From 59cb93df5d7dd8eb17222992ff7a553f32633f90 Mon Sep 17 00:00:00 2001
From: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
Date: Fri, 15 Mar 2024 15:02:42 +0100
Subject: [PATCH 0001/2913] [nrf fromlist] scripts: pylib: twister: twisterlib:
 prevent empty gcda files

In case of problem with parsing hex data from coverage dump,
do not create empty gcda file.
Such empty file will break gcovr parsing.

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/70297

Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
(cherry picked from commit 38cf979136ece17b1e42010384e449645c268be5)
(cherry picked from commit b7a4c93bb9ef80036d555a39118116b70fbf79a3)
(cherry picked from commit 68d3de1590ea042bb84aadf2a32aa851fe745ad0)
---
 scripts/pylib/twister/twisterlib/coverage.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/pylib/twister/twisterlib/coverage.py b/scripts/pylib/twister/twisterlib/coverage.py
index 8a0ea95569b..00fc9ddaca3 100644
--- a/scripts/pylib/twister/twisterlib/coverage.py
+++ b/scripts/pylib/twister/twisterlib/coverage.py
@@ -122,8 +122,9 @@ def create_gcda_files(self, extracted_coverage_info):
 
             try:
                 hexdump_val = self.merge_hexdumps(hexdumps)
+                hex_bytes = bytes.fromhex(hexdump_val)
                 with open(filename, 'wb') as fp:
-                    fp.write(bytes.fromhex(hexdump_val))
+                    fp.write(hex_bytes)
             except ValueError:
                 logger.exception("Unable to convert hex data for file: {}".format(filename))
                 gcda_created = False

From 7851352579f7211fe90ec6c07e2ea1794be5782c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 13 Jun 2024 15:56:37 +0200
Subject: [PATCH 0002/2913] [nrf fromlist] boards: nordic: nrf54h20dk: Disable
 asserts on ppr tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cpuppr is a small core with less than 64k of memory. In order to
fit tests into that memory by default disable asserts (which saves
few kB).

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/74297

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 68776ed76e7de3a84f43be7d6b3974f2f53955f2)
(cherry picked from commit 007c4e4adda8ac1d038bb9a884f6e138e1c47d0a)
(cherry picked from commit e9db5b1144a2fa57a08597a0cea12f94c19ac259)
---
 boards/nordic/nrf54h20dk/Kconfig.defconfig | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/boards/nordic/nrf54h20dk/Kconfig.defconfig b/boards/nordic/nrf54h20dk/Kconfig.defconfig
index e37975f96ad..a2be74d3648 100644
--- a/boards/nordic/nrf54h20dk/Kconfig.defconfig
+++ b/boards/nordic/nrf54h20dk/Kconfig.defconfig
@@ -14,3 +14,11 @@ config BT_CTLR
 	default y if BT
 
 endif # BOARD_NRF54H20DK_NRF54H20_CPURAD
+
+if BOARD_NRF54H20DK_NRF54H20_CPUPPR
+
+# As PPR has limited memory most of tests does not fit with asserts enabled.
+config ASSERT
+	default n if ZTEST
+
+endif # BOARD_NRF54H20DK_NRF54H20_CPUPPR

From fea079bc933045b91c9eb66ae54472a6026143a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 14 Jun 2024 11:29:29 +0200
Subject: [PATCH 0003/2913] [nrf fromlist] tests: kernel: interrupt:
 nested_irq: support nrf54h ppr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add dedicated interrupt lines for nrf54h20_cpuppr. Similar exception
was already added to nrf54l15_flpr: 8742e2476.

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/74297

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit d074251d2fbe7b0bf659921e9f554e6b58ae6030)
(cherry picked from commit 7124f5d71364e58f9565cd2f3f2e59adcd98d464)
(cherry picked from commit 78a62d4adf706e78f044a476ca2d7e0faa2ba04a)
---
 tests/kernel/interrupt/src/nested_irq.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/kernel/interrupt/src/nested_irq.c b/tests/kernel/interrupt/src/nested_irq.c
index 1bcb11c38ea..1650a7b77ec 100644
--- a/tests/kernel/interrupt/src/nested_irq.c
+++ b/tests/kernel/interrupt/src/nested_irq.c
@@ -60,6 +60,12 @@
 #define IRQ0_LINE	16
 #define IRQ1_LINE	17
 
+#define IRQ0_PRIO	1
+#define IRQ1_PRIO	2
+#elif defined(CONFIG_SOC_NRF54H20_CPUPPR)
+#define IRQ0_LINE	14
+#define IRQ1_LINE	15
+
 #define IRQ0_PRIO	1
 #define IRQ1_PRIO	2
 #else

From 4f9ab7947c5214f837d806b33d3cb5262ff9bc83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 14 Jun 2024 12:17:13 +0200
Subject: [PATCH 0004/2913] [nrf fromlist] boards: nordic: nrf54l15pdk: Disable
 asserts on flpr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cpuflpr has limited memory. In order to fit tests into that memory
by default disable asserts (which saves few kB).

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/74297

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 90f792f3a10b2f49faff0a8177042c4e60724b76)
(cherry picked from commit a278ee4af1397201e4b9a8431d601c3e64d34a6b)
(cherry picked from commit 9289a5dfe7dc56d642024497f4104acf79ce7bd4)
---
 boards/nordic/nrf54l15pdk/Kconfig.defconfig | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/boards/nordic/nrf54l15pdk/Kconfig.defconfig b/boards/nordic/nrf54l15pdk/Kconfig.defconfig
index 1c83abbb020..7a9177fcbf7 100644
--- a/boards/nordic/nrf54l15pdk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l15pdk/Kconfig.defconfig
@@ -10,3 +10,11 @@ config ROM_START_OFFSET
 	default 0x800 if BOOTLOADER_MCUBOOT
 
 endif # BOARD_NRF54L15PDK_NRF54L15_CPUAPP
+
+if BOARD_NRF54L15PDK_NRF54L15_CPUFLPR || BOARD_NRF54L15PDK_NRF54L15_CPUFLPR_XIP
+
+# As FLPR has limited memory most of tests does not fit with asserts enabled.
+config ASSERT
+	default n if ZTEST
+
+endif # BOARD_NRF54L15PDK_NRF54L15_CPUFLPR || BOARD_NRF54L15PDK_NRF54L15_CPUFLPR_XIP

From 85968881010c03e94e75cf6d00c5f8ee6da54380 Mon Sep 17 00:00:00 2001
From: Dominik Kilian <Dominik.Kilian@nordicsemi.no>
Date: Thu, 20 Jun 2024 10:54:57 +0200
Subject: [PATCH 0005/2913] [nrf fromlist] icbmsg: Allow deregistration of the
 endpoints

This is implementation of ICBMsg endpoint deregistration.
The underlying ICMsg instance and blocks are not affected by
deregistration, so it is possible to reuse the same address
during the re-registration of the same endpoint.

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/74243

Signed-off-by: Dominik Kilian <Dominik.Kilian@nordicsemi.no>
(cherry picked from commit 297b00dade9f72873f9dd9147008e4a90516a3ff)
(cherry picked from commit 82650c15903d0cc0652004f277433065aaf3d4aa)
(cherry picked from commit 054c29508511fdc5bd33d1d54c44e72ab43f2670)
---
 subsys/ipc/ipc_service/backends/ipc_icbmsg.c | 64 +++++++++++++++++++-
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
index 624896d657a..70c4c4c362f 100644
--- a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
+++ b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
@@ -139,6 +139,14 @@ enum ept_bounding_state {
 	EPT_READY,		/* Bounding is done. Bound callback was called. */
 };
 
+enum ept_rebound_state {
+	EPT_NORMAL = 0,		/* No endpoint rebounding is needed. */
+	EPT_DEREGISTERED,	/* Endpoint was deregistered. */
+	EPT_REBOUNDING,		/* Rebounding was requested, waiting for work queue to
+				 * start rebounding process.
+				 */
+};
+
 struct channel_config {
 	uint8_t *blocks_ptr;	/* Address where the blocks start. */
 	size_t block_size;	/* Size of one block. */
@@ -159,6 +167,7 @@ struct icbmsg_config {
 struct ept_data {
 	const struct ipc_ept_cfg *cfg;	/* Endpoint configuration. */
 	atomic_t state;			/* Bounding state. */
+	atomic_t rebound_state;		/* Rebounding state. */
 	uint8_t addr;			/* Endpoint address. */
 };
 
@@ -768,6 +777,18 @@ static void ept_bound_process(struct backend_data *dev_data)
 		k_mutex_unlock(&dev_data->mutex);
 #endif
 	}
+
+	/* Check if any endpoint is ready to rebound and call the callback if it is. */
+	for (i = 0; i < NUM_EPT; i++) {
+		ept = &dev_data->ept[i];
+		matching_state = atomic_cas(&ept->rebound_state, EPT_REBOUNDING,
+						EPT_NORMAL);
+		if (matching_state) {
+			if (ept->cfg->cb.bound != NULL) {
+				ept->cfg->cb.bound(ept->cfg->priv);
+			}
+		}
+	}
 }
 
 /**
@@ -791,7 +812,10 @@ static struct ept_data *get_ept_and_rx_validate(struct backend_data *dev_data,
 	state = atomic_get(&ept->state);
 
 	if (state == EPT_READY) {
-		/* Valid state - nothing to do. */
+		/* Ready state, ensure that it is not deregistered nor rebounding. */
+		if (atomic_get(&ept->rebound_state) != EPT_NORMAL) {
+			return NULL;
+		}
 	} else if (state == EPT_BOUNDING) {
 		/* Endpoint bound callback was not called yet - call it. */
 		atomic_set(&ept->state, EPT_READY);
@@ -1053,9 +1077,28 @@ static int register_ept(const struct device *instance, void **token,
 {
 	struct backend_data *dev_data = instance->data;
 	struct ept_data *ept = NULL;
+	bool matching_state;
 	int ept_index;
 	int r = 0;
 
+	/* Try to find endpoint to rebound */
+	for (ept_index = 0; ept_index < NUM_EPT; ept_index++) {
+		ept = &dev_data->ept[ept_index];
+		if (ept->cfg == cfg) {
+			matching_state = atomic_cas(&ept->rebound_state, EPT_DEREGISTERED,
+						   EPT_REBOUNDING);
+			if (!matching_state) {
+				return -EINVAL;
+			}
+#ifdef CONFIG_MULTITHREADING
+			schedule_ept_bound_process(dev_data);
+#else
+			ept_bound_process(dev_data);
+#endif
+			return 0;
+		}
+	}
+
 	/* Reserve new endpoint index. */
 	ept_index = atomic_inc(&dev_data->flags) & FLAG_EPT_COUNT_MASK;
 	if (ept_index >= NUM_EPT) {
@@ -1086,6 +1129,23 @@ static int register_ept(const struct device *instance, void **token,
 	return r;
 }
 
+/**
+ * Backend endpoint deregistration callback.
+ */
+static int deregister_ept(const struct device *instance, void *token)
+{
+	struct ept_data *ept = token;
+	bool matching_state;
+
+	matching_state = atomic_cas(&ept->rebound_state, EPT_NORMAL, EPT_DEREGISTERED);
+
+	if (!matching_state) {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
 /**
  * Returns maximum TX buffer size.
  */
@@ -1214,7 +1274,7 @@ const static struct ipc_service_backend backend_ops = {
 	.close_instance = NULL, /* not implemented */
 	.send = send,
 	.register_endpoint = register_ept,
-	.deregister_endpoint = NULL, /* not implemented */
+	.deregister_endpoint = deregister_ept,
 	.get_tx_buffer_size = get_tx_buffer_size,
 	.get_tx_buffer = get_tx_buffer,
 	.drop_tx_buffer = drop_tx_buffer,

From 9aae291a4b4c341efead287b642e1d1e47e83b5c Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Tue, 14 May 2024 11:58:10 +0200
Subject: [PATCH 0006/2913] [nrf fromlist] cmake: cleanup hwm_v2.cmake module
 code

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/72857

Cleanup the Kconfig generating code in hwm_v2.cmake by moving common
logic inside the kconfig_gen() helper function.

This prepares the code for board extension feature.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit d39cc46b56294b6eb297a67478334c23db8c8ca3)
(cherry picked from commit a20616fad2ac054ef7e0db98efc26a66c9e4d30a)
(cherry picked from commit 80f01454f26001edaae28b996fed23e23ac45573)
---
 cmake/modules/hwm_v2.cmake | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/cmake/modules/hwm_v2.cmake b/cmake/modules/hwm_v2.cmake
index 45238f212b3..b514a33c5b0 100644
--- a/cmake/modules/hwm_v2.cmake
+++ b/cmake/modules/hwm_v2.cmake
@@ -24,9 +24,11 @@ if(NOT HWMv2)
 endif()
 
 # Internal helper function for creation of Kconfig files.
-function(kconfig_gen bin_dir file dirs)
-  file(MAKE_DIRECTORY "${bin_dir}")
-  set(kconfig_file ${bin_dir}/${file})
+function(kconfig_gen bin_dir file dirs comment)
+  set(kconfig_header "# Load ${comment} descriptions.\n")
+  set(kconfig_file ${KCONFIG_BINARY_DIR}/${bin_dir}/${file})
+  file(WRITE ${kconfig_file} "${kconfig_header}")
+
   foreach(dir ${dirs})
     cmake_path(CONVERT "${dir}" TO_CMAKE_PATH_LIST dir)
     file(APPEND ${kconfig_file} "osource \"${dir}/${file}\"\n")
@@ -92,28 +94,12 @@ while(TRUE)
 endwhile()
 list(REMOVE_DUPLICATES kconfig_soc_source_dir)
 
-# Support multiple ARCH_ROOT and SOC_ROOT
-set(arch_kconfig_file  Kconfig)
-set(soc_defconfig_file Kconfig.defconfig)
-set(soc_zephyr_file    Kconfig)
-set(soc_kconfig_file   Kconfig.soc)
-set(soc_sysbuild_file  Kconfig.sysbuild)
-set(arch_kconfig_header "# Load arch Kconfig descriptions.\n")
-set(defconfig_header    "# Load Zephyr SoC Kconfig defconfig.\n")
-set(soc_zephyr_header   "# Load Zephyr SoC Kconfig descriptions.\n")
-set(soc_kconfig_header  "# Load SoC Kconfig descriptions.\n")
-set(soc_sysbuild_header "# Load SoC sysbuild Kconfig descriptions.\n")
-file(WRITE ${KCONFIG_BINARY_DIR}/arch/${arch_kconfig_file} "${arch_kconfig_header}")
-file(WRITE ${KCONFIG_BINARY_DIR}/soc/${soc_defconfig_file} "${defconfig_header}")
-file(WRITE ${KCONFIG_BINARY_DIR}/soc/${soc_zephyr_file}    "${soc_zephyr_header}")
-file(WRITE ${KCONFIG_BINARY_DIR}/soc/${soc_kconfig_file}   "${soc_kconfig_header}")
-file(WRITE ${KCONFIG_BINARY_DIR}/soc/${soc_sysbuild_file}  "${soc_sysbuild_header}")
-
-kconfig_gen("${KCONFIG_BINARY_DIR}/arch" "${arch_kconfig_file}" "${kconfig_arch_source_dir}")
-kconfig_gen("${KCONFIG_BINARY_DIR}/soc" "${soc_defconfig_file}" "${kconfig_soc_source_dir}")
-kconfig_gen("${KCONFIG_BINARY_DIR}/soc" "${soc_zephyr_file}" "${kconfig_soc_source_dir}")
-kconfig_gen("${KCONFIG_BINARY_DIR}/soc" "${soc_kconfig_file}" "${kconfig_soc_source_dir}")
-kconfig_gen("${KCONFIG_BINARY_DIR}/soc" "${soc_sysbuild_file}" "${kconfig_soc_source_dir}")
+# Support multiple ARCH_ROOT, SOC_ROOT and BOARD_ROOT
+kconfig_gen("arch" "Kconfig"           "${kconfig_arch_source_dir}" "Zephyr Arch Kconfig")
+kconfig_gen("soc"  "Kconfig.defconfig" "${kconfig_soc_source_dir}"  "Zephyr SoC defconfig")
+kconfig_gen("soc"  "Kconfig"           "${kconfig_soc_source_dir}"  "Zephyr SoC Kconfig")
+kconfig_gen("soc"  "Kconfig.soc"       "${kconfig_soc_source_dir}"  "SoC Kconfig")
+kconfig_gen("soc"  "Kconfig.sysbuild"  "${kconfig_soc_source_dir}"  "Sysbuild SoC Kconfig")
 
 # Clear variables created by cmake_parse_arguments
 unset(SOC_V2_NAME)

From c22239fd5c3b8501003bd462e94a183314fd8c13 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Fri, 12 Jul 2024 10:45:20 +0200
Subject: [PATCH 0007/2913] [nrf noup] revertme: Cover up merge conflicts

This automated patch is inserted before a cherry-pick of:

ad16407 cmake: scripts: support board extension

This allows the above commit to be applied cleanly, even though it
appears to conflict with the following commit(s):

ec3b301 [nrf fromlist] scripts: support soc/boards in Zephyr modules

The conflicts are left to be fixed in a follow-up patch, instead of
doing so in the cherry-pick itself.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit ce853e21d784e8f68566b426ce32235eb7973b9c)
(cherry picked from commit 91df91eb4780e1022326c05d3d3ef52fd18f5b77)
---
 scripts/ci/check_compliance.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/scripts/ci/check_compliance.py b/scripts/ci/check_compliance.py
index 1a45e32a741..95a662614bb 100755
--- a/scripts/ci/check_compliance.py
+++ b/scripts/ci/check_compliance.py
@@ -506,12 +506,8 @@ def get_v2_model(self, kconfig_dir, settings_file):
         kconfig_boards_file = os.path.join(kconfig_dir, 'boards', 'Kconfig.boards')
         kconfig_defconfig_file = os.path.join(kconfig_dir, 'boards', 'Kconfig.defconfig')
 
-        board_roots = self.get_module_setting_root('board', settings_file)
-        board_roots.insert(0, Path(ZEPHYR_BASE))
-        soc_roots = self.get_module_setting_root('soc', settings_file)
-        soc_roots.insert(0, Path(ZEPHYR_BASE))
-        root_args = argparse.Namespace(**{'board_roots': board_roots,
-                                          'soc_roots': soc_roots, 'board': None})
+        root_args = argparse.Namespace(**{'board_roots': [Path(ZEPHYR_BASE)],
+                                          'soc_roots': [Path(ZEPHYR_BASE)], 'board': None})
         v2_boards = list_boards.find_v2_boards(root_args)
 
         with open(kconfig_defconfig_file, 'w') as fp:
@@ -617,7 +613,7 @@ def parse_kconfig(self, filename="Kconfig", hwm=None):
         os.makedirs(os.path.join(kconfiglib_dir, 'arch'), exist_ok=True)
 
         os.environ["BOARD_DIR"] = kconfiglib_boards_dir
-        self.get_v2_model(kconfiglib_dir, os.path.join(kconfiglib_dir, "settings_file.txt"))
+        self.get_v2_model(kconfiglib_dir)
 
         # Tells Kconfiglib to generate warnings for all references to undefined
         # symbols within Kconfig files

From ac11ba595ea48e5f5328ec630b124988d296f668 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Wed, 8 May 2024 13:10:48 +0200
Subject: [PATCH 0008/2913] [nrf fromlist] cmake: scripts: support board
 extension

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/72857

Fixes: #69548

Support extending an existing board with new board variants.

This commit introduces the following changes to allow a board to be
extended out-of-tree.

The board yaml schema is extended to support an extend field which
will be used to identify the board to be extended.

A board 'plank' can be extended like this:
> board:
>   extend: plank
>   variants:
>     - name: ext
>       qualifier: soc1

For the rest of the build system this means that there is no longer a
single board directory.
The existing CMake variable BOARD_DIR is kept and reference the
directory which defines the board.
A new CMake variable BOARD_DIRECTORIES provides a list of all
directories which defines board targets for the board.
This means the directory which defines the board as well as all
directories that extends the board.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit ad16407aca8ccde1aaa57d4d1dcb15bb4d0bfc25)
(cherry picked from commit a276e94de17390ccfaad180c0323d501844e1a92)
(cherry picked from commit ad3a56e02c5a94499cbbca4e8fe99af4eeb6a3a5)
---
 Kconfig.zephyr                             |   4 +-
 boards/Kconfig                             |   2 +-
 boards/Kconfig.v1                          |   6 +-
 boards/Kconfig.v2                          |   2 +-
 cmake/modules/boards.cmake                 |  34 ++----
 cmake/modules/dts.cmake                    |  40 +++----
 cmake/modules/hwm_v2.cmake                 |  14 ++-
 cmake/modules/kconfig.cmake                |   7 +-
 cmake/modules/kernel.cmake                 |   4 +-
 doc/_extensions/zephyr/kconfig/__init__.py |  12 +-
 scripts/ci/check_compliance.py             |  20 ++--
 scripts/ci/test_plan.py                    |   4 +-
 scripts/kconfig/lint.py                    |   2 +-
 scripts/list_boards.py                     | 125 ++++++++++++++++-----
 scripts/schemas/board-schema.yml           |  22 +++-
 scripts/west_commands/boards.py            |   2 +-
 share/sysbuild/Kconfig                     |   2 +-
 17 files changed, 201 insertions(+), 101 deletions(-)

diff --git a/Kconfig.zephyr b/Kconfig.zephyr
index 425d79f4e74..f97819896d9 100644
--- a/Kconfig.zephyr
+++ b/Kconfig.zephyr
@@ -17,13 +17,13 @@ osource "${APPLICATION_SOURCE_DIR}/VERSION"
 # Shield defaults should have precedence over board defaults, which should have
 # precedence over SoC defaults, so include them in that order.
 #
-# $ARCH and $BOARD_DIR will be glob patterns when building documentation.
+# $ARCH and $KCONFIG_BOARD_DIR will be glob patterns when building documentation.
 # This loads custom shields defconfigs (from BOARD_ROOT)
 osource "$(KCONFIG_BINARY_DIR)/Kconfig.shield.defconfig"
 # This loads Zephyr base shield defconfigs
 source "boards/shields/*/Kconfig.defconfig"
 
-osource "$(BOARD_DIR)/Kconfig.defconfig"
+osource "$(KCONFIG_BOARD_DIR)/Kconfig.defconfig"
 
 # This loads Zephyr specific SoC root defconfigs
 source "$(KCONFIG_BINARY_DIR)/soc/Kconfig.defconfig"
diff --git a/boards/Kconfig b/boards/Kconfig
index 6eb9ca5916d..8f186b32caf 100644
--- a/boards/Kconfig
+++ b/boards/Kconfig
@@ -129,7 +129,7 @@ config QEMU_EXTRA_FLAGS
 	  GDBstub over serial with `-serial tcp:127.0.0.1:5678,server`
 
 # There might not be any board options, hence the optional source
-osource "$(BOARD_DIR)/Kconfig"
+osource "$(KCONFIG_BOARD_DIR)/Kconfig"
 endmenu
 
 config BOARD_HAS_TIMING_FUNCTIONS
diff --git a/boards/Kconfig.v1 b/boards/Kconfig.v1
index 670e2f2376e..c98bd27d2db 100644
--- a/boards/Kconfig.v1
+++ b/boards/Kconfig.v1
@@ -2,9 +2,13 @@
 
 # SPDX-License-Identifier: Apache-2.0
 
+# In HWMv1 the KCONFIG_BOARD_DIR points directly to the BOARD_DIR.
+# Set the BOARD_DIR variable for backwards compatibility to legacy hardware model.
+BOARD_DIR := $(KCONFIG_BOARD_DIR)
+
 choice
 	prompt "Board Selection"
 
-source "$(BOARD_DIR)/Kconfig.board"
+source "$(KCONFIG_BOARD_DIR)/Kconfig.board"
 
 endchoice
diff --git a/boards/Kconfig.v2 b/boards/Kconfig.v2
index 47bb3ae2240..6fce9ccb99d 100644
--- a/boards/Kconfig.v2
+++ b/boards/Kconfig.v2
@@ -25,4 +25,4 @@ config BOARD_QUALIFIERS
 	  For example, if building for ``nrf5340dk/nrf5340/cpuapp`` then this will contain the
 	  value ``nrf5340/cpuapp``.
 
-osource "$(BOARD_DIR)/Kconfig.$(BOARD)"
+osource "$(KCONFIG_BOARD_DIR)/Kconfig.$(BOARD)"
diff --git a/cmake/modules/boards.cmake b/cmake/modules/boards.cmake
index d2c0666f2c5..d13e0a16f2d 100644
--- a/cmake/modules/boards.cmake
+++ b/cmake/modules/boards.cmake
@@ -185,9 +185,7 @@ set(format_str "{NAME}\;{DIR}\;{HWM}\;")
 set(format_str "${format_str}{REVISION_FORMAT}\;{REVISION_DEFAULT}\;{REVISION_EXACT}\;")
 set(format_str "${format_str}{REVISIONS}\;{SOCS}\;{QUALIFIERS}")
 
-if(BOARD_DIR)
-  set(board_dir_arg "--board-dir=${BOARD_DIR}")
-endif()
+list(TRANSFORM BOARD_DIRECTORIES PREPEND "--board-dir=" OUTPUT_VARIABLE board_dir_arg)
 execute_process(${list_boards_commands} --board=${BOARD} ${board_dir_arg}
   --cmakeformat=${format_str}
                 OUTPUT_VARIABLE ret_board
@@ -200,29 +198,15 @@ endif()
 
 if(NOT "${ret_board}" STREQUAL "")
   string(STRIP "${ret_board}" ret_board)
-  string(FIND "${ret_board}" "\n" idx REVERSE)
-  if(idx GREATER -1)
-    while(TRUE)
-      math(EXPR start "${idx} + 1")
-      string(SUBSTRING "${ret_board}" ${start} -1 line)
-      string(SUBSTRING "${ret_board}" 0 ${idx} ret_board)
-
-      cmake_parse_arguments(LIST_BOARD "" "DIR" "" ${line})
-      set(board_dirs "${board_dirs}\n${LIST_BOARD_DIR}")
-
-      if(idx EQUAL -1)
-        break()
-      endif()
-      string(FIND "${ret_board}" "\n" idx REVERSE)
-    endwhile()
-    message(FATAL_ERROR "Multiple boards named '${BOARD}' found in:${board_dirs}")
-  endif()
-
-  set(single_val "NAME;DIR;HWM;REVISION_FORMAT;REVISION_DEFAULT;REVISION_EXACT")
-  set(multi_val  "REVISIONS;SOCS;QUALIFIERS")
+  set(single_val "NAME;HWM;REVISION_FORMAT;REVISION_DEFAULT;REVISION_EXACT")
+  set(multi_val  "DIR;REVISIONS;SOCS;QUALIFIERS")
   cmake_parse_arguments(LIST_BOARD "" "${single_val}" "${multi_val}" ${ret_board})
-  set(BOARD_DIR ${LIST_BOARD_DIR} CACHE PATH "Board directory for board (${BOARD})" FORCE)
-  set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${BOARD_DIR}/board.yml)
+  list(GET LIST_BOARD_DIR 0 BOARD_DIR)
+  set(BOARD_DIR ${BOARD_DIR} CACHE PATH "Main board directory for board (${BOARD})" FORCE)
+  set(BOARD_DIRECTORIES ${LIST_BOARD_DIR} CACHE INTERNAL "List of board directories for board (${BOARD})" FORCE)
+  foreach(dir ${BOARD_DIRECTORIES})
+    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${dir}/board.yml)
+  endforeach()
 
   # Create two CMake variables identifying the hw model.
   # CMake variable: HWM=[v1,v2]
diff --git a/cmake/modules/dts.cmake b/cmake/modules/dts.cmake
index ec0999d366b..22631ceecbd 100644
--- a/cmake/modules/dts.cmake
+++ b/cmake/modules/dts.cmake
@@ -70,9 +70,9 @@ find_package(Dtc 1.4.6)
 #
 # Optional variables:
 # - BOARD: board name to use when looking for DTS_SOURCE
-# - BOARD_DIR: board directory to use when looking for DTS_SOURCE
+# - BOARD_DIRECTORIES: list of board directories to use when looking for DTS_SOURCE
 # - BOARD_REVISION_STRING: used when looking for a board revision's
-#   devicetree overlay file in BOARD_DIR
+#   devicetree overlay file in one of the BOARD_DIRECTORIES
 # - DTC_OVERLAY_FILE: list of devicetree overlay files which will be
 #   used to modify or extend the base devicetree.
 # - EXTRA_DTC_OVERLAY_FILE: list of extra devicetree overlay files.
@@ -86,7 +86,7 @@ find_package(Dtc 1.4.6)
 #   C preprocessor when generating the devicetree from DTS_SOURCE
 # - DTS_SOURCE: the devicetree source file to use may be pre-set
 #   with this variable; otherwise, it defaults to
-#   ${BOARD_DIR}/${BOARD}.dts
+#   ${BOARD_DIRECTORIES}/<normalized_board_target>.dts
 #
 # Variables set by this module and not mentioned above are for internal
 # use only, and may be removed, renamed, or re-purposed without prior notice.
@@ -127,28 +127,30 @@ if(NOT DEFINED DTS_SOURCE)
   zephyr_build_string(board_string SHORT shortened_board_string
                       BOARD ${BOARD} BOARD_QUALIFIERS ${BOARD_QUALIFIERS}
   )
-  if(EXISTS ${BOARD_DIR}/${shortened_board_string}.dts AND NOT BOARD_${BOARD}_SINGLE_SOC)
-    message(FATAL_ERROR "Board ${ZFILE_BOARD} defines multiple SoCs.\nShortened file name "
-            "(${shortened_board_string}.dts) not allowed, use '<board>_<soc>.dts' naming"
-    )
-  elseif(EXISTS ${BOARD_DIR}/${board_string}.dts AND EXISTS ${BOARD_DIR}/${shortened_board_string}.dts)
-    message(FATAL_ERROR "Conflicting file names discovered. Cannot use both "
-            "${board_string}.dts and ${shortened_board_string}.dts. "
-            "Please choose one naming style, ${board_string}.dts is recommended."
-    )
-  elseif(EXISTS ${BOARD_DIR}/${board_string}.dts)
-    set(DTS_SOURCE ${BOARD_DIR}/${board_string}.dts)
-  elseif(EXISTS ${BOARD_DIR}/${shortened_board_string}.dts)
-    set(DTS_SOURCE ${BOARD_DIR}/${shortened_board_string}.dts)
-  endif()
+  foreach(dir ${BOARD_DIRECTORIES})
+    if(EXISTS ${dir}/${shortened_board_string}.dts AND NOT BOARD_${BOARD}_SINGLE_SOC)
+      message(FATAL_ERROR "Board ${ZFILE_BOARD} defines multiple SoCs.\nShortened file name "
+              "(${shortened_board_string}.dts) not allowed, use '<board>_<soc>.dts' naming"
+      )
+    elseif(EXISTS ${dir}/${board_string}.dts AND EXISTS ${dir}/${shortened_board_string}.dts)
+      message(FATAL_ERROR "Conflicting file names discovered. Cannot use both "
+              "${board_string}.dts and ${shortened_board_string}.dts. "
+              "Please choose one naming style, ${board_string}.dts is recommended."
+      )
+    elseif(EXISTS ${dir}/${board_string}.dts)
+      set(DTS_SOURCE ${dir}/${board_string}.dts)
+    elseif(EXISTS ${dir}/${shortened_board_string}.dts)
+      set(DTS_SOURCE ${dir}/${shortened_board_string}.dts)
+    endif()
+  endforeach()
 endif()
 
 if(EXISTS ${DTS_SOURCE})
   # We found a devicetree. Append all relevant dts overlays we can find...
-  zephyr_file(CONF_FILES ${BOARD_DIR} DTS DTS_SOURCE)
+  zephyr_file(CONF_FILES ${BOARD_DIRECTORIES} DTS DTS_SOURCE)
 
   zephyr_file(
-    CONF_FILES ${BOARD_DIR}
+    CONF_FILES ${BOARD_DIRECTORIES}
     DTS no_rev_suffix_dts_board_overlays
     BOARD ${BOARD}
     BOARD_QUALIFIERS ${BOARD_QUALIFIERS}
diff --git a/cmake/modules/hwm_v2.cmake b/cmake/modules/hwm_v2.cmake
index b514a33c5b0..c4feb03736e 100644
--- a/cmake/modules/hwm_v2.cmake
+++ b/cmake/modules/hwm_v2.cmake
@@ -95,11 +95,15 @@ endwhile()
 list(REMOVE_DUPLICATES kconfig_soc_source_dir)
 
 # Support multiple ARCH_ROOT, SOC_ROOT and BOARD_ROOT
-kconfig_gen("arch" "Kconfig"           "${kconfig_arch_source_dir}" "Zephyr Arch Kconfig")
-kconfig_gen("soc"  "Kconfig.defconfig" "${kconfig_soc_source_dir}"  "Zephyr SoC defconfig")
-kconfig_gen("soc"  "Kconfig"           "${kconfig_soc_source_dir}"  "Zephyr SoC Kconfig")
-kconfig_gen("soc"  "Kconfig.soc"       "${kconfig_soc_source_dir}"  "SoC Kconfig")
-kconfig_gen("soc"  "Kconfig.sysbuild"  "${kconfig_soc_source_dir}"  "Sysbuild SoC Kconfig")
+kconfig_gen("arch" "Kconfig"             "${kconfig_arch_source_dir}" "Zephyr Arch Kconfig")
+kconfig_gen("soc"  "Kconfig.defconfig"   "${kconfig_soc_source_dir}"  "Zephyr SoC defconfig")
+kconfig_gen("soc"  "Kconfig"             "${kconfig_soc_source_dir}"  "Zephyr SoC Kconfig")
+kconfig_gen("soc"  "Kconfig.soc"         "${kconfig_soc_source_dir}"  "SoC Kconfig")
+kconfig_gen("soc"  "Kconfig.sysbuild"    "${kconfig_soc_source_dir}"  "Sysbuild SoC Kconfig")
+kconfig_gen("boards" "Kconfig.defconfig" "${BOARD_DIRECTORIES}"       "Zephyr board defconfig")
+kconfig_gen("boards" "Kconfig.${BOARD}"  "${BOARD_DIRECTORIES}"       "board Kconfig")
+kconfig_gen("boards" "Kconfig"           "${BOARD_DIRECTORIES}"       "Zephyr board Kconfig")
+kconfig_gen("boards" "Kconfig.sysbuild"  "${BOARD_DIRECTORIES}"       "Sysbuild board Kconfig")
 
 # Clear variables created by cmake_parse_arguments
 unset(SOC_V2_NAME)
diff --git a/cmake/modules/kconfig.cmake b/cmake/modules/kconfig.cmake
index 3f374db5aea..ba461d30bbc 100644
--- a/cmake/modules/kconfig.cmake
+++ b/cmake/modules/kconfig.cmake
@@ -21,9 +21,12 @@ file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/kconfig/include/config)
 set_ifndef(KCONFIG_NAMESPACE "CONFIG")
 
 set_ifndef(KCONFIG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Kconfig)
+set(KCONFIG_BOARD_DIR ${KCONFIG_BINARY_DIR}/boards)
 file(MAKE_DIRECTORY ${KCONFIG_BINARY_DIR})
 
 if(HWMv1)
+  # HWMv1 only supoorts a single board dir which points directly to the board dir.
+  set(KCONFIG_BOARD_DIR ${BOARD_DIR})
   # Support multiple SOC_ROOT
   file(MAKE_DIRECTORY ${KCONFIG_BINARY_DIR}/soc)
   set(kconfig_soc_root ${SOC_ROOT})
@@ -73,7 +76,7 @@ else()
 endif()
 
 if(NOT DEFINED BOARD_DEFCONFIG)
-  zephyr_file(CONF_FILES ${BOARD_DIR} DEFCONFIG BOARD_DEFCONFIG)
+  zephyr_file(CONF_FILES ${BOARD_DIRECTORIES} DEFCONFIG BOARD_DEFCONFIG)
 endif()
 
 if(DEFINED BOARD_REVISION)
@@ -155,7 +158,7 @@ set(COMMON_KCONFIG_ENV_SETTINGS
   APP_VERSION_TWEAK_STRING=${APP_VERSION_TWEAK_STRING}
   CONFIG_=${KCONFIG_NAMESPACE}_
   KCONFIG_CONFIG=${DOTCONFIG}
-  BOARD_DIR=${BOARD_DIR}
+  KCONFIG_BOARD_DIR=${KCONFIG_BOARD_DIR}
   BOARD=${BOARD}
   BOARD_REVISION=${BOARD_REVISION}
   BOARD_QUALIFIERS=${BOARD_QUALIFIERS}
diff --git a/cmake/modules/kernel.cmake b/cmake/modules/kernel.cmake
index 1946e2357ba..6a1a48b172d 100644
--- a/cmake/modules/kernel.cmake
+++ b/cmake/modules/kernel.cmake
@@ -173,7 +173,9 @@ if(CONFIG_LLEXT AND CONFIG_LLEXT_TYPE_ELF_SHAREDLIB)
   set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
 endif()
 
-include(${BOARD_DIR}/board.cmake OPTIONAL)
+foreach(dir ${BOARD_DIRECTORIES})
+  include(${dir}/board.cmake OPTIONAL)
+endforeach()
 
 # If we are using a suitable ethernet driver inside qemu, then these options
 # must be set, otherwise a zephyr instance cannot receive any network packets.
diff --git a/doc/_extensions/zephyr/kconfig/__init__.py b/doc/_extensions/zephyr/kconfig/__init__.py
index 6052db638fa..abbdcc1b9be 100644
--- a/doc/_extensions/zephyr/kconfig/__init__.py
+++ b/doc/_extensions/zephyr/kconfig/__init__.py
@@ -91,7 +91,7 @@ def kconfig_load(app: Sphinx) -> Tuple[kconfiglib.Kconfig, Dict[str, str]]:
         root_args = argparse.Namespace(**{'soc_roots': [Path(ZEPHYR_BASE)]})
         v2_systems = list_hardware.find_v2_systems(root_args)
 
-        soc_folders = {soc.folder for soc in v2_systems.get_socs()}
+        soc_folders = {soc.folder[0] for soc in v2_systems.get_socs()}
         with open(Path(td) / "soc" / "Kconfig.defconfig", "w") as f:
             f.write('')
 
@@ -114,8 +114,9 @@ def kconfig_load(app: Sphinx) -> Tuple[kconfiglib.Kconfig, Dict[str, str]]:
 
         (Path(td) / 'boards').mkdir(exist_ok=True)
         root_args = argparse.Namespace(**{'board_roots': [Path(ZEPHYR_BASE)],
-                                          'soc_roots': [Path(ZEPHYR_BASE)], 'board': None})
-        v2_boards = list_boards.find_v2_boards(root_args)
+                                          'soc_roots': [Path(ZEPHYR_BASE)], 'board': None,
+                                          'board_dir': []})
+        v2_boards = list_boards.find_v2_boards(root_args).values()
 
         with open(Path(td) / "boards" / "Kconfig.boards", "w") as f:
             for board in v2_boards:
@@ -126,7 +127,8 @@ def kconfig_load(app: Sphinx) -> Tuple[kconfiglib.Kconfig, Dict[str, str]]:
                     board_str = 'BOARD_' + re.sub(r"[^a-zA-Z0-9_]", "_", qualifier).upper()
                     f.write('config  ' + board_str + '\n')
                     f.write('\t bool\n')
-                f.write('source "' + (board.dir / ('Kconfig.' + board.name)).as_posix() + '"\n\n')
+                f.write('source "' +
+                        (board.directories[0] / ('Kconfig.' + board.name)).as_posix() + '"\n\n')
 
         # base environment
         os.environ["ZEPHYR_BASE"] = str(ZEPHYR_BASE)
@@ -140,7 +142,7 @@ def kconfig_load(app: Sphinx) -> Tuple[kconfiglib.Kconfig, Dict[str, str]]:
         os.environ["HWM_SCHEME"] = "v2"
 
         os.environ["BOARD"] = "boards"
-        os.environ["BOARD_DIR"] = str(Path(td) / "boards")
+        os.environ["KCONFIG_BOARD_DIR"] = str(Path(td) / "boards")
 
         # insert external Kconfigs to the environment
         module_paths = dict()
diff --git a/scripts/ci/check_compliance.py b/scripts/ci/check_compliance.py
index 95a662614bb..e376222efb1 100755
--- a/scripts/ci/check_compliance.py
+++ b/scripts/ci/check_compliance.py
@@ -507,12 +507,14 @@ def get_v2_model(self, kconfig_dir, settings_file):
         kconfig_defconfig_file = os.path.join(kconfig_dir, 'boards', 'Kconfig.defconfig')
 
         root_args = argparse.Namespace(**{'board_roots': [Path(ZEPHYR_BASE)],
-                                          'soc_roots': [Path(ZEPHYR_BASE)], 'board': None})
-        v2_boards = list_boards.find_v2_boards(root_args)
+                                          'soc_roots': [Path(ZEPHYR_BASE)], 'board': None,
+                                          'board_dir': []})
+        v2_boards = list_boards.find_v2_boards(root_args).values()
 
         with open(kconfig_defconfig_file, 'w') as fp:
             for board in v2_boards:
-                fp.write('osource "' + (Path(board.dir) / 'Kconfig.defconfig').as_posix() + '"\n')
+                fp.write('osource "' +
+                         (board.directories[0] / 'Kconfig.defconfig').as_posix() + '"\n')
 
         with open(kconfig_boards_file, 'w') as fp:
             for board in v2_boards:
@@ -525,7 +527,8 @@ def get_v2_model(self, kconfig_dir, settings_file):
                     fp.write('config  ' + board_str + '\n')
                     fp.write('\t bool\n')
                 fp.write(
-                    'source "' + (Path(board.dir) / ('Kconfig.' + board.name)).as_posix() + '"\n\n'
+                    'source "' +
+                    (board.directories[0] / ('Kconfig.' + board.name)).as_posix() + '"\n\n'
                 )
 
         with open(kconfig_file, 'w') as fp:
@@ -533,7 +536,7 @@ def get_v2_model(self, kconfig_dir, settings_file):
                 'osource "' + (Path(kconfig_dir) / 'boards' / 'Kconfig.syms.v1').as_posix() + '"\n'
             )
             for board in v2_boards:
-                fp.write('osource "' + (Path(board.dir) / 'Kconfig').as_posix() + '"\n')
+                fp.write('osource "' + (Path(board.directories[0]) / 'Kconfig').as_posix() + '"\n')
 
         kconfig_defconfig_file = os.path.join(kconfig_dir, 'soc', 'Kconfig.defconfig')
         kconfig_soc_file = os.path.join(kconfig_dir, 'soc', 'Kconfig.soc')
@@ -542,7 +545,7 @@ def get_v2_model(self, kconfig_dir, settings_file):
         root_args = argparse.Namespace(**{'soc_roots': soc_roots})
         v2_systems = list_hardware.find_v2_systems(root_args)
 
-        soc_folders = {soc.folder for soc in v2_systems.get_socs()}
+        soc_folders = {soc.folder[0] for soc in v2_systems.get_socs()}
         with open(kconfig_defconfig_file, 'w') as fp:
             for folder in soc_folders:
                 fp.write('osource "' + (Path(folder) / 'Kconfig.defconfig').as_posix() + '"\n')
@@ -612,7 +615,7 @@ def parse_kconfig(self, filename="Kconfig", hwm=None):
         os.makedirs(os.path.join(kconfiglib_dir, 'soc'), exist_ok=True)
         os.makedirs(os.path.join(kconfiglib_dir, 'arch'), exist_ok=True)
 
-        os.environ["BOARD_DIR"] = kconfiglib_boards_dir
+        os.environ["KCONFIG_BOARD_DIR"] = kconfiglib_boards_dir
         self.get_v2_model(kconfiglib_dir)
 
         # Tells Kconfiglib to generate warnings for all references to undefined
@@ -922,6 +925,9 @@ def check_no_undef_outside_kconfig(self, kconf):
         "BOOT_RAM_LOAD", # Used in sysbuild for MCUboot configuration
         "BOOT_SWAP_USING_MOVE", # Used in sysbuild for MCUboot configuration
         "BOOT_SWAP_USING_SCRATCH", # Used in sysbuild for MCUboot configuration
+        "BOARD_MPS2_AN521_CPUTEST", # Used for board and SoC extension feature tests
+        "BOARD_NATIVE_SIM_NATIVE_64_TWO", # Used for board and SoC extension feature tests
+        "BOARD_NATIVE_SIM_NATIVE_ONE", # Used for board and SoC extension feature tests
         "BOOT_ENCRYPTION_KEY_FILE", # Used in sysbuild
         "BOOT_ENCRYPT_IMAGE", # Used in sysbuild
         "BOOT_MAX_IMG_SECTORS_AUTO", # Used in sysbuild
diff --git a/scripts/ci/test_plan.py b/scripts/ci/test_plan.py
index 61305a75f45..3e3cf8ee4c7 100755
--- a/scripts/ci/test_plan.py
+++ b/scripts/ci/test_plan.py
@@ -239,12 +239,12 @@ def find_boards(self):
         # Look for boards in monitored repositories
         lb_args = argparse.Namespace(**{'arch_roots': roots, 'board_roots': roots, 'board': None, 'soc_roots':roots,
                                         'board_dir': None})
-        known_boards = list_boards.find_v2_boards(lb_args)
+        known_boards = list_boards.find_v2_boards(lb_args).values()
 
         for changed in changed_boards:
             for board in known_boards:
                 c = (zephyr_base / changed).resolve()
-                if c.is_relative_to(board.dir.resolve()):
+                if c.is_relative_to(board.directories[0].resolve()):
                     for file in glob.glob(os.path.join(board.dir, f"{board.name}*.yaml")):
                         with open(file, 'r') as f:
                             b = yaml.load(f.read(), Loader=SafeLoader)
diff --git a/scripts/kconfig/lint.py b/scripts/kconfig/lint.py
index 30064c34546..5a123ded42f 100755
--- a/scripts/kconfig/lint.py
+++ b/scripts/kconfig/lint.py
@@ -209,7 +209,7 @@ def init_kconfig():
         ZEPHYR_BASE=TOP_DIR,
         SOC_DIR="soc",
         ARCH_DIR="arch",
-        BOARD_DIR="boards/*/*",
+        KCONFIG_BOARD_DIR="boards/*/*",
         ARCH="*")
 
     kconf = kconfiglib.Kconfig(suppress_traceback=True)
diff --git a/scripts/list_boards.py b/scripts/list_boards.py
index 6b810d0e286..23859e00cce 100755
--- a/scripts/list_boards.py
+++ b/scripts/list_boards.py
@@ -4,13 +4,13 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import argparse
-from collections import defaultdict
+from collections import defaultdict, Counter
 from dataclasses import dataclass, field
 import itertools
 from pathlib import Path
 import pykwalify.core
 import sys
-from typing import List
+from typing import List, Union
 import yaml
 import list_hardware
 from list_hardware import unique_paths
@@ -91,7 +91,8 @@ def from_soc(soc, variants):
 @dataclass(frozen=True)
 class Board:
     name: str
-    dir: Path
+    # HWMv1 only supports a single Path, and requires Board dataclass to be hashable.
+    directories: Union[Path, List[Path]]
     hwm: str
     arch: str = None
     vendor: str = None
@@ -102,6 +103,41 @@ class Board:
     socs: List[Soc] = field(default_factory=list, compare=False)
     variants: List[str] = field(default_factory=list, compare=False)
 
+    def from_qualifier(self, qualifiers):
+        qualifiers_list = qualifiers.split('/')
+
+        node = Soc(None)
+        n = len(qualifiers_list)
+        if n > 0:
+            soc_qualifier = qualifiers_list.pop(0)
+            for s in self.socs:
+                if s.name == soc_qualifier:
+                    node = s
+                    break
+
+        if n > 1:
+            if node.cpuclusters:
+                cpu_qualifier = qualifiers_list.pop(0)
+                for c in node.cpuclusters:
+                    if c.name == cpu_qualifier:
+                        node = c
+                        break
+                else:
+                    node = Variant(None)
+
+        for q in qualifiers_list:
+            for v in node.variants:
+                if v.name == q:
+                    node = v
+                    break
+            else:
+                node = Variant(None)
+
+        if node in (Soc(None), Variant(None)):
+            sys.exit(f'ERROR: qualifiers {qualifiers} not found when extending board {self.name}')
+
+        return node
+
 
 def board_key(board):
     return board.name
@@ -164,11 +200,10 @@ def find_arch2board_set_in(root, arches, board_dir):
     for arch in arches:
         if not (boards / arch).is_dir():
             continue
-
         for maybe_board in (boards / arch).iterdir():
             if not maybe_board.is_dir():
                 continue
-            if board_dir is not None and board_dir != maybe_board:
+            if board_dir and maybe_board not in board_dir:
                 continue
             for maybe_defconfig in maybe_board.iterdir():
                 file_name = maybe_defconfig.name
@@ -180,7 +215,8 @@ def find_arch2board_set_in(root, arches, board_dir):
 
 
 def load_v2_boards(board_name, board_yml, systems):
-    boards = []
+    boards = {}
+    board_extensions = []
     if board_yml.is_file():
         with board_yml.open('r') as f:
             b = yaml.load(f.read(), Loader=SafeLoader)
@@ -198,6 +234,18 @@ def load_v2_boards(board_name, board_yml, systems):
 
         board_array = b.get('boards', [b.get('board', None)])
         for board in board_array:
+            mutual_exclusive = {'name', 'extend'}
+            if len(mutual_exclusive - board.keys()) < 1:
+                sys.exit(f'ERROR: Malformed "board" section in file: {board_yml.as_posix()}\n'
+                         f'{mutual_exclusive} are mutual exclusive at this level.')
+
+            # This is a extending an existing board, place in array to allow later processing.
+            if 'extend' in board:
+                board.update({'dir': board_yml.parent})
+                board_extensions.append(board)
+                continue
+
+            # Create board
             if board_name is not None:
                 if board['name'] != board_name:
                     # Not the board we're looking for, ignore.
@@ -219,9 +267,9 @@ def load_v2_boards(board_name, board_yml, systems):
             socs = [Soc.from_soc(systems.get_soc(s['name']), s.get('variants', []))
                     for s in board.get('socs', {})]
 
-            board = Board(
+            boards[board['name']] = Board(
                 name=board['name'],
-                dir=board_yml.parent,
+                directories=[board_yml.parent],
                 vendor=board.get('vendor'),
                 revision_format=board.get('revision', {}).get('format'),
                 revision_default=board.get('revision', {}).get('default'),
@@ -232,8 +280,28 @@ def load_v2_boards(board_name, board_yml, systems):
                 variants=[Variant.from_dict(v) for v in board.get('variants', [])],
                 hwm='v2',
             )
-            boards.append(board)
-    return boards
+            board_qualifiers = board_v2_qualifiers(boards[board['name']])
+            duplicates = [q for q, n in Counter(board_qualifiers).items() if n > 1]
+            if duplicates:
+                sys.exit(f'ERROR: Duplicated board qualifiers detected {duplicates} for board: '
+                         f'{board["name"]}.\nPlease check content of: {board_yml.as_posix()}\n')
+    return boards, board_extensions
+
+
+def extend_v2_boards(boards, board_extensions):
+    for e in board_extensions:
+        board = boards.get(e['extend'])
+        if board is None:
+            continue
+        board.directories.append(e['dir'])
+
+        for v in e.get('variants', []):
+            node = board.from_qualifier(v['qualifier'])
+            if str(v['qualifier'] + '/' + v['name']) in board_v2_qualifiers(board):
+                board_yml = e['dir'] / BOARD_YML
+                sys.exit(f'ERROR: Variant: {v["name"]}, defined multiple times for board: '
+                         f'{board.name}.\nLast defined in {board_yml}')
+            node.variants.append(Variant.from_dict(v))
 
 
 # Note that this does not share the args.board functionality of find_v2_boards
@@ -251,14 +319,25 @@ def find_v2_boards(args):
     root_args = argparse.Namespace(**{'soc_roots': args.soc_roots})
     systems = list_hardware.find_v2_systems(root_args)
 
-    boards = []
+    boards = {}
+    board_extensions = []
     board_files = []
-    for root in unique_paths(args.board_roots):
-        board_files.extend((root / 'boards').rglob(BOARD_YML))
+    if args.board_dir:
+        board_files = [d / BOARD_YML for d in args.board_dir]
+    else:
+        for root in unique_paths(args.board_roots):
+            board_files.extend((root / 'boards').rglob(BOARD_YML))
 
     for board_yml in board_files:
-        b = load_v2_boards(args.board, board_yml, systems)
-        boards.extend(b)
+        b, e = load_v2_boards(args.board, board_yml, systems)
+        conflict_boards = set(boards.keys()).intersection(b.keys())
+        if conflict_boards:
+            sys.exit(f'ERROR: Board(s): {conflict_boards}, defined multiple times.\n'
+                     f'Last defined in {board_yml}')
+        boards.update(b)
+        board_extensions.extend(e)
+
+    extend_v2_boards(boards, board_extensions)
     return boards
 
 
@@ -283,7 +362,7 @@ def add_args(parser):
                         help='add a soc root, may be given more than once')
     parser.add_argument("--board", dest='board', default=None,
                         help='lookup the specific board, fail if not found')
-    parser.add_argument("--board-dir", default=None, type=Path,
+    parser.add_argument("--board-dir", default=[], type=Path, action='append',
                         help='Only look for boards at the specific location')
 
 
@@ -325,20 +404,16 @@ def board_v2_qualifiers_csv(board):
 
 
 def dump_v2_boards(args):
-    if args.board_dir:
-        root_args = argparse.Namespace(**{'soc_roots': args.soc_roots})
-        systems = list_hardware.find_v2_systems(root_args)
-        boards = load_v2_boards(args.board, args.board_dir / BOARD_YML, systems)
-    else:
-        boards = find_v2_boards(args)
+    boards = find_v2_boards(args)
 
-    for b in boards:
+    for b in boards.values():
         qualifiers_list = board_v2_qualifiers(b)
         if args.cmakeformat is not None:
             notfound = lambda x: x or 'NOTFOUND'
             info = args.cmakeformat.format(
                 NAME='NAME;' + b.name,
-                DIR='DIR;' + str(b.dir.as_posix()),
+                DIR='DIR;' + ';'.join(
+                    [str(x.as_posix()) for x in b.directories]),
                 VENDOR='VENDOR;' + notfound(b.vendor),
                 HWM='HWM;' + b.hwm,
                 REVISION_DEFAULT='REVISION_DEFAULT;' + notfound(b.revision_default),
@@ -363,7 +438,7 @@ def dump_boards(args):
             if args.cmakeformat is not None:
                 info = args.cmakeformat.format(
                     NAME='NAME;' + board.name,
-                    DIR='DIR;' + str(board.dir.as_posix()),
+                    DIR='DIR;' + str(board.directories.as_posix()),
                     HWM='HWM;' + board.hwm,
                     VENDOR='VENDOR;NOTFOUND',
                     REVISION_DEFAULT='REVISION_DEFAULT;NOTFOUND',
diff --git a/scripts/schemas/board-schema.yml b/scripts/schemas/board-schema.yml
index 56ee4eab034..2e578ba2e8a 100644
--- a/scripts/schemas/board-schema.yml
+++ b/scripts/schemas/board-schema.yml
@@ -23,13 +23,29 @@ schema;variant-schema:
           required: false
           include: variant-schema
 
+schema;extend-variant-schema:
+  required: false
+  type: seq
+  sequence:
+    - type: map
+      mapping:
+        name:
+          required: true
+          type: str
+        qualifier:
+          required: true
+          type: str
+
 schema;board-schema:
   type: map
   mapping:
     name:
-      required: true
+      required: false # Note: either name or extend is required, but that is handled in python
       type: str
       desc: Name of the board
+    extend:
+      required: false # Note: either name or extend is required, but that is handled in python
+      type: str
     vendor:
       required: false
       type: str
@@ -59,7 +75,7 @@ schema;board-schema:
                   required: true
                   type: str
     socs:
-      required: true
+      required: false # Required for name:, but not for extend.
       type: seq
       sequence:
         - type: map
@@ -69,6 +85,8 @@ schema;board-schema:
               type: str
             variants:
               include: variant-schema
+    variants:
+      include: extend-variant-schema
 
 type: map
 mapping:
diff --git a/scripts/west_commands/boards.py b/scripts/west_commands/boards.py
index 3bb213ae029..f329ea54217 100644
--- a/scripts/west_commands/boards.py
+++ b/scripts/west_commands/boards.py
@@ -96,7 +96,7 @@ def do_run(self, args, _):
             log.inf(args.format.format(name=board.name, arch=board.arch,
                                        dir=board.dir, hwm=board.hwm, qualifiers=''))
 
-        for board in list_boards.find_v2_boards(args):
+        for board in list_boards.find_v2_boards(args).values():
             if name_re is not None and not name_re.search(board.name):
                 continue
             log.inf(
diff --git a/share/sysbuild/Kconfig b/share/sysbuild/Kconfig
index 556462af310..69f2d4cd396 100644
--- a/share/sysbuild/Kconfig
+++ b/share/sysbuild/Kconfig
@@ -6,7 +6,7 @@ rsource "Kconfig.$(HWM_SCHEME)"
 
 comment "Sysbuild image configuration"
 
-osource "$(BOARD_DIR)/Kconfig.sysbuild"
+osource "$(KCONFIG_BOARD_DIR)/Kconfig.sysbuild"
 osource "$(KCONFIG_BINARY_DIR)/soc/Kconfig.sysbuild"
 
 menu "Modules"

From fe2bd338a957488f89f6d19b994ae76be987ec26 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Fri, 12 Jul 2024 10:45:21 +0200
Subject: [PATCH 0009/2913] [nrf noup] revertme: Resolve merge conflicts

This patch finalizes the 3-way merge between:

ad16407 cmake: scripts: support board extension

and:

ec3b301 [nrf fromlist] scripts: support soc/boards in Zephyr modules

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit c2214611654510925168b93579ce35e6f0d950e6)
(cherry picked from commit 3eb953f63af726a96d91fad822b983a8d4442940)
---
 scripts/ci/check_compliance.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/ci/check_compliance.py b/scripts/ci/check_compliance.py
index e376222efb1..3a6ddfdb717 100755
--- a/scripts/ci/check_compliance.py
+++ b/scripts/ci/check_compliance.py
@@ -506,8 +506,12 @@ def get_v2_model(self, kconfig_dir, settings_file):
         kconfig_boards_file = os.path.join(kconfig_dir, 'boards', 'Kconfig.boards')
         kconfig_defconfig_file = os.path.join(kconfig_dir, 'boards', 'Kconfig.defconfig')
 
-        root_args = argparse.Namespace(**{'board_roots': [Path(ZEPHYR_BASE)],
-                                          'soc_roots': [Path(ZEPHYR_BASE)], 'board': None,
+        board_roots = self.get_module_setting_root('board', settings_file)
+        board_roots.insert(0, Path(ZEPHYR_BASE))
+        soc_roots = self.get_module_setting_root('soc', settings_file)
+        soc_roots.insert(0, Path(ZEPHYR_BASE))
+        root_args = argparse.Namespace(**{'board_roots': board_roots,
+                                          'soc_roots': soc_roots, 'board': None,
                                           'board_dir': []})
         v2_boards = list_boards.find_v2_boards(root_args).values()
 
@@ -616,7 +620,7 @@ def parse_kconfig(self, filename="Kconfig", hwm=None):
         os.makedirs(os.path.join(kconfiglib_dir, 'arch'), exist_ok=True)
 
         os.environ["KCONFIG_BOARD_DIR"] = kconfiglib_boards_dir
-        self.get_v2_model(kconfiglib_dir)
+        self.get_v2_model(kconfiglib_dir, os.path.join(kconfiglib_dir, "settings_file.txt"))
 
         # Tells Kconfiglib to generate warnings for all references to undefined
         # symbols within Kconfig files

From 15c21aab194f9e8d68606e3111dcbdb80fddf53d Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Wed, 15 May 2024 22:46:33 +0200
Subject: [PATCH 0010/2913] [nrf fromlist] cmake: scripts: support SoC
 extension

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/72857

Fixes: #72374

Support extending an existing SoC with new CPU clusters.

This commit introduces the following changes to allow an SoC to be
extended out-of-tree.

The SoC yaml schema is extended to support an extend field which
will be used to identify the SoC to be extended with extra CPU clusters.

A SoC 'a_soc' can be extended like this:
> socs:
>   extend: a_soc
>   cpuclusters:
>     - name: extra_core

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit c602935faf814c161ea78d19e5a858f7022978c2)
(cherry picked from commit e3716489033bdbc423f1cff06663ff98a7c6bf0e)
(cherry picked from commit 5de335be5287498916fd735a96876737ecbf5f95)
---
 cmake/modules/hwm_v2.cmake     | 18 ++++++----
 cmake/modules/soc_v2.cmake     |  7 +++-
 scripts/list_hardware.py       | 66 +++++++++++++++++++++++++---------
 scripts/schemas/soc-schema.yml | 19 ++++++++--
 4 files changed, 84 insertions(+), 26 deletions(-)

diff --git a/cmake/modules/hwm_v2.cmake b/cmake/modules/hwm_v2.cmake
index c4feb03736e..a440c95c832 100644
--- a/cmake/modules/hwm_v2.cmake
+++ b/cmake/modules/hwm_v2.cmake
@@ -73,19 +73,23 @@ while(TRUE)
     string(TOUPPER "${ARCH_V2_NAME}" ARCH_V2_NAME_UPPER)
     set(ARCH_V2_${ARCH_V2_NAME_UPPER}_DIR ${ARCH_V2_DIR})
   elseif(HWM_TYPE MATCHES "^soc|^series|^family")
-    cmake_parse_arguments(SOC_V2 "" "NAME;DIR;HWM" "" ${line})
+    cmake_parse_arguments(SOC_V2 "" "NAME;HWM" "DIR" ${line})
 
     list(APPEND kconfig_soc_source_dir "${SOC_V2_DIR}")
+    string(TOUPPER "${SOC_V2_NAME}" SOC_V2_NAME_UPPER)
+    string(TOUPPER "${HWM_TYPE}" HWM_TYPE_UPPER)
 
     if(HWM_TYPE STREQUAL "soc")
-      set(setting_name SOC_${SOC_V2_NAME}_DIR)
+      # We support both SOC_foo_DIR and SOC_FOO_DIR.
+      set(SOC_${SOC_V2_NAME}_DIRECTORIES ${SOC_V2_DIR})
+      set(SOC_${SOC_V2_NAME_UPPER}_DIRECTORIES ${SOC_V2_DIR})
+      list(GET SOC_V2_DIR 0 SOC_${SOC_V2_NAME}_DIR)
+      list(GET SOC_V2_DIR 0 SOC_${SOC_V2_NAME_UPPER}_DIR)
     else()
-      set(setting_name SOC_${HWM_TYPE}_${SOC_V2_NAME}_DIR)
+      # We support both SOC_series_foo_DIR and SOC_SERIES_FOO_DIR (and family /  FAMILY).
+      set(SOC_${HWM_TYPE}_${SOC_V2_NAME}_DIR ${SOC_V2_DIR})
+      set(SOC_${HWM_TYPE_UPPER}_${SOC_V2_NAME_UPPER}_DIR ${SOC_V2_DIR})
     endif()
-    # We support both SOC_foo_DIR and SOC_FOO_DIR.
-    set(${setting_name} ${SOC_V2_DIR})
-    string(TOUPPER ${setting_name} setting_name)
-    set(${setting_name} ${SOC_V2_DIR})
   endif()
 
   if(idx EQUAL -1)
diff --git a/cmake/modules/soc_v2.cmake b/cmake/modules/soc_v2.cmake
index 606ed690f77..f98d33e0011 100644
--- a/cmake/modules/soc_v2.cmake
+++ b/cmake/modules/soc_v2.cmake
@@ -28,5 +28,10 @@ if(HWMv2)
   set(SOC_FAMILY ${CONFIG_SOC_FAMILY})
   set(SOC_V2_DIR ${SOC_${SOC_NAME}_DIR})
   set(SOC_FULL_DIR ${SOC_V2_DIR} CACHE PATH "Path to the SoC directory." FORCE)
-  set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${SOC_V2_DIR}/soc.yml)
+  set(SOC_DIRECTORIES ${SOC_${SOC_NAME}_DIRECTORIES} CACHE INTERNAL
+      "List of SoC directories for SoC (${SOC_NAME})" FORCE
+  )
+  foreach(dir ${SOC_DIRECTORIES})
+    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${dir}/soc.yml)
+  endforeach()
 endif()
diff --git a/scripts/list_hardware.py b/scripts/list_hardware.py
index 1e994f3fd56..2ea2ed9f0c5 100755
--- a/scripts/list_hardware.py
+++ b/scripts/list_hardware.py
@@ -35,6 +35,7 @@ def __init__(self, folder='', soc_yaml=None):
         self._socs = []
         self._series = []
         self._families = []
+        self._extended_socs = []
 
         if soc_yaml is None:
             return
@@ -47,12 +48,12 @@ def __init__(self, folder='', soc_yaml=None):
             sys.exit(f'ERROR: Malformed yaml {soc_yaml.as_posix()}', e)
 
         for f in data.get('family', []):
-            family = Family(f['name'], folder, [], [])
+            family = Family(f['name'], [folder], [], [])
             for s in f.get('series', []):
-                series = Series(s['name'], folder, f['name'], [])
+                series = Series(s['name'], [folder], f['name'], [])
                 socs = [(Soc(soc['name'],
                              [c['name'] for c in soc.get('cpuclusters', [])],
-                             folder, s['name'], f['name']))
+                             [folder], s['name'], f['name']))
                         for soc in s.get('socs', [])]
                 series.socs.extend(socs)
                 self._series.append(series)
@@ -61,26 +62,36 @@ def __init__(self, folder='', soc_yaml=None):
                 family.socs.extend(socs)
             socs = [(Soc(soc['name'],
                          [c['name'] for c in soc.get('cpuclusters', [])],
-                         folder, None, f['name']))
+                         [folder], None, f['name']))
                     for soc in f.get('socs', [])]
             self._socs.extend(socs)
             self._families.append(family)
 
         for s in data.get('series', []):
-            series = Series(s['name'], folder, '', [])
+            series = Series(s['name'], [folder], '', [])
             socs = [(Soc(soc['name'],
                          [c['name'] for c in soc.get('cpuclusters', [])],
-                         folder, s['name'], ''))
+                         [folder], s['name'], ''))
                     for soc in s.get('socs', [])]
             series.socs.extend(socs)
             self._series.append(series)
             self._socs.extend(socs)
 
-        socs = [(Soc(soc['name'],
-                     [c['name'] for c in soc.get('cpuclusters', [])],
-                     folder, '', ''))
-                for soc in data.get('socs', [])]
-        self._socs.extend(socs)
+        for soc in data.get('socs', []):
+            mutual_exclusive = {'name', 'extend'}
+            if len(mutual_exclusive - soc.keys()) < 1:
+                sys.exit(f'ERROR: Malformed content in SoC file: {soc_yaml}\n'
+                         f'{mutual_exclusive} are mutual exclusive at this level.')
+            if soc.get('name') is not None:
+                self._socs.append(Soc(soc['name'], [c['name'] for c in soc.get('cpuclusters', [])],
+                                  [folder], '', ''))
+            elif soc.get('extend') is not None:
+                self._extended_socs.append(Soc(soc['extend'],
+                                           [c['name'] for c in soc.get('cpuclusters', [])],
+                                           [folder], '', ''))
+            else:
+                sys.exit(f'ERROR: Malformed "socs" section in SoC file: {soc_yaml}\n'
+                         f'Cannot find one of required keys {mutual_exclusive}.')
 
         # Ensure that any runner configuration matches socs and cpuclusters declared in the same
         # soc.yml file
@@ -97,7 +108,7 @@ def __init__(self, folder='', soc_yaml=None):
                             if components and components[-1] == 'ns':
                                 components.pop()
 
-                            for soc in self._socs:
+                            for soc in self._socs + self._extended_socs:
                                 if re.match(fr'^{soc_name}$', soc.name) is not None:
                                     if soc.cpuclusters and components:
                                         check_string = '/'.join(components)
@@ -133,8 +144,23 @@ def from_yaml(socs_yaml):
     def extend(self, systems):
         self._families.extend(systems.get_families())
         self._series.extend(systems.get_series())
+
+        for es in self._extended_socs[:]:
+            for s in systems.get_socs():
+                if s.name == es.name:
+                    s.extend(es)
+                    self._extended_socs.remove(es)
+                    break
         self._socs.extend(systems.get_socs())
 
+        for es in systems.get_extended_socs():
+            for s in self._socs:
+                if s.name == es.name:
+                    s.extend(es)
+                    break
+            else:
+                self._extended_socs.append(es)
+
     def get_families(self):
         return self._families
 
@@ -144,6 +170,9 @@ def get_series(self):
     def get_socs(self):
         return self._socs
 
+    def get_extended_socs(self):
+        return self._extended_socs
+
     def get_soc(self, name):
         try:
             return next(s for s in self._socs if s.name == name)
@@ -156,15 +185,20 @@ def get_soc(self, name):
 class Soc:
     name: str
     cpuclusters: List[str]
-    folder: str
+    folder: List[str]
     series: str = ''
     family: str = ''
 
+    def extend(self, soc):
+        if self.name == soc.name:
+            self.cpuclusters.extend(soc.cpuclusters)
+            self.folder.extend(soc.folder)
+
 
 @dataclass
 class Series:
     name: str
-    folder: str
+    folder: List[str]
     family: str
     socs: List[Soc]
 
@@ -172,7 +206,7 @@ class Series:
 @dataclass
 class Family:
     name: str
-    folder: str
+    folder: List[str]
     series: List[Series]
     socs: List[Soc]
 
@@ -289,7 +323,7 @@ def dump_v2_system(args, type, system):
         info = args.cmakeformat.format(
            TYPE='TYPE;' + type,
            NAME='NAME;' + system.name,
-           DIR='DIR;' + Path(system.folder).as_posix(),
+           DIR='DIR;' + ';'.join([Path(x).as_posix() for x in system.folder]),
            HWM='HWM;' + 'v2'
         )
     else:
diff --git a/scripts/schemas/soc-schema.yml b/scripts/schemas/soc-schema.yml
index c13b4a4f7e0..1d8537e8ad2 100644
--- a/scripts/schemas/soc-schema.yml
+++ b/scripts/schemas/soc-schema.yml
@@ -24,7 +24,22 @@ schema;soc-schema:
     - type: map
       mapping:
         name:
-          required: true
+          required: true # Note: either name or extend is required, but that is handled in python
+          type: str
+        cpuclusters:
+          include: cpucluster-schema
+
+schema;soc-extend-schema:
+  required: false
+  type: seq
+  sequence:
+    - type: map
+      mapping:
+        name:
+          required: false # Note: either name or extend is required, but that is handled in python
+          type: str
+        extend:
+          required: false # Note: either name or extend is required, but that is handled in python
           type: str
         cpuclusters:
           include: cpucluster-schema
@@ -60,7 +75,7 @@ mapping:
   series:
     include: series-schema
   socs:
-    include: soc-schema
+    include: soc-extend-schema
   vendor:
     required: false
     type: str

From 0344c2d91490f58b19ee2aabc7d0bd6297b80303 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Wed, 15 May 2024 13:42:04 +0200
Subject: [PATCH 0011/2913] [nrf fromlist] tests: add twister tests for CMake
 board and SoC extension

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/72857

This commit adds new tests for verifying the functionality of the board
and SoC extension feature.

It does so by defining:
- A new CPU cluster on an existing SoC
- Two new board variants on top of an existing board

The new board variants are defined on top of the existing `native_sim`
board, so that the following native_sim board targets are available for
the test.
Existing board targets:
- native_sim/native
- native_sim/native/64

Extended board targets:
- native_sim/native/one
- native_sim/native/64/two

The new CPU cluster is defined for the existing `an521` SoC.
Existing CPU Clusters on an521:
- cpu0
- cpu1

New CPU Cluster:
- cputest

For SoC tests the mps2 board is used.
This means that for testing, the following board targets using the an521
SoC are:
- mps2/an521/cpu0
- mps2/an521/cpu1
- mps2/an521/cputest

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 04dda379d7ea202712c68aba60b473cd4b5774ef)
(cherry picked from commit e766f9f9a66779b867572c2e1158f2923d9a00ba)
(cherry picked from commit 0d8c22b636465ce7e673ef6e281df4ae270a5c02)
---
 tests/cmake/hwm/board_extend/CMakeLists.txt   |  14 ++
 tests/cmake/hwm/board_extend/Kconfig          |  15 ++
 .../hwm/board_extend/boards/native_sim.conf   |   1 +
 .../boards/native_sim_native_64_two.conf      |   1 +
 .../boards/native_sim_native_one.conf         |   1 +
 .../oot_root/boards/arm/mps2/Kconfig.mps2     |   5 +
 .../oot_root/boards/arm/mps2/board.cmake      |  14 ++
 .../oot_root/boards/arm/mps2/board.yml        |   2 +
 .../boards/arm/mps2/mps2_an521-common.dtsi    | 191 +++++++++++++++
 .../boards/arm/mps2/mps2_an521_cputest.dts    | 130 +++++++++++
 .../arm/mps2/mps2_an521_cputest_defconfig     |  21 ++
 .../boards/native/native_sim_extend/Kconfig   |  30 +++
 .../native_sim_extend/Kconfig.defconfig       |  16 ++
 .../boards/native/native_sim_extend/board.yml |   7 +
 .../native_sim_native_64_two.dts              |  14 ++
 .../native_sim_native_64_two.yaml             |  25 ++
 .../native_sim_native_64_two_defconfig        |   7 +
 .../native_sim_native_one.dts                 | 218 ++++++++++++++++++
 .../native_sim_native_one.yaml                |  25 ++
 .../native_sim_native_one_defconfig           |   7 +
 .../board_extend/oot_root/soc/arm/Kconfig.soc |   6 +
 .../hwm/board_extend/oot_root/soc/arm/soc.yml |   4 +
 tests/cmake/hwm/board_extend/prj.conf         |   1 +
 tests/cmake/hwm/board_extend/src/main.c       |  85 +++++++
 tests/cmake/hwm/board_extend/testcase.yaml    |  33 +++
 25 files changed, 873 insertions(+)
 create mode 100644 tests/cmake/hwm/board_extend/CMakeLists.txt
 create mode 100644 tests/cmake/hwm/board_extend/Kconfig
 create mode 100644 tests/cmake/hwm/board_extend/boards/native_sim.conf
 create mode 100644 tests/cmake/hwm/board_extend/boards/native_sim_native_64_two.conf
 create mode 100644 tests/cmake/hwm/board_extend/boards/native_sim_native_one.conf
 create mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/Kconfig.mps2
 create mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/board.cmake
 create mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/board.yml
 create mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521-common.dtsi
 create mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest.dts
 create mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest_defconfig
 create mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/Kconfig
 create mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/Kconfig.defconfig
 create mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/board.yml
 create mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two.dts
 create mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two.yaml
 create mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two_defconfig
 create mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.dts
 create mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.yaml
 create mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one_defconfig
 create mode 100644 tests/cmake/hwm/board_extend/oot_root/soc/arm/Kconfig.soc
 create mode 100644 tests/cmake/hwm/board_extend/oot_root/soc/arm/soc.yml
 create mode 100644 tests/cmake/hwm/board_extend/prj.conf
 create mode 100644 tests/cmake/hwm/board_extend/src/main.c
 create mode 100644 tests/cmake/hwm/board_extend/testcase.yaml

diff --git a/tests/cmake/hwm/board_extend/CMakeLists.txt b/tests/cmake/hwm/board_extend/CMakeLists.txt
new file mode 100644
index 00000000000..20bd94d6af0
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/CMakeLists.txt
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+
+cmake_minimum_required(VERSION 3.20.0)
+
+set(BOARD_ROOT  ${CMAKE_CURRENT_LIST_DIR}/oot_root)
+set(SOC_ROOT  ${CMAKE_CURRENT_LIST_DIR}/oot_root)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(native_sim_extend)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/cmake/hwm/board_extend/Kconfig b/tests/cmake/hwm/board_extend/Kconfig
new file mode 100644
index 00000000000..6bbf5b73227
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/Kconfig
@@ -0,0 +1,15 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BASE_BOARD_SETTING
+	bool "Base board test string"
+	help
+	  This kconfig is set when the base board config fragment is supposed to
+	  be sourced, that is when oot variant defines
+	  'extends:'
+	  '  board: native_sim'
+	  '  qualifier: posix'
+	  '  inherit: 1'
+
+source "Kconfig.zephyr"
diff --git a/tests/cmake/hwm/board_extend/boards/native_sim.conf b/tests/cmake/hwm/board_extend/boards/native_sim.conf
new file mode 100644
index 00000000000..71a2b211d0a
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/boards/native_sim.conf
@@ -0,0 +1 @@
+CONFIG_BASE_BOARD_SETTING=y
diff --git a/tests/cmake/hwm/board_extend/boards/native_sim_native_64_two.conf b/tests/cmake/hwm/board_extend/boards/native_sim_native_64_two.conf
new file mode 100644
index 00000000000..b2dfe184407
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/boards/native_sim_native_64_two.conf
@@ -0,0 +1 @@
+CONFIG_EXTENDED_VARIANT_BOARD_SETTING=y
diff --git a/tests/cmake/hwm/board_extend/boards/native_sim_native_one.conf b/tests/cmake/hwm/board_extend/boards/native_sim_native_one.conf
new file mode 100644
index 00000000000..b2dfe184407
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/boards/native_sim_native_one.conf
@@ -0,0 +1 @@
+CONFIG_EXTENDED_VARIANT_BOARD_SETTING=y
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/Kconfig.mps2 b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/Kconfig.mps2
new file mode 100644
index 00000000000..448c9cc1308
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/Kconfig.mps2
@@ -0,0 +1,5 @@
+# Copyright (c) 2017 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MPS2
+	select SOC_MPS2_AN521_CPUTEST if BOARD_MPS2_AN521_CPUTEST
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/board.cmake b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/board.cmake
new file mode 100644
index 00000000000..27c74975756
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/board.cmake
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024, Nordic Semiconductor ASA
+
+if(CONFIG_BOARD_MPS2_AN521_CPUTEST)
+  set(QEMU_CPU_TYPE_${ARCH} cortex-m33)
+  set(QEMU_FLAGS_${ARCH}
+    -cpu ${QEMU_CPU_TYPE_${ARCH}}
+    -machine mps2-an521
+    -nographic
+    -m 16
+    -vga none
+    )
+endif()
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/board.yml b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/board.yml
new file mode 100644
index 00000000000..05982ac1bb8
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/board.yml
@@ -0,0 +1,2 @@
+board:
+  extend: mps2
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521-common.dtsi b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521-common.dtsi
new file mode 100644
index 00000000000..5b1959ff5fe
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521-common.dtsi
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2019 Linaro Limited
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+sysclk: system-clock {
+	compatible = "fixed-clock";
+	clock-frequency = <25000000>;
+	#clock-cells = <0>;
+};
+
+timer0: timer@0 {
+	compatible = "arm,cmsdk-timer";
+	reg = <0x0 0x1000>;
+	interrupts = <3 3>;
+};
+
+timer1: timer@1000 {
+	compatible = "arm,cmsdk-timer";
+	reg = <0x1000 0x1000>;
+	interrupts = <4 3>;
+};
+
+dtimer0: dtimer@2000 {
+	compatible = "arm,cmsdk-dtimer";
+	reg = <0x2000 0x1000>;
+	interrupts = <5 3>;
+};
+
+mhu0: mhu@3000 {
+	compatible = "arm,mhu";
+	reg = <0x3000 0x1000>;
+	interrupts = <6 3>;
+};
+
+mhu1: mhu@4000 {
+	compatible = "arm,mhu";
+	reg = <0x4000 0x1000>;
+	interrupts = <7 3>;
+};
+
+gpio0: gpio@100000 {
+	compatible = "arm,cmsdk-gpio";
+	reg = <0x100000 0x1000>;
+	interrupts = <68 3>;
+	gpio-controller;
+	#gpio-cells = <2>;
+};
+
+gpio1: gpio@101000 {
+	compatible = "arm,cmsdk-gpio";
+	reg = <0x101000 0x1000>;
+	interrupts = <69 3>;
+	gpio-controller;
+	#gpio-cells = <2>;
+};
+
+gpio2: gpio@102000 {
+	compatible = "arm,cmsdk-gpio";
+	reg = <0x102000 0x1000>;
+	interrupts = <70 3>;
+	gpio-controller;
+	#gpio-cells = <2>;
+};
+
+gpio3: gpio@103000 {
+	compatible = "arm,cmsdk-gpio";
+	reg = <0x103000 0x1000>;
+	interrupts = <71 3>;
+	gpio-controller;
+	#gpio-cells = <2>;
+};
+
+wdog0: wdog@81000 {
+	compatible = "arm,cmsdk-watchdog";
+	reg = <0x81000 0x1000>;
+	clocks = <&sysclk>;
+};
+
+uart0: uart@200000 {
+	compatible = "arm,cmsdk-uart";
+	reg = <0x200000 0x1000>;
+	interrupts = <33 3 32 3>;
+	interrupt-names = "tx", "rx";
+	clocks = <&sysclk>;
+	current-speed = <115200>;
+};
+
+uart1: uart@201000 {
+	compatible = "arm,cmsdk-uart";
+	reg = <0x201000 0x1000>;
+	interrupts = <35 3 34 3>;
+	interrupt-names = "tx", "rx";
+	clocks = <&sysclk>;
+	current-speed = <115200>;
+};
+
+uart2: uart@202000 {
+	compatible = "arm,cmsdk-uart";
+	reg = <0x202000 0x1000>;
+	interrupts = <37 3 36 3>;
+	interrupt-names = "tx", "rx";
+	clocks = <&sysclk>;
+	current-speed = <115200>;
+};
+
+uart3: uart@203000 {
+	compatible = "arm,cmsdk-uart";
+	reg = <0x203000 0x1000>;
+	interrupts = <39 3 38 3>;
+	interrupt-names = "tx", "rx";
+	clocks = <&sysclk>;
+	current-speed = <115200>;
+};
+
+uart4: uart@204000 {
+	compatible = "arm,cmsdk-uart";
+	reg = <0x204000 0x1000>;
+	interrupts = <41 3 40 3>;
+	interrupt-names = "tx", "rx";
+	clocks = <&sysclk>;
+	current-speed = <115200>;
+};
+
+i2c_touch: i2c@207000 {
+	compatible = "arm,versatile-i2c";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	#address-cells = <1>;
+	#size-cells = <0>;
+	reg = <0x207000 0x1000>;
+};
+
+i2c_audio_conf: i2c@208000 {
+	compatible = "arm,versatile-i2c";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	#address-cells = <1>;
+	#size-cells = <0>;
+	reg = <0x208000 0x1000>;
+};
+
+i2c_shield0: i2c@20c000 {
+	compatible = "arm,versatile-i2c";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	#address-cells = <1>;
+	#size-cells = <0>;
+	reg = <0x20c000 0x1000>;
+};
+
+i2c_shield1: i2c@20d000 {
+	compatible = "arm,versatile-i2c";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	#address-cells = <1>;
+	#size-cells = <0>;
+	reg = <0x20d000 0x1000>;
+};
+
+gpio_led0: mps2_fpgaio@302000 {
+	compatible = "arm,mps2-fpgaio-gpio";
+
+	reg = <0x302000 0x4>;
+	gpio-controller;
+	#gpio-cells = <1>;
+	ngpios = <2>;
+};
+
+gpio_button: mps2_fpgaio@302008 {
+	compatible = "arm,mps2-fpgaio-gpio";
+
+	reg = <0x302008 0x4>;
+	gpio-controller;
+	#gpio-cells = <1>;
+	ngpios = <2>;
+};
+
+gpio_misc: mps2_fpgaio@30204c {
+	compatible = "arm,mps2-fpgaio-gpio";
+
+	reg = <0x30204c 0x4>;
+	gpio-controller;
+	#gpio-cells = <1>;
+	ngpios = <10>;
+};
+
+eth0: eth@2000000 {
+	/* Linux has "smsc,lan9115" */
+	compatible = "smsc,lan9220";
+	/* Actual reg range is ~0x200 */
+	reg = <0x2000000 0x100000>;
+	interrupts = <48 3>;
+};
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest.dts b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest.dts
new file mode 100644
index 00000000000..2bb956645ca
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest.dts
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2018-2019 Linaro Limited
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <mem.h>
+#include <arm/armv8-m.dtsi>
+#include <zephyr/dt-bindings/i2c/i2c.h>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	compatible = "arm,mps2";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	aliases {
+		led0 = &led_0;
+		led1 = &led_1;
+		sw0 = &user_button_0;
+		sw1 = &user_button_1;
+		uart-1 = &uart1;
+		watchdog0 = &wdog0;
+	};
+
+	chosen {
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+
+		/*
+		 * These SRAM and flash settings give the entire available
+		 * code and data memories to this secure firmware image.
+		 * This may conflict with mps2_an521_remote firmware. Use
+		 * caution when using both targets simultaneously.
+		 */
+		zephyr,sram = &ssram2_3;
+		zephyr,flash = &ssram1;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		led_0: led_0 {
+			gpios = <&gpio_led0 0>;
+			label = "USERLED0";
+		};
+		led_1: led_1 {
+			gpios = <&gpio_led0 1>;
+			label = "USERLED1";
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		user_button_0: button_0 {
+			label = "USERPB0";
+			gpios = <&gpio_button 0>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+		user_button_1: button_1 {
+			label = "USERPB1";
+			gpios = <&gpio_button 1>;
+			zephyr,code = <INPUT_KEY_1>;
+		};
+	};
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-m33";
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			mpu: mpu@e000ed90 {
+				compatible = "arm,armv8m-mpu";
+				reg = <0xe000ed90 0x40>;
+			};
+		};
+	};
+
+	/*
+	 * The memory regions defined below are according to AN521:
+	 * https://documentation-service.arm.com/static/5fa12fe9b1a7c5445f29017f
+	 *
+	 * Please see tables mentioned in individual comments below for details.
+	 */
+
+	ssram1: memory@10000000 {
+		/* Table 3-2, row 6. */
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x10000000 DT_SIZE_M(4)>;
+		zephyr,memory-region = "SSRAM1";
+	};
+
+	ssram2_3: memory@38000000 {
+		/* Table 3-4, rows 16 and 17. */
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x38000000 DT_SIZE_M(4)>;
+		zephyr,memory-region = "SSRAM2_3";
+	};
+
+	psram: memory@80000000 {
+		/* Table 3-6, row 1. */
+		device_type = "memory";
+		reg = <0x80000000 DT_SIZE_M(16)>;
+	};
+
+	soc {
+		peripheral@50000000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x50000000 0x10000000>;
+
+			#include "mps2_an521-common.dtsi"
+		};
+	};
+};
+
+&nvic {
+	arm,num-irq-priority-bits = <3>;
+};
+
+&uart1 {
+	status = "okay";
+};
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest_defconfig b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest_defconfig
new file mode 100644
index 00000000000..08949950a9e
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest_defconfig
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2018-2019 Linaro Limited
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+#CONFIG_RUNTIME_NMI=y
+#CONFIG_ARM_TRUSTZONE_M=y
+#CONFIG_ARM_MPU=y
+CONFIG_QEMU_ICOUNT_SHIFT=6
+#
+## GPIOs
+CONFIG_GPIO=y
+
+# Serial
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_SERIAL=y
+
+# Build a non-secure firmware image
+#CONFIG_TRUSTED_EXECUTION_NONSECURE=y
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/Kconfig b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/Kconfig
new file mode 100644
index 00000000000..e724497c3b5
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/Kconfig
@@ -0,0 +1,30 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config EXTENDED_VARIANT_BOARD_SETTING
+	bool "Extended variant board test string"
+	depends on BOARD_NATIVE_SIM_NATIVE_ONE || BOARD_NATIVE_SIM_NATIVE_64_TWO
+	help
+	  This kconfig is set when the extended variant board config fragment
+	  is supposed to be sourced, that is when oot variant defines 'extends:'
+
+config EXTENDED_VARIANT_BOARD_ONE_SETTING_PROMPTLESS
+	bool
+	depends on BOARD_NATIVE_SIM_NATIVE_ONE
+	help
+	  This kconfig is promptless and is expected to be set through the
+	  Kconfig.defconfig for the extended board.
+
+config EXTENDED_VARIANT_BOARD_TWO_SETTING_PROMPTLESS
+	bool
+	depends on BOARD_NATIVE_SIM_NATIVE_64_TWO
+	help
+	  This kconfig is promptless and is expected to be set through the
+	  Kconfig.defconfig for the extended board.
+
+config EXTENDED_VARIANT_BOARD_SETTING_DEFCONFIG
+	bool "Extended variant board test string defconfig"
+	depends on BOARD_NATIVE_SIM_NATIVE_ONE || BOARD_NATIVE_SIM_NATIVE_64_TWO
+	help
+	  This kconfig is set when the extended variant board defconfig fragment
+	  is supposed to be sourced, that is when oot variant defines 'extends:'
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/Kconfig.defconfig b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/Kconfig.defconfig
new file mode 100644
index 00000000000..343daa1246a
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/Kconfig.defconfig
@@ -0,0 +1,16 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_NATIVE_SIM_NATIVE_ONE
+
+config EXTENDED_VARIANT_BOARD_ONE_SETTING_PROMPTLESS
+	default y
+
+endif # BOARD_NATIVE_SIM_NATIVE_ONE
+
+if BOARD_NATIVE_SIM_NATIVE_64_TWO
+
+config EXTENDED_VARIANT_BOARD_TWO_SETTING_PROMPTLESS
+	default y
+
+endif # BOARD_NATIVE_SIM_NATIVE_64_TWO
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/board.yml b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/board.yml
new file mode 100644
index 00000000000..8df9cf3c433
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/board.yml
@@ -0,0 +1,7 @@
+board:
+  extend: native_sim
+  variants:
+    - name: one
+      qualifier: native
+    - name: two
+      qualifier: native/64
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two.dts b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two.dts
new file mode 100644
index 00000000000..b3fc17d81fb
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two.dts
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "native_sim_native_one.dts"
+
+/ {
+	/delete-node/ added-by-native-one;
+
+	added-by-native-two{
+	};
+};
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two.yaml b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two.yaml
new file mode 100644
index 00000000000..190d4906cc8
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two.yaml
@@ -0,0 +1,25 @@
+identifier: native_sim_native_64_two
+name: Native Simulation port - 32-bit
+type: native
+simulation: native
+arch: posix
+ram: 65536
+flash: 65536
+toolchain:
+  - host
+  - llvm
+supported:
+  - can
+  - counter
+  - dma
+  - eeprom
+  - netif:eth
+  - usb_device
+  - adc
+  - i2c
+  - spi
+  - gpio
+  - rtc
+testing:
+  default: true
+vendor: zephyr
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two_defconfig b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two_defconfig
new file mode 100644
index 00000000000..d0de015b0df
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two_defconfig
@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CONSOLE=y
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000
+
+CONFIG_EXTENDED_VARIANT_BOARD_SETTING_DEFCONFIG=y
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.dts b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.dts
new file mode 100644
index 00000000000..652c7605f60
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.dts
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2019 Jan Van Winkel (jan.van_winkel@dxplore.eu)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <posix/posix.dtsi>
+#include <zephyr/dt-bindings/adc/adc.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/ {
+	model = "Native Sim Board";
+	compatible = "zephyr,posix";
+
+	chosen {
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,uart-mcumgr = &uart0;
+		zephyr,flash = &flash0;
+		zephyr,entropy = &rng;
+		zephyr,flash-controller = &flashcontroller0;
+		zephyr,display = &sdl_dc;
+		zephyr,canbus = &can_loopback0;
+		zephyr,code-partition = &slot0_partition;
+	};
+
+	aliases {
+		eeprom-0 = &eeprom0;
+		i2c-0 = &i2c0;
+		spi-0 = &spi0;
+		led0 = &led0;
+		rtc = &rtc;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		led0: led_0 {
+			gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
+			label = "Green LED";
+		};
+	};
+
+	lvgl_pointer {
+		compatible = "zephyr,lvgl-pointer-input";
+		input = <&input_sdl_touch>;
+	};
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			compatible = "zephyr,native-posix-cpu";
+			reg = <0>;
+		};
+	};
+
+	flashcontroller0: flash-controller@0 {
+		compatible = "zephyr,sim-flash";
+		reg = <0x00000000 DT_SIZE_K(2048)>;
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+		erase-value = <0xff>;
+
+		flash0: flash@0 {
+			status = "okay";
+			compatible = "soc-nv-flash";
+			erase-block-size = <4096>;
+			write-block-size = <1>;
+			reg = <0x00000000 DT_SIZE_K(2048)>;
+
+			partitions {
+				compatible = "fixed-partitions";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				boot_partition: partition@0 {
+					label = "mcuboot";
+					reg = <0x00000000 0x0000C000>;
+				};
+				slot0_partition: partition@c000 {
+					label = "image-0";
+					reg = <0x0000C000 0x00069000>;
+				};
+				slot1_partition: partition@75000 {
+					label = "image-1";
+					reg = <0x00075000 0x00069000>;
+				};
+				scratch_partition: partition@de000 {
+					label = "image-scratch";
+					reg = <0x000de000 0x0001e000>;
+				};
+				storage_partition: partition@fc000 {
+					label = "storage";
+					reg = <0x000fc000 0x00004000>;
+				};
+			};
+		};
+	};
+
+	eeprom0: eeprom {
+		status = "okay";
+		compatible = "zephyr,sim-eeprom";
+		size = <DT_SIZE_K(32)>;
+	};
+
+	i2c0: i2c@100 {
+		status = "okay";
+		compatible = "zephyr,i2c-emul-controller";
+		clock-frequency = <I2C_BITRATE_STANDARD>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x100 4>;
+	};
+
+	spi0: spi@200 {
+		status = "okay";
+		compatible = "zephyr,spi-emul-controller";
+		clock-frequency = <50000000>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x200 4>;
+	};
+
+	espi0: espi@300 {
+		status = "okay";
+		compatible = "zephyr,espi-emul-controller";
+		reg = <0x300 4>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+	};
+
+	uart0: uart {
+		status = "okay";
+		compatible = "zephyr,native-posix-uart";
+		/* Dummy current-speed entry to comply with serial
+		 * DTS binding
+		 */
+		current-speed = <0>;
+	};
+
+	uart1: uart_1 {
+		status = "okay";
+		compatible = "zephyr,native-posix-uart";
+		/* Dummy current-speed entry to comply with serial
+		 * DTS binding
+		 */
+		current-speed = <0>;
+	};
+
+	rng: rng {
+		status = "okay";
+		compatible = "zephyr,native-posix-rng";
+	};
+
+	counter0: counter {
+		status = "okay";
+		compatible = "zephyr,native-posix-counter";
+	};
+
+	gpio0: gpio@800 {
+		status = "okay";
+		compatible = "zephyr,gpio-emul";
+		reg = <0x800 0x4>;
+		rising-edge;
+		falling-edge;
+		high-level;
+		low-level;
+		gpio-controller;
+		#gpio-cells = <2>;
+	};
+
+	zephyr_udc0: udc0 {
+		compatible = "zephyr,native-posix-udc";
+	};
+
+	sdl_dc: sdl_dc {
+		compatible = "zephyr,sdl-dc";
+		height = <240>;
+		width = <320>;
+	};
+
+	input_sdl_touch: input-sdl-touch {
+		compatible = "zephyr,input-sdl-touch";
+	};
+
+	can_loopback0: can_loopback0 {
+		status = "okay";
+		compatible = "zephyr,can-loopback";
+	};
+
+	can0: can {
+		status = "disabled";
+		compatible = "zephyr,native-linux-can";
+		/* adjust zcan0 to desired host interface or create an alternative
+		 * name, e.g.: sudo ip link property add dev vcan0 altname zcan0
+		 */
+		host-interface = "zcan0";
+	};
+
+	rtc: rtc {
+		status = "okay";
+		compatible = "zephyr,rtc-emul";
+		alarms-count = <2>;
+	};
+
+	dma: dma {
+		compatible = "zephyr,dma-emul";
+		#dma-cells = <1>;
+		stack-size = <4096>;
+	};
+
+	added-by-native-one {
+	};
+};
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.yaml b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.yaml
new file mode 100644
index 00000000000..ea2c2d856ae
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.yaml
@@ -0,0 +1,25 @@
+identifier: native_sim_native_one
+name: Native Simulation port - 32-bit
+type: native
+simulation: native
+arch: posix
+ram: 65536
+flash: 65536
+toolchain:
+  - host
+  - llvm
+supported:
+  - can
+  - counter
+  - dma
+  - eeprom
+  - netif:eth
+  - usb_device
+  - adc
+  - i2c
+  - spi
+  - gpio
+  - rtc
+testing:
+  default: true
+vendor: zephyr
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one_defconfig b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one_defconfig
new file mode 100644
index 00000000000..d0de015b0df
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one_defconfig
@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CONSOLE=y
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000
+
+CONFIG_EXTENDED_VARIANT_BOARD_SETTING_DEFCONFIG=y
diff --git a/tests/cmake/hwm/board_extend/oot_root/soc/arm/Kconfig.soc b/tests/cmake/hwm/board_extend/oot_root/soc/arm/Kconfig.soc
new file mode 100644
index 00000000000..a699e8413a1
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/oot_root/soc/arm/Kconfig.soc
@@ -0,0 +1,6 @@
+# Copyright (c) 2024, Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_MPS2_AN521_CPUTEST
+	bool
+	select SOC_MPS2_AN521
diff --git a/tests/cmake/hwm/board_extend/oot_root/soc/arm/soc.yml b/tests/cmake/hwm/board_extend/oot_root/soc/arm/soc.yml
new file mode 100644
index 00000000000..04b69c75ae4
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/oot_root/soc/arm/soc.yml
@@ -0,0 +1,4 @@
+socs:
+  - extend: an521
+    cpuclusters:
+      - name: cputest
diff --git a/tests/cmake/hwm/board_extend/prj.conf b/tests/cmake/hwm/board_extend/prj.conf
new file mode 100644
index 00000000000..9467c292689
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/prj.conf
@@ -0,0 +1 @@
+CONFIG_ZTEST=y
diff --git a/tests/cmake/hwm/board_extend/src/main.c b/tests/cmake/hwm/board_extend/src/main.c
new file mode 100644
index 00000000000..9795bd8dcb8
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/src/main.c
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/ztest.h>
+
+#ifdef CONFIG_EXTENDED_VARIANT_BOARD_SETTING
+#define EXTENDED_BOARD_A 1
+#else
+#define EXTENDED_BOARD_A 0
+#endif
+
+#ifdef CONFIG_EXTENDED_VARIANT_BOARD_ONE_SETTING_PROMPTLESS
+#define EXTENDED_BOARD_ONE_B 1
+#else
+#define EXTENDED_BOARD_ONE_B 0
+#endif
+
+#ifdef CONFIG_EXTENDED_VARIANT_BOARD_TWO_SETTING_PROMPTLESS
+#define EXTENDED_BOARD_TWO_C 1
+#else
+#define EXTENDED_BOARD_TWO_C 0
+#endif
+
+#ifdef CONFIG_EXTENDED_VARIANT_BOARD_SETTING_DEFCONFIG
+#define EXTENDED_BOARD_D 1
+#else
+#define EXTENDED_BOARD_D 0
+#endif
+
+#ifdef CONFIG_BASE_BOARD_SETTING
+#define BASE_BOARD_CONFIG 1
+#else
+#define BASE_BOARD_CONFIG 0
+#endif
+
+#ifdef CONFIG_SOC_MPS2_AN521_CPUTEST
+#define EXTENDED_SOC 1
+#else
+#define EXTENDED_SOC 0
+#endif
+
+ZTEST_SUITE(soc_board_extend, NULL, NULL, NULL, NULL, NULL);
+
+#if CONFIG_BOARD_NATIVE_SIM
+ZTEST(soc_board_extend, test_native_sim_extend)
+{
+#if CONFIG_BOARD_NATIVE_SIM_NATIVE_ONE
+	zassert_true(EXTENDED_BOARD_A, "Expected extended board to be set");
+	zassert_true(EXTENDED_BOARD_ONE_B, "Expected extended board to be set");
+	zassert_false(EXTENDED_BOARD_TWO_C, "Did not expect extended board two to be set");
+	zassert_true(EXTENDED_BOARD_D, "Expected extended board to be set");
+	zassert_false(BASE_BOARD_CONFIG, "Did not expect base board to be set");
+	zassert_true(DT_NODE_EXISTS(DT_PATH(added_by_native_one)));
+	zassert_false(DT_NODE_EXISTS(DT_PATH(added_by_native_two)));
+	zassert_false(DT_NODE_EXISTS(DT_PATH(adc)));
+#elif CONFIG_BOARD_NATIVE_SIM_NATIVE_64_TWO
+	zassert_true(EXTENDED_BOARD_A, "Expected extended board to be set");
+	zassert_false(EXTENDED_BOARD_ONE_B, "Did not expect extended board one to be set");
+	zassert_true(EXTENDED_BOARD_TWO_C, "Expected extended board to be set");
+	zassert_true(EXTENDED_BOARD_D, "Expected extended board to be set");
+	zassert_false(BASE_BOARD_CONFIG, "Did not expect base board to be set");
+	zassert_false(DT_NODE_EXISTS(DT_PATH(added_by_native_one)));
+	zassert_true(DT_NODE_EXISTS(DT_PATH(added_by_native_two)));
+	zassert_false(DT_NODE_EXISTS(DT_PATH(adc)));
+#else
+	zassert_true(false, "Did not expect to build for a base native_sim board");
+#endif
+#elif CONFIG_BOARD_MPS2
+ZTEST(soc_board_extend, test_an521_soc_extend)
+{
+#if CONFIG_BOARD_MPS2_AN521_CPUTEST
+	zassert_true(EXTENDED_SOC, "Expected extended SoC to be set");
+#elif CONFIG_BOARD_MPS2
+	zassert_true(false, "Did not expect to build for a base mps2 board");
+#endif
+
+#else
+ZTEST(soc_board_extend, test_failure)
+{
+	zassert_true(false, "Did not expect to build for a regular board");
+#endif
+}
diff --git a/tests/cmake/hwm/board_extend/testcase.yaml b/tests/cmake/hwm/board_extend/testcase.yaml
new file mode 100644
index 00000000000..aae39ce6b2c
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/testcase.yaml
@@ -0,0 +1,33 @@
+common:
+  tags:
+    - cmake
+tests:
+  cmake.board.extend_one:
+    extra_args:
+      # Twister can only lookup known board roots.
+      # Thus platform above is set to native_sim, while at this location
+      # we overrule with the native_sim/native/one board.
+      # Test will fail if we accidentially build for the base native_sim board.
+      - CACHED_BOARD=native_sim/native/one
+    platform_allow:
+      - native_sim
+      - native_sim/native/64
+    integration_platforms:
+      - native_sim
+      - native_sim/native/64
+  cmake.board.extend_two:
+    extra_args:
+      - CACHED_BOARD=native_sim/native/64/two
+    platform_allow:
+      - native_sim
+      - native_sim/native/64
+    integration_platforms:
+      - native_sim
+      - native_sim/native/64
+  cmake.soc.extend_cputest:
+    extra_args:
+      - CACHED_BOARD=mps2/an521/cputest
+    platform_allow:
+      - mps2/an521/cpu0
+    integration_platforms:
+      - mps2/an521/cpu0

From 0431663b1be49be3b3a4bf0138970353be14d425 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Mon, 1 Jul 2024 08:19:25 +0100
Subject: [PATCH 0012/2913] [nrf fromlist] scripts: west_commands: run: Add
 priority to run once config

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/72857

Adds an optional priority parameter to the flash runner run once
configuration which allows for deciding upon which file should
ultimately be used

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 88a4c4ecf6906c7b66e6f42402f1f3e22456ff05)
(cherry picked from commit c88231a8af91e8959f77231508bbe3f4f65be145)
(cherry picked from commit 59371c384bde91e705cbc7856e774368d643200d)
---
 scripts/schemas/board-schema.yml    |   5 ++
 scripts/schemas/soc-schema.yml      |   5 ++
 scripts/west_commands/run_common.py | 105 +++++++++++++++++-----------
 3 files changed, 75 insertions(+), 40 deletions(-)

diff --git a/scripts/schemas/board-schema.yml b/scripts/schemas/board-schema.yml
index 2e578ba2e8a..3ca85af73c6 100644
--- a/scripts/schemas/board-schema.yml
+++ b/scripts/schemas/board-schema.yml
@@ -99,6 +99,11 @@ mapping:
   runners:
     type: map
     mapping:
+      priority:
+        type: int
+        desc: |
+              Priority of this flash run once configuration. The highest value data will be used
+              instead of any with lower priorities. If omitted, will default to 10.
       run_once:
         type: map
         desc: |
diff --git a/scripts/schemas/soc-schema.yml b/scripts/schemas/soc-schema.yml
index 1d8537e8ad2..060afea3254 100644
--- a/scripts/schemas/soc-schema.yml
+++ b/scripts/schemas/soc-schema.yml
@@ -88,6 +88,11 @@ mapping:
   runners:
     type: map
     mapping:
+      priority:
+        type: int
+        desc: |
+              Priority of this flash run once configuration. The highest value data will be used
+              instead of any with lower priorities. If omitted, will default to 0.
       run_once:
         type: map
         desc: |
diff --git a/scripts/west_commands/run_common.py b/scripts/west_commands/run_common.py
index 772d736c183..012f27359d6 100644
--- a/scripts/west_commands/run_common.py
+++ b/scripts/west_commands/run_common.py
@@ -42,6 +42,10 @@
 # Don't change this, or output from argparse won't match up.
 INDENT = ' ' * 2
 
+IGNORED_RUN_ONCE_PRIORITY = -1
+SOC_FILE_RUN_ONCE_DEFAULT_PRIORITY = 0
+BOARD_FILE_RUN_ONCE_DEFAULT_PRIORITY = 10
+
 if log.VERBOSE >= log.VERBOSE_NORMAL:
     # Using level 1 allows sub-DEBUG levels of verbosity. The
     # west.log module decides whether or not to actually print the
@@ -96,6 +100,13 @@ class ImagesFlashed:
     flashed: int = 0
     total: int = 0
 
+@dataclass
+class SocBoardFilesProcessing:
+    filename: str
+    board: bool = False
+    priority: int = IGNORED_RUN_ONCE_PRIORITY
+    yaml: object = None
+
 def command_verb(command):
     return "flash" if command.name == "flash" else "debug"
 
@@ -178,6 +189,10 @@ def do_run_common(command, user_args, user_runner_args, domain_file=None):
     # images for a given board.
     board_image_count = defaultdict(ImagesFlashed)
 
+    highest_priority = IGNORED_RUN_ONCE_PRIORITY
+    highest_entry = None
+    check_files = []
+
     if user_args.context:
         dump_context(command, user_args, user_runner_args)
         return
@@ -223,48 +238,58 @@ def do_run_common(command, user_args, user_runner_args, domain_file=None):
             # Load board flash runner configuration (if it exists) and store
             # single-use commands in a dictionary so that they get executed
             # once per unique board name.
-            if cache['BOARD_DIR'] not in processed_boards and 'SOC_FULL_DIR' in cache:
-                soc_yaml_file = Path(cache['SOC_FULL_DIR']) / 'soc.yml'
-                board_yaml_file = Path(cache['BOARD_DIR']) / 'board.yml'
-                group_type = 'boards'
-
-                # Search for flash runner configuration, board takes priority over SoC
-                try:
-                    with open(board_yaml_file, 'r') as f:
-                        data_yaml = yaml.safe_load(f.read())
-
-                except FileNotFoundError:
-                    continue
-
-                if 'runners' not in data_yaml:
-                    # Check SoC file
-                    group_type = 'qualifiers'
-                    try:
-                        with open(soc_yaml_file, 'r') as f:
-                            data_yaml = yaml.safe_load(f.read())
-
-                    except FileNotFoundError:
+            for directory in cache.get_list('SOC_DIRECTORIES'):
+                if directory not in processed_boards:
+                    check_files.append(SocBoardFilesProcessing(Path(directory) / 'soc.yml'))
+                    processed_boards.add(directory)
+
+            for directory in cache.get_list('BOARD_DIRECTORIES'):
+                if directory not in processed_boards:
+                    check_files.append(SocBoardFilesProcessing(Path(directory) / 'board.yml', True))
+                    processed_boards.add(directory)
+
+        for check in check_files:
+            try:
+                with open(check.filename, 'r') as f:
+                    check.yaml = yaml.safe_load(f.read())
+
+                    if 'runners' not in check.yaml:
+                        continue
+                    elif check.board is False and 'run_once' not in check.yaml['runners']:
                         continue
 
-                processed_boards.add(cache['BOARD_DIR'])
-
-                if 'runners' not in data_yaml or 'run_once' not in data_yaml['runners']:
-                    continue
-
-                for cmd in data_yaml['runners']['run_once']:
-                    for data in data_yaml['runners']['run_once'][cmd]:
-                        for group in data['groups']:
-                            run_first = bool(data['run'] == 'first')
-                            if group_type == 'qualifiers':
-                                targets = []
-                                for target in group[group_type]:
-                                    # For SoC-based qualifiers, prepend to the beginning of the
-                                    # match to allow for matching any board name
-                                    targets.append('([^/]+)/' + target)
-                            else:
-                                targets = group[group_type]
-
-                            used_cmds.append(UsedFlashCommand(cmd, targets, data['runners'], run_first))
+                    if 'priority' in check.yaml['runners']:
+                        check.priority = check.yaml['runners']['priority']
+                    else:
+                        check.priority = BOARD_FILE_RUN_ONCE_DEFAULT_PRIORITY if check.board is True else SOC_FILE_RUN_ONCE_DEFAULT_PRIORITY
+
+                    if check.priority == highest_priority:
+                        log.die("Duplicate flash run once configuration found with equal priorities")
+
+                    elif check.priority > highest_priority:
+                        highest_priority = check.priority
+                        highest_entry = check
+
+            except FileNotFoundError:
+                continue
+
+        if highest_entry is not None:
+            group_type = 'boards' if highest_entry.board is True else 'qualifiers'
+
+            for cmd in highest_entry.yaml['runners']['run_once']:
+                for data in highest_entry.yaml['runners']['run_once'][cmd]:
+                    for group in data['groups']:
+                        run_first = bool(data['run'] == 'first')
+                        if group_type == 'qualifiers':
+                            targets = []
+                            for target in group[group_type]:
+                                # For SoC-based qualifiers, prepend to the beginning of the
+                                # match to allow for matching any board name
+                                targets.append('([^/]+)/' + target)
+                        else:
+                            targets = group[group_type]
+
+                        used_cmds.append(UsedFlashCommand(cmd, targets, data['runners'], run_first))
 
     # Reduce entries to only those having matching board names (either exact or with regex) and
     # remove any entries with empty board lists

From b8b1c0b0b69de4df9ab2ee7c62bc80eebd0218f9 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Mon, 8 Jul 2024 13:25:12 +0100
Subject: [PATCH 0013/2913] [nrf fromlist] scripts: list_hardware: Do not check
 qualifiers for run once config

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/72857

Removes validating the qualifiers for flash run once configuration
as files may be present that contain information for qualifiers
that are not present in a single repository but are spaced out in
other repositories, or might be optional

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit b72acf47e550090878fa87145c9766504c3deb13)
(cherry picked from commit 973e62f1dfecd551b0057cd0c723e76ed0401c7a)
(cherry picked from commit 4f0db947f2dcf1782a2f55e8baa8c696fe5cbad8)
---
 scripts/list_hardware.py | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/scripts/list_hardware.py b/scripts/list_hardware.py
index 2ea2ed9f0c5..2485985f4b4 100755
--- a/scripts/list_hardware.py
+++ b/scripts/list_hardware.py
@@ -100,25 +100,13 @@ def __init__(self, folder='', soc_yaml=None):
                 for item_data in data['runners']['run_once'][grp]:
                     for group in item_data['groups']:
                         for qualifiers in group['qualifiers']:
-                            soc_name, *components = qualifiers.split('/')
+                            soc_name = qualifiers.split('/')[0]
                             found_match = False
 
-                            # Allow 'ns' as final qualifier until "virtual" CPUs are ported to soc.yml
-                            # https://github.com/zephyrproject-rtos/zephyr/issues/70721
-                            if components and components[-1] == 'ns':
-                                components.pop()
-
                             for soc in self._socs + self._extended_socs:
                                 if re.match(fr'^{soc_name}$', soc.name) is not None:
-                                    if soc.cpuclusters and components:
-                                        check_string = '/'.join(components)
-                                        for cpucluster in soc.cpuclusters:
-                                            if re.match(fr'^{check_string}$', cpucluster) is not None:
-                                                found_match = True
-                                                break
-                                    elif not soc.cpuclusters and not components:
-                                        found_match = True
-                                        break
+                                    found_match = True
+                                    break
 
                             if found_match is False:
                                 sys.exit(f'ERROR: SoC qualifier match unresolved: {qualifiers}')

From 4cd36a95bc22a77be0459eb39a9d725953fd6a57 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Fri, 7 Jun 2024 11:55:31 +0200
Subject: [PATCH 0014/2913] [nrf fromlist] scripts: gen_dts_cmake: Support
 variable target name in dts.cmake

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/73903

Instead of hardcoding the name `devicetree_target`, we can update the
generated `dts.cmake` to accept `DEVICETREE_TARGET` as input variable.
This will become useful in multi-image builds, where we would like to
process multiple devicetrees.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit cd187c719ae9162a2ab6bd6aeff511a4cc684bdc)
(cherry picked from commit 6f728ca34637b267033e82d94284b1c493c46bc1)
(cherry picked from commit 48909b10a018da4bf7a01010f5d5e12bc42ad17e)
---
 cmake/modules/dts.cmake      |  2 ++
 scripts/dts/gen_dts_cmake.py | 21 ++++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/cmake/modules/dts.cmake b/cmake/modules/dts.cmake
index 22631ceecbd..82c5a302fbc 100644
--- a/cmake/modules/dts.cmake
+++ b/cmake/modules/dts.cmake
@@ -117,6 +117,8 @@ set(GEN_DTS_CMAKE_SCRIPT        ${DT_SCRIPTS}/gen_dts_cmake.py)
 # The generated information itself, which we include() after
 # creating it.
 set(DTS_CMAKE                   ${PROJECT_BINARY_DIR}/dts.cmake)
+# The CMake target to be initialized by including ${DTS_CMAKE}.
+set(DEVICETREE_TARGET           devicetree_target)
 
 # The location of a file containing known vendor prefixes, relative to
 # each element of DTS_ROOT. Users can define their own in their own
diff --git a/scripts/dts/gen_dts_cmake.py b/scripts/dts/gen_dts_cmake.py
index 6fa4a347880..653910cbf8d 100755
--- a/scripts/dts/gen_dts_cmake.py
+++ b/scripts/dts/gen_dts_cmake.py
@@ -11,12 +11,13 @@
 
 The generated CMake file looks like this:
 
-  add_custom_target(devicetree_target)
-  set_target_properties(devicetree_target PROPERTIES
+  add_custom_target(${DEVICETREE_TARGET})
+  set_target_properties(${DEVICETREE_TARGET} PROPERTIES
                         "DT_PROP|/soc|compatible" "vnd,soc;")
   ...
 
-It defines a special CMake target, and saves various values in the
+It takes an input variable - DEVICETREE_TARGET - and creates a special
+CMake target with this name, which will contain various values in the
 devicetree as CMake target properties.
 
 Be careful:
@@ -154,15 +155,13 @@ def main():
         cmake_comp = f'DT_COMP|{comp}'
         cmake_props.append(f'"{cmake_comp}" "{cmake_path}"')
 
+    cmake_props = map(
+        'set_target_properties(${{DEVICETREE_TARGET}} PROPERTIES {})'.format,
+        cmake_props
+    )
     with open(args.cmake_out, "w", encoding="utf-8") as cmake_file:
-        print('add_custom_target(devicetree_target)', file=cmake_file)
-        print(file=cmake_file)
-
-        for prop in cmake_props:
-            print(
-                f'set_target_properties(devicetree_target PROPERTIES {prop})',
-                file=cmake_file
-            )
+        print('add_custom_target(${DEVICETREE_TARGET})\n', *cmake_props,
+              sep='\n', file=cmake_file)
 
 
 if __name__ == "__main__":

From 38fdd95d663c18f37719d92671cb02d539d06313 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Fri, 7 Jun 2024 11:55:31 +0200
Subject: [PATCH 0015/2913] [nrf fromlist] sysbuild: dts: Introduce
 sysbuild_dt_* API

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/73903

Add new functions to `sysbuild_extensions.cmake`, which will mirror the
familiar dt_* API from Zephyr `extensions.cmake`. For example:

   dt_nodelabel(<var> NODELABEL <label>)

gets the following sysbuild counterpart, with one extra argument:

   sysbuild_dt_nodelabel(<var> IMAGE <image> NODELABEL <label>)

This API allows sysbuild to retrieve devicetree information for a given
<image>, only after its respective `ExternalZephyrProject_Cmake()` call.

This works by importing the generated `dts.cmake` files from each
image's build directory, and creating multiple CMake targets to hold the
generated properties - much like how the `CMakeCache.txt` and `.config`
are also imported to be used by the related `sysbuild_get()` function.

The dt_* API itself also has to be updated, in order to read properties
from a variable `DEVICETREE_TARGET` set in the parent scope.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 3bf9a41a20ae52adc3ccadc2ff79425160f8ad73)
(cherry picked from commit 46d86b49a5fa7a94551e460e133abd2918c34dac)
(cherry picked from commit c58279cffd0690bf0713354c4659c34f6bb8c8b4)
---
 cmake/modules/extensions.cmake                | 71 +++++++++++++---
 .../cmake/modules/sysbuild_extensions.cmake   | 85 +++++++++++++++++++
 2 files changed, 144 insertions(+), 12 deletions(-)

diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index 4d8422a3ced..b9812d84379 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -3611,6 +3611,9 @@ endfunction()
 #   alias at the beginning of a path interchangeably with the full
 #   path to the aliased node in these functions. The usage comments
 #   will make this clear in each case.
+#
+# - Each of these methods also has a sysbuild_dt_* counterpart.
+#   See share/sysbuild/cmake/modules/sysbuild_extensions.cmake.
 
 # Usage:
 #   dt_nodelabel(<var> NODELABEL <label>)
@@ -3638,6 +3641,10 @@ endfunction()
 # NODELABEL <label>  : Node label
 # REQUIRED           : Generate a fatal error if the node-label is not found
 function(dt_nodelabel var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_nodelabel(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(options "REQUIRED")
   set(req_single_args "NODELABEL")
   cmake_parse_arguments(DT_LABEL "${options}" "${req_single_args}" "" ${ARGN})
@@ -3654,7 +3661,7 @@ function(dt_nodelabel var)
     endif()
   endforeach()
 
-  get_target_property(${var} devicetree_target "DT_NODELABEL|${DT_LABEL_NODELABEL}")
+  get_target_property(${var} "${DEVICETREE_TARGET}" "DT_NODELABEL|${DT_LABEL_NODELABEL}")
   if(${${var}} STREQUAL ${var}-NOTFOUND)
     if(DT_LABEL_REQUIRED)
       message(FATAL_ERROR "required nodelabel not found: ${DT_LABEL_NODELABEL}")
@@ -3686,6 +3693,10 @@ endfunction()
 # PROPERTY <prop> : The alias to check
 # REQUIRED        : Generate a fatal error if the alias is not found
 function(dt_alias var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_alias(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(options "REQUIRED")
   set(req_single_args "PROPERTY")
   cmake_parse_arguments(DT_ALIAS "${options}" "${req_single_args}" "" ${ARGN})
@@ -3702,7 +3713,7 @@ function(dt_alias var)
     endif()
   endforeach()
 
-  get_target_property(${var} devicetree_target "DT_ALIAS|${DT_ALIAS_PROPERTY}")
+  get_target_property(${var} "${DEVICETREE_TARGET}" "DT_ALIAS|${DT_ALIAS_PROPERTY}")
   if(${${var}} STREQUAL ${var}-NOTFOUND)
     if(DT_ALIAS_REQUIRED)
       message(FATAL_ERROR "required alias not found: ${DT_ALIAS_PROPERTY}")
@@ -3730,6 +3741,10 @@ endfunction()
 # <var>       : Return variable where the check result will be returned
 # PATH <path> : Node path
 function(dt_node_exists var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_node_exists(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PATH")
   cmake_parse_arguments(DT_NODE "" "${req_single_args}" "" ${ARGN})
 
@@ -3775,6 +3790,10 @@ endfunction()
 # PATH <path>     : Node path
 # STATUS <status> : Status to check
 function(dt_node_has_status var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_node_has_status(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PATH;STATUS")
   cmake_parse_arguments(DT_NODE "" "${req_single_args}" "" ${ARGN})
 
@@ -3861,6 +3880,10 @@ endfunction()
 # INDEX <idx>    : Optional index when retrieving a value in an array property
 # REQUIRED       : Generate a fatal error if the property is not found
 function(dt_prop var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_prop(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(options "REQUIRED")
   set(req_single_args "PATH;PROPERTY")
   set(single_args "INDEX")
@@ -3879,7 +3902,7 @@ function(dt_prop var)
   endforeach()
 
   dt_path_internal(canonical "${DT_PROP_PATH}")
-  get_property(exists TARGET devicetree_target
+  get_property(exists TARGET "${DEVICETREE_TARGET}"
       PROPERTY "DT_PROP|${canonical}|${DT_PROP_PROPERTY}"
       SET
   )
@@ -3892,7 +3915,7 @@ function(dt_prop var)
     return()
   endif()
 
-  get_target_property(val devicetree_target
+  get_target_property(val "${DEVICETREE_TARGET}"
       "DT_PROP|${canonical}|${DT_PROP_PROPERTY}"
   )
 
@@ -3921,6 +3944,10 @@ endfunction()
 # INDEX <idx>            : Optional index when retrieving a value in an array property
 
 function(dt_comp_path var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_comp_path(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "COMPATIBLE")
   set(single_args "INDEX")
   cmake_parse_arguments(DT_COMP "" "${req_single_args};${single_args}" "" ${ARGN})
@@ -3937,7 +3964,7 @@ function(dt_comp_path var)
     endif()
   endforeach()
 
-  get_property(exists TARGET devicetree_target
+  get_property(exists TARGET "${DEVICETREE_TARGET}"
       PROPERTY "DT_COMP|${DT_COMP_COMPATIBLE}"
       SET
   )
@@ -3947,7 +3974,7 @@ function(dt_comp_path var)
     return()
   endif()
 
-  get_target_property(val devicetree_target
+  get_target_property(val "${DEVICETREE_TARGET}"
       "DT_COMP|${DT_COMP_COMPATIBLE}"
   )
 
@@ -3976,6 +4003,10 @@ endfunction()
 # <var>          : Return variable where the property value will be stored
 # PATH <path>    : Node path
 function(dt_num_regs var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_num_regs(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PATH")
   cmake_parse_arguments(DT_REG "" "${req_single_args}" "" ${ARGN})
 
@@ -3992,7 +4023,7 @@ function(dt_num_regs var)
   endforeach()
 
   dt_path_internal(canonical "${DT_REG_PATH}")
-  get_target_property(${var} devicetree_target "DT_REG|${canonical}|NUM")
+  get_target_property(${var} "${DEVICETREE_TARGET}" "DT_REG|${canonical}|NUM")
 
   set(${var} ${${var}} PARENT_SCOPE)
 endfunction()
@@ -4022,6 +4053,10 @@ endfunction()
 # INDEX <idx>    : Register block index number
 # NAME <name>    : Register block name
 function(dt_reg_addr var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_reg_addr(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PATH")
   set(single_args "INDEX;NAME")
   cmake_parse_arguments(DT_REG "" "${req_single_args};${single_args}" "" ${ARGN})
@@ -4051,7 +4086,7 @@ function(dt_reg_addr var)
   endif()
 
   dt_path_internal(canonical "${DT_REG_PATH}")
-  get_target_property(${var}_list devicetree_target "DT_REG|${canonical}|ADDR")
+  get_target_property(${var}_list "${DEVICETREE_TARGET}" "DT_REG|${canonical}|ADDR")
 
   list(GET ${var}_list ${DT_REG_INDEX} ${var})
 
@@ -4082,6 +4117,10 @@ endfunction()
 # INDEX <idx>    : Register block index number
 # NAME <name>    : Register block name
 function(dt_reg_size var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_reg_size(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PATH")
   set(single_args "INDEX;NAME")
   cmake_parse_arguments(DT_REG "" "${req_single_args};${single_args}" "" ${ARGN})
@@ -4111,7 +4150,7 @@ function(dt_reg_size var)
   endif()
 
   dt_path_internal(canonical "${DT_REG_PATH}")
-  get_target_property(${var}_list devicetree_target "DT_REG|${canonical}|SIZE")
+  get_target_property(${var}_list "${DEVICETREE_TARGET}" "DT_REG|${canonical}|SIZE")
 
   list(GET ${var}_list ${DT_REG_INDEX} ${var})
 
@@ -4159,6 +4198,10 @@ endfunction()
 # <var>           : Return variable
 # PROPERTY <prop> : Chosen property
 function(dt_has_chosen var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_has_chosen(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PROPERTY")
   cmake_parse_arguments(DT_CHOSEN "" "${req_single_args}" "" ${ARGN})
 
@@ -4174,7 +4217,7 @@ function(dt_has_chosen var)
     endif()
   endforeach()
 
-  get_target_property(exists devicetree_target "DT_CHOSEN|${DT_CHOSEN_PROPERTY}")
+  get_target_property(exists "${DEVICETREE_TARGET}" "DT_CHOSEN|${DT_CHOSEN_PROPERTY}")
 
   if(${exists} STREQUAL exists-NOTFOUND)
     set(${var} FALSE PARENT_SCOPE)
@@ -4194,6 +4237,10 @@ endfunction()
 # <var>           : Return variable where the node path will be stored
 # PROPERTY <prop> : Chosen property
 function(dt_chosen var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_chosen(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PROPERTY")
   cmake_parse_arguments(DT_CHOSEN "" "${req_single_args}" "" ${ARGN})
 
@@ -4209,7 +4256,7 @@ function(dt_chosen var)
     endif()
   endforeach()
 
-  get_target_property(${var} devicetree_target "DT_CHOSEN|${DT_CHOSEN_PROPERTY}")
+  get_target_property(${var} "${DEVICETREE_TARGET}" "DT_CHOSEN|${DT_CHOSEN_PROPERTY}")
 
   if(${${var}} STREQUAL ${var}-NOTFOUND)
     set(${var} PARENT_SCOPE)
@@ -4281,7 +4328,7 @@ endfunction()
 # to an existing node. Set it to FALSE otherwise. See
 # dt_path_internal for a definition and examples of 'canonical' paths.
 function(dt_path_internal_exists var path)
-  get_target_property(path_prop devicetree_target "DT_NODE|${path}")
+  get_target_property(path_prop "${DEVICETREE_TARGET}" "DT_NODE|${path}")
   if (path_prop)
     set(${var} TRUE PARENT_SCOPE)
   else()
diff --git a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
index c1b2513d192..0853535a911 100644
--- a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
+++ b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
@@ -503,6 +503,8 @@ function(ExternalZephyrProject_Cmake)
   endif()
   load_cache(IMAGE ${ZCMAKE_APPLICATION} BINARY_DIR ${BINARY_DIR})
   import_kconfig(CONFIG_ ${BINARY_DIR}/zephyr/.config TARGET ${ZCMAKE_APPLICATION})
+  set(DEVICETREE_TARGET ${ZCMAKE_APPLICATION}_devicetree_target)
+  include(${BINARY_DIR}/zephyr/dts.cmake)
 
   # This custom target informs CMake how the BYPRODUCTS are generated if a target
   # depends directly on the BYPRODUCT instead of depending on the image target.
@@ -750,3 +752,86 @@ function(sysbuild_images_order variable dependency_type)
   topological_sort(TARGETS ${SIS_IMAGES} PROPERTY_NAME ${property_name} RESULT sorted)
   set(${variable} ${sorted} PARENT_SCOPE)
 endfunction()
+
+# Internal macro for defining the sysbuild_dt_* CMake extensions, used to
+# retrieve devicetree information from a Zephyr based build system.
+#
+# It takes a dt_* function <name> and adds common wrapper code, which
+# adds an `IMAGE` argument to select the devicetree of a given <image>,
+# and forwards all other arguments to the original function, including
+# the sole return variable <var> - a common trait of the dt_* API.
+#
+# For additional documentation of each dt_* CMake extension,
+# see section 4.1. of cmake/modules/extensions.cmake.
+#
+macro(sysbuild_dt_function name)
+  function(sysbuild_${name} var)
+    cmake_parse_arguments(PARSE_ARGV 1 SBDT "" "IMAGE" "")
+    zephyr_check_arguments_required_all("sysbuild_${name}" SBDT IMAGE)
+
+    set(DEVICETREE_TARGET ${SBDT_IMAGE}_devicetree_target)
+    if(NOT TARGET ${SBDT_IMAGE} OR NOT TARGET ${DEVICETREE_TARGET})
+      message(FATAL_ERROR "sysbuild_${name}(...) image '${SBDT_IMAGE}' "
+                          "does not exist or its devicetree is not loaded yet"
+      )
+    endif()
+
+    cmake_language(CALL ${name} ${var} ${SBDT_UNPARSED_ARGUMENTS})
+    set(${var} "${${var}}" PARENT_SCOPE)
+  endfunction()
+endmacro()
+
+# Usage:
+#   sysbuild_dt_nodelabel(<var> IMAGE <image> NODELABEL <label>)
+#
+sysbuild_dt_function(dt_nodelabel)
+
+# Usage:
+#   sysbuild_dt_alias(<var> IMAGE <image> PROPERTY <prop>)
+#
+sysbuild_dt_function(dt_alias)
+
+# Usage:
+#   sysbuild_dt_node_exists(<var> IMAGE <image> PATH <path>)
+#
+sysbuild_dt_function(dt_node_exists)
+
+# Usage:
+#   sysbuild_dt_node_has_status(<var> IMAGE <image> PATH <path> STATUS <status>)
+#
+sysbuild_dt_function(dt_node_has_status)
+
+# Usage:
+#   sysbuild_dt_prop(<var> IMAGE <image> PATH <path> PROPERTY <prop> [INDEX <idx>])
+#
+sysbuild_dt_function(dt_prop)
+
+# Usage:
+#   sysbuild_dt_comp_path(<var> IMAGE <image> COMPATIBLE <compatible> [INDEX <idx>])
+#
+sysbuild_dt_function(dt_comp_path)
+
+# Usage:
+#   sysbuild_dt_num_regs(<var> IMAGE <image> PATH <path>)
+#
+sysbuild_dt_function(dt_num_regs)
+
+# Usage:
+#   sysbuild_dt_reg_addr(<var> IMAGE <image> PATH <path> [INDEX <idx>] [NAME <name>])
+#
+sysbuild_dt_function(dt_reg_addr)
+
+# Usage:
+#   sysbuild_dt_reg_size(<var> IMAGE <image> PATH <path> [INDEX <idx>] [NAME <name>])
+#
+sysbuild_dt_function(dt_reg_size)
+
+# Usage:
+#   sysbuild_dt_has_chosen(<var> IMAGE <image> PROPERTY <prop>)
+#
+sysbuild_dt_function(dt_has_chosen)
+
+# Usage:
+#   sysbuild_dt_chosen(<var> IMAGE <image> PROPERTY <prop>)
+#
+sysbuild_dt_function(dt_chosen)

From 2b3736860fc0bf8c38033bfe836f503cc0cc1298 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Thu, 18 Jul 2024 15:08:35 +0200
Subject: [PATCH 0016/2913] [nrf fromlist] scripts: list_boards: Reintroduce
 Board.dir as @property

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/72857

In the `Board` class, the `dir` member was renamed to `directories`,
both to indicate that it is now a list (in HWMv2 with board extensions)
and to reflect the addition of the `BOARD_DIRECTORIES` CMake variable.
Considering that the build system also keeps the `BOARD_DIR` variable,
and for the sake of backwards compatibility and brevity, it should be
useful to retain `Board.dir` in Python as well, symmetrically.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 25fd4b16e8c488792d0d8450e1b822292f94d3c3)
(cherry picked from commit 423ed8024505838c9c0595a8cb837e9177ba3942)
(cherry picked from commit 4175a49c8db0f3a9b119ebc3f7526428741861ee)
---
 scripts/list_boards.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/list_boards.py b/scripts/list_boards.py
index 23859e00cce..c2b8e3740b3 100755
--- a/scripts/list_boards.py
+++ b/scripts/list_boards.py
@@ -103,6 +103,13 @@ class Board:
     socs: List[Soc] = field(default_factory=list, compare=False)
     variants: List[str] = field(default_factory=list, compare=False)
 
+    @property
+    def dir(self):
+        # Get the main board directory.
+        if isinstance(self.directories, Path):
+            return self.directories
+        return self.directories[0]
+
     def from_qualifier(self, qualifiers):
         qualifiers_list = qualifiers.split('/')
 

From 94e326f29d8f1e71dcbce75d104da799ccbec4fd Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Wed, 26 Jun 2024 16:39:35 +0200
Subject: [PATCH 0017/2913] [nrf fromlist] test: drivers: pwm: add fast PWM

Add fast PWM instance for the nRF54H20 device.

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/75047

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit aaf38798ceb7b5d5bf786f1548e16e412c139bb1)
(cherry picked from commit 577412d54db26619fd124935f29a8f72bf573814)
---
 .../nrf54h20dk_nrf54h20_cpuapp_fast.overlay   | 21 +++++++++++++++++++
 tests/drivers/pwm/pwm_api/testcase.yaml       |  4 ++++
 2 files changed, 25 insertions(+)
 create mode 100644 tests/drivers/pwm/pwm_api/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay

diff --git a/tests/drivers/pwm/pwm_api/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/drivers/pwm/pwm_api/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
new file mode 100644
index 00000000000..c4e2cb8c38b
--- /dev/null
+++ b/tests/drivers/pwm/pwm_api/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
@@ -0,0 +1,21 @@
+&pinctrl {
+	pwm_default: pwm_default {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 7, 0)>;
+		};
+	};
+	pwm_sleep: pwm_sleep {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 7, 0)>;
+			low-power-enable;
+		};
+	};
+};
+
+&pwm120 {
+	status = "okay";
+	pinctrl-0 = <&pwm_default>;
+	pinctrl-1 = <&pwm_sleep>;
+	pinctrl-names = "default", "sleep";
+	memory-regions = <&dma_fast_region>;
+};
diff --git a/tests/drivers/pwm/pwm_api/testcase.yaml b/tests/drivers/pwm/pwm_api/testcase.yaml
index c9f3ac62e39..b30458cc970 100644
--- a/tests/drivers/pwm/pwm_api/testcase.yaml
+++ b/tests/drivers/pwm/pwm_api/testcase.yaml
@@ -21,3 +21,7 @@ tests:
       or dt_alias_exists("pwm-3")) and CONFIG_DT_HAS_NXP_FLEXIO_ENABLED and
       CONFIG_DT_HAS_NXP_FLEXIO_PWM_ENABLED
     depends_on: pwm
+  drivers.pwm.pwm_fast:
+    extra_args: DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp

From d25622a3428c4e8971e7046a2864690fae25668b Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 16 May 2024 10:26:05 +0200
Subject: [PATCH 0018/2913] [nrf fromlist] tests: kernel: timer: Fix failing
 tests

This commit provides an additional threshold value for comparison when
a custom k_busy_wait() implementation is chosen.

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/73068

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 764fbbeffcef7efa5e83de79446560b045b17307)
(cherry picked from commit 719790eabcdb2f49d505fad296c504395630de35)
---
 tests/kernel/timer/timer_api/src/main.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/tests/kernel/timer/timer_api/src/main.c b/tests/kernel/timer/timer_api/src/main.c
index b996baa72e3..90ef86a2986 100644
--- a/tests/kernel/timer/timer_api/src/main.c
+++ b/tests/kernel/timer/timer_api/src/main.c
@@ -28,15 +28,22 @@ struct timer_data {
  */
 #define INEXACT_MS_CONVERT ((CONFIG_SYS_CLOCK_TICKS_PER_SEC % MSEC_PER_SEC) != 0)
 
-#if CONFIG_NRF_RTC_TIMER
-/* On Nordic SOCs one or both of the tick and busy-wait clocks may
- * derive from sources that have slews that sum to +/- 13%.
+#if CONFIG_ARCH_HAS_CUSTOM_BUSY_WAIT && CONFIG_NRF_RTC_TIMER
+/* On Nordic SOCs using RTC_TIMER as the system timer and custom k_busy_wait() implementation,
+ * one or both of the tick and busy-wait clocks may derive from sources that have slews that
+ * sum to +/- 13%.
  */
 #define BUSY_TICK_SLEW_PPM 130000U
+#elif CONFIG_ARCH_HAS_CUSTOM_BUSY_WAIT && CONFIG_NRF_GRTC_TIMER
+/* On Nordic SOCs using GRTC_TIMER as the system timer and custom k_busy_wait() implementation,
+ * one or both of the tick and busy-wait clocks may derive from sources that have slews that
+ * sum to +/- 2%.
+ */
+#define BUSY_TICK_SLEW_PPM 20000U
 #else
-/* On other platforms assume the clocks are perfectly aligned. */
+/* In other cases assume the clocks are perfectly aligned. */
 #define BUSY_TICK_SLEW_PPM 0U
-#endif
+#endif /* CONFIG_ARCH_HAS_CUSTOM_BUSY_WAIT && CONFIG_NRF_RTC_TIMER */
 #define PPM_DIVISOR 1000000U
 
 /* If the tick clock is faster or slower than the busywait clock the

From a48638a5ef26936ed3f58ca6678ea929d1710eaa Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 28 May 2024 11:54:29 +0200
Subject: [PATCH 0019/2913] [nrf fromlist] tests: kernel: timer: Exclude
 nRF54H20 PPR core

The nRF54H20 PPR target has not enough memory to run some of
kernel/timer tests.

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/73068

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 1a9fb7fae0960e8db4d849e0da0f9f9c35e10d85)
(cherry picked from commit 7b0a64dc86667e343df4508ba23a28b8faa328b3)
---
 tests/kernel/timer/timer_api/Kconfig            | 3 +++
 tests/kernel/timer/timer_behavior/testcase.yaml | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/tests/kernel/timer/timer_api/Kconfig b/tests/kernel/timer/timer_api/Kconfig
index 9a0bfb8c74d..7854b2cacd7 100644
--- a/tests/kernel/timer/timer_api/Kconfig
+++ b/tests/kernel/timer/timer_api/Kconfig
@@ -4,4 +4,7 @@
 config SYS_CLOCK_TICKS_PER_SEC
 	default 16384 if NRF_RTC_TIMER && TICKLESS_KERNEL
 
+config ASSERT_VERBOSE
+	default n if SOC_NRF54H20_CPUPPR
+
 source "Kconfig.zephyr"
diff --git a/tests/kernel/timer/timer_behavior/testcase.yaml b/tests/kernel/timer/timer_behavior/testcase.yaml
index 7e1b725ffba..40fcde82256 100644
--- a/tests/kernel/timer/timer_behavior/testcase.yaml
+++ b/tests/kernel/timer/timer_behavior/testcase.yaml
@@ -8,6 +8,8 @@ tests:
       - mcu
     simulation_exclude:
       - renode
+    platform_exclude:
+      - nrf54h20dk/nrf54h20/cpuppr
     harness_config:
       record:
         regex: "RECORD:(?P<metrics>.*)"

From 6bbdba51b3814205de6492d2de61cfba21b805b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 12 Sep 2024 12:54:10 +0200
Subject: [PATCH 0020/2913] [nrf fromlist] logging: frontend: stmesp_demux:
 Improve robustness
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Demultiplexer was not ready to handle case when log message was
incomplete which was followed by other log messages. Such scenario
could occur if there was a fault that happen during logging of
a message. In that case incomplete message was followed by valid
messages (fault report) and this fault report was not handled
because processing was blocked waiting for completion of a
message which preceeded fault report.

Since it is expected that some messages may be incomplete a
garbage collection mechanism is added. When start of a message is
received timestamp is logged and list of incomplete messages
is checked for 'old' messages which persist in incomplete state
for long. When message timeouts it is closed and marked as
invalid. It unblocks processing of following messages.

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/78333

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 83c0629239da7e01d62fc96552d20922475458cf)
(cherry picked from commit bcc34873a7992e3f4458aa40eaecd3bbdeabcef4)
---
 subsys/logging/frontends/Kconfig              |  6 ++++
 .../frontends/log_frontend_stmesp_demux.c     | 35 ++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/subsys/logging/frontends/Kconfig b/subsys/logging/frontends/Kconfig
index e5c3870b1b6..9d4b7a43797 100644
--- a/subsys/logging/frontends/Kconfig
+++ b/subsys/logging/frontends/Kconfig
@@ -95,6 +95,12 @@ config LOG_FRONTEND_STMESP_DEMUX_BUFFER_SIZE
 config LOG_FRONTEND_STMESP_DEMUX_MAX_UTILIZATION
 	bool "Track maximum utilization"
 
+config LOG_FRONTEND_STMESP_DEMUX_GC_TIMEOUT
+	int "Message timeout (in milliseconds)"
+	default 100
+	help
+	  If log message is not completed within that time frame it is discarded.
+
 endif # LOG_FRONTEND_STMESP_DEMUX
 
 config LOG_FRONTEND_STMESP_FLUSH_PORT_ID
diff --git a/subsys/logging/frontends/log_frontend_stmesp_demux.c b/subsys/logging/frontends/log_frontend_stmesp_demux.c
index ed09f89ec8e..a3c052eab25 100644
--- a/subsys/logging/frontends/log_frontend_stmesp_demux.c
+++ b/subsys/logging/frontends/log_frontend_stmesp_demux.c
@@ -25,6 +25,7 @@ BUILD_ASSERT(sizeof(struct log_frontend_stmesp_demux_log_header) == sizeof(uint3
 struct log_frontend_stmesp_demux_active_entry {
 	sys_snode_t node;
 	uint32_t m_ch;
+	uint32_t ts;
 	struct log_frontend_stmesp_demux_log *packet;
 	int off;
 };
@@ -221,6 +222,36 @@ static void log_frontend_stmesp_demux_hw_event(uint64_t *ts, uint8_t data)
 	mpsc_pbuf_put_data(&demux.pbuf, (const uint32_t *)&packet, wlen);
 }
 
+/* Check if there are any active messages which are not completed for a significant
+ * amount of time. It may indicate that part of message was lost (due to reset,
+ * fault in the core or fault on the bus). In that case message shall be closed as
+ * incomplete to not block processing of other messages.
+ */
+static void garbage_collector(uint32_t now)
+{
+	sys_snode_t *node;
+
+	SYS_SLIST_FOR_EACH_NODE(&demux.active_entries, node) {
+		struct log_frontend_stmesp_demux_active_entry *entry =
+			CONTAINER_OF(node, struct log_frontend_stmesp_demux_active_entry, node);
+
+		if ((now - entry->ts) > CONFIG_LOG_FRONTEND_STMESP_DEMUX_GC_TIMEOUT) {
+			union log_frontend_stmesp_demux_packet p = {.log = entry->packet};
+
+			sys_slist_find_and_remove(&demux.active_entries, node);
+			entry->packet->content_invalid = 1;
+			mpsc_pbuf_commit(&demux.pbuf, p.generic);
+			demux.dropped++;
+			k_mem_slab_free(&demux.mslab, entry);
+			/* After removing one we need to stop as removing disrupts
+			 * iterating over the list as current node is no longer in
+			 * the list.
+			 */
+			break;
+		}
+	}
+}
+
 int log_frontend_stmesp_demux_packet_start(uint32_t *data, uint64_t *ts)
 {
 	if (skip) {
@@ -265,9 +296,10 @@ int log_frontend_stmesp_demux_packet_start(uint32_t *data, uint64_t *ts)
 	union log_frontend_stmesp_demux_header hdr = {.raw = *data};
 	uint32_t pkt_len = hdr.log.total_len + offsetof(struct log_frontend_stmesp_demux_log, data);
 	uint32_t wlen = calc_wlen(pkt_len);
+	uint32_t now = k_uptime_get_32();
 
+	garbage_collector(now);
 	err = k_mem_slab_alloc(&demux.mslab, (void **)&entry, K_NO_WAIT);
-
 	if (err < 0) {
 		goto on_nomem;
 	}
@@ -288,6 +320,7 @@ int log_frontend_stmesp_demux_packet_start(uint32_t *data, uint64_t *ts)
 	}
 	entry->packet->hdr = hdr.log;
 	entry->packet->hdr.major = m;
+	entry->ts = now;
 	demux.curr = entry;
 	sys_slist_append(&demux.active_entries, &entry->node);
 

From 204142bb1f141852f0cbfce368a48dca4814e4d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 13 Sep 2024 11:13:18 +0200
Subject: [PATCH 0021/2913] [nrf fromlist] logging: frontends: stmesp: Run
 clang-format
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Apply clang-format formatting.

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/78332

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit a57182a15aa059adfc14202aa3e12e49b2bcd750)
(cherry picked from commit 0fa1a9c91d9a0f6ae8f3afdaf1c0ddca31388798)
---
 .../logging/frontends/log_frontend_stmesp.c   | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/subsys/logging/frontends/log_frontend_stmesp.c b/subsys/logging/frontends/log_frontend_stmesp.c
index 389f0f72aeb..e1d3a7a7e8b 100644
--- a/subsys/logging/frontends/log_frontend_stmesp.c
+++ b/subsys/logging/frontends/log_frontend_stmesp.c
@@ -26,15 +26,15 @@ BUILD_ASSERT(sizeof(void *) == sizeof(uint32_t));
 
 #define STMESP_FLUSH_WORD 0xaabbccdd
 
-#define STM_FLAG(reg) \
+#define STM_FLAG(reg)                                                                              \
 	stmesp_flag(reg, 1, false, IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_GUARANTEED_ACCESS))
 
-#define STM_D8(reg, data, timestamp, marked)       \
-	stmesp_data8(reg, data, timestamp, marked, \
+#define STM_D8(reg, data, timestamp, marked)                                                       \
+	stmesp_data8(reg, data, timestamp, marked,                                                 \
 		     IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_GUARANTEED_ACCESS))
 
-#define STM_D32(reg, data, timestamp, marked)       \
-	stmesp_data32(reg, data, timestamp, marked, \
+#define STM_D32(reg, data, timestamp, marked)                                                      \
+	stmesp_data32(reg, data, timestamp, marked,                                                \
 		      IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_GUARANTEED_ACCESS))
 
 /* Buffer for storing frontend data before STM/ETR is ready for usage.
@@ -95,7 +95,7 @@ union stm_log_dict_hdr {
 /* Dictionary header initializer. */
 #define DICT_HDR_INITIALIZER(_level, _source_id, _data_len)                                        \
 	{                                                                                          \
-		.hdr = {.ver = CONFIG_LOG_FRONTEND_STMESP_DICT_VER,                         \
+		.hdr = {.ver = CONFIG_LOG_FRONTEND_STMESP_DICT_VER,                                \
 			.type = STM_MSG_TYPE_LOG_DICT,                                             \
 			.level = _level,                                                           \
 			.data_len = _data_len,                                                     \
@@ -281,8 +281,8 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
 	size_t sname_len;
 	int package_len;
 	int total_len;
-	static const uint32_t flags = CBPRINTF_PACKAGE_CONVERT_RW_STR |
-				      CBPRINTF_PACKAGE_CONVERT_RO_STR;
+	static const uint32_t flags =
+		CBPRINTF_PACKAGE_CONVERT_RW_STR | CBPRINTF_PACKAGE_CONVERT_RO_STR;
 
 	sname = log_source_name_get(0, get_source_id(source));
 	if (sname) {
@@ -293,8 +293,8 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
 	}
 	total_len = desc.data_len + sname_len /* null terminator */;
 
-	package_len = cbprintf_package_convert(package, desc.package_len, NULL, NULL, flags,
-					       strl, ARRAY_SIZE(strl));
+	package_len = cbprintf_package_convert(package, desc.package_len, NULL, NULL, flags, strl,
+					       ARRAY_SIZE(strl));
 	hdr.log.total_len = total_len + package_len;
 	hdr.log.package_len = package_len;
 
@@ -308,8 +308,8 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
 		}
 
 		STM_D32(stm_esp, hdr.raw, use_timestamp, true);
-		(void)cbprintf_package_convert(package, desc.package_len,
-					       package_cb, stm_esp, flags, strl, ARRAY_SIZE(strl));
+		(void)cbprintf_package_convert(package, desc.package_len, package_cb, stm_esp,
+					       flags, strl, ARRAY_SIZE(strl));
 		write_data(sname, sname_len, stm_esp);
 		if (data) {
 			write_data(data, desc.data_len, stm_esp);
@@ -327,8 +327,8 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
 		}
 
 		early_buf_put_data((const uint8_t *)&hdr, sizeof(hdr));
-		(void)cbprintf_package_convert(package, desc.package_len, early_package_cb,
-					       NULL, flags, strl, ARRAY_SIZE(strl));
+		(void)cbprintf_package_convert(package, desc.package_len, early_package_cb, NULL,
+					       flags, strl, ARRAY_SIZE(strl));
 		early_buf_put_data(sname, sname_len);
 		if (data) {
 			early_buf_put_data(data, desc.data_len);
@@ -357,8 +357,8 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
 		}
 
 		STM_D32(stm_esp, dict_desc.raw, true, true);
-		(void)cbprintf_package_convert(package, desc.package_len, package_cb,
-					       stm_esp, flags, NULL, 0);
+		(void)cbprintf_package_convert(package, desc.package_len, package_cb, stm_esp,
+					       flags, NULL, 0);
 		if (data) {
 			package_cb(data, desc.data_len, stm_esp);
 		}
@@ -370,8 +370,8 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
 		key = k_spin_lock(&lock);
 		len_loc = early_buf_len_loc();
 		early_package_cb(&dict_desc.raw, sizeof(dict_desc.raw), NULL);
-		(void)cbprintf_package_convert(package, desc.package_len, early_package_cb,
-					       NULL, flags, NULL, 0);
+		(void)cbprintf_package_convert(package, desc.package_len, early_package_cb, NULL,
+					       flags, NULL, 0);
 		if (data) {
 			early_package_cb(data, desc.data_len, NULL);
 		}
@@ -383,8 +383,8 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
 /* Common function for optimized message (log with 0-2 arguments) which is used in
  * case when STMESP is not yet ready.
  */
-static inline uint32_t *early_msg_start(uint32_t level, const void *source,
-					uint32_t package_hdr, const char *fmt)
+static inline uint32_t *early_msg_start(uint32_t level, const void *source, uint32_t package_hdr,
+					const char *fmt)
 {
 	union stm_log_dict_hdr dict_desc = DICT_HDR_INITIALIZER(level, get_source_id(source), 0);
 	uint32_t fmt32 = (uint32_t)fmt;
@@ -398,8 +398,8 @@ static inline uint32_t *early_msg_start(uint32_t level, const void *source,
 }
 
 /* Common function for optimized message (log with 0-2 arguments) which writes to STMESP */
-static inline void msg_start(STMESP_Type *stm_esp, uint32_t level,
-			     const void *source, uint32_t package_hdr, const char *fmt)
+static inline void msg_start(STMESP_Type *stm_esp, uint32_t level, const void *source,
+			     uint32_t package_hdr, const char *fmt)
 
 {
 	union stm_log_dict_hdr dict_desc = DICT_HDR_INITIALIZER(level, get_source_id(source), 0);

From c0841625b8097006c1c4e5df32e3cb41abe60279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 12 Sep 2024 11:32:49 +0200
Subject: [PATCH 0022/2913] [nrf fromlist] logging: frontend_stmesp: Avoid
 unaligned word access
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

write_data function which was writing to STMESP data registers was
starting by writing words and tail was written using byte access.
However, RISCV core does not support unaligned access and on Cortex-M33
even if supported it is faster to do aligned access. Reworked
write_data to start first by writing data using byte or half word
access until data pointer is word aligned, then word access is used
and finally tail is written using byte or half word access.

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/78332

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 5534a9a5e039ca362cb8e6199964949124b0fabc)
(cherry picked from commit c05f0cd4facc61a1898048b6695e0d26d3fb384b)
---
 .../logging/frontends/log_frontend_stmesp.c   | 70 +++++++++++++++++--
 1 file changed, 64 insertions(+), 6 deletions(-)

diff --git a/subsys/logging/frontends/log_frontend_stmesp.c b/subsys/logging/frontends/log_frontend_stmesp.c
index e1d3a7a7e8b..4042fac853c 100644
--- a/subsys/logging/frontends/log_frontend_stmesp.c
+++ b/subsys/logging/frontends/log_frontend_stmesp.c
@@ -33,6 +33,10 @@ BUILD_ASSERT(sizeof(void *) == sizeof(uint32_t));
 	stmesp_data8(reg, data, timestamp, marked,                                                 \
 		     IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_GUARANTEED_ACCESS))
 
+#define STM_D16(reg, data, timestamp, marked)                                                      \
+	stmesp_data16(reg, data, timestamp, marked,                                                \
+		      IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_GUARANTEED_ACCESS))
+
 #define STM_D32(reg, data, timestamp, marked)                                                      \
 	stmesp_data32(reg, data, timestamp, marked,                                                \
 		      IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_GUARANTEED_ACCESS))
@@ -211,18 +215,72 @@ static int early_package_cb(const void *buf, size_t len, void *ctx)
 
 static inline void write_data(const void *data, size_t len, STMESP_Type *const stm_esp)
 {
-	uint32_t *p32 = (uint32_t *)data;
+	const uint8_t *p8 = data;
+	const uint32_t *p32;
+	uint32_t unaligned;
+
+	if (!len) {
+		return;
+	}
 
+	/* Start by writing using D8 or D16 until pointer is word aligned. */
+	unaligned = (uintptr_t)data & 0x00000003UL;
+	if (unaligned != 0) {
+		unaligned = 4 - unaligned;
+		unaligned = MIN(len, unaligned);
+
+		len -= unaligned;
+
+		switch (unaligned) {
+		case 3:
+			STM_D8(stm_esp, *p8++, false, false);
+			STM_D16(stm_esp, *(uint16_t *)p8, false, false);
+			p8 += sizeof(uint16_t);
+			break;
+		case 2:
+			if (len) {
+				STM_D16(stm_esp, *(uint16_t *)p8, false, false);
+				p8 += sizeof(uint16_t);
+			} else {
+				/* If len 0 then it means that even though 2 bytes are
+				 * to be copied we can have address which is not aligned
+				 * to 2 bytes.
+				 */
+				STM_D8(stm_esp, *p8++, false, false);
+				STM_D8(stm_esp, *p8++, false, false);
+			}
+			break;
+		default:
+			/* 1 byte to align. */
+			STM_D8(stm_esp, *p8++, false, false);
+		}
+	}
+
+	p32 = (const uint32_t *)p8;
+
+	/* Use D32 to write as much data as possible. */
 	while (len >= sizeof(uint32_t)) {
 		STM_D32(stm_esp, *p32++, false, false);
 		len -= sizeof(uint32_t);
 	}
 
-	uint8_t *p8 = (uint8_t *)p32;
-
-	while (len > 0) {
-		STM_D8(stm_esp, *p8++, false, false);
-		len--;
+	/* Write tail using D16 or D8. Address is word aligned at that point. */
+	if (len) {
+		p8 = (const uint8_t *)p32;
+		switch (len) {
+		case 2:
+			STM_D16(stm_esp, *(uint16_t *)p8, false, false);
+			p8 += sizeof(uint16_t);
+			break;
+		case 3:
+			STM_D16(stm_esp, *(uint16_t *)p8, false, false);
+			p8 += sizeof(uint16_t);
+			/* fallthrough */
+		default:
+			/* 1 byte to align. */
+			STM_D8(stm_esp, *p8++, false, false);
+			break;
+		}
 	}
 }
 

From ae949a822b306512a409684be186ce452d71da6d Mon Sep 17 00:00:00 2001
From: Karsten Koenig <karsten.koenig@nordicsemi.no>
Date: Thu, 19 Sep 2024 12:28:17 +0200
Subject: [PATCH 0023/2913] [nrf fromtree] dts: bindings: arm: nordic: Add
 TDDCONF sources

For nrf54h20 a range of combinations exist to configure the test and
debug domains data sources and sinks. Expose them in DTS to allow
configuring them. Also drop the previous style which was too rigid to
extend to cover all cases cleanly. The old style was only used in a
single sample application so far.

Signed-off-by: Karsten Koenig <karsten.koenig@nordicsemi.no>
(cherry picked from commit 43f9488045435cf43e2c48a9856b380b1cfe270b)
(cherry picked from commit 86007496f410edd5233d4d22c68ba376cb1a10be)
(cherry picked from commit 47895472bb87f811090396e49d29f295e9d63f44)
---
 dts/bindings/arm/nordic,nrf-tddconf.yaml      | 26 ++++++++++++++-----
 dts/common/nordic/nrf54h20.dtsi               |  1 +
 .../zephyr/dt-bindings/misc/nordic-tddconf.h  | 14 ++++++++++
 .../boards/nrf54h20_cpuapp.overlay            |  3 ++-
 .../boards/nrf54h20_cpurad.overlay            |  9 +++++++
 snippets/nordic-log-stm-dict/snippet.yml      |  3 +++
 .../boards/nrf54h20_cpuapp.overlay            |  3 ++-
 .../boards/nrf54h20_cpurad.overlay            |  9 +++++++
 snippets/nordic-log-stm/snippet.yml           |  3 +++
 9 files changed, 62 insertions(+), 9 deletions(-)
 create mode 100644 include/zephyr/dt-bindings/misc/nordic-tddconf.h
 create mode 100644 snippets/nordic-log-stm-dict/boards/nrf54h20_cpurad.overlay
 create mode 100644 snippets/nordic-log-stm/boards/nrf54h20_cpurad.overlay

diff --git a/dts/bindings/arm/nordic,nrf-tddconf.yaml b/dts/bindings/arm/nordic,nrf-tddconf.yaml
index 8ef56b44c58..46f9a0e7b2d 100644
--- a/dts/bindings/arm/nordic,nrf-tddconf.yaml
+++ b/dts/bindings/arm/nordic,nrf-tddconf.yaml
@@ -11,15 +11,27 @@ compatible: "nordic,nrf-tddconf"
 include: base.yaml
 
 properties:
-  stmsink:
-    type: string
-    description: indicates the sink for STM data
-    enum:
-      - "etr"
-      - "tpiu"
-      # - "etb" - Not supported yet
+  etbsources:
+    type: int
+    description: |
+      Bitmask of enabled sources for the ETB sink. Valid values can be found in
+      dt-bindings/misc/nordic-tddconf.h
+
+  tpiusources:
+    type: int
+    description: |
+      Bitmask of enabled sources for the TPIU sink. Valid values can be found in
+      dt-bindings/misc/nordic-tddconf.h
+
+  etrsources:
+    type: int
+    description: |
+      Bitmask of enabled sources for the ETR sink. Valid values can be found in
+      dt-bindings/misc/nordic-tddconf.h
+
   portconfig:
     type: int
+    default: 3
     description: TPIU clock divider - TDD HSFLL / 2^(2 + portconfig)
     enum:
       - 0
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index a5241adb6dc..12da886e38e 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -10,6 +10,7 @@
 #include <zephyr/dt-bindings/misc/nordic-nrf-ficr-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-domain-id-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-owner-id-nrf54h20.h>
+#include <zephyr/dt-bindings/misc/nordic-tddconf.h>
 
 /delete-node/ &sw_pwm;
 
diff --git a/include/zephyr/dt-bindings/misc/nordic-tddconf.h b/include/zephyr/dt-bindings/misc/nordic-tddconf.h
new file mode 100644
index 00000000000..b1b45b99252
--- /dev/null
+++ b/include/zephyr/dt-bindings/misc/nordic-tddconf.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_MISC_NORDIC_TDDCONF_H_
+
+#define NRF_TDDCONF_SOURCE_STMMAINCORE BIT(0)
+#define NRF_TDDCONF_SOURCE_ETMMAINCORE BIT(1)
+#define NRF_TDDCONF_SOURCE_STMHWEVENTS BIT(2)
+#define NRF_TDDCONF_SOURCE_STMPPR      BIT(3)
+#define NRF_TDDCONF_SOURCE_STMFLPR     BIT(4)
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_MISC_NORDIC_TDDCONF_H_ */
diff --git a/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay b/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay
index bedc93411c9..d620b83872f 100644
--- a/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay
+++ b/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay
@@ -9,6 +9,7 @@
 
 &tddconf {
 	status = "okay";
-	stmsink = "etr";
+	etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE | NRF_TDDCONF_SOURCE_STMPPR |
+		NRF_TDDCONF_SOURCE_STMFLPR)>;
 	portconfig = <0>;
 };
diff --git a/snippets/nordic-log-stm-dict/boards/nrf54h20_cpurad.overlay b/snippets/nordic-log-stm-dict/boards/nrf54h20_cpurad.overlay
new file mode 100644
index 00000000000..5bdeddd3c07
--- /dev/null
+++ b/snippets/nordic-log-stm-dict/boards/nrf54h20_cpurad.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&tddconf {
+	status = "okay";
+	etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE)>;
+};
diff --git a/snippets/nordic-log-stm-dict/snippet.yml b/snippets/nordic-log-stm-dict/snippet.yml
index 5bacbaf5af0..a482498d1e9 100644
--- a/snippets/nordic-log-stm-dict/snippet.yml
+++ b/snippets/nordic-log-stm-dict/snippet.yml
@@ -6,3 +6,6 @@ boards:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpuapp.overlay
       EXTRA_CONF_FILE: boards/nrf54h20_cpuapp.conf
+  /.*/nrf54h20/cpurad/:
+    append:
+      EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpurad.overlay
diff --git a/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay b/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay
index bedc93411c9..d620b83872f 100644
--- a/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay
+++ b/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay
@@ -9,6 +9,7 @@
 
 &tddconf {
 	status = "okay";
-	stmsink = "etr";
+	etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE | NRF_TDDCONF_SOURCE_STMPPR |
+		NRF_TDDCONF_SOURCE_STMFLPR)>;
 	portconfig = <0>;
 };
diff --git a/snippets/nordic-log-stm/boards/nrf54h20_cpurad.overlay b/snippets/nordic-log-stm/boards/nrf54h20_cpurad.overlay
new file mode 100644
index 00000000000..5bdeddd3c07
--- /dev/null
+++ b/snippets/nordic-log-stm/boards/nrf54h20_cpurad.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&tddconf {
+	status = "okay";
+	etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE)>;
+};
diff --git a/snippets/nordic-log-stm/snippet.yml b/snippets/nordic-log-stm/snippet.yml
index 1cd65087bcc..e2ff7b6f8a1 100644
--- a/snippets/nordic-log-stm/snippet.yml
+++ b/snippets/nordic-log-stm/snippet.yml
@@ -6,3 +6,6 @@ boards:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpuapp.overlay
       EXTRA_CONF_FILE: boards/nrf54h20_cpuapp.conf
+  /.*/nrf54h20/cpurad/:
+    append:
+      EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpurad.overlay

From a6fd92da4ce785ef31d67e6d43982bfbee9f5227 Mon Sep 17 00:00:00 2001
From: Bartosz Miller <bartosz.miller@nordicsemi.no>
Date: Thu, 26 Sep 2024 10:49:24 +0200
Subject: [PATCH 0024/2913] [nrf fromtree] tests: drivers: Add PPR support in
 NRF GRTC timer test

Test did not support PPR core due to failing GRTC channel allocation.
This change fixes the channel allocation and enables PPR core test.

Signed-off-by: Bartosz Miller <bartosz.miller@nordicsemi.no>

(cherry picked from commit e26b9750ae32cf8232bf510a815c7b1eb93b4bfe)
(cherry picked from commit 29c47e986788e703a7b5594d32e472dd8a7fb0eb)
(cherry picked from commit fda5963078e6dadb6a0b12faf5c2e7a2e6efd410)
---
 .../nrf_grtc_timer/boards/nrf54h20dk_nrf54h20_cpuppr.overlay | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 tests/drivers/timer/nrf_grtc_timer/boards/nrf54h20dk_nrf54h20_cpuppr.overlay

diff --git a/tests/drivers/timer/nrf_grtc_timer/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/tests/drivers/timer/nrf_grtc_timer/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
new file mode 100644
index 00000000000..d16ef2893e3
--- /dev/null
+++ b/tests/drivers/timer/nrf_grtc_timer/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&grtc {
+	owned-channels = <5 6>;
+};

From 346d697533dac25ae05d72e199217d1bac2ab6cd Mon Sep 17 00:00:00 2001
From: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
Date: Mon, 30 Sep 2024 09:37:55 +0200
Subject: [PATCH 0025/2913] [nrf fromlist] manifest: openthread: Regular
 OpenThread upmerge

Update OpenThread up to `2aeb8b8` and align KConfig options

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/79180

Signed-off-by: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
(cherry picked from commit 78541b8a92f874a7adf6f83c8b3b2e1aecbaee43)
(cherry picked from commit fc225b8fec10a17108827426ee68126548095e1b)
---
 modules/openthread/CMakeLists.txt   |  4 ++++
 modules/openthread/Kconfig.features | 12 ++++++++++++
 west.yml                            |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/modules/openthread/CMakeLists.txt b/modules/openthread/CMakeLists.txt
index 2ee23327435..6bf3936718a 100644
--- a/modules/openthread/CMakeLists.txt
+++ b/modules/openthread/CMakeLists.txt
@@ -45,6 +45,7 @@ kconfig_to_ot_option(CONFIG_OPENTHREAD_BACKBONE_ROUTER_MULTICAST_ROUTING OT_BACK
 kconfig_to_ot_option(CONFIG_OPENTHREAD_BLE_TCAT OT_BLE_TCAT "Enable BLE TCAT support")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_BORDER_AGENT OT_BORDER_AGENT "Enable Border Agent")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_BORDER_AGENT_EPHEMERAL_KEY_ENABLE OT_BORDER_AGENT_EPSKC "Border agent ephemeral PSKc")
+kconfig_to_ot_option(CONFIG_OPENTHREAD_BORDER_AGENT_ID OT_BORDER_AGENT_ID "Create and save border agent ID")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_BORDER_ROUTER OT_BORDER_ROUTER "Enable Border Router")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_BORDER_ROUTING OT_BORDER_ROUTING "Enable Border routing")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_BORDER_ROUTING_COUNTERS OT_BORDER_ROUTING_COUNTERS "Enable Border routing counters")
@@ -70,8 +71,10 @@ kconfig_to_ot_option(CONFIG_OPENTHREAD_DNS_CLIENT OT_DNS_CLIENT "Enable DNS clie
 kconfig_to_ot_option(CONFIG_OPENTHREAD_DNS_CLIENT_OVER_TCP OT_DNS_CLIENT_OVER_TCP "Enable dns query over tcp")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_DNS_DSO OT_DNS_DSO "Enable DNS Stateful Operations (DSO) support")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_DNS_UPSTREAM_QUERY OT_DNS_UPSTREAM_QUERY "Enable forwarding DNS queries to upstream")
+kconfig_to_ot_option(CONFIG_OPENTHREAD_DNSSD_DISCOVERY_PROXY OT_DNSSD_DISCOVERY_PROXY "Enable DNS-SD discovery proxy support")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_DNSSD_SERVER OT_DNSSD_SERVER "Enable DNS-SD server support")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_DUA OT_DUA "Enable Domain Unicast Address feature for Thread 1.2")
+kconfig_to_ot_option(CONFIG_OPENTHREAD_DYNAMIC_STORE_FRAME_AHEAD_COUNTER OT_DYNAMIC_STORE_FRAME_AHEAD_COUNTER "Enable dynamic store frame ahead counter")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_ECDSA OT_ECDSA "Enable ECDSA support")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_ENABLE_SERVICE OT_SERVICE "Enable Service entries in Thread Network Data")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_EXTERNAL_HEAP OT_EXTERNAL_HEAP "Enable external heap support")
@@ -99,6 +102,7 @@ kconfig_to_ot_option(CONFIG_OPENTHREAD_NAT64_BORDER_ROUTING OT_NAT64_BORDER_ROUT
 kconfig_to_ot_option(CONFIG_OPENTHREAD_NAT64_TRANSLATOR OT_NAT64_TRANSLATOR "Enable NAT64 translator")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_NEIGHBOR_DISCOVERY_AGENT OT_NEIGHBOR_DISCOVERY_AGENT "Enable neighbor discovery agent support")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_NETDIAG_CLIENT OT_NETDIAG_CLIENT "Enable TMF network diagnostics on clients")
+kconfig_to_ot_option(CONFIG_OPENTHREAD_NETDIAG_VENDOR_INFO OT_NETDIAG_VENDOR_INFO "Allow setting vendor info at runtime")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_NETDATA_PUBLISHER OT_NETDATA_PUBLISHER "Enable Thread Network Data publisher")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_OPERATIONAL_DATASET_AUTO_INIT OT_OPERATIONAL_DATASET_AUTO_INIT "Enable operational dataset auto init")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_OTNS OT_OTNS "Enable OTNS support")
diff --git a/modules/openthread/Kconfig.features b/modules/openthread/Kconfig.features
index eb713232c92..ccdd3236d38 100644
--- a/modules/openthread/Kconfig.features
+++ b/modules/openthread/Kconfig.features
@@ -52,6 +52,9 @@ config OPENTHREAD_BORDER_AGENT
 config OPENTHREAD_BORDER_AGENT_EPHEMERAL_KEY_ENABLE
 	bool "Border agent ephemeral PSKc"
 
+config OPENTHREAD_BORDER_AGENT_ID
+	bool "Create and save border agent ID"
+
 config OPENTHREAD_BORDER_ROUTER
 	bool "Border Router support"
 
@@ -150,6 +153,9 @@ config OPENTHREAD_DNS_UPSTREAM_QUERY
 	help
 	  Enable forwarding DNS queries to platform DNS upstream API
 
+config OPENTHREAD_DNSSD_DISCOVERY_PROXY
+	bool "DNS-SD discovery proxy support"
+
 config OPENTHREAD_DNSSD_SERVER
 	bool "DNS-SD server support"
 
@@ -158,6 +164,9 @@ config OPENTHREAD_DUA
 	help
 	  Enable Domain Unicast Address feature for Thread 1.2
 
+config OPENTHREAD_DYNAMIC_STORE_FRAME_AHEAD_COUNTER
+	bool "Dynamic store frame ahead counter"
+
 config OPENTHREAD_ECDSA
 	bool "ECDSA support"
 
@@ -248,6 +257,9 @@ config OPENTHREAD_NAT64_TRANSLATOR
 config OPENTHREAD_NETDIAG_CLIENT
 	bool "TMF network diagnostics on client"
 
+config OPENTHREAD_NETDIAG_VENDOR_INFO
+	bool "Allow setting vendor info at runtime"
+
 config OPENTHREAD_NEIGHBOR_DISCOVERY_AGENT
 	bool "Neighbor discovery agent support"
 
diff --git a/west.yml b/west.yml
index 49bc40e1e4f..c1049d2350c 100644
--- a/west.yml
+++ b/west.yml
@@ -306,7 +306,7 @@ manifest:
       revision: 76d2168bcdfcd23a9a7dce8c21f2083b90a1e60a
       path: modules/lib/open-amp
     - name: openthread
-      revision: e10a92570f94ff1e0bc5e0da9ecf0ee135d955a6
+      revision: 2aeb8b833ba760ec29d5f340dd1ce7bcb61c5d56
       path: modules/lib/openthread
     - name: percepio
       path: modules/debug/percepio

From aa0526279290a16d9e3948e4065de09f13228054 Mon Sep 17 00:00:00 2001
From: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
Date: Mon, 30 Sep 2024 09:43:15 +0200
Subject: [PATCH 0026/2913] [nrf fromlist] net: openthread: add
 `OPENTHREAD_STORE_FRAME_COUNTER_AHEAD`

Add `OPENTHREAD_STORE_FRAME_COUNTER_AHEAD` Kconfig option
and set it to 100000, as after calculations it appears to
be a more suitable value.

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/79180

Signed-off-by: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
(cherry picked from commit 1091ad410897cc07ef125a70c29a20972e92e6c8)
(cherry picked from commit da9ee30027dcd4411474f46dc424c51b93596bd6)
---
 modules/openthread/Kconfig.thread                      | 10 ++++++++--
 .../platform/openthread-core-zephyr-config.h           | 10 ++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/modules/openthread/Kconfig.thread b/modules/openthread/Kconfig.thread
index dce39fecec8..22f11d5c606 100644
--- a/modules/openthread/Kconfig.thread
+++ b/modules/openthread/Kconfig.thread
@@ -187,13 +187,13 @@ config OPENTHREAD_BLE_TCAT_THREAD_STACK_SIZE
 	default 5120 if OPENTHREAD_CRYPTO_PSA
 	default 4200
 	help
-	   Openthread default TCAT stack size.
+	  Openthread default TCAT stack size.
 
 config OPENTHREAD_BLE_TCAT_RING_BUF_SIZE
 	int "Openthread BLE ringbuffer size"
 	default 512
 	help
-	   Openthread BLE TCAT ringbuffer size.
+	  Openthread BLE TCAT ringbuffer size.
 
 config OPENTHREAD_NAT64_CIDR
 	string "Set IPv4 CIDR used by NAT64"
@@ -204,3 +204,9 @@ config OPENTHREAD_NAT64_CIDR
 	  to set source address of the outgoing translated IPv4 packets.
 	  The CIDR must have four bytes in the address with the
 	  non-zero length of prefix (e.g., "127.0.0.1/24").
+
+config OPENTHREAD_STORE_FRAME_COUNTER_AHEAD
+	int "Openthread frame counter ahead value"
+	default 100000
+	help
+	  Openthread value ahead of the current frame counter for persistent storage.
diff --git a/modules/openthread/platform/openthread-core-zephyr-config.h b/modules/openthread/platform/openthread-core-zephyr-config.h
index 71a087ca0b5..20f424ee2fe 100644
--- a/modules/openthread/platform/openthread-core-zephyr-config.h
+++ b/modules/openthread/platform/openthread-core-zephyr-config.h
@@ -448,4 +448,14 @@
 #define OPENTHREAD_CONFIG_RADIO_STATS_ENABLE CONFIG_OPENTHREAD_RADIO_STATS
 #endif
 
+/**
+ * @def OPENTHREAD_CONFIG_STORE_FRAME_COUNTER_AHEAD
+ *
+ * The value ahead of the current frame counter for persistent storage.
+ *
+ */
+#ifdef CONFIG_OPENTHREAD_STORE_FRAME_COUNTER_AHEAD
+#define OPENTHREAD_CONFIG_STORE_FRAME_COUNTER_AHEAD CONFIG_OPENTHREAD_STORE_FRAME_COUNTER_AHEAD
+#endif
+
 #endif  /* OPENTHREAD_CORE_ZEPHYR_CONFIG_H_ */

From f1ba687c6ee1cccd3747ca0ae4c5ecb6e43172f7 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Mon, 30 Sep 2024 14:41:18 +0100
Subject: [PATCH 0027/2913] [nrf fromlist] sysbuild: cmake: Fix
 ExternalZephyrProject_Add() revision handling

Fixes an issue with HWMv2 boards whereby the specified board
revision was not applied at the correct place, which would cause
the target image to fail configuration

Fixes #79208

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/79209

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit faed66f081d008f37e2ad019530a6de73648b670)
(cherry picked from commit bcb795acef56909de3e0898530f1b10c6380c7ba)
---
 .../cmake/modules/sysbuild_extensions.cmake     | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
index 0853535a911..9fb8ecdca6a 100644
--- a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
+++ b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
@@ -398,7 +398,22 @@ function(ExternalZephyrProject_Add)
     # unless <image>_BOARD is defined.
     if(DEFINED ZBUILD_BOARD_REVISION)
       # Use provided board revision
-      set_target_properties(${ZBUILD_APPLICATION} PROPERTIES BOARD ${ZBUILD_BOARD}@${ZBUILD_BOARD_REVISION})
+      if(ZBUILD_BOARD MATCHES "/")
+        # HWMv2 requires adding version to the board, split elements up, attach version, then
+        # reassemble into a complete string
+        string(REPLACE "/" ";" split_board_qualifiers "${ZBUILD_BOARD}")
+        list(GET split_board_qualifiers 0 target_board)
+        set(target_board ${target_board}@${ZBUILD_BOARD_REVISION})
+        list(REMOVE_AT split_board_qualifiers 0)
+        list(PREPEND split_board_qualifiers ${target_board})
+        string(REPLACE ";" "/" board_qualifiers "${split_board_qualifiers}")
+        set_target_properties(${ZBUILD_APPLICATION} PROPERTIES BOARD ${board_qualifiers})
+        set(split_board_qualifiers)
+        set(board_qualifiers)
+      else()
+        # Legacy HWMv1 support, version goes at end
+        set_target_properties(${ZBUILD_APPLICATION} PROPERTIES BOARD ${ZBUILD_BOARD}@${ZBUILD_BOARD_REVISION})
+      endif()
     else()
       set_target_properties(${ZBUILD_APPLICATION} PROPERTIES BOARD ${ZBUILD_BOARD})
     endif()

From fcc4bcf128d883ff242e4297d0cf09c287b75874 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Wed, 18 Sep 2024 14:32:17 +0100
Subject: [PATCH 0028/2913] [nrf fromtree] soc: nordic: nrf53: Make GPIO pin
 forwarding selectable

Allows selecting the forward GPIO pins to network core Kconfig
option and enables it by default if the node exists in devicetree

(cherry picked from commit 07f96b8620c901fa7317067bd0f679540361867b)

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 339eb7603cf31567eb818e144d666422b642f760)
(cherry picked from commit c57ec05f17e8153bf8b5dfb2e7e96036e1c0b9c2)
---
 soc/nordic/nrf53/Kconfig | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/soc/nordic/nrf53/Kconfig b/soc/nordic/nrf53/Kconfig
index 56676ba6db3..91f422e315e 100644
--- a/soc/nordic/nrf53/Kconfig
+++ b/soc/nordic/nrf53/Kconfig
@@ -163,10 +163,11 @@ config NRF_SPU_RAM_REGION_SIZE
 	  RAM region size for the NRF_SPU peripheral
 
 config SOC_NRF_GPIO_FORWARDER_FOR_NRF5340
-	bool
+	bool "Forward GPIO pins to network core"
 	depends on NRF_SOC_SECURE_SUPPORTED
+	default y if $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_GPIO_FORWARDER))
 	help
-	  hidden option for including the nRF GPIO pin forwarding
+	  Will forward configured pins with the forwarder compatible to the network core for usage.
 
 config SOC_NRF53_CPUNET_MGMT
 	bool

From 7c0953b646026fde8b9b00f6bd94e25648cccaa8 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Thu, 12 Sep 2024 10:26:37 +0200
Subject: [PATCH 0029/2913] [nrf fromlist] boards: shields: add nrf7002eb

Add board support for the nrf7002eb shield. This shield uses the
nordic edge-connector to be compatible with multiple boards.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/78330

(cherry picked from commit 5f7e039c16ccda98531e06251ba83e0c4c6d98ec)
(cherry picked from commit c8fac9ca20049d62501b3204fa73830315dd5dbf)
---
 boards/shields/nrf7002eb/Kconfig.shield       |   8 ++
 .../boards/thingy53_nrf5340_cpuapp.overlay    |  19 +++++
 boards/shields/nrf7002eb/doc/index.rst        |  72 ++++++++++++++++++
 boards/shields/nrf7002eb/doc/nrf7002eb.jpg    | Bin 0 -> 62681 bytes
 boards/shields/nrf7002eb/nrf7002eb.overlay    |  42 ++++++++++
 .../shields/nrf7002eb/nrf7002eb_coex.overlay  |  13 ++++
 6 files changed, 154 insertions(+)
 create mode 100644 boards/shields/nrf7002eb/Kconfig.shield
 create mode 100644 boards/shields/nrf7002eb/boards/thingy53_nrf5340_cpuapp.overlay
 create mode 100644 boards/shields/nrf7002eb/doc/index.rst
 create mode 100644 boards/shields/nrf7002eb/doc/nrf7002eb.jpg
 create mode 100644 boards/shields/nrf7002eb/nrf7002eb.overlay
 create mode 100644 boards/shields/nrf7002eb/nrf7002eb_coex.overlay

diff --git a/boards/shields/nrf7002eb/Kconfig.shield b/boards/shields/nrf7002eb/Kconfig.shield
new file mode 100644
index 00000000000..e369cfe3de4
--- /dev/null
+++ b/boards/shields/nrf7002eb/Kconfig.shield
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config SHIELD_NRF7002EB
+	def_bool $(shields_list_contains,nrf7002eb)
+
+config SHIELD_NRF7002EB_COEX
+	def_bool $(shields_list_contains,nrf7002eb_coex)
diff --git a/boards/shields/nrf7002eb/boards/thingy53_nrf5340_cpuapp.overlay b/boards/shields/nrf7002eb/boards/thingy53_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..ee052ec68ae
--- /dev/null
+++ b/boards/shields/nrf7002eb/boards/thingy53_nrf5340_cpuapp.overlay
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * This uses gpio0 pin 8 which conflicts with STATUS pin of Wi-Fi SR coex
+ */
+&npm1100_force_pwm_mode {
+	status = "disabled";
+};
+
+/*
+ * Pins P0.9, P0.10, P0.11, P0.12 conflict with SPI4 and nrf7002 host irq
+ */
+&uart0 {
+	status = "disabled";
+};
diff --git a/boards/shields/nrf7002eb/doc/index.rst b/boards/shields/nrf7002eb/doc/index.rst
new file mode 100644
index 00000000000..e93c778f87c
--- /dev/null
+++ b/boards/shields/nrf7002eb/doc/index.rst
@@ -0,0 +1,72 @@
+.. _nrf7002eb:
+
+nRF7002 EB
+##########
+
+Overview
+********
+
+The nRF7002 EB is a versatile evaluation kit in the form of a thumbstick shield which connects to
+compatible Nordic host boards, like the Thingy53, using the Nordic edge-connector.
+
+The nRF7002 EB unlocks low-power Wi-Fi 6 capabilities for your host device. It support dual-band Wi-Fi
+2.4GHz and 5GHz, and is based on the nRF7002 SoC.
+Seamlessly connect to Wi-Fi networks and leverage Wi-Fi-based locationing, enabling advanced
+features such as SSID sniffing of local Wi-Fi hubs
+
+.. figure:: nrf7002eb.jpg
+   :alt: nRF7002 EB
+   :align: center
+
+   nRF7002 EB
+
+Requirements
+************
+
+The nRF7002 EB board is designed to fit straight into a Nordic edge-connector and uses SPI as the
+communication interface. Any host board that supports the Nordic edge-connector can be used with
+the nRF7002 EB.
+
+Prerequisites
+-------------
+
+the nRF70 driver requires firmware binary blobs for Wi-Fi operation. Run the command
+below to retrieve those files.
+
+.. code-block:: console
+
+   west update
+   west blobs fetch hal_nordic
+
+Usage
+*****
+
+The shield can be used in any application by setting ``--shield nrf7002eb`` when invoking ``west build``.
+
+Shield Variants
+###############
+
+The nRF7002 EK has a variant which includes the COEX pins. These pins are not be routed to the
+edge-connector on some boards, like earlier revisions of the Thingy53 than v1.0.0.
+
+- ``nrf7002ek``: The default variant.
+- ``nrf7002ek_coex``: Variant which includes the COEX pins.
+
+SR Co-existence
+###############
+
+The nRF7002 EK supports SR co-existence provided the host board supports it. The SR co-existence
+pins are connected to the host board's GPIO pins.
+
+Two Kconfig options are available to enable SR co-existence:
+
+- :kconfig:option:`CONFIG_NRF70_SR_COEX`: Enables SR co-existence.
+- :kconfig:option:`CONFIG_NRF70_SR_COEX_RF_SWITCH`: Control SR side RF switch.
+
+References
+**********
+
+- `Developing with nRF7002 EB <https://docs.nordicsemi.com/bundle/ncs-latest/page/nrf/app_dev/device_guides/nrf70/nrf7002eb_dev_guide.html>`_
+- `nRF7002 EB product specification <https://infocenter.nordicsemi.com/topic/ug_nrf7002_eb/UG/nrf7002_EB/intro.html>`_
+- `nRF7002 product specification <https://infocenter.nordicsemi.com/index.jsp?topic=%2Fstruct_nrf70%2Fstruct%2Fnrf7002.html&cp=3_0>`_
+- `nRF7002 Co-existence <https://infocenter.nordicsemi.com/index.jsp?topic=%2Fps_nrf7002%2Fchapters%2Ffunctional%2Fdoc%2Fcoexistence.html&cp=3_0_0_7>`_
diff --git a/boards/shields/nrf7002eb/doc/nrf7002eb.jpg b/boards/shields/nrf7002eb/doc/nrf7002eb.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a8afd6741354a604bc962fbce9d54ecb6d641a72
GIT binary patch
literal 62681
zcmeFZbzB_F);8KmkRZX`HMq;*1cv~@U5CLL+#!S{1cwBITLQslaCawIf@=sK+#&cK
zviCmc{N7Kl{&(LRdit5FwN|aQy1J?Ad3x?=?tcO}%JNF`00IIczzBZ<_scZMaz1v}
z0HCDA3ZMZ1fC}ItAOQ$)^std3Jo>Y@gk$o*u{|6={aXeJj(On5u;6<)_{Iyz1n~VU
z_+}T1{73gA9OuEe5kvsM|Bt<blIjZ@UQQlvPCkCPCO0p?2scQChnI$jTLg~z1>o8U
zpZ@I&TophE?ts6nK6nQp{DqAk;NSS6OGLPL51x_0G1A|jqQF0+{0Aodj|dPD|FT2%
zp!+voq=GBJ3)-L8{eR}}AvJKx`*}bHKtn-6MR|mVii(Pkj`kRn01FcX1CtaF{|Nyl
z88sCp83hFm11B>L9XmY*#Zw^`c5WVietv3Zkhn0f7(8y?2O|jR=;)Xjm?T(OB)qf~
zw7mbf%Y8e5iw5_|2nm4>K*U8r!bQ062B_hFK0^3Y{t5;D84(Hj5eh0A`eO{ZKn>1A
zrjQVkksdulMuxWr!rK94+(&q{Jklum8WyN@t^~ZnA3meeKda~<)ck(Pz-Q_98vQX5
zF$pOdBNOve7FK=%K_Ov~h>Wb9yn>>VvX-`vuAaVuA=nCHZDVU^@9yF0<?Z9^_vUTL
zyU?)kh`9KV35iL`DXG~xUvl&E3kr)WtEy{i>*^aCJG;7jdi(kZzK)GgOioSD%+4*Z
ztgfwZZ2sEXJ~}=*Jv+bneR=f|7XtjC{!{*n?7zf?3y%vC85s!~^&u_<MDK^dagiU<
z@}S^JYoJ=V;?wa4qY*s&@VTM`ot{tgkkHcY`(q*o{$<9ahtU2+_J1v~*Z+?q`&VH9
zj%yCUL_&ZcJS1E|61cpJc=`zuzCEcg*;^?;gp?5V(?y8Nq7`uib0T`FOD3jyz3*0*
zQ^GH0@J%x%*R<c<wP@V~(u5nacdZou(^Rag0^lmlc(o1h^LK^qC!D@pgD(WIUc@jo
zfG+Ht+jeNK1aN|iV~@(5ZAW5cHOSuON!_lGii7OyD0}7^7|Zr$Ks3>tF;9MLD%_Pl
zxrjac<oV{VQRtXoBo15K&PVxb>&C_odV$yM{{@*3Kb<}(#IMKa;%(4cV9nVH<2~?=
ztmR$PuK-jcTK~;<0u4Dwa{>*+ALQS-#8hEMcDfpgiPog_zx5hEJ*hY&Z!7mfFFSWW
zcGNlFB<*~B+_a}_geAx!@9)7=CPb%_*hPUTyjkiO8nG<6^n~jtIG!;4nL+?3+Xl#!
z9G2#BqJ(n~B)Taoe>g3UArnYg|MoSHQ=2kLt2nFgyU}fWSr$D7{u>$!s*J*;-}_JF
zp73@`4=jbEI*(7)8!+H0GR@(Jt%q9doE5x{8v4YBChxV`a8`5`O|=xBbspk$@SC!y
zF7~J0N`wkJE<v2Wg!;>wyBh1IUNid%$34384Ff58U)PHm6ra@tJ;b$^Z5}JA$fwm@
z72IP3Q<`5hnCN0}CUERZ9ua>_N}e_eLK?q8fTbOT>k1A#tta`$cyE$K-xe>iZJ32T
zH(Po6en<(t8K*Q7<S}_VDW|NFcL}a&VI3=_vV#U7$Ps9hJ@UT?cIPdiOY_7V+)#oN
z=~zgw&&^Id+ppN!sypeq>03{;wWo-%?gK)H#5<OW(_~K;&F)uuSjBaZ<Q1M@O{XXg
zIh~fxuVmePq*Tb)fgdb6SIwYe=UhMSxEH!&_Q%j-)iZLEM>(j-HtDC^Y`KS{A)I3B
zj92o*6uK2vpOI)<h0Xd>H{NH(J7dknnzH?9CC1QNMmV?af3LjaO`jAHbQQX6Fc}{O
zjV_Q@)3td!RFWi0`mD0zkplRQ3Ry{-w0kEu&!}3$_un`Au&Dj1uYysibaM2ses5Au
zzR6dmY&qpsZe#9u-Nkm*W2wQm3Jc-iK34i=Se|&H&>D01b$QR(0=f4$C0Yl?MTfxm
zxf{772ctqKdrP-2QT&N(UFYx`2UYo}i9f`+k%{_@S1)x{vu^yKT%_Ft&jh}H+1A>K
zs}l94SIcLhN)&$lG`n2nS!>vBn&cW~Y0$LJ-LqD2Shl3~=q0Ly+1X^!`%jopB4~m-
zyV{mMP^}M8zTDo(uRHV(ts!wFn$~FJHA6k_q6<F0-TzTzw30=QQ-j~JE_@HXipc%!
zkQ5!1YdEg}jdj{&cVZ(nOSf7(?`3NpJGaXjY!0mcn54N__lh}YAa^3FcC1*b0*Pgz
z=+m2C|B1QD^j5-e986<1fl`rK>6PZsx?#ffZBtcF%`ydB?gL-$Hue=#LQ^(~jO#I8
zsoPIYSx=r}7&L>3Vr^_WzR2))-$0?nROwf`-tm6BPPUBu`}*-6f<m$R#;rNNo*dg^
zacV`m=(v11*uo&n?To%R`~yzIrFl6l6DyS}RRjfs&HmED^!0@P8b?eO%kwHeF|ig-
zNKJTC2Mv@%5OuZC4W{zkqv4^%XTpvg=JgKRwf?!JA94V!hQ0SJeRJX(eCMoNcVB++
zA4bQ9tiClGcBk*(ZAh{n11Nb$U!IK^+yi~(_keHPDZSxKh9l`CQoVS!y1KNN8;QJ1
z_Cr<oK&-{xNzgC(hzRA>jRh8A5m>wf<<i@Gzy|CNA)F3B*r-crcdne<`|8h!BQ2>u
z(iHpqMJviZkj0jDgC2BLCfS#TTN8O}@6W+xS6V`2`KlYu&c#JZBBhM_4o}r_;N7G%
z0!I}36Y3DF@?-mrv7Qc<#G&*5Vx+h$li-^edY(E_3QlcsYzo@|t)+ScQ)}Se*b!<R
zv;WQ!s?>@+{2Xc|8<n7)qHBsV+Y=2ZBU%Vq_>lEE_p$LkfWeyUskShXnkk%7GfHCb
zeO@q%a)<<`08md$qCs5zEz0C=73fjsZ3%R1+`S?%`L_ZT3WvCKjq+FmmiGaq4f_1?
z8dcYoMdKg04bTN+j)oeBS1y?uY(?W5>lHnIP~!{#k8@g_C8@6ss-^QVKgi+Ef0zyQ
z({nBGiBweCDb-x$BJ&Ubbp4FqNB=cNI<?^nN3&j0&p8b=Ociutl<{eoSu%s+j()Pa
zY2ILyNpt{ttPFMNcW+>mE|epU^@ARlgI~s7QTF1e<K^g7pPw;H7C@$c@Y0V;yy5e{
zk4e11hr8Y7*t&upLwBD#gUo%S-WIUf6#PheKL%K~V%v3Exb&t3Se!IDq|Hs}kX)TM
z%pa|B^4$YSHzAsv5i`Trph5RXB~T5@IXXh@DG&+jj;_UPefs0|=nq|j(#TX_CZ-!>
zirAs2g`CJ!b@;d0W?UP(ZuKKC6D*zFH77Rw2M1<GHZfge(y=98X-~Pi>Tx|GVG%Vx
zbte5SqdflT`Zi`Ums_l8*+sg8u0F$Uqf?yLT(2%}Eihw>|BZvJAmWlB%I@Y_X`r+5
z5&399k|C{NzTW`N;`@9MO?(Vn)?~AsL~eEugz<d@|7_(8fL$9$g~C0v#b;|2w9(nA
zT77;d;_69Hkox@!Uv(u6@-5_5G%o>GN5jv1z?;$`5gh;FET50)1^Q1H7D6TS)@F}k
zukT&G(R16rXGfYatE(rq)tPr2qDHnu@ycG=*c)ZWzn%4}Kh6(Z@Hnm|>kR{edUTCJ
z2s3jvXDwTGP5xnJ0W}^#cNQ)4(CLkMaZtAq&pptoc>XQ7FP;XQj8VdX9IXrgYnJPt
z!350i_=|%IW;*E0D0A%dhWe_e`nuP?meJ=;Uu27J6~EMvAM8ysG}UF|JWJrC)$E$E
zDRs1KtSL<j-9Nqj(x$|mG-OuQ_?DjJvT7i2=c=W(SfIIf>_?OAC#R-4sZ|Q6qGnjR
zz$5Y{Em~>ZJcYxEt!6ZHDu(EF?h-qv#1knHNaJ`diX#0Qa7ae}iRj?aIcAbqFltA2
zPPCqN`*c3U6vT<vK7a)C8w)~@W<FTh<v2CrUDckz42Efwq)@HD5qT%&6(_tp*0f_5
z(&#?d{d1lMf>ka3o^RB6IyrI_U!llsm?#NCueL?+_@40kQz0h#MnBCaL;6%rTUfIJ
z#p8D!IrF^}AAbgdU`*NeIZlgynTt&6c*;xk#YZKzbwpR;RZ&HezJ%{YYOx(gJ^jP_
z-hK^oloN})L^gyjt`|s;Z-}b7XNr1_u<3PYqBo3Nw=@On9#ImmYY%h)_&Yxuq7}L{
z4S(GOb1<LSdij7hj-&&tpLpD^nUl4+3Mo6&6~oaVFNrd!wH^tE<NJsTVcxRU9xhOk
zH#T2O&bCgvU<^^9&V_-<KgPIT20BEBC8Y{jD!&$HuJQBV_LGBUJhnZC9&59Oz3SDr
z`5kygw%a}NLf3}saa57u*o?!{j1jRD-i1=gpl{qwI}265UEiiLYLrb=%Vf4n+Kx&C
zsoHcMv$<(k>W;@Em+pzDQ3k6DhDS@J#cRmGY#lQ|^~7*<KR~?5p@j1Q>SUph*eMt)
zh94q+HO+2JD^NHq0P47IBBnc}`gl&HIb1R?%`mk^ufU#6Prsvj54;tUu5PG1Ih!FP
zr3PQ(-E_T)HT_+%Z&@EDO>pcBqhL)79z}{Msb#vm8kwm}YSlQQ;(4VWlxwv;nA$(a
zzY1|}eL8+R%p_`CeVyN6K(fBrwbwp^BBK2R>8Zf*&#&)<$w$y;exxORUZ~$hDm?4h
zqmJgc8rSUAPFN7FyqTeFK@d>sEZnd^xJ%$@VrTyfP8#I&xm39a&^8NC`~0@QtZn(v
zrzdEGP26_<#4BvtS`)JT`i~kZvKqn0p4Q^xJKs1wgD@FOR2VA{(2$^!%))0d8WY+x
zEVZ+o$+FcHSyOOHS{DSN*MBunVcCR$8uKhPn0n9KxgNS;L^>)_)4`A+KR*5KG<*KF
z>PtpvJfDqm?YQ$PuyDfnWnJ6D;`HFGk%p!{%OBU$v1)?$mAwRf>uw?P62?!(uH!Qu
zzBhyOX5}bPy<USzKe?%W@51q)MlZCTN~EHQ+2>C&iK8WDNQWAiJ8PV7rOsondP7Qw
zcr@ab4^$}jGxAi$R~a}`UO-iIL_>qdn&y{?1|e?e+*{Q4dePp44Gr|MUHSH_H+=c6
z`LHhhk&0DbC`<ZJ8%oy9&#o?9`%<Y=V$<!|E+B#LhI)SKGq#4Dy*GC(lTMIK71hVW
z3@!$PkVBrjm}C-^%*O4xXO9XEboGf83}~QCBhTRfrd8cI1SW=q*^hZhuDjz{!kzpX
z@Ko`X!LbMBBdAm5US3`^+j@G_?%!yR&cpL(=Q@INw<Yb5?*aeyKB}?BqxWi(WW>FV
zC{4Z&4v<{a0dBWtE5$=8`JGo!D5yJ|S4cOEJ_hctAp+J6ZahXJk4<d{?aCBb)z<op
zu@{rKvw}!2^7m)!KC`H#FcxI;HKs1_5vjP772~0e{K#BOpQOe%Q_tU4=V&UblGTWm
z-$&~gC(i7w3or|0D$Jf;`1*<WtMp~1?+e#-gdbJS)aCZX!RyCw49fd8l`i9h>(bA*
zwv4{(=9J}g(k|iVz1#L_?48$Zi_>YAut})%u%Tf^IP1&v?eUyiBHX;@w-6iq?1CXP
z47Tlna(Pk<=&G}KkyUj|clH7!`|bxnT6m{BuaIls51fY#(l8@qJG}NfkJB)`%KXT+
zJ05@YgnMfDMwhXbnAmH}A(ZRG$Pahpw^up~x(=dJcP}tb;+`P81o~OF==J)YC4R>K
zT&b_~_6f<0RfeC_I2VR$#bA^y%8Bo)eA47xN&T$cY6=>^*m5wK%d&!pBVLc21S)4f
zR#XUE;XTeY${OD?s8cL0QbxPP>=Rp!o@`t0=Wq;guB2x#Dx?_-FONeJA?r;?Dr(rZ
zVMe;$ZY<mX6@gwbn<nU0D=0x1PQ;75>KO77M;uhr<-XQc+}G$z-t-8FZn!uwQg!C@
zNf29qfh@PO@FqBu7u9b>@r#kTHg5%(9)-22{Uvj1|H4|1Jl`j+cMRrJJKJ7L%LUc5
zWsG*qoB^-e*zmeH#T%!d(VXacN%ap92J)kEmhN%Nj<g2sM&(l?&|i5LDRW3z8pXxA
zEWE5JFf_59I@gUCdk0c6FZ-5bOC3vB?BjKyF@C0c71%f^_TeMi>T7gL5M_JWxYBR`
zToa#{<d;LO;2a+E7W6*#&IYb0rt@1@YdgN6I>j7F@Hup54d#5|ty}FNosU);V?U8Q
zRHQn$F{IE_XBe_0|IKJ9)7YK<*bN6^;k>loV~IHVMU(uHf{si?sO$uPh3Ct|#a^8#
zxr}$i2jx&2>VWAy!yBowmFft=a3$@>%8jcLD+LD{d2yGNrwN65X+eCUM|!~?Ei4CR
zWLRTinGgw!zGrgo(b)#G26NkjNm_jcM4{&Fx!#h@QC8s0yc&Uf0N-BE`fm2rsH??P
zlKagoG>OGW5b^UW*L)*`mM?<m*UPsz7AjO<jZnp2iA<|eXPMgkPM^uLfk1wfT_vUj
zEpsTHEy^F7@(RUQD^!Wr|J<xQEdiZ@n8vLtV}9_FkJuQzhFo8iMfRW<*>Xtajmddc
zjL5Lz$yj|z_gb4qN;}xKgRL~yM+OYd>+-F?Nq2GGw~b6tJQ0AtN#bB}>seAsV({Nc
zRvea0MG-RJBsBTi1k?_c`=wL4ztC5K*<&9YnJ5lZ2_=5e#>@%|n5yK8NGEB&2ND`L
zJjJe#w6~1Bo|Swli|5;`ZW=5Ma(AE)xlG<=z;qv7*D~Cx=&^th)W+>cSiis2?_)TM
zHM5_(>u;FIsg7~jlO}!rj)#pk>THvePuHkjmuVRsuj?hMK0@i<2iwvjR<&a?PB2-C
z^b?9K>kDm8GeQeU^RRLj(Zw8&9)5*Dx%1($rlsYs&YiKRK0%l0Jsam?iGem=ThB#B
zY`}S;Kw|yj{5@c8u+;p%A3dG{XR*m&TLQPqfkV@GY)mE3$o)8bfBuAPNWpdfh_FUP
zBf>paD>c^uB#-yYlln0FS7TYRFG~fkTqR00&PNj4juBCtGPatU-!hPM{fIpsRy6YY
zs1wtdtxWZ?dJ|T4-}dJ~q>r<ErK29TqsA&Pyy<ORdY|TTy++cmmB|*7FOt^!BR^2m
z`e$j|=Lw(TQnG0cL3<s!=CrmS9m6g{@6*iC#QTM)ZQsww-B}WnYdbBgNwu%Klv3mP
zNNQE5o*R`y*DZ8>$;3n1>m~QROET<#>~mp0W1Lz|r2(_p^{(XlfKbyZViX*Y#%ep|
z#YRS9DerhS*CsszqnuQ_8%OdToel)hnZgeZ&`&{|M_<0zxH~cECRK`V`46g~@RInM
zU$0d5Z^llgMVwyJJLn&^R8KUNdAAY=avo1ka;)N^P+2BVU>iG*f@5=`#y$Duq{xCt
z=-gijbx1DDCFxT)Z`hV~TMlooN?S`^?L?~B!ZNfUQO;axanRIF9t`KkMjoIk9x;(r
zjKXMKr%z$L&7X?Iy~NW+((*Fu`1o5Kw9~pj*tyx`l@`|XBxv2xr0$w^-UC}qGGd>c
zXx+(9;`@%Sy?cD+bDqq2I)vfr25~+U8#?Zr%D#TSd1s__4+N&p`Pk}KN3pDIO4qk;
zEJb;YTNEjrRH5U1s5d`!9cQM_Q2FV24>+lP5{1@Syy}s@94|!1k)*1p+{v)^rfK2>
zPi)jR(~`F~gdI@L-X!&Qei|HKyNnUPyxW5o7HF=UU^_ePvAJJ}mI@Mv>P>z?y7XU}
zF;!hpGVfq+RS<LCGL3X{U3RYQ*^tdv&2h0}*l2!zBGoh@Fn?mV0*YY%h#4%s_z{(w
zr59C=?dAOPbl7mUmAw!Yt=|zW`TNXQOJz<lV<|_xK=5b0?q#+*!SB`Q6JvKo4c5us
zM>P5rm_J|fMXYgoiV7Uwqy`9K@Wa+^oL<Y-IWu2G%tCzzD9&IiN7SLG#Vk-+!P?m5
z*<)JcH^Z(k>Ak7Y%Jr%}Iq7Lrypa)H-z#9Gdu+S8&o#QlPz*C%2p>fR6xP=IGvC>u
zEV^qMz;E!ZX(>nTkfY3f!J65NdvaW$COR%UUD&W<I<lE}8*|Xp3QWnTkj<*PhD77`
z9XzhEY(|KRO{_e15C>~EjpsO{D`iJASa9^ky%^}_`5Lt;k=Nj05~N#RBRG|G(uKYE
z!!VOim*J=_%!WKBhYl1)>(j2OaC*aI3NdC_n2$8fY@u)@z>D)XN)cIcoOUM8N__4<
zPpJ4f)y}FuAva~PzmL7Ikbg+eQ&_l%$@k2jWq807uP%V4Kqhb7eOO?~Yujm7Mhto#
zvo1_dg5$H3+3j5-rl;^TCO~?<v^lQ&ePyvioriI3IuSA^prCfTc?iE*QcQm6Q><7w
zSwp(d)%|X*cRA<vi-s9qz_Q!?XnM;e0oGGMG$#<VviM!k*19g9nZkXnf@9ASCO|2j
zTcOKBN8^x;a^CHb2-28_Nl!IJIs-m#Mz(8`HjgHF=E=a!hcK#uvYhpnTa5#m6lr(E
zAF(&1%&kXdMHj?8yhctop3H-wUd6jJ8#AB8jRR#7SFH7bH(YGootRifYQ*^hxm=-S
z2Z|E{!B4R;lhI!Mj0&Ef&iWd+)Un|&Snpr|6D^Xyx&K+f3<>IV>M6}H=~*_up$xI-
zt3!+5`)h<^+_N0@^a_9La!AUnOg7@ji*)uE#x}c<P^+=g8;<=P7kfi)EbQfB!Qk(r
z9o$#2Q5S71WaT!9rOCS64}JHZMX}tE0y{H-wepoW7`1%uP9lL6fKO2`ti9G{xOonw
zkkU5~KaJ_&FxviVY;I&cYK#!@divtEi&Q@dwc_VXQpz2%F-<#hQVl23oLmW^30+@E
z#8c^bXh6I1O%VZ}8!vo*YyE_5yRwra(#1^y%^y$P;eBy!(9y2s59eF7X-YqWy_Y8H
zG8kb+i|N&(4TNSLexL9|B>bT=JZAfw>s$TB=y^S!IZAoksog|Y*_Ub;vc*9AasJF>
zm1qU^@<X}Fl!nMXy?1ucWpCz#X~2gX#$`1tY@;~*>RuH{WP2zAy*`w_=lRI%93q68
z+4+>}@?$r|4n<pN)Ot;+i&nIPN*_hlkza~U&X2yE^ZKL#^Te1vM<nRKoD(nNLf*zR
zvK8?_MMT1AU~p4}rj%Za$%m8G&8$0p4}FTZz?X@311d4&^&`(ERnT@7l0ZEy!QEFW
zPI)D&)@S-8pE+JJ6Y+4jcF?U2daOiKm;5El1_W%@c;=lCZY<_j$eX2f^!JYdl2c)4
z4(6XFt8$-4bm%!tDbV<hpU3a3SLV+K_AzBWX_llB)qBAZxQ+}76g|nZZ*n@Ude#s+
zbiz5l!K#x?m8Cq>68H2pY@eorN8~H`=~}vrI!wS4%aT&$hp0~p<gqY7Mcgprhb^2l
zr(S=XAh|C8^taMyJk%^t_(fJPdfRKjrpUxdUP<xGQ}mrz4!@KFq-o;#Bfd(F^7fKm
zf&E?w(FL&{iU-}vT-*a^i)|Usp&!${ZJ0Q5qx4w$>ig8}7yo^?SFP+nZZztdEz4R+
z2zn*W-9=J|l$|#0E-VGp7(C+?B4SkYyP!^R$#MoVDhf!;das|2m03Fr9xpSwP=0uJ
zak^4Tdzes{{_^|F4R#m$Sk$v&S1}V3Q5JiD?tzNQ?A+b`MyCpQ<=-hKwsVeNf)#Tl
z;E~0nINuxl@4q`%fc3Y!q~hvvLA}MQKU)MB3Q{-Dgs=t^Oce@N;#NDzJgXjMZd~!U
zb1y{ppHXNx>rl?~8%RjXe!4p~kR%C^8UI>w5417g*gffef}8n4{~lP%xf4*(IMhkZ
zuoH`R^{Omw$RO-o4u!t1uMwyLX%)cm-{8x)QW@9q+kB#qqN2YCGIb>{*6x95+TUF(
z>X+-_(OX{0Rbv#p8W@8=#gDPTQE6(DW<@j!oluH<pb*~VIa18AI8n#jN1Z}X<cQ7d
zAQ4fJOBwbty^bTWdX-AkW~#bm-m^#$7*Ru=m|}F&59<3E6nj!waLWHFiD!0{z}f%&
zb>zldG;)g7vG>y^W$<Zdp9Z8h6*c(IinAMs@7s|<Xs2H$3RZ34n&h(SBVz#r)#}Eq
z9P^VXLUu7)7K1OaoF9Yz3yt;To3-U*XN+iZhB<x0+fho?NrVoDCL%HpU$#j!zr`}G
z1z~vH#1f8-E)TnH4xZ%I25}%VS&2Q}8~+jKjO~zwL6Yk4jT>FqDF5@NP939>z~Cj7
zAMEu;q)uwhkMRAgQi-!F-aBSG!vQ;j{eYTxjPF19t}nP>PG>qGshqsnlI~UjVJp$+
ziQEZn*GZ5}ahWHIrf{q+Lce|HrA`tT^(r&FBUCHB2P6}-(t<*~mXlZm=Inh)YZNEb
zb(n{3bN!8s>ZT`tifY=BuCyTC5z52<$o{_gtr^srKY0&qo{!%HRQJH+oy}PH{&THe
z-`}|sHB0}cQF2*p`yM#Cwu9dt4+@dAqgsJWx_~ZSgN<~lkJhPIZ-zaJ57YE*9&<S!
zt4T)Quubr{y&)4XOG6g&#vgR~bl~ZTsKgw*uA%8#`>xt<K(y+97R~~|R<QN(a1r6+
zg1U2BSUFolIKj?NTs{^qTs)lIT!5IQkBbG^0pdYp34wp@Cr)?J)J8{RXC+RjC!or$
z>LLTNwNvzSgJ}7wX@mV7z#uC+NeLP;9}yoX7bl2^1&xoBBh+2QN1X1DaS=FvsOF-h
z`6J@tAWo+bCj-bhyFqC9Ir%xcIpCxOFJ3yh4L2)m5lvb7zb(K&iPQb<s<*c{r#By`
zvzrYU4+sR};^yVz<>i1&aJc(IJuG}UpzielSdfLdgWc?0JnWpIG!GUnES)_)#OdJu
z|K*sIi>m6s4F6Aa;N<k+?H_4(4>>Qm^8YSl?%KXC5H3xKyR)Yo7$WBdfqKyYqizNM
zm#&Mao8zAVtiW6lM~D+#%pIO_o_}@qz>)Zu^h3Zlc1|vTG~k*2mlPcTOXz><{6p99
z2t{O_!JZGDD9MV`Jy;U4at7O3iTr_<JeGnWAqyT3ek*Qa4t@b1K@JPBAeh67SD0If
zA0)^F7UcfNjuO<}!vYG1JlKI-=Cp$w;pY~DaC3wBIfNm6a3j3JmK?&?RuB$LK><N)
z9uTh}MA+&deRVfG_%O0?{7-)#>{!9=@CoqqgN3c&y$f)I;eH5lbASYRtT_ZBJi-F}
zeBAuJ{FZbyR$vi%XE!Gc_;Ijvvao@0*}Fh&=x84DB_jPoNt}+C6YlMwk1rf8Jgnie
z;&jjLpq@T|*J|52L9{$99x}%x#4E_d3*r|R5(05^^9lbgp$l<yhmV&BQ-3%rf1DSQ
zaf4WRIJ;>(J3ETg{fol#SDPw)Oj}uaSjbv<K;UZsVzg-g!)RgS<`v=oD~lqk&Q^BT
zzW-;U4`<PzL#Jrx4)50Y?=wOR;`%pow4?bm9z`s`52IV0&fUTb0#Ec`m0(*7s0{>u
zp2Ek<Up03BlS3!W59Sf%7v|;Q2MJqq@biGc93U$JZVmxnem)*+Yd(k&*y103cV}x4
zZwohwv<-Y5!7~6KMSn;<G*9*HpjOV_?(k{qUp;x-LLQRG&CAEZ4dUPt(1x>n_ytAy
zdFi<RKlI%S0{7lZ7z7_5mX;j+mR39*7TneX9J~V7Lc)TUd=Lvh>wi4@f8je1kBESP
z2oL}Nr@mW4__(>PEqOS&!IpyX<nzH#88AN&hp;6`7!04Q3JF+){?C2?Gphf`tn>fL
zI`2PYPw4Nl_mF$8hfCmJLx}6Yj;=p#|8cqeM;v|)et`eFq)X8JclqxO{C5WaI|Kin
zf&b3He`nzTe;N4qq7VXw&oI5=OTPOR#BwDW8M7Cf>hem@<=~`jIHCHJBiP9uSqcE0
zpdN0T3eRZZ{9qc?UvMrrCY)PM0$^Bx-Cd+#ym<Z(OZk7?pHDpyt^r`2<H6Sd*#5t*
z!Louc{^0Cp8n~1c*u~8Qj?Lj%(A&f10Vl&T0eqrt1;-_D%<cwv5RPXa>Mj4myARmr
z4~DbY;n+=EQwAOz0UXoV{0FxD4-B?-bArq8!(|w(oS<;~i28qFs|OtLfSnvY;lBMT
z4-sNQpgLOcJp+8B02BZvKoxia&;XWzCtwFS0v-Sdd=G`!xC5H-_GkYKeX>9LFW_31
za4kCk4A+naoB=1m;*UP?a17uw@bd56x?A({{;5L1d<FoIe%#-mz#kDnjR%0+_xJbL
zpYQK)v*CpL1psJ={#)Pq695RG!Rz1uyN)3X0G_-BfZFbV*I6b3KwT)Dlt1fY;b!rt
zp9hXUqBZ>CgX4Svz%qb89`FqS9vl6YH+b7aJCHLC0NU_eJs$>ulvDs<vVq$+{$IrX
z@C3uZ^7g-#`8$7qNc>2Mh!218f(-wAg!Vv(fAkm?6$K6RF(xL)V+;%|Y&;w+Y+P&%
z3>+dHTzmpTLPE?Z#3V!nBzOdb1b;~UNN^qGN9d0pp%Y+XU=jS^F87^q5<emWP>+NF
z=db@m;-`cMgbF9SKV;(X0;jgaIs8ay=x{DPIh->7K!*RP4ZcT4Kzf9Tf_ncqp&SPZ
z2R@e16#teGSS@M6LQBbXM**<Sv!ys6wWn}Ivwi+i|93kI;cVp3y(y8z#ZD%IXW<)<
zX)h>6i}Mywyrzd{QvW$cksj~%9D1$PA2efKy`sEKT$FDAv`G)WY~0y!jAr`V6hep>
zm_$@V%wP_iQVNwK+7Fo$>0@-$#vUxCqWa;adnoY!qRgT4N7GWP+;PUog1>M$)!YPj
z(lUFk`^TjIhyVba)@b^EUYcJ8rH=7Iii96$z0If^69Y{|YozM)-To~<qT+u<bwxJ&
zuaeIi3QJTt>$R0op*wb{cB0<epRLb6wER+b{@Wsg{!SLT!}7HAsFRGf%u7z=<DFLW
z^v0d|{UpZLH+`oP@3Ig75=A48a@!8L2TFq}Er*j_o{KV4P5}8KaqPLqv$@vJj@vab
zSMxujNFtRmW(P|dp3Jbs!FqRWOYfTWuFPReg=c;`{%<|5xtm_rUp+~v{>$!&WAT6y
z36D2JSSCh26MMqqZa_;3y$tgcZ;%G3n|E!j_%A-yfTFw+;_p$>KmX{UxI#>y&vZmI
z5Gbf7xomK1`lAwmTZL|3PRr1A*xE1gT(F9OKBSVG$yMAwoCxp}2<{TYu6fTwtZ>!q
zJ%a9p!CwP*6ENL62*$>Ejo0Mj)K?|1yNFdknm^(w?hsSunU3iR=Qi;dqGcOR5e)$?
zA^aiy6c?Jl6?{Eekvx5szmAr^J37n$Q2<8RiwFEkbmumkJ&nuuC~fFdRFlMAn2kTD
za#X)bvE8Bd=Y;jN$yKz#2O+#5fhu8)juvvpQ9YPvI@`q<#*Jm%+uw2~S}45IXJ~X1
zQqWA6vg=#J{zxOF%<IM19D+IJ+nc_`B<OStDU%k>nuOc%?NQio8h^y7{6sP3|Eo+0
zepP}OG_kv}dZJ8f?4o5#fzP?PpTDhn7I&OXxIcD{X;M&w>d-8DOT1lkwjpxWIe3fn
ziAGW8`HLA1;}}q-pasmBe?Pz3h(W=AKYHi&LD+awJihC=PWq$>cQkw04iVwP1(%aM
zmH?08Oq)c}X3xk@Lv%HtL7j;k6ZsLitl?LuUD>r9J8y%J5%ES-6BW~~^7?mJI91-e
z@XbJam%%`V4=Wok@v%g##b4)0N>(;R@kT^G)P^h+>UlQ4yHw}o6G;Eomp>Lnn!O!b
zcH|khw;{iR*wnOv?}>_V;uK=TTF05Xx5q<m($cs->dASg+_cZu^r>X-W+`WUAC{qO
zeZ*}F>-$b7k6-rKm(tCZNp)7CdRJ2V#l&z=nUSfCreqmkUi@w+#4mhh2ZE))Z8^T)
zqSMJddKW*`eWC9}mGpG5u^;V2Peg8MAHA0iC><6=E!kj#m`94MVMlc9I^Fo)q)K3k
z86T&~q|j!Hg#6N*FUxO<Dl(zS^b_iW;d!E?!Q52>ri>>^+HB3%>u_oD{LGWVJc6Hc
zTQ(&}lWzw6c7g(CVL9|ga|ijyHND@8ex!snsES4mFI3i?l<kH<C<b<0;@&wu-NKPE
z&>2a)ImrJ&HAf7|tT~ws{p#0rO<>X3z-=<EKlatg_bayh@US>sdA-c$$M=bnX)m{p
zm+vEQPCNizXru(w`jhG3`v+_Kh1QmdlbIJ#j;R-Z(GX8bnT>B>bp{i*@JlYuKC?&Y
zW@3IPz`P~LFJO!Lp8gx{oNb)7jb^4h%$s*h#*0ipzI`dRY`7xARluOwFNgzkjF1RV
z2WwB*w6d?yL*(Gwfs9c5LZ#zsPkr2^!zaCxja?GH%Oe=XM9)nj6547s>9EHUV<hMI
zHM{0$<+=<s)H5{_o>i(;nfHD2<s{6`uE#Z?3(eTpF3|N+pHp*w(O@7fT&p3LzKH`%
zX=U%LmS<=ytCx<-T(>@b8I$k6k&r1iW1qMHTBjdk9=-nxXt(8YG0dlFR_OByw_}b|
zZaxK^agGl)Ol#rb3o96=pYZj1t977zpn_}AgbTb{qv%R`3Mk0O#ebe>^wK+PzV&<y
z;}@A?RzEgvGqv**(A5@QiT!mmBz8i+=p8{8HaZ!OZNZ9#*n=<gKCFrxW_(+QEAA~;
zD&BlugRMH&J)Lo?HL;kvZ_#z3&DYO42RixjzA7Q=R^Pm}yAKynDa2IGN{v6Qk$icY
zz1r1+MEy(HW<x+}A(``8Ei_YFwR%ZwZH1<6p=Ha4_S<9xMzgAyMf3A|O@<8xR9vvz
zqEyF{v3^O>po-8Fw(aV92MNES726;A1BwbS7L0`O5o12SQ14E`rTLk<(8nEbCs($Z
z+3JNEs4n2VtkRr5p}O?-s<_<u9{7IQZ^Qx}Q(tjJxBY4)<9Pd$hpQhp&`m8n#RNi5
zQ&Ofcbt0NR^t@@<a-kJCf@E7x_&v)LHw$h_3sD)r)J@`$R6R7FTf`EyszyfT-k@j?
zi}pnSn!IOUJ83*r&ATUlB5rct#<2}u7|w{`RW2#@bLJxVOA|^uC#_Aic3jcqUz(4(
z^c<WG?e6YQsL?T0iT=nQP4%vd*&U_=vdS%fl6-n4o^Cm3pi|5SbFi$h2+Z#eMCF|A
zDc%8l7|gsoX;dt8+<O#af^J_{>;81R7SAemhHWR3lD%zZALQpoXjVpdrqH-e^=1^*
zBA&+Q%-}AP<%z##ujj$Dk7lpT__?nYyq{<KF1Pt^0_)6eCp~uN_sc~+&)i!4;mx6|
zlq={0Nj{-Q`uOA}b6vhhgDD>}ks-PFa1y_V<E0VKg+{c~<sIc@tuL2-@7$_Qy3NGz
zvr(Z`@(RtKq`|8UyP9L)vSKIBno1gqk%ICRsc?ix_`WI{ogx8_MIX<>raKd3V^$O!
zd_t8YmcN=3Q^{icXFr;RvKO0H=B1HT?9yX6p&`=rC+23D4PDLHZqqU4=A;=-^_Uq0
z$Q1A7Qu7==gz%G!*<`44igtB$*)r>TJLct{oqjbBmNlLX(twZPQ7$dVGBBxTM#JWn
zXJ>xGbBcD1?0xkY>-mFz8LqiIUn^t}BA8)EVj>$AZUvdr*q8fLO^IfF+s9km%3r^A
zCQyz_6s`xlx%blyv~lk4VX67XYFHL6B#mF{@36dg5_WhRx&K9-0odqLkqAA?TuB_}
z_4JOhw;rn#+s?x_Z+{M?mR(|VSf;hGfTx9<QicV!0==UP7iysEil8AJ;JIgqDgxwb
zZ2}Gh4PXV-ep~NMENzvXG1bp+R;6n#mZ<BS;L^?UvqSEeWk6PW^uv2mY`38O6@Y{s
zvh2NEUFCR8)%e|pM7{8sgZ)dgL99;SMIYY>n($5T7knn0UZtaDYUZz2G^OznwIa>j
zE%j_NuspsE+SvCXBG70uynU6-n!MRl)WRQ(05Bj(X(B3Of;ji~i-&Ct)$xcqx0xD7
zwE`!VApFn0%GMT&{0jjo0AQq%eMQ5)*3=k{Ib^*j017O6jaLgB8dNZ_&Lhv<R`4h;
z(?o_pX^Hk8odKZ1AMo}hoR^Dwrehs4&GYdDx>}Z@TMmj?uVH1B^@#bvO=n$Sj({S+
z4-t6V&MLAjlNzn3!gN~+8eSTzADddtDngK5+25?$W@f8}Ha%t6U>s_AW32iOnaXjp
zYcPG37jQM%YtZv6TLj%iG_lySiRUwamekqH!=pssQ0`ZJcG0<F)sXO3$a90!dV|yE
zJ+Rg^XCJFg?37rS<q9FAgKZaV_nwU^?tD>sAC>G*Ng}qP?>VSMCDm8vUVFla%GVC8
zG|k7w5_*I8XteMGyv0olk>g|;(D3P`9;VuIZgXJ2pNi%>i*}W%zj+MWl@QHoqzFPM
zZN$=#wUE)@!zVk*02+;J&s;7U&(5z&-+lGWOxag-nrJA~n_6iDX2$5R5ovizkrB-i
z-b<}U)`&gHsp&aC9)x~LGitRg%F3;mTxUtSYaBU99XSo?b^Rq_-MWL{pG<>H&=LF`
zKqm2C*>fKWRMn?eK$YS*aYmqZ!xk}tv3F_Zzv0UetvVSxdOKS7{Ou44oi8^xJ`jRG
z9qHKyI^(RTR#KwjGJMIDm9bN!x|9q_4pRMo{?dEX^t$BWW;Dq&y`2^x<rxzJqWLQv
z^VP_@8+A`LnTgXk$>?ttqyQW&NouL-qu1tPK*}p*Aea`%9O>ETHZXl|M!z}msvSr6
z6##_uBEXlgBmfOBS_at@_##CB2S7kZ1Q1csk>QIK0A7&c&*MG<P;d!w@bC$V_)%$S
zxp{c`1Z0Wn=%pEC7?}j6;L8^@c&-s1Azm;v6%w4U(PxxDpFAR%U16!}*0Kq+9>rD7
zq)j6YkU41`*pWDW2O<0z@?k&vc;9SEOjB7Ii?>LcEn{YI&h5nWy|3Tx+ZLDA0Iimw
z;qqbi;p?1$raPa2p&;ESf=iN@94GrHZHf1QxJ7DG+J*e3_q7>na_n~3#{A~^P=1zo
z#!cPj4#mXuO`C^zlD26zhp8pQouXm$9No#U$RT<iN2-W%VOL&xE=lXj=M&9KjWg3B
z!a7HTiL2d6G!=}!t-hjC{pm`0ZZu+VtTX*iHc7HEGe@lS&PuzY$i<OH{7d6^`_lC<
zc`DPlQs#J~6<x#k9AnZG2dT{^C-pNgdc$YM8itdkPg-{%*8&koDfa+_ZwHY9#A7tP
zEXJ!u{QcHVsR5p>8U}Hnl-Wtka7~tHS70+OExwTL=FNxIN?kWz$xz;2J~)RY0IF^5
zP|sOW?k)Y{N-BEff;{`|8T`qiHtJ)AnBT+`+goI(kVzbdgyW!AA(#Fi;TiEqR1HI*
zFaFWf{V8XJ!r(i_qpbwbk=Z><Fzu)!zlkiI#jo``<kX^!>?ud5ZB>om*md-Lf6B>P
z7K6`02xI!`R8czPQdt-fbRo1!r5!TV!V)Exq<9YmQ>}U)%iXH6#IbtP_i<I#=&E1E
zL$^xL5o?j1_vwTx$^rt23nqHAnO>^bFKU(GW@)L<g2tZK63hsqdlV;#R>bx+x;Jq+
zn^zvFWGS?~p3qIb7T+&857)*IUh2uU)37&kTpM=1lvwpTW(rhgF+ds29;EPRpC`<c
z9FkjEbTFn>SlT3Md1E@2*!d;rjY;QwYeQY#Y7T4!l(=cNHbleKHs%FrtKw+k(bv@d
z-<1uy5JAyU-BB~9a?b6Pn!;bl!zgs9(tH|(-}6yCwQz-P)~=)1e+3h@wLL|B)zq|2
zV#lyuROfuBD!p|NNHtIuafDiwJC)8$uwVK~GEeLLOl#?SoamETI4JJ=oy!U)53?_E
zA$LPnDqoV=>YMf6y3Kyx?Z?xSL)V8vN7ugQkgcoEKSafMVf)GbmR33DRwj#l3kA}1
z8X{t|O)(>Xyk)ge+EtbL<G8-417>ef<RGLoxjVJTwgb~`=b!P$P`-W!D=TtBz`M$5
zOssG>(wC^PGtsjReDCHcs*^0pxLcPXXddjWy{P3n^ZjJR{foC_ae5!>88s)f9kvQ{
zjcE&Zd}U9jc0ik&ar72B#blhI@~`a3->F$OQJ1#%X%KY6^k&ed;MLXv`&Uu2Bar?1
z6Nus5juVuL=9>NacH8!;aynQ?Z<KjFiE@2b<aqEDe3jg7JQ?iyvCbvbK=_m?PSjH~
zbEl|3=MDIpuCZpa?w!2SvLX9Zr?lJ=F|C{`k9yMzYeaFa@C?&$nfca}x3CaH{vZjS
z*<#EAK1jy;gic_wS>f9m4o90z)sTqo7pz4k#bqe3M6pMNECtBF@BW-ROHzv#)2Kof
zt{$$66D@41GTnWDVS>^{C||v0sMMyI4t20UjkltX#!{biaIz^G3>)1{Vd;eNUeY}s
zi1t<|%JVn=elAcuBc#V2?NxT&?EHbaj>|3i>(y;W`y?S9A)jH?FX!RsEO{TCWNf*2
ziz;=?$rTxEO5-qRB?fSDruBATx3gs6z7ZRLBJ29pD@JDE?Xj+ESV4A)$?Hxb`OA!S
zv=L-WC4OIu5jlUOj?8I$&gfYS6G8zXQ?u;zx$FFVrL|+0RZhWc3ong6sxD$Wc6}>i
z>jQ|#q334qt7!xK;AuGuD4mI5vOntqYH%htDhT-H#ga`~QlC~cLw3=_)GTbBQ2tIl
zdBvAiv|wkYW&ty5KyX0iZMAI35>c@RPwLltG#1sV?Y$!ZJmm=Gxa$5LIaQ~KHN!VK
ziLnJK6Hxu83J|VH{4m2gMc~KU(&B)r6?J35B{mDMdA2OO64W7+v9}yrK(X@99Gp1W
z%QFV{GN8|n^nL$r^KC{f^JzdO&)mdUnHoV<WC1t5;cwpwuJhjsn)S?@Zd6ccse_SM
zCs1{9Cp))S29vC%j=a<>^^&>y=f$*myXfUbMN2XABy}lV9g8-KATC;nDs69zm8bQ`
z6>%z;7@f#q9%E|>xT4@)M+>L<Yomp!w<HUdk1HE%)Aq=|=d=qXuJK!wR$@UJO^!O+
zAyJ#`<t1!l+!s30p&k=VL-v-A=a_v-Hy*t@KDKVM?~=3^W{YdYxf<NhoMr{DcGw1t
zCS%+hy2`D)VX0GSo`+t`A&<rT?I>;XqG=QT3VtGx`}dLUH-7n0Q=_1SPSh=sS7=s!
zZR!VNH~zgA4~t8f7tLDP{)w92tMCMiu{^fC<WxP<{7rf5SJvMu;YcKN<~6uqA5#kJ
zCm#A3Qgu%Tvf_<xpSzns9jUcH0~-w6W*xIdMt*A+q1O{s-hMY@Bs;CA%s3e*S1$jn
zl+O^G*P`al4OwjU4pP_CT5m9m?ljVcxu{$TU6zMx3dPt4%>L+0rD@CSP0TU^H|~B~
ziY|3nvRv=Y)d|>Z$RqfROtBR)bo*k;fkxhakF~>z!{n2zE|xbkXU*gjEt3*b3~Gkw
z5jsEjYwZ#%^je2+OW(wwC$N+adrXjCj3}|^Rzw&ME%&kJM-(k|*`tur7Y`ur{&G}@
zKNhSv&@1fezWLVa`T2mme*f~UL_d!^4LMenv%uhlb+*=OV&4Uve;E8s`CHMar{NqT
zu~lNAOH+~qYeM=Tg;Vyd{SEU2Q6G#xmIO&w8LH_7D$G5#&lbUO0NK3k>uUftcCn7y
z){#G&IkOa1t2NwWH?B-SJvZn;TF)n=JO0X&!)Y_sM#vXRNJgUAD3}pdJ@uL*BbVio
zLoHEF;@oc6v3sA1k=~1}BZ0(YUB;T4*F>u$ELB3q30TC<Tzv&(sw|62+AQoaE|%PE
zUVmEx+|3Xg;WC$${dHzxaB7+I(GP*!DsrN(qDK7-LPuw>VP?aAX(mB;TlQem#Qfe4
zD0`xjVFRsK$BjovjF@K{me1M7hflc3v94sUjA}&zC(6%Lx`ZwBSiuUe>Sf|x`mHOE
z__3lV^8{DzcfW$pksaIxpAJ;K=@OtI%C5~gXRoWZ8k)HqFwnC!ar#{ft7@3BaQaYF
zT$3t$qDNrRE=QY4m|^PIV5of--PKgc5I%WaFwb4{bvh?wPJYuhdX{dQA^dQPESIso
zIgF6nF1G;^plkF2llwN$9|1nydZ&KEAZo}!y7zHTlsnX-mRU~@=csOW7G%~b8(k=5
z*xJB=qAbP4$X~wt;;ekrHMQQt(%+BOF&hOV?L!Hx-25hiZ5?PWFtPlJfP)%VpnG%x
zAu)`K9G{DIfZmDWS;mWRQ&VI0&s?iF7=mj%Cb3cWOtl3QI-ii>lHCJOFes+wBn+<`
zCW<3dlIdTP!uU}!{l<=UstHe~v5HY{8aauvDsEFt?P-S-UD2`%U~17G$-$M=QLi~(
zM}P0p?4q$>{DA6dT4CS~e?S%j#xi<>S0bU^@hl-MT|~e)htx~P@JczT+JUKqfJoGZ
zopatA^J*KhU->pU`Ek_<g;vgT!qoCJ;&8UfZsRFj6I-x)6`3c=yQ^pJe0|uv{XZy_
zH!-IeU$ek4!3Du{9TX(zKN$waxk?N~;t@z#sa~qs|JY#+RQ^onl#%xltzIw(FrWCf
zmy(9%&JrtkR_H)0i7~xHT^gD1{!IGI7ic391F_XLqnjzdY8B>-K3D~=A6dG|BIE^b
zgVRguf|BXo^F#-&M$+2CiDCkEBRz-gEL#>c4fXSATiaZ+?)~a(%!*QW{*LEN9c)x)
zXWvo5-A!c|v16VTy&CpS>8ErK8M(vfW4)hmMDQmjRyk%Jen7rWsE}#LxW9949Dds~
zSdxTk`Mt5*pX|~Bt!FDcrF?<3{9W8I%zp22r9Jmf?Il=n^PS6?{SH&j$6+t&VCy2s
zC};&3b80dipZ#vOlyF`qNMz_`kO}sA(G6{;KKOT4C=52!Nn~94I6~?sK|qC_wz4YG
zvFh4M{5{}sO#^=CT#`kfTw((&tf@#Sf6K6px>mfGTV_XmF1ETKlM+>}Pi8kZqjGC=
zvAfNsa7B@Fd&>Oe1qNyH$H;+vN-nkN;&T0x9v(wwf7d0UKH-&X{Le4(=xV~dYQ1X$
zr`O~$LuVE=v()+>Y~n}-nuHIXv}c(baZlx|Ou<KG(L7`H6+S%18D_qh0_ucyMo#^)
zX#AxjwfBIPZTnl>%_?sua`G6pJU;Q#{zWE%W^uU-$#~s}+H1p{HG*o`pp%FZiR{>?
z%-PHsHiPhAD@~GW#YvKCY?UU?hOg}eqM>xClQo_F)Gwxo=_u7r7(SnIcytD-?zo@+
zsFQ^69P-{pjDGg9SsND#!gprp_B%(iA`FTwLxm<;s@B{C*zu0Lp@9d&-=41WOy9x+
z=EhXfH8CuaKaCqt8yK8k$-#en;`B}pW*BO8Aa2Kcqi*^7Xf@TUj41HsbtaK`OslQM
z-1deQxts-0bd@eCIkb<qeRnc{*sN;GAgO#_r1D3;xx-V++R196J<kuJ<xZ=wB)_P)
zo!&`((U;Bh{_@<J;Mez`S{SgRMi~0smcYk8``q~fi8f0&71)OnnF6Jm@X`dbM<t5%
z(85TGZWHr}qqHJo%;BkUw~T@WzCgObdm#VV(+Kxf#Scfe!9rJ+sZGj+>GcWK)tw=e
zyA!cM-%N?-QEJnbgNu~aorR;b4WGLUu^|6U$(GftVE?QF;s%SCkm{S&aZsO)$ZiZI
z5gahUdCt1hB=X}&U4==ydudqfsE<(cKGc_KGU4|XSU9|N==n>0FCV4ZWoDbV8JW1=
zcr{63#25R$Cn$sidb%^-?{5K3k&zk=!)1Z9@}ho+<(Eyi9x{)<wNbnFp`M^$Cx=C=
zMYyFC)o|xH$>_2tG;WzkS4LAfhrVdDaWHpM^|w%m(jES~t3TYjtBPT3oRLh9oxq1P
zxOv=B`SvWUvM~pw=z6EvOx%7O<i&y3V}<?2zuj40B`T9%{yM@4*HDcnZYJ-_j0K(B
zh*P-_4KTm6A5k`?_&7VDlKyeFe>gqrzrGc2F`6WMf4m3QpM1Rs;OlBBTmS(H{)=9y
z$mmE&j~*7*58nnN<HCQw>k+=R1`YuooO|g?V-frTg^=jsC%l#qwJbktx_uXvl97!&
z`m@A_e|ad0uy4re_!cN_H+o-33q@RrQE?$!<7hVu9)O}U(j)oT-$?VxdTv$L$-SR+
zRnxj~{r%cHGGe8^jP2p=>2`Yl{^}9(Ffn0|tFhk0o5mzaeX(x^{S717vj=cxvo1}o
zb%?07@7?N9Urdj;io0;A&;R<9r=mxsHXyInA&6xZFDCoNuGFu_g)d2{*3r*l!jVaa
zshso1Sw>=|y(`h$^)eOAs`Ms~N^d`8dF>Iv+|?9STF(?1S58gYU(=wZAsZThhj6{k
zBj;UL%1FmIHHEGdhc<ad1Zs&%OP*0@FFX4hV7?3ctxVgE$!dnKN~4hKAKY)7t>NRJ
z?U;T9;oE-@R1dqwxsk{}(`z~;SV&#@!dQ#u3)Q=>_||3l`J;t&`vuqc=lkz`Ucb!3
zy`t@!xGOO8DYQi4d&%l*r%Yv_cU^-ld}5-{Ld!nHYR9?b&GlXV+bE9u_==>guwT}s
zeEXK$Qw%FYE6GblDg)WTnKSK`A=U6#hF?Di*Qb6aN`{+Phspf$L+0=*Yx3C%MFyc;
zqR<n5vC7y)aUK3ygMPI`_9E*}tgm^(Ul{%mw%!6Ljwk3FCczTiU4py22X}XOcMSvx
z7Tnz-fkO`W!`(H=A&0xWYhLpIo_fA|tKQwY-M!h_v6}9h>FNIUJ-bbb7G2=h=O;hu
zgK$*!rwR!HjN|xTS%hMBipmkFZ<bs|CpBQJnV)qu7@it=!n;p&V9rYa!rsEvx>3SV
zVcaAK-U<rz5%oYkgC2KJhQ1!MCY3=BZ(Mqwt<ok!vY=S^ZXI(VJ|dsgvIOIDS@!n0
zuA29A`a!WqZl)OEdUns7MwsD}PaL{uO=?%$3^^gFKfI=3&pCU7t9jd949`}IhUgDU
z63&Ka%BefCHDQ@DsoN{oE7thnGkpdUfA%Wk?hzpJGDbQINuXfI#J@-Cl&?U>M9n&U
z+Ms;(y{Jr1^&2(B(Xxra$+rlXTg@Nx+HZCKKPxH!LNOM5C+_wLbc1O&Zw>*M_v~#{
zv~H`-h^33$dC|tf@C|yPUokAWY9mnsdZXg)o{to0lsFa0UIvLaLMi4hQaoJhoQ(@Y
zup3OrTDRqX;7+@>#?N|+DfO%}*b=omy8Jr*a`<LFStafShLLO&$FM6{)uz5Ono8z{
zCnd5ZXQS}7iGjBYdNU_7eA!oL2tIfgPT1NMh>T#uZ6>u5i^sH^(ny~=2Q9EL;Xx5K
zk1qb_gUIIGEN1&49My+jBCRUn$SyA^TJOX!UMtbj^>pV{ze<-Po0OtIbv)7e+0L;f
z7*jsM5B6?5q<uP#+}DILjdM(8#ZOg(4btos&X~wSzi5%({^V*L^F+hRzhE3Gze$X8
z)f?Gd*9EgzTh*Ic9}|m$Gr?hvW9{-gVg0kFu>8X6CSh;D5GTz?QM1AvyID)7uiybi
z>dX7X7>rGegB-k*6pDsy-|UL}=%kMPcY^Z3yf+n_PTa}Q5Z+bXX;dV$?Zr|Ji;?@~
zKlX|i8jtHkrZ8VSZ)ZQe6&>Ap2-WrlNU%w(##5v2KmuiBptxZD%@c))t{c;{9ECaD
z$5CN3^-762!9(LsULz4cx+L=TATn_B$U3S2zU7U@G<MJ-Gu?`7iL6Y0(Je|^=nb28
zxT;}hg<DmliOilxq%jgW#j^10(Uem#F(k>C%Gq(4yKIT`-C`Wm&KUyZH>Vb|q$w=^
ziWy<?t<MiEt~bNf?{T*3OH1y}LqRzzNDJTfg;NP0VK4xp#-(nR%P9-wxC2t$0mRgz
z-<yhOyD8yOa1%WDMvpoFQX9oj3L{4$FY^n3qLx}<-_>ZWbOFhejEmljN%QJFr#%VV
zWdUo_lLz<*GMpkcEZWd@D`tcG!9gpjUk5x1FYF3z;PIvv#uWz(u9gq5rg4cxiGNeD
ze-N;dxl7|knrA#g2P1kQ;O5aKj1H!)YjQe8>}d+<9rU=l>;6n=&<I4*I^=IOl$}Ou
zhQmcl&TX??9^kO)`qcZ;(JyYefqJ(4f*CBt$QU_kudXv59nU3b#*w&C(0@=$XPySN
zPftsckHd`6l+$TO*u$N!umHYVm6tl+bk(SJS~*L%G;8h8nSGHi$l+Yinl2%T%EFbH
z4Z`~pV~h}5HQ=efBQh=J06Qg&0IWi35kl%buLIJr!;l5i(i1EDQD|b->PgE2U;k{h
z_VYAR354WrVJS7l>!eZc+wfD)-F*FXyh1+DqncH6rB`BKYv^xE2wS1icsW9tX`W?%
z5p4%}p2F}&M6r$KWnNXkgu9a!J#Vt)9rmCb_pJbm6Xp~~Wz4oC&pP~WBRWaDanrvX
zk^bTr`w56#^&Q`d%9+sNgS62gD>sD9n6R$y2)!NJt>{-A@5+UT?(rY}9|(d9!?0~1
za6VQ9LKln<*XW|%Dj6+tNEJ(}ZAY!5)mF8|!{9COU{_iaBe}8iKm8WP<Y-ah-Kqm#
z86RY!7?#t;MGK3H{W-^V+e6Y)Q4_jnRO_MC>MxVbpH}(+Q<%Tq`rfdz&jS`CruI^%
z%7RifP-may^q>jyT(etDiGoAwe-KZ+U8*@(e3Ps8w>sA}j>T5^b6hZJIx7it$xR)+
zb4Zq8hyFWr>E{tXWagyqE73{lC3>i-U@DK*i$Hp|07hI}c}z2~DeeKu?)T<d^8s$B
zY;&zuwlv4!mrQXEcY1tTUOC_uNf-yI$@R-z9~#t^9---o`jPiH_MG|F(6GNyp(Y}S
zk|ENFwAt2>BWX+%&VN)lla@m!js}eZydpiw+DnU=>bh3yy@zEIFvq7Az};LKW@|QN
zPs<%|%grjb!FcDFn!Qt>(@r^4pef)6)P0!L`bi;5d8VnO9#_i^im4GUT^*>HAEuS=
zWF|*63Xun%(*rF&$C<<pq~DhXaF$~mnmnhPGqf?dQXmhD`2^O`)9uq}Vg+?`Y3w4N
zj&SsCc7Vn8V=M7l%Kt*Oz(uKqnJ?4LAZ{r_l+0N{67=0vJ<b5IhGK`tSq+b9-v{Ig
z^+zT(IsBw3@=rehNFB?;J+N;=VVooWyCpMsxUr_LJOsHFqot~61V7A6O6x*@Gix1`
zb&Rz4^S5W{=2UR+q&>7u|J*mfYtZ%Mo2mwcR~P*!Q7TUom{W2H%~(e$6ADo67sJ?B
z*6*0k6@6Y+ki{)EpIiV@M-m;U&vB-#EBiU4TO@Z99JY7Be(E^?(crjD&s=1+UL{*J
zxrhL^)$Zu>(8APQ&mmqy4eld?$Ao_tCU?lTjST_yDZB{z9K@Rhwl^;ePGTSKLc3mc
zqqwKt`BDGjFVtK)rG3pNed?mcfTym?Q83Z0Tiytf<`?Fe4=>YBqwb&VO0vs^CgFxP
zmx@_E6~oy7xD@wK91o-_C^%3y(0F{s|G8!C`D5bjcX8-6*FfoPcTYi32{u?c;V+cr
zA~J7PnZW|i=1yRjqCf~~<S3nJHoArd`-0&6+Xx$g3wpArNQPMS_$MtLy<tt=-8-<N
zW_wK2a9)%f>|;qgdgAT-0MZm!VyNoCgo0Hx#7b-li9+EOVD2q5Ai8w6!v#UXt3ETG
zc~@6oXZiNveI5?r11ixZWw`M2d9J%1ckb9Ta~_tsOZG@^MDwmn8e&o)(`rk+q=PrN
z9#XP-+2Xu}FbfBv^*q%j+l04IW*hjwE>Jr>L_6VXLF+REK2K<=*O4tr_^J$&x}ALz
z$9LjRC7Hrt6~O_v2~|vC1P$R}|KnR6e)@~E8)bTX&E|qa(T3bK>Rp7*x}TXaWfWs4
z$7xs0+#t*^w9guS+Qt&s32mt&Nnn-jXoPrZJ%mzs1?F1)V)V#K&|j!BH)d$XZjwHi
zm=)0SmJVTN9rAPW6SaJxt~JH{jI-U_DywHCN*&(HtPeAAWg1bGZZiqyi64|*V|k%e
zSYa+dJUh)zywPuHNohr4ellyxp-vP32^N0v41qslsKpT<I@_zf{FzP4LW+Dkw)j95
z-29R7k+$?m&*|<>4&T`-ReeYHKvN*n3B7tigRpgBcDdh|UfXcBAGOc*-F&nlxn@iU
z@u}3W_&Y3TQOPG&3D}%6zepj3D48W3+{^nPM@5w=u&wB)7iI~%uLHE>Epqc|NnGy(
zZ8Ut;`qw{7R@2sCd(b;ctSa^H-QQ730oCPQy-d~i0geVsvYUUOAL86mqzn~sG{=y6
zK7~bdjpnub5L@$UAPVN~@m52;qVC#DHrLd=XER7%1n2bmt`TcNYAXCJgbuA;E!=r~
z{WPkDlFt1g6v-Ith;lPrFHxD7AGy0UvCf1<6U_Hzj(|l1aSnBDZuiI~EGs7B&{z;}
zV$Kh&NBnRN1;2T2P&a0taka1Pw&?HK2GZ{V=Di}l@tEy01MQ#32beKO2)szBJb62g
zffB7LMmM&HVUp`pNk=ye@9XA#O1i@p2L!CSGj3P}JGXyNJB!$J1%`4|a|N1gO*EU%
zvLIO5ZKZ)u8{4`ho<<N$YZOmL4=O{2+<HII!XwFWD7<FtZ8qpn$##AH$*L4_?4pwV
zxGM;Cf;Akc0U6D^UU!6DOXgy_Z?WoHC`y^Y!Svd?M-GK(>UyVjyf%i3{wQIwIZh5A
z6nx*+<D4PN@MDrzsW+PgdH#Zs7%ekSF*BYUL6?=U;7%dEhG@6bvI;cbI9DGQ60T{u
z=ZlrcId)#BjtB)<D2Om~4{u?o!()nclE>4VE%TtdAKYzq<#Df0TDhx*?j5Po(Mchv
zQ2VLXmlt`Np0MF)vFH*LXYb}YkcI9p=#&e4_F=f}oMRDiSv<VB+xAE^K{$}58e8O)
zJ;LfV0Rbhs>yPkN?&Qp0zWfWf|L-vSY;~riKVs@k6`GUs1>T|z-hnn7qNACH9ja@p
zquI9DE|+hmaZ1>lTeRrL{W)K{DO&NK`H`ixDgTD}O5D_unN?t?vj8G8{cXfwydj|A
zJn1Ri=AHelQ{AFWzeRV-A2Aia;`*f;P36Tc-=!r_bwu}fM$dWb(T{X@Vu(=Hc||v+
zNJ(=bx7y#0c{$odnJ#|uL!KI^7OLYE3fs8U^mRXax>jawW8~Np+4&-h7Zz3A>D|=M
zsn`T>pXTTNf;&sfjw=1bl;ny9<LMo|?=MvI4;iRw6MnA&0s6afG}*$?E-qq8?di;?
z_KxPbfaV>a&<2pcxcyMz9VOBfSRD+0CCX6)TjO4Hzg4P_5j}rT(#iEoU<`ONR`44Z
zLfu2Rp=hH%`Y-pnf4LhCe0vp@ec3Cc`&}M0AmAjD<z}ooQSX(*LmXo^`94m+mlcII
zQ6OzoyfkaHF*{~9eX+l`^^(q$eyJ`N=KYtW(2fyRjaQ@apu+^P%VtH#IQZGTUZidJ
zxw=V!<GItg^?&~oGT+yCJsLZBS>OA0dEO0K=DPlOw+i?+cK;r2{4e?@#8K^3TFUl(
z3EtR8*WDQV@?Ri{W_Ukn%~}TjLb?9iwf`R!ZCGfS4>132+rMMGzoTfsOBc{E*+t1&
zIaEzyvA$r7skw?%1pU6?{OXqYpGe{3Kas+f&Z4-{a*sjgBu9=l@1$+cHs7FoCEs5t
zR_)H2Y~wNDjHTgL4FU^CWi<z)ku^^HWZQV}Lgs?^4%Q5dxST+y^uHvIn+Iq&5&mo<
zLn0P`p@@j#P(pBj7ZHya?am#tH(lI(`Ys`yk-wc^7Z8UM0xuf<XC`h>?dr%QQ{VeL
zj1W1gg7W3mlE@IeXvnXD16yf#+DCKm1AtCM>1X<G(VvA*iVZmp1RqFZxeY3K@|^-<
zn-WxuLud)b#d3|IKPw~3C5{##(D~{yaay)u{DL~%t-8tr67*(rFNe+Ay1RORf?1={
zF!hQoPNr1_l!M=2r%g9S3tSLJy1IMkszi4tAljMBbr`AOMulDC^m0#Iw>PG<#sWXm
zc8m*|{dj}ZEOr<B=|k5p+S3#*wArK^0kp<BrOW=sdK>w?tCwjl*k4AVWhj`kMgs?7
zypMZSb7lpLn1)v<uUVRV#cGZjU8AbhAk%;UA?J)4;)p|XRS>S|ZF(5SbN8NRondBv
zi-;f7M=Wg~qo!_oL~+Z-v7m2Fzt8q=#Dxm$Q>*wK8K2&sjWv@Alq18<BVD_!QJQ|o
zuAE=1#Tt_a@$RH5gJ<AgFZpg0C{^E5K-!=|3G@@!Qp|EKXkF%x3&q^_D^e@r=&P`t
zGlm&gu@%Kkw4#5>sjgb-foFzq>}DCxQ7^2Mx)h(G;_nILube-BmdWC#WUwDF{a2b2
zb~gE%N(KF0!+oTx!7lM{({V&t%i7?6(K)mGZR3)Wl6ED$5IZZ=D(9kR(^skd{m5)G
zC^`GYuOX!a=Yw6!$+Euv<kp6TtV9AvSPSggayHo2zWw;HzkHoJ(5u_WrRrH(S=sA9
za&Dkyj@tguX=BTZk;^@7N#N{nQvA59=bSC8s~gy0DVQKIYS*K<N33hCgMPiHDQ(?4
z+FgThrL_xtPDk<6ew?4zH{;;3nvQA<Fh(*;p?Mdrx7>e;IOgJR%BTeyIusQ6<fpGR
zv+(CDR1}mM1-Di^s=K{Q^(-788f1`~kDgW4-^zMPqHH&1T$SgescZ`-^6WsX^%?q;
zGU_rG<hntr3c7U2q4i~eam;sUsFIuBned1nqBD9Ei2t+qX-x1NA6e1HyvFaP&|QAw
z6g_o?XeVZeT01&ZdPf3?o^5hy6(|zi?U|`^cOU&5&dlE`g$@osORG$0H^ba+3|U&;
z5;tYU)E!|B3T{QVp`Vp=yhsQ4Bf3Y&_z89Uh}PpT$gCC4#=GqPo;%93=^FExvq)!_
zJ8JF+)gdNC9mfWXc|C-v;NrMkQOY)4eOy=dW7Q=OX5!X_k6KWvlLBH<j0$ex5o;<g
z6ZUjF1L9^7xWDwl-lkUzpgq9a*(wQ}x6lBPg?n*_VxgbY*SoAW>D92uSt?dtGn&n?
zW*y&OvlhNI=6szg4r8!(b*F!dea)1M^tb%p9aCWH?-8@Z^|L^h;L_8f#SwuP;%4V7
z*Pz=QZv&e06=mbM-1IK#on?O>rJj##DUzbJJg4K+Li{feu^QEsshVO)GA^_t9(yvN
zDZ!Puhyb0SlAA07qFzdm7^$1VHwG<iPlDH$z%szEr^kYja&5;GXvIJH<j>xpWcuXK
zHOCfj)Jg&j?+1S`tN2rI2bGf3ybyZYKA>q?_BC}Cs5gtMK_!C48z1=;O6ZJ<)#Co4
zeL&d5i1SvBW_k85dWKh%M%lL5G)b#pORfUC$EZWxVWzE0UxB46F^H$3K-7?ztKOas
zORGrCQqHXS65LMaE57F6Xm89|P-I)mUbc$kw$DrtdBFv^l*u&4w1IpgZ?jBu-FDAW
zJ}j<XrNJJ~p}GPrTOv0g&{>#Uwb5pN>h!)}(Y%6EjI_sBF*3?3x7mM9!tB0G%HF5a
z?G_JhvDmaOy6~K`6YjBB!5;CMe9JFsJ$6MAF38qX9TJiY`m`Rw9d9)^zGo#8yW##p
zSBFl9wV?=ovkM_ct6Pdn26s(!NQj5dv1A?W$Vg45&9q0jAmbYYN*T<duQhB>7-AX+
z8XzOdMJ&s~9rprj(E_e*|5ZB0vi-YfZWDVbLU37{j%`>QUMIRK3;prVau0*WEN4-&
zK{D!WZ#j0u_`<r6QK(i~Kck)}FgNBILLrVzD49Wf-q(1};Wr9d?n){+wplbXou|g6
zQ2-Qa4MjT=;!C2anVXm9!c@zA$awGGn%$`_jQp@Y=gM8D)t4+^<@@x<%uXxw#i1{i
zr`}O;CI327r2x;$R<G6>srTs^Awj+;6Km8n^FGy2>q@=1W}yrv*ev6!Psu)Dc^sWO
zvz_N65#?KBfB(}2?L6IPv{-yia4f6GM=#c!20%>g7Di{&?1=gXTZq+BMzw@|WYEnC
zbp%&Vzp067q0EuQcPycw<+AAmtdM#AzAnuoYCim!=dQ?r<|`PDSw>z~#c^JTZn}JD
zIn~0^KXQfkVkKP5vhQ_N2Y|U!%RjP5hThI_(9&>9bx@GvCPwW-Oxbu0=EJgTCSWOw
zHi{ueZj;F=vq^7%W;v4iyIQ>NGGkAyqnDMi8|uHh>+Ak&Z3UVI#|e7uNXiABVqZu@
zO=suK`r+steTS9_Prfoh4BM4HC)!7<M0oGZn#PQ=I*SR__mwX6aO^rIb0zoZNqe?=
z6qL{iau^1$R8~6GXv}sIWzkZbhp3}(DQsMMWk6f|Br3rrq+OAQJ~I6^ZCrT;Az{rv
z+YetkGlH>4Y{$_JWm6O8HF0v%7zvi8sx{c~3&Ewdh0v^xhDU*eDA*hZmib5D8mglz
zQgy{eBl`K)%<$cIGmLeu<F;lZOi-KydP^CbFbeXF4EJbpI>H-9zopD&Wy=|U6cG)F
zbyKogG#Cc@7a_6G|FR!*Df<j+&|EOS%gEO)#tt*+*z5+I`$)s8<$m37_+oX*w2LNo
z{K(&A?sT16tnY{}L)ASu`kfX%%+&U-i{rG@dfC2<;Md{DV;3p|Y`Ij#PcGORAtEaD
z4qEC%`!2tEg05EI8HwNaWtrS>a*;WDhFy+xmd4GYMQ@3oErO<!>(X5ZcyBvlhhmMP
ztCeEI-%pW_AIHU*4Q7##0ZuB;SOuc+EL#Rz28Hdr))fo!x^xc;6~T1|$|WrCVw_yZ
z;AQU+byGIsdIff*mbTH*)na@dE&a%G69*hMxc)@v?)8S<tBQp`lD=B5*Yul@m06b&
zg-ZThU9+HlJ;+BEL8xe^Vlth1`%kfInIX7gs#cC>TNhPgA?;l3gdfoRqT>fa#WPhT
zK(}tO)H!GR&13Gp>%*HRPUndgN^EE%fF6+%wqmsOplL*1L#5Oj8S7hXfSDE!kAR%m
z*yAn<ZE)XkSxbdP$v0QvjMgpTGkYk}Hd|^r&c(P$RsLcsHl%2wp`bq``}%B}-!Ezz
z_C6&V4(gQQd*y4UR7=TbbVy&_N(CPOCwF=~YWZXDGF<1WN4z#vvII`7Zk}-1aC5h$
zDpZt$O-qhV5_zEp%q93t<6^kcmO?Wy51XspGX5mV#e7Z2M!#rOm+d$v2Y0W7#~S_a
zHN#DB5fH5lqZmDBwIMpp?mMy-AyQ-H)Fu9>=^rLV=hy_#qFI(SrQIJ-_ZALg9Ay$O
zS#N;z`e2c3HjTp>5aVB{@xHCjwR_x-;(*TqnNy|^|FNkSpL=Cky&)AE{>Ew>d##T<
z;zp&o<OJZr7PR>a*x`JS>$5!n*->UYrm0QiV%t%k2+i2KA&-e!KF%py!;e(q8)ac*
zPSflwz7S!9=nSP$+;bxIoZJ}t1*=nHe2wJwi{6_b*iYu2dI2i{$-A5=M<5Z~$4%++
za%H+2%#=Ra5pP@Gu;gfkpGFrmmUDxEBW6p^aRB5J_;6LRD|E`I>?`LXkM3WLTX<1D
zOR~~o$$aUx8OaUxGWgxWIn5oKl~S?{6QE=kZHbw|WG1ji09pBD2VJv90GhZ)?+pfs
zYp~7P@)g?K@`co#+B62%QmC?akcR%qIGPM$lyfTHQ5dvlYyZx<Thj1<g^JzkhTV$y
z^S>M8E~7DAGzWgh_{2F;5?9KTc`nuN|98ABK!mCDNP3<JhyGBM`R|cF_Qm{uDOpo}
zQ$MHu3q^OI5|HvdDl+Q7OS((9AlE@N;a@VBoT-=eq992kulHhW+A?>|d=XqcsNQ=G
zv^Ly>$a$#NoT{AB%yQcZ4nh2ltMYGo*5mM_OjpBgG}(YTHZx&%yk4DKmq~eC?j_o<
zYvd`tb6S6)+LVhu8j$?{eNvWx`=I(4svn5Ggks5&*H{YbC=gJ07$a$2=xYS!D=ZbY
z4?)aX&tqt9?=WxLrTbr5&@V;g`u&t=E=ft>re<nM|Nm(Dem?~gjAD|<m-4Z((NspJ
zzfiUBiz>PQTrPe52nT}z4+jJPzGwTc3H|PJ34;ui4VGL~)zlU3-QyAkE2o&7dty@U
z^cM~_v*h1BaM+Yw;+s^#As1iOJqqe(E_?q+KN?Qt<3p0oA*26o2*pQ1``g&Ng=50g
z>Uo}J<4WhIE}eD9AGMvgriPJE8o25^cXq#lD*+R775&d|Ol8Xa>0<kE5r4e)JJ=6L
zj6AfJb&%#ciMF{4mG$v|6@8=Ntzdm@#GU5Crs=wPXaWkS8u&zIkN?1SKLZK}7C%8>
z7C*Hrmy5)*{NY0V-&BG}+v6H<<`?Dpp0YQvJby@IdB8LNx-T~V&?>K(sy<oq-K2e6
z%cB6^N3c6s0A1a2wX3zt>kR1i7fM0h@fv<x5%lDdNqU$+n0`PIZhn##?ewG^uzC3n
z#<5Xvw0=dB6O>o6LsF_%^0*+irpq<al9|KlHdalb%<3yTVX*G1OswO;=by5aSf?zc
zN!(kzwT})IoS?YOj;wY=b(Cco_N=$q*h-T~ID)!f%agSffeEoVx|@BWIN?4fVC|u-
z#QEvk?|83b`>wbUKCt4W4NH?nTSxhc5L)QA;O$5^{guz)Xp?lbZsLs&-fBzpe99l!
z&z>mZ{$YW@VY|M6rb)m(^rRrX>}h286yaXgauLOGRf6d9!+O7p&z?^XGM{@c&@cYI
zMI=UHSJh8enb|JCFa(ZiR^Tnae5txw>P}Xj^lhj0(FhgF6*BQr6)I`_)A<*wZ!7iY
zXhPnxd$21vYl0^=V3tc{8jFDGjxbN*6QH|$(p9vj#aw>J&UEqXO+}XHwt!m5C;Zp*
z$cTq5;r|LMeqxaCUE-eAzB24<gd9kjcIMu{L(cWaHgr`)q;hsj731x}q5%iehn7e@
zJNoQiS3_+xQ<cY4n0d~eCx7Apg;GI{j2@r;PSABYw|y@uZrAct_7r4RO8ACF9_t~M
zcqn-Wr6I(Cc2rm4j!H84meMH&a7LhM$l7#K4dbD7va|UxYEE7;bza>+uxHx=KiYMe
zm48r4AqMRCXCooshe}jKMV+j4q(E=rQQ<-3-v`yD56|U^#VEOyxY#gfEZ;|+E2e=t
z!z;CZxncZQ7j1rL`oB=ccFqM2N!H8&)~Qgp##QB~fOD;C&pt2#wh_U0Qws7VvP^}h
zXHZdgs;y~<uk;vKqrSh%Lq_0!vQ#BM(+N`pql9b2ZCs*?G*f89X9T(L(Nj*4%z+S>
ztBF$<Ch5VhM)R;N$+SMDK1-nG!LkkWlL7D65RVXXMipJ1JiN{gCp}wNtP!EiMt*T}
zlEIHDEBXQJg98WaAOk^B|3bjIF@$hkBTROqb?3NtJ=Z{DK5_A;fr71FcnslSul8V(
zr3%Hfq8SfgU@xM*K5Eb-Ry2y)$kXvQWXtTD({8c76!+)8s$;lzs$C)&QzE;i8`yow
z5KEBZNWC~`|E#g1F*C2D1+HDPn*y{76jc_q4jFMjhBUuvlEUfa$(+_Q(2y^m?rSYH
z3DGz^`(x$|Dj}RVDSEKlZrTr<B|1@whu(RS#s=6{42-i1E{My^EfO7V?Vg)=9n!fa
z_I+6LQ}nRlex<>VIU2}lX!TW^!?5q~OibXxCe?1O?5y!q&^_l|i(st7jZG|#*><=p
z^)Ptq9gb-m`V}nl3haz1mmg{NV<;N66}Xzb;g<&<LB@Hf^flSG^f+U%D$I;(f#gXX
zgup%u6e+-RYxbcwizH|sH8R3GOE{YMjONznc3+1-AeVf=i#ht3l9|7~?E~=nd*H&|
zcgZ!OFV=5z%7nA=H8VzrH<@8Nq3vO?L6M6{o@H03SY>jLDn46)dv$*n#rG^DMiy0~
zNNS8qFN+gQQ{3s@qfVHnWCZ5xK9F*f=I%;F^dt^3Iu!g$HUB6IW>{P^OPlnit*!uf
zD)Nyfx5=K8hU)d#3^>{%kPxX{k$7Co<yH5`qG7KfQ$TZ$<4QzN_`Z}TAqqGb`NEnj
znWx`%ltNMt=PF$AeN-JYSQ-KQihBF_TPW3z_>_+H0`}<CetK~@?1JTsaq+6cqidWb
zM|TvZuNG-d^ISuuHosPh@nyaa{)OTNM|t?SiMtb-NAz!xt2E%8zaDUJdGGU8CBIz-
z6=$jNO6UKWoAvlft*<SHD?PDp7ktt0FCAYx*nTr#6&oFb;oyE<HYq^p1xi(CDet-q
zSW6mSW;<lWT3E_^I>b9a)w3nNRp3KK*t$t!Vrs8VDEi^_@?yuZcsf;j+2|tGA9wUV
zpcPb19DaD}u}Cd<v<Lcqab~e9s7qRnmyKjAjbB@w6({thSYDS75Ie2NlV3MR+Ko4(
z?$+)G<+wQ&*A>dV<}V4YCAbj&kWO_eVj$0}u0P2~uv0FeC-?Cjx+-zu@0_$rUCgbQ
z_%gm)x!8c_OHl`icjQA7MD_qo@WAQY)Dv>pswT%C0&d&*T(8Zt8U1nAb?E(Z**01n
ze2-+ab~(RH;#BT-G`C<H&?PIdeS{hzF6o{_NV@!;g`LMu0T1IfJ1U~1ube7Q^YruZ
z8k@&!XvPNP+idx|qWq1d^qzfqyvYtJ|NUI2_%z)KUip}*%b!9iJ(<G0eQ1BgZM6Yd
zz~&!@&s6CYE-2fIlJt$8nOLl&QR0*}vB=eB4cE*QS*=f8Cj3(R3-0)yX!NF11#Ef#
zDd{*@%JfoEh4WDG&^6|Dk)Uj;Dmz!vlJuy)B~@MFStoyfborK@!pthc`E|HbXe<|q
z*Xa<wqS0VglR$ZSJkmEWwZp+&3MG+T*|Q>=eb38HwMSHm@}=6Ugm!O0Gq>!ZjG0-{
zGB085+vuSU=URVL?EnjgZsyO{h@%9rWs%W}&LZ2L><Vbx*|U;}jW1{Am61p1aYs>m
zXM1}yun%|uvsRS1;nUMKKrn2xD5+-JK0%{z8(m{aj$_=@qWSc;4)%0wrfX#j?`yIm
z4=#snf~>>w@SW>eYe5*HQ$*Y$5leZ6Vls`3KQDIkkT-EQ7$nUEn9f%v_J^`&+YUfk
z`J=3zTEvrIsX+n{%4as>qE9jllf?^))8$+>%s|s@6T<K<b3&DtongNNI2{AN-M*`j
z5WS)ccYK`G&FtU43lxa)2B*(evMR6>k2cDuHouzRzfBKt9Htbr_FNZ*B05Tg3-F`3
z*QLIR#8N1eB__g{<S!9*iC5-$BTZ{Pe0nXO^LfY3^^~4o`!x?7lv0zr+;s0;*7%N}
zTA3lD>zadlSMGe_g}ySu`tSptk+2H_^y5fAFKS@5RYi-w%{8_rs(rPsKrU-{c$&;)
zEALA@1Cq)ZT5G{N9we_SVuy7y@1*$Skx+M7oo^Nri<6I2&F-(t7cqNmJ6QcbGPIrN
zm`deb=Mf64>WtOnJ6L3Hp2o4=1D{$GcnO7&I*NA3h!22dEq-!)JNd*be^zJd+uFYO
zIGS40N~ZLq-N_}F%}*<Qn8oS{S8_k$;lGVecBo3W-Lf-7!NQEmZ2_<FV>QRr+(qpZ
zJzfvEO1yAC{?_ocQ>3>5pE_o}%D?s*mjyK2d;7f2WF0RblU&$qI93Y!R0jctz%yw{
zH0Vy`2--2VMAkKp#tk^^{poVR{-iS=!wllUeHDMbH>?wsRANJk+2yhtiU#n)bh$q8
zber2%;!2T0Hu&mgF+QB7DdB50A}8&&SU3Y#cvie}Wp?a9K2$daf1}Hd`)(X0!hkaX
z-WRD|#<X|n)2aDVC*5DD0m!vriC%kK)GI#3kO~^8!pRZ=tfDxCb}<(lYeidj;3yXv
zt>H26yq%%8-3>x7gbv$upUSh}t^W&!|9%a?x9cVZ65wMfI`)sK#*J&l67TduJ71>0
zPbeQ_^LOYhA{&MqxyJ9zyqUJQ+Nl*k<6lm3m5+5NbG?`%(zPJ>!KZ7JhU&lSy<t<T
zGoa~f6}_9oA*6psZQ4$EM_23dL~=x|LJ4Xv$mT(QLmu=`UXqF{0yiyR2}kRfbT$P!
zvHi9H=e~p*OE8}l#NE)>Hx+`yz!>=C88SJN-Yw>D1BNTZwIVX%j`)r*wTcXSy_OsG
z6)TEEI_7KNDyrNBB#oD`$lWQ`h+6?jF@K@>cNh{%J>qPnpiT-wmV!woC}Q8lmp}zO
z@~9+;84qr>jx_j_gVp|G_-R}Ih@8n&z(i3Pb0=Ns?>f6W4`r-|*YnTxToNEh1*~nY
zrIK$AP&h(cRa8+>RfXnRVe(^-8)+t_5-#@LBShDmDiPE?XcGwIabtjuhwrRqIuF{?
z;<kN%5^Pe~oh#hmQZQy^C1!}^Nu2~AHQ1NME5vv)_{gLx@+Seez7JG3ixq*$J;b*d
zpRszDx%qs{@U6Sh#o3NX(D|xT;{|nou?<=gepGtPwznVvB=LL_nDP`f|HUsOyy5fO
z$WLO|O<MDvIlMc24fjFS^#u3+bgZ*#|B&{?EW`HJ2})66>DZSz%YCxa!dIq`9U5HN
zQ?F&ZXIqF;@!I=NM54zaRpzR8n>%v<&pGbGUruEy>k%VLLM=dv+A^DWP#t+jk>a_%
z!BI+stsFtq3z#tV1X-UcL_1%*V)dUolG`%~wm}xr^$`B@!ZdC)SE=da579^KB8?OF
z#d#io>L)Uu-A}*y%q)v&ZPvh8XO@4$RY_w^YE|^uY-`1-+2eviZ_|G4d4>(h&fhg8
z;pgA1@*Mgy54F@z*NGs8`)aJWK85Y_7pmd$%_#cejETBU5WP>|bpc-6+S7<((P(LP
z1aE_IqURXta41ywRR>6sq!~N5U)kh^&GX<BZy0WEIv{I<A)}`nYCXuYEjGw|I-a=W
z!u%V#`d;)c<(^|?2;^Qu@C|f^ck<T2$6qtrdS$1(X!@|rWnC`=#DMG_krD5gmvO$N
zD@o<ke_1zTrJ&~E_Vf;Ux2`|b&%_34GqvWE93`vcI9f*A?HkfyFaPS8L*nnKGEDtm
ztTFa`mMFgh+$2(IbR?B9Q9>ZI$6-wA+}ZVNzf*mm{tk-cVcFf_l|(}6&9b<G(zB$*
zuJnQEuxPrEW-o7|13s2BA;w|4xcZ3RDK28nXTX&PW78v|GjL>IMa(26;}0DLHb9(}
z34C%2R3=beFkc$anFAqmw20<1a&v_v)w{*1pyU?>@Mo8rx33#W5Ge?FomU68h<;uV
z7v4pdbRKNXqO(#MoDN^-9iHO@uV6?}BYGHQvdW{aOI4-us!`@?W@<S1GCXtnh0W6r
zEK?AZvQ~e~HKKuIW%jU!CP0X>_@U`KXP^+w0jl3sub0S76UHC1j`%f*mk}MHMQ9Fv
z*M5YT$K98MK?2GYy`OW-<Rb5*Kx-eK?GO&_yz|NaRzAI49Z)|#!=Z?|^1XscGZcj@
zXRB4o)to9Ptt_UxGO9@*kFS)PW4KrXIS|%vYZUT*HAUy$H4#GF3<r3^<40WP+W{R;
z2&O9(ulc;8$bF;eha_d429QjLV@mJ|-wyFhtY6z-C|h9cz$>IdPgh6{$N8|)&@=N5
zyLDpxeEG>vGm7Y>F9T4I>7o&4{^i&lD*sUS+ca*mEha5~!3=7E2(*EI+hV1L2?pcz
zWu7JthN~xKpqw>giI$YlcYZagY_LTb)bxsFIMUHRcr7=(B<U}d(iUkb-*X?f<t>9+
zeL-9J>3SUi)t6Mz>DINoIdYdFkRvPV6LlP(sTv|)%3X4D;<kZ(_HL4b?G!wrf9h4^
z8}74aH!%xSanUYvafflL0e2NO5bt=9qf11ZLd_LGus~qS9?|H1Boc}@J)VeU_wE2^
zL8$q>JY!3yF#*D>H6XL%a({t8^}`==EPrxWw*QaWpQmO4W=^85`afmo_-3xOi`=*(
zV_55JnNjO%_`D3uo$&l*B3fiIENS_Yccrl_)7^T6U!S}uUR|fKXULc&Sj_ukj9l5R
zQnvNb@2<|uC45U$=f8Yn8f_H!CFm4($T>2QD%m7%5<1QDv6_Zajg`!pf0oVzSZ9-5
zi_1%3-bEp4AD?#aKWnaI7Ms^F;(p})urSqESCu1z##!O{HvjU9Il{@xae?nm?l%I(
z5CT4XT^qGYgKTX{d-~~@<;n@$Ti0b1o0UfNH=F4oUr9U4IwfS|@KTu(%ldu3>zwiV
z4xjHRO_`B!NN?82e+iU%Yozoi0ZDyz<ISMecQ`*QiaVcI9fM1e2=OE7%Po&~h$s4h
z!==l2!ghc}D2^gQq)Je~95W-A7#zn1ouy?VInx6YnwzCtAFT2#``|pos*fEFM`x+Q
z-$;DF-$YN0Q8dO>*2ht8e|NsDda)B-(ZZ(+3N?hDMf3Qf;TB@l^{!=9X^`t@FueLh
z543-f{Nhmga|&;;fG)s8_LRV)F+&n^q~!h=iu$Q@G~wM8t7tM73N*=kvIa<UO7PKv
zE^<%xPzN~YS=Ubw6F-t@#$WtF=AFjf*TLv(wA&H~g+FT_|9&pKs&uEH_^_C9#~^9;
z&iyHd^mdyFY)?0{7Ul}hGL38le7flCo{E4ZMtTifdBnV;tJ+4I=H}k*JTa!uXcmJ5
z?=Tp4SLJxvr<1i<916HTgo&naH<wGwSam}zC`w<hFD}YEglJ4nE2SIp%@)tD%G2j5
znJ9?uxCO3n1ZzC}2Qo+|$@x(ur|J!Of{NJ2>)8<43h{dQ@YZTQW&{oiN9qsD<A|Go
zMohu{ass*Xo$hy096(i74)$+VIubK&OIwOXriu7={uam7J6;F7C*LiUk66_9Gc~u<
ztd!fpe;)#t1k?$Sw$8L_=P>|IOIqUQR+h^s#&Y?<d83D+phH?_Av3%g-UY4pFqk_Z
za5@;l^_QS@g~n-z{2R6DMV!bzk!oylnxvD-xiko+Wyn(h`~FDtwvlhWfes0G?hb!H
zJI8k3^TSrPt}~;fy4=p{Km|y|Dht9b<x^}z<k0^3s9ipKNUg2cdKZ<phI0rr-|R&B
zyYcbC8zBj@OMJT2pAXZ`Y6^1dS4oz_)>IXD1{;RiZOCN(ELG*=_SPMA-2|~naUQ*{
zJstFCElQC{l4&+N=JN+J(`>Jr`v%ouf5WOu9-fcxPrr*0Z7zV<Kwn;0mn^A5ZQPfI
zZCB<jN%}HUlD0MIZAP@ZU@BMc%3g{GrG~1L5!_8m@00Nn0G`hSGQ^fGE&r<Gm!~xZ
zL`fkKs^WFuYZmD1H-d0rl4S7f%&kr;sdtrp%y530bKjHin8qZ$RV#b>9qAVGqoTE@
zEEC?TCfO3`qH?<@Kgna5tLGqVq`T_J5h>vR0#E*CTWsJi&0zb?uI%+t4m_>A;jCq3
zpg_}Oh2vh%EPTT_{tLwsF$%9uV)W!2`C&_je_WaWkTR3{R@d=nLXc#RLV%R`=xJuu
zKKr1TmVZlU274h_`YuvHGjabyEH@beZmA?lC0Ibw(4QcdpX-e2AyIHfsSX{V!jwed
zj?_`#Vz}65D^F+7QIU|uBrAat(Iwk9L3qf{Dt2btjF;||xcjASYsM_8`3HK!dEpPU
zYILfFq6D$S9M;Fh@+z3@O>d+5*IS?8BmN9WPj&3BU0siw2XQ7I%VD8`0-ZkojJ{=_
zO}X45ktB_#olC|=FQC#8CC3??uev+xp~?GpL(a~fg@2)f`<)7wqh^{;1YD)ImN$wN
zAr#F+&aGV<+kKo;NRBb*^Khw2=P!DY4ap(%k2!9rQ)%DZ+x>|tEXWgI?U1QuE_h9d
zcJ}QKo8<YnWKBa6xr5MFOn~r}IbNFYOEf_@ihtASljYYk6{fAbMd!T10a>R%QqZTV
zlXf;*TN2S9Zs5OIcc!b?b7st+xXB7NF#U=x3d7RSrgUy}rAU+4&9OBpsWHDUrN|R2
zJMk3$wwo2FvywC}ia&LO9W0bATl9H-uTrkFs^4z1lEy9)hJ|93*A76GPk+efHi4Ab
zN(ORYUXQ^{)CyFZBFf^;{|s?`Zm1?uij5OB*zV1x1m#LN94w9ud986$ZcJR)?5iE}
z%aVo{zkM!D+-{4IQc(C{c)hHZ76GzpN<4@)oCB_BF6T-jEcZ*;12D5bITjqFwP7x+
zap--Rr^!4mkKAfhBCmo(@|IJ40wu{N{%kFfHtC5MjCtmFUDC2bLGuiwaP7YH&KF2q
zw^Zi2fA?(~O;jPg+J(@tVMw(c__ShiZ|=UUwbl`@4ZiNk)3^Hlc5ayu_$(-Ms+(PY
zUK9<sobOKfWs!Gnh)w)+Moe$ZoCZY^U$wYZ=6nAN7ff$w>o<}43YyH=IotUb-73!w
z3okEHbVJs9S=`Es#mKWAhtzd}sL;)<<=_mT6pkY+;=WbA?L5iYKzdX!27tM4jshM>
zmp`;C!w89MNq;bWNs;2iC?m8|jw?s`o^=!8*4XGaK6`Mw_<c5RGI<%Sq=<=}VMTaN
zoyB@IwW&=aehIj3K8KuYgmIs=3fPU!O`6I}D83e5I1`u&z<m==&2wwV*2M}t9VJ4D
z+qr1vUWcdsJbSW@ZHkCDCeL^Y$lO^qww|m~#^AnH+=FdFNDPctgnU2<TjnE-C+LFz
z3&qz((4YV}Udrl2e6+!%Ac~H9@?$F0(BSDs9$LoLHQpJk+%W+ArtJmc-d5nbgXik<
zOW2Kgw01Mahx#rN1R|OmdtjllQ5H9m>?Z*zkvy>FEqNYpqMF#_ho;HiqA9%1sAr*N
zjXzS9DBF(mT8T>@10_<2QrnW;<5Q)#EzV7}oQz4$ky^Hec)FC2<3jK^j4<`G$OE~3
z3e6!A?{bE?qeD90@;6GGcb&$zr^2ynEw4&$92{+o$~Z~~FU+c{Doiq}gyt#!C=+&b
zmj_{ZE}9qSrN*RH_grCp6=fCCd8ShNPGyc!fXM3Q$6?Ly&&=BRgF-yfl!^K)BOl~#
z_wgm1)|tw#7|PoiVj|{e5X~$4rP$qrn&{VXwvOUhOAz%$Q*e%+v6-{mJr{4&+xLo^
zo7=`+t6U;m%2|HOP&I2Ohe;oq8s{k6E}qH-iwdeqQAepZ0R)>)UI}eTEfZ_(6h9eP
zVDs;|S0O_rEao9a;CYY7<|ztwDsXS4&meC7kE2_OK0iEv{k#3ESAmu)fcL2*`PN7;
zzSjwq=8z0TSp*x4HCXNEwhBJ)uF52H@Ff;E=T)WEL9UQf*}baEZ~cF3w@;@O5#1ZV
z^3^_z-IY@AAcV~Cpfc$Ho+<pu_6$8*e+W(Hr%Znf)J1^EmF?loiBgakWRP>cE<P|<
ziQRWy1DQ_~MD*oH7=nOZmGaZ|9KDbS8`LKbFVX-CdBJRj%g{e?W5MoE-?Y~nnJTng
z?Gw5`c)@HFo_?K}ai72*{ajhuELW2EIU#;m%UFY67GFH!VSQL5>K>}fheLB1gO2xv
z@3h><^3aCKB9+VKU7^TH+B#J%VYTQ4t+$pkD$DDPD_+T3E0ND8wgHq+-xUoW9rK}d
zYBjd})BG;|iajw&wrI5!U960KgV=L5$!Clm!!+d(q#e1THy0ndaew+SwIg(kLo7QD
z3_PKlI=uOrmVRh5Er!VX%f<;rk*7Js<T}d@Qt6LU(0bCztGR$w)RRN^5@Jej<ckhX
zIC;A0t-o3`ED%Lo<w=KsDx}$jrRrPPTXq#n$&4$8cGMxxPj#`JSyDN;%qg!nB`vf%
zO~AhIp5T@3+il4E{UvT~G#j8;@PUw<0@TdZ|HayYxE;73M$3ew(pspsHL_Wbe+h}X
zu;}a21OsC4U->Y&WfE~U>P8`|xPwK_QCIU<l-=oIixJgDnX@9xaQZ%qDtc-(PtV|0
z*U>CXr!}dnH((iqjX5Y8z^jbpB#|{u*ac18SQw2|{*jU4=<&}lFXyR00aC6+)p!D)
zIx#bMc|IcOzQn_!m1pFCw#+u%rzYTvbxtcz2_A9F>SZh$a-JEv@4;PQmQ6Lz@G_L#
zmbnD9R?!n|&s#;6WkY!)qXwin7-rqD0v=1#Rh6ewQD;s>dY2xemyuTr^*P<gVbp$u
z)iLb00b5+`tPPyctATu3oq3c&PhzY|D{nRYM}yl;A(NGFzyJhKm5T7nU;(>>@3W>>
zo`fj6SH-bshzt%=iK9Q^)*!nS!?7jNjJSfOvUJ3nf659!V7YyaFL^gs?O-Q`aKgLX
zIF9{sZ(8<w`<cTUmsAx=p6baEPmqQkwzg_Dgw~tgOcX?&sJ2^!g=*ob!cxhN-z}s%
zc2b^xVxQ@H-+{-q`y}4ck*La?1Mp@PI2OTmybUf1qX`oU&62XcQw=Mnbk=Oq1sS0{
z8a-i-xm()f^NTi9n%rya&n3EjwMvz$P>s^9sLZDYmL6^4?8c}xwr#ReP!>zYKF&q)
z%gv3~;{Vj;k2(bB8G_pjY63x#1;*7JemzZVLUXR2O8Z^gOr13vTUSP~ZP`Dq|3YO|
z_#5pJhCrdih`IUsc&q8J8GbE0?YCKq0|=IZ`GpEHa1vw(BDi^uwmFkzeUU3JU2@%6
zi^AOK>9o98EfpE3o5arFZmG`i$1(6Ky;a5WSBK-3ZiHclA%cZZL<cX9pm~H=a+qe%
z+ccR~u3*n^no&%t%~FkVR&3&NEtB6!L)lku%<SkQw88ah_t&MUQV{8nmJkJNs>rvL
zH0_|@DSED!n?Kgdc(Zma%rmMNR$dE0dHbi>SJC+mKQyLgXObzSAcR_r!rlX1Z8s@f
zp8UFOIizj!FhX>c^=#deuE{UJ%F`#s-5kH}tqwirl*IiJ0_eC&|J0)kkDR)RE=?UT
z_mk=rgV(~V>J&r&|GjDjt<Hv#vU@*Caf}7<H$C;JRyM3vGp1t<_0N{$yD!Pnv|$d`
z1!GBIUX+VGq@zpNjg?_Ll3cG!YMq$Bs~ae2+~cabQr;T!4RX(kh@D;Xiz#6dQ!<6t
zLdzPK1F!*-2R{5_5;+xmfauDp(N+tHp)_&bN(nlFkmR5MsukG3TeP5;CYa|HnBg2x
z2I}mp$4M)byv^ooIocTHnXLBrzz$A4u2IfRR=PZ#Ld*BmS=PO%IAt>IFhcU&GedcU
z&ObmcRX%?Dx0P~d=#-={b0wh?)P;6E%*k6Z&_5DWhbB7Z78QrW>Y<6iHCSRN%r&Df
z{WN@%n=bT-wSegnUeVxkNezlxh7$>JROWQY4TI68Od#tG8C%~}2N4%+FoU+GG!D;+
zZ#h10NRr~u%gFHi9vvn*6}7rj&SxCGEyU`!vp1H>Gmz<4-ej`2-22Q*I@1j!bzj_+
zZ|5a1ixJwQ5~!A9;^h8#gVaSB^q3-Dwxn%tqK>6X2FxJ*&eMwHfYBdW`C5ABZ<=fI
zgP?$n-R_jY)+y^7T75>)X3h~b?|{L8Jsr<<P<+TJ^op`S&0C(xe@$j6+CF%oOx@io
zZ`Yj*(RX5#WSKt?8~Eg#tMBAv73NP&=7f^WlwIswCrRi!!(CC1ib5JhA$new&=BVC
z4l`V&u4IAXSo%of$(c(wgFeE88u~emiHyIe?#F1G{n!Iln!UJP5jj1s-(KDp;kzbK
z79@!BdziE>F&O3>t~@#86a{$*fPp%fZdI$+V4d=A-n2tkONc3nm5UVN;ENM_S6ehr
zZ(gTw+2qya5reJcbo!>ck-KVR<GUj`Z^l!;%<Tt`Qj=IN;v2&+`D+E%sk=6v$c<2J
z@t%4O3$F5v+Jkpep97bOLXDS~jfb#fcXF(vWUhMJpMic%e}06%6W*b+ZYxf(lnc?T
zDFA1c?6}@F*=e)Gk;udg$*tN-q)nNroYD<@I-#XHwfZ8|uTtbE!>;WMnK6U$Cc>j$
zz$fj|^ary}t*&0|cfk)@bt=onfL~?6dm{V)P4pM)lQzKtpl(~K5)aZ5@pkHq{tCg1
z6V|`=nS%<2NbU&QIaj|66f=vSj30D5YXb<Hvlkpsrz%EUsV4n9J(>>%MC=78(EG&T
zZ8CY@JoMzVebu;UDRv%DjrX(yY^$#sL>d+zQ}ZGAFQZeZTyNIaFGs#XzK*=%UNYA?
zeh$VuU9koeC6NV3?f`%Kt)DX=W;gsg1Z`w6%M**@#zpuoOjPGK%H83Tw&438O;lS%
zcI*j*xxd_LP8@=VVrxpYR)#E%x_2UJBtNlD1;j=lR&T5SCj36W{!$KYx_a1_$BH=k
z2z7N*t@HE3DaDq*?K%4z7|opdizQX)X2B~%zEfJjd1XD<BgTy^PSOouKV#Kyn$M2k
z*0O1QiKAaEt=mGZ`+RwQ>0qj4HGYPu39t0OZg{r}9QzA3cEc}yNczr*F}k0K0z~-R
zz69|=9mlu5mMVVkLwS?#ttJqz2!bn};#$!r;2d|UGORyYP}9Xcs3pb6ooCrr#~lGB
zX{C}9dbV*GcG<ifL!i484c{(x#?0GPhPDmjuU?Kpr=+=VB4gLpxp(oCt%_V`y69S*
zyvNQ4>E}^9U4GhB&s!}l>)0pN@4xs?h9y!z?K<IyD)IBEJL&(4GVY|uSHhSk;*6h4
z+}&4uC4J#E(tKBYqC<N}rug{r1N1)t$o~)^KR}_AvHjC`3c5f`{9W5K&ANH{<$qBh
zMabSAA;$hBoujI-Cp{-TR}DCOcX=uNowO=oc4EC=<Z#z`En?&NcYv#)Sbg#}_vUGU
z%kaUb^1J^-o|{QIXSt%i=3we(gzr5CGoK?p^Hl0pT2xHxbe8oIx#;X8WRrBzfXqx5
z3p)b=IP2Rl-)_2PI(abPP5y|QVq{zPgmKjKXYbhyHz@8zzWt%9R%gBGvVJ$4gMDRd
z$^*QEZzRI^{2!v;0lJbW+8(~KZD%Gkv2EM7GqG*kwrwX9-PpEmdnPxYFTeNR`hUH;
z*E*|L7rLtY-m0_f?7dIqDG>7~`Rd+J<$ky0j_9Y+i|zn@cfoY*9541i0LgK$tX`=t
zFHm#k`wn#nNz$v2&{jkJj_vj9!9s;RiFL-<o!}YH#~k_AeP46vUE0%E3F`x~k>W*s
zR)!zBvR4Q>hKhxd;n#Gnb`^>mnXWQ+QzM6^I>U+Ubkn(Bll&#^q2HbMSY@FaI?wmh
zrPVk1h&xO|MN?`1==J7(99p-I+@?Q&x@StF#*a6A-e{#VU(Q`mdw4`fCN0l{T|H=U
zz=A0FVKbN6>-i+6B>KVk`fi8=lv?wA)Pd9b^-BawnHGz0{0|qFcJk2sd4fIA5y}s>
z0u1+6e|Fo)HV&dQ`y*rgol$va#B(M%4kca0TF8)TQ`s&Q;;$+H5_-f328@dsjEPGz
zx{!?+`S{)5<8#f>m(@|1UT&0UYb>z7*k<`~r%hrbKg77E8DCV&M~Yo>tkAp!<4RwD
zWctfAUJ_VcRr)cK>~rb}sCwCMb-jw`(>1NRf1qksAuf}N?Pj+-alV5uOl>?8@qh+z
zVb!a7K2%W8L=1X%l2&HgVb=0C#CvcY?F$>c{{cd_W1YQyp|TpA?q)}fT9B1qOu&uG
z|DrUCJ*J}AATK}#p-rGUr17(Y0-jJqav(&O>aT);X$`Sa>64Sr8Dg74w76BaANl)b
za{f5;YO-7=2Y=0nJTf128lq;1L|8;fiRXXK(RqX~0MVHZh?{l-z(|T^5gSsjxO}8p
z$N5j6)u`br|GY})@;@w_ddm6f7#Wxf^ixejPHa$I=>DSDs6#~mmc`qA;7kj!JC7q|
zt{`*uk;!2nL8+3Ajqp;4Kl=J8Vp^j&{A6qM=FDuHGaDdjl!81mTIVUdNPex$xYleD
z$_a6@Wpma~KPo+=VsqF*JHN(yal~G7Z?CesBH=4<Y}ZRWW4mI>j`4CNjPQ<D-JN-n
zxFtsq4plCTZHYgMT2O1QQkh_HJ%1|Pbsl_HzAz>I0yO>tj;OY2P^7^C1c4l_q8_#c
zE-1A8s`2YR@3t^CuEw=td!9w!Ub1U~qRTH3YHHAC00d74ygs0=6HB&a_Jc9XY-`k$
zWBpm$@AQ_9vX}PKu;LEWqssgD{QWAc*qy~WQK+AZP`#~(ZcsXr2~!)9QEh?HiQ*(J
z{u$7(i+3#F&g#G~D`3k4o4+NonJndnq$gM$!bjj;E>JbR3C`6^{g+eYx-!9^Evq#(
z!$KSEDXZJ0?qO43t8e|nG&N>UdMedr0w^1#k;1%%X?J$s&@3vY1EPRl&R2m`e*=U6
z8W+F}mg<o~m`2!<p70#+{+79{IM8~Erq05nA2P{Gp2~f?!~NT)<#3B}N==?k?W}e=
z-Kxd7Q%zpP18S96|3LpT;S%!h;hx$o!dju1)(YUs+IQ>>AE=~wz!si=<Pq5DyOLM`
z7XFUa{ryk{+o`XaQI>ca9hdNqQ6y~reMq4GqyL$l>i6G{7j}cKe}L@ILl7~CT@`$6
zGmh~xkd2;4T&oKD-KXODThd@VP`&j;e@mUz;kR>hx6u8My6dz_8Z-&y)itk2+5m9l
z^AVq<{_sZ&4GPaE87hZn<HFf;41ubaD_VV?h^v>BXo4?xx8ksXOynBAKDeuPEnVLO
zM-yjgJRQ#*;w<=0J4%JNOyN*ppNxasEzg9SM>(B%OPjONb;$9SFCJOsg0_i8Z%^JY
zJ}e2IG!ivC{YHGEQi;IJ%x4T!n&>k}m)<Gm8L}qRcM184nSoeWFdt|+e%|Q>Gv2O@
zCDD>K6@&Oj1S!&{)JrIa9r_}FbgVzmpORe0QpXDCm6<G*21^CPt;M#8)y6++D*Xx^
zGBd^7y$De=O!!hy7hi%&?45dwRDlw#ix*|52XZ~h?h*XrP6C<5tFQb8P9{x%!KcYN
z=QwQ)Ks0!hJm9%EZP4sNa?Hg&>}(@HJC01l=gP0rb~s>kyR}z*COBMGpfp1+r&d2d
zE&P8CRaS94u|Yp$yw2L!x|j&HoN@U`s1glrQTI}{;8V3(W(DcU{gUZgnA*nk><YoU
zf0J12hgkFLsSrG2^PB|{Gc5JBW7(%zq~NW*0MyJ=NN6Gi+DUMN(|4mj>vgL_b*m&{
zmasp{VD<T?IW`uOLY<k)N$b-kq>cP1{JTa@;{HtJmFX|z<Xl_uY4Y|#oBy6}(C@d}
zhZ>fnOW;Vt$u4eRvZFq6ldVP6`=NG($2+maR|WljaBd$Y-S-FFw&wCVE#qijp2TW*
z;Y;g!Hl5`qn*w<Pv<1}e`q?ipSsp?7;_O=vCS9XHwg31WHqfw3a-eEPem%bS96Pf$
zU4!Io{dA#m&(JI~?KXIpf@<k}89h%Wo|dhBH~+O}G37U*r>3%FY{a4Rn}YTk&>Dmf
zt_+%F$#VD+OMNSxZlCp5oLN;Wr`_uyI=##z+!h_LzpUP?=^t$oa1Df5;hKm^IV+lv
znh~l>9X8Wm<tF6<{$)5)%gN^xaIB5pfBPACb_*j1CR}@sdG{m9>F6fs^n3~*RCYSH
zbrSl84Xq8<m1A^J&XRv&Pe#Yd;5^uiU_<Kj^ZNee!dqF{)iskxY<>^Z@!Ef;?=b?z
znK-!3y=5Kr<`l$X*|=3)?mqV{5QMFROe9-@Z2|2|s!~~T%ICwAU%6G%h0zIT9d=(5
zH@<}O{R2GsL4XkWrl^Ya_81W#Qds5=dZl6<37?}j4=a?cY<5GoTQ4I|=OKS0Q<^mZ
zWoiQkx){78Mvnr8^-XmziOE9jEKQ)N4vH?7RrYjIvqag2$7yC8uBlD%EN=M|_7THr
zWwP#Q9u|X2JmmAn<^KMF@fii1!3)fv-L$F@4@RgoK)L_vBUV@g{`1+-Xqj&1jO(5_
zpfS&xS5Qr`yuoxe&rZvny5mN>w7PoyG{-aNFKk+As0?EH58pdG!7voct|+^lU};;J
z6f_5F$ExYetQ29uI9TR%hB`HZW6GNRd+=Phrm_D>n!l*1ZoS!JzLY|#PQ<iKp*F<5
ziZ~0W1A{9Pl6hkj=UGuNqXoBmIZWrb+hXQ%4#|N>^iQGM*xfE?KmM}j;|zs*BjlJ<
zcBCZd@O9ksf>;T;(k3FP^{6&r`Gm~x%aXI;eXNrQ>@!65Hlz(b`e~kR5qKIc!j4U}
zh-#}x+5V%VW#ODNzm`KRkrlpaitnZI=1o^!kAD=yx_zd0$<;9NQ)MVIY-7oiB1Na&
z-9fRm7l5`wP|bzcT;}74!hql2a*Xv;9#ro&eP@iDE7tiRK_Eod<3)%zdE3Z%xixNS
z7!8XqVJl_HXAE|zkmn-7W4DJ^wR(2098xB25h|3T)a9?{;0#O5dcX-JbLZEbp?Lp8
zh$rDdyakhBY8<Zp7mD3WWeOH8DCq;a{h$`BTGMIBn%<C2IH&G2s19beUnrdbDDzD$
zaT|x9qK&F-*rQvw6RhiE>6d{?Gp%emGZZ|Xpb0J!3*Xh4Uj9-gf%ZV{n@LZHBwl4-
zS7e#?ST`*}RgG8%?j6EldPy_&kJK`aQx>6K?Kzu_6P0f^jn>EtGy(m%1D+7x+3nGU
zm}@vli7f#uI4ATsP|bL&V(yA0LshvMjH^|{_%@`JFEU5FEkkbsRJRD_5KlaLNDfUn
z$06|n1YEJ1dnMJX7cCBpM6qIALqM)W*O-AUbzOvE{)U*SeM>7$cS2aUDc{N}>oB}1
z5QY9G5gEH)$<{1z?XV(hLPXFz=~njnCyN>>6TzQd?E`zUKwV!VYb7i5g1k`NmlKK|
zIz4-(Paoz_a)XteG;ABPo{12)2wg;kX;Qg!%0FD>7F|OF>r`6l-1bCb`N{$9<S!7i
znVe}Anu31*4$}RujybbRo3@T6uD(S&J59DeFzlJpI>KGLy^)!)IbBZ0jbiSZLhVSd
znTdm2sP<=O(p|=;sbqFqK0<R`Og!4{CGT$m%4wDHX>N)ND3Ty;Qgvd^SDl-lBbYI!
zTRe5;4LYs9e6*#KSVu}F0h+rAMC5ce?kD?4>ekw$TjB)!Ew-*OWK7pBA&FP<7+-u<
zn^)~u&BHD;l_O-S!RX5=B4g@$BQwt1#VO=sL3>gaT#y|XPS4<lVoQNcCn`L4dX3t}
zR_he{4A<i$&l3^KD#b3K0X*wdt9T1cM^Oe`S2L<wt*Cxl`1m~+F{;M=4|<6)N-_AP
z9vLm9W|hDQSmBvH*M20ghfDBXKV7UpF->Ov+&Ii3%piLoyrG0TLy*AT-Z{BWvF($e
zrd5b5Jk?<IwxC*zGZdO?(FBnyQHKdfq=KmEXwBwRG+aGXSmME|PNsvft8?6HG#qxI
zdO$0V?_}$DwhaAxL<UDA{bbY@GJV1=&rKv+#VzFdDIGDFQLYLxx9Aq)7+}WCiTB?}
zu-kKHMpY@7YU8V!g?xTznDx)`j<4UyrpxAH*YG5&gYE&l6k4`C<6Quq>aEPs559pN
zdFiT;LPK>mE|Rp%DLmtM2^@j_u;65|?PXQCB+SM`HBj}?;;#_|En5P%*Qj1zrA>BS
zPIf$#v!Omt2s+yAu<5;u{xh8(XV{At;OYUA85eYX3rTiRH7sH4c>N46-zQ(%p4)RI
zqTr!BtmiZv<FjUvUJPA34rs*KhP&9o@go_MClT{VtTE{XqOCM()SIewN!M!_%C*jZ
zEPFu9Bj<dQ-2LF2qBeF7az<NOV@LYoHzeGiW2yrP3+PHIF3MBJCksiT;Pk-Ko&Ag-
zlD2AdZ{a~_v4-s?gc&{G&cB8Fa5%lYf|JT%oMe?WOI#BVy3`Z)VbK;|_^!S8qgw%L
za~%=M82a#(Ttxmfr-`rA5SBh)Wu7KsAjP-k;!j7XRKqLc>|rF+GU-b$t#w!y_6}*U
z+FPA=9u#Xs<DxBA7V(8#SC3Iu&sGBPRKg|=z^oTc=E8*<%jJ?1TEL1moV*k`7)%NR
z#G%3WPdTt-MUKL&EoS1r>5K)i5_!q!I@`l3u9fMFig+}WBP8*z@O{IqwUq1jN4rnq
zaw;!7=>(6XY?;4in*SqW>V3}?>|Im<fq`M7^)|VfnFS~4n>}70R~n*bX2mA=eWszL
zVj>a|K^+{F2B2OyrI%11(Xr6pX7LY+{Jx>x)ApQ>GWT#qgY}%9arkkfvBBdv_AJfY
zOx}h^3cYYU)C`4H!TS5<G&<s5NYlomQXIC($;I#jC|<17_x*jL%g*8>;Jy}j2oGGf
zg;Nh7jx9X7Fr@ZpVI}qq#!otLvDLRI^ro_p;+`myB!k~<5v2W@-afFUA(0(AoIB2x
ziIiuH<b*O50R7^i3VVWzt6J(+T{lrwd+2d%X!kIv`;7t(9mZVFN7T5TfVqQ<kGCS2
zf?q=UB5igB>>|L$WV3aJ4jhF=q5>bxYSatEz$~ZgmA0%@J7h)U+*8$~9(O95`9Izz
zqhC@B?oocmJd?*mJml&}zq$KG76{i=zpFIh)=shaDS1IPX_!&JWMuj`<v?e>u^f=1
z@J+l|;pL6Jp%DtHbFYA6pVLe{`-~T-P^Y|-%~-WUFG@NtIgoyP8f-1Zc4Mlj6UZh+
zc?(}Iu#wydRO|{&r>a^1D92nAQS~%I?;Ju;JxzgcIAsis12Yvx4|}v23Zp+3Nj=4&
z^@I~)Uok&{@Kcmb>z{6^XtzF>Ya<<5BdfG<fozi98zGJH#umm7v<$S0!R0T|yG=DC
zvlx@7uOmyW8HS>gh7W;*{^?c-LL~Rh)4P|GBo!o1Tj`@G9Y<jJzB2ZUzL|2^4+`qn
z7aH{BiUlJ9<J@?kh~-%wAku<XH|iIoTXdz!3gwtK+|v=sCZ5fkT1S73D<mQglmix3
zF{?$8zRAKe;I=BS^;ZA#U9Uo43|v;ab7aaaOit&}TAtWMtM<EpC+NqvYToJ`C~?;p
zP}F<~-^aUwwK;g#IN>?0OT#ISXROU`A+c}=)BZUhq7w_jT5FJLkWF%2xpB%BoJn3c
zv3WI%o{EZC&tY<)eee%JgOH#zrP@RQ9;tiD8K*oj_~eKfxNHUcL93rR#6b6F*a9_D
zE8&4mW`aN`@dHU)ej&*Q6*wr)Gj;$AHR!Bf@1)3z3w><RFFnt!I(kq_yQ-7#xXVV^
zPfFh`fVTa42+92x82mjqctIq@>f<k={)THE44+605-ZejAEsELaDJpe?oS*ZkaKo)
zT6czk<mmz<)pQdhN9kK%ES@h8ybrJjNdhKbwbcvNeT!nH%qG?v{Ye*Xd(Ce5MTQ;P
zh?9l5S+o46;Ef)(;CH;0C$F?)kEWJuWUcfC_qs_@{)NH1bc=ShT}L>R3l?6r(4e@K
zoO?EgT&E7hA_k<8#8166+H^SOQrFD5r0-B;hdvGE*WX=zwX7Z^j+koc+5_lVZWVze
zw<!L(2_J1&aU*|{4rCyrLc)(!mlT&(%#IuQAAeLAVF+p)pfE&6rG@f>vBdn%6v6BY
zgbJ?$+XC0it<9lV_hn%*!LQOTR&BMB2r^w6OmXx%IaVANhBg<FV-*MgF>hzbn-9WN
z#4krS(^aX+bZsc<)xDuY?fdqWT0Moo7%`kv0mir8jIno9xaXETBSSd6s%WWi>a8`m
z1|R<`XSmoFY!j+m7&m|pXCL!*^fi<!Xqw$H4Ys|~$hSp=D5^}cb&VsxID%tXghX`Y
zaY?xe7dveu&oY~3WiDDUXNNmLupTy#f_)`PC1mk)=RgXHv;z5k@+|v~Af6IlBpSLw
z<{_Pf@!RzS(-ue~g6@EMMa*!pV5>hh^%Q5!5sVBfBd}7yJW}%xk3MIJFRP3KbJ>>A
z$@805@ZZz(i%~kI*Rxc36C>6DTZx(?QuceMDKS_<X(SLs!0#fTa3y-1sA5momW@YP
zYS9+%g6n)HrURv9*I#wgTOG1cDCiOW5e!wwCS~Q+bDi2XfT3kMjfI{T>#~DZ+7BTd
zMWm#&#!iLMb8M#Qdz3Ftk<@eur52J+ewK=DX_-t$<fg*p@M^P6zemygsTz9njA>=9
zzpiXaVV%#?Q}yp8_C=~zhMm&1j=6T!q2ghe1e9#iQJ?fo`)ZF3`#?jUn4OprTvST?
zoZ5T#_I<#^a<#4w@iK<jz~0Yay;8vGg@>tym4Z6-HfM`i6sN{pA*URW5(L8XajcH@
zUL!SD>Uf}gU+UihlSF$LKIcfS6V*lw>=1nJuw~6lYpuEi@TmUQCZ>8oPwG@&qgu2}
zN&S=XiuaG!kdsHktPEIIO<Tg3JI@q~S5fb&Tr8l(KL8s^#eedfKf3(7#cB;C9TrbZ
z9uci?`BYZG8BYqU+^<Wi>>3H;$qTf*^fQAl<CN**5o$#SEtD&WwTPQV8Cc;boQYU{
z%dxS}JUKmfOQ5zAs{NHRmwM~b{sH=N4j-h`Iq&V-y@K)3LpB?Q6oA#~OhUF;0nIDy
zKC&bM!?821yQ0CdAA5u|?CW;iEm*ell+)EYh5_)UJSLB9Qc(ME+=11+b!(eXar!3g
zuRP`?68`f1@uOD(losDyPZfiM5dJDCBAK*T+o<s5${LJ#K<$AEfeBqH?*X4!at$xu
zWb^#vN=Hl8UK(LLpduJ`B%gqNBFzlY6Rt!Z#EN@QGJ$@+BbRvf7+5K~b%Ff~7@9x*
zeUXtoGM}w4yUd8MEpV>>#4l`#Aog6`^9v+_(aB-1O*-ylTH}oIIO0^AIE_$`!Z?kP
z@mOv2rlBMB;ln$4^$LnOB%w-mpzt0Tx|pLFaC<5Ea%gC5J)%V-gZ*Xzy9i)TQLJ>&
zDJoc`6fpb!H+<rPx+?d3)5br*N!041((^}R`LT_5->8a8+%L`JJE6VzW_dcgiZ;`U
zUFLRpJX6e}ig@o67~)9v%#=i&y*%_*rXNxTL|7<J9IgcFh$=kPN(xL9&&YNBN2aFE
zLOMgU>$DN@!P!UIu|BD5Pi{mKszWmKJFbko&mMcu76KLyqS7!`O|u>7B7;`gBP2kX
z(qmih41IE$iTTSvk0kl)RNZ`<W_??9-JSGC54#7194BgT3A#zVDI828u5$#xqu*ud
z!d6_p3rmV#_a{PU<awJ>Dlt*JPCiUnWXnT~;gO`}{FgIjLU)V?KVxK^m0WofsJ~pC
zMk~o4e_SiuXG@H(u~?Re>X4mb9&sIninJWo!51)fV<8%$NCwPKdcOKRFemS?KCxj&
z8D3)ZNMZMpOQt_7t!dF-@oXWXZZpi>y;+-3fzq7bsrTxFdhhZFQ)AKPr}J^|P&GsJ
z;hDg+e`JLJKz~uZf5D6Rj{tmdTRTleP}pzc+L1T=m#F27(w^*gisd1dY7C8xrm*5%
zk2IR;{tpr6djX)#P_IF$O?Fmlkm|F1!YJS`u|g9=Awsl6s7Khhb(-iZ@w-mxw>=R?
z$=&!0fgMt>zy>)3#c|RL-AyK&(~jB2_;())$uMA0^#FSH_nAZ;^Zar&tJ%2{QrEWH
ziTnQQlH|UJ1V@Ee5`vrxA^6m>97cZN9;^A*K%QG`%;OOIRD8KJa&zwi&#NEauF@6-
zdcF*<c-kz-XTo@3VdddjH@du5D&1*;jT;flLBXzmHD$)1#}hs_87^f0*H6ZRWz~c+
zBpO0(oR^deHy^kbO4Cslk*=QsHsd&SuTv`RiW#$z-Lq0&J}>cQ7>?46GzPPuRfa%~
zkAw)N5g^PDLSF^@l-mj19_)CN%H)BrH?k?#i7Lb#0lz}w(AsN`x|dLKHk$QpG7JHE
zHli6rUw(`d2p+-ci{>(*?wD{ptvAY+B2L-_$y8aRH#=Y9muHEZ03xbcR^ZCC3lDQe
zr9x%*JYkk2Dyx3{k=-ZX<Mf695oYpjWHuO-cC+Ju%lz&Syb~ZkA;|{iV||+U`)8)_
zeH@}x2GUlSdUT#N2&9Go15jYxH-821BYrWeebK3Xakir-N&U!?X{34l^<^{~_dDqP
zNRs-A3itDT{mY<2gRat$`jI4wUGEy=^ks-sbu`aB{C8(b=7-5wk_6d}fgQvzBMHa0
z?l)nQ6xrF{nHtkkk`&&u7|}n#f7y++Yp!^`{790}RF~Z={Cd>6>n4=yRq97_C=WK~
z&cas>$mI#9|Eo%Ln9e7=YLXOWh27!G&x*7x2~x{#B<OJFq5F7p$!{zldL54c07982
zxCiou471;jMdO<~SwZiVq<m(wySPOqmSdcnzDUfK?z<dm14;$iwx?V}-hkbtU~qEA
z-(VnD@HF-`tDg}e^(7<0PNg5g3grvA)ON2m9N&JtOB+kw#+0ogWW3&xe#a`SP!z6t
zr-Y#P7SRl#46rm*+raoVGdKATkuM(BivOzQM=oC)3>f=X)w5uG`2|TVC5*P=c696^
zYNhJN(Yq-S`g%EJ2I(jPKm$doa3{Cf4=gQ}(pN}zT@fE;KY~_?9v!wTe^DLMwm7f+
zK50AAmL!Q7jBw1MhFO-ZwMqS0`lXoo7fBjtzvm%sQuaMsUKWJQpioHp4-gy)^BG<g
zt<gM0W$?QKOSvNr{>k=_;X$?}18!CY?5)em;9J68Er_553PE3z{Nrhjy~s=GAdRNy
zgn;7MNAibxu<XF+zTUIfx2HY5P;4Vk*U^{jLmQ>z@3miah%mhPH98u>#CYgj_|TJ&
z+}dVtp8c%|GQT@$vu#g)kDHbM2dbid4IwZHFgU>fVX9yB|NjfBqB;it52kuYx_{63
zzo6>ZBLb-Z0Fn5in$l0XT#LEH)AQ-qbPjS6BAR3{AB+JN5j$)t=gJ$9zat4cD{84B
zrz$e!1fDFGkrb;Z7Z-deMz~GNEaaNWKBGFnRpA%bclwxmk(F_ieck-=<r5YSi_jc`
zo@y9sEVrnsw)}Ny5o?nshgKM|WQ@t|KV38?12$Ny(bK(Vg)*&Q7kPeu3e%x{UyiRK
zsb;lx(O+LXX?!o=?Nhn~!Tk*KkZEb7WA(&Mwb7c9J(NI|mx?j*gP$4~-dKK1eU+~l
zdI?+p8iaGz9EXIag}-N42NziA7_izuSEstd^zi?l`7~;nLRYql)VGW>DYQ6x!MyRM
zcW^c{7wYkpu62BU+Cm#WCh`wIaAAmrE*b^<$mZRAi#88GB8K07pc7yP1PfbbkvyXG
zf9rPU6I}}aK8FOUuv@3f$NF)Oik&dU?}&*u`AGe%Sgup<YZ?*P>ta;#d+RTTGQ8T}
zHoN<~^lr$i`>jQwJViB`u=*95@vBcgYB81XS_XJtmViQUMNQt9Yx%H#n~jOus|Z09
zcLxI2K7PyV9Don`Qoq}6UQb@!y8%JLzp#SBXKK7h3kty~-+gy|D=S&?imWt<$};3G
zRs%&!3j!Jx^nDZ*U&5|Q{BJNZ2i2l$d<9o~-(9`SWN0@OX*_Ge9D}B88Whu9yj;`z
zAQi2hRJ{>zrb;8yoK*&QKRJ8OE91ZQSnR*18mn~@%E4MZD>1eVU(W@atq?PSE&@#C
zk!=DH*SmZDjIcO4VrO^j)X0*tR(jD&h71%ooxEhIfZO4;)-WZHn>|(@UpVWiL8rA5
z9Ywx4naXSnCp(fC`m}Anv0_lQ>9rs8S~U3k7@mFnDy_QV?&wq(pzc;Dti)Q-9CQl+
zXz8xpVo=fBos@@vy})H;Wl(HV*wXcLIHo4&<~L^ZY@b1VxSC0j82?YbLhtNsR1Ohp
z4)+rdiW5>z+?veF{o8*4EQL<m?ii@~uAz42<*I4ZY{DKxe?HRhJqpIg*!7rqcUd;g
z%K|JChn9L-d0*TY_q4EAWn>=Tv%*sbW};yxCMb>Tr)RGVkYH;6zHz4#M?x9ieypIL
z`)XE<8GT#=HX-Vs3U68%{~Ru!kiyj^M9a#d>WNj>HP_Pbxc=;9sihNFeKp%_<mEiD
zovfc~7usHM3LGsVh=u9;954sp)n)FM8STmEM@7P`*SCYjE4FpyQh!GiVa@aGZBLgb
zd=WVAKhw){gvror^z3na7i7b87@3+O|A;WL7rBAk-o5+0jneItQC}m3U}RHeqCs)q
zi<Btd4iKrnOEA8{eXP!|mPZEm5{lQPd2<PP%JNk)*le!$a4)Q?+*p38*X#kRPpDOK
zN|wOn0Sk-C5xg}{p8U&{cIVrlGeVso+ps$I9UCcSNE2`W0M084&U@hnAakF5oO=}W
zslN(cYb01N5&a^HRx1{ll!dxhxvz?SbwS4;(lZP;!?{%FrA1q6xY%sYZSFb1AK-OS
zwT)3GF=>Y%m*A#dBqxdMmT&LZ?8o%it8Ekr`i!+^bDzLl)TM=P_LP@=vmbfKUR(ba
zvh>%_B&8E4tf}m?mwBXRQ2ka;u65Xv4{<S%<q#Q3nI+n#qTozjjmGzSZTi5RovYS|
zl*+Qcz8Q<K?D$=6wAC$SU!Lvhv_59k<24J5J~q;+nL;EY1dlas-qQ7UU6!zyDGbS>
zIgb2jR!rwY-{-!RBf`Zaj<w)bOd0b&l1h4}Q#NwG{<cTC>a2cGIO{uc(?u65D*V{F
zVi-{Y4UF#NuEADU?`xb%Rds;$%7FpoO2!qx^&^by-GTZsa`9DTVY%knL#WGc%#XRm
z1{mW>ot1@##Gz$)ho^Y0tmj?}sI*c1&%+D44Z6#=6wgMRxyA`lXn%mc0ShA&GK1#5
z*F<AV7h=}}nFJ%JhN%(c*llE5t89gpV~u~aG2l{V2XNO#y0%9Btk2hZqKdEB93H>D
z-6=J!4pJMfeU=`;1X21i)ic*BWWq-?QVDQR9{mJgfeqyKnK-6NF>&=RS33TXDEP?q
zg~q*7BmDgQ6LxS5EME95zi|-H@w^L!9QEH4BBcP;D7w@7kj-{S=%uegg|8qYNY4`S
z?j0P*AiGVD`T+56pVKRIEfL)XcI}f)n`vu@NK1!Dn)Wcadgm9p0x6WVdLya~4{>^9
zjG;n*iJ)bqs^<|VOgb>cYFswh5}0=Dm6a{e2UQ<gWbaBu09cc4GsR$H1uCWc6_hmt
zWL+Y}fIj(pwPI5r5Elm1*<!TFlb`o9O^K*LEQ#jZeFE^g_M*VDt_$^*IP)4|Snat<
zKew9zTe#T9VcWO7ss58kWQ-nvm+&A5o%7ET^-LKCs$wKtpi$bcW0&3#`EUgC`A*u2
z*3Q>9&6g|Q@7MZ7M?|P<8aoacbBRl7s$jNyyAFzy#d1E!xnOnay06#G-lN)g{<`kc
zm;~IjS7H@G7Jq<~G;FgJb&|h>TrDGa)yXnw<V+5ofG6+94GlxBA$zLohIB)nNjIjB
zo<0pMnR?ozt~{R{u^{8$L8b8IyAG}}gBQ$dI4zJyZ{-HtCNX}uALSu7in*F%eDp65
zy<1ZS+ug0Fpb#l*<x&IcD6L^>Olzx@K1ao$E^%@BE0)kypbFl~W7MZaqYhr)o<k#3
zvRv5i0;C}vTi{PzNATqdb+d2Oe{E-SeaRKs!`?pMEe(P{BsQSb)cwA_FH9Iy`y6no
zX=I&dcn$oSk4^l|G_zoD*)h6EBkQ!VTjZr|^{(0ocN=!Ds==7ZQ*o++D`1UYV6aWG
z_gSV&;jp@al>Y9xc20=bdmpoaf#b&pv<k3RyY!lH!;{xuJk7C=X@#sx2kX|G^<}NY
z1q(qsKtIBtm9#MCGqu13HcD!4Z+mc}$iEq?s=DWOP5gf8D|;{NF7Z}xMqD(Xa)B$>
z&z;p0gXX;4dBQSbUu9yh4i_yaH`eT%X@Cjk`%wXFzZGz^q3w)NZDsvAY#_q8_{>)`
zB->h#hBTT|{wyXiCBI*OK(<2C>nnt5I#wUo+qUAR>=K@ji=aKwSEIalFEa~rAz#kG
zzIeU71TKeO^g65)at{jhUu#bROb>O2v6x4ESXQuOOzH_i)3?DFfZ2^<ujo22$8F@>
z&Z0c|1kYbgt>3PZOGS0K<TMpij&%)~PO0#2hHCWBBOODhi&O=o30D?cZey{VU$&Wx
zpK^1_w^Yj-!1`Pae*{vcS9SrOA~k*#plxm1F=snSZx>VGd_a~z2Sj&udq#yPzm#Bx
zv<Vk!uo-t;s_4M{wS<{J|BzmHrX(ZGJ!+90DOH!R?KWE83$0i6H3^LG8H2Y>`knRV
z);R@_ZuAo9Nb&pr=kvt7q?_v>;QP}W%>?r-rp8psAFNnV0K40$PgAneC1c$nr|ZW)
zZrYB30MIlUYN&|0l{3z^(Uvs=(<7{9&h_q#c8o@|hJCb&kMk(asZH1A&Si7Ni<#cH
zd7lz$)JF~;3pjvHf?QMV++*fd)OMU>um1RBxp+FIn(xiFM25A))*3@F;420bdut_!
zYelaX_GsleRJ~~wu@HYy!Dux6>NPM~j^#s`M!4-QUUi0JhYx;LU<-qtZnyn>L!WZM
z@+_6sff?7*Z_6dMlh3Gt$R$n_JPkW!1Su|oGVM<!@okAY;i~r~cBShosATq1_z_sS
z(V3dwvB4Kwcul-0s9J3uSs5cHV7+t#rFu)<{qrn^fniHF#IoA`G3D0~$Ij0dT5GBP
z@=&jV@Bkv&cCQg6TY6pEwet1*H2ipy>nY9yC0`fMQNHGDUR>@!QLm>v)cg%HzmPoc
z!kdNaiBTJQX46Aj+s_@`jT-NHxdMdMJM-5T4dBkDN*%$K3x~eumL)&M?ET_$ln77@
z;O!m}1$!pL3^hc%VYckVk7=+9lOJmkuVV-`I?=pq2D0QlqMXtos%Se5sbuN%S6*tw
zzs(D7dy#DY%tp?4C|N7=a-R^MoJou>=(K0dOa&3t2bY5dDFqvuEH=H-!=zE&0@9Q(
z1srT?xd+zQ7cFC(V_u$O+MD*HtiyWRcQnPaDQ~qZBc%0{=GUPX<8d8ryj}Ae5&C`w
z6(WqM4VWcLgp1fytu}@R!X6P-*ZKQ5CRh=d4}l>{%g<n(4q!#A=X=yKePaF&4(oD`
z-;i0)E@8Sndfe|VC2tuPGKAs^Gb-*tyyuA08=3z*hp6fjZz4^5aJiD{v$x2LH9DS8
z`QhLNcrm)^`F@~F>C{No0I?j6&2%-aD^B$GvjI+%YU@l0&BY$QmXa+mx$9?s3$F{-
zOptme?{;es%smqt`p`Vrl{dN?k%EV66QMmr{4SNb81Nrp7FQtQCCVFzq17x4NkdA<
zbtV1iTS^HAH{s)#AXN|DL8Ck0*6hXsHrf~m&Xzi8;VFue6;aQm$Cf5<B6}SM0|US1
zDO!T$N-e$Zp{6y@e}Se2I?8o_aiq=<22$0t=6S%jmEzbDuCeODo+^b<?x#pJ$G(C8
zaS5OE2{Z3-`g?_-;a0DVfEijSm5bU+T6i7YGa>rIQh1B4s`}{IXiZTLK0hiUBx}>*
z$qaHxjoW<cX>&~<{^gPHfYww|(2&(WIDvnV+&yjp3MA|>fYBCRmnPUp>_)-<2G6AS
zi@+dNFXj^U3=y<CgpQ&Rp409>QdS-gBon@_muw0+e5+{H-d_RI!!i1dQG-|4b+58l
zPaNBrZk;&&D0v`j*6aB!Zff|FPAZrj+@b8GS%?4DeL94xhNb21UIC@kyV5}JYIK_E
zVeweg(rHq^w8NlD=A8D^{^j<a<7(*+6aY9>^8V62ym4MAhAy=Y_y;ik&L(pUz@uJ!
z2vRvAQL=p>UAo{mU%GsWuZW6f98mB2{;~>^@<7=Cn-6E$w*Oc8coig_E3tUtN}^D?
z<jY@J&HB}Ga9`7SdLY5<8!D+oc%QI1;WDO|Y{Hi+AljDS=pA~ck&b$gL4+gMPxD{(
zI}g+HxV5swQU%|329L|%m}TV-Wj}A`OJf~2W;nZUdr%@{&{$RKX$nt2+|EGgZ?3$2
z`#-<a*4dm59+ijpg+(GU@;qeA(5&#+5L`202w8?FM+YFyX|I<1%RgF}Hz|3taa%9e
znFdOR9&OHKT45GF*e+gb!jN7N5xZQ7Q+8iW;IH&{2GO_4P+x);3E((v4VYsFS`>Bm
z<C;;mYt_szM=m2$K^ofjV71cIU;BEiYvykR!oK=x<Pl_0W}>)Y__lVOD<+XEjlHK7
z%YEJ!GbM;<YLCYQy1VphY>Kg51?44}Q_0ad9+rRM`giW;oS>V)bW@L26HrSn9YRsB
z<snk->T-uG$0-UE>?$4TGUoHp79vpR_G9D~Hws!qW%7cnUZ$?MhiL}#OpfQP2@Zc1
zzF_dy#}my*OZHoao^$7awg0QHeEC;beCDgv|9OoY{PUV?P`-5Hm#<R$W!jf7UHbBu
z>zx1P-c_iGHM;zOv6)$dDV5;~-wI7BsivZ$p+ZAL@6CR9F%FL=U0Bewq>X1Gf|wD*
zC8qjZ@vqIlG=J6lTv3Uk1=nO<b&>oB80lg?)cdKy`HJ5St#4SZL#WTR5u9E_SE0QO
z-!QJOFNrg4Xd~hHv10D4Xw}(zKwh?50$CJ|)<}fLhWmRFO@gj77H!FJs3NI1_}#_K
zk%9(#1Y*GT$}!=bjoTi70+Bp5l+|`__%|JAW6Y)?G=5`o5qDff4CSh7P0DSjN;ZwI
z9^*JW5;`z$?8u?tQ7poo_kQ>C9Iq_#3jZ3YVRv9LyK(rAi*+Rl;pfU-s{xm(EK!>1
zKqgegW+%)1kmqofP4VZzOpS)A!Q;rjGD4k7KGEbKfDTu4X(5a<+LZ70k&Zv(9nmk0
z?)RXVL9m;`+yFen;O}@R7hr~Rjp|MgZ%*d~uc8GWWK9>E`Yf|acqY@}REopnPeR^t
z2^40f@e^q$&t%~Le<lX4{fYk+Y5RZ9A8<(MFUQXRY^eW#&L78q)c?FccchH-`}hCr
z{P|Cj0ri8nl4v17bH?UG-sW`1rr4v=8X?M1d?n)X4P$_XN-PdH!;btiGMH9GZ3xvi
zq6#F1)A$x>;W?YluiLR~=w0q^VSUMbiLsr$rx5sNwbb!wKAU%+yKp(Zf!{gnq~N9y
z$WL)yqB6s>98+IEWu7%j!rJWiQILL#cZx>rh;}A%CTjaSHlH#R>1P6}OE%##A*1(b
z&I7vkxU-hUi8|>^*LYe^(3Gt$+II~|)F6Fq8!nwcoK|M^63sZb@uXRpB+@`X7T7du
z3K&vBL<N_o?*a|=`9J;vk`)Bv{KxPY1$bY5`f2q|DYFdRGLp4^HRo6$$tkSCvrw=R
z5#KX=!1Oc!J~muB1cN}3i8U@OUZ*pQtbF~A>L#VkqHe{_cUUj9p@_k}V++3zd|{;H
z1wtiO#hMlQ<#MVa%4t=cf#SMhEc;Gx?&%+^Ye*@^0xgeO-F3gh0lFac%)Ws(Uqui=
z3XA2e(`GeGF5aUILL2PL)U_*a=MSW>XpnwerjCOtVwdH5-3N_6UmPnri~H4I6?@#{
z5fbim3rol2p!SBw?-X^X7_zB(OfL#p0K~G~zq*{{Bk3nA&EK-Q5EY=di^8@{o}2}C
z4y>aa9b%gW<j%%_6`2U=cDck1+ZIGv%V$~w@k~-uQMXT?#%4q<9R~$QQ?o)4l}WXp
z$FLFBhafu~%$$y%FJ?(ujiO{|K!jLm&flUfY~A8hR#63YvetSDVToIqrPOQQl*M++
zaHh2y6A&?kG^*~G-1zwAa+TbvMW?7@@LY`Uxy7-u$x~}QK@!Z;JAyGQ{8Gr%2zNgG
z6V14H*8tUpp{RPGQsQV%)}qOOi9?*fwtNF>j&XIRXd>_FCH|^IWs5#E?0m+xmgVx!
z&*+oO1-dJ8V+yr%de_~jgOC;ZUwv^{Q;5YS`eEPLbyqAxj^$PVJ7oZ}vzlyweN1k%
zdP_80j*x%w6n0IP(<ZH#-xx<Me6)+p#PL!fi;BhFb{Cel$t$VHdJirK`&<vSy$+8D
zNss*2e_vboiWEVm2s&JW*Cqj6FTO!1XWtVo+3xUoH0bWs)03>xVf;dG#j*94^WX*Y
z<fAFW?;}+k(ON2L*R}8xGv!h-zRm!aU%rN42%De(m3?_{B$mV2!yWRrK;!)Kb99vZ
zQ`R=}4#GmHi%!Q}_qt8&AA$9pM(PQD7M%mS^sWG00&5=>x&unm&gIurkGROTMafO}
ze*pIoh#~ZKg)Z^)45L4%oF7|3LM<!j?{}z5GV0Z<Sa1<`Q_$4jFZEZ4lOK_3AqYOE
zU=%z%sky)F9Be)JKL@nsunxf2)wqS9?i0VQ+NE<6ek=4I6yqKVT1(Nq+`od8gYCWq
zj>B3j!v7idyxA8?RPd1lypck&11)O^3DV(3H1Y>UWv&NBVjSr25~lL4$QX2)-s3t^
z%`R>nAOp3|l1`g~&+POL^wlu2<y<0)3>YYjniz?Hi4q}IOP``(Ed&qU+auF=UuYr5
zOgM)i%9m4~k*Q-h-Hh-`O$YV2L2~t%FR<#A*o!^K$|@}++d1_*t1}aVdz)XP$!v*^
zOM@-OPZ?O3mPd{b!`gLi)V;n**u9Wwxh@9Cs&E>A2j2+!cDkWO1u^%MQ(g%eDOiD!
z(+M%0b6K77J;iozix+r;SFJ${)$ds(2X>zXaYWt8NwjFg{7}VGe3X!UEM2fBVewcL
zfRhylQ$AoilVA$9fMmC}$J$Y1%$&B(C_xn~h|VQ%35qp_S7zIbNtJf0^)(UCY!_a4
zk|>Q1)0mHgufT-<$j2`QzT&*`)dwPJne}X8MtW?6qR~UE!-bvn9DtKun|wp2MBtD5
zn-c{k&a3rd$ZMh27H4hf+e6E_jh_RhT<;>fOFWi{gO3k6$3L}Ye5}q8Z=qpPS2`7(
zA)K)P#*Z`9*fKWP5Tp|K`WoI0Vhg(!I%q+WpK`7#Ui||!)2@Xq3LC;#aLZ{Cb_$m*
z3pEJF@)TK9I`A?XIqI<y*ss9NX#iFAOWZek$*dGFKLSgzz7(bh894Fa<s8;r(p35?
zpv)zybc^b^wlJwd9rhkIj{)XPc$qV#6)-DU9MUn&wJUTsItNfu)H}44@B}xjcqY;&
z2%JOMzg$Nl&`Zj&?^{N3ZgT*uKK@t!JT-%g;kXBtsjlQfO0fF~II`x12i3^G1)8@;
z4yQjpha*P6{`mpo2XG)?u0GvDP)_exS~l9A8rSz}qjVBGgpC(r0uru=0W|T@$-&S5
z*iBmXu&G~ToqcD*=`m{kzl)q=ld2lT04h8LFgWqsMS)rqj$X1ZSMLf$jzr@MmZG(s
z{$rKuK>yRwB+`^V{bDS*I&x*TksL=Xg{?mH@%W&hU}CKchB};(uV|}x0uXs~BZ(ow
z*8yf{KV3=-*pC7iygO#pdE5TRuoXmjHE<==IQHWs<g{u#MUWG#VAVc-U^!A|q!J*r
z@SD9l?l1V>zQ!e3(3IYyb5LK8!sM9eV^JCBX+*?qBbT|&MX^~1*UD()ZSJsIkX5z%
zrNJ`ZM>UFs>^gq-9q)WcY7@eSY*eM5SlRLv$0`}Vm#Gm0k8vRJbYWn~Rp=h3sj5Sx
zQkX)Jm4Tt%x+TsjTZjkRsYHYP8yc8swP_uACcv@XyG9$a<8k*~Fc`@Bscy&`2?3tg
z*!!j7%mlBg^)Ixb9bVET>wHZ`!jm_*w2s(68*GblUV;r-{BsQ){BwumpYvojtR#Q;
z0T4CN<|=_+cek~+a7h>CtLXhA8Y7_9@Ep*cVdvrW=Wy9+i70hF8@=QdWrZzctVShE
zQddS|2|c!Atd$~Kt#UmPJ(3Jcj**@o<BUr|J5q~2BD7?ex~CY8r|o-c&4}A3lLzDZ
zr#MKa?^8rwXL|8-dy2rTb);N?=~Yk0P<s%fa5yeS^=N-KX0-JWUqOQFB8k8i`ev*#
zErXClOohr0CxQB*n(Q=c%%h*SJuA0vogyruVHiSby7+1?oK?;g_e1K!@2=Awdn$$Z
zV@%Y0$NKmr{TN{HxOZphqCtd78D9qKa!21Gqn*lzJbUV5e2(6N+aU(oraWT_r*tS?
zvr@Qt^b!AK-i?*5lBS?@jRCv{mJ5LfGI1LTc(jEZrymyXFgReP{lTLT6JOojUy_!C
z<x{Y$k=Emw7fmpaJc5=mtTCuqN7n%88K4zJM^+C_rB`D;K;HwQS60A?T(|QNp!KVi
zOltOi756(5+L!3%Po#WNqo$WzcGekgjVF{?k2%7snFQ4dcZSeghUm>0!(t2TQS^h9
zSx@Svb<Jr#>$0XELj!*Qpn1nKRyLnTYR5qP)t<aYFzb}%q+ce87F1V)?+J6%yHawn
zY4pD3y_tn>e_{~}Cn(E+--}RdQu_|U9H={b2j00s0dPS(oG0kn^=aKsu62wqFe?<C
zn9hNwRlSg;egvaEvpIv@_6+hhj-ow?FzWDn87ssmxc*5C7hepFtk$}$=ez-A&4c&U
zx@BM!w=Hy|lL{)9avQ!6>E-eUk;<ih0C?>){61;<bVBx#93D^EF?v>?->K^PmLu@Y
zntD|7wS7%Vn=>8n*&PW#=UK|`QfcmWLvv_=jZ}6}Udfl74N`ZU50PvIUkRvb<}3SL
zBx1Jq%C>_apT9T0;s@H=engR3Be6fA`%+*lsSoqk;d29buQ-uJ=*x3trWl|R^z=-h
zPc9k{EWt$Y;xg{-?fa6R!th&5uQBnrI{X{dII34;+B?K;o!%Mx?&zsWU+dSmo+CZ`
z_3tOjYqt3li3~~@;kur}YhU{W-%gRyHKN&iA5>31XHJI*=>jz+B!C@W`t6_nn}_hH
zOsR`!?PuqvbaufO62V*|0@fY(SfL`2+YdfdVKbctWbc7Y-`rYHGk$?PMNUxscsqrL
zP}pJAmh(NORONq6F(wjNmuv;)lq$Z>I4SsF9p(K4tdD=;gpH>pL*1v&2Y6)zjmOYI
zytaOZ*!(ra9!P71XFaof-~_hbTbqtpIh=8!u{`HAIZ$W*t^xJJ9fS5GT-&OX*)nb@
zgU9~Jr$f>~6DTDjRcy1J!`!3U;051`c&2eTMf|O((bAzkL{Y1OMp5{tH9RB2*0Juf
zf}QLxvs=Oypv9U(POftVUM#UCQ=7ES5_%QchhSy1dc9(y$vm@qjk_Bk;SMZ4EA{6x
zlflG6;MAp#bIs@hzgiY=OUkh6rd@l53MJCz1pfL|pp_<y_;va;ea*Y@!sfB^s|c<w
zb=yd0dh{YZ@PI1{8dh(wM@6Ih*`1#>p;IB^A`ybpoS!=rWefl|c(>It`E`xwWGI<p
zWOFrag|Ww_rw`e~FMJ(y4uKz84Z{nNV@@emUI}}AhAj*^$K6tsUdd^HDd;Zbb(S(F
zt3z=8x;5R{eD7d4ChyIqsm(=;=cAC5l~qgi&Q@}9qm-loW+Tn9zaIm2GVd{Q{c5#>
z^4+mCk`L=PdLxUIiHK1!f}tSjiKw|oIN#kE3rcjzh&yOiCP?x?2Uu+8yQk0Iqb(Ft
z{HKxd%^F(o$M;Bl6dRsmgkZ_Db`&d&m-(p34FdW#RS1>XZJRM~`40jh|Ktn*@wNwl
ziZ8XmB;b4R_>;g<y#T`lCRp0t&O(O*)iH1BLpnoBhfgm+s_P#>;%oIsiTbtZ`wFQ3
z@AzNv9}ErffAQ4+A^(hbs9%de(*F~Q_#fmS{<EN%Q{iv8x~qc#8OZ>|*1#{g*{?Xh
zQdeI8-K>;1f!pZ;mNtW1{42IT5GYw=TtI=dhL7|cC?v6IAUGW#M%U2iJ_Or}Meh0^
zfFQ%QLkU#O%6SG*;_~JE2apSZ7rzaMTt;s7=(>f$q5Mlv;PhQSi%HS*Z({OscEMwk
z>NcR!_Tj+!fXtL{KY^z3cy#a4pkQ>PWcS@9@{mjQB+Rsz`U{ZFG4xY$*!zw4JaDuW
ze2c_{PWS4sg&M7p+Zd>8({1Ere1-BwOmwkpGtS8~n_(E9Za@1x${~BXR~j#9!Kl)*
z=MDUJi;?GKTI|x}ZMOQ<b1zx!_+TTTWftqlSB5YKGiEqfjbn~~%V0^&b)V3(8NAo`
zE07OWU{rMCE|WAz8k!h!y&^ZufWOf>c0a6Xzn^h0-Gn@$0Ud=QhMAUdq=VC9V2EhZ
zjDaEnh)CzygHuKk5~yyxIRU?kh*_4}oPQr2(r9dROW>lkh7cQ|V2DXrh!BCpW7)`>
zy2B3v25vr33t8x>V7RqVH9A9=B&-w~!C_Jr?&Y_UJ6uFtyA-*?kx`7b7k~nQ93Um4
z{1H{;llMTBV#L{*gkT6HfgOcK|I-FjuHLYcz%j%&>^Z>*zV@{T;REGv0P;Jb2s$g^
zif|!?Tkyq|XuUCvKL$xpKjPSf8~nAzlMkkVYpcnJm4h_M<}Q@o!WXt6Sua4PEv0(%
z7Gqc=0zl?U*GiMaXIWC;gI&OlDl_pHYmo#<ydJ`(RK)k=78eci5dM$HWF?fmSoq=l
zuhWk(stibV7_iF~eyPb@t*JHAEPHksAqYx1U7uUrepvl>kB_>oQ|yAo+g1DlZa4kC
z(2=A#E7w@T<%uZ$`v^(n0L=3_$+I2Snkhjfs80u8wE?@D;CH3KOzi@J9fD}^mXSB^
zN$UiRL5{rQw)<>jLc>aynR`7m&B<lOmGNm-y)R8u)p|w}ui-fMRPd!9J1nck=bWg1
z*%P?8k+vY|98e4c<65~JvreM$$#T8+KLFx-iE<88T|(C|-~CL(ZsNNUr^7Ez!v)_h
z;lXh?u(pJ|2QK43V*1xXA@Zh&(2hs@w8TNgf+x|R^V9n5J_DDhF|mA{pDEF2bB`WF
zu^|u!&_!Mu=yjGr41f!CvWu$jsp%l(O7DOecv9yg(R`~`1Uz_+Xm4J5&Nin&HNJN4
z$^wh>Kw@Jt;$I39)1A4rQ1AXNIBj_T0KYA)2-rpbA{3NlcKiIhqjsrgTPl8j>+=C(
zog;ukQT-0Z6x6`_m_|gh3Tjo_){!UYW8B}G7eRl6{hK_PL8#5i+LO4F&OYd6*UNA0
zv18BSAVU`{qwXJ=NNxSMv^js>i)k}zfPzqjF~-Q2Apda0lH2#gJG)$NvAMo(3gE8A
zW&wCW)`@-EO-LH1+8F*F3JjsqZeqvkvmhhlU8gl7O;z+MUPSi}vg3fd!%Lt2avj_P
zsa@`V24T1%MzcZ<mzwkg(Wg8^DI?|o7ic1v-6*Q*$M=OP$gOY#&#V`Vq=_ZirD5d^
zaPm5ApopC!B54sdl|XeUF|_U%W%+x{qI<u?N+6FdF$40~#Kh2##-Io+Z|4JZ$dd2@
zo1ZQ+Qw&NFba#`Eu|^xU`bvw~VKiv5Xc`p_L=+kV`CGA#nwIt~1!cvcjbKw?QLVRt
zf;k>wCBs6K!b&b4{{W|0SO(LuHQH(J{IMry;%FTRZJ97y=qM1bpIJ?WZ$*_s=h2M+
z01iljQ3T}EACH$<?~Q`Z01Kq^=M#)$95A47ItxS*0y1<un87>EZ#Ib?3hN8+K0yE~
z*`T~oA#L$+DHakHfEM9uMQuRM5Nwh*)XSa0j@2V-REX|l8Q?Rrs%RzW3gk(ic_>h;
zGy*LsI##Jbj>II^LQp&f2bLUeg#Q2&0>JGS5tO6Z@4SHt)5cxEMa7_7AYM}}5WyOy
zIu6&)5{%&j5#fqVQJNqjG-|uTBues0tkCBDU{VG>C<vq5GDxOpa*i97&;e>2$>6$#
z>50^yR5&yv;7otQ!>DSWp@`*5{_)(H>emWbLI5==r+D`z009JB4>}JR2*q}VuYpbV
zal%82m<06y05irXMZ=(kr;>?J4oiY<MSys2whYaAh;Y;e1X2quxV--W>Bpr10AZI|
z$HrgqG=4=&0OekcR4I1*QR_fII5U!#)68&e@Y%c$3X}i}qp;-U@q&odD-1vt?|L-v
zSm)UAVj$W(S0!!0%ZsE}M|Ob*=p3OWphZO_09vSHVLpV{pc()WP3?(h2~U&_jUD?3
z5z~=TNHr3zCuB4WH(F)L6|WP`Nxm6t<q7}<M~Dq0P^1<9zI&196NW$=JUkDcINr=e
z$@>{3bU!!NTSXT~{l2q8G=E|b_Ty*3r5!VdM7uZ7E0bt8!P8Av`o)1KqklL?ET41#
z02pNQ0`EoHA*K5=*#7`QoumLYclrqi&++wArV@_?VgCR%XRLof7m~Qh5^zBg9lG#*
zR}&URgh`?t-tN%K7|T0g8!b9h#WEqzs+HEDCdTi^hUKb^SS<xckQ6M)B0i{_R-z<E
z{iI{EmdJuBNYF-QBmf{h0XFWSrEz~-5~emFS~t6J<!Dp|TWmCH?Kli(o$k=tmqzNr
zo;UaoEW)t?KwIXjFHI~BpGO&Ddktj<+xyD9M4)j69aOs+Wak73?ErY^em^;Q0+FTh
zu%pQzW?n@hg{EEuc`RMr<yL#f-7mKWqJZPjglF0Fi;k+>;s8Jmc2PH~FY@upiBK8|
z*BCXV&{Z*yNcz3vUke~zAhnUcspP^&d^wigw(RqXNPtmczRSAt&fX<5DqU2l^26wv
z5ib?k3#t@%=*SG7gbJzvNZweXCj_w$J(j!BE?eEhc#&pJ)f+^10{FxykePJ>?BHl<
zjibb15GHKLU+S)k+9|4F{5tZc6Txj>;hPAa0P+jEk@oeC=r_#VRXL%6K5!)hi_?P5
zSnWesx0~lbS^Sy7>-w`rA1AGtadX`PgPoKE$lo}td-4LSxA@E*>k*1mG@A$BpT<RH
z7HUq8L!)zs3rm9NqCoieUszF2#04(3lMkDiR=OcP9O1Isloi@>#1^XRcc5%4=-|U%
z`n!Q+E4qcCD-6&PP{EEM1DqU9i-?v+jI7zu7GpJ|v!Z~2VOM%Nh6ExqIA72;oZMd+
zEm-jG9@C*$#uYtbiwGe^pf0&^``q5$>8<RzM(}DUpq)v+dArEim?)FUuE)tWF$e~n
z<X2QBN4b2fXNimFe~iwslJD`<6nfG=@#{YRb$5LVbF9_Bhd8flb9=C_Ez{=+<pW1#
zgLoiljanFpcM$-Htyb%~q6Y4+7WD&tRQ~`u8KRQ|8&1S90LVCC16^%q!0c(H!?wd*
zwoj{RyD`aF+BW^+%h&5RVh%ar{%%VLm;iF7gWIe?SRxasD3(FZ5#wlDlSF$NE;_9O
zhjX$3CeV%JN)(ipCroHQvq~kYYI<Rc(ZPx;fL=jC0_Y<2V$o+LF#(KA7ps%>+5|Ws
zFoWMtI@8X1tERP~KJMRM@@GWgL_%DNruDo~gA7Df<={0{n4bwp7oqyb;U#H@AQS*;
zAXNxD6p2NuH^&!JOoX&{=yf(cN5(lN1~-hBs7ioVFzC9FF;EzJA1)2-`x}hill6_<
zrNm1paVCLHuDQj67-*P=3>^@z%Lq!^>;bk(=9lbhX#z2%4vYE51xvyRRPJcY8*YRu
zi#@g<JJu2_stD*jenT|Ds(RJ2z7U9W##p`hcBwCa_;HVgx-n;uj9tv<`u_O7oao_*
zH?=G04q*ctRyi6h7u$-I%F8N_5=>|%)gT>QHn*#SZ^lq8Iw#SZj53Daj=HemzD({v
zdfUX9+?Od0Do={z4z^eIk6yfSF$exS_Evg1>RiyoPhge9MG3KPNWMy;B)SCU<n+bc
zJ(gNBa?)6DCS=KrNl-8yIyh#oRWsOun_cCps4v(X!nd3Pw({)#WnElX{)`k7VG4X~
zT#i!H?m-W+GhLHUHvR~d8#@QP8Vku+!LxW{Wj|wWyad%3SQf7&)q!kv3g{eqFJ#L0
zrVxQ(6@Y3YdSr!_Km{2Vl>FYN<~C_R8I;OiB4~$j8uZP!4D=~jC2rE5i9<Yt3SmD*
z#qt0&xrYmrv9__0JE<dq1s#E#I412NK%Upe5T97-$B<2iTd}V??Nd(7Q7Nf%c&)Bz
zpTWU|z_uQ*6B3cTdCjKpd%su?zufhOU5>9bhU1c!JIW2GG88B^gvtkyHPqjBZ!SDH
z1zJhc6h}y-j68e1hS`L2&<G2|zsx8MOOiIaT4AbhoS;LBo6s5r60H!06D`XTlX)Ru
zYmYxkkfL4|IH$>*F8bgt(L~ZHp^h~=1vN`metW|N8HI92O#mKW3`-KcTwn9Ng_|Iz
z;Z5CTh_N8Fkc)H+p^iR}WjtjC1Ve+HjC^8jRTxD)Lq(WP3KC67kRB%j;s&D4ZkwDW
zwCIT4Ch{DoFo++cfGO)|S$Tf$fYh2BzOvN(z;PU62C$$6cTm3YC|1h1lTe<c`NT26
z=nFvuU=bV&1R`t)yqK^NMT<*Bi+~@Hk>-eqBq$=FYI6JciohtfbqXSjX7-fB5!4jW
zEJKf3zS|4H<RufYdDVw{qJ}>%=3Je1oNa|E9Bu1!Zb!&i7@nY%K=Yv12AQOZRl~o|
zPSOf)>79#f6O$aUcr-LyXYe(=PCYFmpy)V*yn}ouT*Xa!&Xq|b@@%qhO}i*+9QefA
zkoAxC;aG`48X&2+oFK<(G$F#f`MB4|XM&620%N5=ykmHNNszCGqWi#uamAw*U{yqj
zIZf#DXnPi2o%f0XCCQKlNVY(wOfxCcp0b`8zBzS-<yV>W8Mo*m!%#v4MZDvJdlj5C
zN;(I9<lH}41&j(zZ%8nC-^Nvi(fcNK*ds!y;1ca~0~~@WQ<quVu%)H8kpK@smG&MR
zbD$k2mZwZ~qL2t?8&FU&@tV*gNCDylUc1Py7aTWgD2)s*=6I4vW>N>(n_`js1Z1=d
zRM}GFy&;e(*TOtESjyBLle+i3up#qs&^W*ZRs0z#%aYPjG$<k1Ng1Wyx;DP`j_Rfb
zKqQ!&yt8)zkOT_W_^Y0#Fx<PWiJDR9rfI=m$EwM1X+jLon&!(ulb{jl0!?41szIZr
z0whBg=(M5-z|p@LNU1)eL!hW?@(>mLtAce^fJqCEGfE7!SlObDBcyTDE<@EfWo`EJ
zkvVP!N~A-AG$Uq9kMX<?_6gAt^DUR>WFgh9phaskZ=;$0lNd}Gt{!rxY<!R?B{T+r
zCFdI!C20kr;m@2u^umLEi#cegb@=ZV_y%{l2(;uz3!Kndi{{es`Nu4Ixm2%>cZVJD
zq=lL_S?X=V5us@Wj<@%bEh*O63{W=7KoFTiJ$ut99wAf$nKG?bG^ap@P$^9#w(D35
zl#oaiVTw^Fgky-=Afd*yZaqR!MU8^c^)jq;?76hrR+CUd6-`H(R0th9t_F&L%(!5w
zY&3T07-MiE(g2M(HQQ{sW!4l+44}50qP192tv1!5$k^{)V9+&=hVe!}P6X;)9ilV~
zDEPQc@poORQ;zQw7Q1sdOaAdCbw3z>0Z*a`lczm$V0Cjc89kD*?M!V-)T4p#jBKEi
zHQlzUzv~mnwUcV-s<8dIBSngufGT<g#C!cS*^RYw5VH#ksO=;Z&<i(2apue-SG#NP
z2P}fG$iPaT$uSgD;2T1ch($<dpMAGZMA1~Uu5bJIhSWoyAI<_Idilo!QFJ@kKa6*0
zdWZY|xwEgxAQd_t;>e64QVpnxJmBf}@OOh`)b4cTz=V|pVMJ{WWa|9-#uStgcZKU$
zB`4$^-a$17(=0+k(G)<1RZR@uvwdrTqGYZcfbrP^&f)>X4c!bY7$KpEZ!I}UAfXFO
zxBlS@m{5ZTBZ$Nl=N#&!Q$TTCMJp$Df!Qr{uq)iHa34%)yAHN3>Z{R5Sc&N8oYaT`
zUiJa4=$$m;1FEt1>s%xkZ8e3}02Y%fMnQNrw2*^rYH=MwY;gipTG;e|zs_}srCt+{
zT|8kS7zRa7RYLc%-ZBr<SrD*-2?g7rS6d?6?1dog=Ps~#QguL06vidc?*Vj&LsEb)
zr)a=4GN1@<GJ8veLOTW6PdP(id7D%O^aNLp<+gMoEB0<T!+>@qfOG<?=$rY$O+ahH
z8NqJsvjWUC0-Y3lb-6dYfUMc!F}*^`Sn6Vd$jHp0g^ezjw&>AvvpA8oo{oQ<ac(zc
zOuf2VDR_f~Q(6WLn?jqxmnIXJXD$V9`5oedfHK&G8y7%uqm8P^m%-)3!Iocu4HEHb
z^OSsmR>)XvV`*U?F|Jl10%21^i2*LDHr|5wzzA$KqJnS~o1Hiz)>o#SzaWVGI95Zm
z4|%eVd1Mj9$f)ljP^TDS2XJS+x-ft$yWkEEdDB`W5PL>M;(l{}5<tr+Au55uVIyKQ
zK!8aHoV>anwnbE+-M#{0GweZ&QC&Qt6G|eCrp4%;9gZ~3p9#Rz<KqCX;__C(+R*3@
zA^e$tV+(vA1*{~X3Sb|Nf<|ss2vV#m!&+rcfl003XV=&Bh!NC`97=#cB)FqQQyZr1
zN0D@$W#lEfvy!_WoK~L%&qJd8;3k4?s#$O%O>QGo1tkE%DDff3vv84BQaK)3iiECu
zfoWq@?PeH6hU`}(MsPx-1UrhmFjVvus3TXq@I&RNbu`(=M#X?aGIqCWv>lncf1CkB
zL;xj8CRK>lpfZ?^9o&q(k;76LFw;d1hQ-NF0>-UUhe8?1OQn<3f8KLST6E+Hr)o<`
zE0R?aqML&S6l-PzXf*&0@X=V5iDs`ZLv~V>R*or#+hcUik6+#ZWvI96PZpC3E9O_Y
z1F_XU8&-*T&=W9C!*@9WbcsU+mQgtxGLVuRks42k^lvj#_s(p7!(qZXVXcCEA-)W@
z7eu#ZQxP%_I;%#9tbD@IfDqY0A`T1&VE_Q=Cjk#ZfU}^TUJv(Jv7ISEAsVB%R+xK+
zePNfd=w{{1hl`g$LW2>UOpq`LKv;o}_kiT!ejq}R5F@BD>&Il~oxp-Gyb>WJc8GQz
zVe)SgxTP@)I!a9(hJgqIP+$@WApizWmF*xKX*?}x#ka^refn@(!-$rY*PotdCR~hB
z4NJ(gne88uKiZJOlf%zA@Zc*}9V<&V21wJ<+Xw+KqHlUIdD(*s6y=Enz}DbkN>PoV
zbOl#f!&E?kD(av;xK)fKegK*=_^3iqi?)>9xI&yEkl??8`31+C0_qY{Y2nTKQ(P@2
zg6<xjs6n@h!C<68JYm@4Ts)nDIrWw?iFk}-peITrBzo!*Aw|<8S~$s<(Q7mmu;}Z?
zJ=E!~*Vm3PLXB;Oa%J+|+J14|sC^In{bjU<A4j>?S0$kkcgyi`bytBA2Srj%ydBrS
zoq<k;6h`jzoIK{1_h`ic6t0>~kQD?7>o#(LqcHs-w8uaMjsyF`5(!gPhype~E)>hX
zP@{@#V8=!)g{~f+`{Nu&79|a6Re_Uzr7T{DKooS6M_c?&fY89HVr#C?vm7xYih!|l
zQieJ}?~Df_(RvCOZWPuu{#8iWT*CP@JHZh|wW-;piScklvLHb&5Trqjc(y`npjc>C
zx@bo>!V_afqNb2KJOZZ>H0;o!rkf(@t0eujBV8Z?1L6)J&^_|-hPhxnP3-x|p_EZv
zF13r~0jPUBw#We}AV~ALxi%ID&gYzF3z7gR0djI9COBAsGzbep74d8W21g`+9cHgc
z#@f8L<l{CCB{z>+22qm$z)25SdwbkPLi7bxt2~$TZ`8wBoGtd{3Oy+i5U-CI(Y*^P
z1Q40%@s?%5tPFOnxK3nCO#%Z~fa3wt$8Oq`Z9CZsF&MuHKx=42Vy}~r{v>2kW!fOk
zIeI;xMx^Rh`}L0c@kw@gd&~6+9R!^rxz4%Bgp`{tPZV!dm;w6chR6Yd1TC1~WNA}E
zRVu*fQxU(Q6IC!OI*9R)<)pYt0Mr$U)-xY_U(JFl8?F}cEr&;}9rvu!yQmhn4I+1r
z?FdMMi&W4A_h;oBgG(8HF`NS}6s293`^qzT9@VY_f-&D1osC)n6|!1gVggh?X(#{?
zz0(&YnUxbrgoA1Y%D_@O%&idTmbj~i%w_3)_;tZJHI-jW%}<9|XN(r%p*2=EXh3fU
zTU&Fn!nq2xT(dgG0s%V_-!lSEtxId`-2$~HSU)llOS79~sN`J82aI5tSS$_U72Los
ziaTgHn4ZD%c!2~(_lpM2tYc>+-i%p28}ASe8+XO$9PQUQwANvpd$5vT9dym@iXLl6
z2kVL4y1*%Wvo^vE1UcIXhRQ+)4kiLUxhD-0bqmR1?KZ3`8+>n^I%4qYB&lI)I~q(=
z>~6U{0uxU0*dvNCf>XDA8)M@Dq7!?$<!4w#=}K_=D8UZK9&(?oi0`sA<><grHvm;5
zflyxzTC*{$R6GZorx;#4c&Rl2Vr)}~HxxnROL-4}LK9WeCcf~hbJB=0!>85;aEv*3
zY=T#K<S{kk8nObjRK*jsPH(q%L;k<s@T`|)Ojlf^I`0De0?7mc(6OfUIMR-l6XX8?
zGE`jpBy1M|sYXP+ltMt!r(l!T@Q^_OP%&<}aNPIrhqbKHHj_0)r56SQDZmnD6K8KI
z{=b|Q08@UmTY5a+aD9(IEG?#y)WI$_rO6xx2s^x(+cRy6*IR1vXJUPAK|+UMsCd}D
z+{o+;7~?s=P*9U#v9CE#PItAlaatjIl*qlNrdCbX*biJlmJJEd6`@yZ<E`DMA`dxe
z@rc_rMR8GoH4vkEHi=TIOkYwqMHt>ON;EneDvpIuj4i?QP)&3)J<LBKs?eK~D?ir;
z0_llP!axh7vIxc30#!H4D}=&Ay@#9&bCB1pnrUR?5W9Qc6AE-)m4YnjCJuf@s46%R
zwBq6I3Ru)oX~q|xFu!H%CyMr(L@w}vOXzhVfCn7hFxGry(O2s>ZjUg+htKnd(q@PB
zagN0Nn1P{DbOHE#YaDJMqXHJvWTX{Pa!y><?rkchZ%RkTKobIYtR7ZAT5x5FAgUjB
zF-5s_Q6HEyNr#9+l^V;iB3HZs5Dy-o@9!Wx9{fIYfJLb%I1NW3R#Grs>x{N^xmhUM
zQ_;#Y)$lU3&{T}_bU0{8fnh7r3c4bt!)-4+S}F>Tiz?X<QKgY;paGla^@$z0BEQo#
z+s<7=>06t2+||I@qnsxokA1Vq9iSR63f))&0VzXP6axb(r!U4ky39BrPR#TP-O!FA
z4!Ho8;5)~`xB6^>uD6!G+=<kn0?4bW96!6g3+@)rB4}<pQV|2Of2;juJ1Ckt!~sDY
zmXrk$J4Z1hi(WYoO$dY&QYb^Tfg0la!boAT^=McaB#l#YB|C6D@2oNmk|>dTb7<#z
zztGMKj}Qa7oS7ls1O~8Dk{Z0PkDT4Eyl0t!S;&tKYk#-#j49~?0Dvty2u<OT_JJHk
zpfy;9xqPLZO`&v{dj%lSQFO-2DWNL{u&(k&>``%cm?(u*8tbDsipFC!A+b3)&J;FW
z(Rf}#A|@w`&toZ?6sW@K#jO!Wm;`XN-dn=WrQL<H22V*KFbD;$M19<E5l*F)jci&D
z1Z&(&6cX@l8>qVKqHjoSK8FB##87?sz=F&Dxh-yJ44#~kiXqv?Dm%?m2Zq4~UbT;o
z*-nuKNR}fi@a!NeaMEeW2^KXcUIX)pO3(#TyESz18s@x!OWiz|lwzLFo6;VkDn|<P
zoGU9xM4B#)GRB)0ddo!Bj?F*Dvt0n?IvgX7Yp)p;4Fzy(j3r4)uI~4Wtpk;|f{%w1
zx7(WqS1h=E%-X+9mA0WW5_`cHTy>7Q8{Kg>p$t?pK%@fJgRpB)SPGAHye7)zoK_jf
zuy`^`h~Or~Q35;K-)0tp49K2#bxF&u;ZvhS=Y3&d?9O$hQ7{9#t--XtwiQ5L9*lS_
zjNAVI0Hz?c0{(HfLQGBY0e17e66#5Efgq(5o^S>|PcHGO5EXZ!eeHt*H!dblclpUq
z{{R>pt8%FZhn}#<Xr<p-&gP$3U0RJetXbh*rcyBpI1IH&1pxyjf)K%e0b0N`jfJy-
zhc!ZgOW6}p0Lw!^Isj0-Jtxlb9v#@WVMGeFR$&Sy%|ZSbE45r{2qP0}Za%W=A$xg=
zkn9B6tcbt`bgSr$CwBFc(Kdc_u{e8h1tzzW-G|y@5rBt?Y%n)CK;##1%)$);V2X6k
zv4Fd!rY8(C&=Q*<?|nngZ2eo8ZJ$_31HTWC_T#4%8bQ0z0)$R*0kiScBS415;%9=H
zN{MX%0dt$yGL!^L;c<4NfG)KibFU_HV=6pvua2=VI18}j1*V{^Mqm3(1i%(2Ovw$^
z^8t=sgQ_>Vk7H4n&v{5`-Ay?2a&~2pslB<HvB?1Xum;8He>j%*OfVI&@y={3&r_!W
zJoaPE(oB5u*0FRJXAWTb!Q5{-E|)hC)<Ifl{6$^=0CKExLIO+|z_w|}VDjD5SdDWE
z8_-3CFA2O~s6>S<l_?p=Sn`k(#287re^~R4FMwTC^8z27SiqF<m=Zg<8Cfj=_<oE~
ztfNFd0a^At#k8jcBS3Hf2Z!4!XOqWnx(x%y1ZCI8vZ0QBV@>a!U>ARb5IhCN;7xvU
zJ}K)Rtoy@{c{$z%c-xdN>5`v2&i=TpSo4E_I)i5j0Xbd)tO%?fL^;Sg1=#N;xcH$$
zqN^y=jp4;rM<ynKI3SKpY1EW78Eqb?j5jU_Co$^4<$A)E_!NF$`o?YoHa!-8nX2q+
zs&luzKnk-@7?hQBmWtd06Gx0_^VabIe;LlN20DzV8^G4{NJV$ciZEOkTjPw3Xf-mr
zrlA^Edd5X2SPy`Eq2pM+DmcjU6aj4GjI66>jD<!(6L`l^^}xjtREE#Wb?D~g?EEmt
zw945Mq!rRJtJHpQsGb}RcWaGBl4;Z4S%kxm5(T}dyc>cRr9+Yn@rGBL{{V7ExJ7K;
zn7vzl6-p3jl#SyzF@fV0ZlF|30=!|^Xm$@zr#B^n)y!aPaPG814i)(`WBbBF`R6R!
z0^%{Zhk)-GCRVBM9GAmEtK7#RN@7X00MOU0;}Y*GLXd(+9dH+g)sWK76hot3WP?V^
z5diG`<Cz!)51eh;VVg38QFXT0G&J8ZuEazXkF~>8u(QZXuuUC@1>%J|I6T(!y2T18
zWrLmCF7KBM3aSF6DHh&drf~`b{{ZlkW6eTCvo2g7=ligr?XK~3b>j`TKOS&K^kf{B
zG(@DN?2YddZ9IoMrag$>HHP$#jY4jKZFCqChhf6J{_(|TAXgTW^x_q13Kx3~3E6L0
z^g%0DF4B>`uMR+RDS$eFp;uP$H~10uGPD(Wy2;E3<FHMnSy#w7`WP*v)QNM5VINLi
z3V;AAZ8wFG-~`cOrqr@Mn0p_+ZJH3IUECkqJ$PG$C`fD<WvZISDKH4#a9f4hFrY?I
z180Ub*3~MCCB40p(>5McJfeSj-pUxa#&^s96*4inpkn2t+~X$iMWK^`_6|{-9?`xP
zX1<T!7lmmPTn@ij0wi@qAle<6@nq_25AegaPZ-8{;w0UPM=|(v?~Y|$>usTu9bhVI
z&V}2#qjXIeqAuwnwJ=>v>kB6xm3s%I(Ky>?Yn4MG({gcx%1CY-^yS+(PKL>}BO4p}
z!RfOW!`!SyjXLVMWgr`t1TQ<`teoOShoKo4Qg?$7Y|SZi1@05&cPV)82l~P-4DpE@
zJ>|NyHp019A*mXv0z2y#uM;cJ2PuB0K0(zWn*mzQmEIyy5#U4XdEcV&kSIZEo9dAu
z{{UE&0x|yp<BvQ<=a2Q9PLU{oJj9T-<o^J#6{<o{n{6+HM8{Wrj=lY5Y6XfmcRFjl
z)*0Ac59NzZB2mq#`g1TxRyu#_$X0#FUI5k_lg9xUZd>Ti7KsXP^OH+>9e)=ic~f3i
z>b)8>o{p>_MY|_iI8=V%{><jvuJCah!%!6p^J;&1$G!@+y=x-0#>TYu?bZ;mbRM$d
zR+RDo0GKKQTiidqX|Sl*Q_ed!0Ra8Ju^?`~6wMQ)n&VvKT7LQZ#*>mLd&|1C!<2);
z&Iu8|v4#=L!<XJotLkQn)A__D_1*)MT5{PPHVQ%$kV?7AV44V1`^bKbdP0GZB?oye
zu?)^Y4x-!EF(jR6&5N^+yhI!4kp3~^5pPG|7;&%`6Q8VQpZh`~NQ+{Zc=!RlUTNbd
zhQ)>J9nyilrOg*yZfgxCH=+{ta3oDF4)MB4)E+RcmUl8lPm`R|LHrqB#p^`gNV@Nj
z8K6y9CM$A<Pi$aXvl?bW*)#$M5wSG4K#V>&mh!IRbBelJgz3RBF0?5J8;P8m%Q#Q|
zWI}4nTE5D6Lg7(CLOqLY9!CV2$bdW{ecmxdMBq{$5N~*r(x^v$@?vd$x%1~CBg%`g
zGkR%%E-?{z2UwAO_&L5XCY=mN7DnOgjL`^3dg~N8Qt)?`pwMp!3RAO;^8P=LD2~xX
zxJ(e6frHQ-VipZN4)JPnd1rXiZPKVB2=Kf<@S<S=Ii@R%q=NE7GePk6Cn$6|0%6C@
zS=8F1ki1o(fsKrI9-e55A|t#=HZ@%^c|5W&5_5u!DI(5+vjYS*Tx7gRlo6(%jM648
zYrLy!iX_%BLblZf9e8walMsP<Zt!Em&pD?FwHf9Of7ahQ5cPK)5RJS;5Fmoifd!oT
zJh>Xb(BVZpqrUdzJKcQK6s+0KEFM++nC=+?1<KBGb}y;waSqT-fC1e$3j`gRO$sG@
zJ*E0$Y|c;gq~;$^hr=8y_l_h<MSTp#0+h0VO%)Jb@Z5|CE!fXL@0?f)!Id#714lpa
z85{K5i3xumaw3(yc)($5I;Z!M5rfX8#HgRWWH$Z`8sSU-0Mn324YQg{M!OO{3xJ_p
z-!=!e5rhZ0j2eVNB<U^31{Kr~$))?nTDN{|2`W<wQL&sJ&NE{|?&O$26vQGm*wL>>
zZ0FYub<8&09VGQN`^ZEB{eE){bZ4+Tv8`}TbLHAfjvlk5ZZYPS)17*58Z(8p{{Vhn
zCHmHLiEeX;ld}*<;F2iq)?fAhKjG&)$2|W4$^B!G2mGJ@96A30hpc)0f5*T7*`*4~
An*aa+

literal 0
HcmV?d00001

diff --git a/boards/shields/nrf7002eb/nrf7002eb.overlay b/boards/shields/nrf7002eb/nrf7002eb.overlay
new file mode 100644
index 00000000000..d580a2efb8c
--- /dev/null
+++ b/boards/shields/nrf7002eb/nrf7002eb.overlay
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <freq.h>
+
+/ {
+	chosen {
+		zephyr,wifi = &wlan0;
+	};
+};
+
+&edge_connector_spi {
+	status = "okay";
+
+	nrf70: nrf7002@0 {
+		compatible = "nordic,nrf7002-spi";
+		status = "okay";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(8)>;
+
+		bucken-gpios = <&edge_connector 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
+		iovdd-ctrl-gpios = <&edge_connector 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
+		host-irq-gpios = <&edge_connector 19 GPIO_ACTIVE_HIGH>;
+
+		wlan0: wlan0 {
+			compatible = "nordic,wlan";
+		};
+
+		wifi-max-tx-pwr-2g-dsss = <21>;
+		wifi-max-tx-pwr-2g-mcs0 = <16>;
+		wifi-max-tx-pwr-2g-mcs7 = <16>;
+		wifi-max-tx-pwr-5g-low-mcs0 = <13>;
+		wifi-max-tx-pwr-5g-low-mcs7 = <13>;
+		wifi-max-tx-pwr-5g-mid-mcs0 = <13>;
+		wifi-max-tx-pwr-5g-mid-mcs7 = <13>;
+		wifi-max-tx-pwr-5g-high-mcs0 = <12>;
+		wifi-max-tx-pwr-5g-high-mcs7 = <12>;
+	};
+};
diff --git a/boards/shields/nrf7002eb/nrf7002eb_coex.overlay b/boards/shields/nrf7002eb/nrf7002eb_coex.overlay
new file mode 100644
index 00000000000..a8925c25567
--- /dev/null
+++ b/boards/shields/nrf7002eb/nrf7002eb_coex.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf7002eb.overlay"
+
+&nrf70 {
+	status0-gpios = <&edge_connector 5 GPIO_ACTIVE_HIGH>;
+	req-gpios = <&edge_connector 6 GPIO_ACTIVE_HIGH>;
+	grant-gpios = <&edge_connector 15 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
+};

From 9bdfef468c180c8c7e70ae4782780cfd1edf7a71 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Thu, 12 Sep 2024 10:43:45 +0200
Subject: [PATCH 0030/2913] [nrf fromlist] samples: net: wifi: add build of
 nrf7002eb

Add build for nrf7002eb shield on thingy53 board.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/78330

(cherry picked from commit fb69b42d5eea9d89526106a709aff6faa833986d)
(cherry picked from commit 9dbb226be696653e793499b46b1acc9e97b6e926)
---
 samples/net/wifi/sample.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/samples/net/wifi/sample.yaml b/samples/net/wifi/sample.yaml
index 694a4d68f92..1c106e4897a 100644
--- a/samples/net/wifi/sample.yaml
+++ b/samples/net/wifi/sample.yaml
@@ -62,3 +62,11 @@ tests:
     integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
       - nucleo_h723zg
+  sample.net.wifi.nrf7002eb:
+    extra_args:
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+      - SHIELD=nrf7002eb
+    platform_allow:
+      - thingy53/nrf5340/cpuapp
+    integration_platforms:
+      - thingy53/nrf5340/cpuapp

From 1f00ee210404a97739b0687c4114a0975de6d2ba Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Mon, 16 Sep 2024 15:42:48 +0200
Subject: [PATCH 0031/2913] [nrf fromlist] drivers: wifi: nrfwifi: determine
 shared iovdd and bucken from dt

Currently a user, or a shield definition, must select a Kconfig to
signal that the iovdd_ctrl and bucken GPIOs are connected to the same
pin. We can instead check this in the driver by simply checking if
the iovdd_ctrl_spec and bucken_spec are the same pin.

Update the nrfwifi driver and remove the redundant
NRF_WIFI_COMBINED_BUCKEN_IOVDD_GPIO config.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/78485

(cherry picked from commit e73deb01ce5a148b7721d96fbe1076904cf1119c)
(cherry picked from commit a5592170a2207a922e54cf6602348999d714fbb0)
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi          | 7 -------
 drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c | 3 ++-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index cf423082b4e..d8cae0f38c8 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -664,13 +664,6 @@ config NET_MGMT_EVENT_QUEUE_SIZE
 	default 16
 endif # NRF_WIFI_RPU_RECOVERY
 
-config NRF_WIFI_COMBINED_BUCKEN_IOVDD_GPIO
-	bool
-	help
-	  Enable this option to use a single GPIO to control both buck enable and IOVDD enable,
-	  there will be a internal hardware switch to add delay between the two operations. This
-	  is typically 4ms delay for nRF70.
-
 config NRF_WIFI_FEAT_WMM
 	bool "WMM/QoS support"
 	default y
diff --git a/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c b/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c
index b8b45d7f811..c5f909b4c3a 100644
--- a/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c
+++ b/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c
@@ -242,7 +242,8 @@ static int rpu_pwron(void)
 	/* Settling time for iovdd nRF7002 DK/EK - switch (TCK106AG): ~600us */
 	k_msleep(1);
 
-	if (IS_ENABLED(CONFIG_NRF_WIFI_COMBINED_BUCKEN_IOVDD_GPIO)) {
+	if ((bucken_spec.port == iovdd_ctrl_spec.port) &&
+	    (bucken_spec.pin == iovdd_ctrl_spec.pin)) {
 		/* When a single GPIO is used, we need a total wait time after bucken assertion
 		 * to be 6ms (1ms + 1ms + 4ms).
 		 */

From 43734cb9f5df0de2368b43d71607853287d06a5e Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Mon, 23 Sep 2024 15:04:23 +0200
Subject: [PATCH 0032/2913] [nrf fromlist] doc: extensions: link-roles: missing
 module not critical

External projects building the documentation may not clone all modules, as
they have manifest filtering. Therefore, not having access to a module
should not produce a fatal documentation build error. Convert the error to
a debug log, so it is at least traced.

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/78876

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit cc965eebdd681f8618e5e7f0aa426a9fa56aa3b3)
(cherry picked from commit fd55a6d9caa397fc1db30be01aaf98a576a688da)
---
 doc/_extensions/zephyr/link-roles.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/_extensions/zephyr/link-roles.py b/doc/_extensions/zephyr/link-roles.py
index 19d2a985487..c1474bab312 100644
--- a/doc/_extensions/zephyr/link-roles.py
+++ b/doc/_extensions/zephyr/link-roles.py
@@ -9,6 +9,7 @@
 import re
 import subprocess
 from docutils import nodes
+from sphinx.util import logging
 
 try:
     import west.manifest
@@ -21,6 +22,9 @@
     west_manifest = None
 
 
+logger = logging.getLogger(__name__)
+
+
 def get_github_rev():
     try:
         output = subprocess.check_output(
@@ -88,9 +92,7 @@ def role(name, rawtext, text, lineno, inliner, options={}, content=[]):
             )
         # Invalid module provided
         elif module != config.link_roles_manifest_project:
-            raise ModuleNotFoundError(
-                f"Module {module} not found in the west manifest\n\t{trace}"
-            )
+            logger.debug(f"Module {module} not found in the west manifest")
         # Baseurl for manifest project not set
         elif baseurl is None:
             raise ValueError(

From 2efd4bcf4470f852db53131956bcf3b8f9e2bdf6 Mon Sep 17 00:00:00 2001
From: Olivier Lesage <olivier.lesage@nordicsemi.no>
Date: Sun, 15 Sep 2024 23:55:33 +0200
Subject: [PATCH 0033/2913] [nrf fromtree] bluetooth: host: CS support for
 remote capabilities and FAE table

Adds HCI support for:
- LE CS Read Remote Supported Capabilities
- LE CS Read Remote FAE Table

Callbacks have been added to the conn object to allow upper layers to
make use of the cache commands, with which it will be possible to store
this information and provide it again in the case of a disconnect
and reconnect to the same device.

(cherry picked from commit 947a294d36b04e31d2fef2c45c4926a3cbfc7d53)

Signed-off-by: Olivier Lesage <olivier.lesage@nordicsemi.no>
(cherry picked from commit c0809df7e4e7b97efe75cec86f73ffafc26614a6)
(cherry picked from commit ba2f1e0689cd7ca7789682d4a9540cce09c72a7c)
---
 include/zephyr/bluetooth/conn.h       | 175 +++++++++++++++++++++++++
 include/zephyr/bluetooth/cs.h         |  27 ++++
 include/zephyr/bluetooth/hci_types.h  | 109 ++++++++++++++++
 subsys/bluetooth/host/conn.c          |  36 +++++
 subsys/bluetooth/host/conn_internal.h |   6 +
 subsys/bluetooth/host/cs.c            | 181 ++++++++++++++++++++++++++
 subsys/bluetooth/host/hci_core.c      |  23 ++++
 subsys/bluetooth/host/hci_core.h      |   4 +
 subsys/bluetooth/shell/bt.c           |  76 +++++++++++
 subsys/bluetooth/shell/cs.c           |  43 ++++++
 10 files changed, 680 insertions(+)

diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index fa741715504..6ddc9835ceb 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -262,6 +262,157 @@ enum __packed bt_conn_type {
 			   BT_CONN_TYPE_SCO | BT_CONN_TYPE_ISO,
 };
 
+/** Supported AA-Only RTT precision. */
+enum bt_conn_le_cs_capability_rtt_aa_only {
+	/** AA-Only RTT variant is not supported. */
+	BT_CONN_LE_CS_RTT_AA_ONLY_NOT_SUPP = 0,
+	/** 10ns time-of-flight accuracy. */
+	BT_CONN_LE_CS_RTT_AA_ONLY_10NS,
+	/** 150ns time-of-flight accuracy. */
+	BT_CONN_LE_CS_RTT_AA_ONLY_150NS,
+};
+
+/** Supported Sounding Sequence RTT precision. */
+enum bt_conn_le_cs_capability_rtt_sounding {
+	/** Sounding Sequence RTT variant is not supported. */
+	BT_CONN_LE_CS_RTT_SOUNDING_NOT_SUPP = 0,
+	/** 10ns time-of-flight accuracy. */
+	BT_CONN_LE_CS_RTT_SOUNDING_10NS,
+	/** 150ns time-of-flight accuracy. */
+	BT_CONN_LE_CS_RTT_SOUNDING_150NS,
+};
+
+/** Supported Random Payload RTT precision. */
+enum bt_conn_le_cs_capability_rtt_random_payload {
+	/** Random Payload RTT variant is not supported. */
+	BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_NOT_SUPP = 0,
+	/** 10ns time-of-flight accuracy. */
+	BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_10NS,
+	/** 150ns time-of-flight accuracy. */
+	BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_150NS,
+};
+
+/** Remote channel sounding capabilities for LE connections supporting CS */
+struct bt_conn_le_cs_capabilities {
+	/** Number of CS configurations */
+	uint8_t num_config_supported;
+	/** Maximum number of consecutive CS procedures.
+	 *
+	 * When set to zero, indicates support for both fixed and indefinite
+	 * numbers of CS procedures before termination.
+	 */
+	uint16_t max_consecutive_procedures_supported;
+	/** Number of antennas. */
+	uint8_t num_antennas_supported;
+	/** Maximum number of antenna paths. */
+	uint8_t max_antenna_paths_supported;
+	/** Initiator role. */
+	bool initiator_supported;
+	/** Reflector role. */
+	bool reflector_supported;
+	/** Mode-3 */
+	bool mode_3_supported;
+	/** RTT AA-Only */
+	enum bt_conn_le_cs_capability_rtt_aa_only rtt_aa_only_precision;
+	/** RTT Sounding */
+	enum bt_conn_le_cs_capability_rtt_sounding rtt_sounding_precision;
+	/** RTT Random Payload */
+	enum bt_conn_le_cs_capability_rtt_random_payload rtt_random_payload_precision;
+	/** Number of CS steps needed to achieve the
+	 * accuracy requirements for RTT AA Only.
+	 *
+	 * Set to 0 if RTT AA Only isn't supported.
+	 */
+	uint8_t rtt_aa_only_n;
+	/** Number of CS steps needed to achieve the
+	 * accuracy requirements for RTT Sounding.
+	 *
+	 * Set to 0 if RTT Sounding isn't supported
+	 */
+	uint8_t rtt_sounding_n;
+	/** Number of CS steps needed to achieve the
+	 * accuracy requirements for RTT Random Payload.
+	 *
+	 * Set to 0 if RTT Random Payload isn't supported.
+	 */
+	uint8_t rtt_random_payload_n;
+	/** Phase-based normalized attack detector metric
+	 * when a CS_SYNC with sounding sequence is received.
+	 */
+	bool phase_based_nadm_sounding_supported;
+	/** Phase-based normalized attack detector metric
+	 * when a CS_SYNC with random sequence is received.
+	 */
+	bool phase_based_nadm_random_supported;
+	/** CS_SYNC LE 2M PHY. */
+	bool cs_sync_2m_phy_supported;
+	/** CS_SYNC LE 2M 2BT PHY. */
+	bool cs_sync_2m_2bt_phy_supported;
+	/** Subfeature: CS with no Frequency Actuation Error. */
+	bool cs_without_fae_supported;
+	/** Subfeature: Channel Selection Algorithm #3c */
+	bool chsel_alg_3c_supported;
+	/** Subfeature: Phase-based Ranging from RTT sounding sequence. */
+	bool pbr_from_rtt_sounding_seq_supported;
+	/** Optional T_IP1 time durations during CS steps.
+	 *
+	 *  - Bit 0: 10 us
+	 *  - Bit 1: 20 us
+	 *  - Bit 2: 30 us
+	 *  - Bit 3: 40 us
+	 *  - Bit 4: 50 us
+	 *  - Bit 5: 60 us
+	 *  - Bit 6: 80 us
+	 */
+	uint16_t t_ip1_times_supported;
+	/** Optional T_IP2 time durations during CS steps.
+	 *
+	 *  - Bit 0: 10 us
+	 *  - Bit 1: 20 us
+	 *  - Bit 2: 30 us
+	 *  - Bit 3: 40 us
+	 *  - Bit 4: 50 us
+	 *  - Bit 5: 60 us
+	 *  - Bit 6: 80 us
+	 */
+	uint16_t t_ip2_times_supported;
+	/** Optional T_FCS time durations during CS steps.
+	 *
+	 *  - Bit 0: 15 us
+	 *  - Bit 1: 20 us
+	 *  - Bit 2: 30 us
+	 *  - Bit 3: 40 us
+	 *  - Bit 4: 50 us
+	 *  - Bit 5: 60 us
+	 *  - Bit 6: 80 us
+	 *  - Bit 7: 100 us
+	 *  - Bit 8: 120 us
+	 */
+	uint16_t t_fcs_times_supported;
+	/** Optional T_PM time durations during CS steps.
+	 *
+	 *  - Bit 0: 10 us
+	 *  - Bit 1: 20 us
+	 */
+	uint16_t t_pm_times_supported;
+	/** Time in microseconds for the antenna switch period of the CS tones. */
+	uint8_t t_sw_time;
+	/** Supported SNR levels used in RTT packets.
+	 *
+	 *  - Bit 0: 18dB
+	 *  - Bit 1: 21dB
+	 *  - Bit 2: 24dB
+	 *  - Bit 3: 27dB
+	 *  - Bit 4: 30dB
+	 */
+	uint8_t tx_snr_capability;
+};
+
+/** Remote FAE Table for LE connections supporting CS */
+struct bt_conn_le_cs_fae_table {
+	uint8_t *remote_fae_table;
+};
+
 /** @brief Increment a connection's reference count.
  *
  *  Increment the reference count of a connection object.
@@ -1359,6 +1510,30 @@ struct bt_conn_cb {
 				const struct bt_conn_le_subrate_changed *params);
 #endif /* CONFIG_BT_SUBRATING */
 
+#if defined(CONFIG_BT_CHANNEL_SOUNDING)
+	/** @brief LE CS Read Remote Supported Capabilities Complete event.
+	 *
+	 *  This callback notifies the application that the remote channel
+	 *  sounding capabilities have been received from the peer.
+	 *
+	 *  @param conn Connection object.
+	 *  @param remote_cs_capabilities Remote Channel Sounding Capabilities.
+	 */
+	void (*remote_cs_capabilities_available)(struct bt_conn *conn,
+						 struct bt_conn_le_cs_capabilities *params);
+
+	/** @brief LE CS Read Remote FAE Table Complete event.
+	 *
+	 *  This callback notifies the application that the remote mode-0
+	 *  FAE Table has been received from the peer.
+	 *
+	 *  @param conn Connection object.
+	 *  @param params FAE Table.
+	 */
+	void (*remote_cs_fae_table_available)(struct bt_conn *conn,
+					      struct bt_conn_le_cs_fae_table *params);
+#endif
+
 	/** @internal Internally used field for list handling */
 	sys_snode_t _node;
 };
diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index 903f32eccb0..880cbeeeccc 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -60,6 +60,20 @@ struct bt_cs_set_default_settings_param {
 	int8_t max_tx_power;
 };
 
+
+/** @brief Read Remote Supported Capabilities
+ *
+ * This command is used to query the CS capabilities that are supported
+ * by the remote controller.
+ *
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ *
+ * @param conn   Connection Object.
+ *
+ * @return Zero on success or (negative) error code on failure.
+ */
+int bt_cs_read_remote_supported_capabilities(struct bt_conn *conn);
+
 /** @brief Set Channel Sounding default settings.
  *
  * This command is used to set default Channel Sounding settings for this
@@ -75,6 +89,19 @@ struct bt_cs_set_default_settings_param {
 int bt_cs_set_default_settings(struct bt_conn *conn,
 			       const struct bt_cs_set_default_settings_param *params);
 
+/** @brief Read Remote FAE Table
+ *
+ * This command is used to read the per-channel mode-0 Frequency Actuation Error
+ * table of the remote Controller.
+ *
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ *
+ * @param conn   Connection Object.
+ *
+ * @return Zero on success or (negative) error code on failure.
+ */
+int bt_cs_read_remote_fae_table(struct bt_conn *conn);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index afdb03f0ce9..48d7196c9e6 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -201,6 +201,9 @@ struct bt_hci_cmd_hdr {
 #define BT_LE_FEAT_BIT_PAWR_ADVERTISER          43
 #define BT_LE_FEAT_BIT_PAWR_SCANNER             44
 
+#define BT_LE_FEAT_BIT_CHANNEL_SOUNDING         46
+#define BT_LE_FEAT_BIT_CHANNEL_SOUNDING_HOST    47
+
 #define BT_LE_FEAT_TEST(feat, n)                (feat[(n) >> 3] & \
 						 BIT((n) & 7))
 
@@ -268,6 +271,10 @@ struct bt_hci_cmd_hdr {
 						  BT_LE_FEAT_BIT_PAWR_ADVERTISER)
 #define BT_FEAT_LE_PAWR_SCANNER(feat)             BT_LE_FEAT_TEST(feat, \
 						  BT_LE_FEAT_BIT_PAWR_SCANNER)
+#define BT_FEAT_LE_CHANNEL_SOUNDING(feat)         BT_LE_FEAT_TEST(feat, \
+						  BT_LE_FEAT_BIT_CHANNEL_SOUNDING)
+#define BT_FEAT_LE_CHANNEL_SOUNDING_HOST(feat)    BT_LE_FEAT_TEST(feat, \
+						  BT_LE_FEAT_BIT_CHANNEL_SOUNDING_HOST)
 
 #define BT_FEAT_LE_CIS(feat)            (BT_FEAT_LE_CIS_CENTRAL(feat) | \
 					BT_FEAT_LE_CIS_PERIPHERAL(feat))
@@ -2395,6 +2402,12 @@ struct bt_hci_cp_le_tx_test_v4_tx_power {
 	int8_t tx_power;
 } __packed;
 
+#define BT_HCI_OP_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES BT_OP(BT_OGF_LE, 0x008A) /* 0x208A */
+
+struct bt_hci_cp_le_read_remote_supported_capabilities {
+	uint16_t handle;
+} __packed;
+
 #define BT_HCI_OP_LE_CS_SET_DEFAULT_SETTINGS BT_OP(BT_OGF_LE, 0x008D) /* 0x208D */
 
 #define BT_HCI_OP_LE_CS_INITIATOR_ROLE_MASK BIT(0)
@@ -2417,6 +2430,12 @@ struct bt_hci_cp_le_cs_set_default_settings {
 	int8_t max_tx_power;
 } __packed;
 
+#define BT_HCI_OP_LE_CS_READ_REMOTE_FAE_TABLE BT_OP(BT_OGF_LE, 0x008E) /* 0x208E */
+
+struct bt_hci_cp_le_read_remote_fae_table {
+	uint16_t handle;
+} __packed;
+
 /* Event definitions */
 
 #define BT_HCI_EVT_UNKNOWN                      0x00
@@ -3151,6 +3170,93 @@ struct bt_hci_evt_le_subrate_change {
 	uint16_t supervision_timeout;
 } __packed;
 
+#define BT_HCI_LE_CS_INITIATOR_ROLE_MASK BIT(0)
+#define BT_HCI_LE_CS_REFLECTOR_ROLE_MASK BIT(1)
+
+#define BT_HCI_LE_CS_MODES_SUPPORTED_MODE_3_MASK BIT(0)
+
+#define BT_HCI_LE_CS_RTT_AA_ONLY_N_10NS_MASK        BIT(0)
+#define BT_HCI_LE_CS_RTT_SOUNDING_N_10NS_MASK       BIT(1)
+#define BT_HCI_LE_CS_RTT_RANDOM_PAYLOAD_N_10NS_MASK BIT(2)
+
+#define BT_HCI_LE_CS_NADM_SOUNDING_CAPABILITY_PHASE_BASED_MASK BIT(0)
+#define BT_HCI_LE_CS_NADM_RANDOM_CAPABILITY_PHASE_BASED_MASK BIT(0)
+
+#define BT_HCI_LE_CS_SYNC_PHYS_2M_MASK BIT(1)
+#define BT_HCI_LE_CS_SYNC_PHYS_2M_2BT_MASK BIT(2)
+
+#define BT_HCI_LE_CS_SUBFEATURE_NO_TX_FAE_MASK BIT(1)
+#define BT_HCI_LE_CS_SUBFEATURE_CHSEL_ALG_3C_MASK BIT(2)
+#define BT_HCI_LE_CS_SUBFEATURE_PBR_FROM_RTT_SOUNDING_SEQ_MASK BIT(3)
+
+#define BT_HCI_LE_CS_T_IP1_TIME_10US_MASK BIT(0)
+#define BT_HCI_LE_CS_T_IP1_TIME_20US_MASK BIT(1)
+#define BT_HCI_LE_CS_T_IP1_TIME_30US_MASK BIT(2)
+#define BT_HCI_LE_CS_T_IP1_TIME_40US_MASK BIT(3)
+#define BT_HCI_LE_CS_T_IP1_TIME_50US_MASK BIT(4)
+#define BT_HCI_LE_CS_T_IP1_TIME_60US_MASK BIT(5)
+#define BT_HCI_LE_CS_T_IP1_TIME_80US_MASK BIT(6)
+
+#define BT_HCI_LE_CS_T_IP2_TIME_10US_MASK BIT(0)
+#define BT_HCI_LE_CS_T_IP2_TIME_20US_MASK BIT(1)
+#define BT_HCI_LE_CS_T_IP2_TIME_30US_MASK BIT(2)
+#define BT_HCI_LE_CS_T_IP2_TIME_40US_MASK BIT(3)
+#define BT_HCI_LE_CS_T_IP2_TIME_50US_MASK BIT(4)
+#define BT_HCI_LE_CS_T_IP2_TIME_60US_MASK BIT(5)
+#define BT_HCI_LE_CS_T_IP2_TIME_80US_MASK BIT(6)
+
+#define BT_HCI_LE_CS_T_FCS_TIME_15US_MASK   BIT(0)
+#define BT_HCI_LE_CS_T_FCS_TIME_20US_MASK   BIT(1)
+#define BT_HCI_LE_CS_T_FCS_TIME_30US_MASK   BIT(2)
+#define BT_HCI_LE_CS_T_FCS_TIME_40US_MASK   BIT(3)
+#define BT_HCI_LE_CS_T_FCS_TIME_50US_MASK   BIT(4)
+#define BT_HCI_LE_CS_T_FCS_TIME_60US_MASK   BIT(5)
+#define BT_HCI_LE_CS_T_FCS_TIME_80US_MASK   BIT(6)
+#define BT_HCI_LE_CS_T_FCS_TIME_100US_MASK  BIT(7)
+#define BT_HCI_LE_CS_T_FCS_TIME_1200US_MASK BIT(8)
+
+#define BT_HCI_LE_CS_T_PM_TIME_10US_MASK BIT(0)
+#define BT_HCI_LE_CS_T_PM_TIME_20US_MASK BIT(1)
+
+#define BT_HCI_LE_CS_TX_SNR_CAPABILITY_18DB_MASK BIT(0)
+#define BT_HCI_LE_CS_TX_SNR_CAPABILITY_21DB_MASK BIT(1)
+#define BT_HCI_LE_CS_TX_SNR_CAPABILITY_24DB_MASK BIT(2)
+#define BT_HCI_LE_CS_TX_SNR_CAPABILITY_27DB_MASK BIT(3)
+#define BT_HCI_LE_CS_TX_SNR_CAPABILITY_30DB_MASK BIT(4)
+
+#define BT_HCI_EVT_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE 0x2C
+struct bt_hci_evt_le_cs_read_remote_supported_capabilities_complete {
+	uint8_t status;
+	uint16_t conn_handle;
+	uint8_t num_config_supported;
+	uint16_t max_consecutive_procedures_supported;
+	uint8_t num_antennas_supported;
+	uint8_t max_antenna_paths_supported;
+	uint8_t roles_supported;
+	uint8_t modes_supported;
+	uint8_t rtt_capability;
+	uint8_t rtt_aa_only_n;
+	uint8_t rtt_sounding_n;
+	uint8_t rtt_random_payload_n;
+	uint16_t nadm_sounding_capability;
+	uint16_t nadm_random_capability;
+	uint8_t cs_sync_phys_supported;
+	uint16_t subfeatures_supported;
+	uint16_t t_ip1_times_supported;
+	uint16_t t_ip2_times_supported;
+	uint16_t t_fcs_times_supported;
+	uint16_t t_pm_times_supported;
+	uint8_t t_sw_time_supported;
+	uint8_t tx_snr_capability;
+} __packed;
+
+#define BT_HCI_EVT_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE 0x2D
+struct bt_hci_evt_le_cs_read_remote_fae_table_complete {
+	uint8_t status;
+	uint16_t conn_handle;
+	uint8_t remote_fae_table[72];
+} __packed;
+
 /* Event mask bits */
 
 #define BT_EVT_BIT(n) (1ULL << (n))
@@ -3240,6 +3346,9 @@ struct bt_hci_evt_le_subrate_change {
 #define BT_EVT_MASK_LE_PER_ADV_RESPONSE_REPORT     BT_EVT_BIT(39)
 #define BT_EVT_MASK_LE_ENH_CONN_COMPLETE_V2        BT_EVT_BIT(40)
 
+#define BT_EVT_MASK_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE BT_EVT_BIT(43)
+#define BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE              BT_EVT_BIT(44)
+
 /** HCI Error Codes, BT Core Spec v5.4 [Vol 1, Part F]. */
 #define BT_HCI_ERR_SUCCESS                      0x00
 #define BT_HCI_ERR_UNKNOWN_CMD                  0x01
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index b8c835876c7..862f196618b 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -3320,6 +3320,42 @@ int bt_conn_le_subrate_request(struct bt_conn *conn,
 }
 #endif /* CONFIG_BT_SUBRATING */
 
+#if defined(CONFIG_BT_CHANNEL_SOUNDING)
+void notify_remote_cs_capabilities(struct bt_conn *conn, struct bt_conn_le_cs_capabilities params)
+{
+	struct bt_conn_cb *callback;
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
+		if (callback->remote_cs_capabilities_available) {
+			callback->remote_cs_capabilities_available(conn, &params);
+		}
+	}
+
+	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
+		if (cb->remote_cs_capabilities_available) {
+			cb->remote_cs_capabilities_available(conn, &params);
+		}
+	}
+}
+
+void notify_remote_cs_fae_table(struct bt_conn *conn, struct bt_conn_le_cs_fae_table params)
+{
+	struct bt_conn_cb *callback;
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
+		if (callback->remote_cs_fae_table_available) {
+			callback->remote_cs_fae_table_available(conn, &params);
+		}
+	}
+
+	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
+		if (cb->remote_cs_fae_table_available) {
+			cb->remote_cs_fae_table_available(conn, &params);
+		}
+	}
+}
+#endif /* CONFIG_BT_CHANNEL_SOUNDING */
+
 int bt_conn_le_param_update(struct bt_conn *conn,
 			    const struct bt_le_conn_param *param)
 {
diff --git a/subsys/bluetooth/host/conn_internal.h b/subsys/bluetooth/host/conn_internal.h
index 58228588d0c..4cc4e70d858 100644
--- a/subsys/bluetooth/host/conn_internal.h
+++ b/subsys/bluetooth/host/conn_internal.h
@@ -492,6 +492,12 @@ void notify_path_loss_threshold_report(struct bt_conn *conn,
 void notify_subrate_change(struct bt_conn *conn,
 			   struct bt_conn_le_subrate_changed params);
 
+void notify_remote_cs_capabilities(struct bt_conn *conn,
+			   struct bt_conn_le_cs_capabilities params);
+
+void notify_remote_cs_fae_table(struct bt_conn *conn,
+			   struct bt_conn_le_cs_fae_table params);
+
 #if defined(CONFIG_BT_SMP)
 /* If role specific LTK is present */
 bool bt_conn_ltk_present(const struct bt_conn *conn);
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index 4ec67fd42ce..78b42dc399e 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -13,7 +13,143 @@
 
 #include "conn_internal.h"
 
+#define LOG_LEVEL CONFIG_BT_HCI_CORE_LOG_LEVEL
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(bt_cs);
+
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
+int bt_cs_read_remote_supported_capabilities(struct bt_conn *conn)
+{
+	struct bt_hci_cp_le_read_remote_supported_capabilities *cp;
+	struct net_buf *buf;
+
+	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES, sizeof(*cp));
+	if (!buf) {
+		return -ENOBUFS;
+	}
+
+	cp = net_buf_add(buf, sizeof(*cp));
+	cp->handle = sys_cpu_to_le16(conn->handle);
+
+	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES, buf, NULL);
+}
+
+void bt_hci_le_cs_read_remote_supported_capabilities_complete(struct net_buf *buf)
+{
+	struct bt_conn *conn;
+	struct bt_conn_le_cs_capabilities remote_cs_capabilities;
+	struct bt_hci_evt_le_cs_read_remote_supported_capabilities_complete *evt;
+
+	if (buf->len < sizeof(*evt)) {
+		LOG_ERR("Unexpected end of buffer");
+		return;
+	}
+
+	evt = net_buf_pull_mem(buf, sizeof(*evt));
+	if (evt->status) {
+		LOG_INF("Read Remote Supported Capabilities failed (status 0x%02X)", evt->status);
+		return;
+	}
+
+	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->conn_handle), BT_CONN_TYPE_LE);
+	if (!conn) {
+		LOG_ERR("Could not lookup connection handle when reading remote CS capabilities");
+		return;
+	}
+
+	remote_cs_capabilities.num_config_supported = evt->num_config_supported;
+	remote_cs_capabilities.max_consecutive_procedures_supported =
+		sys_le16_to_cpu(evt->max_consecutive_procedures_supported);
+	remote_cs_capabilities.num_antennas_supported = evt->num_antennas_supported;
+	remote_cs_capabilities.max_antenna_paths_supported = evt->max_antenna_paths_supported;
+
+	remote_cs_capabilities.initiator_supported =
+		evt->roles_supported & BT_HCI_LE_CS_INITIATOR_ROLE_MASK;
+	remote_cs_capabilities.reflector_supported =
+		evt->roles_supported & BT_HCI_LE_CS_REFLECTOR_ROLE_MASK;
+	remote_cs_capabilities.mode_3_supported =
+		evt->modes_supported & BT_HCI_LE_CS_MODES_SUPPORTED_MODE_3_MASK;
+
+	remote_cs_capabilities.rtt_aa_only_n = evt->rtt_aa_only_n;
+	remote_cs_capabilities.rtt_sounding_n = evt->rtt_sounding_n;
+	remote_cs_capabilities.rtt_random_payload_n = evt->rtt_random_payload_n;
+
+	if (evt->rtt_aa_only_n) {
+		if (evt->rtt_capability & BT_HCI_LE_CS_RTT_AA_ONLY_N_10NS_MASK) {
+			remote_cs_capabilities.rtt_aa_only_precision =
+				BT_CONN_LE_CS_RTT_AA_ONLY_10NS;
+		} else {
+			remote_cs_capabilities.rtt_aa_only_precision =
+				BT_CONN_LE_CS_RTT_AA_ONLY_150NS;
+		}
+	} else {
+		remote_cs_capabilities.rtt_aa_only_precision = BT_CONN_LE_CS_RTT_AA_ONLY_NOT_SUPP;
+	}
+
+	if (evt->rtt_sounding_n) {
+		if (evt->rtt_capability & BT_HCI_LE_CS_RTT_SOUNDING_N_10NS_MASK) {
+			remote_cs_capabilities.rtt_sounding_precision =
+				BT_CONN_LE_CS_RTT_SOUNDING_10NS;
+		} else {
+			remote_cs_capabilities.rtt_sounding_precision =
+				BT_CONN_LE_CS_RTT_SOUNDING_150NS;
+		}
+	} else {
+		remote_cs_capabilities.rtt_sounding_precision = BT_CONN_LE_CS_RTT_SOUNDING_NOT_SUPP;
+	}
+
+	if (evt->rtt_random_payload_n) {
+		if (evt->rtt_capability & BT_HCI_LE_CS_RTT_RANDOM_PAYLOAD_N_10NS_MASK) {
+			remote_cs_capabilities.rtt_random_payload_precision =
+				BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_10NS;
+		} else {
+			remote_cs_capabilities.rtt_random_payload_precision =
+				BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_150NS;
+		}
+	} else {
+		remote_cs_capabilities.rtt_random_payload_precision =
+			BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_NOT_SUPP;
+	}
+
+	remote_cs_capabilities.phase_based_nadm_sounding_supported =
+		sys_le16_to_cpu(evt->nadm_sounding_capability) &
+		BT_HCI_LE_CS_NADM_SOUNDING_CAPABILITY_PHASE_BASED_MASK;
+
+	remote_cs_capabilities.phase_based_nadm_random_supported =
+		sys_le16_to_cpu(evt->nadm_random_capability) &
+		BT_HCI_LE_CS_NADM_RANDOM_CAPABILITY_PHASE_BASED_MASK;
+
+	remote_cs_capabilities.cs_sync_2m_phy_supported =
+		evt->cs_sync_phys_supported & BT_HCI_LE_CS_SYNC_PHYS_2M_MASK;
+
+	remote_cs_capabilities.cs_sync_2m_2bt_phy_supported =
+		evt->cs_sync_phys_supported & BT_HCI_LE_CS_SYNC_PHYS_2M_2BT_MASK;
+
+	remote_cs_capabilities.cs_without_fae_supported =
+		sys_le16_to_cpu(evt->subfeatures_supported) &
+		BT_HCI_LE_CS_SUBFEATURE_NO_TX_FAE_MASK;
+
+	remote_cs_capabilities.chsel_alg_3c_supported =
+		sys_le16_to_cpu(evt->subfeatures_supported) &
+		BT_HCI_LE_CS_SUBFEATURE_CHSEL_ALG_3C_MASK;
+
+	remote_cs_capabilities.pbr_from_rtt_sounding_seq_supported =
+		sys_le16_to_cpu(evt->subfeatures_supported) &
+		BT_HCI_LE_CS_SUBFEATURE_PBR_FROM_RTT_SOUNDING_SEQ_MASK;
+
+	remote_cs_capabilities.t_ip1_times_supported = sys_le16_to_cpu(evt->t_ip1_times_supported);
+	remote_cs_capabilities.t_ip2_times_supported = sys_le16_to_cpu(evt->t_ip2_times_supported);
+	remote_cs_capabilities.t_fcs_times_supported = sys_le16_to_cpu(evt->t_fcs_times_supported);
+	remote_cs_capabilities.t_pm_times_supported = sys_le16_to_cpu(evt->t_pm_times_supported);
+
+	remote_cs_capabilities.t_sw_time = evt->t_sw_time_supported;
+	remote_cs_capabilities.tx_snr_capability = evt->tx_snr_capability;
+
+	notify_remote_cs_capabilities(conn, remote_cs_capabilities);
+
+	bt_conn_unref(conn);
+}
+
 int bt_cs_set_default_settings(struct bt_conn *conn,
 			       const struct bt_cs_set_default_settings_param *params)
 {
@@ -41,4 +177,49 @@ int bt_cs_set_default_settings(struct bt_conn *conn,
 
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_SET_DEFAULT_SETTINGS, buf, NULL);
 }
+
+int bt_cs_read_remote_fae_table(struct bt_conn *conn)
+{
+	struct bt_hci_cp_le_read_remote_fae_table *cp;
+	struct net_buf *buf;
+
+	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_READ_REMOTE_FAE_TABLE, sizeof(*cp));
+	if (!buf) {
+		return -ENOBUFS;
+	}
+
+	cp = net_buf_add(buf, sizeof(*cp));
+	cp->handle = sys_cpu_to_le16(conn->handle);
+
+	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_READ_REMOTE_FAE_TABLE, buf, NULL);
+}
+
+void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf)
+{
+	struct bt_conn *conn;
+	struct bt_conn_le_cs_fae_table fae_table;
+	struct bt_hci_evt_le_cs_read_remote_fae_table_complete *evt;
+
+	if (buf->len < sizeof(*evt)) {
+		LOG_ERR("Unexpected end of buffer");
+		return;
+	}
+
+	evt = net_buf_pull_mem(buf, sizeof(*evt));
+	if (evt->status) {
+		LOG_INF("Read Remote FAE Table failed with status 0x%02X", evt->status);
+		return;
+	}
+
+	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->conn_handle), BT_CONN_TYPE_LE);
+	if (!conn) {
+		LOG_ERR("Could not lookup connection handle when reading remote FAE Table");
+		return;
+	}
+
+	fae_table.remote_fae_table = evt->remote_fae_table;
+	notify_remote_cs_fae_table(conn, fae_table);
+
+	bt_conn_unref(conn);
+}
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index adc215a67ea..b1ab4fbb664 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -2821,6 +2821,14 @@ static const struct event_handler meta_events[] = {
 		      sizeof(struct bt_hci_evt_le_enh_conn_complete_v2)),
 #endif /* CONFIG_BT_PER_ADV_RSP || CONFIG_BT_PER_ADV_SYNC_RSP */
 #endif /* CONFIG_BT_CONN */
+#if defined(CONFIG_BT_CHANNEL_SOUNDING)
+	EVENT_HANDLER(BT_HCI_EVT_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE,
+		      bt_hci_le_cs_read_remote_supported_capabilities_complete,
+		      sizeof(struct bt_hci_evt_le_cs_read_remote_supported_capabilities_complete)),
+	EVENT_HANDLER(BT_HCI_EVT_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE,
+		      bt_hci_le_cs_read_remote_fae_table_complete,
+		      sizeof(struct bt_hci_evt_le_cs_read_remote_fae_table_complete)),
+#endif /* CONFIG_BT_CHANNEL_SOUNDING */
 
 };
 
@@ -3391,6 +3399,13 @@ static int le_set_event_mask(void)
 		mask |= BT_EVT_MASK_LE_ENH_CONN_COMPLETE_V2;
 	}
 
+
+	if (IS_ENABLED(CONFIG_BT_CHANNEL_SOUNDING) &&
+	    BT_FEAT_LE_CHANNEL_SOUNDING(bt_dev.le.features)) {
+		mask |= BT_EVT_MASK_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE;
+		mask |= BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE;
+	}
+
 	sys_put_le64(mask, cp_mask->events);
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_SET_EVENT_MASK, buf, NULL);
 }
@@ -3613,6 +3628,14 @@ static int le_init(void)
 		}
 	}
 
+	if (IS_ENABLED(CONFIG_BT_CHANNEL_SOUNDING) &&
+	    BT_FEAT_LE_CHANNEL_SOUNDING(bt_dev.le.features)) {
+		err = le_set_host_feature(BT_LE_FEAT_BIT_CHANNEL_SOUNDING_HOST, 1);
+		if (err) {
+			return err;
+		}
+	}
+
 	return  le_set_event_mask();
 }
 
diff --git a/subsys/bluetooth/host/hci_core.h b/subsys/bluetooth/host/hci_core.h
index b39f219024d..590d85a6c49 100644
--- a/subsys/bluetooth/host/hci_core.h
+++ b/subsys/bluetooth/host/hci_core.h
@@ -538,6 +538,10 @@ void bt_hci_le_vs_df_connectionless_iq_report(struct net_buf *buf);
 void bt_hci_le_past_received(struct net_buf *buf);
 void bt_hci_le_past_received_v2(struct net_buf *buf);
 
+/* CS HCI event handlers */
+void bt_hci_le_cs_read_remote_supported_capabilities_complete(struct net_buf *buf);
+void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf);
+
 /* Adv HCI event handlers */
 void bt_hci_le_adv_set_terminated(struct net_buf *buf);
 void bt_hci_le_scan_req_received(struct net_buf *buf);
diff --git a/subsys/bluetooth/shell/bt.c b/subsys/bluetooth/shell/bt.c
index 70b3e69941d..25841fd48d6 100644
--- a/subsys/bluetooth/shell/bt.c
+++ b/subsys/bluetooth/shell/bt.c
@@ -982,6 +982,78 @@ void subrate_changed(struct bt_conn *conn,
 }
 #endif
 
+#if defined(CONFIG_BT_CHANNEL_SOUNDING)
+void print_remote_cs_capabilities(struct bt_conn *conn, struct bt_conn_le_cs_capabilities *params)
+{
+	shell_print(
+		ctx_shell,
+		"Received remote channel sounding capabilities:\n"
+		"- Num CS configurations: %d\n"
+		"- Max consecutive CS procedures: %d\n"
+		"- Num antennas supported: %d\n"
+		"- Max antenna paths supported: %d\n"
+		"- Initiator role supported: %s\n"
+		"- Reflector role supported: %s\n"
+		"- Mode 3 supported: %s\n"
+		"- RTT AA only supported: %s\n"
+		"- RTT AA only is 10ns precise: %s\n"
+		"- RTT AA only N: %d\n"
+		"- RTT sounding supported: %s\n"
+		"- RTT sounding is 10ns precise: %s\n"
+		"- RTT sounding N: %d\n"
+		"- RTT random payload supported: %s\n"
+		"- RTT random payload is 10ns precise: %s\n"
+		"- RTT random payload N: %d\n"
+		"- Phase-based NADM with sounding sequences supported: %s\n"
+		"- Phase-based NADM with random sequences supported: %s\n"
+		"- CS Sync 2M PHY supported: %s\n"
+		"- CS Sync 2M 2BT PHY supported: %s\n"
+		"- CS without transmitter FAE supported: %s\n"
+		"- Channel selection algorithm #3c supported: %s\n"
+		"- Phase-based ranging from RTT sounding sequence supported: %s\n"
+		"- T_IP1 times supported: 0x%04x\n"
+		"- T_IP2 times supported: 0x%04x\n"
+		"- T_FCS times supported: 0x%04x\n"
+		"- T_PM times supported: 0x%04x\n"
+		"- T_SW time supported: %d us\n"
+		"- TX SNR capability: 0x%02x",
+		params->num_config_supported, params->max_consecutive_procedures_supported,
+		params->num_antennas_supported, params->max_antenna_paths_supported,
+		params->initiator_supported ? "Yes" : "No",
+		params->reflector_supported ? "Yes" : "No", params->mode_3_supported ? "Yes" : "No",
+		params->rtt_aa_only_precision == BT_CONN_LE_CS_RTT_AA_ONLY_NOT_SUPP ? "No" : "Yes",
+		params->rtt_aa_only_precision == BT_CONN_LE_CS_RTT_AA_ONLY_10NS ? "Yes" : "No",
+		params->rtt_aa_only_n,
+		params->rtt_sounding_precision == BT_CONN_LE_CS_RTT_SOUNDING_NOT_SUPP ? "No"
+										      : "Yes",
+		params->rtt_sounding_precision == BT_CONN_LE_CS_RTT_SOUNDING_10NS ? "Yes" : "No",
+		params->rtt_sounding_n,
+		params->rtt_random_payload_precision == BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_NOT_SUPP
+			? "No"
+			: "Yes",
+		params->rtt_random_payload_precision == BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_10NS
+			? "Yes"
+			: "No",
+		params->rtt_random_payload_n,
+		params->phase_based_nadm_sounding_supported ? "Yes" : "No",
+		params->phase_based_nadm_random_supported ? "Yes" : "No",
+		params->cs_sync_2m_phy_supported ? "Yes" : "No",
+		params->cs_sync_2m_2bt_phy_supported ? "Yes" : "No",
+		params->cs_without_fae_supported ? "Yes" : "No",
+		params->chsel_alg_3c_supported ? "Yes" : "No",
+		params->pbr_from_rtt_sounding_seq_supported ? "Yes" : "No",
+		params->t_ip1_times_supported, params->t_ip2_times_supported,
+		params->t_fcs_times_supported, params->t_pm_times_supported, params->t_sw_time,
+		params->tx_snr_capability);
+}
+
+void print_remote_cs_fae_table(struct bt_conn *conn, struct bt_conn_le_cs_fae_table *params)
+{
+	shell_print(ctx_shell, "Received FAE Table: ");
+	shell_hexdump(ctx_shell, params->remote_fae_table, 72);
+}
+#endif
+
 static struct bt_conn_cb conn_callbacks = {
 	.connected = connected,
 	.disconnected = disconnected,
@@ -1011,6 +1083,10 @@ static struct bt_conn_cb conn_callbacks = {
 #if defined(CONFIG_BT_SUBRATING)
 	.subrate_changed = subrate_changed,
 #endif
+#if defined(CONFIG_BT_CHANNEL_SOUNDING)
+	.remote_cs_capabilities_available = print_remote_cs_capabilities,
+	.remote_cs_fae_table_available = print_remote_cs_fae_table,
+#endif
 };
 #endif /* CONFIG_BT_CONN */
 
diff --git a/subsys/bluetooth/shell/cs.c b/subsys/bluetooth/shell/cs.c
index 00a16cb4adb..fbe089155cc 100644
--- a/subsys/bluetooth/shell/cs.c
+++ b/subsys/bluetooth/shell/cs.c
@@ -39,6 +39,24 @@ static int check_cs_sync_antenna_selection_input(uint16_t input)
 	return 0;
 }
 
+static int cmd_read_remote_supported_capabilities(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err = 0;
+
+	if (default_conn == NULL) {
+		shell_error(sh, "Conn handle error, at least one connection is required.");
+		return -ENOEXEC;
+	}
+
+	err = bt_cs_read_remote_supported_capabilities(default_conn);
+	if (err) {
+		shell_error(sh, "bt_cs_read_remote_supported_capabilities returned error %d", err);
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
 static int cmd_set_default_settings(const struct shell *sh, size_t argc, char *argv[])
 {
 	int err = 0;
@@ -98,13 +116,38 @@ static int cmd_set_default_settings(const struct shell *sh, size_t argc, char *a
 	return 0;
 }
 
+static int cmd_read_remote_fae_table(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err = 0;
+
+	if (default_conn == NULL) {
+		shell_error(sh, "Conn handle error, at least one connection is required.");
+		return -ENOEXEC;
+	}
+
+	err = bt_cs_read_remote_fae_table(default_conn);
+	if (err) {
+		shell_error(sh, "bt_cs_read_remote_fae_table returned error %d", err);
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	cs_cmds,
+	SHELL_CMD_ARG(
+		read_remote_supported_capabilities, NULL,
+		"<None>",
+		cmd_read_remote_supported_capabilities, 1, 0),
 	SHELL_CMD_ARG(
 		set_default_settings, NULL,
 		"<Enable initiator role: true, false> <Enable reflector role: true, false> "
 		" <CS_SYNC antenna selection: 0x01 - 0x04, 0xFE, 0xFF> <Max TX power: -127 - 20>",
 		cmd_set_default_settings, 5, 0),
+	SHELL_CMD_ARG(
+		read_remote_fae_table, NULL,
+		"<None>",
+		cmd_read_remote_fae_table, 1, 0),
 	SHELL_SUBCMD_SET_END);
 
 static int cmd_cs(const struct shell *sh, size_t argc, char **argv)

From dd1272f56ecc3d3b4d7212afcf20745638a752c7 Mon Sep 17 00:00:00 2001
From: Olivier Lesage <olivier.lesage@nordicsemi.no>
Date: Sun, 15 Sep 2024 23:59:47 +0200
Subject: [PATCH 0034/2913] [nrf fromtree] bluetooth: host: CS support for CS
 Test

Adds HCI support for the LE CS Test command.

(cherry picked from commit fb9a8eb31696eb28959909f95aa55b831ddd2ce7)

Signed-off-by: Olivier Lesage <olivier.lesage@nordicsemi.no>
(cherry picked from commit 9f49556160d9b5157f78a0326c65bb0764baead2)
(cherry picked from commit 6efd394382978e3ac84602d664c047a081397eb2)
---
 include/zephyr/bluetooth/cs.h        | 467 +++++++++++++++++++++++++++
 include/zephyr/bluetooth/hci_types.h | 146 +++++++++
 subsys/bluetooth/host/cs.c           | 104 ++++++
 subsys/bluetooth/shell/cs.c          |  65 ++++
 4 files changed, 782 insertions(+)

diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index 880cbeeeccc..17331290e32 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -60,6 +60,451 @@ struct bt_cs_set_default_settings_param {
 	int8_t max_tx_power;
 };
 
+/** CS Test Main Mode */
+enum bt_cs_test_main_mode {
+	/** CS Test Mode-1 */
+	BT_CS_TEST_MAIN_MODE_1 = BT_HCI_OP_LE_CS_MAIN_MODE_1,
+	/** CS Test Mode-2 */
+	BT_CS_TEST_MAIN_MODE_2 = BT_HCI_OP_LE_CS_MAIN_MODE_2,
+	/** CS Test Mode-3 */
+	BT_CS_TEST_MAIN_MODE_3 = BT_HCI_OP_LE_CS_MAIN_MODE_3,
+};
+
+/** CS Test Sub-Mode */
+enum bt_cs_test_sub_mode {
+	/** CS Test sub-mode-1 */
+	BT_CS_TEST_SUB_MODE_1 = BT_HCI_OP_LE_CS_SUB_MODE_1,
+	/** CS Test sub-mode-2 */
+	BT_CS_TEST_SUB_MODE_2 = BT_HCI_OP_LE_CS_SUB_MODE_2,
+	/** CS Test sub-mode-3 */
+	BT_CS_TEST_SUB_MODE_3 = BT_HCI_OP_LE_CS_SUB_MODE_3,
+	/** No CS Test sub-mode. */
+	BT_CS_TEST_SUB_MODE_UNUSED = BT_HCI_OP_LE_CS_SUB_MODE_UNUSED,
+};
+
+/** CS Test Role */
+enum bt_cs_test_role {
+	BT_CS_TEST_ROLE_INITIATOR = BT_HCI_OP_LE_CS_INITIATOR_ROLE,
+	BT_CS_TEST_ROLE_REFLECTOR = BT_HCI_OP_LE_CS_REFLECTOR_ROLE,
+};
+
+/** CS Test RTT type */
+enum bt_cs_test_rtt_type {
+	/** RTT AA Only */
+	BT_CS_TEST_RTT_AA_ONLY = BT_HCI_OP_LE_CS_RTT_TYPE_AA_ONLY,
+	/** RTT with 32-bit sounding sequence */
+	BT_CS_TEST_RTT_32_BIT_SOUNDING = BT_HCI_OP_LE_CS_RTT_TYPE_32BIT_SOUND,
+	/** RTT with 96-bit sounding sequence */
+	BT_CS_TEST_RTT_96_BIT_SOUNDING = BT_HCI_OP_LE_CS_RTT_TYPE_96BIT_SOUND,
+	/** RTT with 32-bit random sequence */
+	BT_CS_TEST_RTT_32_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_32BIT_RAND,
+	/** RTT with 64-bit random sequence */
+	BT_CS_TEST_RTT_64_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_64BIT_RAND,
+	/** RTT with 96-bit random sequence */
+	BT_CS_TEST_RTT_96_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_96BIT_RAND,
+	/** RTT with 128-bit random sequence */
+	BT_CS_TEST_RTT_128_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_128BIT_RAND,
+};
+
+/** CS Test CS_SYNC PHY */
+enum bt_cs_test_cs_sync_phy {
+	BT_CS_TEST_CS_SYNC_LE_1M_PHY = BT_HCI_OP_LE_CS_CS_SYNC_1M,
+	BT_CS_TEST_CS_SYNC_LE_2M_PHY = BT_HCI_OP_LE_CS_CS_SYNC_2M,
+	BT_CS_TEST_CS_SYNC_LE_2M_2BT_PHY = BT_HCI_OP_LE_CS_CS_SYNC_2M_2BT,
+};
+
+/** CS Test CS_SYNC Antenna Identifier */
+enum bt_cs_test_cs_sync_antenna_selection {
+	BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_ONE = BT_HCI_OP_LE_CS_ANTENNA_SEL_ONE,
+	BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_TWO = BT_HCI_OP_LE_CS_ANTENNA_SEL_TWO,
+	BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_THREE = BT_HCI_OP_LE_CS_ANTENNA_SEL_THREE,
+	BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_FOUR = BT_HCI_OP_LE_CS_ANTENNA_SEL_FOUR,
+};
+
+/** CS Test Tone Antennna Config Selection.
+ *
+ *  These enum values are indices in the following table, where N_AP is the maximum
+ *  number of antenna paths (in the range [1, 4]).
+ *
+ * +--------------+-------------+-------------------+-------------------+--------+
+ * | Config Index | Total Paths | Dev A: # Antennas | Dev B: # Antennas | Config |
+ * +--------------+-------------+-------------------+-------------------+--------+
+ * |            0 |           1 |                 1 |                 1 | 1:1    |
+ * |            1 |           2 |                 2 |                 1 | N_AP:1 |
+ * |            2 |           3 |                 3 |                 1 | N_AP:1 |
+ * |            3 |           4 |                 4 |                 1 | N_AP:1 |
+ * |            4 |           2 |                 1 |                 2 | 1:N_AP |
+ * |            5 |           3 |                 1 |                 3 | 1:N_AP |
+ * |            6 |           4 |                 1 |                 4 | 1:N_AP |
+ * |            7 |           4 |                 2 |                 2 | 2:2    |
+ * +--------------+-------------+-------------------+-------------------+--------+
+ *
+ *  There are therefore four groups of possible antenna configurations:
+ *
+ *  - 1:1 configuration, where both A and B support 1 antenna each
+ *  - 1:N_AP configuration, where A supports 1 antenna, B supports N_AP antennas, and
+ *    N_AP is a value in the range [2, 4]
+ *  - N_AP:1 configuration, where A supports N_AP antennas, B supports 1 antenna, and
+ *    N_AP is a value in the range [2, 4]
+ *  - 2:2 configuration, where both A and B support 2 antennas and N_AP = 4
+ */
+enum bt_cs_test_tone_antenna_config_selection {
+	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_ONE = BT_HCI_OP_LE_CS_TEST_ACI_0,
+	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_TWO = BT_HCI_OP_LE_CS_TEST_ACI_1,
+	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_THREE = BT_HCI_OP_LE_CS_TEST_ACI_2,
+	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_FOUR = BT_HCI_OP_LE_CS_TEST_ACI_3,
+	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_FIVE = BT_HCI_OP_LE_CS_TEST_ACI_4,
+	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_SIX = BT_HCI_OP_LE_CS_TEST_ACI_5,
+	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_SEVEN = BT_HCI_OP_LE_CS_TEST_ACI_6,
+	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_EIGHT = BT_HCI_OP_LE_CS_TEST_ACI_7,
+};
+
+/** CS Test Initiator SNR control options */
+enum bt_cs_test_initiator_snr_control {
+	BT_CS_TEST_INITIATOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_18,
+	BT_CS_TEST_INITIATOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_21,
+	BT_CS_TEST_INITIATOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_24,
+	BT_CS_TEST_INITIATOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_27,
+	BT_CS_TEST_INITIATOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_30,
+	BT_CS_TEST_INITIATOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_NOT_USED,
+};
+
+/** CS Test Reflector SNR control options */
+enum bt_cs_test_reflector_snr_control {
+	BT_CS_TEST_REFLECTOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_18,
+	BT_CS_TEST_REFLECTOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_21,
+	BT_CS_TEST_REFLECTOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_24,
+	BT_CS_TEST_REFLECTOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_27,
+	BT_CS_TEST_REFLECTOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_30,
+	BT_CS_TEST_REFLECTOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_NOT_USED,
+};
+
+/** CS Test Override 0 channel selection algorithm selection */
+enum bt_cs_test_override_0_chsel_alg {
+	BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3B = BT_HCI_OP_LE_CS_TEST_CHSEL_TYPE_3B,
+	BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3C = BT_HCI_OP_LE_CS_TEST_CHSEL_TYPE_3C,
+};
+
+/** CS Test Override 0 chsel #3c shape */
+enum bt_cs_test_override_0_ch3c_shape {
+	BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3C_HAT_SHAPE = BT_HCI_OP_LE_CS_TEST_CH3C_SHAPE_HAT,
+	BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3C_X_SHAPE = BT_HCI_OP_LE_CS_TEST_CH3C_SHAPE_X,
+};
+
+/** CS Test Override 3 T_PM Tone Extension */
+enum bt_cs_test_override_3_pm_tone_ext {
+	/** Initiator and reflector tones sent without tone extension */
+	BT_CS_TEST_OVERRIDE_3_NO_TONE_EXT = BT_HCI_OP_LE_CS_TEST_TONE_EXT_NONE,
+	/** Initiator tone sent with extension, reflector tone sent without tone extension */
+	BT_CS_TEST_OVERRIDE_3_INITIATOR_TONE_EXT_ONLY = BT_HCI_OP_LE_CS_TEST_TONE_EXT_INIT,
+	/** Initiator tone sent without extension, reflector tone sent with tone extension */
+	BT_CS_TEST_OVERRIDE_3_REFLECTOR_TONE_EXT_ONLY = BT_HCI_OP_LE_CS_TEST_TONE_EXT_REFL,
+	/** Initiator and reflector tones sent with tone extension */
+	BT_CS_TEST_OVERRIDE_3_INITIATOR_AND_REFLECTOR_TONE_EXT = BT_HCI_OP_LE_CS_TEST_TONE_EXT_BOTH,
+	/** Applicable for mode-2 and mode-3 only:
+	 *
+	 *  Loop through:
+	 *   - @ref BT_CS_TEST_OVERRIDE_3_NO_TONE_EXT
+	 *   - @ref BT_CS_TEST_OVERRIDE_3_INITIATOR_TONE_EXT_ONLY
+	 *   - @ref BT_CS_TEST_OVERRIDE_3_REFLECTOR_TONE_EXT_ONLY
+	 *   - @ref BT_CS_TEST_OVERRIDE_3_INITIATOR_AND_REFLECTOR_TONE_EXT
+	 */
+	BT_CS_TEST_OVERRIDE_3_REPETITIVE_TONE_EXT = BT_HCI_OP_LE_CS_TEST_TONE_EXT_REPEAT,
+};
+
+/** CS Test Override 4 Tone Antenna Permutation.
+ *
+ *  These values represent indices in an antenna path permutation table.
+ *
+ *  Which table is applicable (and which indices are valid)
+ *  depends on the maximum number of antenna paths (N_AP).
+ *
+ *  If N_AP = 2, the permutation table is:
+ *
+ * +--------------------------------+------------------------------------------+
+ * | Antenna Path Permutation Index | Antenna Path Positions After Permutation |
+ * +--------------------------------+------------------------------------------+
+ * | 0                              | A1 A2                                    |
+ * | 1                              | A2 A1                                    |
+ * +--------------------------------+------------------------------------------+
+ *
+ * If N_AP = 3, the permutation table is:
+ *
+ * +--------------------------------+------------------------------------------+
+ * | Antenna Path Permutation Index | Antenna Path Positions After Permutation |
+ * +--------------------------------+------------------------------------------+
+ * | 0                              | A1 A2 A3                                 |
+ * | 1                              | A2 A1 A3                                 |
+ * | 2                              | A1 A3 A2                                 |
+ * | 3                              | A3 A1 A2                                 |
+ * | 4                              | A3 A2 A1                                 |
+ * | 5                              | A2 A3 A1                                 |
+ * +--------------------------------+------------------------------------------+
+ *
+ * If N_AP = 4, the permutation table is:
+ *
+ * +--------------------------------+------------------------------------------+
+ * | Antenna Path Permutation Index | Antenna Path Positions After Permutation |
+ * +--------------------------------+------------------------------------------+
+ * | 0                              | A1 A2 A3 A4                              |
+ * | 1                              | A2 A1 A3 A4                              |
+ * | 2                              | A1 A3 A2 A4                              |
+ * | 3                              | A3 A1 A2 A4                              |
+ * | 4                              | A3 A2 A1 A4                              |
+ * | 5                              | A2 A3 A1 A4                              |
+ * | 6                              | A1 A2 A4 A3                              |
+ * | 7                              | A2 A1 A4 A3                              |
+ * | 8                              | A1 A4 A2 A3                              |
+ * | 9                              | A4 A1 A2 A3                              |
+ * | 10                             | A4 A2 A1 A3                              |
+ * | 11                             | A2 A4 A1 A3                              |
+ * | 12                             | A1 A4 A3 A2                              |
+ * | 13                             | A4 A1 A3 A2                              |
+ * | 14                             | A1 A3 A4 A2                              |
+ * | 15                             | A3 A1 A4 A2                              |
+ * | 16                             | A3 A4 A1 A2                              |
+ * | 17                             | A4 A3 A1 A2                              |
+ * | 18                             | A4 A2 A3 A1                              |
+ * | 19                             | A2 A4 A3 A1                              |
+ * | 20                             | A4 A3 A2 A1                              |
+ * | 21                             | A3 A4 A2 A1                              |
+ * | 22                             | A3 A2 A4 A1                              |
+ * | 23                             | A2 A3 A4 A1                              |
+ * +--------------------------------+------------------------------------------+
+ */
+enum bt_cs_test_override_4_tone_antenna_permutation {
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_00 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_00,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_01 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_01,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_02 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_02,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_03 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_03,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_04 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_04,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_05 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_05,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_06 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_06,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_07 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_07,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_08 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_08,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_09 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_09,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_10 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_10,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_11 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_11,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_12 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_12,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_13 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_13,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_14 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_14,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_15 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_15,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_16 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_16,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_17 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_17,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_18 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_18,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_19 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_19,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_20 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_20,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_21 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_21,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_22 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_22,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_23 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_23,
+	/** Loop through all valid Antenna Permuation Indices starting
+	 *  from the lowest index.
+	 */
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_LOOP = BT_HCI_OP_LE_CS_TEST_AP_INDEX_LOOP,
+};
+
+/** CS Test Override 7 Sounding Sequence Marker Value */
+enum bt_cs_test_override_7_ss_marker_value {
+	BT_CS_TEST_OVERRIDE_7_SS_MARKER_VAL_0011 = BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_0011,
+	BT_CS_TEST_OVERRIDE_7_SS_MARKER_VAL_1100 = BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_1100,
+	/** Loop through pattern '0011' and '1100' (in transmission order) */
+	BT_CS_TEST_OVERRIDE_7_SS_MARKER_VAL_LOOP = BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_LOOP,
+};
+
+/** CS Test Override 8 CS_SYNC Payload Pattern */
+enum bt_cs_test_override_8_cs_sync_payload_pattern {
+	/** PRBS9 payload sequence. */
+	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_PRBS9 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_PRBS9,
+	/** Repeated '11110000' payload sequence. */
+	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_11110000 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_11110000,
+	/** Repeated '10101010' payload sequence. */
+	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_10101010 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_10101010,
+	/** PRBS15 payload sequence. */
+	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_PRBS15 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_PRBS15,
+	/** Repeated '11111111' payload sequence. */
+	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_11111111 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_11111111,
+	/** Repeated '00000000' payload sequence. */
+	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_00000000 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_00000000,
+	/** Repeated '00001111' payload sequence. */
+	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_00001111 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_00001111,
+	/** Repeated '01010101' payload sequence. */
+	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_01010101 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_01010101,
+	/** Custom payload provided by the user. */
+	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_USER = BT_HCI_OP_LE_CS_TEST_PAYLOAD_USER,
+};
+
+/** CS Test parameters */
+struct bt_cs_test_param {
+	/** CS mode to be used during the CS procedure. */
+	enum bt_cs_test_main_mode main_mode;
+	/** CS sub-mode to be used during the CS procedure. */
+	enum bt_cs_test_sub_mode sub_mode;
+	/** Number of main mode steps taken from the end of the last CS subevent
+	 * to be repeated at the beginning of the current CS subevent directly
+	 * after the last mode-0 step of that event.
+	 */
+	uint8_t main_mode_repetition;
+	/** Number of CS mode-0 steps at the beginning of the test CS subevent. */
+	uint8_t mode_0_steps;
+	/** CS Test role */
+	enum bt_cs_test_role role;
+	/** RTT variant */
+	enum bt_cs_test_rtt_type rtt_type;
+	/** CS_SYNC PHY */
+	enum bt_cs_test_cs_sync_phy cs_sync_phy;
+	/** Antenna identifier to be used for CS_SYNC packets. */
+	enum bt_cs_test_cs_sync_antenna_selection cs_sync_antenna_selection;
+	/** CS subevent length in microseconds.
+	 *
+	 *  Range: 1250us to 4s
+	 */
+	uint32_t subevent_len;
+	/** Gap between the start of two consecutive CS subevents (N * 0.625 ms)
+	 *
+	 *  A value of 0 means that there is only one CS subevent.
+	 */
+	uint16_t subevent_interval;
+	/** Maximum allowed number of subevents in the procedure.
+	 *
+	 *  A value of 0 means that this parameter is ignored.
+	 */
+	uint8_t max_num_subevents;
+	/** Desired TX power level for the CS procedure.
+	 *
+	 *  Value range is @ref BT_HCI_OP_LE_CS_MIN_MAX_TX_POWER to
+	 *  @ref BT_HCI_OP_LE_CS_MAX_MAX_TX_POWER.
+	 *
+	 *  Special values:
+	 *    - @ref BT_HCI_OP_LE_CS_TEST_MAXIMIZE_TX_POWER tells the controller
+	 *      it should use as high a transmit power as possible
+	 *    - @ref BT_HCI_OP_LE_CS_TEST_MINIMIZE_TX_POWER tells the controller
+	 *      it should use as low a transmit power as possible
+	 */
+	uint8_t transmit_power_level;
+	/** Interlude time in microseconds between the RTT packets. */
+	uint8_t t_ip1_time;
+	/** Interlude time in microseconds between the CS tones. */
+	uint8_t t_ip2_time;
+	/** Time in microseconds for frequency changes. */
+	uint8_t t_fcs_time;
+	/** Time in microseconds for the phase measurement period of the CS tones. */
+	uint8_t t_pm_time;
+	/** Time in microseconds for the antenna switch period of the CS tones. */
+	uint8_t t_sw_time;
+	/** Antenna Configuration Index used during antenna switching during
+	 *  the tone phases of CS steps.
+	 */
+	enum bt_cs_test_tone_antenna_config_selection tone_antenna_config_selection;
+	/** Initiator SNR control options */
+	enum bt_cs_test_initiator_snr_control initiator_snr_control;
+	/** Reflector SNR control options */
+	enum bt_cs_test_reflector_snr_control reflector_snr_control;
+	/** Determines octets 14 and 15 of the initial value of the DRBG nonce. */
+	uint16_t drbg_nonce;
+
+	/** Override configuration.
+	 *
+	 *  This parameter is used to override CS parameters from the DRBG.
+	 *  Each bit configures a different set of parameters.
+	 *
+	 *  All overrides are optional, except for those configured by bit 0.
+	 *
+	 *  These are:
+	 *    - Bit 0 set: Override using list of channels
+	 *    - Bit 0 not set: Override using channel map
+	 *    - Bit 2 set: Override main mode steps
+	 *    - Bit 3 set: Override T_PM_Tone_Ext
+	 *    - Bit 4 set: Override tone antenna permutation
+	 *    - Bit 5 set: Override CS_SYNC AA
+	 *    - Bit 6 set: Override SS marker positions
+	 *    - Bit 7 set: Override SS marker value
+	 *    - Bit 8 set: Override CS_SYNC payload pattern and user payload
+	 *    - Bit 10 set: Procedure is replaced with a stable phase test
+	 */
+	uint16_t override_config;
+
+	/** override config bit 0. */
+	struct {
+		/** Number of times the channels indicated by the channel map or channel field
+		 *  are cycled through for non-mode-0 steps within a CS procedure.
+		 */
+		uint8_t channel_map_repetition;
+		union {
+			struct {
+				uint8_t num_channels;
+				uint8_t *channels;
+			} set;
+			struct {
+				uint8_t channel_map[10];
+				enum bt_cs_test_override_0_chsel_alg channel_selection_type;
+				enum bt_cs_test_override_0_ch3c_shape ch3c_shape;
+				uint8_t ch3c_jump;
+			} not_set;
+		};
+	} override_config_0;
+
+	/** Override config bit 2. These parameters are ignored if the bit is not set. */
+	struct {
+		uint8_t main_mode_steps;
+	} override_config_2;
+
+	/** Override config bit 3. These parameters are ignored if the bit is not set.  */
+	struct {
+		enum bt_cs_test_override_3_pm_tone_ext t_pm_tone_ext;
+	} override_config_3;
+
+	/** Override config bit 4. These parameters are ignored if the bit is not set. */
+	struct {
+		enum bt_cs_test_override_4_tone_antenna_permutation tone_antenna_permutation;
+	} override_config_4;
+
+	/** Override config bit 5. These parameters are ignored if the bit is not set.  */
+	struct {
+		/** Access Address used in CS_SYNC packets sent by the initiator. */
+		uint32_t cs_sync_aa_initiator;
+		/** Access Address used in CS_SYNC packets sent by the reflector. */
+		uint32_t cs_sync_aa_reflector;
+	} override_config_5;
+
+	/** Override config bit 6. These parameters are ignored if the bit is not set. */
+	struct {
+		/** Bit number where the first marker in the channel sounding sequence starts.
+		 *
+		 *  Must be between 0 and 28 when using @ref BT_CS_TEST_RTT_32_BIT_SOUNDING.
+		 */
+		uint8_t ss_marker1_position;
+		/** Bit number where the second marker in the channel sounding sequence starts.
+		 *
+		 *  Must be between 67 and 92 when using @ref BT_CS_TEST_RTT_96_BIT_SOUNDING.
+		 *
+		 *  A value of @ref BT_HCI_OP_LE_CS_TEST_SS_MARKER_2_POSITION_NOT_PRESENT
+		 *  indicates that this sounding sequence or marker is not present.
+		 */
+		uint8_t ss_marker2_position;
+	} override_config_6;
+
+	/** Override config bit 7. These parameters are ignored if the bit is not set. */
+	struct {
+		/** Value of the Sounding Sequence marker. */
+		enum bt_cs_test_override_7_ss_marker_value ss_marker_value;
+	} override_config_7;
+
+	/** Override config bit 8. These parameters are ignored if the bit is not set.  */
+	struct {
+		/** CS_SYNC payload pattern selection. */
+		enum bt_cs_test_override_8_cs_sync_payload_pattern cs_sync_payload_pattern;
+		/** User payload for CS_SYNC packets.
+		 *
+		 *  This parameter is only used when using
+		 *  @ref BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_USER
+		 *
+		 *  The least significant bit corresponds to the most significant bit
+		 *  of the CS payload. When the sequence is less than 16 octets,
+		 *  the least significant octets shall be padded with zeros.
+		 */
+		uint8_t cs_sync_user_payload[16];
+	} override_config_8;
+};
 
 /** @brief Read Remote Supported Capabilities
  *
@@ -102,6 +547,28 @@ int bt_cs_set_default_settings(struct bt_conn *conn,
  */
 int bt_cs_read_remote_fae_table(struct bt_conn *conn);
 
+/** @brief Start a CS test
+ *
+ * This command is used to start a CS test where the IUT is placed in the role
+ * of either the initiator or reflector.
+ *
+ * The first mode-0 channel in the list is used as the starting channel for
+ * the test. At the beginning of any test, the IUT in the flector role shall
+ * listen on the first mode-0 channel until it receives the first transmission
+ * from the initiator. Similarly, with the IUT in the initiator role, the tester
+ * will start by listening on the first mode-0 channel and the IUT shall transmit
+ * on that channel for the first half of the first CS step. Thereafter, the
+ * parameters of this command describe the required transmit and receive behavior
+ * for the CS test.
+ *
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ *
+ * @param params CS Test parameters
+ *
+ * @return Zero on success or (negative) error code on failure.
+ */
+int bt_cs_start_test(const struct bt_cs_test_param *params);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 48d7196c9e6..31b30bbcf96 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -2436,6 +2436,152 @@ struct bt_hci_cp_le_read_remote_fae_table {
 	uint16_t handle;
 } __packed;
 
+
+#define BT_HCI_OP_LE_CS_TEST BT_OP(BT_OGF_LE, 0x0095) /* 0x2095 */
+
+#define BT_HCI_OP_LE_CS_MAIN_MODE_1 0x1
+#define BT_HCI_OP_LE_CS_MAIN_MODE_2 0x2
+#define BT_HCI_OP_LE_CS_MAIN_MODE_3 0x3
+
+#define BT_HCI_OP_LE_CS_SUB_MODE_1 0x1
+#define BT_HCI_OP_LE_CS_SUB_MODE_2 0x2
+#define BT_HCI_OP_LE_CS_SUB_MODE_3 0x3
+#define BT_HCI_OP_LE_CS_SUB_MODE_UNUSED 0xFF
+
+#define BT_HCI_OP_LE_CS_INITIATOR_ROLE 0x0
+#define BT_HCI_OP_LE_CS_REFLECTOR_ROLE 0x1
+
+#define BT_HCI_OP_LE_CS_RTT_TYPE_AA_ONLY     0x0
+#define BT_HCI_OP_LE_CS_RTT_TYPE_32BIT_SOUND 0x1
+#define BT_HCI_OP_LE_CS_RTT_TYPE_96BIT_SOUND 0x2
+#define BT_HCI_OP_LE_CS_RTT_TYPE_32BIT_RAND  0x3
+#define BT_HCI_OP_LE_CS_RTT_TYPE_64BIT_RAND  0x4
+#define BT_HCI_OP_LE_CS_RTT_TYPE_96BIT_RAND  0x5
+#define BT_HCI_OP_LE_CS_RTT_TYPE_128BIT_RAND 0x6
+
+#define BT_HCI_OP_LE_CS_CS_SYNC_1M     0x1
+#define BT_HCI_OP_LE_CS_CS_SYNC_2M     0x2
+#define BT_HCI_OP_LE_CS_CS_SYNC_2M_2BT 0x3
+
+#define BT_HCI_OP_LE_CS_TEST_MAXIMIZE_TX_POWER 0x7E
+#define BT_HCI_OP_LE_CS_TEST_MINIMIZE_TX_POWER 0x7F
+
+#define BT_HCI_OP_LE_CS_TEST_ACI_0 0x0
+#define BT_HCI_OP_LE_CS_TEST_ACI_1 0x1
+#define BT_HCI_OP_LE_CS_TEST_ACI_2 0x2
+#define BT_HCI_OP_LE_CS_TEST_ACI_3 0x3
+#define BT_HCI_OP_LE_CS_TEST_ACI_4 0x4
+#define BT_HCI_OP_LE_CS_TEST_ACI_5 0x5
+#define BT_HCI_OP_LE_CS_TEST_ACI_6 0x6
+#define BT_HCI_OP_LE_CS_TEST_ACI_7 0x7
+
+#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_18 0x0
+#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_21 0x1
+#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_24 0x2
+#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_27 0x3
+#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_30 0x4
+#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_NOT_USED 0xFF
+
+#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_18 0x0
+#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_21 0x1
+#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_24 0x2
+#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_27 0x3
+#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_30 0x4
+#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_NOT_USED 0xFF
+
+#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_0_MASK BIT(0)
+#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_2_MASK BIT(2)
+#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_3_MASK BIT(3)
+#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_4_MASK BIT(4)
+#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_5_MASK BIT(5)
+#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_6_MASK BIT(6)
+#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_7_MASK BIT(7)
+#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_8_MASK BIT(8)
+#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_10_MASK BIT(10)
+
+#define BT_HCI_OP_LE_CS_TEST_CHSEL_TYPE_3B 0x0
+#define BT_HCI_OP_LE_CS_TEST_CHSEL_TYPE_3C 0x1
+
+#define BT_HCI_OP_LE_CS_TEST_CH3C_SHAPE_HAT 0x0
+#define BT_HCI_OP_LE_CS_TEST_CH3C_SHAPE_X   0x1
+
+#define BT_HCI_OP_LE_CS_TEST_TONE_EXT_NONE 0x0
+#define BT_HCI_OP_LE_CS_TEST_TONE_EXT_INIT 0x1
+#define BT_HCI_OP_LE_CS_TEST_TONE_EXT_REFL 0x2
+#define BT_HCI_OP_LE_CS_TEST_TONE_EXT_BOTH 0x3
+#define BT_HCI_OP_LE_CS_TEST_TONE_EXT_REPEAT 0x4
+
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_00 0x0
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_01 0x1
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_02 0x2
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_03 0x3
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_04 0x4
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_05 0x5
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_06 0x6
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_07 0x7
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_08 0x8
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_09 0x9
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_10 0xA
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_11 0xB
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_12 0xC
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_13 0xD
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_14 0xE
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_15 0xF
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_16 0x10
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_17 0x11
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_18 0x12
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_19 0x13
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_20 0x14
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_21 0x15
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_22 0x16
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_23 0x17
+#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_LOOP 0xFF
+
+#define BT_HCI_OP_LE_CS_TEST_SS_MARKER_2_POSITION_NOT_PRESENT 0xFF
+
+#define BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_0011 0x0
+#define BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_1100 0x1
+#define BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_LOOP 0x2
+
+#define BT_HCI_OP_LE_CS_TEST_PAYLOAD_PRBS9    0x00
+#define BT_HCI_OP_LE_CS_TEST_PAYLOAD_11110000 0x01
+#define BT_HCI_OP_LE_CS_TEST_PAYLOAD_10101010 0x02
+#define BT_HCI_OP_LE_CS_TEST_PAYLOAD_PRBS15   0x03
+#define BT_HCI_OP_LE_CS_TEST_PAYLOAD_11111111 0x04
+#define BT_HCI_OP_LE_CS_TEST_PAYLOAD_00000000 0x05
+#define BT_HCI_OP_LE_CS_TEST_PAYLOAD_00001111 0x06
+#define BT_HCI_OP_LE_CS_TEST_PAYLOAD_01010101 0x07
+#define BT_HCI_OP_LE_CS_TEST_PAYLOAD_USER     0x80
+
+struct bt_hci_op_le_cs_test {
+	uint8_t main_mode_type;
+	uint8_t sub_mode_type;
+	uint8_t main_mode_repetition;
+	uint8_t mode_0_steps;
+	uint8_t role;
+	uint8_t rtt_type;
+	uint8_t cs_sync_phy;
+	uint8_t cs_sync_antenna_selection;
+	uint8_t subevent_len[3];
+	uint16_t subevent_interval;
+	uint8_t max_num_subevents;
+	uint8_t transmit_power_level;
+	uint8_t t_ip1_time;
+	uint8_t t_ip2_time;
+	uint8_t t_fcs_time;
+	uint8_t t_pm_time;
+	uint8_t t_sw_time;
+	uint8_t tone_antenna_config_selection;
+	uint8_t reserved;
+	uint8_t snr_control_initiator;
+	uint8_t snr_control_reflector;
+	uint16_t drbg_nonce;
+	uint8_t channel_map_repetition;
+	uint16_t override_config;
+	uint8_t override_parameters_length;
+	uint8_t override_parameters_data[];
+} __packed;
+
 /* Event definitions */
 
 #define BT_HCI_EVT_UNKNOWN                      0x00
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index 78b42dc399e..5a713ad2457 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -222,4 +222,108 @@ void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf)
 
 	bt_conn_unref(conn);
 }
+
+int bt_cs_start_test(const struct bt_cs_test_param *params)
+{
+	struct bt_hci_op_le_cs_test *cp;
+	struct net_buf *buf;
+
+	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_TEST, sizeof(*cp));
+	if (!buf) {
+		return -ENOBUFS;
+	}
+
+	cp = net_buf_add(buf, sizeof(*cp));
+
+	cp->main_mode_type = params->main_mode;
+	cp->sub_mode_type = params->sub_mode;
+	cp->main_mode_repetition = params->main_mode_repetition;
+	cp->mode_0_steps = params->mode_0_steps;
+	cp->role = params->role;
+	cp->rtt_type = params->rtt_type;
+	cp->cs_sync_phy = params->cs_sync_phy;
+	cp->cs_sync_antenna_selection = params->cs_sync_antenna_selection;
+	sys_put_le24(params->subevent_len, cp->subevent_len);
+	cp->subevent_interval = sys_cpu_to_le16(params->subevent_interval);
+	cp->max_num_subevents = params->max_num_subevents;
+	cp->transmit_power_level = params->transmit_power_level;
+	cp->t_ip1_time = params->t_ip1_time;
+	cp->t_ip2_time = params->t_ip2_time;
+	cp->t_fcs_time = params->t_fcs_time;
+	cp->t_pm_time = params->t_pm_time;
+	cp->t_sw_time = params->t_sw_time;
+	cp->tone_antenna_config_selection = params->tone_antenna_config_selection;
+
+	cp->reserved = 0;
+
+	cp->snr_control_initiator = params->initiator_snr_control;
+	cp->snr_control_reflector = params->reflector_snr_control;
+	cp->drbg_nonce = sys_cpu_to_le16(params->drbg_nonce);
+	cp->channel_map_repetition = params->override_config_0.channel_map_repetition;
+	cp->override_config = sys_cpu_to_le16(params->override_config);
+
+	uint8_t override_parameters_length = 0;
+
+	if (params->override_config & BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_0_MASK) {
+		const uint8_t num_channels = params->override_config_0.set.num_channels;
+
+		net_buf_add_u8(buf, num_channels);
+		override_parameters_length++;
+		net_buf_add_mem(buf, params->override_config_0.set.channels, num_channels);
+		override_parameters_length += num_channels;
+	} else {
+		net_buf_add_mem(buf, params->override_config_0.not_set.channel_map,
+				sizeof(params->override_config_0.not_set.channel_map));
+		net_buf_add_u8(buf, params->override_config_0.not_set.channel_selection_type);
+		net_buf_add_u8(buf, params->override_config_0.not_set.ch3c_shape);
+		net_buf_add_u8(buf, params->override_config_0.not_set.ch3c_jump);
+
+		override_parameters_length +=
+			(sizeof(params->override_config_0.not_set.channel_map) +
+			 sizeof(params->override_config_0.not_set.channel_selection_type) +
+			 sizeof(params->override_config_0.not_set.ch3c_shape) +
+			 sizeof(params->override_config_0.not_set.ch3c_jump));
+	}
+
+	if (params->override_config & BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_2_MASK) {
+		net_buf_add_mem(buf, &params->override_config_2, sizeof(params->override_config_2));
+		override_parameters_length += sizeof(params->override_config_2);
+	}
+
+	if (params->override_config & BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_3_MASK) {
+		net_buf_add_mem(buf, &params->override_config_3, sizeof(params->override_config_3));
+		override_parameters_length += sizeof(params->override_config_3);
+	}
+
+	if (params->override_config & BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_4_MASK) {
+		net_buf_add_mem(buf, &params->override_config_4, sizeof(params->override_config_4));
+		override_parameters_length += sizeof(params->override_config_4);
+	}
+
+	if (params->override_config & BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_5_MASK) {
+		net_buf_add_le32(buf, params->override_config_5.cs_sync_aa_initiator);
+		net_buf_add_le32(buf, params->override_config_5.cs_sync_aa_reflector);
+		override_parameters_length += sizeof(params->override_config_5);
+	}
+
+	if (params->override_config & BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_6_MASK) {
+		net_buf_add_mem(buf, &params->override_config_6, sizeof(params->override_config_6));
+		override_parameters_length += sizeof(params->override_config_6);
+	}
+
+	if (params->override_config & BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_7_MASK) {
+		net_buf_add_mem(buf, &params->override_config_7, sizeof(params->override_config_7));
+		override_parameters_length += sizeof(params->override_config_7);
+	}
+
+	if (params->override_config & BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_8_MASK) {
+		net_buf_add_mem(buf, &params->override_config_8, sizeof(params->override_config_8));
+		override_parameters_length += sizeof(params->override_config_8);
+	}
+
+	cp->override_parameters_length = override_parameters_length;
+
+	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_TEST, buf, NULL);
+}
+
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
diff --git a/subsys/bluetooth/shell/cs.c b/subsys/bluetooth/shell/cs.c
index fbe089155cc..b8f32be61be 100644
--- a/subsys/bluetooth/shell/cs.c
+++ b/subsys/bluetooth/shell/cs.c
@@ -133,6 +133,67 @@ static int cmd_read_remote_fae_table(const struct shell *sh, size_t argc, char *
 
 	return 0;
 }
+
+static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err = 0;
+	struct bt_cs_test_param params;
+
+	params.main_mode = BT_CS_TEST_MAIN_MODE_1;
+	params.sub_mode = BT_CS_TEST_SUB_MODE_UNUSED;
+	params.main_mode_repetition = 0;
+	params.mode_0_steps = 0x1;
+
+	params.role = shell_strtoul(argv[1], 16, &err);
+
+	if (err) {
+		shell_help(sh);
+		shell_error(sh, "Could not parse input 1, Role selection");
+		return SHELL_CMD_HELP_PRINTED;
+	}
+
+	if (params.role != BT_CS_TEST_ROLE_INITIATOR && params.role != BT_CS_TEST_ROLE_REFLECTOR) {
+		shell_help(sh);
+		shell_error(sh, "Role selection input invalid");
+		return SHELL_CMD_HELP_PRINTED;
+	}
+
+	params.rtt_type = BT_CS_TEST_RTT_AA_ONLY;
+	params.cs_sync_phy = BT_CS_TEST_CS_SYNC_LE_1M_PHY;
+	params.cs_sync_antenna_selection = BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_ONE;
+	params.subevent_len = 10000;
+	params.subevent_interval = 0;
+	params.max_num_subevents = 0;
+	params.transmit_power_level = BT_HCI_OP_LE_CS_TEST_MAXIMIZE_TX_POWER;
+	params.t_ip1_time = 80;
+	params.t_ip2_time = 80;
+	params.t_fcs_time = 120;
+	params.t_pm_time = 20;
+	params.t_sw_time = 0;
+	params.tone_antenna_config_selection = BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
+	params.initiator_snr_control = BT_CS_TEST_INITIATOR_SNR_CONTROL_NOT_USED;
+	params.reflector_snr_control = BT_CS_TEST_REFLECTOR_SNR_CONTROL_NOT_USED;
+	params.drbg_nonce = 0x1234;
+	params.override_config = 0;
+	params.override_config_0.channel_map_repetition = 1;
+	memset(params.override_config_0.not_set.channel_map, 0,
+		sizeof(params.override_config_0.not_set.channel_map));
+	params.override_config_0.not_set.channel_map[1] = 0xFF;
+	params.override_config_0.not_set.channel_selection_type =
+		BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3B;
+	params.override_config_0.not_set.ch3c_shape =
+		BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3C_HAT_SHAPE;
+	params.override_config_0.not_set.ch3c_jump = 0x2;
+
+	err = bt_cs_start_test(&params);
+	if (err) {
+		shell_error(sh, "bt_cs_start_test returned error %d", err);
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	cs_cmds,
 	SHELL_CMD_ARG(
@@ -148,6 +209,10 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		read_remote_fae_table, NULL,
 		"<None>",
 		cmd_read_remote_fae_table, 1, 0),
+	SHELL_CMD_ARG(
+		start_simple_cs_test, NULL,
+		"<Role selection (initiator, reflector): 0, 1>",
+		cmd_cs_test_simple, 2, 0),
 	SHELL_SUBCMD_SET_END);
 
 static int cmd_cs(const struct shell *sh, size_t argc, char **argv)

From cc3038c2f4104a5ff693bbf185b16ac0675575ad Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Wed, 25 Sep 2024 10:15:23 +0200
Subject: [PATCH 0035/2913] [nrf fromtree] tests: net: http_server: Add netif
 dependency

Some of the http_server tests suites were missing netif dependency.

(cherry picked from commit 1dca822483e9fc7b2b068df052c2a6acbfe8b946)

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 4112e11d006342963a9466a3a2ba5c08e1d38304)
(cherry picked from commit 65f3183dada9d8d333083f0680be79af454ca6b1)
---
 tests/net/lib/http_server/common/testcase.yaml | 1 +
 tests/net/lib/http_server/core/testcase.yaml   | 1 +
 tests/net/lib/http_server/crime/testcase.yaml  | 1 +
 tests/net/lib/http_server/tls/testcase.yaml    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/tests/net/lib/http_server/common/testcase.yaml b/tests/net/lib/http_server/common/testcase.yaml
index 8b89a10da97..530fab321bf 100644
--- a/tests/net/lib/http_server/common/testcase.yaml
+++ b/tests/net/lib/http_server/common/testcase.yaml
@@ -1,4 +1,5 @@
 common:
+  depends_on: netif
   min_ram: 40
   tags:
     - net
diff --git a/tests/net/lib/http_server/core/testcase.yaml b/tests/net/lib/http_server/core/testcase.yaml
index 695674768b0..3ecfe659d48 100644
--- a/tests/net/lib/http_server/core/testcase.yaml
+++ b/tests/net/lib/http_server/core/testcase.yaml
@@ -1,4 +1,5 @@
 common:
+  depends_on: netif
   min_ram: 80
   tags:
     - http
diff --git a/tests/net/lib/http_server/crime/testcase.yaml b/tests/net/lib/http_server/crime/testcase.yaml
index 31660759135..5fbcfe5ea27 100644
--- a/tests/net/lib/http_server/crime/testcase.yaml
+++ b/tests/net/lib/http_server/crime/testcase.yaml
@@ -1,4 +1,5 @@
 common:
+  depends_on: netif
   min_ram: 60
   tags:
     - http
diff --git a/tests/net/lib/http_server/tls/testcase.yaml b/tests/net/lib/http_server/tls/testcase.yaml
index 19611844a00..c163efb2526 100644
--- a/tests/net/lib/http_server/tls/testcase.yaml
+++ b/tests/net/lib/http_server/tls/testcase.yaml
@@ -1,4 +1,5 @@
 common:
+  depends_on: netif
   min_ram: 192
   tags:
     - http

From 734839ff185091c68488c26db3f09eb72e026e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Fri, 20 Sep 2024 11:58:52 +0200
Subject: [PATCH 0036/2913] [nrf fromtree] drivers: usb: udc_dwc2: Remove
 forward defitions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reorder functions in order to remove forward function defitions.
No functional changes.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 2c78a4d2432e6c65960d93dc537cd47d6fdbe2ef)
(cherry picked from commit a0449b1f959df5d460f0593377ba7658ac27f9fa)
(cherry picked from commit c6079bb1829807a8b36b3c449e7ede9ee2108577)
---
 drivers/usb/udc/udc_dwc2.c | 2969 ++++++++++++++++++------------------
 1 file changed, 1481 insertions(+), 1488 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index dc520abe78a..945c242bed4 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -139,13 +139,6 @@ struct udc_dwc2_data {
 	uint8_t setup[8];
 };
 
-static void dwc2_on_bus_reset(const struct device *dev);
-static void dwc2_exit_hibernation(const struct device *dev);
-static void dwc2_wait_for_bit(const struct device *dev,
-			      mem_addr_t addr, uint32_t bit);
-static void udc_dwc2_ep_disable(const struct device *dev,
-				struct udc_ep_config *const cfg, bool stall);
-
 #if defined(CONFIG_PINCTRL)
 #include <zephyr/drivers/pinctrl.h>
 
@@ -185,6 +178,33 @@ static inline struct usb_dwc2_reg *dwc2_get_base(const struct device *dev)
 	return config->base;
 }
 
+static void dwc2_wait_for_bit(const struct device *dev,
+			      mem_addr_t addr, uint32_t bit)
+{
+	k_timepoint_t timeout = sys_timepoint_calc(K_MSEC(100));
+
+	/* This could potentially be converted to use proper synchronization
+	 * primitives instead of busy looping, but the number of interrupt bits
+	 * this function can be waiting for is rather high.
+	 *
+	 * Busy looping is most likely fine unless profiling shows otherwise.
+	 */
+	while (!(sys_read32(addr) & bit)) {
+		if (dwc2_quirk_is_phy_clk_off(dev)) {
+			/* No point in waiting, because the bit can only be set
+			 * when the PHY is actively clocked.
+			 */
+			return;
+		}
+
+		if (sys_timepoint_expired(timeout)) {
+			LOG_ERR("Timeout waiting for bit 0x%08X at 0x%08X",
+				bit, (uint32_t)addr);
+			return;
+		}
+	}
+}
+
 /* Get DOEPCTLn or DIEPCTLn register address */
 static mem_addr_t dwc2_get_dxepctl_reg(const struct device *dev, const uint8_t ep)
 {
@@ -834,1934 +854,1907 @@ static int dwc2_handle_evt_din(const struct device *dev,
 	return udc_submit_ep_event(dev, buf, 0);
 }
 
-static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
+static void dwc2_backup_registers(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	const struct udc_dwc2_config *const config = dev->config;
-	struct udc_ep_config *ep_cfg;
-	struct dwc2_drv_event evt;
+	struct usb_dwc2_reg *const base = config->base;
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	struct dwc2_reg_backup *backup = &priv->backup;
 
-	/* This is the bottom-half of the ISR handler and the place where
-	 * a new transfer can be fed.
-	 */
-	k_msgq_get(&drv_msgq, &evt, K_FOREVER);
-	ep_cfg = udc_get_ep_cfg(dev, evt.ep);
+	backup->gotgctl = sys_read32((mem_addr_t)&base->gotgctl);
+	backup->gahbcfg = sys_read32((mem_addr_t)&base->gahbcfg);
+	backup->gusbcfg = sys_read32((mem_addr_t)&base->gusbcfg);
+	backup->gintmsk = sys_read32((mem_addr_t)&base->gintmsk);
+	backup->grxfsiz = sys_read32((mem_addr_t)&base->grxfsiz);
+	backup->gnptxfsiz = sys_read32((mem_addr_t)&base->gnptxfsiz);
+	backup->gi2cctl = sys_read32((mem_addr_t)&base->gi2cctl);
+	backup->glpmcfg = sys_read32((mem_addr_t)&base->glpmcfg);
+	backup->gdfifocfg = sys_read32((mem_addr_t)&base->gdfifocfg);
 
-	switch (evt.type) {
-	case DWC2_DRV_EVT_XFER:
-		LOG_DBG("New transfer in the queue");
-		break;
-	case DWC2_DRV_EVT_SETUP:
-		LOG_DBG("SETUP event");
-		dwc2_handle_evt_setup(dev);
-		break;
-	case DWC2_DRV_EVT_DOUT:
-		LOG_DBG("DOUT event ep 0x%02x", ep_cfg->addr);
-		dwc2_handle_evt_dout(dev, ep_cfg);
-		break;
-	case DWC2_DRV_EVT_DIN:
-		LOG_DBG("DIN event");
-		dwc2_handle_evt_din(dev, ep_cfg);
-		break;
-	case DWC2_DRV_EVT_HIBERNATION_EXIT:
-		LOG_DBG("Hibernation exit event");
-		config->irq_disable_func(dev);
+	for (uint8_t i = 1U; i < priv->ineps; i++) {
+		backup->dieptxf[i - 1] = sys_read32((mem_addr_t)&base->dieptxf[i - 1]);
+	}
 
-		if (priv->hibernated) {
-			dwc2_exit_hibernation(dev);
+	backup->dcfg = sys_read32((mem_addr_t)&base->dcfg);
+	backup->dctl = sys_read32((mem_addr_t)&base->dctl);
+	backup->diepmsk = sys_read32((mem_addr_t)&base->diepmsk);
+	backup->doepmsk = sys_read32((mem_addr_t)&base->doepmsk);
+	backup->daintmsk = sys_read32((mem_addr_t)&base->daintmsk);
 
-			/* Let stack know we are no longer suspended */
-			udc_set_suspended(dev, false);
-			udc_submit_event(dev, UDC_EVT_RESUME, 0);
+	for (uint8_t i = 0U; i < 16; i++) {
+		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
 
-			if (evt.exit_reason == DWC2_HIBERNATION_EXIT_BUS_RESET) {
-				dwc2_on_bus_reset(dev);
+		if (epdir == USB_DWC2_GHWCFG1_EPDIR_IN || epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			backup->diepctl[i] = sys_read32((mem_addr_t)&base->in_ep[i].diepctl);
+			if (backup->diepctl[i] & USB_DWC2_DEPCTL_DPID) {
+				backup->diepctl[i] |= USB_DWC2_DEPCTL_SETD1PID;
+			} else {
+				backup->diepctl[i] |= USB_DWC2_DEPCTL_SETD0PID;
 			}
+			backup->dieptsiz[i] = sys_read32((mem_addr_t)&base->in_ep[i].dieptsiz);
+			backup->diepdma[i] = sys_read32((mem_addr_t)&base->in_ep[i].diepdma);
 		}
 
-		config->irq_enable_func(dev);
-		break;
+		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT || epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			backup->doepctl[i] = sys_read32((mem_addr_t)&base->out_ep[i].doepctl);
+			if (backup->doepctl[i] & USB_DWC2_DEPCTL_DPID) {
+				backup->doepctl[i] |= USB_DWC2_DEPCTL_SETD1PID;
+			} else {
+				backup->doepctl[i] |= USB_DWC2_DEPCTL_SETD0PID;
+			}
+			backup->doeptsiz[i] = sys_read32((mem_addr_t)&base->out_ep[i].doeptsiz);
+			backup->doepdma[i] = sys_read32((mem_addr_t)&base->out_ep[i].doepdma);
+		}
 	}
 
-	if (ep_cfg->addr != USB_CONTROL_EP_OUT && !udc_ep_is_busy(dev, ep_cfg->addr)) {
-		dwc2_handle_xfer_next(dev, ep_cfg);
-	} else {
-		LOG_DBG("ep 0x%02x busy", ep_cfg->addr);
-	}
+	backup->pcgcctl = sys_read32((mem_addr_t)&base->pcgcctl);
 }
 
-static void dwc2_on_bus_reset(const struct device *dev)
+static void dwc2_restore_essential_registers(const struct device *dev)
 {
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	const struct udc_dwc2_config *const config = dev->config;
+	struct usb_dwc2_reg *const base = config->base;
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	uint32_t doepmsk;
-
-	/* Set the NAK bit for all OUT endpoints */
-	for (uint8_t i = 0U; i < priv->numdeveps; i++) {
-		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
-		mem_addr_t doepctl_reg;
+	struct dwc2_reg_backup *backup = &priv->backup;
+	uint32_t pcgcctl = backup->pcgcctl & USB_DWC2_PCGCCTL_RESTOREVALUE_MASK;
 
-		LOG_DBG("ep 0x%02x EPDIR %u", i, epdir);
-		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT ||
-		    epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			doepctl_reg = dwc2_get_dxepctl_reg(dev, i);
-			sys_write32(USB_DWC2_DEPCTL_SNAK, doepctl_reg);
-		}
-	}
+	sys_write32(backup->glpmcfg, (mem_addr_t)&base->glpmcfg);
+	sys_write32(backup->gi2cctl, (mem_addr_t)&base->gi2cctl);
+	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
 
-	doepmsk = USB_DWC2_DOEPINT_SETUP | USB_DWC2_DOEPINT_XFERCOMPL;
-	if (priv->bufferdma) {
-		doepmsk |= USB_DWC2_DOEPINT_STSPHSERCVD;
-	}
+	sys_write32(backup->gahbcfg | USB_DWC2_GAHBCFG_GLBINTRMASK,
+		    (mem_addr_t)&base->gahbcfg);
 
-	sys_write32(doepmsk, (mem_addr_t)&base->doepmsk);
-	sys_set_bits((mem_addr_t)&base->diepmsk, USB_DWC2_DIEPINT_XFERCOMPL);
+	sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
+	sys_write32(USB_DWC2_GINTSTS_RSTRDONEINT, (mem_addr_t)&base->gintmsk);
 
-	/* Software has to handle RxFLvl interrupt only in Completer mode */
-	if (!priv->bufferdma) {
-		sys_set_bits((mem_addr_t)&base->gintmsk,
-			     USB_DWC2_GINTSTS_RXFLVL);
-	}
+	sys_write32(backup->gusbcfg, (mem_addr_t)&base->gusbcfg);
+	sys_write32(backup->dcfg, (mem_addr_t)&base->dcfg);
 
-	/* Clear device address during reset. */
-	sys_clear_bits((mem_addr_t)&base->dcfg, USB_DWC2_DCFG_DEVADDR_MASK);
+	pcgcctl |= USB_DWC2_PCGCCTL_RESTOREMODE | USB_DWC2_PCGCCTL_RSTPDWNMODULE;
+	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
+	k_busy_wait(1);
 
-	/* Speed enumeration must happen after reset. */
-	priv->enumdone = 0;
+	pcgcctl |= USB_DWC2_PCGCCTL_ESSREGRESTORED;
+	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
 }
 
-static void dwc2_handle_enumdone(const struct device *dev)
+static void dwc2_restore_device_registers(const struct device *dev)
 {
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	const struct udc_dwc2_config *const config = dev->config;
+	struct usb_dwc2_reg *const base = config->base;
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	uint32_t dsts;
+	struct dwc2_reg_backup *backup = &priv->backup;
 
-	dsts = sys_read32((mem_addr_t)&base->dsts);
-	priv->enumspd = usb_dwc2_get_dsts_enumspd(dsts);
-	priv->enumdone = 1;
-}
+	sys_write32(backup->gotgctl, (mem_addr_t)&base->gotgctl);
+	sys_write32(backup->gahbcfg, (mem_addr_t)&base->gahbcfg);
+	sys_write32(backup->gusbcfg, (mem_addr_t)&base->gusbcfg);
+	sys_write32(backup->gintmsk, (mem_addr_t)&base->gintmsk);
+	sys_write32(backup->grxfsiz, (mem_addr_t)&base->grxfsiz);
+	sys_write32(backup->gnptxfsiz, (mem_addr_t)&base->gnptxfsiz);
+	sys_write32(backup->gdfifocfg, (mem_addr_t)&base->gdfifocfg);
 
-static inline int dwc2_read_fifo_setup(const struct device *dev, uint8_t ep,
-				       const size_t size)
-{
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	size_t offset;
+	for (uint8_t i = 1U; i < priv->ineps; i++) {
+		sys_write32(backup->dieptxf[i - 1], (mem_addr_t)&base->dieptxf[i - 1]);
+	}
 
-	/* FIFO access is always in 32-bit words */
+	sys_write32(backup->dctl, (mem_addr_t)&base->dctl);
+	sys_write32(backup->diepmsk, (mem_addr_t)&base->diepmsk);
+	sys_write32(backup->doepmsk, (mem_addr_t)&base->doepmsk);
+	sys_write32(backup->daintmsk, (mem_addr_t)&base->daintmsk);
 
-	if (size != 8) {
-		LOG_ERR("%d bytes SETUP", size);
-	}
+	for (uint8_t i = 0U; i < 16; i++) {
+		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
 
-	/*
-	 * We store the setup packet temporarily in the driver's private data
-	 * because there is always a race risk after the status stage OUT
-	 * packet from the host and the new setup packet. This is fine in
-	 * bottom-half processing because the events arrive in a queue and
-	 * there will be a next net_buf for the setup packet.
-	 */
-	for (offset = 0; offset < MIN(size, 8); offset += 4) {
-		sys_put_le32(sys_read32(UDC_DWC2_EP_FIFO(base, ep)),
-			     &priv->setup[offset]);
-	}
+		if (epdir == USB_DWC2_GHWCFG1_EPDIR_IN || epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			sys_write32(backup->dieptsiz[i], (mem_addr_t)&base->in_ep[i].dieptsiz);
+			sys_write32(backup->diepdma[i], (mem_addr_t)&base->in_ep[i].diepdma);
+			sys_write32(backup->diepctl[i], (mem_addr_t)&base->in_ep[i].diepctl);
+		}
 
-	/* On protocol error simply discard extra data */
-	while (offset < size) {
-		sys_read32(UDC_DWC2_EP_FIFO(base, ep));
-		offset += 4;
+		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT || epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			sys_write32(backup->doeptsiz[i], (mem_addr_t)&base->out_ep[i].doeptsiz);
+			sys_write32(backup->doepdma[i], (mem_addr_t)&base->out_ep[i].doepdma);
+			sys_write32(backup->doepctl[i], (mem_addr_t)&base->out_ep[i].doepctl);
+		}
 	}
-
-	return 0;
 }
 
-static inline void dwc2_handle_rxflvl(const struct device *dev)
+static void dwc2_enter_hibernation(const struct device *dev)
 {
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	struct udc_ep_config *ep_cfg;
-	struct net_buf *buf;
-	uint32_t grxstsp;
-	uint32_t pktsts;
-	uint32_t bcnt;
-	uint8_t ep;
+	const struct udc_dwc2_config *const config = dev->config;
+	struct usb_dwc2_reg *const base = config->base;
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	mem_addr_t gpwrdn_reg = (mem_addr_t)&base->gpwrdn;
+	mem_addr_t pcgcctl_reg = (mem_addr_t)&base->pcgcctl;
 
-	grxstsp = sys_read32((mem_addr_t)&base->grxstsp);
-	ep = usb_dwc2_get_grxstsp_epnum(grxstsp);
-	bcnt = usb_dwc2_get_grxstsp_bcnt(grxstsp);
-	pktsts = usb_dwc2_get_grxstsp_pktsts(grxstsp);
+	dwc2_backup_registers(dev);
 
-	LOG_DBG("ep 0x%02x: pktsts %u, bcnt %u", ep, pktsts, bcnt);
+	/* This code currently only supports UTMI+. UTMI+ runs at either 30 or
+	 * 60 MHz and therefore 1 us busy waits have sufficiently large margin.
+	 */
 
-	switch (pktsts) {
-	case USB_DWC2_GRXSTSR_PKTSTS_SETUP:
-		dwc2_read_fifo_setup(dev, ep, bcnt);
-		break;
-	case USB_DWC2_GRXSTSR_PKTSTS_OUT_DATA:
-		ep_cfg = udc_get_ep_cfg(dev, ep);
+	/* Enable PMU Logic */
+	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUACTV);
+	k_busy_wait(1);
 
-		buf = udc_buf_peek(dev, ep_cfg->addr);
+	/* Stop PHY clock */
+	sys_set_bits(pcgcctl_reg, USB_DWC2_PCGCCTL_STOPPCLK);
+	k_busy_wait(1);
 
-		/* RxFIFO data must be retrieved even when buf is NULL */
-		dwc2_read_fifo(dev, ep, buf, bcnt);
-		break;
-	case USB_DWC2_GRXSTSR_PKTSTS_OUT_DATA_DONE:
-		LOG_DBG("RX pktsts DONE");
-		break;
-	case USB_DWC2_GRXSTSR_PKTSTS_SETUP_DONE:
-		LOG_DBG("SETUP pktsts DONE");
-	case USB_DWC2_GRXSTSR_PKTSTS_GLOBAL_OUT_NAK:
-		LOG_DBG("Global OUT NAK");
-		break;
-	default:
-		break;
-	}
+	/* Enable PMU interrupt */
+	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUINTSEL);
+	k_busy_wait(1);
+
+	/* Unmask PMU interrupt bits */
+	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_LINESTAGECHANGEMSK |
+				 USB_DWC2_GPWRDN_RESETDETMSK |
+				 USB_DWC2_GPWRDN_DISCONNECTDETECTMSK |
+				 USB_DWC2_GPWRDN_STSCHNGINTMSK);
+	k_busy_wait(1);
+
+	/* Enable power clamps */
+	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNCLMP);
+	k_busy_wait(1);
+
+	/* Switch off power to the controller */
+	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNSWTCH);
+
+	/* Mark that the core is hibernated */
+	priv->hibernated = 1;
+	LOG_DBG("Hibernated");
 }
 
-static inline void dwc2_handle_in_xfercompl(const struct device *dev,
-					    const uint8_t ep_idx)
+static void dwc2_exit_hibernation(const struct device *dev)
 {
+	const struct udc_dwc2_config *const config = dev->config;
+	struct usb_dwc2_reg *const base = config->base;
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	struct udc_ep_config *ep_cfg;
-	struct dwc2_drv_event evt;
-	struct net_buf *buf;
+	mem_addr_t gpwrdn_reg = (mem_addr_t)&base->gpwrdn;
+	mem_addr_t pcgcctl_reg = (mem_addr_t)&base->pcgcctl;
 
-	ep_cfg = udc_get_ep_cfg(dev, ep_idx | USB_EP_DIR_IN);
-	buf = udc_buf_peek(dev, ep_cfg->addr);
-	if (buf == NULL) {
-		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
-		return;
-	}
+	/* Switch on power to the controller */
+	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNSWTCH);
+	k_busy_wait(1);
 
-	net_buf_pull(buf, priv->tx_len[ep_idx]);
-	if (buf->len  && dwc2_tx_fifo_write(dev, ep_cfg, buf) == 0) {
-		return;
-	}
+	/* Reset the controller */
+	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNRST_N);
+	k_busy_wait(1);
 
-	evt.dev = dev;
-	evt.ep = ep_cfg->addr;
-	evt.type = DWC2_DRV_EVT_DIN;
-	k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
-}
+	/* Enable restore from PMU */
+	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_RESTORE);
+	k_busy_wait(1);
 
-static inline void dwc2_handle_iepint(const struct device *dev)
-{
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	const uint8_t n_max = 16;
-	uint32_t diepmsk;
-	uint32_t daint;
+	/* Disable power clamps */
+	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNCLMP);
 
-	diepmsk = sys_read32((mem_addr_t)&base->diepmsk);
-	daint = sys_read32((mem_addr_t)&base->daint);
+	/* Remove reset to the controller */
+	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNRST_N);
+	k_busy_wait(1);
 
-	for (uint8_t n = 0U; n < n_max; n++) {
-		mem_addr_t diepint_reg = (mem_addr_t)&base->in_ep[n].diepint;
-		uint32_t diepint;
-		uint32_t status;
+	/* Disable PMU interrupt */
+	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUINTSEL);
 
-		if (daint & USB_DWC2_DAINT_INEPINT(n)) {
-			/* Read and clear interrupt status */
-			diepint = sys_read32(diepint_reg);
-			status = diepint & diepmsk;
-			sys_write32(status, diepint_reg);
+	dwc2_restore_essential_registers(dev);
 
-			LOG_DBG("ep 0x%02x interrupt status: 0x%x",
-				n | USB_EP_DIR_IN, status);
+	/* Wait for Restore Done Interrupt */
+	dwc2_wait_for_bit(dev, (mem_addr_t)&base->gintsts, USB_DWC2_GINTSTS_RSTRDONEINT);
+	sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
 
-			if (status & USB_DWC2_DIEPINT_XFERCOMPL) {
-				dwc2_handle_in_xfercompl(dev, n);
-			}
+	/* Disable restore from PMU */
+	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_RESTORE);
+	k_busy_wait(1);
 
-		}
-	}
+	/* Clear reset to power down module */
+	sys_clear_bits(pcgcctl_reg, USB_DWC2_PCGCCTL_RSTPDWNMODULE);
 
-	/* Clear IEPINT interrupt */
-	sys_write32(USB_DWC2_GINTSTS_IEPINT, (mem_addr_t)&base->gintsts);
-}
+	/* Restore GUSBCFG, DCFG and DCTL */
+	sys_write32(priv->backup.gusbcfg, (mem_addr_t)&base->gusbcfg);
+	sys_write32(priv->backup.dcfg, (mem_addr_t)&base->dcfg);
+	sys_write32(priv->backup.dctl, (mem_addr_t)&base->dctl);
 
-static inline void dwc2_handle_out_xfercompl(const struct device *dev,
-					     const uint8_t ep_idx)
-{
-	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep_idx);
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	struct dwc2_drv_event evt;
-	uint32_t bcnt;
-	struct net_buf *buf;
-	uint32_t doeptsiz;
-	const bool is_iso = dwc2_ep_is_iso(ep_cfg);
+	/* Disable PMU */
+	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUACTV);
+	k_busy_wait(5);
 
-	doeptsiz = sys_read32((mem_addr_t)&base->out_ep[ep_idx].doeptsiz);
+	sys_set_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_PWRONPRGDONE);
+	k_msleep(1);
+	sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
 
-	buf = udc_buf_peek(dev, ep_cfg->addr);
-	if (!buf) {
-		LOG_ERR("No buffer for ep 0x%02x", ep_cfg->addr);
-		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
-		return;
-	}
+	dwc2_restore_device_registers(dev);
 
-	evt.type = DWC2_DRV_EVT_DOUT;
-	evt.ep = ep_cfg->addr;
+	priv->hibernated = 0;
+	LOG_DBG("Hibernation exit complete");
+}
 
-	/* The original transfer size value is necessary here because controller
-	 * decreases the value for every byte stored.
-	 */
-	bcnt = usb_dwc2_get_doeptsizn_xfersize(priv->rx_siz[ep_idx]) -
-	       usb_dwc2_get_doeptsizn_xfersize(doeptsiz);
+static void dwc2_unset_unused_fifo(const struct device *dev)
+{
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	struct udc_ep_config *tmp;
 
-	if (is_iso) {
-		uint32_t pkts;
-		bool valid;
+	for (uint8_t i = priv->ineps - 1U; i > 0; i--) {
+		tmp = udc_get_ep_cfg(dev, i | USB_EP_DIR_IN);
 
-		pkts = usb_dwc2_get_doeptsizn_pktcnt(priv->rx_siz[ep_idx]) -
-			usb_dwc2_get_doeptsizn_pktcnt(doeptsiz);
-		switch (usb_dwc2_get_doeptsizn_rxdpid(doeptsiz)) {
-		case USB_DWC2_DOEPTSIZN_RXDPID_DATA0:
-			valid = (pkts == 1);
-			break;
-		case USB_DWC2_DOEPTSIZN_RXDPID_DATA1:
-			valid = (pkts == 2);
-			break;
-		case USB_DWC2_DOEPTSIZN_RXDPID_DATA2:
-			valid = (pkts == 3);
-			break;
-		case USB_DWC2_DOEPTSIZN_RXDPID_MDATA:
-		default:
-			valid = false;
-			break;
+		if (tmp->stat.enabled && (priv->txf_set & BIT(i))) {
+			return;
 		}
 
-		if (!valid) {
-			if (!priv->bufferdma) {
-				/* RxFlvl added data to net buf, rollback */
-				net_buf_remove_mem(buf, bcnt);
-			}
-			/* Data is not valid, discard it */
-			bcnt = 0;
+		if (!tmp->stat.enabled && (priv->txf_set & BIT(i))) {
+			priv->txf_set &= ~BIT(i);
 		}
 	}
-
-	if (priv->bufferdma && bcnt) {
-		sys_cache_data_invd_range(buf->data, bcnt);
-		net_buf_add(buf, bcnt);
-	}
-
-	if (!is_iso && (bcnt % udc_mps_ep_size(ep_cfg)) == 0 &&
-	    net_buf_tailroom(buf)) {
-		dwc2_prep_rx(dev, buf, ep_cfg);
-	} else {
-		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
-	}
 }
 
-static inline void dwc2_handle_oepint(const struct device *dev)
+/*
+ * In dedicated FIFO mode there are i (i = 1 ... ineps - 1) FIFO size registers,
+ * e.g. DIEPTXF1, DIEPTXF2, ... DIEPTXF4. When dynfifosizing is enabled,
+ * the size register is mutable. The offset of DIEPTXF1 registers is 0.
+ */
+static int dwc2_set_dedicated_fifo(const struct device *dev,
+				   struct udc_ep_config *const cfg,
+				   uint32_t *const diepctl)
 {
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	const uint8_t n_max = 16;
-	uint32_t doepmsk;
-	uint32_t daint;
+	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
+	const uint32_t addnl = USB_MPS_ADDITIONAL_TRANSACTIONS(cfg->mps);
+	uint32_t reqdep;
+	uint32_t txfaddr;
+	uint32_t txfdep;
+	uint32_t tmp;
 
-	doepmsk = sys_read32((mem_addr_t)&base->doepmsk);
-	daint = sys_read32((mem_addr_t)&base->daint);
+	/* Keep everything but FIFO number */
+	tmp = *diepctl & ~USB_DWC2_DEPCTL_TXFNUM_MASK;
 
-	for (uint8_t n = 0U; n < n_max; n++) {
-		mem_addr_t doepint_reg = (mem_addr_t)&base->out_ep[n].doepint;
-		uint32_t doepint;
-		uint32_t status;
+	reqdep = DIV_ROUND_UP(udc_mps_ep_size(cfg), 4U);
+	if (priv->bufferdma) {
+		/* In DMA mode, TxFIFO capable of holding 2 packets is enough */
+		reqdep *= MIN(2, (1 + addnl));
+	} else {
+		reqdep *= (1 + addnl);
+	}
 
-		if (!(daint & USB_DWC2_DAINT_OUTEPINT(n))) {
-			continue;
+	if (priv->dynfifosizing) {
+		if (priv->txf_set & ~BIT_MASK(ep_idx)) {
+			dwc2_unset_unused_fifo(dev);
 		}
 
-		/* Read and clear interrupt status */
-		doepint = sys_read32(doepint_reg);
-		status = doepint & doepmsk;
-		sys_write32(status, doepint_reg);
+		if (priv->txf_set & ~BIT_MASK(ep_idx)) {
+			LOG_WRN("Some of the FIFOs higher than %u are set, %lx",
+				ep_idx, priv->txf_set & ~BIT_MASK(ep_idx));
+			return -EIO;
+		}
 
-		LOG_DBG("ep 0x%02x interrupt status: 0x%x", n, status);
-
-		/* StupPktRcvd is not enabled for interrupt, but must be checked
-		 * when XferComp hits to determine if SETUP token was received.
-		 */
-		if (priv->bufferdma && (status & USB_DWC2_DOEPINT_XFERCOMPL) &&
-		    (doepint & USB_DWC2_DOEPINT_STUPPKTRCVD)) {
-			uint32_t addr;
-
-			sys_write32(USB_DWC2_DOEPINT_STUPPKTRCVD, doepint_reg);
-			status &= ~USB_DWC2_DOEPINT_XFERCOMPL;
-
-			/* DMAAddr points past the memory location where the
-			 * SETUP data was stored. Copy the received SETUP data
-			 * to temporary location used also in Completer mode
-			 * which allows common SETUP interrupt handling.
-			 */
-			addr = sys_read32((mem_addr_t)&base->out_ep[0].doepdma);
-			sys_cache_data_invd_range((void *)(addr - 8), 8);
-			memcpy(priv->setup, (void *)(addr - 8), sizeof(priv->setup));
+		if ((ep_idx - 1) != 0U) {
+			txfaddr = dwc2_get_txfdep(dev, ep_idx - 2) +
+				  dwc2_get_txfaddr(dev, ep_idx - 2);
+		} else {
+			txfaddr = priv->rxfifo_depth +
+				MAX(UDC_DWC2_FIFO0_DEPTH, priv->max_txfifo_depth[0]);
 		}
 
-		if (status & USB_DWC2_DOEPINT_SETUP) {
-			struct dwc2_drv_event evt = {
-				.type = DWC2_DRV_EVT_SETUP,
-				.ep = USB_CONTROL_EP_OUT,
-			};
-
-			k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+		/* Make sure to not set TxFIFO greater than hardware allows */
+		txfdep = reqdep;
+		if (txfdep > priv->max_txfifo_depth[ep_idx]) {
+			return -ENOMEM;
 		}
 
-		if (status & USB_DWC2_DOEPINT_STSPHSERCVD) {
-			/* Driver doesn't need any special handling, but it is
-			 * mandatory that the bit is cleared in Buffer DMA mode.
-			 * If the bit is not cleared (i.e. when this interrupt
-			 * bit is masked), then SETUP interrupts will cease
-			 * after first control transfer with data stage from
-			 * device to host.
-			 */
+		/* Do not allocate TxFIFO outside the SPRAM */
+		if (txfaddr + txfdep > priv->dfifodepth) {
+			return -ENOMEM;
 		}
 
-		if (status & USB_DWC2_DOEPINT_XFERCOMPL) {
-			dwc2_handle_out_xfercompl(dev, n);
+		/* Set FIFO depth (32-bit words) and address */
+		dwc2_set_txf(dev, ep_idx - 1, txfdep, txfaddr);
+	} else {
+		txfdep = dwc2_get_txfdep(dev, ep_idx - 1);
+		txfaddr = dwc2_get_txfaddr(dev, ep_idx - 1);
+
+		if (reqdep > txfdep) {
+			return -ENOMEM;
 		}
+
+		LOG_DBG("Reuse FIFO%u addr 0x%08x depth %u", ep_idx, txfaddr, txfdep);
 	}
 
-	/* Clear OEPINT interrupt */
-	sys_write32(USB_DWC2_GINTSTS_OEPINT, (mem_addr_t)&base->gintsts);
-}
+	/* Assign FIFO to the IN endpoint */
+	*diepctl = tmp | usb_dwc2_set_depctl_txfnum(ep_idx);
+	priv->txf_set |= BIT(ep_idx);
+	dwc2_flush_tx_fifo(dev, ep_idx);
 
-/* In DWC2 otg context incomplete isochronous IN transfer means that the host
- * did not issue IN token to at least one isochronous endpoint and software has
- * find on which endpoints the data is no longer valid and discard it.
- */
-static void dwc2_handle_incompisoin(const struct device *dev)
-{
-	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = config->base;
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	mem_addr_t gintsts_reg = (mem_addr_t)&base->gintsts;
-	const uint32_t mask =
-		USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_EPTYPE_MASK |
-		USB_DWC2_DEPCTL_USBACTEP;
-	const uint32_t val =
-		USB_DWC2_DEPCTL_EPENA |
-		usb_dwc2_set_depctl_eptype(USB_DWC2_DEPCTL_EPTYPE_ISO) |
-		USB_DWC2_DEPCTL_USBACTEP;
+	LOG_INF("Set FIFO%u (ep 0x%02x) addr 0x%04x depth %u size %u",
+		ep_idx, cfg->addr, txfaddr, txfdep, dwc2_ftx_avail(dev, ep_idx));
 
-	for (uint8_t i = 1U; i < priv->numdeveps; i++) {
-		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
+	return 0;
+}
 
-		if (epdir == USB_DWC2_GHWCFG1_EPDIR_IN ||
-		    epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			mem_addr_t diepctl_reg = dwc2_get_dxepctl_reg(dev, i | USB_EP_DIR_IN);
-			uint32_t diepctl;
+static int dwc2_ep_control_enable(const struct device *dev,
+				  struct udc_ep_config *const cfg)
+{
+	mem_addr_t dxepctl0_reg;
+	uint32_t dxepctl0;
 
-			diepctl = sys_read32(diepctl_reg);
+	dxepctl0_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
+	dxepctl0 = sys_read32(dxepctl0_reg);
 
-			/* Check if endpoint didn't receive ISO OUT data */
-			if ((diepctl & mask) == val) {
-				struct udc_ep_config *cfg;
-				struct net_buf *buf;
+	dxepctl0 &= ~USB_DWC2_DEPCTL0_MPS_MASK;
+	switch (cfg->mps) {
+	case 8:
+		dxepctl0 |= USB_DWC2_DEPCTL0_MPS_8 << USB_DWC2_DEPCTL_MPS_POS;
+		break;
+	case 16:
+		dxepctl0 |= USB_DWC2_DEPCTL0_MPS_16 << USB_DWC2_DEPCTL_MPS_POS;
+		break;
+	case 32:
+		dxepctl0 |= USB_DWC2_DEPCTL0_MPS_32 << USB_DWC2_DEPCTL_MPS_POS;
+		break;
+	case 64:
+		dxepctl0 |= USB_DWC2_DEPCTL0_MPS_64 << USB_DWC2_DEPCTL_MPS_POS;
+		break;
+	default:
+		return -EINVAL;
+	}
 
-				cfg = udc_get_ep_cfg(dev, i | USB_EP_DIR_IN);
-				__ASSERT_NO_MSG(cfg && cfg->stat.enabled &&
-						dwc2_ep_is_iso(cfg));
+	dxepctl0 |= USB_DWC2_DEPCTL_USBACTEP;
 
-				udc_dwc2_ep_disable(dev, cfg, false);
+	if (cfg->addr == USB_CONTROL_EP_OUT) {
+		int ret;
 
-				buf = udc_buf_get(dev, cfg->addr);
-				if (buf) {
-					udc_submit_ep_event(dev, buf, 0);
-				}
-			}
+		dwc2_flush_rx_fifo(dev);
+		ret = dwc2_ctrl_feed_dout(dev, 8);
+		if (ret) {
+			return ret;
 		}
+	} else {
+		dwc2_flush_tx_fifo(dev, 0);
 	}
 
-	sys_write32(USB_DWC2_GINTSTS_INCOMPISOIN, gintsts_reg);
+	sys_write32(dxepctl0, dxepctl0_reg);
+	dwc2_set_epint(dev, cfg, true);
+
+	return 0;
 }
 
-/* In DWC2 otg context incomplete isochronous OUT transfer means that the host
- * did not issue OUT token to at least one isochronous endpoint and software has
- * to find on which endpoint it didn't receive any data and let the stack know.
- */
-static void dwc2_handle_incompisoout(const struct device *dev)
+static int udc_dwc2_ep_activate(const struct device *dev,
+				struct udc_ep_config *const cfg)
 {
-	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = config->base;
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	mem_addr_t gintsts_reg = (mem_addr_t)&base->gintsts;
-	const uint32_t mask =
-		USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_EPTYPE_MASK |
-		USB_DWC2_DEPCTL_DPID | USB_DWC2_DEPCTL_USBACTEP;
-	const uint32_t val =
-		USB_DWC2_DEPCTL_EPENA |
-		usb_dwc2_set_depctl_eptype(USB_DWC2_DEPCTL_EPTYPE_ISO) |
-		((priv->sof_num & 1) ? USB_DWC2_DEPCTL_DPID : 0) |
-		USB_DWC2_DEPCTL_USBACTEP;
+	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
+	mem_addr_t dxepctl_reg;
+	uint32_t dxepctl;
 
-	for (uint8_t i = 1U; i < priv->numdeveps; i++) {
-		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
+	LOG_DBG("Enable ep 0x%02x", cfg->addr);
 
-		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT ||
-		    epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			mem_addr_t doepctl_reg = dwc2_get_dxepctl_reg(dev, i);
-			uint32_t doepctl;
+	if (ep_idx == 0U) {
+		return dwc2_ep_control_enable(dev, cfg);
+	}
 
-			doepctl = sys_read32(doepctl_reg);
+	if (USB_EP_DIR_IS_OUT(cfg->addr)) {
+		/* TODO: use dwc2_get_dxepctl_reg() */
+		dxepctl_reg = (mem_addr_t)&base->out_ep[ep_idx].doepctl;
+	} else {
+		if (priv->ineps > 0U && ep_idx > (priv->ineps - 1U)) {
+			LOG_ERR("No resources available for ep 0x%02x", cfg->addr);
+			return -EINVAL;
+		}
 
-			/* Check if endpoint didn't receive ISO OUT data */
-			if ((doepctl & mask) == val) {
-				struct udc_ep_config *cfg;
-				struct net_buf *buf;
+		dxepctl_reg = (mem_addr_t)&base->in_ep[ep_idx].diepctl;
+	}
 
-				cfg = udc_get_ep_cfg(dev, i);
-				__ASSERT_NO_MSG(cfg && cfg->stat.enabled &&
-						dwc2_ep_is_iso(cfg));
+	dxepctl = sys_read32(dxepctl_reg);
+	/* Set max packet size */
+	dxepctl &= ~USB_DWC2_DEPCTL_MPS_MASK;
+	dxepctl |= usb_dwc2_set_depctl_mps(udc_mps_ep_size(cfg));
 
-				udc_dwc2_ep_disable(dev, cfg, false);
+	/* Set endpoint type */
+	dxepctl &= ~USB_DWC2_DEPCTL_EPTYPE_MASK;
 
-				buf = udc_buf_get(dev, cfg->addr);
-				if (buf) {
-					udc_submit_ep_event(dev, buf, 0);
-				}
-			}
-		}
+	switch (cfg->attributes & USB_EP_TRANSFER_TYPE_MASK) {
+	case USB_EP_TYPE_BULK:
+		dxepctl |= USB_DWC2_DEPCTL_EPTYPE_BULK <<
+			   USB_DWC2_DEPCTL_EPTYPE_POS;
+		dxepctl |= USB_DWC2_DEPCTL_SETD0PID;
+		break;
+	case USB_EP_TYPE_INTERRUPT:
+		dxepctl |= USB_DWC2_DEPCTL_EPTYPE_INTERRUPT <<
+			   USB_DWC2_DEPCTL_EPTYPE_POS;
+		dxepctl |= USB_DWC2_DEPCTL_SETD0PID;
+		break;
+	case USB_EP_TYPE_ISO:
+		dxepctl |= USB_DWC2_DEPCTL_EPTYPE_ISO <<
+			   USB_DWC2_DEPCTL_EPTYPE_POS;
+		break;
+	default:
+		return -EINVAL;
 	}
 
-	sys_write32(USB_DWC2_GINTSTS_INCOMPISOOUT, gintsts_reg);
-}
+	if (USB_EP_DIR_IS_IN(cfg->addr) && udc_mps_ep_size(cfg) != 0U) {
+		int ret = dwc2_set_dedicated_fifo(dev, cfg, &dxepctl);
 
-static void dwc2_backup_registers(const struct device *dev)
-{
-	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = config->base;
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	struct dwc2_reg_backup *backup = &priv->backup;
+		if (ret) {
+			return ret;
+		}
+	}
 
-	backup->gotgctl = sys_read32((mem_addr_t)&base->gotgctl);
-	backup->gahbcfg = sys_read32((mem_addr_t)&base->gahbcfg);
-	backup->gusbcfg = sys_read32((mem_addr_t)&base->gusbcfg);
-	backup->gintmsk = sys_read32((mem_addr_t)&base->gintmsk);
-	backup->grxfsiz = sys_read32((mem_addr_t)&base->grxfsiz);
-	backup->gnptxfsiz = sys_read32((mem_addr_t)&base->gnptxfsiz);
-	backup->gi2cctl = sys_read32((mem_addr_t)&base->gi2cctl);
-	backup->glpmcfg = sys_read32((mem_addr_t)&base->glpmcfg);
-	backup->gdfifocfg = sys_read32((mem_addr_t)&base->gdfifocfg);
+	dxepctl |= USB_DWC2_DEPCTL_USBACTEP;
+
+	/* Enable endpoint interrupts */
+	dwc2_set_epint(dev, cfg, true);
+	sys_write32(dxepctl, dxepctl_reg);
 
 	for (uint8_t i = 1U; i < priv->ineps; i++) {
-		backup->dieptxf[i - 1] = sys_read32((mem_addr_t)&base->dieptxf[i - 1]);
+		LOG_DBG("DIEPTXF%u %08x DIEPCTL%u %08x",
+			i, sys_read32((mem_addr_t)&base->dieptxf[i - 1U]), i, dxepctl);
 	}
 
-	backup->dcfg = sys_read32((mem_addr_t)&base->dcfg);
-	backup->dctl = sys_read32((mem_addr_t)&base->dctl);
-	backup->diepmsk = sys_read32((mem_addr_t)&base->diepmsk);
-	backup->doepmsk = sys_read32((mem_addr_t)&base->doepmsk);
-	backup->daintmsk = sys_read32((mem_addr_t)&base->daintmsk);
-
-	for (uint8_t i = 0U; i < 16; i++) {
-		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
-
-		if (epdir == USB_DWC2_GHWCFG1_EPDIR_IN || epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			backup->diepctl[i] = sys_read32((mem_addr_t)&base->in_ep[i].diepctl);
-			if (backup->diepctl[i] & USB_DWC2_DEPCTL_DPID) {
-				backup->diepctl[i] |= USB_DWC2_DEPCTL_SETD1PID;
-			} else {
-				backup->diepctl[i] |= USB_DWC2_DEPCTL_SETD0PID;
-			}
-			backup->dieptsiz[i] = sys_read32((mem_addr_t)&base->in_ep[i].dieptsiz);
-			backup->diepdma[i] = sys_read32((mem_addr_t)&base->in_ep[i].diepdma);
-		}
-
-		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT || epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			backup->doepctl[i] = sys_read32((mem_addr_t)&base->out_ep[i].doepctl);
-			if (backup->doepctl[i] & USB_DWC2_DEPCTL_DPID) {
-				backup->doepctl[i] |= USB_DWC2_DEPCTL_SETD1PID;
-			} else {
-				backup->doepctl[i] |= USB_DWC2_DEPCTL_SETD0PID;
-			}
-			backup->doeptsiz[i] = sys_read32((mem_addr_t)&base->out_ep[i].doeptsiz);
-			backup->doepdma[i] = sys_read32((mem_addr_t)&base->out_ep[i].doepdma);
-		}
-	}
-
-	backup->pcgcctl = sys_read32((mem_addr_t)&base->pcgcctl);
+	return 0;
 }
 
-static void dwc2_restore_essential_registers(const struct device *dev)
+static int dwc2_unset_dedicated_fifo(const struct device *dev,
+				     struct udc_ep_config *const cfg,
+				     uint32_t *const diepctl)
 {
-	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = config->base;
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	struct dwc2_reg_backup *backup = &priv->backup;
-	uint32_t pcgcctl = backup->pcgcctl & USB_DWC2_PCGCCTL_RESTOREVALUE_MASK;
-
-	sys_write32(backup->glpmcfg, (mem_addr_t)&base->glpmcfg);
-	sys_write32(backup->gi2cctl, (mem_addr_t)&base->gi2cctl);
-	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
+	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
 
-	sys_write32(backup->gahbcfg | USB_DWC2_GAHBCFG_GLBINTRMASK,
-		    (mem_addr_t)&base->gahbcfg);
+	/* Clear FIFO number field */
+	*diepctl &= ~USB_DWC2_DEPCTL_TXFNUM_MASK;
 
-	sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
-	sys_write32(USB_DWC2_GINTSTS_RSTRDONEINT, (mem_addr_t)&base->gintmsk);
+	if (priv->dynfifosizing) {
+		if (priv->txf_set & ~BIT_MASK(ep_idx)) {
+			LOG_WRN("Some of the FIFOs higher than %u are set, %lx",
+				ep_idx, priv->txf_set & ~BIT_MASK(ep_idx));
+			return 0;
+		}
 
-	sys_write32(backup->gusbcfg, (mem_addr_t)&base->gusbcfg);
-	sys_write32(backup->dcfg, (mem_addr_t)&base->dcfg);
+		dwc2_set_txf(dev, ep_idx - 1, 0, 0);
+	}
 
-	pcgcctl |= USB_DWC2_PCGCCTL_RESTOREMODE | USB_DWC2_PCGCCTL_RSTPDWNMODULE;
-	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
-	k_busy_wait(1);
+	priv->txf_set &= ~BIT(ep_idx);
 
-	pcgcctl |= USB_DWC2_PCGCCTL_ESSREGRESTORED;
-	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
+	return 0;
 }
 
-static void dwc2_restore_device_registers(const struct device *dev)
+/* Disabled IN endpoint means that device will send NAK (isochronous: ZLP) after
+ * receiving IN token from host even if there is packet available in TxFIFO.
+ * Disabled OUT endpoint means that device will NAK (isochronous: discard data)
+ * incoming OUT data (or HS PING) even if there is space available in RxFIFO.
+ *
+ * Set stall parameter to true if caller wants to send STALL instead of NAK.
+ */
+static void udc_dwc2_ep_disable(const struct device *dev,
+				struct udc_ep_config *const cfg, bool stall)
 {
-	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = config->base;
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	struct dwc2_reg_backup *backup = &priv->backup;
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
+	mem_addr_t dxepctl_reg;
+	uint32_t dxepctl;
 
-	sys_write32(backup->gotgctl, (mem_addr_t)&base->gotgctl);
-	sys_write32(backup->gahbcfg, (mem_addr_t)&base->gahbcfg);
-	sys_write32(backup->gusbcfg, (mem_addr_t)&base->gusbcfg);
-	sys_write32(backup->gintmsk, (mem_addr_t)&base->gintmsk);
-	sys_write32(backup->grxfsiz, (mem_addr_t)&base->grxfsiz);
-	sys_write32(backup->gnptxfsiz, (mem_addr_t)&base->gnptxfsiz);
-	sys_write32(backup->gdfifocfg, (mem_addr_t)&base->gdfifocfg);
+	dxepctl_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
+	dxepctl = sys_read32(dxepctl_reg);
 
-	for (uint8_t i = 1U; i < priv->ineps; i++) {
-		sys_write32(backup->dieptxf[i - 1], (mem_addr_t)&base->dieptxf[i - 1]);
+	if (dxepctl & USB_DWC2_DEPCTL_NAKSTS) {
+		/* Endpoint already sends forced NAKs. STALL if necessary. */
+		if (stall) {
+			dxepctl |= USB_DWC2_DEPCTL_STALL;
+			sys_write32(dxepctl, dxepctl_reg);
+		}
+
+		return;
 	}
 
-	sys_write32(backup->dctl, (mem_addr_t)&base->dctl);
-	sys_write32(backup->diepmsk, (mem_addr_t)&base->diepmsk);
-	sys_write32(backup->doepmsk, (mem_addr_t)&base->doepmsk);
-	sys_write32(backup->daintmsk, (mem_addr_t)&base->daintmsk);
+	if (USB_EP_DIR_IS_OUT(cfg->addr)) {
+		mem_addr_t dctl_reg, gintsts_reg, doepint_reg;
+		uint32_t dctl;
 
-	for (uint8_t i = 0U; i < 16; i++) {
-		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
+		dctl_reg = (mem_addr_t)&base->dctl;
+		gintsts_reg = (mem_addr_t)&base->gintsts;
+		doepint_reg = (mem_addr_t)&base->out_ep[ep_idx].doepint;
 
-		if (epdir == USB_DWC2_GHWCFG1_EPDIR_IN || epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			sys_write32(backup->dieptsiz[i], (mem_addr_t)&base->in_ep[i].dieptsiz);
-			sys_write32(backup->diepdma[i], (mem_addr_t)&base->in_ep[i].diepdma);
-			sys_write32(backup->diepctl[i], (mem_addr_t)&base->in_ep[i].diepctl);
-		}
+		dctl = sys_read32(dctl_reg);
 
-		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT || epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			sys_write32(backup->doeptsiz[i], (mem_addr_t)&base->out_ep[i].doeptsiz);
-			sys_write32(backup->doepdma[i], (mem_addr_t)&base->out_ep[i].doepdma);
-			sys_write32(backup->doepctl[i], (mem_addr_t)&base->out_ep[i].doepctl);
+		if (sys_read32(gintsts_reg) & USB_DWC2_GINTSTS_GOUTNAKEFF) {
+			LOG_ERR("GOUTNAKEFF already active");
+		} else {
+			dctl |= USB_DWC2_DCTL_SGOUTNAK;
+			sys_write32(dctl, dctl_reg);
+			dctl &= ~USB_DWC2_DCTL_SGOUTNAK;
 		}
-	}
-}
 
-static void dwc2_enter_hibernation(const struct device *dev)
-{
-	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = config->base;
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	mem_addr_t gpwrdn_reg = (mem_addr_t)&base->gpwrdn;
-	mem_addr_t pcgcctl_reg = (mem_addr_t)&base->pcgcctl;
+		dwc2_wait_for_bit(dev, gintsts_reg, USB_DWC2_GINTSTS_GOUTNAKEFF);
 
-	dwc2_backup_registers(dev);
+		/* The application cannot disable control OUT endpoint 0. */
+		if (ep_idx != 0) {
+			dxepctl |= USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_EPDIS;
+		}
 
-	/* This code currently only supports UTMI+. UTMI+ runs at either 30 or
-	 * 60 MHz and therefore 1 us busy waits have sufficiently large margin.
-	 */
+		if (stall) {
+			/* For OUT endpoints STALL is set instead of SNAK */
+			dxepctl |= USB_DWC2_DEPCTL_STALL;
+		} else {
+			dxepctl |= USB_DWC2_DEPCTL_SNAK;
+		}
+		sys_write32(dxepctl, dxepctl_reg);
 
-	/* Enable PMU Logic */
-	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUACTV);
-	k_busy_wait(1);
+		if (ep_idx != 0) {
+			dwc2_wait_for_bit(dev, doepint_reg, USB_DWC2_DOEPINT_EPDISBLD);
+		}
 
-	/* Stop PHY clock */
-	sys_set_bits(pcgcctl_reg, USB_DWC2_PCGCCTL_STOPPCLK);
-	k_busy_wait(1);
+		/* Clear Endpoint Disabled interrupt */
+		sys_write32(USB_DWC2_DIEPINT_EPDISBLD, doepint_reg);
 
-	/* Enable PMU interrupt */
-	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUINTSEL);
-	k_busy_wait(1);
+		dctl |= USB_DWC2_DCTL_CGOUTNAK;
+		sys_write32(dctl, dctl_reg);
+	} else {
+		mem_addr_t diepint_reg;
 
-	/* Unmask PMU interrupt bits */
-	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_LINESTAGECHANGEMSK |
-				 USB_DWC2_GPWRDN_RESETDETMSK |
-				 USB_DWC2_GPWRDN_DISCONNECTDETECTMSK |
-				 USB_DWC2_GPWRDN_STSCHNGINTMSK);
-	k_busy_wait(1);
+		diepint_reg = (mem_addr_t)&base->in_ep[ep_idx].diepint;
 
-	/* Enable power clamps */
-	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNCLMP);
-	k_busy_wait(1);
+		dxepctl |= USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_SNAK;
+		if (stall) {
+			/* For IN endpoints STALL is set in addition to SNAK */
+			dxepctl |= USB_DWC2_DEPCTL_STALL;
+		}
+		sys_write32(dxepctl, dxepctl_reg);
 
-	/* Switch off power to the controller */
-	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNSWTCH);
+		dwc2_wait_for_bit(dev, diepint_reg, USB_DWC2_DIEPINT_INEPNAKEFF);
 
-	/* Mark that the core is hibernated */
-	priv->hibernated = 1;
-	LOG_DBG("Hibernated");
-}
+		dxepctl |= USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_EPDIS;
+		sys_write32(dxepctl, dxepctl_reg);
 
-static void dwc2_exit_hibernation(const struct device *dev)
-{
-	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = config->base;
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	mem_addr_t gpwrdn_reg = (mem_addr_t)&base->gpwrdn;
-	mem_addr_t pcgcctl_reg = (mem_addr_t)&base->pcgcctl;
+		dwc2_wait_for_bit(dev, diepint_reg, USB_DWC2_DIEPINT_EPDISBLD);
 
-	/* Switch on power to the controller */
-	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNSWTCH);
-	k_busy_wait(1);
+		/* Clear Endpoint Disabled interrupt */
+		sys_write32(USB_DWC2_DIEPINT_EPDISBLD, diepint_reg);
 
-	/* Reset the controller */
-	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNRST_N);
-	k_busy_wait(1);
+		/* TODO: Read DIEPTSIZn here? Programming Guide suggest it to
+		 * let application know how many bytes of interrupted transfer
+		 * were transferred to the host.
+		 */
 
-	/* Enable restore from PMU */
-	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_RESTORE);
-	k_busy_wait(1);
+		dwc2_flush_tx_fifo(dev, usb_dwc2_get_depctl_txfnum(dxepctl));
+	}
 
-	/* Disable power clamps */
-	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNCLMP);
+	udc_ep_set_busy(dev, cfg->addr, false);
+}
 
-	/* Remove reset to the controller */
-	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNRST_N);
-	k_busy_wait(1);
+/* Deactivated endpoint means that there will be a bus timeout when the host
+ * tries to access the endpoint.
+ */
+static int udc_dwc2_ep_deactivate(const struct device *dev,
+				  struct udc_ep_config *const cfg)
+{
+	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
+	mem_addr_t dxepctl_reg;
+	uint32_t dxepctl;
 
-	/* Disable PMU interrupt */
-	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUINTSEL);
+	dxepctl_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
+	dxepctl = sys_read32(dxepctl_reg);
 
-	dwc2_restore_essential_registers(dev);
+	if (dxepctl & USB_DWC2_DEPCTL_USBACTEP) {
+		LOG_DBG("Disable ep 0x%02x DxEPCTL%u %x",
+			cfg->addr, ep_idx, dxepctl);
 
-	/* Wait for Restore Done Interrupt */
-	dwc2_wait_for_bit(dev, (mem_addr_t)&base->gintsts, USB_DWC2_GINTSTS_RSTRDONEINT);
-	sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
+		udc_dwc2_ep_disable(dev, cfg, false);
 
-	/* Disable restore from PMU */
-	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_RESTORE);
-	k_busy_wait(1);
-
-	/* Clear reset to power down module */
-	sys_clear_bits(pcgcctl_reg, USB_DWC2_PCGCCTL_RSTPDWNMODULE);
+		dxepctl = sys_read32(dxepctl_reg);
+		dxepctl &= ~USB_DWC2_DEPCTL_USBACTEP;
+	} else {
+		LOG_WRN("ep 0x%02x is not active DxEPCTL%u %x",
+			cfg->addr, ep_idx, dxepctl);
+	}
 
-	/* Restore GUSBCFG, DCFG and DCTL */
-	sys_write32(priv->backup.gusbcfg, (mem_addr_t)&base->gusbcfg);
-	sys_write32(priv->backup.dcfg, (mem_addr_t)&base->dcfg);
-	sys_write32(priv->backup.dctl, (mem_addr_t)&base->dctl);
+	if (USB_EP_DIR_IS_IN(cfg->addr) && udc_mps_ep_size(cfg) != 0U &&
+	    ep_idx != 0U) {
+		dwc2_unset_dedicated_fifo(dev, cfg, &dxepctl);
+	}
 
-	/* Disable PMU */
-	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUACTV);
-	k_busy_wait(5);
+	sys_write32(dxepctl, dxepctl_reg);
+	dwc2_set_epint(dev, cfg, false);
 
-	sys_set_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_PWRONPRGDONE);
-	k_msleep(1);
-	sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
+	if (cfg->addr == USB_CONTROL_EP_OUT) {
+		struct net_buf *buf = udc_buf_get_all(dev, cfg->addr);
 
-	dwc2_restore_device_registers(dev);
+		/* Release the buffer allocated in dwc2_ctrl_feed_dout() */
+		if (buf) {
+			net_buf_unref(buf);
+		}
+	}
 
-	priv->hibernated = 0;
-	LOG_DBG("Hibernation exit complete");
+	return 0;
 }
 
-static void udc_dwc2_isr_handler(const struct device *dev)
+static int udc_dwc2_ep_set_halt(const struct device *dev,
+				struct udc_ep_config *const cfg)
 {
-	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = config->base;
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	mem_addr_t gintsts_reg = (mem_addr_t)&base->gintsts;
-	uint32_t int_status;
-	uint32_t gintmsk;
+	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
 
-	if (priv->hibernated) {
-		uint32_t gpwrdn = sys_read32((mem_addr_t)&base->gpwrdn);
-		bool reset, resume = false;
-		enum dwc2_hibernation_exit_reason exit_reason;
+	udc_dwc2_ep_disable(dev, cfg, true);
 
-		/* Clear interrupts */
-		sys_write32(gpwrdn, (mem_addr_t)&base->gpwrdn);
+	LOG_DBG("Set halt ep 0x%02x", cfg->addr);
+	if (ep_idx != 0) {
+		cfg->stat.halted = true;
+	}
 
-		if (gpwrdn & USB_DWC2_GPWRDN_LNSTSCHNG) {
-			resume = usb_dwc2_get_gpwrdn_linestate(gpwrdn) ==
-				 USB_DWC2_GPWRDN_LINESTATE_DM1DP0;
-			exit_reason = DWC2_HIBERNATION_EXIT_HOST_WAKEUP;
-		}
+	return 0;
+}
 
-		reset = gpwrdn & USB_DWC2_GPWRDN_RESETDETECTED;
-		if (reset) {
-			exit_reason = DWC2_HIBERNATION_EXIT_BUS_RESET;
-		}
+static int udc_dwc2_ep_clear_halt(const struct device *dev,
+				  struct udc_ep_config *const cfg)
+{
+	mem_addr_t dxepctl_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
+	uint32_t dxepctl;
+	struct dwc2_drv_event evt = {
+		.ep = cfg->addr,
+		.type = DWC2_DRV_EVT_XFER,
+	};
 
-		if (reset || resume) {
-			struct dwc2_drv_event evt = {
-				.dev = dev,
-				.type = DWC2_DRV_EVT_HIBERNATION_EXIT,
-				.exit_reason = exit_reason,
-			};
+	dxepctl = sys_read32(dxepctl_reg);
+	dxepctl &= ~USB_DWC2_DEPCTL_STALL;
+	dxepctl |= USB_DWC2_DEPCTL_SETD0PID;
+	sys_write32(dxepctl, dxepctl_reg);
 
-			k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
-		}
+	LOG_DBG("Clear halt ep 0x%02x", cfg->addr);
+	cfg->stat.halted = false;
 
-		(void)dwc2_quirk_irq_clear(dev);
-		return;
+	/* Resume queued transfers if any */
+	if (udc_buf_peek(dev, cfg->addr)) {
+		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
 	}
 
-	gintmsk = sys_read32((mem_addr_t)&base->gintmsk);
+	return 0;
+}
 
-	/*  Read and handle interrupt status register */
-	while ((int_status = sys_read32(gintsts_reg) & gintmsk)) {
+static int udc_dwc2_ep_enqueue(const struct device *dev,
+			       struct udc_ep_config *const cfg,
+			       struct net_buf *const buf)
+{
+	struct dwc2_drv_event evt = {
+		.ep = cfg->addr,
+		.type = DWC2_DRV_EVT_XFER,
+	};
 
-		LOG_DBG("GINTSTS 0x%x", int_status);
+	LOG_DBG("%p enqueue %x %p", dev, cfg->addr, buf);
+	udc_buf_put(cfg, buf);
 
-		if (int_status & USB_DWC2_GINTSTS_SOF) {
-			uint32_t dsts;
+	if (!cfg->stat.halted) {
+		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+	}
 
-			/* Clear USB SOF interrupt. */
-			sys_write32(USB_DWC2_GINTSTS_SOF, gintsts_reg);
+	return 0;
+}
 
-			dsts = sys_read32((mem_addr_t)&base->dsts);
-			priv->sof_num = usb_dwc2_get_dsts_soffn(dsts);
-			udc_submit_event(dev, UDC_EVT_SOF, 0);
-		}
+static int udc_dwc2_ep_dequeue(const struct device *dev,
+			       struct udc_ep_config *const cfg)
+{
+	struct net_buf *buf;
 
-		if (int_status & USB_DWC2_GINTSTS_USBRST) {
-			/* Clear and handle USB Reset interrupt. */
-			sys_write32(USB_DWC2_GINTSTS_USBRST, gintsts_reg);
-			dwc2_on_bus_reset(dev);
-			LOG_DBG("USB Reset interrupt");
-		}
+	udc_dwc2_ep_disable(dev, cfg, false);
 
-		if (int_status & USB_DWC2_GINTSTS_ENUMDONE) {
-			/* Clear and handle Enumeration Done interrupt. */
-			sys_write32(USB_DWC2_GINTSTS_ENUMDONE, gintsts_reg);
-			dwc2_handle_enumdone(dev);
-			udc_submit_event(dev, UDC_EVT_RESET, 0);
-		}
+	buf = udc_buf_get_all(dev, cfg->addr);
+	if (buf) {
+		udc_submit_ep_event(dev, buf, -ECONNABORTED);
+	}
 
-		if (int_status & USB_DWC2_GINTSTS_WKUPINT) {
-			/* Clear Resume/Remote Wakeup Detected interrupt. */
-			sys_write32(USB_DWC2_GINTSTS_WKUPINT, gintsts_reg);
-			udc_set_suspended(dev, false);
-			udc_submit_event(dev, UDC_EVT_RESUME, 0);
-		}
+	udc_ep_set_busy(dev, cfg->addr, false);
 
-		if (int_status & USB_DWC2_GINTSTS_IEPINT) {
-			/* Handle IN Endpoints interrupt */
-			dwc2_handle_iepint(dev);
-		}
+	LOG_DBG("dequeue ep 0x%02x", cfg->addr);
 
-		if (int_status & USB_DWC2_GINTSTS_RXFLVL) {
-			/* Handle RxFIFO Non-Empty interrupt */
-			dwc2_handle_rxflvl(dev);
-		}
+	return 0;
+}
 
-		if (int_status & USB_DWC2_GINTSTS_OEPINT) {
-			/* Handle OUT Endpoints interrupt */
-			dwc2_handle_oepint(dev);
-		}
+static int udc_dwc2_set_address(const struct device *dev, const uint8_t addr)
+{
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	mem_addr_t dcfg_reg = (mem_addr_t)&base->dcfg;
+	uint32_t dcfg;
 
-		if (int_status & USB_DWC2_GINTSTS_INCOMPISOIN) {
-			dwc2_handle_incompisoin(dev);
-		}
+	if (addr > (USB_DWC2_DCFG_DEVADDR_MASK >> USB_DWC2_DCFG_DEVADDR_POS)) {
+		return -EINVAL;
+	}
 
-		if (int_status & USB_DWC2_GINTSTS_INCOMPISOOUT) {
-			dwc2_handle_incompisoout(dev);
-		}
+	dcfg = sys_read32(dcfg_reg);
+	dcfg &= ~USB_DWC2_DCFG_DEVADDR_MASK;
+	dcfg |= usb_dwc2_set_dcfg_devaddr(addr);
+	sys_write32(dcfg, dcfg_reg);
+	LOG_DBG("Set new address %u for %p", addr, dev);
 
-		if (int_status & USB_DWC2_GINTSTS_USBSUSP) {
-			if (!priv->enumdone) {
-				/* Clear stale suspend interrupt */
-				sys_write32(USB_DWC2_GINTSTS_USBSUSP, gintsts_reg);
-				continue;
-			}
+	return 0;
+}
 
-			/* Notify the stack */
-			udc_set_suspended(dev, true);
-			udc_submit_event(dev, UDC_EVT_SUSPEND, 0);
+static int udc_dwc2_test_mode(const struct device *dev,
+			      const uint8_t mode, const bool dryrun)
+{
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	mem_addr_t dctl_reg = (mem_addr_t)&base->dctl;
+	uint32_t dctl;
 
-			if (priv->suspend_type == DWC2_SUSPEND_HIBERNATION) {
-				dwc2_enter_hibernation(dev);
-				/* Next interrupt will be from PMU */
-				break;
-			}
+	if (mode == 0U || mode > USB_DWC2_DCTL_TSTCTL_TESTFE) {
+		return -EINVAL;
+	}
 
-			/* Clear USB Suspend interrupt. */
-			sys_write32(USB_DWC2_GINTSTS_USBSUSP, gintsts_reg);
-		}
+	dctl = sys_read32(dctl_reg);
+	if (usb_dwc2_get_dctl_tstctl(dctl) != USB_DWC2_DCTL_TSTCTL_DISABLED) {
+		return -EALREADY;
 	}
 
-	(void)dwc2_quirk_irq_clear(dev);
-}
+	if (dryrun) {
+		LOG_DBG("Test Mode %u supported", mode);
+		return 0;
+	}
 
-static void dwc2_unset_unused_fifo(const struct device *dev)
-{
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	struct udc_ep_config *tmp;
+	dctl |= usb_dwc2_set_dctl_tstctl(mode);
+	sys_write32(dctl, dctl_reg);
+	LOG_DBG("Enable Test Mode %u", mode);
 
-	for (uint8_t i = priv->ineps - 1U; i > 0; i--) {
-		tmp = udc_get_ep_cfg(dev, i | USB_EP_DIR_IN);
+	return 0;
+}
 
-		if (tmp->stat.enabled && (priv->txf_set & BIT(i))) {
-			return;
-		}
+static int udc_dwc2_host_wakeup(const struct device *dev)
+{
+	LOG_DBG("Remote wakeup from %p", dev);
 
-		if (!tmp->stat.enabled && (priv->txf_set & BIT(i))) {
-			priv->txf_set &= ~BIT(i);
-		}
-	}
+	return -ENOTSUP;
 }
 
-/*
- * In dedicated FIFO mode there are i (i = 1 ... ineps - 1) FIFO size registers,
- * e.g. DIEPTXF1, DIEPTXF2, ... DIEPTXF4. When dynfifosizing is enabled,
- * the size register is mutable. The offset of DIEPTXF1 registers is 0.
- */
-static int dwc2_set_dedicated_fifo(const struct device *dev,
-				   struct udc_ep_config *const cfg,
-				   uint32_t *const diepctl)
+/* Return actual USB device speed */
+static enum udc_bus_speed udc_dwc2_device_speed(const struct device *dev)
 {
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
-	const uint32_t addnl = USB_MPS_ADDITIONAL_TRANSACTIONS(cfg->mps);
-	uint32_t reqdep;
-	uint32_t txfaddr;
-	uint32_t txfdep;
-	uint32_t tmp;
-
-	/* Keep everything but FIFO number */
-	tmp = *diepctl & ~USB_DWC2_DEPCTL_TXFNUM_MASK;
 
-	reqdep = DIV_ROUND_UP(udc_mps_ep_size(cfg), 4U);
-	if (priv->bufferdma) {
-		/* In DMA mode, TxFIFO capable of holding 2 packets is enough */
-		reqdep *= MIN(2, (1 + addnl));
-	} else {
-		reqdep *= (1 + addnl);
+	switch (priv->enumspd) {
+	case USB_DWC2_DSTS_ENUMSPD_HS3060:
+		return UDC_BUS_SPEED_HS;
+	case USB_DWC2_DSTS_ENUMSPD_LS6:
+		__ASSERT(false, "Low speed mode not supported");
+		__fallthrough;
+	case USB_DWC2_DSTS_ENUMSPD_FS48:
+		__fallthrough;
+	case USB_DWC2_DSTS_ENUMSPD_FS3060:
+		__fallthrough;
+	default:
+		return UDC_BUS_SPEED_FS;
 	}
+}
 
-	if (priv->dynfifosizing) {
-		if (priv->txf_set & ~BIT_MASK(ep_idx)) {
-			dwc2_unset_unused_fifo(dev);
-		}
-
-		if (priv->txf_set & ~BIT_MASK(ep_idx)) {
-			LOG_WRN("Some of the FIFOs higher than %u are set, %lx",
-				ep_idx, priv->txf_set & ~BIT_MASK(ep_idx));
-			return -EIO;
-		}
-
-		if ((ep_idx - 1) != 0U) {
-			txfaddr = dwc2_get_txfdep(dev, ep_idx - 2) +
-				  dwc2_get_txfaddr(dev, ep_idx - 2);
-		} else {
-			txfaddr = priv->rxfifo_depth +
-				MAX(UDC_DWC2_FIFO0_DEPTH, priv->max_txfifo_depth[0]);
-		}
+static int dwc2_core_soft_reset(const struct device *dev)
+{
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	mem_addr_t grstctl_reg = (mem_addr_t)&base->grstctl;
+	const unsigned int csr_timeout_us = 10000UL;
+	uint32_t cnt = 0UL;
 
-		/* Make sure to not set TxFIFO greater than hardware allows */
-		txfdep = reqdep;
-		if (txfdep > priv->max_txfifo_depth[ep_idx]) {
-			return -ENOMEM;
-		}
+	/* Check AHB master idle state */
+	while (!(sys_read32(grstctl_reg) & USB_DWC2_GRSTCTL_AHBIDLE)) {
+		k_busy_wait(1);
 
-		/* Do not allocate TxFIFO outside the SPRAM */
-		if (txfaddr + txfdep > priv->dfifodepth) {
-			return -ENOMEM;
+		if (++cnt > csr_timeout_us) {
+			LOG_ERR("Wait for AHB idle timeout, GRSTCTL 0x%08x",
+				sys_read32(grstctl_reg));
+			return -EIO;
 		}
+	}
 
-		/* Set FIFO depth (32-bit words) and address */
-		dwc2_set_txf(dev, ep_idx - 1, txfdep, txfaddr);
-	} else {
-		txfdep = dwc2_get_txfdep(dev, ep_idx - 1);
-		txfaddr = dwc2_get_txfaddr(dev, ep_idx - 1);
+	/* Apply Core Soft Reset */
+	sys_write32(USB_DWC2_GRSTCTL_CSFTRST, grstctl_reg);
 
-		if (reqdep > txfdep) {
-			return -ENOMEM;
+	cnt = 0UL;
+	do {
+		if (++cnt > csr_timeout_us) {
+			LOG_ERR("Wait for CSR done timeout, GRSTCTL 0x%08x",
+				sys_read32(grstctl_reg));
+			return -EIO;
 		}
 
-		LOG_DBG("Reuse FIFO%u addr 0x%08x depth %u", ep_idx, txfaddr, txfdep);
-	}
-
-	/* Assign FIFO to the IN endpoint */
-	*diepctl = tmp | usb_dwc2_set_depctl_txfnum(ep_idx);
-	priv->txf_set |= BIT(ep_idx);
-	dwc2_flush_tx_fifo(dev, ep_idx);
+		k_busy_wait(1);
+	} while (sys_read32(grstctl_reg) & USB_DWC2_GRSTCTL_CSFTRST &&
+		 !(sys_read32(grstctl_reg) & USB_DWC2_GRSTCTL_CSFTRSTDONE));
 
-	LOG_INF("Set FIFO%u (ep 0x%02x) addr 0x%04x depth %u size %u",
-		ep_idx, cfg->addr, txfaddr, txfdep, dwc2_ftx_avail(dev, ep_idx));
+	sys_clear_bits(grstctl_reg, USB_DWC2_GRSTCTL_CSFTRST | USB_DWC2_GRSTCTL_CSFTRSTDONE);
 
 	return 0;
 }
 
-static int dwc2_ep_control_enable(const struct device *dev,
-				  struct udc_ep_config *const cfg)
+static int udc_dwc2_init_controller(const struct device *dev)
 {
-	mem_addr_t dxepctl0_reg;
-	uint32_t dxepctl0;
+	const struct udc_dwc2_config *const config = dev->config;
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	struct usb_dwc2_reg *const base = config->base;
+	mem_addr_t grxfsiz_reg = (mem_addr_t)&base->grxfsiz;
+	mem_addr_t gahbcfg_reg = (mem_addr_t)&base->gahbcfg;
+	mem_addr_t gusbcfg_reg = (mem_addr_t)&base->gusbcfg;
+	mem_addr_t dcfg_reg = (mem_addr_t)&base->dcfg;
+	uint32_t dcfg;
+	uint32_t gusbcfg;
+	uint32_t gahbcfg;
+	uint32_t ghwcfg2;
+	uint32_t ghwcfg3;
+	uint32_t ghwcfg4;
+	uint32_t val;
+	int ret;
+	bool hs_phy;
 
-	dxepctl0_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
-	dxepctl0 = sys_read32(dxepctl0_reg);
+	ret = dwc2_core_soft_reset(dev);
+	if (ret) {
+		return ret;
+	}
 
-	dxepctl0 &= ~USB_DWC2_DEPCTL0_MPS_MASK;
-	switch (cfg->mps) {
-	case 8:
-		dxepctl0 |= USB_DWC2_DEPCTL0_MPS_8 << USB_DWC2_DEPCTL_MPS_POS;
-		break;
-	case 16:
-		dxepctl0 |= USB_DWC2_DEPCTL0_MPS_16 << USB_DWC2_DEPCTL_MPS_POS;
-		break;
-	case 32:
-		dxepctl0 |= USB_DWC2_DEPCTL0_MPS_32 << USB_DWC2_DEPCTL_MPS_POS;
-		break;
-	case 64:
-		dxepctl0 |= USB_DWC2_DEPCTL0_MPS_64 << USB_DWC2_DEPCTL_MPS_POS;
-		break;
-	default:
-		return -EINVAL;
+	priv->ghwcfg1 = sys_read32((mem_addr_t)&base->ghwcfg1);
+	ghwcfg2 = sys_read32((mem_addr_t)&base->ghwcfg2);
+	ghwcfg3 = sys_read32((mem_addr_t)&base->ghwcfg3);
+	ghwcfg4 = sys_read32((mem_addr_t)&base->ghwcfg4);
+
+	if (!(ghwcfg4 & USB_DWC2_GHWCFG4_DEDFIFOMODE)) {
+		LOG_ERR("Only dedicated TX FIFO mode is supported");
+		return -ENOTSUP;
 	}
 
-	dxepctl0 |= USB_DWC2_DEPCTL_USBACTEP;
+	/*
+	 * Force device mode as we do no support role changes.
+	 * Wait 25ms for the change to take effect.
+	 */
+	gusbcfg = USB_DWC2_GUSBCFG_FORCEDEVMODE;
+	sys_write32(gusbcfg, gusbcfg_reg);
+	k_msleep(25);
 
-	if (cfg->addr == USB_CONTROL_EP_OUT) {
-		int ret;
+	/* Buffer DMA is always supported in Internal DMA mode.
+	 * TODO: check and support descriptor DMA if available
+	 */
+	priv->bufferdma = (usb_dwc2_get_ghwcfg2_otgarch(ghwcfg2) ==
+			   USB_DWC2_GHWCFG2_OTGARCH_INTERNALDMA);
 
-		dwc2_flush_rx_fifo(dev);
-		ret = dwc2_ctrl_feed_dout(dev, 8);
-		if (ret) {
-			return ret;
-		}
+	if (!IS_ENABLED(CONFIG_UDC_DWC2_DMA)) {
+		priv->bufferdma = 0;
+	} else if (priv->bufferdma) {
+		LOG_WRN("Experimental DMA enabled");
+	}
+
+	if (ghwcfg2 & USB_DWC2_GHWCFG2_DYNFIFOSIZING) {
+		LOG_DBG("Dynamic FIFO Sizing is enabled");
+		priv->dynfifosizing = true;
+	}
+
+	if (IS_ENABLED(CONFIG_UDC_DWC2_HIBERNATION) &&
+	    ghwcfg4 & USB_DWC2_GHWCFG4_HIBERNATION) {
+		LOG_INF("Hibernation enabled");
+		priv->suspend_type = DWC2_SUSPEND_HIBERNATION;
 	} else {
-		dwc2_flush_tx_fifo(dev, 0);
+		priv->suspend_type = DWC2_SUSPEND_NO_POWER_SAVING;
 	}
 
-	sys_write32(dxepctl0, dxepctl0_reg);
-	dwc2_set_epint(dev, cfg, true);
+	/* Get the number or endpoints and IN endpoints we can use later */
+	priv->numdeveps = usb_dwc2_get_ghwcfg2_numdeveps(ghwcfg2) + 1U;
+	priv->ineps = usb_dwc2_get_ghwcfg4_ineps(ghwcfg4) + 1U;
+	LOG_DBG("Number of endpoints (NUMDEVEPS + 1) %u", priv->numdeveps);
+	LOG_DBG("Number of IN endpoints (INEPS + 1) %u", priv->ineps);
 
-	return 0;
-}
+	LOG_DBG("Number of periodic IN endpoints (NUMDEVPERIOEPS) %u",
+		usb_dwc2_get_ghwcfg4_numdevperioeps(ghwcfg4));
+	LOG_DBG("Number of additional control endpoints (NUMCTLEPS) %u",
+		usb_dwc2_get_ghwcfg4_numctleps(ghwcfg4));
 
-static int udc_dwc2_ep_activate(const struct device *dev,
-				struct udc_ep_config *const cfg)
-{
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
-	mem_addr_t dxepctl_reg;
-	uint32_t dxepctl;
+	LOG_DBG("OTG architecture (OTGARCH) %u, mode (OTGMODE) %u",
+		usb_dwc2_get_ghwcfg2_otgarch(ghwcfg2),
+		usb_dwc2_get_ghwcfg2_otgmode(ghwcfg2));
 
-	LOG_DBG("Enable ep 0x%02x", cfg->addr);
+	priv->dfifodepth = usb_dwc2_get_ghwcfg3_dfifodepth(ghwcfg3);
+	LOG_DBG("DFIFO depth (DFIFODEPTH) %u bytes", priv->dfifodepth * 4);
 
-	if (ep_idx == 0U) {
-		return dwc2_ep_control_enable(dev, cfg);
-	}
+	priv->max_pktcnt = GHWCFG3_PKTCOUNT(usb_dwc2_get_ghwcfg3_pktsizewidth(ghwcfg3));
+	priv->max_xfersize = GHWCFG3_XFERSIZE(usb_dwc2_get_ghwcfg3_xfersizewidth(ghwcfg3));
+	LOG_DBG("Max packet count %u, Max transfer size %u",
+		priv->max_pktcnt, priv->max_xfersize);
 
-	if (USB_EP_DIR_IS_OUT(cfg->addr)) {
-		/* TODO: use dwc2_get_dxepctl_reg() */
-		dxepctl_reg = (mem_addr_t)&base->out_ep[ep_idx].doepctl;
-	} else {
-		if (priv->ineps > 0U && ep_idx > (priv->ineps - 1U)) {
-			LOG_ERR("No resources available for ep 0x%02x", cfg->addr);
-			return -EINVAL;
-		}
+	LOG_DBG("Vendor Control interface support enabled: %s",
+		(ghwcfg3 & USB_DWC2_GHWCFG3_VNDCTLSUPT) ? "true" : "false");
 
-		dxepctl_reg = (mem_addr_t)&base->in_ep[ep_idx].diepctl;
+	LOG_DBG("PHY interface type: FSPHYTYPE %u, HSPHYTYPE %u, DATAWIDTH %u",
+		usb_dwc2_get_ghwcfg2_fsphytype(ghwcfg2),
+		usb_dwc2_get_ghwcfg2_hsphytype(ghwcfg2),
+		usb_dwc2_get_ghwcfg4_phydatawidth(ghwcfg4));
+
+	LOG_DBG("LPM mode is %s",
+		(ghwcfg3 & USB_DWC2_GHWCFG3_LPMMODE) ? "enabled" : "disabled");
+
+	/* Configure AHB, select Completer or DMA mode */
+	gahbcfg = sys_read32(gahbcfg_reg);
+
+	if (priv->bufferdma) {
+		gahbcfg |= USB_DWC2_GAHBCFG_DMAEN;
+	} else {
+		gahbcfg &= ~USB_DWC2_GAHBCFG_DMAEN;
 	}
 
-	dxepctl = sys_read32(dxepctl_reg);
-	/* Set max packet size */
-	dxepctl &= ~USB_DWC2_DEPCTL_MPS_MASK;
-	dxepctl |= usb_dwc2_set_depctl_mps(udc_mps_ep_size(cfg));
+	sys_write32(gahbcfg, gahbcfg_reg);
 
-	/* Set endpoint type */
-	dxepctl &= ~USB_DWC2_DEPCTL_EPTYPE_MASK;
+	dcfg = sys_read32(dcfg_reg);
 
-	switch (cfg->attributes & USB_EP_TRANSFER_TYPE_MASK) {
-	case USB_EP_TYPE_BULK:
-		dxepctl |= USB_DWC2_DEPCTL_EPTYPE_BULK <<
-			   USB_DWC2_DEPCTL_EPTYPE_POS;
-		dxepctl |= USB_DWC2_DEPCTL_SETD0PID;
-		break;
-	case USB_EP_TYPE_INTERRUPT:
-		dxepctl |= USB_DWC2_DEPCTL_EPTYPE_INTERRUPT <<
-			   USB_DWC2_DEPCTL_EPTYPE_POS;
-		dxepctl |= USB_DWC2_DEPCTL_SETD0PID;
+	dcfg &= ~USB_DWC2_DCFG_DESCDMA;
+
+	/* Configure PHY and device speed */
+	dcfg &= ~USB_DWC2_DCFG_DEVSPD_MASK;
+	switch (usb_dwc2_get_ghwcfg2_hsphytype(ghwcfg2)) {
+	case USB_DWC2_GHWCFG2_HSPHYTYPE_UTMIPLUSULPI:
+		__fallthrough;
+	case USB_DWC2_GHWCFG2_HSPHYTYPE_ULPI:
+		gusbcfg |= USB_DWC2_GUSBCFG_PHYSEL_USB20 |
+			   USB_DWC2_GUSBCFG_ULPI_UTMI_SEL_ULPI;
+		dcfg |= USB_DWC2_DCFG_DEVSPD_USBHS20
+			<< USB_DWC2_DCFG_DEVSPD_POS;
+		hs_phy = true;
 		break;
-	case USB_EP_TYPE_ISO:
-		dxepctl |= USB_DWC2_DEPCTL_EPTYPE_ISO <<
-			   USB_DWC2_DEPCTL_EPTYPE_POS;
+	case USB_DWC2_GHWCFG2_HSPHYTYPE_UTMIPLUS:
+		gusbcfg |= USB_DWC2_GUSBCFG_PHYSEL_USB20 |
+			   USB_DWC2_GUSBCFG_ULPI_UTMI_SEL_UTMI;
+		dcfg |= USB_DWC2_DCFG_DEVSPD_USBHS20
+			<< USB_DWC2_DCFG_DEVSPD_POS;
+		hs_phy = true;
 		break;
+	case USB_DWC2_GHWCFG2_HSPHYTYPE_NO_HS:
+		__fallthrough;
 	default:
-		return -EINVAL;
-	}
+		if (usb_dwc2_get_ghwcfg2_fsphytype(ghwcfg2) !=
+		    USB_DWC2_GHWCFG2_FSPHYTYPE_NO_FS) {
+			gusbcfg |= USB_DWC2_GUSBCFG_PHYSEL_USB11;
+		}
 
-	if (USB_EP_DIR_IS_IN(cfg->addr) && udc_mps_ep_size(cfg) != 0U) {
-		int ret = dwc2_set_dedicated_fifo(dev, cfg, &dxepctl);
+		dcfg |= USB_DWC2_DCFG_DEVSPD_USBFS1148
+			<< USB_DWC2_DCFG_DEVSPD_POS;
+		hs_phy = false;
+	}
 
-		if (ret) {
-			return ret;
-		}
+	if (usb_dwc2_get_ghwcfg4_phydatawidth(ghwcfg4)) {
+		gusbcfg |= USB_DWC2_GUSBCFG_PHYIF_16_BIT;
 	}
 
-	dxepctl |= USB_DWC2_DEPCTL_USBACTEP;
+	/* Update PHY configuration */
+	sys_write32(gusbcfg, gusbcfg_reg);
+	sys_write32(dcfg, dcfg_reg);
 
-	/* Enable endpoint interrupts */
-	dwc2_set_epint(dev, cfg, true);
-	sys_write32(dxepctl, dxepctl_reg);
+	priv->outeps = 0U;
+	for (uint8_t i = 0U; i < priv->numdeveps; i++) {
+		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
 
-	for (uint8_t i = 1U; i < priv->ineps; i++) {
-		LOG_DBG("DIEPTXF%u %08x DIEPCTL%u %08x",
-			i, sys_read32((mem_addr_t)&base->dieptxf[i - 1U]), i, dxepctl);
+		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT ||
+		    epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			mem_addr_t doepctl_reg = dwc2_get_dxepctl_reg(dev, i);
+
+			sys_write32(USB_DWC2_DEPCTL_SNAK, doepctl_reg);
+			priv->outeps++;
+		}
 	}
 
-	return 0;
-}
+	LOG_DBG("Number of OUT endpoints %u", priv->outeps);
 
-static int dwc2_unset_dedicated_fifo(const struct device *dev,
-				     struct udc_ep_config *const cfg,
-				     uint32_t *const diepctl)
-{
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
+	/* Read and store all TxFIFO depths because Programmed FIFO Depths must
+	 * not exceed the power-on values.
+	 */
+	val = sys_read32((mem_addr_t)&base->gnptxfsiz);
+	priv->max_txfifo_depth[0] = usb_dwc2_get_gnptxfsiz_nptxfdep(val);
+	for (uint8_t i = 1; i < priv->ineps; i++) {
+		priv->max_txfifo_depth[i] = dwc2_get_txfdep(dev, i - 1);
+	}
 
-	/* Clear FIFO number field */
-	*diepctl &= ~USB_DWC2_DEPCTL_TXFNUM_MASK;
+	priv->rxfifo_depth = usb_dwc2_get_grxfsiz(sys_read32(grxfsiz_reg));
 
 	if (priv->dynfifosizing) {
-		if (priv->txf_set & ~BIT_MASK(ep_idx)) {
-			LOG_WRN("Some of the FIFOs higher than %u are set, %lx",
-				ep_idx, priv->txf_set & ~BIT_MASK(ep_idx));
-			return 0;
+		uint32_t gnptxfsiz;
+		uint32_t default_depth;
+
+		/* TODO: For proper runtime FIFO sizing UDC driver would have to
+		 * have prior knowledge of the USB configurations. Only with the
+		 * prior knowledge, the driver will be able to fairly distribute
+		 * available resources. For the time being just use different
+		 * defaults based on maximum configured PHY speed, but this has
+		 * to be revised if e.g. thresholding support would be necessary
+		 * on some target.
+		 */
+		if (hs_phy) {
+			default_depth = UDC_DWC2_GRXFSIZ_HS_DEFAULT;
+		} else {
+			default_depth = UDC_DWC2_GRXFSIZ_FS_DEFAULT;
 		}
+		default_depth += priv->outeps * 2U;
 
-		dwc2_set_txf(dev, ep_idx - 1, 0, 0);
+		/* Driver does not dynamically resize RxFIFO so there is no need
+		 * to store reset value. Read the reset value and make sure that
+		 * the programmed value is not greater than what driver sets.
+		 */
+		priv->rxfifo_depth = MIN(priv->rxfifo_depth, default_depth);
+		sys_write32(usb_dwc2_set_grxfsiz(priv->rxfifo_depth), grxfsiz_reg);
+
+		/* Set TxFIFO 0 depth */
+		val = MAX(UDC_DWC2_FIFO0_DEPTH, priv->max_txfifo_depth[0]);
+		gnptxfsiz = usb_dwc2_set_gnptxfsiz_nptxfdep(val) |
+			    usb_dwc2_set_gnptxfsiz_nptxfstaddr(priv->rxfifo_depth);
+
+		sys_write32(gnptxfsiz, (mem_addr_t)&base->gnptxfsiz);
 	}
 
-	priv->txf_set &= ~BIT(ep_idx);
+	LOG_DBG("RX FIFO size %u bytes", priv->rxfifo_depth * 4);
+	for (uint8_t i = 1U; i < priv->ineps; i++) {
+		LOG_DBG("TX FIFO%u depth %u addr %u",
+			i, priv->max_txfifo_depth[i], dwc2_get_txfaddr(dev, i));
+	}
+
+	if (udc_ep_enable_internal(dev, USB_CONTROL_EP_OUT,
+				   USB_EP_TYPE_CONTROL, 64, 0)) {
+		LOG_ERR("Failed to enable control endpoint");
+		return -EIO;
+	}
+
+	if (udc_ep_enable_internal(dev, USB_CONTROL_EP_IN,
+				   USB_EP_TYPE_CONTROL, 64, 0)) {
+		LOG_ERR("Failed to enable control endpoint");
+		return -EIO;
+	}
+
+	/* Unmask interrupts */
+	sys_write32(USB_DWC2_GINTSTS_OEPINT | USB_DWC2_GINTSTS_IEPINT |
+		    USB_DWC2_GINTSTS_ENUMDONE | USB_DWC2_GINTSTS_USBRST |
+		    USB_DWC2_GINTSTS_WKUPINT | USB_DWC2_GINTSTS_USBSUSP |
+		    USB_DWC2_GINTSTS_INCOMPISOOUT | USB_DWC2_GINTSTS_INCOMPISOIN |
+		    USB_DWC2_GINTSTS_SOF,
+		    (mem_addr_t)&base->gintmsk);
 
 	return 0;
 }
 
-static void dwc2_wait_for_bit(const struct device *dev,
-			      mem_addr_t addr, uint32_t bit)
+static int udc_dwc2_enable(const struct device *dev)
 {
-	k_timepoint_t timeout = sys_timepoint_calc(K_MSEC(100));
+	const struct udc_dwc2_config *const config = dev->config;
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	int err;
 
-	/* This could potentially be converted to use proper synchronization
-	 * primitives instead of busy looping, but the number of interrupt bits
-	 * this function can be waiting for is rather high.
-	 *
-	 * Busy looping is most likely fine unless profiling shows otherwise.
-	 */
-	while (!(sys_read32(addr) & bit)) {
-		if (dwc2_quirk_is_phy_clk_off(dev)) {
-			/* No point in waiting, because the bit can only be set
-			 * when the PHY is actively clocked.
-			 */
-			return;
-		}
+	err = dwc2_quirk_pre_enable(dev);
+	if (err) {
+		LOG_ERR("Quirk pre enable failed %d", err);
+		return err;
+	}
 
-		if (sys_timepoint_expired(timeout)) {
-			LOG_ERR("Timeout waiting for bit 0x%08X at 0x%08X",
-				bit, (uint32_t)addr);
-			return;
-		}
+	err = udc_dwc2_init_controller(dev);
+	if (err) {
+		return err;
+	}
+
+	err = dwc2_quirk_post_enable(dev);
+	if (err) {
+		LOG_ERR("Quirk post enable failed %d", err);
+		return err;
 	}
+
+	/* Enable global interrupt */
+	sys_set_bits((mem_addr_t)&base->gahbcfg, USB_DWC2_GAHBCFG_GLBINTRMASK);
+	config->irq_enable_func(dev);
+
+	/* Disable soft disconnect */
+	sys_clear_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_SFTDISCON);
+	LOG_DBG("Enable device %p", base);
+
+	return 0;
 }
 
-/* Disabled IN endpoint means that device will send NAK (isochronous: ZLP) after
- * receiving IN token from host even if there is packet available in TxFIFO.
- * Disabled OUT endpoint means that device will NAK (isochronous: discard data)
- * incoming OUT data (or HS PING) even if there is space available in RxFIFO.
- *
- * Set stall parameter to true if caller wants to send STALL instead of NAK.
- */
-static void udc_dwc2_ep_disable(const struct device *dev,
-				struct udc_ep_config *const cfg, bool stall)
+static int udc_dwc2_disable(const struct device *dev)
 {
+	const struct udc_dwc2_config *const config = dev->config;
 	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
-	mem_addr_t dxepctl_reg;
-	uint32_t dxepctl;
+	mem_addr_t dctl_reg = (mem_addr_t)&base->dctl;
+	int err;
 
-	dxepctl_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
-	dxepctl = sys_read32(dxepctl_reg);
+	/* Enable soft disconnect */
+	sys_set_bits(dctl_reg, USB_DWC2_DCTL_SFTDISCON);
+	LOG_DBG("Disable device %p", dev);
 
-	if (dxepctl & USB_DWC2_DEPCTL_NAKSTS) {
-		/* Endpoint already sends forced NAKs. STALL if necessary. */
-		if (stall) {
-			dxepctl |= USB_DWC2_DEPCTL_STALL;
-			sys_write32(dxepctl, dxepctl_reg);
-		}
+	if (udc_ep_disable_internal(dev, USB_CONTROL_EP_OUT)) {
+		LOG_DBG("Failed to disable control endpoint");
+		return -EIO;
+	}
 
-		return;
+	if (udc_ep_disable_internal(dev, USB_CONTROL_EP_IN)) {
+		LOG_DBG("Failed to disable control endpoint");
+		return -EIO;
 	}
 
-	if (USB_EP_DIR_IS_OUT(cfg->addr)) {
-		mem_addr_t dctl_reg, gintsts_reg, doepint_reg;
-		uint32_t dctl;
+	config->irq_disable_func(dev);
+	sys_clear_bits((mem_addr_t)&base->gahbcfg, USB_DWC2_GAHBCFG_GLBINTRMASK);
 
-		dctl_reg = (mem_addr_t)&base->dctl;
-		gintsts_reg = (mem_addr_t)&base->gintsts;
-		doepint_reg = (mem_addr_t)&base->out_ep[ep_idx].doepint;
+	err = dwc2_quirk_disable(dev);
+	if (err) {
+		LOG_ERR("Quirk disable failed %d", err);
+		return err;
+	}
 
-		dctl = sys_read32(dctl_reg);
+	return 0;
+}
 
-		if (sys_read32(gintsts_reg) & USB_DWC2_GINTSTS_GOUTNAKEFF) {
-			LOG_ERR("GOUTNAKEFF already active");
-		} else {
-			dctl |= USB_DWC2_DCTL_SGOUTNAK;
-			sys_write32(dctl, dctl_reg);
-			dctl &= ~USB_DWC2_DCTL_SGOUTNAK;
-		}
-
-		dwc2_wait_for_bit(dev, gintsts_reg, USB_DWC2_GINTSTS_GOUTNAKEFF);
-
-		/* The application cannot disable control OUT endpoint 0. */
-		if (ep_idx != 0) {
-			dxepctl |= USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_EPDIS;
-		}
+static int udc_dwc2_init(const struct device *dev)
+{
+	int ret;
 
-		if (stall) {
-			/* For OUT endpoints STALL is set instead of SNAK */
-			dxepctl |= USB_DWC2_DEPCTL_STALL;
-		} else {
-			dxepctl |= USB_DWC2_DEPCTL_SNAK;
-		}
-		sys_write32(dxepctl, dxepctl_reg);
+	ret = dwc2_quirk_init(dev);
+	if (ret) {
+		LOG_ERR("Quirk init failed %d", ret);
+		return ret;
+	}
 
-		if (ep_idx != 0) {
-			dwc2_wait_for_bit(dev, doepint_reg, USB_DWC2_DOEPINT_EPDISBLD);
-		}
+	return dwc2_init_pinctrl(dev);
+}
 
-		/* Clear Endpoint Disabled interrupt */
-		sys_write32(USB_DWC2_DIEPINT_EPDISBLD, doepint_reg);
+static int udc_dwc2_shutdown(const struct device *dev)
+{
+	int ret;
 
-		dctl |= USB_DWC2_DCTL_CGOUTNAK;
-		sys_write32(dctl, dctl_reg);
-	} else {
-		mem_addr_t diepint_reg;
+	ret = dwc2_quirk_shutdown(dev);
+	if (ret) {
+		LOG_ERR("Quirk shutdown failed %d", ret);
+		return ret;
+	}
 
-		diepint_reg = (mem_addr_t)&base->in_ep[ep_idx].diepint;
+	return 0;
+}
 
-		dxepctl |= USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_SNAK;
-		if (stall) {
-			/* For IN endpoints STALL is set in addition to SNAK */
-			dxepctl |= USB_DWC2_DEPCTL_STALL;
-		}
-		sys_write32(dxepctl, dxepctl_reg);
+static int dwc2_driver_preinit(const struct device *dev)
+{
+	const struct udc_dwc2_config *config = dev->config;
+	struct udc_data *data = dev->data;
+	uint16_t mps = 1023;
+	uint32_t numdeveps;
+	uint32_t ineps;
+	int err;
 
-		dwc2_wait_for_bit(dev, diepint_reg, USB_DWC2_DIEPINT_INEPNAKEFF);
+	k_mutex_init(&data->mutex);
 
-		dxepctl |= USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_EPDIS;
-		sys_write32(dxepctl, dxepctl_reg);
+	data->caps.addr_before_status = true;
+	data->caps.mps0 = UDC_MPS0_64;
 
-		dwc2_wait_for_bit(dev, diepint_reg, USB_DWC2_DIEPINT_EPDISBLD);
+	(void)dwc2_quirk_caps(dev);
+	if (data->caps.hs) {
+		mps = 1024;
+	}
 
-		/* Clear Endpoint Disabled interrupt */
-		sys_write32(USB_DWC2_DIEPINT_EPDISBLD, diepint_reg);
+	/*
+	 * At this point, we cannot or do not want to access the hardware
+	 * registers to get GHWCFGn values. For now, we will use devicetree to
+	 * get GHWCFGn values and use them to determine the number and type of
+	 * configured endpoints in the hardware. This can be considered a
+	 * workaround, and we may change the upper layer internals to avoid it
+	 * in the future.
+	 */
+	ineps = usb_dwc2_get_ghwcfg4_ineps(config->ghwcfg4) + 1U;
+	numdeveps = usb_dwc2_get_ghwcfg2_numdeveps(config->ghwcfg2) + 1U;
+	LOG_DBG("Number of endpoints (NUMDEVEPS + 1) %u", numdeveps);
+	LOG_DBG("Number of IN endpoints (INEPS + 1) %u", ineps);
 
-		/* TODO: Read DIEPTSIZn here? Programming Guide suggest it to
-		 * let application know how many bytes of interrupted transfer
-		 * were transferred to the host.
-		 */
+	for (uint32_t i = 0, n = 0; i < numdeveps; i++) {
+		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(config->ghwcfg1, i);
 
-		dwc2_flush_tx_fifo(dev, usb_dwc2_get_depctl_txfnum(dxepctl));
-	}
+		if (epdir != USB_DWC2_GHWCFG1_EPDIR_OUT &&
+		    epdir != USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			continue;
+		}
 
-	udc_ep_set_busy(dev, cfg->addr, false);
-}
+		if (i == 0) {
+			config->ep_cfg_out[n].caps.control = 1;
+			config->ep_cfg_out[n].caps.mps = 64;
+		} else {
+			config->ep_cfg_out[n].caps.bulk = 1;
+			config->ep_cfg_out[n].caps.interrupt = 1;
+			config->ep_cfg_out[n].caps.iso = 1;
+			config->ep_cfg_out[n].caps.high_bandwidth = data->caps.hs;
+			config->ep_cfg_out[n].caps.mps = mps;
+		}
 
-/* Deactivated endpoint means that there will be a bus timeout when the host
- * tries to access the endpoint.
- */
-static int udc_dwc2_ep_deactivate(const struct device *dev,
-				  struct udc_ep_config *const cfg)
-{
-	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
-	mem_addr_t dxepctl_reg;
-	uint32_t dxepctl;
+		config->ep_cfg_out[n].caps.out = 1;
+		config->ep_cfg_out[n].addr = USB_EP_DIR_OUT | i;
 
-	dxepctl_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
-	dxepctl = sys_read32(dxepctl_reg);
+		LOG_DBG("Register ep 0x%02x (%u)", i, n);
+		err = udc_register_ep(dev, &config->ep_cfg_out[n]);
+		if (err != 0) {
+			LOG_ERR("Failed to register endpoint");
+			return err;
+		}
 
-	if (dxepctl & USB_DWC2_DEPCTL_USBACTEP) {
-		LOG_DBG("Disable ep 0x%02x DxEPCTL%u %x",
-			cfg->addr, ep_idx, dxepctl);
+		n++;
+		/* Also check the number of desired OUT endpoints in devicetree. */
+		if (n >= config->num_out_eps) {
+			break;
+		}
+	}
 
-		udc_dwc2_ep_disable(dev, cfg, false);
+	for (uint32_t i = 0, n = 0; i < numdeveps; i++) {
+		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(config->ghwcfg1, i);
 
-		dxepctl = sys_read32(dxepctl_reg);
-		dxepctl &= ~USB_DWC2_DEPCTL_USBACTEP;
-	} else {
-		LOG_WRN("ep 0x%02x is not active DxEPCTL%u %x",
-			cfg->addr, ep_idx, dxepctl);
-	}
+		if (epdir != USB_DWC2_GHWCFG1_EPDIR_IN &&
+		    epdir != USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			continue;
+		}
 
-	if (USB_EP_DIR_IS_IN(cfg->addr) && udc_mps_ep_size(cfg) != 0U &&
-	    ep_idx != 0U) {
-		dwc2_unset_dedicated_fifo(dev, cfg, &dxepctl);
-	}
+		if (i == 0) {
+			config->ep_cfg_in[n].caps.control = 1;
+			config->ep_cfg_in[n].caps.mps = 64;
+		} else {
+			config->ep_cfg_in[n].caps.bulk = 1;
+			config->ep_cfg_in[n].caps.interrupt = 1;
+			config->ep_cfg_in[n].caps.iso = 1;
+			config->ep_cfg_in[n].caps.high_bandwidth = data->caps.hs;
+			config->ep_cfg_in[n].caps.mps = mps;
+		}
 
-	sys_write32(dxepctl, dxepctl_reg);
-	dwc2_set_epint(dev, cfg, false);
+		config->ep_cfg_in[n].caps.in = 1;
+		config->ep_cfg_in[n].addr = USB_EP_DIR_IN | i;
 
-	if (cfg->addr == USB_CONTROL_EP_OUT) {
-		struct net_buf *buf = udc_buf_get_all(dev, cfg->addr);
+		LOG_DBG("Register ep 0x%02x (%u)", USB_EP_DIR_IN | i, n);
+		err = udc_register_ep(dev, &config->ep_cfg_in[n]);
+		if (err != 0) {
+			LOG_ERR("Failed to register endpoint");
+			return err;
+		}
 
-		/* Release the buffer allocated in dwc2_ctrl_feed_dout() */
-		if (buf) {
-			net_buf_unref(buf);
+		n++;
+		/* Also check the number of desired IN endpoints in devicetree. */
+		if (n >= MIN(ineps, config->num_in_eps)) {
+			break;
 		}
 	}
 
+	config->make_thread(dev);
+
 	return 0;
 }
 
-static int udc_dwc2_ep_set_halt(const struct device *dev,
-				struct udc_ep_config *const cfg)
+static int udc_dwc2_lock(const struct device *dev)
 {
-	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
-
-	udc_dwc2_ep_disable(dev, cfg, true);
-
-	LOG_DBG("Set halt ep 0x%02x", cfg->addr);
-	if (ep_idx != 0) {
-		cfg->stat.halted = true;
-	}
+	return udc_lock_internal(dev, K_FOREVER);
+}
 
-	return 0;
+static int udc_dwc2_unlock(const struct device *dev)
+{
+	return udc_unlock_internal(dev);
 }
 
-static int udc_dwc2_ep_clear_halt(const struct device *dev,
-				  struct udc_ep_config *const cfg)
+static void dwc2_on_bus_reset(const struct device *dev)
 {
-	mem_addr_t dxepctl_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
-	uint32_t dxepctl;
-	struct dwc2_drv_event evt = {
-		.ep = cfg->addr,
-		.type = DWC2_DRV_EVT_XFER,
-	};
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	uint32_t doepmsk;
 
-	dxepctl = sys_read32(dxepctl_reg);
-	dxepctl &= ~USB_DWC2_DEPCTL_STALL;
-	dxepctl |= USB_DWC2_DEPCTL_SETD0PID;
-	sys_write32(dxepctl, dxepctl_reg);
+	/* Set the NAK bit for all OUT endpoints */
+	for (uint8_t i = 0U; i < priv->numdeveps; i++) {
+		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
+		mem_addr_t doepctl_reg;
 
-	LOG_DBG("Clear halt ep 0x%02x", cfg->addr);
-	cfg->stat.halted = false;
+		LOG_DBG("ep 0x%02x EPDIR %u", i, epdir);
+		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT ||
+		    epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			doepctl_reg = dwc2_get_dxepctl_reg(dev, i);
+			sys_write32(USB_DWC2_DEPCTL_SNAK, doepctl_reg);
+		}
+	}
 
-	/* Resume queued transfers if any */
-	if (udc_buf_peek(dev, cfg->addr)) {
-		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+	doepmsk = USB_DWC2_DOEPINT_SETUP | USB_DWC2_DOEPINT_XFERCOMPL;
+	if (priv->bufferdma) {
+		doepmsk |= USB_DWC2_DOEPINT_STSPHSERCVD;
 	}
 
-	return 0;
+	sys_write32(doepmsk, (mem_addr_t)&base->doepmsk);
+	sys_set_bits((mem_addr_t)&base->diepmsk, USB_DWC2_DIEPINT_XFERCOMPL);
+
+	/* Software has to handle RxFLvl interrupt only in Completer mode */
+	if (!priv->bufferdma) {
+		sys_set_bits((mem_addr_t)&base->gintmsk,
+			     USB_DWC2_GINTSTS_RXFLVL);
+	}
+
+	/* Clear device address during reset. */
+	sys_clear_bits((mem_addr_t)&base->dcfg, USB_DWC2_DCFG_DEVADDR_MASK);
+
+	/* Speed enumeration must happen after reset. */
+	priv->enumdone = 0;
 }
 
-static int udc_dwc2_ep_enqueue(const struct device *dev,
-			       struct udc_ep_config *const cfg,
-			       struct net_buf *const buf)
+static void dwc2_handle_enumdone(const struct device *dev)
 {
-	struct dwc2_drv_event evt = {
-		.ep = cfg->addr,
-		.type = DWC2_DRV_EVT_XFER,
-	};
-
-	LOG_DBG("%p enqueue %x %p", dev, cfg->addr, buf);
-	udc_buf_put(cfg, buf);
-
-	if (!cfg->stat.halted) {
-		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
-	}
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	uint32_t dsts;
 
-	return 0;
+	dsts = sys_read32((mem_addr_t)&base->dsts);
+	priv->enumspd = usb_dwc2_get_dsts_enumspd(dsts);
+	priv->enumdone = 1;
 }
 
-static int udc_dwc2_ep_dequeue(const struct device *dev,
-			       struct udc_ep_config *const cfg)
+static inline int dwc2_read_fifo_setup(const struct device *dev, uint8_t ep,
+				       const size_t size)
 {
-	struct net_buf *buf;
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	size_t offset;
 
-	udc_dwc2_ep_disable(dev, cfg, false);
+	/* FIFO access is always in 32-bit words */
 
-	buf = udc_buf_get_all(dev, cfg->addr);
-	if (buf) {
-		udc_submit_ep_event(dev, buf, -ECONNABORTED);
+	if (size != 8) {
+		LOG_ERR("%d bytes SETUP", size);
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, false);
-
-	LOG_DBG("dequeue ep 0x%02x", cfg->addr);
-
-	return 0;
-}
-
-static int udc_dwc2_set_address(const struct device *dev, const uint8_t addr)
-{
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	mem_addr_t dcfg_reg = (mem_addr_t)&base->dcfg;
-	uint32_t dcfg;
-
-	if (addr > (USB_DWC2_DCFG_DEVADDR_MASK >> USB_DWC2_DCFG_DEVADDR_POS)) {
-		return -EINVAL;
+	/*
+	 * We store the setup packet temporarily in the driver's private data
+	 * because there is always a race risk after the status stage OUT
+	 * packet from the host and the new setup packet. This is fine in
+	 * bottom-half processing because the events arrive in a queue and
+	 * there will be a next net_buf for the setup packet.
+	 */
+	for (offset = 0; offset < MIN(size, 8); offset += 4) {
+		sys_put_le32(sys_read32(UDC_DWC2_EP_FIFO(base, ep)),
+			     &priv->setup[offset]);
 	}
 
-	dcfg = sys_read32(dcfg_reg);
-	dcfg &= ~USB_DWC2_DCFG_DEVADDR_MASK;
-	dcfg |= usb_dwc2_set_dcfg_devaddr(addr);
-	sys_write32(dcfg, dcfg_reg);
-	LOG_DBG("Set new address %u for %p", addr, dev);
+	/* On protocol error simply discard extra data */
+	while (offset < size) {
+		sys_read32(UDC_DWC2_EP_FIFO(base, ep));
+		offset += 4;
+	}
 
 	return 0;
 }
 
-static int udc_dwc2_test_mode(const struct device *dev,
-			      const uint8_t mode, const bool dryrun)
+static inline void dwc2_handle_rxflvl(const struct device *dev)
 {
 	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	mem_addr_t dctl_reg = (mem_addr_t)&base->dctl;
-	uint32_t dctl;
-
-	if (mode == 0U || mode > USB_DWC2_DCTL_TSTCTL_TESTFE) {
-		return -EINVAL;
-	}
-
-	dctl = sys_read32(dctl_reg);
-	if (usb_dwc2_get_dctl_tstctl(dctl) != USB_DWC2_DCTL_TSTCTL_DISABLED) {
-		return -EALREADY;
-	}
+	struct udc_ep_config *ep_cfg;
+	struct net_buf *buf;
+	uint32_t grxstsp;
+	uint32_t pktsts;
+	uint32_t bcnt;
+	uint8_t ep;
 
-	if (dryrun) {
-		LOG_DBG("Test Mode %u supported", mode);
-		return 0;
-	}
+	grxstsp = sys_read32((mem_addr_t)&base->grxstsp);
+	ep = usb_dwc2_get_grxstsp_epnum(grxstsp);
+	bcnt = usb_dwc2_get_grxstsp_bcnt(grxstsp);
+	pktsts = usb_dwc2_get_grxstsp_pktsts(grxstsp);
 
-	dctl |= usb_dwc2_set_dctl_tstctl(mode);
-	sys_write32(dctl, dctl_reg);
-	LOG_DBG("Enable Test Mode %u", mode);
+	LOG_DBG("ep 0x%02x: pktsts %u, bcnt %u", ep, pktsts, bcnt);
 
-	return 0;
-}
+	switch (pktsts) {
+	case USB_DWC2_GRXSTSR_PKTSTS_SETUP:
+		dwc2_read_fifo_setup(dev, ep, bcnt);
+		break;
+	case USB_DWC2_GRXSTSR_PKTSTS_OUT_DATA:
+		ep_cfg = udc_get_ep_cfg(dev, ep);
 
-static int udc_dwc2_host_wakeup(const struct device *dev)
-{
-	LOG_DBG("Remote wakeup from %p", dev);
+		buf = udc_buf_peek(dev, ep_cfg->addr);
 
-	return -ENOTSUP;
+		/* RxFIFO data must be retrieved even when buf is NULL */
+		dwc2_read_fifo(dev, ep, buf, bcnt);
+		break;
+	case USB_DWC2_GRXSTSR_PKTSTS_OUT_DATA_DONE:
+		LOG_DBG("RX pktsts DONE");
+		break;
+	case USB_DWC2_GRXSTSR_PKTSTS_SETUP_DONE:
+		LOG_DBG("SETUP pktsts DONE");
+	case USB_DWC2_GRXSTSR_PKTSTS_GLOBAL_OUT_NAK:
+		LOG_DBG("Global OUT NAK");
+		break;
+	default:
+		break;
+	}
 }
 
-/* Return actual USB device speed */
-static enum udc_bus_speed udc_dwc2_device_speed(const struct device *dev)
+static inline void dwc2_handle_in_xfercompl(const struct device *dev,
+					    const uint8_t ep_idx)
 {
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	struct udc_ep_config *ep_cfg;
+	struct dwc2_drv_event evt;
+	struct net_buf *buf;
 
-	switch (priv->enumspd) {
-	case USB_DWC2_DSTS_ENUMSPD_HS3060:
-		return UDC_BUS_SPEED_HS;
-	case USB_DWC2_DSTS_ENUMSPD_LS6:
-		__ASSERT(false, "Low speed mode not supported");
-		__fallthrough;
-	case USB_DWC2_DSTS_ENUMSPD_FS48:
-		__fallthrough;
-	case USB_DWC2_DSTS_ENUMSPD_FS3060:
-		__fallthrough;
-	default:
-		return UDC_BUS_SPEED_FS;
+	ep_cfg = udc_get_ep_cfg(dev, ep_idx | USB_EP_DIR_IN);
+	buf = udc_buf_peek(dev, ep_cfg->addr);
+	if (buf == NULL) {
+		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
+		return;
+	}
+
+	net_buf_pull(buf, priv->tx_len[ep_idx]);
+	if (buf->len  && dwc2_tx_fifo_write(dev, ep_cfg, buf) == 0) {
+		return;
 	}
+
+	evt.dev = dev;
+	evt.ep = ep_cfg->addr;
+	evt.type = DWC2_DRV_EVT_DIN;
+	k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
 }
 
-static int dwc2_core_soft_reset(const struct device *dev)
+static inline void dwc2_handle_iepint(const struct device *dev)
 {
 	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	mem_addr_t grstctl_reg = (mem_addr_t)&base->grstctl;
-	const unsigned int csr_timeout_us = 10000UL;
-	uint32_t cnt = 0UL;
+	const uint8_t n_max = 16;
+	uint32_t diepmsk;
+	uint32_t daint;
 
-	/* Check AHB master idle state */
-	while (!(sys_read32(grstctl_reg) & USB_DWC2_GRSTCTL_AHBIDLE)) {
-		k_busy_wait(1);
+	diepmsk = sys_read32((mem_addr_t)&base->diepmsk);
+	daint = sys_read32((mem_addr_t)&base->daint);
 
-		if (++cnt > csr_timeout_us) {
-			LOG_ERR("Wait for AHB idle timeout, GRSTCTL 0x%08x",
-				sys_read32(grstctl_reg));
-			return -EIO;
-		}
-	}
+	for (uint8_t n = 0U; n < n_max; n++) {
+		mem_addr_t diepint_reg = (mem_addr_t)&base->in_ep[n].diepint;
+		uint32_t diepint;
+		uint32_t status;
 
-	/* Apply Core Soft Reset */
-	sys_write32(USB_DWC2_GRSTCTL_CSFTRST, grstctl_reg);
+		if (daint & USB_DWC2_DAINT_INEPINT(n)) {
+			/* Read and clear interrupt status */
+			diepint = sys_read32(diepint_reg);
+			status = diepint & diepmsk;
+			sys_write32(status, diepint_reg);
 
-	cnt = 0UL;
-	do {
-		if (++cnt > csr_timeout_us) {
-			LOG_ERR("Wait for CSR done timeout, GRSTCTL 0x%08x",
-				sys_read32(grstctl_reg));
-			return -EIO;
-		}
+			LOG_DBG("ep 0x%02x interrupt status: 0x%x",
+				n | USB_EP_DIR_IN, status);
 
-		k_busy_wait(1);
-	} while (sys_read32(grstctl_reg) & USB_DWC2_GRSTCTL_CSFTRST &&
-		 !(sys_read32(grstctl_reg) & USB_DWC2_GRSTCTL_CSFTRSTDONE));
+			if (status & USB_DWC2_DIEPINT_XFERCOMPL) {
+				dwc2_handle_in_xfercompl(dev, n);
+			}
 
-	sys_clear_bits(grstctl_reg, USB_DWC2_GRSTCTL_CSFTRST | USB_DWC2_GRSTCTL_CSFTRSTDONE);
+		}
+	}
 
-	return 0;
+	/* Clear IEPINT interrupt */
+	sys_write32(USB_DWC2_GINTSTS_IEPINT, (mem_addr_t)&base->gintsts);
 }
 
-static int udc_dwc2_init_controller(const struct device *dev)
+static inline void dwc2_handle_out_xfercompl(const struct device *dev,
+					     const uint8_t ep_idx)
 {
-	const struct udc_dwc2_config *const config = dev->config;
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep_idx);
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	struct usb_dwc2_reg *const base = config->base;
-	mem_addr_t grxfsiz_reg = (mem_addr_t)&base->grxfsiz;
-	mem_addr_t gahbcfg_reg = (mem_addr_t)&base->gahbcfg;
-	mem_addr_t gusbcfg_reg = (mem_addr_t)&base->gusbcfg;
-	mem_addr_t dcfg_reg = (mem_addr_t)&base->dcfg;
-	uint32_t dcfg;
-	uint32_t gusbcfg;
-	uint32_t gahbcfg;
-	uint32_t ghwcfg2;
-	uint32_t ghwcfg3;
-	uint32_t ghwcfg4;
-	uint32_t val;
-	int ret;
-	bool hs_phy;
-
-	ret = dwc2_core_soft_reset(dev);
-	if (ret) {
-		return ret;
-	}
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	struct dwc2_drv_event evt;
+	uint32_t bcnt;
+	struct net_buf *buf;
+	uint32_t doeptsiz;
+	const bool is_iso = dwc2_ep_is_iso(ep_cfg);
 
-	priv->ghwcfg1 = sys_read32((mem_addr_t)&base->ghwcfg1);
-	ghwcfg2 = sys_read32((mem_addr_t)&base->ghwcfg2);
-	ghwcfg3 = sys_read32((mem_addr_t)&base->ghwcfg3);
-	ghwcfg4 = sys_read32((mem_addr_t)&base->ghwcfg4);
+	doeptsiz = sys_read32((mem_addr_t)&base->out_ep[ep_idx].doeptsiz);
 
-	if (!(ghwcfg4 & USB_DWC2_GHWCFG4_DEDFIFOMODE)) {
-		LOG_ERR("Only dedicated TX FIFO mode is supported");
-		return -ENOTSUP;
+	buf = udc_buf_peek(dev, ep_cfg->addr);
+	if (!buf) {
+		LOG_ERR("No buffer for ep 0x%02x", ep_cfg->addr);
+		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
+		return;
 	}
 
-	/*
-	 * Force device mode as we do no support role changes.
-	 * Wait 25ms for the change to take effect.
-	 */
-	gusbcfg = USB_DWC2_GUSBCFG_FORCEDEVMODE;
-	sys_write32(gusbcfg, gusbcfg_reg);
-	k_msleep(25);
+	evt.type = DWC2_DRV_EVT_DOUT;
+	evt.ep = ep_cfg->addr;
 
-	/* Buffer DMA is always supported in Internal DMA mode.
-	 * TODO: check and support descriptor DMA if available
+	/* The original transfer size value is necessary here because controller
+	 * decreases the value for every byte stored.
 	 */
-	priv->bufferdma = (usb_dwc2_get_ghwcfg2_otgarch(ghwcfg2) ==
-			   USB_DWC2_GHWCFG2_OTGARCH_INTERNALDMA);
+	bcnt = usb_dwc2_get_doeptsizn_xfersize(priv->rx_siz[ep_idx]) -
+	       usb_dwc2_get_doeptsizn_xfersize(doeptsiz);
 
-	if (!IS_ENABLED(CONFIG_UDC_DWC2_DMA)) {
-		priv->bufferdma = 0;
-	} else if (priv->bufferdma) {
-		LOG_WRN("Experimental DMA enabled");
-	}
+	if (is_iso) {
+		uint32_t pkts;
+		bool valid;
 
-	if (ghwcfg2 & USB_DWC2_GHWCFG2_DYNFIFOSIZING) {
-		LOG_DBG("Dynamic FIFO Sizing is enabled");
-		priv->dynfifosizing = true;
-	}
+		pkts = usb_dwc2_get_doeptsizn_pktcnt(priv->rx_siz[ep_idx]) -
+			usb_dwc2_get_doeptsizn_pktcnt(doeptsiz);
+		switch (usb_dwc2_get_doeptsizn_rxdpid(doeptsiz)) {
+		case USB_DWC2_DOEPTSIZN_RXDPID_DATA0:
+			valid = (pkts == 1);
+			break;
+		case USB_DWC2_DOEPTSIZN_RXDPID_DATA1:
+			valid = (pkts == 2);
+			break;
+		case USB_DWC2_DOEPTSIZN_RXDPID_DATA2:
+			valid = (pkts == 3);
+			break;
+		case USB_DWC2_DOEPTSIZN_RXDPID_MDATA:
+		default:
+			valid = false;
+			break;
+		}
 
-	if (IS_ENABLED(CONFIG_UDC_DWC2_HIBERNATION) &&
-	    ghwcfg4 & USB_DWC2_GHWCFG4_HIBERNATION) {
-		LOG_INF("Hibernation enabled");
-		priv->suspend_type = DWC2_SUSPEND_HIBERNATION;
-	} else {
-		priv->suspend_type = DWC2_SUSPEND_NO_POWER_SAVING;
+		if (!valid) {
+			if (!priv->bufferdma) {
+				/* RxFlvl added data to net buf, rollback */
+				net_buf_remove_mem(buf, bcnt);
+			}
+			/* Data is not valid, discard it */
+			bcnt = 0;
+		}
 	}
 
-	/* Get the number or endpoints and IN endpoints we can use later */
-	priv->numdeveps = usb_dwc2_get_ghwcfg2_numdeveps(ghwcfg2) + 1U;
-	priv->ineps = usb_dwc2_get_ghwcfg4_ineps(ghwcfg4) + 1U;
-	LOG_DBG("Number of endpoints (NUMDEVEPS + 1) %u", priv->numdeveps);
-	LOG_DBG("Number of IN endpoints (INEPS + 1) %u", priv->ineps);
-
-	LOG_DBG("Number of periodic IN endpoints (NUMDEVPERIOEPS) %u",
-		usb_dwc2_get_ghwcfg4_numdevperioeps(ghwcfg4));
-	LOG_DBG("Number of additional control endpoints (NUMCTLEPS) %u",
-		usb_dwc2_get_ghwcfg4_numctleps(ghwcfg4));
-
-	LOG_DBG("OTG architecture (OTGARCH) %u, mode (OTGMODE) %u",
-		usb_dwc2_get_ghwcfg2_otgarch(ghwcfg2),
-		usb_dwc2_get_ghwcfg2_otgmode(ghwcfg2));
-
-	priv->dfifodepth = usb_dwc2_get_ghwcfg3_dfifodepth(ghwcfg3);
-	LOG_DBG("DFIFO depth (DFIFODEPTH) %u bytes", priv->dfifodepth * 4);
-
-	priv->max_pktcnt = GHWCFG3_PKTCOUNT(usb_dwc2_get_ghwcfg3_pktsizewidth(ghwcfg3));
-	priv->max_xfersize = GHWCFG3_XFERSIZE(usb_dwc2_get_ghwcfg3_xfersizewidth(ghwcfg3));
-	LOG_DBG("Max packet count %u, Max transfer size %u",
-		priv->max_pktcnt, priv->max_xfersize);
-
-	LOG_DBG("Vendor Control interface support enabled: %s",
-		(ghwcfg3 & USB_DWC2_GHWCFG3_VNDCTLSUPT) ? "true" : "false");
-
-	LOG_DBG("PHY interface type: FSPHYTYPE %u, HSPHYTYPE %u, DATAWIDTH %u",
-		usb_dwc2_get_ghwcfg2_fsphytype(ghwcfg2),
-		usb_dwc2_get_ghwcfg2_hsphytype(ghwcfg2),
-		usb_dwc2_get_ghwcfg4_phydatawidth(ghwcfg4));
-
-	LOG_DBG("LPM mode is %s",
-		(ghwcfg3 & USB_DWC2_GHWCFG3_LPMMODE) ? "enabled" : "disabled");
-
-	/* Configure AHB, select Completer or DMA mode */
-	gahbcfg = sys_read32(gahbcfg_reg);
+	if (priv->bufferdma && bcnt) {
+		sys_cache_data_invd_range(buf->data, bcnt);
+		net_buf_add(buf, bcnt);
+	}
 
-	if (priv->bufferdma) {
-		gahbcfg |= USB_DWC2_GAHBCFG_DMAEN;
+	if (!is_iso && (bcnt % udc_mps_ep_size(ep_cfg)) == 0 &&
+	    net_buf_tailroom(buf)) {
+		dwc2_prep_rx(dev, buf, ep_cfg);
 	} else {
-		gahbcfg &= ~USB_DWC2_GAHBCFG_DMAEN;
+		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
 	}
+}
 
-	sys_write32(gahbcfg, gahbcfg_reg);
+static inline void dwc2_handle_oepint(const struct device *dev)
+{
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	const uint8_t n_max = 16;
+	uint32_t doepmsk;
+	uint32_t daint;
 
-	dcfg = sys_read32(dcfg_reg);
+	doepmsk = sys_read32((mem_addr_t)&base->doepmsk);
+	daint = sys_read32((mem_addr_t)&base->daint);
 
-	dcfg &= ~USB_DWC2_DCFG_DESCDMA;
+	for (uint8_t n = 0U; n < n_max; n++) {
+		mem_addr_t doepint_reg = (mem_addr_t)&base->out_ep[n].doepint;
+		uint32_t doepint;
+		uint32_t status;
 
-	/* Configure PHY and device speed */
-	dcfg &= ~USB_DWC2_DCFG_DEVSPD_MASK;
-	switch (usb_dwc2_get_ghwcfg2_hsphytype(ghwcfg2)) {
-	case USB_DWC2_GHWCFG2_HSPHYTYPE_UTMIPLUSULPI:
-		__fallthrough;
-	case USB_DWC2_GHWCFG2_HSPHYTYPE_ULPI:
-		gusbcfg |= USB_DWC2_GUSBCFG_PHYSEL_USB20 |
-			   USB_DWC2_GUSBCFG_ULPI_UTMI_SEL_ULPI;
-		dcfg |= USB_DWC2_DCFG_DEVSPD_USBHS20
-			<< USB_DWC2_DCFG_DEVSPD_POS;
-		hs_phy = true;
-		break;
-	case USB_DWC2_GHWCFG2_HSPHYTYPE_UTMIPLUS:
-		gusbcfg |= USB_DWC2_GUSBCFG_PHYSEL_USB20 |
-			   USB_DWC2_GUSBCFG_ULPI_UTMI_SEL_UTMI;
-		dcfg |= USB_DWC2_DCFG_DEVSPD_USBHS20
-			<< USB_DWC2_DCFG_DEVSPD_POS;
-		hs_phy = true;
-		break;
-	case USB_DWC2_GHWCFG2_HSPHYTYPE_NO_HS:
-		__fallthrough;
-	default:
-		if (usb_dwc2_get_ghwcfg2_fsphytype(ghwcfg2) !=
-		    USB_DWC2_GHWCFG2_FSPHYTYPE_NO_FS) {
-			gusbcfg |= USB_DWC2_GUSBCFG_PHYSEL_USB11;
+		if (!(daint & USB_DWC2_DAINT_OUTEPINT(n))) {
+			continue;
 		}
 
-		dcfg |= USB_DWC2_DCFG_DEVSPD_USBFS1148
-			<< USB_DWC2_DCFG_DEVSPD_POS;
-		hs_phy = false;
-	}
-
-	if (usb_dwc2_get_ghwcfg4_phydatawidth(ghwcfg4)) {
-		gusbcfg |= USB_DWC2_GUSBCFG_PHYIF_16_BIT;
-	}
+		/* Read and clear interrupt status */
+		doepint = sys_read32(doepint_reg);
+		status = doepint & doepmsk;
+		sys_write32(status, doepint_reg);
 
-	/* Update PHY configuration */
-	sys_write32(gusbcfg, gusbcfg_reg);
-	sys_write32(dcfg, dcfg_reg);
+		LOG_DBG("ep 0x%02x interrupt status: 0x%x", n, status);
 
-	priv->outeps = 0U;
-	for (uint8_t i = 0U; i < priv->numdeveps; i++) {
-		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
+		/* StupPktRcvd is not enabled for interrupt, but must be checked
+		 * when XferComp hits to determine if SETUP token was received.
+		 */
+		if (priv->bufferdma && (status & USB_DWC2_DOEPINT_XFERCOMPL) &&
+		    (doepint & USB_DWC2_DOEPINT_STUPPKTRCVD)) {
+			uint32_t addr;
 
-		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT ||
-		    epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			mem_addr_t doepctl_reg = dwc2_get_dxepctl_reg(dev, i);
+			sys_write32(USB_DWC2_DOEPINT_STUPPKTRCVD, doepint_reg);
+			status &= ~USB_DWC2_DOEPINT_XFERCOMPL;
 
-			sys_write32(USB_DWC2_DEPCTL_SNAK, doepctl_reg);
-			priv->outeps++;
+			/* DMAAddr points past the memory location where the
+			 * SETUP data was stored. Copy the received SETUP data
+			 * to temporary location used also in Completer mode
+			 * which allows common SETUP interrupt handling.
+			 */
+			addr = sys_read32((mem_addr_t)&base->out_ep[0].doepdma);
+			sys_cache_data_invd_range((void *)(addr - 8), 8);
+			memcpy(priv->setup, (void *)(addr - 8), sizeof(priv->setup));
 		}
-	}
-
-	LOG_DBG("Number of OUT endpoints %u", priv->outeps);
-
-	/* Read and store all TxFIFO depths because Programmed FIFO Depths must
-	 * not exceed the power-on values.
-	 */
-	val = sys_read32((mem_addr_t)&base->gnptxfsiz);
-	priv->max_txfifo_depth[0] = usb_dwc2_get_gnptxfsiz_nptxfdep(val);
-	for (uint8_t i = 1; i < priv->ineps; i++) {
-		priv->max_txfifo_depth[i] = dwc2_get_txfdep(dev, i - 1);
-	}
-
-	priv->rxfifo_depth = usb_dwc2_get_grxfsiz(sys_read32(grxfsiz_reg));
 
-	if (priv->dynfifosizing) {
-		uint32_t gnptxfsiz;
-		uint32_t default_depth;
+		if (status & USB_DWC2_DOEPINT_SETUP) {
+			struct dwc2_drv_event evt = {
+				.type = DWC2_DRV_EVT_SETUP,
+				.ep = USB_CONTROL_EP_OUT,
+			};
 
-		/* TODO: For proper runtime FIFO sizing UDC driver would have to
-		 * have prior knowledge of the USB configurations. Only with the
-		 * prior knowledge, the driver will be able to fairly distribute
-		 * available resources. For the time being just use different
-		 * defaults based on maximum configured PHY speed, but this has
-		 * to be revised if e.g. thresholding support would be necessary
-		 * on some target.
-		 */
-		if (hs_phy) {
-			default_depth = UDC_DWC2_GRXFSIZ_HS_DEFAULT;
-		} else {
-			default_depth = UDC_DWC2_GRXFSIZ_FS_DEFAULT;
+			k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
 		}
-		default_depth += priv->outeps * 2U;
 
-		/* Driver does not dynamically resize RxFIFO so there is no need
-		 * to store reset value. Read the reset value and make sure that
-		 * the programmed value is not greater than what driver sets.
-		 */
-		priv->rxfifo_depth = MIN(priv->rxfifo_depth, default_depth);
-		sys_write32(usb_dwc2_set_grxfsiz(priv->rxfifo_depth), grxfsiz_reg);
-
-		/* Set TxFIFO 0 depth */
-		val = MAX(UDC_DWC2_FIFO0_DEPTH, priv->max_txfifo_depth[0]);
-		gnptxfsiz = usb_dwc2_set_gnptxfsiz_nptxfdep(val) |
-			    usb_dwc2_set_gnptxfsiz_nptxfstaddr(priv->rxfifo_depth);
-
-		sys_write32(gnptxfsiz, (mem_addr_t)&base->gnptxfsiz);
-	}
-
-	LOG_DBG("RX FIFO size %u bytes", priv->rxfifo_depth * 4);
-	for (uint8_t i = 1U; i < priv->ineps; i++) {
-		LOG_DBG("TX FIFO%u depth %u addr %u",
-			i, priv->max_txfifo_depth[i], dwc2_get_txfaddr(dev, i));
-	}
-
-	if (udc_ep_enable_internal(dev, USB_CONTROL_EP_OUT,
-				   USB_EP_TYPE_CONTROL, 64, 0)) {
-		LOG_ERR("Failed to enable control endpoint");
-		return -EIO;
-	}
+		if (status & USB_DWC2_DOEPINT_STSPHSERCVD) {
+			/* Driver doesn't need any special handling, but it is
+			 * mandatory that the bit is cleared in Buffer DMA mode.
+			 * If the bit is not cleared (i.e. when this interrupt
+			 * bit is masked), then SETUP interrupts will cease
+			 * after first control transfer with data stage from
+			 * device to host.
+			 */
+		}
 
-	if (udc_ep_enable_internal(dev, USB_CONTROL_EP_IN,
-				   USB_EP_TYPE_CONTROL, 64, 0)) {
-		LOG_ERR("Failed to enable control endpoint");
-		return -EIO;
+		if (status & USB_DWC2_DOEPINT_XFERCOMPL) {
+			dwc2_handle_out_xfercompl(dev, n);
+		}
 	}
 
-	/* Unmask interrupts */
-	sys_write32(USB_DWC2_GINTSTS_OEPINT | USB_DWC2_GINTSTS_IEPINT |
-		    USB_DWC2_GINTSTS_ENUMDONE | USB_DWC2_GINTSTS_USBRST |
-		    USB_DWC2_GINTSTS_WKUPINT | USB_DWC2_GINTSTS_USBSUSP |
-		    USB_DWC2_GINTSTS_INCOMPISOOUT | USB_DWC2_GINTSTS_INCOMPISOIN |
-		    USB_DWC2_GINTSTS_SOF,
-		    (mem_addr_t)&base->gintmsk);
-
-	return 0;
+	/* Clear OEPINT interrupt */
+	sys_write32(USB_DWC2_GINTSTS_OEPINT, (mem_addr_t)&base->gintsts);
 }
 
-static int udc_dwc2_enable(const struct device *dev)
+/* In DWC2 otg context incomplete isochronous IN transfer means that the host
+ * did not issue IN token to at least one isochronous endpoint and software has
+ * find on which endpoints the data is no longer valid and discard it.
+ */
+static void dwc2_handle_incompisoin(const struct device *dev)
 {
 	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	int err;
+	struct usb_dwc2_reg *const base = config->base;
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	mem_addr_t gintsts_reg = (mem_addr_t)&base->gintsts;
+	const uint32_t mask =
+		USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_EPTYPE_MASK |
+		USB_DWC2_DEPCTL_USBACTEP;
+	const uint32_t val =
+		USB_DWC2_DEPCTL_EPENA |
+		usb_dwc2_set_depctl_eptype(USB_DWC2_DEPCTL_EPTYPE_ISO) |
+		USB_DWC2_DEPCTL_USBACTEP;
 
-	err = dwc2_quirk_pre_enable(dev);
-	if (err) {
-		LOG_ERR("Quirk pre enable failed %d", err);
-		return err;
-	}
+	for (uint8_t i = 1U; i < priv->numdeveps; i++) {
+		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
 
-	err = udc_dwc2_init_controller(dev);
-	if (err) {
-		return err;
-	}
+		if (epdir == USB_DWC2_GHWCFG1_EPDIR_IN ||
+		    epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			mem_addr_t diepctl_reg = dwc2_get_dxepctl_reg(dev, i | USB_EP_DIR_IN);
+			uint32_t diepctl;
 
-	err = dwc2_quirk_post_enable(dev);
-	if (err) {
-		LOG_ERR("Quirk post enable failed %d", err);
-		return err;
-	}
+			diepctl = sys_read32(diepctl_reg);
 
-	/* Enable global interrupt */
-	sys_set_bits((mem_addr_t)&base->gahbcfg, USB_DWC2_GAHBCFG_GLBINTRMASK);
-	config->irq_enable_func(dev);
+			/* Check if endpoint didn't receive ISO OUT data */
+			if ((diepctl & mask) == val) {
+				struct udc_ep_config *cfg;
+				struct net_buf *buf;
 
-	/* Disable soft disconnect */
-	sys_clear_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_SFTDISCON);
-	LOG_DBG("Enable device %p", base);
+				cfg = udc_get_ep_cfg(dev, i | USB_EP_DIR_IN);
+				__ASSERT_NO_MSG(cfg && cfg->stat.enabled &&
+						dwc2_ep_is_iso(cfg));
 
-	return 0;
+				udc_dwc2_ep_disable(dev, cfg, false);
+
+				buf = udc_buf_get(dev, cfg->addr);
+				if (buf) {
+					udc_submit_ep_event(dev, buf, 0);
+				}
+			}
+		}
+	}
+
+	sys_write32(USB_DWC2_GINTSTS_INCOMPISOIN, gintsts_reg);
 }
 
-static int udc_dwc2_disable(const struct device *dev)
+/* In DWC2 otg context incomplete isochronous OUT transfer means that the host
+ * did not issue OUT token to at least one isochronous endpoint and software has
+ * to find on which endpoint it didn't receive any data and let the stack know.
+ */
+static void dwc2_handle_incompisoout(const struct device *dev)
 {
 	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	mem_addr_t dctl_reg = (mem_addr_t)&base->dctl;
-	int err;
-
-	/* Enable soft disconnect */
-	sys_set_bits(dctl_reg, USB_DWC2_DCTL_SFTDISCON);
-	LOG_DBG("Disable device %p", dev);
-
-	if (udc_ep_disable_internal(dev, USB_CONTROL_EP_OUT)) {
-		LOG_DBG("Failed to disable control endpoint");
-		return -EIO;
-	}
+	struct usb_dwc2_reg *const base = config->base;
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	mem_addr_t gintsts_reg = (mem_addr_t)&base->gintsts;
+	const uint32_t mask =
+		USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_EPTYPE_MASK |
+		USB_DWC2_DEPCTL_DPID | USB_DWC2_DEPCTL_USBACTEP;
+	const uint32_t val =
+		USB_DWC2_DEPCTL_EPENA |
+		usb_dwc2_set_depctl_eptype(USB_DWC2_DEPCTL_EPTYPE_ISO) |
+		((priv->sof_num & 1) ? USB_DWC2_DEPCTL_DPID : 0) |
+		USB_DWC2_DEPCTL_USBACTEP;
 
-	if (udc_ep_disable_internal(dev, USB_CONTROL_EP_IN)) {
-		LOG_DBG("Failed to disable control endpoint");
-		return -EIO;
-	}
+	for (uint8_t i = 1U; i < priv->numdeveps; i++) {
+		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
 
-	config->irq_disable_func(dev);
-	sys_clear_bits((mem_addr_t)&base->gahbcfg, USB_DWC2_GAHBCFG_GLBINTRMASK);
+		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT ||
+		    epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			mem_addr_t doepctl_reg = dwc2_get_dxepctl_reg(dev, i);
+			uint32_t doepctl;
 
-	err = dwc2_quirk_disable(dev);
-	if (err) {
-		LOG_ERR("Quirk disable failed %d", err);
-		return err;
-	}
+			doepctl = sys_read32(doepctl_reg);
 
-	return 0;
-}
+			/* Check if endpoint didn't receive ISO OUT data */
+			if ((doepctl & mask) == val) {
+				struct udc_ep_config *cfg;
+				struct net_buf *buf;
 
-static int udc_dwc2_init(const struct device *dev)
-{
-	int ret;
+				cfg = udc_get_ep_cfg(dev, i);
+				__ASSERT_NO_MSG(cfg && cfg->stat.enabled &&
+						dwc2_ep_is_iso(cfg));
 
-	ret = dwc2_quirk_init(dev);
-	if (ret) {
-		LOG_ERR("Quirk init failed %d", ret);
-		return ret;
+				udc_dwc2_ep_disable(dev, cfg, false);
+
+				buf = udc_buf_get(dev, cfg->addr);
+				if (buf) {
+					udc_submit_ep_event(dev, buf, 0);
+				}
+			}
+		}
 	}
 
-	return dwc2_init_pinctrl(dev);
+	sys_write32(USB_DWC2_GINTSTS_INCOMPISOOUT, gintsts_reg);
 }
 
-static int udc_dwc2_shutdown(const struct device *dev)
+static void udc_dwc2_isr_handler(const struct device *dev)
 {
-	int ret;
+	const struct udc_dwc2_config *const config = dev->config;
+	struct usb_dwc2_reg *const base = config->base;
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	mem_addr_t gintsts_reg = (mem_addr_t)&base->gintsts;
+	uint32_t int_status;
+	uint32_t gintmsk;
 
-	ret = dwc2_quirk_shutdown(dev);
-	if (ret) {
-		LOG_ERR("Quirk shutdown failed %d", ret);
-		return ret;
-	}
+	if (priv->hibernated) {
+		uint32_t gpwrdn = sys_read32((mem_addr_t)&base->gpwrdn);
+		bool reset, resume = false;
+		enum dwc2_hibernation_exit_reason exit_reason;
 
-	return 0;
-}
+		/* Clear interrupts */
+		sys_write32(gpwrdn, (mem_addr_t)&base->gpwrdn);
 
-static int dwc2_driver_preinit(const struct device *dev)
-{
-	const struct udc_dwc2_config *config = dev->config;
-	struct udc_data *data = dev->data;
-	uint16_t mps = 1023;
-	uint32_t numdeveps;
-	uint32_t ineps;
-	int err;
+		if (gpwrdn & USB_DWC2_GPWRDN_LNSTSCHNG) {
+			resume = usb_dwc2_get_gpwrdn_linestate(gpwrdn) ==
+				 USB_DWC2_GPWRDN_LINESTATE_DM1DP0;
+			exit_reason = DWC2_HIBERNATION_EXIT_HOST_WAKEUP;
+		}
 
-	k_mutex_init(&data->mutex);
+		reset = gpwrdn & USB_DWC2_GPWRDN_RESETDETECTED;
+		if (reset) {
+			exit_reason = DWC2_HIBERNATION_EXIT_BUS_RESET;
+		}
 
-	data->caps.addr_before_status = true;
-	data->caps.mps0 = UDC_MPS0_64;
+		if (reset || resume) {
+			struct dwc2_drv_event evt = {
+				.dev = dev,
+				.type = DWC2_DRV_EVT_HIBERNATION_EXIT,
+				.exit_reason = exit_reason,
+			};
 
-	(void)dwc2_quirk_caps(dev);
-	if (data->caps.hs) {
-		mps = 1024;
+			k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+		}
+
+		(void)dwc2_quirk_irq_clear(dev);
+		return;
 	}
 
-	/*
-	 * At this point, we cannot or do not want to access the hardware
-	 * registers to get GHWCFGn values. For now, we will use devicetree to
-	 * get GHWCFGn values and use them to determine the number and type of
-	 * configured endpoints in the hardware. This can be considered a
-	 * workaround, and we may change the upper layer internals to avoid it
-	 * in the future.
-	 */
-	ineps = usb_dwc2_get_ghwcfg4_ineps(config->ghwcfg4) + 1U;
-	numdeveps = usb_dwc2_get_ghwcfg2_numdeveps(config->ghwcfg2) + 1U;
-	LOG_DBG("Number of endpoints (NUMDEVEPS + 1) %u", numdeveps);
-	LOG_DBG("Number of IN endpoints (INEPS + 1) %u", ineps);
+	gintmsk = sys_read32((mem_addr_t)&base->gintmsk);
 
-	for (uint32_t i = 0, n = 0; i < numdeveps; i++) {
-		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(config->ghwcfg1, i);
+	/*  Read and handle interrupt status register */
+	while ((int_status = sys_read32(gintsts_reg) & gintmsk)) {
 
-		if (epdir != USB_DWC2_GHWCFG1_EPDIR_OUT &&
-		    epdir != USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			continue;
-		}
+		LOG_DBG("GINTSTS 0x%x", int_status);
 
-		if (i == 0) {
-			config->ep_cfg_out[n].caps.control = 1;
-			config->ep_cfg_out[n].caps.mps = 64;
-		} else {
-			config->ep_cfg_out[n].caps.bulk = 1;
-			config->ep_cfg_out[n].caps.interrupt = 1;
-			config->ep_cfg_out[n].caps.iso = 1;
-			config->ep_cfg_out[n].caps.high_bandwidth = data->caps.hs;
-			config->ep_cfg_out[n].caps.mps = mps;
+		if (int_status & USB_DWC2_GINTSTS_SOF) {
+			uint32_t dsts;
+
+			/* Clear USB SOF interrupt. */
+			sys_write32(USB_DWC2_GINTSTS_SOF, gintsts_reg);
+
+			dsts = sys_read32((mem_addr_t)&base->dsts);
+			priv->sof_num = usb_dwc2_get_dsts_soffn(dsts);
+			udc_submit_event(dev, UDC_EVT_SOF, 0);
 		}
 
-		config->ep_cfg_out[n].caps.out = 1;
-		config->ep_cfg_out[n].addr = USB_EP_DIR_OUT | i;
+		if (int_status & USB_DWC2_GINTSTS_USBRST) {
+			/* Clear and handle USB Reset interrupt. */
+			sys_write32(USB_DWC2_GINTSTS_USBRST, gintsts_reg);
+			dwc2_on_bus_reset(dev);
+			LOG_DBG("USB Reset interrupt");
+		}
 
-		LOG_DBG("Register ep 0x%02x (%u)", i, n);
-		err = udc_register_ep(dev, &config->ep_cfg_out[n]);
-		if (err != 0) {
-			LOG_ERR("Failed to register endpoint");
-			return err;
+		if (int_status & USB_DWC2_GINTSTS_ENUMDONE) {
+			/* Clear and handle Enumeration Done interrupt. */
+			sys_write32(USB_DWC2_GINTSTS_ENUMDONE, gintsts_reg);
+			dwc2_handle_enumdone(dev);
+			udc_submit_event(dev, UDC_EVT_RESET, 0);
 		}
 
-		n++;
-		/* Also check the number of desired OUT endpoints in devicetree. */
-		if (n >= config->num_out_eps) {
-			break;
+		if (int_status & USB_DWC2_GINTSTS_WKUPINT) {
+			/* Clear Resume/Remote Wakeup Detected interrupt. */
+			sys_write32(USB_DWC2_GINTSTS_WKUPINT, gintsts_reg);
+			udc_set_suspended(dev, false);
+			udc_submit_event(dev, UDC_EVT_RESUME, 0);
 		}
-	}
 
-	for (uint32_t i = 0, n = 0; i < numdeveps; i++) {
-		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(config->ghwcfg1, i);
+		if (int_status & USB_DWC2_GINTSTS_IEPINT) {
+			/* Handle IN Endpoints interrupt */
+			dwc2_handle_iepint(dev);
+		}
 
-		if (epdir != USB_DWC2_GHWCFG1_EPDIR_IN &&
-		    epdir != USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			continue;
+		if (int_status & USB_DWC2_GINTSTS_RXFLVL) {
+			/* Handle RxFIFO Non-Empty interrupt */
+			dwc2_handle_rxflvl(dev);
 		}
 
-		if (i == 0) {
-			config->ep_cfg_in[n].caps.control = 1;
-			config->ep_cfg_in[n].caps.mps = 64;
-		} else {
-			config->ep_cfg_in[n].caps.bulk = 1;
-			config->ep_cfg_in[n].caps.interrupt = 1;
-			config->ep_cfg_in[n].caps.iso = 1;
-			config->ep_cfg_in[n].caps.high_bandwidth = data->caps.hs;
-			config->ep_cfg_in[n].caps.mps = mps;
+		if (int_status & USB_DWC2_GINTSTS_OEPINT) {
+			/* Handle OUT Endpoints interrupt */
+			dwc2_handle_oepint(dev);
 		}
 
-		config->ep_cfg_in[n].caps.in = 1;
-		config->ep_cfg_in[n].addr = USB_EP_DIR_IN | i;
+		if (int_status & USB_DWC2_GINTSTS_INCOMPISOIN) {
+			dwc2_handle_incompisoin(dev);
+		}
 
-		LOG_DBG("Register ep 0x%02x (%u)", USB_EP_DIR_IN | i, n);
-		err = udc_register_ep(dev, &config->ep_cfg_in[n]);
-		if (err != 0) {
-			LOG_ERR("Failed to register endpoint");
-			return err;
+		if (int_status & USB_DWC2_GINTSTS_INCOMPISOOUT) {
+			dwc2_handle_incompisoout(dev);
 		}
 
-		n++;
-		/* Also check the number of desired IN endpoints in devicetree. */
-		if (n >= MIN(ineps, config->num_in_eps)) {
-			break;
+		if (int_status & USB_DWC2_GINTSTS_USBSUSP) {
+			if (!priv->enumdone) {
+				/* Clear stale suspend interrupt */
+				sys_write32(USB_DWC2_GINTSTS_USBSUSP, gintsts_reg);
+				continue;
+			}
+
+			/* Notify the stack */
+			udc_set_suspended(dev, true);
+			udc_submit_event(dev, UDC_EVT_SUSPEND, 0);
+
+			if (priv->suspend_type == DWC2_SUSPEND_HIBERNATION) {
+				dwc2_enter_hibernation(dev);
+				/* Next interrupt will be from PMU */
+				break;
+			}
+
+			/* Clear USB Suspend interrupt. */
+			sys_write32(USB_DWC2_GINTSTS_USBSUSP, gintsts_reg);
 		}
 	}
 
-	config->make_thread(dev);
-
-	return 0;
+	(void)dwc2_quirk_irq_clear(dev);
 }
 
-static int udc_dwc2_lock(const struct device *dev)
+static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 {
-	return udc_lock_internal(dev, K_FOREVER);
-}
+	const struct device *dev = (const struct device *)arg;
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	const struct udc_dwc2_config *const config = dev->config;
+	struct udc_ep_config *ep_cfg;
+	struct dwc2_drv_event evt;
 
-static int udc_dwc2_unlock(const struct device *dev)
-{
-	return udc_unlock_internal(dev);
+	/* This is the bottom-half of the ISR handler and the place where
+	 * a new transfer can be fed.
+	 */
+	k_msgq_get(&drv_msgq, &evt, K_FOREVER);
+	ep_cfg = udc_get_ep_cfg(dev, evt.ep);
+
+	switch (evt.type) {
+	case DWC2_DRV_EVT_XFER:
+		LOG_DBG("New transfer in the queue");
+		break;
+	case DWC2_DRV_EVT_SETUP:
+		LOG_DBG("SETUP event");
+		dwc2_handle_evt_setup(dev);
+		break;
+	case DWC2_DRV_EVT_DOUT:
+		LOG_DBG("DOUT event ep 0x%02x", ep_cfg->addr);
+		dwc2_handle_evt_dout(dev, ep_cfg);
+		break;
+	case DWC2_DRV_EVT_DIN:
+		LOG_DBG("DIN event");
+		dwc2_handle_evt_din(dev, ep_cfg);
+		break;
+	case DWC2_DRV_EVT_HIBERNATION_EXIT:
+		LOG_DBG("Hibernation exit event");
+		config->irq_disable_func(dev);
+
+		if (priv->hibernated) {
+			dwc2_exit_hibernation(dev);
+
+			/* Let stack know we are no longer suspended */
+			udc_set_suspended(dev, false);
+			udc_submit_event(dev, UDC_EVT_RESUME, 0);
+
+			if (evt.exit_reason == DWC2_HIBERNATION_EXIT_BUS_RESET) {
+				dwc2_on_bus_reset(dev);
+			}
+		}
+
+		config->irq_enable_func(dev);
+		break;
+	}
+
+	if (ep_cfg->addr != USB_CONTROL_EP_OUT && !udc_ep_is_busy(dev, ep_cfg->addr)) {
+		dwc2_handle_xfer_next(dev, ep_cfg);
+	} else {
+		LOG_DBG("ep 0x%02x busy", ep_cfg->addr);
+	}
 }
 
 static const struct udc_api udc_dwc2_api = {

From 3fbfd624af93f5f4f7514e25ff87ffd285279c80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Wed, 11 Sep 2024 15:29:41 +0200
Subject: [PATCH 0037/2913] [nrf fromtree] drivers: usb: udc_dwc2: Replace
 queue with events
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When the queue is full, all messages posted inside interrupt handlers
are simply dropped. This problem can be remedied by having the message
queue large enough, but determining the maximum number of messages that
can ever be posted in the system is really complex task.

Hopefully in DWC2 driver there is finite number of events that have to
be processed inside thread handler. Therefore it is unnecessary to
determine the maximum queue size for the events if the events are posted
to k_event object instead of send to k_msgq object.

Use combination of three k_event structures to handle all possible event
sources. This not only guarantees by design that no event will be lost,
but also slightly reduces the memory usage.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit c2f2d8ce5d9f7485892265d24dec8fb48de84e61)
(cherry picked from commit 25195b496dc0ae8295e3262b7c01b379937524b0)
(cherry picked from commit 392e3a2e91bbc988e169a46d504ec8523363f0d9)
---
 drivers/usb/udc/Kconfig.dwc2 |   9 +-
 drivers/usb/udc/udc_dwc2.c   | 215 +++++++++++++++++++++--------------
 2 files changed, 128 insertions(+), 96 deletions(-)

diff --git a/drivers/usb/udc/Kconfig.dwc2 b/drivers/usb/udc/Kconfig.dwc2
index 745429a94a1..4c023cfb04d 100644
--- a/drivers/usb/udc/Kconfig.dwc2
+++ b/drivers/usb/udc/Kconfig.dwc2
@@ -7,6 +7,7 @@ config UDC_DWC2
 	depends on DT_HAS_SNPS_DWC2_ENABLED
 	select NRFS if NRFS_HAS_VBUS_DETECTOR_SERVICE
 	select NRFS_VBUS_DETECTOR_SERVICE_ENABLED if NRFS_HAS_VBUS_DETECTOR_SERVICE
+	select EVENTS
 	help
 	  DWC2 USB device controller driver.
 
@@ -37,11 +38,3 @@ config UDC_DWC2_THREAD_PRIORITY
 	default 8
 	help
 	  DWC2 driver thread priority.
-
-config UDC_DWC2_MAX_QMESSAGES
-	int "UDC DWC2 maximum number of ISR event messages"
-	depends on UDC_DWC2
-	range 4 64
-	default 8
-	help
-	  DWC2 maximum number of ISR event messages.
diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 945c242bed4..4a8abafb957 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -29,32 +29,14 @@ enum dwc2_drv_event_type {
 	DWC2_DRV_EVT_XFER,
 	/* Setup packet received */
 	DWC2_DRV_EVT_SETUP,
-	/* OUT transaction for specific endpoint is finished */
-	DWC2_DRV_EVT_DOUT,
-	/* IN transaction for specific endpoint is finished */
-	DWC2_DRV_EVT_DIN,
-	/* Core should exit hibernation */
-	DWC2_DRV_EVT_HIBERNATION_EXIT,
+	/* Transaction on endpoint is finished */
+	DWC2_DRV_EVT_EP_FINISHED,
+	/* Core should exit hibernation due to bus reset */
+	DWC2_DRV_EVT_HIBERNATION_EXIT_BUS_RESET,
+	/* Core should exit hibernation due to host resume */
+	DWC2_DRV_EVT_HIBERNATION_EXIT_HOST_RESUME,
 };
 
-enum dwc2_hibernation_exit_reason {
-	DWC2_HIBERNATION_EXIT_BUS_RESET,
-	DWC2_HIBERNATION_EXIT_HOST_WAKEUP,
-};
-
-struct dwc2_drv_event {
-	const struct device *dev;
-	enum dwc2_drv_event_type type;
-	union {
-		uint8_t ep;
-		enum dwc2_hibernation_exit_reason exit_reason;
-	};
-};
-
-K_MSGQ_DEFINE(drv_msgq, sizeof(struct dwc2_drv_event),
-	      CONFIG_UDC_DWC2_MAX_QMESSAGES, sizeof(void *));
-
-
 /* Minimum RX FIFO size in 32-bit words considering the largest used OUT packet
  * of 512 bytes. The value must be adjusted according to the number of OUT
  * endpoints.
@@ -111,6 +93,12 @@ struct dwc2_reg_backup {
 /* Driver private data per instance */
 struct udc_dwc2_data {
 	struct k_thread thread_data;
+	/* Main events the driver thread waits for */
+	struct k_event drv_evt;
+	/* Transfer triggers (OUT on bits 0-15, IN on bits 16-31) */
+	struct k_event xfer_new;
+	/* Finished transactions (OUT on bits 0-15, IN on bits 16-31) */
+	struct k_event xfer_finished;
 	struct dwc2_reg_backup backup;
 	uint32_t ghwcfg1;
 	uint32_t txf_set;
@@ -1502,12 +1490,9 @@ static int udc_dwc2_ep_set_halt(const struct device *dev,
 static int udc_dwc2_ep_clear_halt(const struct device *dev,
 				  struct udc_ep_config *const cfg)
 {
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	mem_addr_t dxepctl_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
 	uint32_t dxepctl;
-	struct dwc2_drv_event evt = {
-		.ep = cfg->addr,
-		.type = DWC2_DRV_EVT_XFER,
-	};
 
 	dxepctl = sys_read32(dxepctl_reg);
 	dxepctl &= ~USB_DWC2_DEPCTL_STALL;
@@ -1519,7 +1504,16 @@ static int udc_dwc2_ep_clear_halt(const struct device *dev,
 
 	/* Resume queued transfers if any */
 	if (udc_buf_peek(dev, cfg->addr)) {
-		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+		uint32_t ep_bit;
+
+		if (USB_EP_DIR_IS_IN(cfg->addr)) {
+			ep_bit = BIT(16 + USB_EP_GET_IDX(cfg->addr));
+		} else {
+			ep_bit = BIT(USB_EP_GET_IDX(cfg->addr));
+		}
+
+		k_event_post(&priv->xfer_new, ep_bit);
+		k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
 	}
 
 	return 0;
@@ -1529,16 +1523,22 @@ static int udc_dwc2_ep_enqueue(const struct device *dev,
 			       struct udc_ep_config *const cfg,
 			       struct net_buf *const buf)
 {
-	struct dwc2_drv_event evt = {
-		.ep = cfg->addr,
-		.type = DWC2_DRV_EVT_XFER,
-	};
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
 
 	LOG_DBG("%p enqueue %x %p", dev, cfg->addr, buf);
 	udc_buf_put(cfg, buf);
 
 	if (!cfg->stat.halted) {
-		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+		uint32_t ep_bit;
+
+		if (USB_EP_DIR_IS_IN(cfg->addr)) {
+			ep_bit = BIT(16 + USB_EP_GET_IDX(cfg->addr));
+		} else {
+			ep_bit = BIT(USB_EP_GET_IDX(cfg->addr));
+		}
+
+		k_event_post(&priv->xfer_new, ep_bit);
+		k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
 	}
 
 	return 0;
@@ -2016,6 +2016,7 @@ static int udc_dwc2_shutdown(const struct device *dev)
 static int dwc2_driver_preinit(const struct device *dev)
 {
 	const struct udc_dwc2_config *config = dev->config;
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	struct udc_data *data = dev->data;
 	uint16_t mps = 1023;
 	uint32_t numdeveps;
@@ -2024,6 +2025,10 @@ static int dwc2_driver_preinit(const struct device *dev)
 
 	k_mutex_init(&data->mutex);
 
+	k_event_init(&priv->drv_evt);
+	k_event_init(&priv->xfer_new);
+	k_event_init(&priv->xfer_finished);
+
 	data->caps.addr_before_status = true;
 	data->caps.mps0 = UDC_MPS0_64;
 
@@ -2264,7 +2269,6 @@ static inline void dwc2_handle_in_xfercompl(const struct device *dev,
 {
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	struct udc_ep_config *ep_cfg;
-	struct dwc2_drv_event evt;
 	struct net_buf *buf;
 
 	ep_cfg = udc_get_ep_cfg(dev, ep_idx | USB_EP_DIR_IN);
@@ -2279,10 +2283,8 @@ static inline void dwc2_handle_in_xfercompl(const struct device *dev,
 		return;
 	}
 
-	evt.dev = dev;
-	evt.ep = ep_cfg->addr;
-	evt.type = DWC2_DRV_EVT_DIN;
-	k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+	k_event_post(&priv->xfer_finished, BIT(16 + ep_idx));
+	k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
 }
 
 static inline void dwc2_handle_iepint(const struct device *dev)
@@ -2326,7 +2328,6 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep_idx);
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	struct dwc2_drv_event evt;
 	uint32_t bcnt;
 	struct net_buf *buf;
 	uint32_t doeptsiz;
@@ -2341,9 +2342,6 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 		return;
 	}
 
-	evt.type = DWC2_DRV_EVT_DOUT;
-	evt.ep = ep_cfg->addr;
-
 	/* The original transfer size value is necessary here because controller
 	 * decreases the value for every byte stored.
 	 */
@@ -2391,7 +2389,8 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 	    net_buf_tailroom(buf)) {
 		dwc2_prep_rx(dev, buf, ep_cfg);
 	} else {
-		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+		k_event_post(&priv->xfer_finished, BIT(ep_idx));
+		k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
 	}
 }
 
@@ -2443,12 +2442,7 @@ static inline void dwc2_handle_oepint(const struct device *dev)
 		}
 
 		if (status & USB_DWC2_DOEPINT_SETUP) {
-			struct dwc2_drv_event evt = {
-				.type = DWC2_DRV_EVT_SETUP,
-				.ep = USB_CONTROL_EP_OUT,
-			};
-
-			k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+			k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_SETUP));
 		}
 
 		if (status & USB_DWC2_DOEPINT_STSPHSERCVD) {
@@ -2583,7 +2577,6 @@ static void udc_dwc2_isr_handler(const struct device *dev)
 	if (priv->hibernated) {
 		uint32_t gpwrdn = sys_read32((mem_addr_t)&base->gpwrdn);
 		bool reset, resume = false;
-		enum dwc2_hibernation_exit_reason exit_reason;
 
 		/* Clear interrupts */
 		sys_write32(gpwrdn, (mem_addr_t)&base->gpwrdn);
@@ -2591,22 +2584,17 @@ static void udc_dwc2_isr_handler(const struct device *dev)
 		if (gpwrdn & USB_DWC2_GPWRDN_LNSTSCHNG) {
 			resume = usb_dwc2_get_gpwrdn_linestate(gpwrdn) ==
 				 USB_DWC2_GPWRDN_LINESTATE_DM1DP0;
-			exit_reason = DWC2_HIBERNATION_EXIT_HOST_WAKEUP;
 		}
 
 		reset = gpwrdn & USB_DWC2_GPWRDN_RESETDETECTED;
-		if (reset) {
-			exit_reason = DWC2_HIBERNATION_EXIT_BUS_RESET;
-		}
 
-		if (reset || resume) {
-			struct dwc2_drv_event evt = {
-				.dev = dev,
-				.type = DWC2_DRV_EVT_HIBERNATION_EXIT,
-				.exit_reason = exit_reason,
-			};
+		if (resume) {
+			k_event_post(&priv->drv_evt,
+				     BIT(DWC2_DRV_EVT_HIBERNATION_EXIT_HOST_RESUME));
+		}
 
-			k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+		if (reset) {
+			k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_HIBERNATION_EXIT_BUS_RESET));
 		}
 
 		(void)dwc2_quirk_irq_clear(dev);
@@ -2700,40 +2688,98 @@ static void udc_dwc2_isr_handler(const struct device *dev)
 	(void)dwc2_quirk_irq_clear(dev);
 }
 
+static uint8_t pull_next_ep_from_bitmap(uint32_t *bitmap)
+{
+	unsigned int bit;
+
+	__ASSERT_NO_MSG(bitmap && *bitmap);
+
+	bit = find_lsb_set(*bitmap) - 1;
+	*bitmap &= ~BIT(bit);
+
+	if (bit >= 16) {
+		return USB_EP_DIR_IN | (bit - 16);
+	} else {
+		return USB_EP_DIR_OUT | bit;
+	}
+}
+
 static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 {
 	const struct device *dev = (const struct device *)arg;
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	const struct udc_dwc2_config *const config = dev->config;
 	struct udc_ep_config *ep_cfg;
-	struct dwc2_drv_event evt;
+	const uint32_t hibernation_exit_events = (BIT(DWC2_DRV_EVT_HIBERNATION_EXIT_BUS_RESET) |
+						  BIT(DWC2_DRV_EVT_HIBERNATION_EXIT_HOST_RESUME));
+	uint32_t prev;
+	uint32_t evt;
+	uint32_t eps;
+	uint8_t ep;
 
 	/* This is the bottom-half of the ISR handler and the place where
 	 * a new transfer can be fed.
 	 */
-	k_msgq_get(&drv_msgq, &evt, K_FOREVER);
-	ep_cfg = udc_get_ep_cfg(dev, evt.ep);
+	evt = k_event_wait(&priv->drv_evt, UINT32_MAX, false, K_FOREVER);
+
+	if (evt & BIT(DWC2_DRV_EVT_XFER)) {
+		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
+
+		LOG_DBG("New transfer(s) in the queue");
+		eps = k_event_test(&priv->xfer_new, UINT32_MAX);
+		k_event_clear(&priv->xfer_new, eps);
+
+		while (eps) {
+			ep = pull_next_ep_from_bitmap(&eps);
+			ep_cfg = udc_get_ep_cfg(dev, ep);
+
+			if (!udc_ep_is_busy(dev, ep_cfg->addr)) {
+				dwc2_handle_xfer_next(dev, ep_cfg);
+			} else {
+				LOG_DBG("ep 0x%02x busy", ep_cfg->addr);
+			}
+		}
+	}
+
+	if (evt & BIT(DWC2_DRV_EVT_EP_FINISHED)) {
+		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
+
+		eps = k_event_test(&priv->xfer_finished, UINT32_MAX);
+		k_event_clear(&priv->xfer_finished, eps);
+
+		while (eps) {
+			ep = pull_next_ep_from_bitmap(&eps);
+			ep_cfg = udc_get_ep_cfg(dev, ep);
+
+			if (USB_EP_DIR_IS_IN(ep)) {
+				LOG_DBG("DIN event ep 0x%02x", ep);
+				dwc2_handle_evt_din(dev, ep_cfg);
+			} else {
+				LOG_DBG("DOUT event ep 0x%02x", ep_cfg->addr);
+				dwc2_handle_evt_dout(dev, ep_cfg);
+			}
+
+			if (!udc_ep_is_busy(dev, ep_cfg->addr)) {
+				dwc2_handle_xfer_next(dev, ep_cfg);
+			} else {
+				LOG_DBG("ep 0x%02x busy", ep_cfg->addr);
+			}
+		}
+	}
+
+	if (evt & BIT(DWC2_DRV_EVT_SETUP)) {
+		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_SETUP));
 
-	switch (evt.type) {
-	case DWC2_DRV_EVT_XFER:
-		LOG_DBG("New transfer in the queue");
-		break;
-	case DWC2_DRV_EVT_SETUP:
 		LOG_DBG("SETUP event");
 		dwc2_handle_evt_setup(dev);
-		break;
-	case DWC2_DRV_EVT_DOUT:
-		LOG_DBG("DOUT event ep 0x%02x", ep_cfg->addr);
-		dwc2_handle_evt_dout(dev, ep_cfg);
-		break;
-	case DWC2_DRV_EVT_DIN:
-		LOG_DBG("DIN event");
-		dwc2_handle_evt_din(dev, ep_cfg);
-		break;
-	case DWC2_DRV_EVT_HIBERNATION_EXIT:
+	}
+
+	if (evt & hibernation_exit_events) {
 		LOG_DBG("Hibernation exit event");
 		config->irq_disable_func(dev);
 
+		prev = k_event_clear(&priv->drv_evt, hibernation_exit_events);
+
 		if (priv->hibernated) {
 			dwc2_exit_hibernation(dev);
 
@@ -2741,19 +2787,12 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 			udc_set_suspended(dev, false);
 			udc_submit_event(dev, UDC_EVT_RESUME, 0);
 
-			if (evt.exit_reason == DWC2_HIBERNATION_EXIT_BUS_RESET) {
+			if (prev & BIT(DWC2_DRV_EVT_HIBERNATION_EXIT_BUS_RESET)) {
 				dwc2_on_bus_reset(dev);
 			}
 		}
 
 		config->irq_enable_func(dev);
-		break;
-	}
-
-	if (ep_cfg->addr != USB_CONTROL_EP_OUT && !udc_ep_is_busy(dev, ep_cfg->addr)) {
-		dwc2_handle_xfer_next(dev, ep_cfg);
-	} else {
-		LOG_DBG("ep 0x%02x busy", ep_cfg->addr);
 	}
 }
 

From afad96006715f63a4607e141c8e9a9d94023f074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Thu, 12 Sep 2024 08:50:03 +0200
Subject: [PATCH 0038/2913] [nrf fromtree] drivers: usb: udc_dwc2: Synchronize
 thread with UDC API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

UDC API handlers and DWC2 driver thread share not only software
constructs, but also the underlying hardware. Ensure that any UDC API
call is not preempted by DWC2 driver thread (and vice versa) by
acquiring the lock in thread handler.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 5fc0405a6f9521bf16121265902bf247b8af209d)
(cherry picked from commit 56b2d1237fbadf2a46d844b4421fe91b3eecb645)
(cherry picked from commit c2d9ac10ed2a5a7dd72ab8c077988c5d9b8d34d7)
---
 drivers/usb/udc/udc_dwc2.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 4a8abafb957..fcdb22afdb1 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -2722,6 +2722,8 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 	 */
 	evt = k_event_wait(&priv->drv_evt, UINT32_MAX, false, K_FOREVER);
 
+	udc_lock_internal(dev, K_FOREVER);
+
 	if (evt & BIT(DWC2_DRV_EVT_XFER)) {
 		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
 
@@ -2794,6 +2796,8 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 
 		config->irq_enable_func(dev);
 	}
+
+	udc_unlock_internal(dev);
 }
 
 static const struct udc_api udc_dwc2_api = {

From 6246b5ac6d54e09fbc31c9b3ef49972f7f8567d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Fri, 20 Sep 2024 10:37:03 +0200
Subject: [PATCH 0039/2913] [nrf fromtree] drivers: usb: udc_dwc2: Enter
 hibernation in thread
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enter hibernation in thread context with the lock held to make sure to
not queue any transfers when the core is hibernated.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit f7650262bfd44ba816991fb8e6cafe0d62364426)
(cherry picked from commit d4046ffbcbc2131b7957af2c5735bff0e6f9c69b)
(cherry picked from commit 029cd92596063feb161ee85ccbc1b54ed2e99005)
---
 drivers/usb/udc/udc_dwc2.c | 107 ++++++++++++++++++++++++++++---------
 1 file changed, 83 insertions(+), 24 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index fcdb22afdb1..d21163345a2 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -31,6 +31,8 @@ enum dwc2_drv_event_type {
 	DWC2_DRV_EVT_SETUP,
 	/* Transaction on endpoint is finished */
 	DWC2_DRV_EVT_EP_FINISHED,
+	/* Core should enter hibernation */
+	DWC2_DRV_EVT_ENTER_HIBERNATION,
 	/* Core should exit hibernation due to bus reset */
 	DWC2_DRV_EVT_HIBERNATION_EXIT_BUS_RESET,
 	/* Core should exit hibernation due to host resume */
@@ -1075,6 +1077,18 @@ static void dwc2_exit_hibernation(const struct device *dev)
 	LOG_DBG("Hibernation exit complete");
 }
 
+static void cancel_hibernation_request(struct udc_dwc2_data *const priv)
+{
+	k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_ENTER_HIBERNATION));
+}
+
+static void request_hibernation(struct udc_dwc2_data *const priv)
+{
+	if (priv->suspend_type == DWC2_SUSPEND_HIBERNATION) {
+		k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_ENTER_HIBERNATION));
+	}
+}
+
 static void dwc2_unset_unused_fifo(const struct device *dev)
 {
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
@@ -2624,6 +2638,8 @@ static void udc_dwc2_isr_handler(const struct device *dev)
 			sys_write32(USB_DWC2_GINTSTS_USBRST, gintsts_reg);
 			dwc2_on_bus_reset(dev);
 			LOG_DBG("USB Reset interrupt");
+
+			cancel_hibernation_request(priv);
 		}
 
 		if (int_status & USB_DWC2_GINTSTS_ENUMDONE) {
@@ -2638,6 +2654,8 @@ static void udc_dwc2_isr_handler(const struct device *dev)
 			sys_write32(USB_DWC2_GINTSTS_WKUPINT, gintsts_reg);
 			udc_set_suspended(dev, false);
 			udc_submit_event(dev, UDC_EVT_RESUME, 0);
+
+			cancel_hibernation_request(priv);
 		}
 
 		if (int_status & USB_DWC2_GINTSTS_IEPINT) {
@@ -2664,9 +2682,11 @@ static void udc_dwc2_isr_handler(const struct device *dev)
 		}
 
 		if (int_status & USB_DWC2_GINTSTS_USBSUSP) {
+			/* Clear USB Suspend interrupt. */
+			sys_write32(USB_DWC2_GINTSTS_USBSUSP, gintsts_reg);
+
 			if (!priv->enumdone) {
-				/* Clear stale suspend interrupt */
-				sys_write32(USB_DWC2_GINTSTS_USBSUSP, gintsts_reg);
+				/* Ignore stale suspend interrupt */
 				continue;
 			}
 
@@ -2674,20 +2694,41 @@ static void udc_dwc2_isr_handler(const struct device *dev)
 			udc_set_suspended(dev, true);
 			udc_submit_event(dev, UDC_EVT_SUSPEND, 0);
 
-			if (priv->suspend_type == DWC2_SUSPEND_HIBERNATION) {
-				dwc2_enter_hibernation(dev);
-				/* Next interrupt will be from PMU */
-				break;
-			}
-
-			/* Clear USB Suspend interrupt. */
-			sys_write32(USB_DWC2_GINTSTS_USBSUSP, gintsts_reg);
+			request_hibernation(priv);
 		}
 	}
 
 	(void)dwc2_quirk_irq_clear(dev);
 }
 
+static void dwc2_handle_hibernation_exit(const struct device *dev,
+					 bool bus_reset)
+{
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+
+	dwc2_exit_hibernation(dev);
+
+	/* Let stack know we are no longer suspended */
+	udc_set_suspended(dev, false);
+	udc_submit_event(dev, UDC_EVT_RESUME, 0);
+
+	if (bus_reset) {
+		/* Clear all pending transfers */
+		k_event_clear(&priv->xfer_new, UINT32_MAX);
+		k_event_clear(&priv->xfer_finished, UINT32_MAX);
+		dwc2_on_bus_reset(dev);
+	} else {
+		/* Resume any pending transfer handling */
+		if (k_event_test(&priv->xfer_new, UINT32_MAX)) {
+			k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
+		}
+
+		if (k_event_test(&priv->xfer_finished, UINT32_MAX)) {
+			k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
+		}
+	}
+}
+
 static uint8_t pull_next_ep_from_bitmap(uint32_t *bitmap)
 {
 	unsigned int bit;
@@ -2727,9 +2768,14 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 	if (evt & BIT(DWC2_DRV_EVT_XFER)) {
 		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
 
-		LOG_DBG("New transfer(s) in the queue");
-		eps = k_event_test(&priv->xfer_new, UINT32_MAX);
-		k_event_clear(&priv->xfer_new, eps);
+		if (!priv->hibernated) {
+			LOG_DBG("New transfer(s) in the queue");
+			eps = k_event_test(&priv->xfer_new, UINT32_MAX);
+			k_event_clear(&priv->xfer_new, eps);
+		} else {
+			/* Events will be handled after hibernation exit */
+			eps = 0;
+		}
 
 		while (eps) {
 			ep = pull_next_ep_from_bitmap(&eps);
@@ -2746,8 +2792,13 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 	if (evt & BIT(DWC2_DRV_EVT_EP_FINISHED)) {
 		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
 
-		eps = k_event_test(&priv->xfer_finished, UINT32_MAX);
-		k_event_clear(&priv->xfer_finished, eps);
+		if (!priv->hibernated) {
+			eps = k_event_test(&priv->xfer_finished, UINT32_MAX);
+			k_event_clear(&priv->xfer_finished, eps);
+		} else {
+			/* Events will be handled after hibernation exit */
+			eps = 0;
+		}
 
 		while (eps) {
 			ep = pull_next_ep_from_bitmap(&eps);
@@ -2776,22 +2827,30 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 		dwc2_handle_evt_setup(dev);
 	}
 
+	if (evt & BIT(DWC2_DRV_EVT_ENTER_HIBERNATION)) {
+		config->irq_disable_func(dev);
+
+		prev = k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_ENTER_HIBERNATION));
+
+		/* Only enter hibernation if IRQ did not cancel the request */
+		if (prev & BIT(DWC2_DRV_EVT_ENTER_HIBERNATION)) {
+			dwc2_enter_hibernation(dev);
+		}
+
+		config->irq_enable_func(dev);
+	}
+
 	if (evt & hibernation_exit_events) {
+		bool bus_reset;
+
 		LOG_DBG("Hibernation exit event");
 		config->irq_disable_func(dev);
 
 		prev = k_event_clear(&priv->drv_evt, hibernation_exit_events);
+		bus_reset = prev & BIT(DWC2_DRV_EVT_HIBERNATION_EXIT_BUS_RESET);
 
 		if (priv->hibernated) {
-			dwc2_exit_hibernation(dev);
-
-			/* Let stack know we are no longer suspended */
-			udc_set_suspended(dev, false);
-			udc_submit_event(dev, UDC_EVT_RESUME, 0);
-
-			if (prev & BIT(DWC2_DRV_EVT_HIBERNATION_EXIT_BUS_RESET)) {
-				dwc2_on_bus_reset(dev);
-			}
+			dwc2_handle_hibernation_exit(dev, bus_reset);
 		}
 
 		config->irq_enable_func(dev);

From 0bb05fc87ef6c31b2562c5c1a2e525ac52ce6d50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Fri, 20 Sep 2024 10:39:48 +0200
Subject: [PATCH 0040/2913] [nrf fromtree] drivers: usb: udc_dwc2: Exit
 hibernation on disable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The PMU is not reset by core reset and therefore it is necessary to exit
hibernation on DWC2 disable to prevent endless PMU interrupt loop when
the driver is enabled again.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit b89b7ed54270ca839741ddcac3a0d9256bcb1b4c)
(cherry picked from commit 60a9e99c8b7ea6cb5f12eba877b3bc6ffb863f00)
(cherry picked from commit 7b629eef484f6a090e64fc7e8f709bbb52c8f63a)
---
 drivers/usb/udc/udc_dwc2.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index d21163345a2..54a946c5b05 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -1070,11 +1070,6 @@ static void dwc2_exit_hibernation(const struct device *dev)
 	sys_set_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_PWRONPRGDONE);
 	k_msleep(1);
 	sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
-
-	dwc2_restore_device_registers(dev);
-
-	priv->hibernated = 0;
-	LOG_DBG("Hibernation exit complete");
 }
 
 static void cancel_hibernation_request(struct udc_dwc2_data *const priv)
@@ -1971,6 +1966,7 @@ static int udc_dwc2_enable(const struct device *dev)
 static int udc_dwc2_disable(const struct device *dev)
 {
 	const struct udc_dwc2_config *const config = dev->config;
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
 	mem_addr_t dctl_reg = (mem_addr_t)&base->dctl;
 	int err;
@@ -1990,6 +1986,12 @@ static int udc_dwc2_disable(const struct device *dev)
 	}
 
 	config->irq_disable_func(dev);
+
+	if (priv->hibernated) {
+		dwc2_exit_hibernation(dev);
+		priv->hibernated = 0;
+	}
+
 	sys_clear_bits((mem_addr_t)&base->gahbcfg, USB_DWC2_GAHBCFG_GLBINTRMASK);
 
 	err = dwc2_quirk_disable(dev);
@@ -2707,6 +2709,10 @@ static void dwc2_handle_hibernation_exit(const struct device *dev,
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
 
 	dwc2_exit_hibernation(dev);
+	dwc2_restore_device_registers(dev);
+
+	priv->hibernated = 0;
+	LOG_DBG("Hibernation exit complete");
 
 	/* Let stack know we are no longer suspended */
 	udc_set_suspended(dev, false);

From b1e82943f4c71b0e78b2111990c6abebf71eaf49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Thu, 12 Sep 2024 12:09:45 +0200
Subject: [PATCH 0041/2913] [nrf fromtree] drivers: udc_dwc2: Add missing
 GHWCFG bit defines
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add missing GHWCFG2 and GHWCFG3 defines based on nRF54H20 registers
documentation.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 68b8818e022c6e828dd2ce2dcb099b8ecfd891b4)
(cherry picked from commit 86074178092d8f99fdd890ab431a33cf15b1afe8)
(cherry picked from commit 861afa1d3bceb88f29127092764d31baa61ee9ab)
---
 drivers/usb/common/usb_dwc2_hw.h | 35 ++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/drivers/usb/common/usb_dwc2_hw.h b/drivers/usb/common/usb_dwc2_hw.h
index f36a2a17ca3..fcb35489a04 100644
--- a/drivers/usb/common/usb_dwc2_hw.h
+++ b/drivers/usb/common/usb_dwc2_hw.h
@@ -350,8 +350,27 @@ USB_DWC2_GET_FIELD_AND_IDX_DEFINE(ghwcfg1_epdir, GHWCFG1_EPDIR)
 
 /* GHWCFG2 register */
 #define USB_DWC2_GHWCFG2			0x0048UL
+#define USB_DWC2_GHWCFG2_TKNQDEPTH_POS		26UL
+#define USB_DWC2_GHWCFG2_TKNQDEPTH_MASK		(0x1FUL << USB_DWC2_GHWCFG2_TKNQDEPTH_POS)
+#define USB_DWC2_GHWCFG2_PTXQDEPTH_POS		24UL
+#define USB_DWC2_GHWCFG2_PTXQDEPTH_MASK		(0x3UL << USB_DWC2_GHWCFG2_PTXQDEPTH_POS)
+#define USB_DWC2_GHWCFG2_PTXQDEPTH_QUE16	3
+#define USB_DWC2_GHWCFG2_PTXQDEPTH_QUE8		2
+#define USB_DWC2_GHWCFG2_PTXQDEPTH_QUE4		1
+#define USB_DWC2_GHWCFG2_PTXQDEPTH_QUE2		0
+#define USB_DWC2_GHWCFG2_NPTXQDEPTH_POS		22UL
+#define USB_DWC2_GHWCFG2_NPTXQDEPTH_MASK	(0x3UL << USB_DWC2_GHWCFG2_NPTXQDEPTH_POS)
+#define USB_DWC2_GHWCFG2_NPTXQDEPTH_EIGHT	2
+#define USB_DWC2_GHWCFG2_NPTXQDEPTH_FOUR	1
+#define USB_DWC2_GHWCFG2_NPTXQDEPTH_TWO		0
+#define USB_DWC2_GHWCFG2_MULTIPROCINTRPT_POS	20UL
+#define USB_DWC2_GHWCFG2_MULTIPROCINTRPT	BIT(USB_DWC2_GHWCFG2_MULTIPROCINTRPT_POS)
 #define USB_DWC2_GHWCFG2_DYNFIFOSIZING_POS	19UL
 #define USB_DWC2_GHWCFG2_DYNFIFOSIZING		BIT(USB_DWC2_GHWCFG2_DYNFIFOSIZING_POS)
+#define USB_DWC2_GHWCFG2_PERIOSUPPORT_POS	18UL
+#define USB_DWC2_GHWCFG2_PERIOSUPPORT		BIT(USB_DWC2_GHWCFG2_PERIOSUPPORT_POS)
+#define USB_DWC2_GHWCFG2_NUMHSTCHNL_POS		14UL
+#define USB_DWC2_GHWCFG2_NUMHSTCHNL_MASK	(0xFUL << USB_DWC2_GHWCFG2_NUMHSTCHNL_POS)
 #define USB_DWC2_GHWCFG2_NUMDEVEPS_POS		10UL
 #define USB_DWC2_GHWCFG2_NUMDEVEPS_MASK		(0xFUL << USB_DWC2_GHWCFG2_NUMDEVEPS_POS)
 #define USB_DWC2_GHWCFG2_FSPHYTYPE_POS		8UL
@@ -366,6 +385,8 @@ USB_DWC2_GET_FIELD_AND_IDX_DEFINE(ghwcfg1_epdir, GHWCFG1_EPDIR)
 #define USB_DWC2_GHWCFG2_HSPHYTYPE_ULPI		2
 #define USB_DWC2_GHWCFG2_HSPHYTYPE_UTMIPLUS	1
 #define USB_DWC2_GHWCFG2_HSPHYTYPE_NO_HS	0
+#define USB_DWC2_GHWCFG2_SINGPNT_POS		5UL
+#define USB_DWC2_GHWCFG2_SINGPNT		BIT(USB_DWC2_GHWCFG2_SINGPNT_POS)
 #define USB_DWC2_GHWCFG2_OTGARCH_POS		3UL
 #define USB_DWC2_GHWCFG2_OTGARCH_MASK		(0x3UL << USB_DWC2_GHWCFG2_OTGARCH_POS)
 #define USB_DWC2_GHWCFG2_OTGARCH_INTERNALDMA	2
@@ -381,6 +402,10 @@ USB_DWC2_GET_FIELD_AND_IDX_DEFINE(ghwcfg1_epdir, GHWCFG1_EPDIR)
 #define USB_DWC2_GHWCFG2_OTGMODE_SRPOTG		1
 #define USB_DWC2_GHWCFG2_OTGMODE_HNPSRP		0
 
+USB_DWC2_GET_FIELD_DEFINE(ghwcfg2_tknqdepth, GHWCFG2_TKNQDEPTH)
+USB_DWC2_GET_FIELD_DEFINE(ghwcfg2_ptxqdepth, GHWCFG2_PTXQDEPTH)
+USB_DWC2_GET_FIELD_DEFINE(ghwcfg2_nptxqdepth, GHWCFG2_NPTXQDEPTH)
+USB_DWC2_GET_FIELD_DEFINE(ghwcfg2_numhstchnl, GHWCFG2_NUMHSTCHNL)
 USB_DWC2_GET_FIELD_DEFINE(ghwcfg2_numdeveps, GHWCFG2_NUMDEVEPS)
 USB_DWC2_GET_FIELD_DEFINE(ghwcfg2_fsphytype, GHWCFG2_FSPHYTYPE)
 USB_DWC2_GET_FIELD_DEFINE(ghwcfg2_hsphytype, GHWCFG2_HSPHYTYPE)
@@ -393,10 +418,20 @@ USB_DWC2_GET_FIELD_DEFINE(ghwcfg2_otgmode, GHWCFG2_OTGMODE)
 #define USB_DWC2_GHWCFG3_DFIFODEPTH_MASK	(0xFFFFUL << USB_DWC2_GHWCFG3_DFIFODEPTH_POS)
 #define USB_DWC2_GHWCFG3_LPMMODE_POS		15UL
 #define USB_DWC2_GHWCFG3_LPMMODE		BIT(USB_DWC2_GHWCFG3_LPMMODE_POS)
+#define USB_DWC2_GHWCFG3_BCSUPPORT_POS		14UL
+#define USB_DWC2_GHWCFG3_BCSUPPORT		BIT(USB_DWC2_GHWCFG3_BCSUPPORT_POS)
+#define USB_DWC2_GHWCFG3_HSICMODE_POS		13UL
+#define USB_DWC2_GHWCFG3_HSICMODE		BIT(USB_DWC2_GHWCFG3_HSICMODE_POS)
+#define USB_DWC2_GHWCFG3_ADPSUPPORT_POS		12UL
+#define USB_DWC2_GHWCFG3_ADPSUPPORT		BIT(USB_DWC2_GHWCFG3_ADPSUPPORT_POS)
+#define USB_DWC2_GHWCFG3_RSTTYPE_POS		11UL
+#define USB_DWC2_GHWCFG3_RSTTYPE		BIT(USB_DWC2_GHWCFG3_RSTTYPE_POS)
 #define USB_DWC2_GHWCFG3_OPTFEATURE_POS		10UL
 #define USB_DWC2_GHWCFG3_OPTFEATURE		BIT(USB_DWC2_GHWCFG3_OPTFEATURE_POS)
 #define USB_DWC2_GHWCFG3_VNDCTLSUPT_POS		9UL
 #define USB_DWC2_GHWCFG3_VNDCTLSUPT		BIT(USB_DWC2_GHWCFG3_VNDCTLSUPT_POS)
+#define USB_DWC2_GHWCFG3_I2CINTSEL_POS		8UL
+#define USB_DWC2_GHWCFG3_I2CINTSEL		BIT(USB_DWC2_GHWCFG3_I2CINTSEL)
 #define USB_DWC2_GHWCFG3_OTGEN_POS		7UL
 #define USB_DWC2_GHWCFG3_OTGEN			BIT(USB_DWC2_GHWCFG3_OTGEN_POS)
 #define USB_DWC2_GHWCFG3_PKTSIZEWIDTH_POS	4UL

From 13117f600e5527e9b2d7698384de4ad23e502d05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Thu, 12 Sep 2024 11:10:19 +0200
Subject: [PATCH 0042/2913] [nrf fromtree] drivers: usb: udc_dwc2: Support
 Remote Wakeup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

According to USB 2.0 Specification the remote wakeup device must hold
the resume signaling for at least 1 ms but for no more than 15 ms. The
DWC2 otg controller requires the software to drive the remote wakeup
signalling for appropriate duration (when LPM is disabled, which is
currently always the case in udc_dwc2). Arbitrarily choose to drive the
resume signalling for 2 ms to have sufficient margin in both directions.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit ac7d55b939598e702f5a118c8d31e2c0704769e8)
(cherry picked from commit 66974c6a67adde527779a7890d449d8d7f166f1b)
(cherry picked from commit b415a853a75912a764222e15a9675200f320e8fc)
---
 drivers/usb/udc/udc_dwc2.c | 110 +++++++++++++++++++++++++++++++------
 1 file changed, 93 insertions(+), 17 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 54a946c5b05..2e56a9de180 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -31,6 +31,8 @@ enum dwc2_drv_event_type {
 	DWC2_DRV_EVT_SETUP,
 	/* Transaction on endpoint is finished */
 	DWC2_DRV_EVT_EP_FINISHED,
+	/* Remote Wakeup should be initiated */
+	DWC2_DRV_EVT_REMOTE_WAKEUP,
 	/* Core should enter hibernation */
 	DWC2_DRV_EVT_ENTER_HIBERNATION,
 	/* Core should exit hibernation due to bus reset */
@@ -115,6 +117,7 @@ struct udc_dwc2_data {
 	/* Configuration flags */
 	unsigned int dynfifosizing : 1;
 	unsigned int bufferdma : 1;
+	unsigned int syncrst : 1;
 	/* Runtime state flags */
 	unsigned int hibernated : 1;
 	unsigned int enumdone : 1;
@@ -900,7 +903,8 @@ static void dwc2_backup_registers(const struct device *dev)
 	backup->pcgcctl = sys_read32((mem_addr_t)&base->pcgcctl);
 }
 
-static void dwc2_restore_essential_registers(const struct device *dev)
+static void dwc2_restore_essential_registers(const struct device *dev,
+					     bool rwup)
 {
 	const struct udc_dwc2_config *const config = dev->config;
 	struct usb_dwc2_reg *const base = config->base;
@@ -921,7 +925,9 @@ static void dwc2_restore_essential_registers(const struct device *dev)
 	sys_write32(backup->gusbcfg, (mem_addr_t)&base->gusbcfg);
 	sys_write32(backup->dcfg, (mem_addr_t)&base->dcfg);
 
-	pcgcctl |= USB_DWC2_PCGCCTL_RESTOREMODE | USB_DWC2_PCGCCTL_RSTPDWNMODULE;
+	if (!rwup) {
+		pcgcctl |= USB_DWC2_PCGCCTL_RESTOREMODE | USB_DWC2_PCGCCTL_RSTPDWNMODULE;
+	}
 	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
 	k_busy_wait(1);
 
@@ -929,7 +935,7 @@ static void dwc2_restore_essential_registers(const struct device *dev)
 	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
 }
 
-static void dwc2_restore_device_registers(const struct device *dev)
+static void dwc2_restore_device_registers(const struct device *dev, bool rwup)
 {
 	const struct udc_dwc2_config *const config = dev->config;
 	struct usb_dwc2_reg *const base = config->base;
@@ -948,7 +954,10 @@ static void dwc2_restore_device_registers(const struct device *dev)
 		sys_write32(backup->dieptxf[i - 1], (mem_addr_t)&base->dieptxf[i - 1]);
 	}
 
-	sys_write32(backup->dctl, (mem_addr_t)&base->dctl);
+	if (!rwup) {
+		sys_write32(backup->dctl, (mem_addr_t)&base->dctl);
+	}
+
 	sys_write32(backup->diepmsk, (mem_addr_t)&base->diepmsk);
 	sys_write32(backup->doepmsk, (mem_addr_t)&base->doepmsk);
 	sys_write32(backup->daintmsk, (mem_addr_t)&base->daintmsk);
@@ -1015,7 +1024,7 @@ static void dwc2_enter_hibernation(const struct device *dev)
 	LOG_DBG("Hibernated");
 }
 
-static void dwc2_exit_hibernation(const struct device *dev)
+static void dwc2_exit_hibernation(const struct device *dev, bool rwup)
 {
 	const struct udc_dwc2_config *const config = dev->config;
 	struct usb_dwc2_reg *const base = config->base;
@@ -1038,6 +1047,14 @@ static void dwc2_exit_hibernation(const struct device *dev)
 	/* Disable power clamps */
 	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNCLMP);
 
+	if (rwup) {
+		if (priv->syncrst) {
+			k_busy_wait(1);
+		} else {
+			k_busy_wait(50);
+		}
+	}
+
 	/* Remove reset to the controller */
 	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNRST_N);
 	k_busy_wait(1);
@@ -1045,7 +1062,9 @@ static void dwc2_exit_hibernation(const struct device *dev)
 	/* Disable PMU interrupt */
 	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUINTSEL);
 
-	dwc2_restore_essential_registers(dev);
+	dwc2_restore_essential_registers(dev, rwup);
+
+	/* Note: in Remote Wakeup case 15 ms max signaling time starts now */
 
 	/* Wait for Restore Done Interrupt */
 	dwc2_wait_for_bit(dev, (mem_addr_t)&base->gintsts, USB_DWC2_GINTSTS_RSTRDONEINT);
@@ -1055,8 +1074,10 @@ static void dwc2_exit_hibernation(const struct device *dev)
 	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_RESTORE);
 	k_busy_wait(1);
 
-	/* Clear reset to power down module */
-	sys_clear_bits(pcgcctl_reg, USB_DWC2_PCGCCTL_RSTPDWNMODULE);
+	if (!rwup) {
+		/* Clear reset to power down module */
+		sys_clear_bits(pcgcctl_reg, USB_DWC2_PCGCCTL_RSTPDWNMODULE);
+	}
 
 	/* Restore GUSBCFG, DCFG and DCTL */
 	sys_write32(priv->backup.gusbcfg, (mem_addr_t)&base->gusbcfg);
@@ -1065,9 +1086,15 @@ static void dwc2_exit_hibernation(const struct device *dev)
 
 	/* Disable PMU */
 	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUACTV);
-	k_busy_wait(5);
+	if (!rwup) {
+		k_busy_wait(5);
+		sys_set_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_PWRONPRGDONE);
+	} else {
+		k_busy_wait(1);
+		sys_write32(USB_DWC2_DCTL_RMTWKUPSIG | priv->backup.dctl,
+			    (mem_addr_t)&base->dctl);
+	}
 
-	sys_set_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_PWRONPRGDONE);
 	k_msleep(1);
 	sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
 }
@@ -1621,9 +1648,13 @@ static int udc_dwc2_test_mode(const struct device *dev,
 
 static int udc_dwc2_host_wakeup(const struct device *dev)
 {
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+
 	LOG_DBG("Remote wakeup from %p", dev);
 
-	return -ENOTSUP;
+	k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_REMOTE_WAKEUP));
+
+	return 0;
 }
 
 /* Return actual USB device speed */
@@ -1785,6 +1816,10 @@ static int udc_dwc2_init_controller(const struct device *dev)
 	LOG_DBG("LPM mode is %s",
 		(ghwcfg3 & USB_DWC2_GHWCFG3_LPMMODE) ? "enabled" : "disabled");
 
+	if (ghwcfg3 & USB_DWC2_GHWCFG3_RSTTYPE) {
+		priv->syncrst = 1;
+	}
+
 	/* Configure AHB, select Completer or DMA mode */
 	gahbcfg = sys_read32(gahbcfg_reg);
 
@@ -1988,7 +2023,7 @@ static int udc_dwc2_disable(const struct device *dev)
 	config->irq_disable_func(dev);
 
 	if (priv->hibernated) {
-		dwc2_exit_hibernation(dev);
+		dwc2_exit_hibernation(dev, false);
 		priv->hibernated = 0;
 	}
 
@@ -2045,6 +2080,7 @@ static int dwc2_driver_preinit(const struct device *dev)
 	k_event_init(&priv->xfer_new);
 	k_event_init(&priv->xfer_finished);
 
+	data->caps.rwup = true;
 	data->caps.addr_before_status = true;
 	data->caps.mps0 = UDC_MPS0_64;
 
@@ -2704,20 +2740,36 @@ static void udc_dwc2_isr_handler(const struct device *dev)
 }
 
 static void dwc2_handle_hibernation_exit(const struct device *dev,
-					 bool bus_reset)
+					 bool rwup, bool bus_reset)
 {
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
 
-	dwc2_exit_hibernation(dev);
-	dwc2_restore_device_registers(dev);
+	dwc2_exit_hibernation(dev, rwup);
+	dwc2_restore_device_registers(dev, rwup);
 
 	priv->hibernated = 0;
-	LOG_DBG("Hibernation exit complete");
+	if (!rwup) {
+		LOG_DBG("Hibernation exit complete");
+	}
 
 	/* Let stack know we are no longer suspended */
 	udc_set_suspended(dev, false);
 	udc_submit_event(dev, UDC_EVT_RESUME, 0);
 
+	if (rwup) {
+		/* Resume has been driven for at least 1 ms now, do 1 ms more to
+		 * have sufficient margin.
+		 */
+		k_msleep(1);
+
+		sys_clear_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_RMTWKUPSIG);
+	}
+
+	if (rwup) {
+		LOG_DBG("Hibernation exit on Remote Wakeup complete");
+	}
+
 	if (bus_reset) {
 		/* Clear all pending transfers */
 		k_event_clear(&priv->xfer_new, UINT32_MAX);
@@ -2754,6 +2806,7 @@ static uint8_t pull_next_ep_from_bitmap(uint32_t *bitmap)
 static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 {
 	const struct device *dev = (const struct device *)arg;
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	const struct udc_dwc2_config *const config = dev->config;
 	struct udc_ep_config *ep_cfg;
@@ -2833,6 +2886,29 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 		dwc2_handle_evt_setup(dev);
 	}
 
+	if (evt & BIT(DWC2_DRV_EVT_REMOTE_WAKEUP)) {
+		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_REMOTE_WAKEUP) |
+			      BIT(DWC2_DRV_EVT_ENTER_HIBERNATION));
+
+		if (priv->hibernated) {
+			config->irq_disable_func(dev);
+
+			dwc2_handle_hibernation_exit(dev, true, false);
+
+			config->irq_enable_func(dev);
+		} else {
+			sys_set_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_RMTWKUPSIG);
+
+			udc_set_suspended(dev, false);
+			udc_submit_event(dev, UDC_EVT_RESUME, 0);
+
+			/* Drive resume for 2 ms to have sufficient margin */
+			k_msleep(2);
+
+			sys_clear_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_RMTWKUPSIG);
+		}
+	}
+
 	if (evt & BIT(DWC2_DRV_EVT_ENTER_HIBERNATION)) {
 		config->irq_disable_func(dev);
 
@@ -2856,7 +2932,7 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 		bus_reset = prev & BIT(DWC2_DRV_EVT_HIBERNATION_EXIT_BUS_RESET);
 
 		if (priv->hibernated) {
-			dwc2_handle_hibernation_exit(dev, bus_reset);
+			dwc2_handle_hibernation_exit(dev, false, bus_reset);
 		}
 
 		config->irq_enable_func(dev);

From 97e7184811de512fcf2d442deb20769ee944a5e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Tue, 24 Sep 2024 11:37:16 +0200
Subject: [PATCH 0043/2913] [nrf fromtree] boards: nrf54h20dk: Allow running
 USB on radio core
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add the necessary entries but keep the usbhs disabled by default on
radio core (it is enabled by default on app core).

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 9815f43fd00252b8266092ff9db8d5b982ea53b0)
(cherry picked from commit 52a640d0ce4fb76770431e53e5e6e71aee407aa6)
(cherry picked from commit a810f99db783437198a58b19c09d24ea4cafb9a4)
---
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts | 4 ++++
 soc/nordic/nrf54h/Kconfig                               | 1 +
 2 files changed, 5 insertions(+)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
index 31c345899cd..31827405f5f 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
@@ -112,3 +112,7 @@ ipc0: &cpuapp_cpurad_ipc {
 &cpurad_ieee802154 {
 	status = "okay";
 };
+
+zephyr_udc0: &usbhs {
+	status = "disabled";
+};
diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
index 1cad8917162..dd647174b14 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -43,6 +43,7 @@ config SOC_NRF54H20_CPURAD
 	select NRFS_HAS_CLOCK_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
+	select NRFS_HAS_VBUS_DETECTOR_SERVICE
 	select HAS_NORDIC_DMM
 	select HAS_PM
 	select HAS_POWEROFF

From 4a996a830b3d4bc7d8e06595efc1c485b4b1e4c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Thu, 19 Sep 2024 09:16:56 +0200
Subject: [PATCH 0044/2913] [nrf fromtree] drivers: udc_dwc2: Add hibernation
 vendor quirks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make it possible to have vendor quirks after hibernation entry sequence
and before hibernation exit sequence.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit f8df6b49e1a33146652e491b13b192ad1ed15b54)
(cherry picked from commit 66affc7a50a18e0d47cc0b2e3f8389d5b090f2ba)
(cherry picked from commit 79d6882f247b21bf98a99b0cab8682391213811c)
---
 drivers/usb/udc/udc_dwc2.c | 4 ++++
 drivers/usb/udc/udc_dwc2.h | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 2e56a9de180..0283b4a1b71 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -1019,6 +1019,8 @@ static void dwc2_enter_hibernation(const struct device *dev)
 	/* Switch off power to the controller */
 	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNSWTCH);
 
+	(void)dwc2_quirk_post_hibernation_entry(dev);
+
 	/* Mark that the core is hibernated */
 	priv->hibernated = 1;
 	LOG_DBG("Hibernated");
@@ -1032,6 +1034,8 @@ static void dwc2_exit_hibernation(const struct device *dev, bool rwup)
 	mem_addr_t gpwrdn_reg = (mem_addr_t)&base->gpwrdn;
 	mem_addr_t pcgcctl_reg = (mem_addr_t)&base->pcgcctl;
 
+	(void)dwc2_quirk_pre_hibernation_exit(dev);
+
 	/* Switch on power to the controller */
 	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNSWTCH);
 	k_busy_wait(1);
diff --git a/drivers/usb/udc/udc_dwc2.h b/drivers/usb/udc/udc_dwc2.h
index 07cd71bcb9c..87e71f81899 100644
--- a/drivers/usb/udc/udc_dwc2.h
+++ b/drivers/usb/udc/udc_dwc2.h
@@ -30,6 +30,10 @@ struct dwc2_vendor_quirks {
 	int (*caps)(const struct device *dev);
 	/* Called while waiting for bits that require PHY to be clocked */
 	int (*is_phy_clk_off)(const struct device *dev);
+	/* Called after hibernation entry sequence */
+	int (*post_hibernation_entry)(const struct device *dev);
+	/* Called before hibernation exit sequence */
+	int (*pre_hibernation_exit)(const struct device *dev);
 };
 
 /* Driver configuration per instance */
@@ -72,5 +76,7 @@ DWC2_QUIRK_FUNC_DEFINE(shutdown)
 DWC2_QUIRK_FUNC_DEFINE(irq_clear)
 DWC2_QUIRK_FUNC_DEFINE(caps)
 DWC2_QUIRK_FUNC_DEFINE(is_phy_clk_off)
+DWC2_QUIRK_FUNC_DEFINE(post_hibernation_entry)
+DWC2_QUIRK_FUNC_DEFINE(pre_hibernation_exit)
 
 #endif /* ZEPHYR_DRIVERS_USB_UDC_DWC2_H */

From fb52d17910343fcfa0b0f8344d2117946b69a57b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Thu, 19 Sep 2024 09:39:14 +0200
Subject: [PATCH 0045/2913] [nrf fromtree] drivers: udc_dwc2: Implement USBHS
 hibernation quirks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use the quirk to keep only the necessary clocks running when the core is
hibernated. The quirk is necessary to bring the USB suspend current
below the USB 2.0 suspend current limit.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit e2f2e448c725bcce1fce9d7a313c3955fe2d10c4)
(cherry picked from commit 8e207d0285cb48331915a1fcd31b3c4ce64b1759)
(cherry picked from commit bdacad80555336befac3544a848d4b6fb06e5b08)
---
 drivers/usb/udc/udc_dwc2_vendor_quirks.h | 32 ++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/drivers/usb/udc/udc_dwc2_vendor_quirks.h b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
index 57ff4c4de04..84d912f9fdb 100644
--- a/drivers/usb/udc/udc_dwc2_vendor_quirks.h
+++ b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
@@ -249,6 +249,36 @@ static inline int usbhs_is_phy_clk_off(const struct device *dev)
 	return !k_event_test(&usbhs_events, USBHS_VBUS_READY);
 }
 
+static inline int usbhs_post_hibernation_entry(const struct device *dev)
+{
+	const struct udc_dwc2_config *const config = dev->config;
+	struct usb_dwc2_reg *const base = config->base;
+	NRF_USBHS_Type *wrapper = USBHS_DT_WRAPPER_REG_ADDR(0);
+
+	sys_set_bits((mem_addr_t)&base->pcgcctl, USB_DWC2_PCGCCTL_GATEHCLK);
+
+	sys_write32(0x87, (mem_addr_t)wrapper + 0xC80);
+	sys_write32(0x87, (mem_addr_t)wrapper + 0xC84);
+	sys_write32(1, (mem_addr_t)wrapper + 0x004);
+
+	return 0;
+}
+
+static inline int usbhs_pre_hibernation_exit(const struct device *dev)
+{
+	const struct udc_dwc2_config *const config = dev->config;
+	struct usb_dwc2_reg *const base = config->base;
+	NRF_USBHS_Type *wrapper = USBHS_DT_WRAPPER_REG_ADDR(0);
+
+	sys_clear_bits((mem_addr_t)&base->pcgcctl, USB_DWC2_PCGCCTL_GATEHCLK);
+
+	wrapper->TASKS_START = 1;
+	sys_write32(0, (mem_addr_t)wrapper + 0xC80);
+	sys_write32(0, (mem_addr_t)wrapper + 0xC84);
+
+	return 0;
+}
+
 #define QUIRK_NRF_USBHS_DEFINE(n)						\
 	struct dwc2_vendor_quirks dwc2_vendor_quirks_##n = {			\
 		.init = usbhs_enable_nrfs_service,				\
@@ -258,6 +288,8 @@ static inline int usbhs_is_phy_clk_off(const struct device *dev)
 		.irq_clear = usbhs_irq_clear,					\
 		.caps = usbhs_init_caps,					\
 		.is_phy_clk_off = usbhs_is_phy_clk_off,				\
+		.post_hibernation_entry = usbhs_post_hibernation_entry,		\
+		.pre_hibernation_exit = usbhs_pre_hibernation_exit,		\
 	};
 
 DT_INST_FOREACH_STATUS_OKAY(QUIRK_NRF_USBHS_DEFINE)

From 841d6ceec25a97a8d08139b862ce18e1ebe7d3eb Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Fri, 27 Sep 2024 08:19:00 +0100
Subject: [PATCH 0046/2913] [nrf fromlist] dfu: Add missing depends on for
 progressive erase

Adds a depends on that requires the underlying driver support
explicit erase

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/79090

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit f72802dd6ab8ce53bfd06c4dedf2c8ce9733379b)
(cherry picked from commit 130ab005d80c7ef518c6fa3fbf99612229ff1dce)
---
 subsys/dfu/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/subsys/dfu/Kconfig b/subsys/dfu/Kconfig
index ec7d90ba14a..5977764016d 100644
--- a/subsys/dfu/Kconfig
+++ b/subsys/dfu/Kconfig
@@ -69,6 +69,7 @@ config IMG_BLOCK_BUF_SIZE
 config IMG_ERASE_PROGRESSIVELY
 	bool "Erase flash progressively when receiving new firmware"
 	select STREAM_FLASH_ERASE
+	depends on FLASH_HAS_EXPLICIT_ERASE
 	help
 	  If enabled, flash is erased as necessary when receiving new firmware,
 	  instead of erasing the whole image slot at once. This is necessary

From 173223e99299d9ec36a156f9e87cfcd4592eeacf Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Wed, 18 Sep 2024 14:29:44 +0100
Subject: [PATCH 0047/2913] [nrf fromlist] boards: nordic: thingy53: Add
 missing FEM entries

Adds missing SPI definition and settings for usage of FEM on
this platform

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/78657

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 9176680f699e0f1dbfda76c9fb93924817285683)
(cherry picked from commit 31dfa50265912f03f174b3285922981d45e06621)
---
 .../thingy53/thingy53_nrf5340_common.dtsi     | 12 ++++++++++
 .../thingy53_nrf5340_cpunet-pinctrl.dtsi      | 16 ++++++++++++++
 .../thingy53/thingy53_nrf5340_cpunet.dts      | 22 +++++++++++++++++++
 3 files changed, 50 insertions(+)

diff --git a/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi b/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
index 13a58443871..12b7cf6c13b 100644
--- a/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
+++ b/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
@@ -131,6 +131,18 @@
 		};
 	};
 
+	/* Disabled by default as SPI lines are shared with peripherals on application core */
+	spi_fwd: nrf-spi-forwarder {
+		compatible = "nordic,nrf-gpio-forwarder";
+		status = "disabled";
+		fem-spi-if {
+			gpios = <&gpio0 24 0>,
+				<&gpio0 29 0>,
+				<&gpio0 27 0>,
+				<&gpio0 28 0>;
+		};
+	};
+
 	aliases {
 		sw0 = &button0;
 		sw1 = &button1;
diff --git a/boards/nordic/thingy53/thingy53_nrf5340_cpunet-pinctrl.dtsi b/boards/nordic/thingy53/thingy53_nrf5340_cpunet-pinctrl.dtsi
index 940d3afedc7..76d1fd8bad5 100644
--- a/boards/nordic/thingy53/thingy53_nrf5340_cpunet-pinctrl.dtsi
+++ b/boards/nordic/thingy53/thingy53_nrf5340_cpunet-pinctrl.dtsi
@@ -23,4 +23,20 @@
 		};
 	};
 
+	spi0_default: spi0_default {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 0, 29)>,
+				<NRF_PSEL(SPIM_MISO, 0, 27)>,
+				<NRF_PSEL(SPIM_MOSI, 0, 28)>;
+		};
+	};
+
+	spi0_sleep: spi0_sleep {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 0, 29)>,
+				<NRF_PSEL(SPIM_MISO, 0, 27)>,
+				<NRF_PSEL(SPIM_MOSI, 0, 28)>;
+			low-power-enable;
+		};
+	};
 };
diff --git a/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts b/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts
index 89e9f8c64e5..aa4d4df909c 100644
--- a/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts
+++ b/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts
@@ -63,6 +63,7 @@
 		mode-gpios  = <&gpio1 12 GPIO_ACTIVE_HIGH>;
 		pdn-gpios   = <&gpio1 10 GPIO_ACTIVE_HIGH>;
 		tx-en-gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
+		spi-if = <&nrf_radio_fem_spi>;
 		supply-voltage-mv = <3000>;
 	};
 
@@ -111,6 +112,27 @@
 	pinctrl-names = "default", "sleep";
 };
 
+/* Disabled by default as shares same GPIO lines as SPI peripherals on application core */
+fem_spi: &spi0 {
+	status = "disabled";
+	cs-gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
+	pinctrl-0 = <&spi0_default>;
+	pinctrl-1 = <&spi0_sleep>;
+	pinctrl-names = "default", "sleep";
+
+	nrf_radio_fem_spi: nrf21540_fem_spi@0 {
+		compatible = "nordic,nrf21540-fem-spi";
+		status = "disabled";
+		reg = <0>;
+		spi-max-frequency = <8000000>;
+	};
+};
+
+&radio {
+	/* Uncomment to enable SPI interface for FEM */
+	/* fem = <&nrf_radio_fem>; */
+};
+
 &flash1 {
 
 	partitions {

From 4ba4cab5b9fad5c1e0d2b1c94f1d3d2d5ef352d9 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Wed, 18 Sep 2024 14:32:17 +0100
Subject: [PATCH 0048/2913] [nrf fromlist] soc: nordic: nrf53: Make GPIO pin
 forwarding automatic

Allows forwarding GPIO pins to network core automatically if the
devicetree node exists.

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/78657

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 52365a150caca9c886e38cae67708e3408c0a571)
(cherry picked from commit 19ca07724a98a8b1250f4ec6937fee3cf4ba961a)
---
 soc/nordic/nrf53/Kconfig | 2 --
 1 file changed, 2 deletions(-)

diff --git a/soc/nordic/nrf53/Kconfig b/soc/nordic/nrf53/Kconfig
index 91f422e315e..3a30a666d20 100644
--- a/soc/nordic/nrf53/Kconfig
+++ b/soc/nordic/nrf53/Kconfig
@@ -180,8 +180,6 @@ config SOC_NRF53_CPUNET_ENABLE
 	depends on !BT
 	default y if NRF_802154_SER_HOST
 	select SOC_NRF53_CPUNET_MGMT
-	select SOC_NRF_GPIO_FORWARDER_FOR_NRF5340 if \
-		$(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_GPIO_FORWARDER))
 	help
 	  This option enables releasing the Network 'force off' signal, which
 	  as a consequence will power up the Network MCU during system boot.

From e2c87e8fdf15f2d8caf30718074e8a0bfb1261f0 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Thu, 26 Sep 2024 12:16:55 +0100
Subject: [PATCH 0049/2913] [nrf fromlist] boards: nordic: nrf7002dk: Remove
 enabling forwarder Kconfig

Removes forcing the Kconfig to be enabled as this is now determined
automatically

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/78657

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit bd0d7a0cbcaa69cbf1f4f056d210e645c035aa9e)
(cherry picked from commit 9637ab4a4547b2c39d6cf1a49bd43b292632f64d)
---
 boards/nordic/nrf7002dk/Kconfig | 2 --
 1 file changed, 2 deletions(-)

diff --git a/boards/nordic/nrf7002dk/Kconfig b/boards/nordic/nrf7002dk/Kconfig
index 4bd84612e7a..1e2a7d09c93 100644
--- a/boards/nordic/nrf7002dk/Kconfig
+++ b/boards/nordic/nrf7002dk/Kconfig
@@ -23,8 +23,6 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
 
 config BOARD_ENABLE_CPUNET
 	bool "nRF53 Network MCU"
-	select SOC_NRF_GPIO_FORWARDER_FOR_NRF5340 if \
-		$(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_GPIO_FORWARDER))
 	help
 	  This option enables releasing the Network 'force off' signal, which
 	  as a consequence will power up the Network MCU during system boot.

From 5afe89dab0ae627d162952f2f69300b8c2fefc2d Mon Sep 17 00:00:00 2001
From: Pete Skeggs <peter.skeggs@nordicsemi.no>
Date: Sat, 28 Sep 2024 13:43:13 -0700
Subject: [PATCH 0050/2913] [nrf fromtree] net: lib: http: ensure
 SYS_FOREVER_MS behavior

The http_client_req() function's timeout parameter is allowed
to be SYS_FOREVER_MS. However, K_MSEC() does not convert this
to a proper k_timeout_t, so sys_timepoint_calc() ends up
returning 0, which is causes immediate timeouts.

Check for this case specifically and force value passed to
sys_timepoint_calc() to be correct.

(cherry picked from commit 09fab7e680b94c0267c18c708eeae8a8caed372e)

Signed-off-by: Pete Skeggs <peter.skeggs@nordicsemi.no>
(cherry picked from commit 6608c8663a34706bb222ccd17b889e87619ea81a)
(cherry picked from commit 7cdf0c1400b518962d5525c1ad8f3336767f374c)
---
 subsys/net/lib/http/http_client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/net/lib/http/http_client.c b/subsys/net/lib/http/http_client.c
index d71a93e634d..db2ddee4b2b 100644
--- a/subsys/net/lib/http/http_client.c
+++ b/subsys/net/lib/http/http_client.c
@@ -562,7 +562,7 @@ int http_client_req(int sock, struct http_request *req,
 	int total_sent = 0;
 	int ret, total_recv, i;
 	const char *method;
-	k_timeout_t req_timeout = K_MSEC(timeout);
+	k_timeout_t req_timeout = (timeout == SYS_FOREVER_MS) ? K_FOREVER : K_MSEC(timeout);
 	k_timepoint_t req_end_timepoint = sys_timepoint_calc(req_timeout);
 
 	if (sock < 0 || req == NULL || req->response == NULL ||

From 50d56af5a7ac56e529166517ff2dc94b683f5258 Mon Sep 17 00:00:00 2001
From: Tommi Rantanen <tommi.rantanen@nordicsemi.no>
Date: Mon, 30 Sep 2024 11:30:18 +0300
Subject: [PATCH 0051/2913] [nrf fromlist] net: lib: coap: Initialize
 response_truncated

Fix the following compilation warning given when using newlibc:
warning: 'response_truncated' may be used
uninitialized [-Wmaybe-uninitialized]

Issue is not seen with picolibc.

The variable was introduced as part of PR #76257

Upstream PR #: 79186

Signed-off-by: Tommi Rantanen <tommi.rantanen@nordicsemi.no>
(cherry picked from commit b5cafa56f07733846ff34cbf4d228db72a06b119)
(cherry picked from commit 364dc7b79121db6fe4dd7291a90cfc1a66d3ebf4)
---
 subsys/net/lib/coap/coap_client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index f1c58b2538d..c99a612cc88 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -887,7 +887,7 @@ static void coap_client_recv(void *coap_cl, void *a, void *b)
 		for (int i = 0; i < num_clients; i++) {
 			if (clients[i]->response_ready) {
 				struct coap_packet response;
-				bool response_truncated;
+				bool response_truncated = false;
 
 				k_mutex_lock(&clients[i]->lock, K_FOREVER);
 

From 90d4047d2e80b45b0eeb5134eecf654b3b301cda Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Mon, 30 Sep 2024 11:46:55 +0200
Subject: [PATCH 0052/2913] [nrf fromlist] boards: nordic: nrf7002dk: re-enable
 external flash by default

The external flash (mx25r64) was accidentally disabled during
testing. The node should be enabled by default like its spi.

This commit removes the status = "disabled";

Upstream PR #: 79191

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 61beafdd16b8768596ce82bef93f860665e123a2)
(cherry picked from commit b845aa221111959a4605e45fce72050feaa6a01f)
---
 boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi b/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi
index ce11dbcb61d..cff6e54fd5d 100644
--- a/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi
+++ b/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi
@@ -173,7 +173,6 @@ arduino_i2c: &i2c1 {
 	cs-gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 	mx25r64: mx25r6435f@0 {
 		compatible = "jedec,spi-nor";
-		status = "disabled";
 		reg = <0>;
 		spi-max-frequency = <33000000>;
 		jedec-id = [c2 28 17];

From 29b9b3e2052e7022ce8a5c197612e08d75796535 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 30 Sep 2024 21:52:16 +0200
Subject: [PATCH 0053/2913] [nrf fromlist] net: wifi: Fix DPP disabled build

In case WPA supplicant disabled DPP, we need to compile out the
corresponding DPP code in Wi-Fi shell too.

Upstream PR #: 79224

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 330eb8146a5b694fb90d738cc04e6ef76d80f636)
(cherry picked from commit 568df8224fa6b5f352aec9af93137033f16bd720)
---
 include/zephyr/net/wifi_mgmt.h  | 8 ++++++++
 modules/hostap/src/supp_api.c   | 2 ++
 modules/hostap/src/supp_api.h   | 2 ++
 modules/hostap/src/supp_main.c  | 2 ++
 subsys/net/l2/wifi/wifi_mgmt.c  | 3 +++
 subsys/net/l2/wifi/wifi_shell.c | 6 ++++++
 6 files changed, 23 insertions(+)

diff --git a/include/zephyr/net/wifi_mgmt.h b/include/zephyr/net/wifi_mgmt.h
index db90f27500d..899cb2f095b 100644
--- a/include/zephyr/net/wifi_mgmt.h
+++ b/include/zephyr/net/wifi_mgmt.h
@@ -219,11 +219,13 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_RTS_THRESHOLD);
 
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_AP_CONFIG_PARAM);
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 /** Request a Wi-Fi DPP operation */
 #define NET_REQUEST_WIFI_DPP			\
 	(_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_DPP)
 
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_DPP);
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_WNM
 /** Request a Wi-Fi BTM query */
@@ -846,6 +848,7 @@ struct wifi_ap_config_params {
 	uint32_t max_num_sta;
 };
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 /** @brief Wi-Fi DPP configuration parameter */
 /** Wi-Fi DPP QR-CODE in string max len for SHA512 */
 #define WIFI_DPP_QRCODE_MAX_LEN 255
@@ -1022,6 +1025,8 @@ struct wifi_dpp_params {
 	};
 };
 
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
+
 #include <zephyr/net/net_if.h>
 
 /** Scan result callback
@@ -1228,6 +1233,8 @@ struct wifi_mgmt_ops {
 	 * @return 0 if ok, < 0 if error
 	 */
 	int (*ap_config_params)(const struct device *dev, struct wifi_ap_config_params *params);
+
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	/** Dispatch DPP operations by action enum, with or without arguments in string format
 	 *
 	 * @param dev Pointer to the device structure for the driver instance
@@ -1236,6 +1243,7 @@ struct wifi_mgmt_ops {
 	 * @return 0 if ok, < 0 if error
 	 */
 	int (*dpp_dispatch)(const struct device *dev, struct wifi_dpp_params *params);
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 	/** Flush PMKSA cache entries
 	 *
 	 * @param dev Pointer to the device structure for the driver instance.
diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 6ba2c650027..049223b6956 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1626,6 +1626,7 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
 }
 #endif /* CONFIG_AP */
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 static const char *dpp_params_to_args_curve(int curve)
 {
 	switch (curve) {
@@ -1915,6 +1916,7 @@ int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *pa
 	os_free(cmd);
 	return 0;
 }
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 int hapd_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params)
diff --git a/modules/hostap/src/supp_api.h b/modules/hostap/src/supp_api.h
index bfc3a2735e6..dbef7b77796 100644
--- a/modules/hostap/src/supp_api.h
+++ b/modules/hostap/src/supp_api.h
@@ -260,6 +260,7 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
 
 #endif /* CONFIG_AP */
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 /**
  * @brief Dispatch DPP operations for STA
  *
@@ -268,6 +269,7 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
  * @return 0 for OK; -1 for ERROR
  */
 int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params);
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 /**
diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index a4b25b35476..9f54fecc42f 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -80,7 +80,9 @@ static const struct wifi_mgmt_ops mgmt_ops = {
 	.ap_disable = supplicant_ap_disable,
 	.ap_sta_disconnect = supplicant_ap_sta_disconnect,
 #endif /* CONFIG_AP */
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	.dpp_dispatch = supplicant_dpp_dispatch,
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 	.pmksa_flush = supplicant_pmksa_flush,
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	.enterprise_creds = supplicant_add_enterprise_creds,
diff --git a/subsys/net/l2/wifi/wifi_mgmt.c b/subsys/net/l2/wifi/wifi_mgmt.c
index 1580d2f8486..d676edd8f99 100644
--- a/subsys/net/l2/wifi/wifi_mgmt.c
+++ b/subsys/net/l2/wifi/wifi_mgmt.c
@@ -833,6 +833,7 @@ static int wifi_set_rts_threshold(uint32_t mgmt_request, struct net_if *iface,
 
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_RTS_THRESHOLD, wifi_set_rts_threshold);
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 static int wifi_dpp(uint32_t mgmt_request, struct net_if *iface,
 		    void *data, size_t len)
 {
@@ -849,6 +850,8 @@ static int wifi_dpp(uint32_t mgmt_request, struct net_if *iface,
 
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_DPP, wifi_dpp);
 
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
+
 static int wifi_pmksa_flush(uint32_t mgmt_request, struct net_if *iface,
 					   void *data, size_t len)
 {
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index 64bee4035ae..2dbb44de0aa 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -2106,6 +2106,7 @@ static int cmd_wifi_version(const struct shell *sh, size_t argc, char *argv[])
 	return 0;
 }
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 static int parse_dpp_args_auth_init(const struct shell *sh, size_t argc, char *argv[],
 				    struct wifi_dpp_params *params)
 {
@@ -2640,6 +2641,7 @@ static int cmd_wifi_dpp_reconfig(const struct shell *sh, size_t argc, char *argv
 	return 0;
 }
 
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 static int cmd_wifi_pmksa_flush(const struct shell *sh, size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_wifi_sta();
@@ -2717,6 +2719,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_twt_ops,
 	SHELL_SUBCMD_SET_END
 );
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	wifi_cmd_dpp,
 	SHELL_CMD_ARG(configurator_add, NULL,
@@ -2793,6 +2796,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      cmd_wifi_dpp_reconfig, 2, 0),
 	SHELL_SUBCMD_SET_END
 );
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
 	SHELL_CMD_ARG(version, NULL, "Print Wi-Fi Driver and Firmware versions\n",
@@ -2929,7 +2933,9 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
 		      "<rts_threshold: rts threshold/off>.\n",
 		      cmd_wifi_set_rts_threshold,
 		      1, 1),
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	SHELL_CMD(dpp, &wifi_cmd_dpp, "DPP actions\n", NULL),
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 	SHELL_CMD_ARG(pmksa_flush, NULL,
 		     "Flush PMKSA cache entries.\n",
 		     cmd_wifi_pmksa_flush, 1, 0),

From d43b88f464ea0a1ae458280dcb3feb5e98f39672 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 30 Sep 2024 23:38:47 +0200
Subject: [PATCH 0054/2913] [nrf fromlist] modules: hostap: Fix double free of
 the event

When an event is sent the receiver gets is asynchronously and hence is
responsible for free the event, the sender should only free in case of
error conditions i.e., unable to send.

Else, this causes a tough to debug double-free.

Upstream PR #: 79231

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 7474b4cab3b5c9f8a5743f48a59bb5e65ccf3df1)
(cherry picked from commit 409056025cadf42805c63619da28f978106b922d)
---
 modules/hostap/src/supp_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index 9f54fecc42f..3e2092dfa1a 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -436,6 +436,8 @@ static int del_interface(struct supplicant_context *ctx, struct net_if *iface)
 
 	supplicant_generate_state_event(ifname, NET_EVENT_SUPPLICANT_CMD_IFACE_REMOVED, 0);
 
+	return 0;
+
 out:
 	if (event) {
 		os_free(event);

From c57352e7a3e3666608d729302f192e6513fdef37 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 30 Sep 2024 23:47:50 +0200
Subject: [PATCH 0055/2913] [nrf fromlist] modules: hostap: Fix double free in
 case of error conditions

In case of error conditions post successfully sending the message, the
event is already freed but we attempt to free it again.

Rejig the labels to easily reflect thier purpose.

Upstream PR #: 79231

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 28f4a5e0f972c7157fdd504b7b7fdce61f51a615)
(cherry picked from commit 536435a5864a033050b225dac30931c35773ea4d)
---
 modules/hostap/src/supp_main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index 3e2092dfa1a..fb52beea2d7 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -374,7 +374,7 @@ static int del_interface(struct supplicant_context *ctx, struct net_if *iface)
 	if (!wpa_s) {
 		ret = -ENOENT;
 		LOG_ERR("Failed to get wpa_s handle for %s", ifname);
-		goto out;
+		goto free;
 	}
 
 	supplicant_generate_state_event(ifname, NET_EVENT_SUPPLICANT_CMD_IFACE_REMOVING, 0);
@@ -382,7 +382,7 @@ static int del_interface(struct supplicant_context *ctx, struct net_if *iface)
 	if (sizeof(event->interface_status.ifname) < strlen(ifname)) {
 		wpa_printf(MSG_ERROR, "Interface name too long: %s (max: %d)",
 			ifname, sizeof(event->interface_status.ifname));
-		goto out;
+		goto free;
 	}
 
 	os_memcpy(event->interface_status.ifname, ifname, strlen(ifname));
@@ -400,7 +400,7 @@ static int del_interface(struct supplicant_context *ctx, struct net_if *iface)
 		 * with WPA supplicant so we cannot unregister NM etc.
 		 */
 		wpa_printf(MSG_ERROR, "Failed to send event: %d", ret);
-		goto out;
+		goto free;
 	}
 
 	while (retry++ < count && wpa_s->wpa_state != WPA_INTERFACE_DISABLED) {
@@ -438,11 +438,11 @@ static int del_interface(struct supplicant_context *ctx, struct net_if *iface)
 
 	return 0;
 
-out:
+free:
 	if (event) {
 		os_free(event);
 	}
-
+out:
 	return ret;
 }
 #endif

From fde19b1d7f53d7d1dc797b1fcce26779f45fb926 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 1 Oct 2024 00:19:57 +0200
Subject: [PATCH 0056/2913] [nrf fromlist] modules: hostap: Fix typo in NM
 unregistration

The module name is not modified in remove.

Upstream PR #: 79231

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit ad5d062a165a8dc3546326a542a036292f056265)
(cherry picked from commit 4e2b80ba29ed478df466d9cda374a5a00598db78)
---
 modules/hostap/src/supp_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index fb52beea2d7..fa38e9acf8d 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -423,7 +423,7 @@ static int del_interface(struct supplicant_context *ctx, struct net_if *iface)
 		goto out;
 	}
 
-	ret = wifi_nm_unregister_mgd_iface(wifi_nm_get_instance("wpa_supplicant"), iface);
+	ret = wifi_nm_unregister_mgd_iface(wifi_nm_get_instance("wifi_supplicant"), iface);
 	if (ret) {
 		LOG_ERR("Failed to unregister mgd iface %s with native stack (%d)",
 			ifname, ret);

From 5b87a8a2df5f7bcdb954ef4820f470cf04f8dd3f Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 30 Sep 2024 23:58:37 +0200
Subject: [PATCH 0057/2913] [nrf fromlist] modules: hostap: Use net_mgmt
 context

Using a separate workqueue causes issues without any special locking to
synchronize with networking threads e.g., interface being removed while
the workqueue is trying to synchronize with WPA supplicant.

It's easier to use the net_mgmt thread which is in better sync with
networking.

Upstream PR #: 79231

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit b8d68b31d1bc742ab05f0b9fbfe886622668c2d1)
(cherry picked from commit 7753b4585d4ed70c1ad4daa23fa3130f0d9007b7)
---
 modules/hostap/src/supp_main.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index fa38e9acf8d..8a7382c7b39 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -475,9 +475,6 @@ static void submit_iface_work(struct supplicant_context *ctx,
 static void interface_handler(struct net_mgmt_event_callback *cb,
 			      uint32_t mgmt_event, struct net_if *iface)
 {
-	struct supplicant_context *ctx = CONTAINER_OF(cb, struct supplicant_context,
-						      cb);
-
 	if ((mgmt_event & INTERFACE_EVENT_MASK) != mgmt_event) {
 		return;
 	}
@@ -490,13 +487,13 @@ static void interface_handler(struct net_mgmt_event_callback *cb,
 
 	if (mgmt_event == NET_EVENT_IF_ADMIN_UP) {
 		LOG_INF("Network interface %d (%p) up", net_if_get_by_iface(iface), iface);
-		submit_iface_work(ctx, iface, add_interface);
+		add_interface(get_default_context(), iface);
 		return;
 	}
 
 	if (mgmt_event == NET_EVENT_IF_ADMIN_DOWN) {
 		LOG_INF("Network interface %d (%p) down", net_if_get_by_iface(iface), iface);
-		submit_iface_work(ctx, iface, del_interface);
+		del_interface(get_default_context(), iface);
 		return;
 	}
 }

From 1f8e37087d3682799b677836534da728db88b9fe Mon Sep 17 00:00:00 2001
From: Marek Pieta <Marek.Pieta@nordicsemi.no>
Date: Wed, 25 Sep 2024 13:58:05 +0200
Subject: [PATCH 0058/2913] [nrf fromtree] usb: device_next: usbd_hid: Fix size
 in HID report get

Since UDC buffers are allocated with `UDC_BUF_GRANULARITY` granularity,
the `net_buf_tailroom` may no longer be equal to the HID report size.
Use `setup->wLength` instead to ensure that proper HID report size is
passed to the application's callback.

(cherry picked from commit 88231b5583d88ad161227d4192496a488453a07f)

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
(cherry picked from commit 2598e7171f8fcc669907bf6b73024a36b6566ab4)
(cherry picked from commit bf1d8c8dab55c540dbd183e1ac7b659c7ab97093)
---
 subsys/usb/device_next/class/usbd_hid.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/subsys/usb/device_next/class/usbd_hid.c b/subsys/usb/device_next/class/usbd_hid.c
index fe67f7e7850..1de7abb5bd2 100644
--- a/subsys/usb/device_next/class/usbd_hid.c
+++ b/subsys/usb/device_next/class/usbd_hid.c
@@ -235,7 +235,7 @@ static int handle_get_report(const struct device *dev,
 	const uint8_t id = HID_GET_REPORT_ID(setup->wValue);
 	struct hid_device_data *const ddata = dev->data;
 	const struct hid_device_ops *ops = ddata->ops;
-	const size_t size = net_buf_tailroom(buf);
+	const size_t size = setup->wLength;
 	int ret = 0;
 
 	switch (type) {
@@ -257,8 +257,9 @@ static int handle_get_report(const struct device *dev,
 	}
 
 	if (ret > 0) {
-		__ASSERT(ret <= size, "Buffer overflow in the HID driver");
-		net_buf_add(buf, MIN(size, ret));
+		__ASSERT(ret <= net_buf_tailroom(buf),
+			 "Buffer overflow in the HID driver");
+		net_buf_add(buf, MIN(net_buf_tailroom(buf), ret));
 	} else {
 		errno = ret ? ret : -ENOTSUP;
 	}

From f535df7925332953c2116286f98ad8fe14411b98 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Tue, 1 Oct 2024 13:26:30 +0300
Subject: [PATCH 0059/2913] [nrf fromlist] tests: lwm2m: Fix minor timing
 issues on tests

* Wait for update when new object is created

  Sometimes our blockwise transfer starts before server have
  received an LwM2M Update. This causes Leshan to reject the SEND
  because is was not aware of object /19/0

* Wait "registered" message already in conftest.py.
  Sometimes Qemu boots faster, and the testcase don't see the
  log.

Upstream PR #: 79261

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit c394e8016ff2bc422eccb19edbbf648cda17c59d)
(cherry picked from commit d49b44bb04d2d199ccc163dcebf2343885cd295f)
---
 tests/net/lib/lwm2m/interop/pytest/test_blockwise.py | 5 +++++
 tests/net/lib/lwm2m/interop/pytest/test_nosec.py     | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/net/lib/lwm2m/interop/pytest/test_blockwise.py b/tests/net/lib/lwm2m/interop/pytest/test_blockwise.py
index 27bece69f1e..f72ab7e05cf 100644
--- a/tests/net/lib/lwm2m/interop/pytest/test_blockwise.py
+++ b/tests/net/lib/lwm2m/interop/pytest/test_blockwise.py
@@ -79,6 +79,8 @@ def test_blockwise_3(shell: Shell, dut: DeviceAdapter, leshan: Leshan, endpoint:
     """Blockwise test 3: Block-Wise Get using TLV and SenML-CBOR content formats"""
 
     shell.exec_command('lwm2m create /19/0')
+    # Wait for update to finish so server is aware of the /19/0 object
+    dut.readlines_until(regex='.*net_lwm2m_rd_client: Update Done', timeout=5.0)
 
     # Generate 4 kB of binary app-data
     # and write it into BinaryAppData object
@@ -109,6 +111,9 @@ def test_blockwise_4(shell: Shell, dut: DeviceAdapter, leshan: Leshan, endpoint:
     """Blockwise test 4: Block-Wise SEND using SenML-CBOR content format"""
 
     shell.exec_command('lwm2m create /19/0')
+    # Wait for update to finish so server is aware of the /19/0 object
+    dut.readlines_until(regex='.*net_lwm2m_rd_client: Update Done', timeout=5.0)
+
     # Generate 4 kB of binary app-data
     data = ''.join(random.choice(string.ascii_letters) for i in range(4096)).encode()
     fmt = leshan.format
diff --git a/tests/net/lib/lwm2m/interop/pytest/test_nosec.py b/tests/net/lib/lwm2m/interop/pytest/test_nosec.py
index 15ac98f2d1a..6411efa0755 100644
--- a/tests/net/lib/lwm2m/interop/pytest/test_nosec.py
+++ b/tests/net/lib/lwm2m/interop/pytest/test_nosec.py
@@ -26,11 +26,8 @@
 def test_LightweightM2M_1_1_int_101(shell: Shell, dut: DeviceAdapter, leshan: Leshan, endpoint_nosec: str):
     """
     Verify that the client is registered.
-    Note that this MUST be the first testcase executed, otherwise it will fail to get the
-    correct log output.
     """
     logger.info("LightweightM2M-1.1-int-101 - Initial Registration")
-    dut.readlines_until(regex='.*Registration Done', timeout=5.0)
     assert leshan.get(f'/clients/{endpoint_nosec}')
 
 def test_LightweightM2M_1_1_int_105(shell: Shell, dut: DeviceAdapter, leshan: Leshan, endpoint_nosec: str, helperclient: object):

From e42d302b030e0b3955ffdc6593f2bdbdf76259f2 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Tue, 1 Oct 2024 13:48:24 +0300
Subject: [PATCH 0060/2913] [nrf fromlist] tests: lwm2m: Remove qemu-cortex-m3

This board just don't have enough RAM for all tests
so it is just a maintenance headache without any
benefits.

Upstream PR #: 79261

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 50380afa6da36503c1f5450b06820ab6d93eef12)
(cherry picked from commit e6da4a9dee64622675dd46adc91065fcd4f5635a)
---
 .../lwm2m/interop/boards/qemu_cortex_m3.conf   | 18 ------------------
 tests/net/lib/lwm2m/interop/testcase.yaml      |  1 -
 2 files changed, 19 deletions(-)
 delete mode 100644 tests/net/lib/lwm2m/interop/boards/qemu_cortex_m3.conf

diff --git a/tests/net/lib/lwm2m/interop/boards/qemu_cortex_m3.conf b/tests/net/lib/lwm2m/interop/boards/qemu_cortex_m3.conf
deleted file mode 100644
index 44263f885a4..00000000000
--- a/tests/net/lib/lwm2m/interop/boards/qemu_cortex_m3.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-CONFIG_NET_L2_ETHERNET=y
-CONFIG_ETH_DRIVER=y
-CONFIG_ETH_STELLARIS=y
-CONFIG_NET_QEMU_ETHERNET=y
-
-# RAM/ROM tuning
-CONFIG_IDLE_STACK_SIZE=128
-CONFIG_ISR_STACK_SIZE=512
-CONFIG_LWM2M_LOG_LEVEL_INF=y
-CONFIG_LOG_BUFFER_SIZE=512
-
-# qemu_cortex_m3 have smaller memory so simulate a small
-# device and small network where max CoAP packet is 256+headers.
-# This excercises the outgoing block-wise module intentionally.
-CONFIG_LWM2M_COAP_MAX_MSG_SIZE=256
-CONFIG_LWM2M_COAP_BLOCK_SIZE=256
-CONFIG_LWM2M_COAP_BLOCK_TRANSFER=y
-CONFIG_LWM2M_COAP_ENCODE_BUFFER_SIZE=2048
diff --git a/tests/net/lib/lwm2m/interop/testcase.yaml b/tests/net/lib/lwm2m/interop/testcase.yaml
index 46a7eee055b..19ad11d9fb7 100644
--- a/tests/net/lib/lwm2m/interop/testcase.yaml
+++ b/tests/net/lib/lwm2m/interop/testcase.yaml
@@ -9,7 +9,6 @@ tests:
       - native_sim
     platform_allow:
       - native_sim
-      - qemu_cortex_m3
       - qemu_x86
     tags:
       - testing

From e814b7e495ec9e654c6f67413d637f696d357745 Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Thu, 26 Sep 2024 15:48:36 +0300
Subject: [PATCH 0061/2913] [nrf fromtree] net: dns: Increase the size of
 dispatcher table

The dispatcher table needs to be large enough to have support
for all file descriptor values.

Fixes #79042

(cherry picked from commit 077dd8f1427a503c4368810249c66fdfe017c141)

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 663548ca57e9bbd861783748f27394fd56ebd14e)
(cherry picked from commit 014eb246e754ce825fbbf554e68fc106e1d54170)
---
 subsys/net/lib/dns/dispatcher.c | 2 +-
 subsys/net/lib/sockets/Kconfig  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/subsys/net/lib/dns/dispatcher.c b/subsys/net/lib/dns/dispatcher.c
index 68244b830ba..dc5602cae40 100644
--- a/subsys/net/lib/dns/dispatcher.c
+++ b/subsys/net/lib/dns/dispatcher.c
@@ -29,7 +29,7 @@ NET_BUF_POOL_DEFINE(dns_msg_pool, DNS_RESOLVER_BUF_CTR,
 
 static struct socket_dispatch_table {
 	struct dns_socket_dispatcher *ctx;
-} dispatch_table[CONFIG_NET_SOCKETS_POLL_MAX];
+} dispatch_table[CONFIG_ZVFS_OPEN_MAX];
 
 static int dns_dispatch(struct dns_socket_dispatcher *dispatcher,
 			int sock, struct sockaddr *addr, size_t addrlen,
diff --git a/subsys/net/lib/sockets/Kconfig b/subsys/net/lib/sockets/Kconfig
index 87fd6efd4c0..1fec4578270 100644
--- a/subsys/net/lib/sockets/Kconfig
+++ b/subsys/net/lib/sockets/Kconfig
@@ -50,6 +50,7 @@ config NET_SOCKETS_POLL_MAX
 	default 6 if WIFI_NM_WPA_SUPPLICANT
 	default 4 if SHELL_BACKEND_TELNET
 	default 3
+	range 1 ZVFS_OPEN_MAX
 	help
 	  Maximum number of entries supported for poll() call.
 

From f1dc0e44fbe4fa8215652254211e640f508da14e Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Thu, 26 Sep 2024 15:55:42 +0300
Subject: [PATCH 0062/2913] [nrf fromtree] net: dns: Check that dispatcher
 table is not overflowing

Add CHECKIF() checks that verify that dispatcher table is
not overflowing.

(cherry picked from commit 2ff26674a26d544df7a54b9481ec4d7b1430d47b)

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 77c6840852fa9cc8cd1ae43125e9b40e7c2680d2)
(cherry picked from commit e7eab88043f11082b92ef836062cdc8752d11309)
---
 subsys/net/lib/dns/dispatcher.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/subsys/net/lib/dns/dispatcher.c b/subsys/net/lib/dns/dispatcher.c
index dc5602cae40..08672b78e7a 100644
--- a/subsys/net/lib/dns/dispatcher.c
+++ b/subsys/net/lib/dns/dispatcher.c
@@ -235,6 +235,11 @@ int dns_dispatcher_register(struct dns_socket_dispatcher *ctx)
 		entry->pair = ctx;
 
 		for (int i = 0; i < ctx->fds_len; i++) {
+			CHECKIF((int)ctx->fds[i].fd >= (int)ARRAY_SIZE(dispatch_table)) {
+				ret = -ERANGE;
+				goto out;
+			}
+
 			if (dispatch_table[ctx->fds[i].fd].ctx == NULL) {
 				dispatch_table[ctx->fds[i].fd].ctx = ctx;
 			}
@@ -267,6 +272,11 @@ int dns_dispatcher_register(struct dns_socket_dispatcher *ctx)
 	ctx->pair = NULL;
 
 	for (int i = 0; i < ctx->fds_len; i++) {
+		if ((int)ctx->fds[i].fd >= (int)ARRAY_SIZE(dispatch_table)) {
+			ret = -ERANGE;
+			goto out;
+		}
+
 		if (dispatch_table[ctx->fds[i].fd].ctx == NULL) {
 			dispatch_table[ctx->fds[i].fd].ctx = ctx;
 		}
@@ -288,17 +298,25 @@ int dns_dispatcher_register(struct dns_socket_dispatcher *ctx)
 
 int dns_dispatcher_unregister(struct dns_socket_dispatcher *ctx)
 {
+	int ret = 0;
+
 	k_mutex_lock(&lock, K_FOREVER);
 
 	(void)sys_slist_find_and_remove(&sockets, &ctx->node);
 
 	for (int i = 0; i < ctx->fds_len; i++) {
+		CHECKIF((int)ctx->fds[i].fd >= (int)ARRAY_SIZE(dispatch_table)) {
+			ret = -ERANGE;
+			goto out;
+		}
+
 		dispatch_table[ctx->fds[i].fd].ctx = NULL;
 	}
 
+out:
 	k_mutex_unlock(&lock);
 
-	return 0;
+	return ret;
 }
 
 void dns_dispatcher_init(void)

From 643506ac45f276b4a2b9709399c34d946bb9013f Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Fri, 27 Sep 2024 08:51:43 +0300
Subject: [PATCH 0063/2913] [nrf fromtree] tests/samples: net: Fix the max
 number of file descriptors

Make sure that CONFIG_ZVFS_OPEN_MAX in the tests and samples is at
least the same value as CONFIG_NET_SOCKETS_POLL_MAX so that we
cannot have more polled sockets than there are available file
descriptors.

(cherry picked from commit 759f3a0c7c641e9af9d0aac3397abf687443d1a0)

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 80e64ed45b83c0e8bad52b54a52db6baed6e234a)
(cherry picked from commit c6cd8db658c5f6f1f982473010e2db8d9385fa28)
---
 samples/net/sockets/echo_service/prj.conf | 1 +
 tests/net/all/prj.conf                    | 1 +
 tests/net/lib/dns_addremove/prj.conf      | 1 +
 tests/net/lib/dns_resolve/prj.conf        | 2 +-
 tests/net/lib/mdns_responder/prj.conf     | 1 +
 tests/net/pm/prj.conf                     | 2 +-
 tests/net/socket/service/prj.conf         | 2 +-
 7 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/samples/net/sockets/echo_service/prj.conf b/samples/net/sockets/echo_service/prj.conf
index b9c053c27a2..3b12a238378 100644
--- a/samples/net/sockets/echo_service/prj.conf
+++ b/samples/net/sockets/echo_service/prj.conf
@@ -14,6 +14,7 @@ CONFIG_ZVFS_OPEN_MAX=10
 CONFIG_NET_MAX_CONN=5
 CONFIG_NET_SOCKETS_SERVICE=y
 CONFIG_NET_SOCKETS_POLL_MAX=20
+CONFIG_ZVFS_OPEN_MAX=20
 
 # Network driver config
 CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/tests/net/all/prj.conf b/tests/net/all/prj.conf
index 7944be6a884..f4f42f78187 100644
--- a/tests/net/all/prj.conf
+++ b/tests/net/all/prj.conf
@@ -354,6 +354,7 @@ CONFIG_NET_SOCKETS_LOG_LEVEL_DBG=y
 CONFIG_NET_SOCKETS_OFFLOAD=y
 CONFIG_NET_SOCKETS_PACKET=y
 CONFIG_NET_SOCKETS_POLL_MAX=50
+CONFIG_ZVFS_OPEN_MAX=50
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_SOCKOPT_TLS=y
 CONFIG_NET_SOCKETS_TLS_MAX_CIPHERSUITES=10
diff --git a/tests/net/lib/dns_addremove/prj.conf b/tests/net/lib/dns_addremove/prj.conf
index c28f0a14eac..81c65b34f32 100644
--- a/tests/net/lib/dns_addremove/prj.conf
+++ b/tests/net/lib/dns_addremove/prj.conf
@@ -18,3 +18,4 @@ CONFIG_PRINTK=y
 CONFIG_ZTEST=y
 CONFIG_MAIN_STACK_SIZE=2048
 CONFIG_NET_SOCKETS_POLL_MAX=5
+CONFIG_ZVFS_OPEN_MAX=5
diff --git a/tests/net/lib/dns_resolve/prj.conf b/tests/net/lib/dns_resolve/prj.conf
index 39ab38272e6..e90e185040a 100644
--- a/tests/net/lib/dns_resolve/prj.conf
+++ b/tests/net/lib/dns_resolve/prj.conf
@@ -30,4 +30,4 @@ CONFIG_ZTEST=y
 
 CONFIG_MAIN_STACK_SIZE=1344
 CONFIG_NET_SOCKETS_POLL_MAX=9
-CONFIG_ZVFS_OPEN_MAX=8
+CONFIG_ZVFS_OPEN_MAX=9
diff --git a/tests/net/lib/mdns_responder/prj.conf b/tests/net/lib/mdns_responder/prj.conf
index 6d4db394c8d..9ea50969898 100644
--- a/tests/net/lib/mdns_responder/prj.conf
+++ b/tests/net/lib/mdns_responder/prj.conf
@@ -6,6 +6,7 @@ CONFIG_NET_LOOPBACK=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_SOCKETS_POLL_MAX=7
+CONFIG_ZVFS_OPEN_MAX=7
 
 # Network driver config
 CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/tests/net/pm/prj.conf b/tests/net/pm/prj.conf
index 5d478e4d070..9c838139d9b 100644
--- a/tests/net/pm/prj.conf
+++ b/tests/net/pm/prj.conf
@@ -7,7 +7,7 @@ CONFIG_NET_L2_ETHERNET=n
 CONFIG_NET_UDP=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_SOCKETS=y
-CONFIG_ZVFS_OPEN_MAX=2
+CONFIG_ZVFS_OPEN_MAX=3
 CONFIG_ZTEST_STACK_SIZE=2048
 CONFIG_MAIN_STACK_SIZE=2048
 CONFIG_NET_LOG=y
diff --git a/tests/net/socket/service/prj.conf b/tests/net/socket/service/prj.conf
index 5f5c2325a33..d0664554f7f 100644
--- a/tests/net/socket/service/prj.conf
+++ b/tests/net/socket/service/prj.conf
@@ -5,7 +5,7 @@ CONFIG_NET_IPV6=y
 CONFIG_NET_UDP=y
 CONFIG_NET_TCP=y
 CONFIG_NET_SOCKETS=y
-CONFIG_ZVFS_OPEN_MAX=10
+CONFIG_ZVFS_OPEN_MAX=20
 CONFIG_NET_PKT_TX_COUNT=8
 CONFIG_NET_PKT_RX_COUNT=8
 CONFIG_NET_MAX_CONN=5

From cd1c6897951b0fa06daf439f85da7c167087cc16 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Wed, 2 Oct 2024 10:37:29 +0200
Subject: [PATCH 0064/2913] [nrf fromlist] tests: net: ipv6: Enable mbed TLS
 heap

mbed TLS MD operations, used by IPv6 Privacy Extensions, require access
to heap. This may vary depending on platform/mbed TLS variant used,
hence enable CONFIG_MBEDTLS_ENABLE_HEAP in tests to ensure mbed TLS has
always access to some heap memory.

Upstream PR #: 79303

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 21bf91d28a13df8ce6d87fe83702dcfe7746dc2c)
(cherry picked from commit 9dfb578f6d96fad6c498e7f269aec46cc98110ac)
---
 tests/net/ipv6/prj.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/net/ipv6/prj.conf b/tests/net/ipv6/prj.conf
index b2b2f088673..51cfa883727 100644
--- a/tests/net/ipv6/prj.conf
+++ b/tests/net/ipv6/prj.conf
@@ -36,3 +36,6 @@ CONFIG_NET_IPV6_PE_PREFER_PUBLIC_ADDRESSES=n
 
 # Increase the stack a bit for mps2/an385
 CONFIG_NET_RX_STACK_SIZE=1700
+
+# Make sure mbedTLS has access to heap
+CONFIG_MBEDTLS_ENABLE_HEAP=y

From 03363a943ff9c3734bda4cfe13d80cf655b9b5e9 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Mon, 30 Sep 2024 16:09:34 +0200
Subject: [PATCH 0065/2913] [nrf fromlist] manifest: update open-amp to include
 change to strlcpy

This manifest update points open-amp to include a fix for unsafe use
of strncpy by by replacing it with internal strlcpy.

Upstream PR #: 79212

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit b1d2d89979e2e6668b6f0536511e4a9c738cf696)
(cherry picked from commit 99e871d6562e02921c28a40101cad183bc7bf90e)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index c1049d2350c..07aedbea3a2 100644
--- a/west.yml
+++ b/west.yml
@@ -303,7 +303,7 @@ manifest:
       revision: d2a119a9c7600ce06033a794de042e0ad9a38702
       path: modules/bsim_hw_models/nrf_hw_models
     - name: open-amp
-      revision: 76d2168bcdfcd23a9a7dce8c21f2083b90a1e60a
+      revision: b735edbc739ad59156eb55bb8ce2583d74537719
       path: modules/lib/open-amp
     - name: openthread
       revision: 2aeb8b833ba760ec29d5f340dd1ce7bcb61c5d56

From 4ea0c0303632648bd3d9ab3cd182abc11544c2c3 Mon Sep 17 00:00:00 2001
From: Dominik Kilian <Dominik.Kilian@nordicsemi.no>
Date: Wed, 2 Oct 2024 08:57:31 +0200
Subject: [PATCH 0066/2913] [nrf fromlist] modules: hal_nordic: Allow app mem
 from net core in serialized 802.15.4

Currently, the serialization module for 802.15.4 enabled
the network core without giving it access to application
core memory in trusted execution mode. This commit
grands this access.

Upstream PR #: 79316

Signed-off-by: Dominik Kilian <Dominik.Kilian@nordicsemi.no>
(cherry picked from commit 66d741841d5324803cebaade8b37469d50f949cb)
(cherry picked from commit 88567b6806ea6a7d5187be41b1a9c2922f6b3a86)
---
 .../platform/nrf_802154_spinel_backend_ipc.c        | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/modules/hal_nordic/nrf_802154/serialization/platform/nrf_802154_spinel_backend_ipc.c b/modules/hal_nordic/nrf_802154/serialization/platform/nrf_802154_spinel_backend_ipc.c
index 6df811f6bad..9071b57c516 100644
--- a/modules/hal_nordic/nrf_802154/serialization/platform/nrf_802154_spinel_backend_ipc.c
+++ b/modules/hal_nordic/nrf_802154/serialization/platform/nrf_802154_spinel_backend_ipc.c
@@ -9,6 +9,11 @@
 #include <zephyr/device.h>
 #include <zephyr/logging/log.h>
 
+#if defined(CONFIG_SOC_NRF5340_CPUAPP)
+#include <nrf53_cpunet_mgmt.h>
+#include <hal/nrf_spu.h>
+#endif
+
 #include "nrf_802154.h"
 #include "nrf_802154_spinel_backend_callouts.h"
 #include "nrf_802154_serialization_error.h"
@@ -55,6 +60,14 @@ nrf_802154_ser_err_t nrf_802154_backend_init(void)
 	int err;
 
 #if defined(CONFIG_SOC_NRF5340_CPUAPP)
+
+#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
+	/* Retain nRF5340 Network MCU in Secure domain (bus
+	 * accesses by Network MCU will have Secure attribute set).
+	 */
+	nrf_spu_extdomain_set((NRF_SPU_Type *)DT_REG_ADDR(DT_NODELABEL(spu)), 0, true, false);
+#endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) */
+
 	nrf53_cpunet_enable(true);
 #endif
 

From 1a600984aa834648ed06b00134beae8ac03d775f Mon Sep 17 00:00:00 2001
From: Frode van der Meeren <frode.vandermeeren@nordicsemi.no>
Date: Thu, 3 Oct 2024 12:33:51 +0200
Subject: [PATCH 0067/2913] [nrf fromlist] bluetooth: tester: audio: Add check
 for bis stopping

Adds a semaphor to make sure the stream has properly been stopped by the
controller before returning from btp_bap_broadcast_source_stop.

Upstream PR #: 79329

Signed-off-by: Frode van der Meeren <frode.vandermeeren@nordicsemi.no>
(cherry picked from commit 3e884837d5d45d531e7952c882de6eec2ec0446f)
(cherry picked from commit f20bffe324c831ada68986562dd5be85d1d4b5da)
---
 .../tester/src/audio/btp_bap_broadcast.c       | 18 +++++++++++++++++-
 .../tester/src/audio/btp_bap_broadcast.h       |  1 +
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
index df3b2f3ba73..00c74efb67c 100644
--- a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
+++ b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
@@ -23,6 +23,8 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 #include "btp_bap_audio_stream.h"
 #include "btp_bap_broadcast.h"
 
+static K_SEM_DEFINE(sem_stream_stopped, 0U, CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT);
+
 static struct btp_bap_broadcast_remote_source remote_broadcast_sources[1];
 static struct btp_bap_broadcast_local_source local_source;
 /* Only one PA sync supported for now. */
@@ -132,8 +134,9 @@ static void stream_stopped(struct bt_bap_stream *stream, uint8_t reason)
 	LOG_DBG("Stopped stream %p with reason 0x%02X", stream, reason);
 
 	btp_bap_audio_stream_stopped(&b_stream->audio_stream);
-
 	b_stream->bis_synced = false;
+
+	k_sem_give(&sem_stream_stopped);
 }
 
 static void send_bis_stream_received_ev(const bt_addr_le_t *address, uint32_t broadcast_id,
@@ -327,6 +330,8 @@ uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 	source->qos.pd = sys_get_le24(cp->presentation_delay);
 	source->qos.sdu = sys_le16_to_cpu(cp->max_sdu);
 
+	source->stream_count = cp->subgroups * cp->streams_per_subgroup;
+
 	err = setup_broadcast_source(cp->streams_per_subgroup, cp->subgroups, source, &codec_cfg);
 	if (err != 0) {
 		LOG_DBG("Unable to setup broadcast source: %d", err);
@@ -484,6 +489,8 @@ uint8_t btp_bap_broadcast_source_stop(const void *cmd, uint16_t cmd_len,
 
 	LOG_DBG("");
 
+	k_sem_reset(&sem_stream_stopped);
+
 	err = bt_bap_broadcast_source_stop(source->bap_broadcast);
 	if (err != 0) {
 		LOG_DBG("Unable to stop broadcast source: %d", err);
@@ -491,6 +498,15 @@ uint8_t btp_bap_broadcast_source_stop(const void *cmd, uint16_t cmd_len,
 		return BTP_STATUS_FAILED;
 	}
 
+	for (int i = 0; i < source->stream_count; i++) {
+		err = k_sem_take(&sem_stream_stopped, K_MSEC(1000));
+		if (err != 0) {
+			LOG_DBG("Timed out waiting for stream nr %d to stop", i);
+
+			return BTP_STATUS_FAILED;
+		}
+	}
+
 	return BTP_STATUS_SUCCESS;
 }
 
diff --git a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
index cbecb446b3a..64f738c3d37 100644
--- a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
+++ b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
@@ -45,6 +45,7 @@ struct btp_bap_broadcast_local_source {
 	struct bt_audio_codec_qos qos;
 	struct btp_bap_broadcast_stream streams[CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT];
 	struct bt_audio_codec_cfg subgroup_codec_cfg[CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT];
+	uint8_t stream_count;
 	/* Only for BTP BAP commands */
 	struct bt_bap_broadcast_source *bap_broadcast;
 	/* Only for BTP CAP commands */

From adb4588807a6dc83a03bb82e0b24e8c31abb277c Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Thu, 12 Sep 2024 07:36:34 +0100
Subject: [PATCH 0068/2913] [nrf fromtree] mgmt: mcumgr: grp: os_mgmt: Allow
 bootloader info without MCUboot

Allows enabling the bootloader info functionality without MCUboot
being enabled, so that other bootloaders can add hooks with their
own responses

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit c6c00e13b817ff00311a868a6f8af7f66d5e2045)
(cherry picked from commit 57be5aa1705172f6662e057fc75db6fecbb425a0)
(cherry picked from commit e676a53e04d362b1c913a9dd73172e19ff35fca1)
---
 subsys/mgmt/mcumgr/grp/os_mgmt/Kconfig       | 4 ----
 subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c | 7 ++++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/subsys/mgmt/mcumgr/grp/os_mgmt/Kconfig b/subsys/mgmt/mcumgr/grp/os_mgmt/Kconfig
index bb2ae92053c..8839d3664a3 100644
--- a/subsys/mgmt/mcumgr/grp/os_mgmt/Kconfig
+++ b/subsys/mgmt/mcumgr/grp/os_mgmt/Kconfig
@@ -194,8 +194,6 @@ config MCUMGR_GRP_OS_INFO_BUILD_DATE_TIME
 
 endif
 
-if BOOTLOADER_MCUBOOT
-
 config MCUMGR_GRP_OS_BOOTLOADER_INFO
 	bool "Bootloader information"
 	help
@@ -209,8 +207,6 @@ config MCUMGR_GRP_OS_BOOTLOADER_INFO_HOOK
 	  Supports adding custom responses to the bootloader info command by using registered
 	  callbacks. Data can be appended to the struct provided in the callback.
 
-endif # BOOTLOADER_MCUBOOT
-
 module = MCUMGR_GRP_OS
 module-str = mcumgr_grp_os
 source "subsys/logging/Kconfig.template.log_config"
diff --git a/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c b/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
index 15342fcb936..eb232093aa9 100644
--- a/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
@@ -423,6 +423,7 @@ os_mgmt_mcumgr_params(struct smp_streamer *ctxt)
 
 #if defined(CONFIG_MCUMGR_GRP_OS_BOOTLOADER_INFO)
 
+#if defined(CONFIG_BOOTLOADER_MCUBOOT)
 #if defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_SINGLE_APP)
 #define BOOTLOADER_MODE MCUBOOT_MODE_SINGLE_SLOT
 #elif defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_SWAP_SCRATCH)
@@ -440,6 +441,7 @@ os_mgmt_mcumgr_params(struct smp_streamer *ctxt)
 #else
 #define BOOTLOADER_MODE -1
 #endif
+#endif
 
 static int
 os_mgmt_bootloader_info(struct smp_streamer *ctxt)
@@ -485,6 +487,7 @@ os_mgmt_bootloader_info(struct smp_streamer *ctxt)
 #endif
 
 	/* If no parameter is recognized then just introduce the bootloader. */
+#if defined(CONFIG_BOOTLOADER_MCUBOOT)
 	if (decoded == 0) {
 		ok = zcbor_tstr_put_lit(zse, "bootloader") &&
 		     zcbor_tstr_put_lit(zse, "MCUboot");
@@ -499,7 +502,9 @@ os_mgmt_bootloader_info(struct smp_streamer *ctxt)
 		ok = ok && zcbor_tstr_put_lit(zse, "no-downgrade") &&
 		     zcbor_bool_encode(zse, &(bool){true});
 #endif
-	} else {
+	} else
+#endif
+	{
 		return OS_MGMT_ERR_QUERY_YIELDS_NO_ANSWER;
 	}
 

From a25c395a385f92e450d16498ee8da8e7a3070a8b Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Fri, 20 Sep 2024 08:25:26 +0100
Subject: [PATCH 0069/2913] [nrf fromtree] mgmt: mcumgr: grp: os_mgmt: Fix
 invalid return

Fixes wrongly returning an SMP version 2 error code as an SMP
version 1 error code instead of adding it as an error

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit ddad1e6fb0bdd7a3a2316cb2ab0b584e6a468b8e)
(cherry picked from commit acc516ba3408f54befb9806910bae115bda35913)
(cherry picked from commit 8e595482599ec00cf3b3fc536f2bcd156a799a7d)
---
 subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c b/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
index eb232093aa9..648f3842705 100644
--- a/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
@@ -505,7 +505,7 @@ os_mgmt_bootloader_info(struct smp_streamer *ctxt)
 	} else
 #endif
 	{
-		return OS_MGMT_ERR_QUERY_YIELDS_NO_ANSWER;
+		ok = smp_add_cmd_err(zse, MGMT_GROUP_ID_OS, OS_MGMT_ERR_QUERY_YIELDS_NO_ANSWER);
 	}
 
 	return ok ? MGMT_ERR_EOK : MGMT_ERR_EMSGSIZE;

From d1d141eeef93a94655138c024c46f79db1b2ec47 Mon Sep 17 00:00:00 2001
From: Kamil Piszczek <Kamil.Piszczek@nordicsemi.no>
Date: Tue, 17 Sep 2024 14:55:09 +0200
Subject: [PATCH 0070/2913] [nrf fromtree] bluetooth: smp: remove experimental
 from BT_BONDABLE_PER_CONNECTION

Removed the experimental status from the BT_BONDABLE_PER_CONNECTION
Kconfig option used in the Bluetooth Host SMP layer. This feature
has been present in Zephyr for over a year without any issue reports
or API modifications.

Signed-off-by: Kamil Piszczek <Kamil.Piszczek@nordicsemi.no>
(cherry picked from commit a743dd6f29c8eacf364a0fb88a7ec8f153d24311)
(cherry picked from commit 9fac88133ec2fff6e642c84f1c8ad6bc0c413907)
(cherry picked from commit a13ab5bc3a40d63a33a49a1fc320cf8cd427c28d)
---
 subsys/bluetooth/host/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index b8d7f629a9c..233c916408f 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -645,8 +645,7 @@ config BT_BONDING_REQUIRED
 	  requests will be rejected.
 
 config BT_BONDABLE_PER_CONNECTION
-	bool "Set/clear the bonding flag per-connection [EXPERIMENTAL]"
-	select EXPERIMENTAL
+	bool "Set/clear the bonding flag per-connection"
 	help
 	  Enable support for the bt_conn_set_bondable API function that is
 	  used to set/clear the bonding flag on a per-connection basis.

From dc5460d3f311a298cb0e7a4bf6a4bce68b007bf7 Mon Sep 17 00:00:00 2001
From: Kamil Piszczek <Kamil.Piszczek@nordicsemi.no>
Date: Tue, 17 Sep 2024 15:06:07 +0200
Subject: [PATCH 0071/2913] [nrf fromtree] bluetooth: smp: remove experimental
 from BT_GATT_AUTHORIZATION_CUSTOM

Removed the experimental status from the BT_GATT_AUTHORIZATION_CUSTOM
Kconfig option used in the Bluetooth Host GATT layer. This feature
has been present in Zephyr for almost a year without any issue reports
or API modifications.

Signed-off-by: Kamil Piszczek <Kamil.Piszczek@nordicsemi.no>
(cherry picked from commit f17431ee97138639fafa6bad081f584472c3a82b)
(cherry picked from commit 96c36f735510d57507619cccf0f1bc96fa3c6158)
(cherry picked from commit 2667ee38359c46a8f6f7c4ca0c9d2b41772bd28a)
---
 subsys/bluetooth/host/Kconfig.gatt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/subsys/bluetooth/host/Kconfig.gatt b/subsys/bluetooth/host/Kconfig.gatt
index 050dab1215c..77bf0191740 100644
--- a/subsys/bluetooth/host/Kconfig.gatt
+++ b/subsys/bluetooth/host/Kconfig.gatt
@@ -285,8 +285,7 @@ config DEVICE_NAME_GATT_WRITABLE_AUTHEN
 endif #BT_DEVICE_NAME_GATT_WRITABLE
 
 config BT_GATT_AUTHORIZATION_CUSTOM
-	bool "Custom authorization of GATT operations [EXPERIMENTAL]"
-	select EXPERIMENTAL
+	bool "Custom authorization of GATT operations"
 	help
 	  This option allows the user to define application-specific
 	  authorization logic for GATT operations that can be registered

From fdfeca4ce8d7af79639256cfd5ee9ebdcf8c8be8 Mon Sep 17 00:00:00 2001
From: Kamil Piszczek <Kamil.Piszczek@nordicsemi.no>
Date: Tue, 17 Sep 2024 11:38:12 +0200
Subject: [PATCH 0072/2913] [nrf fromtree] mgmt: mcumgr: transport: bluetooth:
 add all gatt permission levels

Added new Kconfigs for defining permission level of GATT
characteristics that are part of the Bluetooth SMP service in the
MCUmgr subsys.

Removed the CONFIG_MCUMGR_TRANSPORT_BT_AUTHEN as the new Kconfig
options are mutually exclusive and need to be groupa as the Kconfig
choice option.

Signed-off-by: Kamil Piszczek <Kamil.Piszczek@nordicsemi.no>
(cherry picked from commit 8c0bc54ab09fe84050b4d5a44b1aa4667bcc6cef)
(cherry picked from commit ea7e265dadf63ab2def0813378f20f2da793877e)
(cherry picked from commit 27adc78a425a129069687249621cedc2558048a7)
---
 doc/releases/migration-guide-4.0.rst          |  4 +++
 .../mgmt/mcumgr/smp_svr/overlay-bt.conf       |  1 -
 scripts/utils/migrate_mcumgr_kconfigs.py      |  3 +-
 .../mgmt/mcumgr/transport/Kconfig.bluetooth   | 24 +++++++++++----
 subsys/mgmt/mcumgr/transport/src/smp_bt.c     | 29 +++++++++++++++----
 tests/subsys/mgmt/mcumgr/all_options/prj.conf |  3 +-
 6 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/doc/releases/migration-guide-4.0.rst b/doc/releases/migration-guide-4.0.rst
index 1437b4044de..f8a47907859 100644
--- a/doc/releases/migration-guide-4.0.rst
+++ b/doc/releases/migration-guide-4.0.rst
@@ -283,6 +283,10 @@ hawkBit
 MCUmgr
 ======
 
+* The ``MCUMGR_TRANSPORT_BT_AUTHEN`` Kconfig option from the :kconfig:option:`CONFIG_MCUMGR_TRANSPORT_BT` MCUmgr transport has been replaced with the :kconfig:option:`CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW` Kconfig choice.
+  The requirement for Bluetooth authentication is now indicated by the :kconfig:option:`CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN` Kconfig option.
+  To remove the default requirement for Bluetooth authentication it is necessary to enable the :kconfig:option:`CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW` Kconfig option in the project configuration.
+
 Modem
 =====
 
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/overlay-bt.conf b/samples/subsys/mgmt/mcumgr/smp_svr/overlay-bt.conf
index 8942068beb4..1b945465163 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/overlay-bt.conf
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/overlay-bt.conf
@@ -9,7 +9,6 @@ CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
 
 # Enable the Bluetooth mcumgr transport (unauthenticated).
 CONFIG_MCUMGR_TRANSPORT_BT=y
-CONFIG_MCUMGR_TRANSPORT_BT_AUTHEN=n
 CONFIG_MCUMGR_TRANSPORT_BT_CONN_PARAM_CONTROL=y
 
 # Enable the Shell mcumgr transport.
diff --git a/scripts/utils/migrate_mcumgr_kconfigs.py b/scripts/utils/migrate_mcumgr_kconfigs.py
index b2ca14e332e..429474f80ce 100644
--- a/scripts/utils/migrate_mcumgr_kconfigs.py
+++ b/scripts/utils/migrate_mcumgr_kconfigs.py
@@ -82,7 +82,8 @@
     "MCUMGR_BUF_SIZE" : "MCUMGR_TRANSPORT_NETBUF_SIZE",
     "MCUMGR_BUF_USER_DATA_SIZE" : "MCUMGR_TRANSPORT_NETBUF_USER_DATA_SIZE",
     "MCUMGR_SMP_BT" : "MCUMGR_TRANSPORT_BT",
-    "MCUMGR_SMP_BT_AUTHEN" : "MCUMGR_TRANSPORT_BT_AUTHEN",
+    "MCUMGR_SMP_BT_AUTHEN" : "MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN",
+    "MCUMGR_TRANSPORT_BT_AUTHEN" : "MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN",
     "MCUMGR_SMP_BT_CONN_PARAM_CONTROL" : "MCUMGR_TRANSPORT_BT_CONN_PARAM_CONTROL",
     "MCUMGR_SMP_BT_CONN_PARAM_CONTROL_MIN_INT" : "MCUMGR_TRANSPORT_BT_CONN_PARAM_CONTROL_MIN_INT",
     "MCUMGR_SMP_BT_CONN_PARAM_CONTROL_MAX_INT" : "MCUMGR_TRANSPORT_BT_CONN_PARAM_CONTROL_MAX_INT",
diff --git a/subsys/mgmt/mcumgr/transport/Kconfig.bluetooth b/subsys/mgmt/mcumgr/transport/Kconfig.bluetooth
index 4a65ddf137e..1e1d5c7f6e4 100644
--- a/subsys/mgmt/mcumgr/transport/Kconfig.bluetooth
+++ b/subsys/mgmt/mcumgr/transport/Kconfig.bluetooth
@@ -24,13 +24,25 @@ config MCUMGR_TRANSPORT_BT_REASSEMBLY
 	  When enabled, the SMP BT transport will buffer and reassemble received
 	  packet fragments before passing it for further processing.
 
-config MCUMGR_TRANSPORT_BT_AUTHEN
-	bool "Authenticated requirement for Bluetooth mcumgr SMP transport"
-	depends on BT_SMP
-	default y
+choice MCUMGR_TRANSPORT_BT_PERM
+	prompt "Permission used for the SMP service"
+	default MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN if BT_SMP
+	default MCUMGR_TRANSPORT_BT_PERM_RW
 	help
-	  Enables encrypted and authenticated connection requirement to
-	  Bluetooth SMP transport.
+	  Permission settings for GATT characteristics of the SMP service.
+
+config MCUMGR_TRANSPORT_BT_PERM_RW
+	bool "Read and write allowed"
+
+config MCUMGR_TRANSPORT_BT_PERM_RW_ENCRYPT
+	bool "Require encryption for access"
+	depends on BT_SMP
+
+config MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN
+	bool "Require encryption and authentication for access"
+	depends on BT_SMP
+
+endchoice
 
 config MCUMGR_TRANSPORT_BT_CONN_PARAM_CONTROL
 	bool "Request specific connection parameters for SMP packet exchange"
diff --git a/subsys/mgmt/mcumgr/transport/src/smp_bt.c b/subsys/mgmt/mcumgr/transport/src/smp_bt.c
index f3e72da3c6c..a72c8468647 100644
--- a/subsys/mgmt/mcumgr/transport/src/smp_bt.c
+++ b/subsys/mgmt/mcumgr/transport/src/smp_bt.c
@@ -49,6 +49,27 @@ LOG_MODULE_DECLARE(mcumgr_smp, CONFIG_MCUMGR_TRANSPORT_LOG_LEVEL);
 					CONFIG_BT_PERIPHERAL_PREF_TIMEOUT),		\
 				    (NULL))
 
+/* Permission levels for GATT characteristics of the SMP service. */
+#ifndef CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN
+#define CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN 0
+#endif
+#ifndef CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_ENCRYPT
+#define CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_ENCRYPT 0
+#endif
+#ifndef CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW
+#define CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW 0
+#endif
+
+#define SMP_GATT_PERM (							\
+	CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN ?			\
+	(BT_GATT_PERM_READ_AUTHEN | BT_GATT_PERM_WRITE_AUTHEN) :	\
+	CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_ENCRYPT ?			\
+	(BT_GATT_PERM_READ_ENCRYPT | BT_GATT_PERM_WRITE_ENCRYPT) :	\
+	(BT_GATT_PERM_READ | BT_GATT_PERM_WRITE))			\
+
+#define SMP_GATT_PERM_WRITE_MASK \
+	(BT_GATT_PERM_WRITE | BT_GATT_PERM_WRITE_ENCRYPT | BT_GATT_PERM_WRITE_AUTHEN)
+
 /* Minimum number of bytes that must be able to be sent with a notification to a target device
  * before giving up
  */
@@ -358,14 +379,10 @@ static void smp_bt_ccc_changed(const struct bt_gatt_attr *attr, uint16_t value)
 	BT_GATT_CHARACTERISTIC(&smp_bt_chr_uuid.uuid,					\
 			       BT_GATT_CHRC_WRITE_WITHOUT_RESP |			\
 			       BT_GATT_CHRC_NOTIFY,					\
-			       COND_CODE_1(CONFIG_MCUMGR_TRANSPORT_BT_AUTHEN,		\
-					   (BT_GATT_PERM_WRITE_AUTHEN),			\
-					   (BT_GATT_PERM_WRITE)),			\
+			       SMP_GATT_PERM & SMP_GATT_PERM_WRITE_MASK,		\
 			       NULL, smp_bt_chr_write, NULL),				\
 	BT_GATT_CCC(smp_bt_ccc_changed,							\
-		    COND_CODE_1(CONFIG_MCUMGR_TRANSPORT_BT_AUTHEN,			\
-				(BT_GATT_PERM_READ_AUTHEN | BT_GATT_PERM_WRITE_AUTHEN),	\
-				(BT_GATT_PERM_READ | BT_GATT_PERM_WRITE))),
+		    SMP_GATT_PERM),
 
 
 #ifdef CONFIG_MCUMGR_TRANSPORT_BT_DYNAMIC_SVC_REGISTRATION
diff --git a/tests/subsys/mgmt/mcumgr/all_options/prj.conf b/tests/subsys/mgmt/mcumgr/all_options/prj.conf
index ba15113a923..3087ce16c39 100644
--- a/tests/subsys/mgmt/mcumgr/all_options/prj.conf
+++ b/tests/subsys/mgmt/mcumgr/all_options/prj.conf
@@ -17,10 +17,9 @@ CONFIG_STREAM_FLASH=y
 CONFIG_IMG_MANAGER=y
 CONFIG_MCUMGR=y
 CONFIG_MCUMGR_TRANSPORT_BT=y
-CONFIG_MCUMGR_TRANSPORT_BT_AUTHEN=n
 CONFIG_MCUMGR_TRANSPORT_BT_CONN_PARAM_CONTROL=y
 CONFIG_MCUMGR_TRANSPORT_BT_REASSEMBLY=y
-CONFIG_MCUMGR_TRANSPORT_BT_AUTHEN=y
+CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN=y
 CONFIG_MCUMGR_TRANSPORT_DUMMY=y
 CONFIG_MCUMGR_TRANSPORT_DUMMY_RX_BUF_SIZE=512
 CONFIG_MCUMGR_TRANSPORT_SHELL=y

From c24fc5b361782b7684b31212895e40ff410c55b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Fri, 27 Sep 2024 11:04:36 +0200
Subject: [PATCH 0073/2913] [nrf fromtree] dts: arm: nordic: Define power
 states for nrf54h20/cpuapp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add definition of low power states 'idle' and 's2ram'
for nrf54h20/cpuapp.

manifest-pr-skip

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 5b607ed5c7869b6f01098bb02d5d81c357c3cb43)
(cherry picked from commit 0e3a477650017bf0afa79ce40830308dde0857e4)
(cherry picked from commit 0128bfc9d7164fcc35e18a2cd01072b9bf107d93)
---
 dts/common/nordic/nrf54h20.dtsi | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 12da886e38e..788e1eeaf0a 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -28,6 +28,7 @@
 			device_type = "cpu";
 			clocks = <&cpuapp_hsfll>;
 			clock-frequency = <DT_FREQ_M(320)>;
+			cpu-power-states = <&idle &s2ram>;
 		};
 
 		cpurad: cpu@3 {
@@ -122,6 +123,20 @@
 				nordic,tasks-mask = <0xffff0000>;
 			};
 		};
+
+		power-states {
+			idle: idle {
+				compatible = "zephyr,power-state";
+				power-state-name = "suspend-to-idle";
+				min-residency-us = <100000>;
+			};
+
+			s2ram: s2ram {
+				compatible = "zephyr,power-state";
+				power-state-name = "suspend-to-ram";
+				min-residency-us = <800000>;
+			};
+		};
 	};
 
 	reserved-memory {

From 4c09483144c4b0947270af96ccf5f396bec12484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Wed, 2 Oct 2024 09:04:50 +0200
Subject: [PATCH 0074/2913] [nrf fromtree] tests: drivers: uart: uart_pm:
 Disable PM_DEVICE_SYSTEM_MANAGED
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When PM_DEVICE_SYSTEM_MANAGED is enabled (and that's the default) all
devices are suspended when device go to idle state (through pm
subsystem and not through just cpu_idle). In this test we are manually
controlling PM of the DUT so we don't want that.

Additionally, suspend action is taking a semaphore and it is illegal
in idle thread (where system managment operates) which causes assert
in kernel scheduler.

Removed for nrf54h20 as it applies only there.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit cbe0abfd0002c761591af0d9ba7bc321d00dc589)
(cherry picked from commit b83478a230e79d24d69592274f2a93c9c83958a9)
(cherry picked from commit 0ac9c1dea131d9b45791fdfe2ba56f02329b637f)
---
 .../drivers/uart/uart_pm/boards/nrf54h20dk_nrf54h20_cpuapp.conf  | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 tests/drivers/uart/uart_pm/boards/nrf54h20dk_nrf54h20_cpuapp.conf

diff --git a/tests/drivers/uart/uart_pm/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/uart/uart_pm/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..09f887e0650
--- /dev/null
+++ b/tests/drivers/uart/uart_pm/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_PM_DEVICE_SYSTEM_MANAGED=n

From 4afc1f5e98734ae993df682d262d09149f1ab2dd Mon Sep 17 00:00:00 2001
From: Ivan Iushkov <ivan.iushkov@nordicsemi.no>
Date: Tue, 24 Sep 2024 15:39:14 +0200
Subject: [PATCH 0075/2913] [nrf fromtree] dts: nordic: Add Channel Sounding
 support to nrf-radio

- Added `cs-supported` property to nrf-radio devicetree
- Added `HAS_HW_NRF_RADIO_CS` Kconfig option which is set if
`cs-supported` property is enabled
- Enabled `cs-supported` property for nrf54-series devices
- Disabled `cs-supported` on nrf54l15bsim because it is not
yet supported

Signed-off-by: Ivan Iushkov <ivan.iushkov@nordicsemi.no>
(cherry picked from commit e35781419b8b41001d6bf476f996bf65d47f8fa7)
(cherry picked from commit 4c94a97f562805ed9c3a35cafde9a95ae2eab655)
(cherry picked from commit 5c77699af6a83faa23eb72fcae7ea0b21f9b805e)
---
 boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts | 3 ++-
 dts/bindings/net/wireless/nordic,nrf-radio.yaml         | 7 +++++++
 dts/common/nordic/nrf54h20.dtsi                         | 1 +
 dts/common/nordic/nrf54l15.dtsi                         | 1 +
 soc/nordic/common/Kconfig.peripherals                   | 3 +++
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
index 43ca4460f25..cd8b95be664 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -97,8 +97,9 @@
 
 &radio {
 	status = "okay";
-	/* This feature is not yet supported by the RADIO model */
+	/* These features are not yet supported by the RADIO model */
 	/delete-property/ dfe-supported;
+	/delete-property/ cs-supported;
 };
 
 &clock {
diff --git a/dts/bindings/net/wireless/nordic,nrf-radio.yaml b/dts/bindings/net/wireless/nordic,nrf-radio.yaml
index 9814e5f5fb7..8c73d652662 100644
--- a/dts/bindings/net/wireless/nordic,nrf-radio.yaml
+++ b/dts/bindings/net/wireless/nordic,nrf-radio.yaml
@@ -227,3 +227,10 @@ properties:
     description: |
       If set, indicates that the radio hardware supports high TX power
       settings.
+
+  cs-supported:
+    type: boolean
+    description: |
+      If set, the radio hardware supports the BLE Channel Sounding feature.
+      This property should be treated as read-only and should not be overridden;
+      the correct value is provided for your target's SoC already.
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 788e1eeaf0a..7c8e9a3eec3 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -415,6 +415,7 @@
 				status = "disabled";
 				ble-2mbps-supported;
 				ble-coded-phy-supported;
+				cs-supported;
 				dfe-supported;
 				ieee802154-supported;
 				interrupts = <44 NRF_DEFAULT_IRQ_PRIORITY>;
diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index 4eaac53d0eb..60b22599314 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -211,6 +211,7 @@
 				ieee802154-supported;
 				ble-2mbps-supported;
 				ble-coded-phy-supported;
+				cs-supported;
 
 				ieee802154: ieee802154 {
 					compatible = "nordic,nrf-ieee802154";
diff --git a/soc/nordic/common/Kconfig.peripherals b/soc/nordic/common/Kconfig.peripherals
index 2e77e7bf150..5b1afd66d3f 100644
--- a/soc/nordic/common/Kconfig.peripherals
+++ b/soc/nordic/common/Kconfig.peripherals
@@ -198,6 +198,9 @@ config HAS_HW_NRF_RADIO_BLE_2M
 config HAS_HW_NRF_RADIO_BLE_CODED
 	def_bool $(dt_nodelabel_bool_prop,radio,ble-coded-phy-supported)
 
+config HAS_HW_NRF_RADIO_CS
+	def_bool $(dt_nodelabel_bool_prop,radio,cs-supported)
+
 config HAS_HW_NRF_RADIO_DFE
 	def_bool $(dt_nodelabel_bool_prop,radio,dfe-supported)
 

From 42b5a99486ed840eff6fa4953f11bd8e59d34767 Mon Sep 17 00:00:00 2001
From: Olivier Lesage <olivier.lesage@nordicsemi.no>
Date: Fri, 20 Sep 2024 14:30:42 +0200
Subject: [PATCH 0076/2913] [nrf fromtree] bluetooth: host: set
 BT_BUF_EVT_RX_SIZE to 255 when CS is enabled

Channel sounding frequently produces very large events, so the default
of 68 bytes can lead to buffer overruns / memory corruption.

Signed-off-by: Olivier Lesage <olivier.lesage@nordicsemi.no>
(cherry picked from commit 7538a981c937e0c4738926d1c09f5826f355ca0f)
(cherry picked from commit dd8b760cf4eebfb38a8633fdeb3c2a0375ec5b6f)
(cherry picked from commit b09a13dee5847daa5e0e217da145aa9411191ed8)
---
 subsys/bluetooth/common/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/subsys/bluetooth/common/Kconfig b/subsys/bluetooth/common/Kconfig
index a34dbae692e..8bec5ba90d5 100644
--- a/subsys/bluetooth/common/Kconfig
+++ b/subsys/bluetooth/common/Kconfig
@@ -100,10 +100,11 @@ config BT_BUF_ACL_RX_COUNT
 
 config BT_BUF_EVT_RX_SIZE
 	int "Maximum supported HCI Event buffer length"
-	default $(UINT8_MAX) if (BT_EXT_ADV && BT_OBSERVER) || BT_PER_ADV_SYNC || BT_DF_CONNECTION_CTE_RX || BT_CLASSIC
+	default $(UINT8_MAX) if (BT_EXT_ADV && BT_OBSERVER) || BT_PER_ADV_SYNC || BT_DF_CONNECTION_CTE_RX || BT_CLASSIC || BT_CHANNEL_SOUNDING
 	# LE Read Supported Commands command complete event.
 	default 68
 	range 68 $(UINT8_MAX)
+	range 78 $(UINT8_MAX) if BT_CHANNEL_SOUNDING
 	help
 	  Maximum supported HCI event buffer size. This value does not include
 	  the HCI Event header.

From f2ee010d886d5490c36af0b069d6156810577395 Mon Sep 17 00:00:00 2001
From: Burak Gorduk <burak.gorduk@nordicsemi.no>
Date: Tue, 24 Sep 2024 10:53:43 +0100
Subject: [PATCH 0077/2913] [nrf fromtree] bluetooth: host: HCI support for CS
 configuration

Adds following HCI support for CS configuration:
- LE CS Create Config command
- LE CS Remove Config command
- LE CS Config Complete event

Two callbacks have been added to notify the application
when a new CS configuration is created or an existing
CS configuration is removed.

Signed-off-by: Burak Gorduk <burak.gorduk@nordicsemi.no>
(cherry picked from commit 7b82214d299922e55b448b4bce17f693df1dfe55)
(cherry picked from commit 79a9dfbd7780bc4a364320d3b47cd0dd51d0e66d)
(cherry picked from commit e69d180bde247c999e4e5f3283d3cf6a42de6722)
---
 include/zephyr/bluetooth/conn.h       | 145 +++++++++++++++++
 include/zephyr/bluetooth/cs.h         | 197 ++++++++++++++---------
 include/zephyr/bluetooth/hci_types.h  |  61 +++++++
 subsys/bluetooth/host/conn.c          |  34 ++++
 subsys/bluetooth/host/conn_internal.h |   4 +
 subsys/bluetooth/host/cs.c            | 121 ++++++++++++++
 subsys/bluetooth/host/hci_core.c      |   3 +
 subsys/bluetooth/host/hci_core.h      |   1 +
 subsys/bluetooth/shell/bt.c           |  60 +++++++
 subsys/bluetooth/shell/cs.c           | 219 +++++++++++++++++++++++---
 10 files changed, 749 insertions(+), 96 deletions(-)

diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index 6ddc9835ceb..e4030c265f9 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -413,6 +413,131 @@ struct bt_conn_le_cs_fae_table {
 	uint8_t *remote_fae_table;
 };
 
+/** Channel sounding main mode */
+enum bt_conn_le_cs_main_mode {
+	/** Mode-1 (RTT) */
+	BT_CONN_LE_CS_MAIN_MODE_1 = BT_HCI_OP_LE_CS_MAIN_MODE_1,
+	/** Mode-2 (PBR) */
+	BT_CONN_LE_CS_MAIN_MODE_2 = BT_HCI_OP_LE_CS_MAIN_MODE_2,
+	/** Mode-3 (RTT and PBR) */
+	BT_CONN_LE_CS_MAIN_MODE_3 = BT_HCI_OP_LE_CS_MAIN_MODE_3,
+};
+
+/** Channel sounding sub mode */
+enum bt_conn_le_cs_sub_mode {
+	/** Unused */
+	BT_CONN_LE_CS_SUB_MODE_UNUSED = BT_HCI_OP_LE_CS_SUB_MODE_UNUSED,
+	/** Mode-1 (RTT) */
+	BT_CONN_LE_CS_SUB_MODE_1 = BT_HCI_OP_LE_CS_SUB_MODE_1,
+	/** Mode-2 (PBR) */
+	BT_CONN_LE_CS_SUB_MODE_2 = BT_HCI_OP_LE_CS_SUB_MODE_2,
+	/** Mode-3 (RTT and PBR) */
+	BT_CONN_LE_CS_SUB_MODE_3 = BT_HCI_OP_LE_CS_SUB_MODE_3,
+};
+
+/** Channel sounding role */
+enum bt_conn_le_cs_role {
+	/** CS initiator role */
+	BT_CONN_LE_CS_ROLE_INITIATOR,
+	/** CS reflector role */
+	BT_CONN_LE_CS_ROLE_REFLECTOR,
+};
+
+/** Channel sounding RTT type */
+enum bt_conn_le_cs_rtt_type {
+	/** RTT AA only */
+	BT_CONN_LE_CS_RTT_TYPE_AA_ONLY = BT_HCI_OP_LE_CS_RTT_TYPE_AA_ONLY,
+	/** RTT with 32-bit sounding sequence */
+	BT_CONN_LE_CS_RTT_TYPE_32_BIT_SOUNDING = BT_HCI_OP_LE_CS_RTT_TYPE_32BIT_SOUND,
+	/** RTT with 96-bit sounding sequence */
+	BT_CONN_LE_CS_RTT_TYPE_96_BIT_SOUNDING = BT_HCI_OP_LE_CS_RTT_TYPE_96BIT_SOUND,
+	/** RTT with 32-bit random sequence */
+	BT_CONN_LE_CS_RTT_TYPE_32_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_32BIT_RAND,
+	/** RTT with 64-bit random sequence */
+	BT_CONN_LE_CS_RTT_TYPE_64_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_64BIT_RAND,
+	/** RTT with 96-bit random sequence */
+	BT_CONN_LE_CS_RTT_TYPE_96_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_96BIT_RAND,
+	/** RTT with 128-bit random sequence */
+	BT_CONN_LE_CS_RTT_TYPE_128_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_128BIT_RAND,
+};
+
+/** Channel sounding PHY used for CS sync */
+enum bt_conn_le_cs_sync_phy {
+	/** LE 1M PHY */
+	BT_CONN_LE_CS_SYNC_1M_PHY = BT_HCI_OP_LE_CS_CS_SYNC_1M,
+	/** LE 2M PHY */
+	BT_CONN_LE_CS_SYNC_2M_PHY = BT_HCI_OP_LE_CS_CS_SYNC_2M,
+	/** LE 2M 2BT PHY */
+	BT_CONN_LE_CS_SYNC_2M_2BT_PHY = BT_HCI_OP_LE_CS_CS_SYNC_2M_2BT,
+};
+
+/** Channel sounding channel selection type */
+enum bt_conn_le_cs_chsel_type {
+	/** Use Channel Selection Algorithm #3b for non-mode-0 CS steps */
+	BT_CONN_LE_CS_CHSEL_TYPE_3B = BT_HCI_OP_LE_CS_TEST_CHSEL_TYPE_3B,
+	/** Use Channel Selection Algorithm #3c for non-mode-0 CS steps */
+	BT_CONN_LE_CS_CHSEL_TYPE_3C = BT_HCI_OP_LE_CS_TEST_CHSEL_TYPE_3C,
+};
+
+/** Channel sounding channel sequence shape */
+enum bt_conn_le_cs_ch3c_shape {
+	/** Use Hat shape for user-specified channel sequence */
+	BT_CONN_LE_CS_CH3C_SHAPE_HAT = BT_HCI_OP_LE_CS_TEST_CH3C_SHAPE_HAT,
+	/** Use X shape for user-specified channel sequence */
+	BT_CONN_LE_CS_CH3C_SHAPE_X = BT_HCI_OP_LE_CS_TEST_CH3C_SHAPE_X,
+};
+
+/** Channel sounding configuration */
+struct bt_conn_le_cs_config {
+	/** CS configuration ID */
+	uint8_t id;
+	/** Main CS mode type */
+	enum bt_conn_le_cs_main_mode main_mode_type;
+	/** Sub CS mode type */
+	enum bt_conn_le_cs_sub_mode sub_mode_type;
+	/** Minimum number of CS main mode steps to be executed before a submode step is executed */
+	uint8_t min_main_mode_steps;
+	/** Maximum number of CS main mode steps to be executed before a submode step is executed */
+	uint8_t max_main_mode_steps;
+	/** Number of main mode steps taken from the end of the last CS subevent to be repeated
+	 *  at the beginning of the current CS subevent directly after the last mode-0 step of that
+	 *  event
+	 */
+	uint8_t main_mode_repetition;
+	/** Number of CS mode-0 steps to be included at the beginning of each CS subevent */
+	uint8_t mode_0_steps;
+	/** CS role */
+	enum bt_conn_le_cs_role role;
+	/** RTT type */
+	enum bt_conn_le_cs_rtt_type rtt_type;
+	/** CS Sync PHY */
+	enum bt_conn_le_cs_sync_phy cs_sync_phy;
+	/** The number of times the Channel_Map field will be cycled through for non-mode-0 steps
+	 *  within a CS procedure
+	 */
+	uint8_t channel_map_repetition;
+	/** Channel selection type */
+	enum bt_conn_le_cs_chsel_type channel_selection_type;
+	/** User-specified channel sequence shape */
+	enum bt_conn_le_cs_ch3c_shape ch3c_shape;
+	/** Number of channels skipped in each rising and falling sequence  */
+	uint8_t ch3c_jump;
+	/** Interlude time in microseconds between the RTT packets */
+	uint8_t t_ip1_time_us;
+	/** Interlude time in microseconds between the CS tones */
+	uint8_t t_ip2_time_us;
+	/** Time in microseconds for frequency changes */
+	uint8_t t_fcs_time_us;
+	/** Time in microseconds for the phase measurement period of the CS tones */
+	uint8_t t_pm_time_us;
+	/** Channel map used for CS procedure
+	 *  Channels n = 0, 1, 23, 24, 25, 77, and 78 are not allowed and shall be set to zero.
+	 *  Channel 79 is reserved for future use and shall be set to zero.
+	 *  At least 15 channels shall be enabled.
+	 */
+	uint8_t channel_map[10];
+};
+
 /** @brief Increment a connection's reference count.
  *
  *  Increment the reference count of a connection object.
@@ -1532,6 +1657,26 @@ struct bt_conn_cb {
 	 */
 	void (*remote_cs_fae_table_available)(struct bt_conn *conn,
 					      struct bt_conn_le_cs_fae_table *params);
+
+	/** @brief LE CS Config created.
+	 *
+	 *  This callback notifies the application that a Channel Sounding
+	 *  Configuration procedure has completed and a new CS config is created
+	 *
+	 *  @param conn Connection object.
+	 *  @param config CS configuration.
+	 */
+	void (*le_cs_config_created)(struct bt_conn *conn, struct bt_conn_le_cs_config *config);
+
+	/** @brief LE CS Config removed.
+	 *
+	 *  This callback notifies the application that a Channel Sounding
+	 *  Configuration procedure has completed and a CS config is removed
+	 *
+	 *  @param conn Connection object.
+	 *  @param config_id ID of the CS configuration that was removed.
+	 */
+	void (*le_cs_config_removed)(struct bt_conn *conn, uint8_t config_id);
 #endif
 
 	/** @internal Internally used field for list handling */
diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index 17331290e32..f836dfd3f4b 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -27,6 +27,26 @@
 extern "C" {
 #endif
 
+/**
+ * @brief Macro for getting a specific channel bit in CS channel map
+ *
+ * @param[in] chmap Channel map array
+ * @param[in] bit   Bit number to be accessed
+ *
+ * @return Bit value, either 1 or 0
+ */
+#define BT_LE_CS_CHANNEL_BIT_GET(chmap, bit) (((chmap)[(bit) / 8] >> ((bit) % 8)) & 1)
+
+/**
+ * @brief Macro for setting a specific channel bit value in CS channel map
+ *
+ * @param[in] chmap Channel map array
+ * @param[in] bit   Bit number to be accessed
+ * @param[in] val   Bit value to be set, either 1 or 0
+ */
+#define BT_LE_CS_CHANNEL_BIT_SET_VAL(chmap, bit, val)                                              \
+	((chmap)[(bit) / 8] = ((chmap)[(bit) / 8] & ~BIT((bit) % 8)) | ((val) << ((bit) % 8)))
+
 enum bt_cs_sync_antenna_selection_opt {
 	/** Use antenna identifier 1 for CS_SYNC packets. */
 	BT_CS_ANTENNA_SELECTION_OPT_ONE = BT_HCI_OP_LE_CS_ANTENNA_SEL_ONE,
@@ -60,59 +80,6 @@ struct bt_cs_set_default_settings_param {
 	int8_t max_tx_power;
 };
 
-/** CS Test Main Mode */
-enum bt_cs_test_main_mode {
-	/** CS Test Mode-1 */
-	BT_CS_TEST_MAIN_MODE_1 = BT_HCI_OP_LE_CS_MAIN_MODE_1,
-	/** CS Test Mode-2 */
-	BT_CS_TEST_MAIN_MODE_2 = BT_HCI_OP_LE_CS_MAIN_MODE_2,
-	/** CS Test Mode-3 */
-	BT_CS_TEST_MAIN_MODE_3 = BT_HCI_OP_LE_CS_MAIN_MODE_3,
-};
-
-/** CS Test Sub-Mode */
-enum bt_cs_test_sub_mode {
-	/** CS Test sub-mode-1 */
-	BT_CS_TEST_SUB_MODE_1 = BT_HCI_OP_LE_CS_SUB_MODE_1,
-	/** CS Test sub-mode-2 */
-	BT_CS_TEST_SUB_MODE_2 = BT_HCI_OP_LE_CS_SUB_MODE_2,
-	/** CS Test sub-mode-3 */
-	BT_CS_TEST_SUB_MODE_3 = BT_HCI_OP_LE_CS_SUB_MODE_3,
-	/** No CS Test sub-mode. */
-	BT_CS_TEST_SUB_MODE_UNUSED = BT_HCI_OP_LE_CS_SUB_MODE_UNUSED,
-};
-
-/** CS Test Role */
-enum bt_cs_test_role {
-	BT_CS_TEST_ROLE_INITIATOR = BT_HCI_OP_LE_CS_INITIATOR_ROLE,
-	BT_CS_TEST_ROLE_REFLECTOR = BT_HCI_OP_LE_CS_REFLECTOR_ROLE,
-};
-
-/** CS Test RTT type */
-enum bt_cs_test_rtt_type {
-	/** RTT AA Only */
-	BT_CS_TEST_RTT_AA_ONLY = BT_HCI_OP_LE_CS_RTT_TYPE_AA_ONLY,
-	/** RTT with 32-bit sounding sequence */
-	BT_CS_TEST_RTT_32_BIT_SOUNDING = BT_HCI_OP_LE_CS_RTT_TYPE_32BIT_SOUND,
-	/** RTT with 96-bit sounding sequence */
-	BT_CS_TEST_RTT_96_BIT_SOUNDING = BT_HCI_OP_LE_CS_RTT_TYPE_96BIT_SOUND,
-	/** RTT with 32-bit random sequence */
-	BT_CS_TEST_RTT_32_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_32BIT_RAND,
-	/** RTT with 64-bit random sequence */
-	BT_CS_TEST_RTT_64_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_64BIT_RAND,
-	/** RTT with 96-bit random sequence */
-	BT_CS_TEST_RTT_96_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_96BIT_RAND,
-	/** RTT with 128-bit random sequence */
-	BT_CS_TEST_RTT_128_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_128BIT_RAND,
-};
-
-/** CS Test CS_SYNC PHY */
-enum bt_cs_test_cs_sync_phy {
-	BT_CS_TEST_CS_SYNC_LE_1M_PHY = BT_HCI_OP_LE_CS_CS_SYNC_1M,
-	BT_CS_TEST_CS_SYNC_LE_2M_PHY = BT_HCI_OP_LE_CS_CS_SYNC_2M,
-	BT_CS_TEST_CS_SYNC_LE_2M_2BT_PHY = BT_HCI_OP_LE_CS_CS_SYNC_2M_2BT,
-};
-
 /** CS Test CS_SYNC Antenna Identifier */
 enum bt_cs_test_cs_sync_antenna_selection {
 	BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_ONE = BT_HCI_OP_LE_CS_ANTENNA_SEL_ONE,
@@ -179,18 +146,6 @@ enum bt_cs_test_reflector_snr_control {
 	BT_CS_TEST_REFLECTOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_NOT_USED,
 };
 
-/** CS Test Override 0 channel selection algorithm selection */
-enum bt_cs_test_override_0_chsel_alg {
-	BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3B = BT_HCI_OP_LE_CS_TEST_CHSEL_TYPE_3B,
-	BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3C = BT_HCI_OP_LE_CS_TEST_CHSEL_TYPE_3C,
-};
-
-/** CS Test Override 0 chsel #3c shape */
-enum bt_cs_test_override_0_ch3c_shape {
-	BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3C_HAT_SHAPE = BT_HCI_OP_LE_CS_TEST_CH3C_SHAPE_HAT,
-	BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3C_X_SHAPE = BT_HCI_OP_LE_CS_TEST_CH3C_SHAPE_X,
-};
-
 /** CS Test Override 3 T_PM Tone Extension */
 enum bt_cs_test_override_3_pm_tone_ext {
 	/** Initiator and reflector tones sent without tone extension */
@@ -336,9 +291,9 @@ enum bt_cs_test_override_8_cs_sync_payload_pattern {
 /** CS Test parameters */
 struct bt_cs_test_param {
 	/** CS mode to be used during the CS procedure. */
-	enum bt_cs_test_main_mode main_mode;
+	enum bt_conn_le_cs_main_mode main_mode;
 	/** CS sub-mode to be used during the CS procedure. */
-	enum bt_cs_test_sub_mode sub_mode;
+	enum bt_conn_le_cs_sub_mode sub_mode;
 	/** Number of main mode steps taken from the end of the last CS subevent
 	 * to be repeated at the beginning of the current CS subevent directly
 	 * after the last mode-0 step of that event.
@@ -347,11 +302,11 @@ struct bt_cs_test_param {
 	/** Number of CS mode-0 steps at the beginning of the test CS subevent. */
 	uint8_t mode_0_steps;
 	/** CS Test role */
-	enum bt_cs_test_role role;
+	enum bt_conn_le_cs_role role;
 	/** RTT variant */
-	enum bt_cs_test_rtt_type rtt_type;
+	enum bt_conn_le_cs_rtt_type rtt_type;
 	/** CS_SYNC PHY */
-	enum bt_cs_test_cs_sync_phy cs_sync_phy;
+	enum bt_conn_le_cs_sync_phy cs_sync_phy;
 	/** Antenna identifier to be used for CS_SYNC packets. */
 	enum bt_cs_test_cs_sync_antenna_selection cs_sync_antenna_selection;
 	/** CS subevent length in microseconds.
@@ -436,8 +391,8 @@ struct bt_cs_test_param {
 			} set;
 			struct {
 				uint8_t channel_map[10];
-				enum bt_cs_test_override_0_chsel_alg channel_selection_type;
-				enum bt_cs_test_override_0_ch3c_shape ch3c_shape;
+				enum bt_conn_le_cs_chsel_type channel_selection_type;
+				enum bt_conn_le_cs_ch3c_shape ch3c_shape;
 				uint8_t ch3c_jump;
 			} not_set;
 		};
@@ -470,12 +425,13 @@ struct bt_cs_test_param {
 	struct {
 		/** Bit number where the first marker in the channel sounding sequence starts.
 		 *
-		 *  Must be between 0 and 28 when using @ref BT_CS_TEST_RTT_32_BIT_SOUNDING.
+		 *  Must be between 0 and 28 when using @ref BT_CONN_LE_CS_RTT_TYPE_32_BIT_SOUNDING.
 		 */
 		uint8_t ss_marker1_position;
 		/** Bit number where the second marker in the channel sounding sequence starts.
 		 *
-		 *  Must be between 67 and 92 when using @ref BT_CS_TEST_RTT_96_BIT_SOUNDING.
+		 *  Must be between 67 and 92 when using @ref
+		 * BT_CONN_LE_CS_RTT_TYPE_96_BIT_SOUNDING.
 		 *
 		 *  A value of @ref BT_HCI_OP_LE_CS_TEST_SS_MARKER_2_POSITION_NOT_PRESENT
 		 *  indicates that this sounding sequence or marker is not present.
@@ -506,6 +462,68 @@ struct bt_cs_test_param {
 	} override_config_8;
 };
 
+/** CS config creation context */
+enum bt_le_cs_create_config_context {
+	/** Write CS configuration in local Controller only  */
+	BT_LE_CS_CREATE_CONFIG_CONTEXT_LOCAL_ONLY,
+	/** Write CS configuration in both local and remote Controller using Channel Sounding
+	 * Configuration procedure
+	 */
+	BT_LE_CS_CREATE_CONFIG_CONTEXT_LOCAL_AND_REMOTE
+};
+
+/** CS Create Config params */
+struct bt_le_cs_create_config_params {
+	/** CS configuration ID */
+	uint8_t id;
+	/** Main CS mode type */
+	enum bt_conn_le_cs_main_mode main_mode_type;
+	/** Sub CS mode type */
+	enum bt_conn_le_cs_sub_mode sub_mode_type;
+	/** Minimum number of CS main mode steps to be executed before a submode step is executed */
+	uint8_t min_main_mode_steps;
+	/** Maximum number of CS main mode steps to be executed before a submode step is executed */
+	uint8_t max_main_mode_steps;
+	/** Number of main mode steps taken from the end of the last CS subevent to be repeated
+	 * at the beginning of the current CS subevent directly after the last mode-0 step of that
+	 * event
+	 */
+	uint8_t main_mode_repetition;
+	/** Number of CS mode-0 steps to be included at the beginning of each CS subevent */
+	uint8_t mode_0_steps;
+	/** CS role */
+	enum bt_conn_le_cs_role role;
+	/** RTT type */
+	enum bt_conn_le_cs_rtt_type rtt_type;
+	/** CS Sync PHY */
+	enum bt_conn_le_cs_sync_phy cs_sync_phy;
+	/** The number of times the Channel_Map field will be cycled through for non-mode-0 steps
+	 * within a CS procedure
+	 */
+	uint8_t channel_map_repetition;
+	/** Channel selection type */
+	enum bt_conn_le_cs_chsel_type channel_selection_type;
+	/** User-specified channel sequence shape */
+	enum bt_conn_le_cs_ch3c_shape ch3c_shape;
+	/** Number of channels skipped in each rising and falling sequence  */
+	uint8_t ch3c_jump;
+	/** Channel map used for CS procedure
+	 *  Channels n = 0, 1, 23, 24, 25, 77, and 78 are not allowed and shall be set to zero.
+	 *  Channel 79 is reserved for future use and shall be set to zero.
+	 *  At least 15 channels shall be enabled.
+	 */
+	uint8_t channel_map[10];
+};
+
+/** @brief Set all valid channel map bits
+ *
+ * This command is used to enable all valid channels in a
+ * given CS channel map
+ *
+ * @param channel_map  Chanel map
+ */
+void bt_le_cs_set_valid_chmap_bits(uint8_t channel_map[10]);
+
 /** @brief Read Remote Supported Capabilities
  *
  * This command is used to query the CS capabilities that are supported
@@ -569,6 +587,37 @@ int bt_cs_read_remote_fae_table(struct bt_conn *conn);
  */
 int bt_cs_start_test(const struct bt_cs_test_param *params);
 
+/** @brief Create CS configuration
+ *
+ * This command is used to create a new CS configuration or update an
+ * existing one with the config id specified.
+ *
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ *
+ * @param conn    Connection Object.
+ * @param params  CS Create Config parameters
+ * @param context Controls whether the configuration is written to the local controller or
+ *                both the local and the remote controller
+ *
+ * @return Zero on success or (negative) error code on failure.
+ */
+int bt_le_cs_create_config(struct bt_conn *conn, struct bt_le_cs_create_config_params *params,
+			   enum bt_le_cs_create_config_context context);
+
+/** @brief Create CS configuration
+ *
+ * This command is used to remove a CS configuration from the local controller
+ * identified by the config_id
+ *
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ *
+ * @param conn      Connection Object.
+ * @param config_id CS Config ID
+ *
+ * @return Zero on success or (negative) error code on failure.
+ */
+int bt_le_cs_remove_config(struct bt_conn *conn, uint8_t config_id);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 31b30bbcf96..efc231efaef 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -2582,6 +2582,36 @@ struct bt_hci_op_le_cs_test {
 	uint8_t override_parameters_data[];
 } __packed;
 
+#define BT_HCI_OP_LE_CS_CREATE_CONFIG BT_OP(BT_OGF_LE, 0x0090) /* 0x2090 */
+
+struct bt_hci_cp_le_cs_create_config {
+	uint16_t handle;
+	uint8_t config_id;
+	uint8_t create_context;
+	uint8_t main_mode_type;
+	uint8_t sub_mode_type;
+	uint8_t min_main_mode_steps;
+	uint8_t max_main_mode_steps;
+	uint8_t main_mode_repetition;
+	uint8_t mode_0_steps;
+	uint8_t role;
+	uint8_t rtt_type;
+	uint8_t cs_sync_phy;
+	uint8_t channel_map[10];
+	uint8_t channel_map_repetition;
+	uint8_t channel_selection_type;
+	uint8_t ch3c_shape;
+	uint8_t ch3c_jump;
+	uint8_t reserved;
+} __packed;
+
+#define BT_HCI_OP_LE_CS_REMOVE_CONFIG BT_OP(BT_OGF_LE, 0x0091) /* 0x2091 */
+
+struct bt_hci_cp_le_cs_remove_config {
+	uint16_t handle;
+	uint8_t config_id;
+} __packed;
+
 /* Event definitions */
 
 #define BT_HCI_EVT_UNKNOWN                      0x00
@@ -3403,6 +3433,36 @@ struct bt_hci_evt_le_cs_read_remote_fae_table_complete {
 	uint8_t remote_fae_table[72];
 } __packed;
 
+#define BT_HCI_LE_CS_CONFIG_ACTION_REMOVED 0x00
+#define BT_HCI_LE_CS_CONFIG_ACTION_CREATED 0x01
+
+#define BT_HCI_EVT_LE_CS_CONFIG_COMPLETE 0x2F
+struct bt_hci_evt_le_cs_config_complete {
+	uint8_t status;
+	uint16_t handle;
+	uint8_t config_id;
+	uint8_t action;
+	uint8_t main_mode_type;
+	uint8_t sub_mode_type;
+	uint8_t min_main_mode_steps;
+	uint8_t max_main_mode_steps;
+	uint8_t main_mode_repetition;
+	uint8_t mode_0_steps;
+	uint8_t role;
+	uint8_t rtt_type;
+	uint8_t cs_sync_phy;
+	uint8_t channel_map[10];
+	uint8_t channel_map_repetition;
+	uint8_t channel_selection_type;
+	uint8_t ch3c_shape;
+	uint8_t ch3c_jump;
+	uint8_t reserved;
+	uint8_t t_ip1_time;
+	uint8_t t_ip2_time;
+	uint8_t t_fcs_time;
+	uint8_t t_pm_time;
+} __packed;
+
 /* Event mask bits */
 
 #define BT_EVT_BIT(n) (1ULL << (n))
@@ -3494,6 +3554,7 @@ struct bt_hci_evt_le_cs_read_remote_fae_table_complete {
 
 #define BT_EVT_MASK_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE BT_EVT_BIT(43)
 #define BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE              BT_EVT_BIT(44)
+#define BT_EVT_MASK_LE_CS_CONFIG_COMPLETE                             BT_EVT_BIT(46)
 
 /** HCI Error Codes, BT Core Spec v5.4 [Vol 1, Part F]. */
 #define BT_HCI_ERR_SUCCESS                      0x00
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 862f196618b..806eaba2010 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -3354,6 +3354,40 @@ void notify_remote_cs_fae_table(struct bt_conn *conn, struct bt_conn_le_cs_fae_t
 		}
 	}
 }
+
+void notify_cs_config_created(struct bt_conn *conn, struct bt_conn_le_cs_config *params)
+{
+	struct bt_conn_cb *callback;
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
+		if (callback->le_cs_config_created) {
+			callback->le_cs_config_created(conn, params);
+		}
+	}
+
+	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
+		if (cb->le_cs_config_created) {
+			cb->le_cs_config_created(conn, params);
+		}
+	}
+}
+
+void notify_cs_config_removed(struct bt_conn *conn, uint8_t config_id)
+{
+	struct bt_conn_cb *callback;
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
+		if (callback->le_cs_config_removed) {
+			callback->le_cs_config_removed(conn, config_id);
+		}
+	}
+
+	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
+		if (cb->le_cs_config_removed) {
+			cb->le_cs_config_removed(conn, config_id);
+		}
+	}
+}
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
 
 int bt_conn_le_param_update(struct bt_conn *conn,
diff --git a/subsys/bluetooth/host/conn_internal.h b/subsys/bluetooth/host/conn_internal.h
index 4cc4e70d858..0c334bc7cbe 100644
--- a/subsys/bluetooth/host/conn_internal.h
+++ b/subsys/bluetooth/host/conn_internal.h
@@ -498,6 +498,10 @@ void notify_remote_cs_capabilities(struct bt_conn *conn,
 void notify_remote_cs_fae_table(struct bt_conn *conn,
 			   struct bt_conn_le_cs_fae_table params);
 
+void notify_cs_config_created(struct bt_conn *conn, struct bt_conn_le_cs_config *params);
+
+void notify_cs_config_removed(struct bt_conn *conn, uint8_t config_id);
+
 #if defined(CONFIG_BT_SMP)
 /* If role specific LTK is present */
 bool bt_conn_ltk_present(const struct bt_conn *conn);
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index 5a713ad2457..d0d7f941b7b 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -18,6 +18,24 @@
 LOG_MODULE_REGISTER(bt_cs);
 
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
+
+void bt_le_cs_set_valid_chmap_bits(uint8_t channel_map[10])
+{
+	memset(channel_map, 0xFF, 10);
+
+	/** Channels n = 0, 1, 23, 24, 25, 77, and 78 are not allowed and shall be set to zero.
+	 *  Channel 79 is reserved for future use and shall be set to zero.
+	 */
+	BT_LE_CS_CHANNEL_BIT_SET_VAL(channel_map, 0, 0);
+	BT_LE_CS_CHANNEL_BIT_SET_VAL(channel_map, 1, 0);
+	BT_LE_CS_CHANNEL_BIT_SET_VAL(channel_map, 23, 0);
+	BT_LE_CS_CHANNEL_BIT_SET_VAL(channel_map, 24, 0);
+	BT_LE_CS_CHANNEL_BIT_SET_VAL(channel_map, 25, 0);
+	BT_LE_CS_CHANNEL_BIT_SET_VAL(channel_map, 77, 0);
+	BT_LE_CS_CHANNEL_BIT_SET_VAL(channel_map, 78, 0);
+	BT_LE_CS_CHANNEL_BIT_SET_VAL(channel_map, 79, 0);
+}
+
 int bt_cs_read_remote_supported_capabilities(struct bt_conn *conn)
 {
 	struct bt_hci_cp_le_read_remote_supported_capabilities *cp;
@@ -326,4 +344,107 @@ int bt_cs_start_test(const struct bt_cs_test_param *params)
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_TEST, buf, NULL);
 }
 
+void bt_hci_le_cs_config_complete_event(struct net_buf *buf)
+{
+	struct bt_hci_evt_le_cs_config_complete *evt;
+	struct bt_conn_le_cs_config config;
+	struct bt_conn *conn;
+
+	if (buf->len < sizeof(*evt)) {
+		LOG_ERR("Unexpected end of buffer");
+		return;
+	}
+
+	evt = net_buf_pull_mem(buf, sizeof(*evt));
+	if (evt->status) {
+		LOG_INF("CS Config failed (status 0x%02X)", evt->status);
+		return;
+	}
+
+	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->handle), BT_CONN_TYPE_LE);
+	if (!conn) {
+		LOG_ERR("Could not lookup connection handle when reading CS configuration");
+		return;
+	}
+
+	if (evt->action == BT_HCI_LE_CS_CONFIG_ACTION_REMOVED) {
+		notify_cs_config_removed(conn, evt->config_id);
+		bt_conn_unref(conn);
+		return;
+	}
+
+	config.id = evt->config_id;
+	config.main_mode_type = evt->main_mode_type;
+	config.sub_mode_type = evt->sub_mode_type;
+	config.min_main_mode_steps = evt->min_main_mode_steps;
+	config.max_main_mode_steps = evt->max_main_mode_steps;
+	config.main_mode_repetition = evt->main_mode_repetition;
+	config.mode_0_steps = evt->mode_0_steps;
+	config.role = evt->role;
+	config.rtt_type = evt->rtt_type;
+	config.cs_sync_phy = evt->cs_sync_phy;
+	config.channel_map_repetition = evt->channel_map_repetition;
+	config.channel_selection_type = evt->channel_selection_type;
+	config.ch3c_shape = evt->ch3c_shape;
+	config.ch3c_jump = evt->ch3c_jump;
+	config.t_ip1_time_us = evt->t_ip1_time;
+	config.t_ip2_time_us = evt->t_ip2_time;
+	config.t_fcs_time_us = evt->t_fcs_time;
+	config.t_pm_time_us = evt->t_pm_time;
+	memcpy(config.channel_map, evt->channel_map, ARRAY_SIZE(config.channel_map));
+
+	notify_cs_config_created(conn, &config);
+	bt_conn_unref(conn);
+}
+
+int bt_le_cs_create_config(struct bt_conn *conn, struct bt_le_cs_create_config_params *params,
+			   enum bt_le_cs_create_config_context context)
+{
+	struct bt_hci_cp_le_cs_create_config *cp;
+	struct net_buf *buf;
+
+	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_CREATE_CONFIG, sizeof(*cp));
+	if (!buf) {
+		return -ENOBUFS;
+	}
+
+	cp = net_buf_add(buf, sizeof(*cp));
+	cp->handle = sys_cpu_to_le16(conn->handle);
+	cp->config_id = params->id;
+	cp->create_context = context;
+	cp->main_mode_type = params->main_mode_type;
+	cp->sub_mode_type = params->sub_mode_type;
+	cp->min_main_mode_steps = params->min_main_mode_steps;
+	cp->max_main_mode_steps = params->max_main_mode_steps;
+	cp->main_mode_repetition = params->main_mode_repetition;
+	cp->mode_0_steps = params->mode_0_steps;
+	cp->role = params->role;
+	cp->rtt_type = params->rtt_type;
+	cp->cs_sync_phy = params->cs_sync_phy;
+	cp->channel_map_repetition = params->channel_map_repetition;
+	cp->channel_selection_type = params->channel_selection_type;
+	cp->ch3c_shape = params->ch3c_shape;
+	cp->ch3c_jump = params->ch3c_jump;
+	cp->reserved = 0;
+	memcpy(cp->channel_map, params->channel_map, ARRAY_SIZE(cp->channel_map));
+
+	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_CREATE_CONFIG, buf, NULL);
+}
+
+int bt_le_cs_remove_config(struct bt_conn *conn, uint8_t config_id)
+{
+	struct bt_hci_cp_le_cs_remove_config *cp;
+	struct net_buf *buf;
+
+	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_REMOVE_CONFIG, sizeof(*cp));
+	if (!buf) {
+		return -ENOBUFS;
+	}
+
+	cp = net_buf_add(buf, sizeof(*cp));
+	cp->handle = sys_cpu_to_le16(conn->handle);
+	cp->config_id = config_id;
+
+	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_REMOVE_CONFIG, buf, NULL);
+}
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index b1ab4fbb664..39fe50643a7 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -2828,6 +2828,8 @@ static const struct event_handler meta_events[] = {
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE,
 		      bt_hci_le_cs_read_remote_fae_table_complete,
 		      sizeof(struct bt_hci_evt_le_cs_read_remote_fae_table_complete)),
+	EVENT_HANDLER(BT_HCI_EVT_LE_CS_CONFIG_COMPLETE, bt_hci_le_cs_config_complete_event,
+		      sizeof(struct bt_hci_evt_le_cs_config_complete)),
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
 
 };
@@ -3404,6 +3406,7 @@ static int le_set_event_mask(void)
 	    BT_FEAT_LE_CHANNEL_SOUNDING(bt_dev.le.features)) {
 		mask |= BT_EVT_MASK_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE;
 		mask |= BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE;
+		mask |= BT_EVT_MASK_LE_CS_CONFIG_COMPLETE;
 	}
 
 	sys_put_le64(mask, cp_mask->events);
diff --git a/subsys/bluetooth/host/hci_core.h b/subsys/bluetooth/host/hci_core.h
index 590d85a6c49..a50b534f1b7 100644
--- a/subsys/bluetooth/host/hci_core.h
+++ b/subsys/bluetooth/host/hci_core.h
@@ -541,6 +541,7 @@ void bt_hci_le_past_received_v2(struct net_buf *buf);
 /* CS HCI event handlers */
 void bt_hci_le_cs_read_remote_supported_capabilities_complete(struct net_buf *buf);
 void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf);
+void bt_hci_le_cs_config_complete_event(struct net_buf *buf);
 
 /* Adv HCI event handlers */
 void bt_hci_le_adv_set_terminated(struct net_buf *buf);
diff --git a/subsys/bluetooth/shell/bt.c b/subsys/bluetooth/shell/bt.c
index 25841fd48d6..b900fe721df 100644
--- a/subsys/bluetooth/shell/bt.c
+++ b/subsys/bluetooth/shell/bt.c
@@ -1052,6 +1052,64 @@ void print_remote_cs_fae_table(struct bt_conn *conn, struct bt_conn_le_cs_fae_ta
 	shell_print(ctx_shell, "Received FAE Table: ");
 	shell_hexdump(ctx_shell, params->remote_fae_table, 72);
 }
+
+static void le_cs_config_created(struct bt_conn *conn, struct bt_conn_le_cs_config *config)
+{
+	const char *mode_str[5] = {"Unused", "1 (RTT)", "2 (PBR)", "3 (RTT + PBR)", "Invalid"};
+	const char *role_str[3] = {"Initiator", "Reflector", "Invalid"};
+	const char *rtt_type_str[8] = {"AA only",        "32-bit sounding", "96-bit sounding",
+				       "32-bit random",  "64-bit random",   "96-bit random",
+				       "128-bit random", "Invalid"};
+	const char *phy_str[4] = {"Invalid", "LE 1M PHY", "LE 2M PHY", "LE 2M 2BT PHY"};
+	const char *chsel_type_str[3] = {"Algorithm #3b", "Algorithm #3c", "Invalid"};
+	const char *ch3c_shape_str[3] = {"Hat shape", "X shape", "Invalid"};
+
+	uint8_t main_mode_idx = config->main_mode_type > 0 && config->main_mode_type < 4
+					? config->main_mode_type
+					: 4;
+	uint8_t sub_mode_idx = config->sub_mode_type < 4 ? config->sub_mode_type : 0;
+	uint8_t role_idx = MIN(config->role, 2);
+	uint8_t rtt_type_idx = MIN(config->rtt_type, 7);
+	uint8_t phy_idx =
+		config->cs_sync_phy > 0 && config->cs_sync_phy < 4 ? config->cs_sync_phy : 0;
+	uint8_t chsel_type_idx = MIN(config->channel_selection_type, 2);
+	uint8_t ch3c_shape_idx = MIN(config->ch3c_shape, 2);
+
+	shell_print(ctx_shell,
+		    "New CS config created:\n"
+		    "- ID: %d\n"
+		    "- Role: %s\n"
+		    "- Main mode: %s\n"
+		    "- Sub mode: %s\n"
+		    "- RTT type: %s\n"
+		    "- Main mode steps: %d - %d\n"
+		    "- Main mode repetition: %d\n"
+		    "- Mode 0 steps: %d\n"
+		    "- CS sync PHY: %s\n"
+		    "- T_IP1 time: %d\n"
+		    "- T_IP2 time: %d\n"
+		    "- T_FCS time: %d\n"
+		    "- T_PM time: %d\n"
+		    "- Channel map: 0x%08X%08X%04X\n"
+		    "- Channel map repetition: %d\n"
+		    "- Channel selection type: %s\n"
+		    "- Ch3c shape: %s\n"
+		    "- Ch3c jump: %d\n",
+		    config->id, role_str[role_idx], mode_str[main_mode_idx], mode_str[sub_mode_idx],
+		    rtt_type_str[rtt_type_idx], config->min_main_mode_steps,
+		    config->max_main_mode_steps, config->main_mode_repetition, config->mode_0_steps,
+		    phy_str[phy_idx], config->t_ip1_time_us, config->t_ip2_time_us,
+		    config->t_fcs_time_us, config->t_pm_time_us,
+		    sys_get_le32(&config->channel_map[6]), sys_get_le32(&config->channel_map[2]),
+		    sys_get_le16(&config->channel_map[0]), config->channel_map_repetition,
+		    chsel_type_str[chsel_type_idx], ch3c_shape_str[ch3c_shape_idx],
+		    config->ch3c_jump);
+}
+
+static void le_cs_config_removed(struct bt_conn *conn, uint8_t config_id)
+{
+	shell_print(ctx_shell, "CS config %d is removed", config_id);
+}
 #endif
 
 static struct bt_conn_cb conn_callbacks = {
@@ -1086,6 +1144,8 @@ static struct bt_conn_cb conn_callbacks = {
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
 	.remote_cs_capabilities_available = print_remote_cs_capabilities,
 	.remote_cs_fae_table_available = print_remote_cs_fae_table,
+	.le_cs_config_created = le_cs_config_created,
+	.le_cs_config_removed = le_cs_config_removed,
 #endif
 };
 #endif /* CONFIG_BT_CONN */
diff --git a/subsys/bluetooth/shell/cs.c b/subsys/bluetooth/shell/cs.c
index b8f32be61be..63fb0ad7828 100644
--- a/subsys/bluetooth/shell/cs.c
+++ b/subsys/bluetooth/shell/cs.c
@@ -139,8 +139,8 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	int err = 0;
 	struct bt_cs_test_param params;
 
-	params.main_mode = BT_CS_TEST_MAIN_MODE_1;
-	params.sub_mode = BT_CS_TEST_SUB_MODE_UNUSED;
+	params.main_mode = BT_CONN_LE_CS_MAIN_MODE_1;
+	params.sub_mode = BT_CONN_LE_CS_SUB_MODE_UNUSED;
 	params.main_mode_repetition = 0;
 	params.mode_0_steps = 0x1;
 
@@ -152,14 +152,15 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 		return SHELL_CMD_HELP_PRINTED;
 	}
 
-	if (params.role != BT_CS_TEST_ROLE_INITIATOR && params.role != BT_CS_TEST_ROLE_REFLECTOR) {
+	if (params.role != BT_CONN_LE_CS_ROLE_INITIATOR &&
+	    params.role != BT_CONN_LE_CS_ROLE_REFLECTOR) {
 		shell_help(sh);
 		shell_error(sh, "Role selection input invalid");
 		return SHELL_CMD_HELP_PRINTED;
 	}
 
-	params.rtt_type = BT_CS_TEST_RTT_AA_ONLY;
-	params.cs_sync_phy = BT_CS_TEST_CS_SYNC_LE_1M_PHY;
+	params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_AA_ONLY;
+	params.cs_sync_phy = BT_CONN_LE_CS_SYNC_1M_PHY;
 	params.cs_sync_antenna_selection = BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_ONE;
 	params.subevent_len = 10000;
 	params.subevent_interval = 0;
@@ -177,12 +178,10 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	params.override_config = 0;
 	params.override_config_0.channel_map_repetition = 1;
 	memset(params.override_config_0.not_set.channel_map, 0,
-		sizeof(params.override_config_0.not_set.channel_map));
+	       sizeof(params.override_config_0.not_set.channel_map));
 	params.override_config_0.not_set.channel_map[1] = 0xFF;
-	params.override_config_0.not_set.channel_selection_type =
-		BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3B;
-	params.override_config_0.not_set.ch3c_shape =
-		BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3C_HAT_SHAPE;
+	params.override_config_0.not_set.channel_selection_type = BT_CONN_LE_CS_CHSEL_TYPE_3B;
+	params.override_config_0.not_set.ch3c_shape = BT_CONN_LE_CS_CH3C_SHAPE_HAT;
 	params.override_config_0.not_set.ch3c_jump = 0x2;
 
 	err = bt_cs_start_test(&params);
@@ -194,26 +193,202 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	return 0;
 }
 
+static int cmd_remove_config(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err = 0;
+
+	if (default_conn == NULL) {
+		shell_error(sh, "Conn handle error, at least one connection is required.");
+		return -ENOEXEC;
+	}
+
+	uint8_t config_id = strtoul(argv[1], NULL, 10);
+
+	err = bt_le_cs_remove_config(default_conn, config_id);
+	if (err) {
+		shell_error(sh, "bt_cs_remove_config returned error %d", err);
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
+static int cmd_create_config(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err = 0;
+	enum bt_le_cs_create_config_context context;
+	struct bt_le_cs_create_config_params params;
+
+	if (default_conn == NULL) {
+		shell_error(sh, "Conn handle error, at least one connection is required.");
+		return -ENOEXEC;
+	}
+
+	params.id = strtoul(argv[1], NULL, 10);
+	if (!strcmp(argv[2], "local-only")) {
+		context = BT_LE_CS_CREATE_CONFIG_CONTEXT_LOCAL_ONLY;
+	} else if (!strcmp(argv[2], "local-only")) {
+		context = BT_LE_CS_CREATE_CONFIG_CONTEXT_LOCAL_AND_REMOTE;
+	} else {
+		shell_error(sh, "Invalid context: %s", argv[2]);
+		shell_help(sh);
+		return SHELL_CMD_HELP_PRINTED;
+	}
+
+	if (!strcmp(argv[3], "initiator")) {
+		params.role = BT_CONN_LE_CS_ROLE_INITIATOR;
+	} else if (!strcmp(argv[3], "reflector")) {
+		params.role = BT_CONN_LE_CS_ROLE_REFLECTOR;
+	} else {
+		shell_error(sh, "Invalid role: %s", argv[3]);
+		shell_help(sh);
+		return SHELL_CMD_HELP_PRINTED;
+	}
+
+	/* Set the default values */
+	params.main_mode_type = BT_CONN_LE_CS_MAIN_MODE_2;
+	params.sub_mode_type = BT_CONN_LE_CS_SUB_MODE_1;
+	params.min_main_mode_steps = 0x05;
+	params.max_main_mode_steps = 0x0A;
+	params.main_mode_repetition = 0;
+	params.mode_0_steps = 1;
+	params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_AA_ONLY;
+	params.cs_sync_phy = BT_CONN_LE_CS_SYNC_2M_PHY;
+	params.channel_map_repetition = 1;
+	params.channel_selection_type = BT_CONN_LE_CS_CHSEL_TYPE_3B;
+	params.ch3c_shape = BT_CONN_LE_CS_CH3C_SHAPE_HAT;
+	params.ch3c_jump = 2;
+
+	bt_le_cs_set_valid_chmap_bits(params.channel_map);
+
+	for (int j = 4; j < argc; j++) {
+		if (!strcmp(argv[j], "rtt-none")) {
+			params.main_mode_type = BT_CONN_LE_CS_MAIN_MODE_1;
+			params.sub_mode_type = BT_CONN_LE_CS_SUB_MODE_UNUSED;
+		} else if (!strcmp(argv[j], "pbr-none")) {
+			params.main_mode_type = BT_CONN_LE_CS_MAIN_MODE_2;
+			params.sub_mode_type = BT_CONN_LE_CS_SUB_MODE_UNUSED;
+		} else if (!strcmp(argv[j], "both-none")) {
+			params.main_mode_type = BT_CONN_LE_CS_MAIN_MODE_3;
+			params.sub_mode_type = BT_CONN_LE_CS_SUB_MODE_UNUSED;
+		} else if (!strcmp(argv[j], "pbr-rtt")) {
+			params.main_mode_type = BT_CONN_LE_CS_MAIN_MODE_2;
+			params.sub_mode_type = BT_CONN_LE_CS_SUB_MODE_1;
+		} else if (!strcmp(argv[j], "pbr-both")) {
+			params.main_mode_type = BT_CONN_LE_CS_MAIN_MODE_2;
+			params.sub_mode_type = BT_CONN_LE_CS_SUB_MODE_3;
+		} else if (!strcmp(argv[j], "both-pbr")) {
+			params.main_mode_type = BT_CONN_LE_CS_MAIN_MODE_3;
+			params.sub_mode_type = BT_CONN_LE_CS_SUB_MODE_2;
+		} else if (!strcmp(argv[j], "steps")) {
+			if (++j == argc) {
+				shell_help(sh);
+				return SHELL_CMD_HELP_PRINTED;
+			}
+
+			params.min_main_mode_steps = strtoul(argv[j], NULL, 10);
+			if (++j == argc) {
+				shell_help(sh);
+				return SHELL_CMD_HELP_PRINTED;
+			}
+
+			params.max_main_mode_steps = strtoul(argv[j], NULL, 10);
+			if (++j == argc) {
+				shell_help(sh);
+				return SHELL_CMD_HELP_PRINTED;
+			}
+
+			params.mode_0_steps = strtoul(argv[j], NULL, 10);
+		} else if (!strcmp(argv[j], "aa-only")) {
+			params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_AA_ONLY;
+		} else if (!strcmp(argv[j], "32b-sound")) {
+			params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_32_BIT_SOUNDING;
+		} else if (!strcmp(argv[j], "96b-sound")) {
+			params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_96_BIT_SOUNDING;
+		} else if (!strcmp(argv[j], "32b-rand")) {
+			params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_32_BIT_RANDOM;
+		} else if (!strcmp(argv[j], "64b-rand")) {
+			params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_64_BIT_RANDOM;
+		} else if (!strcmp(argv[j], "96b-rand")) {
+			params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_96_BIT_RANDOM;
+		} else if (!strcmp(argv[j], "128b-rand")) {
+			params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_128_BIT_RANDOM;
+		} else if (!strcmp(argv[j], "phy-1m")) {
+			params.cs_sync_phy = BT_CONN_LE_CS_SYNC_1M_PHY;
+		} else if (!strcmp(argv[j], "phy-2m")) {
+			params.cs_sync_phy = BT_CONN_LE_CS_SYNC_2M_PHY;
+		} else if (!strcmp(argv[j], "phy-2m-2b")) {
+			params.cs_sync_phy = BT_CONN_LE_CS_SYNC_2M_2BT_PHY;
+		} else if (!strcmp(argv[j], "chmap-rep")) {
+			if (++j == argc) {
+				shell_help(sh);
+				return SHELL_CMD_HELP_PRINTED;
+			}
+
+			params.channel_map_repetition = strtoul(argv[j], NULL, 10);
+		} else if (!strcmp(argv[j], "hat-shape")) {
+			params.ch3c_shape = BT_CONN_LE_CS_CH3C_SHAPE_HAT;
+		} else if (!strcmp(argv[j], "x-shape")) {
+			params.ch3c_shape = BT_CONN_LE_CS_CH3C_SHAPE_X;
+		} else if (!strcmp(argv[j], "chsel-3b")) {
+			params.channel_selection_type = BT_CONN_LE_CS_CHSEL_TYPE_3B;
+		} else if (!strcmp(argv[j], "chsel-3c")) {
+			params.channel_selection_type = BT_CONN_LE_CS_CHSEL_TYPE_3C;
+		} else if (!strcmp(argv[j], "ch3c-jump")) {
+			if (++j == argc) {
+				shell_help(sh);
+				return SHELL_CMD_HELP_PRINTED;
+			}
+
+			params.ch3c_jump = strtoul(argv[j], NULL, 10);
+		} else if (!strcmp(argv[j], "chmap")) {
+			if (++j == argc) {
+				shell_help(sh);
+				return SHELL_CMD_HELP_PRINTED;
+			}
+
+			if (hex2bin(argv[j], strlen(argv[j]), params.channel_map, 10) == 0) {
+				shell_error(sh, "Invalid channel map");
+				return -ENOEXEC;
+			}
+
+			sys_mem_swap(params.channel_map, 10);
+		} else {
+			shell_help(sh);
+			return SHELL_CMD_HELP_PRINTED;
+		}
+	}
+
+	err = bt_le_cs_create_config(default_conn, &params, context);
+	if (err) {
+		shell_error(sh, "bt_cs_create_config returned error %d", err);
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	cs_cmds,
-	SHELL_CMD_ARG(
-		read_remote_supported_capabilities, NULL,
-		"<None>",
-		cmd_read_remote_supported_capabilities, 1, 0),
+	SHELL_CMD_ARG(read_remote_supported_capabilities, NULL, "<None>",
+		      cmd_read_remote_supported_capabilities, 1, 0),
 	SHELL_CMD_ARG(
 		set_default_settings, NULL,
 		"<Enable initiator role: true, false> <Enable reflector role: true, false> "
 		" <CS_SYNC antenna selection: 0x01 - 0x04, 0xFE, 0xFF> <Max TX power: -127 - 20>",
 		cmd_set_default_settings, 5, 0),
+	SHELL_CMD_ARG(read_remote_fae_table, NULL, "<None>", cmd_read_remote_fae_table, 1, 0),
+	SHELL_CMD_ARG(start_simple_cs_test, NULL, "<Role selection (initiator, reflector): 0, 1>",
+		      cmd_cs_test_simple, 2, 0),
 	SHELL_CMD_ARG(
-		read_remote_fae_table, NULL,
-		"<None>",
-		cmd_read_remote_fae_table, 1, 0),
-	SHELL_CMD_ARG(
-		start_simple_cs_test, NULL,
-		"<Role selection (initiator, reflector): 0, 1>",
-		cmd_cs_test_simple, 2, 0),
-	SHELL_SUBCMD_SET_END);
+		create_config, NULL,
+		"<id> <context: local-only, local-remote> <role: initiator, reflector> "
+		"[rtt-none, pbr-none, both-none, pbr-rtt, pbr-both, both-pbr] [steps <min> "
+		"<max> <mode-0>] [aa-only, 32b-sound, 96b-sound, 32b-rand, 64b-rand, 96b-rand, "
+		"128b-rand] [phy-1m, phy-2m, phy-2m-2b] [chmap-rep <rep>] [hat-shape, x-shape] "
+		"[ch3c-jump <jump>] [chmap <XXXXXXXXXXXXXXXX>] (78-0) [chsel-3b, chsel-3c]",
+		cmd_create_config, 4, 15),
+	SHELL_CMD_ARG(remove_config, NULL, "<id>", cmd_remove_config, 2, 0), SHELL_SUBCMD_SET_END);
 
 static int cmd_cs(const struct shell *sh, size_t argc, char **argv)
 {

From 8ac8463b7a166427325d5cf5b9e1253a58ba016b Mon Sep 17 00:00:00 2001
From: Burak Gorduk <burak.gorduk@nordicsemi.no>
Date: Tue, 24 Sep 2024 11:32:51 +0100
Subject: [PATCH 0078/2913] [nrf fromtree] bluetooth: host: Use consistent API
 naming for CS

This change adds bt_le_cs prefix to public CS API as well as
adding le_cs prefix to CS related bt_conn callbacks. This is
to ensure consistency within CS API while maintaining the
separation between the Bluetooth LE and Classic features.

Signed-off-by: Burak Gorduk <burak.gorduk@nordicsemi.no>
(cherry picked from commit 6e3c3f67e1fe5900e297af4e5fb977f86794a01e)
(cherry picked from commit 9d0f115d1260b61279df81c4c9bfb4f77b90e247)
(cherry picked from commit 31ff54b941814cb669b6dcc15a8118e823878d9f)
---
 include/zephyr/bluetooth/conn.h |   8 +-
 include/zephyr/bluetooth/cs.h   | 210 ++++++++++++++++----------------
 subsys/bluetooth/host/conn.c    |  16 +--
 subsys/bluetooth/host/cs.c      |  10 +-
 subsys/bluetooth/shell/bt.c     |   4 +-
 subsys/bluetooth/shell/cs.c     |  44 +++----
 6 files changed, 148 insertions(+), 144 deletions(-)

diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index e4030c265f9..1538c36a218 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -1644,8 +1644,8 @@ struct bt_conn_cb {
 	 *  @param conn Connection object.
 	 *  @param remote_cs_capabilities Remote Channel Sounding Capabilities.
 	 */
-	void (*remote_cs_capabilities_available)(struct bt_conn *conn,
-						 struct bt_conn_le_cs_capabilities *params);
+	void (*le_cs_remote_capabilities_available)(struct bt_conn *conn,
+						    struct bt_conn_le_cs_capabilities *params);
 
 	/** @brief LE CS Read Remote FAE Table Complete event.
 	 *
@@ -1655,8 +1655,8 @@ struct bt_conn_cb {
 	 *  @param conn Connection object.
 	 *  @param params FAE Table.
 	 */
-	void (*remote_cs_fae_table_available)(struct bt_conn *conn,
-					      struct bt_conn_le_cs_fae_table *params);
+	void (*le_cs_remote_fae_table_available)(struct bt_conn *conn,
+						 struct bt_conn_le_cs_fae_table *params);
 
 	/** @brief LE CS Config created.
 	 *
diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index f836dfd3f4b..c04fb3a9270 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -11,8 +11,8 @@
 #define ZEPHYR_INCLUDE_BLUETOOTH_CS_H_
 
 /**
- * @brief Channel Sounding (CS)
- * @defgroup bt_cs Channel Sounding (CS)
+ * @brief LE Channel Sounding (CS)
+ * @defgroup bt_le_cs Channel Sounding (CS)
  * @ingroup bluetooth
  * @{
  */
@@ -47,30 +47,30 @@ extern "C" {
 #define BT_LE_CS_CHANNEL_BIT_SET_VAL(chmap, bit, val)                                              \
 	((chmap)[(bit) / 8] = ((chmap)[(bit) / 8] & ~BIT((bit) % 8)) | ((val) << ((bit) % 8)))
 
-enum bt_cs_sync_antenna_selection_opt {
+enum bt_le_cs_sync_antenna_selection_opt {
 	/** Use antenna identifier 1 for CS_SYNC packets. */
-	BT_CS_ANTENNA_SELECTION_OPT_ONE = BT_HCI_OP_LE_CS_ANTENNA_SEL_ONE,
+	BT_LE_CS_ANTENNA_SELECTION_OPT_ONE = BT_HCI_OP_LE_CS_ANTENNA_SEL_ONE,
 	/** Use antenna identifier 2 for CS_SYNC packets. */
-	BT_CS_ANTENNA_SELECTION_OPT_TWO = BT_HCI_OP_LE_CS_ANTENNA_SEL_TWO,
+	BT_LE_CS_ANTENNA_SELECTION_OPT_TWO = BT_HCI_OP_LE_CS_ANTENNA_SEL_TWO,
 	/** Use antenna identifier 3 for CS_SYNC packets. */
-	BT_CS_ANTENNA_SELECTION_OPT_THREE = BT_HCI_OP_LE_CS_ANTENNA_SEL_THREE,
+	BT_LE_CS_ANTENNA_SELECTION_OPT_THREE = BT_HCI_OP_LE_CS_ANTENNA_SEL_THREE,
 	/** Use antenna identifier 4 for CS_SYNC packets. */
-	BT_CS_ANTENNA_SELECTION_OPT_FOUR = BT_HCI_OP_LE_CS_ANTENNA_SEL_FOUR,
+	BT_LE_CS_ANTENNA_SELECTION_OPT_FOUR = BT_HCI_OP_LE_CS_ANTENNA_SEL_FOUR,
 	/** Use antennas in repetitive order from 1 to 4 for CS_SYNC packets. */
-	BT_CS_ANTENNA_SELECTION_OPT_REPETITIVE = BT_HCI_OP_LE_CS_ANTENNA_SEL_REP,
+	BT_LE_CS_ANTENNA_SELECTION_OPT_REPETITIVE = BT_HCI_OP_LE_CS_ANTENNA_SEL_REP,
 	/** No recommendation for local controller antenna selection. */
-	BT_CS_ANTENNA_SELECTION_OPT_NO_RECOMMENDATION = BT_HCI_OP_LE_CS_ANTENNA_SEL_NONE,
+	BT_LE_CS_ANTENNA_SELECTION_OPT_NO_RECOMMENDATION = BT_HCI_OP_LE_CS_ANTENNA_SEL_NONE,
 };
 
 /** Default CS settings in the local Controller */
-struct bt_cs_set_default_settings_param {
+struct bt_le_cs_set_default_settings_param {
 	/** Enable CS initiator role. */
 	bool enable_initiator_role;
 	/** Enable CS reflector role. */
 	bool enable_reflector_role;
 	/** Antenna identifier to be used for CS_SYNC packets by the local controller.
 	 */
-	enum bt_cs_sync_antenna_selection_opt cs_sync_antenna_selection;
+	enum bt_le_cs_sync_antenna_selection_opt cs_sync_antenna_selection;
 	/** Maximum output power (Effective Isotropic Radiated Power) to be used
 	 *  for all CS transmissions.
 	 *
@@ -81,11 +81,11 @@ struct bt_cs_set_default_settings_param {
 };
 
 /** CS Test CS_SYNC Antenna Identifier */
-enum bt_cs_test_cs_sync_antenna_selection {
-	BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_ONE = BT_HCI_OP_LE_CS_ANTENNA_SEL_ONE,
-	BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_TWO = BT_HCI_OP_LE_CS_ANTENNA_SEL_TWO,
-	BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_THREE = BT_HCI_OP_LE_CS_ANTENNA_SEL_THREE,
-	BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_FOUR = BT_HCI_OP_LE_CS_ANTENNA_SEL_FOUR,
+enum bt_le_cs_test_cs_sync_antenna_selection {
+	BT_LE_CS_TEST_CS_SYNC_ANTENNA_SELECTION_ONE = BT_HCI_OP_LE_CS_ANTENNA_SEL_ONE,
+	BT_LE_CS_TEST_CS_SYNC_ANTENNA_SELECTION_TWO = BT_HCI_OP_LE_CS_ANTENNA_SEL_TWO,
+	BT_LE_CS_TEST_CS_SYNC_ANTENNA_SELECTION_THREE = BT_HCI_OP_LE_CS_ANTENNA_SEL_THREE,
+	BT_LE_CS_TEST_CS_SYNC_ANTENNA_SELECTION_FOUR = BT_HCI_OP_LE_CS_ANTENNA_SEL_FOUR,
 };
 
 /** CS Test Tone Antennna Config Selection.
@@ -115,56 +115,57 @@ enum bt_cs_test_cs_sync_antenna_selection {
  *    N_AP is a value in the range [2, 4]
  *  - 2:2 configuration, where both A and B support 2 antennas and N_AP = 4
  */
-enum bt_cs_test_tone_antenna_config_selection {
-	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_ONE = BT_HCI_OP_LE_CS_TEST_ACI_0,
-	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_TWO = BT_HCI_OP_LE_CS_TEST_ACI_1,
-	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_THREE = BT_HCI_OP_LE_CS_TEST_ACI_2,
-	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_FOUR = BT_HCI_OP_LE_CS_TEST_ACI_3,
-	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_FIVE = BT_HCI_OP_LE_CS_TEST_ACI_4,
-	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_SIX = BT_HCI_OP_LE_CS_TEST_ACI_5,
-	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_SEVEN = BT_HCI_OP_LE_CS_TEST_ACI_6,
-	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_EIGHT = BT_HCI_OP_LE_CS_TEST_ACI_7,
+enum bt_le_cs_test_tone_antenna_config_selection {
+	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_ONE = BT_HCI_OP_LE_CS_TEST_ACI_0,
+	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_TWO = BT_HCI_OP_LE_CS_TEST_ACI_1,
+	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_THREE = BT_HCI_OP_LE_CS_TEST_ACI_2,
+	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_FOUR = BT_HCI_OP_LE_CS_TEST_ACI_3,
+	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_FIVE = BT_HCI_OP_LE_CS_TEST_ACI_4,
+	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_SIX = BT_HCI_OP_LE_CS_TEST_ACI_5,
+	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_SEVEN = BT_HCI_OP_LE_CS_TEST_ACI_6,
+	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_EIGHT = BT_HCI_OP_LE_CS_TEST_ACI_7,
 };
 
 /** CS Test Initiator SNR control options */
-enum bt_cs_test_initiator_snr_control {
-	BT_CS_TEST_INITIATOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_18,
-	BT_CS_TEST_INITIATOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_21,
-	BT_CS_TEST_INITIATOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_24,
-	BT_CS_TEST_INITIATOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_27,
-	BT_CS_TEST_INITIATOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_30,
-	BT_CS_TEST_INITIATOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_NOT_USED,
+enum bt_le_cs_test_initiator_snr_control {
+	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_18,
+	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_21,
+	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_24,
+	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_27,
+	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_30,
+	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_NOT_USED,
 };
 
 /** CS Test Reflector SNR control options */
-enum bt_cs_test_reflector_snr_control {
-	BT_CS_TEST_REFLECTOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_18,
-	BT_CS_TEST_REFLECTOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_21,
-	BT_CS_TEST_REFLECTOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_24,
-	BT_CS_TEST_REFLECTOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_27,
-	BT_CS_TEST_REFLECTOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_30,
-	BT_CS_TEST_REFLECTOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_NOT_USED,
+enum bt_le_cs_test_reflector_snr_control {
+	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_18,
+	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_21,
+	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_24,
+	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_27,
+	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_30,
+	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_NOT_USED,
 };
 
 /** CS Test Override 3 T_PM Tone Extension */
-enum bt_cs_test_override_3_pm_tone_ext {
+enum bt_le_cs_test_override_3_pm_tone_ext {
 	/** Initiator and reflector tones sent without tone extension */
-	BT_CS_TEST_OVERRIDE_3_NO_TONE_EXT = BT_HCI_OP_LE_CS_TEST_TONE_EXT_NONE,
+	BT_LE_CS_TEST_OVERRIDE_3_NO_TONE_EXT = BT_HCI_OP_LE_CS_TEST_TONE_EXT_NONE,
 	/** Initiator tone sent with extension, reflector tone sent without tone extension */
-	BT_CS_TEST_OVERRIDE_3_INITIATOR_TONE_EXT_ONLY = BT_HCI_OP_LE_CS_TEST_TONE_EXT_INIT,
+	BT_LE_CS_TEST_OVERRIDE_3_INITIATOR_TONE_EXT_ONLY = BT_HCI_OP_LE_CS_TEST_TONE_EXT_INIT,
 	/** Initiator tone sent without extension, reflector tone sent with tone extension */
-	BT_CS_TEST_OVERRIDE_3_REFLECTOR_TONE_EXT_ONLY = BT_HCI_OP_LE_CS_TEST_TONE_EXT_REFL,
+	BT_LE_CS_TEST_OVERRIDE_3_REFLECTOR_TONE_EXT_ONLY = BT_HCI_OP_LE_CS_TEST_TONE_EXT_REFL,
 	/** Initiator and reflector tones sent with tone extension */
-	BT_CS_TEST_OVERRIDE_3_INITIATOR_AND_REFLECTOR_TONE_EXT = BT_HCI_OP_LE_CS_TEST_TONE_EXT_BOTH,
+	BT_LE_CS_TEST_OVERRIDE_3_INITIATOR_AND_REFLECTOR_TONE_EXT =
+		BT_HCI_OP_LE_CS_TEST_TONE_EXT_BOTH,
 	/** Applicable for mode-2 and mode-3 only:
 	 *
 	 *  Loop through:
-	 *   - @ref BT_CS_TEST_OVERRIDE_3_NO_TONE_EXT
-	 *   - @ref BT_CS_TEST_OVERRIDE_3_INITIATOR_TONE_EXT_ONLY
-	 *   - @ref BT_CS_TEST_OVERRIDE_3_REFLECTOR_TONE_EXT_ONLY
-	 *   - @ref BT_CS_TEST_OVERRIDE_3_INITIATOR_AND_REFLECTOR_TONE_EXT
+	 *   - @ref BT_LE_CS_TEST_OVERRIDE_3_NO_TONE_EXT
+	 *   - @ref BT_LE_CS_TEST_OVERRIDE_3_INITIATOR_TONE_EXT_ONLY
+	 *   - @ref BT_LE_CS_TEST_OVERRIDE_3_REFLECTOR_TONE_EXT_ONLY
+	 *   - @ref BT_LE_CS_TEST_OVERRIDE_3_INITIATOR_AND_REFLECTOR_TONE_EXT
 	 */
-	BT_CS_TEST_OVERRIDE_3_REPETITIVE_TONE_EXT = BT_HCI_OP_LE_CS_TEST_TONE_EXT_REPEAT,
+	BT_LE_CS_TEST_OVERRIDE_3_REPETITIVE_TONE_EXT = BT_HCI_OP_LE_CS_TEST_TONE_EXT_REPEAT,
 };
 
 /** CS Test Override 4 Tone Antenna Permutation.
@@ -227,69 +228,70 @@ enum bt_cs_test_override_3_pm_tone_ext {
  * | 23                             | A2 A3 A4 A1                              |
  * +--------------------------------+------------------------------------------+
  */
-enum bt_cs_test_override_4_tone_antenna_permutation {
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_00 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_00,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_01 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_01,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_02 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_02,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_03 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_03,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_04 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_04,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_05 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_05,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_06 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_06,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_07 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_07,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_08 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_08,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_09 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_09,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_10 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_10,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_11 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_11,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_12 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_12,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_13 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_13,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_14 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_14,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_15 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_15,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_16 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_16,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_17 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_17,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_18 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_18,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_19 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_19,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_20 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_20,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_21 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_21,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_22 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_22,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_23 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_23,
+enum bt_le_cs_test_override_4_tone_antenna_permutation {
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_00 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_00,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_01 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_01,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_02 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_02,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_03 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_03,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_04 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_04,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_05 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_05,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_06 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_06,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_07 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_07,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_08 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_08,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_09 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_09,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_10 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_10,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_11 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_11,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_12 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_12,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_13 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_13,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_14 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_14,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_15 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_15,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_16 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_16,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_17 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_17,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_18 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_18,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_19 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_19,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_20 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_20,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_21 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_21,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_22 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_22,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_23 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_23,
 	/** Loop through all valid Antenna Permuation Indices starting
 	 *  from the lowest index.
 	 */
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_LOOP = BT_HCI_OP_LE_CS_TEST_AP_INDEX_LOOP,
+	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_LOOP =
+		BT_HCI_OP_LE_CS_TEST_AP_INDEX_LOOP,
 };
 
 /** CS Test Override 7 Sounding Sequence Marker Value */
-enum bt_cs_test_override_7_ss_marker_value {
-	BT_CS_TEST_OVERRIDE_7_SS_MARKER_VAL_0011 = BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_0011,
-	BT_CS_TEST_OVERRIDE_7_SS_MARKER_VAL_1100 = BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_1100,
+enum bt_le_cs_test_override_7_ss_marker_value {
+	BT_LE_CS_TEST_OVERRIDE_7_SS_MARKER_VAL_0011 = BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_0011,
+	BT_LE_CS_TEST_OVERRIDE_7_SS_MARKER_VAL_1100 = BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_1100,
 	/** Loop through pattern '0011' and '1100' (in transmission order) */
-	BT_CS_TEST_OVERRIDE_7_SS_MARKER_VAL_LOOP = BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_LOOP,
+	BT_LE_CS_TEST_OVERRIDE_7_SS_MARKER_VAL_LOOP = BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_LOOP,
 };
 
 /** CS Test Override 8 CS_SYNC Payload Pattern */
-enum bt_cs_test_override_8_cs_sync_payload_pattern {
+enum bt_le_cs_test_override_8_cs_sync_payload_pattern {
 	/** PRBS9 payload sequence. */
-	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_PRBS9 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_PRBS9,
+	BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_PRBS9 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_PRBS9,
 	/** Repeated '11110000' payload sequence. */
-	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_11110000 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_11110000,
+	BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_11110000 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_11110000,
 	/** Repeated '10101010' payload sequence. */
-	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_10101010 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_10101010,
+	BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_10101010 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_10101010,
 	/** PRBS15 payload sequence. */
-	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_PRBS15 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_PRBS15,
+	BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_PRBS15 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_PRBS15,
 	/** Repeated '11111111' payload sequence. */
-	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_11111111 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_11111111,
+	BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_11111111 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_11111111,
 	/** Repeated '00000000' payload sequence. */
-	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_00000000 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_00000000,
+	BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_00000000 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_00000000,
 	/** Repeated '00001111' payload sequence. */
-	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_00001111 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_00001111,
+	BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_00001111 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_00001111,
 	/** Repeated '01010101' payload sequence. */
-	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_01010101 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_01010101,
+	BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_01010101 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_01010101,
 	/** Custom payload provided by the user. */
-	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_USER = BT_HCI_OP_LE_CS_TEST_PAYLOAD_USER,
+	BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_USER = BT_HCI_OP_LE_CS_TEST_PAYLOAD_USER,
 };
 
 /** CS Test parameters */
-struct bt_cs_test_param {
+struct bt_le_cs_test_param {
 	/** CS mode to be used during the CS procedure. */
 	enum bt_conn_le_cs_main_mode main_mode;
 	/** CS sub-mode to be used during the CS procedure. */
@@ -308,7 +310,7 @@ struct bt_cs_test_param {
 	/** CS_SYNC PHY */
 	enum bt_conn_le_cs_sync_phy cs_sync_phy;
 	/** Antenna identifier to be used for CS_SYNC packets. */
-	enum bt_cs_test_cs_sync_antenna_selection cs_sync_antenna_selection;
+	enum bt_le_cs_test_cs_sync_antenna_selection cs_sync_antenna_selection;
 	/** CS subevent length in microseconds.
 	 *
 	 *  Range: 1250us to 4s
@@ -349,11 +351,11 @@ struct bt_cs_test_param {
 	/** Antenna Configuration Index used during antenna switching during
 	 *  the tone phases of CS steps.
 	 */
-	enum bt_cs_test_tone_antenna_config_selection tone_antenna_config_selection;
+	enum bt_le_cs_test_tone_antenna_config_selection tone_antenna_config_selection;
 	/** Initiator SNR control options */
-	enum bt_cs_test_initiator_snr_control initiator_snr_control;
+	enum bt_le_cs_test_initiator_snr_control initiator_snr_control;
 	/** Reflector SNR control options */
-	enum bt_cs_test_reflector_snr_control reflector_snr_control;
+	enum bt_le_cs_test_reflector_snr_control reflector_snr_control;
 	/** Determines octets 14 and 15 of the initial value of the DRBG nonce. */
 	uint16_t drbg_nonce;
 
@@ -405,12 +407,12 @@ struct bt_cs_test_param {
 
 	/** Override config bit 3. These parameters are ignored if the bit is not set.  */
 	struct {
-		enum bt_cs_test_override_3_pm_tone_ext t_pm_tone_ext;
+		enum bt_le_cs_test_override_3_pm_tone_ext t_pm_tone_ext;
 	} override_config_3;
 
 	/** Override config bit 4. These parameters are ignored if the bit is not set. */
 	struct {
-		enum bt_cs_test_override_4_tone_antenna_permutation tone_antenna_permutation;
+		enum bt_le_cs_test_override_4_tone_antenna_permutation tone_antenna_permutation;
 	} override_config_4;
 
 	/** Override config bit 5. These parameters are ignored if the bit is not set.  */
@@ -442,17 +444,17 @@ struct bt_cs_test_param {
 	/** Override config bit 7. These parameters are ignored if the bit is not set. */
 	struct {
 		/** Value of the Sounding Sequence marker. */
-		enum bt_cs_test_override_7_ss_marker_value ss_marker_value;
+		enum bt_le_cs_test_override_7_ss_marker_value ss_marker_value;
 	} override_config_7;
 
 	/** Override config bit 8. These parameters are ignored if the bit is not set.  */
 	struct {
 		/** CS_SYNC payload pattern selection. */
-		enum bt_cs_test_override_8_cs_sync_payload_pattern cs_sync_payload_pattern;
+		enum bt_le_cs_test_override_8_cs_sync_payload_pattern cs_sync_payload_pattern;
 		/** User payload for CS_SYNC packets.
 		 *
 		 *  This parameter is only used when using
-		 *  @ref BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_USER
+		 *  @ref BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_USER
 		 *
 		 *  The least significant bit corresponds to the most significant bit
 		 *  of the CS payload. When the sequence is less than 16 octets,
@@ -535,7 +537,7 @@ void bt_le_cs_set_valid_chmap_bits(uint8_t channel_map[10]);
  *
  * @return Zero on success or (negative) error code on failure.
  */
-int bt_cs_read_remote_supported_capabilities(struct bt_conn *conn);
+int bt_le_cs_read_remote_supported_capabilities(struct bt_conn *conn);
 
 /** @brief Set Channel Sounding default settings.
  *
@@ -549,8 +551,8 @@ int bt_cs_read_remote_supported_capabilities(struct bt_conn *conn);
  *
  * @return Zero on success or (negative) error code on failure.
  */
-int bt_cs_set_default_settings(struct bt_conn *conn,
-			       const struct bt_cs_set_default_settings_param *params);
+int bt_le_cs_set_default_settings(struct bt_conn *conn,
+				  const struct bt_le_cs_set_default_settings_param *params);
 
 /** @brief Read Remote FAE Table
  *
@@ -563,7 +565,7 @@ int bt_cs_set_default_settings(struct bt_conn *conn,
  *
  * @return Zero on success or (negative) error code on failure.
  */
-int bt_cs_read_remote_fae_table(struct bt_conn *conn);
+int bt_le_cs_read_remote_fae_table(struct bt_conn *conn);
 
 /** @brief Start a CS test
  *
@@ -585,7 +587,7 @@ int bt_cs_read_remote_fae_table(struct bt_conn *conn);
  *
  * @return Zero on success or (negative) error code on failure.
  */
-int bt_cs_start_test(const struct bt_cs_test_param *params);
+int bt_le_cs_start_test(const struct bt_le_cs_test_param *params);
 
 /** @brief Create CS configuration
  *
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 806eaba2010..20ea9e447f6 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -3326,14 +3326,14 @@ void notify_remote_cs_capabilities(struct bt_conn *conn, struct bt_conn_le_cs_ca
 	struct bt_conn_cb *callback;
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->remote_cs_capabilities_available) {
-			callback->remote_cs_capabilities_available(conn, &params);
+		if (callback->le_cs_remote_capabilities_available) {
+			callback->le_cs_remote_capabilities_available(conn, &params);
 		}
 	}
 
 	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->remote_cs_capabilities_available) {
-			cb->remote_cs_capabilities_available(conn, &params);
+		if (cb->le_cs_remote_capabilities_available) {
+			cb->le_cs_remote_capabilities_available(conn, &params);
 		}
 	}
 }
@@ -3343,14 +3343,14 @@ void notify_remote_cs_fae_table(struct bt_conn *conn, struct bt_conn_le_cs_fae_t
 	struct bt_conn_cb *callback;
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->remote_cs_fae_table_available) {
-			callback->remote_cs_fae_table_available(conn, &params);
+		if (callback->le_cs_remote_fae_table_available) {
+			callback->le_cs_remote_fae_table_available(conn, &params);
 		}
 	}
 
 	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->remote_cs_fae_table_available) {
-			cb->remote_cs_fae_table_available(conn, &params);
+		if (cb->le_cs_remote_fae_table_available) {
+			cb->le_cs_remote_fae_table_available(conn, &params);
 		}
 	}
 }
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index d0d7f941b7b..8341e9f9364 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -36,7 +36,7 @@ void bt_le_cs_set_valid_chmap_bits(uint8_t channel_map[10])
 	BT_LE_CS_CHANNEL_BIT_SET_VAL(channel_map, 79, 0);
 }
 
-int bt_cs_read_remote_supported_capabilities(struct bt_conn *conn)
+int bt_le_cs_read_remote_supported_capabilities(struct bt_conn *conn)
 {
 	struct bt_hci_cp_le_read_remote_supported_capabilities *cp;
 	struct net_buf *buf;
@@ -168,8 +168,8 @@ void bt_hci_le_cs_read_remote_supported_capabilities_complete(struct net_buf *bu
 	bt_conn_unref(conn);
 }
 
-int bt_cs_set_default_settings(struct bt_conn *conn,
-			       const struct bt_cs_set_default_settings_param *params)
+int bt_le_cs_set_default_settings(struct bt_conn *conn,
+				  const struct bt_le_cs_set_default_settings_param *params)
 {
 	struct bt_hci_cp_le_cs_set_default_settings *cp;
 	struct net_buf *buf;
@@ -196,7 +196,7 @@ int bt_cs_set_default_settings(struct bt_conn *conn,
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_SET_DEFAULT_SETTINGS, buf, NULL);
 }
 
-int bt_cs_read_remote_fae_table(struct bt_conn *conn)
+int bt_le_cs_read_remote_fae_table(struct bt_conn *conn)
 {
 	struct bt_hci_cp_le_read_remote_fae_table *cp;
 	struct net_buf *buf;
@@ -241,7 +241,7 @@ void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf)
 	bt_conn_unref(conn);
 }
 
-int bt_cs_start_test(const struct bt_cs_test_param *params)
+int bt_le_cs_start_test(const struct bt_le_cs_test_param *params)
 {
 	struct bt_hci_op_le_cs_test *cp;
 	struct net_buf *buf;
diff --git a/subsys/bluetooth/shell/bt.c b/subsys/bluetooth/shell/bt.c
index b900fe721df..b08f67835e1 100644
--- a/subsys/bluetooth/shell/bt.c
+++ b/subsys/bluetooth/shell/bt.c
@@ -1142,8 +1142,8 @@ static struct bt_conn_cb conn_callbacks = {
 	.subrate_changed = subrate_changed,
 #endif
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
-	.remote_cs_capabilities_available = print_remote_cs_capabilities,
-	.remote_cs_fae_table_available = print_remote_cs_fae_table,
+	.le_cs_remote_capabilities_available = print_remote_cs_capabilities,
+	.le_cs_remote_fae_table_available = print_remote_cs_fae_table,
 	.le_cs_config_created = le_cs_config_created,
 	.le_cs_config_removed = le_cs_config_removed,
 #endif
diff --git a/subsys/bluetooth/shell/cs.c b/subsys/bluetooth/shell/cs.c
index 63fb0ad7828..c5bc228f35c 100644
--- a/subsys/bluetooth/shell/cs.c
+++ b/subsys/bluetooth/shell/cs.c
@@ -28,11 +28,12 @@
 
 static int check_cs_sync_antenna_selection_input(uint16_t input)
 {
-	if (input != BT_CS_ANTENNA_SELECTION_OPT_ONE && input != BT_CS_ANTENNA_SELECTION_OPT_TWO &&
-	    input != BT_CS_ANTENNA_SELECTION_OPT_THREE &&
-	    input != BT_CS_ANTENNA_SELECTION_OPT_FOUR &&
-	    input != BT_CS_ANTENNA_SELECTION_OPT_REPETITIVE &&
-	    input != BT_CS_ANTENNA_SELECTION_OPT_NO_RECOMMENDATION) {
+	if (input != BT_LE_CS_ANTENNA_SELECTION_OPT_ONE &&
+	    input != BT_LE_CS_ANTENNA_SELECTION_OPT_TWO &&
+	    input != BT_LE_CS_ANTENNA_SELECTION_OPT_THREE &&
+	    input != BT_LE_CS_ANTENNA_SELECTION_OPT_FOUR &&
+	    input != BT_LE_CS_ANTENNA_SELECTION_OPT_REPETITIVE &&
+	    input != BT_LE_CS_ANTENNA_SELECTION_OPT_NO_RECOMMENDATION) {
 		return -EINVAL;
 	}
 
@@ -48,9 +49,10 @@ static int cmd_read_remote_supported_capabilities(const struct shell *sh, size_t
 		return -ENOEXEC;
 	}
 
-	err = bt_cs_read_remote_supported_capabilities(default_conn);
+	err = bt_le_cs_read_remote_supported_capabilities(default_conn);
 	if (err) {
-		shell_error(sh, "bt_cs_read_remote_supported_capabilities returned error %d", err);
+		shell_error(sh, "bt_le_cs_read_remote_supported_capabilities returned error %d",
+			    err);
 		return -ENOEXEC;
 	}
 
@@ -60,7 +62,7 @@ static int cmd_read_remote_supported_capabilities(const struct shell *sh, size_t
 static int cmd_set_default_settings(const struct shell *sh, size_t argc, char *argv[])
 {
 	int err = 0;
-	struct bt_cs_set_default_settings_param params;
+	struct bt_le_cs_set_default_settings_param params;
 	uint16_t antenna_input;
 	int16_t tx_power_input;
 
@@ -107,9 +109,9 @@ static int cmd_set_default_settings(const struct shell *sh, size_t argc, char *a
 	params.cs_sync_antenna_selection = antenna_input;
 	params.max_tx_power = tx_power_input;
 
-	err = bt_cs_set_default_settings(default_conn, &params);
+	err = bt_le_cs_set_default_settings(default_conn, &params);
 	if (err) {
-		shell_error(sh, "bt_cs_set_default_settings returned error %d", err);
+		shell_error(sh, "bt_le_cs_set_default_settings returned error %d", err);
 		return -ENOEXEC;
 	}
 
@@ -125,9 +127,9 @@ static int cmd_read_remote_fae_table(const struct shell *sh, size_t argc, char *
 		return -ENOEXEC;
 	}
 
-	err = bt_cs_read_remote_fae_table(default_conn);
+	err = bt_le_cs_read_remote_fae_table(default_conn);
 	if (err) {
-		shell_error(sh, "bt_cs_read_remote_fae_table returned error %d", err);
+		shell_error(sh, "bt_le_cs_read_remote_fae_table returned error %d", err);
 		return -ENOEXEC;
 	}
 
@@ -137,7 +139,7 @@ static int cmd_read_remote_fae_table(const struct shell *sh, size_t argc, char *
 static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 {
 	int err = 0;
-	struct bt_cs_test_param params;
+	struct bt_le_cs_test_param params;
 
 	params.main_mode = BT_CONN_LE_CS_MAIN_MODE_1;
 	params.sub_mode = BT_CONN_LE_CS_SUB_MODE_UNUSED;
@@ -161,7 +163,7 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 
 	params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_AA_ONLY;
 	params.cs_sync_phy = BT_CONN_LE_CS_SYNC_1M_PHY;
-	params.cs_sync_antenna_selection = BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_ONE;
+	params.cs_sync_antenna_selection = BT_LE_CS_TEST_CS_SYNC_ANTENNA_SELECTION_ONE;
 	params.subevent_len = 10000;
 	params.subevent_interval = 0;
 	params.max_num_subevents = 0;
@@ -171,9 +173,9 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	params.t_fcs_time = 120;
 	params.t_pm_time = 20;
 	params.t_sw_time = 0;
-	params.tone_antenna_config_selection = BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
-	params.initiator_snr_control = BT_CS_TEST_INITIATOR_SNR_CONTROL_NOT_USED;
-	params.reflector_snr_control = BT_CS_TEST_REFLECTOR_SNR_CONTROL_NOT_USED;
+	params.tone_antenna_config_selection = BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
+	params.initiator_snr_control = BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_NOT_USED;
+	params.reflector_snr_control = BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_NOT_USED;
 	params.drbg_nonce = 0x1234;
 	params.override_config = 0;
 	params.override_config_0.channel_map_repetition = 1;
@@ -184,9 +186,9 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	params.override_config_0.not_set.ch3c_shape = BT_CONN_LE_CS_CH3C_SHAPE_HAT;
 	params.override_config_0.not_set.ch3c_jump = 0x2;
 
-	err = bt_cs_start_test(&params);
+	err = bt_le_cs_start_test(&params);
 	if (err) {
-		shell_error(sh, "bt_cs_start_test returned error %d", err);
+		shell_error(sh, "bt_le_cs_start_test returned error %d", err);
 		return -ENOEXEC;
 	}
 
@@ -206,7 +208,7 @@ static int cmd_remove_config(const struct shell *sh, size_t argc, char *argv[])
 
 	err = bt_le_cs_remove_config(default_conn, config_id);
 	if (err) {
-		shell_error(sh, "bt_cs_remove_config returned error %d", err);
+		shell_error(sh, "bt_le_cs_remove_config returned error %d", err);
 		return -ENOEXEC;
 	}
 
@@ -361,7 +363,7 @@ static int cmd_create_config(const struct shell *sh, size_t argc, char *argv[])
 
 	err = bt_le_cs_create_config(default_conn, &params, context);
 	if (err) {
-		shell_error(sh, "bt_cs_create_config returned error %d", err);
+		shell_error(sh, "bt_le_cs_create_config returned error %d", err);
 		return -ENOEXEC;
 	}
 

From 03daab703e11f78f65d45fb04f6112f12dfd0475 Mon Sep 17 00:00:00 2001
From: Olivier Lesage <olivier.lesage@nordicsemi.no>
Date: Fri, 4 Oct 2024 11:38:28 +0200
Subject: [PATCH 0079/2913] [nrf fromtree] bluetooth: host: Add support for
 processing CS subevent results

Adds support for:
- LE CS Subevent Result event
- LE CS Test End Complete event

For now, recombination of subevent results with more steps than could
fit within a single HCI event is not supported, and such events
are discarded.

Signed-off-by: Olivier Lesage <olivier.lesage@nordicsemi.no>
(cherry picked from commit a12b869eac890e638cd2736e44bfaa15fc05e675)
(cherry picked from commit dbd259f94fd923c9e7e5d89ce48861c1de2eaa47)
(cherry picked from commit 370bca0a91c08b80769d42d291b0a0a0a79aa506)
---
 include/zephyr/bluetooth/conn.h       | 117 +++++++++++++++++
 include/zephyr/bluetooth/cs.h         |  65 ++++++++++
 include/zephyr/bluetooth/hci_types.h  | 180 ++++++++++++++++++++++++++
 subsys/bluetooth/host/conn.c          |  17 +++
 subsys/bluetooth/host/conn_internal.h |   2 +
 subsys/bluetooth/host/cs.c            | 139 ++++++++++++++++++++
 subsys/bluetooth/host/hci_core.c      |   8 ++
 subsys/bluetooth/host/hci_core.h      |   2 +
 subsys/bluetooth/shell/cs.c           |  81 +++++++++++-
 9 files changed, 607 insertions(+), 4 deletions(-)

diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index 1538c36a218..55bb48c6934 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -538,6 +538,112 @@ struct bt_conn_le_cs_config {
 	uint8_t channel_map[10];
 };
 
+/** Procedure done status */
+enum bt_conn_le_cs_procedure_done_status {
+	BT_CONN_LE_CS_PROCEDURE_COMPLETE = BT_HCI_LE_CS_PROCEDURE_DONE_STATUS_COMPLETE,
+	BT_CONN_LE_CS_PROCEDURE_INCOMPLETE = BT_HCI_LE_CS_PROCEDURE_DONE_STATUS_PARTIAL,
+	BT_CONN_LE_CS_PROCEDURE_ABORTED = BT_HCI_LE_CS_PROCEDURE_DONE_STATUS_ABORTED,
+};
+
+/** Subevent done status */
+enum bt_conn_le_cs_subevent_done_status {
+	BT_CONN_LE_CS_SUBEVENT_COMPLETE = BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_COMPLETE,
+	BT_CONN_LE_CS_SUBEVENT_INCOMPLETE = BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL,
+	BT_CONN_LE_CS_SUBEVENT_ABORTED = BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_ABORTED,
+};
+
+/** Procedure abort reason */
+enum bt_conn_le_cs_procedure_abort_reason {
+	BT_CONN_LE_CS_PROCEDURE_NOT_ABORTED = BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_NO_ABORT,
+	BT_CONN_LE_CS_PROCEDURE_ABORT_REQUESTED =
+		BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_LOCAL_HOST_OR_REMOTE_REQUEST,
+	BT_CONN_LE_CS_PROCEDURE_ABORT_TOO_FEW_CHANNELS =
+		BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_TOO_FEW_CHANNELS,
+	BT_CONN_LE_CS_PROCEDURE_ABORT_CHMAP_INSTANT_PASSED =
+		BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_CHMAP_INSTANT_PASSED,
+	BT_CONN_LE_CS_PROCEDURE_ABORT_UNSPECIFIED = BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_UNSPECIFIED,
+};
+
+/** Subevent abort reason */
+enum bt_conn_le_cs_subevent_abort_reason {
+	BT_CONN_LE_CS_SUBEVENT_NOT_ABORTED = BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_NO_ABORT,
+	BT_CONN_LE_CS_SUBEVENT_ABORT_REQUESTED =
+		BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_LOCAL_HOST_OR_REMOTE_REQUEST,
+	BT_CONN_LE_CS_SUBEVENT_ABORT_NO_CS_SYNC =
+		BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_NO_CS_SYNC_RECEIVED,
+	BT_CONN_LE_CS_SUBEVENT_ABORT_SCHED_CONFLICT =
+		BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_SCHED_CONFLICT,
+	BT_CONN_LE_CS_SUBEVENT_ABORT_UNSPECIFIED = BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_UNSPECIFIED,
+};
+
+/** Subevent data for LE connections supporting CS */
+struct bt_conn_le_cs_subevent_result {
+	struct {
+		/** CS configuration identifier.
+		 *
+		 *  Range: 0 to 3
+		 *
+		 *  If these results were generated by a CS Test,
+		 *  this value will be set to 0 and has no meaning.
+		 */
+		uint8_t config_id;
+		/** Starting ACL connection event counter.
+		 *
+		 *  If these results were generated by a CS Test,
+		 *  this value will be set to 0 and has no meaning.
+		 */
+		uint16_t start_acl_conn_event;
+		/** CS procedure count associated with these results.
+		 *
+		 *  This is the CS procedure count since the completion of
+		 *  the Channel Sounding Security Start procedure.
+		 */
+		uint16_t procedure_counter;
+		/** Frequency compensation value in units of 0.01 ppm.
+		 *
+		 *  This is a 15-bit signed integer in the range [-100, 100] ppm.
+		 *
+		 *  A value of @ref BT_HCI_LE_CS_SUBEVENT_RESULT_FREQ_COMPENSATION_NOT_AVAILABLE
+		 *  indicates that the role is not the initiator, or that the
+		 *  frequency compensation value is unavailable.
+		 */
+		uint16_t frequency_compensation;
+		/** Reference power level in dBm.
+		 *
+		 *  Range: -127 to 20
+		 *
+		 *  A value of @ref BT_HCI_LE_CS_REF_POWER_LEVEL_UNAVAILABLE indicates
+		 *  that the reference power level was not available during a subevent.
+		 */
+		int8_t reference_power_level;
+		/** Procedure status. */
+		enum bt_conn_le_cs_procedure_done_status procedure_done_status;
+		/** Subevent status. */
+		enum bt_conn_le_cs_subevent_done_status subevent_done_status;
+		/** Abort reason.
+		 *
+		 *  If the procedure status is
+		 *  @ref BT_CONN_LE_CS_PROCEDURE_ABORTED, this field will
+		 *  specify the reason for the abortion.
+		 */
+		enum bt_conn_le_cs_procedure_abort_reason procedure_abort_reason;
+		/** Abort reason.
+		 *
+		 *  If the subevent status is
+		 *  @ref BT_CONN_LE_CS_SUBEVENT_ABORTED, this field will
+		 *  specify the reason for the abortion.
+		 */
+		enum bt_conn_le_cs_subevent_abort_reason subevent_abort_reason;
+		/** Number of antenna paths used during the phase measurement stage.
+		 */
+		uint8_t num_antenna_paths;
+		/** Number of CS steps in the subevent.
+		 */
+		uint8_t num_steps_reported;
+	} header;
+	struct net_buf_simple *step_data_buf;
+};
+
 /** @brief Increment a connection's reference count.
  *
  *  Increment the reference count of a connection object.
@@ -1677,6 +1783,17 @@ struct bt_conn_cb {
 	 *  @param config_id ID of the CS configuration that was removed.
 	 */
 	void (*le_cs_config_removed)(struct bt_conn *conn, uint8_t config_id);
+
+	/** @brief Subevent Results from a CS procedure are available.
+	 *
+	 * This callback notifies the user that CS subevent results are
+	 * available for the given connection object.
+	 *
+	 * @param conn Connection objects.
+	 * @param result Subevent results
+	 */
+	void (*le_cs_subevent_data_available)(struct bt_conn *conn,
+					      struct bt_conn_le_cs_subevent_result *result);
 #endif
 
 	/** @internal Internally used field for list handling */
diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index c04fb3a9270..ffb839a9d15 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -517,6 +517,29 @@ struct bt_le_cs_create_config_params {
 	uint8_t channel_map[10];
 };
 
+/** Callbacks for CS Test */
+struct bt_le_cs_test_cb {
+	/**@brief CS Test Subevent data.
+	 *
+	 * @param[in] Subevent results.
+	 */
+	void (*le_cs_test_subevent_data_available)(struct bt_conn_le_cs_subevent_result *data);
+	/**@brief CS Test End Complete. */
+	void (*le_cs_test_end_complete)(void);
+};
+
+/** Subevent result step */
+struct bt_le_cs_subevent_step {
+	/** CS step mode. */
+	uint8_t mode;
+	/** CS step channel index. */
+	uint8_t channel;
+	/** Length of role- and mode-specific information being reported. */
+	uint8_t data_len;
+	/** Pointer to role- and mode-specific information. */
+	const uint8_t *data;
+};
+
 /** @brief Set all valid channel map bits
  *
  * This command is used to enable all valid channels in a
@@ -567,6 +590,17 @@ int bt_le_cs_set_default_settings(struct bt_conn *conn,
  */
 int bt_le_cs_read_remote_fae_table(struct bt_conn *conn);
 
+/** @brief Register callbacks for the CS Test mode.
+ *
+ * Existing callbacks can be unregistered by providing NULL function
+ * pointers.
+ *
+ * @param cs_test_cb Set of callbacks to be used with CS Test
+ *
+ * @return Zero on success or (negative) error code on failure.
+ */
+int bt_le_cs_test_cb_register(struct bt_le_cs_test_cb cs_test_cb);
+
 /** @brief Start a CS test
  *
  * This command is used to start a CS test where the IUT is placed in the role
@@ -620,6 +654,37 @@ int bt_le_cs_create_config(struct bt_conn *conn, struct bt_le_cs_create_config_p
  */
 int bt_le_cs_remove_config(struct bt_conn *conn, uint8_t config_id);
 
+/** @brief Stop ongoing CS Test
+ *
+ * This command is used to stop any CS test that is in progress.
+ *
+ * The controller is expected to finish reporting any subevent results
+ * before completing this termination.
+ *
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ *
+ * @return Zero on success or (negative) error code on failure.
+ */
+int bt_le_cs_stop_test(void);
+
+/** @brief Parse CS Test Subevent Results
+ *
+ * A helper for parsing HCI-formatted step data found in channel sounding subevent results.
+ *
+ * A typical use-case is filtering out data which does not meet certain packet quality or NADM
+ * requirements.
+ *
+ * @warning This function will consume the data when parsing.
+ *
+ * @param step_data_buf Pointer to a buffer containing the step data.
+ * @param func Callback function which will be called for each step data found.
+ *             The callback should return true to continue parsing, or false to stop.
+ * @param user_data User data to be passed to the callback.
+ */
+void bt_le_cs_step_data_parse(struct net_buf_simple *step_data_buf,
+			      bool (*func)(struct bt_le_cs_subevent_step *step, void *user_data),
+			      void *user_data);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index efc231efaef..131b81134c1 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -2612,6 +2612,8 @@ struct bt_hci_cp_le_cs_remove_config {
 	uint8_t config_id;
 } __packed;
 
+#define BT_HCI_OP_LE_CS_TEST_END BT_OP(BT_OGF_LE, 0x0096) /* 0x2096 */
+
 /* Event definitions */
 
 #define BT_HCI_EVT_UNKNOWN                      0x00
@@ -3463,6 +3465,182 @@ struct bt_hci_evt_le_cs_config_complete {
 	uint8_t t_pm_time;
 } __packed;
 
+#define BT_HCI_LE_CS_TEST_CONN_HANDLE 0x0FFF
+
+#define BT_HCI_LE_CS_PROCEDURE_DONE_STATUS_COMPLETE 0x0
+#define BT_HCI_LE_CS_PROCEDURE_DONE_STATUS_PARTIAL  0x1
+#define BT_HCI_LE_CS_PROCEDURE_DONE_STATUS_ABORTED  0xF
+
+#define BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_COMPLETE 0x0
+#define BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL  0x1
+#define BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_ABORTED  0xF
+
+#define BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_NO_ABORT                     0x0
+#define BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_LOCAL_HOST_OR_REMOTE_REQUEST 0x1
+#define BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_TOO_FEW_CHANNELS             0x2
+#define BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_CHMAP_INSTANT_PASSED         0x3
+#define BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_UNSPECIFIED                  0xF
+
+#define BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_NO_ABORT                     0x0
+#define BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_LOCAL_HOST_OR_REMOTE_REQUEST 0x1
+#define BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_NO_CS_SYNC_RECEIVED          0x2
+#define BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_SCHED_CONFLICT               0x3
+#define BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_UNSPECIFIED                  0xF
+
+#define BT_HCI_LE_CS_SUBEVENT_RESULT_N_AP_IGNORED 0x00
+#define BT_HCI_LE_CS_SUBEVENT_RESULT_N_AP_1       0x01
+#define BT_HCI_LE_CS_SUBEVENT_RESULT_N_AP_2       0x02
+#define BT_HCI_LE_CS_SUBEVENT_RESULT_N_AP_3       0x03
+#define BT_HCI_LE_CS_SUBEVENT_RESULT_N_AP_4       0x04
+
+#define BT_HCI_LE_CS_SUBEVENT_RESULT_FREQ_COMPENSATION_NOT_AVAILABLE 0xC000
+
+#define BT_HCI_LE_CS_SUBEVENT_RESULT_PCT_NOT_AVAILABLE 0xFFFFFFFF
+
+#define BT_HCI_LE_CS_REF_POWER_LEVEL_UNAVAILABLE 0x7F
+
+#define BT_HCI_LE_CS_PCT_MASK 0xFFF
+
+#define BT_HCI_LE_CS_TONE_QUALITY_HIGH        0x0
+#define BT_HCI_LE_CS_TONE_QUALITY_MED         0x1
+#define BT_HCI_LE_CS_TONE_QUALITY_LOW         0x2
+#define BT_HCI_LE_CS_TONE_QUALITY_UNAVAILABLE 0x3
+
+#define BT_HCI_LE_CS_NOT_TONE_EXT_SLOT              0x0
+#define BT_HCI_LE_CS_TONE_EXT_SLOT_EXT_NOT_EXPECTED 0x1
+#define BT_HCI_LE_CS_TONE_EXT_SLOT_EXT_EXPECTED     0x2
+
+#define BT_HCI_LE_CS_TIME_DIFFERENCE_NOT_AVAILABLE 0x8000
+
+#define BT_HCI_LE_CS_PACKET_NADM_ATTACK_EXT_UNLIKELY  0x00
+#define BT_HCI_LE_CS_PACKET_NADM_ATTACK_VERY_UNLIKELY 0x01
+#define BT_HCI_LE_CS_PACKET_NADM_ATTACK_UNLIKELY      0x02
+#define BT_HCI_LE_CS_PACKET_NADM_ATTACK_POSSIBLE      0x03
+#define BT_HCI_LE_CS_PACKET_NADM_ATTACK_LIKELY        0x04
+#define BT_HCI_LE_CS_PACKET_NADM_ATTACK_VERY_LIKELY   0x05
+#define BT_HCI_LE_CS_PACKET_NADM_ATTACK_EXT_LIKELY    0x06
+#define BT_HCI_LE_CS_PACKET_NADM_UNKNOWN              0xFF
+
+#define BT_HCI_EVT_LE_CS_SUBEVENT_RESULT 0x31
+/** Subevent result step data format: Mode 0 Initiator  */
+struct bt_hci_le_cs_step_data_mode_0_initiator {
+	uint8_t packet_quality_aa_check: 4;
+	uint8_t packet_quality_bit_errors: 4;
+	uint8_t packet_rssi;
+	uint8_t packet_antenna;
+	uint16_t measured_freq_offset;
+} __packed;
+
+/** Subevent result step data format: Mode 0 Reflector  */
+struct bt_hci_le_cs_step_data_mode_0_reflector {
+	uint8_t packet_quality_aa_check: 4;
+	uint8_t packet_quality_bit_errors: 4;
+	uint8_t packet_rssi;
+	uint8_t packet_antenna;
+} __packed;
+
+/** Subevent result step data format: Mode 1  */
+struct bt_hci_le_cs_step_data_mode_1 {
+	uint8_t packet_quality_aa_check: 4;
+	uint8_t packet_quality_bit_errors: 4;
+	uint8_t packet_nadm;
+	uint8_t packet_rssi;
+	union {
+		uint16_t toa_tod_initiator;
+		uint16_t tod_toa_reflector;
+	};
+	uint8_t packet_antenna;
+} __packed;
+
+/** Subevent result step data format: Mode 1 with sounding sequence RTT support */
+struct bt_hci_le_cs_step_data_mode_1_ss_rtt {
+	uint8_t packet_quality_aa_check: 4;
+	uint8_t packet_quality_bit_errors: 4;
+	uint8_t packet_nadm;
+	uint8_t packet_rssi;
+	union {
+		uint16_t toa_tod_initiator;
+		uint16_t tod_toa_reflector;
+	};
+	uint8_t packet_antenna;
+	uint8_t packet_pct1[4];
+	uint8_t packet_pct2[4];
+} __packed;
+
+
+/** Format for per-antenna path step data in modes 2 and 3 */
+struct bt_hci_le_cs_step_data_tone_info {
+	uint8_t phase_correction_term[3];
+	uint8_t quality_indicator: 4;
+	uint8_t extension_indicator: 4;
+} __packed;
+
+/** Subevent result step data format: Mode 2 */
+struct bt_hci_le_cs_step_data_mode_2 {
+	uint8_t antenna_permutation_index;
+	struct bt_hci_le_cs_step_data_tone_info tone_info[];
+} __packed;
+
+/** Subevent result step data format: Mode 3 */
+struct bt_hci_le_cs_step_data_mode_3 {
+	uint8_t packet_quality_aa_check: 4;
+	uint8_t packet_quality_bit_errors: 4;
+	uint8_t packet_nadm;
+	uint8_t packet_rssi;
+	union {
+		uint16_t toa_tod_initiator;
+		uint16_t tod_toa_reflector;
+	};
+	uint8_t packet_antenna;
+	uint8_t antenna_permutation_index;
+	struct bt_hci_le_cs_step_data_tone_info tone_info[];
+} __packed;
+
+/** Subevent result step data format: Mode 3 with sounding sequence RTT support */
+struct bt_hci_le_cs_step_data_mode_3_ss_rtt {
+	uint8_t packet_quality_aa_check: 4;
+	uint8_t packet_quality_bit_errors: 4;
+	uint8_t packet_nadm;
+	uint8_t packet_rssi;
+	union {
+		uint16_t toa_tod_initiator;
+		uint16_t tod_toa_reflector;
+	};
+	uint8_t packet_antenna;
+	uint8_t packet_pct1[4];
+	uint8_t packet_pct2[4];
+	uint8_t antenna_permutation_index;
+	struct bt_hci_le_cs_step_data_tone_info tone_info[];
+} __packed;
+
+struct bt_hci_evt_le_cs_subevent_result_step {
+	uint8_t step_mode;
+	uint8_t step_channel;
+	uint8_t step_data_length;
+	uint8_t step_data[];
+} __packed;
+
+struct bt_hci_evt_le_cs_subevent_result {
+	uint16_t conn_handle;
+	uint8_t config_id;
+	uint16_t start_acl_conn_event_counter;
+	uint16_t procedure_counter;
+	uint16_t frequency_compensation;
+	uint8_t reference_power_level;
+	uint8_t procedure_done_status;
+	uint8_t subevent_done_status;
+	uint8_t procedure_abort_reason: 4;
+	uint8_t subevent_abort_reason: 4;
+	uint8_t num_antenna_paths;
+	uint8_t num_steps_reported;
+	uint8_t steps[];
+} __packed;
+
+#define BT_HCI_EVT_LE_CS_TEST_END_COMPLETE 0x33
+struct bt_hci_evt_le_cs_test_end_complete {
+	uint8_t status;
+} __packed;
+
 /* Event mask bits */
 
 #define BT_EVT_BIT(n) (1ULL << (n))
@@ -3555,6 +3733,8 @@ struct bt_hci_evt_le_cs_config_complete {
 #define BT_EVT_MASK_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE BT_EVT_BIT(43)
 #define BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE              BT_EVT_BIT(44)
 #define BT_EVT_MASK_LE_CS_CONFIG_COMPLETE                             BT_EVT_BIT(46)
+#define BT_EVT_MASK_LE_CS_SUBEVENT_RESULT                             BT_EVT_BIT(48)
+#define BT_EVT_MASK_LE_CS_TEST_END_COMPLETE                           BT_EVT_BIT(50)
 
 /** HCI Error Codes, BT Core Spec v5.4 [Vol 1, Part F]. */
 #define BT_HCI_ERR_SUCCESS                      0x00
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 20ea9e447f6..01c3bcbe04a 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -3388,6 +3388,23 @@ void notify_cs_config_removed(struct bt_conn *conn, uint8_t config_id)
 		}
 	}
 }
+
+void notify_cs_subevent_result(struct bt_conn *conn, struct bt_conn_le_cs_subevent_result *result)
+{
+	struct bt_conn_cb *callback;
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
+		if (callback->le_cs_subevent_data_available) {
+			callback->le_cs_subevent_data_available(conn, result);
+		}
+	}
+
+	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
+		if (cb->le_cs_subevent_data_available) {
+			cb->le_cs_subevent_data_available(conn, result);
+		}
+	}
+}
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
 
 int bt_conn_le_param_update(struct bt_conn *conn,
diff --git a/subsys/bluetooth/host/conn_internal.h b/subsys/bluetooth/host/conn_internal.h
index 0c334bc7cbe..37e49afa964 100644
--- a/subsys/bluetooth/host/conn_internal.h
+++ b/subsys/bluetooth/host/conn_internal.h
@@ -502,6 +502,8 @@ void notify_cs_config_created(struct bt_conn *conn, struct bt_conn_le_cs_config
 
 void notify_cs_config_removed(struct bt_conn *conn, uint8_t config_id);
 
+void notify_cs_subevent_result(struct bt_conn *conn, struct bt_conn_le_cs_subevent_result *result);
+
 #if defined(CONFIG_BT_SMP)
 /* If role specific LTK is present */
 bool bt_conn_ltk_present(const struct bt_conn *conn);
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index 8341e9f9364..05ab7a90504 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -18,6 +18,7 @@
 LOG_MODULE_REGISTER(bt_cs);
 
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
+static struct bt_le_cs_test_cb cs_test_callbacks;
 
 void bt_le_cs_set_valid_chmap_bits(uint8_t channel_map[10])
 {
@@ -241,6 +242,12 @@ void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf)
 	bt_conn_unref(conn);
 }
 
+int bt_le_cs_test_cb_register(struct bt_le_cs_test_cb cb)
+{
+	cs_test_callbacks = cb;
+	return 0;
+}
+
 int bt_le_cs_start_test(const struct bt_le_cs_test_param *params)
 {
 	struct bt_hci_op_le_cs_test *cp;
@@ -344,6 +351,74 @@ int bt_le_cs_start_test(const struct bt_le_cs_test_param *params)
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_TEST, buf, NULL);
 }
 
+void bt_hci_le_cs_subevent_result(struct net_buf *buf)
+{
+	struct bt_conn *conn = NULL;
+	struct bt_hci_evt_le_cs_subevent_result *evt;
+	struct bt_conn_le_cs_subevent_result result;
+	struct net_buf_simple step_data_buf;
+
+	if (buf->len < sizeof(*evt)) {
+		LOG_ERR("Unexpected end of buffer");
+		return;
+	}
+
+	evt = net_buf_pull_mem(buf, sizeof(*evt));
+
+	if (evt->subevent_done_status == BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL) {
+		LOG_WRN("Discarded incomplete CS subevent results.");
+		return;
+	}
+
+	if (sys_le16_to_cpu(evt->conn_handle) == BT_HCI_LE_CS_TEST_CONN_HANDLE) {
+		if (!cs_test_callbacks.le_cs_test_subevent_data_available) {
+			LOG_WRN("No callback registered. Discarded subevent results from CS Test.");
+			return;
+		}
+	} else {
+		conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->conn_handle), BT_CONN_TYPE_LE);
+		if (!conn) {
+			LOG_ERR("Unknown connection handle when processing subevent results");
+			return;
+		}
+	}
+
+	result.header.procedure_counter = sys_le16_to_cpu(evt->procedure_counter);
+	result.header.frequency_compensation = sys_le16_to_cpu(evt->frequency_compensation);
+	result.header.procedure_done_status = evt->procedure_done_status;
+	result.header.subevent_done_status = evt->subevent_done_status;
+	result.header.procedure_abort_reason = evt->procedure_abort_reason;
+	result.header.subevent_abort_reason = evt->subevent_abort_reason;
+	result.header.reference_power_level = evt->reference_power_level;
+	result.header.num_antenna_paths = evt->num_antenna_paths;
+	result.header.num_steps_reported = evt->num_steps_reported;
+
+	if (evt->num_steps_reported) {
+		net_buf_simple_init_with_data(&step_data_buf,
+					      evt->steps,
+					      buf->len);
+		result.step_data_buf = &step_data_buf;
+	} else {
+		result.step_data_buf = NULL;
+	}
+
+	if (sys_le16_to_cpu(evt->conn_handle) == BT_HCI_LE_CS_TEST_CONN_HANDLE) {
+		result.header.config_id = 0;
+		result.header.start_acl_conn_event = 0;
+
+		cs_test_callbacks.le_cs_test_subevent_data_available(&result);
+
+	} else {
+		result.header.config_id = evt->config_id;
+		result.header.start_acl_conn_event =
+			sys_le16_to_cpu(evt->start_acl_conn_event_counter);
+
+		notify_cs_subevent_result(conn, &result);
+
+		bt_conn_unref(conn);
+	}
+}
+
 void bt_hci_le_cs_config_complete_event(struct net_buf *buf)
 {
 	struct bt_hci_evt_le_cs_config_complete *evt;
@@ -447,4 +522,68 @@ int bt_le_cs_remove_config(struct bt_conn *conn, uint8_t config_id)
 
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_REMOVE_CONFIG, buf, NULL);
 }
+
+int bt_le_cs_stop_test(void)
+{
+	struct net_buf *buf;
+
+	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_TEST_END, 0);
+	if (!buf) {
+		return -ENOBUFS;
+	}
+
+	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_TEST_END, buf, NULL);
+}
+
+void bt_hci_le_cs_test_end_complete(struct net_buf *buf)
+{
+	struct bt_hci_evt_le_cs_test_end_complete *evt;
+
+	if (buf->len < sizeof(*evt)) {
+		LOG_ERR("Unexpected end of buffer");
+		return;
+	}
+
+	evt = net_buf_pull_mem(buf, sizeof(*evt));
+	if (evt->status) {
+		LOG_INF("CS Test End failed with status 0x%02X", evt->status);
+		return;
+	}
+
+	if (cs_test_callbacks.le_cs_test_end_complete) {
+		cs_test_callbacks.le_cs_test_end_complete();
+	}
+}
+
+void bt_le_cs_step_data_parse(struct net_buf_simple *step_data_buf,
+			      bool (*func)(struct bt_le_cs_subevent_step *step, void *user_data),
+			      void *user_data)
+{
+	if (!step_data_buf) {
+		LOG_INF("Tried to parse empty step data.");
+		return;
+	}
+
+	while (step_data_buf->len > 1) {
+		struct bt_le_cs_subevent_step step;
+
+		step.mode = net_buf_simple_pull_u8(step_data_buf);
+		step.channel = net_buf_simple_pull_u8(step_data_buf);
+		step.data_len = net_buf_simple_pull_u8(step_data_buf);
+
+		if (step.data_len == 0) {
+			LOG_WRN("Encountered zero-length step data.");
+			return;
+		}
+
+		step.data = step_data_buf->data;
+
+		if (!func(&step, user_data)) {
+			return;
+		}
+
+		net_buf_simple_pull(step_data_buf, step.data_len);
+	}
+}
+
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index 39fe50643a7..a6329eecc23 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -2830,6 +2830,12 @@ static const struct event_handler meta_events[] = {
 		      sizeof(struct bt_hci_evt_le_cs_read_remote_fae_table_complete)),
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_CONFIG_COMPLETE, bt_hci_le_cs_config_complete_event,
 		      sizeof(struct bt_hci_evt_le_cs_config_complete)),
+	EVENT_HANDLER(BT_HCI_EVT_LE_CS_SUBEVENT_RESULT,
+		      bt_hci_le_cs_subevent_result,
+		      sizeof(struct bt_hci_evt_le_cs_subevent_result)),
+	EVENT_HANDLER(BT_HCI_EVT_LE_CS_TEST_END_COMPLETE,
+		      bt_hci_le_cs_test_end_complete,
+		      sizeof(struct bt_hci_evt_le_cs_test_end_complete)),
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
 
 };
@@ -3407,6 +3413,8 @@ static int le_set_event_mask(void)
 		mask |= BT_EVT_MASK_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE;
 		mask |= BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE;
 		mask |= BT_EVT_MASK_LE_CS_CONFIG_COMPLETE;
+		mask |= BT_EVT_MASK_LE_CS_SUBEVENT_RESULT;
+		mask |= BT_EVT_MASK_LE_CS_TEST_END_COMPLETE;
 	}
 
 	sys_put_le64(mask, cp_mask->events);
diff --git a/subsys/bluetooth/host/hci_core.h b/subsys/bluetooth/host/hci_core.h
index a50b534f1b7..27387c9c53f 100644
--- a/subsys/bluetooth/host/hci_core.h
+++ b/subsys/bluetooth/host/hci_core.h
@@ -542,6 +542,8 @@ void bt_hci_le_past_received_v2(struct net_buf *buf);
 void bt_hci_le_cs_read_remote_supported_capabilities_complete(struct net_buf *buf);
 void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf);
 void bt_hci_le_cs_config_complete_event(struct net_buf *buf);
+void bt_hci_le_cs_subevent_result(struct net_buf *buf);
+void bt_hci_le_cs_test_end_complete(struct net_buf *buf);
 
 /* Adv HCI event handlers */
 void bt_hci_le_adv_set_terminated(struct net_buf *buf);
diff --git a/subsys/bluetooth/shell/cs.c b/subsys/bluetooth/shell/cs.c
index c5bc228f35c..fbc55623b14 100644
--- a/subsys/bluetooth/shell/cs.c
+++ b/subsys/bluetooth/shell/cs.c
@@ -136,6 +136,52 @@ static int cmd_read_remote_fae_table(const struct shell *sh, size_t argc, char *
 	return 0;
 }
 
+static bool process_step_data(struct bt_le_cs_subevent_step *step, void *user_data)
+{
+	shell_print(ctx_shell, "Subevent results contained step data: ");
+	shell_print(ctx_shell, "- Step mode %d\n"
+		"- Step channel %d\n"
+		"- Step data hexdump:",
+		step->mode,
+		step->channel);
+	shell_hexdump(ctx_shell, step->data, step->data_len);
+
+	return true;
+}
+
+static void cs_test_subevent_data_cb(struct bt_conn_le_cs_subevent_result *result)
+{
+	shell_print(ctx_shell, "Received subevent results.");
+	shell_print(ctx_shell, "Subevent Header:\n"
+		"- Procedure Counter: %d\n"
+		"- Frequency Compensation: 0x%04x\n"
+		"- Reference Power Level: %d\n"
+		"- Procedure Done Status: 0x%02x\n"
+		"- Subevent Done Status: 0x%02x\n"
+		"- Procedure Abort Reason: 0x%02x\n"
+		"- Subevent Abort Reason: 0x%02x\n"
+		"- Number of Antenna Paths: %d\n"
+		"- Number of Steps Reported: %d",
+		result->header.procedure_counter,
+		result->header.frequency_compensation,
+		result->header.reference_power_level,
+		result->header.procedure_done_status,
+		result->header.subevent_done_status,
+		result->header.procedure_abort_reason,
+		result->header.subevent_abort_reason,
+		result->header.num_antenna_paths,
+		result->header.num_steps_reported);
+
+	if (result->step_data_buf) {
+		bt_le_cs_step_data_parse(result->step_data_buf, process_step_data, NULL);
+	}
+}
+
+static void cs_test_end_complete_cb(void)
+{
+	shell_print(ctx_shell, "CS Test End Complete.");
+}
+
 static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 {
 	int err = 0;
@@ -144,7 +190,7 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	params.main_mode = BT_CONN_LE_CS_MAIN_MODE_1;
 	params.sub_mode = BT_CONN_LE_CS_SUB_MODE_UNUSED;
 	params.main_mode_repetition = 0;
-	params.mode_0_steps = 0x1;
+	params.mode_0_steps = 2;
 
 	params.role = shell_strtoul(argv[1], 16, &err);
 
@@ -164,9 +210,9 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_AA_ONLY;
 	params.cs_sync_phy = BT_CONN_LE_CS_SYNC_1M_PHY;
 	params.cs_sync_antenna_selection = BT_LE_CS_TEST_CS_SYNC_ANTENNA_SELECTION_ONE;
-	params.subevent_len = 10000;
-	params.subevent_interval = 0;
-	params.max_num_subevents = 0;
+	params.subevent_len = 3000;
+	params.subevent_interval = 1;
+	params.max_num_subevents = 1;
 	params.transmit_power_level = BT_HCI_OP_LE_CS_TEST_MAXIMIZE_TX_POWER;
 	params.t_ip1_time = 80;
 	params.t_ip2_time = 80;
@@ -182,10 +228,23 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	memset(params.override_config_0.not_set.channel_map, 0,
 	       sizeof(params.override_config_0.not_set.channel_map));
 	params.override_config_0.not_set.channel_map[1] = 0xFF;
+	params.override_config_0.not_set.channel_map[7] = 0xFF;
+	params.override_config_0.not_set.channel_map[8] = 0xFF;
 	params.override_config_0.not_set.channel_selection_type = BT_CONN_LE_CS_CHSEL_TYPE_3B;
 	params.override_config_0.not_set.ch3c_shape = BT_CONN_LE_CS_CH3C_SHAPE_HAT;
 	params.override_config_0.not_set.ch3c_jump = 0x2;
 
+	struct bt_le_cs_test_cb cs_test_cb = {
+		.le_cs_test_subevent_data_available = cs_test_subevent_data_cb,
+		.le_cs_test_end_complete = cs_test_end_complete_cb,
+	};
+
+	err = bt_le_cs_test_cb_register(cs_test_cb);
+	if (err) {
+		shell_error(sh, "bt_le_cs_test_cb_register returned error %d", err);
+		return -ENOEXEC;
+	}
+
 	err = bt_le_cs_start_test(&params);
 	if (err) {
 		shell_error(sh, "bt_le_cs_start_test returned error %d", err);
@@ -370,6 +429,19 @@ static int cmd_create_config(const struct shell *sh, size_t argc, char *argv[])
 	return 0;
 }
 
+static int cmd_cs_stop_test(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err = 0;
+
+	err = bt_le_cs_stop_test();
+	if (err) {
+		shell_error(sh, "bt_cs_stop_test returned error %d", err);
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	cs_cmds,
 	SHELL_CMD_ARG(read_remote_supported_capabilities, NULL, "<None>",
@@ -382,6 +454,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 	SHELL_CMD_ARG(read_remote_fae_table, NULL, "<None>", cmd_read_remote_fae_table, 1, 0),
 	SHELL_CMD_ARG(start_simple_cs_test, NULL, "<Role selection (initiator, reflector): 0, 1>",
 		      cmd_cs_test_simple, 2, 0),
+	SHELL_CMD_ARG(stop_cs_test, NULL, "<None>", cmd_cs_stop_test, 1, 0),
 	SHELL_CMD_ARG(
 		create_config, NULL,
 		"<id> <context: local-only, local-remote> <role: initiator, reflector> "

From 3777d8417946e1a5d407aa3e4e03a9d09fce4fe2 Mon Sep 17 00:00:00 2001
From: Olivier Lesage <olivier.lesage@nordicsemi.no>
Date: Fri, 4 Oct 2024 11:34:37 +0200
Subject: [PATCH 0080/2913] [nrf fromtree] bluetooth: host: Add
 CONFIG_BT_CHANNEL_SOUNDING_TEST

Makes it easier to make sure the CS test code is removed if desired.
It should hopefully allow for a clean split in general.

Signed-off-by: Olivier Lesage <olivier.lesage@nordicsemi.no>
(cherry picked from commit 9e3943d13ed866f3fd0899a5ff0666585c329631)
(cherry picked from commit 6847bfb33f9730c11bafc87be1e1606ec6c543be)
(cherry picked from commit dd6c36ea2b7691cddf8337b20b7b9d7b67e31daf)
---
 include/zephyr/bluetooth/cs.h       |  6 ++++--
 subsys/bluetooth/Kconfig            |  7 +++++++
 subsys/bluetooth/host/cs.c          | 16 ++++++++++++++--
 subsys/bluetooth/host/hci_core.c    |  2 ++
 tests/bluetooth/shell/testcase.yaml |  1 +
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index ffb839a9d15..fa362083180 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -595,6 +595,8 @@ int bt_le_cs_read_remote_fae_table(struct bt_conn *conn);
  * Existing callbacks can be unregistered by providing NULL function
  * pointers.
  *
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING_TEST} must be set.
+ *
  * @param cs_test_cb Set of callbacks to be used with CS Test
  *
  * @return Zero on success or (negative) error code on failure.
@@ -615,7 +617,7 @@ int bt_le_cs_test_cb_register(struct bt_le_cs_test_cb cs_test_cb);
  * parameters of this command describe the required transmit and receive behavior
  * for the CS test.
  *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING_TEST} must be set.
  *
  * @param params CS Test parameters
  *
@@ -661,7 +663,7 @@ int bt_le_cs_remove_config(struct bt_conn *conn, uint8_t config_id);
  * The controller is expected to finish reporting any subevent results
  * before completing this termination.
  *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING_TEST} must be set.
  *
  * @return Zero on success or (negative) error code on failure.
  */
diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig
index e8c7d9676d7..6fb49dcd66d 100644
--- a/subsys/bluetooth/Kconfig
+++ b/subsys/bluetooth/Kconfig
@@ -196,6 +196,13 @@ config BT_CHANNEL_SOUNDING
 	help
 	  Enable support for Bluetooth 6.0 Channel Sounding feature.
 
+config BT_CHANNEL_SOUNDING_TEST
+	bool "Channel Sounding Test [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	depends on BT_CHANNEL_SOUNDING
+	help
+	  Enable support for Channel Sounding test mode.
+
 endif # BT_CONN
 
 rsource "Kconfig.iso"
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index 05ab7a90504..75d5f21cf2c 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -18,7 +18,9 @@
 LOG_MODULE_REGISTER(bt_cs);
 
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
+#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 static struct bt_le_cs_test_cb cs_test_callbacks;
+#endif
 
 void bt_le_cs_set_valid_chmap_bits(uint8_t channel_map[10])
 {
@@ -242,6 +244,7 @@ void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf)
 	bt_conn_unref(conn);
 }
 
+#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 int bt_le_cs_test_cb_register(struct bt_le_cs_test_cb cb)
 {
 	cs_test_callbacks = cb;
@@ -350,6 +353,7 @@ int bt_le_cs_start_test(const struct bt_le_cs_test_param *params)
 
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_TEST, buf, NULL);
 }
+#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
 
 void bt_hci_le_cs_subevent_result(struct net_buf *buf)
 {
@@ -370,12 +374,15 @@ void bt_hci_le_cs_subevent_result(struct net_buf *buf)
 		return;
 	}
 
+#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 	if (sys_le16_to_cpu(evt->conn_handle) == BT_HCI_LE_CS_TEST_CONN_HANDLE) {
 		if (!cs_test_callbacks.le_cs_test_subevent_data_available) {
 			LOG_WRN("No callback registered. Discarded subevent results from CS Test.");
 			return;
 		}
-	} else {
+	} else
+#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
+	{
 		conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->conn_handle), BT_CONN_TYPE_LE);
 		if (!conn) {
 			LOG_ERR("Unknown connection handle when processing subevent results");
@@ -402,13 +409,16 @@ void bt_hci_le_cs_subevent_result(struct net_buf *buf)
 		result.step_data_buf = NULL;
 	}
 
+#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 	if (sys_le16_to_cpu(evt->conn_handle) == BT_HCI_LE_CS_TEST_CONN_HANDLE) {
 		result.header.config_id = 0;
 		result.header.start_acl_conn_event = 0;
 
 		cs_test_callbacks.le_cs_test_subevent_data_available(&result);
 
-	} else {
+	} else
+#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
+	{
 		result.header.config_id = evt->config_id;
 		result.header.start_acl_conn_event =
 			sys_le16_to_cpu(evt->start_acl_conn_event_counter);
@@ -523,6 +533,7 @@ int bt_le_cs_remove_config(struct bt_conn *conn, uint8_t config_id)
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_REMOVE_CONFIG, buf, NULL);
 }
 
+#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 int bt_le_cs_stop_test(void)
 {
 	struct net_buf *buf;
@@ -554,6 +565,7 @@ void bt_hci_le_cs_test_end_complete(struct net_buf *buf)
 		cs_test_callbacks.le_cs_test_end_complete();
 	}
 }
+#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
 
 void bt_le_cs_step_data_parse(struct net_buf_simple *step_data_buf,
 			      bool (*func)(struct bt_le_cs_subevent_step *step, void *user_data),
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index a6329eecc23..f2f6c10601a 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -2833,9 +2833,11 @@ static const struct event_handler meta_events[] = {
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_SUBEVENT_RESULT,
 		      bt_hci_le_cs_subevent_result,
 		      sizeof(struct bt_hci_evt_le_cs_subevent_result)),
+#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_TEST_END_COMPLETE,
 		      bt_hci_le_cs_test_end_complete,
 		      sizeof(struct bt_hci_evt_le_cs_test_end_complete)),
+#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
 
 };
diff --git a/tests/bluetooth/shell/testcase.yaml b/tests/bluetooth/shell/testcase.yaml
index a19dfa3f456..cec0a9d0046 100644
--- a/tests/bluetooth/shell/testcase.yaml
+++ b/tests/bluetooth/shell/testcase.yaml
@@ -46,6 +46,7 @@ tests:
   bluetooth.shell.channel_sounding:
     extra_configs:
       - CONFIG_BT_CHANNEL_SOUNDING=y
+      - CONFIG_BT_CHANNEL_SOUNDING_TEST=y
       - CONFIG_BT_CTLR=n
     platform_allow:
       - native_sim

From 0d1c18f433379d4ef5e2f42962ddf3b1a537d453 Mon Sep 17 00:00:00 2001
From: Olivier Lesage <olivier.lesage@nordicsemi.no>
Date: Tue, 1 Oct 2024 08:40:25 +0200
Subject: [PATCH 0081/2913] [nrf fromtree] bluetooth: host: Update text for
 BT_CHANNEL_SOUNDING kconfig

Include EXPERIMENTAL tag in the kconfig text and remove the word
"support" to align with other options

Signed-off-by: Olivier Lesage <olivier.lesage@nordicsemi.no>
(cherry picked from commit 9ae2e23d347c10e2250e587c07a7fd8835c28bcf)
(cherry picked from commit b19fab29203708297273eadb6c999bb75349aa43)
(cherry picked from commit ee45d24a47317b94ddc1bc8cce1d9734eeaa0c43)
---
 subsys/bluetooth/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig
index 6fb49dcd66d..bf6feff37eb 100644
--- a/subsys/bluetooth/Kconfig
+++ b/subsys/bluetooth/Kconfig
@@ -190,7 +190,7 @@ config BT_SUBRATING
 	  Bluetooth Core specification, Version 5.4 | Vol 6, Part B, Section 4.6.35.
 
 config BT_CHANNEL_SOUNDING
-	bool "Channel Sounding support"
+	bool "Channel Sounding [EXPERIMENTAL]"
 	select EXPERIMENTAL
 	depends on !BT_CTLR || BT_CTLR_CHANNEL_SOUNDING_SUPPORT
 	help

From 1bf7e2d24cf280e66f72519357869209ffe7a35a Mon Sep 17 00:00:00 2001
From: Mateusz Kapala <mateusz.kapala@nordicsemi.no>
Date: Tue, 10 Sep 2024 13:56:12 +0200
Subject: [PATCH 0082/2913] [nrf fromtree] mgmt: mcumgr: Add SMP SVC and CHR
 UUIDs to header

Added the SMP service and characteristic UUIDs to the smp_bt module
header and used those definitions.

Signed-off-by: Mateusz Kapala <mateusz.kapala@nordicsemi.no>
(cherry picked from commit 77555898de6cb2b0a1933edd35e97c7d55ac26e2)
(cherry picked from commit d3d3f66845737630687c9018cdb687319b74ec17)
(cherry picked from commit d8482b090ada391997774a8ca85632259defb649)
---
 include/zephyr/mgmt/mcumgr/transport/smp_bt.h | 19 +++++++++++++++++++
 subsys/mgmt/mcumgr/transport/src/smp_bt.c     | 16 ++--------------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/include/zephyr/mgmt/mcumgr/transport/smp_bt.h b/include/zephyr/mgmt/mcumgr/transport/smp_bt.h
index 0aff0510ecd..501cd65885a 100644
--- a/include/zephyr/mgmt/mcumgr/transport/smp_bt.h
+++ b/include/zephyr/mgmt/mcumgr/transport/smp_bt.h
@@ -11,6 +11,7 @@
 #ifndef ZEPHYR_INCLUDE_MGMT_SMP_BT_H_
 #define ZEPHYR_INCLUDE_MGMT_SMP_BT_H_
 
+#include <zephyr/bluetooth/uuid.h>
 #include <zephyr/types.h>
 struct bt_conn;
 
@@ -18,6 +19,24 @@ struct bt_conn;
 extern "C" {
 #endif
 
+/** SMP service UUID value. */
+#define SMP_BT_SVC_UUID_VAL \
+	BT_UUID_128_ENCODE(0x8d53dc1d, 0x1db7, 0x4cd3, 0x868b, 0x8a527460aa84)
+
+/** SMP service UUID. */
+#define SMP_BT_SVC_UUID \
+	BT_UUID_DECLARE_128(SMP_BT_SVC_UUID_VAL)
+
+/** SMP characteristic UUID value. */
+#define SMP_BT_CHR_UUID_VAL \
+	BT_UUID_128_ENCODE(0xda2e7828, 0xfbce, 0x4e01, 0xae9e, 0x261174997c48)
+
+/** SMP characteristic UUID
+ *  Used for both requests and responses.
+ */
+#define SMP_BT_CHR_UUID \
+	BT_UUID_DECLARE_128(SMP_BT_CHR_UUID_VAL)
+
 /**
  * @brief	Registers the SMP Bluetooth service. Should only be called if the Bluetooth
  *		transport has been unregistered by calling smp_bt_unregister().
diff --git a/subsys/mgmt/mcumgr/transport/src/smp_bt.c b/subsys/mgmt/mcumgr/transport/src/smp_bt.c
index a72c8468647..b2486a5d51c 100644
--- a/subsys/mgmt/mcumgr/transport/src/smp_bt.c
+++ b/subsys/mgmt/mcumgr/transport/src/smp_bt.c
@@ -109,18 +109,6 @@ static uint8_t next_id;
 static struct smp_transport smp_bt_transport;
 static struct conn_param_data conn_data[CONFIG_BT_MAX_CONN];
 
-/* SMP service.
- * {8D53DC1D-1DB7-4CD3-868B-8A527460AA84}
- */
-static const struct bt_uuid_128 smp_bt_svc_uuid = BT_UUID_INIT_128(
-	BT_UUID_128_ENCODE(0x8d53dc1d, 0x1db7, 0x4cd3, 0x868b, 0x8a527460aa84));
-
-/* SMP characteristic; used for both requests and responses.
- * {DA2E7828-FBCE-4E01-AE9E-261174997C48}
- */
-static const struct bt_uuid_128 smp_bt_chr_uuid = BT_UUID_INIT_128(
-	BT_UUID_128_ENCODE(0xda2e7828, 0xfbce, 0x4e01, 0xae9e, 0x261174997c48));
-
 static void connected(struct bt_conn *conn, uint8_t err);
 static void disconnected(struct bt_conn *conn, uint8_t reason);
 
@@ -375,8 +363,8 @@ static void smp_bt_ccc_changed(const struct bt_gatt_attr *attr, uint16_t value)
 }
 
 #define SMP_BT_ATTRS									\
-	BT_GATT_PRIMARY_SERVICE(&smp_bt_svc_uuid),					\
-	BT_GATT_CHARACTERISTIC(&smp_bt_chr_uuid.uuid,					\
+	BT_GATT_PRIMARY_SERVICE(SMP_BT_SVC_UUID),					\
+	BT_GATT_CHARACTERISTIC(SMP_BT_CHR_UUID,						\
 			       BT_GATT_CHRC_WRITE_WITHOUT_RESP |			\
 			       BT_GATT_CHRC_NOTIFY,					\
 			       SMP_GATT_PERM & SMP_GATT_PERM_WRITE_MASK,		\

From 7e4842ccccb52337ce6203c419b1f4f753cdfd55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Mon, 7 Oct 2024 09:35:38 +0200
Subject: [PATCH 0083/2913] [nrf fromtree] dts: riscv: nordic:
 nrf54h20_cpuflpr: Add stmesp node
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add node with STMESP registers.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 8e22222e750614dec06b55dfb26abe574dc0f668)
(cherry picked from commit 5190fe9c3e2dd38e1c68ab28fff3afd9450e42b0)
(cherry picked from commit c4f3d61e2c6ecae86fb530d6d71aa510ea02b6c9)
---
 dts/riscv/nordic/nrf54h20_cpuflpr.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dts/riscv/nordic/nrf54h20_cpuflpr.dtsi b/dts/riscv/nordic/nrf54h20_cpuflpr.dtsi
index 173897b9e66..11baac5239b 100644
--- a/dts/riscv/nordic/nrf54h20_cpuflpr.dtsi
+++ b/dts/riscv/nordic/nrf54h20_cpuflpr.dtsi
@@ -27,6 +27,11 @@ cpusys_vevif: &cpusys_vevif_tx {};
 		compatible = "simple-bus";
 		interrupt-parent = <&cpuflpr_clic>;
 		ranges;
+
+		stmesp: memory@ad000000 {
+			compatible = "arm,stmesp";
+			reg = <0xad000000 0x1000000>;
+		};
 	};
 };
 

From cf790873b7d0a5281de8137bbc3946482e9daaa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Mon, 7 Oct 2024 09:37:57 +0200
Subject: [PATCH 0084/2913] [nrf fromtree] logging: frontend: stmesp: Do not
 append strings when not needed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently we can assume that flpr and ppr cores are always owned by
cpuapp. In that case, cpuapp (which processes ETR buffer content) has
access to the memory where logging strings from ppr and flpr are
located. Those strings do not need to be appended to the message
which is written to the STM (in case of standalone configuration).
This approach reduced logging time, e.g. logging a message with
one argument takes 1.8us on cpuapp and 6.3us on cpurad.

This setting applies only to the case when cpuapp is the owner
of those co-oprocessors and shall be updated if that becomes
configurable but currently there are no means to detect core
owner.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit c2454f2a9f8b562bc7f36f02c62fc3c91704a048)
(cherry picked from commit 7ba09b043932224be84aa4ccfb66aa4ff322ac0d)
(cherry picked from commit 99f98fa94e9b4e5317a2d884e5356d9fca16b2eb)
---
 subsys/logging/frontends/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/subsys/logging/frontends/Kconfig b/subsys/logging/frontends/Kconfig
index 9d4b7a43797..c232eb7354a 100644
--- a/subsys/logging/frontends/Kconfig
+++ b/subsys/logging/frontends/Kconfig
@@ -46,7 +46,8 @@ config LOG_FRONTEND_STMESP_DICT
 
 config LOG_FRONTEND_STMESP_FSC
 	bool "Send fully self-contained messages"
-	select LOG_MSG_APPEND_RO_STRING_LOC if !NRF_ETR
+	select LOG_MSG_APPEND_RO_STRING_LOC if (!NRF_ETR && !SOC_NRF54H20_CPUPPR && \
+			!SOC_NRF54H20_CPUFLPR)
 
 config LOG_FRONTEND_STMESP_FLUSH_COUNT
 	int "Number of flushing words"

From 5a573c9f6212834ddb77a0f3f86c87bcdb8743b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 25 Sep 2024 14:30:24 +0200
Subject: [PATCH 0085/2913] [nrf fromtree] samples: boards: nordic:
 coresight_stm: Improve benchmark
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add interrupt locking during test to ensure that main thread is not
interrupts which would impact the test.

Add longer sleep time between tests to ensure that all logs are
processed on time and not dropped.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit c61e92a79c432ae9fde01ff072ccddea2a4fbe40)
(cherry picked from commit f470b55f83944136cece96df005f0f6df99c622b)
(cherry picked from commit 829d41962a6c0a7186b08a689ab169f42426f8c7)
---
 samples/boards/nordic/coresight_stm/src/main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/samples/boards/nordic/coresight_stm/src/main.c b/samples/boards/nordic/coresight_stm/src/main.c
index c5bf328678b..01d3d14035c 100644
--- a/samples/boards/nordic/coresight_stm/src/main.c
+++ b/samples/boards/nordic/coresight_stm/src/main.c
@@ -16,12 +16,14 @@ LOG_MODULE_REGISTER(app);
 
 #define TEST_LOG(rpt, item)                                                                        \
 	({                                                                                         \
+		uint32_t key = irq_lock();                                                         \
 		uint32_t t = k_cycle_get_32();                                                     \
 		for (uint32_t i = 0; i < rpt; i++) {                                               \
 			__DEBRACKET item;                                                          \
 		}                                                                                  \
 		t = k_cycle_get_32() - t;                                                          \
-		k_msleep(200);                                                                     \
+		irq_unlock(key);                                                                   \
+		k_msleep(400);                                                                     \
 		t;                                                                                 \
 	})
 

From ab41cd0ecb692509b607f4775fe41e98ef21c3d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 25 Sep 2024 14:30:41 +0200
Subject: [PATCH 0086/2913] [nrf fromtree] samples: boards: nordic:
 coresight_stm: Add flpr and ppr support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add flpr and ppr core to the sample.

Since there are only 2 UARTs available on DK, local UART configuration
is using only cpuapp and cpurad.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit d11997dbcf2f3d0c38503a18fef72ef71c55940e)
(cherry picked from commit 0dc6f1f37d5350571a744407741d80646f953b68)
(cherry picked from commit 9beae7d2aab344f42e1d23079f2241e419494b29)
---
 .../nordic/coresight_stm/Kconfig.sysbuild     |  8 +++--
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 16 ++++++++++
 .../nordic/coresight_stm/remote/prj.conf      |  5 +++
 .../boards/nordic/coresight_stm/sample.yaml   |  6 ++++
 .../boards/nordic/coresight_stm/src/main.c    |  5 +--
 .../nordic/coresight_stm/sysbuild.cmake       | 32 +++++++++++++------
 6 files changed, 57 insertions(+), 15 deletions(-)
 create mode 100644 samples/boards/nordic/coresight_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/samples/boards/nordic/coresight_stm/Kconfig.sysbuild b/samples/boards/nordic/coresight_stm/Kconfig.sysbuild
index ae4c8048615..3e4ddeaa515 100644
--- a/samples/boards/nordic/coresight_stm/Kconfig.sysbuild
+++ b/samples/boards/nordic/coresight_stm/Kconfig.sysbuild
@@ -4,6 +4,8 @@
 
 source "share/sysbuild/Kconfig"
 
-config RAD_CORE_BOARD
-string
-	default "nrf54h20dk/nrf54h20/cpurad" if $(BOARD) = "nrf54h20dk"
+config APP_CPUPPR_RUN
+	bool "Use PPR"
+
+config APP_CPUFLPR_RUN
+	bool "Use FLPR"
diff --git a/samples/boards/nordic/coresight_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/boards/nordic/coresight_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..bf5ba18d204
--- /dev/null
+++ b/samples/boards/nordic/coresight_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&cpuppr_vpr {
+	status = "okay";
+};
+
+&cpuppr_ram3x_region {
+	status = "okay";
+};
+
+&cpuflpr_vpr {
+	status = "okay";
+};
diff --git a/samples/boards/nordic/coresight_stm/remote/prj.conf b/samples/boards/nordic/coresight_stm/remote/prj.conf
index 1e935e973c7..5bea9f4760e 100644
--- a/samples/boards/nordic/coresight_stm/remote/prj.conf
+++ b/samples/boards/nordic/coresight_stm/remote/prj.conf
@@ -1 +1,6 @@
 CONFIG_LOG=y
+CONFIG_CONSOLE=n
+CONFIG_UART_CONSOLE=n
+CONFIG_SERIAL=n
+CONFIG_BOOT_BANNER=n
+CONFIG_PRINTK=n
diff --git a/samples/boards/nordic/coresight_stm/sample.yaml b/samples/boards/nordic/coresight_stm/sample.yaml
index 2bf3f0695e8..eb3971a2f4e 100644
--- a/samples/boards/nordic/coresight_stm/sample.yaml
+++ b/samples/boards/nordic/coresight_stm/sample.yaml
@@ -11,6 +11,9 @@ tests:
     build_only: true
     required_snippets:
       - nordic-log-stm-dict
+    extra_args:
+      - SB_CONFIG_APP_CPUPPR_RUN=y
+      - SB_CONFIG_APP_CPUFLPR_RUN=y
   sample.boards.nrf.coresight_stm:
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
@@ -26,6 +29,9 @@ tests:
         - "Timing for log message with 2 arguments:"
         - "Timing for log message with 3 arguments:"
         - "Timing for log_message with string:"
+    extra_args:
+      - SB_CONFIG_APP_CPUPPR_RUN=y
+      - SB_CONFIG_APP_CPUFLPR_RUN=y
     required_snippets:
       - nordic-log-stm
   sample.boards.nrf.coresight_stm.local_uart:
diff --git a/samples/boards/nordic/coresight_stm/src/main.c b/samples/boards/nordic/coresight_stm/src/main.c
index 01d3d14035c..221633d8638 100644
--- a/samples/boards/nordic/coresight_stm/src/main.c
+++ b/samples/boards/nordic/coresight_stm/src/main.c
@@ -5,7 +5,6 @@
  */
 
 #include <zephyr/kernel.h>
-#include <zephyr/sys/printk.h>
 #include <zephyr/logging/log.h>
 
 #ifdef CONFIG_LOG_FRONTEND_STMESP
@@ -37,6 +36,8 @@ static void get_core_name(void)
 		core_name = "rad";
 	} else if (strstr(CONFIG_BOARD_TARGET, "cpuppr")) {
 		core_name = "ppr";
+	} else if (strstr(CONFIG_BOARD_TARGET, "cpuflpr")) {
+		core_name = "flpr";
 	}
 }
 
@@ -49,7 +50,7 @@ static void timing_report(uint32_t t, uint32_t rpt, const char *str)
 {
 	uint32_t ns = t_to_ns(t, rpt, CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC);
 
-	printk("%s: Timing for %s: %d.%dus\n", core_name, str, ns / 1000, (ns % 1000) / 10);
+	LOG_RAW("%s: Timing for %s: %d.%dus\n", core_name, str, ns / 1000, (ns % 1000) / 10);
 }
 
 int main(void)
diff --git a/samples/boards/nordic/coresight_stm/sysbuild.cmake b/samples/boards/nordic/coresight_stm/sysbuild.cmake
index c2eaeeaa20f..89ccbcf1343 100644
--- a/samples/boards/nordic/coresight_stm/sysbuild.cmake
+++ b/samples/boards/nordic/coresight_stm/sysbuild.cmake
@@ -1,16 +1,28 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if("${SB_CONFIG_RAD_CORE_BOARD}" STREQUAL "")
-	message(FATAL_ERROR
-	"Target ${BOARD} not supported for this sample. "
-	"There is no remote board selected in Kconfig.sysbuild")
-endif()
-
-set(RAD_APP remote)
+set(REMOTE_APP remote)
 
 ExternalZephyrProject_Add(
-	APPLICATION ${RAD_APP}
-	SOURCE_DIR  ${APP_DIR}/${RAD_APP}
-	BOARD       ${SB_CONFIG_RAD_CORE_BOARD}
+	APPLICATION ${REMOTE_APP}_rad
+	SOURCE_DIR  ${APP_DIR}/${REMOTE_APP}
+	BOARD ${SB_CONFIG_BOARD}/${SB_CONFIG_SOC}/cpurad
 )
+
+# There are sample configurations which do not use PPR.
+if(SB_CONFIG_APP_CPUPPR_RUN)
+	ExternalZephyrProject_Add(
+		APPLICATION ${REMOTE_APP}_ppr
+		SOURCE_DIR  ${APP_DIR}/${REMOTE_APP}
+		BOARD ${SB_CONFIG_BOARD}/${SB_CONFIG_SOC}/cpuppr
+	)
+endif()
+
+# There are sample configurations which do not use FLPR.
+if(SB_CONFIG_APP_CPUFLPR_RUN)
+	ExternalZephyrProject_Add(
+		APPLICATION ${REMOTE_APP}_flpr
+		SOURCE_DIR  ${APP_DIR}/${REMOTE_APP}
+		BOARD ${SB_CONFIG_BOARD}/${SB_CONFIG_SOC}/cpuflpr
+	)
+endif()

From 570158a84153d713ceb53c2496ffecc951498fd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Tue, 8 Oct 2024 10:30:08 +0200
Subject: [PATCH 0087/2913] [nrf fromtree] soc: nordic: Disable asserts on ppr
 and flpr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Asserts are by default enabled for tests but flpr and ppr are
small cores (<64k) and many tests does not fit in memory with
asserts enabled.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 3786b617bdc65204a65a928124d3b11002315484)
(cherry picked from commit f95f5c6682953e3b5fab0624900869cfe518c24b)
(cherry picked from commit 983493d06c874a866019ea5c89f056b7dd5d98f7)
---
 soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr      | 4 ++++
 soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr       | 4 ++++
 soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuflpr      | 4 ++++
 soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuflpr | 3 +++
 soc/nordic/nrf92/Kconfig.defconfig.nrf9280_cpuppr         | 4 ++++
 5 files changed, 19 insertions(+)

diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
index 68acc00f79b..2b792e9f1b9 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
@@ -6,4 +6,8 @@ if SOC_NRF54H20_CPUFLPR
 config NUM_IRQS
 	default 496
 
+# As FLPR has limited memory most of tests does not fit with asserts enabled.
+config ASSERT
+	default n
+
 endif # SOC_NRF54H20_CPUFLPR
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
index ae05e5e89d4..bf7c12a3a69 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
@@ -8,5 +8,9 @@ config NUM_IRQS
 
 config SYS_CLOCK_TICKS_PER_SEC
 	default 1000
+#
+# As PPR has limited memory most of tests does not fit with asserts enabled.
+config ASSERT
+	default n
 
 endif # SOC_NRF54H20_CPUPPR
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuflpr b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuflpr
index eabd1844c90..7c653d14b93 100644
--- a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuflpr
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuflpr
@@ -8,4 +8,8 @@ if SOC_NRF54L15_CPUFLPR
 config NUM_IRQS
 	default 287
 
+# As FLPR has limited memory most of tests does not fit with asserts enabled.
+config ASSERT
+	default n
+
 endif # SOC_NRF54L15_CPUFLPR
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuflpr b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuflpr
index de1a8519225..86c80d08fc2 100644
--- a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuflpr
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuflpr
@@ -11,5 +11,8 @@ config RISCV_HAS_CPU_IDLE
 config NUM_IRQS
 	int
 	default 287
+# As FLPR has limited memory most of tests does not fit with asserts enabled.
+config ASSERT
+	default n
 
 endif # SOC_NRF54L15_ENGA_CPUFLPR
diff --git a/soc/nordic/nrf92/Kconfig.defconfig.nrf9280_cpuppr b/soc/nordic/nrf92/Kconfig.defconfig.nrf9280_cpuppr
index 1bef8de61ca..8e52b3611aa 100644
--- a/soc/nordic/nrf92/Kconfig.defconfig.nrf9280_cpuppr
+++ b/soc/nordic/nrf92/Kconfig.defconfig.nrf9280_cpuppr
@@ -12,4 +12,8 @@ config SYS_CLOCK_TICKS_PER_SEC
 config RV_BOOT_HART
 	default 13 if SOC_NRF9230_ENGB
 
+# As FLPR has limited memory most of tests does not fit with asserts enabled.
+config ASSERT
+	default n
+
 endif # SOC_NRF9280_CPUPPR

From fbf6702771192f972af65e4fb0be6b77556d2da1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Mon, 7 Oct 2024 09:45:39 +0200
Subject: [PATCH 0088/2913] [nrf fromtree] snippets: nordic-log-stm: Do no
 enforce UART Asynchronous API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

UART asynchronous API will ensure highest throughput but it is not
necessary as polling API is also supported as a fallback. Do not
enforce use of asynchronous API as there might be cases when polling
might be used (e.g. to reduce memory footprint).

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit c6f4e719b78d90d2b27f4f20602db323e9268409)
(cherry picked from commit c16b36e115403836d8f9dacca0abcfab7d16d160)
(cherry picked from commit 528e70bdf7b5738efc93cd16777e853ff70f015f)
---
 snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.conf | 1 -
 snippets/nordic-log-stm-dict/snippet.yml                 | 1 -
 snippets/nordic-log-stm/boards/nrf54h20_cpuapp.conf      | 1 -
 snippets/nordic-log-stm/snippet.yml                      | 1 -
 4 files changed, 4 deletions(-)
 delete mode 100644 snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.conf
 delete mode 100644 snippets/nordic-log-stm/boards/nrf54h20_cpuapp.conf

diff --git a/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.conf b/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.conf
deleted file mode 100644
index b4d9d63f77c..00000000000
--- a/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_UART_ASYNC_API=y
diff --git a/snippets/nordic-log-stm-dict/snippet.yml b/snippets/nordic-log-stm-dict/snippet.yml
index a482498d1e9..6e4f1c6d23e 100644
--- a/snippets/nordic-log-stm-dict/snippet.yml
+++ b/snippets/nordic-log-stm-dict/snippet.yml
@@ -5,7 +5,6 @@ boards:
   /.*/nrf54h20/cpuapp/:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpuapp.overlay
-      EXTRA_CONF_FILE: boards/nrf54h20_cpuapp.conf
   /.*/nrf54h20/cpurad/:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpurad.overlay
diff --git a/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.conf b/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.conf
deleted file mode 100644
index b4d9d63f77c..00000000000
--- a/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_UART_ASYNC_API=y
diff --git a/snippets/nordic-log-stm/snippet.yml b/snippets/nordic-log-stm/snippet.yml
index e2ff7b6f8a1..0a984a8312c 100644
--- a/snippets/nordic-log-stm/snippet.yml
+++ b/snippets/nordic-log-stm/snippet.yml
@@ -5,7 +5,6 @@ boards:
   /.*/nrf54h20/cpuapp/:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpuapp.overlay
-      EXTRA_CONF_FILE: boards/nrf54h20_cpuapp.conf
   /.*/nrf54h20/cpurad/:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpurad.overlay

From 2d2704ebac82fa3366e70c0b1d77d7c1e5dd9184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Mon, 7 Oct 2024 09:47:24 +0200
Subject: [PATCH 0089/2913] [nrf fromtree] drivers: misc: coresight: nrf_etr:
 Imply UART asynchronous API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Asynchronous API is recommended to be used by ETR buffer handler but
polling is also supported. Imply UART_ASYNC_API so that it is possible
to disable it in project config and fall back to polling if needed. For
example to reduce memory footprint.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 242331291d30d90e80947f0266cb123327b0a289)
(cherry picked from commit 187d590eb8c82e4459700186b7437965191af4af)
(cherry picked from commit 10165f930ef0975fe6376e0917e06edef6e4d2ea)
---
 drivers/misc/coresight/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/misc/coresight/Kconfig b/drivers/misc/coresight/Kconfig
index f32abe80dab..a31d6e3d3f6 100644
--- a/drivers/misc/coresight/Kconfig
+++ b/drivers/misc/coresight/Kconfig
@@ -7,6 +7,7 @@ config NRF_ETR
 	bool "Coresight ETR handler (with Nordic TBM)"
 	depends on $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_TBM))
 	select NRFX_TBM
+	imply UART_ASYNC_API
 	default y
 	help
 	  Module handles data stored in the ETR circular buffer (e.g. STM logging

From 864db58d79a506823fb32b46d75890b46a66173c Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Wed, 18 Sep 2024 12:33:10 +0200
Subject: [PATCH 0090/2913] [nrf fromtree] scripts: ci: check_compliance: add
 BOARD_REVISION in Kconfig.board.v2

This is required if boards make use of such definition in their Kconfig
files. In Kconfig.board.v2, only `boards/Kconfig.v2` is loaded, but
BOARD_REVISION is part of `boards/Kconfig`, which can't be loaded in this
context.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit c39ad845f372f67787b79164a30cabe0dd236773)
(cherry picked from commit b2edf96845b870c36489dcaa2754cc6826a6e7c0)
(cherry picked from commit e66a7ade5bf730f33d7ec00952b2ad3bd1e1fa76)
---
 scripts/ci/Kconfig.board.v2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/ci/Kconfig.board.v2 b/scripts/ci/Kconfig.board.v2
index e1335cafe39..3058e8e46bb 100644
--- a/scripts/ci/Kconfig.board.v2
+++ b/scripts/ci/Kconfig.board.v2
@@ -6,5 +6,8 @@
 
 mainmenu "Zephyr board / SoC v2 Configuration"
 
+config BOARD_REVISION
+	def_string "$(BOARD_REVISION)"
+
 source "boards/Kconfig.v2"
 source "soc/Kconfig.v2"

From 322be594e1faeb693c57191bd1a8f48866638d62 Mon Sep 17 00:00:00 2001
From: Andrzej Kuros <andrzej.kuros@nordicsemi.no>
Date: Thu, 26 Sep 2024 09:52:06 +0200
Subject: [PATCH 0091/2913] [nrf fromtree] manifest: update hal_nordic revision
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit updates revision of hal_nordic to bring the latest changes
in the nRF IEEE 802.15.4 driver.

Signed-off-by: Andrzej Kuroś <andrzej.kuros@nordicsemi.no>
(cherry picked from commit 54aca3ef58af4b4d640aa249c3260e0440d1362e)
(cherry picked from commit 51658a81e7af2c6439687850680a3720a1f0049b)
(cherry picked from commit e49fae3721a06ce64d482152a51c5e78ab50d713)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 07aedbea3a2..7bd0bf2d99f 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: af7b21c4f875bea26689307daa8e52e9a8e8323c
+      revision: 6d4acb8dbd9e92c7c5d6e18724197e3f007ae45e
       path: modules/hal/nordic
       groups:
         - hal

From 18fefddca0f9c4b98afd04cd62dde59c4962a87a Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Fri, 13 Sep 2024 14:41:32 +0200
Subject: [PATCH 0092/2913] [nrf fromtree] manifest: update hal_nordic revision
 to have nrfx 3.7.0

Bring latest release of nrfx: 3.7.0.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit de82f2f4cb85d543602a086e7ed6ce2f1bab8e34)
(cherry picked from commit c173cfdd5ae0b3815258ae5320e9af61767c5589)
(cherry picked from commit 787f73fa5afe1422822797d536a22e0bc6167db3)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 7bd0bf2d99f..b508fe6633f 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 6d4acb8dbd9e92c7c5d6e18724197e3f007ae45e
+      revision: ee6213b6cfcd7fdc10f7ec3a4f7f37f35dfa5343
       path: modules/hal/nordic
       groups:
         - hal

From 74f640464d08f7f25c762593803afc1075ea297d Mon Sep 17 00:00:00 2001
From: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
Date: Tue, 1 Oct 2024 16:45:54 +0530
Subject: [PATCH 0093/2913] [nrf fromtree] manifest: modules: hal: nordic: Pull
 in fix for country code

Pull in changes to pass country code as string to firmware.

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
(cherry picked from commit 0e2daaa9fa472471ac9efb3feb9b5ea78d855559)
(cherry picked from commit 4c475afcc9cdd4863791456cdde396040e5a6916)
(cherry picked from commit 8dd3184c19483e56319a944d73af3de14d2f90ad)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index b508fe6633f..35a33b0efc6 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: ee6213b6cfcd7fdc10f7ec3a4f7f37f35dfa5343
+      revision: bc25c094a8cf3064f4f9c1e8060b46e1989edf95
       path: modules/hal/nordic
       groups:
         - hal

From 8cb1d89449034dd15614eef6e7e4ed374f850f55 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Mon, 30 Sep 2024 16:47:00 +0200
Subject: [PATCH 0094/2913] [nrf fromtree] modules: hal_nordic: align PDM
 configuration

Introduce instance 0, PDM0, following nrfx 3.7.0 update.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 97dff5bccb3273ee30f457c3dc74836ec1920af1)
(cherry picked from commit 15c77ef342489d4b062d0ca022ba0c29e4111dc0)
(cherry picked from commit dc8697d2d297e954e43b856aa39baef6f5338000)
---
 drivers/audio/Kconfig.dmic_pdm_nrfx   | 2 +-
 modules/hal_nordic/nrfx/Kconfig       | 8 ++++++--
 modules/hal_nordic/nrfx/nrfx_config.h | 3 +++
 soc/nordic/common/Kconfig.peripherals | 4 ++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/drivers/audio/Kconfig.dmic_pdm_nrfx b/drivers/audio/Kconfig.dmic_pdm_nrfx
index 9f45144effa..dfbda8259f2 100644
--- a/drivers/audio/Kconfig.dmic_pdm_nrfx
+++ b/drivers/audio/Kconfig.dmic_pdm_nrfx
@@ -5,7 +5,7 @@ config AUDIO_DMIC_NRFX_PDM
 	bool "nRF PDM nrfx driver"
 	default y
 	depends on DT_HAS_NORDIC_NRF_PDM_ENABLED
-	select NRFX_PDM
+	select NRFX_PDM0 if HAS_HW_NRF_PDM0
 	select PINCTRL
 	help
 	  Enable support for nrfx PDM driver for nRF MCU series.
diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 3313e033c7c..65894d48712 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -162,8 +162,12 @@ config NRFX_NVMC
 		|| $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF91_FLASH_CONTROLLER))
 
 config NRFX_PDM
-	bool "PDM driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_PDM))
+	bool
+
+config NRFX_PDM0
+	bool "PDM0 driver instance"
+	depends on $(dt_nodelabel_has_compat,pdm0,$(DT_COMPAT_NORDIC_NRF_PDM))
+	select NRFX_PDM
 
 config NRFX_POWER
 	bool "POWER driver"
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index b0c27bb2fe8..9971f39b7af 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -212,6 +212,9 @@
 #ifdef CONFIG_NRFX_PDM
 #define NRFX_PDM_ENABLED 1
 #endif
+#ifdef CONFIG_NRFX_PDM0
+#define NRFX_PDM0_ENABLED 1
+#endif
 #ifdef CONFIG_NRFX_PDM_LOG
 #define NRFX_PDM_CONFIG_LOG_ENABLED 1
 #endif
diff --git a/soc/nordic/common/Kconfig.peripherals b/soc/nordic/common/Kconfig.peripherals
index 5b1afd66d3f..57c90b05ef7 100644
--- a/soc/nordic/common/Kconfig.peripherals
+++ b/soc/nordic/common/Kconfig.peripherals
@@ -126,8 +126,8 @@ config HAS_HW_NRF_NVMC_PE
 config HAS_HW_NRF_OSCILLATORS
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_OSCILLATORS))
 
-config HAS_HW_NRF_PDM
-	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_PDM))
+config HAS_HW_NRF_PDM0
+	def_bool $(dt_nodelabel_enabled_with_compat,pdm0,$(DT_COMPAT_NORDIC_NRF_PDM))
 
 config HAS_HW_NRF_POWER
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_POWER))

From 7fcf48eac7bdcaed8a79d7f46662af9d0f0b5651 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Mon, 30 Sep 2024 16:51:30 +0200
Subject: [PATCH 0095/2913] [nrf fromtree] modules: hal_nordic: add nrf54l
 system sources to bsim build

Include system_nrf54l.c file when building for bsim.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 9d82a0344447ec0d72944c796d47aa7528ed8e27)
(cherry picked from commit ba6d4cbf0359afbf36e98e8de3607e8b43dc0e04)
(cherry picked from commit eb4e1661b24418448404b990b139f3aba134aabc)
---
 modules/hal_nordic/nrfx/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 2e8e0cc1eb5..cc1731b1e50 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -95,7 +95,9 @@ zephyr_library_sources_ifdef(CONFIG_SOC_NRF52840       ${MDK_DIR}/system_nrf5284
 zephyr_library_sources_ifdef(CONFIG_SOC_NRF5340_CPUAPP ${MDK_DIR}/system_nrf5340_application.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_NRF5340_CPUNET ${MDK_DIR}/system_nrf5340_network.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF54HX ${MDK_DIR}/system_nrf54h.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF54LX ${MDK_DIR}/system_nrf54l.c)
+if(CONFIG_SOC_SERIES_NRF54LX OR CONFIG_SOC_SERIES_BSIM_NRF54LX)
+  zephyr_library_sources(${MDK_DIR}/system_nrf54l.c)
+endif()
 zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF91X  ${MDK_DIR}/system_nrf91.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF92X  ${MDK_DIR}/system_nrf92.c)
 

From 01dd1143596f023ee34ef6ba4afe4cfd45dc5f8f Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Mon, 30 Sep 2024 15:49:28 +0200
Subject: [PATCH 0096/2913] [nrf fromtree] bluetooth: controller: ll_sw:
 nordic: align to nrfx 3.7.0

Some enums have been renamed:

- NRF_CCM_EVENT_ENDCRYPT -> NRF_CCM_EVENT_END
- NRF_CCM_TASK_CRYPT -> NRF_CCM_TASK_START

Also adjust some TX power level settings (26/28dBm not always available
depending on the SoC revision).

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit b2031aa20d3814e43aa42c769c5536ee8487373d)
(cherry picked from commit d3d8c72bad648b99914d9f5111bac1e45b02cf3b)
(cherry picked from commit 9603ebdcd03b18bdfbabb8dbb308ed7653fc6f5c)
---
 .../controller/ll_sw/nordic/hal/nrf5/radio/radio.c        | 4 ++--
 .../ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h           | 8 ++++++++
 .../ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h         | 6 +++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
index 8ec0e62fa50..9d3a312f51f 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
@@ -2107,7 +2107,7 @@ static void *radio_ccm_ext_rx_pkt_set(struct ccm *cnf, uint8_t phy, uint8_t pdu_
 	NRF_CCM->SCRATCHPTR = (uint32_t)_ccm_scratch;
 	NRF_CCM->SHORTS = 0;
 	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ENDKSGEN);
-	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ENDCRYPT);
+	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_END);
 	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ERROR);
 
 	nrf_ccm_task_trigger(NRF_CCM, NRF_CCM_TASK_KSGEN);
@@ -2182,7 +2182,7 @@ static void *radio_ccm_ext_tx_pkt_set(struct ccm *cnf, uint8_t pdu_type, void *p
 	NRF_CCM->SCRATCHPTR = (uint32_t)_ccm_scratch;
 	NRF_CCM->SHORTS = CCM_SHORTS_ENDKSGEN_CRYPT_Msk;
 	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ENDKSGEN);
-	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ENDCRYPT);
+	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_END);
 	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ERROR);
 
 	nrf_ccm_task_trigger(NRF_CCM, NRF_CCM_TASK_KSGEN);
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h
index b0d3948aefb..bc0cc2993c5 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h
@@ -633,9 +633,17 @@ static inline uint32_t hal_radio_tx_power_value(int8_t tx_power_lvl)
 		return RADIO_TXPOWER_TXPOWER_Neg20dBm;
 	}
 
+#if defined(RADIO_TXPOWER_TXPOWER_Neg26dBm)
 	if (tx_power_lvl >= -26) {
 		return RADIO_TXPOWER_TXPOWER_Neg26dBm;
 	}
+#endif
+
+#if defined(RADIO_TXPOWER_TXPOWER_Neg28dBm)
+	if (tx_power_lvl >= -28) {
+		return RADIO_TXPOWER_TXPOWER_Neg28dBm;
+	}
+#endif
 
 	if (tx_power_lvl >= -40) {
 		return RADIO_TXPOWER_TXPOWER_Neg40dBm;
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
index 770cb70d8cc..1ddf9af1ccf 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
@@ -149,7 +149,7 @@ static inline void hal_trigger_crypt_ppi_config(void)
 {
 	nrf_radio_publish_set(NRF_RADIO,
 			      NRF_RADIO_EVENT_ADDRESS, HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
-	nrf_ccm_subscribe_set(NRF_CCM, NRF_CCM_TASK_CRYPT, HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
+	nrf_ccm_subscribe_set(NRF_CCM, NRF_CCM_TASK_START, HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
 }
 
 /*******************************************************************************
@@ -157,7 +157,7 @@ static inline void hal_trigger_crypt_ppi_config(void)
  */
 static inline void hal_trigger_crypt_ppi_disable(void)
 {
-	nrf_ccm_subscribe_clear(NRF_CCM, NRF_CCM_TASK_CRYPT);
+	nrf_ccm_subscribe_clear(NRF_CCM, NRF_CCM_TASK_START);
 }
 
 /*******************************************************************************
@@ -207,7 +207,7 @@ static inline void hal_trigger_crypt_by_bcmatch_ppi_config(void)
 	 */
 	nrf_radio_publish_set(NRF_RADIO,
 			      NRF_RADIO_EVENT_BCMATCH, HAL_TRIGGER_CRYPT_DELAY_PPI);
-	nrf_ccm_subscribe_set(NRF_CCM, NRF_CCM_TASK_CRYPT, HAL_TRIGGER_CRYPT_DELAY_PPI);
+	nrf_ccm_subscribe_set(NRF_CCM, NRF_CCM_TASK_START, HAL_TRIGGER_CRYPT_DELAY_PPI);
 }
 #endif /* CONFIG_BT_CTLR_DF_CONN_CTE_RX */
 #endif /* CONFIG_BT_CTLR_LE_ENC || CONFIG_BT_CTLR_BROADCAST_ISO_ENC */

From 6e6844185d4839904250bd7c59914ccfbc3586dc Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 26 Sep 2024 12:40:07 +0200
Subject: [PATCH 0097/2913] [nrf fromtree] drivers: timer: nrf_grtc_timer:
 Align Zephyr to new AUTOEN read manner

The new GRTC reading manner of the SYSCOUNTER uses hardware mechanism which
allows to keep it alive when any of CPUs is not sleeping. Otherwise
the SYSCOUNTER goes into sleep mode. Thus there is no
longer need to maintain the `CONFIG_NRF_GRTC_SLEEP_ALLOWED` symbol, however
if the user wants to have the SYSCOUNTER enabled all the time the
`CONFIG_NRF_GRTC_ALWAYS_ON` can be used instead.
The nrfx_grtc  driver no longer provides the `wakeup-read-sleep` reading
manner.
Also setting the GRTC clock source is performed by the nrfx_grtc driver so
it has been removed from the `sys_clock_driver_init()` function.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit bc7a5b6781a47da73b4f8f359e9cccd4a2412279)
(cherry picked from commit cc164946280d87cda4f0172f9467ece53ae37f47)
(cherry picked from commit dc75301f153a178430c987d0f3cd5cd8b5bcb9d7)
---
 drivers/timer/Kconfig.nrf_grtc                      |  9 ++++-----
 drivers/timer/nrf_grtc_timer.c                      | 13 +++++--------
 modules/hal_nordic/nrfx/nrfx_config.h               |  3 ---
 .../nrfx/nrfx_config_nrf54l15_enga_application.h    |  9 ---------
 .../nrfx/nrfx_config_nrf54l15_enga_flpr.h           |  9 ---------
 .../nrfx/nrfx_config_nrf9230_engb_application.h     |  9 ---------
 .../hal_nordic/nrfx/nrfx_config_nrf9230_engb_ppr.h  |  9 ---------
 .../nrfx/nrfx_config_nrf9230_engb_radiocore.h       |  9 ---------
 soc/nordic/nrf54l/Kconfig                           |  2 +-
 9 files changed, 10 insertions(+), 62 deletions(-)

diff --git a/drivers/timer/Kconfig.nrf_grtc b/drivers/timer/Kconfig.nrf_grtc
index b136f654252..082c15333dc 100644
--- a/drivers/timer/Kconfig.nrf_grtc
+++ b/drivers/timer/Kconfig.nrf_grtc
@@ -15,11 +15,10 @@ menuconfig NRF_GRTC_TIMER
 
 if NRF_GRTC_TIMER
 
-config NRF_GRTC_SLEEP_ALLOWED
-	def_bool y
-	depends on POWEROFF
+config NRF_GRTC_ALWAYS_ON
+	bool
 	help
-	  This feature allows GRTC SYSCOUNTER to go to sleep state.
+	  Always keep the SYSCOUNTER active even if the CPU is in sleep mode.
 
 config NRF_GRTC_TIMER_APP_DEFINED_INIT
 	bool "Application defines GRTC initialization"
@@ -44,7 +43,7 @@ config NRF_GRTC_TIMER_CLOCK_MANAGEMENT
 config NRF_GRTC_SYSCOUNTER_SLEEP_MINIMUM_LATENCY
 	int
 	default 1000
-	depends on NRF_GRTC_SLEEP_ALLOWED
+	depends on POWEROFF
 	help
 	  The value (in us) ensures that the wakeup event will not fire
 	  too early. In other words, applying SYSCOUNTER sleep state for less than
diff --git a/drivers/timer/nrf_grtc_timer.c b/drivers/timer/nrf_grtc_timer.c
index 187c7e12326..07d58e402c9 100644
--- a/drivers/timer/nrf_grtc_timer.c
+++ b/drivers/timer/nrf_grtc_timer.c
@@ -367,7 +367,7 @@ int z_nrf_grtc_timer_capture_read(int32_t chan, uint64_t *captured_time)
 	return 0;
 }
 
-#if defined(CONFIG_NRF_GRTC_SLEEP_ALLOWED) && defined(CONFIG_NRF_GRTC_START_SYSCOUNTER)
+#if defined(CONFIG_POWEROFF) && defined(CONFIG_NRF_GRTC_START_SYSCOUNTER)
 int z_nrf_grtc_wakeup_prepare(uint64_t wake_time_us)
 {
 	nrfx_err_t err_code;
@@ -432,7 +432,7 @@ int z_nrf_grtc_wakeup_prepare(uint64_t wake_time_us)
 	k_spin_unlock(&lock, key);
 	return 0;
 }
-#endif /* CONFIG_NRF_GRTC_SLEEP_ALLOWED */
+#endif /* CONFIG_POWEROFF */
 
 uint32_t sys_clock_cycle_get_32(void)
 {
@@ -465,12 +465,6 @@ static int sys_clock_driver_init(void)
 {
 	nrfx_err_t err_code;
 
-#if defined(CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT) &&                                             \
-	(defined(NRF_GRTC_HAS_CLKSEL) && (NRF_GRTC_HAS_CLKSEL == 1))
-	/* Use System LFCLK as the low-frequency clock source during initialization. */
-	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFCLK);
-#endif
-
 	IRQ_CONNECT(DT_IRQN(GRTC_NODE), DT_IRQ(GRTC_NODE, priority), nrfx_isr,
 		    nrfx_grtc_irq_handler, 0);
 
@@ -513,6 +507,9 @@ static int sys_clock_driver_init(void)
 	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFXO);
 #endif
 
+#if defined(CONFIG_NRF_GRTC_ALWAYS_ON)
+	nrfx_grtc_active_request_set(true);
+#endif
 	return 0;
 }
 
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index 9971f39b7af..609c066338e 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -132,9 +132,6 @@
 #ifdef CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT
 #define NRF_GRTC_HAS_EXTENDED 1
 #endif
-#ifdef CONFIG_NRF_GRTC_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 1
-#endif
 #ifdef CONFIG_NRF_GRTC_TIMER_AUTO_KEEP_ALIVE
 #define NRFX_GRTC_CONFIG_AUTOEN 1
 #endif
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_application.h
index eeea811aeff..aa23f93c9e3 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_application.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_application.h
@@ -283,15 +283,6 @@
 #define NRFX_GRTC_ENABLED 0
 #endif
 
-/**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
-#endif
-
 /**
  * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_flpr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_flpr.h
index 7f3c5a80c2c..568790051a3 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_flpr.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_flpr.h
@@ -283,15 +283,6 @@
 #define NRFX_GRTC_ENABLED 0
 #endif
 
-/**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
-#endif
-
 /**
  * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_application.h
index a7905c199d2..38ce6226468 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_application.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_application.h
@@ -367,15 +367,6 @@
 #define NRFX_GRTC_ENABLED 0
 #endif
 
-/**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
-#endif
-
 /**
  * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_ppr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_ppr.h
index ae1f931e3da..9ae53d739e9 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_ppr.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_ppr.h
@@ -322,15 +322,6 @@
 #define NRFX_GRTC_ENABLED 0
 #endif
 
-/**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
-#endif
-
 /**
  * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_radiocore.h b/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_radiocore.h
index 84a0a7558e6..98d71e6b385 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_radiocore.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_radiocore.h
@@ -407,15 +407,6 @@
 #define NRFX_GRTC_ENABLED 0
 #endif
 
-/**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
-#endif
-
 /**
  * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index df17dc35d3e..eeb12fbfab0 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -86,7 +86,7 @@ if NRF_GRTC_TIMER
 
 config ELV_GRTC_LFXO_ALLOWED
 	bool
-	depends on NRF_GRTC_SLEEP_ALLOWED
+	depends on POWEROFF
 	select EXPERIMENTAL
 	help
 	  This feature allows using ELV mode when GRTC operates with the LFXO as

From d750d7e3e357c72d0376e4bfbbdaae8c36d1748b Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Wed, 18 Sep 2024 10:17:33 +0200
Subject: [PATCH 0098/2913] [nrf fromtree] soc: nordic: nrf54h20: add support
 for nRF54H20 EngB

nRF54H20 EngB is a re-label to the existing hardware revision for the
nRF54H20. nRF54H20 (whithout EngX) is becoming the final revision of the
SoC.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit a9d0eacae288393e3686b7c7d6af7a65253e0c9f)
(cherry picked from commit c32dc8cf8fbd3ae7ca2046e065f74cc1db99cff1)
(cherry picked from commit d924ac49f31482ad79855ed46527aea0f30c3d05)
---
 soc/nordic/nrf54h/Kconfig                     | 24 ++++++++++++--
 .../nrf54h/Kconfig.defconfig.nrf54h20_cpuapp  |  4 +--
 .../nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr |  4 +--
 .../nrf54h/Kconfig.defconfig.nrf54h20_cpuppr  |  4 +--
 .../nrf54h/Kconfig.defconfig.nrf54h20_cpurad  |  4 +--
 soc/nordic/nrf54h/Kconfig.soc                 | 32 ++++++++++++++++++-
 soc/nordic/nrf54h/soc.h                       |  4 +--
 7 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
index dd647174b14..51dc4e07480 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -9,7 +9,8 @@ config SOC_SERIES_NRF54HX
 	select HAS_NORDIC_DRIVERS
 	select NRF_PLATFORM_HALTIUM
 
-config SOC_NRF54H20_CPUAPP
+config SOC_NRF54H20_CPUAPP_COMMON
+	bool
 	select ARM
 	select ARMV8_M_DSP
 	select CPU_CORTEX_M33
@@ -29,7 +30,14 @@ config SOC_NRF54H20_CPUAPP
 	select HAS_PM
 	select HAS_POWEROFF
 
-config SOC_NRF54H20_CPURAD
+config SOC_NRF54H20_CPUAPP
+	select SOC_NRF54H20_CPUAPP_COMMON
+
+config SOC_NRF54H20_ENGB_CPUAPP
+	select SOC_NRF54H20_CPUAPP_COMMON
+
+config SOC_NRF54H20_CPURAD_COMMON
+	bool
 	select ARM
 	select ARMV8_M_DSP
 	select CPU_CORTEX_M33
@@ -48,8 +56,20 @@ config SOC_NRF54H20_CPURAD
 	select HAS_PM
 	select HAS_POWEROFF
 
+config SOC_NRF54H20_CPURAD
+	select SOC_NRF54H20_CPURAD_COMMON
+
+config SOC_NRF54H20_ENGB_CPURAD
+	select SOC_NRF54H20_CPURAD_COMMON
+
 config SOC_NRF54H20_CPUPPR
 	depends on RISCV_CORE_NORDIC_VPR
 
+config SOC_NRF54H20_ENGB_CPUPPR
+	depends on RISCV_CORE_NORDIC_VPR
+
 config SOC_NRF54H20_CPUFLPR
 	depends on RISCV_CORE_NORDIC_VPR
+
+config SOC_NRF54H20_ENGB_CPUFLPR
+	depends on RISCV_CORE_NORDIC_VPR
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
index 1a53fb5ff32..2a04f58f672 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
@@ -3,7 +3,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NRF54H20_CPUAPP
+if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
 
 config NUM_IRQS
 	default 471
@@ -11,4 +11,4 @@ config NUM_IRQS
 config NRF_REGTOOL_GENERATE_UICR
 	default y
 
-endif # SOC_NRF54H20_CPUAPP
+endif # SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
index 2b792e9f1b9..97b1e89a9c1 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NRF54H20_CPUFLPR
+if SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR
 
 config NUM_IRQS
 	default 496
@@ -10,4 +10,4 @@ config NUM_IRQS
 config ASSERT
 	default n
 
-endif # SOC_NRF54H20_CPUFLPR
+endif # SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
index bf7c12a3a69..02649146ad7 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NRF54H20_CPUPPR
+if SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR
 
 config NUM_IRQS
 	default 496
@@ -13,4 +13,4 @@ config SYS_CLOCK_TICKS_PER_SEC
 config ASSERT
 	default n
 
-endif # SOC_NRF54H20_CPUPPR
+endif # SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad
index 4437e7aadc4..9ad0b30e1c8 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad
@@ -3,7 +3,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NRF54H20_CPURAD
+if SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
 
 config NUM_IRQS
 	default 471
@@ -11,4 +11,4 @@ config NUM_IRQS
 config NRF_REGTOOL_GENERATE_UICR
 	default y
 
-endif # SOC_NRF54H20_CPURAD
+endif # SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
diff --git a/soc/nordic/nrf54h/Kconfig.soc b/soc/nordic/nrf54h/Kconfig.soc
index 459854e13b2..852e92bb138 100644
--- a/soc/nordic/nrf54h/Kconfig.soc
+++ b/soc/nordic/nrf54h/Kconfig.soc
@@ -9,29 +9,59 @@ config SOC_NRF54H20
 	help
 	  nRF54H20
 
+config SOC_NRF54H20_ENGB
+	bool
+	select SOC_SERIES_NRF54HX
+	help
+	  nRF54H20 (EngB)
+
 config SOC_NRF54H20_CPUAPP
 	bool
 	select SOC_NRF54H20
 	help
 	  nRF54H20 CPUAPP
 
+config SOC_NRF54H20_ENGB_CPUAPP
+	bool
+	select SOC_NRF54H20_ENGB
+	help
+	  nRF54H20 (EngB) CPUAPP
+
 config SOC_NRF54H20_CPURAD
 	bool
 	select SOC_NRF54H20
 	help
 	  nRF54H20 CPURAD
 
+config SOC_NRF54H20_ENGB_CPURAD
+	bool
+	select SOC_NRF54H20_ENGB
+	help
+	  nRF54H20 (EngB) CPURAD
+
 config SOC_NRF54H20_CPUPPR
 	bool
 	select SOC_NRF54H20
 	help
 	  nRF54H20 CPUPPR
 
+config SOC_NRF54H20_ENGB_CPUPPR
+	bool
+	select SOC_NRF54H20_ENGB
+	help
+	  nRF54H20 (EngB) CPUPPR
+
 config SOC_NRF54H20_CPUFLPR
 	bool
 	select SOC_NRF54H20
 	help
 	  nRF54H20 CPUFLPR
 
+config SOC_NRF54H20_ENGB_CPUFLPR
+	bool
+	select SOC_NRF54H20_ENGB
+	help
+	  nRF54H20 (EngB) CPUFLPR
+
 config SOC
-	default "nrf54h20" if SOC_NRF54H20
+	default "nrf54h20" if SOC_NRF54H20 || SOC_NRF54H20_ENGB
diff --git a/soc/nordic/nrf54h/soc.h b/soc/nordic/nrf54h/soc.h
index 566c07a8c2c..db79e2c8c72 100644
--- a/soc/nordic/nrf54h/soc.h
+++ b/soc/nordic/nrf54h/soc.h
@@ -9,7 +9,7 @@
 
 #include <soc_nrf_common.h>
 
-#if defined(CONFIG_SOC_NRF54H20_CPUAPP)
+#if defined(CONFIG_SOC_NRF54H20_CPUAPP) || defined(CONFIG_SOC_NRF54H20_ENGB_CPUAPP)
 #define RAMBLOCK_CONTROL_BIT_ICACHE MEMCONF_POWER_CONTROL_MEM1_Pos
 #define RAMBLOCK_CONTROL_BIT_DCACHE MEMCONF_POWER_CONTROL_MEM2_Pos
 #define RAMBLOCK_POWER_ID           0
@@ -17,7 +17,7 @@
 #define RAMBLOCK_RET_MASK           (MEMCONF_POWER_RET_MEM0_Msk)
 #define RAMBLOCK_RET_BIT_ICACHE     MEMCONF_POWER_RET_MEM1_Pos
 #define RAMBLOCK_RET_BIT_DCACHE     MEMCONF_POWER_RET_MEM2_Pos
-#elif defined(CONFIG_SOC_NRF54H20_CPURAD)
+#elif defined(CONFIG_SOC_NRF54H20_CPURAD) || defined(CONFIG_SOC_NRF54H20_ENGB_CPURAD)
 #define RAMBLOCK_CONTROL_BIT_ICACHE MEMCONF_POWER_CONTROL_MEM6_Pos
 #define RAMBLOCK_CONTROL_BIT_DCACHE MEMCONF_POWER_CONTROL_MEM7_Pos
 #define RAMBLOCK_POWER_ID           0

From 3e3f3a6b92ba40d31933f5352a4357e879bbea01 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Wed, 18 Sep 2024 10:19:16 +0200
Subject: [PATCH 0099/2913] [nrf fromtree] modules: hal_nordic: add support for
 nRF54H20 EngB

Add support for nRF54H20 EngB in the Nordic HAL glue code.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 40f5ca03b594243110eb3a1243299bdb18028b1c)
(cherry picked from commit 046b70bd3318c3c756172f5322a96ea123944ea9)
(cherry picked from commit 999e1a1de47d1a15091fd189f5aef8418c84767a)
---
 modules/hal_nordic/nrfx/CMakeLists.txt        | 12 ++++++++
 modules/hal_nordic/nrfx/nrfx_config.h         |  8 +++---
 .../nrfx/nrfx_config_nrf54h20_application.h   | 19 +++++++------
 .../nrfx/nrfx_config_nrf54h20_flpr.h          | 27 ++++++++++++------
 .../nrfx/nrfx_config_nrf54h20_ppr.h           | 28 +++++++++++++------
 .../nrfx/nrfx_config_nrf54h20_radiocore.h     | 18 ++++++------
 6 files changed, 72 insertions(+), 40 deletions(-)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index cc1731b1e50..8d7adc114d7 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -44,6 +44,14 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUPPR     NRF54H20_XXAA
                                                                 NRF_PPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR    NRF54H20_XXAA
                                                                 NRF_FLPR)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP NRF54H20_ENGB_XXAA
+                                                                 NRF_APPLICATION)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD NRF54H20_ENGB_XXAA
+                                                                 NRF_RADIOCORE)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR NRF54H20_ENGB_XXAA
+                                                                 NRF_PPR)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR NRF54H20_ENGB_XXAA
+                                                                  NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA       NRF54L15_ENGA_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUAPP NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR NRF_FLPR)
@@ -221,6 +229,10 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUAPP      nrf54h20_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUPPR      nrf54h20_ppr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR     nrf54h20_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPURAD      nrf54h20_radiocore.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP  nrf54h20_engb_application.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR  nrf54h20_engb_ppr.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR nrf54h20_engb_flpr.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD  nrf54h20_engb_radiocore.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUAPP nrf54l15_enga_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR nrf54l15_enga_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP      nrf54l15_application.svd)
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index 609c066338e..a7632a8cc43 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -1042,13 +1042,13 @@
     #include <nrfx_config_nrf5340_application.h>
 #elif defined(NRF5340_XXAA_NETWORK)
     #include <nrfx_config_nrf5340_network.h>
-#elif defined(NRF54H20_XXAA) && defined(NRF_APPLICATION)
+#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_APPLICATION)
     #include <nrfx_config_nrf54h20_application.h>
-#elif defined(NRF54H20_XXAA) && defined(NRF_RADIOCORE)
+#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_RADIOCORE)
     #include <nrfx_config_nrf54h20_radiocore.h>
-#elif defined(NRF54H20_XXAA) && defined(NRF_PPR)
+#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_PPR)
     #include <nrfx_config_nrf54h20_ppr.h>
-#elif defined(NRF54H20_XXAA) && defined(NRF_FLPR)
+#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_FLPR)
     #include <nrfx_config_nrf54h20_flpr.h>
 #elif (defined(NRF54L15_XXAA) || defined(NRF54L15_ENGA_XXAA)) && defined(NRF_APPLICATION)
     #include <nrfx_config_nrf54l15_enga_application.h>
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_application.h
index 7f5d4d30ce9..3caed86c48b 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_application.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_application.h
@@ -11,6 +11,7 @@
 #error "This file should not be included directly. Include nrfx_config.h instead."
 #endif
 
+
 /**
  * @brief NRFX_DEFAULT_IRQ_PRIORITY
  *
@@ -358,30 +359,30 @@
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 1
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 0
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
+#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
 #endif
 
 /**
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_flpr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_flpr.h
index 77f5c3c9fc5..f5689f79a96 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_flpr.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_flpr.h
@@ -254,30 +254,30 @@
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 1
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 0
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
+#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
 #endif
 
 /**
@@ -1619,6 +1619,15 @@
 #define NRFX_UARTE_CONFIG_RX_CACHE_ENABLED 1
 #endif
 
+/**
+ * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
+ *
+ * Integer value. Minimum: 0. Maximum: 255.
+ */
+#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
+#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
+#endif
+
 /**
  * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
  *
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_ppr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_ppr.h
index d274abb5b88..35716978f28 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_ppr.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_ppr.h
@@ -11,6 +11,7 @@
 #error "This file should not be included directly. Include nrfx_config.h instead."
 #endif
 
+
 /**
  * @brief NRFX_DEFAULT_IRQ_PRIORITY
  *
@@ -62,6 +63,15 @@
 #define NRFX_COMP_CONFIG_LOG_LEVEL 3
 #endif
 
+/**
+ * @brief NRFX_COREDEP_VPR_LEGACY
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COREDEP_VPR_LEGACY
+#define NRFX_COREDEP_VPR_LEGACY 0
+#endif
+
 /**
  * @brief NRFX_DPPI_ENABLED
  *
@@ -304,30 +314,30 @@
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 1
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 0
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
+#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
 #endif
 
 /**
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_radiocore.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_radiocore.h
index 3a6cde96126..5847cace47e 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_radiocore.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_radiocore.h
@@ -395,30 +395,30 @@
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 1
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 0
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
+#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
 #endif
 
 /**

From 9892f3b7a5470209fed995c21bf5558ade1e8174 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Wed, 18 Sep 2024 15:54:21 +0200
Subject: [PATCH 0100/2913] [nrf fromtree] modules: hal_nordic: nrfs: add
 support for nRF54H20 EngB

Make nrfs compatible with the EngB soc revision.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 72ab376c24ff0e83665d2779ed95637127581a66)
(cherry picked from commit b44193c28da48f174235b016719ed5eb7986cc3d)
(cherry picked from commit 8cb97c00fdcaa90c8d77950ddce5f6b60b97e105)
---
 modules/hal_nordic/nrfs/Kconfig | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig
index b027febd2a5..96d4c7f45cd 100644
--- a/modules/hal_nordic/nrfs/Kconfig
+++ b/modules/hal_nordic/nrfs/Kconfig
@@ -36,7 +36,12 @@ config NRFS_HAS_VBUS_DETECTOR_SERVICE
 
 config NRFS
 	bool "nRF Services Support"
-	select NRFS_LOCAL_DOMAIN if (SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD || SOC_NRF9280_CPUAPP || SOC_NRF9280_CPURAD)
+	select NRFS_LOCAL_DOMAIN if SOC_NRF54H20_CPUAPP || \
+				    SOC_NRF54H20_ENGB_CPUAPP || \
+				    SOC_NRF54H20_CPURAD || \
+				    SOC_NRF54H20_ENGB_CPURAD || \
+				    SOC_NRF9280_CPUAPP || \
+				    SOC_NRF9280_CPURAD
 	depends on HAS_NRFS
 	help
 	  This option enables the nRF Services library.

From dd771a886d0b2161ae69359cc3eb19f49813faa7 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Tue, 1 Oct 2024 08:58:20 +0200
Subject: [PATCH 0101/2913] [nrf fromtree] drivers: adc: nrfx_saadc: use
 CONFIG_NRF_PLATFORM_HALTIUM

So that any Haltium based SoC uses the same settings, including nRF54H20
EngB.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 5a4655f69fb2c006a4ee0ddcfe4372066b0cb138)
(cherry picked from commit c0417a510eb33b6180a2ff5ac27b87caab887cf1)
(cherry picked from commit b0d6c8f10107a915f6d5d4e77e3da5137b4af1a2)
---
 drivers/adc/adc_nrfx_saadc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index 052eab45b6c..132e8e78c3e 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(adc_nrfx_saadc);
 
 #if (NRF_SAADC_HAS_AIN_AS_PIN)
 
-#if defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280)
+#if defined(CONFIG_NRF_PLATFORM_HALTIUM)
 static const uint8_t saadc_psels[NRF_SAADC_AIN7 + 1] = {
 	[NRF_SAADC_AIN0] = NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
 	[NRF_SAADC_AIN1] = NRF_PIN_PORT_TO_PIN_NUMBER(1U, 1),

From 6d24ecb6dffd9074bb369d863e26e6184bf583a1 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Wed, 18 Sep 2024 15:54:55 +0200
Subject: [PATCH 0102/2913] [nrf fromtree] scripts: west_commands: runners:
 nrf: add support for nRF54H20 EngB

Make sure cpuapp/cpurad cores are detected correctly when using nRF54H20
EngB.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 091e38b3f29015cd5a489c348c61c1b3ab92347c)
(cherry picked from commit 75fc593f511ac1566a3af5f755118cab8570f027)
(cherry picked from commit f1a488d9953cffa33e4c555b99f44c048c52a31b)
---
 scripts/west_commands/runners/nrf_common.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index 35f1f53b07f..6423253233c 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -259,8 +259,16 @@ def program_hex(self):
         if self.family in ('NRF54H_FAMILY', 'NRF92_FAMILY'):
             erase_arg = 'ERASE_NONE'
 
-            cpuapp = self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPUAPP') or self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPUAPP')
-            cpurad = self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPURAD') or self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPURAD')
+            cpuapp = (
+                self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPUAPP') or
+                self.build_conf.getboolean('CONFIG_SOC_NRF54H20_ENGB_CPUAPP') or
+                self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPUAPP')
+            )
+            cpurad = (
+                self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPURAD') or
+                self.build_conf.getboolean('CONFIG_SOC_NRF54H20_ENGB_CPURAD') or
+                self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPURAD')
+            )
 
             if self.erase:
                 self.exec_op('erase', core='NRFDL_DEVICE_CORE_APPLICATION')

From 4d4f72121b5e22338d5dd44d5820635c9063fb40 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Wed, 18 Sep 2024 11:06:50 +0200
Subject: [PATCH 0103/2913] [nrf fromtree] boards: nrf54h20dk: introduce
 revision 0.8.0 (current)

The current DK is labeled as revision 0.8.0. Until now, no revisions were
needed, but a new hardware spin is coming, so we'll need to keep at least
two revisions in the near future until the final one becomes the default.
Prepare the board for that scenario. Note that the "old" nRF54H20 SoC is
now nRF54H20 EngB.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 47212de9de8ebdf27ac8a4cb1ab10fd8779a8834)
(cherry picked from commit 15f4e97f1876bcabee23982df4e93295d6360bfc)
(cherry picked from commit fde07b74fc6f395baf369a91149bbcc543f32089)
---
 boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk          | 12 ++++++------
 boards/nordic/nrf54h20dk/board.yml                   |  5 +++++
 ...pp.yaml => nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml} |  4 ++--
 ...r.yaml => nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml} |  4 ++--
 ...ml => nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml} |  4 ++--
 ...pr.yaml => nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml} |  4 ++--
 ...aml => nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml} |  4 ++--
 ...ad.yaml => nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml} |  4 ++--
 8 files changed, 23 insertions(+), 18 deletions(-)
 rename boards/nordic/nrf54h20dk/{nrf54h20dk_nrf54h20_cpuapp.yaml => nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml} (73%)
 rename boards/nordic/nrf54h20dk/{nrf54h20dk_nrf54h20_cpuflpr.yaml => nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml} (69%)
 rename boards/nordic/nrf54h20dk/{nrf54h20dk_nrf54h20_cpuflpr_xip.yaml => nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml} (62%)
 rename boards/nordic/nrf54h20dk/{nrf54h20dk_nrf54h20_cpuppr.yaml => nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml} (70%)
 rename boards/nordic/nrf54h20dk/{nrf54h20dk_nrf54h20_cpuppr_xip.yaml => nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml} (62%)
 rename boards/nordic/nrf54h20dk/{nrf54h20dk_nrf54h20_cpurad.yaml => nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml} (71%)

diff --git a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
index 9a260be4868..aa8c8edbe2d 100644
--- a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
+++ b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF54H20DK
-	select SOC_NRF54H20_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP
-	select SOC_NRF54H20_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD
-	select SOC_NRF54H20_CPUPPR if BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
-				      BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP
-	select SOC_NRF54H20_CPUFLPR if BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
-				       BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP
+	select SOC_NRF54H20_ENGB_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP && BOARD_REVISION = "0.8.0"
+	select SOC_NRF54H20_ENGB_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD && BOARD_REVISION = "0.8.0"
+	select SOC_NRF54H20_ENGB_CPUPPR if (BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
+				       BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP) && BOARD_REVISION = "0.8.0"
+	select SOC_NRF54H20_ENGB_CPUFLPR if (BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
+				        BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP) && BOARD_REVISION = "0.8.0"
diff --git a/boards/nordic/nrf54h20dk/board.yml b/boards/nordic/nrf54h20dk/board.yml
index 61690145d9f..29f1d78c436 100644
--- a/boards/nordic/nrf54h20dk/board.yml
+++ b/boards/nordic/nrf54h20dk/board.yml
@@ -8,3 +8,8 @@ board:
       cpucluster: cpuppr
     - name: xip
       cpucluster: cpuflpr
+  revision:
+    format: major.minor.patch
+    default: "0.8.0"
+    revisions:
+    - name: "0.8.0"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml
similarity index 73%
rename from boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.yaml
rename to boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml
index 1fb5a039875..01c44b51577 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.yaml
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml
@@ -1,8 +1,8 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-identifier: nrf54h20dk/nrf54h20/cpuapp
-name: nRF54H20-DK-nRF54H20-Application
+identifier: nrf54h20dk@0.8.0/nrf54h20/cpuapp
+name: nRF54H20-DK-nRF54H20-Application (revision 0.8.0)
 type: mcu
 arch: arm
 toolchain:
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml
similarity index 69%
rename from boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr.yaml
rename to boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml
index ba7d9a93382..bd60b8d2af3 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr.yaml
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml
@@ -1,8 +1,8 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-identifier: nrf54h20dk/nrf54h20/cpuflpr
-name: nRF54H20-DK-nRF54H20-FLPR
+identifier: nrf54h20dk@0.8.0/nrf54h20/cpuflpr
+name: nRF54H20-DK-nRF54H20-FLPR (revision 0.8.0)
 type: mcu
 arch: riscv
 toolchain:
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml
similarity index 62%
rename from boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip.yaml
rename to boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml
index 63c771688b4..7deaf20135f 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip.yaml
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml
@@ -1,8 +1,8 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-identifier: nrf54h20dk/nrf54h20/cpuflpr/xip
-name: nRF54H20-DK-nRF54H20-FLPR (MRAM XIP)
+identifier: nrf54h20dk@0.8.0/nrf54h20/cpuflpr/xip
+name: nRF54H20-DK-nRF54H20-FLPR (MRAM XIP) (revision 0.8.0)
 type: mcu
 arch: riscv
 toolchain:
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml
similarity index 70%
rename from boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr.yaml
rename to boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml
index db1bf4fbefe..26412657070 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr.yaml
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml
@@ -1,8 +1,8 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-identifier: nrf54h20dk/nrf54h20/cpuppr
-name: nRF54H20-DK-nRF54H20-PPR
+identifier: nrf54h20dk@0.8.0/nrf54h20/cpuppr
+name: nRF54H20-DK-nRF54H20-PPR (revision 0.8.0)
 type: mcu
 arch: riscv
 toolchain:
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml
similarity index 62%
rename from boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip.yaml
rename to boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml
index 8cfc343647f..0ce1718cb60 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip.yaml
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml
@@ -1,8 +1,8 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-identifier: nrf54h20dk/nrf54h20/cpuppr/xip
-name: nRF54H20-DK-nRF54H20-PPR (MRAM XIP)
+identifier: nrf54h20dk@0.8.0/nrf54h20/cpuppr/xip
+name: nRF54H20-DK-nRF54H20-PPR (MRAM XIP) (revision 0.8.0)
 type: mcu
 arch: riscv
 toolchain:
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml
similarity index 71%
rename from boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.yaml
rename to boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml
index 36c0fc01dce..26df539a803 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.yaml
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml
@@ -1,8 +1,8 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-identifier: nrf54h20dk/nrf54h20/cpurad
-name: nRF54H20-DK-nRF54H20-Radio
+identifier: nrf54h20dk@0.8.0/nrf54h20/cpurad
+name: nRF54H20-DK-nRF54H20-Radio (revision 0.8.0)
 type: mcu
 arch: arm
 toolchain:

From ed2899ae54e8f3b97cd5386e77256a97c589729c Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Wed, 18 Sep 2024 11:14:57 +0200
Subject: [PATCH 0104/2913] [nrf fromtree] boards: nrf54h20dk: add board
 revision 0.9.0

Add a new revision for nRF54H20 DK: 0.9.0. This new hardware spin contains
the final nRF54H20 SoC. Treat it as the default, including twister.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit df9a84ea31773bbaf96278307d5ed222479b0c83)
(cherry picked from commit 1eee8717812f037845bfd0f4fc4256a54ab092f7)
(cherry picked from commit dc6c3ac5b20edbc5bb4d5d760b583aefe4f60f41)
---
 boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk   |  6 +++++
 boards/nordic/nrf54h20dk/board.yml            |  3 ++-
 .../nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml     | 24 +++++++++++++++++++
 .../nrf54h20dk_nrf54h20_cpuflpr_0_9_0.yaml    | 18 ++++++++++++++
 ...nrf54h20dk_nrf54h20_cpuflpr_xip_0_9_0.yaml | 14 +++++++++++
 .../nrf54h20dk_nrf54h20_cpuppr_0_9_0.yaml     | 18 ++++++++++++++
 .../nrf54h20dk_nrf54h20_cpuppr_xip_0_9_0.yaml | 14 +++++++++++
 .../nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml     | 19 +++++++++++++++
 8 files changed, 115 insertions(+), 1 deletion(-)
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_9_0.yaml
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_9_0.yaml
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_9_0.yaml
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_9_0.yaml
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml

diff --git a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
index aa8c8edbe2d..af29072fbd5 100644
--- a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
+++ b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
@@ -8,3 +8,9 @@ config BOARD_NRF54H20DK
 				       BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP) && BOARD_REVISION = "0.8.0"
 	select SOC_NRF54H20_ENGB_CPUFLPR if (BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
 				        BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP) && BOARD_REVISION = "0.8.0"
+	select SOC_NRF54H20_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP && BOARD_REVISION = "0.9.0"
+	select SOC_NRF54H20_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD && BOARD_REVISION = "0.9.0"
+	select SOC_NRF54H20_CPUPPR if (BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
+				       BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP) && BOARD_REVISION = "0.9.0"
+	select SOC_NRF54H20_CPUFLPR if (BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
+				        BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP) && BOARD_REVISION = "0.9.0"
diff --git a/boards/nordic/nrf54h20dk/board.yml b/boards/nordic/nrf54h20dk/board.yml
index 29f1d78c436..7d57b61cd53 100644
--- a/boards/nordic/nrf54h20dk/board.yml
+++ b/boards/nordic/nrf54h20dk/board.yml
@@ -10,6 +10,7 @@ board:
       cpucluster: cpuflpr
   revision:
     format: major.minor.patch
-    default: "0.8.0"
+    default: "0.9.0"
     revisions:
     - name: "0.8.0"
+    - name: "0.9.0"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
new file mode 100644
index 00000000000..89b85746540
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
@@ -0,0 +1,24 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54h20dk/nrf54h20/cpuapp
+name: nRF54H20-DK-nRF54H20-Application (revision 0.9.0)
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+sysbuild: true
+ram: 256
+flash: 296
+supported:
+  - adc
+  - can
+  - counter
+  - gpio
+  - i2c
+  - pwm
+  - spi
+  - watchdog
+  - usbd
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_9_0.yaml
new file mode 100644
index 00000000000..ff9513fd593
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_9_0.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54h20dk/nrf54h20/cpuflpr
+name: nRF54H20-DK-nRF54H20-FLPR (revision 0.9.0)
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 46
+flash: 46
+supported:
+  - counter
+  - gpio
+  - i2c
+  - pwm
+  - spi
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_9_0.yaml
new file mode 100644
index 00000000000..e2880af9be3
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_9_0.yaml
@@ -0,0 +1,14 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54h20dk/nrf54h20/cpuflpr/xip
+name: nRF54H20-DK-nRF54H20-FLPR (MRAM XIP) (revision 0.9.0)
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 46
+flash: 48
+supported:
+  - gpio
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_9_0.yaml
new file mode 100644
index 00000000000..60f22350504
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_9_0.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54h20dk/nrf54h20/cpuppr
+name: nRF54H20-DK-nRF54H20-PPR (revision 0.9.0)
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 62
+flash: 62
+supported:
+  - counter
+  - gpio
+  - i2c
+  - pwm
+  - spi
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_9_0.yaml
new file mode 100644
index 00000000000..7198a379a9c
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_9_0.yaml
@@ -0,0 +1,14 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54h20dk/nrf54h20/cpuppr/xip
+name: nRF54H20-DK-nRF54H20-PPR (MRAM XIP) (revision 0.9.0)
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 62
+flash: 64
+supported:
+  - gpio
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml
new file mode 100644
index 00000000000..818a8d74b79
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml
@@ -0,0 +1,19 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54h20dk/nrf54h20/cpurad
+name: nRF54H20-DK-nRF54H20-Radio (revision 0.9.0)
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+sysbuild: true
+ram: 192
+flash: 256
+supported:
+  - counter
+  - gpio
+  - pwm
+  - spi

From c3e879549d27c91dff147cf2367266da08a5ddfe Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Tue, 1 Oct 2024 09:00:37 +0200
Subject: [PATCH 0105/2913] [nrf fromtree] tests: lib: cpp: cxx: ignore
 nRF54H20 DK 0.8.0

nRF54H HAL is not compatible with C++98, add new board revisions to the
list so that they are skipped.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit d3ca4fd84fe25e243a9be92362e4103c8674f5e4)
(cherry picked from commit 0408db66f40c90d7d6995a4f4661ca2379f61933)
(cherry picked from commit 10bb5bff42e6aa0d0f472946db366afe9b469c99)
---
 tests/lib/cpp/cxx/testcase.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/lib/cpp/cxx/testcase.yaml b/tests/lib/cpp/cxx/testcase.yaml
index 5601886b150..642a2ed984d 100644
--- a/tests/lib/cpp/cxx/testcase.yaml
+++ b/tests/lib/cpp/cxx/testcase.yaml
@@ -42,6 +42,8 @@ tests:
       - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
+      - nrf54h20dk@0.8.0/nrf54h20/cpuapp
+      - nrf54h20dk@0.8.0/nrf54h20/cpurad
       - nrf9280pdk/nrf9280/cpuapp
       - nrf9280pdk/nrf9280/cpurad
     filter: not CONFIG_HAS_RENESAS_RA_FSP

From 6a817e873b4473c91a794f33d41e5a21b454a043 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Fri, 13 Sep 2024 14:50:12 +0200
Subject: [PATCH 0106/2913] [nrf fromtree] manifest: Update nRF hw models to
 latest

Update the HW models module to:
85944c64f224406e4d781aa382c5f1f71ed307fd

Including the following:
* 5340: Allocate a buffer for the APP core RAM (2nd version)
* 82ca90c Add NCS test-spec.yml to trigger downstream CI job
* a05d7a6 docs: top README: Mention nrf54l15 support and minor fixes
* cd64524 54 ECB/CCM tests: Remove comment which does not apply

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 942fa67a45bccd1abdfb5317a88b661d325c2d45)
(cherry picked from commit 01bc0acaae3fe0941be7ba64449e523f5009ff64)
(cherry picked from commit cd49c8d3c3bfabd6daf1797d2a5d84b10a1679e8)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 35a33b0efc6..a51048b6857 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: d2a119a9c7600ce06033a794de042e0ad9a38702
+      revision: 85944c64f224406e4d781aa382c5f1f71ed307fd
       path: modules/bsim_hw_models/nrf_hw_models
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719

From adeae59ecca964035196a3890e90f7b4451375b2 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Wed, 11 Sep 2024 14:58:34 +0200
Subject: [PATCH 0107/2913] [nrf fromtree] subsys/ipc icmsg_me.c: Fix ssize_t
 build error for some libCs

ssize_t is not part of the C library ISO standard subset, and as such
one cannot expect a C library to expose the type by default.
Some libraries like glibc do not expose this type in general, and
trying to build using them results in build errors.

There is 3 possible options:
1. Continue using ssize_t and:
1.a define _POSIX_C_SOURCE before including any header
1.b include sys/types.h directly (A bit uglier)
3. Not use ssize_t, and instead rely on ISO standard types

Let's just go with 1.a assuming we want to keep using this type,
as that is the correct way of getting this type defined.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit b6f1767db507a7f8e6aaf46e58d155e8e7b95236)
(cherry picked from commit 70e0f41c64604a34cb8ad36c46361f6da8696c9c)
(cherry picked from commit 586fc95d800e7ed177e1a89796ed67dcb85cf683)
---
 subsys/ipc/ipc_service/lib/icmsg_me.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/subsys/ipc/ipc_service/lib/icmsg_me.c b/subsys/ipc/ipc_service/lib/icmsg_me.c
index b4d384e6bb0..8606b56161e 100644
--- a/subsys/ipc/ipc_service/lib/icmsg_me.c
+++ b/subsys/ipc/ipc_service/lib/icmsg_me.c
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#undef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200809L
+
 #include <zephyr/ipc/icmsg_me.h>
 #include <zephyr/sys/math_extras.h>
 

From 87eac82389dff474cbf87680b6d4bebe3f4f660a Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 30 Sep 2024 15:48:37 +0200
Subject: [PATCH 0108/2913] [nrf fromtree] manifest: Update nRF hw models to
 latest

Update the HW models module to:
bf8e45bd1f870e49cc15392e045c28d54ea12285

Including the following:
* bf8e45b (52) CCM HAL: Support nrfx 3.7.0 with renamed TASK_CRYPT
* 14c14d7 HW_models/NHW_GRTC: Support MDK not exposing SYSCOUNTERVALID
* 6d66801 RADIO: Improve RSSISTART behaviour
* ceb6a80 hal grtc: Add replacements for new int group functions
* 838aa38 docs/README_HW_models: Add reference to Bsim HW models descr
* 0ff34d7 docs: Several updates and fixes
* 2972a93 AES_CCM: Avoid UBSAN pointer align warnwhen reading CNFPTR
* f8cd477 UART: Minor bugfix: Set rx status to off during ENABLE

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 867e84ce5969c60ef1b10d5a39774ce63d929b96)
(cherry picked from commit 3af5c7473655e3bdd67b05e512e6a0f6ff9a051e)
(cherry picked from commit 7138e7e6d5e1fee8ed8a1aa435ccb6ca0814f4f9)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index a51048b6857..241102be58f 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: 85944c64f224406e4d781aa382c5f1f71ed307fd
+      revision: bf8e45bd1f870e49cc15392e045c28d54ea12285
       path: modules/bsim_hw_models/nrf_hw_models
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719

From ddc4224f2f4a7fc7144b1d4b1a4544e39180ac3b Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Thu, 12 Sep 2024 11:20:06 +0200
Subject: [PATCH 0109/2913] [nrf fromtree] boards native: Add function to remap
 embedded address

Add a function which can be used to remap embedded device address,
into addresses which can be used in the simulated native boards.

For the nrf_bsim boards we provide an actual implementation.
For other boards, we provide an optional dummy version which does
nothing.
It is up to each board implementation to decide if they want to
provide one or use the dummy.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 5efe751240e4ed14cc30565ff7bc6e68440210fc)
(cherry picked from commit 685e17110273a47dc44efb5ba1828adc2acd9042)
(cherry picked from commit 006aa5e61a93c6c4c9e4e7697fd437ab320b821f)
---
 boards/native/nrf_bsim/CMakeLists.txt |  1 +
 boards/native/nrf_bsim/native_remap.c | 12 ++++++++++++
 soc/native/inf_clock/CMakeLists.txt   |  1 +
 soc/native/inf_clock/native_remap.c   | 16 ++++++++++++++++
 soc/native/inf_clock/soc.h            | 15 +++++++++++++++
 5 files changed, 45 insertions(+)
 create mode 100644 boards/native/nrf_bsim/native_remap.c
 create mode 100644 soc/native/inf_clock/native_remap.c

diff --git a/boards/native/nrf_bsim/CMakeLists.txt b/boards/native/nrf_bsim/CMakeLists.txt
index d55a52e1a53..6aeb3f01634 100644
--- a/boards/native/nrf_bsim/CMakeLists.txt
+++ b/boards/native/nrf_bsim/CMakeLists.txt
@@ -24,6 +24,7 @@ zephyr_library_sources(
 	cpu_wait.c
 	argparse.c
 	nsi_if.c
+	native_remap.c
 	soc/nrfx_coredep.c
 	common/bstests_entry.c
 	common/cmsis/cmsis.c
diff --git a/boards/native/nrf_bsim/native_remap.c b/boards/native/nrf_bsim/native_remap.c
new file mode 100644
index 00000000000..d8b756a9576
--- /dev/null
+++ b/boards/native/nrf_bsim/native_remap.c
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stdbool.h>
+#include "NHW_misc.h"
+
+bool native_emb_addr_remap(void **addr)
+{
+	return nhw_convert_RAM_addr(addr);
+}
diff --git a/soc/native/inf_clock/CMakeLists.txt b/soc/native/inf_clock/CMakeLists.txt
index 7f9d09b2c34..494ea4de774 100644
--- a/soc/native/inf_clock/CMakeLists.txt
+++ b/soc/native/inf_clock/CMakeLists.txt
@@ -8,6 +8,7 @@ zephyr_library_compile_definitions(NO_POSIX_CHEATS)
 zephyr_library_sources(
 	soc.c
 	native_tasks.c
+	native_remap.c
 	)
 
 zephyr_library_include_directories(
diff --git a/soc/native/inf_clock/native_remap.c b/soc/native/inf_clock/native_remap.c
new file mode 100644
index 00000000000..4aa6bd1129e
--- /dev/null
+++ b/soc/native/inf_clock/native_remap.c
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stdbool.h>
+#include <zephyr/toolchain.h>
+
+/**
+ * Dummy version which does nothing
+ * Boards which do not have a better implementation can use this
+ */
+__weak bool native_emb_addr_remap(void **addr)
+{
+	return false;
+}
diff --git a/soc/native/inf_clock/soc.h b/soc/native/inf_clock/soc.h
index 36d54ac3f72..c7de6c22802 100644
--- a/soc/native/inf_clock/soc.h
+++ b/soc/native/inf_clock/soc.h
@@ -7,6 +7,7 @@
 #ifndef _POSIX_SOC_INF_CLOCK_SOC_H
 #define _POSIX_SOC_INF_CLOCK_SOC_H
 
+#include <stdbool.h>
 #include <zephyr/toolchain.h>
 #include "board_soc.h"
 #include "posix_soc.h"
@@ -18,6 +19,20 @@ extern "C" {
 
 void posix_soc_clean_up(void);
 
+/**
+ * Remap an embedded device address, into an address which can be used in the simulated native
+ * board.
+ *
+ * If the provided address is not in a range known to this function it will not be modified and the
+ * function will return false.
+ * Otherwise the provided address pointer will be modified, and true returned.
+ *
+ * Note: The SOC provides a dummy version of this function which does nothing,
+ * so all boards will have an implementation.
+ * It is optional for boards to provide one if desired.
+ */
+bool native_emb_addr_remap(void **addr);
+
 #ifdef __cplusplus
 }
 #endif

From 2f7d3eb15ce780d972aba42cd50a977ab02ab54b Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Wed, 18 Sep 2024 11:05:54 +0200
Subject: [PATCH 0110/2913] [nrf fromtree] ipc: pbuf: Provide function for Rx
 side initialization

Provide a new function for initializing the Rx side,
so users do not need to initialize the pointers by hand
if they did not use PBUF_DEFINE().

Let's also rename pbuf_init() to pbuf_tx_init() to clearly
signify the previous function was only meant to be used
by the Tx side.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 5dc810e26132ad4475ecf9897c6c4c5199929648)
(cherry picked from commit dfe668bf6a6d107ebcf4939eedf13e04016df825)
(cherry picked from commit 24eb460505ff72a443f24a3e4badd73aab26a515)
---
 include/zephyr/ipc/pbuf.h          | 22 +++++++++++++++++++---
 subsys/ipc/ipc_service/lib/icmsg.c |  6 ++----
 subsys/ipc/ipc_service/lib/pbuf.c  | 14 +++++++++++++-
 tests/subsys/ipc/pbuf/src/main.c   | 10 +++++-----
 4 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/include/zephyr/ipc/pbuf.h b/include/zephyr/ipc/pbuf.h
index 0be5bd5185c..983a0687dbb 100644
--- a/include/zephyr/ipc/pbuf.h
+++ b/include/zephyr/ipc/pbuf.h
@@ -152,9 +152,9 @@ struct pbuf {
 	}
 
 /**
- * @brief Initialize the packet buffer.
+ * @brief Initialize the Tx packet buffer.
  *
- * This function initializes the packet buffer based on provided configuration.
+ * This function initializes the Tx packet buffer based on provided configuration.
  * If the configuration is incorrect, the function will return error.
  *
  * It is recommended to use PBUF_DEFINE macro for build time initialization.
@@ -165,7 +165,23 @@ struct pbuf {
  * @retval 0 on success.
  * @retval -EINVAL when the input parameter is incorrect.
  */
-int pbuf_init(struct pbuf *pb);
+int pbuf_tx_init(struct pbuf *pb);
+
+/**
+ * @brief Initialize the Rx packet buffer.
+ *
+ * This function initializes the Rx packet buffer.
+ * If the configuration is incorrect, the function will return error.
+ *
+ * It is recommended to use PBUF_DEFINE macro for build time initialization.
+ *
+ * @param pb	Pointer to the packed buffer containing
+ *		configuration and data. Configuration has to be
+ *		fixed before the initialization.
+ * @retval 0 on success.
+ * @retval -EINVAL when the input parameter is incorrect.
+ */
+int pbuf_rx_init(struct pbuf *pb);
 
 /**
  * @brief Write specified amount of data to the packet buffer.
diff --git a/subsys/ipc/ipc_service/lib/icmsg.c b/subsys/ipc/ipc_service/lib/icmsg.c
index e73bdaaa723..9de8a99ad58 100644
--- a/subsys/ipc/ipc_service/lib/icmsg.c
+++ b/subsys/ipc/ipc_service/lib/icmsg.c
@@ -270,16 +270,14 @@ int icmsg_open(const struct icmsg_config_t *conf,
 	k_mutex_init(&dev_data->tx_lock);
 #endif
 
-	int ret = pbuf_init(dev_data->tx_pb);
+	int ret = pbuf_tx_init(dev_data->tx_pb);
 
 	if (ret < 0) {
 		__ASSERT(false, "Incorrect configuration");
 		return ret;
 	}
 
-	/* Initialize local copies of rx_pb. */
-	dev_data->rx_pb->data.wr_idx = 0;
-	dev_data->rx_pb->data.rd_idx = 0;
+	(void)pbuf_rx_init(dev_data->rx_pb);
 
 	ret = pbuf_write(dev_data->tx_pb, magic, sizeof(magic));
 
diff --git a/subsys/ipc/ipc_service/lib/pbuf.c b/subsys/ipc/ipc_service/lib/pbuf.c
index 1164f814ca0..19ac2525c28 100644
--- a/subsys/ipc/ipc_service/lib/pbuf.c
+++ b/subsys/ipc/ipc_service/lib/pbuf.c
@@ -54,7 +54,7 @@ static int validate_cfg(const struct pbuf_cfg *cfg)
 	return 0;
 }
 
-int pbuf_init(struct pbuf *pb)
+int pbuf_tx_init(struct pbuf *pb)
 {
 	if (validate_cfg(pb->cfg) != 0) {
 		return -EINVAL;
@@ -77,6 +77,18 @@ int pbuf_init(struct pbuf *pb)
 	return 0;
 }
 
+int pbuf_rx_init(struct pbuf *pb)
+{
+	if (validate_cfg(pb->cfg) != 0) {
+		return -EINVAL;
+	}
+	/* Initialize local copy of indexes. */
+	pb->data.wr_idx = 0;
+	pb->data.rd_idx = 0;
+
+	return 0;
+}
+
 int pbuf_write(struct pbuf *pb, const char *data, uint16_t len)
 {
 	if (pb == NULL || len == 0 || data == NULL) {
diff --git a/tests/subsys/ipc/pbuf/src/main.c b/tests/subsys/ipc/pbuf/src/main.c
index d4bbb9db4fe..9eb26695c08 100644
--- a/tests/subsys/ipc/pbuf/src/main.c
+++ b/tests/subsys/ipc/pbuf/src/main.c
@@ -58,7 +58,7 @@ ZTEST(test_pbuf, test_rw)
 		write_buf[i] = i+1;
 	}
 
-	zassert_equal(pbuf_init(&pb), 0);
+	zassert_equal(pbuf_tx_init(&pb), 0);
 
 	/* Write MSGA_SZ bytes packet. */
 	ret = pbuf_write(&pb, write_buf, MSGA_SZ);
@@ -132,9 +132,9 @@ ZTEST(test_pbuf, test_retcodes)
 	};
 
 	/* Initialize buffers. */
-	zassert_equal(pbuf_init(&pb0), 0);
-	zassert_equal(pbuf_init(&pb1), 0);
-	zassert_equal(pbuf_init(&pb2), 0);
+	zassert_equal(pbuf_tx_init(&pb0), 0);
+	zassert_equal(pbuf_tx_init(&pb1), 0);
+	zassert_equal(pbuf_tx_init(&pb2), 0);
 
 	print_pbuf_info(&pb0);
 	print_pbuf_info(&pb1);
@@ -274,7 +274,7 @@ ZTEST(test_pbuf, test_stress)
 		.cfg = &cfg,
 	};
 
-	zassert_equal(pbuf_init(&pb), 0);
+	zassert_equal(pbuf_tx_init(&pb), 0);
 	ctx.pbuf = &pb;
 	ctx.wr_cnt = 0;
 	ctx.rd_cnt = 0;

From 91fa9101cc11dbcb9d8b4cf7759cd6cf3ab087d7 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Fri, 6 Sep 2024 16:52:08 +0200
Subject: [PATCH 0111/2913] [nrf fromtree] ipc: icmsg & icbmsg: Add support for
 POSIX arch targets

Add support in this IPC backends for POSIX arch targets in general,
and ensure the nrf5340bsim defines the buffer which will be used.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit b5b91b3edb7f2d93710e08f229d4966bc1b4962d)
(cherry picked from commit e29d5174b8c980817c6774d31620c554347bfa79)
(cherry picked from commit d408a8d5bf67e3df378bcb96ac639f4b9fca90a9)
---
 include/zephyr/ipc/pbuf.h                    | 16 +++++++++++-----
 subsys/ipc/ipc_service/backends/ipc_icbmsg.c | 16 ++++++++++++++--
 subsys/ipc/ipc_service/lib/pbuf.c            | 20 ++++++++++++++++++++
 tests/subsys/ipc/pbuf/src/main.c             | 10 +++++-----
 4 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/include/zephyr/ipc/pbuf.h b/include/zephyr/ipc/pbuf.h
index 983a0687dbb..8783cdbbf14 100644
--- a/include/zephyr/ipc/pbuf.h
+++ b/include/zephyr/ipc/pbuf.h
@@ -35,6 +35,13 @@ extern "C" {
  */
 #define _PBUF_MIN_DATA_LEN ROUND_UP(PBUF_PACKET_LEN_SZ + 1 + _PBUF_IDX_SIZE, _PBUF_IDX_SIZE)
 
+#if defined(CONFIG_ARCH_POSIX)
+/* For the native simulated boards we need to modify some pointers at init */
+#define PBUF_MAYBE_CONST
+#else
+#define PBUF_MAYBE_CONST const
+#endif
+
 /** @brief Control block of packet buffer.
  *
  * The structure contains configuration data.
@@ -87,9 +94,9 @@ struct pbuf_data {
  * written in a way to protect the data from being corrupted.
  */
 struct pbuf {
-	const struct pbuf_cfg *const cfg;	/* Configuration of the
-						 * buffer.
-						 */
+	PBUF_MAYBE_CONST struct pbuf_cfg *const cfg; /* Configuration of the
+						      * buffer.
+						      */
 	struct pbuf_data data;			/* Data used to read and write
 						 * to the buffer
 						 */
@@ -144,8 +151,7 @@ struct pbuf {
 			"Misaligned memory.");						\
 	BUILD_ASSERT(size >= (MAX(dcache_align, _PBUF_IDX_SIZE) + _PBUF_IDX_SIZE +	\
 			_PBUF_MIN_DATA_LEN), "Insufficient size.");			\
-											\
-	static const struct pbuf_cfg cfg_##name =					\
+	static PBUF_MAYBE_CONST struct pbuf_cfg cfg_##name =				\
 			PBUF_CFG_INIT(mem_addr, size, dcache_align);			\
 	static struct pbuf name = {							\
 		.cfg = &cfg_##name,							\
diff --git a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
index 70c4c4c362f..9fd7752999f 100644
--- a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
+++ b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
@@ -87,6 +87,13 @@
 #include <zephyr/ipc/ipc_service_backend.h>
 #include <zephyr/cache.h>
 
+#if defined(CONFIG_ARCH_POSIX)
+#include <soc.h>
+#define MAYBE_CONST
+#else
+#define MAYBE_CONST const
+#endif
+
 LOG_MODULE_REGISTER(ipc_icbmsg,
 		    CONFIG_IPC_SERVICE_BACKEND_ICBMSG_LOG_LEVEL);
 
@@ -1238,12 +1245,17 @@ static int release_rx_buffer(const struct device *instance, void *token, void *d
  */
 static int backend_init(const struct device *instance)
 {
-	const struct icbmsg_config *conf = instance->config;
+	MAYBE_CONST struct icbmsg_config *conf = (struct icbmsg_config *)instance->config;
 	struct backend_data *dev_data = instance->data;
 #ifdef CONFIG_MULTITHREADING
 	static K_THREAD_STACK_DEFINE(ep_bound_work_q_stack, EP_BOUND_WORK_Q_STACK_SIZE);
 	static bool is_work_q_started;
 
+#if defined(CONFIG_ARCH_POSIX)
+	native_emb_addr_remap((void **)&conf->tx.blocks_ptr);
+	native_emb_addr_remap((void **)&conf->rx.blocks_ptr);
+#endif
+
 	if (!is_work_q_started) {
 		k_work_queue_init(&ep_bound_work_q);
 		k_work_queue_start(&ep_bound_work_q, ep_bound_work_q_stack,
@@ -1401,7 +1413,7 @@ const static struct ipc_service_backend backend_ops = {
 			.rx_pb = &rx_icbmsg_pb_##i,					\
 		}									\
 	};										\
-	static const struct icbmsg_config backend_config_##i =				\
+	static MAYBE_CONST struct icbmsg_config backend_config_##i =			\
 	{										\
 		.control_config = {							\
 			.mbox_tx = MBOX_DT_SPEC_INST_GET(i, tx),			\
diff --git a/subsys/ipc/ipc_service/lib/pbuf.c b/subsys/ipc/ipc_service/lib/pbuf.c
index 19ac2525c28..c744946f4ca 100644
--- a/subsys/ipc/ipc_service/lib/pbuf.c
+++ b/subsys/ipc/ipc_service/lib/pbuf.c
@@ -11,6 +11,10 @@
 #include <zephyr/ipc/pbuf.h>
 #include <zephyr/sys/byteorder.h>
 
+#if defined(CONFIG_ARCH_POSIX)
+#include <soc.h>
+#endif
+
 /* Helper funciton for getting numer of bytes being written to the bufer. */
 static uint32_t idx_occupied(uint32_t len, uint32_t wr_idx, uint32_t rd_idx)
 {
@@ -54,11 +58,23 @@ static int validate_cfg(const struct pbuf_cfg *cfg)
 	return 0;
 }
 
+#if defined(CONFIG_ARCH_POSIX)
+void pbuf_native_addr_remap(struct pbuf *pb)
+{
+	native_emb_addr_remap((void **)&pb->cfg->rd_idx_loc);
+	native_emb_addr_remap((void **)&pb->cfg->wr_idx_loc);
+	native_emb_addr_remap((void **)&pb->cfg->data_loc);
+}
+#endif
+
 int pbuf_tx_init(struct pbuf *pb)
 {
 	if (validate_cfg(pb->cfg) != 0) {
 		return -EINVAL;
 	}
+#if defined(CONFIG_ARCH_POSIX)
+	pbuf_native_addr_remap(pb);
+#endif
 
 	/* Initialize local copy of indexes. */
 	pb->data.wr_idx = 0;
@@ -82,6 +98,10 @@ int pbuf_rx_init(struct pbuf *pb)
 	if (validate_cfg(pb->cfg) != 0) {
 		return -EINVAL;
 	}
+#if defined(CONFIG_ARCH_POSIX)
+	pbuf_native_addr_remap(pb);
+#endif
+
 	/* Initialize local copy of indexes. */
 	pb->data.wr_idx = 0;
 	pb->data.rd_idx = 0;
diff --git a/tests/subsys/ipc/pbuf/src/main.c b/tests/subsys/ipc/pbuf/src/main.c
index 9eb26695c08..4af9da68c47 100644
--- a/tests/subsys/ipc/pbuf/src/main.c
+++ b/tests/subsys/ipc/pbuf/src/main.c
@@ -48,7 +48,7 @@ ZTEST(test_pbuf, test_rw)
 	 * order to avoid clang complains about memory_area not being constant
 	 * expression.
 	 */
-	static const struct pbuf_cfg cfg = PBUF_CFG_INIT(memory_area, MEM_AREA_SZ, 0);
+	static PBUF_MAYBE_CONST struct pbuf_cfg cfg = PBUF_CFG_INIT(memory_area, MEM_AREA_SZ, 0);
 
 	static struct pbuf pb = {
 		.cfg = &cfg,
@@ -115,9 +115,9 @@ ZTEST(test_pbuf, test_retcodes)
 	 * order to avoid clang complains about memory_area not being constant
 	 * expression.
 	 */
-	static const struct pbuf_cfg cfg0 = PBUF_CFG_INIT(memory_area, MEM_AREA_SZ, 32);
-	static const struct pbuf_cfg cfg1 = PBUF_CFG_INIT(memory_area, MEM_AREA_SZ, 0);
-	static const struct pbuf_cfg cfg2 = PBUF_CFG_INIT(memory_area, 20, 4);
+	static PBUF_MAYBE_CONST struct pbuf_cfg cfg0 = PBUF_CFG_INIT(memory_area, MEM_AREA_SZ, 32);
+	static PBUF_MAYBE_CONST struct pbuf_cfg cfg1 = PBUF_CFG_INIT(memory_area, MEM_AREA_SZ, 0);
+	static PBUF_MAYBE_CONST struct pbuf_cfg cfg2 = PBUF_CFG_INIT(memory_area, 20, 4);
 
 	static struct pbuf pb0 = {
 		.cfg = &cfg0,
@@ -268,7 +268,7 @@ ZTEST(test_pbuf, test_stress)
 	 * order to avoid clang complains about buffer not being constant
 	 * expression.
 	 */
-	static const struct pbuf_cfg cfg = PBUF_CFG_INIT(buffer, MEM_AREA_SZ, 4);
+	static PBUF_MAYBE_CONST struct pbuf_cfg cfg = PBUF_CFG_INIT(buffer, MEM_AREA_SZ, 4);
 
 	static struct pbuf pb = {
 		.cfg = &cfg,

From d5d8de1c2707fd1a35f665f81ecf9563132ab996 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Wed, 11 Sep 2024 11:46:06 +0200
Subject: [PATCH 0112/2913] [nrf fromtree] samples ipc_service/multi_endpoint:
 Enable for nrf5340bsim

Enable this sample for the nrf5340bsim

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit be35bbd4c0cfe09c948712cf931411558ff14e70)
(cherry picked from commit 8ca6ac591ddfd7634a8a29b03057e69d92b1b980)
(cherry picked from commit 6e0b9ba3fc946b6d7cdca96e82b31e3900950b66)
---
 .../ipc/ipc_service/multi_endpoint/CMakeLists.txt      |  3 ++-
 .../ipc/ipc_service/multi_endpoint/Kconfig.sysbuild    |  1 +
 .../boards/nrf5340bsim_nrf5340_cpuapp.overlay          |  7 +++++++
 .../remote/boards/nrf5340bsim_nrf5340_cpunet.overlay   |  7 +++++++
 .../subsys/ipc/ipc_service/multi_endpoint/sample.yaml  | 10 ++++++++--
 .../ipc/ipc_service/multi_endpoint/sysbuild.cmake      |  3 +++
 6 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 samples/subsys/ipc/ipc_service/multi_endpoint/boards/nrf5340bsim_nrf5340_cpuapp.overlay
 create mode 100644 samples/subsys/ipc/ipc_service/multi_endpoint/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay

diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/CMakeLists.txt b/samples/subsys/ipc/ipc_service/multi_endpoint/CMakeLists.txt
index c167dd5375b..fca156d9fe2 100644
--- a/samples/subsys/ipc/ipc_service/multi_endpoint/CMakeLists.txt
+++ b/samples/subsys/ipc/ipc_service/multi_endpoint/CMakeLists.txt
@@ -8,7 +8,8 @@ cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
-if(NOT CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP)
+if(NOT CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP AND
+    NOT CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUAPP )
   message(FATAL_ERROR "${BOARD} is not supported for this sample")
 endif()
 
diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/Kconfig.sysbuild b/samples/subsys/ipc/ipc_service/multi_endpoint/Kconfig.sysbuild
index d0849e37dde..5e4c6d497cf 100644
--- a/samples/subsys/ipc/ipc_service/multi_endpoint/Kconfig.sysbuild
+++ b/samples/subsys/ipc/ipc_service/multi_endpoint/Kconfig.sysbuild
@@ -7,3 +7,4 @@ source "share/sysbuild/Kconfig"
 config NET_CORE_BOARD
 string
 	default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk"
+	default "nrf5340bsim/nrf5340/cpunet" if $(BOARD) = "nrf5340bsim"
diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/samples/subsys/ipc/ipc_service/multi_endpoint/boards/nrf5340bsim_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..53c9b68afe7
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/multi_endpoint/boards/nrf5340bsim_nrf5340_cpuapp.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf5340dk_nrf5340_cpuapp.overlay"
diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay b/samples/subsys/ipc/ipc_service/multi_endpoint/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay
new file mode 100644
index 00000000000..c5194cf93cd
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/multi_endpoint/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf5340dk_nrf5340_cpunet.overlay"
diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/sample.yaml b/samples/subsys/ipc/ipc_service/multi_endpoint/sample.yaml
index b05c8f001f2..f808c95252e 100644
--- a/samples/subsys/ipc/ipc_service/multi_endpoint/sample.yaml
+++ b/samples/subsys/ipc/ipc_service/multi_endpoint/sample.yaml
@@ -14,15 +14,21 @@ common:
       - "IPC-service HOST \\[INST 1\\] demo ended\\."
 tests:
   sample.ipc.multi_endpoint:
-    platform_allow: nrf5340dk/nrf5340/cpuapp
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf5340bsim/nrf5340/cpuapp
     integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
+      - nrf5340bsim/nrf5340/cpuapp
     tags: ipc
     sysbuild: true
   sample.ipc.multi_endpoint.icbmsg:
-    platform_allow: nrf5340dk/nrf5340/cpuapp
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf5340bsim/nrf5340/cpuapp
     integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
+      - nrf5340bsim/nrf5340/cpuapp
     tags: ipc
     sysbuild: true
     extra_args:
diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.cmake b/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.cmake
index d0d79b8f240..9117870be8a 100644
--- a/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.cmake
+++ b/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.cmake
@@ -12,3 +12,6 @@ ExternalZephyrProject_Add(
 	SOURCE_DIR  ${APP_DIR}/remote
 	BOARD       ${SB_CONFIG_NET_CORE_BOARD}
 )
+
+native_simulator_set_child_images(${DEFAULT_IMAGE} remote)
+native_simulator_set_final_executable(${DEFAULT_IMAGE})

From a26d26064d00b8a6b4929cdc0d5f1a74be2ff6d7 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Wed, 11 Sep 2024 14:13:52 +0200
Subject: [PATCH 0113/2913] [nrf fromtree] samples ipc_service/icmsg: Enable
 for nrf5340bsim

Enable this sample for the nrf5340bsim

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit ca62ff801c87a2264dbb6d853c38880ff62279a3)
(cherry picked from commit 5d8ce35cb3427d11dee55f03cf9398225d78862b)
(cherry picked from commit 429b758be87300c75f3c4ce0ece98e61737deb19)
---
 samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt        | 1 +
 samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild      | 1 +
 .../icmsg/boards/nrf5340bsim_nrf5340_cpuapp.overlay        | 7 +++++++
 .../icmsg/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay | 7 +++++++
 samples/subsys/ipc/ipc_service/icmsg/sample.yaml           | 5 ++++-
 samples/subsys/ipc/ipc_service/icmsg/sysbuild.cmake        | 3 +++
 6 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 samples/subsys/ipc/ipc_service/icmsg/boards/nrf5340bsim_nrf5340_cpuapp.overlay
 create mode 100644 samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay

diff --git a/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt b/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt
index 725fd707174..e9e246b02fa 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt
+++ b/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt
@@ -9,6 +9,7 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 if(NOT CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP AND
+    NOT CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUAPP AND
     NOT CONFIG_BOARD_STM32H747I_DISCO AND
     NOT CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUAPP)
   message(FATAL_ERROR "${BOARD} is not supported for this sample")
diff --git a/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild b/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild
index 9a2c85d065d..41b892aba6a 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild
+++ b/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild
@@ -7,5 +7,6 @@ source "share/sysbuild/Kconfig"
 config REMOTE_BOARD
 string
 	default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk"
+	default "nrf5340bsim/nrf5340/cpunet" if $(BOARD) = "nrf5340bsim"
 	default "nrf54l15pdk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15pdk"
 	default "stm32h747i_disco/stm32h747xx/m4" if $(BOARD) = "stm32h747i_disco"
diff --git a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf5340bsim_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..53c9b68afe7
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf5340bsim_nrf5340_cpuapp.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf5340dk_nrf5340_cpuapp.overlay"
diff --git a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay
new file mode 100644
index 00000000000..c5194cf93cd
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf5340dk_nrf5340_cpunet.overlay"
diff --git a/samples/subsys/ipc/ipc_service/icmsg/sample.yaml b/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
index b981c1b8215..321ed3398ed 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
+++ b/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
@@ -2,9 +2,12 @@ sample:
   name: IPC Service example integration (icmsg backend)
 tests:
   sample.ipc.icmsg:
-    platform_allow: nrf5340dk/nrf5340/cpuapp
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf5340bsim/nrf5340/cpuapp
     integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
+      - nrf5340bsim/nrf5340/cpuapp
     tags: ipc
     sysbuild: true
     harness: console
diff --git a/samples/subsys/ipc/ipc_service/icmsg/sysbuild.cmake b/samples/subsys/ipc/ipc_service/icmsg/sysbuild.cmake
index b1f0947aff7..305c85cc3eb 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/sysbuild.cmake
+++ b/samples/subsys/ipc/ipc_service/icmsg/sysbuild.cmake
@@ -12,3 +12,6 @@ ExternalZephyrProject_Add(
 	SOURCE_DIR  ${APP_DIR}/remote
 	BOARD       ${SB_CONFIG_REMOTE_BOARD}
 )
+
+native_simulator_set_child_images(${DEFAULT_IMAGE} remote)
+native_simulator_set_final_executable(${DEFAULT_IMAGE})

From 086003eea70b8e3678f8fe4656b25702ad0aa772 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Wed, 11 Sep 2024 15:08:36 +0200
Subject: [PATCH 0114/2913] [nrf fromtree] samples ipc_service/static_vrings:
 Enable for nrf5340bsim

Enable this sample for the nrf5340bsim

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 13efb3910ee1bc06c1ae70f8de679a7e6c86ff92)
(cherry picked from commit c7ae658f9b988d3f9971452f253b89b7fc527daa)
(cherry picked from commit 3d384f0d63ea1aabb3f3819a2a145b886a83fb94)
---
 .../subsys/ipc/ipc_service/static_vrings/CMakeLists.txt    | 1 +
 .../subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild  | 1 +
 .../boards/nrf5340bsim_nrf5340_cpuapp.overlay              | 7 +++++++
 .../remote/boards/nrf5340bsim_nrf5340_cpunet.overlay       | 7 +++++++
 samples/subsys/ipc/ipc_service/static_vrings/sample.yaml   | 2 ++
 .../subsys/ipc/ipc_service/static_vrings/sysbuild.cmake    | 3 +++
 6 files changed, 21 insertions(+)
 create mode 100644 samples/subsys/ipc/ipc_service/static_vrings/boards/nrf5340bsim_nrf5340_cpuapp.overlay
 create mode 100644 samples/subsys/ipc/ipc_service/static_vrings/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay

diff --git a/samples/subsys/ipc/ipc_service/static_vrings/CMakeLists.txt b/samples/subsys/ipc/ipc_service/static_vrings/CMakeLists.txt
index 4deb07c4789..588bfe71dd0 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/CMakeLists.txt
+++ b/samples/subsys/ipc/ipc_service/static_vrings/CMakeLists.txt
@@ -12,6 +12,7 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../remote/zephyr)
 
 if(NOT (CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR
+        CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUAPP OR
         CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0 OR
         CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7 OR
         CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM7
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild b/samples/subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild
index a1214db3284..4f9caa82501 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild
+++ b/samples/subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild
@@ -8,6 +8,7 @@ source "share/sysbuild/Kconfig"
 config NET_CORE_BOARD
 string
 	default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk"
+	default "nrf5340bsim/nrf5340/cpunet" if $(BOARD) = "nrf5340bsim"
 	default "lpcxpresso55s69/lpc55s69/cpu1" if $(BOARD) = "lpcxpresso55s69"
 	default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk"
 	default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk"
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/samples/subsys/ipc/ipc_service/static_vrings/boards/nrf5340bsim_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..53c9b68afe7
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/static_vrings/boards/nrf5340bsim_nrf5340_cpuapp.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf5340dk_nrf5340_cpuapp.overlay"
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay b/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay
new file mode 100644
index 00000000000..57176705564
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf5340dk_nrf5340_cpunet.overlay"
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/sample.yaml b/samples/subsys/ipc/ipc_service/static_vrings/sample.yaml
index 911b3624e44..d15df7b803e 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/sample.yaml
+++ b/samples/subsys/ipc/ipc_service/static_vrings/sample.yaml
@@ -4,12 +4,14 @@ tests:
   sample.ipc.static_vrings:
     platform_allow:
       - nrf5340dk/nrf5340/cpuapp
+      - nrf5340bsim/nrf5340/cpuapp
       - lpcxpresso55s69/lpc55s69/cpu0
       - mimxrt1160_evk/mimxrt1166/cm7
       - mimxrt1170_evk/mimxrt1176/cm7
       - mimxrt1170_evk@B/mimxrt1176/cm7
     integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
+      - nrf5340bsim/nrf5340/cpuapp
     tags: ipc
     sysbuild: true
     harness: console
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.cmake b/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.cmake
index 2e99a95d3c3..cf5de9dd941 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.cmake
+++ b/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.cmake
@@ -21,3 +21,6 @@ ExternalZephyrProject_Add(
 # remote core's build, such as the output image's LMA
 add_dependencies(${DEFAULT_IMAGE} ${REMOTE_APP})
 sysbuild_add_dependencies(CONFIGURE ${DEFAULT_IMAGE} ${REMOTE_APP})
+
+native_simulator_set_child_images(${DEFAULT_IMAGE} remote)
+native_simulator_set_final_executable(${DEFAULT_IMAGE})

From 9062af0c6fd9eedffb7b871da2a2f23ef75a541e Mon Sep 17 00:00:00 2001
From: Piotr Koziar <piotr.koziar@nordicsemi.no>
Date: Tue, 8 Oct 2024 13:45:34 +0200
Subject: [PATCH 0115/2913] [nrf fromlist] ipc: icmsg: increase stack size of
 RX work queue thread

Increases default size of stack used by work queue RX thread
from 1024 to 1280 to avoid memory issues.

After adding the buffer with the default size of 128
that is allocated on the thread's stack (see #77552),
there is too little stack left during heavy stress.

Upstream PR #: 79557

Signed-off-by: Piotr Koziar <piotr.koziar@nordicsemi.no>
(cherry picked from commit 2a679b95faef5dd1e5a46d6710d7059b6042758c)
(cherry picked from commit fb1d4b17594db397ccbafefa6e78a8e2b3254576)
---
 subsys/ipc/ipc_service/lib/Kconfig.icmsg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/ipc/ipc_service/lib/Kconfig.icmsg b/subsys/ipc/ipc_service/lib/Kconfig.icmsg
index 93427404dca..bc15d9a5999 100644
--- a/subsys/ipc/ipc_service/lib/Kconfig.icmsg
+++ b/subsys/ipc/ipc_service/lib/Kconfig.icmsg
@@ -51,7 +51,7 @@ if IPC_SERVICE_BACKEND_ICMSG_WQ_ENABLE
 
 config IPC_SERVICE_BACKEND_ICMSG_WQ_STACK_SIZE
 	int "Size of RX work queue stack"
-	default 1024
+	default 1280
 	help
 	  Size of stack used by work queue RX thread. This work queue is
 	  created to prevent notifying service users about received data

From 8ed9b80c546d794239c3fa1c9f9d090b8746ead4 Mon Sep 17 00:00:00 2001
From: Riadh Ghaddab <rghaddab@baylibre.com>
Date: Tue, 17 Sep 2024 11:16:28 +0200
Subject: [PATCH 0116/2913] [nrf fromlist] settings: ZMS: add a backend for ZMS
 (Zephyr Memory Storage)

This adds the initial backend support for the ZMS storage system.

Upstream PR #: 78632

Signed-off-by: Riadh Ghaddab <rghaddab@baylibre.com>
(cherry picked from commit b99b214b949d3ae10bf02eb60f4ade4fb42400a1)
(cherry picked from commit 8168f0209dff60e9106d68d8aa28b9b6086a261b)
(cherry picked from commit a05643641ae50372973688ac8490f18a74ea85ac)
---
 subsys/settings/Kconfig                       |  41 ++
 .../settings/include/settings/settings_zms.h  |  64 +++
 subsys/settings/src/CMakeLists.txt            |   1 +
 subsys/settings/src/settings_zms.c            | 432 ++++++++++++++++++
 tests/subsys/settings/zms/CMakeLists.txt      |   7 +
 tests/subsys/settings/zms/prj.conf            |   8 +
 tests/subsys/settings/zms/src/CMakeLists.txt  |  12 +
 tests/subsys/settings/zms/src/settings_test.h |  42 ++
 .../settings/zms/src/settings_test_zms.c      | 125 +++++
 tests/subsys/settings/zms/testcase.yaml       |   7 +
 10 files changed, 739 insertions(+)
 create mode 100644 subsys/settings/include/settings/settings_zms.h
 create mode 100644 subsys/settings/src/settings_zms.c
 create mode 100644 tests/subsys/settings/zms/CMakeLists.txt
 create mode 100644 tests/subsys/settings/zms/prj.conf
 create mode 100644 tests/subsys/settings/zms/src/CMakeLists.txt
 create mode 100644 tests/subsys/settings/zms/src/settings_test.h
 create mode 100644 tests/subsys/settings/zms/src/settings_test_zms.c
 create mode 100644 tests/subsys/settings/zms/testcase.yaml

diff --git a/subsys/settings/Kconfig b/subsys/settings/Kconfig
index bc015cde9c7..48eacf82a8c 100644
--- a/subsys/settings/Kconfig
+++ b/subsys/settings/Kconfig
@@ -32,6 +32,7 @@ config SETTINGS_ENCODE_LEN
 
 choice SETTINGS_BACKEND
 	prompt "Storage back-end"
+	default SETTINGS_ZMS if ZMS
 	default SETTINGS_NVS if NVS
 	default SETTINGS_FCB if FCB
 	default SETTINGS_FILE if FILE_SYSTEM
@@ -39,6 +40,31 @@ choice SETTINGS_BACKEND
 	help
 	  Storage back-end to be used by the settings subsystem.
 
+config SETTINGS_ZMS
+	bool "ZMS (Zephyr Memory Storage)"
+	depends on ZMS
+	help
+	  Use ZMS as settings storage backend.
+
+if SETTINGS_ZMS
+
+config SETTINGS_ZMS_NAME_CACHE
+	bool "ZMS name lookup cache"
+	select SYS_HASH_FUNC32
+	help
+	  Enable ZMS name lookup cache, used to reduce the Settings name
+	  lookup time.
+
+config SETTINGS_ZMS_NAME_CACHE_SIZE
+	int "ZMS name lookup cache size"
+	default 128
+	range 1 $(UINT32_MAX)
+	depends on SETTINGS_ZMS_NAME_CACHE
+	help
+	  Number of entries in Settings ZMS name cache.
+
+endif # SETTINGS_ZMS
+
 config SETTINGS_FCB
 	bool "FCB"
 	depends on FCB
@@ -132,6 +158,21 @@ config SETTINGS_NVS_SECTOR_COUNT
 	help
 	  Number of sectors used for the NVS settings area
 
+config SETTINGS_ZMS_SECTOR_SIZE_MULT
+	int "Sector size of the ZMS settings area"
+	default 1
+	depends on SETTINGS_ZMS
+	help
+	  The sector size to use for the ZMS settings area as a multiple of
+	  FLASH_ERASE_BLOCK_SIZE.
+
+config SETTINGS_ZMS_SECTOR_COUNT
+	int "Sector count of the ZMS settings area"
+	default 8
+	depends on SETTINGS_ZMS
+	help
+	  Number of sectors used for the ZMS settings area
+
 config SETTINGS_SHELL
 	bool "Settings shell"
 	depends on SHELL
diff --git a/subsys/settings/include/settings/settings_zms.h b/subsys/settings/include/settings/settings_zms.h
new file mode 100644
index 00000000000..dd9fb3aba12
--- /dev/null
+++ b/subsys/settings/include/settings/settings_zms.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2024 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __SETTINGS_ZMS_H_
+#define __SETTINGS_ZMS_H_
+
+#include <zephyr/fs/zms.h>
+#include <zephyr/settings/settings.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* In the ZMS backend, each setting is stored in two ZMS entries:
+ *	1. setting's name
+ *	2. setting's value
+ *
+ * The ZMS entry ID for the setting's value is determined implicitly based on
+ * the ID of the ZMS entry for the setting's name, once that is found. The
+ * difference between name and value ID is constant and equal to
+ * ZMS_NAME_ID_OFFSET.
+ *
+ * Setting's name entries start from ZMS_NAMECNT_ID + 1.
+ * The entry with ID == ZMS_NAMECNT_ID is used to store the largest name ID in use.
+ *
+ * Deleted records will not be found, only the last record will be read.
+ */
+#define ZMS_NAMECNT_ID     0x80000000
+#define ZMS_NAME_ID_OFFSET 0x40000000
+
+struct settings_zms {
+	struct settings_store cf_store;
+	struct zms_fs cf_zms;
+	uint32_t last_name_id;
+	const struct device *flash_dev;
+#if CONFIG_SETTINGS_ZMS_NAME_CACHE
+	struct {
+		uint32_t name_hash;
+		uint32_t name_id;
+	} cache[CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE];
+
+	uint32_t cache_next;
+	uint32_t cache_total;
+	bool loaded;
+#endif
+};
+
+/* register zms to be a source of settings */
+int settings_zms_src(struct settings_zms *cf);
+
+/* register zms to be the destination of settings */
+int settings_zms_dst(struct settings_zms *cf);
+
+/* Initialize a zms backend. */
+int settings_zms_backend_init(struct settings_zms *cf);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SETTINGS_ZMS_H_ */
diff --git a/subsys/settings/src/CMakeLists.txt b/subsys/settings/src/CMakeLists.txt
index d4ec6e76142..4aa797fbb35 100644
--- a/subsys/settings/src/CMakeLists.txt
+++ b/subsys/settings/src/CMakeLists.txt
@@ -13,3 +13,4 @@ zephyr_sources_ifdef(CONFIG_SETTINGS_FCB settings_fcb.c)
 zephyr_sources_ifdef(CONFIG_SETTINGS_NVS settings_nvs.c)
 zephyr_sources_ifdef(CONFIG_SETTINGS_NONE settings_none.c)
 zephyr_sources_ifdef(CONFIG_SETTINGS_SHELL settings_shell.c)
+zephyr_sources_ifdef(CONFIG_SETTINGS_ZMS settings_zms.c)
diff --git a/subsys/settings/src/settings_zms.c b/subsys/settings/src/settings_zms.c
new file mode 100644
index 00000000000..0f1164e4ea1
--- /dev/null
+++ b/subsys/settings/src/settings_zms.c
@@ -0,0 +1,432 @@
+/*
+ * Copyright (c) 2024 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <errno.h>
+#include <string.h>
+
+#include "settings/settings_zms.h"
+#include "settings_priv.h"
+
+#include <zephyr/settings/settings.h>
+#include <zephyr/sys/hash_function.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/logging/log.h>
+LOG_MODULE_DECLARE(settings, CONFIG_SETTINGS_LOG_LEVEL);
+
+#if DT_HAS_CHOSEN(zephyr_settings_partition)
+#define SETTINGS_PARTITION DT_FIXED_PARTITION_ID(DT_CHOSEN(zephyr_settings_partition))
+#else
+#define SETTINGS_PARTITION FIXED_PARTITION_ID(storage_partition)
+#endif
+
+struct settings_zms_read_fn_arg {
+	struct zms_fs *fs;
+	uint32_t id;
+};
+
+static int settings_zms_load(struct settings_store *cs, const struct settings_load_arg *arg);
+static int settings_zms_save(struct settings_store *cs, const char *name, const char *value,
+			     size_t val_len);
+static void *settings_zms_storage_get(struct settings_store *cs);
+
+static struct settings_store_itf settings_zms_itf = {.csi_load = settings_zms_load,
+						     .csi_save = settings_zms_save,
+						     .csi_storage_get = settings_zms_storage_get};
+
+static ssize_t settings_zms_read_fn(void *back_end, void *data, size_t len)
+{
+	struct settings_zms_read_fn_arg *rd_fn_arg;
+
+	rd_fn_arg = (struct settings_zms_read_fn_arg *)back_end;
+
+	return zms_read(rd_fn_arg->fs, rd_fn_arg->id, data, len);
+}
+
+int settings_zms_src(struct settings_zms *cf)
+{
+	cf->cf_store.cs_itf = &settings_zms_itf;
+	settings_src_register(&cf->cf_store);
+
+	return 0;
+}
+
+int settings_zms_dst(struct settings_zms *cf)
+{
+	cf->cf_store.cs_itf = &settings_zms_itf;
+	settings_dst_register(&cf->cf_store);
+
+	return 0;
+}
+
+#if CONFIG_SETTINGS_ZMS_NAME_CACHE
+#define SETTINGS_ZMS_CACHE_OVFL(cf) ((cf)->cache_total > ARRAY_SIZE((cf)->cache))
+
+static void settings_zms_cache_add(struct settings_zms *cf, const char *name, uint32_t name_id)
+{
+	uint32_t name_hash = sys_hash32(name, strlen(name));
+
+	cf->cache[cf->cache_next].name_hash = name_hash;
+	cf->cache[cf->cache_next++].name_id = name_id;
+
+	cf->cache_next %= CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE;
+}
+
+static uint32_t settings_zms_cache_match(struct settings_zms *cf, const char *name, char *rdname,
+					 size_t len)
+{
+	uint32_t name_hash = sys_hash32(name, strlen(name));
+	int rc;
+
+	for (int i = 0; i < CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE; i++) {
+		if (cf->cache[i].name_hash != name_hash) {
+			continue;
+		}
+
+		if (cf->cache[i].name_id <= ZMS_NAMECNT_ID) {
+			continue;
+		}
+
+		rc = zms_read(&cf->cf_zms, cf->cache[i].name_id, rdname, len);
+		if (rc < 0) {
+			continue;
+		}
+
+		rdname[rc] = '\0';
+
+		if (strcmp(name, rdname)) {
+			continue;
+		}
+
+		return cf->cache[i].name_id;
+	}
+
+	return ZMS_NAMECNT_ID;
+}
+#endif /* CONFIG_SETTINGS_ZMS_NAME_CACHE */
+
+static int settings_zms_load(struct settings_store *cs, const struct settings_load_arg *arg)
+{
+	int ret = 0;
+	struct settings_zms *cf = CONTAINER_OF(cs, struct settings_zms, cf_store);
+	struct settings_zms_read_fn_arg read_fn_arg;
+	char name[SETTINGS_MAX_NAME_LEN + SETTINGS_EXTRA_LEN + 1];
+	ssize_t rc1, rc2;
+	uint32_t name_id = ZMS_NAMECNT_ID;
+
+#if CONFIG_SETTINGS_ZMS_NAME_CACHE
+	uint32_t cached = 0;
+
+	cf->loaded = false;
+#endif
+
+	name_id = cf->last_name_id + 1;
+
+	while (1) {
+
+		name_id--;
+		if (name_id == ZMS_NAMECNT_ID) {
+#if CONFIG_SETTINGS_ZMS_NAME_CACHE
+			cf->loaded = true;
+			cf->cache_total = cached;
+#endif
+			break;
+		}
+
+		/* In the ZMS backend, each setting item is stored in two ZMS
+		 * entries one for the setting's name and one with the
+		 * setting's value.
+		 */
+		rc1 = zms_read(&cf->cf_zms, name_id, &name, sizeof(name));
+		/* get the length of data and verify that it exists */
+		rc2 = zms_get_data_length(&cf->cf_zms, name_id + ZMS_NAME_ID_OFFSET);
+
+		if ((rc1 <= 0) && (rc2 <= 0)) {
+			/* Settings largest ID in use is invalid due to
+			 * reset, power failure or partition overflow.
+			 * Decrement it and check the next ID in subsequent
+			 * iteration.
+			 */
+			if (name_id == cf->last_name_id) {
+				cf->last_name_id--;
+				zms_write(&cf->cf_zms, ZMS_NAMECNT_ID, &cf->last_name_id,
+					  sizeof(uint32_t));
+			}
+
+			continue;
+		}
+
+		if ((rc1 <= 0) || (rc2 <= 0)) {
+			/* Settings item is not stored correctly in the ZMS.
+			 * ZMS entry for its name or value is either missing
+			 * or deleted. Clean dirty entries to make space for
+			 * future settings item.
+			 */
+			zms_delete(&cf->cf_zms, name_id);
+			zms_delete(&cf->cf_zms, name_id + ZMS_NAME_ID_OFFSET);
+
+			if (name_id == cf->last_name_id) {
+				cf->last_name_id--;
+				zms_write(&cf->cf_zms, ZMS_NAMECNT_ID, &cf->last_name_id,
+					  sizeof(uint32_t));
+			}
+
+			continue;
+		}
+
+		/* Found a name, this might not include a trailing \0 */
+		name[rc1] = '\0';
+		read_fn_arg.fs = &cf->cf_zms;
+		read_fn_arg.id = name_id + ZMS_NAME_ID_OFFSET;
+
+#if CONFIG_SETTINGS_ZMS_NAME_CACHE
+		settings_zms_cache_add(cf, name, name_id);
+		cached++;
+#endif
+
+		ret = settings_call_set_handler(name, rc2, settings_zms_read_fn, &read_fn_arg,
+						(void *)arg);
+		if (ret) {
+			break;
+		}
+	}
+	return ret;
+}
+
+static int settings_zms_save(struct settings_store *cs, const char *name, const char *value,
+			     size_t val_len)
+{
+	struct settings_zms *cf = CONTAINER_OF(cs, struct settings_zms, cf_store);
+	char rdname[SETTINGS_MAX_NAME_LEN + SETTINGS_EXTRA_LEN + 1];
+	uint32_t name_id, write_name_id;
+	bool delete, write_name;
+	int rc = 0;
+
+	if (!name) {
+		return -EINVAL;
+	}
+
+	/* Find out if we are doing a delete */
+	delete = ((value == NULL) || (val_len == 0));
+
+#if CONFIG_SETTINGS_ZMS_NAME_CACHE
+	bool name_in_cache = false;
+
+	name_id = settings_zms_cache_match(cf, name, rdname, sizeof(rdname));
+	if (name_id != ZMS_NAMECNT_ID) {
+		write_name_id = name_id;
+		write_name = false;
+		name_in_cache = true;
+		goto found;
+	}
+#endif
+
+	/* No entry with "name" is in cache, let's find if it exists in the storage */
+	name_id = cf->last_name_id + 1;
+	write_name_id = cf->last_name_id + 1;
+	write_name = true;
+
+#if CONFIG_SETTINGS_ZMS_NAME_CACHE
+	/* We can skip reading ZMS if we know that the cache wasn't overflowed. */
+	if (cf->loaded && !SETTINGS_ZMS_CACHE_OVFL(cf)) {
+		goto found;
+	}
+#endif
+
+	/* Let's find if we already have an ID within storage */
+	while (1) {
+		name_id--;
+		if (name_id == ZMS_NAMECNT_ID) {
+			break;
+		}
+
+		rc = zms_read(&cf->cf_zms, name_id, &rdname, sizeof(rdname));
+
+		if (rc < 0) {
+			/* Error or entry not found */
+			if (rc == -ENOENT) {
+				/* This is a free ID let's keep it */
+				write_name_id = name_id;
+			}
+			continue;
+		}
+
+		rdname[rc] = '\0';
+
+		if (strcmp(name, rdname)) {
+			/* ID exists but the name is different, that's not the ID
+			 * we are looking for.
+			 */
+			continue;
+		}
+
+		/* At this step we found the ID that corresponds to name */
+		if (!delete) {
+			write_name_id = name_id;
+			write_name = false;
+		}
+
+		goto found;
+	}
+
+found:
+	if (delete) {
+		if (name_id == ZMS_NAMECNT_ID) {
+			return 0;
+		}
+
+		rc = zms_delete(&cf->cf_zms, name_id);
+		if (rc >= 0) {
+			rc = zms_delete(&cf->cf_zms, name_id + ZMS_NAME_ID_OFFSET);
+		}
+
+		if (rc < 0) {
+			return rc;
+		}
+
+		if (name_id == cf->last_name_id) {
+			cf->last_name_id--;
+			rc = zms_write(&cf->cf_zms, ZMS_NAMECNT_ID, &cf->last_name_id,
+				       sizeof(uint32_t));
+			if (rc < 0) {
+				/* Error: can't to store
+				 * the largest name ID in use.
+				 */
+				return rc;
+			}
+		}
+
+		return 0;
+	}
+
+	/* No free IDs left. */
+	if (write_name_id == ZMS_NAMECNT_ID + ZMS_NAME_ID_OFFSET - 1) {
+		return -ENOMEM;
+	}
+
+	/* update the last_name_id and write to flash if required*/
+	if (write_name_id > cf->last_name_id) {
+		cf->last_name_id = write_name_id;
+		rc = zms_write(&cf->cf_zms, ZMS_NAMECNT_ID, &cf->last_name_id, sizeof(uint32_t));
+		if (rc < 0) {
+			return rc;
+		}
+	}
+
+	/* write the value */
+	rc = zms_write(&cf->cf_zms, write_name_id + ZMS_NAME_ID_OFFSET, value, val_len);
+	if (rc < 0) {
+		return rc;
+	}
+
+	/* write the name if required */
+	if (write_name) {
+		rc = zms_write(&cf->cf_zms, write_name_id, name, strlen(name));
+		if (rc < 0) {
+			return rc;
+		}
+	}
+
+#if CONFIG_SETTINGS_ZMS_NAME_CACHE
+	if (!name_in_cache) {
+		settings_zms_cache_add(cf, name, write_name_id);
+		if (cf->loaded && !SETTINGS_ZMS_CACHE_OVFL(cf)) {
+			cf->cache_total++;
+		}
+	}
+#endif
+
+	return 0;
+}
+
+/* Initialize the zms backend. */
+int settings_zms_backend_init(struct settings_zms *cf)
+{
+	int rc;
+	uint32_t last_name_id;
+
+	cf->cf_zms.flash_device = cf->flash_dev;
+	if (cf->cf_zms.flash_device == NULL) {
+		return -ENODEV;
+	}
+
+	rc = zms_mount(&cf->cf_zms);
+	if (rc) {
+		return rc;
+	}
+
+	rc = zms_read(&cf->cf_zms, ZMS_NAMECNT_ID, &last_name_id, sizeof(last_name_id));
+	if (rc < 0) {
+		cf->last_name_id = ZMS_NAMECNT_ID;
+	} else {
+		cf->last_name_id = last_name_id;
+	}
+
+	LOG_DBG("Initialized");
+	return 0;
+}
+
+int settings_backend_init(void)
+{
+	static struct settings_zms default_settings_zms;
+	int rc;
+	uint32_t cnt = 0;
+	size_t zms_sector_size, zms_size = 0;
+	const struct flash_area *fa;
+	struct flash_sector hw_flash_sector;
+	uint32_t sector_cnt = 1;
+
+	rc = flash_area_open(SETTINGS_PARTITION, &fa);
+	if (rc) {
+		return rc;
+	}
+
+	rc = flash_area_get_sectors(SETTINGS_PARTITION, &sector_cnt, &hw_flash_sector);
+	if (rc != 0 && rc != -ENOMEM) {
+		return rc;
+	}
+
+	zms_sector_size = CONFIG_SETTINGS_ZMS_SECTOR_SIZE_MULT * hw_flash_sector.fs_size;
+
+	if (zms_sector_size > UINT32_MAX) {
+		return -EDOM;
+	}
+
+	while (cnt < CONFIG_SETTINGS_ZMS_SECTOR_COUNT) {
+		zms_size += zms_sector_size;
+		if (zms_size > fa->fa_size) {
+			break;
+		}
+		cnt++;
+	}
+
+	/* define the zms file system using the page_info */
+	default_settings_zms.cf_zms.sector_size = zms_sector_size;
+	default_settings_zms.cf_zms.sector_count = cnt;
+	default_settings_zms.cf_zms.offset = fa->fa_off;
+	default_settings_zms.flash_dev = fa->fa_dev;
+
+	rc = settings_zms_backend_init(&default_settings_zms);
+	if (rc) {
+		return rc;
+	}
+
+	rc = settings_zms_src(&default_settings_zms);
+
+	if (rc) {
+		return rc;
+	}
+
+	rc = settings_zms_dst(&default_settings_zms);
+
+	return rc;
+}
+
+static void *settings_zms_storage_get(struct settings_store *cs)
+{
+	struct settings_zms *cf = CONTAINER_OF(cs, struct settings_zms, cf_store);
+
+	return &cf->cf_zms;
+}
diff --git a/tests/subsys/settings/zms/CMakeLists.txt b/tests/subsys/settings/zms/CMakeLists.txt
new file mode 100644
index 00000000000..218451c840e
--- /dev/null
+++ b/tests/subsys/settings/zms/CMakeLists.txt
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(test_settings_zms_raw)
+
+add_subdirectory(./src zms_test_bindir)
diff --git a/tests/subsys/settings/zms/prj.conf b/tests/subsys/settings/zms/prj.conf
new file mode 100644
index 00000000000..3de961c7c72
--- /dev/null
+++ b/tests/subsys/settings/zms/prj.conf
@@ -0,0 +1,8 @@
+CONFIG_ZTEST=y
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_ZMS=y
+
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_RUNTIME=y
+CONFIG_SETTINGS_ZMS=y
diff --git a/tests/subsys/settings/zms/src/CMakeLists.txt b/tests/subsys/settings/zms/src/CMakeLists.txt
new file mode 100644
index 00000000000..220a42849a8
--- /dev/null
+++ b/tests/subsys/settings/zms/src/CMakeLists.txt
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2024 BayLibre SAS
+
+zephyr_include_directories(
+	${ZEPHYR_BASE}/subsys/settings/include
+	${ZEPHYR_BASE}/subsys/settings/src
+	${ZEPHYR_BASE}/tests/subsys/settings/zms/src
+	)
+
+target_sources(app PRIVATE settings_test_zms.c)
+
+add_subdirectory(../../src settings_test_bindir)
diff --git a/tests/subsys/settings/zms/src/settings_test.h b/tests/subsys/settings/zms/src/settings_test.h
new file mode 100644
index 00000000000..472ff71f59b
--- /dev/null
+++ b/tests/subsys/settings/zms/src/settings_test.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2024 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef _SETTINGS_TEST_ZMS_H
+#define _SETTINGS_TEST_ZMS_H
+
+#include <stdio.h>
+#include <string.h>
+#include <zephyr/ztest.h>
+
+#include <zephyr/settings/settings.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint8_t val8;
+extern uint8_t val8_un;
+extern uint32_t val32;
+extern uint64_t val64;
+
+extern int test_get_called;
+extern int test_set_called;
+extern int test_commit_called;
+extern int test_export_block;
+
+extern struct settings_handler c_test_handlers[];
+
+void ctest_clear_call_state(void);
+int ctest_get_call_state(void);
+
+void config_wipe_srcs(void);
+void *settings_config_setup(void);
+void settings_config_teardown(void *fixture);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _SETTINGS_TEST_ZMS_H */
diff --git a/tests/subsys/settings/zms/src/settings_test_zms.c b/tests/subsys/settings/zms/src/settings_test_zms.c
new file mode 100644
index 00000000000..17a5ccd56fe
--- /dev/null
+++ b/tests/subsys/settings/zms/src/settings_test_zms.c
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2024 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stdlib.h>
+#include <string.h>
+
+#include "settings_priv.h"
+#include "settings_test.h"
+
+uint8_t val8;
+uint8_t val8_un;
+uint32_t val32;
+uint64_t val64;
+
+int test_get_called;
+int test_set_called;
+int test_commit_called;
+int test_export_block;
+
+int c1_handle_get(const char *name, char *val, int val_len_max);
+int c1_handle_set(const char *name, size_t len, settings_read_cb read_cb, void *cb_arg);
+int c1_handle_commit(void);
+int c1_handle_export(int (*cb)(const char *name, const void *value, size_t val_len));
+
+struct settings_handler c_test_handlers[] = {
+	{.name = "myfoo",
+	 .h_get = c1_handle_get,
+	 .h_set = c1_handle_set,
+	 .h_commit = c1_handle_commit,
+	 .h_export = c1_handle_export},
+};
+
+int c1_handle_get(const char *name, char *val, int val_len_max)
+{
+	const char *next;
+
+	test_get_called = 1;
+
+	if (settings_name_steq(name, "mybar", &next) && !next) {
+		val_len_max = MIN(val_len_max, sizeof(val8));
+		memcpy(val, &val8, MIN(val_len_max, sizeof(val8)));
+		return val_len_max;
+	}
+
+	if (settings_name_steq(name, "mybar64", &next) && !next) {
+		val_len_max = MIN(val_len_max, sizeof(val64));
+		memcpy(val, &val64, MIN(val_len_max, sizeof(val64)));
+		return val_len_max;
+	}
+
+	return -ENOENT;
+}
+
+int c1_handle_set(const char *name, size_t len, settings_read_cb read_cb, void *cb_arg)
+{
+	size_t val_len;
+	int rc;
+	const char *next;
+
+	test_set_called = 1;
+	if (settings_name_steq(name, "mybar", &next) && !next) {
+		rc = read_cb(cb_arg, &val8, sizeof(val8));
+		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
+		return 0;
+	}
+
+	if (settings_name_steq(name, "mybar64", &next) && !next) {
+		rc = read_cb(cb_arg, &val64, sizeof(val64));
+		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
+		return 0;
+	}
+
+	if (settings_name_steq(name, "unaligned", &next) && !next) {
+		val_len = len;
+		zassert_equal(val_len, sizeof(val8_un), "value length: %d, ought equal 1", val_len);
+		rc = read_cb(cb_arg, &val8_un, sizeof(val8_un));
+		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
+		return 0;
+	}
+
+	return -ENOENT;
+}
+
+int c1_handle_commit(void)
+{
+	test_commit_called = 1;
+	return 0;
+}
+
+int c1_handle_export(int (*cb)(const char *name, const void *value, size_t val_len))
+{
+	if (test_export_block) {
+		return 0;
+	}
+
+	(void)cb("myfoo/mybar", &val8, sizeof(val8));
+
+	(void)cb("myfoo/mybar64", &val64, sizeof(val64));
+
+	(void)cb("myfoo/unaligned", &val8_un, sizeof(val8_un));
+
+	return 0;
+}
+
+void ctest_clear_call_state(void)
+{
+	test_get_called = 0;
+	test_set_called = 0;
+	test_commit_called = 0;
+}
+
+int ctest_get_call_state(void)
+{
+	return test_get_called + test_set_called + test_commit_called;
+}
+
+void config_wipe_srcs(void)
+{
+	sys_slist_init(&settings_load_srcs);
+	settings_save_dst = NULL;
+}
+
+ZTEST_SUITE(settings_config, NULL, settings_config_setup, NULL, NULL, settings_config_teardown);
diff --git a/tests/subsys/settings/zms/testcase.yaml b/tests/subsys/settings/zms/testcase.yaml
new file mode 100644
index 00000000000..2234fd4cd78
--- /dev/null
+++ b/tests/subsys/settings/zms/testcase.yaml
@@ -0,0 +1,7 @@
+tests:
+  settings.zms:
+    depends_on: zms
+    min_ram: 32
+    tags:
+      - settings
+      - zms

From 08bc3889776f37bc3f36b05ffb8086937514bc67 Mon Sep 17 00:00:00 2001
From: Kumar Siddaramayya <harish.kumar@nordicsemi.no>
Date: Mon, 23 Sep 2024 15:25:22 +0200
Subject: [PATCH 0117/2913] [nrf fromtree] scripts: logging: dictionary: Add
 uart support

This commit adds support to dictionary logging to parse binary
data directly from input serial and generate the ascii logs.

Signed-off-by: Kumar Siddaramayya <harish.kumar@nordicsemi.no>
(cherry picked from commit a899deda2b0f53802cd232e0cb0f537167571f28)
(cherry picked from commit 3013df9a21016514626c033899d2a461ab16939b)
(cherry picked from commit a7861b0621503ceb6044f83df182dfdad46c0f6f)
---
 scripts/logging/dictionary/log_parser.py      | 32 ++--------
 scripts/logging/dictionary/log_parser_uart.py | 64 +++++++++++++++++++
 scripts/logging/dictionary/parserlib.py       | 50 +++++++++++++++
 3 files changed, 118 insertions(+), 28 deletions(-)
 create mode 100755 scripts/logging/dictionary/log_parser_uart.py
 create mode 100755 scripts/logging/dictionary/parserlib.py

diff --git a/scripts/logging/dictionary/log_parser.py b/scripts/logging/dictionary/log_parser.py
index c2b20b0fda9..3d4d8253faf 100755
--- a/scripts/logging/dictionary/log_parser.py
+++ b/scripts/logging/dictionary/log_parser.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 #
 # Copyright (c) 2021 Intel Corporation
+# Copyright (c) 2024 Nordic Semiconductor ASA
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -17,8 +18,7 @@
 import sys
 
 import dictionary_parser
-from dictionary_parser.log_database import LogDatabase
-
+import parserlib
 
 LOGGER_FORMAT = "%(message)s"
 logger = logging.getLogger("parser")
@@ -47,6 +47,7 @@ def read_log_file(args):
     Read the log from file
     """
     logdata = None
+    hexdata = ''
 
     # Open log data file for reading
     if args.hex:
@@ -100,7 +101,6 @@ def read_log_file(args):
 
     return logdata
 
-
 def main():
     """Main function of log parser"""
     args = parse_args()
@@ -112,36 +112,12 @@ def main():
     else:
         logger.setLevel(logging.INFO)
 
-    # Read from database file
-    database = LogDatabase.read_json_database(args.dbfile)
-    if database is None:
-        logger.error("ERROR: Cannot open database file: %s, exiting...", args.dbfile)
-        sys.exit(1)
-
     logdata = read_log_file(args)
     if logdata is None:
         logger.error("ERROR: cannot read log from file: %s, exiting...", args.logfile)
         sys.exit(1)
 
-    log_parser = dictionary_parser.get_parser(database)
-    if log_parser is not None:
-        logger.debug("# Build ID: %s", database.get_build_id())
-        logger.debug("# Target: %s, %d-bit", database.get_arch(), database.get_tgt_bits())
-        if database.is_tgt_little_endian():
-            logger.debug("# Endianness: Little")
-        else:
-            logger.debug("# Endianness: Big")
-
-        logger.debug("# Database version: %d", database.get_version())
-
-        ret = log_parser.parse_log_data(logdata, debug=args.debug)
-        if not ret:
-            logger.error("ERROR: there were error(s) parsing log data")
-            sys.exit(1)
-    else:
-        logger.error("ERROR: Cannot find a suitable parser matching database version!")
-        sys.exit(1)
-
+    parserlib.parser(logdata, args.dbfile, logger)
 
 if __name__ == "__main__":
     main()
diff --git a/scripts/logging/dictionary/log_parser_uart.py b/scripts/logging/dictionary/log_parser_uart.py
new file mode 100755
index 00000000000..6426644096b
--- /dev/null
+++ b/scripts/logging/dictionary/log_parser_uart.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python3
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+
+"""
+Log Parser for Dictionary-based Logging
+
+This uses the JSON database file to decode the binary
+log data taken directly from input serialport and print
+the log messages.
+"""
+
+import serial
+import time
+import argparse
+import logging
+import sys
+
+import parserlib
+
+LOGGER_FORMAT = "%(message)s"
+logger = logging.getLogger("parser")
+
+def parse_args():
+    """Parse command line arguments"""
+    argparser = argparse.ArgumentParser(allow_abbrev=False)
+
+    argparser.add_argument("dbfile", help="Dictionary Logging Database file")
+    argparser.add_argument("serialPort", help="Port where the logs are generated")
+    argparser.add_argument("baudrate", help="Serial Port baud rate")
+    argparser.add_argument("--debug", action="store_true",
+                           help="Print extra debugging information")
+
+    return argparser.parse_args()
+
+def main():
+    """function of serial parser"""
+    args = parse_args()
+
+    if args.dbfile is None or '.json' not in args.dbfile:
+        logger.error("ERROR: invalid log database path: %s, exiting...", args.dbfile)
+        sys.exit(1)
+
+    logging.basicConfig(format=LOGGER_FORMAT)
+
+    if args.debug:
+        logger.setLevel(logging.DEBUG)
+    else:
+        logger.setLevel(logging.INFO)
+
+    # Parse the log every second from serial port
+    with serial.Serial(args.serialPort, args.baudrate) as ser:
+        ser.timeout = 2
+        while True:
+            size = ser.inWaiting()
+            if size:
+                data = ser.read(size)
+                parserlib.parser(data, args.dbfile, logger)
+            time.sleep(1)
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/logging/dictionary/parserlib.py b/scripts/logging/dictionary/parserlib.py
new file mode 100755
index 00000000000..7e1d0a33b7d
--- /dev/null
+++ b/scripts/logging/dictionary/parserlib.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+#
+# Copyright (c) 2021 Intel Corporation
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+
+"""
+Parser library for Dictionary-based Logging
+
+This library along with dictionary_parser converts the
+input binary data to the log using log database.
+"""
+import sys
+import logging
+
+import dictionary_parser
+from dictionary_parser.log_database import LogDatabase
+
+def parser(logdata, dbfile, logger):
+    """function of serial parser"""
+    # Read from database file
+    database = LogDatabase.read_json_database(dbfile)
+
+    if not isinstance(logger, logging.Logger):
+        raise ValueError("Invalid logger instance. Please configure the logger!")
+
+    if database is None:
+        logger.error("ERROR: Cannot open database file:  exiting...")
+        sys.exit(1)
+
+    if logdata is None:
+        logger.error("ERROR: cannot read log from file:  exiting...")
+        sys.exit(1)
+
+    log_parser = dictionary_parser.get_parser(database)
+    if log_parser is not None:
+        logger.debug("# Build ID: %s", database.get_build_id())
+        logger.debug("# Target: %s, %d-bit", database.get_arch(), database.get_tgt_bits())
+        if database.is_tgt_little_endian():
+            logger.debug("# Endianness: Little")
+        else:
+            logger.debug("# Endianness: Big")
+
+        ret = log_parser.parse_log_data(logdata)
+        if not ret:
+            logger.error("ERROR: there were error(s) parsing log data")
+            sys.exit(1)
+    else:
+        logger.error("ERROR: Cannot find a suitable parser matching database version!")

From 8652e86b6c4d42a5aacf3bad9ad7b492be29f98a Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Thu, 10 Oct 2024 13:37:18 +0200
Subject: [PATCH 0118/2913] [nrf fromtree] drivers: mbox: nrf_vevif_task_rx:
 align to direct IRQs

Allow using direct IRQs (which are obligatory when buiding
with `CONFIG_GEN_SW_ISR_TABLE=n`).

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
(cherry picked from commit a5558380330f1a00d454b9bbf25001df905e7b55)
(cherry picked from commit 073a8950ab57e45b139b958f4c1247554eb84110)
(cherry picked from commit 22ec1bce63578582ad04d1abb35c1d6eda29006c)
---
 drivers/mbox/mbox_nrf_vevif_task_rx.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/drivers/mbox/mbox_nrf_vevif_task_rx.c b/drivers/mbox/mbox_nrf_vevif_task_rx.c
index 8a4d81e0e6e..a489d4d3717 100644
--- a/drivers/mbox/mbox_nrf_vevif_task_rx.c
+++ b/drivers/mbox/mbox_nrf_vevif_task_rx.c
@@ -116,9 +116,25 @@ static const struct mbox_driver_api vevif_task_rx_driver_api = {
 	.set_enabled = vevif_task_rx_set_enabled,
 };
 
+#if defined(CONFIG_GEN_SW_ISR_TABLE)
 #define VEVIF_IRQ_CONNECT(idx, _)                                                                  \
 	IRQ_CONNECT(DT_INST_IRQ_BY_IDX(0, idx, irq), DT_INST_IRQ_BY_IDX(0, idx, priority),         \
 		    vevif_task_rx_isr, &vevif_irqs[idx], 0)
+#else
+
+#define VEVIF_IRQ_FUN(idx, _)                 \
+ISR_DIRECT_DECLARE(vevif_task_##idx##_rx_isr) \
+{                                             \
+	vevif_task_rx_isr(&vevif_irqs[idx]);  \
+	return 1;                             \
+}
+
+LISTIFY(DT_NUM_IRQS(DT_DRV_INST(0)), VEVIF_IRQ_FUN, ())
+
+#define VEVIF_IRQ_CONNECT(idx, _)                                                                 \
+	IRQ_DIRECT_CONNECT(DT_INST_IRQ_BY_IDX(0, idx, irq), DT_INST_IRQ_BY_IDX(0, idx, priority), \
+		    vevif_task_##idx##_rx_isr, 0)
+#endif
 
 static int vevif_task_rx_init(const struct device *dev)
 {

From ac0c34135f7773c9889ea2aefa35957bd8b1a1bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 25 Sep 2024 16:11:14 +0200
Subject: [PATCH 0119/2913] [nrf fromtree] debug: mipi_stp_decoder: Avoid
 potential 64bit unaligned access
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Decoder was casting uint8_t pointers to uint64_t pointers which could
result in double word instruction which does not support unaligned
access on Cortex-M. Issue was revealed when -O3 optimization was
used instead of -Os. In size optimized version, compiler was
using word load and store instructions which support unaligned
access and issue was not visible.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit ddf753cdaca2c06b0b69a26076564838c38cdc1f)
(cherry picked from commit 9a51d12941f21531d175d4bb1883cbbcb27635d0)
(cherry picked from commit b62fb6048a5e3c17978d72798fe5a0a931714387)
---
 subsys/debug/mipi_stp_decoder.c | 35 +++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/subsys/debug/mipi_stp_decoder.c b/subsys/debug/mipi_stp_decoder.c
index ce2478350e4..89ae7a8e0aa 100644
--- a/subsys/debug/mipi_stp_decoder.c
+++ b/subsys/debug/mipi_stp_decoder.c
@@ -461,36 +461,41 @@ static inline void get_nibbles64(const uint8_t *src, size_t src_noff, uint8_t *d
 {
 	bool src_ba = (src_noff & 0x1UL) == 0;
 	bool dst_ba = (dst_noff & 0x1UL) == 0;
-	uint64_t *src64 = (uint64_t *)&src[src_noff / 2];
-	uint64_t *dst64 = (uint64_t *)&dst[dst_noff / 2];
+	uint32_t *src32 = (uint32_t *)&src[src_noff / 2];
+	uint32_t *dst32 = (uint32_t *)&dst[dst_noff / 2];
 
 	if (nlen == 16) {
 		/* dst must be aligned. */
 		if (src_ba) {
-			uint32_t *s32 = (uint32_t *)src64;
-			uint32_t *d32 = (uint32_t *)dst64;
-
-			d32[0] = s32[0];
-			d32[1] = s32[1];
+			dst32[0] = src32[0];
+			dst32[1] = src32[1];
 		} else {
-			uint64_t part_a = src64[0] >> 4;
-			uint64_t part_b = src64[1] << 60;
-
-			dst64[0] = part_a | part_b;
+			uint64_t src0 = src32[0] | ((uint64_t)src32[1] << 32);
+			uint64_t src1 = src32[2] | ((uint64_t)src32[3] << 32);
+			uint64_t part_a = src0 >> 4;
+			uint64_t part_b = src1 << 60;
+			uint64_t out = part_a | part_b;
+
+			dst32[0] = (uint32_t)out;
+			dst32[1] = (uint32_t)(out >> 32);
 		}
 		return;
 	}
 
+	uint64_t src0 = src32[0] | ((uint64_t)src32[1] << 32);
 	uint64_t mask = BIT64_MASK(nlen * 4) << (src_ba ? 0 : 4);
-	uint64_t src_d = src64[0] & mask;
+	uint64_t src_d = src0 & mask;
 
 	if (((src_noff ^ dst_noff) & 0x1UL) == 0) {
-		dst64[0] |= src_d;
+		/* nothing */
 	} else if (dst_ba) {
-		dst64[0] |= (src_d >> 4);
+		src_d >>= 4;
 	} else {
-		dst64[0] |= (src_d << 4);
+		src_d <<= 4;
 	}
+
+	dst32[0] |= (uint32_t)src_d;
+	dst32[1] |= (uint32_t)(src_d >> 32);
 }
 
 /* Function performs getting nibbles in less efficient way but does not use unaligned

From ccd6e0214bff6d52f9583793fab3e8236db54edd Mon Sep 17 00:00:00 2001
From: Arif Balik <arif.balik@enda.com>
Date: Thu, 26 Sep 2024 16:13:53 +0300
Subject: [PATCH 0120/2913] [nrf fromtree] logging: backend: add semihosting

Added semihosting support in logging backend

Signed-off-by: Arif Balik <arif.balik@enda.com>
(cherry picked from commit 8742d9f25efc4e10acf7351e46915a444f2059f6)
(cherry picked from commit 5b88fd8ba42f94b0c022e96f61ed4fff05a2ce44)
(cherry picked from commit f77b6987de0977d34941c1aa90e1e7a04174bb04)
---
 subsys/logging/backends/CMakeLists.txt        |  5 ++
 subsys/logging/backends/Kconfig               |  1 +
 subsys/logging/backends/Kconfig.semihost      | 30 ++++++++
 .../logging/backends/log_backend_semihost.c   | 71 +++++++++++++++++++
 4 files changed, 107 insertions(+)
 create mode 100644 subsys/logging/backends/Kconfig.semihost
 create mode 100644 subsys/logging/backends/log_backend_semihost.c

diff --git a/subsys/logging/backends/CMakeLists.txt b/subsys/logging/backends/CMakeLists.txt
index 5c631ca524f..7ab40c8cb30 100644
--- a/subsys/logging/backends/CMakeLists.txt
+++ b/subsys/logging/backends/CMakeLists.txt
@@ -74,3 +74,8 @@ zephyr_sources_ifdef(
   CONFIG_LOG_BACKEND_IPC_SERVICE
   log_backend_ipc_service.c
 )
+
+zephyr_sources_ifdef(
+  CONFIG_LOG_BACKEND_SEMIHOST
+  log_backend_semihost.c
+)
diff --git a/subsys/logging/backends/Kconfig b/subsys/logging/backends/Kconfig
index 545847d103f..960aeb20c2a 100644
--- a/subsys/logging/backends/Kconfig
+++ b/subsys/logging/backends/Kconfig
@@ -16,5 +16,6 @@ rsource "Kconfig.swo"
 rsource "Kconfig.uart"
 rsource "Kconfig.xtensa_sim"
 rsource "Kconfig.multidomain"
+rsource "Kconfig.semihost"
 
 endmenu
diff --git a/subsys/logging/backends/Kconfig.semihost b/subsys/logging/backends/Kconfig.semihost
new file mode 100644
index 00000000000..10a6da8f2e7
--- /dev/null
+++ b/subsys/logging/backends/Kconfig.semihost
@@ -0,0 +1,30 @@
+# Copyright (c) 2024 Contributors to the logging subsystem.
+# SPDX-License-Identifier: Apache-2.0
+
+config LOG_BACKEND_SEMIHOST
+	bool "Semihost as backend"
+	depends on SEMIHOST
+	select LOG_OUTPUT
+	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
+	help
+	  Enable backend in semihost (using host stdout)
+
+if LOG_BACKEND_SEMIHOST
+
+config LOG_BACKEND_SEMIHOST_BUFFER_SIZE
+	int "Size of reserved up-buffer for logger output."
+	default 256
+	help
+	  Specify reserved size of up-buffer used for logger output.
+
+config LOG_BACKEND_SEMIHOST_AUTOSTART
+	bool "Autostart semihost backend"
+	default y
+	help
+	  Enable semihost backend to start automatically.
+
+backend = SEMIHOST
+backend-str = semihost
+source "subsys/logging/Kconfig.template.log_format_config"
+
+endif # LOG_BACKEND_SEMIHOST
diff --git a/subsys/logging/backends/log_backend_semihost.c b/subsys/logging/backends/log_backend_semihost.c
new file mode 100644
index 00000000000..8bada8051c1
--- /dev/null
+++ b/subsys/logging/backends/log_backend_semihost.c
@@ -0,0 +1,71 @@
+/* Copyright (c) 2024 Contributors to the logging subsystem.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stdio.h>
+#include <stddef.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_backend_std.h>
+#include <zephyr/logging/log_core.h>
+#include <zephyr/logging/log_output.h>
+#include <zephyr/arch/common/semihost.h>
+
+static uint8_t buf[CONFIG_LOG_BACKEND_SEMIHOST_BUFFER_SIZE];
+static uint32_t log_format_current = CONFIG_LOG_BACKEND_SEMIHOST_OUTPUT_DEFAULT;
+
+static int char_out(uint8_t *data, size_t length, void *ctx)
+{
+	ARG_UNUSED(ctx);
+#define SEMIHOST_STDOUT (1)
+	int ret = semihost_write(SEMIHOST_STDOUT, data, length);
+
+	if (ret) {
+		return ret;
+	}
+
+	return length;
+}
+
+LOG_OUTPUT_DEFINE(log_output_semihost, char_out, buf, sizeof(buf));
+
+static void panic(struct log_backend const *const backend)
+{
+	ARG_UNUSED(backend);
+
+	log_output_flush(&log_output_semihost);
+}
+
+static void dropped(const struct log_backend *const backend, uint32_t cnt)
+{
+	ARG_UNUSED(backend);
+
+	log_output_dropped_process(&log_output_semihost, cnt);
+}
+
+static void process(const struct log_backend *const backend, union log_msg_generic *msg)
+{
+	ARG_UNUSED(backend);
+
+	uint32_t flags = log_backend_std_get_flags();
+
+	log_format_func_t log_output_func = log_format_func_t_get(log_format_current);
+
+	log_output_func(&log_output_semihost, &msg->log, flags);
+}
+
+static int format_set(const struct log_backend *const backend, uint32_t log_type)
+{
+	ARG_UNUSED(backend);
+
+	log_format_current = log_type;
+	return 0;
+}
+
+const struct log_backend_api log_backend_semihost_api = {
+	.process = process,
+	.panic = panic,
+	.dropped = IS_ENABLED(CONFIG_LOG_MODE_IMMEDIATE) ? NULL : dropped,
+	.format_set = format_set,
+};
+
+LOG_BACKEND_DEFINE(log_backend_semihost, log_backend_semihost_api,
+		   IS_ENABLED(CONFIG_LOG_BACKEND_SEMIHOST_AUTOSTART));

From 3e5c5ff4cb0d2347f6f2e3e2ed3c9723b3c50f0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 7 Oct 2024 15:38:32 +0200
Subject: [PATCH 0121/2913] [nrf fromtree] logging: log_output: Move flushing
 and writing to the header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move log_output_flush and log_output_write (renamed internal
buffer_write() function) to the header as inline functions.
Those function are used by log_output_dict.c and there are cases
when log_output.c is not compiled in.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit df683fd7f816f88508068f85ff5ded3a012d1e58)
(cherry picked from commit e3ddbd6f49f66708dd354dce6a40de87865b4abb)
(cherry picked from commit 7c1363f5194208ffa4a9a32a7d0d38ed00d3cd4e)
---
 include/zephyr/logging/log_output.h | 25 +++++++++++++++++++++++-
 subsys/logging/log_output.c         | 30 +++--------------------------
 subsys/logging/log_output_dict.c    | 24 ++++++-----------------
 3 files changed, 33 insertions(+), 46 deletions(-)

diff --git a/include/zephyr/logging/log_output.h b/include/zephyr/logging/log_output.h
index 0ef3fe9a2f2..46b59520a68 100644
--- a/include/zephyr/logging/log_output.h
+++ b/include/zephyr/logging/log_output.h
@@ -190,11 +190,34 @@ void log_output_msg_syst_process(const struct log_output *log_output,
  */
 void log_output_dropped_process(const struct log_output *output, uint32_t cnt);
 
+/** @brief Write to the output buffer.
+ *
+ * @param outf Output function.
+ * @param buf  Buffer.
+ * @param len  Buffer length.
+ * @param ctx  Context passed to the %p outf.
+ */
+static inline void log_output_write(log_output_func_t outf, uint8_t *buf, size_t len, void *ctx)
+{
+	int processed;
+
+	while (len != 0) {
+		processed = outf(buf, len, ctx);
+		len -= processed;
+		buf += processed;
+	}
+}
+
 /** @brief Flush output buffer.
  *
  * @param output Pointer to the log output instance.
  */
-void log_output_flush(const struct log_output *output);
+static inline void log_output_flush(const struct log_output *output)
+{
+	log_output_write(output->func, output->buf, output->control_block->offset,
+			 output->control_block->ctx);
+	output->control_block->offset = 0;
+}
 
 /** @brief Function for setting user context passed to the output function.
  *
diff --git a/subsys/logging/log_output.c b/subsys/logging/log_output.c
index 1a2fb4f72c7..187277d0493 100644
--- a/subsys/logging/log_output.c
+++ b/subsys/logging/log_output.c
@@ -148,28 +148,6 @@ static int print_formatted(const struct log_output *output,
 	return length;
 }
 
-static void buffer_write(log_output_func_t outf, uint8_t *buf, size_t len,
-			 void *ctx)
-{
-	int processed;
-
-	while (len != 0) {
-		processed = outf(buf, len, ctx);
-		len -= processed;
-		buf += processed;
-	}
-}
-
-
-void log_output_flush(const struct log_output *output)
-{
-	buffer_write(output->func, output->buf,
-		     output->control_block->offset,
-		     output->control_block->ctx);
-
-	output->control_block->offset = 0;
-}
-
 static inline bool is_leap_year(uint32_t year)
 {
 	return (((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0));
@@ -741,11 +719,9 @@ void log_output_dropped_process(const struct log_output *output, uint32_t cnt)
 	cnt = MIN(cnt, 9999);
 	len = snprintk(buf, sizeof(buf), "%d", cnt);
 
-	buffer_write(outf, (uint8_t *)prefix, sizeof(prefix) - 1,
-		     output->control_block->ctx);
-	buffer_write(outf, buf, len, output->control_block->ctx);
-	buffer_write(outf, (uint8_t *)postfix, sizeof(postfix) - 1,
-		     output->control_block->ctx);
+	log_output_write(outf, (uint8_t *)prefix, sizeof(prefix) - 1, output->control_block->ctx);
+	log_output_write(outf, buf, len, output->control_block->ctx);
+	log_output_write(outf, (uint8_t *)postfix, sizeof(postfix) - 1, output->control_block->ctx);
 }
 
 void log_output_timestamp_freq_set(uint32_t frequency)
diff --git a/subsys/logging/log_output_dict.c b/subsys/logging/log_output_dict.c
index 79b99b3b15e..897484af74e 100644
--- a/subsys/logging/log_output_dict.c
+++ b/subsys/logging/log_output_dict.c
@@ -12,18 +12,6 @@
 #include <zephyr/sys/__assert.h>
 #include <zephyr/sys/util.h>
 
-static void buffer_write(log_output_func_t outf, uint8_t *buf, size_t len,
-			 void *ctx)
-{
-	int processed;
-
-	do {
-		processed = outf(buf, len, ctx);
-		len -= processed;
-		buf += processed;
-	} while (len != 0);
-}
-
 void log_dict_output_msg_process(const struct log_output *output,
 				 struct log_msg *msg, uint32_t flags)
 {
@@ -44,19 +32,19 @@ void log_dict_output_msg_process(const struct log_output *output,
 					log_const_source_id(source)) :
 				0U;
 
-	buffer_write(output->func, (uint8_t *)&output_hdr, sizeof(output_hdr),
-		     (void *)output->control_block->ctx);
+	log_output_write(output->func, (uint8_t *)&output_hdr, sizeof(output_hdr),
+			 (void *)output->control_block->ctx);
 
 	size_t len;
 	uint8_t *data = log_msg_get_package(msg, &len);
 
 	if (len > 0U) {
-		buffer_write(output->func, data, len, (void *)output->control_block->ctx);
+		log_output_write(output->func, data, len, (void *)output->control_block->ctx);
 	}
 
 	data = log_msg_get_data(msg, &len);
 	if (len > 0U) {
-		buffer_write(output->func, data, len, (void *)output->control_block->ctx);
+		log_output_write(output->func, data, len, (void *)output->control_block->ctx);
 	}
 
 	log_output_flush(output);
@@ -69,6 +57,6 @@ void log_dict_output_dropped_process(const struct log_output *output, uint32_t c
 	msg.type = MSG_DROPPED_MSG;
 	msg.num_dropped_messages = MIN(cnt, 9999);
 
-	buffer_write(output->func, (uint8_t *)&msg, sizeof(msg),
-		     (void *)output->control_block->ctx);
+	log_output_write(output->func, (uint8_t *)&msg, sizeof(msg),
+			 (void *)output->control_block->ctx);
 }

From ea1b04e7f7e2c4cb9db05410d0d4e972b2230d1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 7 Oct 2024 15:41:12 +0200
Subject: [PATCH 0122/2913] [nrf fromtree] logging: Fix LOG_OUTPUT dependency
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When CONFIG_LOG_OUTPUT is set, it indicates that logging strings
are formatted by the application (using log_output module). It is
not needed when backend works in the dictionary mode. So far
LOG_OUTPUT was set also when dictionary mode was used and that
prevented removing of the logging strings from binary which is
an important feature of the dictionary logging.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 8652e8e413bb3df0215b51e27f696da3847c80cf)
(cherry picked from commit 77c82588b2866c6bde6c1ae2f294362693837681)
(cherry picked from commit 4cea8a3697d338a9ac17242db40fae478d1a37ef)
---
 subsys/logging/Kconfig.template.log_format_config | 1 +
 subsys/logging/backends/Kconfig.adsp              | 1 -
 subsys/logging/backends/Kconfig.adsp_mtrace       | 1 -
 subsys/logging/backends/Kconfig.ble               | 1 -
 subsys/logging/backends/Kconfig.efi_console       | 1 -
 subsys/logging/backends/Kconfig.fs                | 1 -
 subsys/logging/backends/Kconfig.native_posix      | 1 -
 subsys/logging/backends/Kconfig.net               | 1 -
 subsys/logging/backends/Kconfig.rtt               | 1 -
 subsys/logging/backends/Kconfig.semihost          | 1 -
 subsys/logging/backends/Kconfig.spinel            | 1 -
 subsys/logging/backends/Kconfig.swo               | 1 -
 subsys/logging/backends/Kconfig.uart              | 1 -
 subsys/logging/backends/Kconfig.xtensa_sim        | 1 -
 14 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/subsys/logging/Kconfig.template.log_format_config b/subsys/logging/Kconfig.template.log_format_config
index 14e112e4879..3a5a97c948f 100644
--- a/subsys/logging/Kconfig.template.log_format_config
+++ b/subsys/logging/Kconfig.template.log_format_config
@@ -7,6 +7,7 @@ choice "LOG_BACKEND_$(backend)_OUTPUT"
 
 config LOG_BACKEND_$(backend)_OUTPUT_TEXT
 	bool "Text"
+	select LOG_OUTPUT
 	help
 	  Output in text.
 
diff --git a/subsys/logging/backends/Kconfig.adsp b/subsys/logging/backends/Kconfig.adsp
index 67b37856ec5..97856827c8a 100644
--- a/subsys/logging/backends/Kconfig.adsp
+++ b/subsys/logging/backends/Kconfig.adsp
@@ -4,7 +4,6 @@
 config LOG_BACKEND_ADSP
 	bool "Intel ADSP buffer backend"
 	depends on SOC_FAMILY_INTEL_ADSP
-	select LOG_OUTPUT
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
 	  Enable backend for the host trace protocol of the Intel ADSP
diff --git a/subsys/logging/backends/Kconfig.adsp_mtrace b/subsys/logging/backends/Kconfig.adsp_mtrace
index 18d570c9a8d..98a63b62100 100644
--- a/subsys/logging/backends/Kconfig.adsp_mtrace
+++ b/subsys/logging/backends/Kconfig.adsp_mtrace
@@ -4,7 +4,6 @@
 config LOG_BACKEND_ADSP_MTRACE
 	bool "Intel ADSP mtrace backend"
 	depends on SOC_FAMILY_INTEL_ADSP
-	select LOG_OUTPUT
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
 	  Provide a logging backend which writes to SRAM window
diff --git a/subsys/logging/backends/Kconfig.ble b/subsys/logging/backends/Kconfig.ble
index 016573c0f7b..378577891f7 100644
--- a/subsys/logging/backends/Kconfig.ble
+++ b/subsys/logging/backends/Kconfig.ble
@@ -5,7 +5,6 @@ config LOG_BACKEND_BLE
 	bool "Bluetooth Low Energy (BLE) backend"
 	depends on BT
 	depends on LOG_PROCESS_THREAD_STACK_SIZE>=2048
-	select LOG_OUTPUT
 	select EXPERIMENTAL
 	help
 	  Backend that sends log messages over Bluetooth LE Notifications. This
diff --git a/subsys/logging/backends/Kconfig.efi_console b/subsys/logging/backends/Kconfig.efi_console
index 13d873dfc8e..ddace16ae8c 100644
--- a/subsys/logging/backends/Kconfig.efi_console
+++ b/subsys/logging/backends/Kconfig.efi_console
@@ -4,7 +4,6 @@
 config LOG_BACKEND_EFI_CONSOLE
 	bool "EFI_CONSOLE backend"
 	depends on X86_EFI_CONSOLE
-	select LOG_OUTPUT
 	default y if !UART_CONSOLE
 	help
 	  When enabled backend is using EFI CONSOLE to output logs.
diff --git a/subsys/logging/backends/Kconfig.fs b/subsys/logging/backends/Kconfig.fs
index d424f781ab1..185014283cc 100644
--- a/subsys/logging/backends/Kconfig.fs
+++ b/subsys/logging/backends/Kconfig.fs
@@ -4,7 +4,6 @@
 config LOG_BACKEND_FS
 	bool "File system backend"
 	depends on FILE_SYSTEM
-	select LOG_OUTPUT
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
 	  When enabled, backend is using the configured file system to output logs.
diff --git a/subsys/logging/backends/Kconfig.native_posix b/subsys/logging/backends/Kconfig.native_posix
index 8d566124f81..776e9ce54ad 100644
--- a/subsys/logging/backends/Kconfig.native_posix
+++ b/subsys/logging/backends/Kconfig.native_posix
@@ -5,7 +5,6 @@ config LOG_BACKEND_NATIVE_POSIX
 	bool "Native backend"
 	depends on ARCH_POSIX
 	default y
-	select LOG_OUTPUT
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
 	  Enable backend in native_posix
diff --git a/subsys/logging/backends/Kconfig.net b/subsys/logging/backends/Kconfig.net
index 5c91b68b166..5d7c8a4d919 100644
--- a/subsys/logging/backends/Kconfig.net
+++ b/subsys/logging/backends/Kconfig.net
@@ -6,7 +6,6 @@
 config LOG_BACKEND_NET
 	bool "Networking backend"
 	depends on NETWORKING && (NET_UDP || NET_TCP) && !LOG_MODE_IMMEDIATE
-	select LOG_OUTPUT
 	help
 	  Send syslog messages to network server.
 	  See RFC 5424 (syslog protocol) and RFC 5426 (syslog over UDP) and
diff --git a/subsys/logging/backends/Kconfig.rtt b/subsys/logging/backends/Kconfig.rtt
index 87e8f46a0de..e275f9b18f2 100644
--- a/subsys/logging/backends/Kconfig.rtt
+++ b/subsys/logging/backends/Kconfig.rtt
@@ -6,7 +6,6 @@ config LOG_BACKEND_RTT
 	depends on USE_SEGGER_RTT
 	default y if !SHELL_BACKEND_RTT
 	select SEGGER_RTT_CUSTOM_LOCKING
-	select LOG_OUTPUT
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
 	  When enabled, backend will use RTT for logging. This backend works on a per
diff --git a/subsys/logging/backends/Kconfig.semihost b/subsys/logging/backends/Kconfig.semihost
index 10a6da8f2e7..7861fce8a63 100644
--- a/subsys/logging/backends/Kconfig.semihost
+++ b/subsys/logging/backends/Kconfig.semihost
@@ -4,7 +4,6 @@
 config LOG_BACKEND_SEMIHOST
 	bool "Semihost as backend"
 	depends on SEMIHOST
-	select LOG_OUTPUT
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
 	  Enable backend in semihost (using host stdout)
diff --git a/subsys/logging/backends/Kconfig.spinel b/subsys/logging/backends/Kconfig.spinel
index 6174abb6122..d2d29370aa3 100644
--- a/subsys/logging/backends/Kconfig.spinel
+++ b/subsys/logging/backends/Kconfig.spinel
@@ -5,7 +5,6 @@ config LOG_BACKEND_SPINEL
 	bool "OpenThread dedicated Spinel protocol backend"
 	depends on !LOG_BACKEND_UART
 	depends on NET_L2_OPENTHREAD
-	select LOG_OUTPUT
 	help
 	  When enabled, backend will use OpenThread dedicated SPINEL protocol for logging.
 	  This protocol is byte oriented and wraps given messages into serial frames.
diff --git a/subsys/logging/backends/Kconfig.swo b/subsys/logging/backends/Kconfig.swo
index dc38041fead..5fabe50b62e 100644
--- a/subsys/logging/backends/Kconfig.swo
+++ b/subsys/logging/backends/Kconfig.swo
@@ -4,7 +4,6 @@
 config LOG_BACKEND_SWO
 	bool "Serial Wire Output (SWO) backend"
 	depends on HAS_SWO
-	select LOG_OUTPUT
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
 	  When enabled, backend will use SWO for logging.
diff --git a/subsys/logging/backends/Kconfig.uart b/subsys/logging/backends/Kconfig.uart
index 954168d93ed..e7325c633e8 100644
--- a/subsys/logging/backends/Kconfig.uart
+++ b/subsys/logging/backends/Kconfig.uart
@@ -5,7 +5,6 @@ config LOG_BACKEND_UART
 	bool "UART backend"
 	depends on UART_CONSOLE
 	default y if !SHELL_BACKEND_SERIAL && !SHELL_BACKEND_RTT
-	select LOG_OUTPUT
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
 	  When enabled backend is using UART to output logs.
diff --git a/subsys/logging/backends/Kconfig.xtensa_sim b/subsys/logging/backends/Kconfig.xtensa_sim
index cdf1526f00b..6b81914cf2d 100644
--- a/subsys/logging/backends/Kconfig.xtensa_sim
+++ b/subsys/logging/backends/Kconfig.xtensa_sim
@@ -5,7 +5,6 @@ config LOG_BACKEND_XTENSA_SIM
 	bool "Xtensa simulator backend"
 	depends on SOC_XTENSA_SAMPLE_CONTROLLER || SOC_XTENSA_DC233C || SOC_FAMILY_INTEL_ADSP
 	default y if SOC_XTENSA_SAMPLE_CONTROLLER || SOC_XTENSA_DC233C
-	select LOG_OUTPUT
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
 	  Enable backend in xtensa simulator

From 70a55ee64ddcdd70550eb22ee48a727b7dfe7a76 Mon Sep 17 00:00:00 2001
From: Li Long <li.long@nxp.com>
Date: Fri, 20 Sep 2024 13:35:08 +0800
Subject: [PATCH 0123/2913] [nrf fromtree] west: hostap: update hostap revision
 to PR

Update hostap revision to PR

Signed-off-by: Li Long <li.long@nxp.com>
(cherry picked from commit 04e1b71f5c0a5b440288769bb280ec02b20d41f5)
(cherry picked from commit 77ebe185e03c3eae7ed42af82f1f6ac91ba466c2)
(cherry picked from commit e76065e5e12c8e901e15d5ae74c8c308826d7927)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 241102be58f..df5abf02595 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: cbae0170437dbe196d436b2b53d7aefb97044b0c
+      revision: f801840e246f47c9e895c540d0784f09726136c4
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From b19fb2f24f0a637669ee9be33bf6a3bcea09dabc Mon Sep 17 00:00:00 2001
From: Vivekananda Uppunda <vivekananda.uppunda@nordicsemi.no>
Date: Thu, 26 Sep 2024 07:26:55 +0530
Subject: [PATCH 0124/2913] [nrf fromtree] manifest: Pull PRF-256 PSA based
 wrapper API for supplicant

This pulls in PRF-256 wrapper API based on PSA APIs. This implements
PRF-256 as per section 11.6.1.7.2 in 802.11ac using PSA APIs.

Signed-off-by: Vivekananda Uppunda <vivekananda.uppunda@nordicsemi.no>
(cherry picked from commit 06d0c5831e3dfeca2ae9d647d34db81b71f789b1)
(cherry picked from commit 6cc9fb507f1fd55aa716c75a619806cac39327ec)
(cherry picked from commit 17d16f2c0eb915e096b7a897b0539e7b54212bcb)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index df5abf02595..4637fb5fcdc 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: f801840e246f47c9e895c540d0784f09726136c4
+      revision: 291e1cd0dfad83ec02826adf48dd6db69c3471ca
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From f287d2d7f4c7e8c444246119b8c8473e1c13d7e3 Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Mon, 30 Sep 2024 17:29:02 +0300
Subject: [PATCH 0125/2913] [nrf fromtree] manifest: Fix compilation warnings
 in hostap

Hotfix for two compilation warning issues for
wpa_drv_zep_event_dfs_cac_finished() and
wpa_drv_zep_event_dfs_cac_started(),
and for hmac_prf256() in hostap project.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 0ae12adcf073a5c9c0a47afcf5c89d6554675371)
(cherry picked from commit 82d54c53fd5c3d420a1fbbe355caaefc967fec29)
(cherry picked from commit 658c46564e213780d9f9e11dd01e6357cc97aca8)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 4637fb5fcdc..78533e8b51f 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: 291e1cd0dfad83ec02826adf48dd6db69c3471ca
+      revision: 9896a2ea803ec62e0998c0e569f12af88537d647
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From 9f305076fc328cb702295ac96e9c288a37a70b66 Mon Sep 17 00:00:00 2001
From: Erik Sandgren <erik.sandgren@nordicsemi.no>
Date: Thu, 10 Oct 2024 08:24:18 +0200
Subject: [PATCH 0126/2913] [nrf fromtree] Bluetooth: Host: Fix issue where
 uninitialized value was used

This change makes sure that when a call to `bt_id_set_scan_own_addr` is
sucessful, i.e., the return value is 0, the `own_addr_type` will
be set by the `bt_id_set_scan_own_addr`.

Not setting the `own_addr_type` in a successful call to
`bt_id_set_scan_own_addr` causes, for example,
the `start_le_scan_ext` method in `scan.c` to use an
uninitialized `own_addr_type`.

Eventually this results in an unexpected failure further down in
`start_le_scan_ext`, when sending HCI command to controller with
an uninitialized `own_addr_type`.

Signed-off-by: Erik Sandgren <erik.sandgren@nordicsemi.no>
(cherry picked from commit 5f59b35b42cd0cb6f6df8d91e4607278ee0b34b7)
(cherry picked from commit ad6c18d7ee978108f7cd48f414acf3d1d883c40d)
(cherry picked from commit cd58864f587e488582601188a20c3fd2c80a39b9)
---
 subsys/bluetooth/host/id.c                          | 13 +++++++------
 .../src/test_suite_invalid_inputs.c                 |  3 ---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/subsys/bluetooth/host/id.c b/subsys/bluetooth/host/id.c
index 6261e1fabb7..7f2f154a08e 100644
--- a/subsys/bluetooth/host/id.c
+++ b/subsys/bluetooth/host/id.c
@@ -1785,6 +1785,13 @@ int bt_id_set_scan_own_addr(bool active_scan, uint8_t *own_addr_type)
 	}
 
 	if (IS_ENABLED(CONFIG_BT_PRIVACY)) {
+
+		if (BT_FEAT_LE_PRIVACY(bt_dev.le.features)) {
+			*own_addr_type = BT_HCI_OWN_ADDR_RPA_OR_RANDOM;
+		} else {
+			*own_addr_type = BT_ADDR_LE_RANDOM;
+		}
+
 		err = bt_id_set_private_addr(BT_ID_DEFAULT);
 		if (err == -EACCES && (atomic_test_bit(bt_dev.flags, BT_DEV_SCANNING) ||
 				       atomic_test_bit(bt_dev.flags, BT_DEV_INITIATING))) {
@@ -1794,12 +1801,6 @@ int bt_id_set_scan_own_addr(bool active_scan, uint8_t *own_addr_type)
 		} else if (err) {
 			return err;
 		}
-
-		if (BT_FEAT_LE_PRIVACY(bt_dev.le.features)) {
-			*own_addr_type = BT_HCI_OWN_ADDR_RPA_OR_RANDOM;
-		} else {
-			*own_addr_type = BT_ADDR_LE_RANDOM;
-		}
 	} else {
 		*own_addr_type = bt_dev.id_addr[0].type;
 
diff --git a/tests/bluetooth/host/id/bt_id_set_scan_own_addr/src/test_suite_invalid_inputs.c b/tests/bluetooth/host/id/bt_id_set_scan_own_addr/src/test_suite_invalid_inputs.c
index 4a31b946f46..367cf3296a3 100644
--- a/tests/bluetooth/host/id/bt_id_set_scan_own_addr/src/test_suite_invalid_inputs.c
+++ b/tests/bluetooth/host/id/bt_id_set_scan_own_addr/src/test_suite_invalid_inputs.c
@@ -110,7 +110,6 @@ ZTEST(bt_id_set_scan_own_addr_invalid_inputs, test_set_random_address_fails)
  *  Expected behaviour:
  *   - bt_id_set_scan_own_addr() fails and returns the same error code returned by
  *     bt_id_set_private_addr()
- *   - Address type reference isn't set
  */
 ZTEST(bt_id_set_scan_own_addr_invalid_inputs, test_bt_id_set_private_addr_fails_privacy_enabled)
 {
@@ -131,6 +130,4 @@ ZTEST(bt_id_set_scan_own_addr_invalid_inputs, test_bt_id_set_private_addr_fails_
 #endif
 
 	zassert_true(err < 0, "Unexpected error code '%d' was returned", err);
-	zassert_true(own_addr_type == BT_ADDR_LE_ANONYMOUS,
-		     "Address type reference was unexpectedly modified");
 }

From 40fca325dada70156515863dcefa06713c382a91 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Wed, 18 Sep 2024 14:36:07 +0200
Subject: [PATCH 0127/2913] [nrf fromtree] net: ipv4: Make native IPv4 options
 dependent on NET_NATIVE_IPV4

IPv4 Kconfig options which only affect native IPv4 stack should be
dependent on NET_NATIVE_IPV4, similarly as it's done for IPv6.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 5d085b49a9d1b7d79608bdde7dd20f0cdce6b1ee)
(cherry picked from commit ff18677973d1cbe75de0c4abfb5f4fac4381ac79)
(cherry picked from commit 0fcdaa7216cc063b59a3e44e6eeedc767d3bb876)
---
 subsys/net/ip/Kconfig      |  2 +-
 subsys/net/ip/Kconfig.ipv4 | 43 ++++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/subsys/net/ip/Kconfig b/subsys/net/ip/Kconfig
index 8e525d5ecc5..cb08b3846ca 100644
--- a/subsys/net/ip/Kconfig
+++ b/subsys/net/ip/Kconfig
@@ -168,7 +168,7 @@ config NET_IPV4_MAPPING_TO_IPV6
 config NET_SHELL
 	bool "Network shell utilities"
 	select SHELL
-	select NET_IPV4_IGMP if NET_IPV4
+	select NET_IPV4_IGMP if NET_NATIVE_IPV4
 	select REQUIRES_FLOAT_PRINTF
 	help
 	  Activate shell module that provides network commands like
diff --git a/subsys/net/ip/Kconfig.ipv4 b/subsys/net/ip/Kconfig.ipv4
index a108a015fbe..77c29c8966c 100644
--- a/subsys/net/ip/Kconfig.ipv4
+++ b/subsys/net/ip/Kconfig.ipv4
@@ -11,6 +11,28 @@ menuconfig NET_IPV4
 
 if NET_IPV4
 
+config NET_IF_MAX_IPV4_COUNT
+	int "Max number of IPv4 network interfaces in the system"
+	default NET_VLAN_COUNT if NET_VLAN
+	default 2 if NET_LOOPBACK
+	default 1
+	help
+	  This tells how many network interfaces there will be in the system
+	  that will have IPv4 enabled.
+
+config NET_IF_UNICAST_IPV4_ADDR_COUNT
+	int "Max number of unicast IPv4 addresses per network interface"
+	default 2 if NET_IPV4_AUTO
+	default 2 if NET_LOOPBACK
+	default 1
+
+config NET_IF_MCAST_IPV4_ADDR_COUNT
+	int "Max number of multicast IPv4 addresses per network interface"
+	default 2 if NET_IPV4_IGMP
+	default 1
+
+if NET_NATIVE_IPV4
+
 config NET_INITIAL_TTL
 	int "Initial IPv4 time to live value for unicast packets"
 	default 64
@@ -34,26 +56,6 @@ config NET_INITIAL_MCAST_TTL
 	  don't leave the local network unless the application explicitly
 	  requests it.
 
-config NET_IF_MAX_IPV4_COUNT
-	int "Max number of IPv4 network interfaces in the system"
-	default NET_VLAN_COUNT if NET_VLAN
-	default 2 if NET_LOOPBACK
-	default 1
-	help
-	  This tells how many network interfaces there will be in the system
-	  that will have IPv4 enabled.
-
-config NET_IF_UNICAST_IPV4_ADDR_COUNT
-	int "Max number of unicast IPv4 addresses per network interface"
-	default 2 if NET_IPV4_AUTO
-	default 2 if NET_LOOPBACK
-	default 1
-
-config NET_IF_MCAST_IPV4_ADDR_COUNT
-	int "Max number of multicast IPv4 addresses per network interface"
-	default 2 if NET_IPV4_IGMP
-	default 1
-
 config NET_IF_MCAST_IPV4_SOURCE_COUNT
 	int "Max number of IPv4 sources per mcast address to be included or excluded"
 	default 1
@@ -177,4 +179,5 @@ module-help = Enable debug diagnostic from IPv4 autoconf client.
 source "subsys/net/Kconfig.template.log_config.net"
 endif # NET_IPV4_AUTO
 
+endif # NET_NATIVE_IPV4
 endif # NET_IPV4

From f5b417b07eb9e28de1be60a6ff83d1b8a0071cf7 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Wed, 18 Sep 2024 16:01:15 +0200
Subject: [PATCH 0128/2913] [nrf fromtree] net: iface: Don't require native
 networking to register IP address

It shouldn't be needed to enable native networking to be able to
add/delete IP addresses on network interfaces.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 8d296ba8fe5936f18b21a297c6aff5d2a3af0f43)
(cherry picked from commit 27245b8b04a96defea2085ab9dc6f430eb7c6358)
(cherry picked from commit c09c369b8a008a5c180b5e37f49b55242a971154)
---
 include/zephyr/net/net_if.h |  12 +-
 subsys/net/ip/net_if.c      | 747 +++++++++++++++++++-----------------
 2 files changed, 392 insertions(+), 367 deletions(-)

diff --git a/include/zephyr/net/net_if.h b/include/zephyr/net/net_if.h
index c94d6644314..4e08aa50ba5 100644
--- a/include/zephyr/net/net_if.h
+++ b/include/zephyr/net/net_if.h
@@ -300,7 +300,7 @@ struct net_offload;
 #endif /* CONFIG_NET_OFFLOAD */
 
 /** @cond INTERNAL_HIDDEN */
-#if defined(CONFIG_NET_NATIVE_IPV6)
+#if defined(CONFIG_NET_IPV6)
 #define NET_IF_MAX_IPV6_ADDR CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT
 #define NET_IF_MAX_IPV6_MADDR CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT
 #define NET_IF_MAX_IPV6_PREFIX CONFIG_NET_IF_IPV6_PREFIX_COUNT
@@ -422,7 +422,7 @@ struct net_if_dhcpv6 {
 #endif /* defined(CONFIG_NET_DHCPV6) && defined(CONFIG_NET_NATIVE_IPV6) */
 
 /** @cond INTERNAL_HIDDEN */
-#if defined(CONFIG_NET_NATIVE_IPV4)
+#if defined(CONFIG_NET_IPV4)
 #define NET_IF_MAX_IPV4_ADDR CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT
 #define NET_IF_MAX_IPV4_MADDR CONFIG_NET_IF_MCAST_IPV4_ADDR_COUNT
 #else
@@ -542,11 +542,11 @@ struct net_if_ipv4_autoconf {
  * @brief Network interface IP address configuration.
  */
 struct net_if_ip {
-#if defined(CONFIG_NET_NATIVE_IPV6)
+#if defined(CONFIG_NET_IPV6)
 	struct net_if_ipv6 *ipv6;
 #endif /* CONFIG_NET_IPV6 */
 
-#if defined(CONFIG_NET_NATIVE_IPV4)
+#if defined(CONFIG_NET_IPV4)
 	struct net_if_ipv4 *ipv4;
 #endif /* CONFIG_NET_IPV4 */
 };
@@ -2431,7 +2431,7 @@ bool net_if_ipv4_is_addr_bcast(struct net_if *iface,
  * @return Pointer to network interface to use, NULL if no suitable interface
  * could be found.
  */
-#if defined(CONFIG_NET_NATIVE_IPV4)
+#if defined(CONFIG_NET_IPV4)
 struct net_if *net_if_ipv4_select_src_iface(const struct in_addr *dst);
 #else
 static inline struct net_if *net_if_ipv4_select_src_iface(
@@ -2454,7 +2454,7 @@ static inline struct net_if *net_if_ipv4_select_src_iface(
  * @return Pointer to IPv4 address to use, NULL if no IPv4 address
  * could be found.
  */
-#if defined(CONFIG_NET_NATIVE_IPV4)
+#if defined(CONFIG_NET_IPV4)
 const struct in_addr *net_if_ipv4_select_src_addr(struct net_if *iface,
 						  const struct in_addr *dst);
 #else
diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c
index 54c4f24f368..ea3f4a2dbd8 100644
--- a/subsys/net/ip/net_if.c
+++ b/subsys/net/ip/net_if.c
@@ -84,14 +84,16 @@ static sys_slist_t active_dad_timers;
 static struct k_work_delayable rs_timer;
 static sys_slist_t active_rs_timers;
 #endif
+#endif /* CONFIG_NET_NATIVE_IPV6 */
 
+#if defined(CONFIG_NET_IPV6)
 static struct {
 	struct net_if_ipv6 ipv6;
 	struct net_if *iface;
 } ipv6_addresses[CONFIG_NET_IF_MAX_IPV6_COUNT];
 #endif /* CONFIG_NET_NATIVE_IPV6 */
 
-#if defined(CONFIG_NET_NATIVE_IPV4)
+#if defined(CONFIG_NET_IPV4)
 static struct {
 	struct net_if_ipv4 ipv4;
 	struct net_if *iface;
@@ -674,7 +676,7 @@ static enum net_l2_flags l2_flags_get(struct net_if *iface)
 	return flags;
 }
 
-#if defined(CONFIG_NET_NATIVE_IPV4) || defined(CONFIG_NET_NATIVE_IPV6)
+#if defined(CONFIG_NET_IP)
 /* Return how many bits are shared between two IP addresses */
 static uint8_t get_ipaddr_diff(const uint8_t *src, const uint8_t *dst, int addr_len)
 {
@@ -700,7 +702,9 @@ static uint8_t get_ipaddr_diff(const uint8_t *src, const uint8_t *dst, int addr_
 
 	return len;
 }
+#endif /* CONFIG_NET_IP */
 
+#if defined(CONFIG_NET_NATIVE_IPV4) || defined(CONFIG_NET_NATIVE_IPV6)
 static struct net_if_router *iface_router_lookup(struct net_if *iface,
 						 uint8_t family, void *addr)
 {
@@ -1030,7 +1034,7 @@ void net_if_mcast_monitor(struct net_if *iface,
 #define net_if_mcast_monitor(...)
 #endif /* CONFIG_NET_NATIVE_IPV4 || CONFIG_NET_NATIVE_IPV6 */
 
-#if defined(CONFIG_NET_NATIVE_IPV6)
+#if defined(CONFIG_NET_IPV6)
 int net_if_config_ipv6_get(struct net_if *iface, struct net_if_ipv6 **ipv6)
 {
 	int ret = 0;
@@ -1118,6 +1122,7 @@ int net_if_config_ipv6_put(struct net_if *iface)
 	return ret;
 }
 
+#if defined(CONFIG_NET_NATIVE_IPV6)
 #if defined(CONFIG_NET_IPV6_MLD)
 static void join_mcast_allnodes(struct net_if *iface)
 {
@@ -1579,110 +1584,6 @@ void net_if_nbr_reachability_hint(struct net_if *iface, const struct in6_addr *i
 
 #endif
 
-struct net_if_addr *net_if_ipv6_addr_lookup(const struct in6_addr *addr,
-					    struct net_if **ret)
-{
-	struct net_if_addr *ifaddr = NULL;
-
-	STRUCT_SECTION_FOREACH(net_if, iface) {
-		struct net_if_ipv6 *ipv6;
-
-		net_if_lock(iface);
-
-		ipv6 = iface->config.ip.ipv6;
-		if (!ipv6) {
-			net_if_unlock(iface);
-			continue;
-		}
-
-		ARRAY_FOR_EACH(ipv6->unicast, i) {
-			if (!ipv6->unicast[i].is_used ||
-			    ipv6->unicast[i].address.family != AF_INET6) {
-				continue;
-			}
-
-			if (net_ipv6_is_prefix(
-				    addr->s6_addr,
-				    ipv6->unicast[i].address.in6_addr.s6_addr,
-				    128)) {
-
-				if (ret) {
-					*ret = iface;
-				}
-
-				ifaddr = &ipv6->unicast[i];
-				net_if_unlock(iface);
-				goto out;
-			}
-		}
-
-		net_if_unlock(iface);
-	}
-
-out:
-	return ifaddr;
-}
-
-struct net_if_addr *net_if_ipv6_addr_lookup_by_iface(struct net_if *iface,
-						     struct in6_addr *addr)
-{
-	struct net_if_addr *ifaddr = NULL;
-	struct net_if_ipv6 *ipv6;
-
-	net_if_lock(iface);
-
-	ipv6 = iface->config.ip.ipv6;
-	if (!ipv6) {
-		goto out;
-	}
-
-	ARRAY_FOR_EACH(ipv6->unicast, i) {
-		if (!ipv6->unicast[i].is_used ||
-		    ipv6->unicast[i].address.family != AF_INET6) {
-			continue;
-		}
-
-		if (net_ipv6_is_prefix(
-			    addr->s6_addr,
-			    ipv6->unicast[i].address.in6_addr.s6_addr,
-			    128)) {
-			ifaddr = &ipv6->unicast[i];
-			goto out;
-		}
-	}
-
-out:
-	net_if_unlock(iface);
-
-	return ifaddr;
-}
-
-int z_impl_net_if_ipv6_addr_lookup_by_index(const struct in6_addr *addr)
-{
-	struct net_if *iface = NULL;
-	struct net_if_addr *if_addr;
-
-	if_addr = net_if_ipv6_addr_lookup(addr, &iface);
-	if (!if_addr) {
-		return 0;
-	}
-
-	return net_if_get_by_iface(iface);
-}
-
-#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_net_if_ipv6_addr_lookup_by_index(
-					  const struct in6_addr *addr)
-{
-	struct in6_addr addr_v6;
-
-	K_OOPS(k_usermode_from_copy(&addr_v6, (void *)addr, sizeof(addr_v6)));
-
-	return z_impl_net_if_ipv6_addr_lookup_by_index(&addr_v6);
-}
-#include <zephyr/syscalls/net_if_ipv6_addr_lookup_by_index_mrsh.c>
-#endif
-
 /* To be called when interface comes up so that all the non-joined multicast
  * groups are joined.
  */
@@ -1845,6 +1746,119 @@ static void address_start_timer(struct net_if_addr *ifaddr, uint32_t vlifetime)
 	net_timeout_set(&ifaddr->lifetime, vlifetime, k_uptime_get_32());
 	k_work_reschedule(&address_lifetime_timer, K_NO_WAIT);
 }
+#else /* CONFIG_NET_NATIVE_IPV6 */
+#define address_start_timer(...)
+static inline void net_if_ipv6_start_dad(struct net_if *iface,
+					 struct net_if_addr *ifaddr)
+{
+	ifaddr->addr_state = NET_ADDR_PREFERRED;
+}
+#define join_mcast_nodes(...)
+#endif /* CONFIG_NET_NATIVE_IPV6 */
+
+struct net_if_addr *net_if_ipv6_addr_lookup(const struct in6_addr *addr,
+					    struct net_if **ret)
+{
+	struct net_if_addr *ifaddr = NULL;
+
+	STRUCT_SECTION_FOREACH(net_if, iface) {
+		struct net_if_ipv6 *ipv6;
+
+		net_if_lock(iface);
+
+		ipv6 = iface->config.ip.ipv6;
+		if (!ipv6) {
+			net_if_unlock(iface);
+			continue;
+		}
+
+		ARRAY_FOR_EACH(ipv6->unicast, i) {
+			if (!ipv6->unicast[i].is_used ||
+			    ipv6->unicast[i].address.family != AF_INET6) {
+				continue;
+			}
+
+			if (net_ipv6_is_prefix(
+				    addr->s6_addr,
+				    ipv6->unicast[i].address.in6_addr.s6_addr,
+				    128)) {
+
+				if (ret) {
+					*ret = iface;
+				}
+
+				ifaddr = &ipv6->unicast[i];
+				net_if_unlock(iface);
+				goto out;
+			}
+		}
+
+		net_if_unlock(iface);
+	}
+
+out:
+	return ifaddr;
+}
+
+struct net_if_addr *net_if_ipv6_addr_lookup_by_iface(struct net_if *iface,
+						     struct in6_addr *addr)
+{
+	struct net_if_addr *ifaddr = NULL;
+	struct net_if_ipv6 *ipv6;
+
+	net_if_lock(iface);
+
+	ipv6 = iface->config.ip.ipv6;
+	if (!ipv6) {
+		goto out;
+	}
+
+	ARRAY_FOR_EACH(ipv6->unicast, i) {
+		if (!ipv6->unicast[i].is_used ||
+		    ipv6->unicast[i].address.family != AF_INET6) {
+			continue;
+		}
+
+		if (net_ipv6_is_prefix(
+			    addr->s6_addr,
+			    ipv6->unicast[i].address.in6_addr.s6_addr,
+			    128)) {
+			ifaddr = &ipv6->unicast[i];
+			goto out;
+		}
+	}
+
+out:
+	net_if_unlock(iface);
+
+	return ifaddr;
+}
+
+int z_impl_net_if_ipv6_addr_lookup_by_index(const struct in6_addr *addr)
+{
+	struct net_if *iface = NULL;
+	struct net_if_addr *if_addr;
+
+	if_addr = net_if_ipv6_addr_lookup(addr, &iface);
+	if (!if_addr) {
+		return 0;
+	}
+
+	return net_if_get_by_iface(iface);
+}
+
+#ifdef CONFIG_USERSPACE
+static inline int z_vrfy_net_if_ipv6_addr_lookup_by_index(
+					  const struct in6_addr *addr)
+{
+	struct in6_addr addr_v6;
+
+	K_OOPS(k_usermode_from_copy(&addr_v6, (void *)addr, sizeof(addr_v6)));
+
+	return z_impl_net_if_ipv6_addr_lookup_by_index(&addr_v6);
+}
+#include <zephyr/syscalls/net_if_ipv6_addr_lookup_by_index_mrsh.c>
+#endif
 
 void net_if_ipv6_addr_update_lifetime(struct net_if_addr *ifaddr,
 				      uint32_t vlifetime)
@@ -2307,31 +2321,143 @@ void net_if_ipv6_maddr_join(struct net_if *iface, struct net_if_mcast_addr *addr
 	net_if_unlock(iface);
 }
 
-static void remove_prefix_addresses(struct net_if *iface,
-				    struct net_if_ipv6 *ipv6,
-				    struct in6_addr *addr,
-				    uint8_t len)
+struct in6_addr *net_if_ipv6_get_ll(struct net_if *iface,
+				    enum net_addr_state addr_state)
 {
+	struct in6_addr *addr = NULL;
+	struct net_if_ipv6 *ipv6;
+
+	net_if_lock(iface);
+
+	ipv6 = iface->config.ip.ipv6;
+	if (!ipv6) {
+		goto out;
+	}
+
 	ARRAY_FOR_EACH(ipv6->unicast, i) {
 		if (!ipv6->unicast[i].is_used ||
-		    ipv6->unicast[i].address.family != AF_INET6 ||
-		    ipv6->unicast[i].addr_type != NET_ADDR_AUTOCONF) {
+		    (addr_state != NET_ADDR_ANY_STATE &&
+		     ipv6->unicast[i].addr_state != addr_state) ||
+		    ipv6->unicast[i].address.family != AF_INET6) {
 			continue;
 		}
 
-		if (net_ipv6_is_prefix(
-				addr->s6_addr,
-				ipv6->unicast[i].address.in6_addr.s6_addr,
-				len)) {
-			net_if_ipv6_addr_rm(iface,
-					    &ipv6->unicast[i].address.in6_addr);
+		if (net_ipv6_is_ll_addr(&ipv6->unicast[i].address.in6_addr)) {
+			addr = &ipv6->unicast[i].address.in6_addr;
+			goto out;
 		}
 	}
-}
 
-static void prefix_lifetime_expired(struct net_if_ipv6_prefix *ifprefix)
-{
-	struct net_if_ipv6 *ipv6;
+out:
+	net_if_unlock(iface);
+
+	return addr;
+}
+
+struct in6_addr *net_if_ipv6_get_ll_addr(enum net_addr_state state,
+					 struct net_if **iface)
+{
+	struct in6_addr *addr = NULL;
+
+	STRUCT_SECTION_FOREACH(net_if, tmp) {
+		net_if_lock(tmp);
+
+		addr = net_if_ipv6_get_ll(tmp, state);
+		if (addr) {
+			if (iface) {
+				*iface = tmp;
+			}
+
+			net_if_unlock(tmp);
+			goto out;
+		}
+
+		net_if_unlock(tmp);
+	}
+
+out:
+	return addr;
+}
+
+static inline struct in6_addr *check_global_addr(struct net_if *iface,
+						 enum net_addr_state state)
+{
+	struct net_if_ipv6 *ipv6 = iface->config.ip.ipv6;
+
+	if (!ipv6) {
+		return NULL;
+	}
+
+	ARRAY_FOR_EACH(ipv6->unicast, i) {
+		if (!ipv6->unicast[i].is_used ||
+		    (ipv6->unicast[i].addr_state != state) ||
+		    ipv6->unicast[i].address.family != AF_INET6) {
+			continue;
+		}
+
+		if (!net_ipv6_is_ll_addr(&ipv6->unicast[i].address.in6_addr)) {
+			return &ipv6->unicast[i].address.in6_addr;
+		}
+	}
+
+	return NULL;
+}
+
+struct in6_addr *net_if_ipv6_get_global_addr(enum net_addr_state state,
+					     struct net_if **iface)
+{
+	struct in6_addr *addr = NULL;
+
+	STRUCT_SECTION_FOREACH(net_if, tmp) {
+		if (iface && *iface && tmp != *iface) {
+			continue;
+		}
+
+		net_if_lock(tmp);
+		addr = check_global_addr(tmp, state);
+		if (addr) {
+			if (iface) {
+				*iface = tmp;
+			}
+
+			net_if_unlock(tmp);
+			goto out;
+		}
+
+		net_if_unlock(tmp);
+	}
+
+out:
+
+	return addr;
+}
+
+#if defined(CONFIG_NET_NATIVE_IPV6)
+static void remove_prefix_addresses(struct net_if *iface,
+				    struct net_if_ipv6 *ipv6,
+				    struct in6_addr *addr,
+				    uint8_t len)
+{
+	ARRAY_FOR_EACH(ipv6->unicast, i) {
+		if (!ipv6->unicast[i].is_used ||
+		    ipv6->unicast[i].address.family != AF_INET6 ||
+		    ipv6->unicast[i].addr_type != NET_ADDR_AUTOCONF) {
+			continue;
+		}
+
+		if (net_ipv6_is_prefix(
+				addr->s6_addr,
+				ipv6->unicast[i].address.in6_addr.s6_addr,
+				len)) {
+			net_if_ipv6_addr_rm(iface,
+					    &ipv6->unicast[i].address.in6_addr);
+		}
+	}
+}
+
+static void prefix_lifetime_expired(struct net_if_ipv6_prefix *ifprefix)
+{
+	struct net_if_ipv6 *ipv6;
 
 	net_if_lock(ifprefix->iface);
 
@@ -2852,117 +2978,6 @@ void net_if_ipv6_set_hop_limit(struct net_if *iface, uint8_t hop_limit)
 	net_if_unlock(iface);
 }
 
-struct in6_addr *net_if_ipv6_get_ll(struct net_if *iface,
-				    enum net_addr_state addr_state)
-{
-	struct in6_addr *addr = NULL;
-	struct net_if_ipv6 *ipv6;
-
-	net_if_lock(iface);
-
-	ipv6 = iface->config.ip.ipv6;
-	if (!ipv6) {
-		goto out;
-	}
-
-	ARRAY_FOR_EACH(ipv6->unicast, i) {
-		if (!ipv6->unicast[i].is_used ||
-		    (addr_state != NET_ADDR_ANY_STATE &&
-		     ipv6->unicast[i].addr_state != addr_state) ||
-		    ipv6->unicast[i].address.family != AF_INET6) {
-			continue;
-		}
-
-		if (net_ipv6_is_ll_addr(&ipv6->unicast[i].address.in6_addr)) {
-			addr = &ipv6->unicast[i].address.in6_addr;
-			goto out;
-		}
-	}
-
-out:
-	net_if_unlock(iface);
-
-	return addr;
-}
-
-struct in6_addr *net_if_ipv6_get_ll_addr(enum net_addr_state state,
-					 struct net_if **iface)
-{
-	struct in6_addr *addr = NULL;
-
-	STRUCT_SECTION_FOREACH(net_if, tmp) {
-		net_if_lock(tmp);
-
-		addr = net_if_ipv6_get_ll(tmp, state);
-		if (addr) {
-			if (iface) {
-				*iface = tmp;
-			}
-
-			net_if_unlock(tmp);
-			goto out;
-		}
-
-		net_if_unlock(tmp);
-	}
-
-out:
-	return addr;
-}
-
-static inline struct in6_addr *check_global_addr(struct net_if *iface,
-						 enum net_addr_state state)
-{
-	struct net_if_ipv6 *ipv6 = iface->config.ip.ipv6;
-
-	if (!ipv6) {
-		return NULL;
-	}
-
-	ARRAY_FOR_EACH(ipv6->unicast, i) {
-		if (!ipv6->unicast[i].is_used ||
-		    (ipv6->unicast[i].addr_state != state) ||
-		    ipv6->unicast[i].address.family != AF_INET6) {
-			continue;
-		}
-
-		if (!net_ipv6_is_ll_addr(&ipv6->unicast[i].address.in6_addr)) {
-			return &ipv6->unicast[i].address.in6_addr;
-		}
-	}
-
-	return NULL;
-}
-
-struct in6_addr *net_if_ipv6_get_global_addr(enum net_addr_state state,
-					     struct net_if **iface)
-{
-	struct in6_addr *addr = NULL;
-
-	STRUCT_SECTION_FOREACH(net_if, tmp) {
-		if (iface && *iface && tmp != *iface) {
-			continue;
-		}
-
-		net_if_lock(tmp);
-		addr = check_global_addr(tmp, state);
-		if (addr) {
-			if (iface) {
-				*iface = tmp;
-			}
-
-			net_if_unlock(tmp);
-			goto out;
-		}
-
-		net_if_unlock(tmp);
-	}
-
-out:
-
-	return addr;
-}
-
 static uint8_t get_diff_ipv6(const struct in6_addr *src,
 			  const struct in6_addr *dst)
 {
@@ -3264,17 +3279,8 @@ static void iface_ipv6_init(int if_count)
 		net_if_ipv6_set_reachable_time(&ipv6_addresses[i].ipv6);
 	}
 }
-
-#else /* CONFIG_NET_NATIVE_IPV6 */
-#define join_mcast_allnodes(...)
-#define join_mcast_solicit_node(...)
-#define leave_mcast_all(...)
-#define clear_joined_ipv6_mcast_groups(...)
-#define join_mcast_nodes(...)
-#define iface_ipv6_start(...)
-#define iface_ipv6_stop(...)
-#define iface_ipv6_init(...)
-
+#endif /* CONFIG_NET_NATIVE_IPV6 */
+#else /* CONFIG_NET_IPV6 */
 struct net_if_mcast_addr *net_if_ipv6_maddr_lookup(const struct in6_addr *addr,
 						   struct net_if **iface)
 {
@@ -3301,9 +3307,18 @@ struct in6_addr *net_if_ipv6_get_global_addr(enum net_addr_state state,
 
 	return NULL;
 }
-#endif /* CONFIG_NET_NATIVE_IPV6 */
+#endif /* CONFIG_NET_IPV6 */
 
-#if defined(CONFIG_NET_NATIVE_IPV4)
+#if !defined(CONFIG_NET_NATIVE_IPV6)
+#define join_mcast_allnodes(...)
+#define leave_mcast_all(...)
+#define clear_joined_ipv6_mcast_groups(...)
+#define iface_ipv6_start(...)
+#define iface_ipv6_stop(...)
+#define iface_ipv6_init(...)
+#endif /* !CONFIG_NET_NATIVE_IPV4 */
+
+#if defined(CONFIG_NET_IPV4)
 int net_if_config_ipv4_get(struct net_if *iface, struct net_if_ipv4 **ipv4)
 {
 	int ret = 0;
@@ -3389,107 +3404,6 @@ int net_if_config_ipv4_put(struct net_if *iface)
 	return ret;
 }
 
-uint8_t net_if_ipv4_get_ttl(struct net_if *iface)
-{
-	int ret = 0;
-
-	net_if_lock(iface);
-
-	if (net_if_config_ipv4_get(iface, NULL) < 0) {
-		goto out;
-	}
-
-	if (!iface->config.ip.ipv4) {
-		goto out;
-	}
-
-	ret = iface->config.ip.ipv4->ttl;
-out:
-	net_if_unlock(iface);
-
-	return ret;
-}
-
-void net_if_ipv4_set_ttl(struct net_if *iface, uint8_t ttl)
-{
-	net_if_lock(iface);
-
-	if (net_if_config_ipv4_get(iface, NULL) < 0) {
-		goto out;
-	}
-
-	if (!iface->config.ip.ipv4) {
-		goto out;
-	}
-
-	iface->config.ip.ipv4->ttl = ttl;
-out:
-	net_if_unlock(iface);
-}
-
-uint8_t net_if_ipv4_get_mcast_ttl(struct net_if *iface)
-{
-	int ret = 0;
-
-	net_if_lock(iface);
-
-	if (net_if_config_ipv4_get(iface, NULL) < 0) {
-		goto out;
-	}
-
-	if (!iface->config.ip.ipv4) {
-		goto out;
-	}
-
-	ret = iface->config.ip.ipv4->mcast_ttl;
-out:
-	net_if_unlock(iface);
-
-	return ret;
-}
-
-void net_if_ipv4_set_mcast_ttl(struct net_if *iface, uint8_t ttl)
-{
-	net_if_lock(iface);
-
-	if (net_if_config_ipv4_get(iface, NULL) < 0) {
-		goto out;
-	}
-
-	if (!iface->config.ip.ipv4) {
-		goto out;
-	}
-
-	iface->config.ip.ipv4->mcast_ttl = ttl;
-out:
-	net_if_unlock(iface);
-}
-
-struct net_if_router *net_if_ipv4_router_lookup(struct net_if *iface,
-						struct in_addr *addr)
-{
-	return iface_router_lookup(iface, AF_INET, addr);
-}
-
-struct net_if_router *net_if_ipv4_router_find_default(struct net_if *iface,
-						      struct in_addr *addr)
-{
-	return iface_router_find_default(iface, AF_INET, addr);
-}
-
-struct net_if_router *net_if_ipv4_router_add(struct net_if *iface,
-					     struct in_addr *addr,
-					     bool is_default,
-					     uint16_t lifetime)
-{
-	return iface_router_add(iface, AF_INET, addr, is_default, lifetime);
-}
-
-bool net_if_ipv4_router_rm(struct net_if_router *router)
-{
-	return iface_router_rm(router);
-}
-
 bool net_if_ipv4_addr_mask_cmp(struct net_if *iface,
 			       const struct in_addr *addr)
 {
@@ -4679,6 +4593,109 @@ void net_if_ipv4_maddr_join(struct net_if *iface, struct net_if_mcast_addr *addr
 	net_if_unlock(iface);
 }
 
+#if defined(CONFIG_NET_NATIVE_IPV4)
+uint8_t net_if_ipv4_get_ttl(struct net_if *iface)
+{
+	int ret = 0;
+
+	net_if_lock(iface);
+
+	if (net_if_config_ipv4_get(iface, NULL) < 0) {
+		goto out;
+	}
+
+	if (!iface->config.ip.ipv4) {
+		goto out;
+	}
+
+	ret = iface->config.ip.ipv4->ttl;
+out:
+	net_if_unlock(iface);
+
+	return ret;
+}
+
+void net_if_ipv4_set_ttl(struct net_if *iface, uint8_t ttl)
+{
+	net_if_lock(iface);
+
+	if (net_if_config_ipv4_get(iface, NULL) < 0) {
+		goto out;
+	}
+
+	if (!iface->config.ip.ipv4) {
+		goto out;
+	}
+
+	iface->config.ip.ipv4->ttl = ttl;
+out:
+	net_if_unlock(iface);
+}
+
+uint8_t net_if_ipv4_get_mcast_ttl(struct net_if *iface)
+{
+	int ret = 0;
+
+	net_if_lock(iface);
+
+	if (net_if_config_ipv4_get(iface, NULL) < 0) {
+		goto out;
+	}
+
+	if (!iface->config.ip.ipv4) {
+		goto out;
+	}
+
+	ret = iface->config.ip.ipv4->mcast_ttl;
+out:
+	net_if_unlock(iface);
+
+	return ret;
+}
+
+void net_if_ipv4_set_mcast_ttl(struct net_if *iface, uint8_t ttl)
+{
+	net_if_lock(iface);
+
+	if (net_if_config_ipv4_get(iface, NULL) < 0) {
+		goto out;
+	}
+
+	if (!iface->config.ip.ipv4) {
+		goto out;
+	}
+
+	iface->config.ip.ipv4->mcast_ttl = ttl;
+out:
+	net_if_unlock(iface);
+}
+
+struct net_if_router *net_if_ipv4_router_lookup(struct net_if *iface,
+						struct in_addr *addr)
+{
+	return iface_router_lookup(iface, AF_INET, addr);
+}
+
+struct net_if_router *net_if_ipv4_router_find_default(struct net_if *iface,
+						      struct in_addr *addr)
+{
+	return iface_router_find_default(iface, AF_INET, addr);
+}
+
+struct net_if_router *net_if_ipv4_router_add(struct net_if *iface,
+					     struct in_addr *addr,
+					     bool is_default,
+					     uint16_t lifetime)
+{
+	return iface_router_add(iface, AF_INET, addr, is_default, lifetime);
+}
+
+bool net_if_ipv4_router_rm(struct net_if_router *router)
+{
+	return iface_router_rm(router);
+}
+
+
 static void iface_ipv4_init(int if_count)
 {
 	int i;
@@ -4725,13 +4742,8 @@ static void iface_ipv4_start(struct net_if *iface)
 		net_if_start_acd(iface);
 	}
 }
-
-
-#else /* CONFIG_NET_NATIVE_IPV4 */
-#define leave_ipv4_mcast_all(...)
-#define iface_ipv4_init(...)
-#define iface_ipv4_start(...)
-
+#endif /* CONFIG_NET_NATIVE_IPV4 */
+#else  /* CONFIG_NET_IPV4 */
 struct net_if_mcast_addr *net_if_ipv4_maddr_lookup(const struct in_addr *addr,
 						   struct net_if **iface)
 {
@@ -4758,7 +4770,13 @@ struct in_addr *net_if_ipv4_get_global_addr(struct net_if *iface,
 
 	return NULL;
 }
-#endif /* CONFIG_NET_NATIVE_IPV4 */
+#endif /* CONFIG_NET_IPV4 */
+
+#if !defined(CONFIG_NET_NATIVE_IPV4)
+#define leave_ipv4_mcast_all(...)
+#define iface_ipv4_init(...)
+#define iface_ipv4_start(...)
+#endif /* !CONFIG_NET_NATIVE_IPV4 */
 
 struct net_if *net_if_select_src_iface(const struct sockaddr *dst)
 {
@@ -4797,12 +4815,15 @@ static struct net_if_addr *get_ifaddr(struct net_if *iface,
 
 	if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) {
 		struct net_if_ipv6 *ipv6 =
-			COND_CODE_1(CONFIG_NET_NATIVE_IPV6, (iface->config.ip.ipv6), (NULL));
-
+			COND_CODE_1(CONFIG_NET_IPV6, (iface->config.ip.ipv6), (NULL));
 		struct in6_addr maddr;
 		unsigned int maddr_count = 0;
 		int found = -1;
 
+		if (ipv6 == NULL) {
+			goto out;
+		}
+
 		net_ipv6_addr_create_solicited_node((struct in6_addr *)addr,
 						    &maddr);
 
@@ -4844,7 +4865,11 @@ static struct net_if_addr *get_ifaddr(struct net_if *iface,
 
 	if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) {
 		struct net_if_ipv4 *ipv4 =
-			COND_CODE_1(CONFIG_NET_NATIVE_IPV4, (iface->config.ip.ipv4), (NULL));
+			COND_CODE_1(CONFIG_NET_IPV4, (iface->config.ip.ipv4), (NULL));
+
+		if (ipv4 == NULL) {
+			goto out;
+		}
 
 		ARRAY_FOR_EACH(ipv4->unicast, i) {
 			if (!ipv4->unicast[i].ipv4.is_used) {
@@ -4876,7 +4901,7 @@ static void remove_ipv6_ifaddr(struct net_if *iface,
 
 	net_if_lock(iface);
 
-	ipv6 = COND_CODE_1(CONFIG_NET_NATIVE_IPV6, (iface->config.ip.ipv6), (NULL));
+	ipv6 = COND_CODE_1(CONFIG_NET_IPV6, (iface->config.ip.ipv6), (NULL));
 	if (!ipv6) {
 		goto out;
 	}
@@ -4934,7 +4959,7 @@ static void remove_ipv4_ifaddr(struct net_if *iface,
 
 	net_if_lock(iface);
 
-	ipv4 = COND_CODE_1(CONFIG_NET_NATIVE_IPV4, (iface->config.ip.ipv4), (NULL));
+	ipv4 = COND_CODE_1(CONFIG_NET_IPV4, (iface->config.ip.ipv4), (NULL));
 	if (!ipv4) {
 		goto out;
 	}

From 945b374a60a92b71813008de8ad3019fb127fa4a Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 19 Sep 2024 13:48:34 +0200
Subject: [PATCH 0129/2913] [nrf fromtree] test: net: offloaded_netdev: Add
 tests for IPv4/6 address registration

Make sure it's possible to register IPv4/6 addresses on an offloaded
interface. Add an extra build configuration to make sure it's also
possible when native IP stack is disabled.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 4595295028f720838b12a721fdd252b24c8bd49b)
(cherry picked from commit 9de396586b6123b10da32054e35a247c0573e6ea)
(cherry picked from commit a4eb0d4a99a20cb27a5b7acea0d12324123db2e6)
---
 tests/net/offloaded_netdev/prj.conf      |  6 +++
 tests/net/offloaded_netdev/src/main.c    | 62 ++++++++++++++++++++++++
 tests/net/offloaded_netdev/testcase.yaml | 13 +++--
 3 files changed, 76 insertions(+), 5 deletions(-)

diff --git a/tests/net/offloaded_netdev/prj.conf b/tests/net/offloaded_netdev/prj.conf
index ad92b9bec28..3a670f327d3 100644
--- a/tests/net/offloaded_netdev/prj.conf
+++ b/tests/net/offloaded_netdev/prj.conf
@@ -7,3 +7,9 @@ CONFIG_ZTEST=y
 CONFIG_TEST_USERSPACE=y
 CONFIG_NET_OFFLOAD=y
 CONFIG_TEST_RANDOM_GENERATOR=y
+CONFIG_NET_IPV4=y
+CONFIG_NET_IPV6=y
+CONFIG_NET_IPV6_NBR_CACHE=n
+CONFIG_NET_IPV6_MLD=n
+CONFIG_NET_IF_MAX_IPV4_COUNT=4
+CONFIG_NET_IF_MAX_IPV6_COUNT=4
diff --git a/tests/net/offloaded_netdev/src/main.c b/tests/net/offloaded_netdev/src/main.c
index dfe8f8fbb14..becc0488102 100644
--- a/tests/net/offloaded_netdev/src/main.c
+++ b/tests/net/offloaded_netdev/src/main.c
@@ -19,6 +19,11 @@
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/net_l2.h>
 
+static struct in_addr test_addr_ipv4 = { { { 192, 0, 2, 1 } } };
+static struct in6_addr test_addr_ipv6 = { { {
+	0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1
+} } };
+
 /* Dummy socket creator for socket-offloaded ifaces */
 int offload_socket(int family, int type, int proto)
 {
@@ -36,6 +41,8 @@ static void sock_offload_l2_iface_init(struct net_if *iface)
 	 */
 	net_if_socket_offload_set(iface, offload_socket);
 	net_if_flag_set(iface, NET_IF_NO_AUTO_START);
+	net_if_flag_set(iface, NET_IF_IPV4);
+	net_if_flag_set(iface, NET_IF_IPV6);
 }
 
 /* Dummy init function for net-offloaded ifaces */
@@ -46,6 +53,8 @@ static void net_offload_l2_iface_init(struct net_if *iface)
 	 */
 	iface->if_dev->offload = &net_offload_api;
 	net_if_flag_set(iface, NET_IF_NO_AUTO_START);
+	net_if_flag_set(iface, NET_IF_IPV4);
+	net_if_flag_set(iface, NET_IF_IPV6);
 }
 
 /* Tracks the total number of ifaces that are up (theoretically). */
@@ -327,5 +336,58 @@ ZTEST(net_offloaded_netdev, test_up_down_sock_off_impl_fail_down)
 			"Iface under test should have failed to go up");
 }
 
+static void test_addr_add_common(struct net_if *test_iface, const char *off_type)
+{
+	struct net_if *lookup_iface;
+	struct net_if_addr *ipv4_addr;
+	struct net_if_addr *ipv6_addr;
+
+	/* Bring iface up before test */
+	(void)net_if_up(test_iface);
+
+	ipv4_addr = net_if_ipv4_addr_add(test_iface, &test_addr_ipv4,
+					 NET_ADDR_MANUAL, 0);
+	zassert_not_null(ipv4_addr,
+			"Failed to add IPv4 address to a %s offloaded interface",
+			off_type);
+	ipv6_addr = net_if_ipv6_addr_add(test_iface, &test_addr_ipv6,
+					 NET_ADDR_MANUAL, 0);
+	zassert_not_null(ipv6_addr,
+			 "Failed to add IPv6 address to a socket %s interface",
+			 off_type);
+
+	lookup_iface = NULL;
+	zassert_equal_ptr(net_if_ipv4_addr_lookup(&test_addr_ipv4, &lookup_iface),
+			  ipv4_addr,
+			  "Failed to find IPv4 address on a %s offloaded interface");
+	zassert_equal_ptr(lookup_iface, test_iface, "Wrong interface");
+
+	lookup_iface = NULL;
+	zassert_equal_ptr(net_if_ipv6_addr_lookup(&test_addr_ipv6, &lookup_iface),
+			  ipv6_addr,
+			  "Failed to find IPv6 address on a %s offloaded interface");
+	zassert_equal_ptr(lookup_iface, test_iface, "Wrong interface");
+
+	zassert_true(net_if_ipv4_addr_rm(test_iface, &test_addr_ipv4),
+		     "Failed to remove IPv4 address from a %s offloaded interface",
+		     off_type);
+	zassert_true(net_if_ipv6_addr_rm(test_iface, &test_addr_ipv6),
+		     "Failed to remove IPv4 address from a %s offloaded interface",
+		     off_type);
+}
+
+ZTEST(net_offloaded_netdev, test_addr_add_sock_off_impl)
+{
+	struct net_if *test_iface = NET_IF_GET(sock_offload_test_impl, 0);
+
+	test_addr_add_common(test_iface, "offloaded");
+}
+
+ZTEST(net_offloaded_netdev, test_addr_add_net_off_impl)
+{
+	struct net_if *test_iface = NET_IF_GET(net_offload_test_impl, 0);
+
+	test_addr_add_common(test_iface, "net");
+}
 
 ZTEST_SUITE(net_offloaded_netdev, NULL, NULL, net_offloaded_netdev_before, NULL, NULL);
diff --git a/tests/net/offloaded_netdev/testcase.yaml b/tests/net/offloaded_netdev/testcase.yaml
index 5893d4f12c5..d51590043f9 100644
--- a/tests/net/offloaded_netdev/testcase.yaml
+++ b/tests/net/offloaded_netdev/testcase.yaml
@@ -1,9 +1,12 @@
 common:
   min_ram: 16
   depends_on: netif
+  tags:
+    - net
+    - iface
+    - userspace
 tests:
-  net.offloaded_netdev:
-    tags:
-      - net
-      - iface
-      - userspace
+  net.offloaded_netdev: {}
+  net.offloaded_netdev.no_native:
+    extra_configs:
+      - CONFIG_NET_NATIVE=n

From 496253fe2292e44daf1d2ced661e1848cf0c305c Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Fri, 20 Sep 2024 09:33:47 +0200
Subject: [PATCH 0130/2913] [nrf fromtree] net: shell: Enable IPv4/6 and iface
 commands if NET_NATIVE is disabled

Some commands can be executed and some statuses can be printed even if
native IP is disabled.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit c3770171468a4e49916b88ab9863c1a4d7dd2678)
(cherry picked from commit 9cb5783fc6edeed84319c1f71953cc4b37fa224f)
(cherry picked from commit c547c3f52638cd489100774028e08fa72a749ced)
---
 subsys/net/lib/shell/iface.c | 15 ++++--------
 subsys/net/lib/shell/ipv4.c  | 40 +++++++++++++++---------------
 subsys/net/lib/shell/ipv6.c  | 47 ++++++++++++++++++------------------
 3 files changed, 49 insertions(+), 53 deletions(-)

diff --git a/subsys/net/lib/shell/iface.c b/subsys/net/lib/shell/iface.c
index 7aa03c75730..c3a3428a546 100644
--- a/subsys/net/lib/shell/iface.c
+++ b/subsys/net/lib/shell/iface.c
@@ -91,7 +91,6 @@ static void print_phy_link_state(const struct shell *sh, const struct device *ph
 }
 #endif
 
-#if defined(CONFIG_NET_NATIVE)
 static const char *iface_flags2str(struct net_if *iface)
 {
 	static char str[sizeof("POINTOPOINT") + sizeof("PROMISC") +
@@ -148,17 +147,17 @@ static const char *iface_flags2str(struct net_if *iface)
 
 	return str;
 }
-#endif
 
 static void iface_cb(struct net_if *iface, void *user_data)
 {
-#if defined(CONFIG_NET_NATIVE)
 	struct net_shell_user_data *data = user_data;
 	const struct shell *sh = data->sh;
 
-#if defined(CONFIG_NET_IPV6)
+#if defined(CONFIG_NET_NATIVE_IPV6)
 	struct net_if_ipv6_prefix *prefix;
 	struct net_if_router *router;
+#endif
+#if defined(CONFIG_NET_IPV6)
 	struct net_if_ipv6 *ipv6;
 #endif
 #if defined(CONFIG_NET_IPV4)
@@ -393,6 +392,7 @@ static void iface_cb(struct net_if *iface, void *user_data)
 		PR("\t<none>\n");
 	}
 
+#if defined(CONFIG_NET_NATIVE_IPV6)
 	count = 0;
 
 	PR("IPv6 prefixes (max %d):\n", NET_IF_MAX_IPV6_PREFIX);
@@ -421,6 +421,7 @@ static void iface_cb(struct net_if *iface, void *user_data)
 		   net_sprint_ipv6_addr(&router->address.in6_addr),
 		   router->is_infinite ? " infinite" : "");
 	}
+#endif /* CONFIG_NET_NATIVE_IPV6 */
 
 skip_ipv6:
 
@@ -532,12 +533,6 @@ static void iface_cb(struct net_if *iface, void *user_data)
 		   iface->config.dhcpv4.attempts);
 	}
 #endif /* CONFIG_NET_DHCPV4 */
-
-#else
-	ARG_UNUSED(iface);
-	ARG_UNUSED(user_data);
-
-#endif /* CONFIG_NET_NATIVE */
 }
 
 static int cmd_net_set_mac(const struct shell *sh, size_t argc, char *argv[])
diff --git a/subsys/net/lib/shell/ipv4.c b/subsys/net/lib/shell/ipv4.c
index 74afea9a54a..d70dc786828 100644
--- a/subsys/net/lib/shell/ipv4.c
+++ b/subsys/net/lib/shell/ipv4.c
@@ -13,7 +13,7 @@ LOG_MODULE_DECLARE(net_shell);
 #include "net_shell_private.h"
 #include "../ip/ipv4.h"
 
-#if defined(CONFIG_NET_NATIVE_IPV4)
+#if defined(CONFIG_NET_IPV4)
 static void ip_address_lifetime_cb(struct net_if *iface, void *user_data)
 {
 	struct net_shell_user_data *data = user_data;
@@ -50,7 +50,7 @@ static void ip_address_lifetime_cb(struct net_if *iface, void *user_data)
 			   &ipv4->unicast[i].netmask));
 	}
 }
-#endif /* CONFIG_NET_NATIVE_IPV4 */
+#endif /* CONFIG_NET_IPV4 */
 
 static int cmd_net_ipv4(const struct shell *sh, size_t argc, char *argv[])
 {
@@ -62,14 +62,17 @@ static int cmd_net_ipv4(const struct shell *sh, size_t argc, char *argv[])
 	}
 
 #if defined(CONFIG_NET_NATIVE_IPV4)
-	struct net_shell_user_data user_data;
-
 	PR("IPv4 fragmentation support                : %s\n",
 	   IS_ENABLED(CONFIG_NET_IPV4_FRAGMENT) ? "enabled" :
 	   "disabled");
 	PR("IPv4 conflict detection support           : %s\n",
 	   IS_ENABLED(CONFIG_NET_IPV4_ACD) ? "enabled" :
 	   "disabled");
+#endif /* CONFIG_NET_NATIVE_IPV4 */
+
+#if defined(CONFIG_NET_IPV4)
+	struct net_shell_user_data user_data;
+
 	PR("Max number of IPv4 network interfaces "
 	   "in the system          : %d\n",
 	   CONFIG_NET_IF_MAX_IPV4_COUNT);
@@ -85,14 +88,14 @@ static int cmd_net_ipv4(const struct shell *sh, size_t argc, char *argv[])
 
 	/* Print information about address lifetime */
 	net_if_foreach(ip_address_lifetime_cb, &user_data);
-#endif
+#endif /* CONFIG_NET_IPV4 */
 
 	return 0;
 }
 
 static int cmd_net_ip_add(const struct shell *sh, size_t argc, char *argv[])
 {
-#if defined(CONFIG_NET_NATIVE_IPV4)
+#if defined(CONFIG_NET_IPV4)
 	struct net_if *iface = NULL;
 	int idx;
 	struct in_addr addr;
@@ -151,16 +154,15 @@ static int cmd_net_ip_add(const struct shell *sh, size_t argc, char *argv[])
 		net_if_ipv4_set_netmask_by_addr(iface, &addr, &netmask);
 	}
 
-#else /* CONFIG_NET_NATIVE_IPV4 */
-	PR_INFO("Set %s and %s to enable native %s support.\n",
-			"CONFIG_NET_NATIVE", "CONFIG_NET_IPV4", "IPv4");
-#endif /* CONFIG_NET_NATIVE_IPV4 */
+#else /* CONFIG_NET_IPV4 */
+	PR_INFO("Set %s to enable %s support.\n", "CONFIG_NET_IPV4", "IPv4");
+#endif /* CONFIG_NET_IPV4 */
 	return 0;
 }
 
 static int cmd_net_ip_del(const struct shell *sh, size_t argc, char *argv[])
 {
-#if defined(CONFIG_NET_NATIVE_IPV4)
+#if defined(CONFIG_NET_IPV4)
 	struct net_if *iface = NULL;
 	int idx;
 	struct in_addr addr;
@@ -201,16 +203,15 @@ static int cmd_net_ip_del(const struct shell *sh, size_t argc, char *argv[])
 			return -ENOEXEC;
 		}
 	}
-#else /* CONFIG_NET_NATIVE_IPV4 */
-	PR_INFO("Set %s and %s to enable native %s support.\n",
-			"CONFIG_NET_NATIVE", "CONFIG_NET_IPV4", "IPv4");
-#endif /* CONFIG_NET_NATIVE_IPV4 */
+#else /* CONFIG_NET_IPV4 */
+	PR_INFO("Set %s to enable %s support.\n", "CONFIG_NET_IPV4", "IPv4");
+#endif /* CONFIG_NET_IPV4 */
 	return 0;
 }
 
 static int cmd_net_ip_gateway(const struct shell *sh, size_t argc, char *argv[])
 {
-#if defined(CONFIG_NET_NATIVE_IPV4)
+#if defined(CONFIG_NET_IPV4)
 	struct net_if *iface;
 	int idx;
 	struct in_addr addr;
@@ -238,10 +239,9 @@ static int cmd_net_ip_gateway(const struct shell *sh, size_t argc, char *argv[])
 
 	net_if_ipv4_set_gw(iface, &addr);
 
-#else /* CONFIG_NET_NATIVE_IPV4 */
-	PR_INFO("Set %s and %s to enable native %s support.\n",
-			"CONFIG_NET_NATIVE", "CONFIG_NET_IPV4", "IPv4");
-#endif /* CONFIG_NET_NATIVE_IPV4 */
+#else /* CONFIG_NET_IPV4 */
+	PR_INFO("Set %s to enable %s support.\n", "CONFIG_NET_IPV4", "IPv4");
+#endif /* CONFIG_NET_IPV4 */
 	return 0;
 }
 
diff --git a/subsys/net/lib/shell/ipv6.c b/subsys/net/lib/shell/ipv6.c
index b9a9252f1ac..d13b6803e65 100644
--- a/subsys/net/lib/shell/ipv6.c
+++ b/subsys/net/lib/shell/ipv6.c
@@ -54,8 +54,6 @@ void ipv6_frag_cb(struct net_ipv6_reassembly *reass, void *user_data)
 }
 #endif /* CONFIG_NET_IPV6_FRAGMENT */
 
-#if defined(CONFIG_NET_NATIVE_IPV6)
-
 #if defined(CONFIG_NET_IPV6_PE)
 static void ipv6_pe_filter_cb(struct in6_addr *prefix, bool is_denylist,
 			      void *user_data)
@@ -78,6 +76,7 @@ static void ipv6_pe_filter_cb(struct in6_addr *prefix, bool is_denylist,
 }
 #endif /* CONFIG_NET_IPV6_PE */
 
+#if defined(CONFIG_NET_IPV6)
 static void address_lifetime_cb(struct net_if *iface, void *user_data)
 {
 	struct net_shell_user_data *data = user_data;
@@ -99,16 +98,18 @@ static void address_lifetime_cb(struct net_if *iface, void *user_data)
 	PR("Type      \tState    \tLifetime (sec)\tRef\tAddress\n");
 
 	ARRAY_FOR_EACH(ipv6->unicast, i) {
-		struct net_if_ipv6_prefix *prefix;
 		char remaining_str[sizeof("01234567890")];
-		uint32_t remaining;
-		uint8_t prefix_len;
+		uint8_t prefix_len = 128U;
 
 		if (!ipv6->unicast[i].is_used ||
 		    ipv6->unicast[i].address.family != AF_INET6) {
 			continue;
 		}
 
+#if defined(CONFIG_NET_NATIVE_IPV6)
+		struct net_if_ipv6_prefix *prefix;
+		uint32_t remaining;
+
 		remaining = net_timeout_remaining(&ipv6->unicast[i].lifetime,
 						  k_uptime_get_32());
 
@@ -116,8 +117,6 @@ static void address_lifetime_cb(struct net_if *iface, void *user_data)
 					   &ipv6->unicast[i].address.in6_addr);
 		if (prefix) {
 			prefix_len = prefix->len;
-		} else {
-			prefix_len = 128U;
 		}
 
 		if (ipv6->unicast[i].is_infinite) {
@@ -127,6 +126,9 @@ static void address_lifetime_cb(struct net_if *iface, void *user_data)
 			snprintk(remaining_str, sizeof(remaining_str) - 1,
 				 "%u", remaining);
 		}
+#else
+	snprintk(remaining_str, sizeof(remaining_str) - 1, "infinite");
+#endif /* CONFIG_NET_NATIVE_IPV6 */
 
 		PR("%s  \t%s\t%14s\t%ld\t%s/%d%s\n",
 		   addrtype2str(ipv6->unicast[i].addr_type),
@@ -137,13 +139,13 @@ static void address_lifetime_cb(struct net_if *iface, void *user_data)
 		   ipv6->unicast[i].is_temporary ? " (temporary)" : "");
 	}
 }
-#endif /* CONFIG_NET_NATIVE_IPV6 */
+#endif /* CONFIG_NET_IPV6 */
 
 static int cmd_net_ipv6(const struct shell *sh, size_t argc, char *argv[])
 {
-#if defined(CONFIG_NET_NATIVE_IPV6)
+#if defined(CONFIG_NET_IPV6)
 	struct net_shell_user_data user_data;
-#endif
+#endif /* CONFIG_NET_IPV6 */
 
 	PR("IPv6 support                              : %s\n",
 	   IS_ENABLED(CONFIG_NET_IPV6) ?
@@ -189,8 +191,10 @@ static int cmd_net_ipv6(const struct shell *sh, size_t argc, char *argv[])
 	PR("Max number of IPv6 privacy extension filters "
 	   "                : %d\n",
 	   CONFIG_NET_IPV6_PE_FILTER_PREFIX_COUNT);
-#endif
+#endif /* CONFIG_NET_IPV6_PE */
+#endif /* CONFIG_NET_NATIVE_IPV6 */
 
+#if defined(CONFIG_NET_IPV6)
 	PR("Max number of IPv6 network interfaces "
 	   "in the system          : %d\n",
 	   CONFIG_NET_IF_MAX_IPV6_COUNT);
@@ -209,15 +213,14 @@ static int cmd_net_ipv6(const struct shell *sh, size_t argc, char *argv[])
 
 	/* Print information about address lifetime */
 	net_if_foreach(address_lifetime_cb, &user_data);
-
-#endif /* CONFIG_NET_NATIVE_IPV6 */
+#endif /* CONFIG_NET_IPV6 */
 
 	return 0;
 }
 
 static int cmd_net_ip6_add(const struct shell *sh, size_t argc, char *argv[])
 {
-#if defined(CONFIG_NET_NATIVE_IPV6)
+#if defined(CONFIG_NET_IPV6)
 	struct net_if *iface = NULL;
 	int idx;
 	struct in6_addr addr;
@@ -262,16 +265,15 @@ static int cmd_net_ip6_add(const struct shell *sh, size_t argc, char *argv[])
 		}
 	}
 
-#else /* CONFIG_NET_NATIVE_IPV6 */
-	PR_INFO("Set %s and %s to enable native %s support.\n",
-			"CONFIG_NET_NATIVE", "CONFIG_NET_IPV6", "IPv6");
-#endif /* CONFIG_NET_NATIVE_IPV6 */
+#else /* CONFIG_NET_IPV6 */
+	PR_INFO("Set %s to enable %s support.\n", "CONFIG_NET_IPV6", "IPv6");
+#endif /* CONFIG_NET_IPV6 */
 	return 0;
 }
 
 static int cmd_net_ip6_del(const struct shell *sh, size_t argc, char *argv[])
 {
-#if defined(CONFIG_NET_NATIVE_IPV6)
+#if defined(CONFIG_NET_IPV6)
 	struct net_if *iface = NULL;
 	int idx;
 	struct in6_addr addr;
@@ -317,10 +319,9 @@ static int cmd_net_ip6_del(const struct shell *sh, size_t argc, char *argv[])
 		}
 	}
 
-#else /* CONFIG_NET_NATIVE_IPV6 */
-	PR_INFO("Set %s and %s to enable native %s support.\n",
-			"CONFIG_NET_NATIVE", "CONFIG_NET_IPV6", "IPv6");
-#endif /* CONFIG_NET_NATIVE_IPV6 */
+#else /* CONFIG_NET_IPV6 */
+	PR_INFO("Set %s to enable %s support.\n", "CONFIG_NET_IPV6", "IPv6");
+#endif /* CONFIG_NET_IPV6 */
 	return 0;
 }
 

From 6d479d2865030886d77869e63ce602deccc7f6a3 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Fri, 27 Sep 2024 14:48:28 +0200
Subject: [PATCH 0131/2913] [nrf fromtree] net: sockets: Split native IP socket
 implementation from syscalls

Native IP socket implementation need only be build if native IP stack is
enabled. Therefore, split the native IP sockets from the common socket
syscalls shared across all socket implementations.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 404e9c7b88629cdaf852c7c8d4d725c8f0c7117b)
(cherry picked from commit d7ac5b1f0e654bd6d9fbc0afb8d6cf0fe9be052e)
(cherry picked from commit c7cba4d3ea2a85e36f8d5152b191311c6a75e116)
---
 subsys/net/lib/sockets/CMakeLists.txt |    1 +
 subsys/net/lib/sockets/sockets.c      | 3669 ++++---------------------
 subsys/net/lib/sockets/sockets_inet.c | 2758 +++++++++++++++++++
 3 files changed, 3218 insertions(+), 3210 deletions(-)
 create mode 100644 subsys/net/lib/sockets/sockets_inet.c

diff --git a/subsys/net/lib/sockets/CMakeLists.txt b/subsys/net/lib/sockets/CMakeLists.txt
index 253cb4a182f..28b76df4a7a 100644
--- a/subsys/net/lib/sockets/CMakeLists.txt
+++ b/subsys/net/lib/sockets/CMakeLists.txt
@@ -20,6 +20,7 @@ zephyr_library_sources(
   )
 endif()
 
+zephyr_library_sources_ifdef(CONFIG_NET_NATIVE                     sockets_inet.c)
 zephyr_library_sources_ifdef(CONFIG_NET_SOCKETS_CAN                sockets_can.c)
 zephyr_library_sources_ifdef(CONFIG_NET_SOCKETS_PACKET             sockets_packet.c)
 zephyr_library_sources_ifdef(CONFIG_NET_SOCKETS_SOCKOPT_TLS        sockets_tls.c)
diff --git a/subsys/net/lib/sockets/sockets.c b/subsys/net/lib/sockets/sockets.c
index 12fbce5c6c5..8b420cc9e68 100644
--- a/subsys/net/lib/sockets/sockets.c
+++ b/subsys/net/lib/sockets/sockets.c
@@ -11,32 +11,11 @@
 LOG_MODULE_REGISTER(net_sock, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <zephyr/kernel.h>
-#include <zephyr/net/net_context.h>
-#include <zephyr/net/net_pkt.h>
 #include <zephyr/tracing/tracing.h>
 #include <zephyr/net/socket.h>
-#include <zephyr/net/socket_types.h>
-#include <zephyr/posix/fcntl.h>
 #include <zephyr/internal/syscall_handler.h>
-#include <zephyr/sys/fdtable.h>
-#include <zephyr/sys/math_extras.h>
-#include <zephyr/sys/iterable_sections.h>
-
-#if defined(CONFIG_SOCKS)
-#include "socks.h"
-#endif
-
-#include <zephyr/net/igmp.h>
-#include "../../ip/ipv6.h"
-
-#include "../../ip/net_stats.h"
 
 #include "sockets_internal.h"
-#include "../../ip/tcp_internal.h"
-#include "../../ip/net_private.h"
-
-#define SET_ERRNO(x) \
-	{ int _err = x; if (_err < 0) { errno = -_err; return -1; } }
 
 #define VTABLE_CALL(fn, sock, ...)			     \
 	({						     \
@@ -65,8 +44,6 @@ LOG_MODULE_REGISTER(net_sock, CONFIG_NET_SOCKETS_LOG_LEVEL);
 		retval;					     \
 	})
 
-const struct socket_op_vtable sock_fd_op_vtable;
-
 static inline void *get_sock_vtable(int sock,
 				    const struct socket_op_vtable **vtable,
 				    struct k_mutex **lock)
@@ -114,108 +91,6 @@ void *z_vrfy_zsock_get_context_object(int sock)
 #include <zephyr/syscalls/zsock_get_context_object_mrsh.c>
 #endif
 
-static void zsock_received_cb(struct net_context *ctx,
-			      struct net_pkt *pkt,
-			      union net_ip_header *ip_hdr,
-			      union net_proto_header *proto_hdr,
-			      int status,
-			      void *user_data);
-
-static int fifo_wait_non_empty(struct k_fifo *fifo, k_timeout_t timeout)
-{
-	struct k_poll_event events[] = {
-		K_POLL_EVENT_INITIALIZER(K_POLL_TYPE_FIFO_DATA_AVAILABLE,
-					 K_POLL_MODE_NOTIFY_ONLY, fifo),
-	};
-
-	return k_poll(events, ARRAY_SIZE(events), timeout);
-}
-
-static void zsock_flush_queue(struct net_context *ctx)
-{
-	bool is_listen = net_context_get_state(ctx) == NET_CONTEXT_LISTENING;
-	void *p;
-
-	/* recv_q and accept_q are shared via a union */
-	while ((p = k_fifo_get(&ctx->recv_q, K_NO_WAIT)) != NULL) {
-		if (is_listen) {
-			NET_DBG("discarding ctx %p", p);
-			net_context_put(p);
-		} else {
-			NET_DBG("discarding pkt %p", p);
-			net_pkt_unref(p);
-		}
-	}
-
-	/* Some threads might be waiting on recv, cancel the wait */
-	k_fifo_cancel_wait(&ctx->recv_q);
-
-	/* Wake reader if it was sleeping */
-	(void)k_condvar_signal(&ctx->cond.recv);
-}
-
-#if defined(CONFIG_NET_NATIVE)
-static int zsock_socket_internal(int family, int type, int proto)
-{
-	int fd = zvfs_reserve_fd();
-	struct net_context *ctx;
-	int res;
-
-	if (fd < 0) {
-		return -1;
-	}
-
-	if (proto == 0) {
-		if (family == AF_INET || family == AF_INET6) {
-			if (type == SOCK_DGRAM) {
-				proto = IPPROTO_UDP;
-			} else if (type == SOCK_STREAM) {
-				proto = IPPROTO_TCP;
-			}
-		}
-	}
-
-	res = net_context_get(family, type, proto, &ctx);
-	if (res < 0) {
-		zvfs_free_fd(fd);
-		errno = -res;
-		return -1;
-	}
-
-	/* Initialize user_data, all other calls will preserve it */
-	ctx->user_data = NULL;
-
-	/* The socket flags are stored here */
-	ctx->socket_data = NULL;
-
-	/* recv_q and accept_q are in union */
-	k_fifo_init(&ctx->recv_q);
-
-	/* Condition variable is used to avoid keeping lock for a long time
-	 * when waiting data to be received
-	 */
-	k_condvar_init(&ctx->cond.recv);
-
-	/* TCP context is effectively owned by both application
-	 * and the stack: stack may detect that peer closed/aborted
-	 * connection, but it must not dispose of the context behind
-	 * the application back. Likewise, when application "closes"
-	 * context, it's not disposed of immediately - there's yet
-	 * closing handshake for stack to perform.
-	 */
-	if (proto == IPPROTO_TCP) {
-		net_context_ref(ctx);
-	}
-
-	zvfs_finalize_typed_fd(fd, ctx, (const struct fd_op_vtable *)&sock_fd_op_vtable,
-			    ZVFS_MODE_IFSOCK);
-
-	NET_DBG("socket: ctx=%p, fd=%d", ctx, fd);
-
-	return fd;
-}
-#endif /* CONFIG_NET_NATIVE */
-
 int z_impl_zsock_socket(int family, int type, int proto)
 {
 	STRUCT_SECTION_FOREACH(net_socket_register, sock_family) {
@@ -259,29 +134,6 @@ static inline int z_vrfy_zsock_socket(int family, int type, int proto)
 #include <zephyr/syscalls/zsock_socket_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
-int zsock_close_ctx(struct net_context *ctx)
-{
-	/* Reset callbacks to avoid any race conditions while
-	 * flushing queues. No need to check return values here,
-	 * as these are fail-free operations and we're closing
-	 * socket anyway.
-	 */
-	if (net_context_get_state(ctx) == NET_CONTEXT_LISTENING) {
-		(void)net_context_accept(ctx, NULL, K_NO_WAIT, NULL);
-	} else {
-		(void)net_context_recv(ctx, NULL, K_NO_WAIT, NULL);
-	}
-
-	ctx->user_data = INT_TO_POINTER(EINTR);
-	sock_set_error(ctx);
-
-	zsock_flush_queue(ctx);
-
-	SET_ERRNO(net_context_put(ctx));
-
-	return 0;
-}
-
 int z_impl_zsock_close(int sock)
 {
 	const struct socket_op_vtable *vtable;
@@ -366,128 +218,6 @@ static inline int z_vrfy_zsock_shutdown(int sock, int how)
 #include <zephyr/syscalls/zsock_shutdown_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
-static void zsock_accepted_cb(struct net_context *new_ctx,
-			      struct sockaddr *addr, socklen_t addrlen,
-			      int status, void *user_data) {
-	struct net_context *parent = user_data;
-
-	NET_DBG("parent=%p, ctx=%p, st=%d", parent, new_ctx, status);
-
-	if (status == 0) {
-		/* This just installs a callback, so cannot fail. */
-		(void)net_context_recv(new_ctx, zsock_received_cb, K_NO_WAIT,
-				       NULL);
-		k_fifo_init(&new_ctx->recv_q);
-		k_condvar_init(&new_ctx->cond.recv);
-
-		k_fifo_put(&parent->accept_q, new_ctx);
-
-		/* TCP context is effectively owned by both application
-		 * and the stack: stack may detect that peer closed/aborted
-		 * connection, but it must not dispose of the context behind
-		 * the application back. Likewise, when application "closes"
-		 * context, it's not disposed of immediately - there's yet
-		 * closing handshake for stack to perform.
-		 */
-		net_context_ref(new_ctx);
-
-		(void)k_condvar_signal(&parent->cond.recv);
-	}
-
-}
-
-static void zsock_received_cb(struct net_context *ctx,
-			      struct net_pkt *pkt,
-			      union net_ip_header *ip_hdr,
-			      union net_proto_header *proto_hdr,
-			      int status,
-			      void *user_data)
-{
-	if (ctx->cond.lock) {
-		(void)k_mutex_lock(ctx->cond.lock, K_FOREVER);
-	}
-
-	NET_DBG("ctx=%p, pkt=%p, st=%d, user_data=%p", ctx, pkt, status,
-		user_data);
-
-	if (status < 0) {
-		ctx->user_data = INT_TO_POINTER(-status);
-		sock_set_error(ctx);
-	}
-
-	/* if pkt is NULL, EOF */
-	if (!pkt) {
-		struct net_pkt *last_pkt = k_fifo_peek_tail(&ctx->recv_q);
-
-		if (!last_pkt) {
-			/* If there're no packets in the queue, recv() may
-			 * be blocked waiting on it to become non-empty,
-			 * so cancel that wait.
-			 */
-			sock_set_eof(ctx);
-			k_fifo_cancel_wait(&ctx->recv_q);
-			NET_DBG("Marked socket %p as peer-closed", ctx);
-		} else {
-			net_pkt_set_eof(last_pkt, true);
-			NET_DBG("Set EOF flag on pkt %p", last_pkt);
-		}
-
-		goto unlock;
-	}
-
-	/* Normal packet */
-	net_pkt_set_eof(pkt, false);
-
-	net_pkt_set_rx_stats_tick(pkt, k_cycle_get_32());
-
-	k_fifo_put(&ctx->recv_q, pkt);
-
-unlock:
-	/* Wake reader if it was sleeping */
-	(void)k_condvar_signal(&ctx->cond.recv);
-
-	if (ctx->cond.lock) {
-		(void)k_mutex_unlock(ctx->cond.lock);
-	}
-}
-
-int zsock_shutdown_ctx(struct net_context *ctx, int how)
-{
-	if (how == ZSOCK_SHUT_RD) {
-		if (net_context_get_state(ctx) == NET_CONTEXT_LISTENING) {
-			SET_ERRNO(net_context_accept(ctx, NULL, K_NO_WAIT, NULL));
-		} else {
-			SET_ERRNO(net_context_recv(ctx, NULL, K_NO_WAIT, NULL));
-		}
-
-		sock_set_eof(ctx);
-
-		zsock_flush_queue(ctx);
-	} else if (how == ZSOCK_SHUT_WR || how == ZSOCK_SHUT_RDWR) {
-		SET_ERRNO(-ENOTSUP);
-	} else {
-		SET_ERRNO(-EINVAL);
-	}
-
-	return 0;
-}
-
-int zsock_bind_ctx(struct net_context *ctx, const struct sockaddr *addr,
-		   socklen_t addrlen)
-{
-	SET_ERRNO(net_context_bind(ctx, addr, addrlen));
-	/* For DGRAM socket, we expect to receive packets after call to
-	 * bind(), but for STREAM socket, next expected operation is
-	 * listen(), which doesn't work if recv callback is set.
-	 */
-	if (net_context_get_type(ctx) == SOCK_DGRAM) {
-		SET_ERRNO(net_context_recv(ctx, zsock_received_cb, K_NO_WAIT,
-					   ctx->user_data));
-	}
-
-	return 0;
-}
-
 int z_impl_zsock_bind(int sock, const struct sockaddr *addr, socklen_t addrlen)
 {
 	int ret;
@@ -516,64 +246,6 @@ static inline int z_vrfy_zsock_bind(int sock, const struct sockaddr *addr,
 #include <zephyr/syscalls/zsock_bind_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
-static void zsock_connected_cb(struct net_context *ctx, int status, void *user_data)
-{
-	if (status < 0) {
-		ctx->user_data = INT_TO_POINTER(-status);
-		sock_set_error(ctx);
-	}
-}
-
-int zsock_connect_ctx(struct net_context *ctx, const struct sockaddr *addr,
-		      socklen_t addrlen)
-{
-
-#if defined(CONFIG_SOCKS)
-	if (net_context_is_proxy_enabled(ctx)) {
-		SET_ERRNO(net_socks5_connect(ctx, addr, addrlen));
-		SET_ERRNO(net_context_recv(ctx, zsock_received_cb,
-					   K_NO_WAIT, ctx->user_data));
-		return 0;
-	}
-#endif
-	if (net_context_get_state(ctx) == NET_CONTEXT_CONNECTED) {
-		return 0;
-	} else if (net_context_get_state(ctx) == NET_CONTEXT_CONNECTING) {
-		if (sock_is_error(ctx)) {
-			SET_ERRNO(-POINTER_TO_INT(ctx->user_data));
-		} else {
-			SET_ERRNO(-EALREADY);
-		}
-	} else {
-		k_timeout_t timeout = K_MSEC(CONFIG_NET_SOCKETS_CONNECT_TIMEOUT);
-		net_context_connect_cb_t cb = NULL;
-
-		if (sock_is_nonblock(ctx)) {
-			timeout = K_NO_WAIT;
-			cb = zsock_connected_cb;
-		}
-
-		if (net_context_get_type(ctx) == SOCK_STREAM) {
-			/* For STREAM sockets net_context_recv() only installs
-			 * recv callback w/o side effects, and it has to be done
-			 * first to avoid race condition, when TCP stream data
-			 * arrives right after connect.
-			 */
-			SET_ERRNO(net_context_recv(ctx, zsock_received_cb,
-						   K_NO_WAIT, ctx->user_data));
-			SET_ERRNO(net_context_connect(ctx, addr, addrlen, cb,
-						      timeout, ctx->user_data));
-		} else {
-			SET_ERRNO(net_context_connect(ctx, addr, addrlen, cb,
-						      timeout, ctx->user_data));
-			SET_ERRNO(net_context_recv(ctx, zsock_received_cb,
-						   K_NO_WAIT, ctx->user_data));
-		}
-	}
-
-	return 0;
-}
-
 int z_impl_zsock_connect(int sock, const struct sockaddr *addr,
 			socklen_t addrlen)
 {
@@ -603,14 +275,6 @@ int z_vrfy_zsock_connect(int sock, const struct sockaddr *addr,
 #include <zephyr/syscalls/zsock_connect_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
-int zsock_listen_ctx(struct net_context *ctx, int backlog)
-{
-	SET_ERRNO(net_context_listen(ctx, backlog));
-	SET_ERRNO(net_context_accept(ctx, zsock_accepted_cb, K_NO_WAIT, ctx));
-
-	return 0;
-}
-
 int z_impl_zsock_listen(int sock, int backlog)
 {
 	int ret;
@@ -632,91 +296,6 @@ static inline int z_vrfy_zsock_listen(int sock, int backlog)
 #include <zephyr/syscalls/zsock_listen_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
-int zsock_accept_ctx(struct net_context *parent, struct sockaddr *addr,
-		     socklen_t *addrlen)
-{
-	struct net_context *ctx;
-	struct net_pkt *last_pkt;
-	int fd, ret;
-
-	if (!sock_is_nonblock(parent)) {
-		k_timeout_t timeout = K_FOREVER;
-
-		/* accept() can reuse zsock_wait_data(), as underneath it's
-		 * monitoring the same queue (accept_q is an alias for recv_q).
-		 */
-		ret = zsock_wait_data(parent, &timeout);
-		if (ret < 0) {
-			errno = -ret;
-			return -1;
-		}
-	}
-
-	ctx = k_fifo_get(&parent->accept_q, K_NO_WAIT);
-	if (ctx == NULL) {
-		errno = EAGAIN;
-		return -1;
-	}
-
-	fd = zvfs_reserve_fd();
-	if (fd < 0) {
-		zsock_flush_queue(ctx);
-		net_context_put(ctx);
-		return -1;
-	}
-
-	/* Check if the connection is already disconnected */
-	last_pkt = k_fifo_peek_tail(&ctx->recv_q);
-	if (last_pkt) {
-		if (net_pkt_eof(last_pkt)) {
-			sock_set_eof(ctx);
-			zvfs_free_fd(fd);
-			zsock_flush_queue(ctx);
-			net_context_put(ctx);
-			errno = ECONNABORTED;
-			return -1;
-		}
-	}
-
-	if (net_context_is_closing(ctx)) {
-		errno = ECONNABORTED;
-		zvfs_free_fd(fd);
-		zsock_flush_queue(ctx);
-		net_context_put(ctx);
-		return -1;
-	}
-
-	net_context_set_accepting(ctx, false);
-
-
-	if (addr != NULL && addrlen != NULL) {
-		int len = MIN(*addrlen, sizeof(ctx->remote));
-
-		memcpy(addr, &ctx->remote, len);
-		/* addrlen is a value-result argument, set to actual
-		 * size of source address
-		 */
-		if (ctx->remote.sa_family == AF_INET) {
-			*addrlen = sizeof(struct sockaddr_in);
-		} else if (ctx->remote.sa_family == AF_INET6) {
-			*addrlen = sizeof(struct sockaddr_in6);
-		} else {
-			zvfs_free_fd(fd);
-			errno = ENOTSUP;
-			zsock_flush_queue(ctx);
-			net_context_put(ctx);
-			return -1;
-		}
-	}
-
-	NET_DBG("accept: ctx=%p, fd=%d", ctx, fd);
-
-	zvfs_finalize_typed_fd(fd, ctx, (const struct fd_op_vtable *)&sock_fd_op_vtable,
-			    ZVFS_MODE_IFSOCK);
-
-	return fd;
-}
-
 int z_impl_zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen)
 {
 	int new_sock;
@@ -755,142 +334,6 @@ static inline int z_vrfy_zsock_accept(int sock, struct sockaddr *addr,
 #include <zephyr/syscalls/zsock_accept_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
-#define WAIT_BUFS_INITIAL_MS 10
-#define WAIT_BUFS_MAX_MS 100
-#define MAX_WAIT_BUFS K_MSEC(CONFIG_NET_SOCKET_MAX_SEND_WAIT)
-
-static int send_check_and_wait(struct net_context *ctx, int status,
-			       k_timepoint_t buf_timeout, k_timeout_t timeout,
-			       uint32_t *retry_timeout)
-{
-	if (K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
-		goto out;
-	}
-
-	if (status != -ENOBUFS && status != -EAGAIN) {
-		goto out;
-	}
-
-	/* If we cannot get any buffers in reasonable
-	 * amount of time, then do not wait forever as
-	 * there might be some bigger issue.
-	 * If we get -EAGAIN and cannot recover, then
-	 * it means that the sending window is blocked
-	 * and we just cannot send anything.
-	 */
-	if (sys_timepoint_expired(buf_timeout)) {
-		if (status == -ENOBUFS) {
-			status = -ENOMEM;
-		} else {
-			status = -ENOBUFS;
-		}
-
-		goto out;
-	}
-
-	if (!K_TIMEOUT_EQ(timeout, K_FOREVER)) {
-		*retry_timeout =
-			MIN(*retry_timeout, k_ticks_to_ms_floor32(timeout.ticks));
-	}
-
-	if (ctx->cond.lock) {
-		(void)k_mutex_unlock(ctx->cond.lock);
-	}
-
-	if (status == -ENOBUFS) {
-		/* We can monitor net_pkt/net_buf availability, so just wait. */
-		k_sleep(K_MSEC(*retry_timeout));
-	}
-
-	if (status == -EAGAIN) {
-		if (IS_ENABLED(CONFIG_NET_NATIVE_TCP) &&
-		    net_context_get_type(ctx) == SOCK_STREAM &&
-		    !net_if_is_ip_offloaded(net_context_get_iface(ctx))) {
-			struct k_poll_event event;
-
-			k_poll_event_init(&event,
-					  K_POLL_TYPE_SEM_AVAILABLE,
-					  K_POLL_MODE_NOTIFY_ONLY,
-					  net_tcp_tx_sem_get(ctx));
-
-			k_poll(&event, 1, K_MSEC(*retry_timeout));
-		} else {
-			k_sleep(K_MSEC(*retry_timeout));
-		}
-	}
-	/* Exponentially increase the retry timeout
-	 * Cap the value to WAIT_BUFS_MAX_MS
-	 */
-	*retry_timeout = MIN(WAIT_BUFS_MAX_MS, *retry_timeout << 1);
-
-	if (ctx->cond.lock) {
-		(void)k_mutex_lock(ctx->cond.lock, K_FOREVER);
-	}
-
-	return 0;
-
-out:
-	errno = -status;
-	return -1;
-}
-
-ssize_t zsock_sendto_ctx(struct net_context *ctx, const void *buf, size_t len,
-			 int flags,
-			 const struct sockaddr *dest_addr, socklen_t addrlen)
-{
-	k_timeout_t timeout = K_FOREVER;
-	uint32_t retry_timeout = WAIT_BUFS_INITIAL_MS;
-	k_timepoint_t buf_timeout, end;
-	int status;
-
-	if ((flags & ZSOCK_MSG_DONTWAIT) || sock_is_nonblock(ctx)) {
-		timeout = K_NO_WAIT;
-		buf_timeout = sys_timepoint_calc(K_NO_WAIT);
-	} else {
-		net_context_get_option(ctx, NET_OPT_SNDTIMEO, &timeout, NULL);
-		buf_timeout = sys_timepoint_calc(MAX_WAIT_BUFS);
-	}
-	end = sys_timepoint_calc(timeout);
-
-	/* Register the callback before sending in order to receive the response
-	 * from the peer.
-	 */
-	status = net_context_recv(ctx, zsock_received_cb,
-				  K_NO_WAIT, ctx->user_data);
-	if (status < 0) {
-		errno = -status;
-		return -1;
-	}
-
-	while (1) {
-		if (dest_addr) {
-			status = net_context_sendto(ctx, buf, len, dest_addr,
-						    addrlen, NULL, timeout,
-						    ctx->user_data);
-		} else {
-			status = net_context_send(ctx, buf, len, NULL, timeout,
-						  ctx->user_data);
-		}
-
-		if (status < 0) {
-			status = send_check_and_wait(ctx, status, buf_timeout,
-						     timeout, &retry_timeout);
-			if (status < 0) {
-				return status;
-			}
-
-			/* Update the timeout value in case loop is repeated. */
-			timeout = sys_timepoint_timeout(end);
-
-			continue;
-		}
-
-		break;
-	}
-
-	return status;
-}
-
 ssize_t z_impl_zsock_sendto(int sock, const void *buf, size_t len, int flags,
 			   const struct sockaddr *dest_addr, socklen_t addrlen)
 {
@@ -929,58 +372,6 @@ ssize_t z_vrfy_zsock_sendto(int sock, const void *buf, size_t len, int flags,
 #include <zephyr/syscalls/zsock_sendto_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
-size_t msghdr_non_empty_iov_count(const struct msghdr *msg)
-{
-	size_t non_empty_iov_count = 0;
-
-	for (size_t i = 0; i < msg->msg_iovlen; i++) {
-		if (msg->msg_iov[i].iov_len) {
-			non_empty_iov_count++;
-		}
-	}
-
-	return non_empty_iov_count;
-}
-
-ssize_t zsock_sendmsg_ctx(struct net_context *ctx, const struct msghdr *msg,
-			  int flags)
-{
-	k_timeout_t timeout = K_FOREVER;
-	uint32_t retry_timeout = WAIT_BUFS_INITIAL_MS;
-	k_timepoint_t buf_timeout, end;
-	int status;
-
-	if ((flags & ZSOCK_MSG_DONTWAIT) || sock_is_nonblock(ctx)) {
-		timeout = K_NO_WAIT;
-		buf_timeout = sys_timepoint_calc(K_NO_WAIT);
-	} else {
-		net_context_get_option(ctx, NET_OPT_SNDTIMEO, &timeout, NULL);
-		buf_timeout = sys_timepoint_calc(MAX_WAIT_BUFS);
-	}
-	end = sys_timepoint_calc(timeout);
-
-	while (1) {
-		status = net_context_sendmsg(ctx, msg, flags, NULL, timeout, NULL);
-		if (status < 0) {
-			status = send_check_and_wait(ctx, status,
-						     buf_timeout,
-						     timeout, &retry_timeout);
-			if (status < 0) {
-				return status;
-			}
-
-			/* Update the timeout value in case loop is repeated. */
-			timeout = sys_timepoint_timeout(end);
-
-			continue;
-		}
-
-		break;
-	}
-
-	return status;
-}
-
 ssize_t z_impl_zsock_sendmsg(int sock, const struct msghdr *msg, int flags)
 {
 	int bytes_sent;
@@ -1086,2468 +477,631 @@ static inline ssize_t z_vrfy_zsock_sendmsg(int sock,
 #include <zephyr/syscalls/zsock_sendmsg_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
-static int sock_get_pkt_src_addr(struct net_pkt *pkt,
-				 enum net_ip_protocol proto,
-				 struct sockaddr *addr,
-				 socklen_t addrlen)
+ssize_t z_impl_zsock_recvfrom(int sock, void *buf, size_t max_len, int flags,
+			     struct sockaddr *src_addr, socklen_t *addrlen)
 {
-	int ret = 0;
-	struct net_pkt_cursor backup;
-	uint16_t *port;
+	int bytes_received;
 
-	if (!addr || !pkt) {
-		return -EINVAL;
-	}
+	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, recvfrom, sock, max_len, flags, src_addr, addrlen);
 
-	net_pkt_cursor_backup(pkt, &backup);
-	net_pkt_cursor_init(pkt);
+	bytes_received = VTABLE_CALL(recvfrom, sock, buf, max_len, flags, src_addr, addrlen);
 
-	addr->sa_family = net_pkt_family(pkt);
+	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, recvfrom, sock,
+				       src_addr, addrlen,
+				       bytes_received < 0 ? -errno : bytes_received);
 
-	if (IS_ENABLED(CONFIG_NET_IPV4) &&
-	    net_pkt_family(pkt) == AF_INET) {
-		NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv4_access,
-						      struct net_ipv4_hdr);
-		struct sockaddr_in *addr4 = net_sin(addr);
-		struct net_ipv4_hdr *ipv4_hdr;
+	sock_obj_core_update_recv_stats(sock, bytes_received);
 
-		if (addrlen < sizeof(struct sockaddr_in)) {
-			ret = -EINVAL;
-			goto error;
-		}
+	return bytes_received;
+}
 
-		ipv4_hdr = (struct net_ipv4_hdr *)net_pkt_get_data(
-							pkt, &ipv4_access);
-		if (!ipv4_hdr ||
-		    net_pkt_acknowledge_data(pkt, &ipv4_access) ||
-		    net_pkt_skip(pkt, net_pkt_ipv4_opts_len(pkt))) {
-			ret = -ENOBUFS;
-			goto error;
-		}
-
-		net_ipv4_addr_copy_raw((uint8_t *)&addr4->sin_addr, ipv4_hdr->src);
-		port = &addr4->sin_port;
-	} else if (IS_ENABLED(CONFIG_NET_IPV6) &&
-		   net_pkt_family(pkt) == AF_INET6) {
-		NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv6_access,
-						      struct net_ipv6_hdr);
-		struct sockaddr_in6 *addr6 = net_sin6(addr);
-		struct net_ipv6_hdr *ipv6_hdr;
-
-		if (addrlen < sizeof(struct sockaddr_in6)) {
-			ret = -EINVAL;
-			goto error;
-		}
-
-		ipv6_hdr = (struct net_ipv6_hdr *)net_pkt_get_data(
-							pkt, &ipv6_access);
-		if (!ipv6_hdr ||
-		    net_pkt_acknowledge_data(pkt, &ipv6_access) ||
-		    net_pkt_skip(pkt, net_pkt_ipv6_ext_len(pkt))) {
-			ret = -ENOBUFS;
-			goto error;
-		}
+#ifdef CONFIG_USERSPACE
+ssize_t z_vrfy_zsock_recvfrom(int sock, void *buf, size_t max_len, int flags,
+			      struct sockaddr *src_addr, socklen_t *addrlen)
+{
+	socklen_t addrlen_copy;
+	ssize_t ret;
 
-		net_ipv6_addr_copy_raw((uint8_t *)&addr6->sin6_addr, ipv6_hdr->src);
-		port = &addr6->sin6_port;
-	} else {
-		ret = -ENOTSUP;
-		goto error;
+	if (K_SYSCALL_MEMORY_WRITE(buf, max_len)) {
+		errno = EFAULT;
+		return -1;
 	}
 
-	if (IS_ENABLED(CONFIG_NET_UDP) && proto == IPPROTO_UDP) {
-		NET_PKT_DATA_ACCESS_DEFINE(udp_access, struct net_udp_hdr);
-		struct net_udp_hdr *udp_hdr;
-
-		udp_hdr = (struct net_udp_hdr *)net_pkt_get_data(pkt,
-								 &udp_access);
-		if (!udp_hdr) {
-			ret = -ENOBUFS;
-			goto error;
-		}
-
-		*port = udp_hdr->src_port;
-	} else if (IS_ENABLED(CONFIG_NET_TCP) && proto == IPPROTO_TCP) {
-		NET_PKT_DATA_ACCESS_DEFINE(tcp_access, struct net_tcp_hdr);
-		struct net_tcp_hdr *tcp_hdr;
-
-		tcp_hdr = (struct net_tcp_hdr *)net_pkt_get_data(pkt,
-								 &tcp_access);
-		if (!tcp_hdr) {
-			ret = -ENOBUFS;
-			goto error;
-		}
-
-		*port = tcp_hdr->src_port;
-	} else {
-		ret = -ENOTSUP;
+	if (addrlen) {
+		K_OOPS(k_usermode_from_copy(&addrlen_copy, addrlen,
+					sizeof(socklen_t)));
 	}
+	K_OOPS(src_addr && K_SYSCALL_MEMORY_WRITE(src_addr, addrlen_copy));
 
-error:
-	net_pkt_cursor_restore(pkt, &backup);
-
-	return ret;
-}
-
-#if defined(CONFIG_NET_OFFLOAD)
-static bool net_pkt_remote_addr_is_unspecified(struct net_pkt *pkt)
-{
-	bool ret = true;
+	ret = z_impl_zsock_recvfrom(sock, (void *)buf, max_len, flags,
+				   (struct sockaddr *)src_addr,
+				   addrlen ? &addrlen_copy : NULL);
 
-	if (net_pkt_family(pkt) == AF_INET) {
-		ret = net_ipv4_is_addr_unspecified(&net_sin(&pkt->remote)->sin_addr);
-	} else if (net_pkt_family(pkt) == AF_INET6) {
-		ret = net_ipv6_is_addr_unspecified(&net_sin6(&pkt->remote)->sin6_addr);
+	if (addrlen) {
+		K_OOPS(k_usermode_to_copy(addrlen, &addrlen_copy,
+				      sizeof(socklen_t)));
 	}
 
 	return ret;
 }
+#include <zephyr/syscalls/zsock_recvfrom_mrsh.c>
+#endif /* CONFIG_USERSPACE */
 
-static int sock_get_offload_pkt_src_addr(struct net_pkt *pkt,
-					 struct net_context *ctx,
-					 struct sockaddr *addr,
-					 socklen_t addrlen)
+ssize_t z_impl_zsock_recvmsg(int sock, struct msghdr *msg, int flags)
 {
-	int ret = 0;
+	int bytes_received;
 
-	if (!addr || !pkt) {
-		return -EINVAL;
-	}
+	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, recvmsg, sock, msg, flags);
 
-	if (!net_pkt_remote_addr_is_unspecified(pkt)) {
-		if (IS_ENABLED(CONFIG_NET_IPV4) &&
-		    net_pkt_family(pkt) == AF_INET) {
-			if (addrlen < sizeof(struct sockaddr_in)) {
-				ret = -EINVAL;
-				goto error;
-			}
+	bytes_received = VTABLE_CALL(recvmsg, sock, msg, flags);
 
-			memcpy(addr, &pkt->remote, sizeof(struct sockaddr_in));
-		} else if (IS_ENABLED(CONFIG_NET_IPV6) &&
-			   net_pkt_family(pkt) == AF_INET6) {
-			if (addrlen < sizeof(struct sockaddr_in6)) {
-				ret = -EINVAL;
-				goto error;
-			}
+	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, recvmsg, sock, msg,
+				       bytes_received < 0 ? -errno : bytes_received);
 
-			memcpy(addr, &pkt->remote, sizeof(struct sockaddr_in6));
-		}
-	} else if (ctx->flags & NET_CONTEXT_REMOTE_ADDR_SET) {
-		memcpy(addr, &ctx->remote, MIN(addrlen, sizeof(ctx->remote)));
-	} else {
-		ret = -ENOTSUP;
-	}
+	sock_obj_core_update_recv_stats(sock, bytes_received);
 
-error:
-	return ret;
+	return bytes_received;
 }
-#else
-static int sock_get_offload_pkt_src_addr(struct net_pkt *pkt,
-					 struct net_context *ctx,
-					 struct sockaddr *addr,
-					 socklen_t addrlen)
+
+#ifdef CONFIG_USERSPACE
+ssize_t z_vrfy_zsock_recvmsg(int sock, struct msghdr *msg, int flags)
 {
-	ARG_UNUSED(pkt);
-	ARG_UNUSED(ctx);
-	ARG_UNUSED(addr);
-	ARG_UNUSED(addrlen);
+	struct msghdr msg_copy;
+	size_t iovlen;
+	size_t i;
+	int ret;
 
-	return 0;
-}
-#endif /* CONFIG_NET_OFFLOAD */
+	if (msg == NULL) {
+		errno = EINVAL;
+		return -1;
+	}
 
-void net_socket_update_tc_rx_time(struct net_pkt *pkt, uint32_t end_tick)
-{
-	net_pkt_set_rx_stats_tick(pkt, end_tick);
+	if (msg->msg_iov == NULL) {
+		errno = ENOMEM;
+		return -1;
+	}
 
-	net_stats_update_tc_rx_time(net_pkt_iface(pkt),
-				    net_pkt_priority(pkt),
-				    net_pkt_create_time(pkt),
-				    end_tick);
+	K_OOPS(k_usermode_from_copy(&msg_copy, (void *)msg, sizeof(msg_copy)));
 
-	SYS_PORT_TRACING_FUNC(net, rx_time, pkt, end_tick);
+	k_usermode_from_copy(&iovlen, &msg->msg_iovlen, sizeof(iovlen));
 
-	if (IS_ENABLED(CONFIG_NET_PKT_RXTIME_STATS_DETAIL)) {
-		uint32_t val, prev = net_pkt_create_time(pkt);
-		int i;
+	msg_copy.msg_name = NULL;
+	msg_copy.msg_control = NULL;
 
-		for (i = 0; i < net_pkt_stats_tick_count(pkt); i++) {
-			if (!net_pkt_stats_tick(pkt)[i]) {
-				break;
-			}
+	msg_copy.msg_iov = k_usermode_alloc_from_copy(msg->msg_iov,
+				       msg->msg_iovlen * sizeof(struct iovec));
+	if (!msg_copy.msg_iov) {
+		errno = ENOMEM;
+		goto fail;
+	}
+
+	/* Clear the pointers in the copy so that if the allocation in the
+	 * next loop fails, we do not try to free non allocated memory
+	 * in fail branch.
+	 */
+	memset(msg_copy.msg_iov, 0, msg->msg_iovlen * sizeof(struct iovec));
 
-			val = net_pkt_stats_tick(pkt)[i] - prev;
-			prev = net_pkt_stats_tick(pkt)[i];
-			net_pkt_stats_tick(pkt)[i] = val;
+	for (i = 0; i < iovlen; i++) {
+		/* TODO: In practice we do not need to copy the actual data
+		 * in msghdr when receiving data but currently there is no
+		 * ready made function to do just that (unless we want to call
+		 * relevant malloc function here ourselves). So just use
+		 * the copying variant for now.
+		 */
+		msg_copy.msg_iov[i].iov_base =
+			k_usermode_alloc_from_copy(msg->msg_iov[i].iov_base,
+						   msg->msg_iov[i].iov_len);
+		if (!msg_copy.msg_iov[i].iov_base) {
+			errno = ENOMEM;
+			goto fail;
 		}
 
-		net_stats_update_tc_rx_time_detail(
-			net_pkt_iface(pkt),
-			net_pkt_priority(pkt),
-			net_pkt_stats_tick(pkt));
+		msg_copy.msg_iov[i].iov_len = msg->msg_iov[i].iov_len;
 	}
-}
 
-int zsock_wait_data(struct net_context *ctx, k_timeout_t *timeout)
-{
-	int ret;
+	if (msg->msg_namelen > 0) {
+		if (msg->msg_name == NULL) {
+			errno = EINVAL;
+			goto fail;
+		}
 
-	if (ctx->cond.lock == NULL) {
-		/* For some reason the lock pointer is not set properly
-		 * when called by fdtable.c:zvfs_finalize_fd()
-		 * It is not practical to try to figure out the fdtable
-		 * lock at this point so skip it.
-		 */
-		NET_WARN("No lock pointer set for context %p", ctx);
-		return -EINVAL;
+		msg_copy.msg_name = k_usermode_alloc_from_copy(msg->msg_name,
+							   msg->msg_namelen);
+		if (msg_copy.msg_name == NULL) {
+			errno = ENOMEM;
+			goto fail;
+		}
 	}
 
-	if (k_fifo_is_empty(&ctx->recv_q)) {
-		/* Wait for the data to arrive but without holding a lock */
-		ret = k_condvar_wait(&ctx->cond.recv, ctx->cond.lock,
-				     *timeout);
-		if (ret < 0) {
-			return ret;
+	if (msg->msg_controllen > 0) {
+		if (msg->msg_control == NULL) {
+			errno = EINVAL;
+			goto fail;
 		}
 
-		if (sock_is_error(ctx)) {
-			return -POINTER_TO_INT(ctx->user_data);
+		msg_copy.msg_control =
+			k_usermode_alloc_from_copy(msg->msg_control,
+						   msg->msg_controllen);
+		if (msg_copy.msg_control == NULL) {
+			errno = ENOMEM;
+			goto fail;
 		}
 	}
 
-	return 0;
-}
+	ret = z_impl_zsock_recvmsg(sock, &msg_copy, flags);
 
-static int insert_pktinfo(struct msghdr *msg, int level, int type,
-			  void *pktinfo, size_t pktinfo_len)
-{
-	struct cmsghdr *cmsg;
+	/* Do not copy anything back if there was an error or nothing was
+	 * received.
+	 */
+	if (ret > 0) {
+		if (msg->msg_namelen > 0 && msg->msg_name != NULL) {
+			K_OOPS(k_usermode_to_copy(msg->msg_name,
+						  msg_copy.msg_name,
+						  msg_copy.msg_namelen));
+		}
 
-	if (msg->msg_controllen < pktinfo_len) {
-		return -EINVAL;
-	}
+		if (msg->msg_controllen > 0 &&
+		    msg->msg_control != NULL) {
+			K_OOPS(k_usermode_to_copy(msg->msg_control,
+						  msg_copy.msg_control,
+						  msg_copy.msg_controllen));
+
+			msg->msg_controllen = msg_copy.msg_controllen;
+		} else {
+			msg->msg_controllen = 0U;
+		}
+
+		k_usermode_to_copy(&msg->msg_iovlen,
+				   &msg_copy.msg_iovlen,
+				   sizeof(msg->msg_iovlen));
+
+		/* The new iovlen cannot be bigger than the original one */
+		NET_ASSERT(msg_copy.msg_iovlen <= iovlen);
 
-	for (cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) {
-		if (cmsg->cmsg_len == 0) {
-			break;
+		for (i = 0; i < iovlen; i++) {
+			if (i < msg_copy.msg_iovlen) {
+				K_OOPS(k_usermode_to_copy(msg->msg_iov[i].iov_base,
+							  msg_copy.msg_iov[i].iov_base,
+							  msg_copy.msg_iov[i].iov_len));
+				K_OOPS(k_usermode_to_copy(&msg->msg_iov[i].iov_len,
+							  &msg_copy.msg_iov[i].iov_len,
+							  sizeof(msg->msg_iov[i].iov_len)));
+			} else {
+				/* Clear out those vectors that we could not populate */
+				msg->msg_iov[i].iov_len = 0;
+			}
 		}
+
+		k_usermode_to_copy(&msg->msg_flags,
+				   &msg_copy.msg_flags,
+				   sizeof(msg->msg_flags));
 	}
 
-	if (cmsg == NULL) {
-		return -EINVAL;
+	k_free(msg_copy.msg_name);
+	k_free(msg_copy.msg_control);
+
+	/* Note that we need to free according to original iovlen */
+	for (i = 0; i < iovlen; i++) {
+		k_free(msg_copy.msg_iov[i].iov_base);
 	}
 
-	cmsg->cmsg_len = CMSG_LEN(pktinfo_len);
-	cmsg->cmsg_level = level;
-	cmsg->cmsg_type = type;
+	k_free(msg_copy.msg_iov);
 
-	memcpy(CMSG_DATA(cmsg), pktinfo, pktinfo_len);
+	return ret;
 
-	return 0;
-}
+fail:
+	if (msg_copy.msg_name) {
+		k_free(msg_copy.msg_name);
+	}
 
-static int add_timestamping(struct net_context *ctx,
-			    struct net_pkt *pkt,
-			    struct msghdr *msg)
-{
-	uint8_t timestamping = 0;
+	if (msg_copy.msg_control) {
+		k_free(msg_copy.msg_control);
+	}
 
-	net_context_get_option(ctx, NET_OPT_TIMESTAMPING, &timestamping, NULL);
+	if (msg_copy.msg_iov) {
+		for (i = 0; i < msg_copy.msg_iovlen; i++) {
+			if (msg_copy.msg_iov[i].iov_base) {
+				k_free(msg_copy.msg_iov[i].iov_base);
+			}
+		}
 
-	if (timestamping) {
-		return insert_pktinfo(msg, SOL_SOCKET, SO_TIMESTAMPING,
-				      net_pkt_timestamp(pkt), sizeof(struct net_ptp_time));
+		k_free(msg_copy.msg_iov);
 	}
 
-	return -ENOTSUP;
+	return -1;
 }
+#include <zephyr/syscalls/zsock_recvmsg_mrsh.c>
+#endif /* CONFIG_USERSPACE */
 
-static int add_pktinfo(struct net_context *ctx,
-			struct net_pkt *pkt,
-			struct msghdr *msg)
+/* As this is limited function, we don't follow POSIX signature, with
+ * "..." instead of last arg.
+ */
+int z_impl_zsock_fcntl_impl(int sock, int cmd, int flags)
 {
-	int ret = -ENOTSUP;
-	struct net_pkt_cursor backup;
-
-	net_pkt_cursor_backup(pkt, &backup);
-	net_pkt_cursor_init(pkt);
-
-	if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET) {
-		NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv4_access,
-						      struct net_ipv4_hdr);
-		struct in_pktinfo info;
-		struct net_ipv4_hdr *ipv4_hdr;
-
-		ipv4_hdr = (struct net_ipv4_hdr *)net_pkt_get_data(
-							pkt, &ipv4_access);
-		if (ipv4_hdr == NULL ||
-		    net_pkt_acknowledge_data(pkt, &ipv4_access) ||
-		    net_pkt_skip(pkt, net_pkt_ipv4_opts_len(pkt))) {
-			ret = -ENOBUFS;
-			goto out;
-		}
-
-		net_ipv4_addr_copy_raw((uint8_t *)&info.ipi_addr, ipv4_hdr->dst);
-		net_ipv4_addr_copy_raw((uint8_t *)&info.ipi_spec_dst,
-				       (uint8_t *)net_sin_ptr(&ctx->local)->sin_addr);
-		info.ipi_ifindex = ctx->iface;
+	const struct socket_op_vtable *vtable;
+	struct k_mutex *lock;
+	void *obj;
+	int ret;
 
-		ret = insert_pktinfo(msg, IPPROTO_IP, IP_PKTINFO,
-				     &info, sizeof(info));
+	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, fcntl, sock, cmd, flags);
 
-		goto out;
+	obj = get_sock_vtable(sock, &vtable, &lock);
+	if (obj == NULL) {
+		errno = EBADF;
+		SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, fcntl, sock, -errno);
+		return -1;
 	}
 
-	if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == AF_INET6) {
-		NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv6_access,
-						      struct net_ipv6_hdr);
-		struct in6_pktinfo info;
-		struct net_ipv6_hdr *ipv6_hdr;
-
-		ipv6_hdr = (struct net_ipv6_hdr *)net_pkt_get_data(
-							pkt, &ipv6_access);
-		if (ipv6_hdr == NULL ||
-		    net_pkt_acknowledge_data(pkt, &ipv6_access) ||
-		    net_pkt_skip(pkt, net_pkt_ipv6_ext_len(pkt))) {
-			ret = -ENOBUFS;
-			goto out;
-		}
-
-		net_ipv6_addr_copy_raw((uint8_t *)&info.ipi6_addr, ipv6_hdr->dst);
-		info.ipi6_ifindex = ctx->iface;
-
-		ret = insert_pktinfo(msg, IPPROTO_IPV6, IPV6_RECVPKTINFO,
-				     &info, sizeof(info));
+	(void)k_mutex_lock(lock, K_FOREVER);
 
-		goto out;
-	}
+	ret = zvfs_fdtable_call_ioctl((const struct fd_op_vtable *)vtable,
+				   obj, cmd, flags);
 
-out:
-	net_pkt_cursor_restore(pkt, &backup);
+	k_mutex_unlock(lock);
 
+	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, fcntl, sock,
+				       ret < 0 ? -errno : ret);
 	return ret;
 }
 
-static int update_msg_controllen(struct msghdr *msg)
+#ifdef CONFIG_USERSPACE
+static inline int z_vrfy_zsock_fcntl_impl(int sock, int cmd, int flags)
 {
-	struct cmsghdr *cmsg;
-	size_t cmsg_space = 0;
-
-	for (cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) {
-		if (cmsg->cmsg_len == 0) {
-			break;
-		}
-		cmsg_space += cmsg->cmsg_len;
-	}
-	msg->msg_controllen = cmsg_space;
-
-	return 0;
+	return z_impl_zsock_fcntl_impl(sock, cmd, flags);
 }
+#include <zephyr/syscalls/zsock_fcntl_impl_mrsh.c>
+#endif
 
-static inline ssize_t zsock_recv_dgram(struct net_context *ctx,
-				       struct msghdr *msg,
-				       void *buf,
-				       size_t max_len,
-				       int flags,
-				       struct sockaddr *src_addr,
-				       socklen_t *addrlen)
+int z_impl_zsock_ioctl_impl(int sock, unsigned long request, va_list args)
 {
-	k_timeout_t timeout = K_FOREVER;
-	size_t recv_len = 0;
-	size_t read_len;
-	struct net_pkt_cursor backup;
-	struct net_pkt *pkt;
-
-	if ((flags & ZSOCK_MSG_DONTWAIT) || sock_is_nonblock(ctx)) {
-		timeout = K_NO_WAIT;
-	} else {
-		int ret;
+	const struct socket_op_vtable *vtable;
+	struct k_mutex *lock;
+	void *ctx;
+	int ret;
 
-		net_context_get_option(ctx, NET_OPT_RCVTIMEO, &timeout, NULL);
+	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, ioctl, sock, request);
 
-		ret = zsock_wait_data(ctx, &timeout);
-		if (ret < 0) {
-			errno = -ret;
-			return -1;
-		}
+	ctx = get_sock_vtable(sock, &vtable, &lock);
+	if (ctx == NULL) {
+		errno = EBADF;
+		SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, ioctl, sock, -errno);
+		return -1;
 	}
 
-	if (flags & ZSOCK_MSG_PEEK) {
-		int res;
+	(void)k_mutex_lock(lock, K_FOREVER);
 
-		res = fifo_wait_non_empty(&ctx->recv_q, timeout);
-		/* EAGAIN when timeout expired, EINTR when cancelled */
-		if (res && res != -EAGAIN && res != -EINTR) {
-			errno = -res;
-			return -1;
-		}
+	NET_DBG("ioctl: ctx=%p, fd=%d, request=%lu", ctx, sock, request);
 
-		pkt = k_fifo_peek_head(&ctx->recv_q);
-	} else {
-		pkt = k_fifo_get(&ctx->recv_q, timeout);
-	}
-
-	if (!pkt) {
-		errno = EAGAIN;
-		return -1;
-	}
-
-	net_pkt_cursor_backup(pkt, &backup);
-
-	if (src_addr && addrlen) {
-		if (IS_ENABLED(CONFIG_NET_OFFLOAD) &&
-		    net_if_is_ip_offloaded(net_context_get_iface(ctx))) {
-			int ret;
-
-			ret  = sock_get_offload_pkt_src_addr(pkt, ctx, src_addr,
-								*addrlen);
-			if (ret < 0) {
-				errno = -ret;
-				NET_DBG("sock_get_offload_pkt_src_addr %d", ret);
-				goto fail;
-			}
-		} else {
-			int ret;
-
-			ret = sock_get_pkt_src_addr(pkt, net_context_get_proto(ctx),
-						   src_addr, *addrlen);
-			if (ret < 0) {
-				errno = -ret;
-				NET_DBG("sock_get_pkt_src_addr %d", ret);
-				goto fail;
-			}
-		}
-
-		/* addrlen is a value-result argument, set to actual
-		 * size of source address
-		 */
-		if (src_addr->sa_family == AF_INET) {
-			*addrlen = sizeof(struct sockaddr_in);
-		} else if (src_addr->sa_family == AF_INET6) {
-			*addrlen = sizeof(struct sockaddr_in6);
-		} else {
-			errno = ENOTSUP;
-			goto fail;
-		}
-	}
-
-	if (msg != NULL) {
-		int iovec = 0;
-		size_t tmp_read_len;
-
-		if (msg->msg_iovlen < 1 || msg->msg_iov == NULL) {
-			errno = ENOMEM;
-			return -1;
-		}
-
-		recv_len = net_pkt_remaining_data(pkt);
-		tmp_read_len = read_len = MIN(recv_len, max_len);
-
-		while (tmp_read_len > 0) {
-			size_t len;
-
-			buf = msg->msg_iov[iovec].iov_base;
-			if (buf == NULL) {
-				errno = EINVAL;
-				return -1;
-			}
-
-			len = MIN(tmp_read_len, msg->msg_iov[iovec].iov_len);
-
-			if (net_pkt_read(pkt, buf, len)) {
-				errno = ENOBUFS;
-				goto fail;
-			}
-
-			if (len <= tmp_read_len) {
-				tmp_read_len -= len;
-				msg->msg_iov[iovec].iov_len = len;
-				iovec++;
-			} else {
-				errno = EINVAL;
-				return -1;
-			}
-		}
-
-		msg->msg_iovlen = iovec;
-
-		if (recv_len != read_len) {
-			msg->msg_flags |= ZSOCK_MSG_TRUNC;
-		}
-
-	} else {
-		recv_len = net_pkt_remaining_data(pkt);
-		read_len = MIN(recv_len, max_len);
-
-		if (net_pkt_read(pkt, buf, read_len)) {
-			errno = ENOBUFS;
-			goto fail;
-		}
-	}
-
-	if (msg != NULL) {
-		if (msg->msg_control != NULL) {
-			if (msg->msg_controllen > 0) {
-				if (IS_ENABLED(CONFIG_NET_CONTEXT_TIMESTAMPING) &&
-				    net_context_is_timestamping_set(ctx)) {
-					if (add_timestamping(ctx, pkt, msg) < 0) {
-						msg->msg_flags |= ZSOCK_MSG_CTRUNC;
-					}
-				}
-
-				if (IS_ENABLED(CONFIG_NET_CONTEXT_RECV_PKTINFO) &&
-				    net_context_is_recv_pktinfo_set(ctx)) {
-					if (add_pktinfo(ctx, pkt, msg) < 0) {
-						msg->msg_flags |= ZSOCK_MSG_CTRUNC;
-					}
-				}
-
-				/* msg_controllen must be updated to reflect the total length of all
-				 * control messages in the buffer. If there are no control data,
-				 * msg_controllen will be cleared as expected It will also take into
-				 * account pre-existing control data
-				 */
-				update_msg_controllen(msg);
-			}
-		} else {
-			msg->msg_controllen = 0U;
-		}
-	}
-
-	if ((IS_ENABLED(CONFIG_NET_PKT_RXTIME_STATS) ||
-	     IS_ENABLED(CONFIG_TRACING_NET_CORE)) &&
-	    !(flags & ZSOCK_MSG_PEEK)) {
-		net_socket_update_tc_rx_time(pkt, k_cycle_get_32());
-	}
-
-	if (!(flags & ZSOCK_MSG_PEEK)) {
-		net_pkt_unref(pkt);
-	} else {
-		net_pkt_cursor_restore(pkt, &backup);
-	}
-
-	return (flags & ZSOCK_MSG_TRUNC) ? recv_len : read_len;
-
-fail:
-	if (!(flags & ZSOCK_MSG_PEEK)) {
-		net_pkt_unref(pkt);
-	}
-
-	return -1;
-}
-
-static size_t zsock_recv_stream_immediate(struct net_context *ctx, uint8_t **buf, size_t *max_len,
-					  int flags)
-{
-	size_t len;
-	size_t pkt_len;
-	size_t recv_len = 0;
-	struct net_pkt *pkt;
-	struct net_pkt_cursor backup;
-	struct net_pkt *origin = NULL;
-	const bool do_recv = !(buf == NULL || max_len == NULL);
-	size_t _max_len = (max_len == NULL) ? SIZE_MAX : *max_len;
-	const bool peek = (flags & ZSOCK_MSG_PEEK) == ZSOCK_MSG_PEEK;
-
-	while (_max_len > 0) {
-		/* only peek until we know we can dequeue and / or requeue buffer */
-		pkt = k_fifo_peek_head(&ctx->recv_q);
-		if (pkt == NULL || pkt == origin) {
-			break;
-		}
-
-		if (origin == NULL) {
-			/* mark first pkt to avoid cycles when observing */
-			origin = pkt;
-		}
-
-		pkt_len = net_pkt_remaining_data(pkt);
-		len = MIN(_max_len, pkt_len);
-		recv_len += len;
-		_max_len -= len;
-
-		if (do_recv && len > 0) {
-			if (peek) {
-				net_pkt_cursor_backup(pkt, &backup);
-			}
-
-			net_pkt_read(pkt, *buf, len);
-			/* update buffer position for caller */
-			*buf += len;
-
-			if (peek) {
-				net_pkt_cursor_restore(pkt, &backup);
-			}
-		}
-
-		if (do_recv && !peek) {
-			if (len == pkt_len) {
-				/* dequeue empty packets when not observing */
-				pkt = k_fifo_get(&ctx->recv_q, K_NO_WAIT);
-				if (net_pkt_eof(pkt)) {
-					sock_set_eof(ctx);
-				}
-
-				if (IS_ENABLED(CONFIG_NET_PKT_RXTIME_STATS) ||
-				    IS_ENABLED(CONFIG_TRACING_NET_CORE)) {
-					net_socket_update_tc_rx_time(pkt, k_cycle_get_32());
-				}
-
-				net_pkt_unref(pkt);
-			}
-		} else if (!do_recv || peek) {
-			/* requeue packets when observing */
-			k_fifo_put(&ctx->recv_q, k_fifo_get(&ctx->recv_q, K_NO_WAIT));
-		}
-	}
-
-	if (do_recv) {
-		/* convey remaining buffer size back to caller */
-		*max_len = _max_len;
-	}
-
-	return recv_len;
-}
-
-static int zsock_fionread_ctx(struct net_context *ctx)
-{
-	size_t ret = zsock_recv_stream_immediate(ctx, NULL, NULL, 0);
-
-	return MIN(ret, INT_MAX);
-}
-
-static ssize_t zsock_recv_stream_timed(struct net_context *ctx, struct msghdr *msg,
-				       uint8_t *buf, size_t max_len,
-				       int flags, k_timeout_t timeout)
-{
-	int res;
-	k_timepoint_t end;
-	size_t recv_len = 0, iovec = 0, available_len, max_iovlen = 0;
-	const bool waitall = (flags & ZSOCK_MSG_WAITALL) == ZSOCK_MSG_WAITALL;
-
-	if (msg != NULL && buf == NULL) {
-		if (msg->msg_iovlen < 1) {
-			return -EINVAL;
-		}
-
-		buf = msg->msg_iov[iovec].iov_base;
-		available_len = msg->msg_iov[iovec].iov_len;
-		msg->msg_iov[iovec].iov_len = 0;
-		max_iovlen = msg->msg_iovlen;
-	}
-
-	for (end = sys_timepoint_calc(timeout); max_len > 0; timeout = sys_timepoint_timeout(end)) {
-
-		if (sock_is_error(ctx)) {
-			return -POINTER_TO_INT(ctx->user_data);
-		}
-
-		if (sock_is_eof(ctx)) {
-			return 0;
-		}
-
-		if (!K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
-			res = zsock_wait_data(ctx, &timeout);
-			if (res < 0) {
-				return res;
-			}
-		}
-
-		if (msg != NULL) {
-again:
-			res = zsock_recv_stream_immediate(ctx, &buf, &available_len, flags);
-			recv_len += res;
-
-			if (res == 0 && recv_len == 0 && K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
-				return -EAGAIN;
-			}
-
-			msg->msg_iov[iovec].iov_len += res;
-			buf = (uint8_t *)(msg->msg_iov[iovec].iov_base) + res;
-			max_len -= res;
-
-			if (available_len == 0) {
-				/* All data to this iovec was written */
-				iovec++;
-
-				if (iovec == max_iovlen) {
-					break;
-				}
-
-				msg->msg_iovlen = iovec;
-				buf = msg->msg_iov[iovec].iov_base;
-				available_len = msg->msg_iov[iovec].iov_len;
-				msg->msg_iov[iovec].iov_len = 0;
-
-				/* If there is more data, read it now and do not wait */
-				if (buf != NULL && available_len > 0) {
-					goto again;
-				}
-
-				continue;
-			}
-
-		} else {
-			res = zsock_recv_stream_immediate(ctx, &buf, &max_len, flags);
-			recv_len += res;
-
-			if (res == 0) {
-				if (recv_len == 0 && K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
-					return -EAGAIN;
-				}
-			}
-		}
-
-		if (!waitall) {
-			break;
-		}
-	}
-
-	return recv_len;
-}
-
-static ssize_t zsock_recv_stream(struct net_context *ctx, struct msghdr *msg,
-				 void *buf, size_t max_len, int flags)
-{
-	ssize_t res;
-	size_t recv_len = 0;
-	k_timeout_t timeout = K_FOREVER;
-
-	if (!net_context_is_used(ctx)) {
-		errno = EBADF;
-		return -1;
-	}
-
-	if (net_context_get_state(ctx) != NET_CONTEXT_CONNECTED) {
-		errno = ENOTCONN;
-		return -1;
-	}
-
-	if ((flags & ZSOCK_MSG_DONTWAIT) || sock_is_nonblock(ctx)) {
-		timeout = K_NO_WAIT;
-	} else if (!sock_is_eof(ctx) && !sock_is_error(ctx)) {
-		net_context_get_option(ctx, NET_OPT_RCVTIMEO, &timeout, NULL);
-	}
-
-	if (max_len == 0) {
-		/* no bytes requested - done! */
-		return 0;
-	}
-
-	res = zsock_recv_stream_timed(ctx, msg, buf, max_len, flags, timeout);
-	recv_len += MAX(0, res);
-
-	if (res < 0) {
-		errno = -res;
-		return -1;
-	}
-
-	if (!(flags & ZSOCK_MSG_PEEK)) {
-		net_context_update_recv_wnd(ctx, recv_len);
-	}
-
-	return recv_len;
-}
-
-ssize_t zsock_recvfrom_ctx(struct net_context *ctx, void *buf, size_t max_len,
-			   int flags,
-			   struct sockaddr *src_addr, socklen_t *addrlen)
-{
-	enum net_sock_type sock_type = net_context_get_type(ctx);
-
-	if (max_len == 0) {
-		return 0;
-	}
-
-	if (sock_type == SOCK_DGRAM) {
-		return zsock_recv_dgram(ctx, NULL, buf, max_len, flags, src_addr, addrlen);
-	} else if (sock_type == SOCK_STREAM) {
-		return zsock_recv_stream(ctx, NULL, buf, max_len, flags);
-	}
-
-	__ASSERT(0, "Unknown socket type");
-
-	errno = ENOTSUP;
-
-	return -1;
-}
-
-ssize_t z_impl_zsock_recvfrom(int sock, void *buf, size_t max_len, int flags,
-			     struct sockaddr *src_addr, socklen_t *addrlen)
-{
-	int bytes_received;
-
-	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, recvfrom, sock, max_len, flags, src_addr, addrlen);
-
-	bytes_received = VTABLE_CALL(recvfrom, sock, buf, max_len, flags, src_addr, addrlen);
-
-	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, recvfrom, sock,
-				       src_addr, addrlen,
-				       bytes_received < 0 ? -errno : bytes_received);
-
-	sock_obj_core_update_recv_stats(sock, bytes_received);
-
-	return bytes_received;
-}
-
-#ifdef CONFIG_USERSPACE
-ssize_t z_vrfy_zsock_recvfrom(int sock, void *buf, size_t max_len, int flags,
-			      struct sockaddr *src_addr, socklen_t *addrlen)
-{
-	socklen_t addrlen_copy;
-	ssize_t ret;
-
-	if (K_SYSCALL_MEMORY_WRITE(buf, max_len)) {
-		errno = EFAULT;
-		return -1;
-	}
-
-	if (addrlen) {
-		K_OOPS(k_usermode_from_copy(&addrlen_copy, addrlen,
-					sizeof(socklen_t)));
-	}
-	K_OOPS(src_addr && K_SYSCALL_MEMORY_WRITE(src_addr, addrlen_copy));
-
-	ret = z_impl_zsock_recvfrom(sock, (void *)buf, max_len, flags,
-				   (struct sockaddr *)src_addr,
-				   addrlen ? &addrlen_copy : NULL);
-
-	if (addrlen) {
-		K_OOPS(k_usermode_to_copy(addrlen, &addrlen_copy,
-				      sizeof(socklen_t)));
-	}
-
-	return ret;
-}
-#include <zephyr/syscalls/zsock_recvfrom_mrsh.c>
-#endif /* CONFIG_USERSPACE */
-
-ssize_t zsock_recvmsg_ctx(struct net_context *ctx, struct msghdr *msg,
-			  int flags)
-{
-	enum net_sock_type sock_type = net_context_get_type(ctx);
-	size_t i, max_len = 0;
-
-	if (msg == NULL) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	if (msg->msg_iov == NULL) {
-		errno = ENOMEM;
-		return -1;
-	}
-
-	for (i = 0; i < msg->msg_iovlen; i++) {
-		max_len += msg->msg_iov[i].iov_len;
-	}
-
-	if (sock_type == SOCK_DGRAM) {
-		return zsock_recv_dgram(ctx, msg, NULL, max_len, flags,
-					msg->msg_name, &msg->msg_namelen);
-	} else if (sock_type == SOCK_STREAM) {
-		return zsock_recv_stream(ctx, msg, NULL, max_len, flags);
-	}
-
-	__ASSERT(0, "Unknown socket type");
-
-	errno = ENOTSUP;
-
-	return -1;
-}
-
-ssize_t z_impl_zsock_recvmsg(int sock, struct msghdr *msg, int flags)
-{
-	int bytes_received;
-
-	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, recvmsg, sock, msg, flags);
-
-	bytes_received = VTABLE_CALL(recvmsg, sock, msg, flags);
-
-	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, recvmsg, sock, msg,
-				       bytes_received < 0 ? -errno : bytes_received);
-
-	sock_obj_core_update_recv_stats(sock, bytes_received);
-
-	return bytes_received;
-}
-
-#ifdef CONFIG_USERSPACE
-ssize_t z_vrfy_zsock_recvmsg(int sock, struct msghdr *msg, int flags)
-{
-	struct msghdr msg_copy;
-	size_t iovlen;
-	size_t i;
-	int ret;
-
-	if (msg == NULL) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	if (msg->msg_iov == NULL) {
-		errno = ENOMEM;
-		return -1;
-	}
-
-	K_OOPS(k_usermode_from_copy(&msg_copy, (void *)msg, sizeof(msg_copy)));
-
-	k_usermode_from_copy(&iovlen, &msg->msg_iovlen, sizeof(iovlen));
-
-	msg_copy.msg_name = NULL;
-	msg_copy.msg_control = NULL;
-
-	msg_copy.msg_iov = k_usermode_alloc_from_copy(msg->msg_iov,
-				       msg->msg_iovlen * sizeof(struct iovec));
-	if (!msg_copy.msg_iov) {
-		errno = ENOMEM;
-		goto fail;
-	}
-
-	/* Clear the pointers in the copy so that if the allocation in the
-	 * next loop fails, we do not try to free non allocated memory
-	 * in fail branch.
-	 */
-	memset(msg_copy.msg_iov, 0, msg->msg_iovlen * sizeof(struct iovec));
-
-	for (i = 0; i < iovlen; i++) {
-		/* TODO: In practice we do not need to copy the actual data
-		 * in msghdr when receiving data but currently there is no
-		 * ready made function to do just that (unless we want to call
-		 * relevant malloc function here ourselves). So just use
-		 * the copying variant for now.
-		 */
-		msg_copy.msg_iov[i].iov_base =
-			k_usermode_alloc_from_copy(msg->msg_iov[i].iov_base,
-						   msg->msg_iov[i].iov_len);
-		if (!msg_copy.msg_iov[i].iov_base) {
-			errno = ENOMEM;
-			goto fail;
-		}
-
-		msg_copy.msg_iov[i].iov_len = msg->msg_iov[i].iov_len;
-	}
-
-	if (msg->msg_namelen > 0) {
-		if (msg->msg_name == NULL) {
-			errno = EINVAL;
-			goto fail;
-		}
-
-		msg_copy.msg_name = k_usermode_alloc_from_copy(msg->msg_name,
-							   msg->msg_namelen);
-		if (msg_copy.msg_name == NULL) {
-			errno = ENOMEM;
-			goto fail;
-		}
-	}
-
-	if (msg->msg_controllen > 0) {
-		if (msg->msg_control == NULL) {
-			errno = EINVAL;
-			goto fail;
-		}
-
-		msg_copy.msg_control =
-			k_usermode_alloc_from_copy(msg->msg_control,
-						   msg->msg_controllen);
-		if (msg_copy.msg_control == NULL) {
-			errno = ENOMEM;
-			goto fail;
-		}
-	}
-
-	ret = z_impl_zsock_recvmsg(sock, &msg_copy, flags);
-
-	/* Do not copy anything back if there was an error or nothing was
-	 * received.
-	 */
-	if (ret > 0) {
-		if (msg->msg_namelen > 0 && msg->msg_name != NULL) {
-			K_OOPS(k_usermode_to_copy(msg->msg_name,
-						  msg_copy.msg_name,
-						  msg_copy.msg_namelen));
-		}
-
-		if (msg->msg_controllen > 0 &&
-		    msg->msg_control != NULL) {
-			K_OOPS(k_usermode_to_copy(msg->msg_control,
-						  msg_copy.msg_control,
-						  msg_copy.msg_controllen));
-
-			msg->msg_controllen = msg_copy.msg_controllen;
-		} else {
-			msg->msg_controllen = 0U;
-		}
-
-		k_usermode_to_copy(&msg->msg_iovlen,
-				   &msg_copy.msg_iovlen,
-				   sizeof(msg->msg_iovlen));
-
-		/* The new iovlen cannot be bigger than the original one */
-		NET_ASSERT(msg_copy.msg_iovlen <= iovlen);
-
-		for (i = 0; i < iovlen; i++) {
-			if (i < msg_copy.msg_iovlen) {
-				K_OOPS(k_usermode_to_copy(msg->msg_iov[i].iov_base,
-							  msg_copy.msg_iov[i].iov_base,
-							  msg_copy.msg_iov[i].iov_len));
-				K_OOPS(k_usermode_to_copy(&msg->msg_iov[i].iov_len,
-							  &msg_copy.msg_iov[i].iov_len,
-							  sizeof(msg->msg_iov[i].iov_len)));
-			} else {
-				/* Clear out those vectors that we could not populate */
-				msg->msg_iov[i].iov_len = 0;
-			}
-		}
-
-		k_usermode_to_copy(&msg->msg_flags,
-				   &msg_copy.msg_flags,
-				   sizeof(msg->msg_flags));
-	}
-
-	k_free(msg_copy.msg_name);
-	k_free(msg_copy.msg_control);
-
-	/* Note that we need to free according to original iovlen */
-	for (i = 0; i < iovlen; i++) {
-		k_free(msg_copy.msg_iov[i].iov_base);
-	}
-
-	k_free(msg_copy.msg_iov);
-
-	return ret;
-
-fail:
-	if (msg_copy.msg_name) {
-		k_free(msg_copy.msg_name);
-	}
-
-	if (msg_copy.msg_control) {
-		k_free(msg_copy.msg_control);
-	}
-
-	if (msg_copy.msg_iov) {
-		for (i = 0; i < msg_copy.msg_iovlen; i++) {
-			if (msg_copy.msg_iov[i].iov_base) {
-				k_free(msg_copy.msg_iov[i].iov_base);
-			}
-		}
-
-		k_free(msg_copy.msg_iov);
-	}
-
-	return -1;
-}
-#include <zephyr/syscalls/zsock_recvmsg_mrsh.c>
-#endif /* CONFIG_USERSPACE */
-
-/* As this is limited function, we don't follow POSIX signature, with
- * "..." instead of last arg.
- */
-int z_impl_zsock_fcntl_impl(int sock, int cmd, int flags)
-{
-	const struct socket_op_vtable *vtable;
-	struct k_mutex *lock;
-	void *obj;
-	int ret;
-
-	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, fcntl, sock, cmd, flags);
-
-	obj = get_sock_vtable(sock, &vtable, &lock);
-	if (obj == NULL) {
-		errno = EBADF;
-		SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, fcntl, sock, -errno);
-		return -1;
-	}
-
-	(void)k_mutex_lock(lock, K_FOREVER);
-
-	ret = zvfs_fdtable_call_ioctl((const struct fd_op_vtable *)vtable,
-				   obj, cmd, flags);
-
-	k_mutex_unlock(lock);
-
-	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, fcntl, sock,
-				       ret < 0 ? -errno : ret);
-	return ret;
-}
-
-#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_zsock_fcntl_impl(int sock, int cmd, int flags)
-{
-	return z_impl_zsock_fcntl_impl(sock, cmd, flags);
-}
-#include <zephyr/syscalls/zsock_fcntl_impl_mrsh.c>
-#endif
-
-int z_impl_zsock_ioctl_impl(int sock, unsigned long request, va_list args)
-{
-	const struct socket_op_vtable *vtable;
-	struct k_mutex *lock;
-	void *ctx;
-	int ret;
-
-	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, ioctl, sock, request);
-
-	ctx = get_sock_vtable(sock, &vtable, &lock);
-	if (ctx == NULL) {
-		errno = EBADF;
-		SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, ioctl, sock, -errno);
-		return -1;
-	}
-
-	(void)k_mutex_lock(lock, K_FOREVER);
-
-	NET_DBG("ioctl: ctx=%p, fd=%d, request=%lu", ctx, sock, request);
-
-	ret = vtable->fd_vtable.ioctl(ctx, request, args);
-
-	k_mutex_unlock(lock);
-
-	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, ioctl, sock,
-				       ret < 0 ? -errno : ret);
-	return ret;
-
-}
-
-#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_zsock_ioctl_impl(int sock, unsigned long request, va_list args)
-{
-	switch (request) {
-	case ZFD_IOCTL_FIONBIO:
-		break;
-
-	case ZFD_IOCTL_FIONREAD: {
-		int *avail;
-
-		avail = va_arg(args, int *);
-		K_OOPS(K_SYSCALL_MEMORY_WRITE(avail, sizeof(*avail)));
-
-		break;
-	}
-
-	default:
-		errno = EOPNOTSUPP;
-		return -1;
-	}
-
-	return z_impl_zsock_ioctl_impl(sock, request, args);
-}
-#include <zephyr/syscalls/zsock_ioctl_impl_mrsh.c>
-#endif
-
-static int zsock_poll_prepare_ctx(struct net_context *ctx,
-				  struct zsock_pollfd *pfd,
-				  struct k_poll_event **pev,
-				  struct k_poll_event *pev_end)
-{
-	if (pfd->events & ZSOCK_POLLIN) {
-		if (*pev == pev_end) {
-			return -ENOMEM;
-		}
-
-		(*pev)->obj = &ctx->recv_q;
-		(*pev)->type = K_POLL_TYPE_FIFO_DATA_AVAILABLE;
-		(*pev)->mode = K_POLL_MODE_NOTIFY_ONLY;
-		(*pev)->state = K_POLL_STATE_NOT_READY;
-		(*pev)++;
-	}
-
-	if (pfd->events & ZSOCK_POLLOUT) {
-		if (IS_ENABLED(CONFIG_NET_NATIVE_TCP) &&
-		    net_context_get_type(ctx) == SOCK_STREAM &&
-		    !net_if_is_ip_offloaded(net_context_get_iface(ctx))) {
-			if (*pev == pev_end) {
-				return -ENOMEM;
-			}
-
-			if (net_context_get_state(ctx) == NET_CONTEXT_CONNECTING) {
-				(*pev)->obj = net_tcp_conn_sem_get(ctx);
-			} else {
-				(*pev)->obj = net_tcp_tx_sem_get(ctx);
-			}
-
-			(*pev)->type = K_POLL_TYPE_SEM_AVAILABLE;
-			(*pev)->mode = K_POLL_MODE_NOTIFY_ONLY;
-			(*pev)->state = K_POLL_STATE_NOT_READY;
-			(*pev)++;
-		} else {
-			return -EALREADY;
-		}
-
-	}
-
-	/* If socket is already in EOF or error, it can be reported
-	 * immediately, so we tell poll() to short-circuit wait.
-	 */
-	if (sock_is_eof(ctx) || sock_is_error(ctx)) {
-		return -EALREADY;
-	}
-
-	return 0;
-}
-
-static int zsock_poll_update_ctx(struct net_context *ctx,
-				 struct zsock_pollfd *pfd,
-				 struct k_poll_event **pev)
-{
-	ARG_UNUSED(ctx);
-
-	if (pfd->events & ZSOCK_POLLIN) {
-		if ((*pev)->state != K_POLL_STATE_NOT_READY || sock_is_eof(ctx)) {
-			pfd->revents |= ZSOCK_POLLIN;
-		}
-		(*pev)++;
-	}
-	if (pfd->events & ZSOCK_POLLOUT) {
-		if (IS_ENABLED(CONFIG_NET_NATIVE_TCP) &&
-		    net_context_get_type(ctx) == SOCK_STREAM &&
-		    !net_if_is_ip_offloaded(net_context_get_iface(ctx))) {
-			if ((*pev)->state != K_POLL_STATE_NOT_READY &&
-			    !sock_is_eof(ctx) &&
-			    (net_context_get_state(ctx) == NET_CONTEXT_CONNECTED)) {
-				pfd->revents |= ZSOCK_POLLOUT;
-			}
-			(*pev)++;
-		} else {
-			pfd->revents |= ZSOCK_POLLOUT;
-		}
-	}
-
-	if (sock_is_error(ctx)) {
-		pfd->revents |= ZSOCK_POLLERR;
-	}
-
-	if (sock_is_eof(ctx)) {
-		pfd->revents |= ZSOCK_POLLHUP;
-	}
-
-	return 0;
-}
-
-static inline int time_left(uint32_t start, uint32_t timeout)
-{
-	uint32_t elapsed = k_uptime_get_32() - start;
-
-	return timeout - elapsed;
-}
-
-int zsock_poll_internal(struct zsock_pollfd *fds, int nfds, k_timeout_t timeout)
-{
-	bool retry;
-	int ret = 0;
-	int i;
-	struct zsock_pollfd *pfd;
-	struct k_poll_event poll_events[CONFIG_NET_SOCKETS_POLL_MAX];
-	struct k_poll_event *pev;
-	struct k_poll_event *pev_end = poll_events + ARRAY_SIZE(poll_events);
-	const struct fd_op_vtable *vtable;
-	struct k_mutex *lock;
-	k_timepoint_t end;
-	bool offload = false;
-	const struct fd_op_vtable *offl_vtable = NULL;
-	void *offl_ctx = NULL;
-
-	end = sys_timepoint_calc(timeout);
-
-	pev = poll_events;
-	for (pfd = fds, i = nfds; i--; pfd++) {
-		void *ctx;
-		int result;
-
-		/* Per POSIX, negative fd's are just ignored */
-		if (pfd->fd < 0) {
-			continue;
-		}
-
-		ctx = get_sock_vtable(pfd->fd,
-				      (const struct socket_op_vtable **)&vtable,
-				      &lock);
-		if (ctx == NULL) {
-			/* Will set POLLNVAL in return loop */
-			continue;
-		}
-
-		(void)k_mutex_lock(lock, K_FOREVER);
-
-		result = zvfs_fdtable_call_ioctl(vtable, ctx,
-					      ZFD_IOCTL_POLL_PREPARE,
-					      pfd, &pev, pev_end);
-		if (result == -EALREADY) {
-			/* If POLL_PREPARE returned with EALREADY, it means
-			 * it already detected that some socket is ready. In
-			 * this case, we still perform a k_poll to pick up
-			 * as many events as possible, but without any wait.
-			 */
-			timeout = K_NO_WAIT;
-			end = sys_timepoint_calc(timeout);
-			result = 0;
-		} else if (result == -EXDEV) {
-			/* If POLL_PREPARE returned EXDEV, it means
-			 * it detected an offloaded socket.
-			 * If offloaded socket is used with native TLS, the TLS
-			 * wrapper for the offloaded poll will be used.
-			 * In case the fds array contains a mixup of offloaded
-			 * and non-offloaded sockets, the offloaded poll handler
-			 * shall return an error.
-			 */
-			offload = true;
-			if (offl_vtable == NULL || net_socket_is_tls(ctx)) {
-				offl_vtable = vtable;
-				offl_ctx = ctx;
-			}
-
-			result = 0;
-		}
-
-		k_mutex_unlock(lock);
-
-		if (result < 0) {
-			errno = -result;
-			return -1;
-		}
-	}
-
-	if (offload) {
-		int poll_timeout;
-
-		if (K_TIMEOUT_EQ(timeout, K_FOREVER)) {
-			poll_timeout = SYS_FOREVER_MS;
-		} else {
-			poll_timeout = k_ticks_to_ms_floor32(timeout.ticks);
-		}
-
-		return zvfs_fdtable_call_ioctl(offl_vtable, offl_ctx,
-					    ZFD_IOCTL_POLL_OFFLOAD,
-					    fds, nfds, poll_timeout);
-	}
-
-	timeout = sys_timepoint_timeout(end);
-
-	do {
-		ret = k_poll(poll_events, pev - poll_events, timeout);
-		/* EAGAIN when timeout expired, EINTR when cancelled (i.e. EOF) */
-		if (ret != 0 && ret != -EAGAIN && ret != -EINTR) {
-			errno = -ret;
-			return -1;
-		}
-
-		retry = false;
-		ret = 0;
-
-		pev = poll_events;
-		for (pfd = fds, i = nfds; i--; pfd++) {
-			void *ctx;
-			int result;
-
-			pfd->revents = 0;
-
-			if (pfd->fd < 0) {
-				continue;
-			}
-
-			ctx = get_sock_vtable(
-				pfd->fd,
-				(const struct socket_op_vtable **)&vtable,
-				&lock);
-			if (ctx == NULL) {
-				pfd->revents = ZSOCK_POLLNVAL;
-				ret++;
-				continue;
-			}
-
-			(void)k_mutex_lock(lock, K_FOREVER);
-
-			result = zvfs_fdtable_call_ioctl(vtable, ctx,
-						      ZFD_IOCTL_POLL_UPDATE,
-						      pfd, &pev);
-			k_mutex_unlock(lock);
-
-			if (result == -EAGAIN) {
-				retry = true;
-				continue;
-			} else if (result != 0) {
-				errno = -result;
-				return -1;
-			}
-
-			if (pfd->revents != 0) {
-				ret++;
-			}
-		}
-
-		if (retry) {
-			if (ret > 0) {
-				break;
-			}
-
-			timeout = sys_timepoint_timeout(end);
-
-			if (K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
-				break;
-			}
-		}
-	} while (retry);
-
-	return ret;
-}
-
-int z_impl_zsock_poll(struct zsock_pollfd *fds, int nfds, int poll_timeout)
-{
-	k_timeout_t timeout;
-	int ret;
-
-	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, poll, fds, nfds, poll_timeout);
-
-	if (poll_timeout < 0) {
-		timeout = K_FOREVER;
-	} else {
-		timeout = K_MSEC(poll_timeout);
-	}
-
-	ret = zsock_poll_internal(fds, nfds, timeout);
-
-	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, poll, fds, nfds,
-				       ret < 0 ? -errno : ret);
-	return ret;
-}
-
-#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_zsock_poll(struct zsock_pollfd *fds,
-				    int nfds, int timeout)
-{
-	struct zsock_pollfd *fds_copy;
-	size_t fds_size;
-	int ret;
-
-	/* Copy fds array from user mode */
-	if (size_mul_overflow(nfds, sizeof(struct zsock_pollfd), &fds_size)) {
-		errno = EFAULT;
-		return -1;
-	}
-	fds_copy = k_usermode_alloc_from_copy((void *)fds, fds_size);
-	if (!fds_copy) {
-		errno = ENOMEM;
-		return -1;
-	}
-
-	ret = z_impl_zsock_poll(fds_copy, nfds, timeout);
-
-	if (ret >= 0) {
-		k_usermode_to_copy((void *)fds, fds_copy, fds_size);
-	}
-	k_free(fds_copy);
-
-	return ret;
-}
-#include <zephyr/syscalls/zsock_poll_mrsh.c>
-#endif
-
-int z_impl_zsock_inet_pton(sa_family_t family, const char *src, void *dst)
-{
-	if (net_addr_pton(family, src, dst) == 0) {
-		return 1;
-	} else {
-		return 0;
-	}
-}
-
-#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_zsock_inet_pton(sa_family_t family,
-					 const char *src, void *dst)
-{
-	int dst_size;
-	char src_copy[NET_IPV6_ADDR_LEN];
-	char dst_copy[sizeof(struct in6_addr)];
-	int ret;
-
-	switch (family) {
-	case AF_INET:
-		dst_size = sizeof(struct in_addr);
-		break;
-	case AF_INET6:
-		dst_size = sizeof(struct in6_addr);
-		break;
-	default:
-		errno = EAFNOSUPPORT;
-		return -1;
-	}
-
-	K_OOPS(k_usermode_string_copy(src_copy, (char *)src, sizeof(src_copy)));
-	ret = z_impl_zsock_inet_pton(family, src_copy, dst_copy);
-	K_OOPS(k_usermode_to_copy(dst, dst_copy, dst_size));
-
-	return ret;
-}
-#include <zephyr/syscalls/zsock_inet_pton_mrsh.c>
-#endif
-
-static enum tcp_conn_option get_tcp_option(int optname)
-{
-	switch (optname) {
-	case TCP_KEEPIDLE:
-		return TCP_OPT_KEEPIDLE;
-	case TCP_KEEPINTVL:
-		return TCP_OPT_KEEPINTVL;
-	case TCP_KEEPCNT:
-		return TCP_OPT_KEEPCNT;
-	}
-
-	return -EINVAL;
-}
-
-int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname,
-			 void *optval, socklen_t *optlen)
-{
-	int ret;
-
-	switch (level) {
-	case SOL_SOCKET:
-		switch (optname) {
-		case SO_ERROR: {
-			if (*optlen != sizeof(int)) {
-				errno = EINVAL;
-				return -1;
-			}
-
-			*(int *)optval = POINTER_TO_INT(ctx->user_data);
-
-			return 0;
-		}
-
-		case SO_TYPE: {
-			int type = (int)net_context_get_type(ctx);
-
-			if (*optlen != sizeof(type)) {
-				errno = EINVAL;
-				return -1;
-			}
-
-			*(int *)optval = type;
-
-			return 0;
-		}
-
-		case SO_TXTIME:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_TXTIME)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_TXTIME,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-			break;
-
-		case SO_PROTOCOL: {
-			int proto = (int)net_context_get_proto(ctx);
-
-			if (*optlen != sizeof(proto)) {
-				errno = EINVAL;
-				return -1;
-			}
-
-			*(int *)optval = proto;
-
-			return 0;
-		}
-
-		case SO_DOMAIN: {
-			if (*optlen != sizeof(int)) {
-				errno = EINVAL;
-				return -1;
-			}
-
-			*(int *)optval = net_context_get_family(ctx);
-
-			return 0;
-		}
-
-		break;
-
-		case SO_RCVBUF:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_RCVBUF)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_RCVBUF,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-			break;
-
-		case SO_SNDBUF:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_SNDBUF)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_SNDBUF,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-			break;
-
-		case SO_REUSEADDR:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEADDR)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_REUSEADDR,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-			break;
-
-		case SO_REUSEPORT:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEPORT)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_REUSEPORT,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-			break;
-
-		case SO_KEEPALIVE:
-			if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE) &&
-			    net_context_get_proto(ctx) == IPPROTO_TCP) {
-				ret = net_tcp_get_option(ctx,
-							 TCP_OPT_KEEPALIVE,
-							 optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case SO_TIMESTAMPING:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_TIMESTAMPING)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_TIMESTAMPING,
-							     optval, optlen);
-
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-		}
-
-		break;
-
-	case IPPROTO_TCP:
-		switch (optname) {
-		case TCP_NODELAY:
-			ret = net_tcp_get_option(ctx, TCP_OPT_NODELAY, optval, optlen);
-			return ret;
-
-		case TCP_KEEPIDLE:
-			__fallthrough;
-		case TCP_KEEPINTVL:
-			__fallthrough;
-		case TCP_KEEPCNT:
-			if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE)) {
-				ret = net_tcp_get_option(ctx,
-							 get_tcp_option(optname),
-							 optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-		}
-
-		break;
-
-	case IPPROTO_IP:
-		switch (optname) {
-		case IP_TOS:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_DSCP_ECN,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case IP_TTL:
-			ret = net_context_get_option(ctx, NET_OPT_TTL,
-						     optval, optlen);
-			if (ret < 0) {
-				errno  = -ret;
-				return -1;
-			}
-
-			return 0;
-
-		case IP_MULTICAST_TTL:
-			ret = net_context_get_option(ctx, NET_OPT_MCAST_TTL,
-						     optval, optlen);
-			if (ret < 0) {
-				errno  = -ret;
-				return -1;
-			}
-
-			return 0;
-		}
-
-		break;
-
-	case IPPROTO_IPV6:
-		switch (optname) {
-		case IPV6_V6ONLY:
-			if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_IPV6_V6ONLY,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case IPV6_ADDR_PREFERENCES:
-			if (IS_ENABLED(CONFIG_NET_IPV6)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_ADDR_PREFERENCES,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case IPV6_TCLASS:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_DSCP_ECN,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case IPV6_UNICAST_HOPS:
-			ret = net_context_get_option(ctx,
-						     NET_OPT_UNICAST_HOP_LIMIT,
-						     optval, optlen);
-			if (ret < 0) {
-				errno  = -ret;
-				return -1;
-			}
-
-			return 0;
-
-		case IPV6_MULTICAST_HOPS:
-			ret = net_context_get_option(ctx,
-						     NET_OPT_MCAST_HOP_LIMIT,
-						     optval, optlen);
-			if (ret < 0) {
-				errno  = -ret;
-				return -1;
-			}
-
-			return 0;
-		}
-
-		break;
-	}
-
-	errno = ENOPROTOOPT;
-	return -1;
-}
-
-int z_impl_zsock_getsockopt(int sock, int level, int optname,
-			    void *optval, socklen_t *optlen)
-{
-	int ret;
-
-	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, getsockopt, sock, level, optname);
-
-	ret = VTABLE_CALL(getsockopt, sock, level, optname, optval, optlen);
-
-	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, getsockopt, sock, level, optname,
-				       optval, *optlen, ret < 0 ? -errno : ret);
-	return ret;
-}
-
-#ifdef CONFIG_USERSPACE
-int z_vrfy_zsock_getsockopt(int sock, int level, int optname,
-			    void *optval, socklen_t *optlen)
-{
-	socklen_t kernel_optlen = *(socklen_t *)optlen;
-	void *kernel_optval;
-	int ret;
-
-	if (K_SYSCALL_MEMORY_WRITE(optval, kernel_optlen)) {
-		errno = -EPERM;
-		return -1;
-	}
-
-	kernel_optval = k_usermode_alloc_from_copy((const void *)optval,
-					       kernel_optlen);
-	K_OOPS(!kernel_optval);
-
-	ret = z_impl_zsock_getsockopt(sock, level, optname,
-				      kernel_optval, &kernel_optlen);
-
-	K_OOPS(k_usermode_to_copy((void *)optval, kernel_optval, kernel_optlen));
-	K_OOPS(k_usermode_to_copy((void *)optlen, &kernel_optlen,
-			      sizeof(socklen_t)));
+	ret = vtable->fd_vtable.ioctl(ctx, request, args);
 
-	k_free(kernel_optval);
+	k_mutex_unlock(lock);
 
+	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, ioctl, sock,
+				       ret < 0 ? -errno : ret);
 	return ret;
+
 }
-#include <zephyr/syscalls/zsock_getsockopt_mrsh.c>
-#endif /* CONFIG_USERSPACE */
 
-static int ipv4_multicast_group(struct net_context *ctx, const void *optval,
-				socklen_t optlen, bool do_join)
+#ifdef CONFIG_USERSPACE
+static inline int z_vrfy_zsock_ioctl_impl(int sock, unsigned long request, va_list args)
 {
-	struct ip_mreqn *mreqn;
-	struct net_if *iface;
-	int ifindex, ret;
-
-	if (optval == NULL || optlen != sizeof(struct ip_mreqn)) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	mreqn = (struct ip_mreqn *)optval;
-
-	if (mreqn->imr_multiaddr.s_addr == INADDR_ANY) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	if (mreqn->imr_ifindex != 0) {
-		iface = net_if_get_by_index(mreqn->imr_ifindex);
-	} else {
-		ifindex = net_if_ipv4_addr_lookup_by_index(&mreqn->imr_address);
-		iface = net_if_get_by_index(ifindex);
-	}
+	switch (request) {
+	case ZFD_IOCTL_FIONBIO:
+		break;
 
-	if (iface == NULL) {
-		/* Check if ctx has already an interface and if not,
-		 * then select the default interface.
-		 */
-		if (ctx->iface <= 0) {
-			iface = net_if_get_default();
-		} else {
-			iface = net_if_get_by_index(ctx->iface);
-		}
+	case ZFD_IOCTL_FIONREAD: {
+		int *avail;
 
-		if (iface == NULL) {
-			errno = EINVAL;
-			return -1;
-		}
-	}
+		avail = va_arg(args, int *);
+		K_OOPS(K_SYSCALL_MEMORY_WRITE(avail, sizeof(*avail)));
 
-	if (do_join) {
-		ret = net_ipv4_igmp_join(iface, &mreqn->imr_multiaddr, NULL);
-	} else {
-		ret = net_ipv4_igmp_leave(iface, &mreqn->imr_multiaddr);
+		break;
 	}
 
-	if (ret < 0) {
-		errno  = -ret;
+	default:
+		errno = EOPNOTSUPP;
 		return -1;
 	}
 
-	return 0;
+	return z_impl_zsock_ioctl_impl(sock, request, args);
 }
+#include <zephyr/syscalls/zsock_ioctl_impl_mrsh.c>
+#endif
 
-static int ipv6_multicast_group(struct net_context *ctx, const void *optval,
-				socklen_t optlen, bool do_join)
+int zsock_poll_internal(struct zsock_pollfd *fds, int nfds, k_timeout_t timeout)
 {
-	struct ipv6_mreq *mreq;
-	struct net_if *iface;
-	int ret;
-
-	if (optval == NULL || optlen != sizeof(struct ipv6_mreq)) {
-		errno = EINVAL;
-		return -1;
-	}
+	bool retry;
+	int ret = 0;
+	int i;
+	struct zsock_pollfd *pfd;
+	struct k_poll_event poll_events[CONFIG_NET_SOCKETS_POLL_MAX];
+	struct k_poll_event *pev;
+	struct k_poll_event *pev_end = poll_events + ARRAY_SIZE(poll_events);
+	const struct fd_op_vtable *vtable;
+	struct k_mutex *lock;
+	k_timepoint_t end;
+	bool offload = false;
+	const struct fd_op_vtable *offl_vtable = NULL;
+	void *offl_ctx = NULL;
 
-	mreq = (struct ipv6_mreq *)optval;
+	end = sys_timepoint_calc(timeout);
 
-	if (memcmp(&mreq->ipv6mr_multiaddr,
-		   net_ipv6_unspecified_address(),
-		   sizeof(mreq->ipv6mr_multiaddr)) == 0) {
-		errno = EINVAL;
-		return -1;
-	}
+	pev = poll_events;
+	for (pfd = fds, i = nfds; i--; pfd++) {
+		void *ctx;
+		int result;
 
-	iface = net_if_get_by_index(mreq->ipv6mr_ifindex);
-	if (iface == NULL) {
-		/* Check if ctx has already an interface and if not,
-		 * then select the default interface.
-		 */
-		if (ctx->iface <= 0) {
-			iface = net_if_get_default();
-		} else {
-			iface = net_if_get_by_index(ctx->iface);
+		/* Per POSIX, negative fd's are just ignored */
+		if (pfd->fd < 0) {
+			continue;
 		}
 
-		if (iface == NULL) {
-			errno = ENOENT;
-			return -1;
+		ctx = get_sock_vtable(pfd->fd,
+				      (const struct socket_op_vtable **)&vtable,
+				      &lock);
+		if (ctx == NULL) {
+			/* Will set POLLNVAL in return loop */
+			continue;
 		}
-	}
-
-	if (do_join) {
-		ret = net_ipv6_mld_join(iface, &mreq->ipv6mr_multiaddr);
-	} else {
-		ret = net_ipv6_mld_leave(iface, &mreq->ipv6mr_multiaddr);
-	}
-
-	if (ret < 0) {
-		errno  = -ret;
-		return -1;
-	}
-
-	return 0;
-}
-
-int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname,
-			 const void *optval, socklen_t optlen)
-{
-	int ret;
-
-	switch (level) {
-	case SOL_SOCKET:
-		switch (optname) {
-		case SO_RCVBUF:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_RCVBUF)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_RCVBUF,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case SO_SNDBUF:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_SNDBUF)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_SNDBUF,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
 
-				return 0;
-			}
-
-			break;
-
-		case SO_REUSEADDR:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEADDR)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_REUSEADDR,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case SO_REUSEPORT:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEPORT)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_REUSEPORT,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
+		(void)k_mutex_lock(lock, K_FOREVER);
 
-				return 0;
+		result = zvfs_fdtable_call_ioctl(vtable, ctx,
+					      ZFD_IOCTL_POLL_PREPARE,
+					      pfd, &pev, pev_end);
+		if (result == -EALREADY) {
+			/* If POLL_PREPARE returned with EALREADY, it means
+			 * it already detected that some socket is ready. In
+			 * this case, we still perform a k_poll to pick up
+			 * as many events as possible, but without any wait.
+			 */
+			timeout = K_NO_WAIT;
+			end = sys_timepoint_calc(timeout);
+			result = 0;
+		} else if (result == -EXDEV) {
+			/* If POLL_PREPARE returned EXDEV, it means
+			 * it detected an offloaded socket.
+			 * If offloaded socket is used with native TLS, the TLS
+			 * wrapper for the offloaded poll will be used.
+			 * In case the fds array contains a mixup of offloaded
+			 * and non-offloaded sockets, the offloaded poll handler
+			 * shall return an error.
+			 */
+			offload = true;
+			if (offl_vtable == NULL || net_socket_is_tls(ctx)) {
+				offl_vtable = vtable;
+				offl_ctx = ctx;
 			}
 
-			break;
-
-		case SO_PRIORITY:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_PRIORITY)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_PRIORITY,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
+			result = 0;
+		}
 
-			break;
+		k_mutex_unlock(lock);
 
-		case SO_RCVTIMEO:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_RCVTIMEO)) {
-				const struct zsock_timeval *tv = optval;
-				k_timeout_t timeout;
+		if (result < 0) {
+			errno = -result;
+			return -1;
+		}
+	}
 
-				if (optlen != sizeof(struct zsock_timeval)) {
-					errno = EINVAL;
-					return -1;
-				}
+	if (offload) {
+		int poll_timeout;
 
-				if (tv->tv_sec == 0 && tv->tv_usec == 0) {
-					timeout = K_FOREVER;
-				} else {
-					timeout = K_USEC(tv->tv_sec * 1000000ULL
-							 + tv->tv_usec);
-				}
+		if (K_TIMEOUT_EQ(timeout, K_FOREVER)) {
+			poll_timeout = SYS_FOREVER_MS;
+		} else {
+			poll_timeout = k_ticks_to_ms_floor32(timeout.ticks);
+		}
 
-				ret = net_context_set_option(ctx,
-							     NET_OPT_RCVTIMEO,
-							     &timeout,
-							     sizeof(timeout));
+		return zvfs_fdtable_call_ioctl(offl_vtable, offl_ctx,
+					    ZFD_IOCTL_POLL_OFFLOAD,
+					    fds, nfds, poll_timeout);
+	}
 
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
+	timeout = sys_timepoint_timeout(end);
 
-				return 0;
-			}
+	do {
+		ret = k_poll(poll_events, pev - poll_events, timeout);
+		/* EAGAIN when timeout expired, EINTR when cancelled (i.e. EOF) */
+		if (ret != 0 && ret != -EAGAIN && ret != -EINTR) {
+			errno = -ret;
+			return -1;
+		}
 
-			break;
-
-		case SO_SNDTIMEO:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_SNDTIMEO)) {
-				const struct zsock_timeval *tv = optval;
-				k_timeout_t timeout;
-
-				if (optlen != sizeof(struct zsock_timeval)) {
-					errno = EINVAL;
-					return -1;
-				}
-
-				if (tv->tv_sec == 0 && tv->tv_usec == 0) {
-					timeout = K_FOREVER;
-				} else {
-					timeout = K_USEC(tv->tv_sec * 1000000ULL
-							 + tv->tv_usec);
-				}
-
-				ret = net_context_set_option(ctx,
-							     NET_OPT_SNDTIMEO,
-							     &timeout,
-							     sizeof(timeout));
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
+		retry = false;
+		ret = 0;
 
-			break;
+		pev = poll_events;
+		for (pfd = fds, i = nfds; i--; pfd++) {
+			void *ctx;
+			int result;
 
-		case SO_TXTIME:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_TXTIME)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_TXTIME,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
+			pfd->revents = 0;
 
-				return 0;
+			if (pfd->fd < 0) {
+				continue;
 			}
 
-			break;
-
-		case SO_SOCKS5:
-			if (IS_ENABLED(CONFIG_SOCKS)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_SOCKS5,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				net_context_set_proxy_enabled(ctx, true);
-
-				return 0;
+			ctx = get_sock_vtable(
+				pfd->fd,
+				(const struct socket_op_vtable **)&vtable,
+				&lock);
+			if (ctx == NULL) {
+				pfd->revents = ZSOCK_POLLNVAL;
+				ret++;
+				continue;
 			}
 
-			break;
-
-		case SO_BINDTODEVICE: {
-			struct net_if *iface;
-			const struct ifreq *ifreq = optval;
-
-			if (net_context_get_family(ctx) != AF_INET &&
-			    net_context_get_family(ctx) != AF_INET6) {
-				errno = EAFNOSUPPORT;
-				return -1;
-			}
+			(void)k_mutex_lock(lock, K_FOREVER);
 
-			/* optlen equal to 0 or empty interface name should
-			 * remove the binding.
-			 */
-			if ((optlen == 0) || (ifreq != NULL &&
-					      strlen(ifreq->ifr_name) == 0)) {
-				ctx->flags &= ~NET_CONTEXT_BOUND_TO_IFACE;
-				return 0;
-			}
+			result = zvfs_fdtable_call_ioctl(vtable, ctx,
+						      ZFD_IOCTL_POLL_UPDATE,
+						      pfd, &pev);
+			k_mutex_unlock(lock);
 
-			if ((ifreq == NULL) || (optlen != sizeof(*ifreq))) {
-				errno = EINVAL;
+			if (result == -EAGAIN) {
+				retry = true;
+				continue;
+			} else if (result != 0) {
+				errno = -result;
 				return -1;
 			}
 
-			if (IS_ENABLED(CONFIG_NET_INTERFACE_NAME)) {
-				ret = net_if_get_by_name(ifreq->ifr_name);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				iface = net_if_get_by_index(ret);
-				if (iface == NULL) {
-					errno = ENODEV;
-					return -1;
-				}
-			} else {
-				const struct device *dev;
-
-				dev = device_get_binding(ifreq->ifr_name);
-				if (dev == NULL) {
-					errno = ENODEV;
-					return -1;
-				}
-
-				iface = net_if_lookup_by_dev(dev);
-				if (iface == NULL) {
-					errno = ENODEV;
-					return -1;
-				}
+			if (pfd->revents != 0) {
+				ret++;
 			}
-
-			net_context_bind_iface(ctx, iface);
-
-			return 0;
 		}
 
-		case SO_LINGER:
-			/* ignored. for compatibility purposes only */
-			return 0;
-
-		case SO_KEEPALIVE:
-			if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE) &&
-			    net_context_get_proto(ctx) == IPPROTO_TCP) {
-				ret = net_tcp_set_option(ctx,
-							 TCP_OPT_KEEPALIVE,
-							 optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case SO_TIMESTAMPING:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_TIMESTAMPING)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_TIMESTAMPING,
-							     optval, optlen);
-
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
+		if (retry) {
+			if (ret > 0) {
+				break;
 			}
 
-			break;
-		}
-
-		break;
+			timeout = sys_timepoint_timeout(end);
 
-	case IPPROTO_TCP:
-		switch (optname) {
-		case TCP_NODELAY:
-			ret = net_tcp_set_option(ctx,
-						 TCP_OPT_NODELAY, optval, optlen);
-			return ret;
-
-		case TCP_KEEPIDLE:
-			__fallthrough;
-		case TCP_KEEPINTVL:
-			__fallthrough;
-		case TCP_KEEPCNT:
-			if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE)) {
-				ret = net_tcp_set_option(ctx,
-							 get_tcp_option(optname),
-							 optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
+			if (K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
+				break;
 			}
-
-			break;
 		}
-		break;
-
-	case IPPROTO_IP:
-		switch (optname) {
-		case IP_TOS:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_DSCP_ECN,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case IP_PKTINFO:
-			if (IS_ENABLED(CONFIG_NET_IPV4) &&
-			    IS_ENABLED(CONFIG_NET_CONTEXT_RECV_PKTINFO)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_RECV_PKTINFO,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case IP_MULTICAST_TTL:
-			ret = net_context_set_option(ctx, NET_OPT_MCAST_TTL,
-						     optval, optlen);
-			if (ret < 0) {
-				errno  = -ret;
-				return -1;
-			}
+	} while (retry);
 
-			return 0;
+	return ret;
+}
 
-		case IP_TTL:
-			ret = net_context_set_option(ctx, NET_OPT_TTL,
-						     optval, optlen);
-			if (ret < 0) {
-				errno  = -ret;
-				return -1;
-			}
+int z_impl_zsock_poll(struct zsock_pollfd *fds, int nfds, int poll_timeout)
+{
+	k_timeout_t timeout;
+	int ret;
 
-			return 0;
+	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, poll, fds, nfds, poll_timeout);
 
-		case IP_ADD_MEMBERSHIP:
-			if (IS_ENABLED(CONFIG_NET_IPV4)) {
-				return ipv4_multicast_group(ctx, optval,
-							    optlen, true);
-			}
+	if (poll_timeout < 0) {
+		timeout = K_FOREVER;
+	} else {
+		timeout = K_MSEC(poll_timeout);
+	}
 
-			break;
+	ret = zsock_poll_internal(fds, nfds, timeout);
 
-		case IP_DROP_MEMBERSHIP:
-			if (IS_ENABLED(CONFIG_NET_IPV4)) {
-				return ipv4_multicast_group(ctx, optval,
-							    optlen, false);
-			}
+	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, poll, fds, nfds,
+				       ret < 0 ? -errno : ret);
+	return ret;
+}
 
-			break;
-		}
+#ifdef CONFIG_USERSPACE
+static inline int z_vrfy_zsock_poll(struct zsock_pollfd *fds,
+				    int nfds, int timeout)
+{
+	struct zsock_pollfd *fds_copy;
+	size_t fds_size;
+	int ret;
 
-		break;
+	/* Copy fds array from user mode */
+	if (size_mul_overflow(nfds, sizeof(struct zsock_pollfd), &fds_size)) {
+		errno = EFAULT;
+		return -1;
+	}
+	fds_copy = k_usermode_alloc_from_copy((void *)fds, fds_size);
+	if (!fds_copy) {
+		errno = ENOMEM;
+		return -1;
+	}
 
-	case IPPROTO_IPV6:
-		switch (optname) {
-		case IPV6_V6ONLY:
-			if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_IPV6_V6ONLY,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
-			}
+	ret = z_impl_zsock_poll(fds_copy, nfds, timeout);
 
-			return 0;
-
-		case IPV6_RECVPKTINFO:
-			if (IS_ENABLED(CONFIG_NET_IPV6) &&
-			    IS_ENABLED(CONFIG_NET_CONTEXT_RECV_PKTINFO)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_RECV_PKTINFO,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
+	if (ret >= 0) {
+		k_usermode_to_copy((void *)fds, fds_copy, fds_size);
+	}
+	k_free(fds_copy);
 
-			break;
+	return ret;
+}
+#include <zephyr/syscalls/zsock_poll_mrsh.c>
+#endif
 
-		case IPV6_ADDR_PREFERENCES:
-			if (IS_ENABLED(CONFIG_NET_IPV6)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_ADDR_PREFERENCES,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
+int z_impl_zsock_inet_pton(sa_family_t family, const char *src, void *dst)
+{
+	if (net_addr_pton(family, src, dst) == 0) {
+		return 1;
+	} else {
+		return 0;
+	}
+}
 
-				return 0;
-			}
+#ifdef CONFIG_USERSPACE
+static inline int z_vrfy_zsock_inet_pton(sa_family_t family,
+					 const char *src, void *dst)
+{
+	int dst_size;
+	char src_copy[NET_IPV6_ADDR_LEN];
+	char dst_copy[sizeof(struct in6_addr)];
+	int ret;
 
-			break;
+	switch (family) {
+	case AF_INET:
+		dst_size = sizeof(struct in_addr);
+		break;
+	case AF_INET6:
+		dst_size = sizeof(struct in6_addr);
+		break;
+	default:
+		errno = EAFNOSUPPORT;
+		return -1;
+	}
 
-		case IPV6_TCLASS:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_DSCP_ECN,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
+	K_OOPS(k_usermode_string_copy(src_copy, (char *)src, sizeof(src_copy)));
+	ret = z_impl_zsock_inet_pton(family, src_copy, dst_copy);
+	K_OOPS(k_usermode_to_copy(dst, dst_copy, dst_size));
 
-				return 0;
-			}
+	return ret;
+}
+#include <zephyr/syscalls/zsock_inet_pton_mrsh.c>
+#endif
 
-			break;
+int z_impl_zsock_getsockopt(int sock, int level, int optname,
+			    void *optval, socklen_t *optlen)
+{
+	int ret;
 
-		case IPV6_UNICAST_HOPS:
-			ret = net_context_set_option(ctx,
-						     NET_OPT_UNICAST_HOP_LIMIT,
-						     optval, optlen);
-			if (ret < 0) {
-				errno  = -ret;
-				return -1;
-			}
+	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, getsockopt, sock, level, optname);
 
-			return 0;
+	ret = VTABLE_CALL(getsockopt, sock, level, optname, optval, optlen);
 
-		case IPV6_MULTICAST_HOPS:
-			ret = net_context_set_option(ctx,
-						     NET_OPT_MCAST_HOP_LIMIT,
-						     optval, optlen);
-			if (ret < 0) {
-				errno  = -ret;
-				return -1;
-			}
+	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, getsockopt, sock, level, optname,
+				       optval, *optlen, ret < 0 ? -errno : ret);
+	return ret;
+}
 
-			return 0;
+#ifdef CONFIG_USERSPACE
+int z_vrfy_zsock_getsockopt(int sock, int level, int optname,
+			    void *optval, socklen_t *optlen)
+{
+	socklen_t kernel_optlen = *(socklen_t *)optlen;
+	void *kernel_optval;
+	int ret;
 
-		case IPV6_ADD_MEMBERSHIP:
-			if (IS_ENABLED(CONFIG_NET_IPV6)) {
-				return ipv6_multicast_group(ctx, optval,
-							    optlen, true);
-			}
+	if (K_SYSCALL_MEMORY_WRITE(optval, kernel_optlen)) {
+		errno = -EPERM;
+		return -1;
+	}
 
-			break;
+	kernel_optval = k_usermode_alloc_from_copy((const void *)optval,
+					       kernel_optlen);
+	K_OOPS(!kernel_optval);
 
-		case IPV6_DROP_MEMBERSHIP:
-			if (IS_ENABLED(CONFIG_NET_IPV6)) {
-				return ipv6_multicast_group(ctx, optval,
-							    optlen, false);
-			}
+	ret = z_impl_zsock_getsockopt(sock, level, optname,
+				      kernel_optval, &kernel_optlen);
 
-			break;
-		}
+	K_OOPS(k_usermode_to_copy((void *)optval, kernel_optval, kernel_optlen));
+	K_OOPS(k_usermode_to_copy((void *)optlen, &kernel_optlen,
+			      sizeof(socklen_t)));
 
-		break;
-	}
+	k_free(kernel_optval);
 
-	errno = ENOPROTOOPT;
-	return -1;
+	return ret;
 }
+#include <zephyr/syscalls/zsock_getsockopt_mrsh.c>
+#endif /* CONFIG_USERSPACE */
 
 int z_impl_zsock_setsockopt(int sock, int level, int optname,
 			    const void *optval, socklen_t optlen)
@@ -3584,54 +1138,6 @@ int z_vrfy_zsock_setsockopt(int sock, int level, int optname,
 #include <zephyr/syscalls/zsock_setsockopt_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
-int zsock_getpeername_ctx(struct net_context *ctx, struct sockaddr *addr,
-			  socklen_t *addrlen)
-{
-	socklen_t newlen = 0;
-
-	if (addr == NULL || addrlen == NULL) {
-		SET_ERRNO(-EINVAL);
-	}
-
-	if (!(ctx->flags & NET_CONTEXT_REMOTE_ADDR_SET)) {
-		SET_ERRNO(-ENOTCONN);
-	}
-
-	if (net_context_get_type(ctx) == SOCK_STREAM &&
-	    net_context_get_state(ctx) != NET_CONTEXT_CONNECTED) {
-		SET_ERRNO(-ENOTCONN);
-	}
-
-	if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->remote.sa_family == AF_INET) {
-		struct sockaddr_in addr4 = { 0 };
-
-		addr4.sin_family = AF_INET;
-		addr4.sin_port = net_sin(&ctx->remote)->sin_port;
-		memcpy(&addr4.sin_addr, &net_sin(&ctx->remote)->sin_addr,
-		       sizeof(struct in_addr));
-		newlen = sizeof(struct sockaddr_in);
-
-		memcpy(addr, &addr4, MIN(*addrlen, newlen));
-	} else if (IS_ENABLED(CONFIG_NET_IPV6) &&
-		   ctx->remote.sa_family == AF_INET6) {
-		struct sockaddr_in6 addr6 = { 0 };
-
-		addr6.sin6_family = AF_INET6;
-		addr6.sin6_port = net_sin6(&ctx->remote)->sin6_port;
-		memcpy(&addr6.sin6_addr, &net_sin6(&ctx->remote)->sin6_addr,
-		       sizeof(struct in6_addr));
-		newlen = sizeof(struct sockaddr_in6);
-
-		memcpy(addr, &addr6, MIN(*addrlen, newlen));
-	} else {
-		SET_ERRNO(-EINVAL);
-	}
-
-	*addrlen = newlen;
-
-	return 0;
-}
-
 int z_impl_zsock_getpeername(int sock, struct sockaddr *addr,
 			     socklen_t *addrlen)
 {
@@ -3677,56 +1183,6 @@ static inline int z_vrfy_zsock_getpeername(int sock, struct sockaddr *addr,
 #include <zephyr/syscalls/zsock_getpeername_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
-int zsock_getsockname_ctx(struct net_context *ctx, struct sockaddr *addr,
-			  socklen_t *addrlen)
-{
-	socklen_t newlen = 0;
-	int ret;
-
-	if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->local.family == AF_INET) {
-		struct sockaddr_in addr4 = { 0 };
-
-		if (net_sin_ptr(&ctx->local)->sin_addr == NULL) {
-			SET_ERRNO(-EINVAL);
-		}
-
-		newlen = sizeof(struct sockaddr_in);
-
-		ret = net_context_get_local_addr(ctx,
-						 (struct sockaddr *)&addr4,
-						 &newlen);
-		if (ret < 0) {
-			SET_ERRNO(-ret);
-		}
-
-		memcpy(addr, &addr4, MIN(*addrlen, newlen));
-
-	} else if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->local.family == AF_INET6) {
-		struct sockaddr_in6 addr6 = { 0 };
-
-		if (net_sin6_ptr(&ctx->local)->sin6_addr == NULL) {
-			SET_ERRNO(-EINVAL);
-		}
-
-		newlen = sizeof(struct sockaddr_in6);
-
-		ret = net_context_get_local_addr(ctx,
-						 (struct sockaddr *)&addr6,
-						 &newlen);
-		if (ret < 0) {
-			SET_ERRNO(-ret);
-		}
-
-		memcpy(addr, &addr6, MIN(*addrlen, newlen));
-	} else {
-		SET_ERRNO(-EINVAL);
-	}
-
-	*addrlen = newlen;
-
-	return 0;
-}
-
 int z_impl_zsock_getsockname(int sock, struct sockaddr *addr,
 			     socklen_t *addrlen)
 {
@@ -3771,210 +1227,3 @@ static inline int z_vrfy_zsock_getsockname(int sock, struct sockaddr *addr,
 }
 #include <zephyr/syscalls/zsock_getsockname_mrsh.c>
 #endif /* CONFIG_USERSPACE */
-
-static ssize_t sock_read_vmeth(void *obj, void *buffer, size_t count)
-{
-	return zsock_recvfrom_ctx(obj, buffer, count, 0, NULL, 0);
-}
-
-static ssize_t sock_write_vmeth(void *obj, const void *buffer, size_t count)
-{
-	return zsock_sendto_ctx(obj, buffer, count, 0, NULL, 0);
-}
-
-static void zsock_ctx_set_lock(struct net_context *ctx, struct k_mutex *lock)
-{
-	ctx->cond.lock = lock;
-}
-
-static int sock_ioctl_vmeth(void *obj, unsigned int request, va_list args)
-{
-	switch (request) {
-
-	/* In Zephyr, fcntl() is just an alias of ioctl(). */
-	case F_GETFL:
-		if (sock_is_nonblock(obj)) {
-		    return O_NONBLOCK;
-		}
-
-		return 0;
-
-	case F_SETFL: {
-		int flags;
-
-		flags = va_arg(args, int);
-
-		if (flags & O_NONBLOCK) {
-			sock_set_flag(obj, SOCK_NONBLOCK, SOCK_NONBLOCK);
-		} else {
-			sock_set_flag(obj, SOCK_NONBLOCK, 0);
-		}
-
-		return 0;
-	}
-
-	case ZFD_IOCTL_POLL_PREPARE: {
-		struct zsock_pollfd *pfd;
-		struct k_poll_event **pev;
-		struct k_poll_event *pev_end;
-
-		pfd = va_arg(args, struct zsock_pollfd *);
-		pev = va_arg(args, struct k_poll_event **);
-		pev_end = va_arg(args, struct k_poll_event *);
-
-		return zsock_poll_prepare_ctx(obj, pfd, pev, pev_end);
-	}
-
-	case ZFD_IOCTL_POLL_UPDATE: {
-		struct zsock_pollfd *pfd;
-		struct k_poll_event **pev;
-
-		pfd = va_arg(args, struct zsock_pollfd *);
-		pev = va_arg(args, struct k_poll_event **);
-
-		return zsock_poll_update_ctx(obj, pfd, pev);
-	}
-
-	case ZFD_IOCTL_SET_LOCK: {
-		struct k_mutex *lock;
-
-		lock = va_arg(args, struct k_mutex *);
-
-		zsock_ctx_set_lock(obj, lock);
-		return 0;
-	}
-
-	case ZFD_IOCTL_FIONBIO:
-		sock_set_flag(obj, SOCK_NONBLOCK, SOCK_NONBLOCK);
-		return 0;
-
-	case ZFD_IOCTL_FIONREAD: {
-		int *avail = va_arg(args, int *);
-
-		*avail = zsock_fionread_ctx(obj);
-		return 0;
-	}
-
-	default:
-		errno = EOPNOTSUPP;
-		return -1;
-	}
-}
-
-static int sock_shutdown_vmeth(void *obj, int how)
-{
-	return zsock_shutdown_ctx(obj, how);
-}
-
-static int sock_bind_vmeth(void *obj, const struct sockaddr *addr,
-			   socklen_t addrlen)
-{
-	return zsock_bind_ctx(obj, addr, addrlen);
-}
-
-static int sock_connect_vmeth(void *obj, const struct sockaddr *addr,
-			      socklen_t addrlen)
-{
-	return zsock_connect_ctx(obj, addr, addrlen);
-}
-
-static int sock_listen_vmeth(void *obj, int backlog)
-{
-	return zsock_listen_ctx(obj, backlog);
-}
-
-static int sock_accept_vmeth(void *obj, struct sockaddr *addr,
-			     socklen_t *addrlen)
-{
-	return zsock_accept_ctx(obj, addr, addrlen);
-}
-
-static ssize_t sock_sendto_vmeth(void *obj, const void *buf, size_t len,
-				 int flags, const struct sockaddr *dest_addr,
-				 socklen_t addrlen)
-{
-	return zsock_sendto_ctx(obj, buf, len, flags, dest_addr, addrlen);
-}
-
-static ssize_t sock_sendmsg_vmeth(void *obj, const struct msghdr *msg,
-				  int flags)
-{
-	return zsock_sendmsg_ctx(obj, msg, flags);
-}
-
-static ssize_t sock_recvmsg_vmeth(void *obj, struct msghdr *msg, int flags)
-{
-	return zsock_recvmsg_ctx(obj, msg, flags);
-}
-
-static ssize_t sock_recvfrom_vmeth(void *obj, void *buf, size_t max_len,
-				   int flags, struct sockaddr *src_addr,
-				   socklen_t *addrlen)
-{
-	return zsock_recvfrom_ctx(obj, buf, max_len, flags,
-				  src_addr, addrlen);
-}
-
-static int sock_getsockopt_vmeth(void *obj, int level, int optname,
-				 void *optval, socklen_t *optlen)
-{
-	return zsock_getsockopt_ctx(obj, level, optname, optval, optlen);
-}
-
-static int sock_setsockopt_vmeth(void *obj, int level, int optname,
-				 const void *optval, socklen_t optlen)
-{
-	return zsock_setsockopt_ctx(obj, level, optname, optval, optlen);
-}
-
-static int sock_close_vmeth(void *obj)
-{
-	return zsock_close_ctx(obj);
-}
-static int sock_getpeername_vmeth(void *obj, struct sockaddr *addr,
-				  socklen_t *addrlen)
-{
-	return zsock_getpeername_ctx(obj, addr, addrlen);
-}
-
-static int sock_getsockname_vmeth(void *obj, struct sockaddr *addr,
-				  socklen_t *addrlen)
-{
-	return zsock_getsockname_ctx(obj, addr, addrlen);
-}
-
-const struct socket_op_vtable sock_fd_op_vtable = {
-	.fd_vtable = {
-		.read = sock_read_vmeth,
-		.write = sock_write_vmeth,
-		.close = sock_close_vmeth,
-		.ioctl = sock_ioctl_vmeth,
-	},
-	.shutdown = sock_shutdown_vmeth,
-	.bind = sock_bind_vmeth,
-	.connect = sock_connect_vmeth,
-	.listen = sock_listen_vmeth,
-	.accept = sock_accept_vmeth,
-	.sendto = sock_sendto_vmeth,
-	.sendmsg = sock_sendmsg_vmeth,
-	.recvmsg = sock_recvmsg_vmeth,
-	.recvfrom = sock_recvfrom_vmeth,
-	.getsockopt = sock_getsockopt_vmeth,
-	.setsockopt = sock_setsockopt_vmeth,
-	.getpeername = sock_getpeername_vmeth,
-	.getsockname = sock_getsockname_vmeth,
-};
-
-#if defined(CONFIG_NET_NATIVE)
-static bool inet_is_supported(int family, int type, int proto)
-{
-	if (family != AF_INET && family != AF_INET6) {
-		return false;
-	}
-
-	return true;
-}
-
-NET_SOCKET_REGISTER(af_inet46, NET_SOCKET_DEFAULT_PRIO, AF_UNSPEC,
-		    inet_is_supported, zsock_socket_internal);
-#endif /* CONFIG_NET_NATIVE */
diff --git a/subsys/net/lib/sockets/sockets_inet.c b/subsys/net/lib/sockets/sockets_inet.c
new file mode 100644
index 00000000000..9403cdd152a
--- /dev/null
+++ b/subsys/net/lib/sockets/sockets_inet.c
@@ -0,0 +1,2758 @@
+/*
+ * Copyright (c) 2017 Linaro Limited
+ * Copyright (c) 2021 Nordic Semiconductor
+ * Copyright (c) 2023 Arm Limited (or its affiliates). All rights reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Zephyr headers */
+#include <zephyr/logging/log.h>
+LOG_MODULE_DECLARE(net_sock, CONFIG_NET_SOCKETS_LOG_LEVEL);
+
+#include <zephyr/kernel.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/tracing/tracing.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/socket_types.h>
+#include <zephyr/posix/fcntl.h>
+#include <zephyr/sys/fdtable.h>
+#include <zephyr/sys/math_extras.h>
+#include <zephyr/sys/iterable_sections.h>
+
+#if defined(CONFIG_SOCKS)
+#include "socks.h"
+#endif
+
+#include <zephyr/net/igmp.h>
+#include "../../ip/ipv6.h"
+
+#include "../../ip/net_stats.h"
+
+#include "sockets_internal.h"
+#include "../../ip/tcp_internal.h"
+#include "../../ip/net_private.h"
+
+#define SET_ERRNO(x) \
+	{ int _err = x; if (_err < 0) { errno = -_err; return -1; } }
+
+const struct socket_op_vtable sock_fd_op_vtable;
+
+static void zsock_received_cb(struct net_context *ctx,
+			      struct net_pkt *pkt,
+			      union net_ip_header *ip_hdr,
+			      union net_proto_header *proto_hdr,
+			      int status,
+			      void *user_data);
+
+static int fifo_wait_non_empty(struct k_fifo *fifo, k_timeout_t timeout)
+{
+	struct k_poll_event events[] = {
+		K_POLL_EVENT_INITIALIZER(K_POLL_TYPE_FIFO_DATA_AVAILABLE,
+					 K_POLL_MODE_NOTIFY_ONLY, fifo),
+	};
+
+	return k_poll(events, ARRAY_SIZE(events), timeout);
+}
+
+static void zsock_flush_queue(struct net_context *ctx)
+{
+	bool is_listen = net_context_get_state(ctx) == NET_CONTEXT_LISTENING;
+	void *p;
+
+	/* recv_q and accept_q are shared via a union */
+	while ((p = k_fifo_get(&ctx->recv_q, K_NO_WAIT)) != NULL) {
+		if (is_listen) {
+			NET_DBG("discarding ctx %p", p);
+			net_context_put(p);
+		} else {
+			NET_DBG("discarding pkt %p", p);
+			net_pkt_unref(p);
+		}
+	}
+
+	/* Some threads might be waiting on recv, cancel the wait */
+	k_fifo_cancel_wait(&ctx->recv_q);
+
+	/* Wake reader if it was sleeping */
+	(void)k_condvar_signal(&ctx->cond.recv);
+}
+
+static int zsock_socket_internal(int family, int type, int proto)
+{
+	int fd = zvfs_reserve_fd();
+	struct net_context *ctx;
+	int res;
+
+	if (fd < 0) {
+		return -1;
+	}
+
+	if (proto == 0) {
+		if (family == AF_INET || family == AF_INET6) {
+			if (type == SOCK_DGRAM) {
+				proto = IPPROTO_UDP;
+			} else if (type == SOCK_STREAM) {
+				proto = IPPROTO_TCP;
+			}
+		}
+	}
+
+	res = net_context_get(family, type, proto, &ctx);
+	if (res < 0) {
+		zvfs_free_fd(fd);
+		errno = -res;
+		return -1;
+	}
+
+	/* Initialize user_data, all other calls will preserve it */
+	ctx->user_data = NULL;
+
+	/* The socket flags are stored here */
+	ctx->socket_data = NULL;
+
+	/* recv_q and accept_q are in union */
+	k_fifo_init(&ctx->recv_q);
+
+	/* Condition variable is used to avoid keeping lock for a long time
+	 * when waiting data to be received
+	 */
+	k_condvar_init(&ctx->cond.recv);
+
+	/* TCP context is effectively owned by both application
+	 * and the stack: stack may detect that peer closed/aborted
+	 * connection, but it must not dispose of the context behind
+	 * the application back. Likewise, when application "closes"
+	 * context, it's not disposed of immediately - there's yet
+	 * closing handshake for stack to perform.
+	 */
+	if (proto == IPPROTO_TCP) {
+		net_context_ref(ctx);
+	}
+
+	zvfs_finalize_typed_fd(fd, ctx, (const struct fd_op_vtable *)&sock_fd_op_vtable,
+			    ZVFS_MODE_IFSOCK);
+
+	NET_DBG("socket: ctx=%p, fd=%d", ctx, fd);
+
+	return fd;
+}
+
+int zsock_close_ctx(struct net_context *ctx)
+{
+	/* Reset callbacks to avoid any race conditions while
+	 * flushing queues. No need to check return values here,
+	 * as these are fail-free operations and we're closing
+	 * socket anyway.
+	 */
+	if (net_context_get_state(ctx) == NET_CONTEXT_LISTENING) {
+		(void)net_context_accept(ctx, NULL, K_NO_WAIT, NULL);
+	} else {
+		(void)net_context_recv(ctx, NULL, K_NO_WAIT, NULL);
+	}
+
+	ctx->user_data = INT_TO_POINTER(EINTR);
+	sock_set_error(ctx);
+
+	zsock_flush_queue(ctx);
+
+	SET_ERRNO(net_context_put(ctx));
+
+	return 0;
+}
+
+static void zsock_accepted_cb(struct net_context *new_ctx,
+			      struct sockaddr *addr, socklen_t addrlen,
+			      int status, void *user_data)
+{
+	struct net_context *parent = user_data;
+
+	NET_DBG("parent=%p, ctx=%p, st=%d", parent, new_ctx, status);
+
+	if (status == 0) {
+		/* This just installs a callback, so cannot fail. */
+		(void)net_context_recv(new_ctx, zsock_received_cb, K_NO_WAIT,
+				       NULL);
+		k_fifo_init(&new_ctx->recv_q);
+		k_condvar_init(&new_ctx->cond.recv);
+
+		k_fifo_put(&parent->accept_q, new_ctx);
+
+		/* TCP context is effectively owned by both application
+		 * and the stack: stack may detect that peer closed/aborted
+		 * connection, but it must not dispose of the context behind
+		 * the application back. Likewise, when application "closes"
+		 * context, it's not disposed of immediately - there's yet
+		 * closing handshake for stack to perform.
+		 */
+		net_context_ref(new_ctx);
+
+		(void)k_condvar_signal(&parent->cond.recv);
+	}
+
+}
+
+static void zsock_received_cb(struct net_context *ctx,
+			      struct net_pkt *pkt,
+			      union net_ip_header *ip_hdr,
+			      union net_proto_header *proto_hdr,
+			      int status,
+			      void *user_data)
+{
+	if (ctx->cond.lock) {
+		(void)k_mutex_lock(ctx->cond.lock, K_FOREVER);
+	}
+
+	NET_DBG("ctx=%p, pkt=%p, st=%d, user_data=%p", ctx, pkt, status,
+		user_data);
+
+	if (status < 0) {
+		ctx->user_data = INT_TO_POINTER(-status);
+		sock_set_error(ctx);
+	}
+
+	/* if pkt is NULL, EOF */
+	if (!pkt) {
+		struct net_pkt *last_pkt = k_fifo_peek_tail(&ctx->recv_q);
+
+		if (!last_pkt) {
+			/* If there're no packets in the queue, recv() may
+			 * be blocked waiting on it to become non-empty,
+			 * so cancel that wait.
+			 */
+			sock_set_eof(ctx);
+			k_fifo_cancel_wait(&ctx->recv_q);
+			NET_DBG("Marked socket %p as peer-closed", ctx);
+		} else {
+			net_pkt_set_eof(last_pkt, true);
+			NET_DBG("Set EOF flag on pkt %p", last_pkt);
+		}
+
+		goto unlock;
+	}
+
+	/* Normal packet */
+	net_pkt_set_eof(pkt, false);
+
+	net_pkt_set_rx_stats_tick(pkt, k_cycle_get_32());
+
+	k_fifo_put(&ctx->recv_q, pkt);
+
+unlock:
+	/* Wake reader if it was sleeping */
+	(void)k_condvar_signal(&ctx->cond.recv);
+
+	if (ctx->cond.lock) {
+		(void)k_mutex_unlock(ctx->cond.lock);
+	}
+}
+
+int zsock_shutdown_ctx(struct net_context *ctx, int how)
+{
+	if (how == ZSOCK_SHUT_RD) {
+		if (net_context_get_state(ctx) == NET_CONTEXT_LISTENING) {
+			SET_ERRNO(net_context_accept(ctx, NULL, K_NO_WAIT, NULL));
+		} else {
+			SET_ERRNO(net_context_recv(ctx, NULL, K_NO_WAIT, NULL));
+		}
+
+		sock_set_eof(ctx);
+
+		zsock_flush_queue(ctx);
+	} else if (how == ZSOCK_SHUT_WR || how == ZSOCK_SHUT_RDWR) {
+		SET_ERRNO(-ENOTSUP);
+	} else {
+		SET_ERRNO(-EINVAL);
+	}
+
+	return 0;
+}
+
+int zsock_bind_ctx(struct net_context *ctx, const struct sockaddr *addr,
+		   socklen_t addrlen)
+{
+	SET_ERRNO(net_context_bind(ctx, addr, addrlen));
+	/* For DGRAM socket, we expect to receive packets after call to
+	 * bind(), but for STREAM socket, next expected operation is
+	 * listen(), which doesn't work if recv callback is set.
+	 */
+	if (net_context_get_type(ctx) == SOCK_DGRAM) {
+		SET_ERRNO(net_context_recv(ctx, zsock_received_cb, K_NO_WAIT,
+					   ctx->user_data));
+	}
+
+	return 0;
+}
+
+static void zsock_connected_cb(struct net_context *ctx, int status, void *user_data)
+{
+	if (status < 0) {
+		ctx->user_data = INT_TO_POINTER(-status);
+		sock_set_error(ctx);
+	}
+}
+
+int zsock_connect_ctx(struct net_context *ctx, const struct sockaddr *addr,
+		      socklen_t addrlen)
+{
+
+#if defined(CONFIG_SOCKS)
+	if (net_context_is_proxy_enabled(ctx)) {
+		SET_ERRNO(net_socks5_connect(ctx, addr, addrlen));
+		SET_ERRNO(net_context_recv(ctx, zsock_received_cb,
+					   K_NO_WAIT, ctx->user_data));
+		return 0;
+	}
+#endif
+	if (net_context_get_state(ctx) == NET_CONTEXT_CONNECTED) {
+		return 0;
+	} else if (net_context_get_state(ctx) == NET_CONTEXT_CONNECTING) {
+		if (sock_is_error(ctx)) {
+			SET_ERRNO(-POINTER_TO_INT(ctx->user_data));
+		} else {
+			SET_ERRNO(-EALREADY);
+		}
+	} else {
+		k_timeout_t timeout = K_MSEC(CONFIG_NET_SOCKETS_CONNECT_TIMEOUT);
+		net_context_connect_cb_t cb = NULL;
+
+		if (sock_is_nonblock(ctx)) {
+			timeout = K_NO_WAIT;
+			cb = zsock_connected_cb;
+		}
+
+		if (net_context_get_type(ctx) == SOCK_STREAM) {
+			/* For STREAM sockets net_context_recv() only installs
+			 * recv callback w/o side effects, and it has to be done
+			 * first to avoid race condition, when TCP stream data
+			 * arrives right after connect.
+			 */
+			SET_ERRNO(net_context_recv(ctx, zsock_received_cb,
+						   K_NO_WAIT, ctx->user_data));
+			SET_ERRNO(net_context_connect(ctx, addr, addrlen, cb,
+						      timeout, ctx->user_data));
+		} else {
+			SET_ERRNO(net_context_connect(ctx, addr, addrlen, cb,
+						      timeout, ctx->user_data));
+			SET_ERRNO(net_context_recv(ctx, zsock_received_cb,
+						   K_NO_WAIT, ctx->user_data));
+		}
+	}
+
+	return 0;
+}
+
+int zsock_listen_ctx(struct net_context *ctx, int backlog)
+{
+	SET_ERRNO(net_context_listen(ctx, backlog));
+	SET_ERRNO(net_context_accept(ctx, zsock_accepted_cb, K_NO_WAIT, ctx));
+
+	return 0;
+}
+
+int zsock_accept_ctx(struct net_context *parent, struct sockaddr *addr,
+		     socklen_t *addrlen)
+{
+	struct net_context *ctx;
+	struct net_pkt *last_pkt;
+	int fd, ret;
+
+	if (!sock_is_nonblock(parent)) {
+		k_timeout_t timeout = K_FOREVER;
+
+		/* accept() can reuse zsock_wait_data(), as underneath it's
+		 * monitoring the same queue (accept_q is an alias for recv_q).
+		 */
+		ret = zsock_wait_data(parent, &timeout);
+		if (ret < 0) {
+			errno = -ret;
+			return -1;
+		}
+	}
+
+	ctx = k_fifo_get(&parent->accept_q, K_NO_WAIT);
+	if (ctx == NULL) {
+		errno = EAGAIN;
+		return -1;
+	}
+
+	fd = zvfs_reserve_fd();
+	if (fd < 0) {
+		zsock_flush_queue(ctx);
+		net_context_put(ctx);
+		return -1;
+	}
+
+	/* Check if the connection is already disconnected */
+	last_pkt = k_fifo_peek_tail(&ctx->recv_q);
+	if (last_pkt) {
+		if (net_pkt_eof(last_pkt)) {
+			sock_set_eof(ctx);
+			zvfs_free_fd(fd);
+			zsock_flush_queue(ctx);
+			net_context_put(ctx);
+			errno = ECONNABORTED;
+			return -1;
+		}
+	}
+
+	if (net_context_is_closing(ctx)) {
+		errno = ECONNABORTED;
+		zvfs_free_fd(fd);
+		zsock_flush_queue(ctx);
+		net_context_put(ctx);
+		return -1;
+	}
+
+	net_context_set_accepting(ctx, false);
+
+
+	if (addr != NULL && addrlen != NULL) {
+		int len = MIN(*addrlen, sizeof(ctx->remote));
+
+		memcpy(addr, &ctx->remote, len);
+		/* addrlen is a value-result argument, set to actual
+		 * size of source address
+		 */
+		if (ctx->remote.sa_family == AF_INET) {
+			*addrlen = sizeof(struct sockaddr_in);
+		} else if (ctx->remote.sa_family == AF_INET6) {
+			*addrlen = sizeof(struct sockaddr_in6);
+		} else {
+			zvfs_free_fd(fd);
+			errno = ENOTSUP;
+			zsock_flush_queue(ctx);
+			net_context_put(ctx);
+			return -1;
+		}
+	}
+
+	NET_DBG("accept: ctx=%p, fd=%d", ctx, fd);
+
+	zvfs_finalize_typed_fd(fd, ctx, (const struct fd_op_vtable *)&sock_fd_op_vtable,
+			    ZVFS_MODE_IFSOCK);
+
+	return fd;
+}
+
+#define WAIT_BUFS_INITIAL_MS 10
+#define WAIT_BUFS_MAX_MS 100
+#define MAX_WAIT_BUFS K_MSEC(CONFIG_NET_SOCKET_MAX_SEND_WAIT)
+
+static int send_check_and_wait(struct net_context *ctx, int status,
+			       k_timepoint_t buf_timeout, k_timeout_t timeout,
+			       uint32_t *retry_timeout)
+{
+	if (K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
+		goto out;
+	}
+
+	if (status != -ENOBUFS && status != -EAGAIN) {
+		goto out;
+	}
+
+	/* If we cannot get any buffers in reasonable
+	 * amount of time, then do not wait forever as
+	 * there might be some bigger issue.
+	 * If we get -EAGAIN and cannot recover, then
+	 * it means that the sending window is blocked
+	 * and we just cannot send anything.
+	 */
+	if (sys_timepoint_expired(buf_timeout)) {
+		if (status == -ENOBUFS) {
+			status = -ENOMEM;
+		} else {
+			status = -ENOBUFS;
+		}
+
+		goto out;
+	}
+
+	if (!K_TIMEOUT_EQ(timeout, K_FOREVER)) {
+		*retry_timeout =
+			MIN(*retry_timeout, k_ticks_to_ms_floor32(timeout.ticks));
+	}
+
+	if (ctx->cond.lock) {
+		(void)k_mutex_unlock(ctx->cond.lock);
+	}
+
+	if (status == -ENOBUFS) {
+		/* We can monitor net_pkt/net_buf availability, so just wait. */
+		k_sleep(K_MSEC(*retry_timeout));
+	}
+
+	if (status == -EAGAIN) {
+		if (IS_ENABLED(CONFIG_NET_NATIVE_TCP) &&
+		    net_context_get_type(ctx) == SOCK_STREAM &&
+		    !net_if_is_ip_offloaded(net_context_get_iface(ctx))) {
+			struct k_poll_event event;
+
+			k_poll_event_init(&event,
+					  K_POLL_TYPE_SEM_AVAILABLE,
+					  K_POLL_MODE_NOTIFY_ONLY,
+					  net_tcp_tx_sem_get(ctx));
+
+			k_poll(&event, 1, K_MSEC(*retry_timeout));
+		} else {
+			k_sleep(K_MSEC(*retry_timeout));
+		}
+	}
+	/* Exponentially increase the retry timeout
+	 * Cap the value to WAIT_BUFS_MAX_MS
+	 */
+	*retry_timeout = MIN(WAIT_BUFS_MAX_MS, *retry_timeout << 1);
+
+	if (ctx->cond.lock) {
+		(void)k_mutex_lock(ctx->cond.lock, K_FOREVER);
+	}
+
+	return 0;
+
+out:
+	errno = -status;
+	return -1;
+}
+
+ssize_t zsock_sendto_ctx(struct net_context *ctx, const void *buf, size_t len,
+			 int flags,
+			 const struct sockaddr *dest_addr, socklen_t addrlen)
+{
+	k_timeout_t timeout = K_FOREVER;
+	uint32_t retry_timeout = WAIT_BUFS_INITIAL_MS;
+	k_timepoint_t buf_timeout, end;
+	int status;
+
+	if ((flags & ZSOCK_MSG_DONTWAIT) || sock_is_nonblock(ctx)) {
+		timeout = K_NO_WAIT;
+		buf_timeout = sys_timepoint_calc(K_NO_WAIT);
+	} else {
+		net_context_get_option(ctx, NET_OPT_SNDTIMEO, &timeout, NULL);
+		buf_timeout = sys_timepoint_calc(MAX_WAIT_BUFS);
+	}
+	end = sys_timepoint_calc(timeout);
+
+	/* Register the callback before sending in order to receive the response
+	 * from the peer.
+	 */
+	status = net_context_recv(ctx, zsock_received_cb,
+				  K_NO_WAIT, ctx->user_data);
+	if (status < 0) {
+		errno = -status;
+		return -1;
+	}
+
+	while (1) {
+		if (dest_addr) {
+			status = net_context_sendto(ctx, buf, len, dest_addr,
+						    addrlen, NULL, timeout,
+						    ctx->user_data);
+		} else {
+			status = net_context_send(ctx, buf, len, NULL, timeout,
+						  ctx->user_data);
+		}
+
+		if (status < 0) {
+			status = send_check_and_wait(ctx, status, buf_timeout,
+						     timeout, &retry_timeout);
+			if (status < 0) {
+				return status;
+			}
+
+			/* Update the timeout value in case loop is repeated. */
+			timeout = sys_timepoint_timeout(end);
+
+			continue;
+		}
+
+		break;
+	}
+
+	return status;
+}
+
+size_t msghdr_non_empty_iov_count(const struct msghdr *msg)
+{
+	size_t non_empty_iov_count = 0;
+
+	for (size_t i = 0; i < msg->msg_iovlen; i++) {
+		if (msg->msg_iov[i].iov_len) {
+			non_empty_iov_count++;
+		}
+	}
+
+	return non_empty_iov_count;
+}
+
+ssize_t zsock_sendmsg_ctx(struct net_context *ctx, const struct msghdr *msg,
+			  int flags)
+{
+	k_timeout_t timeout = K_FOREVER;
+	uint32_t retry_timeout = WAIT_BUFS_INITIAL_MS;
+	k_timepoint_t buf_timeout, end;
+	int status;
+
+	if ((flags & ZSOCK_MSG_DONTWAIT) || sock_is_nonblock(ctx)) {
+		timeout = K_NO_WAIT;
+		buf_timeout = sys_timepoint_calc(K_NO_WAIT);
+	} else {
+		net_context_get_option(ctx, NET_OPT_SNDTIMEO, &timeout, NULL);
+		buf_timeout = sys_timepoint_calc(MAX_WAIT_BUFS);
+	}
+	end = sys_timepoint_calc(timeout);
+
+	while (1) {
+		status = net_context_sendmsg(ctx, msg, flags, NULL, timeout, NULL);
+		if (status < 0) {
+			status = send_check_and_wait(ctx, status,
+						     buf_timeout,
+						     timeout, &retry_timeout);
+			if (status < 0) {
+				return status;
+			}
+
+			/* Update the timeout value in case loop is repeated. */
+			timeout = sys_timepoint_timeout(end);
+
+			continue;
+		}
+
+		break;
+	}
+
+	return status;
+}
+
+static int sock_get_pkt_src_addr(struct net_pkt *pkt,
+				 enum net_ip_protocol proto,
+				 struct sockaddr *addr,
+				 socklen_t addrlen)
+{
+	int ret = 0;
+	struct net_pkt_cursor backup;
+	uint16_t *port;
+
+	if (!addr || !pkt) {
+		return -EINVAL;
+	}
+
+	net_pkt_cursor_backup(pkt, &backup);
+	net_pkt_cursor_init(pkt);
+
+	addr->sa_family = net_pkt_family(pkt);
+
+	if (IS_ENABLED(CONFIG_NET_IPV4) &&
+	    net_pkt_family(pkt) == AF_INET) {
+		NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv4_access,
+						      struct net_ipv4_hdr);
+		struct sockaddr_in *addr4 = net_sin(addr);
+		struct net_ipv4_hdr *ipv4_hdr;
+
+		if (addrlen < sizeof(struct sockaddr_in)) {
+			ret = -EINVAL;
+			goto error;
+		}
+
+		ipv4_hdr = (struct net_ipv4_hdr *)net_pkt_get_data(
+							pkt, &ipv4_access);
+		if (!ipv4_hdr ||
+		    net_pkt_acknowledge_data(pkt, &ipv4_access) ||
+		    net_pkt_skip(pkt, net_pkt_ipv4_opts_len(pkt))) {
+			ret = -ENOBUFS;
+			goto error;
+		}
+
+		net_ipv4_addr_copy_raw((uint8_t *)&addr4->sin_addr, ipv4_hdr->src);
+		port = &addr4->sin_port;
+	} else if (IS_ENABLED(CONFIG_NET_IPV6) &&
+		   net_pkt_family(pkt) == AF_INET6) {
+		NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv6_access,
+						      struct net_ipv6_hdr);
+		struct sockaddr_in6 *addr6 = net_sin6(addr);
+		struct net_ipv6_hdr *ipv6_hdr;
+
+		if (addrlen < sizeof(struct sockaddr_in6)) {
+			ret = -EINVAL;
+			goto error;
+		}
+
+		ipv6_hdr = (struct net_ipv6_hdr *)net_pkt_get_data(
+							pkt, &ipv6_access);
+		if (!ipv6_hdr ||
+		    net_pkt_acknowledge_data(pkt, &ipv6_access) ||
+		    net_pkt_skip(pkt, net_pkt_ipv6_ext_len(pkt))) {
+			ret = -ENOBUFS;
+			goto error;
+		}
+
+		net_ipv6_addr_copy_raw((uint8_t *)&addr6->sin6_addr, ipv6_hdr->src);
+		port = &addr6->sin6_port;
+	} else {
+		ret = -ENOTSUP;
+		goto error;
+	}
+
+	if (IS_ENABLED(CONFIG_NET_UDP) && proto == IPPROTO_UDP) {
+		NET_PKT_DATA_ACCESS_DEFINE(udp_access, struct net_udp_hdr);
+		struct net_udp_hdr *udp_hdr;
+
+		udp_hdr = (struct net_udp_hdr *)net_pkt_get_data(pkt,
+								 &udp_access);
+		if (!udp_hdr) {
+			ret = -ENOBUFS;
+			goto error;
+		}
+
+		*port = udp_hdr->src_port;
+	} else if (IS_ENABLED(CONFIG_NET_TCP) && proto == IPPROTO_TCP) {
+		NET_PKT_DATA_ACCESS_DEFINE(tcp_access, struct net_tcp_hdr);
+		struct net_tcp_hdr *tcp_hdr;
+
+		tcp_hdr = (struct net_tcp_hdr *)net_pkt_get_data(pkt,
+								 &tcp_access);
+		if (!tcp_hdr) {
+			ret = -ENOBUFS;
+			goto error;
+		}
+
+		*port = tcp_hdr->src_port;
+	} else {
+		ret = -ENOTSUP;
+	}
+
+error:
+	net_pkt_cursor_restore(pkt, &backup);
+
+	return ret;
+}
+
+#if defined(CONFIG_NET_OFFLOAD)
+static bool net_pkt_remote_addr_is_unspecified(struct net_pkt *pkt)
+{
+	bool ret = true;
+
+	if (net_pkt_family(pkt) == AF_INET) {
+		ret = net_ipv4_is_addr_unspecified(&net_sin(&pkt->remote)->sin_addr);
+	} else if (net_pkt_family(pkt) == AF_INET6) {
+		ret = net_ipv6_is_addr_unspecified(&net_sin6(&pkt->remote)->sin6_addr);
+	}
+
+	return ret;
+}
+
+static int sock_get_offload_pkt_src_addr(struct net_pkt *pkt,
+					 struct net_context *ctx,
+					 struct sockaddr *addr,
+					 socklen_t addrlen)
+{
+	int ret = 0;
+
+	if (!addr || !pkt) {
+		return -EINVAL;
+	}
+
+	if (!net_pkt_remote_addr_is_unspecified(pkt)) {
+		if (IS_ENABLED(CONFIG_NET_IPV4) &&
+		    net_pkt_family(pkt) == AF_INET) {
+			if (addrlen < sizeof(struct sockaddr_in)) {
+				ret = -EINVAL;
+				goto error;
+			}
+
+			memcpy(addr, &pkt->remote, sizeof(struct sockaddr_in));
+		} else if (IS_ENABLED(CONFIG_NET_IPV6) &&
+			   net_pkt_family(pkt) == AF_INET6) {
+			if (addrlen < sizeof(struct sockaddr_in6)) {
+				ret = -EINVAL;
+				goto error;
+			}
+
+			memcpy(addr, &pkt->remote, sizeof(struct sockaddr_in6));
+		}
+	} else if (ctx->flags & NET_CONTEXT_REMOTE_ADDR_SET) {
+		memcpy(addr, &ctx->remote, MIN(addrlen, sizeof(ctx->remote)));
+	} else {
+		ret = -ENOTSUP;
+	}
+
+error:
+	return ret;
+}
+#else
+static int sock_get_offload_pkt_src_addr(struct net_pkt *pkt,
+					 struct net_context *ctx,
+					 struct sockaddr *addr,
+					 socklen_t addrlen)
+{
+	ARG_UNUSED(pkt);
+	ARG_UNUSED(ctx);
+	ARG_UNUSED(addr);
+	ARG_UNUSED(addrlen);
+
+	return 0;
+}
+#endif /* CONFIG_NET_OFFLOAD */
+
+void net_socket_update_tc_rx_time(struct net_pkt *pkt, uint32_t end_tick)
+{
+	net_pkt_set_rx_stats_tick(pkt, end_tick);
+
+	net_stats_update_tc_rx_time(net_pkt_iface(pkt),
+				    net_pkt_priority(pkt),
+				    net_pkt_create_time(pkt),
+				    end_tick);
+
+	SYS_PORT_TRACING_FUNC(net, rx_time, pkt, end_tick);
+
+	if (IS_ENABLED(CONFIG_NET_PKT_RXTIME_STATS_DETAIL)) {
+		uint32_t val, prev = net_pkt_create_time(pkt);
+		int i;
+
+		for (i = 0; i < net_pkt_stats_tick_count(pkt); i++) {
+			if (!net_pkt_stats_tick(pkt)[i]) {
+				break;
+			}
+
+			val = net_pkt_stats_tick(pkt)[i] - prev;
+			prev = net_pkt_stats_tick(pkt)[i];
+			net_pkt_stats_tick(pkt)[i] = val;
+		}
+
+		net_stats_update_tc_rx_time_detail(
+			net_pkt_iface(pkt),
+			net_pkt_priority(pkt),
+			net_pkt_stats_tick(pkt));
+	}
+}
+
+int zsock_wait_data(struct net_context *ctx, k_timeout_t *timeout)
+{
+	int ret;
+
+	if (ctx->cond.lock == NULL) {
+		/* For some reason the lock pointer is not set properly
+		 * when called by fdtable.c:zvfs_finalize_fd()
+		 * It is not practical to try to figure out the fdtable
+		 * lock at this point so skip it.
+		 */
+		NET_WARN("No lock pointer set for context %p", ctx);
+		return -EINVAL;
+	}
+
+	if (k_fifo_is_empty(&ctx->recv_q)) {
+		/* Wait for the data to arrive but without holding a lock */
+		ret = k_condvar_wait(&ctx->cond.recv, ctx->cond.lock,
+				     *timeout);
+		if (ret < 0) {
+			return ret;
+		}
+
+		if (sock_is_error(ctx)) {
+			return -POINTER_TO_INT(ctx->user_data);
+		}
+	}
+
+	return 0;
+}
+
+static int insert_pktinfo(struct msghdr *msg, int level, int type,
+			  void *pktinfo, size_t pktinfo_len)
+{
+	struct cmsghdr *cmsg;
+
+	if (msg->msg_controllen < pktinfo_len) {
+		return -EINVAL;
+	}
+
+	for (cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) {
+		if (cmsg->cmsg_len == 0) {
+			break;
+		}
+	}
+
+	if (cmsg == NULL) {
+		return -EINVAL;
+	}
+
+	cmsg->cmsg_len = CMSG_LEN(pktinfo_len);
+	cmsg->cmsg_level = level;
+	cmsg->cmsg_type = type;
+
+	memcpy(CMSG_DATA(cmsg), pktinfo, pktinfo_len);
+
+	return 0;
+}
+
+static int add_timestamping(struct net_context *ctx,
+			    struct net_pkt *pkt,
+			    struct msghdr *msg)
+{
+	uint8_t timestamping = 0;
+
+	net_context_get_option(ctx, NET_OPT_TIMESTAMPING, &timestamping, NULL);
+
+	if (timestamping) {
+		return insert_pktinfo(msg, SOL_SOCKET, SO_TIMESTAMPING,
+				      net_pkt_timestamp(pkt), sizeof(struct net_ptp_time));
+	}
+
+	return -ENOTSUP;
+}
+
+static int add_pktinfo(struct net_context *ctx,
+			struct net_pkt *pkt,
+			struct msghdr *msg)
+{
+	int ret = -ENOTSUP;
+	struct net_pkt_cursor backup;
+
+	net_pkt_cursor_backup(pkt, &backup);
+	net_pkt_cursor_init(pkt);
+
+	if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET) {
+		NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv4_access,
+						      struct net_ipv4_hdr);
+		struct in_pktinfo info;
+		struct net_ipv4_hdr *ipv4_hdr;
+
+		ipv4_hdr = (struct net_ipv4_hdr *)net_pkt_get_data(
+							pkt, &ipv4_access);
+		if (ipv4_hdr == NULL ||
+		    net_pkt_acknowledge_data(pkt, &ipv4_access) ||
+		    net_pkt_skip(pkt, net_pkt_ipv4_opts_len(pkt))) {
+			ret = -ENOBUFS;
+			goto out;
+		}
+
+		net_ipv4_addr_copy_raw((uint8_t *)&info.ipi_addr, ipv4_hdr->dst);
+		net_ipv4_addr_copy_raw((uint8_t *)&info.ipi_spec_dst,
+				       (uint8_t *)net_sin_ptr(&ctx->local)->sin_addr);
+		info.ipi_ifindex = ctx->iface;
+
+		ret = insert_pktinfo(msg, IPPROTO_IP, IP_PKTINFO,
+				     &info, sizeof(info));
+
+		goto out;
+	}
+
+	if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == AF_INET6) {
+		NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv6_access,
+						      struct net_ipv6_hdr);
+		struct in6_pktinfo info;
+		struct net_ipv6_hdr *ipv6_hdr;
+
+		ipv6_hdr = (struct net_ipv6_hdr *)net_pkt_get_data(
+							pkt, &ipv6_access);
+		if (ipv6_hdr == NULL ||
+		    net_pkt_acknowledge_data(pkt, &ipv6_access) ||
+		    net_pkt_skip(pkt, net_pkt_ipv6_ext_len(pkt))) {
+			ret = -ENOBUFS;
+			goto out;
+		}
+
+		net_ipv6_addr_copy_raw((uint8_t *)&info.ipi6_addr, ipv6_hdr->dst);
+		info.ipi6_ifindex = ctx->iface;
+
+		ret = insert_pktinfo(msg, IPPROTO_IPV6, IPV6_RECVPKTINFO,
+				     &info, sizeof(info));
+
+		goto out;
+	}
+
+out:
+	net_pkt_cursor_restore(pkt, &backup);
+
+	return ret;
+}
+
+static int update_msg_controllen(struct msghdr *msg)
+{
+	struct cmsghdr *cmsg;
+	size_t cmsg_space = 0;
+
+	for (cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) {
+		if (cmsg->cmsg_len == 0) {
+			break;
+		}
+		cmsg_space += cmsg->cmsg_len;
+	}
+	msg->msg_controllen = cmsg_space;
+
+	return 0;
+}
+
+static inline ssize_t zsock_recv_dgram(struct net_context *ctx,
+				       struct msghdr *msg,
+				       void *buf,
+				       size_t max_len,
+				       int flags,
+				       struct sockaddr *src_addr,
+				       socklen_t *addrlen)
+{
+	k_timeout_t timeout = K_FOREVER;
+	size_t recv_len = 0;
+	size_t read_len;
+	struct net_pkt_cursor backup;
+	struct net_pkt *pkt;
+
+	if ((flags & ZSOCK_MSG_DONTWAIT) || sock_is_nonblock(ctx)) {
+		timeout = K_NO_WAIT;
+	} else {
+		int ret;
+
+		net_context_get_option(ctx, NET_OPT_RCVTIMEO, &timeout, NULL);
+
+		ret = zsock_wait_data(ctx, &timeout);
+		if (ret < 0) {
+			errno = -ret;
+			return -1;
+		}
+	}
+
+	if (flags & ZSOCK_MSG_PEEK) {
+		int res;
+
+		res = fifo_wait_non_empty(&ctx->recv_q, timeout);
+		/* EAGAIN when timeout expired, EINTR when cancelled */
+		if (res && res != -EAGAIN && res != -EINTR) {
+			errno = -res;
+			return -1;
+		}
+
+		pkt = k_fifo_peek_head(&ctx->recv_q);
+	} else {
+		pkt = k_fifo_get(&ctx->recv_q, timeout);
+	}
+
+	if (!pkt) {
+		errno = EAGAIN;
+		return -1;
+	}
+
+	net_pkt_cursor_backup(pkt, &backup);
+
+	if (src_addr && addrlen) {
+		if (IS_ENABLED(CONFIG_NET_OFFLOAD) &&
+		    net_if_is_ip_offloaded(net_context_get_iface(ctx))) {
+			int ret;
+
+			ret  = sock_get_offload_pkt_src_addr(pkt, ctx, src_addr,
+								*addrlen);
+			if (ret < 0) {
+				errno = -ret;
+				NET_DBG("sock_get_offload_pkt_src_addr %d", ret);
+				goto fail;
+			}
+		} else {
+			int ret;
+
+			ret = sock_get_pkt_src_addr(pkt, net_context_get_proto(ctx),
+						   src_addr, *addrlen);
+			if (ret < 0) {
+				errno = -ret;
+				NET_DBG("sock_get_pkt_src_addr %d", ret);
+				goto fail;
+			}
+		}
+
+		/* addrlen is a value-result argument, set to actual
+		 * size of source address
+		 */
+		if (src_addr->sa_family == AF_INET) {
+			*addrlen = sizeof(struct sockaddr_in);
+		} else if (src_addr->sa_family == AF_INET6) {
+			*addrlen = sizeof(struct sockaddr_in6);
+		} else {
+			errno = ENOTSUP;
+			goto fail;
+		}
+	}
+
+	if (msg != NULL) {
+		int iovec = 0;
+		size_t tmp_read_len;
+
+		if (msg->msg_iovlen < 1 || msg->msg_iov == NULL) {
+			errno = ENOMEM;
+			return -1;
+		}
+
+		recv_len = net_pkt_remaining_data(pkt);
+		tmp_read_len = read_len = MIN(recv_len, max_len);
+
+		while (tmp_read_len > 0) {
+			size_t len;
+
+			buf = msg->msg_iov[iovec].iov_base;
+			if (buf == NULL) {
+				errno = EINVAL;
+				return -1;
+			}
+
+			len = MIN(tmp_read_len, msg->msg_iov[iovec].iov_len);
+
+			if (net_pkt_read(pkt, buf, len)) {
+				errno = ENOBUFS;
+				goto fail;
+			}
+
+			if (len <= tmp_read_len) {
+				tmp_read_len -= len;
+				msg->msg_iov[iovec].iov_len = len;
+				iovec++;
+			} else {
+				errno = EINVAL;
+				return -1;
+			}
+		}
+
+		msg->msg_iovlen = iovec;
+
+		if (recv_len != read_len) {
+			msg->msg_flags |= ZSOCK_MSG_TRUNC;
+		}
+
+	} else {
+		recv_len = net_pkt_remaining_data(pkt);
+		read_len = MIN(recv_len, max_len);
+
+		if (net_pkt_read(pkt, buf, read_len)) {
+			errno = ENOBUFS;
+			goto fail;
+		}
+	}
+
+	if (msg != NULL) {
+		if (msg->msg_control != NULL) {
+			if (msg->msg_controllen > 0) {
+				if (IS_ENABLED(CONFIG_NET_CONTEXT_TIMESTAMPING) &&
+				    net_context_is_timestamping_set(ctx)) {
+					if (add_timestamping(ctx, pkt, msg) < 0) {
+						msg->msg_flags |= ZSOCK_MSG_CTRUNC;
+					}
+				}
+
+				if (IS_ENABLED(CONFIG_NET_CONTEXT_RECV_PKTINFO) &&
+				    net_context_is_recv_pktinfo_set(ctx)) {
+					if (add_pktinfo(ctx, pkt, msg) < 0) {
+						msg->msg_flags |= ZSOCK_MSG_CTRUNC;
+					}
+				}
+
+				/* msg_controllen must be updated to reflect the total length of all
+				 * control messages in the buffer. If there are no control data,
+				 * msg_controllen will be cleared as expected It will also take into
+				 * account pre-existing control data
+				 */
+				update_msg_controllen(msg);
+			}
+		} else {
+			msg->msg_controllen = 0U;
+		}
+	}
+
+	if ((IS_ENABLED(CONFIG_NET_PKT_RXTIME_STATS) ||
+	     IS_ENABLED(CONFIG_TRACING_NET_CORE)) &&
+	    !(flags & ZSOCK_MSG_PEEK)) {
+		net_socket_update_tc_rx_time(pkt, k_cycle_get_32());
+	}
+
+	if (!(flags & ZSOCK_MSG_PEEK)) {
+		net_pkt_unref(pkt);
+	} else {
+		net_pkt_cursor_restore(pkt, &backup);
+	}
+
+	return (flags & ZSOCK_MSG_TRUNC) ? recv_len : read_len;
+
+fail:
+	if (!(flags & ZSOCK_MSG_PEEK)) {
+		net_pkt_unref(pkt);
+	}
+
+	return -1;
+}
+
+static size_t zsock_recv_stream_immediate(struct net_context *ctx, uint8_t **buf, size_t *max_len,
+					  int flags)
+{
+	size_t len;
+	size_t pkt_len;
+	size_t recv_len = 0;
+	struct net_pkt *pkt;
+	struct net_pkt_cursor backup;
+	struct net_pkt *origin = NULL;
+	const bool do_recv = !(buf == NULL || max_len == NULL);
+	size_t _max_len = (max_len == NULL) ? SIZE_MAX : *max_len;
+	const bool peek = (flags & ZSOCK_MSG_PEEK) == ZSOCK_MSG_PEEK;
+
+	while (_max_len > 0) {
+		/* only peek until we know we can dequeue and / or requeue buffer */
+		pkt = k_fifo_peek_head(&ctx->recv_q);
+		if (pkt == NULL || pkt == origin) {
+			break;
+		}
+
+		if (origin == NULL) {
+			/* mark first pkt to avoid cycles when observing */
+			origin = pkt;
+		}
+
+		pkt_len = net_pkt_remaining_data(pkt);
+		len = MIN(_max_len, pkt_len);
+		recv_len += len;
+		_max_len -= len;
+
+		if (do_recv && len > 0) {
+			if (peek) {
+				net_pkt_cursor_backup(pkt, &backup);
+			}
+
+			net_pkt_read(pkt, *buf, len);
+			/* update buffer position for caller */
+			*buf += len;
+
+			if (peek) {
+				net_pkt_cursor_restore(pkt, &backup);
+			}
+		}
+
+		if (do_recv && !peek) {
+			if (len == pkt_len) {
+				/* dequeue empty packets when not observing */
+				pkt = k_fifo_get(&ctx->recv_q, K_NO_WAIT);
+				if (net_pkt_eof(pkt)) {
+					sock_set_eof(ctx);
+				}
+
+				if (IS_ENABLED(CONFIG_NET_PKT_RXTIME_STATS) ||
+				    IS_ENABLED(CONFIG_TRACING_NET_CORE)) {
+					net_socket_update_tc_rx_time(pkt, k_cycle_get_32());
+				}
+
+				net_pkt_unref(pkt);
+			}
+		} else if (!do_recv || peek) {
+			/* requeue packets when observing */
+			k_fifo_put(&ctx->recv_q, k_fifo_get(&ctx->recv_q, K_NO_WAIT));
+		}
+	}
+
+	if (do_recv) {
+		/* convey remaining buffer size back to caller */
+		*max_len = _max_len;
+	}
+
+	return recv_len;
+}
+
+static int zsock_fionread_ctx(struct net_context *ctx)
+{
+	size_t ret = zsock_recv_stream_immediate(ctx, NULL, NULL, 0);
+
+	return MIN(ret, INT_MAX);
+}
+
+static ssize_t zsock_recv_stream_timed(struct net_context *ctx, struct msghdr *msg,
+				       uint8_t *buf, size_t max_len,
+				       int flags, k_timeout_t timeout)
+{
+	int res;
+	k_timepoint_t end;
+	size_t recv_len = 0, iovec = 0, available_len, max_iovlen = 0;
+	const bool waitall = (flags & ZSOCK_MSG_WAITALL) == ZSOCK_MSG_WAITALL;
+
+	if (msg != NULL && buf == NULL) {
+		if (msg->msg_iovlen < 1) {
+			return -EINVAL;
+		}
+
+		buf = msg->msg_iov[iovec].iov_base;
+		available_len = msg->msg_iov[iovec].iov_len;
+		msg->msg_iov[iovec].iov_len = 0;
+		max_iovlen = msg->msg_iovlen;
+	}
+
+	for (end = sys_timepoint_calc(timeout); max_len > 0; timeout = sys_timepoint_timeout(end)) {
+
+		if (sock_is_error(ctx)) {
+			return -POINTER_TO_INT(ctx->user_data);
+		}
+
+		if (sock_is_eof(ctx)) {
+			return 0;
+		}
+
+		if (!K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
+			res = zsock_wait_data(ctx, &timeout);
+			if (res < 0) {
+				return res;
+			}
+		}
+
+		if (msg != NULL) {
+again:
+			res = zsock_recv_stream_immediate(ctx, &buf, &available_len, flags);
+			recv_len += res;
+
+			if (res == 0 && recv_len == 0 && K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
+				return -EAGAIN;
+			}
+
+			msg->msg_iov[iovec].iov_len += res;
+			buf = (uint8_t *)(msg->msg_iov[iovec].iov_base) + res;
+			max_len -= res;
+
+			if (available_len == 0) {
+				/* All data to this iovec was written */
+				iovec++;
+
+				if (iovec == max_iovlen) {
+					break;
+				}
+
+				msg->msg_iovlen = iovec;
+				buf = msg->msg_iov[iovec].iov_base;
+				available_len = msg->msg_iov[iovec].iov_len;
+				msg->msg_iov[iovec].iov_len = 0;
+
+				/* If there is more data, read it now and do not wait */
+				if (buf != NULL && available_len > 0) {
+					goto again;
+				}
+
+				continue;
+			}
+
+		} else {
+			res = zsock_recv_stream_immediate(ctx, &buf, &max_len, flags);
+			recv_len += res;
+
+			if (res == 0) {
+				if (recv_len == 0 && K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
+					return -EAGAIN;
+				}
+			}
+		}
+
+		if (!waitall) {
+			break;
+		}
+	}
+
+	return recv_len;
+}
+
+static ssize_t zsock_recv_stream(struct net_context *ctx, struct msghdr *msg,
+				 void *buf, size_t max_len, int flags)
+{
+	ssize_t res;
+	size_t recv_len = 0;
+	k_timeout_t timeout = K_FOREVER;
+
+	if (!net_context_is_used(ctx)) {
+		errno = EBADF;
+		return -1;
+	}
+
+	if (net_context_get_state(ctx) != NET_CONTEXT_CONNECTED) {
+		errno = ENOTCONN;
+		return -1;
+	}
+
+	if ((flags & ZSOCK_MSG_DONTWAIT) || sock_is_nonblock(ctx)) {
+		timeout = K_NO_WAIT;
+	} else if (!sock_is_eof(ctx) && !sock_is_error(ctx)) {
+		net_context_get_option(ctx, NET_OPT_RCVTIMEO, &timeout, NULL);
+	}
+
+	if (max_len == 0) {
+		/* no bytes requested - done! */
+		return 0;
+	}
+
+	res = zsock_recv_stream_timed(ctx, msg, buf, max_len, flags, timeout);
+	recv_len += MAX(0, res);
+
+	if (res < 0) {
+		errno = -res;
+		return -1;
+	}
+
+	if (!(flags & ZSOCK_MSG_PEEK)) {
+		net_context_update_recv_wnd(ctx, recv_len);
+	}
+
+	return recv_len;
+}
+
+ssize_t zsock_recvfrom_ctx(struct net_context *ctx, void *buf, size_t max_len,
+			   int flags,
+			   struct sockaddr *src_addr, socklen_t *addrlen)
+{
+	enum net_sock_type sock_type = net_context_get_type(ctx);
+
+	if (max_len == 0) {
+		return 0;
+	}
+
+	if (sock_type == SOCK_DGRAM) {
+		return zsock_recv_dgram(ctx, NULL, buf, max_len, flags, src_addr, addrlen);
+	} else if (sock_type == SOCK_STREAM) {
+		return zsock_recv_stream(ctx, NULL, buf, max_len, flags);
+	}
+
+	__ASSERT(0, "Unknown socket type");
+
+	errno = ENOTSUP;
+
+	return -1;
+}
+
+ssize_t zsock_recvmsg_ctx(struct net_context *ctx, struct msghdr *msg,
+			  int flags)
+{
+	enum net_sock_type sock_type = net_context_get_type(ctx);
+	size_t i, max_len = 0;
+
+	if (msg == NULL) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	if (msg->msg_iov == NULL) {
+		errno = ENOMEM;
+		return -1;
+	}
+
+	for (i = 0; i < msg->msg_iovlen; i++) {
+		max_len += msg->msg_iov[i].iov_len;
+	}
+
+	if (sock_type == SOCK_DGRAM) {
+		return zsock_recv_dgram(ctx, msg, NULL, max_len, flags,
+					msg->msg_name, &msg->msg_namelen);
+	} else if (sock_type == SOCK_STREAM) {
+		return zsock_recv_stream(ctx, msg, NULL, max_len, flags);
+	}
+
+	__ASSERT(0, "Unknown socket type");
+
+	errno = ENOTSUP;
+
+	return -1;
+}
+
+static int zsock_poll_prepare_ctx(struct net_context *ctx,
+				  struct zsock_pollfd *pfd,
+				  struct k_poll_event **pev,
+				  struct k_poll_event *pev_end)
+{
+	if (pfd->events & ZSOCK_POLLIN) {
+		if (*pev == pev_end) {
+			return -ENOMEM;
+		}
+
+		(*pev)->obj = &ctx->recv_q;
+		(*pev)->type = K_POLL_TYPE_FIFO_DATA_AVAILABLE;
+		(*pev)->mode = K_POLL_MODE_NOTIFY_ONLY;
+		(*pev)->state = K_POLL_STATE_NOT_READY;
+		(*pev)++;
+	}
+
+	if (pfd->events & ZSOCK_POLLOUT) {
+		if (IS_ENABLED(CONFIG_NET_NATIVE_TCP) &&
+		    net_context_get_type(ctx) == SOCK_STREAM &&
+		    !net_if_is_ip_offloaded(net_context_get_iface(ctx))) {
+			if (*pev == pev_end) {
+				return -ENOMEM;
+			}
+
+			if (net_context_get_state(ctx) == NET_CONTEXT_CONNECTING) {
+				(*pev)->obj = net_tcp_conn_sem_get(ctx);
+			} else {
+				(*pev)->obj = net_tcp_tx_sem_get(ctx);
+			}
+
+			(*pev)->type = K_POLL_TYPE_SEM_AVAILABLE;
+			(*pev)->mode = K_POLL_MODE_NOTIFY_ONLY;
+			(*pev)->state = K_POLL_STATE_NOT_READY;
+			(*pev)++;
+		} else {
+			return -EALREADY;
+		}
+
+	}
+
+	/* If socket is already in EOF or error, it can be reported
+	 * immediately, so we tell poll() to short-circuit wait.
+	 */
+	if (sock_is_eof(ctx) || sock_is_error(ctx)) {
+		return -EALREADY;
+	}
+
+	return 0;
+}
+
+static int zsock_poll_update_ctx(struct net_context *ctx,
+				 struct zsock_pollfd *pfd,
+				 struct k_poll_event **pev)
+{
+	ARG_UNUSED(ctx);
+
+	if (pfd->events & ZSOCK_POLLIN) {
+		if ((*pev)->state != K_POLL_STATE_NOT_READY || sock_is_eof(ctx)) {
+			pfd->revents |= ZSOCK_POLLIN;
+		}
+		(*pev)++;
+	}
+	if (pfd->events & ZSOCK_POLLOUT) {
+		if (IS_ENABLED(CONFIG_NET_NATIVE_TCP) &&
+		    net_context_get_type(ctx) == SOCK_STREAM &&
+		    !net_if_is_ip_offloaded(net_context_get_iface(ctx))) {
+			if ((*pev)->state != K_POLL_STATE_NOT_READY &&
+			    !sock_is_eof(ctx) &&
+			    (net_context_get_state(ctx) == NET_CONTEXT_CONNECTED)) {
+				pfd->revents |= ZSOCK_POLLOUT;
+			}
+			(*pev)++;
+		} else {
+			pfd->revents |= ZSOCK_POLLOUT;
+		}
+	}
+
+	if (sock_is_error(ctx)) {
+		pfd->revents |= ZSOCK_POLLERR;
+	}
+
+	if (sock_is_eof(ctx)) {
+		pfd->revents |= ZSOCK_POLLHUP;
+	}
+
+	return 0;
+}
+
+static enum tcp_conn_option get_tcp_option(int optname)
+{
+	switch (optname) {
+	case TCP_KEEPIDLE:
+		return TCP_OPT_KEEPIDLE;
+	case TCP_KEEPINTVL:
+		return TCP_OPT_KEEPINTVL;
+	case TCP_KEEPCNT:
+		return TCP_OPT_KEEPCNT;
+	}
+
+	return -EINVAL;
+}
+
+int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname,
+			 void *optval, socklen_t *optlen)
+{
+	int ret;
+
+	switch (level) {
+	case SOL_SOCKET:
+		switch (optname) {
+		case SO_ERROR: {
+			if (*optlen != sizeof(int)) {
+				errno = EINVAL;
+				return -1;
+			}
+
+			*(int *)optval = POINTER_TO_INT(ctx->user_data);
+
+			return 0;
+		}
+
+		case SO_TYPE: {
+			int type = (int)net_context_get_type(ctx);
+
+			if (*optlen != sizeof(type)) {
+				errno = EINVAL;
+				return -1;
+			}
+
+			*(int *)optval = type;
+
+			return 0;
+		}
+
+		case SO_TXTIME:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_TXTIME)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_TXTIME,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+			break;
+
+		case SO_PROTOCOL: {
+			int proto = (int)net_context_get_proto(ctx);
+
+			if (*optlen != sizeof(proto)) {
+				errno = EINVAL;
+				return -1;
+			}
+
+			*(int *)optval = proto;
+
+			return 0;
+		}
+
+		case SO_DOMAIN: {
+			if (*optlen != sizeof(int)) {
+				errno = EINVAL;
+				return -1;
+			}
+
+			*(int *)optval = net_context_get_family(ctx);
+
+			return 0;
+		}
+
+		break;
+
+		case SO_RCVBUF:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_RCVBUF)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_RCVBUF,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+			break;
+
+		case SO_SNDBUF:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_SNDBUF)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_SNDBUF,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+			break;
+
+		case SO_REUSEADDR:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEADDR)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_REUSEADDR,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+			break;
+
+		case SO_REUSEPORT:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEPORT)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_REUSEPORT,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+			break;
+
+		case SO_KEEPALIVE:
+			if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE) &&
+			    net_context_get_proto(ctx) == IPPROTO_TCP) {
+				ret = net_tcp_get_option(ctx,
+							 TCP_OPT_KEEPALIVE,
+							 optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case SO_TIMESTAMPING:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_TIMESTAMPING)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_TIMESTAMPING,
+							     optval, optlen);
+
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+		}
+
+		break;
+
+	case IPPROTO_TCP:
+		switch (optname) {
+		case TCP_NODELAY:
+			ret = net_tcp_get_option(ctx, TCP_OPT_NODELAY, optval, optlen);
+			return ret;
+
+		case TCP_KEEPIDLE:
+			__fallthrough;
+		case TCP_KEEPINTVL:
+			__fallthrough;
+		case TCP_KEEPCNT:
+			if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE)) {
+				ret = net_tcp_get_option(ctx,
+							 get_tcp_option(optname),
+							 optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+		}
+
+		break;
+
+	case IPPROTO_IP:
+		switch (optname) {
+		case IP_TOS:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_DSCP_ECN,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case IP_TTL:
+			ret = net_context_get_option(ctx, NET_OPT_TTL,
+						     optval, optlen);
+			if (ret < 0) {
+				errno  = -ret;
+				return -1;
+			}
+
+			return 0;
+
+		case IP_MULTICAST_TTL:
+			ret = net_context_get_option(ctx, NET_OPT_MCAST_TTL,
+						     optval, optlen);
+			if (ret < 0) {
+				errno  = -ret;
+				return -1;
+			}
+
+			return 0;
+		}
+
+		break;
+
+	case IPPROTO_IPV6:
+		switch (optname) {
+		case IPV6_V6ONLY:
+			if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_IPV6_V6ONLY,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case IPV6_ADDR_PREFERENCES:
+			if (IS_ENABLED(CONFIG_NET_IPV6)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_ADDR_PREFERENCES,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case IPV6_TCLASS:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_DSCP_ECN,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case IPV6_UNICAST_HOPS:
+			ret = net_context_get_option(ctx,
+						     NET_OPT_UNICAST_HOP_LIMIT,
+						     optval, optlen);
+			if (ret < 0) {
+				errno  = -ret;
+				return -1;
+			}
+
+			return 0;
+
+		case IPV6_MULTICAST_HOPS:
+			ret = net_context_get_option(ctx,
+						     NET_OPT_MCAST_HOP_LIMIT,
+						     optval, optlen);
+			if (ret < 0) {
+				errno  = -ret;
+				return -1;
+			}
+
+			return 0;
+		}
+
+		break;
+	}
+
+	errno = ENOPROTOOPT;
+	return -1;
+}
+
+static int ipv4_multicast_group(struct net_context *ctx, const void *optval,
+				socklen_t optlen, bool do_join)
+{
+	struct ip_mreqn *mreqn;
+	struct net_if *iface;
+	int ifindex, ret;
+
+	if (optval == NULL || optlen != sizeof(struct ip_mreqn)) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	mreqn = (struct ip_mreqn *)optval;
+
+	if (mreqn->imr_multiaddr.s_addr == INADDR_ANY) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	if (mreqn->imr_ifindex != 0) {
+		iface = net_if_get_by_index(mreqn->imr_ifindex);
+	} else {
+		ifindex = net_if_ipv4_addr_lookup_by_index(&mreqn->imr_address);
+		iface = net_if_get_by_index(ifindex);
+	}
+
+	if (iface == NULL) {
+		/* Check if ctx has already an interface and if not,
+		 * then select the default interface.
+		 */
+		if (ctx->iface <= 0) {
+			iface = net_if_get_default();
+		} else {
+			iface = net_if_get_by_index(ctx->iface);
+		}
+
+		if (iface == NULL) {
+			errno = EINVAL;
+			return -1;
+		}
+	}
+
+	if (do_join) {
+		ret = net_ipv4_igmp_join(iface, &mreqn->imr_multiaddr, NULL);
+	} else {
+		ret = net_ipv4_igmp_leave(iface, &mreqn->imr_multiaddr);
+	}
+
+	if (ret < 0) {
+		errno  = -ret;
+		return -1;
+	}
+
+	return 0;
+}
+
+static int ipv6_multicast_group(struct net_context *ctx, const void *optval,
+				socklen_t optlen, bool do_join)
+{
+	struct ipv6_mreq *mreq;
+	struct net_if *iface;
+	int ret;
+
+	if (optval == NULL || optlen != sizeof(struct ipv6_mreq)) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	mreq = (struct ipv6_mreq *)optval;
+
+	if (memcmp(&mreq->ipv6mr_multiaddr,
+		   net_ipv6_unspecified_address(),
+		   sizeof(mreq->ipv6mr_multiaddr)) == 0) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	iface = net_if_get_by_index(mreq->ipv6mr_ifindex);
+	if (iface == NULL) {
+		/* Check if ctx has already an interface and if not,
+		 * then select the default interface.
+		 */
+		if (ctx->iface <= 0) {
+			iface = net_if_get_default();
+		} else {
+			iface = net_if_get_by_index(ctx->iface);
+		}
+
+		if (iface == NULL) {
+			errno = ENOENT;
+			return -1;
+		}
+	}
+
+	if (do_join) {
+		ret = net_ipv6_mld_join(iface, &mreq->ipv6mr_multiaddr);
+	} else {
+		ret = net_ipv6_mld_leave(iface, &mreq->ipv6mr_multiaddr);
+	}
+
+	if (ret < 0) {
+		errno  = -ret;
+		return -1;
+	}
+
+	return 0;
+}
+
+int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname,
+			 const void *optval, socklen_t optlen)
+{
+	int ret;
+
+	switch (level) {
+	case SOL_SOCKET:
+		switch (optname) {
+		case SO_RCVBUF:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_RCVBUF)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_RCVBUF,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case SO_SNDBUF:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_SNDBUF)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_SNDBUF,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case SO_REUSEADDR:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEADDR)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_REUSEADDR,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case SO_REUSEPORT:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEPORT)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_REUSEPORT,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case SO_PRIORITY:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_PRIORITY)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_PRIORITY,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case SO_RCVTIMEO:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_RCVTIMEO)) {
+				const struct zsock_timeval *tv = optval;
+				k_timeout_t timeout;
+
+				if (optlen != sizeof(struct zsock_timeval)) {
+					errno = EINVAL;
+					return -1;
+				}
+
+				if (tv->tv_sec == 0 && tv->tv_usec == 0) {
+					timeout = K_FOREVER;
+				} else {
+					timeout = K_USEC(tv->tv_sec * 1000000ULL
+							 + tv->tv_usec);
+				}
+
+				ret = net_context_set_option(ctx,
+							     NET_OPT_RCVTIMEO,
+							     &timeout,
+							     sizeof(timeout));
+
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case SO_SNDTIMEO:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_SNDTIMEO)) {
+				const struct zsock_timeval *tv = optval;
+				k_timeout_t timeout;
+
+				if (optlen != sizeof(struct zsock_timeval)) {
+					errno = EINVAL;
+					return -1;
+				}
+
+				if (tv->tv_sec == 0 && tv->tv_usec == 0) {
+					timeout = K_FOREVER;
+				} else {
+					timeout = K_USEC(tv->tv_sec * 1000000ULL
+							 + tv->tv_usec);
+				}
+
+				ret = net_context_set_option(ctx,
+							     NET_OPT_SNDTIMEO,
+							     &timeout,
+							     sizeof(timeout));
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case SO_TXTIME:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_TXTIME)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_TXTIME,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case SO_SOCKS5:
+			if (IS_ENABLED(CONFIG_SOCKS)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_SOCKS5,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				net_context_set_proxy_enabled(ctx, true);
+
+				return 0;
+			}
+
+			break;
+
+		case SO_BINDTODEVICE: {
+			struct net_if *iface;
+			const struct ifreq *ifreq = optval;
+
+			if (net_context_get_family(ctx) != AF_INET &&
+			    net_context_get_family(ctx) != AF_INET6) {
+				errno = EAFNOSUPPORT;
+				return -1;
+			}
+
+			/* optlen equal to 0 or empty interface name should
+			 * remove the binding.
+			 */
+			if ((optlen == 0) || (ifreq != NULL &&
+					      strlen(ifreq->ifr_name) == 0)) {
+				ctx->flags &= ~NET_CONTEXT_BOUND_TO_IFACE;
+				return 0;
+			}
+
+			if ((ifreq == NULL) || (optlen != sizeof(*ifreq))) {
+				errno = EINVAL;
+				return -1;
+			}
+
+			if (IS_ENABLED(CONFIG_NET_INTERFACE_NAME)) {
+				ret = net_if_get_by_name(ifreq->ifr_name);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				iface = net_if_get_by_index(ret);
+				if (iface == NULL) {
+					errno = ENODEV;
+					return -1;
+				}
+			} else {
+				const struct device *dev;
+
+				dev = device_get_binding(ifreq->ifr_name);
+				if (dev == NULL) {
+					errno = ENODEV;
+					return -1;
+				}
+
+				iface = net_if_lookup_by_dev(dev);
+				if (iface == NULL) {
+					errno = ENODEV;
+					return -1;
+				}
+			}
+
+			net_context_bind_iface(ctx, iface);
+
+			return 0;
+		}
+
+		case SO_LINGER:
+			/* ignored. for compatibility purposes only */
+			return 0;
+
+		case SO_KEEPALIVE:
+			if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE) &&
+			    net_context_get_proto(ctx) == IPPROTO_TCP) {
+				ret = net_tcp_set_option(ctx,
+							 TCP_OPT_KEEPALIVE,
+							 optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case SO_TIMESTAMPING:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_TIMESTAMPING)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_TIMESTAMPING,
+							     optval, optlen);
+
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+		}
+
+		break;
+
+	case IPPROTO_TCP:
+		switch (optname) {
+		case TCP_NODELAY:
+			ret = net_tcp_set_option(ctx,
+						 TCP_OPT_NODELAY, optval, optlen);
+			return ret;
+
+		case TCP_KEEPIDLE:
+			__fallthrough;
+		case TCP_KEEPINTVL:
+			__fallthrough;
+		case TCP_KEEPCNT:
+			if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE)) {
+				ret = net_tcp_set_option(ctx,
+							 get_tcp_option(optname),
+							 optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+		}
+		break;
+
+	case IPPROTO_IP:
+		switch (optname) {
+		case IP_TOS:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_DSCP_ECN,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case IP_PKTINFO:
+			if (IS_ENABLED(CONFIG_NET_IPV4) &&
+			    IS_ENABLED(CONFIG_NET_CONTEXT_RECV_PKTINFO)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_RECV_PKTINFO,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case IP_MULTICAST_TTL:
+			ret = net_context_set_option(ctx, NET_OPT_MCAST_TTL,
+						     optval, optlen);
+			if (ret < 0) {
+				errno  = -ret;
+				return -1;
+			}
+
+			return 0;
+
+		case IP_TTL:
+			ret = net_context_set_option(ctx, NET_OPT_TTL,
+						     optval, optlen);
+			if (ret < 0) {
+				errno  = -ret;
+				return -1;
+			}
+
+			return 0;
+
+		case IP_ADD_MEMBERSHIP:
+			if (IS_ENABLED(CONFIG_NET_IPV4)) {
+				return ipv4_multicast_group(ctx, optval,
+							    optlen, true);
+			}
+
+			break;
+
+		case IP_DROP_MEMBERSHIP:
+			if (IS_ENABLED(CONFIG_NET_IPV4)) {
+				return ipv4_multicast_group(ctx, optval,
+							    optlen, false);
+			}
+
+			break;
+		}
+
+		break;
+
+	case IPPROTO_IPV6:
+		switch (optname) {
+		case IPV6_V6ONLY:
+			if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_IPV6_V6ONLY,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
+			}
+
+			return 0;
+
+		case IPV6_RECVPKTINFO:
+			if (IS_ENABLED(CONFIG_NET_IPV6) &&
+			    IS_ENABLED(CONFIG_NET_CONTEXT_RECV_PKTINFO)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_RECV_PKTINFO,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case IPV6_ADDR_PREFERENCES:
+			if (IS_ENABLED(CONFIG_NET_IPV6)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_ADDR_PREFERENCES,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case IPV6_TCLASS:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_DSCP_ECN,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case IPV6_UNICAST_HOPS:
+			ret = net_context_set_option(ctx,
+						     NET_OPT_UNICAST_HOP_LIMIT,
+						     optval, optlen);
+			if (ret < 0) {
+				errno  = -ret;
+				return -1;
+			}
+
+			return 0;
+
+		case IPV6_MULTICAST_HOPS:
+			ret = net_context_set_option(ctx,
+						     NET_OPT_MCAST_HOP_LIMIT,
+						     optval, optlen);
+			if (ret < 0) {
+				errno  = -ret;
+				return -1;
+			}
+
+			return 0;
+
+		case IPV6_ADD_MEMBERSHIP:
+			if (IS_ENABLED(CONFIG_NET_IPV6)) {
+				return ipv6_multicast_group(ctx, optval,
+							    optlen, true);
+			}
+
+			break;
+
+		case IPV6_DROP_MEMBERSHIP:
+			if (IS_ENABLED(CONFIG_NET_IPV6)) {
+				return ipv6_multicast_group(ctx, optval,
+							    optlen, false);
+			}
+
+			break;
+		}
+
+		break;
+	}
+
+	errno = ENOPROTOOPT;
+	return -1;
+}
+
+int zsock_getpeername_ctx(struct net_context *ctx, struct sockaddr *addr,
+			  socklen_t *addrlen)
+{
+	socklen_t newlen = 0;
+
+	if (addr == NULL || addrlen == NULL) {
+		SET_ERRNO(-EINVAL);
+	}
+
+	if (!(ctx->flags & NET_CONTEXT_REMOTE_ADDR_SET)) {
+		SET_ERRNO(-ENOTCONN);
+	}
+
+	if (net_context_get_type(ctx) == SOCK_STREAM &&
+	    net_context_get_state(ctx) != NET_CONTEXT_CONNECTED) {
+		SET_ERRNO(-ENOTCONN);
+	}
+
+	if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->remote.sa_family == AF_INET) {
+		struct sockaddr_in addr4 = { 0 };
+
+		addr4.sin_family = AF_INET;
+		addr4.sin_port = net_sin(&ctx->remote)->sin_port;
+		memcpy(&addr4.sin_addr, &net_sin(&ctx->remote)->sin_addr,
+		       sizeof(struct in_addr));
+		newlen = sizeof(struct sockaddr_in);
+
+		memcpy(addr, &addr4, MIN(*addrlen, newlen));
+	} else if (IS_ENABLED(CONFIG_NET_IPV6) &&
+		   ctx->remote.sa_family == AF_INET6) {
+		struct sockaddr_in6 addr6 = { 0 };
+
+		addr6.sin6_family = AF_INET6;
+		addr6.sin6_port = net_sin6(&ctx->remote)->sin6_port;
+		memcpy(&addr6.sin6_addr, &net_sin6(&ctx->remote)->sin6_addr,
+		       sizeof(struct in6_addr));
+		newlen = sizeof(struct sockaddr_in6);
+
+		memcpy(addr, &addr6, MIN(*addrlen, newlen));
+	} else {
+		SET_ERRNO(-EINVAL);
+	}
+
+	*addrlen = newlen;
+
+	return 0;
+}
+
+int zsock_getsockname_ctx(struct net_context *ctx, struct sockaddr *addr,
+			  socklen_t *addrlen)
+{
+	socklen_t newlen = 0;
+	int ret;
+
+	if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->local.family == AF_INET) {
+		struct sockaddr_in addr4 = { 0 };
+
+		if (net_sin_ptr(&ctx->local)->sin_addr == NULL) {
+			SET_ERRNO(-EINVAL);
+		}
+
+		newlen = sizeof(struct sockaddr_in);
+
+		ret = net_context_get_local_addr(ctx,
+						 (struct sockaddr *)&addr4,
+						 &newlen);
+		if (ret < 0) {
+			SET_ERRNO(-ret);
+		}
+
+		memcpy(addr, &addr4, MIN(*addrlen, newlen));
+
+	} else if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->local.family == AF_INET6) {
+		struct sockaddr_in6 addr6 = { 0 };
+
+		if (net_sin6_ptr(&ctx->local)->sin6_addr == NULL) {
+			SET_ERRNO(-EINVAL);
+		}
+
+		newlen = sizeof(struct sockaddr_in6);
+
+		ret = net_context_get_local_addr(ctx,
+						 (struct sockaddr *)&addr6,
+						 &newlen);
+		if (ret < 0) {
+			SET_ERRNO(-ret);
+		}
+
+		memcpy(addr, &addr6, MIN(*addrlen, newlen));
+	} else {
+		SET_ERRNO(-EINVAL);
+	}
+
+	*addrlen = newlen;
+
+	return 0;
+}
+
+static ssize_t sock_read_vmeth(void *obj, void *buffer, size_t count)
+{
+	return zsock_recvfrom_ctx(obj, buffer, count, 0, NULL, 0);
+}
+
+static ssize_t sock_write_vmeth(void *obj, const void *buffer, size_t count)
+{
+	return zsock_sendto_ctx(obj, buffer, count, 0, NULL, 0);
+}
+
+static void zsock_ctx_set_lock(struct net_context *ctx, struct k_mutex *lock)
+{
+	ctx->cond.lock = lock;
+}
+
+static int sock_ioctl_vmeth(void *obj, unsigned int request, va_list args)
+{
+	switch (request) {
+
+	/* In Zephyr, fcntl() is just an alias of ioctl(). */
+	case F_GETFL:
+		if (sock_is_nonblock(obj)) {
+			return O_NONBLOCK;
+		}
+
+		return 0;
+
+	case F_SETFL: {
+		int flags;
+
+		flags = va_arg(args, int);
+
+		if (flags & O_NONBLOCK) {
+			sock_set_flag(obj, SOCK_NONBLOCK, SOCK_NONBLOCK);
+		} else {
+			sock_set_flag(obj, SOCK_NONBLOCK, 0);
+		}
+
+		return 0;
+	}
+
+	case ZFD_IOCTL_POLL_PREPARE: {
+		struct zsock_pollfd *pfd;
+		struct k_poll_event **pev;
+		struct k_poll_event *pev_end;
+
+		pfd = va_arg(args, struct zsock_pollfd *);
+		pev = va_arg(args, struct k_poll_event **);
+		pev_end = va_arg(args, struct k_poll_event *);
+
+		return zsock_poll_prepare_ctx(obj, pfd, pev, pev_end);
+	}
+
+	case ZFD_IOCTL_POLL_UPDATE: {
+		struct zsock_pollfd *pfd;
+		struct k_poll_event **pev;
+
+		pfd = va_arg(args, struct zsock_pollfd *);
+		pev = va_arg(args, struct k_poll_event **);
+
+		return zsock_poll_update_ctx(obj, pfd, pev);
+	}
+
+	case ZFD_IOCTL_SET_LOCK: {
+		struct k_mutex *lock;
+
+		lock = va_arg(args, struct k_mutex *);
+
+		zsock_ctx_set_lock(obj, lock);
+		return 0;
+	}
+
+	case ZFD_IOCTL_FIONBIO:
+		sock_set_flag(obj, SOCK_NONBLOCK, SOCK_NONBLOCK);
+		return 0;
+
+	case ZFD_IOCTL_FIONREAD: {
+		int *avail = va_arg(args, int *);
+
+		*avail = zsock_fionread_ctx(obj);
+		return 0;
+	}
+
+	default:
+		errno = EOPNOTSUPP;
+		return -1;
+	}
+}
+
+static int sock_shutdown_vmeth(void *obj, int how)
+{
+	return zsock_shutdown_ctx(obj, how);
+}
+
+static int sock_bind_vmeth(void *obj, const struct sockaddr *addr,
+			   socklen_t addrlen)
+{
+	return zsock_bind_ctx(obj, addr, addrlen);
+}
+
+static int sock_connect_vmeth(void *obj, const struct sockaddr *addr,
+			      socklen_t addrlen)
+{
+	return zsock_connect_ctx(obj, addr, addrlen);
+}
+
+static int sock_listen_vmeth(void *obj, int backlog)
+{
+	return zsock_listen_ctx(obj, backlog);
+}
+
+static int sock_accept_vmeth(void *obj, struct sockaddr *addr,
+			     socklen_t *addrlen)
+{
+	return zsock_accept_ctx(obj, addr, addrlen);
+}
+
+static ssize_t sock_sendto_vmeth(void *obj, const void *buf, size_t len,
+				 int flags, const struct sockaddr *dest_addr,
+				 socklen_t addrlen)
+{
+	return zsock_sendto_ctx(obj, buf, len, flags, dest_addr, addrlen);
+}
+
+static ssize_t sock_sendmsg_vmeth(void *obj, const struct msghdr *msg,
+				  int flags)
+{
+	return zsock_sendmsg_ctx(obj, msg, flags);
+}
+
+static ssize_t sock_recvmsg_vmeth(void *obj, struct msghdr *msg, int flags)
+{
+	return zsock_recvmsg_ctx(obj, msg, flags);
+}
+
+static ssize_t sock_recvfrom_vmeth(void *obj, void *buf, size_t max_len,
+				   int flags, struct sockaddr *src_addr,
+				   socklen_t *addrlen)
+{
+	return zsock_recvfrom_ctx(obj, buf, max_len, flags,
+				  src_addr, addrlen);
+}
+
+static int sock_getsockopt_vmeth(void *obj, int level, int optname,
+				 void *optval, socklen_t *optlen)
+{
+	return zsock_getsockopt_ctx(obj, level, optname, optval, optlen);
+}
+
+static int sock_setsockopt_vmeth(void *obj, int level, int optname,
+				 const void *optval, socklen_t optlen)
+{
+	return zsock_setsockopt_ctx(obj, level, optname, optval, optlen);
+}
+
+static int sock_close_vmeth(void *obj)
+{
+	return zsock_close_ctx(obj);
+}
+static int sock_getpeername_vmeth(void *obj, struct sockaddr *addr,
+				  socklen_t *addrlen)
+{
+	return zsock_getpeername_ctx(obj, addr, addrlen);
+}
+
+static int sock_getsockname_vmeth(void *obj, struct sockaddr *addr,
+				  socklen_t *addrlen)
+{
+	return zsock_getsockname_ctx(obj, addr, addrlen);
+}
+
+const struct socket_op_vtable sock_fd_op_vtable = {
+	.fd_vtable = {
+		.read = sock_read_vmeth,
+		.write = sock_write_vmeth,
+		.close = sock_close_vmeth,
+		.ioctl = sock_ioctl_vmeth,
+	},
+	.shutdown = sock_shutdown_vmeth,
+	.bind = sock_bind_vmeth,
+	.connect = sock_connect_vmeth,
+	.listen = sock_listen_vmeth,
+	.accept = sock_accept_vmeth,
+	.sendto = sock_sendto_vmeth,
+	.sendmsg = sock_sendmsg_vmeth,
+	.recvmsg = sock_recvmsg_vmeth,
+	.recvfrom = sock_recvfrom_vmeth,
+	.getsockopt = sock_getsockopt_vmeth,
+	.setsockopt = sock_setsockopt_vmeth,
+	.getpeername = sock_getpeername_vmeth,
+	.getsockname = sock_getsockname_vmeth,
+};
+
+static bool inet_is_supported(int family, int type, int proto)
+{
+	if (family != AF_INET && family != AF_INET6) {
+		return false;
+	}
+
+	return true;
+}
+
+NET_SOCKET_REGISTER(af_inet46, NET_SOCKET_DEFAULT_PRIO, AF_UNSPEC,
+		    inet_is_supported, zsock_socket_internal);

From f6d0a4ab92120da9367b6dba2c4feb704628c968 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Fri, 27 Sep 2024 15:01:31 +0200
Subject: [PATCH 0132/2913] [nrf fromtree] net: Avoid compiling native network
 stack parts w/o NET_NATIVE

In case NET_NATIVE is disabled, certain network stack components do not
need to be compiled. Otherwise, they could throw errors if
--no-gc-sections compiler options is enabled.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 2e1d89619f4d126edcc5f2272728ca941aeead8c)
(cherry picked from commit 135cf0e4ae39dce060129e6d4fd7d714e5faa9ac)
(cherry picked from commit e2a2e14e15bc8cfceba8c846401e12e688178e97)
---
 include/zephyr/net/net_if.h | 36 ++++++++++++++++++++++++++
 subsys/net/ip/net_context.c |  4 +--
 subsys/net/ip/net_core.c    | 50 +++++++++++++++++++++++++------------
 subsys/net/ip/net_if.c      |  4 +++
 subsys/net/ip/utils.c       |  6 ++---
 5 files changed, 79 insertions(+), 21 deletions(-)

diff --git a/include/zephyr/net/net_if.h b/include/zephyr/net/net_if.h
index 4e08aa50ba5..0e0e619a831 100644
--- a/include/zephyr/net/net_if.h
+++ b/include/zephyr/net/net_if.h
@@ -1827,7 +1827,16 @@ bool net_if_ipv6_router_rm(struct net_if_router *router);
  *
  * @return Hop limit
  */
+#if defined(CONFIG_NET_NATIVE_IPV6)
 uint8_t net_if_ipv6_get_hop_limit(struct net_if *iface);
+#else
+static inline uint8_t net_if_ipv6_get_hop_limit(struct net_if *iface)
+{
+	ARG_UNUSED(iface);
+
+	return 0;
+}
+#endif /* CONFIG_NET_NATIVE_IPV6 */
 
 /**
  * @brief Set the default IPv6 hop limit of a given interface.
@@ -1835,7 +1844,16 @@ uint8_t net_if_ipv6_get_hop_limit(struct net_if *iface);
  * @param iface Network interface
  * @param hop_limit New hop limit
  */
+#if defined(CONFIG_NET_NATIVE_IPV6)
 void net_if_ipv6_set_hop_limit(struct net_if *iface, uint8_t hop_limit);
+#else
+static inline void net_if_ipv6_set_hop_limit(struct net_if *iface,
+					     uint8_t hop_limit)
+{
+	ARG_UNUSED(iface);
+	ARG_UNUSED(hop_limit);
+}
+#endif /* CONFIG_NET_NATIVE_IPV6 */
 
 /** @cond INTERNAL_HIDDEN */
 
@@ -1860,7 +1878,16 @@ static inline void net_ipv6_set_hop_limit(struct net_if *iface,
  *
  * @return Hop limit
  */
+#if defined(CONFIG_NET_NATIVE_IPV6)
 uint8_t net_if_ipv6_get_mcast_hop_limit(struct net_if *iface);
+#else
+static inline uint8_t net_if_ipv6_get_mcast_hop_limit(struct net_if *iface)
+{
+	ARG_UNUSED(iface);
+
+	return 0;
+}
+#endif /* CONFIG_NET_NATIVE_IPV6 */
 
 /**
  * @brief Set the default IPv6 multicast hop limit of a given interface.
@@ -1868,7 +1895,16 @@ uint8_t net_if_ipv6_get_mcast_hop_limit(struct net_if *iface);
  * @param iface Network interface
  * @param hop_limit New hop limit
  */
+#if defined(CONFIG_NET_NATIVE_IPV6)
 void net_if_ipv6_set_mcast_hop_limit(struct net_if *iface, uint8_t hop_limit);
+#else
+static inline void net_if_ipv6_set_mcast_hop_limit(struct net_if *iface,
+						   uint8_t hop_limit)
+{
+	ARG_UNUSED(iface);
+	ARG_UNUSED(hop_limit);
+}
+#endif /* CONFIG_NET_NATIVE_IPV6 */
 
 /**
  * @brief Set IPv6 reachable time for a given interface
diff --git a/subsys/net/ip/net_context.c b/subsys/net/ip/net_context.c
index af434e950f1..e6a13874bde 100644
--- a/subsys/net/ip/net_context.c
+++ b/subsys/net/ip/net_context.c
@@ -2456,7 +2456,7 @@ enum net_verdict net_context_packet_received(struct net_conn *conn,
 	return verdict;
 }
 
-#if defined(CONFIG_NET_UDP)
+#if defined(CONFIG_NET_NATIVE_UDP)
 static int recv_udp(struct net_context *context,
 		    net_context_recv_cb_t cb,
 		    k_timeout_t timeout,
@@ -2538,7 +2538,7 @@ static int recv_udp(struct net_context *context,
 }
 #else
 #define recv_udp(...) 0
-#endif /* CONFIG_NET_UDP */
+#endif /* CONFIG_NET_NATIVE_UDP */
 
 static enum net_verdict net_context_raw_packet_received(
 					struct net_conn *conn,
diff --git a/subsys/net/ip/net_core.c b/subsys/net/ip/net_core.c
index 8ab2fb93a3c..5259f9c6e6d 100644
--- a/subsys/net/ip/net_core.c
+++ b/subsys/net/ip/net_core.c
@@ -60,6 +60,7 @@ LOG_MODULE_REGISTER(net_core, CONFIG_NET_CORE_LOG_LEVEL);
 
 #include "net_stats.h"
 
+#if defined(CONFIG_NET_NATIVE)
 static inline enum net_verdict process_data(struct net_pkt *pkt,
 					    bool is_loopback)
 {
@@ -188,22 +189,6 @@ static void net_post_init(void)
 #endif
 }
 
-static void init_rx_queues(void)
-{
-	/* Starting TX side. The ordering is important here and the TX
-	 * can only be started when RX side is ready to receive packets.
-	 */
-	net_if_init();
-
-	net_tc_rx_init();
-
-	/* This will take the interface up and start everything. */
-	net_if_post_init();
-
-	/* Things to init after network interface is working */
-	net_post_init();
-}
-
 static inline void copy_ll_addr(struct net_pkt *pkt)
 {
 	memcpy(net_pkt_lladdr_src(pkt), net_pkt_lladdr_if(pkt),
@@ -571,6 +556,39 @@ static inline void l3_init(void)
 
 	NET_DBG("Network L3 init done");
 }
+#else /* CONFIG_NET_NATIVE */
+#define l3_init(...)
+#define net_post_init(...)
+int net_send_data(struct net_pkt *pkt)
+{
+	ARG_UNUSED(pkt);
+
+	return -ENOTSUP;
+}
+int net_recv_data(struct net_if *iface, struct net_pkt *pkt)
+{
+	ARG_UNUSED(iface);
+	ARG_UNUSED(pkt);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_NET_NATIVE */
+
+static void init_rx_queues(void)
+{
+	/* Starting TX side. The ordering is important here and the TX
+	 * can only be started when RX side is ready to receive packets.
+	 */
+	net_if_init();
+
+	net_tc_rx_init();
+
+	/* This will take the interface up and start everything. */
+	net_if_post_init();
+
+	/* Things to init after network interface is working */
+	net_post_init();
+}
 
 static inline int services_init(void)
 {
diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c
index ea3f4a2dbd8..c03ec771481 100644
--- a/subsys/net/ip/net_if.c
+++ b/subsys/net/ip/net_if.c
@@ -174,6 +174,7 @@ struct net_if *z_vrfy_net_if_get_by_index(int index)
 #include <zephyr/syscalls/net_if_get_by_index_mrsh.c>
 #endif
 
+#if defined(CONFIG_NET_NATIVE)
 static inline void net_context_send_cb(struct net_context *context,
 				       int status)
 {
@@ -382,6 +383,7 @@ void net_if_queue_tx(struct net_if *iface, struct net_pkt *pkt)
 			;
 	}
 }
+#endif /* CONFIG_NET_NATIVE */
 
 void net_if_stats_reset(struct net_if *iface)
 {
@@ -445,6 +447,7 @@ static inline void init_iface(struct net_if *iface)
 	net_ipv6_pe_init(iface);
 }
 
+#if defined(CONFIG_NET_NATIVE)
 enum net_verdict net_if_send_data(struct net_if *iface, struct net_pkt *pkt)
 {
 	const struct net_l2 *l2;
@@ -551,6 +554,7 @@ enum net_verdict net_if_send_data(struct net_if *iface, struct net_pkt *pkt)
 
 	return verdict;
 }
+#endif /* CONFIG_NET_NATIVE */
 
 int net_if_set_link_addr_locked(struct net_if *iface,
 				uint8_t *addr, uint8_t len,
diff --git a/subsys/net/ip/utils.c b/subsys/net/ip/utils.c
index e8b6b99b073..f130a184bcb 100644
--- a/subsys/net/ip/utils.c
+++ b/subsys/net/ip/utils.c
@@ -634,7 +634,7 @@ static inline uint16_t pkt_calc_chksum(struct net_pkt *pkt, uint16_t sum)
 	return sum;
 }
 
-#if defined(CONFIG_NET_IP)
+#if defined(CONFIG_NET_NATIVE_IP)
 uint16_t net_calc_chksum(struct net_pkt *pkt, uint8_t proto)
 {
 	size_t len = 0U;
@@ -684,7 +684,7 @@ uint16_t net_calc_chksum(struct net_pkt *pkt, uint8_t proto)
 }
 #endif
 
-#if defined(CONFIG_NET_IPV4)
+#if defined(CONFIG_NET_NATIVE_IPV4)
 uint16_t net_calc_chksum_ipv4(struct net_pkt *pkt)
 {
 	uint16_t sum;
@@ -697,7 +697,7 @@ uint16_t net_calc_chksum_ipv4(struct net_pkt *pkt)
 
 	return ~sum;
 }
-#endif /* CONFIG_NET_IPV4 */
+#endif /* CONFIG_NET_NATIVE_IPV4 */
 
 #if defined(CONFIG_NET_IPV4_IGMP)
 uint16_t net_calc_chksum_igmp(struct net_pkt *pkt)

From c15765ae714881bbcbc77aac719eb95574a61f69 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Mon, 30 Sep 2024 11:54:12 +0200
Subject: [PATCH 0133/2913] [nrf fromtree] net: offload: Do not need to enable
 TC threads for NET_OFFLOAD

Net offloading doesn't need net TC threads to be enabled as they're used
by the native stack. This fixes build if CONFIG_NET_OFFLOAD is enabled
but native stack is disabled.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit bdbf7cc6209f1b8a4c9c4371b58dffd91f7a7f92)
(cherry picked from commit 1fb7fff28e6bd45f206c5b5285152fc488fa9e3d)
(cherry picked from commit ca68a0282fdfb94a5288e286f09bf0820f8ead61)
---
 subsys/net/ip/CMakeLists.txt | 2 +-
 subsys/net/ip/net_private.h  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/subsys/net/ip/CMakeLists.txt b/subsys/net/ip/CMakeLists.txt
index 11509d804d7..0189d748f6a 100644
--- a/subsys/net/ip/CMakeLists.txt
+++ b/subsys/net/ip/CMakeLists.txt
@@ -19,7 +19,7 @@ zephyr_library_sources(
   )
 
 if(CONFIG_NET_OFFLOAD)
-zephyr_library_sources(net_context.c net_pkt.c net_tc.c)
+zephyr_library_sources(net_context.c net_pkt.c)
 endif()
 
 zephyr_library_sources_ifdef(CONFIG_NET_MGMT_EVENT   net_mgmt.c)
diff --git a/subsys/net/ip/net_private.h b/subsys/net/ip/net_private.h
index 0bbcbb23164..04c3205f5ae 100644
--- a/subsys/net/ip/net_private.h
+++ b/subsys/net/ip/net_private.h
@@ -86,16 +86,12 @@ extern bool net_context_is_v6only_set(struct net_context *context);
 extern bool net_context_is_recv_pktinfo_set(struct net_context *context);
 extern bool net_context_is_timestamping_set(struct net_context *context);
 extern void net_pkt_init(void);
-extern void net_tc_tx_init(void);
-extern void net_tc_rx_init(void);
 int net_context_get_local_addr(struct net_context *context,
 			       struct sockaddr *addr,
 			       socklen_t *addrlen);
 #else
 static inline void net_context_init(void) { }
 static inline void net_pkt_init(void) { }
-static inline void net_tc_tx_init(void) { }
-static inline void net_tc_rx_init(void) { }
 static inline const char *net_context_state(struct net_context *context)
 {
 	ARG_UNUSED(context);
@@ -149,6 +145,8 @@ static inline void mdns_init_responder(void) { }
 #if defined(CONFIG_NET_NATIVE)
 enum net_verdict net_ipv4_input(struct net_pkt *pkt, bool is_loopback);
 enum net_verdict net_ipv6_input(struct net_pkt *pkt, bool is_loopback);
+extern void net_tc_tx_init(void);
+extern void net_tc_rx_init(void);
 #else
 static inline enum net_verdict net_ipv4_input(struct net_pkt *pkt,
 					      bool is_loopback)
@@ -167,6 +165,9 @@ static inline enum net_verdict net_ipv6_input(struct net_pkt *pkt,
 
 	return NET_CONTINUE;
 }
+
+static inline void net_tc_tx_init(void) { }
+static inline void net_tc_rx_init(void) { }
 #endif
 extern bool net_tc_submit_to_tx_queue(uint8_t tc, struct net_pkt *pkt);
 extern void net_tc_submit_to_rx_queue(uint8_t tc, struct net_pkt *pkt);

From e36666a23c2b488ff8169455f4cdf45326db79e6 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Mon, 30 Sep 2024 16:23:37 +0200
Subject: [PATCH 0134/2913] [nrf fromtree] net: sockets: Remove SET_ERRNO()
 macro

Macros with flow control are discouraged and generate compliance error,
hence remove it and replace the corresponding code with simple errno
assignments.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 0c1550dd9fcfd8d17f128885db892b51cef06018)
(cherry picked from commit 44e2e923311006e60913fa70d08ba1d2efad4d2f)
(cherry picked from commit be6f8338f65a113b9dc9ab363f03ee6c0de04c69)
---
 subsys/net/lib/sockets/sockets_inet.c | 184 ++++++++++++++++++--------
 1 file changed, 130 insertions(+), 54 deletions(-)

diff --git a/subsys/net/lib/sockets/sockets_inet.c b/subsys/net/lib/sockets/sockets_inet.c
index 9403cdd152a..4a51fd3f0dc 100644
--- a/subsys/net/lib/sockets/sockets_inet.c
+++ b/subsys/net/lib/sockets/sockets_inet.c
@@ -34,9 +34,6 @@ LOG_MODULE_DECLARE(net_sock, CONFIG_NET_SOCKETS_LOG_LEVEL);
 #include "../../ip/tcp_internal.h"
 #include "../../ip/net_private.h"
 
-#define SET_ERRNO(x) \
-	{ int _err = x; if (_err < 0) { errno = -_err; return -1; } }
-
 const struct socket_op_vtable sock_fd_op_vtable;
 
 static void zsock_received_cb(struct net_context *ctx,
@@ -141,6 +138,8 @@ static int zsock_socket_internal(int family, int type, int proto)
 
 int zsock_close_ctx(struct net_context *ctx)
 {
+	int ret;
+
 	/* Reset callbacks to avoid any race conditions while
 	 * flushing queues. No need to check return values here,
 	 * as these are fail-free operations and we're closing
@@ -157,7 +156,11 @@ int zsock_close_ctx(struct net_context *ctx)
 
 	zsock_flush_queue(ctx);
 
-	SET_ERRNO(net_context_put(ctx));
+	ret = net_context_put(ctx);
+	if (ret < 0) {
+		errno = -ret;
+		return -1;
+	}
 
 	return 0;
 }
@@ -250,36 +253,61 @@ static void zsock_received_cb(struct net_context *ctx,
 
 int zsock_shutdown_ctx(struct net_context *ctx, int how)
 {
+	int ret;
+
 	if (how == ZSOCK_SHUT_RD) {
 		if (net_context_get_state(ctx) == NET_CONTEXT_LISTENING) {
-			SET_ERRNO(net_context_accept(ctx, NULL, K_NO_WAIT, NULL));
+			ret = net_context_accept(ctx, NULL, K_NO_WAIT, NULL);
+			if (ret < 0) {
+				errno = -ret;
+				return -1;
+			}
 		} else {
-			SET_ERRNO(net_context_recv(ctx, NULL, K_NO_WAIT, NULL));
+			ret = net_context_recv(ctx, NULL, K_NO_WAIT, NULL);
+			if (ret < 0) {
+				errno = -ret;
+				return -1;
+			}
 		}
 
 		sock_set_eof(ctx);
 
 		zsock_flush_queue(ctx);
-	} else if (how == ZSOCK_SHUT_WR || how == ZSOCK_SHUT_RDWR) {
-		SET_ERRNO(-ENOTSUP);
-	} else {
-		SET_ERRNO(-EINVAL);
+
+		return 0;
 	}
 
-	return 0;
+	if (how == ZSOCK_SHUT_WR || how == ZSOCK_SHUT_RDWR) {
+		errno = ENOTSUP;
+		return -1;
+	}
+
+	errno = EINVAL;
+	return -1;
 }
 
 int zsock_bind_ctx(struct net_context *ctx, const struct sockaddr *addr,
 		   socklen_t addrlen)
 {
-	SET_ERRNO(net_context_bind(ctx, addr, addrlen));
+	int ret;
+
+	ret = net_context_bind(ctx, addr, addrlen);
+	if (ret < 0) {
+		errno = -ret;
+		return -1;
+	}
+
 	/* For DGRAM socket, we expect to receive packets after call to
 	 * bind(), but for STREAM socket, next expected operation is
 	 * listen(), which doesn't work if recv callback is set.
 	 */
 	if (net_context_get_type(ctx) == SOCK_DGRAM) {
-		SET_ERRNO(net_context_recv(ctx, zsock_received_cb, K_NO_WAIT,
-					   ctx->user_data));
+		ret = net_context_recv(ctx, zsock_received_cb, K_NO_WAIT,
+				       ctx->user_data);
+		if (ret < 0) {
+			errno = -ret;
+			return -1;
+		}
 	}
 
 	return 0;
@@ -296,47 +324,75 @@ static void zsock_connected_cb(struct net_context *ctx, int status, void *user_d
 int zsock_connect_ctx(struct net_context *ctx, const struct sockaddr *addr,
 		      socklen_t addrlen)
 {
+	k_timeout_t timeout = K_MSEC(CONFIG_NET_SOCKETS_CONNECT_TIMEOUT);
+	net_context_connect_cb_t cb = NULL;
+	int ret;
 
 #if defined(CONFIG_SOCKS)
 	if (net_context_is_proxy_enabled(ctx)) {
-		SET_ERRNO(net_socks5_connect(ctx, addr, addrlen));
-		SET_ERRNO(net_context_recv(ctx, zsock_received_cb,
-					   K_NO_WAIT, ctx->user_data));
+		ret = net_socks5_connect(ctx, addr, addrlen);
+		if (ret < 0) {
+			errno = -ret;
+			return -1;
+		}
+		ret = net_context_recv(ctx, zsock_received_cb,
+				       K_NO_WAIT, ctx->user_data);
+		if (ret < 0) {
+			errno = -ret;
+			return -1;
+		}
 		return 0;
 	}
 #endif
 	if (net_context_get_state(ctx) == NET_CONTEXT_CONNECTED) {
 		return 0;
-	} else if (net_context_get_state(ctx) == NET_CONTEXT_CONNECTING) {
+	}
+
+	if (net_context_get_state(ctx) == NET_CONTEXT_CONNECTING) {
 		if (sock_is_error(ctx)) {
-			SET_ERRNO(-POINTER_TO_INT(ctx->user_data));
-		} else {
-			SET_ERRNO(-EALREADY);
+			errno = POINTER_TO_INT(ctx->user_data);
+			return -1;
 		}
-	} else {
-		k_timeout_t timeout = K_MSEC(CONFIG_NET_SOCKETS_CONNECT_TIMEOUT);
-		net_context_connect_cb_t cb = NULL;
 
-		if (sock_is_nonblock(ctx)) {
-			timeout = K_NO_WAIT;
-			cb = zsock_connected_cb;
-		}
+		errno = EALREADY;
+		return -1;
+	}
 
-		if (net_context_get_type(ctx) == SOCK_STREAM) {
-			/* For STREAM sockets net_context_recv() only installs
-			 * recv callback w/o side effects, and it has to be done
-			 * first to avoid race condition, when TCP stream data
-			 * arrives right after connect.
-			 */
-			SET_ERRNO(net_context_recv(ctx, zsock_received_cb,
-						   K_NO_WAIT, ctx->user_data));
-			SET_ERRNO(net_context_connect(ctx, addr, addrlen, cb,
-						      timeout, ctx->user_data));
-		} else {
-			SET_ERRNO(net_context_connect(ctx, addr, addrlen, cb,
-						      timeout, ctx->user_data));
-			SET_ERRNO(net_context_recv(ctx, zsock_received_cb,
-						   K_NO_WAIT, ctx->user_data));
+	if (sock_is_nonblock(ctx)) {
+		timeout = K_NO_WAIT;
+		cb = zsock_connected_cb;
+	}
+
+	if (net_context_get_type(ctx) == SOCK_STREAM) {
+		/* For STREAM sockets net_context_recv() only installs
+		 * recv callback w/o side effects, and it has to be done
+		 * first to avoid race condition, when TCP stream data
+		 * arrives right after connect.
+		 */
+		ret = net_context_recv(ctx, zsock_received_cb,
+					K_NO_WAIT, ctx->user_data);
+		if (ret < 0) {
+			errno = -ret;
+			return -1;
+		}
+		ret = net_context_connect(ctx, addr, addrlen, cb,
+						timeout, ctx->user_data);
+		if (ret < 0) {
+			errno = -ret;
+			return -1;
+		}
+	} else {
+		ret = net_context_connect(ctx, addr, addrlen, cb,
+						timeout, ctx->user_data);
+		if (ret < 0) {
+			errno = -ret;
+			return -1;
+		}
+		ret = net_context_recv(ctx, zsock_received_cb,
+					K_NO_WAIT, ctx->user_data);
+		if (ret < 0) {
+			errno = -ret;
+			return -1;
 		}
 	}
 
@@ -345,8 +401,19 @@ int zsock_connect_ctx(struct net_context *ctx, const struct sockaddr *addr,
 
 int zsock_listen_ctx(struct net_context *ctx, int backlog)
 {
-	SET_ERRNO(net_context_listen(ctx, backlog));
-	SET_ERRNO(net_context_accept(ctx, zsock_accepted_cb, K_NO_WAIT, ctx));
+	int ret;
+
+	ret = net_context_listen(ctx, backlog);
+	if (ret < 0) {
+		errno = -ret;
+		return -1;
+	}
+
+	ret = net_context_accept(ctx, zsock_accepted_cb, K_NO_WAIT, ctx);
+	if (ret < 0) {
+		errno = -ret;
+		return -1;
+	}
 
 	return 0;
 }
@@ -2460,16 +2527,19 @@ int zsock_getpeername_ctx(struct net_context *ctx, struct sockaddr *addr,
 	socklen_t newlen = 0;
 
 	if (addr == NULL || addrlen == NULL) {
-		SET_ERRNO(-EINVAL);
+		errno = EINVAL;
+		return -1;
 	}
 
 	if (!(ctx->flags & NET_CONTEXT_REMOTE_ADDR_SET)) {
-		SET_ERRNO(-ENOTCONN);
+		errno = ENOTCONN;
+		return -1;
 	}
 
 	if (net_context_get_type(ctx) == SOCK_STREAM &&
 	    net_context_get_state(ctx) != NET_CONTEXT_CONNECTED) {
-		SET_ERRNO(-ENOTCONN);
+		errno = ENOTCONN;
+		return -1;
 	}
 
 	if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->remote.sa_family == AF_INET) {
@@ -2494,7 +2564,8 @@ int zsock_getpeername_ctx(struct net_context *ctx, struct sockaddr *addr,
 
 		memcpy(addr, &addr6, MIN(*addrlen, newlen));
 	} else {
-		SET_ERRNO(-EINVAL);
+		errno = EINVAL;
+		return -1;
 	}
 
 	*addrlen = newlen;
@@ -2512,7 +2583,8 @@ int zsock_getsockname_ctx(struct net_context *ctx, struct sockaddr *addr,
 		struct sockaddr_in addr4 = { 0 };
 
 		if (net_sin_ptr(&ctx->local)->sin_addr == NULL) {
-			SET_ERRNO(-EINVAL);
+			errno = EINVAL;
+			return -1;
 		}
 
 		newlen = sizeof(struct sockaddr_in);
@@ -2521,7 +2593,8 @@ int zsock_getsockname_ctx(struct net_context *ctx, struct sockaddr *addr,
 						 (struct sockaddr *)&addr4,
 						 &newlen);
 		if (ret < 0) {
-			SET_ERRNO(-ret);
+			errno = -ret;
+			return -1;
 		}
 
 		memcpy(addr, &addr4, MIN(*addrlen, newlen));
@@ -2530,7 +2603,8 @@ int zsock_getsockname_ctx(struct net_context *ctx, struct sockaddr *addr,
 		struct sockaddr_in6 addr6 = { 0 };
 
 		if (net_sin6_ptr(&ctx->local)->sin6_addr == NULL) {
-			SET_ERRNO(-EINVAL);
+			errno = EINVAL;
+			return -1;
 		}
 
 		newlen = sizeof(struct sockaddr_in6);
@@ -2539,12 +2613,14 @@ int zsock_getsockname_ctx(struct net_context *ctx, struct sockaddr *addr,
 						 (struct sockaddr *)&addr6,
 						 &newlen);
 		if (ret < 0) {
-			SET_ERRNO(-ret);
+			errno = -ret;
+			return -1;
 		}
 
 		memcpy(addr, &addr6, MIN(*addrlen, newlen));
 	} else {
-		SET_ERRNO(-EINVAL);
+		errno = EINVAL;
+		return -1;
 	}
 
 	*addrlen = newlen;

From 0c4568949e0b42465a393106d95b83ec2436b112 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Tue, 1 Oct 2024 15:28:59 +0200
Subject: [PATCH 0135/2913] [nrf fromtree] net: ipv6: Make Multicast Listener
 Discovery API public

IPv6 MLD API was so far defined in an internal header. This does not
seem correct though, as application code should be able to join/leave
multicast groups, hence the API should be exposed in a public header,
just as it is done for its IPv4 countepart - IGMP.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit c6498bb68d93178e65c4694f41087f3b9bb1d50b)
(cherry picked from commit 3481d866958a196d88c1add94ec8b1c22554c734)
(cherry picked from commit 7d99dadc9feadfd5b53b2a035e998463533f07b6)
---
 include/zephyr/net/mld.h                   | 84 ++++++++++++++++++++++
 samples/net/sockets/coap_server/src/main.c |  1 +
 subsys/net/ip/ipv6.h                       | 42 -----------
 subsys/net/ip/ipv6_mld.c                   |  1 +
 subsys/net/ip/net_if.c                     |  1 +
 subsys/net/lib/dns/llmnr_responder.c       |  1 +
 subsys/net/lib/dns/mdns_responder.c        |  1 +
 subsys/net/lib/shell/ipv6.c                |  2 +
 subsys/net/lib/sockets/sockets_inet.c      |  1 +
 subsys/net/lib/zperf/zperf_udp_receiver.c  |  1 +
 tests/net/ipv6/src/main.c                  |  1 +
 tests/net/mld/src/main.c                   |  1 +
 12 files changed, 95 insertions(+), 42 deletions(-)
 create mode 100644 include/zephyr/net/mld.h

diff --git a/include/zephyr/net/mld.h b/include/zephyr/net/mld.h
new file mode 100644
index 00000000000..031eb03c931
--- /dev/null
+++ b/include/zephyr/net/mld.h
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2016 Intel Corporation
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/** @file
+ * @brief Multicast Listener Discovery API
+ */
+
+#ifndef ZEPHYR_INCLUDE_NET_MLD_H_
+#define ZEPHYR_INCLUDE_NET_MLD_H_
+
+/**
+ * @brief MLD (Multicast Listener Discovery)
+ * @defgroup mld Multicast Listener Discovery API
+ * @since 1.8
+ * @version 0.8.0
+ * @ingroup networking
+ * @{
+ */
+
+#include <errno.h>
+
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/toolchain.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Join a given multicast group.
+ *
+ * @param iface Network interface where join message is sent
+ * @param addr Multicast group to join
+ *
+ * @return 0 if joining was done, <0 otherwise.
+ */
+#if defined(CONFIG_NET_IPV6_MLD)
+int net_ipv6_mld_join(struct net_if *iface, const struct in6_addr *addr);
+#else
+static inline int
+net_ipv6_mld_join(struct net_if *iface, const struct in6_addr *addr)
+{
+	ARG_UNUSED(addr);
+	ARG_UNUSED(iface);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_NET_IPV6_MLD */
+
+/**
+ * @brief Leave a given multicast group.
+ *
+ * @param iface Network interface where leave message is sent
+ * @param addr Multicast group to leave
+ *
+ * @return 0 if leaving is done, <0 otherwise.
+ */
+#if defined(CONFIG_NET_IPV6_MLD)
+int net_ipv6_mld_leave(struct net_if *iface, const struct in6_addr *addr);
+#else
+static inline int
+net_ipv6_mld_leave(struct net_if *iface, const struct in6_addr *addr)
+{
+	ARG_UNUSED(iface);
+	ARG_UNUSED(addr);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_NET_IPV6_MLD */
+
+#ifdef __cplusplus
+}
+#endif
+
+/**
+ * @}
+ */
+
+#endif /* ZEPHYR_INCLUDE_NET_MLD_H_ */
diff --git a/samples/net/sockets/coap_server/src/main.c b/samples/net/sockets/coap_server/src/main.c
index 4f476511b2c..60dd32a000b 100644
--- a/samples/net/sockets/coap_server/src/main.c
+++ b/samples/net/sockets/coap_server/src/main.c
@@ -8,6 +8,7 @@
 LOG_MODULE_REGISTER(net_coap_service_sample, LOG_LEVEL_DBG);
 
 #include <zephyr/net/coap_service.h>
+#include <zephyr/net/mld.h>
 
 #ifdef CONFIG_NET_IPV6
 #include "net_private.h"
diff --git a/subsys/net/ip/ipv6.h b/subsys/net/ip/ipv6.h
index 2dbd1189a6a..68115f818c2 100644
--- a/subsys/net/ip/ipv6.h
+++ b/subsys/net/ip/ipv6.h
@@ -198,48 +198,6 @@ static inline int net_ipv6_finalize(struct net_pkt *pkt,
 }
 #endif
 
-/**
- * @brief Join a given multicast group.
- *
- * @param iface Network interface where join message is sent
- * @param addr Multicast group to join
- *
- * @return Return 0 if joining was done, <0 otherwise.
- */
-#if defined(CONFIG_NET_IPV6_MLD)
-int net_ipv6_mld_join(struct net_if *iface, const struct in6_addr *addr);
-#else
-static inline int
-net_ipv6_mld_join(struct net_if *iface, const struct in6_addr *addr)
-{
-	ARG_UNUSED(iface);
-	ARG_UNUSED(addr);
-
-	return -ENOTSUP;
-}
-#endif /* CONFIG_NET_IPV6_MLD */
-
-/**
- * @brief Leave a given multicast group.
- *
- * @param iface Network interface where leave message is sent
- * @param addr Multicast group to leave
- *
- * @return Return 0 if leaving is done, <0 otherwise.
- */
-#if defined(CONFIG_NET_IPV6_MLD)
-int net_ipv6_mld_leave(struct net_if *iface, const struct in6_addr *addr);
-#else
-static inline int
-net_ipv6_mld_leave(struct net_if *iface, const struct in6_addr *addr)
-{
-	ARG_UNUSED(iface);
-	ARG_UNUSED(addr);
-
-	return -ENOTSUP;
-}
-#endif /* CONFIG_NET_IPV6_MLD */
-
 /**
  * @brief Send MLDv2 report message with a single entry.
  *
diff --git a/subsys/net/ip/ipv6_mld.c b/subsys/net/ip/ipv6_mld.c
index 75644c2ca58..66166fd1d3b 100644
--- a/subsys/net/ip/ipv6_mld.c
+++ b/subsys/net/ip/ipv6_mld.c
@@ -12,6 +12,7 @@
 LOG_MODULE_DECLARE(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL);
 
 #include <errno.h>
+#include <zephyr/net/mld.h>
 #include <zephyr/net/net_core.h>
 #include <zephyr/net/net_pkt.h>
 #include <zephyr/net/net_stats.h>
diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c
index c03ec771481..0652b8c75d3 100644
--- a/subsys/net/ip/net_if.c
+++ b/subsys/net/ip/net_if.c
@@ -17,6 +17,7 @@ LOG_MODULE_REGISTER(net_if, CONFIG_NET_IF_LOG_LEVEL);
 #include <string.h>
 #include <zephyr/net/igmp.h>
 #include <zephyr/net/ipv4_autoconf.h>
+#include <zephyr/net/mld.h>
 #include <zephyr/net/net_core.h>
 #include <zephyr/net/net_event.h>
 #include <zephyr/net/net_pkt.h>
diff --git a/subsys/net/lib/dns/llmnr_responder.c b/subsys/net/lib/dns/llmnr_responder.c
index 21832efdf67..133fce7ba60 100644
--- a/subsys/net/lib/dns/llmnr_responder.c
+++ b/subsys/net/lib/dns/llmnr_responder.c
@@ -21,6 +21,7 @@ LOG_MODULE_REGISTER(net_llmnr_responder, CONFIG_LLMNR_RESPONDER_LOG_LEVEL);
 #include <errno.h>
 #include <stdlib.h>
 
+#include <zephyr/net/mld.h>
 #include <zephyr/net/net_ip.h>
 #include <zephyr/net/net_pkt.h>
 #include <zephyr/net/dns_resolve.h>
diff --git a/subsys/net/lib/dns/mdns_responder.c b/subsys/net/lib/dns/mdns_responder.c
index 43b07d694c5..93b62016090 100644
--- a/subsys/net/lib/dns/mdns_responder.c
+++ b/subsys/net/lib/dns/mdns_responder.c
@@ -22,6 +22,7 @@ LOG_MODULE_REGISTER(net_mdns_responder, CONFIG_MDNS_RESPONDER_LOG_LEVEL);
 #include <errno.h>
 #include <stdlib.h>
 
+#include <zephyr/net/mld.h>
 #include <zephyr/net/net_core.h>
 #include <zephyr/net/net_ip.h>
 #include <zephyr/net/net_pkt.h>
diff --git a/subsys/net/lib/shell/ipv6.c b/subsys/net/lib/shell/ipv6.c
index d13b6803e65..eb65185c03c 100644
--- a/subsys/net/lib/shell/ipv6.c
+++ b/subsys/net/lib/shell/ipv6.c
@@ -8,6 +8,8 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_shell);
 
+#include <zephyr/net/mld.h>
+
 #include "net_shell_private.h"
 #include "../ip/ipv6.h"
 
diff --git a/subsys/net/lib/sockets/sockets_inet.c b/subsys/net/lib/sockets/sockets_inet.c
index 4a51fd3f0dc..10de541fc8f 100644
--- a/subsys/net/lib/sockets/sockets_inet.c
+++ b/subsys/net/lib/sockets/sockets_inet.c
@@ -11,6 +11,7 @@
 LOG_MODULE_DECLARE(net_sock, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <zephyr/kernel.h>
+#include <zephyr/net/mld.h>
 #include <zephyr/net/net_context.h>
 #include <zephyr/net/net_pkt.h>
 #include <zephyr/tracing/tracing.h>
diff --git a/subsys/net/lib/zperf/zperf_udp_receiver.c b/subsys/net/lib/zperf/zperf_udp_receiver.c
index 0f7e1e4f077..2f0d292f7ad 100644
--- a/subsys/net/lib/zperf/zperf_udp_receiver.c
+++ b/subsys/net/lib/zperf/zperf_udp_receiver.c
@@ -12,6 +12,7 @@ LOG_MODULE_DECLARE(net_zperf, CONFIG_NET_ZPERF_LOG_LEVEL);
 
 #include <zephyr/kernel.h>
 
+#include <zephyr/net/mld.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/socket_service.h>
 #include <zephyr/net/zperf.h>
diff --git a/tests/net/ipv6/src/main.c b/tests/net/ipv6/src/main.c
index 02df9ac650c..1dd40afcde8 100644
--- a/tests/net/ipv6/src/main.c
+++ b/tests/net/ipv6/src/main.c
@@ -19,6 +19,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 
 #include <zephyr/ztest.h>
 
+#include <zephyr/net/mld.h>
 #include <zephyr/net/net_core.h>
 #include <zephyr/net/net_pkt.h>
 #include <zephyr/net/net_ip.h>
diff --git a/tests/net/mld/src/main.c b/tests/net/mld/src/main.c
index e1bcce056cf..1c95fe5409d 100644
--- a/tests/net/mld/src/main.c
+++ b/tests/net/mld/src/main.c
@@ -18,6 +18,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 
 #include <zephyr/ztest.h>
 
+#include <zephyr/net/mld.h>
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/net_pkt.h>
 #include <zephyr/net/net_ip.h>

From 9a63323f0d009a23dd1ae2f5d95e0fc608a43d51 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Mon, 7 Oct 2024 14:33:34 +0200
Subject: [PATCH 0136/2913] [nrf fromtree] net: if: Don't require native IP
 stack support for IPv6 lookups

IPv6 based interface lookups doesn't require native IP stack support,
hence reflect that in the API.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit f4335d22ca619a6d298cddaf0ba9d58397ecd9b0)
(cherry picked from commit e3f4f4f88277673eec367f1d665651b064d2a360)
(cherry picked from commit a9f6da409c54f9af590716ef5b88355b54f67b7a)
---
 include/zephyr/net/net_if.h | 6 +++---
 subsys/net/ip/net_if.c      | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/zephyr/net/net_if.h b/include/zephyr/net/net_if.h
index 0e0e619a831..7795f565976 100644
--- a/include/zephyr/net/net_if.h
+++ b/include/zephyr/net/net_if.h
@@ -2038,7 +2038,7 @@ static inline uint32_t net_if_ipv6_get_retrans_timer(struct net_if *iface)
  * @return Pointer to IPv6 address to use, NULL if no IPv6 address
  * could be found.
  */
-#if defined(CONFIG_NET_NATIVE_IPV6)
+#if defined(CONFIG_NET_IPV6)
 const struct in6_addr *net_if_ipv6_select_src_addr(struct net_if *iface,
 						   const struct in6_addr *dst);
 #else
@@ -2065,7 +2065,7 @@ static inline const struct in6_addr *net_if_ipv6_select_src_addr(
  * @return Pointer to IPv6 address to use, NULL if no IPv6 address
  * could be found.
  */
-#if defined(CONFIG_NET_NATIVE_IPV6)
+#if defined(CONFIG_NET_IPV6)
 const struct in6_addr *net_if_ipv6_select_src_addr_hint(struct net_if *iface,
 							const struct in6_addr *dst,
 							int flags);
@@ -2090,7 +2090,7 @@ static inline const struct in6_addr *net_if_ipv6_select_src_addr_hint(
  * @return Pointer to network interface to use, NULL if no suitable interface
  * could be found.
  */
-#if defined(CONFIG_NET_NATIVE_IPV6)
+#if defined(CONFIG_NET_IPV6)
 struct net_if *net_if_ipv6_select_src_iface(const struct in6_addr *dst);
 #else
 static inline struct net_if *net_if_ipv6_select_src_iface(
diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c
index 0652b8c75d3..8bceee7a29d 100644
--- a/subsys/net/ip/net_if.c
+++ b/subsys/net/ip/net_if.c
@@ -2983,6 +2983,8 @@ void net_if_ipv6_set_hop_limit(struct net_if *iface, uint8_t hop_limit)
 	net_if_unlock(iface);
 }
 
+#endif /* CONFIG_NET_NATIVE_IPV6 */
+
 static uint8_t get_diff_ipv6(const struct in6_addr *src,
 			  const struct in6_addr *dst)
 {
@@ -3208,6 +3210,8 @@ struct net_if *net_if_ipv6_select_src_iface(const struct in6_addr *dst)
 	return iface;
 }
 
+#if defined(CONFIG_NET_NATIVE_IPV6)
+
 uint32_t net_if_ipv6_calc_reachable_time(struct net_if_ipv6 *ipv6)
 {
 	uint32_t min_reachable, max_reachable;

From 7bfcd5bcb4798f2bd1b47aafaa48c6ccb81eb1fb Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Mon, 7 Oct 2024 16:45:40 +0200
Subject: [PATCH 0137/2913] [nrf fromtree] net: sockets: Move
 msghdr_non_empty_iov_count() to common file

msghdr_non_empty_iov_count() is used by TLS sockets too therefore should
be available regardless of native IP sockets being enabled or not.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 66ff30efb4d786ac15a4ef03a81bbe7a3f315690)
(cherry picked from commit 20e2052e5343f4848b46814165bd0d09aa163e05)
(cherry picked from commit 36a61ef2966d7b15e1c6329397cc68490aa51c02)
---
 subsys/net/lib/sockets/sockets.c      | 13 +++++++++++++
 subsys/net/lib/sockets/sockets_inet.c | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/subsys/net/lib/sockets/sockets.c b/subsys/net/lib/sockets/sockets.c
index 8b420cc9e68..be7ba5ad967 100644
--- a/subsys/net/lib/sockets/sockets.c
+++ b/subsys/net/lib/sockets/sockets.c
@@ -74,6 +74,19 @@ static inline void *get_sock_vtable(int sock,
 	return ctx;
 }
 
+size_t msghdr_non_empty_iov_count(const struct msghdr *msg)
+{
+	size_t non_empty_iov_count = 0;
+
+	for (size_t i = 0; i < msg->msg_iovlen; i++) {
+		if (msg->msg_iov[i].iov_len) {
+			non_empty_iov_count++;
+		}
+	}
+
+	return non_empty_iov_count;
+}
+
 void *z_impl_zsock_get_context_object(int sock)
 {
 	const struct socket_op_vtable *ignored;
diff --git a/subsys/net/lib/sockets/sockets_inet.c b/subsys/net/lib/sockets/sockets_inet.c
index 10de541fc8f..88e4e47bfe4 100644
--- a/subsys/net/lib/sockets/sockets_inet.c
+++ b/subsys/net/lib/sockets/sockets_inet.c
@@ -640,19 +640,6 @@ ssize_t zsock_sendto_ctx(struct net_context *ctx, const void *buf, size_t len,
 	return status;
 }
 
-size_t msghdr_non_empty_iov_count(const struct msghdr *msg)
-{
-	size_t non_empty_iov_count = 0;
-
-	for (size_t i = 0; i < msg->msg_iovlen; i++) {
-		if (msg->msg_iov[i].iov_len) {
-			non_empty_iov_count++;
-		}
-	}
-
-	return non_empty_iov_count;
-}
-
 ssize_t zsock_sendmsg_ctx(struct net_context *ctx, const struct msghdr *msg,
 			  int flags)
 {

From 7745607684110ad7dc60526f1844b6c6bee5359e Mon Sep 17 00:00:00 2001
From: Joakim Andersson <joerchan@gmail.com>
Date: Fri, 4 Oct 2024 11:57:18 +0200
Subject: [PATCH 0138/2913] [nrf fromtree] drivers: nrf_qspi_nor: Fix build
 without multithreading

Fix build of nrf_qspi_nor flash driver without multithreading enabled.
This is required for builds like mcuboot.

Signed-off-by: Joakim Andersson <joerchan@gmail.com>
(cherry picked from commit 14c896b647f782982afcb438ae3392eca4daab36)
(cherry picked from commit c3866430bd7c23cbda2229909f9337655c65ce0c)
(cherry picked from commit 80fafec8ce0741c705f38c7f1bbce3050b97b8fd)
---
 drivers/flash/nrf_qspi_nor.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/flash/nrf_qspi_nor.c b/drivers/flash/nrf_qspi_nor.c
index 0c4faf99dff..44fcc6b7629 100644
--- a/drivers/flash/nrf_qspi_nor.c
+++ b/drivers/flash/nrf_qspi_nor.c
@@ -487,7 +487,9 @@ static int qspi_wait_while_writing(const struct device *dev, k_timeout_t poll_pe
 	int rc;
 
 	do {
+#ifdef CONFIG_MULTITHREADING
 		k_sleep(poll_period);
+#endif
 		rc = qspi_rdsr(dev, 1);
 	} while ((rc >= 0)
 		 && ((rc & SPI_NOR_WIP_BIT) != 0U));

From edc4776c91baf7a6fa93b8a18be81a61127635a7 Mon Sep 17 00:00:00 2001
From: Joakim Andersson <joerchan@gmail.com>
Date: Fri, 4 Oct 2024 11:57:18 +0200
Subject: [PATCH 0139/2913] [nrf fromtree] drivers: nrf_qspi_nor: Check poll
 period before sleep

Check that the poll period is non-zero before sleeping.

Signed-off-by: Joakim Andersson <joerchan@gmail.com>
(cherry picked from commit d794d58d64ce3fc3b3c1be0f9c0129d5150ab401)
(cherry picked from commit c63443e43fc1268a84bd3c9da2050009f33211e3)
(cherry picked from commit f5fb5e8fcbb47a3ff31870cc9312a44e9fd0bf01)
---
 drivers/flash/nrf_qspi_nor.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/flash/nrf_qspi_nor.c b/drivers/flash/nrf_qspi_nor.c
index 44fcc6b7629..73213a1ce30 100644
--- a/drivers/flash/nrf_qspi_nor.c
+++ b/drivers/flash/nrf_qspi_nor.c
@@ -488,7 +488,9 @@ static int qspi_wait_while_writing(const struct device *dev, k_timeout_t poll_pe
 
 	do {
 #ifdef CONFIG_MULTITHREADING
-		k_sleep(poll_period);
+		if (!K_TIMEOUT_EQ(poll_period, K_NO_WAIT)) {
+			k_sleep(poll_period);
+		}
 #endif
 		rc = qspi_rdsr(dev, 1);
 	} while ((rc >= 0)

From 96e5f03cf6be73ab91cf4db221b405a58993fbb6 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Mon, 23 Sep 2024 13:22:35 +0200
Subject: [PATCH 0140/2913] [nrf fromtree] cmake: linker: evaluate
 CONFIG_LINKER_ITERABLE_SUBALIGN in CMake

Evaluate CONFIG_LINKER_ITERABLE_SUBALIGN in CMake instead of in the
linker script.

It cannot be assumed that a linker generator implementation is
pre-processed and therefore Kconfig settings cannot be used in those
but must be evaluated in CMake.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 205691edce5a90c9e972910ab9632d716cdfcffe)
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 712ff224fc25110c370792d5c2dcf5407bf533c7)
(cherry picked from commit b8b4bf166803031c03f4c4aa509341300c36005e)
---
 cmake/linker_script/common/common-ram.cmake   | 80 ++++++++---------
 cmake/linker_script/common/common-rom.cmake   | 90 +++++++++----------
 .../net/sockets/coap_server/CMakeLists.txt    |  2 +-
 subsys/net/conn_mgr/CMakeLists.txt            |  2 +-
 subsys/net/l2/wifi/CMakeLists.txt             |  2 +-
 tests/misc/iterable_sections/CMakeLists.txt   | 20 ++---
 .../net/lib/http_server/common/CMakeLists.txt |  4 +-
 tests/net/lib/http_server/core/CMakeLists.txt |  2 +-
 .../net/lib/http_server/crime/CMakeLists.txt  |  2 +-
 tests/net/lib/http_server/tls/CMakeLists.txt  |  2 +-
 10 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/cmake/linker_script/common/common-ram.cmake b/cmake/linker_script/common/common-ram.cmake
index 091da6ff541..48e0c6010aa 100644
--- a/cmake/linker_script/common/common-ram.cmake
+++ b/cmake/linker_script/common/common-ram.cmake
@@ -18,10 +18,10 @@ zephyr_linker_section_configure(SECTION device_states
 )
 
 if(CONFIG_PM_DEVICE)
-  zephyr_iterable_section(NAME pm_device_slots GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME pm_device_slots GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
-zephyr_iterable_section(NAME log_dynamic GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME log_dynamic GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 if(CONFIG_USERSPACE)
   # All kernel objects within are assumed to be either completely
@@ -32,35 +32,35 @@ if(CONFIG_USERSPACE)
   #   _static_kernel_objects_begin = .;
 endif()
 
-zephyr_iterable_section(NAME k_timer GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_mem_slab GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_heap GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_mutex GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_stack GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_msgq GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_mbox GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_pipe GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_sem GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_queue GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_condvar GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_event GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_fifo GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME k_timer GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_mem_slab GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_heap GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_mutex GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_stack GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_msgq GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_mbox GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_pipe GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_sem GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_queue GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_condvar GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_event GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_fifo GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
-zephyr_iterable_section(NAME net_buf_pool GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME net_buf_pool GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 if(CONFIG_NETWORKING)
-  zephyr_iterable_section(NAME net_if     GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME net_if_dev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME net_l2     GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME eth_bridge GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME net_if     GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME net_if_dev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME net_l2     GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME eth_bridge GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_ARM_SCMI)
-  zephyr_iterable_section(NAME scmi_protocol GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME scmi_protocol GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_SENSING)
-  zephyr_iterable_section(NAME sensing_sensor GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME sensing_sensor GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_USB_DEVICE_STACK)
@@ -83,8 +83,8 @@ if(CONFIG_USB_DEVICE_BOS)
 endif()
 
 if(CONFIG_RTIO)
-  zephyr_iterable_section(NAME rtio GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME rtio_iodev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME rtio GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME rtio_iodev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 #if(CONFIG_USERSPACE)
@@ -93,11 +93,11 @@ endif()
 #
 
 if(CONFIG_ZTEST)
-  zephyr_iterable_section(NAME ztest_suite_node GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME ztest_suite_stats GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME ztest_unit_test GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME ztest_test_rule GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME ztest_expected_result_entry GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME ztest_suite_node GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME ztest_suite_stats GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME ztest_unit_test GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME ztest_test_rule GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME ztest_expected_result_entry GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_ZBUS)
@@ -105,31 +105,31 @@ if(CONFIG_ZBUS)
 endif()
 
 if(CONFIG_UVB)
-  zephyr_iterable_section(NAME uvb_node GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME uvb_node GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 
 if(CONFIG_LOG)
-  zephyr_iterable_section(NAME log_mpsc_pbuf GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME log_msg_ptr GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME log_mpsc_pbuf GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME log_msg_ptr GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_PCIE)
-  zephyr_iterable_section(NAME pcie_dev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME pcie_dev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_USB_DEVICE_STACK OR CONFIG_USB_DEVICE_STACK_NEXT)
-  zephyr_iterable_section(NAME usb_cfg_data GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME usbd_context GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME usbd_class_fs GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME usbd_class_hs GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME usb_cfg_data GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME usbd_context GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME usbd_class_fs GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME usbd_class_hs GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_USB_HOST_STACK)
-  zephyr_iterable_section(NAME usbh_contex GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME usbh_class_data GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME usbh_contex GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME usbh_class_data GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_DEVICE_MUTABLE)
-  zephyr_iterable_section(NAME device_mutable GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME device_mutable GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
diff --git a/cmake/linker_script/common/common-rom.cmake b/cmake/linker_script/common/common-rom.cmake
index 2fd4fcedb47..868e9f382d9 100644
--- a/cmake/linker_script/common/common-rom.cmake
+++ b/cmake/linker_script/common/common-rom.cmake
@@ -11,7 +11,7 @@ zephyr_linker_section_obj_level(SECTION init LEVEL SMP)
 zephyr_linker_section(NAME deferred_init_list KVMA RAM_REGION GROUP RODATA_REGION)
 zephyr_linker_section_configure(SECTION deferred_init_list INPUT ".z_deferred_init*" KEEP SORT NAME)
 
-zephyr_iterable_section(NAME device NUMERIC KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME device NUMERIC KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 if(CONFIG_GEN_SW_ISR_TABLE AND NOT CONFIG_DYNAMIC_INTERRUPTS)
   # ld align has been changed to subalign to provide identical behavior scatter vs. ld.
@@ -92,98 +92,98 @@ zephyr_linker_section_configure(
 )
 
 if(CONFIG_NET_SOCKETS)
-  zephyr_iterable_section(NAME net_socket_register KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME net_socket_register KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 
 if(CONFIG_NET_L2_PPP)
-  zephyr_iterable_section(NAME ppp_protocol_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME ppp_protocol_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
-zephyr_iterable_section(NAME bt_l2cap_fixed_chan KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME bt_l2cap_fixed_chan KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 if(CONFIG_BT_CLASSIC)
-  zephyr_iterable_section(NAME bt_l2cap_br_fixed_chan KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME bt_l2cap_br_fixed_chan KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_BT_CONN)
-  zephyr_iterable_section(NAME bt_conn_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME bt_conn_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
-zephyr_iterable_section(NAME bt_gatt_service_static KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME bt_gatt_service_static KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 if(CONFIG_BT_MESH)
-  zephyr_iterable_section(NAME bt_mesh_subnet_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME bt_mesh_app_key_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME bt_mesh_subnet_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME bt_mesh_app_key_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
-  zephyr_iterable_section(NAME bt_mesh_hb_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME bt_mesh_hb_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_BT_MESH_FRIEND)
-  zephyr_iterable_section(NAME bt_mesh_friend_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME bt_mesh_friend_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_BT_MESH_LOW_POWER)
-  zephyr_iterable_section(NAME bt_mesh_lpn_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME bt_mesh_lpn_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_BT_MESH_PROXY)
-  zephyr_iterable_section(NAME bt_mesh_proxy_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME bt_mesh_proxy_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_EC_HOST_CMD)
-  zephyr_iterable_section(NAME ec_host_cmd_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME ec_host_cmd_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_SETTINGS)
-  zephyr_iterable_section(NAME settings_handler_static KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME settings_handler_static KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_SENSING)
-  zephyr_iterable_section(NAME sensing_sensor_info KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME sensing_sensor_info KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_SENSOR_INFO)
-  zephyr_iterable_section(NAME sensor_info KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME sensor_info KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_SENSOR_ASYNC_API)
-  zephyr_iterable_section(NAME sensor_decoder_api KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME sensor_decoder_api KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_MCUMGR)
-  zephyr_iterable_section(NAME mcumgr_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME mcumgr_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
-zephyr_iterable_section(NAME k_p4wq_initparam KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME k_p4wq_initparam KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 if(CONFIG_EMUL)
-  zephyr_iterable_section(NAME emul KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME emul KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_DNS_SD)
-  zephyr_iterable_section(NAME dns_sd_rec KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME dns_sd_rec KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_PCIE)
-  zephyr_iterable_section(NAME irq_alloc KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME irq_alloc KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
-zephyr_iterable_section(NAME log_strings KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME log_strings KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
-zephyr_iterable_section(NAME log_const KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME log_const KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
-zephyr_iterable_section(NAME shell KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME shell KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
-zephyr_iterable_section(NAME shell_root_cmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME shell_root_cmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
-zephyr_iterable_section(NAME shell_subcmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME shell_subcmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
-zephyr_iterable_section(NAME shell_dynamic_subcmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME shell_dynamic_subcmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
-zephyr_iterable_section(NAME cfb_font KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME cfb_font KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
-zephyr_iterable_section(NAME tracing_backend KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME tracing_backend KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 zephyr_linker_section(NAME zephyr_dbg_info KVMA RAM_REGION GROUP RODATA_REGION NOINPUT ${XIP_ALIGN_WITH_INPUT})
 zephyr_linker_section_configure(SECTION zephyr_dbg_info INPUT ".zephyr_dbg_info" KEEP)
@@ -199,15 +199,15 @@ if (CONFIG_DEVICE_DEPS)
   zephyr_linker_section_configure(SECTION device_deps INPUT .__device_deps_pass2* KEEP SORT NAME PASS NOT LINKER_DEVICE_DEPS_PASS1)
 endif()
 
-zephyr_iterable_section(NAME _static_thread_data KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME _static_thread_data KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 if (CONFIG_BT_IAS)
-  zephyr_iterable_section(NAME bt_ias_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME bt_ias_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if (CONFIG_LOG)
-  zephyr_iterable_section(NAME log_link KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME log_backend KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME log_link KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME log_backend KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if (CONFIG_MULTI_LEVEL_INTERRUPTS)
@@ -215,35 +215,35 @@ if (CONFIG_MULTI_LEVEL_INTERRUPTS)
 endif()
 
 if (CONFIG_HTTP_SERVER)
-  zephyr_iterable_section(NAME http_service_desc KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME http_service_desc KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if (CONFIG_COAP_SERVER)
-  zephyr_iterable_section(NAME coap_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME coap_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if (CONFIG_NET_MGMT)
-  zephyr_iterable_section(NAME net_mgmt_event_static_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME net_mgmt_event_static_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_INPUT)
-  zephyr_iterable_section(NAME input_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME input_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_USBD_MSC_CLASS)
-  zephyr_iterable_section(NAME usbd_msc_lun KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME usbd_msc_lun KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_ZBUS)
-  zephyr_iterable_section(NAME zbus_channel KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME zbus_observer KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME zbus_channel_observation KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME zbus_channel KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME zbus_observer KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME zbus_channel_observation KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_GNSS)
-  zephyr_iterable_section(NAME gnss_data_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME gnss_data_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_GNSS_SATELLITES)
-  zephyr_iterable_section(NAME gnss_satellites_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME gnss_satellites_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
diff --git a/samples/net/sockets/coap_server/CMakeLists.txt b/samples/net/sockets/coap_server/CMakeLists.txt
index 932e3cfdeeb..418e31e7d2f 100644
--- a/samples/net/sockets/coap_server/CMakeLists.txt
+++ b/samples/net/sockets/coap_server/CMakeLists.txt
@@ -15,4 +15,4 @@ zephyr_linker_sources(DATA_SECTIONS sections-ram.ld)
 zephyr_iterable_section(
   NAME coap_resource_coap_server
   GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT}
-  SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
diff --git a/subsys/net/conn_mgr/CMakeLists.txt b/subsys/net/conn_mgr/CMakeLists.txt
index 68ca0f1388f..d9a6cd30c0c 100644
--- a/subsys/net/conn_mgr/CMakeLists.txt
+++ b/subsys/net/conn_mgr/CMakeLists.txt
@@ -10,4 +10,4 @@ zephyr_library_sources(
 	)
 
 zephyr_linker_sources(DATA_SECTIONS conn_mgr.ld)
-zephyr_iterable_section(NAME conn_mgr_conn_binding GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME conn_mgr_conn_binding GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
diff --git a/subsys/net/l2/wifi/CMakeLists.txt b/subsys/net/l2/wifi/CMakeLists.txt
index 6548e814bc3..bab445e8262 100644
--- a/subsys/net/l2/wifi/CMakeLists.txt
+++ b/subsys/net/l2/wifi/CMakeLists.txt
@@ -20,7 +20,7 @@ zephyr_library_sources_ifdef(CONFIG_NET_L2_WIFI_UTILS wifi_utils.c)
 # Linker section placement for wifi_nm_instance iterable structure
 zephyr_linker_sources_ifdef(CONFIG_WIFI_NM DATA_SECTIONS wifi_nm.ld)
 if (CONFIG_WIFI_NM)
-zephyr_iterable_section(NAME wifi_nm_instance GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME wifi_nm_instance GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 # Wi-Fi Enterprise test certificates handling
diff --git a/tests/misc/iterable_sections/CMakeLists.txt b/tests/misc/iterable_sections/CMakeLists.txt
index 350c2a5ca0e..2519c45a5c3 100644
--- a/tests/misc/iterable_sections/CMakeLists.txt
+++ b/tests/misc/iterable_sections/CMakeLists.txt
@@ -8,15 +8,15 @@ FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
 
 zephyr_linker_sources(DATA_SECTIONS sections-ram.ld)
-zephyr_iterable_section(NAME test_ram GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME test_ram2 GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME test_ram_named GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME test_ram_numeric NUMERIC GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME ramn_alt GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME test_ram GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME test_ram2 GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME test_ram_named GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME test_ram_numeric NUMERIC GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME ramn_alt GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 zephyr_linker_sources(SECTIONS sections-rom.ld)
-zephyr_iterable_section(NAME test_rom KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME test_rom2 KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME test_rom_named KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME test_rom_numeric NUMERIC KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME romn_alt KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME test_rom KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME test_rom2 KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME test_rom_named KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME test_rom_numeric NUMERIC KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME romn_alt KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
diff --git a/tests/net/lib/http_server/common/CMakeLists.txt b/tests/net/lib/http_server/common/CMakeLists.txt
index add7abe2de3..a2e5b499808 100644
--- a/tests/net/lib/http_server/common/CMakeLists.txt
+++ b/tests/net/lib/http_server/common/CMakeLists.txt
@@ -8,5 +8,5 @@ FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
 
 zephyr_linker_sources(SECTIONS sections-rom.ld)
-zephyr_iterable_section(NAME http_resource_desc_service_A KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME http_resource_desc_service_B KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME http_resource_desc_service_A KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME http_resource_desc_service_B KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
diff --git a/tests/net/lib/http_server/core/CMakeLists.txt b/tests/net/lib/http_server/core/CMakeLists.txt
index aa64e0bcf6e..7d47b3be9e2 100644
--- a/tests/net/lib/http_server/core/CMakeLists.txt
+++ b/tests/net/lib/http_server/core/CMakeLists.txt
@@ -15,4 +15,4 @@ set(gen_dir ${ZEPHYR_BINARY_DIR}/include/generated/)
 target_link_libraries(app PRIVATE zephyr_interface zephyr)
 
 zephyr_linker_sources(SECTIONS sections-rom.ld)
-zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
diff --git a/tests/net/lib/http_server/crime/CMakeLists.txt b/tests/net/lib/http_server/crime/CMakeLists.txt
index d991ae1d3f6..0e930e194d7 100644
--- a/tests/net/lib/http_server/crime/CMakeLists.txt
+++ b/tests/net/lib/http_server/crime/CMakeLists.txt
@@ -21,4 +21,4 @@ generate_inc_file_for_target(app ${source_file_not_found} ${gen_dir}/not_found_p
 generate_inc_file_for_target(app ${source_file_not_found} ${gen_dir}/not_found_page.html.gz.inc --gzip)
 
 zephyr_linker_sources(SECTIONS sections-rom.ld)
-zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
diff --git a/tests/net/lib/http_server/tls/CMakeLists.txt b/tests/net/lib/http_server/tls/CMakeLists.txt
index 35f1805f63e..f277bc750b2 100644
--- a/tests/net/lib/http_server/tls/CMakeLists.txt
+++ b/tests/net/lib/http_server/tls/CMakeLists.txt
@@ -51,4 +51,4 @@ FILE(GLOB app_sources src/main.c)
 target_sources(app PRIVATE ${app_sources})
 
 zephyr_linker_sources(SECTIONS sections-rom.ld)
-zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})

From cd2db18b942c7589d8b57d831f304a770327a0e2 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Sat, 21 Sep 2024 07:37:46 +0200
Subject: [PATCH 0141/2913] [nrf fromtree] samples/net: Don't test on
 native_posix

native_posix is now deprecated.
Building these samples in both native_sim and native_posix
does not improve coverage for these samples but doubles CI time.
As anyhow native_posix will be removed all together in
2 releases, let's remove it already for this sample.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit d9aae58f80ebb1d22eda95104b2389cf59da5f54)
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 8263ec5a4cb59dc677419e06575980a2bab4587d)
(cherry picked from commit e3770a2d89a4666a0cecad1f1d0ced0a1f64e54f)
---
 samples/net/gptp/boards/native_posix.conf | 8 --------
 samples/net/gptp/sample.yaml              | 2 --
 samples/net/ipv4_autoconf/sample.yaml     | 2 --
 samples/net/lldp/sample.yaml              | 2 --
 4 files changed, 14 deletions(-)
 delete mode 100644 samples/net/gptp/boards/native_posix.conf

diff --git a/samples/net/gptp/boards/native_posix.conf b/samples/net/gptp/boards/native_posix.conf
deleted file mode 100644
index c514520186c..00000000000
--- a/samples/net/gptp/boards/native_posix.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Settings for native_posix ethernet driver
-CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK=y
-
-#CONFIG_ETH_NATIVE_POSIX_RANDOM_MAC=y
-CONFIG_ETH_NATIVE_POSIX_MAC_ADDR="00:00:5e:00:53:2a"
-
-# Assume 1 ms accuracy for native_posix simulated clock
-CONFIG_NET_GPTP_CLOCK_ACCURACY_1MS=y
diff --git a/samples/net/gptp/sample.yaml b/samples/net/gptp/sample.yaml
index 44bf695d628..c2698bae1aa 100644
--- a/samples/net/gptp/sample.yaml
+++ b/samples/net/gptp/sample.yaml
@@ -11,8 +11,6 @@ tests:
     platform_allow:
       - frdm_k64f
       - sam_e70_xplained/same70q21
-      - native_posix
-      - native_posix/native/64
       - native_sim
       - native_sim/native/64
       - nucleo_f767zi
diff --git a/samples/net/ipv4_autoconf/sample.yaml b/samples/net/ipv4_autoconf/sample.yaml
index 0322a31ad75..88e39ec2356 100644
--- a/samples/net/ipv4_autoconf/sample.yaml
+++ b/samples/net/ipv4_autoconf/sample.yaml
@@ -5,8 +5,6 @@ common:
     - ipv4_autoconf
   platform_allow:
     - qemu_x86
-    - native_posix
-    - native_posix/native/64
     - native_sim
     - native_sim/native/64
   integration_platforms:
diff --git a/samples/net/lldp/sample.yaml b/samples/net/lldp/sample.yaml
index ee465be7883..27f26d18590 100644
--- a/samples/net/lldp/sample.yaml
+++ b/samples/net/lldp/sample.yaml
@@ -9,8 +9,6 @@ sample:
 tests:
   sample.net.lldp:
     platform_allow:
-      - native_posix
-      - native_posix/native/64
       - native_sim
       - native_sim/native/64
     integration_platforms:

From 0739495eb3cad2c7198a3a50b558e4ad61563043 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Wed, 2 Oct 2024 17:12:36 +0200
Subject: [PATCH 0142/2913] [nrf fromtree] snippets: Add Wi-Fi IPv4 snippet

Introduce a snippet for configuring IPv4 over Wi-Fi support in
networking samples.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 0fdfad84ded28292c6c8cf78c689b59d3c5b8eb7)
(cherry picked from commit d681e4c54e8b33bbfbd68b7e55dd3e38e8e9362a)
(cherry picked from commit a671ae80bb5023d90038bc0025a582156a7c0ee4)
---
 snippets/wifi-ipv4/README.rst     | 28 ++++++++++++++++++++++++++++
 snippets/wifi-ipv4/snippet.yml    |  3 +++
 snippets/wifi-ipv4/wifi-ipv4.conf | 31 +++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 snippets/wifi-ipv4/README.rst
 create mode 100644 snippets/wifi-ipv4/snippet.yml
 create mode 100644 snippets/wifi-ipv4/wifi-ipv4.conf

diff --git a/snippets/wifi-ipv4/README.rst b/snippets/wifi-ipv4/README.rst
new file mode 100644
index 00000000000..89139c56d79
--- /dev/null
+++ b/snippets/wifi-ipv4/README.rst
@@ -0,0 +1,28 @@
+.. _snippet-wifi-ipv4:
+
+Wi-Fi IPv4 Snippet (wifi-ipv4)
+##############################
+
+.. code-block:: console
+
+   west build -S wifi-ipv4 [...]
+
+Overview
+********
+
+This snippet enables IPv4 Wi-Fi support in supported networking samples.
+The sample execution is postponed until Wi-Fi connectivity is established.
+
+Use Wi-Fi shell to connect to the Wi-Fi network:
+
+.. code-block:: console
+
+   wifi connect -s <SSID> -k <key_management> -p <passphrase>
+
+Requirements
+************
+
+Hardware support for:
+
+- :kconfig:option:`CONFIG_WIFI`
+- :kconfig:option:`CONFIG_WIFI_USE_NATIVE_NETWORKING`
diff --git a/snippets/wifi-ipv4/snippet.yml b/snippets/wifi-ipv4/snippet.yml
new file mode 100644
index 00000000000..cde1bb348d8
--- /dev/null
+++ b/snippets/wifi-ipv4/snippet.yml
@@ -0,0 +1,3 @@
+name: wifi-ipv4
+append:
+  EXTRA_CONF_FILE: wifi-ipv4.conf
diff --git a/snippets/wifi-ipv4/wifi-ipv4.conf b/snippets/wifi-ipv4/wifi-ipv4.conf
new file mode 100644
index 00000000000..59f4eafc222
--- /dev/null
+++ b/snippets/wifi-ipv4/wifi-ipv4.conf
@@ -0,0 +1,31 @@
+# Wi-Fi
+CONFIG_WIFI=y
+CONFIG_NET_L2_ETHERNET=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
+
+# Make sure there is enough resources for supplicant and most of the samples
+CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_ZVFS_OPEN_MAX=24
+CONFIG_NET_MAX_CONN=10
+CONFIG_NET_SOCKETS_POLL_MAX=9
+
+# IPv4 only for now
+CONFIG_NET_IPV6=n
+CONFIG_NET_CONFIG_NEED_IPV6=n
+CONFIG_NET_IPV4=y
+
+# DHCPv4
+CONFIG_NET_DHCPV4=y
+CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
+CONFIG_NET_CONFIG_INIT_TIMEOUT=0
+
+# DNS
+CONFIG_DNS_RESOLVER=y
+
+# Connection manager
+CONFIG_NET_CONNECTION_MANAGER=y
+
+# Wi-Fi shell
+CONFIG_NET_SHELL=y
+CONFIG_NET_L2_WIFI_SHELL=y
+CONFIG_SHELL_STACK_SIZE=5200

From cd5a8695556b7cf4f35a506d9b80dab8cb3b71ad Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Wed, 2 Oct 2024 17:13:06 +0200
Subject: [PATCH 0143/2913] [nrf fromtree] samples: net: Add Wi-Fi snippet
 support for networking samples

Make use of wifi-ipv4 snippet in several networking samples.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit fd2fa54aa755a5c0f3d8b7a2075d804f325ed6ea)
(cherry picked from commit c257a1f808aac48da91152c94116998887c5c648)
(cherry picked from commit 9b684667d7c98c9f2b507564bfdd6141d9b437b3)
---
 samples/net/common/common.cmake               |  3 ++
 samples/net/common/net_sample_common.c        | 42 +++++++++++++++++++
 samples/net/common/net_sample_common.h        | 11 +++++
 samples/net/dns_resolve/CMakeLists.txt        |  2 +
 samples/net/dns_resolve/README.rst            |  6 +++
 samples/net/dns_resolve/sample.yaml           |  6 +++
 samples/net/dns_resolve/src/main.c            |  4 ++
 samples/net/ipv4_autoconf/CMakeLists.txt      |  2 +
 samples/net/ipv4_autoconf/README.rst          |  6 +++
 samples/net/ipv4_autoconf/sample.yaml         | 20 +++++----
 samples/net/ipv4_autoconf/src/main.c          |  4 ++
 samples/net/lwm2m_client/Kconfig              |  2 +
 samples/net/lwm2m_client/src/lwm2m-client.c   |  9 ++--
 samples/net/mdns_responder/README.rst         |  6 +++
 samples/net/mdns_responder/sample.yaml        | 15 +++++--
 samples/net/mdns_responder/src/main.c         |  4 ++
 samples/net/mqtt_publisher/CMakeLists.txt     |  2 +
 samples/net/mqtt_publisher/README.rst         |  6 +++
 samples/net/mqtt_publisher/sample.yaml        |  6 +++
 samples/net/mqtt_publisher/src/main.c         |  3 ++
 .../net/sockets/coap_server/CMakeLists.txt    |  2 +
 samples/net/sockets/coap_server/README.rst    |  6 +++
 samples/net/sockets/coap_server/prj.conf      |  2 +
 samples/net/sockets/coap_server/sample.yaml   | 14 +++++--
 samples/net/sockets/coap_server/src/main.c    |  6 +++
 samples/net/sockets/echo_async/README.rst     |  6 +++
 samples/net/sockets/echo_async/sample.yaml    |  6 +++
 .../net/sockets/echo_async/src/socket_echo.c  |  4 ++
 samples/net/sockets/http_get/README.rst       |  6 +++
 samples/net/sockets/http_get/sample.yaml      |  6 +++
 samples/net/sockets/http_get/src/http_get.c   |  4 ++
 .../net/sockets/sntp_client/CMakeLists.txt    |  2 +
 samples/net/sockets/sntp_client/README.rst    |  6 +++
 samples/net/sockets/sntp_client/sample.yaml   |  6 +++
 samples/net/sockets/sntp_client/src/main.c    |  3 ++
 samples/net/syslog_net/CMakeLists.txt         |  2 +
 samples/net/syslog_net/README.rst             |  6 +++
 samples/net/syslog_net/sample.yaml            |  6 +++
 samples/net/syslog_net/src/main.c             |  4 ++
 samples/net/telnet/CMakeLists.txt             |  2 +
 samples/net/telnet/README.rst                 |  6 +++
 samples/net/telnet/sample.yaml                | 17 +++++---
 samples/net/telnet/src/telnet.c               |  4 ++
 43 files changed, 259 insertions(+), 26 deletions(-)
 create mode 100644 samples/net/common/net_sample_common.c
 create mode 100644 samples/net/common/net_sample_common.h

diff --git a/samples/net/common/common.cmake b/samples/net/common/common.cmake
index b17d6493819..c0e0e511179 100644
--- a/samples/net/common/common.cmake
+++ b/samples/net/common/common.cmake
@@ -1,3 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Common routines used in net samples
+
+target_include_directories(app PRIVATE ${ZEPHYR_BASE}/samples/net/common/)
+target_sources(app PRIVATE $ENV{ZEPHYR_BASE}/samples/net/common/net_sample_common.c)
diff --git a/samples/net/common/net_sample_common.c b/samples/net/common/net_sample_common.c
new file mode 100644
index 00000000000..1e744f178b5
--- /dev/null
+++ b/samples/net/common/net_sample_common.c
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2024 Nordic Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(net_samples_common, LOG_LEVEL_DBG);
+
+#include <zephyr/net/conn_mgr_connectivity.h>
+
+#if defined(CONFIG_NET_CONNECTION_MANAGER)
+#define L4_EVENT_MASK (NET_EVENT_L4_CONNECTED | NET_EVENT_L4_DISCONNECTED)
+
+static struct net_mgmt_event_callback l4_cb;
+static K_SEM_DEFINE(network_connected, 0, 1);
+
+static void l4_event_handler(struct net_mgmt_event_callback *cb, uint32_t event,
+			     struct net_if *iface)
+{
+	switch (event) {
+	case NET_EVENT_L4_CONNECTED:
+		LOG_INF("Network connectivity established and IP address assigned");
+		k_sem_give(&network_connected);
+		break;
+	case NET_EVENT_L4_DISCONNECTED:
+		break;
+	default:
+		break;
+	}
+}
+
+void wait_for_network(void)
+{
+	net_mgmt_init_event_callback(&l4_cb, l4_event_handler, L4_EVENT_MASK);
+	net_mgmt_add_event_callback(&l4_cb);
+
+	LOG_INF("Waiting for network...");
+
+	k_sem_take(&network_connected, K_FOREVER);
+}
+#endif /* CONFIG_NET_CONNECTION_MANAGER */
diff --git a/samples/net/common/net_sample_common.h b/samples/net/common/net_sample_common.h
new file mode 100644
index 00000000000..f44e852a0da
--- /dev/null
+++ b/samples/net/common/net_sample_common.h
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2024 Nordic Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#if defined(CONFIG_NET_CONNECTION_MANAGER)
+void wait_for_network(void);
+#else
+static inline void wait_for_network(void) { }
+#endif /* CONFIG_NET_CONNECTION_MANAGER */
diff --git a/samples/net/dns_resolve/CMakeLists.txt b/samples/net/dns_resolve/CMakeLists.txt
index 1ac07c37fd2..1a863388264 100644
--- a/samples/net/dns_resolve/CMakeLists.txt
+++ b/samples/net/dns_resolve/CMakeLists.txt
@@ -6,3 +6,5 @@ project(dns_resolve)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/dns_resolve/README.rst b/samples/net/dns_resolve/README.rst
index e566fa44bd1..b741b827ac9 100644
--- a/samples/net/dns_resolve/README.rst
+++ b/samples/net/dns_resolve/README.rst
@@ -155,3 +155,9 @@ Open a terminal window and type:
 Use 'dmesg' to find the right USB device.
 
 Once the binary is loaded into the FRDM board, press the RESET button.
+
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/dns_resolve/sample.yaml b/samples/net/dns_resolve/sample.yaml
index cafc9beac83..7cf510d0ba4 100644
--- a/samples/net/dns_resolve/sample.yaml
+++ b/samples/net/dns_resolve/sample.yaml
@@ -23,3 +23,9 @@ tests:
       - CONFIG_LLMNR_RESOLVER=y
       - CONFIG_NET_DHCPV4=y
     tags: llmnr
+  sample.net.dns_resolve.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/dns_resolve/src/main.c b/samples/net/dns_resolve/src/main.c
index 5eec113ead3..23e5645d0b4 100644
--- a/samples/net/dns_resolve/src/main.c
+++ b/samples/net/dns_resolve/src/main.c
@@ -17,6 +17,8 @@ LOG_MODULE_REGISTER(net_dns_resolve_client_sample, LOG_LEVEL_DBG);
 #include <zephyr/net/net_mgmt.h>
 #include <zephyr/net/dns_resolve.h>
 
+#include "net_sample_common.h"
+
 #if defined(CONFIG_MDNS_RESOLVER)
 #if defined(CONFIG_NET_IPV4)
 static struct k_work_delayable mdns_ipv4_timer;
@@ -395,6 +397,8 @@ int main(void)
 
 	LOG_INF("Starting DNS resolve sample");
 
+	wait_for_network();
+
 	setup_ipv4(iface);
 
 	setup_dhcpv4(iface);
diff --git a/samples/net/ipv4_autoconf/CMakeLists.txt b/samples/net/ipv4_autoconf/CMakeLists.txt
index cb0f8e1b9c6..8bcf3bfd244 100644
--- a/samples/net/ipv4_autoconf/CMakeLists.txt
+++ b/samples/net/ipv4_autoconf/CMakeLists.txt
@@ -6,3 +6,5 @@ project(ipv4_autoconf)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/ipv4_autoconf/README.rst b/samples/net/ipv4_autoconf/README.rst
index 614f2c64047..f9a8f63363b 100644
--- a/samples/net/ipv4_autoconf/README.rst
+++ b/samples/net/ipv4_autoconf/README.rst
@@ -69,3 +69,9 @@ type:
 .. code-block:: console
 
    $ ping -I eth1 169.254.218.128
+
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/ipv4_autoconf/sample.yaml b/samples/net/ipv4_autoconf/sample.yaml
index 88e39ec2356..eb9c06ae18e 100644
--- a/samples/net/ipv4_autoconf/sample.yaml
+++ b/samples/net/ipv4_autoconf/sample.yaml
@@ -1,17 +1,23 @@
 common:
   harness: net
+  depends_on: netif
   tags:
     - net
     - ipv4_autoconf
-  platform_allow:
-    - qemu_x86
-    - native_sim
-    - native_sim/native/64
-  integration_platforms:
-    - native_sim
 sample:
   description: Test IPv4 autoconf functionality
   name: IPv4 autoconf sample app
 tests:
   sample.net.ipv4_autoconf:
-    depends_on: netif
+    platform_allow:
+      - qemu_x86
+      - native_sim
+      - native_sim/native/64
+    integration_platforms:
+      - native_sim
+  sample.net.ipv4_autoconf.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/ipv4_autoconf/src/main.c b/samples/net/ipv4_autoconf/src/main.c
index b9f9c00379d..c4e93105cf7 100644
--- a/samples/net/ipv4_autoconf/src/main.c
+++ b/samples/net/ipv4_autoconf/src/main.c
@@ -20,6 +20,8 @@ LOG_MODULE_REGISTER(net_ipv4_autoconf_sample, LOG_LEVEL_DBG);
 #include <zephyr/net/net_context.h>
 #include <zephyr/net/net_mgmt.h>
 
+#include "net_sample_common.h"
+
 static struct net_mgmt_event_callback mgmt_cb;
 
 static void handler(struct net_mgmt_event_callback *cb,
@@ -60,6 +62,8 @@ int main(void)
 {
 	LOG_INF("Run ipv4 autoconf client");
 
+	wait_for_network();
+
 	net_mgmt_init_event_callback(&mgmt_cb, handler,
 				     NET_EVENT_IPV4_ADDR_ADD);
 	net_mgmt_add_event_callback(&mgmt_cb);
diff --git a/samples/net/lwm2m_client/Kconfig b/samples/net/lwm2m_client/Kconfig
index 2037d281ce0..1bc4b6c49b0 100644
--- a/samples/net/lwm2m_client/Kconfig
+++ b/samples/net/lwm2m_client/Kconfig
@@ -29,6 +29,8 @@ endif
 
 config LWM2M_APP_SERVER
 	string "LwM2M server address"
+	default "coap://leshan.eclipseprojects.io:5683" if (WIFI && !LWM2M_DTLS_SUPPORT)
+	default "coaps://leshan.eclipseprojects.io:5684" if (WIFI && LWM2M_DTLS_SUPPORT)
 	default "coap://192.0.2.2:5683" if !LWM2M_DTLS_SUPPORT
 	default "coaps://192.0.2.2:5684" if (LWM2M_DTLS_SUPPORT && !LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP)
 	default "coaps://192.0.2.2:5784" if (LWM2M_DTLS_SUPPORT && LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP)
diff --git a/samples/net/lwm2m_client/src/lwm2m-client.c b/samples/net/lwm2m_client/src/lwm2m-client.c
index cea4f92ce8c..e59b4e9482a 100644
--- a/samples/net/lwm2m_client/src/lwm2m-client.c
+++ b/samples/net/lwm2m_client/src/lwm2m-client.c
@@ -385,12 +385,9 @@ int main(void)
 			return ret;
 		}
 
-		ret = conn_mgr_if_connect(net_if_get_default());
-		/* Ignore errors from interfaces not requiring connectivity */
-		if (ret == 0) {
-			LOG_INF("Connecting to network");
-			k_sem_take(&network_connected_sem, K_FOREVER);
-		}
+		(void)conn_mgr_if_connect(net_if_get_default());
+
+		k_sem_take(&network_connected_sem, K_FOREVER);
 	}
 
 	ret = lwm2m_setup();
diff --git a/samples/net/mdns_responder/README.rst b/samples/net/mdns_responder/README.rst
index 015f6c8b444..bdb65259282 100644
--- a/samples/net/mdns_responder/README.rst
+++ b/samples/net/mdns_responder/README.rst
@@ -74,3 +74,9 @@ If the query is successful, then the following information is printed:
        address = [192.0.2.1]
        port = [4242]
        txt = []
+
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/mdns_responder/sample.yaml b/samples/net/mdns_responder/sample.yaml
index dff79845d75..31b12260d0f 100644
--- a/samples/net/mdns_responder/sample.yaml
+++ b/samples/net/mdns_responder/sample.yaml
@@ -1,13 +1,20 @@
+common:
+  harness: net
+  tags:
+    - net
+    - mdns
 sample:
   name: mDNS responder
 tests:
   sample.net.mdns_responder:
-    harness: net
     platform_allow:
       - qemu_x86
       - qemu_cortex_m3
     integration_platforms:
       - qemu_x86
-    tags:
-      - net
-      - mdns
+  sample.net.mdns_responder.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/mdns_responder/src/main.c b/samples/net/mdns_responder/src/main.c
index 112f9e93931..d6eea7c8337 100644
--- a/samples/net/mdns_responder/src/main.c
+++ b/samples/net/mdns_responder/src/main.c
@@ -12,6 +12,8 @@ LOG_MODULE_REGISTER(net_mdns_responder_sample, LOG_LEVEL_DBG);
 #include <zephyr/kernel.h>
 #include <zephyr/net/net_core.h>
 
+#include "net_sample_common.h"
+
 extern void service(void);
 
 #if defined(CONFIG_NET_VLAN)
@@ -34,6 +36,8 @@ static inline int init_vlan(void)
  */
 int main(void)
 {
+	wait_for_network();
+
 	LOG_INF("Waiting mDNS queries...");
 	init_vlan();
 	service();
diff --git a/samples/net/mqtt_publisher/CMakeLists.txt b/samples/net/mqtt_publisher/CMakeLists.txt
index 4c6e3c0ef0c..df650107905 100644
--- a/samples/net/mqtt_publisher/CMakeLists.txt
+++ b/samples/net/mqtt_publisher/CMakeLists.txt
@@ -7,3 +7,5 @@ project(mqtt_publisher)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/mqtt_publisher/README.rst b/samples/net/mqtt_publisher/README.rst
index 6c75f2f2d7e..081d3a32625 100644
--- a/samples/net/mqtt_publisher/README.rst
+++ b/samples/net/mqtt_publisher/README.rst
@@ -372,3 +372,9 @@ This is the output from the MQTT broker:
 	1485663807: Received PUBREL from zephyr_publisher (Mid: 49829)
 	1485663807: Sending PUBCOMP to zephyr_publisher (Mid: 49829)
 	1485663808: Received DISCONNECT from zephyr_publisher
+
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/mqtt_publisher/sample.yaml b/samples/net/mqtt_publisher/sample.yaml
index 5d29a7e46a8..8d3662fe0bf 100644
--- a/samples/net/mqtt_publisher/sample.yaml
+++ b/samples/net/mqtt_publisher/sample.yaml
@@ -28,3 +28,9 @@ tests:
       - net
       - mqtt
       - bluetooth
+  sample.net.mqtt_publisher.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/mqtt_publisher/src/main.c b/samples/net/mqtt_publisher/src/main.c
index 231c9c2b2f3..faa96e33b5c 100644
--- a/samples/net/mqtt_publisher/src/main.c
+++ b/samples/net/mqtt_publisher/src/main.c
@@ -16,6 +16,7 @@ LOG_MODULE_REGISTER(net_mqtt_publisher_sample, LOG_LEVEL_DBG);
 #include <errno.h>
 
 #include "config.h"
+#include "net_sample_common.h"
 
 #if defined(CONFIG_USERSPACE)
 #include <zephyr/app_memory/app_memdomain.h>
@@ -516,6 +517,8 @@ static K_HEAP_DEFINE(app_mem_pool, 1024 * 2);
 
 int main(void)
 {
+	wait_for_network();
+
 #if defined(CONFIG_MQTT_LIB_TLS)
 	int rc;
 
diff --git a/samples/net/sockets/coap_server/CMakeLists.txt b/samples/net/sockets/coap_server/CMakeLists.txt
index 418e31e7d2f..5b9a0beeb19 100644
--- a/samples/net/sockets/coap_server/CMakeLists.txt
+++ b/samples/net/sockets/coap_server/CMakeLists.txt
@@ -16,3 +16,5 @@ zephyr_iterable_section(
   NAME coap_resource_coap_server
   GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT}
   SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/sockets/coap_server/README.rst b/samples/net/sockets/coap_server/README.rst
index 9aadbea5fc5..64bb1a687dc 100644
--- a/samples/net/sockets/coap_server/README.rst
+++ b/samples/net/sockets/coap_server/README.rst
@@ -60,3 +60,9 @@ prj_cc2520.conf configuration file enabling IEEE 802.15.4.
 .. _`net-tools`: https://github.com/zephyrproject-rtos/net-tools
 
 .. _`libcoap`: https://github.com/obgm/libcoap
+
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/sockets/coap_server/prj.conf b/samples/net/sockets/coap_server/prj.conf
index 470caa6b448..94ac1abd5cf 100644
--- a/samples/net/sockets/coap_server/prj.conf
+++ b/samples/net/sockets/coap_server/prj.conf
@@ -13,6 +13,8 @@ CONFIG_COAP=y
 CONFIG_COAP_SERVER=y
 CONFIG_COAP_SERVER_WELL_KNOWN_CORE=y
 CONFIG_COAP_WELL_KNOWN_BLOCK_WISE=n
+CONFIG_COAP_EXTENDED_OPTIONS_LEN=y
+CONFIG_COAP_EXTENDED_OPTIONS_LEN_VALUE=40
 
 # Kernel options
 CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/net/sockets/coap_server/sample.yaml b/samples/net/sockets/coap_server/sample.yaml
index 2fcf9b63287..9f7d5de78d7 100644
--- a/samples/net/sockets/coap_server/sample.yaml
+++ b/samples/net/sockets/coap_server/sample.yaml
@@ -1,14 +1,20 @@
 common:
+  harness: net
+  tags:
+    - net
+    - socket
   filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
 sample:
   description: BSD Sockets API CoAP server example
   name: socket_coap_server
 tests:
   sample.net.sockets.coap_server:
-    harness: net
-    tags:
-      - net
-      - socket
     platform_allow:
       - native_sim
       - qemu_x86
+  sample.net.sockets.coap_server.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/sockets/coap_server/src/main.c b/samples/net/sockets/coap_server/src/main.c
index 60dd32a000b..19890c1f3d3 100644
--- a/samples/net/sockets/coap_server/src/main.c
+++ b/samples/net/sockets/coap_server/src/main.c
@@ -15,6 +15,8 @@ LOG_MODULE_REGISTER(net_coap_service_sample, LOG_LEVEL_DBG);
 #include "ipv6.h"
 #endif
 
+#include "net_sample_common.h"
+
 static const uint16_t coap_port = 5683;
 
 #ifdef CONFIG_NET_IPV6
@@ -71,6 +73,8 @@ static int join_coap_multicast_group(void)
 
 int main(void)
 {
+	wait_for_network();
+
 	return join_coap_multicast_group();
 }
 
@@ -78,6 +82,8 @@ int main(void)
 
 int main(void)
 {
+	wait_for_network();
+
 	return 0;
 }
 
diff --git a/samples/net/sockets/echo_async/README.rst b/samples/net/sockets/echo_async/README.rst
index 826b3ffbda5..1b9beccdbcb 100644
--- a/samples/net/sockets/echo_async/README.rst
+++ b/samples/net/sockets/echo_async/README.rst
@@ -49,6 +49,12 @@ another terminal window and run the same telnet command as above.
 The sample supports up to three connected clients, but this can be adjusted
 by changing ``NUM_FDS`` defined in the source code.
 
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
+
 Running application on POSIX Host
 =================================
 
diff --git a/samples/net/sockets/echo_async/sample.yaml b/samples/net/sockets/echo_async/sample.yaml
index 39b33bd3165..811f2115c57 100644
--- a/samples/net/sockets/echo_async/sample.yaml
+++ b/samples/net/sockets/echo_async/sample.yaml
@@ -12,3 +12,9 @@ tests:
   sample.net.sockets.echo_async:
     extra_configs:
       - CONFIG_POSIX_API=y
+  sample.net.sockets.echo_async.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/sockets/echo_async/src/socket_echo.c b/samples/net/sockets/echo_async/src/socket_echo.c
index 33dadfbf9e7..b38eb62c001 100644
--- a/samples/net/sockets/echo_async/src/socket_echo.c
+++ b/samples/net/sockets/echo_async/src/socket_echo.c
@@ -26,6 +26,8 @@
 #include <zephyr/net/socket.h>
 #include <zephyr/kernel.h>
 
+#include "net_sample_common.h"
+
 #ifdef CONFIG_NET_IPV6
 #define USE_IPV6
 #endif
@@ -128,6 +130,8 @@ int main(void)
 	};
 #endif
 
+	wait_for_network();
+
 #if !defined(USE_IPV6) || !(CONFIG_SOC_SERIES_CC32XX)
 	serv4 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 	if (serv4 < 0) {
diff --git a/samples/net/sockets/http_get/README.rst b/samples/net/sockets/http_get/README.rst
index 09bfb2050d1..bf2f058eb4d 100644
--- a/samples/net/sockets/http_get/README.rst
+++ b/samples/net/sockets/http_get/README.rst
@@ -69,6 +69,12 @@ Note, that TLS support in the sample depends on non-posix, TLS socket
 functionality. Therefore, it is only possible to run TLS in this sample
 on Zephyr.
 
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
+
 Running application on POSIX Host
 =================================
 
diff --git a/samples/net/sockets/http_get/sample.yaml b/samples/net/sockets/http_get/sample.yaml
index 2aba5c7d60d..292058bfce9 100644
--- a/samples/net/sockets/http_get/sample.yaml
+++ b/samples/net/sockets/http_get/sample.yaml
@@ -57,3 +57,9 @@ tests:
       - native_sim
       - native_sim/native/64
     extra_args: OVERLAY_CONFIG="overlay-nsos.conf;overlay-tls.conf"
+  sample.net.sockets.http_get.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/sockets/http_get/src/http_get.c b/samples/net/sockets/http_get/src/http_get.c
index c6d16b53461..b4ad0ff8410 100644
--- a/samples/net/sockets/http_get/src/http_get.c
+++ b/samples/net/sockets/http_get/src/http_get.c
@@ -25,6 +25,8 @@
 #include "ca_certificate.h"
 #endif
 
+#include "net_sample_common.h"
+
 #endif
 
 /* HTTP server to connect to */
@@ -61,6 +63,8 @@ int main(void)
 	struct addrinfo *res;
 	int st, sock;
 
+	wait_for_network();
+
 #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS)
 	tls_credential_add(CA_CERTIFICATE_TAG, TLS_CREDENTIAL_CA_CERTIFICATE,
 			   ca_certificate, sizeof(ca_certificate));
diff --git a/samples/net/sockets/sntp_client/CMakeLists.txt b/samples/net/sockets/sntp_client/CMakeLists.txt
index 3d23993968b..b42a3549dd6 100644
--- a/samples/net/sockets/sntp_client/CMakeLists.txt
+++ b/samples/net/sockets/sntp_client/CMakeLists.txt
@@ -6,3 +6,5 @@ project(sntp_client)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/sockets/sntp_client/README.rst b/samples/net/sockets/sntp_client/README.rst
index f9a1aacd4b8..72c06877848 100644
--- a/samples/net/sockets/sntp_client/README.rst
+++ b/samples/net/sockets/sntp_client/README.rst
@@ -28,3 +28,9 @@ This sample can be built and executed on QEMU or native_sim board as
 described in :ref:`networking_with_qemu`.
 
 .. _`net-tools`: https://github.com/zephyrproject-rtos/net-tools
+
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/sockets/sntp_client/sample.yaml b/samples/net/sockets/sntp_client/sample.yaml
index aba249df18a..762da6d0000 100644
--- a/samples/net/sockets/sntp_client/sample.yaml
+++ b/samples/net/sockets/sntp_client/sample.yaml
@@ -9,3 +9,9 @@ tests:
     platform_allow:
       - qemu_x86
       - native_sim
+  sample.net.sockets.sntp_client.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/sockets/sntp_client/src/main.c b/samples/net/sockets/sntp_client/src/main.c
index 585ce1d1b43..66cf8a759e8 100644
--- a/samples/net/sockets/sntp_client/src/main.c
+++ b/samples/net/sockets/sntp_client/src/main.c
@@ -12,6 +12,7 @@ LOG_MODULE_REGISTER(net_sntp_client_sample, LOG_LEVEL_DBG);
 #include <arpa/inet.h>
 
 #include "config.h"
+#include "net_sample_common.h"
 
 #define SNTP_PORT 123
 
@@ -25,6 +26,8 @@ int main(void)
 	struct sntp_time sntp_time;
 	int rv;
 
+	wait_for_network();
+
 	/* ipv4 */
 	memset(&addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;
diff --git a/samples/net/syslog_net/CMakeLists.txt b/samples/net/syslog_net/CMakeLists.txt
index c6c052e8a90..99c7d474c3b 100644
--- a/samples/net/syslog_net/CMakeLists.txt
+++ b/samples/net/syslog_net/CMakeLists.txt
@@ -7,3 +7,5 @@ project(syslog_net)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/syslog_net/README.rst b/samples/net/syslog_net/README.rst
index dd5908714b9..acc27ff0582 100644
--- a/samples/net/syslog_net/README.rst
+++ b/samples/net/syslog_net/README.rst
@@ -51,3 +51,9 @@ Build syslog_net sample application like this:
    :conf: <config file to use>
    :goals: build
    :compact:
+
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/syslog_net/sample.yaml b/samples/net/syslog_net/sample.yaml
index 4fe99e593ff..7770f1ea80b 100644
--- a/samples/net/syslog_net/sample.yaml
+++ b/samples/net/syslog_net/sample.yaml
@@ -37,3 +37,9 @@ tests:
       - CONFIG_LOG_BACKEND_NET_AUTOSTART=n
       - CONFIG_LOG_BACKEND_NET_SERVER=""
       - CONFIG_NET_SAMPLE_SERVER_RUNTIME="192.0.2.2:514"
+  sample.net.syslog.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/syslog_net/src/main.c b/samples/net/syslog_net/src/main.c
index f0362648f05..da499fec741 100644
--- a/samples/net/syslog_net/src/main.c
+++ b/samples/net/syslog_net/src/main.c
@@ -15,6 +15,8 @@ LOG_MODULE_REGISTER(net_syslog, LOG_LEVEL_DBG);
 
 #include <stdlib.h>
 
+#include "net_sample_common.h"
+
 BUILD_ASSERT(IS_ENABLED(CONFIG_LOG_BACKEND_NET), "syslog backend not enabled");
 
 #define SLEEP_BETWEEN_PRINTS 3
@@ -25,6 +27,8 @@ int main(void)
 
 	LOG_DBG("Starting");
 
+	wait_for_network();
+
 	if (!IS_ENABLED(CONFIG_LOG_BACKEND_NET_AUTOSTART)) {
 		/* Example how to start the backend if autostart is disabled.
 		 * This is useful if the application needs to wait the network
diff --git a/samples/net/telnet/CMakeLists.txt b/samples/net/telnet/CMakeLists.txt
index 342f2dbee48..6dfd6ba8ef9 100644
--- a/samples/net/telnet/CMakeLists.txt
+++ b/samples/net/telnet/CMakeLists.txt
@@ -6,3 +6,5 @@ project(telnet)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/telnet/README.rst b/samples/net/telnet/README.rst
index 1c648e2e970..7eb82cd9dda 100644
--- a/samples/net/telnet/README.rst
+++ b/samples/net/telnet/README.rst
@@ -128,3 +128,9 @@ On your linux host:
 
 You are now connected, and as for the UART console, you can type in
 your commands and get the output through your telnet client.
+
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/telnet/sample.yaml b/samples/net/telnet/sample.yaml
index c3987d33634..508b76fe4f6 100644
--- a/samples/net/telnet/sample.yaml
+++ b/samples/net/telnet/sample.yaml
@@ -1,12 +1,19 @@
+common:
+  harness: net
+  depends_on: netif
+  tags:
+    - net
+    - telnet
 sample:
   name: Telnet Server
 tests:
   sample.net.telnet:
-    harness: net
-    depends_on: netif
-    tags:
-      - net
-      - telnet
     platform_exclude:
       - native_posix
       - native_posix/native/64
+  sample.net.telnet.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/telnet/src/telnet.c b/samples/net/telnet/src/telnet.c
index e1cc53095a4..6ad77c4f7d3 100644
--- a/samples/net/telnet/src/telnet.c
+++ b/samples/net/telnet/src/telnet.c
@@ -16,6 +16,8 @@ LOG_MODULE_REGISTER(net_telnet_sample, LOG_LEVEL_DBG);
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/net_mgmt.h>
 
+#include "net_sample_common.h"
+
 #if defined(CONFIG_NET_DHCPV4)
 static struct net_mgmt_event_callback mgmt_cb;
 
@@ -140,6 +142,8 @@ int main(void)
 
 	LOG_INF("Starting Telnet sample");
 
+	wait_for_network();
+
 	setup_ipv4(iface);
 
 	setup_dhcpv4(iface);

From 781e9126c5f12b7a4f762a4e49aa5f8166e6d18e Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 3 Oct 2024 12:37:31 +0200
Subject: [PATCH 0144/2913] [nrf fromtree] samples: net: echo_client: Fix build
 warning with IPv6 disabled

Building the sample with IPv4 only gives the following warning:

tcp.c:99:37: warning: array subscript 'struct sockaddr[0]' is partly
outside array bounds of 'struct sockaddr_in[1]' [-Warray-bounds]
  data->tcp.sock = socket(addr->sa_family, SOCK_STREAM, IPPROTO_TCP);

This doesn't really seem like a valid one, but to get rid of it
workaround by specifying address family explicitly.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 0623b23f71f85c5568446b46f79cb19581c82ba3)
(cherry picked from commit 48608dc80b4b7b36c5184afbd9105433b977555e)
(cherry picked from commit fa1de51eccbcf812cef398cc6db895e2eb009aeb)
---
 samples/net/sockets/echo_client/src/tcp.c | 19 ++++++++++---------
 samples/net/sockets/echo_client/src/udp.c | 15 ++++++++-------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/samples/net/sockets/echo_client/src/tcp.c b/samples/net/sockets/echo_client/src/tcp.c
index eee8994425c..b8abce4036b 100644
--- a/samples/net/sockets/echo_client/src/tcp.c
+++ b/samples/net/sockets/echo_client/src/tcp.c
@@ -87,16 +87,16 @@ static int compare_tcp_data(struct data *data, const char *buf, uint32_t receive
 	return 0;
 }
 
-static int start_tcp_proto(struct data *data, struct sockaddr *addr,
-			   socklen_t addrlen)
+static int start_tcp_proto(struct data *data, sa_family_t family,
+			   struct sockaddr *addr, socklen_t addrlen)
 {
 	int optval;
 	int ret;
 
 #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS)
-	data->tcp.sock = socket(addr->sa_family, SOCK_STREAM, IPPROTO_TLS_1_2);
+	data->tcp.sock = socket(family, SOCK_STREAM, IPPROTO_TLS_1_2);
 #else
-	data->tcp.sock = socket(addr->sa_family, SOCK_STREAM, IPPROTO_TCP);
+	data->tcp.sock = socket(family, SOCK_STREAM, IPPROTO_TCP);
 #endif
 	if (data->tcp.sock < 0) {
 		LOG_ERR("Failed to create TCP socket (%s): %d", data->proto,
@@ -108,7 +108,7 @@ static int start_tcp_proto(struct data *data, struct sockaddr *addr,
 		struct sockaddr proxy_addr;
 		socklen_t proxy_addrlen;
 
-		if (addr->sa_family == AF_INET) {
+		if (family == AF_INET) {
 			struct sockaddr_in *proxy4 =
 				(struct sockaddr_in *)&proxy_addr;
 
@@ -117,7 +117,7 @@ static int start_tcp_proto(struct data *data, struct sockaddr *addr,
 			inet_pton(AF_INET, SOCKS5_PROXY_V4_ADDR,
 				  &proxy4->sin_addr);
 			proxy_addrlen = sizeof(struct sockaddr_in);
-		} else if (addr->sa_family == AF_INET6) {
+		} else if (family == AF_INET6) {
 			struct sockaddr_in6 *proxy6 =
 				(struct sockaddr_in6 *)&proxy_addr;
 
@@ -163,7 +163,7 @@ static int start_tcp_proto(struct data *data, struct sockaddr *addr,
 #endif
 
 	/* Prefer IPv6 temporary addresses */
-	if (addr->sa_family == AF_INET6) {
+	if (family == AF_INET6) {
 		optval = IPV6_PREFER_SRC_TMP;
 		(void)setsockopt(data->tcp.sock, IPPROTO_IPV6,
 				 IPV6_ADDR_PREFERENCES,
@@ -242,7 +242,7 @@ int start_tcp(void)
 		inet_pton(AF_INET6, CONFIG_NET_CONFIG_PEER_IPV6_ADDR,
 			  &addr6.sin6_addr);
 
-		ret = start_tcp_proto(&conf.ipv6,
+		ret = start_tcp_proto(&conf.ipv6, AF_INET6,
 				      (struct sockaddr *)&addr6,
 				      sizeof(addr6));
 		if (ret < 0) {
@@ -256,7 +256,8 @@ int start_tcp(void)
 		inet_pton(AF_INET, CONFIG_NET_CONFIG_PEER_IPV4_ADDR,
 			  &addr4.sin_addr);
 
-		ret = start_tcp_proto(&conf.ipv4, (struct sockaddr *)&addr4,
+		ret = start_tcp_proto(&conf.ipv4, AF_INET,
+				      (struct sockaddr *)&addr4,
 				      sizeof(addr4));
 		if (ret < 0) {
 			return ret;
diff --git a/samples/net/sockets/echo_client/src/udp.c b/samples/net/sockets/echo_client/src/udp.c
index 3055c2d03f2..1fe92e88899 100644
--- a/samples/net/sockets/echo_client/src/udp.c
+++ b/samples/net/sockets/echo_client/src/udp.c
@@ -190,16 +190,16 @@ static void wait_transmit(struct k_timer *timer)
 	k_poll_signal_raise(&ctrl->tx_signal, 0);
 }
 
-static int start_udp_proto(struct data *data, struct sockaddr *addr,
-			   socklen_t addrlen)
+static int start_udp_proto(struct data *data, sa_family_t family,
+			   struct sockaddr *addr, socklen_t addrlen)
 {
 	int optval;
 	int ret;
 
 #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS)
-	data->udp.sock = socket(addr->sa_family, SOCK_DGRAM, IPPROTO_DTLS_1_2);
+	data->udp.sock = socket(family, SOCK_DGRAM, IPPROTO_DTLS_1_2);
 #else
-	data->udp.sock = socket(addr->sa_family, SOCK_DGRAM, IPPROTO_UDP);
+	data->udp.sock = socket(family, SOCK_DGRAM, IPPROTO_UDP);
 #endif
 	if (data->udp.sock < 0) {
 		LOG_ERR("Failed to create UDP socket (%s): %d", data->proto,
@@ -233,7 +233,7 @@ static int start_udp_proto(struct data *data, struct sockaddr *addr,
 #endif
 
 	/* Prefer IPv6 temporary addresses */
-	if (addr->sa_family == AF_INET6) {
+	if (family == AF_INET6) {
 		optval = IPV6_PREFER_SRC_TMP;
 		(void)setsockopt(data->udp.sock, IPPROTO_IPV6,
 				 IPV6_ADDR_PREFERENCES,
@@ -312,7 +312,7 @@ int start_udp(void)
 		inet_pton(AF_INET6, CONFIG_NET_CONFIG_PEER_IPV6_ADDR,
 			  &addr6.sin6_addr);
 
-		ret = start_udp_proto(&conf.ipv6,
+		ret = start_udp_proto(&conf.ipv6, AF_INET6,
 				      (struct sockaddr *)&addr6,
 				      sizeof(addr6));
 		if (ret < 0) {
@@ -326,7 +326,8 @@ int start_udp(void)
 		inet_pton(AF_INET, CONFIG_NET_CONFIG_PEER_IPV4_ADDR,
 			  &addr4.sin_addr);
 
-		ret = start_udp_proto(&conf.ipv4, (struct sockaddr *)&addr4,
+		ret = start_udp_proto(&conf.ipv4, AF_INET,
+				      (struct sockaddr *)&addr4,
 				      sizeof(addr4));
 		if (ret < 0) {
 			return ret;

From 5ab06af1a2138221dd44fbc954db5caa3d9d0bab Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 3 Oct 2024 17:34:32 +0200
Subject: [PATCH 0145/2913] [nrf fromtree] samples: net: echo_client: Fix 'Tag
 name should be unique' error

Refactor the code to comply with:
  Violation to rule 5.7 (Tag name should be unique) tag: data

Rename the structure to avoid excessive refactoring.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 7b854d82606665742d612e7c18f0da81e6ae9ded)
(cherry picked from commit ab8cfa0d32cd007fafb1009937290c64e3b9739a)
(cherry picked from commit 55d8fc66215d7116a3736bc7c6ff2d74b8689541)
---
 samples/net/sockets/echo_client/src/common.h |  6 +++---
 samples/net/sockets/echo_client/src/tcp.c    |  8 ++++----
 samples/net/sockets/echo_client/src/udp.c    | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/samples/net/sockets/echo_client/src/common.h b/samples/net/sockets/echo_client/src/common.h
index d7a8b6c69e5..76bbc5604de 100644
--- a/samples/net/sockets/echo_client/src/common.h
+++ b/samples/net/sockets/echo_client/src/common.h
@@ -42,7 +42,7 @@ struct udp_control {
 	struct k_timer rx_timer;
 };
 
-struct data {
+struct sample_data {
 	const char *proto;
 
 	struct {
@@ -62,8 +62,8 @@ struct data {
 };
 
 struct configs {
-	struct data ipv4;
-	struct data ipv6;
+	struct sample_data ipv4;
+	struct sample_data ipv6;
 };
 
 #if !defined(CONFIG_NET_CONFIG_PEER_IPV4_ADDR)
diff --git a/samples/net/sockets/echo_client/src/tcp.c b/samples/net/sockets/echo_client/src/tcp.c
index b8abce4036b..32019849d8f 100644
--- a/samples/net/sockets/echo_client/src/tcp.c
+++ b/samples/net/sockets/echo_client/src/tcp.c
@@ -47,7 +47,7 @@ static ssize_t sendall(int sock, const void *buf, size_t len)
 	return 0;
 }
 
-static int send_tcp_data(struct data *data)
+static int send_tcp_data(struct sample_data *data)
 {
 	int ret;
 
@@ -72,7 +72,7 @@ static int send_tcp_data(struct data *data)
 	return ret;
 }
 
-static int compare_tcp_data(struct data *data, const char *buf, uint32_t received)
+static int compare_tcp_data(struct sample_data *data, const char *buf, uint32_t received)
 {
 	if (data->tcp.received + received > data->tcp.expecting) {
 		LOG_ERR("Too much data received: TCP %s", data->proto);
@@ -87,7 +87,7 @@ static int compare_tcp_data(struct data *data, const char *buf, uint32_t receive
 	return 0;
 }
 
-static int start_tcp_proto(struct data *data, sa_family_t family,
+static int start_tcp_proto(struct sample_data *data, sa_family_t family,
 			   struct sockaddr *addr, socklen_t addrlen)
 {
 	int optval;
@@ -180,7 +180,7 @@ static int start_tcp_proto(struct data *data, sa_family_t family,
 	return ret;
 }
 
-static int process_tcp_proto(struct data *data)
+static int process_tcp_proto(struct sample_data *data)
 {
 	int ret, received;
 	char buf[RECV_BUF_SIZE];
diff --git a/samples/net/sockets/echo_client/src/udp.c b/samples/net/sockets/echo_client/src/udp.c
index 1fe92e88899..49b6c14b8f1 100644
--- a/samples/net/sockets/echo_client/src/udp.c
+++ b/samples/net/sockets/echo_client/src/udp.c
@@ -36,7 +36,7 @@ static struct k_thread udp_tx_thread;
 static struct udp_control udp4_ctrl, udp6_ctrl;
 static struct k_poll_signal udp_kill;
 
-static int send_udp_data(struct data *data);
+static int send_udp_data(struct sample_data *data);
 static void wait_reply(struct k_timer *timer);
 static void wait_transmit(struct k_timer *timer);
 
@@ -136,7 +136,7 @@ void init_udp(void)
 	}
 }
 
-static int send_udp_data(struct data *data)
+static int send_udp_data(struct sample_data *data)
 {
 	int ret;
 
@@ -156,7 +156,7 @@ static int send_udp_data(struct data *data)
 	return ret < 0 ? -EIO : 0;
 }
 
-static int compare_udp_data(struct data *data, const char *buf, uint32_t received)
+static int compare_udp_data(struct sample_data *data, const char *buf, uint32_t received)
 {
 	if (received != data->udp.expecting) {
 		LOG_ERR("Invalid amount of data received: UDP %s", data->proto);
@@ -175,7 +175,7 @@ static void wait_reply(struct k_timer *timer)
 {
 	/* This means that we did not receive response in time. */
 	struct udp_control *ctrl = CONTAINER_OF(timer, struct udp_control, rx_timer);
-	struct data *data = (ctrl == conf.ipv4.udp.ctrl) ? &conf.ipv4 : &conf.ipv6;
+	struct sample_data *data = (ctrl == conf.ipv4.udp.ctrl) ? &conf.ipv4 : &conf.ipv6;
 
 	LOG_ERR("UDP %s: Data packet not received", data->proto);
 
@@ -190,7 +190,7 @@ static void wait_transmit(struct k_timer *timer)
 	k_poll_signal_raise(&ctrl->tx_signal, 0);
 }
 
-static int start_udp_proto(struct data *data, sa_family_t family,
+static int start_udp_proto(struct sample_data *data, sa_family_t family,
 			   struct sockaddr *addr, socklen_t addrlen)
 {
 	int optval;
@@ -251,7 +251,7 @@ static int start_udp_proto(struct data *data, sa_family_t family,
 	return ret;
 }
 
-static int process_udp_proto(struct data *data)
+static int process_udp_proto(struct sample_data *data)
 {
 	int ret, received;
 

From b5c4e13237a99901ee1767bb405b3b6cf2c8f6d2 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 3 Oct 2024 15:52:10 +0200
Subject: [PATCH 0146/2913] [nrf fromtree] net: dns: dispatcher: Don't use
 uninitialized entries

In case CONFIG_DNS_RESOLVER_MAX_SERVERS is larger than the actual number
of DNS servers configured, some server entries may be left
uninitialized. The dispatcher needs to take this into account, otherwise
it may cause memory corruptions.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 5c6b003554215e88fd0f03d02e5ea2cfc7df4410)
(cherry picked from commit d31fa2d735a1ad5bd9457e8a8f165d31cbdd1d15)
(cherry picked from commit 23573bd9a74b9411b6666839964018bfec365665)
---
 subsys/net/lib/dns/dispatcher.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/subsys/net/lib/dns/dispatcher.c b/subsys/net/lib/dns/dispatcher.c
index 08672b78e7a..3adde74cf44 100644
--- a/subsys/net/lib/dns/dispatcher.c
+++ b/subsys/net/lib/dns/dispatcher.c
@@ -240,6 +240,10 @@ int dns_dispatcher_register(struct dns_socket_dispatcher *ctx)
 				goto out;
 			}
 
+			if (ctx->fds[i].fd < 0) {
+				continue;
+			}
+
 			if (dispatch_table[ctx->fds[i].fd].ctx == NULL) {
 				dispatch_table[ctx->fds[i].fd].ctx = ctx;
 			}
@@ -277,6 +281,10 @@ int dns_dispatcher_register(struct dns_socket_dispatcher *ctx)
 			goto out;
 		}
 
+		if (ctx->fds[i].fd < 0) {
+			continue;
+		}
+
 		if (dispatch_table[ctx->fds[i].fd].ctx == NULL) {
 			dispatch_table[ctx->fds[i].fd].ctx = ctx;
 		}

From cd986bcde1f08a35fc2c85ad68b7676277d93e11 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 3 Oct 2024 16:26:11 +0200
Subject: [PATCH 0147/2913] [nrf fromtree] samples: net: telnet: Remove
 redundant code

The sample uses net_config library, so there's no need for the sample to
configure unicast IP addresses manually.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 7d91281caaa587fe6252653808153a1ace32fca0)
(cherry picked from commit 5ac7771589814197f9f57567a7c67fdf553586a6)
(cherry picked from commit c8fb28f5899754e35bcbbf7cabe8395358422df6)
---
 samples/net/telnet/src/telnet.c | 112 +-------------------------------
 1 file changed, 3 insertions(+), 109 deletions(-)

diff --git a/samples/net/telnet/src/telnet.c b/samples/net/telnet/src/telnet.c
index 6ad77c4f7d3..f8df416e39a 100644
--- a/samples/net/telnet/src/telnet.c
+++ b/samples/net/telnet/src/telnet.c
@@ -18,111 +18,13 @@ LOG_MODULE_REGISTER(net_telnet_sample, LOG_LEVEL_DBG);
 
 #include "net_sample_common.h"
 
-#if defined(CONFIG_NET_DHCPV4)
-static struct net_mgmt_event_callback mgmt_cb;
-
-static void ipv4_addr_add_handler(struct net_mgmt_event_callback *cb,
-				  uint32_t mgmt_event,
-				  struct net_if *iface)
-{
-	char hr_addr[NET_IPV4_ADDR_LEN];
-	int i = 0;
-
-	if (mgmt_event != NET_EVENT_IPV4_ADDR_ADD) {
-		/* Spurious callback. */
-		return;
-	}
-
-	for (i = 0; i < NET_IF_MAX_IPV4_ADDR; i++) {
-		struct net_if_addr *if_addr =
-			&iface->config.ip.ipv4->unicast[i];
-
-		if (if_addr->addr_type != NET_ADDR_DHCP || !if_addr->is_used) {
-			continue;
-		}
-
-		LOG_INF("IPv4 address: %s",
-			net_addr_ntop(AF_INET,
-				      &if_addr->address.in_addr,
-				      hr_addr, NET_IPV4_ADDR_LEN));
-		LOG_INF("Lease time: %u seconds",
-			 iface->config.dhcpv4.lease_time);
-		LOG_INF("Subnet: %s",
-			net_addr_ntop(AF_INET,
-				      &iface->config.ip.ipv4->netmask,
-				      hr_addr, NET_IPV4_ADDR_LEN));
-		LOG_INF("Router: %s",
-			net_addr_ntop(AF_INET,
-				      &iface->config.ip.ipv4->gw,
-				      hr_addr, NET_IPV4_ADDR_LEN));
-		break;
-	}
-}
-
-static void setup_dhcpv4(struct net_if *iface)
-{
-	LOG_INF("Running dhcpv4 client...");
-
-	net_mgmt_init_event_callback(&mgmt_cb, ipv4_addr_add_handler,
-				     NET_EVENT_IPV4_ADDR_ADD);
-	net_mgmt_add_event_callback(&mgmt_cb);
-
-	net_dhcpv4_start(iface);
-}
-
-#else
-#define setup_dhcpv4(...)
-#endif /* CONFIG_NET_DHCPV4 */
-
-#if defined(CONFIG_NET_IPV4) && !defined(CONFIG_NET_DHCPV4)
-
-#if !defined(CONFIG_NET_CONFIG_MY_IPV4_ADDR)
-#error "You need to define an IPv4 Address or enable DHCPv4!"
-#endif
-
-static void setup_ipv4(struct net_if *iface)
-{
-	char hr_addr[NET_IPV4_ADDR_LEN];
-	struct in_addr addr;
-
-	if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &addr)) {
-		LOG_ERR("Invalid address: %s", CONFIG_NET_CONFIG_MY_IPV4_ADDR);
-		return;
-	}
-
-	net_if_ipv4_addr_add(iface, &addr, NET_ADDR_MANUAL, 0);
-
-	LOG_INF("IPv4 address: %s",
-		net_addr_ntop(AF_INET, &addr, hr_addr,
-			      NET_IPV4_ADDR_LEN));
-}
-
-#else
-#define setup_ipv4(...)
-#endif /* CONFIG_NET_IPV4 && !CONFIG_NET_DHCPV4 */
-
 #if defined(CONFIG_NET_IPV6)
-
 #define MCAST_IP6ADDR "ff84::2"
 
-#ifndef CONFIG_NET_CONFIG_MY_IPV6_ADDR
-#error "You need to define an IPv6 Address!"
-#endif
-
-static void setup_ipv6(struct net_if *iface)
+static void setup_ipv6(void)
 {
-	char hr_addr[NET_IPV6_ADDR_LEN];
 	struct in6_addr addr;
-
-	if (net_addr_pton(AF_INET6, CONFIG_NET_CONFIG_MY_IPV6_ADDR, &addr)) {
-		LOG_ERR("Invalid address: %s", CONFIG_NET_CONFIG_MY_IPV6_ADDR);
-		return;
-	}
-
-	net_if_ipv6_addr_add(iface, &addr, NET_ADDR_MANUAL, 0);
-
-	LOG_INF("IPv6 address: %s",
-		net_addr_ntop(AF_INET6, &addr, hr_addr, NET_IPV6_ADDR_LEN));
+	struct net_if *iface = net_if_get_default();
 
 	if (net_addr_pton(AF_INET6, MCAST_IP6ADDR, &addr)) {
 		LOG_ERR("Invalid address: %s", MCAST_IP6ADDR);
@@ -131,23 +33,15 @@ static void setup_ipv6(struct net_if *iface)
 
 	net_if_ipv6_maddr_add(iface, &addr);
 }
-
 #else
 #define setup_ipv6(...)
 #endif /* CONFIG_NET_IPV6 */
 
 int main(void)
 {
-	struct net_if *iface = net_if_get_default();
-
 	LOG_INF("Starting Telnet sample");
 
 	wait_for_network();
-
-	setup_ipv4(iface);
-
-	setup_dhcpv4(iface);
-
-	setup_ipv6(iface);
+	setup_ipv6();
 	return 0;
 }

From 1b77c92ddaff3eedc661c54722852cca3e660470 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 3 Oct 2024 18:32:13 +0200
Subject: [PATCH 0148/2913] [nrf fromtree] log: net: Fix build warning with
 IPv6 disabled

Building the net logger backend with IPv4 only gives the following
warning:

log_backend_net.c:116:31: warning: array subscript 'struct sockaddr[0]'
is partly outside array bounds of 'struct sockaddr_in[1]'
[-Warray-bounds] local_addr->sa_family = server_addr.sa_family;

hence assign the address family directly to sockaddr_in/6 structs.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit c6cc87c526224e03d305f2072a5cb91967938715)
(cherry picked from commit a7100a57d53e3a781b58d8139ea5fc159e1d1aca)
(cherry picked from commit e1fe30fd7fb1ab9b33676b56dda59e29d7831893)
---
 subsys/logging/backends/log_backend_net.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/subsys/logging/backends/log_backend_net.c b/subsys/logging/backends/log_backend_net.c
index 3f49e0a4088..f968a6cf4f6 100644
--- a/subsys/logging/backends/log_backend_net.c
+++ b/subsys/logging/backends/log_backend_net.c
@@ -99,12 +99,14 @@ static int do_net_init(struct log_backend_net_ctx *ctx)
 	if (IS_ENABLED(CONFIG_NET_IPV4) && server_addr.sa_family == AF_INET) {
 		local_addr = (struct sockaddr *)&local_addr4;
 		server_addr_len = sizeof(struct sockaddr_in);
+		local_addr4.sin_family = AF_INET;
 		local_addr4.sin_port = 0U;
 	}
 
 	if (IS_ENABLED(CONFIG_NET_IPV6) && server_addr.sa_family == AF_INET6) {
 		local_addr = (struct sockaddr *)&local_addr6;
 		server_addr_len = sizeof(struct sockaddr_in6);
+		local_addr6.sin6_family = AF_INET6;
 		local_addr6.sin6_port = 0U;
 	}
 
@@ -113,8 +115,6 @@ static int do_net_init(struct log_backend_net_ctx *ctx)
 		return -EINVAL;
 	}
 
-	local_addr->sa_family = server_addr.sa_family;
-
 	if (ctx->is_tcp) {
 		proto = IPPROTO_TCP;
 		type = SOCK_STREAM;

From d1d06f97325ffde3cd934c2f02234532aa68af37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Fri, 27 Sep 2024 12:17:46 +0200
Subject: [PATCH 0149/2913] [nrf fromtree] drivers: udc_dwc2: Suspend if
 connected to suspended bus
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Peripherals are required to support the suspend state whenever VBUS
is powered, even if bus reset has not occurred (Mandate: Required,
Effective Date: February, 2010).

Remove the stale suspend check that essentially prevented the device
from hibernating when connected to already suspended bus.

(cherry picked from commit f57e78de2a53f4c9a650b4680bbfccfd1cfb3b15)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit a0e1ea85fd4ed79d9be311676676bb56d08071f6)
(cherry picked from commit e6a32f83e631bea57741fa415905ad2f0ff04ffa)
---
 drivers/usb/udc/udc_dwc2.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 0283b4a1b71..91cbaba8f53 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -2727,11 +2727,6 @@ static void udc_dwc2_isr_handler(const struct device *dev)
 			/* Clear USB Suspend interrupt. */
 			sys_write32(USB_DWC2_GINTSTS_USBSUSP, gintsts_reg);
 
-			if (!priv->enumdone) {
-				/* Ignore stale suspend interrupt */
-				continue;
-			}
-
 			/* Notify the stack */
 			udc_set_suspended(dev, true);
 			udc_submit_event(dev, UDC_EVT_SUSPEND, 0);

From ed7f64c9b689c813486acca99c84d1edf3902656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Mon, 30 Sep 2024 08:54:11 +0200
Subject: [PATCH 0150/2913] [nrf fromtree] drivers: udc_dwc2: Change
 hibernation exit on bus reset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adhere to programming guide steps on Hibernation Exit on Host Initiated
Reset.

(cherry picked from commit 508bd3edef06c43e1eb525062ff0474d87a5e91e)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 975bdb90fcf8eeecd2e03937f5768e3004e13bef)
(cherry picked from commit 57d8ad4fcf5ab1aeef2c5c94e7905cd846969f03)
---
 drivers/usb/udc/udc_dwc2.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 91cbaba8f53..917910ad26d 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -904,7 +904,7 @@ static void dwc2_backup_registers(const struct device *dev)
 }
 
 static void dwc2_restore_essential_registers(const struct device *dev,
-					     bool rwup)
+					     bool rwup, bool bus_reset)
 {
 	const struct udc_dwc2_config *const config = dev->config;
 	struct usb_dwc2_reg *const base = config->base;
@@ -925,6 +925,10 @@ static void dwc2_restore_essential_registers(const struct device *dev,
 	sys_write32(backup->gusbcfg, (mem_addr_t)&base->gusbcfg);
 	sys_write32(backup->dcfg, (mem_addr_t)&base->dcfg);
 
+	if (bus_reset) {
+		sys_write32(backup->dcfg, (mem_addr_t)&base->dcfg);
+	}
+
 	if (!rwup) {
 		pcgcctl |= USB_DWC2_PCGCCTL_RESTOREMODE | USB_DWC2_PCGCCTL_RSTPDWNMODULE;
 	}
@@ -1026,7 +1030,8 @@ static void dwc2_enter_hibernation(const struct device *dev)
 	LOG_DBG("Hibernated");
 }
 
-static void dwc2_exit_hibernation(const struct device *dev, bool rwup)
+static void dwc2_exit_hibernation(const struct device *dev,
+				  bool rwup, bool bus_reset)
 {
 	const struct udc_dwc2_config *const config = dev->config;
 	struct usb_dwc2_reg *const base = config->base;
@@ -1066,13 +1071,15 @@ static void dwc2_exit_hibernation(const struct device *dev, bool rwup)
 	/* Disable PMU interrupt */
 	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUINTSEL);
 
-	dwc2_restore_essential_registers(dev, rwup);
+	dwc2_restore_essential_registers(dev, rwup, bus_reset);
 
 	/* Note: in Remote Wakeup case 15 ms max signaling time starts now */
 
 	/* Wait for Restore Done Interrupt */
 	dwc2_wait_for_bit(dev, (mem_addr_t)&base->gintsts, USB_DWC2_GINTSTS_RSTRDONEINT);
-	sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
+	if (!bus_reset) {
+		sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
+	}
 
 	/* Disable restore from PMU */
 	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_RESTORE);
@@ -2027,7 +2034,7 @@ static int udc_dwc2_disable(const struct device *dev)
 	config->irq_disable_func(dev);
 
 	if (priv->hibernated) {
-		dwc2_exit_hibernation(dev, false);
+		dwc2_exit_hibernation(dev, false, true);
 		priv->hibernated = 0;
 	}
 
@@ -2744,7 +2751,7 @@ static void dwc2_handle_hibernation_exit(const struct device *dev,
 	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
 
-	dwc2_exit_hibernation(dev, rwup);
+	dwc2_exit_hibernation(dev, rwup, bus_reset);
 	dwc2_restore_device_registers(dev, rwup);
 
 	priv->hibernated = 0;

From 38b4e79d9ac76c6c74c7944b119850ada052b93c Mon Sep 17 00:00:00 2001
From: Jordan Yates <jordan@embeint.com>
Date: Mon, 1 Apr 2024 15:42:36 +1000
Subject: [PATCH 0151/2913] [nrf fromtree] uart: update meaning of
 `uart_irq_tx_ready` return code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update the documented value range that `uart_irq_tx_ready` returns in
order to provide more information to the callers about the number of
bytes that could be writted with `uart_fifo_fill` without fragmentation.

Signed-off-by: Jordan Yates <jordan@embeint.com>
(cherry picked from commit 5bd53b6e2ecce7581300499dc9b8c01510d0eb27)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit df64ceea2f557115575a41faeb30def0c3ac50d2)
(cherry picked from commit be5fd934791573ee426ba77dc75b48eff1b6b582)
---
 doc/releases/migration-guide-4.0.rst |  4 ++++
 include/zephyr/drivers/uart.h        | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/doc/releases/migration-guide-4.0.rst b/doc/releases/migration-guide-4.0.rst
index f8a47907859..3699a7fedcb 100644
--- a/doc/releases/migration-guide-4.0.rst
+++ b/doc/releases/migration-guide-4.0.rst
@@ -153,6 +153,10 @@ Sensors
 Serial
 ======
 
+ * Users of :c:func:`uart_irq_tx_ready` now need to check for ``ret > 0`` to ensure that the FIFO
+   can accept data bytes, instead of ``ret == 1``. The function now returns a lower bound on the
+   number of bytes that can be provided to :c:func:`uart_fifo_fill` without truncation.
+
 Regulator
 =========
 
diff --git a/include/zephyr/drivers/uart.h b/include/zephyr/drivers/uart.h
index 845949ea964..7d56a78b056 100644
--- a/include/zephyr/drivers/uart.h
+++ b/include/zephyr/drivers/uart.h
@@ -902,9 +902,9 @@ static inline void z_impl_uart_irq_tx_disable(const struct device *dev)
 }
 
 /**
- * @brief Check if UART TX buffer can accept a new char
+ * @brief Check if UART TX buffer can accept bytes
  *
- * @details Check if UART TX buffer can accept at least one character
+ * @details Check if UART TX buffer can accept more bytes
  * for transmission (i.e. uart_fifo_fill() will succeed and return
  * non-zero). This function must be called in a UART interrupt
  * handler, or its result is undefined. Before calling this function
@@ -913,9 +913,11 @@ static inline void z_impl_uart_irq_tx_disable(const struct device *dev)
  *
  * @param dev UART device instance.
  *
- * @retval 1 If TX interrupt is enabled and at least one char can be
- *           written to UART.
  * @retval 0 If device is not ready to write a new byte.
+ * @retval >0 Minimum number of bytes that can be written in a single call to
+ *            @ref uart_fifo_fill. It may be possible to write more bytes, but
+ *            the actual number written must be checked in the return code from
+ *            @ref uart_fifo_fill.
  * @retval -ENOSYS If this function is not implemented.
  * @retval -ENOTSUP If API is not enabled.
  */

From 14559ece2402c6c709530e1fe3aedf6f24441bd4 Mon Sep 17 00:00:00 2001
From: Jordan Yates <jordan@embeint.com>
Date: Mon, 1 Apr 2024 15:45:39 +1000
Subject: [PATCH 0152/2913] [nrf fromtree] serial/usb: update `struct ring_buf`
 users
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update the interrupt driver UART drivers that use `struct ring_buf`
internally to report the number of bytes that can be pushed in
`uart_fifo_fill` without fragmentation.

Signed-off-by: Jordan Yates <jordan@embeint.com>
(cherry picked from commit 81352d011f14a01c803d20661bddd2086aa572c7)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 4f3834be3f9976e3aaeb1a58b82dab3ed0cc34ef)
(cherry picked from commit 3f7b227d6a1e835d65aaac0fc97e2f8a2482d324)
---
 drivers/serial/serial_test.c                | 6 +++---
 drivers/serial/uart_emul.c                  | 6 +++---
 subsys/usb/device/class/cdc_acm.c           | 2 +-
 subsys/usb/device_next/class/usbd_cdc_acm.c | 4 +---
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/serial/serial_test.c b/drivers/serial/serial_test.c
index b1bb46228be..f04f5eee702 100644
--- a/drivers/serial/serial_test.c
+++ b/drivers/serial/serial_test.c
@@ -130,10 +130,10 @@ static void irq_tx_disable(const struct device *dev)
 static int irq_tx_ready(const struct device *dev)
 {
 	struct serial_vnd_data *data = dev->data;
-	bool ready = (ring_buf_space_get(data->written) != 0);
+	int available = ring_buf_space_get(data->written);
 
-	LOG_DBG("tx ready: %d", ready);
-	return ready;
+	LOG_DBG("tx ready: %d", available);
+	return available;
 }
 
 static void irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb,
diff --git a/drivers/serial/uart_emul.c b/drivers/serial/uart_emul.c
index f0207377737..a00f10486b1 100644
--- a/drivers/serial/uart_emul.c
+++ b/drivers/serial/uart_emul.c
@@ -231,7 +231,7 @@ static int uart_emul_fifo_read(const struct device *dev, uint8_t *rx_data, int s
 
 static int uart_emul_irq_tx_ready(const struct device *dev)
 {
-	bool ready = false;
+	int available = 0;
 	struct uart_emul_data *data = dev->data;
 
 	K_SPINLOCK(&data->tx_lock) {
@@ -239,10 +239,10 @@ static int uart_emul_irq_tx_ready(const struct device *dev)
 			K_SPINLOCK_BREAK;
 		}
 
-		ready = ring_buf_space_get(data->tx_rb) > 0;
+		available = ring_buf_space_get(data->tx_rb);
 	}
 
-	return ready;
+	return available;
 }
 
 static int uart_emul_irq_rx_ready(const struct device *dev)
diff --git a/subsys/usb/device/class/cdc_acm.c b/subsys/usb/device/class/cdc_acm.c
index 130e571b0f6..5cc73f7bae9 100644
--- a/subsys/usb/device/class/cdc_acm.c
+++ b/subsys/usb/device/class/cdc_acm.c
@@ -622,7 +622,7 @@ static int cdc_acm_irq_tx_ready(const struct device *dev)
 	struct cdc_acm_dev_data_t * const dev_data = dev->data;
 
 	if (dev_data->tx_irq_ena && dev_data->tx_ready) {
-		return 1;
+		return ring_buf_space_get(dev_data->tx_ringbuf);
 	}
 
 	return 0;
diff --git a/subsys/usb/device_next/class/usbd_cdc_acm.c b/subsys/usb/device_next/class/usbd_cdc_acm.c
index eb0abb803ce..acb17ed446f 100644
--- a/subsys/usb/device_next/class/usbd_cdc_acm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_acm.c
@@ -707,9 +707,7 @@ static int cdc_acm_irq_tx_ready(const struct device *dev)
 	struct cdc_acm_uart_data *const data = dev->data;
 
 	if (check_wq_ctx(dev)) {
-		if (ring_buf_space_get(data->tx_fifo.rb)) {
-			return 1;
-		}
+		return ring_buf_space_get(data->tx_fifo.rb);
 	} else {
 		LOG_WRN("Invoked by inappropriate context");
 		__ASSERT_NO_MSG(false);

From 52f9d7771e0f6724121dfd06c594cf1d97ea8192 Mon Sep 17 00:00:00 2001
From: Jordan Yates <jordan@embeint.com>
Date: Mon, 1 Apr 2024 15:53:50 +1000
Subject: [PATCH 0153/2913] [nrf fromtree] serial: async_to_irq: update
 `tx_ready` return
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The async IRQ shim supports writes of any size up to the TX buffer size.

Signed-off-by: Jordan Yates <jordan@embeint.com>
(cherry picked from commit 3e5c72a0ee212418eb12f93afbe5e30a4585e2c5)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit b7ca85ab52b10aeb98fc28f6d7a2089b3cc96b70)
(cherry picked from commit 634a8c74d894cff8172165309c764114d2203cb6)
---
 drivers/serial/uart_async_to_irq.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/serial/uart_async_to_irq.c b/drivers/serial/uart_async_to_irq.c
index 897ff50fcb5..b67dd6505aa 100644
--- a/drivers/serial/uart_async_to_irq.c
+++ b/drivers/serial/uart_async_to_irq.c
@@ -263,8 +263,10 @@ void z_uart_async_to_irq_irq_tx_disable(const struct device *dev)
 int z_uart_async_to_irq_irq_tx_ready(const struct device *dev)
 {
 	struct uart_async_to_irq_data *data = get_data(dev);
+	bool ready = (data->flags & A2I_TX_IRQ_ENABLED) && !(data->flags & A2I_TX_BUSY);
 
-	return (data->flags & A2I_TX_IRQ_ENABLED) && !(data->flags & A2I_TX_BUSY);
+	/* async API handles arbitrary sizes */
+	return ready ? data->tx.len : 0;
 }
 
 /** Interrupt driven receiver enabling function */

From 6f66b837a5e940b45236644023222e7fd55bfb97 Mon Sep 17 00:00:00 2001
From: Jordan Yates <jordan@embeint.com>
Date: Mon, 1 Apr 2024 15:56:21 +1000
Subject: [PATCH 0154/2913] [nrf fromtree] serial: uart_nrfx_*: update
 `tx_ready` return codes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update nrfx drivers with the minimum number of bytes that can be sent
in a single call to `uart_fifo_fill`.

Signed-off-by: Jordan Yates <jordan@embeint.com>
(cherry picked from commit 0425b04fc317aa7a222d7f66af8c2df9b064f8b2)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 2f5817ae06eed9622901bf10f0e8f7f0069cccaa)
(cherry picked from commit 178c75edad20e94c4461a8c5323e98d9e3bd568a)
---
 drivers/serial/uart_nrfx_uart.c  | 9 +++++----
 drivers/serial/uart_nrfx_uarte.c | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uart.c b/drivers/serial/uart_nrfx_uart.c
index 25dab17ea74..9fa634fe01f 100644
--- a/drivers/serial/uart_nrfx_uart.c
+++ b/drivers/serial/uart_nrfx_uart.c
@@ -878,10 +878,11 @@ static int uart_nrfx_irq_tx_ready_complete(const struct device *dev)
 	 * called after the TX interrupt is requested to be disabled but before
 	 * the disabling is actually performed (in the IRQ handler).
 	 */
-	return nrf_uart_int_enable_check(uart0_addr,
-					 NRF_UART_INT_MASK_TXDRDY) &&
-	       !disable_tx_irq &&
-	       event_txdrdy_check();
+	bool ready = nrf_uart_int_enable_check(uart0_addr,
+					       NRF_UART_INT_MASK_TXDRDY) &&
+		     !disable_tx_irq &&
+		     event_txdrdy_check();
+	return ready ? 1 : 0;
 }
 
 /** Interrupt driven receiver ready function */
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 97edddbf278..00225464f37 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -1646,7 +1646,7 @@ static int uarte_nrfx_irq_tx_ready_complete(const struct device *dev)
 		data->int_driven->fifo_fill_lock = 0;
 	}
 
-	return ready;
+	return ready ? data->int_driven->tx_buff_size : 0;
 }
 
 static int uarte_nrfx_irq_rx_ready(const struct device *dev)

From 0f18858011a0ea2f5a9f4a869757695bc6bd8ae9 Mon Sep 17 00:00:00 2001
From: Johann Fischer <johann.fischer@nordicsemi.no>
Date: Thu, 4 Jul 2024 12:26:13 +0200
Subject: [PATCH 0155/2913] [nrf fromtree] doc: usb: move "Built-in functions"
 down  and increase the heading
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move "Built-in functions" section down and increase the heading.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit fc0437c0b806f3ffb02fc840048d5288a55e4aeb)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit c295ee83fef5b594c1d962479646118d63df5f03)
(cherry picked from commit 2087a465c6d99fff8c6eec349709c77980e92abc)
---
 .../usb/device_next/usb_device.rst            | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/doc/connectivity/usb/device_next/usb_device.rst b/doc/connectivity/usb/device_next/usb_device.rst
index 1213c85fb51..ea6eb69324c 100644
--- a/doc/connectivity/usb/device_next/usb_device.rst
+++ b/doc/connectivity/usb/device_next/usb_device.rst
@@ -23,31 +23,6 @@ classes and provides an API to implement custom USB functions.
 The new USB device support is considered experimental and will replace
 :ref:`usb_device_stack`.
 
-Built-in functions
-==================
-
-The USB device stack has built-in USB functions. Some can be used directly in
-the user application through a special API, such as HID or Audio class devices,
-while others use a general Zephyr RTOS driver API, such as MSC and CDC class
-implementations. The *Identification string* identifies a class or function
-instance (``n``) and is used as an argument to the :c:func:`usbd_register_class`.
-
-+-----------------------------------+-------------------------+-------------------------+
-| Class or function                 | User API (if any)       | Identification string   |
-+===================================+=========================+=========================+
-| USB Audio 2 class                 | :ref:`uac2_device`      | :samp:`uac2_{n}`        |
-+-----------------------------------+-------------------------+-------------------------+
-| USB CDC ACM class                 | :ref:`uart_api`         | :samp:`cdc_acm_{n}`     |
-+-----------------------------------+-------------------------+-------------------------+
-| USB CDC ECM class                 | Ethernet device         | :samp:`cdc_ecm_{n}`     |
-+-----------------------------------+-------------------------+-------------------------+
-| USB Mass Storage Class (MSC)      | :ref:`usbd_msc_device`  | :samp:`msc_{n}`         |
-+-----------------------------------+-------------------------+-------------------------+
-| USB Human Interface Devices (HID) | :ref:`usbd_hid_device`  | :samp:`hid_{n}`         |
-+-----------------------------------+-------------------------+-------------------------+
-| Bluetooth HCI USB transport layer | :ref:`bt_hci_raw`       | :samp:`bt_hci_{n}`      |
-+-----------------------------------+-------------------------+-------------------------+
-
 Samples
 =======
 
@@ -223,3 +198,28 @@ for this capability.
    :dedent:
    :start-after: doc device msg-cb start
    :end-before: doc device msg-cb end
+
+Built-in functions
+******************
+
+The USB device stack has built-in USB functions. Some can be used directly in
+the user application through a special API, such as HID or Audio class devices,
+while others use a general Zephyr RTOS driver API, such as MSC and CDC class
+implementations. The *Identification string* identifies a class or function
+instance (``n``) and is used as an argument to the :c:func:`usbd_register_class`.
+
++-----------------------------------+-------------------------+-------------------------+
+| Class or function                 | User API (if any)       | Identification string   |
++===================================+=========================+=========================+
+| USB Audio 2 class                 | :ref:`uac2_device`      | :samp:`uac2_{n}`        |
++-----------------------------------+-------------------------+-------------------------+
+| USB CDC ACM class                 | :ref:`uart_api`         | :samp:`cdc_acm_{n}`     |
++-----------------------------------+-------------------------+-------------------------+
+| USB CDC ECM class                 | Ethernet device         | :samp:`cdc_ecm_{n}`     |
++-----------------------------------+-------------------------+-------------------------+
+| USB Mass Storage Class (MSC)      | :ref:`usbd_msc_device`  | :samp:`msc_{n}`         |
++-----------------------------------+-------------------------+-------------------------+
+| USB Human Interface Devices (HID) | :ref:`usbd_hid_device`  | :samp:`hid_{n}`         |
++-----------------------------------+-------------------------+-------------------------+
+| Bluetooth HCI USB transport layer | :ref:`bt_hci_raw`       | :samp:`bt_hci_{n}`      |
++-----------------------------------+-------------------------+-------------------------+

From e827f9ad147821874bfdb7801336ee1d8a6b518a Mon Sep 17 00:00:00 2001
From: Johann Fischer <johann.fischer@nordicsemi.no>
Date: Thu, 4 Jul 2024 12:32:47 +0200
Subject: [PATCH 0156/2913] [nrf fromtree] usb: device_next: align CDC ACM UART
 with Interrupt-driven UART API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Align CDC ACM UART with Interrupt-driven UART API behavior description.
Use the same flags in uart_irq_rx_ready(), uart_irq_tx_ready(), and
uart_irq_is_pending(), which are updated after each uart_irq_update()
call. Allow TX FIFO to be filled if there is space.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit 64ee885950434e086c067891790ae8c579656c6a)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 3523a1fb4131f7501d25c17170f7c7572e3e28e5)
(cherry picked from commit 987022f1f668f75aacbbe856f119e52b0eba8fdf)
---
 subsys/usb/device_next/class/usbd_cdc_acm.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/subsys/usb/device_next/class/usbd_cdc_acm.c b/subsys/usb/device_next/class/usbd_cdc_acm.c
index acb17ed446f..83735e202a6 100644
--- a/subsys/usb/device_next/class/usbd_cdc_acm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_acm.c
@@ -269,7 +269,7 @@ static void usbd_cdc_acm_enable(struct usbd_class_data *const c_data)
 	}
 
 	if (atomic_test_bit(&data->state, CDC_ACM_IRQ_TX_ENABLED)) {
-		if (ring_buf_is_empty(data->tx_fifo.rb)) {
+		if (ring_buf_space_get(data->tx_fifo.rb)) {
 			/* Raise TX ready interrupt */
 			cdc_acm_work_submit(&data->irq_cb_work);
 		} else {
@@ -613,7 +613,7 @@ static void cdc_acm_irq_tx_enable(const struct device *dev)
 
 	atomic_set_bit(&data->state, CDC_ACM_IRQ_TX_ENABLED);
 
-	if (ring_buf_is_empty(data->tx_fifo.rb)) {
+	if (ring_buf_space_get(data->tx_fifo.rb)) {
 		LOG_INF("tx_en: trigger irq_cb_work");
 		cdc_acm_work_submit(&data->irq_cb_work);
 	}
@@ -707,7 +707,9 @@ static int cdc_acm_irq_tx_ready(const struct device *dev)
 	struct cdc_acm_uart_data *const data = dev->data;
 
 	if (check_wq_ctx(dev)) {
-		return ring_buf_space_get(data->tx_fifo.rb);
+		if (data->tx_fifo.irq) {
+			return ring_buf_space_get(data->tx_fifo.rb);
+		}
 	} else {
 		LOG_WRN("Invoked by inappropriate context");
 		__ASSERT_NO_MSG(false);
@@ -721,7 +723,7 @@ static int cdc_acm_irq_rx_ready(const struct device *dev)
 	struct cdc_acm_uart_data *const data = dev->data;
 
 	if (check_wq_ctx(dev)) {
-		if (!ring_buf_is_empty(data->rx_fifo.rb)) {
+		if (data->rx_fifo.irq) {
 			return 1;
 		}
 	} else {
@@ -767,7 +769,7 @@ static int cdc_acm_irq_update(const struct device *dev)
 	}
 
 	if (atomic_test_bit(&data->state, CDC_ACM_IRQ_TX_ENABLED) &&
-	    ring_buf_is_empty(data->tx_fifo.rb)) {
+	    ring_buf_space_get(data->tx_fifo.rb)) {
 		data->tx_fifo.irq = true;
 	} else {
 		data->tx_fifo.irq = false;
@@ -834,7 +836,7 @@ static void cdc_acm_irq_cb_handler(struct k_work *work)
 	}
 
 	if (atomic_test_bit(&data->state, CDC_ACM_IRQ_TX_ENABLED) &&
-	    ring_buf_is_empty(data->tx_fifo.rb)) {
+	    ring_buf_space_get(data->tx_fifo.rb)) {
 		LOG_DBG("tx irq pending, submit irq_cb_work");
 		cdc_acm_work_submit(&data->irq_cb_work);
 	}

From 55236602c6973f11f7cbdc1c56bccd70cdd2cea9 Mon Sep 17 00:00:00 2001
From: Johann Fischer <johann.fischer@nordicsemi.no>
Date: Thu, 4 Jul 2024 12:47:06 +0200
Subject: [PATCH 0157/2913] [nrf fromtree] doc: usb: describe CDC ACM virtual
 UART IRQ API behavior
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In general, it mirrors what is described in Interrupt-driven API
documentation, but here a little more explicitly and with a simplified
example, so that we can finally chisel it into the stone.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit 1867e71df26f23c8897a998e7f8945b04f1bbdf5)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit bb4e213c83688dcecc343fe383252b875ed1dfcc)
(cherry picked from commit 7e08e7379307235176f2e588f6d8d38d3728b4f2)
---
 .../usb/device_next/usb_device.rst            | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/doc/connectivity/usb/device_next/usb_device.rst b/doc/connectivity/usb/device_next/usb_device.rst
index ea6eb69324c..d658c75180a 100644
--- a/doc/connectivity/usb/device_next/usb_device.rst
+++ b/doc/connectivity/usb/device_next/usb_device.rst
@@ -223,3 +223,62 @@ instance (``n``) and is used as an argument to the :c:func:`usbd_register_class`
 +-----------------------------------+-------------------------+-------------------------+
 | Bluetooth HCI USB transport layer | :ref:`bt_hci_raw`       | :samp:`bt_hci_{n}`      |
 +-----------------------------------+-------------------------+-------------------------+
+
+CDC ACM UART
+============
+
+CDC ACM implements a virtual UART controller and provides Interrupt-driven UART
+API and Polling UART API.
+
+Interrupt-driven UART API
+-------------------------
+
+Internally the implementation uses two ringbuffers, these take over the
+function of the TX/RX FIFOs (TX/RX buffers) from the :ref:`uart_interrupt_api`.
+
+As described in the :ref:`uart_interrupt_api`, the functions
+:c:func:`uart_irq_update()`, :c:func:`uart_irq_is_pending`,
+:c:func:`uart_irq_rx_ready()`, :c:func:`uart_irq_tx_ready()`
+:c:func:`uart_fifo_read()`, and :c:func:`uart_fifo_fill()`
+should be called from the interrupt handler, see
+:c:func:`uart_irq_callback_user_data_set()`. To prevent undefined behaviour,
+the implementation of these functions checks in what context they are called
+and fails if it is not an interrupt handler.
+
+Also, as described in the UART API, :c:func:`uart_irq_is_pending`
+:c:func:`uart_irq_rx_ready()`, and :c:func:`uart_irq_tx_ready()`
+can only be called after :c:func:`uart_irq_update()`.
+
+Simplified, the interrupt handler should look something like:
+
+.. code-block:: c
+
+   static void interrupt_handler(const struct device *dev, void *user_data)
+   {
+      while (uart_irq_update(dev) && uart_irq_is_pending(dev)) {
+         if (uart_irq_rx_ready(dev)) {
+            int len;
+            int n;
+
+            /* ... */
+            n = uart_fifo_read(dev, buffer, len);
+            /* ... */
+         }
+
+         if (uart_irq_tx_ready(dev)) {
+            int len;
+            int n;
+
+            /* ... */
+            n = uart_fifo_fill(dev, buffer, len);
+           /* ... */
+         }
+   }
+
+All these functions are not directly dependent on the status of the USB device.
+Filling the TX FIFO does not mean that data is being sent to the host. And
+successfully reading the RX FIFO does not mean that the device is still
+connected to the host. If there is space in the TX FIFO, and the TX interrupt
+is enabled, :c:func:`uart_irq_tx_ready()` will succeed. If there is data in the
+RX FIFO, and the RX interrupt is enabled, :c:func:`uart_irq_rx_ready()` will
+succeed. Function :c:func:`uart_irq_tx_complete()` is not implemented yet.

From eb97a970c70308acc98444f3c64de2aa160c66a8 Mon Sep 17 00:00:00 2001
From: Johann Fischer <johann.fischer@nordicsemi.no>
Date: Fri, 5 Jul 2024 11:52:24 +0200
Subject: [PATCH 0158/2913] [nrf fromtree] usb: device_next: align CDC ACM UART
 poll_out with legacy implementation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Apply changes in commit c152e0980cf6
("usb: device: cdc_acm: block in uart_poll_out() routine")
to the new CDC ACM UART poll_out implementation.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit 6cf27758d3dca90464779438f9dbb31d578118b7)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 42e19b6e7e17e7731c25d39edcfec19c1af8e854)
(cherry picked from commit f7796b08118735fd883656bb7a0204f6ef09d222)
---
 subsys/usb/device_next/class/usbd_cdc_acm.c | 52 ++++++++++++---------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/subsys/usb/device_next/class/usbd_cdc_acm.c b/subsys/usb/device_next/class/usbd_cdc_acm.c
index 83735e202a6..36154e16313 100644
--- a/subsys/usb/device_next/class/usbd_cdc_acm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_acm.c
@@ -105,6 +105,10 @@ struct cdc_acm_uart_data {
 	struct k_work irq_cb_work;
 	struct cdc_acm_uart_fifo rx_fifo;
 	struct cdc_acm_uart_fifo tx_fifo;
+	/* When flow_ctrl is set, poll out is blocked when the buffer is full,
+	 * roughly emulating flow control.
+	 */
+	bool flow_ctrl;
 	/* USBD CDC ACM TX fifo work */
 	struct k_work tx_fifo_work;
 	/* USBD CDC ACM RX fifo work */
@@ -373,7 +377,8 @@ static void cdc_acm_update_uart_cfg(struct cdc_acm_uart_data *const data)
 		break;
 	};
 
-	cfg->flow_ctrl = UART_CFG_FLOW_CTRL_NONE;
+	cfg->flow_ctrl = data->flow_ctrl ? UART_CFG_FLOW_CTRL_RTS_CTS :
+					   UART_CFG_FLOW_CTRL_NONE;
 }
 
 static void cdc_acm_update_linestate(struct cdc_acm_uart_data *const data)
@@ -884,24 +889,27 @@ static int cdc_acm_poll_in(const struct device *dev, unsigned char *const c)
 static void cdc_acm_poll_out(const struct device *dev, const unsigned char c)
 {
 	struct cdc_acm_uart_data *const data = dev->data;
+	uint32_t wrote;
 
 	if (atomic_test_and_set_bit(&data->state, CDC_ACM_LOCK)) {
 		LOG_ERR("IRQ callback is used");
 		return;
 	}
 
-	if (ring_buf_put(data->tx_fifo.rb, &c, 1)) {
-		goto poll_out_exit;
-	}
+	while (true) {
+		wrote = ring_buf_put(data->tx_fifo.rb, &c, 1);
+		if (wrote == 1) {
+			break;
+		}
 
-	LOG_DBG("Ring buffer full, drain buffer");
-	if (!ring_buf_get(data->tx_fifo.rb, NULL, 1) ||
-	    !ring_buf_put(data->tx_fifo.rb, &c, 1)) {
-		LOG_ERR("Failed to drain buffer");
-		__ASSERT_NO_MSG(false);
+		if (k_is_in_isr() || !data->flow_ctrl) {
+			LOG_WRN_ONCE("Ring buffer full, discard data");
+			break;
+		}
+
+		k_msleep(1);
 	}
 
-poll_out_exit:
 	atomic_clear_bit(&data->state, CDC_ACM_LOCK);
 	cdc_acm_work_submit(&data->tx_fifo_work);
 }
@@ -976,17 +984,18 @@ static int cdc_acm_line_ctrl_get(const struct device *dev,
 static int cdc_acm_configure(const struct device *dev,
 			     const struct uart_config *const cfg)
 {
-	ARG_UNUSED(dev);
-	ARG_UNUSED(cfg);
-	/*
-	 * We cannot implement configure API because there is
-	 * no notification of configuration changes provided
-	 * for the Abstract Control Model and the UART controller
-	 * is only emulated.
-	 * However, it allows us to use CDC ACM UART together with
-	 * subsystems like Modbus which require configure API for
-	 * real controllers.
-	 */
+	struct cdc_acm_uart_data *const data = dev->data;
+
+	switch (cfg->flow_ctrl) {
+	case UART_CFG_FLOW_CTRL_NONE:
+		data->flow_ctrl = false;
+		break;
+	case UART_CFG_FLOW_CTRL_RTS_CTS:
+		data->flow_ctrl = true;
+		break;
+	default:
+		return -ENOTSUP;
+	}
 
 	return 0;
 }
@@ -1240,6 +1249,7 @@ const static struct usb_desc_header *cdc_acm_hs_desc_##n[] = {			\
 		.c_data = &cdc_acm_##n,						\
 		.rx_fifo.rb = &cdc_acm_rb_rx_##n,				\
 		.tx_fifo.rb = &cdc_acm_rb_tx_##n,				\
+		.flow_ctrl = DT_INST_PROP(n, hw_flow_control),			\
 		.notif_sem = Z_SEM_INITIALIZER(uart_data_##n.notif_sem, 0, 1),	\
 		.desc = &cdc_acm_desc_##n,					\
 		.fs_desc = cdc_acm_fs_desc_##n,					\

From e824e3bb66c811ff53958fd84c90c12d6fffa543 Mon Sep 17 00:00:00 2001
From: Johann Fischer <johann.fischer@nordicsemi.no>
Date: Fri, 5 Jul 2024 13:41:46 +0200
Subject: [PATCH 0159/2913] [nrf fromtree] usb: device_next: allow fifo_fill
 and poll_out be used simultaneously
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As it is still accepted practice, allow fifo_fill and poll_out to be
used simultaneously. The lock around fifo_fill was already in place.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit ef89321160d092644ed9efa5e30f2ff92ce809a2)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit d6257f6eb03528eb5d1fc8db8a410e6b4ed6acaa)
(cherry picked from commit a654ab5602488c2ba467ee3b8671cb74feb29818)
---
 subsys/usb/device_next/class/usbd_cdc_acm.c | 39 ++++-----------------
 1 file changed, 6 insertions(+), 33 deletions(-)

diff --git a/subsys/usb/device_next/class/usbd_cdc_acm.c b/subsys/usb/device_next/class/usbd_cdc_acm.c
index 36154e16313..e67b27ad037 100644
--- a/subsys/usb/device_next/class/usbd_cdc_acm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_acm.c
@@ -47,7 +47,6 @@ UDC_BUF_POOL_DEFINE(cdc_acm_ep_pool,
 #define CDC_ACM_IRQ_RX_ENABLED		2
 #define CDC_ACM_IRQ_TX_ENABLED		3
 #define CDC_ACM_RX_FIFO_BUSY		4
-#define CDC_ACM_LOCK			5
 
 static struct k_work_q cdc_acm_work_q;
 static K_KERNEL_STACK_DEFINE(cdc_acm_stack,
@@ -540,15 +539,10 @@ static void cdc_acm_tx_fifo_handler(struct k_work *work)
 		return;
 	}
 
-	if (atomic_test_and_set_bit(&data->state, CDC_ACM_LOCK)) {
-		cdc_acm_work_submit(&data->tx_fifo_work);
-		return;
-	}
-
 	buf = cdc_acm_buf_alloc(cdc_acm_get_bulk_in(c_data));
 	if (buf == NULL) {
 		cdc_acm_work_submit(&data->tx_fifo_work);
-		goto tx_fifo_handler_exit;
+		return;
 	}
 
 	len = ring_buf_get(data->tx_fifo.rb, buf->data, buf->size);
@@ -559,9 +553,6 @@ static void cdc_acm_tx_fifo_handler(struct k_work *work)
 		LOG_ERR("Failed to enqueue");
 		net_buf_unref(buf);
 	}
-
-tx_fifo_handler_exit:
-	atomic_clear_bit(&data->state, CDC_ACM_LOCK);
 }
 
 /*
@@ -808,12 +799,6 @@ static void cdc_acm_irq_cb_handler(struct k_work *work)
 		return;
 	}
 
-	if (atomic_test_and_set_bit(&data->state, CDC_ACM_LOCK)) {
-		LOG_ERR("Polling is in progress");
-		cdc_acm_work_submit(&data->irq_cb_work);
-		return;
-	}
-
 	data->tx_fifo.altered = false;
 	data->rx_fifo.altered = false;
 	data->rx_fifo.irq = false;
@@ -845,8 +830,6 @@ static void cdc_acm_irq_cb_handler(struct k_work *work)
 		LOG_DBG("tx irq pending, submit irq_cb_work");
 		cdc_acm_work_submit(&data->irq_cb_work);
 	}
-
-	atomic_clear_bit(&data->state, CDC_ACM_LOCK);
 }
 
 static void cdc_acm_irq_callback_set(const struct device *dev,
@@ -865,13 +848,8 @@ static int cdc_acm_poll_in(const struct device *dev, unsigned char *const c)
 	uint32_t len;
 	int ret = -1;
 
-	if (atomic_test_and_set_bit(&data->state, CDC_ACM_LOCK)) {
-		LOG_ERR("IRQ callback is used");
-		return -1;
-	}
-
 	if (ring_buf_is_empty(data->rx_fifo.rb)) {
-		goto poll_in_exit;
+		return ret;
 	}
 
 	len = ring_buf_get(data->rx_fifo.rb, c, 1);
@@ -880,24 +858,20 @@ static int cdc_acm_poll_in(const struct device *dev, unsigned char *const c)
 		ret = 0;
 	}
 
-poll_in_exit:
-	atomic_clear_bit(&data->state, CDC_ACM_LOCK);
-
 	return ret;
 }
 
 static void cdc_acm_poll_out(const struct device *dev, const unsigned char c)
 {
 	struct cdc_acm_uart_data *const data = dev->data;
+	unsigned int lock;
 	uint32_t wrote;
 
-	if (atomic_test_and_set_bit(&data->state, CDC_ACM_LOCK)) {
-		LOG_ERR("IRQ callback is used");
-		return;
-	}
-
 	while (true) {
+		lock = irq_lock();
 		wrote = ring_buf_put(data->tx_fifo.rb, &c, 1);
+		irq_unlock(lock);
+
 		if (wrote == 1) {
 			break;
 		}
@@ -910,7 +884,6 @@ static void cdc_acm_poll_out(const struct device *dev, const unsigned char c)
 		k_msleep(1);
 	}
 
-	atomic_clear_bit(&data->state, CDC_ACM_LOCK);
 	cdc_acm_work_submit(&data->tx_fifo_work);
 }
 

From ca795aa72d7165613118b69aa38c114cad90f436 Mon Sep 17 00:00:00 2001
From: Johann Fischer <johann.fischer@nordicsemi.no>
Date: Fri, 5 Jul 2024 13:49:25 +0200
Subject: [PATCH 0160/2913] [nrf fromtree] doc: usb: add note about CDC ACM
 virtual UART polling API behavior
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add note about CDC ACM virtual UART polling API behavior.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit ece1f51c5b10842680303515a2795125375c7123)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit c25c7d0562176b55e7bfe6df2f11abc4dd7611bb)
(cherry picked from commit c08dc7df4e5613b93b5da4554fab9a4855069612)
---
 doc/connectivity/usb/device_next/usb_device.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/connectivity/usb/device_next/usb_device.rst b/doc/connectivity/usb/device_next/usb_device.rst
index d658c75180a..7e7762997a0 100644
--- a/doc/connectivity/usb/device_next/usb_device.rst
+++ b/doc/connectivity/usb/device_next/usb_device.rst
@@ -282,3 +282,10 @@ connected to the host. If there is space in the TX FIFO, and the TX interrupt
 is enabled, :c:func:`uart_irq_tx_ready()` will succeed. If there is data in the
 RX FIFO, and the RX interrupt is enabled, :c:func:`uart_irq_rx_ready()` will
 succeed. Function :c:func:`uart_irq_tx_complete()` is not implemented yet.
+
+Polling UART API
+----------------
+
+The CDC ACM poll out implementation follows :ref:`uart_polling_api` and
+blocks when the TX FIFO is full only if the hw-flow-control property is enabled
+and called from a non-ISR context.

From 2a864794f5067e04c5886fc4c706348f66a2495d Mon Sep 17 00:00:00 2001
From: Johann Fischer <johann.fischer@nordicsemi.no>
Date: Mon, 9 Sep 2024 17:01:08 +0200
Subject: [PATCH 0161/2913] [nrf fromtree] usb: device_next: limit CDC ACM OUT
 transfer size to the current MPS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When the controller is connected to a full speed bus, regardless of
whether the controller supports high speed or not, the transfer size for
the bulk OUT endpoint should be equal to the MPS in the current
configuration.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit 4875aa392443cf2dca5426fcc7123b84bf3258ee)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit e1a46e16a691afb611711b47efab8470578257fd)
(cherry picked from commit aa8f87723d0f3fbdbc03231fd2b3b5c3dd287d65)
---
 subsys/usb/device_next/class/usbd_cdc_acm.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/subsys/usb/device_next/class/usbd_cdc_acm.c b/subsys/usb/device_next/class/usbd_cdc_acm.c
index e67b27ad037..1d683fa3cc4 100644
--- a/subsys/usb/device_next/class/usbd_cdc_acm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_acm.c
@@ -596,6 +596,9 @@ static void cdc_acm_rx_fifo_handler(struct k_work *work)
 		return;
 	}
 
+	/* Shrink the buffer size if operating on a full speed bus */
+	buf->size = MIN(cdc_acm_get_bulk_mps(c_data), buf->size);
+
 	ret = usbd_ep_enqueue(c_data, buf);
 	if (ret) {
 		LOG_ERR("Failed to enqueue net_buf for 0x%02x", ep);

From 0eff7178460de727baf47aa826a5f9486ef86a93 Mon Sep 17 00:00:00 2001
From: Johann Fischer <johann.fischer@nordicsemi.no>
Date: Mon, 9 Sep 2024 13:23:50 +0200
Subject: [PATCH 0162/2913] [nrf fromtree] usb: device_next: use delayable work
 for TX FIFO in CDC ACM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use delayable work to reduce CPU load when there is no transfer flow in
the host direction. This also improves the performance of poll out, as
introduced in commit commit fed6bde78852
("usb: device: cdc_acm: send more than 1 byte in poll out")
for the legacy CDC ACM implementation.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit fe4d8a678c56127b8e74830da4f8035c394d832c)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 7fcabe91c3b60321cf7365859467cff773ee145a)
(cherry picked from commit 274e2471255342e259f429e339bcf43657c86a21)
---
 subsys/usb/device_next/class/usbd_cdc_acm.c | 25 +++++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/subsys/usb/device_next/class/usbd_cdc_acm.c b/subsys/usb/device_next/class/usbd_cdc_acm.c
index 1d683fa3cc4..80f4a858386 100644
--- a/subsys/usb/device_next/class/usbd_cdc_acm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_acm.c
@@ -109,7 +109,7 @@ struct cdc_acm_uart_data {
 	 */
 	bool flow_ctrl;
 	/* USBD CDC ACM TX fifo work */
-	struct k_work tx_fifo_work;
+	struct k_work_delayable tx_fifo_work;
 	/* USBD CDC ACM RX fifo work */
 	struct k_work rx_fifo_work;
 	atomic_t state;
@@ -140,6 +140,12 @@ static ALWAYS_INLINE int cdc_acm_work_submit(struct k_work *work)
 	return k_work_submit_to_queue(&cdc_acm_work_q, work);
 }
 
+static ALWAYS_INLINE int cdc_acm_work_schedule(struct k_work_delayable *work,
+					       k_timeout_t delay)
+{
+	return k_work_schedule_for_queue(&cdc_acm_work_q, work, delay);
+}
+
 static ALWAYS_INLINE bool check_wq_ctx(const struct device *dev)
 {
 	return k_current_get() == k_work_queue_thread_get(&cdc_acm_work_q);
@@ -277,7 +283,7 @@ static void usbd_cdc_acm_enable(struct usbd_class_data *const c_data)
 			cdc_acm_work_submit(&data->irq_cb_work);
 		} else {
 			/* Queue pending TX data on IN endpoint */
-			cdc_acm_work_submit(&data->tx_fifo_work);
+			cdc_acm_work_schedule(&data->tx_fifo_work, K_NO_WAIT);
 		}
 	}
 }
@@ -520,13 +526,14 @@ static int cdc_acm_send_notification(const struct device *dev,
  */
 static void cdc_acm_tx_fifo_handler(struct k_work *work)
 {
+	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
 	struct cdc_acm_uart_data *data;
 	struct usbd_class_data *c_data;
 	struct net_buf *buf;
 	size_t len;
 	int ret;
 
-	data = CONTAINER_OF(work, struct cdc_acm_uart_data, tx_fifo_work);
+	data = CONTAINER_OF(dwork, struct cdc_acm_uart_data, tx_fifo_work);
 	c_data = data->c_data;
 
 	if (!atomic_test_bit(&data->state, CDC_ACM_CLASS_ENABLED)) {
@@ -541,7 +548,7 @@ static void cdc_acm_tx_fifo_handler(struct k_work *work)
 
 	buf = cdc_acm_buf_alloc(cdc_acm_get_bulk_in(c_data));
 	if (buf == NULL) {
-		cdc_acm_work_submit(&data->tx_fifo_work);
+		cdc_acm_work_schedule(&data->tx_fifo_work, K_MSEC(1));
 		return;
 	}
 
@@ -819,7 +826,7 @@ static void cdc_acm_irq_cb_handler(struct k_work *work)
 
 	if (data->tx_fifo.altered) {
 		LOG_DBG("tx fifo altered, submit work");
-		cdc_acm_work_submit(&data->tx_fifo_work);
+		cdc_acm_work_schedule(&data->tx_fifo_work, K_NO_WAIT);
 	}
 
 	if (atomic_test_bit(&data->state, CDC_ACM_IRQ_RX_ENABLED) &&
@@ -887,7 +894,11 @@ static void cdc_acm_poll_out(const struct device *dev, const unsigned char c)
 		k_msleep(1);
 	}
 
-	cdc_acm_work_submit(&data->tx_fifo_work);
+	/* Schedule with minimal timeout to make it possible to send more than
+	 * one byte per USB transfer. The latency increase is negligible while
+	 * the increased throughput and reduced CPU usage is easily observable.
+	 */
+	cdc_acm_work_schedule(&data->tx_fifo_work, K_MSEC(1));
 }
 
 #ifdef CONFIG_UART_LINE_CTRL
@@ -1006,7 +1017,7 @@ static int usbd_cdc_acm_preinit(const struct device *dev)
 
 	k_thread_name_set(&cdc_acm_work_q.thread, "cdc_acm_work_q");
 
-	k_work_init(&data->tx_fifo_work, cdc_acm_tx_fifo_handler);
+	k_work_init_delayable(&data->tx_fifo_work, cdc_acm_tx_fifo_handler);
 	k_work_init(&data->rx_fifo_work, cdc_acm_rx_fifo_handler);
 	k_work_init(&data->irq_cb_work, cdc_acm_irq_cb_handler);
 

From fb127b2cdc4d0fc6ed53089dee0cdb9579d68fd4 Mon Sep 17 00:00:00 2001
From: Benedek Kupper <kupper.benedek@gmail.com>
Date: Fri, 4 Oct 2024 09:03:50 +0200
Subject: [PATCH 0163/2913] [nrf fromtree] usb: device_next: USB reset clears
 remote wakeup permission
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Verbatim from USB 2.0 specification:
The Remote Wakeup field indicates whether the device is currently enabled
to request remote wakeup. The default mode for devices that support
remote wakeup is disabled. If D1 is reset to zero, the ability of the
device to signal remote wakeup is disabled. If D1 is set to one,
the ability of the device to signal remote wakeup is enabled.
The Remote Wakeup field can be modified by the SetFeature() and
ClearFeature() requests using the DEVICE_REMOTE_WAKEUP feature selector.
This field is reset to zero when the device is reset.

Signed-off-by: Benedek Kupper <kupper.benedek@gmail.com>
(cherry picked from commit a6b911f1952c226eeb8099e2e657f4f19ec3c41a)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit fb6c746e88e11a1db66efe93f049bcf91a72fe6a)
(cherry picked from commit a0c63fc49870567fb67e04ec7546867d996d3fb5)
---
 subsys/usb/device_next/usbd_core.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/subsys/usb/device_next/usbd_core.c b/subsys/usb/device_next/usbd_core.c
index e6f1cf1faee..2502357bf8c 100644
--- a/subsys/usb/device_next/usbd_core.c
+++ b/subsys/usb/device_next/usbd_core.c
@@ -127,6 +127,8 @@ static int event_handler_bus_reset(struct usbd_context *const uds_ctx)
 
 	uds_ctx->ch9_data.state = USBD_STATE_DEFAULT;
 
+	uds_ctx->status.rwup = false;
+
 	return 0;
 }
 

From 0cd71d808f8a34d09e1d4efc95ea6c1af9218829 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Tue, 15 Oct 2024 13:34:09 +0200
Subject: [PATCH 0164/2913] [nrf fromtree] manifest: Update nRF hw models to
 latest

Update the HW models module to:
eeed2591d38e5e9bf89658df67555f2777249fc0

eeed259 RADIO: Do not warn about TASK_RSSISTART during RXIDLE
565220e 54L15.mk: Fix flipper hal target name
bb8c6fd Makefile: Let's install libraries by default
6dbb843 RADIO: Implement immediate RSSI measurement when needed
3a5d567 RADIO: Allow triggering TASK_RSSISTART from register writes

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit fb010719ed5a1682bc946dd2153ef964b87ff2cc)
(cherry picked from commit 4365d55c8a2eaca06cb62abd0dd2f9b9de77a823)
(cherry picked from commit f4bb8a49f5a4dd6c7079324c4dec5d4fd47e7075)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 78533e8b51f..1265f9cca33 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: bf8e45bd1f870e49cc15392e045c28d54ea12285
+      revision: eeed2591d38e5e9bf89658df67555f2777249fc0
       path: modules/bsim_hw_models/nrf_hw_models
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719

From 5a4fc1954fe8811660acbd98decd324781b816af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Katarzyna=20Gi=C4=85d=C5=82a?=
 <katarzyna.giadla@nordicsemi.no>
Date: Tue, 10 Sep 2024 15:50:40 +0200
Subject: [PATCH 0165/2913] [nrf fromtree] samples: tests: Add support to tests
 on nrf54l15 DK
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Align all existing samples/tests/applications which
contains nrf54l15pdk/nrf54l15/* by adding
nrf54l15dk/nrf54l15/* to enable twister builds.

Signed-off-by: Katarzyna Giądła <katarzyna.giadla@nordicsemi.no>
Signed-off-by: Grzegorz Chwierut <grzegorz.chwierut@nordicsemi.no>
(cherry picked from commit 436d1bf6288de0c6a85fa233b59e1c64f422ee04)
(cherry picked from commit 7f012e94eea84aa268c8ae3b20a261a4824eb1df)
(cherry picked from commit c9f8893599a36575b6588e364c8d1f8c92e1840f)
---
 samples/bluetooth/beacon/sample.yaml          |  3 +-
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |  5 +-
 .../nrf54l15dk_nrf54l15_cpuapp_df.overlay     | 33 ++++++++++++
 samples/bluetooth/hci_uart/sample.yaml        | 11 ++++
 samples/bluetooth/peripheral_hr/sample.yaml   |  3 +-
 ...15dk_nrf54l15_cpuapp_retained_mem.overlay} |  0
 samples/boards/nordic/system_off/sample.yaml  |  6 +--
 ...lay => nrf54l15dk_nrf54l15_cpuapp.overlay} |  0
 samples/drivers/adc/adc_dt/sample.yaml        |  2 +-
 ...lay => nrf54l15dk_nrf54l15_cpuapp.overlay} |  0
 samples/drivers/adc/adc_sequence/sample.yaml  |  2 +-
 .../nrf54l15dk_nrf54l15_cpuflpr_xip.overlay   | 24 +++++++++
 samples/drivers/mbox/sample.yaml              |  9 ++--
 ...lay => nrf54l15dk_nrf54l15_cpuapp.overlay} |  0
 samples/sensor/qdec/sample.yaml               |  4 +-
 .../boards/nrf54l15dk_nrf54l15_cpuapp.conf    | 12 +++++
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 45 ++++++++++++++++
 samples/subsys/fs/fs_sample/sample.yaml       |  3 ++
 samples/subsys/fs/littlefs/sample.yaml        |  1 +
 .../ipc/ipc_service/icmsg/CMakeLists.txt      |  1 +
 .../ipc/ipc_service/icmsg/Kconfig.sysbuild    |  1 +
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 41 ++++++++++++++
 .../nrf54l15dk_nrf54l15_cpuflpr.overlay       | 41 ++++++++++++++
 .../subsys/ipc/ipc_service/icmsg/sample.yaml  | 12 ++---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.conf    |  2 +
 samples/subsys/settings/sample.yaml           |  1 +
 samples/sysbuild/hello_world/sample.yaml      |  9 ++++
 .../sysbuild/nrf54l15dk_nrf54l15_cpuflpr.conf |  1 +
 ...p.conf => nrf54l15dk_nrf54l15_cpuapp.conf} |  0
 ...lay => nrf54l15dk_nrf54l15_cpuapp.overlay} |  3 +-
 tests/boards/nrf/i2c/i2c_slave/testcase.yaml  |  4 +-
 ...lay => nrf54l15dk_nrf54l15_cpuapp.overlay} |  0
 ...ay => nrf54l15dk_nrf54l15_cpuflpr.overlay} |  0
 tests/boards/nrf/qdec/testcase.yaml           |  8 +--
 tests/boot/with_mcumgr/testcase.yaml          |  1 +
 .../clock_control_api/testcase.yaml           |  4 +-
 .../nrf_clock_calibration/testcase.yaml       |  2 +-
 .../nrf_lf_clock_start/testcase.yaml          | 18 +++----
 .../drivers/clock_control/onoff/testcase.yaml |  2 +-
 tests/drivers/flash/common/testcase.yaml      |  2 +-
 tests/drivers/flash/negative_tests/prj.conf   |  1 +
 .../flash/negative_tests/testcase.yaml        |  2 +-
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 23 ++++++++
 .../drivers/mbox/mbox_error_cases/sample.yaml |  3 +-
 ...lay => nrf54l15dk_nrf54l15_cpuapp.overlay} |  0
 tests/drivers/retained_mem/api/testcase.yaml  |  2 +-
 ...lay => nrf54l15dk_nrf54l15_cpuapp.overlay} |  0
 .../spi_controller_peripheral/testcase.yaml   |  6 +--
 ...lay => nrf54l15dk_nrf54l15_cpuapp.overlay} |  0
 .../drivers/spi/spi_error_cases/testcase.yaml |  2 +-
 ...lay => nrf54l15dk_nrf54l15_cpuapp.overlay} |  0
 .../timer/nrf_grtc_timer/testcase.yaml        |  4 +-
 ...lay => nrf54l15dk_nrf54l15_cpuapp.overlay} |  0
 ...54l15dk_nrf54l15_cpuapp_dual_uart.overlay} |  0
 ...ay => nrf54l15dk_nrf54l15_cpuflpr.overlay} |  0
 ...4l15dk_nrf54l15_cpuflpr_dual_uart.overlay} |  0
 .../uart/uart_elementary/testcase.yaml        | 20 +++----
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 54 +++++++++++++++++++
 tests/drivers/uart/uart_errors/testcase.yaml  |  4 +-
 ...lay => nrf54l15dk_nrf54l15_cpuapp.overlay} |  0
 .../uart/uart_mix_fifo_poll/testcase.yaml     |  8 +--
 ...lay => nrf54l15dk_nrf54l15_cpuapp.overlay} |  0
 tests/drivers/uart/uart_pm/testcase.yaml      | 10 ++--
 .../nrf54l15pdk_nrf54l15_cpuflpr.overlay      |  8 ---
 .../nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay  |  8 ---
 .../nrf54l15dk_nrf54l15_cpuapp.overlay}       |  0
 .../watchdog/wdt_error_cases/testcase.yaml    |  4 +-
 tests/subsys/fs/fcb/testcase.yaml             |  1 +
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 22 ++++++++
 tests/subsys/fs/littlefs/testcase.yaml        |  2 +-
 .../storage/stream/stream_flash/testcase.yaml |  1 +
 71 files changed, 412 insertions(+), 89 deletions(-)
 rename tests/drivers/watchdog/wdt_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay => samples/bluetooth/hci_uart/boards/nrf54l15dk_nrf54l15_cpuapp.overlay (56%)
 create mode 100644 samples/bluetooth/hci_uart/boards/nrf54l15dk_nrf54l15_cpuapp_df.overlay
 rename samples/boards/nordic/system_off/boards/{nrf54l15pdk_nrf54l15_cpuapp_retained_mem.overlay => nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay} (100%)
 rename samples/drivers/adc/adc_dt/boards/{nrf54l15pdk_nrf54l15_cpuapp.overlay => nrf54l15dk_nrf54l15_cpuapp.overlay} (100%)
 rename samples/drivers/adc/adc_sequence/boards/{nrf54l15pdk_nrf54l15_cpuapp.overlay => nrf54l15dk_nrf54l15_cpuapp.overlay} (100%)
 create mode 100644 samples/drivers/mbox/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay
 rename samples/sensor/qdec/boards/{nrf54l15pdk_nrf54l15_cpuapp.overlay => nrf54l15dk_nrf54l15_cpuapp.overlay} (100%)
 create mode 100644 samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.conf
 create mode 100644 samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 create mode 100644 samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 create mode 100644 samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
 create mode 100644 samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf
 create mode 100644 samples/sysbuild/hello_world/sysbuild/nrf54l15dk_nrf54l15_cpuflpr.conf
 rename tests/boards/nrf/i2c/i2c_slave/boards/{nrf54l15pdk_nrf54l15_cpuapp.conf => nrf54l15dk_nrf54l15_cpuapp.conf} (100%)
 rename tests/boards/nrf/i2c/i2c_slave/boards/{nrf54l15pdk_nrf54l15_cpuapp.overlay => nrf54l15dk_nrf54l15_cpuapp.overlay} (95%)
 rename tests/boards/nrf/qdec/boards/{nrf54l15pdk_nrf54l15_cpuapp.overlay => nrf54l15dk_nrf54l15_cpuapp.overlay} (100%)
 rename tests/boards/nrf/qdec/boards/{nrf54l15pdk_nrf54l15_cpuflpr.overlay => nrf54l15dk_nrf54l15_cpuflpr.overlay} (100%)
 create mode 100644 tests/drivers/mbox/mbox_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 rename tests/drivers/retained_mem/api/boards/{nrf54l15pdk_nrf54l15_cpuapp.overlay => nrf54l15dk_nrf54l15_cpuapp.overlay} (100%)
 rename tests/drivers/spi/spi_controller_peripheral/boards/{nrf54l15pdk_nrf54l15_cpuapp.overlay => nrf54l15dk_nrf54l15_cpuapp.overlay} (100%)
 rename tests/drivers/spi/spi_error_cases/boards/{nrf54l15pdk_nrf54l15_cpuapp.overlay => nrf54l15dk_nrf54l15_cpuapp.overlay} (100%)
 rename tests/drivers/spi/spi_loopback/boards/{nrf54l15pdk_nrf54l15_cpuapp.overlay => nrf54l15dk_nrf54l15_cpuapp.overlay} (100%)
 rename tests/drivers/uart/uart_elementary/boards/{nrf54l15pdk_nrf54l15_cpuapp.overlay => nrf54l15dk_nrf54l15_cpuapp.overlay} (100%)
 rename tests/drivers/uart/uart_elementary/boards/{nrf54l15pdk_nrf54l15_cpuapp_dual_uart.overlay => nrf54l15dk_nrf54l15_cpuapp_dual_uart.overlay} (100%)
 rename tests/drivers/uart/uart_elementary/boards/{nrf54l15pdk_nrf54l15_cpuflpr.overlay => nrf54l15dk_nrf54l15_cpuflpr.overlay} (100%)
 rename tests/drivers/uart/uart_elementary/boards/{nrf54l15pdk_nrf54l15_cpuflpr_dual_uart.overlay => nrf54l15dk_nrf54l15_cpuflpr_dual_uart.overlay} (100%)
 create mode 100644 tests/drivers/uart/uart_errors/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 rename tests/drivers/uart/uart_mix_fifo_poll/boards/{nrf54l15pdk_nrf54l15_cpuapp.overlay => nrf54l15dk_nrf54l15_cpuapp.overlay} (100%)
 rename tests/drivers/uart/uart_pm/boards/{nrf54l15pdk_nrf54l15_cpuapp.overlay => nrf54l15dk_nrf54l15_cpuapp.overlay} (100%)
 delete mode 100644 tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
 delete mode 100644 tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
 rename tests/drivers/watchdog/{wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay => wdt_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay} (100%)
 create mode 100644 tests/subsys/fs/littlefs/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/samples/bluetooth/beacon/sample.yaml b/samples/bluetooth/beacon/sample.yaml
index d76a16eb566..6952be223ec 100644
--- a/samples/bluetooth/beacon/sample.yaml
+++ b/samples/bluetooth/beacon/sample.yaml
@@ -8,13 +8,14 @@ tests:
       - qemu_x86
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
     tags: bluetooth
     integration_platforms:
       - qemu_cortex_m3
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
   sample.bluetooth.beacon-coex:
     extra_args: CONF_FILE="prj-coex.conf"
     harness: bluetooth
diff --git a/tests/drivers/watchdog/wdt_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/bluetooth/hci_uart/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
similarity index 56%
rename from tests/drivers/watchdog/wdt_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
rename to samples/bluetooth/hci_uart/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 8d3dce3b380..7613ab836ba 100644
--- a/tests/drivers/watchdog/wdt_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ b/samples/bluetooth/hci_uart/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-&wdt31 {
+&uart20 {
+	compatible = "nordic,nrf-uarte";
+	current-speed = <1000000>;
 	status = "okay";
+	hw-flow-control;
 };
diff --git a/samples/bluetooth/hci_uart/boards/nrf54l15dk_nrf54l15_cpuapp_df.overlay b/samples/bluetooth/hci_uart/boards/nrf54l15dk_nrf54l15_cpuapp_df.overlay
new file mode 100644
index 00000000000..470bfdaa8c5
--- /dev/null
+++ b/samples/bluetooth/hci_uart/boards/nrf54l15dk_nrf54l15_cpuapp_df.overlay
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&uart20 {
+	compatible = "nordic,nrf-uarte";
+	current-speed = <1000000>;
+	status = "okay";
+	hw-flow-control;
+};
+
+&radio {
+	status = "okay";
+	/* This is an example number of antennas that may be available
+	 * on antenna matrix board.
+	 */
+	dfe-antenna-num = <10>;
+	/* This is an example switch pattern that will be used to set an
+	 * antenna for Tx PDU (period before start of Tx CTE).
+	 */
+	dfe-pdu-antenna = <0x0>;
+
+	/* These are example GPIO pin numbers that are provided to
+	 * Radio peripheral. The pins will be acquired by Radio to
+	 * drive antenna switching when AoD is enabled.
+	 */
+	dfegpio0-gpios = <&gpio1 4 0>;
+	dfegpio1-gpios = <&gpio1 5 0>;
+	dfegpio2-gpios = <&gpio1 6 0>;
+	dfegpio3-gpios = <&gpio1 7 0>;
+};
diff --git a/samples/bluetooth/hci_uart/sample.yaml b/samples/bluetooth/hci_uart/sample.yaml
index 96a3b446add..6c87e6edede 100644
--- a/samples/bluetooth/hci_uart/sample.yaml
+++ b/samples/bluetooth/hci_uart/sample.yaml
@@ -59,6 +59,17 @@ tests:
       - uart
       - bluetooth
   sample.bluetooth.hci_uart.nrf54l15.all:
+    harness: bluetooth
+    platform_allow: nrf54l15dk/nrf54l15/cpuapp
+    integration_platforms:
+      - nrf54l15dk/nrf54l15/cpuapp
+    extra_args:
+      - OVERLAY_CONFIG=overlay-all-bt_ll_sw_split.conf
+      - DTC_OVERLAY_FILE=./boards/nrf54l15dk_nrf54l15_cpuapp_df.overlay
+    tags:
+      - uart
+      - bluetooth
+  sample.bluetooth.hci_uart.nrf54l15pdk.all:
     harness: bluetooth
     platform_allow: nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
diff --git a/samples/bluetooth/peripheral_hr/sample.yaml b/samples/bluetooth/peripheral_hr/sample.yaml
index 6a4f2edead0..c0af932a3ea 100644
--- a/samples/bluetooth/peripheral_hr/sample.yaml
+++ b/samples/bluetooth/peripheral_hr/sample.yaml
@@ -13,6 +13,7 @@ tests:
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - qemu_cortex_m3
@@ -22,7 +23,7 @@ tests:
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     tags: bluetooth
   sample.bluetooth.peripheral_hr.minimal:
     harness: bluetooth
diff --git a/samples/boards/nordic/system_off/boards/nrf54l15pdk_nrf54l15_cpuapp_retained_mem.overlay b/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay
similarity index 100%
rename from samples/boards/nordic/system_off/boards/nrf54l15pdk_nrf54l15_cpuapp_retained_mem.overlay
rename to samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay
diff --git a/samples/boards/nordic/system_off/sample.yaml b/samples/boards/nordic/system_off/sample.yaml
index da000dc3188..0503867b191 100644
--- a/samples/boards/nordic/system_off/sample.yaml
+++ b/samples/boards/nordic/system_off/sample.yaml
@@ -8,7 +8,7 @@ tests:
     integration_platforms:
       - nrf52840dk/nrf52840
     platform_allow:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
@@ -22,10 +22,10 @@ tests:
     extra_configs:
       - CONFIG_APP_USE_NRF_RETENTION=y
   sample.boards.nrf.system_off.retained_mem:
-    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_retained_mem.overlay"
+    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay"
     build_only: true
     platform_allow:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     extra_configs:
       - CONFIG_APP_USE_RETAINED_MEM=y
       - CONFIG_RETAINED_MEM=y
diff --git a/samples/drivers/adc/adc_dt/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/drivers/adc/adc_dt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from samples/drivers/adc/adc_dt/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
rename to samples/drivers/adc/adc_dt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/samples/drivers/adc/adc_dt/sample.yaml b/samples/drivers/adc/adc_dt/sample.yaml
index d7a9487d89d..7957f01f70a 100644
--- a/samples/drivers/adc/adc_dt/sample.yaml
+++ b/samples/drivers/adc/adc_dt/sample.yaml
@@ -15,7 +15,7 @@ tests:
       - stm32h735g_disco
       - nrf51dk/nrf51822
       - nrf52840dk/nrf52840
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - mec172xevb_assy6906
       - gd32f350r_eval
diff --git a/samples/drivers/adc/adc_sequence/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/drivers/adc/adc_sequence/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from samples/drivers/adc/adc_sequence/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
rename to samples/drivers/adc/adc_sequence/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/samples/drivers/adc/adc_sequence/sample.yaml b/samples/drivers/adc/adc_sequence/sample.yaml
index 639a41dfff0..1516184a50d 100644
--- a/samples/drivers/adc/adc_sequence/sample.yaml
+++ b/samples/drivers/adc/adc_sequence/sample.yaml
@@ -9,7 +9,7 @@ tests:
       - cy8cproto_063_ble
       - cy8cproto_062_4343w
       - nrf52840dk/nrf52840
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - ucans32k1sic
     integration_platforms:
diff --git a/samples/drivers/mbox/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay b/samples/drivers/mbox/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay
new file mode 100644
index 00000000000..e2bf5bbe06c
--- /dev/null
+++ b/samples/drivers/mbox/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&cpuflpr_vevif_rx 21>, <&cpuflpr_vevif_tx 20>;
+		mbox-names = "rx", "tx";
+	};
+};
+
+&cpuflpr_vevif_rx {
+	status = "okay";
+};
+
+&cpuflpr_vevif_tx {
+	status = "okay";
+};
+
+&uart30 {
+	/delete-property/ hw-flow-control;
+};
diff --git a/samples/drivers/mbox/sample.yaml b/samples/drivers/mbox/sample.yaml
index 637027e0551..40664dac736 100644
--- a/samples/drivers/mbox/sample.yaml
+++ b/samples/drivers/mbox/sample.yaml
@@ -85,9 +85,10 @@ tests:
 
   sample.drivers.mbox.nrf54l15:
     platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     extra_args:
       mbox_SNIPPET=nordic-flpr
     sysbuild: true
@@ -101,9 +102,10 @@ tests:
 
   sample.drivers.mbox.nrf54l15_no_multithreading:
     platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     extra_args:
       mbox_SNIPPET=nordic-flpr
       mbox_CONFIG_MULTITHREADING=n
@@ -119,9 +121,10 @@ tests:
 
   sample.drivers.mbox.nrf54l15_remote_no_multithreading:
     platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     extra_args:
       mbox_SNIPPET=nordic-flpr
       remote_CONFIG_MULTITHREADING=n
diff --git a/samples/sensor/qdec/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/sensor/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from samples/sensor/qdec/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
rename to samples/sensor/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/samples/sensor/qdec/sample.yaml b/samples/sensor/qdec/sample.yaml
index 0100a19cfa6..d4d685c43fb 100644
--- a/samples/sensor/qdec/sample.yaml
+++ b/samples/sensor/qdec/sample.yaml
@@ -41,12 +41,12 @@ tests:
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
     integration_platforms:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
     harness_config:
       fixture: gpio_loopback
diff --git a/samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.conf
new file mode 100644
index 00000000000..949237fd4ba
--- /dev/null
+++ b/samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_DISK_DRIVERS=y
+CONFIG_DISK_DRIVER_FLASH=y
+# There may be no files on internal SoC flash, so this Kconfig
+# options has ben enabled to create some if listing does not
+# find in the first place.
+CONFIG_FS_SAMPLE_CREATE_SOME_ENTRIES=y
diff --git a/samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..391afea75a4
--- /dev/null
+++ b/samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Because FAT FS needs at least 64kiB partition and default
+ * storage_partition is 36kiB for this board, we need to reorganize
+ * partitions to get at least 64KiB.
+ */
+/delete-node/ &slot0_partition;
+/delete-node/ &slot1_partition;
+/delete-node/ &slot0_ns_partition;
+/delete-node/ &slot1_ns_partition;
+/delete-node/ &storage_partition;
+
+&cpuapp_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		slot0_partition: parition@10000 {
+			reg = <0x00010000 DT_SIZE_K(300)>;
+		};
+		slot1_partition: partition@5b000 {
+			reg = <0x0005b000 DT_SIZE_K(300)>;
+		};
+
+		storage_partition: partition@a6000 {
+			label = "storage";
+			reg = <0x000a6000 DT_SIZE_K(128)>;
+		};
+	};
+};
+
+/ {
+	msc_disk0 {
+		status="okay";
+		compatible = "zephyr,flash-disk";
+		partition = <&storage_partition>;
+		disk-name = "SD";
+		cache-size = <512>;
+	};
+};
diff --git a/samples/subsys/fs/fs_sample/sample.yaml b/samples/subsys/fs/fs_sample/sample.yaml
index 83895f21529..d54960c7589 100644
--- a/samples/subsys/fs/fs_sample/sample.yaml
+++ b/samples/subsys/fs/fs_sample/sample.yaml
@@ -58,6 +58,9 @@ tests:
   sample.filesystem.fat_fs.nrf54l15pdk:
     build_only: true
     platform_allow: nrf54l15pdk/nrf54l15/cpuapp
+  sample.filesystem.fat_fs.nrf54l15dk:
+    build_only: true
+    platform_allow: nrf54l15dk/nrf54l15/cpuapp
   sample.filesystem.fat_fs.nrf52840dk_nrf52840.qspi:
     build_only: true
     platform_allow: nrf52840dk/nrf52840
diff --git a/samples/subsys/fs/littlefs/sample.yaml b/samples/subsys/fs/littlefs/sample.yaml
index 4a92d6e339c..2d78141c9db 100644
--- a/samples/subsys/fs/littlefs/sample.yaml
+++ b/samples/subsys/fs/littlefs/sample.yaml
@@ -24,6 +24,7 @@ tests:
       - stm32f746g_disco
       - stm32h747i_disco/stm32h747xx/m7
       - stm32h750b_dk
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
       - frdm_ke17z
       - frdm_ke17z512
diff --git a/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt b/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt
index e9e246b02fa..21d9bafeab0 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt
+++ b/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt
@@ -11,6 +11,7 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 if(NOT CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP AND
     NOT CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUAPP AND
     NOT CONFIG_BOARD_STM32H747I_DISCO AND
+    NOT CONFIG_BOARD_NRF54L15DK_NRF54L15_CPUAPP AND
     NOT CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUAPP)
   message(FATAL_ERROR "${BOARD} is not supported for this sample")
 endif()
diff --git a/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild b/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild
index 41b892aba6a..ef6f7df968b 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild
+++ b/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild
@@ -9,4 +9,5 @@ string
 	default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk"
 	default "nrf5340bsim/nrf5340/cpunet" if $(BOARD) = "nrf5340bsim"
 	default "nrf54l15pdk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15pdk"
+	default "nrf54l15dk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15dk"
 	default "stm32h747i_disco/stm32h747xx/m4" if $(BOARD) = "stm32h747i_disco"
diff --git a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..b6f20acc42a
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	soc {
+		reserved-memory {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			sram_rx: memory@20018000 {
+				reg = <0x20018000 0x0800>;
+			};
+
+			sram_tx: memory@20020000 {
+				reg = <0x20020000 0x0800>;
+			};
+		};
+	};
+
+	ipc {
+		ipc0: ipc0 {
+			compatible = "zephyr,ipc-icmsg";
+			tx-region = <&sram_tx>;
+			rx-region = <&sram_rx>;
+			mboxes = <&cpuapp_vevif_rx 20>, <&cpuapp_vevif_tx 21>;
+			mbox-names = "rx", "tx";
+			status = "okay";
+		};
+	};
+};
+
+&cpuapp_vevif_rx {
+	status = "okay";
+};
+
+&cpuapp_vevif_tx {
+	status = "okay";
+};
diff --git a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
new file mode 100644
index 00000000000..e1dbd1eaa01
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	soc {
+		reserved-memory {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			sram_tx: memory@20018000 {
+				reg = <0x20018000 0x0800>;
+			};
+
+			sram_rx: memory@20020000 {
+				reg = <0x20020000 0x0800>;
+			};
+		};
+	};
+
+	ipc {
+		ipc0: ipc0 {
+			compatible = "zephyr,ipc-icmsg";
+			tx-region = <&sram_tx>;
+			rx-region = <&sram_rx>;
+			mboxes = <&cpuflpr_vevif_rx 21>, <&cpuflpr_vevif_tx 20>;
+			mbox-names = "rx", "tx";
+			status = "okay";
+		};
+	};
+};
+
+&cpuflpr_vevif_rx {
+	status = "okay";
+};
+
+&cpuflpr_vevif_tx {
+	status = "okay";
+};
diff --git a/samples/subsys/ipc/ipc_service/icmsg/sample.yaml b/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
index 321ed3398ed..b1fc001a45b 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
+++ b/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
@@ -23,9 +23,9 @@ tests:
         - "host: IPC-service HOST demo ended"
 
   sample.ipc.icmsg.nrf54l15:
-    platform_allow: nrf54l15pdk/nrf54l15/cpuapp
+    platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     tags: ipc
     extra_args:
       icmsg_SNIPPET=nordic-flpr
@@ -43,9 +43,9 @@ tests:
         - "host: IPC-service HOST demo ended"
 
   sample.ipc.icmsg.nrf54l15_no_multithreading:
-    platform_allow: nrf54l15pdk/nrf54l15/cpuapp
+    platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     tags: ipc
     extra_args:
       icmsg_SNIPPET=nordic-flpr
@@ -67,9 +67,9 @@ tests:
         - "I: IPC-service HOST demo ended"
 
   sample.ipc.icmsg.nrf54l15_remote_no_multithreading:
-    platform_allow: nrf54l15pdk/nrf54l15/cpuapp
+    platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     tags: ipc
     extra_args:
       icmsg_SNIPPET=nordic-flpr
diff --git a/samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf
new file mode 100644
index 00000000000..3746c13c741
--- /dev/null
+++ b/samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -0,0 +1,2 @@
+CONFIG_NVS=y
+CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/sample.yaml b/samples/subsys/settings/sample.yaml
index e4a9e148c5a..db06905ac90 100644
--- a/samples/subsys/settings/sample.yaml
+++ b/samples/subsys/settings/sample.yaml
@@ -12,6 +12,7 @@ tests:
       - native_sim
       - native_sim/native/64
       - mr_canhubk3
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
     integration_platforms:
diff --git a/samples/sysbuild/hello_world/sample.yaml b/samples/sysbuild/hello_world/sample.yaml
index 40a1425497e..444410f46a3 100644
--- a/samples/sysbuild/hello_world/sample.yaml
+++ b/samples/sysbuild/hello_world/sample.yaml
@@ -56,6 +56,15 @@ tests:
       SB_CONF_FILE=sysbuild/nrf54l15pdk_nrf54l15_cpuflpr.conf
       hello_world_SNIPPET=nordic-flpr
 
+  sample.sysbuild.hello_world.nrf54l15dk_nrf54l15_cpuflpr:
+    platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
+    integration_platforms:
+      - nrf54l15dk/nrf54l15/cpuapp
+    extra_args:
+      SB_CONF_FILE=sysbuild/nrf54l15dk_nrf54l15_cpuflpr.conf
+      hello_world_SNIPPET=nordic-flpr
+
   sample.sysbuild.hello_world.nrf54h20dk_cpuapp_cpuflpr:
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
diff --git a/samples/sysbuild/hello_world/sysbuild/nrf54l15dk_nrf54l15_cpuflpr.conf b/samples/sysbuild/hello_world/sysbuild/nrf54l15dk_nrf54l15_cpuflpr.conf
new file mode 100644
index 00000000000..203dc628f47
--- /dev/null
+++ b/samples/sysbuild/hello_world/sysbuild/nrf54l15dk_nrf54l15_cpuflpr.conf
@@ -0,0 +1 @@
+SB_CONFIG_REMOTE_BOARD="nrf54l15dk/nrf54l15/cpuflpr"
diff --git a/tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15dk_nrf54l15_cpuapp.conf
similarity index 100%
rename from tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
rename to tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15dk_nrf54l15_cpuapp.conf
diff --git a/tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
similarity index 95%
rename from tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
rename to tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index d60e42659ee..2a26aacce05 100644
--- a/tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ b/tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -23,7 +23,8 @@
 	i2c22_default_alt: i2c22_default_alt {
 		group1 {
 /* Temporary workaround as it is currently not possible
- * to configure pins for TWIS with pinctrl. */
+ * to configure pins for TWIS with pinctrl.
+ */
 			psels = <NRF_PSEL(TWIM_SDA, 1, 9)>,
 				<NRF_PSEL(TWIM_SCL, 1, 13)>;
 			bias-pull-up;
diff --git a/tests/boards/nrf/i2c/i2c_slave/testcase.yaml b/tests/boards/nrf/i2c/i2c_slave/testcase.yaml
index 818502b6890..ad3b34058c7 100644
--- a/tests/boards/nrf/i2c/i2c_slave/testcase.yaml
+++ b/tests/boards/nrf/i2c/i2c_slave/testcase.yaml
@@ -8,10 +8,10 @@ tests:
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
     integration_platforms:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
rename to tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
similarity index 100%
rename from tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
rename to tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
diff --git a/tests/boards/nrf/qdec/testcase.yaml b/tests/boards/nrf/qdec/testcase.yaml
index f8d5f0c7a60..4bc634412db 100644
--- a/tests/boards/nrf/qdec/testcase.yaml
+++ b/tests/boards/nrf/qdec/testcase.yaml
@@ -7,14 +7,14 @@ tests:
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuflpr
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuflpr
       - nrf54h20dk/nrf54h20/cpuapp
     integration_platforms:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuflpr
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuflpr
       - nrf54h20dk/nrf54h20/cpuapp
     harness: ztest
     harness_config:
diff --git a/tests/boot/with_mcumgr/testcase.yaml b/tests/boot/with_mcumgr/testcase.yaml
index 1e3a250d10e..37e7d91ffaf 100644
--- a/tests/boot/with_mcumgr/testcase.yaml
+++ b/tests/boot/with_mcumgr/testcase.yaml
@@ -3,6 +3,7 @@ common:
   platform_allow:
     - nrf52840dk/nrf52840
     - nrf5340dk/nrf5340/cpuapp
+    - nrf54l15dk/nrf54l15/cpuapp
     - nrf54l15pdk/nrf54l15/cpuapp
     - nrf9160dk/nrf9160
     - nucleo_wba55cg
diff --git a/tests/drivers/clock_control/clock_control_api/testcase.yaml b/tests/drivers/clock_control/clock_control_api/testcase.yaml
index f14e57971ab..ece53e013d7 100644
--- a/tests/drivers/clock_control/clock_control_api/testcase.yaml
+++ b/tests/drivers/clock_control/clock_control_api/testcase.yaml
@@ -16,7 +16,7 @@ tests:
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
       - nrf9160dk/nrf9160
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
   drivers.clock.clock_control_nrf5_lfclk_rc:
@@ -24,7 +24,7 @@ tests:
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_args: CONF_FILE="nrf_lfclk_rc.conf"
diff --git a/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml b/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml
index e5f1248f5ec..fc90cc792ab 100644
--- a/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml
+++ b/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml
@@ -7,6 +7,6 @@ tests:
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
diff --git a/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml b/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml
index c35d4529722..c17f6b6cd48 100644
--- a/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml
+++ b/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml
@@ -13,7 +13,7 @@ tests:
       - nrf9160dk/nrf9160
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     extra_configs:
       - CONFIG_SYSTEM_CLOCK_WAIT_FOR_STABILITY=y
       - CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
@@ -28,7 +28,7 @@ tests:
       - nrf9160dk/nrf9160
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     extra_configs:
       - CONFIG_SYSTEM_CLOCK_WAIT_FOR_AVAILABILITY=y
       - CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
@@ -43,7 +43,7 @@ tests:
       - nrf9160dk/nrf9160
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
@@ -57,7 +57,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
@@ -71,7 +71,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
@@ -85,7 +85,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
@@ -99,7 +99,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
@@ -113,7 +113,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
@@ -127,7 +127,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
diff --git a/tests/drivers/clock_control/onoff/testcase.yaml b/tests/drivers/clock_control/onoff/testcase.yaml
index 867ae2dce40..3e57daea83a 100644
--- a/tests/drivers/clock_control/onoff/testcase.yaml
+++ b/tests/drivers/clock_control/onoff/testcase.yaml
@@ -7,7 +7,7 @@ tests:
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf9160dk/nrf9160
     integration_platforms:
       - nrf51dk/nrf51822
diff --git a/tests/drivers/flash/common/testcase.yaml b/tests/drivers/flash/common/testcase.yaml
index 487c8cd97fe..977fea9d0ed 100644
--- a/tests/drivers/flash/common/testcase.yaml
+++ b/tests/drivers/flash/common/testcase.yaml
@@ -38,7 +38,7 @@ tests:
       - mimxrt1060_evk
   drivers.flash.common.no_explicit_erase:
     platform_allow:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
   drivers.flash.common.tfm_ns:
     build_only: true
diff --git a/tests/drivers/flash/negative_tests/prj.conf b/tests/drivers/flash/negative_tests/prj.conf
index 2496d765165..e00f27ad9e1 100644
--- a/tests/drivers/flash/negative_tests/prj.conf
+++ b/tests/drivers/flash/negative_tests/prj.conf
@@ -3,3 +3,4 @@ CONFIG_ZTEST=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_SPI_NOR=n
diff --git a/tests/drivers/flash/negative_tests/testcase.yaml b/tests/drivers/flash/negative_tests/testcase.yaml
index 75c60a9b7f8..cea837a8f0d 100644
--- a/tests/drivers/flash/negative_tests/testcase.yaml
+++ b/tests/drivers/flash/negative_tests/testcase.yaml
@@ -5,5 +5,5 @@ common:
 tests:
   drivers.flash.negative_tests:
     platform_allow:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
diff --git a/tests/drivers/mbox/mbox_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/mbox/mbox_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..f7fd310c974
--- /dev/null
+++ b/tests/drivers/mbox/mbox_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&cpuapp_vevif_tx 21>, <&cpuapp_vevif_tx 32>,
+				 <&cpuapp_vevif_rx 20>, <&cpuapp_vevif_rx 32>;
+		mbox-names = "remote_valid", "remote_incorrect",
+					 "local_valid", "local_incorrect";
+
+	};
+};
+
+&cpuapp_vevif_rx {
+	status = "okay";
+};
+
+&cpuapp_vevif_tx {
+	status = "okay";
+};
diff --git a/tests/drivers/mbox/mbox_error_cases/sample.yaml b/tests/drivers/mbox/mbox_error_cases/sample.yaml
index 9f61af5e1d2..c6183d32d4f 100644
--- a/tests/drivers/mbox/mbox_error_cases/sample.yaml
+++ b/tests/drivers/mbox/mbox_error_cases/sample.yaml
@@ -14,7 +14,8 @@ tests:
 
   tests.drivers.mbox_error_cases.nrf54l:
     platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     extra_args: SNIPPET=nordic-flpr
diff --git a/tests/drivers/retained_mem/api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/drivers/retained_mem/api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
rename to tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/retained_mem/api/testcase.yaml b/tests/drivers/retained_mem/api/testcase.yaml
index 7b23fd3b6e8..2979607296c 100644
--- a/tests/drivers/retained_mem/api/testcase.yaml
+++ b/tests/drivers/retained_mem/api/testcase.yaml
@@ -5,7 +5,7 @@ tests:
       - drivers
       - retained_mem
   drivers.retained_mem.api.ram:
-    platform_allow: qemu_cortex_m3 nrf54l15pdk/nrf54l15/cpuapp
+    platform_allow: qemu_cortex_m3 nrf54l15dk/nrf54l15/cpuapp
     tags:
       - drivers
       - retained_mem
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
rename to tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
index 18dfb9db1cd..675259a4dd0 100644
--- a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
+++ b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
@@ -5,8 +5,8 @@ common:
   harness_config:
     fixture: gpio_spi_loopback
   platform_allow: |
-    nrf52840dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp
-    nrf54h20dk/nrf54h20/cpurad
+    nrf52840dk/nrf52840 nrf54l15dk/nrf54l15/cpuapp
+    nrf54h20dk/nrf54h20/cpuapp nrf54h20dk/nrf54h20/cpurad
 
 tests:
   drivers.spi.spi_mode0:
@@ -55,5 +55,5 @@ tests:
     extra_args: DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
     platform_exclude:
       - nrf52840dk/nrf52840
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
diff --git a/tests/drivers/spi/spi_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/drivers/spi/spi_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
rename to tests/drivers/spi/spi_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/spi/spi_error_cases/testcase.yaml b/tests/drivers/spi/spi_error_cases/testcase.yaml
index ba046ee0292..b00c73c2ef9 100644
--- a/tests/drivers/spi/spi_error_cases/testcase.yaml
+++ b/tests/drivers/spi/spi_error_cases/testcase.yaml
@@ -8,7 +8,7 @@ tests:
   drivers.spi.spi_error_cases:
     platform_allow:
       - nrf52840dk/nrf52840
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
     integration_platforms:
       - nrf52840dk/nrf52840
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
rename to tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/timer/nrf_grtc_timer/testcase.yaml b/tests/drivers/timer/nrf_grtc_timer/testcase.yaml
index 6f7c1cd769f..8d7b2f8d86e 100644
--- a/tests/drivers/timer/nrf_grtc_timer/testcase.yaml
+++ b/tests/drivers/timer/nrf_grtc_timer/testcase.yaml
@@ -2,8 +2,8 @@ tests:
   drivers.timer.nrf_grtc_timer:
     tags: drivers
     platform_allow:
-      - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuflpr
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuflpr
       - nrf54l15bsim/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
diff --git a/tests/drivers/uart/uart_elementary/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_elementary/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/drivers/uart/uart_elementary/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
rename to tests/drivers/uart/uart_elementary/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/uart/uart_elementary/boards/nrf54l15pdk_nrf54l15_cpuapp_dual_uart.overlay b/tests/drivers/uart/uart_elementary/boards/nrf54l15dk_nrf54l15_cpuapp_dual_uart.overlay
similarity index 100%
rename from tests/drivers/uart/uart_elementary/boards/nrf54l15pdk_nrf54l15_cpuapp_dual_uart.overlay
rename to tests/drivers/uart/uart_elementary/boards/nrf54l15dk_nrf54l15_cpuapp_dual_uart.overlay
diff --git a/tests/drivers/uart/uart_elementary/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay b/tests/drivers/uart/uart_elementary/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
similarity index 100%
rename from tests/drivers/uart/uart_elementary/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
rename to tests/drivers/uart/uart_elementary/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
diff --git a/tests/drivers/uart/uart_elementary/boards/nrf54l15pdk_nrf54l15_cpuflpr_dual_uart.overlay b/tests/drivers/uart/uart_elementary/boards/nrf54l15dk_nrf54l15_cpuflpr_dual_uart.overlay
similarity index 100%
rename from tests/drivers/uart/uart_elementary/boards/nrf54l15pdk_nrf54l15_cpuflpr_dual_uart.overlay
rename to tests/drivers/uart/uart_elementary/boards/nrf54l15dk_nrf54l15_cpuflpr_dual_uart.overlay
diff --git a/tests/drivers/uart/uart_elementary/testcase.yaml b/tests/drivers/uart/uart_elementary/testcase.yaml
index e8f0184eff3..e1ea05cddc1 100644
--- a/tests/drivers/uart/uart_elementary/testcase.yaml
+++ b/tests/drivers/uart/uart_elementary/testcase.yaml
@@ -9,8 +9,8 @@ tests:
     filter: CONFIG_SERIAL_SUPPORT_INTERRUPT
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuflpr
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuflpr
       - nrf5340dk/nrf5340/cpuapp
   drivers.uart.uart_elementary_dual_nrf54h:
     filter: CONFIG_SERIAL_SUPPORT_INTERRUPT
@@ -30,30 +30,30 @@ tests:
   drivers.uart.uart_elementary_dual_nrf54l:
     filter: CONFIG_SERIAL_SUPPORT_INTERRUPT
     platform_allow:
-      - nrf54l15pdk/nrf54l15/cpuapp
-    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_dual_uart.overlay"
+      - nrf54l15dk/nrf54l15/cpuapp
+    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_dual_uart.overlay"
     extra_configs:
       - CONFIG_DUAL_UART_TEST=y
   drivers.uart.uart_elementary_dual_setup_mismatch_nrf54l:
     filter: CONFIG_SERIAL_SUPPORT_INTERRUPT
     platform_allow:
-      - nrf54l15pdk/nrf54l15/cpuapp
-    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_dual_uart.overlay"
+      - nrf54l15dk/nrf54l15/cpuapp
+    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_dual_uart.overlay"
     extra_configs:
       - CONFIG_DUAL_UART_TEST=y
       - CONFIG_SETUP_MISMATCH_TEST=y
   drivers.uart.uart_elementary_dual_nrf54l_cpuflpr:
     filter: CONFIG_SERIAL_SUPPORT_INTERRUPT
     platform_allow:
-      - nrf54l15pdk/nrf54l15/cpuflpr
-    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuflpr_dual_uart.overlay"
+      - nrf54l15dk/nrf54l15/cpuflpr
+    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_dual_uart.overlay"
     extra_configs:
       - CONFIG_DUAL_UART_TEST=y
   drivers.uart.uart_elementary_dual_setup_mismatch_nrf54l_cpuflpr:
     filter: CONFIG_SERIAL_SUPPORT_INTERRUPT
     platform_allow:
-      - nrf54l15pdk/nrf54l15/cpuflpr
-    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuflpr_dual_uart.overlay"
+      - nrf54l15dk/nrf54l15/cpuflpr
+    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_dual_uart.overlay"
     extra_configs:
       - CONFIG_DUAL_UART_TEST=y
       - CONFIG_SETUP_MISMATCH_TEST=y
diff --git a/tests/drivers/uart/uart_errors/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_errors/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..babbc740133
--- /dev/null
+++ b/tests/drivers/uart/uart_errors/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,54 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&pinctrl {
+	uart21_default: uart21_default {
+		group1 {
+			psels = <NRF_PSEL(UART_RX, 1, 8)>,
+				<NRF_PSEL(UART_RTS, 1, 10)>;
+		};
+	};
+
+	uart21_sleep: uart21_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_RX, 1, 8)>,
+				<NRF_PSEL(UART_RTS, 1, 10)>;
+			low-power-enable;
+		};
+	};
+
+	uart22_default: uart22_default {
+		group1 {
+			psels =
+				<NRF_PSEL(UART_CTS, 1, 11)>;
+				bias-pull-up;
+		};
+		group2 {
+			psels = <NRF_PSEL(UART_TX, 1, 9)>;
+		};
+	};
+
+	uart22_sleep: uart22_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 9)>,
+				<NRF_PSEL(UART_CTS, 1, 11)>;
+			low-power-enable;
+		};
+	};
+};
+
+dut: &uart21 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart21_default>;
+	pinctrl-1 = <&uart21_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+dut_aux: &uart22 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart22_default>;
+	pinctrl-1 = <&uart22_sleep>;
+	pinctrl-names = "default", "sleep";
+	disable-rx;
+};
diff --git a/tests/drivers/uart/uart_errors/testcase.yaml b/tests/drivers/uart/uart_errors/testcase.yaml
index 9ce1e989c67..b049b10333c 100644
--- a/tests/drivers/uart/uart_errors/testcase.yaml
+++ b/tests/drivers/uart/uart_errors/testcase.yaml
@@ -9,13 +9,13 @@ tests:
     filter: CONFIG_SERIAL_SUPPORT_INTERRUPT
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf5340dk/nrf5340/cpuapp
   drivers.uart.uart_errors.async:
     filter: CONFIG_SERIAL_SUPPORT_ASYNC
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf5340dk/nrf5340/cpuapp
     extra_configs:
       - CONFIG_UART_ASYNC_API=y
diff --git a/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
rename to tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml b/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
index 8be2429492e..1b13bc57166 100644
--- a/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
+++ b/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
@@ -8,7 +8,7 @@ common:
     - nrf52840dk/nrf52840
     - nrf9160dk/nrf9160
     - nrf5340dk/nrf5340/cpuapp
-    - nrf54l15pdk/nrf54l15/cpuapp
+    - nrf54l15dk/nrf54l15/cpuapp
     - nrf54h20dk/nrf54h20/cpuapp
     - nrf54h20dk/nrf54h20/cpurad
     - nrf52_bsim
@@ -82,7 +82,7 @@ tests:
       - CONFIG_UART_0_ENHANCED_POLL_OUT=n
       - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     platform_exclude:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
 
@@ -93,7 +93,7 @@ tests:
       - CONFIG_UART_0_ENHANCED_POLL_OUT=n
       - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     platform_exclude:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
 
@@ -108,6 +108,6 @@ tests:
       - CONFIG_NRFX_TIMER2=y
       - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     platform_exclude:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
diff --git a/tests/drivers/uart/uart_pm/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_pm/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/drivers/uart/uart_pm/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
rename to tests/drivers/uart/uart_pm/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/uart/uart_pm/testcase.yaml b/tests/drivers/uart/uart_pm/testcase.yaml
index c7c7b803442..9a7729c8236 100644
--- a/tests/drivers/uart/uart_pm/testcase.yaml
+++ b/tests/drivers/uart/uart_pm/testcase.yaml
@@ -5,7 +5,7 @@ common:
   harness: ztest
   platform_allow:
     - nrf52840dk/nrf52840
-    - nrf54l15pdk/nrf54l15/cpuapp
+    - nrf54l15dk/nrf54l15/cpuapp
     - nrf54h20dk/nrf54h20/cpuapp
     - nrf52_bsim
   harness_config:
@@ -27,7 +27,7 @@ tests:
       - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     extra_args: DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840.overlay;nrf_rx_disable.overlay"
     platform_exclude:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
 
   drivers.uart.pm.enhanced_poll:
@@ -37,7 +37,7 @@ tests:
       - CONFIG_UART_0_ENHANCED_POLL_OUT=y
       - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     platform_exclude:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
 
   drivers.uart.pm.int_driven:
@@ -56,7 +56,7 @@ tests:
       - CONFIG_UART_0_ENHANCED_POLL_OUT=y
       - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     platform_exclude:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
 
   drivers.uart.pm.async:
@@ -81,5 +81,5 @@ tests:
       - CONFIG_UART_0_ENHANCED_POLL_OUT=y
       - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     platform_exclude:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
deleted file mode 100644
index 5c765a8a896..00000000000
--- a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&wdt31 {
-	status = "okay";
-};
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
deleted file mode 100644
index 5c765a8a896..00000000000
--- a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&wdt31 {
-	status = "okay";
-};
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/watchdog/wdt_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
rename to tests/drivers/watchdog/wdt_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/watchdog/wdt_error_cases/testcase.yaml b/tests/drivers/watchdog/wdt_error_cases/testcase.yaml
index 738008c754e..3a3dbf94358 100644
--- a/tests/drivers/watchdog/wdt_error_cases/testcase.yaml
+++ b/tests/drivers/watchdog/wdt_error_cases/testcase.yaml
@@ -8,10 +8,10 @@ common:
 tests:
   drivers.watchdog.wdt_error_cases:
     platform_allow:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
       - nrf9280pdk/nrf9280/cpuapp
       - nrf9280pdk/nrf9280/cpurad
     integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
diff --git a/tests/subsys/fs/fcb/testcase.yaml b/tests/subsys/fs/fcb/testcase.yaml
index 19e47e33a1b..5ec3bbf2a19 100644
--- a/tests/subsys/fs/fcb/testcase.yaml
+++ b/tests/subsys/fs/fcb/testcase.yaml
@@ -14,6 +14,7 @@ tests:
       - nrf52840dk/nrf52840
   filesystem.fcb.no_erase:
     platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
   filesystem.fcb.native_sim.no_erase:
     extra_args: CONFIG_FLASH_SIMULATOR_EXPLICIT_ERASE=n
diff --git a/tests/subsys/fs/littlefs/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/subsys/fs/littlefs/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..292e98c96a0
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &slot0_ns_partition;
+/delete-node/ &slot1_partition;
+/delete-node/ &slot1_ns_partition;
+
+&cpuapp_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		small_partition: partition@67000 {
+			label = "small";
+			reg = <0x00067000 0x00010000>;
+		};
+	};
+};
diff --git a/tests/subsys/fs/littlefs/testcase.yaml b/tests/subsys/fs/littlefs/testcase.yaml
index e934ac5b9d8..49f19492ab4 100644
--- a/tests/subsys/fs/littlefs/testcase.yaml
+++ b/tests/subsys/fs/littlefs/testcase.yaml
@@ -15,7 +15,7 @@ common:
 tests:
   filesystem.littlefs.default:
     timeout: 60
-    platform_allow: nrf54l15pdk/nrf54l15/cpuapp
+    platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
   filesystem.littlefs.custom:
     timeout: 180
     extra_configs:
diff --git a/tests/subsys/storage/stream/stream_flash/testcase.yaml b/tests/subsys/storage/stream/stream_flash/testcase.yaml
index 60408fceaba..9d42d9c3182 100644
--- a/tests/subsys/storage/stream/stream_flash/testcase.yaml
+++ b/tests/subsys/storage/stream/stream_flash/testcase.yaml
@@ -21,6 +21,7 @@ tests:
     tags: stream_flash
   storage.stream_flash.no_explicit_erase:
     platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
   storage.stream_flash.dword_wbs:
     extra_args: DTC_OVERLAY_FILE=unaligned_flush.overlay

From 7e6ab077753c418bde6f6468a2dcaea84681d73c Mon Sep 17 00:00:00 2001
From: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
Date: Mon, 30 Sep 2024 13:42:08 +0200
Subject: [PATCH 0166/2913] [nrf fromtree] samples: Align tests yaml and
 overlays to nrf54l15dk

Align mbox sample.yaml and icmsg flpr overlays to nrf54l15dk.

Signed-off-by: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
(cherry picked from commit 3904c3b2fe0ceb84cdacb2ae28fe949f326d0442)
(cherry picked from commit ed414beb4617361fbf55f9a15fdf5f489aff6be2)
(cherry picked from commit 2dbf191d7f564b29d2628ae46833b1419d8e8b86)
---
 samples/drivers/mbox/sample.yaml              | 15 ++++------
 ...nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay} |  2 +-
 .../nrf54l15dk_nrf54l15_cpuflpr.overlay       |  4 +++
 ...rf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay} |  2 +-
 .../nrf54l15pdk_nrf54l15_cpuflpr.overlay      |  4 +++
 .../subsys/ipc/ipc_service/icmsg/sample.yaml  | 30 +++++++++----------
 6 files changed, 31 insertions(+), 26 deletions(-)
 rename samples/subsys/ipc/ipc_service/icmsg/boards/{nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay => nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay} (91%)
 rename samples/subsys/ipc/ipc_service/icmsg/remote/boards/{nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay => nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay} (91%)

diff --git a/samples/drivers/mbox/sample.yaml b/samples/drivers/mbox/sample.yaml
index 40664dac736..1cede323899 100644
--- a/samples/drivers/mbox/sample.yaml
+++ b/samples/drivers/mbox/sample.yaml
@@ -86,7 +86,6 @@ tests:
   sample.drivers.mbox.nrf54l15:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     extra_args:
@@ -97,13 +96,12 @@ tests:
       type: multi_line
       ordered: false
       regex:
-        - "Ping \\(on channel 16\\)"
-        - "Pong \\(on channel 15\\)"
+        - "Ping \\(on channel 21\\)"
+        - "Pong \\(on channel 20\\)"
 
   sample.drivers.mbox.nrf54l15_no_multithreading:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     extra_args:
@@ -116,13 +114,12 @@ tests:
       type: multi_line
       ordered: false
       regex:
-        - "Ping \\(on channel 16\\)"
-        - "Pong \\(on channel 15\\)"
+        - "Ping \\(on channel 21\\)"
+        - "Pong \\(on channel 20\\)"
 
   sample.drivers.mbox.nrf54l15_remote_no_multithreading:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     extra_args:
@@ -134,5 +131,5 @@ tests:
       type: multi_line
       ordered: false
       regex:
-        - "Ping \\(on channel 16\\)"
-        - "Pong \\(on channel 15\\)"
+        - "Ping \\(on channel 21\\)"
+        - "Pong \\(on channel 20\\)"
diff --git a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay
similarity index 91%
rename from samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay
rename to samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay
index 74bdf07915b..a3f853c6e3d 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay
+++ b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay
@@ -27,7 +27,7 @@
 			rx-region = <&sram_rx>;
 			tx-blocks = <16>;
 			rx-blocks = <18>;
-			mboxes = <&cpuapp_vevif_rx 15>, <&cpuapp_vevif_tx 16>;
+			mboxes = <&cpuapp_vevif_rx 20>, <&cpuapp_vevif_tx 21>;
 			mbox-names = "rx", "tx";
 			status = "okay";
 		};
diff --git a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
index e1dbd1eaa01..c6e59f2b131 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
+++ b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
@@ -39,3 +39,7 @@
 &cpuflpr_vevif_tx {
 	status = "okay";
 };
+
+&uart30 {
+	/delete-property/ hw-flow-control;
+};
diff --git a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay
similarity index 91%
rename from samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay
rename to samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay
index 56ea0e6a5e4..0033e622107 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay
+++ b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay
@@ -27,7 +27,7 @@
 			rx-region = <&sram_rx>;
 			tx-blocks = <18>;
 			rx-blocks = <16>;
-			mboxes = <&cpuflpr_vevif_rx 16>, <&cpuflpr_vevif_tx 15>;
+			mboxes = <&cpuflpr_vevif_rx 21>, <&cpuflpr_vevif_tx 20>;
 			mbox-names = "rx", "tx";
 			status = "okay";
 		};
diff --git a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
index 2219b7b78fa..b0e1f0d5034 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
+++ b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
@@ -39,3 +39,7 @@
 &cpuflpr_vevif_tx {
 	status = "okay";
 };
+
+&uart30 {
+	/delete-property/ hw-flow-control;
+};
diff --git a/samples/subsys/ipc/ipc_service/icmsg/sample.yaml b/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
index b1fc001a45b..9305aa61a03 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
+++ b/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
@@ -23,7 +23,7 @@ tests:
         - "host: IPC-service HOST demo ended"
 
   sample.ipc.icmsg.nrf54l15:
-    platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
+    platform_allow: nrf54l15dk/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     tags: ipc
@@ -43,7 +43,7 @@ tests:
         - "host: IPC-service HOST demo ended"
 
   sample.ipc.icmsg.nrf54l15_no_multithreading:
-    platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
+    platform_allow: nrf54l15dk/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     tags: ipc
@@ -67,7 +67,7 @@ tests:
         - "I: IPC-service HOST demo ended"
 
   sample.ipc.icmsg.nrf54l15_remote_no_multithreading:
-    platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
+    platform_allow: nrf54l15dk/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     tags: ipc
@@ -89,16 +89,16 @@ tests:
         - "host: IPC-service HOST demo ended"
 
   sample.ipc.icbmsg.nrf54l15:
-    platform_allow: nrf54l15pdk/nrf54l15/cpuapp
+    platform_allow: nrf54l15dk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     tags: ipc
     extra_args:
       icmsg_SNIPPET=nordic-flpr
       icmsg_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
-      icmsg_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay"
+      icmsg_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay"
       remote_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
-      remote_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay"
+      remote_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay"
     sysbuild: true
     harness: console
     harness_config:
@@ -113,18 +113,18 @@ tests:
         - "host: IPC-service HOST demo ended"
 
   sample.ipc.icbmsg.nrf54l15_no_multithreading:
-    platform_allow: nrf54l15pdk/nrf54l15/cpuapp
+    platform_allow: nrf54l15dk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     tags: ipc
     extra_args:
       icmsg_SNIPPET=nordic-flpr
       icmsg_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
-      icmsg_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay"
+      icmsg_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay"
       icmsg_CONFIG_MULTITHREADING=n
       icmsg_CONFIG_LOG_MODE_MINIMAL=y
       remote_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
-      remote_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay"
+      remote_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay"
       remote_CONFIG_MULTITHREADING=n
       remote_CONFIG_LOG_MODE_MINIMAL=y
     sysbuild: true
@@ -141,16 +141,16 @@ tests:
         - "host: IPC-service HOST demo ended"
 
   sample.ipc.icbmsg.nrf54l15_remote_no_multithreading:
-    platform_allow: nrf54l15pdk/nrf54l15/cpuapp
+    platform_allow: nrf54l15dk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     tags: ipc
     extra_args:
       icmsg_SNIPPET=nordic-flpr
       icmsg_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
-      icmsg_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay"
+      icmsg_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay"
       remote_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
-      remote_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay"
+      remote_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay"
       remote_CONFIG_MULTITHREADING=n
       remote_CONFIG_LOG_MODE_MINIMAL=y
     sysbuild: true

From 08882cb5488b0a16e012248d359d8e1a8356d1fd Mon Sep 17 00:00:00 2001
From: Jonathan Nilsen <jonathan.nilsen@nordicsemi.no>
Date: Thu, 12 Sep 2024 10:09:57 +0200
Subject: [PATCH 0167/2913] [nrf fromtree] boards: nordic: update custom JLink
 reset scheme for ADACv2

Version 2 of the ADAC interface implemented by secure domain firmware
changes the ADAC RESET command used in the custom reset handling in
the JLink support scripts. The command has been split into two
commands, RESET and START, and has different semantics from
the previous RESET command. The new RESET command resets both the
application and radio domains without starting the CPUs again, and the
START command must then be used to start the CPUs.

Update the JLink support scripts for nrf54h20dk/nrf54h20/cpuapp,
nrf54h20dk/nrf54h20/cpurad, nrf9280pdk/nrf9280/cpuapp and
nrf9280pdk/nrf9280/cpurad so that they read out the ADAC interface
version from the device and use the newer commands if ADAC version 2 is
detected. If the version is lower than 2, the legacy implementation is
used.

Also improve the CTRL-AP MAILBOX transaction implementation
to avoid the need for arbitrary sleeps or unnecessary polling of
the MAILBOX. This should improve stability when using the script.

Signed-off-by: Jonathan Nilsen <jonathan.nilsen@nordicsemi.no>
(cherry picked from commit d403d73ad7b773a83d00d43b40b928630b8365a1)
(cherry picked from commit 29f0e97195dc294f9e65c55b79576c7b1d9bf1fb)
(cherry picked from commit eb3ecaecb4195867fe2763b671711dc036adf110)
---
 .../support/nrf54h20_cpuapp.JLinkScript       | 259 +++++++++++++++--
 .../support/nrf54h20_cpurad.JLinkScript       | 262 ++++++++++++++++--
 .../support/nrf9280_cpuapp.JLinkScript        | 259 +++++++++++++++--
 .../support/nrf9280_cpurad.JLinkScript        | 262 ++++++++++++++++--
 4 files changed, 960 insertions(+), 82 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/support/nrf54h20_cpuapp.JLinkScript b/boards/nordic/nrf54h20dk/support/nrf54h20_cpuapp.JLinkScript
index ffa1beed1ed..28010addbf1 100644
--- a/boards/nordic/nrf54h20dk/support/nrf54h20_cpuapp.JLinkScript
+++ b/boards/nordic/nrf54h20dk/support/nrf54h20_cpuapp.JLinkScript
@@ -1,29 +1,248 @@
+// Constants specific to the application core
+__constant U32 _CPUCONF_ADDR = 0x52011000;
+__constant U32 _PROCESSOR_ID = 2;
+__constant U32 _DOMAIN_ID = 2;
+__constant U32 _NUM_OTHER_PROCESSORS = 1;
+const U32 _OTHER_PROCESSOR_IDS[1] = {3};
+
 // Debug Halting Control and Status Register
-__constant U32 _DHCSR_ADDR      = 0xE000EDF0;
-__constant U32 _DHCSR_DBGKEY    = (0xA05F << 16);
-__constant U32 _DHCSR_C_DEBUGEN = (1 <<  0);
-__constant U32 _DHCSR_C_HALT    = (1 <<  1);
+__constant U32 _DHCSR_ADDR = 0xE000EDF0;
+__constant U32 _DHCSR_DBGKEY = (0xA05F << 16);
+__constant U32 _DHCSR_C_DEBUGEN = (1 << 0);
+__constant U32 _DHCSR_C_HALT = (1 << 1);
 
 // Debug Exception and Monitor Control Register
-__constant U32 _DEMCR_ADDR         = 0xE000EDFC;
-__constant U32 _DEMCR_VC_CORERESET = (1 <<  0);
-__constant U32 _DEMCR_TRCENA       = (1 << 24);
+__constant U32 _DEMCR_ADDR = 0xE000EDFC;
+__constant U32 _DEMCR_VC_CORERESET = (1 << 0);
+__constant U32 _DEMCR_TRCENA = (1 << 24);
 
 // CPU wait enable register
-__constant U32 _CPUCONF_CPUWAIT_ADDR = 0x5201150C;
+__constant U32 _CPUCONF_CPUWAIT_OFFSET = 0x50C;
+
+// CTRL-AP
+__constant U32 _CTRLAP_ID = 4;
+__constant U32 _CTRLAP_READY_BANK = 0;
+__constant U32 _CTRLAP_READY_OFFSET = 1;
+__constant U32 _CTRLAP_READY = 0;
+__constant U32 _CTRLAP_MAILBOX_BANK = 1;
+__constant U32 _CTRLAP_MAILBOX_TXDATA_OFFSET = 0;
+__constant U32 _CTRLAP_MAILBOX_TXSTATUS_OFFSET = 1;
+__constant U32 _CTRLAP_MAILBOX_RXDATA_OFFSET = 2;
+__constant U32 _CTRLAP_MAILBOX_RXSTATUS_OFFSET = 3;
+__constant U32 _CTRLAP_MAILBOX_NO_DATA_PENDING = 0;
+__constant U32 _CTRLAP_MAILBOX_DATA_PENDING = 1;
+__constant int _CTRLAP_TIMEOUT_MS = 500;
+
+// ADAC transaction buffers
+static U32 _adacTx[20];
+static U32 _adacRx[20];
+
+// Failed to send to the CTRL-AP MAILBOX
+__constant int _ERR_TX = -1;
+// Failed to receive from the CTRL-AP MAILBOX
+__constant int _ERR_RX = -2;
+// ADAC command returned an error
+__constant int _ERR_REPLY = -3;
+
+// Wait for an AP register read to return the expected value.
+int _WaitForDataStatus(U32 regOffset, int expectedStatus)
+{
+	int status;
+	int ret;
+	int start;
+	int elapsed;
+
+	status = 0;
+	start = JLINK_GetTime();
+	elapsed = 0;
+
+	do {
+		ret = JLINK_CORESIGHT_ReadDAP(regOffset, 1, &status);
+		elapsed = JLINK_GetTime() - start;
+	} while ((ret < 0 || status != expectedStatus) && (elapsed < _CTRLAP_TIMEOUT_MS));
+
+	if (ret < 0) {
+		return ret;
+	}
+
+	return status;
+}
+
+// Continuously read from the CTRL-AP MAILBOX until there is no more pending data.
+void _DrainMailbox(void)
+{
+	int ret;
+	int status;
+	int data;
+
+	ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
+	while (ret >= 0 && status == _CTRLAP_MAILBOX_DATA_PENDING) {
+		JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
+		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
+	}
+}
+
+// Perform an ADAC transaction by:
+// * writing the given sequence of words to MAILBOX.TXDATATA, waiting for MAILBOX.TXSTATUS
+//   readiness before each write.
+// * reading a sequence of words from MAILBOX.RXDATA, waiting for MAILBOX.RXSTATUS readiness before
+//   each read.
+//
+// The message to send is read from _adacTx and the reply is written to _adacRx.
+// Optionally checks if a single data word is returned and returns an error if it is non-zero.
+//
+// Assumes that the correct AP and AP bank for CTRL-AP MAILBOX has been selected in the DP.
+int _DoAdacTransaction(int checkReplyStatus)
+{
+	int numWords;
+	int ret;
+	int data;
+	int i;
+
+	i = 0;
+	numWords = 2 + (_adacTx[1] >> 2); // Length based on the length field of the message
+
+	while (i < numWords) {
+		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_TXSTATUS_OFFSET,
+					 _CTRLAP_MAILBOX_NO_DATA_PENDING);
+		if (ret != _CTRLAP_MAILBOX_NO_DATA_PENDING) {
+			JLINK_SYS_Report1("Timed out waiting for CTRL-AP TX readiness - result: ",
+					  ret);
+			return _ERR_TX;
+		}
+
+		ret = JLINK_CORESIGHT_WriteDAP(_CTRLAP_MAILBOX_TXDATA_OFFSET, 1, _adacTx[i]);
+		if (ret < 0) {
+			JLINK_SYS_Report1("Failed to write CTRL-AP TX data - result: ", ret);
+			return _ERR_TX;
+		}
+
+		i += 1;
+	}
+
+	i = 0;
+	numWords = 2; // Minimum message length
+
+	while (i < numWords) {
+		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_RXSTATUS_OFFSET,
+					 _CTRLAP_MAILBOX_DATA_PENDING);
+		if (ret != _CTRLAP_MAILBOX_DATA_PENDING) {
+			JLINK_SYS_Report1("Timed out waiting for CTRL-AP RX data - result: ", ret);
+			return _ERR_RX;
+		}
+
+		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
+		if (ret < 0) {
+			JLINK_SYS_Report1("Failed to read CTRL-AP RX data - result: ", ret);
+			return _ERR_RX;
+		}
+
+		if (i == 1) {
+			// Update total length based on the message length field
+			numWords = 2 + (data >> 2);
+		}
+
+		_adacRx[i] = data;
+		i += 1;
+	}
+
+	if (checkReplyStatus && _adacRx[1] == 4 && _adacRx[2] != 0) {
+		JLINK_SYS_Report1("ADAC command failed with status: ", _adacRx[2]);
+		return _ERR_REPLY;
+	}
+
+	return 0;
+}
+
+int ResetTarget(void)
+{
+	int err;
+	U32 adacMajorVersion;
+	U32 i;
+
+	// Select CTRL-AP bank 0, used for the READY register
+	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
+				 (_CTRLAP_ID << 24) | (_CTRLAP_READY_BANK << 4));
+
+	// Wait for the READY register to indicate that the AP can be used.
+	err = _WaitForDataStatus(_CTRLAP_READY_OFFSET, _CTRLAP_READY);
+	if (err < 0) {
+		JLINK_SYS_Report1("Timed out waiting for CTRL-AP readiness - result: ", err);
+		return -1;
+	}
+
+	// Select CTRL-AP bank 1, used for the MAILBOX registers for ADAC communication
+	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
+				 (_CTRLAP_ID << 24) | (_CTRLAP_MAILBOX_BANK << 4));
+
+	// Extract any pre-existing data from the mailbox in case there was previously
+	// an aborted transaction.
+	_DrainMailbox();
+
+	// Read the ADAC version
+	_adacTx[0] = 0xA3000000; // Command VERSION
+	_adacTx[1] = 0x00000004; // Data length 4 bytes
+	_adacTx[2] = 0x00000000; // Type 0 (ADAC version)
+	err = _DoAdacTransaction(0);
+	if (err < 0) {
+		return -1;
+	}
+
+	adacMajorVersion = (_adacRx[2] >> 24) & 0xff;
+	JLINK_SYS_Report1("ADAC major version: ", adacMajorVersion);
+
+	if (adacMajorVersion >= 2) {
+		// There is a very small chance that this command fails if the domain reset itself
+		// at the exact same time the command was issued. Therefore we retry a few times.
+		i = 0;
+		while (i < 3) {
+			// Reset non-essential domains
+			_adacTx[0] = 0xA30A0000; // Command RESET
+			_adacTx[1] = 0x00000004; // Data length 4 bytes
+			_adacTx[2] = 0x00000000; // (reserved)
+			err = _DoAdacTransaction(1);
+			if (err >= 0) {
+				break;
+			} else if (err != _ERR_REPLY) {
+				return -1;
+			}
+
+			i = i + 1;
+		}
+
+		// Start the core in halted mode
+		_adacTx[0] = 0xA3090000;                         // Command START
+		_adacTx[1] = 0x00000004;                         // Data length 4 bytes
+		_adacTx[2] = 0x01000000 | (_PROCESSOR_ID << 16); // Own processor, Flags HALT
+		err = _DoAdacTransaction(1);
+		if (err < 0) {
+			return -1;
+		}
 
-int ResetTarget(void) {
-	// ADAC reset
-	JLINK_CORESIGHT_WriteDP(2, 0x04000010);
-	JLINK_CORESIGHT_WriteAP(0, 0xA3030000);
-	JLINK_CORESIGHT_WriteAP(0, 0x00000004);
-	JLINK_CORESIGHT_WriteAP(0, 0x01020000);
+		// Start other cores normally (will fail silently if no firmware is present)
+		i = 0;
+		while (i < _NUM_OTHER_PROCESSORS) {
+			_adacTx[0] = 0xA3090000; // Command START
+			_adacTx[1] = 0x00000004; // Data length 4 bytes
+			_adacTx[2] = 0x00000000 |
+				     (_OTHER_PROCESSOR_IDS[i] << 16); // Other processor, No flags
+			err = _DoAdacTransaction(0);
+			if (err < 0 && err != _ERR_REPLY) {
+				return -1;
+			}
 
-	JLINK_SYS_Sleep(100);
-	JLINK_CORESIGHT_ReadAP(2);
-	JLINK_CORESIGHT_ReadAP(2);
-	JLINK_CORESIGHT_ReadAP(2);
-	JLINK_CORESIGHT_ReadAP(2);
+			i = i + 1;
+		}
+	} else {
+		// Reset single domain via legacy implementation
+		_adacTx[0] = 0xA3030000;                      // Command RESET
+		_adacTx[1] = 0x00000004;                      // Data length 4 bytes
+		_adacTx[2] = 0x01000000 | (_DOMAIN_ID << 16); // Own domain, Mode HALT
+		err = _DoAdacTransaction(1);
+		if (err < 0) {
+			return -1;
+		}
+	}
 
 	// Halt the CPU
 	JLINK_MEM_WriteU32(_DHCSR_ADDR, (_DHCSR_DBGKEY | _DHCSR_C_HALT | _DHCSR_C_DEBUGEN));
@@ -32,7 +251,7 @@ int ResetTarget(void) {
 	JLINK_MEM_WriteU32(_DEMCR_ADDR, (_DEMCR_VC_CORERESET | _DEMCR_TRCENA));
 
 	// Disable CPU wait
-	JLINK_MEM_WriteU32(_CPUCONF_CPUWAIT_ADDR, 0);
+	JLINK_MEM_WriteU32(_CPUCONF_ADDR + _CPUCONF_CPUWAIT_OFFSET, 0);
 
 	// Clear vector catch stuff
 	JLINK_MEM_WriteU32(_DEMCR_ADDR, _DEMCR_TRCENA);
diff --git a/boards/nordic/nrf54h20dk/support/nrf54h20_cpurad.JLinkScript b/boards/nordic/nrf54h20dk/support/nrf54h20_cpurad.JLinkScript
index 2f1802801c1..5c2065307ff 100644
--- a/boards/nordic/nrf54h20dk/support/nrf54h20_cpurad.JLinkScript
+++ b/boards/nordic/nrf54h20dk/support/nrf54h20_cpurad.JLinkScript
@@ -1,36 +1,256 @@
+// Constants specific to the radio core
+__constant U32 _CPUCONF_ADDR = 0x53011000;
+__constant U32 _PROCESSOR_ID = 3;
+__constant U32 _DOMAIN_ID = 3;
+__constant U32 _NUM_OTHER_PROCESSORS = 1;
+const U32 _OTHER_PROCESSOR_IDS[1] = {2};
+
 // Debug Halting Control and Status Register
-__constant U32 _DHCSR_ADDR      = 0xE000EDF0;
-__constant U32 _DHCSR_DBGKEY    = (0xA05F << 16);
-__constant U32 _DHCSR_C_DEBUGEN = (1 <<  0);
-__constant U32 _DHCSR_C_HALT    = (1 <<  1);
+__constant U32 _DHCSR_ADDR = 0xE000EDF0;
+__constant U32 _DHCSR_DBGKEY = (0xA05F << 16);
+__constant U32 _DHCSR_C_DEBUGEN = (1 << 0);
+__constant U32 _DHCSR_C_HALT = (1 << 1);
 
 // Debug Exception and Monitor Control Register
-__constant U32 _DEMCR_ADDR         = 0xE000EDFC;
-__constant U32 _DEMCR_VC_CORERESET = (1 <<  0);
-__constant U32 _DEMCR_TRCENA       = (1 << 24);
+__constant U32 _DEMCR_ADDR = 0xE000EDFC;
+__constant U32 _DEMCR_VC_CORERESET = (1 << 0);
+__constant U32 _DEMCR_TRCENA = (1 << 24);
 
 // CPU wait enable register
-__constant U32 _CPUCONF_CPUWAIT_ADDR = 0x5301150C;
+__constant U32 _CPUCONF_CPUWAIT_OFFSET = 0x50C;
+
+// CTRL-AP
+__constant U32 _CTRLAP_ID = 4;
+__constant U32 _CTRLAP_READY_BANK = 0;
+__constant U32 _CTRLAP_READY_OFFSET = 1;
+__constant U32 _CTRLAP_READY = 0;
+__constant U32 _CTRLAP_MAILBOX_BANK = 1;
+__constant U32 _CTRLAP_MAILBOX_TXDATA_OFFSET = 0;
+__constant U32 _CTRLAP_MAILBOX_TXSTATUS_OFFSET = 1;
+__constant U32 _CTRLAP_MAILBOX_RXDATA_OFFSET = 2;
+__constant U32 _CTRLAP_MAILBOX_RXSTATUS_OFFSET = 3;
+__constant U32 _CTRLAP_MAILBOX_NO_DATA_PENDING = 0;
+__constant U32 _CTRLAP_MAILBOX_DATA_PENDING = 1;
+__constant int _CTRLAP_TIMEOUT_MS = 500;
+
+// ADAC transaction buffers
+static U32 _adacTx[20];
+static U32 _adacRx[20];
+
+// Failed to send to the CTRL-AP MAILBOX
+__constant int _ERR_TX = -1;
+// Failed to receive from the CTRL-AP MAILBOX
+__constant int _ERR_RX = -2;
+// ADAC command returned an error
+__constant int _ERR_REPLY = -3;
+
+// Wait for an AP register read to return the expected value.
+int _WaitForDataStatus(U32 regOffset, int expectedStatus)
+{
+	int status;
+	int ret;
+	int start;
+	int elapsed;
+
+	status = 0;
+	start = JLINK_GetTime();
+	elapsed = 0;
+
+	do {
+		ret = JLINK_CORESIGHT_ReadDAP(regOffset, 1, &status);
+		elapsed = JLINK_GetTime() - start;
+	} while ((ret < 0 || status != expectedStatus) && (elapsed < _CTRLAP_TIMEOUT_MS));
+
+	if (ret < 0) {
+		return ret;
+	}
+
+	return status;
+}
+
+// Continuously read from the CTRL-AP MAILBOX until there is no more pending data.
+void _DrainMailbox(void)
+{
+	int ret;
+	int status;
+	int data;
+
+	ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
+	while (ret >= 0 && status == _CTRLAP_MAILBOX_DATA_PENDING) {
+		JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
+		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
+	}
+}
+
+// Perform an ADAC transaction by:
+// * writing the given sequence of words to MAILBOX.TXDATATA, waiting for MAILBOX.TXSTATUS
+//   readiness before each write.
+// * reading a sequence of words from MAILBOX.RXDATA, waiting for MAILBOX.RXSTATUS readiness before
+//   each read.
+//
+// The message to send is read from _adacTx and the reply is written to _adacRx.
+// Optionally checks if a single data word is returned and returns an error if it is non-zero.
+//
+// Assumes that the correct AP and AP bank for CTRL-AP MAILBOX has been selected in the DP.
+int _DoAdacTransaction(int checkReplyStatus)
+{
+	int numWords;
+	int ret;
+	int data;
+	int i;
+
+	i = 0;
+	numWords = 2 + (_adacTx[1] >> 2); // Length based on the length field of the message
+
+	while (i < numWords) {
+		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_TXSTATUS_OFFSET,
+					 _CTRLAP_MAILBOX_NO_DATA_PENDING);
+		if (ret != _CTRLAP_MAILBOX_NO_DATA_PENDING) {
+			JLINK_SYS_Report1("Timed out waiting for CTRL-AP TX readiness - result: ",
+					  ret);
+			return _ERR_TX;
+		}
+
+		ret = JLINK_CORESIGHT_WriteDAP(_CTRLAP_MAILBOX_TXDATA_OFFSET, 1, _adacTx[i]);
+		if (ret < 0) {
+			JLINK_SYS_Report1("Failed to write CTRL-AP TX data - result: ", ret);
+			return _ERR_TX;
+		}
+
+		i += 1;
+	}
+
+	i = 0;
+	numWords = 2; // Minimum message length
 
-int ConfigTargetSettings(void) {
+	while (i < numWords) {
+		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_RXSTATUS_OFFSET,
+					 _CTRLAP_MAILBOX_DATA_PENDING);
+		if (ret != _CTRLAP_MAILBOX_DATA_PENDING) {
+			JLINK_SYS_Report1("Timed out waiting for CTRL-AP RX data - result: ", ret);
+			return _ERR_RX;
+		}
+
+		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
+		if (ret < 0) {
+			JLINK_SYS_Report1("Failed to read CTRL-AP RX data - result: ", ret);
+			return _ERR_RX;
+		}
+
+		if (i == 1) {
+			// Update total length based on the message length field
+			numWords = 2 + (data >> 2);
+		}
+
+		_adacRx[i] = data;
+		i += 1;
+	}
+
+	if (checkReplyStatus && _adacRx[1] == 4 && _adacRx[2] != 0) {
+		JLINK_SYS_Report1("ADAC command failed with status: ", _adacRx[2]);
+		return _ERR_REPLY;
+	}
+
+	return 0;
+}
+
+int ConfigTargetSettings(void)
+{
 	JLINK_ExecCommand("CORESIGHT_AddAP = Index=1 Type=AHB-AP");
 	CORESIGHT_IndexAHBAPToUse = 1;
 
 	return 0;
 }
 
-int ResetTarget(void) {
-	// ADAC reset
-	JLINK_CORESIGHT_WriteDP(2, 0x04000010);
-	JLINK_CORESIGHT_WriteAP(0, 0xA3030000);
-	JLINK_CORESIGHT_WriteAP(0, 0x00000004);
-	JLINK_CORESIGHT_WriteAP(0, 0x01030000);
+int ResetTarget(void)
+{
+	int err;
+	U32 adacMajorVersion;
+	U32 i;
+
+	// Select CTRL-AP bank 0, used for the READY register
+	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
+				 (_CTRLAP_ID << 24) | (_CTRLAP_READY_BANK << 4));
+
+	// Wait for the READY register to indicate that the AP can be used.
+	err = _WaitForDataStatus(_CTRLAP_READY_OFFSET, _CTRLAP_READY);
+	if (err < 0) {
+		JLINK_SYS_Report1("Timed out waiting for CTRL-AP readiness - result: ", err);
+		return -1;
+	}
+
+	// Select CTRL-AP bank 1, used for the MAILBOX registers for ADAC communication
+	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
+				 (_CTRLAP_ID << 24) | (_CTRLAP_MAILBOX_BANK << 4));
+
+	// Extract any pre-existing data from the mailbox in case there was previously
+	// an aborted transaction.
+	_DrainMailbox();
+
+	// Read the ADAC version
+	_adacTx[0] = 0xA3000000; // Command VERSION
+	_adacTx[1] = 0x00000004; // Data length 4 bytes
+	_adacTx[2] = 0x00000000; // Type 0 (ADAC version)
+	err = _DoAdacTransaction(0);
+	if (err < 0) {
+		return -1;
+	}
+
+	adacMajorVersion = (_adacRx[2] >> 24) & 0xff;
+	JLINK_SYS_Report1("ADAC major version: ", adacMajorVersion);
+
+	if (adacMajorVersion >= 2) {
+		// There is a very small chance that this command fails if the domain reset itself
+		// at the exact same time the command was issued. Therefore we retry a few times.
+		i = 0;
+		while (i < 3) {
+			// Reset non-essential domains
+			_adacTx[0] = 0xA30A0000; // Command RESET
+			_adacTx[1] = 0x00000004; // Data length 4 bytes
+			_adacTx[2] = 0x00000000; // (reserved)
+			err = _DoAdacTransaction(1);
+			if (err >= 0) {
+				break;
+			} else if (err != _ERR_REPLY) {
+				return -1;
+			}
+
+			i = i + 1;
+		}
+
+		// Start the core in halted mode
+		_adacTx[0] = 0xA3090000;                         // Command START
+		_adacTx[1] = 0x00000004;                         // Data length 4 bytes
+		_adacTx[2] = 0x01000000 | (_PROCESSOR_ID << 16); // Own processor, Flags HALT
+		err = _DoAdacTransaction(1);
+		if (err < 0) {
+			return -1;
+		}
+
+		// Start other cores normally (will fail silently if no firmware is present)
+		i = 0;
+		while (i < _NUM_OTHER_PROCESSORS) {
+			_adacTx[0] = 0xA3090000; // Command START
+			_adacTx[1] = 0x00000004; // Data length 4 bytes
+			_adacTx[2] = 0x00000000 |
+				     (_OTHER_PROCESSOR_IDS[i] << 16); // Other processor, No flags
+			err = _DoAdacTransaction(0);
+			if (err < 0 && err != _ERR_REPLY) {
+				return -1;
+			}
 
-	JLINK_SYS_Sleep(100);
-	JLINK_CORESIGHT_ReadAP(2);
-	JLINK_CORESIGHT_ReadAP(2);
-	JLINK_CORESIGHT_ReadAP(2);
-	JLINK_CORESIGHT_ReadAP(2);
+			i = i + 1;
+		}
+	} else {
+		// Reset single domain via legacy implementation
+		_adacTx[0] = 0xA3030000;                      // Command RESET
+		_adacTx[1] = 0x00000004;                      // Data length 4 bytes
+		_adacTx[2] = 0x01000000 | (_DOMAIN_ID << 16); // Own domain, Mode HALT
+		err = _DoAdacTransaction(1);
+		if (err < 0) {
+			return -1;
+		}
+	}
 
 	// Halt the CPU
 	JLINK_MEM_WriteU32(_DHCSR_ADDR, (_DHCSR_DBGKEY | _DHCSR_C_HALT | _DHCSR_C_DEBUGEN));
@@ -39,7 +259,7 @@ int ResetTarget(void) {
 	JLINK_MEM_WriteU32(_DEMCR_ADDR, (_DEMCR_VC_CORERESET | _DEMCR_TRCENA));
 
 	// Disable CPU wait
-	JLINK_MEM_WriteU32(_CPUCONF_CPUWAIT_ADDR, 0);
+	JLINK_MEM_WriteU32(_CPUCONF_ADDR + _CPUCONF_CPUWAIT_OFFSET, 0);
 
 	// Clear vector catch stuff
 	JLINK_MEM_WriteU32(_DEMCR_ADDR, _DEMCR_TRCENA);
diff --git a/boards/nordic/nrf9280pdk/support/nrf9280_cpuapp.JLinkScript b/boards/nordic/nrf9280pdk/support/nrf9280_cpuapp.JLinkScript
index ffa1beed1ed..5791a7bed9b 100644
--- a/boards/nordic/nrf9280pdk/support/nrf9280_cpuapp.JLinkScript
+++ b/boards/nordic/nrf9280pdk/support/nrf9280_cpuapp.JLinkScript
@@ -1,29 +1,248 @@
+// Constants specific to the application core
+__constant U32 _CPUCONF_ADDR = 0x52011000;
+__constant U32 _PROCESSOR_ID = 2;
+__constant U32 _DOMAIN_ID = 2;
+__constant U32 _NUM_OTHER_PROCESSORS = 2;
+const U32 _OTHER_PROCESSOR_IDS[2] = {4, 3};
+
 // Debug Halting Control and Status Register
-__constant U32 _DHCSR_ADDR      = 0xE000EDF0;
-__constant U32 _DHCSR_DBGKEY    = (0xA05F << 16);
-__constant U32 _DHCSR_C_DEBUGEN = (1 <<  0);
-__constant U32 _DHCSR_C_HALT    = (1 <<  1);
+__constant U32 _DHCSR_ADDR = 0xE000EDF0;
+__constant U32 _DHCSR_DBGKEY = (0xA05F << 16);
+__constant U32 _DHCSR_C_DEBUGEN = (1 << 0);
+__constant U32 _DHCSR_C_HALT = (1 << 1);
 
 // Debug Exception and Monitor Control Register
-__constant U32 _DEMCR_ADDR         = 0xE000EDFC;
-__constant U32 _DEMCR_VC_CORERESET = (1 <<  0);
-__constant U32 _DEMCR_TRCENA       = (1 << 24);
+__constant U32 _DEMCR_ADDR = 0xE000EDFC;
+__constant U32 _DEMCR_VC_CORERESET = (1 << 0);
+__constant U32 _DEMCR_TRCENA = (1 << 24);
 
 // CPU wait enable register
-__constant U32 _CPUCONF_CPUWAIT_ADDR = 0x5201150C;
+__constant U32 _CPUCONF_CPUWAIT_OFFSET = 0x50C;
+
+// CTRL-AP
+__constant U32 _CTRLAP_ID = 4;
+__constant U32 _CTRLAP_READY_BANK = 0;
+__constant U32 _CTRLAP_READY_OFFSET = 1;
+__constant U32 _CTRLAP_READY = 0;
+__constant U32 _CTRLAP_MAILBOX_BANK = 1;
+__constant U32 _CTRLAP_MAILBOX_TXDATA_OFFSET = 0;
+__constant U32 _CTRLAP_MAILBOX_TXSTATUS_OFFSET = 1;
+__constant U32 _CTRLAP_MAILBOX_RXDATA_OFFSET = 2;
+__constant U32 _CTRLAP_MAILBOX_RXSTATUS_OFFSET = 3;
+__constant U32 _CTRLAP_MAILBOX_NO_DATA_PENDING = 0;
+__constant U32 _CTRLAP_MAILBOX_DATA_PENDING = 1;
+__constant int _CTRLAP_TIMEOUT_MS = 500;
+
+// ADAC transaction buffers
+static U32 _adacTx[20];
+static U32 _adacRx[20];
+
+// Failed to send to the CTRL-AP MAILBOX
+__constant int _ERR_TX = -1;
+// Failed to receive from the CTRL-AP MAILBOX
+__constant int _ERR_RX = -2;
+// ADAC command returned an error
+__constant int _ERR_REPLY = -3;
+
+// Wait for an AP register read to return the expected value.
+int _WaitForDataStatus(U32 regOffset, int expectedStatus)
+{
+	int status;
+	int ret;
+	int start;
+	int elapsed;
+
+	status = 0;
+	start = JLINK_GetTime();
+	elapsed = 0;
+
+	do {
+		ret = JLINK_CORESIGHT_ReadDAP(regOffset, 1, &status);
+		elapsed = JLINK_GetTime() - start;
+	} while ((ret < 0 || status != expectedStatus) && (elapsed < _CTRLAP_TIMEOUT_MS));
+
+	if (ret < 0) {
+		return ret;
+	}
+
+	return status;
+}
+
+// Continuously read from the CTRL-AP MAILBOX until there is no more pending data.
+void _DrainMailbox(void)
+{
+	int ret;
+	int status;
+	int data;
+
+	ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
+	while (ret >= 0 && status == _CTRLAP_MAILBOX_DATA_PENDING) {
+		JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
+		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
+	}
+}
+
+// Perform an ADAC transaction by:
+// * writing the given sequence of words to MAILBOX.TXDATATA, waiting for MAILBOX.TXSTATUS
+//   readiness before each write.
+// * reading a sequence of words from MAILBOX.RXDATA, waiting for MAILBOX.RXSTATUS readiness before
+//   each read.
+//
+// The message to send is read from _adacTx and the reply is written to _adacRx.
+// Optionally checks if a single data word is returned and returns an error if it is non-zero.
+//
+// Assumes that the correct AP and AP bank for CTRL-AP MAILBOX has been selected in the DP.
+int _DoAdacTransaction(int checkReplyStatus)
+{
+	int numWords;
+	int ret;
+	int data;
+	int i;
+
+	i = 0;
+	numWords = 2 + (_adacTx[1] >> 2); // Length based on the length field of the message
+
+	while (i < numWords) {
+		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_TXSTATUS_OFFSET,
+					 _CTRLAP_MAILBOX_NO_DATA_PENDING);
+		if (ret != _CTRLAP_MAILBOX_NO_DATA_PENDING) {
+			JLINK_SYS_Report1("Timed out waiting for CTRL-AP TX readiness - result: ",
+					  ret);
+			return _ERR_TX;
+		}
+
+		ret = JLINK_CORESIGHT_WriteDAP(_CTRLAP_MAILBOX_TXDATA_OFFSET, 1, _adacTx[i]);
+		if (ret < 0) {
+			JLINK_SYS_Report1("Failed to write CTRL-AP TX data - result: ", ret);
+			return _ERR_TX;
+		}
+
+		i += 1;
+	}
+
+	i = 0;
+	numWords = 2; // Minimum message length
+
+	while (i < numWords) {
+		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_RXSTATUS_OFFSET,
+					 _CTRLAP_MAILBOX_DATA_PENDING);
+		if (ret != _CTRLAP_MAILBOX_DATA_PENDING) {
+			JLINK_SYS_Report1("Timed out waiting for CTRL-AP RX data - result: ", ret);
+			return _ERR_RX;
+		}
+
+		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
+		if (ret < 0) {
+			JLINK_SYS_Report1("Failed to read CTRL-AP RX data - result: ", ret);
+			return _ERR_RX;
+		}
+
+		if (i == 1) {
+			// Update total length based on the message length field
+			numWords = 2 + (data >> 2);
+		}
+
+		_adacRx[i] = data;
+		i += 1;
+	}
+
+	if (checkReplyStatus && _adacRx[1] == 4 && _adacRx[2] != 0) {
+		JLINK_SYS_Report1("ADAC command failed with status: ", _adacRx[2]);
+		return _ERR_REPLY;
+	}
+
+	return 0;
+}
+
+int ResetTarget(void)
+{
+	int err;
+	U32 adacMajorVersion;
+	U32 i;
+
+	// Select CTRL-AP bank 0, used for the READY register
+	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
+				 (_CTRLAP_ID << 24) | (_CTRLAP_READY_BANK << 4));
+
+	// Wait for the READY register to indicate that the AP can be used.
+	err = _WaitForDataStatus(_CTRLAP_READY_OFFSET, _CTRLAP_READY);
+	if (err < 0) {
+		JLINK_SYS_Report1("Timed out waiting for CTRL-AP readiness - result: ", err);
+		return -1;
+	}
+
+	// Select CTRL-AP bank 1, used for the MAILBOX registers for ADAC communication
+	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
+				 (_CTRLAP_ID << 24) | (_CTRLAP_MAILBOX_BANK << 4));
+
+	// Extract any pre-existing data from the mailbox in case there was previously
+	// an aborted transaction.
+	_DrainMailbox();
+
+	// Read the ADAC version
+	_adacTx[0] = 0xA3000000; // Command VERSION
+	_adacTx[1] = 0x00000004; // Data length 4 bytes
+	_adacTx[2] = 0x00000000; // Type 0 (ADAC version)
+	err = _DoAdacTransaction(0);
+	if (err < 0) {
+		return -1;
+	}
+
+	adacMajorVersion = (_adacRx[2] >> 24) & 0xff;
+	JLINK_SYS_Report1("ADAC major version: ", adacMajorVersion);
+
+	if (adacMajorVersion >= 2) {
+		// There is a very small chance that this command fails if the domain reset itself
+		// at the exact same time the command was issued. Therefore we retry a few times.
+		i = 0;
+		while (i < 3) {
+			// Reset non-essential domains
+			_adacTx[0] = 0xA30A0000; // Command RESET
+			_adacTx[1] = 0x00000004; // Data length 4 bytes
+			_adacTx[2] = 0x00000000; // (reserved)
+			err = _DoAdacTransaction(1);
+			if (err >= 0) {
+				break;
+			} else if (err != _ERR_REPLY) {
+				return -1;
+			}
+
+			i = i + 1;
+		}
+
+		// Start the core in halted mode
+		_adacTx[0] = 0xA3090000;                         // Command START
+		_adacTx[1] = 0x00000004;                         // Data length 4 bytes
+		_adacTx[2] = 0x01000000 | (_PROCESSOR_ID << 16); // Own processor, Flags HALT
+		err = _DoAdacTransaction(1);
+		if (err < 0) {
+			return -1;
+		}
 
-int ResetTarget(void) {
-	// ADAC reset
-	JLINK_CORESIGHT_WriteDP(2, 0x04000010);
-	JLINK_CORESIGHT_WriteAP(0, 0xA3030000);
-	JLINK_CORESIGHT_WriteAP(0, 0x00000004);
-	JLINK_CORESIGHT_WriteAP(0, 0x01020000);
+		// Start other cores normally (will fail silently if no firmware is present)
+		i = 0;
+		while (i < _NUM_OTHER_PROCESSORS) {
+			_adacTx[0] = 0xA3090000; // Command START
+			_adacTx[1] = 0x00000004; // Data length 4 bytes
+			_adacTx[2] = 0x00000000 |
+				     (_OTHER_PROCESSOR_IDS[i] << 16); // Other processor, No flags
+			err = _DoAdacTransaction(0);
+			if (err < 0 && err != _ERR_REPLY) {
+				return -1;
+			}
 
-	JLINK_SYS_Sleep(100);
-	JLINK_CORESIGHT_ReadAP(2);
-	JLINK_CORESIGHT_ReadAP(2);
-	JLINK_CORESIGHT_ReadAP(2);
-	JLINK_CORESIGHT_ReadAP(2);
+			i = i + 1;
+		}
+	} else {
+		// Reset single domain via legacy implementation
+		_adacTx[0] = 0xA3030000;                      // Command RESET
+		_adacTx[1] = 0x00000004;                      // Data length 4 bytes
+		_adacTx[2] = 0x01000000 | (_DOMAIN_ID << 16); // Own domain, Mode HALT
+		err = _DoAdacTransaction(1);
+		if (err < 0) {
+			return -1;
+		}
+	}
 
 	// Halt the CPU
 	JLINK_MEM_WriteU32(_DHCSR_ADDR, (_DHCSR_DBGKEY | _DHCSR_C_HALT | _DHCSR_C_DEBUGEN));
@@ -32,7 +251,7 @@ int ResetTarget(void) {
 	JLINK_MEM_WriteU32(_DEMCR_ADDR, (_DEMCR_VC_CORERESET | _DEMCR_TRCENA));
 
 	// Disable CPU wait
-	JLINK_MEM_WriteU32(_CPUCONF_CPUWAIT_ADDR, 0);
+	JLINK_MEM_WriteU32(_CPUCONF_ADDR + _CPUCONF_CPUWAIT_OFFSET, 0);
 
 	// Clear vector catch stuff
 	JLINK_MEM_WriteU32(_DEMCR_ADDR, _DEMCR_TRCENA);
diff --git a/boards/nordic/nrf9280pdk/support/nrf9280_cpurad.JLinkScript b/boards/nordic/nrf9280pdk/support/nrf9280_cpurad.JLinkScript
index 2f1802801c1..02b84dcc970 100644
--- a/boards/nordic/nrf9280pdk/support/nrf9280_cpurad.JLinkScript
+++ b/boards/nordic/nrf9280pdk/support/nrf9280_cpurad.JLinkScript
@@ -1,36 +1,256 @@
+// Constants specific to the radio core
+__constant U32 _CPUCONF_ADDR = 0x53011000;
+__constant U32 _PROCESSOR_ID = 3;
+__constant U32 _DOMAIN_ID = 3;
+__constant U32 _NUM_OTHER_PROCESSORS = 2;
+const U32 _OTHER_PROCESSOR_IDS[2] = {4, 2};
+
 // Debug Halting Control and Status Register
-__constant U32 _DHCSR_ADDR      = 0xE000EDF0;
-__constant U32 _DHCSR_DBGKEY    = (0xA05F << 16);
-__constant U32 _DHCSR_C_DEBUGEN = (1 <<  0);
-__constant U32 _DHCSR_C_HALT    = (1 <<  1);
+__constant U32 _DHCSR_ADDR = 0xE000EDF0;
+__constant U32 _DHCSR_DBGKEY = (0xA05F << 16);
+__constant U32 _DHCSR_C_DEBUGEN = (1 << 0);
+__constant U32 _DHCSR_C_HALT = (1 << 1);
 
 // Debug Exception and Monitor Control Register
-__constant U32 _DEMCR_ADDR         = 0xE000EDFC;
-__constant U32 _DEMCR_VC_CORERESET = (1 <<  0);
-__constant U32 _DEMCR_TRCENA       = (1 << 24);
+__constant U32 _DEMCR_ADDR = 0xE000EDFC;
+__constant U32 _DEMCR_VC_CORERESET = (1 << 0);
+__constant U32 _DEMCR_TRCENA = (1 << 24);
 
 // CPU wait enable register
-__constant U32 _CPUCONF_CPUWAIT_ADDR = 0x5301150C;
+__constant U32 _CPUCONF_CPUWAIT_OFFSET = 0x50C;
+
+// CTRL-AP
+__constant U32 _CTRLAP_ID = 4;
+__constant U32 _CTRLAP_READY_BANK = 0;
+__constant U32 _CTRLAP_READY_OFFSET = 1;
+__constant U32 _CTRLAP_READY = 0;
+__constant U32 _CTRLAP_MAILBOX_BANK = 1;
+__constant U32 _CTRLAP_MAILBOX_TXDATA_OFFSET = 0;
+__constant U32 _CTRLAP_MAILBOX_TXSTATUS_OFFSET = 1;
+__constant U32 _CTRLAP_MAILBOX_RXDATA_OFFSET = 2;
+__constant U32 _CTRLAP_MAILBOX_RXSTATUS_OFFSET = 3;
+__constant U32 _CTRLAP_MAILBOX_NO_DATA_PENDING = 0;
+__constant U32 _CTRLAP_MAILBOX_DATA_PENDING = 1;
+__constant int _CTRLAP_TIMEOUT_MS = 500;
+
+// ADAC transaction buffers
+static U32 _adacTx[20];
+static U32 _adacRx[20];
+
+// Failed to send to the CTRL-AP MAILBOX
+__constant int _ERR_TX = -1;
+// Failed to receive from the CTRL-AP MAILBOX
+__constant int _ERR_RX = -2;
+// ADAC command returned an error
+__constant int _ERR_REPLY = -3;
+
+// Wait for an AP register read to return the expected value.
+int _WaitForDataStatus(U32 regOffset, int expectedStatus)
+{
+	int status;
+	int ret;
+	int start;
+	int elapsed;
+
+	status = 0;
+	start = JLINK_GetTime();
+	elapsed = 0;
+
+	do {
+		ret = JLINK_CORESIGHT_ReadDAP(regOffset, 1, &status);
+		elapsed = JLINK_GetTime() - start;
+	} while ((ret < 0 || status != expectedStatus) && (elapsed < _CTRLAP_TIMEOUT_MS));
+
+	if (ret < 0) {
+		return ret;
+	}
+
+	return status;
+}
+
+// Continuously read from the CTRL-AP MAILBOX until there is no more pending data.
+void _DrainMailbox(void)
+{
+	int ret;
+	int status;
+	int data;
+
+	ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
+	while (ret >= 0 && status == _CTRLAP_MAILBOX_DATA_PENDING) {
+		JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
+		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
+	}
+}
+
+// Perform an ADAC transaction by:
+// * writing the given sequence of words to MAILBOX.TXDATATA, waiting for MAILBOX.TXSTATUS
+//   readiness before each write.
+// * reading a sequence of words from MAILBOX.RXDATA, waiting for MAILBOX.RXSTATUS readiness before
+//   each read.
+//
+// The message to send is read from _adacTx and the reply is written to _adacRx.
+// Optionally checks if a single data word is returned and returns an error if it is non-zero.
+//
+// Assumes that the correct AP and AP bank for CTRL-AP MAILBOX has been selected in the DP.
+int _DoAdacTransaction(int checkReplyStatus)
+{
+	int numWords;
+	int ret;
+	int data;
+	int i;
+
+	i = 0;
+	numWords = 2 + (_adacTx[1] >> 2); // Length based on the length field of the message
+
+	while (i < numWords) {
+		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_TXSTATUS_OFFSET,
+					 _CTRLAP_MAILBOX_NO_DATA_PENDING);
+		if (ret != _CTRLAP_MAILBOX_NO_DATA_PENDING) {
+			JLINK_SYS_Report1("Timed out waiting for CTRL-AP TX readiness - result: ",
+					  ret);
+			return _ERR_TX;
+		}
+
+		ret = JLINK_CORESIGHT_WriteDAP(_CTRLAP_MAILBOX_TXDATA_OFFSET, 1, _adacTx[i]);
+		if (ret < 0) {
+			JLINK_SYS_Report1("Failed to write CTRL-AP TX data - result: ", ret);
+			return _ERR_TX;
+		}
+
+		i += 1;
+	}
+
+	i = 0;
+	numWords = 2; // Minimum message length
 
-int ConfigTargetSettings(void) {
+	while (i < numWords) {
+		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_RXSTATUS_OFFSET,
+					 _CTRLAP_MAILBOX_DATA_PENDING);
+		if (ret != _CTRLAP_MAILBOX_DATA_PENDING) {
+			JLINK_SYS_Report1("Timed out waiting for CTRL-AP RX data - result: ", ret);
+			return _ERR_RX;
+		}
+
+		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
+		if (ret < 0) {
+			JLINK_SYS_Report1("Failed to read CTRL-AP RX data - result: ", ret);
+			return _ERR_RX;
+		}
+
+		if (i == 1) {
+			// Update total length based on the message length field
+			numWords = 2 + (data >> 2);
+		}
+
+		_adacRx[i] = data;
+		i += 1;
+	}
+
+	if (checkReplyStatus && _adacRx[1] == 4 && _adacRx[2] != 0) {
+		JLINK_SYS_Report1("ADAC command failed with status: ", _adacRx[2]);
+		return _ERR_REPLY;
+	}
+
+	return 0;
+}
+
+int ConfigTargetSettings(void)
+{
 	JLINK_ExecCommand("CORESIGHT_AddAP = Index=1 Type=AHB-AP");
 	CORESIGHT_IndexAHBAPToUse = 1;
 
 	return 0;
 }
 
-int ResetTarget(void) {
-	// ADAC reset
-	JLINK_CORESIGHT_WriteDP(2, 0x04000010);
-	JLINK_CORESIGHT_WriteAP(0, 0xA3030000);
-	JLINK_CORESIGHT_WriteAP(0, 0x00000004);
-	JLINK_CORESIGHT_WriteAP(0, 0x01030000);
+int ResetTarget(void)
+{
+	int err;
+	U32 adacMajorVersion;
+	U32 i;
+
+	// Select CTRL-AP bank 0, used for the READY register
+	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
+				 (_CTRLAP_ID << 24) | (_CTRLAP_READY_BANK << 4));
+
+	// Wait for the READY register to indicate that the AP can be used.
+	err = _WaitForDataStatus(_CTRLAP_READY_OFFSET, _CTRLAP_READY);
+	if (err < 0) {
+		JLINK_SYS_Report1("Timed out waiting for CTRL-AP readiness - result: ", err);
+		return -1;
+	}
+
+	// Select CTRL-AP bank 1, used for the MAILBOX registers for ADAC communication
+	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
+				 (_CTRLAP_ID << 24) | (_CTRLAP_MAILBOX_BANK << 4));
+
+	// Extract any pre-existing data from the mailbox in case there was previously
+	// an aborted transaction.
+	_DrainMailbox();
+
+	// Read the ADAC version
+	_adacTx[0] = 0xA3000000; // Command VERSION
+	_adacTx[1] = 0x00000004; // Data length 4 bytes
+	_adacTx[2] = 0x00000000; // Type 0 (ADAC version)
+	err = _DoAdacTransaction(0);
+	if (err < 0) {
+		return -1;
+	}
+
+	adacMajorVersion = (_adacRx[2] >> 24) & 0xff;
+	JLINK_SYS_Report1("ADAC major version: ", adacMajorVersion);
+
+	if (adacMajorVersion >= 2) {
+		// There is a very small chance that this command fails if the domain reset itself
+		// at the exact same time the command was issued. Therefore we retry a few times.
+		i = 0;
+		while (i < 3) {
+			// Reset non-essential domains
+			_adacTx[0] = 0xA30A0000; // Command RESET
+			_adacTx[1] = 0x00000004; // Data length 4 bytes
+			_adacTx[2] = 0x00000000; // (reserved)
+			err = _DoAdacTransaction(1);
+			if (err >= 0) {
+				break;
+			} else if (err != _ERR_REPLY) {
+				return -1;
+			}
+
+			i = i + 1;
+		}
+
+		// Start the core in halted mode
+		_adacTx[0] = 0xA3090000;                         // Command START
+		_adacTx[1] = 0x00000004;                         // Data length 4 bytes
+		_adacTx[2] = 0x01000000 | (_PROCESSOR_ID << 16); // Own processor, Flags HALT
+		err = _DoAdacTransaction(1);
+		if (err < 0) {
+			return -1;
+		}
+
+		// Start other cores normally (will fail silently if no firmware is present)
+		i = 0;
+		while (i < _NUM_OTHER_PROCESSORS) {
+			_adacTx[0] = 0xA3090000; // Command START
+			_adacTx[1] = 0x00000004; // Data length 4 bytes
+			_adacTx[2] = 0x00000000 |
+				     (_OTHER_PROCESSOR_IDS[i] << 16); // Other processor, No flags
+			err = _DoAdacTransaction(0);
+			if (err < 0 && err != _ERR_REPLY) {
+				return -1;
+			}
 
-	JLINK_SYS_Sleep(100);
-	JLINK_CORESIGHT_ReadAP(2);
-	JLINK_CORESIGHT_ReadAP(2);
-	JLINK_CORESIGHT_ReadAP(2);
-	JLINK_CORESIGHT_ReadAP(2);
+			i = i + 1;
+		}
+	} else {
+		// Reset single domain via legacy implementation
+		_adacTx[0] = 0xA3030000;                      // Command RESET
+		_adacTx[1] = 0x00000004;                      // Data length 4 bytes
+		_adacTx[2] = 0x01000000 | (_DOMAIN_ID << 16); // Own domain, Mode HALT
+		err = _DoAdacTransaction(1);
+		if (err < 0) {
+			return -1;
+		}
+	}
 
 	// Halt the CPU
 	JLINK_MEM_WriteU32(_DHCSR_ADDR, (_DHCSR_DBGKEY | _DHCSR_C_HALT | _DHCSR_C_DEBUGEN));
@@ -39,7 +259,7 @@ int ResetTarget(void) {
 	JLINK_MEM_WriteU32(_DEMCR_ADDR, (_DEMCR_VC_CORERESET | _DEMCR_TRCENA));
 
 	// Disable CPU wait
-	JLINK_MEM_WriteU32(_CPUCONF_CPUWAIT_ADDR, 0);
+	JLINK_MEM_WriteU32(_CPUCONF_ADDR + _CPUCONF_CPUWAIT_OFFSET, 0);
 
 	// Clear vector catch stuff
 	JLINK_MEM_WriteU32(_DEMCR_ADDR, _DEMCR_TRCENA);

From e60e1f237b85f293585d862c5d4a6ac9e416fc84 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Mon, 7 Oct 2024 09:22:17 +0200
Subject: [PATCH 0168/2913] [nrf fromtree] boards: nordic: nrf54h20dk: make
 RAM3x DMA region larger for cpurad

Some tests are failing on nrf54h20 cpurad in non-obvious manner
because of this memory region being too small.
Instead of adding overlays to each individual application,
make this region larger at expense of cpuapp equivalent.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit e0860eb9a6c9c099cf67152f8775d73bb3aebc3d)
(cherry picked from commit 8717086d4d5e8ff49579589c618c5739418da66e)
(cherry picked from commit f00fc6dd11b6774f7d135e0a5e9e9a145f3013a2)
---
 .../nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index bf96741de22..f001678cb1f 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -183,16 +183,16 @@
 
 			cpuapp_dma_region: memory@e80 {
 				compatible = "zephyr,memory-region";
-				reg = <0xe80 DT_SIZE_K(4)>;
+				reg = <0xe80 DT_SIZE_K(3)>;
 				status = "disabled";
 				#memory-region-cells = <0>;
 				zephyr,memory-region = "DMA_RAM3x_APP";
 				zephyr,memory-attr = <( DT_MEM_DMA )>;
 			};
 
-			cpurad_dma_region: memory@1e80 {
+			cpurad_dma_region: memory@1a80 {
 				compatible = "zephyr,memory-region";
-				reg = <0x1e80 0x80>;
+				reg = <0x1a80 0x480>;
 				status = "disabled";
 				#memory-region-cells = <0>;
 				zephyr,memory-region = "DMA_RAM3x_RAD";

From 2b2dd1bd365786a30b1f270e09a2d44a73156aad Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Fri, 3 May 2024 10:07:30 +0200
Subject: [PATCH 0169/2913] [nrf fromtree] dts: bindings: Update Nordic owned
 memory bindings

This concerns both `nordic,owned-memory` and `nordic,owned-partitions`.

Introduce a property named `nordic,access`, which is meant to replace
the `owner-id` and `perm-*` properties. It allows for describing how
multiple domains should access a single memory region, possibly with
different permissions per owner, but without having to create more than
one DT node for this purpose.

This change is also motivated by updated memory protection requirements
on the nRF54H20, which mandate that a given memory region must only be
reserved by one domain, even if multiple domains can have access to it.
This restriction is now described in the binding itself.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 365e9d63d038973b262ef156f0f383eb965d9f35)
(cherry picked from commit 0c72bd83be523c04a28ebd0a39dcd6f92da3ce8d)
(cherry picked from commit 96931f1119be1651591ae24bee358eeac2cabebe)
---
 dts/bindings/mtd/nordic,owned-partitions.yaml |  6 +-
 .../reserved-memory/nordic,owned-memory.yaml  | 74 +++++++++++++++++--
 dts/common/nordic/nrf54h20.dtsi               |  1 +
 dts/common/nordic/nrf9280.dtsi                |  1 +
 .../reserved-memory/nordic-owned-memory.h     | 53 +++++++++++++
 5 files changed, 125 insertions(+), 10 deletions(-)
 create mode 100644 include/zephyr/dt-bindings/reserved-memory/nordic-owned-memory.h

diff --git a/dts/bindings/mtd/nordic,owned-partitions.yaml b/dts/bindings/mtd/nordic,owned-partitions.yaml
index bf42c13346a..6dd300ecb98 100644
--- a/dts/bindings/mtd/nordic,owned-partitions.yaml
+++ b/dts/bindings/mtd/nordic,owned-partitions.yaml
@@ -24,8 +24,7 @@ description: |
 
         rx-partitions {
             compatible = "nordic,owned-partitions";
-            perm-read;
-            perm-execute;
+            nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RX>;
             #address-cells = <1>;
             #size-cells = <1>;
 
@@ -37,8 +36,7 @@ description: |
 
         rw-partitions {
             compatible = "nordic,owned-partitions";
-            perm-read;
-            perm-write;
+            nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
             #address-cells = <1>;
             #size-cells = <1>;
 
diff --git a/dts/bindings/reserved-memory/nordic,owned-memory.yaml b/dts/bindings/reserved-memory/nordic,owned-memory.yaml
index 9b13c965ac8..69f3e4f9f7b 100644
--- a/dts/bindings/reserved-memory/nordic,owned-memory.yaml
+++ b/dts/bindings/reserved-memory/nordic,owned-memory.yaml
@@ -8,17 +8,64 @@ description: |
   will be recorded in the UICR of the compiled domain. Memory ownership and
   access is then configured for the domain at boot time, based on the UICR.
 
+  Example:
+
+    reserved-memory {
+        memory@2fc00000 {
+            compatible = "nordic,owned-memory";
+            reg = <0x2fc00000 0x1000>;
+            status = "okay";
+            nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_R>,
+                            <NRF_OWNER_ID_RADIOCORE NRF_PERM_W>;
+        };
+    };
+
+  A single local domain can request a memory region to be reserved on behalf of
+  multiple access owners. A single memory region shall be reserved by at most
+  one domain, by setting status "okay" on the associated node. For example, if
+  the region defined above is enabled by Application on behalf of Radiocore,
+  then the Radiocore's devicetree must set status "disabled" on that node.
+
+  Each of the different owners may have a different set of permissions granted,
+  as also shown above.
+
+  Note: one domain can also reserve memory for another domain and not itself.
+  Whichever domain has status "okay" set on the node does not need to be listed
+  as one of the access owners.
+
 compatible: "nordic,owned-memory"
 
-include: base.yaml
+include: [base.yaml, "zephyr,memory-common.yaml"]
 
 properties:
   reg:
     required: true
 
+  nordic,access:
+    type: array
+    description: |
+      Array of (owner-id, permission-flags) pairs, where:
+
+      - Owner ID represents the domain that will have access to this memory.
+        Valid values can be found in dts/common/nordic/<soc>.dtsi,
+        where they are defined as NRF_OWNER_ID_*
+
+      - Permissions are encoded as a 32-bit bitfield, using the flags found in
+        include/zephyr/dt-bindings/reserved-memory/nordic-owned-memory.h,
+        where they are defined as NRF_PERM_*
+
+        The same file defines all possible permission flag combinations.
+        For example, one can use:
+          <NRF_OWNER_ID_APPLICATION NRF_PERM_RWX>
+
+        as a shorthand for:
+          <NRF_OWNER_ID_APPLICATION (NRF_PERM_R | NRF_PERM_W | NRF_PERM_X)>
+
   owner-id:
     type: int
+    deprecated: true
     description: |
+      Deprecated, applies only if 'nordic,access' is not defined.
       Owner ID of the domain that will own this memory region. If not defined,
       the ownership will default to the domain being compiled.
 
@@ -27,20 +74,35 @@ properties:
 
   perm-read:
     type: boolean
-    description: Owner has read access to the region.
+    deprecated: true
+    description: |
+      Deprecated, applies only if 'nordic,access' is not defined.
+      Owner has read access to the region.
 
   perm-write:
     type: boolean
-    description: Owner has write access to the region.
+    deprecated: true
+    description: |
+      Deprecated, applies only if 'nordic,access' is not defined.
+      Owner has write access to the region.
 
   perm-execute:
     type: boolean
-    description: Owner can execute code from the region.
+    deprecated: true
+    description: |
+      Deprecated, applies only if 'nordic,access' is not defined.
+      Owner can execute code from the region.
 
   perm-secure:
     type: boolean
-    description: Owner has secure-only access to the region.
+    deprecated: true
+    description: |
+      Deprecated, applies only if 'nordic,access' is not defined.
+      Owner has secure-only access to the region.
 
   non-secure-callable:
     type: boolean
-    description: Memory region is used for non-secure-callable code.
+    deprecated: true
+    description: |
+      Deprecated, applies only if 'nordic,access' is not defined.
+      Memory region is used for non-secure-callable code.
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 7c8e9a3eec3..1aae058b70e 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -11,6 +11,7 @@
 #include <zephyr/dt-bindings/misc/nordic-domain-id-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-owner-id-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-tddconf.h>
+#include <zephyr/dt-bindings/reserved-memory/nordic-owned-memory.h>
 
 /delete-node/ &sw_pwm;
 
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 59f450aba1d..08223449076 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -10,6 +10,7 @@
 #include <zephyr/dt-bindings/misc/nordic-nrf-ficr-nrf9230-engb.h>
 #include <zephyr/dt-bindings/misc/nordic-domain-id-nrf9230.h>
 #include <zephyr/dt-bindings/misc/nordic-owner-id-nrf9230.h>
+#include <zephyr/dt-bindings/reserved-memory/nordic-owned-memory.h>
 
 /delete-node/ &sw_pwm;
 
diff --git a/include/zephyr/dt-bindings/reserved-memory/nordic-owned-memory.h b/include/zephyr/dt-bindings/reserved-memory/nordic-owned-memory.h
new file mode 100644
index 00000000000..90f43379372
--- /dev/null
+++ b/include/zephyr/dt-bindings/reserved-memory/nordic-owned-memory.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_RESERVED_MEMORY_NORDIC_OWNED_MEMORY_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_RESERVED_MEMORY_NORDIC_OWNED_MEMORY_H_
+
+#include <zephyr/dt-bindings/dt-util.h>
+
+/**
+ * @name Basic memory permission flags.
+ * @{
+ */
+
+/** Readable. */
+#define NRF_PERM_R BIT(0)
+/** Writable. */
+#define NRF_PERM_W BIT(1)
+/** Executable. */
+#define NRF_PERM_X BIT(2)
+/** Secure-only. */
+#define NRF_PERM_S BIT(3)
+/** Non-secure-callable. */
+#define NRF_PERM_NSC BIT(4)
+
+/**
+ * @}
+ */
+
+/**
+ * @name Memory permission flag combinations.
+ * @note NRF_PERM_NSC overrides all other flags, so it is not included here.
+ * @{
+ */
+
+#define NRF_PERM_RW   (NRF_PERM_R | NRF_PERM_W)
+#define NRF_PERM_RX   (NRF_PERM_R | NRF_PERM_X)
+#define NRF_PERM_RS   (NRF_PERM_R | NRF_PERM_S)
+#define NRF_PERM_WX   (NRF_PERM_W | NRF_PERM_X)
+#define NRF_PERM_WS   (NRF_PERM_W | NRF_PERM_S)
+#define NRF_PERM_XS   (NRF_PERM_X | NRF_PERM_S)
+#define NRF_PERM_RWX  (NRF_PERM_R | NRF_PERM_W | NRF_PERM_X)
+#define NRF_PERM_RWS  (NRF_PERM_R | NRF_PERM_W | NRF_PERM_S)
+#define NRF_PERM_RXS  (NRF_PERM_R | NRF_PERM_X | NRF_PERM_S)
+#define NRF_PERM_WXS  (NRF_PERM_W | NRF_PERM_X | NRF_PERM_S)
+#define NRF_PERM_RWXS (NRF_PERM_R | NRF_PERM_W | NRF_PERM_X | NRF_PERM_S)
+
+/**
+ * @}
+ */
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_RESERVED_MEMORY_NORDIC_OWNED_MEMORY_H_ */

From 3711cfab2250084f70ba50271488dcb9acb0e19b Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Fri, 3 May 2024 10:07:30 +0200
Subject: [PATCH 0170/2913] [nrf fromtree] boards: nordic: Align with updated
 Nordic owned memory bindings

Apply the following changes to `nrf54h20dk` and `nrf9280pdk`:

* Convert `perm-*` properties to the newly introduced `nordic,access`,
  both in board files and tests.

* Redefine shared regions to specify multiple access owners per node,
  and ensure that each such region is reserved by one domain at a time.
  `cpuapp_cpurad_ram0x_region` is only enabled by Radiocore, while
  `cpuapp_cpucell_ram0x_region` is only enabled by Application core.

* Divide `shared_ram3x_region` so that each sub-region is owned by a
  different domain. Their addresses must be rounded down to fit the
  current UICR format.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 13b1cfa5ec82971ba1cd1d5c650bf985d8b25221)
(cherry picked from commit c1bf188b54ac57df29eccc57c9213fb6f93c1ff7)
(cherry picked from commit f716e662d0cc39461d368285eda15a07e8545c8e)
---
 .../nrf54h20dk_nrf54h20-memory_map.dtsi       | 59 ++++++---------
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts |  8 ---
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts |  4 --
 .../nrf9280pdk_nrf9280-memory_map.dtsi        | 72 +++++--------------
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts  | 14 +---
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts  |  4 --
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  2 +-
 .../boards/nrf54h20dk_nrf54h20_cpurad.overlay |  5 --
 .../boards/nrf54h20dk_nrf54h20_cpurad.overlay |  5 --
 9 files changed, 40 insertions(+), 133 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index f001678cb1f..e26afaaa637 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -11,9 +11,7 @@
 			compatible = "nordic,owned-memory";
 			reg = <0x2f010000 DT_SIZE_K(260)>;
 			status = "disabled";
-			perm-read;
-			perm-write;
-			perm-secure;
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f010000 0x41000>;
@@ -35,9 +33,7 @@
 			compatible = "nordic,owned-memory";
 			reg = <0x2f051000 DT_SIZE_K(4)>;
 			status = "disabled";
-			perm-read;
-			perm-write;
-			perm-secure;
+			nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RWS>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f051000 0x1000>;
@@ -55,9 +51,7 @@
 			compatible = "nordic,owned-memory";
 			reg = <0x2f0be000 DT_SIZE_K(4)>;
 			status = "disabled";
-			perm-read;
-			perm-write;
-			perm-secure;
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f0be000 0x1000>;
@@ -72,8 +66,8 @@
 			compatible = "nordic,owned-memory";
 			reg = <0x2f0bf000 DT_SIZE_K(4)>;
 			status = "disabled";
-			perm-read;
-			perm-write;
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>,
+					<NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f0bf000 0x1000>;
@@ -111,16 +105,15 @@
 		};
 
 		/*
-		 * NOTE: perm-execute is not required as FLPR has a direct
-		 * bridge with RAM21, bypassing MPC.
+		 * NOTE: FLPR has a direct bridge with RAM21 that bypasses MPC.
+		 * This means that when this region is marked as non-executable,
+		 * only FLPR can execute code from it.
 		 */
 		ram21_region: memory@2f890000 {
 			compatible = "nordic,owned-memory";
 			status = "disabled";
 			reg = <0x2f890000 DT_SIZE_K(64)>;
-			perm-read;
-			perm-write;
-			perm-secure;
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f890000 0x10000>;
@@ -151,9 +144,7 @@
 			compatible = "nordic,owned-memory";
 			reg = <0x2fc00000 DT_SIZE_K(64)>;
 			status = "disabled";
-			perm-read;
-			perm-write;
-			perm-execute;
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWX>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2fc00000 0x10000>;
@@ -172,29 +163,27 @@
 		};
 
 		shared_ram3x_region: memory@2fc12000 {
-			compatible = "nordic,owned-memory";
 			reg = <0x2fc12000 DT_SIZE_K(8)>;
-			status = "disabled";
-			perm-read;
-			perm-write;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2fc12000 0x2000>;
 
-			cpuapp_dma_region: memory@e80 {
-				compatible = "zephyr,memory-region";
-				reg = <0xe80 DT_SIZE_K(3)>;
+			cpuapp_dma_region: memory@0 {
+				compatible = "nordic,owned-memory", "zephyr,memory-region";
+				reg = <0x0 DT_SIZE_K(4)>;
 				status = "disabled";
 				#memory-region-cells = <0>;
+				nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
 				zephyr,memory-region = "DMA_RAM3x_APP";
 				zephyr,memory-attr = <( DT_MEM_DMA )>;
 			};
 
-			cpurad_dma_region: memory@1a80 {
-				compatible = "zephyr,memory-region";
-				reg = <0x1a80 0x480>;
+			cpurad_dma_region: memory@1000 {
+				compatible = "nordic,owned-memory", "zephyr,memory-region";
+				reg = <0x1000 DT_SIZE_K(1)>;
 				status = "disabled";
 				#memory-region-cells = <0>;
+				nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
 				zephyr,memory-region = "DMA_RAM3x_RAD";
 				zephyr,memory-attr = <( DT_MEM_DMA )>;
 			};
@@ -206,9 +195,7 @@
 	cpurad_rx_partitions: cpurad-rx-partitions {
 		compatible = "nordic,owned-partitions", "fixed-partitions";
 		status = "disabled";
-		perm-read;
-		perm-execute;
-		perm-secure;
+		nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RXS>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
@@ -220,9 +207,7 @@
 	cpuapp_rx_partitions: cpuapp-rx-partitions {
 		compatible = "nordic,owned-partitions", "fixed-partitions";
 		status = "disabled";
-		perm-read;
-		perm-execute;
-		perm-secure;
+		nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RXS>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
@@ -242,9 +227,7 @@
 	cpuapp_rw_partitions: cpuapp-rw-partitions {
 		compatible = "nordic,owned-partitions", "fixed-partitions";
 		status = "disabled";
-		perm-read;
-		perm-write;
-		perm-secure;
+		nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 517b6ed853c..eacc510ce8a 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -116,14 +116,6 @@
 	status = "okay";
 };
 
-&cpuapp_cpurad_ram0x_region {
-	status = "okay";
-};
-
-&shared_ram3x_region {
-	status = "okay";
-};
-
 &ram21_region {
 	status = "okay";
 };
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
index 31827405f5f..77e69aa463c 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
@@ -34,10 +34,6 @@
 	};
 };
 
-&shared_ram3x_region {
-	status = "okay";
-};
-
 &cpuapp_cpurad_ram0x_region {
 	status = "okay";
 };
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi
index 78e3be8825f..957fde61212 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi
@@ -15,9 +15,7 @@
 			compatible = "nordic,owned-memory";
 			reg = <0x2f011000 DT_SIZE_K(4)>;
 			status = "disabled";
-			perm-read;
-			perm-write;
-			perm-secure;
+			nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RWS>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f011000 0x1000>;
@@ -35,9 +33,7 @@
 			compatible = "nordic,owned-memory";
 			reg = <0x2f012000 DT_SIZE_K(516)>;
 			status = "disabled";
-			perm-read;
-			perm-write;
-			perm-secure;
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f012000 0x81000>;
@@ -59,8 +55,8 @@
 			compatible = "nordic,owned-memory";
 			reg = <0x2f0cf000 DT_SIZE_K(4)>;
 			status = "disabled";
-			perm-read;
-			perm-write;
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>,
+					<NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f0cf000 0x1000>;
@@ -75,8 +71,11 @@
 		};
 
 		cpuapp_cpucell_ram0x_region: memory@2f0d0000 {
+			compatible = "nordic,owned-memory";
 			reg = <0x2f0d0000 DT_SIZE_K(36)>;
 			status = "disabled";
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>,
+					<NRF_OWNER_ID_CELL NRF_PERM_RW>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f0d0000 0x9000>;
@@ -99,31 +98,6 @@
 			};
 		};
 
-		/* Shared memory ownership.
-		 * TODO:
-		 * remove these two after https://github.com/zephyrproject-rtos/zephyr/pull/72273
-		 * and let cpuapp_cpucell_ram0x_region use the `access` binding to describe
-		 * the shared memory ownership.
-		 */
-
-		cpuapp_cpucell_ipc_shm: memory@2 {
-			compatible = "nordic,owned-memory";
-			reg = <0x2f0d0000 DT_SIZE_K(36)>;
-			owner-id = <2>;
-			perm-read;
-			perm-write;
-			status = "disabled";
-		};
-
-		cpucell_cpuapp_ipc_shm: memory@4 {
-			compatible = "nordic,owned-memory";
-			reg = <0x2f0d0000 DT_SIZE_K(36)>;
-			owner-id = <4>;
-			perm-read;
-			perm-write;
-			status = "disabled";
-		};
-
 		shared_ram20_region: memory@2f88f000 {
 			reg = <0x2f88f000 DT_SIZE_K(4)>;
 			#address-cells = <1>;
@@ -151,9 +125,7 @@
 			compatible = "nordic,owned-memory";
 			status = "disabled";
 			reg = <0x2f890000 DT_SIZE_K(32)>;
-			perm-read;
-			perm-write;
-			perm-secure;
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f890000 0x8000>;
@@ -172,9 +144,7 @@
 			compatible = "nordic,owned-memory";
 			reg = <0x2fc00000 DT_SIZE_K(24)>;
 			status = "disabled";
-			perm-read;
-			perm-write;
-			perm-execute;
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWX>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2fc00000 0x6000>;
@@ -193,29 +163,27 @@
 		};
 
 		shared_ram3x_region: memory@2fc06000 {
-			compatible = "nordic,owned-memory";
 			reg = <0x2fc06000 DT_SIZE_K(8)>;
-			status = "disabled";
-			perm-read;
-			perm-write;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2fc06000 0x4000>;
 
 			cpuapp_dma_region: memory@0 {
-				compatible = "zephyr,memory-region";
+				compatible = "nordic,owned-memory", "zephyr,memory-region";
 				reg = <0x0 DT_SIZE_K(4)>;
 				status = "disabled";
 				#memory-region-cells = <0>;
+				nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
 				zephyr,memory-region = "DMA_RAM3x_APP";
 				zephyr,memory-attr = <( DT_MEM_DMA )>;
 			};
 
 			cpurad_dma_region: memory@1000 {
-				compatible = "zephyr,memory-region";
-				reg = <0x1000 0x80>;
+				compatible = "nordic,owned-memory", "zephyr,memory-region";
+				reg = <0x1000 DT_SIZE_K(1)>;
 				status = "disabled";
 				#memory-region-cells = <0>;
+				nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
 				zephyr,memory-region = "DMA_RAM3x_RAD";
 				zephyr,memory-attr = <( DT_MEM_DMA )>;
 			};
@@ -227,9 +195,7 @@
 	cpurad_rx_partitions: cpurad-rx-partitions {
 		compatible = "nordic,owned-partitions", "fixed-partitions";
 		status = "disabled";
-		perm-read;
-		perm-execute;
-		perm-secure;
+		nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RXS>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
@@ -241,9 +207,7 @@
 	cpuapp_rx_partitions: cpuapp-rx-partitions {
 		compatible = "nordic,owned-partitions", "fixed-partitions";
 		status = "disabled";
-		perm-read;
-		perm-execute;
-		perm-secure;
+		nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RXS>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
@@ -259,9 +223,7 @@
 	cpuapp_rw_partitions: cpuapp-rw-partitions {
 		compatible = "nordic,owned-partitions", "fixed-partitions";
 		status = "disabled";
-		perm-read;
-		perm-write;
-		perm-secure;
+		nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index ceb4ddc3ff1..17715ee0087 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -114,19 +114,7 @@
 	status = "okay";
 };
 
-&cpuapp_cpurad_ram0x_region {
-	status = "okay";
-};
-
-&cpuapp_cpucell_ipc_shm {
-	status = "okay";
-};
-
-&cpucell_cpuapp_ipc_shm {
-	status = "okay";
-};
-
-&shared_ram3x_region {
+&cpuapp_cpucell_ram0x_region {
 	status = "okay";
 };
 
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
index 1235f53df2b..ddda9eb5871 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
@@ -35,10 +35,6 @@
 	};
 };
 
-&shared_ram3x_region {
-	status = "okay";
-};
-
 &cpuapp_cpurad_ram0x_region {
 	status = "okay";
 };
diff --git a/tests/arch/common/ramfunc/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/arch/common/ramfunc/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index 2deb6756009..ad84324a3e9 100644
--- a/tests/arch/common/ramfunc/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/arch/common/ramfunc/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -4,5 +4,5 @@
  */
 
 &cpuapp_ram0x_region {
-	perm-execute;
+	nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWXS>;
 };
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpurad.overlay
index 73ec4c1dc08..84edfb2b6f1 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpurad.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpurad.overlay
@@ -5,11 +5,6 @@
  */
 #include "nrf54h20dk_nrf54h20_common.dtsi"
 
-/* Increase dma region to fit dmm heap. */
-&cpurad_dma_region {
-	reg = <0x1e80 0x100>;
-};
-
 &spi130 {
 	memory-regions = <&cpurad_dma_region>;
 };
diff --git a/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54h20dk_nrf54h20_cpurad.overlay
index 2bde29c9fc5..0ded983c2af 100644
--- a/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54h20dk_nrf54h20_cpurad.overlay
+++ b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54h20dk_nrf54h20_cpurad.overlay
@@ -2,11 +2,6 @@
 
 #include "nrf54h20dk_nrf54h20_common.dtsi"
 
-&cpurad_dma_region {
-	/* Default space is not enough. */
-	reg = <0x1e80 0x100>;
-};
-
 &dut {
 	memory-regions = <&cpurad_dma_region>;
 };

From edfe1ee48e99822e49252c3b46645a50309b8038 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Tue, 8 Oct 2024 13:54:54 +0200
Subject: [PATCH 0171/2913] [nrf fromtree] boards: nordic: Flatten
 shared_ramxx_region nodes

Update the default memory maps for `nrf54h20dk` and `nrf9280pdk` to
remove the `shared_ram20_region` and `shared_ram3x_region` nodes,
because their child nodes no longer need to be grouped together:

  * IPC buffers in RAM20 are statically allocated.
  * DMA buffers in RAM3x have separate access owners.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 85b03949e43c0578c814030f125c41450e798b85)
(cherry picked from commit 8a3432671cd370133c84ea48b7f814675989f5ca)
(cherry picked from commit afcf5153a71c310b127e074d20d5b874306822af)
---
 .../nrf54h20dk_nrf54h20-memory_map.dtsi       | 70 ++++++++-----------
 .../nrf9280pdk_nrf9280-memory_map.dtsi        | 70 ++++++++-----------
 ...rf54h20dk_nrf54h20_cpuppr_launcher.overlay |  4 --
 3 files changed, 56 insertions(+), 88 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index e26afaaa637..2b2473f92b5 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -81,27 +81,20 @@
 			};
 		};
 
-		shared_ram20_region: memory@2f88f000 {
-			reg = <0x2f88f000 DT_SIZE_K(4)>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0x0 0x2f88f000 0x1000>;
-
-			cpuapp_cpusys_ipc_shm: memory@ce0 {
-				reg = <0xce0 0x80>;
-			};
+		cpuapp_cpusys_ipc_shm: memory@2f88fce0 {
+			reg = <0x2f88fce0 0x80>;
+		};
 
-			cpusys_cpuapp_ipc_shm: memory@d60 {
-				reg = <0xd60 0x80>;
-			};
+		cpusys_cpuapp_ipc_shm: memory@2f88fd60 {
+			reg = <0x2f88fd60 0x80>;
+		};
 
-			cpurad_cpusys_ipc_shm: memory@e00 {
-				reg = <0xe00 0x80>;
-			};
+		cpurad_cpusys_ipc_shm: memory@2f88fe00 {
+			reg = <0x2f88fe00 0x80>;
+		};
 
-			cpusys_cpurad_ipc_shm: memory@e80 {
-				reg = <0xe80 0x80>;
-			};
+		cpusys_cpurad_ipc_shm: memory@2f88fe80 {
+			reg = <0x2f88fe80 0x80>;
 		};
 
 		/*
@@ -162,31 +155,24 @@
 			};
 		};
 
-		shared_ram3x_region: memory@2fc12000 {
-			reg = <0x2fc12000 DT_SIZE_K(8)>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0x0 0x2fc12000 0x2000>;
-
-			cpuapp_dma_region: memory@0 {
-				compatible = "nordic,owned-memory", "zephyr,memory-region";
-				reg = <0x0 DT_SIZE_K(4)>;
-				status = "disabled";
-				#memory-region-cells = <0>;
-				nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
-				zephyr,memory-region = "DMA_RAM3x_APP";
-				zephyr,memory-attr = <( DT_MEM_DMA )>;
-			};
+		cpuapp_dma_region: memory@2fc12000 {
+			compatible = "nordic,owned-memory", "zephyr,memory-region";
+			reg = <0x2fc12000 DT_SIZE_K(4)>;
+			status = "disabled";
+			#memory-region-cells = <0>;
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
+			zephyr,memory-region = "DMA_RAM3x_APP";
+			zephyr,memory-attr = <( DT_MEM_DMA )>;
+		};
 
-			cpurad_dma_region: memory@1000 {
-				compatible = "nordic,owned-memory", "zephyr,memory-region";
-				reg = <0x1000 DT_SIZE_K(1)>;
-				status = "disabled";
-				#memory-region-cells = <0>;
-				nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
-				zephyr,memory-region = "DMA_RAM3x_RAD";
-				zephyr,memory-attr = <( DT_MEM_DMA )>;
-			};
+		cpurad_dma_region: memory@2fc13000 {
+			compatible = "nordic,owned-memory", "zephyr,memory-region";
+			reg = <0x2fc13000 DT_SIZE_K(1)>;
+			status = "disabled";
+			#memory-region-cells = <0>;
+			nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
+			zephyr,memory-region = "DMA_RAM3x_RAD";
+			zephyr,memory-attr = <( DT_MEM_DMA )>;
 		};
 	};
 };
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi
index 957fde61212..0127998509e 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi
@@ -98,27 +98,20 @@
 			};
 		};
 
-		shared_ram20_region: memory@2f88f000 {
-			reg = <0x2f88f000 DT_SIZE_K(4)>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0x0 0x2f88f000 0x1000>;
-
-			cpuapp_cpusys_ipc_shm: memory@ce0 {
-				reg = <0xce0 0x80>;
-			};
+		cpuapp_cpusys_ipc_shm: memory@2f88fce0 {
+			reg = <0x2f88fce0 0x80>;
+		};
 
-			cpusys_cpuapp_ipc_shm: memory@d60 {
-				reg = <0xd60 0x80>;
-			};
+		cpusys_cpuapp_ipc_shm: memory@2f88fd60 {
+			reg = <0x2f88fd60 0x80>;
+		};
 
-			cpurad_cpusys_ipc_shm: memory@e00 {
-				reg = <0xe00 0x80>;
-			};
+		cpurad_cpusys_ipc_shm: memory@2f88fe00 {
+			reg = <0x2f88fe00 0x80>;
+		};
 
-			cpusys_cpurad_ipc_shm: memory@e80 {
-				reg = <0xe80 0x80>;
-			};
+		cpusys_cpurad_ipc_shm: memory@2f88fe80 {
+			reg = <0x2f88fe80 0x80>;
 		};
 
 		ram21_region: memory@2f890000 {
@@ -162,31 +155,24 @@
 			};
 		};
 
-		shared_ram3x_region: memory@2fc06000 {
-			reg = <0x2fc06000 DT_SIZE_K(8)>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0x0 0x2fc06000 0x4000>;
-
-			cpuapp_dma_region: memory@0 {
-				compatible = "nordic,owned-memory", "zephyr,memory-region";
-				reg = <0x0 DT_SIZE_K(4)>;
-				status = "disabled";
-				#memory-region-cells = <0>;
-				nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
-				zephyr,memory-region = "DMA_RAM3x_APP";
-				zephyr,memory-attr = <( DT_MEM_DMA )>;
-			};
+		cpuapp_dma_region: memory@2fc06000 {
+			compatible = "nordic,owned-memory", "zephyr,memory-region";
+			reg = <0x2fc06000 DT_SIZE_K(4)>;
+			status = "disabled";
+			#memory-region-cells = <0>;
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
+			zephyr,memory-region = "DMA_RAM3x_APP";
+			zephyr,memory-attr = <( DT_MEM_DMA )>;
+		};
 
-			cpurad_dma_region: memory@1000 {
-				compatible = "nordic,owned-memory", "zephyr,memory-region";
-				reg = <0x1000 DT_SIZE_K(1)>;
-				status = "disabled";
-				#memory-region-cells = <0>;
-				nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
-				zephyr,memory-region = "DMA_RAM3x_RAD";
-				zephyr,memory-attr = <( DT_MEM_DMA )>;
-			};
+		cpurad_dma_region: memory@2fc07000 {
+			compatible = "nordic,owned-memory", "zephyr,memory-region";
+			reg = <0x2fc07000 DT_SIZE_K(1)>;
+			status = "disabled";
+			#memory-region-cells = <0>;
+			nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
+			zephyr,memory-region = "DMA_RAM3x_RAD";
+			zephyr,memory-attr = <( DT_MEM_DMA )>;
 		};
 	};
 };
diff --git a/tests/drivers/spi/spi_error_cases/boards/nrf54h20dk_nrf54h20_cpuppr_launcher.overlay b/tests/drivers/spi/spi_error_cases/boards/nrf54h20dk_nrf54h20_cpuppr_launcher.overlay
index 6e30d173155..facf592d94c 100644
--- a/tests/drivers/spi/spi_error_cases/boards/nrf54h20dk_nrf54h20_cpuppr_launcher.overlay
+++ b/tests/drivers/spi/spi_error_cases/boards/nrf54h20dk_nrf54h20_cpuppr_launcher.overlay
@@ -14,10 +14,6 @@
 	interrupt-parent = <&cpuppr_clic>;
 };
 
-&shared_ram3x_region {
-	status = "okay";
-};
-
 &gpio0 {
 	status = "reserved";
 };

From c81e72de0ad2f56e11ae653e091fb7a44236a90f Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Wed, 16 Oct 2024 14:50:56 +0200
Subject: [PATCH 0172/2913] [nrf fromlist] modules: hal_nordic: Integrate
 nrf-regtool 7.0.0

Upstream PR #: 79925

This new version introduces a new sub-command `uicr-compile`, which will
generate `uicr.hex` based on a new binary format required by an upcoming
release of Secure Domain Firmware (SDFW) closer to production.

Since this is a breaking change, and SDFW is not finalized yet, we need
to support two nrf-regtool versions for a short time, and use different
CLI invocations based on which version is installed. Hence, the minimum
required version is unchanged.

Additionally, retire CONFIG_NRF_REGTOOL_EXTRA_GENERATE_ARGS. There will
be no use for it moving forward.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 6c4eb43567fc82935ccff21ebfe843ccc1ac88e1)
(cherry picked from commit fad108ab38f8c941cd75af278bc22d16dff01361)
(cherry picked from commit 8bfc9eb676da48900b090742c214b75e59001219)
---
 modules/hal_nordic/Kconfig.nrf_regtool        |  7 ---
 .../nrf-regtool/nrf-regtoolConfig.cmake       | 52 ++++++++++++-------
 .../nrf-regtoolConfigVersion.cmake            |  1 +
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/modules/hal_nordic/Kconfig.nrf_regtool b/modules/hal_nordic/Kconfig.nrf_regtool
index 791971452fe..396ec2050a0 100644
--- a/modules/hal_nordic/Kconfig.nrf_regtool
+++ b/modules/hal_nordic/Kconfig.nrf_regtool
@@ -26,11 +26,4 @@ config NRF_REGTOOL_VERBOSITY
 	  3. Print even more details, which are typically only useful for
 	     nrf-regtool developers.
 
-config NRF_REGTOOL_EXTRA_GENERATE_ARGS
-	string "Extra arguments to 'nrf-regtool generate'"
-	help
-	  List of additional arguments to every nrf-regtool invocation used for
-	  generating hex files. Example value: "--fill all --fill-byte 0xff".
-	  Run "nrf-regtool generate -h" to see all of the available options.
-
 endmenu
diff --git a/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake b/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake
index 0ff0a8ba6dd..6bcaa453cce 100644
--- a/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake
+++ b/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake
@@ -1,16 +1,26 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-function(nrf_regtool_generate_hex_from_dts peripheral)
-  string(TOLOWER "${peripheral}.hex" generated_hex_name)
-  string(TOLOWER "${peripheral}_merged.hex" merged_hex_name)
+function(nrf_regtool_generate_uicr generated_hex_file)
+  string(REPEAT "-v;" ${CONFIG_NRF_REGTOOL_VERBOSITY} verbosity)
+  execute_process(
+    COMMAND
+    ${CMAKE_COMMAND} -E env PYTHONPATH=${ZEPHYR_BASE}/scripts/dts/python-devicetree/src
+    ${NRF_REGTOOL} ${verbosity} uicr-compile
+    --edt-pickle-file ${EDT_PICKLE}
+    --product-name ${CONFIG_SOC}
+    --output-file ${generated_hex_file}
+    WORKING_DIRECTORY ${APPLICATION_SOURCE_DIR}
+    COMMAND_ERROR_IS_FATAL ANY
+  )
+  message(STATUS "Generated UICR hex file: ${generated_hex_file}")
+endfunction()
 
+function(nrf_regtool_generate_peripheral peripheral generated_hex_file)
   # Prepare common argument sub-lists.
   string(REPEAT "-v;" ${CONFIG_NRF_REGTOOL_VERBOSITY} verbosity)
   list(TRANSFORM CACHED_DTS_ROOT_BINDINGS PREPEND "--bindings-dir;" OUTPUT_VARIABLE bindings_dirs)
-  separate_arguments(extra_args UNIX_COMMAND "${CONFIG_NRF_REGTOOL_EXTRA_GENERATE_ARGS}")
 
-  set(generated_hex_file ${PROJECT_BINARY_DIR}/${generated_hex_name})
   execute_process(
     COMMAND
     ${CMAKE_COMMAND} -E env PYTHONPATH=${ZEPHYR_BASE}/scripts/dts/python-devicetree/src
@@ -25,25 +35,29 @@ function(nrf_regtool_generate_hex_from_dts peripheral)
     COMMAND_ERROR_IS_FATAL ANY
   )
   message(STATUS "Generated ${peripheral} hex file: ${generated_hex_file}")
-
-  set(merged_hex_file ${PROJECT_BINARY_DIR}/${merged_hex_name})
-  set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-    COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/mergehex.py
-    -o ${merged_hex_file}
-    ${generated_hex_file}
-    ${PROJECT_BINARY_DIR}/${KERNEL_HEX_NAME}
-  )
-  set_property(TARGET runners_yaml_props_target PROPERTY hex_file ${merged_hex_file})
 endfunction()
 
+get_property(version GLOBAL PROPERTY nrf_regtool_version)
 
 foreach(component IN LISTS ${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS)
-  string(REGEX MATCH "(^.*):(.*$)" match ${component})
-  set(operation  "${CMAKE_MATCH_1}")
-  set(peripheral "${CMAKE_MATCH_2}")
+  if(component STREQUAL "GENERATE:UICR")
+    set(generated_hex_file ${PROJECT_BINARY_DIR}/uicr.hex)
+    if(version VERSION_GREATER_EQUAL 7.0.0)
+      nrf_regtool_generate_uicr(${generated_hex_file})
+    else()
+      nrf_regtool_generate_peripheral(UICR ${generated_hex_file})
+    endif()
+
+    # UICR must be flashed together with the Zephyr binary.
+    set(merged_hex_file ${PROJECT_BINARY_DIR}/uicr_merged.hex)
+    set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+      COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/mergehex.py
+      -o ${merged_hex_file}
+      ${generated_hex_file}
+      ${PROJECT_BINARY_DIR}/${KERNEL_HEX_NAME}
+    )
+    set_property(TARGET runners_yaml_props_target PROPERTY hex_file ${merged_hex_file})
 
-  if(operation STREQUAL "GENERATE")
-    nrf_regtool_generate_hex_from_dts(${peripheral})
   else()
     message(FATAL_ERROR "Unrecognized package component: \"${component}\"")
   endif()
diff --git a/modules/hal_nordic/nrf-regtool/nrf-regtoolConfigVersion.cmake b/modules/hal_nordic/nrf-regtool/nrf-regtoolConfigVersion.cmake
index e147d1b0532..81345c1ae50 100644
--- a/modules/hal_nordic/nrf-regtool/nrf-regtoolConfigVersion.cmake
+++ b/modules/hal_nordic/nrf-regtool/nrf-regtoolConfigVersion.cmake
@@ -22,6 +22,7 @@ if(NRF_REGTOOL)
         "Found nrf-regtool (found suitable version \"${PACKAGE_VERSION}\", "
         "minimum required is \"${PACKAGE_FIND_VERSION}\")"
       )
+      set_property(GLOBAL PROPERTY nrf_regtool_version ${PACKAGE_VERSION})
       return()
     endif()
   endif()

From a5245119eb40efc613cbf24fc8d6b1a091bcbfd9 Mon Sep 17 00:00:00 2001
From: Aleksander Strzebonski <aleksander.strzebonski@nordicsemi.no>
Date: Fri, 6 Sep 2024 17:23:04 +0200
Subject: [PATCH 0173/2913] [nrf fromtree] usb: dwc2: Allow for enabling USB if
 the cable is disconnected

Adds CONFIG_UDC_DWC2_USBHS_VBUS_READY_TIMEOUT_MS that allows
for waiting for a USBHS VBUS ready event for a specified
amount of time. Earlier it waited forever and because of that,
the udc_enable() was blocked forever if the USB cable was
disconnected. Now the function returns error on timeout.

Signed-off-by: Aleksander Strzebonski <aleksander.strzebonski@nordicsemi.no>
(cherry picked from commit 18fb3f9a329ade44495983206a5263f7aa2a84a4)
(cherry picked from commit 928a6623d9f0c3921d7a4ea96c8cb77d79d5ebe1)
(cherry picked from commit 2bfceaf86cf5a270af803fb8e601f403cecc0353)
---
 drivers/usb/udc/Kconfig.dwc2             | 10 ++++++++++
 drivers/usb/udc/udc_dwc2_vendor_quirks.h | 14 ++++++++++++--
 include/zephyr/drivers/usb/udc.h         |  1 +
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/udc/Kconfig.dwc2 b/drivers/usb/udc/Kconfig.dwc2
index 4c023cfb04d..2f40c8f71a2 100644
--- a/drivers/usb/udc/Kconfig.dwc2
+++ b/drivers/usb/udc/Kconfig.dwc2
@@ -38,3 +38,13 @@ config UDC_DWC2_THREAD_PRIORITY
 	default 8
 	help
 	  DWC2 driver thread priority.
+
+config UDC_DWC2_USBHS_VBUS_READY_TIMEOUT
+	int "UDC DWC2 USBHS VBUS ready event timeout in ms"
+	depends on UDC_DWC2
+	depends on NRFS_HAS_VBUS_DETECTOR_SERVICE
+	default 0
+	help
+	  UDC DWC2 USBHS VBUS ready event timeout. If the VBUS is not ready
+	  and the Nordic USBHS controller is used, the udc_enable() is
+	  blocked for this amount of time. Set it to zero to wait forever.
diff --git a/drivers/usb/udc/udc_dwc2_vendor_quirks.h b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
index 84d912f9fdb..d12d64ef848 100644
--- a/drivers/usb/udc/udc_dwc2_vendor_quirks.h
+++ b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
@@ -121,7 +121,8 @@ DT_INST_FOREACH_STATUS_OKAY(QUIRK_STM32F4_FSOTG_DEFINE)
  * On USBHS, we cannot access the DWC2 register until VBUS is detected and
  * valid. If the user tries to force usbd_enable() and the corresponding
  * udc_enable() without a "VBUS ready" notification, the event wait will block
- * until a valid VBUS signal is detected.
+ * until a valid VBUS signal is detected or until the
+ * CONFIG_UDC_DWC2_USBHS_VBUS_READY_TIMEOUT timeout expires.
  */
 static K_EVENT_DEFINE(usbhs_events);
 #define USBHS_VBUS_READY	BIT(0)
@@ -182,10 +183,19 @@ static inline int usbhs_enable_nrfs_service(const struct device *dev)
 static inline int usbhs_enable_core(const struct device *dev)
 {
 	NRF_USBHS_Type *wrapper = USBHS_DT_WRAPPER_REG_ADDR(0);
+	k_timeout_t timeout = K_FOREVER;
+
+	#if CONFIG_NRFS_HAS_VBUS_DETECTOR_SERVICE
+	if (CONFIG_UDC_DWC2_USBHS_VBUS_READY_TIMEOUT) {
+		timeout = K_MSEC(CONFIG_UDC_DWC2_USBHS_VBUS_READY_TIMEOUT);
+	}
+	#endif
 
 	if (!k_event_wait(&usbhs_events, USBHS_VBUS_READY, false, K_NO_WAIT)) {
 		LOG_WRN("VBUS is not ready, block udc_enable()");
-		k_event_wait(&usbhs_events, USBHS_VBUS_READY, false, K_FOREVER);
+		if (!k_event_wait(&usbhs_events, USBHS_VBUS_READY, false, timeout)) {
+			return -ETIMEDOUT;
+		}
 	}
 
 	wrapper->ENABLE = USBHS_ENABLE_PHY_Msk | USBHS_ENABLE_CORE_Msk;
diff --git a/include/zephyr/drivers/usb/udc.h b/include/zephyr/drivers/usb/udc.h
index 7910d8cfd8f..15b99cf5251 100644
--- a/include/zephyr/drivers/usb/udc.h
+++ b/include/zephyr/drivers/usb/udc.h
@@ -371,6 +371,7 @@ int udc_init(const struct device *dev,
  * @return 0 on success, all other values should be treated as error.
  * @retval -EPERM controller is not initialized
  * @retval -EALREADY already enabled
+ * @retval -ETIMEDOUT enable operation timed out
  */
 int udc_enable(const struct device *dev);
 

From ee69262018163ae450684fd57dac358141c73fa9 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 7 Oct 2024 13:40:56 +0530
Subject: [PATCH 0174/2913] [nrf fromtree] drivers: nrfwifi: Fix the
 indentation

The Cmake indentation is two spaces.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 3cd470013260ffbf6ffbde7e401d8c3986d48c9a)
(cherry picked from commit a5ce43e437609b2c143058847581967f200590e0)
(cherry picked from commit 8baf7ac63dec84e4089d9e080c00a8d918d9c0cc)
---
 drivers/wifi/nrfwifi/CMakeLists.txt | 64 ++++++++++++++---------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 91818f65582..4055384aac7 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -136,39 +136,39 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF70_ON_QSPI
 )
 
 if (CONFIG_NRF_WIFI_BUILD_ONLY_MODE)
-message(WARNING "
-------------------------------------------------------------------------
-Building only the nRF70 driver, skipping firmware patch.
-This is only for building (CI) purposes and will not work on a real device.
-------------------------------------------------------------------------
-")
+  message(WARNING "
+  ------------------------------------------------------------------------
+  Building only the nRF70 driver, skipping firmware patch.
+  This is only for building (CI) purposes and will not work on a real device.
+  ------------------------------------------------------------------------
+  ")
 else()
-# RPU FW patch binaries based on the selected configuration
-if(CONFIG_NRF70_SYSTEM_MODE)
-  set(NRF70_PATCH ${FW_BINS_BASE}/default/nrf70.bin)
-elseif(CONFIG_NRF70_RADIO_TEST)
-  set(NRF70_PATCH ${FW_BINS_BASE}/radio_test/nrf70.bin)
-elseif(CONFIG_NRF70_SCAN_ONLY)
-  set(NRF70_PATCH ${FW_BINS_BASE}/scan_only/nrf70.bin)
-elseif (CONFIG_NRF70_SYSTEM_WITH_RAW_MODES)
-  set(NRF70_PATCH ${FW_BINS_BASE}/system_with_raw/nrf70.bin)
-else()
-  # Error
-  message(FATAL_ERROR "Unsupported nRF70 patch configuration")
-endif()
-
-if(NOT EXISTS ${NRF70_PATCH})
-  message(FATAL_ERROR "
-    ------------------------------------------------------------------------
-    Missing blobs for nRF70 device driver, please install by running:
-        $ west update
-        $ west blobs fetch hal_nordic
-    ------------------------------------------------------------------------")
-endif()
-
-zephyr_compile_definitions(
-  -DCONFIG_NRF_WIFI_FW_BIN=${NRF70_PATCH}
-)
+  # RPU FW patch binaries based on the selected configuration
+  if(CONFIG_NRF70_SYSTEM_MODE)
+    set(NRF70_PATCH ${FW_BINS_BASE}/default/nrf70.bin)
+  elseif(CONFIG_NRF70_RADIO_TEST)
+    set(NRF70_PATCH ${FW_BINS_BASE}/radio_test/nrf70.bin)
+  elseif(CONFIG_NRF70_SCAN_ONLY)
+    set(NRF70_PATCH ${FW_BINS_BASE}/scan_only/nrf70.bin)
+  elseif (CONFIG_NRF70_SYSTEM_WITH_RAW_MODES)
+    set(NRF70_PATCH ${FW_BINS_BASE}/system_with_raw/nrf70.bin)
+  else()
+    # Error
+    message(FATAL_ERROR "Unsupported nRF70 patch configuration")
+  endif()
+
+  if(NOT EXISTS ${NRF70_PATCH})
+    message(FATAL_ERROR "
+      ------------------------------------------------------------------------
+      Missing blobs for nRF70 device driver, please install by running:
+          $ west update
+          $ west blobs fetch hal_nordic
+      ------------------------------------------------------------------------")
+  endif()
+
+  zephyr_compile_definitions(
+    -DCONFIG_NRF_WIFI_FW_BIN=${NRF70_PATCH}
+  )
 endif()
 
 

From cb1ce639a283d48c7330b3371282c1a6f25838a4 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 2 Oct 2024 15:49:34 +0200
Subject: [PATCH 0175/2913] [nrf fromtree] drivers: wifi: Add support to
 override FW load

For using external flash the tooling is only available in NCS, so, use
the existing Kconfig option to override the FW loading.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit f20e2d68b054e672831d099ca5ade2e7dc00e33d)
(cherry picked from commit 54098a57bd34a0ac1228fdefb1c4fe9e15103d0f)
(cherry picked from commit 8a998c2d44e7bc46e5d2e91145436658bf0d17de)
---
 drivers/wifi/nrfwifi/CMakeLists.txt  | 2 +-
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 1 +
 drivers/wifi/nrfwifi/src/fw_load.c   | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 4055384aac7..3c912419a9c 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -63,7 +63,7 @@ zephyr_library_sources(
   src/qspi/src/ficr_prog.c
 )
 
-zephyr_library_sources_ifndef(CONFIG_NRF_WIFI_BUILD_ONLY_MODE
+zephyr_library_sources_ifdef(CONFIG_NRF_WIFI_PATCHES_BUILTIN
   src/fw_load.c
 )
 
diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index d8cae0f38c8..d4b796fef35 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -131,6 +131,7 @@ config NRF_WIFI_IF_AUTO_START
 config NRF_WIFI_PATCHES_BUILTIN
 	bool "Store nRF70 FW patches as part of the driver"
 	default y
+	depends on !NRF_WIFI_BUILD_ONLY_MODE
 	help
 	  Select this option to store nRF70 FW patches as part of the driver.
 	  This option impacts the code memory footprint of the driver.
diff --git a/drivers/wifi/nrfwifi/src/fw_load.c b/drivers/wifi/nrfwifi/src/fw_load.c
index 14087a7d35c..6bf4c85193f 100644
--- a/drivers/wifi/nrfwifi/src/fw_load.c
+++ b/drivers/wifi/nrfwifi/src/fw_load.c
@@ -18,7 +18,6 @@ LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 
 #include <fmac_main.h>
 
-#ifdef CONFIG_NRF_WIFI_PATCHES_BUILTIN
 /* INCBIN macro Taken from https://gist.github.com/mmozeiko/ed9655cf50341553d282 */
 #define STR2(x) #x
 #define STR(x) STR2(x)
@@ -56,7 +55,6 @@ LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 	extern                  const char prefix ## _ ## name ## _end[];
 
 INCBIN(_bin, nrf70_fw, STR(CONFIG_NRF_WIFI_FW_BIN));
-#endif /* CONFIG_NRF_WIFI_PATCHES_BUILTIN */
 
 enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx)
 {

From 3ad88eef115661d3196f1c299e1d62287016e070 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 2 Oct 2024 16:18:11 +0200
Subject: [PATCH 0176/2913] [nrf fromtree] drivers: wifi: nrf: Remove unused
 linker script

This script is needed only when external flash is used to store nRF70
firmware patches. This also uses PM which is supported only in NCS.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit d15b7b5b3af9a1e3e5e6bceb0792bcdc34e9131d)
(cherry picked from commit 0981e96fa66f4b69ccb7540a4863c0ce9e4c70fd)
(cherry picked from commit 9523683b6493441d9a37fe7b262253ed5de2754b)
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi   |  4 --
 drivers/wifi/nrfwifi/rpu_fw_patches.ld | 51 --------------------------
 2 files changed, 55 deletions(-)
 delete mode 100644 drivers/wifi/nrfwifi/rpu_fw_patches.ld

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index d4b796fef35..3096dd7c76e 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -136,10 +136,6 @@ config NRF_WIFI_PATCHES_BUILTIN
 	  Select this option to store nRF70 FW patches as part of the driver.
 	  This option impacts the code memory footprint of the driver.
 
-config CUSTOM_LINKER_SCRIPT
-	string "Custom linker script for nRF70 FW patches"
-	default "${ZEPHYR_BASE}/../nrf/drivers/wifi/nrf70/rpu_fw_patches.ld"
-
 config NRF_WIFI_LOW_POWER
 	bool "low power mode in nRF Wi-Fi chipsets"
 	default y
diff --git a/drivers/wifi/nrfwifi/rpu_fw_patches.ld b/drivers/wifi/nrfwifi/rpu_fw_patches.ld
deleted file mode 100644
index 4ecbaedb096..00000000000
--- a/drivers/wifi/nrfwifi/rpu_fw_patches.ld
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @file
- * @brief Custom Linker command/script file
- *
- * Custom Linker script for the Cortex-M platforms.
- */
-
-#include <zephyr/linker/sections.h>
-#include <zephyr/devicetree.h>
-
-#include <zephyr/linker/linker-defs.h>
-#include <zephyr/linker/linker-tool.h>
-
-#if CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP || CONFIG_BOARD_NRF52840DK_NRF52840
-/*
- * nRF53/52 series ship an external flash that can be used for XIP using QSPI/SPI.
- *
- * Note: In nRF7002 external flash using is accessible only using SPI but there is no
- *       support for XIP, so, relocation cannot be used.
- */
-#if CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP
-#define EXTFLASH_BASE_ADDR 0x10000000
-#define EXTFLASH_SIZE 0x800000
-#elif CONFIG_BOARD_NRF52840DK_NRF52840
-#define EXTFLASH_BASE_ADDR 0x12000000
-#define EXTFLASH_SIZE 0x800000
-#endif /* CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP */
-
-#if USE_PARTITION_MANAGER && PM_EXTERNAL_FLASH_ADDRESS
-#include <pm_config.h>
-#define EXTFLASH_ADDRESS (EXTFLASH_BASE_ADDR + PM_EXTERNAL_FLASH_ADDRESS)
-#undef EXTFLASH_SIZE
-#define EXTFLASH_SIZE (PM_EXTERNAL_FLASH_SIZE)
-#else
-#define EXTFLASH_ADDRESS (EXTFLASH_BASE_ADDR)
-#endif /* USE_PARTITION_MANAGER && PM_EXTERNAL_FLASH_ADDRESS */
-
-MEMORY
-{
-     EXTFLASH (wx) : ORIGIN = EXTFLASH_ADDRESS, LENGTH = EXTFLASH_SIZE
-}
-
-#endif /* CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP || CONFIG_BOARD_NRF52840DK_NRF52840 */
-
-#include <zephyr/arch/arm/cortex_m/scripts/linker.ld>

From 08f95bacf3b4bc902faada0c3611046d9fea20f0 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Sat, 12 Oct 2024 21:59:54 +0530
Subject: [PATCH 0177/2913] [nrf fromtree] drivers: nrfwifi: Add provision to
 handle FW blobs externally

The FW blobs are contentious topic in OSS, so, add a provision to use
external tooling (e.g., NCS) to handle FW blobs for advanced usecases
(e.g., storing in external flash).

This won't be used upstream, only built-in or build-only are supported.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit cb1ea80c0201a358a70fc7729299857d4ae13123)
(cherry picked from commit 8d6fc59bf40a9de47a4dc982cfa71738453fab70)
(cherry picked from commit 21379fc455e651716aeddb5eb3ccace5a0d70f22)
---
 drivers/wifi/nrfwifi/CMakeLists.txt  |  2 +-
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 26 +++++++++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 3c912419a9c..a2773efbc06 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -142,7 +142,7 @@ if (CONFIG_NRF_WIFI_BUILD_ONLY_MODE)
   This is only for building (CI) purposes and will not work on a real device.
   ------------------------------------------------------------------------
   ")
-else()
+elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
   # RPU FW patch binaries based on the selected configuration
   if(CONFIG_NRF70_SYSTEM_MODE)
     set(NRF70_PATCH ${FW_BINS_BASE}/default/nrf70.bin)
diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 3096dd7c76e..bccb48b8576 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -128,14 +128,29 @@ config NRF_WIFI_IF_AUTO_START
 	bool "Wi-Fi interface auto start on boot"
 	default y
 
+choice NRF_WIFI_FW_BLOB_HANDLING
+	prompt "nRF70 Firmware blob handling"
+	default NRF_WIFI_PATCHES_BUILTIN
+
+config NRF_WIFI_BUILD_ONLY_MODE
+	bool "Build only mode"
+	help
+	  Enable this option to build the driver without firmware loading, removes
+	  dependency on firmware binary and patches.
+	  This is useful to check the build and link errors.
+
 config NRF_WIFI_PATCHES_BUILTIN
 	bool "Store nRF70 FW patches as part of the driver"
-	default y
-	depends on !NRF_WIFI_BUILD_ONLY_MODE
 	help
 	  Select this option to store nRF70 FW patches as part of the driver.
 	  This option impacts the code memory footprint of the driver.
 
+config NRF_WIFI_PATCHES_EXTERNAL
+	bool "Load nRF70 FW patches from external binary"
+	help
+	  Select this option to load nRF70 FW patches from an external tooling.
+endchoice
+
 config NRF_WIFI_LOW_POWER
 	bool "low power mode in nRF Wi-Fi chipsets"
 	default y
@@ -690,11 +705,4 @@ config NRF_WIFI_QOS_NULL_BASED_RETRIEVAL
 
 endchoice
 
-config NRF_WIFI_BUILD_ONLY_MODE
-	bool "Build only mode"
-	help
-	  Enable this option to build the driver without firmware loading, removes
-	  dependency on firmware binary and patches.
-	  This is useful to check the build and link errors.
-
 endif # WIFI_NRF70

From d3347cac78c2239265b5dbaf52dbbf1f5fc82ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Thu, 11 Jul 2024 07:54:12 +0200
Subject: [PATCH 0178/2913] [nrf fromtree] drivers: sensor: qdec: fix QDEC
 overflow handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QDEC sensor driver fails to inform user of the overflow in the
ACC register, which makes the most recently fetched data invalid.
An error code return has been added to nrfx_qdec_sample_fetch(),
that indicates that an overflow has occured, based on oveflow flag.
Also, raw_acc field was added in the qdec_nrfx_data structure, to
adjust QDEC to sensor API rules - two subsequent sensor_channel_get()
calls should will yield the same values.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit 2e6c83dd4cc23df0b17624d17ec8898db34e3370)
(cherry picked from commit 8f65156cbd482a85e58d3159e2135ae1cf4fc43f)
(cherry picked from commit b929146130ef56c28b0692a69c6dd19e07c7df50)
---
 drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c | 23 +++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c b/drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c
index 10035e0a103..dc70c27d417 100644
--- a/drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c
+++ b/drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c
@@ -26,7 +26,9 @@ LOG_MODULE_REGISTER(qdec_nrfx, CONFIG_SENSOR_LOG_LEVEL);
 
 
 struct qdec_nrfx_data {
+	int32_t fetched_acc;
 	int32_t acc;
+	bool overflow;
 	sensor_trigger_handler_t data_ready_handler;
 	const struct sensor_trigger *data_ready_trigger;
 };
@@ -49,6 +51,8 @@ static void accumulate(struct qdec_nrfx_data *data, int32_t acc)
 
 	if (!overflow) {
 		data->acc += acc;
+	} else {
+		data->overflow = true;
 	}
 
 	irq_unlock(key);
@@ -70,6 +74,18 @@ static int qdec_nrfx_sample_fetch(const struct device *dev,
 
 	accumulate(data, acc);
 
+	unsigned int key = irq_lock();
+
+	data->fetched_acc = data->acc;
+	data->acc = 0;
+
+	irq_unlock(key);
+
+	if (data->overflow) {
+		data->overflow = false;
+		return -EOVERFLOW;
+	}
+
 	return 0;
 }
 
@@ -87,8 +103,7 @@ static int qdec_nrfx_channel_get(const struct device *dev,
 	}
 
 	key = irq_lock();
-	acc = data->acc;
-	data->acc = 0;
+	acc = data->fetched_acc;
 	irq_unlock(key);
 
 	val->val1 = (acc * FULL_ANGLE) / config->steps;
@@ -148,6 +163,10 @@ static void qdec_nrfx_event_handler(nrfx_qdec_event_t event, void *p_context)
 		}
 		break;
 
+	case NRF_QDEC_EVENT_ACCOF:
+		dev_data->overflow = true;
+		break;
+
 	default:
 		LOG_ERR("unhandled event (0x%x)", event.type);
 		break;

From 7aab55d3b7cb52dae800309bd82b28a91a27f736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Mon, 29 Jul 2024 09:33:52 +0200
Subject: [PATCH 0179/2913] [nrf fromtree] tests: boards: nrf: qdec: modify
 QDEC tests to match new api
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Overflow errorcode is now correctly detected when expected.
Subsequent sensor_channel_get() yield the same values, so
the check can be no longer ignored.
Added a sensor_sample_fetch() where missing for correct
sensor_channel_get() calls.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit 9b5260de9a31738f5632a0f7240f1f70bc1d4cd4)
(cherry picked from commit 8411e6a346838a2d0980b28e9add8b29a06d711f)
(cherry picked from commit 9d2bb4e50ba8f67fee3752a8ce05a75edeb1263f)
---
 tests/boards/nrf/qdec/src/main.c | 37 +++++++++++++++++---------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/tests/boards/nrf/qdec/src/main.c b/tests/boards/nrf/qdec/src/main.c
index 639e92f8510..cccd92c3293 100644
--- a/tests/boards/nrf/qdec/src/main.c
+++ b/tests/boards/nrf/qdec/src/main.c
@@ -89,7 +89,7 @@ static void qenc_emulate_stop(void)
 }
 
 static void qenc_emulate_verify_reading(int emulator_period_ms, int emulation_duration_ms,
-					bool forward, bool overflow_possible)
+					bool forward, bool overflow_expected)
 {
 	int rc;
 	struct sensor_value val = {0};
@@ -107,13 +107,17 @@ static void qenc_emulate_verify_reading(int emulator_period_ms, int emulation_du
 	k_msleep(emulation_duration_ms);
 
 	rc = sensor_sample_fetch(qdec_dev);
-	zassert_true(rc == 0, "Failed to fetch sample (%d)", rc);
+
+	if (!overflow_expected) {
+		zassert_true(rc == 0, "Failed to fetch sample (%d)", rc);
+	} else {
+		zassert_true(rc == -EOVERFLOW, "Failed to detect overflow");
+	}
 
 	rc = sensor_channel_get(qdec_dev, SENSOR_CHAN_ROTATION, &val);
 	zassert_true(rc == 0, "Failed to get sample (%d)", rc);
 
-	TC_PRINT("QDEC reading: %d\n", val.val1);
-	if (!overflow_possible) {
+	if (!overflow_expected) {
 		zassert_within(val.val1, expected_reading, delta,
 			       "Expected reading: %d,  but got: %d", expected_reading, val.val1);
 	}
@@ -197,6 +201,9 @@ ZTEST(qdec_sensor, test_sensor_trigger_set)
 	rc = k_sem_take(&sem, K_MSEC(200));
 	zassert_true(rc == 0, "qdec handler should be triggered (%d)", rc);
 
+	rc = sensor_sample_fetch(qdec_dev);
+	zassert_true(rc == 0, "Failed to fetch sample (%d)", rc);
+
 	rc = sensor_channel_get(qdec_dev, SENSOR_CHAN_ROTATION, &val);
 	zassert_true(rc == 0, "Failed to fetch sample (%d)", rc);
 
@@ -241,7 +248,6 @@ ZTEST(qdec_sensor, test_qdec_readings)
 	qenc_emulate_verify_reading(10, 100, true, false);
 	qenc_emulate_verify_reading(2, 500, true, false);
 	qenc_emulate_verify_reading(10, 200, false, false);
-	/* may lead to overflows but currently driver does not detects that */
 	qenc_emulate_verify_reading(1, 1000, false, true);
 	qenc_emulate_verify_reading(1, 1000, true, true);
 }
@@ -313,18 +319,15 @@ ZTEST(qdec_sensor, test_sensor_channel_get)
 	/* subsequent calls of sensor_channel_get without calling sensor_sample_fetch
 	 * should yield the same value
 	 */
-	/* zassert_true(val_first.val1 == val_second.val1,
-	 *				"Expected the same readings: %d vs %d",
-	 *				val_first.val1,
-	 *				val_second.val1);
-	 */
-	TC_PRINT("Expected the same readings: %d vs %d - ignore!\n", val_first.val1,
-		 val_second.val1);
-	/* zassert_true(val_first.val2 == val_second.val2, "Expected the same readings: %d vs %d",
-	 *	     val_first.val2, val_second.val2);
-	 */
-	TC_PRINT("Expected the same readings: %d vs %d - ignore!\n", val_first.val2,
-		 val_second.val2);
+	zassert_true(val_first.val1 == val_second.val1,
+		     "Expected the same readings: %d vs %d",
+		     val_first.val1,
+		     val_second.val1);
+
+	zassert_true(val_first.val2 == val_second.val2,
+		     "Expected the same readings: %d vs %d",
+		     val_first.val2,
+		     val_second.val2);
 }
 
 /**

From 18db89b124bf36fa24d2bb970a56e66c71adb8ed Mon Sep 17 00:00:00 2001
From: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
Date: Wed, 16 Oct 2024 12:01:44 +0200
Subject: [PATCH 0180/2913] [nrf fromtree] net: silence no sources cmake
 warning

add `ALLOW_EMPTY TRUE` property to silence cmake warnings in case
when no sources are added to subsys__net library

Signed-off-by: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
(cherry picked from commit ca09d1daa1f134eb37dc3340af97d02f58477819)
(cherry picked from commit e3dc30435744dab530dbca04e1b215cf71d15c0f)
(cherry picked from commit 04b5c42c9af97f082a3174d6fc826ee5eb8188bf)
---
 subsys/net/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/subsys/net/CMakeLists.txt b/subsys/net/CMakeLists.txt
index e99b26f5fb6..4bdcdabe2d3 100644
--- a/subsys/net/CMakeLists.txt
+++ b/subsys/net/CMakeLists.txt
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_library()
+zephyr_library_property(ALLOW_EMPTY TRUE)
 zephyr_library_sources_ifdef(CONFIG_NET_HOSTNAME_ENABLE hostname.c)
 
 if(CONFIG_NETWORKING)

From 3bb9b8888fbeda815e21b8502cd17ee1357f6d7b Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Wed, 18 Sep 2024 13:56:06 +0200
Subject: [PATCH 0181/2913] [nrf fromtree] soc: nordic: nrf54l: remove normal
 voltage mode

Normal voltage mode is no longer supported by MDK 8.67.0.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 6300e1bc253531b992c868424543cde112189915)
(cherry picked from commit 3d76fd0fdf30bf6c191b7b164180f45f7e95da18)
(cherry picked from commit e0a06303f95b9c0956f599a79836d77fbc9f5c52)
---
 soc/nordic/nrf54l/Kconfig | 3 ---
 soc/nordic/nrf54l/soc.c   | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index eeb12fbfab0..0ad48f7c9c1 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -79,9 +79,6 @@ config SOC_NRF_FORCE_CONSTLAT
 	  of base resources on while in sleep. The advantage of having a constant
 	  and predictable latency will be at the cost of having increased power consumption.
 
-config SOC_NRF54L_NORMAL_VOLTAGE_MODE
-	bool "NRF54L Normal Voltage Mode."
-
 if NRF_GRTC_TIMER
 
 config ELV_GRTC_LFXO_ALLOWED
diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index b1e8667a9f1..f70675517b8 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -156,10 +156,6 @@ static int nordicsemi_nrf54l_init(void)
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);
 #endif
 
-	if (IS_ENABLED(CONFIG_SOC_NRF54L_NORMAL_VOLTAGE_MODE)) {
-		nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MEDIUM, false);
-	}
-
 #if defined(CONFIG_ELV_GRTC_LFXO_ALLOWED)
 	nrf_regulators_elv_mode_allow_set(NRF_REGULATORS, NRF_REGULATORS_ELV_ELVGRTCLFXO_MASK);
 #endif /* CONFIG_ELV_GRTC_LFXO_ALLOWED */

From 86d577797f6329f7cd528365af3996e6acd774af Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Mon, 30 Sep 2024 16:05:34 +0200
Subject: [PATCH 0182/2913] [nrf fromtree] dts: nordic: refactor bindings
 helper symbols for SAADC

Split header files containing symbols denoting SAADC inputs
so that only supported inputs can be used for given device.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit d49476994899943eaac97e2c482e11a38b8e5d1e)
(cherry picked from commit 8b3f45351248044118fc9b3d64c5fa5b92036031)
(cherry picked from commit 143c1b9ec5e7787d0d2ceb170781875377a2e81d)
---
 drivers/adc/adc_nrfx_saadc.c                  |  3 ++-
 dts/arm/nordic/nrf51822.dtsi                  |  1 +
 dts/arm/nordic/nrf52805.dtsi                  |  1 +
 dts/arm/nordic/nrf52810.dtsi                  |  1 +
 dts/arm/nordic/nrf52811.dtsi                  |  1 +
 dts/arm/nordic/nrf52832.dtsi                  |  1 +
 dts/arm/nordic/nrf52833.dtsi                  |  1 +
 dts/arm/nordic/nrf52840.dtsi                  |  1 +
 dts/arm/nordic/nrf5340_cpuapp.dtsi            |  1 +
 dts/arm/nordic/nrf5340_cpuappns.dtsi          |  1 +
 dts/arm/nordic/nrf91.dtsi                     |  1 +
 dts/arm/nordic/nrf91ns.dtsi                   |  1 +
 dts/common/nordic/nrf54h20.dtsi               |  1 +
 dts/common/nordic/nrf54l15.dtsi               |  1 +
 dts/common/nordic/nrf54l20.dtsi               |  1 +
 dts/common/nordic/nrf9280.dtsi                |  2 +-
 dts/common/nordic/nrf_common.dtsi             |  1 -
 include/zephyr/dt-bindings/adc/nrf-adc.h      | 11 -----------
 .../zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h | 15 +++++++++++++++
 include/zephyr/dt-bindings/adc/nrf-saadc-v2.h | 14 ++++++++++++++
 include/zephyr/dt-bindings/adc/nrf-saadc-v3.h | 14 ++++++++++++++
 include/zephyr/dt-bindings/adc/nrf-saadc.h    | 19 +++++++++++++++++++
 22 files changed, 79 insertions(+), 14 deletions(-)
 create mode 100644 include/zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h
 create mode 100644 include/zephyr/dt-bindings/adc/nrf-saadc-v2.h
 create mode 100644 include/zephyr/dt-bindings/adc/nrf-saadc-v3.h
 create mode 100644 include/zephyr/dt-bindings/adc/nrf-saadc.h

diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index 132e8e78c3e..ba4d3e8364f 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -7,7 +7,8 @@
 #define ADC_CONTEXT_USES_KERNEL_TIMER
 #include "adc_context.h"
 #include <haly/nrfy_saadc.h>
-#include <zephyr/dt-bindings/adc/nrf-adc.h>
+#include <zephyr/dt-bindings/adc/nrf-saadc-v3.h>
+#include <zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h>
 #include <zephyr/linker/devicetree_regions.h>
 
 #define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
diff --git a/dts/arm/nordic/nrf51822.dtsi b/dts/arm/nordic/nrf51822.dtsi
index 11cc9eff2f9..a11677ad934 100644
--- a/dts/arm/nordic/nrf51822.dtsi
+++ b/dts/arm/nordic/nrf51822.dtsi
@@ -2,6 +2,7 @@
 
 #include <arm/armv6-m.dtsi>
 #include <nordic/nrf_common.dtsi>
+#include <zephyr/dt-bindings/adc/nrf-adc.h>
 
 / {
 	chosen {
diff --git a/dts/arm/nordic/nrf52805.dtsi b/dts/arm/nordic/nrf52805.dtsi
index 07f3e8ed7d3..bd768ca85fe 100644
--- a/dts/arm/nordic/nrf52805.dtsi
+++ b/dts/arm/nordic/nrf52805.dtsi
@@ -6,6 +6,7 @@
 
 #include <arm/armv7-m.dtsi>
 #include <nordic/nrf_common.dtsi>
+#include <zephyr/dt-bindings/adc/nrf-saadc-v2.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 / {
diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
index 3acbf81c56c..7cdca229120 100644
--- a/dts/arm/nordic/nrf52810.dtsi
+++ b/dts/arm/nordic/nrf52810.dtsi
@@ -2,6 +2,7 @@
 
 #include <arm/armv7-m.dtsi>
 #include <nordic/nrf_common.dtsi>
+#include <zephyr/dt-bindings/adc/nrf-saadc-v2.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 / {
diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi
index 2f1660c052e..99815337203 100644
--- a/dts/arm/nordic/nrf52811.dtsi
+++ b/dts/arm/nordic/nrf52811.dtsi
@@ -6,6 +6,7 @@
 
 #include <arm/armv7-m.dtsi>
 #include <nordic/nrf_common.dtsi>
+#include <zephyr/dt-bindings/adc/nrf-saadc-v2.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 / {
diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
index ccd8bda3ab3..d40d48eb947 100644
--- a/dts/arm/nordic/nrf52832.dtsi
+++ b/dts/arm/nordic/nrf52832.dtsi
@@ -2,6 +2,7 @@
 
 #include <arm/armv7-m.dtsi>
 #include <nordic/nrf_common.dtsi>
+#include <zephyr/dt-bindings/adc/nrf-saadc-v2.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 / {
diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi
index 1029d2a4239..b3661a2ebe0 100644
--- a/dts/arm/nordic/nrf52833.dtsi
+++ b/dts/arm/nordic/nrf52833.dtsi
@@ -6,6 +6,7 @@
 
 #include <arm/armv7-m.dtsi>
 #include <nordic/nrf_common.dtsi>
+#include <zephyr/dt-bindings/adc/nrf-saadc-v3.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 / {
diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index 718f8a562b7..85520958568 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -2,6 +2,7 @@
 
 #include <arm/armv7-m.dtsi>
 #include <nordic/nrf_common.dtsi>
+#include <zephyr/dt-bindings/adc/nrf-saadc-v3.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 / {
diff --git a/dts/arm/nordic/nrf5340_cpuapp.dtsi b/dts/arm/nordic/nrf5340_cpuapp.dtsi
index e40f6241d91..c02f939a7fa 100644
--- a/dts/arm/nordic/nrf5340_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuapp.dtsi
@@ -6,6 +6,7 @@
 
 #include <arm/armv8-m.dtsi>
 #include <nordic/nrf_common.dtsi>
+#include <zephyr/dt-bindings/adc/nrf-saadc-v3.h>
 
 / {
 	cpus {
diff --git a/dts/arm/nordic/nrf5340_cpuappns.dtsi b/dts/arm/nordic/nrf5340_cpuappns.dtsi
index 6df1be54b34..a65b24ac818 100644
--- a/dts/arm/nordic/nrf5340_cpuappns.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuappns.dtsi
@@ -8,6 +8,7 @@
 
 #include <arm/armv8-m.dtsi>
 #include <nordic/nrf_common.dtsi>
+#include <zephyr/dt-bindings/adc/nrf-saadc-v3.h>
 
 / {
 	cpus {
diff --git a/dts/arm/nordic/nrf91.dtsi b/dts/arm/nordic/nrf91.dtsi
index 78502d3f086..9a64ed92229 100644
--- a/dts/arm/nordic/nrf91.dtsi
+++ b/dts/arm/nordic/nrf91.dtsi
@@ -6,6 +6,7 @@
 
 #include <arm/armv8-m.dtsi>
 #include <nordic/nrf_common.dtsi>
+#include <zephyr/dt-bindings/adc/nrf-saadc-v2.h>
 
 / {
 	cpus {
diff --git a/dts/arm/nordic/nrf91ns.dtsi b/dts/arm/nordic/nrf91ns.dtsi
index 13a82c442e0..e44bbcde0a4 100644
--- a/dts/arm/nordic/nrf91ns.dtsi
+++ b/dts/arm/nordic/nrf91ns.dtsi
@@ -6,6 +6,7 @@
 
 #include <arm/armv8-m.dtsi>
 #include <nordic/nrf_common.dtsi>
+#include <zephyr/dt-bindings/adc/nrf-saadc-v2.h>
 
 / {
 	cpus {
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 1aae058b70e..c0de788ad9b 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -7,6 +7,7 @@
 #include <mem.h>
 #include <nordic/nrf_common.dtsi>
 
+#include <zephyr/dt-bindings/adc/nrf-saadc.h>
 #include <zephyr/dt-bindings/misc/nordic-nrf-ficr-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-domain-id-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-owner-id-nrf54h20.h>
diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index 60b22599314..737c1d5a199 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -6,6 +6,7 @@
 
 #include <mem.h>
 #include <nordic/nrf_common.dtsi>
+#include <zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 /delete-node/ &sw_pwm;
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 6338f497adf..43c749f8c64 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -6,6 +6,7 @@
 
 #include <mem.h>
 #include <nordic/nrf_common.dtsi>
+#include <zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 /delete-node/ &sw_pwm;
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 08223449076..dc688a89f25 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -6,7 +6,7 @@
 
 #include <mem.h>
 #include <nordic/nrf_common.dtsi>
-
+#include <zephyr/dt-bindings/adc/nrf-saadc.h>
 #include <zephyr/dt-bindings/misc/nordic-nrf-ficr-nrf9230-engb.h>
 #include <zephyr/dt-bindings/misc/nordic-domain-id-nrf9230.h>
 #include <zephyr/dt-bindings/misc/nordic-owner-id-nrf9230.h>
diff --git a/dts/common/nordic/nrf_common.dtsi b/dts/common/nordic/nrf_common.dtsi
index cb2df6bcccd..6293a82ed97 100644
--- a/dts/common/nordic/nrf_common.dtsi
+++ b/dts/common/nordic/nrf_common.dtsi
@@ -5,7 +5,6 @@
  */
 
 #include <zephyr/dt-bindings/adc/adc.h>
-#include <zephyr/dt-bindings/adc/nrf-adc.h>
 #include <zephyr/dt-bindings/gpio/gpio.h>
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
diff --git a/include/zephyr/dt-bindings/adc/nrf-adc.h b/include/zephyr/dt-bindings/adc/nrf-adc.h
index 1d875b8eb35..62d9b7cc33f 100644
--- a/include/zephyr/dt-bindings/adc/nrf-adc.h
+++ b/include/zephyr/dt-bindings/adc/nrf-adc.h
@@ -18,15 +18,4 @@
 #define NRF_ADC_AIN6 BIT(6)
 #define NRF_ADC_AIN7 BIT(7)
 
-#define NRF_SAADC_AIN0     1
-#define NRF_SAADC_AIN1     2
-#define NRF_SAADC_AIN2     3
-#define NRF_SAADC_AIN3     4
-#define NRF_SAADC_AIN4     5
-#define NRF_SAADC_AIN5     6
-#define NRF_SAADC_AIN6     7
-#define NRF_SAADC_AIN7     8
-#define NRF_SAADC_VDD      9
-#define NRF_SAADC_VDDHDIV5 13
-
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_ADC_H_ */
diff --git a/include/zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h b/include/zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h
new file mode 100644
index 00000000000..19da4ff6020
--- /dev/null
+++ b/include/zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_NRF54L_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_NRF54L_H_
+
+#include <zephyr/dt-bindings/adc/nrf-saadc-v2.h>
+
+#define NRF_SAADC_AVDD 10
+#define NRF_SAADC_DVDD 11
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_NRF54L_H_ */
diff --git a/include/zephyr/dt-bindings/adc/nrf-saadc-v2.h b/include/zephyr/dt-bindings/adc/nrf-saadc-v2.h
new file mode 100644
index 00000000000..f5f72bec829
--- /dev/null
+++ b/include/zephyr/dt-bindings/adc/nrf-saadc-v2.h
@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_V2_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_V2_H_
+
+#include <zephyr/dt-bindings/adc/nrf-saadc.h>
+
+#define NRF_SAADC_VDD 9
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_V2_H_ */
diff --git a/include/zephyr/dt-bindings/adc/nrf-saadc-v3.h b/include/zephyr/dt-bindings/adc/nrf-saadc-v3.h
new file mode 100644
index 00000000000..c51bab1a91e
--- /dev/null
+++ b/include/zephyr/dt-bindings/adc/nrf-saadc-v3.h
@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_V3_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_V3_H_
+
+#include <zephyr/dt-bindings/adc/nrf-saadc-v2.h>
+
+#define NRF_SAADC_VDDHDIV5 13
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_V3_H_ */
diff --git a/include/zephyr/dt-bindings/adc/nrf-saadc.h b/include/zephyr/dt-bindings/adc/nrf-saadc.h
new file mode 100644
index 00000000000..4a3deb95cff
--- /dev/null
+++ b/include/zephyr/dt-bindings/adc/nrf-saadc.h
@@ -0,0 +1,19 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_H_
+
+#define NRF_SAADC_AIN0 1
+#define NRF_SAADC_AIN1 2
+#define NRF_SAADC_AIN2 3
+#define NRF_SAADC_AIN3 4
+#define NRF_SAADC_AIN4 5
+#define NRF_SAADC_AIN5 6
+#define NRF_SAADC_AIN6 7
+#define NRF_SAADC_AIN7 8
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_H_ */

From a2308eca1072ac85e67ad1e757f06f61f0064e0d Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Mon, 30 Sep 2024 16:08:42 +0200
Subject: [PATCH 0183/2913] [nrf fromtree] drivers: adc: nrf: add support for
 nrf54l internal SAADC inputs

SAADC peripheral for nRF54L Series allows to choose internal
voltages as positive inputs.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit ece7da5947deac49802fe83587cac9507cde95a6)
(cherry picked from commit b1376e8bc2afbf47f89823b948bb9380e20c71b8)
(cherry picked from commit 73990a6359be79ae5a33ea9f32d3494700a43384)
---
 drivers/adc/adc_nrfx_saadc.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index ba4d3e8364f..e4c37a1f736 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -32,7 +32,7 @@ static const uint8_t saadc_psels[NRF_SAADC_AIN7 + 1] = {
 	[NRF_SAADC_AIN7] = NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
 };
 #elif defined(CONFIG_SOC_NRF54L15)
-static const uint8_t saadc_psels[NRF_SAADC_AIN7 + 1] = {
+static const uint32_t saadc_psels[NRF_SAADC_DVDD + 1] = {
 	[NRF_SAADC_AIN0] = NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
 	[NRF_SAADC_AIN1] = NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
 	[NRF_SAADC_AIN2] = NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
@@ -41,6 +41,9 @@ static const uint8_t saadc_psels[NRF_SAADC_AIN7 + 1] = {
 	[NRF_SAADC_AIN5] = NRF_PIN_PORT_TO_PIN_NUMBER(12U, 1),
 	[NRF_SAADC_AIN6] = NRF_PIN_PORT_TO_PIN_NUMBER(13U, 1),
 	[NRF_SAADC_AIN7] = NRF_PIN_PORT_TO_PIN_NUMBER(14U, 1),
+	[NRF_SAADC_VDD]  = NRF_SAADC_INPUT_VDD,
+	[NRF_SAADC_AVDD] = NRF_SAADC_INPUT_AVDD,
+	[NRF_SAADC_DVDD] = NRF_SAADC_INPUT_DVDD,
 };
 #endif
 
@@ -274,13 +277,8 @@ static int adc_nrfx_channel_setup(const struct device *dev,
 		m_data.single_ended_channels |= BIT(channel_cfg->channel_id);
 	}
 
-	/* Keep the channel disabled in hardware (set positive input to
-	 * NRF_SAADC_INPUT_DISABLED) until it is selected to be included
-	 * in a sampling sequence.
-	 */
-
 #if (NRF_SAADC_HAS_AIN_AS_PIN)
-	if ((channel_cfg->input_positive > NRF_SAADC_AIN7) ||
+	if ((channel_cfg->input_positive >= ARRAY_SIZE(saadc_psels)) ||
 	    (channel_cfg->input_positive < NRF_SAADC_AIN0)) {
 		return -EINVAL;
 	}
@@ -295,17 +293,18 @@ static int adc_nrfx_channel_setup(const struct device *dev,
 	} else {
 		input_negative = NRF_SAADC_INPUT_DISABLED;
 	}
-
+#endif
 	/* Store the positive input selection in a dedicated array,
 	 * to get it later when the channel is selected for a sampling
 	 * and to mark the channel as configured (ready to be selected).
 	 */
-	m_data.positive_inputs[channel_id] = saadc_psels[channel_cfg->input_positive];
-#else
 	m_data.positive_inputs[channel_id] = channel_cfg->input_positive;
-#endif
 
 	nrf_saadc_channel_init(NRF_SAADC, channel_id, &config);
+	/* Keep the channel disabled in hardware (set positive input to
+	 * NRF_SAADC_INPUT_DISABLED) until it is selected to be included
+	 * in a sampling sequence.
+	 */
 	nrf_saadc_channel_input_set(NRF_SAADC,
 				    channel_id,
 				    NRF_SAADC_INPUT_DISABLED,
@@ -532,7 +531,12 @@ static int start_read(const struct device *dev,
 			nrf_saadc_channel_pos_input_set(
 				NRF_SAADC,
 				channel_id,
-				m_data.positive_inputs[channel_id]);
+#if NRF_SAADC_HAS_AIN_AS_PIN
+				saadc_psels[m_data.positive_inputs[channel_id]]
+#else
+				m_data.positive_inputs[channel_id]
+#endif
+				);
 			++active_channels;
 		} else {
 			nrf_saadc_burst_set(

From 534fdbb41aa9eacf66db211e8ad2d5ca142ae3b0 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Mon, 30 Sep 2024 16:16:03 +0200
Subject: [PATCH 0184/2913] [nrf fromtree] samples: drivers: adc: add support
 for internal nRF54L SAADC inputs

SAADC peripheral for nRF54L Series allows to choose internal
voltages as positive inputs and samples shall showcase that.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit e31598233d67fab76afa3a839650c00c7d9621fc)
(cherry picked from commit 9c7b7478492218e5eac1324fd00344df4617fa57)
(cherry picked from commit ff05708b357d3bab73668f45f88b2ed56b290796)
---
 .../adc_dt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 12 +++++++++++-
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay        | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/samples/drivers/adc/adc_dt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/drivers/adc/adc_dt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index f185624f9b9..6273756c993 100644
--- a/samples/drivers/adc/adc_dt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/samples/drivers/adc/adc_dt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -6,7 +6,7 @@
 
 / {
 	zephyr,user {
-		io-channels = <&adc 0>, <&adc 1>, <&adc 7>;
+		io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 7>;
 	};
 };
 
@@ -33,6 +33,16 @@
 		zephyr,oversampling = <8>;
 	};
 
+	channel@2 {
+		reg = <2>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_VDD>;
+		zephyr,resolution = <12>;
+		zephyr,oversampling = <8>;
+	};
+
 	channel@7 {
 		reg = <7>;
 		zephyr,gain = "ADC_GAIN_1";
diff --git a/samples/drivers/adc/adc_sequence/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/drivers/adc/adc_sequence/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index a0639a405c4..7fedbe52ad2 100644
--- a/samples/drivers/adc/adc_sequence/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/samples/drivers/adc/adc_sequence/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -6,7 +6,7 @@
 
 / {
 	zephyr,user {
-		io-channels = <&adc 0>, <&adc 1>, <&adc 7>;
+		io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 7>;
 	};
 };
 
@@ -39,6 +39,16 @@
 		zephyr,oversampling = <8>;
 	};
 
+	channel@2 {
+		reg = <2>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_DVDD>; /* 0.9 V internal */
+		zephyr,resolution = <12>;
+		zephyr,oversampling = <8>;
+	};
+
 	channel@7 {
 		reg = <7>;
 		zephyr,gain = "ADC_GAIN_1";

From c79d767a89ceffe4308165733f44da132603a29c Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Mon, 30 Sep 2024 14:49:19 +0200
Subject: [PATCH 0185/2913] [nrf fromtree] drivers: retained_mem: nrf: align
 dependencies to nrf54h20

nRF54H20 cpuapp and cpurad are now compatible with retained_mem,
so explicit list of supported devices can be removed.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 7048e0bec395ee57a417c165d1691b766ed878b5)
(cherry picked from commit 94750fa620f31ba96b9ddb434a0c7f3a882a85cb)
(cherry picked from commit cafc199548e78468c9622c9c4bf739db8f5be248)
---
 drivers/retained_mem/Kconfig.nrf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/retained_mem/Kconfig.nrf b/drivers/retained_mem/Kconfig.nrf
index 3590249fcbe..348361e5f6f 100644
--- a/drivers/retained_mem/Kconfig.nrf
+++ b/drivers/retained_mem/Kconfig.nrf
@@ -13,6 +13,6 @@ config RETAINED_MEM_NRF_RAM_CTRL
 	bool "nRF RAM retention driver"
 	default y
 	depends on DT_HAS_ZEPHYR_RETAINED_RAM_ENABLED && RETAINED_MEM_ZEPHYR_RAM && POWEROFF
-	depends on SOC_SERIES_NRF52X || SOC_SERIES_NRF53X || SOC_SERIES_NRF54LX || SOC_SERIES_NRF91X
+	depends on SOC_FAMILY_NORDIC_NRF
 	help
 	  Enable driver for Nordic RAM retention.

From 70ca604d9e33a135c10739d8ea0b7e070cb6654c Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Mon, 30 Sep 2024 14:53:40 +0200
Subject: [PATCH 0186/2913] [nrf fromtree] tests: drivers: retained_mem: api:
 add support for nrf54h20

retained_mem driver is now compatible with nrf54h20 cpuapp & cpurad.
Also add missing .conf for nrf54l15.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit e9f1f41e2819a88b230fca5575f440a24cd61bb9)
(cherry picked from commit 321c69d5f012e5f9605d910623332f29855631b2)
(cherry picked from commit 2f52f5bf23b9aa0f2c3dbbd5afec110ee6dec08c)
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.conf    |  1 +
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 22 +++++++++++++++++++
 .../boards/nrf54h20dk_nrf54h20_cpurad.conf    |  1 +
 .../boards/nrf54h20dk_nrf54h20_cpurad.overlay | 22 +++++++++++++++++++
 .../boards/nrf54l15dk_nrf54l15_cpuapp.conf    |  1 +
 tests/drivers/retained_mem/api/testcase.yaml  |  6 ++++-
 6 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpurad.conf
 create mode 100644 tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpurad.overlay
 create mode 100644 tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l15_cpuapp.conf

diff --git a/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..c15ba3ed96d
--- /dev/null
+++ b/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_POWEROFF=y
diff --git a/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..672a49379e7
--- /dev/null
+++ b/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,22 @@
+/ {
+	cpuapp_ram0_ret@22004000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x22004000 DT_SIZE_K(16)>;
+		zephyr,memory-region = "RetainedMem";
+		status = "okay";
+
+		retainedmem0: retainedmem {
+			compatible = "zephyr,retained-ram";
+			status = "okay";
+		};
+	};
+
+	aliases {
+		retainedmemtestdevice = &retainedmem0;
+	};
+};
+
+&cpuapp_ram0 {
+	reg = <0x22000000 DT_SIZE_K(16)>;
+	ranges = <0x0 0x22000000 0x4000>;
+};
diff --git a/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpurad.conf
new file mode 100644
index 00000000000..c15ba3ed96d
--- /dev/null
+++ b/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -0,0 +1 @@
+CONFIG_POWEROFF=y
diff --git a/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpurad.overlay
new file mode 100644
index 00000000000..c824df8b74e
--- /dev/null
+++ b/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpurad.overlay
@@ -0,0 +1,22 @@
+/ {
+	cpurad_ram0_ret@2302c000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x2302c000 DT_SIZE_K(16)>;
+		zephyr,memory-region = "RetainedMem";
+		status = "okay";
+
+		retainedmem0: retainedmem {
+			compatible = "zephyr,retained-ram";
+			status = "okay";
+		};
+	};
+
+	aliases {
+		retainedmemtestdevice = &retainedmem0;
+	};
+};
+
+&cpurad_ram0 {
+	reg = <0x23000000 DT_SIZE_K(176)>;
+	ranges = <0x0 0x23000000 0x2c000>;
+};
diff --git a/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l15_cpuapp.conf
new file mode 100644
index 00000000000..c15ba3ed96d
--- /dev/null
+++ b/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_POWEROFF=y
diff --git a/tests/drivers/retained_mem/api/testcase.yaml b/tests/drivers/retained_mem/api/testcase.yaml
index 2979607296c..02f7c7c8b27 100644
--- a/tests/drivers/retained_mem/api/testcase.yaml
+++ b/tests/drivers/retained_mem/api/testcase.yaml
@@ -5,7 +5,11 @@ tests:
       - drivers
       - retained_mem
   drivers.retained_mem.api.ram:
-    platform_allow: qemu_cortex_m3 nrf54l15dk/nrf54l15/cpuapp
+    platform_allow:
+      - qemu_cortex_m3
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpurad
+      - nrf54l15dk/nrf54l15/cpuapp
     tags:
       - drivers
       - retained_mem

From 0118105e02c58c74dd3b6bc41a20a3fce613114b Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Tue, 1 Oct 2024 14:32:16 +0200
Subject: [PATCH 0187/2913] [nrf fromtree] boards: nordic: nrf54hl: add
 retained_mem to supported features

Doc and .yaml descriptions shall mention retained_mem
in supported features on affected boards.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 478a40ad8926f0084c33755f6d1293d840e61b46)
(cherry picked from commit 36cdfc208bc20901b60219071be843b269599826)
(cherry picked from commit dedad4bcb84f3af99e8224314fdcbbbc0c3645af)
---
 boards/nordic/nrf54h20dk/doc/index.rst                       | 5 +++++
 .../nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml  | 1 +
 .../nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml  | 1 +
 boards/nordic/nrf54l15dk/doc/index.rst                       | 3 +++
 boards/nordic/nrf54l15pdk/doc/index.rst                      | 3 +++
 5 files changed, 13 insertions(+)

diff --git a/boards/nordic/nrf54h20dk/doc/index.rst b/boards/nordic/nrf54h20dk/doc/index.rst
index 41306357fe4..c8e95e39875 100644
--- a/boards/nordic/nrf54h20dk/doc/index.rst
+++ b/boards/nordic/nrf54h20dk/doc/index.rst
@@ -39,6 +39,7 @@ nRF54H20 SoC provides support for the following devices:
 * :abbr:`GPIO (General Purpose Input Output)`
 * :abbr:`GRTC (Global real-time counter)`
 * :abbr:`I2C (Inter-Integrated Circuit)`
+* MEMCONF
 * MRAM
 * :abbr:`PWM (Pulse Width Modulation)`
 * RADIO (Bluetooth Low Energy and 802.15.4)
@@ -70,6 +71,8 @@ hardware features:
 +-----------+------------+----------------------+
 | I2C(M)    | on-chip    | i2c                  |
 +-----------+------------+----------------------+
+| MEMCONF   | on-chip    | retained_mem         |
++-----------+------------+----------------------+
 | SPI(M/S)  | on-chip    | spi                  |
 +-----------+------------+----------------------+
 | UART      | on-chip    | serial               |
@@ -89,6 +92,8 @@ hardware features:
 +-----------+------------+----------------------+
 | I2C(M)    | on-chip    | i2c                  |
 +-----------+------------+----------------------+
+| MEMCONF   | on-chip    | retained_mem         |
++-----------+------------+----------------------+
 | SPI(M/S)  | on-chip    | spi                  |
 +-----------+------------+----------------------+
 | UART      | on-chip    | serial               |
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
index 89b85746540..a64f8cf6398 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
@@ -19,6 +19,7 @@ supported:
   - gpio
   - i2c
   - pwm
+  - retained_mem
   - spi
   - watchdog
   - usbd
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml
index 818a8d74b79..568f6fcc18e 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml
@@ -16,4 +16,5 @@ supported:
   - counter
   - gpio
   - pwm
+  - retained_mem
   - spi
diff --git a/boards/nordic/nrf54l15dk/doc/index.rst b/boards/nordic/nrf54l15dk/doc/index.rst
index 7d450912661..f7b927bdc86 100644
--- a/boards/nordic/nrf54l15dk/doc/index.rst
+++ b/boards/nordic/nrf54l15dk/doc/index.rst
@@ -19,6 +19,7 @@ nRF54L15 Arm Cortex-M33 CPU and the following devices:
 * RRAM
 * :abbr:`GPIO (General Purpose Input Output)`
 * :abbr:`TWIM (I2C-compatible two-wire interface master with EasyDMA)`
+* MEMCONF
 * :abbr:`MPU (Memory Protection Unit)`
 * :abbr:`NVIC (Nested Vectored Interrupt Controller)`
 * :abbr:`PWM (Pulse Width Modulation)`
@@ -60,6 +61,8 @@ hardware features:
 +-----------+------------+----------------------+
 | GRTC      | on-chip    | counter              |
 +-----------+------------+----------------------+
+| MEMCONF   | on-chip    | retained_mem         |
++-----------+------------+----------------------+
 | MPU       | on-chip    | arch/arm             |
 +-----------+------------+----------------------+
 | NVIC      | on-chip    | arch/arm             |
diff --git a/boards/nordic/nrf54l15pdk/doc/index.rst b/boards/nordic/nrf54l15pdk/doc/index.rst
index dc6e69b65e5..3fae82b713c 100644
--- a/boards/nordic/nrf54l15pdk/doc/index.rst
+++ b/boards/nordic/nrf54l15pdk/doc/index.rst
@@ -20,6 +20,7 @@ the following devices:
 * RRAM
 * :abbr:`GPIO (General Purpose Input Output)`
 * :abbr:`TWIM (I2C-compatible two-wire interface master with EasyDMA)`
+* MEMCONF
 * :abbr:`MPU (Memory Protection Unit)`
 * :abbr:`NVIC (Nested Vectored Interrupt Controller)`
 * :abbr:`PWM (Pulse Width Modulation)`
@@ -65,6 +66,8 @@ hardware features:
 +-----------+------------+----------------------+
 | TWIM      | on-chip    | i2c                  |
 +-----------+------------+----------------------+
+| MEMCONF   | on-chip    | retained_mem         |
++-----------+------------+----------------------+
 | MPU       | on-chip    | arch/arm             |
 +-----------+------------+----------------------+
 | NVIC      | on-chip    | arch/arm             |

From c438cf465761cf86495c970e34da250ee874a4bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 14 Oct 2024 13:09:59 +0200
Subject: [PATCH 0188/2913] [nrf fromtree] dts: common: nordic: nrf54l20:
 Adjust RAM size to 511k
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Last 1k is used for saving VPR context and shall not be exposed.
Limiting RAM to 511k.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 7b3acdb5c0d51fbe362d7a397325b721427ac3bf)
(cherry picked from commit 4ac75dcc76d082c13c5ae511a85511820a47f68c)
(cherry picked from commit 565cf3f1bbe402e7130e56eb2e53e9534bd16dbb)
---
 dts/common/nordic/nrf54l20.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 43c749f8c64..56adf8fef46 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -65,10 +65,10 @@
 
 		cpuapp_sram: memory@20000000 {
 			compatible = "mmio-sram";
-			reg = <0x20000000 DT_SIZE_K(512)>;
+			reg = <0x20000000 DT_SIZE_K(511)>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0x0 0x20000000 0x2f000>;
+			ranges = <0x0 0x20000000 0x7fc00>;
 		};
 
 		global_peripherals: peripheral@50000000 {

From 03c2143fb70a7d12086c5e83d91097c9f91a4932 Mon Sep 17 00:00:00 2001
From: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
Date: Tue, 8 Oct 2024 07:18:50 +0200
Subject: [PATCH 0189/2913] [nrf fromlist] samples: boards: nordic: system_off:
 Add GRTC wakeup

Extend system_off sample to use GRTC timer as a wake up source.

Upstream PR #: 79095

Signed-off-by: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
(cherry picked from commit a2171d70ea896d645273c2b32f5a6551ab83f4c8)
(cherry picked from commit b2daa1248c506d65309d414959f8adce9050618b)
---
 samples/boards/nordic/system_off/Kconfig     |  6 ++++++
 samples/boards/nordic/system_off/sample.yaml |  6 ++++++
 samples/boards/nordic/system_off/src/main.c  | 15 +++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/samples/boards/nordic/system_off/Kconfig b/samples/boards/nordic/system_off/Kconfig
index 5d26d75ecdf..c5a0f492d90 100644
--- a/samples/boards/nordic/system_off/Kconfig
+++ b/samples/boards/nordic/system_off/Kconfig
@@ -21,4 +21,10 @@ config APP_USE_RETAINED_MEM
 
 endchoice
 
+config GRTC_WAKEUP_ENABLE
+	bool "Use GRTC to wake up device from system off"
+	default n
+	help
+	  Switch wake up source from pressing sw0 button to GRTC
+
 source "Kconfig.zephyr"
diff --git a/samples/boards/nordic/system_off/sample.yaml b/samples/boards/nordic/system_off/sample.yaml
index 0503867b191..ab6a12aeb16 100644
--- a/samples/boards/nordic/system_off/sample.yaml
+++ b/samples/boards/nordic/system_off/sample.yaml
@@ -29,3 +29,9 @@ tests:
     extra_configs:
       - CONFIG_APP_USE_RETAINED_MEM=y
       - CONFIG_RETAINED_MEM=y
+  sample.boards.nrf.system_off.grtc_wakeup:
+    build_only: true
+    platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
+    extra_configs:
+      - CONFIG_GRTC_WAKEUP_ENABLE=y
diff --git a/samples/boards/nordic/system_off/src/main.c b/samples/boards/nordic/system_off/src/main.c
index 6e1683c4cd6..b40b1ea26da 100644
--- a/samples/boards/nordic/system_off/src/main.c
+++ b/samples/boards/nordic/system_off/src/main.c
@@ -16,7 +16,12 @@
 #include <zephyr/sys/poweroff.h>
 #include <zephyr/sys/util.h>
 
+#if IS_ENABLED(CONFIG_GRTC_WAKEUP_ENABLE)
+#include <zephyr/drivers/timer/nrf_grtc_timer.h>
+#define DEEP_SLEEP_TIME_S 2
+#else
 static const struct gpio_dt_spec sw0 = GPIO_DT_SPEC_GET(DT_ALIAS(sw0), gpios);
+#endif
 
 int main(void)
 {
@@ -45,6 +50,15 @@ int main(void)
 		printf("Retained data not supported\n");
 	}
 
+#if IS_ENABLED(CONFIG_GRTC_WAKEUP_ENABLE)
+	int err = z_nrf_grtc_wakeup_prepare(DEEP_SLEEP_TIME_S * USEC_PER_SEC);
+
+	if (err < 0) {
+		printk("Unable to prepare GRTC as a wake up source (err = %d).\n", err);
+	} else {
+		printk("Entering system off; wait %u seconds to restart\n", DEEP_SLEEP_TIME_S);
+	}
+#else
 	/* configure sw0 as input, interrupt as level active to allow wake-up */
 	rc = gpio_pin_configure_dt(&sw0, GPIO_INPUT);
 	if (rc < 0) {
@@ -59,6 +73,7 @@ int main(void)
 	}
 
 	printf("Entering system off; press sw0 to restart\n");
+#endif
 
 	rc = pm_device_action_run(cons, PM_DEVICE_ACTION_SUSPEND);
 	if (rc < 0) {

From 81a69fd2fea9fc78761eb16f20853c7f1469a578 Mon Sep 17 00:00:00 2001
From: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
Date: Mon, 24 Jun 2024 16:50:42 +0200
Subject: [PATCH 0190/2913] [nrf fromtree] drivers: dp: swdp_bitbang: power
 optimization

This patch changes GPIO initialization
to be in PORT_OFF state by default.
Also, if no transceiver is attached to the signals,
the GPIOs are configured to be disconnected to preserve power.

I tested this on a prototype board where we are going to have
a debugger in a low-power context.

Signed-off-by: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
(cherry picked from commit b0936ae35331c3218ed4d51477d95b06afe53ecd)
(cherry picked from commit 44cb14672c41345317b239c9027c6b7ebb4de4dc)
(cherry picked from commit 2158a35c7c4e07232da15e141109a35272bbee70)
---
 drivers/dp/swdp_bitbang.c | 118 ++++++++++++++++++++++----------------
 1 file changed, 68 insertions(+), 50 deletions(-)

diff --git a/drivers/dp/swdp_bitbang.c b/drivers/dp/swdp_bitbang.c
index ba46c629604..dabf6d34a02 100644
--- a/drivers/dp/swdp_bitbang.c
+++ b/drivers/dp/swdp_bitbang.c
@@ -562,107 +562,125 @@ static int sw_configure(const struct device *dev,
 static int sw_port_on(const struct device *dev)
 {
 	const struct sw_config *config = dev->config;
-
-	gpio_pin_set_dt(&config->clk, 1);
+	int ret;
 
 	if (config->dnoe.port) {
-		gpio_pin_set_dt(&config->dnoe, 1);
+		ret = gpio_pin_configure_dt(&config->dnoe, GPIO_OUTPUT_ACTIVE);
+		if (ret) {
+			return ret;
+		}
 	}
 
 	if (config->dout.port) {
-		gpio_pin_set_dt(&config->dout, 1);
-	} else {
-		int ret;
-
-		ret = gpio_pin_configure_dt(&config->dio, GPIO_OUTPUT_ACTIVE);
+		ret = gpio_pin_configure_dt(&config->dout, GPIO_OUTPUT_ACTIVE);
 		if (ret) {
 			return ret;
 		}
 	}
 
-	if (config->noe.port) {
-		gpio_pin_set_dt(&config->noe, 1);
-	}
-	if (config->reset.port) {
-		gpio_pin_set_dt(&config->reset, 1);
-	}
-
-	return 0;
-}
-
-static int sw_port_off(const struct device *dev)
-{
-	const struct sw_config *config = dev->config;
-
-	if (config->dnoe.port) {
-		gpio_pin_set_dt(&config->dnoe, 0);
+	ret = gpio_pin_configure_dt(&config->dio, GPIO_INPUT);
+	if (ret) {
+		return ret;
 	}
 
-	if (config->dout.port) {
-		gpio_pin_set_dt(&config->dout, 0);
-	} else {
-		int ret;
-
-		ret = gpio_pin_configure_dt(&config->dio, GPIO_INPUT);
+	if (config->noe.port) {
+		ret = gpio_pin_configure_dt(&config->noe, GPIO_OUTPUT_ACTIVE);
 		if (ret) {
 			return ret;
 		}
 	}
 
-	if (config->noe.port) {
-		gpio_pin_set_dt(&config->noe, 0);
+	ret = gpio_pin_configure_dt(&config->clk, GPIO_OUTPUT_ACTIVE);
+	if (ret) {
+		return ret;
 	}
-	if (config->reset.port) {
-		gpio_pin_set_dt(&config->reset, 1);
+
+	ret = gpio_pin_configure_dt(&config->reset, GPIO_OUTPUT_ACTIVE);
+	if (ret) {
+		return ret;
 	}
 
 	return 0;
 }
 
-static int sw_gpio_init(const struct device *dev)
+static int sw_port_off(const struct device *dev)
 {
 	const struct sw_config *config = dev->config;
-	struct sw_cfg_data *sw_data = dev->data;
 	int ret;
 
-	ret = gpio_pin_configure_dt(&config->clk, GPIO_OUTPUT_ACTIVE);
-	if (ret) {
-		return ret;
-	}
+	/* If there is a transceiver connected to IO, pins should always be driven. */
+	if (config->dnoe.port) {
+		ret = gpio_pin_configure_dt(&config->dnoe, GPIO_OUTPUT_INACTIVE);
+		if (ret) {
+			return ret;
+		}
 
-	ret = gpio_pin_configure_dt(&config->dio, GPIO_INPUT);
-	if (ret) {
-		return ret;
-	}
+		if (config->dout.port) {
+			ret = gpio_pin_configure_dt(&config->dout, GPIO_OUTPUT_ACTIVE);
+			if (ret) {
+				return ret;
+			}
+		}
 
-	if (config->dout.port) {
-		ret = gpio_pin_configure_dt(&config->dout, GPIO_OUTPUT_ACTIVE);
+		ret = gpio_pin_configure_dt(&config->dio, GPIO_INPUT);
 		if (ret) {
 			return ret;
 		}
-	}
+	} else {
+		if (config->dout.port) {
+			ret = gpio_pin_configure_dt(&config->dout, GPIO_DISCONNECTED);
+			if (ret) {
+				return ret;
+			}
+		}
 
-	if (config->dnoe.port) {
-		ret = gpio_pin_configure_dt(&config->dnoe, GPIO_OUTPUT_INACTIVE);
+		ret = gpio_pin_configure_dt(&config->dio, GPIO_DISCONNECTED);
 		if (ret) {
 			return ret;
 		}
 	}
 
+	/* If there is a transceiver connected to CLK, pins should always be driven. */
 	if (config->noe.port) {
 		ret = gpio_pin_configure_dt(&config->noe, GPIO_OUTPUT_INACTIVE);
 		if (ret) {
 			return ret;
 		}
+
+		ret = gpio_pin_configure_dt(&config->clk, GPIO_OUTPUT_ACTIVE);
+		if (ret) {
+			return ret;
+		}
+
+	} else {
+		ret = gpio_pin_configure_dt(&config->clk, GPIO_DISCONNECTED);
+		if (ret) {
+			return ret;
+		}
 	}
 
 	if (config->reset.port) {
-		ret = gpio_pin_configure_dt(&config->reset, GPIO_OUTPUT_ACTIVE);
+		ret = gpio_pin_configure_dt(&config->reset, GPIO_DISCONNECTED);
 		if (ret) {
 			return ret;
 		}
 	}
 
+	return 0;
+}
+
+static int sw_gpio_init(const struct device *dev)
+{
+	const struct sw_config *config = dev->config;
+	struct sw_cfg_data *sw_data = dev->data;
+	int ret;
+
+	/* start with the port turned off */
+	ret = sw_port_off(dev);
+	if (ret) {
+		return ret;
+	}
+
 	sw_data->turnaround = 1U;
 	sw_data->data_phase = false;
 	sw_data->fast_clock = false;

From 94454bdf9e6e1e1ab156bec7708d1bb5370f1f13 Mon Sep 17 00:00:00 2001
From: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
Date: Wed, 2 Oct 2024 13:52:33 +0200
Subject: [PATCH 0191/2913] [nrf fromtree] drivers: dp: swdp_bitbang: hardcode
 nRF53 SYSCLK

Since CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC is tied to the slow RTC clock
for the nRF53, use the default SYSCLK of 64MHz instead.

Signed-off-by: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
(cherry picked from commit 621a6000d578aa7d52c8d9e7e4403d2e851c15d0)
(cherry picked from commit 0a8d32e73cce6381e4d1ae861ca228b54681fb40)
(cherry picked from commit b9ca00caf7fffa2bf78dcaf3b76d5d44a23a8f6e)
---
 drivers/dp/swdp_ll_pin.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/dp/swdp_ll_pin.h b/drivers/dp/swdp_ll_pin.h
index 3044931a228..48b4ea14cb3 100644
--- a/drivers/dp/swdp_ll_pin.h
+++ b/drivers/dp/swdp_ll_pin.h
@@ -6,8 +6,9 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
+#include <soc.h>
 
-#if defined(CONFIG_SOC_SERIES_NRF52X)
+#if defined(CONFIG_SOC_SERIES_NRF52X) || defined(CONFIG_SOC_SERIES_NRF53X)
 #define CPU_CLOCK		64000000U
 #else
 #define CPU_CLOCK		CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC

From 027bc9c090988bef705e58a8db090b8683c31b51 Mon Sep 17 00:00:00 2001
From: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
Date: Wed, 2 Oct 2024 13:53:31 +0200
Subject: [PATCH 0192/2913] [nrf fromtree] drivers: dp: swdp_bitbang: Update
 SWD clock calculation

This patch updates the SWD clock calculation to the latest behavior
of DAPLink.

Signed-off-by: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
(cherry picked from commit fd686a25b3aa2d2671d628fca1717ae43fb49b55)
(cherry picked from commit 6c3c818c6f59bc2a1f6f78db83585b59a1037ab5)
(cherry picked from commit f06cba871ae5031a2673183311e4c63d96a51fea)
---
 drivers/dp/swdp_bitbang.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/drivers/dp/swdp_bitbang.c b/drivers/dp/swdp_bitbang.c
index dabf6d34a02..a1d28386209 100644
--- a/drivers/dp/swdp_bitbang.c
+++ b/drivers/dp/swdp_bitbang.c
@@ -26,8 +26,8 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(swdp, CONFIG_DP_DRIVER_LOG_LEVEL);
 
-#define CLOCK_DELAY(swclk_freq, port_write_cycles) \
-	((CPU_CLOCK / 2 / swclk_freq) - port_write_cycles)
+#define MAX_SWJ_CLOCK(delay_cycles, port_write_cycles) \
+	((CPU_CLOCK / 2U) / (port_write_cycles + delay_cycles))
 
 /*
  * Default SWCLK frequency in Hz.
@@ -35,6 +35,7 @@ LOG_MODULE_REGISTER(swdp, CONFIG_DP_DRIVER_LOG_LEVEL);
  */
 #define SWDP_DEFAULT_SWCLK_FREQUENCY	1000000U
 
+#define DELAY_FAST_CYCLES		2U
 #define DELAY_SLOW_CYCLES		3U
 
 struct sw_config {
@@ -528,14 +529,19 @@ static int sw_set_clock(const struct device *dev, const uint32_t clock)
 	struct sw_cfg_data *sw_data = dev->data;
 	uint32_t delay;
 
-	sw_data->fast_clock = false;
-	delay = ((CPU_CLOCK / 2U) + (clock - 1U)) / clock;
-
-	if (delay > config->port_write_cycles) {
-		delay -= config->port_write_cycles;
-		delay = (delay + (DELAY_SLOW_CYCLES - 1U)) / DELAY_SLOW_CYCLES;
-	} else {
+	if (clock >= MAX_SWJ_CLOCK(DELAY_FAST_CYCLES, config->port_write_cycles)) {
+		sw_data->fast_clock = true;
 		delay = 1U;
+	} else {
+		sw_data->fast_clock = false;
+
+		delay = ((CPU_CLOCK / 2U) + (clock - 1U)) / clock;
+		if (delay > config->port_write_cycles) {
+			delay -= config->port_write_cycles;
+			delay = (delay + (DELAY_SLOW_CYCLES - 1U)) / DELAY_SLOW_CYCLES;
+		} else {
+			delay = 1U;
+		}
 	}
 
 	sw_data->clock_delay = delay;
@@ -684,8 +690,7 @@ static int sw_gpio_init(const struct device *dev)
 	sw_data->turnaround = 1U;
 	sw_data->data_phase = false;
 	sw_data->fast_clock = false;
-	sw_data->clock_delay = CLOCK_DELAY(SWDP_DEFAULT_SWCLK_FREQUENCY,
-					   config->port_write_cycles);
+	sw_set_clock(dev, SWDP_DEFAULT_SWCLK_FREQUENCY);
 
 	return 0;
 }

From 0668211f6a110be1757a7cdf894696c8ab727964 Mon Sep 17 00:00:00 2001
From: Daniel Leung <daniel.leung@intel.com>
Date: Fri, 11 Oct 2024 13:11:30 -0700
Subject: [PATCH 0193/2913] [nrf fromtree] dp: swdp_bitbang: fix unused
 variable build error

The variable config in sw_port_off() is not used, and it's
causing CI build error about unused variable. So remove it.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
(cherry picked from commit 1ec5ce05f9f84b18cb8056d01917480a6ec39e52)
(cherry picked from commit d02b0d9cf9c3c3913564a2fd0c3da6edc4f78afe)
(cherry picked from commit b9714e98fb4448420fe73e0ed4a0e19e580c3bec)
---
 drivers/dp/swdp_bitbang.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/dp/swdp_bitbang.c b/drivers/dp/swdp_bitbang.c
index a1d28386209..7822315ab8e 100644
--- a/drivers/dp/swdp_bitbang.c
+++ b/drivers/dp/swdp_bitbang.c
@@ -677,7 +677,6 @@ static int sw_port_off(const struct device *dev)
 
 static int sw_gpio_init(const struct device *dev)
 {
-	const struct sw_config *config = dev->config;
 	struct sw_cfg_data *sw_data = dev->data;
 	int ret;
 

From 2ffc67d08d682ca70f7f2d0ba217bded613c9ef2 Mon Sep 17 00:00:00 2001
From: Marek Pieta <Marek.Pieta@nordicsemi.no>
Date: Tue, 1 Oct 2024 09:06:05 +0200
Subject: [PATCH 0194/2913] [nrf fromtree] bluetooth: conn: Use a separate
 workqueue for connection TX notify

Use a separate workqueue instead of system workqueue for connection TX
notify processing. This makes Bluetooth stack more independent from the
system workqueue.

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
(cherry picked from commit 341f1f502d00087c205cfe21def20f8388565409)
(cherry picked from commit 66b53a905773e65325a80ef8495494f12d7e4f9e)
(cherry picked from commit b9c06f700c08b84fc9e3efe45d78d95d053e8ec0)
---
 subsys/bluetooth/host/Kconfig         |  29 ++++++++
 subsys/bluetooth/host/conn.c          | 103 +++++++++++++++++---------
 subsys/bluetooth/host/conn_internal.h |   2 +
 subsys/bluetooth/host/hci_core.c      |   2 +-
 4 files changed, 99 insertions(+), 37 deletions(-)

diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index 233c916408f..4710f24e90c 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -129,6 +129,35 @@ config BT_DRIVER_RX_HIGH_PRIO
 	int
 	default 6
 
+config BT_CONN_TX_NOTIFY_WQ
+	bool "Use a separate workqueue for connection TX notify processing [EXPERIMENTAL]"
+	depends on BT_CONN_TX
+	select EXPERIMENTAL
+	help
+	  Use a separate workqueue instead of system workqueue for
+	  bt_conn_tx_notify processing. The option can be used to make Bluetooth
+	  stack more independent from the system workqueue.
+
+if BT_CONN_TX_NOTIFY_WQ
+
+config BT_CONN_TX_NOTIFY_WQ_STACK_SIZE
+	int "Stack size of workqueue for connection TX notify processing"
+	default SYSTEM_WORKQUEUE_STACK_SIZE
+
+config BT_CONN_TX_NOTIFY_WQ_PRIO
+	int "Cooperative priority of workqueue for connection TX notify processing"
+	default 8
+
+config BT_CONN_TX_NOTIFY_WQ_INIT_PRIORITY
+	int "Init priority of workqueue for connection TX notify processing"
+	default 50
+	help
+	  The connection TX notify processing workqueue is initialized during
+	  system initialization (at POST_KERNEL level). The Kconfig option
+	  controls the initialization priority within level.
+
+endif # BT_CONN_TX_NOTIFY_WQ
+
 menu "Bluetooth Host"
 
 if BT_HCI_HOST
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 01c3bcbe04a..bfb29b31cd9 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -52,6 +52,11 @@ LOG_MODULE_REGISTER(bt_conn);
 
 K_FIFO_DEFINE(free_tx);
 
+#if defined(CONFIG_BT_CONN_TX_NOTIFY_WQ)
+static struct k_work_q conn_tx_workq;
+static K_KERNEL_STACK_DEFINE(conn_tx_workq_thread_stack, CONFIG_BT_CONN_TX_NOTIFY_WQ_STACK_SIZE);
+#endif /* CONFIG_BT_CONN_TX_NOTIFY_WQ */
+
 static void tx_free(struct bt_conn_tx *tx);
 
 static void conn_tx_destroy(struct bt_conn *conn, struct bt_conn_tx *tx)
@@ -254,12 +259,21 @@ static void tx_free(struct bt_conn_tx *tx)
 }
 
 #if defined(CONFIG_BT_CONN_TX)
-static void tx_notify(struct bt_conn *conn)
+static struct k_work_q *tx_notify_workqueue_get(void)
 {
-	__ASSERT_NO_MSG(k_current_get() ==
-			k_work_queue_thread_get(&k_sys_work_q));
+#if defined(CONFIG_BT_CONN_TX_NOTIFY_WQ)
+	return &conn_tx_workq;
+#else
+	return &k_sys_work_q;
+#endif /* CONFIG_BT_CONN_TX_NOTIFY_WQ */
+}
 
-	LOG_DBG("conn %p", conn);
+static void tx_notify_process(struct bt_conn *conn)
+{
+	/* TX notify processing is done only from a single thread. */
+	__ASSERT_NO_MSG(k_current_get() == k_work_queue_thread_get(tx_notify_workqueue_get()));
+
+	LOG_DBG("conn %p", (void *)conn);
 
 	while (1) {
 		struct bt_conn_tx *tx = NULL;
@@ -300,7 +314,30 @@ static void tx_notify(struct bt_conn *conn)
 		bt_tx_irq_raise();
 	}
 }
-#endif	/* CONFIG_BT_CONN_TX */
+#endif /* CONFIG_BT_CONN_TX */
+
+void bt_conn_tx_notify(struct bt_conn *conn, bool wait_for_completion)
+{
+#if defined(CONFIG_BT_CONN_TX)
+	/* Ensure that function is called only from a single context. */
+	if (k_current_get() == k_work_queue_thread_get(tx_notify_workqueue_get())) {
+		tx_notify_process(conn);
+	} else {
+		struct k_work_sync sync;
+		int err;
+
+		err = k_work_submit_to_queue(tx_notify_workqueue_get(), &conn->tx_complete_work);
+		__ASSERT(err >= 0, "couldn't submit (err %d)", err);
+
+		if (wait_for_completion) {
+			(void)k_work_flush(&conn->tx_complete_work, &sync);
+		}
+	}
+#else
+	ARG_UNUSED(conn);
+	ARG_UNUSED(wait_for_completion);
+#endif /* CONFIG_BT_CONN_TX */
+}
 
 struct bt_conn *bt_conn_new(struct bt_conn *conns, size_t size)
 {
@@ -439,38 +476,15 @@ static void bt_acl_recv(struct bt_conn *conn, struct net_buf *buf, uint8_t flags
 	bt_l2cap_recv(conn, buf, true);
 }
 
-static void wait_for_tx_work(struct bt_conn *conn)
-{
-#if defined(CONFIG_BT_CONN_TX)
-	LOG_DBG("conn %p", conn);
-
-	if (IS_ENABLED(CONFIG_BT_RECV_WORKQ_SYS) ||
-	    k_current_get() == k_work_queue_thread_get(&k_sys_work_q)) {
-		tx_notify(conn);
-	} else {
-		struct k_work_sync sync;
-		int err;
-
-		err = k_work_submit(&conn->tx_complete_work);
-		__ASSERT(err >= 0, "couldn't submit (err %d)", err);
-
-		k_work_flush(&conn->tx_complete_work, &sync);
-	}
-	LOG_DBG("done");
-#else
-	ARG_UNUSED(conn);
-#endif	/* CONFIG_BT_CONN_TX */
-}
-
 void bt_conn_recv(struct bt_conn *conn, struct net_buf *buf, uint8_t flags)
 {
 	/* Make sure we notify any pending TX callbacks before processing
 	 * new data for this connection.
 	 *
 	 * Always do so from the same context for sanity. In this case that will
-	 * be the system workqueue.
+	 * be either a dedicated Bluetooth connection TX workqueue or system workqueue.
 	 */
-	wait_for_tx_work(conn);
+	bt_conn_tx_notify(conn, true);
 
 	LOG_DBG("handle %u len %u flags %02x", conn->handle, buf->len, flags);
 
@@ -1240,7 +1254,7 @@ void bt_conn_set_state(struct bt_conn *conn, bt_conn_state_t state)
 		 */
 		switch (old_state) {
 		case BT_CONN_DISCONNECT_COMPLETE:
-			wait_for_tx_work(conn);
+			bt_conn_tx_notify(conn, true);
 
 			bt_conn_reset_rx_state(conn);
 
@@ -1631,12 +1645,9 @@ struct net_buf *bt_conn_create_pdu_timeout(struct net_buf_pool *pool,
 #if defined(CONFIG_BT_CONN_TX)
 static void tx_complete_work(struct k_work *work)
 {
-	struct bt_conn *conn = CONTAINER_OF(work, struct bt_conn,
-					    tx_complete_work);
+	struct bt_conn *conn = CONTAINER_OF(work, struct bt_conn, tx_complete_work);
 
-	LOG_DBG("conn %p", conn);
-
-	tx_notify(conn);
+	tx_notify_process(conn);
 }
 #endif /* CONFIG_BT_CONN_TX */
 
@@ -4161,3 +4172,23 @@ void bt_hci_le_df_cte_req_failed(struct net_buf *buf)
 #endif /* CONFIG_BT_DF_CONNECTION_CTE_REQ */
 
 #endif /* CONFIG_BT_CONN */
+
+#if defined(CONFIG_BT_CONN_TX_NOTIFY_WQ)
+static int bt_conn_tx_workq_init(void)
+{
+	const struct k_work_queue_config cfg = {
+		.name = "BT CONN TX WQ",
+		.no_yield = false,
+		.essential = false,
+	};
+
+	k_work_queue_init(&conn_tx_workq);
+	k_work_queue_start(&conn_tx_workq, conn_tx_workq_thread_stack,
+			   K_THREAD_STACK_SIZEOF(conn_tx_workq_thread_stack),
+			   K_PRIO_COOP(CONFIG_BT_CONN_TX_NOTIFY_WQ_PRIO), &cfg);
+
+	return 0;
+}
+
+SYS_INIT(bt_conn_tx_workq_init, POST_KERNEL, CONFIG_BT_CONN_TX_NOTIFY_WQ_INIT_PRIORITY);
+#endif /* CONFIG_BT_CONN_TX_NOTIFY_WQ */
diff --git a/subsys/bluetooth/host/conn_internal.h b/subsys/bluetooth/host/conn_internal.h
index 37e49afa964..ac2141c1aad 100644
--- a/subsys/bluetooth/host/conn_internal.h
+++ b/subsys/bluetooth/host/conn_internal.h
@@ -358,6 +358,8 @@ static inline void *closure_data(void *storage)
 	return ((struct closure *)storage)->data;
 }
 
+void bt_conn_tx_notify(struct bt_conn *conn, bool wait_for_completion);
+
 void bt_conn_reset_rx_state(struct bt_conn *conn);
 
 /* Process incoming data for a connection */
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index f2f6c10601a..6d0670502c1 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -605,7 +605,7 @@ static void hci_num_completed_packets(struct net_buf *buf)
 			atomic_dec(&conn->in_ll);
 
 			/* TX context free + callback happens in there */
-			k_work_submit(&conn->tx_complete_work);
+			bt_conn_tx_notify(conn, false);
 		}
 
 		bt_conn_unref(conn);

From 22632c9c7cd4c56118e9f1f7495e67d814320ec0 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 9 Jul 2024 10:02:46 +0200
Subject: [PATCH 0195/2913] [nrf fromlist] drivers: spi: nrfx_spim: Add support
 for device runtime PM

Enable the device runtime power management on the SPIM shim.

Upstream PR #: 75715

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 35e51a2b7648bdaede1c2ee43b6cb806c902709b)
(cherry picked from commit 149b1c8914e2f0f5d6b9c92399cba0b64f0606ab)
---
 drivers/spi/spi_nrfx_spim.c | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c
index 3de9f82709c..01191caa829 100644
--- a/drivers/spi/spi_nrfx_spim.c
+++ b/drivers/spi/spi_nrfx_spim.c
@@ -8,6 +8,7 @@
 #include <zephyr/drivers/spi/rtio.h>
 #include <zephyr/cache.h>
 #include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
 #include <soc.h>
@@ -87,6 +88,9 @@ static inline void finalize_spi_transaction(const struct device *dev, bool deact
 	if (NRF_SPIM_IS_320MHZ_SPIM(reg) && !(dev_data->ctx.config->operation & SPI_HOLD_ON_CS)) {
 		nrfy_spim_disable(reg);
 	}
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_put(dev);
+	}
 }
 
 static inline uint32_t get_nrf_spim_frequency(uint32_t frequency)
@@ -457,6 +461,9 @@ static int transceive(const struct device *dev,
 	void *reg = dev_config->spim.p_reg;
 	int error;
 
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_get(dev);
+	}
 	spi_context_lock(&dev_data->ctx, asynchronous, cb, userdata, spi_cfg);
 
 	error = configure(dev, spi_cfg);
@@ -568,21 +575,20 @@ static const struct spi_driver_api spi_nrfx_driver_api = {
 	.release = spi_nrfx_release,
 };
 
-#ifdef CONFIG_PM_DEVICE
 static int spim_nrfx_pm_action(const struct device *dev,
 			       enum pm_device_action action)
 {
-	int ret = 0;
+	int ret = -ENOTSUP;
 	struct spi_nrfx_data *dev_data = dev->data;
 	const struct spi_nrfx_config *dev_config = dev->config;
 
 	switch (action) {
+	case PM_DEVICE_ACTION_TURN_ON:
+		ret = 0;
+		break;
 	case PM_DEVICE_ACTION_RESUME:
 		ret = pinctrl_apply_state(dev_config->pcfg,
 					  PINCTRL_STATE_DEFAULT);
-		if (ret < 0) {
-			return ret;
-		}
 		/* nrfx_spim_init() will be called at configuration before
 		 * the next transfer.
 		 */
@@ -596,19 +602,14 @@ static int spim_nrfx_pm_action(const struct device *dev,
 
 		ret = pinctrl_apply_state(dev_config->pcfg,
 					  PINCTRL_STATE_SLEEP);
-		if (ret < 0) {
-			return ret;
-		}
 		break;
 
 	default:
-		ret = -ENOTSUP;
+		break;
 	}
 
 	return ret;
 }
-#endif /* CONFIG_PM_DEVICE */
-
 
 static int spi_nrfx_init(const struct device *dev)
 {
@@ -643,10 +644,12 @@ static int spi_nrfx_init(const struct device *dev)
 	spi_context_unlock_unconditionally(&dev_data->ctx);
 
 #ifdef CONFIG_SOC_NRF52832_ALLOW_SPIM_DESPITE_PAN_58
-	return anomaly_58_workaround_init(dev);
-#else
-	return 0;
+	err = anomaly_58_workaround_init(dev);
+	if (err < 0) {
+		return err;
+	}
 #endif
+	return pm_device_driver_init(dev, spim_nrfx_pm_action);
 }
 /*
  * We use NODELABEL here because the nrfx API requires us to call

From 21246912543a9e8c13f635021ffea00f5d3de9da Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Fri, 12 Jul 2024 10:50:14 +0200
Subject: [PATCH 0196/2913] [nrf fromlist] tests: drivers: spi: nordic: add
 device PM runtime

Add configuration for testing SPI with device runtime PM enabled
for nRF platforms.

Upstream PR #: 75715

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit b20e5fdd43e04340b482d0f703ff626d0905f82d)
(cherry picked from commit 3db79a32c9628d668851331274b9e729e1bb64c2)
---
 .../boards/nrf52840dk_nrf52840.overlay                      | 2 ++
 .../boards/nrf54h20dk_nrf54h20_common.dtsi                  | 1 +
 .../boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay          | 1 +
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay               | 2 ++
 tests/drivers/spi/spi_controller_peripheral/testcase.yaml   | 6 ++++++
 .../spi/spi_loopback/boards/nrf51dk_nrf51822.overlay        | 1 +
 .../spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay     | 1 +
 .../spi/spi_loopback/boards/nrf52dk_nrf52832.overlay        | 1 +
 .../spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay  | 1 +
 .../boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay          | 1 +
 .../spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay  | 1 +
 .../spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay       | 1 +
 tests/drivers/spi/spi_loopback/testcase.yaml                | 5 +++++
 13 files changed, 24 insertions(+)

diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
index 97802a7a637..91cd073041e 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
@@ -50,9 +50,11 @@
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(8)>;
 	};
 };
 
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi
index 8661760a5e3..d431933ab5a 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi
@@ -60,6 +60,7 @@
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
index 0523426db45..4441819249f 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
@@ -55,6 +55,7 @@
 	overrun-character = <0x00>;
 	memory-regions = <&dma_fast_region>;
 	cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 73a50a7c6fc..0188a2c4e24 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -54,9 +54,11 @@
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(16)>;
 	};
 };
 
diff --git a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
index 675259a4dd0..51a503e9231 100644
--- a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
+++ b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
@@ -57,3 +57,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
+
+  drivers.spi.pm_runtime:
+    extra_configs:
+      - CONFIG_PM_DEVICE=y
+      - CONFIG_PM_DEVICE_RUNTIME=y
+    filter: CONFIG_SOC_FAMILY_NORDIC_NRF
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay b/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay
index 812f643f3e8..06a0d63816a 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay
@@ -7,6 +7,7 @@
 &spi1 {
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay
index 7f511d0753d..7de4d8d6322 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay
@@ -8,6 +8,7 @@
 	overrun-character = <0x00>;
 	rx-delay = <1>;
 	cs-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay b/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay
index 812f643f3e8..06a0d63816a 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay
@@ -7,6 +7,7 @@
 &spi1 {
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index 89e5fbad08a..6743e1d0933 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -30,6 +30,7 @@
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
 	memory-regions = <&cpuapp_dma_region>;
+	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
index d6c3c972afd..2857c48f6fb 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
@@ -30,6 +30,7 @@
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
 	memory-regions = <&dma_fast_region>;
+	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index f2e84b72f9b..8dcf6fd190d 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -29,6 +29,7 @@
 	pinctrl-1 = <&spi00_sleep>;
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
+	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay b/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay
index a07ed5fbf5d..bcd2472166a 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay
@@ -7,6 +7,7 @@
 &spi3 {
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml
index 5760aa0d879..c65ec904d37 100644
--- a/tests/drivers/spi/spi_loopback/testcase.yaml
+++ b/tests/drivers/spi/spi_loopback/testcase.yaml
@@ -204,3 +204,8 @@ tests:
   drivers.spi.max32_dma.loopback:
     extra_args: OVERLAY_CONFIG="overlay-max32-spi-dma.conf"
     filter: CONFIG_SOC_FAMILY_MAX32
+  drivers.spi.nrf_pm_runtime:
+    extra_configs:
+      - CONFIG_PM_DEVICE=y
+      - CONFIG_PM_DEVICE_RUNTIME=y
+    filter: CONFIG_SOC_FAMILY_NORDIC_NRF

From 7b8b2beed601da5a5dda95337bc48bfc6a4ecc2b Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Mon, 23 Sep 2024 10:29:40 +0200
Subject: [PATCH 0197/2913] [nrf fromtree] pm: device: allow optional support
 of TURN_ON action

Some devices, e.g. SoC level devices like I2C peripheral, can never be
powerd off as they are always energized. Such devices can only go from an
active state or to a low power state (suspended). Allow them to simply
return -ENOTSUP when called with TURN_ON (or TURN_OFF).

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 740eba1341ab2456c97390ea71d4be5d9ff8bab7)
(cherry picked from commit 090b1d687554066b326fc668daa430d5807295f4)
(cherry picked from commit 0ae1d9624177e9383eb31c8bd647d122fd1c4e02)
---
 include/zephyr/pm/device.h | 5 +++--
 subsys/pm/device.c         | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/zephyr/pm/device.h b/include/zephyr/pm/device.h
index 26e4a803774..a6e2ef032c0 100644
--- a/include/zephyr/pm/device.h
+++ b/include/zephyr/pm/device.h
@@ -625,7 +625,8 @@ bool pm_device_is_powered(const struct device *dev);
  * This helper function is intended to be called at the end of a driver
  * init function to automatically setup the device into the lowest power
  * mode. It assumes that the device has been configured as if it is in
- * @ref PM_DEVICE_STATE_OFF.
+ * @ref PM_DEVICE_STATE_OFF, or @ref PM_DEVICE_STATE_SUSPENDED if device can
+ * never be powered off.
  *
  * @param dev Device instance.
  * @param action_cb Device PM control callback function.
@@ -718,7 +719,7 @@ static inline int pm_device_driver_init(const struct device *dev, pm_device_acti
 
 	/* When power management is not enabled, all drivers should initialise to active state */
 	rc = action_cb(dev, PM_DEVICE_ACTION_TURN_ON);
-	if (rc < 0) {
+	if ((rc < 0) && (rc != -ENOTSUP)) {
 		return rc;
 	}
 
diff --git a/subsys/pm/device.c b/subsys/pm/device.c
index f272a2a8e28..518e20a8630 100644
--- a/subsys/pm/device.c
+++ b/subsys/pm/device.c
@@ -370,7 +370,7 @@ int pm_device_driver_init(const struct device *dev,
 
 	/* Run power-up logic */
 	rc = action_cb(dev, PM_DEVICE_ACTION_TURN_ON);
-	if (rc != 0) {
+	if ((rc < 0) && (rc != -ENOTSUP)) {
 		return rc;
 	}
 

From 7f1e48338a93047781b6f2ceff34dc8a7ad5c1b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 1 Oct 2024 08:54:56 +0200
Subject: [PATCH 0198/2913] [nrf fromtree] drivers: pwm: nrfx: Improve device
 generation macros
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use NRFX_FOREACH_PRESENT macro to iterate over all PWM instances
and create device only for those enabled in the devicetree.
This approach removes need of changing driver code when new
instance id is added.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 0ab86c48dd7a448e82c69a8e274de9984ac40f82)
(cherry picked from commit 8f94fe0e3f016e048e2d38671705532626d2c19d)
(cherry picked from commit 0204c3b4451eb807f4d633f16f9e7ebe4f519656)
---
 drivers/pwm/pwm_nrfx.c | 49 +++---------------------------------------
 1 file changed, 3 insertions(+), 46 deletions(-)

diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index f6312535c7e..a1ee27fc702 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -390,50 +390,7 @@ static int pwm_nrfx_pm_action(const struct device *dev,
 			 POST_KERNEL, CONFIG_PWM_INIT_PRIORITY,		      \
 			 &pwm_nrfx_drv_api_funcs)
 
-#ifdef CONFIG_HAS_HW_NRF_PWM0
-PWM_NRFX_DEVICE(0);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_PWM1
-PWM_NRFX_DEVICE(1);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_PWM2
-PWM_NRFX_DEVICE(2);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_PWM3
-PWM_NRFX_DEVICE(3);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_PWM20
-PWM_NRFX_DEVICE(20);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_PWM21
-PWM_NRFX_DEVICE(21);
-#endif
+#define COND_PWM_NRFX_DEVICE(unused, prefix, i, _) \
+	IF_ENABLED(CONFIG_HAS_HW_NRF_PWM##prefix##i, (PWM_NRFX_DEVICE(prefix##i);))
 
-#ifdef CONFIG_HAS_HW_NRF_PWM22
-PWM_NRFX_DEVICE(22);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_PWM120
-PWM_NRFX_DEVICE(120);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_PWM130
-PWM_NRFX_DEVICE(130);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_PWM131
-PWM_NRFX_DEVICE(131);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_PWM132
-PWM_NRFX_DEVICE(132);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_PWM133
-PWM_NRFX_DEVICE(133);
-#endif
+NRFX_FOREACH_PRESENT(PWM, COND_PWM_NRFX_DEVICE, (), (), _)

From 6fe25620465757428f55769a7f791514c04345d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 20 Sep 2024 10:34:13 +0200
Subject: [PATCH 0199/2913] [nrf fromtree] drivers: pwm: nrfx: Disable PWM
 peripheral when not used
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Shim was not correctly disabling PWM when it was not used. Task
STOP was triggered but PWM->ENABLE remained set which caused
increased current. Added interrupt and enabled event handler in
the nrfx driver to allow disabling PWM on STOPPED event.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit c3a33cfd3e63a3dede31ebc4e58153a395706fb9)
(cherry picked from commit a7dbe5eb2b8589a934f2cd41437af615d76f0345)
(cherry picked from commit e0679f698ad0f43ee91026a1d74b87a213f37653)
---
 drivers/pwm/pwm_nrfx.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index a1ee27fc702..9ceb2f53302 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -20,7 +20,6 @@ LOG_MODULE_REGISTER(pwm_nrfx, CONFIG_PWM_LOG_LEVEL);
  * to 0 or 1, hence the use of #if IS_ENABLED().
  */
 #if IS_ENABLED(NRFX_PWM_NRF52_ANOMALY_109_WORKAROUND_ENABLED)
-#define ANOMALY_109_IRQ_CONNECT(...) IRQ_CONNECT(__VA_ARGS__)
 #define ANOMALY_109_EGU_IRQ_CONNECT(idx) _EGU_IRQ_CONNECT(idx)
 #define _EGU_IRQ_CONNECT(idx) \
 	extern void nrfx_egu_##idx##_irq_handler(void); \
@@ -28,7 +27,6 @@ LOG_MODULE_REGISTER(pwm_nrfx, CONFIG_PWM_LOG_LEVEL);
 		    DT_IRQ(DT_NODELABEL(egu##idx), priority), \
 		    nrfx_isr, nrfx_egu_##idx##_irq_handler, 0)
 #else
-#define ANOMALY_109_IRQ_CONNECT(...)
 #define ANOMALY_109_EGU_IRQ_CONNECT(idx)
 #endif
 
@@ -63,6 +61,12 @@ static uint16_t *seq_values_ptr_get(const struct device *dev)
 	return (uint16_t *)config->seq.values.p_raw;
 }
 
+static void pwm_handler(nrfx_pwm_evt_type_t event_type, void *p_context)
+{
+	ARG_UNUSED(event_type);
+	ARG_UNUSED(p_context);
+}
+
 static bool pwm_period_check_and_set(const struct device *dev,
 				     uint32_t channel, uint32_t period_cycles)
 {
@@ -229,7 +233,8 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 		 * until another playback is requested (new values will be
 		 * loaded then) or the PWM peripheral is stopped.
 		 */
-		nrfx_pwm_simple_playback(&config->pwm, &config->seq, 1, 0);
+		nrfx_pwm_simple_playback(&config->pwm, &config->seq, 1,
+					 NRFX_PWM_FLAG_NO_EVT_FINISHED);
 	}
 
 	return 0;
@@ -256,6 +261,7 @@ static int pwm_nrfx_init(const struct device *dev)
 {
 	const struct pwm_nrfx_config *config = dev->config;
 	uint8_t initially_inverted = 0;
+	nrfx_err_t result;
 
 	int ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
 
@@ -284,10 +290,7 @@ static int pwm_nrfx_init(const struct device *dev)
 		seq_values_ptr_get(dev)[i] = PWM_NRFX_CH_VALUE(0, inverted);
 	}
 
-	nrfx_err_t result = nrfx_pwm_init(&config->pwm,
-					  &config->initial_config,
-					  NULL,
-					  NULL);
+	result = nrfx_pwm_init(&config->pwm, &config->initial_config, pwm_handler, dev->data);
 	if (result != NRFX_SUCCESS) {
 		LOG_ERR("Failed to initialize device: %s", dev->name);
 		return -EBUSY;
@@ -377,9 +380,8 @@ static int pwm_nrfx_pm_action(const struct device *dev,
 	};								      \
 	static int pwm_nrfx_init##idx(const struct device *dev)		      \
 	{								      \
-		ANOMALY_109_IRQ_CONNECT(				      \
-			DT_IRQN(PWM(idx)), DT_IRQ(PWM(idx), priority),	      \
-			nrfx_isr, nrfx_pwm_##idx##_irq_handler, 0);	      \
+		IRQ_CONNECT(DT_IRQN(PWM(idx)), DT_IRQ(PWM(idx), priority),    \
+			    nrfx_isr, nrfx_pwm_##idx##_irq_handler, 0);	      \
 		return pwm_nrfx_init(dev);				      \
 	};								      \
 	PM_DEVICE_DT_DEFINE(PWM(idx), pwm_nrfx_pm_action);		      \

From 07e38a764518d653dc563f966bc2a96d2b0049dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 20 Sep 2024 13:17:19 +0200
Subject: [PATCH 0200/2913] [nrf fromtree] drivers: pwm: nrfx: Improve runtime
 PM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rework PM handling to use pm_device_driver_init(). Shim is not using
put and get internally as there is no api that disables or stops
pwm so it is hard to determine when to put the device. There are cases
when PWM peripheral is stopped but PWM is still active because
duty cycle is 100% or 0% and pin is driven by GPIO and not PWM.

If user want to use runtime PM with PWM it is possible and getting
the device will initialize internal data and putting will suspend
by forcing PWM stop if used and setting pins to sleep state. However,
from power consumption perspective it is enough to set 0% or 100%
duty cycle on all channels.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit e11d050b23e514a408bb6428055e5f568b319d6f)
(cherry picked from commit b063a96d60f4b881114fb99157c7b394daaa4448)
(cherry picked from commit a144de0b533e6dc4a08b836e1e85e77af9033211)
---
 drivers/pwm/pwm_nrfx.c | 75 +++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 45 deletions(-)

diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index 9ceb2f53302..420a9078c59 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -257,19 +257,12 @@ static const struct pwm_driver_api pwm_nrfx_drv_api_funcs = {
 	.get_cycles_per_sec = pwm_nrfx_get_cycles_per_sec,
 };
 
-static int pwm_nrfx_init(const struct device *dev)
+static void pwm_resume(const struct device *dev)
 {
 	const struct pwm_nrfx_config *config = dev->config;
 	uint8_t initially_inverted = 0;
-	nrfx_err_t result;
-
-	int ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
-
-	ANOMALY_109_EGU_IRQ_CONNECT(NRFX_PWM_NRF52_ANOMALY_109_EGU_INSTANCE);
 
-	if (ret < 0) {
-		return ret;
-	}
+	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
 
 	for (size_t i = 0; i < NRF_PWM_CHANNEL_COUNT; i++) {
 		uint32_t psel;
@@ -289,61 +282,53 @@ static int pwm_nrfx_init(const struct device *dev)
 
 		seq_values_ptr_get(dev)[i] = PWM_NRFX_CH_VALUE(0, inverted);
 	}
-
-	result = nrfx_pwm_init(&config->pwm, &config->initial_config, pwm_handler, dev->data);
-	if (result != NRFX_SUCCESS) {
-		LOG_ERR("Failed to initialize device: %s", dev->name);
-		return -EBUSY;
-	}
-
-	return 0;
 }
 
-#ifdef CONFIG_PM_DEVICE
-static void pwm_nrfx_uninit(const struct device *dev)
+static void pwm_suspend(const struct device *dev)
 {
 	const struct pwm_nrfx_config *config = dev->config;
 
-	nrfx_pwm_uninit(&config->pwm);
+	nrfx_pwm_stop(&config->pwm, false);
+	while (!nrfx_pwm_stopped_check(&config->pwm)) {
+	}
 
 	memset(dev->data, 0, sizeof(struct pwm_nrfx_data));
+	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
 }
 
 static int pwm_nrfx_pm_action(const struct device *dev,
 			      enum pm_device_action action)
 {
-	const struct pwm_nrfx_config *config = dev->config;
-	int ret = 0;
+	if (action == PM_DEVICE_ACTION_RESUME) {
+		pwm_resume(dev);
+	} else if (IS_ENABLED(CONFIG_PM_DEVICE) && (action == PM_DEVICE_ACTION_SUSPEND)) {
+		pwm_suspend(dev);
+	} else {
+		return -ENOTSUP;
+	}
 
-	switch (action) {
-	case PM_DEVICE_ACTION_RESUME:
-		ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
-		if (ret < 0) {
-			return ret;
-		}
-		ret = pwm_nrfx_init(dev);
-		break;
+	return 0;
+}
 
-	case PM_DEVICE_ACTION_SUSPEND:
-		pwm_nrfx_uninit(dev);
+static int pwm_nrfx_init(const struct device *dev)
+{
+	const struct pwm_nrfx_config *config = dev->config;
+	nrfx_err_t err;
 
-		ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
-		if (ret < 0) {
-			return ret;
-		}
-		break;
+	ANOMALY_109_EGU_IRQ_CONNECT(NRFX_PWM_NRF52_ANOMALY_109_EGU_INSTANCE);
 
-	default:
-		return -ENOTSUP;
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
 	}
 
-	return ret;
-}
-#else
-
-#define pwm_nrfx_pm_action NULL
+	err = nrfx_pwm_init(&config->pwm, &config->initial_config, pwm_handler, dev->data);
+	if (err != NRFX_SUCCESS) {
+		LOG_ERR("Failed to initialize device: %s", dev->name);
+		return -EBUSY;
+	}
 
-#endif /* CONFIG_PM_DEVICE */
+	return pm_device_driver_init(dev, pwm_nrfx_pm_action);
+}
 
 #define PWM(dev_idx) DT_NODELABEL(pwm##dev_idx)
 #define PWM_PROP(dev_idx, prop) DT_PROP(PWM(dev_idx), prop)

From 2a818c30f67744a729b961b31a3170659fbd2cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 11 Oct 2024 08:02:47 +0200
Subject: [PATCH 0201/2913] [nrf fromtree] boards: nordic: Do not enable
 hw-flow-control on console
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Like in all other legacy boards, hw-flow-control should not be
enabled for console UART. With hw-flow-control sample stuck
during printing some initial information and sample appears to
be not working correctly unless com port is opened.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 01f2740015fec36b1d9b000be95fd88ebb42edf0)
(cherry picked from commit dded8c29fbd2e3930e865bb6986d472ccf266e3c)
(cherry picked from commit f46be1a2ec4a955f1dba7bd7bf3ad602cbe4f490)
---
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts    | 1 -
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr.dts    | 1 -
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts    | 1 -
 boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi       | 1 -
 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts   | 1 -
 boards/nordic/nrf54l15pdk/nrf54l15_cpuapp_common.dtsi      | 1 -
 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.dts | 1 -
 boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts     | 1 -
 boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuppr.dts     | 1 -
 boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts     | 1 -
 10 files changed, 10 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index eacc510ce8a..c85b911302f 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -248,7 +248,6 @@ ipc0: &cpuapp_cpurad_ipc {
 	pinctrl-0 = <&uart136_default>;
 	pinctrl-1 = <&uart136_sleep>;
 	pinctrl-names = "default", "sleep";
-	hw-flow-control;
 };
 
 &gpio6 {
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr.dts
index 2143823239c..59b53aafcb2 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr.dts
@@ -48,7 +48,6 @@
 	pinctrl-0 = <&uart135_default>;
 	pinctrl-1 = <&uart135_sleep>;
 	pinctrl-names = "default", "sleep";
-	hw-flow-control;
 };
 
 &uart136 {
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
index 77e69aa463c..cb8fb9e1a02 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
@@ -95,7 +95,6 @@ ipc0: &cpuapp_cpurad_ipc {
 	pinctrl-0 = <&uart135_default>;
 	pinctrl-1 = <&uart135_sleep>;
 	pinctrl-names = "default", "sleep";
-	hw-flow-control;
 };
 
 &uart136 {
diff --git a/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi b/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi
index 4292e9a1523..191babb632f 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi
@@ -87,7 +87,6 @@
 
 &uart20 {
 	status = "okay";
-	hw-flow-control;
 };
 
 &gpio0 {
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts
index a608941514e..472e3f2b8d3 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts
@@ -48,7 +48,6 @@
 
 &uart30 {
 	status = "okay";
-	hw-flow-control;
 };
 
 &gpio0 {
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15_cpuapp_common.dtsi b/boards/nordic/nrf54l15pdk/nrf54l15_cpuapp_common.dtsi
index 1327d48f5bd..474874d110c 100644
--- a/boards/nordic/nrf54l15pdk/nrf54l15_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l15pdk/nrf54l15_cpuapp_common.dtsi
@@ -87,7 +87,6 @@
 
 &uart20 {
 	status = "okay";
-	hw-flow-control;
 };
 
 &gpio0 {
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.dts b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.dts
index 2b80a45c4e1..c8ed4abb79f 100644
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.dts
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.dts
@@ -48,7 +48,6 @@
 
 &uart30 {
 	status = "okay";
-	hw-flow-control;
 };
 
 &gpio0 {
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index 17715ee0087..aff2a15e6c1 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -240,7 +240,6 @@ ipc0: &cpuapp_cpurad_ipc {
 	pinctrl-0 = <&uart136_default>;
 	pinctrl-1 = <&uart136_sleep>;
 	pinctrl-names = "default", "sleep";
-	hw-flow-control;
 };
 
 &gpio6 {
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuppr.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuppr.dts
index 5da976ef70d..10942796ff3 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuppr.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuppr.dts
@@ -49,7 +49,6 @@
 	pinctrl-0 = <&uart135_default>;
 	pinctrl-1 = <&uart135_sleep>;
 	pinctrl-names = "default", "sleep";
-	hw-flow-control;
 };
 
 &uart136 {
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
index ddda9eb5871..f9bfae09897 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
@@ -100,7 +100,6 @@ ipc0: &cpuapp_cpurad_ipc {
 	pinctrl-0 = <&uart135_default>;
 	pinctrl-1 = <&uart135_sleep>;
 	pinctrl-names = "default", "sleep";
-	hw-flow-control;
 };
 
 &uart136 {

From fffeaf2cb035fe5843f3afca2853cdc79574cfc4 Mon Sep 17 00:00:00 2001
From: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
Date: Fri, 18 Oct 2024 10:47:52 +0200
Subject: [PATCH 0202/2913] [nrf fromtree] samples: icbmsg: Change regex for
 no_multithreading test

Change regex for no_multithreading test version for nRF54L15 platform.
This needs to be changed because LOG is running in MINIMAL mode.

Signed-off-by: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
(cherry picked from commit df201e4b4bc6b23d7d80b9b2298f4e6dfb87d47b)
(cherry picked from commit 09aba0216b3b596fdddafeb4a4be04334e45af51)
(cherry picked from commit 24dfa6a9c51be5250229d539466ac58e71423dfb)
---
 samples/subsys/ipc/ipc_service/icmsg/sample.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/samples/subsys/ipc/ipc_service/icmsg/sample.yaml b/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
index 9305aa61a03..27a2a8b6d8d 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
+++ b/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
@@ -133,12 +133,12 @@ tests:
       type: multi_line
       ordered: false
       regex:
-        - "host: IPC-service HOST demo started"
-        - "host: Ep bounded"
-        - "host: Perform sends for"
-        - "host: Sent"
-        - "host: Received"
-        - "host: IPC-service HOST demo ended"
+        - "I: IPC-service HOST demo started"
+        - "I: Ep bounded"
+        - "I: Perform sends for"
+        - "I: Sent"
+        - "I: Received"
+        - "I: IPC-service HOST demo ended"
 
   sample.ipc.icbmsg.nrf54l15_remote_no_multithreading:
     platform_allow: nrf54l15dk/nrf54l15/cpuapp

From f71108a0273d15df6d67fa7442a4ee432719aa95 Mon Sep 17 00:00:00 2001
From: Burak Gorduk <burak.gorduk@nordicsemi.no>
Date: Tue, 15 Oct 2024 10:38:29 +0100
Subject: [PATCH 0203/2913] [nrf fromtree] bluetooth: host: LE CS subevent
 result reassembly

Adds HCI support for LE CS subevent result continue
event and the reassembly logic for the partial results.

When subevent results are completed or the subevent is
aborted, the user callback is invoked with a buffer
pointing to the HCI event buffer, so no copy is done.

When subevent results are incomplete, then a reassembly
buffer is allocated from a fixed sized pool. This buffer
is used for the reassembling of the subevent result
containing all of the step data, which is then passed
to the user via the callback. kconfigs have been added
to set the size and the count of the reassembly buffer.

Signed-off-by: Burak Gorduk <burak.gorduk@nordicsemi.no>
(cherry picked from commit c5a126cedb2f96239662352ae1662424d261c53e)
(cherry picked from commit 5244a2d7bbc25869facb8a18977d69c66b9f18fd)
(cherry picked from commit e4c9dffbbd4e5c25504da8d76159c9b411982e96)
---
 include/zephyr/bluetooth/conn.h      |  20 +-
 include/zephyr/bluetooth/hci_types.h |  20 ++
 subsys/bluetooth/Kconfig             |  20 ++
 subsys/bluetooth/host/cs.c           | 415 ++++++++++++++++++++++++---
 subsys/bluetooth/host/hci_core.c     |   4 +
 subsys/bluetooth/host/hci_core.h     |   1 +
 6 files changed, 446 insertions(+), 34 deletions(-)

diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index 55bb48c6934..f81ca8b3ce8 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -548,7 +548,6 @@ enum bt_conn_le_cs_procedure_done_status {
 /** Subevent done status */
 enum bt_conn_le_cs_subevent_done_status {
 	BT_CONN_LE_CS_SUBEVENT_COMPLETE = BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_COMPLETE,
-	BT_CONN_LE_CS_SUBEVENT_INCOMPLETE = BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL,
 	BT_CONN_LE_CS_SUBEVENT_ABORTED = BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_ABORTED,
 };
 
@@ -618,7 +617,19 @@ struct bt_conn_le_cs_subevent_result {
 		int8_t reference_power_level;
 		/** Procedure status. */
 		enum bt_conn_le_cs_procedure_done_status procedure_done_status;
-		/** Subevent status. */
+		/** Subevent status
+		 *
+		 *  For aborted subevents, this will be set to @ref BT_CONN_LE_CS_SUBEVENT_ABORTED
+		 *  and abort_step will contain the step number on which the subevent was aborted.
+		 *  Consider the following example:
+		 *
+		 *  subevent_done_status = @ref BT_CONN_LE_CS_SUBEVENT_ABORTED
+		 *  num_steps_reported = 160
+		 *  abort_step = 100
+		 *
+		 *  this would mean that steps from 0 to 99 are complete and steps from 100 to 159
+		 *  are aborted.
+		 */
 		enum bt_conn_le_cs_subevent_done_status subevent_done_status;
 		/** Abort reason.
 		 *
@@ -640,6 +651,11 @@ struct bt_conn_le_cs_subevent_result {
 		/** Number of CS steps in the subevent.
 		 */
 		uint8_t num_steps_reported;
+		/** Step number, on which the subevent was aborted
+		 *  if subevent_done_status is @ref BT_CONN_LE_CS_SUBEVENT_COMPLETE
+		 *  then abort_step will be unused and set to 255
+		 */
+		uint8_t abort_step;
 	} header;
 	struct net_buf_simple *step_data_buf;
 };
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 131b81134c1..cc3ea00afd1 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -3636,6 +3636,25 @@ struct bt_hci_evt_le_cs_subevent_result {
 	uint8_t steps[];
 } __packed;
 
+#define BT_HCI_EVT_LE_CS_SUBEVENT_RESULT_CONTINUE 0x32
+
+struct bt_hci_evt_le_cs_subevent_result_continue {
+	uint16_t conn_handle;
+	uint8_t config_id;
+	uint8_t procedure_done_status;
+	uint8_t subevent_done_status;
+#ifdef CONFIG_LITTLE_ENDIAN
+	uint8_t procedure_abort_reason: 4;
+	uint8_t subevent_abort_reason: 4;
+#else
+	uint8_t subevent_abort_reason: 4;
+	uint8_t procedure_abort_reason: 4;
+#endif /* CONFIG_LITTLE_ENDIAN */
+	uint8_t num_antenna_paths;
+	uint8_t num_steps_reported;
+	uint8_t steps[];
+} __packed;
+
 #define BT_HCI_EVT_LE_CS_TEST_END_COMPLETE 0x33
 struct bt_hci_evt_le_cs_test_end_complete {
 	uint8_t status;
@@ -3734,6 +3753,7 @@ struct bt_hci_evt_le_cs_test_end_complete {
 #define BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE              BT_EVT_BIT(44)
 #define BT_EVT_MASK_LE_CS_CONFIG_COMPLETE                             BT_EVT_BIT(46)
 #define BT_EVT_MASK_LE_CS_SUBEVENT_RESULT                             BT_EVT_BIT(48)
+#define BT_EVT_MASK_LE_CS_SUBEVENT_RESULT_CONTINUE                    BT_EVT_BIT(49)
 #define BT_EVT_MASK_LE_CS_TEST_END_COMPLETE                           BT_EVT_BIT(50)
 
 /** HCI Error Codes, BT Core Spec v5.4 [Vol 1, Part F]. */
diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig
index bf6feff37eb..dbb8214a136 100644
--- a/subsys/bluetooth/Kconfig
+++ b/subsys/bluetooth/Kconfig
@@ -203,6 +203,26 @@ config BT_CHANNEL_SOUNDING_TEST
 	help
 	  Enable support for Channel Sounding test mode.
 
+config BT_CHANNEL_SOUNDING_REASSEMBLY_BUFFER_SIZE
+	int "Subevent result reassembly buffer size"
+	depends on BT_CHANNEL_SOUNDING
+	range 239 5600
+	default 5600
+	help
+	  When the results for a CS subevent cannot fit into a single HCI event,
+	  it will be split up into multiple events and consequently, reassembled into a
+	  full CS subevent. This config sets the size of the reassembly buffer.
+
+config BT_CHANNEL_SOUNDING_REASSEMBLY_BUFFER_CNT
+	int "Subevent result reassembly buffer count"
+	depends on BT_CHANNEL_SOUNDING
+	range 1 BT_MAX_CONN
+	default 1
+	help
+	  Controls the number of the reassembly buffers for CS subevent
+	  results. Each running CS procedure is allocated one buffer and the
+	  number of concurrent CS procedures is limited by this value.
+
 endif # BT_CONN
 
 rsource "Kconfig.iso"
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index 75d5f21cf2c..5a09c017261 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -22,6 +22,224 @@ LOG_MODULE_REGISTER(bt_cs);
 static struct bt_le_cs_test_cb cs_test_callbacks;
 #endif
 
+struct reassembly_buf_meta_data {
+	uint16_t conn_handle;
+};
+
+static void clear_on_disconnect(struct bt_conn *conn, uint8_t reason);
+
+NET_BUF_POOL_FIXED_DEFINE(reassembly_buf_pool, CONFIG_BT_CHANNEL_SOUNDING_REASSEMBLY_BUFFER_CNT,
+			  CONFIG_BT_CHANNEL_SOUNDING_REASSEMBLY_BUFFER_SIZE,
+			  sizeof(struct reassembly_buf_meta_data), NULL);
+
+static sys_slist_t reassembly_bufs = SYS_SLIST_STATIC_INIT(&reassembly_bufs);
+
+struct bt_conn_le_cs_subevent_result reassembled_result;
+
+BT_CONN_CB_DEFINE(cs_conn_callbacks) = {
+	.disconnected = clear_on_disconnect,
+};
+
+/** @brief Allocates new reassembly buffer identified by the connection handle
+ *
+ * @param conn_handle Connection handle
+ * @return struct net_buf* Reassembly buffer, NULL if allocation fails
+ */
+static struct net_buf *alloc_reassembly_buf(uint16_t conn_handle)
+{
+	struct net_buf *buf = net_buf_alloc(&reassembly_buf_pool, K_NO_WAIT);
+
+	if (!buf) {
+		LOG_ERR("Failed to allocate new reassembly buffer");
+		return NULL;
+	}
+
+	struct reassembly_buf_meta_data *buf_meta_data =
+		(struct reassembly_buf_meta_data *)buf->user_data;
+
+	buf_meta_data->conn_handle = conn_handle;
+	net_buf_slist_put(&reassembly_bufs, buf);
+
+	LOG_DBG("Allocated new reassembly buffer for conn handle %d", conn_handle);
+	return buf;
+}
+
+/** @brief Frees a reassembly buffer
+ *
+ * @note Takes the ownership of the pointer and sets it to NULL
+ *
+ * @param buf Double pointer to reassembly buffer
+ */
+static void free_reassembly_buf(struct net_buf **buf)
+{
+	if (!buf) {
+		LOG_ERR("NULL double pointer was passed when attempting to free reassembly buffer");
+		return;
+	}
+
+	if (!(*buf)) {
+		LOG_WRN("Attempted double free on reassembly buffer");
+		return;
+	}
+
+	struct reassembly_buf_meta_data *buf_meta_data =
+		(struct reassembly_buf_meta_data *)((*buf)->user_data);
+
+	LOG_DBG("De-allocating reassembly buffer for conn handle %d", buf_meta_data->conn_handle);
+	if (!sys_slist_find_and_remove(&reassembly_bufs, &(*buf)->node)) {
+		LOG_WRN("The buffer was not in the list");
+	}
+
+	net_buf_unref(*buf);
+	*buf = NULL;
+}
+
+/** @brief Gets the reassembly buffer identified by the connection handle
+ *
+ * @param conn_handle Connection handle
+ * @param allocate Allocates a new reassembly buffer if it's not allocated already
+ * @return struct net_buf* Reassembly buffer, NULL if it doesn't exist or failed when allocating new
+ */
+static struct net_buf *get_reassembly_buf(uint16_t conn_handle, bool allocate)
+{
+	sys_snode_t *node;
+
+	SYS_SLIST_FOR_EACH_NODE(&reassembly_bufs, node) {
+		struct net_buf *buf = CONTAINER_OF(node, struct net_buf, node);
+		struct reassembly_buf_meta_data *buf_meta_data =
+			(struct reassembly_buf_meta_data *)(buf->user_data);
+
+		if (buf_meta_data->conn_handle == conn_handle) {
+			return buf;
+		}
+	}
+
+	return allocate ? alloc_reassembly_buf(conn_handle) : NULL;
+}
+
+/** @brief Adds step data to a reassembly buffer
+ *
+ * @param reassembly_buf Reassembly buffer
+ * @param data Step data
+ * @param data_len Step data length
+ * @return true if successful, false if there is insufficient space
+ */
+static bool add_reassembly_data(struct net_buf *reassembly_buf, const uint8_t *data,
+				uint16_t data_len)
+{
+	if (data_len > net_buf_tailroom(reassembly_buf)) {
+		LOG_ERR("Not enough reassembly buffer space for subevent result");
+		return false;
+	}
+
+	net_buf_add_mem(reassembly_buf, data, data_len);
+	return true;
+}
+
+/** @brief Initializes a reassembly buffer from partial step data
+ *
+ * @note Upon first call, this function also registers the disconnection callback
+ *       to ensure any dangling reassembly buffer is freed
+ *
+ * @param conn_handle Connection handle
+ * @param steps Step data
+ * @param step_data_len Step data length
+ * @return struct net_buf* Pointer to reassembly buffer, NULL if fails to allocate or insert data
+ */
+static struct net_buf *start_reassembly(uint16_t conn_handle, const uint8_t *steps,
+					uint16_t step_data_len)
+{
+	struct net_buf *reassembly_buf = get_reassembly_buf(conn_handle, true);
+
+	if (!reassembly_buf) {
+		LOG_ERR("No buffer allocated for the result reassembly");
+		return NULL;
+	}
+
+	if (reassembly_buf->len) {
+		LOG_WRN("Over-written incomplete CS subevent results");
+	}
+
+	net_buf_reset(reassembly_buf);
+
+	bool success = add_reassembly_data(reassembly_buf, steps, step_data_len);
+
+	return success ? reassembly_buf : NULL;
+}
+
+/** @brief Adds more step data to reassembly buffer identified by the connection handle
+ *
+ * @param conn_handle Connection handle
+ * @param steps Step data
+ * @param step_data_len Step data length
+ * @return struct net_buf* Pointer to reassembly buffer, NULL if fails to insert data
+ */
+static struct net_buf *continue_reassembly(uint16_t conn_handle, const uint8_t *steps,
+					   uint16_t step_data_len)
+{
+	struct net_buf *reassembly_buf = get_reassembly_buf(conn_handle, false);
+
+	if (!reassembly_buf) {
+		LOG_ERR("No reassembly buffer was allocated for this CS procedure, possibly due to "
+			"an out-of-order subevent result continue event");
+		return NULL;
+	}
+
+	if (!reassembly_buf->len) {
+		LOG_WRN("Discarded out-of-order partial CS subevent results");
+		return NULL;
+	}
+
+	if (!step_data_len) {
+		return reassembly_buf;
+	}
+
+	bool success = add_reassembly_data(reassembly_buf, steps, step_data_len);
+
+	return success ? reassembly_buf : NULL;
+}
+
+/**
+ * @brief Disconnect callback to clear any dangling reassembly buffer
+ *
+ * @param conn Connection
+ * @param reason Reason
+ */
+static void clear_on_disconnect(struct bt_conn *conn, uint8_t reason)
+{
+	struct net_buf *buf = get_reassembly_buf(conn->handle, false);
+
+	if (buf) {
+		free_reassembly_buf(&buf);
+	}
+}
+
+/** @brief Invokes user callback for new subevent results
+ *
+ * @param conn Connection context, NULL for CS Test subevent results
+ * @param p_result Pointer to subevent results
+ */
+static void invoke_subevent_result_callback(struct bt_conn *conn,
+					    struct bt_conn_le_cs_subevent_result *p_result)
+{
+#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
+	if (!conn) {
+		cs_test_callbacks.le_cs_test_subevent_data_available(p_result);
+	} else
+#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
+	{
+		notify_cs_subevent_result(conn, p_result);
+	}
+}
+
+/** @brief Resets reassembly results
+ *
+ */
+static void reset_reassembly_results(void)
+{
+	memset(&reassembled_result, 0, sizeof(struct bt_conn_le_cs_subevent_result));
+}
+
 void bt_le_cs_set_valid_chmap_bits(uint8_t channel_map[10])
 {
 	memset(channel_map, 0xFF, 10);
@@ -360,7 +578,9 @@ void bt_hci_le_cs_subevent_result(struct net_buf *buf)
 	struct bt_conn *conn = NULL;
 	struct bt_hci_evt_le_cs_subevent_result *evt;
 	struct bt_conn_le_cs_subevent_result result;
+	struct bt_conn_le_cs_subevent_result *p_result = &result;
 	struct net_buf_simple step_data_buf;
+	struct net_buf *reassembly_buf = NULL;
 
 	if (buf->len < sizeof(*evt)) {
 		LOG_ERR("Unexpected end of buffer");
@@ -368,14 +588,10 @@ void bt_hci_le_cs_subevent_result(struct net_buf *buf)
 	}
 
 	evt = net_buf_pull_mem(buf, sizeof(*evt));
-
-	if (evt->subevent_done_status == BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL) {
-		LOG_WRN("Discarded incomplete CS subevent results.");
-		return;
-	}
+	uint16_t conn_handle = sys_le16_to_cpu(evt->conn_handle);
 
 #if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
-	if (sys_le16_to_cpu(evt->conn_handle) == BT_HCI_LE_CS_TEST_CONN_HANDLE) {
+	if (conn_handle == BT_HCI_LE_CS_TEST_CONN_HANDLE) {
 		if (!cs_test_callbacks.le_cs_test_subevent_data_available) {
 			LOG_WRN("No callback registered. Discarded subevent results from CS Test.");
 			return;
@@ -383,49 +599,177 @@ void bt_hci_le_cs_subevent_result(struct net_buf *buf)
 	} else
 #endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
 	{
-		conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->conn_handle), BT_CONN_TYPE_LE);
+		conn = bt_conn_lookup_handle(conn_handle, BT_CONN_TYPE_LE);
 		if (!conn) {
 			LOG_ERR("Unknown connection handle when processing subevent results");
 			return;
 		}
 	}
 
-	result.header.procedure_counter = sys_le16_to_cpu(evt->procedure_counter);
-	result.header.frequency_compensation = sys_le16_to_cpu(evt->frequency_compensation);
-	result.header.procedure_done_status = evt->procedure_done_status;
-	result.header.subevent_done_status = evt->subevent_done_status;
-	result.header.procedure_abort_reason = evt->procedure_abort_reason;
-	result.header.subevent_abort_reason = evt->subevent_abort_reason;
-	result.header.reference_power_level = evt->reference_power_level;
-	result.header.num_antenna_paths = evt->num_antenna_paths;
-	result.header.num_steps_reported = evt->num_steps_reported;
-
-	if (evt->num_steps_reported) {
-		net_buf_simple_init_with_data(&step_data_buf,
-					      evt->steps,
-					      buf->len);
-		result.step_data_buf = &step_data_buf;
+	if (evt->subevent_done_status != BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL) {
+		p_result->step_data_buf = NULL;
+		if (evt->num_steps_reported) {
+			net_buf_simple_init_with_data(&step_data_buf, evt->steps, buf->len);
+			p_result->step_data_buf = &step_data_buf;
+		}
 	} else {
-		result.step_data_buf = NULL;
+		if (evt->procedure_done_status != BT_HCI_LE_CS_PROCEDURE_DONE_STATUS_PARTIAL) {
+			LOG_WRN("Procedure status is inconsistent with subevent status. Discarding "
+				"subevent results");
+			goto abort;
+		}
+
+		if (!evt->num_steps_reported) {
+			LOG_WRN("Discarding partial results without step data");
+			goto abort;
+		}
+
+		reassembly_buf = start_reassembly(conn_handle, evt->steps, buf->len);
+		if (!reassembly_buf) {
+			goto abort;
+		}
+
+		p_result = &reassembled_result;
+		p_result->step_data_buf = (struct net_buf_simple *)&reassembly_buf->data;
+	}
+
+	p_result->header.procedure_counter = sys_le16_to_cpu(evt->procedure_counter);
+	p_result->header.frequency_compensation = sys_le16_to_cpu(evt->frequency_compensation);
+	p_result->header.procedure_done_status = evt->procedure_done_status;
+	p_result->header.subevent_done_status = evt->subevent_done_status;
+	p_result->header.procedure_abort_reason = evt->procedure_abort_reason;
+	p_result->header.subevent_abort_reason = evt->subevent_abort_reason;
+	p_result->header.reference_power_level = evt->reference_power_level;
+	p_result->header.num_antenna_paths = evt->num_antenna_paths;
+	p_result->header.num_steps_reported = evt->num_steps_reported;
+	p_result->header.abort_step =
+		evt->subevent_done_status == BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_ABORTED ? 0 : 255;
+
+	p_result->header.config_id = 0;
+	p_result->header.start_acl_conn_event = 0;
+	if (conn) {
+		p_result->header.config_id = evt->config_id;
+		p_result->header.start_acl_conn_event =
+			sys_le16_to_cpu(evt->start_acl_conn_event_counter);
 	}
 
-#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
-	if (sys_le16_to_cpu(evt->conn_handle) == BT_HCI_LE_CS_TEST_CONN_HANDLE) {
-		result.header.config_id = 0;
-		result.header.start_acl_conn_event = 0;
+	if (evt->subevent_done_status != BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL) {
+		invoke_subevent_result_callback(conn, p_result);
+	}
+
+	if (evt->procedure_done_status != BT_CONN_LE_CS_PROCEDURE_INCOMPLETE) {
+		/* We can now clear the any reassembly buffer allocated for this procedure,
+		 * to avoid code duplication, we're using the abort label to do so
+		 */
+		goto abort;
+	}
 
-		cs_test_callbacks.le_cs_test_subevent_data_available(&result);
+	if (conn) {
+		bt_conn_unref(conn);
+		conn = NULL;
+	}
+
+	return;
+
+abort:
+	if (conn) {
+		bt_conn_unref(conn);
+		conn = NULL;
+	}
+
+	reassembly_buf = get_reassembly_buf(conn_handle, false);
+	if (reassembly_buf) {
+		free_reassembly_buf(&reassembly_buf);
+	}
+}
+
+void bt_hci_le_cs_subevent_result_continue(struct net_buf *buf)
+{
+	struct bt_conn *conn = NULL;
+	struct bt_hci_evt_le_cs_subevent_result_continue *evt;
+	struct net_buf *reassembly_buf = NULL;
+	uint16_t conn_handle;
 
+	if (buf->len < sizeof(*evt)) {
+		LOG_ERR("Unexpected end of buffer");
+		return;
+	}
+
+	evt = net_buf_pull_mem(buf, sizeof(*evt));
+	conn_handle = sys_le16_to_cpu(evt->conn_handle);
+
+#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
+	if (conn_handle == BT_HCI_LE_CS_TEST_CONN_HANDLE) {
+		if (!cs_test_callbacks.le_cs_test_subevent_data_available) {
+			LOG_WRN("No callback registered. Discarded subevent results from CS Test.");
+			return;
+		}
 	} else
 #endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
 	{
-		result.header.config_id = evt->config_id;
-		result.header.start_acl_conn_event =
-			sys_le16_to_cpu(evt->start_acl_conn_event_counter);
+		conn = bt_conn_lookup_handle(conn_handle, BT_CONN_TYPE_LE);
+		if (!conn) {
+			LOG_ERR("Unknown connection handle when processing subevent results");
+			return;
+		}
+	}
+
+	uint16_t step_data_len = evt->num_steps_reported ? buf->len : 0;
+
+	reassembly_buf = continue_reassembly(conn_handle, evt->steps, step_data_len);
+	if (!reassembly_buf) {
+		goto abort;
+	}
 
-		notify_cs_subevent_result(conn, &result);
+	reassembled_result.header.procedure_done_status = evt->procedure_done_status;
+	reassembled_result.header.subevent_done_status = evt->subevent_done_status;
+	reassembled_result.header.procedure_abort_reason = evt->procedure_abort_reason;
+	reassembled_result.header.subevent_abort_reason = evt->subevent_abort_reason;
 
+	if (evt->num_antenna_paths != reassembled_result.header.num_antenna_paths) {
+		LOG_WRN("Received inconsistent number of antenna paths from the controller: %d, "
+			"previous number was: %d",
+			evt->num_antenna_paths, reassembled_result.header.num_antenna_paths);
+	}
+
+	if (evt->subevent_done_status == BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_ABORTED &&
+	    reassembled_result.header.num_steps_reported < reassembled_result.header.abort_step) {
+		reassembled_result.header.abort_step = reassembled_result.header.num_steps_reported;
+	}
+
+	reassembled_result.header.num_steps_reported += evt->num_steps_reported;
+
+	if (evt->subevent_done_status != BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL) {
+		invoke_subevent_result_callback(conn, &reassembled_result);
+		net_buf_reset(reassembly_buf);
+		reset_reassembly_results();
+	}
+
+	if (evt->procedure_done_status != BT_HCI_LE_CS_PROCEDURE_DONE_STATUS_PARTIAL) {
+		if (evt->subevent_done_status == BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL) {
+			LOG_WRN("Procedure status is inconsistent with subevent status. Discarding "
+				"subevent results");
+			goto abort;
+		}
+
+		free_reassembly_buf(&reassembly_buf);
+	}
+
+	if (conn) {
+		bt_conn_unref(conn);
+		conn = NULL;
+	}
+
+	return;
+
+abort:
+	if (conn) {
 		bt_conn_unref(conn);
+		conn = NULL;
+	}
+
+	if (reassembly_buf) {
+		free_reassembly_buf(&reassembly_buf);
 	}
 }
 
@@ -561,6 +905,13 @@ void bt_hci_le_cs_test_end_complete(struct net_buf *buf)
 		return;
 	}
 
+	struct net_buf *reassembly_buf = get_reassembly_buf(BT_HCI_LE_CS_TEST_CONN_HANDLE, false);
+
+	if (reassembly_buf) {
+		LOG_WRN("De-allocating a dangling reassembly buffer");
+		free_reassembly_buf(&reassembly_buf);
+	}
+
 	if (cs_test_callbacks.le_cs_test_end_complete) {
 		cs_test_callbacks.le_cs_test_end_complete();
 	}
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index 6d0670502c1..0d0b5a9c60b 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -2833,6 +2833,9 @@ static const struct event_handler meta_events[] = {
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_SUBEVENT_RESULT,
 		      bt_hci_le_cs_subevent_result,
 		      sizeof(struct bt_hci_evt_le_cs_subevent_result)),
+	EVENT_HANDLER(BT_HCI_EVT_LE_CS_SUBEVENT_RESULT_CONTINUE,
+		      bt_hci_le_cs_subevent_result_continue,
+		      sizeof(struct bt_hci_evt_le_cs_subevent_result_continue)),
 #if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_TEST_END_COMPLETE,
 		      bt_hci_le_cs_test_end_complete,
@@ -3416,6 +3419,7 @@ static int le_set_event_mask(void)
 		mask |= BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE;
 		mask |= BT_EVT_MASK_LE_CS_CONFIG_COMPLETE;
 		mask |= BT_EVT_MASK_LE_CS_SUBEVENT_RESULT;
+		mask |= BT_EVT_MASK_LE_CS_SUBEVENT_RESULT_CONTINUE;
 		mask |= BT_EVT_MASK_LE_CS_TEST_END_COMPLETE;
 	}
 
diff --git a/subsys/bluetooth/host/hci_core.h b/subsys/bluetooth/host/hci_core.h
index 27387c9c53f..458576e74f7 100644
--- a/subsys/bluetooth/host/hci_core.h
+++ b/subsys/bluetooth/host/hci_core.h
@@ -543,6 +543,7 @@ void bt_hci_le_cs_read_remote_supported_capabilities_complete(struct net_buf *bu
 void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf);
 void bt_hci_le_cs_config_complete_event(struct net_buf *buf);
 void bt_hci_le_cs_subevent_result(struct net_buf *buf);
+void bt_hci_le_cs_subevent_result_continue(struct net_buf *buf);
 void bt_hci_le_cs_test_end_complete(struct net_buf *buf);
 
 /* Adv HCI event handlers */

From ea45b52b818301ab3a5adbcd2d7702e38a08bc01 Mon Sep 17 00:00:00 2001
From: Burak Gorduk <burak.gorduk@nordicsemi.no>
Date: Tue, 15 Oct 2024 10:41:47 +0100
Subject: [PATCH 0204/2913] [nrf fromtree] bluetooth: host Accommodate platform
 endianness for CS types

Modifies the CS bitfields that are used for accessing HCI
event data to take platform endiannes into consideration.

Signed-off-by: Burak Gorduk <burak.gorduk@nordicsemi.no>
(cherry picked from commit bfe3c4353c7945fdedbdd99698eb228da6897749)
(cherry picked from commit da7650c6d86042c3828db32ba3e655e46fbff0c5)
(cherry picked from commit a10478d63a98db5cc413e03369326d40a8993bc4)
---
 include/zephyr/bluetooth/hci_types.h | 40 ++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index cc3ea00afd1..a620097acaf 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -3524,8 +3524,13 @@ struct bt_hci_evt_le_cs_config_complete {
 #define BT_HCI_EVT_LE_CS_SUBEVENT_RESULT 0x31
 /** Subevent result step data format: Mode 0 Initiator  */
 struct bt_hci_le_cs_step_data_mode_0_initiator {
+#ifdef CONFIG_LITTLE_ENDIAN
 	uint8_t packet_quality_aa_check: 4;
 	uint8_t packet_quality_bit_errors: 4;
+#else
+	uint8_t packet_quality_bit_errors: 4;
+	uint8_t packet_quality_aa_check: 4;
+#endif /* CONFIG_LITTLE_ENDIAN */
 	uint8_t packet_rssi;
 	uint8_t packet_antenna;
 	uint16_t measured_freq_offset;
@@ -3533,16 +3538,26 @@ struct bt_hci_le_cs_step_data_mode_0_initiator {
 
 /** Subevent result step data format: Mode 0 Reflector  */
 struct bt_hci_le_cs_step_data_mode_0_reflector {
+#ifdef CONFIG_LITTLE_ENDIAN
 	uint8_t packet_quality_aa_check: 4;
 	uint8_t packet_quality_bit_errors: 4;
+#else
+	uint8_t packet_quality_bit_errors: 4;
+	uint8_t packet_quality_aa_check: 4;
+#endif /* CONFIG_LITTLE_ENDIAN */
 	uint8_t packet_rssi;
 	uint8_t packet_antenna;
 } __packed;
 
 /** Subevent result step data format: Mode 1  */
 struct bt_hci_le_cs_step_data_mode_1 {
+#ifdef CONFIG_LITTLE_ENDIAN
 	uint8_t packet_quality_aa_check: 4;
 	uint8_t packet_quality_bit_errors: 4;
+#else
+	uint8_t packet_quality_bit_errors: 4;
+	uint8_t packet_quality_aa_check: 4;
+#endif /* CONFIG_LITTLE_ENDIAN */
 	uint8_t packet_nadm;
 	uint8_t packet_rssi;
 	union {
@@ -3554,8 +3569,13 @@ struct bt_hci_le_cs_step_data_mode_1 {
 
 /** Subevent result step data format: Mode 1 with sounding sequence RTT support */
 struct bt_hci_le_cs_step_data_mode_1_ss_rtt {
+#ifdef CONFIG_LITTLE_ENDIAN
 	uint8_t packet_quality_aa_check: 4;
 	uint8_t packet_quality_bit_errors: 4;
+#else
+	uint8_t packet_quality_bit_errors: 4;
+	uint8_t packet_quality_aa_check: 4;
+#endif /* CONFIG_LITTLE_ENDIAN */
 	uint8_t packet_nadm;
 	uint8_t packet_rssi;
 	union {
@@ -3571,8 +3591,13 @@ struct bt_hci_le_cs_step_data_mode_1_ss_rtt {
 /** Format for per-antenna path step data in modes 2 and 3 */
 struct bt_hci_le_cs_step_data_tone_info {
 	uint8_t phase_correction_term[3];
+#ifdef CONFIG_LITTLE_ENDIAN
 	uint8_t quality_indicator: 4;
 	uint8_t extension_indicator: 4;
+#else
+	uint8_t extension_indicator: 4;
+	uint8_t quality_indicator: 4;
+#endif /* CONFIG_LITTLE_ENDIAN */
 } __packed;
 
 /** Subevent result step data format: Mode 2 */
@@ -3583,8 +3608,13 @@ struct bt_hci_le_cs_step_data_mode_2 {
 
 /** Subevent result step data format: Mode 3 */
 struct bt_hci_le_cs_step_data_mode_3 {
+#ifdef CONFIG_LITTLE_ENDIAN
 	uint8_t packet_quality_aa_check: 4;
 	uint8_t packet_quality_bit_errors: 4;
+#else
+	uint8_t packet_quality_bit_errors: 4;
+	uint8_t packet_quality_aa_check: 4;
+#endif /* CONFIG_LITTLE_ENDIAN */
 	uint8_t packet_nadm;
 	uint8_t packet_rssi;
 	union {
@@ -3598,8 +3628,13 @@ struct bt_hci_le_cs_step_data_mode_3 {
 
 /** Subevent result step data format: Mode 3 with sounding sequence RTT support */
 struct bt_hci_le_cs_step_data_mode_3_ss_rtt {
+#ifdef CONFIG_LITTLE_ENDIAN
 	uint8_t packet_quality_aa_check: 4;
 	uint8_t packet_quality_bit_errors: 4;
+#else
+	uint8_t packet_quality_bit_errors: 4;
+	uint8_t packet_quality_aa_check: 4;
+#endif /* CONFIG_LITTLE_ENDIAN */
 	uint8_t packet_nadm;
 	uint8_t packet_rssi;
 	union {
@@ -3629,8 +3664,13 @@ struct bt_hci_evt_le_cs_subevent_result {
 	uint8_t reference_power_level;
 	uint8_t procedure_done_status;
 	uint8_t subevent_done_status;
+#ifdef CONFIG_LITTLE_ENDIAN
 	uint8_t procedure_abort_reason: 4;
 	uint8_t subevent_abort_reason: 4;
+#else
+	uint8_t subevent_abort_reason: 4;
+	uint8_t procedure_abort_reason: 4;
+#endif /* CONFIG_LITTLE_ENDIAN */
 	uint8_t num_antenna_paths;
 	uint8_t num_steps_reported;
 	uint8_t steps[];

From afefccc290c2fbbb55325b02e4904993504217a3 Mon Sep 17 00:00:00 2001
From: Olivier Lesage <olivier.lesage@nordicsemi.no>
Date: Tue, 15 Oct 2024 10:44:26 +0200
Subject: [PATCH 0205/2913] [nrf fromtree] bluetooth: host: Fix values for
 minimizing/maximizing TX power

The values were swapped, leading to the opposite of the intended
behavior

Signed-off-by: Olivier Lesage <olivier.lesage@nordicsemi.no>
(cherry picked from commit 51a0e9484d1f22a2cf9b7c04d8dab3a959bedf25)
(cherry picked from commit cde1a3cba67e70864b7493ed5c221d9a84ea5d2f)
(cherry picked from commit 63b036b5950bb1edafa01f6558e1036bf018bec9)
---
 include/zephyr/bluetooth/hci_types.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index a620097acaf..83956de7d4a 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -2463,8 +2463,8 @@ struct bt_hci_cp_le_read_remote_fae_table {
 #define BT_HCI_OP_LE_CS_CS_SYNC_2M     0x2
 #define BT_HCI_OP_LE_CS_CS_SYNC_2M_2BT 0x3
 
-#define BT_HCI_OP_LE_CS_TEST_MAXIMIZE_TX_POWER 0x7E
-#define BT_HCI_OP_LE_CS_TEST_MINIMIZE_TX_POWER 0x7F
+#define BT_HCI_OP_LE_CS_TEST_MINIMIZE_TX_POWER 0x7E
+#define BT_HCI_OP_LE_CS_TEST_MAXIMIZE_TX_POWER 0x7F
 
 #define BT_HCI_OP_LE_CS_TEST_ACI_0 0x0
 #define BT_HCI_OP_LE_CS_TEST_ACI_1 0x1

From 3ead2ba0de1b59ec1548dcfa7f9797be70ba68db Mon Sep 17 00:00:00 2001
From: Olivier Lesage <olivier.lesage@nordicsemi.no>
Date: Tue, 15 Oct 2024 10:45:56 +0200
Subject: [PATCH 0206/2913] [nrf fromtree] bluetooth: host: Add docs for t_XX
 times in CS Test

These options are in microseconds but not fully configurable,
document what options are allowed in 6.0

Signed-off-by: Olivier Lesage <olivier.lesage@nordicsemi.no>
(cherry picked from commit 5d0366404ae628762dad95125bdd3816ee6e8290)
(cherry picked from commit 1ce8721c2ffbf0c40193403374097bd7fe3abcfb)
(cherry picked from commit ca207fc11d60c9b6c4309470664093cb3d75bca7)
---
 include/zephyr/bluetooth/cs.h | 59 ++++++++++++++++++++++++++++++++---
 1 file changed, 54 insertions(+), 5 deletions(-)

diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index fa362083180..aa145b65f5c 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -338,15 +338,64 @@ struct bt_le_cs_test_param {
 	 *      it should use as low a transmit power as possible
 	 */
 	uint8_t transmit_power_level;
-	/** Interlude time in microseconds between the RTT packets. */
+	/** Interlude time in microseconds between the RTT packets.
+	 *
+	 *  Valid options are:
+	 *    - 10 us
+	 *    - 20 us
+	 *    - 30 us
+	 *    - 40 us
+	 *    - 50 us
+	 *    - 60 us
+	 *    - 80 us
+	 *    - 145 us
+	 */
 	uint8_t t_ip1_time;
-	/** Interlude time in microseconds between the CS tones. */
+	/** Interlude time in microseconds between the CS tones.
+	 *
+	 *  Valid options are:
+	 *    - 10 us
+	 *    - 20 us
+	 *    - 30 us
+	 *    - 40 us
+	 *    - 50 us
+	 *    - 60 us
+	 *    - 80 us
+	 *    - 145 us
+	 */
 	uint8_t t_ip2_time;
-	/** Time in microseconds for frequency changes. */
+	/** Time in microseconds for frequency changes.
+	 *
+	 *  Valid options are:
+	 *    - 15 us
+	 *    - 20 us
+	 *    - 30 us
+	 *    - 40 us
+	 *    - 50 us
+	 *    - 60 us
+	 *    - 80 us
+	 *    - 100 us
+	 *    - 120 us
+	 *    - 150 us
+	 */
 	uint8_t t_fcs_time;
-	/** Time in microseconds for the phase measurement period of the CS tones. */
+	/** Time in microseconds for the phase measurement period of the CS tones.
+	 *
+	 *  Valid options are:
+	 *    - 10 us
+	 *    - 20 us
+	 *    - 40 us
+	 */
 	uint8_t t_pm_time;
-	/** Time in microseconds for the antenna switch period of the CS tones. */
+	/** Time in microseconds for the antenna switch period of the CS tones.
+	 *
+	 *  Valid options are:
+	 *    - 0 us
+	 *    - 1 us
+	 *    - 2 us
+	 *    - 4 us
+	 *    - 10 us
+	 */
 	uint8_t t_sw_time;
 	/** Antenna Configuration Index used during antenna switching during
 	 *  the tone phases of CS steps.

From c165c4e75cbd49063a81c0ba939d9920991929fb Mon Sep 17 00:00:00 2001
From: Olivier Lesage <olivier.lesage@nordicsemi.no>
Date: Tue, 15 Oct 2024 10:46:44 +0200
Subject: [PATCH 0207/2913] [nrf fromtree] bluetooth: host: uint16_t -> int16_t
 mode 1 deltas

These are signed 16-bit integers by spec

Signed-off-by: Olivier Lesage <olivier.lesage@nordicsemi.no>
(cherry picked from commit b1f34a1b19c426794d1ee190566b232d85709e08)
(cherry picked from commit 9a66af4f85a49526e93a203664160b371346e089)
(cherry picked from commit 6b2000d0f163f924838f64b3654996e1b4ca07b4)
---
 include/zephyr/bluetooth/hci_types.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 83956de7d4a..eb05e53b72c 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -3561,8 +3561,8 @@ struct bt_hci_le_cs_step_data_mode_1 {
 	uint8_t packet_nadm;
 	uint8_t packet_rssi;
 	union {
-		uint16_t toa_tod_initiator;
-		uint16_t tod_toa_reflector;
+		int16_t toa_tod_initiator;
+		int16_t tod_toa_reflector;
 	};
 	uint8_t packet_antenna;
 } __packed;
@@ -3579,8 +3579,8 @@ struct bt_hci_le_cs_step_data_mode_1_ss_rtt {
 	uint8_t packet_nadm;
 	uint8_t packet_rssi;
 	union {
-		uint16_t toa_tod_initiator;
-		uint16_t tod_toa_reflector;
+		int16_t toa_tod_initiator;
+		int16_t tod_toa_reflector;
 	};
 	uint8_t packet_antenna;
 	uint8_t packet_pct1[4];
@@ -3618,8 +3618,8 @@ struct bt_hci_le_cs_step_data_mode_3 {
 	uint8_t packet_nadm;
 	uint8_t packet_rssi;
 	union {
-		uint16_t toa_tod_initiator;
-		uint16_t tod_toa_reflector;
+		int16_t toa_tod_initiator;
+		int16_t tod_toa_reflector;
 	};
 	uint8_t packet_antenna;
 	uint8_t antenna_permutation_index;
@@ -3638,8 +3638,8 @@ struct bt_hci_le_cs_step_data_mode_3_ss_rtt {
 	uint8_t packet_nadm;
 	uint8_t packet_rssi;
 	union {
-		uint16_t toa_tod_initiator;
-		uint16_t tod_toa_reflector;
+		int16_t toa_tod_initiator;
+		int16_t tod_toa_reflector;
 	};
 	uint8_t packet_antenna;
 	uint8_t packet_pct1[4];

From 2667542a69d19eeda47f38f5253c15d2a9c9e93a Mon Sep 17 00:00:00 2001
From: Olivier Lesage <olivier.lesage@nordicsemi.no>
Date: Tue, 15 Oct 2024 10:52:25 +0200
Subject: [PATCH 0208/2913] [nrf fromtree] bluetooth: host: Add defines for
 mode 1 packet quality and RSSI

Add some defines for packet quality and rssi for RTT,
these are useful for filtering out steps where the RTT exchange
was unsuccessful

Signed-off-by: Olivier Lesage <olivier.lesage@nordicsemi.no>
(cherry picked from commit 6c954782d2c87c89326c1a5870241d070c8f1384)
(cherry picked from commit e4bcf1fa7dd28da8028e7db7b2f5c50d59087ef3)
(cherry picked from commit bca19c35a233360d20666136ddd764b2dc9bee44)
---
 include/zephyr/bluetooth/hci_types.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index eb05e53b72c..61f4747a7a8 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -3521,6 +3521,12 @@ struct bt_hci_evt_le_cs_config_complete {
 #define BT_HCI_LE_CS_PACKET_NADM_ATTACK_EXT_LIKELY    0x06
 #define BT_HCI_LE_CS_PACKET_NADM_UNKNOWN              0xFF
 
+#define BT_HCI_LE_CS_PACKET_QUALITY_AA_CHECK_SUCCESSFUL	      0x0
+#define BT_HCI_LE_CS_PACKET_QUALITY_AA_CHECK_BIT_ERRORS_FOUND 0x1
+#define BT_HCI_LE_CS_PACKET_QUALITY_AA_CHECK_AA_NOT_FOUND     0x2
+
+#define BT_HCI_LE_CS_PACKET_RSSI_NOT_AVAILABLE 0x7F
+
 #define BT_HCI_EVT_LE_CS_SUBEVENT_RESULT 0x31
 /** Subevent result step data format: Mode 0 Initiator  */
 struct bt_hci_le_cs_step_data_mode_0_initiator {

From f9b0224ad414aa053850eab9b012acbc77b1b9ab Mon Sep 17 00:00:00 2001
From: Olivier Lesage <olivier.lesage@nordicsemi.no>
Date: Thu, 17 Oct 2024 10:29:28 +0200
Subject: [PATCH 0209/2913] [nrf fromtree] bluetooth: host: minor doc
 correction for bt_le_cs_step_data_parse()

This function can be used to parse HCI-formatted subevent results
regardless of whether they come from CS Test or not

Signed-off-by: Olivier Lesage <olivier.lesage@nordicsemi.no>
(cherry picked from commit 60a2d7d7d2e4ffa424a9cb0967ef5f279f6d54f6)
(cherry picked from commit 7de875875bb337c98613c5814d0d655effc20337)
(cherry picked from commit 3b2d81454aafec798fc147df668d8d135c0e09e5)
---
 include/zephyr/bluetooth/cs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index aa145b65f5c..5ba452667aa 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -718,7 +718,7 @@ int bt_le_cs_remove_config(struct bt_conn *conn, uint8_t config_id);
  */
 int bt_le_cs_stop_test(void);
 
-/** @brief Parse CS Test Subevent Results
+/** @brief Parse CS Subevent Step Data
  *
  * A helper for parsing HCI-formatted step data found in channel sounding subevent results.
  *

From bbb8a72983c150b37d0b40be1f0fdc50c097bf20 Mon Sep 17 00:00:00 2001
From: Adam Cavender <adam.cavender@nordicsemi.no>
Date: Thu, 10 Oct 2024 11:10:25 +0100
Subject: [PATCH 0210/2913] [nrf fromtree] bluetooth: host: CS support for
 various HCI commands

Adds HCI support for:
- LE CS Security Enable
- LE CS Procedure Enable
- LE CS Set Procedure Parameters
- LE CS Set Channel Classification
- LE CS Read Local Supported Capabilities
- LE CS Write Cached Remote Supported Capabilities
- LE CS Write Cached Remote FAE Table

Signed-off-by: Adam Cavender <adam.cavender@nordicsemi.no>
(cherry picked from commit 18f508144e4ffc50c13f02866ba4bf47335d35ea)
(cherry picked from commit 0b957cd4e97a3aaabb063332de24534af24430f7)
(cherry picked from commit 8caa3ee5c79460867c06013a44f27b0637636b80)
---
 include/zephyr/bluetooth/conn.h       | 101 +++++++
 include/zephyr/bluetooth/cs.h         | 244 +++++++++++++----
 include/zephyr/bluetooth/hci_types.h  | 171 ++++++++++--
 subsys/bluetooth/host/conn.c          |  35 +++
 subsys/bluetooth/host/conn_internal.h |   5 +
 subsys/bluetooth/host/cs.c            | 372 ++++++++++++++++++++++++++
 subsys/bluetooth/host/hci_core.c      |   8 +
 subsys/bluetooth/host/hci_core.h      |   2 +
 subsys/bluetooth/shell/cs.c           | 270 ++++++++++++++++++-
 9 files changed, 1127 insertions(+), 81 deletions(-)

diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index f81ca8b3ce8..23dd9fb89f8 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -1518,6 +1518,86 @@ enum bt_security_err {
 	BT_SECURITY_ERR_UNSPECIFIED,
 };
 
+enum bt_conn_le_cs_procedure_enable_state {
+	BT_CONN_LE_CS_PROCEDURES_DISABLED = BT_HCI_OP_LE_CS_PROCEDURES_DISABLED,
+	BT_CONN_LE_CS_PROCEDURES_ENABLED = BT_HCI_OP_LE_CS_PROCEDURES_ENABLED,
+};
+
+/** CS Test Tone Antennna Config Selection.
+ *
+ *  These enum values are indices in the following table, where N_AP is the maximum
+ *  number of antenna paths (in the range [1, 4]).
+ *
+ * +--------------+-------------+-------------------+-------------------+--------+
+ * | Config Index | Total Paths | Dev A: # Antennas | Dev B: # Antennas | Config |
+ * +--------------+-------------+-------------------+-------------------+--------+
+ * |            0 |           1 |                 1 |                 1 | 1:1    |
+ * |            1 |           2 |                 2 |                 1 | N_AP:1 |
+ * |            2 |           3 |                 3 |                 1 | N_AP:1 |
+ * |            3 |           4 |                 4 |                 1 | N_AP:1 |
+ * |            4 |           2 |                 1 |                 2 | 1:N_AP |
+ * |            5 |           3 |                 1 |                 3 | 1:N_AP |
+ * |            6 |           4 |                 1 |                 4 | 1:N_AP |
+ * |            7 |           4 |                 2 |                 2 | 2:2    |
+ * +--------------+-------------+-------------------+-------------------+--------+
+ *
+ *  There are therefore four groups of possible antenna configurations:
+ *
+ *  - 1:1 configuration, where both A and B support 1 antenna each
+ *  - 1:N_AP configuration, where A supports 1 antenna, B supports N_AP antennas, and
+ *    N_AP is a value in the range [2, 4]
+ *  - N_AP:1 configuration, where A supports N_AP antennas, B supports 1 antenna, and
+ *    N_AP is a value in the range [2, 4]
+ *  - 2:2 configuration, where both A and B support 2 antennas and N_AP = 4
+ */
+enum bt_conn_le_cs_tone_antenna_config_selection {
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE = BT_HCI_OP_LE_CS_ACI_0,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_TWO = BT_HCI_OP_LE_CS_ACI_1,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_THREE = BT_HCI_OP_LE_CS_ACI_2,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_FOUR = BT_HCI_OP_LE_CS_ACI_3,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_FIVE = BT_HCI_OP_LE_CS_ACI_4,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_SIX = BT_HCI_OP_LE_CS_ACI_5,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_SEVEN = BT_HCI_OP_LE_CS_ACI_6,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_EIGHT = BT_HCI_OP_LE_CS_ACI_7,
+};
+
+struct bt_conn_le_cs_procedure_enable_complete {
+	/* The ID associated with the desired configuration (0 to 3) */
+	uint8_t config_id;
+
+	/* State of the CS procedure */
+	enum bt_conn_le_cs_procedure_enable_state state;
+
+	/* Antenna configuration index */
+	enum bt_conn_le_cs_tone_antenna_config_selection tone_antenna_config_selection;
+
+	/* Transmit power level used for CS procedures (-127 to 20 dB; 0x7F if unavailable) */
+	int8_t selected_tx_power;
+
+	/* Duration of each CS subevent in microseconds (1250 us to 4 s) */
+	uint32_t subevent_len;
+
+	/* Number of CS subevents anchored off the same ACL connection event (0x01 to 0x20) */
+	uint8_t subevents_per_event;
+
+	/* Time between consecutive CS subevents anchored off the same ACL connection event in
+	 * units of 0.625 ms
+	 */
+	uint16_t subevent_interval;
+
+	/* Number of ACL connection events between consecutive CS event anchor points */
+	uint16_t event_interval;
+
+	/* Number of ACL connection events between consecutive CS procedure anchor points */
+	uint16_t procedure_interval;
+
+	/* Number of CS procedures to be scheduled (0 if procedures to continue until disabled) */
+	uint16_t procedure_count;
+
+	/* Maximum duration for each procedure in units of 0.625 ms (0x0001 to 0xFFFF) */
+	uint16_t max_procedure_len;
+};
+
 /** @brief Connection callback structure.
  *
  *  This structure is used for tracking the state of a connection.
@@ -1810,6 +1890,27 @@ struct bt_conn_cb {
 	 */
 	void (*le_cs_subevent_data_available)(struct bt_conn *conn,
 					      struct bt_conn_le_cs_subevent_result *result);
+
+	/** @brief LE CS Security Enabled.
+	 *
+	 *  This callback notifies the application that a Channel Sounding
+	 *  Security Enable procedure has completed
+	 *
+	 *  @param conn Connection object.
+	 */
+	void (*le_cs_security_enabled)(struct bt_conn *conn);
+
+	/** @brief LE CS Procedure Enabled.
+	 *
+	 *  This callback notifies the application that a Channel Sounding
+	 *  Procedure Enable procedure has completed
+	 *
+	 *  @param conn Connection object.
+	 *  @param params CS Procedure Enable parameters
+	 */
+	void (*le_cs_procedure_enabled)(
+		struct bt_conn *conn, struct bt_conn_le_cs_procedure_enable_complete *params);
+
 #endif
 
 	/** @internal Internally used field for list handling */
diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index 5ba452667aa..d5d34039d27 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -88,62 +88,24 @@ enum bt_le_cs_test_cs_sync_antenna_selection {
 	BT_LE_CS_TEST_CS_SYNC_ANTENNA_SELECTION_FOUR = BT_HCI_OP_LE_CS_ANTENNA_SEL_FOUR,
 };
 
-/** CS Test Tone Antennna Config Selection.
- *
- *  These enum values are indices in the following table, where N_AP is the maximum
- *  number of antenna paths (in the range [1, 4]).
- *
- * +--------------+-------------+-------------------+-------------------+--------+
- * | Config Index | Total Paths | Dev A: # Antennas | Dev B: # Antennas | Config |
- * +--------------+-------------+-------------------+-------------------+--------+
- * |            0 |           1 |                 1 |                 1 | 1:1    |
- * |            1 |           2 |                 2 |                 1 | N_AP:1 |
- * |            2 |           3 |                 3 |                 1 | N_AP:1 |
- * |            3 |           4 |                 4 |                 1 | N_AP:1 |
- * |            4 |           2 |                 1 |                 2 | 1:N_AP |
- * |            5 |           3 |                 1 |                 3 | 1:N_AP |
- * |            6 |           4 |                 1 |                 4 | 1:N_AP |
- * |            7 |           4 |                 2 |                 2 | 2:2    |
- * +--------------+-------------+-------------------+-------------------+--------+
- *
- *  There are therefore four groups of possible antenna configurations:
- *
- *  - 1:1 configuration, where both A and B support 1 antenna each
- *  - 1:N_AP configuration, where A supports 1 antenna, B supports N_AP antennas, and
- *    N_AP is a value in the range [2, 4]
- *  - N_AP:1 configuration, where A supports N_AP antennas, B supports 1 antenna, and
- *    N_AP is a value in the range [2, 4]
- *  - 2:2 configuration, where both A and B support 2 antennas and N_AP = 4
- */
-enum bt_le_cs_test_tone_antenna_config_selection {
-	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_ONE = BT_HCI_OP_LE_CS_TEST_ACI_0,
-	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_TWO = BT_HCI_OP_LE_CS_TEST_ACI_1,
-	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_THREE = BT_HCI_OP_LE_CS_TEST_ACI_2,
-	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_FOUR = BT_HCI_OP_LE_CS_TEST_ACI_3,
-	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_FIVE = BT_HCI_OP_LE_CS_TEST_ACI_4,
-	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_SIX = BT_HCI_OP_LE_CS_TEST_ACI_5,
-	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_SEVEN = BT_HCI_OP_LE_CS_TEST_ACI_6,
-	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_EIGHT = BT_HCI_OP_LE_CS_TEST_ACI_7,
-};
-
 /** CS Test Initiator SNR control options */
-enum bt_le_cs_test_initiator_snr_control {
-	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_18,
-	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_21,
-	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_24,
-	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_27,
-	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_30,
-	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_NOT_USED,
+enum bt_le_cs_initiator_snr_control {
+	BT_LE_CS_INITIATOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_18,
+	BT_LE_CS_INITIATOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_21,
+	BT_LE_CS_INITIATOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_24,
+	BT_LE_CS_INITIATOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_27,
+	BT_LE_CS_INITIATOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_30,
+	BT_LE_CS_INITIATOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_INITIATOR_SNR_NOT_USED,
 };
 
 /** CS Test Reflector SNR control options */
-enum bt_le_cs_test_reflector_snr_control {
-	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_18,
-	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_21,
-	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_24,
-	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_27,
-	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_30,
-	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_NOT_USED,
+enum bt_le_cs_reflector_snr_control {
+	BT_LE_CS_REFLECTOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_18,
+	BT_LE_CS_REFLECTOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_21,
+	BT_LE_CS_REFLECTOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_24,
+	BT_LE_CS_REFLECTOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_27,
+	BT_LE_CS_REFLECTOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_30,
+	BT_LE_CS_REFLECTOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_REFLECTOR_SNR_NOT_USED,
 };
 
 /** CS Test Override 3 T_PM Tone Extension */
@@ -400,11 +362,11 @@ struct bt_le_cs_test_param {
 	/** Antenna Configuration Index used during antenna switching during
 	 *  the tone phases of CS steps.
 	 */
-	enum bt_le_cs_test_tone_antenna_config_selection tone_antenna_config_selection;
+	enum bt_conn_le_cs_tone_antenna_config_selection tone_antenna_config_selection;
 	/** Initiator SNR control options */
-	enum bt_le_cs_test_initiator_snr_control initiator_snr_control;
+	enum bt_le_cs_initiator_snr_control initiator_snr_control;
 	/** Reflector SNR control options */
-	enum bt_le_cs_test_reflector_snr_control reflector_snr_control;
+	enum bt_le_cs_reflector_snr_control reflector_snr_control;
 	/** Determines octets 14 and 15 of the initial value of the DRBG nonce. */
 	uint16_t drbg_nonce;
 
@@ -736,6 +698,178 @@ void bt_le_cs_step_data_parse(struct net_buf_simple *step_data_buf,
 			      bool (*func)(struct bt_le_cs_subevent_step *step, void *user_data),
 			      void *user_data);
 
+/** @brief CS Security Enable
+ *
+ * This commmand is used to start or restart the Channel Sounding Security
+ * Start procedure in the local Controller for the ACL connection identified
+ * in the conn parameter.
+ *
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ *
+ * @param conn   Connection Object.
+ *
+ * @return Zero on success or (negative) error code on failure.
+ */
+int bt_le_cs_security_enable(struct bt_conn *conn);
+
+struct bt_le_cs_procedure_enable_param {
+	uint8_t config_id;
+	enum bt_conn_le_cs_procedure_enable_state enable;
+};
+
+/** @brief CS Procedure Enable
+ *
+ *  This command is used to enable or disable the scheduling of CS procedures
+ *  by the local Controller, with the remote device identified in the conn
+ *  parameter.
+ *
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ *
+ * @param conn   Connection Object.
+ * @param params Parameters for the CS Procedure Enable command.
+ *
+ * @return Zero on success or (negative) error code on failure.
+ */
+int bt_le_cs_procedure_enable(struct bt_conn *conn,
+			      const struct bt_le_cs_procedure_enable_param *params);
+
+enum bt_le_cs_procedure_phy {
+	BT_LE_CS_PROCEDURE_PHY_1M = BT_HCI_OP_LE_CS_PROCEDURE_PHY_1M,
+	BT_LE_CS_PROCEUDRE_PHY_2M = BT_HCI_OP_LE_CS_PROCEDURE_PHY_2M,
+	BT_LE_CS_PROCEDURE_PHY_CODED_S8 = BT_HCI_OP_LE_CS_PROCEDURE_PHY_CODED_S8,
+	BT_LE_CS_PROCEDURE_PHY_CODED_S2 = BT_HCI_OP_LE_CS_PROCEDURE_PHY_CODED_S2,
+};
+
+#define BT_LE_CS_PROCEDURE_PREFERRED_PEER_ANTENNA_1 BIT(0)
+#define BT_LE_CS_PROCEDURE_PREFERRED_PEER_ANTENNA_2 BIT(1)
+#define BT_LE_CS_PROCEDURE_PREFERRED_PEER_ANTENNA_3 BIT(2)
+#define BT_LE_CS_PROCEDURE_PREFERRED_PEER_ANTENNA_4 BIT(3)
+
+struct bt_le_cs_set_procedure_parameters_param {
+	/* The ID associated with the desired configuration (0 to 3) */
+	uint8_t config_id;
+
+	/* Max. duration for each CS procedure, where T = N * 0.625 ms (0x0001 to 0xFFFF) */
+	uint16_t max_procedure_len;
+
+	/* Min. number of connection events between consecutive CS procedures (0x0001 to 0xFFFF) */
+	uint16_t min_procedure_interval;
+
+	/* Max. number of connection events between consecutive CS procedures (0x0001 to 0xFFFF) */
+	uint16_t max_procedure_interval;
+
+	/* Max. number of procedures to be scheduled (0x0000 for no limit; otherwise 0x0001
+	 * to 0xFFFF)
+	 */
+	uint16_t max_procedure_count;
+
+	/* Min. suggested duration for each CS subevent in microseconds (1250 us to 4 s) */
+	uint32_t min_subevent_len;
+
+	/* Max. suggested duration for each CS subevent in microseconds (1250 us to 4 s) */
+	uint32_t max_subevent_len;
+
+	/* Antenna configuration index */
+	enum bt_conn_le_cs_tone_antenna_config_selection tone_antenna_config_selection;
+
+	/* Phy */
+	enum bt_le_cs_procedure_phy phy;
+
+	/* Transmit power delta, in signed dB, to indicate the recommended difference between the
+	 * remote device's power level for the CS tones and RTT packets and the existing power
+	 * level for the Phy indicated by the Phy parameter (0x80 for no recommendation)
+	 */
+	int8_t tx_power_delta;
+
+	/* Preferred peer antenna (Bitmask of BT_LE_CS_PROCEDURE_PREFERRED_PEER_ANTENNA_*) */
+	uint8_t preferred_peer_antenna;
+
+	/* Initiator SNR control adjustment */
+	enum bt_le_cs_initiator_snr_control snr_control_initiator;
+
+	/* Reflector SNR control adjustment */
+	enum bt_le_cs_reflector_snr_control snr_control_reflector;
+};
+
+/** @brief CS Set Procedure Parameters
+ *
+ * This command is used to set the parameters for the scheduling of one
+ * or more CS procedures by the local controller.
+ *
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ *
+ * @param conn Connection Object.
+ * @param params Parameters for the CS Set Procedure Parameters command.
+ *
+ * @return Zero on success or (negative) error code on failure.
+ */
+int bt_le_cs_set_procedure_parameters(struct bt_conn *conn,
+				      const struct bt_le_cs_set_procedure_parameters_param *params);
+
+/** @brief CS Set Channel Classification
+ *
+ * This command is used to update the channel classification based on
+ * its local information.
+ *
+ * The nth bitfield (in the range 0 to 78) contains the value for the CS
+ * channel index n. Channel Enabled = 1; Channel Disabled = 0.
+ *
+ * Channels n = 0, 1, 23, 24, 25, 77, and 78 shall be reserved for future
+ * use and shall be set to zero. At least 15 channels shall be enabled.
+ *
+ * The most significant bit (bit 79) is reserved for future use.
+ *
+ * @note To use this API, @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ *
+ * @param channel_classification Bit fields
+ *
+ * @return Zero on success or (negative) error code on failure.
+ */
+int bt_le_cs_set_channel_classification(uint8_t channel_classification[10]);
+
+/** @brief CS Read Local Supported Capabilities
+ *
+ *  This command is used to read the CS capabilities that are supported
+ *  by the local Controller.
+ *
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ *
+ * @param ret Return values for the CS Procedure Enable command.
+ *
+ * @return Zero on success or (negative) error code on failure.
+ */
+int bt_le_cs_read_local_supported_capabilities(struct bt_conn_le_cs_capabilities *ret);
+
+/** @brief CS Write Cached Remote Supported Capabilities
+ *
+ *  This command is used to write the cached copy of the CS capabilities
+ *  that are supported by the remote Controller for the connection
+ *  identified.
+ *
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ *
+ * @param conn   Connection Object.
+ * @param params Parameters for the CS Write Cached Remote Supported Capabilities command.
+ *
+ * @return Zero on success or (negative) error code on failure.
+ */
+int bt_le_cs_write_cached_remote_supported_capabilities(
+	struct bt_conn *conn, const struct bt_conn_le_cs_capabilities *params);
+
+/** @brief CS Write Cached Remote FAE Table
+ *
+ *  This command is used to write a cached copy of the per-channel mode-0
+ *  Frequency Actuation Error table of the remote device in the local Controller.
+ *
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ *
+ * @param conn   Connection Object.
+ * @param remote_fae_table Per-channel mode-0 FAE table of the local Controller
+ *
+ * @return Zero on success or (negative) error code on failure.
+ */
+int bt_le_cs_write_cached_remote_fae_table(struct bt_conn *conn, uint8_t remote_fae_table[72]);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 61f4747a7a8..1b22e172fcc 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -2402,12 +2402,71 @@ struct bt_hci_cp_le_tx_test_v4_tx_power {
 	int8_t tx_power;
 } __packed;
 
+#define BT_HCI_OP_LE_CS_READ_LOCAL_SUPPORTED_CAPABILITIES BT_OP(BT_OGF_LE, 0x0089) /* 0x2089 */
+
+struct bt_hci_rp_le_read_local_supported_capabilities {
+	uint8_t status;
+	uint8_t num_config_supported;
+	uint16_t max_consecutive_procedures_supported;
+	uint8_t num_antennas_supported;
+	uint8_t max_antenna_paths_supported;
+	uint8_t roles_supported;
+	uint8_t modes_supported;
+	uint8_t rtt_capability;
+	uint8_t rtt_aa_only_n;
+	uint8_t rtt_sounding_n;
+	uint8_t rtt_random_payload_n;
+	uint16_t nadm_sounding_capability;
+	uint16_t nadm_random_capability;
+	uint8_t cs_sync_phys_supported;
+	uint16_t subfeatures_supported;
+	uint16_t t_ip1_times_supported;
+	uint16_t t_ip2_times_supported;
+	uint16_t t_fcs_times_supported;
+	uint16_t t_pm_times_supported;
+	uint8_t t_sw_time_supported;
+	uint8_t tx_snr_capability;
+} __packed;
+
 #define BT_HCI_OP_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES BT_OP(BT_OGF_LE, 0x008A) /* 0x208A */
 
 struct bt_hci_cp_le_read_remote_supported_capabilities {
 	uint16_t handle;
 } __packed;
 
+#define BT_HCI_OP_LE_CS_WRITE_CACHED_REMOTE_SUPPORTED_CAPABILITIES \
+	BT_OP(BT_OGF_LE, 0x008B) /* 0x208B */
+
+struct bt_hci_cp_le_write_cached_remote_supported_capabilities {
+	uint16_t handle;
+	uint8_t num_config_supported;
+	uint16_t max_consecutive_procedures_supported;
+	uint8_t num_antennas_supported;
+	uint8_t max_antenna_paths_supported;
+	uint8_t roles_supported;
+	uint8_t modes_supported;
+	uint8_t rtt_capability;
+	uint8_t rtt_aa_only_n;
+	uint8_t rtt_sounding_n;
+	uint8_t rtt_random_payload_n;
+	uint16_t nadm_sounding_capability;
+	uint16_t nadm_random_capability;
+	uint8_t cs_sync_phys_supported;
+	uint16_t subfeatures_supported;
+	uint16_t t_ip1_times_supported;
+	uint16_t t_ip2_times_supported;
+	uint16_t t_fcs_times_supported;
+	uint16_t t_pm_times_supported;
+	uint8_t t_sw_time_supported;
+	uint8_t tx_snr_capability;
+} __packed;
+
+#define BT_HCI_OP_LE_CS_SECURITY_ENABLE BT_OP(BT_OGF_LE, 0x008C) /* 0x208C */
+
+struct bt_hci_cp_le_security_enable {
+	uint16_t handle;
+} __packed;
+
 #define BT_HCI_OP_LE_CS_SET_DEFAULT_SETTINGS BT_OP(BT_OGF_LE, 0x008D) /* 0x208D */
 
 #define BT_HCI_OP_LE_CS_INITIATOR_ROLE_MASK BIT(0)
@@ -2436,6 +2495,49 @@ struct bt_hci_cp_le_read_remote_fae_table {
 	uint16_t handle;
 } __packed;
 
+#define BT_HCI_OP_LE_CS_WRITE_CACHED_REMOTE_FAE_TABLE BT_OP(BT_OGF_LE, 0x008F) /* 0x208F */
+
+struct bt_hci_cp_le_write_cached_remote_fae_table {
+	uint16_t handle;
+	uint8_t remote_fae_table[72];
+} __packed;
+
+#define BT_HCI_OP_LE_CS_SET_CHANNEL_CLASSIFICATION BT_OP(BT_OGF_LE, 0x0092) /* 0x2092 */
+
+#define BT_HCI_OP_LE_CS_SET_PROCEDURE_PARAMETERS BT_OP(BT_OGF_LE, 0x0093) /* 0x2093 */
+
+#define BT_HCI_OP_LE_CS_PROCEDURE_PHY_1M       0x01
+#define BT_HCI_OP_LE_CS_PROCEDURE_PHY_2M       0x02
+#define BT_HCI_OP_LE_CS_PROCEDURE_PHY_CODED_S8 0x03
+#define BT_HCI_OP_LE_CS_PROCEDURE_PHY_CODED_S2 0x04
+
+struct bt_hci_cp_le_set_procedure_parameters {
+	uint16_t handle;
+	uint8_t config_id;
+	uint16_t max_procedure_len;
+	uint16_t min_procedure_interval;
+	uint16_t max_procedure_interval;
+	uint16_t max_procedure_count;
+	uint8_t min_subevent_len[3];
+	uint8_t max_subevent_len[3];
+	uint8_t tone_antenna_config_selection;
+	uint8_t phy;
+	uint8_t tx_power_delta;
+	uint8_t preferred_peer_antenna;
+	uint8_t snr_control_initiator;
+	uint8_t snr_control_reflector;
+} __packed;
+
+#define BT_HCI_OP_LE_CS_PROCEDURE_ENABLE BT_OP(BT_OGF_LE, 0x0094) /* 0x2094 */
+
+#define BT_HCI_OP_LE_CS_PROCEDURES_DISABLED 0x00
+#define BT_HCI_OP_LE_CS_PROCEDURES_ENABLED  0x01
+
+struct bt_hci_cp_le_procedure_enable {
+	uint16_t handle;
+	uint8_t config_id;
+	uint8_t enable;
+} __packed;
 
 #define BT_HCI_OP_LE_CS_TEST BT_OP(BT_OGF_LE, 0x0095) /* 0x2095 */
 
@@ -2466,28 +2568,28 @@ struct bt_hci_cp_le_read_remote_fae_table {
 #define BT_HCI_OP_LE_CS_TEST_MINIMIZE_TX_POWER 0x7E
 #define BT_HCI_OP_LE_CS_TEST_MAXIMIZE_TX_POWER 0x7F
 
-#define BT_HCI_OP_LE_CS_TEST_ACI_0 0x0
-#define BT_HCI_OP_LE_CS_TEST_ACI_1 0x1
-#define BT_HCI_OP_LE_CS_TEST_ACI_2 0x2
-#define BT_HCI_OP_LE_CS_TEST_ACI_3 0x3
-#define BT_HCI_OP_LE_CS_TEST_ACI_4 0x4
-#define BT_HCI_OP_LE_CS_TEST_ACI_5 0x5
-#define BT_HCI_OP_LE_CS_TEST_ACI_6 0x6
-#define BT_HCI_OP_LE_CS_TEST_ACI_7 0x7
-
-#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_18 0x0
-#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_21 0x1
-#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_24 0x2
-#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_27 0x3
-#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_30 0x4
-#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_NOT_USED 0xFF
-
-#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_18 0x0
-#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_21 0x1
-#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_24 0x2
-#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_27 0x3
-#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_30 0x4
-#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_NOT_USED 0xFF
+#define BT_HCI_OP_LE_CS_ACI_0 0x0
+#define BT_HCI_OP_LE_CS_ACI_1 0x1
+#define BT_HCI_OP_LE_CS_ACI_2 0x2
+#define BT_HCI_OP_LE_CS_ACI_3 0x3
+#define BT_HCI_OP_LE_CS_ACI_4 0x4
+#define BT_HCI_OP_LE_CS_ACI_5 0x5
+#define BT_HCI_OP_LE_CS_ACI_6 0x6
+#define BT_HCI_OP_LE_CS_ACI_7 0x7
+
+#define BT_HCI_OP_LE_CS_INITIATOR_SNR_18 0x0
+#define BT_HCI_OP_LE_CS_INITIATOR_SNR_21 0x1
+#define BT_HCI_OP_LE_CS_INITIATOR_SNR_24 0x2
+#define BT_HCI_OP_LE_CS_INITIATOR_SNR_27 0x3
+#define BT_HCI_OP_LE_CS_INITIATOR_SNR_30 0x4
+#define BT_HCI_OP_LE_CS_INITIATOR_SNR_NOT_USED 0xFF
+
+#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_18 0x0
+#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_21 0x1
+#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_24 0x2
+#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_27 0x3
+#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_30 0x4
+#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_NOT_USED 0xFF
 
 #define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_0_MASK BIT(0)
 #define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_2_MASK BIT(2)
@@ -3438,6 +3540,12 @@ struct bt_hci_evt_le_cs_read_remote_fae_table_complete {
 #define BT_HCI_LE_CS_CONFIG_ACTION_REMOVED 0x00
 #define BT_HCI_LE_CS_CONFIG_ACTION_CREATED 0x01
 
+#define BT_HCI_EVT_LE_CS_SECURITY_ENABLE_COMPLETE 0x2E
+struct bt_hci_evt_le_cs_security_enable_complete {
+	uint8_t status;
+	uint16_t handle;
+} __packed;
+
 #define BT_HCI_EVT_LE_CS_CONFIG_COMPLETE 0x2F
 struct bt_hci_evt_le_cs_config_complete {
 	uint8_t status;
@@ -3706,6 +3814,23 @@ struct bt_hci_evt_le_cs_test_end_complete {
 	uint8_t status;
 } __packed;
 
+#define BT_HCI_EVT_LE_CS_PROCEDURE_ENABLE_COMPLETE 0x30
+struct bt_hci_evt_le_cs_procedure_enable_complete {
+	uint8_t status;
+	uint16_t handle;
+	uint8_t config_id;
+	uint8_t state;
+	uint8_t tone_antenna_config_selection;
+	uint8_t selected_tx_power;
+	uint8_t subevent_len[3];
+	uint8_t subevents_per_event;
+	uint16_t subevent_interval;
+	uint16_t event_interval;
+	uint16_t procedure_interval;
+	uint16_t procedure_count;
+	uint16_t max_procedure_len;
+} __packed;
+
 /* Event mask bits */
 
 #define BT_EVT_BIT(n) (1ULL << (n))
@@ -3797,7 +3922,9 @@ struct bt_hci_evt_le_cs_test_end_complete {
 
 #define BT_EVT_MASK_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE BT_EVT_BIT(43)
 #define BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE              BT_EVT_BIT(44)
+#define BT_EVT_MASK_LE_CS_SECURITY_ENABLE_COMPLETE                    BT_EVT_BIT(45)
 #define BT_EVT_MASK_LE_CS_CONFIG_COMPLETE                             BT_EVT_BIT(46)
+#define BT_EVT_MASK_LE_CS_PROCEDURE_ENABLE_COMPLETE                   BT_EVT_BIT(47)
 #define BT_EVT_MASK_LE_CS_SUBEVENT_RESULT                             BT_EVT_BIT(48)
 #define BT_EVT_MASK_LE_CS_SUBEVENT_RESULT_CONTINUE                    BT_EVT_BIT(49)
 #define BT_EVT_MASK_LE_CS_TEST_END_COMPLETE                           BT_EVT_BIT(50)
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index bfb29b31cd9..40f7d7906cc 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -3400,6 +3400,41 @@ void notify_cs_config_removed(struct bt_conn *conn, uint8_t config_id)
 	}
 }
 
+void notify_cs_security_enable_available(struct bt_conn *conn)
+{
+	struct bt_conn_cb *callback;
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
+		if (callback->le_cs_security_enabled) {
+			callback->le_cs_security_enabled(conn);
+		}
+	}
+
+	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
+		if (cb->le_cs_security_enabled) {
+			cb->le_cs_security_enabled(conn);
+		}
+	}
+}
+
+void notify_cs_procedure_enable_available(struct bt_conn *conn,
+					  struct bt_conn_le_cs_procedure_enable_complete *params)
+{
+	struct bt_conn_cb *callback;
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
+		if (callback->le_cs_procedure_enabled) {
+			callback->le_cs_procedure_enabled(conn, params);
+		}
+	}
+
+	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
+		if (cb->le_cs_procedure_enabled) {
+			cb->le_cs_procedure_enabled(conn, params);
+		}
+	}
+}
+
 void notify_cs_subevent_result(struct bt_conn *conn, struct bt_conn_le_cs_subevent_result *result)
 {
 	struct bt_conn_cb *callback;
diff --git a/subsys/bluetooth/host/conn_internal.h b/subsys/bluetooth/host/conn_internal.h
index ac2141c1aad..6b6c97b1902 100644
--- a/subsys/bluetooth/host/conn_internal.h
+++ b/subsys/bluetooth/host/conn_internal.h
@@ -506,6 +506,11 @@ void notify_cs_config_removed(struct bt_conn *conn, uint8_t config_id);
 
 void notify_cs_subevent_result(struct bt_conn *conn, struct bt_conn_le_cs_subevent_result *result);
 
+void notify_cs_security_enable_available(struct bt_conn *conn);
+
+void notify_cs_procedure_enable_available(struct bt_conn *conn,
+					  struct bt_conn_le_cs_procedure_enable_complete *params);
+
 #if defined(CONFIG_BT_SMP)
 /* If role specific LTK is present */
 bool bt_conn_ltk_present(const struct bt_conn *conn);
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index 5a09c017261..b22877d31b8 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -877,6 +877,378 @@ int bt_le_cs_remove_config(struct bt_conn *conn, uint8_t config_id)
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_REMOVE_CONFIG, buf, NULL);
 }
 
+int bt_le_cs_security_enable(struct bt_conn *conn)
+{
+	struct bt_hci_cp_le_security_enable *cp;
+	struct net_buf *buf;
+
+	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_SECURITY_ENABLE, sizeof(*cp));
+	if (!buf) {
+		return -ENOBUFS;
+	}
+
+	cp = net_buf_add(buf, sizeof(*cp));
+	cp->handle = sys_cpu_to_le16(conn->handle);
+
+	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_SECURITY_ENABLE, buf, NULL);
+}
+
+int bt_le_cs_procedure_enable(struct bt_conn *conn,
+			      const struct bt_le_cs_procedure_enable_param *params)
+{
+	struct bt_hci_cp_le_procedure_enable *cp;
+	struct net_buf *buf;
+
+	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_PROCEDURE_ENABLE, sizeof(*cp));
+	if (!buf) {
+		return -ENOBUFS;
+	}
+
+	cp = net_buf_add(buf, sizeof(*cp));
+	cp->handle = sys_cpu_to_le16(conn->handle);
+	cp->config_id = params->config_id;
+	cp->enable = params->enable;
+
+	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_PROCEDURE_ENABLE, buf, NULL);
+}
+
+int bt_le_cs_set_procedure_parameters(struct bt_conn *conn,
+				      const struct bt_le_cs_set_procedure_parameters_param *params)
+{
+	struct bt_hci_cp_le_set_procedure_parameters *cp;
+	struct net_buf *buf;
+
+	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_SET_PROCEDURE_PARAMETERS, sizeof(*cp));
+	if (!buf) {
+		return -ENOBUFS;
+	}
+
+	cp = net_buf_add(buf, sizeof(*cp));
+	cp->handle = sys_cpu_to_le16(conn->handle);
+	cp->config_id = params->config_id;
+	cp->max_procedure_len = sys_cpu_to_le16(params->max_procedure_len);
+	cp->min_procedure_interval = sys_cpu_to_le16(params->min_procedure_interval);
+	cp->max_procedure_interval = sys_cpu_to_le16(params->max_procedure_interval);
+	cp->max_procedure_count = sys_cpu_to_le16(params->max_procedure_count);
+	sys_put_le24(params->min_subevent_len, cp->min_subevent_len);
+	sys_put_le24(params->max_subevent_len, cp->max_subevent_len);
+	cp->tone_antenna_config_selection = params->tone_antenna_config_selection;
+	cp->phy = params->phy;
+	cp->tx_power_delta = params->tx_power_delta;
+	cp->preferred_peer_antenna = params->preferred_peer_antenna;
+	cp->snr_control_initiator = params->snr_control_initiator;
+	cp->snr_control_reflector = params->snr_control_reflector;
+
+	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_SET_PROCEDURE_PARAMETERS, buf, NULL);
+}
+
+int bt_le_cs_set_channel_classification(uint8_t channel_classification[10])
+{
+	uint8_t *cp;
+	struct net_buf *buf;
+
+	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_SET_CHANNEL_CLASSIFICATION, 10);
+	if (!buf) {
+		return -ENOBUFS;
+	}
+
+	cp = net_buf_add(buf, 10);
+	memcpy(cp, channel_classification, 10);
+
+	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_SET_CHANNEL_CLASSIFICATION, buf, NULL);
+}
+
+int bt_le_cs_read_local_supported_capabilities(struct bt_conn_le_cs_capabilities *ret)
+{
+	struct bt_hci_rp_le_read_local_supported_capabilities *rp;
+	struct net_buf *rsp;
+
+	int err =
+		bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_READ_LOCAL_SUPPORTED_CAPABILITIES, NULL, &rsp);
+
+	if (err) {
+		return err;
+	}
+
+	rp = (void *)rsp->data;
+
+	uint8_t status = rp->status;
+
+	ret->num_config_supported = rp->num_config_supported;
+	ret->max_consecutive_procedures_supported =
+		sys_le16_to_cpu(rp->max_consecutive_procedures_supported);
+	ret->num_antennas_supported = rp->num_antennas_supported;
+	ret->max_antenna_paths_supported = rp->max_antenna_paths_supported;
+
+	ret->initiator_supported = rp->roles_supported & BT_HCI_LE_CS_INITIATOR_ROLE_MASK;
+	ret->reflector_supported = rp->roles_supported & BT_HCI_LE_CS_REFLECTOR_ROLE_MASK;
+	ret->mode_3_supported = rp->modes_supported & BT_HCI_LE_CS_MODES_SUPPORTED_MODE_3_MASK;
+
+	ret->rtt_aa_only_n = rp->rtt_aa_only_n;
+	ret->rtt_sounding_n = rp->rtt_sounding_n;
+	ret->rtt_random_payload_n = rp->rtt_random_payload_n;
+
+	if (rp->rtt_aa_only_n) {
+		if (rp->rtt_capability & BT_HCI_LE_CS_RTT_AA_ONLY_N_10NS_MASK) {
+			ret->rtt_aa_only_precision = BT_CONN_LE_CS_RTT_AA_ONLY_10NS;
+		} else {
+			ret->rtt_aa_only_precision = BT_CONN_LE_CS_RTT_AA_ONLY_150NS;
+		}
+	} else {
+		ret->rtt_aa_only_precision = BT_CONN_LE_CS_RTT_AA_ONLY_NOT_SUPP;
+	}
+
+	if (rp->rtt_sounding_n) {
+		if (rp->rtt_capability & BT_HCI_LE_CS_RTT_SOUNDING_N_10NS_MASK) {
+			ret->rtt_sounding_precision = BT_CONN_LE_CS_RTT_SOUNDING_10NS;
+		} else {
+			ret->rtt_sounding_precision = BT_CONN_LE_CS_RTT_SOUNDING_150NS;
+		}
+	} else {
+		ret->rtt_sounding_precision = BT_CONN_LE_CS_RTT_SOUNDING_NOT_SUPP;
+	}
+
+	if (rp->rtt_random_payload_n) {
+		if (rp->rtt_capability & BT_HCI_LE_CS_RTT_RANDOM_PAYLOAD_N_10NS_MASK) {
+			ret->rtt_random_payload_precision = BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_10NS;
+		} else {
+			ret->rtt_random_payload_precision = BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_150NS;
+		}
+	} else {
+		ret->rtt_random_payload_precision = BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_NOT_SUPP;
+	}
+
+	ret->phase_based_nadm_sounding_supported =
+		sys_le16_to_cpu(rp->nadm_sounding_capability) &
+		BT_HCI_LE_CS_NADM_SOUNDING_CAPABILITY_PHASE_BASED_MASK;
+
+	ret->phase_based_nadm_random_supported =
+		sys_le16_to_cpu(rp->nadm_random_capability) &
+		BT_HCI_LE_CS_NADM_RANDOM_CAPABILITY_PHASE_BASED_MASK;
+
+	ret->cs_sync_2m_phy_supported = rp->cs_sync_phys_supported & BT_HCI_LE_CS_SYNC_PHYS_2M_MASK;
+
+	ret->cs_sync_2m_2bt_phy_supported =
+		rp->cs_sync_phys_supported & BT_HCI_LE_CS_SYNC_PHYS_2M_2BT_MASK;
+
+	ret->cs_without_fae_supported =
+		sys_le16_to_cpu(rp->subfeatures_supported) & BT_HCI_LE_CS_SUBFEATURE_NO_TX_FAE_MASK;
+
+	ret->chsel_alg_3c_supported = sys_le16_to_cpu(rp->subfeatures_supported) &
+				      BT_HCI_LE_CS_SUBFEATURE_CHSEL_ALG_3C_MASK;
+
+	ret->pbr_from_rtt_sounding_seq_supported =
+		sys_le16_to_cpu(rp->subfeatures_supported) &
+		BT_HCI_LE_CS_SUBFEATURE_PBR_FROM_RTT_SOUNDING_SEQ_MASK;
+
+	ret->t_ip1_times_supported = sys_le16_to_cpu(rp->t_ip1_times_supported);
+	ret->t_ip2_times_supported = sys_le16_to_cpu(rp->t_ip2_times_supported);
+	ret->t_fcs_times_supported = sys_le16_to_cpu(rp->t_fcs_times_supported);
+	ret->t_pm_times_supported = sys_le16_to_cpu(rp->t_pm_times_supported);
+
+	ret->t_sw_time = rp->t_sw_time_supported;
+	ret->tx_snr_capability = rp->tx_snr_capability;
+
+	net_buf_unref(rsp);
+	return status;
+}
+
+int bt_le_cs_write_cached_remote_supported_capabilities(
+	struct bt_conn *conn, const struct bt_conn_le_cs_capabilities *params)
+{
+	struct bt_hci_cp_le_write_cached_remote_supported_capabilities *cp;
+	struct net_buf *buf;
+
+	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_WRITE_CACHED_REMOTE_SUPPORTED_CAPABILITIES,
+				sizeof(*cp));
+
+	if (!buf) {
+		return -ENOBUFS;
+	}
+
+	cp = net_buf_add(buf, sizeof(*cp));
+
+	cp->handle = sys_cpu_to_le16(conn->handle);
+
+	cp->num_config_supported = params->num_config_supported;
+
+	cp->max_consecutive_procedures_supported =
+		sys_cpu_to_le16(params->max_consecutive_procedures_supported);
+
+	cp->num_antennas_supported = params->num_antennas_supported;
+	cp->max_antenna_paths_supported = params->max_antenna_paths_supported;
+
+	cp->roles_supported = 0;
+	if (params->initiator_supported) {
+		cp->roles_supported |= BT_HCI_LE_CS_INITIATOR_ROLE_MASK;
+	}
+	if (params->reflector_supported) {
+		cp->roles_supported |= BT_HCI_LE_CS_REFLECTOR_ROLE_MASK;
+	}
+
+	cp->modes_supported = 0;
+	if (params->mode_3_supported) {
+		cp->modes_supported |= BT_HCI_LE_CS_MODES_SUPPORTED_MODE_3_MASK;
+	}
+
+	cp->rtt_aa_only_n = params->rtt_aa_only_n;
+	cp->rtt_sounding_n = params->rtt_sounding_n;
+	cp->rtt_random_payload_n = params->rtt_random_payload_n;
+
+	cp->rtt_capability = 0;
+	if (params->rtt_aa_only_precision == BT_CONN_LE_CS_RTT_AA_ONLY_10NS) {
+		cp->rtt_capability |= BT_HCI_LE_CS_RTT_AA_ONLY_N_10NS_MASK;
+	}
+
+	if (params->rtt_sounding_precision == BT_CONN_LE_CS_RTT_SOUNDING_10NS) {
+		cp->rtt_capability |= BT_HCI_LE_CS_RTT_SOUNDING_N_10NS_MASK;
+	}
+
+	if (params->rtt_random_payload_precision == BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_10NS) {
+		cp->rtt_capability |= BT_HCI_LE_CS_RTT_RANDOM_PAYLOAD_N_10NS_MASK;
+	}
+
+	cp->nadm_sounding_capability = 0;
+	if (params->phase_based_nadm_sounding_supported) {
+		cp->nadm_sounding_capability |=
+			sys_cpu_to_le16(BT_HCI_LE_CS_NADM_SOUNDING_CAPABILITY_PHASE_BASED_MASK);
+	}
+
+	cp->nadm_random_capability = 0;
+	if (params->phase_based_nadm_random_supported) {
+		cp->nadm_random_capability |=
+			sys_cpu_to_le16(BT_HCI_LE_CS_NADM_RANDOM_CAPABILITY_PHASE_BASED_MASK);
+	}
+
+	cp->cs_sync_phys_supported = 0;
+	if (params->cs_sync_2m_phy_supported) {
+		cp->cs_sync_phys_supported |= BT_HCI_LE_CS_SYNC_PHYS_2M_MASK;
+	}
+	if (params->cs_sync_2m_2bt_phy_supported) {
+		cp->cs_sync_phys_supported |= BT_HCI_LE_CS_SYNC_PHYS_2M_2BT_MASK;
+	}
+
+	cp->subfeatures_supported = 0;
+	if (params->cs_without_fae_supported) {
+		cp->subfeatures_supported |=
+			sys_cpu_to_le16(BT_HCI_LE_CS_SUBFEATURE_NO_TX_FAE_MASK);
+	}
+	if (params->chsel_alg_3c_supported) {
+		cp->subfeatures_supported |=
+			sys_cpu_to_le16(BT_HCI_LE_CS_SUBFEATURE_CHSEL_ALG_3C_MASK);
+	}
+	if (params->pbr_from_rtt_sounding_seq_supported) {
+		cp->subfeatures_supported |=
+			sys_cpu_to_le16(BT_HCI_LE_CS_SUBFEATURE_PBR_FROM_RTT_SOUNDING_SEQ_MASK);
+	}
+
+	cp->t_ip1_times_supported = sys_cpu_to_le16(params->t_ip1_times_supported);
+	cp->t_ip2_times_supported = sys_cpu_to_le16(params->t_ip2_times_supported);
+	cp->t_fcs_times_supported = sys_cpu_to_le16(params->t_fcs_times_supported);
+	cp->t_pm_times_supported = sys_cpu_to_le16(params->t_pm_times_supported);
+	cp->t_sw_time_supported = params->t_sw_time;
+	cp->tx_snr_capability = params->tx_snr_capability;
+
+	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_WRITE_CACHED_REMOTE_SUPPORTED_CAPABILITIES, buf,
+				    NULL);
+}
+
+int bt_le_cs_write_cached_remote_fae_table(struct bt_conn *conn, uint8_t remote_fae_table[72])
+{
+	struct bt_hci_cp_le_write_cached_remote_fae_table *cp;
+	struct net_buf *buf;
+
+	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_WRITE_CACHED_REMOTE_FAE_TABLE, sizeof(*cp));
+	if (!buf) {
+		return -ENOBUFS;
+	}
+
+	cp = net_buf_add(buf, sizeof(*cp));
+
+	cp->handle = sys_cpu_to_le16(conn->handle);
+	memcpy(cp->remote_fae_table, remote_fae_table, sizeof(cp->remote_fae_table));
+
+	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_WRITE_CACHED_REMOTE_FAE_TABLE, buf, NULL);
+}
+
+void bt_hci_le_cs_security_enable_complete(struct net_buf *buf)
+{
+	struct bt_conn *conn;
+
+	struct bt_hci_evt_le_cs_security_enable_complete *evt;
+
+	if (buf->len < sizeof(*evt)) {
+		LOG_ERR("Unexpected end of buffer");
+		return;
+	}
+
+	evt = net_buf_pull_mem(buf, sizeof(*evt));
+	if (evt->status) {
+		LOG_INF("Security Enable failed with status 0x%02X", evt->status);
+		return;
+	}
+
+	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->handle), BT_CONN_TYPE_LE);
+	if (!conn) {
+		LOG_ERR("Can't lookup conn handle when reading Security Enable Complete event");
+		return;
+	}
+
+	notify_cs_security_enable_available(conn);
+
+	bt_conn_unref(conn);
+}
+
+void bt_hci_le_cs_procedure_enable_complete(struct net_buf *buf)
+{
+	struct bt_conn *conn;
+
+	struct bt_hci_evt_le_cs_procedure_enable_complete *evt;
+	struct bt_conn_le_cs_procedure_enable_complete params;
+
+	if (buf->len < sizeof(*evt)) {
+		LOG_ERR("Unexpected end of buffer");
+		return;
+	}
+
+	evt = net_buf_pull_mem(buf, sizeof(*evt));
+	if (evt->status) {
+		LOG_INF("Procedure Enable failed with status 0x%02X", evt->status);
+		return;
+	}
+
+	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->handle), BT_CONN_TYPE_LE);
+	if (!conn) {
+		LOG_ERR("Can't lookup conn handle when reading Procedure Enable Complete event");
+		return;
+	}
+
+	if (evt->state == BT_HCI_OP_LE_CS_PROCEDURES_DISABLED) {
+		struct net_buf *reassembly_buf = get_reassembly_buf(conn->handle, false);
+
+		if (reassembly_buf) {
+			LOG_WRN("De-allocating a dangling reassembly buffer");
+			free_reassembly_buf(&reassembly_buf);
+		}
+	}
+
+	params.config_id = evt->config_id;
+	params.state = evt->state;
+	params.tone_antenna_config_selection = evt->tone_antenna_config_selection;
+	params.selected_tx_power = evt->selected_tx_power;
+	params.subevent_len = sys_get_le24(evt->subevent_len);
+	params.subevents_per_event = evt->subevents_per_event;
+	params.subevent_interval = sys_le16_to_cpu(evt->subevent_interval);
+	params.event_interval = sys_le16_to_cpu(evt->event_interval);
+	params.procedure_interval = sys_le16_to_cpu(evt->procedure_interval);
+	params.procedure_count = sys_le16_to_cpu(evt->procedure_count);
+	params.max_procedure_len = sys_le16_to_cpu(evt->max_procedure_len);
+
+	notify_cs_procedure_enable_available(conn, &params);
+
+	bt_conn_unref(conn);
+}
+
 #if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 int bt_le_cs_stop_test(void)
 {
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index 0d0b5a9c60b..2db727fb6eb 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -2830,6 +2830,12 @@ static const struct event_handler meta_events[] = {
 		      sizeof(struct bt_hci_evt_le_cs_read_remote_fae_table_complete)),
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_CONFIG_COMPLETE, bt_hci_le_cs_config_complete_event,
 		      sizeof(struct bt_hci_evt_le_cs_config_complete)),
+	EVENT_HANDLER(BT_HCI_EVT_LE_CS_SECURITY_ENABLE_COMPLETE,
+			  bt_hci_le_cs_security_enable_complete,
+			  sizeof(struct bt_hci_evt_le_cs_security_enable_complete)),
+	EVENT_HANDLER(BT_HCI_EVT_LE_CS_PROCEDURE_ENABLE_COMPLETE,
+			  bt_hci_le_cs_procedure_enable_complete,
+			  sizeof(struct bt_hci_evt_le_cs_procedure_enable_complete)),
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_SUBEVENT_RESULT,
 		      bt_hci_le_cs_subevent_result,
 		      sizeof(struct bt_hci_evt_le_cs_subevent_result)),
@@ -3418,6 +3424,8 @@ static int le_set_event_mask(void)
 		mask |= BT_EVT_MASK_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE;
 		mask |= BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE;
 		mask |= BT_EVT_MASK_LE_CS_CONFIG_COMPLETE;
+		mask |= BT_EVT_MASK_LE_CS_SECURITY_ENABLE_COMPLETE;
+		mask |= BT_EVT_MASK_LE_CS_PROCEDURE_ENABLE_COMPLETE;
 		mask |= BT_EVT_MASK_LE_CS_SUBEVENT_RESULT;
 		mask |= BT_EVT_MASK_LE_CS_SUBEVENT_RESULT_CONTINUE;
 		mask |= BT_EVT_MASK_LE_CS_TEST_END_COMPLETE;
diff --git a/subsys/bluetooth/host/hci_core.h b/subsys/bluetooth/host/hci_core.h
index 458576e74f7..fb7a69539fd 100644
--- a/subsys/bluetooth/host/hci_core.h
+++ b/subsys/bluetooth/host/hci_core.h
@@ -542,6 +542,8 @@ void bt_hci_le_past_received_v2(struct net_buf *buf);
 void bt_hci_le_cs_read_remote_supported_capabilities_complete(struct net_buf *buf);
 void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf);
 void bt_hci_le_cs_config_complete_event(struct net_buf *buf);
+void bt_hci_le_cs_security_enable_complete(struct net_buf *buf);
+void bt_hci_le_cs_procedure_enable_complete(struct net_buf *buf);
 void bt_hci_le_cs_subevent_result(struct net_buf *buf);
 void bt_hci_le_cs_subevent_result_continue(struct net_buf *buf);
 void bt_hci_le_cs_test_end_complete(struct net_buf *buf);
diff --git a/subsys/bluetooth/shell/cs.c b/subsys/bluetooth/shell/cs.c
index fbc55623b14..b1f6f18aceb 100644
--- a/subsys/bluetooth/shell/cs.c
+++ b/subsys/bluetooth/shell/cs.c
@@ -219,9 +219,9 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	params.t_fcs_time = 120;
 	params.t_pm_time = 20;
 	params.t_sw_time = 0;
-	params.tone_antenna_config_selection = BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
-	params.initiator_snr_control = BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_NOT_USED;
-	params.reflector_snr_control = BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_NOT_USED;
+	params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
+	params.initiator_snr_control = BT_LE_CS_INITIATOR_SNR_CONTROL_NOT_USED;
+	params.reflector_snr_control = BT_LE_CS_REFLECTOR_SNR_CONTROL_NOT_USED;
 	params.drbg_nonce = 0x1234;
 	params.override_config = 0;
 	params.override_config_0.channel_map_repetition = 1;
@@ -442,6 +442,255 @@ static int cmd_cs_stop_test(const struct shell *sh, size_t argc, char *argv[])
 	return 0;
 }
 
+static int cmd_read_local_supported_capabilities(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err = 0;
+
+	struct bt_conn_le_cs_capabilities params;
+
+	err = bt_le_cs_read_local_supported_capabilities(&params);
+
+	if (err) {
+		shell_error(sh, "bt_le_cs_read_local_supported_capabilities returned error %d",
+			    err);
+
+		return -ENOEXEC;
+	}
+
+	shell_print(
+		sh,
+		"Local channel sounding supported capabilities:\n"
+		"- Num CS configurations: %d\n"
+		"- Max consecutive CS procedures: %d\n"
+		"- Num antennas supported: %d\n"
+		"- Max antenna paths supported: %d\n"
+		"- Initiator role supported: %s\n"
+		"- Reflector role supported: %s\n"
+		"- Mode 3 supported: %s\n"
+		"- RTT AA only supported: %s\n"
+		"- RTT AA only is 10ns precise: %s\n"
+		"- RTT AA only N: %d\n"
+		"- RTT sounding supported: %s\n"
+		"- RTT sounding is 10ns precise: %s\n"
+		"- RTT sounding N: %d\n"
+		"- RTT random payload supported: %s\n"
+		"- RTT random payload is 10ns precise: %s\n"
+		"- RTT random payload N: %d\n"
+		"- Phase-based NADM with sounding sequences supported: %s\n"
+		"- Phase-based NADM with random sequences supported: %s\n"
+		"- CS Sync 2M PHY supported: %s\n"
+		"- CS Sync 2M 2BT PHY supported: %s\n"
+		"- CS without transmitter FAE supported: %s\n"
+		"- Channel selection algorithm #3c supported: %s\n"
+		"- Phase-based ranging from RTT sounding sequence supported: %s\n"
+		"- T_IP1 times supported: 0x%04x\n"
+		"- T_IP2 times supported: 0x%04x\n"
+		"- T_FCS times supported: 0x%04x\n"
+		"- T_PM times supported: 0x%04x\n"
+		"- T_SW time supported: %d us\n"
+		"- TX SNR capability: 0x%02x",
+		params.num_config_supported, params.max_consecutive_procedures_supported,
+		params.num_antennas_supported, params.max_antenna_paths_supported,
+		params.initiator_supported ? "Yes" : "No",
+		params.reflector_supported ? "Yes" : "No", params.mode_3_supported ? "Yes" : "No",
+		params.rtt_aa_only_precision == BT_CONN_LE_CS_RTT_AA_ONLY_NOT_SUPP ? "No" : "Yes",
+		params.rtt_aa_only_precision == BT_CONN_LE_CS_RTT_AA_ONLY_10NS ? "Yes" : "No",
+		params.rtt_aa_only_n,
+		params.rtt_sounding_precision == BT_CONN_LE_CS_RTT_SOUNDING_NOT_SUPP ? "No" : "Yes",
+		params.rtt_sounding_precision == BT_CONN_LE_CS_RTT_SOUNDING_10NS ? "Yes" : "No",
+		params.rtt_sounding_n,
+		params.rtt_random_payload_precision == BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_NOT_SUPP
+			? "No"
+			: "Yes",
+		params.rtt_random_payload_precision == BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_10NS ? "Yes"
+											     : "No",
+		params.rtt_random_payload_n,
+		params.phase_based_nadm_sounding_supported ? "Yes" : "No",
+		params.phase_based_nadm_random_supported ? "Yes" : "No",
+		params.cs_sync_2m_phy_supported ? "Yes" : "No",
+		params.cs_sync_2m_2bt_phy_supported ? "Yes" : "No",
+		params.cs_without_fae_supported ? "Yes" : "No",
+		params.chsel_alg_3c_supported ? "Yes" : "No",
+		params.pbr_from_rtt_sounding_seq_supported ? "Yes" : "No",
+		params.t_ip1_times_supported, params.t_ip2_times_supported,
+		params.t_fcs_times_supported, params.t_pm_times_supported, params.t_sw_time,
+		params.tx_snr_capability);
+
+	return 0;
+}
+
+static int cmd_write_cached_remote_supported_capabilities(const struct shell *sh, size_t argc,
+							  char *argv[])
+{
+	int err = 0;
+
+	if (default_conn == NULL) {
+		shell_error(sh, "Conn handle error, at least one connection is required.");
+		return -ENOEXEC;
+	}
+
+	struct bt_conn_le_cs_capabilities params;
+
+	params.num_config_supported = 1;
+	params.max_consecutive_procedures_supported = 0;
+	params.num_antennas_supported = 1;
+	params.max_antenna_paths_supported = 1;
+	params.initiator_supported = true;
+	params.reflector_supported = true;
+	params.mode_3_supported = true;
+	params.rtt_aa_only_precision = BT_CONN_LE_CS_RTT_AA_ONLY_10NS;
+	params.rtt_sounding_precision = BT_CONN_LE_CS_RTT_SOUNDING_10NS;
+	params.rtt_random_payload_precision = BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_10NS;
+	params.rtt_aa_only_n = 5;
+	params.rtt_sounding_n = 6;
+	params.rtt_random_payload_n = 7;
+	params.phase_based_nadm_sounding_supported = true;
+	params.phase_based_nadm_random_supported = true;
+	params.cs_sync_2m_phy_supported = true;
+	params.cs_sync_2m_2bt_phy_supported = true;
+	params.chsel_alg_3c_supported = true;
+	params.cs_without_fae_supported = true;
+	params.pbr_from_rtt_sounding_seq_supported = false;
+	params.t_ip1_times_supported = BT_HCI_LE_CS_T_IP1_TIME_10US_MASK;
+	params.t_ip2_times_supported = BT_HCI_LE_CS_T_IP2_TIME_10US_MASK;
+	params.t_fcs_times_supported = BT_HCI_LE_CS_T_FCS_TIME_100US_MASK;
+	params.t_sw_time = 0x04;
+	params.tx_snr_capability = BT_HCI_LE_CS_TX_SNR_CAPABILITY_18DB_MASK;
+
+	err = bt_le_cs_write_cached_remote_supported_capabilities(default_conn, &params);
+
+	if (err) {
+		shell_error(sh, "bt_le_cs_set_channel_classification returned error %d", err);
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
+static int cmd_security_enable(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err = 0;
+
+	if (default_conn == NULL) {
+		shell_error(sh, "Conn handle error, at least one connection is required.");
+		return -ENOEXEC;
+	}
+
+	err = bt_le_cs_security_enable(default_conn);
+
+	if (err) {
+		shell_error(sh, "bt_le_cs_security_enable returned error %d", err);
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
+static int cmd_set_channel_classification(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err = 0;
+
+	if (default_conn == NULL) {
+		shell_error(sh, "Conn handle error, at least one connection is required.");
+		return -ENOEXEC;
+	}
+
+	uint8_t channel_classification[10];
+
+	for (int i = 0; i < 10; i++) {
+		channel_classification[i] = shell_strtoul(argv[1 + i], 16, &err);
+
+		if (err) {
+			shell_help(sh);
+			shell_error(sh, "Could not parse input %d, Channel Classification[%d]", i,
+				    i);
+
+			return SHELL_CMD_HELP_PRINTED;
+		}
+	}
+
+	err = bt_le_cs_set_channel_classification(channel_classification);
+
+	if (err) {
+		shell_error(sh, "bt_le_cs_set_channel_classification returned error %d", err);
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
+static int cmd_set_procedure_parameters(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err = 0;
+
+	if (default_conn == NULL) {
+		shell_error(sh, "Conn handle error, at least one connection is required.");
+		return -ENOEXEC;
+	}
+
+	struct bt_le_cs_set_procedure_parameters_param params;
+
+	params.config_id = 0;
+	params.max_procedure_len = 1000;
+	params.min_procedure_interval = 5;
+	params.max_procedure_interval = 5000;
+	params.max_procedure_count = 1;
+	params.min_subevent_len = 5000;
+	params.max_subevent_len = 4000000;
+	params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
+	params.phy = 0x01;
+	params.tx_power_delta = 0x80;
+	params.preferred_peer_antenna = 1;
+	params.snr_control_initiator = BT_LE_CS_INITIATOR_SNR_CONTROL_18dB;
+	params.snr_control_reflector = BT_HCI_OP_LE_CS_REFLECTOR_SNR_18;
+
+	err = bt_le_cs_set_procedure_parameters(default_conn, &params);
+
+	if (err) {
+		shell_error(sh, "bt_le_cs_set_procedure_parameters returned error %d", err);
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
+static int cmd_procedure_enable(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err = 0;
+
+	if (default_conn == NULL) {
+		shell_error(sh, "Conn handle error, at least one connection is required.");
+		return -ENOEXEC;
+	}
+
+	struct bt_le_cs_procedure_enable_param params;
+
+	params.config_id = shell_strtoul(argv[1], 16, &err);
+
+	if (err) {
+		shell_help(sh);
+		shell_error(sh, "Could not parse input 1, Config ID");
+		return SHELL_CMD_HELP_PRINTED;
+	}
+
+	params.enable = shell_strtoul(argv[2], 16, &err);
+
+	if (err) {
+		shell_help(sh);
+		shell_error(sh, "Could not parse input 2, Enable");
+		return SHELL_CMD_HELP_PRINTED;
+	}
+
+	err = bt_le_cs_procedure_enable(default_conn, &params);
+
+	if (err) {
+		shell_error(sh, "bt_le_cs_procedure_enable returned error %d", err);
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	cs_cmds,
 	SHELL_CMD_ARG(read_remote_supported_capabilities, NULL, "<None>",
@@ -463,7 +712,20 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		"128b-rand] [phy-1m, phy-2m, phy-2m-2b] [chmap-rep <rep>] [hat-shape, x-shape] "
 		"[ch3c-jump <jump>] [chmap <XXXXXXXXXXXXXXXX>] (78-0) [chsel-3b, chsel-3c]",
 		cmd_create_config, 4, 15),
-	SHELL_CMD_ARG(remove_config, NULL, "<id>", cmd_remove_config, 2, 0), SHELL_SUBCMD_SET_END);
+	SHELL_CMD_ARG(remove_config, NULL, "<id>", cmd_remove_config, 2, 0),
+	SHELL_CMD_ARG(read_local_supported_capabilities, NULL, "<None>",
+		      cmd_read_local_supported_capabilities, 1, 0),
+	SHELL_CMD_ARG(write_cached_remote_supported_capabilities, NULL, "<None>",
+		      cmd_write_cached_remote_supported_capabilities, 1, 0),
+	SHELL_CMD_ARG(security_enable, NULL, "<None>", cmd_security_enable, 1, 0),
+	SHELL_CMD_ARG(set_channel_classification, NULL,
+		      "<Byte 0> <Byte 1> <Byte 2> <Byte 3> "
+		      "<Byte 4> <Byte 5> <Byte 6> <Byte 7> <Byte 8> <Byte 9>",
+		      cmd_set_channel_classification, 11, 0),
+	SHELL_CMD_ARG(set_procedure_parameters, NULL, "<None>", cmd_set_procedure_parameters, 1, 0),
+	SHELL_CMD_ARG(procedure_enable, NULL, "<Config ID: 0 to 3> <Enable: 0, 1>",
+		      cmd_procedure_enable, 3, 0),
+	SHELL_SUBCMD_SET_END);
 
 static int cmd_cs(const struct shell *sh, size_t argc, char **argv)
 {

From 1253af0a47cdc539971e91df67aef3e9fc94a870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 18 Sep 2024 12:33:42 +0200
Subject: [PATCH 0211/2913] [nrf fromtree] drivers: sensor: nordic: qdec: Add
 runtime PM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add runtime PM to the driver.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit b773306a56927b764c85695c446fe1ee1c65b6fa)
(cherry picked from commit 8d14baa36afba3eb5992db45caa0050fd364c20a)
(cherry picked from commit 5e6ad03c3e300ab11e0ff754d992e024f5f566cb)
---
 drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c | 87 +++++++++------------
 1 file changed, 35 insertions(+), 52 deletions(-)

diff --git a/drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c b/drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c
index dc70c27d417..e7f014de0d0 100644
--- a/drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c
+++ b/drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c
@@ -192,81 +192,64 @@ static const struct sensor_driver_api qdec_nrfx_driver_api = {
 	.trigger_set  = qdec_nrfx_trigger_set,
 };
 
-#ifdef CONFIG_PM_DEVICE
-static int qdec_nrfx_pm_action(const struct device *dev,
-			       enum pm_device_action action)
+static void qdec_pm_suspend(const struct device *dev)
 {
 	const struct qdec_nrfx_config *config = dev->config;
-	int ret = 0;
 
+	nrfx_qdec_disable(&config->qdec);
+	qdec_nrfx_gpio_ctrl(dev, false);
+
+	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
+}
+
+static void qdec_pm_resume(const struct device *dev)
+{
+	const struct qdec_nrfx_config *config = dev->config;
+
+	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+	qdec_nrfx_gpio_ctrl(dev, true);
+	nrfx_qdec_enable(&config->qdec);
+}
+
+static int qdec_nrfx_pm_action(const struct device *dev, enum pm_device_action action)
+{
 	switch (action) {
 	case PM_DEVICE_ACTION_RESUME:
-		ret = pinctrl_apply_state(config->pcfg,
-					  PINCTRL_STATE_DEFAULT);
-		if (ret < 0) {
-			return ret;
-		}
-		qdec_nrfx_gpio_ctrl(dev, true);
-		nrfx_qdec_enable(&config->qdec);
-		break;
-
-	case PM_DEVICE_ACTION_TURN_OFF:
-		/* device must be uninitialized */
-		nrfx_qdec_uninit(&config->qdec);
-		ret = pinctrl_apply_state(config->pcfg,
-					  PINCTRL_STATE_SLEEP);
-		if (ret < 0) {
-			return ret;
-		}
+		qdec_pm_resume(dev);
 		break;
 
 	case PM_DEVICE_ACTION_SUSPEND:
-		/* device must be suspended */
-		nrfx_qdec_disable(&config->qdec);
-		qdec_nrfx_gpio_ctrl(dev, false);
-		ret = pinctrl_apply_state(config->pcfg,
-					  PINCTRL_STATE_SLEEP);
-		if (ret < 0) {
-			return ret;
+		if (IS_ENABLED(CONFIG_PM_DEVICE)) {
+			qdec_pm_suspend(dev);
 		}
 		break;
 	default:
 		return -ENOTSUP;
+		break;
 	}
 
-	return ret;
+	return 0;
 }
-#endif /* CONFIG_PM_DEVICE */
 
 static int qdec_nrfx_init(const struct device *dev)
 {
-	const struct qdec_nrfx_config *dev_config = dev->config;
-
-	dev_config->irq_connect();
+	const struct qdec_nrfx_config *config = dev->config;
+	nrfx_err_t nerr;
 
-	int err = pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_DEFAULT);
+	config->irq_connect();
 
-	if (err < 0) {
-		return err;
+	nerr = nrfx_qdec_init(&config->qdec, &config->config, qdec_nrfx_event_handler, (void *)dev);
+	if (nerr != NRFX_SUCCESS) {
+		return (nerr == NRFX_ERROR_INVALID_STATE) ? -EBUSY : -EFAULT;
 	}
 
-	nrfx_err_t nerr = nrfx_qdec_init(&dev_config->qdec,
-					 &dev_config->config,
-					 qdec_nrfx_event_handler,
-					 (void *)dev);
-
-	if (nerr == NRFX_ERROR_INVALID_STATE) {
-		LOG_ERR("qdec already in use");
-		return -EBUSY;
-	} else if (nerr != NRFX_SUCCESS) {
-		LOG_ERR("failed to initialize qdec");
-		return -EFAULT;
+	/* End up in suspend state. */
+	qdec_nrfx_gpio_ctrl(dev, false);
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
 	}
 
-	qdec_nrfx_gpio_ctrl(dev, true);
-	nrfx_qdec_enable(&dev_config->qdec);
-
-	return 0;
+	return pm_device_driver_init(dev, qdec_nrfx_pm_action);
 }
 
 #define QDEC(idx)			DT_NODELABEL(qdec##idx)
@@ -301,7 +284,7 @@ static int qdec_nrfx_init(const struct device *dev)
 		.enable_pin = DT_PROP_OR(QDEC(idx), enable_pin, NRF_QDEC_PIN_NOT_CONNECTED), \
 		.steps = QDEC_PROP(idx, steps),						     \
 	};										     \
-	PM_DEVICE_DT_DEFINE(QDEC(idx), qdec_nrfx_pm_action);				     \
+	PM_DEVICE_DT_DEFINE(QDEC(idx), qdec_nrfx_pm_action, PM_DEVICE_ISR_SAFE);	     \
 	SENSOR_DEVICE_DT_DEFINE(QDEC(idx),						     \
 				qdec_nrfx_init,						     \
 				PM_DEVICE_DT_GET(QDEC(idx)),				     \

From c3d8f6f7223ce8833a70e09c138330cf6ea52f2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 18 Sep 2024 15:42:44 +0200
Subject: [PATCH 0212/2913] [nrf fromtree] tests: boards: nrf: qdec: Add common
 configuration for nrf54l
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add common overlay for nrf54l15pdk targets.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 7fc73619b4320b484ef4be2c2486d3c7d8de4f43)
(cherry picked from commit db7b6f680b1a8778a05b7412f191a59b973ae684)
(cherry picked from commit 4e7b04dd4c6e44e9dab203ff06cb20d41f8f4e29)
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 39 +----------------
 .../nrf54l15dk_nrf54l15_cpuflpr.overlay       | 39 +----------------
 .../boards/nrf54l15pdk_nrf54l15_common.dtsi   | 43 +++++++++++++++++++
 3 files changed, 45 insertions(+), 76 deletions(-)
 create mode 100644 tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi

diff --git a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 538106b38b1..63276a93656 100644
--- a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -3,41 +3,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/ {
-	aliases {
-		qdec0 = &qdec20;
-		qenca = &phase_a;
-		qencb = &phase_b;
-	};
-
-	encoder-emulate {
-		compatible = "gpio-leds";
-		phase_a: phase_a {
-			gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-		};
-		phase_b: phase_b {
-			gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&pinctrl {
-	qdec_pinctrl: qdec_pinctrl {
-		group1 {
-			psels = <NRF_PSEL(QDEC_A, 1, 8)>,
-				<NRF_PSEL(QDEC_B, 1, 10)>;
-		};
-	};
-};
-
-&gpio1 {
-	status = "okay";
-};
-
-&qdec20 {
-	status = "okay";
-	pinctrl-0 = <&qdec_pinctrl>;
-	pinctrl-names = "default";
-	steps = <127>;
-	led-pre = <500>;
-};
+#include "nrf54l15pdk_nrf54l15_common.dtsi"
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
index 538106b38b1..63276a93656 100644
--- a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
@@ -3,41 +3,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/ {
-	aliases {
-		qdec0 = &qdec20;
-		qenca = &phase_a;
-		qencb = &phase_b;
-	};
-
-	encoder-emulate {
-		compatible = "gpio-leds";
-		phase_a: phase_a {
-			gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-		};
-		phase_b: phase_b {
-			gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&pinctrl {
-	qdec_pinctrl: qdec_pinctrl {
-		group1 {
-			psels = <NRF_PSEL(QDEC_A, 1, 8)>,
-				<NRF_PSEL(QDEC_B, 1, 10)>;
-		};
-	};
-};
-
-&gpio1 {
-	status = "okay";
-};
-
-&qdec20 {
-	status = "okay";
-	pinctrl-0 = <&qdec_pinctrl>;
-	pinctrl-names = "default";
-	steps = <127>;
-	led-pre = <500>;
-};
+#include "nrf54l15pdk_nrf54l15_common.dtsi"
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi b/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi
new file mode 100644
index 00000000000..538106b38b1
--- /dev/null
+++ b/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		qdec0 = &qdec20;
+		qenca = &phase_a;
+		qencb = &phase_b;
+	};
+
+	encoder-emulate {
+		compatible = "gpio-leds";
+		phase_a: phase_a {
+			gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+		};
+		phase_b: phase_b {
+			gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
+		};
+	};
+};
+
+&pinctrl {
+	qdec_pinctrl: qdec_pinctrl {
+		group1 {
+			psels = <NRF_PSEL(QDEC_A, 1, 8)>,
+				<NRF_PSEL(QDEC_B, 1, 10)>;
+		};
+	};
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&qdec20 {
+	status = "okay";
+	pinctrl-0 = <&qdec_pinctrl>;
+	pinctrl-names = "default";
+	steps = <127>;
+	led-pre = <500>;
+};

From bbd0fa11d406b1408dca863b3b647b3ef3d52ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 18 Sep 2024 15:53:28 +0200
Subject: [PATCH 0213/2913] [nrf fromtree] tests: boards: nrf: qdec: Add device
 runtime PM configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add configuration to the test which is using runtime PM on qdec.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 5371effda8ff2bfc1a8e219a33c4de32ae45143d)
(cherry picked from commit cf8d81639784d9037ad6afb9c34d0c5ef81c7572)
(cherry picked from commit a4b59b095899a829897907051622f8843e29d5d5)
---
 .../qdec/boards/nrf52840dk_nrf52840.overlay   | 17 ++++-
 .../boards/nrf5340dk_nrf5340_cpuapp.overlay   | 17 ++++-
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 17 ++++-
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |  5 ++
 .../nrf54l15dk_nrf54l15_cpuflpr.overlay       |  5 ++
 .../boards/nrf54l15pdk_nrf54l15_common.dtsi   | 12 ++-
 tests/boards/nrf/qdec/src/main.c              | 76 +++++++++++++++++++
 tests/boards/nrf/qdec/testcase.yaml           | 40 ++++++----
 8 files changed, 170 insertions(+), 19 deletions(-)

diff --git a/tests/boards/nrf/qdec/boards/nrf52840dk_nrf52840.overlay b/tests/boards/nrf/qdec/boards/nrf52840dk_nrf52840.overlay
index 4f8ea8ad31b..f227fb95c38 100644
--- a/tests/boards/nrf/qdec/boards/nrf52840dk_nrf52840.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf52840dk_nrf52840.overlay
@@ -31,12 +31,27 @@
 				<NRF_PSEL(QDEC_B, 1, 3)>;   /* Arduino D2 */
 		};
 	};
+
+	qdec_sleep_pinctrl: qdec_sleep_pinctrl {
+		group1 {
+			psels = <NRF_PSEL(QDEC_A, 1, 1)>,   /* Ardiuno D0 */
+				<NRF_PSEL(QDEC_B, 1, 3)>;   /* Arduino D2 */
+			low-power-enable;
+		};
+	};
 };
 
 &qdec0 {
 	status = "okay";
 	pinctrl-0 = <&qdec_pinctrl>;
-	pinctrl-names = "default";
+	pinctrl-1 = <&qdec_sleep_pinctrl>;
+	pinctrl-names = "default", "sleep";
 	steps = < 127 >;
 	led-pre = < 500 >;
+	zephyr,pm-device-runtime-auto;
+};
+
+/* To prevent enabling console receiver. */
+&uart0 {
+	disable-rx;
 };
diff --git a/tests/boards/nrf/qdec/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/boards/nrf/qdec/boards/nrf5340dk_nrf5340_cpuapp.overlay
index 7f4a13f3602..ed6a5587f5b 100644
--- a/tests/boards/nrf/qdec/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -30,12 +30,27 @@
 				<NRF_PSEL(QDEC_B, 0, 6)>;   /* Arduino A2 */
 		};
 	};
+
+	qdec_sleep_pinctrl: qdec_sleep_pinctrl {
+		group1 {
+			psels = <NRF_PSEL(QDEC_A, 0, 4)>,
+				<NRF_PSEL(QDEC_B, 0, 6)>;
+			low-power-enable;
+		};
+	};
 };
 
 &qdec1 {
 	status = "okay";
 	pinctrl-0 = <&qdec_pinctrl>;
-	pinctrl-names = "default";
+	pinctrl-1 = <&qdec_sleep_pinctrl>;
+	pinctrl-names = "default", "sleep";
 	steps = < 127 >;
 	led-pre = < 500 >;
+	zephyr,pm-device-runtime-auto;
+};
+
+/* To prevent enabling console receiver. */
+&uart0 {
+	disable-rx;
 };
diff --git a/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index 6b0db6ad6a8..0e552906a00 100644
--- a/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -28,6 +28,14 @@
 				<NRF_PSEL(QDEC_B, 1, 2)>;
 		};
 	};
+
+	qdec_sleep_pinctrl: qdec_sleep_pinctrl {
+		group1 {
+			psels = <NRF_PSEL(QDEC_A, 1, 0)>,
+				<NRF_PSEL(QDEC_B, 1, 2)>;
+			low-power-enable;
+		};
+	};
 };
 
 &gpio1 {
@@ -41,7 +49,14 @@
 &qdec130 {
 	status = "okay";
 	pinctrl-0 = <&qdec_pinctrl>;
-	pinctrl-names = "default";
+	pinctrl-1 = <&qdec_sleep_pinctrl>;
+	pinctrl-names = "default", "sleep";
 	steps = <127>;
 	led-pre = <500>;
+	zephyr,pm-device-runtime-auto;
+};
+
+/* To prevent enabling console receiver. */
+&uart136 {
+	disable-rx;
 };
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 63276a93656..dc39be6deb3 100644
--- a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -4,3 +4,8 @@
  */
 
 #include "nrf54l15pdk_nrf54l15_common.dtsi"
+
+/* To prevent enabling console receiver. */
+&uart20 {
+	disable-rx;
+};
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
index 63276a93656..059222c801b 100644
--- a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
@@ -4,3 +4,8 @@
  */
 
 #include "nrf54l15pdk_nrf54l15_common.dtsi"
+
+/* To prevent enabling console receiver. */
+&uart30 {
+	disable-rx;
+};
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi b/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi
index 538106b38b1..3fa426569b8 100644
--- a/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi
+++ b/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi
@@ -28,6 +28,14 @@
 				<NRF_PSEL(QDEC_B, 1, 10)>;
 		};
 	};
+
+	qdec_sleep_pinctrl: qdec_sleep_pinctrl {
+		group1 {
+			psels = <NRF_PSEL(QDEC_A, 1, 8)>,
+				<NRF_PSEL(QDEC_B, 1, 10)>;
+			low-power-enable;
+		};
+	};
 };
 
 &gpio1 {
@@ -37,7 +45,9 @@
 &qdec20 {
 	status = "okay";
 	pinctrl-0 = <&qdec_pinctrl>;
-	pinctrl-names = "default";
+	pinctrl-1 = <&qdec_sleep_pinctrl>;
+	pinctrl-names = "default", "sleep";
 	steps = <127>;
 	led-pre = <500>;
+	zephyr,pm-device-runtime-auto;
 };
diff --git a/tests/boards/nrf/qdec/src/main.c b/tests/boards/nrf/qdec/src/main.c
index cccd92c3293..2ad847796e8 100644
--- a/tests/boards/nrf/qdec/src/main.c
+++ b/tests/boards/nrf/qdec/src/main.c
@@ -9,6 +9,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/pm/device_runtime.h>
 
 static K_SEM_DEFINE(sem, 0, 1);
 static const struct gpio_dt_spec phase_a = GPIO_DT_SPEC_GET(DT_ALIAS(qenca), gpios);
@@ -144,6 +145,10 @@ ZTEST(qdec_sensor, test_sensor_trigger_set_and_disable)
 {
 	int rc;
 
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_get(qdec_dev);
+	}
+
 	qdec_trigger.type = SENSOR_TRIG_DATA_READY;
 	qdec_trigger.chan = SENSOR_CHAN_ALL;
 	rc = sensor_trigger_set(qdec_dev, &qdec_trigger, qdec_trigger_handler);
@@ -162,10 +167,18 @@ ZTEST(qdec_sensor, test_sensor_trigger_set_and_disable)
 	/* emulation not working, but there maybe old trigger, ignore */
 	rc = k_sem_take(&sem, K_MSEC(200));
 
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_put(qdec_dev);
+	}
+
 	/* there should be no triggers now*/
 	rc = k_sem_take(&sem, K_MSEC(200));
 	zassert_true(rc == -EAGAIN, "qdec handler should not be triggered (%d)", rc);
 
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_get(qdec_dev);
+	}
+
 	/* register empty trigger - disable trigger */
 	rc = sensor_trigger_set(qdec_dev, &qdec_trigger, NULL);
 	zassert_true(rc == 0, "sensor_trigger_set failed: %d", rc);
@@ -175,6 +188,10 @@ ZTEST(qdec_sensor, test_sensor_trigger_set_and_disable)
 	/* emulation working, but handler not set, thus should not be called */
 	rc = k_sem_take(&sem, K_MSEC(200));
 	zassert_true(rc == -EAGAIN, "qdec handler should not be triggered (%d)", rc);
+
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_put(qdec_dev);
+	}
 }
 
 /**
@@ -188,6 +205,10 @@ ZTEST(qdec_sensor, test_sensor_trigger_set)
 	int rc;
 	struct sensor_value val = {0};
 
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_get(qdec_dev);
+	}
+
 	qdec_trigger.type = SENSOR_TRIG_DATA_READY;
 	qdec_trigger.chan = SENSOR_CHAN_ROTATION;
 	rc = sensor_trigger_set(qdec_dev, &qdec_trigger, qdec_trigger_handler);
@@ -209,6 +230,10 @@ ZTEST(qdec_sensor, test_sensor_trigger_set)
 
 	TC_PRINT("QDEC reading: %d\n", val.val1);
 	zassert_true(val.val1 != 0, "No readings from QDEC");
+
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_put(qdec_dev);
+	}
 }
 
 /**
@@ -221,6 +246,10 @@ ZTEST(qdec_sensor, test_sensor_trigger_set_negative)
 {
 	int rc;
 
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_get(qdec_dev);
+	}
+
 	rc = sensor_trigger_set(qdec_dev, &qdec_trigger, qdec_trigger_handler);
 	zassume_true(rc != -ENOSYS, "sensor_trigger_set not supported");
 
@@ -235,6 +264,10 @@ ZTEST(qdec_sensor, test_sensor_trigger_set_negative)
 
 	rc = sensor_trigger_set(qdec_dev, &qdec_trigger, qdec_trigger_handler);
 	zassume_true(rc < 0, "sensor_trigger_set should fail due to invalid channel");
+
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_put(qdec_dev);
+	}
 }
 
 /**
@@ -245,11 +278,19 @@ ZTEST(qdec_sensor, test_sensor_trigger_set_negative)
  */
 ZTEST(qdec_sensor, test_qdec_readings)
 {
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_get(qdec_dev);
+	}
+
 	qenc_emulate_verify_reading(10, 100, true, false);
 	qenc_emulate_verify_reading(2, 500, true, false);
 	qenc_emulate_verify_reading(10, 200, false, false);
 	qenc_emulate_verify_reading(1, 1000, false, true);
 	qenc_emulate_verify_reading(1, 1000, true, true);
+
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_put(qdec_dev);
+	}
 }
 
 /**
@@ -263,9 +304,16 @@ ZTEST(qdec_sensor, test_sensor_channel_get_empty)
 	int rc;
 	struct sensor_value val = {0};
 
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_get(qdec_dev);
+	}
+
 	rc = sensor_sample_fetch(qdec_dev);
 	zassert_true(rc == 0, "Failed to fetch sample (%d)", rc);
 
+	/* wait for potential new readings */
+	k_msleep(100);
+
 	/* get readings but ignore them, as they may include reading from time
 	 * when emulation was still working (i.e. during previous test)
 	 */
@@ -283,6 +331,10 @@ ZTEST(qdec_sensor, test_sensor_channel_get_empty)
 	zassert_true(rc == 0, "Failed to get sample (%d)", rc);
 	zassert_true(val.val1 == 0, "Expected no readings but got: %d", val.val1);
 	zassert_true(val.val2 == 0, "Expected no readings but got: %d", val.val2);
+
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_put(qdec_dev);
+	}
 }
 
 /**
@@ -297,6 +349,10 @@ ZTEST(qdec_sensor, test_sensor_channel_get)
 	struct sensor_value val_first = {0};
 	struct sensor_value val_second = {0};
 
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_get(qdec_dev);
+	}
+
 	qenc_emulate_start(K_MSEC(10), true);
 
 	/* wait for some readings*/
@@ -328,6 +384,10 @@ ZTEST(qdec_sensor, test_sensor_channel_get)
 		     "Expected the same readings: %d vs %d",
 		     val_first.val2,
 		     val_second.val2);
+
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_put(qdec_dev);
+	}
 }
 
 /**
@@ -341,6 +401,10 @@ ZTEST(qdec_sensor, test_sensor_channel_get_negative)
 	int rc;
 	struct sensor_value val = {0};
 
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_get(qdec_dev);
+	}
+
 	qenc_emulate_start(K_MSEC(10), true);
 
 	/* wait for some readings*/
@@ -353,6 +417,10 @@ ZTEST(qdec_sensor, test_sensor_channel_get_negative)
 	zassert_true(rc < 0, "Should failed to get sample (%d)", rc);
 	zassert_true(val.val1 == 0, "Some readings from QDEC: %d", val.val1);
 	zassert_true(val.val2 == 0, "Some readings from QDEC: %d", val.val2);
+
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_put(qdec_dev);
+	}
 }
 
 /**
@@ -365,6 +433,10 @@ ZTEST(qdec_sensor, test_sensor_sample_fetch)
 {
 	int rc;
 
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_get(qdec_dev);
+	}
+
 	rc = sensor_sample_fetch(qdec_dev);
 	zassert_true(rc == 0, "Failed to fetch sample (%d)", rc);
 
@@ -373,6 +445,10 @@ ZTEST(qdec_sensor, test_sensor_sample_fetch)
 
 	rc = sensor_sample_fetch_chan(qdec_dev, SENSOR_CHAN_MAX);
 	zassert_true(rc < 0, "Should fail to fetch sample from invalid channel (%d)", rc);
+
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_put(qdec_dev);
+	}
 }
 
 static void *setup(void)
diff --git a/tests/boards/nrf/qdec/testcase.yaml b/tests/boards/nrf/qdec/testcase.yaml
index 4bc634412db..26cfd9901a5 100644
--- a/tests/boards/nrf/qdec/testcase.yaml
+++ b/tests/boards/nrf/qdec/testcase.yaml
@@ -1,21 +1,31 @@
+common:
+  platform_allow:
+    - nrf52840dk/nrf52840
+    - nrf5340dk/nrf5340/cpuapp
+    - nrf54l15dk/nrf54l15/cpuapp
+    - nrf54l15dk/nrf54l15/cpuflpr
+    - nrf54h20dk/nrf54h20/cpuapp
+  integration_platforms:
+    - nrf52840dk/nrf52840
+    - nrf5340dk/nrf5340/cpuapp
+    - nrf54l15dk/nrf54l15/cpuapp
+    - nrf54l15dk/nrf54l15/cpuflpr
+    - nrf54h20dk/nrf54h20/cpuapp
+  harness: ztest
+  harness_config:
+    fixture: gpio_loopback
 tests:
   drivers.sensor.qdec:
     tags:
       - drivers
       - sensors
       - qdec
-    platform_allow:
-      - nrf52840dk/nrf52840
-      - nrf5340dk/nrf5340/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15dk/nrf54l15/cpuflpr
-      - nrf54h20dk/nrf54h20/cpuapp
-    integration_platforms:
-      - nrf52840dk/nrf52840
-      - nrf5340dk/nrf5340/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15dk/nrf54l15/cpuflpr
-      - nrf54h20dk/nrf54h20/cpuapp
-    harness: ztest
-    harness_config:
-      fixture: gpio_loopback
+  drivers.sensor.qdec.pm_runtime:
+    tags:
+      - drivers
+      - sensors
+      - qdec
+      - pm
+    extra_configs:
+      - CONFIG_PM_DEVICE=y
+      - CONFIG_PM_DEVICE_RUNTIME=y

From d934be9c661ab8eabaf35383d5bdca6600b87ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 18 Oct 2024 13:04:35 +0200
Subject: [PATCH 0214/2913] [nrf fromlist] tests: boards: nrf: qdec: Fix
 failing drivers.sensor.qdec.pm_runtime
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test was failing because after re-enabling QDEC there is an interrupt
REPORTRDY coming after some time. Test had k_msleep(100) added to
accomodate for that but it was added after sensor_sample_fetch and
should be added before so that sample with data from REPORTRDY event
is fetched so that next read is empty as expected.

Upstream PR #: 80051

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 8ceab93c866d584201621703dee15a77107e7363)
(cherry picked from commit dc384e5a68de7b8b5e55aa600e74c87a47b77a57)
---
 tests/boards/nrf/qdec/src/main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/boards/nrf/qdec/src/main.c b/tests/boards/nrf/qdec/src/main.c
index 2ad847796e8..d87feb22f42 100644
--- a/tests/boards/nrf/qdec/src/main.c
+++ b/tests/boards/nrf/qdec/src/main.c
@@ -308,12 +308,12 @@ ZTEST(qdec_sensor, test_sensor_channel_get_empty)
 		pm_device_runtime_get(qdec_dev);
 	}
 
-	rc = sensor_sample_fetch(qdec_dev);
-	zassert_true(rc == 0, "Failed to fetch sample (%d)", rc);
-
 	/* wait for potential new readings */
 	k_msleep(100);
 
+	rc = sensor_sample_fetch(qdec_dev);
+	zassert_true(rc == 0, "Failed to fetch sample (%d)", rc);
+
 	/* get readings but ignore them, as they may include reading from time
 	 * when emulation was still working (i.e. during previous test)
 	 */

From 901b3ac3355fec4cd91cf2cb598152d134c85047 Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Sat, 28 Sep 2024 21:09:44 +0200
Subject: [PATCH 0215/2913] [nrf fromtree] susbys/dfu/img_util: refined ERASE
 PROGRESSIVELY implementation

Moved MCUboot trailer's status erase ahead any write operation,
which is step which helps with addition of support for devices
don't require explicit pager erase.
For these kind of devices flattening of mcuboot image status in
the trailer was introduced.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
(cherry picked from commit 17c15e3b4edb2e776c748073248c99cecd5cdef8)
(cherry picked from commit 2542e3cfe5c425efbed5c35d446ca8a80b19015f)
(cherry picked from commit 1a4d8a0a9644597bcd51becfc7bfdcf6dc7c93f8)
---
 subsys/dfu/Kconfig              |  3 +-
 subsys/dfu/img_util/flash_img.c | 72 ++++++++++++++++++++++++++++-----
 2 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/subsys/dfu/Kconfig b/subsys/dfu/Kconfig
index 5977764016d..a72960acf3b 100644
--- a/subsys/dfu/Kconfig
+++ b/subsys/dfu/Kconfig
@@ -68,8 +68,7 @@ config IMG_BLOCK_BUF_SIZE
 
 config IMG_ERASE_PROGRESSIVELY
 	bool "Erase flash progressively when receiving new firmware"
-	select STREAM_FLASH_ERASE
-	depends on FLASH_HAS_EXPLICIT_ERASE
+	select STREAM_FLASH_ERASE if FLASH_HAS_EXPLICIT_ERASE
 	help
 	  If enabled, flash is erased as necessary when receiving new firmware,
 	  instead of erasing the whole image slot at once. This is necessary
diff --git a/subsys/dfu/img_util/flash_img.c b/subsys/dfu/img_util/flash_img.c
index 9de47250670..69fa559f0e3 100644
--- a/subsys/dfu/img_util/flash_img.c
+++ b/subsys/dfu/img_util/flash_img.c
@@ -43,26 +43,78 @@ BUILD_ASSERT((CONFIG_IMG_BLOCK_BUF_SIZE % FLASH_WRITE_BLOCK_SIZE == 0),
 	     "FLASH_WRITE_BLOCK_SIZE");
 #endif
 
+static int scramble_mcuboot_trailer(struct flash_img_context *ctx)
+{
+	int rc = 0;
+
+#ifdef CONFIG_IMG_ERASE_PROGRESSIVELY
+	if (stream_flash_bytes_written(&ctx->stream) == 0) {
+		off_t toff = boot_get_trailer_status_offset(ctx->flash_area->fa_size);
+		off_t offset;
+		size_t size;
+		const struct flash_parameters *fparams =
+			flash_get_parameters(flash_area_get_device(ctx->flash_area));
+#ifdef CONFIG_STREAM_FLASH_ERASE
+		/* for erasable devices prgressive-erase works only along with
+		 * CONFIG_STREAM_FLASH_ERASE option.
+		 */
+		if (flash_params_get_erase_cap(fparams) & FLASH_ERASE_C_EXPLICIT) {
+			/* On devices with explicit erase we are aligning to page
+			 * layout.
+			 */
+			struct flash_pages_info info;
+
+			rc = flash_get_page_info_by_offs(flash_area_get_device(ctx->flash_area),
+							 toff, &info);
+			if (rc != 0) {
+				return rc;
+			}
+			offset = info.start_offset;
+			size = info.size;
+
+		} else
+#endif
+		{
+			/* On devices with no erase, we are aligning to write block
+			 * size.
+			 */
+			offset = (toff + fparams->write_block_size - 1) &
+				 ~(fparams->write_block_size - 1);
+			/* No alignment correction needed here, offset is corrected already
+			 * and, size should be aligned.
+			 */
+			size = ctx->flash_area->fa_size - offset;
+		}
+
+		rc = flash_area_flatten(ctx->flash_area, offset, size);
+	}
+#endif
+
+	return rc;
+}
+
+
 int flash_img_buffered_write(struct flash_img_context *ctx, const uint8_t *data,
 			     size_t len, bool flush)
 {
 	int rc;
 
-	rc = stream_flash_buffered_write(&ctx->stream, data, len, flush);
-	if (!flush) {
+	/* If there is a need to erase the trailer, that should happen before any
+	 * write is done to partition.
+	 */
+	rc = scramble_mcuboot_trailer(ctx);
+	if (rc != 0) {
 		return rc;
 	}
 
-#ifdef CONFIG_IMG_ERASE_PROGRESSIVELY
-	ssize_t status_offset = boot_get_trailer_status_offset(
-		ctx->flash_area->fa_size);
-	rc = stream_flash_erase_page(&ctx->stream,
-				ctx->flash_area->fa_off +
-				status_offset);
-	if (rc) {
+
+	/* if CONFIG_IMG_ERASE_PROGRESSIVELY is enabled the enabled CONFIG_STREAM_FLASH_ERASE
+	 * ensures that stream_flash erases flash progresively.
+	 */
+	rc = stream_flash_buffered_write(&ctx->stream, data, len, flush);
+	if (!flush) {
 		return rc;
 	}
-#endif
 
 	flash_area_close(ctx->flash_area);
 	ctx->flash_area = NULL;

From 390960f29b59ac589ac4cfd74f983dd344a09b98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Wed, 25 Sep 2024 10:51:01 +0200
Subject: [PATCH 0216/2913] [nrf fromtree] modules: hal_nordic: Add new PDM
 instances
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

New PDM, some present on nRF54L15 FP1, instances have
been added. Modified condfiguration file for nRF5340,
which now requires PDM0 instance.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit c092964dd2a02ec7ecf52a438c6a12174ee5fbd0)
(cherry picked from commit c6b47629cd6f6a4ef752d00f6955386853c73adb)
(cherry picked from commit 1e4e817446fb0f9e18fb07d5a7b7672d95d461d2)
---
 modules/hal_nordic/nrfx/Kconfig                        | 10 ++++++++++
 modules/hal_nordic/nrfx/nrfx_config.h                  | 10 ++++++++--
 .../hal_nordic/nrfx/nrfx_config_nrf5340_application.h  |  9 +++++++++
 soc/nordic/common/Kconfig.peripherals                  |  6 ++++++
 soc/nordic/validate_base_addresses.c                   |  2 ++
 5 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 65894d48712..83ce3f157cc 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -169,6 +169,16 @@ config NRFX_PDM0
 	depends on $(dt_nodelabel_has_compat,pdm0,$(DT_COMPAT_NORDIC_NRF_PDM))
 	select NRFX_PDM
 
+config NRFX_PDM20
+	bool "PDM20 driver instance"
+	depends on $(dt_nodelabel_has_compat,pdm20,$(DT_COMPAT_NORDIC_NRF_PDM))
+	select NRFX_PDM
+
+config NRFX_PDM21
+	bool "PDM21 driver instance"
+	depends on $(dt_nodelabel_has_compat,pdm21,$(DT_COMPAT_NORDIC_NRF_PDM))
+	select NRFX_PDM
+
 config NRFX_POWER
 	bool "POWER driver"
 	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_POWER))
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index a7632a8cc43..c7a7f169c01 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -209,11 +209,17 @@
 #ifdef CONFIG_NRFX_PDM
 #define NRFX_PDM_ENABLED 1
 #endif
+#ifdef CONFIG_NRFX_PDM_LOG
+#define NRFX_PDM_CONFIG_LOG_ENABLED 1
+#endif
 #ifdef CONFIG_NRFX_PDM0
 #define NRFX_PDM0_ENABLED 1
 #endif
-#ifdef CONFIG_NRFX_PDM_LOG
-#define NRFX_PDM_CONFIG_LOG_ENABLED 1
+#ifdef CONFIG_NRFX_PDM20
+#define NRFX_PDM20_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PDM21
+#define NRFX_PDM21_ENABLED 1
 #endif
 
 #ifdef CONFIG_NRFX_POWER
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf5340_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf5340_application.h
index a5dbcaa3db8..ab04db03f15 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf5340_application.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf5340_application.h
@@ -596,6 +596,15 @@
 #define NRFX_PDM_CONFIG_LOG_LEVEL 3
 #endif
 
+/**
+ * @brief NRFX_PDM0_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_PDM0_ENABLED
+#define NRFX_PDM0_ENABLED 0
+#endif
+
 /**
  * @brief NRFX_POWER_ENABLED
  *
diff --git a/soc/nordic/common/Kconfig.peripherals b/soc/nordic/common/Kconfig.peripherals
index 57c90b05ef7..8ba97b225b9 100644
--- a/soc/nordic/common/Kconfig.peripherals
+++ b/soc/nordic/common/Kconfig.peripherals
@@ -129,6 +129,12 @@ config HAS_HW_NRF_OSCILLATORS
 config HAS_HW_NRF_PDM0
 	def_bool $(dt_nodelabel_enabled_with_compat,pdm0,$(DT_COMPAT_NORDIC_NRF_PDM))
 
+config HAS_HW_NRF_PDM20
+	def_bool $(dt_nodelabel_enabled_with_compat,pdm20,$(DT_COMPAT_NORDIC_NRF_PDM))
+
+config HAS_HW_NRF_PDM21
+	def_bool $(dt_nodelabel_enabled_with_compat,pdm21,$(DT_COMPAT_NORDIC_NRF_PDM))
+
 config HAS_HW_NRF_POWER
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_POWER))
 
diff --git a/soc/nordic/validate_base_addresses.c b/soc/nordic/validate_base_addresses.c
index 84d773159bc..07ae94a233b 100644
--- a/soc/nordic/validate_base_addresses.c
+++ b/soc/nordic/validate_base_addresses.c
@@ -222,6 +222,8 @@ CHECK_DT_REG(nfct, NRF_NFCT);
 CHECK_DT_REG(nrf_mpu, NRF_MPU);
 CHECK_DT_REG(oscillators, NRF_OSCILLATORS);
 CHECK_DT_REG(pdm0, NRF_PDM0);
+CHECK_DT_REG(pdm20, NRF_PDM20);
+CHECK_DT_REG(pdm21, NRF_PDM21);
 CHECK_DT_REG(power, NRF_POWER);
 CHECK_DT_REG(ppi, NRF_PPI);
 CHECK_DT_REG(pwm0, NRF_PWM0);

From 8291fe441fc239632175eba83ea7198787e2ad8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Wed, 25 Sep 2024 12:11:01 +0200
Subject: [PATCH 0217/2913] [nrf fromtree] drivers: audio: dmic: Add support
 for multiple nrf PDM instances
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Driver now uses multi-instance PDM nrfx API and
defines PDM device based on available instances.
It also introduces calculating PDM frequency using
prescaler, present on nRF54L15 FP1.
Updated nrfx API version changed to 3.7 to use the
new PDM API.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit f8466b4791cd53b5d1049e55c0f3f8add3467b4f)
(cherry picked from commit 0ce0e147c1a03dbedc0faa50d0c416e372a194f0)
(cherry picked from commit 14227a37cdbd190b501debbeb14dfd0e7a456f13)
---
 drivers/audio/Kconfig.dmic_pdm_nrfx          |  2 +
 drivers/audio/dmic_nrfx_pdm.c                | 96 ++++++++++++++++----
 modules/hal_nordic/nrfx/nrfx_config_common.h |  2 +-
 3 files changed, 83 insertions(+), 17 deletions(-)

diff --git a/drivers/audio/Kconfig.dmic_pdm_nrfx b/drivers/audio/Kconfig.dmic_pdm_nrfx
index dfbda8259f2..51a56bebb54 100644
--- a/drivers/audio/Kconfig.dmic_pdm_nrfx
+++ b/drivers/audio/Kconfig.dmic_pdm_nrfx
@@ -6,6 +6,8 @@ config AUDIO_DMIC_NRFX_PDM
 	default y
 	depends on DT_HAS_NORDIC_NRF_PDM_ENABLED
 	select NRFX_PDM0 if HAS_HW_NRF_PDM0
+	select NRFX_PDM20 if HAS_HW_NRF_PDM20
+	select NRFX_PDM21 if HAS_HW_NRF_PDM21
 	select PINCTRL
 	help
 	  Enable support for nrfx PDM driver for nRF MCU series.
diff --git a/drivers/audio/dmic_nrfx_pdm.c b/drivers/audio/dmic_nrfx_pdm.c
index c663aa177b2..971fd902665 100644
--- a/drivers/audio/dmic_nrfx_pdm.c
+++ b/drivers/audio/dmic_nrfx_pdm.c
@@ -15,6 +15,7 @@
 LOG_MODULE_REGISTER(dmic_nrfx_pdm, CONFIG_AUDIO_DMIC_LOG_LEVEL);
 
 struct dmic_nrfx_pdm_drv_data {
+	const nrfx_pdm_t *pdm;
 	struct onoff_manager *clk_mgr;
 	struct onoff_client clk_cli;
 	struct k_mem_slab *mem_slab;
@@ -58,8 +59,7 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 			LOG_ERR("Failed to allocate buffer: %d", ret);
 			stop = true;
 		} else {
-			err = nrfx_pdm_buffer_set(buffer,
-						  drv_data->block_size / 2);
+			err = nrfx_pdm_buffer_set(drv_data->pdm, buffer, drv_data->block_size / 2);
 			if (err != NRFX_SUCCESS) {
 				LOG_ERR("Failed to set buffer: 0x%08x", err);
 				stop = true;
@@ -94,10 +94,15 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 
 	if (stop) {
 		drv_data->stopping = true;
-		nrfx_pdm_stop();
+		nrfx_pdm_stop(drv_data->pdm);
 	}
 }
 
+static bool is_in_freq_range(uint32_t freq, const struct dmic_cfg *pdm_cfg)
+{
+	return freq >= pdm_cfg->io.min_pdm_clk_freq && freq <= pdm_cfg->io.max_pdm_clk_freq;
+}
+
 static bool is_better(uint32_t freq,
 		      uint8_t ratio,
 		      uint32_t req_rate,
@@ -132,6 +137,37 @@ static bool check_pdm_frequencies(const struct dmic_nrfx_pdm_drv_cfg *drv_cfg,
 	uint32_t req_rate = pdm_cfg->streams[0].pcm_rate;
 	bool better_found = false;
 
+#if NRF_PDM_HAS_PRESCALER
+	uint32_t src_freq = 32 * 1000 * 1000UL;
+	uint32_t req_freq = req_rate * ratio;
+	uint32_t prescaler = src_freq / req_freq;
+	uint32_t act_freq = src_freq / prescaler;
+
+	if (is_in_freq_range(act_freq, pdm_cfg) &&
+	    is_better(act_freq, ratio, req_rate, best_diff, best_rate, best_freq)) {
+		config->prescaler = prescaler;
+
+		better_found = true;
+	}
+
+	/* Stop if an exact rate match is found. */
+	if (*best_diff == 0) {
+		return true;
+	}
+
+	/* Prescaler value is rounded down by default,
+	 * thus value rounded up should be checked as well.
+	 */
+	prescaler += 1;
+	act_freq  = src_freq / prescaler;
+
+	if (is_in_freq_range(act_freq, pdm_cfg) &&
+	    is_better(act_freq, ratio, req_rate, best_diff, best_rate, best_freq)) {
+		config->prescaler = prescaler;
+
+		better_found = true;
+	}
+#else
 	if (IS_ENABLED(CONFIG_SOC_SERIES_NRF53X)) {
 		const uint32_t src_freq =
 			(NRF_PDM_HAS_MCLKCONFIG && drv_cfg->clk_src == ACLK)
@@ -158,10 +194,8 @@ static bool check_pdm_frequencies(const struct dmic_nrfx_pdm_drv_cfg *drv_cfg,
 						 (src_freq + req_freq / 2));
 		uint32_t act_freq = src_freq / (1048576 / clk_factor);
 
-		if (act_freq >= pdm_cfg->io.min_pdm_clk_freq &&
-		    act_freq <= pdm_cfg->io.max_pdm_clk_freq &&
-		    is_better(act_freq, ratio, req_rate,
-			      best_diff, best_rate, best_freq)) {
+		if (is_in_freq_range(act_freq, pdm_cfg) &&
+		    is_better(act_freq, ratio, req_rate, best_diff, best_rate, best_freq)) {
 			config->clock_freq = clk_factor * 4096;
 
 			better_found = true;
@@ -216,6 +250,7 @@ static bool check_pdm_frequencies(const struct dmic_nrfx_pdm_drv_cfg *drv_cfg,
 			}
 		}
 	}
+#endif /* NRF_PDM_HAS_PRESCALER */
 
 	return better_found;
 }
@@ -236,8 +271,26 @@ static bool find_suitable_clock(const struct dmic_nrfx_pdm_drv_cfg *drv_cfg,
 		uint8_t         ratio_val;
 		nrf_pdm_ratio_t ratio_enum;
 	} ratios[] = {
-		{  64, NRF_PDM_RATIO_64X },
-		{  80, NRF_PDM_RATIO_80X }
+#if defined(PDM_RATIO_RATIO_Ratio32)
+		{ 32, NRF_PDM_RATIO_32X },
+#endif
+#if defined(PDM_RATIO_RATIO_Ratio48)
+		{ 48, NRF_PDM_RATIO_48X },
+#endif
+#if defined(PDM_RATIO_RATIO_Ratio50)
+		{ 50, NRF_PDM_RATIO_50X },
+#endif
+		{ 64, NRF_PDM_RATIO_64X },
+		{ 80, NRF_PDM_RATIO_80X },
+#if defined(PDM_RATIO_RATIO_Ratio96)
+		{ 96, NRF_PDM_RATIO_96X },
+#endif
+#if defined(PDM_RATIO_RATIO_Ratio100)
+		{ 100, NRF_PDM_RATIO_100X },
+#endif
+#if defined(PDM_RATIO_RATIO_Ratio128)
+		{ 128, NRF_PDM_RATIO_128X }
+#endif
 	};
 
 	for (int r = 0; best_diff != 0 && r < ARRAY_SIZE(ratios); ++r) {
@@ -327,7 +380,7 @@ static int dmic_nrfx_pdm_configure(const struct device *dev,
 	/* If either rate or width is 0, the stream is to be disabled. */
 	if (stream->pcm_rate == 0 || stream->pcm_width == 0) {
 		if (drv_data->configured) {
-			nrfx_pdm_uninit();
+			nrfx_pdm_uninit(drv_data->pdm);
 			drv_data->configured = false;
 		}
 
@@ -357,11 +410,11 @@ static int dmic_nrfx_pdm_configure(const struct device *dev,
 	}
 
 	if (drv_data->configured) {
-		nrfx_pdm_uninit();
+		nrfx_pdm_uninit(drv_data->pdm);
 		drv_data->configured = false;
 	}
 
-	err = nrfx_pdm_init(&nrfx_cfg, drv_cfg->event_handler);
+	err = nrfx_pdm_init(drv_data->pdm, &nrfx_cfg, drv_cfg->event_handler);
 	if (err != NRFX_SUCCESS) {
 		LOG_ERR("Failed to initialize PDM: 0x%08x", err);
 		return -EIO;
@@ -385,7 +438,7 @@ static int start_transfer(struct dmic_nrfx_pdm_drv_data *drv_data)
 	nrfx_err_t err;
 	int ret;
 
-	err = nrfx_pdm_start();
+	err = nrfx_pdm_start(drv_data->pdm);
 	if (err == NRFX_SUCCESS) {
 		return 0;
 	}
@@ -460,7 +513,7 @@ static int dmic_nrfx_pdm_trigger(const struct device *dev,
 	case DMIC_TRIGGER_STOP:
 		if (drv_data->active) {
 			drv_data->stopping = true;
-			nrfx_pdm_stop();
+			nrfx_pdm_stop(drv_data->pdm);
 		}
 		break;
 
@@ -541,16 +594,18 @@ static const struct _dmic_ops dmic_ops = {
 #define PDM_NRFX_DEVICE(idx)						     \
 	static void *rx_msgs##idx[DT_PROP(PDM(idx), queue_size)];	     \
 	static struct dmic_nrfx_pdm_drv_data dmic_nrfx_pdm_data##idx;	     \
+	static const nrfx_pdm_t dmic_nrfx_pdm##idx = NRFX_PDM_INSTANCE(idx); \
 	static int pdm_nrfx_init##idx(const struct device *dev)		     \
 	{								     \
 		IRQ_CONNECT(DT_IRQN(PDM(idx)), DT_IRQ(PDM(idx), priority),   \
-			    nrfx_isr, nrfx_pdm_irq_handler, 0);		     \
+			    nrfx_isr, nrfx_pdm_##idx##_irq_handler, 0);      \
 		const struct dmic_nrfx_pdm_drv_cfg *drv_cfg = dev->config;   \
 		int err = pinctrl_apply_state(drv_cfg->pcfg,		     \
 					      PINCTRL_STATE_DEFAULT);	     \
 		if (err < 0) {						     \
 			return err;					     \
 		}							     \
+		dmic_nrfx_pdm_data##idx.pdm = &dmic_nrfx_pdm##idx;	     \
 		k_msgq_init(&dmic_nrfx_pdm_data##idx.rx_queue,		     \
 			    (char *)rx_msgs##idx, sizeof(void *),	     \
 			    ARRAY_SIZE(rx_msgs##idx));			     \
@@ -582,5 +637,14 @@ static const struct _dmic_ops dmic_ops = {
 			 POST_KERNEL, CONFIG_AUDIO_DMIC_INIT_PRIORITY,	     \
 			 &dmic_ops);
 
-/* Existing SoCs only have one PDM instance. */
+#ifdef CONFIG_HAS_HW_NRF_PDM0
 PDM_NRFX_DEVICE(0);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_PDM20
+PDM_NRFX_DEVICE(20);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_PDM21
+PDM_NRFX_DEVICE(21);
+#endif
diff --git a/modules/hal_nordic/nrfx/nrfx_config_common.h b/modules/hal_nordic/nrfx/nrfx_config_common.h
index f156c21777f..e04a11c6df8 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_common.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_common.h
@@ -18,7 +18,7 @@
 
 /** @brief Symbol specifying minor version of the nrfx API to be used. */
 #ifndef NRFX_CONFIG_API_VER_MINOR
-#define NRFX_CONFIG_API_VER_MINOR 6
+#define NRFX_CONFIG_API_VER_MINOR 7
 #endif
 
 /** @brief Symbol specifying micro version of the nrfx API to be used. */

From 611eb7baae9cead2615acd0613e826e49dd2fd39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Wed, 25 Sep 2024 12:16:22 +0200
Subject: [PATCH 0218/2913] [nrf fromtree] samples: drivers: audio: dmic: Add
 nRF54L15 to the sample
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

nRF54L15 FP1 can now be used in dmic audio sample.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit 3013604f1ba68cc52a4d334f766b454401650681)
(cherry picked from commit 41853353e2f555dce55ff55ab88af503ad5c113d)
(cherry picked from commit 0bcf41f96244181f2a1fb905aa589124e6c4eabc)
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 21 +++++++++++++++++++
 samples/drivers/audio/dmic/sample.yaml        |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 samples/drivers/audio/dmic/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/samples/drivers/audio/dmic/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/drivers/audio/dmic/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..6131d6d7193
--- /dev/null
+++ b/samples/drivers/audio/dmic/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	pdm20_default_alt: pdm20_default_alt {
+		group1 {
+			psels = <NRF_PSEL(PDM_CLK, 1, 12)>,
+				<NRF_PSEL(PDM_DIN, 1, 13)>;
+		};
+	};
+};
+
+dmic_dev: &pdm20 {
+	status = "okay";
+	pinctrl-0 = <&pdm20_default_alt>;
+	pinctrl-names = "default";
+	clock-source = "PCLK32M";
+};
diff --git a/samples/drivers/audio/dmic/sample.yaml b/samples/drivers/audio/dmic/sample.yaml
index 8cc5464b781..3f8dc0b1610 100644
--- a/samples/drivers/audio/dmic/sample.yaml
+++ b/samples/drivers/audio/dmic/sample.yaml
@@ -7,6 +7,7 @@ tests:
     integration_platforms:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     harness: console
     harness_config:
       type: multi_line

From 0e7c05ad8e727f611b9e908e5bc2e685ff2371be Mon Sep 17 00:00:00 2001
From: Emilio Aguila Escalante <emilio.aguila@hotmail.com>
Date: Wed, 23 Oct 2024 09:35:57 +0200
Subject: [PATCH 0219/2913] [nrf fromtree] Bluetooth: Mesh: Use dfd_phase_set()
 in dfu_suspended()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently, dfu_suspended() sets the phase SUSPENDED
directly in the structure, bypassing the dfd_phase_set() function.
This prevents the phase change callback in the bt_mesh_dfd_srv_cb
structure from receiving the SUSPENDED event.

Signed-off-by: Emilio Aguila Escalante <emilio.aguila@hotmail.com>
(cherry picked from commit dda9ba6031daea1d2a76a7f26edd720192c77887)
Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 55f4bae210607307dd9e4c380c98092c83ec6140)
---
 subsys/bluetooth/mesh/dfd_srv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/bluetooth/mesh/dfd_srv.c b/subsys/bluetooth/mesh/dfd_srv.c
index e765f2d5d7b..4a395a175bd 100644
--- a/subsys/bluetooth/mesh/dfd_srv.c
+++ b/subsys/bluetooth/mesh/dfd_srv.c
@@ -801,7 +801,7 @@ static void dfu_suspended(struct bt_mesh_dfu_cli *cli)
 	struct bt_mesh_dfd_srv *srv =
 		CONTAINER_OF(cli, struct bt_mesh_dfd_srv, dfu);
 
-	srv->phase = BT_MESH_DFD_PHASE_TRANSFER_SUSPENDED;
+	dfd_phase_set(srv, BT_MESH_DFD_PHASE_TRANSFER_SUSPENDED);
 }
 
 static void dfu_ended(struct bt_mesh_dfu_cli *cli,

From fddbc575139c96a41849a310752b5e1dc0f263f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5vard=20Reierstad?= <haavard.reierstad@nordicsemi.no>
Date: Wed, 23 Oct 2024 09:35:57 +0200
Subject: [PATCH 0220/2913] [nrf fromtree] Tests: Bluetooth: Tester: Increase
 the number of max mesh tx segments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Increasing the number of max tx segments to be able to fit composition
page 0 into composition data status message.

After the subnet bridge config client and server are added to the
tester, the size needed to report composition data page 0 increased.
Current behaviour of the tester is correct, dropping the element when
there is not enough space in data field, however the PTS application
does not handle the composition data status message without element.

Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
(cherry picked from commit 9ae8ebfadef412ed6981445988bbc05f1d23bba5)
Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit e04e4827f88e0be08c6f2fe73e17a37f726677e0)
---
 tests/bluetooth/tester/overlay-mesh.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/bluetooth/tester/overlay-mesh.conf b/tests/bluetooth/tester/overlay-mesh.conf
index a9e96686da8..1e488bad00b 100644
--- a/tests/bluetooth/tester/overlay-mesh.conf
+++ b/tests/bluetooth/tester/overlay-mesh.conf
@@ -15,6 +15,7 @@ CONFIG_BT_MESH_HEALTH_CLI=y
 CONFIG_BT_MESH_FRIEND=y
 CONFIG_BT_MESH_FRIEND_QUEUE_SIZE=32
 CONFIG_BT_MESH_RX_SEG_MAX=13
+CONFIG_BT_MESH_TX_SEG_MAX=7
 CONFIG_BT_MESH_TX_SEG_MSG_COUNT=3
 CONFIG_BT_MESH_LPN_POLL_TIMEOUT=100
 CONFIG_BT_MESH_PROVISIONER=y

From bf70215e395edab94716e006f30f09add2b89f00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5vard=20Reierstad?= <haavard.reierstad@nordicsemi.no>
Date: Wed, 23 Oct 2024 09:35:57 +0200
Subject: [PATCH 0221/2913] [nrf fromtree] Bluetooth: Mesh: Add prefix to
 Subnet Bridge API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds the `bt_mesh_brg_cfg` prefix to the public Subnet Bridge API, and
aligns the function and callback naming with the rest of the Bluetooth
Mesh API.

Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 8049c249940a0a073ee2b849f31c85d2385f993d)
Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 1a23393afdf11cf9df220c7bf2846c4cb31e16e5)
---
 .../bluetooth/api/mesh/brg_cfg.rst            |  15 +-
 include/zephyr/bluetooth/mesh/brg_cfg.h       |  24 ++--
 include/zephyr/bluetooth/mesh/brg_cfg_cli.h   |  76 +++++------
 subsys/bluetooth/mesh/brg_cfg_cli.c           | 102 +++++++-------
 subsys/bluetooth/mesh/brg_cfg_srv.c           |  10 +-
 subsys/bluetooth/mesh/shell/brg_cfg.c         |  58 ++++----
 tests/bluetooth/tester/src/btp_mesh.c         |  35 +++--
 tests/bsim/bluetooth/mesh/src/test_brg.c      | 129 +++++++++---------
 8 files changed, 215 insertions(+), 234 deletions(-)

diff --git a/doc/connectivity/bluetooth/api/mesh/brg_cfg.rst b/doc/connectivity/bluetooth/api/mesh/brg_cfg.rst
index b118116f620..d6e7462c546 100644
--- a/doc/connectivity/bluetooth/api/mesh/brg_cfg.rst
+++ b/doc/connectivity/bluetooth/api/mesh/brg_cfg.rst
@@ -69,15 +69,15 @@ Enabling or disabling the Subnet Bridge feature
 
 The Bridge Configuration Client (or Configuration Manager) can enable or disable the Subnet Bridge
 feature on a node by sending a **Subnet Bridge Set** message to the Bridge Configuration
-Server model on the target node, using the :c:func:`bt_mesh_brg_cfg_cli_subnet_bridge_set` function.
+Server model on the target node, using the :c:func:`bt_mesh_brg_cfg_cli_set` function.
 
 Adding or removing subnets
 **************************
 
 The Bridge Configuration Client can add or remove an entry from the Bridging Table by sending a
 **Bridging Table Add** or **Bridging Table Remove** message to the Bridge Configuration
-Server model on the target node, calling the :c:func:`bt_mesh_brg_cfg_cli_bridging_table_add` or
-:c:func:`bt_mesh_brg_cfg_cli_bridging_table_remove` functions.
+Server model on the target node, calling the :c:func:`bt_mesh_brg_cfg_cli_table_add` or
+:c:func:`bt_mesh_brg_cfg_cli_table_remove` functions.
 
 .. _bluetooth_mesh_brg_cfg_states:
 
@@ -89,20 +89,19 @@ The Subnet Bridge has the following states:
 - *Subnet Bridge*: This state indicates whether the Subnet Bridge feature is enabled or disabled on
   the node.
   The Bridge Configuration Client can retrieve this information by sending a **Subnet Bridge Get**
-  message to the Bridge Configuration Server using the
-  :c:func:`bt_mesh_brg_cfg_cli_subnet_bridge_get` function.
+  message to the Bridge Configuration Server using the :c:func:`bt_mesh_brg_cfg_cli_get` function.
 
 - *Bridging Table*: This state holds the bridging table. The Client can request a list of
   entries from a Bridging Table by sending a **Bridging Table Get** message to the target node using
-  the :c:func:`bt_mesh_brg_cfg_cli_bridging_table_get` function.
+  the :c:func:`bt_mesh_brg_cfg_cli_table_get` function.
 
   The Client can get a list of subnets currently bridged by a Subnet Bridge by sending a
   **Bridged Subnets Get** message to the target Server by calling the
-  :c:func:`bt_mesh_brg_cfg_cli_bridged_subnets_get` function.
+  :c:func:`bt_mesh_brg_cfg_cli_subnets_get` function.
 
 - *Bridging Table Size*: This state reports the maximum number of entries the Bridging Table can
   store. The Client can retrieve this information by sending a **Bridging Table Size Get** message
-  using the :c:func:`bt_mesh_brg_cfg_cli_bridging_table_size_get` function.
+  using the :c:func:`bt_mesh_brg_cfg_cli_table_size_get` function.
   This is a read-only state.
 
 Subnet bridging and replay protection
diff --git a/include/zephyr/bluetooth/mesh/brg_cfg.h b/include/zephyr/bluetooth/mesh/brg_cfg.h
index 906a2e0bb38..a488fed09c5 100644
--- a/include/zephyr/bluetooth/mesh/brg_cfg.h
+++ b/include/zephyr/bluetooth/mesh/brg_cfg.h
@@ -21,20 +21,20 @@ extern "C" {
  */
 
 /** Subnet Bridge states */
-enum bt_mesh_subnet_bridge_state {
+enum bt_mesh_brg_cfg_state {
 	/** Subnet bridge functionality is disabled. */
-	BT_MESH_SUBNET_BRIDGE_DISABLED,
+	BT_MESH_BRG_CFG_DISABLED,
 	/** Subnet bridge state functionality is enabled. */
-	BT_MESH_SUBNET_BRIDGE_ENABLED,
+	BT_MESH_BRG_CFG_ENABLED,
 };
 
 /* Briding from Addr1 to Addr2. */
-#define BT_MESH_SUBNET_BRIDGE_DIR_ONEWAY 1
+#define BT_MESH_BRG_CFG_DIR_ONEWAY 1
 /* Bidirectional briging between Addr1 and Addr2. */
-#define BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY 2
+#define BT_MESH_BRG_CFG_DIR_TWOWAY 2
 
 /** Bridging Table state entry corresponding to a entry in the Bridging Table. */
-struct bt_mesh_bridging_table_entry {
+struct bt_mesh_brg_cfg_table_entry {
 	/** Allowed directions for the bridged traffic (or bridged traffic not allowed) */
 	uint8_t directions;
 	/** NetKey Index of the first subnet */
@@ -48,24 +48,24 @@ struct bt_mesh_bridging_table_entry {
 };
 
 /** Bridging Table Status response */
-struct bt_mesh_bridging_table_status {
+struct bt_mesh_brg_cfg_table_status {
 	/** Status Code of the requesting message */
 	uint8_t status;
 	/** Requested Bridging Table entry */
-	struct bt_mesh_bridging_table_entry entry;
+	struct bt_mesh_brg_cfg_table_entry entry;
 };
 
 /** Used to filter set of pairs of NetKey Indexes from the Bridging Table */
-struct bt_mesh_filter_netkey {
+struct bt_mesh_brg_cfg_filter_netkey {
 	uint16_t filter: 2,    /* Filter applied to the set of pairs of NetKey Indexes */
 		prohibited: 2, /* Prohibited */
 		net_idx: 12;   /* NetKey Index used for filtering or ignored */
 };
 
 /** Bridged Subnets List response */
-struct bt_mesh_bridged_subnets_list {
+struct bt_mesh_brg_cfg_subnets_list {
 	/** Filter applied NetKey Indexes, and NetKey Index used for filtering. */
-	struct bt_mesh_filter_netkey net_idx_filter;
+	struct bt_mesh_brg_cfg_filter_netkey net_idx_filter;
 	/** Start offset in units of bridges */
 	uint8_t start_idx;
 	/** Pointer to allocated buffer for storing filtered of NetKey Indexes */
@@ -73,7 +73,7 @@ struct bt_mesh_bridged_subnets_list {
 };
 
 /** Bridging Table List response */
-struct bt_mesh_bridging_table_list {
+struct bt_mesh_brg_cfg_table_list {
 	/** Status Code of the requesting message */
 	uint8_t status;
 	/** NetKey Index of the first subnet */
diff --git a/include/zephyr/bluetooth/mesh/brg_cfg_cli.h b/include/zephyr/bluetooth/mesh/brg_cfg_cli.h
index c29650a5df9..37666ac6dcd 100644
--- a/include/zephyr/bluetooth/mesh/brg_cfg_cli.h
+++ b/include/zephyr/bluetooth/mesh/brg_cfg_cli.h
@@ -42,8 +42,8 @@ struct bt_mesh_brg_cfg_cli_cb {
 	 *  @param addr     Address of the sender.
 	 *  @param status   Status received from the server.
 	 */
-	void (*subnet_bridge_status)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr,
-				     enum bt_mesh_subnet_bridge_state status);
+	void (*bridge_status)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr,
+			      enum bt_mesh_brg_cfg_state status);
 
 	/** @brief Optional callback for Bridging Table Size Status message.
 	 *
@@ -54,8 +54,7 @@ struct bt_mesh_brg_cfg_cli_cb {
 	 *  @param addr     Address of the sender.
 	 *  @param size     Size received from the server.
 	 */
-	void (*bridging_table_size_status)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr,
-					   uint16_t size);
+	void (*table_size_status)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr, uint16_t size);
 
 	/** @brief Optional callback for Bridging Table Status message.
 	 *
@@ -66,8 +65,8 @@ struct bt_mesh_brg_cfg_cli_cb {
 	 *  @param addr     Address of the sender.
 	 *  @param rsp      Response received from the Bridging Configuration Server.
 	 */
-	void (*bridging_table_status)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr,
-				      struct bt_mesh_bridging_table_status *rsp);
+	void (*table_status)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr,
+			     struct bt_mesh_brg_cfg_table_status *rsp);
 
 	/** @brief Optional callback for Bridged Subnets List message.
 	 *
@@ -78,8 +77,8 @@ struct bt_mesh_brg_cfg_cli_cb {
 	 *  @param addr     Address of the sender.
 	 *  @param rsp      Response received from the Bridging Configuration Server.
 	 */
-	void (*bridged_subnets_list)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr,
-				     struct bt_mesh_bridged_subnets_list *rsp);
+	void (*subnets_list)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr,
+			     struct bt_mesh_brg_cfg_subnets_list *rsp);
 
 	/** @brief Optional callback for Bridging Table List message.
 	 *
@@ -90,8 +89,8 @@ struct bt_mesh_brg_cfg_cli_cb {
 	 *  @param addr     Address of the sender.
 	 *  @param rsp      Response received from the Bridging Configuration Server.
 	 */
-	void (*bridging_table_list)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr,
-				    struct bt_mesh_bridging_table_list *rsp);
+	void (*table_list)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr,
+			   struct bt_mesh_brg_cfg_table_list *rsp);
 };
 
 /** Bridge Configuration Client Model Context */
@@ -121,13 +120,12 @@ struct bt_mesh_brg_cfg_cli {
  *  @param net_idx Network index to encrypt the message with.
  *  @param addr    Target node address.
  *  @param status  Status response parameter, returns one of
- *                 @ref BT_MESH_SUBNET_BRIDGE_DISABLED or
- *                 @ref BT_MESH_SUBNET_BRIDGE_ENABLED on success.
+ *                 @ref BT_MESH_BRG_CFG_DISABLED or
+ *                 @ref BT_MESH_BRG_CFG_ENABLED on success.
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_brg_cfg_cli_subnet_bridge_get(uint16_t net_idx, uint16_t addr,
-					  enum bt_mesh_subnet_bridge_state *status);
+int bt_mesh_brg_cfg_cli_get(uint16_t net_idx, uint16_t addr, enum bt_mesh_brg_cfg_state *status);
 
 /** @brief Sends a Subnet Bridge Set message to the given destination address
  *  with the given parameters
@@ -145,17 +143,16 @@ int bt_mesh_brg_cfg_cli_subnet_bridge_get(uint16_t net_idx, uint16_t addr,
  *  @param net_idx Network index to encrypt the message with.
  *  @param addr    Target node address.
  *  @param val     Value to set the Subnet Bridge state to. Must be one of
- *                 @ref BT_MESH_SUBNET_BRIDGE_DISABLED or
- *                 @ref BT_MESH_SUBNET_BRIDGE_ENABLED.
+ *                 @ref BT_MESH_BRG_CFG_DISABLED or
+ *                 @ref BT_MESH_BRG_CFG_ENABLED.
  *  @param status  Status response parameter, returns one of
- *                 @ref BT_MESH_SUBNET_BRIDGE_DISABLED or
- *                 @ref BT_MESH_SUBNET_BRIDGE_ENABLED on success.
+ *                 @ref BT_MESH_BRG_CFG_DISABLED or
+ *                 @ref BT_MESH_BRG_CFG_ENABLED on success.
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_brg_cfg_cli_subnet_bridge_set(uint16_t net_idx, uint16_t addr,
-					  enum bt_mesh_subnet_bridge_state val,
-					  enum bt_mesh_subnet_bridge_state *status);
+int bt_mesh_brg_cfg_cli_set(uint16_t net_idx, uint16_t addr, enum bt_mesh_brg_cfg_state val,
+			    enum bt_mesh_brg_cfg_state *status);
 
 /** @brief Sends a Bridging Table Size Get message to the given destination
  *  address with the given parameters
@@ -176,7 +173,7 @@ int bt_mesh_brg_cfg_cli_subnet_bridge_set(uint16_t net_idx, uint16_t addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_brg_cfg_cli_bridging_table_size_get(uint16_t net_idx, uint16_t addr, uint16_t *size);
+int bt_mesh_brg_cfg_cli_table_size_get(uint16_t net_idx, uint16_t addr, uint16_t *size);
 
 /** @brief Sends a Bridging Table Add message to the given destination address
  *  with the given parameters
@@ -198,9 +195,9 @@ int bt_mesh_brg_cfg_cli_bridging_table_size_get(uint16_t net_idx, uint16_t addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_brg_cfg_cli_bridging_table_add(uint16_t net_idx, uint16_t addr,
-					   struct bt_mesh_bridging_table_entry *entry,
-					   struct bt_mesh_bridging_table_status *rsp);
+int bt_mesh_brg_cfg_cli_table_add(uint16_t net_idx, uint16_t addr,
+				  struct bt_mesh_brg_cfg_table_entry *entry,
+				  struct bt_mesh_brg_cfg_table_status *rsp);
 
 /** @brief Sends a Bridging Table Remove message to the given destination
  *  address with the given parameters
@@ -226,9 +223,9 @@ int bt_mesh_brg_cfg_cli_bridging_table_add(uint16_t net_idx, uint16_t addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_brg_cfg_cli_bridging_table_remove(uint16_t net_idx, uint16_t addr, uint16_t net_idx1,
-					      uint16_t net_idx2, uint16_t addr1, uint16_t addr2,
-					      struct bt_mesh_bridging_table_status *rsp);
+int bt_mesh_brg_cfg_cli_table_remove(uint16_t net_idx, uint16_t addr, uint16_t net_idx1,
+				     uint16_t net_idx2, uint16_t addr1, uint16_t addr2,
+				     struct bt_mesh_brg_cfg_table_status *rsp);
 
 /** @brief Sends a Bridged Subnets Get message to the given destination address
  *  with the given parameters
@@ -244,7 +241,7 @@ int bt_mesh_brg_cfg_cli_bridging_table_remove(uint16_t net_idx, uint16_t addr, u
  *
  *  When @c rsp is set, the user is responsible for providing a buffer for the
  *  filtered set of N pairs of NetKey Indexes in
- *  @ref bt_mesh_bridged_subnets_list::list. If a buffer is not provided, the
+ *  @ref bt_mesh_brg_cfg_subnets_list::list. If a buffer is not provided, the
  *  bridged subnets won't be copied.
 
  *  @param net_idx          Network index to encrypt the message with.
@@ -256,10 +253,9 @@ int bt_mesh_brg_cfg_cli_bridging_table_remove(uint16_t net_idx, uint16_t addr, u
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_brg_cfg_cli_bridged_subnets_get(uint16_t net_idx, uint16_t addr,
-					    struct bt_mesh_filter_netkey filter_net_idx,
-					    uint8_t start_idx,
-					    struct bt_mesh_bridged_subnets_list *rsp);
+int bt_mesh_brg_cfg_cli_subnets_get(uint16_t net_idx, uint16_t addr,
+				    struct bt_mesh_brg_cfg_filter_netkey filter_net_idx,
+				    uint8_t start_idx, struct bt_mesh_brg_cfg_subnets_list *rsp);
 
 /** @brief Sends a Bridging Table Get message to the given destination address
  *  with the given parameters
@@ -276,10 +272,10 @@ int bt_mesh_brg_cfg_cli_bridged_subnets_get(uint16_t net_idx, uint16_t addr,
  *
  *  When @c rsp is set, the user is responsible for providing a buffer for the
  *   filtered set of N pairs of NetKey Indexes in
- *  @ref bt_mesh_bridging_table_list::list. If a buffer is not provided, the
- *  bridged addresses won't be copied. If a buffer size is shorter than received
- *  list, only those many entries that fit in the buffer will be copied from the
- *  list, and rest will be discarded.
+ *  @ref bt_mesh_brg_cfg_table_list::list. If a buffer is not provided,
+ *  the bridged addresses won't be copied. If a buffer size is shorter than
+ *  received list, only those many entries that fit in the buffer will be copied
+ *  from the list, and rest will be discarded.
  *
  *  @param net_idx   Network index to encrypt the message with.
  *  @param addr      Target node address.
@@ -291,9 +287,9 @@ int bt_mesh_brg_cfg_cli_bridged_subnets_get(uint16_t net_idx, uint16_t addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_brg_cfg_cli_bridging_table_get(uint16_t net_idx, uint16_t addr, uint16_t net_idx1,
-					   uint16_t net_idx2, uint16_t start_idx,
-					   struct bt_mesh_bridging_table_list *rsp);
+int bt_mesh_brg_cfg_cli_table_get(uint16_t net_idx, uint16_t addr, uint16_t net_idx1,
+				  uint16_t net_idx2, uint16_t start_idx,
+				  struct bt_mesh_brg_cfg_table_list *rsp);
 
 /** @brief Get the current transmission timeout value.
  *
diff --git a/subsys/bluetooth/mesh/brg_cfg_cli.c b/subsys/bluetooth/mesh/brg_cfg_cli.c
index 229b0b6f892..3f398408708 100644
--- a/subsys/bluetooth/mesh/brg_cfg_cli.c
+++ b/subsys/bluetooth/mesh/brg_cfg_cli.c
@@ -17,12 +17,11 @@ static int32_t msg_timeout;
 
 static struct bt_mesh_brg_cfg_cli *cli;
 
-static int subnet_bridge_status(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
-				struct net_buf_simple *buf)
+static int bridge_status(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
+			 struct net_buf_simple *buf)
 {
-	enum bt_mesh_subnet_bridge_state status =
-		(enum bt_mesh_subnet_bridge_state)net_buf_simple_pull_u8(buf);
-	enum bt_mesh_subnet_bridge_state *rsp;
+	enum bt_mesh_brg_cfg_state status = (enum bt_mesh_brg_cfg_state)net_buf_simple_pull_u8(buf);
+	enum bt_mesh_brg_cfg_state *rsp;
 
 	if (bt_mesh_msg_ack_ctx_match(&cli->ack_ctx, OP_SUBNET_BRIDGE_STATUS, ctx->addr,
 				      (void **)&rsp)) {
@@ -30,17 +29,17 @@ static int subnet_bridge_status(const struct bt_mesh_model *model, struct bt_mes
 		bt_mesh_msg_ack_ctx_rx(&cli->ack_ctx);
 	}
 
-	if (cli->cb && cli->cb->subnet_bridge_status) {
-		cli->cb->subnet_bridge_status(cli, ctx->addr, status);
+	if (cli->cb && cli->cb->bridge_status) {
+		cli->cb->bridge_status(cli, ctx->addr, status);
 	}
 	return 0;
 }
 
-static int bridging_table_status(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
-				 struct net_buf_simple *buf)
+static int table_status(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
+			struct net_buf_simple *buf)
 {
-	struct bt_mesh_bridging_table_status table_status;
-	struct bt_mesh_bridging_table_status *rsp;
+	struct bt_mesh_brg_cfg_table_status table_status;
+	struct bt_mesh_brg_cfg_table_status *rsp;
 
 	table_status.status = net_buf_simple_pull_u8(buf);
 	table_status.entry.directions = net_buf_simple_pull_u8(buf);
@@ -63,17 +62,17 @@ static int bridging_table_status(const struct bt_mesh_model *model, struct bt_me
 		bt_mesh_msg_ack_ctx_rx(&cli->ack_ctx);
 	}
 
-	if (cli->cb && cli->cb->bridging_table_status) {
-		cli->cb->bridging_table_status(cli, ctx->addr, &table_status);
+	if (cli->cb && cli->cb->table_status) {
+		cli->cb->table_status(cli, ctx->addr, &table_status);
 	}
 	return 0;
 }
 
-static int bridged_subnets_list(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
-				struct net_buf_simple *buf)
+static int subnets_list(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
+			struct net_buf_simple *buf)
 {
-	struct bt_mesh_bridged_subnets_list subnets_list;
-	struct bt_mesh_bridged_subnets_list *rsp;
+	struct bt_mesh_brg_cfg_subnets_list subnets_list;
+	struct bt_mesh_brg_cfg_subnets_list *rsp;
 	uint16_t net_idx_filter;
 
 	net_idx_filter = net_buf_simple_pull_le16(buf);
@@ -102,17 +101,17 @@ static int bridged_subnets_list(const struct bt_mesh_model *model, struct bt_mes
 		bt_mesh_msg_ack_ctx_rx(&cli->ack_ctx);
 	}
 
-	if (cli->cb && cli->cb->bridged_subnets_list) {
-		cli->cb->bridged_subnets_list(cli, ctx->addr, &subnets_list);
+	if (cli->cb && cli->cb->subnets_list) {
+		cli->cb->subnets_list(cli, ctx->addr, &subnets_list);
 	}
 	return 0;
 }
 
-static int bridging_table_list(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
-			       struct net_buf_simple *buf)
+static int table_list(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
+		      struct net_buf_simple *buf)
 {
-	struct bt_mesh_bridging_table_list table_list;
-	struct bt_mesh_bridging_table_list *rsp;
+	struct bt_mesh_brg_cfg_table_list table_list;
+	struct bt_mesh_brg_cfg_table_list *rsp;
 
 	table_list.status = net_buf_simple_pull_u8(buf);
 	key_idx_unpack_pair(buf, &table_list.net_idx1, &table_list.net_idx2);
@@ -141,14 +140,14 @@ static int bridging_table_list(const struct bt_mesh_model *model, struct bt_mesh
 		bt_mesh_msg_ack_ctx_rx(&cli->ack_ctx);
 	}
 
-	if (cli->cb && cli->cb->bridging_table_list) {
-		cli->cb->bridging_table_list(cli, ctx->addr, &table_list);
+	if (cli->cb && cli->cb->table_list) {
+		cli->cb->table_list(cli, ctx->addr, &table_list);
 	}
 	return 0;
 }
 
-static int bridging_table_size_status(const struct bt_mesh_model *model,
-				      struct bt_mesh_msg_ctx *ctx, struct net_buf_simple *buf)
+static int table_size_status(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
+			     struct net_buf_simple *buf)
 {
 	uint16_t size = net_buf_simple_pull_le16(buf);
 	uint16_t *rsp;
@@ -159,18 +158,18 @@ static int bridging_table_size_status(const struct bt_mesh_model *model,
 		bt_mesh_msg_ack_ctx_rx(&cli->ack_ctx);
 	}
 
-	if (cli->cb && cli->cb->bridging_table_size_status) {
-		cli->cb->bridging_table_size_status(cli, ctx->addr, size);
+	if (cli->cb && cli->cb->table_size_status) {
+		cli->cb->table_size_status(cli, ctx->addr, size);
 	}
 	return 0;
 }
 
 const struct bt_mesh_model_op _bt_mesh_brg_cfg_cli_op[] = {
-	{OP_SUBNET_BRIDGE_STATUS, BT_MESH_LEN_EXACT(1), subnet_bridge_status},
-	{OP_BRIDGING_TABLE_STATUS, BT_MESH_LEN_EXACT(9), bridging_table_status},
-	{OP_BRIDGED_SUBNETS_LIST, BT_MESH_LEN_MIN(3), bridged_subnets_list},
-	{OP_BRIDGING_TABLE_LIST, BT_MESH_LEN_MIN(6), bridging_table_list},
-	{OP_BRIDGING_TABLE_SIZE_STATUS, BT_MESH_LEN_EXACT(2), bridging_table_size_status},
+	{OP_SUBNET_BRIDGE_STATUS, BT_MESH_LEN_EXACT(1), bridge_status},
+	{OP_BRIDGING_TABLE_STATUS, BT_MESH_LEN_EXACT(9), table_status},
+	{OP_BRIDGED_SUBNETS_LIST, BT_MESH_LEN_MIN(3), subnets_list},
+	{OP_BRIDGING_TABLE_LIST, BT_MESH_LEN_MIN(6), table_list},
+	{OP_BRIDGING_TABLE_SIZE_STATUS, BT_MESH_LEN_EXACT(2), table_size_status},
 	BT_MESH_MODEL_OP_END,
 };
 
@@ -202,8 +201,7 @@ const struct bt_mesh_model_cb _bt_mesh_brg_cfg_cli_cb = {
 	.init = brg_cfg_cli_init,
 };
 
-int bt_mesh_brg_cfg_cli_subnet_bridge_get(uint16_t net_idx, uint16_t addr,
-					  enum bt_mesh_subnet_bridge_state *status)
+int bt_mesh_brg_cfg_cli_get(uint16_t net_idx, uint16_t addr, enum bt_mesh_brg_cfg_state *status)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_SUBNET_BRIDGE_GET, 0);
 	struct bt_mesh_msg_ctx ctx = BT_MESH_MSG_CTX_INIT_DEV(net_idx, addr);
@@ -219,9 +217,8 @@ int bt_mesh_brg_cfg_cli_subnet_bridge_get(uint16_t net_idx, uint16_t addr,
 	return bt_mesh_msg_ackd_send(cli->model, &ctx, &msg, !status ? NULL : &rsp_ctx);
 }
 
-int bt_mesh_brg_cfg_cli_subnet_bridge_set(uint16_t net_idx, uint16_t addr,
-					  enum bt_mesh_subnet_bridge_state val,
-					  enum bt_mesh_subnet_bridge_state *status)
+int bt_mesh_brg_cfg_cli_set(uint16_t net_idx, uint16_t addr, enum bt_mesh_brg_cfg_state val,
+			    enum bt_mesh_brg_cfg_state *status)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_SUBNET_BRIDGE_SET, 1);
 	struct bt_mesh_msg_ctx ctx = BT_MESH_MSG_CTX_INIT_DEV(net_idx, addr);
@@ -238,7 +235,7 @@ int bt_mesh_brg_cfg_cli_subnet_bridge_set(uint16_t net_idx, uint16_t addr,
 	return bt_mesh_msg_ackd_send(cli->model, &ctx, &msg, !status ? NULL : &rsp_ctx);
 }
 
-int bt_mesh_brg_cfg_cli_bridging_table_size_get(uint16_t net_idx, uint16_t addr, uint16_t *size)
+int bt_mesh_brg_cfg_cli_table_size_get(uint16_t net_idx, uint16_t addr, uint16_t *size)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_BRIDGING_TABLE_SIZE_GET, 0);
 	struct bt_mesh_msg_ctx ctx = BT_MESH_MSG_CTX_INIT_DEV(net_idx, addr);
@@ -254,9 +251,9 @@ int bt_mesh_brg_cfg_cli_bridging_table_size_get(uint16_t net_idx, uint16_t addr,
 	return bt_mesh_msg_ackd_send(cli->model, &ctx, &msg, !size ? NULL : &rsp_ctx);
 }
 
-int bt_mesh_brg_cfg_cli_bridging_table_add(uint16_t net_idx, uint16_t addr,
-					   struct bt_mesh_bridging_table_entry *entry,
-					   struct bt_mesh_bridging_table_status *rsp)
+int bt_mesh_brg_cfg_cli_table_add(uint16_t net_idx, uint16_t addr,
+				  struct bt_mesh_brg_cfg_table_entry *entry,
+				  struct bt_mesh_brg_cfg_table_status *rsp)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_BRIDGING_TABLE_ADD, 8);
 	struct bt_mesh_msg_ctx ctx = BT_MESH_MSG_CTX_INIT_DEV(net_idx, addr);
@@ -292,9 +289,9 @@ int bt_mesh_brg_cfg_cli_bridging_table_add(uint16_t net_idx, uint16_t addr,
 	return bt_mesh_msg_ackd_send(cli->model, &ctx, &msg, !rsp ? NULL : &rsp_ctx);
 }
 
-int bt_mesh_brg_cfg_cli_bridging_table_remove(uint16_t net_idx, uint16_t addr, uint16_t net_idx1,
-					      uint16_t net_idx2, uint16_t addr1, uint16_t addr2,
-					      struct bt_mesh_bridging_table_status *rsp)
+int bt_mesh_brg_cfg_cli_table_remove(uint16_t net_idx, uint16_t addr, uint16_t net_idx1,
+				     uint16_t net_idx2, uint16_t addr1, uint16_t addr2,
+				     struct bt_mesh_brg_cfg_table_status *rsp)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_BRIDGING_TABLE_REMOVE, 7);
 	struct bt_mesh_msg_ctx ctx = BT_MESH_MSG_CTX_INIT_DEV(net_idx, addr);
@@ -321,10 +318,9 @@ int bt_mesh_brg_cfg_cli_bridging_table_remove(uint16_t net_idx, uint16_t addr, u
 	return bt_mesh_msg_ackd_send(cli->model, &ctx, &msg, !rsp ? NULL : &rsp_ctx);
 }
 
-int bt_mesh_brg_cfg_cli_bridged_subnets_get(uint16_t net_idx, uint16_t addr,
-					    struct bt_mesh_filter_netkey filter_net_idx,
-					    uint8_t start_idx,
-					    struct bt_mesh_bridged_subnets_list *rsp)
+int bt_mesh_brg_cfg_cli_subnets_get(uint16_t net_idx, uint16_t addr,
+				    struct bt_mesh_brg_cfg_filter_netkey filter_net_idx,
+				    uint8_t start_idx, struct bt_mesh_brg_cfg_subnets_list *rsp)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_BRIDGED_SUBNETS_GET, 3);
 	struct bt_mesh_msg_ctx ctx = BT_MESH_MSG_CTX_INIT_DEV(net_idx, addr);
@@ -342,9 +338,9 @@ int bt_mesh_brg_cfg_cli_bridged_subnets_get(uint16_t net_idx, uint16_t addr,
 	return bt_mesh_msg_ackd_send(cli->model, &ctx, &msg, !rsp ? NULL : &rsp_ctx);
 }
 
-int bt_mesh_brg_cfg_cli_bridging_table_get(uint16_t net_idx, uint16_t addr, uint16_t net_idx1,
-					   uint16_t net_idx2, uint16_t start_idx,
-					   struct bt_mesh_bridging_table_list *rsp)
+int bt_mesh_brg_cfg_cli_table_get(uint16_t net_idx, uint16_t addr, uint16_t net_idx1,
+				  uint16_t net_idx2, uint16_t start_idx,
+				  struct bt_mesh_brg_cfg_table_list *rsp)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_BRIDGING_TABLE_GET, 5);
 	struct bt_mesh_msg_ctx ctx = BT_MESH_MSG_CTX_INIT_DEV(net_idx, addr);
diff --git a/subsys/bluetooth/mesh/brg_cfg_srv.c b/subsys/bluetooth/mesh/brg_cfg_srv.c
index 7492caf3771..d622ebf48a2 100644
--- a/subsys/bluetooth/mesh/brg_cfg_srv.c
+++ b/subsys/bluetooth/mesh/brg_cfg_srv.c
@@ -40,7 +40,7 @@ static int subnet_bridge_set(const struct bt_mesh_model *model, struct bt_mesh_m
 {
 	uint8_t enable = net_buf_simple_pull_u8(buf);
 
-	if (enable > BT_MESH_SUBNET_BRIDGE_ENABLED) {
+	if (enable > BT_MESH_BRG_CFG_ENABLED) {
 		return -EINVAL;
 	}
 
@@ -52,7 +52,7 @@ static int subnet_bridge_set(const struct bt_mesh_model *model, struct bt_mesh_m
 
 static void bridging_table_status_send(const struct bt_mesh_model *model,
 				       struct bt_mesh_msg_ctx *ctx, uint8_t status,
-				       struct bt_mesh_bridging_table_entry *entry)
+				       struct bt_mesh_brg_cfg_table_entry *entry)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_BRIDGING_TABLE_STATUS, 9);
 
@@ -76,7 +76,7 @@ static bool netkey_check(uint16_t net_idx1, uint16_t net_idx2)
 static int bridging_table_add(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
 			      struct net_buf_simple *buf)
 {
-	struct bt_mesh_bridging_table_entry entry;
+	struct bt_mesh_brg_cfg_table_entry entry;
 	uint8_t status = STATUS_SUCCESS;
 	int err;
 
@@ -99,7 +99,7 @@ static int bridging_table_add(const struct bt_mesh_model *model, struct bt_mesh_
 static int bridging_table_remove(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
 				 struct net_buf_simple *buf)
 {
-	struct bt_mesh_bridging_table_entry entry;
+	struct bt_mesh_brg_cfg_table_entry entry;
 	uint8_t status = STATUS_SUCCESS;
 	int err;
 
@@ -135,7 +135,7 @@ static int bridged_subnets_get(const struct bt_mesh_model *model, struct bt_mesh
 		return -EINVAL;
 	}
 
-	struct bt_mesh_filter_netkey filter_net_idx;
+	struct bt_mesh_brg_cfg_filter_netkey filter_net_idx;
 
 	filter_net_idx.filter = net_idx_filter & BIT_MASK(2);
 	filter_net_idx.net_idx = (net_idx_filter >> 4) & BIT_MASK(12);
diff --git a/subsys/bluetooth/mesh/shell/brg_cfg.c b/subsys/bluetooth/mesh/shell/brg_cfg.c
index 43ab3e0b157..cefaaa47035 100644
--- a/subsys/bluetooth/mesh/shell/brg_cfg.c
+++ b/subsys/bluetooth/mesh/shell/brg_cfg.c
@@ -14,43 +14,43 @@
 
 static int cmd_subnet_bridge_get(const struct shell *sh, size_t argc, char *argv[])
 {
-	enum bt_mesh_subnet_bridge_state rsp;
+	enum bt_mesh_brg_cfg_state rsp;
 	int err;
 
-	err = bt_mesh_brg_cfg_cli_subnet_bridge_get(bt_mesh_shell_target_ctx.net_idx,
-						    bt_mesh_shell_target_ctx.dst, &rsp);
+	err = bt_mesh_brg_cfg_cli_get(bt_mesh_shell_target_ctx.net_idx,
+				      bt_mesh_shell_target_ctx.dst, &rsp);
 	if (err) {
 		shell_error(sh, "Failed to send Subnet Bridge Get (err %d)", err);
 		return -ENOEXEC;
 	}
 
 	shell_print(sh, "Subnet Bridge State: %s",
-		    (rsp == BT_MESH_SUBNET_BRIDGE_ENABLED) ? "Enabled" : "Disabled");
+		    (rsp == BT_MESH_BRG_CFG_ENABLED) ? "Enabled" : "Disabled");
 	return 0;
 }
 
 static int cmd_subnet_bridge_set(const struct shell *sh, size_t argc, char *argv[])
 {
-	enum bt_mesh_subnet_bridge_state set, rsp;
+	enum bt_mesh_brg_cfg_state set, rsp;
 	int err = 0;
 
-	set = shell_strtobool(argv[1], 0, &err) ? BT_MESH_SUBNET_BRIDGE_ENABLED
-						: BT_MESH_SUBNET_BRIDGE_DISABLED;
+	set = shell_strtobool(argv[1], 0, &err) ? BT_MESH_BRG_CFG_ENABLED
+						: BT_MESH_BRG_CFG_DISABLED;
 
 	if (err) {
 		shell_warn(sh, "Unable to parse input string argument");
 		return err;
 	}
 
-	err = bt_mesh_brg_cfg_cli_subnet_bridge_set(bt_mesh_shell_target_ctx.net_idx,
-						    bt_mesh_shell_target_ctx.dst, set, &rsp);
+	err = bt_mesh_brg_cfg_cli_set(bt_mesh_shell_target_ctx.net_idx,
+				      bt_mesh_shell_target_ctx.dst, set, &rsp);
 	if (err) {
 		shell_error(sh, "Failed to send Subnet Bridge Set (err %d)", err);
 		return -ENOEXEC;
 	}
 
 	shell_print(sh, "Subnet Bridge State: %s",
-		    (rsp == BT_MESH_SUBNET_BRIDGE_ENABLED) ? "Enabled" : "Disabled");
+		    (rsp == BT_MESH_BRG_CFG_ENABLED) ? "Enabled" : "Disabled");
 	return 0;
 }
 
@@ -59,8 +59,8 @@ static int cmd_bridging_table_size_get(const struct shell *sh, size_t argc, char
 	uint16_t rsp;
 	int err;
 
-	err = bt_mesh_brg_cfg_cli_bridging_table_size_get(bt_mesh_shell_target_ctx.net_idx,
-							  bt_mesh_shell_target_ctx.dst, &rsp);
+	err = bt_mesh_brg_cfg_cli_table_size_get(bt_mesh_shell_target_ctx.net_idx,
+						 bt_mesh_shell_target_ctx.dst, &rsp);
 	if (err) {
 		shell_error(sh, "Failed to send Bridging Table Size Get (err %d)", err);
 		return -ENOEXEC;
@@ -72,8 +72,8 @@ static int cmd_bridging_table_size_get(const struct shell *sh, size_t argc, char
 
 static int cmd_bridging_table_add(const struct shell *sh, size_t argc, char *argv[])
 {
-	struct bt_mesh_bridging_table_entry entry;
-	struct bt_mesh_bridging_table_status rsp;
+	struct bt_mesh_brg_cfg_table_entry entry;
+	struct bt_mesh_brg_cfg_table_status rsp;
 	int err = 0;
 
 	entry.directions = shell_strtoul(argv[1], 0, &err);
@@ -86,8 +86,8 @@ static int cmd_bridging_table_add(const struct shell *sh, size_t argc, char *arg
 		return err;
 	}
 
-	err = bt_mesh_brg_cfg_cli_bridging_table_add(bt_mesh_shell_target_ctx.net_idx,
-						     bt_mesh_shell_target_ctx.dst, &entry, &rsp);
+	err = bt_mesh_brg_cfg_cli_table_add(bt_mesh_shell_target_ctx.net_idx,
+					    bt_mesh_shell_target_ctx.dst, &entry, &rsp);
 	if (err) {
 		shell_error(sh, "Failed to send Bridging Table Add (err %d)", err);
 		return -ENOEXEC;
@@ -104,7 +104,7 @@ static int cmd_bridging_table_add(const struct shell *sh, size_t argc, char *arg
 static int cmd_bridging_table_remove(const struct shell *sh, size_t argc, char *argv[])
 {
 	uint16_t net_idx1, net_idx2, addr1, addr2;
-	struct bt_mesh_bridging_table_status rsp;
+	struct bt_mesh_brg_cfg_table_status rsp;
 	int err = 0;
 
 	net_idx1 = shell_strtoul(argv[1], 0, &err);
@@ -116,9 +116,9 @@ static int cmd_bridging_table_remove(const struct shell *sh, size_t argc, char *
 		return err;
 	}
 
-	err = bt_mesh_brg_cfg_cli_bridging_table_remove(bt_mesh_shell_target_ctx.net_idx,
-							bt_mesh_shell_target_ctx.dst, net_idx1,
-							net_idx2, addr1, addr2, &rsp);
+	err = bt_mesh_brg_cfg_cli_table_remove(bt_mesh_shell_target_ctx.net_idx,
+					       bt_mesh_shell_target_ctx.dst, net_idx1, net_idx2,
+					       addr1, addr2, &rsp);
 	if (err) {
 		shell_error(sh, "Failed to send Bridging Table Remove (err %d)", err);
 		return -ENOEXEC;
@@ -134,9 +134,9 @@ static int cmd_bridging_table_remove(const struct shell *sh, size_t argc, char *
 
 static int cmd_bridged_subnets_get(const struct shell *sh, size_t argc, char *argv[])
 {
-	struct bt_mesh_filter_netkey filter_net_idx;
+	struct bt_mesh_brg_cfg_filter_netkey filter_net_idx;
 	uint8_t start_idx;
-	struct bt_mesh_bridged_subnets_list rsp = {
+	struct bt_mesh_brg_cfg_subnets_list rsp = {
 		.list = NET_BUF_SIMPLE(CONFIG_BT_MESH_BRG_TABLE_ITEMS_MAX * 3),
 	};
 	int err = 0;
@@ -151,9 +151,9 @@ static int cmd_bridged_subnets_get(const struct shell *sh, size_t argc, char *ar
 		return err;
 	}
 
-	err = bt_mesh_brg_cfg_cli_bridged_subnets_get(bt_mesh_shell_target_ctx.net_idx,
-						      bt_mesh_shell_target_ctx.dst, filter_net_idx,
-						      start_idx, &rsp);
+	err = bt_mesh_brg_cfg_cli_subnets_get(bt_mesh_shell_target_ctx.net_idx,
+					      bt_mesh_shell_target_ctx.dst, filter_net_idx,
+					      start_idx, &rsp);
 	if (err) {
 		shell_error(sh, "Failed to send Bridged Subnets Get (err %d)", err);
 		return -ENOEXEC;
@@ -180,7 +180,7 @@ static int cmd_bridged_subnets_get(const struct shell *sh, size_t argc, char *ar
 static int cmd_bridging_table_get(const struct shell *sh, size_t argc, char *argv[])
 {
 	uint16_t net_idx1, net_idx2, start_idx;
-	struct bt_mesh_bridging_table_list rsp = {
+	struct bt_mesh_brg_cfg_table_list rsp = {
 		.list = NET_BUF_SIMPLE(CONFIG_BT_MESH_BRG_TABLE_ITEMS_MAX * 5),
 	};
 	int err = 0;
@@ -195,9 +195,9 @@ static int cmd_bridging_table_get(const struct shell *sh, size_t argc, char *arg
 		return err;
 	}
 
-	err = bt_mesh_brg_cfg_cli_bridging_table_get(bt_mesh_shell_target_ctx.net_idx,
-						     bt_mesh_shell_target_ctx.dst, net_idx1,
-						     net_idx2, start_idx, &rsp);
+	err = bt_mesh_brg_cfg_cli_table_get(bt_mesh_shell_target_ctx.net_idx,
+					    bt_mesh_shell_target_ctx.dst, net_idx1, net_idx2,
+					    start_idx, &rsp);
 	if (err) {
 		shell_error(sh, "Failed to send Bridging Table Get (err %d)", err);
 		return -ENOEXEC;
diff --git a/tests/bluetooth/tester/src/btp_mesh.c b/tests/bluetooth/tester/src/btp_mesh.c
index efd1d4c3584..2830d52556b 100644
--- a/tests/bluetooth/tester/src/btp_mesh.c
+++ b/tests/bluetooth/tester/src/btp_mesh.c
@@ -2086,10 +2086,10 @@ static uint8_t models_metadata_get(const void *cmd, uint16_t cmd_len,
 static uint8_t subnet_bridge_get(const void *cmd, uint16_t cmd_len, void *rsp, uint16_t *rsp_len)
 {
 	const struct btp_mesh_subnet_bridge_get_cmd *cp = cmd;
-	enum bt_mesh_subnet_bridge_state state;
+	enum bt_mesh_brg_cfg_state state;
 	int err;
 
-	err = bt_mesh_brg_cfg_cli_subnet_bridge_get(net.net_idx, sys_le16_to_cpu(cp->addr), &state);
+	err = bt_mesh_brg_cfg_cli_get(net.net_idx, sys_le16_to_cpu(cp->addr), &state);
 	if (err) {
 		LOG_ERR("err=%d", err);
 		return BTP_STATUS_FAILED;
@@ -2103,13 +2103,12 @@ static uint8_t subnet_bridge_get(const void *cmd, uint16_t cmd_len, void *rsp, u
 static uint8_t subnet_bridge_set(const void *cmd, uint16_t cmd_len, void *rsp, uint16_t *rsp_len)
 {
 	const struct btp_mesh_subnet_bridge_set_cmd *cp = cmd;
-	enum bt_mesh_subnet_bridge_state state;
+	enum bt_mesh_brg_cfg_state state;
 	int err;
 
 	state = cp->val;
 
-	err = bt_mesh_brg_cfg_cli_subnet_bridge_set(net.net_idx, sys_le16_to_cpu(cp->addr), state,
-						    &state);
+	err = bt_mesh_brg_cfg_cli_set(net.net_idx, sys_le16_to_cpu(cp->addr), state, &state);
 	if (err) {
 		LOG_ERR("err=%d", err);
 		return BTP_STATUS_FAILED;
@@ -2123,8 +2122,8 @@ static uint8_t subnet_bridge_set(const void *cmd, uint16_t cmd_len, void *rsp, u
 static uint8_t bridging_table_add(const void *cmd, uint16_t cmd_len, void *rsp, uint16_t *rsp_len)
 {
 	const struct btp_mesh_bridging_table_add_cmd *cp = cmd;
-	struct bt_mesh_bridging_table_entry entry;
-	struct bt_mesh_bridging_table_status rp;
+	struct bt_mesh_brg_cfg_table_entry entry;
+	struct bt_mesh_brg_cfg_table_status rp;
 	int err;
 
 	LOG_DBG("");
@@ -2135,8 +2134,7 @@ static uint8_t bridging_table_add(const void *cmd, uint16_t cmd_len, void *rsp,
 	entry.addr1 = sys_le16_to_cpu(cp->addr1);
 	entry.addr2 = sys_le16_to_cpu(cp->addr2);
 
-	err = bt_mesh_brg_cfg_cli_bridging_table_add(net_key_idx, sys_le16_to_cpu(cp->addr), &entry,
-						     &rp);
+	err = bt_mesh_brg_cfg_cli_table_add(net_key_idx, sys_le16_to_cpu(cp->addr), &entry, &rp);
 	if (err) {
 		LOG_ERR("err=%d", err);
 		return BTP_STATUS_FAILED;
@@ -2149,12 +2147,12 @@ static uint8_t bridging_table_remove(const void *cmd, uint16_t cmd_len, void *rs
 				     uint16_t *rsp_len)
 {
 	const struct btp_mesh_bridging_table_remove_cmd *cp = cmd;
-	struct bt_mesh_bridging_table_status rp;
+	struct bt_mesh_brg_cfg_table_status rp;
 	int err;
 
 	LOG_DBG("");
 
-	err = bt_mesh_brg_cfg_cli_bridging_table_remove(
+	err = bt_mesh_brg_cfg_cli_table_remove(
 		net_key_idx, sys_le16_to_cpu(cp->addr), sys_le16_to_cpu(cp->net_idx1),
 		sys_le16_to_cpu(cp->net_idx2), sys_le16_to_cpu(cp->addr1),
 		sys_le16_to_cpu(cp->addr2), &rp);
@@ -2170,8 +2168,8 @@ static uint8_t bridging_table_remove(const void *cmd, uint16_t cmd_len, void *rs
 static uint8_t bridged_subnets_get(const void *cmd, uint16_t cmd_len, void *rsp, uint16_t *rsp_len)
 {
 	const struct btp_mesh_bridged_subnets_get_cmd *cp = cmd;
-	struct bt_mesh_filter_netkey filter_net_idx;
-	struct bt_mesh_bridged_subnets_list rp;
+	struct bt_mesh_brg_cfg_filter_netkey filter_net_idx;
+	struct bt_mesh_brg_cfg_subnets_list rp;
 	int err;
 
 	LOG_DBG("");
@@ -2184,8 +2182,8 @@ static uint8_t bridged_subnets_get(const void *cmd, uint16_t cmd_len, void *rsp,
 	filter_net_idx.filter = cp->filter;
 	filter_net_idx.net_idx = sys_le16_to_cpu(cp->net_idx);
 
-	err = bt_mesh_brg_cfg_cli_bridged_subnets_get(net_key_idx, sys_le16_to_cpu(cp->addr),
-						      filter_net_idx, cp->start_idx, &rp);
+	err = bt_mesh_brg_cfg_cli_subnets_get(net_key_idx, sys_le16_to_cpu(cp->addr),
+					      filter_net_idx, cp->start_idx, &rp);
 	if (err) {
 		LOG_ERR("err=%d", err);
 		return BTP_STATUS_FAILED;
@@ -2197,7 +2195,7 @@ static uint8_t bridged_subnets_get(const void *cmd, uint16_t cmd_len, void *rsp,
 static uint8_t bridging_table_get(const void *cmd, uint16_t cmd_len, void *rsp, uint16_t *rsp_len)
 {
 	const struct btp_mesh_bridging_table_get_cmd *cp = cmd;
-	struct bt_mesh_bridging_table_list rp;
+	struct bt_mesh_brg_cfg_table_list rp;
 	int err;
 
 	LOG_DBG("");
@@ -2207,7 +2205,7 @@ static uint8_t bridging_table_get(const void *cmd, uint16_t cmd_len, void *rsp,
 	 */
 	rp.list = NULL;
 
-	err = bt_mesh_brg_cfg_cli_bridging_table_get(
+	err = bt_mesh_brg_cfg_cli_table_get(
 		net_key_idx, sys_le16_to_cpu(cp->addr), sys_le16_to_cpu(cp->net_idx1),
 		sys_le16_to_cpu(cp->net_idx2), sys_le16_to_cpu(cp->start_idx), &rp);
 	if (err) {
@@ -2227,8 +2225,7 @@ static uint8_t bridging_table_size_get(const void *cmd, uint16_t cmd_len, void *
 
 	LOG_DBG("");
 
-	err = bt_mesh_brg_cfg_cli_bridging_table_size_get(net_key_idx, sys_le16_to_cpu(cp->addr),
-							  &size);
+	err = bt_mesh_brg_cfg_cli_table_size_get(net_key_idx, sys_le16_to_cpu(cp->addr), &size);
 	if (err) {
 		LOG_ERR("err=%d", err);
 		return BTP_STATUS_FAILED;
diff --git a/tests/bsim/bluetooth/mesh/src/test_brg.c b/tests/bsim/bluetooth/mesh/src/test_brg.c
index 279bed1767b..5c82c4dce74 100644
--- a/tests/bsim/bluetooth/mesh/src/test_brg.c
+++ b/tests/bsim/bluetooth/mesh/src/test_brg.c
@@ -202,8 +202,8 @@ static void tester_setup(void)
 static void bridge_entry_add(uint16_t src, uint16_t dst, uint16_t net_idx1, uint16_t net_idx2,
 			     uint8_t dir)
 {
-	struct bt_mesh_bridging_table_entry entry;
-	struct bt_mesh_bridging_table_status rsp;
+	struct bt_mesh_brg_cfg_table_entry entry;
+	struct bt_mesh_brg_cfg_table_status rsp;
 	int err;
 
 	entry.directions = dir;
@@ -212,7 +212,7 @@ static void bridge_entry_add(uint16_t src, uint16_t dst, uint16_t net_idx1, uint
 	entry.addr1 = src;
 	entry.addr2 = dst;
 
-	err = bt_mesh_brg_cfg_cli_bridging_table_add(0, BRIDGE_ADDR, &entry, &rsp);
+	err = bt_mesh_brg_cfg_cli_table_add(0, BRIDGE_ADDR, &entry, &rsp);
 	if (err || rsp.status || rsp.entry.directions != dir || rsp.entry.net_idx1 != net_idx1 ||
 	    rsp.entry.net_idx2 != net_idx2 || rsp.entry.addr1 != src || rsp.entry.addr2 != dst) {
 		FAIL("Bridging table add failed (err %d) (status %u)", err, rsp.status);
@@ -222,10 +222,10 @@ static void bridge_entry_add(uint16_t src, uint16_t dst, uint16_t net_idx1, uint
 
 static void bridge_entry_remove(uint16_t src, uint16_t dst, uint16_t net_idx1, uint16_t net_idx2)
 {
-	struct bt_mesh_bridging_table_status rsp;
+	struct bt_mesh_brg_cfg_table_status rsp;
 
-	ASSERT_OK(bt_mesh_brg_cfg_cli_bridging_table_remove(0, BRIDGE_ADDR, net_idx1, net_idx2, src,
-							    dst, &rsp));
+	ASSERT_OK(bt_mesh_brg_cfg_cli_table_remove(0, BRIDGE_ADDR, net_idx1, net_idx2, src, dst,
+						   &rsp));
 	if (rsp.status) {
 		FAIL("Bridging table remove failed (status %u)", rsp.status);
 		return;
@@ -247,9 +247,8 @@ static void tester_bridge_configure(int subnets)
 		}
 	}
 
-	ASSERT_OK(bt_mesh_brg_cfg_cli_subnet_bridge_set(0, BRIDGE_ADDR,
-							BT_MESH_SUBNET_BRIDGE_ENABLED, &status));
-	if (status != BT_MESH_SUBNET_BRIDGE_ENABLED) {
+	ASSERT_OK(bt_mesh_brg_cfg_cli_set(0, BRIDGE_ADDR, BT_MESH_BRG_CFG_ENABLED, &status));
+	if (status != BT_MESH_BRG_CFG_ENABLED) {
 		FAIL("Subnet bridge set failed (status %u)", status);
 		return;
 	}
@@ -333,14 +332,14 @@ struct bridged_addresses_entry {
 static void bridge_table_verify(uint16_t net_idx1, uint16_t net_idx2, uint16_t start_idx,
 				struct bridged_addresses_entry *list, size_t list_len)
 {
-	struct bt_mesh_bridging_table_list rsp = {
+	struct bt_mesh_brg_cfg_table_list rsp = {
 		.list = NET_BUF_SIMPLE(BT_MESH_RX_SDU_MAX),
 	};
 
 	net_buf_simple_init(rsp.list, 0);
 
-	ASSERT_OK(bt_mesh_brg_cfg_cli_bridging_table_get(0, BRIDGE_ADDR, net_idx1, net_idx2,
-							 start_idx, &rsp));
+	ASSERT_OK(
+		bt_mesh_brg_cfg_cli_table_get(0, BRIDGE_ADDR, net_idx1, net_idx2, start_idx, &rsp));
 	ASSERT_EQUAL(rsp.status, 0);
 	ASSERT_EQUAL(rsp.net_idx1, net_idx1);
 	ASSERT_EQUAL(rsp.net_idx2, net_idx2);
@@ -472,7 +471,7 @@ static void test_tester_simple(void)
 	/* Adding devices to bridge table */
 	for (int i = 0; i < REMOTE_NODES; i++) {
 		bridge_entry_add(PROV_ADDR, DEVICE_ADDR_START + i, 0, i + 1,
-				 BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY);
+				 BT_MESH_BRG_CFG_DIR_TWOWAY);
 	}
 
 	for (int i = 0; i < REMOTE_NODES; i++) {
@@ -489,9 +488,8 @@ static void test_tester_simple(void)
 
 	LOG_INF("Step 2: Disabling bridging...");
 
-	err = bt_mesh_brg_cfg_cli_subnet_bridge_set(0, BRIDGE_ADDR, BT_MESH_SUBNET_BRIDGE_DISABLED,
-						    &status);
-	if (err || status != BT_MESH_SUBNET_BRIDGE_DISABLED) {
+	err = bt_mesh_brg_cfg_cli_set(0, BRIDGE_ADDR, BT_MESH_BRG_CFG_DISABLED, &status);
+	if (err || status != BT_MESH_BRG_CFG_DISABLED) {
 		FAIL("Subnet bridge set failed (err %d) (status %u)", err, status);
 		return;
 	}
@@ -506,9 +504,8 @@ static void test_tester_simple(void)
 	}
 
 	LOG_INF("Step3: Enabling bridging...");
-	err = bt_mesh_brg_cfg_cli_subnet_bridge_set(0, BRIDGE_ADDR, BT_MESH_SUBNET_BRIDGE_ENABLED,
-						    &status);
-	if (err || status != BT_MESH_SUBNET_BRIDGE_ENABLED) {
+	err = bt_mesh_brg_cfg_cli_set(0, BRIDGE_ADDR, BT_MESH_BRG_CFG_ENABLED, &status);
+	if (err || status != BT_MESH_BRG_CFG_ENABLED) {
 		FAIL("Subnet bridge set failed (err %d) (status %u)", err, status);
 		return;
 	}
@@ -554,7 +551,7 @@ static void test_tester_table_state_change(void)
 	ASSERT_EQUAL(err, -EAGAIN);
 
 	/* DATA and GET messages should reach Device 1, but STATUS message won't be received. */
-	bridge_entry_add(PROV_ADDR, DEVICE_ADDR_START, 0, 1, BT_MESH_SUBNET_BRIDGE_DIR_ONEWAY);
+	bridge_entry_add(PROV_ADDR, DEVICE_ADDR_START, 0, 1, BT_MESH_BRG_CFG_DIR_ONEWAY);
 
 	ASSERT_OK(send_data(DEVICE_ADDR_START, 0xAA));
 
@@ -569,19 +566,17 @@ static void test_tester_table_state_change(void)
 	/* Adding a reverse entry. This should be added to the bridge table as a separate entry as
 	 * the addresses and net keys indexs are provided in the opposite order.
 	 */
-	bridge_entry_add(DEVICE_ADDR_START, PROV_ADDR, 1, 0, BT_MESH_SUBNET_BRIDGE_DIR_ONEWAY);
-	bridge_table_verify(
-		0, 1, 0,
-		(struct bridged_addresses_entry[]){
-			{PROV_ADDR, DEVICE_ADDR_START, BT_MESH_SUBNET_BRIDGE_DIR_ONEWAY},
-		},
-		1);
-	bridge_table_verify(
-		1, 0, 0,
-		(struct bridged_addresses_entry[]){
-			{DEVICE_ADDR_START, PROV_ADDR, BT_MESH_SUBNET_BRIDGE_DIR_ONEWAY},
-		},
-		1);
+	bridge_entry_add(DEVICE_ADDR_START, PROV_ADDR, 1, 0, BT_MESH_BRG_CFG_DIR_ONEWAY);
+	bridge_table_verify(0, 1, 0,
+			    (struct bridged_addresses_entry[]){
+				    {PROV_ADDR, DEVICE_ADDR_START, BT_MESH_BRG_CFG_DIR_ONEWAY},
+			    },
+			    1);
+	bridge_table_verify(1, 0, 0,
+			    (struct bridged_addresses_entry[]){
+				    {DEVICE_ADDR_START, PROV_ADDR, BT_MESH_BRG_CFG_DIR_ONEWAY},
+			    },
+			    1);
 
 	k_sleep(K_SECONDS(1));
 
@@ -596,13 +591,12 @@ static void test_tester_table_state_change(void)
 	 * tester should still receive STATUS message.
 	 */
 	bridge_entry_remove(DEVICE_ADDR_START, PROV_ADDR, 1, 0);
-	bridge_entry_add(PROV_ADDR, DEVICE_ADDR_START, 0, 1, BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY);
-	bridge_table_verify(
-		0, 1, 0,
-		(struct bridged_addresses_entry[]){
-			{PROV_ADDR, DEVICE_ADDR_START, BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY},
-		},
-		1);
+	bridge_entry_add(PROV_ADDR, DEVICE_ADDR_START, 0, 1, BT_MESH_BRG_CFG_DIR_TWOWAY);
+	bridge_table_verify(0, 1, 0,
+			    (struct bridged_addresses_entry[]){
+				    {PROV_ADDR, DEVICE_ADDR_START, BT_MESH_BRG_CFG_DIR_TWOWAY},
+			    },
+			    1);
 	bridge_table_verify(1, 0, 0, NULL, 0);
 
 	ASSERT_OK(send_get(DEVICE_ADDR_START));
@@ -651,7 +645,7 @@ static void test_tester_net_key_remove(void)
 	/* Adding devices to bridge table */
 	for (int i = 0; i < REMOTE_NODES; i++) {
 		bridge_entry_add(PROV_ADDR, DEVICE_ADDR_START + i, 0, i + 1,
-				 BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY);
+				 BT_MESH_BRG_CFG_DIR_TWOWAY);
 	}
 
 	ASSERT_OK(send_data(DEVICE_ADDR_START, 0xAA));
@@ -667,21 +661,20 @@ static void test_tester_net_key_remove(void)
 	err = k_sem_take(&status_msg_recvd_sem, K_SECONDS(5));
 	ASSERT_EQUAL(err, -EAGAIN);
 
-	bridge_table_verify(
-		0, 2, 0,
-		(struct bridged_addresses_entry[]){
-			{PROV_ADDR, DEVICE_ADDR_START + 1, BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY},
-		},
-		1);
+	bridge_table_verify(0, 2, 0,
+			    (struct bridged_addresses_entry[]){
+				    {PROV_ADDR, DEVICE_ADDR_START + 1, BT_MESH_BRG_CFG_DIR_TWOWAY},
+			    },
+			    1);
 
 	/* Bridging Table Get message will return Invalid NetKey Index error because Subnet 1 is
 	 * removed.
 	 */
-	struct bt_mesh_bridging_table_list rsp = {
+	struct bt_mesh_brg_cfg_table_list rsp = {
 		.list = NULL,
 	};
 
-	ASSERT_OK(bt_mesh_brg_cfg_cli_bridging_table_get(0, BRIDGE_ADDR, 0, 1, 0, &rsp));
+	ASSERT_OK(bt_mesh_brg_cfg_cli_table_get(0, BRIDGE_ADDR, 0, 1, 0, &rsp));
 	ASSERT_EQUAL(rsp.status, 4);
 
 	PASS();
@@ -699,8 +692,8 @@ static void test_tester_persistence(void)
 
 		LOG_INF("Already provisioned, skipping provisioning");
 
-		ASSERT_OK(bt_mesh_brg_cfg_cli_subnet_bridge_get(0, BRIDGE_ADDR, &status));
-		if (status != BT_MESH_SUBNET_BRIDGE_ENABLED) {
+		ASSERT_OK(bt_mesh_brg_cfg_cli_get(0, BRIDGE_ADDR, &status));
+		if (status != BT_MESH_BRG_CFG_ENABLED) {
 			FAIL("Subnet bridge set failed (status %u)", status);
 			return;
 		}
@@ -708,30 +701,30 @@ static void test_tester_persistence(void)
 		bridge_table_verify(
 			0, 1, 0,
 			(struct bridged_addresses_entry[]){
-				{PROV_ADDR, DEVICE_ADDR_START, BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY},
+				{PROV_ADDR, DEVICE_ADDR_START, BT_MESH_BRG_CFG_DIR_TWOWAY},
 			},
 			1);
 
-		bridge_table_verify(0, 2, 0,
-				    (struct bridged_addresses_entry[]){
-					    {PROV_ADDR, DEVICE_ADDR_START + 1,
-					     BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY},
-				    },
-				    1);
+		bridge_table_verify(
+			0, 2, 0,
+			(struct bridged_addresses_entry[]){
+				{PROV_ADDR, DEVICE_ADDR_START + 1, BT_MESH_BRG_CFG_DIR_TWOWAY},
+			},
+			1);
 
 		bridge_table_verify(
 			1, 0, 0,
 			(struct bridged_addresses_entry[]){
-				{DEVICE_ADDR_START, PROV_ADDR, BT_MESH_SUBNET_BRIDGE_DIR_ONEWAY},
+				{DEVICE_ADDR_START, PROV_ADDR, BT_MESH_BRG_CFG_DIR_ONEWAY},
 			},
 			1);
 
-		bridge_table_verify(2, 0, 0,
-				    (struct bridged_addresses_entry[]){
-					    {DEVICE_ADDR_START + 1, PROV_ADDR,
-					     BT_MESH_SUBNET_BRIDGE_DIR_ONEWAY},
-				    },
-				    1);
+		bridge_table_verify(
+			2, 0, 0,
+			(struct bridged_addresses_entry[]){
+				{DEVICE_ADDR_START + 1, PROV_ADDR, BT_MESH_BRG_CFG_DIR_ONEWAY},
+			},
+			1);
 	} else {
 		tester_setup();
 
@@ -744,9 +737,9 @@ static void test_tester_persistence(void)
 		/* Adding devices to bridge table */
 		for (int i = 0; i < REMOTE_NODES; i++) {
 			bridge_entry_add(PROV_ADDR, DEVICE_ADDR_START + i, 0, i + 1,
-					 BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY);
+					 BT_MESH_BRG_CFG_DIR_TWOWAY);
 			bridge_entry_add(DEVICE_ADDR_START + i, PROV_ADDR, i + 1, 0,
-					 BT_MESH_SUBNET_BRIDGE_DIR_ONEWAY);
+					 BT_MESH_BRG_CFG_DIR_ONEWAY);
 		}
 
 		k_sleep(K_SECONDS(CONFIG_BT_MESH_STORE_TIMEOUT));
@@ -839,7 +832,7 @@ static void test_tester_ivu(void)
 	/* Adding devices to bridge table */
 	for (int i = 0; i < REMOTE_NODES; i++) {
 		bridge_entry_add(PROV_ADDR, DEVICE_ADDR_START + i, 0, i + 1,
-				 BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY);
+				 BT_MESH_BRG_CFG_DIR_TWOWAY);
 	}
 
 	for (int i = 0; i < REMOTE_NODES; i++) {

From 1087efe401c12cec15a1aa2314ae65445f176912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5vard=20Reierstad?= <haavard.reierstad@nordicsemi.no>
Date: Wed, 23 Oct 2024 09:35:57 +0200
Subject: [PATCH 0222/2913] [nrf fromtree] Bluetooth: Mesh: Remove duplicate
 brg declaration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removes duplicate declaration of the bridging direction, keeping the
one in the public header file.

Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 0fe6d34f8a49da81c5b9c2b9d324122a169c38a5)
Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 3e2e85b8bbb44f6f86281d27ae849af913b14822)
---
 include/zephyr/bluetooth/mesh/brg_cfg.h |  4 ++--
 subsys/bluetooth/mesh/brg_cfg.c         |  4 ++--
 subsys/bluetooth/mesh/brg_cfg.h         | 15 ++-------------
 tests/bluetooth/mesh/brg/src/main.c     |  5 +++++
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/include/zephyr/bluetooth/mesh/brg_cfg.h b/include/zephyr/bluetooth/mesh/brg_cfg.h
index a488fed09c5..754ecc9e3e4 100644
--- a/include/zephyr/bluetooth/mesh/brg_cfg.h
+++ b/include/zephyr/bluetooth/mesh/brg_cfg.h
@@ -28,9 +28,9 @@ enum bt_mesh_brg_cfg_state {
 	BT_MESH_BRG_CFG_ENABLED,
 };
 
-/* Briding from Addr1 to Addr2. */
+/* Bridging from Addr1 to Addr2. */
 #define BT_MESH_BRG_CFG_DIR_ONEWAY 1
-/* Bidirectional briging between Addr1 and Addr2. */
+/* Bidirectional bridging between Addr1 and Addr2. */
 #define BT_MESH_BRG_CFG_DIR_TWOWAY 2
 
 /** Bridging Table state entry corresponding to a entry in the Bridging Table. */
diff --git a/subsys/bluetooth/mesh/brg_cfg.c b/subsys/bluetooth/mesh/brg_cfg.c
index 9c90773faef..112d2fe0a3e 100644
--- a/subsys/bluetooth/mesh/brg_cfg.c
+++ b/subsys/bluetooth/mesh/brg_cfg.c
@@ -224,8 +224,8 @@ static bool netkey_check(uint16_t net_idx1, uint16_t net_idx2)
 	return bt_mesh_subnet_get(net_idx1) && bt_mesh_subnet_get(net_idx2);
 }
 
-int bt_mesh_brg_cfg_tbl_add(enum bt_mesh_brg_cfg_dir direction, uint16_t net_idx1,
-			    uint16_t net_idx2, uint16_t addr1, uint16_t addr2, uint8_t *status)
+int bt_mesh_brg_cfg_tbl_add(uint8_t direction, uint16_t net_idx1, uint16_t net_idx2, uint16_t addr1,
+			    uint16_t addr2, uint8_t *status)
 {
 	/* Sanity checks */
 	if (!BT_MESH_ADDR_IS_UNICAST(addr1) || net_idx1 == net_idx2 || addr1 == addr2 ||
diff --git a/subsys/bluetooth/mesh/brg_cfg.h b/subsys/bluetooth/mesh/brg_cfg.h
index af8cc5adc0f..4deddd05c1b 100644
--- a/subsys/bluetooth/mesh/brg_cfg.h
+++ b/subsys/bluetooth/mesh/brg_cfg.h
@@ -13,17 +13,6 @@
 
 #define BT_MESH_BRG_CFG_NKEY_PRHB_FLT_MASK 0x000C
 
-enum bt_mesh_brg_cfg_dir {
-	/* Value is prohibited. */
-	BT_MESH_BRG_CFG_DIR_PROHIBITED = 0,
-	/* Briging from Addr1 to Addr2. */
-	BT_MESH_BRG_CFG_DIR_ONEWAY = 1,
-	/* Briging to/from Addr1 from/to Addr2. */
-	BT_MESH_BRG_CFG_DIR_TWOWAY = 2,
-	/* Values above these are prohibited. */
-	BT_MESH_BRG_CFG_DIR_MAX = 3,
-};
-
 #define BT_MESH_BRG_CFG_NETIDX_NOMATCH 0xFFFF
 
 /* One row of the bridging table */
@@ -50,8 +39,8 @@ int bt_mesh_brg_cfg_tbl_reset(void);
 
 int bt_mesh_brg_cfg_tbl_get(const struct bt_mesh_brg_cfg_row **rows);
 
-int bt_mesh_brg_cfg_tbl_add(enum bt_mesh_brg_cfg_dir direction, uint16_t net_idx1,
-			    uint16_t net_idx2, uint16_t addr1, uint16_t addr2, uint8_t *status);
+int bt_mesh_brg_cfg_tbl_add(uint8_t direction, uint16_t net_idx1, uint16_t net_idx2, uint16_t addr1,
+			    uint16_t addr2, uint8_t *status);
 
 int bt_mesh_brg_cfg_tbl_remove(uint16_t net_idx1, uint16_t net_idx2, uint16_t addr1, uint16_t addr2,
 			       uint8_t *status);
diff --git a/tests/bluetooth/mesh/brg/src/main.c b/tests/bluetooth/mesh/brg/src/main.c
index 65cf5424012..2b98722e402 100644
--- a/tests/bluetooth/mesh/brg/src/main.c
+++ b/tests/bluetooth/mesh/brg/src/main.c
@@ -293,6 +293,11 @@ ZTEST(bt_mesh_brg_cfg, test_brg_tbl_pending_store)
 	bt_mesh_brg_cfg_pending_store();
 }
 
+/* Value is prohibited. */
+#define BT_MESH_BRG_CFG_DIR_PROHIBITED 0
+/* Values above and including this is prohibited. */
+#define BT_MESH_BRG_CFG_DIR_MAX 3
+
 /* Test if invalid entries are not added to the table. */
 ZTEST(bt_mesh_brg_cfg, test_tbl_add_invalid_ip)
 {

From 08ca95384a942e64872f381e5ffd8a268d61e0c1 Mon Sep 17 00:00:00 2001
From: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
Date: Wed, 23 Oct 2024 09:35:57 +0200
Subject: [PATCH 0223/2913] [nrf fromtree] Bluetooth: Mesh: Fix out of bounds
 write
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix of the subnet bridging table function to only
compact the table if elements has been removed, and
fixing the compact function to compact the table if
several elemnts has been removed at the same time.

Fixes zephyrproject-rtos#78794

Signed-off-by: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
(cherry picked from commit b32eb0d2b2c7c3cd5e4e2b9acdf6cac7f26712a0)
Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 2d4190a52fa196f275491dcba687b1c51be16592)
---
 subsys/bluetooth/mesh/brg_cfg.c     |  72 +++++++++++--------
 tests/bluetooth/mesh/brg/src/main.c | 105 ++++++++++++++++++++++++++++
 2 files changed, 147 insertions(+), 30 deletions(-)

diff --git a/subsys/bluetooth/mesh/brg_cfg.c b/subsys/bluetooth/mesh/brg_cfg.c
index 112d2fe0a3e..58d1aada550 100644
--- a/subsys/bluetooth/mesh/brg_cfg.c
+++ b/subsys/bluetooth/mesh/brg_cfg.c
@@ -33,18 +33,18 @@ enum {
 };
 static ATOMIC_DEFINE(brg_cfg_flags, BRG_CFG_FLAGS_COUNT);
 
-static void brg_tbl_compact(void)
+/* Compact the bridge table for all removed entries, input is first removed entry */
+static void brg_tbl_compact(int j)
 {
-	int j = 0;
-
-	for (int k = 0; k < bt_mesh_brg_cfg_row_cnt; k++) {
+	for (int k = j; k < bt_mesh_brg_cfg_row_cnt; k++) {
 		if (brg_tbl[k].direction != 0) {
 			brg_tbl[j] = brg_tbl[k];
 			j++;
 		}
 	}
-	memset(&brg_tbl[j], 0, sizeof(brg_tbl[j]));
-	bt_mesh_brg_cfg_row_cnt--;
+
+	memset(&brg_tbl[j], 0, sizeof(brg_tbl[j]) * (bt_mesh_brg_cfg_row_cnt - j));
+	bt_mesh_brg_cfg_row_cnt = j;
 }
 
 /* Set function for initializing bridging enable state from value stored in settings. */
@@ -167,21 +167,30 @@ void bt_mesh_brg_cfg_pending_store(void)
  */
 static void brg_tbl_netkey_removed_evt(struct bt_mesh_subnet *sub, enum bt_mesh_key_evt evt)
 {
+	int first_removed = -1;
+
 	if (evt != BT_MESH_KEY_DELETED) {
 		return;
 	}
 
-	for (int i = 0; i < CONFIG_BT_MESH_BRG_TABLE_ITEMS_MAX; i++) {
-		if (brg_tbl[i].direction &&
-		    (brg_tbl[i].net_idx1 == sub->net_idx || brg_tbl[i].net_idx2 == sub->net_idx)) {
-			memset(&brg_tbl[i], 0, sizeof(brg_tbl[i]));
-			brg_tbl_compact();
+	for (int i = 0; i < bt_mesh_brg_cfg_row_cnt; i++) {
+		if (brg_tbl[i].net_idx1 == sub->net_idx || brg_tbl[i].net_idx2 == sub->net_idx) {
+			/* Setting direction to 0, entry will be cleared in brg_tbl_compact. */
+			brg_tbl[i].direction = 0;
+			if (first_removed == -1) {
+				first_removed = i;
+			}
 		}
 	}
 
-	if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-		atomic_set_bit(brg_cfg_flags, TABLE_UPDATED);
-		bt_mesh_settings_store_schedule(BT_MESH_SETTINGS_BRG_PENDING);
+	if (first_removed != -1) {
+		/* Compact when all rows have been deleted. */
+		brg_tbl_compact(first_removed);
+
+		if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
+			atomic_set_bit(brg_cfg_flags, TABLE_UPDATED);
+			bt_mesh_settings_store_schedule(BT_MESH_SETTINGS_BRG_PENDING);
+		}
 	}
 }
 
@@ -263,7 +272,7 @@ int bt_mesh_brg_cfg_tbl_add(uint8_t direction, uint16_t net_idx1, uint16_t net_i
 	}
 
 	/* Empty element, is the current table row counter */
-	if (bt_mesh_brg_cfg_row_cnt == CONFIG_BT_MESH_BRG_TABLE_ITEMS_MAX) {
+	if (bt_mesh_brg_cfg_row_cnt >= CONFIG_BT_MESH_BRG_TABLE_ITEMS_MAX) {
 		*status = STATUS_INSUFF_RESOURCES;
 		return 0;
 	}
@@ -306,7 +315,7 @@ void bt_mesh_brg_cfg_tbl_foreach_subnet(uint16_t src, uint16_t dst, uint16_t net
 int bt_mesh_brg_cfg_tbl_remove(uint16_t net_idx1, uint16_t net_idx2, uint16_t addr1, uint16_t addr2,
 			       uint8_t *status)
 {
-	bool store = false;
+	int first_removed = -1;
 
 	/* Sanity checks */
 	if ((!BT_MESH_ADDR_IS_UNICAST(addr1) && addr1 != BT_MESH_ADDR_UNASSIGNED) ||
@@ -334,26 +343,29 @@ int bt_mesh_brg_cfg_tbl_remove(uint16_t net_idx1, uint16_t net_idx2, uint16_t ad
 
 	for (int i = 0; i < bt_mesh_brg_cfg_row_cnt; i++) {
 		/* Match according to remove behavior in Section 4.4.9.2.2 of MshPRT_v1.1 */
-		if (brg_tbl[i].direction) {
-			if (!(brg_tbl[i].net_idx1 == net_idx1 && brg_tbl[i].net_idx2 == net_idx2)) {
-				continue;
-			}
+		if (!(brg_tbl[i].net_idx1 == net_idx1 && brg_tbl[i].net_idx2 == net_idx2)) {
+			continue;
+		}
 
-			if ((brg_tbl[i].addr1 == addr1 && brg_tbl[i].addr2 == addr2) ||
-			    (addr2 == BT_MESH_ADDR_UNASSIGNED && brg_tbl[i].addr1 == addr1) ||
-			    (addr1 == BT_MESH_ADDR_UNASSIGNED && brg_tbl[i].addr2 == addr2)) {
-				memset(&brg_tbl[i], 0, sizeof(brg_tbl[i]));
-				store = true;
+		if ((brg_tbl[i].addr1 == addr1 && brg_tbl[i].addr2 == addr2) ||
+		    (addr2 == BT_MESH_ADDR_UNASSIGNED && brg_tbl[i].addr1 == addr1) ||
+		    (addr1 == BT_MESH_ADDR_UNASSIGNED && brg_tbl[i].addr2 == addr2)) {
+			/* Setting direction to 0, entry will be cleared in brg_tbl_compact. */
+			brg_tbl[i].direction = 0;
+			if (first_removed == -1) {
+				first_removed = i;
 			}
 		}
 	}
 
-	/* Compact when all rows have been deleted. */
-	brg_tbl_compact();
+	if (first_removed != -1) {
+		/* Compact when all rows have been deleted. */
+		brg_tbl_compact(first_removed);
 
-	if (IS_ENABLED(CONFIG_BT_SETTINGS) && store) {
-		atomic_set_bit(brg_cfg_flags, TABLE_UPDATED);
-		bt_mesh_settings_store_schedule(BT_MESH_SETTINGS_BRG_PENDING);
+		if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
+			atomic_set_bit(brg_cfg_flags, TABLE_UPDATED);
+			bt_mesh_settings_store_schedule(BT_MESH_SETTINGS_BRG_PENDING);
+		}
 	}
 
 	*status = STATUS_SUCCESS;
diff --git a/tests/bluetooth/mesh/brg/src/main.c b/tests/bluetooth/mesh/brg/src/main.c
index 2b98722e402..e9ae46fff7f 100644
--- a/tests/bluetooth/mesh/brg/src/main.c
+++ b/tests/bluetooth/mesh/brg/src/main.c
@@ -218,6 +218,111 @@ ZTEST(bt_mesh_brg_cfg, test_basic_functionality_storage)
 	}
 }
 
+static void check_bt_mesh_brg_cfg_tbl_multiple_delete(int expect_left)
+{
+	uint8_t status;
+	int err;
+	int n;
+	const struct bt_mesh_brg_cfg_row *brg_tbl;
+
+	n = bt_mesh_brg_cfg_tbl_get(&brg_tbl);
+	zassert_equal(n, TEST_VECT_SZ - 1);
+
+	ztest_expect_value(bt_mesh_settings_store_schedule, flag, BT_MESH_SETTINGS_BRG_PENDING);
+	err = bt_mesh_brg_cfg_tbl_remove(test_vector[1].net_idx1, test_vector[1].net_idx2,
+					 test_vector[1].addr1, BT_MESH_ADDR_UNASSIGNED, &status);
+	zassert_equal(err, 0);
+
+	n = bt_mesh_brg_cfg_tbl_get(&brg_tbl);
+	zassert_equal(n, expect_left);
+
+	for (int i = 0; i < n; i++) {
+		zassert_true(brg_tbl[i].net_idx1 == test_vector[0].net_idx1);
+		zassert_true(brg_tbl[i].net_idx2 == test_vector[0].net_idx2);
+		zassert_true(brg_tbl[i].addr1 == test_vector[0].addr1);
+		zassert_true(brg_tbl[i].addr2 == test_vector[i * 2].addr2);
+	}
+}
+
+ZTEST(bt_mesh_brg_cfg, test_removal_multiple_entries)
+{
+	check_bt_mesh_brg_cfg_tbl_reset();
+
+	uint8_t status;
+	int err;
+
+	/* Test removal of every second entry */
+	for (int i = 0; i < TEST_VECT_SZ - 1; i++) {
+		ztest_expect_value(bt_mesh_settings_store_schedule, flag,
+				   BT_MESH_SETTINGS_BRG_PENDING);
+		err = bt_mesh_brg_cfg_tbl_add(test_vector[i].direction, test_vector[i % 2].net_idx1,
+					      test_vector[i % 2].net_idx2, test_vector[i % 2].addr1,
+					      test_vector[i].addr2, &status);
+		zassert_equal(err, 0);
+		zassert_equal(status, STATUS_SUCCESS);
+	}
+
+	check_bt_mesh_brg_cfg_tbl_multiple_delete((TEST_VECT_SZ - 1) / 2);
+	check_bt_mesh_brg_cfg_tbl_reset();
+
+	/* Test removal of all entries, except first */
+	for (int i = 0; i < TEST_VECT_SZ - 1; i++) {
+		ztest_expect_value(bt_mesh_settings_store_schedule, flag,
+				   BT_MESH_SETTINGS_BRG_PENDING);
+		if (i == 0) {
+			err = bt_mesh_brg_cfg_tbl_add(test_vector[i].direction,
+						      test_vector[i].net_idx1,
+						      test_vector[i].net_idx2, test_vector[i].addr1,
+						      test_vector[i].addr2, &status);
+		} else {
+			err = bt_mesh_brg_cfg_tbl_add(test_vector[i].direction,
+						      test_vector[1].net_idx1,
+						      test_vector[1].net_idx2, test_vector[1].addr1,
+						      test_vector[i].addr2, &status);
+		}
+		zassert_equal(err, 0);
+		zassert_equal(status, STATUS_SUCCESS);
+	}
+
+	check_bt_mesh_brg_cfg_tbl_multiple_delete(1);
+	check_bt_mesh_brg_cfg_tbl_reset();
+
+	/* Test removal of all entries, except last */
+	for (int i = TEST_VECT_SZ - 2; i >= 0; i--) {
+		ztest_expect_value(bt_mesh_settings_store_schedule, flag,
+				   BT_MESH_SETTINGS_BRG_PENDING);
+		if (i == 0) {
+			err = bt_mesh_brg_cfg_tbl_add(test_vector[i].direction,
+						      test_vector[i].net_idx1,
+						      test_vector[i].net_idx2, test_vector[i].addr1,
+						      test_vector[i].addr2, &status);
+		} else {
+			err = bt_mesh_brg_cfg_tbl_add(test_vector[i].direction,
+						      test_vector[1].net_idx1,
+						      test_vector[1].net_idx2, test_vector[1].addr1,
+						      test_vector[i].addr2, &status);
+		}
+		zassert_equal(err, 0);
+		zassert_equal(status, STATUS_SUCCESS);
+	}
+
+	check_bt_mesh_brg_cfg_tbl_multiple_delete(1);
+	check_bt_mesh_brg_cfg_tbl_reset();
+
+	/* Test removal of all entries */
+	for (int i = 0; i < TEST_VECT_SZ - 1; i++) {
+		ztest_expect_value(bt_mesh_settings_store_schedule, flag,
+				   BT_MESH_SETTINGS_BRG_PENDING);
+		err = bt_mesh_brg_cfg_tbl_add(test_vector[i].direction, test_vector[1].net_idx1,
+					      test_vector[1].net_idx2, test_vector[1].addr1,
+					      test_vector[i].addr2, &status);
+		zassert_equal(err, 0);
+		zassert_equal(status, STATUS_SUCCESS);
+	}
+
+	check_bt_mesh_brg_cfg_tbl_multiple_delete(0);
+}
+
 static void pending_store_enable_create_expectations(bool *enable_val)
 {
 	if (*enable_val) {

From 7930901ea2d20d53d5eae3d6f724ad7b7256b25d Mon Sep 17 00:00:00 2001
From: Lingao Meng <menglingao@xiaomi.com>
Date: Wed, 23 Oct 2024 09:35:57 +0200
Subject: [PATCH 0224/2913] [nrf fromtree] Bluetooth: Mesh: Refine Mesh store
 logic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move flag&handler to structure, not only save some flash size
but also make code more readable.

Signed-off-by: Lingao Meng <menglingao@xiaomi.com>
(cherry picked from commit 664c087d558d9a918ebe2b16e08713287aa2f5c2)
Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 14f0af8623282eb57877154c6abb67ddbd8a7ad6)
---
 subsys/bluetooth/mesh/rpl.c      |   5 ++
 subsys/bluetooth/mesh/rpl.h      |   1 +
 subsys/bluetooth/mesh/settings.c | 116 ++++++++++---------------------
 3 files changed, 43 insertions(+), 79 deletions(-)

diff --git a/subsys/bluetooth/mesh/rpl.c b/subsys/bluetooth/mesh/rpl.c
index 213ed7d4479..581c94771c8 100644
--- a/subsys/bluetooth/mesh/rpl.c
+++ b/subsys/bluetooth/mesh/rpl.c
@@ -404,3 +404,8 @@ void bt_mesh_rpl_pending_store(uint16_t addr)
 		(void)memset(&replay_list[last - shift + 1], 0, sizeof(struct bt_mesh_rpl) * shift);
 	}
 }
+
+void bt_mesh_rpl_pending_store_all_nodes(void)
+{
+	bt_mesh_rpl_pending_store(BT_MESH_ADDR_ALL_NODES);
+}
diff --git a/subsys/bluetooth/mesh/rpl.h b/subsys/bluetooth/mesh/rpl.h
index 39395bb25d1..6dbe4796033 100644
--- a/subsys/bluetooth/mesh/rpl.h
+++ b/subsys/bluetooth/mesh/rpl.h
@@ -26,3 +26,4 @@ bool bt_mesh_rpl_check(struct bt_mesh_net_rx *rx, struct bt_mesh_rpl **match, bo
 void bt_mesh_rpl_clear(void);
 void bt_mesh_rpl_update(struct bt_mesh_rpl *rpl,
 			struct bt_mesh_net_rx *rx);
+void bt_mesh_rpl_pending_store_all_nodes(void);
diff --git a/subsys/bluetooth/mesh/settings.c b/subsys/bluetooth/mesh/settings.c
index 5c9e03693bc..6bd651c7493 100644
--- a/subsys/bluetooth/mesh/settings.c
+++ b/subsys/bluetooth/mesh/settings.c
@@ -184,86 +184,44 @@ static void store_pending(struct k_work *work)
 {
 	LOG_DBG("");
 
-	if (atomic_test_and_clear_bit(pending_flags, BT_MESH_SETTINGS_RPL_PENDING)) {
-		bt_mesh_rpl_pending_store(BT_MESH_ADDR_ALL_NODES);
-	}
-
-	if (atomic_test_and_clear_bit(pending_flags,
-				      BT_MESH_SETTINGS_NET_KEYS_PENDING)) {
-		bt_mesh_subnet_pending_store();
-	}
-
-	if (atomic_test_and_clear_bit(pending_flags,
-				      BT_MESH_SETTINGS_APP_KEYS_PENDING)) {
-		bt_mesh_app_key_pending_store();
-	}
-
-	if (atomic_test_and_clear_bit(pending_flags,
-				      BT_MESH_SETTINGS_NET_PENDING)) {
-		bt_mesh_net_pending_net_store();
-	}
-
-	if (atomic_test_and_clear_bit(pending_flags,
-				      BT_MESH_SETTINGS_IV_PENDING)) {
-		bt_mesh_net_pending_iv_store();
-	}
-
-	if (atomic_test_and_clear_bit(pending_flags,
-				      BT_MESH_SETTINGS_SEQ_PENDING)) {
-		bt_mesh_net_pending_seq_store();
-	}
-
-	if (atomic_test_and_clear_bit(pending_flags,
-				      BT_MESH_SETTINGS_DEV_KEY_CAND_PENDING)) {
-		bt_mesh_net_pending_dev_key_cand_store();
-	}
-
-	if (atomic_test_and_clear_bit(pending_flags,
-				      BT_MESH_SETTINGS_HB_PUB_PENDING)) {
-		bt_mesh_hb_pub_pending_store();
-	}
-
-	if (atomic_test_and_clear_bit(pending_flags,
-				      BT_MESH_SETTINGS_CFG_PENDING)) {
-		bt_mesh_cfg_pending_store();
-	}
-
-	if (atomic_test_and_clear_bit(pending_flags,
-				      BT_MESH_SETTINGS_COMP_PENDING)) {
-		bt_mesh_comp_data_pending_clear();
-	}
-
-	if (atomic_test_and_clear_bit(pending_flags,
-				      BT_MESH_SETTINGS_MOD_PENDING)) {
-		bt_mesh_model_pending_store();
-	}
-
-	if (atomic_test_and_clear_bit(pending_flags,
-				      BT_MESH_SETTINGS_VA_PENDING)) {
-		bt_mesh_va_pending_store();
-	}
-
-	if (IS_ENABLED(CONFIG_BT_MESH_CDB) &&
-	    atomic_test_and_clear_bit(pending_flags,
-				      BT_MESH_SETTINGS_CDB_PENDING)) {
-		bt_mesh_cdb_pending_store();
-	}
-
-	if (IS_ENABLED(CONFIG_BT_MESH_OD_PRIV_PROXY_SRV) &&
-		atomic_test_and_clear_bit(pending_flags,
-					  BT_MESH_SETTINGS_SRPL_PENDING)) {
-		bt_mesh_srpl_pending_store();
-	}
-
-	if (IS_ENABLED(CONFIG_BT_MESH_PROXY_SOLICITATION) &&
-		atomic_test_and_clear_bit(pending_flags,
-					  BT_MESH_SETTINGS_SSEQ_PENDING)) {
-		bt_mesh_sseq_pending_store();
-	}
+	static const struct {
+		void (*handler)(void);
+	} handlers[BT_MESH_SETTINGS_FLAG_COUNT] = {
+		[BT_MESH_SETTINGS_RPL_PENDING]      = { bt_mesh_rpl_pending_store_all_nodes },
+		[BT_MESH_SETTINGS_NET_KEYS_PENDING] = { bt_mesh_subnet_pending_store },
+		[BT_MESH_SETTINGS_APP_KEYS_PENDING] = { bt_mesh_app_key_pending_store },
+		[BT_MESH_SETTINGS_NET_PENDING]	    = { bt_mesh_net_pending_net_store },
+		[BT_MESH_SETTINGS_IV_PENDING]	    = { bt_mesh_net_pending_iv_store },
+		[BT_MESH_SETTINGS_SEQ_PENDING]	    = { bt_mesh_net_pending_seq_store },
+		[BT_MESH_SETTINGS_DEV_KEY_CAND_PENDING] = {
+			bt_mesh_net_pending_dev_key_cand_store },
+		[BT_MESH_SETTINGS_HB_PUB_PENDING]   = { bt_mesh_hb_pub_pending_store },
+		[BT_MESH_SETTINGS_CFG_PENDING]	    = { bt_mesh_cfg_pending_store },
+		[BT_MESH_SETTINGS_COMP_PENDING]	    = { bt_mesh_comp_data_pending_clear },
+		[BT_MESH_SETTINGS_MOD_PENDING]	    = { bt_mesh_model_pending_store },
+		[BT_MESH_SETTINGS_VA_PENDING]	    = { bt_mesh_va_pending_store },
+		[BT_MESH_SETTINGS_CDB_PENDING]	    = {
+			IS_ENABLED(CONFIG_BT_MESH_CDB) ?
+				bt_mesh_cdb_pending_store : NULL },
+		[BT_MESH_SETTINGS_SRPL_PENDING]     = {
+			IS_ENABLED(CONFIG_BT_MESH_OD_PRIV_PROXY_SRV) ?
+				bt_mesh_srpl_pending_store : NULL },
+		[BT_MESH_SETTINGS_SSEQ_PENDING]     = {
+			IS_ENABLED(CONFIG_BT_MESH_PROXY_SOLICITATION) ?
+				bt_mesh_sseq_pending_store : NULL },
+		[BT_MESH_SETTINGS_BRG_PENDING]      = {
+			IS_ENABLED(CONFIG_BT_MESH_BRG_CFG_SRV) ?
+				bt_mesh_brg_cfg_pending_store : NULL },
+	};
+
+	for (int i = 0; i < ARRAY_SIZE(handlers); i++) {
+		if (!handlers[i].handler) {
+			continue;
+		}
 
-	if (IS_ENABLED(CONFIG_BT_MESH_BRG_CFG_SRV) &&
-	    atomic_test_and_clear_bit(pending_flags, BT_MESH_SETTINGS_BRG_PENDING)) {
-		bt_mesh_brg_cfg_pending_store();
+		if (atomic_test_and_clear_bit(pending_flags, i)) {
+			handlers[i].handler();
+		}
 	}
 }
 

From bf0a988a229dd32579a5dc76fd5bd7894f7c09bf Mon Sep 17 00:00:00 2001
From: Lingao Meng <menglingao@xiaomi.com>
Date: Wed, 23 Oct 2024 09:35:57 +0200
Subject: [PATCH 0225/2913] [nrf fromtree] Bluetooth: Mesh: Fixes after proxy
 advertising unable to send messages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When Proxy advertising or PB-GATT Advertising Enabled and use a same
advertising sets.

As adv\_start will call multi HCI Command will cause syswork_q yield.
At same time, if another thread(BT RX) all schedule\_send will cause
unable send mesh message, because ADV\_FLAG\_ACTIVE was be set, but
ADV\_FLAG\_PROXY not set currentlly.

Add ADV\_FLAG\_SCHEDULE\_PENDING indicate mesh buf has been pendings
but not scheduled, so when proxy advertising enable, let's take again,
as we can't break or terminated adv\_start, so we must waiting proxy
advertising enabled.

But after https://github.com/zephyrproject-rtos/zephyr/pull/68558

The `k_work_is_pending` always true in `send_pending_adv`, which cause
unable to send more mesh message until more mesh message comming

Signed-off-by: Lingao Meng <menglingao@xiaomi.com>
(cherry picked from commit 537d2159816e203dcbc4dc3ae4e7ad248cd28569)
Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit ebc473ff30cf143986324b08779dcbb807799f8c)
---
 subsys/bluetooth/mesh/adv_ext.c | 43 ++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index b437e6d91ef..b206b81b743 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -241,6 +241,28 @@ static const char * const adv_tag_to_str[] = {
 	[BT_MESH_ADV_TAG_PROV]   = "prov adv",
 };
 
+static bool schedule_send_with_mask(struct bt_mesh_ext_adv *ext_adv, int ignore_mask)
+{
+	if (atomic_test_and_clear_bit(ext_adv->flags, ADV_FLAG_PROXY)) {
+		atomic_clear_bit(ext_adv->flags, ADV_FLAG_PROXY_START);
+		(void)bt_le_ext_adv_stop(ext_adv->instance);
+
+		atomic_clear_bit(ext_adv->flags, ADV_FLAG_ACTIVE);
+	}
+
+	if (atomic_test_bit(ext_adv->flags, ADV_FLAG_ACTIVE)) {
+		atomic_set_bit(ext_adv->flags, ADV_FLAG_SCHEDULE_PENDING);
+		return false;
+	} else if ((~ignore_mask) & k_work_busy_get(&ext_adv->work)) {
+		return false;
+	}
+
+	atomic_clear_bit(ext_adv->flags, ADV_FLAG_SCHEDULE_PENDING);
+	k_work_submit(&ext_adv->work);
+
+	return true;
+}
+
 static void send_pending_adv(struct k_work *work)
 {
 	struct bt_mesh_ext_adv *ext_adv;
@@ -314,30 +336,13 @@ static void send_pending_adv(struct k_work *work)
 	}
 
 	if (atomic_test_and_clear_bit(ext_adv->flags, ADV_FLAG_SCHEDULE_PENDING)) {
-		schedule_send(ext_adv);
+		schedule_send_with_mask(ext_adv, K_WORK_RUNNING);
 	}
 }
 
 static bool schedule_send(struct bt_mesh_ext_adv *ext_adv)
 {
-	if (atomic_test_and_clear_bit(ext_adv->flags, ADV_FLAG_PROXY)) {
-		atomic_clear_bit(ext_adv->flags, ADV_FLAG_PROXY_START);
-		(void)bt_le_ext_adv_stop(ext_adv->instance);
-
-		atomic_clear_bit(ext_adv->flags, ADV_FLAG_ACTIVE);
-	}
-
-	if (atomic_test_bit(ext_adv->flags, ADV_FLAG_ACTIVE)) {
-		atomic_set_bit(ext_adv->flags, ADV_FLAG_SCHEDULE_PENDING);
-		return false;
-	} else if (k_work_is_pending(&ext_adv->work)) {
-		return false;
-	}
-
-	atomic_clear_bit(ext_adv->flags, ADV_FLAG_SCHEDULE_PENDING);
-	k_work_submit(&ext_adv->work);
-
-	return true;
+	return schedule_send_with_mask(ext_adv, 0);
 }
 
 void bt_mesh_adv_gatt_update(void)

From 084193a761bea757adaea97b32459b9f2d9aabbf Mon Sep 17 00:00:00 2001
From: alperen sener <alperen.sener@nordicsemi.no>
Date: Wed, 23 Oct 2024 09:35:58 +0200
Subject: [PATCH 0226/2913] [nrf fromtree] tests: bluetooth: tester: Add
 nrf54l15dk and remove nrf54l15pdk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rename the config files according to nrf54l15dk.

Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
(cherry picked from commit a5010504bc71d5f3fa8ccc86a2b335920e560cf0)
Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit efefac8c733bc57ac5fc04b07fc8b347ff0310a6)
---
 ...15pdk_nrf54l15_cpuapp.conf => nrf54l15dk_nrf54l15_cpuapp.conf} | 0
 ...nrf54l15_cpuapp.overlay => nrf54l15dk_nrf54l15_cpuapp.overlay} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/bluetooth/tester/boards/{nrf54l15pdk_nrf54l15_cpuapp.conf => nrf54l15dk_nrf54l15_cpuapp.conf} (100%)
 rename tests/bluetooth/tester/boards/{nrf54l15pdk_nrf54l15_cpuapp.overlay => nrf54l15dk_nrf54l15_cpuapp.overlay} (100%)

diff --git a/tests/bluetooth/tester/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/tests/bluetooth/tester/boards/nrf54l15dk_nrf54l15_cpuapp.conf
similarity index 100%
rename from tests/bluetooth/tester/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
rename to tests/bluetooth/tester/boards/nrf54l15dk_nrf54l15_cpuapp.conf
diff --git a/tests/bluetooth/tester/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/bluetooth/tester/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/bluetooth/tester/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
rename to tests/bluetooth/tester/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

From 8f9818dec4bdeeb9763032960a4a0137d0419882 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Thu, 22 Aug 2024 12:44:58 +0200
Subject: [PATCH 0227/2913] [nrf fromtree] cmake: define ZEPHYR_TOOLCHAIN_PATH

Other toolchains uses <toolchain>_TOOLCHAIN_PATH, align Zephyr SDK
by setting ZEPHYR_TOOLCHAIN_PATH to be identical to the
ZEPHYR_SDK_INSTALL_DIR.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 6c3a55a6824ea6baa48d0f64f4f84461737f7026)
(cherry picked from commit d6e8dbe4e2e8ae1ce1d39ceb8c8d7df2a3b1380a)
---
 cmake/modules/FindZephyr-sdk.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmake/modules/FindZephyr-sdk.cmake b/cmake/modules/FindZephyr-sdk.cmake
index b1c1c8cf02b..1b56379ec66 100644
--- a/cmake/modules/FindZephyr-sdk.cmake
+++ b/cmake/modules/FindZephyr-sdk.cmake
@@ -175,3 +175,4 @@ if(LOAD IN_LIST Zephyr-sdk_FIND_COMPONENTS)
     endif()
   endif()
 endif()
+set(ZEPHYR_TOOLCHAIN_PATH ${ZEPHYR_SDK_INSTALL_DIR})

From a4b31d83d2f8e9fb7c99cdd316e31f5ae04d6fdc Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Mon, 30 Sep 2024 21:53:51 +0200
Subject: [PATCH 0228/2913] [nrf fromtree] cmake: move script mode handling
 from package helper to extensions.cmake

Move Zephyr CMake script mode handling from package_helper.cmake into
extensions.cmake.

This ensures that all Zephyr CMake script which includes
extensions.cmake will have the same functions stubbed or mocked and thus
does not need to replicate this behavior.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit daac2d55ab13039d68548dec030073ffcee6a71e)
(cherry picked from commit 9a22422e0af56f78a55ea32e488065614944fa04)
---
 cmake/modules/extensions.cmake | 36 ++++++++++++++++++++++++++++++++++
 cmake/package_helper.cmake     | 25 -----------------------
 2 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index b9812d84379..5c45f5d4d8c 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -38,6 +38,7 @@ include(CheckCXXCompilerFlag)
 # 7.1 llext_* configuration functions
 # 7.2 add_llext_* build control functions
 # 7.3 llext helper functions
+# 8. Script mode handling
 
 ########################################################
 # 1. Zephyr-aware extensions
@@ -5744,3 +5745,38 @@ function(llext_filter_zephyr_flags filter flags outvar)
 
   set(${outvar} ${zephyr_filtered_flags} PARENT_SCOPE)
 endfunction()
+
+########################################################
+# 8. Script mode handling
+########################################################
+#
+# Certain features are not available when CMake is used in script mode.
+# For example custom targets, and thus features related to custom targets, such
+# as target properties are not available in script mode.
+#
+# This section defines behavior for functions whose default implementation does
+# not work correctly in script mode.
+#
+# The script mode function can be a simple stub or a more complex solution
+# depending on the exact use of the function in script mode.
+#
+# Current Zephyr CMake scripts which includes `extensions.cmake` in script mode
+# are: package_helper.cmake, verify-toolchain.cmake
+#
+
+if(CMAKE_SCRIPT_MODE_FILE)
+  # add_custom_target and set_target_properties are not supported in script mode.
+  # However, Zephyr CMake functions like `zephyr_get()`, `zephyr_create_scope()`,
+  # llext functions creates or relies on custom CMake targets.
+  function(add_custom_target)
+    # This silence the error: 'add_custom_target command is not scriptable'
+  endfunction()
+
+  function(set_target_properties)
+    # This silence the error: 'set_target_properties command is not scriptable'
+  endfunction()
+
+  function(zephyr_set variable)
+    # This silence the error: zephyr_set(...  SCOPE <scope>) doesn't exists.
+  endfunction()
+endif()
diff --git a/cmake/package_helper.cmake b/cmake/package_helper.cmake
index 55412b94110..886dbfff71d 100644
--- a/cmake/package_helper.cmake
+++ b/cmake/package_helper.cmake
@@ -44,20 +44,6 @@
 
 cmake_minimum_required(VERSION 3.20.5)
 
-# add_custom_target and set_target_properties are not supported in script mode.
-# However, several Zephyr CMake modules create custom target for user convenience
-# like menuconfig, boards, shields, etc.
-# As we are not generating a build system with this tool, only running part of
-# the modules, then we simply override those functions to allow running those
-# modules.
-function(add_custom_target)
-  # This silence the error: 'add_custom_target command is not scriptable'
-endfunction()
-
-function(set_target_properties)
-  # This silence the error: 'set_target_properties command is not scriptable'
-endfunction()
-
 # Find last `-B` and `-S` instances.
 foreach(i RANGE ${CMAKE_ARGC})
   if(CMAKE_ARGV${i} MATCHES "^-B(.*)")
@@ -111,16 +97,5 @@ if(NOT DEFINED MODULES)
   )
 endif()
 
-# Loading Zephyr CMake extension commands, which allows us to overload Zephyr
-# scoping rules.
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS extensions)
-
-# Zephyr scoping creates custom targets for handling of properties.
-# However, custom targets cannot be used in CMake script mode.
-# Therefore disable zephyr_set(... SCOPE ...) in package helper as it is not needed.
-function(zephyr_set variable)
-  # This silence the error: zephyr_set(...  SCOPE <scope>) doesn't exists.
-endfunction()
-
 string(REPLACE ";" "," MODULES "${MODULES}")
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS zephyr_default:${MODULES})

From 3732cd3567862efcc7fd3a690dc5f64f7e7eeb16 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Fri, 9 Aug 2024 16:26:16 +0200
Subject: [PATCH 0229/2913] [nrf fromtree] cmake: introduce build_info function

The build_info function provides a generic and stable way of dumping
build information to the <build>/build_info.yml file.

The build info file is in YAML format and the keys in the file are
intended to be stable, as to allow external tools to retrieve
information regarding the build.

The main differences to the CMakeCache.txt are:
- Settings in the CMakeCache.txt are user controlled, whereas the
  information in the build info file is intended to be those values
  which are used by the build system regardless if those are specified
  by the developer or picked up automatically.
- Internal build system variables are not present in the CMake cache
  and should not be, because their values are calculated when CMake
  runs.

This also has the benefits of decoupling CMake variable names from
build info keys. Several CMake variables has internal build system
names, and the build system is free to rename those at its own
discretion.

Having dedicated key names ensures a stable API that external tools can
rely upon.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 5d5c2d4775854f136dcb7d2b845aae490958859b)
(cherry picked from commit f8d609cbde3d2520f0f37d95e0029e88ad48d74a)
---
 cmake/modules/extensions.cmake   |  70 ++++++++++++++++++++
 cmake/modules/unittest.cmake     |   1 +
 scripts/schemas/build-schema.yml | 106 +++++++++++++++++++++++++++++++
 3 files changed, 177 insertions(+)
 create mode 100644 scripts/schemas/build-schema.yml

diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index 5c45f5d4d8c..066e0422e49 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -3595,6 +3595,67 @@ function(topological_sort)
   set(${TS_RESULT} "${sorted_targets}" PARENT_SCOPE)
 endfunction()
 
+# Usage:
+#   build_info(<tag>... VALUE <value>...)
+#
+# This function populates updates the build_info.yml info file with exchangable build information
+# related to the current build.
+#
+# Example:
+#   build_info(devicetree files VALUE file1.dts file2.dts file3.dts)
+# Will update the 'devicetree files' key in the build info yaml with the list
+# of files, file1.dts file2.dts file3.dts.
+#
+#   build_info(vendor-specific foo VALUE bar)
+# Will place the vendor specific key 'foo' with value 'bar' in the vendor specific section
+# of the build info file.
+#
+# <tag>...: One of the pre-defined valid CMake keys supported by build info or vendor-specific.
+#           See 'scripts/schemas/build-schema.yml' CMake section for valid tags.
+# VALUE <value>... : value(s) to place in the build_info.yml file.
+function(build_info)
+  set(arg_list ${ARGV})
+  list(FIND arg_list VALUE index)
+  if(index EQUAL -1)
+    message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION}(...) missing a required argument: VALUE")
+  endif()
+
+  yaml_context(EXISTS NAME build_info result)
+  if(NOT result)
+    yaml_load(FILE ${ZEPHYR_BASE}/scripts/schemas/build-schema.yml NAME build_info_schema)
+    if(EXISTS ${CMAKE_BINARY_DIR}/build_info.yml)
+      yaml_load(FILE ${CMAKE_BINARY_DIR}/build_info.yml NAME build_info)
+    else()
+      yaml_create(FILE ${CMAKE_BINARY_DIR}/build_info.yml NAME build_info)
+    endif()
+    yaml_set(NAME build_info KEY version VALUE "0.1.0")
+  endif()
+
+  list(SUBLIST arg_list 0 ${index} keys)
+  list(SUBLIST arg_list ${index} -1 values)
+  list(POP_FRONT values)
+
+  if(ARGV0 STREQUAL "vendor-specific")
+    set(type VALUE)
+  else()
+    set(schema_check ${keys})
+    list(TRANSFORM schema_check PREPEND "mapping;")
+    yaml_get(check NAME build_info_schema KEY mapping cmake ${schema_check})
+    if(check MATCHES ".*-NOTFOUND")
+      message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION}(...) called with invalid tag: ${keys}")
+    endif()
+
+    yaml_get(type NAME build_info_schema KEY mapping cmake ${schema_check} type)
+    if(type MATCHES "seq|sequence")
+      set(type LIST)
+    else()
+      set(type VALUE)
+    endif()
+  endif()
+
+  yaml_set(NAME build_info KEY cmake ${keys} ${type} "${values}")
+endfunction()
+
 ########################################################
 # 4. Devicetree extensions
 ########################################################
@@ -5779,4 +5840,13 @@ if(CMAKE_SCRIPT_MODE_FILE)
   function(zephyr_set variable)
     # This silence the error: zephyr_set(...  SCOPE <scope>) doesn't exists.
   endfunction()
+
+  # Build info creates a custom target for handling of build info.
+  # build_info is not needed in script mode but still called by Zephyr CMake
+  # modules. Therefore disable build_info(...) in when including
+  # extensions.cmake in script mode.
+  function(build_info)
+    # This silence the error: 'YAML context 'build_info' does not exist.'
+    #                         'Remember to create a YAML context'
+  endfunction()
 endif()
diff --git a/cmake/modules/unittest.cmake b/cmake/modules/unittest.cmake
index 9598bf8b84a..6565e89aec5 100644
--- a/cmake/modules/unittest.cmake
+++ b/cmake/modules/unittest.cmake
@@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 3.20.0)
 
 include(extensions)
 include(west)
+include(yaml)
 include(root)
 include(zephyr_module)
 include(boards)
diff --git a/scripts/schemas/build-schema.yml b/scripts/schemas/build-schema.yml
new file mode 100644
index 00000000000..b4435a032d7
--- /dev/null
+++ b/scripts/schemas/build-schema.yml
@@ -0,0 +1,106 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024, Nordic Semiconductor ASA
+
+# A pykwalify schema for basic validation of the Zephyr build info YAML file.
+
+type: map
+mapping:
+  version:
+    required: true
+    type: str
+  cmake:
+    type: map
+    mapping:
+      application:
+        type: map
+        mapping:
+          source-dir:
+            type: str
+          configuration-dir:
+            type: str
+      board:
+        type: map
+        mapping:
+          name:
+            required: true
+            type: str
+          qualifiers:
+            type: str
+          revision:
+            type: str
+          path:
+            type: seq
+            sequence:
+              - type: str
+      devicetree:
+        type: map
+        mapping:
+          files:
+            type: seq
+            sequence:
+              - type: str
+          user-files:
+            type: seq
+            sequence:
+              - type: str
+          extra-user-files:
+            type: seq
+            sequence:
+              - type: str
+          include-dirs:
+            type: seq
+            sequence:
+              - type: str
+          bindings-dirs:
+            type: seq
+            sequence:
+              - type: str
+      kconfig:
+        type: map
+        mapping:
+          files:
+            type: seq
+            sequence:
+              - type: str
+          user-files:
+            type: seq
+            sequence:
+              - type: str
+          extra-user-files:
+            type: seq
+            sequence:
+              - type: str
+      sysbuild:
+        type: bool
+      toolchain:
+        type: map
+        mapping:
+          name:
+            type: str
+          version:
+            type: str
+          path:
+            type: str
+      zephyr:
+        type: map
+        mapping:
+          zephyr-base:
+            type: str
+          version:
+            type: str
+      vendor-specific:
+        type: map
+        mapping:
+          regex;(.*):
+            type: map
+            mapping:
+              regex;(.*):
+                type: str
+  west:
+    type: map
+    mapping:
+      command:
+        type: str
+      topdir:
+        type: str

From 7a18ca13818360d6f814e0ef1c9fc2ee775f78a6 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Thu, 8 Aug 2024 21:23:28 +0200
Subject: [PATCH 0230/2913] [nrf fromtree] west: support build info file for
 west build

For pristine builds 'west build' will now create a build_info.yml file
containing the west build command including arguments.

This is done to help users and external tools to recreate builds.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 24ee3912316ca53bbf27add2a98f06f6d8b12e1d)
(cherry picked from commit 0d5e3c92e98fd3e8a406af1e8bad525fbb94985b)
---
 scripts/schemas/build-schema.yml |  2 ++
 scripts/west_commands/build.py   | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/scripts/schemas/build-schema.yml b/scripts/schemas/build-schema.yml
index b4435a032d7..5086afbb25b 100644
--- a/scripts/schemas/build-schema.yml
+++ b/scripts/schemas/build-schema.yml
@@ -104,3 +104,5 @@ mapping:
         type: str
       topdir:
         type: str
+      version:
+        type: str
diff --git a/scripts/west_commands/build.py b/scripts/west_commands/build.py
index 6bedd61937f..459d9aedf0b 100644
--- a/scripts/west_commands/build.py
+++ b/scripts/west_commands/build.py
@@ -11,6 +11,8 @@
 
 from west import log
 from west.configuration import config
+from west.util import west_topdir
+from west.version import __version__
 from zcmake import DEFAULT_CMAKE_GENERATOR, run_cmake, run_build, CMakeCache
 from build_helpers import is_zephyr_build, find_build_dir, load_domains, \
     FIND_BUILD_DIR_DESCRIPTION
@@ -22,6 +24,8 @@
 SYSBUILD_PROJ_DIR = pathlib.Path(__file__).resolve().parent.parent.parent \
                     / pathlib.Path('share/sysbuild')
 
+BUILD_INFO_LOG = 'build_info.yml'
+
 BUILD_USAGE = '''\
 west build [-h] [-b BOARD[@REV]]] [-d BUILD_DIR]
            [-S SNIPPET] [--shield SHIELD]
@@ -227,9 +231,25 @@ def do_run(self, args, remainder):
                     self.run_cmake = True
         else:
             self.run_cmake = True
+
         self.source_dir = self._find_source_dir()
         self._sanity_check()
 
+        build_info_path = self.build_dir
+        build_info_file = os.path.join(build_info_path, BUILD_INFO_LOG)
+        west_workspace = west_topdir(self.source_dir)
+        if not os.path.exists(build_info_path):
+            os.makedirs(build_info_path)
+        if not os.path.exists(build_info_file):
+            build_command = {'west': {'command': ' '.join(sys.argv[:]),
+                                     'topdir': str(west_workspace),
+                                     'version': str(__version__)}}
+            try:
+                with open(build_info_file, "w") as f:
+                    yaml.dump(build_command, f, default_flow_style=False)
+            except Exception as e:
+                log.wrn(f'Failed to create info file: {build_info_file},', e)
+
         board, origin = self._find_board()
         self._run_cmake(board, origin, self.args.cmake_opts)
         if args.cmake_only:

From df94528234c7fe2e5f5a1bd7f732b39ff378a773 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Tue, 26 Jan 2021 15:43:08 +0100
Subject: [PATCH 0231/2913] [nrf noup] ci: set `ZEPHYR_<MODULE_NAME>_KCONFIG`
 for NCS modules
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit sets `ZEPHYR_<MODULE_NAME>_KCONFIG` variable for each
Kconfig file discovered in `nrf/modules/<module>/Kconfig`.

This is not meant as a permanent solution; we should do more careful
consideration on the optimal approach forward that will allow
compliance_check.py to be used downstream with custom
module_ext_roots, and at the same time keep current flexibility for
module glue code handling intact.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
(cherry picked from commit ae6e6aa694c19ad3de61caa94bb8efe805676deb)
(cherry picked from commit 5970b0fd3e08f00853bc298dc903a069f704065a)
---
 scripts/ci/check_compliance.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/scripts/ci/check_compliance.py b/scripts/ci/check_compliance.py
index 3a6ddfdb717..3b9439a6d96 100755
--- a/scripts/ci/check_compliance.py
+++ b/scripts/ci/check_compliance.py
@@ -408,6 +408,13 @@ def get_modules(self, modules_file, settings_file):
         modules = [name for name in os.listdir(modules_dir) if
                    os.path.exists(os.path.join(modules_dir, name, 'Kconfig'))]
 
+        nrf_modules_dir = ZEPHYR_BASE + '/../nrf/modules'
+        nrf_modules = []
+        if os.path.exists(nrf_modules_dir):
+            nrf_modules = [name for name in os.listdir(nrf_modules_dir) if
+                           os.path.exists(os.path.join(nrf_modules_dir, name,
+                                                       'Kconfig'))]
+
         with open(modules_file, 'r') as fp_module_file:
             content = fp_module_file.read()
 
@@ -417,6 +424,15 @@ def get_modules(self, modules_file, settings_file):
                     re.sub('[^a-zA-Z0-9]', '_', module).upper(),
                     modules_dir + '/' + module + '/Kconfig'
                 ))
+            for module in nrf_modules:
+                fp_module_file.write("ZEPHYR_{}_KCONFIG = {}\n".format(
+                    re.sub('[^a-zA-Z0-9]', '_', module).upper(),
+                    nrf_modules_dir + '/' + module + '/Kconfig'
+                ))
+                fp_module_file.write("NCS_{}_KCONFIG = {}\n".format(
+                    re.sub('[^a-zA-Z0-9]', '_', module).upper(),
+                    modules_dir + '/' + module + '/Kconfig'
+                ))
             fp_module_file.write(content)
 
     def get_module_setting_root(self, root, settings_file):

From 980e3ca8c6ac4b98bcf05de1582403da03b4cb08 Mon Sep 17 00:00:00 2001
From: Piotr Golyzniak <piotr.golyzniak@nordicsemi.no>
Date: Mon, 1 Aug 2022 13:06:01 +0200
Subject: [PATCH 0232/2913] [nrf noup] ci: scripts: add quarantine file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add scripts/quarantine.yaml file, which will be used in CI.

Signed-off-by: Piotr Golyzniak <piotr.golyzniak@nordicsemi.no>
Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
Signed-off-by: Maciej Perkowski <Maciej.Perkowski@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit d3cf93898ce7600574e8dc2d5921d6af8fdd5cdc)
(cherry picked from commit 354e6bce3c5e42e15c47100fe9ca8dcd3f22011f)
---
 scripts/quarantine.yaml | 88 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 scripts/quarantine.yaml

diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml
new file mode 100644
index 00000000000..20c4f9248ea
--- /dev/null
+++ b/scripts/quarantine.yaml
@@ -0,0 +1,88 @@
+# The configurations resulting as a product of scenarios and platforms
+# will be skipped if quarantine is used. More details here:
+# https://docs.zephyrproject.org/latest/guides/test/twister.html#quarantine
+
+- scenarios:
+    - testing.ztest.busy_sim
+    - testing.ztest.busy_sim_nrf52840dk_pin
+  platforms:
+    - nrf52840dk_nrf52840
+
+# Already reported, but will not be fixed (look at the discussion):
+# https://github.com/zephyrproject-rtos/zephyr/issues/44947
+- scenarios:
+    - libraries.cmsis_dsp.matrix.unary_f64
+  platforms:
+    - nrf5340dk_nrf5340_cpunet
+    - qemu_cortex_m3
+  comment: "Flash overflows"
+
+# Already reported, but will not be fixed (look at the discussion):
+# https://github.com/zephyrproject-rtos/zephyr/issues/44947
+- scenarios:
+    - libraries.cmsis_dsp.matrix.binary_f16
+    - libraries.cmsis_dsp.matrix.binary_f16.fpu
+  platforms:
+    - nrf5340dk_nrf5340_cpuapp_ns
+  comment: "Flash overflows"
+
+# Already reported, but will not be fixed (look at the discussion):
+# https://github.com/zephyrproject-rtos/zephyr/issues/44947
+- scenarios:
+    - libraries.cmsis_dsp.matrix.binary_q15
+    - libraries.cmsis_dsp.matrix.binary_q15.fpu
+    - libraries.cmsis_dsp.matrix.unary_f32
+    - libraries.cmsis_dsp.matrix.unary_f32.fpu
+    - libraries.cmsis_dsp.matrix.unary_f64
+    - libraries.cmsis_dsp.matrix.unary_f64.fpu
+  platforms:
+    - nrf5340dk_nrf5340_cpuapp_ns
+    - nrf9160dk_nrf9160_ns
+  comment: "Flash overflows"
+
+# libsdl2-dev package should be added into docker image
+- scenarios:
+    - sample.boards.nrf.nrf_led_matrix
+    - sample.display.lvgl.gui
+  platforms:
+    - native_posix
+  comment: "libsdl2-dev package not available"
+
+- scenarios:
+    - sample.net.sockets.echo_server.usbnet
+    - sample.net.sockets.echo_server.usbnet_composite
+  platforms:
+    - nrf5340dk_nrf5340_cpuapp_ns
+  comment: "Ram/flash overflows, also in the upstream"
+
+- scenarios:
+    - sample.net.zperf.netusb_ecm
+    - sample.net.zperf.netusb_eem
+    - sample.net.zperf.netusb_rndis
+  platforms:
+    - nrf52833dk_nrf52833
+    - nrf5340dk_nrf5340_cpuapp_ns
+  comment: "Ram/flash overflows, also in the upstream"
+
+- scenarios:
+    - net.mqtt.tls
+  platforms:
+    - nrf5340dk_nrf5340_cpuapp_ns
+    - nrf9160dk_nrf9160_ns
+  comment: "Ram/flash overflows, also in the upstream"
+
+- scenarios:
+    - kernel.common.picolibc
+    - libraries.picolibc
+    - libraries.libc.picolibc.mem_alloc
+    - libraries.picolibc.sprintf_new
+  platforms:
+    - nrf52dk_nrf52832
+  comment: "Ram overflows, also in the upstream"
+
+- scenarios:
+    - sample.psa_crypto
+  platforms:
+    - nrf5340dk_nrf5340_cpuapp_ns
+    - nrf9160dk_nrf9160_ns
+  comment: "Due to using sdk-zephyr manifest instead of nrf. Should be fixed after the change"

From 98762a9ff01147afb8fa5fcbd7d5772b58311900 Mon Sep 17 00:00:00 2001
From: Sebastian Wezel <sebastian.wezel@nordicsemi.no>
Date: Tue, 15 Mar 2022 13:12:25 +0100
Subject: [PATCH 0233/2913] [nrf noup] ci: add .github/test-spec.yml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This file is used for NCS-specific testing configuration based on
modifications to files in this repository.

Signed-off-by: Alperen Sener <alperen.sener@nordicsemi.no>
Signed-off-by: Elisabeth Solheim Klakken <elisabeth.solheim@nordicsemi.no>
Signed-off-by: Mariusz Poslinski <mariusz.poslinski@nordicsemi.no>
Signed-off-by: Markus Swarowsky <markus.swarowskyl@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Sebastian Wezel <sebastian.wezel@nordicsemi.no>
Signed-off-by: Tomasz Tyzenhauz <tomasz.tyzenhauz@nordicsemi.no>
Signed-off-by: Fredrik Ås <fredrik.aas@nordicsemi.no>
Signed-off-by: Michał Szablowski <michal.szablowski@nordicsemi.no>
Signed-off-by: Tony Le <tony.le@nordicsemi.no>
Signed-off-by: Krishna T <krishna.t@nordicsemi.no>
Signed-off-by: Dawid Przybylo <dawid.przybylo@nordicsemi.no>
Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Signed-off-by: Jørgen Kvalvaag <jorgen.kvalvaag@nordicsemi.no>
Signed-off-by: Magne Værnes <magne.varnes@nordicsemi.no>
Signed-off-by: Lang Xie <Lang.Xie@nordicsemi.no>
Signed-off-by: Alexander Svensen <alexander.svensen@nordicsemi.no>
Signed-off-by: Jan Gałda <jan.galda@nordicsemi.no>
Signed-off-by: Vladislav Litvinov <vladislav.litvinov@nordicsemi.no>
Signed-off-by: Guojun Wang <guojun.wang@nordicsemi.no>
Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
Signed-off-by: Thomas Stilwell <Thomas.Stilwell@nordicsemi.no>
Signed-off-by: Krzysztof Szromek <krzysztof.szromek@nordicsemi.no>
Signed-off-by: Grzegorz Chwierut <grzegorz.chwierut@nordicsemi.no>
(cherry picked from commit ea3d3dba241ab400a6c0e67858722a78c1add94d)
(cherry picked from commit 7f2dad2218ccb8626315acb759416121ec5c3323)
---
 .github/test-spec.yml | 406 ++++++++++++++++++++++++++++++++++++++++++
 CODEOWNERS            |   1 +
 2 files changed, 407 insertions(+)
 create mode 100644 .github/test-spec.yml

diff --git a/.github/test-spec.yml b/.github/test-spec.yml
new file mode 100644
index 00000000000..63a29824c11
--- /dev/null
+++ b/.github/test-spec.yml
@@ -0,0 +1,406 @@
+# This is the Jenkins ci variant of the .github/labler.yaml
+
+"CI-run-zephyr-twister":
+  - any:
+      - "!.github/**/*"
+      - "!doc/**/*"
+      - "!CODEOWNERS"
+      - "!LICENSE"
+      - "!**/*.rst"
+      - "!VERSION"
+      - "!submanifests/**/*"
+      - "!MAINTAINERS.yml"
+      - "!version.h.in"
+      - "!Jenkinsfile"
+      - "!**/*.md"
+
+"CI-iot-zephyr-lwm2m-test":
+  - "drivers/console/**/*"
+  - "drivers/flash/**/*"
+  - "subsys/dfu/boot/**/*"
+  - "subsys/net/ip/**/*"
+  - "subsys/net/lib/http/**/*"
+  - "subsys/net/lib/lwm2m//**/*"
+  - "subsys/net/**/*"
+
+"CI-iot-samples-test":
+  - "boards/nordic/nrf9160dk/**/*"
+  - "dts/arm/nordic/nrf9160*"
+  - "include/net/**/*"
+  - "subsys/net/lib/**/*"
+
+"CI-iot-libraries-test":
+  - "boards/nordic/nrf9160dk/**/*"
+  - "dts/arm/nordic/nrf9160*"
+  - "include/net/socket_ncs.h"
+  - "subsys/testsuite/ztest/**/*"
+
+"CI-lwm2m-test": null
+# Not necessary to run tests on changes to this repo.
+
+"CI-boot-test":
+  - "subsys/mgmt/mcumgr/**/*"
+  - "subsys/dfu/**/*"
+  - "include/mgmt/mcumgr/**/*"
+  - "include/dfu/**/*"
+  - "samples/subsys/mgmt/mcumgr/smp_svr/**/*"
+  - "tests/boot/**/*"
+  - "tests/subsys/dfu/**/*"
+  - "tests/subsys/mgmt/mcumgr/**/*"
+
+"CI-tfm-test":
+  - "boards/nordic/nrf5340dk/**/*"
+  - "boards/nordic/nrf9160dk/**/*"
+  - "drivers/entropy/*"
+  - "dts/arm/nordic/nrf5340*"
+  - "dts/arm/nordic/nrf9160*"
+  - "modules/trusted-firmware-m/**/*"
+  - "samples/tfm_integration/**/*"
+
+"CI-ble-test":
+  - any:
+      - "drivers/bluetooth/**/*"
+  - any:
+      - "dts/arm/nordic/nrf5*"
+  - any:
+      - "subsys/bluetooth/**/*"
+      - "!subsys/bluetooth/mesh/**/*"
+      - "!subsys/bluetooth/audio/**/*"
+  - any:
+      - "include/zephyr/bluetooth/**/*"
+      - "!include/zephyr/bluetooth/mesh/**/*"
+  - "samples/bluetooth/hci_ipc/**/*"
+
+"CI-ble-samples-test":
+  - any:
+      - "drivers/bluetooth/**/*"
+  - any:
+      - "dts/arm/nordic/nrf5*"
+  - any:
+      - "subsys/bluetooth/**/*"
+      - "!subsys/bluetooth/mesh/**/*"
+      - "!subsys/bluetooth/audio/**/*"
+  - any:
+      - "include/zephyr/bluetooth/**/*"
+      - "!include/zephyr/bluetooth/mesh/**/*"
+  - "samples/bluetooth/**/*"
+
+"CI-mesh-test":
+  - "subsys/bluetooth/mesh/**/*"
+  - "include/zephyr/bluetooth/mesh/**/*"
+  - "samples/bluetooth/mesh/**/*"
+  - "samples/bluetooth/mesh_demo/**/*"
+  - "samples/bluetooth/mesh_provisioner/**/*"
+  - "tests/bluetooth/mesh/**/*"
+  - "tests/bluetooth/mesh_shell/**/*"
+
+"CI-zigbee-test":
+  - "subsys/mgmt/mcumgr/**/*"
+  - "subsys/dfu/**/*"
+  - "include/mgmt/mcumgr/**/*"
+  - "include/dfu/**/*"
+
+"CI-thingy91-test":
+  - "boards/nordic/nrf9160dk/**/*"
+  - "arch/x86/core/**/*"
+  - "arch/x86/include/**/*"
+  - "drivers/console/**/*"
+  - "drivers/ethernet/**/*"
+  - "drivers/flash/**/*"
+  - "drivers/hwinfo/**/*"
+  - "drivers/interrupt_controller/**/*"
+  - "drivers/net/**/*"
+  - "drivers/serial/**/*"
+  - "drivers/timer/**/*"
+  - "include/**/*"
+  - "kernel/**/*"
+  - "lib/libc/common/source/stdlib/**/*"
+  - "lib/libc/newlib/**/*"
+  - "lib/libc/picolibc/**/*"
+  - "lib/os/**/*"
+  - "lib/posix/**/*"
+  - "misc/**/*"
+  - "modules/mbedtls/**/*"
+  - "soc/x86/ia32/**/*"
+  - "subsys/fs/fcb/**/*"
+  - "subsys/logging/**/*"
+  - "subsys/net/**/*"
+  - "subsys/random/**/*"
+  - "subsys/settings/include/**/*"
+  - "subsys/settings/src/**/*"
+  - "subsys/stats/**/*"
+  - "subsys/storage/flash_map/**/*"
+  - "subsys/storage/stream/**/*"
+  - "subsys/tracing/**/*"
+
+"CI-desktop-test":
+  - "drivers/bluetooth/*"
+  - "subsys/bluetooth/*"
+  - "include/zephyr/bluetooth/*"
+
+"CI-crypto-test":
+  - "boards/nordic/nrf52840dk/**/*"
+  - "boards/nordic/nrf5340dk/**/*"
+  - "boards/nordic/nrf9160dk/**/*"
+  - "drivers/entropy/*"
+  - "drivers/serial/**/*"
+  - "dts/arm/nordic/nrf52840*"
+  - "dts/arm/nordic/nrf5340*"
+  - "dts/arm/nordic/nrf9160*"
+  - "include/drivers/serial/**/*"
+  - "modules/mbedtls/**/*"
+
+"CI-fem-test":
+  - "boards/nordic/**/*"
+  - "drivers/bluetooth/hci/**/*"
+  - "drivers/entropy/**/*"
+  - "dts/bindings/**/*"
+  - "include/zephyr/net/**/*"
+  - "include/zephyr/arch/**/*"
+  - "lib/libc/**/*"
+  - "lib/open-amp/**/*"
+  - "modules/hal_nordic/**/*"
+  - "modules/mbedtls/**/*"
+  - "modules/openthread/**/*"
+  - "modules/trusted-firmware-m/**/*"
+  - "samples/net/sockets/echo_*/**/*"
+  - "share/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/net/**/*"
+  - "subsys/settings/**/*"
+  - "subsys/bluetooth/shell/**/*"
+  - "subsys/ipc/**/*"
+  - "Kconfig"
+  - "CMakeLists.txt"
+
+"CI-rs-test":
+  - "boards/nordic/**/*"
+  - "drivers/bluetooth/hci/**/*"
+  - "drivers/entropy/**/*"
+  - "dts/bindings/**/*"
+  - "include/zephyr/net/**/*"
+  - "include/zephyr/arch/**/*"
+  - "lib/libc/**/*"
+  - "lib/open-amp/**/*"
+  - "modules/hal_nordic/**/*"
+  - "modules/mbedtls/**/*"
+  - "modules/openthread/**/*"
+  - "modules/trusted-firmware-m/**/*"
+  - "samples/net/sockets/echo_*/**/*"
+  - "share/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/net/**/*"
+  - "subsys/settings/**/*"
+  - "subsys/bluetooth/shell/**/*"
+  - "subsys/ipc/**/*"
+  - "Kconfig"
+  - "CMakeLists.txt"
+
+"CI-thread-test":
+  - "include/zephyr/net/**/*"
+  - "modules/mbedtls/**/*"
+  - "modules/openthread/**/*"
+  - "samples/net/openthread/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/net/**/*"
+  - "subsys/settings/**/*"
+
+"CI-nfc-test":
+  - "drivers/bluetooth/hci/**/*"
+  - "drivers/entropy/**/*"
+  - "drivers/flash/**/*"
+  - "drivers/mbox/**/*"
+  - "drivers/spi/**/*"
+  - "lib/crc/**/*"
+  - "modules/hal_nordic/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/bluetooth/**/*"
+  - "subsys/ipc/ipc_service/**/*"
+  - "subsys/fs/**/*"
+  - "subsys/mem_mgmt/**/*"
+  - "subsys/net/**/*"
+  - "subsys/random/**/*"
+  - "subsys/settings/**/*"
+  - "subsys/shell/**/*"
+  - "subsys/storage/**/*"
+
+"CI-matter-test":
+  - "include/dfu/**/*"
+  - "include/mgmt/mcumgr/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/dfu/**/*"
+  - "subsys/settings/**/*"
+  - "subsys/net/**/*"
+  - "subsys/mgmt/mcumgr/**/*"
+  - "drivers/net/**/*"
+  - "samples/bluetooth/hci_ipc/**/*"
+  - any:
+      - "subsys/bluetooth/**/*"
+      - "!subsys/bluetooth/mesh/**/*"
+      - "!subsys/bluetooth/audio/**/*"
+
+"CI-find-my-test":
+  - "boards/nordic/**/*"
+  - "drivers/bluetooth/**/*"
+  - "drivers/entropy/**/*"
+  - "drivers/flash/**/*"
+  - "drivers/usb/**/*"
+  - "drivers/regulator/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/bluetooth/**/*"
+  - "subsys/dfu/**/*"
+  - "subsys/fs/**/*"
+  - "subsys/ipc/**/*"
+  - "subsys/net/**/*"
+  - "subsys/random/**/*"
+  - "subsys/settings/**/*"
+  - "subsys/storage/**/*"
+  - "subsys/tracing/**/*"
+  - "subsys/usb/device/**/*"
+
+"CI-rpc-test":
+  - "subsys/ipc/ipc_service/**/*"
+  - "subsys/random/**/*"
+  - "soc/nordic/nrf53/**/*"
+
+"CI-modemshell-test":
+  - "include/net/**/*"
+  - "include/posix/**/*"
+  - "include/shell/**/*"
+  - "drivers/net/**/*"
+  - "drivers/serial/**/*"
+  - "drivers/wifi/**/*"
+  - "subsys/shell/**/*"
+  - "subsys/net/**/*"
+  - "subsys/settings/**/*"
+
+"CI-positioning-test":
+  - "include/net/**/*"
+  - "include/posix/**/*"
+  - "drivers/net/**/*"
+  - "drivers/wifi/**/*"
+  - "subsys/net/**/*"
+  - "subsys/settings/**/*"
+
+"CI-cloud-test":
+  - "include/zephyr/dfu/**/*"
+  - "include/zephyr/net/**/*"
+  - "include/zephyr/posix/**/*"
+  - "include/zephyr/settings/**/*"
+  - "drivers/led/**/*"
+  - "drivers/net/**/*"
+  - "drivers/sensor/**/*"
+  - "drivers/serial/**/*"
+  - "drivers/wifi/**/*"
+  - "lib/posix/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/dfu/**/*"
+  - "subsys/net/**/*"
+  - "subsys/settings/**/*"
+
+"CI-wifi":
+  - "subsys/net/l2/wifi/**/*"
+  - "subsys/net/l2/ethernet/**/*"
+
+"CI-sidewalk-test":
+  - "include/dfu/**/*"
+  - "include/mgmt/mcumgr/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/dfu/**/*"
+  - "subsys/settings/**/*"
+  - "subsys/mgmt/mcumgr/**/*"
+  - "samples/bluetooth/hci_ipc/**/*"
+  - any:
+      - "subsys/bluetooth/**/*"
+      - "!subsys/bluetooth/mesh/**/*"
+      - "!subsys/bluetooth/audio/**/*"
+
+"CI-audio-test":
+  - "boards/nordic/nrf5340_audio_dk/**/*"
+  - "drivers/flash/**/*"
+  - "drivers/spi/**/*"
+  - "drivers/gpio/**/*"
+  - "drivers/i2c/**/*"
+  - "drivers/watchdog/**/*"
+  - "include/dfu/**/*"
+  - "include/mgmt/mcumgr/**/*"
+  - "samples/bluetooth/hci_ipc/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/bluetooth/audio/**/*"
+  - "subsys/bluetooth/host/**/*"
+  - "subsys/dfu/**/*"
+  - "subsys/fs/**/*"
+  - "subsys/mgmt/mcumgr/**/*"
+  - "subsys/sd/**/*"
+  - "subsys/storage/**/*"
+  - "subsys/task_wdt/**/*"
+  - "subsys/usb/**/*"
+  - "subsys/zbus/**/*"
+
+"CI-pmic-samples-test":
+  - "samples/shields/npm1300_ek/**/*"
+  - "boards/shields/npm1300_ek/**/*"
+  - "**/**npm1300**/**"
+  - "drivers/regulator/regulator_common.c"
+  - "drivers/regulator/regulator_shell.c"
+  - "drivers/gpio/gpio_shell.c"
+  - "drivers/sensor/sensor_shell.c"
+
+"CI-test-low-level":
+  - "arch/**/*"
+  - "boards/nordic/nrf54*/**/*"
+  - "drivers/**/*"
+  - "dts/**/*"
+  - "include/zephyr/**/*"
+  - "kernel/**/*"
+  - "modules/hal_nordic/**/*"
+  - "samples/basic/blinky_pwm/**/*"
+  - "samples/basic/fade_led/**/*"
+  - "samples/boards/nrf/**/*"
+  - "samples/boards/nordic/**/*"
+  - "samples/drivers/adc/**/*"
+  - "samples/drivers/jesd216/**/*"
+  - "samples/drivers/mbox/**/*"
+  - "samples/drivers/soc_flash_nrf/**/*"
+  - "samples/drivers/spi_flash/**/*"
+  - "samples/drivers/watchdog/**/*"
+  - "samples/hello_world/**/*"
+  - "samples/sensor/**/*"
+  - "samples/subsys/ipc/**/*"
+  - "samples/subsys/logging/**/*"
+  - "samples/subsys/settings/**/*"
+  - "samples/subsys/usb/cdc_acm/**/*"
+  - "samples/subsys/usb/mass/**/*"
+  - "samples/synchronization/**/*"
+  - "subsys/logging/**/*"
+  - "subsys/settings/**/*"
+  - "tests/arch/**/*"
+  - "tests/boards/nrf/**/*"
+  - "tests/boards/nordic/**/*"
+  - "tests/drivers/**/*"
+  - "tests/kernel/**/*"
+
+"CI-suit-dfu-test":
+  - "subsys/mgmt/mcumgr/**/*"
+  - "include/mgmt/mcumgr/**/*"
+  - "samples/subsys/mgmt/mcumgr/smp_svr/**/*"
+  - "subsys/bluetooth/**/*"
+  - "drivers/bluetooth/**/*"
+  - "drivers/flash/**/*"
+  - "drivers/spi/**/*"
+  - "drivers/mbox/**/*"
+  - "drivers/serial/**/*"
+  - "drivers/console/**/*"
+  - "dts/common/nordic/*"
+  - "dts/arm/nordic/nrf54h*"
+  - "dts/riscv/nordic/nrf54h*"
+  - "boards/nordic/nrf54h*"
+  - "soc/nordic/nrf54h/**/*"
+  - "include/zephyr/**/*"
+  - "subsys/logging/**/*"
+  - "subsys/tracing/**/*"
+  - "scripts/west_commands/build.py"
+  - "scripts/west_commands/flash.py"
+  - "scripts/west_commands/runners/nrfutil.py"
+  - "scripts/west_commands/runners/core.py"
+  - "scripts/west_commands/runners/nrf_common.py"
diff --git a/CODEOWNERS b/CODEOWNERS
index 4c737dc9642..8ba6e3c5b78 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -18,6 +18,7 @@
 # component or code. This file is going to be deprecated and currently only had
 # entries that are not covered by the MAINTAINERS file.
 
+/.github/test-spec.yml                    @nrfconnect/ncs-test-leads
 /soc/arm/aspeed/                          @aspeeddylan
 /soc/atmel/                               @nandojve
 /soc/arm/bcm*/                            @sbranden

From d1ded336a6e34041e9de4fa4f52cc3669c9aa17f Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Date: Thu, 1 Jun 2023 15:58:56 +0200
Subject: [PATCH 0234/2913] [nrf noup] tests: drivers: build_all: regulator:
 use old schema

New Twister schema is not supported yet in sdk-zephyr, drop this patch
once Twister is updated.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
(cherry picked from commit 104d43fecb7fd83a6dea634c1f7672164c2621a6)
(cherry picked from commit cf56646288a1bed6ae84c162a67b43b93c6abfcd)
---
 tests/drivers/build_all/regulator/testcase.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/drivers/build_all/regulator/testcase.yaml b/tests/drivers/build_all/regulator/testcase.yaml
index 58fc0851981..8214a2ca33a 100644
--- a/tests/drivers/build_all/regulator/testcase.yaml
+++ b/tests/drivers/build_all/regulator/testcase.yaml
@@ -3,9 +3,7 @@
 
 tests:
   drivers.regulator.build:
-    tags:
-      - drivers
-      - regulator
+    tags: drivers regulator
     build_only: true
     platform_allow:
       - native_posix

From 374374bd72782f93412ea12d1713d543d4080ffb Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Mon, 19 Jun 2023 12:19:05 +0200
Subject: [PATCH 0235/2913] [nrf noup] Revert "twister: Use natural sort when
 generating hardware map"

This reverts commit c37deeb0c4602dc3eeb700a7dc3ed317283fff17.

This is only a temporary change, until we align our CI. To be removed
once natsort is avaialble in the NCS CI.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 9c859b63b0650645505cffb9d8da0d293880803c)
(cherry picked from commit ec65bcf1e11225426ff9ad99645a71a48e3ef81d)
---
 scripts/pylib/twister/twisterlib/hardwaremap.py | 3 +--
 scripts/requirements-run-test.txt               | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/pylib/twister/twisterlib/hardwaremap.py b/scripts/pylib/twister/twisterlib/hardwaremap.py
index 61653800280..6ca6dbcdb7d 100644
--- a/scripts/pylib/twister/twisterlib/hardwaremap.py
+++ b/scripts/pylib/twister/twisterlib/hardwaremap.py
@@ -13,7 +13,6 @@
 import scl
 import logging
 from pathlib import Path
-from natsort import natsorted
 
 from twisterlib.environment import ZEPHYR_BASE
 
@@ -358,7 +357,7 @@ def readlink(link):
 
     def save(self, hwm_file):
         # use existing map
-        self.detected = natsorted(self.detected, key=lambda x: x.serial or '')
+        self.detected.sort(key=lambda x: x.serial or '')
         if os.path.exists(hwm_file):
             with open(hwm_file, 'r') as yaml_file:
                 hwm = yaml.load(yaml_file, Loader=SafeLoader)
diff --git a/scripts/requirements-run-test.txt b/scripts/requirements-run-test.txt
index 8b1d01afb09..551ec9d6990 100644
--- a/scripts/requirements-run-test.txt
+++ b/scripts/requirements-run-test.txt
@@ -7,7 +7,6 @@ pyocd>=0.35.0
 
 # used by twister for board/hardware map
 tabulate
-natsort
 
 # used by mcuboot
 cbor>=1.0.0

From 901dcc3c7ed6b26ef53ce9e48b4b0a811841a3cb Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Fri, 15 Dec 2023 09:35:22 +0000
Subject: [PATCH 0236/2913] [nrf noup] cmake: modules: kconfig: Add hide
 child/parent variable

Adds a variable to Kconfig which, when set, will disable showing
child/parent Kconfig values in builds (enabled when Sysbuild is
used)

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 391567a66236c0f83f17c3750d00e73c2c6e48c8)
(cherry picked from commit 2483870f79a3f4c4da2ff11f61d7a9d9d40afa2c)
---
 cmake/modules/kconfig.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmake/modules/kconfig.cmake b/cmake/modules/kconfig.cmake
index ba461d30bbc..1e156bff470 100644
--- a/cmake/modules/kconfig.cmake
+++ b/cmake/modules/kconfig.cmake
@@ -169,6 +169,7 @@ set(COMMON_KCONFIG_ENV_SETTINGS
   TOOLCHAIN_KCONFIG_DIR=${TOOLCHAIN_KCONFIG_DIR}
   TOOLCHAIN_HAS_NEWLIB=${_local_TOOLCHAIN_HAS_NEWLIB}
   TOOLCHAIN_HAS_PICOLIBC=${_local_TOOLCHAIN_HAS_PICOLIBC}
+  HIDE_CHILD_PARENT_CONFIG=${SYSBUILD}
   EDT_PICKLE=${EDT_PICKLE}
   # Export all Zephyr modules to Kconfig
   ${ZEPHYR_KCONFIG_MODULES_DIR}

From 3fe805d25ad4858aa4cea4d326ef1652f52c23d3 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Date: Thu, 3 Mar 2022 15:28:16 +0100
Subject: [PATCH 0237/2913] [nrf noup] doc: remove Kconfig search

Kconfig search is handled in a separate docset in NCS, so remove the
page. This is a long-term noup patch.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Signed-off-by: Krishna T <krishna.t@nordicsemi.no>
(cherry picked from commit 37911f8989112d448f47af0d5cf4fd57755d4a99)
(cherry picked from commit e0851076b40e26f49cae64e65ae9a90697804ab7)
---
 MAINTAINERS.yml                   | 1 -
 doc/build/kconfig/setting.rst     | 6 ++----
 doc/develop/application/index.rst | 5 ++---
 doc/kconfig.rst                   | 8 --------
 4 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 doc/kconfig.rst

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index b4bf261ec29..cc7cb9a1411 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -975,7 +975,6 @@ Documentation:
     - doc/images/Zephyr-Kite-in-tree.png
     - doc/index-tex.rst
     - doc/index.rst
-    - doc/kconfig.rst
     - doc/templates/sample.tmpl
     - doc/templates/board.tmpl
     - boards/index.rst
diff --git a/doc/build/kconfig/setting.rst b/doc/build/kconfig/setting.rst
index 05308589d53..85ae9f4c745 100644
--- a/doc/build/kconfig/setting.rst
+++ b/doc/build/kconfig/setting.rst
@@ -7,8 +7,7 @@ The :ref:`menuconfig and guiconfig interfaces <menuconfig>` can be used to test
 out configurations during application development. This page explains how to
 make settings permanent.
 
-All Kconfig options can be searched in the :ref:`Kconfig search page
-<kconfig-search>`.
+All Kconfig options can be searched in the Kconfig search page.
 
 .. note::
 
@@ -115,8 +114,7 @@ Assignments in configuration files are only respected if the dependencies for
 the symbol are satisfied. A warning is printed otherwise. To figure out what
 the dependencies of a symbol are, use one of the :ref:`interactive
 configuration interfaces <menuconfig>` (you can jump directly to a symbol with
-:kbd:`/`), or look up the symbol in the :ref:`Kconfig search page
-<kconfig-search>`.
+:kbd:`/`), or look up the symbol in the Kconfig search page.
 
 
 .. _initial-conf:
diff --git a/doc/develop/application/index.rst b/doc/develop/application/index.rst
index 64d99dc0bcc..bcad2900b88 100644
--- a/doc/develop/application/index.rst
+++ b/doc/develop/application/index.rst
@@ -648,9 +648,8 @@ started.
 
 See :ref:`setting_configuration_values` for detailed documentation on setting
 Kconfig configuration values. The :ref:`initial-conf` section on the same page
-explains how the initial configuration is derived. See :ref:`kconfig-search`
-for a complete list of configuration options.
-See :ref:`hardening` for security information related with Kconfig options.
+explains how the initial configuration is derived. See :ref:`hardening` for
+security information related with Kconfig options.
 
 The other pages in the :ref:`Kconfig section of the manual <kconfig>` are also
 worth going through, especially if you planning to add new configuration
diff --git a/doc/kconfig.rst b/doc/kconfig.rst
deleted file mode 100644
index 1123de2adbd..00000000000
--- a/doc/kconfig.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-:orphan:
-
-.. _kconfig-search:
-
-Kconfig Search
-==============
-
-.. kconfig:search::

From 676d548b558daea46043f239dcf414c4cffacde0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Thu, 13 Jan 2022 11:37:18 +0100
Subject: [PATCH 0238/2913] [nrf noup] modules: tf-m: use of
 PSA_HAS_XXXX_SUPPORT
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-This allows configurations enabled by PSA_WANTS_ALG_XXXX to be
 used to control which TF-M module is enabled
-If the TF-M image doesn't support e.g. the MAC APIs, then the
 MAC interface is not enabled

Note: This functionality requires that nrf_security is enabled

ref: NCSDK-11689

Make TF-M crypto module depend on PSA_WANT_GENERATE_RANDOM, same
as all other crypto modules, which have PSA_HAS to group all PSA
features that require the module.
This makes TF-M by default exclude the RNG module when not needed.

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
(cherry picked from commit 06896355fad61c922819fcbd2b98abd122618831)
(cherry picked from commit 23fdd1e6a2f49a776e94f2adf78971a17286cf23)
---
 modules/trusted-firmware-m/Kconfig.tfm.crypto_modules | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules b/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
index 1d70a2c44d2..02d3580c22f 100644
--- a/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
+++ b/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
@@ -10,6 +10,7 @@ if TFM_PARTITION_CRYPTO
 config TFM_CRYPTO_RNG_MODULE_ENABLED
 	bool "Random number generator crypto module"
 	default y
+	depends on PSA_WANT_GENERATE_RANDOM && NRF_SECURITY
 	help
 	  Enables the random number generator  module within the crypto partition.
 	  Unset this option if 'psa_generate_random' is not used.
@@ -17,6 +18,7 @@ config TFM_CRYPTO_RNG_MODULE_ENABLED
 config TFM_CRYPTO_KEY_MODULE_ENABLED
 	bool "KEY crypto module"
 	default y
+	depends on PSA_HAS_KEY_SUPPORT && NRF_SECURITY
 	help
 	  Enables the KEY crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_key_management.c'
@@ -25,6 +27,7 @@ config TFM_CRYPTO_KEY_MODULE_ENABLED
 config TFM_CRYPTO_AEAD_MODULE_ENABLED
 	bool "AEAD crypto module"
 	default y
+	depends on PSA_HAS_AEAD_SUPPORT && NRF_SECURITY
 	help
 	  Enables the AEAD crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_aead.c'
@@ -33,6 +36,7 @@ config TFM_CRYPTO_AEAD_MODULE_ENABLED
 config TFM_CRYPTO_MAC_MODULE_ENABLED
 	bool "MAC crypto module"
 	default y
+	depends on PSA_HAS_MAC_SUPPORT && NRF_SECURITY
 	help
 	  Enables the MAC crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_mac.c'
@@ -41,6 +45,7 @@ config TFM_CRYPTO_MAC_MODULE_ENABLED
 config TFM_CRYPTO_HASH_MODULE_ENABLED
 	bool "HASH crypto module"
 	default y
+	depends on PSA_HAS_HASH_SUPPORT && NRF_SECURITY
 	help
 	  Enables the HASH crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_hash.c'
@@ -49,6 +54,7 @@ config TFM_CRYPTO_HASH_MODULE_ENABLED
 config TFM_CRYPTO_CIPHER_MODULE_ENABLED
 	bool "CIPHER crypto module"
 	default y
+	depends on PSA_HAS_CIPHER_SUPPORT && NRF_SECURITY
 	help
 	  Enables the CIPHER crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_cipher.c'
@@ -57,6 +63,7 @@ config TFM_CRYPTO_CIPHER_MODULE_ENABLED
 config TFM_CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED
 	bool "ASYM ENCRYPT crypto module"
 	default y
+	depends on PSA_HAS_ASYM_ENCRYPT_SUPPORT && NRF_SECURITY
 	help
 	  Enables the ASYM ENCRYPT crypto module within the crypto partition.
 	  Unset this option if the encrypt functionality provided by 'crypto_asymmetric.c'
@@ -65,6 +72,7 @@ config TFM_CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED
 config TFM_CRYPTO_ASYM_SIGN_MODULE_ENABLED
 	bool "ASYM SIGN crypto module"
 	default y
+	depends on PSA_HAS_ASYM_SIGN_SUPPORT && NRF_SECURITY
 	help
 	  Enables the ASYM SIGN crypto module within the crypto partition.
 	  Unset this option if the sign functionality provided by 'crypto_asymmetric.c'
@@ -73,10 +81,12 @@ config TFM_CRYPTO_ASYM_SIGN_MODULE_ENABLED
 config TFM_CRYPTO_KEY_DERIVATION_MODULE_ENABLED
 	bool "KEY DERIVATION crypto module"
 	default y
+	depends on (PSA_HAS_KEY_DERIVATION || PSA_HAS_KEY_AGREEMENT) && NRF_SECURITY
 	help
 	  Enables the KEY_DERIVATION crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_key_derivation.c'
 	  is not used.
+	  Note that key agreement is under key derivation in the current implementation.
 
 endif # TFM_PARTITION_CRYPTO
 

From 5a62fe9cc2ade67040d97c207ed444a58c22397f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B8e?= <sebastian.boe@nordicsemi.no>
Date: Sat, 29 Jan 2022 13:03:08 +0100
Subject: [PATCH 0239/2913] [nrf noup] modules: mbedtls: Allow MBEDTLS_BUILTIN
 to be deselected
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Out-of-tree crypto subsystems need to deselect MBEDTLS_BUILTIN, but
deselection is not supported. It is however supported to select a
dependency in a ! expression.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
(cherry picked from commit e261976152f6ab4ede877be8a9f8d6770f81e4fb)
(cherry picked from commit 906921d5349828999e7669f06c37a336fa71e4a5)
---
 modules/mbedtls/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/mbedtls/Kconfig b/modules/mbedtls/Kconfig
index d15c420f507..546bcd66dd2 100644
--- a/modules/mbedtls/Kconfig
+++ b/modules/mbedtls/Kconfig
@@ -28,6 +28,7 @@ choice MBEDTLS_IMPLEMENTATION
 
 config MBEDTLS_BUILTIN
 	bool "Use Zephyr in-tree mbedTLS version"
+	depends on ! DISABLE_MBEDTLS_BUILTIN
 	help
 	  Link with mbedTLS sources included with Zephyr distribution.
 	  Included mbedTLS version is well integrated with and supported
@@ -41,6 +42,11 @@ config MBEDTLS_LIBRARY
 
 endchoice
 
+# subsystems cannot deselect MBEDTLS_BUILTIN, but they can select
+# DISABLE_MBEDTLS_BUILTIN.
+config DISABLE_MBEDTLS_BUILTIN
+	bool
+
 config CUSTOM_MBEDTLS_CFG_FILE
 	bool "Custom mbed TLS configuration file"
 	help

From 801154a9986d2a4c48d51f881973c8ba72ae5b40 Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Mon, 12 Feb 2024 14:30:23 +0100
Subject: [PATCH 0240/2913] [nrf noup] modules: mbedtls: Add include folders

We moved the header files in sdk-mbedtls from the library
folder to the include/library folder. This was done to avoid
issues when building MbedTLS with the nrf_security module
and the Oberon PSA core. The Oberon PSA core provides a subset
of these header files and since they are included with quotes
we cannot have them in the same directory.
This change make the needed adaptions in CMake for the
applications that don't use nrf_security.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
(cherry picked from commit 7a598fa3fb81493466d1bb3c8e6db6d2736dfb09)
(cherry picked from commit 736cf61e59a2d95bf2cdac4753de67cafbabadfe)
---
 modules/mbedtls/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/mbedtls/CMakeLists.txt b/modules/mbedtls/CMakeLists.txt
index aab4ad5316c..1bde8df4dee 100644
--- a/modules/mbedtls/CMakeLists.txt
+++ b/modules/mbedtls/CMakeLists.txt
@@ -39,6 +39,8 @@ zephyr_interface_library_named(mbedTLS)
     # Add regular includes
     target_include_directories(mbedTLS INTERFACE
         ${ZEPHYR_CURRENT_MODULE_DIR}/include
+        ${ZEPHYR_CURRENT_MODULE_DIR}/include/library
+        ${ZEPHYR_CURRENT_MODULE_DIR}/library
         configs
         include
     )

From e92e87d7790ce93101dc6038b4831e660757501e Mon Sep 17 00:00:00 2001
From: Joakim Andersson <joakim.andersson@nordicsemi.no>
Date: Fri, 20 Nov 2020 14:44:03 +0100
Subject: [PATCH 0241/2913] [nrf noup] Bluetooth: update experimental for
 qualification
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update Kconfig options for qualification:
 - Remove experimental on qualified feature.
 - Add experimental on unqualified feature.
 - BT_L2CAP_ECRED is not marked as experimental upstream and we qualify it
   downstream.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Signed-off-by: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Signed-off-by: Herman Berget <herman.berget@nordicsemi.no>
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 2c70097463c8c8e65c1c058fa3760a641e5b8518)
(cherry picked from commit 432dbdc27ddbd10e709341db9889a7ceefb9591a)
---
 subsys/bluetooth/controller/Kconfig | 4 +++-
 subsys/bluetooth/host/Kconfig.l2cap | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
index 25f480788e1..a62b8c404a3 100644
--- a/subsys/bluetooth/controller/Kconfig
+++ b/subsys/bluetooth/controller/Kconfig
@@ -137,7 +137,9 @@ choice BT_LL_CHOICE
 	  and set as the default Bluetooth Controller.
 
 config BT_LL_SW_SPLIT
-	bool "Software-based BLE Link Layer"
+	bool "Software-based BLE Link Layer [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	select ENTROPY_GENERATOR
 	help
 	  Use Zephyr software BLE Link Layer ULL LLL split implementation.
 
diff --git a/subsys/bluetooth/host/Kconfig.l2cap b/subsys/bluetooth/host/Kconfig.l2cap
index 6499fbb19a8..ed1428aade7 100644
--- a/subsys/bluetooth/host/Kconfig.l2cap
+++ b/subsys/bluetooth/host/Kconfig.l2cap
@@ -52,7 +52,7 @@ config BT_L2CAP_DYNAMIC_CHANNEL
 	  allowing the creation of dynamic L2CAP Channels.
 
 config BT_L2CAP_ECRED
-	bool "L2CAP Enhanced Credit Based Flow Control support"
+	bool "L2CAP Enhanced Credit Based Flow Control support [EXPERIMENTAL]"
 	depends on BT_L2CAP_DYNAMIC_CHANNEL
 	help
 	  This option enables support for LE Connection oriented Channels with

From 1601992b029b1a917feb8990102cb7504db274af Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Thu, 13 Jul 2023 13:42:10 +0000
Subject: [PATCH 0242/2913] [nrf noup] drivers/flashdisk: Add support for
 Partition Manager

The commits adds support for generating flash disks from Partition
Manager defined partitions.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 6616a6eb9e05208ea1e834bea73467ffc67b659e)
(cherry picked from commit 3b37bbff7d4c812a8ef90f358243f11445e0b368)
---
 drivers/disk/flashdisk.c | 78 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/drivers/disk/flashdisk.c b/drivers/disk/flashdisk.c
index 1ac3d15ba62..4d8e3f1eee0 100644
--- a/drivers/disk/flashdisk.c
+++ b/drivers/disk/flashdisk.c
@@ -469,6 +469,8 @@ static const struct disk_operations flash_disk_ops = {
 	.ioctl = disk_flash_access_ioctl,
 };
 
+#ifndef USE_PARTITION_MANAGER
+/* The non-Partition manager, DTS based generators below */
 #define DT_DRV_COMPAT zephyr_flash_disk
 
 #define PARTITION_PHANDLE(n) DT_PHANDLE_BY_IDX(DT_DRV_INST(n), partition, 0)
@@ -510,6 +512,82 @@ DT_INST_FOREACH_STATUS_OKAY(VERIFY_CACHE_SIZE_IS_NOT_ZERO_IF_NOT_READ_ONLY)
 		"Devicetree node " DT_NODE_PATH(DT_DRV_INST(n))				\
 		" has cache size which is not a multiple of its sector size");
 DT_INST_FOREACH_STATUS_OKAY(VERIFY_CACHE_SIZE_IS_MULTIPLY_OF_SECTOR_SIZE)
+#else /* ifndef USE_PARTITION_MANAGER */
+/* Partition Manager based generators below */
+
+/* Gets the PM_..._EXTRA_PARAM_##param value */
+#define PM_FLASH_DISK_ENTRY_EXTRA_PARAM(name, param) PM_##name##_EXTRA_PARAM_disk_##param
+
+/* Gets the PM_..._NAME value which is originally cased, as in yaml, partition name */
+#define PM_FLASH_DISK_ENTRY_PARTITION_NAME(name) PM_##name##_NAME
+
+/* Generates flashdiskN_cache variable name, where N is partition ID */
+#define PM_FLASH_DISK_CACHE_VARIABLE(n) UTIL_CAT(flashdisk, UTIL_CAT(FIXED_PARTITION_ID(n), _cache))
+
+/* Generate cache buffers */
+#define CACHE_SIZE(n) (COND_CODE_1(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, read_only), (0), (1)) * \
+		       PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, cache_size))
+#define DEFINE_FLASHDISKS_CACHE(n) \
+	static uint8_t __aligned(4) PM_FLASH_DISK_CACHE_VARIABLE(n)[CACHE_SIZE(n)];
+
+PM_FOREACH_AFFILIATED_TO_disk(DEFINE_FLASHDISKS_CACHE)
+
+/* Generated single Flash Disk device data from Partition Manager partition.
+ * Partition is required to have type set to disk in partition definitions:
+ *  type: disk
+ * and following extra params can be provided:
+ *  extra_params: {
+ *	name = "<name>",
+ *	cache_size = <size>,
+ *	sector_size = <ssize>,
+ *	read_only = <ro>
+ *  }
+ * where:
+ *  <name> is mandatory device name that will be used by Disk Access and FAT FS to mount device;
+ *  <cache_size> is cache r/w cache size, which is mandatory if read_only = 0 or not present,
+ *  and should be multiple of <ssize>;
+ *  <ssize> is mandatory device sector size information, usually should be erase page size,
+ *  for flash devices, for example 4096 bytes;
+ *  read_only is optional, if not present then assumed false; <ro> can be 0(false) or 1(true).
+ */
+#define DEFINE_FLASHDISKS_DEVICE(n)						\
+{										\
+	.info = {								\
+		.ops = &flash_disk_ops,						\
+		.name = STRINGIFY(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, name)),		\
+	},									\
+	.area_id = FIXED_PARTITION_ID(n),					\
+	.offset = FIXED_PARTITION_OFFSET(n),					\
+	.cache = PM_FLASH_DISK_CACHE_VARIABLE(n),				\
+	.cache_size = sizeof(PM_FLASH_DISK_CACHE_VARIABLE(n)),			\
+	.size = FIXED_PARTITION_SIZE(n),					\
+	.sector_size = PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, sector_size),		\
+},
+
+/* The bellow used PM_FOREACH_TYPE_disk is generated by Partition Manager foreach
+ * loop macro. The lower case _disk is type name for which the macro has been generated;
+ * partition entry can have multiple types set and foreach macro will be generated
+ * for every type found across partition definitions.
+ */
+static struct flashdisk_data flash_disks[] = {
+	PM_FOREACH_AFFILIATED_TO_disk(DEFINE_FLASHDISKS_DEVICE)
+};
+
+#define VERIFY_CACHE_SIZE_IS_NOT_ZERO_IF_NOT_READ_ONLY(n)				\
+	COND_CODE_1(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, read_only),			\
+		(/* cache-size is not used for read-only disks */),			\
+		(BUILD_ASSERT(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, cache_size) != 0,	\
+		"Flash disk partition " STRINGIFY(PM_FLASH_DISK_ENTRY_PARTITION_NAME(n))\
+		" must have non-zero cache-size");))
+PM_FOREACH_AFFILIATED_TO_disk(VERIFY_CACHE_SIZE_IS_NOT_ZERO_IF_NOT_READ_ONLY)
+
+#define VERIFY_CACHE_SIZE_IS_MULTIPLY_OF_SECTOR_SIZE(n)					\
+	BUILD_ASSERT(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, cache_size) %			\
+		     PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, sector_size) == 0,		\
+		"Devicetree node " STRINGIFY(PM_FLASH_DISK_ENTRY_PARTITION_NAME(n))	\
+		" has cache size which is not a multiple of its sector size");
+PM_FOREACH_AFFILIATED_TO_disk(VERIFY_CACHE_SIZE_IS_MULTIPLY_OF_SECTOR_SIZE)
+#endif /* USE_PARTITION_MANAGER */
 
 static int disk_flash_init(void)
 {

From 763a1886246f5caa4aac5fc5cc5bce6682a3115f Mon Sep 17 00:00:00 2001
From: Marek Pieta <Marek.Pieta@nordicsemi.no>
Date: Fri, 5 May 2023 11:12:26 +0200
Subject: [PATCH 0243/2913] [nrf noup] mcumgr: img_mgmt: Fix check for chosen
 code partition

The "zephyr-code-partition" chosen DTS node cannot be used when build
uses Partition Manager. In that case, mcumgr must rely on the
definitions provided by the Partition Manager.

Jira: NCSDK-21381

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 61732b61a5121ec6a77d01448ac3b81f0222c4a7)
(cherry picked from commit 0879bc2c4cb20aeb642a66f6fcfa67f99bb3b0d3)
---
 subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
index 467eb03bced..28fca251ac8 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
@@ -33,6 +33,23 @@
 #include <zephyr/mgmt/mcumgr/mgmt/callbacks.h>
 #endif
 
+#if USE_PARTITION_MANAGER
+#include <flash_map_pm.h>
+
+#ifdef PM_MCUBOOT_SECONDARY_PAD_SIZE
+BUILD_ASSERT(PM_MCUBOOT_PAD_SIZE == PM_MCUBOOT_SECONDARY_PAD_SIZE);
+#endif
+
+#if CONFIG_BUILD_WITH_TFM
+  #define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE + PM_TFM_SIZE)
+#else
+  #define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE)
+#endif
+
+#define FIXED_PARTITION_IS_RUNNING_APP_PARTITION(label)	\
+	(FIXED_PARTITION_OFFSET(label) == (PM_ADDRESS - PM_ADDRESS_OFFSET))
+
+#else /* ! USE_PARTITION_MANAGER */
 #ifndef CONFIG_FLASH_LOAD_OFFSET
 #error MCUmgr requires application to be built with CONFIG_FLASH_LOAD_OFFSET set \
 	to be able to figure out application running slot.
@@ -40,6 +57,7 @@
 
 #define FIXED_PARTITION_IS_RUNNING_APP_PARTITION(label)	\
 	 (FIXED_PARTITION_OFFSET(label) == CONFIG_FLASH_LOAD_OFFSET)
+#endif /* USE_PARTITION_MANAGER */
 
 BUILD_ASSERT(sizeof(struct image_header) == IMAGE_HEADER_SIZE,
 	     "struct image_header not required size");

From 7b33eafddebfebbadeb213581466af5eee52ad3b Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Thu, 23 Jun 2022 14:10:01 +0000
Subject: [PATCH 0244/2913] [nrf noup] mgmt/mcumgr: Bootutil hooks to handle
 image-1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The commit adds bootutil hook, for nrf5340, to allow it
handling the non-accessible image-1/primary slot.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 89e2ae611479efff3fb81c5bb898541b55b6644c)
(cherry picked from commit 75826a3c359478cb12acf1a4e2ab173fc39002c9)
---
 subsys/mgmt/mcumgr/CMakeLists.txt             |  8 +++++
 subsys/mgmt/mcumgr/Kconfig                    |  1 +
 .../mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c  | 35 +++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c

diff --git a/subsys/mgmt/mcumgr/CMakeLists.txt b/subsys/mgmt/mcumgr/CMakeLists.txt
index 39d4a4ca8ce..ad088eca067 100644
--- a/subsys/mgmt/mcumgr/CMakeLists.txt
+++ b/subsys/mgmt/mcumgr/CMakeLists.txt
@@ -16,3 +16,11 @@ add_subdirectory(transport)
 add_subdirectory_ifdef(CONFIG_SMP_CLIENT    smp_client)
 
 zephyr_library_link_libraries(mgmt_mcumgr)
+
+if (CONFIG_BOOT_IMAGE_ACCESS_HOOKS)
+    zephyr_include_directories(
+        ${ZEPHYR_MCUBOOT_MODULE_DIR}/boot/bootutil/include
+        ${ZEPHYR_MCUBOOT_MODULE_DIR}/boot/zephyr/include
+    )
+    zephyr_library_sources(bootutil_hooks/nrf53_hooks.c)
+endif()
diff --git a/subsys/mgmt/mcumgr/Kconfig b/subsys/mgmt/mcumgr/Kconfig
index 49bd17f4669..1c6a3a2a516 100644
--- a/subsys/mgmt/mcumgr/Kconfig
+++ b/subsys/mgmt/mcumgr/Kconfig
@@ -6,6 +6,7 @@ menuconfig MCUMGR
 	bool "mcumgr Support"
 	depends on NET_BUF
 	depends on ZCBOR
+	imply BOOT_IMAGE_ACCESS_HOOKS if (SOC_NRF5340_CPUAPP_QKAA && MCUMGR_GRP_IMG)
 	help
 	  This option enables the mcumgr management library.
 
diff --git a/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c b/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c
new file mode 100644
index 00000000000..f1ac8a168e6
--- /dev/null
+++ b/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include "bootutil/bootutil_public.h"
+
+#if CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER != -1
+/* Sysbuild */
+#define NET_CORE_IMAGE CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER
+#else
+/* Legacy child/parent */
+#define NET_CORE_IMAGE 1
+#endif
+
+int boot_read_swap_state_primary_slot_hook(int image_index,
+		struct boot_swap_state *state)
+{
+	if (image_index == NET_CORE_IMAGE) {
+		/* Pretend that primary slot of image 1 unpopulated */
+		state->magic = BOOT_MAGIC_UNSET;
+		state->swap_type = BOOT_SWAP_TYPE_NONE;
+		state->image_num = image_index;
+		state->copy_done = BOOT_FLAG_UNSET;
+		state->image_ok = BOOT_FLAG_UNSET;
+
+		/* Prevent bootutil from trying to obtain true info */
+		return 0;
+	}
+
+	return BOOT_HOOK_REGULAR;
+}

From 44b6e2cd62a01054017716bbec17b4b332bfd59e Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Thu, 28 Sep 2023 11:10:55 +0000
Subject: [PATCH 0245/2913] [nrf noup] mgmt/MCUmgr/grp/img: Move out label to
 make compiler happy

Move it inside ifdef.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 75f701d7d3b74997ed7fb21f66cdc0c4f698cfb1)
(cherry picked from commit 25d17b4580eb7af503b16585e3296445c1034f03)
---
 subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
index a580d7af6c3..6a4a0aeeea3 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
@@ -285,13 +285,14 @@ int img_mgmt_get_next_boot_slot(int image, enum img_mgmt_next_boot_type *type)
 			return_slot = other_slot;
 		}
 	}
+out:
+
 #else
 	if (rcs == 0 && rca == 0 && img_mgmt_vercmp(&aver, &over) < 0) {
 		return_slot = other_slot;
 	}
 #endif /* defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT) */
 
-out:
 	if (type != NULL) {
 		*type = lt;
 	}

From beecaaabbbacce1b6f278a6a7e77e54a73ab9f02 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Mon, 16 Oct 2023 08:40:38 +0100
Subject: [PATCH 0246/2913] [nrf noup] samples: bluetooth: hci_pow_ctrl:
 Migrate child image config

Migrates child image configuration for this sample over to sysbuild

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit e6a6bec225c2e2a63e011345538815aa6dbb73e9)
(cherry picked from commit 9a05e319f9480d38131bdc2d929d8194f8557ffa)
---
 samples/bluetooth/hci_pwr_ctrl/sysbuild/hci_rpmsg.conf | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 samples/bluetooth/hci_pwr_ctrl/sysbuild/hci_rpmsg.conf

diff --git a/samples/bluetooth/hci_pwr_ctrl/sysbuild/hci_rpmsg.conf b/samples/bluetooth/hci_pwr_ctrl/sysbuild/hci_rpmsg.conf
new file mode 100644
index 00000000000..e6749ae6399
--- /dev/null
+++ b/samples/bluetooth/hci_pwr_ctrl/sysbuild/hci_rpmsg.conf
@@ -0,0 +1 @@
+CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y

From 6199743d6366ea6a00201890322d1790945f034d Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Mon, 16 Oct 2023 08:41:27 +0100
Subject: [PATCH 0247/2913] [nrf noup] samples: mgmt: mcumgr smp_svr: Migrate
 child image config

Migrates child image configuration for this sample over to sysbuild

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit b49af5f5928c98c90a51f601331ed415cb7bfad2)
(cherry picked from commit 700ce0d9d63e963eaea32ab190ceaaa6d13f25b3)
---
 .../subsys/mgmt/mcumgr/smp_svr/sysbuild/hci_rpmsg.conf | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 samples/subsys/mgmt/mcumgr/smp_svr/sysbuild/hci_rpmsg.conf

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild/hci_rpmsg.conf b/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild/hci_rpmsg.conf
new file mode 100644
index 00000000000..98260877332
--- /dev/null
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild/hci_rpmsg.conf
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2022 Nordic Semiconductor
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_BT_MAX_CONN=2
+CONFIG_BT_BUF_ACL_RX_SIZE=502
+CONFIG_BT_BUF_ACL_TX_SIZE=502
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251

From cb05ba516e75d6656be0368375c210374158430e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 1 Dec 2022 14:41:13 +0100
Subject: [PATCH 0248/2913] [nrf noup] samples&tests: Restore a few
 CONFIG_NEWLIB_LIBC_NANO=n
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a follow-up to commit 9dd570f8a2207a02c886480b0065cd5a0e3a2e94.

Since in NCS, unlike in vanilla Zephyr, the nano variant of newlib
is the default one, restore entries that disable the nano variant
in one sample and one test that require the full newlib variant.
This patch is supposed to be removed when picolibc becomes the default.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 0c3bd197df5c7e3b671470d6fba792193ea9d705)
(cherry picked from commit a81093c0e84f7640f4b2f4c4c0a460c5a0c69a48)
---
 tests/lib/newlib/heap_listener/prj.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/lib/newlib/heap_listener/prj.conf b/tests/lib/newlib/heap_listener/prj.conf
index e5a5dc6df4c..7282777ff1c 100644
--- a/tests/lib/newlib/heap_listener/prj.conf
+++ b/tests/lib/newlib/heap_listener/prj.conf
@@ -1,3 +1,4 @@
 CONFIG_ZTEST=y
 CONFIG_NEWLIB_LIBC=y
+CONFIG_NEWLIB_LIBC_NANO=n
 CONFIG_NEWLIB_LIBC_HEAP_LISTENER=y

From cd344abd45cc7647e691b1ced0214a4ba3dfb6f1 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Fri, 15 Dec 2023 07:57:14 +0000
Subject: [PATCH 0249/2913] [nrf noup] samples/tests: Disable PM for some
 sysbuild builds

Disables partition manager when building some samples and tests
which use sysbuild to prevent build issues

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit d0dd6c62001a0bc497e14bc6814d394d6da55edd)
(cherry picked from commit 29b5780def52b2d2645cd2896becf4b34ddc2ff1)
---
 samples/boards/nordic/nrf53_sync_rtc/sysbuild.conf          | 1 +
 samples/drivers/mbox/sysbuild.conf                          | 1 +
 samples/subsys/ipc/ipc_service/icmsg/sysbuild.conf          | 1 +
 samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.conf | 1 +
 samples/subsys/ipc/ipc_service/static_vrings/sysbuild.conf  | 1 +
 samples/subsys/logging/multidomain/sysbuild.conf            | 1 +
 tests/boot/mcuboot_recovery_retention/sysbuild.conf         | 1 +
 tests/boot/test_mcuboot/sysbuild.conf                       | 1 +
 tests/drivers/flash/common/sysbuild.conf                    | 1 +
 tests/drivers/flash/negative_tests/sysbuild.conf            | 1 +
 tests/subsys/fs/fcb/sysbuild.conf                           | 1 +
 tests/subsys/fs/littlefs/sysbuild.conf                      | 1 +
 12 files changed, 12 insertions(+)
 create mode 100644 samples/boards/nordic/nrf53_sync_rtc/sysbuild.conf
 create mode 100644 samples/drivers/mbox/sysbuild.conf
 create mode 100644 samples/subsys/ipc/ipc_service/icmsg/sysbuild.conf
 create mode 100644 samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.conf
 create mode 100644 samples/subsys/ipc/ipc_service/static_vrings/sysbuild.conf
 create mode 100644 samples/subsys/logging/multidomain/sysbuild.conf
 create mode 100644 tests/drivers/flash/common/sysbuild.conf
 create mode 100644 tests/drivers/flash/negative_tests/sysbuild.conf
 create mode 100644 tests/subsys/fs/fcb/sysbuild.conf
 create mode 100644 tests/subsys/fs/littlefs/sysbuild.conf

diff --git a/samples/boards/nordic/nrf53_sync_rtc/sysbuild.conf b/samples/boards/nordic/nrf53_sync_rtc/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/samples/boards/nordic/nrf53_sync_rtc/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/drivers/mbox/sysbuild.conf b/samples/drivers/mbox/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/samples/drivers/mbox/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/subsys/ipc/ipc_service/icmsg/sysbuild.conf b/samples/subsys/ipc/ipc_service/icmsg/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/icmsg/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.conf b/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.conf b/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/subsys/logging/multidomain/sysbuild.conf b/samples/subsys/logging/multidomain/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/samples/subsys/logging/multidomain/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/boot/mcuboot_recovery_retention/sysbuild.conf b/tests/boot/mcuboot_recovery_retention/sysbuild.conf
index 47f00ff3cff..3b5b3c96380 100644
--- a/tests/boot/mcuboot_recovery_retention/sysbuild.conf
+++ b/tests/boot/mcuboot_recovery_retention/sysbuild.conf
@@ -1 +1,2 @@
 SB_CONFIG_BOOTLOADER_MCUBOOT=y
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/boot/test_mcuboot/sysbuild.conf b/tests/boot/test_mcuboot/sysbuild.conf
index 47f00ff3cff..3b5b3c96380 100644
--- a/tests/boot/test_mcuboot/sysbuild.conf
+++ b/tests/boot/test_mcuboot/sysbuild.conf
@@ -1 +1,2 @@
 SB_CONFIG_BOOTLOADER_MCUBOOT=y
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/drivers/flash/common/sysbuild.conf b/tests/drivers/flash/common/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/tests/drivers/flash/common/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/drivers/flash/negative_tests/sysbuild.conf b/tests/drivers/flash/negative_tests/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/tests/drivers/flash/negative_tests/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/subsys/fs/fcb/sysbuild.conf b/tests/subsys/fs/fcb/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/tests/subsys/fs/fcb/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/subsys/fs/littlefs/sysbuild.conf b/tests/subsys/fs/littlefs/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/tests/subsys/fs/littlefs/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n

From eb58994e4696b18909c35406d47d0ff5a5baa781 Mon Sep 17 00:00:00 2001
From: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
Date: Thu, 29 Feb 2024 13:38:48 +0100
Subject: [PATCH 0250/2913] [nrf noup] modules: tfm: Add Kconfig for
 CRYPTO_PAKE_MODULE_ENABLED

Add a Kconfig for th TFM_CRYPTO_PAKE_MODULE_ENABLED to support the PAKE
APIs.

noup as the PAKE support including the PAKE module doesn't exist yet in
upstream TF-M as they depend on mbed TLS support for it

Ref: NCSDK-22416
Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
(cherry picked from commit 3c40f38ec1cdffb36e1f6339b85d20a6c328ec73)
(cherry picked from commit d2d7844be4c095f93fb8038f7617d49d2ad484be)
---
 modules/trusted-firmware-m/Kconfig.tfm.crypto_modules | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules b/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
index 02d3580c22f..9604319ca01 100644
--- a/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
+++ b/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
@@ -88,6 +88,17 @@ config TFM_CRYPTO_KEY_DERIVATION_MODULE_ENABLED
 	  is not used.
 	  Note that key agreement is under key derivation in the current implementation.
 
+config TFM_CRYPTO_PAKE_MODULE_ENABLED
+	bool "PAKE crypto module"
+	default y
+	depends on PSA_HAS_PAKE_SUPPORT
+	depends on NRF_SECURITY
+	depends on PSA_CRYPTO_DRIVER_OBERON || PSA_CRYPTO_DRIVER_CRACEN
+	help
+	  Enables the PAKE crypto module within the crypto partition.
+	  Unset this option if the functionality provided by 'crypto_pake.c'
+	  is not used.
+
 endif # TFM_PARTITION_CRYPTO
 
 endif # BUILD_WITH_TFM

From 6d826614fb100e3b4ba01955000ed4ab68e67ce1 Mon Sep 17 00:00:00 2001
From: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
Date: Tue, 7 Feb 2023 12:39:12 +0100
Subject: [PATCH 0251/2913] [nrf noup] Bluetooth: Mesh: zero randomization for
 friend's adv

Friend's replies on LPN's polls do not assume randomization in
advertiser. Zero randomization will help to optimize time when
LPN keeps receiving window open and save power.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
(cherry picked from commit e8235b8d30dbe6c6ede786c498d78297323d0e1f)
(cherry picked from commit d43c560674ad3ce5de5aba6cbc5f47755f2802d3)
---
 subsys/bluetooth/mesh/Kconfig   |  2 +-
 subsys/bluetooth/mesh/adv_ext.c | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 384033f7908..7eced10bd07 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -1642,7 +1642,7 @@ config BT_MESH_LPN_INIT_POLL_TIMEOUT
 config BT_MESH_LPN_SCAN_LATENCY
 	int "Latency for enabling scanning"
 	range 0 50
-	default 15
+	default 2
 	help
 	  Latency in milliseconds that it takes to enable scanning. This
 	  is in practice how much time in advance before the Receive Window
diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index b206b81b743..330dcd86305 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -13,6 +13,9 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/mesh.h>
+#if defined(CONFIG_BT_LL_SOFTDEVICE)
+#include <sdc_hci_vs.h>
+#endif
 
 #include "common/bt_str.h"
 
@@ -136,6 +139,28 @@ static inline struct bt_mesh_ext_adv *gatt_adv_get(void)
 	}
 }
 
+static int set_adv_randomness(uint8_t handle, int rand_us)
+{
+#if defined(CONFIG_BT_LL_SOFTDEVICE)
+	struct net_buf *buf;
+	sdc_hci_cmd_vs_set_adv_randomness_t *cmd_params;
+
+	buf = bt_hci_cmd_create(SDC_HCI_OPCODE_CMD_VS_SET_ADV_RANDOMNESS, sizeof(*cmd_params));
+	if (!buf) {
+		LOG_ERR("Could not allocate command buffer");
+		return -ENOMEM;
+	}
+
+	cmd_params = net_buf_add(buf, sizeof(*cmd_params));
+	cmd_params->adv_handle = handle;
+	cmd_params->rand_us = rand_us;
+
+	return bt_hci_cmd_send_sync(SDC_HCI_OPCODE_CMD_VS_SET_ADV_RANDOMNESS, buf, NULL);
+#else
+	return 0;
+#endif /* defined(CONFIG_BT_LL_SOFTDEVICE) */
+}
+
 static int adv_start(struct bt_mesh_ext_adv *ext_adv,
 		     const struct bt_le_adv_param *param,
 		     struct bt_le_ext_adv_start_param *start,
@@ -496,6 +521,13 @@ int bt_mesh_adv_enable(void)
 		if (err) {
 			return err;
 		}
+
+		if (IS_ENABLED(CONFIG_BT_LL_SOFTDEVICE) && adv->tag & BT_MESH_FRIEND_ADV) {
+			err = set_adv_randomness(adv->instance->handle, 0);
+			if (err) {
+				LOG_ERR("Failed to set zero randomness: %d", err);
+			}
+		}
 	}
 
 	return 0;

From 8709818e88c4bf34c80da3918f428c28b3bfd98f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20Storr=C3=B8?= <anders.storro@nordicsemi.no>
Date: Wed, 8 Mar 2023 12:17:09 +0100
Subject: [PATCH 0252/2913] [nrf noup] Bluetooth: Mesh: Fix adv randomness bug
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes issue where randomness can be removed for advertising sets that
have to handle other adv types than the BT_MESH_FRIEND_ADV tag type.

Signed-off-by: Anders Storrø <anders.storro@nordicsemi.no>
Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 3a212a5cc18ae6a2b14d8bcb527e98288a99db34)
(cherry picked from commit d46f2eee121df345318002ff0816111091a794af)
---
 subsys/bluetooth/mesh/adv_ext.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index 330dcd86305..0dcdab9adf8 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -522,8 +522,10 @@ int bt_mesh_adv_enable(void)
 			return err;
 		}
 
-		if (IS_ENABLED(CONFIG_BT_LL_SOFTDEVICE) && adv->tag & BT_MESH_FRIEND_ADV) {
-			err = set_adv_randomness(adv->instance->handle, 0);
+		if (IS_ENABLED(CONFIG_BT_LL_SOFTDEVICE) &&
+		    IS_ENABLED(CONFIG_BT_MESH_ADV_EXT_FRIEND_SEPARATE) &&
+		    advs[i].tags == BT_MESH_ADV_TAG_BIT_FRIEND) {
+			err = set_adv_randomness(advs[i].instance->handle, 0);
 			if (err) {
 				LOG_ERR("Failed to set zero randomness: %d", err);
 			}

From a7b53d1f6fb34219d6be11f40188c86e1f3be317 Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Thu, 28 Mar 2024 15:04:41 +0100
Subject: [PATCH 0253/2913] [nrf noup] dfu/boot/mcuboot: fix confirmation in
 case of USE_PARTITION_MANAGER

Active partition ID need to be extracted basing on PARTITION_MANAGER
products.

ref.:NCSDK-26693

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
(cherry picked from commit 2b0b244423e5da1f919b7279370315dc1fe89bd5)
(cherry picked from commit e1e797128ca32614a26a7d4ba53759a70b6d3c1d)
---
 subsys/dfu/boot/mcuboot.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/subsys/dfu/boot/mcuboot.c b/subsys/dfu/boot/mcuboot.c
index 20015349dbc..a6e05700ac7 100644
--- a/subsys/dfu/boot/mcuboot.c
+++ b/subsys/dfu/boot/mcuboot.c
@@ -34,8 +34,34 @@
 #define BOOT_HEADER_MAGIC_V1 0x96f3b83d
 #define BOOT_HEADER_SIZE_V1 32
 
+#if USE_PARTITION_MANAGER
+#include <pm_config.h>
+
+#if CONFIG_BUILD_WITH_TFM
+	#define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE + PM_TFM_SIZE)
+#else
+	#define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE)
+#endif
+
+#ifdef CONFIG_MCUBOOT
+	/* lib is part of MCUboot -> operate on the primart application slot */
+	#define ACTIVE_SLOT_ID		PM_MCUBOOT_PRIMARY_ID
+#else
+	/* lib is part of the App -> operate on active slot */
+#if (PM_ADDRESS - PM_ADDRESS_OFFSET) == PM_MCUBOOT_PRIMARY_ADDRESS
+	#define ACTIVE_SLOT_ID		PM_MCUBOOT_PRIMARY_ID
+#elif (PM_ADDRESS - PM_ADDRESS_OFFSET) == PM_MCUBOOT_SECONDARY_ADDRESS
+	#define ACTIVE_SLOT_ID		PM_MCUBOOT_SECONDARY_ID
+#else
+	#error Missing partition definitions.
+#endif
+#endif /* CONFIG_MCUBOOT */
+
+#define ACTIVE_SLOT_FLASH_AREA_ID ACTIVE_SLOT_ID
+#else
 /* Get active partition. zephyr,code-partition chosen node must be defined */
 #define ACTIVE_SLOT_FLASH_AREA_ID DT_FIXED_PARTITION_ID(DT_CHOSEN(zephyr_code_partition))
+#endif /* USE_PARTITION_MANAGER */
 
 /*
  * Raw (on-flash) representation of the v1 image header.

From 2bff40a5046fafdc45109cdd9942c461c709b9bd Mon Sep 17 00:00:00 2001
From: Sigurd Hellesvik <sigurd.hellesvik@nordicsemi.no>
Date: Tue, 26 Mar 2024 16:35:05 +0100
Subject: [PATCH 0254/2913] [nrf noup] modules: mbedtls: Use help for
 DISABLE_MBEDTLS_BUILTIN info

Using a comment to explain Kconfig options make them
invisible to Kconfig search. Use help instead.

Signed-off-by: Sigurd Hellesvik <sigurd.hellesvik@nordicsemi.no>
(cherry picked from commit 6da708e089393a57fc0bd8c847375a2608e840f3)
(cherry picked from commit 1763f9d3704053a906985d947f7998f7690cc1dd)
---
 modules/mbedtls/Kconfig | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/mbedtls/Kconfig b/modules/mbedtls/Kconfig
index 546bcd66dd2..3761ff6a02f 100644
--- a/modules/mbedtls/Kconfig
+++ b/modules/mbedtls/Kconfig
@@ -42,10 +42,11 @@ config MBEDTLS_LIBRARY
 
 endchoice
 
-# subsystems cannot deselect MBEDTLS_BUILTIN, but they can select
-# DISABLE_MBEDTLS_BUILTIN.
 config DISABLE_MBEDTLS_BUILTIN
 	bool
+	help
+	  Subsystems cannot deselect MBEDTLS_BUILTIN, but they can select
+	  DISABLE_MBEDTLS_BUILTIN.
 
 config CUSTOM_MBEDTLS_CFG_FILE
 	bool "Custom mbed TLS configuration file"

From f8b30ba1b3d7b505e702ad8b5348346c672b2da0 Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Wed, 10 Apr 2024 16:21:40 +0200
Subject: [PATCH 0255/2913] [nrf noup] sample/**/smp_svr: nrf54l15pdk external
 memory dts overlay

Added overlay with m25r64 on-DK memory selecton.
This aim to support testing DFU with secondary partition moved to the
external flash.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
(cherry picked from commit ae151cde1458bcfac16b7cd2684d0026f688c63f)
(cherry picked from commit 36e84c507950678f98321b6b3274ca0b38745c44)
---
 .../boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
new file mode 100644
index 00000000000..410388bfa6d
--- /dev/null
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
@@ -0,0 +1,9 @@
+/ {
+	chosen {
+		nordic,pm-ext-flash = &mx25r64;
+	};
+};
+
+&mx25r64 {
+	status = "okay";
+};

From ef75b3e9cc4d05bef72ec6fcce1f3bec5add5d23 Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Fri, 30 Nov 2018 14:07:56 +0100
Subject: [PATCH 0256/2913] [nrf noup] ci: NCS-specific CI tweaks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Necessary changes for NCS CI.

- Add a Jenkinsfile
- Add a commit-tags workflow: This enables sauce tag checking in sdk-zephyr
- compliance.yml: Disable check for merge commits, since we have upmerges
downstream. Also, since in the code we refer to Kconfig symbols that are defined
in the sdk-nrf repository, the Kconfig checks (Kconfig, KconfigBasic and
KconfigBasicNoModules) will not pass so exclude them. Also, disable any
maintainers-related checks
- scripts/gitlint: Extend the max commit line lengths for Gitlint to account
for sauce tags
- Adapt to the changes in:
https://github.com/nrfconnect/action-commit-tags/pull/4

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Signed-off-by: Krishna T <krishna.t@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 860324b72bbbc6f789af5f4e351472f3aba80f02)
(cherry picked from commit 79278e7c5fb393785dbb50a9c931c07ca3610b9f)
---
 .github/workflows/commit-tags.yml      | 28 ++++++++++++++++++++++++++
 .github/workflows/compliance.yml       |  8 ++++----
 Jenkinsfile                            |  5 +++++
 scripts/gitlint/zephyr_commit_rules.py |  4 ++--
 4 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 .github/workflows/commit-tags.yml
 create mode 100644 Jenkinsfile

diff --git a/.github/workflows/commit-tags.yml b/.github/workflows/commit-tags.yml
new file mode 100644
index 00000000000..828f0297167
--- /dev/null
+++ b/.github/workflows/commit-tags.yml
@@ -0,0 +1,28 @@
+name: Commit tags
+
+on:
+  pull_request:
+    types: [synchronize, opened, reopened, edited, labeled, unlabeled,
+            milestoned, demilestoned, assigned, unassigned, ready_for_review,
+            review_requested]
+
+jobs:
+  commit_tags:
+    runs-on: ubuntu-22.04
+    name: Run commit tags checks on patch series (PR)
+    steps:
+    - name: Update PATH for west
+      run: |
+        echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+    - name: Checkout the code
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+        fetch-depth: 0
+
+    - name: Run the commit tags
+      uses: nrfconnect/action-commit-tags@main
+      with:
+        target: .
+        upstream: zephyrproject-rtos/zephyr/main
diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml
index 39815d8baa3..c8ffedcb77b 100644
--- a/.github/workflows/compliance.yml
+++ b/.github/workflows/compliance.yml
@@ -49,8 +49,8 @@ jobs:
         git config --global user.name "Your Name"
         git remote -v
         # Ensure there's no merge commits in the PR
-        [[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
-        (echo "::error ::Merge commits not allowed, rebase instead";false)
+        #[[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
+        #(echo "::error ::Merge commits not allowed, rebase instead";false)
         git rebase origin/${BASE_REF}
         # debug
         git log  --pretty=oneline | head -n 10
@@ -78,8 +78,8 @@ jobs:
         git log  --pretty=oneline | head -n 10
         # Increase rename limit to allow for large PRs
         git config diff.renameLimit 10000
-        ./scripts/ci/check_compliance.py --annotate -e KconfigBasic \
-        -c origin/${BASE_REF}..
+        ./scripts/ci/check_compliance.py --annotate -e KconfigBasic -e Kconfig \
+        -e KconfigBasicNoModules -e ModulesMaintainers -c origin/${BASE_REF}..
 
     - name: upload-results
       uses: actions/upload-artifact@v4
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 00000000000..3b9cf002239
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,5 @@
+@Library("CI_LIB") _
+
+def pipeline = new ncs.sdk_zephyr.Main()
+
+pipeline.run(JOB_NAME)
diff --git a/scripts/gitlint/zephyr_commit_rules.py b/scripts/gitlint/zephyr_commit_rules.py
index a2c9cd3cb7f..ef317e22684 100644
--- a/scripts/gitlint/zephyr_commit_rules.py
+++ b/scripts/gitlint/zephyr_commit_rules.py
@@ -78,7 +78,7 @@ class TitleMaxLengthRevert(LineRule):
     name = "title-max-length-no-revert"
     id = "UC5"
     target = CommitMessageTitle
-    options_spec = [IntOption('line-length', 75, "Max line length")]
+    options_spec = [IntOption('line-length', 120, "Max line length")]
     violation_message = "Commit title exceeds max length ({0}>{1})"
 
     def validate(self, line, _commit):
@@ -103,7 +103,7 @@ class MaxLineLengthExceptions(LineRule):
     name = "max-line-length-with-exceptions"
     id = "UC4"
     target = CommitMessageBody
-    options_spec = [IntOption('line-length', 75, "Max line length")]
+    options_spec = [IntOption('line-length', 120, "Max line length")]
     violation_message = "Commit message body line exceeds max length ({0}>{1})"
 
     def validate(self, line, _commit):

From 1fb551a83cd9763170f35f74e7dfaa8a6984d4a7 Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Wed, 27 Sep 2023 09:41:10 +0000
Subject: [PATCH 0257/2913] [nrf noup] test: schedule_api: Use Minimal C
 library

There is no point to use PICOLIB here as it bloats the tests.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 2dfdcf624d983c0e1cddda5d09ea8342d081d567)
(cherry picked from commit 098ad7b20a42faf78780c95b8d35df9c527127f9)
---
 tests/kernel/sched/schedule_api/prj.conf        | 1 +
 tests/kernel/sched/schedule_api/prj_dumb.conf   | 1 +
 tests/kernel/sched/schedule_api/prj_multiq.conf | 1 +
 3 files changed, 3 insertions(+)

diff --git a/tests/kernel/sched/schedule_api/prj.conf b/tests/kernel/sched/schedule_api/prj.conf
index fe5125047e3..785e9a3987b 100644
--- a/tests/kernel/sched/schedule_api/prj.conf
+++ b/tests/kernel/sched/schedule_api/prj.conf
@@ -7,3 +7,4 @@ CONFIG_MAX_THREAD_BYTES=5
 CONFIG_TEST_USERSPACE=y
 CONFIG_MP_MAX_NUM_CPUS=1
 CONFIG_ZTEST_FATAL_HOOK=y
+CONFIG_MINIMAL_LIBC=y
diff --git a/tests/kernel/sched/schedule_api/prj_dumb.conf b/tests/kernel/sched/schedule_api/prj_dumb.conf
index c0ddfbd7c3f..a1d0cf6dced 100644
--- a/tests/kernel/sched/schedule_api/prj_dumb.conf
+++ b/tests/kernel/sched/schedule_api/prj_dumb.conf
@@ -5,3 +5,4 @@ CONFIG_SCHED_DUMB=y
 CONFIG_MAX_THREAD_BYTES=5
 CONFIG_MP_MAX_NUM_CPUS=1
 CONFIG_ZTEST_FATAL_HOOK=y
+CONFIG_MINIMAL_LIBC=y
diff --git a/tests/kernel/sched/schedule_api/prj_multiq.conf b/tests/kernel/sched/schedule_api/prj_multiq.conf
index 6b28a1f39b2..cfe09fbce47 100644
--- a/tests/kernel/sched/schedule_api/prj_multiq.conf
+++ b/tests/kernel/sched/schedule_api/prj_multiq.conf
@@ -7,3 +7,4 @@ CONFIG_MP_MAX_NUM_CPUS=1
 CONFIG_ZTEST_FATAL_HOOK=y
 CONFIG_NUM_COOP_PRIORITIES=30
 CONFIG_NUM_PREEMPT_PRIORITIES=40
+CONFIG_MINIMAL_LIBC=y

From 327226912eecb79b1cca2c96ef99dc904b08ed19 Mon Sep 17 00:00:00 2001
From: Jan Tore Guggedal <jantore.guggedal@nordicsemi.no>
Date: Mon, 18 May 2020 20:50:13 +0200
Subject: [PATCH 0258/2913] [nrf noup] net: mqtt: Provide option to enable TLS
 session caching

Provides an option to enable TLS session caching for an MQTT
client's secure socket.

Signed-off-by: Jan Tore Guggedal <jantore.guggedal@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit fac4fce48f805ca5d2fec0f0358dd87d49428587)
(cherry picked from commit ed841baa367ac9fce4f4d080355d13ae54517b8e)
---
 include/zephyr/net/mqtt.h                       |  3 +++
 subsys/net/lib/mqtt/mqtt_transport_socket_tls.c | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index 2514fc709c2..5da175fe065 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -372,6 +372,9 @@ struct mqtt_sec_config {
 	uint32_t alpn_protocol_name_count;
 #endif
 
+	/** Indicates the preference for enabling TLS session caching. */
+	int session_cache;
+
 	/** Peer hostname for ceritificate verification.
 	 *  May be NULL to skip hostname verification.
 	 */
diff --git a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
index a33cee5aecf..445f45c95df 100644
--- a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
+++ b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
@@ -91,6 +91,16 @@ int mqtt_client_tls_connect(struct mqtt_client *client)
 		}
 	}
 
+	if (tls_config->session_cache == TLS_SESSION_CACHE_ENABLED) {
+		ret = zsock_setsockopt(client->transport.tls.sock, SOL_TLS,
+				       TLS_SESSION_CACHE,
+				       &tls_config->session_cache,
+				       sizeof(tls_config->session_cache));
+		if (ret < 0) {
+			goto error;
+		}
+	}
+
 	if (tls_config->cert_nocopy != TLS_CERT_NOCOPY_NONE) {
 		ret = zsock_setsockopt(client->transport.tls.sock, SOL_TLS,
 				       TLS_CERT_NOCOPY, &tls_config->cert_nocopy,

From 640fd0cd087fd83efd2d83fd173930cb188e3a26 Mon Sep 17 00:00:00 2001
From: Mirko Covizzi <mirko.covizzi@nordicsemi.no>
Date: Thu, 10 Mar 2022 00:25:50 -0800
Subject: [PATCH 0259/2913] [nrf noup] net: mqtt: add native TLS support

This commit adds an extra parameter in the configuration
structure to configure native TLS support at runtime.

Signed-off-by: Mirko Covizzi <mirko.covizzi@nordicsemi.no>
(cherry picked from commit 40e422404ffe6594abf4b803ea4b68a1d34c3992)
(cherry picked from commit 2264ca355eabb1bdd608503d25a7aa13f455a8dd)
---
 doc/connectivity/networking/api/mqtt.rst        | 3 +++
 include/zephyr/net/mqtt.h                       | 3 +++
 subsys/net/lib/mqtt/mqtt_transport_socket_tls.c | 7 ++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/doc/connectivity/networking/api/mqtt.rst b/doc/connectivity/networking/api/mqtt.rst
index b232f125333..79da5abe57b 100644
--- a/doc/connectivity/networking/api/mqtt.rst
+++ b/doc/connectivity/networking/api/mqtt.rst
@@ -150,6 +150,7 @@ additional configuration information:
    tls_config->sec_tag_list = m_sec_tags;
    tls_config->sec_tag_count = ARRAY_SIZE(m_sec_tags);
    tls_config->hostname = MQTT_BROKER_HOSTNAME;
+   tls_config->set_native_tls = true;
 
 In this sample code, the ``m_sec_tags`` array holds a list of tags, referencing TLS
 credentials that the MQTT library should use for authentication. We do not specify
@@ -162,6 +163,8 @@ Note, that TLS credentials referenced by the ``m_sec_tags`` array must be
 registered in the system first. For more information on how to do that, refer
 to :ref:`secure sockets documentation <secure_sockets_interface>`.
 
+Finally, ``set_native_tls`` can be optionally set to enable native TLS support instead of offloading TLS operations to the modem.
+
 An example of how to use TLS with MQTT is also present in
 :zephyr:code-sample:`mqtt-publisher` sample application.
 
diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index 5da175fe065..9c09069b107 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -382,6 +382,9 @@ struct mqtt_sec_config {
 
 	/** Indicates the preference for copying certificates to the heap. */
 	int cert_nocopy;
+
+	/** Set socket to native TLS */
+	bool set_native_tls;
 };
 
 /** @brief MQTT transport type. */
diff --git a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
index 445f45c95df..c3816e5949f 100644
--- a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
+++ b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
@@ -22,10 +22,15 @@ int mqtt_client_tls_connect(struct mqtt_client *client)
 {
 	const struct sockaddr *broker = client->broker;
 	struct mqtt_sec_config *tls_config = &client->transport.tls.config;
+	int type = SOCK_STREAM;
 	int ret;
 
+	if (tls_config->set_native_tls) {
+		type |= SOCK_NATIVE_TLS;
+	}
+
 	client->transport.tls.sock = zsock_socket(broker->sa_family,
-						  SOCK_STREAM, IPPROTO_TLS_1_2);
+						  type, IPPROTO_TLS_1_2);
 	if (client->transport.tls.sock < 0) {
 		return -errno;
 	}

From 8315b87957b9ca4805759ef0b2cef76eedc70318 Mon Sep 17 00:00:00 2001
From: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
Date: Mon, 4 Dec 2023 15:27:08 +0100
Subject: [PATCH 0260/2913] [nrf noup] soc: arm: nRF53: Add SPU Flash/RAM
 alignment

TF-M will uses SPU alignment during build time to make sure all
partitions can be locked down with the SPU.

So adding them for nRF53

Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
(cherry picked from commit 0ad68b30ed7c3ba22413ca72088f00d1b5632261)
(cherry picked from commit 48b5a316e929e95d8cc3cda93ef589841f4d4932)
---
 soc/nordic/nrf53/Kconfig | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/soc/nordic/nrf53/Kconfig b/soc/nordic/nrf53/Kconfig
index 3a30a666d20..ab282f56523 100644
--- a/soc/nordic/nrf53/Kconfig
+++ b/soc/nordic/nrf53/Kconfig
@@ -156,12 +156,26 @@ config NRF_SPU_FLASH_REGION_SIZE
 	help
 	  FLASH region size for the NRF_SPU peripheral
 
+config NRF_SPU_FLASH_REGION_ALIGNMENT
+	hex
+	default 0x4000
+	help
+	  FLASH regions must be aligned to this value due to SPU HW
+	  limitations.
+
 config NRF_SPU_RAM_REGION_SIZE
 	hex
 	default 0x2000
 	help
 	  RAM region size for the NRF_SPU peripheral
 
+config NRF_SPU_RAM_REGION_ALIGNMENT
+	hex
+	default 0x2000
+	help
+	  RAM regions must be aligned to this value due to SPU HW
+	  limitations.
+
 config SOC_NRF_GPIO_FORWARDER_FOR_NRF5340
 	bool "Forward GPIO pins to network core"
 	depends on NRF_SOC_SECURE_SUPPORTED

From 0107d28417da899552a1ffae3814a4a5be2feb6b Mon Sep 17 00:00:00 2001
From: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
Date: Mon, 4 Dec 2023 15:27:14 +0100
Subject: [PATCH 0261/2913] [nrf noup] soc: arm: nRF91: Add SPU Flash/RAM
 alignment

TF-M will uses SPU alignment during build time to make sure all
partitions can be locked down with the SPU.

So adding them for nRF91

The nRF54L15 doesn't use the SPU for setting the security attributes
for flash/RAM regions. In order to avoid having multiple Kconfigs
with similar meaning renamed the alignment Kconfig option to something
more generic in order to use the same symbol for all the TrustZone enabled
devices.

Ref: NCSDK-25023

Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
(cherry picked from commit a6679f3c52f57feb941c746fd7389e9c2b15d70d)
(cherry picked from commit 140205eaedac9352f22e7489a4eae9d2ada86d07)
---
 soc/nordic/nrf53/Kconfig | 22 ++++++++++++++--------
 soc/nordic/nrf91/Kconfig | 20 ++++++++++++++++++++
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/soc/nordic/nrf53/Kconfig b/soc/nordic/nrf53/Kconfig
index ab282f56523..6527509a1f8 100644
--- a/soc/nordic/nrf53/Kconfig
+++ b/soc/nordic/nrf53/Kconfig
@@ -156,12 +156,15 @@ config NRF_SPU_FLASH_REGION_SIZE
 	help
 	  FLASH region size for the NRF_SPU peripheral
 
-config NRF_SPU_FLASH_REGION_ALIGNMENT
+config  NRF_TRUSTZONE_FLASH_REGION_SIZE
 	hex
-	default 0x4000
+	default NRF_SPU_FLASH_REGION_SIZE
 	help
-	  FLASH regions must be aligned to this value due to SPU HW
-	  limitations.
+	  Define the flash region size from a TrustZone perspective.
+	  This is used when we set the security attributes(S/NSC/NS) of a region
+	  in TrustZone enabled devices.
+	  In practice this option defines the granularity of the security attributes,
+	  i.e. the smallest region that can be set to secure or non-secure.
 
 config NRF_SPU_RAM_REGION_SIZE
 	hex
@@ -169,12 +172,15 @@ config NRF_SPU_RAM_REGION_SIZE
 	help
 	  RAM region size for the NRF_SPU peripheral
 
-config NRF_SPU_RAM_REGION_ALIGNMENT
+config  NRF_TRUSTZONE_RAM_REGION_SIZE
 	hex
-	default 0x2000
+	default NRF_SPU_RAM_REGION_SIZE
 	help
-	  RAM regions must be aligned to this value due to SPU HW
-	  limitations.
+	  Define the RAM region size from a TrustZone perspective.
+	  This is used when we set the security attributes(S/NSC/NS) of a region
+	  in TrustZone enabled devices.
+	  In practice this option defines the granularity of the security attributes,
+	  i.e. the smallest region that can be set to secure or non-secure.
 
 config SOC_NRF_GPIO_FORWARDER_FOR_NRF5340
 	bool "Forward GPIO pins to network core"
diff --git a/soc/nordic/nrf91/Kconfig b/soc/nordic/nrf91/Kconfig
index ed38eff73a2..9f55cdd77ed 100644
--- a/soc/nordic/nrf91/Kconfig
+++ b/soc/nordic/nrf91/Kconfig
@@ -24,6 +24,16 @@ config NRF_SPU_FLASH_REGION_SIZE
 	help
 	  FLASH region size for the NRF_SPU peripheral
 
+config  NRF_TRUSTZONE_FLASH_REGION_SIZE
+	hex
+	default NRF_SPU_FLASH_REGION_SIZE
+	help
+	  Define the flash region size from a TrustZone perspective.
+	  This is used when we set the security attributes(S/NSC/NS) of a region
+	  in TrustZone enabled devices.
+	  In practice this option defines the granularity of the security attributes,
+	  i.e. the smallest region that can be set to secure or non-secure.
+
 config NRF_SPU_RAM_REGION_SIZE
 	hex
 	default 0x2000
@@ -34,4 +44,14 @@ config NRF_ENABLE_ICACHE
 	bool "Instruction cache (I-Cache)"
 	default y
 
+config  NRF_TRUSTZONE_RAM_REGION_SIZE
+	hex
+	default NRF_SPU_RAM_REGION_SIZE
+	help
+	  Define the RAM region size from a TrustZone perspective.
+	  This is used when we set the security attributes(S/NSC/NS) of a region
+	  in TrustZone enabled devices.
+	  In practice this option defines the granularity of the security attributes,
+	  i.e. the smallest region that can be set to secure or non-secure.
+
 endif # SOC_SERIES_NRF91X

From 4f1f83b81edf0c7502344736130ab66e03b25bee Mon Sep 17 00:00:00 2001
From: Marek Pieta <Marek.Pieta@nordicsemi.no>
Date: Mon, 14 Nov 2022 11:22:06 +0100
Subject: [PATCH 0262/2913] [nrf noup] boards: thingy53_nrf5340: Add common
 partition map

Change introduces common static Partition Manager configuration.
The tfm_nonsecure partition must be SPU region aligned.

Ref: NCSDK-18033
Ref: NCSDK-19515

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
(cherry picked from commit 1642ab5ad5cfbdaa5dfbbfa6e8cbb8a3b397f085)
(cherry picked from commit ec4d98fc347ae71decb19bbd6d9b82088e4982b4)
---
 .../pm_static_thingy53_nrf5340_cpuapp.yml     | 55 ++++++++++++++
 .../pm_static_thingy53_nrf5340_cpuapp_ns.yml  | 73 +++++++++++++++++++
 2 files changed, 128 insertions(+)
 create mode 100644 boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp.yml
 create mode 100644 boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp_ns.yml

diff --git a/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp.yml b/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp.yml
new file mode 100644
index 00000000000..7a48d51ec33
--- /dev/null
+++ b/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp.yml
@@ -0,0 +1,55 @@
+app:
+  address: 0x10200
+  region: flash_primary
+  size: 0xdfe00
+mcuboot:
+  address: 0x0
+  region: flash_primary
+  size: 0x10000
+mcuboot_pad:
+  address: 0x10000
+  region: flash_primary
+  size: 0x200
+mcuboot_primary:
+  address: 0x10000
+  orig_span: &id001
+  - mcuboot_pad
+  - app
+  region: flash_primary
+  size: 0xe0000
+  span: *id001
+mcuboot_primary_app:
+  address: 0x10200
+  orig_span: &id002
+  - app
+  region: flash_primary
+  size: 0xdfe00
+  span: *id002
+settings_storage:
+  address: 0xf0000
+  region: flash_primary
+  size: 0x10000
+mcuboot_primary_1:
+  address: 0x0
+  size: 0x40000
+  device: flash_ctrl
+  region: ram_flash
+mcuboot_secondary:
+  address: 0x00000
+  size: 0xe0000
+  device: MX25R64
+  region: external_flash
+mcuboot_secondary_1:
+  address: 0xe0000
+  size: 0x40000
+  device: MX25R64
+  region: external_flash
+external_flash:
+  address: 0x120000
+  size: 0x6e0000
+  device: MX25R64
+  region: external_flash
+pcd_sram:
+  address: 0x20000000
+  size: 0x2000
+  region: sram_primary
diff --git a/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp_ns.yml b/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp_ns.yml
new file mode 100644
index 00000000000..70ffe6d9c12
--- /dev/null
+++ b/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp_ns.yml
@@ -0,0 +1,73 @@
+mcuboot:
+  address: 0x0
+  region: flash_primary
+  size: 0x10000
+mcuboot_pad:
+  address: 0x10000
+  region: flash_primary
+  size: 0x200
+tfm_secure:
+  address: 0x10000
+  size: 0xc000
+  span: [mcuboot_pad, tfm]
+tfm_nonsecure:
+  address: 0x1c000
+  size: 0xd4000
+  span: [app]
+tfm:
+  address: 0x10200
+  region: flash_primary
+  size: 0xbe00
+app:
+  address: 0x1c000
+  region: flash_primary
+  size: 0xd4000
+mcuboot_primary:
+  address: 0x10000
+  orig_span: &id001
+  - mcuboot_pad
+  - tfm
+  - app
+  region: flash_primary
+  size: 0xe0000
+  span: *id001
+mcuboot_primary_app:
+  address: 0x10200
+  orig_span: &id002
+  - tfm
+  - app
+  region: flash_primary
+  size: 0xdfe00
+  span: *id002
+nonsecure_storage:
+  address: 0xf0000
+  size: 0x10000
+  span: [settings_storage]
+settings_storage:
+  address: 0xf0000
+  region: flash_primary
+  size: 0x10000
+mcuboot_primary_1:
+  address: 0x0
+  size: 0x40000
+  device: flash_ctrl
+  region: ram_flash
+mcuboot_secondary:
+  address: 0x00000
+  size: 0xe0000
+  device: MX25R64
+  region: external_flash
+mcuboot_secondary_1:
+  address: 0xe0000
+  size: 0x40000
+  device: MX25R64
+  region: external_flash
+external_flash:
+  address: 0x120000
+  size: 0x6e0000
+  device: MX25R64
+  region: external_flash
+pcd_sram:
+  address: 0x20000000
+  size: 0x2000
+  region: sram_primary

From f01f4727d70b4ed20bbaf0fb8c1f022e16fb3064 Mon Sep 17 00:00:00 2001
From: Mateusz Kapala <mateusz.kapala@nordicsemi.no>
Date: Thu, 2 Feb 2023 11:04:23 +0100
Subject: [PATCH 0263/2913] [nrf noup] boards: arm: thingy53: Disable USB CDC
 added by MCUBoot

Enabling USB CDC by default in Thingy:53 board configuration
caused that there were two instances of USB CDC in MCUBoot. Change
disables one instance which was added automatically by NCS if
MCUBoot bootloader was built as a child image.

Jira: NCSDK-18596

Signed-off-by: Mateusz Kapala <mateusz.kapala@nordicsemi.no>
Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit 133e9ae371f47c0b30dfecbfd907432825d99e32)
(cherry picked from commit a2eb8a8cb8c9396bc2015b9a8c34d8327d732676)
---
 boards/nordic/thingy53/Kconfig.defconfig | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/boards/nordic/thingy53/Kconfig.defconfig b/boards/nordic/thingy53/Kconfig.defconfig
index 92eac11503d..fc259cbd429 100644
--- a/boards/nordic/thingy53/Kconfig.defconfig
+++ b/boards/nordic/thingy53/Kconfig.defconfig
@@ -132,6 +132,13 @@ endif # LOG
 
 endif # BOARD_SERIAL_BACKEND_CDC_ACM
 
+# By default, a USB CDC ACM instance is already enabled in the board's DTS.
+# It is not necessary for nRF Connect SDK to add another instance if MCUBoot
+# bootloader is built as a child image.
+config MCUBOOT_USB_SUPPORT
+	bool
+	default n
+
 endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
 
 if BOARD_THINGY53_NRF5340_CPUNET

From 1e7e8edd624db75044326f201ecd02880298e493 Mon Sep 17 00:00:00 2001
From: Marek Pieta <Marek.Pieta@nordicsemi.no>
Date: Mon, 28 Nov 2022 15:31:33 +0100
Subject: [PATCH 0264/2913] [nrf noup] boards: thingy53_nrf5340: Enable MCUboot
 by default

Change enables MCUboot bootloader by default to allow programming
samples and applications without external programmer (using MCUboot
serial recovery). Change also enables network core to prevent build
failures when building MCUboot with nRF53 multi image DFU.

Jira: NCSDK-18263

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
(cherry picked from commit 8c3e1850b100b34e07a6f598fa4209927af8b517)
(cherry picked from commit 2e308869170b1e194fc86bd9a0f1fc9d3eaf2290)
---
 boards/nordic/thingy53/Kconfig.defconfig            | 6 ++++++
 boards/nordic/thingy53/thingy53_nrf5340_common.dtsi | 1 +
 2 files changed, 7 insertions(+)

diff --git a/boards/nordic/thingy53/Kconfig.defconfig b/boards/nordic/thingy53/Kconfig.defconfig
index fc259cbd429..c2e13fad0ab 100644
--- a/boards/nordic/thingy53/Kconfig.defconfig
+++ b/boards/nordic/thingy53/Kconfig.defconfig
@@ -5,6 +5,12 @@
 
 if BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
 
+config BOOTLOADER_MCUBOOT
+	default y if !MCUBOOT
+
+config BOARD_ENABLE_CPUNET
+	default y if !MCUBOOT
+
 # Code Partition:
 #
 # For the secure version of the board the firmware is linked at the beginning
diff --git a/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi b/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
index 12b7cf6c13b..e4028edfc94 100644
--- a/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
+++ b/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
@@ -18,6 +18,7 @@
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,ieee802154 = &ieee802154;
+		nordic,pm-ext-flash = &mx25r64;
 	};
 
 	buttons {

From f4efefb975d3e0b54aee51be89bd830ccd04c67b Mon Sep 17 00:00:00 2001
From: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
Date: Wed, 15 Nov 2023 12:55:40 +0100
Subject: [PATCH 0265/2913] [nrf noup] boards: arm: nrf9131ek: enable tfm

This patch backports the nrf9131ek to a time before tfm was refactored.

To be reverted when TF-M is updated.

Signed-off-by: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
(cherry picked from commit e4c33a1901515ddb74343299758f8cde06ea05fb)
(cherry picked from commit b45c2d77e7e0ca1c05da82a9aed678e09e2d631a)
---
 boards/nordic/nrf9131ek/Kconfig.defconfig | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/boards/nordic/nrf9131ek/Kconfig.defconfig b/boards/nordic/nrf9131ek/Kconfig.defconfig
index b63e7ef8d34..8e0e1d02d1d 100644
--- a/boards/nordic/nrf9131ek/Kconfig.defconfig
+++ b/boards/nordic/nrf9131ek/Kconfig.defconfig
@@ -5,6 +5,21 @@
 
 if BOARD_NRF9131EK_NRF9131 || BOARD_NRF9131EK_NRF9131_NS
 
+# By default, if we build for a Non-Secure version of the board,
+# enable building with TF-M as the Secure Execution Environment.
+config BUILD_WITH_TFM
+	default y if BOARD_NRF9131EK_NRF9131_NS
+
+if BUILD_WITH_TFM
+
+# By default, if we build with TF-M, instruct build system to
+# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
+config TFM_FLASH_MERGED_BINARY
+	bool
+	default y
+
+endif # BUILD_WITH_TFM
+
 # For the secure version of the board the firmware is linked at the beginning
 # of the flash, or into the code-partition defined in DT if it is intended to
 # be loaded by MCUboot. If the secure firmware is to be combined with a non-

From 0b39a49df9468bdcdda450731d6b02ddebba14bb Mon Sep 17 00:00:00 2001
From: Mateusz Michalek <mateusz.michalek@nordicsemi.no>
Date: Wed, 20 Mar 2024 12:10:13 +0100
Subject: [PATCH 0266/2913] [nrf noup] samples: smp_svr: configuration for
 nrf54l15

Configuration allows DFU with serial transport using
mcumgr and over BT using nRF Connect.

Signed-off-by: Mateusz Michalek <mateusz.michalek@nordicsemi.no>
(cherry picked from commit ba6d0b4bec000efb70229090cd8080a96759e459)
(cherry picked from commit c620cdcf170193d945acd9eba7476a537633dcd5)
---
 samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 6a3669b2438..04e19dfb48e 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -12,9 +12,11 @@ tests:
       - nrf52840dk/nrf52840
       - pinnacle_100_dvk
       - mg100
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
+      - nrf54l15pdk/nrf54l15/cpuapp
   sample.mcumgr.smp_svr.bt_static_svc:
     extra_args: OVERLAY_CONFIG="overlay-bt.conf"
     extra_configs:

From b4f2813c71c6308c0b65d5a0fa39aaf043731fbf Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Fri, 12 Apr 2024 17:53:35 +0200
Subject: [PATCH 0267/2913] [nrf noup] samples/**/smp_svr: testcase of
 nrf54l15pdk with ext-flash

Added description of sample testcase for building smp_svr with
support of secondary partition in on PDK spi_nor flash.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
(cherry picked from commit 8597d35c6ed0389906a9889897a504ee14b468b4)
(cherry picked from commit 978c7e563ed906914bf48c3cb1b0ba7309b69681)
---
 samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 04e19dfb48e..81b06ca5634 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -104,3 +104,15 @@ tests:
       - mg100
     integration_platforms:
       - nrf52840dk/nrf52840
+  sample.mcumgr.smp_svr.bt.nrf54l15pdk.ext_flash:
+    extra_args:
+      - OVERLAY_CONFIG="overlay-bt.conf"
+      - DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
+      - mcuboot_CONF_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.conf"
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
+    extra_configs:
+      - CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
+    platform_allow:
+      - nrf54l15pdk/nrf54l15/cpuapp
+    integration_platforms:
+      - nrf54l15pdk/nrf54l15/cpuapp

From 124e72c6d8c85f195acf1379f2c95a32d1229f08 Mon Sep 17 00:00:00 2001
From: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
Date: Fri, 19 Apr 2024 12:58:47 +0200
Subject: [PATCH 0268/2913] [nrf noup] samples: psa_crypto: Remove support for
 Nordic boards

We have our own psa crypto samples to show how to used PSA crypto with
NCS.

This sample still uses CONFIG_MBEDTLS_BUILTIN which is not supported
anymore, therefore removing the support for it in NCS.

Ref: NCSDK-17944
Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
(cherry picked from commit 1669d74d4dabe85bb60b43bd7779bb13f1f1b725)
(cherry picked from commit bd020cfb5dfa370be8cb16e567342d923d1b7d9f)
---
 samples/tfm_integration/psa_crypto/sample.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/samples/tfm_integration/psa_crypto/sample.yaml b/samples/tfm_integration/psa_crypto/sample.yaml
index 37a6aeaf234..9f067c7be0d 100644
--- a/samples/tfm_integration/psa_crypto/sample.yaml
+++ b/samples/tfm_integration/psa_crypto/sample.yaml
@@ -16,8 +16,6 @@ tests:
     platform_allow:
       - mps2/an521/cpu0/ns
       - v2m_musca_s1/musca_s1/ns
-      - nrf5340dk/nrf5340/cpuapp/ns
-      - nrf9160dk/nrf9160/ns
       - stm32l562e_dk/stm32l562xx/ns
       - bl5340_dvk/nrf5340/cpuapp/ns
     harness: console

From 9a675fa35fbd88a3464aaf015f68dff3fa22090a Mon Sep 17 00:00:00 2001
From: Grzegorz Chwierut <grzegorz.chwierut@nordicsemi.no>
Date: Wed, 24 Apr 2024 12:22:51 +0200
Subject: [PATCH 0269/2913] [nrf noup] boards: nrf54l15pdk: ROM_START_OFFSET

Sets up default for builds with partition manager.

Signed-off-by: Mateusz Michalek <mateusz.michalek@nordicsemi.no>
Signed-off-by: Grzegorz Chwierut <grzegorz.chwierut@nordicsemi.no>
(cherry picked from commit 9a0b81bf553b937f2ecb729a4ae9dff6df93919f)
(cherry picked from commit a58bb0235e1b1f31ca368a6615eff4ce573e1cf0)
---
 boards/nordic/nrf54l15pdk/Kconfig.defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boards/nordic/nrf54l15pdk/Kconfig.defconfig b/boards/nordic/nrf54l15pdk/Kconfig.defconfig
index 7a9177fcbf7..46df08cfa84 100644
--- a/boards/nordic/nrf54l15pdk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l15pdk/Kconfig.defconfig
@@ -7,6 +7,7 @@ config BT_CTLR
 	default BT
 
 config ROM_START_OFFSET
+	default 0 if PARTITION_MANAGER_ENABLED
 	default 0x800 if BOOTLOADER_MCUBOOT
 
 endif # BOARD_NRF54L15PDK_NRF54L15_CPUAPP

From f68b2edaa2233cde29d955bc3d3b3dd75ff50334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= <rafal.kuznia@nordicsemi.no>
Date: Fri, 26 Apr 2024 13:36:54 +0200
Subject: [PATCH 0270/2913] [nrf noup] drivers: spi_dw: add custom EXMIF
 peripheral handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Synopsys Designware SPI peripheral core is wrapped in hardware that
manages interrupts, power and clock. The SPI core registers are shifted
by 0x500 bytes.
Before the SPI core is used, the power and clock must be enabled by
writing to EXMIF.TASKS_START register.
Interrupts must be enabled by writing to EXMIF.INTENSET/INTENCLR
registers.

The SER register must be configured unconditionally during peripheral
setup. Otherwise, the serial transaction does not complete.

The "snps,designware-spi" compatible is added to the EXMIF node so that
the peripheral can be used with the spi_dw driver specially modified
for that purpose.

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit 1a630d8a0c738f0543bebaacae50a1393f4cebe2)
(cherry picked from commit 66697abb80434c6b6d5bbc5181cd592df8b55daa)
---
 drivers/spi/spi_dw.c            | 21 ++++++++++++++++++++-
 dts/common/nordic/nrf54h20.dtsi |  2 +-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
index 649a13aca01..b4f772b158b 100644
--- a/drivers/spi/spi_dw.c
+++ b/drivers/spi/spi_dw.c
@@ -41,6 +41,10 @@ LOG_MODULE_REGISTER(spi_dw);
 #include <zephyr/drivers/pinctrl.h>
 #endif
 
+#ifdef CONFIG_HAS_NRFX
+#include <nrfx.h>
+#endif
+
 static inline bool spi_dw_is_slave(struct spi_dw_data *spi)
 {
 	return (IS_ENABLED(CONFIG_SPI_SLAVE) &&
@@ -258,6 +262,7 @@ static int spi_dw_configure(const struct device *dev,
 		/* Baud rate and Slave select, for master only */
 		write_baudr(dev, SPI_DW_CLK_DIVIDER(info->clock_frequency,
 						    config->frequency));
+		write_ser(dev, BIT(config->slave));
 	}
 
 	if (spi_dw_is_slave(spi)) {
@@ -500,6 +505,10 @@ void spi_dw_isr(const struct device *dev)
 	uint32_t int_status;
 	int error;
 
+#ifdef CONFIG_HAS_NRFX
+	NRF_EXMIF->EVENTS_CORE = 0;
+#endif
+
 	int_status = read_isr(dev);
 
 	LOG_DBG("SPI %p int_status 0x%x - (tx: %d, rx: %d)", dev, int_status,
@@ -548,6 +557,11 @@ int spi_dw_init(const struct device *dev)
 
 	DEVICE_MMIO_MAP(dev, K_MEM_CACHE_NONE);
 
+#ifdef CONFIG_HAS_NRFX
+	NRF_EXMIF->INTENSET = BIT(0);
+	NRF_EXMIF->TASKS_START = 1;
+#endif
+
 	info->config_func();
 
 	/* Masking interrupt and making sure controller is disabled */
@@ -566,6 +580,11 @@ int spi_dw_init(const struct device *dev)
 	return 0;
 }
 
+#define REG_ADDR(inst) \
+	COND_CODE_1(DT_NODE_HAS_COMPAT(DT_DRV_INST(inst), nordic_nrf_exmif), \
+		    (Z_DEVICE_MMIO_NAMED_ROM_INITIALIZER(core, DT_DRV_INST(inst))), \
+		    (DEVICE_MMIO_ROM_INIT(DT_DRV_INST(inst))))
+
 #define SPI_CFG_IRQS_SINGLE_ERR_LINE(inst)					\
 		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(inst, rx_avail, irq),		\
 			    DT_INST_IRQ_BY_NAME(inst, rx_avail, priority),	\
@@ -638,7 +657,7 @@ COND_CODE_1(IS_EQ(DT_NUM_IRQS(DT_DRV_INST(inst)), 1),              \
 		SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(inst), ctx)                     \
 	};                                                                                  \
 	static const struct spi_dw_config spi_dw_config_##inst = {                          \
-		DEVICE_MMIO_ROM_INIT(DT_DRV_INST(inst)),                                    \
+		REG_ADDR(inst),                                                             \
 		.clock_frequency = COND_CODE_1(                                             \
 			DT_NODE_HAS_PROP(DT_INST_PHANDLE(inst, clocks), clock_frequency),   \
 			(DT_INST_PROP_BY_PHANDLE(inst, clocks, clock_frequency)),           \
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index c0de788ad9b..2aa647316c0 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -496,7 +496,7 @@
 			};
 
 			exmif: spi@95000 {
-				compatible = "nordic,nrf-exmif";
+				compatible = "nordic,nrf-exmif", "snps,designware-spi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x95000 0x500 0x95500 0xb00>;

From 7edd93c1edb7701c8e7a67591df2c32c19c3374d Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Mon, 15 Apr 2024 18:51:29 +0200
Subject: [PATCH 0271/2913] [nrf noup] samples/smp_svr: nrf54l15pdk ext-flash
 partition

Added DTS with partitioning which involves external flash
as place for slo1_partition.external slot1_partition

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
(cherry picked from commit dd5fdbe0f3abd0a398069066ad2e492732f345c0)
(cherry picked from commit 8ceb8dc2b21e69b4a3b48571c4463f8def4a59a4)
---
 ...54l15pdk_nrf54l15_cpuapp_ext_flash.overlay | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
index 410388bfa6d..76b648903a0 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
@@ -4,6 +4,42 @@
 	};
 };
 
+/delete-node/ &boot_partition;
+/delete-node/ &slot0_partition;
+/delete-node/ &slot1_partition;
+
+/delete-node/ &slot0_ns_partition;
+/delete-node/ &slot1_ns_partition;
+
+/delete-node/ &storage_partition;
+
+&rram0 {
+	partitions {
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x000000000 0x00014000>;
+		};
+		slot0_partition: partition@14000 {
+			label = "image-0";
+			reg = <0x000014000 0x0015A000>;
+		};
+		storage_partition: partition@16E000 {
+			label = "storage";
+			reg = < 0x16E000 0x9000 >;
+		};
+	};
+};
+
 &mx25r64 {
 	status = "okay";
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		slot1_partition: partition@0 {
+			label = "image-1";
+			reg = <0x000000000 0x0015A000>;
+		};
+	};
 };

From 08368a1040105dc596829aacd8aa6ccf80465c97 Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Mon, 29 Apr 2024 17:26:47 +0200
Subject: [PATCH 0272/2913] [nrf noup] samples/**/smp_svr: testcase of
 nrf54l15pdk with ext-flash DT

Added description of sample testcase for building smp_svr with
support of secondary partition in on PDK spi_nor flash uisng
DTS.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
(cherry picked from commit 3e5cde49960e408b6f36e526ea6ddeda1e7fc458)
(cherry picked from commit 5c6d682f79523f6f39af8a4c9e0586f6e60fab4b)
---
 samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 81b06ca5634..00182054eba 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -116,3 +116,15 @@ tests:
       - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15pdk/nrf54l15/cpuapp
+  sample.mcumgr.smp_svr.bt.nrf54l15pdk.ext_flash.pure_dts:
+    extra_args:
+      - OVERLAY_CONFIG="overlay-bt.conf"
+      - DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
+      - mcuboot_CONF_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.conf"
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
+    extra_configs:
+      - SB_CONFIG_PARTITION_MANAGER=n
+    platform_allow:
+      - nrf54l15pdk/nrf54l15/cpuapp
+    integration_platforms:
+      - nrf54l15pdk/nrf54l15/cpuapp

From 031b51365d27df2bc012be3e1775164f0ee925d2 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Thu, 9 May 2024 09:34:06 +0100
Subject: [PATCH 0273/2913] [nrf noup] boards: nordic: thingy53: Add sysbuild
 Kconfig file

Adds a sysbuild Kconfig file which enables external flash when
partition manager is enabled

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit af08cbc1ac046f933569f351cb257ef6ae4613f7)
(cherry picked from commit 1b7100a4d8ec755561443a20d4bafc71a7843537)
---
 boards/nordic/thingy53/Kconfig.sysbuild | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 boards/nordic/thingy53/Kconfig.sysbuild

diff --git a/boards/nordic/thingy53/Kconfig.sysbuild b/boards/nordic/thingy53/Kconfig.sysbuild
new file mode 100644
index 00000000000..2110f226e6b
--- /dev/null
+++ b/boards/nordic/thingy53/Kconfig.sysbuild
@@ -0,0 +1,5 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
+	default y if BOOTLOADER_MCUBOOT

From f7060745b31b1d26e57a3280cd3f0dc6660682ec Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Tue, 14 May 2024 12:22:51 +0100
Subject: [PATCH 0274/2913] [nrf noup] scripts: west: build: Use sysbuild by
 default if in NCS dir

Uses sysbuild by default when building an application which resides in
an allowed NCS-based directory when the sysbuild config key is not
set. Do not use sysbuild if the mps2 board is being used to avoid
problems with CI testing.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 8d0cc16c73c1ce587669be498069a59dfae7b81e)
(cherry picked from commit 866d3929ff47b2c55bc735f57da2cc98aee41dfc)
---
 scripts/west_commands/build.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/west_commands/build.py b/scripts/west_commands/build.py
index 459d9aedf0b..260945483cf 100644
--- a/scripts/west_commands/build.py
+++ b/scripts/west_commands/build.py
@@ -595,7 +595,12 @@ def _run_cmake(self, board, origin, cmake_opts):
         if user_args:
             cmake_opts.extend(shlex.split(user_args))
 
-        config_sysbuild = config_getboolean('sysbuild', False)
+        config_sysbuild = config_getboolean('sysbuild', None)
+
+        if config_sysbuild is None:
+            # If no option is set, then enable sysbuild globally
+            config_sysbuild = True
+
         if self.args.sysbuild or (config_sysbuild and not self.args.no_sysbuild):
             cmake_opts.extend(['-S{}'.format(SYSBUILD_PROJ_DIR),
                                '-DAPP_DIR:PATH={}'.format(self.source_dir)])

From ab305add763a56b6671c3b1b5828a6c7d6d88105 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Fri, 17 May 2024 10:15:33 +0100
Subject: [PATCH 0275/2913] [nrf noup] board: nordic: thingy53: Enable default
 images for sysbuild

Enables MCUboot, empty network core and network core updates by
default when building for the thingy53

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit f77847e89f7c3c3d474cf82e1a155957f1b205f9)
(cherry picked from commit ba4136eab993a92d285b95ae0b8c9812c9489a5e)
---
 boards/nordic/thingy53/Kconfig.sysbuild | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/boards/nordic/thingy53/Kconfig.sysbuild b/boards/nordic/thingy53/Kconfig.sysbuild
index 2110f226e6b..c03d191b370 100644
--- a/boards/nordic/thingy53/Kconfig.sysbuild
+++ b/boards/nordic/thingy53/Kconfig.sysbuild
@@ -1,5 +1,22 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
+if BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
+
+choice BOOTLOADER
+	default BOOTLOADER_MCUBOOT
+endchoice
+
+config SECURE_BOOT_NETCORE
+	default y
+
+config NETCORE_APP_UPDATE
+	default y if SECURE_BOOT_NETCORE
+
+config NRF_DEFAULT_EMPTY
+	default y if SECURE_BOOT_NETCORE
+
+endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
+
 config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
 	default y if BOOTLOADER_MCUBOOT

From 4101af67a14edb655c33fa08e778bd44ef52cff2 Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Tue, 21 May 2024 16:30:31 +0200
Subject: [PATCH 0276/2913] [nrf noup] samples/**/smp_svr: fix
 SB_CONFIG_PARTITION_MANAGER injection

In sample.yaml:
`SB_CONFIG_PARTITION_MANAGER=n` moved to extar_args as extra_config
can't handle property with `SB_` prefix.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
(cherry picked from commit 1c273f20338514fabc18a8f53a5ffc7c0cbb9483)
(cherry picked from commit 3f18f27c965cbbfd76201017a1eda83ce0b5138d)
---
 samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 00182054eba..3aa3ca449e5 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -122,7 +122,6 @@ tests:
       - DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
       - mcuboot_CONF_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.conf"
       - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
-    extra_configs:
       - SB_CONFIG_PARTITION_MANAGER=n
     platform_allow:
       - nrf54l15pdk/nrf54l15/cpuapp

From eab09f631472554b4a1cd9df6b67a587ecd7d634 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Mon, 1 Oct 2018 10:27:32 +0200
Subject: [PATCH 0277/2913] [nrf noup] include: net: add NCS extensions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add some socket options and address family extensions to Zephyr
headers, which will be useful for nRF Connect SDK.

Add secure socket options:
* Add CID socket options to NCS specific options.
* Add TLS/DTLS tls ciphersuite chosen socket option to NCS specific
  options.
* Add TLS/DTLS connection save/load socket options to NCS specific
  options.
* Add TLS/DTLS handshake status socket option to NCS specific options.

* Add SO_KEEPOPEN socket option.
* Add SO_RAI socket options.
* Add SO_IPV6_DELAYED_ADDR_REFRESH socket option.

The "author" of this commit is a contact person; various people with
s-o-b lines following here have contributed to the maintenance of this
patch.

Signed-off-by: Andreas Moltumyr <andreas.moltumyr@nordicsemi.no>
Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
Signed-off-by: Christopher Métrailler <christopher.metrailler@nordicsemi.no>
Signed-off-by: Emanuele Di Santo <emdi@nordicsemi.no>
Signed-off-by: Glenn Ruben Bakke <glenn.ruben.bakke@nordicsemi.no>
Signed-off-by: Håkon Alseth <haal@nordicsemi.no>
Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
Signed-off-by: Jan Tore Guggedal <jantore.guggedal@nordicsemi.no>
Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
Signed-off-by: Mirko Covizzi <mirko.covizzi@nordicsemi.no>
Signed-off-by: Petri Honkala <petri.honkala@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Tommi Mammela <tommi.mammela@nordicsemi.no>
Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Signed-off-by: Eivind Jølsgard <eivind.jolsgard@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit c37e13b0e5e2943752729283de03f3a253a0d000)
(cherry picked from commit 182bd3b5fd085a6954ca3c1b711e52a2b9796b82)
---
 include/zephyr/net/socket.h     |   1 +
 include/zephyr/net/socket_ncs.h | 170 ++++++++++++++++++++++++++++++++
 2 files changed, 171 insertions(+)
 create mode 100644 include/zephyr/net/socket_ncs.h

diff --git a/include/zephyr/net/socket.h b/include/zephyr/net/socket.h
index d62b12719ab..34211d83759 100644
--- a/include/zephyr/net/socket.h
+++ b/include/zephyr/net/socket.h
@@ -34,6 +34,7 @@
 #include <zephyr/sys/iterable_sections.h>
 #include <zephyr/sys/fdtable.h>
 #include <zephyr/net/dns_resolve.h>
+#include <zephyr/net/socket_ncs.h>
 #include <stdlib.h>
 
 #ifdef __cplusplus
diff --git a/include/zephyr/net/socket_ncs.h b/include/zephyr/net/socket_ncs.h
new file mode 100644
index 00000000000..4a198b5992b
--- /dev/null
+++ b/include/zephyr/net/socket_ncs.h
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_NET_SOCKET_NCS_H_
+#define ZEPHYR_INCLUDE_NET_SOCKET_NCS_H_
+
+/**
+ * @file
+ * @brief NCS specific additions to the BSD sockets API definitions
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* When CONFIG_NET_SOCKETS_OFFLOAD is enabled, offloaded sockets take precedence
+ * when creating a new socket. Combine this flag with a socket type when
+ * creating a socket, to enforce native socket creation (e. g. SOCK_STREAM | SOCK_NATIVE).
+ * If it's desired to create a native TLS socket, but still offload the
+ * underlying TCP/UDP socket, use e. g. SOCK_STREAM | SOCK_NATIVE_TLS.
+ */
+#define SOCK_NATIVE 0x80000000
+#define SOCK_NATIVE_TLS 0x40000000
+
+/* NCS specific TLS level socket options */
+
+/** Socket option to set DTLS handshake timeout, specifically for nRF sockets.
+ *  The option accepts an integer, indicating the total handshake timeout,
+ *  including retransmissions, in seconds.
+ *  Accepted values for the option are: 1, 3, 7, 15, 31, 63, 123.
+ */
+#define TLS_DTLS_HANDSHAKE_TIMEO 18
+
+/** Socket option to save DTLS connection, specifically for nRF sockets.
+ */
+#define TLS_DTLS_CONN_SAVE 19
+
+/** Socket option to load DTLS connection, specifically for nRF sockets.
+ */
+#define TLS_DTLS_CONN_LOAD 20
+
+/** Socket option to get result of latest TLS/DTLS completed handshakes end status,
+ *  specifically for nRF sockets.
+ *  The option accepts an integer, indicating the setting.
+ *  Accepted vaules for the option are: 0 and 1.
+ */
+#define TLS_DTLS_HANDSHAKE_STATUS 21
+
+/* Valid values for TLS_SESSION_CACHE option */
+#define TLS_SESSION_CACHE_DISABLED 0 /**< Disable TLS session caching. */
+#define TLS_SESSION_CACHE_ENABLED 1 /**< Enable TLS session caching. */
+
+/* Valid values for TLS_DTLS_HANDSHAKE_TIMEO option */
+#define TLS_DTLS_HANDSHAKE_TIMEO_NONE 0 /**< No timeout */
+#define TLS_DTLS_HANDSHAKE_TIMEO_1S 1 /**< 1 second */
+#define TLS_DTLS_HANDSHAKE_TIMEO_3S 3 /**< 1s + 2s */
+#define TLS_DTLS_HANDSHAKE_TIMEO_7S 7 /**< 1s + 2s + 4s */
+#define TLS_DTLS_HANDSHAKE_TIMEO_15S 15 /**< 1s + 2s + 4s + 8s */
+#define TLS_DTLS_HANDSHAKE_TIMEO_31S 31 /**< 1s + 2s + 4s + 8s + 16s */
+#define TLS_DTLS_HANDSHAKE_TIMEO_63S 63 /**< 1s + 2s + 4s + 8s + 16s + 32s */
+#define TLS_DTLS_HANDSHAKE_TIMEO_123S 123 /**< 1s + 2s + 4s + 8s + 16s + 32s + 60s */
+
+/* Valid values for TLS_DTLS_HANDSHAKE_STATUS option */
+#define TLS_DTLS_HANDSHAKE_STATUS_FULL		0
+#define TLS_DTLS_HANDSHAKE_STATUS_CACHED	1
+
+/* NCS specific socket options */
+
+/** sockopt: enable sending data as part of exceptional events */
+#define SO_EXCEPTIONAL_DATA 33
+/** sockopt: Keep socket open when its PDN connection is lost
+ *           or the device is put into flight mode.
+ */
+#define SO_KEEPOPEN 34
+/** sockopt: bind to PDN */
+#define SO_BINDTOPDN 40
+
+/** sockopt: Release assistance indication (RAI).
+ *  The option accepts an integer, indicating the type of RAI.
+ *  Accepted values for the option are: @ref RAI_NO_DATA, @ref RAI_LAST, @ref RAI_ONE_RESP,
+ *  @ref RAI_ONGOING, @ref RAI_WAIT_MORE.
+ */
+#define SO_RAI 61
+
+/** Release assistance indication (RAI).
+ *  Indicate that the application does not intend to send more data.
+ *  This applies immediately and lets the modem exit connected mode more
+ *  quickly.
+ *
+ *  @note This requires the socket to be connected.
+ */
+#define RAI_NO_DATA 1
+/** Release assistance indication (RAI).
+ *  Indicate that the application does not intend to send more data
+ *  after the next call to send() or sendto().
+ *  This lets the modem exit connected mode more quickly after sending the data.
+ */
+#define RAI_LAST 2
+/** Release assistance indication (RAI).
+ *  Indicate that the application is expecting to receive just one data packet
+ *  after the next call to send() or sendto().
+ *  This lets the modem exit connected mode more quickly after having received the data.
+ */
+#define RAI_ONE_RESP 3
+/** Release assistance indication (RAI).
+ *  Indicate that the socket is in active use by a client application.
+ *  This lets the modem stay in connected mode longer.
+ */
+#define RAI_ONGOING 4
+/** Release assistance indication (RAI).
+ *  Indicate that the socket is in active use by a server application.
+ *  This lets the modem stay in connected mode longer.
+ */
+#define RAI_WAIT_MORE 5
+
+/* NCS specific IPPROTO_ALL level socket options */
+
+/** IPv4 and IPv6 protocol level (pseudo-val) for nRF sockets. */
+#define IPPROTO_ALL 512
+/** sockopt: disable all replies to unexpected traffics */
+#define SO_SILENCE_ALL 30
+
+/* NCS specific IPPROTO_IP level socket options */
+
+/** sockopt: enable IPv4 ICMP replies */
+#define SO_IP_ECHO_REPLY 31
+
+/* NCS specific IPPROTO_IPV6 level socket options */
+
+/** sockopt: enable IPv6 ICMP replies */
+#define SO_IPV6_ECHO_REPLY 32
+
+/** sockopt: Delay IPv6 address refresh during power saving mode  */
+#define SO_IPV6_DELAYED_ADDR_REFRESH 62
+
+/* NCS specific TCP level socket options */
+
+/** sockopt: Configurable TCP server session timeout in minutes.
+ * Range is 0 to 135. 0 is no timeout and 135 is 2 h 15 min. Default is 0 (no timeout).
+ */
+#define SO_TCP_SRV_SESSTIMEO 55
+
+/* NCS specific gettaddrinfo() flags */
+
+/** Assume `service` contains a Packet Data Network (PDN) ID.
+ *  When specified together with the AI_NUMERICSERV flag,
+ *  `service` shall be formatted as follows: "port:pdn_id"
+ *  where "port" is the port number and "pdn_id" is the PDN ID.
+ *  Example: "8080:1", port 8080 PDN ID 1.
+ *  Example: "42:0", port 42 PDN ID 0.
+ */
+#define AI_PDNSERV 0x1000
+
+/* NCS specific send() and sendto() flags */
+
+/** Request a blocking send operation until the request is acknowledged.
+ *  When used in send() or sendto(), the request will not return until the
+ *  send operation is completed by lower layers, or until the timeout, given by the SO_SNDTIMEO
+ *  socket option, is reached. Valid timeout values are 1 to 600 seconds.
+ */
+#define MSG_WAITACK 0x200
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_NET_SOCKET_NCS_H_ */

From e56959d1eb4c3d21aa9335f8d642f047b2afb7db Mon Sep 17 00:00:00 2001
From: Sigvart Hovland <sigvart.hovland@nordicsemi.no>
Date: Fri, 3 May 2019 14:21:52 +0200
Subject: [PATCH 0278/2913] [nrf noup] tree-wide: support NCS Partition Manager
 (PM) definitions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Partition Manager (PM) is a component of the nRF Connect SDK (NCS)
which uses yaml files to resolve flash partition placement with a
holistic view of the entire device, including each firmware image
present on the flash device, and various subsystems, such as settings
and NFFS.

When this NCS extension is used, various source files which would use
partition information from devicetree in "vanilla" zephyr instead use
defines generated by PM instead.

This commit removes support for HEX_FILES_TO_MERGE, as it conflicts
with PM.

The settings subsystem pm.yml defines a partition 'settings_storage'.
The nffs subsystem pm.yml defines 'nffs_storage'.

Leverage label translation to avoid patching partition names.

Refer to the NCS documentation page for this feature for more details.

This is a long-running out of tree patch which has been worked on by
several people. The following sign-offs are in alphabetical order by
first name.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>
Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
Signed-off-by: Ole Sæther <ole.saether@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
Signed-off-by: Sigvart Hovland <sigvart.hovland@nordicsemi.no>
Signed-off-by: Thomas Stenersen <thomas.stenersen@nordicsemi.no>
Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>
Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit a195a8b3745ea556a65dd390c97247933d985ae5)
(cherry picked from commit 04c02d0eaba762d48cc278b221a8fa8f5f67e32e)
(cherry picked from commit 25f14b4f8ecba7423f39ead3c117c0d86a096c5b)
---
 arch/arm/core/mpu/arm_mpu_regions.c           | 13 +++++
 cmake/linker/ld/target.cmake                  |  1 +
 cmake/modules/kernel.cmake                    |  4 ++
 drivers/flash/soc_flash_nrf.c                 | 11 ++++
 .../arch/arm/cortex_m/scripts/linker.ld       | 50 +++++++++++++++++++
 include/zephyr/storage/flash_map.h            |  6 +++
 lib/heap/Kconfig                              |  2 +-
 lib/libc/common/source/stdlib/malloc.c        | 18 ++++++-
 subsys/dfu/boot/mcuboot_shell.c               | 40 +++++++++++++++
 subsys/fs/littlefs_fs.c                       |  7 ++-
 subsys/ipc/rpmsg_service/rpmsg_backend.h      | 27 ++++++++++
 11 files changed, 175 insertions(+), 4 deletions(-)

diff --git a/arch/arm/core/mpu/arm_mpu_regions.c b/arch/arm/core/mpu/arm_mpu_regions.c
index 6af62f84078..cfe1230c907 100644
--- a/arch/arm/core/mpu/arm_mpu_regions.c
+++ b/arch/arm/core/mpu/arm_mpu_regions.c
@@ -8,6 +8,9 @@
 #include <zephyr/arch/arm/mpu/arm_mpu.h>
 
 #include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#if USE_PARTITION_MANAGER
+#include <pm_config.h>
+#endif
 
 static const struct arm_mpu_region mpu_regions[] = {
 	/* Region 0 */
@@ -21,6 +24,14 @@ static const struct arm_mpu_region mpu_regions[] = {
 #endif
 	/* Region 1 */
 	MPU_REGION_ENTRY("SRAM_0",
+#if USE_PARTITION_MANAGER
+			 PM_SRAM_ADDRESS,
+#if defined(CONFIG_ARMV8_M_BASELINE) || defined(CONFIG_ARMV8_M_MAINLINE)
+			 REGION_RAM_ATTR(PM_SRAM_ADDRESS, PM_SRAM_SIZE)),
+#else
+			 REGION_RAM_ATTR(REGION_SRAM_SIZE)),
+#endif
+#else
 			 CONFIG_SRAM_BASE_ADDRESS,
 #if defined(CONFIG_ARMV8_M_BASELINE) || defined(CONFIG_ARMV8_M_MAINLINE)
 			 REGION_RAM_ATTR(CONFIG_SRAM_BASE_ADDRESS, \
@@ -28,6 +39,8 @@ static const struct arm_mpu_region mpu_regions[] = {
 #else
 			 REGION_RAM_ATTR(REGION_SRAM_SIZE)),
 #endif
+
+#endif /* USE_PARTITION_MANAGER */
 };
 
 const struct arm_mpu_config mpu_config = {
diff --git a/cmake/linker/ld/target.cmake b/cmake/linker/ld/target.cmake
index 8c18fce0e9a..ed29e88aa16 100644
--- a/cmake/linker/ld/target.cmake
+++ b/cmake/linker/ld/target.cmake
@@ -80,6 +80,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
       ${current_includes}
       ${soc_linker_script_includes}
       ${template_script_defines}
+      -DUSE_PARTITION_MANAGER=$<OR:$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>,$<BOOL:${IMAGE_NAME}>,$<TARGET_EXISTS:partition_manager>>
       -E ${LINKER_SCRIPT}
       -P # Prevent generation of debug `#line' directives.
       -o ${linker_script_gen}
diff --git a/cmake/modules/kernel.cmake b/cmake/modules/kernel.cmake
index 6a1a48b172d..db07a04b921 100644
--- a/cmake/modules/kernel.cmake
+++ b/cmake/modules/kernel.cmake
@@ -250,3 +250,7 @@ if("${CMAKE_EXTRA_GENERATOR}" STREQUAL "Eclipse CDT4")
   include(${ZEPHYR_BASE}/cmake/ide/eclipse_cdt4_generator_amendment.cmake)
   eclipse_cdt4_generator_amendment(1)
 endif()
+
+if(ZEPHYR_NRF_MODULE_DIR)
+  include(${ZEPHYR_NRF_MODULE_DIR}/cmake/partition_manager.cmake)
+endif()
diff --git a/drivers/flash/soc_flash_nrf.c b/drivers/flash/soc_flash_nrf.c
index c15722082a3..16ab00b9660 100644
--- a/drivers/flash/soc_flash_nrf.c
+++ b/drivers/flash/soc_flash_nrf.c
@@ -37,6 +37,11 @@ LOG_MODULE_REGISTER(flash_nrf);
 
 #define SOC_NV_FLASH_NODE DT_INST(0, soc_nv_flash)
 
+#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER
+#include <soc_secure.h>
+#include <pm_config.h>
+#endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER */
+
 #ifndef CONFIG_SOC_FLASH_NRF_RADIO_SYNC_NONE
 #define FLASH_SLOT_WRITE     7500
 #if defined(CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE)
@@ -166,6 +171,12 @@ static int flash_nrf_read(const struct device *dev, off_t addr,
 	}
 #endif
 
+#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER && PM_APP_ADDRESS
+	if (addr < PM_APP_ADDRESS) {
+		return soc_secure_mem_read(data, (void *)addr, len);
+	}
+#endif
+
 	nrf_nvmc_buffer_read(data, (uint32_t)addr, len);
 
 	return 0;
diff --git a/include/zephyr/arch/arm/cortex_m/scripts/linker.ld b/include/zephyr/arch/arm/cortex_m/scripts/linker.ld
index fb26e91cf61..d6f7a54eb29 100644
--- a/include/zephyr/arch/arm/cortex_m/scripts/linker.ld
+++ b/include/zephyr/arch/arm/cortex_m/scripts/linker.ld
@@ -34,6 +34,39 @@
 #define ROMSTART_REGION ROMABLE_REGION
 #endif
 
+#if USE_PARTITION_MANAGER
+
+#include <pm_config.h>
+
+#if CONFIG_NCS_IS_VARIANT_IMAGE && defined(PM_S0_ID)
+/* We are linking against S1, create symbol containing the flash ID of S0.
+ * This is used when writing code operating on the "other" slot.
+ */
+_image_1_primary_slot_id = PM_S0_ID;
+
+#else /* ! CONFIG_NCS_IS_VARIANT_IMAGE */
+
+#ifdef PM_S1_ID
+/* We are linking against S0, create symbol containing the flash ID of S1.
+ * This is used when writing code operating on the "other" slot.
+ */
+_image_1_primary_slot_id = PM_S1_ID;
+#endif /* PM_S1_ID */
+
+#endif /* CONFIG_NCS_IS_VARIANT_IMAGE */
+
+#define ROM_ADDR PM_ADDRESS
+#define ROM_SIZE PM_SIZE
+
+#if defined(CONFIG_PM_USE_CONFIG_SRAM_SIZE)
+#define RAM_SIZE CONFIG_PM_SRAM_SIZE
+#else
+#define RAM_SIZE PM_SRAM_SIZE
+#endif
+#define RAM_ADDR PM_SRAM_ADDRESS
+
+#else /* ! USE_PARTITION_MANAGER */
+
 #if !defined(CONFIG_XIP) && (CONFIG_FLASH_SIZE == 0)
 #define ROM_ADDR RAM_ADDR
 #else
@@ -66,6 +99,23 @@
 #define RAM_ADDR CONFIG_SRAM_BASE_ADDRESS
 #endif
 
+#endif /* USE_PARTITION_MANAGER */
+
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_ccm), okay)
+#define CCM_SIZE DT_REG_SIZE(DT_CHOSEN(zephyr_ccm))
+#define CCM_ADDR DT_REG_ADDR(DT_CHOSEN(zephyr_ccm))
+#endif
+
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_itcm), okay)
+#define ITCM_SIZE DT_REG_SIZE(DT_CHOSEN(zephyr_itcm))
+#define ITCM_ADDR DT_REG_ADDR(DT_CHOSEN(zephyr_itcm))
+#endif
+
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
+#define DTCM_SIZE DT_REG_SIZE(DT_CHOSEN(zephyr_dtcm))
+#define DTCM_ADDR DT_REG_ADDR(DT_CHOSEN(zephyr_dtcm))
+#endif
+
 #if defined(CONFIG_CUSTOM_SECTION_ALIGN)
 _region_min_align = CONFIG_CUSTOM_SECTION_MIN_ALIGN_SIZE;
 #else
diff --git a/include/zephyr/storage/flash_map.h b/include/zephyr/storage/flash_map.h
index 937e242830a..8943d082861 100644
--- a/include/zephyr/storage/flash_map.h
+++ b/include/zephyr/storage/flash_map.h
@@ -296,6 +296,10 @@ const char *flash_area_label(const struct flash_area *fa);
  */
 uint8_t flash_area_erased_val(const struct flash_area *fa);
 
+#if USE_PARTITION_MANAGER
+#include <flash_map_pm.h>
+#else
+
 /**
  * Returns non-0 value if fixed-partition of given DTS node label exists.
  *
@@ -381,6 +385,8 @@ uint8_t flash_area_erased_val(const struct flash_area *fa);
 #define FIXED_PARTITION_NODE_DEVICE(node) \
 	DEVICE_DT_GET(DT_MTD_FROM_FIXED_PARTITION(node))
 
+#endif /* USE_PARTITION_MANAGER */
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/heap/Kconfig b/lib/heap/Kconfig
index 89ede278006..147659f96a9 100644
--- a/lib/heap/Kconfig
+++ b/lib/heap/Kconfig
@@ -69,7 +69,7 @@ config HEAP_LISTENER
 choice
 	prompt "Supported heap sizes"
 	depends on !64BIT
-	default SYS_HEAP_SMALL_ONLY if (SRAM_SIZE <= 256)
+	default SYS_HEAP_SMALL_ONLY if (SRAM_SIZE <= 256) && !PARTITION_MANAGER_ENABLED
 	default SYS_HEAP_AUTO
 	help
 	  Heaps using reduced-size chunk headers can accommodate so called
diff --git a/lib/libc/common/source/stdlib/malloc.c b/lib/libc/common/source/stdlib/malloc.c
index a75b028000d..505bd50bad0 100644
--- a/lib/libc/common/source/stdlib/malloc.c
+++ b/lib/libc/common/source/stdlib/malloc.c
@@ -25,6 +25,20 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
+#if USE_PARTITION_MANAGER
+
+#include <pm_config.h>
+
+#define RAM_SIZE PM_SRAM_SIZE
+#define RAM_ADDR PM_SRAM_ADDRESS
+
+#else /* ! USE_PARTITION_MANAGER */
+
+#define RAM_SIZE (KB((size_t) CONFIG_SRAM_SIZE))
+#define RAM_ADDR CONFIG_SRAM_BASE_ADDRESS
+
+#endif /* USE_PARTITION_MANAGER */
+
 #ifdef CONFIG_COMMON_LIBC_MALLOC
 
 #if (CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE != 0)
@@ -106,8 +120,8 @@ static POOL_SECTION unsigned char __aligned(HEAP_ALIGN) malloc_arena[HEAP_SIZE];
 extern char _heap_sentry[];
 #    define HEAP_SIZE  ROUND_DOWN((POINTER_TO_UINT(_heap_sentry) - HEAP_BASE), HEAP_ALIGN)
 #   else
-#    define HEAP_SIZE	ROUND_DOWN((KB((size_t) CONFIG_SRAM_SIZE) -	\
-		((size_t) HEAP_BASE - (size_t) CONFIG_SRAM_BASE_ADDRESS)), HEAP_ALIGN)
+#    define HEAP_SIZE	ROUND_DOWN((RAM_SIZE -	\
+		((size_t) HEAP_BASE - (size_t) RAM_ADDR)), HEAP_ALIGN)
 #   endif /* else CONFIG_XTENSA */
 
 #  endif /* else CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE > 0 */
diff --git a/subsys/dfu/boot/mcuboot_shell.c b/subsys/dfu/boot/mcuboot_shell.c
index be4e558713f..e167bc1e39b 100644
--- a/subsys/dfu/boot/mcuboot_shell.c
+++ b/subsys/dfu/boot/mcuboot_shell.c
@@ -20,6 +20,16 @@
 #endif
 #endif
 
+#if USE_PARTITION_MANAGER
+#include <flash_map_pm.h>
+
+#ifdef CONFIG_NCS_IS_VARIANT_IMAGE
+#define ACTIVE_IMAGE_ID PM_MCUBOOT_SECONDARY_ID
+#else
+#define ACTIVE_IMAGE_ID PM_MCUBOOT_PRIMARY_ID
+#endif
+#endif
+
 struct area_desc {
 	const char *name;
 	unsigned int id;
@@ -93,6 +103,35 @@ static int cmd_mcuboot_erase(const struct shell *sh, size_t argc,
 	id = strtoul(argv[1], NULL, 0);
 
 	/* Check if this is the parent (MCUboot) or own slot and if so, deny the request */
+#if USE_PARTITION_MANAGER
+#ifdef PM_MCUBOOT_ID
+	if (id == PM_MCUBOOT_ID || id == PM_MCUBOOT_PAD_ID) {
+		shell_error(sh, "Cannot erase boot partition");
+		return -EACCES;
+	}
+#endif
+
+#ifdef PM_APP_ID
+	if (id == PM_APP_ID) {
+		shell_error(sh, "Cannot erase this area");
+		return -EACCES;
+	}
+#endif
+
+#ifdef PM_MCUBOOT_PRIMARY_APP_ID
+	if (id == PM_MCUBOOT_PRIMARY_APP_ID) {
+		shell_error(sh, "Cannot erase this area");
+		return -EACCES;
+	}
+#endif
+
+#ifdef ACTIVE_IMAGE_ID
+	if (id == ACTIVE_IMAGE_ID) {
+		shell_error(sh, "Cannot erase active partitions");
+		return -EACCES;
+	}
+#endif
+#else
 #if FIXED_PARTITION_EXISTS(boot_partition)
 	if (id == FIXED_PARTITION_ID(boot_partition)) {
 		shell_error(sh, "Cannot erase boot partition");
@@ -105,6 +144,7 @@ static int cmd_mcuboot_erase(const struct shell *sh, size_t argc,
 		shell_error(sh, "Cannot erase active partitions");
 		return -EACCES;
 	}
+#endif
 #endif
 
 	err = boot_erase_img_bank(id);
diff --git a/subsys/fs/littlefs_fs.c b/subsys/fs/littlefs_fs.c
index 5989f856ac1..3d0c71e2367 100644
--- a/subsys/fs/littlefs_fs.c
+++ b/subsys/fs/littlefs_fs.c
@@ -1070,7 +1070,12 @@ struct fs_mount_t FS_FSTAB_ENTRY(DT_DRV_INST(inst)) = { \
 	.type = FS_LITTLEFS, \
 	.mnt_point = DT_INST_PROP(inst, mount_point), \
 	.fs_data = &fs_data_##inst, \
-	.storage_dev = (void *)DT_FIXED_PARTITION_ID(FS_PARTITION(inst)), \
+	.storage_dev = (void *) \
+		COND_CODE_1(USE_PARTITION_MANAGER, \
+			    (COND_CODE_1(FIXED_PARTITION_EXISTS(littlefs_storage), \
+					 (FIXED_PARTITION_ID(littlefs_storage)), \
+					 (FIXED_PARTITION_ID(storage)))), \
+			    (DT_FIXED_PARTITION_ID(FS_PARTITION(inst)))), \
 	.flags = FSTAB_ENTRY_DT_MOUNT_FLAGS(DT_DRV_INST(inst)), \
 };
 
diff --git a/subsys/ipc/rpmsg_service/rpmsg_backend.h b/subsys/ipc/rpmsg_service/rpmsg_backend.h
index a74e46b8520..9996e1d74d9 100644
--- a/subsys/ipc/rpmsg_service/rpmsg_backend.h
+++ b/subsys/ipc/rpmsg_service/rpmsg_backend.h
@@ -13,8 +13,35 @@
 extern "C" {
 #endif
 
+#if CONFIG_PARTITION_MANAGER_ENABLED
+
+#include "pm_config.h"
+
+#if defined(PM_RPMSG_NRF53_SRAM_ADDRESS) || defined(PM__RPMSG_NRF53_SRAM_ADDRESS)
+
+#if defined(PM_RPMSG_NRF53_SRAM_ADDRESS)
+#define VDEV_START_ADDR PM_RPMSG_NRF53_SRAM_ADDRESS
+#define VDEV_SIZE PM_RPMSG_NRF53_SRAM_SIZE
+#else
+/* The current image is a child image in a different domain than the image
+ * which defined the required values. To reach the values of the parent domain
+ * we use the 'PM__' variant of the define.
+ */
+#define VDEV_START_ADDR PM__RPMSG_NRF53_SRAM_ADDRESS
+#define VDEV_SIZE PM__RPMSG_NRF53_SRAM_SIZE
+#endif /* defined(PM_RPMSG_NRF53_SRAM_ADDRESS) */
+
+#else
 #define VDEV_START_ADDR		DT_REG_ADDR(DT_CHOSEN(zephyr_ipc_shm))
 #define VDEV_SIZE		DT_REG_SIZE(DT_CHOSEN(zephyr_ipc_shm))
+#endif /* defined(PM_RPMSG_NRF53_SRAM_ADDRESS) || defined(PM__RPMSG_NRF53_SRAM_ADDRESS) */
+
+#else
+
+#define VDEV_START_ADDR		DT_REG_ADDR(DT_CHOSEN(zephyr_ipc_shm))
+#define VDEV_SIZE		DT_REG_SIZE(DT_CHOSEN(zephyr_ipc_shm))
+
+#endif /* CONFIG_PARTITION_MANAGER_ENABLED */
 
 #define VDEV_STATUS_ADDR	VDEV_START_ADDR
 #define VDEV_STATUS_SIZE	0x400

From 188ec35dc3785cf4e498434ebb55bdf47b08061b Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Fri, 12 Apr 2024 14:13:12 +0200
Subject: [PATCH 0279/2913] [nrf noup] boards: add nrf54l15/nrf54l15/cpuapp/ns
 as board variant

This commit adds the nRF54l15//nrf54l15/cpuapp/ns board variant to
sdk-zephyr. It allows to build nRF54l15pdk with TF-M in nRF Connect SDK.

This is done as a nrf noup patch as the out-of-tree board extension
feature is not available. When zephyrproject-rtos/zephyr#69548 is
completed, then this commit can be reverted and the variant be placed in
sdk-nrf repository.

The nRF54L15 is using the SAU and the MPC to configure the security
attributes for TrustZone. The SPU is only used for the configuration
of the peripherals. This sets the Kconfig configurations for TrustZone
which use the correct region size(based on the MPC) for nRF54L15.

Ref: NCSDK-25023

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
(cherry picked from commit 500609863634bf00a675146dcb78f5137aed330a)
(cherry picked from commit 958c6c34b8b5b140bd54db644f3a94ef940ea245)
---
 boards/nordic/nrf54l15pdk/Kconfig             |  34 +++++
 boards/nordic/nrf54l15pdk/Kconfig.defconfig   |  18 +++
 boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk |   2 +-
 boards/nordic/nrf54l15pdk/board.cmake         |   8 ++
 boards/nordic/nrf54l15pdk/board.yml           |   2 +
 ...rf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi |  38 +++++
 .../nrf54l15pdk_nrf54l15_cpuapp_ns.dts        | 132 ++++++++++++++++++
 .../nrf54l15pdk_nrf54l15_cpuapp_ns.yaml       |  22 +++
 .../nrf54l15pdk_nrf54l15_cpuapp_ns_defconfig  |  31 ++++
 9 files changed, 286 insertions(+), 1 deletion(-)
 create mode 100644 boards/nordic/nrf54l15pdk/Kconfig
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.dts
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.yaml
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns_defconfig

diff --git a/boards/nordic/nrf54l15pdk/Kconfig b/boards/nordic/nrf54l15pdk/Kconfig
new file mode 100644
index 00000000000..8c937c8c890
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/Kconfig
@@ -0,0 +1,34 @@
+# nRF54L15 PDK board configuration
+
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS
+
+config NRF_MPC_REGION_SIZE
+	hex
+	default 0x1000
+	help
+	  Region size for the Memory Protection Controller (MPC) in bytes.
+
+config NRF_TRUSTZONE_FLASH_REGION_SIZE
+	hex
+	default NRF_MPC_REGION_SIZE
+	help
+	  This defines the flash region size from the TRUSTZONE perspective.
+	  It is used when configuring the TRUSTZONE and when setting alignments
+	  requirements for the partitions.
+	  This abstraction allows us to configure TRUSTZONE without depending
+	  on peripheral specific symbols.
+
+config NRF_TRUSTZONE_RAM_REGION_SIZE
+	hex
+	default NRF_MPC_REGION_SIZE
+	help
+	  This defines the RAM region size from the TRUSTZONE perspective.
+	  It is used when configuring the TRUSTZONE and when setting alignments
+	  requirements for the partitions.
+	  This abstraction allows us to configure TRUSTZONE without depending
+	  on peripheral specific symbols.
+
+endif #BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS
diff --git a/boards/nordic/nrf54l15pdk/Kconfig.defconfig b/boards/nordic/nrf54l15pdk/Kconfig.defconfig
index 46df08cfa84..819ddf25aba 100644
--- a/boards/nordic/nrf54l15pdk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l15pdk/Kconfig.defconfig
@@ -12,6 +12,24 @@ config ROM_START_OFFSET
 
 endif # BOARD_NRF54L15PDK_NRF54L15_CPUAPP
 
+if BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS
+
+config BT_CTLR
+	default BT
+
+# By default, if we build for a Non-Secure version of the board,
+# enable building with TF-M as the Secure Execution Environment.
+config BUILD_WITH_TFM
+	default y if BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS
+
+# By default, if we build with TF-M, instruct build system to
+# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
+config TFM_FLASH_MERGED_BINARY
+	default y
+	depends on BUILD_WITH_TFM
+
+endif #BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS
+
 if BOARD_NRF54L15PDK_NRF54L15_CPUFLPR || BOARD_NRF54L15PDK_NRF54L15_CPUFLPR_XIP
 
 # As FLPR has limited memory most of tests does not fit with asserts enabled.
diff --git a/boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk b/boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk
index d5116bd50c6..09afebc2e09 100644
--- a/boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk
+++ b/boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk
@@ -2,6 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF54L15PDK
-	select SOC_NRF54L15_ENGA_CPUAPP if BOARD_NRF54L15PDK_NRF54L15_CPUAPP
+	select SOC_NRF54L15_ENGA_CPUAPP if BOARD_NRF54L15PDK_NRF54L15_CPUAPP || BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS
 	select SOC_NRF54L15_ENGA_CPUFLPR if BOARD_NRF54L15PDK_NRF54L15_CPUFLPR || \
 					    BOARD_NRF54L15PDK_NRF54L15_CPUFLPR_XIP
diff --git a/boards/nordic/nrf54l15pdk/board.cmake b/boards/nordic/nrf54l15pdk/board.cmake
index 4a6a86a8f8a..46a6f896e0c 100644
--- a/boards/nordic/nrf54l15pdk/board.cmake
+++ b/boards/nordic/nrf54l15pdk/board.cmake
@@ -7,6 +7,14 @@ elseif (CONFIG_SOC_NRF54L15_ENGA_CPUFLPR)
   board_runner_args(jlink "--speed=4000")
 endif()
 
+if(BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS)
+  set(TFM_PUBLIC_KEY_FORMAT "full")
+endif()
+
+if(CONFIG_TFM_FLASH_MERGED_BINARY)
+  set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex)
+endif()
+
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf54l15pdk/board.yml b/boards/nordic/nrf54l15pdk/board.yml
index e692040f7bd..5df0270abe3 100644
--- a/boards/nordic/nrf54l15pdk/board.yml
+++ b/boards/nordic/nrf54l15pdk/board.yml
@@ -6,6 +6,8 @@ board:
     variants:
     - name: xip
       cpucluster: cpuflpr
+    - name: ns
+      cpucluster: cpuapp
   revision:
     format: major.minor.patch
     default: "0.3.0"
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi
new file mode 100644
index 00000000000..b4b924e90ef
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+&pinctrl {
+	uart20_default: uart20_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 4)>,
+				<NRF_PSEL(UART_RX, 1, 5)>;
+		};
+	};
+
+	uart20_sleep: uart20_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 4)>,
+				<NRF_PSEL(UART_RX, 1, 5)>;
+			low-power-enable;
+		};
+	};
+
+	uart30_default: uart30_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RX, 0, 1)>;
+		};
+	};
+
+	uart30_sleep: uart30_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RX, 0, 1)>;
+			low-power-enable;
+		};
+	};
+
+};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.dts b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.dts
new file mode 100644
index 00000000000..49fd1ac0ece
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.dts
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/dts-v1/;
+#include <nordic/nrf54l15_cpuapp_ns.dtsi>
+#include "nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi"
+
+/ {
+	chosen {
+		zephyr,console = &uart20;
+		/* TODO: NCSDK-24862: We don't support configuring RRAM and SRAM
+		 * regions in the DTS file yet. The partition manager configures
+		 * these regions now.
+		 */
+		zephyr,shell-uart = &uart20;
+		zephyr,flash = &rram0;
+		zephyr,sram = &sram0;
+		zephyr,ieee802154 = &ieee802154;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		led0: led_0 {
+			gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
+			label = "Green LED 0";
+		};
+		led1: led_1 {
+			gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
+			label = "Green LED 1";
+		};
+		led2: led_2 {
+			gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+			label = "Green LED 2";
+		};
+		led3: led_3 {
+			gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
+			label = "Green LED 3";
+		};
+	};
+
+	buttons {
+		compatible = "gpio-keys";
+		button0: button_0 {
+			gpios = <&gpio1 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button 0";
+			zephyr,code = <INPUT_KEY_0>;
+		};
+		button1: button_1 {
+			gpios = <&gpio1 10 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button 1";
+			zephyr,code = <INPUT_KEY_1>;
+		};
+		button2: button_2 {
+			gpios = <&gpio2 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button 2";
+			zephyr,code = <INPUT_KEY_2>;
+		};
+		button3: button_3 {
+			gpios = <&gpio2 10 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button 3";
+			zephyr,code = <INPUT_KEY_3>;
+		};
+	};
+
+	aliases {
+		led0 = &led0;
+		led1 = &led1;
+		led2 = &led2;
+		led3 = &led3;
+		sw0 = &button0;
+		sw1 = &button1;
+		sw2 = &button2;
+		sw3 = &button3;
+	};
+};
+
+&uart20 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart20_default>;
+	pinctrl-1 = <&uart20_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&uart30 {
+	/* Disable so that TF-M can use this UART */
+	status = "disabled";
+
+	current-speed = <115200>;
+	pinctrl-0 = <&uart30_default>;
+	pinctrl-1 = <&uart30_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&grtc {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpiote30 {
+	status = "okay";
+};
+
+&ieee802154 {
+	status = "okay";
+};
+
+&temp {
+	status = "okay";
+};
+
+&clock {
+	status = "okay";
+};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.yaml b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.yaml
new file mode 100644
index 00000000000..460803eaa53
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.yaml
@@ -0,0 +1,22 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+
+identifier: nrf54l15pdk/nrf54l15/cpuapp/ns
+name: nRF54l15-PDK-nRF54l15-Application-Non-Secure
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+ram: 256
+flash: 1524
+supported:
+  - adc
+  - gpio
+  - i2c
+  - spi
+  - counter
+  - watchdog
+  - adc
+  - i2s
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns_defconfig b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns_defconfig
new file mode 100644
index 00000000000..70f01d7c9ba
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns_defconfig
@@ -0,0 +1,31 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
+
+# Enable TrustZone-M
+CONFIG_ARM_TRUSTZONE_M=y
+
+# This Board implies building Non-Secure firmware
+CONFIG_TRUSTED_EXECUTION_NONSECURE=y
+
+# Don't enable the cache in the non-secure image as it is a
+# secure-only peripheral on 54l
+CONFIG_CACHE_MANAGEMENT=n
+CONFIG_EXTERNAL_CACHE=n
+
+CONFIG_UART_CONSOLE=y
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Start SYSCOUNTER on driver init
+CONFIG_NRF_GRTC_START_SYSCOUNTER=y

From 2afff479b2ef3ed56afbd540e0fa3e7e53a3a0c4 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Fri, 17 May 2024 14:10:51 +0200
Subject: [PATCH 0280/2913] [nrf noup] kernel: Disable boot banner if
 NCS_BOOT_BANNER is enabled

Zephyr's boot banner should not be used if NCS boot banner is enabled.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 2cbe424e8515a3ae2bb006b9971dccb7e9d1618d)
(cherry picked from commit 09e06b63e4ad9b6adda328970a237058c9f5baa7)
---
 kernel/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/Kconfig b/kernel/Kconfig
index 54e0ccf1f2d..e826de402b1 100644
--- a/kernel/Kconfig
+++ b/kernel/Kconfig
@@ -441,6 +441,7 @@ config SKIP_BSS_CLEAR
 config BOOT_BANNER
 	bool "Boot banner"
 	default y
+	depends on !NCS_BOOT_BANNER
 	select PRINTK
 	select EARLY_CONSOLE
 	help

From 045899a31200e2b57627442ced7cb80916270fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B8e?= <sebastian.boe@nordicsemi.no>
Date: Wed, 22 May 2024 15:23:29 +0200
Subject: [PATCH 0281/2913] [nrf noup] boards: nordic: 54L: Complete rewrite of
 the 54l_ns DT
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Complete rewrite of the 54l_ns DT board definition.

Now the secure board and non-secure board re-use a lot more code,
giving us a more maintainable solution.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
(cherry picked from commit e02f019aaac99993da5e39a986c2345eeac22dfc)
(cherry picked from commit c99b07ea11bcd34097d45947426e4573247f01b6)
---
 ...rf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi |  38 ------
 .../nrf54l15pdk_nrf54l15_cpuapp_ns.dts        | 119 ++----------------
 2 files changed, 9 insertions(+), 148 deletions(-)
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi

diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi
deleted file mode 100644
index b4b924e90ef..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
- */
-
-&pinctrl {
-	uart20_default: uart20_default {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 1, 4)>,
-				<NRF_PSEL(UART_RX, 1, 5)>;
-		};
-	};
-
-	uart20_sleep: uart20_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 1, 4)>,
-				<NRF_PSEL(UART_RX, 1, 5)>;
-			low-power-enable;
-		};
-	};
-
-	uart30_default: uart30_default {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 0, 0)>,
-				<NRF_PSEL(UART_RX, 0, 1)>;
-		};
-	};
-
-	uart30_sleep: uart30_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 0, 0)>,
-				<NRF_PSEL(UART_RX, 0, 1)>;
-			low-power-enable;
-		};
-	};
-
-};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.dts b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.dts
index 49fd1ac0ece..6e05c69c5f9 100644
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.dts
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.dts
@@ -1,90 +1,25 @@
 /*
  * Copyright (c) 2024 Nordic Semiconductor ASA
  *
- * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /dts-v1/;
-#include <nordic/nrf54l15_cpuapp_ns.dtsi>
-#include "nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi"
 
-/ {
-	chosen {
-		zephyr,console = &uart20;
-		/* TODO: NCSDK-24862: We don't support configuring RRAM and SRAM
-		 * regions in the DTS file yet. The partition manager configures
-		 * these regions now.
-		 */
-		zephyr,shell-uart = &uart20;
-		zephyr,flash = &rram0;
-		zephyr,sram = &sram0;
-		zephyr,ieee802154 = &ieee802154;
-	};
+#define USE_NON_SECURE_ADDRESS_MAP 1
 
-	leds {
-		compatible = "gpio-leds";
-		led0: led_0 {
-			gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
-			label = "Green LED 0";
-		};
-		led1: led_1 {
-			gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
-			label = "Green LED 1";
-		};
-		led2: led_2 {
-			gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
-			label = "Green LED 2";
-		};
-		led3: led_3 {
-			gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
-			label = "Green LED 3";
-		};
-	};
+#include "nrf54l15_cpuapp_common.dtsi"
 
-	buttons {
-		compatible = "gpio-keys";
-		button0: button_0 {
-			gpios = <&gpio1 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-			label = "Push button 0";
-			zephyr,code = <INPUT_KEY_0>;
-		};
-		button1: button_1 {
-			gpios = <&gpio1 10 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-			label = "Push button 1";
-			zephyr,code = <INPUT_KEY_1>;
-		};
-		button2: button_2 {
-			gpios = <&gpio2 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-			label = "Push button 2";
-			zephyr,code = <INPUT_KEY_2>;
-		};
-		button3: button_3 {
-			gpios = <&gpio2 10 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-			label = "Push button 3";
-			zephyr,code = <INPUT_KEY_3>;
-		};
-	};
+/ {
+	compatible = "nordic,nrf54l15pdk_nrf54l15-cpuapp";
+	model = "Nordic nRF54L15 PDK nRF54L15 Application MCU";
 
-	aliases {
-		led0 = &led0;
-		led1 = &led1;
-		led2 = &led2;
-		led3 = &led3;
-		sw0 = &button0;
-		sw1 = &button1;
-		sw2 = &button2;
-		sw3 = &button3;
+	chosen {
+		zephyr,code-partition = &slot0_partition;
+		zephyr,sram = &cpuapp_sram;
 	};
 };
 
-&uart20 {
-	status = "okay";
-	current-speed = <115200>;
-	pinctrl-0 = <&uart20_default>;
-	pinctrl-1 = <&uart20_sleep>;
-	pinctrl-names = "default", "sleep";
-};
-
 &uart30 {
 	/* Disable so that TF-M can use this UART */
 	status = "disabled";
@@ -94,39 +29,3 @@
 	pinctrl-1 = <&uart30_sleep>;
 	pinctrl-names = "default", "sleep";
 };
-
-&grtc {
-	status = "okay";
-};
-
-&gpio0 {
-	status = "okay";
-};
-
-&gpio1 {
-	status = "okay";
-};
-
-&gpio2 {
-	status = "okay";
-};
-
-&gpiote20 {
-	status = "okay";
-};
-
-&gpiote30 {
-	status = "okay";
-};
-
-&ieee802154 {
-	status = "okay";
-};
-
-&temp {
-	status = "okay";
-};
-
-&clock {
-	status = "okay";
-};

From 710ffc1ae64aa5bb6807baecd79bb143acc9fda8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5vard=20Reierstad?= <haavard.reierstad@nordicsemi.no>
Date: Fri, 31 May 2024 08:21:51 +0200
Subject: [PATCH 0282/2913] =?UTF-8?q?[nrf=20noup]=C2=A0Bluetooth:=20Mesh:?=
 =?UTF-8?q?=20remove=20legacy=20adv=20support?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removes explicit support for the legacy advertiser due
to incompatibility with SDC.

The legacy advertiser can be used (experimentally) with the
Zephyr Link Layer enabled, but is not recommended.

Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit ef0b68942f40531b34ad7797643e6e3b06c90ee1)
(cherry picked from commit f0d20808f749b335aaa53effd515a45c08716748)
---
 subsys/bluetooth/mesh/Kconfig | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 7eced10bd07..3c362ce2641 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -59,12 +59,16 @@ choice BT_MESH_ADV
 
 menuconfig BT_MESH_ADV_LEGACY
 	bool "Legacy advertising"
+	depends on BT_LL_SW_SPLIT
 	help
 	  Use legacy advertising commands for mesh sending. Legacy
-	  advertising is significantly slower than the extended advertising, but
-	  is supported by all controllers.
+	  advertising is significantly slower than the extended advertising.
 
-	  WARNING: The legacy advertiser can occasionally do more message
+	  WARNING: This feature is not supported in NCS. The legacy advertiser will not work
+	  with SDC, as attempting to start an advertisement during the scanner duty cycle
+	  will result in an error. The Zephyr Link Layer can be used experimentally as an
+	  alternative.
+	  The legacy advertiser can occasionally do more message
 	  retransmissions than requested because of limitations of HCI
 	  interface API.
 

From 35df9f232ff779aa117e5f440d556d4903f17142 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Wed, 5 Jun 2024 13:37:34 +0100
Subject: [PATCH 0283/2913] [nrf noup] board: nordic: thingy53: Default to
 update only MCUboot type

Changes the default MCUboot mode to update only for the thingy53,
to align with previous bootloader builds

Changes the thingy53 default configuration for sysbuild to enable
using all RAM in the MCUboot image

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 45ee4ca89cbbb6a2ace1a4963e5a91fe4e2eb8c2)
(cherry picked from commit 55210c0acf751fdd9bcce181b6f05ef680414e81)
---
 boards/nordic/thingy53/Kconfig.sysbuild | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/boards/nordic/thingy53/Kconfig.sysbuild b/boards/nordic/thingy53/Kconfig.sysbuild
index c03d191b370..df489c1dd54 100644
--- a/boards/nordic/thingy53/Kconfig.sysbuild
+++ b/boards/nordic/thingy53/Kconfig.sysbuild
@@ -7,6 +7,10 @@ choice BOOTLOADER
 	default BOOTLOADER_MCUBOOT
 endchoice
 
+choice MCUBOOT_MODE
+	default MCUBOOT_MODE_OVERWRITE_ONLY
+endchoice
+
 config SECURE_BOOT_NETCORE
 	default y
 
@@ -16,6 +20,9 @@ config NETCORE_APP_UPDATE
 config NRF_DEFAULT_EMPTY
 	default y if SECURE_BOOT_NETCORE
 
+config MCUBOOT_USE_ALL_AVAILABLE_RAM
+	default y if BOARD_THINGY53_NRF5340_CPUAPP_NS && BOOTLOADER_MCUBOOT
+
 endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
 
 config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY

From a283f6b726973c4ee4688aa37750cf80bb5cbaf6 Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Wed, 5 Jun 2024 15:41:34 +0200
Subject: [PATCH 0284/2913] [nrf noup] samples/../smp_svr: fix nrf54l15pdk ext
 flash dts overlay

Align to changes in DTS:
  renamed: rram0 -> cpuapp_rram
  sized up cpauapp_rram region szie as part of it was reserved for
  cpuflpr_rram (which is not used by this config).

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
(cherry picked from commit 9f0fbc024b317e37564b5b5da94eb0e870d194d7)
(cherry picked from commit 2ad71549639b0107aa70fa432415d9c9666f4416)
---
 .../boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
index 76b648903a0..ddbd39f4bde 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
@@ -13,7 +13,8 @@
 
 /delete-node/ &storage_partition;
 
-&rram0 {
+&cpuapp_rram {
+	reg = < 0x0 DT_SIZE_K(1524) >;
 	partitions {
 		boot_partition: partition@0 {
 			label = "mcuboot";

From 29b2233c624721668927f692d7a67b1430068249 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Wed, 12 Jun 2024 16:15:29 +0200
Subject: [PATCH 0285/2913] [nrf noup] samples: sysbuild: hello_world: support
 PM on nRF53

PM support is still required for nRF53/nRF54l15 in the context of NCS.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit db9a16b511b64cdb01b9d072d5dbdaff1fca717d)
(cherry picked from commit cce8f989758be7da70bd6169d6a4e0335a45cffa)
---
 samples/sysbuild/hello_world/sysbuild.cmake | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/samples/sysbuild/hello_world/sysbuild.cmake b/samples/sysbuild/hello_world/sysbuild.cmake
index c7c2615c665..8f8fc49dbff 100644
--- a/samples/sysbuild/hello_world/sysbuild.cmake
+++ b/samples/sysbuild/hello_world/sysbuild.cmake
@@ -11,5 +11,17 @@ ExternalZephyrProject_Add(
   BOARD ${SB_CONFIG_REMOTE_BOARD}
 )
 
+if(SB_CONFIG_SOC_SERIES_NRF53X)
+  set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUNET)
+  set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES remote)
+  set_property(GLOBAL PROPERTY DOMAIN_APP_CPUNET remote)
+  set(CPUNET_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "")
+else(SB_CONFIG_SOC_SERIES_NRF54LX)
+  set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUFLPR)
+  set_property(GLOBAL APPEND PROPERTY PM_CPUFLPR_IMAGES remote)
+  set_property(GLOBAL PROPERTY DOMAIN_APP_CPUFLPR remote)
+  set(CPUFLPR_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "")
+endif()
+
 add_dependencies(${DEFAULT_IMAGE} remote)
 sysbuild_add_dependencies(FLASH ${DEFAULT_IMAGE} remote)

From aa850001cd2334aa9a0e74fcdba8e639e6edd30b Mon Sep 17 00:00:00 2001
From: Damian Krolik <damian.krolik@nordicsemi.no>
Date: Mon, 25 Sep 2023 16:41:15 +0200
Subject: [PATCH 0286/2913] [nrf noup] settings: nvs: use dedicated lookup
 cache hash function

Introduce NVS_LOOKUP_CACHE_FOR_SETTINGS Kconfig option that
enables a dedicated hash function for the NVS lookup cache
that takes advantage of the NVS ID allocation scheme used
by the NVS settings backend. As such, this option should
only be used if an application uses NVS via the settings
layer.

Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>
(cherry picked from commit a25c11c78d911e8362bf6838dce381343f311877)
(cherry picked from commit 524213d499490df612a5767a4b27767c65596217)
---
 subsys/fs/nvs/Kconfig |  9 +++++++++
 subsys/fs/nvs/nvs.c   | 46 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/subsys/fs/nvs/Kconfig b/subsys/fs/nvs/Kconfig
index 8b7dfdbab40..b3bd46c5b76 100644
--- a/subsys/fs/nvs/Kconfig
+++ b/subsys/fs/nvs/Kconfig
@@ -29,6 +29,15 @@ config NVS_LOOKUP_CACHE_SIZE
 	  Number of entries in Non-volatile Storage lookup cache.
 	  It is recommended that it be a power of 2.
 
+config NVS_LOOKUP_CACHE_FOR_SETTINGS
+	bool "Non-volatile Storage lookup cache optimized for settings"
+	depends on NVS_LOOKUP_CACHE
+	help
+	  Use the lookup cache hash function that results in the least number of
+	  collissions and, in turn, the best NVS performance provided that the NVS
+	  is used as the settings backend only. This option should NOT be enabled
+	  if the NVS is also written to directly, outside the settings layer.
+
 config NVS_DATA_CRC
 	bool "Non-volatile Storage CRC protection on the data"
 	help
diff --git a/subsys/fs/nvs/nvs.c b/subsys/fs/nvs/nvs.c
index 9e6578a5576..28bd5655c14 100644
--- a/subsys/fs/nvs/nvs.c
+++ b/subsys/fs/nvs/nvs.c
@@ -13,6 +13,11 @@
 #include <zephyr/sys/crc.h>
 #include "nvs_priv.h"
 
+#ifdef CONFIG_NVS_LOOKUP_CACHE_FOR_SETTINGS
+#include <zephyr/sys/util.h>
+#include <settings/settings_nvs.h>
+#endif
+
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(fs_nvs, CONFIG_NVS_LOG_LEVEL);
 
@@ -21,6 +26,45 @@ static int nvs_ate_valid(struct nvs_fs *fs, const struct nvs_ate *entry);
 
 #ifdef CONFIG_NVS_LOOKUP_CACHE
 
+#ifdef CONFIG_NVS_LOOKUP_CACHE_FOR_SETTINGS
+
+static inline size_t nvs_lookup_cache_pos(uint16_t id)
+{
+	/*
+	 * 1. The NVS settings backend uses up to (NVS_NAME_ID_OFFSET - 1) NVS IDs to
+	      store keys and equal number of NVS IDs to store values.
+	 * 2. For each key-value pair, the value is stored at NVS ID greater by exactly
+	 *    NVS_NAME_ID_OFFSET than NVS ID that holds the key.
+	 * 3. The backend tries to minimize the range of NVS IDs used to store keys.
+	 *    That is, NVS IDs are allocated sequentially, and freed NVS IDs are reused
+	 *    before allocating new ones.
+	 *
+	 * Therefore, to assure the least number of collisions in the lookup cache,
+	 * the least significant bit of the hash indicates whether the given NVS ID
+	 * represents a key or a value, and remaining bits of the hash are set to
+	 * the ordinal number of the key-value pair. Consequently, the hash function
+	 * provides the following mapping:
+	 *
+	 * 1st settings key   => hash 0
+	 * 1st settings value => hash 1
+	 * 2nd settings key   => hash 2
+	 * 2nd settings value => hash 3
+	 * ...
+	 */
+	BUILD_ASSERT(IS_POWER_OF_TWO(NVS_NAMECNT_ID), "NVS_NAMECNT_ID is not power of 2");
+	BUILD_ASSERT(IS_POWER_OF_TWO(NVS_NAME_ID_OFFSET), "NVS_NAME_ID_OFFSET is not power of 2");
+
+	uint16_t key_value_bit;
+	uint16_t key_value_ord;
+
+	key_value_bit = (id >> LOG2(NVS_NAME_ID_OFFSET)) & 1;
+	key_value_ord = id & (NVS_NAME_ID_OFFSET - 1);
+
+	return ((key_value_ord << 1) | key_value_bit) % CONFIG_NVS_LOOKUP_CACHE_SIZE;
+}
+
+#else /* CONFIG_NVS_LOOKUP_CACHE_FOR_SETTINGS */
+
 static inline size_t nvs_lookup_cache_pos(uint16_t id)
 {
 	uint16_t hash;
@@ -36,6 +80,8 @@ static inline size_t nvs_lookup_cache_pos(uint16_t id)
 	return hash % CONFIG_NVS_LOOKUP_CACHE_SIZE;
 }
 
+#endif /* CONFIG_NVS_LOOKUP_CACHE_FOR_SETTINGS */
+
 static int nvs_lookup_cache_rebuild(struct nvs_fs *fs)
 {
 	int rc;

From 0d8345e043b78b9cbea34abfe508eff0ae5fd7b1 Mon Sep 17 00:00:00 2001
From: Kamil Gawor <Kamil.Gawor@nordicsemi.no>
Date: Tue, 9 Apr 2024 14:24:34 +0200
Subject: [PATCH 0287/2913] [nrf noup] entropy: Add fake entropy nRF PRNG
 driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This adds temporary entropy driver simulation for
nRF54h20 device since final entropy source is not
available yet.

TODO: Remove this commit when proper solution will
be available.

Jira: NCSDK-25947

Signed-off-by: Kamil Gawor <Kamil.Gawor@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Andreas Moltumyr <andreas.moltumyr@nordicsemi.no>
Signed-off-by: Karol Lasończyk <karol.lasonczyk@nordicsemi.no>
(cherry picked from commit c162b4c52cd4b9a86053a1c5862c6612dad142d9)
(cherry picked from commit 153f347f4da58d18fa854c9122fbfaa861a61765)
---
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts |   6 ++
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts |   5 +
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts  |   6 ++
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts  |   5 +
 drivers/entropy/CMakeLists.txt                |   7 ++
 drivers/entropy/Kconfig                       |   1 +
 drivers/entropy/Kconfig.nrf_prng              |  19 ++++
 drivers/entropy/fake_entropy_nrf_prng.c       | 101 ++++++++++++++++++
 dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi      |   9 ++
 dts/bindings/rng/nordic,nrf-prng.yaml         |   8 ++
 10 files changed, 167 insertions(+)
 create mode 100644 drivers/entropy/Kconfig.nrf_prng
 create mode 100644 drivers/entropy/fake_entropy_nrf_prng.c
 create mode 100644 dts/bindings/rng/nordic,nrf-prng.yaml

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index c85b911302f..1868ba8c331 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -26,6 +26,7 @@
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,canbus = &can120;
+		zephyr,entropy = &prng;
 	};
 
 	aliases {
@@ -106,6 +107,11 @@
 			pwms = <&pwm130 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
 		};
 	};
+
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
+	};
 };
 
 &cpuapp_ram0x_region {
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
index cb8fb9e1a02..049617e6dc6 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
@@ -27,6 +27,11 @@
 		zephyr,ieee802154 = &cpurad_ieee802154;
 		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
+		zephyr,entropy = &prng;
+	};
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
 	};
 	aliases {
 		ipc-to-cpusys = &cpurad_cpusys_ipc;
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index aff2a15e6c1..2ce9b912269 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -28,6 +28,7 @@
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,canbus = &can120;
+		zephyr,entropy = &prng;
 	};
 
 	aliases {
@@ -108,6 +109,11 @@
 			pwms = <&pwm130 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
 		};
 	};
+
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
+	};
 };
 
 &cpuapp_ram0x_region {
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
index f9bfae09897..f1f3af54132 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
@@ -28,6 +28,11 @@
 		zephyr,ieee802154 = &cpurad_ieee802154;
 		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
+		zephyr,entropy = &prng;
+	};
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
 	};
 	aliases {
 		ipc-to-cpusys = &cpurad_cpusys_ipc;
diff --git a/drivers/entropy/CMakeLists.txt b/drivers/entropy/CMakeLists.txt
index 8a67fc3a03e..ea5e9fb8683 100644
--- a/drivers/entropy/CMakeLists.txt
+++ b/drivers/entropy/CMakeLists.txt
@@ -36,4 +36,11 @@ zephyr_library_sources_ifdef(CONFIG_ENTROPY_NPCX_DRBG                 entropy_np
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_MAX32_TRNG                entropy_max32.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_RENESAS_RA_RSIP_E51A_TRNG entropy_renesas_ra.c)
 
+if (CONFIG_FAKE_ENTROPY_NRF_PRNG)
+  zephyr_library_sources(fake_entropy_nrf_prng.c)
+
+  message(WARNING "\nA nRF PRNG is used, which does not produce real random bits."
+  "This is not secure and should therefore never be used in a product.")
+endif()
+
 zephyr_library_link_libraries_ifdef(CONFIG_BUILD_WITH_TFM tfm_api)
diff --git a/drivers/entropy/Kconfig b/drivers/entropy/Kconfig
index debd0f8d7a1..40571df47f1 100644
--- a/drivers/entropy/Kconfig
+++ b/drivers/entropy/Kconfig
@@ -38,6 +38,7 @@ source "drivers/entropy/Kconfig.psa_crypto"
 source "drivers/entropy/Kconfig.npcx"
 source "drivers/entropy/Kconfig.max32"
 source "drivers/entropy/Kconfig.renesas_ra"
+source "drivers/entropy/Kconfig.nrf_prng"
 
 config ENTROPY_HAS_DRIVER
 	bool
diff --git a/drivers/entropy/Kconfig.nrf_prng b/drivers/entropy/Kconfig.nrf_prng
new file mode 100644
index 00000000000..e81db4de4b1
--- /dev/null
+++ b/drivers/entropy/Kconfig.nrf_prng
@@ -0,0 +1,19 @@
+# nRF fake entropy prng generator driver configuration
+
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if ENTROPY_GENERATOR
+
+config FAKE_ENTROPY_NRF_PRNG
+	bool "A fake nRF entropy driver"
+	default y
+	depends on DT_HAS_NORDIC_ENTROPY_PRNG_ENABLED
+	depends on (SOC_SERIES_NRF54HX || SOC_SERIES_NRF92X || SOC_SERIES_NRF54LX)
+	select ENTROPY_HAS_DRIVER
+	help
+	  This is a super simple PRNG driver that can be used on nRF platforms that
+	  do not have an entropy source.
+	  This is NOT SAFE to use for cryptographic operations!
+
+endif
diff --git a/drivers/entropy/fake_entropy_nrf_prng.c b/drivers/entropy/fake_entropy_nrf_prng.c
new file mode 100644
index 00000000000..8624c844405
--- /dev/null
+++ b/drivers/entropy/fake_entropy_nrf_prng.c
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/init.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <zephyr/drivers/entropy.h>
+
+#define DT_DRV_COMPAT nordic_entropy_prng
+
+/* This file implements a pseudo-RNG
+ * https://vigna.di.unimi.it/xorshift/xoshiro128plus.c
+ */
+
+static uint32_t s[4];
+
+static inline uint32_t rotl(const uint32_t x, int k)
+{
+	return (x << k) | (x >> (32 - k));
+}
+
+static uint32_t rng_next(void)
+{
+	const uint32_t result = rotl(s[0] + s[3], 7) + s[0];
+
+	const uint32_t t = s[1] << 9;
+
+	s[2] ^= s[0];
+	s[3] ^= s[1];
+	s[1] ^= s[2];
+	s[0] ^= s[3];
+
+	s[2] ^= t;
+
+	s[3] = rotl(s[3], 11);
+
+	return result;
+}
+
+static int entropy_prng_get_entropy(const struct device *dev, uint8_t *buffer, uint16_t length)
+{
+	ARG_UNUSED(dev);
+
+	while (length) {
+		/*
+		 * Note that only 1 thread (Zephyr thread or HW models), runs at
+		 * a time, therefore there is no need to use random_r()
+		 */
+		uint32_t value = rng_next();
+
+		size_t to_copy = MIN(length, sizeof(long));
+
+		memcpy(buffer, &value, to_copy);
+		buffer += to_copy;
+		length -= to_copy;
+	}
+
+	return 0;
+}
+
+static int entropy_prng_get_entropy_isr(const struct device *dev, uint8_t *buf, uint16_t len,
+					uint32_t flags)
+{
+	ARG_UNUSED(flags);
+
+	int err;
+
+	/*
+	 * entropy_prng_get_entropy() is also safe for ISRs
+	 * and always produces data.
+	 */
+	err = entropy_prng_get_entropy(dev, buf, len);
+	if (err < 0) {
+		return err;
+	} else {
+		return len;
+	}
+}
+
+static int entropy_prng_init(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	/* Picked some arbitrary initial seed. */
+	s[0] = 0xAF568BC0;
+	s[1] = 0xAC34307E;
+	s[2] = 0x9B7F6DD1;
+	s[3] = 0xD84319FC;
+	return 0;
+}
+
+static const struct entropy_driver_api entropy_prng_api_funcs = {
+	.get_entropy = entropy_prng_get_entropy, .get_entropy_isr = entropy_prng_get_entropy_isr};
+
+DEVICE_DT_INST_DEFINE(0, entropy_prng_init, NULL, NULL, NULL, PRE_KERNEL_1,
+		      CONFIG_ENTROPY_INIT_PRIORITY, &entropy_prng_api_funcs);
diff --git a/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi b/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
index 8a331371f1c..d8fffc93808 100644
--- a/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
@@ -11,6 +11,10 @@ systick: &cpuapp_systick {};
 nvic: &cpuapp_nvic {};
 
 / {
+	chosen {
+		zephyr,entropy = &prng;
+	};
+
 	soc {
 		compatible = "simple-bus";
 		interrupt-parent = <&cpuapp_nvic>;
@@ -21,6 +25,11 @@ nvic: &cpuapp_nvic {};
 		compatible = "zephyr,psa-crypto-rng";
 		status = "disabled";
 	};
+
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
+	};
 };
 
 &cpuapp_ppb {
diff --git a/dts/bindings/rng/nordic,nrf-prng.yaml b/dts/bindings/rng/nordic,nrf-prng.yaml
new file mode 100644
index 00000000000..8936393a0b6
--- /dev/null
+++ b/dts/bindings/rng/nordic,nrf-prng.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+
+description: This is a super simple PRNG
+
+compatible: "nordic,entropy-prng"
+
+include: base.yaml

From f787d7b1dd2cd768dd849c95f00ecac6b399b005 Mon Sep 17 00:00:00 2001
From: Jan Zyczkowski <jan.zyczkowski@nordicsemi.no>
Date: Mon, 24 Jun 2024 13:20:33 +0200
Subject: [PATCH 0288/2913] [nrf noup] boards: nordic: Turn off MRAM suspend
 for NRF54H20 DK

Turn off suspending MRAM for NRF54H20 DK
This change is required so sections of code
depending on critical timings will not have unacceptable latency.

Turn on NRFS globally so turning off
suspending MRAM for NRF54H20 DK will work.

Signed-off-by: Jan Zyczkowski <jan.zyczkowski@nordicsemi.no>
(cherry picked from commit 38f2104a801b1db40ab4596f972c0178f21821c5)
(cherry picked from commit 0c206ac0b3a522236078540b27a2bf3fa45650de)
---
 boards/nordic/nrf54h20dk/CMakeLists.txt |  6 +++
 boards/nordic/nrf54h20dk/board.c        | 58 +++++++++++++++++++++++++
 modules/hal_nordic/nrfs/Kconfig         |  3 ++
 3 files changed, 67 insertions(+)
 create mode 100644 boards/nordic/nrf54h20dk/CMakeLists.txt
 create mode 100644 boards/nordic/nrf54h20dk/board.c

diff --git a/boards/nordic/nrf54h20dk/CMakeLists.txt b/boards/nordic/nrf54h20dk/CMakeLists.txt
new file mode 100644
index 00000000000..a5a06d8805a
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/CMakeLists.txt
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+if(CONFIG_NRFS_MRAM_SERVICE_ENABLED)
+  zephyr_library_sources(board.c)
+endif()
diff --git a/boards/nordic/nrf54h20dk/board.c b/boards/nordic/nrf54h20dk/board.c
new file mode 100644
index 00000000000..0699e93a7c3
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/board.c
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/init.h>
+
+#define MODULE mram_suspend_off
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(MODULE);
+
+#include <services/nrfs_mram.h>
+#include <nrfs_backend_ipc_service.h>
+
+#define MRAM_SUSPEND_OFF_INIT_PRIO 90
+
+void mram_latency_handler(nrfs_mram_latency_evt_t const *p_evt, void *context)
+{
+	switch (p_evt->type) {
+	case NRFS_MRAM_LATENCY_REQ_APPLIED:
+		LOG_DBG("MRAM latency handler: response received");
+		break;
+	case NRFS_MRAM_LATENCY_REQ_REJECTED:
+		LOG_ERR("MRAM latency handler - request rejected!");
+		break;
+	default:
+		LOG_ERR("MRAM latency handler - unexpected event: 0x%x", p_evt->type);
+		break;
+	}
+}
+
+static int turn_off_suspend_mram(void)
+{
+	/* Turn off mram automatic suspend as it causes delays in time depended code sections. */
+
+	nrfs_err_t err = NRFS_SUCCESS;
+
+	/* Wait for ipc initialization */
+	nrfs_backend_wait_for_connection(K_FOREVER);
+
+	err = nrfs_mram_init(mram_latency_handler);
+	if (err != NRFS_SUCCESS) {
+		LOG_ERR("MRAM service init failed: %d", err);
+	} else {
+		LOG_DBG("MRAM service initialized");
+	}
+
+	LOG_DBG("MRAM: set latency: NOT ALLOWED");
+	err = nrfs_mram_set_latency(MRAM_LATENCY_NOT_ALLOWED, NULL);
+	if (err) {
+		LOG_ERR("MRAM: set latency failed (%d)", err);
+	}
+
+	return err;
+}
+
+SYS_INIT(turn_off_suspend_mram, APPLICATION, MRAM_SUSPEND_OFF_INIT_PRIO);
diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig
index 96d4c7f45cd..cf7c9be939b 100644
--- a/modules/hal_nordic/nrfs/Kconfig
+++ b/modules/hal_nordic/nrfs/Kconfig
@@ -43,6 +43,8 @@ config NRFS
 				    SOC_NRF9280_CPUAPP || \
 				    SOC_NRF9280_CPURAD
 	depends on HAS_NRFS
+	depends on !MISRA_SANE
+	default y if !ZTEST
 	help
 	  This option enables the nRF Services library.
 
@@ -77,6 +79,7 @@ config NRFS_RESET_SERVICE_ENABLED
 config NRFS_MRAM_SERVICE_ENABLED
 	bool "MRAM latency service"
 	depends on NRFS_HAS_MRAM_SERVICE
+	default y
 
 config NRFS_TEMP_SERVICE_ENABLED
 	bool "Temperature service"

From a2ca5957e9657ce3a1eb09b493c110c3f5319be3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B8e?= <sebastian.boe@nordicsemi.no>
Date: Fri, 24 May 2024 15:32:07 +0200
Subject: [PATCH 0289/2913] [nrf noup] soc: nordic: nrf54l: Skip clock
 configuration from ns
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Do not permit configuring clocks from non-secure as NRF_OSCILLATORS is
a not supported as a non-secure peripheral

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
(cherry picked from commit 000963ceeed9daec09e7565e0da757869b1644e1)
(cherry picked from commit 4d1f964df070b42976d65cbff8983eaa806e2826)
---
 soc/nordic/nrf54l/Kconfig | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index 0ad48f7c9c1..8c670b9355e 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -51,10 +51,18 @@ config SOC_NRF54L15_CPUFLPR
 if SOC_SERIES_NRF54LX
 
 config SOC_NRF54LX_SKIP_CLOCK_CONFIG
-	bool "Skip clock frequency configuration in system initialization"
+	bool
+	prompt "Skip clock frequency configuration in system initialization" if TRUSTED_EXECUTION_SECURE
+	default y if TRUSTED_EXECUTION_NONSECURE
 	help
-	  With this option, the CPU clock frequency is not set during system initialization.
-	  The CPU runs with the default, hardware-selected frequency.
+	  With this option, the CPU clock frequency is not set during this
+	  Zephyr image's system initialization. The CPU runs with either
+	  the HW reset values, or with the configuration set by an image
+	  earlier in the boot chain.
+
+	  Note that for security reasons it is not supported to configure
+	  the clock peripheral (NRF_OSCILLATORS) from the non-secure
+	  domain.
 
 config SOC_NRF54LX_DISABLE_FICR_TRIMCNF
 	bool "Disable trimming of the device"

From ee23470a8947f4a98445b7543798e084fa8a6ff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B8e?= <sebastian.boe@nordicsemi.no>
Date: Fri, 24 May 2024 15:34:47 +0200
Subject: [PATCH 0290/2913] [nrf noup] soc: nordic: nrf54l: Port Soc.c to be
 compatible with TFM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In this patch we do several things to be able to configure power and
clocks when NRF_OSCILLATORS and NRF_REGULATORS is secure.

We port soc.c to TF-M so that the TF-M image can do the same
configuration that would normally be done by the Zephyr image.

This is done by explicitly including autoconf.h for instance.

We also ifdef-out the configuration when nordicsemi_nrf54l_init is
invoked from a non-secure image, because the peripherals are secure.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
(cherry picked from commit 962fa00fcd23a4a758c3489fc40c1b2e94e07810)
(cherry picked from commit 028f0c4c054e79e0c1fae1f0f905112c4b12544c)
---
 soc/nordic/nrf54l/soc.c | 65 +++++++++++++++++++++++++++++++----------
 1 file changed, 49 insertions(+), 16 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index f70675517b8..fa5099989c7 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -12,13 +12,21 @@
  * for the Nordic Semiconductor nRF54L family processor.
  */
 
+#ifdef __NRF_TFM__
+#include <autoconf.h>
+#endif
+
 #include <zephyr/devicetree.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 #include <zephyr/kernel.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
+
+#ifndef __NRF_TFM__
 #include <zephyr/cache.h>
+#endif
+
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 #if defined(NRF_APPLICATION)
@@ -39,17 +47,9 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 #define HFXO_NODE DT_NODELABEL(hfxo)
 #endif
 
-static int nordicsemi_nrf54l_init(void)
-{
-	/* Update the SystemCoreClock global variable with current core clock
-	 * retrieved from hardware state.
-	 */
-	SystemCoreClockUpdate();
-
 #if defined(NRF_APPLICATION)
-	/* Enable ICACHE */
-	sys_cache_instr_enable();
-
+static inline void power_and_clock_configuration(void)
+{
 #if DT_ENUM_HAS_VALUE(LFXO_NODE, load_capacitors, internal)
 	uint32_t xosc32ktrim = NRF_FICR->XOSC32KTRIM;
 
@@ -76,16 +76,16 @@ static int nordicsemi_nrf54l_init(void)
 	 * NOTE: The desired capacitance value is used in encoded from in INTCAP calculation formula
 	 *       That is different than in case of HFXO.
 	 */
-	uint32_t cap_val_encoded = (((DT_PROP(LFXO_NODE, load_capacitance_femtofarad) - 4000UL)
-				     * 2UL) / 1000UL);
+	uint32_t cap_val_encoded =
+		(((DT_PROP(LFXO_NODE, load_capacitance_femtofarad) - 4000UL) * 2UL) / 1000UL);
 
 	/* Calculation of INTCAP code before rounding. Min that calculations here are done on
 	 * values multiplied by 2^9, e.g. 0.765625 * 2^9 = 392.
 	 * offset_k should be divided by 2^6, but to add it to value shifted by 2^9 we have to
 	 * multiply it be 2^3.
 	 */
-	uint32_t mid_val = (cap_val_encoded - 4UL) * (uint32_t)(slope_k + 392UL)
-			   + (offset_k << 3UL);
+	uint32_t mid_val =
+		(cap_val_encoded - 4UL) * (uint32_t)(slope_k + 392UL) + (offset_k << 3UL);
 
 	/* Get integer part of the INTCAP code */
 	uint32_t lfxo_intcap = mid_val >> 9UL;
@@ -131,8 +131,9 @@ static int nordicsemi_nrf54l_init(void)
 	 */
 	uint32_t cap_val_femto_f = DT_PROP(HFXO_NODE, load_capacitance_femtofarad);
 
-	uint32_t mid_val_intcap = (((cap_val_femto_f - 5500UL) * (uint32_t)(slope_m + 791UL))
-		 + (offset_m << 2UL) * 1000UL) >> 8UL;
+	uint32_t mid_val_intcap = (((cap_val_femto_f - 5500UL) * (uint32_t)(slope_m + 791UL)) +
+				   (offset_m << 2UL) * 1000UL) >>
+				  8UL;
 
 	/* Convert the calculated value to piko Farads */
 	uint32_t hfxo_intcap = mid_val_intcap / 1000;
@@ -159,8 +160,40 @@ static int nordicsemi_nrf54l_init(void)
 #if defined(CONFIG_ELV_GRTC_LFXO_ALLOWED)
 	nrf_regulators_elv_mode_allow_set(NRF_REGULATORS, NRF_REGULATORS_ELV_ELVGRTCLFXO_MASK);
 #endif /* CONFIG_ELV_GRTC_LFXO_ALLOWED */
+}
 #endif /* NRF_APPLICATION */
 
+int nordicsemi_nrf54l_init(void)
+{
+	/* Update the SystemCoreClock global variable with current core clock
+	 * retrieved from hardware state.
+	 */
+#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(__NRF_TFM__)
+	/* Currently not supported for non-secure */
+	SystemCoreClockUpdate();
+#endif
+
+#ifdef __NRF_TFM__
+	/* TF-M enables the instruction cache from target_cfg.c, so we
+	 * don't need to enable it here.
+	 */
+#else
+	/* Enable ICACHE */
+	sys_cache_instr_enable();
+#endif
+
+	/* NRF_REGULATORS and NRF_OSCILLATORS are configured to be secure
+	 * as NRF_REGULATORS.POFCON is needed by the secure domain to
+	 * prevent glitches when the power supply is attacked.
+	 *
+	 * NRF_OSCILLATORS is also configured as secure because of a HW limitation
+	 * that requires them to be configured with the same security property.
+	 */
+#if (defined(NRF_APPLICATION) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)) ||                  \
+	defined(__NRF_TFM__)
+	power_and_clock_configuration();
+#endif
+
 	return 0;
 }
 

From 4605159c7d01e4c79dc86b690ad884427a8778df Mon Sep 17 00:00:00 2001
From: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Date: Mon, 8 Jul 2024 10:08:10 +0200
Subject: [PATCH 0291/2913] [nrf noup] ci: Enable action-manifest-pr

This action will automatically manage a PR to sdk-nrf
once a PR to sdk-zephyr is created.

This includes:
 - Creating an initial PR
 - Updating and (optionally) rebase it once the PR
   to sdk-nrf is merged.

The action can be disabled by adding the string
"manifest-pr-skip" to the title or body of the PR.

This will simplify cherry-picking changes from upstream
zephyr.

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
(cherry picked from commit f2b5914ad3e3c79463d43886c70f6436c0d51158)
(cherry picked from commit 43a09d77eedb5de4b404295c37230345b0ea01ec)
---
 .github/workflows/manifest-PR.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/workflows/manifest-PR.yml

diff --git a/.github/workflows/manifest-PR.yml b/.github/workflows/manifest-PR.yml
new file mode 100644
index 00000000000..a871aa381de
--- /dev/null
+++ b/.github/workflows/manifest-PR.yml
@@ -0,0 +1,17 @@
+name: handle manifest PR
+on:
+  pull_request_target:
+    types: [opened, synchronize, closed]
+    branches:
+      - main
+
+
+jobs:
+  call-manifest-pr-action:
+    runs-on: ubuntu-latest
+    steps:
+      - name: handle manifest PR
+        uses: nrfconnect/action-manifest-pr@main
+        with:
+          token: ${{ secrets.NCS_GITHUB_TOKEN }}
+          manifest-pr-title-details: ${{ github.event.pull_request.title }}

From 4279ea34588eb8a8339fbcb069a4e18039aac1d1 Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Fri, 21 Jun 2024 13:25:22 +0200
Subject: [PATCH 0292/2913] [nrf noup] soc: nrf54l: Add custom section for KMU

Add a custom section in the linker which should always
be placed in the top of RAM. This will be used by the
KMU to push keys into it. Since when you provision a key
into the KMU you need to set specific a memory location
for the PUSH operation we need to keep this memory location
static across images/dfus.

This is a noup since the KMU is not supported upstream.

Ref: NCSDK-25121

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
(cherry picked from commit 9ce3906acd7ebb3d82ae699b24965d6eff2a47f1)
(cherry picked from commit 95d3bde051b31af162a12a2e194555bf82be566e)
---
 soc/nordic/nrf54l/CMakeLists.txt           |  9 +++++++++
 soc/nordic/nrf54l/kmu_push_area_section.ld | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 soc/nordic/nrf54l/kmu_push_area_section.ld

diff --git a/soc/nordic/nrf54l/CMakeLists.txt b/soc/nordic/nrf54l/CMakeLists.txt
index f1c18291fc6..bf2eaa1d820 100644
--- a/soc/nordic/nrf54l/CMakeLists.txt
+++ b/soc/nordic/nrf54l/CMakeLists.txt
@@ -10,3 +10,12 @@ zephyr_include_directories(.)
 if(CONFIG_ELV_GRTC_LFXO_ALLOWED)
   message(WARNING "WARNING! ELV mode feature is EXPERIMENTAL and may brick your device!")
 endif()
+
+# We need a buffer in memory in a static location which can be used by
+# the KMU peripheral. The KMU has a static destination address, we chose
+# this address to be 0x20000000, which is the first address in the SRAM.
+if(NOT CONFIG_BUILD_WITH_TFM AND CONFIG_PSA_NEED_CRACEN_KMU_DRIVER)
+# Exclamation mark is printable character with the lowest number in ASCII table.
+# We are sure that this file will be included first.
+zephyr_linker_sources(RAM_SECTIONS SORT_KEY ! kmu_push_area_section.ld)
+endif()
diff --git a/soc/nordic/nrf54l/kmu_push_area_section.ld b/soc/nordic/nrf54l/kmu_push_area_section.ld
new file mode 100644
index 00000000000..e8c8cd9f09a
--- /dev/null
+++ b/soc/nordic/nrf54l/kmu_push_area_section.ld
@@ -0,0 +1,19 @@
+# This section must be loaded first of all the
+# custom sections because we want it to be placed
+# at the top address of RAM.
+SECTION_PROLOGUE(NRF_KMU_RESERVED_PUSH_SECTION,(NOLOAD) ,)
+{
+    __nrf_kmu_reserved_push_area = .;
+    *(.nrf_kmu_reserved_push_area)
+    __nrf_kmu_reserved_push_area_end = .;
+} GROUP_NOLOAD_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
+
+# It doesn't seem to be possible to enforce placing a section
+# at a specific address in memory using the Zephyr SECTION macros.
+# So this assert is necessary to avoid accidentatly moving this
+# section to a different address.
+ASSERT(__nrf_kmu_reserved_push_area == RAM_ADDR, "Error:  \
+ The section NRF_KMU_RESERVED_PUSH_SECTION needs to be    \
+ placed on the top RAM address but it is not, please edit \
+ your linker scripts to make sure that it is placed on    \
+ the to RAM address.")

From 22ab87b0f9928a688de6c7c07a7ac667819ae9a0 Mon Sep 17 00:00:00 2001
From: Mateusz Michalek <mateusz.michalek@nordicsemi.no>
Date: Mon, 17 Jun 2024 14:57:09 +0200
Subject: [PATCH 0293/2913] [nrf noup] drivers: flash: kconfig: nrf_rram region
 resolution

adjusting region resolution to match erase-block-size

Signed-off-by: Mateusz Michalek <mateusz.michalek@nordicsemi.no>
(cherry picked from commit 91f2d7e57d764ca7128aa63237aa4c6d8bb48067)
(cherry picked from commit 0ac95a4ae3870a24764e4f4e0e7f7e3527ddfdbe)
---
 drivers/flash/Kconfig.nrf_rram | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/flash/Kconfig.nrf_rram b/drivers/flash/Kconfig.nrf_rram
index 6251f2e90b4..8c45f8b36bb 100644
--- a/drivers/flash/Kconfig.nrf_rram
+++ b/drivers/flash/Kconfig.nrf_rram
@@ -70,14 +70,14 @@ config SOC_FLASH_NRF_TIMEOUT_MULTIPLIER
 
 config NRF_RRAM_REGION_ADDRESS_RESOLUTION
 	hex
-	default 0x400
+	default 0x1000
 	help
 	  RRAMC's region protection address resolution.
 	  Applies to region with configurable start address.
 
 config NRF_RRAM_REGION_SIZE_UNIT
 	hex
-	default 0x400
+	default 0x1000
 	help
 	  Base unit for the size of RRAMC's region protection.
 

From f47a9b8666778709e9e031854511566d55ce3ad4 Mon Sep 17 00:00:00 2001
From: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Date: Tue, 16 Jul 2024 14:43:30 +0200
Subject: [PATCH 0294/2913] [nrf noup] dts: Add Bluetooth Controller to
 nRF54H20

The nRF54H20 supports a Bluetooth controller.
The HCI driver interface has changed upstream in
https://github.com/zephyrproject-rtos/zephyr/pull/72323
so now we need to add it to device tree.

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
(cherry picked from commit 25e862583514fb24c4b378e5418b56a83ca8a226)
(cherry picked from commit 8b26afdb33a2879595d541f84bc6176611b5dc70)
---
 dts/arm/nordic/nrf54h20_cpurad.dtsi | 8 ++++++++
 dts/common/nordic/nrf54h20.dtsi     | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/dts/arm/nordic/nrf54h20_cpurad.dtsi b/dts/arm/nordic/nrf54h20_cpurad.dtsi
index 2d2fdee8d27..2cfda47afc5 100644
--- a/dts/arm/nordic/nrf54h20_cpurad.dtsi
+++ b/dts/arm/nordic/nrf54h20_cpurad.dtsi
@@ -23,6 +23,10 @@ wdt011: &cpurad_wdt011 {};
 /delete-node/ &cpuflpr;
 
 / {
+	chosen {
+		zephyr,bt-hci = &bt_hci_controller;
+	};
+
 	soc {
 		compatible = "simple-bus";
 		interrupt-parent = <&cpurad_nvic>;
@@ -99,3 +103,7 @@ wdt011: &cpurad_wdt011 {};
 &dppic020 {
 	status = "okay";
 };
+
+&bt_hci_controller {
+	status = "okay";
+};
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 2aa647316c0..29ae6888df0 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -427,6 +427,14 @@
 					compatible = "nordic,nrf-ieee802154";
 					status = "disabled";
 				};
+
+				/* Note: In the nRF Connect SDK the SoftDevice Controller
+				 * is added and set as the default Bluetooth Controller.
+				 */
+				bt_hci_controller: bt_hci_controller {
+					compatible = "zephyr,bt-hci-ll-sw-split";
+					status = "disabled";
+				};
 			};
 
 			ccm030: ccm@3a000 {

From 26fcb4f0c4427912619cda058f7777d8f6625d03 Mon Sep 17 00:00:00 2001
From: Marek Pieta <Marek.Pieta@nordicsemi.no>
Date: Fri, 14 Jun 2024 09:13:48 +0200
Subject: [PATCH 0295/2913] [nrf noup] bluetooth: att: Allow ATT sent callback
 after data TX is done

By default, the BLE stack calls sent callback for ATT data when the data
is passed to BLE controller for transmission. Enabling this Kconfig
option delays calling the sent callback until data transmission is
finished by BLE controller (the callback is delayed until receiving the
num complete packets event).

Jira: NCSDK-27422

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
(cherry picked from commit 5f3a56cc40c98cd12b7c34f638c68abb9907b89d)
(cherry picked from commit 857dc90a072026e54d63b54ccddc4ac50ee2fc1a)
---
 subsys/bluetooth/host/Kconfig.gatt | 17 +++++++++++++++++
 subsys/bluetooth/host/att.c        | 17 ++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/subsys/bluetooth/host/Kconfig.gatt b/subsys/bluetooth/host/Kconfig.gatt
index 77bf0191740..c3751359512 100644
--- a/subsys/bluetooth/host/Kconfig.gatt
+++ b/subsys/bluetooth/host/Kconfig.gatt
@@ -38,6 +38,23 @@ config BT_ATT_RETRY_ON_SEC_ERR
 	  If an ATT request fails due to insufficient security, the host will
 	  try to elevate the security level and retry the ATT request.
 
+config BT_ATT_SENT_CB_AFTER_TX
+	bool "Delay ATT sent callback until data transmission is done by controller [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	help
+	  By default, the BLE stack calls sent callback for ATT data when the
+	  data is passed to BLE controller for transmission. Enabling this
+	  Kconfig option delays calling the sent callback until data
+	  transmission is finished by BLE controller (the callback is called
+	  upon receiving the Number of Completed Packets HCI Event).
+
+	  The feature is not available in Zephyr RTOS (it's specific to NCS
+	  Zephyr fork). It is a temporary solution allowing to control flow of
+	  GATT notifications with HID reports for HID use-case.
+
+	  Enabling this option may require increasing CONFIG_BT_CONN_TX_MAX in
+	  configuration, because ATT would use additional TX contexts.
+
 config BT_EATT
 	bool "Enhanced ATT Bearers support [EXPERIMENTAL]"
 	depends on BT_L2CAP_ECRED
diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c
index 5ecb86ce7ef..7af47a6a3b8 100644
--- a/subsys/bluetooth/host/att.c
+++ b/subsys/bluetooth/host/att.c
@@ -316,6 +316,13 @@ static void att_sent(void *user_data)
 	bt_att_sent(chan);
 }
 
+static void chan_sent_cb(struct bt_conn *conn, void *user_data, int err)
+{
+	struct net_buf *nb = user_data;
+
+	net_buf_unref(nb);
+}
+
 /* In case of success the ownership of the buffer is transferred to the stack
  * which takes care of releasing it when it completes transmitting to the
  * controller.
@@ -409,7 +416,15 @@ static int chan_send(struct bt_att_chan *chan, struct net_buf *buf)
 
 	data->att_chan = chan;
 
-	err = bt_l2cap_send_pdu(&chan->chan, buf, NULL, NULL);
+	if (IS_ENABLED(CONFIG_BT_ATT_SENT_CB_AFTER_TX)) {
+		err = bt_l2cap_send_pdu(&chan->chan, buf, chan_sent_cb, net_buf_ref(buf));
+		if (err) {
+			net_buf_unref(buf);
+		}
+	} else {
+		err = bt_l2cap_send_pdu(&chan->chan, buf, NULL, NULL);
+	}
+
 	if (err) {
 		if (err == -ENOBUFS) {
 			LOG_ERR("Ran out of TX buffers or contexts.");

From ccd2f6324256a9dd7cdba83b1b4b8f5627df77ac Mon Sep 17 00:00:00 2001
From: Marek Pieta <Marek.Pieta@nordicsemi.no>
Date: Fri, 14 Jun 2024 12:08:55 +0200
Subject: [PATCH 0296/2913] [nrf noup] bluetooth: conn: Allow for an extra ref
 in bt_l2cap_send_pdu

Allow for an additional buffer reference if callback is provided. This
can be used to extend lifetime of the net buffer until the data
transmission is confirmed by ACK of the remote.

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
(cherry picked from commit b0ce7fe23a0c83ce3038baf2b8899e0e6b1497fc)
(cherry picked from commit 76e660aea0df44bb425d96c45ac91efe4b828564)
---
 subsys/bluetooth/host/conn.c  | 8 +++++++-
 subsys/bluetooth/host/l2cap.c | 8 ++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 40f7d7906cc..f4aab1e2d9d 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -695,7 +695,13 @@ static int send_buf(struct bt_conn *conn, struct net_buf *buf,
 
 	uint16_t frag_len = MIN(conn_mtu(conn), len);
 
-	__ASSERT_NO_MSG(buf->ref == 1);
+	if (buf->ref > 1 + (cb ? 1 : 0)) {
+		/* Allow for an additional buffer reference if callback is provided.
+		 * This can be used to extend lifetime of the net buffer until the
+		 * data transmission is confirmed by ACK of the remote.
+		 */
+		__ASSERT_NO_MSG(false);
+	}
 
 	if (buf->len > frag_len) {
 		LOG_DBG("keep %p around", buf);
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index 1b25f838fa3..8747eae4791 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -717,13 +717,17 @@ static void cancel_data_ready(struct bt_l2cap_le_chan *le_chan)
 int bt_l2cap_send_pdu(struct bt_l2cap_le_chan *le_chan, struct net_buf *pdu,
 		      bt_conn_tx_cb_t cb, void *user_data)
 {
-	if (pdu->ref != 1) {
+	/* Allow for an additional buffer reference if callback is provided. This can be used to
+	 * extend lifetime of the net buffer until the data transmission is confirmed by ACK of the
+	 * remote.
+	 */
+	if (pdu->ref > 1 + (cb ? 1 : 0)) {
 		/* The host may alter the buf contents when fragmenting. Higher
 		 * layers cannot expect the buf contents to stay intact. Extra
 		 * refs suggests a silent data corruption would occur if not for
 		 * this error.
 		 */
-		LOG_ERR("Expecting 1 ref, got %d", pdu->ref);
+		LOG_ERR("Expecting up to %d refs, got %d", cb ? 2 : 1, pdu->ref);
 		return -EINVAL;
 	}
 

From eefa2fee0b36fb0a502e7b44fc4a2d90e5cf23bb Mon Sep 17 00:00:00 2001
From: Marek Pieta <Marek.Pieta@nordicsemi.no>
Date: Wed, 7 Aug 2024 10:29:21 +0200
Subject: [PATCH 0297/2913] [nrf noup] bluetooth: conn: Skip buffer ref count
 check in send_buf

If ATT sent callback is delayed until data transmission is done by BLE
controller, the transmitted buffer may have an additional reference. The
reference is used to extend lifetime of the net buffer until the data
transmission is confirmed by ACK of the remote.

send_buf function can be called multiple times, if buffer has to be
fragmented over HCI. In that case, the callback is provided as an
argument only for the last transmitted fragment. The `buf->ref == 1`
check is skipped because it's impossible to properly validate number of
references for the sent fragments if buffers may have the additional
reference.

Jira: NCSDK-28624

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
(cherry picked from commit 687cefae54d14d19010ec95b6a6a89eedb6da5b0)
(cherry picked from commit f4839963124fd628ea3b10541633b8293cbc6e48)
---
 subsys/bluetooth/host/conn.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index f4aab1e2d9d..5e853d57be1 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -695,13 +695,17 @@ static int send_buf(struct bt_conn *conn, struct net_buf *buf,
 
 	uint16_t frag_len = MIN(conn_mtu(conn), len);
 
-	if (buf->ref > 1 + (cb ? 1 : 0)) {
-		/* Allow for an additional buffer reference if callback is provided.
-		 * This can be used to extend lifetime of the net buffer until the
-		 * data transmission is confirmed by ACK of the remote.
-		 */
-		__ASSERT_NO_MSG(false);
-	}
+	/* If ATT sent callback is delayed until data transmission is done by BLE controller, the
+	 * transmitted buffer may have an additional reference. The reference is used to extend
+	 * lifetime of the net buffer until the data transmission is confirmed by ACK of the remote.
+	 *
+	 * send_buf function can be called multiple times, if buffer has to be fragmented over HCI.
+	 * In that case, the callback is provided as an argument only for the last transmitted
+	 * fragment. The `buf->ref == 1` check is skipped because it's impossible to properly
+	 * validate number of references for the sent fragments if buffers may have the additional
+	 * reference.
+	 */
+	__ASSERT_NO_MSG(IS_ENABLED(CONFIG_BT_ATT_SENT_CB_AFTER_TX) || (buf->ref == 1));
 
 	if (buf->len > frag_len) {
 		LOG_DBG("keep %p around", buf);

From 88307ffd820675f23d265483bdb19e6008250b6b Mon Sep 17 00:00:00 2001
From: Sigurd Hellesvik <sigurd.hellesvik@nordicsemi.no>
Date: Fri, 23 Aug 2024 11:24:06 +0200
Subject: [PATCH 0298/2913] [nrf noup] board: nordic_ thingy53: Enable QSPI by
 default

The Thingy:53 enabled MCUboot and external flash by default.
Therefore, it should also enable drivers for its external
flash by default.

Signed-off-by: Sigurd Hellesvik <sigurd.hellesvik@nordicsemi.no>
(cherry picked from commit 240776aa32267997eb80e68238066e127fe63de3)
(cherry picked from commit 72ce0c9115fce64a048cf8f6d072da2e0b2aae4b)
---
 boards/nordic/thingy53/Kconfig.defconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/boards/nordic/thingy53/Kconfig.defconfig b/boards/nordic/thingy53/Kconfig.defconfig
index c2e13fad0ab..31ac0093ba2 100644
--- a/boards/nordic/thingy53/Kconfig.defconfig
+++ b/boards/nordic/thingy53/Kconfig.defconfig
@@ -145,6 +145,9 @@ config MCUBOOT_USB_SUPPORT
 	bool
 	default n
 
+config NORDIC_QSPI_NOR
+	default y
+
 endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
 
 if BOARD_THINGY53_NRF5340_CPUNET

From 324f8ae1d82cb5edd3fb9eb8763965baed12dda4 Mon Sep 17 00:00:00 2001
From: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Date: Thu, 22 Aug 2024 10:06:28 +0200
Subject: [PATCH 0299/2913] [nrf noup] snippets: Add snippet for the Zephyr
 Bluetooth Controller

By defining this snippet it becomes simpler to build an application
for the Zephyr Bluetooth Controller as it removes the need
for adding boilerplate overlay files to applications.

This snippet is only needed in NCS because the SoftDevice
Controller is the default and supported controller.

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
(cherry picked from commit e36c39febc1517cbfa9b0dd1132d1fdc0addbbb2)
(cherry picked from commit 3866916ffcaf7a8332bbd115d7c98ad6ce026238)
---
 snippets/bt-ll-sw-split/README.rst            | 21 +++++++++++++++++++
 snippets/bt-ll-sw-split/bt-ll-sw-split.conf   |  3 +++
 .../bt-ll-sw-split/bt-ll-sw-split.overlay     | 13 ++++++++++++
 snippets/bt-ll-sw-split/snippet.yml           |  4 ++++
 4 files changed, 41 insertions(+)
 create mode 100644 snippets/bt-ll-sw-split/README.rst
 create mode 100644 snippets/bt-ll-sw-split/bt-ll-sw-split.conf
 create mode 100644 snippets/bt-ll-sw-split/bt-ll-sw-split.overlay
 create mode 100644 snippets/bt-ll-sw-split/snippet.yml

diff --git a/snippets/bt-ll-sw-split/README.rst b/snippets/bt-ll-sw-split/README.rst
new file mode 100644
index 00000000000..490d45be36c
--- /dev/null
+++ b/snippets/bt-ll-sw-split/README.rst
@@ -0,0 +1,21 @@
+.. _snippet-bt-ll-sw-split:
+
+Zephyr Bluetooth LE Controller (bt-ll-sw-split)
+###############################################
+
+.. code-block:: console
+
+   west build -S bt-ll-sw-split [...]
+
+Overview
+********
+
+This snippet changes the default Bluetooth controller to the Zephyr Bluetooth LE Controller.
+
+Requirements
+************
+
+Hardware support for:
+
+- :kconfig:option:`CONFIG_BT`
+- :kconfig:option:`CONFIG_BT_CTLR`
diff --git a/snippets/bt-ll-sw-split/bt-ll-sw-split.conf b/snippets/bt-ll-sw-split/bt-ll-sw-split.conf
new file mode 100644
index 00000000000..f2dd622901b
--- /dev/null
+++ b/snippets/bt-ll-sw-split/bt-ll-sw-split.conf
@@ -0,0 +1,3 @@
+CONFIG_BT=y
+CONFIG_BT_CTLR=y
+CONFIG_BT_LL_SW_SPLIT=y
diff --git a/snippets/bt-ll-sw-split/bt-ll-sw-split.overlay b/snippets/bt-ll-sw-split/bt-ll-sw-split.overlay
new file mode 100644
index 00000000000..a57a0e82ba6
--- /dev/null
+++ b/snippets/bt-ll-sw-split/bt-ll-sw-split.overlay
@@ -0,0 +1,13 @@
+&bt_hci_controller {
+	status = "okay";
+};
+
+&bt_hci_sdc {
+	status = "disabled";
+};
+
+/ {
+	chosen {
+		zephyr,bt-hci = &bt_hci_controller;
+	};
+};
diff --git a/snippets/bt-ll-sw-split/snippet.yml b/snippets/bt-ll-sw-split/snippet.yml
new file mode 100644
index 00000000000..27a7325dc7e
--- /dev/null
+++ b/snippets/bt-ll-sw-split/snippet.yml
@@ -0,0 +1,4 @@
+name: bt-ll-sw-split
+append:
+  EXTRA_CONF_FILE: bt-ll-sw-split.conf
+  EXTRA_DTC_OVERLAY_FILE: bt-ll-sw-split.overlay

From a83be5d3b0f9545f7efe044e5eb1789dbcec4e8d Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Mon, 9 Sep 2024 08:31:03 +0100
Subject: [PATCH 0300/2913] [nrf noup] mgmt: mcumgr: grp: img_mgmt: Add
 handling for QSPI XIP

Adds handling code to allow selecting the correct image slot when
using QSPI XIP in DirectXIP mode

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 872eb08b4b0a669d90a7e563665f29bf24995c35)
(cherry picked from commit 51fc731750da32a34f3c27a1665f4358437a3c26)
---
 subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig        | 8 ++++++++
 subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig b/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
index 56030a1cd5c..5e6da1e0ba7 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
@@ -201,6 +201,14 @@ config MCUMGR_GRP_IMG_IMAGE_SLOT_STATE_STATES
 	  The value does not affect memory allocation, it is used by zcbor
 	  to figure out how to encode map depending on its predicted size.
 
+config MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE
+	bool "QSPI XIP Split image mode"
+	depends on MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP
+	help
+	  This option should not be selected by users and should automatically be selected by
+	  sysbuild if needed. This enables selecting the correct slot when running a QSPI XIP
+	  split image application in DirectXIP mode.
+
 module = MCUMGR_GRP_IMG
 module-str = mcumgr_grp_img
 source "subsys/logging/Kconfig.template.log_config"
diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
index 28fca251ac8..e10953a155a 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
@@ -159,6 +159,12 @@ int img_mgmt_active_slot(int image)
 	/* Multi image does not support DirectXIP currently */
 #if CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER > 1
 	slot = (image << 1);
+
+#if CONFIG_MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE
+	if (FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot1_partition)) {
+		slot += 1;
+	}
+#endif
 #else
 	/* This covers single image, including DirectXiP */
 	if (FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot1_partition)) {

From 7db6fe0372890ceb24f9c644203261ba242f5792 Mon Sep 17 00:00:00 2001
From: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Date: Thu, 5 Sep 2024 08:04:15 +0200
Subject: [PATCH 0301/2913] [nrf noup] dts: Select SoftDevice Controller DTS
 binding as default

The SoftDevice Controller is a different controller than
the open source link layer with a different set of quirks.
It should therefore have its own device tree binding.

This commit converts the SoftDevice Controller driver
to use this new DTS binding instead of reusing the existing one.

This commit updates or adds additional overlays for
existing samples, applications and tests that were using the
open source link layer.

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
(cherry picked from commit 8d6a853718ee5be65221d5187fa32793e44b8bdb)
(cherry picked from commit ecd4e3dce7a4f6e17ea9ede20480ecbce98617bf)
---
 dts/arm/nordic/nrf52805.dtsi                  |  11 +-
 dts/arm/nordic/nrf52810.dtsi                  |  11 +-
 dts/arm/nordic/nrf52811.dtsi                  |  11 +-
 dts/arm/nordic/nrf52820.dtsi                  |  11 +-
 dts/arm/nordic/nrf52832.dtsi                  |  11 +-
 dts/arm/nordic/nrf52833.dtsi                  |  11 +-
 dts/arm/nordic/nrf52840.dtsi                  |   9 +-
 dts/arm/nordic/nrf5340_cpunet.dtsi            |  11 +-
 dts/arm/nordic/nrf54h20_cpurad.dtsi           |   4 +-
 dts/arm/nordic/nrf54l15_cpuapp.dtsi           |   2 +-
 dts/common/nordic/nrf54h20.dtsi               |   7 +-
 dts/common/nordic/nrf54l15.dtsi               |   7 +-
 .../bluetooth/bap_broadcast_sink/sample.yaml  |   4 +-
 .../bap_broadcast_source/sample.yaml          |   4 +-
 .../bap_broadcast_source/sysbuild.cmake       |   4 +
 .../bluetooth/bap_unicast_client/sample.yaml  |   4 +-
 .../bap_unicast_client/sysbuild.cmake         |   4 +
 .../bluetooth/bap_unicast_server/sample.yaml  |   4 +-
 .../bap_unicast_server/sysbuild.cmake         |   4 +
 samples/bluetooth/beacon/sample.yaml          |   4 +-
 .../bluetooth/cap_initiator/sysbuild.cmake    |   4 +
 .../direction_finding_central/sample.yaml     |  15 ++-
 .../sample.yaml                               |  14 ++-
 .../sample.yaml                               |  14 ++-
 .../direction_finding_peripheral/sample.yaml  |  15 ++-
 samples/bluetooth/hci_ipc/sample.yaml         |  34 ++++--
 samples/bluetooth/hci_uart/sample.yaml        |  18 +++-
 samples/bluetooth/hci_vs_scan_req/sample.yaml |   2 +
 samples/bluetooth/iso_central/sample.yaml     |   6 +-
 .../pbp_public_broadcast_sink/sample.yaml     |   4 +-
 .../pbp_public_broadcast_sink/sysbuild.cmake  |   4 +
 .../pbp_public_broadcast_source/sample.yaml   |   4 +-
 .../sysbuild.cmake                            |   4 +
 .../controller/ll_sw/nordic/lll/lll.c         |   2 +-
 .../controller/ctrl_api/testcase.yaml         |   2 +
 .../controller/ctrl_chmu/testcase.yaml        |   2 +
 .../controller/ctrl_cis_create/testcase.yaml  |   2 +
 .../ctrl_cis_terminate/testcase.yaml          |   2 +
 .../controller/ctrl_collision/testcase.yaml   |   2 +
 .../controller/ctrl_conn_update/testcase.yaml |  11 +-
 .../controller/ctrl_cte_req/testcase.yaml     |   2 +
 .../ctrl_data_length_update/testcase.yaml     |  10 +-
 .../controller/ctrl_encrypt/testcase.yaml     |   2 +
 .../ctrl_feature_exchange/testcase.yaml       |   2 +
 .../controller/ctrl_hci/testcase.yaml         |   2 +
 .../controller/ctrl_invalid/testcase.yaml     |   2 +
 .../controller/ctrl_le_ping/testcase.yaml     |   2 +
 .../ctrl_min_used_chans/testcase.yaml         |   2 +
 .../controller/ctrl_phy_update/testcase.yaml  |   6 +-
 .../controller/ctrl_sca_update/testcase.yaml  |   2 +
 .../controller/ctrl_sw_privacy/testcase.yaml  |   2 +
 .../controller/ctrl_terminate/testcase.yaml   |   2 +
 .../ctrl_tx_buffer_alloc/testcase.yaml        |  22 +++-
 .../controller/ctrl_tx_queue/testcase.yaml    |   2 +
 .../controller/ctrl_unsupported/testcase.yaml |   6 +-
 .../controller/ctrl_user_ext/testcase.yaml    |   2 +
 .../controller/ctrl_version/testcase.yaml     |   2 +
 .../df/connection_cte_req/testcase.yaml       |   2 +
 .../df/connection_cte_tx_params/testcase.yaml |   2 +
 .../connectionless_cte_chains/testcase.yaml   |   2 +
 .../df/connectionless_cte_rx/testcase.yaml    |   2 +
 .../df/connectionless_cte_tx/testcase.yaml    |   2 +
 tests/bluetooth/init/testcase.yaml            | 101 +++++++++++++-----
 63 files changed, 362 insertions(+), 118 deletions(-)

diff --git a/dts/arm/nordic/nrf52805.dtsi b/dts/arm/nordic/nrf52805.dtsi
index bd768ca85fe..8966c4bf684 100644
--- a/dts/arm/nordic/nrf52805.dtsi
+++ b/dts/arm/nordic/nrf52805.dtsi
@@ -11,7 +11,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -97,12 +97,13 @@
 			status = "okay";
 			ble-2mbps-supported;
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
index 7cdca229120..8758a6354b8 100644
--- a/dts/arm/nordic/nrf52810.dtsi
+++ b/dts/arm/nordic/nrf52810.dtsi
@@ -7,7 +7,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -101,12 +101,13 @@
 			status = "okay";
 			ble-2mbps-supported;
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi
index 99815337203..b14df8b567a 100644
--- a/dts/arm/nordic/nrf52811.dtsi
+++ b/dts/arm/nordic/nrf52811.dtsi
@@ -11,7 +11,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -113,12 +113,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52820.dtsi b/dts/arm/nordic/nrf52820.dtsi
index 1553a6481d2..601a4f8c7ed 100644
--- a/dts/arm/nordic/nrf52820.dtsi
+++ b/dts/arm/nordic/nrf52820.dtsi
@@ -11,7 +11,7 @@
 / {
 
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -115,12 +115,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK another Bluetooth controller
-			 * is added and set as the default.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
index d40d48eb947..b722d183da8 100644
--- a/dts/arm/nordic/nrf52832.dtsi
+++ b/dts/arm/nordic/nrf52832.dtsi
@@ -7,7 +7,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -101,12 +101,13 @@
 			status = "okay";
 			ble-2mbps-supported;
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi
index b3661a2ebe0..d81a8953fda 100644
--- a/dts/arm/nordic/nrf52833.dtsi
+++ b/dts/arm/nordic/nrf52833.dtsi
@@ -11,7 +11,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -115,12 +115,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index 85520958568..238d6318537 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -103,12 +103,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf5340_cpunet.dtsi b/dts/arm/nordic/nrf5340_cpunet.dtsi
index 77b77759b22..0da1e06866f 100644
--- a/dts/arm/nordic/nrf5340_cpunet.dtsi
+++ b/dts/arm/nordic/nrf5340_cpunet.dtsi
@@ -9,7 +9,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -102,12 +102,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf54h20_cpurad.dtsi b/dts/arm/nordic/nrf54h20_cpurad.dtsi
index 2cfda47afc5..e8ff2dac3a4 100644
--- a/dts/arm/nordic/nrf54h20_cpurad.dtsi
+++ b/dts/arm/nordic/nrf54h20_cpurad.dtsi
@@ -24,7 +24,7 @@ wdt011: &cpurad_wdt011 {};
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 	};
 
 	soc {
@@ -104,6 +104,6 @@ wdt011: &cpurad_wdt011 {};
 	status = "okay";
 };
 
-&bt_hci_controller {
+&bt_hci_sdc {
 	status = "okay";
 };
diff --git a/dts/arm/nordic/nrf54l15_cpuapp.dtsi b/dts/arm/nordic/nrf54l15_cpuapp.dtsi
index 458d5a2e12a..21d5d1dd6f7 100644
--- a/dts/arm/nordic/nrf54l15_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l15_cpuapp.dtsi
@@ -32,7 +32,7 @@ nvic: &cpuapp_nvic {};
 	};
 };
 
-&bt_hci_controller {
+&bt_hci_sdc {
 	status = "okay";
 };
 
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 29ae6888df0..c2923d2732a 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -428,9 +428,10 @@
 					status = "disabled";
 				};
 
-				/* Note: In the nRF Connect SDK the SoftDevice Controller
-				 * is added and set as the default Bluetooth Controller.
-				 */
+				bt_hci_sdc: bt_hci_sdc {
+					compatible = "nordic,bt-hci-sdc";
+					status = "disabled";
+				};
 				bt_hci_controller: bt_hci_controller {
 					compatible = "zephyr,bt-hci-ll-sw-split";
 					status = "disabled";
diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index 737c1d5a199..1df4c4f53c5 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -219,9 +219,10 @@
 					status = "disabled";
 				};
 
-				/* Note: In the nRF Connect SDK the SoftDevice Controller
-				 * is added and set as the default Bluetooth Controller.
-				 */
+				bt_hci_sdc: bt_hci_sdc {
+					compatible = "nordic,bt-hci-sdc";
+					status = "disabled";
+				};
 				bt_hci_controller: bt_hci_controller {
 					compatible = "zephyr,bt-hci-ll-sw-split";
 					status = "disabled";
diff --git a/samples/bluetooth/bap_broadcast_sink/sample.yaml b/samples/bluetooth/bap_broadcast_sink/sample.yaml
index b6360768f0a..e19e17d57a0 100644
--- a/samples/bluetooth/bap_broadcast_sink/sample.yaml
+++ b/samples/bluetooth/bap_broadcast_sink/sample.yaml
@@ -24,5 +24,7 @@ tests:
       - nrf52_bsim
       - nrf52833dk/nrf52833
       - nrf52840dongle/nrf52840
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/bap_broadcast_source/sample.yaml b/samples/bluetooth/bap_broadcast_source/sample.yaml
index 27262103b29..4b9b7c705e5 100644
--- a/samples/bluetooth/bap_broadcast_source/sample.yaml
+++ b/samples/bluetooth/bap_broadcast_source/sample.yaml
@@ -25,5 +25,7 @@ tests:
       - nrf52_bsim
       - nrf52833dk/nrf52833
       - nrf52840dongle/nrf52840
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/bap_broadcast_source/sysbuild.cmake b/samples/bluetooth/bap_broadcast_source/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/bap_broadcast_source/sysbuild.cmake
+++ b/samples/bluetooth/bap_broadcast_source/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/bap_unicast_client/sample.yaml b/samples/bluetooth/bap_unicast_client/sample.yaml
index 536ab9144f0..e69083f2669 100644
--- a/samples/bluetooth/bap_unicast_client/sample.yaml
+++ b/samples/bluetooth/bap_unicast_client/sample.yaml
@@ -22,5 +22,7 @@ tests:
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52dk/nrf52832
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/bap_unicast_client/sysbuild.cmake b/samples/bluetooth/bap_unicast_client/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/bap_unicast_client/sysbuild.cmake
+++ b/samples/bluetooth/bap_unicast_client/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/bap_unicast_server/sample.yaml b/samples/bluetooth/bap_unicast_server/sample.yaml
index fc14175a2d1..744833234b9 100644
--- a/samples/bluetooth/bap_unicast_server/sample.yaml
+++ b/samples/bluetooth/bap_unicast_server/sample.yaml
@@ -22,5 +22,7 @@ tests:
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52dk/nrf52832
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/bap_unicast_server/sysbuild.cmake b/samples/bluetooth/bap_unicast_server/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/bap_unicast_server/sysbuild.cmake
+++ b/samples/bluetooth/bap_unicast_server/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/beacon/sample.yaml b/samples/bluetooth/beacon/sample.yaml
index 6952be223ec..48a235b481c 100644
--- a/samples/bluetooth/beacon/sample.yaml
+++ b/samples/bluetooth/beacon/sample.yaml
@@ -17,7 +17,9 @@ tests:
       - nrf52dk/nrf52832
       - nrf54l15dk/nrf54l15/cpuapp
   sample.bluetooth.beacon-coex:
-    extra_args: CONF_FILE="prj-coex.conf"
+    extra_args:
+      - CONF_FILE="prj-coex.conf"
+      - SNIPPET="bt-ll-sw-split"
     harness: bluetooth
     platform_allow:
       - nrf52840dk/nrf52840
diff --git a/samples/bluetooth/cap_initiator/sysbuild.cmake b/samples/bluetooth/cap_initiator/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/cap_initiator/sysbuild.cmake
+++ b/samples/bluetooth/cap_initiator/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/direction_finding_central/sample.yaml b/samples/bluetooth/direction_finding_central/sample.yaml
index b0c94537b51..c1d1adae2c4 100644
--- a/samples/bluetooth/direction_finding_central/sample.yaml
+++ b/samples/bluetooth/direction_finding_central/sample.yaml
@@ -14,15 +14,24 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding.central.aod:
+  sample.bluetooth.direction_finding.central.aod_with_controller:
     harness: bluetooth
-    extra_args: OVERLAY_CONFIG="overlay-aod.conf"
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aod.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     tags: bluetooth
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding.central.aod_host_only:
+    harness: bluetooth
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aod.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    tags: bluetooth
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
index 1c79df41275..97d4fea9e69 100644
--- a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
+++ b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
@@ -12,14 +12,22 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding_connectionless_rx.aod:
+  sample.bluetooth.direction_finding_connectionless_rx.aod_with_controller:
     harness: bluetooth
-    extra_args: OVERLAY_CONFIG="overlay-aod.conf"
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aod.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding_connectionless_rx.aod_host_only:
+    harness: bluetooth
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aod.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
index 1ea189f5088..e1833b9be8a 100644
--- a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
+++ b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
@@ -12,14 +12,22 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding_connectionless.aoa:
+  sample.bluetooth.direction_finding_connectionless.aoa_with_controller:
     harness: bluetooth
-    extra_args: OVERLAY_CONFIG="overlay-aoa.conf"
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aoa.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding_connectionless.aoa_host_only:
+    harness: bluetooth
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aoa.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_peripheral/sample.yaml b/samples/bluetooth/direction_finding_peripheral/sample.yaml
index 126355a735f..00a8c0b79d1 100644
--- a/samples/bluetooth/direction_finding_peripheral/sample.yaml
+++ b/samples/bluetooth/direction_finding_peripheral/sample.yaml
@@ -14,15 +14,24 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding.peripheral.aod:
+  sample.bluetooth.direction_finding.peripheral.aod_with_controller:
     harness: bluetooth
-    extra_args: OVERLAY_CONFIG="overlay-aoa.conf"
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aoa.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     tags: bluetooth
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding.peripheral.aod_host_only:
+    harness: bluetooth
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aoa.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    tags: bluetooth
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/hci_ipc/sample.yaml b/samples/bluetooth/hci_ipc/sample.yaml
index e88726aa45f..15d47e6866e 100644
--- a/samples/bluetooth/hci_ipc/sample.yaml
+++ b/samples/bluetooth/hci_ipc/sample.yaml
@@ -15,7 +15,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_broadcast.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -26,7 +28,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_receive.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -36,7 +40,9 @@ tests:
   sample.bluetooth.hci_ipc.bis.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_bis-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_bis-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -46,7 +52,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_central.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_central-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_central-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -56,7 +64,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_peripheral.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -66,7 +76,9 @@ tests:
   sample.bluetooth.hci_ipc.cis.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_cis-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_cis-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -76,7 +88,9 @@ tests:
   sample.bluetooth.hci_ipc.iso.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340bsim/nrf5340/cpunet
@@ -88,6 +102,7 @@ tests:
     extra_args:
       - CONF_FILE="nrf5340_cpunet_df-bt_ll_sw_split.conf"
       - DTC_OVERLAY_FILE="nrf5340_cpunet_df-bt_ll_sw_split.overlay"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
@@ -98,13 +113,16 @@ tests:
       - CONF_FILE="nrf5340_cpunet_df-bt_ll_sw_split.conf"
       - DTC_OVERLAY_FILE="nrf5340_cpunet_df-bt_ll_sw_split.overlay"
       - CONFIG_BT_CTLR_PHY_CODED=n
+      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
   sample.bluetooth.hci_ipc.mesh.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
diff --git a/samples/bluetooth/hci_uart/sample.yaml b/samples/bluetooth/hci_uart/sample.yaml
index 6c87e6edede..8e64558736a 100644
--- a/samples/bluetooth/hci_uart/sample.yaml
+++ b/samples/bluetooth/hci_uart/sample.yaml
@@ -12,7 +12,9 @@ tests:
   sample.bluetooth.hci_uart.nrf52833.df:
     harness: bluetooth
     platform_allow: nrf52833dk/nrf52833
-    extra_args: DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+    extra_args:
+      - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
     tags:
@@ -21,7 +23,9 @@ tests:
   sample.bluetooth.hci_uart.nrf5340_netcore.df:
     harness: bluetooth
     platform_allow: nrf5340dk/nrf5340/cpunet
-    extra_args: DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
+    extra_args:
+      - DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
     tags:
@@ -30,7 +34,9 @@ tests:
   sample.bluetooth.hci_uart.nrf52833.df.iq_report:
     harness: bluetooth
     platform_allow: nrf52833dk/nrf52833
-    extra_args: DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+    extra_args:
+      - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
       - CONFIG_BT_CTLR_DTM_HCI_DF_IQ_REPORT=y
@@ -40,7 +46,9 @@ tests:
   sample.bluetooth.hci_uart.nrf5340_netcore.df.iq_report:
     harness: bluetooth
     platform_allow: nrf5340dk/nrf5340/cpunet
-    extra_args: DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
+    extra_args:
+      - DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
       - CONFIG_BT_CTLR_DTM_HCI_DF_IQ_REPORT=y
@@ -55,6 +63,7 @@ tests:
     extra_args:
       - OVERLAY_CONFIG=overlay-all-bt_ll_sw_split.conf
       - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     tags:
       - uart
       - bluetooth
@@ -77,6 +86,7 @@ tests:
     extra_args:
       - OVERLAY_CONFIG=overlay-all-bt_ll_sw_split.conf
       - DTC_OVERLAY_FILE=./boards/nrf54l15pdk_nrf54l15_cpuapp_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     tags:
       - uart
       - bluetooth
diff --git a/samples/bluetooth/hci_vs_scan_req/sample.yaml b/samples/bluetooth/hci_vs_scan_req/sample.yaml
index 245a83aa0d9..49526522d16 100644
--- a/samples/bluetooth/hci_vs_scan_req/sample.yaml
+++ b/samples/bluetooth/hci_vs_scan_req/sample.yaml
@@ -9,4 +9,6 @@ tests:
       - nrf52dk/nrf52832
     extra_configs:
       - CONFIG_BT_LL_SW_SPLIT=y
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/iso_central/sample.yaml b/samples/bluetooth/iso_central/sample.yaml
index d4350e0d9cf..fd5ec7ac4fe 100644
--- a/samples/bluetooth/iso_central/sample.yaml
+++ b/samples/bluetooth/iso_central/sample.yaml
@@ -11,11 +11,11 @@ tests:
   sample.bluetooth.iso_central.bt_ll_sw_split:
     harness: bluetooth
     platform_allow:
-      - qemu_cortex_m3
-      - qemu_x86
       - nrf52_bsim
       - nrf52833dk/nrf52833
     integration_platforms:
       - nrf52833dk/nrf52833
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml b/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
index 2c4d31fd4b9..daa63336080 100644
--- a/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
+++ b/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
@@ -23,5 +23,7 @@ tests:
     integration_platforms:
       - nrf52_bsim
       - nrf52833dk/nrf52833
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake b/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake
+++ b/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/pbp_public_broadcast_source/sample.yaml b/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
index 31809027f29..75cdc80ec6f 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
+++ b/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
@@ -23,5 +23,7 @@ tests:
     integration_platforms:
       - nrf52_bsim
       - nrf52833dk/nrf52833
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake b/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake
index d3bf7be5b6c..e0a7fd9d175 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake
+++ b/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake
@@ -18,6 +18,10 @@ if(NOT("${SB_CONFIG_NET_CORE_BOARD}" STREQUAL ""))
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
index 77b4360cabd..956834765ce 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
@@ -62,7 +62,7 @@ static struct {
 /* FIXME: This could probably use a chosen entropy device instead on relying on
  * the nodelabel being the same as for the old nrf rng.
  */
-static const struct device *const dev_entropy = DEVICE_DT_GET(DT_NODELABEL(rng));
+static const struct device *const dev_entropy = DEVICE_DT_GET(DT_CHOSEN(zephyr_entropy));
 #endif /* CONFIG_ENTROPY_HAS_DRIVER */
 
 static int init_reset(void);
diff --git a/tests/bluetooth/controller/ctrl_api/testcase.yaml b/tests/bluetooth/controller/ctrl_api/testcase.yaml
index 19bf6c9ab49..21f178bf9b2 100644
--- a/tests/bluetooth/controller/ctrl_api/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_api/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_api.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_chmu/testcase.yaml b/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
index f7e8068d60e..9c3ee626433 100644
--- a/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_chmu.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml b/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
index 99612a89bc3..2371d7063eb 100644
--- a/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_cis_create.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml b/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
index 956172a89b2..a98229ba45f 100644
--- a/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_cis_terminate.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_collision/testcase.yaml b/tests/bluetooth/controller/ctrl_collision/testcase.yaml
index 6086a9a4ebc..daa8f3bc6c3 100644
--- a/tests/bluetooth/controller/ctrl_collision/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_collision/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_collision.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml b/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
index 5b0bda4b908..fc4ecb0b647 100644
--- a/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
@@ -7,11 +7,18 @@ common:
 tests:
   bluetooth.controller.ctrl_conn_update.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_conn_update.apm_test:
     type: unit
-    extra_args: CONF_FILE=prj_apm.conf
+    extra_args:
+      - CONF_FILE=prj_apm.conf
+      - SNIPPET="bt-ll-sw-split"
+
 
   bluetooth.controller.ctrl_conn_update.no_param_req_test:
     type: unit
-    extra_args: CONF_FILE=prj_no_param_req.conf
+    extra_args:
+      - CONF_FILE=prj_no_param_req.conf
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml b/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
index fd6ff51118d..c6288aecc43 100644
--- a/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_cte_req.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml b/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
index 9778af435b4..c7d1174e12b 100644
--- a/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
@@ -6,11 +6,17 @@ common:
 tests:
   bluetooth.controller.ctrl_data_length_update.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_data_length_update.test_nocodedphy:
     type: unit
-    extra_args: CONF_FILE=prj_nocoded.conf
+    extra_args:
+      - CONF_FILE=prj_nocoded.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_data_length_update.test_nophy:
     type: unit
-    extra_args: CONF_FILE=prj_nophy.conf
+    extra_args:
+      - CONF_FILE=prj_nophy.conf
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml b/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
index d5bb2cb8b11..86dd5bfe4d3 100644
--- a/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_encrypt.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml b/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
index 257542f3612..087e49575ff 100644
--- a/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_feature_exchange.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_hci/testcase.yaml b/tests/bluetooth/controller/ctrl_hci/testcase.yaml
index c750ebc8dd8..5e00c85f6f4 100644
--- a/tests/bluetooth/controller/ctrl_hci/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_hci/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_hci.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_invalid/testcase.yaml b/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
index 2d1741931e3..cee54e6b09e 100644
--- a/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_invalid.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml b/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
index b6a77528f32..54178905da1 100644
--- a/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_le_ping.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml b/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
index 0991b0cdd43..a9445cbf8c4 100644
--- a/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_min_used_chans.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml b/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
index 1d7da169f1d..d5c49d587a8 100644
--- a/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
@@ -6,6 +6,10 @@ common:
 tests:
   bluetooth.controller.ctrl_phy_update.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
   bluetooth.controller.ctrl_phy_update.test_reduced_buf:
     type: unit
-    extra_args: CONF_FILE=prj_rx_cnt.conf
+    extra_args:
+      - CONF_FILE=prj_rx_cnt.conf
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml b/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
index cbf63aa1b57..cbc3c3faf72 100644
--- a/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_sca_update.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml b/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml
index 778606d6954..ac5dd6e957e 100644
--- a/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml
@@ -4,3 +4,5 @@ common:
 tests:
   bluetooth.ctrl_sw_privacy.test:
     platform_allow: nrf52_bsim
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_terminate/testcase.yaml b/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
index cbe639401ea..6b1409e9653 100644
--- a/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_terminate.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml
index 614eb7fe94c..363986bd3d3 100644
--- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml
@@ -6,23 +6,35 @@ common:
 tests:
   bluetooth.controller.ctrl_tx_buffer_alloc.test_0_per_conn:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_1_per_conn:
     type: unit
-    extra_args: CONF_FILE=prj_1.conf
+    extra_args:
+      - CONF_FILE=prj_1.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_2_per_conn:
     type: unit
-    extra_args: CONF_FILE=prj_2.conf
+    extra_args:
+      - CONF_FILE=prj_2.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_3_per_conn:
     type: unit
-    extra_args: CONF_FILE=prj_3.conf
+    extra_args:
+      - CONF_FILE=prj_3.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_max_per_conn_alloc:
     type: unit
-    extra_args: CONF_FILE=prj_max.conf
+    extra_args:
+      - CONF_FILE=prj_max.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_max_common_alloc:
     type: unit
-    extra_args: CONF_FILE=prj_max_common.conf
+    extra_args:
+      - CONF_FILE=prj_max_common.conf
+       - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml b/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml
index 295ad891a63..282b620b317 100644
--- a/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml
@@ -5,3 +5,5 @@ common:
 tests:
   bluetooth.ctrl_tx_queue.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml b/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml
index 28aba1a752a..48b18af9353 100644
--- a/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml
@@ -6,7 +6,11 @@ common:
 tests:
   bluetooth.controller.ctrl_unsupported.default.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_unsupported.test:
     type: unit
-    extra_args: CONF_FILE=prj_unsupported.conf
+    extra_args:
+      - CONF_FILE=prj_unsupported.conf
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml b/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml
index af319a7a719..be963df24a8 100644
--- a/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml
@@ -4,3 +4,5 @@ common:
 tests:
   bluetooth.ctrl_user_ext.test:
     platform_allow: nrf52_bsim
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_version/testcase.yaml b/tests/bluetooth/controller/ctrl_version/testcase.yaml
index 6badcbc7254..5df86b9bca9 100644
--- a/tests/bluetooth/controller/ctrl_version/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_version/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_version.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connection_cte_req/testcase.yaml b/tests/bluetooth/df/connection_cte_req/testcase.yaml
index 768aba4a51f..fbfe4b0d9a1 100644
--- a/tests/bluetooth/df/connection_cte_req/testcase.yaml
+++ b/tests/bluetooth/df/connection_cte_req/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.conection_cte_req:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml b/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml
index 38a23b0950e..a9986c5b0e5 100644
--- a/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml
+++ b/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.conection_cte_tx_params:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml b/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
index 6aa5bb0f0c1..844a7bbb524 100644
--- a/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.connectionless_cte_chains:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml b/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml
index f839b1910eb..c8f08a90843 100644
--- a/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.connectionless_cte_rx:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml b/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml
index 77d651d0cbc..491cc0e7e59 100644
--- a/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.connectionless_cte_tx:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/init/testcase.yaml b/tests/bluetooth/init/testcase.yaml
index 69afaaf8b08..d0f917f1fe2 100644
--- a/tests/bluetooth/init/testcase.yaml
+++ b/tests/bluetooth/init/testcase.yaml
@@ -74,7 +74,9 @@ tests:
     extra_args: CONF_FILE=prj_9.conf
     platform_allow: qemu_cortex_m3
   bluetooth.init.test_ctlr:
-    extra_args: CONF_FILE=prj_ctlr.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -86,7 +88,9 @@ tests:
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_4_0:
-    extra_args: CONF_FILE=prj_ctlr_4_0.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_4_0.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -95,7 +99,9 @@ tests:
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_4_0_dbg:
-    extra_args: CONF_FILE=prj_ctlr_4_0_dbg.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_4_0_dbg.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -104,7 +110,9 @@ tests:
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_tiny:
-    extra_args: CONF_FILE=prj_ctlr_tiny.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_tiny.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -116,6 +124,7 @@ tests:
     extra_args:
       - CONF_FILE=prj_ctlr_dbg.conf
       - DTC_OVERLAY_FILE=pa_lna.overlay
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -126,6 +135,7 @@ tests:
     extra_args:
       - CONF_FILE=prj_ctlr_5_x_dbg.conf
       - DTC_OVERLAY_FILE=pa_lna.overlay
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -137,6 +147,7 @@ tests:
       - CONF_FILE=prj_ctlr.conf
       - CONFIG_BT_CTLR_ADVANCED_FEATURES=y
       - CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER=y
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf52840dk/nrf52840
@@ -148,6 +159,7 @@ tests:
   bluetooth.init.test_ctlr_ticker:
     extra_args:
       - CONF_FILE=prj_ctlr_ticker.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -155,28 +167,36 @@ tests:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
   bluetooth.init.test_ctlr_broadcaster:
-    extra_args: CONF_FILE=prj_ctlr_broadcaster.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_broadcaster.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_peripheral:
-    extra_args: CONF_FILE=prj_ctlr_peripheral.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_peripheral_priv:
-    extra_args: CONF_FILE=prj_ctlr_peripheral_priv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral_priv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_observer:
-    extra_args: CONF_FILE=prj_ctlr_observer.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_observer.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -187,7 +207,9 @@ tests:
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_central:
-    extra_args: CONF_FILE=prj_ctlr_central.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -198,7 +220,9 @@ tests:
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_central_priv:
-    extra_args: CONF_FILE=prj_ctlr_central_priv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central_priv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -209,7 +233,9 @@ tests:
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_broadcaster_ext:
-    extra_args: CONF_FILE=prj_ctlr_broadcaster_ext.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_broadcaster_ext.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -218,7 +244,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_peripheral_ext:
-    extra_args: CONF_FILE=prj_ctlr_peripheral_ext.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral_ext.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -227,7 +255,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_peripheral_ext_priv:
-    extra_args: CONF_FILE=prj_ctlr_peripheral_ext_priv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral_ext_priv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -236,7 +266,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_oberver_ext:
-    extra_args: CONF_FILE=prj_ctlr_observer_ext.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_observer_ext.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -245,7 +277,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_central_ext:
-    extra_args: CONF_FILE=prj_ctlr_central_ext.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central_ext.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -254,7 +288,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_central_ext_priv:
-    extra_args: CONF_FILE=prj_ctlr_central_ext_priv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central_ext_priv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -263,7 +299,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_adv:
-    extra_args: CONF_FILE=prj_ctlr_per_adv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_adv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -272,7 +310,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_adv_no_adi:
-    extra_args: CONF_FILE=prj_ctlr_per_adv_no_adi.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_adv_no_adi.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -281,7 +321,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_sync:
-    extra_args: CONF_FILE=prj_ctlr_per_sync.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_sync.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -290,7 +332,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_sync_no_adi:
-    extra_args: CONF_FILE=prj_ctlr_per_sync_no_adi.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_sync_no_adi.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -299,7 +343,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_sync_no_filter:
-    extra_args: CONF_FILE=prj_ctlr_per_sync_no_filter.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_sync_no_filter.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -308,7 +354,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_peripheral_iso:
-    extra_args: CONF_FILE=prj_ctlr_peripheral_iso.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral_iso.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -317,7 +365,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_central_iso:
-    extra_args: CONF_FILE=prj_ctlr_central_iso.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central_iso.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -336,7 +386,9 @@ tests:
       - DTC_OVERLAY_FILE=h5.overlay
     platform_allow: qemu_cortex_m3
   bluetooth.init.test_llcp:
-    extra_args: CONF_FILE=prj_llcp.conf
+    extra_args:
+      - CONF_FILE=prj_llcp.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -349,5 +401,6 @@ tests:
     extra_args:
       - CONF_FILE=prj_ctlr.conf
       - CONFIG_BT_RECV_WORKQ_BT=y
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840

From 620b4df913d415a19b326629612a401658f3961b Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Mon, 16 Sep 2024 15:09:50 +0200
Subject: [PATCH 0302/2913] [nrf noup] boards/nordic/nrf54l15dk: Set ROM offset
 by PM

While Partition Manager is enabled, it manages the offset
by itself.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
(cherry picked from commit 77ed77acade23024c29b10e9105829c45f0595fe)
(cherry picked from commit 17e9709ceeeadae286be2cc1a58780cd5419c465)
---
 boards/nordic/nrf54l15dk/Kconfig.defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boards/nordic/nrf54l15dk/Kconfig.defconfig b/boards/nordic/nrf54l15dk/Kconfig.defconfig
index 2b753df3515..06a426bd8ed 100644
--- a/boards/nordic/nrf54l15dk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l15dk/Kconfig.defconfig
@@ -7,6 +7,7 @@ config BT_CTLR
 	default BT
 
 config ROM_START_OFFSET
+	default 0 if PARTITION_MANAGER_ENABLED
 	default 0x800 if BOOTLOADER_MCUBOOT
 
 endif # BOARD_NRF54L15DK_NRF54L15_CPUAPP

From 26b8d92f84c6f6358467b80a4a833657d7726d1c Mon Sep 17 00:00:00 2001
From: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
Date: Thu, 26 Sep 2024 12:40:33 +0200
Subject: [PATCH 0303/2913] [nrf noup] samples: basic: blinky: add eGPIO tests
 configuration

Add overlay for nrf54l15dk to enable eGPIO tests.

Signed-off-by: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
(cherry picked from commit 26bd28ef1c0bcfe17a49dc6445efc0eb713268ed)
(cherry picked from commit 1bb7263a2036bb4b68eaad2706060d89c8e0d3c1)
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay      | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay

diff --git a/samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay b/samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay
new file mode 100644
index 00000000000..d165fc44b4b
--- /dev/null
+++ b/samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+&led0 {
+	gpios = <&egpio 9 GPIO_ACTIVE_HIGH>;
+};

From 728983fe1906c18007bdd44ebc2e00e06e9d3139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Wed, 11 Sep 2024 10:17:28 +0200
Subject: [PATCH 0304/2913] [nrf noup] modules: mbedtls: Disable configurations
 in Kconfig.tls-generic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-This commit prevents legacy mbed TLS configurations from being in
 conflict with PSA Configurations while using nrf_security.
-This [nrf noup] is reworked from an earlier cherry-pick of
 commit d8c96cfab37d3738dac933075780f6ca24593447, but has the following
 changes:
 - Endif's relevant that is using our pattern for masking
   configs duplicated or in conflict in nrf_security
  (by using if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)) is
  made clearer by adding a comment at their corresponding endif
  (# !(NRF_SECURITY || NORDIC_SECURITY_BACKEND))
 - Changes to zephyr_init.c for entropy_dev checking for
   CONFIG_NRF_CC3XX_PLATFORM is removed as the symbol entropy_dev
   doesn't exist in this file anymore

ref: NCSDK-13503

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit a8e07bb0c6e2a0524a629a1857a6efd591065da2)
(cherry picked from commit de7ac20cc685f85bdf2e970e85ea0008e30a4528)
---
 modules/mbedtls/Kconfig.tls-generic | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/modules/mbedtls/Kconfig.tls-generic b/modules/mbedtls/Kconfig.tls-generic
index 3ea0a49dd34..65989b9c756 100644
--- a/modules/mbedtls/Kconfig.tls-generic
+++ b/modules/mbedtls/Kconfig.tls-generic
@@ -7,6 +7,8 @@
 menu "Mbed TLS configuration"
 	depends on MBEDTLS_BUILTIN && MBEDTLS_CFG_FILE = "config-tls-generic.h"
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 menu "TLS"
 
 config MBEDTLS_TLS_VERSION_1_2
@@ -40,10 +42,14 @@ endif # MBEDTLS_TLS_VERSION_1_2 || MBEDTLS_TLS_VERSION_1_3
 
 endmenu # TLS
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 menu "Ciphersuite configuration"
 
 comment "Supported key exchange modes"
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_KEY_EXCHANGE_ALL_ENABLED
 	bool "All available ciphersuite modes"
 	select MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
@@ -71,6 +77,8 @@ config MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
 config MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
 	bool "RSA-PSK based ciphersuite modes"
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_PSK_MAX_LEN
 	int "Max size of TLS pre-shared keys"
 	default 32
@@ -78,6 +86,8 @@ config MBEDTLS_PSK_MAX_LEN
 	  Max size of TLS pre-shared keys, in bytes. It has no effect if no
 	  PSK key exchange is used.
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
 	bool "RSA-only based ciphersuite modes"
 	default y if UOSCORE || UEDHOC
@@ -214,8 +224,12 @@ config MBEDTLS_ECP_NIST_OPTIM
 
 endif
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 comment "Supported ciphers and cipher modes"
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_CIPHER_ALL_ENABLED
 	bool "All available ciphers and modes"
 	select MBEDTLS_CIPHER_AES_ENABLED
@@ -306,8 +320,12 @@ config MBEDTLS_CMAC
 	bool "CMAC (Cipher-based Message Authentication Code) mode for block ciphers."
 	depends on MBEDTLS_CIPHER_AES_ENABLED || MBEDTLS_CIPHER_DES_ENABLED
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 comment "Supported hash algorithms"
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_HASH_ALL_ENABLED
 	bool "All available MAC methods"
 	select MBEDTLS_MD5
@@ -348,10 +366,14 @@ config MBEDTLS_SHA512
 config MBEDTLS_POLY1305
 	bool "Poly1305 hash family"
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 endmenu
 
 comment "Random number generators"
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_CTR_DRBG_ENABLED
 	bool "CTR_DRBG AES-256-based random generator"
 	depends on MBEDTLS_CIPHER_AES_ENABLED
@@ -361,15 +383,21 @@ config MBEDTLS_HMAC_DRBG_ENABLED
 	bool "HMAC_DRBG random generator"
 	select MBEDTLS_MD
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 comment "Other configurations"
 
 config MBEDTLS_CIPHER
 	bool "generic cipher layer."
 	default y if PSA_WANT_ALG_CMAC
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_MD
 	bool "generic message digest layer."
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_GENPRIME_ENABLED
 	bool "prime-number generation code."
 
@@ -387,6 +415,8 @@ config MBEDTLS_HAVE_ASM
 	  of asymmetric cryptography, however this might have an impact on the
 	  code size.
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_ENTROPY_C
 	bool "Mbed TLS entropy accumulator"
 	depends on MBEDTLS_SHA256 || MBEDTLS_SHA384 || MBEDTLS_SHA512
@@ -395,6 +425,8 @@ config MBEDTLS_ENTROPY_C
 	  mostly used in conjunction with CTR_DRBG or HMAC_DRBG to create
 	  a deterministic random number generator.
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_ENTROPY_POLL_ZEPHYR
 	bool "Provide entropy data to Mbed TLS through entropy driver or random generator"
 	depends on MBEDTLS_ENTROPY_C

From 3b697befa1dc2407f3f62a422ac534c3e089e65f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Mon, 9 Sep 2024 14:55:05 +0200
Subject: [PATCH 0305/2913] [nrf noup] mbedtls: Enable PSA_WANT_GENERATE_RANDOM
 for PSA RNG
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-This is a [nrf noup] because PSA_WANT_GENERATE_RANDOM is a Nordic
 configuration that is not found upstream. This was previously in
 commit 5cfe5750b622efff77427425bf61854a95ade9fb but has been split out

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit 33a985fd38443be450c8a904d9fe2890f0563a46)
(cherry picked from commit 78c79bc6a1d2370302661298b73ceff9e307b3c9)
---
 drivers/entropy/Kconfig.psa_crypto | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/entropy/Kconfig.psa_crypto b/drivers/entropy/Kconfig.psa_crypto
index d06001225b0..18514a071d1 100644
--- a/drivers/entropy/Kconfig.psa_crypto
+++ b/drivers/entropy/Kconfig.psa_crypto
@@ -7,6 +7,7 @@ config ENTROPY_PSA_CRYPTO_RNG
 	bool "PSA Crypto Random source Entropy driver"
 	depends on DT_HAS_ZEPHYR_PSA_CRYPTO_RNG_ENABLED
 	select ENTROPY_HAS_DRIVER
+	select PSA_WANT_GENERATE_RANDOM
 	default y
 	help
 	  Enable the PSA Crypto source Entropy driver.

From 1147b11bb1585f9ba3e9163d9ad6fcfd7845a32f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Wed, 21 Aug 2024 12:35:25 +0200
Subject: [PATCH 0306/2913] [nrf noup] mbedtls: Remove unsupported algorithms
 in PSA crypto
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-This commit is a [nrf noup] because it removes configuration options
 for cryptographic algortihms available in Mbed TLS but which is not
 actively supported in nRF Connect SDK.
 The list of algorithms removed:
 - AES CFB - Cipher Feedback block cipher
 - AES OFB - Output Feedback block cipher
 - FFDH
 - RIPEMD160
 - Aria
 - Camellia
 - DES

 The removal of these algorithms is based both on a wish to remove
 weaker cryptography and unsupported features in the products we have
 today.

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit f02f29bf1afa12578b50c0d6523dcc9a17d80e69)
(cherry picked from commit 02905305eb4bb77f3996f0ca871dc7f5b40086e0)
---
 modules/mbedtls/Kconfig.psa | 65 -------------------------------------
 1 file changed, 65 deletions(-)

diff --git a/modules/mbedtls/Kconfig.psa b/modules/mbedtls/Kconfig.psa
index 7562032bf3d..77b4566ec27 100644
--- a/modules/mbedtls/Kconfig.psa
+++ b/modules/mbedtls/Kconfig.psa
@@ -36,10 +36,6 @@ config PSA_WANT_ALG_CMAC
 	bool "PSA_WANT_ALG_CMAC" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_ALG_CFB
-	bool "PSA_WANT_ALG_CFB" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 config PSA_WANT_ALG_CHACHA20_POLY1305
 	bool "PSA_WANT_ALG_CHACHA20_POLY1305" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
@@ -60,10 +56,6 @@ config PSA_WANT_ALG_ECDH
 	bool "PSA_WANT_ALG_ECDH" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_ALG_FFDH
-	bool "PSA_WANT_ALG_FFDH" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 config PSA_WANT_ALG_ECDSA
 	bool "PSA_WANT_ALG_ECDSA" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
@@ -96,9 +88,6 @@ config PSA_WANT_ALG_MD5
 	bool "PSA_WANT_ALG_MD5" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_ALG_OFB
-	bool "PSA_WANT_ALG_OFB" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_ALG_PBKDF2_HMAC
 	bool "PSA_WANT_ALG_PBKDF2_HMAC" if !MBEDTLS_PROMPTLESS
@@ -108,9 +97,6 @@ config PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
 	bool "PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_ALG_RIPEMD160
-	bool "PSA_WANT_ALG_RIPEMD160" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_ALG_RSA_OAEP
 	bool "PSA_WANT_ALG_RSA_OAEP" if !MBEDTLS_PROMPTLESS
@@ -228,26 +214,6 @@ config PSA_WANT_ECC_SECP_R1_521
 	bool "PSA_WANT_ECC_SECP_R1_521" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_DH_RFC7919_2048
-	bool "PSA_WANT_DH_RFC7919_2048" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_DH_RFC7919_3072
-	bool "PSA_WANT_DH_RFC7919_3072" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_DH_RFC7919_4096
-	bool "PSA_WANT_DH_RFC7919_4096" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_DH_RFC7919_6144
-	bool "PSA_WANT_DH_RFC7919_6144" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_DH_RFC7919_8192
-	bool "PSA_WANT_DH_RFC7919_8192" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 config PSA_WANT_KEY_TYPE_DERIVE
 	bool "PSA_WANT_KEY_TYPE_DERIVE" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
@@ -268,30 +234,15 @@ config PSA_WANT_KEY_TYPE_AES
 	bool "PSA_WANT_KEY_TYPE_AES" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_KEY_TYPE_ARIA
-	bool "PSA_WANT_KEY_TYPE_ARIA" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_KEY_TYPE_CAMELLIA
-	bool "PSA_WANT_KEY_TYPE_CAMELLIA" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 config PSA_WANT_KEY_TYPE_CHACHA20
 	bool "PSA_WANT_KEY_TYPE_CHACHA20" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_KEY_TYPE_DES
-	bool "PSA_WANT_KEY_TYPE_DES" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	bool "PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_KEY_TYPE_DH_PUBLIC_KEY
-	bool "PSA_WANT_KEY_TYPE_DH_PUBLIC_KEY" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 config PSA_WANT_KEY_TYPE_RAW_DATA
 	bool "PSA_WANT_KEY_TYPE_RAW_DATA" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
@@ -336,20 +287,4 @@ config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_KEY_TYPE_DH_KEY_PAIR_BASIC
-	bool "PSA_WANT_KEY_TYPE_DH_KEY_PAIR_BASIC" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_KEY_TYPE_DH_KEY_PAIR_IMPORT
-	bool "PSA_WANT_KEY_TYPE_DH_KEY_PAIR_IMPORT" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_KEY_TYPE_DH_KEY_PAIR_EXPORT
-	bool "PSA_WANT_KEY_TYPE_DH_KEY_PAIR_EXPORT" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_KEY_TYPE_DH_KEY_PAIR_GENERATE
-	bool "PSA_WANT_KEY_TYPE_DH_KEY_PAIR_GENERATE" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 endif # PSA_CRYPTO_CLIENT

From 3e925032d3bef4a68ee4383cd35f71581ee4f880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Wed, 21 Aug 2024 12:49:58 +0200
Subject: [PATCH 0307/2913] [nrf noup] mbedtls: Add dependency logic for PSA
 crypto configurations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-This is a [nrf noup] as this the upstream version of PSA crypto configs
 is generated by tooling, and there is no mechanisms to qualify
 that dependent configurations are enabled (by depends or select).
-This adds dependency-mapping between configurations in the Kconfigs
 added for PSA crypto in upstream.
-Selecting CHACHA20 key type if PSA_WANT_ALG_STREAM_CIPHER is
 enabled

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit daf3951940301344abf8e366278db9d807b798e8)
(cherry picked from commit 4bebef039e5cde9b84f3872b974349ef53b11c42)
---
 modules/mbedtls/Kconfig.psa | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/modules/mbedtls/Kconfig.psa b/modules/mbedtls/Kconfig.psa
index 77b4566ec27..2e860ebad85 100644
--- a/modules/mbedtls/Kconfig.psa
+++ b/modules/mbedtls/Kconfig.psa
@@ -71,6 +71,7 @@ config PSA_WANT_ALG_GCM
 config PSA_WANT_ALG_HKDF
 	bool "PSA_WANT_ALG_HKDF" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_ALG_HMAC
 
 config PSA_WANT_ALG_HKDF_EXTRACT
 	bool "PSA_WANT_ALG_HKDF_EXTRACT" if !MBEDTLS_PROMPTLESS
@@ -92,11 +93,12 @@ config PSA_WANT_ALG_MD5
 config PSA_WANT_ALG_PBKDF2_HMAC
 	bool "PSA_WANT_ALG_PBKDF2_HMAC" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_ALG_HMAC
 
 config PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
 	bool "PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-
+	depends on PSA_WANT_ALG_CMAC
 
 config PSA_WANT_ALG_RSA_OAEP
 	bool "PSA_WANT_ALG_RSA_OAEP" if !MBEDTLS_PROMPTLESS
@@ -153,18 +155,22 @@ config PSA_WANT_ALG_SHA3_512
 config PSA_WANT_ALG_STREAM_CIPHER
 	bool "PSA_WANT_ALG_STREAM_CIPHER" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	select PSA_WANT_KEY_TYPE_CHACHA20
 
 config PSA_WANT_ALG_TLS12_PRF
 	bool "PSA_WANT_ALG_TLS12_PRF" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_ALG_HMAC
 
 config PSA_WANT_ALG_TLS12_PSK_TO_MS
 	bool "PSA_WANT_ALG_TLS12_PSK_TO_MS" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_ALG_HMAC
 
 config PSA_WANT_ALG_TLS12_ECJPAKE_TO_PMS
 	bool "PSA_WANT_ALG_TLS12_ECJPAKE_TO_PMS" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_ALG_SHA_256
 
 config PSA_WANT_ECC_BRAINPOOL_P_R1_256
 	bool "PSA_WANT_ECC_BRAINPOOL_P_R1_256" if !MBEDTLS_PROMPTLESS
@@ -237,7 +243,8 @@ config PSA_WANT_KEY_TYPE_AES
 config PSA_WANT_KEY_TYPE_CHACHA20
 	bool "PSA_WANT_KEY_TYPE_CHACHA20" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-
+	depends on PSA_WANT_ALG_CHACHA20_POLY1305 || \
+		   PSA_WANT_ALG_STREAM_CIPHER
 
 config PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	bool "PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY" if !MBEDTLS_PROMPTLESS
@@ -254,37 +261,53 @@ config PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC
 	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 	|| \
+		   PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 	|| \
+		   PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE	|| \
+		   PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
 
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT
 	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT
 	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE
 	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
 	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT	|| \
+		   PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT 	|| \
+		   PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE	|| \
+		   PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE
 
 config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
+	default y if PSA_CRYPTO_ENABLE_ALL
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 endif # PSA_CRYPTO_CLIENT

From 8f6a02426f35fe5405bf4413b753b2c225201587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Wed, 21 Aug 2024 12:53:27 +0200
Subject: [PATCH 0308/2913] [nrf noup] mbedtls: Adding helptext warnings for
 weak crypto
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-This commit is a [nrf noup] because PSA crypto configs in upstream
 Zephyr doesn't have help-text in their configurations and we don't
 want to duplicate configurations to control the value
-This adds warning for SHA-1 and MD5 usage

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit d2a534e3a6b4e09f0a8cd4b11a2732edc72ec46b)
(cherry picked from commit 5247845401f7e26c2feb7ca4cd585f1363e289eb)
---
 modules/mbedtls/Kconfig.psa | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/mbedtls/Kconfig.psa b/modules/mbedtls/Kconfig.psa
index 2e860ebad85..4b4d5018743 100644
--- a/modules/mbedtls/Kconfig.psa
+++ b/modules/mbedtls/Kconfig.psa
@@ -88,7 +88,9 @@ config PSA_WANT_ALG_HMAC
 config PSA_WANT_ALG_MD5
 	bool "PSA_WANT_ALG_MD5" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-
+	help
+	  Warning: The MD5 hash is weak and deprecated and is only recommended
+	  for use in legacy protocols.
 
 config PSA_WANT_ALG_PBKDF2_HMAC
 	bool "PSA_WANT_ALG_PBKDF2_HMAC" if !MBEDTLS_PROMPTLESS
@@ -119,6 +121,9 @@ config PSA_WANT_ALG_RSA_PSS
 config PSA_WANT_ALG_SHA_1
 	bool "PSA_WANT_ALG_SHA_1" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	help
+	  Warning: The SHA-1 hash is weak and deprecated and is only recommended
+	  for use in legacy protocols.
 
 config PSA_WANT_ALG_SHA_224
 	bool "PSA_WANT_ALG_SHA_224" if !MBEDTLS_PROMPTLESS

From 75ac1943bc904f20b342c89bb9919130cfe2ef65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Wed, 21 Aug 2024 12:56:48 +0200
Subject: [PATCH 0309/2913] [nrf noup] mbedtls: Adding missing configuration
 for RSA key type derive
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-This is a [nrf noup] because the upstream Zephyr is generated using
 a script and is not committed as-is as source-code. The relevant
 responsible person for this feature has received information about
 the missing configuration and this will be resolved upstream in
 Mbed TLS and will propagate down to zephyr. Once this has happened,
 this [nrf noup] can be dropped.
-Add missing PSA_WANT_KEY_TYPE_RSA_KEY_DERIVE

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit f23c48fb98cbae7ff563264db97b971d6da89f9d)
(cherry picked from commit c1dccdbb1fbb0f9035ae81c826ce441d00dda6da)
---
 modules/mbedtls/Kconfig.psa | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/mbedtls/Kconfig.psa b/modules/mbedtls/Kconfig.psa
index 4b4d5018743..70f98622038 100644
--- a/modules/mbedtls/Kconfig.psa
+++ b/modules/mbedtls/Kconfig.psa
@@ -313,6 +313,10 @@ config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE" if !MBEDTLS_PROMPTLESS
 	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
+
+config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE
+	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 endif # PSA_CRYPTO_CLIENT

From 3ec22b60972e84264c3fc857e3bbd6bb9ce05aea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Wed, 11 Sep 2024 08:01:56 +0200
Subject: [PATCH 0310/2913] [nrf noup] mbedtls: Non-selectable
 PSA_WANT_KEY_TYPE_XXXX_KEY_PAIR_BASIC
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-This commit is a [nrf noup] as Kconfig.psa is an auto-generated
 file. The changes reflected here has been reported to maintainers
 in upstream Zephyr.
 Change: Mbed TLS resolves PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC and
 PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT internally from the other
 types.

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit 1a2c83ca98d5ad3a03ad3875702830709889eddb)
(cherry picked from commit ecbdb861d9c1530993d026d98aa3de7b5fde75ff)
---
 modules/mbedtls/Kconfig.psa | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/mbedtls/Kconfig.psa b/modules/mbedtls/Kconfig.psa
index 70f98622038..ff3c488e212 100644
--- a/modules/mbedtls/Kconfig.psa
+++ b/modules/mbedtls/Kconfig.psa
@@ -264,8 +264,8 @@ config PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC
-	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
+	bool
+	default y
 	depends on PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 	|| \
 		   PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 	|| \
 		   PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE	|| \
@@ -292,9 +292,9 @@ config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
-	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-	depends on PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT	|| \
+	bool
+	default y
+	depends on PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT 	|| \
 		   PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT 	|| \
 		   PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE	|| \
 		   PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE

From a1456789b749c1ad52a6c68df42544500456f37d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Thu, 5 Sep 2024 15:05:43 +0200
Subject: [PATCH 0311/2913] [nrf noup] mbedtls: Don't select
 PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC is internally resolved by
 Mbed TLS. It has been made promptless in a previous commit.
 Keeping this change separated since the Kconfig.psa is auto-generated
 and it would likely be a bit more complex to handle this in a
 single commit. Upstream maintainers have been notified about this
 mismatch in configurations.

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit 2589d0a7ff08674e0d44bf3186fe22e3ec5ce932)
(cherry picked from commit 0ddf4f7b1e0c31a6e31c80136bb3f9c72fa4522c)
---
 modules/mbedtls/Kconfig.tls-generic | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/mbedtls/Kconfig.tls-generic b/modules/mbedtls/Kconfig.tls-generic
index 65989b9c756..4300b0f03e6 100644
--- a/modules/mbedtls/Kconfig.tls-generic
+++ b/modules/mbedtls/Kconfig.tls-generic
@@ -96,6 +96,7 @@ config MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
 	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT if PSA_CRYPTO_CLIENT
 	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT if PSA_CRYPTO_CLIENT
 	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE if PSA_CRYPTO_CLIENT
+	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE if PSA_CRYPTO_CLIENT
 
 config MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
 	bool "DHE-RSA based ciphersuite modes"

From e94d330581af040f9e41e0590e6a4b999eccfaf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Thu, 5 Sep 2024 15:06:57 +0200
Subject: [PATCH 0312/2913] [nrf noup] samples: bluetooth: update autoconf.h
 header path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update path for autoconf.h which is now in zephyr/autoconf.h

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit b22c113e035ffef20c2dd9ad9ce4eebae992f6db)
(cherry picked from commit 02f8b45f35322b72378f9fe641057779a36476bd)
---
 samples/bluetooth/bap_unicast_client/src/stream_tx.c        | 2 +-
 samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c   | 2 +-
 samples/bluetooth/cap_acceptor/src/main.c                   | 2 +-
 samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c | 2 +-
 samples/bluetooth/cap_initiator/src/main.c                  | 2 +-
 soc/nordic/nrf54l/soc.c                                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/samples/bluetooth/bap_unicast_client/src/stream_tx.c b/samples/bluetooth/bap_unicast_client/src/stream_tx.c
index 06ea3a3c349..eba7273a0c6 100644
--- a/samples/bluetooth/bap_unicast_client/src/stream_tx.c
+++ b/samples/bluetooth/bap_unicast_client/src/stream_tx.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c b/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
index cbdb859eb8f..aad077a0aed 100644
--- a/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
+++ b/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
@@ -7,7 +7,7 @@
  *  SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_acceptor/src/main.c b/samples/bluetooth/cap_acceptor/src/main.c
index 6ca5f59282e..df4600f09bb 100644
--- a/samples/bluetooth/cap_acceptor/src/main.c
+++ b/samples/bluetooth/cap_acceptor/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c b/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
index 39b7a68aef6..60509beb258 100644
--- a/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
+++ b/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/samples/bluetooth/cap_initiator/src/main.c b/samples/bluetooth/cap_initiator/src/main.c
index 1b35ea7981f..8eab76938bc 100644
--- a/samples/bluetooth/cap_initiator/src/main.c
+++ b/samples/bluetooth/cap_initiator/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <stddef.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index fa5099989c7..56e48800ed4 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -13,7 +13,7 @@
  */
 
 #ifdef __NRF_TFM__
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #endif
 
 #include <zephyr/devicetree.h>

From 683421718ef6344b399ab0f9fce05cedc32b4d94 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Tue, 7 May 2024 08:27:09 +0100
Subject: [PATCH 0313/2913] [nrf noup] kernel: banner: Make function weak

Makes the boot banner function weak, this resolves an issue when
building with llext enabled which uses different build options
than a normal zephyr build

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 0c7ccc4d02209ded087f5e54b17840dee11593c4)
(cherry picked from commit e89e4f5d13a59581a2d91f7a07cde37a1d50c64b)
---
 kernel/banner.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/banner.c b/kernel/banner.c
index 5cadda0a5e9..a16784cb975 100644
--- a/kernel/banner.c
+++ b/kernel/banner.c
@@ -24,7 +24,7 @@
 #endif /* BUILD_VERSION */
 #endif /* !BANNER_VERSION */
 
-void boot_banner(void)
+__weak void boot_banner(void)
 {
 #if defined(CONFIG_BOOT_DELAY) && (CONFIG_BOOT_DELAY > 0)
 #ifdef CONFIG_BOOT_BANNER

From 4b9357e2cfee37f90b170b5fba7ae4da6dabcfb3 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Fri, 20 Sep 2024 14:48:37 +0200
Subject: [PATCH 0314/2913] [nrf noup] lib: os: zvfs: Remove EXPERIMENTAL from
 ZVFS

Although ZVFS is experimental, the warning is annoying the matter team.
Therefore, remove the experimental selection.

This may be reverted once upstream unselects experimental.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 559cabfc3f0ad3296d1bde902073a2bf4401a978)
(cherry picked from commit bfbcae35e8c95656e0f381c927bd72a65599533a)
---
 lib/os/zvfs/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/os/zvfs/Kconfig b/lib/os/zvfs/Kconfig
index 7f50ff52bef..64808b7ce36 100644
--- a/lib/os/zvfs/Kconfig
+++ b/lib/os/zvfs/Kconfig
@@ -6,7 +6,6 @@
 menuconfig ZVFS
 	bool "Zephyr virtual filesystem (ZVFS) support [EXPERIMENTAL]"
 	select FDTABLE
-	select EXPERIMENTAL
 	help
 	  ZVFS is a central, Zephyr-native library that provides a common interoperable API for all
 	  types of file descriptors such as those from the non-virtual FS, sockets, eventfds, FILE *'s

From 13eda60b561985c70e7c8c2dc3b9b7a63d5a5ee4 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Wed, 5 Jun 2024 15:14:51 +0200
Subject: [PATCH 0315/2913] [nrf noup] dts: nordic: Add support for BICR
 generation

This will be replaced by a different solution upstream (NCSDK-27673).

Migrate the existing BICR bindings from NCS 2.4.99-cs3 to NCS 2.7.0.
They are updated to remove obsoleted values. Enable generating bicr.hex
for Application core by default.

LFXO CLOAD value is a resualt of DK's characterization.

The BICR LFOSC.LFXOCONFIG.MODE field supports disabling the usage of an
external crystal oscillator to disable LFXO as LF clock source.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Signed-off-by: Karol Lisak <karol.lisak@nordicsemi.no>
Signed-off-by: Karsten Koenig <karsten.koenig@nordicsemi.no>
(cherry picked from commit 3bedb2dfd9d68d08d5bf9405ce92c7e2bf11d4e7)
(cherry picked from commit 1b6cc13ea4c4a57ae05abf63ea9d987a70200dca)
---
 boards/nordic/nrf54h20dk/nrf54h20dk_bicr.dtsi |  54 ++++++++
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts |   1 +
 dts/bindings/gpio/nordic,nrf-gpio.yaml        |   2 +-
 .../gpio/nordic,nrf-port-configs.yaml         |  35 ++++++
 dts/bindings/misc/nordic,nrf-bicr.yaml        | 118 ++++++++++++++++++
 modules/hal_nordic/CMakeLists.txt             |   3 +
 modules/hal_nordic/Kconfig.nrf_regtool        |   7 ++
 .../nrf-regtool/nrf-regtoolConfig.cmake       |   2 +
 .../nrf54h/Kconfig.defconfig.nrf54h20_cpuapp  |   3 +
 9 files changed, 224 insertions(+), 1 deletion(-)
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_bicr.dtsi
 create mode 100644 dts/bindings/gpio/nordic,nrf-port-configs.yaml
 create mode 100644 dts/bindings/misc/nordic,nrf-bicr.yaml

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_bicr.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_bicr.dtsi
new file mode 100644
index 00000000000..34652755564
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_bicr.dtsi
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	bicr: bicr@fff87b0 {
+		compatible = "nordic,nrf-bicr";
+		reg = <0xfff87b0 0x48>;
+
+		power-vddao5v0 = "external";
+		power-vddao1v8 = "internal";
+		power-vdd1v0 = "internal";
+		power-vddrf1v0 = "shorted";
+		power-vddao0v8 = "internal";
+		power-vddvs0v8 = "internal";
+
+		inductor-present;
+
+		ioport-power-rails = <&gpio1 2>, <&gpio2 2>, <&gpio6 2>, <&gpio7 2>, <&gpio9 4>;
+		ioport-drivectrls = <&gpio6 50>, <&gpio7 50>;
+
+		lfosc-mode = "crystal";
+		lfosc-loadcap = <15>;
+
+		lfrc-autocalibration = <20 40 3>;
+
+		hfxo-mode = "crystal";
+		hfxo-loadcap = <56>;
+	};
+};
+
+&gpio1 {
+	#ioport-power-rail-cells = <1>;
+};
+
+&gpio2 {
+	#ioport-power-rail-cells = <1>;
+};
+
+&gpio6 {
+	#ioport-power-rail-cells = <1>;
+	#ioport-drivectrl-cells = <1>;
+};
+
+&gpio7 {
+	#ioport-power-rail-cells = <1>;
+	#ioport-drivectrl-cells = <1>;
+};
+
+&gpio9 {
+	#ioport-power-rail-cells = <1>;
+};
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 1868ba8c331..9c3556b27c4 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -8,6 +8,7 @@
 
 #include <nordic/nrf54h20_cpuapp.dtsi>
 #include "nrf54h20dk_nrf54h20-common.dtsi"
+#include "nrf54h20dk_bicr.dtsi"
 
 /delete-node/ &cpurad_cpusys_ipc;
 /delete-node/ &cpusec_cpurad_ipc;
diff --git a/dts/bindings/gpio/nordic,nrf-gpio.yaml b/dts/bindings/gpio/nordic,nrf-gpio.yaml
index 097a99d8fa9..0ba8a14e132 100644
--- a/dts/bindings/gpio/nordic,nrf-gpio.yaml
+++ b/dts/bindings/gpio/nordic,nrf-gpio.yaml
@@ -5,7 +5,7 @@ description: NRF5 GPIO node
 
 compatible: "nordic,nrf-gpio"
 
-include: [gpio-controller.yaml, base.yaml]
+include: [gpio-controller.yaml, base.yaml, "nordic,nrf-port-configs.yaml"]
 
 properties:
   reg:
diff --git a/dts/bindings/gpio/nordic,nrf-port-configs.yaml b/dts/bindings/gpio/nordic,nrf-port-configs.yaml
new file mode 100644
index 00000000000..fd6754e53a0
--- /dev/null
+++ b/dts/bindings/gpio/nordic,nrf-port-configs.yaml
@@ -0,0 +1,35 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
+
+description: |
+  Nordic Port Configs
+
+  Hardware configurations that apply to IO ports.
+
+properties:
+  ioport-power-rails:
+    type: phandle-array
+    description: |
+      Power supply configurations for GPIO ports. The configuration is board-
+      specific and stored in BICR.
+      The property is encoded as <&phandle rail>, where:
+
+      - phandle is the phandle of the associated GPIO port
+      - rail is the 8-bit power rail configuration to apply to the port
+
+  ioport-drivectrls:
+    type: phandle-array
+    description: |
+      Drive control settings for GPIO ports. The configuration is board-specific
+      and stored in BICR.
+      The property is encoded as <&phandle resistance>, where:
+
+      - phandle is the phandle of the associated GPIO port
+      - resistance is the resistance in ohms to adjust in the port's drive
+      control, and can be one of the following: [33, 40, 50, 66, 100].
+
+ioport-power-rail-cells:
+  - rail
+
+ioport-drivectrl-cells:
+  - resistance
diff --git a/dts/bindings/misc/nordic,nrf-bicr.yaml b/dts/bindings/misc/nordic,nrf-bicr.yaml
new file mode 100644
index 00000000000..60894ee2e1d
--- /dev/null
+++ b/dts/bindings/misc/nordic,nrf-bicr.yaml
@@ -0,0 +1,118 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
+
+description: |
+  Nordic Board Information Configuration Registers (BICR)
+
+compatible: "nordic,nrf-bicr"
+
+include: [base.yaml, "nordic,nrf-port-configs.yaml"]
+
+properties:
+  power-vddao5v0:
+    type: string
+    description: VDD_AO_5V0 power rail configuration.
+    enum:
+      - "external"
+      - "shorted"
+
+  power-vddao1v8:
+    type: string
+    description: VDD_AO_1V8 power rail configuration.
+    enum:
+      - "internal"
+      - "external"
+
+  power-vdd1v0:
+    type: string
+    description: VDD_1V0 power rail configuration.
+    enum:
+      - "internal"
+      - "external"
+
+  power-vddrf1v0:
+    type: string
+    description: VDD_RF_1V0 power rail configuration.
+    enum:
+      - "external"
+      - "shorted"
+
+  power-vddao0v8:
+    type: string
+    description: VDD_AO_0V8 power rail configuration.
+    enum:
+      - "internal"
+      - "external"
+
+  power-vddvs0v8:
+    type: string
+    description: VDD_VS_0V8 power rail configuration.
+    enum:
+      - "internal"
+      - "external"
+
+  inductor-present:
+    type: boolean
+    description: DC/DC inductor present.
+
+  lfosc-accuracy:
+    type: int
+    description: LFXO crystal or external signal accuracy in ppm.
+    enum:
+      - 500
+      - 250
+      - 150
+      - 100
+      - 75
+      - 50
+      - 30
+      - 20
+
+  lfosc-mode:
+    type: string
+    description: |
+      LFXO operational mode.
+    enum:
+      - "crystal"
+      - "external-sine"
+      - "external-square"
+      - "disabled"
+
+  lfosc-loadcap:
+    type: int
+    description: |
+      Built-in load capacitors selection in 1pF steps, up to 25pF max. If 0,
+      only external capacitors will be used.
+
+  lfosc-startup:
+    type: int
+    description: LFXO startup time in milliseconds.
+
+  lfrc-autocalibration:
+    type: array
+    description: |
+      A list of values pertaining to LFRC autocalibration settings. The prop
+      is encoded as <temp-interval temp-delta interval-max-count>, where:
+      - temp-interval is the temperature measurement interval in 0.25s steps
+      - temp-delta is the temperature delta that should trigger a calibration
+        in 0.25 degree steps
+      - interval-max-count are the max number of temp-interval periods in
+        between calibrations, independent of temperature changes.
+
+  hfxo-mode:
+    type: string
+    description: |
+      HFXO operational mode.
+    enum:
+      - "crystal"
+      - "external-square"
+
+  hfxo-loadcap:
+    type: int
+    description: |
+      Built-in load capacitors selection in 0.25 pF steps, up to 25.75 pF max.
+      If 0, only external capacitors will be used.
+
+  hfxo-startup:
+    type: int
+    description: HFXO startup time in milliseconds.
diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt
index a9384a03633..eb85fd58f5e 100644
--- a/modules/hal_nordic/CMakeLists.txt
+++ b/modules/hal_nordic/CMakeLists.txt
@@ -11,6 +11,9 @@ add_subdirectory_ifdef(CONFIG_HAS_NRFS nrfs)
 if(CONFIG_NRF_REGTOOL_GENERATE_UICR)
   list(APPEND nrf_regtool_components GENERATE:UICR)
 endif()
+if(CONFIG_NRF_REGTOOL_GENERATE_BICR)
+  list(APPEND nrf_regtool_components GENERATE:BICR)
+endif()
 if(DEFINED nrf_regtool_components)
   find_package(nrf-regtool 5.6.0 REQUIRED
     COMPONENTS ${nrf_regtool_components}
diff --git a/modules/hal_nordic/Kconfig.nrf_regtool b/modules/hal_nordic/Kconfig.nrf_regtool
index 396ec2050a0..b057133aaf5 100644
--- a/modules/hal_nordic/Kconfig.nrf_regtool
+++ b/modules/hal_nordic/Kconfig.nrf_regtool
@@ -11,6 +11,13 @@ config NRF_REGTOOL_GENERATE_UICR
 	  CPU domains that require UICR allocation aren't bootable without it
 	  being programmed alongside the firmware.
 
+config NRF_REGTOOL_GENERATE_BICR
+	bool "Generate BICR"
+	help
+	  Generate a BICR hex based on devicetree contents using nrf-regtool.
+	  If not already present, the BICR must be included alongside
+	  any firmware programmed to the board for the first time.
+
 config NRF_REGTOOL_VERBOSITY
 	int "Verbosity level of console output"
 	range 0 3
diff --git a/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake b/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake
index 6bcaa453cce..8e93a35adc8 100644
--- a/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake
+++ b/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake
@@ -58,6 +58,8 @@ foreach(component IN LISTS ${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS)
     )
     set_property(TARGET runners_yaml_props_target PROPERTY hex_file ${merged_hex_file})
 
+  elseif(component STREQUAL "GENERATE:BICR")
+    nrf_regtool_generate_peripheral(BICR ${PROJECT_BINARY_DIR}/bicr.hex)
   else()
     message(FATAL_ERROR "Unrecognized package component: \"${component}\"")
   endif()
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
index 2a04f58f672..597f7fbea22 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
@@ -11,4 +11,7 @@ config NUM_IRQS
 config NRF_REGTOOL_GENERATE_UICR
 	default y
 
+config NRF_REGTOOL_GENERATE_BICR
+	default y
+
 endif # SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP

From 427ba759b72bb9fa6ea5002f9301fd1ab942606f Mon Sep 17 00:00:00 2001
From: Juha Ylinen <juha.ylinen@nordicsemi.no>
Date: Fri, 19 Jan 2024 15:26:33 +0200
Subject: [PATCH 0316/2913] [nrf noup] samples: lwm2m_client: Add support for
 nRF91x

Add support for nRF91x by providing overlay configuration file.

Signed-off-by: Juha Ylinen <juha.ylinen@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 1ee66115c356fb7b0851575ec555b3242055541c)
(cherry picked from commit 32dc62dc40748e879f469d954ae667b68c4ed940)
---
 samples/net/lwm2m_client/overlay-nrf91x.conf | 53 ++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 samples/net/lwm2m_client/overlay-nrf91x.conf

diff --git a/samples/net/lwm2m_client/overlay-nrf91x.conf b/samples/net/lwm2m_client/overlay-nrf91x.conf
new file mode 100644
index 00000000000..9597791c10e
--- /dev/null
+++ b/samples/net/lwm2m_client/overlay-nrf91x.conf
@@ -0,0 +1,53 @@
+# Configuration file for nRF91x
+# This file is merged with prj.conf in the application folder, and options
+# set here will take precedence if they are present in both files.
+
+# General
+CONFIG_MAIN_STACK_SIZE=4096
+
+CONFIG_NET_SOCKETS=y
+CONFIG_NET_NATIVE=y
+CONFIG_NET_SOCKETS_OFFLOAD=y
+
+CONFIG_NET_CONFIG_MY_IPV6_ADDR=""
+CONFIG_NET_CONFIG_PEER_IPV6_ADDR=""
+CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
+CONFIG_NET_CONFIG_MY_IPV4_GW=""
+
+CONFIG_NET_CONFIG_NEED_IPV6=n
+CONFIG_NET_CONFIG_NEED_IPV4=n
+CONFIG_NET_CONFIG_AUTO_INIT=n
+
+# Modem related configurations
+CONFIG_NRF_MODEM_LIB_NET_IF=y
+CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_DOWN=n
+CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_CONNECT=n
+CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_START=n
+CONFIG_NRF_MODEM_LIB_ON_FAULT_APPLICATION_SPECIFIC=y
+
+CONFIG_LTE_LINK_CONTROL_LOG_LEVEL_DBG=n
+CONFIG_NRF_MODEM_LIB_NET_IF_LOG_LEVEL_DBG=n
+
+# Disable Duplicate Address Detection (DAD)
+# due to not being properly implemented for offloaded interfaces.
+CONFIG_NET_IPV6_NBR_CACHE=n
+CONFIG_NET_IPV6_MLD=n
+
+# Zephyr NET Connection Manager and Connectivity layer.
+CONFIG_NET_CONNECTION_MANAGER=y
+CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE=1024
+
+CONFIG_LWM2M_APP_ID="nrf91x"
+CONFIG_LWM2M_APP_SERVER="coaps://leshan.eclipseprojects.io:5684"
+CONFIG_LWM2M_DNS_SUPPORT=y
+
+## Enable DTLS support
+CONFIG_LWM2M_DTLS_SUPPORT=y
+CONFIG_LWM2M_TLS_SESSION_CACHING=y
+CONFIG_LWM2M_DTLS_CID=y
+CONFIG_TLS_CREDENTIALS=y
+
+## Crypto
+CONFIG_OBERON_BACKEND=y
+CONFIG_NORDIC_SECURITY_BACKEND=y
+CONFIG_MBEDTLS_SHA256_C=y

From 5eec5ca2ac59038194a91b7086edc50949ed83c9 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Mon, 7 Oct 2024 15:36:43 +0200
Subject: [PATCH 0317/2913] [nrf noup] samples: net: Enable Wi-Fi driver in
 sysbuild builds

Make sure Wi-Fi driver is enabled in networking samples supporting Wi-Fi
when sysbuild is used.
For shields we cannot automate this, as sysbuild doesn't recognize
shields, so, Wi-Fi has to be explicitly enabled, this is done for
twister in Wi-Fi sample.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit f3e023b6fa93918de26bca8407eee26c11baf4ec)
(cherry picked from commit 958279dfbf908b80d3239b3030d2cb3a832c91cb)
---
 samples/net/dns_resolve/Kconfig.sysbuild         | 13 +++++++++++++
 samples/net/ipv4_autoconf/Kconfig.sysbuild       | 13 +++++++++++++
 samples/net/lwm2m_client/Kconfig.sysbuild        | 13 +++++++++++++
 samples/net/mdns_responder/Kconfig.sysbuild      | 13 +++++++++++++
 samples/net/mqtt_publisher/Kconfig.sysbuild      | 13 +++++++++++++
 samples/net/mqtt_sn_publisher/Kconfig.sysbuild   | 13 +++++++++++++
 samples/net/sockets/coap_server/Kconfig.sysbuild | 13 +++++++++++++
 samples/net/sockets/echo_async/Kconfig.sysbuild  | 13 +++++++++++++
 samples/net/sockets/echo_client/Kconfig.sysbuild | 13 +++++++++++++
 samples/net/sockets/echo_server/Kconfig.sysbuild | 13 +++++++++++++
 samples/net/sockets/http_get/Kconfig.sysbuild    | 13 +++++++++++++
 samples/net/sockets/sntp_client/Kconfig.sysbuild | 13 +++++++++++++
 samples/net/syslog_net/Kconfig.sysbuild          | 13 +++++++++++++
 samples/net/telnet/Kconfig.sysbuild              | 13 +++++++++++++
 samples/net/wifi/Kconfig.sysbuild                | 13 +++++++++++++
 samples/net/wifi/sample.yaml                     |  2 ++
 16 files changed, 197 insertions(+)
 create mode 100644 samples/net/dns_resolve/Kconfig.sysbuild
 create mode 100644 samples/net/ipv4_autoconf/Kconfig.sysbuild
 create mode 100644 samples/net/lwm2m_client/Kconfig.sysbuild
 create mode 100644 samples/net/mdns_responder/Kconfig.sysbuild
 create mode 100644 samples/net/mqtt_publisher/Kconfig.sysbuild
 create mode 100644 samples/net/mqtt_sn_publisher/Kconfig.sysbuild
 create mode 100644 samples/net/sockets/coap_server/Kconfig.sysbuild
 create mode 100644 samples/net/sockets/echo_async/Kconfig.sysbuild
 create mode 100644 samples/net/sockets/echo_client/Kconfig.sysbuild
 create mode 100644 samples/net/sockets/echo_server/Kconfig.sysbuild
 create mode 100644 samples/net/sockets/http_get/Kconfig.sysbuild
 create mode 100644 samples/net/sockets/sntp_client/Kconfig.sysbuild
 create mode 100644 samples/net/syslog_net/Kconfig.sysbuild
 create mode 100644 samples/net/telnet/Kconfig.sysbuild
 create mode 100644 samples/net/wifi/Kconfig.sysbuild

diff --git a/samples/net/dns_resolve/Kconfig.sysbuild b/samples/net/dns_resolve/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/dns_resolve/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/ipv4_autoconf/Kconfig.sysbuild b/samples/net/ipv4_autoconf/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/ipv4_autoconf/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/lwm2m_client/Kconfig.sysbuild b/samples/net/lwm2m_client/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/lwm2m_client/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/mdns_responder/Kconfig.sysbuild b/samples/net/mdns_responder/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/mdns_responder/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/mqtt_publisher/Kconfig.sysbuild b/samples/net/mqtt_publisher/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/mqtt_publisher/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/mqtt_sn_publisher/Kconfig.sysbuild b/samples/net/mqtt_sn_publisher/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/mqtt_sn_publisher/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/coap_server/Kconfig.sysbuild b/samples/net/sockets/coap_server/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/sockets/coap_server/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/echo_async/Kconfig.sysbuild b/samples/net/sockets/echo_async/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/sockets/echo_async/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/echo_client/Kconfig.sysbuild b/samples/net/sockets/echo_client/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/sockets/echo_client/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/echo_server/Kconfig.sysbuild b/samples/net/sockets/echo_server/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/sockets/echo_server/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/http_get/Kconfig.sysbuild b/samples/net/sockets/http_get/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/sockets/http_get/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/sntp_client/Kconfig.sysbuild b/samples/net/sockets/sntp_client/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/sockets/sntp_client/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/syslog_net/Kconfig.sysbuild b/samples/net/syslog_net/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/syslog_net/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/telnet/Kconfig.sysbuild b/samples/net/telnet/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/telnet/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/wifi/Kconfig.sysbuild b/samples/net/wifi/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/wifi/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/wifi/sample.yaml b/samples/net/wifi/sample.yaml
index 1c106e4897a..51c52edbd6f 100644
--- a/samples/net/wifi/sample.yaml
+++ b/samples/net/wifi/sample.yaml
@@ -53,6 +53,7 @@ tests:
       - nrf7002dk/nrf5340/cpuapp/nrf7001
   sample.net.wifi.nrf7002ek:
     extra_args:
+      - SB_CONFIG_WIFI_NRF70=y
       - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
       - SHIELD=nrf7002ek
     platform_allow:
@@ -64,6 +65,7 @@ tests:
       - nucleo_h723zg
   sample.net.wifi.nrf7002eb:
     extra_args:
+      - SB_CONFIG_WIFI_NRF70=y
       - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
       - SHIELD=nrf7002eb
     platform_allow:

From b22e695a722ce2aae31b0c1f9549d1bb61ec1ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= <rafal.kuznia@nordicsemi.no>
Date: Tue, 15 Oct 2024 09:21:06 +0200
Subject: [PATCH 0318/2913] [nrf noup] dts: Select SoftDevice Controller DTS
 binding as default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Softdevice Controller is enabled using the device tree.
Added a device tree node that enables the SDC and disables the Zephyr
Bluetooth controller on nRF54L20.

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
(cherry picked from commit 5065d3b95b17315b997098f49eb44bc3ef428fd5)
(cherry picked from commit 7c64954bd09a6c5bbcd2718fca4f4a0a9138d086)
---
 boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi | 4 ++--
 dts/common/nordic/nrf54l20.dtsi                       | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
index cdf6d62a30a..ed9d76a6b19 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
@@ -18,7 +18,7 @@
 		zephyr,bt-c2h-uart = &uart20;
 		zephyr,flash-controller = &rram_controller;
 		zephyr,flash = &cpuapp_rram;
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,ieee802154 = &ieee802154;
 	};
 };
@@ -108,7 +108,7 @@
 	status = "okay";
 };
 
-&bt_hci_controller {
+&bt_hci_sdc {
 	status = "okay";
 };
 
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 56adf8fef46..17d871d2bfc 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -169,9 +169,10 @@
 					status = "disabled";
 				};
 
-				/* Note: In the nRF Connect SDK the SoftDevice Controller
-				 * is added and set as the default Bluetooth Controller.
-				 */
+				bt_hci_sdc: bt_hci_sdc {
+					compatible = "nordic,bt-hci-sdc";
+					status = "disabled";
+				};
 				bt_hci_controller: bt_hci_controller {
 					compatible = "zephyr,bt-hci-ll-sw-split";
 					status = "disabled";

From 59f4768d7c0cb16cbf6385a7fe5e3b8e02394a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Wed, 25 Sep 2024 13:49:59 +0200
Subject: [PATCH 0319/2913] [nrf noup] mbedtls: Don't enable auto-generation of
 Mbed TLS files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- We don't use this mechanism in nRF Connect SDK

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit 8331990cce596fb2a0f2028f883377bbbf9e0d22)
(cherry picked from commit 6b82ed53cfb630e361c4958e77599305723b6e28)
---
 tests/crypto/mbedtls/CMakeLists.txt | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/tests/crypto/mbedtls/CMakeLists.txt b/tests/crypto/mbedtls/CMakeLists.txt
index 7ebdc9d76a9..47670bead01 100644
--- a/tests/crypto/mbedtls/CMakeLists.txt
+++ b/tests/crypto/mbedtls/CMakeLists.txt
@@ -6,15 +6,5 @@ project(mbedtls)
 
 set(output_file ${PROJECT_BINARY_DIR}/mbedtls-check.timestamp)
 
-add_custom_command(
-    COMMENT "Check Mbed TLS auto-generated files"
-    COMMAND
-        ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/modules/mbedtls/create_psa_files.py --check
-    OUTPUT
-        ${output_file}
-)
-
-add_custom_target(check_mbedtls_auto_generated_files ALL DEPENDS ${output_file})
-
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})

From e38e10f814c596e02320253c17b948a692f1374e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Wed, 25 Sep 2024 14:05:41 +0200
Subject: [PATCH 0320/2913] [nrf noup] net: tests: Add legacy crypto API
 support for big_http_download
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-We handle legacy Crypto API support specially (favoring PSA crypto)
 the tests here require MD interface to build, which needs the config
 MBEDTLS_LEGACY_CRYPTO_C to be enable to get access to

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit 6a3ab5d4bcfc4707238fe8798181bab828d7c472)
(cherry picked from commit c101ce6c01f1f24ded628405c2bae7996d8260cd)
---
 samples/net/sockets/big_http_download/prj.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/net/sockets/big_http_download/prj.conf b/samples/net/sockets/big_http_download/prj.conf
index a406f314dfb..8677e7113e4 100644
--- a/samples/net/sockets/big_http_download/prj.conf
+++ b/samples/net/sockets/big_http_download/prj.conf
@@ -3,6 +3,7 @@ CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_ENABLE_HEAP=y
 CONFIG_MBEDTLS_MD=y
+CONFIG_MBEDTLS_LEGACY_CRYPTO_C=y
 CONFIG_MAIN_STACK_SIZE=2536
 
 # Networking config

From 1a5bfcdc8771ca6ebc26dd0c9f7f0bcbc79cd44f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Wed, 25 Sep 2024 14:31:02 +0200
Subject: [PATCH 0321/2913] [nrf noup] net: tests: crypto: Adding legacy Crypto
 support ipv6 tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-This adds crypto support for ipv6 tests by enabling
 CONFIG_MBEDTLS_LEGACY_CRYPTO_C

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit 36f533d987ccaced0e615517be079007657acfef)
(cherry picked from commit a7e6b2695679947b1ef8ad69c1491c2a5bdf2a02)
---
 tests/net/ipv6/prj.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/net/ipv6/prj.conf b/tests/net/ipv6/prj.conf
index 51cfa883727..c8dda772895 100644
--- a/tests/net/ipv6/prj.conf
+++ b/tests/net/ipv6/prj.conf
@@ -33,6 +33,7 @@ CONFIG_NET_IF_MAX_IPV6_COUNT=2
 CONFIG_NET_IPV6_PE=y
 CONFIG_NET_IPV6_PE_FILTER_PREFIX_COUNT=2
 CONFIG_NET_IPV6_PE_PREFER_PUBLIC_ADDRESSES=n
+CONFIG_MBEDTLS_LEGACY_CRYPTO_C=y
 
 # Increase the stack a bit for mps2/an385
 CONFIG_NET_RX_STACK_SIZE=1700

From 4bbe53c6a9d56513f96cf0d6bd8b776c24359cf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Wed, 25 Sep 2024 20:02:12 +0200
Subject: [PATCH 0322/2913] [nrf noup] hostap: Avoid double-definition of
 base64 APIs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-base64 API belongs to the Mbed TLS deliverable. This avoids taking in
 the duplicated APIs from hostap

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit aeca13c81604369b607195d13220f6beebe6dddc)
(cherry picked from commit 8303bb7dfd7d3ec62324a61d23a824dceaf65af1)
---
 modules/hostap/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index 1f30ee34416..fc9fd40ca82 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -105,7 +105,6 @@ zephyr_library_sources(
 	${HOSTAP_SRC_BASE}/drivers/driver_common.c
 	${HOSTAP_SRC_BASE}/drivers/drivers.c
 	${HOSTAP_SRC_BASE}/utils/crc32.c
-	${HOSTAP_SRC_BASE}/utils/base64.c
 	${HOSTAP_SRC_BASE}/utils/common.c
 	${HOSTAP_SRC_BASE}/utils/wpabuf.c
 	${HOSTAP_SRC_BASE}/utils/bitfield.c

From 73127457dd15b87fd4a7757df0c4e10dfeb5dd4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Rist=20Sk=C3=B8ien?=
 <kristoffer.skoien@nordicsemi.no>
Date: Thu, 26 Sep 2024 15:30:16 +0200
Subject: [PATCH 0323/2913] [nrf noup] dts: Add bt-ll-sw-split snippet
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OCT-3045
This fix is related to https://github.com/nrfconnect/sdk-zephyr/pull/2006
this adds the bt-ll-sw-split snippet for more bluetooth samples

Signed-off-by: Kristoffer Rist Skøien <kristoffer.skoien@nordicsemi.no>
(cherry picked from commit ea3ab045f71c5e704e778946a8459e7a3ceb54b4)
(cherry picked from commit dfae99603628fdaa5b6a9cf291af3d61d6dd0230)
---
 samples/bluetooth/bap_broadcast_sink/sysbuild.cmake | 4 ++++
 samples/bluetooth/cap_acceptor/sample.yaml          | 4 +++-
 samples/bluetooth/cap_acceptor/sysbuild.cmake       | 4 ++++
 samples/bluetooth/cap_initiator/sample.yaml         | 4 +++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/samples/bluetooth/bap_broadcast_sink/sysbuild.cmake b/samples/bluetooth/bap_broadcast_sink/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/bap_broadcast_sink/sysbuild.cmake
+++ b/samples/bluetooth/bap_broadcast_sink/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/cap_acceptor/sample.yaml b/samples/bluetooth/cap_acceptor/sample.yaml
index 6be99aab183..99de826eb6f 100644
--- a/samples/bluetooth/cap_acceptor/sample.yaml
+++ b/samples/bluetooth/cap_acceptor/sample.yaml
@@ -26,5 +26,7 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52840dk/nrf52840
       - nrf52840dongle/nrf52840
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/cap_acceptor/sysbuild.cmake b/samples/bluetooth/cap_acceptor/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/cap_acceptor/sysbuild.cmake
+++ b/samples/bluetooth/cap_acceptor/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/cap_initiator/sample.yaml b/samples/bluetooth/cap_initiator/sample.yaml
index 12a6022bcd7..865c3f5e11e 100644
--- a/samples/bluetooth/cap_initiator/sample.yaml
+++ b/samples/bluetooth/cap_initiator/sample.yaml
@@ -26,5 +26,7 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52840dk/nrf52840
       - nrf52840dongle/nrf52840
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth

From 00faf4479c36edfe3349bf2594114e7de5abe008 Mon Sep 17 00:00:00 2001
From: Pete Skeggs <peter.skeggs@nordicsemi.no>
Date: Sat, 28 Sep 2024 14:46:21 -0700
Subject: [PATCH 0324/2913] [nrf noup] net: lib: coap: Make use of
 ZSOCK_MSG_TRUNC configurable

Not all offloaded network stacks support this socket option.

Go back to previous behavior that it is not used, but allow it
to be enabled using CONFIG_COAP_CLIENT_TRUNCATE_MSGS.

Signed-off-by: Pete Skeggs <peter.skeggs@nordicsemi.no>
(cherry picked from commit fddbbd1ed0458577fae792a5ace40bd1b9742753)
(cherry picked from commit adcffa835a8eabda9e9e1ac5dc59597b2ea67747)
---
 subsys/net/lib/coap/Kconfig       |  5 +++++
 subsys/net/lib/coap/coap_client.c | 15 +++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/subsys/net/lib/coap/Kconfig b/subsys/net/lib/coap/Kconfig
index 61a5d2ab785..e41e80ef1d8 100644
--- a/subsys/net/lib/coap/Kconfig
+++ b/subsys/net/lib/coap/Kconfig
@@ -152,6 +152,11 @@ config COAP_CLIENT_MAX_REQUESTS
 	help
 	  Maximum number of CoAP requests a single client can handle at a time
 
+config COAP_CLIENT_TRUNCATE_MSGS
+	bool "Truncate blocks larger than the buffer size"
+	help
+	  Include ZSOCK_MSG_TRUNC in flags passed to zsock_recvfrom()
+
 endif # COAP_CLIENT
 
 config COAP_SERVER
diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index c99a612cc88..7c49a90981b 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -552,14 +552,21 @@ static int recv_response(struct coap_client *client, struct coap_packet *respons
 	int total_len;
 	int available_len;
 	int ret;
+	int flags = ZSOCK_MSG_DONTWAIT;
+
+	if (IS_ENABLED(CONFIG_COAP_CLIENT_TRUNCATE_MSGS)) {
+		flags |= ZSOCK_MSG_TRUNC;
+	}
 
 	memset(client->recv_buf, 0, sizeof(client->recv_buf));
 	total_len = receive(client->fd, client->recv_buf, sizeof(client->recv_buf),
-			    ZSOCK_MSG_DONTWAIT | ZSOCK_MSG_TRUNC, &client->address,
-			    &client->socklen);
+			    flags, &client->address, &client->socklen);
 
 	if (total_len < 0) {
 		LOG_ERR("Error reading response: %d", errno);
+		if (errno == EOPNOTSUPP) {
+			return -errno;
+		}
 		return -EINVAL;
 	} else if (total_len == 0) {
 		LOG_ERR("Zero length recv");
@@ -896,6 +903,10 @@ static void coap_client_recv(void *coap_cl, void *a, void *b)
 					LOG_ERR("Error receiving response");
 					clients[i]->response_ready = false;
 					k_mutex_unlock(&clients[i]->lock);
+					if (ret == -EOPNOTSUPP) {
+						LOG_ERR("Socket misconfigured.");
+						goto idle;
+					}
 					continue;
 				}
 

From 554c61a02662de46e5c02e4fc19bae2bbd90e463 Mon Sep 17 00:00:00 2001
From: Maochen Wang <maochen.wang@nxp.com>
Date: Mon, 2 Sep 2024 12:27:52 +0800
Subject: [PATCH 0325/2913] [nrf fromtree] hostap: only add STA interface when
 hostapd enabled

For add_interface(), only add STA interface when hostapd enabled,
and the Soft-AP interface will be added in zephyr_hostapd_init().

Signed-off-by: Maochen Wang <maochen.wang@nxp.com>
(cherry picked from commit e2f671ee004e6d89699ce45e2f7891b04b1aa73f)
(cherry picked from commit fd271144c9d29dffc0373757294777f126c7c39d)
---
 modules/hostap/src/supp_main.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index 8a7382c7b39..bff147df40e 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -508,6 +508,12 @@ static void iface_cb(struct net_if *iface, void *user_data)
 		return;
 	}
 
+#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
+	if (wifi_nm_iface_is_sap(iface)) {
+		return;
+	}
+#endif
+
 	if (!net_if_is_admin_up(iface)) {
 		return;
 	}

From 725a9f1de4fc3abdb4759db3b28e9f48403af9fd Mon Sep 17 00:00:00 2001
From: Gaofeng Zhang <gaofeng.zhang@nxp.com>
Date: Mon, 23 Sep 2024 11:35:11 +0800
Subject: [PATCH 0326/2913] [nrf fromtree] zephyr: hostap: fix eap secure mode
 print UNKNOWN

wpas_key_mgmt_to_zephyr doesn't support eap secure mode, add code to
support eap secure mode.

Signed-off-by: Gaofeng Zhang <gaofeng.zhang@nxp.com>
(cherry picked from commit 94386e103ee230bd01965e4171ff6de2ddff4933)
(cherry picked from commit 641848dfe6cb087060ee711400f52225e584cdf3)
---
 modules/hostap/src/supp_api.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 049223b6956..703ca789f42 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -348,6 +348,10 @@ static inline int chan_to_freq(int chan)
 static inline enum wifi_frequency_bands wpas_band_to_zephyr(enum wpa_radio_work_band band)
 {
 	switch (band) {
+	case WPA_KEY_MGMT_IEEE8021X:
+	case WPA_KEY_MGMT_IEEE8021X_SUITE_B:
+	case WPA_KEY_MGMT_IEEE8021X_SUITE_B_192:
+		return WIFI_SECURITY_TYPE_EAP_TLS;
 	case BAND_2_4_GHZ:
 		return WIFI_FREQ_BAND_2_4_GHZ;
 	case BAND_5_GHZ:

From 6108eddf50dc659107e27581facd41e02ca75844 Mon Sep 17 00:00:00 2001
From: Gang Li <gang.li_1@nxp.com>
Date: Fri, 20 Sep 2024 19:05:53 +0900
Subject: [PATCH 0327/2913] [nrf fromtree] hostap: add AP configuration cmd
 support

Implement AP configuration parameter operations.

Signed-off-by: Gang Li <gang.li_1@nxp.com>
(cherry picked from commit 4bfdb643867bc23968166506d172736eed98ae68)
(cherry picked from commit 87618b47f985c2312ac4eeab26aadc966de99155)
---
 modules/hostap/src/supp_api.c  | 51 ++++++++++++++++++++++++++++++++++
 modules/hostap/src/supp_api.h  |  9 ++++++
 modules/hostap/src/supp_main.c |  1 +
 3 files changed, 61 insertions(+)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 703ca789f42..d7c3c60749a 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1410,6 +1410,57 @@ int hapd_config_network(struct hostapd_iface *iface,
 out:
 	return ret;
 }
+
+int supplicant_ap_config_params(const struct device *dev, struct wifi_ap_config_params *params)
+{
+	struct hostapd_iface *iface;
+	const struct wifi_mgmt_ops *const wifi_mgmt_api = get_wifi_mgmt_api(dev);
+	int ret = 0;
+
+	if (params->type & WIFI_AP_CONFIG_PARAM_MAX_INACTIVITY) {
+		if (!wifi_mgmt_api || !wifi_mgmt_api->ap_config_params) {
+			wpa_printf(MSG_ERROR, "ap_config_params not supported");
+			return -ENOTSUP;
+		}
+
+		ret = wifi_mgmt_api->ap_config_params(dev, params);
+		if (ret) {
+			wpa_printf(MSG_ERROR,
+				   "Failed to set maximum inactivity duration for stations");
+		} else {
+			wpa_printf(MSG_INFO, "Set maximum inactivity duration for stations: %d (s)",
+				   params->max_inactivity);
+		}
+	}
+	if (params->type & WIFI_AP_CONFIG_PARAM_MAX_NUM_STA) {
+		k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
+
+		iface = get_hostapd_handle(dev);
+		if (!iface) {
+			ret = -ENOENT;
+			wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
+			goto out;
+		}
+
+		if (iface->state > HAPD_IFACE_DISABLED) {
+			ret = -EBUSY;
+			wpa_printf(MSG_ERROR, "Interface %s is not in disable state", dev->name);
+			goto out;
+		}
+
+		if (!hostapd_cli_cmd_v("set max_num_sta %d", params->max_num_sta)) {
+			ret = -EINVAL;
+			wpa_printf(MSG_ERROR, "Failed to set maximum number of stations");
+			goto out;
+		}
+		wpa_printf(MSG_INFO, "Set maximum number of stations: %d", params->max_num_sta);
+
+out:
+		k_mutex_unlock(&wpa_supplicant_mutex);
+	}
+
+	return ret;
+}
 #endif
 
 int supplicant_ap_enable(const struct device *dev,
diff --git a/modules/hostap/src/supp_api.h b/modules/hostap/src/supp_api.h
index dbef7b77796..9dc37cbd88a 100644
--- a/modules/hostap/src/supp_api.h
+++ b/modules/hostap/src/supp_api.h
@@ -225,6 +225,15 @@ int supplicant_get_wifi_conn_params(const struct device *dev,
  * @return 0 for OK; -1 for ERROR
  */
 int hapd_state(const struct device *dev, int *state);
+
+/**
+ * @brief Wi-Fi AP configuration parameter.
+ *
+ * @param dev Wi-Fi device
+ * @param params AP parameters
+ * @return 0 for OK; -1 for ERROR
+ */
+int supplicant_ap_config_params(const struct device *dev, struct wifi_ap_config_params *params);
 #else
 static inline int hapd_state(const struct device *dev, int *state)
 {
diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index bff147df40e..b696c7bc02a 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -101,6 +101,7 @@ static const struct wifi_mgmt_ops mgmt_ap_ops = {
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	.dpp_dispatch = hapd_dpp_dispatch,
 #endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
+	.ap_config_params = supplicant_ap_config_params,
 };
 
 DEFINE_WIFI_NM_INSTANCE(hostapd, &mgmt_ap_ops);

From d48b43dd08d0086593545ea0ea6fdfbe87dcf58f Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Fri, 27 Sep 2024 21:32:47 +0300
Subject: [PATCH 0328/2913] [nrf fromtree] hostap: The security keys were
 checked in wrong function

The security check case statements were in frequency band
setting checks. This is totally wrong and will cause compiler
warnings. Moving the checks to correct function.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 2f47de60a0a7038eed1bfe11ced16ae51444434e)
(cherry picked from commit d7fbdf9a07303f0b51fecd4aed50e5b9401cbdc1)
---
 modules/hostap/src/supp_api.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index d7c3c60749a..58e2a3127aa 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -348,10 +348,6 @@ static inline int chan_to_freq(int chan)
 static inline enum wifi_frequency_bands wpas_band_to_zephyr(enum wpa_radio_work_band band)
 {
 	switch (band) {
-	case WPA_KEY_MGMT_IEEE8021X:
-	case WPA_KEY_MGMT_IEEE8021X_SUITE_B:
-	case WPA_KEY_MGMT_IEEE8021X_SUITE_B_192:
-		return WIFI_SECURITY_TYPE_EAP_TLS;
 	case BAND_2_4_GHZ:
 		return WIFI_FREQ_BAND_2_4_GHZ;
 	case BAND_5_GHZ:
@@ -364,6 +360,10 @@ static inline enum wifi_frequency_bands wpas_band_to_zephyr(enum wpa_radio_work_
 static inline enum wifi_security_type wpas_key_mgmt_to_zephyr(int key_mgmt, int proto)
 {
 	switch (key_mgmt) {
+	case WPA_KEY_MGMT_IEEE8021X:
+	case WPA_KEY_MGMT_IEEE8021X_SUITE_B:
+	case WPA_KEY_MGMT_IEEE8021X_SUITE_B_192:
+		return WIFI_SECURITY_TYPE_EAP_TLS;
 	case WPA_KEY_MGMT_NONE:
 		return WIFI_SECURITY_TYPE_NONE;
 	case WPA_KEY_MGMT_PSK:

From c05b4ebbc31859de1300dbc444a127106d1360d3 Mon Sep 17 00:00:00 2001
From: Rex Chen <rex.chen_1@nxp.com>
Date: Sun, 29 Sep 2024 18:30:00 +0900
Subject: [PATCH 0329/2913] [nrf fromtree] net: wifi: shell: add reg domain
 support

Supp api add reg domain support.

Signed-off-by: Rex Chen <rex.chen_1@nxp.com>
(cherry picked from commit 5a195001e393fcfbb48111f8376e45b2bb63b233)
(cherry picked from commit 563c136986ede47eddb2506001a5149233e14b8a)
---
 modules/hostap/src/supp_api.c | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 58e2a3127aa..542ba57b235 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1141,13 +1141,44 @@ int supplicant_reg_domain(const struct device *dev,
 			  struct wifi_reg_domain *reg_domain)
 {
 	const struct wifi_mgmt_ops *const wifi_mgmt_api = get_wifi_mgmt_api(dev);
+	struct wpa_supplicant *wpa_s;
+	int ret = -1;
 
 	if (!wifi_mgmt_api || !wifi_mgmt_api->reg_domain) {
 		wpa_printf(MSG_ERROR, "Regulatory domain not supported");
 		return -ENOTSUP;
 	}
 
-	return wifi_mgmt_api->reg_domain(dev, reg_domain);
+	if (reg_domain->oper == WIFI_MGMT_GET) {
+		return wifi_mgmt_api->reg_domain(dev, reg_domain);
+	}
+
+	if (reg_domain->oper == WIFI_MGMT_SET) {
+		k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
+
+		wpa_s = get_wpa_s_handle(dev);
+		if (!wpa_s) {
+			wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
+			goto out;
+		}
+
+		if (!wpa_cli_cmd_v("set country %s", reg_domain->country_code)) {
+			goto out;
+		}
+
+#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
+		if (!hostapd_cli_cmd_v("set country_code %s", reg_domain->country_code)) {
+			goto out;
+		}
+#endif
+
+		ret = 0;
+
+out:
+		k_mutex_unlock(&wpa_supplicant_mutex);
+	}
+
+	return ret;
 }
 
 int supplicant_mode(const struct device *dev, struct wifi_mode_info *mode)

From 83b66a55f6a6e49a5a3c8caf2fb0b52f5b7b7556 Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Wed, 25 Sep 2024 14:18:47 +0300
Subject: [PATCH 0330/2913] [nrf fromtree] hostap: Use proper value when
 generating supplicant event

The previous NET_EVENT_SUPPLICANT_CMD_INT_EVENT is from
"enum net_event_supplicant_cmd" but the supplicant_send_wifi_mgmt_event()
has the event parameter as an "enum net_event_wifi_cmd" and those event
number spaces are different.

This meant that the wrong event value NET_EVENT_SUPPLICANT_CMD_INT_EVENT
maps to NET_EVENT_WIFI_CMD_TWT (from "enum net_event_wifi_cmd") which
fortunately did not cause issue in this case because the
supplicant_send_wifi_mgmt_event() has no handling for this TWT event value.

It is important we fix this as this can cause great confusion in the
future.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 4b83b2346fe1d3845a10cd47e449dd3418b82952)
(cherry picked from commit 883a02fbb19bf296fbf2fe25c8ec2f278cc81f83)
---
 include/zephyr/net/wifi_mgmt.h   | 2 ++
 modules/hostap/src/supp_events.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/zephyr/net/wifi_mgmt.h b/include/zephyr/net/wifi_mgmt.h
index 899cb2f095b..68650dd9319 100644
--- a/include/zephyr/net/wifi_mgmt.h
+++ b/include/zephyr/net/wifi_mgmt.h
@@ -282,6 +282,8 @@ enum net_event_wifi_cmd {
 	NET_EVENT_WIFI_CMD_AP_STA_CONNECTED,
 	/** STA disconnected from AP */
 	NET_EVENT_WIFI_CMD_AP_STA_DISCONNECTED,
+	/** Supplicant specific event */
+	NET_EVENT_WIFI_CMD_SUPPLICANT,
 };
 
 /** Event emitted for Wi-Fi scan result */
diff --git a/modules/hostap/src/supp_events.c b/modules/hostap/src/supp_events.c
index 617779b4d44..9ac472b6bdb 100644
--- a/modules/hostap/src/supp_events.c
+++ b/modules/hostap/src/supp_events.c
@@ -386,7 +386,7 @@ int supplicant_send_wifi_mgmt_event(const char *ifname, enum net_event_wifi_cmd
 				(struct wifi_ap_sta_info *)supplicant_status);
 		break;
 #endif /* CONFIG_AP */
-	case NET_EVENT_SUPPLICANT_CMD_INT_EVENT:
+	case NET_EVENT_WIFI_CMD_SUPPLICANT:
 		event_data.data = &data;
 		if (supplicant_process_status(&event_data, (char *)supplicant_status) > 0) {
 			net_mgmt_event_notify_with_info(NET_EVENT_SUPPLICANT_INT_EVENT,

From 29aca670905ba5526b9c58e503a42b59f336c7f0 Mon Sep 17 00:00:00 2001
From: Fengming Ye <frank.ye@nxp.com>
Date: Fri, 27 Sep 2024 12:07:12 +0900
Subject: [PATCH 0331/2913] [nrf fromtree] hostap: add crypto module test
 kconfig option

Add crypto module test kconfig option
CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_TEST,
which is default n and hidden.
It is only available by developer for crypto module test.

Signed-off-by: Fengming Ye <frank.ye@nxp.com>
(cherry picked from commit e40eef2d58d4355b0b9978228240d712de6d956c)
(cherry picked from commit ddddfdd85d13afcce81137c1fdaa270ad08c6b0d)
---
 modules/hostap/CMakeLists.txt | 7 +++++++
 modules/hostap/Kconfig        | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index fc9fd40ca82..4cd62bc2f9e 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -502,6 +502,13 @@ zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	${HOSTAP_SRC_BASE}/crypto/fips_prf_internal.c
 	${HOSTAP_SRC_BASE}/crypto/milenage.c
 )
+
+zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_TEST
+	${HOSTAP_SRC_BASE}/crypto/crypto_module_tests.c
+	${HOSTAP_SRC_BASE}/crypto/fips_prf_internal.c
+	${HOSTAP_SRC_BASE}/crypto/sha1-internal.c
+	${HOSTAP_SRC_BASE}/crypto/sha1-tlsprf.c
+)
 endif()
 
 zephyr_library_link_libraries_ifndef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index c49cee46973..4350b054e13 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -485,4 +485,8 @@ config SAE_PWE_EARLY_EXIT
 	  this can be intensive, so, add an option to exit early.
 	  Note that this is highly insecure and shouldn't be used in production
 
+config WIFI_NM_WPA_SUPPLICANT_CRYPTO_TEST
+	bool
+	depends on WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA
+
 endif # WIFI_NM_WPA_SUPPLICANT

From 9c998e0466efe869c69bda691293ea3534d415d1 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 7 Oct 2024 01:22:04 +0530
Subject: [PATCH 0332/2913] [nrf fromtree] modules: hostap: Use OS primitive
 even in native code

This was we can modify it in a single place that works both for native
and OS specific code.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit bcef9ac6eab222526644fa9257420e4ee7fb8f59)
(cherry picked from commit d00ea9274c38e238b4bf2714d7fa4883746165de)
---
 modules/hostap/src/supp_api.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 542ba57b235..875d2d72949 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -269,7 +269,7 @@ static int wpa_supp_supported_channels(struct wpa_supplicant *wpa_s, uint8_t ban
 	}
 
 	size = ((mode->num_channels) * CHAN_NUM_LEN) + 1;
-	_chan_list = k_malloc(size);
+	_chan_list = os_malloc(size);
 	if (!_chan_list) {
 		wpa_printf(MSG_ERROR, "Mem alloc failed for channel list");
 		return -ENOMEM;
@@ -500,11 +500,11 @@ static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
 		if (chan_list) {
 			if (!wpa_cli_cmd_v("set_network %d scan_freq%s", resp.network_id,
 					   chan_list)) {
-				k_free(chan_list);
+				os_free(chan_list);
 				goto out;
 			}
 
-			k_free(chan_list);
+			os_free(chan_list);
 		}
 	}
 

From 6abc047bbaf336526f107f60344caef8bd57205f Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 7 Oct 2024 01:37:49 +0530
Subject: [PATCH 0333/2913] [nrf fromtree] modules: hostap: Fix heap pool
 allocation

Now that hostap is used k_heap, it needs to reserve the kernel heap not
libc heap.

Fixes #79477.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 3ade4bed2749d2096bba293b8869c057adaf55a6)
(cherry picked from commit 4f541cf957db93675cfd14969b1defbb8d51096e)
---
 modules/hostap/Kconfig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index 4350b054e13..e1417e14e02 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -23,13 +23,13 @@ config WIFI_NM_WPA_SUPPLICANT
 
 if WIFI_NM_WPA_SUPPLICANT
 
-config COMMON_LIBC_MALLOC_ARENA_SIZE
-	default 85000 if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE && !MBEDTLS_ENABLE_HEAP
-	default 40000 if WIFI_NM_WPA_SUPPLICANT_AP
+config HEAP_MEM_POOL_ADD_SIZE_HOSTAP
+	def_int 85000 if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE && !MBEDTLS_ENABLE_HEAP
+	def_int 40000 if WIFI_NM_WPA_SUPPLICANT_AP
 	# 8192 for MbedTLS heap
-	default 21808 if MBEDTLS_ENABLE_HEAP
+	def_int 21808 if MBEDTLS_ENABLE_HEAP
 	# 30K is mandatory, but might need more for long duration use cases
-	default 30000
+	def_int 30000
 
 config WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE
 	int "Stack size for wpa_supplicant thread"

From 939749ed39292a6f44f8cc591d8c9c8100a5035b Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 7 Oct 2024 01:57:24 +0530
Subject: [PATCH 0334/2913] [nrf fromtree] modules: hostap: Add missing default
 for max STAs in AP mode

The default should honor the build time flag.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit b2c6f6c53b1bf1df66434b8ae0a37502b093ba5b)
(cherry picked from commit 4ad5c6f61adbc78b33b13848d52a5ef429ace545)
---
 modules/hostap/src/supp_api.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 875d2d72949..a19747575fb 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1575,6 +1575,8 @@ int supplicant_ap_enable(const struct device *dev,
 
 	/* No need to check for existing network to join for SoftAP*/
 	wpa_s->conf->ap_scan = 2;
+	/* Set BSS parameter max_num_sta to default configured value */
+	wpa_s->conf->max_num_sta = CONFIG_WIFI_MGMT_AP_MAX_NUM_STA;
 
 	ret = wpas_add_and_config_network(wpa_s, params, true);
 	if (ret) {

From d6107710ba046088fdabf3a8d46c242d97a5010a Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 7 Oct 2024 01:58:10 +0530
Subject: [PATCH 0335/2913] [nrf fromtree] modules: hostap: Use the build time
 flag

Instead of hard-coded value, use the build time flag.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 970428419cfdf7a1c836528a44fe006121080064)
(cherry picked from commit 0823505894675507c3a18ec1140aaa42de6a9ce2)
---
 modules/hostap/src/supp_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index b696c7bc02a..b111f43a4e8 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -873,7 +873,7 @@ struct hostapd_config *hostapd_config_read2(const char *fname)
 
 	bss                 = conf->last_bss;
 	bss->start_disabled = 1;
-	bss->max_num_sta    = 8;
+	bss->max_num_sta    = CONFIG_WIFI_MGMT_AP_MAX_NUM_STA;
 	bss->dtim_period    = 1;
 	os_strlcpy(conf->bss[0]->iface, ifname, sizeof(conf->bss[0]->iface));
 	bss->logger_stdout_level = HOSTAPD_LEVEL_INFO;

From cfc1427785547a9e199973d0f1d66e4770827c38 Mon Sep 17 00:00:00 2001
From: Maochen Wang <maochen.wang@nxp.com>
Date: Tue, 8 Oct 2024 17:19:56 +0800
Subject: [PATCH 0336/2913] [nrf fromtree] hostap: fix other STA failed to
 connect to SAP

The format of wpa_passphrase and sae_password is wrong when start the
SAP, which leads the invaild MIC check error when other STA try to
connect in security mode. Change the wrong format can fix this issue.

Signed-off-by: Maochen Wang <maochen.wang@nxp.com>
(cherry picked from commit 838ff13fe2d6e0ec7e289efd7908d429e6e57d23)
(cherry picked from commit 025a9c20f245acefbd76b3f4285c110e922e02bd)
---
 modules/hostap/src/supp_api.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index a19747575fb..3d79fab1eb1 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1357,7 +1357,7 @@ int hapd_config_network(struct hostapd_iface *iface,
 			if (!hostapd_cli_cmd_v("set wpa_key_mgmt WPA-PSK")) {
 				goto out;
 			}
-			if (!hostapd_cli_cmd_v("set wpa_passphrase \"%s\"", params->psk)) {
+			if (!hostapd_cli_cmd_v("set wpa_passphrase %s", params->psk)) {
 				goto out;
 			}
 			if (!hostapd_cli_cmd_v("set wpa_pairwise CCMP")) {
@@ -1370,7 +1370,7 @@ int hapd_config_network(struct hostapd_iface *iface,
 			if (!hostapd_cli_cmd_v("set wpa_key_mgmt WPA-PSK")) {
 				goto out;
 			}
-			if (!hostapd_cli_cmd_v("set wpa_passphrase \"%s\"", params->psk)) {
+			if (!hostapd_cli_cmd_v("set wpa_passphrase %s", params->psk)) {
 				goto out;
 			}
 			if (!hostapd_cli_cmd_v("set rsn_pairwise CCMP")) {
@@ -1383,7 +1383,7 @@ int hapd_config_network(struct hostapd_iface *iface,
 			if (!hostapd_cli_cmd_v("set wpa_key_mgmt WPA-PSK-SHA256")) {
 				goto out;
 			}
-			if (!hostapd_cli_cmd_v("set wpa_passphrase \"%s\"", params->psk)) {
+			if (!hostapd_cli_cmd_v("set wpa_passphrase %s", params->psk)) {
 				goto out;
 			}
 			if (!hostapd_cli_cmd_v("set rsn_pairwise CCMP")) {
@@ -1396,7 +1396,7 @@ int hapd_config_network(struct hostapd_iface *iface,
 			if (!hostapd_cli_cmd_v("set wpa_key_mgmt SAE")) {
 				goto out;
 			}
-			if (!hostapd_cli_cmd_v("set sae_password \"%s\"",
+			if (!hostapd_cli_cmd_v("set sae_password %s",
 					       params->sae_password ? params->sae_password :
 					       params->psk)) {
 				goto out;

From 3e8fb90a4ca096865c6b5c684858b97611a6a7c2 Mon Sep 17 00:00:00 2001
From: Gang Li <gang.li_1@nxp.com>
Date: Fri, 20 Sep 2024 15:54:45 +0900
Subject: [PATCH 0337/2913] [nrf fromtree] hostap: add
 WPA-Auto-Personal(WPA2/WPA3 mixed) support

Add WPA-Auto-Personal support for AP and STA.
This mode uses WPA2/WPA3 SAE mixed security with PSK.

Signed-off-by: Gang Li <gang.li_1@nxp.com>
(cherry picked from commit 79222c9c11f69c879de295477db6a811de6c2497)
(cherry picked from commit 51c09bbcd9e0dae8823eb7888c7410bef0a51eb2)
---
 modules/hostap/src/supp_api.c | 53 ++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 3d79fab1eb1..e3efd8c9bf8 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -603,6 +603,32 @@ static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
 					goto out;
 				}
 			}
+		} else if (params->security == WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL) {
+			if (!wpa_cli_cmd_v("set_network %d psk \"%s\"", resp.network_id,
+					   psk_null_terminated)) {
+				goto out;
+			}
+
+			if (params->sae_password) {
+				if (!wpa_cli_cmd_v("set_network %d sae_password \"%s\"",
+						   resp.network_id, sae_null_terminated)) {
+					goto out;
+				}
+			} else {
+				if (!wpa_cli_cmd_v("set_network %d sae_password \"%s\"",
+						   resp.network_id, psk_null_terminated)) {
+					goto out;
+				}
+			}
+
+			if (!wpa_cli_cmd_v("set sae_pwe 2")) {
+				goto out;
+			}
+
+			if (!wpa_cli_cmd_v("set_network %d key_mgmt WPA-PSK SAE",
+					   resp.network_id)) {
+				goto out;
+			}
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 		} else if (params->security == WIFI_SECURITY_TYPE_EAP_TLS) {
 			if (!wpa_cli_cmd_v("set_network %d key_mgmt WPA-EAP",
@@ -1407,7 +1433,32 @@ int hapd_config_network(struct hostapd_iface *iface,
 			if (!hostapd_cli_cmd_v("set sae_pwe 2")) {
 				goto out;
 			}
-			iface->bss[0]->conf->sae_pwe = 2;
+		} else if (params->security == WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL) {
+			if (!hostapd_cli_cmd_v("set wpa 2")) {
+				goto out;
+			}
+
+			if (!hostapd_cli_cmd_v("set wpa_key_mgmt WPA-PSK SAE")) {
+				goto out;
+			}
+
+			if (!hostapd_cli_cmd_v("set wpa_passphrase \"%s\"", params->psk)) {
+				goto out;
+			}
+
+			if (!hostapd_cli_cmd_v("set sae_password \"%s\"",
+					       params->sae_password ? params->sae_password
+								    : params->psk)) {
+				goto out;
+			}
+
+			if (!hostapd_cli_cmd_v("set rsn_pairwise CCMP")) {
+				goto out;
+			}
+
+			if (!hostapd_cli_cmd_v("set sae_pwe 2")) {
+				goto out;
+			}
 		} else if (params->security == WIFI_SECURITY_TYPE_DPP) {
 			if (!hostapd_cli_cmd_v("set wpa 2")) {
 				goto out;

From 6441e79117b3bceda1f3fa470b6572e6d21cdce9 Mon Sep 17 00:00:00 2001
From: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
Date: Thu, 10 Oct 2024 13:15:32 +0530
Subject: [PATCH 0338/2913] [nrf fromtree] modules: hostap: Add config options
 for EAP types

Enabling all EAP types for enterprise mode increases
memory usage in both ROM and RAM. Provide config options for each
type to let solutions choose the methods based on their
requirements.

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
(cherry picked from commit 609520bf3fbf5fa20a4941eb253b1eb6903e60ad)
(cherry picked from commit c8c1eed9ff46877b1234cbea87010b1b0576ad77)
---
 modules/hostap/CMakeLists.txt  | 133 +++++++++++++++++++++++++++------
 modules/hostap/Kconfig         |  50 +++++++++++++
 modules/hostap/src/supp_main.h |  30 ++++++++
 3 files changed, 191 insertions(+), 22 deletions(-)

diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index 4cd62bc2f9e..4ca33cf1623 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -323,68 +323,157 @@ zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_WPS
 )
 
 zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+	${HOSTAP_SRC_BASE}/eap_common/eap_common.c
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+	IEEE8021X_EAPOL
+	EAP_IKEv2
+)
+
+zephyr_library_sources_ifdef(CONFIG_EAP_TLS
 	${HOSTAP_SRC_BASE}/eap_peer/eap_tls.c
 	${HOSTAP_SRC_BASE}/eap_peer/eap_tls_common.c
-	${HOSTAP_SRC_BASE}/eap_common/eap_common.c
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_TLS
+	EAP_TLS
+)
+
+zephyr_library_sources_ifdef(CONFIG_EAP_TTLS
+	${HOSTAP_SRC_BASE}/eap_peer/eap_ttls.c
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_TTLS
+        EAP_TTLS
+)
 
+zephyr_library_sources_ifdef(CONFIG_EAP_PEAP
 	${HOSTAP_SRC_BASE}/eap_peer/eap_peap.c
 	${HOSTAP_SRC_BASE}/eap_common/eap_peap_common.c
-	${HOSTAP_SRC_BASE}/eap_peer/eap_ttls.c
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_PEAP
+        EAP_PEAP
+)
+
+zephyr_library_sources_ifdef(CONFIG_EAP_MD5
 	${HOSTAP_SRC_BASE}/eap_peer/eap_md5.c
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_MD5
+        EAP_MD5
+)
+
+zephyr_library_sources_ifdef(CONFIG_EAP_MSCHAPV2
 	${HOSTAP_SRC_BASE}/eap_peer/eap_mschapv2.c
-	${HOSTAP_SRC_BASE}/eap_common/chap.c
 	${HOSTAP_SRC_BASE}/eap_peer/mschapv2.c
+	${HOSTAP_SRC_BASE}/eap_common/chap.c
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_MSCHAPV2
+        EAP_MSCHAPv2
+)
+
+zephyr_library_sources_ifdef(CONFIG_EAP_LEAP
 	${HOSTAP_SRC_BASE}/eap_peer/eap_leap.c
+)
 
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_LEAP
+        EAP_LEAP
+)
+
+zephyr_library_sources_ifdef(CONFIG_EAP_PSK
 	${HOSTAP_SRC_BASE}/eap_peer/eap_psk.c
 	${HOSTAP_SRC_BASE}/eap_common/eap_psk_common.c
+)
 
-	${HOSTAP_SRC_BASE}/eap_peer/eap_fast.c
-	${HOSTAP_SRC_BASE}/eap_peer/eap_fast_pac.c
-	${HOSTAP_SRC_BASE}/eap_common/eap_fast_common.c
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_PSK
+        EAP_PSK
+)
 
+zephyr_library_sources_ifdef(CONFIG_EAP_PAX
 	${HOSTAP_SRC_BASE}/eap_peer/eap_pax.c
 	${HOSTAP_SRC_BASE}/eap_common/eap_pax_common.c
+)
 
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_PAX
+        EAP_PAX
+)
+
+zephyr_library_sources_ifdef(CONFIG_EAP_SAKE
 	${HOSTAP_SRC_BASE}/eap_peer/eap_sake.c
 	${HOSTAP_SRC_BASE}/eap_common/eap_sake_common.c
+)
 
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_SAKE
+        EAP_SAKE
+)
+
+zephyr_library_sources_ifdef(CONFIG_EAP_GPSK
 	${HOSTAP_SRC_BASE}/eap_peer/eap_gpsk.c
 	${HOSTAP_SRC_BASE}/eap_common/eap_gpsk_common.c
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_GPSK
+        EAP_GPSK
+)
 
+zephyr_library_sources_ifdef(CONFIG_EAP_PWD
 	${HOSTAP_SRC_BASE}/eap_peer/eap_pwd.c
 	${HOSTAP_SRC_BASE}/eap_common/eap_pwd_common.c
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_PWD
+        EAP_PWD
+)
 
+zephyr_library_sources_ifdef(CONFIG_EAP_EKE
 	${HOSTAP_SRC_BASE}/eap_peer/eap_eke.c
 	${HOSTAP_SRC_BASE}/eap_common/eap_eke_common.c
+)
 
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_EKE
+        EAP_EKE
+)
+
+zephyr_library_sources_ifdef(CONFIG_EAP_IKEV2
 	${HOSTAP_SRC_BASE}/eap_peer/eap_ikev2.c
 	${HOSTAP_SRC_BASE}/eap_peer/ikev2.c
 	${HOSTAP_SRC_BASE}/eap_common/eap_ikev2_common.c
 	${HOSTAP_SRC_BASE}/eap_common/ikev2_common.c
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_IKEV2
+        EAP_IKEV2
+)
 
+zephyr_library_sources_ifdef(CONFIG_EAP_SIM
 	${HOSTAP_SRC_BASE}/eap_peer/eap_sim.c
 	${HOSTAP_SRC_BASE}/eap_common/eap_sim_common.c
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_SIM
+        EAP_SIM
+)
 
+zephyr_library_sources_ifdef(CONFIG_EAP_AKA
 	${HOSTAP_SRC_BASE}/eap_peer/eap_aka.c
 )
 
-zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
-	EAP_TLS
-	IEEE8021X_EAPOL
-	EAP_PEAP
-	EAP_TTLS
-	EAP_MD5
-	EAP_MSCHAPv2
-	EAP_LEAP
-	EAP_PSK
-	EAP_FAST
-	EAP_PAX
-	EAP_SAKE
-	EAP_GPSK
-	EAP_PWD
-	EAP_EKE
-	EAP_IKEv2
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_AKA
+        EAP_AKA
+)
+
+# Needs TLS1.3 and SESSION_TICKETS
+zephyr_library_sources_ifdef(CONFIG_EAP_FAST
+  ${HOSTAP_SRC_BASE}/eap_peer/eap_fast.c
+  ${HOSTAP_SRC_BASE}/eap_peer/eap_fast_pac.c
+  ${HOSTAP_SRC_BASE}/eap_common/eap_fast_common.c
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_FAST
+  EAP_FAST
 )
 
 zephyr_library_compile_definitions_ifndef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index e1417e14e02..01574cfc60c 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -178,6 +178,56 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	select MBEDTLS_PEM_CERTIFICATE_FORMAT
 	depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
 
+config EAP_TLS
+	bool "EAP-TLS support"
+
+config EAP_TTLS
+	bool "EAP-TTLS support"
+
+config EAP_PEAP
+	bool "EAP-PEAP support"
+
+config EAP_MD5
+	bool "EAP-MD5 support"
+
+config EAP_MSCHAPV2
+	bool "EAP-MSCHAPv2 support"
+
+config EAP_LEAP
+	bool "EAP-LEAP support"
+
+config EAP_PSK
+	bool "EAP-PSK support"
+
+config EAP_PAX
+	bool "EAP-PAX support"
+
+config EAP_SAKE
+	bool "EAP-SAKE support"
+
+config EAP_GPSK
+	bool "EAP-GPSK support"
+
+config EAP_PWD
+	bool "EAP-PWD support"
+
+config EAP_EKE
+	bool "EAP-EKE support"
+
+config EAP_IKEV2
+	bool "EAP-IKEv2 support"
+
+config EAP_SIM
+	bool "EAP-SIM support"
+
+config EAP_AKA
+	bool "EAP-AKA support"
+
+config EAP_ALL
+	bool "All EAP methods support"
+	select EAP_TLS
+	default y if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+
 config WIFI_NM_WPA_SUPPLICANT_WPA3
 	bool "WPA3 support"
 	depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
diff --git a/modules/hostap/src/supp_main.h b/modules/hostap/src/supp_main.h
index 03f7461555e..7137d281929 100644
--- a/modules/hostap/src/supp_main.h
+++ b/modules/hostap/src/supp_main.h
@@ -6,6 +6,36 @@
 #ifndef __SUPP_MAIN_H_
 #define __SUPP_MAIN_H_
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+/* At least one of the EAP methods need to be enabled in enterprise mode */
+#if !defined(CONFIG_EAP_TLS) && !defined(CONFIG_EAP_TTLS) && \
+	!defined(CONFIG_EAP_PEAP) && !defined(CONFIG_EAP_FAST) && \
+	!defined(CONFIG_EAP_SIM) && !defined(CONFIG_EAP_AKA) && \
+	!defined(CONFIG_EAP_MD5) && !defined(CONFIG_EAP_MSCHAPV2) && \
+	!defined(CONFIG_EAP_PSK) && !defined(CONFIG_EAP_PAX) && \
+	!defined(CONFIG_EAP_SAKE) && !defined(CONFIG_EAP_GPSK) && \
+	!defined(CONFIG_EAP_PWD) && !defined(CONFIG_EAP_EKE) && \
+	!defined(CONFIG_EAP_IKEV2)
+#error "At least one of the following EAP methods need to be defined    \
+	CONFIG_EAP_TLS    \
+	CONFIG_EAP_TTLS   \
+	CONFIG_EAP_PEAP   \
+	CONFIG_EAP_MD5        \
+	CONFIG_EAP_MSCHAPV2    \
+	CONFIG_EAP_LEAP    \
+	CONFIG_EAP_PSK   \
+	CONFIG_EAP_PAX   \
+	CONFIG_EAP_SAKE   \
+	CONFIG_EAP_GPSK   \
+	CONFIG_EAP_PWD   \
+	CONFIG_EAP_EKE   \
+	CONFIG_EAP_IKEV2   \
+	CONFIG_EAP_SIM   \
+	CONFIG_EAP_AKA   \
+	CONFIG_EAP_ALL "
+#endif /* EAP METHODS */
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
+
 #if !defined(CONFIG_NET_DHCPV4)
 static inline void net_dhcpv4_start(struct net_if *iface)
 {

From 39529697afde9c13b35cb67741ab90f98ce209d5 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Thu, 19 Sep 2024 17:13:35 +0530
Subject: [PATCH 0339/2913] [nrf fromtree] modules: hostap: Add separate config
 for EAP-FAST

EAP-FAST has extra requirements (TLS 1.3, session tickets etc) and is
seldom used, so, remove it from Enterprise list and add a separate
Kconfig option.

This solves the build error when Enterprise mode is enabled.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 39b904d9cc6cb40013a8a5ff75cd8053eeed8889)
(cherry picked from commit 4206c05b44adaa87d16e2de4f1238f264dc648f2)
---
 modules/hostap/CMakeLists.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index 4ca33cf1623..8eeaa5879a2 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -476,6 +476,17 @@ zephyr_library_compile_definitions_ifdef(CONFIG_EAP_FAST
   EAP_FAST
 )
 
+# Needs TLS1.3 and SESSION_TICKETS
+zephyr_library_sources_ifdef(CONFIG_EAP_FAST
+  ${HOSTAP_SRC_BASE}/eap_peer/eap_fast.c
+  ${HOSTAP_SRC_BASE}/eap_peer/eap_fast_pac.c
+  ${HOSTAP_SRC_BASE}/eap_common/eap_fast_common.c
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_FAST
+  EAP_FAST
+)
+
 zephyr_library_compile_definitions_ifndef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	CONFIG_NO_CONFIG_BLOBS
 )

From 3fe3436d91eceec27759af8ffbae4225ed7445d4 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Fri, 20 Sep 2024 00:16:50 +0530
Subject: [PATCH 0340/2913] [nrf fromtree] modules: hostap: Fix checks for
 Enterprise security

Enterprise security doesn't have either SAE or PSK, so, using a blanker
else throws a false warning. Fix the checks to proper handler enterprise
mode.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 48916d66e7d35022525e7e05e7b0b7d99a104809)
(cherry picked from commit 9ee4f0a2d98fd072487704ba6202e0d08b2f70ac)
---
 modules/hostap/src/supp_api.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index e3efd8c9bf8..46de2917acf 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -509,17 +509,7 @@ static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
 	}
 
 	if (params->security != WIFI_SECURITY_TYPE_NONE) {
-		if (params->sae_password) {
-			if ((params->sae_password_length < WIFI_PSK_MIN_LEN) ||
-			    (params->sae_password_length > WIFI_SAE_PSWD_MAX_LEN)) {
-				wpa_printf(MSG_ERROR,
-					   "Passphrase should be in range (%d-%d) characters",
-					   WIFI_PSK_MIN_LEN, WIFI_SAE_PSWD_MAX_LEN);
-				goto out;
-			}
-			strncpy(sae_null_terminated, params->sae_password, WIFI_SAE_PSWD_MAX_LEN);
-			sae_null_terminated[params->sae_password_length] = '\0';
-		} else {
+		if (params->psk) {
 			if ((params->psk_length < WIFI_PSK_MIN_LEN) ||
 			    (params->psk_length > WIFI_PSK_MAX_LEN)) {
 				wpa_printf(MSG_ERROR,
@@ -551,6 +541,16 @@ static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
 		    params->security == WIFI_SECURITY_TYPE_SAE_H2E ||
 		    params->security == WIFI_SECURITY_TYPE_SAE_AUTO) {
 			if (params->sae_password) {
+				if ((params->sae_password_length < WIFI_PSK_MIN_LEN) ||
+				    (params->sae_password_length > WIFI_SAE_PSWD_MAX_LEN)) {
+					wpa_printf(MSG_ERROR,
+						"Passphrase should be in range (%d-%d) characters",
+						WIFI_PSK_MIN_LEN, WIFI_SAE_PSWD_MAX_LEN);
+					goto out;
+				}
+				strncpy(sae_null_terminated, params->sae_password,
+					WIFI_SAE_PSWD_MAX_LEN);
+				sae_null_terminated[params->sae_password_length] = '\0';
 				if (!wpa_cli_cmd_v("set_network %d sae_password \"%s\"",
 						   resp.network_id, sae_null_terminated)) {
 					goto out;

From ad53702cb8d31624b96385e9d4fe46e8423beaf7 Mon Sep 17 00:00:00 2001
From: Maochen Wang <maochen.wang@nxp.com>
Date: Tue, 15 Oct 2024 16:02:20 +0800
Subject: [PATCH 0341/2913] [nrf fromtree] hostap: fix DUT hang when start SAP
 on wrong channel

When try to start SAP on channel 12 with region code US, the channel
check will fail and calls supplicant_send_wifi_mgmt_ap_status() with
iface->owner is NULL, which causes DUT hang. Set iface->owner when
enable the SAP can fix this issue.

Signed-off-by: Maochen Wang <maochen.wang@nxp.com>
(cherry picked from commit a2599007202c3c5682aeebb742177ccf8b0b6ee1)
(cherry picked from commit b0c28c01602e24220c244786cb9093df80f4a4a7)
---
 modules/hostap/src/supp_api.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 46de2917acf..e39e358393a 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1574,6 +1574,8 @@ int supplicant_ap_enable(const struct device *dev,
 		goto out;
 	}
 
+	iface->owner = iface;
+
 	if (iface->state == HAPD_IFACE_ENABLED) {
 		ret = -EBUSY;
 		wpa_printf(MSG_ERROR, "Interface %s is not in disable state", dev->name);

From 2506b9cf4dd65777f832c94e464cb1c20fcea4e0 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 8 Oct 2024 21:42:26 +0530
Subject: [PATCH 0342/2913] [nrf fromtree] drivers: nrfwifi: Fix random MAC
 address setting

Random MAC address setting can never be configured as the two defaults
cover all cases. Fix the defaults, now the order is

* Fixed
* OTP (default, in case of no config)
* Random

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 80db01f3bfeb5302b51d78375be17a1889cdca01)
(cherry picked from commit 0e8c6cf6e3ce1ea7212c359a205b1f150024551a)
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index bccb48b8576..5f2e645e575 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -511,8 +511,8 @@ config WIFI_FIXED_MAC_ADDRESS
 
 choice
 	prompt "Wi-Fi MAC address type"
-	default WIFI_OTP_MAC_ADDRESS if WIFI_FIXED_MAC_ADDRESS = ""
 	default WIFI_FIXED_MAC_ADDRESS_ENABLED if WIFI_FIXED_MAC_ADDRESS != ""
+	default WIFI_OTP_MAC_ADDRESS
 	help
 	  Select the type of MAC address to be used by the Wi-Fi driver
 

From b61a09f313305cec7835df2ed553bc70967459cd Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Wed, 25 Sep 2024 14:46:37 +0300
Subject: [PATCH 0343/2913] [nrf fromtree] west.yml: update hostap revision

Update hostap revision to get supplicant event numbers
correctly.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit d59bb2f9f50c542fb10b0d8095903dea6109c3cc)
(cherry picked from commit 5e13de09c75b7b5a3d1c56173181f1b0c1213ce2)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 1265f9cca33..dc77e581c4a 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: 9896a2ea803ec62e0998c0e569f12af88537d647
+      revision: f6792cb45d848df5d562dd9255dfc6acf62be164
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From b5455bd5223a700d8190f9075d89c2a239e588a1 Mon Sep 17 00:00:00 2001
From: Fengming Ye <frank.ye@nxp.com>
Date: Fri, 27 Sep 2024 12:10:04 +0900
Subject: [PATCH 0344/2913] [nrf fromtree] west.yml: update hostap revision

Update hostap revision to get crypto module test.

Signed-off-by: Fengming Ye <frank.ye@nxp.com>
(cherry picked from commit 20e81f7c85bb6e298735325cc74e160db8f95baa)
(cherry picked from commit 3ea1f832c470fb28e7b7c42ce78c0e1cef184275)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index dc77e581c4a..40707c2c58b 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: f6792cb45d848df5d562dd9255dfc6acf62be164
+      revision: d84b1ea174407f9a501976fb294e39c40c348645
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From ff40678fac59e098e589fd45aca2a097956382e2 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 7 Oct 2024 02:20:11 +0530
Subject: [PATCH 0345/2913] [nrf fromtree] manifest: hostap: Pull fixes from
 NCS

Pull fixes that are in NCS but missed in upstream.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 5c9c95b593a2f0725c1115195d7568456e84a795)
(cherry picked from commit e35cf5b783aeb22b39062e26de7a79c5e0092cd5)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 40707c2c58b..2f749eba0f3 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: d84b1ea174407f9a501976fb294e39c40c348645
+      revision: cdc0782c6ec76d75456e637bff78004c2c6eae87
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From ff26bc06f8debf13dd2311213d0fd401b562bdb7 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 9 Oct 2024 23:11:53 +0530
Subject: [PATCH 0346/2913] [nrf fromtree] manifest: hostap: Pull fix for
 duplicate AP enable event

The event is sent from both WPA supplicant and hostapd, but hostapd
should only be sent when using hostapd to create the AP.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit edb47444b933b61d15ea87f3b5e6aa2db8e81716)
(cherry picked from commit 924bf9c9cdac1a8b60c8c2d411c9af995381a757)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 2f749eba0f3..d7fd027b924 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: cdc0782c6ec76d75456e637bff78004c2c6eae87
+      revision: 0fd0276b5b65de4d2f7cd0552789a74d3a129441
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From 86a85397b361f2d9bb6b1f5508af15de42776f39 Mon Sep 17 00:00:00 2001
From: Rafal Dyla <rafal.dyla@nordicsemi.no>
Date: Tue, 1 Oct 2024 09:18:42 +0200
Subject: [PATCH 0347/2913] [nrf fromtree] modules: hal_nordic: Add global
 domain power request service

Service for powering peripherals that use GPIO pins
in the global power domains:
- Active Fast
- Active Slow
- Main Slow

Signed-off-by: Rafal Dyla <rafal.dyla@nordicsemi.no>
(cherry picked from commit ec77fc399cb15a7bc2b49c9713ad9e0c1048d697)
(cherry picked from commit 8fbe6cbb06aab019eff32183ddeee5689c9d0120)
---
 modules/hal_nordic/nrfs/CMakeLists.txt | 1 +
 modules/hal_nordic/nrfs/Kconfig        | 9 +++++++++
 modules/hal_nordic/nrfs/nrfs_config.h  | 4 ++++
 soc/nordic/nrf54h/Kconfig              | 2 ++
 soc/nordic/nrf92/Kconfig               | 2 ++
 west.yml                               | 2 +-
 6 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/modules/hal_nordic/nrfs/CMakeLists.txt b/modules/hal_nordic/nrfs/CMakeLists.txt
index c601b8a4233..f470eea00e9 100644
--- a/modules/hal_nordic/nrfs/CMakeLists.txt
+++ b/modules/hal_nordic/nrfs/CMakeLists.txt
@@ -25,6 +25,7 @@ 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_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)
diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig
index cf7c9be939b..3eee664e480 100644
--- a/modules/hal_nordic/nrfs/Kconfig
+++ b/modules/hal_nordic/nrfs/Kconfig
@@ -19,6 +19,9 @@ config NRFS_HAS_DIAG_SERVICE
 config NRFS_HAS_DVFS_SERVICE
 	bool
 
+config NRFS_HAS_GDPWR_SERVICE
+	bool
+
 config NRFS_HAS_MRAM_SERVICE
 	bool
 
@@ -113,6 +116,12 @@ config NRFS_CLOCK_SERVICE_ENABLED
 	bool "Clock service"
 	depends on NRFS_HAS_CLOCK_SERVICE
 	default y
+
+config NRFS_GDPWR_SERVICE_ENABLED
+	bool "Global domain power request service"
+	depends on NRFS_HAS_GDPWR_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 20cf6cece0e..a092adb7850 100644
--- a/modules/hal_nordic/nrfs/nrfs_config.h
+++ b/modules/hal_nordic/nrfs/nrfs_config.h
@@ -40,6 +40,10 @@
 #define NRFS_CLOCK_SERVICE_ENABLED
 #endif
 
+#ifdef CONFIG_NRFS_GDPWR_SERVICE_ENABLED
+#define NRFS_GDPWR_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 51dc4e07480..9132ca8458b 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -24,6 +24,7 @@ config SOC_NRF54H20_CPUAPP_COMMON
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select NRFS_HAS_CLOCK_SERVICE
 	select NRFS_HAS_DVFS_SERVICE
+	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
 	select NRFS_HAS_VBUS_DETECTOR_SERVICE
@@ -49,6 +50,7 @@ config SOC_NRF54H20_CPURAD_COMMON
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select NRFS_HAS_CLOCK_SERVICE
+	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
 	select NRFS_HAS_VBUS_DETECTOR_SERVICE
diff --git a/soc/nordic/nrf92/Kconfig b/soc/nordic/nrf92/Kconfig
index f6efecb6ad0..1f60b944b76 100644
--- a/soc/nordic/nrf92/Kconfig
+++ b/soc/nordic/nrf92/Kconfig
@@ -22,6 +22,7 @@ config SOC_NRF9230_ENGB_CPUAPP
 	select HAS_NORDIC_DMM
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select NRFS_HAS_CLOCK_SERVICE
+	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
 	select NRFS_HAS_PMIC_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
@@ -40,6 +41,7 @@ config SOC_NRF9230_ENGB_CPURAD
 	select HAS_NORDIC_DMM
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select NRFS_HAS_CLOCK_SERVICE
+	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
 	select NRFS_HAS_PMIC_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
diff --git a/west.yml b/west.yml
index d7fd027b924..239ac8d20d4 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: bc25c094a8cf3064f4f9c1e8060b46e1989edf95
+      revision: 4a3ba8eaca8f5255f550db7bc54dc3e23212da64
       path: modules/hal/nordic
       groups:
         - hal

From 8c27d921fed640ee746f86a693836f8decdda731 Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Mon, 14 Oct 2024 14:13:47 +0530
Subject: [PATCH 0348/2913] [nrf fromtree] manifest: update hal_nordic revision
 for offloaded raw tx mode

Updated hal_nordic revision contains changes for offloaded
raw tx mode.

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit 56a5ac5189ae4293b80e4bca433e7d820f09fdf0)
(cherry picked from commit 0d5a4eb283f94533ce8a694fdbbfa79e7d15ff42)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 239ac8d20d4..bd588eaaea0 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 4a3ba8eaca8f5255f550db7bc54dc3e23212da64
+      revision: d5c70305b2389641b0a166d0714775a1b13319a2
       path: modules/hal/nordic
       groups:
         - hal

From 40ce9acd0c88245e1af351c7e4d65b8699ef309e Mon Sep 17 00:00:00 2001
From: Maochen Wang <maochen.wang@nxp.com>
Date: Mon, 14 Oct 2024 14:14:42 +0800
Subject: [PATCH 0349/2913] [nrf fromtree] manifest: Update hostap to fix build
 error

Fix build error of undefined reference to 'inet_aton' in
hostap/src/utils/ip_addr.c

Signed-off-by: Maochen Wang <maochen.wang@nxp.com>
(cherry picked from commit 244958c9f482ab0980da07d7565bd86cca377ed7)
(cherry picked from commit 01bddd1369cb84b468855aeefa610e456f9aea7d)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index bd588eaaea0..e87e6405424 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: 0fd0276b5b65de4d2f7cd0552789a74d3a129441
+      revision: 7c32520564908e1220976b6c185dec296b6d4a80
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From 83be9686b16029a67c05744aaf68ffe4e8d01326 Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Mon, 9 Sep 2024 17:07:09 +0530
Subject: [PATCH 0350/2913] [nrf fromtree] drivers: nrfwifi: Create separate
 offloaded raw tx mode

Create separate offloaded raw tx mode which will work
as stand-alone compile-time mode.

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit 5c3cc3730a20a073bf1252c427c01591a9a6a359)
(cherry picked from commit 269e7a121cdeea29b2f0578e6a893ca30fcc487b)
---
 drivers/wifi/nrfwifi/CMakeLists.txt  | 11 +++++++++--
 drivers/wifi/nrfwifi/Kconfig.nrfwifi |  5 ++++-
 drivers/wifi/nrfwifi/inc/fmac_main.h |  6 +++++-
 drivers/wifi/nrfwifi/src/wifi_util.c |  8 ++++----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index a2773efbc06..0d8c6f615c0 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -30,7 +30,7 @@ zephyr_include_directories_ifdef(CONFIG_NRF70_RADIO_TEST
 )
 
 zephyr_include_directories_ifndef(CONFIG_NRF70_RADIO_TEST
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/default
+  {OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/default
 )
 
 zephyr_library_sources_ifdef(CONFIG_NRF70_SR_COEX
@@ -57,12 +57,15 @@ zephyr_library_sources(
   src/shim.c
   src/work.c
   src/timer.c
-  src/fmac_main.c
   src/qspi/src/device.c
   src/qspi/src/rpu_hw_if.c
   src/qspi/src/ficr_prog.c
 )
 
+zephyr_library_sources_ifndef(CONFIG_NRF70_OFFLOADED_RAW_TX
+  src/fmac_main.c
+)
+
 zephyr_library_sources_ifdef(CONFIG_NRF_WIFI_PATCHES_BUILTIN
   src/fw_load.c
 )
@@ -226,6 +229,10 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF70_RADIO_TEST
   -DNRF70_RADIO_TEST
 )
 
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
+  -DNRF70_OFFLOADED_RAW_TX
+)
+
 zephyr_compile_definitions_ifdef(CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD
   -DNRF70_TCP_IP_CHECKSUM_OFFLOAD
 )
diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 5f2e645e575..ce7e0b753f8 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -69,6 +69,9 @@ config NRF70_SCAN_ONLY
 config NRF70_RADIO_TEST
 	bool "Radio test mode of the nRF70 driver"
 
+config NRF70_OFFLOADED_RAW_TX
+	bool "Offloaded raw Tx mode of the nRF70 driver"
+
 config NRF70_SYSTEM_WITH_RAW_MODES
 	bool "nRF70 system mode with raw modes"
 	depends on WIFI_NRF7002 || WIFI_NRF7001
@@ -83,7 +86,7 @@ config NRF70_SYSTEM_MODE_COMMON
 	default y if NRF70_SYSTEM_MODE || NRF70_SYSTEM_WITH_RAW_MODES
 
 config NET_L2_ETHERNET
-	default y if !NRF70_RADIO_TEST
+	default y if (!NRF70_RADIO_TEST && !NRF70_OFFLOADED_RAW_TX)
 
 config HEAP_MEM_POOL_ADD_SIZE_NRF70
 	# Use a maximum that works for typical usecases and boards, each sample/app can override
diff --git a/drivers/wifi/nrfwifi/inc/fmac_main.h b/drivers/wifi/nrfwifi/inc/fmac_main.h
index 92bc2ac28f8..c11d32c487a 100644
--- a/drivers/wifi/nrfwifi/inc/fmac_main.h
+++ b/drivers/wifi/nrfwifi/inc/fmac_main.h
@@ -34,6 +34,7 @@
 
 #define NRF70_DRIVER_VERSION "1."KERNEL_VERSION_STRING
 
+#ifndef CONFIG_NRF70_OFFLOADED_RAW_TX
 #ifndef CONFIG_NRF70_RADIO_TEST
 struct nrf_wifi_vif_ctx_zep {
 	const struct device *zep_dev_ctx;
@@ -119,6 +120,7 @@ struct nrf_wifi_drv_priv_zep {
 extern struct nrf_wifi_drv_priv_zep rpu_drv_priv_zep;
 
 void nrf_wifi_scan_timeout_work(struct k_work *work);
+
 void configure_tx_pwr_settings(struct nrf_wifi_tx_pwr_ctrl_params *tx_pwr_ctrl_params,
 				struct nrf_wifi_tx_pwr_ceil_params *tx_pwr_ceil_params);
 void configure_board_dep_params(struct nrf_wifi_board_params *board_params);
@@ -126,6 +128,7 @@ void set_tx_pwr_ceil_default(struct nrf_wifi_tx_pwr_ceil_params *pwr_ceil_params
 const char *nrf_wifi_get_drv_version(void);
 enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep);
 enum nrf_wifi_status nrf_wifi_fmac_dev_rem_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep);
+#endif /* !CONFIG_NRF_WIFI_BUILD_ONLY_MODE */
 #ifdef CONFIG_NRF_WIFI_BUILD_ONLY_MODE
 inline enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx)
 {
@@ -136,9 +139,10 @@ inline enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx)
 #else
 enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx);
 #endif /* CONFIG_NRF_WIFI_BUILD_ONLY_MODE */
+#ifndef CONFIG_NRF70_OFFLOADED_RAW_TX
 struct nrf_wifi_vif_ctx_zep *nrf_wifi_get_vif_ctx(struct net_if *iface);
 void nrf_wifi_rpu_recovery_cb(void *vif_ctx,
 		void *event_data,
 		unsigned int event_len);
-
+#endif /* !CONFIG_NRF_WIFI_BUILD_ONLY_MODE */
 #endif /* __ZEPHYR_FMAC_MAIN_H__ */
diff --git a/drivers/wifi/nrfwifi/src/wifi_util.c b/drivers/wifi/nrfwifi/src/wifi_util.c
index 43c527a4b7d..c5e2a8dedfa 100644
--- a/drivers/wifi/nrfwifi/src/wifi_util.c
+++ b/drivers/wifi/nrfwifi/src/wifi_util.c
@@ -435,7 +435,7 @@ static int nrf_wifi_util_show_vers(const struct shell *sh,
 	return status;
 }
 
-#ifndef CONFIG_NRF70_RADIO_TEST
+#if !defined(CONFIG_NRF70_RADIO_TEST) && !defined(CONFIG_NRF70_OFFLOADED_RAW_TX)
 static int nrf_wifi_util_dump_rpu_stats(const struct shell *sh,
 					size_t argc,
 					const char *argv[])
@@ -849,7 +849,7 @@ static int nrf_wifi_util_dump_rpu_stats(const struct shell *sh,
 
 	return 0;
 }
-#endif /* CONFIG_NRF70_RADIO_TEST */
+#endif /* !CONFIG_NRF70_RADIO_TEST && !CONFIG_NRF70_OFFLOADED_RAW_TX */
 
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
 static int nrf_wifi_util_trigger_rpu_recovery(const struct shell *sh,
@@ -964,7 +964,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      nrf_wifi_util_show_vers,
 		      1,
 		      0),
-#ifndef CONFIG_NRF70_RADIO_TEST
+#if !defined(CONFIG_NRF70_RADIO_TEST) && !defined(CONFIG_NRF70_OFFLOADED_RAW_TX)
 	SHELL_CMD_ARG(rpu_stats,
 		      NULL,
 		      "Display RPU stats "
@@ -972,7 +972,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      nrf_wifi_util_dump_rpu_stats,
 		      1,
 		      1),
-#endif /* CONFIG_NRF70_RADIO_TEST */
+#endif /* !CONFIG_NRF70_RADIO_TEST && !CONFIG_NRF70_OFFLOADED_RAW_TX*/
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
 	SHELL_CMD_ARG(rpu_recovery_test,
 		      NULL,

From ddcf4cd7a0ade74c36058d369c03b3d73f89789d Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Fri, 27 Sep 2024 18:08:29 +0530
Subject: [PATCH 0351/2913] [nrf fromtree] wifi: Add wrapper APIs for offloaded
 raw TX feature

Add wrapper APIs for the offloaded raw TX feature supported
by nRF70 devices.

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit 28b74947e07822d52187458b5a79a18782269e53)
(cherry picked from commit ba2cb8e177ec63d16d9946ad8526f79dd65c9716)
---
 drivers/wifi/nrfwifi/CMakeLists.txt           |  21 +-
 .../wifi/nrfwifi/off_raw_tx/inc/off_raw_tx.h  |  28 +
 .../nrfwifi/off_raw_tx/src/off_raw_tx_api.c   | 482 ++++++++++++++++++
 .../wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h  | 260 ++++++++++
 4 files changed, 788 insertions(+), 3 deletions(-)
 create mode 100644 drivers/wifi/nrfwifi/off_raw_tx/inc/off_raw_tx.h
 create mode 100644 drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
 create mode 100644 include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 0d8c6f615c0..da458d13a9a 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -29,10 +29,15 @@ zephyr_include_directories_ifdef(CONFIG_NRF70_RADIO_TEST
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/radio_test
 )
 
-zephyr_include_directories_ifndef(CONFIG_NRF70_RADIO_TEST
-  {OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/default
+zephyr_include_directories_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/offload_raw_tx
+  off_raw_tx/inc
 )
 
+if(NOT CONFIG_NRF70_RADIO_TEST AND NOT CONFIG_NRF70_OFFLOADED_RAW_TX)
+  zephyr_include_directories(${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/default)
+endif()
+
 zephyr_library_sources_ifdef(CONFIG_NRF70_SR_COEX
   src/coex.c
 )
@@ -70,13 +75,15 @@ zephyr_library_sources_ifdef(CONFIG_NRF_WIFI_PATCHES_BUILTIN
   src/fw_load.c
 )
 
-zephyr_library_sources_ifndef(CONFIG_NRF70_RADIO_TEST
+if(NOT CONFIG_NRF70_RADIO_TEST AND NOT CONFIG_NRF70_OFFLOADED_RAW_TX)
+  zephyr_library_sources(
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/rx.c
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_vif.c
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
   src/net_if.c
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/default/fmac_api.c
 )
+endif()
 
 zephyr_library_sources_ifdef(CONFIG_NET_L2_WIFI_MGMT
   src/wifi_mgmt_scan.c
@@ -91,6 +98,12 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_RADIO_TEST
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
 )
 
+zephyr_library_sources_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/offload_raw_tx/fmac_api.c
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
+  off_raw_tx/src/off_raw_tx_api.c
+)
+
 zephyr_library_sources_ifdef(CONFIG_NRF70_DATA_TX
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/tx.c
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_peer.c
@@ -155,6 +168,8 @@ elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
     set(NRF70_PATCH ${FW_BINS_BASE}/scan_only/nrf70.bin)
   elseif (CONFIG_NRF70_SYSTEM_WITH_RAW_MODES)
     set(NRF70_PATCH ${FW_BINS_BASE}/system_with_raw/nrf70.bin)
+  elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
+    set(NRF70_PATCH ${FW_BINS_BASE}/offloaded_raw_tx/nrf70.bin)
   else()
     # Error
     message(FATAL_ERROR "Unsupported nRF70 patch configuration")
diff --git a/drivers/wifi/nrfwifi/off_raw_tx/inc/off_raw_tx.h b/drivers/wifi/nrfwifi/off_raw_tx/inc/off_raw_tx.h
new file mode 100644
index 00000000000..1cb6e258462
--- /dev/null
+++ b/drivers/wifi/nrfwifi/off_raw_tx/inc/off_raw_tx.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @brief File containing internal structures for the offloaded raw TX feature in the driver.
+ */
+
+#include "fmac_structs_common.h"
+#include "osal_api.h"
+
+struct nrf_wifi_ctx_zep {
+	void *drv_priv_zep;
+	void *rpu_ctx;
+	uint8_t mac_addr[6];
+};
+
+
+struct nrf_wifi_off_raw_tx_drv_priv {
+	struct nrf_wifi_fmac_priv *fmac_priv;
+	/* TODO: Replace with a linked list to handle unlimited RPUs */
+	struct nrf_wifi_ctx_zep rpu_ctx_zep;
+	struct k_spinlock lock;
+};
+
+enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx);
diff --git a/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c b/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
new file mode 100644
index 00000000000..3b1dd0bb093
--- /dev/null
+++ b/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
@@ -0,0 +1,482 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @brief File containing API definitions for the Offloaded raw TX feature.
+ */
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h>
+#include <off_raw_tx.h>
+#include <fmac_api.h>
+
+#define DT_DRV_COMPAT nordic_wlan
+LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
+
+struct nrf_wifi_off_raw_tx_drv_priv off_raw_tx_drv_priv;
+extern const struct nrf_wifi_osal_ops nrf_wifi_os_zep_ops;
+
+static const int valid_data_rates[] = { 1, 2, 55, 11, 6, 9, 12, 18, 24, 36, 48, 54,
+				  0, 1, 2, 3, 4, 5, 6, 7, -1 };
+
+/* DTS uses 1dBm as the unit for TX power, while the RPU uses 0.25dBm */
+#define MAX_TX_PWR(label) DT_PROP(DT_NODELABEL(nrf70), label) * 4
+static void configure_tx_pwr_settings(struct nrf_wifi_tx_pwr_ctrl_params *ctrl_params,
+				      struct nrf_wifi_tx_pwr_ceil_params *ceil_params)
+{
+	ctrl_params->ant_gain_2g = CONFIG_NRF70_ANT_GAIN_2G;
+	ctrl_params->ant_gain_5g_band1 = CONFIG_NRF70_ANT_GAIN_5G_BAND1;
+	ctrl_params->ant_gain_5g_band2 = CONFIG_NRF70_ANT_GAIN_5G_BAND2;
+	ctrl_params->ant_gain_5g_band3 = CONFIG_NRF70_ANT_GAIN_5G_BAND3;
+	ctrl_params->band_edge_2g_lo_dss = CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS;
+	ctrl_params->band_edge_2g_lo_ht = CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT;
+	ctrl_params->band_edge_2g_lo_he = CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE;
+	ctrl_params->band_edge_2g_hi_dsss = CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS;
+	ctrl_params->band_edge_2g_hi_ht = CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT;
+	ctrl_params->band_edge_2g_hi_he = CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE;
+	ctrl_params->band_edge_5g_unii_1_lo_ht =
+		CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT;
+	ctrl_params->band_edge_5g_unii_1_lo_he =
+		CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE;
+	ctrl_params->band_edge_5g_unii_1_hi_ht =
+		CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT;
+	ctrl_params->band_edge_5g_unii_1_hi_he =
+		CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE;
+	ctrl_params->band_edge_5g_unii_2a_lo_ht =
+		CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT;
+	ctrl_params->band_edge_5g_unii_2a_lo_he =
+		CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE;
+	ctrl_params->band_edge_5g_unii_2a_hi_ht =
+		CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT;
+	ctrl_params->band_edge_5g_unii_2a_hi_he =
+		CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE;
+	ctrl_params->band_edge_5g_unii_2c_lo_ht =
+		CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT;
+	ctrl_params->band_edge_5g_unii_2c_lo_he =
+		CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE;
+	ctrl_params->band_edge_5g_unii_2c_hi_ht =
+		CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT;
+	ctrl_params->band_edge_5g_unii_2c_hi_he =
+		CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE;
+	ctrl_params->band_edge_5g_unii_3_lo_ht =
+		CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT;
+	ctrl_params->band_edge_5g_unii_3_lo_he =
+		CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE;
+	ctrl_params->band_edge_5g_unii_3_hi_ht =
+		CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT;
+	ctrl_params->band_edge_5g_unii_3_hi_he =
+		CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE;
+	ctrl_params->band_edge_5g_unii_4_lo_ht =
+		CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT;
+	ctrl_params->band_edge_5g_unii_4_lo_he =
+		CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE;
+	ctrl_params->band_edge_5g_unii_4_hi_ht =
+		CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT;
+	ctrl_params->band_edge_5g_unii_4_hi_he =
+		CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE;
+	ceil_params->max_pwr_2g_dsss = MAX_TX_PWR(wifi_max_tx_pwr_2g_dsss);
+	ceil_params->max_pwr_2g_mcs7 = MAX_TX_PWR(wifi_max_tx_pwr_2g_mcs7);
+	ceil_params->max_pwr_2g_mcs0 = MAX_TX_PWR(wifi_max_tx_pwr_2g_mcs0);
+#ifndef CONFIG_NRF70_2_4G_ONLY
+	ceil_params->max_pwr_5g_low_mcs7 = MAX_TX_PWR(wifi_max_tx_pwr_5g_low_mcs7);
+	ceil_params->max_pwr_5g_mid_mcs7 = MAX_TX_PWR(wifi_max_tx_pwr_5g_mid_mcs7);
+	ceil_params->max_pwr_5g_high_mcs7 = MAX_TX_PWR(wifi_max_tx_pwr_5g_high_mcs7);
+	ceil_params->max_pwr_5g_low_mcs0 = MAX_TX_PWR(wifi_max_tx_pwr_5g_low_mcs0);
+	ceil_params->max_pwr_5g_mid_mcs0 = MAX_TX_PWR(wifi_max_tx_pwr_5g_mid_mcs0);
+	ceil_params->max_pwr_5g_high_mcs0 = MAX_TX_PWR(wifi_max_tx_pwr_5g_high_mcs0);
+#endif /* CONFIG_NRF70_2_4G_ONLY */
+}
+
+static void configure_board_dep_params(struct nrf_wifi_board_params *board_params)
+{
+	board_params->pcb_loss_2g = CONFIG_NRF70_PCB_LOSS_2G;
+#ifndef CONFIG_NRF70_2_4G_ONLY
+	board_params->pcb_loss_5g_band1 = CONFIG_NRF70_PCB_LOSS_5G_BAND1;
+	board_params->pcb_loss_5g_band2 = CONFIG_NRF70_PCB_LOSS_5G_BAND2;
+	board_params->pcb_loss_5g_band3 = CONFIG_NRF70_PCB_LOSS_5G_BAND3;
+#endif /* CONFIG_NRF70_2_4G_ONLY */
+}
+
+#ifdef CONFIG_WIFI_FIXED_MAC_ADDRESS_ENABLED
+static int bytes_from_str(uint8_t *buf, int buf_len, const char *src)
+{
+	size_t i;
+	size_t src_len = strlen(src);
+	char *endptr;
+
+	for (i = 0U; i < src_len; i++) {
+		if (!isxdigit((unsigned char)src[i]) &&
+		    src[i] != ':') {
+			return -EINVAL;
+		}
+	}
+
+	(void)memset(buf, 0, buf_len);
+
+	for (i = 0U; i < (size_t)buf_len; i++) {
+		buf[i] = (uint8_t)strtol(src, &endptr, 16);
+		src = ++endptr;
+	}
+
+	return 0;
+}
+#endif /* CONFIG_WIFI_FIXED_MAC_ADDRESS_ENABLED */
+
+int nrf70_off_raw_tx_init(uint8_t *mac_addr)
+{
+	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
+	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
+	void *rpu_ctx = NULL;
+	struct nrf_wifi_tx_pwr_ctrl_params ctrl_params;
+	struct nrf_wifi_tx_pwr_ceil_params ceil_params;
+	struct nrf_wifi_board_params board_params;
+	unsigned int fw_ver = 0;
+	k_spinlock_key_t key;
+
+	/* The OSAL layer needs to be initialized before any other initialization
+	 * so that other layers (like FW IF,HW IF etc) have access to OS ops
+	 */
+	nrf_wifi_osal_init(&nrf_wifi_os_zep_ops);
+
+	key = k_spin_lock(&off_raw_tx_drv_priv.lock);
+
+	off_raw_tx_drv_priv.fmac_priv = nrf_wifi_fmac_off_raw_tx_init();
+
+	if (off_raw_tx_drv_priv.fmac_priv == NULL) {
+		LOG_ERR("%s: Failed to initialize nRF70 driver",
+			__func__);
+		goto err;
+	}
+
+	rpu_ctx_zep = &off_raw_tx_drv_priv.rpu_ctx_zep;
+
+	rpu_ctx_zep->drv_priv_zep = &off_raw_tx_drv_priv;
+
+	rpu_ctx = nrf_wifi_fmac_dev_add(off_raw_tx_drv_priv.fmac_priv,
+					rpu_ctx_zep);
+	if (!rpu_ctx) {
+		LOG_ERR("%s: Failed to add nRF70 device", __func__);
+		rpu_ctx_zep = NULL;
+		goto err;
+	}
+
+	rpu_ctx_zep->rpu_ctx = rpu_ctx;
+
+	status = nrf_wifi_fw_load(rpu_ctx);
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		LOG_ERR("%s: Failed to load the nRF70 firmware patch", __func__);
+		goto err;
+	}
+
+	status = nrf_wifi_fmac_ver_get(rpu_ctx,
+				       &fw_ver);
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		LOG_ERR("%s: Failed to read the nRF70 firmware version", __func__);
+		goto err;
+	}
+
+	LOG_DBG("nRF70 firmware (v%d.%d.%d.%d) booted successfully",
+		NRF_WIFI_UMAC_VER(fw_ver),
+		NRF_WIFI_UMAC_VER_MAJ(fw_ver),
+		NRF_WIFI_UMAC_VER_MIN(fw_ver),
+		NRF_WIFI_UMAC_VER_EXTRA(fw_ver));
+
+	memset(&ctrl_params, 0, sizeof(ctrl_params));
+	memset(&ceil_params, 0, sizeof(ceil_params));
+
+	configure_tx_pwr_settings(&ctrl_params,
+				  &ceil_params);
+
+	memset(&board_params, 0, sizeof(board_params));
+
+	configure_board_dep_params(&board_params);
+
+	status = nrf_wifi_fmac_off_raw_tx_dev_init(rpu_ctx_zep->rpu_ctx,
+#ifdef CONFIG_NRF_WIFI_LOW_POWER
+						   HW_SLEEP_ENABLE,
+#endif /* CONFIG_NRF_WIFI_LOW_POWER */
+						   NRF_WIFI_DEF_PHY_CALIB,
+						   CONFIG_NRF_WIFI_OP_BAND,
+						   IS_ENABLED(CONFIG_NRF_WIFI_BEAMFORMING),
+						   &ctrl_params,
+						   &ceil_params,
+						   &board_params);
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		LOG_ERR("%s: nRF70 firmware initialization failed", __func__);
+		goto err;
+	}
+
+	if (mac_addr) {
+		memcpy(rpu_ctx_zep->mac_addr, mac_addr, 6);
+	} else {
+#ifdef CONFIG_WIFI_FIXED_MAC_ADDRESS_ENABLED
+		int ret = -1;
+
+		ret = bytes_from_str(rpu_ctx_zep->mac_addr,
+				     6,
+				     CONFIG_WIFI_FIXED_MAC_ADDRESS);
+		if (ret < 0) {
+			LOG_ERR("%s: Failed to parse MAC address: %s",
+				__func__,
+				CONFIG_WIFI_FIXED_MAC_ADDRESS);
+			goto err;
+		}
+#elif CONFIG_WIFI_OTP_MAC_ADDRESS
+		status = nrf_wifi_fmac_otp_mac_addr_get(off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx,
+							0,
+							rpu_ctx_zep->mac_addr);
+		if (status != NRF_WIFI_STATUS_SUCCESS) {
+			LOG_ERR("%s: Fetching of MAC address from OTP failed",
+				__func__);
+			goto err;
+		}
+#endif /* CONFIG_WIFI_FIXED_MAC_ADDRESS_ENABLED */
+
+		if (!nrf_wifi_utils_is_mac_addr_valid(rpu_ctx_zep->mac_addr)) {
+			LOG_ERR("%s: Invalid MAC address: %02X:%02X:%02X:%02X:%02X:%02X",
+				__func__,
+				rpu_ctx_zep->mac_addr[0],
+				rpu_ctx_zep->mac_addr[1],
+				rpu_ctx_zep->mac_addr[2],
+				rpu_ctx_zep->mac_addr[3],
+				rpu_ctx_zep->mac_addr[4],
+				rpu_ctx_zep->mac_addr[5]);
+			goto err;
+		}
+	}
+
+	k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
+
+	return 0;
+err:
+	if (rpu_ctx) {
+		nrf_wifi_fmac_off_raw_tx_dev_rem(rpu_ctx);
+		rpu_ctx_zep->rpu_ctx = NULL;
+	}
+
+	k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
+	nrf70_off_raw_tx_deinit();
+	return -1;
+}
+
+
+void nrf70_off_raw_tx_deinit(void)
+{
+	k_spinlock_key_t key;
+
+	key = k_spin_lock(&off_raw_tx_drv_priv.lock);
+
+	if (!off_raw_tx_drv_priv.fmac_priv) {
+		k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
+		return;
+	}
+
+	nrf_wifi_fmac_off_raw_tx_deinit(off_raw_tx_drv_priv.fmac_priv);
+	nrf_wifi_osal_deinit();
+
+	k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
+}
+
+static bool validate_rate(enum nrf_wifi_off_raw_tx_tput_mode tput_mode,
+			enum nrf_wifi_off_raw_tx_rate rate)
+{
+	if (tput_mode == TPUT_MODE_LEGACY) {
+		if (rate > RATE_54M) {
+			return false;
+		}
+	} else {
+		if (rate <= RATE_54M) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+int nrf70_off_raw_tx_conf_update(struct nrf_wifi_off_raw_tx_conf *conf)
+{
+	int ret = -1;
+	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
+	struct nrf_wifi_offload_ctrl_params *off_ctrl_params = NULL;
+	struct nrf_wifi_offload_tx_ctrl *off_tx_params = NULL;
+	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
+	k_spinlock_key_t key;
+
+	if (!conf) {
+		LOG_ERR("%s: Config params is NULL", __func__);
+		goto out;
+	}
+
+	off_ctrl_params = nrf_wifi_osal_mem_zalloc(sizeof(*off_ctrl_params));
+	if (!off_ctrl_params) {
+		LOG_ERR("%s: Failed to allocate memory for off_ctrl_params", __func__);
+		goto out;
+	}
+
+	key = k_spin_lock(&off_raw_tx_drv_priv.lock);
+
+	fmac_dev_ctx = off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx;
+
+	if (!fmac_dev_ctx) {
+		LOG_ERR("%s: FMAC device context is NULL", __func__);
+		goto out;
+	}
+
+	off_tx_params = nrf_wifi_osal_mem_zalloc(sizeof(*off_tx_params));
+	if (!off_tx_params) {
+		LOG_ERR("%s Failed to allocate memory for off_tx_params: ", __func__);
+		goto out;
+	}
+
+	if (!validate_rate(conf->tput_mode, conf->rate)) {
+		LOG_ERR("%s Invalid rate. Throughput mode: %d, rate: %d\n", __func__,
+				      conf->tput_mode, conf->rate);
+		goto out;
+	}
+
+	off_ctrl_params->channel_no = conf->chan;
+	off_ctrl_params->period_in_us = conf->period_us;
+	off_ctrl_params->tx_pwr = conf->tx_pwr;
+	off_tx_params->he_gi_type = conf->he_gi;
+	off_tx_params->he_ltf = conf->he_ltf;
+	off_tx_params->pkt_ram_ptr = RPU_MEM_PKT_BASE;
+	off_tx_params->pkt_length = conf->pkt_len;
+	off_tx_params->rate_flags = conf->tput_mode;
+	off_tx_params->rate = valid_data_rates[conf->rate];
+	off_tx_params->rate_preamble_type = conf->short_preamble;
+	off_tx_params->rate_retries = conf->num_retries;
+
+	status = hal_rpu_mem_write(fmac_dev_ctx->hal_dev_ctx,
+				   RPU_MEM_PKT_BASE,
+				   conf->pkt,
+				   conf->pkt_len);
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		LOG_ERR("%s: hal_rpu_mem_write failed", __func__);
+		goto out;
+	}
+
+	status = nrf_wifi_fmac_off_raw_tx_conf(fmac_dev_ctx,
+					       off_ctrl_params,
+					       off_tx_params);
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		LOG_ERR("%s: nRF70 offloaded raw TX configuration failed",
+				      __func__);
+		goto out;
+	}
+
+	ret = 0;
+out:
+	nrf_wifi_osal_mem_free(off_ctrl_params);
+	nrf_wifi_osal_mem_free(off_tx_params);
+	k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
+	return ret;
+}
+
+
+int nrf70_off_raw_tx_start(struct nrf_wifi_off_raw_tx_conf *conf)
+{
+	int ret = -1;
+	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
+	k_spinlock_key_t key;
+
+	status = nrf70_off_raw_tx_conf_update(conf);
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		LOG_ERR("%s: nRF70 offloaded raw TX configuration failed",
+				      __func__);
+		goto out;
+	}
+
+	key = k_spin_lock(&off_raw_tx_drv_priv.lock);
+	if (!off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx) {
+		LOG_ERR("%s: FMAC device context is NULL", __func__);
+		goto out;
+	}
+
+	status = nrf_wifi_fmac_off_raw_tx_start(off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx);
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		LOG_ERR("%s: nRF70 offloaded raw TX start failed",
+				      __func__);
+		goto out;
+	}
+
+	ret = 0;
+out:
+	k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
+	return ret;
+}
+
+
+int nrf70_off_raw_tx_stop(void)
+{
+	int ret = -1;
+	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
+	k_spinlock_key_t key;
+
+	key = k_spin_lock(&off_raw_tx_drv_priv.lock);
+
+	if (!off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx) {
+		LOG_ERR("%s: FMAC device context is NULL", __func__);
+		goto out;
+	}
+
+	status = nrf_wifi_fmac_off_raw_tx_stop(off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx);
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		LOG_ERR("%s: nRF70 offloaded raw TX stop failed",
+				      __func__);
+		goto out;
+	}
+
+	ret = 0;
+out:
+	k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
+	return ret;
+}
+
+
+int nrf70_off_raw_tx_mac_addr_get(uint8_t *mac_addr)
+{
+	if (!mac_addr) {
+		LOG_ERR("%s: Invalid param", __func__);
+		return -EINVAL;
+	}
+
+	memcpy(mac_addr, off_raw_tx_drv_priv.rpu_ctx_zep.mac_addr, 6);
+	return 0;
+}
+
+int nrf70_off_raw_tx_stats(struct nrf_wifi_off_raw_tx_stats *off_raw_tx_stats)
+{
+	int ret = -1;
+	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
+	struct rpu_op_stats stats;
+	k_spinlock_key_t key;
+
+	memset(&stats, 0, sizeof(struct rpu_op_stats));
+
+	key = k_spin_lock(&off_raw_tx_drv_priv.lock);
+
+	if (!off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx) {
+		LOG_ERR("%s: FMAC device context is NULL", __func__);
+		goto out;
+	}
+
+	status = nrf_wifi_fmac_stats_get(off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx, 0, &stats);
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		LOG_ERR("%s: nRF70 offloaded raw TX stats failed",
+				      __func__);
+		goto out;
+	}
+
+	off_raw_tx_stats->off_raw_tx_pkt_sent = stats.fw.offloaded_raw_tx.offload_raw_tx_cnt;
+
+	ret = 0;
+out:
+	k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
+	return ret;
+}
diff --git a/include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h b/include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h
new file mode 100644
index 00000000000..b8ff50cd390
--- /dev/null
+++ b/include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h
@@ -0,0 +1,260 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/** @file
+ *
+ * @addtogroup nrf70_off_raw_tx_api nRF70 Offloaded raw TX API
+ * @{
+ *
+ * @brief File containing API's for the Offloaded raw TX feature.
+ */
+
+#ifndef INCLUDE_ZEPHYR_DRIVERS_OFF_RAW_TX_API_H_
+#define INCLUDE_ZEPHYR_DRIVERS_OFF_RAW_TX_API_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "osal_api.h"
+
+/*  Minimum frame size for raw packet transmission */
+#define NRF_WIFI_OFF_RAW_TX_FRAME_SIZE_MIN 26
+/*  Maximum frame size for raw packet transmission */
+#define NRF_WIFI_OFF_RAW_TX_FRAME_SIZE_MAX 600
+
+/**
+ * @brief- Transmission rates
+ * Rate to be used for transmitting a packet.
+ */
+enum nrf_wifi_off_raw_tx_rate {
+	/** 1 Mbps */
+	RATE_1M,
+	/** 2 Mbps */
+	RATE_2M,
+	/** 5.5 Mbps */
+	RATE_5_5M,
+	/** 11 Mbps */
+	RATE_11M,
+	/** 6 Mbps */
+	RATE_6M,
+	/** 9 Mbps */
+	RATE_9M,
+	/** 12 Mbps */
+	RATE_12M,
+	/** 18 Mbps */
+	RATE_18M,
+	/** 24 Mbps */
+	RATE_24M,
+	/** 36 Mbps */
+	RATE_36M,
+	/** 48 Mbps */
+	RATE_48M,
+	/** 54 Mbps */
+	RATE_54M,
+	/** MCS 0 */
+	RATE_MCS0,
+	/** MCS 1 */
+	RATE_MCS1,
+	/** MCS 2 */
+	RATE_MCS2,
+	/** MCS 3 */
+	RATE_MCS3,
+	/** MCS 4 */
+	RATE_MCS4,
+	/** MCS 5 */
+	RATE_MCS5,
+	/** MCS 6 */
+	RATE_MCS6,
+	/** MCS 7 */
+	RATE_MCS7,
+	/** Invalid rate */
+	RATE_MAX
+};
+
+
+/**
+ * @brief- HE guard interval value
+ * Value of the guard interval to be used between symbols when transmitting using HE.
+ */
+enum nrf_wifi_off_raw_tx_he_gi {
+	/** 800 ns */
+	HE_GI_800NS,
+	/** 1600 ns */
+	HE_GI_1600NS,
+	/** 3200 ns */
+	HE_GI_3200NS,
+	/** Invalid value */
+	HE_GI_MAX
+};
+
+
+/**
+ * @brief- HE long training field duration
+ * Value of the long training field duration to be used when transmitting using HE.
+ */
+enum nrf_wifi_off_raw_tx_he_ltf {
+	/** 3.2us */
+	HE_LTF_3200NS,
+	/** 6.4us */
+	HE_LTF_6400NS,
+	/** 12.8us */
+	HE_LTF_12800NS,
+	/** Invalid value */
+	HE_LTF_MAX
+};
+
+/**
+ * @brief- Throughput mode
+ * Throughput mode to be used for transmitting the packet.
+ */
+enum nrf_wifi_off_raw_tx_tput_mode {
+	/** Legacy mode */
+	TPUT_MODE_LEGACY,
+	/** High Throughput mode (11n) */
+	TPUT_MODE_HT,
+	/** Very high throughput mode (11ac) */
+	TPUT_MODE_VHT,
+	/** HE SU mode */
+	TPUT_MODE_HE_SU,
+	/** HE ER SU mode */
+	TPUT_MODE_HE_ER_SU,
+	/** HE TB mode */
+	TPUT_MODE_HE_TB,
+	/** Highest throughput mode currently defined */
+	TPUT_MODE_MAX
+};
+
+/**
+ * @brief This structure defines the Offloaded raw tx debug statistics.
+ *
+ */
+struct nrf_wifi_off_raw_tx_stats {
+	/** Number of packets sent */
+	unsigned int off_raw_tx_pkt_sent;
+};
+
+/**
+ * @brief- Configuration parameters for offloaded raw TX
+ * Parameters which can be used to configure the offloaded raw TX operation.
+ */
+struct nrf_wifi_off_raw_tx_conf {
+	/** Time interval (in microseconds) between transmissions */
+	unsigned int period_us;
+	/** Transmit power in dBm (0 to 20) */
+	unsigned int tx_pwr;
+	/** Channel number on which to transmit */
+	unsigned int chan;
+	/** Set to TRUE to use short preamble for FALSE to disable short preamble */
+	bool short_preamble;
+	/* Number of times a packet should be retried at each possible rate */
+	unsigned int num_retries;
+	/** Throughput mode for packet transmittion. Refer &enum nrf_wifi_off_raw_tx_tput_mode */
+	enum nrf_wifi_off_raw_tx_tput_mode tput_mode;
+	/* Rate at which packet needs to be transmitted. Refer &enum nrf_wifi_off_raw_tx_rate */
+	enum nrf_wifi_off_raw_tx_rate rate;
+	/** HE GI. Refer &enum nrf_wifi_off_raw_tx_he_gi */
+	enum nrf_wifi_off_raw_tx_he_gi he_gi;
+	/** HE GI. Refer &enum nrf_wifi_off_raw_tx_he_ltf */
+	enum nrf_wifi_off_raw_tx_he_ltf he_ltf;
+	/* Pointer to packet to be transmitted */
+	void *pkt;
+	/** Packet length of the frame to be transmitted, (min 26 bytes and max 600 bytes) */
+	unsigned int pkt_len;
+};
+
+
+/**
+ * @brief Initialize the nRF70 for operating in the offloaded raw TX mode.
+ * @param mac_addr MAC address to be used for the nRF70 device.
+ *
+ * This function is initializes the nRF70 device for offloaded raw TX mode by:
+ *  - Powering it up,
+ *  - Downloading a firmware patch (if any).
+ *  - Initializing the firmware to accept further commands
+ *
+ * The mac_addr parameter is used to set the MAC address of the nRF70 device.
+ * This address can be used to override the MAC addresses programmed in the OTP and
+ * the value configured (if any) in CONFIG_WIFI_FIXED_MAC_ADDRESS.
+ * The priority order in which the MAC address values for the nRF70 device are used is:
+ * - If mac_addr is provided, the MAC address is set to the value provided.
+ * - If CONFIG_WIFI_FIXED_MAC_ADDRESS is enabled, the MAC address uses the Kconfig value.
+ * - If none of the above are provided, the MAC address is set to the value programmed in the OTP.
+ *
+ * @retval 0 If the operation was successful.
+ * @retval -1 If the operation failed.
+ */
+int nrf70_off_raw_tx_init(uint8_t *mac_addr);
+
+/**
+ * @brief Initialize the nRF70 for operating in the offloaded raw TX mode.
+ *
+ * This function is deinitializes the nRF70 device.
+ *
+ */
+void nrf70_off_raw_tx_deinit(void);
+
+/**
+ * @brief Update the configured offloaded raw TX parameters.
+ * @param conf Configuration parameters to be updated for the offloaded raw TX operation.
+ *
+ * This function is used to update configured parameters for offloaded raw TX operation.
+ * This function should be used to when the parameters need to be updated during an ongoing
+ * raw TX operation without having to stop it.
+ *
+ * @retval 0 If the operation was successful.
+ * @retval -1 If the operation failed.
+ */
+int nrf70_off_raw_tx_conf_update(struct nrf_wifi_off_raw_tx_conf *conf);
+
+/**
+ * @brief Start the offloaded raw TX.
+ * @param conf Configuration parameters necessary for the offloaded raw TX operation.
+ *
+ * This function is used to start offloaded raw TX operation. When this function is invoked
+ * the nRF70 device will start transmitting frames as per the configuration specified by @p conf.
+ *
+ * @retval 0 If the operation was successful.
+ * @retval -1 If the operation failed.
+ */
+int nrf70_off_raw_tx_start(struct nrf_wifi_off_raw_tx_conf *conf);
+
+/**
+ * @brief Stop the offloaded raw TX.
+ *
+ * This function is used to stop offloaded raw TX operation. When this function is invoked
+ * the nRF70 device will stop transmitting frames.
+ *
+ * @retval 0 If the operation was successful.
+ * @retval -1 If the operation failed.
+ */
+int nrf70_off_raw_tx_stop(void);
+
+/**
+ * @brief Get the MAC address of the nRF70 device.
+ * @param mac_addr Buffer to store the MAC address.
+ *
+ * This function is used to get the MAC address of the nRF70 device.
+ * The MAC address is stored in the buffer pointed by mac_addr.
+ * The MAC address is expected to be a 6 byte value.
+ *
+ * @retval 0 If the operation was successful.
+ * @retval -1 If the operation failed.
+ */
+int nrf70_off_raw_tx_mac_addr_get(uint8_t *mac_addr);
+
+/**
+ * @brief Get statistics of the offloaded raw TX.
+ * @param off_raw_tx_stats Statistics of the offloaded raw TX operation.
+ *
+ * This function is used to get statistics of offloaded raw TX operation. When this function
+ * is invoked the nRF70 device will show statistics.
+ *
+ * @retval 0 If the operation was successful.
+ * @retval -1 If the operation failed.
+ */
+int nrf70_off_raw_tx_stats(struct nrf_wifi_off_raw_tx_stats *off_raw_tx_stats);
+/**
+ * @}
+ */
+#endif /* INCLUDE_ZEPHYR_DRIVERS_OFF_RAW_TX_API_H_ */

From 7363d93f67c33c43055f6f2419f58775f19d1e2f Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Sun, 6 Oct 2024 01:15:15 +0530
Subject: [PATCH 0352/2913] [nrf fromtree] drivers: nrfwifi: Fix rebuilding
 when FW blobs are changes

Whenever FW blobs are updated manually, we need to tell cmake to
auto-build the source files to use the latest firmware without doing a
pristine build.

This adds a custom target to be run with nRF Wi-Fi driver and updates
timestamp of fw_load.c to rebuild whenevr the blob is updated.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit e2e96acebfef43fe619d315587592b8885a1187e)
(cherry picked from commit 49ef1c16bedf217d177c09e0a0e72cbfca7f96ec)
---
 drivers/wifi/nrfwifi/CMakeLists.txt | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index da458d13a9a..04d8d7f2bb4 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-zephyr_library()
+zephyr_library_named(nrfwifi)
 
 set(OS_AGNOSTIC_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/drivers/nrf_wifi)
 set(FW_BINS_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
@@ -187,6 +187,22 @@ elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
   zephyr_compile_definitions(
     -DCONFIG_NRF_WIFI_FW_BIN=${NRF70_PATCH}
   )
+
+  # Rebuild fw_load.c whenever the firmware binary changes
+  # a bit crude way to do it, but it works
+  add_custom_command(
+    OUTPUT ${CMAKE_SOURCE_DIR}/src/fw_load.c
+    COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_SOURCE_DIR}/src/fw_load.c
+    DEPENDS ${NRF70_PATCH}
+    COMMENT "Checking firmware blobs ${NRF70_PATCH}"
+  )
+
+  add_custom_target(
+    check_firmware_blobs ALL
+    DEPENDS ${CMAKE_SOURCE_DIR}/src/fw_load.c
+  )
+
+  add_dependencies(nrfwifi check_firmware_blobs)
 endif()
 
 

From 1afba7cc56bfb0f3c0c9dfd03961774b2733f5c4 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 9 Oct 2024 23:16:38 +0530
Subject: [PATCH 0353/2913] [nrf fromtree] Revert "drivers: nrfwifi: Fix
 rebuilding when FW blobs are changes"

This reverts commit e2e96acebfef43fe619d315587592b8885a1187e.
This will be properly fixes by adding a target for nRF70.bin and
removing INCBIN approach.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 7f9be548970627306b8bdb65202a1c0f5754d9d2)
(cherry picked from commit 4c14fdc88a19de7c5816899fc18fa355d547da18)
---
 drivers/wifi/nrfwifi/CMakeLists.txt | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 04d8d7f2bb4..da458d13a9a 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-zephyr_library_named(nrfwifi)
+zephyr_library()
 
 set(OS_AGNOSTIC_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/drivers/nrf_wifi)
 set(FW_BINS_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
@@ -187,22 +187,6 @@ elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
   zephyr_compile_definitions(
     -DCONFIG_NRF_WIFI_FW_BIN=${NRF70_PATCH}
   )
-
-  # Rebuild fw_load.c whenever the firmware binary changes
-  # a bit crude way to do it, but it works
-  add_custom_command(
-    OUTPUT ${CMAKE_SOURCE_DIR}/src/fw_load.c
-    COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_SOURCE_DIR}/src/fw_load.c
-    DEPENDS ${NRF70_PATCH}
-    COMMENT "Checking firmware blobs ${NRF70_PATCH}"
-  )
-
-  add_custom_target(
-    check_firmware_blobs ALL
-    DEPENDS ${CMAKE_SOURCE_DIR}/src/fw_load.c
-  )
-
-  add_dependencies(nrfwifi check_firmware_blobs)
 endif()
 
 

From e74e84ddf118a78a6c8fc3b16405d4526bcaaf20 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 9 Oct 2024 23:52:44 +0530
Subject: [PATCH 0354/2913] [nrf fromtree] drivers: nrfwifi: Use Zephyr tooling
 to load nRF70 FW file

Instead of relying on INCBIN macros which do not properly add
dependencies, e.g., modifying FW file doesn't trigger rebuild.

Use the Zephyr cmake tooling to load the FW patch file as a header.

This also improves memory report where the patch target is clearly
visible instead of a hidden section.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit b40cb4c46c093c20aba59034b385786e871560fd)
(cherry picked from commit b2e80b47f4ea7eac75b3a9c9aa836a82e2c6e6dd)
---
 drivers/wifi/nrfwifi/CMakeLists.txt | 11 +++++--
 drivers/wifi/nrfwifi/src/fw_load.c  | 49 +++--------------------------
 2 files changed, 12 insertions(+), 48 deletions(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index da458d13a9a..5ea9da5825e 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-zephyr_library()
+zephyr_library_named(nrfwifi)
 
 set(OS_AGNOSTIC_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/drivers/nrf_wifi)
 set(FW_BINS_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
@@ -184,8 +184,13 @@ elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
       ------------------------------------------------------------------------")
   endif()
 
-  zephyr_compile_definitions(
-    -DCONFIG_NRF_WIFI_FW_BIN=${NRF70_PATCH}
+  set(gen_inc_dir ${ZEPHYR_BINARY_DIR}/misc/generated)
+  zephyr_include_directories(${gen_inc_dir})
+  set(gen_dir ${gen_inc_dir}/nrf70_fw_patch)
+  generate_inc_file_for_target(
+    nrfwifi
+    ${NRF70_PATCH}
+    ${gen_dir}/nrf70.bin.inc
   )
 endif()
 
diff --git a/drivers/wifi/nrfwifi/src/fw_load.c b/drivers/wifi/nrfwifi/src/fw_load.c
index 6bf4c85193f..9204d295d30 100644
--- a/drivers/wifi/nrfwifi/src/fw_load.c
+++ b/drivers/wifi/nrfwifi/src/fw_load.c
@@ -17,57 +17,16 @@
 LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 
 #include <fmac_main.h>
-
-/* INCBIN macro Taken from https://gist.github.com/mmozeiko/ed9655cf50341553d282 */
-#define STR2(x) #x
-#define STR(x) STR2(x)
-
-#ifdef __APPLE__
-#define USTR(x) "_" STR(x)
-#else
-#define USTR(x) STR(x)
-#endif
-
-#ifdef _WIN32
-#define INCBIN_SECTION ".rdata, \"dr\""
-#elif defined __APPLE__
-#define INCBIN_SECTION "__TEXT,__const"
-#else
-#define INCBIN_SECTION ".rodata.*"
-#endif
-
-/* this aligns start address to 16 and terminates byte array with explicit 0
- * which is not really needed, feel free to change it to whatever you want/need
- */
-#define INCBIN(prefix, name, file) \
-	__asm__(".section " INCBIN_SECTION "\n" \
-			".global " USTR(prefix) "_" STR(name) "_start\n" \
-			".balign 16\n" \
-			USTR(prefix) "_" STR(name) "_start:\n" \
-			".incbin \"" file "\"\n" \
-			\
-			".global " STR(prefix) "_" STR(name) "_end\n" \
-			".balign 1\n" \
-			USTR(prefix) "_" STR(name) "_end:\n" \
-			".byte 0\n" \
-	); \
-	extern __aligned(16)    const char prefix ## _ ## name ## _start[]; \
-	extern                  const char prefix ## _ ## name ## _end[];
-
-INCBIN(_bin, nrf70_fw, STR(CONFIG_NRF_WIFI_FW_BIN));
+static const char fw_patch[] = {
+	#include <nrf70_fw_patch/nrf70.bin.inc>
+};
 
 enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx)
 {
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
 	struct nrf_wifi_fmac_fw_info fw_info = { 0 };
-	uint8_t *fw_start;
-	uint8_t *fw_end;
-
-	fw_start = (uint8_t *)_bin_nrf70_fw_start;
-	fw_end = (uint8_t *)_bin_nrf70_fw_end;
 
-	status = nrf_wifi_fmac_fw_parse(rpu_ctx, fw_start, fw_end - fw_start,
-					&fw_info);
+	status = nrf_wifi_fmac_fw_parse(rpu_ctx, fw_patch, sizeof(fw_patch), &fw_info);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nrf_wifi_fmac_fw_parse failed", __func__);
 		return status;

From d8f2e13c31e33d80f5d40763c6aa6847dc358d6b Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 8 Jul 2024 22:42:56 +0530
Subject: [PATCH 0355/2913] [nrf fromtree] drivers: wifi: Fix RPU recovery not
 being triggered

During watchdog (or any) interrupt processing, RPU accesses are being
made and they assert the wakeup_now flag this causes RPU recovery to not
trigger.

New false or true recovery detection algo:

 Check the time difference b/w last de-assert and assert, and if it
 exceeds minimum time needed for RPU to enter sleep, then not the
 timestamp. This timestamp will be used to compare when a watchdog
 interrupt is received and see if during the last window if host has
 given a chance for RPU to attempt sleep, if yes, then attempt recovery
 else ignore watchdog.

Also, add a Kconfig for the 10s active time that triggers recovery, this
needs to be passed to the FW (once we have enough patch memory).

Also, add a Kconfig for the minimum time needed for RPU to attempt sleep
in positive case.

Also, add a new _ms API for time stamp fetch, this is to avoid
precision loss when converting to and from ms to us and also makes code
readable by avoiding *1000 and /1000.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 5ad733931154799108b0e2e81fce4228770327fa)
(cherry picked from commit 412275dbd08154d5a78448a98b2551965020c586)
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 26 ++++++++++++++++++++++++++
 drivers/wifi/nrfwifi/src/shim.c      | 16 ++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index ce7e0b753f8..9d8fad2daaa 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -677,6 +677,32 @@ config NRF_WIFI_RPU_RECOVERY_PROPAGATION_DELAY_MS
 config NET_MGMT_EVENT_QUEUE_SIZE
 	# Doing interface down and up even with delay puts a lot of events in the queue
 	default 16
+
+config NRF_WIFI_RPU_RECOVERY_PROPAGATION_DELAY_MS
+	int "RPU recovery propagation delay in milliseconds"
+	default 10
+	help
+	  Propagation delay in milliseconds to wait after RPU is powered down
+	  before powering it up. This delay is required to ensure that the recovery
+	  is propagated to all the applications and stack and have enough time to
+	  clean up the resources.
+
+config NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS
+	int "RPU recovery power save active timeout in milliseconds"
+	default 10000
+	help
+	  Power save active timeout in milliseconds after which RPU recovery
+	  mechanism will be triggered. This timeout is used to ensure that the
+	  RPU attempts to enter power save mode in case of inactivity.
+
+config NRF_WIFI_RPU_MIN_TIME_TO_ENTER_SLEEP_MS
+	int "Minimum idle time to enter sleep in milliseconds"
+	range 100 5000
+	default 1000
+	help
+	  Minimum time the host should de-assert WAKEUP_NOW and let RPU enter
+	  sleep mode, assuming there is no activity.
+
 endif # NRF_WIFI_RPU_RECOVERY
 
 config NRF_WIFI_FEAT_WMM
diff --git a/drivers/wifi/nrfwifi/src/shim.c b/drivers/wifi/nrfwifi/src/shim.c
index 19660f727e7..9f8b065ead0 100644
--- a/drivers/wifi/nrfwifi/src/shim.c
+++ b/drivers/wifi/nrfwifi/src/shim.c
@@ -618,6 +618,20 @@ static unsigned int zep_shim_time_elapsed_us(unsigned long start_time_us)
 	return curr_time_us - start_time_us;
 }
 
+static unsigned long zep_shim_time_get_curr_ms(void)
+{
+	return k_uptime_get();
+}
+
+static unsigned int zep_shim_time_elapsed_ms(unsigned long start_time_ms)
+{
+	unsigned long curr_time_ms = 0;
+
+	curr_time_ms = zep_shim_time_get_curr_ms();
+
+	return curr_time_ms - start_time_ms;
+}
+
 static enum nrf_wifi_status zep_shim_bus_qspi_dev_init(void *os_qspi_dev_ctx)
 {
 	ARG_UNUSED(os_qspi_dev_ctx);
@@ -938,6 +952,8 @@ const struct nrf_wifi_osal_ops nrf_wifi_os_zep_ops = {
 	.delay_us = k_usleep,
 	.time_get_curr_us = zep_shim_time_get_curr_us,
 	.time_elapsed_us = zep_shim_time_elapsed_us,
+	.time_get_curr_ms = zep_shim_time_get_curr_ms,
+	.time_elapsed_ms = zep_shim_time_elapsed_ms,
 
 	.bus_qspi_init = zep_shim_bus_qspi_init,
 	.bus_qspi_deinit = zep_shim_bus_qspi_deinit,

From 4c4aeeef1e7c0bcf186f7e3a1df2fc1726194ba9 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 9 Jul 2024 22:51:15 +0530
Subject: [PATCH 0356/2913] [nrf fromtree] drivers: wifi: nrf700x: Ignore all
 failures in iface down

In case RPU is stuck and need a recovery, the failures in interface down
should be ignored as they are expected and we should proceed with device
removal that in turn removes power to the RPU.

TODO: This works for single VIF, but needs more thought for multi-VIF.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 04ddd6d2b04207d868563b8847e70c720def4e70)
(cherry picked from commit f538932e8e12f5e8dde88b88cd6aeaab44841a31)
---
 drivers/wifi/nrfwifi/src/net_if.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
index 4d4125e8c8a..899e9a87105 100644
--- a/drivers/wifi/nrfwifi/src/net_if.c
+++ b/drivers/wifi/nrfwifi/src/net_if.c
@@ -802,14 +802,14 @@ int nrf_wifi_if_stop_zep(const struct device *dev)
 	ret = k_mutex_lock(&vif_ctx_zep->vif_lock, K_FOREVER);
 	if (ret != 0) {
 		LOG_ERR("%s: Failed to lock vif_lock", __func__);
-		goto out;
+		goto unlock;
 	}
 
 	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
 	if (!rpu_ctx_zep) {
 		LOG_ERR("%s: rpu_ctx_zep is NULL",
 			__func__);
-		goto out;
+		goto unlock;
 	}
 
 #ifdef CONFIG_NRF70_STA_MODE
@@ -821,7 +821,6 @@ int nrf_wifi_if_stop_zep(const struct device *dev)
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nrf_wifi_fmac_set_power_save failed",
 			__func__);
-		goto unlock;
 	}
 #endif /* CONFIG_NRF_WIFI_LOW_POWER */
 #endif /* CONFIG_NRF70_STA_MODE */
@@ -840,7 +839,6 @@ int nrf_wifi_if_stop_zep(const struct device *dev)
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nrf_wifi_fmac_chg_vif_state failed",
 			__func__);
-		goto unlock;
 	}
 
 	status = nrf_wifi_fmac_del_vif(rpu_ctx_zep->rpu_ctx,
@@ -849,11 +847,8 @@ int nrf_wifi_if_stop_zep(const struct device *dev)
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nrf_wifi_fmac_del_vif failed",
 			__func__);
-		goto unlock;
 	}
 
-	vif_ctx_zep->if_op_state = NRF_WIFI_FMAC_IF_OP_STATE_DOWN;
-
 	if (nrf_wifi_fmac_get_num_vifs(rpu_ctx_zep->rpu_ctx) == 0) {
 		nrf_wifi_fmac_dev_rem_zep(&rpu_drv_priv_zep);
 	}

From fa55b4e0765eb2a04241ec3db8d23e573675685c Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 10 Jul 2024 00:51:59 +0530
Subject: [PATCH 0357/2913] [nrf fromtree] drivers: wifi: Add a sanity check
 for RPU comms

Before proceeding with RPU bringup, do a sanity check by reading a known
signature to make sure the Host-RPU comms are operational.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit a23184c473764babf4d3ec8985267caa1c494c88)
(cherry picked from commit b7e1245536821344a566157caaaca96f1b755ddd)
---
 drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c b/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c
index c5f909b4c3a..6fac7412362 100644
--- a/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c
+++ b/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c
@@ -405,6 +405,31 @@ int rpu_clks_on(void)
 	return 0;
 }
 
+#define RPU_EXP_SIG 0x42000020
+/* Read a known value from RPU memory to validate RPU communication */
+int rpu_validate_comms(void)
+{
+	uint32_t rpu_test;
+	int ret;
+
+	/* UCCP_SOC_FAB_MST_READ_IDLE - HW reset value */
+	ret = rpu_read(0x0005C, &rpu_test, 4);
+	if (ret) {
+		LOG_ERR("Error: RPU comms test: read failed\n");
+		return ret;
+	}
+
+	if (rpu_test != RPU_EXP_SIG) {
+		LOG_ERR("Error: RPU comms test: sig failed: expected 0x%x, got 0x%x\n",
+			RPU_EXP_SIG, rpu_test);
+		return -1;
+	}
+
+	LOG_DBG("RPU comms test passed\n");
+
+	return 0;
+}
+
 int rpu_init(void)
 {
 	int ret;
@@ -458,6 +483,11 @@ int rpu_enable(void)
 		goto rpu_pwroff;
 	}
 
+	ret = rpu_validate_comms();
+	if (ret) {
+		goto rpu_pwroff;
+	}
+
 	return 0;
 rpu_pwroff:
 	rpu_pwroff();

From 510ddb4ea6b35f17963d1cb29a11e719394fea45 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 10 Jul 2024 00:56:32 +0530
Subject: [PATCH 0358/2913] [nrf fromtree] drivers: wifi: Add support for
 separate debugs for RPU recovery

These are helpful for debugging RPU recovery only.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 1e5db78afc6ba25412dd74aae09ecdf56ece5f22)
(cherry picked from commit feae43925a7c5b1c91c5bdee943dba333a80f24c)
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi |  5 +++++
 drivers/wifi/nrfwifi/src/net_if.c    | 30 ++++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 9d8fad2daaa..a3f42a32198 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -703,6 +703,11 @@ config NRF_WIFI_RPU_MIN_TIME_TO_ENTER_SLEEP_MS
 	  Minimum time the host should de-assert WAKEUP_NOW and let RPU enter
 	  sleep mode, assuming there is no activity.
 
+config NRF_WIFI_RPU_RECOVERY_DEBUG
+	bool "RPU recovery debug logs"
+	help
+		Enable RPU recovery debug logs to help debug RPU recovery mechanism.
+
 endif # NRF_WIFI_RPU_RECOVERY
 
 config NRF_WIFI_FEAT_WMM
diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
index 899e9a87105..3170b67b975 100644
--- a/drivers/wifi/nrfwifi/src/net_if.c
+++ b/drivers/wifi/nrfwifi/src/net_if.c
@@ -71,6 +71,7 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 								struct nrf_wifi_vif_ctx_zep,
 								nrf_wifi_rpu_recovery_work);
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
+	int ret;
 
 	if (!vif_ctx_zep) {
 		LOG_ERR("%s: vif_ctx_zep is NULL", __func__);
@@ -88,14 +89,39 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 		return;
 	}
 
+#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
+	LOG_ERR("%s: Starting RPU recovery", __func__);
+#else
+	LOG_DBG("%s: Starting RPU recovery", __func__);
+#endif
 	k_mutex_lock(&rpu_ctx_zep->rpu_lock, K_FOREVER);
+#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
+	LOG_ERR("%s: Bringing the interface down", __func__);
+#else
 	LOG_DBG("%s: Bringing the interface down", __func__);
+#endif
 	/* This indirectly does a cold-boot of RPU */
-	net_if_down(vif_ctx_zep->zep_net_if_ctx);
+	ret = net_if_down(vif_ctx_zep->zep_net_if_ctx);
+	if (ret) {
+		LOG_ERR("%s: net_if_down failed: %d", __func__, ret);
+		/* Continue with the recovery */
+	}
 	k_msleep(CONFIG_NRF_WIFI_RPU_RECOVERY_PROPAGATION_DELAY_MS);
+#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
+	LOG_ERR("%s: Bringing the interface up", __func__);
+#else
 	LOG_DBG("%s: Bringing the interface up", __func__);
-	net_if_up(vif_ctx_zep->zep_net_if_ctx);
+#endif
+	ret = net_if_up(vif_ctx_zep->zep_net_if_ctx);
+	if (ret) {
+		LOG_ERR("%s: net_if_up failed: %d", __func__, ret);
+	}
 	k_mutex_unlock(&rpu_ctx_zep->rpu_lock);
+#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
+	LOG_ERR("%s: RPU recovery done", __func__);
+#else
+	LOG_DBG("%s: RPU recovery done", __func__);
+#endif
 }
 
 void nrf_wifi_rpu_recovery_cb(void *vif_ctx_handle,

From 224f0b5f511d899416a3d444496eda838066f5cb Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Thu, 11 Jul 2024 13:07:32 +0530
Subject: [PATCH 0359/2913] [nrf fromtree] drivers: wifi: Increase the
 propogation delay

In order for the interface down to propagate and cleanup it needs more
time, using Shell 10ms was working due to human delay, but
programatically this needs higher delay.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit c1afe97e94f464da5ed16199f4f03190959dcf37)
(cherry picked from commit 87e7d5449ef50d90004b6313215fbc4be1d3ac4d)
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index a3f42a32198..8906a22a5e8 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -667,7 +667,7 @@ if NRF_WIFI_RPU_RECOVERY
 
 config NRF_WIFI_RPU_RECOVERY_PROPAGATION_DELAY_MS
 	int "RPU recovery propagation delay in milliseconds"
-	default 10
+	default 2000
 	help
 		Propagation delay in milliseconds to wait after RPU is powered down
 		before powering it up. This delay is required to ensure that the recovery

From c2a13fa32b05506af486e5ed32e8ee34e02be497 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Sat, 13 Jul 2024 21:32:50 +0530
Subject: [PATCH 0360/2913] [nrf fromtree] drivers: wifi: Ignore parallel
 recovery requests

During recovery we might get further watchdog interrupts causing
multiple recovery requests, ignore them if a recovery is already in
progress.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit ce521b89ee6b0d311c0b3e5a5c183816981e11f3)
(cherry picked from commit a4842788b00e84026a98553a0d8bf372a21a6235)
---
 drivers/wifi/nrfwifi/inc/fmac_main.h |  3 +++
 drivers/wifi/nrfwifi/src/net_if.c    | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/drivers/wifi/nrfwifi/inc/fmac_main.h b/drivers/wifi/nrfwifi/inc/fmac_main.h
index c11d32c487a..88dbd960044 100644
--- a/drivers/wifi/nrfwifi/inc/fmac_main.h
+++ b/drivers/wifi/nrfwifi/inc/fmac_main.h
@@ -109,6 +109,9 @@ struct nrf_wifi_ctx_zep {
 	unsigned char *extended_capa, *extended_capa_mask;
 	unsigned int extended_capa_len;
 	struct k_mutex rpu_lock;
+#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
+	bool rpu_recovery_in_progress;
+#endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 };
 
 struct nrf_wifi_drv_priv_zep {
diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
index 3170b67b975..b4e5748dda9 100644
--- a/drivers/wifi/nrfwifi/src/net_if.c
+++ b/drivers/wifi/nrfwifi/src/net_if.c
@@ -89,12 +89,22 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 		return;
 	}
 
+	if (rpu_ctx_zep->rpu_recovery_in_progress) {
+#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
+		LOG_ERR("%s: RPU recovery already in progress", __func__);
+#else
+		LOG_DBG("%s: RPU recovery already in progress", __func__);
+#endif
+		return;
+	}
+
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 	LOG_ERR("%s: Starting RPU recovery", __func__);
 #else
 	LOG_DBG("%s: Starting RPU recovery", __func__);
 #endif
 	k_mutex_lock(&rpu_ctx_zep->rpu_lock, K_FOREVER);
+	rpu_ctx_zep->rpu_recovery_in_progress = true;
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 	LOG_ERR("%s: Bringing the interface down", __func__);
 #else
@@ -116,6 +126,7 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 	if (ret) {
 		LOG_ERR("%s: net_if_up failed: %d", __func__, ret);
 	}
+	rpu_ctx_zep->rpu_recovery_in_progress = false;
 	k_mutex_unlock(&rpu_ctx_zep->rpu_lock);
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 	LOG_ERR("%s: RPU recovery done", __func__);

From f896425368e97d3ee25ad4553a6d6fc3a5c06010 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Sun, 14 Jul 2024 01:20:59 +0530
Subject: [PATCH 0361/2913] [nrf fromtree] drivers: wifi: Add quiet period for
 RPU recovery

This is to avoid successive recoveries in case we get successive
watchdog interrupts from the RPU.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit ed7c10ead3907bafc82900e3c57cfd6a8017ca7d)
(cherry picked from commit c9b628f92e58e54e624119ea10c245bd91dcd6fe)
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi |  6 ++++++
 drivers/wifi/nrfwifi/inc/fmac_main.h |  1 +
 drivers/wifi/nrfwifi/src/net_if.c    | 15 +++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 8906a22a5e8..e5c5e77c8f8 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -708,6 +708,12 @@ config NRF_WIFI_RPU_RECOVERY_DEBUG
 	help
 		Enable RPU recovery debug logs to help debug RPU recovery mechanism.
 
+config NRF_WIFI_RPU_RECOVERY_QUIET_PERIOD_MS
+	int "RPU recovery quiet period in milliseconds"
+	default 5000
+	help
+	  Quiet period in milliseconds after RPU recovery is triggered. During
+	  this period, no new RPU recovery will be triggered.
 endif # NRF_WIFI_RPU_RECOVERY
 
 config NRF_WIFI_FEAT_WMM
diff --git a/drivers/wifi/nrfwifi/inc/fmac_main.h b/drivers/wifi/nrfwifi/inc/fmac_main.h
index 88dbd960044..bcdae7161e7 100644
--- a/drivers/wifi/nrfwifi/inc/fmac_main.h
+++ b/drivers/wifi/nrfwifi/inc/fmac_main.h
@@ -111,6 +111,7 @@ struct nrf_wifi_ctx_zep {
 	struct k_mutex rpu_lock;
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
 	bool rpu_recovery_in_progress;
+	unsigned long last_rpu_recovery_time_ms;
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 };
 
diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
index b4e5748dda9..9bcd772d903 100644
--- a/drivers/wifi/nrfwifi/src/net_if.c
+++ b/drivers/wifi/nrfwifi/src/net_if.c
@@ -98,6 +98,20 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 		return;
 	}
 
+	if (rpu_ctx_zep->last_rpu_recovery_time_ms &&
+		((k_uptime_get() - rpu_ctx_zep->last_rpu_recovery_time_ms) <
+	    CONFIG_NRF_WIFI_RPU_RECOVERY_QUIET_PERIOD_MS)) {
+#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
+		LOG_ERR("%s: In quiet period (last_rpu_recovery_time_ms=%ld), ignoring",
+			__func__, rpu_ctx_zep->last_rpu_recovery_time_ms);
+#else
+		LOG_DBG("%s: In quiet period (last_rpu_recovery_time_ms=%ld), ignoring",
+			__func__, rpu_ctx_zep->last_rpu_recovery_time_ms);
+#endif
+		return;
+	}
+
+
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 	LOG_ERR("%s: Starting RPU recovery", __func__);
 #else
@@ -127,6 +141,7 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 		LOG_ERR("%s: net_if_up failed: %d", __func__, ret);
 	}
 	rpu_ctx_zep->rpu_recovery_in_progress = false;
+	rpu_ctx_zep->last_rpu_recovery_time_ms = k_uptime_get();
 	k_mutex_unlock(&rpu_ctx_zep->rpu_lock);
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 	LOG_ERR("%s: RPU recovery done", __func__);

From 8e804e14b21df3395c7791106eb49d882a866616 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Sun, 14 Jul 2024 01:43:43 +0530
Subject: [PATCH 0362/2913] [nrf fromtree] drivers: wifi: Fix the NULL check

Check for RPU context as well.

To fix this properly we need more fixes to be backported, but this
should suffice for now.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 6f7fbf845181f437ae5572f1005a1e6514c68f39)
(cherry picked from commit 3decbb21b1894329757766acb8ad14c48e06dda1)
---
 drivers/wifi/nrfwifi/src/fmac_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c
index 5c0e4f336e6..ca5782a1ee7 100644
--- a/drivers/wifi/nrfwifi/src/fmac_main.c
+++ b/drivers/wifi/nrfwifi/src/fmac_main.c
@@ -252,7 +252,7 @@ static void nrf_wifi_process_rssi_from_rx(void *vif_ctx,
 
 	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
 
-	if (!rpu_ctx_zep) {
+	if (!(rpu_ctx_zep && rpu_ctx_zep->rpu_ctx)) {
 		LOG_ERR("%s: rpu_ctx_zep is NULL", __func__);
 		return;
 	}

From e2292255ff1505f60db4ec486256b0675a3a6564 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Sun, 14 Jul 2024 01:57:29 +0530
Subject: [PATCH 0363/2913] [nrf fromtree] drivers: wifi: Add RPU recovery
 retry mechanism

In case RPU is stuck in consecutive recovery over a time period then
that means it's not recoverable through RPU recovery, only thing left to
do is to trigger a system reboot. This feature is disabled by default,
so, either application can do their own implementatio or enable this
feature in the driver along with configurable retries and window period.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 9b105698ede164de7d44bef12effa4a7e8ab547b)
(cherry picked from commit 38a6217bd88cce53877eba17bd2ff058b1c12555)
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 16 ++++++++++++++++
 drivers/wifi/nrfwifi/inc/fmac_main.h |  1 +
 drivers/wifi/nrfwifi/src/net_if.c    | 18 +++++++++++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index e5c5e77c8f8..003123bdbad 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -714,6 +714,22 @@ config NRF_WIFI_RPU_RECOVERY_QUIET_PERIOD_MS
 	help
 	  Quiet period in milliseconds after RPU recovery is triggered. During
 	  this period, no new RPU recovery will be triggered.
+
+config NRF_WIFI_RPU_RECOVERY_MAX_RETRIES
+	int "Maximum number of consecutive RPU recovery retries, 0 to disable"
+	default 0
+	help
+	  Maximum number of consecutive RPU recovery retries before giving up
+	  and resetting the system. Set to 0 to keep retrying indefinitely.
+
+config NRF_WIFI_RPU_RECOVERY_RETRY_WINDOW_S
+	int "RPU recovery retry window in seconds"
+	default 900
+	help
+	  Window in seconds during which the number of consecutive RPU recovery
+	  retries are counted. If the number of consecutive RPU recovery retries
+	  exceeds NRF_WIFI_RPU_RECOVERY_MAX_RETRIES within this window, the system
+	  will be reset.
 endif # NRF_WIFI_RPU_RECOVERY
 
 config NRF_WIFI_FEAT_WMM
diff --git a/drivers/wifi/nrfwifi/inc/fmac_main.h b/drivers/wifi/nrfwifi/inc/fmac_main.h
index bcdae7161e7..24453a4c34f 100644
--- a/drivers/wifi/nrfwifi/inc/fmac_main.h
+++ b/drivers/wifi/nrfwifi/inc/fmac_main.h
@@ -112,6 +112,7 @@ struct nrf_wifi_ctx_zep {
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
 	bool rpu_recovery_in_progress;
 	unsigned long last_rpu_recovery_time_ms;
+	unsigned int rpu_recovery_retries;
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 };
 
diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
index 9bcd772d903..81369186533 100644
--- a/drivers/wifi/nrfwifi/src/net_if.c
+++ b/drivers/wifi/nrfwifi/src/net_if.c
@@ -18,6 +18,8 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 
+#include <zephyr/sys/reboot.h>
+
 #include "net_private.h"
 
 #include "util.h"
@@ -111,13 +113,27 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 		return;
 	}
 
-
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 	LOG_ERR("%s: Starting RPU recovery", __func__);
 #else
 	LOG_DBG("%s: Starting RPU recovery", __func__);
 #endif
 	k_mutex_lock(&rpu_ctx_zep->rpu_lock, K_FOREVER);
+#if CONFIG_NRF_WIFI_RPU_RECOVERY_MAX_RETRIES > 0
+	if (!rpu_ctx_zep->last_rpu_recovery_time_ms ||
+		(k_uptime_get() - rpu_ctx_zep->last_rpu_recovery_time_ms) <
+	    CONFIG_NRF_WIFI_RPU_RECOVERY_RETRY_WINDOW_S * MSEC_PER_SEC) {
+		if (rpu_ctx_zep->rpu_recovery_retries >=
+		    CONFIG_NRF_WIFI_RPU_RECOVERY_MAX_RETRIES) {
+			LOG_ERR("%s: Maximum recovery retries reached, rebooting system",
+				__func__);
+			sys_reboot(SYS_REBOOT_COLD);
+		}
+		rpu_ctx_zep->rpu_recovery_retries++;
+	} else {
+		rpu_ctx_zep->rpu_recovery_retries = 0;
+	}
+#endif
 	rpu_ctx_zep->rpu_recovery_in_progress = true;
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 	LOG_ERR("%s: Bringing the interface down", __func__);

From 3e55f425ed27ea86abfaead57b419b4ab38c5f95 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Thu, 18 Jul 2024 00:14:16 +0530
Subject: [PATCH 0364/2913] [nrf fromtree] drivers: wifi: Fix RPU recovery
 disabled build failures

Fix RPU recovery protection to solve build failures when RPU recovery is
disabled.

As recovery is primarily based on power-management, add a Kconfig
dependency to enforce, this simplies the macros to protect the code.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 5c8f1807c198b9b246ecd4ad3778412a626894aa)
(cherry picked from commit 0cc01f6577d238daa6da93fb5e985ce13156f02b)
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 1 +
 drivers/wifi/nrfwifi/inc/fmac_main.h | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 003123bdbad..07b286ebdf0 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -655,6 +655,7 @@ config NRF_WIFI_AP_DEAD_DETECT_TIMEOUT
 
 config NRF_WIFI_RPU_RECOVERY
 	bool "RPU recovery mechanism"
+	depends on NRF_WIFI_LOW_POWER
 	select EXPERIMENTAL
 	help
 		Enable RPU recovery mechanism to recover from RPU (nRF70) hang.
diff --git a/drivers/wifi/nrfwifi/inc/fmac_main.h b/drivers/wifi/nrfwifi/inc/fmac_main.h
index 24453a4c34f..9eb98baa518 100644
--- a/drivers/wifi/nrfwifi/inc/fmac_main.h
+++ b/drivers/wifi/nrfwifi/inc/fmac_main.h
@@ -146,8 +146,9 @@ enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx);
 #endif /* CONFIG_NRF_WIFI_BUILD_ONLY_MODE */
 #ifndef CONFIG_NRF70_OFFLOADED_RAW_TX
 struct nrf_wifi_vif_ctx_zep *nrf_wifi_get_vif_ctx(struct net_if *iface);
+#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
 void nrf_wifi_rpu_recovery_cb(void *vif_ctx,
 		void *event_data,
 		unsigned int event_len);
-#endif /* !CONFIG_NRF_WIFI_BUILD_ONLY_MODE */
+#endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 #endif /* __ZEPHYR_FMAC_MAIN_H__ */

From d097420afa6d18a17890b5864105a8746cf7bcae Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Thu, 18 Jul 2024 01:02:57 +0530
Subject: [PATCH 0365/2913] [nrf fromtree] drivers: wifi: Fix TX buffers leak

During interface down in case TX has pending buffers in either TXQ or
Pending_Q then they are not freed instead the Q itself is freed.

Fix by traversing the Q and freeing all members.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 9c36d976460ee612f716a191c461c16f40d55936)
(cherry picked from commit 994efbefeeb017ad8a4ec0e8688a8a1af8d099d4)
---
 drivers/wifi/nrfwifi/src/shim.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/wifi/nrfwifi/src/shim.c b/drivers/wifi/nrfwifi/src/shim.c
index 9f8b065ead0..d0379a6d1f5 100644
--- a/drivers/wifi/nrfwifi/src/shim.c
+++ b/drivers/wifi/nrfwifi/src/shim.c
@@ -235,6 +235,10 @@ static void *zep_shim_nbuf_alloc(unsigned int size)
 
 static void zep_shim_nbuf_free(void *nbuf)
 {
+	if (!nbuf) {
+		return;
+	}
+
 	k_free(((struct nwb *)nbuf)->priv);
 	k_free(nbuf);
 }

From a1daf4a3e7ee024c09f7e18aa7621f8594f37f77 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Thu, 18 Jul 2024 20:52:19 +0530
Subject: [PATCH 0366/2913] [nrf fromtree] drivers: wifi: Add PS state debugs

These are very frequent, so, a separate debug is added for debugging
host RPU recovery logic.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit a4537a7eea25d2d8b5eeb2544d101419047659f4)
(cherry picked from commit d5a4d971682d3c681a5609831942b11b9e07e62e)
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 07b286ebdf0..edf1049a0e8 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -731,6 +731,13 @@ config NRF_WIFI_RPU_RECOVERY_RETRY_WINDOW_S
 	  retries are counted. If the number of consecutive RPU recovery retries
 	  exceeds NRF_WIFI_RPU_RECOVERY_MAX_RETRIES within this window, the system
 	  will be reset.
+
+config NRF_WIFI_RPU_RECOVERY_PS_STATE_DEBUG
+	bool "RPU recovery power save state debug logs"
+	help
+	  Enable RPU recovery power save state debug logs to help debug RPU recovery mechanism.
+
+
 endif # NRF_WIFI_RPU_RECOVERY
 
 config NRF_WIFI_FEAT_WMM

From aacbb8ca6ba8533518043d92e21abcab352a3c2e Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Thu, 18 Jul 2024 17:40:46 +0530
Subject: [PATCH 0367/2913] [nrf fromtree] drivers: wifi: Enable management
 buffers offload

With this offload, host doesn't need to manage RX buffers for management
frames, and this saves Host-RPU comms and thus giving RPU to sleep more
often and is essential to test RPU recovery.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit dbda09d3e506d391cbd203bd2afdd6444d1bcdc7)
(cherry picked from commit 26f62010e121d4d3054d565796ac644b998fe2be)
---
 drivers/wifi/nrfwifi/CMakeLists.txt  | 4 ++++
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 5ea9da5825e..933be3603a5 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -285,6 +285,10 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF70_AP_MODE
   -DNRF70_AP_MODE
 )
 
+zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_MGMT_BUFF_OFFLOAD
+  -DNRF_WIFI_MGMT_BUFF_OFFLOAD
+)
+
 zephyr_compile_definitions(
   -DNRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
   -DNRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}
diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index edf1049a0e8..5403ecdf83f 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -769,4 +769,12 @@ config NRF_WIFI_QOS_NULL_BASED_RETRIEVAL
 
 endchoice
 
+config NRF_WIFI_MGMT_BUFF_OFFLOAD
+	bool "management buffer offload"
+	default y
+	help
+	  This option offloads the refilling of management buffers to UMAC, saves host
+	  having to exchange commands and events for every management packet even if it is
+	  consumed by UMAC.
+
 endif # WIFI_NRF70

From f0e8cea70ba7037f95f6a6eb42ba6336d07820e6 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 6 Aug 2024 20:30:58 +0530
Subject: [PATCH 0368/2913] [nrf fromtree] drivers: wifi: Increase default PS
 active timeout interval

In crowded environments RPU is active for more than 10s due to too many
retries and this triggers a false RPU recovery. To avoid this, increase
the default to 50s to handle corner cases, as this will only impact the
recovery triggered case, higher timeout doesn't have any impact in
normal cases.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 94f9fb95d9e0c6d9db8003feaf26afd7cdd96f11)
(cherry picked from commit 43614e2db079691d9e713a06802d3af5f41633a7)
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 5403ecdf83f..5814548cb20 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -690,7 +690,7 @@ config NRF_WIFI_RPU_RECOVERY_PROPAGATION_DELAY_MS
 
 config NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS
 	int "RPU recovery power save active timeout in milliseconds"
-	default 10000
+	default 50000
 	help
 	  Power save active timeout in milliseconds after which RPU recovery
 	  mechanism will be triggered. This timeout is used to ensure that the

From 02fc26cb0caa7b8023bbc08c55fd5b953c3087fe Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 6 Aug 2024 21:10:39 +0530
Subject: [PATCH 0369/2913] [nrf fromtree] drivers: wifi: Add support for
 keepalive

To handle interoperability issue with few APs, add a feature to keep
sending keepalive frames periodically to avoid AP disconnecting the STA.

This is disabled by default to avoid unnecessary power consumption as
it's only seen with few old APs.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 7c3d3427963e1295b2e8a0ed1b6eb5492bb7ac9e)
(cherry picked from commit 17b81496b4c2cc54f4d31afe36fdd6148e97608a)
---
 drivers/wifi/nrfwifi/CMakeLists.txt  |  8 ++++++++
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 933be3603a5..14f3080d1a4 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -289,6 +289,14 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_MGMT_BUFF_OFFLOAD
   -DNRF_WIFI_MGMT_BUFF_OFFLOAD
 )
 
+zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_FEAT_KEEPALIVE
+  -DNRF_WIFI_FEAT_KEEPALIVE
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_FEAT_KEEPALIVE
+  -DNRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}
+)
+
 zephyr_compile_definitions(
   -DNRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
   -DNRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}
diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 5814548cb20..c4b619315b3 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -777,4 +777,22 @@ config NRF_WIFI_MGMT_BUFF_OFFLOAD
 	  having to exchange commands and events for every management packet even if it is
 	  consumed by UMAC.
 
+config NRF_WIFI_FEAT_KEEPALIVE
+	bool "Wi-Fi keepalive feature for connection maintenance"
+	depends on NRF70_STA_MODE
+	help
+	  Enable Wi-Fi keepalive feature to keep the connection alive by sending
+	  keepalive packets to the AP. Primarily intended to interoperate with APs
+	  that disconnect idle clients without any explicit checks. Slightly increases
+	  power consumption.
+
+if NRF_WIFI_FEAT_KEEPALIVE
+config NRF_WIFI_KEEPALIVE_PERIOD_S
+	int "Keepalive period in seconds"
+	range 30 3600
+	default 60
+	help
+	  Keepalive period in seconds to send keepalive packets to the AP.
+endif
+
 endif # WIFI_NRF70

From 618fb597401791eb55f6a16edfdb3d411967231e Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 3 Sep 2024 00:02:08 +0530
Subject: [PATCH 0370/2913] [nrf fromtree] drivers: wifi: Fix shell hang

Add a null check for HAL context in the interrupt handler, this was
causing locking issue operating on null. The root cause of null is not
known, but this solves the locking issue when data and control paths are
excited in parallel.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 5f6dca377a055b419c4caa5c7da8aa1a8d56c19a)
(cherry picked from commit 986c18ed18705ecec409cbe4b9940efe61c3cdd8)
---
 drivers/wifi/nrfwifi/src/shim.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/wifi/nrfwifi/src/shim.c b/drivers/wifi/nrfwifi/src/shim.c
index d0379a6d1f5..9c6c117ddfb 100644
--- a/drivers/wifi/nrfwifi/src/shim.c
+++ b/drivers/wifi/nrfwifi/src/shim.c
@@ -751,6 +751,11 @@ static void irq_work_handler(struct k_work *work)
 {
 	int ret = 0;
 
+	if (!intr_priv || !intr_priv->callbk_fn || !intr_priv->callbk_data) {
+		LOG_ERR("%s: Invalid intr_priv handler", __func__);
+		return;
+	}
+
 	ret = intr_priv->callbk_fn(intr_priv->callbk_data);
 
 	if (ret) {
@@ -766,6 +771,11 @@ static void zep_shim_irq_handler(const struct device *dev, struct gpio_callback
 	ARG_UNUSED(cb);
 	ARG_UNUSED(pins);
 
+	if (!(intr_priv && intr_priv->callbk_fn && intr_priv->callbk_data)) {
+		LOG_ERR("%s: Invalid intr_priv", __func__);
+		return;
+	}
+
 	k_work_schedule_for_queue(&zep_wifi_intr_q, &intr_priv->work, K_NO_WAIT);
 }
 

From 01f3e58db73b5ab7664c61998b9346c42ba10856 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Thu, 5 Sep 2024 01:44:40 +0530
Subject: [PATCH 0371/2913] [nrf fromtree] drivers: wifi: Use mutex for
 spinlock

Ideally we should be using Zephyr spinlock APIs but that requires
changes to shim API, so, for this maintenance release just replace with
mutex to keep the context same and no API changes.

This solves the locking issue that we see when control and data path are
excited concurrently due to locking semantics of semaphores, the issue
is not root caused but mutex enforce strict locking semantics for
multiple threads and solve the issue.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit d0d659b675ec256928faf92741f6ea4641f5287e)
(cherry picked from commit 63da7d9bb932e12c1f555ca19ae0b8dd4dcafccd)
---
 drivers/wifi/nrfwifi/src/shim.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/shim.c b/drivers/wifi/nrfwifi/src/shim.c
index 9c6c117ddfb..93cafa905c2 100644
--- a/drivers/wifi/nrfwifi/src/shim.c
+++ b/drivers/wifi/nrfwifi/src/shim.c
@@ -116,7 +116,7 @@ static void zep_shim_qspi_cpy_to(void *priv, unsigned long addr, const void *src
 
 static void *zep_shim_spinlock_alloc(void)
 {
-	struct k_sem *lock = NULL;
+	struct k_mutex *lock = NULL;
 
 	lock = k_malloc(sizeof(*lock));
 
@@ -134,27 +134,29 @@ static void zep_shim_spinlock_free(void *lock)
 
 static void zep_shim_spinlock_init(void *lock)
 {
-	k_sem_init(lock, 1, 1);
+	k_mutex_init(lock);
 }
 
 static void zep_shim_spinlock_take(void *lock)
 {
-	k_sem_take(lock, K_FOREVER);
+	k_mutex_lock(lock, K_FOREVER);
 }
 
 static void zep_shim_spinlock_rel(void *lock)
 {
-	k_sem_give(lock);
+	k_mutex_unlock(lock);
 }
 
 static void zep_shim_spinlock_irq_take(void *lock, unsigned long *flags)
 {
-	k_sem_take(lock, K_FOREVER);
+	ARG_UNUSED(flags);
+	k_mutex_lock(lock, K_FOREVER);
 }
 
 static void zep_shim_spinlock_irq_rel(void *lock, unsigned long *flags)
 {
-	k_sem_give(lock);
+	ARG_UNUSED(flags);
+	k_mutex_unlock(lock);
 }
 
 static int zep_shim_pr_dbg(const char *fmt, va_list args)

From efb4c8f076fa6fa89d9c527e8e9c01be79c7a150 Mon Sep 17 00:00:00 2001
From: Ajay Parida <ajay.parida@nordicsemi.no>
Date: Tue, 3 Sep 2024 19:12:09 +0530
Subject: [PATCH 0372/2913] [nrf fromtree] drivers: wifi: Add PS exit strategy
 runtime configuration

Dynamically set power save exit strategy runtime configuration that
allows to switch b/w stratgies depending on conserving power and
low-latency traffic download.

Signed-off-by: Ajay Parida <ajay.parida@nordicsemi.no>
(cherry picked from commit fe920fc9c911b817ad3df3688611ec4ba20a6732)
(cherry picked from commit aa74fffa2c6a69653fb72fc1186e0ded150a23d2)
---
 drivers/wifi/nrfwifi/CMakeLists.txt  |  1 +
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 20 ++++++++++++++++++++
 drivers/wifi/nrfwifi/src/wifi_mgmt.c | 23 +++++++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 14f3080d1a4..41611af08a1 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -338,4 +338,5 @@ zephyr_compile_definitions(
   -DNRF70_ANT_GAIN_5G_BAND1=${CONFIG_NRF70_ANT_GAIN_5G_BAND1}
   -DNRF70_ANT_GAIN_5G_BAND2=${CONFIG_NRF70_ANT_GAIN_5G_BAND2}
   -DNRF70_ANT_GAIN_5G_BAND3=${CONFIG_NRF70_ANT_GAIN_5G_BAND3}
+  -DNRF_WIFI_PS_INT_PS=${CONFIG_NRF_WIFI_PS_INT_PS}
 )
diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index c4b619315b3..b409261b614 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -795,4 +795,24 @@ config NRF_WIFI_KEEPALIVE_PERIOD_S
 	  Keepalive period in seconds to send keepalive packets to the AP.
 endif
 
+choice NRF_WIFI_PS_EXIT_STRATEGY
+	prompt "Power save exit strategy"
+	default NRF_WIFI_PS_INT_PS
+	help
+	  Select the power save exit strategy to retrieve buffered data from AP.
+
+config NRF_WIFI_PS_EXIT_EVERY_TIM
+	bool "Exit power save every time to retrieve buffered data from AP"
+	help
+	  Exit power save every time to retrieve buffered data from AP. Entering back to
+	  power save mode might take some time and power.
+
+config NRF_WIFI_PS_INT_PS
+	bool "Exit power save based on an intelligent algorithm"
+	help
+	  Exit power save based on an intelligent algorithm to retrieve buffered data from AP.
+	  The algorithm tracks the buffered data at the AP and then dynamically decides
+	  whether to stay in PS (for lower amount of buffered data) or exit PS (for higher
+	  amount of buffered data).
+endchoice
 endif # WIFI_NRF70
diff --git a/drivers/wifi/nrfwifi/src/wifi_mgmt.c b/drivers/wifi/nrfwifi/src/wifi_mgmt.c
index 6232ad245cd..65f6c217bfe 100644
--- a/drivers/wifi/nrfwifi/src/wifi_mgmt.c
+++ b/drivers/wifi/nrfwifi/src/wifi_mgmt.c
@@ -115,6 +115,24 @@ int nrf_wifi_set_power_save(const struct device *dev,
 							vif_ctx_zep->vif_idx,
 							params->wakeup_mode);
 	break;
+	case WIFI_PS_PARAM_EXIT_STRATEGY:
+		unsigned int exit_strategy;
+
+		if (params->exit_strategy == WIFI_PS_EXIT_EVERY_TIM) {
+			exit_strategy = EVERY_TIM;
+		} else if (params->exit_strategy == WIFI_PS_EXIT_CUSTOM_ALGO) {
+			exit_strategy = INT_PS;
+		} else {
+			params->fail_reason =
+				WIFI_PS_PARAM_FAIL_INVALID_EXIT_STRATEGY;
+			return -EINVAL;
+		}
+
+		status = nrf_wifi_fmac_set_ps_exit_strategy(
+							rpu_ctx_zep->rpu_ctx,
+							vif_ctx_zep->vif_idx,
+							exit_strategy);
+	break;
 	default:
 		params->fail_reason =
 			WIFI_PS_PARAM_FAIL_CMD_EXEC_FAIL;
@@ -379,6 +397,11 @@ void nrf_wifi_event_proc_get_power_save_info(void *vif_ctx,
 	vif_ctx_zep->ps_info->ps_params.timeout_ms = ps_info->ps_timeout;
 	vif_ctx_zep->ps_info->ps_params.listen_interval = ps_info->listen_interval;
 	vif_ctx_zep->ps_info->ps_params.wakeup_mode = ps_info->extended_ps;
+	if (ps_info->ps_exit_strategy == EVERY_TIM) {
+		vif_ctx_zep->ps_info->ps_params.exit_strategy = WIFI_PS_EXIT_EVERY_TIM;
+	} else if (ps_info->ps_exit_strategy == INT_PS) {
+		vif_ctx_zep->ps_info->ps_params.exit_strategy = WIFI_PS_EXIT_CUSTOM_ALGO;
+	}
 
 	for (int i = 0; i < ps_info->num_twt_flows; i++) {
 		struct twt_interval_float twt_interval_fp;

From a3a0742a91d059f6f70d76bf9dc7124f0c72ce8c Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 11 Sep 2024 17:53:33 +0530
Subject: [PATCH 0373/2913] [nrf fromtree] drivers: wifi: Fix crash when
 recovery is triggered

There is a race condition when recovery is in progress and in parallel
Wi-Fi util commands are being executed (CTF), where the RPU context is
de-initialized as part of recovery but no checks are present in the
Wi-Fi util command processing causing a crash.

This needs a proper fix for all commands, but for maintenance branch
fix is added only for commonly used commands.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 67216f1b5ae1e9467c6b2e88bfde5609fabd2040)
(cherry picked from commit 017d72c62cd8f6bd3baafb6fbecf41fdad6aebbe)
---
 drivers/wifi/nrfwifi/src/wifi_util.c | 42 ++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/wifi_util.c b/drivers/wifi/nrfwifi/src/wifi_util.c
index c5e2a8dedfa..2e514ea6719 100644
--- a/drivers/wifi/nrfwifi/src/wifi_util.c
+++ b/drivers/wifi/nrfwifi/src/wifi_util.c
@@ -273,6 +273,7 @@ static int nrf_wifi_util_tx_stats(const struct shell *sh,
 	void *queue = NULL;
 	unsigned int tx_pending_pkts = 0;
 	struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
+	int ret;
 
 	vif_index = atoi(argv[1]);
 	if ((vif_index < 0) || (vif_index >= max_vif_index)) {
@@ -284,6 +285,15 @@ static int nrf_wifi_util_tx_stats(const struct shell *sh,
 		return -ENOEXEC;
 	}
 
+	k_mutex_lock(&ctx->rpu_lock, K_FOREVER);
+	if (!ctx->rpu_ctx) {
+		shell_fprintf(shell,
+			      SHELL_ERROR,
+			      "RPU context not initialized\n");
+		ret = -ENOEXEC;
+		goto unlock;
+	}
+
 	fmac_dev_ctx = ctx->rpu_ctx;
 	def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
 
@@ -306,7 +316,11 @@ static int nrf_wifi_util_tx_stats(const struct shell *sh,
 			tx_pending_pkts);
 	}
 
-	return 0;
+	ret = 0;
+
+unlock:
+	k_mutex_unlock(&ctx->rpu_lock);
+	return ret;
 }
 #endif /* CONFIG_NRF70_STA_MODE */
 
@@ -444,6 +458,7 @@ static int nrf_wifi_util_dump_rpu_stats(const struct shell *sh,
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
 	struct rpu_op_stats stats;
 	enum rpu_stats_type stats_type = RPU_STATS_TYPE_ALL;
+	int ret;
 
 	if (argc == 2) {
 		const char *type  = argv[1];
@@ -465,6 +480,14 @@ static int nrf_wifi_util_dump_rpu_stats(const struct shell *sh,
 		}
 	}
 
+	k_mutex_lock(&ctx->rpu_lock, K_FOREVER);
+	if (!ctx->rpu_ctx) {
+		shell_fprintf(shell,
+			      SHELL_ERROR,
+			      "RPU context not initialized\n");
+		ret = -ENOEXEC;
+		goto unlock;
+	}
 	fmac_dev_ctx = ctx->rpu_ctx;
 
 	memset(&stats, 0, sizeof(struct rpu_op_stats));
@@ -474,7 +497,8 @@ static int nrf_wifi_util_dump_rpu_stats(const struct shell *sh,
 		shell_fprintf(sh,
 			      SHELL_ERROR,
 			      "Failed to get stats\n");
-		return -ENOEXEC;
+		ret = -ENOEXEC;
+		goto unlock;
 	}
 
 	if (stats_type == RPU_STATS_TYPE_UMAC || stats_type == RPU_STATS_TYPE_ALL) {
@@ -847,7 +871,9 @@ static int nrf_wifi_util_dump_rpu_stats(const struct shell *sh,
 				  phy->dsss_crc32_fail_cnt);
 	}
 
-	return 0;
+	ret = 0;
+unlock:
+	return ret;
 }
 #endif /* !CONFIG_NRF70_RADIO_TEST && !CONFIG_NRF70_OFFLOADED_RAW_TX */
 
@@ -858,12 +884,15 @@ static int nrf_wifi_util_trigger_rpu_recovery(const struct shell *sh,
 {
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
+	int ret;
 
+	k_mutex_lock(&ctx->rpu_lock, K_FOREVER);
 	if (!ctx || !ctx->rpu_ctx) {
 		shell_fprintf(sh,
 			      SHELL_ERROR,
 			      "RPU context not initialized\n");
-		return -ENOEXEC;
+		ret = -ENOEXEC;
+		goto unlock;
 	}
 
 	fmac_dev_ctx = ctx->rpu_ctx;
@@ -880,7 +909,10 @@ static int nrf_wifi_util_trigger_rpu_recovery(const struct shell *sh,
 		      SHELL_INFO,
 		      "RPU recovery triggered\n");
 
-	return 0;
+	ret = 0;
+unlock:
+	k_mutex_unlock(&ctx->rpu_lock);
+	return ret;
 }
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 

From 9e94331db41bd4265f2cf19a3c1fabb6be3bbeb0 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Thu, 12 Sep 2024 14:45:27 +0530
Subject: [PATCH 0374/2913] [nrf fromtree] drivers: wifi: Fix missing unlock
 for stats

The RPU context lock is not unlocked this is causing recovery to be
stuck waiting for the lock.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit ce9d71c476ba5c0815324086bd0692e56933cfbd)
(cherry picked from commit 5e6c3710e64dd6d2f09864c62958c48dc4db1123)
---
 drivers/wifi/nrfwifi/src/wifi_util.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/wifi/nrfwifi/src/wifi_util.c b/drivers/wifi/nrfwifi/src/wifi_util.c
index 2e514ea6719..cad5662f483 100644
--- a/drivers/wifi/nrfwifi/src/wifi_util.c
+++ b/drivers/wifi/nrfwifi/src/wifi_util.c
@@ -873,6 +873,7 @@ static int nrf_wifi_util_dump_rpu_stats(const struct shell *sh,
 
 	ret = 0;
 unlock:
+	k_mutex_unlock(&ctx->rpu_lock);
 	return ret;
 }
 #endif /* !CONFIG_NRF70_RADIO_TEST && !CONFIG_NRF70_OFFLOADED_RAW_TX */

From 6a05274420601096f1fd6c7340fa88d1d6980b98 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Fri, 13 Sep 2024 15:31:04 +0530
Subject: [PATCH 0375/2913] [nrf fromtree] drivers: wifi: Fix mutex
 re-initialization

The mutex is used to protect RPU zephyr context which gets modified for
every interface down and up (including recovery), so, it was being
re-initialized but also used to protect down and up which is a bug.

Move the re-initialization to the driver entry so that it happens only
once and we can properly use the mutext for down and up protection.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit d30161cd8bd182de5c725376c98b19bce686c6ac)
(cherry picked from commit 25a8bd07f76600804dd85b1eae8aca75b6471e10)
---
 drivers/wifi/nrfwifi/src/fmac_main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c
index ca5782a1ee7..4778111579e 100644
--- a/drivers/wifi/nrfwifi/src/fmac_main.c
+++ b/drivers/wifi/nrfwifi/src/fmac_main.c
@@ -656,8 +656,6 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv
 		goto err;
 	}
 
-	k_mutex_init(&rpu_ctx_zep->rpu_lock);
-
 	return status;
 err:
 	if (rpu_ctx) {
@@ -816,6 +814,7 @@ static int nrf_wifi_drv_main_zep(const struct device *dev)
 			      nrf_wifi_scan_timeout_work);
 #endif /* CONFIG_NRF70_RADIO_TEST */
 
+	k_mutex_init(&rpu_drv_priv_zep.rpu_ctx_zep.rpu_lock);
 	return 0;
 #ifdef CONFIG_NRF70_RADIO_TEST
 fmac_deinit:

From 6895c1287e305e29ca634ee545fa41519b54ee30 Mon Sep 17 00:00:00 2001
From: Ajay Parida <ajay.parida@nordicsemi.no>
Date: Tue, 3 Sep 2024 19:03:55 +0530
Subject: [PATCH 0376/2913] [nrf fromtree] wifi_mgmt: Add support for
 configuring PS exit strategy

If AP indicates the presence of buffered traffic, then it is up to the
STA to decide whether to stay in PS or come out of PS, add configuration
options that can be used at runtime to choose this.

This is tagged as "noup" because it's a backport and "fromlist" cannot
be used as it won't apply cleanly.

Signed-off-by: Ajay Parida <ajay.parida@nordicsemi.no>
(cherry picked from commit 0ce5da6da8124dfe760e17e87e60746798aae2a3)
(cherry picked from commit 0dcde521dd07e11b42808125f38f059cb216da86)
---
 include/zephyr/net/wifi.h       | 22 +++++++++++++++++
 include/zephyr/net/wifi_mgmt.h  |  2 ++
 subsys/net/l2/wifi/wifi_mgmt.c  | 19 +++++++++++++++
 subsys/net/l2/wifi/wifi_shell.c | 43 +++++++++++++++++++++++++++++++++
 4 files changed, 86 insertions(+)

diff --git a/include/zephyr/net/wifi.h b/include/zephyr/net/wifi.h
index f8a2645f558..4612fe2b0b1 100644
--- a/include/zephyr/net/wifi.h
+++ b/include/zephyr/net/wifi.h
@@ -450,6 +450,8 @@ enum wifi_ps_param_type {
 	WIFI_PS_PARAM_WAKEUP_MODE,
 	/** Power save mode. */
 	WIFI_PS_PARAM_MODE,
+	/** Power save exit strategy. */
+	WIFI_PS_PARAM_EXIT_STRATEGY,
 	/** Power save timeout. */
 	WIFI_PS_PARAM_TIMEOUT,
 };
@@ -465,6 +467,24 @@ enum wifi_ps_wakeup_mode {
 /** Helper function to get user-friendly ps wakeup mode name. */
 const char *wifi_ps_wakeup_mode_txt(enum wifi_ps_wakeup_mode ps_wakeup_mode);
 
+/**
+ * @brief Wi-Fi power save exit strategy
+ */
+enum wifi_ps_exit_strategy {
+	/** PS-Poll frame based */
+	WIFI_PS_EXIT_CUSTOM_ALGO = 0,
+	/** QoS NULL frame based */
+	WIFI_PS_EXIT_EVERY_TIM,
+
+/** @cond INTERNAL_HIDDEN */
+	WIFI_PS_EXIT_LAST,
+	WIFI_PS_EXIT_MAX = WIFI_PS_EXIT_LAST - 1,
+/** @endcond */
+};
+
+/** Helper function to get user-friendly ps exit strategy name. */
+const char * const wifi_ps_exit_strategy_txt(enum wifi_ps_exit_strategy ps_exit_strategy);
+
 /** @brief Wi-Fi power save error codes. */
 enum wifi_config_ps_param_fail_reason {
 	/** Unspecified error */
@@ -481,6 +501,8 @@ enum wifi_config_ps_param_fail_reason {
 	WIFI_PS_PARAM_FAIL_DEVICE_CONNECTED,
 	/** Listen interval out of range */
 	WIFI_PS_PARAM_LISTEN_INTERVAL_RANGE_INVALID,
+	/** Invalid exit strategy */
+	WIFI_PS_PARAM_FAIL_INVALID_EXIT_STRATEGY,
 };
 
 /** @cond INTERNAL_HIDDEN */
diff --git a/include/zephyr/net/wifi_mgmt.h b/include/zephyr/net/wifi_mgmt.h
index 68650dd9319..653197bf938 100644
--- a/include/zephyr/net/wifi_mgmt.h
+++ b/include/zephyr/net/wifi_mgmt.h
@@ -604,6 +604,8 @@ struct wifi_ps_params {
 	enum wifi_ps_param_type type;
 	/** Wi-Fi power save fail reason */
 	enum wifi_config_ps_param_fail_reason fail_reason;
+	/** Wi-Fi power save exit strategy */
+	enum wifi_ps_exit_strategy exit_strategy;
 };
 
 /** @brief Wi-Fi TWT parameters */
diff --git a/subsys/net/l2/wifi/wifi_mgmt.c b/subsys/net/l2/wifi/wifi_mgmt.c
index d676edd8f99..3cea624b6e3 100644
--- a/subsys/net/l2/wifi/wifi_mgmt.c
+++ b/subsys/net/l2/wifi/wifi_mgmt.c
@@ -240,6 +240,18 @@ const char *wifi_ps_wakeup_mode_txt(enum wifi_ps_wakeup_mode ps_wakeup_mode)
 	}
 }
 
+const char * const wifi_ps_exit_strategy_txt(enum wifi_ps_exit_strategy ps_exit_strategy)
+{
+	switch (ps_exit_strategy) {
+	case WIFI_PS_EXIT_EVERY_TIM:
+		return "Every TIM";
+	case WIFI_PS_EXIT_CUSTOM_ALGO:
+		return "Custom algorithm";
+	default:
+		return "UNKNOWN";
+	}
+}
+
 static const struct wifi_mgmt_ops *const get_wifi_api(struct net_if *iface)
 {
 	const struct device *dev = net_if_get_device(iface);
@@ -570,6 +582,13 @@ static int wifi_set_power_save(uint32_t mgmt_request, struct net_if *iface,
 	case WIFI_PS_PARAM_WAKEUP_MODE:
 	case WIFI_PS_PARAM_TIMEOUT:
 		break;
+	case WIFI_PS_PARAM_EXIT_STRATEGY:
+		if (ps_params->exit_strategy > WIFI_PS_EXIT_MAX) {
+			ps_params->fail_reason =
+				WIFI_PS_PARAM_FAIL_INVALID_EXIT_STRATEGY;
+			return -EINVAL;
+		}
+	break;
 	default:
 		ps_params->fail_reason =
 			WIFI_PS_PARAM_FAIL_OPERATION_NOT_SUPPORTED;
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index 2dbb44de0aa..0817f256b6c 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -1062,6 +1062,9 @@ static int cmd_wifi_ps(const struct shell *sh, size_t argc, char *argv[])
 			PR("PS timeout: disabled\n");
 		}
 
+		shell_fprintf(sh, SHELL_NORMAL, "PS exit strategy: %s\n",
+				wifi_ps_exit_strategy_txt(config.ps_params.exit_strategy));
+
 		if (config.num_twt_flows == 0) {
 			PR("No TWT flows\n");
 		} else {
@@ -1777,6 +1780,40 @@ static int cmd_wifi_set_rts_threshold(const struct shell *sh, size_t argc, char
 	return 0;
 }
 
+static int cmd_wifi_ps_exit_strategy(const struct shell *sh, size_t argc,
+			    char *argv[])
+{
+	struct net_if *iface = net_if_get_first_wifi();
+	struct wifi_ps_params params = { 0 };
+
+	context.sh = sh;
+
+	if (!strncmp(argv[1], "tim", 3)) {
+		params.exit_strategy = WIFI_PS_EXIT_EVERY_TIM;
+	} else if (!strncmp(argv[1], "custom", 6)) {
+		params.exit_strategy = WIFI_PS_EXIT_CUSTOM_ALGO;
+	} else {
+		shell_fprintf(sh, SHELL_WARNING, "Invalid argument\n");
+		shell_fprintf(sh, SHELL_INFO, "Valid argument : <tim> / <custom>\n");
+		return -ENOEXEC;
+	}
+
+	params.type = WIFI_PS_PARAM_EXIT_STRATEGY;
+
+	if (net_mgmt(NET_REQUEST_WIFI_PS, iface, &params, sizeof(params))) {
+		shell_fprintf(sh, SHELL_WARNING,
+			      "Setting PS exit strategy to %s failed..Reason :%s\n",
+			      wifi_ps_exit_strategy_txt(params.exit_strategy),
+			      wifi_ps_get_config_err_code_str(params.fail_reason));
+		return -ENOEXEC;
+	}
+
+	shell_fprintf(sh, SHELL_NORMAL, "%s\n",
+		      wifi_ps_exit_strategy_txt(params.exit_strategy));
+
+	return 0;
+}
+
 void parse_mode_args_to_params(const struct shell *sh, int argc,
 			       char *argv[], struct wifi_mode_info *mode,
 			       bool *do_mode_oper)
@@ -2942,6 +2979,12 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
 	SHELL_SUBCMD_SET_END
 );
 
+SHELL_SUBCMD_ADD((wifi), ps_exit_strategy, &wifi_commands,
+		 "<tim> : Set PS exit strategy to Every TIM\n"
+		 "<custom> : Set PS exit strategy to Custom",
+		 cmd_wifi_ps_exit_strategy,
+		 2, 0);
+
 SHELL_CMD_REGISTER(wifi, &wifi_commands, "Wi-Fi commands", NULL);
 
 static int wifi_shell_init(void)

From 461d6de02550932e960d073495cc4636167a6d5a Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 7 Oct 2024 22:28:41 +0530
Subject: [PATCH 0377/2913] [nrf fromtree] drivers: nrfwifi: Fix build errors
 when Util is enabled

This path is disabled by default.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit cd736558ef51f16ffcce86a1a4cfb7a945c62852)
(cherry picked from commit a0713dc45c7b5dedaa1b0f64f19829ff69dce6ce)
---
 drivers/wifi/nrfwifi/src/wifi_util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/wifi_util.c b/drivers/wifi/nrfwifi/src/wifi_util.c
index cad5662f483..528c41fa184 100644
--- a/drivers/wifi/nrfwifi/src/wifi_util.c
+++ b/drivers/wifi/nrfwifi/src/wifi_util.c
@@ -287,7 +287,7 @@ static int nrf_wifi_util_tx_stats(const struct shell *sh,
 
 	k_mutex_lock(&ctx->rpu_lock, K_FOREVER);
 	if (!ctx->rpu_ctx) {
-		shell_fprintf(shell,
+		shell_fprintf(sh,
 			      SHELL_ERROR,
 			      "RPU context not initialized\n");
 		ret = -ENOEXEC;
@@ -482,7 +482,7 @@ static int nrf_wifi_util_dump_rpu_stats(const struct shell *sh,
 
 	k_mutex_lock(&ctx->rpu_lock, K_FOREVER);
 	if (!ctx->rpu_ctx) {
-		shell_fprintf(shell,
+		shell_fprintf(sh,
 			      SHELL_ERROR,
 			      "RPU context not initialized\n");
 		ret = -ENOEXEC;

From 08b6e7604926f6a2ec5eca9d4058f2f3fbc11e6e Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 22 Oct 2024 01:43:21 +0530
Subject: [PATCH 0378/2913] Revert "[nrf noup] samples: net: wifi: Enable Wi-Fi
 driver in sysbuild builds"

This reverts commit fe339b14b3effd069458f5e4710f17cda8295229.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit d0b13448eafdd517abca68464a085f0b9cfd47a7)
---
 samples/net/wifi/Kconfig.sysbuild | 13 -------------
 samples/net/wifi/sample.yaml      |  2 --
 2 files changed, 15 deletions(-)
 delete mode 100644 samples/net/wifi/Kconfig.sysbuild

diff --git a/samples/net/wifi/Kconfig.sysbuild b/samples/net/wifi/Kconfig.sysbuild
deleted file mode 100644
index 158551060c5..00000000000
--- a/samples/net/wifi/Kconfig.sysbuild
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config WIFI_NRF70
-	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/wifi/sample.yaml b/samples/net/wifi/sample.yaml
index 51c52edbd6f..1c106e4897a 100644
--- a/samples/net/wifi/sample.yaml
+++ b/samples/net/wifi/sample.yaml
@@ -53,7 +53,6 @@ tests:
       - nrf7002dk/nrf5340/cpuapp/nrf7001
   sample.net.wifi.nrf7002ek:
     extra_args:
-      - SB_CONFIG_WIFI_NRF70=y
       - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
       - SHIELD=nrf7002ek
     platform_allow:
@@ -65,7 +64,6 @@ tests:
       - nucleo_h723zg
   sample.net.wifi.nrf7002eb:
     extra_args:
-      - SB_CONFIG_WIFI_NRF70=y
       - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
       - SHIELD=nrf7002eb
     platform_allow:

From 6c01e7ecd5d6d849abcacc404cded25c653ce30b Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 7 Oct 2024 22:29:35 +0530
Subject: [PATCH 0379/2913] [nrf fromtree] samples: net: wifi: Enable nRF70
 Util in nRF70 build

This ensures we catch basic issues in nRF70 util, which is handy in
debugging.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit c08b846b4767bc3b02a3a288f17974bccd1adafe)
(cherry picked from commit 1d6965af80b24c938cc6abe70c40483ef849d56c)
---
 samples/net/wifi/sample.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/net/wifi/sample.yaml b/samples/net/wifi/sample.yaml
index 1c106e4897a..e7ca553ecaf 100644
--- a/samples/net/wifi/sample.yaml
+++ b/samples/net/wifi/sample.yaml
@@ -64,6 +64,7 @@ tests:
       - nucleo_h723zg
   sample.net.wifi.nrf7002eb:
     extra_args:
+      - NRF70_UTIL=y
       - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
       - SHIELD=nrf7002eb
     platform_allow:

From 1b80c5c1250661f618d8946e477e118997419494 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 16 Oct 2024 01:39:19 +0530
Subject: [PATCH 0380/2913] [nrf fromtree] drivers: nrfwifi: Fix build error

This crept-in due to bad merge conflict resolution.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 9eedb6d7c8e67b5c48ce016ce57f294e4d3207f1)
(cherry picked from commit be6309215a27d5b3fd1286d999f505dc5fe76a1c)
---
 drivers/wifi/nrfwifi/inc/fmac_main.h | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/wifi/nrfwifi/inc/fmac_main.h b/drivers/wifi/nrfwifi/inc/fmac_main.h
index 9eb98baa518..57d4b8b9df5 100644
--- a/drivers/wifi/nrfwifi/inc/fmac_main.h
+++ b/drivers/wifi/nrfwifi/inc/fmac_main.h
@@ -133,7 +133,13 @@ void set_tx_pwr_ceil_default(struct nrf_wifi_tx_pwr_ceil_params *pwr_ceil_params
 const char *nrf_wifi_get_drv_version(void);
 enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep);
 enum nrf_wifi_status nrf_wifi_fmac_dev_rem_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep);
-#endif /* !CONFIG_NRF_WIFI_BUILD_ONLY_MODE */
+struct nrf_wifi_vif_ctx_zep *nrf_wifi_get_vif_ctx(struct net_if *iface);
+#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
+void nrf_wifi_rpu_recovery_cb(void *vif_ctx,
+		void *event_data,
+		unsigned int event_len);
+#endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
+#endif /* !CONFIG_NRF70_OFFLOADED_RAW_TX */
 #ifdef CONFIG_NRF_WIFI_BUILD_ONLY_MODE
 inline enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx)
 {
@@ -144,11 +150,4 @@ inline enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx)
 #else
 enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx);
 #endif /* CONFIG_NRF_WIFI_BUILD_ONLY_MODE */
-#ifndef CONFIG_NRF70_OFFLOADED_RAW_TX
-struct nrf_wifi_vif_ctx_zep *nrf_wifi_get_vif_ctx(struct net_if *iface);
-#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
-void nrf_wifi_rpu_recovery_cb(void *vif_ctx,
-		void *event_data,
-		unsigned int event_len);
-#endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 #endif /* __ZEPHYR_FMAC_MAIN_H__ */

From 89442c5f06bc500e7e3a4db707396fb508af0140 Mon Sep 17 00:00:00 2001
From: Fengming Ye <frank.ye@nxp.com>
Date: Wed, 16 Oct 2024 17:27:14 +0900
Subject: [PATCH 0381/2913] [nrf fromtree] modules: hostap: fix DPP build error

Fix DPP build error when HOSTAPD enabled and DPP disabled.
Guard hapd_dpp_dispatch in both CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
and CONFIG_WIFI_NM_HOSTAPD_AP.

Signed-off-by: Fengming Ye <frank.ye@nxp.com>
(cherry picked from commit 9e8b7bd3adac4b232d0ae05aa443f7fee06a8e6c)
(cherry picked from commit 163b8dae1b7e776ef1c60dce4cd9729abad8a06e)
---
 modules/hostap/src/supp_api.c | 2 +-
 modules/hostap/src/supp_api.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index e39e358393a..aac8c097fb8 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -2057,7 +2057,6 @@ int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *pa
 	os_free(cmd);
 	return 0;
 }
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 int hapd_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params)
@@ -2091,3 +2090,4 @@ int hapd_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params)
 	return 0;
 }
 #endif /* CONFIG_WIFI_NM_HOSTAPD_AP */
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
diff --git a/modules/hostap/src/supp_api.h b/modules/hostap/src/supp_api.h
index 9dc37cbd88a..d5edce626de 100644
--- a/modules/hostap/src/supp_api.h
+++ b/modules/hostap/src/supp_api.h
@@ -278,7 +278,6 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
  * @return 0 for OK; -1 for ERROR
  */
 int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params);
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 /**
@@ -290,4 +289,5 @@ int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *pa
  */
 int hapd_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params);
 #endif /* CONFIG_WIFI_NM_HOSTAPD_AP */
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 #endif /* ZEPHYR_SUPP_MGMT_H */

From 785cbfe94e63b11433cc514700891dbd86e86e3d Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Thu, 19 Sep 2024 17:16:23 +0530
Subject: [PATCH 0382/2913] [nrf fromtree] doc: wifi: Update enumeration for
 EAP-TLS

EAP-TLS enumeration is now changed due to recent SAE additions.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 6cac9540ec44b44f551dbdca758f613bdd9571b7)
(cherry picked from commit e566c615705a82b752fc16b945daaa94e123525e)
---
 doc/connectivity/networking/api/wifi.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/connectivity/networking/api/wifi.rst b/doc/connectivity/networking/api/wifi.rst
index 7803a456055..f1bc744a831 100644
--- a/doc/connectivity/networking/api/wifi.rst
+++ b/doc/connectivity/networking/api/wifi.rst
@@ -44,7 +44,7 @@ To initiate Wi-Fi connection, the following command can be used:
 
 .. code-block:: console
 
-    uart:~$ wifi connect -s <SSID> -k 5 -a anon -K whatever
+    uart:~$ wifi connect -s <SSID> -k 7 -a anon -K whatever
 
 Server certificate is also provided in the same directory for testing purposes.
 Any AAA server can be used for testing purposes, for example, ``FreeRADIUS`` or ``hostapd``.

From 76df149e549dc1e8858a1302d371eef1cc1b99c0 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Sun, 6 Oct 2024 15:05:34 +0530
Subject: [PATCH 0383/2913] [nrf fromtree] doc: wifi: Update build command for
 Enterprise mode

Now, Enterprise mode has a separate overlay.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit b6430705572b53b712168255e934418c8b6f7b19)
(cherry picked from commit 5f00ff732595320a98f0376d199ef24696a0a15b)
---
 doc/connectivity/networking/api/wifi.rst | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/connectivity/networking/api/wifi.rst b/doc/connectivity/networking/api/wifi.rst
index f1bc744a831..84c407cd4a8 100644
--- a/doc/connectivity/networking/api/wifi.rst
+++ b/doc/connectivity/networking/api/wifi.rst
@@ -38,7 +38,15 @@ module.
     $ cp client.pem samples/net/wifi/test_certs/
     $ cp client-key.pem samples/net/wifi/test_certs/
     $ cp ca.pem samples/net/wifi/test_certs/
-    $ west build -p -b <board> samples/net/wifi
+    $ west build -p -b <board> samples/net/wifi -- -DEXTRA_CONF_FILE=overlay-enterprise.conf
+
+For using variable size network buffer, the following overlay file can be used:
+
+.. code-block:: bash
+
+    $ west build -p -b <board> samples/net/wifi -- -DEXTRA_CONF_FILE=overlay-enterprise-variable-bufs.conf
+
+
 
 To initiate Wi-Fi connection, the following command can be used:
 

From 009a7213fa98ee2eda4604ee1d1b5eaba3cda5db Mon Sep 17 00:00:00 2001
From: Rex Chen <rex.chen_1@nxp.com>
Date: Sun, 29 Sep 2024 18:38:42 +0900
Subject: [PATCH 0384/2913] [nrf fromtree] samples: net: wifi: enable time
 checking for mbedtls cert files

enable time checking for mbedtls certificate files, return failed
if certificate files expired.

Signed-off-by: Rex Chen <rex.chen_1@nxp.com>
(cherry picked from commit 6551e4083ff527437d79b78d4fa437b64f615cee)
(cherry picked from commit aa0853406737e462d7a681224d8e66c3a6dba579)
---
 samples/net/wifi/boards/rd_rw612_bga.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/net/wifi/boards/rd_rw612_bga.conf b/samples/net/wifi/boards/rd_rw612_bga.conf
index 1df1baa0be7..d20b5af0b3e 100644
--- a/samples/net/wifi/boards/rd_rw612_bga.conf
+++ b/samples/net/wifi/boards/rd_rw612_bga.conf
@@ -91,6 +91,7 @@ CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_BUILTIN=y
 CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y
 CONFIG_MBEDTLS_USER_CONFIG_FILE="wpa_supp_els_pkc_mbedtls_config.h"
+CONFIG_MBEDTLS_HAVE_TIME_DATE=y
 
 # Include els_pkc in build
 CONFIG_ENTROPY_GENERATOR=y

From 10590084e4d381eeaebc66ae78fa2c2cd8706d88 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Thu, 19 Sep 2024 17:15:29 +0530
Subject: [PATCH 0385/2913] [nrf fromtree] samples: wifi: Add overlays for
 Enterprise mode

This overlay has all necessary configuration needed for Enterprise mode.
Two variants are given, once with fixed size network buffers and other
with variable size network buffers (still experimental).

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit d107b04c9d708035779de23eb397da1bd69a85dc)
(cherry picked from commit a5139521f777b25e3f1cfe1076ce893c36ec93c3)
---
 samples/net/wifi/overlay-enterprise-variable-bufs.conf |  9 +++++++++
 samples/net/wifi/overlay-enterprise.conf               | 10 ++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 samples/net/wifi/overlay-enterprise-variable-bufs.conf
 create mode 100644 samples/net/wifi/overlay-enterprise.conf

diff --git a/samples/net/wifi/overlay-enterprise-variable-bufs.conf b/samples/net/wifi/overlay-enterprise-variable-bufs.conf
new file mode 100644
index 00000000000..627d77a9247
--- /dev/null
+++ b/samples/net/wifi/overlay-enterprise-variable-bufs.conf
@@ -0,0 +1,9 @@
+CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE=y
+# EAP frames are ~1100 bytes, so, for efficiency, we set the data size to 1100
+CONFIG_NET_BUF_DATA_SIZE=1100
+# Use variable data size to reduce memory usage for small data packets
+CONFIG_NET_BUF_VARIABLE_DATA_SIZE=y
+# For TLS and X.509 processing MbedTLS needs large heap size and using separate heap
+# for MbedTLS gives us more control over the heap size.
+CONFIG_MBEDTLS_ENABLE_HEAP=y
+CONFIG_MBEDTLS_HEAP_SIZE=55000
diff --git a/samples/net/wifi/overlay-enterprise.conf b/samples/net/wifi/overlay-enterprise.conf
new file mode 100644
index 00000000000..34416282811
--- /dev/null
+++ b/samples/net/wifi/overlay-enterprise.conf
@@ -0,0 +1,10 @@
+CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE=y
+# EAP frames are ~1100 bytes, so, need higher packet counts as default packet size is 128
+CONFIG_NET_PKT_TX_COUNT=36
+CONFIG_NET_PKT_RX_COUNT=36
+CONFIG_NET_BUF_TX_COUNT=72
+CONFIG_NET_BUF_RX_COUNT=36
+# For TLS and X.509 processing MbedTLS needs large heap size and using separate heap
+# for MbedTLS gives us more control over the heap size.
+CONFIG_MBEDTLS_ENABLE_HEAP=y
+CONFIG_MBEDTLS_HEAP_SIZE=55000

From e07af9554f73276a3c795dd0de452a720f787bcb Mon Sep 17 00:00:00 2001
From: Daniel DeGrasse <daniel.degrasse@nxp.com>
Date: Thu, 19 Sep 2024 11:05:47 -0500
Subject: [PATCH 0386/2913] [nrf fromtree] net: l2: wifi: ensure certificates
 directory is created

Ensure that the output certificates directory is created, where
generated certificates will be placed. This fixes a build error seen
when using `make` to build samples/net/wifi for the rd_rw612_bga board,
where the output directory for generated certificates did not exist at
build time.

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
(cherry picked from commit bc8cb0be4ca5db93c567fbdef79fe10a42f8bdb2)
(cherry picked from commit 0bae840c3ce3222bdb294ca1d4c9653074779fad)
---
 subsys/net/l2/wifi/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/subsys/net/l2/wifi/CMakeLists.txt b/subsys/net/l2/wifi/CMakeLists.txt
index bab445e8262..9f190dda307 100644
--- a/subsys/net/l2/wifi/CMakeLists.txt
+++ b/subsys/net/l2/wifi/CMakeLists.txt
@@ -26,6 +26,8 @@ endif()
 # Wi-Fi Enterprise test certificates handling
 set(gen_inc_dir ${ZEPHYR_BINARY_DIR}/misc/generated)
 set(gen_dir ${gen_inc_dir}/wifi_enterprise_test_certs)
+# Create output directory for test certs
+file(MAKE_DIRECTORY ${gen_dir})
 
 # convert .pem files to array data at build time
 zephyr_include_directories(${gen_inc_dir})

From eaa545a167aca270720d2165f40c6c1d16727dc2 Mon Sep 17 00:00:00 2001
From: Pisit Sawangvonganan <pisit@ndrsolution.com>
Date: Sat, 21 Sep 2024 15:42:59 +0700
Subject: [PATCH 0387/2913] [nrf fromtree] net: wifi: shell: enhance
 consistency in `cmd_wifi_dpp_ap_auth_init`

The `cmd_wifi_dpp_ap_auth_init` function was added but is not yet
aligned with others.
This update enhances consistency with the following changes:
- Unified the order of declaration for `opt`, `opt_index`,
  `state`, and `long_options`.
- Wrapped lines in the `long_options` declaration to prevent them
  from extending too far to the right.
- Applied `struct option` as `static const`
- Unified the wrapping of `getopt_long` calls, regardless of
  the length of the `options` string.
- Using `getopt_state` to access `optarg` and also `optopt` offers
  a better alternative to direct global access.

Signed-off-by: Pisit Sawangvonganan <pisit@ndrsolution.com>
(cherry picked from commit 7d1953918a615f53ef06a020d7ebc645576fb3ba)
(cherry picked from commit 4867660f00df7bfba7d01cfc252544117565a775)
---
 subsys/net/l2/wifi/wifi_shell.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index 0817f256b6c..70a4e9a8e59 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -2617,24 +2617,27 @@ static int cmd_wifi_dpp_ap_qr_code(const struct shell *sh, size_t argc, char *ar
 
 static int cmd_wifi_dpp_ap_auth_init(const struct shell *sh, size_t argc, char *argv[])
 {
-	int ret = 0;
-	struct net_if *iface = net_if_get_wifi_sap();
-	struct wifi_dpp_params params = {0};
 	int opt;
 	int opt_index = 0;
 	struct getopt_state *state;
-	static struct option long_options[] = {{"peer", required_argument, 0, 'p'}, {0, 0, 0, 0}};
+	static const struct option long_options[] = {
+		{"peer", required_argument, 0, 'p'},
+		{0, 0, 0, 0}};
+	int ret = 0;
+	struct net_if *iface = net_if_get_wifi_sap();
+	struct wifi_dpp_params params = {0};
 
 	params.action = WIFI_DPP_AUTH_INIT;
 
-	while ((opt = getopt_long(argc, argv, "p:", long_options, &opt_index)) != -1) {
+	while ((opt = getopt_long(argc, argv, "p:",
+				  long_options, &opt_index)) != -1) {
 		state = getopt_state_get();
 		switch (opt) {
 		case 'p':
-			params.auth_init.peer = shell_strtol(optarg, 10, &ret);
+			params.auth_init.peer = shell_strtol(state->optarg, 10, &ret);
 			break;
 		default:
-			PR_ERROR("Invalid option %c\n", optopt);
+			PR_ERROR("Invalid option %c\n", state->optopt);
 			return -EINVAL;
 		}
 

From 34ac0f01d11fd78304df355cc139479bb32e511e Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 22 Oct 2024 00:51:15 +0530
Subject: [PATCH 0388/2913] Revert "[nrf fromlist] net: wifi: Fix DPP disabled
 build"

This reverts commit 330eb8146a5b694fb90d738cc04e6ef76d80f636.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit a5b2b24148a71d23c667ac5303e94faf119c8ad8)
---
 include/zephyr/net/wifi_mgmt.h  | 8 --------
 modules/hostap/src/supp_api.c   | 1 -
 modules/hostap/src/supp_api.h   | 1 -
 modules/hostap/src/supp_main.c  | 2 --
 subsys/net/l2/wifi/wifi_mgmt.c  | 3 ---
 subsys/net/l2/wifi/wifi_shell.c | 6 ------
 6 files changed, 21 deletions(-)

diff --git a/include/zephyr/net/wifi_mgmt.h b/include/zephyr/net/wifi_mgmt.h
index 653197bf938..dcf6e7001d0 100644
--- a/include/zephyr/net/wifi_mgmt.h
+++ b/include/zephyr/net/wifi_mgmt.h
@@ -219,13 +219,11 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_RTS_THRESHOLD);
 
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_AP_CONFIG_PARAM);
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 /** Request a Wi-Fi DPP operation */
 #define NET_REQUEST_WIFI_DPP			\
 	(_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_DPP)
 
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_DPP);
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_WNM
 /** Request a Wi-Fi BTM query */
@@ -852,7 +850,6 @@ struct wifi_ap_config_params {
 	uint32_t max_num_sta;
 };
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 /** @brief Wi-Fi DPP configuration parameter */
 /** Wi-Fi DPP QR-CODE in string max len for SHA512 */
 #define WIFI_DPP_QRCODE_MAX_LEN 255
@@ -1029,8 +1026,6 @@ struct wifi_dpp_params {
 	};
 };
 
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
-
 #include <zephyr/net/net_if.h>
 
 /** Scan result callback
@@ -1237,8 +1232,6 @@ struct wifi_mgmt_ops {
 	 * @return 0 if ok, < 0 if error
 	 */
 	int (*ap_config_params)(const struct device *dev, struct wifi_ap_config_params *params);
-
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	/** Dispatch DPP operations by action enum, with or without arguments in string format
 	 *
 	 * @param dev Pointer to the device structure for the driver instance
@@ -1247,7 +1240,6 @@ struct wifi_mgmt_ops {
 	 * @return 0 if ok, < 0 if error
 	 */
 	int (*dpp_dispatch)(const struct device *dev, struct wifi_dpp_params *params);
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 	/** Flush PMKSA cache entries
 	 *
 	 * @param dev Pointer to the device structure for the driver instance.
diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index aac8c097fb8..af3df3c6278 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1767,7 +1767,6 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
 }
 #endif /* CONFIG_AP */
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 static const char *dpp_params_to_args_curve(int curve)
 {
 	switch (curve) {
diff --git a/modules/hostap/src/supp_api.h b/modules/hostap/src/supp_api.h
index d5edce626de..12298ad6544 100644
--- a/modules/hostap/src/supp_api.h
+++ b/modules/hostap/src/supp_api.h
@@ -269,7 +269,6 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
 
 #endif /* CONFIG_AP */
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 /**
  * @brief Dispatch DPP operations for STA
  *
diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index b111f43a4e8..ce91c1a6e8e 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -80,9 +80,7 @@ static const struct wifi_mgmt_ops mgmt_ops = {
 	.ap_disable = supplicant_ap_disable,
 	.ap_sta_disconnect = supplicant_ap_sta_disconnect,
 #endif /* CONFIG_AP */
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	.dpp_dispatch = supplicant_dpp_dispatch,
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 	.pmksa_flush = supplicant_pmksa_flush,
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	.enterprise_creds = supplicant_add_enterprise_creds,
diff --git a/subsys/net/l2/wifi/wifi_mgmt.c b/subsys/net/l2/wifi/wifi_mgmt.c
index 3cea624b6e3..6e0de6f42b8 100644
--- a/subsys/net/l2/wifi/wifi_mgmt.c
+++ b/subsys/net/l2/wifi/wifi_mgmt.c
@@ -852,7 +852,6 @@ static int wifi_set_rts_threshold(uint32_t mgmt_request, struct net_if *iface,
 
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_RTS_THRESHOLD, wifi_set_rts_threshold);
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 static int wifi_dpp(uint32_t mgmt_request, struct net_if *iface,
 		    void *data, size_t len)
 {
@@ -869,8 +868,6 @@ static int wifi_dpp(uint32_t mgmt_request, struct net_if *iface,
 
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_DPP, wifi_dpp);
 
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
-
 static int wifi_pmksa_flush(uint32_t mgmt_request, struct net_if *iface,
 					   void *data, size_t len)
 {
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index 70a4e9a8e59..4adbf48c8c8 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -2143,7 +2143,6 @@ static int cmd_wifi_version(const struct shell *sh, size_t argc, char *argv[])
 	return 0;
 }
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 static int parse_dpp_args_auth_init(const struct shell *sh, size_t argc, char *argv[],
 				    struct wifi_dpp_params *params)
 {
@@ -2681,7 +2680,6 @@ static int cmd_wifi_dpp_reconfig(const struct shell *sh, size_t argc, char *argv
 	return 0;
 }
 
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 static int cmd_wifi_pmksa_flush(const struct shell *sh, size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_wifi_sta();
@@ -2759,7 +2757,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_twt_ops,
 	SHELL_SUBCMD_SET_END
 );
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	wifi_cmd_dpp,
 	SHELL_CMD_ARG(configurator_add, NULL,
@@ -2836,7 +2833,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      cmd_wifi_dpp_reconfig, 2, 0),
 	SHELL_SUBCMD_SET_END
 );
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
 	SHELL_CMD_ARG(version, NULL, "Print Wi-Fi Driver and Firmware versions\n",
@@ -2973,9 +2969,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
 		      "<rts_threshold: rts threshold/off>.\n",
 		      cmd_wifi_set_rts_threshold,
 		      1, 1),
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	SHELL_CMD(dpp, &wifi_cmd_dpp, "DPP actions\n", NULL),
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 	SHELL_CMD_ARG(pmksa_flush, NULL,
 		     "Flush PMKSA cache entries.\n",
 		     cmd_wifi_pmksa_flush, 1, 0),

From 4ef325b48f68aea95f34f8be1351f05584fedb85 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 30 Sep 2024 21:52:16 +0200
Subject: [PATCH 0389/2913] [nrf fromtree] net: wifi: Fix DPP disabled build

In case WPA supplicant disabled DPP, we need to compile out the
corresponding DPP code in Wi-Fi shell too.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 1da74ef705bcf1723a3271266622948251253c0a)
(cherry picked from commit 359ef372541f85100f9654c56e9887a81d198745)
---
 include/zephyr/net/wifi_mgmt.h  | 7 +++++++
 modules/hostap/src/supp_api.c   | 2 ++
 modules/hostap/src/supp_api.h   | 2 ++
 modules/hostap/src/supp_main.c  | 2 ++
 subsys/net/l2/wifi/wifi_mgmt.c  | 3 +++
 subsys/net/l2/wifi/wifi_shell.c | 6 ++++++
 6 files changed, 22 insertions(+)

diff --git a/include/zephyr/net/wifi_mgmt.h b/include/zephyr/net/wifi_mgmt.h
index dcf6e7001d0..528e72dffe9 100644
--- a/include/zephyr/net/wifi_mgmt.h
+++ b/include/zephyr/net/wifi_mgmt.h
@@ -219,11 +219,13 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_RTS_THRESHOLD);
 
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_AP_CONFIG_PARAM);
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 /** Request a Wi-Fi DPP operation */
 #define NET_REQUEST_WIFI_DPP			\
 	(_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_DPP)
 
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_DPP);
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_WNM
 /** Request a Wi-Fi BTM query */
@@ -850,6 +852,7 @@ struct wifi_ap_config_params {
 	uint32_t max_num_sta;
 };
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 /** @brief Wi-Fi DPP configuration parameter */
 /** Wi-Fi DPP QR-CODE in string max len for SHA512 */
 #define WIFI_DPP_QRCODE_MAX_LEN 255
@@ -1025,6 +1028,7 @@ struct wifi_dpp_params {
 		char resp[WIFI_DPP_QRCODE_MAX_LEN + 1];
 	};
 };
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #include <zephyr/net/net_if.h>
 
@@ -1232,6 +1236,8 @@ struct wifi_mgmt_ops {
 	 * @return 0 if ok, < 0 if error
 	 */
 	int (*ap_config_params)(const struct device *dev, struct wifi_ap_config_params *params);
+
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	/** Dispatch DPP operations by action enum, with or without arguments in string format
 	 *
 	 * @param dev Pointer to the device structure for the driver instance
@@ -1240,6 +1246,7 @@ struct wifi_mgmt_ops {
 	 * @return 0 if ok, < 0 if error
 	 */
 	int (*dpp_dispatch)(const struct device *dev, struct wifi_dpp_params *params);
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 	/** Flush PMKSA cache entries
 	 *
 	 * @param dev Pointer to the device structure for the driver instance.
diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index af3df3c6278..f1a3017b70d 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1767,6 +1767,7 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
 }
 #endif /* CONFIG_AP */
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 static const char *dpp_params_to_args_curve(int curve)
 {
 	switch (curve) {
@@ -2056,6 +2057,7 @@ int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *pa
 	os_free(cmd);
 	return 0;
 }
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 int hapd_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params)
diff --git a/modules/hostap/src/supp_api.h b/modules/hostap/src/supp_api.h
index 12298ad6544..1abcd2166c9 100644
--- a/modules/hostap/src/supp_api.h
+++ b/modules/hostap/src/supp_api.h
@@ -269,6 +269,7 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
 
 #endif /* CONFIG_AP */
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 /**
  * @brief Dispatch DPP operations for STA
  *
@@ -277,6 +278,7 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
  * @return 0 for OK; -1 for ERROR
  */
 int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params);
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 /**
diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index ce91c1a6e8e..b111f43a4e8 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -80,7 +80,9 @@ static const struct wifi_mgmt_ops mgmt_ops = {
 	.ap_disable = supplicant_ap_disable,
 	.ap_sta_disconnect = supplicant_ap_sta_disconnect,
 #endif /* CONFIG_AP */
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	.dpp_dispatch = supplicant_dpp_dispatch,
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 	.pmksa_flush = supplicant_pmksa_flush,
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	.enterprise_creds = supplicant_add_enterprise_creds,
diff --git a/subsys/net/l2/wifi/wifi_mgmt.c b/subsys/net/l2/wifi/wifi_mgmt.c
index 6e0de6f42b8..3cea624b6e3 100644
--- a/subsys/net/l2/wifi/wifi_mgmt.c
+++ b/subsys/net/l2/wifi/wifi_mgmt.c
@@ -852,6 +852,7 @@ static int wifi_set_rts_threshold(uint32_t mgmt_request, struct net_if *iface,
 
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_RTS_THRESHOLD, wifi_set_rts_threshold);
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 static int wifi_dpp(uint32_t mgmt_request, struct net_if *iface,
 		    void *data, size_t len)
 {
@@ -868,6 +869,8 @@ static int wifi_dpp(uint32_t mgmt_request, struct net_if *iface,
 
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_DPP, wifi_dpp);
 
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
+
 static int wifi_pmksa_flush(uint32_t mgmt_request, struct net_if *iface,
 					   void *data, size_t len)
 {
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index 4adbf48c8c8..70a4e9a8e59 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -2143,6 +2143,7 @@ static int cmd_wifi_version(const struct shell *sh, size_t argc, char *argv[])
 	return 0;
 }
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 static int parse_dpp_args_auth_init(const struct shell *sh, size_t argc, char *argv[],
 				    struct wifi_dpp_params *params)
 {
@@ -2680,6 +2681,7 @@ static int cmd_wifi_dpp_reconfig(const struct shell *sh, size_t argc, char *argv
 	return 0;
 }
 
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 static int cmd_wifi_pmksa_flush(const struct shell *sh, size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_wifi_sta();
@@ -2757,6 +2759,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_twt_ops,
 	SHELL_SUBCMD_SET_END
 );
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	wifi_cmd_dpp,
 	SHELL_CMD_ARG(configurator_add, NULL,
@@ -2833,6 +2836,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      cmd_wifi_dpp_reconfig, 2, 0),
 	SHELL_SUBCMD_SET_END
 );
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
 	SHELL_CMD_ARG(version, NULL, "Print Wi-Fi Driver and Firmware versions\n",
@@ -2969,7 +2973,9 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
 		      "<rts_threshold: rts threshold/off>.\n",
 		      cmd_wifi_set_rts_threshold,
 		      1, 1),
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	SHELL_CMD(dpp, &wifi_cmd_dpp, "DPP actions\n", NULL),
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 	SHELL_CMD_ARG(pmksa_flush, NULL,
 		     "Flush PMKSA cache entries.\n",
 		     cmd_wifi_pmksa_flush, 1, 0),

From e924488c851a51889d9dc82ea9848e18b29561e2 Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Wed, 9 Oct 2024 15:28:01 +0300
Subject: [PATCH 0390/2913] [nrf fromtree] wifi: shell: Add missing newlines
 when printing error

The parse_number() did not print newline after error or warning message.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 8105f70d7a0504ce88132a3247fb204b6caa2226)
(cherry picked from commit 461a4ed985655993f04c6355be745ece15d5a55c)
---
 subsys/net/l2/wifi/wifi_shell.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index 70a4e9a8e59..ac5240a918d 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -125,16 +125,16 @@ static bool parse_number(const struct shell *sh, long *param, char *str,
 	}
 
 	if (*endptr != '\0') {
-		PR_ERROR("Invalid number: %s", str_tmp);
+		PR_ERROR("Invalid number: %s\n", str_tmp);
 		return false;
 	}
 
 	if ((num) < (min) || (num) > (max)) {
 		if (pname) {
-			PR_WARNING("%s value out of range: %s, (%ld-%ld)",
+			PR_WARNING("%s value out of range: %s, (%ld-%ld)\n",
 				   pname, str_tmp, min, max);
 		} else {
-			PR_WARNING("Value out of range: %s, (%ld-%ld)",
+			PR_WARNING("Value out of range: %s, (%ld-%ld)\n",
 				   str_tmp, min, max);
 		}
 		return false;

From ab47d7ee753b11a81919373e3bba4e592fcbd1b8 Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Wed, 9 Oct 2024 15:32:58 +0300
Subject: [PATCH 0391/2913] [nrf fromtree] wifi: shell: btm_query: Fix invalid
 pointer cast

The 11v_btm_query shell command was calling parse_number() using
a pointer to uint8_t. This will cause memory overwrite and possible
crash. Convert to use long temporary value to avoid this.

Fix also the output prints in case of an error.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit c6aa9e3803f10ac44152df604089495f37037094)
(cherry picked from commit 8c70792036b76deb37ee7bd15da5d4d0c3da931e)
---
 subsys/net/l2/wifi/wifi_shell.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index ac5240a918d..576de45a437 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -1674,16 +1674,19 @@ static int cmd_wifi_btm_query(const struct shell *sh, size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_first_wifi();
 	uint8_t query_reason = 0;
+	long tmp = 0;
 
 	context.sh = sh;
 
-	if (!parse_number(sh, (long *)&query_reason, argv[1], NULL,
+	if (!parse_number(sh, &tmp, argv[1], NULL,
 			  WIFI_BTM_QUERY_REASON_UNSPECIFIED, WIFI_BTM_QUERY_REASON_LEAVING_ESS)) {
 		return -EINVAL;
 	}
 
+	query_reason = tmp;
+
 	if (net_mgmt(NET_REQUEST_WIFI_BTM_QUERY, iface, &query_reason, sizeof(query_reason))) {
-		PR_WARNING("Setting BTM query Reason failed..Reason :%d\n", query_reason);
+		PR_WARNING("Setting BTM query Reason failed. Reason : %d\n", query_reason);
 		return -ENOEXEC;
 	}
 

From 91cc73b92fdc7c77b84820c1b910959c336478d7 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Fri, 20 Sep 2024 00:17:52 +0530
Subject: [PATCH 0392/2913] [nrf fromtree] net: wifi: Fix PEM certificate
 parsing errors

MbedTLS specifically checks for null-terminator, else it skips PEM
format processing and tries to parse it as DER causing parsing failures.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 4c5a72f9e0ecd03f8e1c4e93aa9cf3f58fb79616)
(cherry picked from commit c3d56f0de4da50731e221669df98ade9138bbc74)
---
 subsys/net/l2/wifi/wifi_shell.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index 576de45a437..c40edab2fd7 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -32,14 +32,17 @@ LOG_MODULE_REGISTER(net_wifi_shell, LOG_LEVEL_INF);
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 static const char ca_cert_test[] = {
 	#include <wifi_enterprise_test_certs/ca.pem.inc>
+	'\0'
 };
 
 static const char client_cert_test[] = {
 	#include <wifi_enterprise_test_certs/client.pem.inc>
+	'\0'
 };
 
 static const char client_key_test[] = {
 	#include <wifi_enterprise_test_certs/client-key.pem.inc>
+	'\0'
 };
 #endif
 

From f543ebe2d7b098e89ac1029bbcb4ac9e1cb3e714 Mon Sep 17 00:00:00 2001
From: Maochen Wang <maochen.wang@nxp.com>
Date: Wed, 16 Oct 2024 12:10:01 +0800
Subject: [PATCH 0393/2913] [nrf fromtree] net: l2: wifi: fix AP sets band
 failed with channel 0

Should support setting band for both STA and SAP mode.

Signed-off-by: Maochen Wang <maochen.wang@nxp.com>
(cherry picked from commit 4af697ad6b1c1587201efd8660e73799bc9e803a)
(cherry picked from commit 0af7001bad89f0ed89c4ebdc28953ef7c66cda6c)
---
 subsys/net/l2/wifi/wifi_shell.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index c40edab2fd7..22e3f0e83e7 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -587,7 +587,8 @@ static int __wifi_args_to_params(const struct shell *sh, size_t argc, char *argv
 			params->channel = channel;
 			break;
 		case 'b':
-			if (iface_mode == WIFI_MODE_INFRA) {
+			if (iface_mode == WIFI_MODE_INFRA ||
+				iface_mode == WIFI_MODE_AP) {
 				switch (atoi(state->optarg)) {
 				case 2:
 					params->band = WIFI_FREQ_BAND_2_4_GHZ;

From f42f401aabd5a1af3e21f4d49c4c8e60384deff9 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Sat, 12 Oct 2024 02:45:02 +0530
Subject: [PATCH 0394/2913] [nrf fromtree] modules: hostap: Fix memory leak of
 network

In "connect" all networks are removed and  new network is always added,
but in disconnect the network isn't deleted, so, the memory is
unnecessarily held till next connect. This is not exactly a leak, but if
someone profiles using "kernel heap" then this can be construed as a
leak.

Fix this by removing network during the disconnection (for now "all") so
that the memory can be used by someone else.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit be65de0d09d19ba2d03e106b81183ec7af996d24)
(cherry picked from commit 4162b773da57781e5a6661356aa597b124dbbbe3)
---
 modules/hostap/src/supp_api.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index f1a3017b70d..ea4afcbcbf4 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -840,6 +840,10 @@ static int wpas_disconnect_network(const struct device *dev, int cur_mode)
 		wifi_mgmt_raise_disconnect_complete_event(iface, ret);
 	}
 
+	if (!wpa_cli_cmd_v("remove_network all")) {
+		wpa_printf(MSG_ERROR, "Failed to remove all networks");
+	}
+
 	return ret;
 }
 

From 78c7983b1ec953671c83294f467b36eb1f08d69f Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Sat, 12 Oct 2024 02:52:02 +0530
Subject: [PATCH 0395/2913] [nrf fromtree] manifest: hostap: Pull fix for WPA3
 connection

Fixes WPA3 connection regression.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 734fc58b62eac8a8091f29b98224d433d514a00c)
(cherry picked from commit ff0bd82792ac46991768801e674cf3d7c72d4f67)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index e87e6405424..cb4a1de93b2 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: 7c32520564908e1220976b6c185dec296b6d4a80
+      revision: ac59d28778b20cd68702f55dad2a27d648e3d571
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From 9e6041426216c22cce627dc0936f351118172eaf Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Mon, 14 Oct 2024 09:57:17 +0200
Subject: [PATCH 0396/2913] [nrf fromtree] manifest: hal_nordic: include
 lpcomp-int-dis-on-stop patch

Update hal_nordic manifest to include lpcomp-int-dis-on-stop patch

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 0f6a35c36393976c24886d72b6026ba327360bad)
(cherry picked from commit bd030766909f9b61892d3d499ceb36003f2e6ac3)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index cb4a1de93b2..58c40f7b327 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: d5c70305b2389641b0a166d0714775a1b13319a2
+      revision: 1abc0519d768c203eb27d19a0fa26dbae07e2b71
       path: modules/hal/nordic
       groups:
         - hal

From f8264954bcfbed742f3ac333b606d9778c5e14b3 Mon Sep 17 00:00:00 2001
From: Vivekananda Uppunda <vivekananda.uppunda@nordicsemi.no>
Date: Mon, 7 Oct 2024 09:28:55 +0530
Subject: [PATCH 0397/2913] [nrf fromtree] manifest: Pull promiscuous mode
 filtering support in driver

This pulls in changes to support promiscuous mode filtering
in driver.

Signed-off-by: Vivekananda Uppunda <vivekananda.uppunda@nordicsemi.no>
(cherry picked from commit 2f23313e37e431d64972133e3c946a2829dad142)
(cherry picked from commit a64b8ff0146d3e4e627311862b3767aa456e8e57)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 58c40f7b327..126048a0a1c 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 1abc0519d768c203eb27d19a0fa26dbae07e2b71
+      revision: af91488c6edc4cebaf8b072c8bb258122a055cdb
       path: modules/hal/nordic
       groups:
         - hal

From 5bf28de990cea3c8814b10e1b6296701b36adbd8 Mon Sep 17 00:00:00 2001
From: Vivekananda Uppunda <vivekananda.uppunda@nordicsemi.no>
Date: Mon, 7 Oct 2024 09:20:40 +0530
Subject: [PATCH 0398/2913] [nrf fromtree] drivers: wifi: nrfwifi: Promiscuous
 mode filtering support in driver

This set of changes brings in promiscuous mode filtering support in
driver. Since, firmware would be unable to filter packets due to
connection issues, the filtering support for promiscuous mode is
moved to the driver.

Signed-off-by: Vivekananda Uppunda <vivekananda.uppunda@nordicsemi.no>
(cherry picked from commit c9b56de0400422be2385c45abbac0d3138bd4b11)
(cherry picked from commit e5c5f0942fb6d16f6e4dcc217ff154118254e090)
---
 drivers/wifi/nrfwifi/src/fmac_main.c |  2 +-
 drivers/wifi/nrfwifi/src/wifi_mgmt.c | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c
index 4778111579e..fce5da67722 100644
--- a/drivers/wifi/nrfwifi/src/fmac_main.c
+++ b/drivers/wifi/nrfwifi/src/fmac_main.c
@@ -715,7 +715,7 @@ static int nrf_wifi_drv_main_zep(const struct device *dev)
 	callbk_fns.if_carr_state_chg_callbk_fn = nrf_wifi_if_carr_state_chg;
 	callbk_fns.rx_frm_callbk_fn = nrf_wifi_if_rx_frm;
 #if defined(CONFIG_NRF70_RAW_DATA_RX) || defined(CONFIG_NRF70_PROMISC_DATA_RX)
-	callbk_fns.rx_sniffer_frm_callbk_fn = nrf_wifi_if_sniffer_rx_frm;
+	callbk_fns.sniffer_callbk_fn = nrf_wifi_if_sniffer_rx_frm;
 #endif /* CONFIG_NRF70_RAW_DATA_RX || CONFIG_NRF70_PROMISC_DATA_RX */
 #endif
 	rx_buf_pools[0].num_bufs = rx1_num_bufs;
diff --git a/drivers/wifi/nrfwifi/src/wifi_mgmt.c b/drivers/wifi/nrfwifi/src/wifi_mgmt.c
index 65f6c217bfe..5effb759fa4 100644
--- a/drivers/wifi/nrfwifi/src/wifi_mgmt.c
+++ b/drivers/wifi/nrfwifi/src/wifi_mgmt.c
@@ -935,6 +935,21 @@ int nrf_wifi_filter(const struct device *dev,
 	def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
 
 	if (filter->oper == WIFI_MGMT_SET) {
+		/**
+		 * If promiscuous mode is enabled, filter settings
+		 * cannot be plumbed to the lower layers as that might
+		 * affect connectivity. Save the filter settings in the
+		 * driver and filter packet type on packet receive by
+		 * checking the 802.11 header in the packet
+		 */
+		if (((def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) &
+		    (NRF_WIFI_PROMISCUOUS_MODE)) == NRF_WIFI_PROMISCUOUS_MODE) {
+			def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->packet_filter =
+				filter->filter;
+			ret = 0;
+			goto out;
+		}
+
 		/**
 		 * In case a user sets data + management + ctrl bits
 		 * or all the filter bits. Map it to bit 0 set to

From ad515c6c7ba901a23e51a8c9b141b4919430728a Mon Sep 17 00:00:00 2001
From: Vivekananda Uppunda <vivekananda.uppunda@nordicsemi.no>
Date: Tue, 8 Oct 2024 10:03:40 +0530
Subject: [PATCH 0399/2913] [nrf fromtree] drivers: wifi: nrfwifi: Add
 promiscuous mode support functions

This adds promiscuous mode support functions into build for filter
operation when the configuration CONFIG_NRF70_PROMISC_DATA_RX
is enabled.

Signed-off-by: Vivekananda Uppunda <vivekananda.uppunda@nordicsemi.no>
(cherry picked from commit da0c30d52ad3af4bf7a866e866fcaf860a73386e)
(cherry picked from commit fa20ccc366513dbd06994d15a3c4f4880dbe2b1a)
---
 drivers/wifi/nrfwifi/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 41611af08a1..0cd45829318 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -128,6 +128,10 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
 )
 
+zephyr_library_sources_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_promisc.c
+)
+
 zephyr_library_sources_ifdef(CONFIG_NRF70_ON_QSPI
   src/qspi/src/qspi_if.c
 )

From 3f687841cae07f7834f02fa53b37e1aaeaa38ef1 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 16 Oct 2024 02:35:30 +0530
Subject: [PATCH 0400/2913] [nrf fromtree] drivers: wifi: Add regulatory debug
 log

This log helps in identifing if the event is solicited or not.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit f333e1f00fe0757464eea17c43c88211e9069e3b)
(cherry picked from commit 1afb1bfcd190d3b2c4827ab625b078816ab636a8)
---
 drivers/wifi/nrfwifi/src/fmac_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c
index fce5da67722..30bd150e811 100644
--- a/drivers/wifi/nrfwifi/src/fmac_main.c
+++ b/drivers/wifi/nrfwifi/src/fmac_main.c
@@ -453,6 +453,8 @@ void reg_change_callbk_fn(void *vif_ctx,
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
 
+	LOG_DBG("%s: Regulatory change event received", __func__);
+
 	vif_ctx_zep = vif_ctx;
 
 	if (!vif_ctx_zep) {

From 1981f89544fe3229fe1e232fc08e310a99ebb418 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 16 Oct 2024 03:09:06 +0530
Subject: [PATCH 0401/2913] [nrf fromtree] manifest: hal_nordic: Pull the flag
 to identify unsolicited reg event

This flag can be used to drop unsolicited regulatory event as it's not
supported.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 0baff426c4acfd1a12005c4198f8b62e4abcc853)
(cherry picked from commit 5c11cb7de70d3a4427732c81f1aa7638652887a5)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 126048a0a1c..31647ae878c 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: af91488c6edc4cebaf8b072c8bb258122a055cdb
+      revision: 5f1210074cb8bb7ec66317af294596a97ac48815
       path: modules/hal/nordic
       groups:
         - hal

From 7247161afaed2986a4d9f07ad2705836f0c09ba5 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 16 Oct 2024 02:43:28 +0530
Subject: [PATCH 0402/2913] [nrf fromtree] drivers: wifi: Fix memory leak in
 regulatory processing

During Wi-Fi connection UMAC sends an unsolicited regulatory change
event but the driver code always assumes that this event is solicited
hence doesn't free the memory for the event.

Fix this by dropping the unsolicited event as it's not supported yet.

Fixes #79733.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit ea7d3bea9360a850a2586ade12f170fbfdeaf71a)
(cherry picked from commit 591291f2e905b7e80587a317350063db506ef67f)
---
 drivers/wifi/nrfwifi/src/fmac_main.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c
index 30bd150e811..82ea0f99267 100644
--- a/drivers/wifi/nrfwifi/src/fmac_main.c
+++ b/drivers/wifi/nrfwifi/src/fmac_main.c
@@ -474,6 +474,12 @@ void reg_change_callbk_fn(void *vif_ctx,
 		return;
 	}
 
+	if (!fmac_dev_ctx->waiting_for_reg_event) {
+		LOG_DBG("%s: Unsolicited regulatory change event", __func__);
+		/* TODO: Handle unsolicited regulatory change event */
+		return;
+	}
+
 	fmac_dev_ctx->reg_change = k_malloc(sizeof(struct nrf_wifi_event_regulatory_change));
 	if (!fmac_dev_ctx->reg_change) {
 		LOG_ERR("%s: Failed to allocate memory for reg_change", __func__);

From 7c149c7648f4f7e61f56e3966079d6245c76a900 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 16 Oct 2024 02:49:19 +0530
Subject: [PATCH 0403/2913] [nrf fromtree] drivers: wifi: Clean up exit path

Fix couple of bugs in exit path:

- In case of calloc failure, return's without unlocking
- memory is freed outside lock, in case of a tiny window of race, this
  can cause a crash when this function is called from two threads.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit a21648d7e6df946f3cc1676228f519b5fc054944)
(cherry picked from commit e8f571603f91001cc6cc358afd31e3d2bea5863c)
---
 drivers/wifi/nrfwifi/src/net_if.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
index 81369186533..b8ca8915ff4 100644
--- a/drivers/wifi/nrfwifi/src/net_if.c
+++ b/drivers/wifi/nrfwifi/src/net_if.c
@@ -440,7 +440,7 @@ static void ip_maddr_event_handler(struct net_if *iface,
 	ret = k_mutex_lock(&vif_ctx_zep->vif_lock, K_FOREVER);
 	if (ret != 0) {
 		LOG_ERR("%s: Failed to lock vif_lock", __func__);
-		goto out;
+		return;
 	}
 
 	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
@@ -455,7 +455,7 @@ static void ip_maddr_event_handler(struct net_if *iface,
 	if (!mcast_info) {
 		LOG_ERR("%s: Unable to allocate memory of size %d "
 			"for mcast_info", __func__, sizeof(*mcast_info));
-		return;
+		goto unlock;
 	}
 
 	switch (addr->family) {
@@ -492,9 +492,8 @@ static void ip_maddr_event_handler(struct net_if *iface,
 					       sizeof(mac_string_buf)));
 	}
 unlock:
-	k_mutex_unlock(&vif_ctx_zep->vif_lock);
-out:
 	k_free(mcast_info);
+	k_mutex_unlock(&vif_ctx_zep->vif_lock);
 }
 #endif /* CONFIG_NRF70_STA_MODE */
 

From 9aa90fa0c3d3b22ab93bacd5a2032faff0e535b0 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 16 Oct 2024 20:35:01 +0530
Subject: [PATCH 0404/2913] [nrf fromtree] drivers: nrfwifi: Remove
 non-existing member

Opriv was removed but the doxygen doc string was left.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 9a9f8998f9fec877c3af58a8743c4dd12dd8bc59)
(cherry picked from commit e039e8ec535cc1bc8a181a763fd858cf3720865c)
---
 drivers/wifi/nrfwifi/src/shim.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/src/shim.h b/drivers/wifi/nrfwifi/src/shim.h
index a4162bf8931..be26fd6355e 100644
--- a/drivers/wifi/nrfwifi/src/shim.h
+++ b/drivers/wifi/nrfwifi/src/shim.h
@@ -19,7 +19,6 @@
 /**
  * struct zep_shim_bus_qspi_priv - Structure to hold context information for the Linux OS
  *                        shim.
- * @opriv: Pointer to OSAL context.
  * @pcie_callbk_data: Callback data to be passed to the PCIe callback functions.
  * @pcie_prb_callbk: The callback function to be called when a PCIe device
  *                   has been probed.

From 8dbbf5cf79db62bf157645cc18fed6f7641774cb Mon Sep 17 00:00:00 2001
From: Triveni Danda <triveni.danda@nordicsemi.no>
Date: Thu, 3 Oct 2024 10:40:46 +0530
Subject: [PATCH 0405/2913] [nrf fromlist] net: ip: Add a name to existing
 Kconfig choice

Update kconfig choice name to enable overriding
from other parts of the code.

Upstream PR #: 78852

Signed-off-by: Triveni Danda <triveni.danda@nordicsemi.no>
(cherry picked from commit cbcb2dba63e70283439f6cc86540f7e7450b73c1)
---
 subsys/net/ip/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/net/ip/Kconfig b/subsys/net/ip/Kconfig
index cb08b3846ca..f8c215b4fc3 100644
--- a/subsys/net/ip/Kconfig
+++ b/subsys/net/ip/Kconfig
@@ -663,7 +663,7 @@ config NET_BUF_TX_COUNT
 	  Each data buffer will occupy CONFIG_NET_BUF_DATA_SIZE + smallish
 	  header (sizeof(struct net_buf)) amount of data.
 
-choice
+choice NET_PKT_DATA_ALLOC_TYPE
 	prompt "Network packet data allocator type"
 	default NET_BUF_FIXED_DATA_SIZE
 	help

From b96fbf3fe87af55e9da3ba622fab123a2d7cd1c3 Mon Sep 17 00:00:00 2001
From: Triveni Danda <triveni.danda@nordicsemi.no>
Date: Thu, 19 Sep 2024 13:10:39 +0530
Subject: [PATCH 0406/2913] [nrf fromlist] drivers: wifi: nrfwifi: Enable
 variable network configurations

Add variable network configuration control into the driver to optimize
RAM usage by default. The pool sizes are default, and tuning is left to
the applications or samples.

Upstream PR #: 78852

Signed-off-by: Triveni Danda <triveni.danda@nordicsemi.no>
(cherry picked from commit b58ca22706146b743c73d329f2e263f365dc4015)
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index b409261b614..a5a12a03e26 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -570,6 +570,12 @@ config NET_TC_TX_COUNT
 
 endif # NETWORKING
 
+# nRF70 now uses variable buffers as default to optimize RAM usage. Default pool sizes are used, samples/apps can override
+# for higher performance.
+choice NET_PKT_DATA_ALLOC_TYPE
+	default NET_BUF_VARIABLE_DATA_SIZE
+endchoice
+
 config MAIN_STACK_SIZE
 	default 4096
 

From 3224db5f5a1e81f1d66875432c3f4d95ae5a2522 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Wed, 9 Oct 2024 12:18:59 +0200
Subject: [PATCH 0407/2913] [nrf fromlist] dts: bindings: wifi: split nrf700x
 coex and wifi models

The nrf7000, nrf7001 and nrf7002 expose a coex hardware interface
which is independent from the wifi/control interface (spi and
control pins)

These interfaces where previously combined into a single model. This
is incompatible with the actual usage of the interfaces where one
core may interact only with the coex interface, and another with the
wifi/control interface.

This commit moves the coex interface, commonly described in
"nordic,nrf70-coex.yaml", out of the wifi/control models
"nrf700<variant>-<bus>.yaml" to its own models
"nrf700<variant>-coex.yaml"

Upstream PR #: 79606

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit ec256065bf919ca7f08cbb86ded8c8f81b2a699b)
---
 dts/bindings/wifi/nordic,nrf70-coex.yaml   | 6 ------
 dts/bindings/wifi/nordic,nrf70.yaml        | 9 ++++++---
 dts/bindings/wifi/nordic,nrf7000-coex.yaml | 9 +++++++++
 dts/bindings/wifi/nordic,nrf7001-coex.yaml | 9 +++++++++
 dts/bindings/wifi/nordic,nrf7002-coex.yaml | 9 +++++++++
 5 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 dts/bindings/wifi/nordic,nrf7000-coex.yaml
 create mode 100644 dts/bindings/wifi/nordic,nrf7001-coex.yaml
 create mode 100644 dts/bindings/wifi/nordic,nrf7002-coex.yaml

diff --git a/dts/bindings/wifi/nordic,nrf70-coex.yaml b/dts/bindings/wifi/nordic,nrf70-coex.yaml
index 208657f3fb5..0a9c12f587e 100644
--- a/dts/bindings/wifi/nordic,nrf70-coex.yaml
+++ b/dts/bindings/wifi/nordic,nrf70-coex.yaml
@@ -27,9 +27,3 @@ properties:
     description: |
       GPIO of the SOC controlling the Priority (STATUS1) pin (in 4-wire
       coex case) of the nRF7002
-
-  srrf-switch-gpios:
-    type: phandle-array
-    description: |
-      GPIO of the RF Switch to control SR RF output to either SR Antenna
-      or shared Antenna with Wi-Fi
diff --git a/dts/bindings/wifi/nordic,nrf70.yaml b/dts/bindings/wifi/nordic,nrf70.yaml
index ff9021739ac..abdc7ec2cb0 100644
--- a/dts/bindings/wifi/nordic,nrf70.yaml
+++ b/dts/bindings/wifi/nordic,nrf70.yaml
@@ -1,9 +1,6 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-# GPIO lines for controlling the nRF70 Series Wi-Fi chip.
-include: nordic,nrf70-coex.yaml
-
 properties:
   iovdd-ctrl-gpios:
     type: phandle-array
@@ -19,3 +16,9 @@ properties:
     type: phandle-array
     required: true
     description: GPIO of the SoC controlling the HOST_IRQ pin of the nRF70
+
+  srrf-switch-gpios:
+    type: phandle-array
+    description: |
+      GPIO of the RF Switch to control SR RF output to either SR Antenna
+      or shared Antenna with Wi-Fi
diff --git a/dts/bindings/wifi/nordic,nrf7000-coex.yaml b/dts/bindings/wifi/nordic,nrf7000-coex.yaml
new file mode 100644
index 00000000000..94dcc2181d3
--- /dev/null
+++ b/dts/bindings/wifi/nordic,nrf7000-coex.yaml
@@ -0,0 +1,9 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: This is a representation of the nRF7000 Wi-Fi chip with COEX interface.
+
+compatible: nordic,nrf7000-coex
+
+include:
+  - "nordic,nrf70-coex.yaml"
diff --git a/dts/bindings/wifi/nordic,nrf7001-coex.yaml b/dts/bindings/wifi/nordic,nrf7001-coex.yaml
new file mode 100644
index 00000000000..d58afe7d44c
--- /dev/null
+++ b/dts/bindings/wifi/nordic,nrf7001-coex.yaml
@@ -0,0 +1,9 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: This is a representation of the nRF7001 Wi-Fi chip with COEX interface.
+
+compatible: nordic,nrf7001-coex
+
+include:
+  - "nordic,nrf70-coex.yaml"
diff --git a/dts/bindings/wifi/nordic,nrf7002-coex.yaml b/dts/bindings/wifi/nordic,nrf7002-coex.yaml
new file mode 100644
index 00000000000..1df61d0bf98
--- /dev/null
+++ b/dts/bindings/wifi/nordic,nrf7002-coex.yaml
@@ -0,0 +1,9 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: This is a representation of the nRF7002 Wi-Fi chip with COEX interface.
+
+compatible: nordic,nrf7002-coex
+
+include:
+  - "nordic,nrf70-coex.yaml"

From a219a6a36976936735e2339ed2a56ca9dae3b099 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Wed, 9 Oct 2024 12:36:43 +0200
Subject: [PATCH 0408/2913] [nrf fromlist] boards: nordic: nrf7002dk: align
 with nrf700x split interface

Remove the unused coex interface from the cpuapp of the nrf7002dk
nrf5340 SoC.

Upstream PR #: 79606

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 1492f1d8c29a586a3dca4168cf98fe8601c0acd3)
---
 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp.dts  |  1 -
 .../nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001.dts    |  1 -
 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts  |  7 +++++--
 boards/nordic/nrf7002dk/nrf70_common.dtsi             |  1 +
 boards/nordic/nrf7002dk/nrf70_common_coex.dtsi        | 11 -----------
 5 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 boards/nordic/nrf7002dk/nrf70_common_coex.dtsi

diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp.dts
index fbe74a82224..9b62eafea17 100644
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp.dts
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp.dts
@@ -32,7 +32,6 @@
 		qspi-quad-mode;
 
 		#include "nrf70_common.dtsi"
-		#include "nrf70_common_coex.dtsi"
 		#include "nrf70_common_5g.dtsi"
 	};
 };
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001.dts
index 1d78dddbe68..8d955c67fc7 100644
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001.dts
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001.dts
@@ -32,6 +32,5 @@
 		qspi-quad-mode;
 
 		#include "nrf70_common.dtsi"
-		#include "nrf70_common_coex.dtsi"
 	};
 };
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts
index 823c9fafacb..8e36e678581 100644
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts
@@ -84,9 +84,12 @@
 
 	nrf70: coex {
 		status = "okay";
-		compatible = "nordic,nrf70-coex";
+		compatible = "nordic,nrf7002-coex";
 
-		#include "nrf70_common_coex.dtsi"
+		req-gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
+		status0-gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
+		grant-gpios = <&gpio0 24 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
+		swctrl1-gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
 	};
 
 	/* These aliases are provided for compatibility with samples */
diff --git a/boards/nordic/nrf7002dk/nrf70_common.dtsi b/boards/nordic/nrf7002dk/nrf70_common.dtsi
index f40f8ad9bb7..cd9cd23bb89 100644
--- a/boards/nordic/nrf7002dk/nrf70_common.dtsi
+++ b/boards/nordic/nrf7002dk/nrf70_common.dtsi
@@ -7,6 +7,7 @@
 iovdd-ctrl-gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;
 bucken-gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
 host-irq-gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>;
+srrf-switch-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
 
 wifi-max-tx-pwr-2g-dsss = <21>;
 wifi-max-tx-pwr-2g-mcs0 = <16>;
diff --git a/boards/nordic/nrf7002dk/nrf70_common_coex.dtsi b/boards/nordic/nrf7002dk/nrf70_common_coex.dtsi
deleted file mode 100644
index 03f22c3edba..00000000000
--- a/boards/nordic/nrf7002dk/nrf70_common_coex.dtsi
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-req-gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
-status0-gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
-grant-gpios = <&gpio0 24 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
-swctrl1-gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
-srrf-switch-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;

From f2a7cbb12c78bcc13a155b97231970ce96c4755c Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Wed, 9 Oct 2024 12:49:38 +0200
Subject: [PATCH 0409/2913] [nrf fromlist] boards: shields: nrf7002eb: align
 with nrf700x split interface

Exclude the coex interface if the coex variant of the nrf7002eb
is selected instead of adding the interface alongside the
wifi/control interface.

Upstream PR #: 79606

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 32f30a89b8fa02a3b83aea24fd96cfc3b5b3afb8)
---
 boards/shields/nrf7002eb/nrf7002eb_coex.overlay | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/boards/shields/nrf7002eb/nrf7002eb_coex.overlay b/boards/shields/nrf7002eb/nrf7002eb_coex.overlay
index a8925c25567..59007ebe58e 100644
--- a/boards/shields/nrf7002eb/nrf7002eb_coex.overlay
+++ b/boards/shields/nrf7002eb/nrf7002eb_coex.overlay
@@ -4,10 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "nrf7002eb.overlay"
+/ {
+	nrf70: coex {
+		compatible = "nordic,nrf7002-coex";
+		status = "okay";
 
-&nrf70 {
-	status0-gpios = <&edge_connector 5 GPIO_ACTIVE_HIGH>;
-	req-gpios = <&edge_connector 6 GPIO_ACTIVE_HIGH>;
-	grant-gpios = <&edge_connector 15 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
+		status0-gpios = <&edge_connector 5 GPIO_ACTIVE_HIGH>;
+		req-gpios = <&edge_connector 6 GPIO_ACTIVE_HIGH>;
+		grant-gpios = <&edge_connector 15 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
+	};
 };

From 85ed407a9a71cccac3e1ff3b21fce6e5a5e43c36 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Wed, 9 Oct 2024 12:58:33 +0200
Subject: [PATCH 0410/2913] [nrf fromlist] boards: shields: nrf7002ek: align
 with nrf700x split interface

Add variant for the coex interface and move the coex interface out
if the wifi/control interface variants.

Upstream PR #: 79606

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 6b38f1ad94c87cfc45930fe6e609e0b39fb9ece5)
---
 boards/shields/nrf7002ek/Kconfig.shield       |  3 +++
 boards/shields/nrf7002ek/doc/index.rst        | 13 ++++++------
 .../shields/nrf7002ek/nrf7002ek_coex.overlay  | 21 +++++++++++++++++++
 .../shields/nrf7002ek/nrf7002ek_common.dtsi   |  9 +-------
 4 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 boards/shields/nrf7002ek/nrf7002ek_coex.overlay

diff --git a/boards/shields/nrf7002ek/Kconfig.shield b/boards/shields/nrf7002ek/Kconfig.shield
index 7627ff96dbd..5b52d5710f2 100644
--- a/boards/shields/nrf7002ek/Kconfig.shield
+++ b/boards/shields/nrf7002ek/Kconfig.shield
@@ -9,3 +9,6 @@ config SHIELD_NRF7002EK_NRF7001
 
 config SHIELD_NRF7002EK_NRF7000
 	def_bool $(shields_list_contains,nrf7002ek_nrf7000)
+
+config SHIELD_NRF7002EK_COEX
+	def_bool $(shields_list_contains,nrf7002ek_coex)
diff --git a/boards/shields/nrf7002ek/doc/index.rst b/boards/shields/nrf7002ek/doc/index.rst
index 9f247be3501..cfe08750f57 100644
--- a/boards/shields/nrf7002ek/doc/index.rst
+++ b/boards/shields/nrf7002ek/doc/index.rst
@@ -47,24 +47,25 @@ SR Co-existence
 ###############
 
 The nRF7002 EK supports SR co-existence provided the host board supports it. The SR co-existence
-pins are connected to the host board's GPIO pins.
+pins are connected to the host board's GPIO pins. The interface is selected by setting
+``--shield nrf7002ek_coex`` when invoking ``west build``.
 
 Two Kconfig options are available to enable SR co-existence:
 
-- :kconfig:option:`CONFIG_NRF70_SR_COEX`: Enables SR co-existence.
+- :kconfig:option:`CONFIG_NRF70_SR_COEX`: Enables SR co-existence driver.
 - :kconfig:option:`CONFIG_NRF70_SR_COEX_RF_SWITCH`: Control SR side RF switch.
 
 Shield Variants
 ###############
 
-The nRF7002 EK is available in three variants:
+The nRF7002 EK is available in four variants:
 
 - ``nrf7002ek``: The default variant.
 - ``nrf7002ek_nrf7001``: Variant for the nRF7001 SoC or nRF7002 SoC emulating nRF7001
-   that supports only 2.4GHz Wi-Fi.
+  that supports only 2.4GHz Wi-Fi.
 - ``nrf7002ek_nrf7000``: Variant for the nRF7000 SoC or nRF7002 SoC emulating nRF7000
-   that supports only 2.4GHz Wi-Fi.
-
+  that supports only 2.4GHz Wi-Fi.
+- ``nrf7002ek_coex``: Variant for the SR co-existence interface
 
 References
 **********
diff --git a/boards/shields/nrf7002ek/nrf7002ek_coex.overlay b/boards/shields/nrf7002ek/nrf7002ek_coex.overlay
new file mode 100644
index 00000000000..4b592acbfb2
--- /dev/null
+++ b/boards/shields/nrf7002ek/nrf7002ek_coex.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	nrf70: coex {
+		compatible = "nordic,nrf7002-coex";
+		status = "okay";
+
+		/* D2 */
+		status0-gpios = <&arduino_header 8 GPIO_ACTIVE_HIGH>;
+		/* D3 */
+		req-gpios = <&arduino_header 9 GPIO_ACTIVE_HIGH>;
+		/* D4 */
+		grant-gpios = <&arduino_header 10 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
+		/* D6 */
+		swctrl1-gpios = <&arduino_header 12 GPIO_ACTIVE_HIGH>;
+	};
+};
diff --git a/boards/shields/nrf7002ek/nrf7002ek_common.dtsi b/boards/shields/nrf7002ek/nrf7002ek_common.dtsi
index 102e0078d5f..c9bbbde4b92 100644
--- a/boards/shields/nrf7002ek/nrf7002ek_common.dtsi
+++ b/boards/shields/nrf7002ek/nrf7002ek_common.dtsi
@@ -12,15 +12,8 @@ iovdd-ctrl-gpios = <&arduino_header 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
 bucken-gpios = <&arduino_header 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
 /* D7 */
 host-irq-gpios = <&arduino_header 13 GPIO_ACTIVE_HIGH>;
+
 /* Short-range (SR) co-existence */
-/* D2 */
-status0-gpios = <&arduino_header 8 GPIO_ACTIVE_HIGH>;
-/* D3 */
-req-gpios = <&arduino_header 9 GPIO_ACTIVE_HIGH>;
-/* D4 */
-grant-gpios = <&arduino_header 10 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
-/* D6 */
-swctrl1-gpios = <&arduino_header 12 GPIO_ACTIVE_HIGH>;
 /* D8 */
 srrf-switch-gpios = <&arduino_header 14 GPIO_ACTIVE_HIGH>;
 

From 346f21e901d5eb98d74f2c461e168a87086dd44b Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Thu, 17 Oct 2024 19:01:23 +0530
Subject: [PATCH 0411/2913] [nrf fromtree] drivers: wifi: Add Kconfig option
 for passive scan

Add kconfig option for forced passive scan, It will use for
only scan only mode.

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit 0b11b39461958c25be6855e139124a8a4352e88a)
(cherry picked from commit 5f477d0fb50ac2879ac670cfbc14156f46550083)
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi      | 7 +++++++
 drivers/wifi/nrfwifi/src/wifi_mgmt_scan.c | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index a5a12a03e26..b0c5e6cb63e 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -821,4 +821,11 @@ config NRF_WIFI_PS_INT_PS
 	  whether to stay in PS (for lower amount of buffered data) or exit PS (for higher
 	  amount of buffered data).
 endchoice
+
+config NRF70_PASSIVE_SCAN_ONLY
+	bool "Forced Passive scan"
+	depends on NRF70_SCAN_ONLY
+	help
+	  Enable this configuration to force passive scan on all channels.
+	  This will override application specified scan type.
 endif # WIFI_NRF70
diff --git a/drivers/wifi/nrfwifi/src/wifi_mgmt_scan.c b/drivers/wifi/nrfwifi/src/wifi_mgmt_scan.c
index c5c6f18804e..e30f572aeb3 100644
--- a/drivers/wifi/nrfwifi/src/wifi_mgmt_scan.c
+++ b/drivers/wifi/nrfwifi/src/wifi_mgmt_scan.c
@@ -206,6 +206,10 @@ int nrf_wifi_disp_scan_zep(const struct device *dev, struct wifi_scan_params *pa
 
 	vif_ctx_zep->scan_res_cnt = 0;
 
+#ifdef CONFIG_NRF70_PASSIVE_SCAN_ONLY
+	scan_info->scan_params.passive_scan = 1;
+#endif /* CONFIG_NRF70_PASSIVE_SCAN_ONLY */
+
 	status = nrf_wifi_fmac_scan(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, scan_info);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {

From 3c85c2cefbfe3c2f97d70090ee53ea52d22474b7 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Fri, 18 Oct 2024 20:55:29 +0530
Subject: [PATCH 0412/2913] [nrf fromtree] drivers: nrfwifi: Allow scan-only
 for all platforms

Though nRF7000 is a special Scan only chipset, scan only can work with
any nRF70 platforms, no need for this enforcement and we can keep things
flexible.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit f7ef64df28dc71e89eb0a80a5174c76bc8461330)
(cherry picked from commit 4b7b89df5d82f8aac9895a6312fbe0f903cbe9a8)
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index b0c5e6cb63e..36935ed8ba1 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -62,7 +62,6 @@ config NRF70_SYSTEM_MODE
 
 config NRF70_SCAN_ONLY
 	bool "nRF70 scan only mode"
-	depends on WIFI_NRF7000
 	help
 	  Select this option to enable scan only mode of the nRF70 driver
 

From 1fc850a01f00b9379f1fddbe07f1a6bf627de9f2 Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Fri, 18 Oct 2024 16:56:41 +0530
Subject: [PATCH 0413/2913] [nrf fromtree] drivers: wifi: Add changes for
 regulatory domain

Add changes for offloaded raw tx regulatory domain.

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit 7161a7a06ab58ce2338c51974813e270dcd5b7d9)
(cherry picked from commit da64b654f46220eace789332edb39fe0895ce0de)
---
 drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c        | 5 +++--
 drivers/wifi/nrfwifi/src/fmac_main.c                        | 6 ++++--
 .../zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h | 6 ++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c b/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
index 3b1dd0bb093..520814865d6 100644
--- a/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
+++ b/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
@@ -128,7 +128,7 @@ static int bytes_from_str(uint8_t *buf, int buf_len, const char *src)
 }
 #endif /* CONFIG_WIFI_FIXED_MAC_ADDRESS_ENABLED */
 
-int nrf70_off_raw_tx_init(uint8_t *mac_addr)
+int nrf70_off_raw_tx_init(uint8_t *mac_addr, unsigned char *country_code)
 {
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
@@ -206,7 +206,8 @@ int nrf70_off_raw_tx_init(uint8_t *mac_addr)
 						   IS_ENABLED(CONFIG_NRF_WIFI_BEAMFORMING),
 						   &ctrl_params,
 						   &ceil_params,
-						   &board_params);
+						   &board_params,
+						   country_code);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nRF70 firmware initialization failed", __func__);
 		goto err;
diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c
index 82ea0f99267..f2f7ba41340 100644
--- a/drivers/wifi/nrfwifi/src/fmac_main.c
+++ b/drivers/wifi/nrfwifi/src/fmac_main.c
@@ -644,7 +644,8 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv
 					IS_ENABLED(CONFIG_NRF_WIFI_BEAMFORMING),
 					&tx_pwr_ctrl_params,
 					&tx_pwr_ceil_params,
-					&board_params);
+					&board_params,
+					STRINGIFY(CONFIG_NRF70_REG_DOMAIN));
 #else
 	status = nrf_wifi_fmac_dev_init(rpu_ctx_zep->rpu_ctx,
 #ifdef CONFIG_NRF_WIFI_LOW_POWER
@@ -655,7 +656,8 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv
 					IS_ENABLED(CONFIG_NRF_WIFI_BEAMFORMING),
 					&tx_pwr_ctrl_params,
 					&tx_pwr_ceil_params,
-					&board_params);
+					&board_params,
+					STRINGIFY(CONFIG_NRF70_REG_DOMAIN));
 #endif /* CONFIG_NRF70_RADIO_TEST */
 
 
diff --git a/include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h b/include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h
index b8ff50cd390..b14ae39488d 100644
--- a/include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h
+++ b/include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h
@@ -22,7 +22,8 @@
 #define NRF_WIFI_OFF_RAW_TX_FRAME_SIZE_MIN 26
 /*  Maximum frame size for raw packet transmission */
 #define NRF_WIFI_OFF_RAW_TX_FRAME_SIZE_MAX 600
-
+/* Maximum length of country code*/
+#define NRF_WIFI_COUNTRY_CODE_LEN 2
 /**
  * @brief- Transmission rates
  * Rate to be used for transmitting a packet.
@@ -167,6 +168,7 @@ struct nrf_wifi_off_raw_tx_conf {
 /**
  * @brief Initialize the nRF70 for operating in the offloaded raw TX mode.
  * @param mac_addr MAC address to be used for the nRF70 device.
+ * @param country_code Country code to be set for regularity domain.
  *
  * This function is initializes the nRF70 device for offloaded raw TX mode by:
  *  - Powering it up,
@@ -184,7 +186,7 @@ struct nrf_wifi_off_raw_tx_conf {
  * @retval 0 If the operation was successful.
  * @retval -1 If the operation failed.
  */
-int nrf70_off_raw_tx_init(uint8_t *mac_addr);
+int nrf70_off_raw_tx_init(uint8_t *mac_addr, unsigned char *country_code);
 
 /**
  * @brief Initialize the nRF70 for operating in the offloaded raw TX mode.

From 2096d9ff26512795ccc1cabaf7c342148af24942 Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Tue, 22 Oct 2024 13:00:50 +0530
Subject: [PATCH 0414/2913] [nrf fromtree] manifest: update hal_nordic revision
 for regularity domain

Update update hal_nordic revision for regularity domain changes.
Set regularity domain in umac command init.

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit b8c18f55447e3781299242e3af83e949a0e67bc1)
(cherry picked from commit 553569ed2c14af883340aef57997db6c6f0a0267)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 31647ae878c..31a525b6eaf 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 5f1210074cb8bb7ec66317af294596a97ac48815
+      revision: 957d1a803d0663330e870af2985503ba0cdbb152
       path: modules/hal/nordic
       groups:
         - hal

From ab4cba58b7dc5ca4d6e898145781946f9cfa03af Mon Sep 17 00:00:00 2001
From: Fengming Ye <frank.ye@nxp.com>
Date: Wed, 16 Oct 2024 17:27:14 +0900
Subject: [PATCH 0415/2913] [nrf fromtree] modules: hostap: fix DPP build error

Fix DPP build error when HOSTAPD enabled and DPP disabled.
Guard hapd_dpp_dispatch in both CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
and CONFIG_WIFI_NM_HOSTAPD_AP.

Signed-off-by: Fengming Ye <frank.ye@nxp.com>
(cherry picked from commit 9e8b7bd3adac4b232d0ae05aa443f7fee06a8e6c)
(cherry picked from commit 893037de2ffedca18a33b8ef0ce9d1992b8dd3db)
---
 modules/hostap/src/supp_api.c | 1 -
 modules/hostap/src/supp_api.h | 1 -
 2 files changed, 2 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index ea4afcbcbf4..a29bc1c8296 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -2061,7 +2061,6 @@ int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *pa
 	os_free(cmd);
 	return 0;
 }
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 int hapd_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params)
diff --git a/modules/hostap/src/supp_api.h b/modules/hostap/src/supp_api.h
index 1abcd2166c9..d5edce626de 100644
--- a/modules/hostap/src/supp_api.h
+++ b/modules/hostap/src/supp_api.h
@@ -278,7 +278,6 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
  * @return 0 for OK; -1 for ERROR
  */
 int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params);
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 /**

From 185fa70fba41dfb7e7fefcbbf87276f8611a69ed Mon Sep 17 00:00:00 2001
From: Rex Chen <rex.chen_1@nxp.com>
Date: Mon, 19 Aug 2024 23:09:26 -0700
Subject: [PATCH 0416/2913] [nrf fromtree] net: wifi: shell: add wps support

Add wps pin and wps pbc L2 layer cmd support.

Signed-off-by: Rex Chen <rex.chen_1@nxp.com>
(cherry picked from commit 82ec1d7862102cfb72da60b1a7a215a7b70c2713)
(cherry picked from commit 9f1a2440d0be6907f23b85b101db29ea97ec3c1c)
---
 include/zephyr/net/wifi_mgmt.h            | 36 ++++++++-
 modules/hostap/src/supp_api.c             | 89 ++++++++++++++++++++++-
 modules/hostap/src/supp_api.h             |  9 +++
 modules/hostap/src/supp_main.c            |  1 +
 samples/net/wifi/boards/rd_rw612_bga.conf |  1 +
 subsys/net/l2/wifi/wifi_mgmt.c            | 15 ++++
 subsys/net/l2/wifi/wifi_shell.c           | 58 +++++++++++++++
 7 files changed, 207 insertions(+), 2 deletions(-)

diff --git a/include/zephyr/net/wifi_mgmt.h b/include/zephyr/net/wifi_mgmt.h
index 528e72dffe9..8e4b00b31a9 100644
--- a/include/zephyr/net/wifi_mgmt.h
+++ b/include/zephyr/net/wifi_mgmt.h
@@ -106,7 +106,9 @@ enum net_request_wifi_cmd {
 	NET_REQUEST_WIFI_CMD_ENTERPRISE_CREDS,
 	/** Get RTS threshold */
 	NET_REQUEST_WIFI_CMD_RTS_THRESHOLD_CONFIG,
-/** @cond INTERNAL_HIDDEN */
+	/** WPS config */
+	NET_REQUEST_WIFI_CMD_WPS_CONFIG,
+	/** @cond INTERNAL_HIDDEN */
 	NET_REQUEST_WIFI_CMD_MAX
 /** @endcond */
 };
@@ -252,6 +254,10 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_ENTERPRISE_CREDS);
 
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_RTS_THRESHOLD_CONFIG);
 
+#define NET_REQUEST_WIFI_WPS_CONFIG (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_WPS_CONFIG)
+
+NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_WPS_CONFIG);
+
 /** @brief Wi-Fi management events */
 enum net_event_wifi_cmd {
 	/** Scan results available */
@@ -1030,6 +1036,26 @@ struct wifi_dpp_params {
 };
 #endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
+#define WIFI_WPS_PIN_MAX_LEN 8
+
+/** Operation for WPS */
+enum wifi_wps_op {
+	/** WPS pbc */
+	WIFI_WPS_PBC = 0,
+	/** Get WPS pin number */
+	WIFI_WPS_PIN_GET = 1,
+	/** Set WPS pin number */
+	WIFI_WPS_PIN_SET = 2,
+};
+
+/** Wi-Fi wps setup */
+struct wifi_wps_config_params {
+	/** wps operation */
+	enum wifi_wps_op oper;
+	/** pin value*/
+	char pin[WIFI_WPS_PIN_MAX_LEN + 1];
+};
+
 #include <zephyr/net/net_if.h>
 
 /** Scan result callback
@@ -1273,6 +1299,14 @@ struct wifi_mgmt_ops {
 	 * @return 0 if ok, < 0 if error
 	 */
 	int (*get_rts_threshold)(const struct device *dev, unsigned int *rts_threshold);
+	/** Start a WPS PBC/PIN connection
+	 *
+	 * @param dev Pointer to the device structure for the driver instance
+	 * @param params wps operarion parameters
+	 *
+	 * @return 0 if ok, < 0 if error
+	 */
+	int (*wps_config)(const struct device *dev, struct wifi_wps_config_params *params);
 };
 
 /** Wi-Fi management offload API */
diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index a29bc1c8296..087b70644bd 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -35,7 +35,9 @@ static struct wifi_connect_req_params last_wifi_conn_params;
 
 enum requested_ops {
 	CONNECT = 0,
-	DISCONNECT
+	DISCONNECT,
+	WPS_PBC,
+	WPS_PIN,
 };
 
 enum status_thread_state {
@@ -1320,6 +1322,91 @@ int supplicant_get_wifi_conn_params(const struct device *dev,
 	return ret;
 }
 
+static int supplicant_wps_pbc(const struct device *dev)
+{
+	struct wpa_supplicant *wpa_s;
+	int ret = -1;
+
+	k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
+
+	wpa_s = get_wpa_s_handle(dev);
+	if (!wpa_s) {
+		ret = -1;
+		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
+		goto out;
+	}
+
+	if (!wpa_cli_cmd_v("wps_pbc")) {
+		goto out;
+	}
+
+	wpas_api_ctrl.dev = dev;
+	wpas_api_ctrl.requested_op = WPS_PBC;
+
+	ret = 0;
+
+out:
+	k_mutex_unlock(&wpa_supplicant_mutex);
+
+	return ret;
+}
+
+static int supplicant_wps_pin(const struct device *dev, struct wifi_wps_config_params *params)
+{
+	struct wpa_supplicant *wpa_s;
+	char *get_pin_cmd = "WPS_PIN get";
+	int ret = -1;
+
+	k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
+
+	wpa_s = get_wpa_s_handle(dev);
+	if (!wpa_s) {
+		ret = -1;
+		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
+		goto out;
+	}
+
+	if (params->oper == WIFI_WPS_PIN_GET) {
+		if (zephyr_wpa_cli_cmd_resp(get_pin_cmd, params->pin)) {
+			goto out;
+		}
+	} else if (params->oper == WIFI_WPS_PIN_SET) {
+		if (!wpa_cli_cmd_v("wps_check_pin %s", params->pin)) {
+			goto out;
+		}
+
+		if (!wpa_cli_cmd_v("wps_pin any %s", params->pin)) {
+			goto out;
+		}
+
+		wpas_api_ctrl.dev = dev;
+		wpas_api_ctrl.requested_op = WPS_PIN;
+	} else {
+		wpa_printf(MSG_ERROR, "Error wps pin operation : %d", params->oper);
+		goto out;
+	}
+
+	ret = 0;
+
+out:
+	k_mutex_unlock(&wpa_supplicant_mutex);
+
+	return ret;
+}
+
+int supplicant_wps_config(const struct device *dev, struct wifi_wps_config_params *params)
+{
+	int ret = 0;
+
+	if (params->oper == WIFI_WPS_PBC) {
+		ret = supplicant_wps_pbc(dev);
+	} else if (params->oper == WIFI_WPS_PIN_GET || params->oper == WIFI_WPS_PIN_SET) {
+		ret = supplicant_wps_pin(dev, params);
+	}
+
+	return ret;
+}
+
 #ifdef CONFIG_AP
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 int hapd_state(const struct device *dev, int *state)
diff --git a/modules/hostap/src/supp_api.h b/modules/hostap/src/supp_api.h
index d5edce626de..3cd4ccac113 100644
--- a/modules/hostap/src/supp_api.h
+++ b/modules/hostap/src/supp_api.h
@@ -215,6 +215,15 @@ int supplicant_btm_query(const struct device *dev, uint8_t reason);
 int supplicant_get_wifi_conn_params(const struct device *dev,
 			 struct wifi_connect_req_params *params);
 
+/** Start a WPS PBC/PIN connection
+ *
+ * @param dev Pointer to the device structure for the driver instance
+ * @param params wps operarion parameters
+ *
+ * @return 0 if ok, < 0 if error
+ */
+int supplicant_wps_config(const struct device *dev, struct wifi_wps_config_params *params);
+
 #ifdef CONFIG_AP
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 /**
diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index b111f43a4e8..380c32dfc16 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -75,6 +75,7 @@ static const struct wifi_mgmt_ops mgmt_ops = {
 	.btm_query = supplicant_btm_query,
 #endif
 	.get_conn_params = supplicant_get_wifi_conn_params,
+	.wps_config = supplicant_wps_config,
 #ifdef CONFIG_AP
 	.ap_enable = supplicant_ap_enable,
 	.ap_disable = supplicant_ap_disable,
diff --git a/samples/net/wifi/boards/rd_rw612_bga.conf b/samples/net/wifi/boards/rd_rw612_bga.conf
index d20b5af0b3e..a916ff131ad 100644
--- a/samples/net/wifi/boards/rd_rw612_bga.conf
+++ b/samples/net/wifi/boards/rd_rw612_bga.conf
@@ -85,6 +85,7 @@ CONFIG_WIFI_NM_WPA_SUPPLICANT_INF_MON=n
 CONFIG_WIFI_NM_MAX_MANAGED_INTERFACES=2
 CONFIG_SAE_PWE_EARLY_EXIT=y
 CONFIG_WIFI_NM_HOSTAPD_AP=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_WPS=y
 
 # Enable mbedtls
 CONFIG_MBEDTLS=y
diff --git a/subsys/net/l2/wifi/wifi_mgmt.c b/subsys/net/l2/wifi/wifi_mgmt.c
index 3cea624b6e3..f0d25d864d0 100644
--- a/subsys/net/l2/wifi/wifi_mgmt.c
+++ b/subsys/net/l2/wifi/wifi_mgmt.c
@@ -832,6 +832,21 @@ static int wifi_get_connection_params(uint32_t mgmt_request, struct net_if *ifac
 
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_CONN_PARAMS, wifi_get_connection_params);
 
+static int wifi_wps_config(uint32_t mgmt_request, struct net_if *iface, void *data, size_t len)
+{
+	const struct device *dev = net_if_get_device(iface);
+	const struct wifi_mgmt_ops *const wifi_mgmt_api = get_wifi_api(iface);
+	struct wifi_wps_config_params *params = data;
+
+	if (wifi_mgmt_api == NULL || wifi_mgmt_api->wps_config == NULL) {
+		return -ENOTSUP;
+	}
+
+	return wifi_mgmt_api->wps_config(dev, params);
+}
+
+NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_WPS_CONFIG, wifi_wps_config);
+
 static int wifi_set_rts_threshold(uint32_t mgmt_request, struct net_if *iface,
 				  void *data, size_t len)
 {
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index 22e3f0e83e7..a7085ee3760 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -1700,6 +1700,57 @@ static int cmd_wifi_btm_query(const struct shell *sh, size_t argc, char *argv[])
 }
 #endif
 
+static int cmd_wifi_wps_pbc(const struct shell *sh, size_t argc, char *argv[])
+{
+	struct net_if *iface = net_if_get_first_wifi();
+	struct wifi_wps_config_params params = {0};
+
+	context.sh = sh;
+
+	if (argc == 1) {
+		params.oper = WIFI_WPS_PBC;
+	} else {
+		shell_help(sh);
+		return -ENOEXEC;
+	}
+
+	if (net_mgmt(NET_REQUEST_WIFI_WPS_CONFIG, iface, &params, sizeof(params))) {
+		PR_WARNING("Start wps pbc connection failed\n");
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
+static int cmd_wifi_wps_pin(const struct shell *sh, size_t argc, char *argv[])
+{
+	struct net_if *iface = net_if_get_first_wifi();
+	struct wifi_wps_config_params params = {0};
+
+	context.sh = sh;
+
+	if (argc == 1) {
+		params.oper = WIFI_WPS_PIN_GET;
+	} else if (argc == 2) {
+		params.oper = WIFI_WPS_PIN_SET;
+		strncpy(params.pin, argv[1], WIFI_WPS_PIN_MAX_LEN);
+	} else {
+		shell_help(sh);
+		return -ENOEXEC;
+	}
+
+	if (net_mgmt(NET_REQUEST_WIFI_WPS_CONFIG, iface, &params, sizeof(params))) {
+		PR_WARNING("Start wps pin connection failed\n");
+		return -ENOEXEC;
+	}
+
+	if (params.oper == WIFI_WPS_PIN_GET) {
+		PR("WPS PIN is: %s\n", params.pin);
+	}
+
+	return 0;
+}
+
 static int cmd_wifi_ps_wakeup_mode(const struct shell *sh, size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_first_wifi();
@@ -2960,6 +3011,13 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
 		cmd_wifi_btm_query,
 		2, 0),
 #endif
+	SHELL_CMD_ARG(wps_pbc, NULL,
+		"Start a WPS PBC connection.\n",
+		cmd_wifi_wps_pbc, 1, 0),
+	SHELL_CMD_ARG(wps_pin, NULL,
+		"Set and get WPS pin.\n"
+		"[pin] Only applicable for set.\n",
+		cmd_wifi_wps_pin, 1, 1),
 	SHELL_CMD_ARG(ps_timeout,
 		      NULL,
 		      "<val> - PS inactivity timer(in ms).\n",

From 2c89d340c090b68106f29ad356c3c73b684bc983 Mon Sep 17 00:00:00 2001
From: Maochen Wang <maochen.wang@nxp.com>
Date: Tue, 8 Oct 2024 17:16:01 +0800
Subject: [PATCH 0417/2913] [nrf fromtree] net: fix build error in DPP struct

Fix build error in DPP struct when building Matter over Wi-Fi.
The struct declaration must be done outside of the anonymous union.
Only struct definition can be done inside the anonymous union.

Signed-off-by: Maochen Wang <maochen.wang@nxp.com>
(cherry picked from commit 9487952a4fd054ccb47a7b26fb071a744fc6c59d)
(cherry picked from commit fd127c93c583796ff4e012aeddb4dfd893d3179e)
---
 include/zephyr/net/wifi_mgmt.h | 134 +++++++++++++++++++--------------
 1 file changed, 76 insertions(+), 58 deletions(-)

diff --git a/include/zephyr/net/wifi_mgmt.h b/include/zephyr/net/wifi_mgmt.h
index 8e4b00b31a9..4927bc1c9c5 100644
--- a/include/zephyr/net/wifi_mgmt.h
+++ b/include/zephyr/net/wifi_mgmt.h
@@ -949,6 +949,76 @@ enum wifi_dpp_bootstrap_type {
 	WIFI_DPP_BOOTSTRAP_TYPE_NFC_URI
 };
 
+/** Params to add DPP configurator */
+struct wifi_dpp_configurator_add_params {
+	/** ECP curves for private key */
+	int curve;
+	/** ECP curves for net access key */
+	int net_access_key_curve;
+};
+
+/** Params to initiate a DPP auth procedure */
+struct wifi_dpp_auth_init_params {
+	/** Peer bootstrap id */
+	int peer;
+	/** Configuration parameter id */
+	int configurator;
+	/** Role configurator or enrollee */
+	int role;
+	/** Security type */
+	int conf;
+	/** SSID in string */
+	char ssid[WIFI_SSID_MAX_LEN + 1];
+};
+
+/** Params to do DPP chirp */
+struct wifi_dpp_chirp_params {
+	/** Own bootstrap id */
+	int id;
+	/** Chirp on frequency */
+	int freq;
+};
+
+/** Params to do DPP listen */
+struct wifi_dpp_listen_params {
+	/** Listen on frequency */
+	int freq;
+	/** Role configurator or enrollee */
+	int role;
+};
+
+/** Params to generate a DPP bootstrap */
+struct wifi_dpp_bootstrap_gen_params {
+	/** Bootstrap type */
+	int type;
+	/** Own operating class */
+	int op_class;
+	/** Own working channel */
+	int chan;
+	/** ECP curves */
+	int curve;
+	/** Own mac address */
+	uint8_t mac[WIFI_MAC_ADDR_LEN];
+};
+
+/** Params to set specific DPP configurator */
+struct wifi_dpp_configurator_set_params {
+	/** Peer bootstrap id */
+	int peer;
+	/** Configuration parameter id */
+	int configurator;
+	/** Role configurator or enrollee */
+	int role;
+	/** Security type */
+	int conf;
+	/** ECP curves for private key */
+	int curve;
+	/** ECP curves for net access key */
+	int net_access_key_curve;
+	/** Own mac address */
+	char ssid[WIFI_SSID_MAX_LEN + 1];
+};
+
 /** Wi-Fi DPP params for various operations
  */
 struct wifi_dpp_params {
@@ -956,69 +1026,17 @@ struct wifi_dpp_params {
 	int action;
 	union {
 		/** Params to add DPP configurator */
-		struct wifi_dpp_configurator_add_params {
-			/** ECP curves for private key */
-			int curve;
-			/** ECP curves for net access key */
-			int net_access_key_curve;
-		} configurator_add;
+		struct wifi_dpp_configurator_add_params configurator_add;
 		/** Params to initiate a DPP auth procedure */
-		struct wifi_dpp_auth_init_params {
-			/** Peer bootstrap id */
-			int peer;
-			/** Configuration parameter id */
-			int configurator;
-			/** Role configurator or enrollee */
-			int role;
-			/** Security type */
-			int conf;
-			/** SSID in string */
-			char ssid[WIFI_SSID_MAX_LEN + 1];
-		} auth_init;
+		struct wifi_dpp_auth_init_params auth_init;
 		/** Params to do DPP chirp */
-		struct wifi_dpp_chirp_params {
-			/** Own bootstrap id */
-			int id;
-			/** Chirp on frequency */
-			int freq;
-		} chirp;
+		struct wifi_dpp_chirp_params chirp;
 		/** Params to do DPP listen */
-		struct wifi_dpp_listen_params {
-			/** Listen on frequency */
-			int freq;
-			/** Role configurator or enrollee */
-			int role;
-		} listen;
+		struct wifi_dpp_listen_params listen;
 		/** Params to generate a DPP bootstrap */
-		struct wifi_dpp_bootstrap_gen_params {
-			/** Bootstrap type */
-			int type;
-			/** Own operating class */
-			int op_class;
-			/** Own working channel */
-			int chan;
-			/** ECP curves */
-			int curve;
-			/** Own mac address */
-			uint8_t mac[WIFI_MAC_ADDR_LEN];
-		} bootstrap_gen;
+		struct wifi_dpp_bootstrap_gen_params bootstrap_gen;
 		/** Params to set specific DPP configurator */
-		struct wifi_dpp_configurator_set_params {
-			/** Peer bootstrap id */
-			int peer;
-			/** Configuration parameter id */
-			int configurator;
-			/** Role configurator or enrollee */
-			int role;
-			/** Security type */
-			int conf;
-			/** ECP curves for private key */
-			int curve;
-			/** ECP curves for net access key */
-			int net_access_key_curve;
-			/** Own mac address */
-			char ssid[WIFI_SSID_MAX_LEN + 1];
-		} configurator_set;
+		struct wifi_dpp_configurator_set_params configurator_set;
 		/** Bootstrap get uri id */
 		int id;
 		/** Timeout for DPP frame response rx */

From ba2c044811331d6275439907deb51775c1c6c11a Mon Sep 17 00:00:00 2001
From: Gaofeng Zhang <gaofeng.zhang@nxp.com>
Date: Sun, 29 Sep 2024 14:24:22 +0800
Subject: [PATCH 0418/2913] [nrf fromtree] hostapd: add ap status in l2 wifi

add ap status in l2 wifi

Signed-off-by: Gaofeng Zhang <gaofeng.zhang@nxp.com>
(cherry picked from commit 0c54a3f8c7b4770820d3c2cfc02add29cc42f525)
(cherry picked from commit 1ad08d46bbf2133a99ca242f0e2ad329885b9218)
---
 include/zephyr/net/wifi_mgmt.h  |  12 ++++
 modules/hostap/src/supp_api.c   |  80 ++++++++++++++++++++-
 modules/hostap/src/supp_api.h   |   9 +++
 modules/hostap/src/supp_main.c  |   1 +
 subsys/net/l2/wifi/wifi_mgmt.c  |   2 +
 subsys/net/l2/wifi/wifi_shell.c | 120 +++++++++++++++++++++++---------
 6 files changed, 188 insertions(+), 36 deletions(-)

diff --git a/include/zephyr/net/wifi_mgmt.h b/include/zephyr/net/wifi_mgmt.h
index 4927bc1c9c5..c0c9643602a 100644
--- a/include/zephyr/net/wifi_mgmt.h
+++ b/include/zephyr/net/wifi_mgmt.h
@@ -1074,6 +1074,18 @@ struct wifi_wps_config_params {
 	char pin[WIFI_WPS_PIN_MAX_LEN + 1];
 };
 
+/** Wi-Fi AP status
+ */
+enum wifi_hostapd_iface_state {
+	WIFI_HAPD_IFACE_UNINITIALIZED,
+	WIFI_HAPD_IFACE_DISABLED,
+	WIFI_HAPD_IFACE_COUNTRY_UPDATE,
+	WIFI_HAPD_IFACE_ACS,
+	WIFI_HAPD_IFACE_HT_SCAN,
+	WIFI_HAPD_IFACE_DFS,
+	WIFI_HAPD_IFACE_ENABLED
+};
+
 #include <zephyr/net/net_if.h>
 
 /** Scan result callback
diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 087b70644bd..e62fbfca0be 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -378,6 +378,8 @@ static inline enum wifi_security_type wpas_key_mgmt_to_zephyr(int key_mgmt, int
 		return WIFI_SECURITY_TYPE_PSK_SHA256;
 	case WPA_KEY_MGMT_SAE:
 		return WIFI_SECURITY_TYPE_SAE;
+	case WPA_KEY_MGMT_SAE | WPA_KEY_MGMT_PSK:
+		return WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL;
 	default:
 		return WIFI_SECURITY_TYPE_UNKNOWN;
 	}
@@ -1574,7 +1576,7 @@ int hapd_config_network(struct hostapd_iface *iface,
 		if (!hostapd_cli_cmd_v("set wpa 0")) {
 			goto out;
 		}
-		iface->bss[0]->conf->wpa_key_mgmt = 0;
+		iface->bss[0]->conf->wpa_key_mgmt = WPA_KEY_MGMT_NONE;
 	}
 
 	if (!hostapd_cli_cmd_v("set ieee80211w %d", params->mfp)) {
@@ -1636,6 +1638,80 @@ int supplicant_ap_config_params(const struct device *dev, struct wifi_ap_config_
 }
 #endif
 
+int supplicant_ap_status(const struct device *dev, struct wifi_iface_status *status)
+{
+	int ret = 0;
+	struct hostapd_iface *iface;
+	struct hostapd_config *conf;
+	struct hostapd_data *hapd;
+	struct hostapd_bss_config *bss;
+	struct hostapd_ssid *ssid;
+	struct hostapd_hw_modes *hw_mode;
+	int proto;    /* Wi-Fi secure protocol */
+	int key_mgmt; /*  Wi-Fi key management */
+
+	k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
+
+	iface = get_hostapd_handle(dev);
+	if (!iface) {
+		ret = -1;
+		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
+		goto out;
+	}
+
+	conf = iface->conf;
+	if (!conf) {
+		ret = -1;
+		wpa_printf(MSG_ERROR, "Conf %s not found", dev->name);
+		goto out;
+	}
+
+	bss = conf->bss[0];
+	if (!bss) {
+		ret = -1;
+		wpa_printf(MSG_ERROR, "Bss_conf %s not found", dev->name);
+		goto out;
+	}
+
+	hapd = iface->bss[0];
+	if (!hapd) {
+		ret = -1;
+		wpa_printf(MSG_ERROR, "Bss %s not found", dev->name);
+		goto out;
+	}
+
+	status->state = iface->state;
+	ssid = &bss->ssid;
+
+	os_memcpy(status->bssid, hapd->own_addr, WIFI_MAC_ADDR_LEN);
+	status->iface_mode = WPAS_MODE_AP;
+	status->band = wpas_band_to_zephyr(wpas_freq_to_band(iface->freq));
+	key_mgmt = bss->wpa_key_mgmt;
+	proto = bss->wpa;
+	status->security = wpas_key_mgmt_to_zephyr(key_mgmt, proto);
+	status->mfp = bss->ieee80211w;
+	status->channel = conf->channel;
+	os_memcpy(status->ssid, ssid->ssid, ssid->ssid_len);
+
+	status->dtim_period = bss->dtim_period;
+	status->beacon_interval = conf->beacon_int;
+
+	hw_mode = iface->current_mode;
+
+	status->link_mode = conf->ieee80211ax                          ? WIFI_6
+			    : conf->ieee80211ac                        ? WIFI_5
+			    : conf->ieee80211n                         ? WIFI_4
+			    : hw_mode->mode == HOSTAPD_MODE_IEEE80211G ? WIFI_3
+			    : hw_mode->mode == HOSTAPD_MODE_IEEE80211A ? WIFI_2
+			    : hw_mode->mode == HOSTAPD_MODE_IEEE80211B ? WIFI_1
+								       : WIFI_0;
+	status->twt_capable = (hw_mode->he_capab[IEEE80211_MODE_AP].mac_cap[0] & 0x04);
+
+out:
+	k_mutex_unlock(&wpa_supplicant_mutex);
+	return ret;
+}
+
 int supplicant_ap_enable(const struct device *dev,
 			 struct wifi_connect_req_params *params)
 {
@@ -1717,7 +1793,7 @@ int supplicant_ap_enable(const struct device *dev,
 		goto out;
 	}
 
-	/* No need to check for existing network to join for SoftAP*/
+	/* No need to check for existing network to join for SoftAP */
 	wpa_s->conf->ap_scan = 2;
 	/* Set BSS parameter max_num_sta to default configured value */
 	wpa_s->conf->max_num_sta = CONFIG_WIFI_MGMT_AP_MAX_NUM_STA;
diff --git a/modules/hostap/src/supp_api.h b/modules/hostap/src/supp_api.h
index 3cd4ccac113..f6584d86126 100644
--- a/modules/hostap/src/supp_api.h
+++ b/modules/hostap/src/supp_api.h
@@ -250,6 +250,15 @@ static inline int hapd_state(const struct device *dev, int *state)
 }
 #endif
 
+/**
+ * @brief Get Wi-Fi SAP status
+ *
+ * @param dev Wi-Fi device
+ * @param status SAP status
+ * @return 0 for OK; -1 for ERROR
+ */
+int supplicant_ap_status(const struct device *dev, struct wifi_iface_status *status);
+
 /**
  * @brief Set Wi-Fi AP configuration
  *
diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index 380c32dfc16..b47b322e2aa 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -99,6 +99,7 @@ static const struct wifi_mgmt_ops mgmt_ap_ops = {
 	.ap_disable = supplicant_ap_disable,
 	.ap_sta_disconnect = supplicant_ap_sta_disconnect,
 	.ap_bandwidth = supplicant_ap_bandwidth,
+	.iface_status = supplicant_ap_status,
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	.dpp_dispatch = hapd_dpp_dispatch,
 #endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
diff --git a/subsys/net/l2/wifi/wifi_mgmt.c b/subsys/net/l2/wifi/wifi_mgmt.c
index f0d25d864d0..5974cde6a1a 100644
--- a/subsys/net/l2/wifi/wifi_mgmt.c
+++ b/subsys/net/l2/wifi/wifi_mgmt.c
@@ -41,6 +41,8 @@ const char *wifi_security_txt(enum wifi_security_type security)
 		return "WAPI";
 	case WIFI_SECURITY_TYPE_EAP_TLS:
 		return "EAP";
+	case WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL:
+		return "WPA/WPA2/WPA3 PSK";
 	case WIFI_SECURITY_TYPE_UNKNOWN:
 	default:
 		return "UNKNOWN";
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index a7085ee3760..93005936f09 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -954,6 +954,65 @@ static int cmd_wifi_status(const struct shell *sh, size_t argc, char *argv[])
 	return 0;
 }
 
+static int cmd_wifi_ap_status(const struct shell *sh, size_t argc, char *argv[])
+{
+	struct net_if *iface = net_if_get_wifi_sap();
+	struct wifi_iface_status status = {0};
+	uint8_t mac_string_buf[sizeof("xx:xx:xx:xx:xx:xx")];
+
+	context.sh = sh;
+
+	if (net_mgmt(NET_REQUEST_WIFI_IFACE_STATUS, iface, &status,
+		     sizeof(struct wifi_iface_status))) {
+		PR_WARNING("Status request failed\n");
+
+		return -ENOEXEC;
+	}
+
+	switch (status.state) {
+	case WIFI_HAPD_IFACE_UNINITIALIZED:
+		PR("State: %s\n", "HAPD_IFACE_UNINITIALIZED");
+		return 0;
+	case WIFI_HAPD_IFACE_DISABLED:
+		PR("State: %s\n", "HAPD_IFACE_DISABLED");
+		return 0;
+	case WIFI_HAPD_IFACE_COUNTRY_UPDATE:
+		PR("State: %s\n", "HAPD_IFACE_DISABLED");
+		return 0;
+	case WIFI_HAPD_IFACE_ACS:
+		PR("State: %s\n", "HAPD_IFACE_DISABLED");
+		return 0;
+	case WIFI_HAPD_IFACE_HT_SCAN:
+		PR("State: %s\n", "HAPD_IFACE_DISABLED");
+		return 0;
+	case WIFI_HAPD_IFACE_DFS:
+		PR("State: %s\n", "HAPD_IFACE_DISABLED");
+		break;
+	case WIFI_HAPD_IFACE_ENABLED:
+		break;
+	default:
+		return 0;
+	}
+
+	PR("Interface Mode: %s\n", wifi_mode_txt(status.iface_mode));
+	PR("Link Mode: %s\n", wifi_link_mode_txt(status.link_mode));
+	PR("SSID: %.32s\n", status.ssid);
+	PR("BSSID: %s\n", net_sprint_ll_addr_buf(status.bssid, WIFI_MAC_ADDR_LEN, mac_string_buf,
+						 sizeof(mac_string_buf)));
+	PR("Band: %s\n", wifi_band_txt(status.band));
+	PR("Channel: %d\n", status.channel);
+	PR("Security: %s\n", wifi_security_txt(status.security));
+	PR("MFP: %s\n", wifi_mfp_txt(status.mfp));
+	if (status.iface_mode == WIFI_MODE_INFRA) {
+		PR("RSSI: %d\n", status.rssi);
+	}
+	PR("Beacon Interval: %d\n", status.beacon_interval);
+	PR("DTIM: %d\n", status.dtim_period);
+	PR("TWT: %s\n", status.twt_capable ? "Supported" : "Not supported");
+
+	return 0;
+}
+
 #if defined(CONFIG_NET_STATISTICS_WIFI) && \
 					defined(CONFIG_NET_STATISTICS_USER_API)
 static void print_wifi_stats(struct net_if *iface, struct net_stats_wifi *data,
@@ -2754,43 +2813,36 @@ static int cmd_wifi_pmksa_flush(const struct shell *sh, size_t argc, char *argv[
 	return 0;
 }
 
-SHELL_STATIC_SUBCMD_SET_CREATE(wifi_cmd_ap,
-	SHELL_CMD_ARG(disable, NULL,
-		  "Disable Access Point mode.\n",
-		  cmd_wifi_ap_disable,
-		  1, 0),
+SHELL_STATIC_SUBCMD_SET_CREATE(
+	wifi_cmd_ap,
+	SHELL_CMD_ARG(disable, NULL, "Disable Access Point mode.\n", cmd_wifi_ap_disable, 1, 0),
 	SHELL_CMD_ARG(enable, NULL,
-		  "-s --ssid=<SSID>\n"
-		  "-c --channel=<channel number>\n"
-		  "-p --passphrase=<PSK> (valid only for secure SSIDs)\n"
-		  "-k --key-mgmt=<Security type> (valid only for secure SSIDs)\n"
-		  "0:None, 1:WPA2-PSK, 2:WPA2-PSK-256, 3:SAE, 4:WAPI, 5:EAP-TLS, 6:WEP\n"
-		  "7: WPA-PSK, 11: DPP\n"
-		  "-w --ieee-80211w=<MFP> (optional: needs security type to be specified)\n"
-		  "0:Disable, 1:Optional, 2:Required\n"
-		  "-b --band=<band> (2 -2.6GHz, 5 - 5Ghz, 6 - 6GHz)\n"
-		  "-m --bssid=<BSSID>\n"
-		  "-h --help (prints help)",
-		  cmd_wifi_ap_enable,
-		  2, 13),
-	SHELL_CMD_ARG(stations, NULL,
-		  "List stations connected to the AP",
-		  cmd_wifi_ap_stations,
-		  1, 0),
+		      "-s --ssid=<SSID>\n"
+		      "-c --channel=<channel number>\n"
+		      "-p --passphrase=<PSK> (valid only for secure SSIDs)\n"
+		      "-k --key-mgmt=<Security type> (valid only for secure SSIDs)\n"
+		      "0:None, 1:WPA2-PSK, 2:WPA2-PSK-256, 3:SAE, 4:WAPI, 5:EAP-TLS, 6:WEP\n"
+		      "7: WPA-PSK, 11: DPP\n"
+		      "-w --ieee-80211w=<MFP> (optional: needs security type to be specified)\n"
+		      "0:Disable, 1:Optional, 2:Required\n"
+		      "-b --band=<band> (2 -2.6GHz, 5 - 5Ghz, 6 - 6GHz)\n"
+		      "-m --bssid=<BSSID>\n"
+		      "-h --help (prints help)",
+		      cmd_wifi_ap_enable, 2, 13),
+	SHELL_CMD_ARG(stations, NULL, "List stations connected to the AP", cmd_wifi_ap_stations, 1,
+		      0),
 	SHELL_CMD_ARG(disconnect, NULL,
-		  "Disconnect a station from the AP\n"
-		  "<MAC address of the station>\n",
-		  cmd_wifi_ap_sta_disconnect,
-		  2, 0),
+		      "Disconnect a station from the AP\n"
+		      "<MAC address of the station>\n",
+		      cmd_wifi_ap_sta_disconnect, 2, 0),
 	SHELL_CMD_ARG(config, NULL,
-		  "Configure AP parameters.\n"
-		  "-i --max_inactivity=<time duration (in seconds)>\n"
-		  "-s --max_num_sta=<maximum number of stations>\n"
-		  "-h --help (prints help)",
-		  cmd_wifi_ap_config_params,
-		  2, 5),
-	SHELL_SUBCMD_SET_END
-);
+		      "Configure AP parameters.\n"
+		      "-i --max_inactivity=<time duration (in seconds)>\n"
+		      "-s --max_num_sta=<maximum number of stations>\n"
+		      "-h --help (prints help)",
+		      cmd_wifi_ap_config_params, 2, 5),
+	SHELL_CMD_ARG(status, NULL, "Status of Wi-Fi SAP\n", cmd_wifi_ap_status, 1, 0),
+	SHELL_SUBCMD_SET_END);
 
 SHELL_STATIC_SUBCMD_SET_CREATE(wifi_twt_ops,
 	SHELL_CMD_ARG(quick_setup, NULL, " Start a TWT flow with defaults:\n"

From 32448277851d7dd4b5c50196ea92a788ac4ae95e Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Wed, 9 Oct 2024 15:16:53 +0300
Subject: [PATCH 0419/2913] [nrf fromtree] wifi: Refactor wifi-shell to allow
 external subcommands

Rework the wifi-shell code so that external subcommands can be
bolted into it easily. This means that the commands should be
created using SHELL_SUBCMD_ADD().

Place the various subcommands in alphabetical order to find them
more easily.

Split long lines in order to pass CI checks.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 32aa1d634ed9992505ea551b567cdb2e65d418b9)
(cherry picked from commit fee3f41bfb1b20000e87f973793f1972b581b8a0)
---
 subsys/net/l2/wifi/wifi_shell.c | 322 +++++++++++++++++++-------------
 1 file changed, 187 insertions(+), 135 deletions(-)

diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index 93005936f09..ac37a64a346 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -2844,6 +2844,11 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 	SHELL_CMD_ARG(status, NULL, "Status of Wi-Fi SAP\n", cmd_wifi_ap_status, 1, 0),
 	SHELL_SUBCMD_SET_END);
 
+SHELL_SUBCMD_ADD((wifi), ap, &wifi_cmd_ap,
+		 "Access Point mode commands.",
+		 NULL,
+		 0, 0);
+
 SHELL_STATIC_SUBCMD_SET_CREATE(wifi_twt_ops,
 	SHELL_CMD_ARG(quick_setup, NULL, " Start a TWT flow with defaults:\n"
 		"<twt_wake_interval: 1-262144us> <twt_interval: 1us-2^31us>.\n",
@@ -2869,6 +2874,11 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_twt_ops,
 	SHELL_SUBCMD_SET_END
 );
 
+SHELL_SUBCMD_ADD((wifi), twt, &wifi_twt_ops,
+		 "Manage TWT flows.",
+		 NULL,
+		 0, 0);
+
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	wifi_cmd_dpp,
@@ -2946,17 +2956,43 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      cmd_wifi_dpp_reconfig, 2, 0),
 	SHELL_SUBCMD_SET_END
 );
+
+SHELL_SUBCMD_ADD((wifi), dpp, &wifi_cmd_dpp,
+		 "DPP actions.",
+		 NULL,
+		 0, 0);
 #endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
-SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
-	SHELL_CMD_ARG(version, NULL, "Print Wi-Fi Driver and Firmware versions\n",
-		  cmd_wifi_version,
-		  1, 0),
-	SHELL_CMD(ap, &wifi_cmd_ap, "Access Point mode commands.\n", NULL),
-	SHELL_CMD_ARG(connect, NULL,
+SHELL_SUBCMD_SET_CREATE(wifi_commands, (wifi));
+
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_WNM
+SHELL_SUBCMD_ADD((wifi), 11v_btm_query, &wifi_commands,
+		 "<query_reason: The reason code for a BSS transition management query>.\n",
+		 cmd_wifi_btm_query,
+		 2, 0);
+#endif
+
+SHELL_SUBCMD_ADD((wifi), channel, &wifi_commands,
+		 "wifi channel setting\n"
+		 "This command is used to set the channel when\n"
+		 "monitor or TX-Injection mode is enabled\n"
+		 "Currently 20 MHz is only supported and no BW parameter is provided\n"
+		 "[-i, --if-index <idx>] : Interface index\n"
+		 "[-c, --channel <chan>] : Set a specific channel number to the lower layer\n"
+		 "[-g, --get] : Get current set channel number from the lower layer\n"
+		 "[-h, --help] : Help\n"
+		 "Usage: Get operation example for interface index 1\n"
+		 "wifi channel -g -i1\n"
+		 "Set operation example for interface index 1 (setting channel 5)\n"
+		 "wifi -i1 -c5.\n",
+		 cmd_wifi_channel,
+		 2, 4);
+
+SHELL_SUBCMD_ADD((wifi), connect, &wifi_commands,
 		  "Connect to a Wi-Fi AP\n"
 		  "<-s --ssid \"<SSID>\">: SSID.\n"
-		  "[-c --channel]: Channel that needs to be scanned for connection. 0:any channel.\n"
+		  "[-c --channel]: Channel that needs to be scanned for connection. "
+		 "0:any channel.\n"
 		  "[-b, --band] 0: any band (2:2.4GHz, 5:5GHz, 6:6GHz]\n"
 		  "[-p, --psk]: Passphrase (valid only for secure SSIDs)\n"
 		  "[-k, --key-mgmt]: Key Management type (valid only for secure SSIDs)\n"
@@ -2970,134 +3006,150 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
 		  "[-K, --key-passwd]: Private key passwd for enterprise mode.\n"
 		  "[-h, --help]: Print out the help for the connect command.\n",
 		  cmd_wifi_connect,
-		  2, 13),
-	SHELL_CMD_ARG(disconnect, NULL, "Disconnect from the Wi-Fi AP.\n",
-		  cmd_wifi_disconnect,
-		  1, 0),
-	SHELL_CMD_ARG(ps, NULL, "Configure or display Wi-Fi power save state.\n"
-		  "[on/off]\n",
-		  cmd_wifi_ps,
-		  1, 1),
-	SHELL_CMD_ARG(ps_mode,
-		      NULL,
-		      "<mode: legacy/WMM>.\n",
-		      cmd_wifi_ps_mode,
-		      2, 0),
-	SHELL_CMD_ARG(scan, NULL,
-		  "Scan for Wi-Fi APs\n"
-		    "[-t, --type <active/passive>] : Preferred mode of scan. The actual mode of scan can depend on factors such as the Wi-Fi chip implementation, regulatory domain restrictions. Default type is active\n"
-		    "[-b, --bands <Comma separated list of band values (2/5/6)>] : Bands to be scanned where 2: 2.4 GHz, 5: 5 GHz, 6: 6 GHz\n"
-		    "[-a, --dwell_time_active <val_in_ms>] : Active scan dwell time (in ms) on a channel. Range 5 ms to 1000 ms\n"
-		    "[-p, --dwell_time_passive <val_in_ms>] : Passive scan dwell time (in ms) on a channel. Range 10 ms to 1000 ms\n"
-		    "[-s, --ssid] : SSID to scan for. Can be provided multiple times\n"
-		    "[-m, --max_bss <val>] : Maximum BSSes to scan for. Range 1 - 65535\n"
-		    "[-c, --chans <Comma separated list of channel ranges>] : Channels to be scanned. The channels must be specified in the form band1:chan1,chan2_band2:chan3,..etc. band1, band2 must be valid band values and chan1, chan2, chan3 must be specified as a list of comma separated values where each value is either a single channel or a channel range specified as chan_start-chan_end. Each band channel set has to be separated by a _. For example, a valid channel specification can be 2:1,6_5:36 or 2:1,6-11,14_5:36,163-177,52. Care should be taken to ensure that configured channels don't exceed CONFIG_WIFI_MGMT_SCAN_CHAN_MAX_MANUAL\n"
-		    "[-h, --help] : Print out the help for the scan command.\n",
-		  cmd_wifi_scan,
-		  1, 8),
-	SHELL_CMD_ARG(statistics, NULL, "Wi-Fi interface statistics.\n"
-					"[reset] : Reset Wi-Fi interface statistics\n"
-					"[help] :  Print out the help for the statistics command.",
-					cmd_wifi_stats,
-					1, 1),
-	SHELL_CMD_ARG(status, NULL, "Status of the Wi-Fi interface.\n", cmd_wifi_status, 1, 0),
-	SHELL_CMD(twt, &wifi_twt_ops, "Manage TWT flows.\n", NULL),
-	SHELL_CMD_ARG(reg_domain, NULL,
-		"Set or Get Wi-Fi regulatory domain\n"
-		"[ISO/IEC 3166-1 alpha2]: Regulatory domain\n"
-		"[-f]: Force to use this regulatory hint over any other regulatory hints\n"
-		"Note: This may cause regulatory compliance issues, use it at your own risk.\n",
-		cmd_wifi_reg_domain,
-		1, 2),
-	SHELL_CMD_ARG(mode, NULL, "mode operational setting\n"
-		"This command may be used to set the Wi-Fi device into a specific mode of operation\n"
-		"[-i, --if-index <idx>] : Interface index\n"
-		"[-s, --sta] : Station mode\n"
-		"[-m, --monitor] : Monitor mode\n"
-		"[-a, --ap] : AP mode\n"
-		"[-k, --softap] : Softap mode\n"
-		"[-h, --help] : Help\n"
-		"[-g, --get] : Get current mode for a specific interface index\n"
-		"Usage: Get operation example for interface index 1\n"
-		"wifi mode -g -i1\n"
-		"Set operation example for interface index 1 - set station+promiscuous\n"
-		"wifi mode -i1 -sp.\n",
-		cmd_wifi_mode,
-		1, 9),
-	SHELL_CMD_ARG(packet_filter, NULL, "mode filter setting\n"
-		"This command is used to set packet filter setting when\n"
-		"monitor, TX-Injection and promiscuous mode is enabled\n"
-		"The different packet filter modes are control, management, data and enable all filters\n"
-		"[-i, --if-index <idx>] : Interface index\n"
-		"[-a, --all] : Enable all packet filter modes\n"
-		"[-m, --mgmt] : Enable management packets to allowed up the stack\n"
-		"[-c, --ctrl] : Enable control packets to be allowed up the stack\n"
-		"[-d, --data] : Enable Data packets to be allowed up the stack\n"
-		"[-g, --get] : Get current filter settings for a specific interface index\n"
-		"[-b, --capture-len <len>] : Capture length buffer size for each packet to be captured\n"
-		"[-h, --help] : Help\n"
-		"Usage: Get operation example for interface index 1\n"
-		"wifi packet_filter -g -i1\n"
-		"Set operation example for interface index 1 - set data+management frame filter\n"
-		"wifi packet_filter -i1 -md.\n",
-		cmd_wifi_packet_filter,
-		2, 8),
-	SHELL_CMD_ARG(channel, NULL, "wifi channel setting\n"
-		"This command is used to set the channel when\n"
-		"monitor or TX-Injection mode is enabled\n"
-		"Currently 20 MHz is only supported and no BW parameter is provided\n"
-		"[-i, --if-index <idx>] : Interface index\n"
-		"[-c, --channel <chan>] : Set a specific channel number to the lower layer\n"
-		"[-g, --get] : Get current set channel number from the lower layer\n"
-		"[-h, --help] : Help\n"
-		"Usage: Get operation example for interface index 1\n"
-		"wifi channel -g -i1\n"
-		"Set operation example for interface index 1 (setting channel 5)\n"
-		"wifi -i1 -c5.\n",
-		cmd_wifi_channel,
-		2, 4),
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_WNM
-	SHELL_CMD_ARG(11v_btm_query,
-		NULL,
-		"<query_reason: The reason code for a BSS transition management query>.\n",
-		cmd_wifi_btm_query,
-		2, 0),
-#endif
-	SHELL_CMD_ARG(wps_pbc, NULL,
-		"Start a WPS PBC connection.\n",
-		cmd_wifi_wps_pbc, 1, 0),
-	SHELL_CMD_ARG(wps_pin, NULL,
-		"Set and get WPS pin.\n"
-		"[pin] Only applicable for set.\n",
-		cmd_wifi_wps_pin, 1, 1),
-	SHELL_CMD_ARG(ps_timeout,
-		      NULL,
-		      "<val> - PS inactivity timer(in ms).\n",
-		      cmd_wifi_ps_timeout,
-		      2, 0),
-	SHELL_CMD_ARG(ps_listen_interval,
-		      NULL,
-		      "<val> - Listen interval in the range of <0-65535>.\n",
-		      cmd_wifi_listen_interval,
-		      2, 0),
-	SHELL_CMD_ARG(ps_wakeup_mode,
-		      NULL,
-		      "<wakeup_mode: DTIM/Listen Interval>.\n",
-		      cmd_wifi_ps_wakeup_mode,
-		      2, 0),
-	SHELL_CMD_ARG(rts_threshold,
-		      NULL,
-		      "<rts_threshold: rts threshold/off>.\n",
-		      cmd_wifi_set_rts_threshold,
-		      1, 1),
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
-	SHELL_CMD(dpp, &wifi_cmd_dpp, "DPP actions\n", NULL),
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
-	SHELL_CMD_ARG(pmksa_flush, NULL,
-		     "Flush PMKSA cache entries.\n",
-		     cmd_wifi_pmksa_flush, 1, 0),
-	SHELL_SUBCMD_SET_END
-);
+		 2, 13);
+
+SHELL_SUBCMD_ADD((wifi), disconnect, &wifi_commands,
+		 "Disconnect from the Wi-Fi AP.\n",
+		 cmd_wifi_disconnect,
+		 1, 0);
+
+SHELL_SUBCMD_ADD((wifi), mode, &wifi_commands,
+		 "mode operational setting\n"
+		 "This command may be used to set the Wi-Fi device into a specific "
+		 "mode of operation\n"
+		 "[-i, --if-index <idx>] : Interface index\n"
+		 "[-s, --sta] : Station mode\n"
+		 "[-m, --monitor] : Monitor mode\n"
+		 "[-a, --ap] : AP mode\n"
+		 "[-k, --softap] : Softap mode\n"
+		 "[-h, --help] : Help\n"
+		 "[-g, --get] : Get current mode for a specific interface index\n"
+		 "Usage: Get operation example for interface index 1\n"
+		 "wifi mode -g -i1\n"
+		 "Set operation example for interface index 1 - set station+promiscuous\n"
+		 "wifi mode -i1 -sp.\n",
+		 cmd_wifi_mode,
+		 1, 9);
+
+SHELL_SUBCMD_ADD((wifi), packet_filter, &wifi_commands,
+		 "mode filter setting\n"
+		 "This command is used to set packet filter setting when\n"
+		 "monitor, TX-Injection and promiscuous mode is enabled\n"
+		 "The different packet filter modes are control, management, "
+		 "data and enable all filters\n"
+		 "[-i, --if-index <idx>] : Interface index\n"
+		 "[-a, --all] : Enable all packet filter modes\n"
+		 "[-m, --mgmt] : Enable management packets to allowed up the stack\n"
+		 "[-c, --ctrl] : Enable control packets to be allowed up the stack\n"
+		 "[-d, --data] : Enable Data packets to be allowed up the stack\n"
+		 "[-g, --get] : Get current filter settings for a specific interface index\n"
+		 "[-b, --capture-len <len>] : Capture length buffer size for each packet "
+		 "to be captured\n"
+		 "[-h, --help] : Help\n"
+		 "Usage: Get operation example for interface index 1\n"
+		 "wifi packet_filter -g -i1\n"
+		 "Set operation example for interface index 1 - set data+management frame filter\n"
+		 "wifi packet_filter -i1 -md.\n",
+		 cmd_wifi_packet_filter,
+		 2, 8);
+
+SHELL_SUBCMD_ADD((wifi), pmksa_flush, &wifi_commands,
+		 "Flush PMKSA cache entries.\n",
+		 cmd_wifi_pmksa_flush,
+		 1, 0);
+
+SHELL_SUBCMD_ADD((wifi), ps, &wifi_commands,
+		 "Configure or display Wi-Fi power save state.\n[on/off]\n",
+		 cmd_wifi_ps,
+		 1, 1);
+
+SHELL_SUBCMD_ADD((wifi), ps_listen_interval, &wifi_commands,
+		 "<val> - Listen interval in the range of <0-65535>.\n",
+		 cmd_wifi_listen_interval,
+		 2, 0);
+
+SHELL_SUBCMD_ADD((wifi), ps_mode, &wifi_commands,
+		 "<mode: legacy/WMM>.\n",
+		 cmd_wifi_ps_mode,
+		 2, 0);
+
+SHELL_SUBCMD_ADD((wifi), ps_timeout, &wifi_commands,
+		 "<val> - PS inactivity timer(in ms).\n",
+		 cmd_wifi_ps_timeout,
+		 2, 0);
+
+SHELL_SUBCMD_ADD((wifi), ps_wakeup_mode, &wifi_commands,
+		 "<wakeup_mode: DTIM/Listen Interval>.\n",
+		 cmd_wifi_ps_wakeup_mode,
+		 2, 0);
+
+SHELL_SUBCMD_ADD((wifi), reg_domain, &wifi_commands,
+		 "Set or Get Wi-Fi regulatory domain\n"
+		 "[ISO/IEC 3166-1 alpha2]: Regulatory domain\n"
+		 "[-f]: Force to use this regulatory hint over any other regulatory hints\n"
+		 "Note: This may cause regulatory compliance issues, use it at your own risk.\n",
+		 cmd_wifi_reg_domain,
+		 1, 2);
+
+SHELL_SUBCMD_ADD((wifi), rts_threshold, &wifi_commands,
+		 "<rts_threshold: rts threshold/off>.\n",
+		 cmd_wifi_set_rts_threshold,
+		 1, 1);
+
+SHELL_SUBCMD_ADD((wifi), scan, &wifi_commands,
+		 "Scan for Wi-Fi APs\n"
+		 "[-t, --type <active/passive>] : Preferred mode of scan. "
+		 "The actual mode of scan can depend on factors such as the Wi-Fi chip "
+		 "implementation, regulatory domain restrictions. Default type is active\n"
+		 "[-b, --bands <Comma separated list of band values (2/5/6)>] : "
+		 "Bands to be scanned where 2: 2.4 GHz, 5: 5 GHz, 6: 6 GHz\n"
+		 "[-a, --dwell_time_active <val_in_ms>] : "
+		 "Active scan dwell time (in ms) on a channel. Range 5 ms to 1000 ms\n"
+		 "[-p, --dwell_time_passive <val_in_ms>] : "
+		 "Passive scan dwell time (in ms) on a channel. Range 10 ms to 1000 ms\n"
+		 "[-s, --ssid] : SSID to scan for. Can be provided multiple times\n"
+		 "[-m, --max_bss <val>] : Maximum BSSes to scan for. Range 1 - 65535\n"
+		 "[-c, --chans <Comma separated list of channel ranges>] : "
+		 "Channels to be scanned. The channels must be specified in the form "
+		 "band1:chan1,chan2_band2:chan3,..etc. band1, band2 must be valid band "
+		 "values and chan1, chan2, chan3 must be specified as a list of comma "
+		 "separated values where each value is either a single channel or a "
+		 "channel range specified as chan_start-chan_end. Each band channel "
+		 "set has to be separated by a _. For example, a valid channel "
+		 "specification can be 2:1,6_5:36 or 2:1,6-11,14_5:36,163-177,52. "
+		 "Care should be taken to ensure that configured channels don't exceed "
+		 "CONFIG_WIFI_MGMT_SCAN_CHAN_MAX_MANUAL\n"
+		 "[-h, --help] : Print out the help for the scan command.\n",
+		 cmd_wifi_scan,
+		 1, 8);
+
+SHELL_SUBCMD_ADD((wifi), statistics, &wifi_commands,
+		 "Wi-Fi interface statistics.\n"
+		 "[reset] : Reset Wi-Fi interface statistics\n"
+		 "[help] :  Print out the help for the statistics command.",
+		 cmd_wifi_stats,
+		 1, 1);
+
+SHELL_SUBCMD_ADD((wifi), status, &wifi_commands,
+		 "Status of the Wi-Fi interface.\n",
+		 cmd_wifi_status,
+		 1, 0);
+
+SHELL_SUBCMD_ADD((wifi), version, &wifi_commands,
+		 "Print Wi-Fi Driver and Firmware versions\n",
+		 cmd_wifi_version,
+		 1, 0);
+
+SHELL_SUBCMD_ADD((wifi), wps_pbc, &wifi_commands,
+		 "Start a WPS PBC connection.\n",
+		 cmd_wifi_wps_pbc,
+		 1, 0);
+
+SHELL_SUBCMD_ADD((wifi), wps_pin, &wifi_commands,
+		 "Set and get WPS pin.\n"
+		 "[pin] Only applicable for set.\n",
+		 cmd_wifi_wps_pin,
+		 1, 1);
 
 SHELL_SUBCMD_ADD((wifi), ps_exit_strategy, &wifi_commands,
 		 "<tim> : Set PS exit strategy to Every TIM\n"

From 6d75db5444ac20d079a781281ed680912a42c99b Mon Sep 17 00:00:00 2001
From: Rex Chen <rex.chen_1@nxp.com>
Date: Tue, 24 Sep 2024 17:15:56 +0900
Subject: [PATCH 0420/2913] [nrf fromtree] net: wifi: shell: add enterprise
 support for station

Add EAP-TLS, EAP-PEAP-MSCHAPv2, EAP-PEAP-GTC, EAP-TTLS-MSCHAPv2,
EAP-PEAP-TLS, EAP-TLS-SHA256  enterprise wpa2 and wpa3 suiteb
support for station.

Signed-off-by: Rex Chen <rex.chen_1@nxp.com>
(cherry picked from commit be151908d88e859e5155c9aec0bbf2f26dd57fc8)
(cherry picked from commit db077ba30de0f1af065dd29ee5337584c9ae8a5b)
---
 doc/connectivity/networking/api/wifi.rst  |   9 +-
 include/zephyr/net/wifi.h                 |  95 ++++++++++
 include/zephyr/net/wifi_mgmt.h            |  36 +++-
 modules/hostap/CMakeLists.txt             |   9 +
 modules/hostap/Kconfig                    |   6 +
 modules/hostap/src/supp_api.c             | 221 +++++++++++++++++++++-
 modules/hostap/src/supp_main.h            |   3 +-
 samples/net/wifi/boards/rd_rw612_bga.conf |   1 +
 subsys/net/l2/wifi/CMakeLists.txt         |  18 ++
 subsys/net/l2/wifi/wifi_shell.c           | 115 ++++++++++-
 10 files changed, 488 insertions(+), 25 deletions(-)

diff --git a/doc/connectivity/networking/api/wifi.rst b/doc/connectivity/networking/api/wifi.rst
index 84c407cd4a8..1499f1c75ab 100644
--- a/doc/connectivity/networking/api/wifi.rst
+++ b/doc/connectivity/networking/api/wifi.rst
@@ -38,6 +38,9 @@ module.
     $ cp client.pem samples/net/wifi/test_certs/
     $ cp client-key.pem samples/net/wifi/test_certs/
     $ cp ca.pem samples/net/wifi/test_certs/
+    $ cp client2.pem samples/net/wifi/test_certs/
+    $ cp client-key2.pem samples/net/wifi/test_certs/
+    $ cp ca2.pem samples/net/wifi/test_certs/
     $ west build -p -b <board> samples/net/wifi -- -DEXTRA_CONF_FILE=overlay-enterprise.conf
 
 For using variable size network buffer, the following overlay file can be used:
@@ -52,15 +55,11 @@ To initiate Wi-Fi connection, the following command can be used:
 
 .. code-block:: console
 
-    uart:~$ wifi connect -s <SSID> -k 7 -a anon -K whatever
+    uart:~$ wifi connect -s <SSID> -c 149 -k 17 -w 2 -a client1 --key1-pwd whatever --key2-pwd whatever --eap-id1 id1 --eap-pwd1 pwd1
 
 Server certificate is also provided in the same directory for testing purposes.
 Any AAA server can be used for testing purposes, for example, ``FreeRADIUS`` or ``hostapd``.
 
-.. important::
-
-    The passphrase for the :file:`client-key.pem`` and the :file:`server-key.pem` is ``whatever``.
-
 .. note::
 
     The certificates are for testing purposes only and should not be used in production.
diff --git a/include/zephyr/net/wifi.h b/include/zephyr/net/wifi.h
index 4612fe2b0b1..36a62f02cad 100644
--- a/include/zephyr/net/wifi.h
+++ b/include/zephyr/net/wifi.h
@@ -68,6 +68,16 @@ enum wifi_security_type {
 	WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL,
 	/** DPP security */
 	WIFI_SECURITY_TYPE_DPP,
+	/** EAP PEAP MSCHAPV2 security - Enterprise. */
+	WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2,
+	/** EAP PEAP GTC security - Enterprise. */
+	WIFI_SECURITY_TYPE_EAP_PEAP_GTC,
+	/** EAP TTLS MSCHAPV2 security - Enterprise. */
+	WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2,
+	/** EAP PEAP security - Enterprise. */
+	WIFI_SECURITY_TYPE_EAP_PEAP_TLS,
+	/** EAP TLS SHA256 security - Enterprise. */
+	WIFI_SECURITY_TYPE_EAP_TLS_SHA256,
 
 	/** @cond INTERNAL_HIDDEN */
 	__WIFI_SECURITY_TYPE_AFTER_LAST,
@@ -76,6 +86,91 @@ enum wifi_security_type {
 	/** @endcond */
 };
 
+/** @brief EPA method Types. */
+enum wifi_eap_type {
+	/** No EPA  security. */
+	WIFI_EAP_TYPE_NONE = 0,
+	/** EPA GTC security, refer to rfc3748 chapter 5. */
+	WIFI_EAP_TYPE_GTC = 6,
+	/** EPA TLS security, refer to rfc5216. */
+	WIFI_EAP_TYPE_TLS = 13,
+	/** EPA TTLS security, refer to rfc5281. */
+	WIFI_EAP_TYPE_TTLS = 21,
+	/** EPA PEAP security, refer to draft-josefsson-pppext-eap-tls-eap-06.txt. */
+	WIFI_EAP_TYPE_PEAP = 25,
+	/** EPA MSCHAPV2 security, refer to draft-kamath-pppext-eap-mschapv2-00.txt. */
+	WIFI_EAP_TYPE_MSCHAPV2 = 26,
+};
+
+/** @brief Enterprise security WPA3 suiteb types. */
+enum wifi_suiteb_type {
+	/** suiteb. */
+	WIFI_SUITEB = 1,
+	/** suiteb-192. */
+	WIFI_SUITEB_192,
+};
+
+/** @brief Group cipher and pairwise cipher types. */
+enum wifi_cipher_type {
+	/** AES in counter mode with CBC-MAC (CCMP-128). */
+	WPA_CAPA_ENC_CCMP,
+	/** 128-bit Galois/Counter Mode Protocol. */
+	WPA_CAPA_ENC_GCMP,
+	/** 256-bit Galois/Counter Mode Protocol. */
+	WPA_CAPA_ENC_GCMP_256,
+};
+
+/** @brief group mgmt cipher types. */
+enum wifi_group_mgmt_cipher_type {
+	/** 128-bit Broadcast/Multicast Integrity Protocol
+	 * Cipher-based Message Authentication Code .
+	 */
+	WPA_CAPA_ENC_BIP,
+	/** 128-bit Broadcast/Multicast Integrity Protocol
+	 * Galois Message Authentication Code .
+	 */
+	WPA_CAPA_ENC_BIP_GMAC_128,
+	/** 256-bit Broadcast/Multicast Integrity Protocol
+	 * Galois Message Authentication Code .
+	 */
+	WPA_CAPA_ENC_BIP_GMAC_256,
+};
+
+struct wifi_cipher_desc {
+	/** Cipher capability. */
+	unsigned int capa;
+	/** Cipher name string. */
+	char *name;
+};
+
+struct wifi_eap_cipher_config {
+	/** Key management type string. */
+	char *key_mgmt;
+	/** OpenSSL cipher string. */
+	char *openssl_ciphers;
+	/** Group cipher cipher string. */
+	char *group_cipher;
+	/** Pairwise_cipher cipher string. */
+	char *pairwise_cipher;
+	/** Group management cipher string. */
+	char *group_mgmt_cipher;
+	/** Used to confiure TLS features. */
+	char *tls_flags;
+};
+
+struct wifi_eap_config {
+	/**  Security type. */
+	unsigned int type;
+	/** EPA method type of phase1. */
+	enum wifi_eap_type eap_type_phase1;
+	/** EPA method type of phase2. */
+	enum wifi_eap_type eap_type_phase2;
+	/** EPA method string. */
+	char *method;
+	/** Phase2 setting string. */
+	char *phase2;
+};
+
 /** Helper function to get user-friendly security type name. */
 const char *wifi_security_txt(enum wifi_security_type security);
 
diff --git a/include/zephyr/net/wifi_mgmt.h b/include/zephyr/net/wifi_mgmt.h
index c0c9643602a..c67cab30a0e 100644
--- a/include/zephyr/net/wifi_mgmt.h
+++ b/include/zephyr/net/wifi_mgmt.h
@@ -466,12 +466,28 @@ struct wifi_connect_req_params {
 	int timeout;
 	/** anonymous identity */
 	const uint8_t *anon_id;
-	/** anon_id length */
-	uint8_t aid_length; /* Max 64 */
+	/** anon_id length, max 64 */
+	uint8_t aid_length;
 	/** Private key passwd for enterprise mode */
 	const uint8_t *key_passwd;
-	/** Private key passwd length */
-	uint8_t key_passwd_length; /* Max 128 */
+	/** Private key passwd length, max 128 */
+	uint8_t key_passwd_length;
+	/** private key2 passwd */
+	const uint8_t *key2_passwd;
+	/** key2 passwd length, max 128 */
+	uint8_t key2_passwd_length;
+	/** suiteb or suiteb-192 */
+	uint8_t suiteb_type;
+	/** eap version */
+	uint8_t eap_ver;
+	/** Identity for EAP */
+	const uint8_t *eap_identity;
+	/** eap identity length, max 64 */
+	uint8_t eap_id_length;
+	/** Password string for EAP. */
+	const uint8_t *eap_password;
+	/** eap passwd length, max 128 */
+	uint8_t eap_passwd_length;
 };
 
 /** @brief Wi-Fi connect result codes. To be overlaid on top of \ref wifi_status
@@ -711,6 +727,18 @@ struct wifi_enterprise_creds_params {
 	uint8_t *client_key;
 	/** Client key length */
 	uint32_t client_key_len;
+	/** CA certification of phase2*/
+	uint8_t *ca_cert2;
+	/** Phase2 CA certification length */
+	uint32_t ca_cert2_len;
+	/** Client certification of phase2*/
+	uint8_t *client_cert2;
+	/** Phase2 Client certification length */
+	uint32_t client_cert2_len;
+	/** Client key of phase2*/
+	uint8_t *client_key2;
+	/** Phase2 Client key length */
+	uint32_t client_key2_len;
 };
 
 /** @brief Wi-Fi power save configuration */
diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index 8eeaa5879a2..98345fb4c24 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -46,6 +46,7 @@ zephyr_library_compile_definitions(
 	CONFIG_SHA512
 	CONFIG_CTRL_IFACE_ZEPHYR
 	CONFIG_SUITEB192
+	CONFIG_SUITEB
 )
 
 
@@ -365,6 +366,14 @@ zephyr_library_compile_definitions_ifdef(CONFIG_EAP_MD5
         EAP_MD5
 )
 
+zephyr_library_sources_ifdef(CONFIG_EAP_GTC
+	${HOSTAP_SRC_BASE}/eap_peer/eap_gtc.c
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_GTC
+        EAP_GTC
+)
+
 zephyr_library_sources_ifdef(CONFIG_EAP_MSCHAPV2
 	${HOSTAP_SRC_BASE}/eap_peer/eap_mschapv2.c
 	${HOSTAP_SRC_BASE}/eap_peer/mschapv2.c
diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index 01574cfc60c..09a43d7d07e 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -190,6 +190,9 @@ config EAP_PEAP
 config EAP_MD5
 	bool "EAP-MD5 support"
 
+config EAP_GTC
+	bool "EAP-GTC support"
+
 config EAP_MSCHAPV2
 	bool "EAP-MSCHAPv2 support"
 
@@ -466,6 +469,9 @@ config SHA512
 config SUITEB192
 	bool
 
+config SUITEB
+	bool
+
 config WEP
 	bool
 	default y if WIFI_NM_WPA_SUPPLICANT_WEP
diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index e62fbfca0be..24561086f38 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -438,6 +438,100 @@ static int wpas_config_process_blob(struct wpa_config *config, char *name, uint8
 
 	return 0;
 }
+
+static const struct wifi_cipher_desc ciphers[] = {
+	{WPA_CAPA_ENC_GCMP_256, "GCMP-256"},
+	{WPA_CAPA_ENC_CCMP, "CCMP"},
+	{WPA_CAPA_ENC_GCMP, "GCMP"},
+};
+
+static const struct wifi_cipher_desc ciphers_group_mgmt[] = {
+	{WPA_CAPA_ENC_BIP, "AES-128-CMAC"},
+	{WPA_CAPA_ENC_BIP_GMAC_128, "BIP-GMAC-128"},
+	{WPA_CAPA_ENC_BIP_GMAC_256, "BIP-GMAC-256"},
+};
+
+static struct wifi_eap_config eap_config[] = {
+	{WIFI_SECURITY_TYPE_EAP_TLS, WIFI_EAP_TYPE_TLS, WIFI_EAP_TYPE_NONE, "TLS", NULL},
+	{WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2, WIFI_EAP_TYPE_PEAP, WIFI_EAP_TYPE_MSCHAPV2, "PEAP",
+	 "auth=MSCHAPV2"},
+	{WIFI_SECURITY_TYPE_EAP_PEAP_GTC, WIFI_EAP_TYPE_PEAP, WIFI_EAP_TYPE_GTC, "PEAP",
+	 "auth=GTC"},
+	{WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2, WIFI_EAP_TYPE_TTLS, WIFI_EAP_TYPE_NONE, "TTLS",
+	 "auth=MSCHAPV2"},
+	{WIFI_SECURITY_TYPE_EAP_PEAP_TLS, WIFI_EAP_TYPE_PEAP, WIFI_EAP_TYPE_TLS, "PEAP",
+	 "auth=TLS"},
+	{WIFI_SECURITY_TYPE_EAP_TLS_SHA256, WIFI_EAP_TYPE_TLS, WIFI_EAP_TYPE_NONE, "TLS", NULL},
+};
+
+int process_cipher_config(struct wifi_connect_req_params *params,
+			  struct wifi_eap_cipher_config *cipher_config)
+{
+	unsigned int cipher_capa;
+	unsigned int gropu_mgmt_cipher_capa;
+	unsigned int index;
+
+	if (params->suiteb_type == WIFI_SUITEB) {
+		cipher_capa = WPA_CAPA_ENC_GCMP;
+		gropu_mgmt_cipher_capa = WPA_CAPA_ENC_BIP_GMAC_128;
+		cipher_config->key_mgmt = "WPA-EAP-SUITE-B";
+		cipher_config->openssl_ciphers = "SUITEB128";
+		cipher_config->tls_flags = "[SUITEB]";
+	} else if (params->suiteb_type == WIFI_SUITEB_192) {
+		cipher_capa = WPA_CAPA_ENC_GCMP_256;
+		gropu_mgmt_cipher_capa = WPA_CAPA_ENC_BIP_GMAC_256;
+		cipher_config->key_mgmt = "WPA-EAP-SUITE-B-192";
+		cipher_config->openssl_ciphers = "SUITEB192";
+		cipher_config->tls_flags = "[SUITEB]";
+	} else {
+		cipher_capa = WPA_CAPA_ENC_CCMP;
+		gropu_mgmt_cipher_capa = WPA_CAPA_ENC_BIP;
+		cipher_config->key_mgmt = "WPA-EAP";
+	}
+
+	if (params->security == WIFI_SECURITY_TYPE_EAP_TLS_SHA256) {
+		cipher_config->key_mgmt = "WPA-EAP-SHA256";
+	}
+
+	for (index = 0; index < ARRAY_SIZE(ciphers); index++) {
+		if (cipher_capa == ciphers[index].capa) {
+			cipher_config->group_cipher = ciphers[index].name;
+			cipher_config->pairwise_cipher = ciphers[index].name;
+			break;
+		}
+	}
+
+	if (index == ARRAY_SIZE(ciphers)) {
+		wpa_printf(MSG_ERROR, "Get ciphers error");
+		goto out;
+	}
+
+	for (index = 0; index < ARRAY_SIZE(ciphers_group_mgmt); index++) {
+		if (gropu_mgmt_cipher_capa == ciphers_group_mgmt[index].capa) {
+			cipher_config->group_mgmt_cipher = ciphers_group_mgmt[index].name;
+			break;
+		}
+	}
+
+	if (index == ARRAY_SIZE(ciphers_group_mgmt)) {
+		wpa_printf(MSG_ERROR, "Get group mgmt ciphers error");
+		goto out;
+	}
+
+	return 0;
+out:
+	return -EINVAL;
+}
+
+static int is_eap_valid_security(int security)
+{
+	return (security == WIFI_SECURITY_TYPE_EAP_TLS ||
+		    security == WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2 ||
+		    security == WIFI_SECURITY_TYPE_EAP_PEAP_GTC ||
+		    security == WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2 ||
+		    security == WIFI_SECURITY_TYPE_EAP_PEAP_TLS ||
+		    security == WIFI_SECURITY_TYPE_EAP_TLS_SHA256);
+}
 #endif
 
 static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
@@ -451,6 +545,14 @@ static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
 	uint8_t ssid_null_terminated[WIFI_SSID_MAX_LEN + 1];
 	uint8_t psk_null_terminated[WIFI_PSK_MAX_LEN + 1];
 	uint8_t sae_null_terminated[WIFI_SAE_PSWD_MAX_LEN + 1];
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+	struct wifi_eap_cipher_config cipher_config = {NULL,   "DEFAULT:!EXP:!LOW", "CCMP",
+						       "CCMP", "AES-128-CMAC",      NULL};
+	char *method;
+	char phase1[128] = {0};
+	char *phase2 = NULL;
+	unsigned int index;
+#endif
 
 	if (!wpa_cli_cmd_v("remove_network all")) {
 		goto out;
@@ -634,9 +736,47 @@ static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
 				goto out;
 			}
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
-		} else if (params->security == WIFI_SECURITY_TYPE_EAP_TLS) {
-			if (!wpa_cli_cmd_v("set_network %d key_mgmt WPA-EAP",
-					   resp.network_id)) {
+		} else if (is_eap_valid_security(params->security)) {
+			if (process_cipher_config(params, &cipher_config)) {
+				goto out;
+			}
+
+			for (index = 0; index < ARRAY_SIZE(eap_config); index++) {
+				if (params->security == eap_config[index].type) {
+					method = eap_config[index].method;
+					phase2 = eap_config[index].phase2;
+					break;
+				}
+			}
+
+			if (index == ARRAY_SIZE(eap_config)) {
+				wpa_printf(MSG_ERROR, "Get eap method error with security type: %d",
+					   params->security);
+				goto out;
+			}
+
+			if (!wpa_cli_cmd_v("set_network %d key_mgmt %s", resp.network_id,
+					   cipher_config.key_mgmt)) {
+				goto out;
+			}
+
+			if (!wpa_cli_cmd_v("set openssl_ciphers \"%s\"",
+					   cipher_config.openssl_ciphers)) {
+				goto out;
+			}
+
+			if (!wpa_cli_cmd_v("set_network %d group %s", resp.network_id,
+					   cipher_config.group_cipher)) {
+				goto out;
+			}
+
+			if (!wpa_cli_cmd_v("set_network %d pairwise %s", resp.network_id,
+					   cipher_config.pairwise_cipher)) {
+				goto out;
+			}
+
+			if (!wpa_cli_cmd_v("set_network %d group_mgmt %s", resp.network_id,
+					   cipher_config.group_mgmt_cipher)) {
 				goto out;
 			}
 
@@ -645,11 +785,44 @@ static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
 				goto out;
 			}
 
-			if (!wpa_cli_cmd_v("set_network %d eap TLS",
-					   resp.network_id)) {
+			if (!wpa_cli_cmd_v("set_network %d eap %s", resp.network_id, method)) {
 				goto out;
 			}
 
+			if (params->security == WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2 ||
+			    params->security == WIFI_SECURITY_TYPE_EAP_PEAP_GTC ||
+			    params->security == WIFI_SECURITY_TYPE_EAP_PEAP_TLS) {
+				snprintk(phase1, sizeof(phase1),
+					 "peapver=%d peaplabel=0 crypto_binding=0",
+					 params->eap_ver);
+
+				if (!wpa_cli_cmd_v("set_network %d phase1 \"%s\"", resp.network_id,
+						   &phase1[0])) {
+					goto out;
+				}
+			}
+
+			if (phase2 != NULL) {
+				if (!wpa_cli_cmd_v("set_network %d phase2 \"%s\"", resp.network_id,
+						   phase2)) {
+					goto out;
+				}
+			}
+
+			if (params->eap_id_length > 0) {
+				if (!wpa_cli_cmd_v("set_network %d identity \"%s\"",
+						   resp.network_id, params->eap_identity)) {
+					goto out;
+				}
+			}
+
+			if (params->eap_passwd_length > 0) {
+				if (!wpa_cli_cmd_v("set_network %d password \"%s\"",
+						   resp.network_id, params->eap_password)) {
+					goto out;
+				}
+			}
+
 			if (!wpa_cli_cmd_v("set_network %d anonymous_identity \"%s\"",
 					   resp.network_id, params->anon_id)) {
 				goto out;
@@ -692,6 +865,44 @@ static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
 					   resp.network_id, params->key_passwd)) {
 				goto out;
 			}
+
+			if (wpas_config_process_blob(wpa_s->conf, "ca_cert2",
+						     enterprise_creds.ca_cert2,
+						     enterprise_creds.ca_cert2_len)) {
+				goto out;
+			}
+
+			if (!wpa_cli_cmd_v("set_network %d ca_cert2 \"blob://ca_cert2\"",
+					   resp.network_id)) {
+				goto out;
+			}
+
+			if (wpas_config_process_blob(wpa_s->conf, "client_cert2",
+						     enterprise_creds.client_cert2,
+						     enterprise_creds.client_cert2_len)) {
+				goto out;
+			}
+
+			if (!wpa_cli_cmd_v("set_network %d client_cert2 \"blob://client_cert2\"",
+					   resp.network_id)) {
+				goto out;
+			}
+
+			if (wpas_config_process_blob(wpa_s->conf, "private_key2",
+						     enterprise_creds.client_key2,
+						     enterprise_creds.client_key2_len)) {
+				goto out;
+			}
+
+			if (!wpa_cli_cmd_v("set_network %d private_key2 \"blob://private_key2\"",
+					   resp.network_id)) {
+				goto out;
+			}
+
+			if (!wpa_cli_cmd_v("set_network %d private_key2_passwd \"%s\"",
+					   resp.network_id, params->key2_passwd)) {
+				goto out;
+			}
 #endif
 		} else {
 			ret = -1;
diff --git a/modules/hostap/src/supp_main.h b/modules/hostap/src/supp_main.h
index 7137d281929..e80ced03431 100644
--- a/modules/hostap/src/supp_main.h
+++ b/modules/hostap/src/supp_main.h
@@ -15,7 +15,7 @@
 	!defined(CONFIG_EAP_PSK) && !defined(CONFIG_EAP_PAX) && \
 	!defined(CONFIG_EAP_SAKE) && !defined(CONFIG_EAP_GPSK) && \
 	!defined(CONFIG_EAP_PWD) && !defined(CONFIG_EAP_EKE) && \
-	!defined(CONFIG_EAP_IKEV2)
+	!defined(CONFIG_EAP_IKEV2 && !defined(CONFIG_EAP_GTC)
 #error "At least one of the following EAP methods need to be defined    \
 	CONFIG_EAP_TLS    \
 	CONFIG_EAP_TTLS   \
@@ -32,6 +32,7 @@
 	CONFIG_EAP_IKEV2   \
 	CONFIG_EAP_SIM   \
 	CONFIG_EAP_AKA   \
+	CONFIG_EAP_GTC   \
 	CONFIG_EAP_ALL "
 #endif /* EAP METHODS */
 #endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
diff --git a/samples/net/wifi/boards/rd_rw612_bga.conf b/samples/net/wifi/boards/rd_rw612_bga.conf
index a916ff131ad..d6435e874b7 100644
--- a/samples/net/wifi/boards/rd_rw612_bga.conf
+++ b/samples/net/wifi/boards/rd_rw612_bga.conf
@@ -28,6 +28,7 @@ CONFIG_ZVFS_OPEN_MAX=30
 CONFIG_SHELL_ARGC_MAX=48
 CONFIG_WIFI_SHELL_MAX_AP_STA=8
 CONFIG_WIFI_MGMT_AP_MAX_NUM_STA=8
+CONFIG_SHELL_CMD_BUFF_SIZE=512
 
 # net
 CONFIG_NET_L2_ETHERNET=y
diff --git a/subsys/net/l2/wifi/CMakeLists.txt b/subsys/net/l2/wifi/CMakeLists.txt
index 9f190dda307..eb22a54cf77 100644
--- a/subsys/net/l2/wifi/CMakeLists.txt
+++ b/subsys/net/l2/wifi/CMakeLists.txt
@@ -49,3 +49,21 @@ generate_inc_file_for_target(
     ${ZEPHYR_BASE}/samples/net/wifi/test_certs/ca.pem
     ${gen_dir}/ca.pem.inc
     )
+
+generate_inc_file_for_target(
+    app
+    ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client2.pem
+    ${gen_dir}/client2.pem.inc
+    )
+
+generate_inc_file_for_target(
+    app
+    ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client-key2.pem
+    ${gen_dir}/client-key2.pem.inc
+    )
+
+generate_inc_file_for_target(
+    app
+    ${ZEPHYR_BASE}/samples/net/wifi/test_certs/ca2.pem
+    ${gen_dir}/ca2.pem.inc
+    )
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index ac37a64a346..d422abb5024 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -44,6 +44,18 @@ static const char client_key_test[] = {
 	#include <wifi_enterprise_test_certs/client-key.pem.inc>
 	'\0'
 };
+
+static const char ca_cert2_test[] = {
+	#include <wifi_enterprise_test_certs/ca2.pem.inc>
+	'\0'};
+
+static const char client_cert2_test[] = {
+	#include <wifi_enterprise_test_certs/client2.pem.inc>
+	'\0'};
+
+static const char client_key2_test[] = {
+	#include <wifi_enterprise_test_certs/client-key2.pem.inc>
+	'\0'};
 #endif
 
 #define WIFI_SHELL_MODULE "wifi"
@@ -103,6 +115,12 @@ static int cmd_wifi_set_enterprise_creds(const struct shell *sh, struct net_if *
 	params.client_cert_len = ARRAY_SIZE(client_cert_test);
 	params.client_key = (uint8_t *)client_key_test;
 	params.client_key_len = ARRAY_SIZE(client_key_test);
+	params.ca_cert2 = (uint8_t *)ca_cert2_test;
+	params.ca_cert2_len = ARRAY_SIZE(ca_cert2_test);
+	params.client_cert2 = (uint8_t *)client_cert2_test;
+	params.client_cert2_len = ARRAY_SIZE(client_cert2_test);
+	params.client_key2 = (uint8_t *)client_key2_test;
+	params.client_key2_len = ARRAY_SIZE(client_key2_test);
 
 	if (net_mgmt(NET_REQUEST_WIFI_ENTERPRISE_CREDS, iface, &params, sizeof(params))) {
 		PR_WARNING("Set enterprise credentials failed\n");
@@ -503,7 +521,26 @@ static int __wifi_args_to_params(const struct shell *sh, size_t argc, char *argv
 		{"channel", required_argument, 0, 'c'},
 		{"timeout", required_argument, 0, 't'},
 		{"anon-id", required_argument, 0, 'a'},
-		{"key-passwd", required_argument, 0, 'K'},
+		{"key1-pwd", required_argument, 0, 'K'},
+		{"key2-pwd", required_argument, 0, 'K'},
+		{"suiteb-type", required_argument, 0, 'S'},
+		{"eap-version", required_argument, 0, 'V'},
+		{"eap-id1", required_argument, 0, 'I'},
+		{"eap-id2", required_argument, 0, 'I'},
+		{"eap-id3", required_argument, 0, 'I'},
+		{"eap-id4", required_argument, 0, 'I'},
+		{"eap-id5", required_argument, 0, 'I'},
+		{"eap-id6", required_argument, 0, 'I'},
+		{"eap-id7", required_argument, 0, 'I'},
+		{"eap-id8", required_argument, 0, 'I'},
+		{"eap-pwd1", required_argument, 0, 'P'},
+		{"eap-pwd2", required_argument, 0, 'P'},
+		{"eap-pwd3", required_argument, 0, 'P'},
+		{"eap-pwd4", required_argument, 0, 'P'},
+		{"eap-pwd5", required_argument, 0, 'P'},
+		{"eap-pwd6", required_argument, 0, 'P'},
+		{"eap-pwd7", required_argument, 0, 'P'},
+		{"eap-pwd8", required_argument, 0, 'P'},
 		{"help", no_argument, 0, 'h'},
 		{0, 0, 0, 0}};
 	char *endptr;
@@ -519,14 +556,16 @@ static int __wifi_args_to_params(const struct shell *sh, size_t argc, char *argv
 	char bands_str[MAX_BANDS_STR_LEN] = {0};
 	size_t offset = 0;
 	long channel;
+	int key_passwd_cnt = 0;
 
 	/* Defaults */
 	params->band = WIFI_FREQ_BAND_UNKNOWN;
 	params->channel = WIFI_CHANNEL_ANY;
 	params->security = WIFI_SECURITY_TYPE_NONE;
 	params->mfp = WIFI_MFP_OPTIONAL;
+	params->eap_ver = 1;
 
-	while ((opt = getopt_long(argc, argv, "s:p:k:w:b:c:m:t:a:K:h",
+	while ((opt = getopt_long(argc, argv, "s:p:k:e:w:b:c:m:t:a:K:S:V:I:P:h",
 				  long_options, &opt_index)) != -1) {
 		state = getopt_state_get();
 		switch (opt) {
@@ -640,10 +679,54 @@ static int __wifi_args_to_params(const struct shell *sh, size_t argc, char *argv
 			}
 			break;
 		case 'K':
-			params->key_passwd = optarg;
-			params->key_passwd_length = strlen(params->key_passwd);
-			if (params->key_passwd_length > WIFI_ENT_PSWD_MAX_LEN) {
-				PR_WARNING("key_passwd too long (max %d characters)\n",
+			if (key_passwd_cnt >= 2) {
+				PR_WARNING("too many key_passwd (max 2 key_passwd)\n");
+				return -EINVAL;
+			}
+
+			if (key_passwd_cnt == 0) {
+				params->key_passwd = optarg;
+				params->key_passwd_length = strlen(params->key_passwd);
+				if (params->key_passwd_length > WIFI_ENT_PSWD_MAX_LEN) {
+					PR_WARNING("key_passwd too long (max %d characters)\n",
+							WIFI_ENT_PSWD_MAX_LEN);
+					return -EINVAL;
+				}
+			} else if (key_passwd_cnt == 1) {
+				params->key2_passwd = optarg;
+				params->key2_passwd_length = strlen(params->key2_passwd);
+				if (params->key2_passwd_length > WIFI_ENT_PSWD_MAX_LEN) {
+					PR_WARNING("key2_passwd too long (max %d characters)\n",
+							WIFI_ENT_PSWD_MAX_LEN);
+					return -EINVAL;
+				}
+			}
+			key_passwd_cnt++;
+			break;
+		case 'S':
+			params->suiteb_type = atoi(optarg);
+			break;
+		case 'V':
+			params->eap_ver = atoi(optarg);
+			if (params->eap_ver != 0U && params->eap_ver != 1U) {
+				PR_WARNING("eap_ver error %d\n", params->eap_ver);
+				return -EINVAL;
+			}
+			break;
+		case 'I':
+			params->eap_identity = optarg;
+			params->eap_id_length = strlen(params->eap_identity);
+			if (params->eap_id_length > WIFI_ENT_IDENTITY_MAX_LEN) {
+				PR_WARNING("eap identity too long (max %d characters)\n",
+					    WIFI_ENT_IDENTITY_MAX_LEN);
+				return -EINVAL;
+			}
+			break;
+		case 'P':
+			params->eap_password = optarg;
+			params->eap_passwd_length = strlen(params->eap_password);
+			if (params->eap_passwd_length > WIFI_ENT_PSWD_MAX_LEN) {
+				PR_WARNING("eap password length too long (max %d characters)\n",
 					    WIFI_ENT_PSWD_MAX_LEN);
 				return -EINVAL;
 			}
@@ -710,7 +793,12 @@ static int cmd_wifi_connect(const struct shell *sh, size_t argc,
 
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	/* Load the enterprise credentials if needed */
-	if (cnx_params.security == WIFI_SECURITY_TYPE_EAP_TLS) {
+	if (cnx_params.security == WIFI_SECURITY_TYPE_EAP_TLS ||
+	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2 ||
+	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_GTC ||
+	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2 ||
+	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_TLS ||
+	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_TLS_SHA256) {
 		cmd_wifi_set_enterprise_creds(sh, iface);
 	}
 #endif
@@ -2997,16 +3085,23 @@ SHELL_SUBCMD_ADD((wifi), connect, &wifi_commands,
 		  "[-p, --psk]: Passphrase (valid only for secure SSIDs)\n"
 		  "[-k, --key-mgmt]: Key Management type (valid only for secure SSIDs)\n"
 		  "0:None, 1:WPA2-PSK, 2:WPA2-PSK-256, 3:SAE-HNP, 4:SAE-H2E, 5:SAE-AUTO, 6:WAPI,"
-		  " 7:EAP-TLS, 8:WEP, 9: WPA-PSK, 10: WPA-Auto-Personal, 11: DPP\n"
+		  "7:EAP-TLS, 8:WEP, 9: WPA-PSK, 10: WPA-Auto-Personal, 11: DPP\n"
+		  "12: EAP-PEAP-MSCHAPv2, 13: EAP-PEAP-GTC, 14: EAP-TTLS-MSCHAPv2, 15: EAP-PEAP-TLS\n"
 		  "[-w, --ieee-80211w]: MFP (optional: needs security type to be specified)\n"
 		  ": 0:Disable, 1:Optional, 2:Required.\n"
 		  "[-m, --bssid]: MAC address of the AP (BSSID).\n"
 		  "[-t, --timeout]: Timeout for the connection attempt (in seconds).\n"
 		  "[-a, --anon-id]: Anonymous identity for enterprise mode.\n"
-		  "[-K, --key-passwd]: Private key passwd for enterprise mode.\n"
+		  "[-K, --key1-pwd for eap phase1 or --key2-pwd for eap phase2]:\n"
+		  "Private key passwd for enterprise mode. Default no password for private key.\n"
+		  "[-S, --suiteb-type]: 1:suiteb, 2:suiteb-192. Default 0: not suiteb mode.\n"
+		  "[-V, --eap-version]: 0 or 1. Default 1: eap version 1.\n"
+		  "[-I, --eap-id1]: Client Identity. Default no eap identity.\n"
+		  "[-P, --eap-pwd1]: Client Password.\n"
+		  "Default no password for eap user.\n"
 		  "[-h, --help]: Print out the help for the connect command.\n",
 		  cmd_wifi_connect,
-		 2, 13);
+		 2, 19);
 
 SHELL_SUBCMD_ADD((wifi), disconnect, &wifi_commands,
 		 "Disconnect from the Wi-Fi AP.\n",

From da9c7d7cc71eaebfd94dfeca8d59172f2625d155 Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Thu, 17 Oct 2024 10:40:35 +0300
Subject: [PATCH 0421/2913] [nrf fromtree] hostap: Remove extra IEEE8021X_EAPOL
 as it was mentioned twice

The CONFIG_IEEE8021X_EAPOL was in the Kconfig file twice so
remove the extra entry.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 5c5f3b0b5109103cf01abc990b5da0e429545533)
(cherry picked from commit 220793dfe000bb8346075fe937b10ab34c8aed5a)
---
 modules/hostap/Kconfig | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index 09a43d7d07e..5ed4fb8c559 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -439,9 +439,6 @@ config EAP_EKE
 config EAP_IKEv2
 	bool
 
-config IEEE8021X_EAPOL
-	bool
-
 config CRYPTO_INTERNAL
 	bool
 

From ec45c1a524769036157613693d0fb2a5c9d9b72e Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Thu, 17 Oct 2024 10:41:54 +0300
Subject: [PATCH 0422/2913] [nrf fromtree] hostap: Fix hostapd AP compilation
 error

The supplicant_ap_status() is only available if
CONFIG_WIFI_NM_HOSTAPD_AP is enabled.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 18275f84d7d42ace2e15b07b34717ed3324d2c1d)
(cherry picked from commit d396fee5dd073836f9835c11e64191624c8cb48f)
---
 modules/hostap/src/supp_api.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 24561086f38..fd6449e98a9 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1847,7 +1847,6 @@ int supplicant_ap_config_params(const struct device *dev, struct wifi_ap_config_
 
 	return ret;
 }
-#endif
 
 int supplicant_ap_status(const struct device *dev, struct wifi_iface_status *status)
 {
@@ -1922,6 +1921,7 @@ int supplicant_ap_status(const struct device *dev, struct wifi_iface_status *sta
 	k_mutex_unlock(&wpa_supplicant_mutex);
 	return ret;
 }
+#endif /* CONFIG_WIFI_NM_HOSTAPD_AP */
 
 int supplicant_ap_enable(const struct device *dev,
 			 struct wifi_connect_req_params *params)

From 6487af5285d14110400eb71bc58139a971ed328a Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Thu, 17 Oct 2024 11:00:20 +0300
Subject: [PATCH 0423/2913] [nrf fromtree] hostap: Add ip-addr.c compilation to
 the build

The functions in ip-addr.c are needed in more places than just
for hostapd so add it unconditionally to the build.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 0edb64db5f47a4b4a5df957621087b4005b0d9f5)
(cherry picked from commit fa81875070f127af102cd1bab335f2f2ecbae0ac)
---
 modules/hostap/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index 98345fb4c24..5df8166baf1 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -205,6 +205,7 @@ zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_AP
 	${HOSTAP_SRC_BASE}/ap/mbo_ap.c
 	${HOSTAP_SRC_BASE}/ap/ctrl_iface_ap.c
 	${HOSTAP_SRC_BASE}/utils/crc32.c
+	${HOSTAP_SRC_BASE}/utils/ip_addr.c
 )
 
 zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_AP
@@ -225,7 +226,6 @@ zephyr_include_directories_ifdef(CONFIG_WIFI_NM_HOSTAPD_AP
 
 zephyr_library_sources_ifdef(CONFIG_WIFI_NM_HOSTAPD_AP
 	${HOSTAP_SRC_BASE}/ap/acs.c
-	${HOSTAP_SRC_BASE}/utils/ip_addr.c
 	${WIFI_NM_HOSTAPD_BASE}/config_file.c
 	${WIFI_NM_HOSTAPD_BASE}/ctrl_iface.c
 	${WIFI_NM_HOSTAPD_BASE}/ctrl_iface_zephyr.c

From 6cc7cfa906cb375fe30da58772bfd42ee0d0ba7c Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Thu, 17 Oct 2024 11:14:15 +0300
Subject: [PATCH 0424/2913] [nrf fromtree] hostap: P2P needs EAPOL to select it
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The P2P support needs EAPOL support in order to avoid a compilation
error about missing eap field in wpa_ssid struct.

modules/lib/hostap/wpa_supplicant/wpa_supplicant.c:5102:65:
 error: ‘struct wpa_ssid’ has no member named ‘eap’
 5102 |      eap_is_wps_pin_enrollee(&wpa_s->current_ssid->eap)) {

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 6827ec0d93d9bc6dd727ee61ca1941314db5f89b)
(cherry picked from commit 163447005e076077984ac005adfec6a596cfabd6)
---
 modules/hostap/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index 5ed4fb8c559..1a82af8233d 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -247,6 +247,7 @@ config WIFI_NM_WPA_SUPPLICANT_P2P
 	bool "P2P mode support"
 	select WIFI_NM_WPA_SUPPLICANT_AP
 	select WIFI_NM_WPA_SUPPLICANT_WPS
+	select WIFI_NM_WPA_SUPPLICANT_EAPOL
 
 config WIFI_NM_WPA_SUPPLICANT_EAPOL
 	bool "EAPoL supplicant"

From 6d59a86e47fbad02bda12736694dbe43aa6ee33b Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Thu, 17 Oct 2024 11:19:58 +0300
Subject: [PATCH 0425/2913] [nrf fromtree] hostap: Fix compilation error when
 enterprise support is enabled

The code was missing ")" when checking crypto support.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 33bc6f05c8f21325fd5eca9d3c3ceda7ecc16949)
(cherry picked from commit ee7753e30392050f4004d9e0ed414342d67f85fd)
---
 modules/hostap/src/supp_main.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hostap/src/supp_main.h b/modules/hostap/src/supp_main.h
index e80ced03431..b28869c2bd3 100644
--- a/modules/hostap/src/supp_main.h
+++ b/modules/hostap/src/supp_main.h
@@ -15,7 +15,7 @@
 	!defined(CONFIG_EAP_PSK) && !defined(CONFIG_EAP_PAX) && \
 	!defined(CONFIG_EAP_SAKE) && !defined(CONFIG_EAP_GPSK) && \
 	!defined(CONFIG_EAP_PWD) && !defined(CONFIG_EAP_EKE) && \
-	!defined(CONFIG_EAP_IKEV2 && !defined(CONFIG_EAP_GTC)
+	!defined(CONFIG_EAP_IKEV2) && !defined(CONFIG_EAP_GTC)
 #error "At least one of the following EAP methods need to be defined    \
 	CONFIG_EAP_TLS    \
 	CONFIG_EAP_TTLS   \

From 846b3c81f43f7a8ae3cc5abce891e91177621577 Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Thu, 17 Oct 2024 16:10:39 +0300
Subject: [PATCH 0426/2913] [nrf fromtree] hostap: Enterprise mode needs
 sha1-internal.c

Without this there is an error

modules/lib/hostap/src/crypto/fips_prf_internal.c:47: \
    undefined reference to `SHA1Transform'

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit e9ec7a23a32c4a6ba4ba487a95f9cd588aaea893)
(cherry picked from commit bc206f7011b90f48edaedc4f60c356999cd9debf)
---
 modules/hostap/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index 5df8166baf1..ed97e261167 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -608,6 +608,7 @@ zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	${HOSTAP_SRC_BASE}/crypto/ms_funcs.c
 	${HOSTAP_SRC_BASE}/crypto/aes-eax.c
 	${HOSTAP_SRC_BASE}/crypto/md4-internal.c
+	${HOSTAP_SRC_BASE}/crypto/sha1-internal.c
 	${HOSTAP_SRC_BASE}/crypto/fips_prf_internal.c
 	${HOSTAP_SRC_BASE}/crypto/milenage.c
 )

From 199d1a7a90c30b6a2272f835369373f2a3d8c938 Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Thu, 17 Oct 2024 16:13:27 +0300
Subject: [PATCH 0427/2913] [nrf fromtree] hostap: Fix crypto=none compilation

If CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE is enabled, there
are lot of missing functions reported during linking.
Add missing C files to the compilation to fix this.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 980a352d395785225475e92b1c1c0edfc795a75e)
(cherry picked from commit 01838b58f55afc560d61be1c19b9621ac38c6ab1)
---
 modules/hostap/CMakeLists.txt | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index ed97e261167..9a0fd21d2cb 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -242,6 +242,27 @@ zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_HOSTAPD_AP
 zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
 	${HOSTAP_SRC_BASE}/crypto/crypto_none.c
 	${HOSTAP_SRC_BASE}/crypto/tls_none.c
+
+	# FIXME: why do we need these when crypto is not selected?
+	${HOSTAP_SRC_BASE}/crypto/aes-wrap.c
+	${HOSTAP_SRC_BASE}/crypto/aes-internal.c
+	${HOSTAP_SRC_BASE}/crypto/aes-internal-enc.c
+	${HOSTAP_SRC_BASE}/crypto/aes-omac1.c
+	${HOSTAP_SRC_BASE}/crypto/md5.c
+	${HOSTAP_SRC_BASE}/crypto/md5-internal.c
+	${HOSTAP_SRC_BASE}/crypto/sha1.c
+	${HOSTAP_SRC_BASE}/crypto/sha1-internal.c
+	${HOSTAP_SRC_BASE}/crypto/sha1-pbkdf2.c
+	${HOSTAP_SRC_BASE}/crypto/sha1-prf.c
+	${HOSTAP_SRC_BASE}/crypto/sha256.c
+	${HOSTAP_SRC_BASE}/crypto/sha256-internal.c
+	${HOSTAP_SRC_BASE}/crypto/sha256-prf.c
+	${HOSTAP_SRC_BASE}/crypto/sha384.c
+	${HOSTAP_SRC_BASE}/crypto/sha384-internal.c
+	${HOSTAP_SRC_BASE}/crypto/sha384-prf.c
+	${HOSTAP_SRC_BASE}/crypto/sha512.c
+	${HOSTAP_SRC_BASE}/crypto/sha512-internal.c
+	${HOSTAP_SRC_BASE}/crypto/rc4.c
 )
 
 zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE

From 0c8dcad418d522d8b232e6a9a3dccfa503e25960 Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Fri, 18 Oct 2024 09:42:00 +0300
Subject: [PATCH 0428/2913] [nrf fromtree] hostap: Remove not found hostapd
 functions

Both the supplicant_set_btwt() and supplicant_ap_bandwidth() are
not found in Zephyr sources so remove them.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 6ac4e9c3b7270c8eefd547a46d5de85edf5e2806)
(cherry picked from commit 70e9654712fe34018725cf0fc67a8be4a8439610)
---
 modules/hostap/src/supp_main.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index b47b322e2aa..826e15e9d8d 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -94,11 +94,9 @@ DEFINE_WIFI_NM_INSTANCE(wifi_supplicant, &mgmt_ops);
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 static const struct wifi_mgmt_ops mgmt_ap_ops = {
-	.set_btwt = supplicant_set_btwt,
 	.ap_enable = supplicant_ap_enable,
 	.ap_disable = supplicant_ap_disable,
 	.ap_sta_disconnect = supplicant_ap_sta_disconnect,
-	.ap_bandwidth = supplicant_ap_bandwidth,
 	.iface_status = supplicant_ap_status,
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	.dpp_dispatch = hapd_dpp_dispatch,

From b5d92faf4fb5c6c90616aa685cd2b5e345ad0be3 Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Fri, 18 Oct 2024 09:43:53 +0300
Subject: [PATCH 0429/2913] [nrf fromtree] hostap: Add needed include files to
 fix compilation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The "enum wpa_msg_type" was not found by default so add needed
include files to get the definitions.

modules/hostap/src/supp_main.h:61:57: warning: ‘enum wpa_msg_type’
   declared inside parameter list will not be visible outside of
   this definition or declaration
   61 | void wpa_supplicant_msg_send(void *ctx, int level,
                                     enum wpa_msg_type type,
                                     const char *txt,

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit c9b8365f6db9dc5a7ed071143b84be280f5fa236)
(cherry picked from commit f812a78c655c0aedd2b1b7dbd007456c3e221a27)
---
 modules/hostap/src/supp_main.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/hostap/src/supp_main.h b/modules/hostap/src/supp_main.h
index b28869c2bd3..981bdf66958 100644
--- a/modules/hostap/src/supp_main.h
+++ b/modules/hostap/src/supp_main.h
@@ -52,12 +52,17 @@ static inline void net_dhcpv4_stop(struct net_if *iface)
 
 struct wpa_global *zephyr_get_default_supplicant_context(void);
 struct wpa_supplicant *zephyr_get_handle_by_ifname(const char *ifname);
+
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
+#include "common.h"
+#include "wpa_debug_zephyr.h"
+
 struct hostapd_iface *zephyr_get_hapd_handle_by_ifname(const char *ifname);
 void wpa_supplicant_msg_send(void *ctx, int level, enum wpa_msg_type type, const char *txt,
 			     size_t len);
 void hostapd_msg_send(void *ctx, int level, enum wpa_msg_type type, const char *buf, size_t len);
 #endif
+
 struct wpa_supplicant_event_msg {
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 	int hostapd;

From ede83366d1ede14c478b09ed88cfc7de51fa5bdf Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Fri, 18 Oct 2024 13:42:44 +0300
Subject: [PATCH 0430/2913] [nrf fromtree] hostap: Avoid warning of different
 enum mapping

Even if the enum contains the same values, the values might
change if the wpa_supplicant sources change or Zephyr values
change. In order to avoid weird errors later and prevent the
following warning, add a conversion functions for the enums.

modules/hostap/src/supp_api.c:1172:23: warning: implicit conversion
from enumeration type 'enum mfp_options' to different enumeration
type 'enum wifi_mfp_options' [-Wenum-conversion]
                status->mfp = ssid->ieee80211w; /* Same mapping */

modules/hostap/src/supp_api.c:1190:30: warning: implicit conversion
from enumeration type 'enum wpas_mode' to different enumeration
type 'enum wifi_iface_mode' [-Wenum-conversion]
                status->iface_mode = ssid->mode;

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit ec21dab31a741180a8978f2cadf21c999527f68a)
(cherry picked from commit c5d8337f4926b061a7feca2c68d4309218503506)
---
 modules/hostap/src/supp_api.c | 47 ++++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index fd6449e98a9..52772b4becf 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1116,6 +1116,45 @@ int supplicant_disconnect(const struct device *dev)
 	return wpas_disconnect_network(dev, WPAS_MODE_INFRA);
 }
 
+static enum wifi_mfp_options get_mfp(enum mfp_options supp_mfp_option)
+{
+	switch (supp_mfp_option) {
+	case NO_MGMT_FRAME_PROTECTION:
+		return WIFI_MFP_DISABLE;
+	case MGMT_FRAME_PROTECTION_OPTIONAL:
+		return WIFI_MFP_OPTIONAL;
+	case MGMT_FRAME_PROTECTION_REQUIRED:
+		return WIFI_MFP_REQUIRED;
+	default:
+		wpa_printf(MSG_ERROR, "Invalid mfp mapping %d", supp_mfp_option);
+		break;
+	}
+
+	return WIFI_MFP_DISABLE;
+}
+
+static enum wifi_iface_mode get_iface_mode(enum wpas_mode supp_mode)
+{
+	switch (supp_mode) {
+	case WPAS_MODE_INFRA:
+		return WIFI_MODE_INFRA;
+	case WPAS_MODE_IBSS:
+		return WIFI_MODE_IBSS;
+	case WPAS_MODE_AP:
+		return WIFI_MODE_AP;
+	case WPAS_MODE_P2P_GO:
+		return WIFI_MODE_P2P_GO;
+	case WPAS_MODE_P2P_GROUP_FORMATION:
+		return WIFI_MODE_P2P_GROUP_FORMATION;
+	case WPAS_MODE_MESH:
+		return WIFI_MODE_MESH;
+	default:
+		break;
+	}
+
+	return WIFI_MODE_UNKNOWN;
+}
+
 int supplicant_status(const struct device *dev, struct wifi_iface_status *status)
 {
 	struct net_if *iface = net_if_lookup_by_dev(dev);
@@ -1169,7 +1208,7 @@ int supplicant_status(const struct device *dev, struct wifi_iface_status *status
 		os_memcpy(status->bssid, wpa_s->bssid, WIFI_MAC_ADDR_LEN);
 		status->band = wpas_band_to_zephyr(wpas_freq_to_band(wpa_s->assoc_freq));
 		status->security = wpas_key_mgmt_to_zephyr(key_mgmt, proto);
-		status->mfp = ssid->ieee80211w; /* Same mapping */
+		status->mfp = get_mfp(ssid->ieee80211w);
 		ieee80211_freq_to_chan(wpa_s->assoc_freq, &channel);
 		status->channel = channel;
 
@@ -1187,7 +1226,7 @@ int supplicant_status(const struct device *dev, struct wifi_iface_status *status
 
 		os_memcpy(status->ssid, _ssid, ssid_len);
 		status->ssid_len = ssid_len;
-		status->iface_mode = ssid->mode;
+		status->iface_mode = get_iface_mode(ssid->mode);
 
 		if (wpa_s->connection_set == 1) {
 			status->link_mode = wpa_s->connection_he ? WIFI_6 :
@@ -1894,12 +1933,12 @@ int supplicant_ap_status(const struct device *dev, struct wifi_iface_status *sta
 	ssid = &bss->ssid;
 
 	os_memcpy(status->bssid, hapd->own_addr, WIFI_MAC_ADDR_LEN);
-	status->iface_mode = WPAS_MODE_AP;
+	status->iface_mode = WIFI_MODE_AP;
 	status->band = wpas_band_to_zephyr(wpas_freq_to_band(iface->freq));
 	key_mgmt = bss->wpa_key_mgmt;
 	proto = bss->wpa;
 	status->security = wpas_key_mgmt_to_zephyr(key_mgmt, proto);
-	status->mfp = bss->ieee80211w;
+	status->mfp = get_mfp(bss->ieee80211w);
 	status->channel = conf->channel;
 	os_memcpy(status->ssid, ssid->ssid, ssid->ssid_len);
 

From a008aee9be1d0adc2792e20b67e5c4b61dccbc43 Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Thu, 17 Oct 2024 11:23:10 +0300
Subject: [PATCH 0431/2913] [nrf fromtree] tests: net: wifi: Add build test for
 various config combinations

Try to compile test wifi with various configuration combinations.
This is trying to catch simple compilation issues in the PRs.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 3f8828d8279edfb6ea6c5f298b6e3e854579ae24)
(cherry picked from commit aff2f85cd92b94d1a99c642f0de83ab908f83fb9)
---
 tests/net/wifi/configs/CMakeLists.txt |  8 ++++
 tests/net/wifi/configs/prj.conf       | 33 ++++++++++++++
 tests/net/wifi/configs/src/main.c     | 10 ++++
 tests/net/wifi/configs/testcase.yaml  | 66 +++++++++++++++++++++++++++
 4 files changed, 117 insertions(+)
 create mode 100644 tests/net/wifi/configs/CMakeLists.txt
 create mode 100644 tests/net/wifi/configs/prj.conf
 create mode 100644 tests/net/wifi/configs/src/main.c
 create mode 100644 tests/net/wifi/configs/testcase.yaml

diff --git a/tests/net/wifi/configs/CMakeLists.txt b/tests/net/wifi/configs/CMakeLists.txt
new file mode 100644
index 00000000000..518596a02f7
--- /dev/null
+++ b/tests/net/wifi/configs/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(build_all)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/net/wifi/configs/prj.conf b/tests/net/wifi/configs/prj.conf
new file mode 100644
index 00000000000..2a2f4d2cf6b
--- /dev/null
+++ b/tests/net/wifi/configs/prj.conf
@@ -0,0 +1,33 @@
+CONFIG_TEST=y
+CONFIG_TEST_USERSPACE=y
+CONFIG_NET_TEST=y
+
+CONFIG_NETWORKING=y
+CONFIG_NET_IPV4=y
+CONFIG_NET_IPV6=y
+CONFIG_NET_CONFIG_SETTINGS=n
+
+CONFIG_WIFI=y
+CONFIG_WIFI_NM=y
+
+CONFIG_SHELL=y
+CONFIG_NET_SHELL=y
+CONFIG_NET_L2_WIFI_SHELL=y
+CONFIG_NET_L2_WIFI_MGMT=y
+
+CONFIG_WIFI_SHELL_MAX_AP_STA=2
+CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS=y
+CONFIG_WIFI_MGMT_FORCED_PASSIVE_SCAN=y
+CONFIG_WIFI_MGMT_SCAN_SSID_FILT_MAX=3
+CONFIG_WIFI_MGMT_SCAN_CHAN_MAX_MANUAL=10
+CONFIG_WIFI_NM_MAX_MANAGED_INTERFACES=2
+CONFIG_WIFI_MGMT_AP_STA_SKIP_INACTIVITY_POLL=y
+CONFIG_WIFI_MGMT_AP_MAX_NUM_STA=10
+
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=0
+CONFIG_WIFI_NM_WPA_SUPPLICANT_WEP=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_ADVANCED_FEATURES=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_AP=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_CLI=y
+CONFIG_WPA_CLI=y
diff --git a/tests/net/wifi/configs/src/main.c b/tests/net/wifi/configs/src/main.c
new file mode 100644
index 00000000000..a05ee591430
--- /dev/null
+++ b/tests/net/wifi/configs/src/main.c
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+int main(void)
+{
+	return 0;
+}
diff --git a/tests/net/wifi/configs/testcase.yaml b/tests/net/wifi/configs/testcase.yaml
new file mode 100644
index 00000000000..017407bc846
--- /dev/null
+++ b/tests/net/wifi/configs/testcase.yaml
@@ -0,0 +1,66 @@
+common:
+  build_only: true
+  tags:
+    - drivers
+    - wifi
+    - net
+  platform_allow:
+    - native_sim
+    - native_sim/native/64
+tests:
+  wifi.build.crypto_default:
+    extra_configs:
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO=y
+  wifi.build.crypto_alt:
+    extra_configs:
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT=y
+  wifi.build.crypto_none:
+    extra_configs:
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE=y
+  # FIXME: The psa crypto does not work atm so commented out
+  #        the build test temporarily.
+  # wifi.build.crypto_psa:
+  #  extra_configs:
+  #    - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA=y
+  wifi.build.crypto_enterprise:
+    extra_configs:
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT=y
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE=y
+      - CONFIG_MBEDTLS_TLS_VERSION_1_2=y
+      - CONFIG_EAP_TLS=y
+      - CONFIG_EAP_TTLS=y
+      - CONFIG_EAP_PEAP=y
+      - CONFIG_EAP_MD5=y
+      - CONFIG_EAP_MSCHAPV2=y
+      - CONFIG_EAP_LEAP=y
+      - CONFIG_EAP_PSK=y
+      - CONFIG_EAP_PAX=y
+      - CONFIG_EAP_SAKE=y
+      - CONFIG_EAP_GPSK=y
+      - CONFIG_EAP_PWD=y
+      - CONFIG_EAP_EKE=y
+      - CONFIG_EAP_IKEV2=y
+      - CONFIG_EAP_SIM=y
+      - CONFIG_EAP_AKA=y
+  wifi.build.wpa3:
+    extra_configs:
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT_WPA3=y
+      - CONFIG_MBEDTLS_TLS_VERSION_1_2=y
+  wifi.build.wps:
+    extra_configs:
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT_WPS=y
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT_EAPOL=y
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO=y
+  wifi.build.p2p:
+    extra_configs:
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT_P2P=y
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO=y
+  wifi.build.hostapd_ap:
+    extra_configs:
+      - CONFIG_WIFI_NM_HOSTAPD_AP=y
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT_INF_MON=n
+  wifi.build.dpp:
+    extra_configs:
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT=y
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE=y
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP=y

From df045030e0b35b8f35bf48741bdaec53dabfd339 Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
Date: Fri, 18 Oct 2024 10:28:37 +0300
Subject: [PATCH 0432/2913] [nrf fromtree] manifest: hostap: Pull compile error
 fixes

This is related to work on #79973 which creates build tests
for hostap with different configurations.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 3cf8b09a9a830af76eb6c2d15d6611dbc1404c43)
(cherry picked from commit 746c298b85ff4dd9ede62194c60db8d6d55d6d06)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 31a525b6eaf..f500d7e1b59 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: ac59d28778b20cd68702f55dad2a27d648e3d571
+      revision: e481fe559e17052ec8ea04388a934f3d30816737
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From c270e07b9cff53855be699b04a7db7df5fe9ac4f Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Sun, 20 Oct 2024 00:17:26 +0530
Subject: [PATCH 0433/2913] [nrf fromtree] modules: hostap: Add a config option
 for WPA control timeout

WPA control interface timeout is hardcoded to 10s, add a configuration
option to remove the hardcode, this is needed sometimes as a workaround
e.g., crypto taking too long to complete the request.

Work around for #79834, increase the default from 10 to 15s, in positive
case this will have no impact.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 78f5821b379f3684bb310141c880312acecd7180)
(cherry picked from commit b1c9526eeb387e17c0d780cddcf449f31e29ca8a)
---
 modules/hostap/Kconfig | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index 1a82af8233d..e22059f00f0 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -543,4 +543,11 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_TEST
 	bool
 	depends on WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA
 
+config WIFI_NM_WPA_CTRL_RESP_TIMEOUT_S
+	int "WPA supplicant control interface response timeout in seconds"
+	default 15
+	help
+	  Timeout for the control interface commands to get a response from the
+	  supplicant.
+
 endif # WIFI_NM_WPA_SUPPLICANT

From 3fd8f640984e72bfe8a7a1108131817d32aad754 Mon Sep 17 00:00:00 2001
From: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
Date: Tue, 22 Oct 2024 15:22:32 +0530
Subject: [PATCH 0434/2913] [nrf fromlist] net: l2: wifi: Add checks for cert
 header creation

Execute certificate headers creation rules only if Wi-Fi Enterprise mode
is enabled.

Upstream PR #: 80212

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
(cherry picked from commit 313c1038d422793b38570149adc580450f75c3ef)
---
 subsys/net/l2/wifi/CMakeLists.txt | 76 ++++++++++++++++---------------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/subsys/net/l2/wifi/CMakeLists.txt b/subsys/net/l2/wifi/CMakeLists.txt
index eb22a54cf77..fc844e37ca2 100644
--- a/subsys/net/l2/wifi/CMakeLists.txt
+++ b/subsys/net/l2/wifi/CMakeLists.txt
@@ -23,47 +23,49 @@ if (CONFIG_WIFI_NM)
 zephyr_iterable_section(NAME wifi_nm_instance GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
-# Wi-Fi Enterprise test certificates handling
-set(gen_inc_dir ${ZEPHYR_BINARY_DIR}/misc/generated)
-set(gen_dir ${gen_inc_dir}/wifi_enterprise_test_certs)
-# Create output directory for test certs
-file(MAKE_DIRECTORY ${gen_dir})
+if(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE)
+  # Wi-Fi Enterprise test certificates handling
+  set(gen_inc_dir ${ZEPHYR_BINARY_DIR}/misc/generated)
+  set(gen_dir ${gen_inc_dir}/wifi_enterprise_test_certs)
+  # Create output directory for test certs
+  file(MAKE_DIRECTORY ${gen_dir})
 
-# convert .pem files to array data at build time
-zephyr_include_directories(${gen_inc_dir})
+  # convert .pem files to array data at build time
+  zephyr_include_directories(${gen_inc_dir})
 
-generate_inc_file_for_target(
-    app
-    ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client.pem
-    ${gen_dir}/client.pem.inc
-    )
+  generate_inc_file_for_target(
+      app
+      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client.pem
+      ${gen_dir}/client.pem.inc
+      )
 
-generate_inc_file_for_target(
-    app
-    ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client-key.pem
-    ${gen_dir}/client-key.pem.inc
-    )
+  generate_inc_file_for_target(
+      app
+      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client-key.pem
+      ${gen_dir}/client-key.pem.inc
+      )
 
-generate_inc_file_for_target(
-    app
-    ${ZEPHYR_BASE}/samples/net/wifi/test_certs/ca.pem
-    ${gen_dir}/ca.pem.inc
-    )
+  generate_inc_file_for_target(
+      app
+      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/ca.pem
+      ${gen_dir}/ca.pem.inc
+      )
 
-generate_inc_file_for_target(
-    app
-    ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client2.pem
-    ${gen_dir}/client2.pem.inc
-    )
+  generate_inc_file_for_target(
+      app
+      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client2.pem
+      ${gen_dir}/client2.pem.inc
+      )
 
-generate_inc_file_for_target(
-    app
-    ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client-key2.pem
-    ${gen_dir}/client-key2.pem.inc
-    )
+  generate_inc_file_for_target(
+      app
+      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client-key2.pem
+      ${gen_dir}/client-key2.pem.inc
+      )
 
-generate_inc_file_for_target(
-    app
-    ${ZEPHYR_BASE}/samples/net/wifi/test_certs/ca2.pem
-    ${gen_dir}/ca2.pem.inc
-    )
+  generate_inc_file_for_target(
+      app
+      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/ca2.pem
+      ${gen_dir}/ca2.pem.inc
+      )
+endif()

From 630e679c1cad25a905b9dac47dcffae9465a250e Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 22 Oct 2024 01:37:00 +0530
Subject: [PATCH 0435/2913] [nrf fromtree] manifest: hal_nordic: Pull fix for
 build errors

Few build errors due to bugs in previous commits.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit f6b60bd057ccf040b87c7a8a7701473fc35d96c8)
(cherry picked from commit 7ef355b41dd7ae8d7af762325021fcdb23dcd78e)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index f500d7e1b59..e46ee9e3d0f 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 957d1a803d0663330e870af2985503ba0cdbb152
+      revision: cb7600a1be4c8b177867e6d463729c07dd3f6d73
       path: modules/hal/nordic
       groups:
         - hal

From 632004f3762089eede0be7f9a3cf293f6c1a47e6 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 22 Oct 2024 01:36:07 +0530
Subject: [PATCH 0436/2913] [nrf fromtree] drivers: nrfwifi: Fix a build error

The defines should explicitly be passed to nordic HAL as they dont' use
the CONFIG_ prefix.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 3098c484cb9f87edf59bd788aadf5a8d68595968)
(cherry picked from commit 0e3b836c9a208cebf4debc0ce69a3c15b7176104)
---
 drivers/wifi/nrfwifi/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 0cd45829318..70223f739ef 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -343,4 +343,5 @@ zephyr_compile_definitions(
   -DNRF70_ANT_GAIN_5G_BAND2=${CONFIG_NRF70_ANT_GAIN_5G_BAND2}
   -DNRF70_ANT_GAIN_5G_BAND3=${CONFIG_NRF70_ANT_GAIN_5G_BAND3}
   -DNRF_WIFI_PS_INT_PS=${CONFIG_NRF_WIFI_PS_INT_PS}
+  -DNRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS=${CONFIG_NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS}
 )

From da5179a404d0b10e023d0ef9c2b66e160f62d000 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 22 Oct 2024 01:40:41 +0530
Subject: [PATCH 0437/2913] [nrf fromtree] samples: wifi: Fix missing CONFIG
 for the option

Missed adding CONFIG_ to the configuration option.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit f840f660a4e0044722918874abde729fe4b897e4)
(cherry picked from commit baaca29ceff71790e4d5ff92e200f91bb3b4ea41)
---
 samples/net/wifi/sample.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/net/wifi/sample.yaml b/samples/net/wifi/sample.yaml
index e7ca553ecaf..f2f5207f354 100644
--- a/samples/net/wifi/sample.yaml
+++ b/samples/net/wifi/sample.yaml
@@ -64,7 +64,7 @@ tests:
       - nucleo_h723zg
   sample.net.wifi.nrf7002eb:
     extra_args:
-      - NRF70_UTIL=y
+      - CONFIG_NRF70_UTIL=y
       - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
       - SHIELD=nrf7002eb
     platform_allow:

From c55d898c5a69085444dfae395a17696b10fcff05 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 23 Oct 2024 19:51:54 +0530
Subject: [PATCH 0438/2913] [nrf fromlist] manifest: hostap: Pull fix for build
 error

When debug is disabled, seeing a build error for unused variable.

Upstream PR #: 80315

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 8af79d4f1520c95324dc1e75d7c488bb4a28ef1f)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index e46ee9e3d0f..f2a65b025c9 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: e481fe559e17052ec8ea04388a934f3d30816737
+      revision: 44285310338f423021cc7df2c1056256882a00cc
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From 387e246f63699a40a504cc58fb6bb0810129bf0c Mon Sep 17 00:00:00 2001
From: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
Date: Tue, 8 Oct 2024 21:27:51 +0530
Subject: [PATCH 0439/2913] [nrf noup] samples: net: wifi: Changes for EAP-TLS
 support

Enable wifi sample to connect in EAP-TLS mode. Create sample
certificates.

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
(cherry picked from commit d4911e8664d884e803a643c371d6145a6aa51a49)
---
 samples/net/wifi/overlay-enterprise.conf | 2 +-
 samples/net/wifi/prj.conf                | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/samples/net/wifi/overlay-enterprise.conf b/samples/net/wifi/overlay-enterprise.conf
index 34416282811..ba6d958f9a5 100644
--- a/samples/net/wifi/overlay-enterprise.conf
+++ b/samples/net/wifi/overlay-enterprise.conf
@@ -7,4 +7,4 @@ CONFIG_NET_BUF_RX_COUNT=36
 # For TLS and X.509 processing MbedTLS needs large heap size and using separate heap
 # for MbedTLS gives us more control over the heap size.
 CONFIG_MBEDTLS_ENABLE_HEAP=y
-CONFIG_MBEDTLS_HEAP_SIZE=55000
+CONFIG_MBEDTLS_HEAP_SIZE=70000
diff --git a/samples/net/wifi/prj.conf b/samples/net/wifi/prj.conf
index e1a1b40a409..ab3d718f06b 100644
--- a/samples/net/wifi/prj.conf
+++ b/samples/net/wifi/prj.conf
@@ -31,6 +31,10 @@ CONFIG_NET_STATISTICS_PERIODIC_OUTPUT=n
 CONFIG_WIFI=y
 CONFIG_WIFI_LOG_LEVEL_ERR=y
 CONFIG_NET_L2_WIFI_SHELL=y
+
+CONFIG_MBEDTLS_ENABLE_HEAP=y
+CONFIG_MBEDTLS_HEAP_SIZE=70000
+
 # printing of scan results puts pressure on queues in new locking
 # design in net_mgmt. So, use a higher timeout for a crowded
 # environment.

From 74aa39df52e40b8342ca7feff8ff0847df74365c Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Fri, 11 Oct 2024 00:57:13 +0530
Subject: [PATCH 0440/2913] [nrf noup] samples: net: wifi: Enable Wi-Fi driver
 in sysbuild builds

Make sure Wi-Fi driver is enabled when sysbuild is used. For shields we
cannot automate this, as sysbuild doesn't recognize shields, so, Wi-Fi
has to be explicitly enabled, this is done for twister.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit c877fdee564f75f17527bfa33cb1a8548f538007)
---
 samples/net/wifi/Kconfig.sysbuild | 13 +++++++++++++
 samples/net/wifi/sample.yaml      |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 samples/net/wifi/Kconfig.sysbuild

diff --git a/samples/net/wifi/Kconfig.sysbuild b/samples/net/wifi/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/wifi/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/wifi/sample.yaml b/samples/net/wifi/sample.yaml
index f2f5207f354..c5234753a78 100644
--- a/samples/net/wifi/sample.yaml
+++ b/samples/net/wifi/sample.yaml
@@ -53,6 +53,7 @@ tests:
       - nrf7002dk/nrf5340/cpuapp/nrf7001
   sample.net.wifi.nrf7002ek:
     extra_args:
+      - SB_CONFIG_WIFI_NRF70=y
       - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
       - SHIELD=nrf7002ek
     platform_allow:
@@ -65,6 +66,7 @@ tests:
   sample.net.wifi.nrf7002eb:
     extra_args:
       - CONFIG_NRF70_UTIL=y
+      - SB_CONFIG_WIFI_NRF70=y
       - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
       - SHIELD=nrf7002eb
     platform_allow:

From 59ed8524c7d18e9c7cd267c9fd84ac9f852ba93c Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 22 Oct 2024 03:26:49 +0530
Subject: [PATCH 0441/2913] [nrf noup] boards: nordic: 7002dk_ns: Fix missing
 co-ex

The file has been removed upstream, but as upstream doesn't have NS
support, this need to be fixed explicitly.

Upstream PR #: 79606

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 9236bc22711946b34c2f9e2e0d3479374194e09d)
---
 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts | 1 -
 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts         | 1 -
 2 files changed, 2 deletions(-)

diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
index cbbd46dff8b..5ff28accf3f 100644
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
@@ -35,6 +35,5 @@
 		qspi-quad-mode;
 
 		#include "nrf70_common.dtsi"
-		#include "nrf70_common_coex.dtsi"
 	};
 };
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
index ed219384795..0deb8ccc1bf 100644
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
@@ -35,7 +35,6 @@
 		qspi-quad-mode;
 
 		#include "nrf70_common.dtsi"
-		#include "nrf70_common_coex.dtsi"
 		#include "nrf70_common_5g.dtsi"
 	};
 };

From 0113fd656f235a627194c1dcd280d341e7716685 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 22 Oct 2024 23:09:14 +0530
Subject: [PATCH 0442/2913] [nrf noup] samples: net: wifi: Update certificates

Upstream certificates are RSA3K + Suite-B, they are not support yet on
nRF boards, so, generate a new certificate for both phase1 and phase2
and use them.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
(cherry picked from commit 130d4202186b30fa3605e48a7eabdc317b307743)
---
 samples/net/wifi/test_certs/ca.pem          | 45 +++++------
 samples/net/wifi/test_certs/ca2.pem         | 24 ++++++
 samples/net/wifi/test_certs/client-key.pem  | 56 +++++++-------
 samples/net/wifi/test_certs/client-key2.pem | 30 +++++++
 samples/net/wifi/test_certs/client.pem      | 82 +++++---------------
 samples/net/wifi/test_certs/client2.pem     | 22 ++++++
 samples/net/wifi/test_certs/server-key.pem  | 56 +++++++-------
 samples/net/wifi/test_certs/server-key2.pem | 30 +++++++
 samples/net/wifi/test_certs/server.pem      | 86 +++++----------------
 samples/net/wifi/test_certs/server2.pem     | 22 ++++++
 10 files changed, 244 insertions(+), 209 deletions(-)
 create mode 100644 samples/net/wifi/test_certs/ca2.pem
 create mode 100644 samples/net/wifi/test_certs/client-key2.pem
 create mode 100644 samples/net/wifi/test_certs/client2.pem
 create mode 100644 samples/net/wifi/test_certs/server-key2.pem
 create mode 100644 samples/net/wifi/test_certs/server2.pem

diff --git a/samples/net/wifi/test_certs/ca.pem b/samples/net/wifi/test_certs/ca.pem
index 70a234dfdc3..2b872d2e30d 100644
--- a/samples/net/wifi/test_certs/ca.pem
+++ b/samples/net/wifi/test_certs/ca.pem
@@ -1,29 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIE9zCCA9+gAwIBAgIUNX/wAWvB0xblUUghlsoear4f6kkwDQYJKoZIhvcNAQEL
+MIIEBzCCAu+gAwIBAgIUK8+d+8IOzeX+DP3VSvdF3lHiCdcwDQYJKoZIhvcNAQEL
 BQAwgZIxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIDAZSYWRpdXMxEjAQBgNVBAcMCVNv
-bWV3aGVyZTEUMBIGA1UECgwLRXhhbXBsZSBJbmMxIDAeBgkqhkiG9w0BCQEWEWFk
-bWluQGV4YW1wbGUub3JnMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRlIEF1
-dGhvcml0eTAeFw0yNDA4MDcxODQzMDZaFw0yNDEwMDYxODQzMDZaMIGSMQswCQYD
+bWV3aGVyZTEUMBIGA1UECgwLRXhhbXBsZSBJbmMxJjAkBgNVBAMMHUV4YW1wbGUg
+Q2VydGlmaWNhdGUgQXV0aG9yaXR5MSAwHgYJKoZIhvcNAQkBFhFhZG1pbkBleGFt
+cGxlLm9yZzAeFw0yNDEwMDgxMDI0MDZaFw0zNDEwMDYxMDI0MDZaMIGSMQswCQYD
 VQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hlcmUxFDAS
-BgNVBAoMC0V4YW1wbGUgSW5jMSAwHgYJKoZIhvcNAQkBFhFhZG1pbkBleGFtcGxl
-Lm9yZzEmMCQGA1UEAwwdRXhhbXBsZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzR3RL3+70yN+1Nx0bAXT60qqf
-AxCk/NXphq5cxUT5skXc97KUUnIQ1SaLAin8WHRS8Idajywlo0ULpCeoOj35aPI/
-kTUu4P2Rx5p1DYgquTGjW6fS4p5c65y75BWoukng5DQp/kVpo4OcRMUncexGxBET
-1IkpuXGlvQyEKB5I+TgYe4eEXpdn+0A2Nytw9kpSzrd26JofWOO2ZtVCgISnj7ID
-B7ErVzStuHg+rMKVI2SU966CH78lNuIIQFKrg8NoWRQI1zMMouU7hj6EL7cZcvA/
-MW9SIFpzkfC4xq0EnOMzg/D3p4k8ah6MikHf8FqDdBBfPUcYU0rG9+zpQdb3AgMB
-AAGjggFBMIIBPTAdBgNVHQ4EFgQUQl34Jn7xx5zTXckus4k09ScmfUYwgdIGA1Ud
-IwSByjCBx4AUQl34Jn7xx5zTXckus4k09ScmfUahgZikgZUwgZIxCzAJBgNVBAYT
-AkZSMQ8wDQYDVQQIDAZSYWRpdXMxEjAQBgNVBAcMCVNvbWV3aGVyZTEUMBIGA1UE
-CgwLRXhhbXBsZSBJbmMxIDAeBgkqhkiG9w0BCQEWEWFkbWluQGV4YW1wbGUub3Jn
-MSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRlIEF1dGhvcml0eYIUNX/wAWvB
-0xblUUghlsoear4f6kkwDwYDVR0TAQH/BAUwAwEB/zA2BgNVHR8ELzAtMCugKaAn
-hiVodHRwOi8vd3d3LmV4YW1wbGUuY29tL2V4YW1wbGVfY2EuY3JsMA0GCSqGSIb3
-DQEBCwUAA4IBAQCP4qUyKkYD6hXaozV29opSo1sOdQ+voCe9lCTMnFEaCvCO22IX
-ViyvNyR6cDt/wa2eeXCRzhOr8vXLyxUOZg0gMDuOxhMBWhdJUNowNrk5jLw2RdFG
-OOB53m2JW2E7JNVsheRzKa+98xW7BFjkZKjrowFptZFDrtPFbGg1ETy+mPY74RVj
-T+ebESqd/Q/hQUQYfvLUgbcVUF28nXzQ3EWxSL64wpheFDbYEdE97h3Z4tJX7MYi
-nOdw+Hn8jss8xCjijk99MgI08GYqgYqCZP7Xka9tyOmD7FYFVnderU+aTCxEYbK3
-9/R7Y+PEaqamKZKXhYh8isjZz/EOiHYz2YjU
+BgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRl
+IEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5vcmcwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWKIwjdRIp9IrpZELN/ZsN13Xj
+qQI6n086PNJ7BZfLi0+tD164rmxFk2eukNNksFCPhvMkqUxouGhc4mJjeivvrZxR
+oT3cblOQIkkdEci6iTKC2E1a20W/Ur7cTXoIsnKwjiUjXk+cujkrZu4fcHX+O4vy
+wTd5tEbhmifT/4u5nN8U2vBcEZqkGHOCp30VZSxtlGwqp4lc+tVziF3uFViW9MXk
+3bVt+s1E7ztwG7+WBgVlLYe3CNSWkMxfyYBafH/l7iep6AFjoTn1z3AAjYi7IUNN
+0JkW8MTgafRQIu4QsV5luq/Tiar2vwAm/GNgUJdSzUKARsfQzb/XTIgnLQqtAgMB
+AAGjUzBRMB0GA1UdDgQWBBSijSC03/Thi6EOdM91V33zsbQpgzAfBgNVHSMEGDAW
+gBSijSC03/Thi6EOdM91V33zsbQpgzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQAvKEfmCDoMTKC6bfP6DSs+MSAGc5tCr6w6cz2AKNJ2fOMhkq55
+JF47oBBGm9SdTB6Jqo6c109Ps69/+LMtEEGwvzL0RL0WAuTYGo6sudm9hj/jDHZh
+pAqi/2BQQeVgTa6oW0jtNPFe+/cobXo9TJ7wECGrhvVbmfl5ZPc0YVOIjjR0/LhL
+q7lqPAlJ5vx0WvsX+QReN97we8vD0x1D3mCySJTi3Irh+grE0yJOSN2fa7cyqi9+
+vSiNUB1eUgQwrO+S8ZazYNvAZXC2Xf4WB4SOifJD73pYPAdwOejc0FA+zfEKa/6/
+vTUs8cIhlmDWO+BEoc9wygMKMmhT5s7/T5Bv
 -----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/ca2.pem b/samples/net/wifi/test_certs/ca2.pem
new file mode 100644
index 00000000000..2b872d2e30d
--- /dev/null
+++ b/samples/net/wifi/test_certs/ca2.pem
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEBzCCAu+gAwIBAgIUK8+d+8IOzeX+DP3VSvdF3lHiCdcwDQYJKoZIhvcNAQEL
+BQAwgZIxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIDAZSYWRpdXMxEjAQBgNVBAcMCVNv
+bWV3aGVyZTEUMBIGA1UECgwLRXhhbXBsZSBJbmMxJjAkBgNVBAMMHUV4YW1wbGUg
+Q2VydGlmaWNhdGUgQXV0aG9yaXR5MSAwHgYJKoZIhvcNAQkBFhFhZG1pbkBleGFt
+cGxlLm9yZzAeFw0yNDEwMDgxMDI0MDZaFw0zNDEwMDYxMDI0MDZaMIGSMQswCQYD
+VQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hlcmUxFDAS
+BgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRl
+IEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5vcmcwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWKIwjdRIp9IrpZELN/ZsN13Xj
+qQI6n086PNJ7BZfLi0+tD164rmxFk2eukNNksFCPhvMkqUxouGhc4mJjeivvrZxR
+oT3cblOQIkkdEci6iTKC2E1a20W/Ur7cTXoIsnKwjiUjXk+cujkrZu4fcHX+O4vy
+wTd5tEbhmifT/4u5nN8U2vBcEZqkGHOCp30VZSxtlGwqp4lc+tVziF3uFViW9MXk
+3bVt+s1E7ztwG7+WBgVlLYe3CNSWkMxfyYBafH/l7iep6AFjoTn1z3AAjYi7IUNN
+0JkW8MTgafRQIu4QsV5luq/Tiar2vwAm/GNgUJdSzUKARsfQzb/XTIgnLQqtAgMB
+AAGjUzBRMB0GA1UdDgQWBBSijSC03/Thi6EOdM91V33zsbQpgzAfBgNVHSMEGDAW
+gBSijSC03/Thi6EOdM91V33zsbQpgzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQAvKEfmCDoMTKC6bfP6DSs+MSAGc5tCr6w6cz2AKNJ2fOMhkq55
+JF47oBBGm9SdTB6Jqo6c109Ps69/+LMtEEGwvzL0RL0WAuTYGo6sudm9hj/jDHZh
+pAqi/2BQQeVgTa6oW0jtNPFe+/cobXo9TJ7wECGrhvVbmfl5ZPc0YVOIjjR0/LhL
+q7lqPAlJ5vx0WvsX+QReN97we8vD0x1D3mCySJTi3Irh+grE0yJOSN2fa7cyqi9+
+vSiNUB1eUgQwrO+S8ZazYNvAZXC2Xf4WB4SOifJD73pYPAdwOejc0FA+zfEKa/6/
+vTUs8cIhlmDWO+BEoc9wygMKMmhT5s7/T5Bv
+-----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/client-key.pem b/samples/net/wifi/test_certs/client-key.pem
index 20ca0796572..6ab70da2452 100644
--- a/samples/net/wifi/test_certs/client-key.pem
+++ b/samples/net/wifi/test_certs/client-key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIKh6bYnzze8sCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNtt6KHyCgBPBIIEyPOdtbZFuRkf
-NoEhloVT9ZbxSfYUOoD86w6OUgLW9I9zgH7v1lZ+Q6YnZ6lPxi+NthUvZZNd0M4f
-rEAkJMeVqCImk9C5DYUdsEyVxxbWCiBKuO+j14S8RaetKvTVlYZjdkdbwW4chwLs
-joPtKUtRMhWdQ5XF9qtVhmKjqHHTEFhOXP/VMCd6bNOkjzneuUDlLj+EOl8K1NVZ
-tpZUi6D2p0tksrMokgl3n0Esee4W6XKemJ8KyLkA34QGG/c2MQyQnBzqo+9FnLvr
-uX5DmApiichLMYDMssQjfyVUsDTz1bolTCWZcY2gz7zoHSJ3Twa4uf0D/Syi/pU5
-c4m1DvfY+BDt7GPG9S6eQHEIp/7m6jCKX90jYi297nEcJjYkXVUDe4Nx7a+oZkc4
-OIKP7VTVnhuUSjbN5h0UB1yNMA9t65IsXLPVVtn4b+eC/4RZyJAYuzJD8xpb9u4r
-bXl0qMW1bPyU2qdC5oheM2oLIvuSBKuRf2vvqKt7c5mahTWIUxNckkNeSQghJxw5
-uEgG/ji+ggL9YfPQiMt8Ps4754/mtOfzXGX3UTniuSpo7ddonqDQpHBvNiRdy6Dl
-pQTJczykNOe5HaMsfa/hyu22AVVKWQDLacFLvRqqps5JiH2A1dzBfU/GVeGYcl84
-BZUVO56tGMY64t/StqADVrW7AxTLB0tV90uNSg16oRQkRDIx5R5/Q9xlILCSPdvN
-i8qR6jY0wLgEot5hweCnbYjQ79n7H8NKAHe52TNbYts/S6jjqdWNu19JpNHV8Z7v
-aGlf5Puk4U+A8MhyjTVgWoOW+GNmyEiMXOTz66nrhtDFy3nzPjwQcMQtj3yTzHnS
-0P80cdY/k2tfBPT4BTbIoKbuuuXLXKQ0jZ0AETu1Z12Q7G6C5f0fOJ5m97qLOvbE
-dMgYPeeulbLr6Gw7CYfTE1wSj795z2d4SpbRSVNyN+iFccFD4tXhWk+lf8ym4/A2
-hsI2SS9TxBR93Fje6oTdeAlC0DIpY8117W4GhU+IZm9HqpD+DVcnLOAzRIl7urlW
-jqpEkZXce+CV9L614hdAjUHQZOj43P3Q/zXEr/ZcVP6+yuLFCf+JbRXUglUgpdQh
-McGVV09tL+Qbb/28yEygiw2m8HFAoUgMc2st4IkkO7XKX3Q8WVDSgqE4olAVE74g
-1OB8w2R96+conCWYJfLCGM5lwsGeB1z8Q/NncKToulnqTKft7Rg8SFyMxVlzygPr
-P9AMhS+wqXHbzhYb+dwD+DsbAtKl0Urp1ZjHSQrOrVtctDCnEX1Bx5ek+AgNExNp
-tv2yBnsBcCLXy5UZYw9rAH+m7t8dAjGOYV3he4GotjCjyq+VcZgpzG2iWCHOhfob
-1xtm030/Xuc4TfX76rWithXggSeKEhuqL2ERa/+OOC/JjE4omdmL9GVrr4vxt37U
-MeJpxymYEP05QfRxcbvJB1L+cGv4Tgy3XgikK8ClUQqKvPntXIoX4cga8O5FE5KB
-5H714hGK/JplhbCDDomi/hRHZHxae2MLnHgq4Rj7JWZ+iTUvLncfMdBBFdHF4qkr
-ZbhwJ3KIAbCcSvXFoYJy1oOOitYhgoAKksyVNrzOMiYMfQ3YKc+6sF6lHOFllawD
-RYTUnfN5ztaxB8OpKaPtig==
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQILVdWyEWhWU0CAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDMFReIusCg7gSkoUQZV2flBIIE
+0BIFQH7+0dc7wHIQQ1y0ao90rrK3ExtCABH6xp4OAHUNPR1549zSEak/9Ba6WLBp
+YE0m/lpLz4oUJE4Kd3rg4ekSZk4mapZoW7g5ax4qAEblmM6rqmyjiU0Q6tsAb8n1
+x+RyjUILlgTH1HDmeNA53QNMCw++xIMIJPN29SvFN6vkU2Fd2f74/TuZRSaCEPLO
+LKtNMwWCMTrlv0UewEryOvZegPQuEF/Ewmmw/9l5VfkPp6zAtZKzWsfk4jUo5tv2
+5dPoHR+RKjNNVwetnCq59QYMS2My6KLqX4Vzqnbu8K1nlbm85ZHnvLGi8cDn8EB7
+QtRL+Ev5IwcwYJgV5AMojouJLQdR655jeITWI1Gsohz28YG8c1qYX4ZN6albSd1G
+fd1tMOWkeu4uEzJ7ijLDfnCzrklnLuAZx8yLzyrOa7i9AwwJmdgUEdbWWsru3L6C
+zDJ45rpA0FobdlTem4kpoE9yiyHkIhf3wmI3X+0aodC11pdbHP260KIC8E1K9FUh
+s/IoEQCYrBp8UltNTlezwq/E5uOuIu4EpfjEgH1Z3+hSDbnmMAXNX4DbL234x7iy
+3Y256DtOeHSElnRz3kDnZVNtM1Kd5fgEYJ1ptYRPYaWyJka7/hC/0UObuM9w+QeO
+OlG0QgumQFloyhDa9anPBK4sYJp4g1fK8golUDW4AdpFPNOJvvgOvQUzhPpHjr+N
+lpZ75Y6I3JSSKJ/UMlSCOqjak8oZtMtJNMfbx1lgwwDtgjDSJvSdl735gI9VmXXH
+qnlGEtyiQ7k1Z1a4HxiY2/CiDHvkymClir/Ik8gt+wmyT9c/9BcehLRf6PxMsDVy
+PCkty1LlzN+5tSZJtJnOiTlgsRn/w49Ohp74ITheSdb30/6PnFI+o8rcJHmrjN4d
+t3z/bCyWAeC8mS7m0wtXlyBeG9xvdyT8dDHAFOnqxX30dEwEbjNj58kWGAgRf9i3
+HlOAP8yRy7LAV7A4HEPnEzXBxYpsROUw/8d3Jtmr2nAp2hfKP339DYZPHZpRLjJr
+WQlJasHHLxHKKjSsuM06WsCO+Tt2FTSgGJuU6nFVK75fssmmJYzj9qMHVM6YSjfY
+sT0ZIWRgO9NLFx5O3QxY1wgMLhhv1FREy9NVnMU0W3A1u0F7dwHywZGha2IqEXgu
++UyWIJnePMvluV/s66AN/OpIxKU48c0B4l7XzXkHHd43tDUG3ztfRuPbWCHipuRO
+eo+vHGD01iBLSE1ZhrYLHKQhJvIKx/PIEaqJHP/Vy35AD/2/GH09TiIBHzX9aXie
+TiKFs30FQv7SpLNHNE7jUxsYGNUbYa70S/Vgn3wkKATcXpCc749XQV4OUbFoqkDm
+vuZOjkIOlm/OtZkUuDWmk96mgoVG/gWSEJPynJHUpmWdu/BCdYOgxBk/bmPa1leS
+Z5NbO0fGMnNhDMXYA5rqmVzABcNSYhgYw5aciWpBlgYHEYrPxZvCxWftIyb24oEk
+wdHEaFbIYbOoVZqo7Ym2hrvVrJb8Qdukf1BmUgfSSSc7BFoSrBUO4SNFtZI55NOB
+OM4rnkqfoYR0IpnxzPIpxpsWljG9QsgnTaffStDgIGXiAtBWJFy+44f1IS4EoC6B
++we1Q6atPwYSyPtG8mn4Ce0BNxLDUoFDLMQ7Bt8QBMeX
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/client-key2.pem b/samples/net/wifi/test_certs/client-key2.pem
new file mode 100644
index 00000000000..6ab70da2452
--- /dev/null
+++ b/samples/net/wifi/test_certs/client-key2.pem
@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQILVdWyEWhWU0CAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDMFReIusCg7gSkoUQZV2flBIIE
+0BIFQH7+0dc7wHIQQ1y0ao90rrK3ExtCABH6xp4OAHUNPR1549zSEak/9Ba6WLBp
+YE0m/lpLz4oUJE4Kd3rg4ekSZk4mapZoW7g5ax4qAEblmM6rqmyjiU0Q6tsAb8n1
+x+RyjUILlgTH1HDmeNA53QNMCw++xIMIJPN29SvFN6vkU2Fd2f74/TuZRSaCEPLO
+LKtNMwWCMTrlv0UewEryOvZegPQuEF/Ewmmw/9l5VfkPp6zAtZKzWsfk4jUo5tv2
+5dPoHR+RKjNNVwetnCq59QYMS2My6KLqX4Vzqnbu8K1nlbm85ZHnvLGi8cDn8EB7
+QtRL+Ev5IwcwYJgV5AMojouJLQdR655jeITWI1Gsohz28YG8c1qYX4ZN6albSd1G
+fd1tMOWkeu4uEzJ7ijLDfnCzrklnLuAZx8yLzyrOa7i9AwwJmdgUEdbWWsru3L6C
+zDJ45rpA0FobdlTem4kpoE9yiyHkIhf3wmI3X+0aodC11pdbHP260KIC8E1K9FUh
+s/IoEQCYrBp8UltNTlezwq/E5uOuIu4EpfjEgH1Z3+hSDbnmMAXNX4DbL234x7iy
+3Y256DtOeHSElnRz3kDnZVNtM1Kd5fgEYJ1ptYRPYaWyJka7/hC/0UObuM9w+QeO
+OlG0QgumQFloyhDa9anPBK4sYJp4g1fK8golUDW4AdpFPNOJvvgOvQUzhPpHjr+N
+lpZ75Y6I3JSSKJ/UMlSCOqjak8oZtMtJNMfbx1lgwwDtgjDSJvSdl735gI9VmXXH
+qnlGEtyiQ7k1Z1a4HxiY2/CiDHvkymClir/Ik8gt+wmyT9c/9BcehLRf6PxMsDVy
+PCkty1LlzN+5tSZJtJnOiTlgsRn/w49Ohp74ITheSdb30/6PnFI+o8rcJHmrjN4d
+t3z/bCyWAeC8mS7m0wtXlyBeG9xvdyT8dDHAFOnqxX30dEwEbjNj58kWGAgRf9i3
+HlOAP8yRy7LAV7A4HEPnEzXBxYpsROUw/8d3Jtmr2nAp2hfKP339DYZPHZpRLjJr
+WQlJasHHLxHKKjSsuM06WsCO+Tt2FTSgGJuU6nFVK75fssmmJYzj9qMHVM6YSjfY
+sT0ZIWRgO9NLFx5O3QxY1wgMLhhv1FREy9NVnMU0W3A1u0F7dwHywZGha2IqEXgu
++UyWIJnePMvluV/s66AN/OpIxKU48c0B4l7XzXkHHd43tDUG3ztfRuPbWCHipuRO
+eo+vHGD01iBLSE1ZhrYLHKQhJvIKx/PIEaqJHP/Vy35AD/2/GH09TiIBHzX9aXie
+TiKFs30FQv7SpLNHNE7jUxsYGNUbYa70S/Vgn3wkKATcXpCc749XQV4OUbFoqkDm
+vuZOjkIOlm/OtZkUuDWmk96mgoVG/gWSEJPynJHUpmWdu/BCdYOgxBk/bmPa1leS
+Z5NbO0fGMnNhDMXYA5rqmVzABcNSYhgYw5aciWpBlgYHEYrPxZvCxWftIyb24oEk
+wdHEaFbIYbOoVZqo7Ym2hrvVrJb8Qdukf1BmUgfSSSc7BFoSrBUO4SNFtZI55NOB
+OM4rnkqfoYR0IpnxzPIpxpsWljG9QsgnTaffStDgIGXiAtBWJFy+44f1IS4EoC6B
++we1Q6atPwYSyPtG8mn4Ce0BNxLDUoFDLMQ7Bt8QBMeX
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/client.pem b/samples/net/wifi/test_certs/client.pem
index 0de5748bf03..9e815474cd8 100644
--- a/samples/net/wifi/test_certs/client.pem
+++ b/samples/net/wifi/test_certs/client.pem
@@ -1,64 +1,22 @@
-Bag Attributes
-	localKeyID: DF 33 79 D4 52 3A 61 87 BF DD 0C BC BB 90 F5 1D 8C D0 02 1E
-subject=C = FR, ST = Radius, O = Example Inc, CN = Example user, emailAddress = user.example@example.org
-issuer=C = FR, ST = Radius, L = Somewhere, O = Example Inc, emailAddress = admin@example.org, CN = Example Certificate Authority
 -----BEGIN CERTIFICATE-----
-MIIEgTCCA2mgAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBkjELMAkGA1UEBhMCRlIx
-DzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQKDAtF
-eGFtcGxlIEluYzEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5vcmcxJjAk
-BgNVBAMMHUV4YW1wbGUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTI0MDgwNzE4
-NDMwN1oXDTI0MTAwNjE4NDMwN1owdDELMAkGA1UEBhMCRlIxDzANBgNVBAgMBlJh
-ZGl1czEUMBIGA1UECgwLRXhhbXBsZSBJbmMxFTATBgNVBAMMDEV4YW1wbGUgdXNl
-cjEnMCUGCSqGSIb3DQEJARYYdXNlci5leGFtcGxlQGV4YW1wbGUub3JnMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz6mI+213GsAcquAlq0/MMUDbbpjz
-PxurB+9NoQ6xNpoUzK8x8hhC8tORkXi2stCbZbIFISMdtuDzshZ7BBLA32lX5/q0
-YNCS6czcuxnkbFgunfaA6VupK/dx+9GULTMKa7TVNyIhid9NQBowz2BB8n4lHQjS
-g3fkZgR771e3xqZ8xaEKlA8+/lCRHUtjiUtzSFMbQDBA+Liu9cRpb+4xk93CNOk6
-WmHI7reGzJrC8YPc3ngFRvp1ujw0BHlp+AYfwnPPTn7mWYBgJQwfrkECzt/vTIhS
-CJgsvM2bMI/HK30EvCLJb3NheSfZFo5fzkmWk8NK8B1p/d6/SPoul8L2QQIDAQAB
-o4H+MIH7MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMBMGA1UdJQQMMAoGCCsGAQUF
-BwMCMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly93d3cuZXhhbXBsZS5jb20vZXhh
-bXBsZV9jYS5jcmwwNwYIKwYBBQUHAQEEKzApMCcGCCsGAQUFBzABhhtodHRwOi8v
-d3d3LmV4YW1wbGUub3JnL29jc3AwGwYDVR0RBBQwEoEQdXNlckBleGFtcGxlLm9y
-ZzAdBgNVHQ4EFgQUpBSja2rvRXhlulUyZ8ZEDLS0j4AwHwYDVR0jBBgwFoAUQl34
-Jn7xx5zTXckus4k09ScmfUYwDQYJKoZIhvcNAQELBQADggEBAENOA88x6RMfT73L
-hBQBT45qqvLK4GRGhqXDcj/E4hiZ0fX39r5PSUA+rbVbWjlJzW+gnsHWIdDASg4H
-ZlMSYCgU6PN7hhJ1gmc0736V1t1vS63x6502fzNG7TMEvyWP3iadVjkn+sH8Q83d
-AHwJjaKEq0SQYQof4QZZcxaBVLwh0buck4QLpeBYKeGpEiRK+AWireJMNFmBRHpG
-R2E0I/B/duICWoL/8E/PCK7Ys7fUcGtIekEOCToDPW39uoU79mTjXrv+F3NO6Z6p
-CwY9WqlHV0jLrfpdEMQuN2Pl0Qi8N2R0vJLrXRxbSrIkQbZtKyUG11XQBPgl5ZPz
-KbHL9JU=
+MIIDojCCAooCFGZ4UJXBKG70aewILFtsy4mbvaYZMA0GCSqGSIb3DQEBCwUAMIGS
+MQswCQYDVQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hl
+cmUxFDASBgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRp
+ZmljYXRlIEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
+cmcwHhcNMjQxMDA4MTAyNjI1WhcNMzQxMDA2MTAyNjI1WjCBhzELMAkGA1UEBhMC
+RlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQK
+DAtFeGFtcGxlIEluYzEbMBkGA1UEAwwSY2xpZW50LmV4YW1wbGUub3JnMSAwHgYJ
+KoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMu3HXJvi2Q4hQnLL4v/sCyEr5x+ZtBcSi2yETMViaf2EStW
+UOs1A1pmCQbO7nadLQcWaX4tzefQCRrs1X4hIQuDIqRPNi6h6G1g5HEtqBWZhvwu
+hDbmFiX8/Vtw/P0/9sox2DzyLG0mjJUAYAbKtyC1kQalybVBtrSaazyyAyh6oOuU
+chAb7SmmNDsRB959TWM/mp+6yCcFGzCDKNBwlwthB6Uw92d3SfOyXEnZm8rPf0hV
+4ICL5iB+xEYBv1LKmznFK/4UAyKpxAygc5fxKVWwlSsq8MrES5ak0n6H71wViaXK
+BrH5yh9jEkK9XSeaUwg8C9eOOexyx/5JDY3TTE8CAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEAUNddNiRUlJH0acJJv8ztXNWjNewd17tAk1BBHp6yyGAD8b52p6QbDAdS
+xO3WsSc2bqSy599jp4GshO27TMQsBRMfoggCG21Aj6sIs0Hd4shTE4T0GUBEBxC2
+/HReuD+cGIzzKMYlvK8RPSaGLPvPw5SryvmOnjD368V0KCHwT04Z14i4sMxlkd5q
+wB7fxTkVla9MR4uWObX62mJykmqT86chScJpldtBpRh8wrEa3Gt9FZoi/eqP0De8
+oCxmCZDrozGTZ4IIaNzchx3Ensh1RQwvvxd6ATerYdUjq4V2TlTksDRdCXtj+uNJ
+FnB32sUHiIouxudAsqDf8UL9/99RCw==
 -----END CERTIFICATE-----
-Bag Attributes
-	localKeyID: DF 33 79 D4 52 3A 61 87 BF DD 0C BC BB 90 F5 1D 8C D0 02 1E
-Key Attributes: <No Attributes>
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIj62qIYenEeYCAggA
-MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBD+aD/Nfhvs8bsr44gG36xRBIIE
-0OA3BuJdNL3yo5SOVFXMbWeMj13B5yvQwqLRCPJmDesNSy6I2OLVQKr571IiuwBf
-xNytF8MNfZ/OAI7FcMDqf/so9s9zQZlgR5jZKzoR8c0d6NiXboW7HHlO1tk7PhwW
-T2dSFBcmfI0N4zug5vTYGVnOBtwk9F0BlFs8HZwa/5wXfdLnJVXT4l8enIU45Ssb
-MJXrLNZ8SRMSjnsatrPqPhRMtLharGhOAItj4uQ770WbjdMgPejeZOMQ6NAEl1CL
-NPeikRKZQzeBCBYnbAfOSTPNy0i2q28vKzc5e0gHPzqWg6r41/XsCGiKi/4pkwxE
-ZDhbBCLeGdlB7KX4cv6KTp5PtBKMrh4BxGsWrAALqOdt/nsNl8oPBe8j6/iSWDDw
-xJbemI8nFXAI6jAiz4RZS516eHJQT9uEpYdPUfluT17PPOotmjwkL2XuaMDjYOjD
-LOFSIX1Y8L7DPhayViY7hGyBWFDgozIl+us7H7q27SIJQAtoG4gS6w2qTE6UmDbG
-xqxluuQadfnrhtenpVJMwRQzf24txRsuHDTB/6EY3lqZhOvGZzwUV4RqJgg7G5Ix
-YUCiRrNrWGgbViTGpR87GkhBc84pXlTdIVb/bxl1myJ4QFya2oG4PjMK+wxlGJ3q
-8Ght0sz3xvDXLzoh3NYBBhqOj1zKHcUoVMLmxd+GinAy4FENc3cbZjAaTDprPbze
-1368MvGQkcwgxHmqhPIRaz+GPtLhxjPO/SDIkZdzwAGvy8AKS5HTAGcSvbcjcjXE
-3cY4DObY19MwUfsedXYcDzyEKS6OTgNSbfXPStBhijKA+joOzUKf36xEipV3J9fa
-9YtXf5MALkUcLqGKCa4OybAktvN/VBnZfieOyCM3vcTHimmyDhuyjxzJptMTjiH3
-BaBxgZpm0FJVKjTJ3+xkmIeMA8p475Aocs8F7aHqIO/MEMHDB5MuCui3h+Mzccha
-eR2e4Ldv5v8yFR+3Q+MIq8rELtIeNgG/ANldJEWt7paLsRXMXzNah1rdHb6oaDLa
-iou8ZcOKI6kBxj6GxcGN2HicWbqAXgoHAVN59siVOSUGI2rmCxxj1v38oY61IahZ
-k9nde23oAhTnO02ovRXkVNArBE3cEQPbBqwv09rrO/HQqHXRVNu/qFuA/oEopzjI
-lZFUel4IjUQJgk7+1pY/OQzJQR9wfEXMOW4fXG+tL90sIypv115CbYXiUy3tOFcs
-XX5QhDnrSo69Be4ZJQBBY9JEtOPlZCA9C+6Q0zxpNctfj091N7e8nWg2a+DHzpFz
-Vdoa+xGCUMkJZopsnjEStfSTYqgCuPRSRIf8a1i9U2QnLXOFjmu2YUfa06JuQIXK
-lpJxyMmUmd07KiTH3Da0/3V9W++zSlVpT4hHD6zvZ/OzpPKL74cGgtNFMOVkFCjr
-KUcrg7JCxrVb1zZ/Y6CIdpRMFv5/94M67D8hX7aSiPgzGXwwuUzZlygbOZa97s3U
-nKc7ZgVqiNCR6HH2Vhc2A2fuu9aErdnqr6tcbxiWTVORSQxIHCchX/+5+4XtKrHm
-EOPmhwehDEsyFqHwBd/T8xdz/wb8ct+ce1HbzRe8UXjeGsTSPQVuMF4wjHP1MvEl
-0BTRDQlqETtBvtxzZJ7cABWpZqdrZEUtrdD90jd6ZQrF
------END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/client2.pem b/samples/net/wifi/test_certs/client2.pem
new file mode 100644
index 00000000000..9e815474cd8
--- /dev/null
+++ b/samples/net/wifi/test_certs/client2.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDojCCAooCFGZ4UJXBKG70aewILFtsy4mbvaYZMA0GCSqGSIb3DQEBCwUAMIGS
+MQswCQYDVQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hl
+cmUxFDASBgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRp
+ZmljYXRlIEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
+cmcwHhcNMjQxMDA4MTAyNjI1WhcNMzQxMDA2MTAyNjI1WjCBhzELMAkGA1UEBhMC
+RlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQK
+DAtFeGFtcGxlIEluYzEbMBkGA1UEAwwSY2xpZW50LmV4YW1wbGUub3JnMSAwHgYJ
+KoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMu3HXJvi2Q4hQnLL4v/sCyEr5x+ZtBcSi2yETMViaf2EStW
+UOs1A1pmCQbO7nadLQcWaX4tzefQCRrs1X4hIQuDIqRPNi6h6G1g5HEtqBWZhvwu
+hDbmFiX8/Vtw/P0/9sox2DzyLG0mjJUAYAbKtyC1kQalybVBtrSaazyyAyh6oOuU
+chAb7SmmNDsRB959TWM/mp+6yCcFGzCDKNBwlwthB6Uw92d3SfOyXEnZm8rPf0hV
+4ICL5iB+xEYBv1LKmznFK/4UAyKpxAygc5fxKVWwlSsq8MrES5ak0n6H71wViaXK
+BrH5yh9jEkK9XSeaUwg8C9eOOexyx/5JDY3TTE8CAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEAUNddNiRUlJH0acJJv8ztXNWjNewd17tAk1BBHp6yyGAD8b52p6QbDAdS
+xO3WsSc2bqSy599jp4GshO27TMQsBRMfoggCG21Aj6sIs0Hd4shTE4T0GUBEBxC2
+/HReuD+cGIzzKMYlvK8RPSaGLPvPw5SryvmOnjD368V0KCHwT04Z14i4sMxlkd5q
+wB7fxTkVla9MR4uWObX62mJykmqT86chScJpldtBpRh8wrEa3Gt9FZoi/eqP0De8
+oCxmCZDrozGTZ4IIaNzchx3Ensh1RQwvvxd6ATerYdUjq4V2TlTksDRdCXtj+uNJ
+FnB32sUHiIouxudAsqDf8UL9/99RCw==
+-----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/server-key.pem b/samples/net/wifi/test_certs/server-key.pem
index c9defa1229b..5f032cad701 100644
--- a/samples/net/wifi/test_certs/server-key.pem
+++ b/samples/net/wifi/test_certs/server-key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIU44Xbg9l+1kCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBx6SOeZLPFiBIIEyBbU4bj1/Sq0
-W5O13hWtq34nTHG+HtgOG61u8659V+0Txbd6E6gBlMTUDtczKCb2BS7D2uugSwTR
-Xj1CeLha1qfsWT3IEe38KB/r+TXA1CESblkHBeYjHYOhOoRSNjg8e+QddFim4uuN
-6eCqgia4jJjC4jT7gLhoUgMtLKxGiw/iVsLme//p1czB2sNNy441Cp2smwvP6GqC
-rymGKgmmEa3pqFm72jO77kev71gUYxPJLXg6bGJ3HBBD0iN79rlCgMTru4s/C/G6
-VoTLCxJrYNiRGsCNu1PM4DtZgQtL32il+u/thZzE6cmh6Yqzkv9G8JXRIakoZctN
-JOwOgbyQLwbAV/0OpZcX0rWKGbO2AO1RmayEJrTBp98qbOW1SrJf2HVAqzevaxOy
-ZqyLbq80x+6wH1sg200tnfwGO/2nz1U7yDTJ4tMuMeJYvAHB5luXYOBrL7AmUJjZ
-CLY/BaN90amz3h1/ZeooMslB1ldjNznLYfrmYc7E1UKWUd5CRjbh6f+k/iYp1wuw
-W2O9qW/aatQyrcWMLboJLTs9XarTFXYSA66bvhPfP/lP4BPm4eQM1xCS7qSjbJMK
-OuTX9J++ZzNIiUJjFTAWW4cIEKkJ+PpljTgdcfnwUCGUcxuqJaVbWVrPstc2tyjJ
-8Ravtr5Fp79dYsD5xSB31ATiAVehp0Zn7lorwmFZ1fhZNMOaFjDk0e3GJPrWgTGY
-DUyeN2Ec/lY76+nTKLqpCPmP/aM3uOEsKEXmtuiYONnz1ZcRSXqAfZKW0Sv9iEQA
-IK31lNuU6CULXM6aUn0lwdoYKZ1S7SPwK6UmqSimBb/5FF5zaZPgzHKhClsnd6EN
-ToMDw18YD1rY6jaAxZdXiaI70i7V9S3RkfjlYkiaLEmjO44yg6Ae7xL0KbOut8iB
-ZCyMHRjobFCLWPTdplQux0xzPD0FXrl8GgJBmiY8SkiFh9NKDNyB6SodjVKXsIhe
-BPsdmh9E66XfHkI16LkkoK5eKgtVDpXVAJBAI2wURIwfIzfzOJ6SExQd3capXqfr
-HpC+sJJjAPy0hHTkv3RnzX1NHqYK5gHq/WCSda/4cl8ZepF5eoyJ8h+9TJzlTDJX
-REyt5iUvKbFT3bQ3WYwWUW6lEei16KK9Cm8ivZsEQqbeG0kP6lO3pG+WNsAYRXlE
-aXg8wgFLJRS/7llaB8xiZHZ0mMsj9UAwZd7gUkp1EjDt7A6f1KlYEtIXtQ9TVXhS
-kegWYMvJOpzJoOTcZ2Yu/wNUEAnnOnXzCrr5EAD3aHUwaSHfj75y44uHrYtEKEyO
-Q1bhRhSC5rFcEEomHofy7PlJqoynxMxOd6VZdSpMr2fSDKO36aY8bGD7ST0hpHrs
-6NNbywy23G68YX6QREwcuT4EDzIQOQsl7GCSx8KVibubsYcGSuXSVlBMI9sLOtsA
-AwSAXOyGoVrmms79ekp4O4Pzq4vqE61KEh8K0/h5qDJ8+c2kqQl5eeDkDwtBYwjD
-oYKRlmCkKzoo7qW4uIeVy4ZeQIuzWcCWnSZumtBa2mLlo4w9njmwgPR0wtDU8daW
-+0CL828/eNfIN3awo0VeAJ8nbZlKL2ioyND9KNXjJ2fJNuwyrWv9c5fz/NeWgv9O
-Z2S6ZI0xPgZJNQ6rLcPigA==
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIjI78fcZSH7oCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDfF676hRrL290F0MgMDZiuBIIE
+0Hkz7skRV8Ox0SoX5N8GsOPfN4PS1cLyHgokY6dUhJPU5vUzOn9iSiGQSEzSguQ7
+11mssjRC2T45wB/95VK2EPtRw1f/6VOUR6RJnnGb0PV1Rydp/x5TZ6vzcXpakqly
+eljJR/20fIJClsZzhw0iu5la9fkF6G8WYFEkqex5jALSiN4qVLvkiqcTnh5+amem
+8+OCKgvgooKD2ids4/0GGfJRQSC6DFf3kuxNl+MMvmDXmz/vrD85ONnyXzKXDA3N
+3vRgL/YT6GzwIXb+7/c/tIMpnacxPAdbNOs3DY5ss4xcK68L5PwpM2BljzBa5dGw
+Smgf2VRaYRVzmrte5j280QjfrlHRU2cHaxm0GCu2AOTGwMXcSNYMXfDNuxc57oQJ
+vHXMeZD4K5lACbhYdZ5lJNFvv29YI7dZ7QOGu6nXlAuhZfbdc/cgT0som7eG8xpT
+pERllhQ5ych9sP9nAccN6VUsWgmlF73lbSptBek1ccYkp9LIYCteJUPl2qPcz6zl
+A7zrZ54f3Lg0fOm2pCtg+qKBiw1nd3MR/YbRCgyvudyZE2cCN/ZspWqxsavbGYOz
+JOfIFNnyAcOYtEv1n1BGLfMa1THW2bDV8XmHVHUtM0k4z250QAmLygWLY2166iUF
+qotBkvctKKdulzGdT4nVer1UEKTqcxhDf0dRiHN5spZtFrOee0uGIoQWHt2oecaK
+pJovW+i0qO/1DG5spfU2m1bz6jR2u6nxi340oRrMSoe1ELVg3l1/wmM8yzh07GuK
+pshzxwqAG/FnaKCvcKGUG2EfnAvOcbMgSa2w3GvyRkcDPn00arvX9nuXj0gkRDBi
+eoVMkKKTeeYSGQ4ik+ja3xkgHcxh5W8aoezLvBbmUq206cmhLwfnYMhnvFTs6EBK
+E0ENpCHwF/qoVBIzRCijG/eeCuf3a1YkJsWlvEeVrPeOmDFeDft3SSGOzHxE2A/7
+HWmHbWTm7dPOfgsU4zf+HglnBjN3kYU7StyM0EGxmB4lfB2BiWiL/3R13ERHQZfa
+oOqa4/hOFXOXfTQk6ufXtBx8L9BemBqh36zbs2xVvIizJKeRMruoRblWZkHhUKR8
+K5GA7FYkU9ZPPP0UPKsO94xzwfbevi+7nWeUZoqcqAUy8Jt5aD2QpvFVbPBBOz17
+PGaubeVn/Ry8swPvkpddtmJ4mgF+3SVctmzY+EE/oN1XS8wa+XeuaThzk89Lvrfa
+606nRWrNw3PSKjYoEEtRLhPeJCi9uOVenbOjtclio9mV5Sugwurolczvq8DAGpMG
+W4WgALgOWDjQAudiNH5dtcMGkBONbYywkJc7cT2OZFmzkCbchPPWlKGopuaFGAoU
+SPj7C9SenHmOWAFRX5jJrOZAuVqkdKN3ShWZUL+cDkOCCQlZ0E31u0m9yozY1MeO
+Sx42GtZaSGff37FGYeMZM2ztlutw2zmv2B1g52SBHTjCqQU/ud2Q6/U0kUzjbsdF
+/0KQY9wgZRdOvbnA2lBirN1rXzLWPdduOZ5QImfHfvToN+oOlEqVvvWG12DdA4e5
+y4Dumx00lfKEsGutjF3oKgE6jsjwqAwCoYEAFHTtsvA0hKPisQwNHZmpjGARvR56
+yMEmXynKvgyVGvVP2a9VdqBXSpstL24HfDIu+nlyEWGQ
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/server-key2.pem b/samples/net/wifi/test_certs/server-key2.pem
new file mode 100644
index 00000000000..5f032cad701
--- /dev/null
+++ b/samples/net/wifi/test_certs/server-key2.pem
@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIjI78fcZSH7oCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDfF676hRrL290F0MgMDZiuBIIE
+0Hkz7skRV8Ox0SoX5N8GsOPfN4PS1cLyHgokY6dUhJPU5vUzOn9iSiGQSEzSguQ7
+11mssjRC2T45wB/95VK2EPtRw1f/6VOUR6RJnnGb0PV1Rydp/x5TZ6vzcXpakqly
+eljJR/20fIJClsZzhw0iu5la9fkF6G8WYFEkqex5jALSiN4qVLvkiqcTnh5+amem
+8+OCKgvgooKD2ids4/0GGfJRQSC6DFf3kuxNl+MMvmDXmz/vrD85ONnyXzKXDA3N
+3vRgL/YT6GzwIXb+7/c/tIMpnacxPAdbNOs3DY5ss4xcK68L5PwpM2BljzBa5dGw
+Smgf2VRaYRVzmrte5j280QjfrlHRU2cHaxm0GCu2AOTGwMXcSNYMXfDNuxc57oQJ
+vHXMeZD4K5lACbhYdZ5lJNFvv29YI7dZ7QOGu6nXlAuhZfbdc/cgT0som7eG8xpT
+pERllhQ5ych9sP9nAccN6VUsWgmlF73lbSptBek1ccYkp9LIYCteJUPl2qPcz6zl
+A7zrZ54f3Lg0fOm2pCtg+qKBiw1nd3MR/YbRCgyvudyZE2cCN/ZspWqxsavbGYOz
+JOfIFNnyAcOYtEv1n1BGLfMa1THW2bDV8XmHVHUtM0k4z250QAmLygWLY2166iUF
+qotBkvctKKdulzGdT4nVer1UEKTqcxhDf0dRiHN5spZtFrOee0uGIoQWHt2oecaK
+pJovW+i0qO/1DG5spfU2m1bz6jR2u6nxi340oRrMSoe1ELVg3l1/wmM8yzh07GuK
+pshzxwqAG/FnaKCvcKGUG2EfnAvOcbMgSa2w3GvyRkcDPn00arvX9nuXj0gkRDBi
+eoVMkKKTeeYSGQ4ik+ja3xkgHcxh5W8aoezLvBbmUq206cmhLwfnYMhnvFTs6EBK
+E0ENpCHwF/qoVBIzRCijG/eeCuf3a1YkJsWlvEeVrPeOmDFeDft3SSGOzHxE2A/7
+HWmHbWTm7dPOfgsU4zf+HglnBjN3kYU7StyM0EGxmB4lfB2BiWiL/3R13ERHQZfa
+oOqa4/hOFXOXfTQk6ufXtBx8L9BemBqh36zbs2xVvIizJKeRMruoRblWZkHhUKR8
+K5GA7FYkU9ZPPP0UPKsO94xzwfbevi+7nWeUZoqcqAUy8Jt5aD2QpvFVbPBBOz17
+PGaubeVn/Ry8swPvkpddtmJ4mgF+3SVctmzY+EE/oN1XS8wa+XeuaThzk89Lvrfa
+606nRWrNw3PSKjYoEEtRLhPeJCi9uOVenbOjtclio9mV5Sugwurolczvq8DAGpMG
+W4WgALgOWDjQAudiNH5dtcMGkBONbYywkJc7cT2OZFmzkCbchPPWlKGopuaFGAoU
+SPj7C9SenHmOWAFRX5jJrOZAuVqkdKN3ShWZUL+cDkOCCQlZ0E31u0m9yozY1MeO
+Sx42GtZaSGff37FGYeMZM2ztlutw2zmv2B1g52SBHTjCqQU/ud2Q6/U0kUzjbsdF
+/0KQY9wgZRdOvbnA2lBirN1rXzLWPdduOZ5QImfHfvToN+oOlEqVvvWG12DdA4e5
+y4Dumx00lfKEsGutjF3oKgE6jsjwqAwCoYEAFHTtsvA0hKPisQwNHZmpjGARvR56
+yMEmXynKvgyVGvVP2a9VdqBXSpstL24HfDIu+nlyEWGQ
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/server.pem b/samples/net/wifi/test_certs/server.pem
index 12b9a5458bd..d8f82faf6dd 100644
--- a/samples/net/wifi/test_certs/server.pem
+++ b/samples/net/wifi/test_certs/server.pem
@@ -1,68 +1,22 @@
-Bag Attributes
-	localKeyID: 70 E4 1E 20 0B 8A 3E 65 06 98 99 29 C2 A4 26 33 38 D8 94 23
-subject=C = FR, ST = Radius, O = Example Inc, CN = Example Server Certificate, emailAddress = admin@example.org
-issuer=C = FR, ST = Radius, L = Somewhere, O = Example Inc, emailAddress = admin@example.org, CN = Example Certificate Authority
 -----BEGIN CERTIFICATE-----
-MIIFZzCCBE+gAwIBAgIBATANBgkqhkiG9w0BAQsFADCBkjELMAkGA1UEBhMCRlIx
-DzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQKDAtF
-eGFtcGxlIEluYzEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5vcmcxJjAk
-BgNVBAMMHUV4YW1wbGUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTI0MDgwNzE4
-NDMwNloXDTI0MTAwNjE4NDMwNlowezELMAkGA1UEBhMCRlIxDzANBgNVBAgMBlJh
-ZGl1czEUMBIGA1UECgwLRXhhbXBsZSBJbmMxIzAhBgNVBAMMGkV4YW1wbGUgU2Vy
-dmVyIENlcnRpZmljYXRlMSAwHgYJKoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLm9y
-ZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtkktsya+B8p8x5/P7t
-IDIVcc0E6PPUklUmrcAzBuLNdnHH0FCbzqqsE+28L36gyriNv+l0EOvvnV3LJJdc
-RO/6Ee4NHjO/GKcmTCDOC1KSl7yP+IaPog/f86UJ1rTOQpnpCi/uB3Gd3ZocZ+s+
-5fnPCVFdAaRfLs8fVbJ3Lt79E/FiVhXXjG4/wFMGHg/6P3fsq5B+VqUww8xUjfZ9
-MUuo+MYP5CPYJHfhuIwNHsunGKsmjMtQ4nR84huTOKy9+YVsKr+GRzGy4aC3ElCb
-HTU+axLVcVPRgpsdCaFzXLAg5L//rufgWI7NKIV16t+6q/3euFWPHYW3lqdAWMD4
-yssCAwEAAaOCAdwwggHYMB0GA1UdDgQWBBT5kdLsBRD8WBlzoAmLWRMZf6PvOjCB
-0gYDVR0jBIHKMIHHgBRCXfgmfvHHnNNdyS6ziTT1JyZ9RqGBmKSBlTCBkjELMAkG
-A1UEBhMCRlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQw
-EgYDVQQKDAtFeGFtcGxlIEluYzEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBs
-ZS5vcmcxJjAkBgNVBAMMHUV4YW1wbGUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5ghQ1
-f/ABa8HTFuVRSCGWyh5qvh/qSTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAw4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0
-cDovL3d3dy5leGFtcGxlLmNvbS9leGFtcGxlX2NhLmNybDA3BggrBgEFBQcBAQQr
-MCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly93d3cuZXhhbXBsZS5vcmcvb2NzcDA6BgNV
-HREEMzAxghJyYWRpdXMuZXhhbXBsZS5vcmegGwYIKwYBBQUHCAigDwwNKi5leGFt
-cGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAX5O3aUlupNs8C0blKzGJosqKoEP1
-D0/RUESK6443TlK2hAImSE/qz9JGQ4tMSO1bfnYUS9Mnk4hStlG4gg6F/B4nV1eZ
-qbHEFWCyhCAlUUeDF+8Lz2G6wYXrw9pPe1GpQSFdHLTV2WKVK0IaRaote8bCQHBm
-bgNbfZVXK4JJKX0Wg+ECNQv8bGA/WwZ+QKOcjemaa1kxwi9PFRNOIOdFfk1zKXHz
-D6Ex0hFzl2dt+aSpmb93Fo4wDz1rtCJ7HGo1TtUbDdDwDoZv8SKsAI7XtDmrqqP/
-MZa+lI5xVXCsSBDppGZb6BVkl3AfUIIhbCDqj1MT9vXqjtaWsyG4F3iHuw==
+MIIDojCCAooCFCPQcj7ej5jhr6/mLlAoLYgfgsYcMA0GCSqGSIb3DQEBCwUAMIGS
+MQswCQYDVQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hl
+cmUxFDASBgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRp
+ZmljYXRlIEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
+cmcwHhcNMjQxMDA4MTAyNTI5WhcNMzQxMDA2MTAyNTI5WjCBhzELMAkGA1UEBhMC
+RlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQK
+DAtFeGFtcGxlIEluYzEbMBkGA1UEAwwSc2VydmVyLmV4YW1wbGUub3JnMSAwHgYJ
+KoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBANcE/OPHQK/y1b6UsIktNK7WIZB528HECY7Bz18EGba0uHod
+91RbzHSJ1qI3iQyldI1UW/kY5oYjBW3lhLH0BkD/EsqvNYCV+3YzAM3ITtdOdEU9
+CqjgXttehQHfXvc7jQlF8Q2gYPUz2dDLo/gcTkz1d+mCr6nQUjT8Kq/nG54T0NnD
+k8udchjUlNaQsvx/WVs3TUYxMbWzQRtpJIbv99rAWq7YgQbkNZnSYC1VgrU/BiuQ
+0KrP6rfkxvBCGwIh2JXIL3FV4N8AsgGZvjXQ3zXKXwuPhxWdSmjKWlioVM3mha2A
+/1e1gX6nFY/uk46D60XWxcJ6tHGHoafU7EtN3zMCAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEAWwdTMphD0jxLtYO0iq/+fMtq2R96ZUN9wprZ7qg1evUNQjqLR4jKX306
+ZJX5uw+6r5Ve/k368qvcSF/sSfvBm8yd3JcegTl5t8T2/Aks8o3sfyuS0uyJC1rS
+zTrd7FmJG9YMosU1BqYobda64MXq7g+6MyrQoZ6fVdPvC6Sox3+a4fl9xjdm4CTY
+MsWqBJMe26LptvRIJ01/B6PjVTvsn/fxxj7rHmnJ/j63AIiBntm0vV/85cwYy/4o
+HlPH/Qjvn3hZjUlBcveiYat998F+s9gH2usvCkG3kly/n1/667LLCymmCHxtH8ka
+7tF3siO1EANureFY8qj6ZvlKeTkZ6g==
 -----END CERTIFICATE-----
-Bag Attributes
-	localKeyID: 70 E4 1E 20 0B 8A 3E 65 06 98 99 29 C2 A4 26 33 38 D8 94 23
-Key Attributes: <No Attributes>
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQI0/IqoquZd2sCAggA
-MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBA3/HwadBWDheQI/8p1u6j+BIIE
-0N7R2UwLzLVPv/QR/hfYtK56iUtq0j5dqW/1Yos5IpkmUhOdXa149OGmzUkM6JQ/
-GaYQ5TbCn0+/HZx0k1nLIHL0fOUlorW/6i/pfw+KMR0bZrPUoZJyukG7iFIcD5yB
-Pq6Q/QXVIH0qzB2lTTEa6TNSzM4PtcGd24Ivt7GwX8vz/bbW+gPCnAEbFKTrn1aP
-Dr5LRIn9MOStPox/PmCEysdrdgJ8W9BD9J7iviUOmfJckl7hc10j87SvqHDYuPIP
-a5QZnGanbsdOfYRCtg6jkLPiR7f3kS+aeITGx1iKdm+wqpcp1JelYmg3b9a0mSGk
-fLgOS8z0hmdPrPT4yZtU1MvjxPpbVcpP+S5idWWD30bit2c7lqW3shXjan+voA4R
-gYbJewXiJbjFCElj/EnvX5dFaJyBdeRcaIZcKhEwsTGJ/GI6S7nFdDNao4dXUESX
-CWgVQNcdqiK/OJ8blQR6+1vxajJNLqx5GwbLJdMbN7d+o8m0O7O+lygF3BiDYpp0
-niLrB+qTM2H5jGRe2Vwhs5HxU1b0uN85xqUHRppeFmNB4mEcpT0XZ0a5kZZhuCQg
-P48ONl46i1DAAKOAQ+WSiSQUBO+AmMlzNquCNstkSrEis4szfDOT/RQmlMwLEyb9
-3aXZwsHzZREi7gojsyEHyadeKhsblBITSD79MmVpPBhym6sok8QWgk4R4+Xsckll
-cxqhsczmGv/tSz71/Soqql6KXmtk7YUAWDM1YtF1K2pb4zF9q0/mp3MgUB7sjcfm
-HMFDD3KSMFGfP9ex4MTUlEFXoBS0jM1rC+L0OtSDsBs23BOJvgi3JArZD2WPUPeR
-1dxcrtqYFy1DGkCMZ8+24GmqXbaL+iG/vgyAyhjcgWet2Xk8BHpuYPWSoGlnmJTP
-tqLC13jU0to8S8H7vsrbUP5m+XN/sVXkYE86AOsMO+/g+1fcqQOu0fSdSOvNvw5c
-/56yHA/+bJJfcQyqoEpPrpR2npazcG0cop3FOP9eTvNERRO6ayXJjrq1Tl9Ok39v
-DRQy/TLt6tQtHjiTFDgiZI+PI7FVzSudCGa2oMKTyf8qDWUN65825oSL7e7jggFM
-8VFf1MBXb1lCIFIrukNnXuXnYMWtQYjvHS/vN3jP/BGnVW+rEupj/hq4gtv1J2Pu
-B5Qn8Q+szCz8ha6ziA9+iVt57SRakK87bZ7qEIIy4XTJBnCGHTVjQOn+aMHJ/76H
-wiw8CPgKKQMwx0JyySMfZih+LgxlibPpk76zNIw0eYLM4DQEwmx9LGXZ4TIPCyAg
-GiWeKYn4zD0ub634DBFRTmX5XGQhqmKSkCIKOs4/8yzmX3649vess85RJN4DjjGN
-njzxuInblVxVg0YvzlGQHXwwCJuG48yoTa3UPvqft67kOoBLh8Kky1kMPPtPm8yR
-ZT8E8VdYSg2ssyCpyfaV3RCnxsMpnFUER+JU0g6IxTpDqxA4zK5XS6Wt/KsdnU+1
-locA7O1+lcsDXf2FyDFtwPwNZIjchV1UDXSYr/fKyn10TDoSMeRTZsC0vwm2/9bW
-peH+nk/x93j29VZVzGk6hlpLC9MBRq/qGhNqIwklxtfIKLr0l5oMcWwm4h4dAVBR
-HUC0MTfbSTrC8mAsOglVa87dF9v1gnA2FVlRZEHJCGwe
------END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/server2.pem b/samples/net/wifi/test_certs/server2.pem
new file mode 100644
index 00000000000..d8f82faf6dd
--- /dev/null
+++ b/samples/net/wifi/test_certs/server2.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDojCCAooCFCPQcj7ej5jhr6/mLlAoLYgfgsYcMA0GCSqGSIb3DQEBCwUAMIGS
+MQswCQYDVQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hl
+cmUxFDASBgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRp
+ZmljYXRlIEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
+cmcwHhcNMjQxMDA4MTAyNTI5WhcNMzQxMDA2MTAyNTI5WjCBhzELMAkGA1UEBhMC
+RlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQK
+DAtFeGFtcGxlIEluYzEbMBkGA1UEAwwSc2VydmVyLmV4YW1wbGUub3JnMSAwHgYJ
+KoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBANcE/OPHQK/y1b6UsIktNK7WIZB528HECY7Bz18EGba0uHod
+91RbzHSJ1qI3iQyldI1UW/kY5oYjBW3lhLH0BkD/EsqvNYCV+3YzAM3ITtdOdEU9
+CqjgXttehQHfXvc7jQlF8Q2gYPUz2dDLo/gcTkz1d+mCr6nQUjT8Kq/nG54T0NnD
+k8udchjUlNaQsvx/WVs3TUYxMbWzQRtpJIbv99rAWq7YgQbkNZnSYC1VgrU/BiuQ
+0KrP6rfkxvBCGwIh2JXIL3FV4N8AsgGZvjXQ3zXKXwuPhxWdSmjKWlioVM3mha2A
+/1e1gX6nFY/uk46D60XWxcJ6tHGHoafU7EtN3zMCAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEAWwdTMphD0jxLtYO0iq/+fMtq2R96ZUN9wprZ7qg1evUNQjqLR4jKX306
+ZJX5uw+6r5Ve/k368qvcSF/sSfvBm8yd3JcegTl5t8T2/Aks8o3sfyuS0uyJC1rS
+zTrd7FmJG9YMosU1BqYobda64MXq7g+6MyrQoZ6fVdPvC6Sox3+a4fl9xjdm4CTY
+MsWqBJMe26LptvRIJ01/B6PjVTvsn/fxxj7rHmnJ/j63AIiBntm0vV/85cwYy/4o
+HlPH/Qjvn3hZjUlBcveiYat998F+s9gH2usvCkG3kly/n1/667LLCymmCHxtH8ka
+7tF3siO1EANureFY8qj6ZvlKeTkZ6g==
+-----END CERTIFICATE-----

From ea82ec041dc5e1129ed5b6eb22c0badee88c0e1e Mon Sep 17 00:00:00 2001
From: Dominik Kilian <Dominik.Kilian@nordicsemi.no>
Date: Wed, 16 Oct 2024 14:07:45 +0200
Subject: [PATCH 0443/2913] [nrf fromtree] doc: ipc: Add detailed protocol
 specs for ICBMsg backend

The details of how the ICBMsg communication is done, are hidden
inside the source code. This specification adds details about
the ICBMsg protocol.

Signed-off-by: Dominik Kilian <Dominik.Kilian@nordicsemi.no>

(cherry picked from commit 8d99393530adf8d478027996fd055bfb306ff3c9)
(cherry picked from commit 567fe962b51958f954b6dea256dbd111918ce427)
---
 .../ipc/ipc_service/backends/icbmsg_flows.svg | 520 ++++++++++++++++++
 .../ipc_service/backends/icbmsg_memory.svg    | 266 +++++++++
 .../ipc_service/backends/icbmsg_message.svg   | 209 +++++++
 .../backends/ipc_service_icbmsg.rst           | 297 ++++++++++
 4 files changed, 1292 insertions(+)
 create mode 100644 doc/services/ipc/ipc_service/backends/icbmsg_flows.svg
 create mode 100644 doc/services/ipc/ipc_service/backends/icbmsg_memory.svg
 create mode 100644 doc/services/ipc/ipc_service/backends/icbmsg_message.svg

diff --git a/doc/services/ipc/ipc_service/backends/icbmsg_flows.svg b/doc/services/ipc/ipc_service/backends/icbmsg_flows.svg
new file mode 100644
index 00000000000..f0ecb633a22
--- /dev/null
+++ b/doc/services/ipc/ipc_service/backends/icbmsg_flows.svg
@@ -0,0 +1,520 @@
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="632px" height="662px" viewBox="-0.5 -0.5 632 662" content="&lt;mxfile&gt;&lt;diagram id=&quot;9mlln88F-3eijnHMO-SS&quot; name=&quot;Page-1&quot;&gt;7Vxtk6I4EP41fpwteXP0ozovu1U7d1vnXt3ep6sMRE1tIF6Io+6vv0SCSILAIQI6M1u1kzShiU8/6XQ3cXrW1N8+U7BavhAP4p7Z97Y966FnmiPL5P8LwU4KnH4kWFDkRSIjEczQLyiF8bA18mCYGsgIwQyt0kKXBAF0WUoGKCWb9LA5wemnrsBCPrGfCGYuwFAb9hfy2DKSDs37RP4ZosUyfrIxGEVXfBAPlorDJfDI5khkPfasKSWERS1/O4VYYBfjEt33dOLqYWIUBqzMDdIQbwCv5Wf7Mp28hIueOcBcweSV8tZCtJC/wtDnagFDJJCzZ7sYEkrWgQeF1j4fvFkiBmcr4IqrG84BLlsyH/OewZv6LOXE3yBlcHskkrN+hsSHjO74kPjqQCIoKRQDuknsYcSy5ZEt4tuApMDioDlBiTckUNmg2dcKmtUiaE5p0NYhpBpUfKGsRHPt47HLCOXjxOdGfFF+Ba8QfyMh2mNsPbwSxoh/NGCM0UJcYESBlKwZRgGcHtxEvyacnSKYrQuhPHhHKDv3rcE81GDWoISBNxZbDe8FJODCiQfC5X6xG2l8QkbJTw4PFnjzW63R/icPJOgtYC5ERxg4GRjEMgox90xv6W0tCxj5hG8E8ZkkPDfT/mRgKdiGZE1dKO863oYKFN2ZiiIG6AIyTdHeToePXcp0I32FBJzTQLBdtSEnIsuzlTTsHGGsiIBcDC63HKQZq8RHnicek+n10/vCnARsJid16EcxkVnTUjIU+K2spZTBI9XeVdaSoccgTwRjssnwT+/GIJbdpkWsKu7tyCgqIBwHuvsh0PrkxN2/5dh952EroYx6u6JNInIHqRC2Iy7RrMsl2kM1VruYSzT0gPY8e3d933JqspGix7jcrmXo4fONm2hUl41GzRlJj7477DftTtnbrs1vGqNPzrCf/Nhp81/Qjd5r5qdwgUIRb3CcA28VPUTNxPjvf9ei4DOBWyAKBkYiyeOPi0EYIvckhXhgJeIjQFl8B+FTi2VPCBdWFgq5cTrzas57G2pCV5Yp6latKTpBjURRPJDM5yE8mz56Uvkye/5n8vufv/H2VOdNAHzYE58hjz5TMU3PozAMeau/7RtnU+rK6FJo5tKepWN80TPZd+Ju7hr2N0oEoUXiVQlUNqS/EIHi2SgO54/Hr4/j2WOO4ynvT3JDHJ0wCcVUznCdsnde8NoJD2TadRFIVdQwgeKyRkKgV1Eo4SIXYPwK3J955JDuoU5y1ONejHbdy62wwzyLHc2EIg3bujZP4HTL1HriWy0UMa8tFGk187Hqynw0RQ3TR0+cq2U+Zm7mY7bvbtqNOyrzRd1Z2uaLnim/E3fTcuZzeE17NoFKFmEvRSA9da6Q+eT6k4/MJ8sD2XURSFPULIHi4vRH5lOne7kZdpyXF7+LzKeyrZ1umVpPcr8vRWyKkkNF/f2qFZvGHNGQaabv0KGWI4ItCUW/uAwUbj3lT7WoBfSSJ/a0QnuVQy2WfqglstT8cNjow1AnDGUOSxpqWIehKp1GOXW4UkULbhH7IYES7cPrdN5O3qaLTvwyvcLxzMiXpT1EV96z9xXTVn2ZMTjFkfpfrFuVDr80yIjJ/l9pRlidYsSdcvjTrlqTVBlhl6wSVGGEXnAM4T7A8gAD/Jf4soWavCWFgYLKUWOVAIUBGczpSB6nBF2OUZEi6saiKWo4essuPD6Mv4/PTP//Rwx/NSQoNF7VdK1tFmSVE9maBiIQpMRPpW0qJfYBvnQ6HF8IQngdDqTlUqJzXxd5VEUNkye/lBi5ksJY5TJlwjPY0W5x4FbIEUdSR+SQrqJMHair3Gi5Sngr245tauR4iMjh8xhDfANd5cZV1R+0YkMpimXXHw6ZRFH9wVEsWunb3ZW+/dRetlm8ktPpZ8S7rmSbh9V9brY5KLmai1cq7yZ/gCEanvwVC+vxPw==&lt;/diagram&gt;&lt;/mxfile&gt;">
+    <defs/>
+    <g>
+        <rect x="150" y="50" width="120" height="60" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 80px; margin-left: 151px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                ICBMsg
+                                <br/>
+                                implementation
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="210" y="84" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    ICBMsg...
+                </text>
+            </switch>
+        </g>
+        <rect x="350" y="50" width="120" height="60" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 80px; margin-left: 351px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                ICBMsg
+                                <br/>
+                                implementation
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="410" y="84" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    ICBMsg...
+                </text>
+            </switch>
+        </g>
+        <ellipse cx="40" cy="57.5" rx="7.5" ry="7.5" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 40 65 L 40 90 M 40 70 L 25 70 M 40 70 L 55 70 M 40 90 L 25 110 M 40 90 L 55 110" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 117px; margin-left: 40px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                ICBMsg
+                                <br/>
+                                user
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="40" y="129" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    ICBMs...
+                </text>
+            </switch>
+        </g>
+        <ellipse cx="580" cy="57.5" rx="7.5" ry="7.5" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 580 65 L 580 90 M 580 70 L 565 70 M 580 70 L 595 70 M 580 90 L 565 110 M 580 90 L 595 110" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 117px; margin-left: 580px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                ICBMsg
+                                <br/>
+                                user
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="580" y="129" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    ICBMs...
+                </text>
+            </switch>
+        </g>
+        <path d="M 310 660 L 310 10" fill="none" stroke="#999999" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <rect x="0" y="0" width="300" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 298px; height: 1px; padding-top: 15px; margin-left: 1px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 20px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Initiator
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="150" y="21" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="20px" text-anchor="middle">
+                    Initiator
+                </text>
+            </switch>
+        </g>
+        <rect x="330" y="0" width="300" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 298px; height: 1px; padding-top: 15px; margin-left: 331px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 20px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Follower
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="480" y="21" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="20px" text-anchor="middle">
+                    Follower
+                </text>
+            </switch>
+        </g>
+        <path d="M 210 660 L 210 110" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 40 660 L 40 150" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 580 660 L 580 150" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 410 660 L 410 110" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 43 190 L 203.63 190" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <ellipse cx="40" cy="190" rx="3" ry="3" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 208.88 190 L 201.88 193.5 L 203.63 190 L 201.88 186.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 170px; margin-left: 125px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+                                register endpoint
+                                <br/>
+                                "example1"
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="125" y="174" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    register...
+                </text>
+            </switch>
+        </g>
+        <path d="M 210 190 L 403.63 190" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 408.88 190 L 401.88 193.5 L 403.63 190 L 401.88 186.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 170px; margin-left: 310px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+                                MSG_BOUND,
+                                <br/>
+                                name "example1", address 0x01
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="310" y="174" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    MSG_BOUND...
+                </text>
+            </switch>
+        </g>
+        <path d="M 577 230 L 416.37 230" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <ellipse cx="580" cy="230" rx="3" ry="3" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 411.12 230 L 418.12 226.5 L 416.37 230 L 418.12 233.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 210px; margin-left: 495px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+                                register endpoint
+                                <br/>
+                                "example1"
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="495" y="214" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    register...
+                </text>
+            </switch>
+        </g>
+        <path d="M 216.37 270 L 410 270" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 211.12 270 L 218.12 266.5 L 216.37 270 L 218.12 273.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 250px; margin-left: 310px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+                                MSG_RELEASE_BOUND,
+                                <br/>
+                                address 0x01
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="310" y="254" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    MSG_RELEA...
+                </text>
+            </switch>
+        </g>
+        <path d="M 573.63 270 L 413 270" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 578.88 270 L 571.88 273.5 L 573.63 270 L 571.88 266.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <ellipse cx="410" cy="270" rx="3" ry="3" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 260px; margin-left: 495px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+                                bound callback
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="495" y="264" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    bound cal...
+                </text>
+            </switch>
+        </g>
+        <path d="M 210 270 L 46.37 270" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 41.12 270 L 48.12 266.5 L 46.37 270 L 48.12 273.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 260px; margin-left: 125px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+                                bound callback
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="125" y="264" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    bound cal...
+                </text>
+            </switch>
+        </g>
+        <path d="M 43 390 L 203.63 390" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <ellipse cx="40" cy="390" rx="3" ry="3" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 208.88 390 L 201.88 393.5 L 203.63 390 L 201.88 386.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 370px; margin-left: 125px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+                                register endpoint
+                                <br/>
+                                "example2"
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="125" y="374" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    register...
+                </text>
+            </switch>
+        </g>
+        <path d="M 210 390 L 403.63 390" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 408.88 390 L 401.88 393.5 L 403.63 390 L 401.88 386.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 370px; margin-left: 310px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+                                MSG_BOUND,
+                                <br/>
+                                name "example2", address 0x02
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="310" y="374" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    MSG_BOUND...
+                </text>
+            </switch>
+        </g>
+        <path d="M 577 350 L 416.37 350" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <ellipse cx="580" cy="350" rx="3" ry="3" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 411.12 350 L 418.12 346.5 L 416.37 350 L 418.12 353.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 330px; margin-left: 495px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+                                register endpoint
+                                <br/>
+                                "example2"
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="495" y="334" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    register...
+                </text>
+            </switch>
+        </g>
+        <path d="M 216.37 450 L 410 450" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 211.12 450 L 218.12 446.5 L 216.37 450 L 218.12 453.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 430px; margin-left: 310px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+                                MSG_RELEASE_BOUND,
+                                <br/>
+                                address 0x02
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="310" y="434" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    MSG_RELEA...
+                </text>
+            </switch>
+        </g>
+        <path d="M 573.63 450 L 413 450" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 578.88 450 L 571.88 453.5 L 573.63 450 L 571.88 446.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <ellipse cx="410" cy="450" rx="3" ry="3" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 440px; margin-left: 495px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+                                bound callback
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="495" y="444" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    bound cal...
+                </text>
+            </switch>
+        </g>
+        <path d="M 210 450 L 46.37 450" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 41.12 450 L 48.12 446.5 L 46.37 450 L 48.12 453.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 440px; margin-left: 125px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+                                bound callback
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="125" y="444" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    bound cal...
+                </text>
+            </switch>
+        </g>
+        <rect x="10" y="150" width="30" height="160" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)rotate(-90 24.999999999999886 230)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 158px; height: 1px; padding-top: 230px; margin-left: -54px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                The initiator starts first
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="25" y="234" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    The initiator starts first
+                </text>
+            </switch>
+        </g>
+        <rect x="10" y="310" width="30" height="180" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)rotate(-90 24.999999999999886 400)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 178px; height: 1px; padding-top: 400px; margin-left: -64px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                The follower starts first
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="25" y="404" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    The follower starts first
+                </text>
+            </switch>
+        </g>
+        <path d="M 10 310 L 610 310" fill="none" stroke="#999999" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 10 490 L 610 490" fill="none" stroke="#b3b3b3" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 43 540 L 203.63 540" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <ellipse cx="40" cy="540" rx="3" ry="3" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 208.88 540 L 201.88 543.5 L 203.63 540 L 201.88 536.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 520px; margin-left: 125px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+                                send data on
+                                <br/>
+                                endpoint "example2"
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="125" y="524" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    send data...
+                </text>
+            </switch>
+        </g>
+        <path d="M 210 540 L 403.63 540" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 408.88 540 L 401.88 543.5 L 403.63 540 L 401.88 536.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 520px; margin-left: 310px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+                                MSG_DATA,
+                                <br/>
+                                address 0x02
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="310" y="524" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    MSG_DATA,...
+                </text>
+            </switch>
+        </g>
+        <path d="M 577 600 L 416.37 600" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <ellipse cx="580" cy="600" rx="3" ry="3" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <path d="M 411.12 600 L 418.12 596.5 L 416.37 600 L 418.12 603.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 580px; margin-left: 495px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+                                return from callback
+                                <br/>
+                                or data release
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="495" y="584" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    return fr...
+                </text>
+            </switch>
+        </g>
+        <path d="M 216.37 600 L 410 600" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 211.12 600 L 218.12 596.5 L 216.37 600 L 218.12 603.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 590px; margin-left: 310px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+                                MSG_RELEASE_DATA
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="310" y="594" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    MSG_RELEA...
+                </text>
+            </switch>
+        </g>
+        <path d="M 573.63 540 L 410 540" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 578.88 540 L 571.88 543.5 L 573.63 540 L 571.88 536.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 530px; margin-left: 495px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+                                data callback
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="495" y="534" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    data call...
+                </text>
+            </switch>
+        </g>
+        <rect x="10" y="490" width="30" height="150" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)rotate(-90 24.999999999999886 565)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 565px; margin-left: -49px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Data message
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="25" y="569" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Data message
+                </text>
+            </switch>
+        </g>
+        <path d="M 10 640 L 610 640" fill="none" stroke="#b3b3b3" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+    </g>
+    <switch>
+        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
+        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
+            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
+                Text is not SVG - cannot display
+            </text>
+        </a>
+    </switch>
+</svg>
\ No newline at end of file
diff --git a/doc/services/ipc/ipc_service/backends/icbmsg_memory.svg b/doc/services/ipc/ipc_service/backends/icbmsg_memory.svg
new file mode 100644
index 00000000000..09fcfe2a6f9
--- /dev/null
+++ b/doc/services/ipc/ipc_service/backends/icbmsg_memory.svg
@@ -0,0 +1,266 @@
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="649px" height="263px" viewBox="-0.5 -0.5 649 263" content="&lt;mxfile&gt;&lt;diagram name=&quot;Page-1&quot; id=&quot;aVFX6VjFinrp-ASp4lZ8&quot;&gt;5Vpbk6MoFP41eeyuILk+TqfnslU7W13VW7sz85IiSiLVKlkkk2R+/YKCF9BcbO0kPXlRDkLkOx/nhj04C3efGVr7X6mHg57T93Y9+NhzHABAX1ykZJ9KpoNJKlgx4qWifi54Jr+wGqmlG+LhWMlSEac04GRdFro0irDLSzLEGN2WH1vSwCsJ1miFS68hBc8uCrD12L/E475e12iad3zBZOWrv54447QjRPphNXHsI49uCyL4sQdnjFKe3oW7GQ4keGVcPtX0Zi/GcMRPGTCG4Xj5MqWP/+3/gbsf4WKLf9ypWX6iYKMW/Mfsa7xKwMNIvTjfazQY3UQelhP2e/Bh6xOOn9fIlb1boX8h83kYiBYQt0sa8Wc1NmmTIJjRgDLRjmgkxA8xZ/QFa2HPgf3kJ3rs1elXxYzjXUGkVvsZ0xBzthePqN6BAl4xb6Ka24IatW78ggb1MKSYs8omzsEVNwrfM7B2LKwfAuq+xO8CbDA6irbTf0u0YTXavewtbhXpSRloUIH05C2BHtQCDW4baJPSF0d6WIu0c9tIm6b64kiPapH+6+7GWT24NqzHFtYWwDjyPshYLoeoAGgZfQEM238rNr6r55LG467Y9bjXrR3h3wr33wv3+RDZ0CMsHU2T3yEdxXTDXHzcZXHEVpgfDySwp0PXGo0XNDqs0KiWMRwgTn6WA94qNat/eKJErCwj1NAwkxAaTEnXrUYVA1RjohEoT5TRUE+UAmNNlLAuW3ZzIk67ISJoQkRwUSKO3gcRnbaIOH5bIoL62BXetvPJVHIB52OnX2x3x/CK0Oi2QQX9Mqh3AxvUznIvm6r8faA6cC6Iqp1T/a4xka75FVzRdXmdqeErQEOnA8aGaTTDqPacjp1HvopdZ4cszUKjLtjlXDu7YE1Z7Vx2ZZaqgxDG9quJ+Z8vxCWao4CsIkEWk2HCDPPjXiAZLe4DvJRPS/NNXBR8UOKQeJ6csINysWObe1ClaDPIbGLuJxaEi6QyPJd14TnyPIbjuCGCtZBpaF0BGWad1CYrXGZWVGsbQzt7SzCcx/JI6XXkyxDqkn5WDawCvKrQuA3stM+y97DwA6/cwUf5x9K1tIKhc3wPD7rC0D5KO+RV3QDFMXHLWFWGXPfj4UFvepr3uyqvZlXWzQT7VLdWc8TXvpMDdvbYXLv3w4J+wUHlVofueXBUHSqdRAnldG6syGNSZ9SQOWA4vR/At2KPnSU3Zg84xzZUR9qt0Ef7jBvjDxyW+TNtbHmqQ50OyHNCuhb7aC1v3Q0L9g8MuS/4BNec53GyFaAFDp5oTLis3Vgh959Gd60fr3X4jHKkBk/bOjisS5pLRRqbTOZWb+Tw7UPCQ5tapdEeiv0M8oIupPwJcRFnRolElnp1zqs/PHIaVWVatgFXso/N/QeaZsa156Ed7ORGR51dMObEoOOs+sytMcaK+psyxpqoRcbYlYG/fSwZg0J5oWyFIvIrNavJCwiY8vq7mL+/2MhXl1lw8qFZ5EmZOk1yhQOQvSGSaljIGT2yXGKpwnuLmo3L932jfN9z4Kfkd7CqV+J9C77CVFvVF2pVyWEb9XzQ0dnydRf0QUWKAa/KJrQUDALjwNg8A2jPIGhT83vV7q+fSHDcDpNgV0wSzfxT8/Tx/IN9+PF/&lt;/diagram&gt;&lt;/mxfile&gt;">
+    <defs/>
+    <g>
+        <rect x="7" y="120" width="120" height="40" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 140px; margin-left: 8px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                                ICMsg area
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="67" y="144" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
+                    ICMsg area
+                </text>
+            </switch>
+        </g>
+        <rect x="127" y="120" width="200" height="40" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 198px; height: 1px; padding-top: 140px; margin-left: 128px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                                Blocks area
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="227" y="144" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
+                    Blocks area
+                </text>
+            </switch>
+        </g>
+        <rect x="47" y="220" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 240px; margin-left: 48px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                                Block 0
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="87" y="244" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
+                    Block 0
+                </text>
+            </switch>
+        </g>
+        <rect x="127" y="220" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 240px; margin-left: 128px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                                Block 1
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="167" y="244" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
+                    Block 1
+                </text>
+            </switch>
+        </g>
+        <rect x="207" y="220" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 240px; margin-left: 208px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                                Block 2
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="247" y="244" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
+                    Block 2
+                </text>
+            </switch>
+        </g>
+        <rect x="407" y="220" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 240px; margin-left: 408px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                                Block N-1
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="447" y="244" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
+                    Block N-1
+                </text>
+            </switch>
+        </g>
+        <path d="M 47 220 L 127 160" fill="none" stroke="#999999" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 487 220 L 327 160" fill="none" stroke="#999999" stroke-miterlimit="10" pointer-events="stroke"/>
+        <rect x="287" y="220" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 240px; margin-left: 288px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                                Block 3
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="327" y="244" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
+                    Block 3
+                </text>
+            </switch>
+        </g>
+        <rect x="67" y="0" width="200" height="40" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 198px; height: 1px; padding-top: 20px; margin-left: 68px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                                rx-region
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="167" y="24" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
+                    rx-region
+                </text>
+            </switch>
+        </g>
+        <rect x="387" y="0" width="200" height="40" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 198px; height: 1px; padding-top: 20px; margin-left: 388px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                                tx-region
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="487" y="24" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
+                    tx-region
+                </text>
+            </switch>
+        </g>
+        <path d="M 7 120 L 67 40" fill="none" stroke="#999999" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 327 120 L 267 40" fill="none" stroke="#999999" stroke-miterlimit="10" pointer-events="stroke"/>
+        <rect x="7" y="60" width="150" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 148px; height: 1px; padding-top: 70px; margin-left: 9px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                region_begin_aligned
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="9" y="74" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">
+                    region_begin_aligned
+                </text>
+            </switch>
+        </g>
+        <rect x="47" y="80" width="160" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 158px; height: 1px; padding-top: 90px; margin-left: 48px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                blocks_area_address
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="127" y="94" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    blocks_area_address
+                </text>
+            </switch>
+        </g>
+        <rect x="207" y="180" width="80" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 190px; margin-left: 208px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                block_size
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="247" y="194" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    block_size
+                </text>
+            </switch>
+        </g>
+        <rect x="187" y="60" width="140" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 138px; height: 1px; padding-top: 70px; margin-left: 187px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                region_end_aligned
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="325" y="74" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">
+                    region_end_aligned
+                </text>
+            </switch>
+        </g>
+        <path d="M 7 75 L 7 113.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 7 118.88 L 3.5 111.88 L 7 113.63 L 10.5 111.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 127 100 L 127 113.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 127 118.88 L 123.5 111.88 L 127 113.63 L 130.5 111.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 327 75 L 327 113.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 327 118.88 L 323.5 111.88 L 327 113.63 L 330.5 111.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 257 170 L 252 170 Q 247 170 247 180 L 247 200 Q 247 210 242 210 L 239.5 210 Q 237 210 242 210 L 244.5 210 Q 247 210 247 220 L 247 240 Q 247 250 252 250 L 257 250" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,247,210)" pointer-events="all"/>
+        <path d="M 367 220 L 407 220" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-miterlimit="10" stroke-dasharray="2 6" pointer-events="stroke"/>
+        <path d="M 367 260 L 407 260" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-miterlimit="10" stroke-dasharray="2 6" pointer-events="stroke"/>
+        <rect x="407" y="120" width="240" height="40" fill="#ffffff" stroke="#999999" stroke-dasharray="3 3" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 238px; height: 1px; padding-top: 140px; margin-left: 408px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                The same organization as rx-region, but sizes and block count may be different.
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="527" y="144" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    The same organization as rx-region, but...
+                </text>
+            </switch>
+        </g>
+        <path d="M 407 120 L 387 40" fill="none" stroke="#999999" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 647 120 L 587 40" fill="none" stroke="#999999" stroke-miterlimit="10" pointer-events="stroke"/>
+    </g>
+    <switch>
+        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
+        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
+            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
+                Text is not SVG - cannot display
+            </text>
+        </a>
+    </switch>
+</svg>
\ No newline at end of file
diff --git a/doc/services/ipc/ipc_service/backends/icbmsg_message.svg b/doc/services/ipc/ipc_service/backends/icbmsg_message.svg
new file mode 100644
index 00000000000..0252501480b
--- /dev/null
+++ b/doc/services/ipc/ipc_service/backends/icbmsg_message.svg
@@ -0,0 +1,209 @@
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="561px" height="182px" viewBox="-0.5 -0.5 561 182" content="&lt;mxfile&gt;&lt;diagram name=&quot;Page-1&quot; id=&quot;aVFX6VjFinrp-ASp4lZ8&quot;&gt;3Vldb5swFP01SNtDJcDk63FJu+5hmypF2tq+OeAEKwZnxmnIfv1ssPkwkKZp1pL2ofI9ti/43OtjX2KBWZTeMrgJf9AAEcu1g9QC15bret5I/JfAPgfcoZcDK4aDHHJKYI7/IgXaCt3iACW1gZxSwvGmDvo0jpHPaxhkjO7qw5aU1J+6gSv1RLsE5j4kqDHsNw54qFBnOCk7viG8CtWjx65acAT1YOU4CWFAdxUI3FhgxijleStKZ4hI7jQv+byvHb3FizEU82MmjEA0Wq4n9PrP/hdIH6PFDj1egdzLEyRbteApof5aQPqt+V5Tweg2DpD0ZltgugsxR/MN9GXvTsReYCGPiLAc0VzSmM/V3MzGhMwooUzYMY0FPE04o2ukQcsFdvYneppLU6t9QoyjtAKppd4iGiHO9mKI6h2r91dp52h7VwZRQ2ElfJ7CoEqbVeG4ZFY0FLkvINrrJNq5bKKdYc+YHnQy7V420wVlfWF62Mn0z6sLz2qvb1zr87BCdohggJjlDol4+HQhWyvZ+pTIU9S16VKeu5DDz5cdC0PK3XcPhdMIhWT5skk2ZbyN5WLM29DsNmjexttEEHrRRAO3b+ncfQcEH4vq9xfx5i2wwTCKgy+ybik5qjBapx+lmN9X2g+V9nVaNfbaiMUy7qvGg/KcGeWkzNKzGkGaZH+HgpTQLfPREecZh2yF+IGBijIU6DqtI+aVmA5aYqoxhgjk+Kle3bUFWj3hjmKxtCKlBkZKAdvIlXzhala1GjMcuSNDBoDhKCem4SjLu2LZr0jF5jX5Val4UmLpBHaOTuD/korukamolbIvuQgMeZucmIvAdOS8cS6O2k+gRL4CQ82bldB/Xs9GSPAqFm2ClrJHnhHYh+SLgiMcBHJy64lVz+QznDuDvpXEzrhB8E0Kow0pygTBsR2hJJFfw4RFBP2Qy6uWWVzQWPQvyk8XNoyD1tK65zEyC7y2a1jxEezcQWpJ+CPEN4BJmFHg1HmV+B3kHLE4Q+S9TSul/mbpdlwXnINqW6i68xJV74xOT3TTs43QuyfqZiOHTEfn082WHezJjbjnKOnaes/czvV29EWYEDu0Ic+w3YwaHnjHKaJJ6EmbbfL8ZktCuJFNf8vIfsqgv0ZHMFiKkrQIXCByRxPMMW2Rue9Gd8GujgPLl90dBkY5VJOvJucq+x0jhSdtMtgMzPgMgdF+P7IKGpLXEq2+qKBjhvRUFWw4OlkFhVn+PJYPL39jBDf/AA==&lt;/diagram&gt;&lt;/mxfile&gt;">
+    <defs/>
+    <g>
+        <rect x="0" y="1" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 21px; margin-left: 1px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                                Block 0
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="40" y="25" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
+                    Block 0
+                </text>
+            </switch>
+        </g>
+        <rect x="80" y="1" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 21px; margin-left: 81px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                                Block 1
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="120" y="25" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
+                    Block 1
+                </text>
+            </switch>
+        </g>
+        <rect x="160" y="1" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 21px; margin-left: 161px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                                Block 2
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="200" y="25" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
+                    Block 2
+                </text>
+            </switch>
+        </g>
+        <rect x="360" y="1" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 21px; margin-left: 361px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                                Block N-1
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="400" y="25" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
+                    Block N-1
+                </text>
+            </switch>
+        </g>
+        <rect x="0" y="101" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 121px; margin-left: 1px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                                header
+                                <br/>
+                                (size of data)
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="40" y="125" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
+                    header...
+                </text>
+            </switch>
+        </g>
+        <rect x="80" y="101" width="160" height="40" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 158px; height: 1px; padding-top: 121px; margin-left: 81px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                                data
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="160" y="125" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
+                    data
+                </text>
+            </switch>
+        </g>
+        <rect x="240" y="101" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 121px; margin-left: 241px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                                unused
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="280" y="125" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
+                    unused
+                </text>
+            </switch>
+        </g>
+        <rect x="240" y="1" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 21px; margin-left: 241px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                                Block 3
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="280" y="25" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
+                    Block 3
+                </text>
+            </switch>
+        </g>
+        <path d="M 0 101 L 80 41" fill="none" stroke="#999999" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 320 101 L 240 41" fill="none" stroke="#999999" stroke-miterlimit="10" pointer-events="stroke"/>
+        <rect x="480" y="1" width="80" height="40" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 78px; height: 1px; padding-top: 21px; margin-left: 482px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Blocks area
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="482" y="25" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">
+                    Blocks area
+                </text>
+            </switch>
+        </g>
+        <rect x="360" y="101" width="200" height="40" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 198px; height: 1px; padding-top: 121px; margin-left: 362px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Example of a message allocated
+                                <br/>
+                                on block 1 and 2
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="362" y="125" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">
+                    Example of a message allocated...
+                </text>
+            </switch>
+        </g>
+        <path d="M 320 41 L 360 41" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-miterlimit="10" stroke-dasharray="2 6" pointer-events="stroke"/>
+        <rect x="0" y="161" width="80" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 171px; margin-left: 1px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                4 bytes
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="40" y="175" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    4 bytes
+                </text>
+            </switch>
+        </g>
+        <path d="M 50 111 L 45 111 Q 40 111 40 121 L 40 141 Q 40 151 35 151 L 32.5 151 Q 30 151 35 151 L 37.5 151 Q 40 151 40 161 L 40 181 Q 40 191 45 191 L 50 191" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(-90,40,151)" pointer-events="all"/>
+        <path d="M 320 1 L 360 1" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-miterlimit="10" stroke-dasharray="2 6" pointer-events="stroke"/>
+    </g>
+    <switch>
+        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
+        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
+            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
+                Text is not SVG - cannot display
+            </text>
+        </a>
+    </switch>
+</svg>
\ No newline at end of file
diff --git a/doc/services/ipc/ipc_service/backends/ipc_service_icbmsg.rst b/doc/services/ipc/ipc_service/backends/ipc_service_icbmsg.rst
index f06f7587df6..f570766b0bd 100644
--- a/doc/services/ipc/ipc_service/backends/ipc_service_icbmsg.rst
+++ b/doc/services/ipc/ipc_service/backends/ipc_service_icbmsg.rst
@@ -81,3 +81,300 @@ Samples
 =======
 
 * :zephyr:code-sample:`ipc_multi_endpoint`
+
+Detailed Protocol Specification
+===============================
+
+The ICBMsg protocol transfers messages using dynamically allocated blocks of shared memory.
+Internally, it uses ICMsg for control messages.
+
+Shared Memory Organization
+--------------------------
+
+The ICBMsg uses two shared memory regions, ``rx-region`` for message receiving, and ``tx-region`` for message transmission.
+The regions do not need to be next to each other, placed in any specific order, or be of the same size.
+Those regions are interchanged on each core.
+
+Each shared memory region is divided into following two parts:
+
+* **ICMsg area** - An area reserved by ICMsg instance and used to transfer the control messages.
+* **Blocks area** - An area containing allocatable blocks carrying the content of the messages.
+  This area is divided into even-sized blocks aligned to cache boundaries.
+
+The location of each area is calculated to fulfill cache boundary requirements and allow optimal region usage.
+It is calculated using the following algorithm:
+
+Inputs:
+
+* ``region_begin``, ``region_end`` - Boundaries of the region.
+* ``local_blocks`` - Number of blocks in this region.
+* ``remote_blocks`` - Number of blocks in the opposite region.
+* ``alignment`` - Memory cache alignment.
+
+The algorithm:
+
+#. Align region boundaries to cache:
+
+   * ``region_begin_aligned = ROUND_UP(region_begin, alignment)``
+   * ``region_end_aligned = ROUND_DOWN(region_end, alignment)``
+   * ``region_size_aligned = region_end_aligned - region_begin_aligned``
+
+#. Calculate the minimum size required for ICMsg area ``icmsg_min_size``, which is a sum of:
+
+   * ICMsg header size (refer to the ICMsg specification)
+   * ICMsg message size for 4 bytes of content (refer to the ICMsg specification) multiplied by ``local_blocks + remote_blocks + 2``
+
+#. Calculate available size for block area. Note that the actual size may be smaller because of block alignment:
+
+   ``blocks_area_available_size = region_size_aligned - icmsg_min_size``
+
+#. Calculate single block size:
+
+   ``block_size = ROUND_DOWN(blocks_area_available_size / local_blocks, alignment)``
+
+#. Calculate actual block area size:
+
+   ``blocks_area_size = block_size * local_blocks``
+
+#. Calculate block area start address:
+
+   ``blocks_area_begin = region_end_aligned - blocks_area_size``
+
+The result:
+
+* ``region_begin_aligned`` - The start of ICMsg area.
+* ``blocks_area_begin`` - End of ICMsg area and the start of block area.
+* ``block_size`` - Single block size.
+* ``region_end_aligned`` - End of blocks area.
+
+.. image:: icbmsg_memory.svg
+   :align: center
+
+|
+
+Message Transfer
+----------------
+
+The ICBMsg uses following two types of messages:
+
+* **Binding message** - Message exchanged during endpoint binding process (described below).
+* **Data message** - Message carrying actual data from a user.
+
+They serve different purposes, but their lifetime and flow are the same.
+The following steps describe it:
+
+#. The sender wants to send a message that contains ``K`` bytes.
+#. The sender reserves blocks from his ``tx-region`` blocks area that can hold at least ``K + 4`` bytes.
+   The additional ``+ 4`` bytes are reserved for the header, which contains the exact size of the message.
+   The blocks must be continuous (one after another).
+   The sender is responsible for block allocation management.
+   It is up to the implementation to decide what to do if no blocks are available.
+#. The sender fills the header with a 32-bit integer value, ``K`` (little-endian).
+#. The sender fills the remaining part of the blocks with his data.
+   Unused space is ignored.
+#. The sender sends an ``MSG_DATA`` or ``MSG_BOUND`` control message over ICMsg that contains starting block number (where the header is located).
+   Details about the control message are in the next section.
+#. The control message travels to the receiver.
+#. The receiver reads message size and data from his ``rx-region`` starting from the block number received in the control message.
+#. The receiver processes the message.
+#. The receiver sends ``MSG_RELEASE_DATA`` or ``MSG_RELEASE_BOUND`` control message over ICMsg containing the starting block number
+   (the same as inside received control message).
+#. The control message travels back to the sender.
+#. The sender releases the blocks starting from the block number provided in the control message.
+   The number of blocks to release can be calculated using a size from the header.
+
+.. image:: icbmsg_message.svg
+   :align: center
+
+|
+
+Control Messages
+----------------
+
+The control messages are transmitted over ICMsg.
+Each control message contains three bytes.
+The first byte tells what kind of message it is.
+
+The allocated size for ICMsg ensures that the maximum possible number of control messages will fit into its ring buffer,
+so sending over the ICMsg will never fail because of buffer overflow.
+
+MSG_DATA
+^^^^^^^^
+
+.. list-table::
+   :header-rows: 1
+
+   * - byte 0
+     - byte 1
+     - byte 2
+   * - MSG_DATA
+     - endpoint address
+     - block number
+   * - 0x00
+     - 0x00 ÷ 0xFD
+     - 0x00 ÷ N-1
+
+The ``MSG_DATA`` control message indicates that a new data message was sent.
+The data message starts with a header inside ``block number``.
+The data message was sent over the endpoint specified in ``endpoint address``.
+The endpoint binding procedure must be finished before sending this control message.
+
+MSG_RELEASE_DATA
+^^^^^^^^^^^^^^^^
+
+.. list-table::
+   :header-rows: 1
+
+   * - byte 0
+     - byte 1
+     - byte 2
+   * - MSG_RELEASE_DATA
+     - unused
+     - block number
+   * - 0x01
+     -
+     - 0x00 ÷ N-1
+
+The ``MSG_RELEASE_DATA`` control message is sent in response to ``MSG_DATA``.
+It informs us that the data message starting with ``block number`` was received and is no longer needed.
+When this control message is received, the blocks containing the message must be released.
+
+MSG_BOUND
+^^^^^^^^^
+
+.. list-table::
+   :header-rows: 1
+
+   * - byte 0
+     - byte 1
+     - byte 2
+   * - MSG_BOUND
+     - endpoint address
+     - block number
+   * - 0x02
+     - 0x00 ÷ 0xFD
+     - 0x00 ÷ N-1
+
+The ``MSG_BOUND`` control message is similar to the ``MSG_DATA`` except the blocks carry binding information.
+See the next section for details on the binding procedure.
+
+MSG_RELEASE_BOUND
+^^^^^^^^^^^^^^^^^
+
+.. list-table::
+   :header-rows: 1
+
+   * - byte 0
+     - byte 1
+     - byte 2
+   * - MSG_RELEASE_BOUND
+     - endpoint address
+     - block number
+   * - 0x03
+     - 0x00 ÷ 0xFD
+     - 0x00 ÷ N-1
+
+The ``MSG_RELEASE_BOUND`` control message is sent in response to ``MSG_BOUND``.
+It is similar to the ``MSG_RELEASE_DATA`` except the ``endpoint address`` is required.
+See the next section for details on the binding procedure.
+
+Initialization
+--------------
+
+The ICBMsg initialization calls ICMsg to initialize.
+When it is done, no further initialization is required.
+Blocks can be left uninitialized.
+
+After ICBMsg initialization, you are ready for the endpoint binding procedure.
+
+Endpoint Binding
+-----------------
+
+So far, the protocol is symmetrical.
+Each side of the connection was the same.
+The binding process is not symmetrical.
+There are following two roles:
+
+* **Initiator** - It assigns endpoint addresses and sends binding messages.
+* **Follower** - It waits for a binding message.
+
+The roles are determined based on the addresses of the ``rx-region`` and ``tx-region``.
+
+* If ``address of rx-region < address of tx-region``, then it is initiator.
+* If ``address of rx-region > address of tx-region``, then it is follower.
+
+The binding process needs an endpoint name and is responsible for following two things:
+
+* To establish a common endpoint address,
+* To make sure that two sides are ready to exchange messages over that endpoint.
+
+After ICMsg is initialized, both sides can start the endpoint binding.
+There are no restrictions on the order in which the sides start the endpoint binding.
+
+Initiator Binding Procedure
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The initiator sends a binding message.
+It contains a single null-terminated string with an endpoint name.
+As usual, it is preceded by a message header containing the message size (including null-terminator).
+
+Example of the binding message for ``example`` endpoint name:
+
+.. list-table::
+   :header-rows: 1
+
+   * - Header
+     - Endpoint name
+     - Null-terminator
+   * - bytes 0-3
+     - bytes 4-10
+     - byte 11
+   * - 0x00000008
+     - ``example``
+     - 0x00
+
+The binding message is sent using the ``MSG_BOUND`` control message and released with the ``MSG_RELEASE_BOUND`` control message.
+
+The endpoint binding procedure from the initiator's point of view is the following:
+
+#. The initiator assigns an endpoint address to this endpoint.
+#. The initiator sends a binding message containing the endpoint name and address.
+#. The initiator waits for any message from the follower using this endpoint address.
+   Usually, it will be ``MSG_RELEASE_BOUND``, but ``MSG_DATA`` is also allowed.
+#. The initiator is bound to an endpoint, and it can send data messages using this endpoint.
+
+Follower Binding Procedure
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If the follower receives a binding message before it starts the binding procedure on that endpoint, it should store the message for later.
+It should not send the ``MSG_RELEASE_BOUND`` yet.
+
+The endpoint binding procedure from the follower's point of view is the following:
+
+#. The follower waits for a binding message containing its endpoint name.
+   The message may be a newly received message or a message stored before the binding procedure started.
+#. The follower stores the endpoint address assigned to this endpoint by the initiator.
+#. The follower sends the ``MSG_RELEASE_BOUND`` control message.
+#. The follower is bound to an endpoint, and it can send data messages using this endpoint.
+
+Example sequence diagrams
+-------------------------
+
+The following diagram shows a few examples of how the messages flow between two ends.
+There is a binding of two endpoints and one fully processed data message exchange.
+
+.. image:: icbmsg_flows.svg
+   :align: center
+
+|
+
+Protocol Versioning
+-------------------
+
+The protocol allows improvements in future versions.
+The newer implementations should be able to work with older ones in backward compatible mode.
+To allow it, the current protocol version has the following restrictions:
+
+* If the receiver receives a longer control message, it should use only the first three bytes and ignore the remaining.
+* If the receiver receives a control message starting with a byte that does not match any of the messages described here, it should ignore it.
+* If the receiver receives a binding message with additional bytes at the end, it should ignore the additional bytes.

From 50b7c97380e6a5f4a631f48952dc106c7cb699b3 Mon Sep 17 00:00:00 2001
From: Dominik Kilian <Dominik.Kilian@nordicsemi.no>
Date: Wed, 16 Oct 2024 14:11:55 +0200
Subject: [PATCH 0444/2913] [nrf fromtree] doc: ipc: Add detailed protocol
 specs for ICMsg backend

The details of how the ICMsg communication is done, are hidden
inside the source code. This specification adds details about
the ICBMsg protocol.

Signed-off-by: Dominik Kilian <Dominik.Kilian@nordicsemi.no>

(cherry picked from commit 7574602108879a1d86c8361272ccff02456c8cda)
(cherry picked from commit cc3c2ac3a76288c06a0a266527070fac89709e1a)
---
 .../backends/ipc_service_icmsg.rst            | 108 ++++++++++++++++++
 1 file changed, 108 insertions(+)

diff --git a/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst b/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst
index 1b1298df49b..56f618b442d 100644
--- a/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst
+++ b/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst
@@ -84,3 +84,111 @@ Samples
 =======
 
  - :zephyr:code-sample:`ipc-icmsg`
+
+Detailed Protocol Specification
+===============================
+
+The ICMsg uses two shared memory regions and two MBOX channels.
+The region and channel pair are used to transfer messages in one direction.
+The other pair is symmetric and transfers messages in the opposite direction.
+For this reason, the specification below focuses on one such pair.
+The other pair is identical.
+
+The ICMsg provides just one endpoint per instance.
+
+Shared Memory Region Organization
+---------------------------------
+
+If data caching is enabled, the shared memory region provided to ICMsg must be aligned according to the cache requirement.
+If cache is not enabled, the required alignment is 4 bytes.
+
+The shared memory region is entirely used by a single FIFO.
+It contains read and write indexes followed by the data buffer.
+The detailed structure is contained in the following table:
+
+.. list-table::
+   :header-rows: 1
+
+   * - Field name
+     - Size (bytes)
+     - Byte order
+     - Description
+   * - ``rd_idx``
+     - 4
+     - little‑endian
+     - Index of the first incoming byte in the ``data`` field.
+   * - ``padding``
+     - depends on cache alignment
+     - n/a
+     - Padding added to align ``wr_idx`` to the cache alignment.
+   * - ``wr_idx``
+     - 4
+     - little‑endian
+     - Index of the byte after the last incoming byte in the ``data`` field.
+   * - ``data``
+     - everything to the end of the region
+     - n/a
+     - Circular buffer containing actual bytes to transfer.
+
+This is usual FIFO with a circular buffer:
+
+* The Indexes (``rd_idx`` and ``wr_idx``) are wrapped around when they reach the end of the ``data`` buffer.
+* The FIFO is empty if ``rd_idx == wr_idx``.
+* The FIFO has one byte less capacity than the ``data`` buffer length.
+
+Packets
+-------
+
+Packets are sent over the FIFO described in the above section.
+One packet can be wrapped around if it occurs at the end of the FIFO buffer.
+
+The following is the packet structure:
+
+.. list-table::
+   :header-rows: 1
+
+   * - Field name
+     - Size (bytes)
+     - Byte order
+     - Description
+   * - ``len``
+     - 2
+     - big‑endian
+     - Length of the ``data`` field.
+   * - ``reserved``
+     - 2
+     - n/a
+     - Reserved for the future use.
+       It must be 0 for the current protocol version.
+   * - ``data``
+     - ``len``
+     - n/a
+     - Packet data.
+   * - ``padding``
+     - 0‑3
+     - n/a
+     - Padding is added to align the total packet size to 4 bytes.
+
+The packet send procedure is the following:
+
+#. Check if the packet fits into the buffer.
+#. Write the packet to ``data`` FIFO buffer starting at ``wr_idx``.
+   Wrap it if needed.
+#. Write a new value of the ``wr_idx``.
+#. Notify the receiver over the MBOX channel.
+
+Initialization
+--------------
+
+The initialization sequence is the following:
+
+#. Set the ``wr_idx`` and ``rd_idx`` to zero.
+#. Push a single packet to FIFO containing magic data: ``45 6d 31 6c 31 4b 30 72 6e 33 6c 69 34``.
+   The MBOX is not used yet.
+#. Initialize the MBOX.
+#. Repeat the notification over the MBOX channel using some interval, for example, 1 ms.
+#. Wait for an incoming packet containing the magic data.
+   It will arrive over the other pair (shared memory region and MBOX).
+#. Stop repeating the MBOX notification.
+
+After this, the ICMsg is bound, and it is ready to transfer packets.

From 0c3d03772d103ef5225f43e3690e969b7b0559c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 10 Sep 2024 16:36:29 +0200
Subject: [PATCH 0445/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Split
 async control block structure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Split async control block structure into tx and rx structures.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 701beecb5c80aa0399fe1debd579c81fc5211e76)
(cherry picked from commit a010c2090c71fd237d608e74936872b4f553637c)
---
 drivers/serial/uart_nrfx_uarte.c | 314 ++++++++++++++++---------------
 1 file changed, 160 insertions(+), 154 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 00225464f37..c4b136bf1f4 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -108,45 +108,51 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #define UARTE_HW_RX_FIFO_SIZE 5
 
 #ifdef UARTE_ANY_ASYNC
-struct uarte_async_cb {
-	uart_callback_t user_callback;
-	void *user_data;
 
-	const uint8_t *tx_buf;
-	volatile size_t tx_size;
+struct uarte_async_tx {
+	struct k_timer timer;
+	const uint8_t *buf;
+	volatile size_t len;
 	const uint8_t *xfer_buf;
 	size_t xfer_len;
+	size_t cache_offset;
+	volatile int amount;
+	bool pending;
+};
 
-	size_t tx_cache_offset;
-
-	struct k_timer tx_timeout_timer;
-
-	uint8_t *rx_buf;
-	size_t rx_buf_len;
-	size_t rx_offset;
-	uint8_t *rx_next_buf;
-	size_t rx_next_buf_len;
-	uint32_t rx_total_byte_cnt; /* Total number of bytes received */
-	uint32_t rx_total_user_byte_cnt; /* Total number of bytes passed to user */
-	int32_t rx_timeout; /* Timeout set by user */
-	int32_t rx_timeout_slab; /* rx_timeout divided by RX_TIMEOUT_DIV */
-	int32_t rx_timeout_left; /* Current time left until user callback */
-	struct k_timer rx_timeout_timer;
+struct uarte_async_rx {
+	struct k_timer timer;
+	uint8_t *buf;
+	size_t buf_len;
+	size_t offset;
+	uint8_t *next_buf;
+	size_t next_buf_len;
+	uint32_t total_byte_cnt; /* Total number of bytes received */
+	uint32_t total_user_byte_cnt; /* Total number of bytes passed to user */
+	int32_t timeout; /* Timeout set by user */
+	int32_t timeout_slab; /* rx_timeout divided by RX_TIMEOUT_DIV */
+	int32_t timeout_left; /* Current time left until user callback */
 	union {
-		gppi_channel_t ppi;
+		uint8_t ppi;
 		uint32_t cnt;
-	} rx_cnt;
-	volatile int tx_amount;
-
-	atomic_t low_power_mask;
-	uint8_t rx_flush_buffer[UARTE_HW_RX_FIFO_SIZE];
-	uint8_t rx_flush_cnt;
-	volatile bool rx_enabled;
-	volatile bool discard_rx_fifo;
-	bool pending_tx;
+	} cnt;
 	/* Flag to ensure that RX timeout won't be executed during ENDRX ISR */
 	volatile bool is_in_irq;
+	uint8_t flush_buffer[UARTE_HW_RX_FIFO_SIZE];
+	uint8_t flush_cnt;
+	volatile bool enabled;
+	volatile bool discard_fifo;
+	volatile bool aborted;
 };
+
+struct uarte_async_cb {
+	uart_callback_t user_callback;
+	void *user_data;
+	atomic_t low_power_mask;
+	struct uarte_async_rx rx;
+	struct uarte_async_tx tx;
+};
+
 #endif /* UARTE_ANY_ASYNC */
 
 #ifdef UARTE_INTERRUPT_DRIVEN
@@ -555,7 +561,7 @@ static int uarte_enable(const struct device *dev, uint32_t mask)
 
 			nrfx_timer_enable(timer);
 
-			for (int i = 0; i < data->async->rx_flush_cnt; i++) {
+			for (int i = 0; i < data->async->rx.flush_cnt; i++) {
 				nrfx_timer_increment(timer);
 			}
 		}
@@ -604,8 +610,8 @@ static void uart_disable(const struct device *dev)
 	if (data->async && HW_RX_COUNTING_ENABLED(config)) {
 		nrfx_timer_disable(&config->timer);
 		/* Timer/counter value is reset when disabled. */
-		data->async->rx_total_byte_cnt = 0;
-		data->async->rx_total_user_byte_cnt = 0;
+		data->async->rx.total_byte_cnt = 0;
+		data->async->rx.total_user_byte_cnt = 0;
 	}
 #endif
 
@@ -643,7 +649,7 @@ static int uarte_nrfx_rx_counting_init(const struct device *dev)
 			nrfx_timer_clear(&cfg->timer);
 		}
 
-		ret = gppi_channel_alloc(&data->async->rx_cnt.ppi);
+		ret = gppi_channel_alloc(&data->async->rx.cnt.ppi);
 		if (ret != NRFX_SUCCESS) {
 			LOG_ERR("Failed to allocate PPI Channel");
 			nrfx_timer_uninit(&cfg->timer);
@@ -652,7 +658,7 @@ static int uarte_nrfx_rx_counting_init(const struct device *dev)
 
 #if CONFIG_HAS_HW_NRF_PPI
 		ret = nrfx_ppi_channel_assign(
-			data->async->rx_cnt.ppi,
+			data->async->rx.cnt.ppi,
 			nrf_uarte_event_address_get(uarte,
 						    NRF_UARTE_EVENT_RXDRDY),
 			nrfx_timer_task_address_get(&cfg->timer,
@@ -664,13 +670,13 @@ static int uarte_nrfx_rx_counting_init(const struct device *dev)
 #else
 		nrf_uarte_publish_set(uarte,
 				      NRF_UARTE_EVENT_RXDRDY,
-				      data->async->rx_cnt.ppi);
+				      data->async->rx.cnt.ppi);
 		nrf_timer_subscribe_set(cfg->timer.p_reg,
 					NRF_TIMER_TASK_COUNT,
-					data->async->rx_cnt.ppi);
+					data->async->rx.cnt.ppi);
 
 #endif
-		ret = gppi_channel_enable(data->async->rx_cnt.ppi);
+		ret = gppi_channel_enable(data->async->rx.cnt.ppi);
 		if (ret != NRFX_SUCCESS) {
 			return -EIO;
 		}
@@ -700,10 +706,10 @@ static int uarte_nrfx_init(const struct device *dev)
 			     NRF_UARTE_INT_RXTO_MASK);
 	nrf_uarte_enable(uarte);
 
-	k_timer_init(&data->async->rx_timeout_timer, rx_timeout, NULL);
-	k_timer_user_data_set(&data->async->rx_timeout_timer, data);
-	k_timer_init(&data->async->tx_timeout_timer, tx_timeout, NULL);
-	k_timer_user_data_set(&data->async->tx_timeout_timer, data);
+	k_timer_init(&data->async->rx.timer, rx_timeout, NULL);
+	k_timer_user_data_set(&data->async->rx.timer, data);
+	k_timer_init(&data->async->tx.timer, tx_timeout, NULL);
+	k_timer_user_data_set(&data->async->tx.timer, data);
 
 	return 0;
 }
@@ -716,11 +722,11 @@ static void start_tx_locked(const struct device *dev, struct uarte_nrfx_data *da
 {
 	if (!is_tx_ready(dev)) {
 		/* Active poll out, postpone until it is completed. */
-		data->async->pending_tx = true;
+		data->async->tx.pending = true;
 	} else {
-		data->async->pending_tx = false;
-		data->async->tx_amount = -1;
-		tx_start(dev, data->async->xfer_buf, data->async->xfer_len);
+		data->async->tx.pending = false;
+		data->async->tx.amount = -1;
+		tx_start(dev, data->async->tx.xfer_buf, data->async->tx.xfer_len);
 	}
 }
 
@@ -733,7 +739,7 @@ static bool setup_tx_cache(const struct device *dev)
 {
 	struct uarte_nrfx_data *data = dev->data;
 	const struct uarte_nrfx_config *config = dev->config;
-	size_t remaining = data->async->tx_size - data->async->tx_cache_offset;
+	size_t remaining = data->async->tx.len - data->async->tx.cache_offset;
 
 	if (!remaining) {
 		return false;
@@ -741,9 +747,9 @@ static bool setup_tx_cache(const struct device *dev)
 
 	size_t len = MIN(remaining, CONFIG_UART_ASYNC_TX_CACHE_SIZE);
 
-	data->async->xfer_len = len;
-	data->async->xfer_buf = config->tx_cache;
-	memcpy(config->tx_cache, &data->async->tx_buf[data->async->tx_cache_offset], len);
+	data->async->tx.xfer_len = len;
+	data->async->tx.xfer_buf = config->tx_cache;
+	memcpy(config->tx_cache, &data->async->tx.buf[data->async->tx.cache_offset], len);
 
 	return true;
 }
@@ -770,20 +776,20 @@ static int uarte_nrfx_tx(const struct device *dev, const uint8_t *buf,
 
 	unsigned int key = irq_lock();
 
-	if (data->async->tx_size) {
+	if (data->async->tx.len) {
 		irq_unlock(key);
 		return -EBUSY;
 	}
 
-	data->async->tx_size = len;
-	data->async->tx_buf = buf;
+	data->async->tx.len = len;
+	data->async->tx.buf = buf;
 	nrf_uarte_int_enable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
 
 	if (nrfx_is_in_ram(buf)) {
-		data->async->xfer_buf = buf;
-		data->async->xfer_len = len;
+		data->async->tx.xfer_buf = buf;
+		data->async->tx.xfer_len = len;
 	} else {
-		data->async->tx_cache_offset = 0;
+		data->async->tx.cache_offset = 0;
 		(void)setup_tx_cache(dev);
 	}
 
@@ -792,7 +798,7 @@ static int uarte_nrfx_tx(const struct device *dev, const uint8_t *buf,
 	irq_unlock(key);
 
 	if (has_hwfc(dev) && timeout != SYS_FOREVER_US) {
-		k_timer_start(&data->async->tx_timeout_timer, K_USEC(timeout), K_NO_WAIT);
+		k_timer_start(&data->async->tx.timer, K_USEC(timeout), K_NO_WAIT);
 	}
 	return 0;
 }
@@ -802,12 +808,12 @@ static int uarte_nrfx_tx_abort(const struct device *dev)
 	struct uarte_nrfx_data *data = dev->data;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
-	if (data->async->tx_buf == NULL) {
+	if (data->async->tx.buf == NULL) {
 		return -EFAULT;
 	}
 
-	data->async->pending_tx = false;
-	k_timer_stop(&data->async->tx_timeout_timer);
+	data->async->tx.pending = false;
+	k_timer_stop(&data->async->tx.timer);
 	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPTX);
 
 	return 0;
@@ -827,9 +833,9 @@ static void notify_uart_rx_rdy(const struct device *dev, size_t len)
 	struct uarte_nrfx_data *data = dev->data;
 	struct uart_event evt = {
 		.type = UART_RX_RDY,
-		.data.rx.buf = data->async->rx_buf,
+		.data.rx.buf = data->async->rx.buf,
 		.data.rx.len = len,
-		.data.rx.offset = data->async->rx_offset
+		.data.rx.offset = data->async->rx.offset
 	};
 
 	user_callback(dev, &evt);
@@ -875,24 +881,24 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	 * for the RXTO event after a call to uart_rx_disable() to discard
 	 * data from the UARTE internal RX FIFO.
 	 */
-	if (data->async->rx_enabled || data->async->discard_rx_fifo) {
+	if (data->async->rx.enabled || data->async->rx.discard_fifo) {
 		return -EBUSY;
 	}
 
-	data->async->rx_timeout = timeout;
-	data->async->rx_timeout_slab = timeout / RX_TIMEOUT_DIV;
+	data->async->rx.timeout = timeout;
+	data->async->rx.timeout_slab = timeout / RX_TIMEOUT_DIV;
 
-	data->async->rx_buf = buf;
-	data->async->rx_buf_len = len;
-	data->async->rx_offset = 0;
-	data->async->rx_next_buf = NULL;
-	data->async->rx_next_buf_len = 0;
+	data->async->rx.buf = buf;
+	data->async->rx.buf_len = len;
+	data->async->rx.offset = 0;
+	data->async->rx.next_buf = NULL;
+	data->async->rx.next_buf_len = 0;
 
 	if (cfg->flags & UARTE_CFG_FLAG_LOW_POWER) {
-		if (data->async->rx_flush_cnt) {
-			int cpy_len = MIN(len, data->async->rx_flush_cnt);
+		if (data->async->rx.flush_cnt) {
+			int cpy_len = MIN(len, data->async->rx.flush_cnt);
 
-			memcpy(buf, data->async->rx_flush_buffer, cpy_len);
+			memcpy(buf, data->async->rx.flush_buffer, cpy_len);
 			buf += cpy_len;
 			len -= cpy_len;
 
@@ -900,9 +906,9 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 			 * request and indicate rx being disabled.
 			 */
 			if (!len) {
-				data->async->rx_flush_cnt -= cpy_len;
+				data->async->rx.flush_cnt -= cpy_len;
 				notify_uart_rx_rdy(dev, cpy_len);
-				rx_buf_release(dev, &data->async->rx_buf);
+				rx_buf_release(dev, &data->async->rx.buf);
 				notify_rx_disable(dev);
 				return 0;
 			}
@@ -914,7 +920,7 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 
-	data->async->rx_enabled = true;
+	data->async->rx.enabled = true;
 	if (cfg->flags & UARTE_CFG_FLAG_LOW_POWER) {
 		unsigned int key = irq_lock();
 
@@ -935,11 +941,11 @@ static int uarte_nrfx_rx_buf_rsp(const struct device *dev, uint8_t *buf,
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	unsigned int key = irq_lock();
 
-	if (data->async->rx_buf == NULL) {
+	if (data->async->rx.buf == NULL) {
 		err = -EACCES;
-	} else if (data->async->rx_next_buf == NULL) {
-		data->async->rx_next_buf = buf;
-		data->async->rx_next_buf_len = len;
+	} else if (data->async->rx.next_buf == NULL) {
+		data->async->rx.next_buf = buf;
+		data->async->rx.next_buf_len = len;
 		nrf_uarte_rx_buffer_set(uarte, buf, len);
 		nrf_uarte_shorts_enable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
 		err = 0;
@@ -973,17 +979,17 @@ static int uarte_nrfx_rx_disable(const struct device *dev)
 	struct uarte_nrfx_data *data = dev->data;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
-	if (data->async->rx_buf == NULL) {
+	if (data->async->rx.buf == NULL) {
 		return -EFAULT;
 	}
-	if (data->async->rx_next_buf != NULL) {
+	if (data->async->rx.next_buf != NULL) {
 		nrf_uarte_shorts_disable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 	}
 
-	k_timer_stop(&data->async->rx_timeout_timer);
-	data->async->rx_enabled = false;
-	data->async->discard_rx_fifo = true;
+	k_timer_stop(&data->async->rx.timer);
+	data->async->rx.enabled = false;
+	data->async->rx.discard_fifo = true;
 
 	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPRX);
 
@@ -1011,7 +1017,7 @@ static void rx_timeout(struct k_timer *timer)
 	const struct uarte_nrfx_config *cfg = dev->config;
 	uint32_t read;
 
-	if (data->async->is_in_irq) {
+	if (data->async->rx.is_in_irq) {
 		return;
 	}
 
@@ -1024,21 +1030,21 @@ static void rx_timeout(struct k_timer *timer)
 	if (HW_RX_COUNTING_ENABLED(cfg)) {
 		read = nrfx_timer_capture(&cfg->timer, 0);
 	} else {
-		read = data->async->rx_cnt.cnt;
+		read = data->async->rx.cnt.cnt;
 	}
 
 	/* Check if data was received since last function call */
-	if (read != data->async->rx_total_byte_cnt) {
-		data->async->rx_total_byte_cnt = read;
-		data->async->rx_timeout_left = data->async->rx_timeout;
+	if (read != data->async->rx.total_byte_cnt) {
+		data->async->rx.total_byte_cnt = read;
+		data->async->rx.timeout_left = data->async->rx.timeout;
 	}
 
 	/* Check if there is data that was not sent to user yet
 	 * Note though that 'len' is a count of data bytes received, but not
 	 * necessarily the amount available in the current buffer
 	 */
-	int32_t len = data->async->rx_total_byte_cnt
-		    - data->async->rx_total_user_byte_cnt;
+	int32_t len = data->async->rx.total_byte_cnt
+		    - data->async->rx.total_user_byte_cnt;
 
 	if (!HW_RX_COUNTING_ENABLED(cfg) &&
 	    (len < 0)) {
@@ -1047,7 +1053,7 @@ static void rx_timeout(struct k_timer *timer)
 		 * At this point, the number of received bytes is at least
 		 * equal to what was reported to the user.
 		 */
-		data->async->rx_cnt.cnt = data->async->rx_total_user_byte_cnt;
+		data->async->rx.cnt.cnt = data->async->rx.total_user_byte_cnt;
 		len = 0;
 	}
 
@@ -1059,31 +1065,31 @@ static void rx_timeout(struct k_timer *timer)
 	 */
 	bool clipped = false;
 
-	if (len + data->async->rx_offset > data->async->rx_buf_len) {
-		len = data->async->rx_buf_len - data->async->rx_offset;
+	if (len + data->async->rx.offset > data->async->rx.buf_len) {
+		len = data->async->rx.buf_len - data->async->rx.offset;
 		clipped = true;
 	}
 
 	if (len > 0) {
 		if (clipped ||
-			(data->async->rx_timeout_left
-				< data->async->rx_timeout_slab)) {
+			(data->async->rx.timeout_left
+				< data->async->rx.timeout_slab)) {
 			/* rx_timeout us elapsed since last receiving */
-			if (data->async->rx_buf != NULL) {
+			if (data->async->rx.buf != NULL) {
 				notify_uart_rx_rdy(dev, len);
-				data->async->rx_offset += len;
-				data->async->rx_total_user_byte_cnt += len;
+				data->async->rx.offset += len;
+				data->async->rx.total_user_byte_cnt += len;
 			}
 		} else {
-			data->async->rx_timeout_left -=
-				data->async->rx_timeout_slab;
+			data->async->rx.timeout_left -=
+				data->async->rx.timeout_slab;
 		}
 
 		/* If there's nothing left to report until the buffers are
 		 * switched then the timer can be stopped
 		 */
 		if (clipped) {
-			k_timer_stop(&data->async->rx_timeout_timer);
+			k_timer_stop(&data->async->rx.timer);
 		}
 	}
 
@@ -1118,11 +1124,11 @@ static void rxstarted_isr(const struct device *dev)
 		.type = UART_RX_BUF_REQUEST,
 	};
 	user_callback(dev, &evt);
-	if (data->async->rx_timeout != SYS_FOREVER_US) {
-		data->async->rx_timeout_left = data->async->rx_timeout;
-		k_timer_start(&data->async->rx_timeout_timer,
-			      K_USEC(data->async->rx_timeout_slab),
-			      K_USEC(data->async->rx_timeout_slab));
+	if (data->async->rx.timeout != SYS_FOREVER_US) {
+		data->async->rx.timeout_left = data->async->rx.timeout;
+		k_timer_start(&data->async->rx.timer,
+			      K_USEC(data->async->rx.timeout_slab),
+			      K_USEC(data->async->rx.timeout_slab));
 	}
 }
 
@@ -1131,20 +1137,20 @@ static void endrx_isr(const struct device *dev)
 	struct uarte_nrfx_data *data = dev->data;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
-	data->async->is_in_irq = true;
+	data->async->rx.is_in_irq = true;
 
 	/* ensure rx timer is stopped - it will be restarted in RXSTARTED
 	 * handler if needed
 	 */
-	k_timer_stop(&data->async->rx_timeout_timer);
+	k_timer_stop(&data->async->rx.timer);
 
 	/* this is the amount that the EasyDMA controller has copied into the
 	 * buffer
 	 */
 	const int rx_amount = nrf_uarte_rx_amount_get(uarte) +
-				data->async->rx_flush_cnt;
+				data->async->rx.flush_cnt;
 
-	data->async->rx_flush_cnt = 0;
+	data->async->rx.flush_cnt = 0;
 
 	/* The 'rx_offset' can be bigger than 'rx_amount', so it the length
 	 * of data we report back the user may need to be clipped.
@@ -1153,25 +1159,25 @@ static void endrx_isr(const struct device *dev)
 	 * here to handle this buffer. (The next buffer is now already active
 	 * because of the ENDRX_STARTRX shortcut)
 	 */
-	int rx_len = rx_amount - data->async->rx_offset;
+	int rx_len = rx_amount - data->async->rx.offset;
 
 	if (rx_len < 0) {
 		rx_len = 0;
 	}
 
-	data->async->rx_total_user_byte_cnt += rx_len;
+	data->async->rx.total_user_byte_cnt += rx_len;
 
 	/* Only send the RX_RDY event if there is something to send */
 	if (rx_len > 0) {
 		notify_uart_rx_rdy(dev, rx_len);
 	}
 
-	if (!data->async->rx_enabled) {
-		data->async->is_in_irq = false;
+	if (!data->async->rx.enabled) {
+		data->async->rx.is_in_irq = false;
 		return;
 	}
 
-	rx_buf_release(dev, &data->async->rx_buf);
+	rx_buf_release(dev, &data->async->rx.buf);
 
 	/* If there is a next buffer, then STARTRX will have already been
 	 * invoked by the short (the next buffer will be filling up already)
@@ -1180,13 +1186,13 @@ static void endrx_isr(const struct device *dev)
 	 */
 	unsigned int key = irq_lock();
 
-	if (data->async->rx_next_buf) {
-		data->async->rx_buf = data->async->rx_next_buf;
-		data->async->rx_buf_len = data->async->rx_next_buf_len;
-		data->async->rx_next_buf = NULL;
-		data->async->rx_next_buf_len = 0;
+	if (data->async->rx.next_buf) {
+		data->async->rx.buf = data->async->rx.next_buf;
+		data->async->rx.buf_len = data->async->rx.next_buf_len;
+		data->async->rx.next_buf = NULL;
+		data->async->rx.next_buf_len = 0;
 
-		data->async->rx_offset = 0;
+		data->async->rx.offset = 0;
 		/* Check is based on assumption that ISR handler handles
 		 * ENDRX before RXSTARTED so if short was set on time, RXSTARTED
 		 * event will be set.
@@ -1202,7 +1208,7 @@ static void endrx_isr(const struct device *dev)
 
 	irq_unlock(key);
 
-	data->async->is_in_irq = false;
+	data->async->rx.is_in_irq = false;
 }
 
 /* Function for flushing internal RX fifo. Function can be called in case
@@ -1281,9 +1287,9 @@ static void async_uart_release(const struct device *dev, uint32_t dir_mask)
 	data->async->low_power_mask &= ~dir_mask;
 	if (!data->async->low_power_mask) {
 		if (dir_mask == UARTE_LOW_POWER_RX) {
-			data->async->rx_flush_cnt =
-				rx_flush(dev, data->async->rx_flush_buffer,
-					 sizeof(data->async->rx_flush_buffer));
+			data->async->rx.flush_cnt =
+				rx_flush(dev, data->async->rx.flush_buffer,
+					 sizeof(data->async->rx.flush_buffer));
 		}
 
 		uart_disable(dev);
@@ -1304,8 +1310,8 @@ static void rxto_isr(const struct device *dev)
 	const struct uarte_nrfx_config *config = dev->config;
 	struct uarte_nrfx_data *data = dev->data;
 
-	rx_buf_release(dev, &data->async->rx_buf);
-	rx_buf_release(dev, &data->async->rx_next_buf);
+	rx_buf_release(dev, &data->async->rx.buf);
+	rx_buf_release(dev, &data->async->rx.next_buf);
 
 	/* This point can be reached in two cases:
 	 * 1. RX is disabled because all provided RX buffers have been filled.
@@ -1315,17 +1321,17 @@ static void rxto_isr(const struct device *dev)
 	 * In the second case, additionally, data from the UARTE internal RX
 	 * FIFO need to be discarded.
 	 */
-	data->async->rx_enabled = false;
-	if (data->async->discard_rx_fifo) {
+	data->async->rx.enabled = false;
+	if (data->async->rx.discard_fifo) {
 		uint8_t flushed;
 
-		data->async->discard_rx_fifo = false;
+		data->async->rx.discard_fifo = false;
 		flushed = rx_flush(dev, NULL, 0);
 		if (HW_RX_COUNTING_ENABLED(config)) {
 			/* It need to be included because TIMER+PPI got RXDRDY events
 			 * and counted those flushed bytes.
 			 */
-			data->async->rx_total_user_byte_cnt += flushed;
+			data->async->rx.total_user_byte_cnt += flushed;
 		}
 	}
 
@@ -1347,18 +1353,18 @@ static void txstopped_isr(const struct device *dev)
 		nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
 		async_uart_release(dev, UARTE_LOW_POWER_TX);
 
-		if (!data->async->tx_size) {
+		if (!data->async->tx.len) {
 			return;
 		}
 	}
 
-	if (!data->async->tx_buf) {
+	if (!data->async->tx.buf) {
 		return;
 	}
 
 	key = irq_lock();
-	size_t amount = (data->async->tx_amount >= 0) ?
-			data->async->tx_amount : nrf_uarte_tx_amount_get(uarte);
+	size_t amount = (data->async->tx.amount >= 0) ?
+			data->async->tx.amount : nrf_uarte_tx_amount_get(uarte);
 
 	irq_unlock(key);
 
@@ -1366,7 +1372,7 @@ static void txstopped_isr(const struct device *dev)
 	 * was called when there was ongoing uart_poll_out. Handling
 	 * TXSTOPPED interrupt means that uart_poll_out has completed.
 	 */
-	if (data->async->pending_tx) {
+	if (data->async->tx.pending) {
 		key = irq_lock();
 		start_tx_locked(dev, data);
 		irq_unlock(key);
@@ -1374,12 +1380,12 @@ static void txstopped_isr(const struct device *dev)
 	}
 
 	/* Cache buffer is used because tx_buf wasn't in RAM. */
-	if (data->async->tx_buf != data->async->xfer_buf) {
+	if (data->async->tx.buf != data->async->tx.xfer_buf) {
 		/* In that case setup next chunk. If that was the last chunk
 		 * fall back to reporting TX_DONE.
 		 */
-		if (amount == data->async->xfer_len) {
-			data->async->tx_cache_offset += amount;
+		if (amount == data->async->tx.xfer_len) {
+			data->async->tx.cache_offset += amount;
 			if (setup_tx_cache(dev)) {
 				key = irq_lock();
 				start_tx_locked(dev, data);
@@ -1388,28 +1394,28 @@ static void txstopped_isr(const struct device *dev)
 			}
 
 			/* Amount is already included in tx_cache_offset. */
-			amount = data->async->tx_cache_offset;
+			amount = data->async->tx.cache_offset;
 		} else {
 			/* TX was aborted, include tx_cache_offset in amount. */
-			amount += data->async->tx_cache_offset;
+			amount += data->async->tx.cache_offset;
 		}
 	}
 
-	k_timer_stop(&data->async->tx_timeout_timer);
+	k_timer_stop(&data->async->tx.timer);
 
 	struct uart_event evt = {
-		.data.tx.buf = data->async->tx_buf,
+		.data.tx.buf = data->async->tx.buf,
 		.data.tx.len = amount,
 	};
-	if (amount == data->async->tx_size) {
+	if (amount == data->async->tx.len) {
 		evt.type = UART_TX_DONE;
 	} else {
 		evt.type = UART_TX_ABORTED;
 	}
 
 	nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
-	data->async->tx_buf = NULL;
-	data->async->tx_size = 0;
+	data->async->tx.buf = NULL;
+	data->async->tx.len = 0;
 
 	user_callback(dev, &evt);
 }
@@ -1425,7 +1431,7 @@ static void uarte_nrfx_isr_async(const void *arg)
 		struct uarte_nrfx_data *data = dev->data;
 
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXDRDY);
-		data->async->rx_cnt.cnt++;
+		data->async->rx.cnt.cnt++;
 		return;
 	}
 
@@ -1529,9 +1535,9 @@ static void uarte_nrfx_poll_out(const struct device *dev, unsigned char c)
 			key = irq_lock();
 			if (is_tx_ready(dev)) {
 #if UARTE_ANY_ASYNC
-				if (data->async && data->async->tx_size &&
-					data->async->tx_amount < 0) {
-					data->async->tx_amount =
+				if (data->async && data->async->tx.len &&
+					data->async->tx.amount < 0) {
+					data->async->tx.amount =
 						nrf_uarte_tx_amount_get(
 						      get_uarte_instance(dev));
 				}
@@ -1957,8 +1963,8 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 			/* Entering inactive state requires device to be no
 			 * active asynchronous calls.
 			 */
-			__ASSERT_NO_MSG(!data->async->rx_enabled);
-			__ASSERT_NO_MSG(!data->async->tx_size);
+			__ASSERT_NO_MSG(!data->async->rx.enabled);
+			__ASSERT_NO_MSG(!data->async->tx.len);
 
 		}
 #endif

From e4ec1b503c23db64b1c033097dbd40f606533be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 25 Jun 2024 09:44:14 +0200
Subject: [PATCH 0446/2913] [nrf fromtree] dts: nordic: nrf-uarte: Add
 frame-timeout-supported property
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add property which indicates that UARTE support frame timeout
feature. Property is added to nrf54h20, nrf9280, nrf54l20 and
nrf54l15.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit ac1cc17ae90a9ede2a2b2c5d8311bddf93ea3eca)
(cherry picked from commit 8b426b84100f2a03a567e8280a4af4badd301a1e)
---
 dts/bindings/serial/nordic,nrf-uarte.yaml | 5 +++++
 dts/common/nordic/nrf54h20.dtsi           | 9 +++++++++
 dts/common/nordic/nrf54l15.dtsi           | 5 +++++
 dts/common/nordic/nrf54l20.dtsi           | 5 +++++
 dts/common/nordic/nrf9280.dtsi            | 9 +++++++++
 5 files changed, 33 insertions(+)

diff --git a/dts/bindings/serial/nordic,nrf-uarte.yaml b/dts/bindings/serial/nordic,nrf-uarte.yaml
index c1361d54e1b..e6ba4c0b214 100644
--- a/dts/bindings/serial/nordic,nrf-uarte.yaml
+++ b/dts/bindings/serial/nordic,nrf-uarte.yaml
@@ -9,3 +9,8 @@ properties:
     type: boolean
     description: |
       UARTE has ENDTX_STOPTX HW short.
+
+  frame-timeout-supported:
+    type: boolean
+    description: |
+      UARTE has RX frame timeout HW feature.
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index c2923d2732a..60d85faff77 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -654,6 +654,7 @@
 				interrupts = <230 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&hsfll120>;
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			spi121: spi@8e7000 {
@@ -963,6 +964,7 @@
 				clocks = <&fll16m>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			i2c131: i2c@9a6000 {
@@ -1004,6 +1006,7 @@
 				clocks = <&fll16m>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			dppic134: dppic@9b1000 {
@@ -1082,6 +1085,7 @@
 				clocks = <&fll16m>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			i2c133: i2c@9b6000 {
@@ -1123,6 +1127,7 @@
 				clocks = <&fll16m>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			dppic135: dppic@9c1000 {
@@ -1201,6 +1206,7 @@
 				clocks = <&fll16m>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			i2c135: i2c@9c6000 {
@@ -1242,6 +1248,7 @@
 				clocks = <&fll16m>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			dppic136: dppic@9d1000 {
@@ -1320,6 +1327,7 @@
 				clocks = <&fll16m>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			i2c137: i2c@9d6000 {
@@ -1361,6 +1369,7 @@
 				clocks = <&fll16m>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 		};
 	};
diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index 1df4c4f53c5..5851bfd71e3 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -138,6 +138,7 @@
 				interrupts = <74 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			cpuflpr_vpr: vpr@4c000 {
@@ -271,6 +272,7 @@
 				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			i2c21: i2c@c7000 {
@@ -309,6 +311,7 @@
 				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			i2c22: i2c@c8000 {
@@ -347,6 +350,7 @@
 				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			egu20: egu@c9000 {
@@ -556,6 +560,7 @@
 				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 #ifdef USE_NON_SECURE_ADDRESS_MAP
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 17d871d2bfc..dfe8d7b4531 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -107,6 +107,7 @@
 				interrupts = <77 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			gpio2: gpio@50400 {
@@ -221,6 +222,7 @@
 				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			i2c21: i2c@c7000 {
@@ -259,6 +261,7 @@
 				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			i2c22: i2c@c8000 {
@@ -297,6 +300,7 @@
 				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			egu20: egu@c9000 {
@@ -497,6 +501,7 @@
 				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			wdt30: watchdog@108000 {
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index dc688a89f25..9949f6c9f1c 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -517,6 +517,7 @@
 				status = "disabled";
 				interrupts = <230 NRF_DEFAULT_IRQ_PRIORITY>;
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			spi121: spi@8e7000 {
@@ -847,6 +848,7 @@
 				interrupts = <421 NRF_DEFAULT_IRQ_PRIORITY>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			i2c131: i2c@9a6000 {
@@ -885,6 +887,7 @@
 				interrupts = <422 NRF_DEFAULT_IRQ_PRIORITY>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			dppic134: dppic@9b1000 {
@@ -957,6 +960,7 @@
 				interrupts = <437 NRF_DEFAULT_IRQ_PRIORITY>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			i2c133: i2c@9b6000 {
@@ -995,6 +999,7 @@
 				interrupts = <438 NRF_DEFAULT_IRQ_PRIORITY>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			dppic135: dppic@9c1000 {
@@ -1067,6 +1072,7 @@
 				interrupts = <453 NRF_DEFAULT_IRQ_PRIORITY>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			i2c135: i2c@9c6000 {
@@ -1105,6 +1111,7 @@
 				interrupts = <454 NRF_DEFAULT_IRQ_PRIORITY>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			dppic136: dppic@9d1000 {
@@ -1177,6 +1184,7 @@
 				interrupts = <469 NRF_DEFAULT_IRQ_PRIORITY>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 
 			i2c137: i2c@9d6000 {
@@ -1215,6 +1223,7 @@
 				interrupts = <470 NRF_DEFAULT_IRQ_PRIORITY>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
+				frame-timeout-supported;
 			};
 		};
 	};

From f4335c024e47f63972508898402dc1e92b635410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 20 Sep 2024 16:04:58 +0200
Subject: [PATCH 0447/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Remove
 CONFIG_UART_n_GPIO_MANAGEMENT
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a leftover from pre-pinctrl era and no longer makes sense.
Driver always manages gpio through pinctrl.

Support removed from uart and uarte shims.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 76db5b24e0257f21de137bd9acdca153a3cb3072)
(cherry picked from commit eb62dd5ec96539262726296fdac62fbbd46afaaf)
---
 drivers/serial/Kconfig.nrfx_uart_instance |  9 ------
 drivers/serial/uart_nrfx_uart.c           | 19 ++++--------
 drivers/serial/uart_nrfx_uarte.c          | 36 ++++-------------------
 3 files changed, 12 insertions(+), 52 deletions(-)

diff --git a/drivers/serial/Kconfig.nrfx_uart_instance b/drivers/serial/Kconfig.nrfx_uart_instance
index 0840cad7760..ed4c011da51 100644
--- a/drivers/serial/Kconfig.nrfx_uart_instance
+++ b/drivers/serial/Kconfig.nrfx_uart_instance
@@ -119,12 +119,3 @@ config UART_$(nrfx_uart_num)_A2I_RX_BUF_COUNT
 	default 0
 	help
 	  Number of chunks into RX space is divided.
-
-config UART_$(nrfx_uart_num)_GPIO_MANAGEMENT
-	bool "GPIO management on port $(nrfx_uart_num)"
-	depends on PM_DEVICE
-	default y
-	help
-	  If enabled, the driver will configure the GPIOs used by the uart to
-	  their default configuration when device is powered down. The GPIOs
-	  will be configured back to correct state when UART is powered up.
diff --git a/drivers/serial/uart_nrfx_uart.c b/drivers/serial/uart_nrfx_uart.c
index 9fa634fe01f..1e0da0f882f 100644
--- a/drivers/serial/uart_nrfx_uart.c
+++ b/drivers/serial/uart_nrfx_uart.c
@@ -1087,12 +1087,9 @@ static int uart_nrfx_pm_action(const struct device *dev,
 
 	switch (action) {
 	case PM_DEVICE_ACTION_RESUME:
-		if (IS_ENABLED(CONFIG_UART_0_GPIO_MANAGEMENT)) {
-			ret = pinctrl_apply_state(config->pcfg,
-						  PINCTRL_STATE_DEFAULT);
-			if (ret < 0) {
-				return ret;
-			}
+		ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+		if (ret < 0) {
+			return ret;
 		}
 
 		nrf_uart_enable(uart0_addr);
@@ -1103,13 +1100,9 @@ static int uart_nrfx_pm_action(const struct device *dev,
 		break;
 	case PM_DEVICE_ACTION_SUSPEND:
 		nrf_uart_disable(uart0_addr);
-
-		if (IS_ENABLED(CONFIG_UART_0_GPIO_MANAGEMENT)) {
-			ret = pinctrl_apply_state(config->pcfg,
-						  PINCTRL_STATE_SLEEP);
-			if (ret < 0) {
-				return ret;
-			}
+		ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
+		if (ret < 0) {
+			return ret;
 		}
 		break;
 	default:
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index c4b136bf1f4..aa65103132d 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -191,19 +191,16 @@ struct uarte_nrfx_data {
 #define UARTE_LOW_POWER_TX BIT(0)
 #define UARTE_LOW_POWER_RX BIT(1)
 
-/* If enabled, pins are managed when going to low power mode. */
-#define UARTE_CFG_FLAG_GPIO_MGMT   BIT(0)
-
 /* If enabled then ENDTX is PPI'ed to TXSTOP */
-#define UARTE_CFG_FLAG_PPI_ENDTX   BIT(1)
+#define UARTE_CFG_FLAG_PPI_ENDTX   BIT(0)
 
 /* If enabled then TIMER and PPI is used for byte counting. */
-#define UARTE_CFG_FLAG_HW_BYTE_COUNTING   BIT(2)
+#define UARTE_CFG_FLAG_HW_BYTE_COUNTING   BIT(1)
 
 /* If enabled then UARTE peripheral is disabled when not used. This allows
  * to achieve lowest power consumption in idle.
  */
-#define UARTE_CFG_FLAG_LOW_POWER   BIT(4)
+#define UARTE_CFG_FLAG_LOW_POWER   BIT(2)
 
 /* Macro for converting numerical baudrate to register value. It is convenient
  * to use this approach because for constant input it can calculate nrf setting
@@ -516,20 +513,6 @@ static int wait_tx_ready(const struct device *dev)
 	return key;
 }
 
-#if defined(UARTE_ANY_ASYNC) || defined(CONFIG_PM_DEVICE)
-static int pins_state_change(const struct device *dev, bool on)
-{
-	const struct uarte_nrfx_config *config = dev->config;
-
-	if (config->flags & UARTE_CFG_FLAG_GPIO_MGMT) {
-		return pinctrl_apply_state(config->pcfg,
-				on ? PINCTRL_STATE_DEFAULT : PINCTRL_STATE_SLEEP);
-	}
-
-	return 0;
-}
-#endif
-
 #ifdef UARTE_ANY_ASYNC
 
 /* Using Macro instead of static inline function to handle NO_OPTIMIZATIONS case
@@ -551,7 +534,7 @@ static int uarte_enable(const struct device *dev, uint32_t mask)
 		int ret;
 
 		data->async->low_power_mask |= mask;
-		ret = pins_state_change(dev, true);
+		ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
 		if (ret < 0) {
 			return ret;
 		}
@@ -1293,10 +1276,6 @@ static void async_uart_release(const struct device *dev, uint32_t dir_mask)
 		}
 
 		uart_disable(dev);
-		int err = pins_state_change(dev, false);
-
-		(void)err;
-		__ASSERT_NO_MSG(err == 0);
 	}
 
 	irq_unlock(key);
@@ -1924,8 +1903,7 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 
 	switch (action) {
 	case PM_DEVICE_ACTION_RESUME:
-
-		ret = pins_state_change(dev, true);
+		ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
 		if (ret < 0) {
 			return ret;
 		}
@@ -1994,7 +1972,7 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		wait_for_tx_stopped(dev);
 		uart_disable(dev);
 
-		ret = pins_state_change(dev, false);
+		ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_SLEEP);
 		if (ret < 0) {
 			return ret;
 		}
@@ -2095,8 +2073,6 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(UARTE(idx)),		       \
 		.uarte_regs = _CONCAT(NRF_UARTE, idx),                         \
 		.flags =						       \
-			(IS_ENABLED(CONFIG_UART_##idx##_GPIO_MANAGEMENT) ?     \
-				UARTE_CFG_FLAG_GPIO_MGMT : 0) |		       \
 			(IS_ENABLED(CONFIG_UART_##idx##_ENHANCED_POLL_OUT) ?   \
 				UARTE_CFG_FLAG_PPI_ENDTX : 0) |		       \
 			(IS_ENABLED(CONFIG_UART_##idx##_NRF_HW_ASYNC) ?        \

From e42295ec0ade5d6f4e4f674723a8d0509837fb27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 24 Sep 2024 11:39:47 +0200
Subject: [PATCH 0448/2913] [nrf fromtree] drivers: serial: nrfx_uarte2: Remove
 CONFIG_UART_n_GPIO_MANAGEMENT
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove Kconfig option that no longer has any use after pinctrl
driver is introduced.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit cae53af136027cdeb195890d9ef71f97f5f6aa31)
(cherry picked from commit 42fad2cf975b1d831954ddfa6311b25208dcc5b0)
---
 drivers/serial/uart_nrfx_uarte2.c | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte2.c b/drivers/serial/uart_nrfx_uarte2.c
index 594f5a79b55..ae25334f03f 100644
--- a/drivers/serial/uart_nrfx_uarte2.c
+++ b/drivers/serial/uart_nrfx_uarte2.c
@@ -141,14 +141,11 @@ struct uarte_nrfx_data {
 };
 BUILD_ASSERT(offsetof(struct uarte_nrfx_data, a2i_data) == 0);
 
-/* If set then pins are managed when going to low power mode. */
-#define UARTE_CFG_FLAG_GPIO_MGMT		BIT(0)
-
 /* If set then receiver is not used. */
-#define UARTE_CFG_FLAG_NO_RX			BIT(1)
+#define UARTE_CFG_FLAG_NO_RX			BIT(0)
 
 /* If set then instance is using interrupt driven API. */
-#define UARTE_CFG_FLAG_INTERRUPT_DRIVEN_API	BIT(2)
+#define UARTE_CFG_FLAG_INTERRUPT_DRIVEN_API	BIT(1)
 
 /**
  * @brief Structure for UARTE configuration.
@@ -917,11 +914,9 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 
 	switch (action) {
 	case PM_DEVICE_ACTION_RESUME:
-		if (cfg->flags & UARTE_CFG_FLAG_GPIO_MGMT) {
-			ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
-			if (ret < 0) {
-				return ret;
-			}
+		ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
+		if (ret < 0) {
+			return ret;
 		}
 		if (!IS_ASYNC_API(dev) && !(cfg->flags & UARTE_CFG_FLAG_NO_RX)) {
 			return start_rx(dev);
@@ -933,11 +928,9 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 			stop_rx(dev);
 		}
 
-		if (cfg->flags & UARTE_CFG_FLAG_GPIO_MGMT) {
-			ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_SLEEP);
-			if (ret < 0) {
-				return ret;
-			}
+		ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_SLEEP);
+		if (ret < 0) {
+			return ret;
 		}
 
 		break;
@@ -1032,8 +1025,6 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		},										\
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(UARTE(idx)),					\
 		.flags = (UARTE_PROP(idx, disable_rx) ? UARTE_CFG_FLAG_NO_RX : 0) |		\
-			(IS_ENABLED(CONFIG_UART_##idx##_GPIO_MANAGEMENT) ?			\
-				UARTE_CFG_FLAG_GPIO_MGMT : 0) |					\
 			(IS_ENABLED(CONFIG_UART_##idx##_INTERRUPT_DRIVEN) ?			\
 				UARTE_CFG_FLAG_INTERRUPT_DRIVEN_API : 0),			\
 		LOG_INSTANCE_PTR_INIT(log, LOG_MODULE_NAME, idx)				\

From 2ba3f1e3b43004d1080d04d34f41f4db5b502167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 24 Sep 2024 11:37:12 +0200
Subject: [PATCH 0449/2913] [nrf fromtree] doc: releases: Add not about
 CONFIG_UART_n_GPIO_MANAGEMENT removal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add note that those Kconfig options were removed from Nordic UART driver
configuration.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 3a4c5a9ebca458d68fa07b52c6dc6695995bf438)
(cherry picked from commit 49bbbead3b6b537cfbebc0ed11c262d953298862)
---
 doc/releases/release-notes-4.0.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/releases/release-notes-4.0.rst b/doc/releases/release-notes-4.0.rst
index a6964e8a3c3..70ed64dd770 100644
--- a/doc/releases/release-notes-4.0.rst
+++ b/doc/releases/release-notes-4.0.rst
@@ -228,6 +228,8 @@ Drivers and Sensors
 * Serial
 
   * LiteX: Renamed the ``compatible`` from ``litex,uart0`` to :dtcompatible:`litex,uart`.
+  * Nordic: Removed ``CONFIG_UART_n_GPIO_MANAGEMENT`` Kconfig options (where n is an instance
+    index) which had no use after pinctrl driver was introduced.
 
 * SPI
 

From 7d402a5d6e8ddea5ce8b9b29f9a1e28fb78f3edb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 24 Sep 2024 11:27:34 +0200
Subject: [PATCH 0450/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Use
 nrfx_gppi helper
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use nrfx_gppi as abstraction over (D)PPI.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 266847665ae43a6c04bee6ebdbb88116f0c12a66)
(cherry picked from commit 6bd3a7e737f91e69bbc7c3f7e1e7d89481a94ce3)
---
 drivers/serial/uart_nrfx_uarte.c | 49 +++++---------------------------
 1 file changed, 7 insertions(+), 42 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index aa65103132d..72791f23374 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -24,21 +24,6 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 
 #include <zephyr/drivers/pinctrl.h>
 
-/* Generalize PPI or DPPI channel management */
-#if defined(PPI_PRESENT)
-#include <nrfx_ppi.h>
-#define gppi_channel_t nrf_ppi_channel_t
-#define gppi_channel_alloc nrfx_ppi_channel_alloc
-#define gppi_channel_enable nrfx_ppi_channel_enable
-#elif defined(DPPI_PRESENT)
-#include <nrfx_dppi.h>
-#define gppi_channel_t uint8_t
-#define gppi_channel_alloc nrfx_dppi_channel_alloc
-#define gppi_channel_enable nrfx_dppi_channel_enable
-#else
-#error "No PPI or DPPI"
-#endif
-
 #define UARTE(idx)                DT_NODELABEL(uart##idx)
 #define UARTE_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(UARTE(idx), prop)
 #define UARTE_PROP(idx, prop)     DT_PROP(UARTE(idx), prop)
@@ -185,7 +170,7 @@ struct uarte_nrfx_data {
 	atomic_val_t poll_out_lock;
 	uint8_t *char_out;
 	uint8_t *rx_data;
-	gppi_channel_t ppi_ch_endtx;
+	uint8_t ppi_ch_endtx;
 };
 
 #define UARTE_LOW_POWER_TX BIT(0)
@@ -618,6 +603,8 @@ static int uarte_nrfx_rx_counting_init(const struct device *dev)
 	if (HW_RX_COUNTING_ENABLED(cfg)) {
 		nrfx_timer_config_t tmr_config = NRFX_TIMER_DEFAULT_CONFIG(
 						NRF_TIMER_BASE_FREQUENCY_GET(cfg->timer.p_reg));
+		uint32_t evt_addr = nrf_uarte_event_address_get(uarte, NRF_UARTE_EVENT_RXDRDY);
+		uint32_t tsk_addr = nrfx_timer_task_address_get(&cfg->timer, NRF_TIMER_TASK_COUNT);
 
 		tmr_config.mode = NRF_TIMER_MODE_COUNTER;
 		tmr_config.bit_width = NRF_TIMER_BIT_WIDTH_32;
@@ -632,37 +619,15 @@ static int uarte_nrfx_rx_counting_init(const struct device *dev)
 			nrfx_timer_clear(&cfg->timer);
 		}
 
-		ret = gppi_channel_alloc(&data->async->rx.cnt.ppi);
+		ret = nrfx_gppi_channel_alloc(&data->async->rx.cnt.ppi);
 		if (ret != NRFX_SUCCESS) {
 			LOG_ERR("Failed to allocate PPI Channel");
 			nrfx_timer_uninit(&cfg->timer);
 			return -EINVAL;
 		}
 
-#if CONFIG_HAS_HW_NRF_PPI
-		ret = nrfx_ppi_channel_assign(
-			data->async->rx.cnt.ppi,
-			nrf_uarte_event_address_get(uarte,
-						    NRF_UARTE_EVENT_RXDRDY),
-			nrfx_timer_task_address_get(&cfg->timer,
-						    NRF_TIMER_TASK_COUNT));
-
-		if (ret != NRFX_SUCCESS) {
-			return -EIO;
-		}
-#else
-		nrf_uarte_publish_set(uarte,
-				      NRF_UARTE_EVENT_RXDRDY,
-				      data->async->rx.cnt.ppi);
-		nrf_timer_subscribe_set(cfg->timer.p_reg,
-					NRF_TIMER_TASK_COUNT,
-					data->async->rx.cnt.ppi);
-
-#endif
-		ret = gppi_channel_enable(data->async->rx.cnt.ppi);
-		if (ret != NRFX_SUCCESS) {
-			return -EIO;
-		}
+		nrfx_gppi_channel_endpoints_setup(data->async->rx.cnt.ppi, evt_addr, tsk_addr);
+		nrfx_gppi_channels_enable(BIT(data->async->rx.cnt.ppi));
 	} else {
 		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_RXDRDY_MASK);
 	}
@@ -1745,7 +1710,7 @@ static int endtx_stoptx_ppi_init(NRF_UARTE_Type *uarte,
 {
 	nrfx_err_t ret;
 
-	ret = gppi_channel_alloc(&data->ppi_ch_endtx);
+	ret = nrfx_gppi_channel_alloc(&data->ppi_ch_endtx);
 	if (ret != NRFX_SUCCESS) {
 		LOG_ERR("Failed to allocate PPI Channel");
 		return -EIO;

From aa096eb9efc346591f7255a6e77d759c8a065f21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 24 Sep 2024 11:18:14 +0200
Subject: [PATCH 0451/2913] [nrf fromtree] drivers: serial: nrfx_uarte:
 Refactor to use RX async struct pointer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refactor RX asynchronous API function to use a pointer to the RX
async data structure instead of top level data structure pointer.
It improves readability with more concise code.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit d82808ea9b82241eae696828845151aba0aeac24)
(cherry picked from commit d62a69c77429f933caeeeec8c3992abd2f5b9c84)
---
 drivers/serial/uart_nrfx_uarte.c | 130 ++++++++++++++++---------------
 1 file changed, 66 insertions(+), 64 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 72791f23374..bb473fa6e65 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -816,6 +816,7 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 				int32_t timeout)
 {
 	struct uarte_nrfx_data *data = dev->data;
+	struct uarte_async_rx *async_rx = &data->async->rx;
 	const struct uarte_nrfx_config *cfg = dev->config;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	int ret = 0;
@@ -829,24 +830,24 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	 * for the RXTO event after a call to uart_rx_disable() to discard
 	 * data from the UARTE internal RX FIFO.
 	 */
-	if (data->async->rx.enabled || data->async->rx.discard_fifo) {
+	if (async_rx->enabled || async_rx->discard_fifo) {
 		return -EBUSY;
 	}
 
-	data->async->rx.timeout = timeout;
-	data->async->rx.timeout_slab = timeout / RX_TIMEOUT_DIV;
+	async_rx->timeout = timeout;
+	async_rx->timeout_slab = timeout / RX_TIMEOUT_DIV;
 
-	data->async->rx.buf = buf;
-	data->async->rx.buf_len = len;
-	data->async->rx.offset = 0;
-	data->async->rx.next_buf = NULL;
-	data->async->rx.next_buf_len = 0;
+	async_rx->buf = buf;
+	async_rx->buf_len = len;
+	async_rx->offset = 0;
+	async_rx->next_buf = NULL;
+	async_rx->next_buf_len = 0;
 
 	if (cfg->flags & UARTE_CFG_FLAG_LOW_POWER) {
-		if (data->async->rx.flush_cnt) {
-			int cpy_len = MIN(len, data->async->rx.flush_cnt);
+		if (async_rx->flush_cnt) {
+			int cpy_len = MIN(len, async_rx->flush_cnt);
 
-			memcpy(buf, data->async->rx.flush_buffer, cpy_len);
+			memcpy(buf, async_rx->flush_buffer, cpy_len);
 			buf += cpy_len;
 			len -= cpy_len;
 
@@ -854,9 +855,9 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 			 * request and indicate rx being disabled.
 			 */
 			if (!len) {
-				data->async->rx.flush_cnt -= cpy_len;
+				async_rx->flush_cnt -= cpy_len;
 				notify_uart_rx_rdy(dev, cpy_len);
-				rx_buf_release(dev, &data->async->rx.buf);
+				rx_buf_release(dev, &async_rx->buf);
 				notify_rx_disable(dev);
 				return 0;
 			}
@@ -868,7 +869,7 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 
-	data->async->rx.enabled = true;
+	async_rx->enabled = true;
 	if (cfg->flags & UARTE_CFG_FLAG_LOW_POWER) {
 		unsigned int key = irq_lock();
 
@@ -885,15 +886,16 @@ static int uarte_nrfx_rx_buf_rsp(const struct device *dev, uint8_t *buf,
 				 size_t len)
 {
 	struct uarte_nrfx_data *data = dev->data;
+	struct uarte_async_rx *async_rx = &data->async->rx;
 	int err;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	unsigned int key = irq_lock();
 
-	if (data->async->rx.buf == NULL) {
+	if (async_rx->buf == NULL) {
 		err = -EACCES;
-	} else if (data->async->rx.next_buf == NULL) {
-		data->async->rx.next_buf = buf;
-		data->async->rx.next_buf_len = len;
+	} else if (async_rx->next_buf == NULL) {
+		async_rx->next_buf = buf;
+		async_rx->next_buf_len = len;
 		nrf_uarte_rx_buffer_set(uarte, buf, len);
 		nrf_uarte_shorts_enable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
 		err = 0;
@@ -925,19 +927,20 @@ static int uarte_nrfx_callback_set(const struct device *dev,
 static int uarte_nrfx_rx_disable(const struct device *dev)
 {
 	struct uarte_nrfx_data *data = dev->data;
+	struct uarte_async_rx *async_rx = &data->async->rx;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
-	if (data->async->rx.buf == NULL) {
+	if (async_rx->buf == NULL) {
 		return -EFAULT;
 	}
-	if (data->async->rx.next_buf != NULL) {
+	if (async_rx->next_buf != NULL) {
 		nrf_uarte_shorts_disable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 	}
 
-	k_timer_stop(&data->async->rx.timer);
-	data->async->rx.enabled = false;
-	data->async->rx.discard_fifo = true;
+	k_timer_stop(&async_rx->timer);
+	async_rx->enabled = false;
+	async_rx->discard_fifo = true;
 
 	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPRX);
 
@@ -961,11 +964,12 @@ static void tx_timeout(struct k_timer *timer)
 static void rx_timeout(struct k_timer *timer)
 {
 	struct uarte_nrfx_data *data = k_timer_user_data_get(timer);
+	struct uarte_async_rx *async_rx = &data->async->rx;
 	const struct device *dev = data->dev;
 	const struct uarte_nrfx_config *cfg = dev->config;
 	uint32_t read;
 
-	if (data->async->rx.is_in_irq) {
+	if (async_rx->is_in_irq) {
 		return;
 	}
 
@@ -978,21 +982,20 @@ static void rx_timeout(struct k_timer *timer)
 	if (HW_RX_COUNTING_ENABLED(cfg)) {
 		read = nrfx_timer_capture(&cfg->timer, 0);
 	} else {
-		read = data->async->rx.cnt.cnt;
+		read = async_rx->cnt.cnt;
 	}
 
 	/* Check if data was received since last function call */
-	if (read != data->async->rx.total_byte_cnt) {
-		data->async->rx.total_byte_cnt = read;
-		data->async->rx.timeout_left = data->async->rx.timeout;
+	if (read != async_rx->total_byte_cnt) {
+		async_rx->total_byte_cnt = read;
+		async_rx->timeout_left = async_rx->timeout;
 	}
 
 	/* Check if there is data that was not sent to user yet
 	 * Note though that 'len' is a count of data bytes received, but not
 	 * necessarily the amount available in the current buffer
 	 */
-	int32_t len = data->async->rx.total_byte_cnt
-		    - data->async->rx.total_user_byte_cnt;
+	int32_t len = async_rx->total_byte_cnt - async_rx->total_user_byte_cnt;
 
 	if (!HW_RX_COUNTING_ENABLED(cfg) &&
 	    (len < 0)) {
@@ -1001,7 +1004,7 @@ static void rx_timeout(struct k_timer *timer)
 		 * At this point, the number of received bytes is at least
 		 * equal to what was reported to the user.
 		 */
-		data->async->rx.cnt.cnt = data->async->rx.total_user_byte_cnt;
+		async_rx->cnt.cnt = async_rx->total_user_byte_cnt;
 		len = 0;
 	}
 
@@ -1013,31 +1016,28 @@ static void rx_timeout(struct k_timer *timer)
 	 */
 	bool clipped = false;
 
-	if (len + data->async->rx.offset > data->async->rx.buf_len) {
-		len = data->async->rx.buf_len - data->async->rx.offset;
+	if (len + async_rx->offset > async_rx->buf_len) {
+		len = async_rx->buf_len - async_rx->offset;
 		clipped = true;
 	}
 
 	if (len > 0) {
-		if (clipped ||
-			(data->async->rx.timeout_left
-				< data->async->rx.timeout_slab)) {
+		if (clipped || (async_rx->timeout_left < async_rx->timeout_slab)) {
 			/* rx_timeout us elapsed since last receiving */
-			if (data->async->rx.buf != NULL) {
+			if (async_rx->buf != NULL) {
 				notify_uart_rx_rdy(dev, len);
-				data->async->rx.offset += len;
-				data->async->rx.total_user_byte_cnt += len;
+				async_rx->offset += len;
+				async_rx->total_user_byte_cnt += len;
 			}
 		} else {
-			data->async->rx.timeout_left -=
-				data->async->rx.timeout_slab;
+			async_rx->timeout_left -= async_rx->timeout_slab;
 		}
 
 		/* If there's nothing left to report until the buffers are
 		 * switched then the timer can be stopped
 		 */
 		if (clipped) {
-			k_timer_stop(&data->async->rx.timer);
+			k_timer_stop(&async_rx->timer);
 		}
 	}
 
@@ -1083,22 +1083,23 @@ static void rxstarted_isr(const struct device *dev)
 static void endrx_isr(const struct device *dev)
 {
 	struct uarte_nrfx_data *data = dev->data;
+	struct uarte_async_rx *async_rx = &data->async->rx;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
-	data->async->rx.is_in_irq = true;
+	async_rx->is_in_irq = true;
 
 	/* ensure rx timer is stopped - it will be restarted in RXSTARTED
 	 * handler if needed
 	 */
-	k_timer_stop(&data->async->rx.timer);
+	k_timer_stop(&async_rx->timer);
 
 	/* this is the amount that the EasyDMA controller has copied into the
 	 * buffer
 	 */
 	const int rx_amount = nrf_uarte_rx_amount_get(uarte) +
-				data->async->rx.flush_cnt;
+				async_rx->flush_cnt;
 
-	data->async->rx.flush_cnt = 0;
+	async_rx->flush_cnt = 0;
 
 	/* The 'rx_offset' can be bigger than 'rx_amount', so it the length
 	 * of data we report back the user may need to be clipped.
@@ -1107,25 +1108,25 @@ static void endrx_isr(const struct device *dev)
 	 * here to handle this buffer. (The next buffer is now already active
 	 * because of the ENDRX_STARTRX shortcut)
 	 */
-	int rx_len = rx_amount - data->async->rx.offset;
+	int rx_len = rx_amount - async_rx->offset;
 
 	if (rx_len < 0) {
 		rx_len = 0;
 	}
 
-	data->async->rx.total_user_byte_cnt += rx_len;
+	async_rx->total_user_byte_cnt += rx_len;
 
 	/* Only send the RX_RDY event if there is something to send */
 	if (rx_len > 0) {
 		notify_uart_rx_rdy(dev, rx_len);
 	}
 
-	if (!data->async->rx.enabled) {
-		data->async->rx.is_in_irq = false;
+	if (!async_rx->enabled) {
+		async_rx->is_in_irq = false;
 		return;
 	}
 
-	rx_buf_release(dev, &data->async->rx.buf);
+	rx_buf_release(dev, &async_rx->buf);
 
 	/* If there is a next buffer, then STARTRX will have already been
 	 * invoked by the short (the next buffer will be filling up already)
@@ -1134,13 +1135,13 @@ static void endrx_isr(const struct device *dev)
 	 */
 	unsigned int key = irq_lock();
 
-	if (data->async->rx.next_buf) {
-		data->async->rx.buf = data->async->rx.next_buf;
-		data->async->rx.buf_len = data->async->rx.next_buf_len;
-		data->async->rx.next_buf = NULL;
-		data->async->rx.next_buf_len = 0;
+	if (async_rx->next_buf) {
+		async_rx->buf = async_rx->next_buf;
+		async_rx->buf_len = async_rx->next_buf_len;
+		async_rx->next_buf = NULL;
+		async_rx->next_buf_len = 0;
 
-		data->async->rx.offset = 0;
+		async_rx->offset = 0;
 		/* Check is based on assumption that ISR handler handles
 		 * ENDRX before RXSTARTED so if short was set on time, RXSTARTED
 		 * event will be set.
@@ -1156,7 +1157,7 @@ static void endrx_isr(const struct device *dev)
 
 	irq_unlock(key);
 
-	data->async->rx.is_in_irq = false;
+	async_rx->is_in_irq = false;
 }
 
 /* Function for flushing internal RX fifo. Function can be called in case
@@ -1253,9 +1254,10 @@ static void rxto_isr(const struct device *dev)
 {
 	const struct uarte_nrfx_config *config = dev->config;
 	struct uarte_nrfx_data *data = dev->data;
+	struct uarte_async_rx *async_rx = &data->async->rx;
 
-	rx_buf_release(dev, &data->async->rx.buf);
-	rx_buf_release(dev, &data->async->rx.next_buf);
+	rx_buf_release(dev, &async_rx->buf);
+	rx_buf_release(dev, &async_rx->next_buf);
 
 	/* This point can be reached in two cases:
 	 * 1. RX is disabled because all provided RX buffers have been filled.
@@ -1265,17 +1267,17 @@ static void rxto_isr(const struct device *dev)
 	 * In the second case, additionally, data from the UARTE internal RX
 	 * FIFO need to be discarded.
 	 */
-	data->async->rx.enabled = false;
-	if (data->async->rx.discard_fifo) {
+	async_rx->enabled = false;
+	if (async_rx->discard_fifo) {
 		uint8_t flushed;
 
-		data->async->rx.discard_fifo = false;
+		async_rx->discard_fifo = false;
 		flushed = rx_flush(dev, NULL, 0);
 		if (HW_RX_COUNTING_ENABLED(config)) {
 			/* It need to be included because TIMER+PPI got RXDRDY events
 			 * and counted those flushed bytes.
 			 */
-			data->async->rx.total_user_byte_cnt += flushed;
+			async_rx->total_user_byte_cnt += flushed;
 		}
 	}
 

From cca947e77d9a3d2744974e3386ee78bca045a1a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 24 Sep 2024 07:30:15 +0200
Subject: [PATCH 0452/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Rework
 driver to support new features
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rework driver to support new way of asynchronous RX handling.
Previously RX was handled in two modes: using RXDRDY interrupt for byte
counting or TIMER + PPI. Both modes had flaws. RXDRDY interrupt mode
could miscalculated amount of received bytes when interrupt was not
handled on time. Data was not lost but was not reported on time that
could lead to issues. PPI+TIMER mode requires additional resources
thus it was not the default mode. Often user was not aware of that
option and was expiriencing driver RX faults.

New RX mode is switching buffers when there is new data (RXDRDY event
not set for given amount of time). It does not require additional
resources to get precise byte counting. Additionally, this is in line
with new UARTE feature (RX frame timeout) which is present in nRF54X
devices. The behavior of the driver is the same for legacy devices
and new one. For legacy devices k_timer periodic interrupts are used
to check if there are any new bytes and it is not needed when RX frame
timeout is present.

Improved RX mode is enabled by default
(CONFIG_UART_NRFX_UARTE_ENHANCED_RX=y) but legacy modes are still
available though not recommended to be used.

Note that new RX mode (CONFIG_UART_NRFX_UARTE_ENHANCED_RX=y) behaves
a bit different because timeout always triggers switch of buffers
which means that there will be no UART_RX_RDY events with non-zero
offset. It also means that every UART_RX_RDY will be followed by
UART_RX_BUF_RELEASED.

After rework, driver is recommended to be used for all platforms as it
performs much better and takes much less code than the second UART shim
available for Nordic devices.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 399a235653518bc9b65c083f2e70cefa943aa4d9)
(cherry picked from commit 22c4f085a7f6414246b214baed44372a67e76fb4)
---
 drivers/serial/Kconfig.nrfx               |  12 +
 drivers/serial/Kconfig.nrfx_uart_instance |   1 +
 drivers/serial/uart_nrfx_uarte.c          | 575 ++++++++++++++--------
 3 files changed, 369 insertions(+), 219 deletions(-)

diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx
index daf185cd7e8..16f667eaa50 100644
--- a/drivers/serial/Kconfig.nrfx
+++ b/drivers/serial/Kconfig.nrfx
@@ -37,6 +37,18 @@ config UART_NRFX_UARTE_LEGACY_SHIM
 	# New shim takes more ROM. Until it is fixed use legacy shim.
 	default y
 
+config UART_NRFX_UARTE_ENHANCED_RX
+	bool "Enhanced RX handling"
+	depends on UART_ASYNC_API
+	depends on UART_NRFX_UARTE_LEGACY_SHIM
+	default y if !(UART_0_NRF_HW_ASYNC || UART_1_NRF_HW_ASYNC || UART_2_NRF_HW_ASYNC)
+	help
+	  Enable RX handling mode which is switching buffers on timeout. This is an
+	  enhancement compared to other two modes (default and hardware assisted).
+	  Default mode could miscount bytes when interrupt was not handled on time
+	  and hardware assisted required TIMER peripheral instance and PPI channel
+	  for accurate byte counting.
+
 config UART_ASYNC_TX_CACHE_SIZE
 	int "TX cache buffer size"
 	depends on UART_ASYNC_API
diff --git a/drivers/serial/Kconfig.nrfx_uart_instance b/drivers/serial/Kconfig.nrfx_uart_instance
index ed4c011da51..4ea1393a2c1 100644
--- a/drivers/serial/Kconfig.nrfx_uart_instance
+++ b/drivers/serial/Kconfig.nrfx_uart_instance
@@ -68,6 +68,7 @@ config UART_$(nrfx_uart_num)_NRF_ASYNC_LOW_POWER
 	depends on HAS_HW_NRF_UARTE$(nrfx_uart_num)
 	depends on UART_ASYNC_API
 	depends on UART_NRFX_UARTE_LEGACY_SHIM
+	default y
 	help
 	  When enabled, UARTE is enabled before each TX or RX usage and disabled
 	  when not used. Disabling UARTE while in idle allows to achieve lowest
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index bb473fa6e65..6708143b704 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -9,6 +9,7 @@
  */
 
 #include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <zephyr/pm/device.h>
 #include <hal/nrf_uarte.h>
 #include <nrfx_timer.h>
@@ -18,11 +19,10 @@
 #include <helpers/nrfx_gppi.h>
 #include <zephyr/linker/devicetree_regions.h>
 #include <zephyr/irq.h>
-
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 
-#include <zephyr/drivers/pinctrl.h>
+#define RX_FLUSH_WORKAROUND 1
 
 #define UARTE(idx)                DT_NODELABEL(uart##idx)
 #define UARTE_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(UARTE(idx), prop)
@@ -63,7 +63,7 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #define IS_HW_ASYNC(unused, prefix, i, _) IS_ENABLED(CONFIG_UART_##prefix##i##_NRF_HW_ASYNC)
 
 #if UARTE_FOR_EACH_INSTANCE(IS_HW_ASYNC, (||), (0))
-#define UARTE_HW_ASYNC 1
+#define UARTE_ANY_HW_ASYNC 1
 #endif
 
 /* Determine if any instance is using enhanced poll_out feature. */
@@ -112,9 +112,13 @@ struct uarte_async_rx {
 	size_t offset;
 	uint8_t *next_buf;
 	size_t next_buf_len;
+#ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
+	uint32_t idle_cnt;
+	k_timeout_t timeout;
+#else
 	uint32_t total_byte_cnt; /* Total number of bytes received */
 	uint32_t total_user_byte_cnt; /* Total number of bytes passed to user */
-	int32_t timeout; /* Timeout set by user */
+	int32_t timeout_us; /* Timeout set by user */
 	int32_t timeout_slab; /* rx_timeout divided by RX_TIMEOUT_DIV */
 	int32_t timeout_left; /* Current time left until user callback */
 	union {
@@ -123,7 +127,7 @@ struct uarte_async_rx {
 	} cnt;
 	/* Flag to ensure that RX timeout won't be executed during ENDRX ISR */
 	volatile bool is_in_irq;
-	uint8_t flush_buffer[UARTE_HW_RX_FIFO_SIZE];
+#endif /* CONFIG_UART_NRFX_UARTE_ENHANCED_RX */
 	uint8_t flush_cnt;
 	volatile bool enabled;
 	volatile bool discard_fifo;
@@ -133,11 +137,9 @@ struct uarte_async_rx {
 struct uarte_async_cb {
 	uart_callback_t user_callback;
 	void *user_data;
-	atomic_t low_power_mask;
 	struct uarte_async_rx rx;
 	struct uarte_async_tx tx;
 };
-
 #endif /* UARTE_ANY_ASYNC */
 
 #ifdef UARTE_INTERRUPT_DRIVEN
@@ -157,7 +159,6 @@ struct uarte_nrfx_int_driven {
 
 /* Device data structure */
 struct uarte_nrfx_data {
-	const struct device *dev;
 #ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
 	struct uart_config uart_config;
 #endif
@@ -168,13 +169,15 @@ struct uarte_nrfx_data {
 	struct uarte_async_cb *async;
 #endif
 	atomic_val_t poll_out_lock;
-	uint8_t *char_out;
-	uint8_t *rx_data;
+	atomic_t flags;
+#ifdef UARTE_ENHANCED_POLL_OUT
 	uint8_t ppi_ch_endtx;
+#endif
 };
 
-#define UARTE_LOW_POWER_TX BIT(0)
-#define UARTE_LOW_POWER_RX BIT(1)
+#define UARTE_FLAG_LOW_POWER_TX BIT(0)
+#define UARTE_FLAG_LOW_POWER_RX BIT(1)
+#define UARTE_FLAG_TRIG_RXTO BIT(2)
 
 /* If enabled then ENDTX is PPI'ed to TXSTOP */
 #define UARTE_CFG_FLAG_PPI_ENDTX   BIT(0)
@@ -217,18 +220,24 @@ struct uarte_nrfx_data {
  */
 struct uarte_nrfx_config {
 	NRF_UARTE_Type *uarte_regs; /* Instance address */
-	uint32_t clock_freq;
 	uint32_t flags;
 	bool disable_rx;
 	const struct pinctrl_dev_config *pcfg;
-#ifndef CONFIG_UART_USE_RUNTIME_CONFIGURE
-	nrf_uarte_baudrate_t baudrate;
+#ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
+	/* None-zero in case of high speed instances. Baudrate is adjusted by that ratio. */
+	uint32_t clock_freq;
+#else
+	nrf_uarte_baudrate_t nrf_baudrate;
 	nrf_uarte_config_t hw_config;
-#endif
+#endif /* CONFIG_UART_USE_RUNTIME_CONFIGURE */
+
 #ifdef UARTE_ANY_ASYNC
 	nrfx_timer_t timer;
 	uint8_t *tx_cache;
+	uint8_t *rx_flush_buf;
 #endif
+	uint8_t *poll_out_byte;
+	uint8_t *poll_in_byte;
 };
 
 static inline NRF_UARTE_Type *get_uarte_instance(const struct device *dev)
@@ -503,28 +512,26 @@ static int wait_tx_ready(const struct device *dev)
 /* Using Macro instead of static inline function to handle NO_OPTIMIZATIONS case
  * where static inline fails on linking.
  */
-#define HW_RX_COUNTING_ENABLED(config) \
-	(IS_ENABLED(UARTE_HW_ASYNC) ? (config->flags & UARTE_CFG_FLAG_HW_BYTE_COUNTING) : false)
+#define HW_RX_COUNTING_ENABLED(config)    \
+	(IS_ENABLED(UARTE_ANY_HW_ASYNC) ? \
+	 (config->flags & UARTE_CFG_FLAG_HW_BYTE_COUNTING) : false)
 
 #endif /* UARTE_ANY_ASYNC */
 
-static int uarte_enable(const struct device *dev, uint32_t mask)
+static void uarte_enable(const struct device *dev, uint32_t act_mask, uint32_t sec_mask)
 {
-#ifdef UARTE_ANY_ASYNC
-	const struct uarte_nrfx_config *config = dev->config;
 	struct uarte_nrfx_data *data = dev->data;
 
-	if (data->async) {
-		bool disabled = data->async->low_power_mask == 0;
-		int ret;
+	if (atomic_or(&data->flags, act_mask) & sec_mask) {
+		/* Second direction already enabled so UARTE is enabled. */
+		return;
+	}
 
-		data->async->low_power_mask |= mask;
-		ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
-		if (ret < 0) {
-			return ret;
-		}
+#ifdef UARTE_ANY_ASYNC
+	if (data->async) {
+		const struct uarte_nrfx_config *config = dev->config;
 
-		if (HW_RX_COUNTING_ENABLED(config) && disabled) {
+		if (HW_RX_COUNTING_ENABLED(config)) {
 			const nrfx_timer_t *timer = &config->timer;
 
 			nrfx_timer_enable(timer);
@@ -536,8 +543,6 @@ static int uarte_enable(const struct device *dev, uint32_t mask)
 	}
 #endif
 	nrf_uarte_enable(get_uarte_instance(dev));
-
-	return 0;
 }
 
 /* At this point we should have irq locked and any previous transfer completed.
@@ -556,12 +561,13 @@ static void tx_start(const struct device *dev, const uint8_t *buf, size_t len)
 		return;
 	}
 #endif
+
 	nrf_uarte_tx_buffer_set(uarte, buf, len);
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDTX);
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_TXSTOPPED);
 
 	if (config->flags & UARTE_CFG_FLAG_LOW_POWER) {
-		(void)uarte_enable(dev, UARTE_LOW_POWER_TX);
+		uarte_enable(dev, UARTE_FLAG_LOW_POWER_TX, UARTE_FLAG_LOW_POWER_RX);
 		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
 	}
 
@@ -569,12 +575,29 @@ static void tx_start(const struct device *dev, const uint8_t *buf, size_t len)
 }
 
 #if defined(UARTE_ANY_ASYNC) || defined(CONFIG_PM_DEVICE)
-static void uart_disable(const struct device *dev)
+/** @brief Disable UARTE peripheral is not used by RX or TX.
+ *
+ * It must be called with interrupts locked so that deciding if no direction is
+ * using the UARTE is atomically performed with UARTE peripheral disabling. Otherwise
+ * it would be possible that after clearing flags we get preempted and UARTE is
+ * enabled from the higher priority context and when we come back UARTE is disabled
+ * here.
+ * @param dev Device.
+ * @param dis_mask Mask of direction (RX or TX) which now longer uses the UARTE instance.
+ * @param sec_mask Mask of second direction which is used to check if it uses the UARTE.
+ */
+static void uarte_disable_locked(const struct device *dev, uint32_t dis_mask, uint32_t sec_mask)
 {
-#ifdef UARTE_ANY_ASYNC
-	const struct uarte_nrfx_config *config = dev->config;
 	struct uarte_nrfx_data *data = dev->data;
 
+	data->flags &= ~dis_mask;
+	if (data->flags & sec_mask) {
+		return;
+	}
+
+#if defined(UARTE_ANY_ASYNC) && !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
+	const struct uarte_nrfx_config *config = dev->config;
+
 	if (data->async && HW_RX_COUNTING_ENABLED(config)) {
 		nrfx_timer_disable(&config->timer);
 		/* Timer/counter value is reset when disabled. */
@@ -589,10 +612,12 @@ static void uart_disable(const struct device *dev)
 
 #ifdef UARTE_ANY_ASYNC
 
-static void timer_handler(nrf_timer_event_t event_type, void *p_context) { }
 static void rx_timeout(struct k_timer *timer);
 static void tx_timeout(struct k_timer *timer);
 
+#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
+static void timer_handler(nrf_timer_event_t event_type, void *p_context) { }
+
 static int uarte_nrfx_rx_counting_init(const struct device *dev)
 {
 	struct uarte_nrfx_data *data = dev->data;
@@ -615,7 +640,6 @@ static int uarte_nrfx_rx_counting_init(const struct device *dev)
 			LOG_ERR("Timer already initialized");
 			return -EINVAL;
 		} else {
-			nrfx_timer_enable(&cfg->timer);
 			nrfx_timer_clear(&cfg->timer);
 		}
 
@@ -634,30 +658,34 @@ static int uarte_nrfx_rx_counting_init(const struct device *dev)
 
 	return 0;
 }
+#endif /* !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX) */
 
 static int uarte_nrfx_init(const struct device *dev)
 {
 	struct uarte_nrfx_data *data = dev->data;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-
+	static const uint32_t rx_int_mask =
+		NRF_UARTE_INT_ENDRX_MASK |
+		NRF_UARTE_INT_RXSTARTED_MASK |
+		NRF_UARTE_INT_ERROR_MASK |
+		NRF_UARTE_INT_RXTO_MASK |
+		(IS_ENABLED(CONFIG_UART_NRFX_UARTE_ENHANCED_RX) ? NRF_UARTE_INT_RXDRDY_MASK : 0);
+
+#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
 	int ret = uarte_nrfx_rx_counting_init(dev);
 
 	if (ret != 0) {
 		return ret;
 	}
+#endif
 
-	data->async->low_power_mask = UARTE_LOW_POWER_TX;
-	nrf_uarte_int_enable(uarte,
-			     NRF_UARTE_INT_ENDRX_MASK |
-			     NRF_UARTE_INT_RXSTARTED_MASK |
-			     NRF_UARTE_INT_ERROR_MASK |
-			     NRF_UARTE_INT_RXTO_MASK);
+	nrf_uarte_int_enable(uarte, rx_int_mask);
 	nrf_uarte_enable(uarte);
 
 	k_timer_init(&data->async->rx.timer, rx_timeout, NULL);
-	k_timer_user_data_set(&data->async->rx.timer, data);
+	k_timer_user_data_set(&data->async->rx.timer, (void *)dev);
 	k_timer_init(&data->async->tx.timer, tx_timeout, NULL);
-	k_timer_user_data_set(&data->async->tx.timer, data);
+	k_timer_user_data_set(&data->async->tx.timer, (void *)dev);
 
 	return 0;
 }
@@ -733,7 +761,7 @@ static int uarte_nrfx_tx(const struct device *dev, const uint8_t *buf,
 	data->async->tx.buf = buf;
 	nrf_uarte_int_enable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
 
-	if (nrfx_is_in_ram(buf)) {
+	if (nrf_dma_accessible_check(uarte, buf)) {
 		data->async->tx.xfer_buf = buf;
 		data->async->tx.xfer_len = len;
 	} else {
@@ -789,17 +817,14 @@ static void notify_uart_rx_rdy(const struct device *dev, size_t len)
 	user_callback(dev, &evt);
 }
 
-static void rx_buf_release(const struct device *dev, uint8_t **buf)
+static void rx_buf_release(const struct device *dev, uint8_t *buf)
 {
-	if (*buf) {
-		struct uart_event evt = {
-			.type = UART_RX_BUF_RELEASED,
-			.data.rx_buf.buf = *buf,
-		};
+	struct uart_event evt = {
+		.type = UART_RX_BUF_RELEASED,
+		.data.rx_buf.buf = buf,
+	};
 
-		user_callback(dev, &evt);
-		*buf = NULL;
-	}
+	user_callback(dev, &evt);
 }
 
 static void notify_rx_disable(const struct device *dev)
@@ -819,7 +844,6 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	struct uarte_async_rx *async_rx = &data->async->rx;
 	const struct uarte_nrfx_config *cfg = dev->config;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-	int ret = 0;
 
 	if (cfg->disable_rx) {
 		__ASSERT(false, "TX only UARTE instance");
@@ -834,8 +858,14 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 		return -EBUSY;
 	}
 
-	async_rx->timeout = timeout;
+#ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
+	async_rx->timeout = (timeout == SYS_FOREVER_US) ?
+		K_NO_WAIT : K_USEC(timeout / RX_TIMEOUT_DIV);
+	async_rx->idle_cnt = 0;
+#else
+	async_rx->timeout_us = timeout;
 	async_rx->timeout_slab = timeout / RX_TIMEOUT_DIV;
+#endif
 
 	async_rx->buf = buf;
 	async_rx->buf_len = len;
@@ -847,19 +877,29 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 		if (async_rx->flush_cnt) {
 			int cpy_len = MIN(len, async_rx->flush_cnt);
 
-			memcpy(buf, async_rx->flush_buffer, cpy_len);
+			memcpy(buf, cfg->rx_flush_buf, cpy_len);
+
 			buf += cpy_len;
 			len -= cpy_len;
 
-			/* If flush content filled whole new buffer complete the
-			 * request and indicate rx being disabled.
+			/* If flush content filled whole new buffer trigger interrupt
+			 * to notify about received data and disabled RX from there.
 			 */
 			if (!len) {
 				async_rx->flush_cnt -= cpy_len;
-				notify_uart_rx_rdy(dev, cpy_len);
-				rx_buf_release(dev, &async_rx->buf);
-				notify_rx_disable(dev);
+				memmove(cfg->rx_flush_buf, &cfg->rx_flush_buf[cpy_len],
+						async_rx->flush_cnt);
+				atomic_or(&data->flags, UARTE_FLAG_TRIG_RXTO);
+				NRFX_IRQ_PENDING_SET(nrfx_get_irq_number(uarte));
 				return 0;
+			} else {
+#ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
+				if (!K_TIMEOUT_EQ(async_rx->timeout, K_NO_WAIT)) {
+					nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXDRDY);
+					k_timer_start(&async_rx->timer, async_rx->timeout,
+							K_NO_WAIT);
+				}
+#endif
 			}
 		}
 	}
@@ -873,7 +913,7 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	if (cfg->flags & UARTE_CFG_FLAG_LOW_POWER) {
 		unsigned int key = irq_lock();
 
-		ret = uarte_enable(dev, UARTE_LOW_POWER_RX);
+		uarte_enable(dev, UARTE_FLAG_LOW_POWER_RX, UARTE_FLAG_LOW_POWER_TX);
 		irq_unlock(key);
 	}
 
@@ -897,7 +937,17 @@ static int uarte_nrfx_rx_buf_rsp(const struct device *dev, uint8_t *buf,
 		async_rx->next_buf = buf;
 		async_rx->next_buf_len = len;
 		nrf_uarte_rx_buffer_set(uarte, buf, len);
-		nrf_uarte_shorts_enable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
+		/* If buffer is shorter than RX FIFO then there is a risk that due
+		 * to interrupt handling latency ENDRX event is not handled on time
+		 * and due to ENDRX_STARTRX short data will start to be overwritten.
+		 * In that case short is not enabled and ENDRX event handler will
+		 * manually start RX for that buffer. Thanks to RX FIFO there is
+		 * 5 byte time for doing that. If interrupt latency is higher and
+		 * there is no HWFC in both cases data will be lost or corrupted.
+		 */
+		if (len >= UARTE_HW_RX_FIFO_SIZE) {
+			nrf_uarte_shorts_enable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
+		}
 		err = 0;
 	} else {
 		err = -EBUSY;
@@ -949,8 +999,8 @@ static int uarte_nrfx_rx_disable(const struct device *dev)
 
 static void tx_timeout(struct k_timer *timer)
 {
-	struct uarte_nrfx_data *data = k_timer_user_data_get(timer);
-	(void) uarte_nrfx_tx_abort(data->dev);
+	const struct device *dev = k_timer_user_data_get(timer);
+	(void) uarte_nrfx_tx_abort(dev);
 }
 
 /**
@@ -963,10 +1013,38 @@ static void tx_timeout(struct k_timer *timer)
  */
 static void rx_timeout(struct k_timer *timer)
 {
-	struct uarte_nrfx_data *data = k_timer_user_data_get(timer);
+	const struct device *dev = k_timer_user_data_get(timer);
+
+#if  CONFIG_UART_NRFX_UARTE_ENHANCED_RX
+	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
+
+	struct uarte_nrfx_data *data = dev->data;
 	struct uarte_async_rx *async_rx = &data->async->rx;
-	const struct device *dev = data->dev;
+
+	if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXDRDY)) {
+		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXDRDY);
+		async_rx->idle_cnt = 0;
+	} else {
+		async_rx->idle_cnt++;
+		/* We compare against RX_TIMEOUT_DIV - 1 to get rather earlier timeout
+		 * than late. idle_cnt is reset when last RX activity (RXDRDY event) is
+		 * detected. It may happen that it happens when RX is inactive for whole
+		 * RX timeout period (and it is the case when transmission is short compared
+		 * to the timeout, for example timeout is 50 ms and transmission of few bytes
+		 * takes less than 1ms). In that case if we compare against RX_TIMEOUT_DIV
+		 * then RX notification would come after (RX_TIMEOUT_DIV + 1) * timeout.
+		 */
+		if (async_rx->idle_cnt == (RX_TIMEOUT_DIV - 1)) {
+			nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPRX);
+			return;
+		}
+	}
+
+	k_timer_start(&async_rx->timer, async_rx->timeout, K_NO_WAIT);
+#else /* CONFIG_UART_NRFX_UARTE_ENHANCED_RX */
 	const struct uarte_nrfx_config *cfg = dev->config;
+	struct uarte_nrfx_data *data = dev->data;
+	struct uarte_async_rx *async_rx = &data->async->rx;
 	uint32_t read;
 
 	if (async_rx->is_in_irq) {
@@ -988,7 +1066,7 @@ static void rx_timeout(struct k_timer *timer)
 	/* Check if data was received since last function call */
 	if (read != async_rx->total_byte_cnt) {
 		async_rx->total_byte_cnt = read;
-		async_rx->timeout_left = async_rx->timeout;
+		async_rx->timeout_left = async_rx->timeout_us;
 	}
 
 	/* Check if there is data that was not sent to user yet
@@ -1043,7 +1121,7 @@ static void rx_timeout(struct k_timer *timer)
 
 	nrf_uarte_int_enable(get_uarte_instance(dev),
 			     NRF_UARTE_INT_ENDRX_MASK);
-
+#endif /* CONFIG_UART_NRFX_UARTE_ENHANCED_RX */
 }
 
 #define UARTE_ERROR_FROM_MASK(mask)					\
@@ -1056,28 +1134,44 @@ static void rx_timeout(struct k_timer *timer)
 static void error_isr(const struct device *dev)
 {
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-	uint32_t err = nrf_uarte_errorsrc_get_and_clear(uarte);
+	uint32_t err = nrf_uarte_errorsrc_get(uarte);
 	struct uart_event evt = {
 		.type = UART_RX_STOPPED,
 		.data.rx_stop.reason = UARTE_ERROR_FROM_MASK(err),
 	};
+
+	/* For VPR cores read and write may be reordered - barrier needed. */
+	nrf_barrier_r();
+	nrf_uarte_errorsrc_clear(uarte, err);
+
 	user_callback(dev, &evt);
 	(void) uarte_nrfx_rx_disable(dev);
 }
 
 static void rxstarted_isr(const struct device *dev)
 {
-	struct uarte_nrfx_data *data = dev->data;
 	struct uart_event evt = {
 		.type = UART_RX_BUF_REQUEST,
 	};
-	user_callback(dev, &evt);
-	if (data->async->rx.timeout != SYS_FOREVER_US) {
-		data->async->rx.timeout_left = data->async->rx.timeout;
-		k_timer_start(&data->async->rx.timer,
-			      K_USEC(data->async->rx.timeout_slab),
-			      K_USEC(data->async->rx.timeout_slab));
+
+	struct uarte_nrfx_data *data = dev->data;
+	struct uarte_async_rx *async_rx = &data->async->rx;
+
+#ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
+	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
+
+	if (!K_TIMEOUT_EQ(async_rx->timeout, K_NO_WAIT)) {
+		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_RXDRDY_MASK);
+	}
+#else
+	if (async_rx->timeout_us != SYS_FOREVER_US) {
+		k_timeout_t timeout = K_USEC(async_rx->timeout_slab);
+
+		async_rx->timeout_left = async_rx->timeout_us;
+		k_timer_start(&async_rx->timer, timeout, timeout);
 	}
+#endif /* CONFIG_UART_NRFX_UARTE_ENHANCED_RX */
+	user_callback(dev, &evt);
 }
 
 static void endrx_isr(const struct device *dev)
@@ -1086,7 +1180,9 @@ static void endrx_isr(const struct device *dev)
 	struct uarte_async_rx *async_rx = &data->async->rx;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
+#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
 	async_rx->is_in_irq = true;
+#endif
 
 	/* ensure rx timer is stopped - it will be restarted in RXSTARTED
 	 * handler if needed
@@ -1096,8 +1192,7 @@ static void endrx_isr(const struct device *dev)
 	/* this is the amount that the EasyDMA controller has copied into the
 	 * buffer
 	 */
-	const int rx_amount = nrf_uarte_rx_amount_get(uarte) +
-				async_rx->flush_cnt;
+	const int rx_amount = nrf_uarte_rx_amount_get(uarte) + async_rx->flush_cnt;
 
 	async_rx->flush_cnt = 0;
 
@@ -1114,50 +1209,50 @@ static void endrx_isr(const struct device *dev)
 		rx_len = 0;
 	}
 
+#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
 	async_rx->total_user_byte_cnt += rx_len;
+#endif
 
 	/* Only send the RX_RDY event if there is something to send */
 	if (rx_len > 0) {
 		notify_uart_rx_rdy(dev, rx_len);
 	}
 
-	if (!async_rx->enabled) {
-		async_rx->is_in_irq = false;
-		return;
-	}
-
-	rx_buf_release(dev, &async_rx->buf);
-
-	/* If there is a next buffer, then STARTRX will have already been
-	 * invoked by the short (the next buffer will be filling up already)
-	 * and here we just do the swap of which buffer the driver is following,
-	 * the next rx_timeout() will update the rx_offset.
-	 */
-	unsigned int key = irq_lock();
-
-	if (async_rx->next_buf) {
-		async_rx->buf = async_rx->next_buf;
-		async_rx->buf_len = async_rx->next_buf_len;
-		async_rx->next_buf = NULL;
-		async_rx->next_buf_len = 0;
+	rx_buf_release(dev, async_rx->buf);
+	async_rx->buf = async_rx->next_buf;
+	async_rx->buf_len = async_rx->next_buf_len;
+	async_rx->next_buf = NULL;
+	async_rx->next_buf_len = 0;
+	async_rx->offset = 0;
 
-		async_rx->offset = 0;
-		/* Check is based on assumption that ISR handler handles
-		 * ENDRX before RXSTARTED so if short was set on time, RXSTARTED
-		 * event will be set.
+	if (async_rx->enabled) {
+		/* If there is a next buffer, then STARTRX will have already been
+		 * invoked by the short (the next buffer will be filling up already)
+		 * and here we just do the swap of which buffer the driver is following,
+		 * the next rx_timeout() will update the rx_offset.
 		 */
-		if (!nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXSTARTED)) {
-			nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTRX);
+		unsigned int key = irq_lock();
+
+		if (async_rx->buf) {
+			/* Check is based on assumption that ISR handler handles
+			 * ENDRX before RXSTARTED so if short was set on time, RXSTARTED
+			 * event will be set.
+			 */
+			if (!nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXSTARTED)) {
+				nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTRX);
+			}
+			/* Remove the short until the subsequent next buffer is setup */
+			nrf_uarte_shorts_disable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
+		} else {
+			nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPRX);
 		}
-		/* Remove the short until the subsequent next buffer is setup */
-		nrf_uarte_shorts_disable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
-	} else {
-		nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPRX);
-	}
 
-	irq_unlock(key);
+		irq_unlock(key);
+	}
 
+#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
 	async_rx->is_in_irq = false;
+#endif
 }
 
 /* Function for flushing internal RX fifo. Function can be called in case
@@ -1183,26 +1278,23 @@ static void endrx_isr(const struct device *dev)
  *
  * @return number of bytes flushed from the fifo.
  */
-static uint8_t rx_flush(const struct device *dev, uint8_t *buf, uint32_t len)
+
+static uint8_t rx_flush(const struct device *dev, uint8_t *buf)
 {
 	/* Flushing RX fifo requires buffer bigger than 4 bytes to empty fifo*/
-	static const uint8_t dirty;
+	static const uint8_t dirty = 0xAA;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-	uint32_t prev_rx_amount = nrf_uarte_rx_amount_get(uarte);
-	uint8_t tmp_buf[UARTE_HW_RX_FIFO_SIZE];
-	uint8_t *flush_buf = buf ? buf : tmp_buf;
-	size_t flush_len = buf ? len : sizeof(tmp_buf);
-
-	if (buf) {
-		flush_buf = buf;
-		flush_len = len;
+	uint32_t prev_rx_amount;
+	uint32_t rx_amount;
+
+	if (IS_ENABLED(RX_FLUSH_WORKAROUND)) {
+		memset(buf, dirty, UARTE_HW_RX_FIFO_SIZE);
+		prev_rx_amount = nrf_uarte_rx_amount_get(uarte);
 	} else {
-		flush_buf = tmp_buf;
-		flush_len = sizeof(tmp_buf);
+		prev_rx_amount = 0;
 	}
 
-	memset(flush_buf, dirty, flush_len);
-	nrf_uarte_rx_buffer_set(uarte, flush_buf, flush_len);
+	nrf_uarte_rx_buffer_set(uarte, buf, UARTE_HW_RX_FIFO_SIZE);
 	/* Final part of handling RXTO event is in ENDRX interrupt
 	 * handler. ENDRX is generated as a result of FLUSHRX task.
 	 */
@@ -1212,39 +1304,28 @@ static uint8_t rx_flush(const struct device *dev, uint8_t *buf, uint32_t len)
 		/* empty */
 	}
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
+	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 
-	uint32_t rx_amount = nrf_uarte_rx_amount_get(uarte);
+	rx_amount = nrf_uarte_rx_amount_get(uarte);
+	if (!buf || !IS_ENABLED(RX_FLUSH_WORKAROUND)) {
+		return rx_amount;
+	}
 
 	if (rx_amount != prev_rx_amount) {
 		return rx_amount;
 	}
 
-	for (int i = 0; i < flush_len; i++) {
-		if (flush_buf[i] != dirty) {
-			return rx_amount;
-		}
+	if (rx_amount > UARTE_HW_RX_FIFO_SIZE) {
+		return 0;
 	}
 
-	return 0;
-}
-
-static void async_uart_release(const struct device *dev, uint32_t dir_mask)
-{
-	struct uarte_nrfx_data *data = dev->data;
-	unsigned int key = irq_lock();
-
-	data->async->low_power_mask &= ~dir_mask;
-	if (!data->async->low_power_mask) {
-		if (dir_mask == UARTE_LOW_POWER_RX) {
-			data->async->rx.flush_cnt =
-				rx_flush(dev, data->async->rx.flush_buffer,
-					 sizeof(data->async->rx.flush_buffer));
+	for (int i = 0; i < rx_amount; i++) {
+		if (buf[i] != dirty) {
+			return rx_amount;
 		}
-
-		uart_disable(dev);
 	}
 
-	irq_unlock(key);
+	return 0;
 }
 
 /* This handler is called when the receiver is stopped. If rx was aborted
@@ -1256,8 +1337,10 @@ static void rxto_isr(const struct device *dev)
 	struct uarte_nrfx_data *data = dev->data;
 	struct uarte_async_rx *async_rx = &data->async->rx;
 
-	rx_buf_release(dev, &async_rx->buf);
-	rx_buf_release(dev, &async_rx->next_buf);
+	if (async_rx->buf) {
+		rx_buf_release(dev, async_rx->buf);
+		async_rx->buf = NULL;
+	}
 
 	/* This point can be reached in two cases:
 	 * 1. RX is disabled because all provided RX buffers have been filled.
@@ -1269,20 +1352,33 @@ static void rxto_isr(const struct device *dev)
 	 */
 	async_rx->enabled = false;
 	if (async_rx->discard_fifo) {
-		uint8_t flushed;
-
 		async_rx->discard_fifo = false;
-		flushed = rx_flush(dev, NULL, 0);
+#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
 		if (HW_RX_COUNTING_ENABLED(config)) {
+			uint8_t buf[UARTE_HW_RX_FIFO_SIZE];
+
 			/* It need to be included because TIMER+PPI got RXDRDY events
 			 * and counted those flushed bytes.
 			 */
-			async_rx->total_user_byte_cnt += flushed;
+			async_rx->total_user_byte_cnt += rx_flush(dev, buf);
+			(void)buf;
 		}
+#endif
+	} else {
+		async_rx->flush_cnt = rx_flush(dev, config->rx_flush_buf);
 	}
 
+#ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
+	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
+
+	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXDRDY);
+#endif
+
 	if (config->flags & UARTE_CFG_FLAG_LOW_POWER) {
-		async_uart_release(dev, UARTE_LOW_POWER_RX);
+		uint32_t key = irq_lock();
+
+		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_RX, UARTE_FLAG_LOW_POWER_TX);
+		irq_unlock(key);
 	}
 
 	notify_rx_disable(dev);
@@ -1297,7 +1393,9 @@ static void txstopped_isr(const struct device *dev)
 
 	if (config->flags & UARTE_CFG_FLAG_LOW_POWER) {
 		nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
-		async_uart_release(dev, UARTE_LOW_POWER_TX);
+		key = irq_lock();
+		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_TX, UARTE_FLAG_LOW_POWER_RX);
+		irq_unlock(key);
 
 		if (!data->async->tx.len) {
 			return;
@@ -1339,10 +1437,10 @@ static void txstopped_isr(const struct device *dev)
 				return;
 			}
 
-			/* Amount is already included in tx_cache_offset. */
+			/* Amount is already included in cache_offset. */
 			amount = data->async->tx.cache_offset;
 		} else {
-			/* TX was aborted, include tx_cache_offset in amount. */
+			/* TX was aborted, include cache_offset in amount. */
 			amount += data->async->tx.cache_offset;
 		}
 	}
@@ -1366,28 +1464,50 @@ static void txstopped_isr(const struct device *dev)
 	user_callback(dev, &evt);
 }
 
+static void rxdrdy_isr(const struct device *dev)
+{
+#if defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
+	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
+
+	data->async->rx.idle_cnt = 0;
+	k_timer_start(&data->async->rx.timer, data->async->rx.timeout, K_NO_WAIT);
+	nrf_uarte_int_disable(uarte, NRF_UARTE_INT_RXDRDY_MASK);
+#else
+	data->async->rx.cnt.cnt++;
+#endif
+}
+
+static bool event_check_clear(NRF_UARTE_Type *uarte, nrf_uarte_event_t event,
+				uint32_t int_mask, uint32_t int_en_mask)
+{
+	if (nrf_uarte_event_check(uarte, event) && (int_mask & int_en_mask)) {
+		nrf_uarte_event_clear(uarte, event);
+		return true;
+	}
+
+	return false;
+}
+
 static void uarte_nrfx_isr_async(const void *arg)
 {
 	const struct device *dev = arg;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	const struct uarte_nrfx_config *config = dev->config;
+	struct uarte_nrfx_data *data = dev->data;
+	struct uarte_async_rx *async_rx = &data->async->rx;
+	uint32_t imask = nrf_uarte_int_enable_check(uarte, UINT32_MAX);
 
 	if (!HW_RX_COUNTING_ENABLED(config)
-	    && nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXDRDY)) {
-		struct uarte_nrfx_data *data = dev->data;
+	    && event_check_clear(uarte, NRF_UARTE_EVENT_RXDRDY, NRF_UARTE_INT_RXDRDY_MASK, imask)) {
+		rxdrdy_isr(dev);
 
-		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXDRDY);
-		data->async->rx.cnt.cnt++;
-		return;
 	}
 
-	if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ERROR)) {
-		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ERROR);
+	if (event_check_clear(uarte, NRF_UARTE_EVENT_ERROR, NRF_UARTE_INT_ERROR_MASK, imask)) {
 		error_isr(dev);
 	}
 
-	if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ENDRX)
-	    && nrf_uarte_int_enable_check(uarte, NRF_UARTE_INT_ENDRX_MASK)) {
+	if (event_check_clear(uarte, NRF_UARTE_EVENT_ENDRX, NRF_UARTE_INT_ENDRX_MASK, imask)) {
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
 		endrx_isr(dev);
 	}
@@ -1399,7 +1519,8 @@ static void uarte_nrfx_isr_async(const void *arg)
 	 * UARTE interrupt got preempted. Events are not cleared
 	 * and isr will be called again. ENDRX will be handled first.
 	 */
-	if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXSTARTED) &&
+	if ((imask & NRF_UARTE_INT_RXSTARTED_MASK) &&
+	    nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXSTARTED) &&
 	    !nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ENDRX)) {
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 		rxstarted_isr(dev);
@@ -1411,22 +1532,31 @@ static void uarte_nrfx_isr_async(const void *arg)
 	 * UARTE interrupt got preempted. Events are not cleared
 	 * and isr will be called again. ENDRX will be handled first.
 	 */
-	if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXTO) &&
+	if ((imask & NRF_UARTE_INT_RXTO_MASK) &&
+	    nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXTO) &&
 	    !nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ENDRX)) {
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXTO);
 		rxto_isr(dev);
 	}
 
 	if (!IS_ENABLED(UARTE_HAS_ENDTX_STOPTX_SHORT) &&
-	    (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ENDTX) &&
-	     nrf_uarte_int_enable_check(uarte, NRF_UARTE_INT_ENDTX_MASK))) {
+	    (imask & NRF_UARTE_INT_ENDTX_MASK) &&
+	    nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ENDTX)) {
 		endtx_isr(dev);
 	}
 
-	if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_TXSTOPPED) &&
-	    nrf_uarte_int_enable_check(uarte, NRF_UARTE_INT_TXSTOPPED_MASK)) {
+	if ((imask & NRF_UARTE_INT_TXSTOPPED_MASK) &&
+	    nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_TXSTOPPED)) {
 		txstopped_isr(dev);
 	}
+
+	if (atomic_and(&data->flags, ~UARTE_FLAG_TRIG_RXTO) & UARTE_FLAG_TRIG_RXTO) {
+		notify_uart_rx_rdy(dev, async_rx->buf_len);
+		rx_buf_release(dev, async_rx->buf);
+		async_rx->buf_len = 0;
+		async_rx->buf = NULL;
+		notify_rx_disable(dev);
+	}
 }
 
 #endif /* UARTE_ANY_ASYNC */
@@ -1441,11 +1571,12 @@ static void uarte_nrfx_isr_async(const void *arg)
  */
 static int uarte_nrfx_poll_in(const struct device *dev, unsigned char *c)
 {
-
-	const struct uarte_nrfx_data *data = dev->data;
+	const struct uarte_nrfx_config *config = dev->config;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
 #ifdef UARTE_ANY_ASYNC
+	struct uarte_nrfx_data *data = dev->data;
+
 	if (data->async) {
 		return -ENOTSUP;
 	}
@@ -1455,7 +1586,7 @@ static int uarte_nrfx_poll_in(const struct device *dev, unsigned char *c)
 		return -1;
 	}
 
-	*c = *data->rx_data;
+	*c = *config->poll_in_byte;
 
 	/* clear the interrupt */
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
@@ -1472,7 +1603,7 @@ static int uarte_nrfx_poll_in(const struct device *dev, unsigned char *c)
  */
 static void uarte_nrfx_poll_out(const struct device *dev, unsigned char c)
 {
-	struct uarte_nrfx_data *data = dev->data;
+	const struct uarte_nrfx_config *config = dev->config;
 	bool isr_mode = k_is_in_isr() || k_is_pre_kernel();
 	unsigned int key;
 
@@ -1481,11 +1612,12 @@ static void uarte_nrfx_poll_out(const struct device *dev, unsigned char c)
 			key = irq_lock();
 			if (is_tx_ready(dev)) {
 #if UARTE_ANY_ASYNC
+				NRF_UARTE_Type *uarte = get_uarte_instance(dev);
+				struct uarte_nrfx_data *data = dev->data;
+
 				if (data->async && data->async->tx.len &&
 					data->async->tx.amount < 0) {
-					data->async->tx.amount =
-						nrf_uarte_tx_amount_get(
-						      get_uarte_instance(dev));
+					data->async->tx.amount = nrf_uarte_tx_amount_get(uarte);
 				}
 #endif
 				break;
@@ -1498,8 +1630,8 @@ static void uarte_nrfx_poll_out(const struct device *dev, unsigned char c)
 		key = wait_tx_ready(dev);
 	}
 
-	*data->char_out = c;
-	tx_start(dev, data->char_out, 1);
+	*config->poll_out_byte = c;
+	tx_start(dev, config->poll_out_byte, 1);
 
 	irq_unlock(key);
 }
@@ -1542,14 +1674,14 @@ static int uarte_nrfx_fifo_read(const struct device *dev,
 {
 	int num_rx = 0;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-	const struct uarte_nrfx_data *data = dev->data;
+	const struct uarte_nrfx_config *config = dev->config;
 
 	if (size > 0 && nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ENDRX)) {
 		/* Clear the interrupt */
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
 
 		/* Receive a character */
-		rx_data[num_rx++] = *data->rx_data;
+		rx_data[num_rx++] = *config->poll_in_byte;
 
 		nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTRX);
 	}
@@ -1732,12 +1864,14 @@ static int uarte_instance_init(const struct device *dev,
 {
 	int err;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-	struct uarte_nrfx_data *data = dev->data;
 	const struct uarte_nrfx_config *cfg = dev->config;
 
-	nrf_uarte_disable(uarte);
+#if	defined(CONFIG_UART_USE_RUNTIME_CONFIGURE) || defined(UARTE_ENHANCED_POLL_OUT) || \
+	defined(UARTE_ANY_ASYNC)
+	struct uarte_nrfx_data *data = dev->data;
+#endif
 
-	data->dev = dev;
+	nrf_uarte_disable(uarte);
 
 #ifdef CONFIG_ARCH_POSIX
 	/* For simulation the DT provided peripheral address needs to be corrected */
@@ -1755,7 +1889,7 @@ static int uarte_instance_init(const struct device *dev,
 		return err;
 	}
 #else
-	nrf_uarte_baudrate_set(uarte, cfg->baudrate);
+	nrf_uarte_baudrate_set(uarte, cfg->nrf_baudrate);
 	nrf_uarte_configure(uarte, &cfg->hw_config);
 #endif
 
@@ -1769,7 +1903,6 @@ static int uarte_instance_init(const struct device *dev,
 		}
 	}
 #endif
-
 #ifdef UARTE_ANY_ASYNC
 	if (data->async) {
 		err = uarte_nrfx_init(dev);
@@ -1785,7 +1918,7 @@ static int uarte_instance_init(const struct device *dev,
 		if (!cfg->disable_rx) {
 			nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
 
-			nrf_uarte_rx_buffer_set(uarte, data->rx_data, 1);
+			nrf_uarte_rx_buffer_set(uarte, cfg->poll_in_byte, 1);
 			nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTRX);
 		}
 	}
@@ -1794,19 +1927,11 @@ static int uarte_instance_init(const struct device *dev,
 		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_ENDTX_MASK);
 	}
 
-	if (cfg->flags & UARTE_CFG_FLAG_LOW_POWER) {
-		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
-	}
-
 	/* Set TXSTOPPED event by requesting fake (zero-length) transfer.
 	 * Pointer to RAM variable (data->tx_buffer) is set because otherwise
 	 * such operation may result in HardFault or RAM corruption.
 	 */
-	nrf_uarte_tx_buffer_set(uarte, data->char_out, 0);
-	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTTX);
-
-	/* switch off transmitter to save an energy */
-	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPTX);
+	tx_start(dev, cfg->poll_out_byte, 0);
 
 	return 0;
 }
@@ -1910,6 +2035,14 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 			 */
 			__ASSERT_NO_MSG(!data->async->rx.enabled);
 			__ASSERT_NO_MSG(!data->async->tx.len);
+#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
+			if (data->async && HW_RX_COUNTING_ENABLED(cfg)) {
+				nrfx_timer_disable(&cfg->timer);
+				/* Timer/counter value is reset when disabled. */
+				data->async->rx.total_byte_cnt = 0;
+				data->async->rx.total_user_byte_cnt = 0;
+			}
+#endif
 
 		}
 #endif
@@ -1937,7 +2070,7 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		}
 
 		wait_for_tx_stopped(dev);
-		uart_disable(dev);
+		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_TX | UARTE_FLAG_LOW_POWER_RX, 0);
 
 		ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_SLEEP);
 		if (ret < 0) {
@@ -1963,11 +2096,12 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 /* Low power mode is used when disable_rx is not defined or in async mode if
  * kconfig option is enabled.
  */
-#define USE_LOW_POWER(idx) \
-	((!UARTE_PROP(idx, disable_rx) &&				       \
-	COND_CODE_1(CONFIG_UART_##idx##_ASYNC,				       \
-		(!IS_ENABLED(CONFIG_UART_##idx##_NRF_ASYNC_LOW_POWER)),	       \
-		(1))) ? 0 : UARTE_CFG_FLAG_LOW_POWER)
+#define USE_LOW_POWER(idx)						       \
+	COND_CODE_1(CONFIG_PM_DEVICE, (0),				       \
+		(((!UARTE_PROP(idx, disable_rx) &&			       \
+		COND_CODE_1(CONFIG_UART_##idx##_ASYNC,			       \
+			(!IS_ENABLED(CONFIG_UART_##idx##_NRF_ASYNC_LOW_POWER)),\
+			(1))) ? 0 : UARTE_CFG_FLAG_LOW_POWER)))
 
 #define UARTE_DISABLE_RX_INIT(node_id) \
 	.disable_rx = DT_PROP(node_id, disable_rx)
@@ -1978,12 +2112,13 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 	COND_CODE_1(DT_CLOCKS_HAS_IDX(UARTE(idx), 0),				\
 		   ((UARTE_GET_FREQ(idx) / NRF_UARTE_BASE_FREQUENCY_16MHZ)), (1))
 
-/* When calculating baudrate we need to take into account that some instances
- * must have baudrate adjusted to the ratio between UARTE clocking frequency and 16 MHz.
+/* When calculating baudrate we need to take into account that high speed instances
+ * must have baudrate adjust to the ratio between UARTE clocking frequency and 16 MHz.
  */
 #define UARTE_GET_BAUDRATE(idx) \
 	(NRF_BAUDRATE(UARTE_PROP(idx, current_speed)) / UARTE_GET_BAUDRATE_DIV(idx))
 
+
 /* Macro for setting nRF specific configuration structures. */
 #define UARTE_NRF_CONFIG(idx) {							\
 		.hwfc = (UARTE_PROP(idx, hw_flow_control) ==			\
@@ -2017,12 +2152,12 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		static uint8_t						       \
 			uarte##idx##_tx_cache[CONFIG_UART_ASYNC_TX_CACHE_SIZE] \
 			UARTE_MEMORY_SECTION(idx);			       \
+		static uint8_t uarte##idx##_flush_buf[UARTE_HW_RX_FIFO_SIZE]   \
+			UARTE_MEMORY_SECTION(idx);			       \
 		struct uarte_async_cb uarte##idx##_async;))		       \
-	static uint8_t uarte##idx##_char_out UARTE_MEMORY_SECTION(idx);	       \
-	static uint8_t uarte##idx##_rx_data UARTE_MEMORY_SECTION(idx);	       \
+	static uint8_t uarte##idx##_poll_out_byte UARTE_MEMORY_SECTION(idx);   \
+	static uint8_t uarte##idx##_poll_in_byte UARTE_MEMORY_SECTION(idx);    \
 	static struct uarte_nrfx_data uarte_##idx##_data = {		       \
-		.char_out = &uarte##idx##_char_out,			       \
-		.rx_data = &uarte##idx##_rx_data,			       \
 		IF_ENABLED(CONFIG_UART_USE_RUNTIME_CONFIGURE,		       \
 				(.uart_config = UARTE_CONFIG(idx),))	       \
 		IF_ENABLED(CONFIG_UART_##idx##_ASYNC,			       \
@@ -2034,8 +2169,10 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		(BUILD_ASSERT(NRF_BAUDRATE(UARTE_PROP(idx, current_speed)) > 0,\
 			  "Unsupported baudrate");))			       \
 	static const struct uarte_nrfx_config uarte_##idx##z_config = {	       \
-		COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE, (),	       \
-		    (.baudrate = UARTE_GET_BAUDRATE(idx),		       \
+		COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,		       \
+		    (IF_ENABLED(DT_CLOCKS_HAS_IDX(UARTE(idx), 0),	       \
+			   (.clock_freq = UARTE_GET_FREQ(idx),))),	       \
+		     (.nrf_baudrate = UARTE_GET_BAUDRATE(idx),		       \
 		     .hw_config = UARTE_NRF_CONFIG(idx),))		       \
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(UARTE(idx)),		       \
 		.uarte_regs = _CONCAT(NRF_UARTE, idx),                         \
@@ -2046,14 +2183,14 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 				UARTE_CFG_FLAG_HW_BYTE_COUNTING : 0) |	       \
 			USE_LOW_POWER(idx),				       \
 		UARTE_DISABLE_RX_INIT(UARTE(idx)),			       \
+		.poll_out_byte = &uarte##idx##_poll_out_byte,		       \
+		.poll_in_byte = &uarte##idx##_poll_in_byte,		       \
 		IF_ENABLED(CONFIG_UART_##idx##_ASYNC,			       \
-				(.tx_cache = uarte##idx##_tx_cache,))	       \
+				(.tx_cache = uarte##idx##_tx_cache,	       \
+				 .rx_flush_buf = uarte##idx##_flush_buf,))     \
 		IF_ENABLED(CONFIG_UART_##idx##_NRF_HW_ASYNC,		       \
 			(.timer = NRFX_TIMER_INSTANCE(			       \
 				CONFIG_UART_##idx##_NRF_HW_ASYNC_TIMER),))     \
-		IF_ENABLED(DT_CLOCKS_HAS_IDX(UARTE(idx), 0),		       \
-			   (.clock_freq = DT_PROP(DT_CLOCKS_CTLR(UARTE(idx)),  \
-						  clock_frequency),))	       \
 	};								       \
 	static int uarte_##idx##_init(const struct device *dev)		       \
 	{								       \

From d7cb52ca9e408f27a51dab8c356c3408d035b3e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 4 Jul 2024 14:18:54 +0200
Subject: [PATCH 0453/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Add
 support for frame timeout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Frame timeout is a hardware feature present in newer versions
of UARTE (e.g. in NRF54X platforms) for detecting idle state
on RX line and ending RX after configurable timeout.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 1f96e623979db6b900260e812d44af9261c8a1ad)
(cherry picked from commit f80b60886ca46f6a83aa77a70bb7a444f8a89332)
---
 drivers/serial/Kconfig.nrfx      |  2 -
 drivers/serial/uart_nrfx_uarte.c | 67 ++++++++++++++++++++++++++++----
 2 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx
index 16f667eaa50..ae790980f42 100644
--- a/drivers/serial/Kconfig.nrfx
+++ b/drivers/serial/Kconfig.nrfx
@@ -31,10 +31,8 @@ config UART_NRFX_UARTE
 config UART_NRFX_UARTE_LEGACY_SHIM
 	bool "Legacy UARTE shim"
 	depends on UART_NRFX_UARTE
-	depends on !SOC_SERIES_NRF54LX
 	depends on !SOC_SERIES_NRF54HX || RISCV
 	depends on !SOC_SERIES_NRF92X || RISCV
-	# New shim takes more ROM. Until it is fixed use legacy shim.
 	default y
 
 config UART_NRFX_UARTE_ENHANCED_RX
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 6708143b704..5c106011a57 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -83,6 +83,11 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #define UARTE_HAS_ENDTX_STOPTX_SHORT 1
 #endif
 
+#if	(UARTE_FOR_EACH_INSTANCE(INSTANCE_PROP, (+), (0), frame_timeout_supported)) == \
+	(UARTE_FOR_EACH_INSTANCE(INSTANCE_PRESENT, (+), (0), frame_timeout_supported))
+#define UARTE_HAS_FRAME_TIMEOUT 1
+#endif
+
 /*
  * RX timeout is divided into time slabs, this define tells how many divisions
  * should be made. More divisions - higher timeout accuracy and processor usage.
@@ -113,7 +118,9 @@ struct uarte_async_rx {
 	uint8_t *next_buf;
 	size_t next_buf_len;
 #ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
+#if !defined(UARTE_HAS_FRAME_TIMEOUT)
 	uint32_t idle_cnt;
+#endif
 	k_timeout_t timeout;
 #else
 	uint32_t total_byte_cnt; /* Total number of bytes received */
@@ -227,6 +234,9 @@ struct uarte_nrfx_config {
 	/* None-zero in case of high speed instances. Baudrate is adjusted by that ratio. */
 	uint32_t clock_freq;
 #else
+#ifdef UARTE_HAS_FRAME_TIMEOUT
+	uint32_t baudrate;
+#endif
 	nrf_uarte_baudrate_t nrf_baudrate;
 	nrf_uarte_config_t hw_config;
 #endif /* CONFIG_UART_USE_RUNTIME_CONFIGURE */
@@ -373,10 +383,6 @@ static int uarte_nrfx_configure(const struct device *dev,
 	struct uarte_nrfx_data *data = dev->data;
 	nrf_uarte_config_t uarte_cfg;
 
-#if NRF_UARTE_HAS_FRAME_TIMEOUT
-	uarte_cfg.frame_timeout = NRF_UARTE_FRAME_TIMEOUT_DIS;
-#endif
-
 #if defined(UARTE_CONFIG_STOP_Msk)
 	switch (cfg->stop_bits) {
 	case UART_CFG_STOP_BITS_1:
@@ -433,6 +439,9 @@ static int uarte_nrfx_configure(const struct device *dev,
 		return -ENOTSUP;
 	}
 
+#ifdef UARTE_HAS_FRAME_TIMEOUT
+	uarte_cfg.frame_timeout = NRF_UARTE_FRAME_TIMEOUT_EN;
+#endif
 	nrf_uarte_configure(get_uarte_instance(dev), &uarte_cfg);
 
 	data->uart_config = *cfg;
@@ -669,7 +678,8 @@ static int uarte_nrfx_init(const struct device *dev)
 		NRF_UARTE_INT_RXSTARTED_MASK |
 		NRF_UARTE_INT_ERROR_MASK |
 		NRF_UARTE_INT_RXTO_MASK |
-		(IS_ENABLED(CONFIG_UART_NRFX_UARTE_ENHANCED_RX) ? NRF_UARTE_INT_RXDRDY_MASK : 0);
+		((IS_ENABLED(CONFIG_UART_NRFX_UARTE_ENHANCED_RX) &&
+		  !IS_ENABLED(UARTE_HAS_FRAME_TIMEOUT)) ? NRF_UARTE_INT_RXDRDY_MASK : 0);
 
 #if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
 	int ret = uarte_nrfx_rx_counting_init(dev);
@@ -836,6 +846,15 @@ static void notify_rx_disable(const struct device *dev)
 	user_callback(dev, (struct uart_event *)&evt);
 }
 
+#ifdef UARTE_HAS_FRAME_TIMEOUT
+static uint32_t us_to_bauds(uint32_t baudrate, int32_t timeout)
+{
+	uint64_t bauds = (uint64_t)baudrate * timeout / 1000000;
+
+	return MIN((uint32_t)bauds, UARTE_FRAMETIMEOUT_COUNTERTOP_Msk);
+}
+#endif
+
 static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 				size_t len,
 				int32_t timeout)
@@ -859,9 +878,22 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	}
 
 #ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
+#ifdef UARTE_HAS_FRAME_TIMEOUT
+	if (timeout != SYS_FOREVER_US) {
+		uint32_t baudrate = COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,
+			(data->uart_config.baudrate), (cfg->baudrate));
+
+		async_rx->timeout = K_USEC(timeout);
+		nrf_uarte_frame_timeout_set(uarte, us_to_bauds(baudrate, timeout));
+		nrf_uarte_shorts_enable(uarte, NRF_UARTE_SHORT_FRAME_TIMEOUT_STOPRX);
+	} else {
+		async_rx->timeout = K_NO_WAIT;
+	}
+#else
 	async_rx->timeout = (timeout == SYS_FOREVER_US) ?
 		K_NO_WAIT : K_USEC(timeout / RX_TIMEOUT_DIV);
 	async_rx->idle_cnt = 0;
+#endif /* UARTE_HAS_FRAME_TIMEOUT */
 #else
 	async_rx->timeout_us = timeout;
 	async_rx->timeout_slab = timeout / RX_TIMEOUT_DIV;
@@ -1018,6 +1050,12 @@ static void rx_timeout(struct k_timer *timer)
 #if  CONFIG_UART_NRFX_UARTE_ENHANCED_RX
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
+#ifdef UARTE_HAS_FRAME_TIMEOUT
+	if (!nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXDRDY)) {
+		nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPRX);
+	}
+	return;
+#else /* UARTE_HAS_FRAME_TIMEOUT */
 	struct uarte_nrfx_data *data = dev->data;
 	struct uarte_async_rx *async_rx = &data->async->rx;
 
@@ -1041,6 +1079,7 @@ static void rx_timeout(struct k_timer *timer)
 	}
 
 	k_timer_start(&async_rx->timer, async_rx->timeout, K_NO_WAIT);
+#endif /* UARTE_HAS_FRAME_TIMEOUT */
 #else /* CONFIG_UART_NRFX_UARTE_ENHANCED_RX */
 	const struct uarte_nrfx_config *cfg = dev->config;
 	struct uarte_nrfx_data *data = dev->data;
@@ -1154,6 +1193,7 @@ static void rxstarted_isr(const struct device *dev)
 		.type = UART_RX_BUF_REQUEST,
 	};
 
+#ifndef UARTE_HAS_FRAME_TIMEOUT
 	struct uarte_nrfx_data *data = dev->data;
 	struct uarte_async_rx *async_rx = &data->async->rx;
 
@@ -1171,6 +1211,7 @@ static void rxstarted_isr(const struct device *dev)
 		k_timer_start(&async_rx->timer, timeout, timeout);
 	}
 #endif /* CONFIG_UART_NRFX_UARTE_ENHANCED_RX */
+#endif /* !UARTE_HAS_FRAME_TIMEOUT */
 	user_callback(dev, &evt);
 }
 
@@ -1370,7 +1411,9 @@ static void rxto_isr(const struct device *dev)
 
 #ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-
+#ifdef UARTE_HAS_FRAME_TIMEOUT
+	nrf_uarte_shorts_disable(uarte, NRF_UARTE_SHORT_FRAME_TIMEOUT_STOPRX);
+#endif
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXDRDY);
 #endif
 
@@ -1466,6 +1509,9 @@ static void txstopped_isr(const struct device *dev)
 
 static void rxdrdy_isr(const struct device *dev)
 {
+#if !defined(UARTE_HAS_FRAME_TIMEOUT)
+	struct uarte_nrfx_data *data = dev->data;
+
 #if defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
@@ -1475,6 +1521,7 @@ static void rxdrdy_isr(const struct device *dev)
 #else
 	data->async->rx.cnt.cnt++;
 #endif
+#endif /* !UARTE_HAS_FRAME_TIMEOUT */
 }
 
 static bool event_check_clear(NRF_UARTE_Type *uarte, nrf_uarte_event_t event,
@@ -1497,7 +1544,7 @@ static void uarte_nrfx_isr_async(const void *arg)
 	struct uarte_async_rx *async_rx = &data->async->rx;
 	uint32_t imask = nrf_uarte_int_enable_check(uarte, UINT32_MAX);
 
-	if (!HW_RX_COUNTING_ENABLED(config)
+	if (!(HW_RX_COUNTING_ENABLED(config) || IS_ENABLED(UARTE_HAS_FRAME_TIMEOUT))
 	    && event_check_clear(uarte, NRF_UARTE_EVENT_RXDRDY, NRF_UARTE_INT_RXDRDY_MASK, imask)) {
 		rxdrdy_isr(dev);
 
@@ -2129,6 +2176,8 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		IF_ENABLED(UARTE_HAS_STOP_CONFIG, (.stop = NRF_UARTE_STOP_ONE,))\
 		IF_ENABLED(UARTE_ODD_PARITY_ALLOWED,				\
 			(.paritytype = NRF_UARTE_PARITYTYPE_EVEN,))		\
+		IF_ENABLED(UARTE_HAS_FRAME_TIMEOUT,				\
+			(.frame_timeout = NRF_UARTE_FRAME_TIMEOUT_EN,))		\
 	}
 
 /* Macro for setting zephyr specific configuration structures. */
@@ -2172,7 +2221,9 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,		       \
 		    (IF_ENABLED(DT_CLOCKS_HAS_IDX(UARTE(idx), 0),	       \
 			   (.clock_freq = UARTE_GET_FREQ(idx),))),	       \
-		     (.nrf_baudrate = UARTE_GET_BAUDRATE(idx),		       \
+		    (IF_ENABLED(UARTE_HAS_FRAME_TIMEOUT,		       \
+			(.baudrate = UARTE_PROP(idx, current_speed),))	       \
+		     .nrf_baudrate = UARTE_GET_BAUDRATE(idx),		       \
 		     .hw_config = UARTE_NRF_CONFIG(idx),))		       \
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(UARTE(idx)),		       \
 		.uarte_regs = _CONCAT(NRF_UARTE, idx),                         \

From f576625466f8a0ddc93a1d101c39c9e30fc0a4ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 16 Sep 2024 10:39:21 +0200
Subject: [PATCH 0454/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Add
 support for DMM and cache
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add support for DMM which manages cache and dedicated memory spaces.
Added support for data cache for buffers which are not DMM managed.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 951710689969522da20c206529c6883ad0e9b7b2)
(cherry picked from commit 76495df2a64ea0b7daae08603ab4ddc1bd27cc18)
---
 drivers/serial/uart_nrfx_uarte.c | 126 ++++++++++++++++++++++++++++---
 1 file changed, 115 insertions(+), 11 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 5c106011a57..3fc63bc28d7 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -15,7 +15,9 @@
 #include <nrfx_timer.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/kernel.h>
+#include <zephyr/cache.h>
 #include <soc.h>
+#include <dmm.h>
 #include <helpers/nrfx_gppi.h>
 #include <zephyr/linker/devicetree_regions.h>
 #include <zephyr/irq.h>
@@ -28,6 +30,8 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #define UARTE_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(UARTE(idx), prop)
 #define UARTE_PROP(idx, prop)     DT_PROP(UARTE(idx), prop)
 
+#define UARTE_IS_CACHEABLE(idx) DMM_IS_REG_CACHEABLE(DT_PHANDLE(UARTE(idx), memory_regions))
+
 /* Execute macro f(x) for all instances. */
 #define UARTE_FOR_EACH_INSTANCE(f, sep, off_code, ...)                                             \
 	NRFX_FOREACH_PRESENT(UARTE, f, sep, off_code, __VA_ARGS__)
@@ -88,6 +92,12 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #define UARTE_HAS_FRAME_TIMEOUT 1
 #endif
 
+#define INSTANCE_NEEDS_CACHE_MGMT(unused, prefix, i, prop) UARTE_IS_CACHEABLE(prefix##i)
+
+#if UARTE_FOR_EACH_INSTANCE(INSTANCE_NEEDS_CACHE_MGMT, (+), (0), _)
+#define UARTE_ANY_CACHE 1
+#endif
+
 /*
  * RX timeout is divided into time slabs, this define tells how many divisions
  * should be made. More divisions - higher timeout accuracy and processor usage.
@@ -112,6 +122,10 @@ struct uarte_async_tx {
 
 struct uarte_async_rx {
 	struct k_timer timer;
+#ifdef CONFIG_HAS_NORDIC_DMM
+	uint8_t *usr_buf;
+	uint8_t *next_usr_buf;
+#endif
 	uint8_t *buf;
 	size_t buf_len;
 	size_t offset;
@@ -197,6 +211,9 @@ struct uarte_nrfx_data {
  */
 #define UARTE_CFG_FLAG_LOW_POWER   BIT(2)
 
+/* If enabled then UARTE peripheral is using memory which is cacheable. */
+#define UARTE_CFG_FLAG_CACHEABLE BIT(3)
+
 /* Macro for converting numerical baudrate to register value. It is convenient
  * to use this approach because for constant input it can calculate nrf setting
  * at compile time.
@@ -230,6 +247,9 @@ struct uarte_nrfx_config {
 	uint32_t flags;
 	bool disable_rx;
 	const struct pinctrl_dev_config *pcfg;
+#ifdef CONFIG_HAS_NORDIC_DMM
+	void *mem_reg;
+#endif
 #ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
 	/* None-zero in case of high speed instances. Baudrate is adjusted by that ratio. */
 	uint32_t clock_freq;
@@ -571,6 +591,10 @@ static void tx_start(const struct device *dev, const uint8_t *buf, size_t len)
 	}
 #endif
 
+	if (IS_ENABLED(UARTE_ANY_CACHE) && (config->flags & UARTE_CFG_FLAG_CACHEABLE)) {
+		sys_cache_data_flush_range((void *)buf, len);
+	}
+
 	nrf_uarte_tx_buffer_set(uarte, buf, len);
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDTX);
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_TXSTOPPED);
@@ -877,6 +901,19 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 		return -EBUSY;
 	}
 
+#ifdef CONFIG_HAS_NORDIC_DMM
+	uint8_t *dma_buf;
+	int ret = 0;
+
+	ret = dmm_buffer_in_prepare(cfg->mem_reg, buf, len, (void **)&dma_buf);
+	if (ret < 0) {
+		return ret;
+	}
+
+	async_rx->usr_buf = buf;
+	buf = dma_buf;
+#endif
+
 #ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
 #ifdef UARTE_HAS_FRAME_TIMEOUT
 	if (timeout != SYS_FOREVER_US) {
@@ -909,8 +946,18 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 		if (async_rx->flush_cnt) {
 			int cpy_len = MIN(len, async_rx->flush_cnt);
 
+			if (IS_ENABLED(UARTE_ANY_CACHE) &&
+			    (cfg->flags & UARTE_CFG_FLAG_CACHEABLE)) {
+				sys_cache_data_invd_range(cfg->rx_flush_buf, cpy_len);
+			}
+
 			memcpy(buf, cfg->rx_flush_buf, cpy_len);
 
+			if (IS_ENABLED(UARTE_ANY_CACHE) &&
+			    (cfg->flags & UARTE_CFG_FLAG_CACHEABLE)) {
+				sys_cache_data_flush_range(buf, cpy_len);
+			}
+
 			buf += cpy_len;
 			len -= cpy_len;
 
@@ -921,6 +968,11 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 				async_rx->flush_cnt -= cpy_len;
 				memmove(cfg->rx_flush_buf, &cfg->rx_flush_buf[cpy_len],
 						async_rx->flush_cnt);
+				if (IS_ENABLED(UARTE_ANY_CACHE) &&
+				    (cfg->flags & UARTE_CFG_FLAG_CACHEABLE)) {
+					sys_cache_data_flush_range(cfg->rx_flush_buf,
+								   async_rx->flush_cnt);
+				}
 				atomic_or(&data->flags, UARTE_FLAG_TRIG_RXTO);
 				NRFX_IRQ_PENDING_SET(nrfx_get_irq_number(uarte));
 				return 0;
@@ -966,6 +1018,17 @@ static int uarte_nrfx_rx_buf_rsp(const struct device *dev, uint8_t *buf,
 	if (async_rx->buf == NULL) {
 		err = -EACCES;
 	} else if (async_rx->next_buf == NULL) {
+#ifdef CONFIG_HAS_NORDIC_DMM
+		uint8_t *dma_buf;
+		const struct uarte_nrfx_config *config = dev->config;
+
+		err = dmm_buffer_in_prepare(config->mem_reg, buf, len, (void **)&dma_buf);
+		if (err < 0) {
+			return err;
+		}
+		async_rx->next_usr_buf = buf;
+		buf = dma_buf;
+#endif
 		async_rx->next_buf = buf;
 		async_rx->next_buf_len = len;
 		nrf_uarte_rx_buffer_set(uarte, buf, len);
@@ -1235,6 +1298,15 @@ static void endrx_isr(const struct device *dev)
 	 */
 	const int rx_amount = nrf_uarte_rx_amount_get(uarte) + async_rx->flush_cnt;
 
+#ifdef CONFIG_HAS_NORDIC_DMM
+	const struct uarte_nrfx_config *config = dev->config;
+	int err =
+		dmm_buffer_in_release(config->mem_reg, async_rx->usr_buf, rx_amount, async_rx->buf);
+
+	(void)err;
+	__ASSERT_NO_MSG(err == 0);
+	async_rx->buf = async_rx->usr_buf;
+#endif
 	async_rx->flush_cnt = 0;
 
 	/* The 'rx_offset' can be bigger than 'rx_amount', so it the length
@@ -1262,6 +1334,9 @@ static void endrx_isr(const struct device *dev)
 	rx_buf_release(dev, async_rx->buf);
 	async_rx->buf = async_rx->next_buf;
 	async_rx->buf_len = async_rx->next_buf_len;
+#ifdef CONFIG_HAS_NORDIC_DMM
+	async_rx->usr_buf = async_rx->next_usr_buf;
+#endif
 	async_rx->next_buf = NULL;
 	async_rx->next_buf_len = 0;
 	async_rx->offset = 0;
@@ -1325,11 +1400,15 @@ static uint8_t rx_flush(const struct device *dev, uint8_t *buf)
 	/* Flushing RX fifo requires buffer bigger than 4 bytes to empty fifo*/
 	static const uint8_t dirty = 0xAA;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
+	const struct uarte_nrfx_config *config = dev->config;
 	uint32_t prev_rx_amount;
 	uint32_t rx_amount;
 
 	if (IS_ENABLED(RX_FLUSH_WORKAROUND)) {
 		memset(buf, dirty, UARTE_HW_RX_FIFO_SIZE);
+		if (IS_ENABLED(UARTE_ANY_CACHE) && (config->flags & UARTE_CFG_FLAG_CACHEABLE)) {
+			sys_cache_data_flush_range(buf, UARTE_HW_RX_FIFO_SIZE);
+		}
 		prev_rx_amount = nrf_uarte_rx_amount_get(uarte);
 	} else {
 		prev_rx_amount = 0;
@@ -1360,6 +1439,10 @@ static uint8_t rx_flush(const struct device *dev, uint8_t *buf)
 		return 0;
 	}
 
+	if (IS_ENABLED(UARTE_ANY_CACHE) && (config->flags & UARTE_CFG_FLAG_CACHEABLE)) {
+		sys_cache_data_invd_range(buf, UARTE_HW_RX_FIFO_SIZE);
+	}
+
 	for (int i = 0; i < rx_amount; i++) {
 		if (buf[i] != dirty) {
 			return rx_amount;
@@ -1379,6 +1462,10 @@ static void rxto_isr(const struct device *dev)
 	struct uarte_async_rx *async_rx = &data->async->rx;
 
 	if (async_rx->buf) {
+#ifdef CONFIG_HAS_NORDIC_DMM
+		(void)dmm_buffer_in_release(config->mem_reg, async_rx->usr_buf, 0, async_rx->buf);
+		async_rx->buf = async_rx->usr_buf;
+#endif
 		rx_buf_release(dev, async_rx->buf);
 		async_rx->buf = NULL;
 	}
@@ -1598,6 +1685,16 @@ static void uarte_nrfx_isr_async(const void *arg)
 	}
 
 	if (atomic_and(&data->flags, ~UARTE_FLAG_TRIG_RXTO) & UARTE_FLAG_TRIG_RXTO) {
+#ifdef CONFIG_HAS_NORDIC_DMM
+		int ret;
+
+		ret = dmm_buffer_in_release(config->mem_reg, async_rx->usr_buf, async_rx->buf_len,
+					    async_rx->buf);
+
+		(void)ret;
+		__ASSERT_NO_MSG(ret == 0);
+		async_rx->buf = async_rx->usr_buf;
+#endif
 		notify_uart_rx_rdy(dev, async_rx->buf_len);
 		rx_buf_release(dev, async_rx->buf);
 		async_rx->buf_len = 0;
@@ -1633,6 +1730,10 @@ static int uarte_nrfx_poll_in(const struct device *dev, unsigned char *c)
 		return -1;
 	}
 
+	if (IS_ENABLED(UARTE_ANY_CACHE) && (config->flags & UARTE_CFG_FLAG_CACHEABLE)) {
+		sys_cache_data_invd_range(config->poll_in_byte, 1);
+	}
+
 	*c = *config->poll_in_byte;
 
 	/* clear the interrupt */
@@ -1727,6 +1828,10 @@ static int uarte_nrfx_fifo_read(const struct device *dev,
 		/* Clear the interrupt */
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
 
+		if (IS_ENABLED(UARTE_ANY_CACHE) && (config->flags & UARTE_CFG_FLAG_CACHEABLE)) {
+			sys_cache_data_invd_range(config->poll_in_byte, 1);
+		}
+
 		/* Receive a character */
 		rx_data[num_rx++] = *config->poll_in_byte;
 
@@ -2200,12 +2305,12 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 	IF_ENABLED(CONFIG_UART_##idx##_ASYNC, (				       \
 		static uint8_t						       \
 			uarte##idx##_tx_cache[CONFIG_UART_ASYNC_TX_CACHE_SIZE] \
-			UARTE_MEMORY_SECTION(idx);			       \
+			DMM_MEMORY_SECTION(UARTE(idx));			       \
 		static uint8_t uarte##idx##_flush_buf[UARTE_HW_RX_FIFO_SIZE]   \
-			UARTE_MEMORY_SECTION(idx);			       \
+			DMM_MEMORY_SECTION(UARTE(idx));			       \
 		struct uarte_async_cb uarte##idx##_async;))		       \
-	static uint8_t uarte##idx##_poll_out_byte UARTE_MEMORY_SECTION(idx);   \
-	static uint8_t uarte##idx##_poll_in_byte UARTE_MEMORY_SECTION(idx);    \
+	static uint8_t uarte##idx##_poll_out_byte DMM_MEMORY_SECTION(UARTE(idx));\
+	static uint8_t uarte##idx##_poll_in_byte DMM_MEMORY_SECTION(UARTE(idx)); \
 	static struct uarte_nrfx_data uarte_##idx##_data = {		       \
 		IF_ENABLED(CONFIG_UART_USE_RUNTIME_CONFIGURE,		       \
 				(.uart_config = UARTE_CONFIG(idx),))	       \
@@ -2227,11 +2332,16 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		     .hw_config = UARTE_NRF_CONFIG(idx),))		       \
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(UARTE(idx)),		       \
 		.uarte_regs = _CONCAT(NRF_UARTE, idx),                         \
+		IF_ENABLED(CONFIG_HAS_NORDIC_DMM,			       \
+				(.mem_reg = DMM_DEV_TO_REG(UARTE(idx)),))      \
 		.flags =						       \
 			(IS_ENABLED(CONFIG_UART_##idx##_ENHANCED_POLL_OUT) ?   \
 				UARTE_CFG_FLAG_PPI_ENDTX : 0) |		       \
 			(IS_ENABLED(CONFIG_UART_##idx##_NRF_HW_ASYNC) ?        \
 				UARTE_CFG_FLAG_HW_BYTE_COUNTING : 0) |	       \
+			(!IS_ENABLED(CONFIG_HAS_NORDIC_DMM) ? 0 :	       \
+			  (UARTE_IS_CACHEABLE(idx) ?			       \
+				UARTE_CFG_FLAG_CACHEABLE : 0)) |	       \
 			USE_LOW_POWER(idx),				       \
 		UARTE_DISABLE_RX_INIT(UARTE(idx)),			       \
 		.poll_out_byte = &uarte##idx##_poll_out_byte,		       \
@@ -2269,19 +2379,13 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		(static uint8_t uarte##idx##_tx_buffer			       \
 			[MIN(CONFIG_UART_##idx##_NRF_TX_BUFFER_SIZE,	       \
 			     BIT_MASK(UARTE##idx##_EASYDMA_MAXCNT_SIZE))]      \
-			UARTE_MEMORY_SECTION(idx);			       \
+			DMM_MEMORY_SECTION(UARTE(idx));			       \
 		 static struct uarte_nrfx_int_driven			       \
 			uarte##idx##_int_driven = {			       \
 				.tx_buffer = uarte##idx##_tx_buffer,	       \
 				.tx_buff_size = sizeof(uarte##idx##_tx_buffer),\
 			};))
 
-#define UARTE_MEMORY_SECTION(idx)					       \
-	COND_CODE_1(UARTE_HAS_PROP(idx, memory_regions),		       \
-		(__attribute__((__section__(LINKER_DT_NODE_REGION_NAME(	       \
-			DT_PHANDLE(UARTE(idx), memory_regions)))))),	       \
-		())
-
 #define COND_UART_NRF_UARTE_DEVICE(unused, prefix, i, _) \
 	IF_ENABLED(CONFIG_HAS_HW_NRF_UARTE##prefix##i, (UART_NRF_UARTE_DEVICE(prefix##i);))
 

From 884bf85382b48f7d45d6233979eb29306aca231e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 9 Jul 2024 11:44:36 +0200
Subject: [PATCH 0455/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Improve
 RX FIFO flush workaround
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add configurable magic byte instead of fixed 0xAA. In some cases, it
is known that certain bytes are less likely in the transmission and
picking specific magic byte may reduce probability of failure of
detection of the correct amount of flushed data.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 7735302e06ba26cc445eec82c20e456dc590e605)
(cherry picked from commit f6115ffb03344e4d81ea8fca5b9e3336ea8030af)
---
 drivers/serial/Kconfig.nrfx      | 10 ++++++++++
 drivers/serial/uart_nrfx_uarte.c |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx
index ae790980f42..6bd4b2d4591 100644
--- a/drivers/serial/Kconfig.nrfx
+++ b/drivers/serial/Kconfig.nrfx
@@ -57,6 +57,16 @@ config UART_ASYNC_TX_CACHE_SIZE
 	  in RAM, because EasyDMA in UARTE peripherals can only transfer data
 	  from RAM.
 
+config UART_NRFX_UARTE_RX_FLUSH_MAGIC_BYTE
+	hex "Byte used for RX FIFO flush workaround"
+	default 0xAA
+	range 0x00 0xFF
+	help
+	  Byte used to fill the buffer before RX FIFO is flushed into it. Due to the
+	  HW anomaly a workaround need to be applied which checks if content of the
+	  buffer changed. There are cases when specific value of the magic byte is
+	  used if it is known that certain bytes are less likely to occur.
+
 if HAS_HW_NRF_UART0 || HAS_HW_NRF_UARTE0
 nrfx_uart_num = 0
 rsource "Kconfig.nrfx_uart_instance"
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 3fc63bc28d7..4043ab4a6ec 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -1398,7 +1398,7 @@ static void endrx_isr(const struct device *dev)
 static uint8_t rx_flush(const struct device *dev, uint8_t *buf)
 {
 	/* Flushing RX fifo requires buffer bigger than 4 bytes to empty fifo*/
-	static const uint8_t dirty = 0xAA;
+	static const uint8_t dirty = CONFIG_UART_NRFX_UARTE_RX_FLUSH_MAGIC_BYTE;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	const struct uarte_nrfx_config *config = dev->config;
 	uint32_t prev_rx_amount;

From 88c2c5a29534836e20e9e3b73b71e0d62a5d13c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 17 Sep 2024 14:15:04 +0200
Subject: [PATCH 0456/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Add
 workaround for BAUDRATE register
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On uart120 BAUDRATE register is not retained when ENABLE=0 and
because of that BAUDRATE must be set after enabling. Add workaround
to the driver.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 5eaafbaf996fa8f290a80afc903ec51f1fe45f66)
(cherry picked from commit c541fa9cf514728f0edf00a2fa1e603b9ee50879)
---
 drivers/serial/uart_nrfx_uarte.c | 34 ++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 4043ab4a6ec..51a4b365a96 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -98,6 +98,16 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #define UARTE_ANY_CACHE 1
 #endif
 
+#ifdef UARTE_ANY_CACHE
+/* uart120 instance does not retain BAUDRATE register when ENABLE=0. When this instance
+ * is used then baudrate must be set after enabling the peripheral and not before.
+ * This approach works for all instances so can be generally applied when uart120 is used.
+ * It is not default for all because it costs some resources. Since currently only uart120
+ * needs cache, that is used to determine if workaround shall be applied.
+ */
+#define UARTE_BAUDRATE_RETENTION_WORKAROUND 1
+#endif
+
 /*
  * RX timeout is divided into time slabs, this define tells how many divisions
  * should be made. More divisions - higher timeout accuracy and processor usage.
@@ -182,6 +192,9 @@ struct uarte_nrfx_int_driven {
 struct uarte_nrfx_data {
 #ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
 	struct uart_config uart_config;
+#ifdef UARTE_BAUDRATE_RETENTION_WORKAROUND
+	nrf_uarte_baudrate_t nrf_baudrate;
+#endif
 #endif
 #ifdef UARTE_INTERRUPT_DRIVEN
 	struct uarte_nrfx_int_driven *int_driven;
@@ -381,7 +394,6 @@ static int baudrate_set(const struct device *dev, uint32_t baudrate)
 	const struct uarte_nrfx_config *config = dev->config;
 	/* calculated baudrate divisor */
 	nrf_uarte_baudrate_t nrf_baudrate = NRF_BAUDRATE(baudrate);
-	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
 	if (nrf_baudrate == 0) {
 		return -EINVAL;
@@ -392,7 +404,13 @@ static int baudrate_set(const struct device *dev, uint32_t baudrate)
 		nrf_baudrate /= config->clock_freq / NRF_UARTE_BASE_FREQUENCY_16MHZ;
 	}
 
-	nrf_uarte_baudrate_set(uarte, nrf_baudrate);
+#ifdef UARTE_BAUDRATE_RETENTION_WORKAROUND
+	struct uarte_nrfx_data *data = dev->data;
+
+	data->nrf_baudrate = nrf_baudrate;
+#else
+	nrf_uarte_baudrate_set(get_uarte_instance(dev), nrf_baudrate);
+#endif
 
 	return 0;
 }
@@ -572,6 +590,13 @@ static void uarte_enable(const struct device *dev, uint32_t act_mask, uint32_t s
 	}
 #endif
 	nrf_uarte_enable(get_uarte_instance(dev));
+#if UARTE_BAUDRATE_RETENTION_WORKAROUND
+	nrf_uarte_baudrate_t baudrate = COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,
+			(data->nrf_baudrate),
+			(((const struct uarte_nrfx_config *)dev->config)->nrf_baudrate));
+
+	nrf_uarte_baudrate_set(get_uarte_instance(dev), baudrate);
+#endif
 }
 
 /* At this point we should have irq locked and any previous transfer completed.
@@ -2153,6 +2178,11 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		}
 
 		nrf_uarte_enable(uarte);
+#if UARTE_BAUDRATE_RETENTION_WORKAROUND
+		nrf_uarte_baudrate_set(get_uarte_instance(dev),
+			COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,
+				(data->nrf_baudrate), (cfg->nrf_baudrate));
+#endif
 
 #ifdef UARTE_ANY_ASYNC
 		if (data->async) {

From f2e6cf4a9d03aedc97739777cb2604c4fafb378d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 17 Sep 2024 14:24:05 +0200
Subject: [PATCH 0457/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Add
 lock to uart_rx_disable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add lock to fix race when uart_rx_disable is interrupted by RXTO
event which lead to driver state corruption.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 317de0c6dea11466f7465addeeb7d04076f32f4f)
(cherry picked from commit 75263f76adeb01cbd34f39e1c0854ce2fbdbc4ea)
---
 drivers/serial/uart_nrfx_uarte.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 51a4b365a96..d308bef4f13 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -1099,20 +1099,26 @@ static int uarte_nrfx_rx_disable(const struct device *dev)
 	struct uarte_nrfx_data *data = dev->data;
 	struct uarte_async_rx *async_rx = &data->async->rx;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
+	int key;
 
 	if (async_rx->buf == NULL) {
 		return -EFAULT;
 	}
+
+	k_timer_stop(&async_rx->timer);
+
+	key = irq_lock();
+
 	if (async_rx->next_buf != NULL) {
 		nrf_uarte_shorts_disable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 	}
 
-	k_timer_stop(&async_rx->timer);
 	async_rx->enabled = false;
 	async_rx->discard_fifo = true;
 
 	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPRX);
+	irq_unlock(key);
 
 	return 0;
 }

From 35ce7d76c8f42ec4b5ee496671af9ea747f53159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 21 Oct 2024 12:50:17 +0200
Subject: [PATCH 0458/2913] [nrf fromtree] boards: native: nrf_bsim: Add
 include path to common
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add include path to nordic/soc/nordic/common where some internal
headers for nordic devices are kept (e.g. dmm.h).

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit ec224fde283306092537783d9f20e89acc465580)
(cherry picked from commit 5d0ed65afff8aed565271b690657f4279b3533a3)
---
 boards/native/nrf_bsim/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boards/native/nrf_bsim/CMakeLists.txt b/boards/native/nrf_bsim/CMakeLists.txt
index 6aeb3f01634..244133c1bd6 100644
--- a/boards/native/nrf_bsim/CMakeLists.txt
+++ b/boards/native/nrf_bsim/CMakeLists.txt
@@ -56,6 +56,7 @@ zephyr_include_directories(
   common
   common/cmsis
   ${NSI_DIR}/common/src/include
+  ${ZEPHYR_BASE}/soc/nordic/common
 )
 
 zephyr_library_include_directories(

From 5995252e622a16c5a41191a0b1247f9ebc92aacc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 19 Jul 2024 14:52:43 +0200
Subject: [PATCH 0459/2913] [nrf fromtree] tests: drivers: uart: async_api:
 Make long buffer configurable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

One of the test case is performing long transfers using 1k buffers.
For some targets there may be not enough RAM to perform such
transfers. Make long buffer length configurable.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit d612982b14003364047565f21537578f173ac8b4)
(cherry picked from commit 8f950bc22cfe614cb8ff151ef22ae64d8aba8f99)
---
 tests/drivers/uart/uart_async_api/Kconfig     |  4 ++
 .../uart/uart_async_api/src/test_uart_async.c | 38 +++++++++++--------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/tests/drivers/uart/uart_async_api/Kconfig b/tests/drivers/uart/uart_async_api/Kconfig
index 6883eb23509..b7ec969a5f5 100644
--- a/tests/drivers/uart/uart_async_api/Kconfig
+++ b/tests/drivers/uart/uart_async_api/Kconfig
@@ -19,3 +19,7 @@ config DT_DEFINED_NOCACHE_NAME
 endif # DT_DEFINED_NOCACHE
 
 endif # DCACHE
+
+config TEST_LONG_BUFFER_SIZE
+	int "Long buffer size"
+	default 1024
diff --git a/tests/drivers/uart/uart_async_api/src/test_uart_async.c b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
index 15b4b6fba41..2feb201d94c 100644
--- a/tests/drivers/uart/uart_async_api/src/test_uart_async.c
+++ b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
@@ -850,14 +850,17 @@ ZTEST_USER(uart_async_chain_write, test_chained_write)
 		      "RX_DISABLED timeout");
 }
 
+#define RX_LONG_BUFFER CONFIG_TEST_LONG_BUFFER_SIZE
+#define TX_LONG_BUFFER (CONFIG_TEST_LONG_BUFFER_SIZE - 8)
+
 #if NOCACHE_MEM
-static __aligned(32) uint8_t long_rx_buf[1024] __used __NOCACHE;
-static __aligned(32) uint8_t long_rx_buf2[1024] __used __NOCACHE;
-static __aligned(32) uint8_t long_tx_buf[1000] __used __NOCACHE;
+static __aligned(32) uint8_t long_rx_buf[RX_LONG_BUFFER] __used __NOCACHE;
+static __aligned(32) uint8_t long_rx_buf2[RX_LONG_BUFFER] __used __NOCACHE;
+static __aligned(32) uint8_t long_tx_buf[TX_LONG_BUFFER] __used __NOCACHE;
 #else
-ZTEST_BMEM uint8_t long_rx_buf[1024];
-ZTEST_BMEM uint8_t long_rx_buf2[1024];
-ZTEST_BMEM uint8_t long_tx_buf[1000];
+ZTEST_BMEM uint8_t long_rx_buf[RX_LONG_BUFFER];
+ZTEST_BMEM uint8_t long_rx_buf2[RX_LONG_BUFFER];
+ZTEST_BMEM uint8_t long_tx_buf[TX_LONG_BUFFER];
 #endif /* NOCACHE_MEM */
 ZTEST_BMEM volatile uint8_t evt_num;
 ZTEST_BMEM size_t long_received[2];
@@ -887,7 +890,7 @@ static void test_long_buffers_callback(const struct device *dev,
 		k_sem_give(&rx_disabled);
 		break;
 	case UART_RX_BUF_REQUEST:
-		uart_rx_buf_rsp(dev, next_buffer, 1024);
+		uart_rx_buf_rsp(dev, next_buffer, RX_LONG_BUFFER);
 		next_buffer = (next_buffer == long_rx_buf2) ? long_rx_buf : long_rx_buf2;
 		break;
 	default:
@@ -906,16 +909,19 @@ static void *long_buffers_setup(void)
 
 ZTEST_USER(uart_async_long_buf, test_long_buffers)
 {
+	size_t tx_len1 = TX_LONG_BUFFER / 2;
+	size_t tx_len2 = TX_LONG_BUFFER;
+
 	memset(long_rx_buf, 0, sizeof(long_rx_buf));
 	memset(long_tx_buf, 1, sizeof(long_tx_buf));
 
 	uart_rx_enable(uart_dev, long_rx_buf, sizeof(long_rx_buf), 10 * USEC_PER_MSEC);
 
-	uart_tx(uart_dev, long_tx_buf, 500, 200 * USEC_PER_MSEC);
+	uart_tx(uart_dev, long_tx_buf, tx_len1, 200 * USEC_PER_MSEC);
 	zassert_equal(k_sem_take(&tx_done, K_MSEC(200)), 0, "TX_DONE timeout");
 	zassert_equal(k_sem_take(&rx_rdy, K_MSEC(200)), 0, "RX_RDY timeout");
-	zassert_equal(long_received[0], 500, "Wrong number of bytes received.");
-	zassert_equal(memcmp(long_tx_buf, long_rx_buf, 500),
+	zassert_equal(long_received[0], tx_len1, "Wrong number of bytes received.");
+	zassert_equal(memcmp(long_tx_buf, long_rx_buf, tx_len1),
 		      0,
 		      "Buffers not equal");
 	k_msleep(10);
@@ -923,19 +929,21 @@ ZTEST_USER(uart_async_long_buf, test_long_buffers)
 	bool release_on_timeout = k_sem_take(&rx_buf_released, K_NO_WAIT) == 0;
 
 	evt_num = 0;
-	uart_tx(uart_dev, long_tx_buf, 1000, 200 * USEC_PER_MSEC);
+	uart_tx(uart_dev, long_tx_buf, tx_len2, 200 * USEC_PER_MSEC);
 	zassert_equal(k_sem_take(&tx_done, K_MSEC(200)), 0, "TX_DONE timeout");
 	zassert_equal(k_sem_take(&rx_rdy, K_MSEC(200)), 0, "RX_RDY timeout");
 
 	if (release_on_timeout) {
-		zassert_equal(long_received[0], 1000, "Wrong number of bytes received.");
+		zassert_equal(long_received[0], tx_len2, "Wrong number of bytes received.");
 		zassert_equal(memcmp(long_tx_buf, long_rx_buf2, long_received[0]), 0,
 			      "Buffers not equal");
 	} else {
 		zassert_equal(k_sem_take(&rx_rdy, K_MSEC(200)), 0, "RX_RDY timeout");
-		zassert_equal(long_received[0], 524, "Wrong number of bytes received.");
-		zassert_equal(long_received[1], 476, "Wrong number of bytes received.");
-		zassert_equal(memcmp(long_tx_buf, long_rx_buf + 500, long_received[0]), 0,
+		zassert_equal(long_received[0], RX_LONG_BUFFER - tx_len1,
+				"Wrong number of bytes received.");
+		zassert_equal(long_received[1], tx_len2 - (RX_LONG_BUFFER - tx_len1),
+				"Wrong number of bytes received.");
+		zassert_equal(memcmp(long_tx_buf, long_rx_buf + tx_len1, long_received[0]), 0,
 			      "Buffers not equal");
 		zassert_equal(memcmp(long_tx_buf, long_rx_buf2, long_received[1]), 0,
 			      "Buffers not equal");

From 04f2415927a4db8daf9211ee72f889cf86248384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 23 Oct 2024 07:33:37 +0200
Subject: [PATCH 0460/2913] [nrf fromtree] tests: drivers: uart: async_api: Use
 custom long buffer for nrf54h20
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

nrf54h20dk_nrf54h20_cpurad by default has less RAM dedicated for
DMA transfers and default 1k buffer cannot be used for
uart_async_long_buf case. Use custom value.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit d480093cd62df25603106f4a505c17e34805d764)
(cherry picked from commit e6f1bb50a472d06759d7e99c7416c16a6f28ab1b)
---
 .../uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpurad.conf   | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpurad.conf

diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpurad.conf
new file mode 100644
index 00000000000..0eebd15e8a9
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -0,0 +1 @@
+CONFIG_TEST_LONG_BUFFER_SIZE=128

From 411d92965b2a8f83c6be367e12ac6754b9b1047c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 22 Oct 2024 11:08:49 +0200
Subject: [PATCH 0461/2913] [nrf fromtree] tests: drivers: uart:
 uart_async_api: Add nrf54l15dk//cpuapp overlay
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add overlay for nrf54l15dk/nrf54l15/cpuapp target.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit a04c1db9a46ab3912d0a678a370516ef754a7007)
(cherry picked from commit c7124d946d583b350ce07f8758f35d6aa6dad69f)
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..ed4a2de1891
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&pinctrl {
+	uart21_default_alt: uart21_default_alt {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>;
+		};
+	};
+
+	uart21_sleep_alt: uart21_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>;
+			low-power-enable;
+		};
+	};
+};
+
+dut: &uart21 {
+	status = "okay";
+	pinctrl-0 = <&uart21_default_alt>;
+	pinctrl-1 = <&uart21_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	current-speed = <115200>;
+};

From 55b6fd92a20f9d998dfa20b14635d33ae48760d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 22 Oct 2024 09:34:27 +0200
Subject: [PATCH 0462/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Add
 missing closing bracket
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A code ifdefed by UARTE_BAUDRATE_RETENTION_WORKAROUND was missing a
closing bracket. It was missed because CI did not compile any target
that is applying this workaround and enables code compilation.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit a98bde993e91fac5f2944f2cc9f48a271065dba9)
(cherry picked from commit 9a0c38773b1b6b0b52d00969dfcaa3590c00bf22)
---
 drivers/serial/uart_nrfx_uarte.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index d308bef4f13..27a8b23e2c0 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -2187,7 +2187,7 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 #if UARTE_BAUDRATE_RETENTION_WORKAROUND
 		nrf_uarte_baudrate_set(get_uarte_instance(dev),
 			COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,
-				(data->nrf_baudrate), (cfg->nrf_baudrate));
+				(data->nrf_baudrate), (cfg->nrf_baudrate)));
 #endif
 
 #ifdef UARTE_ANY_ASYNC

From 63ff46f256a861ed4478a8b3a6469003dd3fad13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 21 Oct 2024 15:34:25 +0200
Subject: [PATCH 0463/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Remove
 unused element from a structure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove aborted flag from uarte_async_rx structure. Flag is not
used.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit cfc87dab75b937d4618795a20c58c5989c6bf492)
(cherry picked from commit e209799402ab655346d664c1195216788c82f544)
---
 drivers/serial/uart_nrfx_uarte.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 27a8b23e2c0..efef52102c5 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -162,7 +162,6 @@ struct uarte_async_rx {
 	uint8_t flush_cnt;
 	volatile bool enabled;
 	volatile bool discard_fifo;
-	volatile bool aborted;
 };
 
 struct uarte_async_cb {

From 7120fada0f6234519bb48c823c8ac5bd27676966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 16 Sep 2024 10:32:22 +0200
Subject: [PATCH 0464/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Add
 runtime PM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add runtime PM to the driver. When asynchronous or interrupt
driven API is used, there are 3 independent paths for enabling
the device: RX, TX and TX poll_out. TX poll_out requires special
handling because number of poll_out calls does not need to much
number of TXSTOPPED interrupts. To handle that special flag is
added. For standard RX and TX is simpler.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 3ce19da43b1e07a39c9f078687d3e8b2154e662e)
(cherry picked from commit 922989ea98617c4b36017a40346ef313a930d1eb)
---
 drivers/serial/Kconfig.nrfx_uart_instance |   5 +-
 drivers/serial/uart_nrfx_uarte.c          | 463 ++++++++++++----------
 2 files changed, 254 insertions(+), 214 deletions(-)

diff --git a/drivers/serial/Kconfig.nrfx_uart_instance b/drivers/serial/Kconfig.nrfx_uart_instance
index 4ea1393a2c1..d44c1ab7e02 100644
--- a/drivers/serial/Kconfig.nrfx_uart_instance
+++ b/drivers/serial/Kconfig.nrfx_uart_instance
@@ -68,11 +68,14 @@ config UART_$(nrfx_uart_num)_NRF_ASYNC_LOW_POWER
 	depends on HAS_HW_NRF_UARTE$(nrfx_uart_num)
 	depends on UART_ASYNC_API
 	depends on UART_NRFX_UARTE_LEGACY_SHIM
-	default y
+	default y if !PM_DEVICE
 	help
 	  When enabled, UARTE is enabled before each TX or RX usage and disabled
 	  when not used. Disabling UARTE while in idle allows to achieve lowest
 	  power consumption. It is only feasible if receiver is not always on.
+	  This option is irrelevant when device power management (PM) is enabled
+	  because then device state is controlled by the PM actions.
+
 
 config UART_$(nrfx_uart_num)_NRF_HW_ASYNC_TIMER
 	int "Timer instance"
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index efef52102c5..b22c50af096 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -11,6 +11,7 @@
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
 #include <hal/nrf_uarte.h>
 #include <nrfx_timer.h>
 #include <zephyr/sys/util.h>
@@ -98,6 +99,12 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #define UARTE_ANY_CACHE 1
 #endif
 
+#define IS_LOW_POWER(unused, prefix, i, _) IS_ENABLED(CONFIG_UART_##prefix##i##_NRF_ASYNC_LOW_POWER)
+
+#if UARTE_FOR_EACH_INSTANCE(IS_LOW_POWER, (||), (0))
+#define UARTE_ANY_LOW_POWER 1
+#endif
+
 #ifdef UARTE_ANY_CACHE
 /* uart120 instance does not retain BAUDRATE register when ENABLE=0. When this instance
  * is used then baudrate must be set after enabling the peripheral and not before.
@@ -211,6 +218,7 @@ struct uarte_nrfx_data {
 #define UARTE_FLAG_LOW_POWER_TX BIT(0)
 #define UARTE_FLAG_LOW_POWER_RX BIT(1)
 #define UARTE_FLAG_TRIG_RXTO BIT(2)
+#define UARTE_FLAG_POLL_OUT BIT(3)
 
 /* If enabled then ENDTX is PPI'ed to TXSTOP */
 #define UARTE_CFG_FLAG_PPI_ENDTX   BIT(0)
@@ -251,6 +259,10 @@ struct uarte_nrfx_data {
 	(baudrate) == 921600 ? NRF_UARTE_BAUDRATE_921600 :	\
 	(baudrate) == 1000000 ? NRF_UARTE_BAUDRATE_1000000 : 0)
 
+#define LOW_POWER_ENABLED(_config) \
+	(IS_ENABLED(UARTE_ANY_LOW_POWER) && \
+	 !IS_ENABLED(CONFIG_PM_DEVICE) && \
+	 (_config->flags & UARTE_CFG_FLAG_LOW_POWER))
 /**
  * @brief Structure for UARTE configuration.
  */
@@ -316,6 +328,7 @@ static void uarte_nrfx_isr_int(const void *arg)
 {
 	const struct device *dev = arg;
 	const struct uarte_nrfx_config *config = dev->config;
+	struct uarte_nrfx_data *data = dev->data;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
 	/* If interrupt driven and asynchronous APIs are disabled then UART
@@ -327,34 +340,35 @@ static void uarte_nrfx_isr_int(const void *arg)
 		endtx_isr(dev);
 	}
 
-	if (config->flags & UARTE_CFG_FLAG_LOW_POWER) {
+	bool txstopped = nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_TXSTOPPED);
+
+	if (txstopped && (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || LOW_POWER_ENABLED(config))) {
 		unsigned int key = irq_lock();
 
-		if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_TXSTOPPED)) {
+		if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) &&
+		    (data->flags & UARTE_FLAG_POLL_OUT)) {
+			data->flags &= ~UARTE_FLAG_POLL_OUT;
+			pm_device_runtime_put(dev);
+		} else {
 			nrf_uarte_disable(uarte);
 		}
 
 #ifdef UARTE_INTERRUPT_DRIVEN
-		struct uarte_nrfx_data *data = dev->data;
-
 		if (!data->int_driven || data->int_driven->fifo_fill_lock == 0)
 #endif
 		{
-			nrf_uarte_int_disable(uarte,
-					      NRF_UARTE_INT_TXSTOPPED_MASK);
+			nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
 		}
 
 		irq_unlock(key);
 	}
 
 #ifdef UARTE_INTERRUPT_DRIVEN
-	struct uarte_nrfx_data *data = dev->data;
-
 	if (!data->int_driven) {
 		return;
 	}
 
-	if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_TXSTOPPED)) {
+	if (txstopped) {
 		data->int_driven->fifo_fill_lock = 0;
 		if (data->int_driven->disable_tx_irq) {
 			nrf_uarte_int_disable(uarte,
@@ -553,8 +567,6 @@ static int wait_tx_ready(const struct device *dev)
 	return key;
 }
 
-#ifdef UARTE_ANY_ASYNC
-
 /* Using Macro instead of static inline function to handle NO_OPTIMIZATIONS case
  * where static inline fails on linking.
  */
@@ -562,21 +574,22 @@ static int wait_tx_ready(const struct device *dev)
 	(IS_ENABLED(UARTE_ANY_HW_ASYNC) ? \
 	 (config->flags & UARTE_CFG_FLAG_HW_BYTE_COUNTING) : false)
 
-#endif /* UARTE_ANY_ASYNC */
-
-static void uarte_enable(const struct device *dev, uint32_t act_mask, uint32_t sec_mask)
+static void uarte_periph_enable(const struct device *dev)
 {
+	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
+	const struct uarte_nrfx_config *config = dev->config;
 	struct uarte_nrfx_data *data = dev->data;
 
-	if (atomic_or(&data->flags, act_mask) & sec_mask) {
-		/* Second direction already enabled so UARTE is enabled. */
-		return;
-	}
+	(void)data;
+	nrf_uarte_enable(uarte);
+#if UARTE_BAUDRATE_RETENTION_WORKAROUND
+	nrf_uarte_baudrate_set(uarte,
+		COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,
+			(data->nrf_baudrate), (config->nrf_baudrate)));
+#endif
 
 #ifdef UARTE_ANY_ASYNC
 	if (data->async) {
-		const struct uarte_nrfx_config *config = dev->config;
-
 		if (HW_RX_COUNTING_ENABLED(config)) {
 			const nrfx_timer_t *timer = &config->timer;
 
@@ -586,16 +599,32 @@ static void uarte_enable(const struct device *dev, uint32_t act_mask, uint32_t s
 				nrfx_timer_increment(timer);
 			}
 		}
+		return;
 	}
 #endif
-	nrf_uarte_enable(get_uarte_instance(dev));
-#if UARTE_BAUDRATE_RETENTION_WORKAROUND
-	nrf_uarte_baudrate_t baudrate = COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,
-			(data->nrf_baudrate),
-			(((const struct uarte_nrfx_config *)dev->config)->nrf_baudrate));
 
-	nrf_uarte_baudrate_set(get_uarte_instance(dev), baudrate);
+	if (IS_ENABLED(UARTE_ANY_NONE_ASYNC) && !config->disable_rx) {
+		nrf_uarte_rx_buffer_set(uarte, config->poll_in_byte, 1);
+		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
+		nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTRX);
+#if defined(UARTE_INTERRUPT_DRIVEN) && defined(CONFIG_PM_DEVICE)
+		if (data->int_driven && data->int_driven->rx_irq_enabled) {
+			nrf_uarte_int_enable(uarte, NRF_UARTE_INT_ENDRX_MASK);
+		}
 #endif
+	}
+}
+
+static void uarte_enable(const struct device *dev, uint32_t act_mask, uint32_t sec_mask)
+{
+	struct uarte_nrfx_data *data = dev->data;
+
+	if (atomic_or(&data->flags, act_mask) & sec_mask) {
+		/* Second direction already enabled so UARTE is enabled. */
+		return;
+	}
+
+	uarte_periph_enable(dev);
 }
 
 /* At this point we should have irq locked and any previous transfer completed.
@@ -606,7 +635,7 @@ static void tx_start(const struct device *dev, const uint8_t *buf, size_t len)
 	const struct uarte_nrfx_config *config = dev->config;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
-#ifdef CONFIG_PM_DEVICE
+#if defined(CONFIG_PM_DEVICE) && !defined(CONFIG_PM_DEVICE_RUNTIME)
 	enum pm_device_state state;
 
 	(void)pm_device_state_get(dev, &state);
@@ -620,18 +649,19 @@ static void tx_start(const struct device *dev, const uint8_t *buf, size_t len)
 	}
 
 	nrf_uarte_tx_buffer_set(uarte, buf, len);
-	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDTX);
+	if (!IS_ENABLED(UARTE_HAS_ENDTX_STOPTX_SHORT)) {
+		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDTX);
+	}
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_TXSTOPPED);
 
-	if (config->flags & UARTE_CFG_FLAG_LOW_POWER) {
+	if (LOW_POWER_ENABLED(config)) {
 		uarte_enable(dev, UARTE_FLAG_LOW_POWER_TX, UARTE_FLAG_LOW_POWER_RX);
-		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
 	}
 
 	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTTX);
 }
 
-#if defined(UARTE_ANY_ASYNC) || defined(CONFIG_PM_DEVICE)
+#if defined(UARTE_ANY_ASYNC)
 /** @brief Disable UARTE peripheral is not used by RX or TX.
  *
  * It must be called with interrupts locked so that deciding if no direction is
@@ -652,7 +682,7 @@ static void uarte_disable_locked(const struct device *dev, uint32_t dis_mask, ui
 		return;
 	}
 
-#if defined(UARTE_ANY_ASYNC) && !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
+#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
 	const struct uarte_nrfx_config *config = dev->config;
 
 	if (data->async && HW_RX_COUNTING_ENABLED(config)) {
@@ -717,7 +747,7 @@ static int uarte_nrfx_rx_counting_init(const struct device *dev)
 }
 #endif /* !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX) */
 
-static int uarte_nrfx_init(const struct device *dev)
+static int uarte_async_init(const struct device *dev)
 {
 	struct uarte_nrfx_data *data = dev->data;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
@@ -738,7 +768,6 @@ static int uarte_nrfx_init(const struct device *dev)
 #endif
 
 	nrf_uarte_int_enable(uarte, rx_int_mask);
-	nrf_uarte_enable(uarte);
 
 	k_timer_init(&data->async->rx.timer, rx_timeout, NULL);
 	k_timer_user_data_set(&data->async->rx.timer, (void *)dev);
@@ -754,6 +783,7 @@ static int uarte_nrfx_init(const struct device *dev)
  */
 static void start_tx_locked(const struct device *dev, struct uarte_nrfx_data *data)
 {
+	nrf_uarte_int_enable(get_uarte_instance(dev), NRF_UARTE_INT_TXSTOPPED_MASK);
 	if (!is_tx_ready(dev)) {
 		/* Active poll out, postpone until it is completed. */
 		data->async->tx.pending = true;
@@ -817,7 +847,6 @@ static int uarte_nrfx_tx(const struct device *dev, const uint8_t *buf,
 
 	data->async->tx.len = len;
 	data->async->tx.buf = buf;
-	nrf_uarte_int_enable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
 
 	if (nrf_dma_accessible_check(uarte, buf)) {
 		data->async->tx.xfer_buf = buf;
@@ -827,6 +856,10 @@ static int uarte_nrfx_tx(const struct device *dev, const uint8_t *buf,
 		(void)setup_tx_cache(dev);
 	}
 
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_get(dev);
+	}
+
 	start_tx_locked(dev, data);
 
 	irq_unlock(key);
@@ -966,7 +999,7 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	async_rx->next_buf = NULL;
 	async_rx->next_buf_len = 0;
 
-	if (cfg->flags & UARTE_CFG_FLAG_LOW_POWER) {
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || LOW_POWER_ENABLED(cfg)) {
 		if (async_rx->flush_cnt) {
 			int cpy_len = MIN(len, async_rx->flush_cnt);
 
@@ -1018,7 +1051,10 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 
 	async_rx->enabled = true;
-	if (cfg->flags & UARTE_CFG_FLAG_LOW_POWER) {
+
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_get(dev);
+	} else if (LOW_POWER_ENABLED(cfg)) {
 		unsigned int key = irq_lock();
 
 		uarte_enable(dev, UARTE_FLAG_LOW_POWER_RX, UARTE_FLAG_LOW_POWER_TX);
@@ -1534,7 +1570,9 @@ static void rxto_isr(const struct device *dev)
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXDRDY);
 #endif
 
-	if (config->flags & UARTE_CFG_FLAG_LOW_POWER) {
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_put(dev);
+	} else if (LOW_POWER_ENABLED(config)) {
 		uint32_t key = irq_lock();
 
 		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_RX, UARTE_FLAG_LOW_POWER_TX);
@@ -1551,27 +1589,28 @@ static void txstopped_isr(const struct device *dev)
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	unsigned int key;
 
-	if (config->flags & UARTE_CFG_FLAG_LOW_POWER) {
-		nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
-		key = irq_lock();
-		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_TX, UARTE_FLAG_LOW_POWER_RX);
-		irq_unlock(key);
+	key = irq_lock();
 
-		if (!data->async->tx.len) {
-			return;
+	size_t amount = (data->async->tx.amount >= 0) ?
+			data->async->tx.amount : nrf_uarte_tx_amount_get(uarte);
+
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
+		if (data->flags & UARTE_FLAG_POLL_OUT) {
+			pm_device_runtime_put(dev);
+			data->flags &= ~UARTE_FLAG_POLL_OUT;
 		}
+	} else if (LOW_POWER_ENABLED(config)) {
+		nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
+		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_TX, UARTE_FLAG_LOW_POWER_RX);
 	}
 
+	irq_unlock(key);
+
 	if (!data->async->tx.buf) {
 		return;
 	}
 
-	key = irq_lock();
-	size_t amount = (data->async->tx.amount >= 0) ?
-			data->async->tx.amount : nrf_uarte_tx_amount_get(uarte);
-
-	irq_unlock(key);
-
 	/* If there is a pending tx request, it means that uart_tx()
 	 * was called when there was ongoing uart_poll_out. Handling
 	 * TXSTOPPED interrupt means that uart_poll_out has completed.
@@ -1621,6 +1660,10 @@ static void txstopped_isr(const struct device *dev)
 	data->async->tx.buf = NULL;
 	data->async->tx.len = 0;
 
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_put(dev);
+	}
+
 	user_callback(dev, &evt);
 }
 
@@ -1783,6 +1826,8 @@ static void uarte_nrfx_poll_out(const struct device *dev, unsigned char c)
 {
 	const struct uarte_nrfx_config *config = dev->config;
 	bool isr_mode = k_is_in_isr() || k_is_pre_kernel();
+	struct uarte_nrfx_data *data = dev->data;
+	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	unsigned int key;
 
 	if (isr_mode) {
@@ -1790,9 +1835,6 @@ static void uarte_nrfx_poll_out(const struct device *dev, unsigned char c)
 			key = irq_lock();
 			if (is_tx_ready(dev)) {
 #if UARTE_ANY_ASYNC
-				NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-				struct uarte_nrfx_data *data = dev->data;
-
 				if (data->async && data->async->tx.len &&
 					data->async->tx.amount < 0) {
 					data->async->tx.amount = nrf_uarte_tx_amount_get(uarte);
@@ -1808,6 +1850,17 @@ static void uarte_nrfx_poll_out(const struct device *dev, unsigned char c)
 		key = wait_tx_ready(dev);
 	}
 
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		if (!(data->flags & UARTE_FLAG_POLL_OUT)) {
+			data->flags |= UARTE_FLAG_POLL_OUT;
+			pm_device_runtime_get(dev);
+		}
+	}
+
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || LOW_POWER_ENABLED(config)) {
+		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
+	}
+
 	*config->poll_out_byte = c;
 	tx_start(dev, config->poll_out_byte, 1);
 
@@ -2041,84 +2094,6 @@ static int endtx_stoptx_ppi_init(NRF_UARTE_Type *uarte,
 }
 #endif /* UARTE_ENHANCED_POLL_OUT */
 
-static int uarte_instance_init(const struct device *dev,
-			       uint8_t interrupts_active)
-{
-	int err;
-	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-	const struct uarte_nrfx_config *cfg = dev->config;
-
-#if	defined(CONFIG_UART_USE_RUNTIME_CONFIGURE) || defined(UARTE_ENHANCED_POLL_OUT) || \
-	defined(UARTE_ANY_ASYNC)
-	struct uarte_nrfx_data *data = dev->data;
-#endif
-
-	nrf_uarte_disable(uarte);
-
-#ifdef CONFIG_ARCH_POSIX
-	/* For simulation the DT provided peripheral address needs to be corrected */
-	((struct pinctrl_dev_config *)cfg->pcfg)->reg = (uintptr_t)cfg->uarte_regs;
-#endif
-
-	err = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
-	if (err < 0) {
-		return err;
-	}
-
-#ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
-	err = uarte_nrfx_configure(dev, &data->uart_config);
-	if (err) {
-		return err;
-	}
-#else
-	nrf_uarte_baudrate_set(uarte, cfg->nrf_baudrate);
-	nrf_uarte_configure(uarte, &cfg->hw_config);
-#endif
-
-#ifdef UARTE_HAS_ENDTX_STOPTX_SHORT
-	nrf_uarte_shorts_enable(uarte, NRF_UARTE_SHORT_ENDTX_STOPTX);
-#elif defined(UARTE_ENHANCED_POLL_OUT)
-	if (cfg->flags & UARTE_CFG_FLAG_PPI_ENDTX) {
-		err = endtx_stoptx_ppi_init(uarte, data);
-		if (err < 0) {
-			return err;
-		}
-	}
-#endif
-#ifdef UARTE_ANY_ASYNC
-	if (data->async) {
-		err = uarte_nrfx_init(dev);
-		if (err < 0) {
-			return err;
-		}
-	} else
-#endif
-	{
-		/* Enable receiver and transmitter */
-		nrf_uarte_enable(uarte);
-
-		if (!cfg->disable_rx) {
-			nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
-
-			nrf_uarte_rx_buffer_set(uarte, cfg->poll_in_byte, 1);
-			nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTRX);
-		}
-	}
-
-	if (!IS_ENABLED(UARTE_HAS_ENDTX_STOPTX_SHORT) && !(cfg->flags & UARTE_CFG_FLAG_PPI_ENDTX)) {
-		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_ENDTX_MASK);
-	}
-
-	/* Set TXSTOPPED event by requesting fake (zero-length) transfer.
-	 * Pointer to RAM variable (data->tx_buffer) is set because otherwise
-	 * such operation may result in HardFault or RAM corruption.
-	 */
-	tx_start(dev, cfg->poll_out_byte, 0);
-
-	return 0;
-}
-
-#ifdef CONFIG_PM_DEVICE
 /** @brief Pend until TX is stopped.
  *
  * There are 2 configurations that must be handled:
@@ -2142,7 +2117,9 @@ static void wait_for_tx_stopped(const struct device *dev)
 		nrf_uarte_int_disable(uarte, NRF_UARTE_INT_ENDTX_MASK);
 		NRFX_WAIT_FOR(is_tx_ready(dev), 1000, 1, res);
 		if (!nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_TXSTOPPED)) {
-			nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDTX);
+			if (!IS_ENABLED(UARTE_HAS_ENDTX_STOPTX_SHORT)) {
+				nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDTX);
+			}
 			nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPTX);
 		}
 	}
@@ -2155,93 +2132,59 @@ static void wait_for_tx_stopped(const struct device *dev)
 	}
 }
 
-
-static int uarte_nrfx_pm_action(const struct device *dev,
-				enum pm_device_action action)
+static void uarte_pm_resume(const struct device *dev)
 {
-	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-#if defined(UARTE_ANY_ASYNC) || defined(UARTE_INTERRUPT_DRIVEN)
-	struct uarte_nrfx_data *data = dev->data;
-#endif
 	const struct uarte_nrfx_config *cfg = dev->config;
-	int ret;
 
-#ifdef UARTE_ANY_ASYNC
-	/* If low power mode for asynchronous mode is used then there is nothing to do here.
-	 * In low power mode UARTE is turned off whenever there is no activity.
-	 */
-	if (data->async && (cfg->flags & UARTE_CFG_FLAG_LOW_POWER)) {
-		return 0;
-	}
-#endif
+	(void)pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
 
-	switch (action) {
-	case PM_DEVICE_ACTION_RESUME:
-		ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
-		if (ret < 0) {
-			return ret;
-		}
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || !LOW_POWER_ENABLED(cfg)) {
+		uarte_periph_enable(dev);
+	}
+}
 
-		nrf_uarte_enable(uarte);
-#if UARTE_BAUDRATE_RETENTION_WORKAROUND
-		nrf_uarte_baudrate_set(get_uarte_instance(dev),
-			COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,
-				(data->nrf_baudrate), (cfg->nrf_baudrate)));
-#endif
+static void uarte_pm_suspend(const struct device *dev)
+{
+	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
+	const struct uarte_nrfx_config *cfg = dev->config;
+	struct uarte_nrfx_data *data = dev->data;
 
+	(void)data;
 #ifdef UARTE_ANY_ASYNC
-		if (data->async) {
-			if (HW_RX_COUNTING_ENABLED(cfg)) {
-				nrfx_timer_enable(&cfg->timer);
-			}
-
-			return 0;
-		}
-#endif
-		if (!cfg->disable_rx) {
-
-			nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
-			nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTRX);
-#ifdef UARTE_INTERRUPT_DRIVEN
-			if (data->int_driven &&
-			    data->int_driven->rx_irq_enabled) {
-				nrf_uarte_int_enable(uarte,
-						     NRF_UARTE_INT_ENDRX_MASK);
-			}
-#endif
-		}
-		break;
-	case PM_DEVICE_ACTION_SUSPEND:
-		/* Disabling UART requires stopping RX, but stop RX event is
-		 * only sent after each RX if async UART API is used.
+	if (data->async) {
+		/* Entering inactive state requires device to be no
+		 * active asynchronous calls.
 		 */
-#ifdef UARTE_ANY_ASYNC
-		if (data->async) {
-			/* Entering inactive state requires device to be no
-			 * active asynchronous calls.
+		__ASSERT_NO_MSG(!data->async->rx.enabled);
+		__ASSERT_NO_MSG(!data->async->tx.len);
+		if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+			/* If runtime PM is enabled then reference counting ensures that
+			 * suspend will not occur when TX is active.
 			 */
-			__ASSERT_NO_MSG(!data->async->rx.enabled);
-			__ASSERT_NO_MSG(!data->async->tx.len);
-#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
-			if (data->async && HW_RX_COUNTING_ENABLED(cfg)) {
-				nrfx_timer_disable(&cfg->timer);
-				/* Timer/counter value is reset when disabled. */
-				data->async->rx.total_byte_cnt = 0;
-				data->async->rx.total_user_byte_cnt = 0;
-			}
-#endif
+			__ASSERT_NO_MSG(nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_TXSTOPPED));
+		} else {
+			wait_for_tx_stopped(dev);
+		}
 
+#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
+		if (data->async && HW_RX_COUNTING_ENABLED(cfg)) {
+			nrfx_timer_disable(&cfg->timer);
+			/* Timer/counter value is reset when disabled. */
+			data->async->rx.total_byte_cnt = 0;
+			data->async->rx.total_user_byte_cnt = 0;
 		}
 #endif
+	} else if (IS_ENABLED(UARTE_ANY_NONE_ASYNC))
+#endif
+	{
 		if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXSTARTED)) {
-#ifdef UARTE_INTERRUPT_DRIVEN
+#if defined(UARTE_INTERRUPT_DRIVEN) && defined(CONFIG_PM_DEVICE)
 			if (data->int_driven) {
 				data->int_driven->rx_irq_enabled =
-					nrf_uarte_int_enable_check(uarte,
-						NRF_UARTE_INT_ENDRX_MASK);
+						nrf_uarte_int_enable_check(uarte,
+							NRF_UARTE_INT_ENDRX_MASK);
 				if (data->int_driven->rx_irq_enabled) {
-					nrf_uarte_int_disable(uarte,
-						NRF_UARTE_INT_ENDRX_MASK);
+					nrf_uarte_int_disable(uarte, NRF_UARTE_INT_ENDRX_MASK);
 				}
 			}
 #endif
@@ -2257,21 +2200,114 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		}
 
 		wait_for_tx_stopped(dev);
-		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_TX | UARTE_FLAG_LOW_POWER_RX, 0);
+	}
 
-		ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_SLEEP);
-		if (ret < 0) {
-			return ret;
-		}
+	nrf_uarte_disable(uarte);
 
-		break;
-	default:
+	(void)pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_SLEEP);
+}
+
+static int uarte_nrfx_pm_action(const struct device *dev, enum pm_device_action action)
+{
+	if (action == PM_DEVICE_ACTION_RESUME) {
+		uarte_pm_resume(dev);
+	} else if (IS_ENABLED(CONFIG_PM_DEVICE) && (action == PM_DEVICE_ACTION_SUSPEND)) {
+		uarte_pm_suspend(dev);
+	} else {
 		return -ENOTSUP;
 	}
 
 	return 0;
 }
-#endif /* CONFIG_PM_DEVICE */
+
+static int uarte_tx_path_init(const struct device *dev)
+{
+	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
+	const struct uarte_nrfx_config *cfg = dev->config;
+	bool auto_endtx = false;
+
+#ifdef UARTE_HAS_ENDTX_STOPTX_SHORT
+	nrf_uarte_shorts_enable(uarte, NRF_UARTE_SHORT_ENDTX_STOPTX);
+	auto_endtx = true;
+#elif defined(UARTE_ENHANCED_POLL_OUT)
+	if (cfg->flags & UARTE_CFG_FLAG_PPI_ENDTX) {
+		struct uarte_nrfx_data *data = dev->data;
+		int err;
+
+		err = endtx_stoptx_ppi_init(uarte, data);
+		if (err < 0) {
+			return err;
+		}
+		auto_endtx = true;
+	}
+#endif
+
+	/* Get to the point where TXSTOPPED event is set but TXSTOPPED interrupt is
+	 * disabled. This trick is later on used to handle TX path and determine
+	 * using HW if TX is active (TXSTOPPED event set means TX is inactive).
+	 *
+	 * Set TXSTOPPED event by requesting fake (zero-length) transfer.
+	 * Pointer to RAM variable is set because otherwise such operation may
+	 * result in HardFault or RAM corruption.
+	 */
+	nrf_uarte_enable(uarte);
+	nrf_uarte_tx_buffer_set(uarte, cfg->poll_out_byte, 0);
+	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTTX);
+	if (!auto_endtx) {
+		while (!nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ENDTX)) {
+		}
+		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDTX);
+		nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPTX);
+		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_ENDTX_MASK);
+	}
+	while (!nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_TXSTOPPED)) {
+	}
+	nrf_uarte_disable(uarte);
+
+	return 0;
+}
+
+static int uarte_instance_init(const struct device *dev,
+			       uint8_t interrupts_active)
+{
+	int err;
+	const struct uarte_nrfx_config *cfg = dev->config;
+
+	if (IS_ENABLED(CONFIG_ARCH_POSIX)) {
+		/* For simulation the DT provided peripheral address needs to be corrected */
+		((struct pinctrl_dev_config *)cfg->pcfg)->reg = (uintptr_t)cfg->uarte_regs;
+	}
+
+#ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
+	err = uarte_nrfx_configure(dev, &((struct uarte_nrfx_data *)dev->data)->uart_config);
+	if (err) {
+		return err;
+	}
+#else
+	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
+
+	nrf_uarte_baudrate_set(uarte, cfg->nrf_baudrate);
+	nrf_uarte_configure(uarte, &cfg->hw_config);
+#endif
+
+#ifdef UARTE_ANY_ASYNC
+	struct uarte_nrfx_data *data = dev->data;
+
+	if (data->async) {
+		err = uarte_async_init(dev);
+		if (err < 0) {
+			return err;
+		}
+	}
+#endif
+
+	err = uarte_tx_path_init(dev);
+	if (err) {
+		return err;
+	}
+
+	return pm_device_driver_init(dev, uarte_nrfx_pm_action);
+}
 
 #define UARTE_IRQ_CONFIGURE(idx, isr_handler)				       \
 	do {								       \
@@ -2398,7 +2434,8 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 			IS_ENABLED(CONFIG_UART_##idx##_INTERRUPT_DRIVEN));     \
 	}								       \
 									       \
-	PM_DEVICE_DT_DEFINE(UARTE(idx), uarte_nrfx_pm_action);		       \
+	PM_DEVICE_DT_DEFINE(UARTE(idx), uarte_nrfx_pm_action,		       \
+			    PM_DEVICE_ISR_SAFE);			       \
 									       \
 	DEVICE_DT_DEFINE(UARTE(idx),					       \
 		      uarte_##idx##_init,				       \

From cae16c3003aadc1915b374fdeb8ff4626d104393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 25 Oct 2024 12:59:55 +0200
Subject: [PATCH 0465/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Improve
 RX FIFO flushing workaround
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Improved a workaround. When FIFO is not empty then FLUSHRX
task will generate RXSTARTED event to indicated that DMA transfer
was started. This property can be used to detect when FIFO was
not empty and workaroud a HW bug where RX.AMOUNT register is not
updated after flushing empty FIFO.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 68903ca8dded73a1dc6c6893e69e72c294673266)
(cherry picked from commit 81716921bae13bb9729108c2a7d8f644bdf62beb)
---
 drivers/serial/Kconfig.nrfx      | 10 ----
 drivers/serial/uart_nrfx_uarte.c | 88 ++++++++------------------------
 2 files changed, 22 insertions(+), 76 deletions(-)

diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx
index 6bd4b2d4591..ae790980f42 100644
--- a/drivers/serial/Kconfig.nrfx
+++ b/drivers/serial/Kconfig.nrfx
@@ -57,16 +57,6 @@ config UART_ASYNC_TX_CACHE_SIZE
 	  in RAM, because EasyDMA in UARTE peripherals can only transfer data
 	  from RAM.
 
-config UART_NRFX_UARTE_RX_FLUSH_MAGIC_BYTE
-	hex "Byte used for RX FIFO flush workaround"
-	default 0xAA
-	range 0x00 0xFF
-	help
-	  Byte used to fill the buffer before RX FIFO is flushed into it. Due to the
-	  HW anomaly a workaround need to be applied which checks if content of the
-	  buffer changed. There are cases when specific value of the magic byte is
-	  used if it is known that certain bytes are less likely to occur.
-
 if HAS_HW_NRF_UART0 || HAS_HW_NRF_UARTE0
 nrfx_uart_num = 0
 rsource "Kconfig.nrfx_uart_instance"
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index b22c50af096..6bc211a5351 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -25,7 +25,9 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 
+#if !defined(CONFIG_ARCH_POSIX)
 #define RX_FLUSH_WORKAROUND 1
+#endif
 
 #define UARTE(idx)                DT_NODELABEL(uart##idx)
 #define UARTE_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(UARTE(idx), prop)
@@ -695,9 +697,6 @@ static void uarte_disable_locked(const struct device *dev, uint32_t dis_mask, ui
 
 	nrf_uarte_disable(get_uarte_instance(dev));
 }
-#endif
-
-#ifdef UARTE_ANY_ASYNC
 
 static void rx_timeout(struct k_timer *timer);
 static void tx_timeout(struct k_timer *timer);
@@ -1437,85 +1436,45 @@ static void endrx_isr(const struct device *dev)
 #endif
 }
 
-/* Function for flushing internal RX fifo. Function can be called in case
- * flushed data is discarded or when data is valid and needs to be retrieved.
+/** @brief RX FIFO flushing
  *
- * However, UARTE does not update RXAMOUNT register if fifo is empty. Old value
- * remains. In certain cases it makes it impossible to distinguish between
- * case when fifo was empty and not. Function is trying to minimize chances of
- * error with following measures:
- * - RXAMOUNT is read before flushing and compared against value after flushing
- *   if they differ it indicates that data was flushed
- * - user buffer is dirtied and if RXAMOUNT did not changed it is checked if
- *   it is still dirty. If not then it indicates that data was flushed
- *
- * In other cases function indicates that fifo was empty. It means that if
- * number of bytes in the fifo equal last rx transfer length and data is equal
- * to dirty marker it will be discarded.
+ * Due to the HW bug which does not update RX.AMOUNT register when FIFO was empty
+ * a workaround is applied which checks RXSTARTED event. If that event is set it
+ * means that FIFO was not empty.
  *
  * @param dev Device.
- * @param buf Buffer for flushed data, null indicates that flushed data can be
- *	      dropped but we still want to get amount of data flushed.
- * @param len Buffer size, not used if @p buf is null.
  *
  * @return number of bytes flushed from the fifo.
  */
-
-static uint8_t rx_flush(const struct device *dev, uint8_t *buf)
+static uint8_t rx_flush(const struct device *dev)
 {
-	/* Flushing RX fifo requires buffer bigger than 4 bytes to empty fifo*/
-	static const uint8_t dirty = CONFIG_UART_NRFX_UARTE_RX_FLUSH_MAGIC_BYTE;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	const struct uarte_nrfx_config *config = dev->config;
-	uint32_t prev_rx_amount;
 	uint32_t rx_amount;
 
-	if (IS_ENABLED(RX_FLUSH_WORKAROUND)) {
-		memset(buf, dirty, UARTE_HW_RX_FIFO_SIZE);
-		if (IS_ENABLED(UARTE_ANY_CACHE) && (config->flags & UARTE_CFG_FLAG_CACHEABLE)) {
-			sys_cache_data_flush_range(buf, UARTE_HW_RX_FIFO_SIZE);
-		}
-		prev_rx_amount = nrf_uarte_rx_amount_get(uarte);
-	} else {
-		prev_rx_amount = 0;
-	}
-
-	nrf_uarte_rx_buffer_set(uarte, buf, UARTE_HW_RX_FIFO_SIZE);
-	/* Final part of handling RXTO event is in ENDRX interrupt
-	 * handler. ENDRX is generated as a result of FLUSHRX task.
-	 */
-	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
+	nrf_uarte_rx_buffer_set(uarte, config->rx_flush_buf, UARTE_HW_RX_FIFO_SIZE);
 	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_FLUSHRX);
 	while (!nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ENDRX)) {
 		/* empty */
 	}
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
-	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 
-	rx_amount = nrf_uarte_rx_amount_get(uarte);
-	if (!buf || !IS_ENABLED(RX_FLUSH_WORKAROUND)) {
-		return rx_amount;
-	}
-
-	if (rx_amount != prev_rx_amount) {
-		return rx_amount;
-	}
-
-	if (rx_amount > UARTE_HW_RX_FIFO_SIZE) {
-		return 0;
-	}
-
-	if (IS_ENABLED(UARTE_ANY_CACHE) && (config->flags & UARTE_CFG_FLAG_CACHEABLE)) {
-		sys_cache_data_invd_range(buf, UARTE_HW_RX_FIFO_SIZE);
+	if (!IS_ENABLED(RX_FLUSH_WORKAROUND)) {
+		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
+		rx_amount = nrf_uarte_rx_amount_get(uarte);
+	} else if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXSTARTED)) {
+		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
+		rx_amount = nrf_uarte_rx_amount_get(uarte);
+	} else {
+		rx_amount = 0;
 	}
 
-	for (int i = 0; i < rx_amount; i++) {
-		if (buf[i] != dirty) {
-			return rx_amount;
-		}
+	if (IS_ENABLED(UARTE_ANY_CACHE) && (config->flags & UARTE_CFG_FLAG_CACHEABLE) &&
+	    rx_amount) {
+		sys_cache_data_invd_range(config->rx_flush_buf, rx_amount);
 	}
 
-	return 0;
+	return rx_amount;
 }
 
 /* This handler is called when the receiver is stopped. If rx was aborted
@@ -1549,17 +1508,14 @@ static void rxto_isr(const struct device *dev)
 		async_rx->discard_fifo = false;
 #if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
 		if (HW_RX_COUNTING_ENABLED(config)) {
-			uint8_t buf[UARTE_HW_RX_FIFO_SIZE];
-
 			/* It need to be included because TIMER+PPI got RXDRDY events
 			 * and counted those flushed bytes.
 			 */
-			async_rx->total_user_byte_cnt += rx_flush(dev, buf);
-			(void)buf;
+			async_rx->total_user_byte_cnt += rx_flush(dev);
 		}
 #endif
 	} else {
-		async_rx->flush_cnt = rx_flush(dev, config->rx_flush_buf);
+		async_rx->flush_cnt = rx_flush(dev);
 	}
 
 #ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX

From cd31752dc9bd8f47363846f4a8b96ff99365d755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 7 Oct 2024 16:21:22 +0200
Subject: [PATCH 0466/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Use
 legacy shim by default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

So far new platforms did not use legacy shim but it shall
be now a default uart shim for all platforms.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 7e94fca0bdd8ee2499a00f947b0fc632fe1b301f)
(cherry picked from commit c3fd7fdd4e42fb46ecb202a751020785ba2a9a96)
---
 drivers/serial/Kconfig.nrfx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx
index ae790980f42..650404fceec 100644
--- a/drivers/serial/Kconfig.nrfx
+++ b/drivers/serial/Kconfig.nrfx
@@ -31,8 +31,6 @@ config UART_NRFX_UARTE
 config UART_NRFX_UARTE_LEGACY_SHIM
 	bool "Legacy UARTE shim"
 	depends on UART_NRFX_UARTE
-	depends on !SOC_SERIES_NRF54HX || RISCV
-	depends on !SOC_SERIES_NRF92X || RISCV
 	default y
 
 config UART_NRFX_UARTE_ENHANCED_RX

From 55aaf1469caf12c62fa82b775dc6ee83f8f0ca7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 22 Oct 2024 20:31:10 +0200
Subject: [PATCH 0467/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Minor
 code size optimization
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Optimize function which enables UARTE peripheral. It is called
only when interrupts are locked so data->flags does not require
atomic operation. Use standard logical operations so save few
bytes.

Simplify uarte_disable_locked.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 9ccaf9b5bdb68c393b8c14a82e1132266cc6b900)
(cherry picked from commit 055d020877e43430585cc670b433675309622dc7)
---
 drivers/serial/uart_nrfx_uarte.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 6bc211a5351..5c19485946c 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -219,6 +219,7 @@ struct uarte_nrfx_data {
 
 #define UARTE_FLAG_LOW_POWER_TX BIT(0)
 #define UARTE_FLAG_LOW_POWER_RX BIT(1)
+#define UARTE_FLAG_LOW_POWER (UARTE_FLAG_LOW_POWER_TX | UARTE_FLAG_LOW_POWER_RX)
 #define UARTE_FLAG_TRIG_RXTO BIT(2)
 #define UARTE_FLAG_POLL_OUT BIT(3)
 
@@ -617,11 +618,13 @@ static void uarte_periph_enable(const struct device *dev)
 	}
 }
 
-static void uarte_enable(const struct device *dev, uint32_t act_mask, uint32_t sec_mask)
+static void uarte_enable_locked(const struct device *dev, uint32_t act_mask)
 {
 	struct uarte_nrfx_data *data = dev->data;
+	bool already_active = (data->flags & UARTE_FLAG_LOW_POWER) != 0;
 
-	if (atomic_or(&data->flags, act_mask) & sec_mask) {
+	data->flags |= act_mask;
+	if (already_active) {
 		/* Second direction already enabled so UARTE is enabled. */
 		return;
 	}
@@ -657,7 +660,7 @@ static void tx_start(const struct device *dev, const uint8_t *buf, size_t len)
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_TXSTOPPED);
 
 	if (LOW_POWER_ENABLED(config)) {
-		uarte_enable(dev, UARTE_FLAG_LOW_POWER_TX, UARTE_FLAG_LOW_POWER_RX);
+		uarte_enable_locked(dev, UARTE_FLAG_LOW_POWER_TX);
 	}
 
 	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTTX);
@@ -673,14 +676,13 @@ static void tx_start(const struct device *dev, const uint8_t *buf, size_t len)
  * here.
  * @param dev Device.
  * @param dis_mask Mask of direction (RX or TX) which now longer uses the UARTE instance.
- * @param sec_mask Mask of second direction which is used to check if it uses the UARTE.
  */
-static void uarte_disable_locked(const struct device *dev, uint32_t dis_mask, uint32_t sec_mask)
+static void uarte_disable_locked(const struct device *dev, uint32_t dis_mask)
 {
 	struct uarte_nrfx_data *data = dev->data;
 
 	data->flags &= ~dis_mask;
-	if (data->flags & sec_mask) {
+	if (data->flags & UARTE_FLAG_LOW_POWER) {
 		return;
 	}
 
@@ -1056,7 +1058,7 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	} else if (LOW_POWER_ENABLED(cfg)) {
 		unsigned int key = irq_lock();
 
-		uarte_enable(dev, UARTE_FLAG_LOW_POWER_RX, UARTE_FLAG_LOW_POWER_TX);
+		uarte_enable_locked(dev, UARTE_FLAG_LOW_POWER_RX);
 		irq_unlock(key);
 	}
 
@@ -1531,7 +1533,7 @@ static void rxto_isr(const struct device *dev)
 	} else if (LOW_POWER_ENABLED(config)) {
 		uint32_t key = irq_lock();
 
-		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_RX, UARTE_FLAG_LOW_POWER_TX);
+		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_RX);
 		irq_unlock(key);
 	}
 
@@ -1558,7 +1560,7 @@ static void txstopped_isr(const struct device *dev)
 		}
 	} else if (LOW_POWER_ENABLED(config)) {
 		nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
-		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_TX, UARTE_FLAG_LOW_POWER_RX);
+		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_TX);
 	}
 
 	irq_unlock(key);

From 1a10e62204e0c71bffc64b0faee456f2b4d8a413 Mon Sep 17 00:00:00 2001
From: Riadh Ghaddab <rghaddab@baylibre.com>
Date: Mon, 26 Feb 2024 12:18:58 +0100
Subject: [PATCH 0468/2913] [nrf fromtree] fs: introduce ZMS a new Memory
 storage system

ZMS is the abreviation of Zephyr Memory Storage.
It is a storage developed to target especially the non erasable devices.

The new memory storage system inherit from the NVS storage multiple
features and introduce new ones :
* Inherited features :
 - light key-value based storage
 - cache for entries
 - Wear Leveling of flash memory
 - Resilience to power failures
* New features :
 - cycle counter for non erasable devices (instead of erase emulation)
 - Keys up to 32-bit
 - Built-in support of CRC32 for data
 - Small size data (<= 8 bytes) integrated within entries

Signed-off-by: Riadh Ghaddab <rghaddab@baylibre.com>
(cherry picked from commit d4e246dfa1f2fe09ba526dce38b218297b698948)
(cherry picked from commit d027f10ca0273694f027f12fee34c36312346005)
---
 include/zephyr/fs/zms.h      |  215 +++++
 subsys/fs/CMakeLists.txt     |    1 +
 subsys/fs/Kconfig            |    1 +
 subsys/fs/zms/CMakeLists.txt |    3 +
 subsys/fs/zms/Kconfig        |   57 ++
 subsys/fs/zms/zms.c          | 1752 ++++++++++++++++++++++++++++++++++
 subsys/fs/zms/zms_priv.h     |   76 ++
 7 files changed, 2105 insertions(+)
 create mode 100644 include/zephyr/fs/zms.h
 create mode 100644 subsys/fs/zms/CMakeLists.txt
 create mode 100644 subsys/fs/zms/Kconfig
 create mode 100644 subsys/fs/zms/zms.c
 create mode 100644 subsys/fs/zms/zms_priv.h

diff --git a/include/zephyr/fs/zms.h b/include/zephyr/fs/zms.h
new file mode 100644
index 00000000000..1155319d792
--- /dev/null
+++ b/include/zephyr/fs/zms.h
@@ -0,0 +1,215 @@
+/*  ZMS: Zephyr Memory Storage
+ *
+ * Copyright (c) 2024 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ZEPHYR_INCLUDE_FS_ZMS_H_
+#define ZEPHYR_INCLUDE_FS_ZMS_H_
+
+#include <zephyr/drivers/flash.h>
+#include <sys/types.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/toolchain.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Zephyr Memory Storage (ZMS)
+ * @defgroup zms Zephyr Memory Storage (ZMS)
+ * @ingroup file_system_storage
+ * @{
+ * @}
+ */
+
+/**
+ * @brief Zephyr Memory Storage Data Structures
+ * @defgroup zms_data_structures Zephyr Memory Storage Data Structures
+ * @ingroup zms
+ * @{
+ */
+
+/**
+ * @brief Zephyr Memory Storage File system structure
+ */
+struct zms_fs {
+	/** File system offset in flash **/
+	off_t offset;
+	/** Allocation table entry write address.
+	 * Addresses are stored as uint64_t:
+	 * - high 4 bytes correspond to the sector
+	 * - low 4 bytes are the offset in the sector
+	 */
+	uint64_t ate_wra;
+	/** Data write address */
+	uint64_t data_wra;
+	/** Storage system is split into sectors, each sector size must be multiple of erase-blocks
+	 *  if the device has erase capabilities
+	 */
+	uint32_t sector_size;
+	/** Number of sectors in the file system */
+	uint32_t sector_count;
+	/** Current cycle counter of the active sector (pointed by ate_wra)*/
+	uint8_t sector_cycle;
+	/** Flag indicating if the file system is initialized */
+	bool ready;
+	/** Mutex */
+	struct k_mutex zms_lock;
+	/** Flash device runtime structure */
+	const struct device *flash_device;
+	/** Flash memory parameters structure */
+	const struct flash_parameters *flash_parameters;
+	/** Size of an Allocation Table Entry */
+	size_t ate_size;
+#if CONFIG_ZMS_LOOKUP_CACHE
+	/** Lookup table used to cache ATE address of a written ID */
+	uint64_t lookup_cache[CONFIG_ZMS_LOOKUP_CACHE_SIZE];
+#endif
+};
+
+/**
+ * @}
+ */
+
+/**
+ * @brief Zephyr Memory Storage APIs
+ * @defgroup zms_high_level_api Zephyr Memory Storage APIs
+ * @ingroup zms
+ * @{
+ */
+
+/**
+ * @brief Mount a ZMS file system onto the device specified in @p fs.
+ *
+ * @param fs Pointer to file system
+ * @retval 0 Success
+ * @retval -ERRNO errno code if error
+ */
+int zms_mount(struct zms_fs *fs);
+
+/**
+ * @brief Clear the ZMS file system from device.
+ *
+ * @param fs Pointer to file system
+ * @retval 0 Success
+ * @retval -ERRNO errno code if error
+ */
+int zms_clear(struct zms_fs *fs);
+
+/**
+ * @brief Write an entry to the file system.
+ *
+ * @note  When @p len parameter is equal to @p 0 then entry is effectively removed (it is
+ * equivalent to calling of zms_delete). It is not possible to distinguish between a deleted
+ * entry and an entry with data of length 0.
+ *
+ * @param fs Pointer to file system
+ * @param id Id of the entry to be written
+ * @param data Pointer to the data to be written
+ * @param len Number of bytes to be written (maximum 64 KB)
+ *
+ * @return Number of bytes written. On success, it will be equal to the number of bytes requested
+ * to be written. When a rewrite of the same data already stored is attempted, nothing is written
+ * to flash, thus 0 is returned. On error, returns negative value of errno.h defined error codes.
+ */
+ssize_t zms_write(struct zms_fs *fs, uint32_t id, const void *data, size_t len);
+
+/**
+ * @brief Delete an entry from the file system
+ *
+ * @param fs Pointer to file system
+ * @param id Id of the entry to be deleted
+ * @retval 0 Success
+ * @retval -ERRNO errno code if error
+ */
+int zms_delete(struct zms_fs *fs, uint32_t id);
+
+/**
+ * @brief Read an entry from the file system.
+ *
+ * @param fs Pointer to file system
+ * @param id Id of the entry to be read
+ * @param data Pointer to data buffer
+ * @param len Number of bytes to be read (or size of the allocated read buffer)
+ *
+ * @return Number of bytes read. On success, it will be equal to the number of bytes requested
+ * to be read. When the return value is less than the number of bytes requested to read this
+ * indicates that ATE contain less data than requested. On error, returns negative value of
+ * errno.h defined error codes.
+ */
+ssize_t zms_read(struct zms_fs *fs, uint32_t id, void *data, size_t len);
+
+/**
+ * @brief Read a history entry from the file system.
+ *
+ * @param fs Pointer to file system
+ * @param id Id of the entry to be read
+ * @param data Pointer to data buffer
+ * @param len Number of bytes to be read
+ * @param cnt History counter: 0: latest entry, 1: one before latest ...
+ *
+ * @return Number of bytes read. On success, it will be equal to the number of bytes requested
+ * to be read. When the return value is larger than the number of bytes requested to read this
+ * indicates not all bytes were read, and more data is available. On error, returns negative
+ * value of errno.h defined error codes.
+ */
+ssize_t zms_read_hist(struct zms_fs *fs, uint32_t id, void *data, size_t len, uint32_t cnt);
+
+/**
+ * @brief Gets the data size that is stored in an entry with a given id
+ *
+ * @param fs Pointer to file system
+ * @param id Id of the entry that we want to get its data length
+ *
+ * @return Data length contained in the ATE. On success, it will be equal to the number of bytes
+ * in the ATE. On error, returns negative value of errno.h defined error codes.
+ */
+ssize_t zms_get_data_length(struct zms_fs *fs, uint32_t id);
+/**
+ * @brief Calculate the available free space in the file system.
+ *
+ * @param fs Pointer to file system
+ *
+ * @return Number of bytes free. On success, it will be equal to the number of bytes that can
+ * still be written to the file system.
+ * Calculating the free space is a time consuming operation, especially on spi flash.
+ * On error, returns negative value of errno.h defined error codes.
+ */
+ssize_t zms_calc_free_space(struct zms_fs *fs);
+
+/**
+ * @brief Tell how many contiguous free space remains in the currently active ZMS sector.
+ *
+ * @param fs Pointer to the file system.
+ *
+ * @return Number of free bytes.
+ */
+size_t zms_sector_max_data_size(struct zms_fs *fs);
+
+/**
+ * @brief Close the currently active sector and switch to the next one.
+ *
+ * @note The garbage collector is called on the new sector.
+ *
+ * @warning This routine is made available for specific use cases.
+ * It collides with the ZMS goal of avoiding any unnecessary flash erase operations.
+ * Using this routine extensively can result in premature failure of the flash device.
+ *
+ * @param fs Pointer to the file system.
+ *
+ * @return 0 on success. On error, returns negative value of errno.h defined error codes.
+ */
+int zms_sector_use_next(struct zms_fs *fs);
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_FS_ZMS_H_ */
diff --git a/subsys/fs/CMakeLists.txt b/subsys/fs/CMakeLists.txt
index fb774711543..825b8356381 100644
--- a/subsys/fs/CMakeLists.txt
+++ b/subsys/fs/CMakeLists.txt
@@ -25,6 +25,7 @@ endif()
 
 add_subdirectory_ifdef(CONFIG_FCB  ./fcb)
 add_subdirectory_ifdef(CONFIG_NVS  ./nvs)
+add_subdirectory_ifdef(CONFIG_ZMS  ./zms)
 
 if(CONFIG_FUSE_FS_ACCESS)
   zephyr_library_named(FS_FUSE)
diff --git a/subsys/fs/Kconfig b/subsys/fs/Kconfig
index 0a20aea7ee8..7029f84f5fd 100644
--- a/subsys/fs/Kconfig
+++ b/subsys/fs/Kconfig
@@ -99,5 +99,6 @@ endif # FILE_SYSTEM
 
 rsource "fcb/Kconfig"
 rsource "nvs/Kconfig"
+rsource "zms/Kconfig"
 
 endmenu
diff --git a/subsys/fs/zms/CMakeLists.txt b/subsys/fs/zms/CMakeLists.txt
new file mode 100644
index 00000000000..b6db8a3f57f
--- /dev/null
+++ b/subsys/fs/zms/CMakeLists.txt
@@ -0,0 +1,3 @@
+#SPDX-License-Identifier: Apache-2.0
+
+zephyr_sources(zms.c)
diff --git a/subsys/fs/zms/Kconfig b/subsys/fs/zms/Kconfig
new file mode 100644
index 00000000000..330ef11155c
--- /dev/null
+++ b/subsys/fs/zms/Kconfig
@@ -0,0 +1,57 @@
+#Zephyr Memory Storage ZMS
+
+#Copyright (c) 2024 BayLibre SAS
+
+#SPDX-License-Identifier: Apache-2.0
+
+config ZMS
+	bool "Zephyr Memory Storage"
+	select CRC
+	help
+	  Enable support of Zephyr Memory Storage.
+
+if ZMS
+
+config ZMS_LOOKUP_CACHE
+	bool "ZMS lookup cache"
+	help
+	  Enable ZMS cache to reduce the ZMS data lookup time.
+	  Each cache entry holds an address of the most recent allocation
+	  table entry (ATE) for all ZMS IDs that fall into that cache position.
+
+config ZMS_LOOKUP_CACHE_SIZE
+	int "ZMS Storage lookup cache size"
+	default 128
+	range 1 65536
+	depends on ZMS_LOOKUP_CACHE
+	help
+	  Number of entries in ZMS lookup cache.
+	  It is recommended that it should be a power of 2.
+	  Every additional entry in cache will add 8 bytes in RAM
+
+config ZMS_DATA_CRC
+	bool "ZMS DATA CRC"
+	help
+	  Enables DATA CRC
+
+config ZMS_CUSTOM_BLOCK_SIZE
+	bool "Custom buffer size used by ZMS for reads and writes"
+	help
+	  ZMS uses internal buffers to read/write and compare stored data.
+	  Increasing the size of these buffers should be done carefully in order to not
+	  overflow the stack.
+	  Increasing this buffer means as well that ZMS could work with storage devices
+	  that have larger write-block-size which decreases ZMS performance
+
+config ZMS_MAX_BLOCK_SIZE
+	int "ZMS internal buffer size"
+	default 32
+	depends on ZMS_CUSTOM_BLOCK_SIZE
+	help
+	  Changes the internal buffer size of ZMS
+
+module = ZMS
+module-str = zms
+source "subsys/logging/Kconfig.template.log_config"
+
+endif # ZMS
diff --git a/subsys/fs/zms/zms.c b/subsys/fs/zms/zms.c
new file mode 100644
index 00000000000..21930313109
--- /dev/null
+++ b/subsys/fs/zms/zms.c
@@ -0,0 +1,1752 @@
+/*  ZMS: Zephyr Memory Storage
+ *
+ * Copyright (c) 2024 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <string.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <zephyr/fs/zms.h>
+#include <zephyr/sys/crc.h>
+#include "zms_priv.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(fs_zms, CONFIG_ZMS_LOG_LEVEL);
+
+static int zms_prev_ate(struct zms_fs *fs, uint64_t *addr, struct zms_ate *ate);
+static int zms_ate_valid(struct zms_fs *fs, const struct zms_ate *entry);
+static int zms_get_sector_cycle(struct zms_fs *fs, uint64_t addr, uint8_t *cycle_cnt);
+static int zms_get_sector_header(struct zms_fs *fs, uint64_t addr, struct zms_ate *empty_ate,
+				 struct zms_ate *close_ate);
+static int zms_ate_valid_different_sector(struct zms_fs *fs, const struct zms_ate *entry,
+					  uint8_t cycle_cnt);
+
+#ifdef CONFIG_ZMS_LOOKUP_CACHE
+
+static inline size_t zms_lookup_cache_pos(uint32_t id)
+{
+	uint32_t hash;
+
+	/* 32-bit integer hash function found by https://github.com/skeeto/hash-prospector. */
+	hash = id;
+	hash ^= hash >> 16;
+	hash *= 0x7feb352dU;
+	hash ^= hash >> 15;
+	hash *= 0x846ca68bU;
+	hash ^= hash >> 16;
+
+	return hash % CONFIG_ZMS_LOOKUP_CACHE_SIZE;
+}
+
+static int zms_lookup_cache_rebuild(struct zms_fs *fs)
+{
+	int rc, previous_sector_num = ZMS_INVALID_SECTOR_NUM;
+	uint64_t addr, ate_addr;
+	uint64_t *cache_entry;
+	uint8_t current_cycle;
+	struct zms_ate ate;
+
+	memset(fs->lookup_cache, 0xff, sizeof(fs->lookup_cache));
+	addr = fs->ate_wra;
+
+	while (true) {
+		/* Make a copy of 'addr' as it will be advanced by zms_prev_ate() */
+		ate_addr = addr;
+		rc = zms_prev_ate(fs, &addr, &ate);
+
+		if (rc) {
+			return rc;
+		}
+
+		cache_entry = &fs->lookup_cache[zms_lookup_cache_pos(ate.id)];
+
+		if (ate.id != ZMS_HEAD_ID && *cache_entry == ZMS_LOOKUP_CACHE_NO_ADDR) {
+			/* read the ate cycle only when we change the sector
+			 * or if it is the first read
+			 */
+			if (SECTOR_NUM(ate_addr) != previous_sector_num) {
+				rc = zms_get_sector_cycle(fs, ate_addr, &current_cycle);
+				if (rc == -ENOENT) {
+					/* sector never used */
+					current_cycle = 0;
+				} else if (rc) {
+					/* bad flash read */
+					return rc;
+				}
+			}
+			if (zms_ate_valid_different_sector(fs, &ate, current_cycle)) {
+				*cache_entry = ate_addr;
+			}
+			previous_sector_num = SECTOR_NUM(ate_addr);
+		}
+
+		if (addr == fs->ate_wra) {
+			break;
+		}
+	}
+
+	return 0;
+}
+
+static void zms_lookup_cache_invalidate(struct zms_fs *fs, uint32_t sector)
+{
+	uint64_t *cache_entry = fs->lookup_cache;
+	uint64_t *const cache_end = &fs->lookup_cache[CONFIG_ZMS_LOOKUP_CACHE_SIZE];
+
+	for (; cache_entry < cache_end; ++cache_entry) {
+		if (SECTOR_NUM(*cache_entry) == sector) {
+			*cache_entry = ZMS_LOOKUP_CACHE_NO_ADDR;
+		}
+	}
+}
+
+#endif /* CONFIG_ZMS_LOOKUP_CACHE */
+
+/* Helper to compute offset given the address */
+static inline off_t zms_addr_to_offset(struct zms_fs *fs, uint64_t addr)
+{
+	return fs->offset + (fs->sector_size * SECTOR_NUM(addr)) + SECTOR_OFFSET(addr);
+}
+
+/* zms_al_size returns size aligned to fs->write_block_size */
+static inline size_t zms_al_size(struct zms_fs *fs, size_t len)
+{
+	size_t write_block_size = fs->flash_parameters->write_block_size;
+
+	if (write_block_size <= 1U) {
+		return len;
+	}
+	return (len + (write_block_size - 1U)) & ~(write_block_size - 1U);
+}
+
+/* Helper to get empty ATE address */
+static inline uint64_t zms_empty_ate_addr(struct zms_fs *fs, uint64_t addr)
+{
+	return (addr & ADDR_SECT_MASK) + fs->sector_size - fs->ate_size;
+}
+
+/* Helper to get close ATE address */
+static inline uint64_t zms_close_ate_addr(struct zms_fs *fs, uint64_t addr)
+{
+	return (addr & ADDR_SECT_MASK) + fs->sector_size - 2 * fs->ate_size;
+}
+
+/* Aligned memory write */
+static int zms_flash_al_wrt(struct zms_fs *fs, uint64_t addr, const void *data, size_t len)
+{
+	const uint8_t *data8 = (const uint8_t *)data;
+	int rc = 0;
+	off_t offset;
+	size_t blen;
+	uint8_t buf[ZMS_BLOCK_SIZE];
+
+	if (!len) {
+		/* Nothing to write, avoid changing the flash protection */
+		return 0;
+	}
+
+	offset = zms_addr_to_offset(fs, addr);
+
+	blen = len & ~(fs->flash_parameters->write_block_size - 1U);
+	if (blen > 0) {
+		rc = flash_write(fs->flash_device, offset, data8, blen);
+		if (rc) {
+			/* flash write error */
+			goto end;
+		}
+		len -= blen;
+		offset += blen;
+		data8 += blen;
+	}
+	if (len) {
+		memcpy(buf, data8, len);
+		(void)memset(buf + len, fs->flash_parameters->erase_value,
+			     fs->flash_parameters->write_block_size - len);
+
+		rc = flash_write(fs->flash_device, offset, buf,
+				 fs->flash_parameters->write_block_size);
+	}
+
+end:
+	return rc;
+}
+
+/* basic flash read from zms address */
+static int zms_flash_rd(struct zms_fs *fs, uint64_t addr, void *data, size_t len)
+{
+	off_t offset;
+
+	offset = zms_addr_to_offset(fs, addr);
+
+	return flash_read(fs->flash_device, offset, data, len);
+}
+
+/* allocation entry write */
+static int zms_flash_ate_wrt(struct zms_fs *fs, const struct zms_ate *entry)
+{
+	int rc;
+
+	rc = zms_flash_al_wrt(fs, fs->ate_wra, entry, sizeof(struct zms_ate));
+	if (rc) {
+		goto end;
+	}
+#ifdef CONFIG_ZMS_LOOKUP_CACHE
+	/* 0xFFFFFFFF is a special-purpose identifier. Exclude it from the cache */
+	if (entry->id != ZMS_HEAD_ID) {
+		fs->lookup_cache[zms_lookup_cache_pos(entry->id)] = fs->ate_wra;
+	}
+#endif
+	fs->ate_wra -= zms_al_size(fs, sizeof(struct zms_ate));
+end:
+	return rc;
+}
+
+/* data write */
+static int zms_flash_data_wrt(struct zms_fs *fs, const void *data, size_t len)
+{
+	int rc;
+
+	rc = zms_flash_al_wrt(fs, fs->data_wra, data, len);
+	if (rc < 0) {
+		return rc;
+	}
+	fs->data_wra += zms_al_size(fs, len);
+
+	return 0;
+}
+
+/* flash ate read */
+static int zms_flash_ate_rd(struct zms_fs *fs, uint64_t addr, struct zms_ate *entry)
+{
+	return zms_flash_rd(fs, addr, entry, sizeof(struct zms_ate));
+}
+
+/* zms_flash_block_cmp compares the data in flash at addr to data
+ * in blocks of size ZMS_BLOCK_SIZE aligned to fs->write_block_size
+ * returns 0 if equal, 1 if not equal, errcode if error
+ */
+static int zms_flash_block_cmp(struct zms_fs *fs, uint64_t addr, const void *data, size_t len)
+{
+	const uint8_t *data8 = (const uint8_t *)data;
+	int rc;
+	size_t bytes_to_cmp, block_size;
+	uint8_t buf[ZMS_BLOCK_SIZE];
+
+	block_size = ZMS_BLOCK_SIZE & ~(fs->flash_parameters->write_block_size - 1U);
+
+	while (len) {
+		bytes_to_cmp = MIN(block_size, len);
+		rc = zms_flash_rd(fs, addr, buf, bytes_to_cmp);
+		if (rc) {
+			return rc;
+		}
+		rc = memcmp(data8, buf, bytes_to_cmp);
+		if (rc) {
+			return 1;
+		}
+		len -= bytes_to_cmp;
+		addr += bytes_to_cmp;
+		data8 += bytes_to_cmp;
+	}
+	return 0;
+}
+
+/* zms_flash_cmp_const compares the data in flash at addr to a constant
+ * value. returns 0 if all data in flash is equal to value, 1 if not equal,
+ * errcode if error
+ */
+static int zms_flash_cmp_const(struct zms_fs *fs, uint64_t addr, uint8_t value, size_t len)
+{
+	int rc;
+	size_t bytes_to_cmp, block_size;
+	uint8_t cmp[ZMS_BLOCK_SIZE];
+
+	block_size = ZMS_BLOCK_SIZE & ~(fs->flash_parameters->write_block_size - 1U);
+
+	(void)memset(cmp, value, block_size);
+	while (len) {
+		bytes_to_cmp = MIN(block_size, len);
+		rc = zms_flash_block_cmp(fs, addr, cmp, bytes_to_cmp);
+		if (rc) {
+			return rc;
+		}
+		len -= bytes_to_cmp;
+		addr += bytes_to_cmp;
+	}
+	return 0;
+}
+
+/* flash block move: move a block at addr to the current data write location
+ * and updates the data write location.
+ */
+static int zms_flash_block_move(struct zms_fs *fs, uint64_t addr, size_t len)
+{
+	int rc;
+	size_t bytes_to_copy, block_size;
+	uint8_t buf[ZMS_BLOCK_SIZE];
+
+	block_size = ZMS_BLOCK_SIZE & ~(fs->flash_parameters->write_block_size - 1U);
+
+	while (len) {
+		bytes_to_copy = MIN(block_size, len);
+		rc = zms_flash_rd(fs, addr, buf, bytes_to_copy);
+		if (rc) {
+			return rc;
+		}
+		rc = zms_flash_data_wrt(fs, buf, bytes_to_copy);
+		if (rc) {
+			return rc;
+		}
+		len -= bytes_to_copy;
+		addr += bytes_to_copy;
+	}
+	return 0;
+}
+
+/* erase a sector and verify erase was OK.
+ * return 0 if OK, errorcode on error.
+ */
+static int zms_flash_erase_sector(struct zms_fs *fs, uint64_t addr)
+{
+	int rc;
+	off_t offset;
+	bool ebw_required =
+		flash_params_get_erase_cap(fs->flash_parameters) & FLASH_ERASE_C_EXPLICIT;
+
+	if (!ebw_required) {
+		/* Do nothing for devices that do not have erase capability */
+		return 0;
+	}
+
+	addr &= ADDR_SECT_MASK;
+	offset = zms_addr_to_offset(fs, addr);
+
+	LOG_DBG("Erasing flash at offset 0x%lx ( 0x%llx ), len %u", (long)offset, addr,
+		fs->sector_size);
+
+#ifdef CONFIG_ZMS_LOOKUP_CACHE
+	zms_lookup_cache_invalidate(fs, SECTOR_NUM(addr));
+#endif
+	rc = flash_erase(fs->flash_device, offset, fs->sector_size);
+
+	if (rc) {
+		return rc;
+	}
+
+	if (zms_flash_cmp_const(fs, addr, fs->flash_parameters->erase_value, fs->sector_size)) {
+		LOG_ERR("Failure while erasing the sector at offset 0x%lx", (long)offset);
+		rc = -ENXIO;
+	}
+
+	return rc;
+}
+
+/* crc update on allocation entry */
+static void zms_ate_crc8_update(struct zms_ate *entry)
+{
+	uint8_t crc8;
+
+	/* crc8 field is the first element of the structure, do not include it */
+	crc8 = crc8_ccitt(0xff, (uint8_t *)entry + SIZEOF_FIELD(struct zms_ate, crc8),
+			  sizeof(struct zms_ate) - SIZEOF_FIELD(struct zms_ate, crc8));
+	entry->crc8 = crc8;
+}
+
+/* crc check on allocation entry
+ * returns 0 if OK, 1 on crc fail
+ */
+static int zms_ate_crc8_check(const struct zms_ate *entry)
+{
+	uint8_t crc8;
+
+	/* crc8 field is the first element of the structure, do not include it */
+	crc8 = crc8_ccitt(0xff, (uint8_t *)entry + SIZEOF_FIELD(struct zms_ate, crc8),
+			  sizeof(struct zms_ate) - SIZEOF_FIELD(struct zms_ate, crc8));
+	if (crc8 == entry->crc8) {
+		return 0;
+	}
+
+	return 1;
+}
+
+/* zms_ate_valid validates an ate:
+ *     return 1 if crc8 and cycle_cnt valid,
+ *            0 otherwise
+ */
+static int zms_ate_valid(struct zms_fs *fs, const struct zms_ate *entry)
+{
+	if ((fs->sector_cycle != entry->cycle_cnt) || zms_ate_crc8_check(entry)) {
+		return 0;
+	}
+
+	return 1;
+}
+
+/* zms_ate_valid_different_sector validates an ate that is in a different
+ * sector than the active one. It takes as argument the cycle_cnt of the
+ * sector where the ATE to be validated is stored
+ *     return 1 if crc8 and cycle_cnt are valid,
+ *            0 otherwise
+ */
+static int zms_ate_valid_different_sector(struct zms_fs *fs, const struct zms_ate *entry,
+					  uint8_t cycle_cnt)
+{
+	if ((cycle_cnt != entry->cycle_cnt) || zms_ate_crc8_check(entry)) {
+		return 0;
+	}
+
+	return 1;
+}
+
+static inline int zms_get_cycle_on_sector_change(struct zms_fs *fs, uint64_t addr,
+						 int previous_sector_num, uint8_t *cycle_cnt)
+{
+	int rc;
+
+	/* read the ate cycle only when we change the sector
+	 * or if it is the first read
+	 */
+	if (SECTOR_NUM(addr) != previous_sector_num) {
+		rc = zms_get_sector_cycle(fs, addr, cycle_cnt);
+		if (rc == -ENOENT) {
+			/* sector never used */
+			*cycle_cnt = 0;
+		} else if (rc) {
+			/* bad flash read */
+			return rc;
+		}
+	}
+
+	return 0;
+}
+
+/* zms_close_ate_valid validates an sector close ate: a valid sector close ate:
+ * - valid ate
+ * - len = 0 and id = ZMS_HEAD_ID
+ * - offset points to location at ate multiple from sector size
+ * return true if valid, false otherwise
+ */
+static bool zms_close_ate_valid(struct zms_fs *fs, const struct zms_ate *entry)
+{
+	return (zms_ate_valid_different_sector(fs, entry, entry->cycle_cnt) && (!entry->len) &&
+		(entry->id == ZMS_HEAD_ID) && !((fs->sector_size - entry->offset) % fs->ate_size));
+}
+
+/* zms_empty_ate_valid validates an sector empty ate: a valid sector empty ate:
+ * - valid ate
+ * - len = 0xffff and id = 0xffffffff
+ * return true if valid, false otherwise
+ */
+static bool zms_empty_ate_valid(struct zms_fs *fs, const struct zms_ate *entry)
+{
+	return (zms_ate_valid_different_sector(fs, entry, entry->cycle_cnt) &&
+		(entry->len == 0xffff) && (entry->id == ZMS_HEAD_ID));
+}
+
+/* zms_gc_done_ate_valid validates a garbage collector done ATE
+ * Valid gc_done_ate:
+ * - valid ate
+ * - len = 0
+ * - id = 0xffffffff
+ * return true if valid, false otherwise
+ */
+static bool zms_gc_done_ate_valid(struct zms_fs *fs, const struct zms_ate *entry)
+{
+	return (zms_ate_valid_different_sector(fs, entry, entry->cycle_cnt) && (!entry->len) &&
+		(entry->id == ZMS_HEAD_ID));
+}
+
+/* Read empty and close ATE of the sector where belongs address "addr" and
+ * validates that the sector is closed.
+ * retval: 0 if sector is not close
+ * retval: 1 is sector is closed
+ * retval: < 0 if read of the header failed.
+ */
+static int zms_validate_closed_sector(struct zms_fs *fs, uint64_t addr, struct zms_ate *empty_ate,
+				      struct zms_ate *close_ate)
+{
+	int rc;
+
+	/* read the header ATEs */
+	rc = zms_get_sector_header(fs, addr, empty_ate, close_ate);
+	if (rc) {
+		return rc;
+	}
+
+	if (zms_empty_ate_valid(fs, empty_ate) && zms_close_ate_valid(fs, close_ate) &&
+	    (empty_ate->cycle_cnt == close_ate->cycle_cnt)) {
+		/* Closed sector validated */
+		return 1;
+	}
+
+	return 0;
+}
+
+/* store an entry in flash */
+static int zms_flash_write_entry(struct zms_fs *fs, uint32_t id, const void *data, size_t len)
+{
+	int rc;
+	struct zms_ate entry;
+
+	/* Initialize all members to 0 */
+	memset(&entry, 0, sizeof(struct zms_ate));
+
+	entry.id = id;
+	entry.len = (uint16_t)len;
+	entry.cycle_cnt = fs->sector_cycle;
+
+	if (len > ZMS_DATA_IN_ATE_SIZE) {
+		/* only compute CRC if len is greater than 8 bytes */
+		if (IS_ENABLED(CONFIG_ZMS_DATA_CRC)) {
+			entry.data_crc = crc32_ieee(data, len);
+		}
+		entry.offset = (uint32_t)SECTOR_OFFSET(fs->data_wra);
+	} else if ((len > 0) && (len <= ZMS_DATA_IN_ATE_SIZE)) {
+		/* Copy data into entry for small data ( < 8B) */
+		memcpy(&entry.data, data, len);
+	}
+
+	zms_ate_crc8_update(&entry);
+
+	if (len > ZMS_DATA_IN_ATE_SIZE) {
+		rc = zms_flash_data_wrt(fs, data, len);
+		if (rc) {
+			return rc;
+		}
+	}
+
+	rc = zms_flash_ate_wrt(fs, &entry);
+	if (rc) {
+		return rc;
+	}
+
+	return 0;
+}
+
+/* end of flash routines */
+
+/* Search for the last valid ATE written in a sector and also update data write address
+ */
+static int zms_recover_last_ate(struct zms_fs *fs, uint64_t *addr, uint64_t *data_wra)
+{
+	uint64_t data_end_addr, ate_end_addr;
+	struct zms_ate end_ate;
+	int rc;
+
+	LOG_DBG("Recovering last ate from sector %llu", SECTOR_NUM(*addr));
+
+	/* skip close and empty ATE */
+	*addr -= 2 * fs->ate_size;
+
+	ate_end_addr = *addr;
+	data_end_addr = *addr & ADDR_SECT_MASK;
+	/* Initialize the data_wra to the first address of the sector */
+	*data_wra = data_end_addr;
+
+	while (ate_end_addr > data_end_addr) {
+		rc = zms_flash_ate_rd(fs, ate_end_addr, &end_ate);
+		if (rc) {
+			return rc;
+		}
+		if (zms_ate_valid(fs, &end_ate)) {
+			/* found a valid ate, update data_end_addr and *addr */
+			data_end_addr &= ADDR_SECT_MASK;
+			if (end_ate.len > ZMS_DATA_IN_ATE_SIZE) {
+				data_end_addr += end_ate.offset + zms_al_size(fs, end_ate.len);
+				*data_wra = data_end_addr;
+			}
+			*addr = ate_end_addr;
+		}
+		ate_end_addr -= fs->ate_size;
+	}
+
+	return 0;
+}
+
+/* compute previous addr of ATE */
+static int zms_compute_prev_addr(struct zms_fs *fs, uint64_t *addr)
+{
+	int sec_closed;
+	struct zms_ate empty_ate, close_ate;
+
+	*addr += fs->ate_size;
+	if ((SECTOR_OFFSET(*addr)) != (fs->sector_size - 2 * fs->ate_size)) {
+		return 0;
+	}
+
+	/* last ate in sector, do jump to previous sector */
+	if (SECTOR_NUM(*addr) == 0U) {
+		*addr += ((uint64_t)(fs->sector_count - 1) << ADDR_SECT_SHIFT);
+	} else {
+		*addr -= (1ULL << ADDR_SECT_SHIFT);
+	}
+
+	/* verify if the sector is closed */
+	sec_closed = zms_validate_closed_sector(fs, *addr, &empty_ate, &close_ate);
+	if (sec_closed < 0) {
+		return sec_closed;
+	}
+
+	/* Non Closed Sector */
+	if (!sec_closed) {
+		/* at the end of filesystem */
+		*addr = fs->ate_wra;
+		return 0;
+	}
+
+	/* Update the address here because the header ATEs are valid.*/
+	(*addr) &= ADDR_SECT_MASK;
+	(*addr) += close_ate.offset;
+
+	return 0;
+}
+
+/* walking through allocation entry list, from newest to oldest entries
+ * read ate from addr, modify addr to the previous ate
+ */
+static int zms_prev_ate(struct zms_fs *fs, uint64_t *addr, struct zms_ate *ate)
+{
+	int rc;
+
+	rc = zms_flash_ate_rd(fs, *addr, ate);
+	if (rc) {
+		return rc;
+	}
+
+	return zms_compute_prev_addr(fs, addr);
+}
+
+static void zms_sector_advance(struct zms_fs *fs, uint64_t *addr)
+{
+	*addr += (1ULL << ADDR_SECT_SHIFT);
+	if ((*addr >> ADDR_SECT_SHIFT) == fs->sector_count) {
+		*addr -= ((uint64_t)fs->sector_count << ADDR_SECT_SHIFT);
+	}
+}
+
+/* allocation entry close (this closes the current sector) by writing offset
+ * of last ate to the sector end.
+ */
+static int zms_sector_close(struct zms_fs *fs)
+{
+	int rc;
+	struct zms_ate close_ate, garbage_ate;
+
+	close_ate.id = ZMS_HEAD_ID;
+	close_ate.len = 0U;
+	close_ate.offset = (uint32_t)SECTOR_OFFSET(fs->ate_wra + fs->ate_size);
+	close_ate.metadata = 0xffffffff;
+	close_ate.cycle_cnt = fs->sector_cycle;
+
+	/* When we close the sector, we must write all non used ATE with
+	 * a non valid (Junk) ATE.
+	 * This is needed to avoid some corner cases where some ATEs are
+	 * not overwritten and become valid when the cycle counter wrap again
+	 * to the same cycle counter of the old ATE.
+	 * Example :
+	 * - An ATE.cycl_cnt == 0 is written as last ATE of the sector
+	   - This ATE was never overwritten in the next 255 cycles because of
+	     large data size
+	   - Next 256th cycle the leading cycle_cnt is 0, this ATE becomes
+	     valid even if it is not the case.
+	 */
+	memset(&garbage_ate, fs->flash_parameters->erase_value, sizeof(garbage_ate));
+	while (SECTOR_OFFSET(fs->ate_wra) && (fs->ate_wra >= fs->data_wra)) {
+		rc = zms_flash_ate_wrt(fs, &garbage_ate);
+		if (rc) {
+			return rc;
+		}
+	}
+
+	fs->ate_wra = zms_close_ate_addr(fs, fs->ate_wra);
+
+	zms_ate_crc8_update(&close_ate);
+
+	(void)zms_flash_ate_wrt(fs, &close_ate);
+
+	zms_sector_advance(fs, &fs->ate_wra);
+
+	rc = zms_get_sector_cycle(fs, fs->ate_wra, &fs->sector_cycle);
+	if (rc == -ENOENT) {
+		/* sector never used */
+		fs->sector_cycle = 0;
+	} else if (rc) {
+		/* bad flash read */
+		return rc;
+	}
+
+	fs->data_wra = fs->ate_wra & ADDR_SECT_MASK;
+
+	return 0;
+}
+
+static int zms_add_gc_done_ate(struct zms_fs *fs)
+{
+	struct zms_ate gc_done_ate;
+
+	LOG_DBG("Adding gc done ate at %llx", fs->ate_wra);
+	gc_done_ate.id = ZMS_HEAD_ID;
+	gc_done_ate.len = 0U;
+	gc_done_ate.offset = (uint32_t)SECTOR_OFFSET(fs->data_wra);
+	gc_done_ate.metadata = 0xffffffff;
+	gc_done_ate.cycle_cnt = fs->sector_cycle;
+
+	zms_ate_crc8_update(&gc_done_ate);
+
+	return zms_flash_ate_wrt(fs, &gc_done_ate);
+}
+
+static int zms_add_empty_ate(struct zms_fs *fs, uint64_t addr)
+{
+	struct zms_ate empty_ate;
+	uint8_t cycle_cnt;
+	int rc = 0;
+	uint64_t previous_ate_wra;
+
+	addr &= ADDR_SECT_MASK;
+
+	LOG_DBG("Adding empty ate at %llx", (uint64_t)(addr + fs->sector_size - fs->ate_size));
+	empty_ate.id = ZMS_HEAD_ID;
+	empty_ate.len = 0xffff;
+	empty_ate.offset = 0U;
+	empty_ate.metadata =
+		FIELD_PREP(ZMS_MAGIC_NUMBER_MASK, ZMS_MAGIC_NUMBER) | ZMS_DEFAULT_VERSION;
+
+	rc = zms_get_sector_cycle(fs, addr, &cycle_cnt);
+	if (rc == -ENOENT) {
+		/* sector never used */
+		cycle_cnt = 0;
+	} else if (rc) {
+		/* bad flash read */
+		return rc;
+	}
+
+	/* increase cycle counter */
+	empty_ate.cycle_cnt = (cycle_cnt + 1) % BIT(8);
+	zms_ate_crc8_update(&empty_ate);
+
+	/* Adding empty ate to this sector changes fs->ate_wra value
+	 * Restore the ate_wra of the current sector after this
+	 */
+	previous_ate_wra = fs->ate_wra;
+	fs->ate_wra = zms_empty_ate_addr(fs, addr);
+	rc = zms_flash_ate_wrt(fs, &empty_ate);
+	if (rc) {
+		return rc;
+	}
+	fs->ate_wra = previous_ate_wra;
+
+	return 0;
+}
+
+static int zms_get_sector_cycle(struct zms_fs *fs, uint64_t addr, uint8_t *cycle_cnt)
+{
+	int rc;
+	struct zms_ate empty_ate;
+	uint64_t empty_addr;
+
+	empty_addr = zms_empty_ate_addr(fs, addr);
+
+	/* read the cycle counter of the current sector */
+	rc = zms_flash_ate_rd(fs, empty_addr, &empty_ate);
+	if (rc < 0) {
+		/* flash error */
+		return rc;
+	}
+
+	if (zms_empty_ate_valid(fs, &empty_ate)) {
+		*cycle_cnt = empty_ate.cycle_cnt;
+		return 0;
+	}
+
+	/* there is no empty ATE in this sector */
+	return -ENOENT;
+}
+
+static int zms_get_sector_header(struct zms_fs *fs, uint64_t addr, struct zms_ate *empty_ate,
+				 struct zms_ate *close_ate)
+{
+	int rc;
+	uint64_t close_addr;
+
+	close_addr = zms_close_ate_addr(fs, addr);
+	/* read the second ate in the sector to get the close ATE */
+	rc = zms_flash_ate_rd(fs, close_addr, close_ate);
+	if (rc) {
+		return rc;
+	}
+
+	/* read the first ate in the sector to get the empty ATE */
+	rc = zms_flash_ate_rd(fs, close_addr + fs->ate_size, empty_ate);
+	if (rc) {
+		return rc;
+	}
+
+	return 0;
+}
+
+/**
+ * @brief Helper to find an ATE using its ID
+ *
+ * @param fs Pointer to file system
+ * @param id Id of the entry to be found
+ * @param start_addr Address from where the search will start
+ * @param end_addr Address where the search will stop
+ * @param ate pointer to the found ATE if it exists
+ * @param ate_addr Pointer to the address of the found ATE
+ *
+ * @retval 0 No ATE is found
+ * @retval 1 valid ATE with same ID found
+ * @retval < 0 An error happened
+ */
+static int zms_find_ate_with_id(struct zms_fs *fs, uint32_t id, uint64_t start_addr,
+				uint64_t end_addr, struct zms_ate *ate, uint64_t *ate_addr)
+{
+	int rc;
+	int previous_sector_num = ZMS_INVALID_SECTOR_NUM;
+	uint64_t wlk_prev_addr, wlk_addr;
+	int prev_found = 0;
+	struct zms_ate wlk_ate;
+	uint8_t current_cycle;
+
+	wlk_addr = start_addr;
+
+	do {
+		wlk_prev_addr = wlk_addr;
+		rc = zms_prev_ate(fs, &wlk_addr, &wlk_ate);
+		if (rc) {
+			return rc;
+		}
+		if (wlk_ate.id == id) {
+			/* read the ate cycle only when we change the sector or if it is
+			 * the first read ( previous_sector_num == ZMS_INVALID_SECTOR_NUM).
+			 */
+			rc = zms_get_cycle_on_sector_change(fs, wlk_prev_addr, previous_sector_num,
+							    &current_cycle);
+			if (rc) {
+				return rc;
+			}
+			if (zms_ate_valid_different_sector(fs, &wlk_ate, current_cycle)) {
+				prev_found = 1;
+				break;
+			}
+			previous_sector_num = SECTOR_NUM(wlk_prev_addr);
+		}
+	} while (wlk_addr != end_addr);
+
+	*ate = wlk_ate;
+	*ate_addr = wlk_prev_addr;
+
+	return prev_found;
+}
+
+/* garbage collection: the address ate_wra has been updated to the new sector
+ * that has just been started. The data to gc is in the sector after this new
+ * sector.
+ */
+static int zms_gc(struct zms_fs *fs)
+{
+	int rc, sec_closed;
+	struct zms_ate close_ate, gc_ate, wlk_ate, empty_ate;
+	uint64_t sec_addr, gc_addr, gc_prev_addr, wlk_addr, wlk_prev_addr, data_addr, stop_addr;
+	uint8_t previous_cycle = 0;
+
+	rc = zms_get_sector_cycle(fs, fs->ate_wra, &fs->sector_cycle);
+	if (rc == -ENOENT) {
+		/* Erase this new unused sector if needed */
+		rc = zms_flash_erase_sector(fs, fs->ate_wra);
+		if (rc) {
+			return rc;
+		}
+		/* sector never used */
+		rc = zms_add_empty_ate(fs, fs->ate_wra);
+		if (rc) {
+			return rc;
+		}
+		/* At this step we are sure that empty ATE exist.
+		 * If not, then there is an I/O problem.
+		 */
+		rc = zms_get_sector_cycle(fs, fs->ate_wra, &fs->sector_cycle);
+		if (rc) {
+			return rc;
+		}
+	} else if (rc) {
+		/* bad flash read */
+		return rc;
+	}
+	previous_cycle = fs->sector_cycle;
+
+	sec_addr = (fs->ate_wra & ADDR_SECT_MASK);
+	zms_sector_advance(fs, &sec_addr);
+	gc_addr = sec_addr + fs->sector_size - fs->ate_size;
+
+	/* verify if the sector is closed */
+	sec_closed = zms_validate_closed_sector(fs, gc_addr, &empty_ate, &close_ate);
+	if (sec_closed < 0) {
+		return sec_closed;
+	}
+
+	/* if the sector is not closed don't do gc */
+	if (!sec_closed) {
+		goto gc_done;
+	}
+
+	/* update sector_cycle */
+	fs->sector_cycle = empty_ate.cycle_cnt;
+
+	/* stop_addr points to the first ATE before the header ATEs */
+	stop_addr = gc_addr - 2 * fs->ate_size;
+	/* At this step empty & close ATEs are valid.
+	 * let's start the GC
+	 */
+	gc_addr &= ADDR_SECT_MASK;
+	gc_addr += close_ate.offset;
+
+	do {
+		gc_prev_addr = gc_addr;
+		rc = zms_prev_ate(fs, &gc_addr, &gc_ate);
+		if (rc) {
+			return rc;
+		}
+
+		if (!zms_ate_valid(fs, &gc_ate) || !gc_ate.len) {
+			continue;
+		}
+
+#ifdef CONFIG_ZMS_LOOKUP_CACHE
+		wlk_addr = fs->lookup_cache[zms_lookup_cache_pos(gc_ate.id)];
+
+		if (wlk_addr == ZMS_LOOKUP_CACHE_NO_ADDR) {
+			wlk_addr = fs->ate_wra;
+		}
+#else
+		wlk_addr = fs->ate_wra;
+#endif
+
+		/* Initialize the wlk_prev_addr as if no previous ID will be found */
+		wlk_prev_addr = gc_prev_addr;
+		/* Search for a previous valid ATE with the same ID. If it doesn't exist
+		 * then wlk_prev_addr will be equal to gc_prev_addr.
+		 */
+		rc = zms_find_ate_with_id(fs, gc_ate.id, wlk_addr, fs->ate_wra, &wlk_ate,
+					  &wlk_prev_addr);
+		if (rc < 0) {
+			return rc;
+		}
+
+		/* if walk_addr has reached the same address as gc_addr, a copy is
+		 * needed unless it is a deleted item.
+		 */
+		if (wlk_prev_addr == gc_prev_addr) {
+			/* copy needed */
+			LOG_DBG("Moving %d, len %d", gc_ate.id, gc_ate.len);
+
+			if (gc_ate.len > ZMS_DATA_IN_ATE_SIZE) {
+				/* Copy Data only when len > 8
+				 * Otherwise, Data is already inside ATE
+				 */
+				data_addr = (gc_prev_addr & ADDR_SECT_MASK);
+				data_addr += gc_ate.offset;
+				gc_ate.offset = (uint32_t)SECTOR_OFFSET(fs->data_wra);
+
+				rc = zms_flash_block_move(fs, data_addr, gc_ate.len);
+				if (rc) {
+					return rc;
+				}
+			}
+
+			gc_ate.cycle_cnt = previous_cycle;
+			zms_ate_crc8_update(&gc_ate);
+			rc = zms_flash_ate_wrt(fs, &gc_ate);
+			if (rc) {
+				return rc;
+			}
+		}
+	} while (gc_prev_addr != stop_addr);
+
+gc_done:
+
+	/* restore the previous sector_cycle */
+	fs->sector_cycle = previous_cycle;
+
+	/* Write a GC_done ATE to mark the end of this operation
+	 */
+
+	rc = zms_add_gc_done_ate(fs);
+	if (rc) {
+		return rc;
+	}
+
+	/* Erase the GC'ed sector when needed */
+	rc = zms_flash_erase_sector(fs, sec_addr);
+	if (rc) {
+		return rc;
+	}
+
+#ifdef CONFIG_ZMS_LOOKUP_CACHE
+	zms_lookup_cache_invalidate(fs, sec_addr >> ADDR_SECT_SHIFT);
+#endif
+	rc = zms_add_empty_ate(fs, sec_addr);
+
+	return rc;
+}
+
+int zms_clear(struct zms_fs *fs)
+{
+	int rc;
+	uint64_t addr;
+
+	if (!fs->ready) {
+		LOG_ERR("zms not initialized");
+		return -EACCES;
+	}
+
+	k_mutex_lock(&fs->zms_lock, K_FOREVER);
+	for (uint32_t i = 0; i < fs->sector_count; i++) {
+		addr = (uint64_t)i << ADDR_SECT_SHIFT;
+		rc = zms_flash_erase_sector(fs, addr);
+		if (rc) {
+			goto end;
+		}
+		rc = zms_add_empty_ate(fs, addr);
+		if (rc) {
+			goto end;
+		}
+	}
+
+	/* zms needs to be reinitialized after clearing */
+	fs->ready = false;
+
+end:
+	k_mutex_unlock(&fs->zms_lock);
+
+	return 0;
+}
+
+static int zms_init(struct zms_fs *fs)
+{
+	int rc, sec_closed;
+	struct zms_ate last_ate, first_ate, close_ate, empty_ate;
+	/* Initialize addr to 0 for the case fs->sector_count == 0. This
+	 * should never happen as this is verified in zms_mount() but both
+	 * Coverity and GCC believe the contrary.
+	 */
+	uint64_t addr = 0U, data_wra = 0U;
+	uint32_t i, closed_sectors = 0;
+	bool zms_magic_exist = false;
+
+	k_mutex_lock(&fs->zms_lock, K_FOREVER);
+
+	/* step through the sectors to find a open sector following
+	 * a closed sector, this is where zms can write.
+	 */
+
+	for (i = 0; i < fs->sector_count; i++) {
+		addr = zms_close_ate_addr(fs, ((uint64_t)i << ADDR_SECT_SHIFT));
+
+		/* verify if the sector is closed */
+		sec_closed = zms_validate_closed_sector(fs, addr, &empty_ate, &close_ate);
+		if (sec_closed < 0) {
+			rc = sec_closed;
+			goto end;
+		}
+		/* update cycle count */
+		fs->sector_cycle = empty_ate.cycle_cnt;
+
+		if (sec_closed == 1) {
+			/* closed sector */
+			closed_sectors++;
+			/* Let's verify that this is a ZMS storage system */
+			if (ZMS_GET_MAGIC_NUMBER(empty_ate.metadata) == ZMS_MAGIC_NUMBER) {
+				zms_magic_exist = true;
+				/* Let's check that we support this ZMS version */
+				if (ZMS_GET_VERSION(empty_ate.metadata) != ZMS_DEFAULT_VERSION) {
+					LOG_ERR("ZMS Version is not supported");
+					rc = -ENOEXEC;
+					goto end;
+				}
+			}
+
+			zms_sector_advance(fs, &addr);
+			/* addr is pointing to the close ATE */
+			/* verify if the sector is Open */
+			sec_closed = zms_validate_closed_sector(fs, addr, &empty_ate, &close_ate);
+			if (sec_closed < 0) {
+				rc = sec_closed;
+				goto end;
+			}
+			/* update cycle count */
+			fs->sector_cycle = empty_ate.cycle_cnt;
+
+			if (!sec_closed) {
+				/* We found an Open sector following a closed one */
+				break;
+			}
+		}
+	}
+	/* all sectors are closed, and zms magic number not found. This is not a zms fs */
+	if ((closed_sectors == fs->sector_count) && !zms_magic_exist) {
+		rc = -EDEADLK;
+		goto end;
+	}
+	/* TODO: add a recovery mechanism here if the ZMS magic number exist but all
+	 * sectors are closed
+	 */
+
+	if (i == fs->sector_count) {
+		/* none of the sectors were closed, which means that the first
+		 * sector is the one in use, except if there are only 2 sectors.
+		 * Let's check if the last sector has valid ATEs otherwise set
+		 * the open sector to the first one.
+		 */
+		rc = zms_flash_ate_rd(fs, addr - fs->ate_size, &first_ate);
+		if (rc) {
+			goto end;
+		}
+		if (!zms_ate_valid(fs, &first_ate)) {
+			zms_sector_advance(fs, &addr);
+		}
+		rc = zms_get_sector_header(fs, addr, &empty_ate, &close_ate);
+		if (rc) {
+			goto end;
+		}
+
+		if (zms_empty_ate_valid(fs, &empty_ate)) {
+			/* Empty ATE is valid, let's verify that this is a ZMS storage system */
+			if (ZMS_GET_MAGIC_NUMBER(empty_ate.metadata) == ZMS_MAGIC_NUMBER) {
+				zms_magic_exist = true;
+				/* Let's check the version */
+				if (ZMS_GET_VERSION(empty_ate.metadata) != ZMS_DEFAULT_VERSION) {
+					LOG_ERR("ZMS Version is not supported");
+					rc = -ENOEXEC;
+					goto end;
+				}
+			}
+		} else {
+			rc = zms_flash_erase_sector(fs, addr);
+			if (rc) {
+				goto end;
+			}
+			rc = zms_add_empty_ate(fs, addr);
+			if (rc) {
+				goto end;
+			}
+		}
+		rc = zms_get_sector_cycle(fs, addr, &fs->sector_cycle);
+		if (rc == -ENOENT) {
+			/* sector never used */
+			fs->sector_cycle = 0;
+		} else if (rc) {
+			/* bad flash read */
+			goto end;
+		}
+	}
+
+	/* addr contains address of closing ate in the most recent sector,
+	 * search for the last valid ate using the recover_last_ate routine
+	 * and also update the data_wra
+	 */
+	rc = zms_recover_last_ate(fs, &addr, &data_wra);
+	if (rc) {
+		goto end;
+	}
+
+	/* addr contains address of the last valid ate in the most recent sector
+	 * data_wra contains the data write address of the current sector
+	 */
+	fs->ate_wra = addr;
+	fs->data_wra = data_wra;
+
+	/* fs->ate_wra should point to the next available entry. This is normally
+	 * the next position after the one found by the recovery function.
+	 * Let's verify that it doesn't contain any valid ATE, otherwise search for
+	 * an empty position
+	 */
+	while (fs->ate_wra >= fs->data_wra) {
+		rc = zms_flash_ate_rd(fs, fs->ate_wra, &last_ate);
+		if (rc) {
+			goto end;
+		}
+		if (!zms_ate_valid(fs, &last_ate)) {
+			/* found empty location */
+			break;
+		}
+
+		/* ate on the last position within the sector is
+		 * reserved for deletion an entry
+		 */
+		if ((fs->ate_wra == fs->data_wra) && last_ate.len) {
+			/* not a delete ate */
+			rc = -ESPIPE;
+			goto end;
+		}
+
+		fs->ate_wra -= fs->ate_size;
+	}
+
+	/* The sector after the write sector is either empty with a valid empty ATE (regular case)
+	 * or it has never been used or it is a closed sector (GC didn't finish)
+	 * If it is a closed sector we must look for a valid GC done ATE in the current write
+	 * sector, if it is missing, we need to restart gc because it has been interrupted.
+	 * If no valid empty ATE is found then it has never been used. Just erase it by adding
+	 * a valid empty ATE.
+	 * When gc needs to be restarted, first erase the sector by adding an empty
+	 * ATE otherwise the data might not fit into the sector.
+	 */
+	addr = zms_close_ate_addr(fs, fs->ate_wra);
+	zms_sector_advance(fs, &addr);
+
+	/* verify if the sector is closed */
+	sec_closed = zms_validate_closed_sector(fs, addr, &empty_ate, &close_ate);
+	if (sec_closed < 0) {
+		rc = sec_closed;
+		goto end;
+	}
+
+	if (sec_closed == 1) {
+		/* The sector after fs->ate_wrt is closed.
+		 * Look for a marker (gc_done_ate) that indicates that gc was finished.
+		 */
+		bool gc_done_marker = false;
+		struct zms_ate gc_done_ate;
+
+		fs->sector_cycle = empty_ate.cycle_cnt;
+		addr = fs->ate_wra + fs->ate_size;
+		while (SECTOR_OFFSET(addr) < (fs->sector_size - 2 * fs->ate_size)) {
+			rc = zms_flash_ate_rd(fs, addr, &gc_done_ate);
+			if (rc) {
+				goto end;
+			}
+
+			if (zms_gc_done_ate_valid(fs, &gc_done_ate)) {
+				break;
+			}
+			addr += fs->ate_size;
+		}
+
+		if (gc_done_marker) {
+			/* erase the next sector */
+			LOG_INF("GC Done marker found");
+			addr = fs->ate_wra & ADDR_SECT_MASK;
+			zms_sector_advance(fs, &addr);
+			rc = zms_flash_erase_sector(fs, addr);
+			if (rc < 0) {
+				goto end;
+			}
+			rc = zms_add_empty_ate(fs, addr);
+			goto end;
+		}
+		LOG_INF("No GC Done marker found: restarting gc");
+		rc = zms_flash_erase_sector(fs, fs->ate_wra);
+		if (rc) {
+			goto end;
+		}
+		rc = zms_add_empty_ate(fs, fs->ate_wra);
+		if (rc) {
+			goto end;
+		}
+
+		/* Let's point to the first writable position */
+		fs->ate_wra &= ADDR_SECT_MASK;
+		fs->ate_wra += (fs->sector_size - 3 * fs->ate_size);
+		fs->data_wra = (fs->ate_wra & ADDR_SECT_MASK);
+#ifdef CONFIG_ZMS_LOOKUP_CACHE
+		/**
+		 * At this point, the lookup cache wasn't built but the gc function need to use it.
+		 * So, temporarily, we set the lookup cache to the end of the fs.
+		 * The cache will be rebuilt afterwards
+		 **/
+		for (i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
+			fs->lookup_cache[i] = fs->ate_wra;
+		}
+#endif
+		rc = zms_gc(fs);
+		goto end;
+	}
+
+end:
+#ifdef CONFIG_ZMS_LOOKUP_CACHE
+	if (!rc) {
+		rc = zms_lookup_cache_rebuild(fs);
+	}
+#endif
+	/* If the sector is empty add a gc done ate to avoid having insufficient
+	 * space when doing gc.
+	 */
+	if ((!rc) && (SECTOR_OFFSET(fs->ate_wra) == (fs->sector_size - 3 * fs->ate_size))) {
+		rc = zms_add_gc_done_ate(fs);
+	}
+	k_mutex_unlock(&fs->zms_lock);
+
+	return rc;
+}
+
+int zms_mount(struct zms_fs *fs)
+{
+
+	int rc;
+	struct flash_pages_info info;
+	size_t write_block_size;
+
+	k_mutex_init(&fs->zms_lock);
+
+	fs->flash_parameters = flash_get_parameters(fs->flash_device);
+	if (fs->flash_parameters == NULL) {
+		LOG_ERR("Could not obtain flash parameters");
+		return -EINVAL;
+	}
+
+	fs->ate_size = zms_al_size(fs, sizeof(struct zms_ate));
+	write_block_size = flash_get_write_block_size(fs->flash_device);
+
+	/* check that the write block size is supported */
+	if (write_block_size > ZMS_BLOCK_SIZE || write_block_size == 0) {
+		LOG_ERR("Unsupported write block size");
+		return -EINVAL;
+	}
+
+	/* When the device need erase operations before write let's check that
+	 * sector size is a multiple of pagesize
+	 */
+	if (flash_params_get_erase_cap(fs->flash_parameters) & FLASH_ERASE_C_EXPLICIT) {
+		rc = flash_get_page_info_by_offs(fs->flash_device, fs->offset, &info);
+		if (rc) {
+			LOG_ERR("Unable to get page info");
+			return -EINVAL;
+		}
+		if (!fs->sector_size || fs->sector_size % info.size) {
+			LOG_ERR("Invalid sector size");
+			return -EINVAL;
+		}
+	}
+
+	/* we need at least 5 aligned ATEs size as the minimum sector size
+	 * 1 close ATE, 1 empty ATE, 1 GC done ATE, 1 Delete ATE, 1 ID/Value ATE
+	 */
+	if (fs->sector_size < ZMS_MIN_ATE_NUM * fs->ate_size) {
+		LOG_ERR("Invalid sector size, should be at least %u",
+			ZMS_MIN_ATE_NUM * fs->ate_size);
+	}
+
+	/* check the number of sectors, it should be at least 2 */
+	if (fs->sector_count < 2) {
+		LOG_ERR("Configuration error - sector count below minimum requirement (2)");
+		return -EINVAL;
+	}
+
+	rc = zms_init(fs);
+
+	if (rc) {
+		return rc;
+	}
+
+	/* zms is ready for use */
+	fs->ready = true;
+
+	LOG_INF("%u Sectors of %u bytes", fs->sector_count, fs->sector_size);
+	LOG_INF("alloc wra: %llu, %llx", SECTOR_NUM(fs->ate_wra), SECTOR_OFFSET(fs->ate_wra));
+	LOG_INF("data wra: %llu, %llx", SECTOR_NUM(fs->data_wra), SECTOR_OFFSET(fs->data_wra));
+
+	return 0;
+}
+
+ssize_t zms_write(struct zms_fs *fs, uint32_t id, const void *data, size_t len)
+{
+	int rc;
+	size_t data_size;
+	struct zms_ate wlk_ate;
+	uint64_t wlk_addr, rd_addr;
+	uint32_t gc_count, required_space = 0U; /* no space, appropriate for delete ate */
+	int prev_found = 0;
+
+	if (!fs->ready) {
+		LOG_ERR("zms not initialized");
+		return -EACCES;
+	}
+
+	data_size = zms_al_size(fs, len);
+
+	/* The maximum data size is sector size - 5 ate
+	 * where: 1 ate for data, 1 ate for sector close, 1 ate for empty,
+	 * 1 ate for gc done, and 1 ate to always allow a delete.
+	 * We cannot also store more than 64 KB of data
+	 */
+	if ((len > (fs->sector_size - 5 * fs->ate_size)) || (len > UINT16_MAX) ||
+	    ((len > 0) && (data == NULL))) {
+		return -EINVAL;
+	}
+
+	/* find latest entry with same id */
+#ifdef CONFIG_ZMS_LOOKUP_CACHE
+	wlk_addr = fs->lookup_cache[zms_lookup_cache_pos(id)];
+
+	if (wlk_addr == ZMS_LOOKUP_CACHE_NO_ADDR) {
+		goto no_cached_entry;
+	}
+#else
+	wlk_addr = fs->ate_wra;
+#endif
+	rd_addr = wlk_addr;
+
+	/* Search for a previous valid ATE with the same ID */
+	prev_found = zms_find_ate_with_id(fs, id, wlk_addr, fs->ate_wra, &wlk_ate, &rd_addr);
+	if (prev_found < 0) {
+		return prev_found;
+	}
+
+#ifdef CONFIG_ZMS_LOOKUP_CACHE
+no_cached_entry:
+#endif
+	if (prev_found) {
+		/* previous entry found */
+		if (len > ZMS_DATA_IN_ATE_SIZE) {
+			rd_addr &= ADDR_SECT_MASK;
+			rd_addr += wlk_ate.offset;
+		}
+
+		if (len == 0) {
+			/* do not try to compare with empty data */
+			if (wlk_ate.len == 0U) {
+				/* skip delete entry as it is already the
+				 * last one
+				 */
+				return 0;
+			}
+		} else if (len == wlk_ate.len) {
+			/* do not try to compare if lengths are not equal */
+			/* compare the data and if equal return 0 */
+			if (len <= ZMS_DATA_IN_ATE_SIZE) {
+				rc = memcmp(&wlk_ate.data, data, len);
+				if (!rc) {
+					return 0;
+				}
+			} else {
+				rc = zms_flash_block_cmp(fs, rd_addr, data, len);
+				if (rc <= 0) {
+					return rc;
+				}
+			}
+		}
+	} else {
+		/* skip delete entry for non-existing entry */
+		if (len == 0) {
+			return 0;
+		}
+	}
+
+	/* calculate required space if the entry contains data */
+	if (data_size) {
+		/* Leave space for delete ate */
+		if (len > ZMS_DATA_IN_ATE_SIZE) {
+			required_space = data_size + fs->ate_size;
+		} else {
+			required_space = fs->ate_size;
+		}
+	}
+
+	k_mutex_lock(&fs->zms_lock, K_FOREVER);
+
+	gc_count = 0;
+	while (1) {
+		if (gc_count == fs->sector_count) {
+			/* gc'ed all sectors, no extra space will be created
+			 * by extra gc.
+			 */
+			rc = -ENOSPC;
+			goto end;
+		}
+
+		/* We need to make sure that we leave the ATE at address 0x0 of the sector
+		 * empty (even for delete ATE). Otherwise, the fs->ate_wra will be decremented
+		 * after this write by ate_size and it will underflow.
+		 * So the first position of a sector (fs->ate_wra = 0x0) is forbidden for ATEs
+		 * and the second position could be written only be a delete ATE.
+		 */
+		if ((SECTOR_OFFSET(fs->ate_wra)) &&
+		    (fs->ate_wra >= (fs->data_wra + required_space)) &&
+		    (SECTOR_OFFSET(fs->ate_wra - fs->ate_size) || !len)) {
+			rc = zms_flash_write_entry(fs, id, data, len);
+			if (rc) {
+				goto end;
+			}
+			break;
+		}
+		rc = zms_sector_close(fs);
+		if (rc) {
+			LOG_ERR("Failed to close the sector, returned = %d", rc);
+			goto end;
+		}
+		rc = zms_gc(fs);
+		if (rc) {
+			LOG_ERR("Garbage collection failed, returned = %d", rc);
+			goto end;
+		}
+		gc_count++;
+	}
+	rc = len;
+end:
+	k_mutex_unlock(&fs->zms_lock);
+	return rc;
+}
+
+int zms_delete(struct zms_fs *fs, uint32_t id)
+{
+	return zms_write(fs, id, NULL, 0);
+}
+
+ssize_t zms_read_hist(struct zms_fs *fs, uint32_t id, void *data, size_t len, uint32_t cnt)
+{
+	int rc, prev_found = 0;
+	uint64_t wlk_addr, rd_addr = 0, wlk_prev_addr = 0;
+	uint32_t cnt_his;
+	struct zms_ate wlk_ate;
+#ifdef CONFIG_ZMS_DATA_CRC
+	uint32_t computed_data_crc;
+#endif
+
+	if (!fs->ready) {
+		LOG_ERR("zms not initialized");
+		return -EACCES;
+	}
+
+	cnt_his = 0U;
+
+#ifdef CONFIG_ZMS_LOOKUP_CACHE
+	wlk_addr = fs->lookup_cache[zms_lookup_cache_pos(id)];
+
+	if (wlk_addr == ZMS_LOOKUP_CACHE_NO_ADDR) {
+		rc = -ENOENT;
+		goto err;
+	}
+#else
+	wlk_addr = fs->ate_wra;
+#endif
+
+	while (cnt_his <= cnt) {
+		wlk_prev_addr = wlk_addr;
+		/* Search for a previous valid ATE with the same ID */
+		prev_found = zms_find_ate_with_id(fs, id, wlk_addr, fs->ate_wra, &wlk_ate,
+						  &wlk_prev_addr);
+		if (prev_found < 0) {
+			return prev_found;
+		}
+		if (prev_found) {
+			cnt_his++;
+			/* wlk_prev_addr contain the ATE address of the previous found ATE. */
+			rd_addr = wlk_prev_addr;
+			/*
+			 * compute the previous ATE address in case we need to start
+			 * the research again.
+			 */
+			rc = zms_compute_prev_addr(fs, &wlk_prev_addr);
+			if (rc) {
+				return rc;
+			}
+			/* wlk_addr will be the start research address in the next loop */
+			wlk_addr = wlk_prev_addr;
+		} else {
+			break;
+		}
+	}
+
+	if (((!prev_found) || (wlk_ate.id != id)) || (wlk_ate.len == 0U) || (cnt_his < cnt)) {
+		return -ENOENT;
+	}
+
+	if (wlk_ate.len <= ZMS_DATA_IN_ATE_SIZE) {
+		/* data is stored in the ATE */
+		if (data) {
+			memcpy(data, &wlk_ate.data, MIN(len, wlk_ate.len));
+		}
+	} else {
+		rd_addr &= ADDR_SECT_MASK;
+		rd_addr += wlk_ate.offset;
+		/* do not read or copy data if pointer is NULL */
+		if (data) {
+			rc = zms_flash_rd(fs, rd_addr, data, MIN(len, wlk_ate.len));
+			if (rc) {
+				goto err;
+			}
+		}
+#ifdef CONFIG_ZMS_DATA_CRC
+		/* Do not compute CRC for partial reads as CRC won't match */
+		if (len >= wlk_ate.len) {
+			computed_data_crc = crc32_ieee(data, wlk_ate.len);
+			if (computed_data_crc != wlk_ate.data_crc) {
+				LOG_ERR("Invalid data CRC: ATE_CRC=0x%08X, "
+					"computed_data_crc=0x%08X",
+					wlk_ate.data_crc, computed_data_crc);
+				return -EIO;
+			}
+		}
+#endif
+	}
+
+	return wlk_ate.len;
+
+err:
+	return rc;
+}
+
+ssize_t zms_read(struct zms_fs *fs, uint32_t id, void *data, size_t len)
+{
+	int rc;
+
+	rc = zms_read_hist(fs, id, data, len, 0);
+	if (rc < 0) {
+		return rc;
+	}
+
+	/* returns the minimum between ATE data length and requested length */
+	return MIN(rc, len);
+}
+
+ssize_t zms_get_data_length(struct zms_fs *fs, uint32_t id)
+{
+	int rc;
+
+	rc = zms_read_hist(fs, id, NULL, 0, 0);
+
+	return rc;
+}
+
+ssize_t zms_calc_free_space(struct zms_fs *fs)
+{
+
+	int rc, previous_sector_num = ZMS_INVALID_SECTOR_NUM, prev_found = 0, sec_closed;
+	struct zms_ate step_ate, wlk_ate, empty_ate, close_ate;
+	uint64_t step_addr, wlk_addr, step_prev_addr, wlk_prev_addr, data_wra = 0U;
+	uint8_t current_cycle;
+	ssize_t free_space = 0;
+
+	if (!fs->ready) {
+		LOG_ERR("zms not initialized");
+		return -EACCES;
+	}
+
+	/*
+	 * There is always a closing ATE , an empty ATE, a GC_done ATE and a reserved ATE for
+	 * deletion in each sector.
+	 * And there is always one reserved Sector for garbage collection operations
+	 */
+	free_space = (fs->sector_count - 1) * (fs->sector_size - 4 * fs->ate_size);
+
+	step_addr = fs->ate_wra;
+
+	do {
+		step_prev_addr = step_addr;
+		rc = zms_prev_ate(fs, &step_addr, &step_ate);
+		if (rc) {
+			return rc;
+		}
+
+		/* When changing the sector let's get the new cycle counter */
+		rc = zms_get_cycle_on_sector_change(fs, step_prev_addr, previous_sector_num,
+						    &current_cycle);
+		if (rc) {
+			return rc;
+		}
+		previous_sector_num = SECTOR_NUM(step_prev_addr);
+
+		/* Invalid and deleted ATEs are free spaces.
+		 * Header ATEs are already retrieved from free space
+		 */
+		if (!zms_ate_valid_different_sector(fs, &step_ate, current_cycle) ||
+		    (step_ate.id == ZMS_HEAD_ID) || (step_ate.len == 0)) {
+			continue;
+		}
+
+		wlk_addr = step_addr;
+		/* Try to find if there is a previous valid ATE with same ID */
+		prev_found = zms_find_ate_with_id(fs, step_ate.id, wlk_addr, step_addr, &wlk_ate,
+						  &wlk_prev_addr);
+		if (prev_found < 0) {
+			return prev_found;
+		}
+
+		/* If no previous ATE is found, then this is a valid ATE that cannot be
+		 * Garbage Collected
+		 */
+		if (!prev_found || (wlk_prev_addr == step_prev_addr)) {
+			if (step_ate.len > ZMS_DATA_IN_ATE_SIZE) {
+				free_space -= zms_al_size(fs, step_ate.len);
+			}
+			free_space -= fs->ate_size;
+		}
+	} while (step_addr != fs->ate_wra);
+
+	/* we must keep the sector_cycle before we start looking into special cases */
+	current_cycle = fs->sector_cycle;
+
+	/* Let's look now for special cases where some sectors have only ATEs with
+	 * small data size.
+	 */
+	const uint32_t second_to_last_offset = (2 * fs->ate_size);
+
+	for (uint32_t i = 0; i < fs->sector_count; i++) {
+		step_addr = zms_close_ate_addr(fs, ((uint64_t)i << ADDR_SECT_SHIFT));
+
+		/* verify if the sector is closed */
+		sec_closed = zms_validate_closed_sector(fs, step_addr, &empty_ate, &close_ate);
+		if (sec_closed < 0) {
+			return sec_closed;
+		}
+
+		/* If the sector is closed and its offset is pointing to a position less than the
+		 * 3rd to last ATE position in a sector, it means that we need to leave the second
+		 * to last ATE empty.
+		 */
+		if ((sec_closed == 1) && (close_ate.offset <= second_to_last_offset)) {
+			free_space -= fs->ate_size;
+		} else if (!sec_closed) {
+			/* sector is open, let's recover the last ATE */
+			fs->sector_cycle = empty_ate.cycle_cnt;
+			rc = zms_recover_last_ate(fs, &step_addr, &data_wra);
+			if (rc) {
+				return rc;
+			}
+			if (SECTOR_OFFSET(step_addr) <= second_to_last_offset) {
+				free_space -= fs->ate_size;
+			}
+		}
+	}
+	/* restore sector cycle */
+	fs->sector_cycle = current_cycle;
+
+	return free_space;
+}
+
+size_t zms_sector_max_data_size(struct zms_fs *fs)
+{
+	if (!fs->ready) {
+		LOG_ERR("ZMS not initialized");
+		return -EACCES;
+	}
+
+	return fs->ate_wra - fs->data_wra - fs->ate_size;
+}
+
+int zms_sector_use_next(struct zms_fs *fs)
+{
+	int ret;
+
+	if (!fs->ready) {
+		LOG_ERR("ZMS not initialized");
+		return -EACCES;
+	}
+
+	k_mutex_lock(&fs->zms_lock, K_FOREVER);
+
+	ret = zms_sector_close(fs);
+	if (ret != 0) {
+		goto end;
+	}
+
+	ret = zms_gc(fs);
+
+end:
+	k_mutex_unlock(&fs->zms_lock);
+	return ret;
+}
diff --git a/subsys/fs/zms/zms_priv.h b/subsys/fs/zms/zms_priv.h
new file mode 100644
index 00000000000..6594048ea0f
--- /dev/null
+++ b/subsys/fs/zms/zms_priv.h
@@ -0,0 +1,76 @@
+/*  ZMS: Zephyr Memory Storage
+ *
+ * Copyright (c) 2024 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef __ZMS_PRIV_H_
+#define __ZMS_PRIV_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * MASKS AND SHIFT FOR ADDRESSES
+ * an address in zms is an uint64_t where:
+ *   high 4 bytes represent the sector number
+ *   low 4 bytes represent the offset in a sector
+ */
+#define ADDR_SECT_MASK   GENMASK64(63, 32)
+#define ADDR_SECT_SHIFT  32
+#define ADDR_OFFS_MASK   GENMASK64(31, 0)
+#define SECTOR_NUM(x)    FIELD_GET(ADDR_SECT_MASK, x)
+#define SECTOR_OFFSET(x) FIELD_GET(ADDR_OFFS_MASK, x)
+
+#if defined(CONFIG_ZMS_CUSTOM_BLOCK_SIZE)
+#define ZMS_BLOCK_SIZE CONFIG_ZMS_MAX_BLOCK_SIZE
+#else
+#define ZMS_BLOCK_SIZE 32
+#endif
+
+#define ZMS_LOOKUP_CACHE_NO_ADDR GENMASK64(63, 0)
+#define ZMS_HEAD_ID              GENMASK(31, 0)
+
+#define ZMS_VERSION_MASK        GENMASK(7, 0)
+#define ZMS_GET_VERSION(x)      FIELD_GET(ZMS_VERSION_MASK, x)
+#define ZMS_DEFAULT_VERSION     1
+#define ZMS_MAGIC_NUMBER        0x42 /* murmur3a hash of "ZMS" (MSB) */
+#define ZMS_MAGIC_NUMBER_MASK   GENMASK(15, 8)
+#define ZMS_GET_MAGIC_NUMBER(x) FIELD_GET(ZMS_MAGIC_NUMBER_MASK, x)
+#define ZMS_MIN_ATE_NUM         5
+
+#define ZMS_INVALID_SECTOR_NUM -1
+#define ZMS_DATA_IN_ATE_SIZE   8
+
+struct zms_ate {
+	uint8_t crc8;      /* crc8 check of the entry */
+	uint8_t cycle_cnt; /* cycle counter for non erasable devices */
+	uint32_t id;       /* data id */
+	uint16_t len;      /* data len within sector */
+	union {
+		uint8_t data[8]; /* used to store small size data */
+		struct {
+			uint32_t offset; /* data offset within sector */
+			union {
+				uint32_t data_crc; /*
+						    * crc for data: The data CRC is checked only
+						    * when the whole data of the element is read.
+						    * The data CRC is not checked for a partial
+						    * read, as it is computed for the complete
+						    * set of data.
+						    */
+				uint32_t metadata; /*
+						    * Used to store metadata information
+						    * such as storage version.
+						    */
+			};
+		};
+	};
+} __packed;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ZMS_PRIV_H_ */

From 98b2be49e8604e83ff81b04bdf9e55c3bbbfd3f5 Mon Sep 17 00:00:00 2001
From: Riadh Ghaddab <rghaddab@baylibre.com>
Date: Mon, 5 Aug 2024 13:09:18 +0200
Subject: [PATCH 0469/2913] [nrf fromtree] tests: fs: zms: add testsuite for
 ZMS storage

List of added tests :
- zms.test_delete
- zms.test_zms_cache_collission
- zms.test_zms_cache_gc
- zms.test_zms_cache_hash_quality
- zms.test_zms_cache_init
- zms.test_zms_corrupted_sector_close_operation
- zms.test_zms_corrupted_write
- zms.test_zms_full_sector
- zms.test_zms_gc
- zms.test_zms_gc_3sectors
- zms.test_zms_gc_corrupt_ate
- zms.test_zms_gc_corrupt_close_ate
- zms.test_zms_mount
- zms.test_zms_write

Signed-off-by: Riadh Ghaddab <rghaddab@baylibre.com>
(cherry picked from commit 004d6d6adc01ef8c776eb0c4863d05cb3b661d03)
(cherry picked from commit fac1b34693de281a4e63428fbe37fbea6f0e6a79)
---
 tests/subsys/fs/zms/CMakeLists.txt            |   9 +
 tests/subsys/fs/zms/boards/native_sim.overlay |   9 +
 .../fs/zms/boards/qemu_x86_ev_0x00.overlay    |   9 +
 tests/subsys/fs/zms/prj.conf                  |   9 +
 tests/subsys/fs/zms/src/main.c                | 888 ++++++++++++++++++
 tests/subsys/fs/zms/testcase.yaml             |  28 +
 6 files changed, 952 insertions(+)
 create mode 100644 tests/subsys/fs/zms/CMakeLists.txt
 create mode 100644 tests/subsys/fs/zms/boards/native_sim.overlay
 create mode 100644 tests/subsys/fs/zms/boards/qemu_x86_ev_0x00.overlay
 create mode 100644 tests/subsys/fs/zms/prj.conf
 create mode 100644 tests/subsys/fs/zms/src/main.c
 create mode 100644 tests/subsys/fs/zms/testcase.yaml

diff --git a/tests/subsys/fs/zms/CMakeLists.txt b/tests/subsys/fs/zms/CMakeLists.txt
new file mode 100644
index 00000000000..66d9c91a520
--- /dev/null
+++ b/tests/subsys/fs/zms/CMakeLists.txt
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(fs_zms)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
+target_include_directories(app PRIVATE ${ZEPHYR_BASE}/subsys/fs/zms)
diff --git a/tests/subsys/fs/zms/boards/native_sim.overlay b/tests/subsys/fs/zms/boards/native_sim.overlay
new file mode 100644
index 00000000000..0f330fd7b17
--- /dev/null
+++ b/tests/subsys/fs/zms/boards/native_sim.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&flash0 {
+	erase-block-size = <0x400>;
+};
diff --git a/tests/subsys/fs/zms/boards/qemu_x86_ev_0x00.overlay b/tests/subsys/fs/zms/boards/qemu_x86_ev_0x00.overlay
new file mode 100644
index 00000000000..ffc3bc97aac
--- /dev/null
+++ b/tests/subsys/fs/zms/boards/qemu_x86_ev_0x00.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&sim_flash {
+	erase-value = < 0x00 >;
+};
diff --git a/tests/subsys/fs/zms/prj.conf b/tests/subsys/fs/zms/prj.conf
new file mode 100644
index 00000000000..5d84f6e17fd
--- /dev/null
+++ b/tests/subsys/fs/zms/prj.conf
@@ -0,0 +1,9 @@
+CONFIG_ZTEST=y
+CONFIG_ZTEST_STACK_SIZE=4096
+
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+
+CONFIG_ZMS=y
+CONFIG_LOG=y
+CONFIG_ZMS_LOG_LEVEL_DBG=y
diff --git a/tests/subsys/fs/zms/src/main.c b/tests/subsys/fs/zms/src/main.c
new file mode 100644
index 00000000000..80866687dba
--- /dev/null
+++ b/tests/subsys/fs/zms/src/main.c
@@ -0,0 +1,888 @@
+/*
+ * Copyright (c) 2024 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * This test is designed to be run using flash-simulator which provide
+ * functionality for flash property customization and emulating errors in
+ * flash operation in parallel to regular flash API.
+ * Test should be run on qemu_x86 or native_sim target.
+ */
+
+#if !defined(CONFIG_BOARD_QEMU_X86) && !defined(CONFIG_ARCH_POSIX)
+#error "Run only on qemu_x86 or a posix architecture based target (for ex. native_sim)"
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <zephyr/ztest.h>
+
+#include <zephyr/drivers/flash.h>
+#include <zephyr/fs/zms.h>
+#include <zephyr/stats/stats.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/sys/crc.h>
+#include "zms_priv.h"
+
+#define TEST_ZMS_AREA        storage_partition
+#define TEST_ZMS_AREA_OFFSET FIXED_PARTITION_OFFSET(TEST_ZMS_AREA)
+#define TEST_ZMS_AREA_ID     FIXED_PARTITION_ID(TEST_ZMS_AREA)
+#define TEST_ZMS_AREA_DEV    DEVICE_DT_GET(DT_MTD_FROM_FIXED_PARTITION(DT_NODELABEL(TEST_ZMS_AREA)))
+#define TEST_DATA_ID         1
+#define TEST_SECTOR_COUNT    5U
+
+static const struct device *const flash_dev = TEST_ZMS_AREA_DEV;
+
+struct zms_fixture {
+	struct zms_fs fs;
+	struct stats_hdr *sim_stats;
+	struct stats_hdr *sim_thresholds;
+};
+
+static void *setup(void)
+{
+	int err;
+	const struct flash_area *fa;
+	struct flash_pages_info info;
+	static struct zms_fixture fixture;
+
+	__ASSERT_NO_MSG(device_is_ready(flash_dev));
+
+	err = flash_area_open(TEST_ZMS_AREA_ID, &fa);
+	zassert_true(err == 0, "flash_area_open() fail: %d", err);
+
+	fixture.fs.offset = TEST_ZMS_AREA_OFFSET;
+	err = flash_get_page_info_by_offs(flash_area_get_device(fa), fixture.fs.offset, &info);
+	zassert_true(err == 0, "Unable to get page info: %d", err);
+
+	fixture.fs.sector_size = info.size;
+	fixture.fs.sector_count = TEST_SECTOR_COUNT;
+	fixture.fs.flash_device = flash_area_get_device(fa);
+
+	return &fixture;
+}
+
+static void before(void *data)
+{
+	struct zms_fixture *fixture = (struct zms_fixture *)data;
+
+	fixture->sim_stats = stats_group_find("flash_sim_stats");
+	fixture->sim_thresholds = stats_group_find("flash_sim_thresholds");
+}
+
+static void after(void *data)
+{
+	struct zms_fixture *fixture = (struct zms_fixture *)data;
+
+	if (fixture->sim_stats) {
+		stats_reset(fixture->sim_stats);
+	}
+	if (fixture->sim_thresholds) {
+		stats_reset(fixture->sim_thresholds);
+	}
+
+	/* Clear ZMS */
+	if (fixture->fs.ready) {
+		int err;
+
+		err = zms_clear(&fixture->fs);
+		zassert_true(err == 0, "zms_clear call failure: %d", err);
+	}
+
+	fixture->fs.sector_count = TEST_SECTOR_COUNT;
+}
+
+ZTEST_SUITE(zms, NULL, setup, before, after, NULL);
+
+ZTEST_F(zms, test_zms_mount)
+{
+	int err;
+
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+}
+
+static void execute_long_pattern_write(uint32_t id, struct zms_fs *fs)
+{
+	char rd_buf[512];
+	char wr_buf[512];
+	char pattern[] = {0xDE, 0xAD, 0xBE, 0xEF};
+	size_t len;
+
+	len = zms_read(fs, id, rd_buf, sizeof(rd_buf));
+	zassert_true(len == -ENOENT, "zms_read unexpected failure: %d", len);
+
+	BUILD_ASSERT((sizeof(wr_buf) % sizeof(pattern)) == 0);
+	for (int i = 0; i < sizeof(wr_buf); i += sizeof(pattern)) {
+		memcpy(wr_buf + i, pattern, sizeof(pattern));
+	}
+
+	len = zms_write(fs, id, wr_buf, sizeof(wr_buf));
+	zassert_true(len == sizeof(wr_buf), "zms_write failed: %d", len);
+
+	len = zms_read(fs, id, rd_buf, sizeof(rd_buf));
+	zassert_true(len == sizeof(rd_buf), "zms_read unexpected failure: %d", len);
+	zassert_mem_equal(wr_buf, rd_buf, sizeof(rd_buf), "RD buff should be equal to the WR buff");
+}
+
+ZTEST_F(zms, test_zms_write)
+{
+	int err;
+
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	execute_long_pattern_write(TEST_DATA_ID, &fixture->fs);
+}
+
+static int flash_sim_write_calls_find(struct stats_hdr *hdr, void *arg, const char *name,
+				      uint16_t off)
+{
+	if (!strcmp(name, "flash_write_calls")) {
+		uint32_t **flash_write_stat = (uint32_t **)arg;
+		*flash_write_stat = (uint32_t *)((uint8_t *)hdr + off);
+	}
+
+	return 0;
+}
+
+static int flash_sim_max_write_calls_find(struct stats_hdr *hdr, void *arg, const char *name,
+					  uint16_t off)
+{
+	if (!strcmp(name, "max_write_calls")) {
+		uint32_t **max_write_calls = (uint32_t **)arg;
+		*max_write_calls = (uint32_t *)((uint8_t *)hdr + off);
+	}
+
+	return 0;
+}
+
+ZTEST_F(zms, test_zms_corrupted_write)
+{
+	int err;
+	size_t len;
+	char rd_buf[512];
+	char wr_buf_1[512];
+	char wr_buf_2[512];
+	char pattern_1[] = {0xDE, 0xAD, 0xBE, 0xEF};
+	char pattern_2[] = {0x03, 0xAA, 0x85, 0x6F};
+	uint32_t *flash_write_stat;
+	uint32_t *flash_max_write_calls;
+
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	err = zms_read(&fixture->fs, TEST_DATA_ID, rd_buf, sizeof(rd_buf));
+	zassert_true(err == -ENOENT, "zms_read unexpected failure: %d", err);
+
+	BUILD_ASSERT((sizeof(wr_buf_1) % sizeof(pattern_1)) == 0);
+	for (int i = 0; i < sizeof(wr_buf_1); i += sizeof(pattern_1)) {
+		memcpy(wr_buf_1 + i, pattern_1, sizeof(pattern_1));
+	}
+
+	len = zms_write(&fixture->fs, TEST_DATA_ID, wr_buf_1, sizeof(wr_buf_1));
+	zassert_true(len == sizeof(wr_buf_1), "zms_write failed: %d", len);
+
+	len = zms_read(&fixture->fs, TEST_DATA_ID, rd_buf, sizeof(rd_buf));
+	zassert_true(len == sizeof(rd_buf), "zms_read unexpected failure: %d", len);
+	zassert_mem_equal(wr_buf_1, rd_buf, sizeof(rd_buf),
+			  "RD buff should be equal to the first WR buff");
+
+	BUILD_ASSERT((sizeof(wr_buf_2) % sizeof(pattern_2)) == 0);
+	for (int i = 0; i < sizeof(wr_buf_2); i += sizeof(pattern_2)) {
+		memcpy(wr_buf_2 + i, pattern_2, sizeof(pattern_2));
+	}
+
+	/* Set the maximum number of writes that the flash simulator can
+	 * execute.
+	 */
+	stats_walk(fixture->sim_thresholds, flash_sim_max_write_calls_find, &flash_max_write_calls);
+	stats_walk(fixture->sim_stats, flash_sim_write_calls_find, &flash_write_stat);
+
+	*flash_max_write_calls = *flash_write_stat - 1;
+	*flash_write_stat = 0;
+
+	/* Flash simulator will lose part of the data at the end of this write.
+	 * This should simulate power down during flash write. The written data
+	 * are corrupted at this point and should be discarded by the ZMS.
+	 */
+	len = zms_write(&fixture->fs, TEST_DATA_ID, wr_buf_2, sizeof(wr_buf_2));
+	zassert_true(len == sizeof(wr_buf_2), "zms_write failed: %d", len);
+
+	/* Reinitialize the ZMS. */
+	memset(&fixture->fs, 0, sizeof(fixture->fs));
+	(void)setup();
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	len = zms_read(&fixture->fs, TEST_DATA_ID, rd_buf, sizeof(rd_buf));
+	zassert_true(len == sizeof(rd_buf), "zms_read unexpected failure: %d", len);
+	zassert_true(memcmp(wr_buf_2, rd_buf, sizeof(rd_buf)) != 0,
+		     "RD buff should not be equal to the second WR buff because of "
+		     "corrupted write operation");
+	zassert_mem_equal(wr_buf_1, rd_buf, sizeof(rd_buf),
+			  "RD buff should be equal to the first WR buff because subsequent "
+			  "write operation has failed");
+}
+
+ZTEST_F(zms, test_zms_gc)
+{
+	int err;
+	int len;
+	uint8_t buf[32];
+	uint8_t rd_buf[32];
+
+	const uint16_t max_id = 10;
+	/* 21st write will trigger GC. */
+	const uint16_t max_writes = 21;
+
+	fixture->fs.sector_count = 2;
+
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	for (uint32_t i = 0; i < max_writes; i++) {
+		uint8_t id = (i % max_id);
+		uint8_t id_data = id + max_id * (i / max_id);
+
+		memset(buf, id_data, sizeof(buf));
+
+		len = zms_write(&fixture->fs, id, buf, sizeof(buf));
+		zassert_true(len == sizeof(buf), "zms_write failed: %d", len);
+	}
+
+	for (uint32_t id = 0; id < max_id; id++) {
+		len = zms_read(&fixture->fs, id, rd_buf, sizeof(buf));
+		zassert_true(len == sizeof(rd_buf), "zms_read unexpected failure: %d", len);
+
+		for (uint16_t i = 0; i < sizeof(rd_buf); i++) {
+			rd_buf[i] = rd_buf[i] % max_id;
+			buf[i] = id;
+		}
+		zassert_mem_equal(buf, rd_buf, sizeof(rd_buf),
+				  "RD buff should be equal to the WR buff");
+	}
+
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	for (uint32_t id = 0; id < max_id; id++) {
+		len = zms_read(&fixture->fs, id, rd_buf, sizeof(buf));
+		zassert_true(len == sizeof(rd_buf), "zms_read unexpected failure: %d", len);
+
+		for (uint16_t i = 0; i < sizeof(rd_buf); i++) {
+			rd_buf[i] = rd_buf[i] % max_id;
+			buf[i] = id;
+		}
+		zassert_mem_equal(buf, rd_buf, sizeof(rd_buf),
+				  "RD buff should be equal to the WR buff");
+	}
+}
+
+static void write_content(uint32_t max_id, uint32_t begin, uint32_t end, struct zms_fs *fs)
+{
+	uint8_t buf[32];
+	ssize_t len;
+
+	for (uint32_t i = begin; i < end; i++) {
+		uint8_t id = (i % max_id);
+		uint8_t id_data = id + max_id * (i / max_id);
+
+		memset(buf, id_data, sizeof(buf));
+
+		len = zms_write(fs, id, buf, sizeof(buf));
+		zassert_true(len == sizeof(buf), "zms_write failed: %d", len);
+	}
+}
+
+static void check_content(uint32_t max_id, struct zms_fs *fs)
+{
+	uint8_t rd_buf[32];
+	uint8_t buf[32];
+	ssize_t len;
+
+	for (uint32_t id = 0; id < max_id; id++) {
+		len = zms_read(fs, id, rd_buf, sizeof(buf));
+		zassert_true(len == sizeof(rd_buf), "zms_read unexpected failure: %d", len);
+
+		for (uint16_t i = 0; i < ARRAY_SIZE(rd_buf); i++) {
+			rd_buf[i] = rd_buf[i] % max_id;
+			buf[i] = id;
+		}
+		zassert_mem_equal(buf, rd_buf, sizeof(rd_buf),
+				  "RD buff should be equal to the WR buff");
+	}
+}
+
+/**
+ * Full round of GC over 3 sectors
+ */
+ZTEST_F(zms, test_zms_gc_3sectors)
+{
+	int err;
+
+	const uint16_t max_id = 10;
+	/* 41st write will trigger 1st GC. */
+	const uint16_t max_writes = 41;
+	/* 61st write will trigger 2nd GC. */
+	const uint16_t max_writes_2 = 41 + 20;
+	/* 81st write will trigger 3rd GC. */
+	const uint16_t max_writes_3 = 41 + 20 + 20;
+	/* 101st write will trigger 4th GC. */
+	const uint16_t max_writes_4 = 41 + 20 + 20 + 20;
+
+	fixture->fs.sector_count = 3;
+
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 0, "unexpected write sector");
+
+	/* Trigger 1st GC */
+	write_content(max_id, 0, max_writes, &fixture->fs);
+
+	/* sector sequence: empty,closed, write */
+	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 2, "unexpected write sector");
+	check_content(max_id, &fixture->fs);
+
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 2, "unexpected write sector");
+	check_content(max_id, &fixture->fs);
+
+	/* Trigger 2nd GC */
+	write_content(max_id, max_writes, max_writes_2, &fixture->fs);
+
+	/* sector sequence: write, empty, closed */
+	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 0, "unexpected write sector");
+	check_content(max_id, &fixture->fs);
+
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 0, "unexpected write sector");
+	check_content(max_id, &fixture->fs);
+
+	/* Trigger 3rd GC */
+	write_content(max_id, max_writes_2, max_writes_3, &fixture->fs);
+
+	/* sector sequence: closed, write, empty */
+	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 1, "unexpected write sector");
+	check_content(max_id, &fixture->fs);
+
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 1, "unexpected write sector");
+	check_content(max_id, &fixture->fs);
+
+	/* Trigger 4th GC */
+	write_content(max_id, max_writes_3, max_writes_4, &fixture->fs);
+
+	/* sector sequence: empty,closed, write */
+	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 2, "unexpected write sector");
+	check_content(max_id, &fixture->fs);
+
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 2, "unexpected write sector");
+	check_content(max_id, &fixture->fs);
+}
+
+static int flash_sim_max_len_find(struct stats_hdr *hdr, void *arg, const char *name, uint16_t off)
+{
+	if (!strcmp(name, "max_len")) {
+		uint32_t **max_len = (uint32_t **)arg;
+		*max_len = (uint32_t *)((uint8_t *)hdr + off);
+	}
+
+	return 0;
+}
+
+ZTEST_F(zms, test_zms_corrupted_sector_close_operation)
+{
+	int err;
+	int len;
+	uint8_t buf[32];
+	uint32_t *flash_write_stat;
+	uint32_t *flash_max_write_calls;
+	uint32_t *flash_max_len;
+
+	const uint16_t max_id = 10;
+	/* 21st write will trigger GC. */
+	const uint16_t max_writes = 21;
+
+	/* Get the address of simulator parameters. */
+	stats_walk(fixture->sim_thresholds, flash_sim_max_write_calls_find, &flash_max_write_calls);
+	stats_walk(fixture->sim_thresholds, flash_sim_max_len_find, &flash_max_len);
+	stats_walk(fixture->sim_stats, flash_sim_write_calls_find, &flash_write_stat);
+
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	for (uint32_t i = 0; i < max_writes; i++) {
+		uint8_t id = (i % max_id);
+		uint8_t id_data = id + max_id * (i / max_id);
+
+		memset(buf, id_data, sizeof(buf));
+
+		if (i == max_writes - 1) {
+			/* Reset stats. */
+			*flash_write_stat = 0;
+
+			/* Block write calls and simulate power down during
+			 * sector closing operation, so only a part of a ZMS
+			 * closing ate will be written.
+			 */
+			*flash_max_write_calls = 1;
+			*flash_max_len = 4;
+		}
+		len = zms_write(&fixture->fs, id, buf, sizeof(buf));
+		zassert_true(len == sizeof(buf), "zms_write failed: %d", len);
+	}
+
+	/* Make the flash simulator functional again. */
+	*flash_max_write_calls = 0;
+	*flash_max_len = 0;
+
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	check_content(max_id, &fixture->fs);
+
+	/* Ensure that the ZMS is able to store new content. */
+	execute_long_pattern_write(max_id, &fixture->fs);
+}
+
+/**
+ * @brief Test case when storage become full, so only deletion is possible.
+ */
+ZTEST_F(zms, test_zms_full_sector)
+{
+	int err;
+	ssize_t len;
+	uint32_t filling_id = 0;
+	uint32_t i, data_read;
+
+	fixture->fs.sector_count = 3;
+
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	while (1) {
+		len = zms_write(&fixture->fs, filling_id, &filling_id, sizeof(filling_id));
+		if (len == -ENOSPC) {
+			break;
+		}
+		zassert_true(len == sizeof(filling_id), "zms_write failed: %d", len);
+		filling_id++;
+	}
+
+	/* check whether can delete whatever from full storage */
+	err = zms_delete(&fixture->fs, 1);
+	zassert_true(err == 0, "zms_delete call failure: %d", err);
+
+	/* the last sector is full now, test re-initialization */
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	len = zms_write(&fixture->fs, filling_id, &filling_id, sizeof(filling_id));
+	zassert_true(len == sizeof(filling_id), "zms_write failed: %d", len);
+
+	/* sanitycheck on ZMS content */
+	for (i = 0; i <= filling_id; i++) {
+		len = zms_read(&fixture->fs, i, &data_read, sizeof(data_read));
+		if (i == 1) {
+			zassert_true(len == -ENOENT, "zms_read shouldn't found the entry: %d", len);
+		} else {
+			zassert_true(len == sizeof(data_read),
+				     "zms_read #%d failed: len is %zd instead of %zu", i, len,
+				     sizeof(data_read));
+			zassert_equal(data_read, i, "read unexpected data: %d instead of %d",
+				      data_read, i);
+		}
+	}
+}
+
+ZTEST_F(zms, test_delete)
+{
+	int err;
+	ssize_t len;
+	uint32_t filling_id, data_read;
+	uint32_t ate_wra, data_wra;
+
+	fixture->fs.sector_count = 3;
+
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	for (filling_id = 0; filling_id < 10; filling_id++) {
+		len = zms_write(&fixture->fs, filling_id, &filling_id, sizeof(filling_id));
+
+		zassert_true(len == sizeof(filling_id), "zms_write failed: %d", len);
+
+		if (filling_id != 0) {
+			continue;
+		}
+
+		/* delete the first entry while it is the most recent one */
+		err = zms_delete(&fixture->fs, filling_id);
+		zassert_true(err == 0, "zms_delete call failure: %d", err);
+
+		len = zms_read(&fixture->fs, filling_id, &data_read, sizeof(data_read));
+		zassert_true(len == -ENOENT, "zms_read shouldn't found the entry: %d", len);
+	}
+
+	/* delete existing entry */
+	err = zms_delete(&fixture->fs, 1);
+	zassert_true(err == 0, "zms_delete call failure: %d", err);
+
+	len = zms_read(&fixture->fs, 1, &data_read, sizeof(data_read));
+	zassert_true(len == -ENOENT, "zms_read shouldn't found the entry: %d", len);
+
+	ate_wra = fixture->fs.ate_wra;
+	data_wra = fixture->fs.data_wra;
+
+	/* delete already deleted entry */
+	err = zms_delete(&fixture->fs, 1);
+	zassert_true(err == 0, "zms_delete call failure: %d", err);
+	zassert_true(ate_wra == fixture->fs.ate_wra && data_wra == fixture->fs.data_wra,
+		     "delete already deleted entry should not make"
+		     " any footprint in the storage");
+
+	/* delete nonexisting entry */
+	err = zms_delete(&fixture->fs, filling_id);
+	zassert_true(err == 0, "zms_delete call failure: %d", err);
+	zassert_true(ate_wra == fixture->fs.ate_wra && data_wra == fixture->fs.data_wra,
+		     "delete nonexistent entry should not make"
+		     " any footprint in the storage");
+}
+
+/*
+ * Test that garbage-collection can recover all ate's even when the last ate,
+ * ie close_ate, is corrupt. In this test the close_ate is set to point to the
+ * last ate at -5. A valid ate is however present at -6. Since the close_ate
+ * has an invalid crc8, the offset should not be used and a recover of the
+ * last ate should be done instead.
+ */
+ZTEST_F(zms, test_zms_gc_corrupt_close_ate)
+{
+	struct zms_ate ate, close_ate, empty_ate;
+	uint32_t data;
+	ssize_t len;
+	int err;
+
+	Z_TEST_SKIP_IFNDEF(CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES);
+	close_ate.id = 0xffffffff;
+	close_ate.offset = fixture->fs.sector_size - sizeof(struct zms_ate) * 5;
+	close_ate.len = 0;
+	close_ate.metadata = 0xffffffff;
+	close_ate.cycle_cnt = 1;
+	close_ate.crc8 = 0xff; /* Incorrect crc8 */
+
+	empty_ate.id = 0xffffffff;
+	empty_ate.offset = 0;
+	empty_ate.len = 0xffff;
+	empty_ate.metadata = 0x4201;
+	empty_ate.cycle_cnt = 1;
+	empty_ate.crc8 =
+		crc8_ccitt(0xff, (uint8_t *)&empty_ate + SIZEOF_FIELD(struct zms_ate, crc8),
+			   sizeof(struct zms_ate) - SIZEOF_FIELD(struct zms_ate, crc8));
+
+	memset(&ate, 0, sizeof(struct zms_ate));
+	ate.id = 0x1;
+	ate.len = sizeof(data);
+	ate.cycle_cnt = 1;
+	data = 0xaa55aa55;
+	memcpy(&ate.data, &data, sizeof(data));
+	ate.crc8 = crc8_ccitt(0xff, (uint8_t *)&ate + SIZEOF_FIELD(struct zms_ate, crc8),
+			      sizeof(struct zms_ate) - SIZEOF_FIELD(struct zms_ate, crc8));
+
+	/* Add empty ATE */
+	err = flash_write(fixture->fs.flash_device,
+			  fixture->fs.offset + fixture->fs.sector_size - sizeof(struct zms_ate),
+			  &empty_ate, sizeof(empty_ate));
+	zassert_true(err == 0, "flash_write failed: %d", err);
+
+	/* Mark sector 0 as closed */
+	err = flash_write(fixture->fs.flash_device,
+			  fixture->fs.offset + fixture->fs.sector_size - 2 * sizeof(struct zms_ate),
+			  &close_ate, sizeof(close_ate));
+	zassert_true(err == 0, "flash_write failed: %d", err);
+
+	/* Write valid ate at -6 */
+	err = flash_write(fixture->fs.flash_device,
+			  fixture->fs.offset + fixture->fs.sector_size - 6 * sizeof(struct zms_ate),
+			  &ate, sizeof(ate));
+	zassert_true(err == 0, "flash_write failed: %d", err);
+
+	/* Mark sector 1 as closed */
+	err = flash_write(fixture->fs.flash_device,
+			  fixture->fs.offset + (2 * fixture->fs.sector_size) -
+				  2 * sizeof(struct zms_ate),
+			  &close_ate, sizeof(close_ate));
+	zassert_true(err == 0, "flash_write failed: %d", err);
+
+	fixture->fs.sector_count = 3;
+
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	data = 0;
+	len = zms_read(&fixture->fs, 1, &data, sizeof(data));
+	zassert_true(len == sizeof(data), "zms_read should have read %d bytes", sizeof(data));
+	zassert_true(data == 0xaa55aa55, "unexpected value %d", data);
+}
+
+/*
+ * Test that garbage-collection correctly handles corrupt ate's.
+ */
+ZTEST_F(zms, test_zms_gc_corrupt_ate)
+{
+	struct zms_ate corrupt_ate, close_ate;
+	int err;
+
+	close_ate.id = 0xffffffff;
+	close_ate.offset = fixture->fs.sector_size / 2;
+	close_ate.len = 0;
+	close_ate.crc8 =
+		crc8_ccitt(0xff, (uint8_t *)&close_ate + SIZEOF_FIELD(struct zms_ate, crc8),
+			   sizeof(struct zms_ate) - SIZEOF_FIELD(struct zms_ate, crc8));
+
+	corrupt_ate.id = 0xdeadbeef;
+	corrupt_ate.offset = 0;
+	corrupt_ate.len = 20;
+	corrupt_ate.crc8 = 0xff; /* Incorrect crc8 */
+
+	/* Mark sector 0 as closed */
+	err = flash_write(fixture->fs.flash_device,
+			  fixture->fs.offset + fixture->fs.sector_size - 2 * sizeof(struct zms_ate),
+			  &close_ate, sizeof(close_ate));
+	zassert_true(err == 0, "flash_write failed: %d", err);
+
+	/* Write a corrupt ate */
+	err = flash_write(fixture->fs.flash_device,
+			  fixture->fs.offset + (fixture->fs.sector_size / 2), &corrupt_ate,
+			  sizeof(corrupt_ate));
+	zassert_true(err == 0, "flash_write failed: %d", err);
+
+	/* Mark sector 1 as closed */
+	err = flash_write(fixture->fs.flash_device,
+			  fixture->fs.offset + (2 * fixture->fs.sector_size) -
+				  2 * sizeof(struct zms_ate),
+			  &close_ate, sizeof(close_ate));
+	zassert_true(err == 0, "flash_write failed: %d", err);
+
+	fixture->fs.sector_count = 3;
+
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+}
+
+#ifdef CONFIG_ZMS_LOOKUP_CACHE
+static size_t num_matching_cache_entries(uint64_t addr, bool compare_sector_only, struct zms_fs *fs)
+{
+	size_t i, num = 0;
+	uint64_t mask = compare_sector_only ? ADDR_SECT_MASK : UINT64_MAX;
+
+	for (i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
+		if ((fs->lookup_cache[i] & mask) == addr) {
+			num++;
+		}
+	}
+
+	return num;
+}
+
+static size_t num_occupied_cache_entries(struct zms_fs *fs)
+{
+	return CONFIG_ZMS_LOOKUP_CACHE_SIZE -
+	       num_matching_cache_entries(ZMS_LOOKUP_CACHE_NO_ADDR, false, fs);
+}
+#endif
+
+/*
+ * Test that ZMS lookup cache is properly rebuilt on zms_mount(), or initialized
+ * to ZMS_LOOKUP_CACHE_NO_ADDR if the store is empty.
+ */
+ZTEST_F(zms, test_zms_cache_init)
+{
+#ifdef CONFIG_ZMS_LOOKUP_CACHE
+	int err;
+	size_t num;
+	uint64_t ate_addr;
+	uint8_t data = 0;
+
+	/* Test cache initialization when the store is empty */
+
+	fixture->fs.sector_count = 3;
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	num = num_occupied_cache_entries(&fixture->fs);
+	zassert_equal(num, 0, "uninitialized cache");
+
+	/* Test cache update after zms_write() */
+
+	ate_addr = fixture->fs.ate_wra;
+	err = zms_write(&fixture->fs, 1, &data, sizeof(data));
+	zassert_equal(err, sizeof(data), "zms_write call failure: %d", err);
+
+	num = num_occupied_cache_entries(&fixture->fs);
+	zassert_equal(num, 1, "cache not updated after write");
+
+	num = num_matching_cache_entries(ate_addr, false, &fixture->fs);
+	zassert_equal(num, 1, "invalid cache entry after write");
+
+	/* Test cache initialization when the store is non-empty */
+
+	memset(fixture->fs.lookup_cache, 0xAA, sizeof(fixture->fs.lookup_cache));
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	num = num_occupied_cache_entries(&fixture->fs);
+	zassert_equal(num, 1, "uninitialized cache after restart");
+
+	num = num_matching_cache_entries(ate_addr, false, &fixture->fs);
+	zassert_equal(num, 1, "invalid cache entry after restart");
+#endif
+}
+
+/*
+ * Test that even after writing more ZMS IDs than the number of ZMS lookup cache
+ * entries they all can be read correctly.
+ */
+ZTEST_F(zms, test_zms_cache_collission)
+{
+#ifdef CONFIG_ZMS_LOOKUP_CACHE
+	int err;
+	uint32_t id;
+	uint16_t data;
+
+	fixture->fs.sector_count = 4;
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	for (id = 0; id < CONFIG_ZMS_LOOKUP_CACHE_SIZE + 1; id++) {
+		data = id;
+		err = zms_write(&fixture->fs, id, &data, sizeof(data));
+		zassert_equal(err, sizeof(data), "zms_write call failure: %d", err);
+	}
+
+	for (id = 0; id < CONFIG_ZMS_LOOKUP_CACHE_SIZE + 1; id++) {
+		err = zms_read(&fixture->fs, id, &data, sizeof(data));
+		zassert_equal(err, sizeof(data), "zms_read call failure: %d", err);
+		zassert_equal(data, id, "incorrect data read");
+	}
+#endif
+}
+
+/*
+ * Test that ZMS lookup cache does not contain any address from gc-ed sector
+ */
+ZTEST_F(zms, test_zms_cache_gc)
+{
+#ifdef CONFIG_ZMS_LOOKUP_CACHE
+	int err;
+	size_t num;
+	uint16_t data = 0;
+
+	fixture->fs.sector_count = 3;
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	/* Fill the first sector with writes of ID 1 */
+
+	while (fixture->fs.data_wra + sizeof(data) + sizeof(struct zms_ate) <=
+	       fixture->fs.ate_wra) {
+		++data;
+		err = zms_write(&fixture->fs, 1, &data, sizeof(data));
+		zassert_equal(err, sizeof(data), "zms_write call failure: %d", err);
+	}
+
+	/* Verify that cache contains a single entry for sector 0 */
+
+	num = num_matching_cache_entries(0ULL << ADDR_SECT_SHIFT, true, &fixture->fs);
+	zassert_equal(num, 1, "invalid cache content after filling sector 0");
+
+	/* Fill the second sector with writes of ID 2 */
+
+	while ((fixture->fs.ate_wra >> ADDR_SECT_SHIFT) != 2) {
+		++data;
+		err = zms_write(&fixture->fs, 2, &data, sizeof(data));
+		zassert_equal(err, sizeof(data), "zms_write call failure: %d", err);
+	}
+
+	/*
+	 * At this point sector 0 should have been gc-ed. Verify that action is
+	 * reflected by the cache content.
+	 */
+
+	num = num_matching_cache_entries(0ULL << ADDR_SECT_SHIFT, true, &fixture->fs);
+	zassert_equal(num, 0, "not invalidated cache entries aftetr gc");
+
+	num = num_matching_cache_entries(2ULL << ADDR_SECT_SHIFT, true, &fixture->fs);
+	zassert_equal(num, 2, "invalid cache content after gc");
+#endif
+}
+
+/*
+ * Test ZMS lookup cache hash quality.
+ */
+ZTEST_F(zms, test_zms_cache_hash_quality)
+{
+#ifdef CONFIG_ZMS_LOOKUP_CACHE
+	const size_t MIN_CACHE_OCCUPANCY = CONFIG_ZMS_LOOKUP_CACHE_SIZE * 6 / 10;
+	int err;
+	size_t num;
+	uint32_t id;
+	uint16_t data;
+
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	/* Write ZMS IDs from 0 to CONFIG_ZMS_LOOKUP_CACHE_SIZE - 1 */
+
+	for (uint16_t i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
+		id = i;
+		data = 0;
+
+		err = zms_write(&fixture->fs, id, &data, sizeof(data));
+		zassert_equal(err, sizeof(data), "zms_write call failure: %d", err);
+	}
+
+	/* Verify that at least 60% cache entries are occupied */
+
+	num = num_occupied_cache_entries(&fixture->fs);
+	TC_PRINT("Cache occupancy: %u\n", (unsigned int)num);
+	zassert_between_inclusive(num, MIN_CACHE_OCCUPANCY, CONFIG_ZMS_LOOKUP_CACHE_SIZE,
+				  "too low cache occupancy - poor hash quality");
+
+	err = zms_clear(&fixture->fs);
+	zassert_true(err == 0, "zms_clear call failure: %d", err);
+
+	err = zms_mount(&fixture->fs);
+	zassert_true(err == 0, "zms_mount call failure: %d", err);
+
+	/* Write CONFIG_ZMS_LOOKUP_CACHE_SIZE ZMS IDs that form the following series: 0, 4, 8... */
+
+	for (uint16_t i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
+		id = i * 4;
+		data = 0;
+
+		err = zms_write(&fixture->fs, id, &data, sizeof(data));
+		zassert_equal(err, sizeof(data), "zms_write call failure: %d", err);
+	}
+
+	/* Verify that at least 60% cache entries are occupied */
+
+	num = num_occupied_cache_entries(&fixture->fs);
+	TC_PRINT("Cache occupancy: %u\n", (unsigned int)num);
+	zassert_between_inclusive(num, MIN_CACHE_OCCUPANCY, CONFIG_ZMS_LOOKUP_CACHE_SIZE,
+				  "too low cache occupancy - poor hash quality");
+
+#endif
+}
diff --git a/tests/subsys/fs/zms/testcase.yaml b/tests/subsys/fs/zms/testcase.yaml
new file mode 100644
index 00000000000..bdee4529f2a
--- /dev/null
+++ b/tests/subsys/fs/zms/testcase.yaml
@@ -0,0 +1,28 @@
+common:
+  tags: zms
+tests:
+  filesystem.zms:
+    platform_allow:
+      - qemu_x86
+  filesystem.zms.0x00:
+    extra_args: DTC_OVERLAY_FILE=boards/qemu_x86_ev_0x00.overlay
+    platform_allow: qemu_x86
+  filesystem.zms.sim.no_erase:
+    extra_args: CONFIG_FLASH_SIMULATOR_EXPLICIT_ERASE=n
+    platform_allow: qemu_x86
+  filesystem.zms.sim.corrupt_close:
+    extra_args:
+      - CONFIG_FLASH_SIMULATOR_EXPLICIT_ERASE=y
+      - CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y
+    platform_allow: qemu_x86
+  filesystem.zms.cache:
+    extra_args:
+      - CONFIG_ZMS_LOOKUP_CACHE=y
+      - CONFIG_ZMS_LOOKUP_CACHE_SIZE=64
+    platform_allow: native_sim
+  filesystem.zms.data_crc:
+    extra_args:
+      - CONFIG_ZMS_DATA_CRC=y
+    platform_allow:
+      - native_sim
+      - qemu_x86

From 3af7f058f6d9eb619a1e6bdee0b9823ffec4bd89 Mon Sep 17 00:00:00 2001
From: Riadh Ghaddab <rghaddab@baylibre.com>
Date: Sat, 28 Sep 2024 07:24:33 +0200
Subject: [PATCH 0470/2913] [nrf fromtree] samples: fs: zms: add a sample app
 for ZMS storage system

This adds a user application that shows the usage of ZMS
The sample app shows three main functions of ZMS:
- read/write/delete key/value pairs
- fill all storage and delete it
- calculate free remaining space

Signed-off-by: Riadh Ghaddab <rghaddab@baylibre.com>
(cherry picked from commit fb7dae77ef937c008d9b62e062a515160703eb33)
(cherry picked from commit 7584f5092c5ed713f771e3a4f77e73c307fd88cd)
---
 samples/subsys/fs/zms/CMakeLists.txt |  10 +
 samples/subsys/fs/zms/README.rst     |  96 ++++++++++
 samples/subsys/fs/zms/prj.conf       |   5 +
 samples/subsys/fs/zms/sample.yaml    |  10 +
 samples/subsys/fs/zms/src/main.c     | 267 +++++++++++++++++++++++++++
 5 files changed, 388 insertions(+)
 create mode 100644 samples/subsys/fs/zms/CMakeLists.txt
 create mode 100644 samples/subsys/fs/zms/README.rst
 create mode 100644 samples/subsys/fs/zms/prj.conf
 create mode 100644 samples/subsys/fs/zms/sample.yaml
 create mode 100644 samples/subsys/fs/zms/src/main.c

diff --git a/samples/subsys/fs/zms/CMakeLists.txt b/samples/subsys/fs/zms/CMakeLists.txt
new file mode 100644
index 00000000000..33644e1d903
--- /dev/null
+++ b/samples/subsys/fs/zms/CMakeLists.txt
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(zms)
+
+
+target_sources(app PRIVATE src/main.c)
+target_include_directories(app PRIVATE ${ZEPHYR_BASE}/subsys/fs/zms)
diff --git a/samples/subsys/fs/zms/README.rst b/samples/subsys/fs/zms/README.rst
new file mode 100644
index 00000000000..f05d1fa0838
--- /dev/null
+++ b/samples/subsys/fs/zms/README.rst
@@ -0,0 +1,96 @@
+.. zephyr:code-sample:: zms
+   :name: Zephyr Memory Storage (ZMS)
+   :relevant-api: zms_high_level_api
+
+   Store and retrieve data from storage using the ZMS API.
+
+Overview
+********
+ The sample shows how to use ZMS to store ID/VALUE pairs and reads them back.
+ Deleting an ID/VALUE pair is also shown in this sample.
+
+ The sample stores the following items:
+
+ #. A string representing an IP address: stored at id=1, data="192.168.1.1"
+ #. A binary blob representing a key/value pair: stored at id=0xbeefdead,
+    data={0xDE, 0xAD, 0xBE, 0xEF, 0xDE, 0xAD, 0xBE, 0xEF}
+ #. A variable (32bit): stored at id=2, data=cnt
+ #. A long set of data (128 bytes)
+
+ A loop is executed where we mount the storage system, and then write all set
+ of data.
+
+ Each DELETE_ITERATION period, we delete all set of data and verify that it has been deleted.
+ We generate as well incremented ID/value pairs, we store them until storage is full, then we
+ delete them and verify that storage is empty.
+
+Requirements
+************
+
+* A board with flash support or native_sim target
+
+Building and Running
+********************
+
+This sample can be found under :zephyr_file:`samples/subsys/fs/zms` in the Zephyr tree.
+
+The sample can be built for several platforms, but for the moment it has been tested only
+on native_sim target
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/subsys/fs/zms
+   :goals: build
+   :compact:
+
+After running the generated image on a native_sim target, the output on the console shows the
+multiple Iterations of read/write/delete exectuted.
+
+Sample Output
+=============
+
+.. code-block:: console
+
+   *** Booting Zephyr OS build v3.7.0-2383-g624f75400242 ***
+   [00:00:00.000,000] <inf> fs_zms: 3 Sectors of 4096 bytes
+   [00:00:00.000,000] <inf> fs_zms: alloc wra: 0, fc0
+   [00:00:00.000,000] <inf> fs_zms: data wra: 0, 0
+   ITERATION: 0
+   Adding IP_ADDRESS 172.16.254.1 at id 1
+   Adding key/value at id beefdead
+   Adding counter at id 2
+   Adding Longarray at id 3
+   [00:00:00.000,000] <inf> fs_zms: 3 Sectors of 4096 bytes
+   [00:00:00.000,000] <inf> fs_zms: alloc wra: 0, f80
+   [00:00:00.000,000] <inf> fs_zms: data wra: 0, 8c
+   ITERATION: 1
+   ID: 1, IP Address: 172.16.254.1
+   Adding IP_ADDRESS 172.16.254.1 at id 1
+   Id: beefdead, Key: de ad be ef de ad be ef
+   Adding key/value at id beefdead
+   Id: 2, loop_cnt: 0
+   Adding counter at id 2
+   Id: 3, Longarray: 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 5
+   4 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f
+   Adding Longarray at id 3
+   .
+   .
+   .
+   .
+   .
+   .
+   [00:00:00.000,000] <inf> fs_zms: 3 Sectors of 4096 bytes
+   [00:00:00.000,000] <inf> fs_zms: alloc wra: 0, f40
+   [00:00:00.000,000] <inf> fs_zms: data wra: 0, 80
+   ITERATION: 299
+   ID: 1, IP Address: 172.16.254.1
+   Adding IP_ADDRESS 172.16.254.1 at id 1
+   Id: beefdead, Key: de ad be ef de ad be ef
+   Adding key/value at id beefdead
+   Id: 2, loop_cnt: 298
+   Adding counter at id 2
+   Id: 3, Longarray: 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 5
+   4 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f
+   Adding Longarray at id 3
+   Memory is full let's delete all items
+   Free space in storage is 8064 bytes
+   Sample code finished Successfully
diff --git a/samples/subsys/fs/zms/prj.conf b/samples/subsys/fs/zms/prj.conf
new file mode 100644
index 00000000000..343c5021899
--- /dev/null
+++ b/samples/subsys/fs/zms/prj.conf
@@ -0,0 +1,5 @@
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+
+CONFIG_ZMS=y
+CONFIG_LOG=y
diff --git a/samples/subsys/fs/zms/sample.yaml b/samples/subsys/fs/zms/sample.yaml
new file mode 100644
index 00000000000..802dabcf0f1
--- /dev/null
+++ b/samples/subsys/fs/zms/sample.yaml
@@ -0,0 +1,10 @@
+sample:
+  name: ZMS Sample
+
+tests:
+  sample.zms.basic:
+    tags: zms
+    depends_on: zms
+    platform_allow:
+      - qemu_x86
+      - native_posix
diff --git a/samples/subsys/fs/zms/src/main.c b/samples/subsys/fs/zms/src/main.c
new file mode 100644
index 00000000000..a2166392724
--- /dev/null
+++ b/samples/subsys/fs/zms/src/main.c
@@ -0,0 +1,267 @@
+/*
+ * Copyright (c) 2024 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * ZMS Sample for Zephyr using high level API.
+ *
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/sys/reboot.h>
+#include <zephyr/device.h>
+#include <string.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/fs/zms.h>
+
+static struct zms_fs fs;
+
+#define ZMS_PARTITION        storage_partition
+#define ZMS_PARTITION_DEVICE FIXED_PARTITION_DEVICE(ZMS_PARTITION)
+#define ZMS_PARTITION_OFFSET FIXED_PARTITION_OFFSET(ZMS_PARTITION)
+
+#define IP_ADDRESS_ID 1
+#define KEY_VALUE_ID  0xbeefdead
+#define CNT_ID        2
+#define LONG_DATA_ID  3
+
+#define MAX_ITERATIONS   300
+#define DELETE_ITERATION 10
+
+static int delete_and_verify_items(struct zms_fs *fs, uint32_t id)
+{
+	int rc = 0;
+
+	rc = zms_delete(fs, id);
+	if (rc) {
+		goto error1;
+	}
+	rc = zms_get_data_length(fs, id);
+	if (rc > 0) {
+		goto error2;
+	}
+
+	return 0;
+error1:
+	printk("Error while deleting item rc=%d\n", rc);
+	return rc;
+error2:
+	printk("Error, Delete failed item should not be present\n");
+	return -1;
+}
+
+static int delete_basic_items(struct zms_fs *fs)
+{
+	int rc = 0;
+
+	rc = delete_and_verify_items(fs, IP_ADDRESS_ID);
+	if (rc) {
+		printk("Error while deleting item %x rc=%d\n", IP_ADDRESS_ID, rc);
+		return rc;
+	}
+	rc = delete_and_verify_items(fs, KEY_VALUE_ID);
+	if (rc) {
+		printk("Error while deleting item %x rc=%d\n", KEY_VALUE_ID, rc);
+		return rc;
+	}
+	rc = delete_and_verify_items(fs, CNT_ID);
+	if (rc) {
+		printk("Error while deleting item %x rc=%d\n", CNT_ID, rc);
+		return rc;
+	}
+	rc = delete_and_verify_items(fs, LONG_DATA_ID);
+	if (rc) {
+		printk("Error while deleting item %x rc=%d\n", LONG_DATA_ID, rc);
+	}
+
+	return rc;
+}
+
+int main(void)
+{
+	int rc = 0;
+	char buf[16];
+	uint8_t key[8] = {0xDE, 0xAD, 0xBE, 0xEF, 0xDE, 0xAD, 0xBE, 0xEF}, longarray[128];
+	uint32_t i_cnt = 0U, i;
+	uint32_t id = 0;
+	ssize_t free_space = 0;
+	struct flash_pages_info info;
+
+	for (int n = 0; n < sizeof(longarray); n++) {
+		longarray[n] = n;
+	}
+
+	/* define the zms file system by settings with:
+	 *	sector_size equal to the pagesize,
+	 *	3 sectors
+	 *	starting at ZMS_PARTITION_OFFSET
+	 */
+	fs.flash_device = ZMS_PARTITION_DEVICE;
+	if (!device_is_ready(fs.flash_device)) {
+		printk("Storage device %s is not ready\n", fs.flash_device->name);
+		return 0;
+	}
+	fs.offset = ZMS_PARTITION_OFFSET;
+	rc = flash_get_page_info_by_offs(fs.flash_device, fs.offset, &info);
+	if (rc) {
+		printk("Unable to get page info, rc=%d\n", rc);
+		return 0;
+	}
+	fs.sector_size = info.size;
+	fs.sector_count = 3U;
+
+	for (i = 0; i < MAX_ITERATIONS; i++) {
+		rc = zms_mount(&fs);
+		if (rc) {
+			printk("Storage Init failed, rc=%d\n", rc);
+			return 0;
+		}
+
+		printk("ITERATION: %u\n", i);
+		/* IP_ADDRESS_ID is used to store an address, lets see if we can
+		 * read it from flash, since we don't know the size read the
+		 * maximum possible
+		 */
+		rc = zms_read(&fs, IP_ADDRESS_ID, &buf, sizeof(buf));
+		if (rc > 0) {
+			/* item was found, show it */
+			buf[rc] = '\0';
+			printk("ID: %u, IP Address: %s\n", IP_ADDRESS_ID, buf);
+		}
+		/* Rewriting ADDRESS IP even if we found it */
+		strncpy(buf, "172.16.254.1", sizeof(buf) - 1);
+		printk("Adding IP_ADDRESS %s at id %u\n", buf, IP_ADDRESS_ID);
+		rc = zms_write(&fs, IP_ADDRESS_ID, &buf, strlen(buf));
+		if (rc < 0) {
+			printk("Error while writing Entry rc=%d\n", rc);
+			break;
+		}
+
+		/* KEY_VALUE_ID is used to store a key/value pair , lets see if we can read
+		 * it from storage.
+		 */
+		rc = zms_read(&fs, KEY_VALUE_ID, &key, sizeof(key));
+		if (rc > 0) { /* item was found, show it */
+			printk("Id: %x, Key: ", KEY_VALUE_ID);
+			for (int n = 0; n < 8; n++) {
+				printk("%x ", key[n]);
+			}
+			printk("\n");
+		}
+		/* Rewriting KEY_VALUE even if we found it */
+		printk("Adding key/value at id %x\n", KEY_VALUE_ID);
+		rc = zms_write(&fs, KEY_VALUE_ID, &key, sizeof(key));
+		if (rc < 0) {
+			printk("Error while writing Entry rc=%d\n", rc);
+			break;
+		}
+
+		/* CNT_ID is used to store the loop counter, lets see
+		 * if we can read it from storage
+		 */
+		rc = zms_read(&fs, CNT_ID, &i_cnt, sizeof(i_cnt));
+		if (rc > 0) { /* item was found, show it */
+			printk("Id: %d, loop_cnt: %u\n", CNT_ID, i_cnt);
+			if (i_cnt != (i - 1)) {
+				break;
+			}
+		}
+		printk("Adding counter at id %u\n", CNT_ID);
+		rc = zms_write(&fs, CNT_ID, &i, sizeof(i));
+		if (rc < 0) {
+			printk("Error while writing Entry rc=%d\n", rc);
+			break;
+		}
+
+		/* LONG_DATA_ID is used to store a larger dataset ,lets see if we can read
+		 * it from flash
+		 */
+		rc = zms_read(&fs, LONG_DATA_ID, &longarray, sizeof(longarray));
+		if (rc > 0) {
+			/* item was found, show it */
+			printk("Id: %d, Longarray: ", LONG_DATA_ID);
+			for (int n = 0; n < sizeof(longarray); n++) {
+				printk("%x ", longarray[n]);
+			}
+			printk("\n");
+		}
+		/* Rewrite the entry even if we found it */
+		printk("Adding Longarray at id %d\n", LONG_DATA_ID);
+		rc = zms_write(&fs, LONG_DATA_ID, &longarray, sizeof(longarray));
+		if (rc < 0) {
+			printk("Error while writing Entry rc=%d\n", rc);
+			break;
+		}
+
+		/* Each DELETE_ITERATION delete all basic items */
+		if (!(i % DELETE_ITERATION) && (i)) {
+			rc = delete_basic_items(&fs);
+			if (rc) {
+				break;
+			}
+		}
+	}
+
+	if (i != MAX_ITERATIONS) {
+		printk("Error: Something went wrong at iteration %u rc=%d\n", i - 1, rc);
+		return 0;
+	}
+
+	while (1) {
+		/* fill all storage */
+		rc = zms_write(&fs, id, &id, sizeof(uint32_t));
+		if (rc < 0) {
+			break;
+		}
+		id++;
+	}
+
+	if (rc == -ENOSPC) {
+		/* Calculate free space and verify that it is 0 */
+		free_space = zms_calc_free_space(&fs);
+		if (free_space < 0) {
+			printk("Error while computing free space, rc=%d\n", free_space);
+			return 0;
+		}
+		if (free_space > 0) {
+			printk("Error: free_space should be 0, computed %u\n", free_space);
+			return 0;
+		}
+		printk("Memory is full let's delete all items\n");
+
+		/* Now delete all previously written items */
+		for (uint32_t n = 0; n < id; n++) {
+			rc = delete_and_verify_items(&fs, n);
+			if (rc) {
+				printk("Error deleting at id %u\n", n);
+				return 0;
+			}
+		}
+		rc = delete_basic_items(&fs);
+		if (rc) {
+			printk("Error deleting basic items\n");
+			return 0;
+		}
+	}
+
+	/*
+	 * Let's compute free space in storage. But before doing that let's Garbage collect
+	 * all sectors where we deleted all entries and then compute the free space
+	 */
+	for (uint32_t i = 0; i < fs.sector_count; i++) {
+		rc = zms_sector_use_next(&fs);
+		if (rc) {
+			printk("Error while changing sector rc=%d\n", rc);
+		}
+	}
+	free_space = zms_calc_free_space(&fs);
+	if (free_space < 0) {
+		printk("Error while computing free space, rc=%d\n", free_space);
+		return 0;
+	}
+	printk("Free space in storage is %u bytes\n", free_space);
+	printk("Sample code finished Successfully\n");
+
+	return 0;
+}

From 509ec379cffaf53ac81846ad90ee1e5e4539fc60 Mon Sep 17 00:00:00 2001
From: Riadh Ghaddab <rghaddab@baylibre.com>
Date: Wed, 9 Oct 2024 04:08:22 +0200
Subject: [PATCH 0471/2913] [nrf fromtree] doc: zms: add documentation for ZMS

This adds the documentation for the Zephyr Memory Storage system.

Signed-off-by: Riadh Ghaddab <rghaddab@baylibre.com>
(cherry picked from commit 3c4fcaa2c0e2c525d416ae248574a2fb505eff7b)
(cherry picked from commit 77095d52e9f60c83ccaef0d3376a680d7cd0efdd)
---
 doc/services/storage/index.rst   |   1 +
 doc/services/storage/zms/zms.rst | 432 +++++++++++++++++++++++++++++++
 2 files changed, 433 insertions(+)
 create mode 100644 doc/services/storage/zms/zms.rst

diff --git a/doc/services/storage/index.rst b/doc/services/storage/index.rst
index 8d3dd3da50c..f6e069ecf2a 100644
--- a/doc/services/storage/index.rst
+++ b/doc/services/storage/index.rst
@@ -7,6 +7,7 @@ Storage
    :maxdepth: 1
 
    nvs/nvs.rst
+   zms/zms.rst
    disk/access.rst
    flash_map/flash_map.rst
    fcb/fcb.rst
diff --git a/doc/services/storage/zms/zms.rst b/doc/services/storage/zms/zms.rst
new file mode 100644
index 00000000000..d1125e0505d
--- /dev/null
+++ b/doc/services/storage/zms/zms.rst
@@ -0,0 +1,432 @@
+.. _zms_api:
+
+Zephyr Memory Storage (ZMS)
+###########################
+Zephyr Memory Storage is a new key-value storage system that is designed to work with all types
+of non-volatile storage technologies. It supports classical on-chip NOR flash as well as new
+technologies like RRAM and MRAM that do not require a separate erase operation at all, that is,
+data on these types of devices can be overwritten directly at any time.
+
+General behavior
+****************
+ZMS divides the memory space into sectors (minimum 2), and each sector is filled with key-value
+pairs until it is full.
+
+The key-value pair is divided into two parts:
+
+- The key part is written in an ATE (Allocation Table Entry) called "ID-ATE" which is stored
+  starting from the bottom of the sector
+- The value part is defined as "DATA" and is stored raw starting from the top of the sector
+
+Additionally, for each sector we store at the last positions Header-ATEs which are ATEs that
+are needed for the sector to describe its status (closed, open) and the current version of ZMS.
+
+When the current sector is full we verify first that the following sector is empty, we garbage
+collect the N+2 sector (where N is the current sector number) by moving the valid ATEs to the
+N+1 empty sector, we erase the garbage collected sector and then we close the current sector by
+writing a garbage_collect_done ATE and the close ATE (one of the header entries).
+Afterwards we move forward to the next sector and start writing entries again.
+
+This behavior is repeated until it reaches the end of the partition. Then it starts again from
+the first sector after garbage collecting it and erasing its content.
+
+Composition of a sector
+=======================
+A sector is organized in this form (example with 3 sectors):
+
+.. list-table::
+   :widths: 25 25 25
+   :header-rows: 1
+
+   * - Sector 0 (closed)
+     - Sector 1 (open)
+     - Sector 2 (empty)
+   * - Data_a0
+     - Data_b0
+     - Data_c0
+   * - Data_a1
+     - Data_b1
+     - Data_c1
+   * - Data_a2
+     - Data_b2
+     - Data_c2
+   * - GC_done
+     -    .
+     -    .
+   * -    .
+     -    .
+     -    .
+   * -    .
+     -    .
+     -    .
+   * -    .
+     - ATE_b2
+     - ATE_c2
+   * - ATE_a2
+     - ATE_b1
+     - ATE_c1
+   * - ATE_a1
+     - ATE_b0
+     - ATE_c0
+   * - ATE_a0
+     - GC_done
+     - GC_done
+   * - Close (cyc=1)
+     - Close (cyc=1)
+     - Close (cyc=1)
+   * - Empty (cyc=1)
+     - Empty (cyc=2)
+     - Empty (cyc=2)
+
+Definition of each element in the sector
+========================================
+
+``Empty ATE:`` is written when erasing a sector (last position of the sector).
+
+``Close ATE:`` is written when closing a sector (second to last position of the sector).
+
+``GC_done ATE:`` is written to indicate that the next sector has been already garbage
+collected. This ATE could be in any position of the sector.
+
+``ID-ATE:`` are entries that contain a 32 bits Key and describe where the data is stored, its
+size and its crc32
+
+``Data:`` is the actual value associated to the ID-ATE
+
+How does ZMS work?
+******************
+
+Mounting the Storage system
+===========================
+
+Mounting the storage starts by getting the flash parameters, checking that the file system
+properties are correct (sector_size, sector_count ...) then calling the zms_init function to
+make the storage ready.
+
+To mount the filesystem some elements in the zms_fs structure must be initialized.
+
+.. code-block:: c
+
+	struct zms_fs {
+		/** File system offset in flash **/
+		off_t offset;
+
+		/** Storage system is split into sectors, each sector size must be multiple of
+		 * erase-blocks if the device has erase capabilities
+		 */
+		uint32_t sector_size;
+		/** Number of sectors in the file system */
+		uint32_t sector_count;
+
+		/** Flash device runtime structure */
+		const struct device *flash_device;
+	};
+
+Initialization
+==============
+
+As ZMS has a fast-forward write mechanism, we must find the last sector and the last pointer of
+the entry where it stopped the last time.
+It must look for a closed sector followed by an open one, then within the open sector, it finds
+(recover) the last written ATE (Allocation Table Entry).
+After that, it checks that the sector after this one is empty, or it will erase it.
+
+ZMS ID-Data write
+===================
+
+To avoid rewriting the same data with the same ID again, it must look in all the sectors if the
+same ID exist then compares its data, if the data is identical no write is performed.
+If we must perform a write, then an ATE and Data (if not a delete) are written in the sector.
+If the sector is full (cannot hold the current data + ATE) we have to move to the next sector,
+garbage collect the sector after the newly opened one then erase it.
+Data size that is smaller or equal to 8 bytes are written within the ATE.
+
+ZMS ID/data read (with history)
+===============================
+
+By default it looks for the last data with the same ID by browsing through all stored ATEs from
+the most recent ones to the oldest ones. If it finds a valid ATE with a matching ID it retrieves
+its data and returns the number of bytes that were read.
+If history count is provided that is different than 0, older data with same ID is retrieved.
+
+ZMS free space calculation
+==========================
+
+ZMS can also return the free space remaining in the partition.
+However, this operation is very time consuming and needs to browse all valid ATEs in all sectors
+of the partition and for each valid ATE try to find if an older one exist.
+It is not recommended for application to use this function often, as it is time consuming and
+could slow down the calling thread.
+
+The cycle counter
+=================
+
+Each sector has a lead cycle counter which is a uin8_t that is used to validate all the other
+ATEs.
+The lead cycle counter is stored in the empty ATE.
+To become valid, an ATE must have the same cycle counter as the one stored in the empty ATE.
+Each time an ATE is moved from a sector to another it must get the cycle counter of the
+destination sector.
+To erase a sector, the cycle counter of the empty ATE is incremented and a single write of the
+empty ATE is done.
+All the ATEs in that sector become invalid.
+
+Closing sectors
+===============
+
+To close a sector a close ATE is added at the end of the sector and it must have the same cycle
+counter as the empty ATE.
+When closing a sector, all the remaining space that has not been used is filled with garbage data
+to avoid having old ATEs with a valid cycle counter.
+
+Triggering Garbage collection
+=============================
+
+Some applications need to make sure that storage writes have a maximum defined latency.
+When calling a ZMS write, the current sector could be almost full and we need to trigger the GC
+to switch to the next sector.
+This operation is time consuming and it will cause some applications to not meet their real time
+constraints.
+ZMS adds an API for the application to get the current remaining free space in a sector.
+The application could then decide when needed to switch to the next sector if the current one is
+almost full and of course it will trigger the garbage collection on the next sector.
+This will guarantee the application that the next write won't trigger the garbage collection.
+
+ATE (Allocation Table Entry) structure
+======================================
+
+An entry has 16 bytes divided between these variables :
+
+.. code-block:: c
+
+	struct zms_ate {
+		uint8_t crc8;      /* crc8 check of the entry */
+		uint8_t cycle_cnt; /* cycle counter for non erasable devices */
+		uint32_t id;       /* data id */
+		uint16_t len;      /* data len within sector */
+		union {
+			uint8_t data[8]; /* used to store small size data */
+			struct {
+				uint32_t offset; /* data offset within sector */
+				union {
+					uint32_t data_crc; /* crc for data */
+					uint32_t metadata; /* Used to store metadata information
+							    * such as storage version.
+							    */
+				};
+			};
+		};
+	} __packed;
+
+.. note:: The data CRC is checked only when the whole data of the element is read.
+   The data CRC is not checked for a partial read, as it is computed for the complete set of data.
+
+.. note:: Enabling the data CRC feature on a previously existing ZMS content without
+   data CRC will make all existing data invalid.
+
+.. _free-space:
+
+Available space for user data (key-value pairs)
+***********************************************
+
+For both scenarios ZMS should have always an empty sector to be able to perform the garbage
+collection.
+So if we suppose that 4 sectors exist in a partition, ZMS will only use 3 sectors to store
+Key-value pairs and keep always one (rotating sector) empty to be able to launch GC.
+
+.. note:: The maximum single data length that could be written at once in a sector is 64K
+   (This could change in future versions of ZMS)
+
+Small data values
+=================
+
+For small data values (<= 8 bytes), the data is stored within the entry (ATE) itself and no data
+is written at the top of the sector.
+ZMS has an entry size of 16 bytes which means that the maximum available space in a partition to
+store data is computed in this scenario as :
+
+.. math::
+
+   \small\frac{(NUM\_SECTORS - 1) \times (SECTOR\_SIZE - (5 \times ATE\_SIZE))}{2}
+
+Where:
+
+``NUM_SECTOR:`` Total number of sectors
+
+``SECTOR_SIZE:`` Size of the sector
+
+``ATE_SIZE:`` 16 bytes
+
+``(5 * ATE_SIZE):`` Reserved ATEs for header and delete items
+
+For example for 4 sectors of 1024 bytes, free space for data is :math:`\frac{3 \times 944}{2} = 1416 \, \text{ bytes}`.
+
+Large data values
+=================
+
+Large data values ( > 8 bytes) are stored separately at the top of the sector.
+In this case it is hard to estimate the free available space as this depends on the size of
+the data. But we can take into account that for N bytes of data (N > 8 bytes) an additional
+16 bytes of ATE must be added at the bottom of the sector.
+
+Let's take an example:
+
+For a partition that has 4 sectors of 1024 bytes and for data size of 64 bytes.
+Only 3 sectors are available for writes with a capacity of 944 bytes each.
+Each Key-value pair needs an extra 16 bytes for ATE which makes it possible to store 11 pairs
+in each sectors (:math:`\frac{944}{80}`).
+Total data that could be stored in this partition for this case is :math:`11 \times 3 \times 64 = 2112 \text{ bytes}`
+
+.. _wear-leveling:
+
+Wear leveling
+*************
+
+This storage system is optimized for devices that do not require an erase.
+Using storage systems that rely on an erase-value (NVS as an example) will need to emulate the
+erase with write operations. This will cause a significant decrease in the life expectancy of
+these devices and will cause more delays for write operations and for initialization.
+ZMS introduces a cycle count mechanism that avoids emulating erase operation for these devices.
+It also guarantees that every memory location is written only once for each cycle of sector write.
+
+As an example, to erase a 4096 bytes sector on a non erasable device using NVS, 256 flash writes
+must be performed (supposing that write-block-size=16 bytes), while using ZMS only 1 write of
+16 bytes is needed. This operation is 256 times faster in this case.
+
+Garbage collection operation is also adding some writes to the memory cell life expectancy as it
+is moving some blocks from one sector to another.
+To make the garbage collector not affect the life expectancy of the device it is recommended
+to dimension correctly the partition size. Its size should be the double of the maximum size of
+data (including extra headers) that could be written in the storage.
+
+See :ref:`free-space`.
+
+Device lifetime calculation
+===========================
+
+Storage devices whether they are classical Flash or new technologies like RRAM/MRAM has a limited
+life expectancy which is determined by the number of times memory cells can be erased/written.
+Flash devices are erased one page at a time as part of their functional behavior (otherwise
+memory cells cannot be overwritten) and for non erasable storage devices memory cells can be
+overwritten directly.
+
+A typical scenario is shown here to calculate the life expectancy of a device.
+Let's suppose that we store an 8 bytes variable using the same ID but its content changes every
+minute. The partition has 4 sectors with 1024 bytes each.
+Each write of the variable requires 16 bytes of storage.
+As we have 944 bytes available for ATEs for each sector, and because ZMS is a fast-forward
+storage system, we are going to rewrite the first location of the first sector after
+:math:`\frac{(944 \times 4)}{16} = 236 \text{ minutes}`.
+
+In addition to the normal writes, garbage collector will move the still valid data from old
+sectors to new ones.
+As we are using the same ID and a big partition size, no data will be moved by the garbage
+collector in this case.
+For storage devices that could be written 20000 times, the storage will last about
+4.720.000 minutes (~9 years).
+
+To make a more general formula we must first compute the effective used size in ZMS by our
+typical set of data.
+For id/data pair with data <= 8 bytes, effective_size is 16 bytes
+For id/data pair with data > 8 bytes, effective_size is 16 bytes + sizeof(data)
+Let's suppose that total_effective_size is the total size of the set of data that is written in
+the storage and that the partition is well dimensioned (double of the effective size) to avoid
+having the garbage collector moving blocks all the time.
+
+The expected life of the device in minutes is computed as :
+
+.. math::
+
+   \small\frac{(SECTOR\_EFFECTIVE\_SIZE \times SECTOR\_NUMBER \times MAX\_NUM\_WRITES)}{(TOTAL\_EFFECTIVE\_SIZE \times WR\_MIN)}
+
+Where:
+
+``SECTOR_EFFECTIVE_SIZE``: is the size sector - header_size(80 bytes)
+
+``SECTOR_NUMBER``: is the number of sectors
+
+``MAX_NUM_WRITES``: is the life expectancy of the storage device in number of writes
+
+``TOTAL_EFFECTIVE_SIZE``: Total effective size of the set of written data
+
+``WR_MIN``: Number of writes of the set of data per minute
+
+Features
+********
+ZMS has introduced many features compared to existing storage system like NVS and will evolve
+from its initial version to include more features that satisfies new technologies requirements
+such as low latency and bigger storage space.
+
+Existing features
+=================
+Version1
+--------
+- Supports non erasable devices (only one write operation to erase a sector)
+- Supports large partition size and sector size (64 bits address space)
+- Supports large IDs width (32 bits) to store ID/Value pairs
+- Small sized data ( <= 8 bytes) are stored in the ATE itself
+- Built-in Data CRC32 (included in the ATE)
+- Versionning of ZMS (to handle future evolution)
+- Supports large write-block-size (Only for platforms that need this)
+
+Future features
+===============
+
+- Add multiple format ATE support to be able to use ZMS with different ATE formats that satisfies
+  requirements from application
+- Add the possibility to skip garbage collector for some application usage where ID/value pairs
+  are written periodically and do not exceed half of the partition size (ther is always an old
+  entry with the same ID).
+- Divide IDs into namespaces and allocate IDs on demand from application to handle collisions
+  between IDs used by different subsystems or samples.
+- Add the possibility to retrieve the wear out value of the device based on the cycle count value
+- Add a recovery function that can recover a storage partition if something went wrong
+- Add a library/application to allow migration from NVS entries to ZMS entries
+- Add the possibility to force formatting the storage partition to the ZMS format if something
+  went wrong when mounting the storage.
+
+ZMS and other storage systems in Zephyr
+=======================================
+This section describes ZMS in the wider context of storage systems in Zephyr (not full filesystems,
+but simpler, non-hierarchical ones).
+Today Zephyr includes at least two other systems that are somewhat comparable in scope and
+functionality: :ref:`NVS <nvs_api>` and :ref:`FCB <fcb_api>`.
+Which one to use in your application will depend on your needs and the hardware you are using,
+and this section provides information to help make a choice.
+
+- If you are using a non erasable technology device like RRAM or MRAM, :ref:`ZMS <zms_api>` is definitely the
+  best fit for your storage subsystem as it is designed very well to avoid emulating erase for
+  these devices and replace it by a single write call.
+- For devices with large write_block_size and/or needs a sector size that is different than the
+  classical flash page size (equal to erase_block_size), :ref:`ZMS <zms_api>` is also the best fit as there is
+  the possibility to customize these parameters and add the support of these devices in ZMS.
+- For classical flash technology devices, :ref:`NVS <nvs_api>` is recommended as it has low footprint (smaller
+  ATEs and smaller header ATEs). Erasing flash in NVS is also very fast and do not require an
+  additional write operation compared to ZMS.
+  For these devices, NVS reads/writes will be faster as well than ZMS as it has smaller ATE size.
+- If your application needs more than 64K IDs for storage, :ref:`ZMS <zms_api>` is recommended here as it
+  has a 32-bit ID field.
+- If your application is working in a FIFO mode (First-in First-out) then :ref:`FCB <fcb_api>` is
+  the best storage solution for this use case.
+
+More generally to make the right choice between NVS and ZMS, all the blockers should be first
+verified to make sure that the application could work with one subsystem or the other, then if
+both solutions could be implemented, the best choice should be based on the calculations of the
+life expectancy of the device described in this section: :ref:`wear-leveling`.
+
+Sample
+******
+
+A sample of how ZMS can be used is supplied in :zephyr:code-sample:`zms`.
+
+API Reference
+*************
+
+The ZMS subsystem APIs are provided by ``zms.h``:
+
+.. doxygengroup:: zms_data_structures
+
+.. doxygengroup:: zms_high_level_api
+
+.. comment
+   not documenting .. doxygengroup:: zms

From 031c3c0bec0931ae011c78d36637a57c5cdfd3aa Mon Sep 17 00:00:00 2001
From: Riadh Ghaddab <rghaddab@baylibre.com>
Date: Fri, 11 Oct 2024 10:06:38 +0200
Subject: [PATCH 0472/2913] [nrf noup] settings: zms: use dedicated lookup
 cache hash function

Introduce ZMS_LOOKUP_CACHE_FOR_SETTINGS Kconfig option that enables a
dedicated hash function for the ZMS lookup cache that takes advantage
of the ZMS ID allocation scheme used by the ZMS settings backend.
As such, this option should only be used if an application uses ZMS via
the settings layer.

Signed-off-by: Riadh Ghaddab <rghaddab@baylibre.com>
(cherry picked from commit 6ccfcdc1051d9d405f694882beb4f306ae518b5c)
(cherry picked from commit 810873eb0e62f9e53b0e022b93107682f193726c)
---
 subsys/fs/zms/Kconfig |  9 +++++++++
 subsys/fs/zms/zms.c   | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/subsys/fs/zms/Kconfig b/subsys/fs/zms/Kconfig
index 330ef11155c..42f23905e09 100644
--- a/subsys/fs/zms/Kconfig
+++ b/subsys/fs/zms/Kconfig
@@ -50,6 +50,15 @@ config ZMS_MAX_BLOCK_SIZE
 	help
 	  Changes the internal buffer size of ZMS
 
+config ZMS_LOOKUP_CACHE_FOR_SETTINGS
+	bool "ZMS Storage lookup cache optimized for settings"
+	depends on ZMS_LOOKUP_CACHE
+	help
+	  Use the lookup cache hash function that results in the least number of
+	  collissions and, in turn, the best ZMS performance provided that the ZMS
+	  is used as the settings backend only. This option should NOT be enabled
+	  if the ZMS is also written to directly, outside the settings layer.
+
 module = ZMS
 module-str = zms
 source "subsys/logging/Kconfig.template.log_config"
diff --git a/subsys/fs/zms/zms.c b/subsys/fs/zms/zms.c
index 21930313109..814a08a8839 100644
--- a/subsys/fs/zms/zms.c
+++ b/subsys/fs/zms/zms.c
@@ -11,6 +11,10 @@
 #include <zephyr/fs/zms.h>
 #include <zephyr/sys/crc.h>
 #include "zms_priv.h"
+#ifdef CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS
+#include <zephyr/sys/util.h>
+#include <settings/settings_zms.h>
+#endif
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(fs_zms, CONFIG_ZMS_LOG_LEVEL);
@@ -25,6 +29,45 @@ static int zms_ate_valid_different_sector(struct zms_fs *fs, const struct zms_at
 
 #ifdef CONFIG_ZMS_LOOKUP_CACHE
 
+#ifdef CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS
+
+static inline size_t zms_lookup_cache_pos(uint32_t id)
+{
+	/*
+	 * 1. The ZMS settings backend uses up to (ZMS_NAME_ID_OFFSET - 1) ZMS IDs to
+	      store keys and equal number of ZMS IDs to store values.
+	 * 2. For each key-value pair, the value is stored at ZMS ID greater by exactly
+	 *    ZMS_NAME_ID_OFFSET than ZMS ID that holds the key.
+	 * 3. The backend tries to minimize the range of ZMS IDs used to store keys.
+	 *    That is, ZMS IDs are allocated sequentially, and freed ZMS IDs are reused
+	 *    before allocating new ones.
+	 *
+	 * Therefore, to assure the least number of collisions in the lookup cache,
+	 * the least significant bit of the hash indicates whether the given ZMS ID
+	 * represents a key or a value, and remaining bits of the hash are set to
+	 * the ordinal number of the key-value pair. Consequently, the hash function
+	 * provides the following mapping:
+	 *
+	 * 1st settings key   => hash 0
+	 * 1st settings value => hash 1
+	 * 2nd settings key   => hash 2
+	 * 2nd settings value => hash 3
+	 * ...
+	 */
+	BUILD_ASSERT(IS_POWER_OF_TWO(ZMS_NAMECNT_ID), "ZMS_NAMECNT_ID is not power of 2");
+	BUILD_ASSERT(IS_POWER_OF_TWO(ZMS_NAME_ID_OFFSET), "ZMS_NAME_ID_OFFSET is not power of 2");
+
+	uint32_t key_value_bit;
+	uint32_t key_value_ord;
+
+	key_value_bit = (id >> LOG2(ZMS_NAME_ID_OFFSET)) & 1;
+	key_value_ord = id & (ZMS_NAME_ID_OFFSET - 1);
+
+	return ((key_value_ord << 1) | key_value_bit) % CONFIG_ZMS_LOOKUP_CACHE_SIZE;
+}
+
+#else /* CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS */
+
 static inline size_t zms_lookup_cache_pos(uint32_t id)
 {
 	uint32_t hash;
@@ -40,6 +83,8 @@ static inline size_t zms_lookup_cache_pos(uint32_t id)
 	return hash % CONFIG_ZMS_LOOKUP_CACHE_SIZE;
 }
 
+#endif /* CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS */
+
 static int zms_lookup_cache_rebuild(struct zms_fs *fs)
 {
 	int rc, previous_sector_num = ZMS_INVALID_SECTOR_NUM;

From f73e4775b8e9d093369cdd8dcbcbf3bf78fd6889 Mon Sep 17 00:00:00 2001
From: Riadh Ghaddab <rghaddab@baylibre.com>
Date: Wed, 23 Oct 2024 18:09:14 +0200
Subject: [PATCH 0473/2913] [nrf fromlist] fs: zms: multiple fixes from
 previous PR review

This resolves some addressed comments in this PR
https://github.com/zephyrproject-rtos/zephyr/pull/77930

It adds as well a section in the documentation about some
recommendations to increase ZMS performance.

Upstream PR #: 80407

Signed-off-by: Riadh Ghaddab <rghaddab@baylibre.com>
(cherry picked from commit a40ba482bd65ba75540454468cbce4cfcbcc4bf2)
(cherry picked from commit 53f2704972225653a7b9cfe656476a475773d660)
---
 doc/services/storage/zms/zms.rst |  84 +++++++++++-----
 include/zephyr/fs/zms.h          | 108 ++++++++++-----------
 samples/subsys/fs/zms/src/main.c |  18 +++-
 subsys/fs/zms/Kconfig            |  16 +--
 subsys/fs/zms/zms.c              | 162 ++++++++++++++++++++-----------
 subsys/fs/zms/zms_priv.h         |  13 +--
 tests/subsys/fs/zms/src/main.c   |  53 +++++-----
 7 files changed, 273 insertions(+), 181 deletions(-)

diff --git a/doc/services/storage/zms/zms.rst b/doc/services/storage/zms/zms.rst
index d1125e0505d..02fed3cf77c 100644
--- a/doc/services/storage/zms/zms.rst
+++ b/doc/services/storage/zms/zms.rst
@@ -201,9 +201,9 @@ An entry has 16 bytes divided between these variables :
 
 	struct zms_ate {
 		uint8_t crc8;      /* crc8 check of the entry */
-		uint8_t cycle_cnt; /* cycle counter for non erasable devices */
-		uint32_t id;       /* data id */
+		uint8_t cycle_cnt; /* cycle counter for non-erasable devices */
 		uint16_t len;      /* data len within sector */
+		uint32_t id;       /* data id */
 		union {
 			uint8_t data[8]; /* used to store small size data */
 			struct {
@@ -218,21 +218,22 @@ An entry has 16 bytes divided between these variables :
 		};
 	} __packed;
 
-.. note:: The data CRC is checked only when the whole data of the element is read.
-   The data CRC is not checked for a partial read, as it is computed for the complete set of data.
+.. note:: The CRC of the data is checked only when the whole the element is read.
+   The CRC of the data is not checked for a partial read, as it is computed for the whole element.
 
-.. note:: Enabling the data CRC feature on a previously existing ZMS content without
-   data CRC will make all existing data invalid.
+.. note:: Enabling the CRC feature on previously existing ZMS content without CRC enabled
+   will make all existing data invalid.
 
 .. _free-space:
 
 Available space for user data (key-value pairs)
 ***********************************************
 
-For both scenarios ZMS should have always an empty sector to be able to perform the garbage
-collection.
-So if we suppose that 4 sectors exist in a partition, ZMS will only use 3 sectors to store
-Key-value pairs and keep always one (rotating sector) empty to be able to launch GC.
+For both scenarios ZMS should always have an empty sector to be able to perform the
+garbage collection (GC).
+So, if we suppose that 4 sectors exist in a partition, ZMS will only use 3 sectors to store
+Key-value pairs and keep one sector empty to be able to launch GC.
+The empty sector will rotate between the 4 sectors in the partition.
 
 .. note:: The maximum single data length that could be written at once in a sector is 64K
    (This could change in future versions of ZMS)
@@ -240,8 +241,8 @@ Key-value pairs and keep always one (rotating sector) empty to be able to launch
 Small data values
 =================
 
-For small data values (<= 8 bytes), the data is stored within the entry (ATE) itself and no data
-is written at the top of the sector.
+Values smaller than 8 bytes will be stored within the entry (ATE) itself, without writing data
+at the top of the sector.
 ZMS has an entry size of 16 bytes which means that the maximum available space in a partition to
 store data is computed in this scenario as :
 
@@ -265,7 +266,7 @@ Large data values
 =================
 
 Large data values ( > 8 bytes) are stored separately at the top of the sector.
-In this case it is hard to estimate the free available space as this depends on the size of
+In this case, it is hard to estimate the free available space, as this depends on the size of
 the data. But we can take into account that for N bytes of data (N > 8 bytes) an additional
 16 bytes of ATE must be added at the bottom of the sector.
 
@@ -286,17 +287,17 @@ This storage system is optimized for devices that do not require an erase.
 Using storage systems that rely on an erase-value (NVS as an example) will need to emulate the
 erase with write operations. This will cause a significant decrease in the life expectancy of
 these devices and will cause more delays for write operations and for initialization.
-ZMS introduces a cycle count mechanism that avoids emulating erase operation for these devices.
+ZMS uses a cycle count mechanism that avoids emulating erase operation for these devices.
 It also guarantees that every memory location is written only once for each cycle of sector write.
 
-As an example, to erase a 4096 bytes sector on a non erasable device using NVS, 256 flash writes
+As an example, to erase a 4096 bytes sector on a non-erasable device using NVS, 256 flash writes
 must be performed (supposing that write-block-size=16 bytes), while using ZMS only 1 write of
 16 bytes is needed. This operation is 256 times faster in this case.
 
 Garbage collection operation is also adding some writes to the memory cell life expectancy as it
 is moving some blocks from one sector to another.
 To make the garbage collector not affect the life expectancy of the device it is recommended
-to dimension correctly the partition size. Its size should be the double of the maximum size of
+to correctly dimension the partition size. Its size should be the double of the maximum size of
 data (including extra headers) that could be written in the storage.
 
 See :ref:`free-space`.
@@ -307,10 +308,10 @@ Device lifetime calculation
 Storage devices whether they are classical Flash or new technologies like RRAM/MRAM has a limited
 life expectancy which is determined by the number of times memory cells can be erased/written.
 Flash devices are erased one page at a time as part of their functional behavior (otherwise
-memory cells cannot be overwritten) and for non erasable storage devices memory cells can be
+memory cells cannot be overwritten) and for non-erasable storage devices memory cells can be
 overwritten directly.
 
-A typical scenario is shown here to calculate the life expectancy of a device.
+A typical scenario is shown here to calculate the life expectancy of a device:
 Let's suppose that we store an 8 bytes variable using the same ID but its content changes every
 minute. The partition has 4 sectors with 1024 bytes each.
 Each write of the variable requires 16 bytes of storage.
@@ -361,9 +362,9 @@ Existing features
 =================
 Version1
 --------
-- Supports non erasable devices (only one write operation to erase a sector)
+- Supports non-erasable devices (only one write operation to erase a sector)
 - Supports large partition size and sector size (64 bits address space)
-- Supports large IDs width (32 bits) to store ID/Value pairs
+- Supports 32-bit IDs to store ID/Value pairs
 - Small sized data ( <= 8 bytes) are stored in the ATE itself
 - Built-in Data CRC32 (included in the ATE)
 - Versionning of ZMS (to handle future evolution)
@@ -375,7 +376,7 @@ Future features
 - Add multiple format ATE support to be able to use ZMS with different ATE formats that satisfies
   requirements from application
 - Add the possibility to skip garbage collector for some application usage where ID/value pairs
-  are written periodically and do not exceed half of the partition size (ther is always an old
+  are written periodically and do not exceed half of the partition size (there is always an old
   entry with the same ID).
 - Divide IDs into namespaces and allocate IDs on demand from application to handle collisions
   between IDs used by different subsystems or samples.
@@ -394,9 +395,9 @@ functionality: :ref:`NVS <nvs_api>` and :ref:`FCB <fcb_api>`.
 Which one to use in your application will depend on your needs and the hardware you are using,
 and this section provides information to help make a choice.
 
-- If you are using a non erasable technology device like RRAM or MRAM, :ref:`ZMS <zms_api>` is definitely the
-  best fit for your storage subsystem as it is designed very well to avoid emulating erase for
-  these devices and replace it by a single write call.
+- If you are using a non-erasable technology device like RRAM or MRAM, :ref:`ZMS <zms_api>` is definitely the
+  best fit for your storage subsystem as it is designed to avoid emulating erase operation using
+  large block writes for these devices and replaces it with a single write call.
 - For devices with large write_block_size and/or needs a sector size that is different than the
   classical flash page size (equal to erase_block_size), :ref:`ZMS <zms_api>` is also the best fit as there is
   the possibility to customize these parameters and add the support of these devices in ZMS.
@@ -414,6 +415,41 @@ verified to make sure that the application could work with one subsystem or the
 both solutions could be implemented, the best choice should be based on the calculations of the
 life expectancy of the device described in this section: :ref:`wear-leveling`.
 
+Recommendations to increase performance
+***************************************
+
+Sector size and count
+=====================
+
+- The total size of the storage partition should be well dimensioned to achieve the best
+  performance for ZMS.
+  All the information regarding the effectively available free space in ZMS can be found
+  in the documentation. See :ref:`free-space`.
+  We recommend choosing a storage partition that can hold double the size of the key-value pairs
+  that will be written in the storage.
+- The size of a sector needs to be dimensioned to hold the maximum data length that will be stored.
+  Increasing the size of a sector will slow down the garbage collection operation which will
+  occur less frequently.
+  Decreasing its size, in the opposite, will make the garbage collection operation faster
+  which will occur more frequently.
+- For some subsystems like :ref:`Settings <settings_api>`, all path-value pairs are split into two ZMS entries (ATEs).
+  The header needed by the two entries should be accounted when computing the needed storage space.
+- Using small data to store in the ZMS entries can increase the performance, as this data is
+  written within the entry header.
+  For example, for the :ref:`Settings <settings_api>` subsystem, choosing a path name that is
+  less than or equal to 8 bytes can make reads and writes faster.
+
+Dimensioning cache
+==================
+
+- When using ZMS API directly, the recommended cache size should be, at least, equal to
+  the number of different entries that will be written in the storage.
+- Each additional cache entry will add 8 bytes to your RAM usage. Cache size should be carefully
+  chosen.
+- If you use ZMS through :ref:`Settings <settings_api>`, you have to take into account that each Settings entry is
+  divided into two ZMS entries. The recommended cache size should be, at least, twice the number
+  of Settings entries.
+
 Sample
 ******
 
diff --git a/include/zephyr/fs/zms.h b/include/zephyr/fs/zms.h
index 1155319d792..0f0fbb82cc9 100644
--- a/include/zephyr/fs/zms.h
+++ b/include/zephyr/fs/zms.h
@@ -1,14 +1,14 @@
-/*  ZMS: Zephyr Memory Storage
- *
- * Copyright (c) 2024 BayLibre SAS
+/* Copyright (c) 2024 BayLibre SAS
  *
  * SPDX-License-Identifier: Apache-2.0
+ *
+ * ZMS: Zephyr Memory Storage
  */
 #ifndef ZEPHYR_INCLUDE_FS_ZMS_H_
 #define ZEPHYR_INCLUDE_FS_ZMS_H_
 
-#include <zephyr/drivers/flash.h>
 #include <sys/types.h>
+#include <zephyr/drivers/flash.h>
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/toolchain.h>
@@ -18,7 +18,6 @@ extern "C" {
 #endif
 
 /**
- * @brief Zephyr Memory Storage (ZMS)
  * @defgroup zms Zephyr Memory Storage (ZMS)
  * @ingroup file_system_storage
  * @{
@@ -26,37 +25,34 @@ extern "C" {
  */
 
 /**
- * @brief Zephyr Memory Storage Data Structures
- * @defgroup zms_data_structures Zephyr Memory Storage Data Structures
+ * @defgroup zms_data_structures ZMS data structures
  * @ingroup zms
  * @{
  */
 
-/**
- * @brief Zephyr Memory Storage File system structure
- */
+/** Zephyr Memory Storage file system structure */
 struct zms_fs {
-	/** File system offset in flash **/
+	/** File system offset in flash */
 	off_t offset;
-	/** Allocation table entry write address.
-	 * Addresses are stored as uint64_t:
+	/** Allocation Table Entry (ATE) write address.
+	 * Addresses are stored as `uint64_t`:
 	 * - high 4 bytes correspond to the sector
 	 * - low 4 bytes are the offset in the sector
 	 */
 	uint64_t ate_wra;
 	/** Data write address */
 	uint64_t data_wra;
-	/** Storage system is split into sectors, each sector size must be multiple of erase-blocks
-	 *  if the device has erase capabilities
+	/** Storage system is split into sectors. The sector size must be a multiple of
+	 *  `erase-block-size` if the device has erase capabilities
 	 */
 	uint32_t sector_size;
 	/** Number of sectors in the file system */
 	uint32_t sector_count;
-	/** Current cycle counter of the active sector (pointed by ate_wra)*/
+	/** Current cycle counter of the active sector (pointed to by `ate_wra`) */
 	uint8_t sector_cycle;
 	/** Flag indicating if the file system is initialized */
 	bool ready;
-	/** Mutex */
+	/** Mutex used to lock flash writes */
 	struct k_mutex zms_lock;
 	/** Flash device runtime structure */
 	const struct device *flash_device;
@@ -65,7 +61,7 @@ struct zms_fs {
 	/** Size of an Allocation Table Entry */
 	size_t ate_size;
 #if CONFIG_ZMS_LOOKUP_CACHE
-	/** Lookup table used to cache ATE address of a written ID */
+	/** Lookup table used to cache ATE addresses of written IDs */
 	uint64_t lookup_cache[CONFIG_ZMS_LOOKUP_CACHE_SIZE];
 #endif
 };
@@ -75,78 +71,77 @@ struct zms_fs {
  */
 
 /**
- * @brief Zephyr Memory Storage APIs
- * @defgroup zms_high_level_api Zephyr Memory Storage APIs
+ * @defgroup zms_high_level_api ZMS API
  * @ingroup zms
  * @{
  */
 
 /**
- * @brief Mount a ZMS file system onto the device specified in @p fs.
+ * @brief Mount a ZMS file system onto the device specified in `fs`.
  *
- * @param fs Pointer to file system
+ * @param fs Pointer to the file system.
  * @retval 0 Success
- * @retval -ERRNO errno code if error
+ * @retval -ERRNO Negative errno code on error
  */
 int zms_mount(struct zms_fs *fs);
 
 /**
  * @brief Clear the ZMS file system from device.
  *
- * @param fs Pointer to file system
+ * @param fs Pointer to the file system.
  * @retval 0 Success
- * @retval -ERRNO errno code if error
+ * @retval -ERRNO Negative errno code on error
  */
 int zms_clear(struct zms_fs *fs);
 
 /**
  * @brief Write an entry to the file system.
  *
- * @note  When @p len parameter is equal to @p 0 then entry is effectively removed (it is
- * equivalent to calling of zms_delete). It is not possible to distinguish between a deleted
+ * @note  When the `len` parameter is equal to `0` the entry is effectively removed (it is
+ * equivalent to calling @ref zms_delete()). It is not possible to distinguish between a deleted
  * entry and an entry with data of length 0.
  *
- * @param fs Pointer to file system
- * @param id Id of the entry to be written
+ * @param fs Pointer to the file system.
+ * @param id ID of the entry to be written
  * @param data Pointer to the data to be written
- * @param len Number of bytes to be written (maximum 64 KB)
+ * @param len Number of bytes to be written (maximum 64 KiB)
  *
  * @return Number of bytes written. On success, it will be equal to the number of bytes requested
- * to be written. When a rewrite of the same data already stored is attempted, nothing is written
- * to flash, thus 0 is returned. On error, returns negative value of errno.h defined error codes.
+ * to be written or 0.
+ * When a rewrite of the same data already stored is attempted, nothing is written to flash,
+ * thus 0 is returned. On error, returns negative value of error codes defined in `errno.h`.
  */
 ssize_t zms_write(struct zms_fs *fs, uint32_t id, const void *data, size_t len);
 
 /**
  * @brief Delete an entry from the file system
  *
- * @param fs Pointer to file system
- * @param id Id of the entry to be deleted
+ * @param fs Pointer to the file system.
+ * @param id ID of the entry to be deleted
  * @retval 0 Success
- * @retval -ERRNO errno code if error
+ * @retval -ERRNO Negative errno code on error
  */
 int zms_delete(struct zms_fs *fs, uint32_t id);
 
 /**
  * @brief Read an entry from the file system.
  *
- * @param fs Pointer to file system
- * @param id Id of the entry to be read
+ * @param fs Pointer to the file system.
+ * @param id ID of the entry to be read
  * @param data Pointer to data buffer
- * @param len Number of bytes to be read (or size of the allocated read buffer)
+ * @param len Number of bytes to read at most
  *
  * @return Number of bytes read. On success, it will be equal to the number of bytes requested
- * to be read. When the return value is less than the number of bytes requested to read this
- * indicates that ATE contain less data than requested. On error, returns negative value of
- * errno.h defined error codes.
+ * to be read or less than that if the stored data has a smaller size than the requested one.
+ * On error, returns negative value of error codes defined in `errno.h`.
  */
 ssize_t zms_read(struct zms_fs *fs, uint32_t id, void *data, size_t len);
 
 /**
  * @brief Read a history entry from the file system.
  *
- * @param fs Pointer to file system
- * @param id Id of the entry to be read
+ * @param fs Pointer to the file system.
+ * @param id ID of the entry to be read
  * @param data Pointer to data buffer
  * @param len Number of bytes to be read
  * @param cnt History counter: 0: latest entry, 1: one before latest ...
@@ -154,40 +149,41 @@ ssize_t zms_read(struct zms_fs *fs, uint32_t id, void *data, size_t len);
  * @return Number of bytes read. On success, it will be equal to the number of bytes requested
  * to be read. When the return value is larger than the number of bytes requested to read this
  * indicates not all bytes were read, and more data is available. On error, returns negative
- * value of errno.h defined error codes.
+ * value of error codes defined in `errno.h`.
  */
 ssize_t zms_read_hist(struct zms_fs *fs, uint32_t id, void *data, size_t len, uint32_t cnt);
 
 /**
- * @brief Gets the data size that is stored in an entry with a given id
+ * @brief Gets the length of the data that is stored in an entry with a given ID
  *
- * @param fs Pointer to file system
- * @param id Id of the entry that we want to get its data length
+ * @param fs Pointer to the file system.
+ * @param id ID of the entry whose data length to retrieve.
  *
  * @return Data length contained in the ATE. On success, it will be equal to the number of bytes
- * in the ATE. On error, returns negative value of errno.h defined error codes.
+ * in the ATE. On error, returns negative value of error codes defined in `errno.h`.
  */
 ssize_t zms_get_data_length(struct zms_fs *fs, uint32_t id);
+
 /**
  * @brief Calculate the available free space in the file system.
  *
- * @param fs Pointer to file system
+ * @param fs Pointer to the file system.
  *
- * @return Number of bytes free. On success, it will be equal to the number of bytes that can
+ * @return Number of free bytes. On success, it will be equal to the number of bytes that can
  * still be written to the file system.
- * Calculating the free space is a time consuming operation, especially on spi flash.
- * On error, returns negative value of errno.h defined error codes.
+ * Calculating the free space is a time-consuming operation, especially on SPI flash.
+ * On error, returns negative value of error codes defined in `errno.h`.
  */
 ssize_t zms_calc_free_space(struct zms_fs *fs);
 
 /**
- * @brief Tell how many contiguous free space remains in the currently active ZMS sector.
+ * @brief Tell how much contiguous free space remains in the currently active ZMS sector.
  *
  * @param fs Pointer to the file system.
  *
  * @return Number of free bytes.
  */
-size_t zms_sector_max_data_size(struct zms_fs *fs);
+size_t zms_active_sector_free_space(struct zms_fs *fs);
 
 /**
  * @brief Close the currently active sector and switch to the next one.
@@ -195,12 +191,12 @@ size_t zms_sector_max_data_size(struct zms_fs *fs);
  * @note The garbage collector is called on the new sector.
  *
  * @warning This routine is made available for specific use cases.
- * It collides with the ZMS goal of avoiding any unnecessary flash erase operations.
+ * It collides with ZMS's goal of avoiding any unnecessary flash erase operations.
  * Using this routine extensively can result in premature failure of the flash device.
  *
  * @param fs Pointer to the file system.
  *
- * @return 0 on success. On error, returns negative value of errno.h defined error codes.
+ * @return 0 on success. On error, returns negative value of error codes defined in `errno.h`.
  */
 int zms_sector_use_next(struct zms_fs *fs);
 
diff --git a/samples/subsys/fs/zms/src/main.c b/samples/subsys/fs/zms/src/main.c
index a2166392724..959d5ac5f3e 100644
--- a/samples/subsys/fs/zms/src/main.c
+++ b/samples/subsys/fs/zms/src/main.c
@@ -83,7 +83,8 @@ int main(void)
 	int rc = 0;
 	char buf[16];
 	uint8_t key[8] = {0xDE, 0xAD, 0xBE, 0xEF, 0xDE, 0xAD, 0xBE, 0xEF}, longarray[128];
-	uint32_t i_cnt = 0U, i;
+	uint32_t i_cnt = 0U;
+	uint32_t i;
 	uint32_t id = 0;
 	ssize_t free_space = 0;
 	struct flash_pages_info info;
@@ -144,7 +145,7 @@ int main(void)
 		rc = zms_read(&fs, KEY_VALUE_ID, &key, sizeof(key));
 		if (rc > 0) { /* item was found, show it */
 			printk("Id: %x, Key: ", KEY_VALUE_ID);
-			for (int n = 0; n < 8; n++) {
+			for (uint8_t n = 0; n < 8; n++) {
 				printk("%x ", key[n]);
 			}
 			printk("\n");
@@ -181,7 +182,7 @@ int main(void)
 		if (rc > 0) {
 			/* item was found, show it */
 			printk("Id: %d, Longarray: ", LONG_DATA_ID);
-			for (int n = 0; n < sizeof(longarray); n++) {
+			for (uint16_t n = 0; n < sizeof(longarray); n++) {
 				printk("%x ", longarray[n]);
 			}
 			printk("\n");
@@ -204,7 +205,7 @@ int main(void)
 	}
 
 	if (i != MAX_ITERATIONS) {
-		printk("Error: Something went wrong at iteration %u rc=%d\n", i - 1, rc);
+		printk("Error: Something went wrong at iteration %u rc=%d\n", i, rc);
 		return 0;
 	}
 
@@ -249,7 +250,7 @@ int main(void)
 	 * Let's compute free space in storage. But before doing that let's Garbage collect
 	 * all sectors where we deleted all entries and then compute the free space
 	 */
-	for (uint32_t i = 0; i < fs.sector_count; i++) {
+	for (i = 0; i < fs.sector_count; i++) {
 		rc = zms_sector_use_next(&fs);
 		if (rc) {
 			printk("Error while changing sector rc=%d\n", rc);
@@ -261,6 +262,13 @@ int main(void)
 		return 0;
 	}
 	printk("Free space in storage is %u bytes\n", free_space);
+
+	/* Let's clean the storage now */
+	rc = zms_clear(&fs);
+	if (rc < 0) {
+		printk("Error while cleaning the storage, rc=%d\n", rc);
+	}
+
 	printk("Sample code finished Successfully\n");
 
 	return 0;
diff --git a/subsys/fs/zms/Kconfig b/subsys/fs/zms/Kconfig
index 42f23905e09..a2b060dfb4b 100644
--- a/subsys/fs/zms/Kconfig
+++ b/subsys/fs/zms/Kconfig
@@ -1,9 +1,9 @@
-#Zephyr Memory Storage ZMS
-
 #Copyright (c) 2024 BayLibre SAS
 
 #SPDX-License-Identifier: Apache-2.0
 
+#Zephyr Memory Storage ZMS
+
 config ZMS
 	bool "Zephyr Memory Storage"
 	select CRC
@@ -34,19 +34,19 @@ config ZMS_DATA_CRC
 	help
 	  Enables DATA CRC
 
-config ZMS_CUSTOM_BLOCK_SIZE
-	bool "Custom buffer size used by ZMS for reads and writes"
+config ZMS_CUSTOMIZE_BLOCK_SIZE
+	bool "Customize the size of the buffer used internally for reads and writes"
 	help
-	  ZMS uses internal buffers to read/write and compare stored data.
-	  Increasing the size of these buffers should be done carefully in order to not
+	  ZMS uses an internal buffer to read/write and compare stored data.
+	  Increasing the size of this buffer should be done carefully in order to not
 	  overflow the stack.
 	  Increasing this buffer means as well that ZMS could work with storage devices
 	  that have larger write-block-size which decreases ZMS performance
 
-config ZMS_MAX_BLOCK_SIZE
+config ZMS_CUSTOM_BLOCK_SIZE
 	int "ZMS internal buffer size"
 	default 32
-	depends on ZMS_CUSTOM_BLOCK_SIZE
+	depends on ZMS_CUSTOMIZE_BLOCK_SIZE
 	help
 	  Changes the internal buffer size of ZMS
 
diff --git a/subsys/fs/zms/zms.c b/subsys/fs/zms/zms.c
index 814a08a8839..f0f22c59735 100644
--- a/subsys/fs/zms/zms.c
+++ b/subsys/fs/zms/zms.c
@@ -1,8 +1,8 @@
-/*  ZMS: Zephyr Memory Storage
- *
- * Copyright (c) 2024 BayLibre SAS
+/* Copyright (c) 2024 BayLibre SAS
  *
  * SPDX-License-Identifier: Apache-2.0
+ *
+ * ZMS: Zephyr Memory Storage
  */
 
 #include <string.h>
@@ -87,8 +87,10 @@ static inline size_t zms_lookup_cache_pos(uint32_t id)
 
 static int zms_lookup_cache_rebuild(struct zms_fs *fs)
 {
-	int rc, previous_sector_num = ZMS_INVALID_SECTOR_NUM;
-	uint64_t addr, ate_addr;
+	int rc;
+	int previous_sector_num = ZMS_INVALID_SECTOR_NUM;
+	uint64_t addr;
+	uint64_t ate_addr;
 	uint64_t *cache_entry;
 	uint8_t current_cycle;
 	struct zms_ate ate;
@@ -155,6 +157,19 @@ static inline off_t zms_addr_to_offset(struct zms_fs *fs, uint64_t addr)
 	return fs->offset + (fs->sector_size * SECTOR_NUM(addr)) + SECTOR_OFFSET(addr);
 }
 
+/* Helper to round down len to the closest multiple of write_block_size  */
+static inline size_t zms_round_down_write_block_size(struct zms_fs *fs, size_t len)
+{
+	return len & ~(fs->flash_parameters->write_block_size - 1U);
+}
+
+/* Helper to round up len to multiple of write_block_size */
+static inline size_t zms_round_up_write_block_size(struct zms_fs *fs, size_t len)
+{
+	return (len + (fs->flash_parameters->write_block_size - 1U)) &
+	       ~(fs->flash_parameters->write_block_size - 1U);
+}
+
 /* zms_al_size returns size aligned to fs->write_block_size */
 static inline size_t zms_al_size(struct zms_fs *fs, size_t len)
 {
@@ -163,7 +178,8 @@ static inline size_t zms_al_size(struct zms_fs *fs, size_t len)
 	if (write_block_size <= 1U) {
 		return len;
 	}
-	return (len + (write_block_size - 1U)) & ~(write_block_size - 1U);
+
+	return zms_round_up_write_block_size(fs, len);
 }
 
 /* Helper to get empty ATE address */
@@ -194,7 +210,7 @@ static int zms_flash_al_wrt(struct zms_fs *fs, uint64_t addr, const void *data,
 
 	offset = zms_addr_to_offset(fs, addr);
 
-	blen = len & ~(fs->flash_parameters->write_block_size - 1U);
+	blen = zms_round_down_write_block_size(fs, len);
 	if (blen > 0) {
 		rc = flash_write(fs->flash_device, offset, data8, blen);
 		if (rc) {
@@ -276,10 +292,11 @@ static int zms_flash_block_cmp(struct zms_fs *fs, uint64_t addr, const void *dat
 {
 	const uint8_t *data8 = (const uint8_t *)data;
 	int rc;
-	size_t bytes_to_cmp, block_size;
+	size_t bytes_to_cmp;
+	size_t block_size;
 	uint8_t buf[ZMS_BLOCK_SIZE];
 
-	block_size = ZMS_BLOCK_SIZE & ~(fs->flash_parameters->write_block_size - 1U);
+	block_size = zms_round_down_write_block_size(fs, ZMS_BLOCK_SIZE);
 
 	while (len) {
 		bytes_to_cmp = MIN(block_size, len);
@@ -305,10 +322,11 @@ static int zms_flash_block_cmp(struct zms_fs *fs, uint64_t addr, const void *dat
 static int zms_flash_cmp_const(struct zms_fs *fs, uint64_t addr, uint8_t value, size_t len)
 {
 	int rc;
-	size_t bytes_to_cmp, block_size;
+	size_t bytes_to_cmp;
+	size_t block_size;
 	uint8_t cmp[ZMS_BLOCK_SIZE];
 
-	block_size = ZMS_BLOCK_SIZE & ~(fs->flash_parameters->write_block_size - 1U);
+	block_size = zms_round_down_write_block_size(fs, ZMS_BLOCK_SIZE);
 
 	(void)memset(cmp, value, block_size);
 	while (len) {
@@ -329,10 +347,11 @@ static int zms_flash_cmp_const(struct zms_fs *fs, uint64_t addr, uint8_t value,
 static int zms_flash_block_move(struct zms_fs *fs, uint64_t addr, size_t len)
 {
 	int rc;
-	size_t bytes_to_copy, block_size;
+	size_t bytes_to_copy;
+	size_t block_size;
 	uint8_t buf[ZMS_BLOCK_SIZE];
 
-	block_size = ZMS_BLOCK_SIZE & ~(fs->flash_parameters->write_block_size - 1U);
+	block_size = zms_round_down_write_block_size(fs, ZMS_BLOCK_SIZE);
 
 	while (len) {
 		bytes_to_copy = MIN(block_size, len);
@@ -416,17 +435,17 @@ static int zms_ate_crc8_check(const struct zms_ate *entry)
 	return 1;
 }
 
-/* zms_ate_valid validates an ate:
- *     return 1 if crc8 and cycle_cnt valid,
- *            0 otherwise
+/* zms_ate_valid validates an ate in the current sector by checking if the ate crc is valid
+ * and its cycle cnt matches the cycle cnt of the active sector
+ *
+ * return 1 if ATE is valid,
+ *        0 otherwise
+ *
+ * see: zms_ate_valid_different_sector
  */
 static int zms_ate_valid(struct zms_fs *fs, const struct zms_ate *entry)
 {
-	if ((fs->sector_cycle != entry->cycle_cnt) || zms_ate_crc8_check(entry)) {
-		return 0;
-	}
-
-	return 1;
+	return zms_ate_valid_different_sector(fs, entry, fs->sector_cycle);
 }
 
 /* zms_ate_valid_different_sector validates an ate that is in a different
@@ -467,10 +486,11 @@ static inline int zms_get_cycle_on_sector_change(struct zms_fs *fs, uint64_t add
 	return 0;
 }
 
-/* zms_close_ate_valid validates an sector close ate: a valid sector close ate:
- * - valid ate
- * - len = 0 and id = ZMS_HEAD_ID
- * - offset points to location at ate multiple from sector size
+/* zms_close_ate_valid validates a sector close ate.
+ * A valid sector close ate should be:
+ * - a valid ate
+ * - with len = 0 and id = ZMS_HEAD_ID
+ * - and offset points to location at ate multiple from sector size
  * return true if valid, false otherwise
  */
 static bool zms_close_ate_valid(struct zms_fs *fs, const struct zms_ate *entry)
@@ -479,9 +499,10 @@ static bool zms_close_ate_valid(struct zms_fs *fs, const struct zms_ate *entry)
 		(entry->id == ZMS_HEAD_ID) && !((fs->sector_size - entry->offset) % fs->ate_size));
 }
 
-/* zms_empty_ate_valid validates an sector empty ate: a valid sector empty ate:
- * - valid ate
- * - len = 0xffff and id = 0xffffffff
+/* zms_empty_ate_valid validates an sector empty ate.
+ * A valid sector empty ate should be:
+ * - a valid ate
+ * - with len = 0xffff and id = 0xffffffff
  * return true if valid, false otherwise
  */
 static bool zms_empty_ate_valid(struct zms_fs *fs, const struct zms_ate *entry)
@@ -576,7 +597,8 @@ static int zms_flash_write_entry(struct zms_fs *fs, uint32_t id, const void *dat
  */
 static int zms_recover_last_ate(struct zms_fs *fs, uint64_t *addr, uint64_t *data_wra)
 {
-	uint64_t data_end_addr, ate_end_addr;
+	uint64_t data_end_addr;
+	uint64_t ate_end_addr;
 	struct zms_ate end_ate;
 	int rc;
 
@@ -614,7 +636,8 @@ static int zms_recover_last_ate(struct zms_fs *fs, uint64_t *addr, uint64_t *dat
 static int zms_compute_prev_addr(struct zms_fs *fs, uint64_t *addr)
 {
 	int sec_closed;
-	struct zms_ate empty_ate, close_ate;
+	struct zms_ate empty_ate;
+	struct zms_ate close_ate;
 
 	*addr += fs->ate_size;
 	if ((SECTOR_OFFSET(*addr)) != (fs->sector_size - 2 * fs->ate_size)) {
@@ -677,7 +700,8 @@ static void zms_sector_advance(struct zms_fs *fs, uint64_t *addr)
 static int zms_sector_close(struct zms_fs *fs)
 {
 	int rc;
-	struct zms_ate close_ate, garbage_ate;
+	struct zms_ate close_ate;
+	struct zms_ate garbage_ate;
 
 	close_ate.id = ZMS_HEAD_ID;
 	close_ate.len = 0U;
@@ -851,7 +875,8 @@ static int zms_find_ate_with_id(struct zms_fs *fs, uint32_t id, uint64_t start_a
 {
 	int rc;
 	int previous_sector_num = ZMS_INVALID_SECTOR_NUM;
-	uint64_t wlk_prev_addr, wlk_addr;
+	uint64_t wlk_prev_addr;
+	uint64_t wlk_addr;
 	int prev_found = 0;
 	struct zms_ate wlk_ate;
 	uint8_t current_cycle;
@@ -893,9 +918,19 @@ static int zms_find_ate_with_id(struct zms_fs *fs, uint32_t id, uint64_t start_a
  */
 static int zms_gc(struct zms_fs *fs)
 {
-	int rc, sec_closed;
-	struct zms_ate close_ate, gc_ate, wlk_ate, empty_ate;
-	uint64_t sec_addr, gc_addr, gc_prev_addr, wlk_addr, wlk_prev_addr, data_addr, stop_addr;
+	int rc;
+	int sec_closed;
+	struct zms_ate close_ate;
+	struct zms_ate gc_ate;
+	struct zms_ate wlk_ate;
+	struct zms_ate empty_ate;
+	uint64_t sec_addr;
+	uint64_t gc_addr;
+	uint64_t gc_prev_addr;
+	uint64_t wlk_addr;
+	uint64_t wlk_prev_addr;
+	uint64_t data_addr;
+	uint64_t stop_addr;
 	uint8_t previous_cycle = 0;
 
 	rc = zms_get_sector_cycle(fs, fs->ate_wra, &fs->sector_cycle);
@@ -1072,14 +1107,16 @@ int zms_clear(struct zms_fs *fs)
 
 static int zms_init(struct zms_fs *fs)
 {
-	int rc, sec_closed;
-	struct zms_ate last_ate, first_ate, close_ate, empty_ate;
-	/* Initialize addr to 0 for the case fs->sector_count == 0. This
-	 * should never happen as this is verified in zms_mount() but both
-	 * Coverity and GCC believe the contrary.
-	 */
-	uint64_t addr = 0U, data_wra = 0U;
-	uint32_t i, closed_sectors = 0;
+	int rc;
+	int sec_closed;
+	struct zms_ate last_ate;
+	struct zms_ate first_ate;
+	struct zms_ate close_ate;
+	struct zms_ate empty_ate;
+	uint64_t addr = 0U;
+	uint64_t data_wra = 0U;
+	uint32_t i;
+	uint32_t closed_sectors = 0;
 	bool zms_magic_exist = false;
 
 	k_mutex_lock(&fs->zms_lock, K_FOREVER);
@@ -1330,7 +1367,6 @@ static int zms_init(struct zms_fs *fs)
 
 int zms_mount(struct zms_fs *fs)
 {
-
 	int rc;
 	struct flash_pages_info info;
 	size_t write_block_size;
@@ -1344,7 +1380,7 @@ int zms_mount(struct zms_fs *fs)
 	}
 
 	fs->ate_size = zms_al_size(fs, sizeof(struct zms_ate));
-	write_block_size = flash_get_write_block_size(fs->flash_device);
+	write_block_size = fs->flash_parameters->write_block_size;
 
 	/* check that the write block size is supported */
 	if (write_block_size > ZMS_BLOCK_SIZE || write_block_size == 0) {
@@ -1402,8 +1438,10 @@ ssize_t zms_write(struct zms_fs *fs, uint32_t id, const void *data, size_t len)
 	int rc;
 	size_t data_size;
 	struct zms_ate wlk_ate;
-	uint64_t wlk_addr, rd_addr;
-	uint32_t gc_count, required_space = 0U; /* no space, appropriate for delete ate */
+	uint64_t wlk_addr;
+	uint64_t rd_addr;
+	uint32_t gc_count;
+	uint32_t required_space = 0U; /* no space, appropriate for delete ate */
 	int prev_found = 0;
 
 	if (!fs->ready) {
@@ -1543,8 +1581,11 @@ int zms_delete(struct zms_fs *fs, uint32_t id)
 
 ssize_t zms_read_hist(struct zms_fs *fs, uint32_t id, void *data, size_t len, uint32_t cnt)
 {
-	int rc, prev_found = 0;
-	uint64_t wlk_addr, rd_addr = 0, wlk_prev_addr = 0;
+	int rc;
+	int prev_found = 0;
+	uint64_t wlk_addr;
+	uint64_t rd_addr = 0;
+	uint64_t wlk_prev_addr = 0;
 	uint32_t cnt_his;
 	struct zms_ate wlk_ate;
 #ifdef CONFIG_ZMS_DATA_CRC
@@ -1659,12 +1700,22 @@ ssize_t zms_get_data_length(struct zms_fs *fs, uint32_t id)
 
 ssize_t zms_calc_free_space(struct zms_fs *fs)
 {
-
-	int rc, previous_sector_num = ZMS_INVALID_SECTOR_NUM, prev_found = 0, sec_closed;
-	struct zms_ate step_ate, wlk_ate, empty_ate, close_ate;
-	uint64_t step_addr, wlk_addr, step_prev_addr, wlk_prev_addr, data_wra = 0U;
+	int rc;
+	int previous_sector_num = ZMS_INVALID_SECTOR_NUM;
+	int prev_found = 0;
+	int sec_closed;
+	struct zms_ate step_ate;
+	struct zms_ate wlk_ate;
+	struct zms_ate empty_ate;
+	struct zms_ate close_ate;
+	uint64_t step_addr;
+	uint64_t wlk_addr;
+	uint64_t step_prev_addr;
+	uint64_t wlk_prev_addr;
+	uint64_t data_wra = 0U;
 	uint8_t current_cycle;
 	ssize_t free_space = 0;
+	const uint32_t second_to_last_offset = (2 * fs->ate_size);
 
 	if (!fs->ready) {
 		LOG_ERR("zms not initialized");
@@ -1728,9 +1779,8 @@ ssize_t zms_calc_free_space(struct zms_fs *fs)
 	/* Let's look now for special cases where some sectors have only ATEs with
 	 * small data size.
 	 */
-	const uint32_t second_to_last_offset = (2 * fs->ate_size);
 
-	for (uint32_t i = 0; i < fs->sector_count; i++) {
+	for (int i = 0; i < fs->sector_count; i++) {
 		step_addr = zms_close_ate_addr(fs, ((uint64_t)i << ADDR_SECT_SHIFT));
 
 		/* verify if the sector is closed */
@@ -1763,7 +1813,7 @@ ssize_t zms_calc_free_space(struct zms_fs *fs)
 	return free_space;
 }
 
-size_t zms_sector_max_data_size(struct zms_fs *fs)
+size_t zms_active_sector_free_space(struct zms_fs *fs)
 {
 	if (!fs->ready) {
 		LOG_ERR("ZMS not initialized");
diff --git a/subsys/fs/zms/zms_priv.h b/subsys/fs/zms/zms_priv.h
index 6594048ea0f..428ff6babca 100644
--- a/subsys/fs/zms/zms_priv.h
+++ b/subsys/fs/zms/zms_priv.h
@@ -1,9 +1,10 @@
-/*  ZMS: Zephyr Memory Storage
- *
- * Copyright (c) 2024 BayLibre SAS
+/* Copyright (c) 2024 BayLibre SAS
  *
  * SPDX-License-Identifier: Apache-2.0
+ *
+ * ZMS: Zephyr Memory Storage
  */
+
 #ifndef __ZMS_PRIV_H_
 #define __ZMS_PRIV_H_
 
@@ -23,8 +24,8 @@ extern "C" {
 #define SECTOR_NUM(x)    FIELD_GET(ADDR_SECT_MASK, x)
 #define SECTOR_OFFSET(x) FIELD_GET(ADDR_OFFS_MASK, x)
 
-#if defined(CONFIG_ZMS_CUSTOM_BLOCK_SIZE)
-#define ZMS_BLOCK_SIZE CONFIG_ZMS_MAX_BLOCK_SIZE
+#if defined(CONFIG_ZMS_CUSTOMIZE_BLOCK_SIZE)
+#define ZMS_BLOCK_SIZE CONFIG_ZMS_CUSTOM_BLOCK_SIZE
 #else
 #define ZMS_BLOCK_SIZE 32
 #endif
@@ -46,8 +47,8 @@ extern "C" {
 struct zms_ate {
 	uint8_t crc8;      /* crc8 check of the entry */
 	uint8_t cycle_cnt; /* cycle counter for non erasable devices */
-	uint32_t id;       /* data id */
 	uint16_t len;      /* data len within sector */
+	uint32_t id;       /* data id */
 	union {
 		uint8_t data[8]; /* used to store small size data */
 		struct {
diff --git a/tests/subsys/fs/zms/src/main.c b/tests/subsys/fs/zms/src/main.c
index 80866687dba..bd4e21dd745 100644
--- a/tests/subsys/fs/zms/src/main.c
+++ b/tests/subsys/fs/zms/src/main.c
@@ -233,8 +233,7 @@ ZTEST_F(zms, test_zms_gc)
 	int len;
 	uint8_t buf[32];
 	uint8_t rd_buf[32];
-
-	const uint16_t max_id = 10;
+	const uint8_t max_id = 10;
 	/* 21st write will trigger GC. */
 	const uint16_t max_writes = 21;
 
@@ -243,7 +242,7 @@ ZTEST_F(zms, test_zms_gc)
 	err = zms_mount(&fixture->fs);
 	zassert_true(err == 0, "zms_mount call failure: %d", err);
 
-	for (uint32_t i = 0; i < max_writes; i++) {
+	for (int i = 0; i < max_writes; i++) {
 		uint8_t id = (i % max_id);
 		uint8_t id_data = id + max_id * (i / max_id);
 
@@ -253,11 +252,11 @@ ZTEST_F(zms, test_zms_gc)
 		zassert_true(len == sizeof(buf), "zms_write failed: %d", len);
 	}
 
-	for (uint32_t id = 0; id < max_id; id++) {
+	for (int id = 0; id < max_id; id++) {
 		len = zms_read(&fixture->fs, id, rd_buf, sizeof(buf));
 		zassert_true(len == sizeof(rd_buf), "zms_read unexpected failure: %d", len);
 
-		for (uint16_t i = 0; i < sizeof(rd_buf); i++) {
+		for (int i = 0; i < sizeof(rd_buf); i++) {
 			rd_buf[i] = rd_buf[i] % max_id;
 			buf[i] = id;
 		}
@@ -268,11 +267,11 @@ ZTEST_F(zms, test_zms_gc)
 	err = zms_mount(&fixture->fs);
 	zassert_true(err == 0, "zms_mount call failure: %d", err);
 
-	for (uint32_t id = 0; id < max_id; id++) {
+	for (int id = 0; id < max_id; id++) {
 		len = zms_read(&fixture->fs, id, rd_buf, sizeof(buf));
 		zassert_true(len == sizeof(rd_buf), "zms_read unexpected failure: %d", len);
 
-		for (uint16_t i = 0; i < sizeof(rd_buf); i++) {
+		for (int i = 0; i < sizeof(rd_buf); i++) {
 			rd_buf[i] = rd_buf[i] % max_id;
 			buf[i] = id;
 		}
@@ -286,7 +285,7 @@ static void write_content(uint32_t max_id, uint32_t begin, uint32_t end, struct
 	uint8_t buf[32];
 	ssize_t len;
 
-	for (uint32_t i = begin; i < end; i++) {
+	for (int i = begin; i < end; i++) {
 		uint8_t id = (i % max_id);
 		uint8_t id_data = id + max_id * (i / max_id);
 
@@ -303,11 +302,11 @@ static void check_content(uint32_t max_id, struct zms_fs *fs)
 	uint8_t buf[32];
 	ssize_t len;
 
-	for (uint32_t id = 0; id < max_id; id++) {
+	for (int id = 0; id < max_id; id++) {
 		len = zms_read(fs, id, rd_buf, sizeof(buf));
 		zassert_true(len == sizeof(rd_buf), "zms_read unexpected failure: %d", len);
 
-		for (uint16_t i = 0; i < ARRAY_SIZE(rd_buf); i++) {
+		for (int i = 0; i < ARRAY_SIZE(rd_buf); i++) {
 			rd_buf[i] = rd_buf[i] % max_id;
 			buf[i] = id;
 		}
@@ -322,7 +321,6 @@ static void check_content(uint32_t max_id, struct zms_fs *fs)
 ZTEST_F(zms, test_zms_gc_3sectors)
 {
 	int err;
-
 	const uint16_t max_id = 10;
 	/* 41st write will trigger 1st GC. */
 	const uint16_t max_writes = 41;
@@ -410,7 +408,6 @@ ZTEST_F(zms, test_zms_corrupted_sector_close_operation)
 	uint32_t *flash_write_stat;
 	uint32_t *flash_max_write_calls;
 	uint32_t *flash_max_len;
-
 	const uint16_t max_id = 10;
 	/* 21st write will trigger GC. */
 	const uint16_t max_writes = 21;
@@ -423,7 +420,7 @@ ZTEST_F(zms, test_zms_corrupted_sector_close_operation)
 	err = zms_mount(&fixture->fs);
 	zassert_true(err == 0, "zms_mount call failure: %d", err);
 
-	for (uint32_t i = 0; i < max_writes; i++) {
+	for (int i = 0; i < max_writes; i++) {
 		uint8_t id = (i % max_id);
 		uint8_t id_data = id + max_id * (i / max_id);
 
@@ -465,7 +462,7 @@ ZTEST_F(zms, test_zms_full_sector)
 	int err;
 	ssize_t len;
 	uint32_t filling_id = 0;
-	uint32_t i, data_read;
+	uint32_t data_read;
 
 	fixture->fs.sector_count = 3;
 
@@ -493,7 +490,7 @@ ZTEST_F(zms, test_zms_full_sector)
 	zassert_true(len == sizeof(filling_id), "zms_write failed: %d", len);
 
 	/* sanitycheck on ZMS content */
-	for (i = 0; i <= filling_id; i++) {
+	for (int i = 0; i <= filling_id; i++) {
 		len = zms_read(&fixture->fs, i, &data_read, sizeof(data_read));
 		if (i == 1) {
 			zassert_true(len == -ENOENT, "zms_read shouldn't found the entry: %d", len);
@@ -511,8 +508,10 @@ ZTEST_F(zms, test_delete)
 {
 	int err;
 	ssize_t len;
-	uint32_t filling_id, data_read;
-	uint32_t ate_wra, data_wra;
+	uint32_t filling_id;
+	uint32_t data_read;
+	uint32_t ate_wra;
+	uint32_t data_wra;
 
 	fixture->fs.sector_count = 3;
 
@@ -570,7 +569,9 @@ ZTEST_F(zms, test_delete)
  */
 ZTEST_F(zms, test_zms_gc_corrupt_close_ate)
 {
-	struct zms_ate ate, close_ate, empty_ate;
+	struct zms_ate ate;
+	struct zms_ate close_ate;
+	struct zms_ate empty_ate;
 	uint32_t data;
 	ssize_t len;
 	int err;
@@ -642,7 +643,8 @@ ZTEST_F(zms, test_zms_gc_corrupt_close_ate)
  */
 ZTEST_F(zms, test_zms_gc_corrupt_ate)
 {
-	struct zms_ate corrupt_ate, close_ate;
+	struct zms_ate corrupt_ate;
+	struct zms_ate close_ate;
 	int err;
 
 	close_ate.id = 0xffffffff;
@@ -685,10 +687,10 @@ ZTEST_F(zms, test_zms_gc_corrupt_ate)
 #ifdef CONFIG_ZMS_LOOKUP_CACHE
 static size_t num_matching_cache_entries(uint64_t addr, bool compare_sector_only, struct zms_fs *fs)
 {
-	size_t i, num = 0;
+	size_t num = 0;
 	uint64_t mask = compare_sector_only ? ADDR_SECT_MASK : UINT64_MAX;
 
-	for (i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
+	for (int i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
 		if ((fs->lookup_cache[i] & mask) == addr) {
 			num++;
 		}
@@ -759,20 +761,19 @@ ZTEST_F(zms, test_zms_cache_collission)
 {
 #ifdef CONFIG_ZMS_LOOKUP_CACHE
 	int err;
-	uint32_t id;
 	uint16_t data;
 
 	fixture->fs.sector_count = 4;
 	err = zms_mount(&fixture->fs);
 	zassert_true(err == 0, "zms_mount call failure: %d", err);
 
-	for (id = 0; id < CONFIG_ZMS_LOOKUP_CACHE_SIZE + 1; id++) {
+	for (int id = 0; id < CONFIG_ZMS_LOOKUP_CACHE_SIZE + 1; id++) {
 		data = id;
 		err = zms_write(&fixture->fs, id, &data, sizeof(data));
 		zassert_equal(err, sizeof(data), "zms_write call failure: %d", err);
 	}
 
-	for (id = 0; id < CONFIG_ZMS_LOOKUP_CACHE_SIZE + 1; id++) {
+	for (int id = 0; id < CONFIG_ZMS_LOOKUP_CACHE_SIZE + 1; id++) {
 		err = zms_read(&fixture->fs, id, &data, sizeof(data));
 		zassert_equal(err, sizeof(data), "zms_read call failure: %d", err);
 		zassert_equal(data, id, "incorrect data read");
@@ -846,7 +847,7 @@ ZTEST_F(zms, test_zms_cache_hash_quality)
 
 	/* Write ZMS IDs from 0 to CONFIG_ZMS_LOOKUP_CACHE_SIZE - 1 */
 
-	for (uint16_t i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
+	for (int i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
 		id = i;
 		data = 0;
 
@@ -869,7 +870,7 @@ ZTEST_F(zms, test_zms_cache_hash_quality)
 
 	/* Write CONFIG_ZMS_LOOKUP_CACHE_SIZE ZMS IDs that form the following series: 0, 4, 8... */
 
-	for (uint16_t i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
+	for (int i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
 		id = i * 4;
 		data = 0;
 

From b45ca4a1e949d99fe56a749e09f60b7c09329c32 Mon Sep 17 00:00:00 2001
From: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Date: Mon, 28 Oct 2024 13:50:19 +0200
Subject: [PATCH 0474/2913] [nrf fromlist] drivers: modem_cellular: fix
 handling of `+C*REG` answers

`+C*REG:` may be received as AT read command answer
or unsolicited notification.
Their syntax differs, and even the overall parameter count varies
depending on what `<n>` is used in the `AT+CEREG=` write command.

To handle all cases properly, check the parameter count and
the presence of the `<tac>` parameter (which is a string and
thus begins with `"`) to figure out what is the position of `<stat>`.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
(cherry picked from commit 46366b9a4330b18d1eb0210d001532c75a215885)

Upstream PR #: 80512

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
(cherry picked from commit c2097f6acea271ca69201de1c70f0f45bcbb5571)
---
 drivers/modem/modem_cellular.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/modem/modem_cellular.c b/drivers/modem/modem_cellular.c
index 65f03cba43d..eb59319ac24 100644
--- a/drivers/modem/modem_cellular.c
+++ b/drivers/modem/modem_cellular.c
@@ -454,10 +454,15 @@ static void modem_cellular_chat_on_cxreg(struct modem_chat *chat, char **argv, u
 	struct modem_cellular_data *data = (struct modem_cellular_data *)user_data;
 	enum cellular_registration_status registration_status = 0;
 
-	if (argc == 2) {
-		registration_status = atoi(argv[1]);
-	} else if (argc == 3 || argc == 6) {
+	/* This receives both +C*REG? read command answers and unsolicited notifications.
+	 * Their syntax differs in that the former has one more parameter, <n>, which is first.
+	 */
+	if (argc >= 3 && argv[2][0] != '"') {
+		/* +CEREG: <n>,<stat>[,<tac>[...]] */
 		registration_status = atoi(argv[2]);
+	} else if (argc >= 2) {
+		/* +CEREG: <stat>[,<tac>[...]] */
+		registration_status = atoi(argv[1]);
 	} else {
 		return;
 	}
@@ -466,7 +471,7 @@ static void modem_cellular_chat_on_cxreg(struct modem_chat *chat, char **argv, u
 		data->registration_status_gsm = registration_status;
 	} else if (strcmp(argv[0], "+CGREG: ") == 0) {
 		data->registration_status_gprs = registration_status;
-	} else {
+	} else { /* CEREG */
 		data->registration_status_lte = registration_status;
 	}
 

From 558396cba201bc0a88a6f0ea0e84dcf2e694c566 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Thu, 10 Oct 2024 11:53:37 +0200
Subject: [PATCH 0475/2913] [nrf fromtree] cmake: support PATH argument in
 build_info()

Support PATH argument in build_info() function.
The PATH argument can be used to provide a list of paths paths and that
those paths might be using native style, such as `c:\win\path', and
therefore should be converted to CMake style path.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit a5cd46b843c66ee0b7b753d5b791ac0c6f7995e3)
(cherry picked from commit 724df7d4e50e1a10f9f17959e59a600efd58f821)
---
 cmake/modules/extensions.cmake | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index 066e0422e49..23c30789b73 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -3596,7 +3596,8 @@ function(topological_sort)
 endfunction()
 
 # Usage:
-#   build_info(<tag>... VALUE <value>...)
+#   build_info(<tag>... VALUE <value>... )
+#   build_info(<tag>... PATH  <path>... )
 #
 # This function populates updates the build_info.yml info file with exchangable build information
 # related to the current build.
@@ -3613,11 +3614,20 @@ endfunction()
 # <tag>...: One of the pre-defined valid CMake keys supported by build info or vendor-specific.
 #           See 'scripts/schemas/build-schema.yml' CMake section for valid tags.
 # VALUE <value>... : value(s) to place in the build_info.yml file.
+# PATH  <path>... : path(s) to place in the build_info.yml file. All paths are converted to CMake
+#                   style. If no conversion is required, for example when paths are already
+#                   guaranteed to be CMake style, then VALUE can also be used.
 function(build_info)
+  set(convert_path FALSE)
   set(arg_list ${ARGV})
   list(FIND arg_list VALUE index)
   if(index EQUAL -1)
-    message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION}(...) missing a required argument: VALUE")
+    list(FIND arg_list PATH index)
+    set(convert_path TRUE)
+  endif()
+
+  if(index EQUAL -1)
+    message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION}(...) missing a required argument: VALUE or PATH")
   endif()
 
   yaml_context(EXISTS NAME build_info result)
@@ -3635,6 +3645,15 @@ function(build_info)
   list(SUBLIST arg_list ${index} -1 values)
   list(POP_FRONT values)
 
+  if(convert_path)
+    set(converted_values)
+    foreach(val ${values})
+      cmake_path(SET cmake_path "${val}")
+      list(APPEND converted_values "${cmake_path}")
+    endforeach()
+    set(values "${converted_values}")
+  endif()
+
   if(ARGV0 STREQUAL "vendor-specific")
     set(type VALUE)
   else()

From 0a7925e539776d124e778f0d7a7f29bec63436be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karol=20Laso=C5=84czyk?= <karol.lasonczyk@nordicsemi.no>
Date: Wed, 16 Oct 2024 15:47:08 +0200
Subject: [PATCH 0476/2913] [nrf fromtree] tests: drivers: i2s: Add overlay to
 support nRF54L15 DK
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add overlay to support nRF54L15 DK.

Signed-off-by: Karol Lasończyk <karol.lasonczyk@nordicsemi.no>
(cherry picked from commit 19252bdc3db032cd9ff8a54d8a6ece397b3563eb)
(cherry picked from commit e6b24cbaf05dcbd9d5579751c86d8a2ef2a4d466)
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 30 +++++++++++++++++++
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 30 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..8b82825a0f2
--- /dev/null
+++ b/tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* i2s-node0 is the transmitter/receiver */
+
+/ {
+	aliases {
+		i2s-node0 = &i2s20;
+	};
+};
+
+&pinctrl {
+	i2s20_default_alt: i2s20_default_alt {
+		group1 {
+			psels = <NRF_PSEL(I2S_SCK_M, 1, 11)>,
+				<NRF_PSEL(I2S_LRCK_M, 1, 12)>,
+				<NRF_PSEL(I2S_SDOUT, 1, 8)>,
+				<NRF_PSEL(I2S_SDIN, 1, 9)>;
+		};
+	};
+};
+
+&i2s20 {
+	status = "okay";
+	pinctrl-0 = <&i2s20_default_alt>;
+	pinctrl-names = "default";
+};
diff --git a/tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..8b82825a0f2
--- /dev/null
+++ b/tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* i2s-node0 is the transmitter/receiver */
+
+/ {
+	aliases {
+		i2s-node0 = &i2s20;
+	};
+};
+
+&pinctrl {
+	i2s20_default_alt: i2s20_default_alt {
+		group1 {
+			psels = <NRF_PSEL(I2S_SCK_M, 1, 11)>,
+				<NRF_PSEL(I2S_LRCK_M, 1, 12)>,
+				<NRF_PSEL(I2S_SDOUT, 1, 8)>,
+				<NRF_PSEL(I2S_SDIN, 1, 9)>;
+		};
+	};
+};
+
+&i2s20 {
+	status = "okay";
+	pinctrl-0 = <&i2s20_default_alt>;
+	pinctrl-names = "default";
+};

From cd410de7c15904e5c8a0d11bb0a03f377572db6f Mon Sep 17 00:00:00 2001
From: Dominik Kilian <Dominik.Kilian@nordicsemi.no>
Date: Wed, 23 Oct 2024 14:23:00 +0200
Subject: [PATCH 0477/2913] [nrf fromtree] boards: nordic: ipc: added dcache
 alignement

The nRF54 and nRF92 chips has data cache, which means
the ICMsg and ICBMsg must be configured to follow required
cache alignment of the shared memory.
The `dcache-alignement` needs to be defined for that.

Signed-off-by: Dominik Kilian <Dominik.Kilian@nordicsemi.no>

(cherry picked from commit cbaafe209c17f03feea3760be855dc76ef5612cc)
(cherry picked from commit 6c435d6d9b1ffa8782d38ddb338edac2447a502e)
---
 .../nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi       |  1 +
 .../nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi |  1 +
 .../ipc/ipc_service/backends/ipc_service_icbmsg.rst    | 10 ++++++++++
 .../ipc/ipc_service/backends/ipc_service_icmsg.rst     | 10 ++++++++++
 dts/bindings/ipc/zephyr,ipc-icmsg.yaml                 |  2 +-
 .../icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay    |  1 +
 .../boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay   |  1 +
 .../remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay  |  1 +
 .../boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay  |  1 +
 subsys/ipc/ipc_service/backends/ipc_icbmsg.c           |  4 ++--
 10 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi
index a17889fe0b0..fdc93408dd3 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi
@@ -22,6 +22,7 @@
 
 		cpuapp_cpurad_ipc: ipc-2-3 {
 			compatible = "zephyr,ipc-icbmsg";
+			dcache-alignment = <32>;
 			status = "disabled";
 			mboxes = <&cpuapp_bellboard 18>,
 				 <&cpurad_bellboard 12>;
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi
index 944dd7fb6ab..906342f6f3d 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi
@@ -22,6 +22,7 @@
 
 		cpuapp_cpurad_ipc: ipc-2-3 {
 			compatible = "zephyr,ipc-icbmsg";
+			dcache-alignment = <32>;
 			status = "disabled";
 			mboxes = <&cpuapp_bellboard 18>,
 				 <&cpurad_bellboard 12>;
diff --git a/doc/services/ipc/ipc_service/backends/ipc_service_icbmsg.rst b/doc/services/ipc/ipc_service/backends/ipc_service_icbmsg.rst
index f570766b0bd..b1f13d7566a 100644
--- a/doc/services/ipc/ipc_service/backends/ipc_service_icbmsg.rst
+++ b/doc/services/ipc/ipc_service/backends/ipc_service_icbmsg.rst
@@ -40,12 +40,21 @@ Configuration
 The backend is configured using Kconfig and devicetree.
 When configuring the backend, do the following:
 
+* If at least one of the cores uses data cache on shared memory, set the ``dcache-alignment`` value.
+  This must be the largest value of the invalidation or the write-back size for both sides of the communication.
+  You can skip it if none of the communication sides is using data cache on shared memory.
 * Define two memory regions and assign them to ``tx-region`` and ``rx-region`` of an instance.
   Ensure that the memory regions used for data exchange are unique (not overlapping any other region) and accessible by both domains (or CPUs).
 * Define the number of allocable blocks for each region with ``tx-blocks`` and ``rx-blocks``.
 * Define MBOX devices for sending a signal that informs the other domain (or CPU) of the written data.
   Ensure that the other domain (or CPU) can receive the signal.
 
+.. caution::
+
+    Make sure that you set correct value of the ``dcache-alignment``.
+    At first, wrong value may not show any signs, which may give a false impression that everything works.
+    Unstable behavior will appear sooner or later.
+
 See the following configuration example for one of the instances:
 
 .. code-block:: devicetree
@@ -63,6 +72,7 @@ See the following configuration example for one of the instances:
    ipc {
       ipc0: ipc0 {
          compatible = "zephyr,ipc-icbmsg";
+         dcache-alignment = <32>;
          tx-region = <&tx>;
          rx-region = <&rx>;
          tx-blocks = <16>;
diff --git a/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst b/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst
index 56f618b442d..251a332027a 100644
--- a/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst
+++ b/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst
@@ -24,6 +24,9 @@ Configuration
 The  backend is configured via Kconfig and devicetree.
 When configuring the backend, do the following:
 
+* If at least one of the cores uses data cache on shared memory, set the ``dcache-alignment`` value.
+  This must be the largest value of the invalidation or the write-back size for both sides of the communication.
+  You can skip it if none of the communication sides is using data cache on shared memory.
 * Define two memory regions and assign them to ``tx-region`` and ``rx-region``
   of an instance. Ensure that the memory regions used for data exchange are
   unique (not overlapping any other region) and accessible by both domains
@@ -32,6 +35,12 @@ When configuring the backend, do the following:
   domain (or CPU) that data has been written. Ensure that the other domain
   (or CPU) is able to receive the signal.
 
+.. caution::
+
+    Make sure that you set correct value of the ``dcache-alignment``.
+    At first, wrong value may not show any signs, which may give a false impression that everything works.
+    Unstable behavior will appear sooner or later.
+
 See the following configuration example for one of the instances:
 
 .. code-block:: devicetree
@@ -49,6 +58,7 @@ See the following configuration example for one of the instances:
       ipc {
          ipc0: ipc0 {
             compatible = "zephyr,ipc-icmsg";
+            dcache-alignment = <32>;
             tx-region = <&tx>;
             rx-region = <&rx>;
             mboxes = <&mbox 0>, <&mbox 1>;
diff --git a/dts/bindings/ipc/zephyr,ipc-icmsg.yaml b/dts/bindings/ipc/zephyr,ipc-icmsg.yaml
index 41793005373..13a9e2b84b6 100644
--- a/dts/bindings/ipc/zephyr,ipc-icmsg.yaml
+++ b/dts/bindings/ipc/zephyr,ipc-icmsg.yaml
@@ -32,7 +32,7 @@ properties:
       For example:
         Side A: no data cache
         Side B: 32 Bytes write-back size, 16 Bytes invalidation size
-        dcache-alignment = 32; for both
+        dcache-alignment = <32>; for both
 
   mboxes:
     description: phandle to the MBOX controller (TX and RX are required)
diff --git a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index b6f20acc42a..56b3ae097d8 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -23,6 +23,7 @@
 	ipc {
 		ipc0: ipc0 {
 			compatible = "zephyr,ipc-icmsg";
+			dcache-alignment = <32>;
 			tx-region = <&sram_tx>;
 			rx-region = <&sram_rx>;
 			mboxes = <&cpuapp_vevif_rx 20>, <&cpuapp_vevif_tx 21>;
diff --git a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay
index a3f853c6e3d..639ad5e844b 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay
+++ b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay
@@ -23,6 +23,7 @@
 	ipc {
 		ipc0: ipc0 {
 			compatible = "zephyr,ipc-icbmsg";
+			dcache-alignment = <32>;
 			tx-region = <&sram_tx>;
 			rx-region = <&sram_rx>;
 			tx-blocks = <16>;
diff --git a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
index c6e59f2b131..b3e86e96361 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
+++ b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
@@ -23,6 +23,7 @@
 	ipc {
 		ipc0: ipc0 {
 			compatible = "zephyr,ipc-icmsg";
+			dcache-alignment = <32>;
 			tx-region = <&sram_tx>;
 			rx-region = <&sram_rx>;
 			mboxes = <&cpuflpr_vevif_rx 21>, <&cpuflpr_vevif_tx 20>;
diff --git a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay
index 0033e622107..7fe78a71653 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay
+++ b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay
@@ -23,6 +23,7 @@
 	ipc {
 		ipc0: ipc0 {
 			compatible = "zephyr,ipc-icbmsg";
+			dcache-alignment = <32>;
 			tx-region = <&sram_tx>;
 			rx-region = <&sram_rx>;
 			tx-blocks = <18>;
diff --git a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
index 9fd7752999f..927950dd50a 100644
--- a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
+++ b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
@@ -1434,11 +1434,11 @@ const static struct ipc_service_backend backend_ops = {
 	};										\
 	BUILD_ASSERT(IS_POWER_OF_TWO(GET_CACHE_ALIGNMENT(i)),				\
 		     "This module supports only power of two cache alignment");		\
-	BUILD_ASSERT((GET_BLOCK_SIZE_INST(i, tx, rx) > GET_CACHE_ALIGNMENT(i)) &&	\
+	BUILD_ASSERT((GET_BLOCK_SIZE_INST(i, tx, rx) >= GET_CACHE_ALIGNMENT(i)) &&	\
 		     (GET_BLOCK_SIZE_INST(i, tx, rx) <					\
 		      GET_MEM_SIZE_INST(i, tx)),					\
 		     "TX region is too small for provided number of blocks");		\
-	BUILD_ASSERT((GET_BLOCK_SIZE_INST(i, rx, tx) > GET_CACHE_ALIGNMENT(i)) &&	\
+	BUILD_ASSERT((GET_BLOCK_SIZE_INST(i, rx, tx) >= GET_CACHE_ALIGNMENT(i)) &&	\
 		     (GET_BLOCK_SIZE_INST(i, rx, tx) <					\
 		      GET_MEM_SIZE_INST(i, rx)),					\
 		     "RX region is too small for provided number of blocks");		\

From 93a848474ed0013d47d48e0f106fb9eac610af5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Fri, 27 Sep 2024 15:14:16 +0200
Subject: [PATCH 0478/2913] [nrf fromtree] soc: nordic: Fix the way of enabling
 clock control for nRF54H Series
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a follow-up to commit 7a2ce2882a66f44dae9d462bb9ad965958369a28.

Do not enable clock control by default on nRF54H Series SoCs when
the system timer is present, because clock control is not needed
for this purpose there.

Add missing `default y` in the CLOCK_CONTROL_NRF2 Kconfig option that
enables compilation of clock control drivers for nRF54H Series.
This way modules that actually require clock control (like drivers
that use radio) will be able to enable it using the generic option
(CLOCK_CONTROL), not the above one that is specific for nRF54H.

Update accordingly applications that referenced the CLOCK_CONTROL_NRF2
option.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit edc4f75b6174b358566dad32e56d5ed667c5c52d)
(cherry picked from commit e9fcbfe49dfc527d856a5562a34a15a4f2f153d0)
---
 drivers/clock_control/Kconfig.nrf                      |  1 +
 .../nordic/clock_control/configs/cpuapp_hsfll.conf     |  2 +-
 .../boards/nordic/clock_control/configs/fll16m.conf    |  2 +-
 samples/boards/nordic/clock_control/configs/lfclk.conf |  2 +-
 .../boards/nordic/clock_control/configs/uart135.conf   |  2 +-
 soc/nordic/Kconfig.defconfig                           | 10 ++++------
 tests/drivers/clock_control/nrf_clock_control/prj.conf |  2 +-
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/drivers/clock_control/Kconfig.nrf b/drivers/clock_control/Kconfig.nrf
index 8c806119fd6..f7b0de3db09 100644
--- a/drivers/clock_control/Kconfig.nrf
+++ b/drivers/clock_control/Kconfig.nrf
@@ -175,6 +175,7 @@ endif # CLOCK_CONTROL_NRF
 
 config CLOCK_CONTROL_NRF2
 	bool "nRF clock control support"
+	default y
 	depends on SOC_SERIES_NRF54HX && !RISCV_CORE_NORDIC_VPR
 	select ONOFF
 	select NRFS if HAS_NRFS
diff --git a/samples/boards/nordic/clock_control/configs/cpuapp_hsfll.conf b/samples/boards/nordic/clock_control/configs/cpuapp_hsfll.conf
index 5c1bad08a80..53eebac30be 100644
--- a/samples/boards/nordic/clock_control/configs/cpuapp_hsfll.conf
+++ b/samples/boards/nordic/clock_control/configs/cpuapp_hsfll.conf
@@ -1,6 +1,6 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CLOCK_CONTROL_NRF2=y
+CONFIG_CLOCK_CONTROL=y
 
 CONFIG_SAMPLE_CLOCK_FREQUENCY_HZ=320000000
diff --git a/samples/boards/nordic/clock_control/configs/fll16m.conf b/samples/boards/nordic/clock_control/configs/fll16m.conf
index de9942857b9..c5d3a84f661 100644
--- a/samples/boards/nordic/clock_control/configs/fll16m.conf
+++ b/samples/boards/nordic/clock_control/configs/fll16m.conf
@@ -1,6 +1,6 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CLOCK_CONTROL_NRF2=y
+CONFIG_CLOCK_CONTROL=y
 
 CONFIG_SAMPLE_CLOCK_ACCURACY_PPM=30
diff --git a/samples/boards/nordic/clock_control/configs/lfclk.conf b/samples/boards/nordic/clock_control/configs/lfclk.conf
index 6cf09f0e4c7..b866d3d81d1 100644
--- a/samples/boards/nordic/clock_control/configs/lfclk.conf
+++ b/samples/boards/nordic/clock_control/configs/lfclk.conf
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CLOCK_CONTROL_NRF2=y
+CONFIG_CLOCK_CONTROL=y
 
 CONFIG_SAMPLE_CLOCK_ACCURACY_PPM=20
 CONFIG_SAMPLE_CLOCK_PRECISION=1
diff --git a/samples/boards/nordic/clock_control/configs/uart135.conf b/samples/boards/nordic/clock_control/configs/uart135.conf
index de9942857b9..c5d3a84f661 100644
--- a/samples/boards/nordic/clock_control/configs/uart135.conf
+++ b/samples/boards/nordic/clock_control/configs/uart135.conf
@@ -1,6 +1,6 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CLOCK_CONTROL_NRF2=y
+CONFIG_CLOCK_CONTROL=y
 
 CONFIG_SAMPLE_CLOCK_ACCURACY_PPM=30
diff --git a/soc/nordic/Kconfig.defconfig b/soc/nordic/Kconfig.defconfig
index c912861cc4b..efa122aa5b5 100644
--- a/soc/nordic/Kconfig.defconfig
+++ b/soc/nordic/Kconfig.defconfig
@@ -7,13 +7,11 @@ if SOC_FAMILY_NORDIC_NRF
 
 rsource "*/Kconfig.defconfig"
 
-# If the kernel has timer support, enable clock control
-if SYS_CLOCK_EXISTS
-
+# If the kernel has timer support, enable clock control, except for SoCs
+# based on the Haltium platform SoCs where clock control is not needed
+# for the system timer
 config CLOCK_CONTROL
-	default y if !SOC_SERIES_NRF92X
-
-endif # SYS_CLOCK_EXISTS
+	default y if SYS_CLOCK_EXISTS && !NRF_PLATFORM_HALTIUM
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 1000000 if NRF_GRTC_TIMER
diff --git a/tests/drivers/clock_control/nrf_clock_control/prj.conf b/tests/drivers/clock_control/nrf_clock_control/prj.conf
index 84145cf96a4..d11c2f125a0 100644
--- a/tests/drivers/clock_control/nrf_clock_control/prj.conf
+++ b/tests/drivers/clock_control/nrf_clock_control/prj.conf
@@ -1,6 +1,6 @@
 CONFIG_ZTEST=y
 
-CONFIG_CLOCK_CONTROL_NRF2=y
+CONFIG_CLOCK_CONTROL=y
 CONFIG_LOG=y
 CONFIG_CLOCK_CONTROL_LOG_LEVEL_DBG=y
 CONFIG_LOCAL_DOMAIN_DVFS_LIB_LOG_LEVEL_DBG=y

From c6a13549da00c0ba8424b95caf0cf0fe8369aa1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 17 Oct 2024 15:55:14 +0200
Subject: [PATCH 0479/2913] [nrf fromtree] drivers: clock_control_nrf2_hsfll:
 Fix checking if DVFS is available
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To check if DVFS can be used, the CONFIG_NRFS_DVFS_LOCAL_DOMAIN symbol
needs to be used, not CONFIG_NRFS_HAS_DVFS_SERVICE which only indicates
that DVFS is technically possible, not that its local domain part is
actually included in the build.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit f629f1e287bc5e0d514e025e8a964c0b42a2e46f)
(cherry picked from commit 5a8a8e39e34ef24a57ac93a410448b904d2a2bfd)
---
 drivers/clock_control/clock_control_nrf2_hsfll.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/clock_control/clock_control_nrf2_hsfll.c b/drivers/clock_control/clock_control_nrf2_hsfll.c
index 90cd56318dd..026edf9abbd 100644
--- a/drivers/clock_control/clock_control_nrf2_hsfll.c
+++ b/drivers/clock_control/clock_control_nrf2_hsfll.c
@@ -17,7 +17,7 @@ LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
 BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
 	     "multiple instances not supported");
 
-#ifdef CONFIG_NRFS_HAS_DVFS_SERVICE
+#ifdef CONFIG_NRFS_DVFS_LOCAL_DOMAIN
 #include <ld_dvfs_handler.h>
 
 #define FLAG_FREQ_CHANGE_CB_EXPECTED BIT(FLAGS_COMMON_BITS)
@@ -131,13 +131,13 @@ static struct onoff_manager *hsfll_find_mgr(const struct device *dev,
 	LOG_ERR("invalid frequency");
 	return NULL;
 }
-#endif /* CONFIG_NRFS_HAS_DVFS_SERVICE */
+#endif /* CONFIG_NRFS_DVFS_LOCAL_DOMAIN */
 
 static int api_request_hsfll(const struct device *dev,
 			     const struct nrf_clock_spec *spec,
 			     struct onoff_client *cli)
 {
-#ifdef CONFIG_NRFS_HAS_DVFS_SERVICE
+#ifdef CONFIG_NRFS_DVFS_LOCAL_DOMAIN
 	struct onoff_manager *mgr = hsfll_find_mgr(dev, spec);
 
 	if (mgr) {
@@ -153,7 +153,7 @@ static int api_request_hsfll(const struct device *dev,
 static int api_release_hsfll(const struct device *dev,
 			     const struct nrf_clock_spec *spec)
 {
-#ifdef CONFIG_NRFS_HAS_DVFS_SERVICE
+#ifdef CONFIG_NRFS_DVFS_LOCAL_DOMAIN
 	struct onoff_manager *mgr = hsfll_find_mgr(dev, spec);
 
 	if (mgr) {
@@ -170,7 +170,7 @@ static int api_cancel_or_release_hsfll(const struct device *dev,
 				       const struct nrf_clock_spec *spec,
 				       struct onoff_client *cli)
 {
-#ifdef CONFIG_NRFS_HAS_DVFS_SERVICE
+#ifdef CONFIG_NRFS_DVFS_LOCAL_DOMAIN
 	struct onoff_manager *mgr = hsfll_find_mgr(dev, spec);
 
 	if (mgr) {
@@ -197,7 +197,7 @@ static int api_get_rate_hsfll(const struct device *dev,
 
 static int hsfll_init(const struct device *dev)
 {
-#ifdef CONFIG_NRFS_HAS_DVFS_SERVICE
+#ifdef CONFIG_NRFS_DVFS_LOCAL_DOMAIN
 	struct hsfll_dev_data *dev_data = dev->data;
 	int rc;
 
@@ -228,12 +228,12 @@ static struct nrf_clock_control_driver_api hsfll_drv_api = {
 	.cancel_or_release = api_cancel_or_release_hsfll,
 };
 
-#ifdef CONFIG_NRFS_HAS_DVFS_SERVICE
+#ifdef CONFIG_NRFS_DVFS_LOCAL_DOMAIN
 static struct hsfll_dev_data hsfll_data;
 #endif
 
 DEVICE_DT_INST_DEFINE(0, hsfll_init, NULL,
-		      COND_CODE_1(CONFIG_NRFS_HAS_DVFS_SERVICE,
+		      COND_CODE_1(CONFIG_NRFS_DVFS_LOCAL_DOMAIN,
 				  (&hsfll_data),
 				  (NULL)),
 		      NULL,

From c192cac1317f41f0a7de3bc7c82bc78b4dfd1a56 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Thu, 24 Oct 2024 17:05:11 +0200
Subject: [PATCH 0480/2913] [nrf fromlist] dts: common: nordic: nrf54l15: add
 power peripheral

Add power peripheral to nrf54l15.

Upstream PR #: 79934

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit b7cc11b332ecb1a9eefd933f373fb34d5799204f)
---
 dts/common/nordic/nrf54l15.dtsi | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index 5851bfd71e3..66c5e3c2d51 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -606,6 +606,32 @@
 				status = "disabled";
 			};
 
+			power: power@10e000 {
+				compatible = "nordic,nrf-power";
+				reg = <0x10e000 0x1000>;
+				ranges = <0x0 0x10e000 0x1000>;
+				interrupts = <270 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				gpregret1: gpregret1@51c {
+					#address-cells = <1>;
+					#size-cells = <1>;
+					compatible = "nordic,nrf-gpregret";
+					reg = <0x51c 0x1>;
+					status = "disabled";
+				};
+
+				gpregret2: gpregret2@520 {
+					#address-cells = <1>;
+					#size-cells = <1>;
+					compatible = "nordic,nrf-gpregret";
+					reg = <0x520 0x1>;
+					status = "disabled";
+				};
+			};
+
 			regulators: regulator@120000 {
 				compatible = "nordic,nrf54l-regulators";
 				reg = <0x120000 0x1000>;

From 435b75c005fff8dfc17c543a36307dbd1803b5cc Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Wed, 16 Oct 2024 15:36:50 +0200
Subject: [PATCH 0481/2913] [nrf fromlist] soc: nordic: add fn for setting
 constlat mode

Nordic SoCs implement an event system, for which the system can
optimize for low latency/high power or low power.

Add soc level implementation of reference counted API which will
optimize for low latency if any part of the system requires it.

Upstream PR #: 79934

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit becf3de1d9648cec1ee7677d21f7033209d5a79b)
---
 soc/nordic/common/CMakeLists.txt  |  2 +
 soc/nordic/common/Kconfig         |  4 ++
 soc/nordic/common/nrf_sys_event.c | 95 +++++++++++++++++++++++++++++++
 soc/nordic/common/nrf_sys_event.h | 30 ++++++++++
 4 files changed, 131 insertions(+)
 create mode 100644 soc/nordic/common/nrf_sys_event.c
 create mode 100644 soc/nordic/common/nrf_sys_event.h

diff --git a/soc/nordic/common/CMakeLists.txt b/soc/nordic/common/CMakeLists.txt
index 38c55c614e9..1a4e17c20d1 100644
--- a/soc/nordic/common/CMakeLists.txt
+++ b/soc/nordic/common/CMakeLists.txt
@@ -29,3 +29,5 @@ if(CONFIG_TFM_PARTITION_PLATFORM)
     $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
   )
 endif()
+
+zephyr_library_sources_ifdef(CONFIG_NRF_SYS_EVENT nrf_sys_event.c)
diff --git a/soc/nordic/common/Kconfig b/soc/nordic/common/Kconfig
index 8de20c37dd4..ef32e7403c1 100644
--- a/soc/nordic/common/Kconfig
+++ b/soc/nordic/common/Kconfig
@@ -4,4 +4,8 @@
 config HAS_NORDIC_DMM
 	bool
 
+config NRF_SYS_EVENT
+	bool "nRF system event support"
+	select NRFX_POWER if !NRF_PLATFORM_HALTIUM
+
 rsource "vpr/Kconfig"
diff --git a/soc/nordic/common/nrf_sys_event.c b/soc/nordic/common/nrf_sys_event.c
new file mode 100644
index 00000000000..47c02eadb96
--- /dev/null
+++ b/soc/nordic/common/nrf_sys_event.c
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <nrf_sys_event.h>
+
+#if CONFIG_SOC_SERIES_NRF54HX
+
+/*
+ * The 54HX is not yet supported by an nrfx driver nor the system controller so
+ * we implement an ISR and concurrent access safe reference counting implementation
+ * here using the nrfx hal.
+ */
+
+#include <hal/nrf_lrcconf.h>
+
+static struct k_spinlock global_constlat_lock;
+static uint16_t global_constlat_count;
+
+int nrf_sys_event_request_global_constlat(void)
+{
+	K_SPINLOCK(&global_constlat_lock) {
+		if (global_constlat_count == 0) {
+#if CONFIG_SOC_NRF54H20_CPUAPP
+			nrf_lrcconf_task_trigger(NRF_LRCCONF010,
+						 NRF_LRCCONF_TASK_CONSTLAT_ENABLE);
+#elif CONFIG_SOC_NRF54H20_CPURAD
+			nrf_lrcconf_task_trigger(NRF_LRCCONF000,
+						 NRF_LRCCONF_TASK_CONSTLAT_ENABLE);
+			nrf_lrcconf_task_trigger(NRF_LRCCONF020,
+						 NRF_LRCCONF_TASK_CONSTLAT_ENABLE);
+#else
+#error "unsupported"
+#endif
+		}
+
+		global_constlat_count++;
+	}
+
+	return 0;
+}
+
+int nrf_sys_event_release_global_constlat(void)
+{
+	K_SPINLOCK(&global_constlat_lock) {
+		if (global_constlat_count == 1) {
+#if CONFIG_SOC_NRF54H20_CPUAPP
+			nrf_lrcconf_task_trigger(NRF_LRCCONF010,
+						 NRF_LRCCONF_TASK_CONSTLAT_DISABLE);
+#elif CONFIG_SOC_NRF54H20_CPURAD
+			nrf_lrcconf_task_trigger(NRF_LRCCONF000,
+						 NRF_LRCCONF_TASK_CONSTLAT_DISABLE);
+			nrf_lrcconf_task_trigger(NRF_LRCCONF020,
+						 NRF_LRCCONF_TASK_CONSTLAT_DISABLE);
+#else
+#error "unsupported"
+#endif
+		}
+
+		global_constlat_count--;
+	}
+
+	return 0;
+}
+
+#else
+
+/*
+ * The nrfx power driver already contains an ISR and concurrent access safe reference
+ * counting API so we just use it directly when available.
+ */
+
+#include <nrfx_power.h>
+
+int nrf_sys_event_request_global_constlat(void)
+{
+	nrfx_err_t err;
+
+	err = nrfx_power_constlat_mode_request();
+
+	return (err == NRFX_SUCCESS || err == NRFX_ERROR_ALREADY) ? 0 : -EAGAIN;
+}
+
+int nrf_sys_event_release_global_constlat(void)
+{
+	nrfx_err_t err;
+
+	err = nrfx_power_constlat_mode_free();
+
+	return (err == NRFX_SUCCESS || err == NRFX_ERROR_BUSY) ? 0 : -EAGAIN;
+}
+
+#endif
diff --git a/soc/nordic/common/nrf_sys_event.h b/soc/nordic/common/nrf_sys_event.h
new file mode 100644
index 00000000000..a4d6d8050f0
--- /dev/null
+++ b/soc/nordic/common/nrf_sys_event.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+/**
+ * @brief Request lowest latency for system events
+ *
+ * @details System will be configured for lowest latency after first
+ * call to nrf_sys_event_request_global_constlat() and will remain
+ * configured for lowest latency until matching number of calls to
+ * nrf_sys_event_release_global_constlat() occur.
+ *
+ * @retval 0 if successful
+ * @retval -errno code otherwise
+ */
+int nrf_sys_event_request_global_constlat(void);
+
+/**
+ * @brief Release low latency request
+ *
+ * @see nrf_sys_event_request_global_constlat()
+ *
+ * @retval 0 if successful
+ * @retval -errno code otherwise
+ */
+int nrf_sys_event_release_global_constlat(void);

From 5b6fcf3d80f8136b2b9057ad4a9d0253d139e5e7 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Wed, 16 Oct 2024 16:31:10 +0200
Subject: [PATCH 0482/2913] [nrf fromlist] samples: boards: nordic: add
 nrf_sys_event sample

Add sample for nrf system events.

Upstream PR #: 79934

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 4c7f4d4219899a497853e432636a0344e064c0f4)
---
 .../nordic/nrf_sys_event/CMakeLists.txt       |  9 ++++
 samples/boards/nordic/nrf_sys_event/prj.conf  |  4 ++
 .../boards/nordic/nrf_sys_event/sample.yaml   | 28 +++++++++++++
 .../boards/nordic/nrf_sys_event/src/main.c    | 41 +++++++++++++++++++
 4 files changed, 82 insertions(+)
 create mode 100644 samples/boards/nordic/nrf_sys_event/CMakeLists.txt
 create mode 100644 samples/boards/nordic/nrf_sys_event/prj.conf
 create mode 100644 samples/boards/nordic/nrf_sys_event/sample.yaml
 create mode 100644 samples/boards/nordic/nrf_sys_event/src/main.c

diff --git a/samples/boards/nordic/nrf_sys_event/CMakeLists.txt b/samples/boards/nordic/nrf_sys_event/CMakeLists.txt
new file mode 100644
index 00000000000..5f7335b260e
--- /dev/null
+++ b/samples/boards/nordic/nrf_sys_event/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(soc_sys_event)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/samples/boards/nordic/nrf_sys_event/prj.conf b/samples/boards/nordic/nrf_sys_event/prj.conf
new file mode 100644
index 00000000000..28f655a7e24
--- /dev/null
+++ b/samples/boards/nordic/nrf_sys_event/prj.conf
@@ -0,0 +1,4 @@
+# Copyright 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_NRF_SYS_EVENT=y
diff --git a/samples/boards/nordic/nrf_sys_event/sample.yaml b/samples/boards/nordic/nrf_sys_event/sample.yaml
new file mode 100644
index 00000000000..c5ea3d8a23d
--- /dev/null
+++ b/samples/boards/nordic/nrf_sys_event/sample.yaml
@@ -0,0 +1,28 @@
+sample:
+  name: nRF System events
+tests:
+  sample.boards.nordic.nrf_sys_event:
+    harness: console
+    harness_config:
+      type: one_line
+      regex:
+        - "constant latency mode disabled"
+    platform_allow:
+      - nrf52dk/nrf52810
+      - nrf52dk/nrf52832
+      - nrf52833dk/nrf52820
+      - nrf52833dk/nrf52833
+      - nrf52840dk/nrf52811
+      - nrf52840dk/nrf52840
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf5340dk/nrf5340/cpunet
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpurad
+      - nrf54l15dk/nrf54l15/cpuapp
+    integration_platforms:
+      - nrf52840dk/nrf52840
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf5340dk/nrf5340/cpunet
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpurad
+      - nrf54l15dk/nrf54l15/cpuapp
diff --git a/samples/boards/nordic/nrf_sys_event/src/main.c b/samples/boards/nordic/nrf_sys_event/src/main.c
new file mode 100644
index 00000000000..e97d3c821f7
--- /dev/null
+++ b/samples/boards/nordic/nrf_sys_event/src/main.c
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <nrf_sys_event.h>
+#include <stdio.h>
+
+int main(void)
+{
+	printf("request global constant latency mode\n");
+	if (nrf_sys_event_request_global_constlat()) {
+		printf("failed to request global constant latency mode\n");
+		return 0;
+	}
+	printf("constant latency mode enabled\n");
+
+	printf("request global constant latency mode again\n");
+	if (nrf_sys_event_request_global_constlat()) {
+		printf("failed to request global constant latency mode\n");
+		return 0;
+	}
+
+	printf("release global constant latency mode\n");
+	printf("constant latency mode will remain enabled\n");
+	if (nrf_sys_event_release_global_constlat()) {
+		printf("failed to release global constant latency mode\n");
+		return 0;
+	}
+
+	printf("release global constant latency mode again\n");
+	printf("constant latency mode will be disabled\n");
+	if (nrf_sys_event_release_global_constlat()) {
+		printf("failed to release global constant latency mode\n");
+		return 0;
+	}
+
+	printf("constant latency mode disabled\n");
+	return 0;
+}

From a45e8eb2157ac9a2bd98af330a279f1061466bf0 Mon Sep 17 00:00:00 2001
From: Lukasz Stepnicki <lukasz.stepnicki@nordicsemi.no>
Date: Thu, 3 Oct 2024 21:37:38 +0200
Subject: [PATCH 0483/2913] [nrf fromtree] boards: nordic: ipc node added
 dcache alignement

dcache-alignement needs to be defined for ipc to have
consistent memory organization on both endpoints, when
shared memory is cacheable. nrf54h20 and nrf9280 are
using cacheable shared memory.
This is applied for ipc with icmsg backend.

Signed-off-by: Lukasz Stepnicki <lukasz.stepnicki@nordicsemi.no>
(cherry picked from commit 022122d659a7c10180b8a91c6a0b49874f2850fa)
(cherry picked from commit 6565fcdc8710f584810bb40f7810302c7426961a)
---
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi | 6 ++++++
 boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi  | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi
index fdc93408dd3..94cda5e8ee2 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi
@@ -9,6 +9,7 @@
 		cpusec_cpuapp_ipc: ipc-1-2 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
+			dcache-alignment = <32>;
 			mboxes = <&cpusec_bellboard 12>,
 				 <&cpuapp_bellboard 0>;
 		};
@@ -16,6 +17,7 @@
 		cpusec_cpurad_ipc: ipc-1-3 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
+			dcache-alignment = <32>;
 			mboxes = <&cpusec_bellboard 18>,
 				 <&cpurad_bellboard 0>;
 		};
@@ -31,6 +33,7 @@
 		cpuapp_cpusys_ipc: ipc-2-12 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
+			dcache-alignment = <32>;
 			mboxes = <&cpuapp_bellboard 6>,
 				 <&cpusys_vevif 12>;
 		};
@@ -38,6 +41,7 @@
 		cpuapp_cpuppr_ipc: ipc-2-13 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
+			dcache-alignment = <32>;
 			mboxes = <&cpuapp_bellboard 13>,
 				 <&cpuppr_vevif 12>;
 		};
@@ -45,6 +49,7 @@
 		cpuapp_cpuflpr_ipc: ipc-2-14 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
+			dcache-alignment = <32>;
 			mboxes = <&cpuapp_bellboard 14>,
 				 <&cpuflpr_vevif 16>;
 		};
@@ -52,6 +57,7 @@
 		cpurad_cpusys_ipc: ipc-3-12 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
+			dcache-alignment = <32>;
 			mboxes = <&cpurad_bellboard 6>,
 				 <&cpusys_vevif 18>;
 		};
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi
index 906342f6f3d..0588e8d0801 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi
@@ -9,6 +9,7 @@
 		cpusec_cpuapp_ipc: ipc-1-2 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
+			dcache-alignment = <32>;
 			mboxes = <&cpusec_bellboard 12>,
 				 <&cpuapp_bellboard 0>;
 		};
@@ -16,6 +17,7 @@
 		cpusec_cpurad_ipc: ipc-1-3 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
+			dcache-alignment = <32>;
 			mboxes = <&cpusec_bellboard 18>,
 				 <&cpurad_bellboard 0>;
 		};
@@ -31,6 +33,7 @@
 		cpuapp_cpusys_ipc: ipc-2-12 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
+			dcache-alignment = <32>;
 			mboxes = <&cpuapp_bellboard 6>,
 				 <&cpusys_vevif 12>;
 		};
@@ -38,6 +41,7 @@
 		cpuapp_cpuppr_ipc: ipc-2-13 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
+			dcache-alignment = <32>;
 			mboxes = <&cpuapp_bellboard 13>,
 				 <&cpuppr_vevif 12>;
 		};
@@ -45,6 +49,7 @@
 		cpurad_cpusys_ipc: ipc-3-12 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
+			dcache-alignment = <32>;
 			mboxes = <&cpurad_bellboard 6>,
 				 <&cpusys_vevif 18>;
 		};

From 53e36012f715ed830c69f9a1103e245f84ef3e1c Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Tue, 22 Oct 2024 14:19:46 +0200
Subject: [PATCH 0484/2913] [nrf fromtree] drivers: cache: Enable LINEADDR
 workaround on nRF54H20 EngB

Just like on nRF54H20 EngC.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 41f53b209169f967cb43bc59f2f730f6f838a5eb)
(cherry picked from commit 45109fcae351dc16ef4a2593d1b7f2526203871e)
---
 drivers/cache/Kconfig.nrf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/cache/Kconfig.nrf b/drivers/cache/Kconfig.nrf
index c1cfc2c8c58..ffcbfe66d19 100644
--- a/drivers/cache/Kconfig.nrf
+++ b/drivers/cache/Kconfig.nrf
@@ -10,6 +10,6 @@ config CACHE_NRF_CACHE
 
 config CACHE_NRF_PATCH_LINEADDR
 	bool "Patch lineaddr"
-	default y if SOC_NRF54H20
+	default y if SOC_NRF54H20 || SOC_NRF54H20_ENGB
 	help
 	  Manually set 28th bit in the LINEADDR in Trustzone Secure build.

From a3ce4dbeb6096ad1d7fd4f9e6a28bf7c25c9e2d9 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Tue, 22 Oct 2024 14:19:46 +0200
Subject: [PATCH 0485/2913] [nrf fromtree] modules: hal_nordic: Disable
 802.15.4 temp update on nRF54H20 EngB

Just like on nRF54H20 EngC.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 3f221f9577e33eeee37442d8a22f049c1f1a1f65)
(cherry picked from commit 2e2bd810349a677621c19a395585dd1a98917c7d)
---
 modules/hal_nordic/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/Kconfig b/modules/hal_nordic/Kconfig
index dd4e0a0859b..9d54c15d715 100644
--- a/modules/hal_nordic/Kconfig
+++ b/modules/hal_nordic/Kconfig
@@ -55,7 +55,7 @@ endchoice
 
 config NRF_802154_TEMPERATURE_UPDATE
 	bool "nRF 802.15.4 temperature update"
-	default y if !SOC_NRF54H20
+	default y if !SOC_NRF54H20 && !SOC_NRF54H20_ENGB
 	help
 	  Enable temperature update for nRF 802.15.4 driver
 

From a48f5a2fa8a8162255ed8bc1e4c3680e950d947e Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Tue, 22 Oct 2024 14:19:46 +0200
Subject: [PATCH 0486/2913] [nrf fromtree] modules: hal_nordic: nrfs: Enable
 DVFS service on nRF54H20 EngB

Just like on nRF54H20 EngC.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 0379424b4372eeecf15e57938a74cd4c44ac55f1)
(cherry picked from commit da8cc84c1f828f0cfe5d9f406424b8dcf10a1778)
---
 modules/hal_nordic/nrfs/Kconfig        | 2 +-
 modules/hal_nordic/nrfs/dvfs/ld_dvfs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig
index 3eee664e480..8325c8db3bc 100644
--- a/modules/hal_nordic/nrfs/Kconfig
+++ b/modules/hal_nordic/nrfs/Kconfig
@@ -106,7 +106,7 @@ config NRFS_PMIC_SERVICE_ENABLED
 config NRFS_DVFS_SERVICE_ENABLED
 	bool "DVFS service"
 	depends on NRFS_HAS_DVFS_SERVICE
-	default y if SOC_NRF54H20_CPUAPP || SOC_NRF9280_CPUAPP
+	default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || SOC_NRF9280_CPUAPP
 
 config NRFS_DIAG_SERVICE_ENABLED
 	bool "System Diagnostics service (only for development purposes)"
diff --git a/modules/hal_nordic/nrfs/dvfs/ld_dvfs.c b/modules/hal_nordic/nrfs/dvfs/ld_dvfs.c
index 1faffbdb3c2..57ee0bdc375 100644
--- a/modules/hal_nordic/nrfs/dvfs/ld_dvfs.c
+++ b/modules/hal_nordic/nrfs/dvfs/ld_dvfs.c
@@ -269,7 +269,7 @@ int32_t ld_dvfs_configure_hsfll(enum dvfs_frequency_setting oppoint)
 		freq_trim = 2;
 	}
 
-#if defined(CONFIG_SOC_NRF54H20_CPUAPP) || defined(CONFIG_SOC_NRF9280_CPUAPP)
+#if defined(NRF_APPLICATION)
 	hsfll_trim.vsup	  = NRF_FICR->TRIM.APPLICATION.HSFLL.TRIM.VSUP;
 	hsfll_trim.coarse = NRF_FICR->TRIM.APPLICATION.HSFLL.TRIM.COARSE[freq_trim];
 	hsfll_trim.fine	  = NRF_FICR->TRIM.APPLICATION.HSFLL.TRIM.FINE[freq_trim];

From 8df3edada2bc0d41c41d98763784c27b130ee1c2 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Tue, 22 Oct 2024 14:19:46 +0200
Subject: [PATCH 0487/2913] [nrf fromtree] logging: stmesp: Do not append
 strings on nRF54H20 EngB VPRs

Just like on nRF54H20 EngC.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit bcf6a91689eb507d9548fee84866a8b9c4402043)
(cherry picked from commit bbb0afee8839982e65aaeb9581639101e506391b)
---
 subsys/logging/frontends/Kconfig | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/subsys/logging/frontends/Kconfig b/subsys/logging/frontends/Kconfig
index c232eb7354a..4d6d85e3e88 100644
--- a/subsys/logging/frontends/Kconfig
+++ b/subsys/logging/frontends/Kconfig
@@ -46,8 +46,9 @@ config LOG_FRONTEND_STMESP_DICT
 
 config LOG_FRONTEND_STMESP_FSC
 	bool "Send fully self-contained messages"
-	select LOG_MSG_APPEND_RO_STRING_LOC if (!NRF_ETR && !SOC_NRF54H20_CPUPPR && \
-			!SOC_NRF54H20_CPUFLPR)
+	select LOG_MSG_APPEND_RO_STRING_LOC if !(NRF_ETR || \
+			SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR || \
+			SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR)
 
 config LOG_FRONTEND_STMESP_FLUSH_COUNT
 	int "Number of flushing words"

From 6275dadf44e91eaaa414e727cfd346c7af0afe87 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Wed, 23 Oct 2024 09:48:01 +0200
Subject: [PATCH 0488/2913] [nrf fromtree] drivers: adc: nrfx_saadc: Use
 CONFIG_NRF_PLATFORM_HALTIUM

Apply it in a few more locations that were missed in
5a4655f69fb2c006a4ee0ddcfe4372066b0cb138.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 96f08d53a482beb8867861f230adaf79955bb7c0)
(cherry picked from commit 787033713f37411d6c23146d7304f0273e6d5972)
---
 drivers/adc/adc_nrfx_saadc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index e4c37a1f736..b8782d02454 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -66,9 +66,9 @@ BUILD_ASSERT((NRF_SAADC_AIN0 == NRF_SAADC_INPUT_AIN0) &&
 	     "Definitions from nrf-adc.h do not match those from nrf_saadc.h");
 #endif
 
-#if defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280)
+#if defined(CONFIG_NRF_PLATFORM_HALTIUM)
 
-/* nRF54H20 and nRF9280 always use bounce buffers in RAM */
+/* Haltium devices always use bounce buffers in RAM */
 
 #define SAADC_MEMORY_SECTION					                     \
 	COND_CODE_1(DT_NODE_HAS_PROP(DT_NODELABEL(adc), memory_regions), \
@@ -80,7 +80,7 @@ static uint16_t adc_samples_buffer[SAADC_CH_NUM] SAADC_MEMORY_SECTION;
 
 #define ADC_BUFFER_IN_RAM
 
-#endif /* defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280) */
+#endif /* defined(CONFIG_NRF_PLATFORM_HALTIUM) */
 
 struct driver_data {
 	struct adc_context ctx;
@@ -669,7 +669,7 @@ static const struct adc_driver_api adc_nrfx_driver_api = {
 #endif
 #if defined(CONFIG_SOC_NRF54L15)
 	.ref_internal  = 900,
-#elif defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280)
+#elif defined(CONFIG_NRF_PLATFORM_HALTIUM)
 	.ref_internal  = 1024,
 #else
 	.ref_internal  = 600,

From a41277b8cd45a38be1b6d92df732f5d16d31a62f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20Amundsen?= <haakon.amundsen@nordicsemi.no>
Date: Mon, 7 Oct 2024 15:43:13 +0200
Subject: [PATCH 0489/2913] [nrf fromtree] dts: update memory map and remove
 ext-uicr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extended UICR will not be used as its configurations will be merged
with the UICR registers in NVR.

Memory maps changes are needed to align with pre compiled
firmware.

Signed-off-by: Håkon Amundsen <haakon.amundsen@nordicsemi.no>
Signed-off-by: Jonathan Nilsen <jonathan.nilsen@nordicsemi.no>
(cherry picked from commit 26603cefaf41298c417f2eee834ed40d9ab35d3a)
(cherry picked from commit 70f83512f952d167a8b0754503f8a27154caec43)
---
 .../nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi     | 15 +++++++++++++++
 .../nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay      |  7 +++++++
 .../nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay     |  7 +++++++
 .../nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay      |  7 +++++++
 .../nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay      |  7 +++++++
 dts/bindings/arm/nordic,nrf-uicr-v2.yaml          |  7 -------
 dts/common/nordic/nrf54h20.dtsi                   | 14 ++------------
 dts/common/nordic/nrf9280.dtsi                    | 10 ----------
 8 files changed, 45 insertions(+), 29 deletions(-)
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi
new file mode 100644
index 00000000000..940ac4d2391
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &suit_storage_partition;
+
+/ {
+	reserved-memory {
+		suit_storage_partition: memory@e1eb000 {
+			reg = <0xe1eb000 DT_SIZE_K(24)>;
+		};
+	};
+};
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay
new file mode 100644
index 00000000000..dfee18c5b6f
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay
new file mode 100644
index 00000000000..dfee18c5b6f
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay
new file mode 100644
index 00000000000..dfee18c5b6f
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay
new file mode 100644
index 00000000000..dfee18c5b6f
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/dts/bindings/arm/nordic,nrf-uicr-v2.yaml b/dts/bindings/arm/nordic,nrf-uicr-v2.yaml
index f509fdf4061..9000cce94c5 100644
--- a/dts/bindings/arm/nordic,nrf-uicr-v2.yaml
+++ b/dts/bindings/arm/nordic,nrf-uicr-v2.yaml
@@ -17,10 +17,3 @@ properties:
     description: |
       Domain ID of the domain associated with this UICR instance. Must be unique
       across all UICR instances in the system.
-
-  ptr-ext-uicr:
-    type: phandle
-    required: true
-    description: |
-      Handle of a memory region reserved to contain an Extended UICR instance.
-      The address of that node will be stored in the UICR.PTREXTUICR register.
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 60d85faff77..bf2cd072f37 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -145,16 +145,8 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		suit_storage_partition: memory@e1eb000 {
-			reg = <0xe1eb000 DT_SIZE_K(24)>;
-		};
-
-		cpurad_uicr_ext: memory@e1ff000 {
-			reg = <0xe1ff000 DT_SIZE_K(2)>;
-		};
-
-		cpuapp_uicr_ext: memory@e1ff800 {
-			reg = <0xe1ff800 DT_SIZE_K(2)>;
+		suit_storage_partition: memory@e1ed000 {
+			reg = <0xe1ed000 DT_SIZE_K(20)>;
 		};
 	};
 
@@ -217,14 +209,12 @@
 			compatible = "nordic,nrf-uicr-v2";
 			reg = <0xfff8000 DT_SIZE_K(2)>;
 			domain = <2>;
-			ptr-ext-uicr = <&cpuapp_uicr_ext>;
 		};
 
 		cpurad_uicr: uicr@fffa000 {
 			compatible = "nordic,nrf-uicr-v2";
 			reg = <0xfffa000 DT_SIZE_K(2)>;
 			domain = <3>;
-			ptr-ext-uicr = <&cpurad_uicr_ext>;
 		};
 
 		ficr: ficr@fffe000 {
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 9949f6c9f1c..ae3ffc904d2 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -74,14 +74,6 @@
 	reserved-memory {
 		#address-cells = <1>;
 		#size-cells = <1>;
-
-		cpurad_uicr_ext: memory@e401000 {
-			reg = <0xe401000 DT_SIZE_K(2)>;
-		};
-
-		cpuapp_uicr_ext: memory@e401800 {
-			reg = <0xe401800 DT_SIZE_K(2)>;
-		};
 	};
 
 	clocks {
@@ -113,14 +105,12 @@
 			compatible = "nordic,nrf-uicr-v2";
 			reg = <0xfff8000 DT_SIZE_K(2)>;
 			domain = <2>;
-			ptr-ext-uicr = <&cpuapp_uicr_ext>;
 		};
 
 		cpurad_uicr: uicr@fffa000 {
 			compatible = "nordic,nrf-uicr-v2";
 			reg = <0xfffa000 DT_SIZE_K(2)>;
 			domain = <3>;
-			ptr-ext-uicr = <&cpurad_uicr_ext>;
 		};
 
 		ficr: ficr@fffe000 {

From 44d86af4ea9c08859df50a1627736c341f9d3de4 Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Tue, 22 Oct 2024 13:34:47 +0200
Subject: [PATCH 0490/2913] [nrf fromtree] modules: hal_nordic: Require
 nrf-regtool 7.0.0

Some upcoming changes require this version.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit 45fbc31a3f0065f0c5a54ab3cf8cd2d38afdc8a3)
(cherry picked from commit 285fcbe059faa0ae5f7b83a6f569de1b2531e8eb)
---
 modules/hal_nordic/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt
index eb85fd58f5e..3bed5a033b5 100644
--- a/modules/hal_nordic/CMakeLists.txt
+++ b/modules/hal_nordic/CMakeLists.txt
@@ -15,7 +15,7 @@ if(CONFIG_NRF_REGTOOL_GENERATE_BICR)
   list(APPEND nrf_regtool_components GENERATE:BICR)
 endif()
 if(DEFINED nrf_regtool_components)
-  find_package(nrf-regtool 5.6.0 REQUIRED
+  find_package(nrf-regtool 7.0.0 REQUIRED
     COMPONENTS ${nrf_regtool_components}
     PATHS ${CMAKE_CURRENT_LIST_DIR}/nrf-regtool
     NO_CMAKE_PATH

From f3e33c4fe7a4982b163df508ceca2dd476ebe3bd Mon Sep 17 00:00:00 2001
From: Jonathan Nilsen <jonathan.nilsen@nordicsemi.no>
Date: Wed, 23 Oct 2024 12:30:31 +0200
Subject: [PATCH 0491/2913] [nrf noup] scripts: west_commands: runners: nrf:
 workarounds for SDFW v8.0.0

SDFW v8.0.0 introduces certain changes that require matching changes
in nrfutil device to ensure that west flash works properly on
nrf54h20dk and nrf9280pdk.

This commit adds a few temporary workarounds to ensure that west flash
works with an older nrfutil device version as well:

1. Don't erase UICR, as this tries to erase the extended UICR regions
   as well, and those regions no longer exist (resulting in an error).

2. Reset after erasing domains with west flash --erase. This is needed
   for the memory owned by the different domains to be freely
   accessible and able to be allocated to different domains.

2. Unless doing a west flash --erase, do a RESET_VIA_SECDOM reset before
   programming firmware. This ensures that all the cores are stopped
   before writing firmware. Removing the UICR erase step seemed to cause
   some instability when programming, which is suspected to be caused by
   the firmware running while programming.

Signed-off-by: Jonathan Nilsen <jonathan.nilsen@nordicsemi.no>
(cherry picked from commit 08f1c5bc9f202932467d1ba8c0398c8093d29fa4)
---
 scripts/west_commands/runners/nrf_common.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index 6423253233c..a42e841bdbd 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -273,6 +273,11 @@ def program_hex(self):
             if self.erase:
                 self.exec_op('erase', core='NRFDL_DEVICE_CORE_APPLICATION')
                 self.exec_op('erase', core='NRFDL_DEVICE_CORE_NETWORK')
+                # A reset is needed if repartitioning the device memory
+                self.reset_target()
+            else:
+                # Ensure that firmware is not executing while erasing/programming
+                self.exec_op("reset", option="RESET_VIA_SECDOM")
 
             # Manage SUIT artifacts.
             # This logic should be executed only once per build.
@@ -298,16 +303,8 @@ def program_hex(self):
                     self.op_program(app_root_envelope_hex_file, 'ERASE_NONE', None, defer=True, core='NRFDL_DEVICE_CORE_APPLICATION')
 
             if cpuapp:
-                if not self.erase and self.build_conf.getboolean('CONFIG_NRF_REGTOOL_GENERATE_UICR'):
-                    self.exec_op('erase', core='NRFDL_DEVICE_CORE_APPLICATION',
-                                 option={'chip_erase_mode': 'ERASE_UICR',
-                                         'qspi_erase_mode': 'ERASE_NONE'})
                 core = 'NRFDL_DEVICE_CORE_APPLICATION'
             elif cpurad:
-                if not self.erase and self.build_conf.getboolean('CONFIG_NRF_REGTOOL_GENERATE_UICR'):
-                    self.exec_op('erase', core='NRFDL_DEVICE_CORE_NETWORK',
-                                 option={'chip_erase_mode': 'ERASE_UICR',
-                                         'qspi_erase_mode': 'ERASE_NONE'})
                 core = 'NRFDL_DEVICE_CORE_NETWORK'
         else:
             if self.erase:

From acdcf9e065da6149edc0e75ab1bf53e56c3cd602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Wed, 23 Oct 2024 12:02:36 +0200
Subject: [PATCH 0492/2913] [nrf fromtree] tests: drivers: can: api: Add
 negative test for can_add_rx_filter()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Check that error is reported when CAN filter is added without
callback function.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit dbc8eaa5359bb23c00cebf92dc049ddbc312bd02)
(cherry picked from commit 5f714666ad8db89e03cf3f35b0166d69e4fe7856)
---
 tests/drivers/can/api/src/classic.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/drivers/can/api/src/classic.c b/tests/drivers/can/api/src/classic.c
index b762137f8cd..c3e85015a65 100644
--- a/tests/drivers/can/api/src/classic.c
+++ b/tests/drivers/can/api/src/classic.c
@@ -615,6 +615,19 @@ ZTEST(can_classic, test_add_filter)
 	can_remove_rx_filter(can_dev, filter_id);
 }
 
+/**
+ * @brief Test adding filter without callback.
+ */
+ZTEST(can_classic, test_add_filter_without_callback)
+{
+	int err;
+
+	Z_TEST_SKIP_IFNDEF(CONFIG_RUNTIME_ERROR_CHECKS);
+
+	err = can_add_rx_filter(can_dev, NULL, NULL, &test_std_filter_1);
+	zassert_equal(err, -EINVAL, "added filter with NULL callback");
+}
+
 /**
  * @brief Test adding an invalid CAN RX filter.
  *

From 2219261a209b537006aebdb36adbd85bc63ca080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Wed, 23 Oct 2024 12:05:25 +0200
Subject: [PATCH 0493/2913] [nrf fromtree] tests: drivers: can: api: Add
 negative test for can_set_bitrate()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There is negative test for too high bitrate.
Add test that checks too low bitrate.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 13fbac86eb41702e9071552feea1d8f5f446dcbf)
(cherry picked from commit af9ae06bbcab6b86e0d0ea0f39533db50e962f76)
---
 tests/drivers/can/api/src/classic.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/drivers/can/api/src/classic.c b/tests/drivers/can/api/src/classic.c
index c3e85015a65..cf852487aa9 100644
--- a/tests/drivers/can/api/src/classic.c
+++ b/tests/drivers/can/api/src/classic.c
@@ -486,6 +486,31 @@ ZTEST_USER(can_classic, test_bitrate_limits)
 	zassert_true(min <= max, "min bitrate must be lower or equal to max bitrate");
 }
 
+/**
+ * @brief Test setting a too low bitrate.
+ */
+ZTEST_USER(can_classic, test_set_bitrate_too_low)
+{
+	uint32_t min = can_get_bitrate_min(can_dev);
+	int err;
+
+	if (min == 0) {
+		ztest_test_skip();
+	}
+
+	err = can_stop(can_dev);
+	zassert_equal(err, 0, "failed to stop CAN controller (err %d)", err);
+
+	err = can_set_bitrate(can_dev, min - 1);
+	zassert_equal(err, -ENOTSUP, "too low bitrate accepted");
+
+	err = can_set_bitrate(can_dev, CONFIG_CAN_DEFAULT_BITRATE);
+	zassert_equal(err, 0, "failed to restore default bitrate");
+
+	err = can_start(can_dev);
+	zassert_equal(err, 0, "failed to start CAN controller (err %d)", err);
+}
+
 /**
  * @brief Test setting a too high bitrate.
  */

From acb9eed5f32fc6746a66168a1a8d07a46697fe19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Wed, 23 Oct 2024 12:07:24 +0200
Subject: [PATCH 0494/2913] [nrf fromtree] tests: drivers: can: api: Add
 negative test for can_set_bitrate_data()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There is negative test for too high data bitrate.
Add test that checks too low data bitrate.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 2616720ee2a0c45732f6debba5581d9a8da0fffc)
(cherry picked from commit 957e31e8b332345ef8cf63114e1a2f394ac9a4b5)
---
 tests/drivers/can/api/src/canfd.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/drivers/can/api/src/canfd.c b/tests/drivers/can/api/src/canfd.c
index 80703655d1f..38f7cc7346d 100644
--- a/tests/drivers/can/api/src/canfd.c
+++ b/tests/drivers/can/api/src/canfd.c
@@ -395,6 +395,31 @@ ZTEST_USER(canfd, test_set_timing_data_min)
 	zassert_equal(err, 0, "failed to start CAN controller (err %d)", err);
 }
 
+/**
+ * @brief Test setting a too low data phase bitrate.
+ */
+ZTEST_USER(canfd, test_set_bitrate_data_too_low)
+{
+	uint32_t min = can_get_bitrate_min(can_dev);
+	int err;
+
+	if (min == 0) {
+		ztest_test_skip();
+	}
+
+	err = can_stop(can_dev);
+	zassert_equal(err, 0, "failed to stop CAN controller (err %d)", err);
+
+	err = can_set_bitrate_data(can_dev, min - 1);
+	zassert_equal(err, -ENOTSUP, "too low data phase bitrate accepted");
+
+	err = can_set_bitrate_data(can_dev, CONFIG_CAN_DEFAULT_BITRATE_DATA);
+	zassert_equal(err, 0, "failed to restore default data bitrate");
+
+	err = can_start(can_dev);
+	zassert_equal(err, 0, "failed to start CAN controller (err %d)", err);
+}
+
 /**
  * @brief Test setting a too high data phase bitrate.
  */

From 46f9b14342e882d50b83f84326cc72967250c0fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Wed, 23 Oct 2024 12:10:49 +0200
Subject: [PATCH 0495/2913] [nrf fromtree] tests: drivers: can: api: Add
 negative test for can_send()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Check error codes when sending invalid frames:
- too big data payload;
- wrong set of flags.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 8023a58c2a463cfcda1ffeaf41b0ea853bba0178)
(cherry picked from commit 6893450c49aff35e1b4e566686b24dded6cdabd8)
---
 tests/drivers/can/api/src/canfd.c   | 39 +++++++++++++++++++++++++++++
 tests/drivers/can/api/src/classic.c | 27 ++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/tests/drivers/can/api/src/canfd.c b/tests/drivers/can/api/src/canfd.c
index 38f7cc7346d..50e5d43add8 100644
--- a/tests/drivers/can/api/src/canfd.c
+++ b/tests/drivers/can/api/src/canfd.c
@@ -238,6 +238,45 @@ ZTEST(canfd, test_canfd_get_capabilities)
 			  "CAN FD loopback mode not supported");
 }
 
+/**
+ * @brief Test sending CAN FD frame with too big payload.
+ */
+ZTEST(canfd, test_send_fd_dlc_out_of_range)
+{
+	struct can_frame frame = {
+		.flags = CAN_FRAME_FDF | CAN_FRAME_BRS,
+		.id = TEST_CAN_STD_ID_1,
+		.dlc = CANFD_MAX_DLC + 1U,
+	};
+	int err;
+
+	Z_TEST_SKIP_IFNDEF(CONFIG_RUNTIME_ERROR_CHECKS);
+
+	err = can_send(can_dev, &frame, TEST_SEND_TIMEOUT, NULL, NULL);
+	zassert_equal(err, -EINVAL, "wrong error on sending invalid frame (err %d)", err);
+}
+
+/**
+ * @brief Test error when CAN FD Error State Indicator (ESI) is send without FD format flag (FDF).
+ *
+ * CAN FD Error State Indicator (ESI) indicates that the transmitting node is
+ * in error-passive state. Only valid in combination with CAN_FRAME_FDF.
+ */
+ZTEST(canfd, test_send_fd_incorrect_esi)
+{
+	struct can_frame frame = {
+		.flags = CAN_FRAME_ESI,
+		.id = TEST_CAN_STD_ID_1,
+		.dlc = 0,
+	};
+	int err;
+
+	Z_TEST_SKIP_IFNDEF(CONFIG_RUNTIME_ERROR_CHECKS);
+
+	err = can_send(can_dev, &frame, TEST_SEND_TIMEOUT, NULL, NULL);
+	zassert_equal(err, -ENOTSUP, "wrong error on sending invalid frame (err %d)", err);
+}
+
 /**
  * @brief Test send/receive with standard (11-bit) CAN IDs and classic CAN frames.
  */
diff --git a/tests/drivers/can/api/src/classic.c b/tests/drivers/can/api/src/classic.c
index cf852487aa9..9192d6612bc 100644
--- a/tests/drivers/can/api/src/classic.c
+++ b/tests/drivers/can/api/src/classic.c
@@ -856,6 +856,33 @@ ZTEST(can_classic, test_send_ext_id_out_of_range)
 	send_invalid_frame(can_dev, &frame);
 }
 
+/**
+ * @brief Test sending standard (11-bit ID) CAN frame with too big payload.
+ */
+ZTEST(can_classic, test_send_std_id_dlc_of_range)
+{
+	struct can_frame frame = {
+		.id = TEST_CAN_STD_ID_1,
+		.dlc = CAN_MAX_DLC + 1U,
+	};
+
+	send_invalid_frame(can_dev, &frame);
+}
+
+/**
+ * @brief Test sending extended (29-bit ID) CAN frame with too big payload.
+ */
+ZTEST(can_classic, test_send_ext_id_dlc_of_range)
+{
+	struct can_frame frame = {
+		.flags = CAN_FRAME_IDE,
+		.id = TEST_CAN_EXT_ID_1,
+		.dlc = CAN_MAX_DLC + 1U,
+	};
+
+	send_invalid_frame(can_dev, &frame);
+}
+
 /**
  * @brief Test send/receive with standard (11-bit) CAN IDs.
  */

From b2fef8081d5b7c3c24cf82ec1b146ee1c2aa9a0e Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Wed, 23 Oct 2024 18:05:04 +0530
Subject: [PATCH 0496/2913] [nrf fromlist] drivers: wifi: Fix deinit for
 offloaded raw tx API

The osal deinint was causing crash in log. The osal apis
spin lock take, release, bus qspi sleep are trying to use ops.
So removing osal deinit for temporary workaround.

Upstream PR #: 80328

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit f09598ed02de7cfd6edfa533115d8af86e8b031d)
---
 drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c b/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
index 520814865d6..155c8a5cd5e 100644
--- a/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
+++ b/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
@@ -279,7 +279,6 @@ void nrf70_off_raw_tx_deinit(void)
 	}
 
 	nrf_wifi_fmac_off_raw_tx_deinit(off_raw_tx_drv_priv.fmac_priv);
-	nrf_wifi_osal_deinit();
 
 	k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
 }

From 5f17168c0a51373ba00d86239013c7e53fe1cfff Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 28 Oct 2024 14:05:58 +0530
Subject: [PATCH 0497/2913] [nrf fromlist] drivers: nrfwifi: Remove passing
 unused flag

This flag is now unused in OSAL as it takes the input via the API.

Upstream PR #: 80328

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 1778ec0039ff70c11524efb0df0bcbb1db22c721)
---
 drivers/wifi/nrfwifi/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 70223f739ef..ad665916ceb 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -307,7 +307,6 @@ zephyr_compile_definitions(
   -DNRF70_RX_MAX_DATA_SIZE=${CONFIG_NRF70_RX_MAX_DATA_SIZE}
   -DNRF70_MAX_TX_PENDING_QLEN=${CONFIG_NRF70_MAX_TX_PENDING_QLEN}
   -DNRF70_RPU_PS_IDLE_TIMEOUT_MS=${CONFIG_NRF70_RPU_PS_IDLE_TIMEOUT_MS}
-  -DNRF70_REG_DOMAIN=${CONFIG_NRF70_REG_DOMAIN}
   -DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS}
   -DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT}
   -DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE}

From f4d056034391cfa31270a7fccd05de5eab9ea887 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Sun, 27 Oct 2024 02:20:20 +0530
Subject: [PATCH 0498/2913] [nrf fromlist] boards: nordic: Fix the label for
 nRF70 SR co-existence

The co-existence modules expect a common and fixed name, so, rename it
to avoid churn.

Upstream PR #: 80474

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 9bf627fd411ec69f64b79eb55578a4a60140e8f1)
---
 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts | 2 +-
 boards/shields/nrf7002eb/nrf7002eb_coex.overlay      | 2 +-
 boards/shields/nrf7002ek/nrf7002ek_coex.overlay      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts
index 8e36e678581..faea5ee69e3 100644
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts
@@ -82,7 +82,7 @@
 			   <21 0 &gpio1 3 0>;	/* D15 */
 	};
 
-	nrf70: coex {
+	nrf_radio_coex: coex {
 		status = "okay";
 		compatible = "nordic,nrf7002-coex";
 
diff --git a/boards/shields/nrf7002eb/nrf7002eb_coex.overlay b/boards/shields/nrf7002eb/nrf7002eb_coex.overlay
index 59007ebe58e..09bfb6e1906 100644
--- a/boards/shields/nrf7002eb/nrf7002eb_coex.overlay
+++ b/boards/shields/nrf7002eb/nrf7002eb_coex.overlay
@@ -5,7 +5,7 @@
  */
 
 / {
-	nrf70: coex {
+	nrf_radio_coex: coex {
 		compatible = "nordic,nrf7002-coex";
 		status = "okay";
 
diff --git a/boards/shields/nrf7002ek/nrf7002ek_coex.overlay b/boards/shields/nrf7002ek/nrf7002ek_coex.overlay
index 4b592acbfb2..60ff3ca6ea4 100644
--- a/boards/shields/nrf7002ek/nrf7002ek_coex.overlay
+++ b/boards/shields/nrf7002ek/nrf7002ek_coex.overlay
@@ -5,7 +5,7 @@
  */
 
 / {
-	nrf70: coex {
+	nrf_radio_coex: coex {
 		compatible = "nordic,nrf7002-coex";
 		status = "okay";
 

From a345b82e631e62b90f63abf5c948a57bbd8564bd Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 28 Oct 2024 01:18:13 +0530
Subject: [PATCH 0499/2913] [nrf fromlist] shields: nrf7002eb: Add missing SR
 RF switch GPIO

This causes a build error as nRF70 driver running on CPU APP needs this
when SR co-existence is enabled.

Upstream PR #: 80474

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit ab0b98510be4b07af99718fa109a7c208cd04ae8)
---
 boards/shields/nrf7002eb/nrf7002eb.overlay | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boards/shields/nrf7002eb/nrf7002eb.overlay b/boards/shields/nrf7002eb/nrf7002eb.overlay
index d580a2efb8c..7f9074da9d0 100644
--- a/boards/shields/nrf7002eb/nrf7002eb.overlay
+++ b/boards/shields/nrf7002eb/nrf7002eb.overlay
@@ -24,6 +24,7 @@
 		bucken-gpios = <&edge_connector 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
 		iovdd-ctrl-gpios = <&edge_connector 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
 		host-irq-gpios = <&edge_connector 19 GPIO_ACTIVE_HIGH>;
+		srrf-switch-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
 
 		wlan0: wlan0 {
 			compatible = "nordic,wlan";

From 1b78473e46faa2e5ba33439acc4247b1d7d81146 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 28 Oct 2024 21:22:40 +0530
Subject: [PATCH 0500/2913] [nrf fromlist] drivers: nrfwifi: Fix memory leak in
 TX path

During secure association, if we get any data packets from the
networking stack (as we switch off the dormancy) then they will be
dropped till the 802.1x port is authorized, but with recent changes the
corresponding network buffer isn't freed causing a memory leak.

Handle this case and free the network buffer (Using an OSAL API though
it's Zephyr to avoid duplication and also getting access to "struct
nwb");

Upstream PR #: 80528

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 979a6723d250df32cf18ca9193d6f2de0e787724)
---
 drivers/wifi/nrfwifi/src/net_if.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
index b8ca8915ff4..a4404cfb1a7 100644
--- a/drivers/wifi/nrfwifi/src/net_if.c
+++ b/drivers/wifi/nrfwifi/src/net_if.c
@@ -389,7 +389,7 @@ int nrf_wifi_if_send(const struct device *dev,
 #ifdef CONFIG_NRF70_RAW_DATA_TX
 	if ((*(unsigned int *)pkt->frags->data) == NRF_WIFI_MAGIC_NUM_RAWTX) {
 		if (vif_ctx_zep->if_carr_state != NRF_WIFI_FMAC_IF_CARR_STATE_ON) {
-			goto unlock;
+			goto drop;
 		}
 
 		ret = nrf_wifi_fmac_start_rawpkt_xmit(rpu_ctx_zep->rpu_ctx,
@@ -399,7 +399,7 @@ int nrf_wifi_if_send(const struct device *dev,
 #endif /* CONFIG_NRF70_RAW_DATA_TX */
 		if ((vif_ctx_zep->if_carr_state != NRF_WIFI_FMAC_IF_CARR_STATE_ON) ||
 		    (!vif_ctx_zep->authorized && !is_eapol(pkt))) {
-			goto unlock;
+			goto drop;
 		}
 
 		ret = nrf_wifi_fmac_start_xmit(rpu_ctx_zep->rpu_ctx,
@@ -408,6 +408,10 @@ int nrf_wifi_if_send(const struct device *dev,
 #ifdef CONFIG_NRF70_RAW_DATA_TX
 	}
 #endif /* CONFIG_NRF70_RAW_DATA_TX */
+	goto unlock;
+drop:
+	host_stats->total_tx_drop_pkts++;
+	nrf_wifi_osal_nbuf_free(nbuf);
 unlock:
 	k_mutex_unlock(&vif_ctx_zep->vif_lock);
 #else

From 610808650925034c3a69ba62a532d4ecf44cd547 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Fri, 25 Oct 2024 04:01:32 +0530
Subject: [PATCH 0501/2913] [nrf fromtree] net: lib: capture: Fix build error

The CONFIG_ prefix was missed.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit cef6b69a39d664b84161d61edde4704cac722132)
(cherry picked from commit c8fd566676f5205165304243f4313469d01d9e65)
---
 subsys/net/lib/capture/capture.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/subsys/net/lib/capture/capture.c b/subsys/net/lib/capture/capture.c
index 7b7f135c251..122096c96fc 100644
--- a/subsys/net/lib/capture/capture.c
+++ b/subsys/net/lib/capture/capture.c
@@ -42,7 +42,8 @@ NET_PKT_SLAB_DEFINE(capture_pkts, CONFIG_NET_CAPTURE_PKT_COUNT);
 NET_BUF_POOL_FIXED_DEFINE(capture_bufs, CONFIG_NET_CAPTURE_BUF_COUNT,
 			  CONFIG_NET_BUF_DATA_SIZE, 4, NULL);
 #else
-#define DATA_POOL_SIZE MAX(NET_PKT_BUF_RX_DATA_POOL_SIZE, NET_PKT_BUF_TX_DATA_POOL_SIZE)
+#define DATA_POOL_SIZE MAX(CONFIG_NET_PKT_BUF_RX_DATA_POOL_SIZE, \
+			   CONFIG_NET_PKT_BUF_TX_DATA_POOL_SIZE)
 
 NET_BUF_POOL_VAR_DEFINE(capture_bufs, CONFIG_NET_CAPTURE_BUF_COUNT,
 			DATA_POOL_SIZE, 4, NULL);

From fbfb655d72d72e4ca25dca5e03bf6567e72060bf Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Mon, 15 Jul 2024 10:29:44 +0200
Subject: [PATCH 0502/2913] [nrf fromtree] drivers: Add comparator API

Add comparator API header.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 00cefa15ff5c7fa54d66a2b33db49a831780ff47)
(cherry picked from commit cc1381611d9f6327f3d7605a52fa343b11fc476d)
---
 include/zephyr/drivers/comparator.h | 150 ++++++++++++++++++++++++++++
 1 file changed, 150 insertions(+)
 create mode 100644 include/zephyr/drivers/comparator.h

diff --git a/include/zephyr/drivers/comparator.h b/include/zephyr/drivers/comparator.h
new file mode 100644
index 00000000000..3d246fea5ff
--- /dev/null
+++ b/include/zephyr/drivers/comparator.h
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_COMPARATOR_H_
+#define ZEPHYR_INCLUDE_DRIVERS_COMPARATOR_H_
+
+/**
+ * @brief Comparator Interface
+ * @defgroup comparator_interface Comparator Interface
+ * @since 3.7
+ * @version 0.1.0
+ * @ingroup io_interfaces
+ * @{
+ */
+
+#include <zephyr/device.h>
+#include <errno.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Comparator trigger enumerations */
+enum comparator_trigger {
+	/** No trigger */
+	COMPARATOR_TRIGGER_NONE = 0,
+	/** Trigger on rising edge of comparator output */
+	COMPARATOR_TRIGGER_RISING_EDGE,
+	/** Trigger on falling edge of comparator output */
+	COMPARATOR_TRIGGER_FALLING_EDGE,
+	/** Trigger on both edges of comparator output */
+	COMPARATOR_TRIGGER_BOTH_EDGES
+};
+
+/** Comparator callback template */
+typedef void (*comparator_callback_t)(const struct device *dev, void *user_data);
+
+/** @cond INTERNAL_HIDDEN */
+
+typedef int (*comparator_api_get_output)(const struct device *dev);
+typedef int (*comparator_api_set_trigger)(const struct device *dev,
+					  enum comparator_trigger trigger);
+typedef int (*comparator_api_set_trigger_callback)(const struct device *dev,
+						   comparator_callback_t callback,
+						   void *user_data);
+typedef int (*comparator_api_trigger_is_pending)(const struct device *dev);
+
+__subsystem struct comparator_driver_api {
+	comparator_api_get_output get_output;
+	comparator_api_set_trigger set_trigger;
+	comparator_api_set_trigger_callback set_trigger_callback;
+	comparator_api_trigger_is_pending trigger_is_pending;
+};
+
+/** @endcond */
+
+/**
+ * @brief Get comparator's output state
+ *
+ * @param dev Comparator device
+ *
+ * @retval 1 Output state is high
+ * @retval 0 Output state is low
+ * @retval -errno code Failure
+ */
+__syscall int comparator_get_output(const struct device *dev);
+
+static inline int z_impl_comparator_get_output(const struct device *dev)
+{
+	const struct comparator_driver_api *api =
+		(const struct comparator_driver_api *)dev->api;
+
+	return api->get_output(dev);
+}
+
+/**
+ * @brief Set comparator's trigger
+ *
+ * @param dev Comparator device
+ * @param trigger Trigger for signal and callback
+ *
+ * @retval 0 Successful
+ * @retval -errno code Failure
+ */
+__syscall int comparator_set_trigger(const struct device *dev,
+				     enum comparator_trigger trigger);
+
+static inline int z_impl_comparator_set_trigger(const struct device *dev,
+						enum comparator_trigger trigger)
+{
+	const struct comparator_driver_api *api =
+		(const struct comparator_driver_api *)dev->api;
+
+	return api->set_trigger(dev, trigger);
+}
+
+/**
+ * @brief Set comparator's trigger callback
+ *
+ * @param dev Comparator device
+ * @param callback Trigger callback
+ * @param user_data User data passed to callback
+ *
+ * @retval 0 Successful
+ * @retval -errno code Failure
+ *
+ * @note Set callback to NULL to disable callback
+ * @note Callback is called immediately if trigger is pending
+ */
+static inline int comparator_set_trigger_callback(const struct device *dev,
+						  comparator_callback_t callback,
+						  void *user_data)
+{
+	const struct comparator_driver_api *api =
+		(const struct comparator_driver_api *)dev->api;
+
+	return api->set_trigger_callback(dev, callback, user_data);
+}
+
+/**
+ * @brief Check if comparator's trigger is pending and clear it
+ *
+ * @param dev Comparator device
+ *
+ * @retval 1 Trigger was pending
+ * @retval 0 Trigger was cleared
+ * @retval -errno code Failure
+ */
+__syscall int comparator_trigger_is_pending(const struct device *dev);
+
+static inline int z_impl_comparator_trigger_is_pending(const struct device *dev)
+{
+	const struct comparator_driver_api *api =
+		(const struct comparator_driver_api *)dev->api;
+
+	return api->trigger_is_pending(dev);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+/** @} */
+
+#include <zephyr/syscalls/comparator.h>
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_COMPARATOR_H_ */

From a94590357d0abe7e3f842902a96ea3a63212e7fe Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Mon, 15 Jul 2024 11:07:19 +0200
Subject: [PATCH 0503/2913] [nrf fromtree] drivers: comparator: Add initial
 files

Add top level CMakeLists.txt entry and Kconfig options along with
userspace handlers for comparator API.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 211bdd935c489391412da7bef6b1f1c061bb08b7)
(cherry picked from commit 7d97fc75c24ea05a0e36cd15a079c8df0c38c85a)
---
 drivers/CMakeLists.txt                   |  1 +
 drivers/Kconfig                          |  1 +
 drivers/comparator/CMakeLists.txt        |  8 +++++++
 drivers/comparator/Kconfig               | 21 +++++++++++++++++
 drivers/comparator/comparator_handlers.c | 30 ++++++++++++++++++++++++
 5 files changed, 61 insertions(+)
 create mode 100644 drivers/comparator/CMakeLists.txt
 create mode 100644 drivers/comparator/Kconfig
 create mode 100644 drivers/comparator/comparator_handlers.c

diff --git a/drivers/CMakeLists.txt b/drivers/CMakeLists.txt
index acf20d2867c..05be8c3fd01 100644
--- a/drivers/CMakeLists.txt
+++ b/drivers/CMakeLists.txt
@@ -24,6 +24,7 @@ add_subdirectory_ifdef(CONFIG_CACHE_MANAGEMENT cache)
 add_subdirectory_ifdef(CONFIG_CAN can)
 add_subdirectory_ifdef(CONFIG_CHARGER charger)
 add_subdirectory_ifdef(CONFIG_CLOCK_CONTROL clock_control)
+add_subdirectory_ifdef(CONFIG_COMPARATOR comparator)
 add_subdirectory_ifdef(CONFIG_CONSOLE console)
 add_subdirectory_ifdef(CONFIG_COREDUMP_DEVICE coredump)
 add_subdirectory_ifdef(CONFIG_COUNTER counter)
diff --git a/drivers/Kconfig b/drivers/Kconfig
index ec9e0c77b6d..db80ba39a66 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -15,6 +15,7 @@ source "drivers/cache/Kconfig"
 source "drivers/can/Kconfig"
 source "drivers/charger/Kconfig"
 source "drivers/clock_control/Kconfig"
+source "drivers/comparator/Kconfig"
 source "drivers/console/Kconfig"
 source "drivers/coredump/Kconfig"
 source "drivers/counter/Kconfig"
diff --git a/drivers/comparator/CMakeLists.txt b/drivers/comparator/CMakeLists.txt
new file mode 100644
index 00000000000..5f61892829d
--- /dev/null
+++ b/drivers/comparator/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/comparator.h)
+
+zephyr_library()
+
+zephyr_library_sources_ifdef(CONFIG_USERSPACE comparator_handlers.c)
diff --git a/drivers/comparator/Kconfig b/drivers/comparator/Kconfig
new file mode 100644
index 00000000000..333fe6671a5
--- /dev/null
+++ b/drivers/comparator/Kconfig
@@ -0,0 +1,21 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+menuconfig COMPARATOR
+	bool "Comparator drivers"
+	help
+	  Enable comparator driver configuration.
+
+if COMPARATOR
+
+module = COMPARATOR
+module-str = comparator
+source "subsys/logging/Kconfig.template.log_config"
+
+config COMPARATOR_INIT_PRIORITY
+	int "COMPARATOR init priority"
+	default KERNEL_INIT_PRIORITY_DEVICE
+	help
+	  Comparator device driver initialization priority.
+
+endif # COMPARATOR
diff --git a/drivers/comparator/comparator_handlers.c b/drivers/comparator/comparator_handlers.c
new file mode 100644
index 00000000000..fba43a9ce8e
--- /dev/null
+++ b/drivers/comparator/comparator_handlers.c
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/comparator.h>
+#include <zephyr/internal/syscall_handler.h>
+
+static inline int z_vrfy_comparator_get_output(const struct device *dev)
+{
+	K_OOPS(K_SYSCALL_DRIVER_COMPARATOR(dev, get_output));
+	return z_impl_comparator_get_output(dev);
+}
+#include <zephyr/syscalls/comparator_get_output_mrsh.c>
+
+static inline int z_vrfy_comparator_set_trigger(const struct device *dev,
+						enum comparator_trigger trigger)
+{
+	K_OOPS(K_SYSCALL_DRIVER_COMPARATOR(dev, set_trigger));
+	return z_impl_comparator_set_trigger(dev, trigger);
+}
+#include <zephyr/syscalls/comparator_set_trigger_mrsh.c>
+
+static inline int z_vrfy_comparator_trigger_is_pending(const struct device *dev)
+{
+	K_OOPS(K_SYSCALL_DRIVER_COMPARATOR(dev, trigger_is_pending));
+	return z_impl_comparator_trigger_is_pending(dev);
+}
+#include <zephyr/syscalls/comparator_trigger_is_pending_mrsh.c>

From 1cd07dd748ef5ce64c08ec6a5b16e70227201477 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Fri, 13 Sep 2024 15:13:47 +0200
Subject: [PATCH 0504/2913] [nrf fromtree] dts: common: nordic: adjust
 comparator nodes

Adjust comparator nodes of nrf SoCs to exclude the unused
io-channel-cells property and simplify the comment describing how
to configure the comparator hardware block as COMP or LPCOMP for
SoCs which support this.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit ffbda1b0f84864704b2522619717896d6b22223f)
(cherry picked from commit 30def4545830ad97da03707a2e62714a0426e255)
---
 dts/arm/nordic/nrf52810.dtsi                   |  1 -
 dts/arm/nordic/nrf52811.dtsi                   |  1 -
 dts/arm/nordic/nrf52820.dtsi                   |  1 -
 dts/arm/nordic/nrf52832.dtsi                   |  7 ++-----
 dts/arm/nordic/nrf52833.dtsi                   |  7 ++-----
 dts/arm/nordic/nrf52840.dtsi                   |  7 ++-----
 dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi |  7 ++-----
 dts/common/nordic/nrf54h20.dtsi                |  5 ++++-
 dts/common/nordic/nrf54l15.dtsi                | 11 +++++++++++
 dts/common/nordic/nrf9280.dtsi                 |  5 ++++-
 10 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
index 8758a6354b8..a67d677e7a2 100644
--- a/dts/arm/nordic/nrf52810.dtsi
+++ b/dts/arm/nordic/nrf52810.dtsi
@@ -269,7 +269,6 @@
 			reg = <0x40013000 0x1000>;
 			interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
-			#io-channel-cells = <1>;
 		};
 
 		egu0: swi0: egu@40014000 {
diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi
index b14df8b567a..41391b7eb3d 100644
--- a/dts/arm/nordic/nrf52811.dtsi
+++ b/dts/arm/nordic/nrf52811.dtsi
@@ -301,7 +301,6 @@
 			reg = <0x40013000 0x1000>;
 			interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
-			#io-channel-cells = <1>;
 		};
 
 		egu0: swi0: egu@40014000 {
diff --git a/dts/arm/nordic/nrf52820.dtsi b/dts/arm/nordic/nrf52820.dtsi
index 601a4f8c7ed..4d05bc741a0 100644
--- a/dts/arm/nordic/nrf52820.dtsi
+++ b/dts/arm/nordic/nrf52820.dtsi
@@ -313,7 +313,6 @@
 			reg = <0x40013000 0x1000>;
 			interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
-			#io-channel-cells = <1>;
 		};
 
 		egu0: swi0: egu@40014000 {
diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
index b722d183da8..32245608a80 100644
--- a/dts/arm/nordic/nrf52832.dtsi
+++ b/dts/arm/nordic/nrf52832.dtsi
@@ -310,16 +310,13 @@
 
 		comp: comparator@40013000 {
 			/*
-			 * This comparator node can be COMP or LPCOMP,
-			 * for the user to pick:
-			 * compatible = "nordic,nrf-comp" or
-			 *              "nordic,nrf-lpcomp".
+			 * Use compatible "nordic,nrf-comp" to configure as COMP
+			 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
 			 */
 			compatible = "nordic,nrf-comp";
 			reg = <0x40013000 0x1000>;
 			interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
-			#io-channel-cells = <1>;
 		};
 
 		egu0: swi0: egu@40014000 {
diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi
index d81a8953fda..b576401803a 100644
--- a/dts/arm/nordic/nrf52833.dtsi
+++ b/dts/arm/nordic/nrf52833.dtsi
@@ -325,16 +325,13 @@
 
 		comp: comparator@40013000 {
 			/*
-			 * This comparator node can be COMP or LPCOMP,
-			 * for the user to pick:
-			 * compatible = "nordic,nrf-comp" or
-			 *              "nordic,nrf-lpcomp".
+			 * Use compatible "nordic,nrf-comp" to configure as COMP
+			 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
 			 */
 			compatible = "nordic,nrf-comp";
 			reg = <0x40013000 0x1000>;
 			interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
-			#io-channel-cells = <1>;
 		};
 
 		egu0: swi0: egu@40014000 {
diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index 238d6318537..98f5e689227 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -312,16 +312,13 @@
 
 		comp: comparator@40013000 {
 			/*
-			 * This comparator node can be COMP or LPCOMP,
-			 * for the user to pick:
-			 * compatible = "nordic,nrf-comp" or
-			 *              "nordic,nrf-lpcomp".
+			 * Use compatible "nordic,nrf-comp" to configure as COMP
+			 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
 			 */
 			compatible = "nordic,nrf-comp";
 			reg = <0x40013000 0x1000>;
 			interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
-			#io-channel-cells = <1>;
 		};
 
 		egu0: swi0: egu@40014000 {
diff --git a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
index 7d79b227be2..50842fb3801 100644
--- a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
@@ -350,16 +350,13 @@ wdt1: watchdog@19000 {
 
 comp: comparator@1a000 {
 	/*
-	 * This comparator node can be COMP or LPCOMP,
-	 * for the user to pick:
-	 * compatible = "nordic,nrf-comp" or
-	 *              "nordic,nrf-lpcomp".
+	 * Use compatible "nordic,nrf-comp" to configure as COMP
+	 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
 	 */
 	compatible = "nordic,nrf-comp";
 	reg = <0x1a000 0x1000>;
 	interrupts = <26 NRF_DEFAULT_IRQ_PRIORITY>;
 	status = "disabled";
-	#io-channel-cells = <1>;
 };
 
 egu0: egu@1b000 {
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index bf2cd072f37..282da95ab64 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -825,11 +825,14 @@
 			};
 
 			comp: comparator@983000 {
+				/*
+				 * Use compatible "nordic,nrf-comp" to configure as COMP
+				 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
+				 */
 				compatible = "nordic,nrf-comp";
 				reg = <0x983000 0x1000>;
 				status = "disabled";
 				interrupts = <387 NRF_DEFAULT_IRQ_PRIORITY>;
-				#io-channel-cells = <1>;
 			};
 
 			temp: temperature-sensor@984000 {
diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index 66c5e3c2d51..d3c0c551823 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -563,6 +563,17 @@
 				frame-timeout-supported;
 			};
 
+			comp: comparator@106000 {
+				/*
+				 * Use compatible "nordic,nrf-comp" to configure as COMP
+				 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
+				 */
+				compatible = "nordic,nrf-comp";
+				reg = <0x106000 0x1000>;
+				status = "disabled";
+				interrupts = <262 NRF_DEFAULT_IRQ_PRIORITY>;
+			};
+
 #ifdef USE_NON_SECURE_ADDRESS_MAP
 			/* intentionally empty because WDT30 is hardware fixed to Secure */
 #else
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index ae3ffc904d2..45b05f9262e 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -727,11 +727,14 @@
 			};
 
 			comp: comparator@983000 {
+				/*
+				 * Use compatible "nordic,nrf-comp" to configure as COMP
+				 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
+				 */
 				compatible = "nordic,nrf-comp";
 				reg = <0x983000 0x1000>;
 				status = "disabled";
 				interrupts = <387 NRF_DEFAULT_IRQ_PRIORITY>;
-				#io-channel-cells = <1>;
 			};
 
 			temp: temperature-sensor@984000 {

From 981a79f2435c34a276336de0898a5a9f72e9b3ef Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Wed, 17 Jul 2024 12:46:52 +0200
Subject: [PATCH 0505/2913] [nrf fromtree] drivers: comparator: Add nRF COMP
 device driver

Add nRF COMP device driver and remove deprecated bindings from
dts/bindings/sensor.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 4adc92475d951c94ab0c2267a5e6196b4df0dfb4)
(cherry picked from commit cbf5449ac72eeab60b19b7c3eaa4e0010a3180a8)
---
 drivers/comparator/CMakeLists.txt            |   1 +
 drivers/comparator/Kconfig                   |   2 +
 drivers/comparator/Kconfig.nrf_comp          |   8 +
 drivers/comparator/comparator_nrf_comp.c     | 764 +++++++++++++++++++
 dts/bindings/comparator/nordic,nrf-comp.yaml | 128 ++++
 dts/bindings/sensor/nordic,nrf-comp.yaml     |  23 -
 include/zephyr/drivers/comparator/nrf_comp.h | 164 ++++
 7 files changed, 1067 insertions(+), 23 deletions(-)
 create mode 100644 drivers/comparator/Kconfig.nrf_comp
 create mode 100644 drivers/comparator/comparator_nrf_comp.c
 create mode 100644 dts/bindings/comparator/nordic,nrf-comp.yaml
 delete mode 100644 dts/bindings/sensor/nordic,nrf-comp.yaml
 create mode 100644 include/zephyr/drivers/comparator/nrf_comp.h

diff --git a/drivers/comparator/CMakeLists.txt b/drivers/comparator/CMakeLists.txt
index 5f61892829d..20aa301af7d 100644
--- a/drivers/comparator/CMakeLists.txt
+++ b/drivers/comparator/CMakeLists.txt
@@ -6,3 +6,4 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/comparator.h)
 zephyr_library()
 
 zephyr_library_sources_ifdef(CONFIG_USERSPACE comparator_handlers.c)
+zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_COMP comparator_nrf_comp.c)
diff --git a/drivers/comparator/Kconfig b/drivers/comparator/Kconfig
index 333fe6671a5..84ea5c74baa 100644
--- a/drivers/comparator/Kconfig
+++ b/drivers/comparator/Kconfig
@@ -18,4 +18,6 @@ config COMPARATOR_INIT_PRIORITY
 	help
 	  Comparator device driver initialization priority.
 
+rsource "Kconfig.nrf_comp"
+
 endif # COMPARATOR
diff --git a/drivers/comparator/Kconfig.nrf_comp b/drivers/comparator/Kconfig.nrf_comp
new file mode 100644
index 00000000000..0e0c889f3ee
--- /dev/null
+++ b/drivers/comparator/Kconfig.nrf_comp
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config COMPARATOR_NRF_COMP
+	bool "Nordic COMP comparator driver"
+	default y
+	depends on DT_HAS_NORDIC_NRF_COMP_ENABLED
+	select NRFX_COMP
diff --git a/drivers/comparator/comparator_nrf_comp.c b/drivers/comparator/comparator_nrf_comp.c
new file mode 100644
index 00000000000..339d24f8dcd
--- /dev/null
+++ b/drivers/comparator/comparator_nrf_comp.c
@@ -0,0 +1,764 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <nrfx_comp.h>
+
+#include <zephyr/drivers/comparator/nrf_comp.h>
+#include <zephyr/kernel.h>
+#include <zephyr/pm/device.h>
+
+#define DT_DRV_COMPAT nordic_nrf_comp
+
+#define SHIM_NRF_COMP_DT_INST_REFSEL(inst) \
+	_CONCAT(COMP_NRF_COMP_REFSEL_, DT_INST_STRING_TOKEN(inst, refsel))
+
+#define SHIM_NRF_COMP_DT_INST_REFSEL_IS_AREF(inst) \
+	DT_INST_ENUM_HAS_VALUE(inst, refsel, AREF)
+
+#define SHIM_NRF_COMP_DT_INST_EXTREFSEL(inst) \
+	_CONCAT(COMP_NRF_COMP_EXTREFSEL_, DT_INST_STRING_TOKEN(inst, extrefsel))
+
+#define SHIM_NRF_COMP_DT_INST_MAIN_MODE_IS_SE(inst) \
+	DT_INST_ENUM_HAS_VALUE(inst, main_mode, SE)
+
+#define SHIM_NRF_COMP_DT_INST_MAIN_MODE_IS_DIFF(inst) \
+	DT_INST_ENUM_HAS_VALUE(inst, main_mode, DIFF)
+
+#define SHIM_NRF_COMP_DT_INST_TH_DOWN(inst) \
+	DT_INST_PROP(inst, th_down)
+
+#define SHIM_NRF_COMP_DT_INST_TH_UP(inst) \
+	DT_INST_PROP(inst, th_up)
+
+#define SHIM_NRF_COMP_DT_INST_SP_MODE(inst) \
+	_CONCAT(COMP_NRF_COMP_SP_MODE_, DT_INST_STRING_TOKEN(inst, sp_mode))
+
+#define SHIM_NRF_COMP_DT_INST_ENABLE_HYST(inst) \
+	DT_INST_PROP(inst, enable_hyst)
+
+#define SHIM_NRF_COMP_DT_INST_ISOURCE(inst) \
+	_CONCAT(COMP_NRF_COMP_ISOURCE_, DT_INST_STRING_TOKEN(inst, isource))
+
+#define SHIM_NRF_COMP_DT_INST_PSEL(inst) \
+	_CONCAT(COMP_NRF_COMP_PSEL_, DT_INST_STRING_TOKEN(inst, psel))
+
+#if defined(COMP_HYST_HYST_Hyst40mV)
+#define NRF_COMP_HYST_ENABLED NRF_COMP_HYST_40MV
+#elif defined(COMP_HYST_HYST_Hyst50mV)
+#define NRF_COMP_HYST_ENABLED NRF_COMP_HYST_50MV
+#endif
+
+#define NRF_COMP_HYST_DISABLED NRF_COMP_HYST_NO_HYST
+
+#if defined(NRF_COMP_HYST_ENABLED)
+#define NRF_COMP_HAS_HYST 1
+#else
+#define NRF_COMP_HAS_HYST 0
+#endif
+
+struct shim_nrf_comp_data {
+	uint32_t event_mask;
+	bool started;
+	atomic_t triggered;
+	comparator_callback_t callback;
+	void *user_data;
+};
+
+#if (NRF_COMP_HAS_AIN_AS_PIN)
+static const uint32_t shim_nrf_comp_ain_map[] = {
+#if defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280)
+	NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(1U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(2U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(3U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
+#elif defined(CONFIG_SOC_NRF54L15)
+	NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(11U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(12U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(13U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(14U, 1),
+#endif
+};
+#endif
+
+#if SHIM_NRF_COMP_DT_INST_MAIN_MODE_IS_SE(0)
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_TH_DOWN(0) < 64);
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_TH_UP(0) < 64);
+#endif
+
+#if NRF_COMP_HAS_AIN_AS_PIN
+BUILD_ASSERT((COMP_NRF_COMP_PSEL_AIN0 == 0));
+BUILD_ASSERT((COMP_NRF_COMP_PSEL_AIN7 == 7));
+BUILD_ASSERT((COMP_NRF_COMP_EXTREFSEL_AIN0 == 0));
+BUILD_ASSERT((COMP_NRF_COMP_EXTREFSEL_AIN7 == 7));
+#else
+#ifndef COMP_PSEL_PSEL_AnalogInput4
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_PSEL(0) != COMP_NRF_COMP_PSEL_AIN4);
+#endif
+
+#ifndef COMP_PSEL_PSEL_AnalogInput5
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_PSEL(0) != COMP_NRF_COMP_PSEL_AIN5);
+#endif
+
+#ifndef COMP_PSEL_PSEL_AnalogInput6
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_PSEL(0) != COMP_NRF_COMP_PSEL_AIN6);
+#endif
+
+#ifndef COMP_PSEL_PSEL_AnalogInput7
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_PSEL(0) != COMP_NRF_COMP_PSEL_AIN7);
+#endif
+#endif
+
+#ifndef COMP_PSEL_PSEL_VddDiv2
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_PSEL(0) != COMP_NRF_COMP_PSEL_VDD_DIV2);
+#endif
+
+#ifndef COMP_PSEL_PSEL_VddhDiv5
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_PSEL(0) != COMP_NRF_COMP_PSEL_VDDH_DIV5);
+#endif
+
+#ifndef COMP_MODE_SP_Normal
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_SP_MODE(0) != COMP_NRF_COMP_SP_MODE_NORMAL);
+#endif
+
+#if NRF_COMP_HAS_ISOURCE
+#ifndef COMP_ISOURCE_ISOURCE_Ien2uA5
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_ISOURCE(0) != COMP_NRF_COMP_ISOURCE_2UA5);
+#endif
+
+#ifndef COMP_ISOURCE_ISOURCE_Ien5uA
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_ISOURCE(0) != COMP_NRF_COMP_ISOURCE_5UA);
+#endif
+
+#ifndef COMP_ISOURCE_ISOURCE_Ien10uA
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_ISOURCE(0) != COMP_NRF_COMP_ISOURCE_10UA);
+#endif
+#endif
+
+#if SHIM_NRF_COMP_DT_INST_REFSEL_IS_AREF(0)
+#ifndef COMP_EXTREFSEL_EXTREFSEL_AnalogReference4
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_EXTREFSEL(0) != COMP_NRF_COMP_EXTREFSEL_AIN4);
+#endif
+
+#ifndef COMP_EXTREFSEL_EXTREFSEL_AnalogReference5
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_EXTREFSEL(0) != COMP_NRF_COMP_EXTREFSEL_AIN5);
+#endif
+
+#ifndef COMP_EXTREFSEL_EXTREFSEL_AnalogReference6
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_EXTREFSEL(0) != COMP_NRF_COMP_EXTREFSEL_AIN6);
+#endif
+
+#ifndef COMP_EXTREFSEL_EXTREFSEL_AnalogReference7
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_EXTREFSEL(0) != COMP_NRF_COMP_EXTREFSEL_AIN7);
+#endif
+#endif
+
+#if SHIM_NRF_COMP_DT_INST_MAIN_MODE_IS_SE(0)
+#ifndef COMP_REFSEL_REFSEL_Int1V8
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_REFSEL(0) != COMP_NRF_COMP_REFSEL_INT_1V8);
+#endif
+
+#ifndef COMP_REFSEL_REFSEL_Int2V4
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_REFSEL(0) != COMP_NRF_COMP_REFSEL_INT_2V4);
+#endif
+
+#ifndef COMP_REFSEL_REFSEL_AVDDAO1V8
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_REFSEL(0) != COMP_NRF_COMP_REFSEL_AVDDAO1V8);
+#endif
+
+#ifndef COMP_REFSEL_REFSEL_VDD
+BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_REFSEL(0) != COMP_NRF_COMP_REFSEL_VDD);
+#endif
+#endif
+
+#if SHIM_NRF_COMP_DT_INST_MAIN_MODE_IS_DIFF(0)
+#if SHIM_NRF_COMP_DT_INST_ENABLE_HYST(0)
+BUILD_ASSERT(NRF_COMP_HAS_HYST);
+#endif
+#endif
+
+#if SHIM_NRF_COMP_DT_INST_MAIN_MODE_IS_SE(0)
+static const struct comp_nrf_comp_se_config shim_nrf_comp_config0 = {
+	.psel = SHIM_NRF_COMP_DT_INST_PSEL(0),
+	.sp_mode = SHIM_NRF_COMP_DT_INST_SP_MODE(0),
+	.isource = SHIM_NRF_COMP_DT_INST_ISOURCE(0),
+#if SHIM_NRF_COMP_DT_INST_REFSEL_IS_AREF(0)
+	.extrefsel = SHIM_NRF_COMP_DT_INST_EXTREFSEL(0),
+#endif
+	.refsel = SHIM_NRF_COMP_DT_INST_REFSEL(0),
+	.th_down = SHIM_NRF_COMP_DT_INST_TH_DOWN(0),
+	.th_up = SHIM_NRF_COMP_DT_INST_TH_UP(0),
+};
+#else
+static const struct comp_nrf_comp_diff_config shim_nrf_comp_config0 = {
+	.psel = SHIM_NRF_COMP_DT_INST_PSEL(0),
+	.sp_mode = SHIM_NRF_COMP_DT_INST_SP_MODE(0),
+	.isource = SHIM_NRF_COMP_DT_INST_ISOURCE(0),
+	.extrefsel = SHIM_NRF_COMP_DT_INST_EXTREFSEL(0),
+	.enable_hyst = SHIM_NRF_COMP_DT_INST_ENABLE_HYST(0),
+};
+#endif
+
+static struct shim_nrf_comp_data shim_nrf_comp_data0;
+
+#if CONFIG_PM_DEVICE
+static bool shim_nrf_comp_is_resumed(void)
+{
+	enum pm_device_state state;
+
+	(void)pm_device_state_get(DEVICE_DT_INST_GET(0), &state);
+	return state == PM_DEVICE_STATE_ACTIVE;
+}
+#else
+static bool shim_nrf_comp_is_resumed(void)
+{
+	return true;
+}
+#endif
+
+static void shim_nrf_comp_start(void)
+{
+	if (shim_nrf_comp_data0.started) {
+		return;
+	}
+
+	nrfx_comp_start(shim_nrf_comp_data0.event_mask, 0);
+	shim_nrf_comp_data0.started = true;
+}
+
+static void shim_nrf_comp_stop(void)
+{
+	if (!shim_nrf_comp_data0.started) {
+		return;
+	}
+
+	nrfx_comp_stop();
+	shim_nrf_comp_data0.started = false;
+}
+
+static int shim_nrf_comp_pm_callback(const struct device *dev, enum pm_device_action action)
+{
+	ARG_UNUSED(dev);
+
+	switch (action) {
+	case PM_DEVICE_ACTION_RESUME:
+		shim_nrf_comp_start();
+		break;
+
+#if CONFIG_PM_DEVICE
+	case PM_DEVICE_ACTION_SUSPEND:
+		shim_nrf_comp_stop();
+		break;
+#endif
+
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+#if (NRF_COMP_HAS_AIN_AS_PIN)
+static int shim_nrf_comp_psel_to_nrf(enum comp_nrf_comp_psel shim,
+				     nrf_comp_input_t *nrf)
+{
+	if (shim >= ARRAY_SIZE(shim_nrf_comp_ain_map)) {
+		return -EINVAL;
+	}
+
+	*nrf = shim_nrf_comp_ain_map[(uint32_t)shim];
+	return 0;
+}
+#else
+static int shim_nrf_comp_psel_to_nrf(enum comp_nrf_comp_psel shim,
+				     nrf_comp_input_t *nrf)
+{
+	switch (shim) {
+	case COMP_NRF_COMP_PSEL_AIN0:
+		*nrf = NRF_COMP_INPUT_0;
+		break;
+
+	case COMP_NRF_COMP_PSEL_AIN1:
+		*nrf = NRF_COMP_INPUT_1;
+		break;
+
+	case COMP_NRF_COMP_PSEL_AIN2:
+		*nrf = NRF_COMP_INPUT_2;
+		break;
+
+	case COMP_NRF_COMP_PSEL_AIN3:
+		*nrf = NRF_COMP_INPUT_3;
+		break;
+
+#if defined(COMP_PSEL_PSEL_AnalogInput4)
+	case COMP_NRF_COMP_PSEL_AIN4:
+		*nrf = NRF_COMP_INPUT_4;
+		break;
+#endif
+
+#if defined(COMP_PSEL_PSEL_AnalogInput5)
+	case COMP_NRF_COMP_PSEL_AIN5:
+		*nrf = NRF_COMP_INPUT_5;
+		break;
+#endif
+
+#if defined(COMP_PSEL_PSEL_AnalogInput6)
+	case COMP_NRF_COMP_PSEL_AIN6:
+		*nrf = NRF_COMP_INPUT_6;
+		break;
+#endif
+
+#if defined(COMP_PSEL_PSEL_AnalogInput7)
+	case COMP_NRF_COMP_PSEL_AIN7:
+		*nrf = NRF_COMP_INPUT_7;
+		break;
+#endif
+
+#if defined(COMP_PSEL_PSEL_VddDiv2)
+	case COMP_NRF_COMP_PSEL_VDD_DIV2:
+		*nrf = NRF_COMP_VDD_DIV2;
+		break;
+#endif
+
+#if defined(COMP_PSEL_PSEL_VddhDiv5)
+	case COMP_NRF_COMP_PSEL_VDDH_DIV5:
+		*nrf = NRF_COMP_VDDH_DIV5;
+		break;
+#endif
+
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+#endif
+
+static int shim_nrf_comp_sp_mode_to_nrf(enum comp_nrf_comp_sp_mode shim,
+					nrf_comp_sp_mode_t *nrf)
+{
+	switch (shim) {
+	case COMP_NRF_COMP_SP_MODE_LOW:
+		*nrf = NRF_COMP_SP_MODE_LOW;
+		break;
+
+#if defined(COMP_MODE_SP_Normal)
+	case COMP_NRF_COMP_SP_MODE_NORMAL:
+		*nrf = NRF_COMP_SP_MODE_NORMAL;
+		break;
+#endif
+
+	case COMP_NRF_COMP_SP_MODE_HIGH:
+		*nrf = NRF_COMP_SP_MODE_HIGH;
+		break;
+
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+#if NRF_COMP_HAS_ISOURCE
+static int shim_nrf_comp_isource_to_nrf(enum comp_nrf_comp_isource shim,
+					nrf_isource_t *nrf)
+{
+	switch (shim) {
+	case COMP_NRF_COMP_ISOURCE_DISABLED:
+		*nrf = NRF_COMP_ISOURCE_OFF;
+		break;
+
+#if defined(COMP_ISOURCE_ISOURCE_Ien2uA5)
+	case COMP_NRF_COMP_ISOURCE_2UA5:
+		*nrf = NRF_COMP_ISOURCE_IEN_2UA5;
+		break;
+#endif
+
+#if defined(COMP_ISOURCE_ISOURCE_Ien5uA)
+	case COMP_NRF_COMP_ISOURCE_5UA:
+		*nrf = NRF_COMP_ISOURCE_IEN_5UA;
+		break;
+#endif
+
+#if defined(COMP_ISOURCE_ISOURCE_Ien10uA)
+	case COMP_NRF_COMP_ISOURCE_10UA:
+		*nrf = NRF_COMP_ISOURCE_IEN_10UA;
+		break;
+#endif
+
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+#endif
+
+#if (NRF_COMP_HAS_AIN_AS_PIN)
+static int shim_nrf_comp_extrefsel_to_nrf(enum comp_nrf_comp_extrefsel shim,
+					  nrf_comp_ext_ref_t *nrf)
+{
+	if (shim >= ARRAY_SIZE(shim_nrf_comp_ain_map)) {
+		return -EINVAL;
+	}
+
+	*nrf = shim_nrf_comp_ain_map[(uint32_t)shim];
+	return 0;
+}
+#else
+static int shim_nrf_comp_extrefsel_to_nrf(enum comp_nrf_comp_extrefsel shim,
+					  nrf_comp_ext_ref_t *nrf)
+{
+	switch (shim) {
+	case COMP_NRF_COMP_EXTREFSEL_AIN0:
+		*nrf = NRF_COMP_EXT_REF_0;
+		break;
+
+	case COMP_NRF_COMP_EXTREFSEL_AIN1:
+		*nrf = NRF_COMP_EXT_REF_1;
+		break;
+
+	case COMP_NRF_COMP_EXTREFSEL_AIN2:
+		*nrf = NRF_COMP_EXT_REF_2;
+		break;
+
+	case COMP_NRF_COMP_EXTREFSEL_AIN3:
+		*nrf = NRF_COMP_EXT_REF_3;
+		break;
+
+#if defined(COMP_EXTREFSEL_EXTREFSEL_AnalogReference4)
+	case COMP_NRF_COMP_EXTREFSEL_AIN4:
+		*nrf = NRF_COMP_EXT_REF_4;
+		break;
+#endif
+
+#if defined(COMP_EXTREFSEL_EXTREFSEL_AnalogReference5)
+	case COMP_NRF_COMP_EXTREFSEL_AIN5:
+		*nrf = NRF_COMP_EXT_REF_5;
+		break;
+#endif
+
+#if defined(COMP_EXTREFSEL_EXTREFSEL_AnalogReference6)
+	case COMP_NRF_COMP_EXTREFSEL_AIN6:
+		*nrf = NRF_COMP_EXT_REF_6;
+		break;
+#endif
+
+#if defined(COMP_EXTREFSEL_EXTREFSEL_AnalogReference7)
+	case COMP_NRF_COMP_EXTREFSEL_AIN7:
+		*nrf = NRF_COMP_EXT_REF_7;
+		break;
+#endif
+
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+#endif
+
+static int shim_nrf_comp_refsel_to_nrf(enum comp_nrf_comp_refsel shim,
+				       nrf_comp_ref_t *nrf)
+{
+	switch (shim) {
+	case COMP_NRF_COMP_REFSEL_INT_1V2:
+		*nrf = NRF_COMP_REF_INT_1V2;
+		break;
+
+#if defined(COMP_REFSEL_REFSEL_Int1V8)
+	case COMP_NRF_COMP_REFSEL_INT_1V8:
+		*nrf = NRF_COMP_REF_INT_1V8;
+		break;
+#endif
+
+#if defined(COMP_REFSEL_REFSEL_Int2V4)
+	case COMP_NRF_COMP_REFSEL_INT_2V4:
+		*nrf = NRF_COMP_REF_INT_2V4;
+		break;
+#endif
+
+#if defined(COMP_REFSEL_REFSEL_AVDDAO1V8)
+	case COMP_NRF_COMP_REFSEL_AVDDAO1V8:
+		*nrf = NRF_COMP_REF_AVDDAO1V8;
+		break;
+#endif
+
+#if defined(COMP_REFSEL_REFSEL_VDD)
+	case COMP_NRF_COMP_REFSEL_VDD:
+		*nrf = NRF_COMP_REF_VDD;
+		break;
+#endif
+
+	case COMP_NRF_COMP_REFSEL_AREF:
+		*nrf = NRF_COMP_REF_AREF;
+		break;
+
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int shim_nrf_comp_se_config_to_nrf(const struct comp_nrf_comp_se_config *shim,
+					  nrfx_comp_config_t *nrf)
+{
+	if (shim_nrf_comp_refsel_to_nrf(shim->refsel, &nrf->reference)) {
+		return -EINVAL;
+	}
+
+	if (shim_nrf_comp_extrefsel_to_nrf(shim->extrefsel, &nrf->ext_ref)) {
+		return -EINVAL;
+	}
+
+	nrf->main_mode = NRF_COMP_MAIN_MODE_SE;
+
+	if (shim->th_down > 63 || shim->th_up > 63) {
+		return -EINVAL;
+	}
+
+	nrf->threshold.th_down = shim->th_down;
+	nrf->threshold.th_up = shim->th_up;
+
+	if (shim_nrf_comp_sp_mode_to_nrf(shim->sp_mode, &nrf->speed_mode)) {
+		return -EINVAL;
+	}
+
+	nrf->hyst = NRF_COMP_HYST_NO_HYST;
+
+#if NRF_COMP_HAS_ISOURCE
+	if (shim_nrf_comp_isource_to_nrf(shim->isource, &nrf->isource)) {
+		return -EINVAL;
+	}
+#else
+	if (shim->isource != COMP_NRF_COMP_ISOURCE_DISABLED) {
+		return -EINVAL;
+	}
+#endif
+
+	if (shim_nrf_comp_psel_to_nrf(shim->psel, &nrf->input)) {
+		return -EINVAL;
+	}
+
+	nrf->interrupt_priority = 0;
+	return 0;
+}
+
+static int shim_nrf_comp_diff_config_to_nrf(const struct comp_nrf_comp_diff_config *shim,
+					    nrfx_comp_config_t *nrf)
+{
+	nrf->reference = NRF_COMP_REF_AREF;
+
+	if (shim_nrf_comp_extrefsel_to_nrf(shim->extrefsel, &nrf->ext_ref)) {
+		return -EINVAL;
+	}
+
+	nrf->main_mode = NRF_COMP_MAIN_MODE_DIFF;
+	nrf->threshold.th_down = 0;
+	nrf->threshold.th_up = 0;
+
+	if (shim_nrf_comp_sp_mode_to_nrf(shim->sp_mode, &nrf->speed_mode)) {
+		return -EINVAL;
+	}
+
+#if NRF_COMP_HAS_HYST
+	if (shim->enable_hyst) {
+		nrf->hyst = NRF_COMP_HYST_ENABLED;
+	} else {
+		nrf->hyst = NRF_COMP_HYST_DISABLED;
+	}
+#else
+	if (shim->enable_hyst) {
+		return -EINVAL;
+	}
+#endif
+
+#if NRF_COMP_HAS_ISOURCE
+	if (shim_nrf_comp_isource_to_nrf(shim->isource, &nrf->isource)) {
+		return -EINVAL;
+	}
+#else
+	if (shim->isource != COMP_NRF_COMP_ISOURCE_DISABLED) {
+		return -EINVAL;
+	}
+#endif
+
+	if (shim_nrf_comp_psel_to_nrf(shim->psel, &nrf->input)) {
+		return -EINVAL;
+	}
+
+	nrf->interrupt_priority = 0;
+	return 0;
+}
+
+static int shim_nrf_comp_get_output(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	return nrfx_comp_sample();
+}
+
+static int shim_nrf_comp_set_trigger(const struct device *dev,
+				     enum comparator_trigger trigger)
+{
+	shim_nrf_comp_stop();
+
+	switch (trigger) {
+	case COMPARATOR_TRIGGER_NONE:
+		shim_nrf_comp_data0.event_mask = 0;
+		break;
+
+	case COMPARATOR_TRIGGER_RISING_EDGE:
+		shim_nrf_comp_data0.event_mask = NRF_COMP_INT_UP_MASK;
+		break;
+
+	case COMPARATOR_TRIGGER_FALLING_EDGE:
+		shim_nrf_comp_data0.event_mask = NRF_COMP_INT_DOWN_MASK;
+		break;
+
+	case COMPARATOR_TRIGGER_BOTH_EDGES:
+		shim_nrf_comp_data0.event_mask = NRF_COMP_INT_CROSS_MASK;
+		break;
+	}
+
+	if (shim_nrf_comp_is_resumed()) {
+		shim_nrf_comp_start();
+	}
+
+	return 0;
+}
+
+static int shim_nrf_comp_set_trigger_callback(const struct device *dev,
+					      comparator_callback_t callback,
+					      void *user_data)
+{
+	shim_nrf_comp_stop();
+
+	shim_nrf_comp_data0.callback = callback;
+	shim_nrf_comp_data0.user_data = user_data;
+
+	if (callback != NULL && atomic_test_and_clear_bit(&shim_nrf_comp_data0.triggered, 0)) {
+		callback(dev, user_data);
+	}
+
+	if (shim_nrf_comp_is_resumed()) {
+		shim_nrf_comp_start();
+	}
+
+	return 0;
+}
+
+static int shim_nrf_comp_trigger_is_pending(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	return atomic_test_and_clear_bit(&shim_nrf_comp_data0.triggered, 0);
+}
+
+static const struct comparator_driver_api shim_nrf_comp_api = {
+	.get_output = shim_nrf_comp_get_output,
+	.set_trigger = shim_nrf_comp_set_trigger,
+	.set_trigger_callback = shim_nrf_comp_set_trigger_callback,
+	.trigger_is_pending = shim_nrf_comp_trigger_is_pending,
+};
+
+static int shim_nrf_comp_reconfigure(const nrfx_comp_config_t *nrf)
+{
+	shim_nrf_comp_stop();
+
+	(void)nrfx_comp_reconfigure(nrf);
+
+	if (shim_nrf_comp_is_resumed()) {
+		shim_nrf_comp_start();
+	}
+
+	return 0;
+}
+
+int comp_nrf_comp_configure_se(const struct device *dev,
+			       const struct comp_nrf_comp_se_config *config)
+{
+	nrfx_comp_config_t nrf = {};
+
+	ARG_UNUSED(dev);
+
+	if (shim_nrf_comp_se_config_to_nrf(config, &nrf)) {
+		return -EINVAL;
+	}
+
+	return shim_nrf_comp_reconfigure(&nrf);
+}
+
+int comp_nrf_comp_configure_diff(const struct device *dev,
+				 const struct comp_nrf_comp_diff_config *config)
+{
+	nrfx_comp_config_t nrf = {};
+
+	ARG_UNUSED(dev);
+
+	if (shim_nrf_comp_diff_config_to_nrf(config, &nrf)) {
+		return -EINVAL;
+	}
+
+	return shim_nrf_comp_reconfigure(&nrf);
+}
+
+static void shim_nrf_comp_event_handler(nrf_comp_event_t event)
+{
+	ARG_UNUSED(event);
+
+	if (shim_nrf_comp_data0.callback == NULL) {
+		atomic_set_bit(&shim_nrf_comp_data0.triggered, 0);
+		return;
+	}
+
+	shim_nrf_comp_data0.callback(DEVICE_DT_INST_GET(0), shim_nrf_comp_data0.user_data);
+	atomic_clear_bit(&shim_nrf_comp_data0.triggered, 0);
+}
+
+static int shim_nrf_comp_init(const struct device *dev)
+{
+	nrfx_comp_config_t nrf = {};
+
+	IRQ_CONNECT(DT_INST_IRQN(0),
+		    DT_INST_IRQ(0, priority),
+		    nrfx_isr,
+		    nrfx_comp_irq_handler,
+		    0);
+
+	irq_enable(DT_INST_IRQN(0));
+
+#if SHIM_NRF_COMP_DT_INST_MAIN_MODE_IS_SE(0)
+	(void)shim_nrf_comp_se_config_to_nrf(&shim_nrf_comp_config0, &nrf);
+#else
+	(void)shim_nrf_comp_diff_config_to_nrf(&shim_nrf_comp_config0, &nrf);
+#endif
+
+	if (nrfx_comp_init(&nrf, shim_nrf_comp_event_handler) != NRFX_SUCCESS) {
+		return -ENODEV;
+	}
+
+	return pm_device_driver_init(dev, shim_nrf_comp_pm_callback);
+}
+
+PM_DEVICE_DT_INST_DEFINE(0, shim_nrf_comp_pm_callback);
+
+DEVICE_DT_INST_DEFINE(0,
+		      shim_nrf_comp_init,
+		      PM_DEVICE_DT_INST_GET(0),
+		      NULL,
+		      NULL,
+		      POST_KERNEL,
+		      CONFIG_COMPARATOR_INIT_PRIORITY,
+		      &shim_nrf_comp_api);
diff --git a/dts/bindings/comparator/nordic,nrf-comp.yaml b/dts/bindings/comparator/nordic,nrf-comp.yaml
new file mode 100644
index 00000000000..a6f7f32db5f
--- /dev/null
+++ b/dts/bindings/comparator/nordic,nrf-comp.yaml
@@ -0,0 +1,128 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  Nordic nRF COMP (analog COMParator)
+
+  This comparator has varying configurations which require varying
+  properties be set in the devicetree.
+
+  The following example displays the minimum node layout:
+
+    comp: comp@deadbeef {
+            compatible = "nordic,nrf-comp";
+            reg = <0xdeadbeef 0x1000>;
+            interrupts = <0 NRF_DEFAULT_IRQ_PRIORITY>;
+            status = "disabled";
+    };
+
+  Enabling the comparator node requires setting the default
+  configuration of the comparator.
+
+  The following example displays enabling the comparator in
+  single-ended mode, selecting an internal reference:
+
+    &comp {
+            status = "okay";
+            main-mode = "SE";
+            psel = "AIN0";
+            refsel = "INT_1V2";
+            sp-mode = "NORMAL";
+            th-up = <36>;
+            th-down = <30>;
+            isource = "OFF";
+    };
+
+  To select an external reference, select the "AREF"
+  reference and add the external reference:
+
+    &comp {
+            ...
+            refsel = "AREF";
+            extrefsel = "AIN1";
+            ...
+    };
+
+  The following example displays enabling the comparator
+  in differential mode:
+
+    &comp {
+            status = "okay";
+            main-mode = "DIFF";
+            psel = "AIN0";
+            extrefsel = "AIN1";
+            sp-mode = "NORMAL";
+            hyst = "50MV";
+            isource = "OFF";
+    };
+
+compatible: "nordic,nrf-comp"
+
+include: base.yaml
+
+properties:
+  main-mode:
+    type: string
+    enum:
+      - "SE"
+      - "DIFF"
+
+  psel:
+    type: string
+    enum:
+      - "AIN0"
+      - "AIN1"
+      - "AIN2"
+      - "AIN3"
+      - "AIN4"
+      - "AIN5"
+      - "AIN6"
+      - "AIN7"
+      - "VDD_DIV2"
+      - "VDDH_DIV5"
+
+  extrefsel:
+    type: string
+    enum:
+      - "AIN0"
+      - "AIN1"
+      - "AIN2"
+      - "AIN3"
+      - "AIN4"
+      - "AIN5"
+      - "AIN6"
+      - "AIN7"
+
+  refsel:
+    type: string
+    enum:
+      - "INT_1V2"
+      - "INT_1V8"
+      - "INT_2V4"
+      - "AVDDAO1V8"
+      - "VDD"
+      - "AREF"
+
+  enable-hyst:
+    type: boolean
+
+  sp-mode:
+    type: string
+    enum:
+      - "LOW"
+      - "NORMAL"
+      - "HIGH"
+
+  th-up:
+    type: int
+
+  th-down:
+    type: int
+
+  isource:
+    type: string
+    enum:
+      - "DISABLED"
+      - "2UA5"
+      - "5UA"
+      - "10UA"
diff --git a/dts/bindings/sensor/nordic,nrf-comp.yaml b/dts/bindings/sensor/nordic,nrf-comp.yaml
deleted file mode 100644
index cc964015ba1..00000000000
--- a/dts/bindings/sensor/nordic,nrf-comp.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2022, Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: Nordic nRF family COMP (Comparator)
-
-compatible: "nordic,nrf-comp"
-
-include: base.yaml
-
-properties:
-  reg:
-    required: true
-
-  interrupts:
-    required: true
-
-  "#io-channel-cells":
-    type: int
-    const: 1
-    required: true
-
-io-channel-cells:
-  - input
diff --git a/include/zephyr/drivers/comparator/nrf_comp.h b/include/zephyr/drivers/comparator/nrf_comp.h
new file mode 100644
index 00000000000..59e1cbbb3ce
--- /dev/null
+++ b/include/zephyr/drivers/comparator/nrf_comp.h
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_COMP_NRF_COMP_H_
+#define ZEPHYR_INCLUDE_DRIVERS_COMP_NRF_COMP_H_
+
+#include <zephyr/drivers/comparator.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Positive input selection */
+enum comp_nrf_comp_psel {
+	/** AIN0 external input */
+	COMP_NRF_COMP_PSEL_AIN0,
+	/** AIN1 external input */
+	COMP_NRF_COMP_PSEL_AIN1,
+	/** AIN2 external input */
+	COMP_NRF_COMP_PSEL_AIN2,
+	/** AIN3 external input */
+	COMP_NRF_COMP_PSEL_AIN3,
+	/** AIN4 external input */
+	COMP_NRF_COMP_PSEL_AIN4,
+	/** AIN5 external input */
+	COMP_NRF_COMP_PSEL_AIN5,
+	/** AIN6 external input */
+	COMP_NRF_COMP_PSEL_AIN6,
+	/** AIN7 external input */
+	COMP_NRF_COMP_PSEL_AIN7,
+	/** VDD / 2 */
+	COMP_NRF_COMP_PSEL_VDD_DIV2,
+	/** VDDH / 5 */
+	COMP_NRF_COMP_PSEL_VDDH_DIV5,
+};
+
+/** External reference selection */
+enum comp_nrf_comp_extrefsel {
+	/** AIN0 external input */
+	COMP_NRF_COMP_EXTREFSEL_AIN0,
+	/** AIN1 external input */
+	COMP_NRF_COMP_EXTREFSEL_AIN1,
+	/** AIN2 external input */
+	COMP_NRF_COMP_EXTREFSEL_AIN2,
+	/** AIN3 external input */
+	COMP_NRF_COMP_EXTREFSEL_AIN3,
+	/** AIN4 external input */
+	COMP_NRF_COMP_EXTREFSEL_AIN4,
+	/** AIN5 external input */
+	COMP_NRF_COMP_EXTREFSEL_AIN5,
+	/** AIN6 external input */
+	COMP_NRF_COMP_EXTREFSEL_AIN6,
+	/** AIN7 external input */
+	COMP_NRF_COMP_EXTREFSEL_AIN7,
+};
+
+/** Reference selection */
+enum comp_nrf_comp_refsel {
+	/** Internal 1.2V reference */
+	COMP_NRF_COMP_REFSEL_INT_1V2,
+	/** Internal 1.8V reference */
+	COMP_NRF_COMP_REFSEL_INT_1V8,
+	/** Internal 2.4V reference */
+	COMP_NRF_COMP_REFSEL_INT_2V4,
+	/** AVDD 1.8V reference */
+	COMP_NRF_COMP_REFSEL_AVDDAO1V8,
+	/** VDD reference */
+	COMP_NRF_COMP_REFSEL_VDD,
+	/** Use external analog reference */
+	COMP_NRF_COMP_REFSEL_AREF,
+};
+
+/** Speed mode selection */
+enum comp_nrf_comp_sp_mode {
+	/** Low-power mode */
+	COMP_NRF_COMP_SP_MODE_LOW,
+	/** Normal mode */
+	COMP_NRF_COMP_SP_MODE_NORMAL,
+	/** High-speed mode */
+	COMP_NRF_COMP_SP_MODE_HIGH,
+};
+
+/** Current source configuration */
+enum comp_nrf_comp_isource {
+	/** Current source disabled */
+	COMP_NRF_COMP_ISOURCE_DISABLED,
+	/** 2.5uA current source enabled */
+	COMP_NRF_COMP_ISOURCE_2UA5,
+	/** 5uA current source enabled */
+	COMP_NRF_COMP_ISOURCE_5UA,
+	/** 10uA current source enabled */
+	COMP_NRF_COMP_ISOURCE_10UA,
+};
+
+/**
+ * @brief Single-ended mode configuration structure
+ *
+ * @note extrefsel is only used if refsel == COMP_NRF_COMP_REFSEL_AREF
+ * @note Hysteresis down in volts = ((th_down + 1) / 64) * ref
+ * @note Hysteresis up in volts = ((th_up + 1) / 64) * ref
+ */
+struct comp_nrf_comp_se_config {
+	/** Positive input selection */
+	enum comp_nrf_comp_psel psel;
+	/** Speed mode selection */
+	enum comp_nrf_comp_sp_mode sp_mode;
+	/** Current source configuration */
+	enum comp_nrf_comp_isource isource;
+	/** External reference selection */
+	enum comp_nrf_comp_extrefsel extrefsel;
+	/** Reference selection */
+	enum comp_nrf_comp_refsel refsel;
+	/** Hysteresis down threshold configuration */
+	uint8_t th_down;
+	/** Hysteresis up threshold configuration */
+	uint8_t th_up;
+};
+
+/**
+ * @brief Configure comparator in single-ended mode
+ *
+ * @param dev Comparator device instance
+ * @param config Single-ended mode configuration
+ *
+ * @retval 0 if successful
+ * @retval negative errno-code otherwise
+ */
+int comp_nrf_comp_configure_se(const struct device *dev,
+			       const struct comp_nrf_comp_se_config *config);
+
+/** Differential mode configuration structure */
+struct comp_nrf_comp_diff_config {
+	/** Positive input selection */
+	enum comp_nrf_comp_psel psel;
+	/** Speed mode selection */
+	enum comp_nrf_comp_sp_mode sp_mode;
+	/** Current source configuration */
+	enum comp_nrf_comp_isource isource;
+	/** Negative input selection */
+	enum comp_nrf_comp_extrefsel extrefsel;
+	/** Hysteresis configuration */
+	bool enable_hyst;
+};
+
+/**
+ * @brief Configure comparator in differential mode
+ *
+ * @param dev Comparator device instance
+ * @param config Differential mode configuration
+ *
+ * @retval 0 if successful
+ * @retval negative errno-code otherwise
+ */
+int comp_nrf_comp_configure_diff(const struct device *dev,
+				 const struct comp_nrf_comp_diff_config *config);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_COMP_NRF_COMP_H_ */

From 3a077555f59cd51357a7bbed4833ffd6974e4fa8 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Wed, 4 Sep 2024 11:22:29 +0200
Subject: [PATCH 0506/2913] [nrf fromtree] tests: drivers: build_all: add
 comparator test suite

Add comparator build_all test suite designed to test multiple
devicetree overlays and boards for each comparator device driver.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 13af5ca0dc86dc88f0ad448be26ba556af2bcefe)
(cherry picked from commit aca1d406727f7232a360263eac0ddb4549026cde)
---
 .../build_all/comparator/CMakeLists.txt       |  8 ++++
 .../comparator/nrf_comp/diff.overlay          | 14 ++++++
 .../build_all/comparator/nrf_comp/se.overlay  | 16 +++++++
 .../comparator/nrf_comp/se_aref.overlay       | 17 +++++++
 tests/drivers/build_all/comparator/prj.conf   |  6 +++
 tests/drivers/build_all/comparator/src/main.c | 10 ++++
 .../build_all/comparator/testcase.yaml        | 48 +++++++++++++++++++
 7 files changed, 119 insertions(+)
 create mode 100644 tests/drivers/build_all/comparator/CMakeLists.txt
 create mode 100644 tests/drivers/build_all/comparator/nrf_comp/diff.overlay
 create mode 100644 tests/drivers/build_all/comparator/nrf_comp/se.overlay
 create mode 100644 tests/drivers/build_all/comparator/nrf_comp/se_aref.overlay
 create mode 100644 tests/drivers/build_all/comparator/prj.conf
 create mode 100644 tests/drivers/build_all/comparator/src/main.c
 create mode 100644 tests/drivers/build_all/comparator/testcase.yaml

diff --git a/tests/drivers/build_all/comparator/CMakeLists.txt b/tests/drivers/build_all/comparator/CMakeLists.txt
new file mode 100644
index 00000000000..edb50bd78e5
--- /dev/null
+++ b/tests/drivers/build_all/comparator/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(build_all_comparator)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/tests/drivers/build_all/comparator/nrf_comp/diff.overlay b/tests/drivers/build_all/comparator/nrf_comp/diff.overlay
new file mode 100644
index 00000000000..8b8e9a02c2b
--- /dev/null
+++ b/tests/drivers/build_all/comparator/nrf_comp/diff.overlay
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&comp {
+	main-mode = "DIFF";
+	psel = "AIN0";
+	extrefsel = "AIN1";
+	sp-mode = "HIGH";
+	isource = "DISABLED";
+	status = "okay";
+};
diff --git a/tests/drivers/build_all/comparator/nrf_comp/se.overlay b/tests/drivers/build_all/comparator/nrf_comp/se.overlay
new file mode 100644
index 00000000000..e4eb56f61a9
--- /dev/null
+++ b/tests/drivers/build_all/comparator/nrf_comp/se.overlay
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&comp {
+	main-mode = "SE";
+	psel = "AIN0";
+	refsel = "INT_1V2";
+	sp-mode = "HIGH";
+	th-up = <36>;
+	th-down = <28>;
+	isource = "DISABLED";
+	status = "okay";
+};
diff --git a/tests/drivers/build_all/comparator/nrf_comp/se_aref.overlay b/tests/drivers/build_all/comparator/nrf_comp/se_aref.overlay
new file mode 100644
index 00000000000..0d36a3e40b4
--- /dev/null
+++ b/tests/drivers/build_all/comparator/nrf_comp/se_aref.overlay
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&comp {
+	main-mode = "SE";
+	psel = "AIN0";
+	extrefsel = "AIN1";
+	refsel = "AREF";
+	sp-mode = "HIGH";
+	th-up = <36>;
+	th-down = <28>;
+	isource = "DISABLED";
+	status = "okay";
+};
diff --git a/tests/drivers/build_all/comparator/prj.conf b/tests/drivers/build_all/comparator/prj.conf
new file mode 100644
index 00000000000..9e78e0bbe53
--- /dev/null
+++ b/tests/drivers/build_all/comparator/prj.conf
@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_TEST=y
+CONFIG_TEST_USERSPACE=y
+CONFIG_COMPARATOR=y
diff --git a/tests/drivers/build_all/comparator/src/main.c b/tests/drivers/build_all/comparator/src/main.c
new file mode 100644
index 00000000000..a05ee591430
--- /dev/null
+++ b/tests/drivers/build_all/comparator/src/main.c
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+int main(void)
+{
+	return 0;
+}
diff --git a/tests/drivers/build_all/comparator/testcase.yaml b/tests/drivers/build_all/comparator/testcase.yaml
new file mode 100644
index 00000000000..9c94ef9a69e
--- /dev/null
+++ b/tests/drivers/build_all/comparator/testcase.yaml
@@ -0,0 +1,48 @@
+common:
+  build_only: true
+  tags:
+    - drivers
+    - comparator
+tests:
+  drivers.build_all.comparator.nrf_comp.diff:
+    extra_args:
+      - DTC_OVERLAY_FILE="nrf_comp/diff.overlay"
+    platform_allow:
+      - nrf52dk/nrf52810
+      - nrf52dk/nrf52832
+      - nrf52833dk/nrf52820
+      - nrf52833dk/nrf52833
+      - nrf52840dk/nrf52811
+      - nrf52840dk/nrf52840
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf9280pdk/nrf9280/cpuapp
+  drivers.build_all.comparator.nrf_comp.se_aref:
+    extra_args:
+      - DTC_OVERLAY_FILE="nrf_comp/se_aref.overlay"
+    platform_allow:
+      - nrf52dk/nrf52810
+      - nrf52dk/nrf52832
+      - nrf52833dk/nrf52820
+      - nrf52833dk/nrf52833
+      - nrf52840dk/nrf52811
+      - nrf52840dk/nrf52840
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf9280pdk/nrf9280/cpuapp
+  drivers.build_all.comparator.nrf_comp.se:
+    extra_args:
+      - DTC_OVERLAY_FILE="nrf_comp/se.overlay"
+    platform_allow:
+      - nrf52dk/nrf52810
+      - nrf52dk/nrf52832
+      - nrf52833dk/nrf52820
+      - nrf52833dk/nrf52833
+      - nrf52840dk/nrf52811
+      - nrf52840dk/nrf52840
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf9280pdk/nrf9280/cpuapp

From 22939094a7f7a95f87651894e2204223aaab53f0 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Mon, 2 Sep 2024 19:39:11 +0200
Subject: [PATCH 0507/2913] [nrf fromtree] drivers: comparator: add nRF LPCOMP
 device driver

Add nRF LPCOMP device driver.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 04e70ab96c54a7413fd300ad599b44c8a7b8f91f)
(cherry picked from commit 1e13d3f1d29baa78255b222dbc91cf828b5aa489)
---
 drivers/comparator/CMakeLists.txt             |   1 +
 drivers/comparator/Kconfig                    |   1 +
 drivers/comparator/Kconfig.nrf_lpcomp         |   8 +
 drivers/comparator/comparator_nrf_lpcomp.c    | 491 ++++++++++++++++++
 .../comparator/nordic,nrf-lpcomp.yaml         |  83 +++
 dts/bindings/sensor/nordic,nrf-lpcomp.yaml    |  23 -
 .../zephyr/drivers/comparator/nrf_lpcomp.h    | 112 ++++
 7 files changed, 696 insertions(+), 23 deletions(-)
 create mode 100644 drivers/comparator/Kconfig.nrf_lpcomp
 create mode 100644 drivers/comparator/comparator_nrf_lpcomp.c
 create mode 100644 dts/bindings/comparator/nordic,nrf-lpcomp.yaml
 delete mode 100644 dts/bindings/sensor/nordic,nrf-lpcomp.yaml
 create mode 100644 include/zephyr/drivers/comparator/nrf_lpcomp.h

diff --git a/drivers/comparator/CMakeLists.txt b/drivers/comparator/CMakeLists.txt
index 20aa301af7d..d0dc726bf58 100644
--- a/drivers/comparator/CMakeLists.txt
+++ b/drivers/comparator/CMakeLists.txt
@@ -7,3 +7,4 @@ zephyr_library()
 
 zephyr_library_sources_ifdef(CONFIG_USERSPACE comparator_handlers.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_COMP comparator_nrf_comp.c)
+zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_LPCOMP comparator_nrf_lpcomp.c)
diff --git a/drivers/comparator/Kconfig b/drivers/comparator/Kconfig
index 84ea5c74baa..819936024b9 100644
--- a/drivers/comparator/Kconfig
+++ b/drivers/comparator/Kconfig
@@ -19,5 +19,6 @@ config COMPARATOR_INIT_PRIORITY
 	  Comparator device driver initialization priority.
 
 rsource "Kconfig.nrf_comp"
+rsource "Kconfig.nrf_lpcomp"
 
 endif # COMPARATOR
diff --git a/drivers/comparator/Kconfig.nrf_lpcomp b/drivers/comparator/Kconfig.nrf_lpcomp
new file mode 100644
index 00000000000..f33de46f15d
--- /dev/null
+++ b/drivers/comparator/Kconfig.nrf_lpcomp
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config COMPARATOR_NRF_LPCOMP
+	bool "Nordic LPCOMP comparator driver"
+	default y
+	depends on DT_HAS_NORDIC_NRF_LPCOMP_ENABLED
+	select NRFX_LPCOMP
diff --git a/drivers/comparator/comparator_nrf_lpcomp.c b/drivers/comparator/comparator_nrf_lpcomp.c
new file mode 100644
index 00000000000..6c6710d337d
--- /dev/null
+++ b/drivers/comparator/comparator_nrf_lpcomp.c
@@ -0,0 +1,491 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <nrfx_lpcomp.h>
+
+#include <zephyr/drivers/comparator/nrf_lpcomp.h>
+#include <zephyr/kernel.h>
+#include <zephyr/pm/device.h>
+
+#include <string.h>
+
+#define DT_DRV_COMPAT nordic_nrf_lpcomp
+
+#define SHIM_NRF_LPCOMP_DT_INST_REFSEL(inst) \
+	_CONCAT(COMP_NRF_LPCOMP_REFSEL_, DT_INST_STRING_TOKEN(inst, refsel))
+
+#define SHIM_NRF_LPCOMP_DT_INST_REFSEL_IS_AREF(inst) \
+	DT_INST_ENUM_HAS_VALUE(inst, refsel, AREF)
+
+#define SHIM_NRF_LPCOMP_DT_INST_EXTREFSEL(inst) \
+	_CONCAT(COMP_NRF_LPCOMP_EXTREFSEL_, DT_INST_STRING_TOKEN(inst, extrefsel))
+
+#define SHIM_NRF_LPCOMP_DT_INST_ENABLE_HYST(inst) \
+	DT_INST_PROP(inst, enable_hyst)
+
+#define SHIM_NRF_LPCOMP_DT_INST_PSEL(inst) \
+	_CONCAT(COMP_NRF_LPCOMP_PSEL_, DT_INST_STRING_TOKEN(inst, psel))
+
+struct shim_nrf_lpcomp_data {
+	nrfx_lpcomp_config_t config;
+	uint32_t event_mask;
+	bool started;
+	atomic_t triggered;
+	comparator_callback_t callback;
+	void *user_data;
+};
+
+#if (NRF_LPCOMP_HAS_AIN_AS_PIN)
+static const uint32_t shim_nrf_lpcomp_ain_map[] = {
+#if defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280)
+	NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(1U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(2U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(3U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
+#elif defined(CONFIG_SOC_NRF54L15)
+	NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(11U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(12U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(13U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(14U, 1),
+#endif
+};
+#endif
+
+#if (NRF_LPCOMP_HAS_AIN_AS_PIN)
+BUILD_ASSERT(COMP_NRF_LPCOMP_PSEL_AIN0 == 0);
+BUILD_ASSERT(COMP_NRF_LPCOMP_PSEL_AIN7 == 7);
+BUILD_ASSERT(COMP_NRF_LPCOMP_EXTREFSEL_AIN0 == 0);
+BUILD_ASSERT(COMP_NRF_LPCOMP_EXTREFSEL_AIN1 == 1);
+#endif
+
+#if (LPCOMP_REFSEL_RESOLUTION == 8)
+BUILD_ASSERT((SHIM_NRF_LPCOMP_DT_INST_REFSEL(0) < COMP_NRF_LPCOMP_REFSEL_VDD_1_16) ||
+	     (SHIM_NRF_LPCOMP_DT_INST_REFSEL(0) > COMP_NRF_LPCOMP_REFSEL_VDD_15_16));
+#endif
+
+#if SHIM_NRF_LPCOMP_DT_INST_ENABLE_HYST(0)
+BUILD_ASSERT(NRF_LPCOMP_HAS_HYST);
+#endif
+
+static struct shim_nrf_lpcomp_data shim_nrf_lpcomp_data0;
+
+static const struct comp_nrf_lpcomp_config shim_nrf_lpcomp_config0 = {
+	.psel = SHIM_NRF_LPCOMP_DT_INST_PSEL(0),
+#if SHIM_NRF_LPCOMP_DT_INST_REFSEL_IS_AREF(0)
+	.extrefsel = SHIM_NRF_LPCOMP_DT_INST_EXTREFSEL(0),
+#endif
+	.refsel = SHIM_NRF_LPCOMP_DT_INST_REFSEL(0),
+	.enable_hyst = SHIM_NRF_LPCOMP_DT_INST_ENABLE_HYST(0),
+};
+
+#if CONFIG_PM_DEVICE
+static bool shim_nrf_lpcomp_is_resumed(void)
+{
+	enum pm_device_state state;
+
+	(void)pm_device_state_get(DEVICE_DT_INST_GET(0), &state);
+	return state == PM_DEVICE_STATE_ACTIVE;
+}
+#else
+static bool shim_nrf_lpcomp_is_resumed(void)
+{
+	return true;
+}
+#endif
+
+static void shim_nrf_lpcomp_start(void)
+{
+	if (shim_nrf_lpcomp_data0.started) {
+		return;
+	}
+
+	nrfx_lpcomp_start(shim_nrf_lpcomp_data0.event_mask, 0);
+	shim_nrf_lpcomp_data0.started = true;
+}
+
+static void shim_nrf_lpcomp_stop(void)
+{
+	if (!shim_nrf_lpcomp_data0.started) {
+		return;
+	}
+
+	nrfx_lpcomp_stop();
+	shim_nrf_lpcomp_data0.started = false;
+}
+
+static int shim_nrf_lpcomp_pm_callback(const struct device *dev, enum pm_device_action action)
+{
+	ARG_UNUSED(dev);
+
+	ARG_UNUSED(dev);
+
+	switch (action) {
+	case PM_DEVICE_ACTION_RESUME:
+		shim_nrf_lpcomp_start();
+		break;
+
+#if CONFIG_PM_DEVICE
+	case PM_DEVICE_ACTION_SUSPEND:
+		shim_nrf_lpcomp_stop();
+		break;
+#endif
+
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+#if (NRF_LPCOMP_HAS_AIN_AS_PIN)
+static int shim_nrf_lpcomp_psel_to_nrf(enum comp_nrf_lpcomp_psel shim,
+				       nrf_lpcomp_input_t *nrf)
+{
+	if (shim >= ARRAY_SIZE(shim_nrf_lpcomp_ain_map)) {
+		return -EINVAL;
+	}
+
+	*nrf = shim_nrf_lpcomp_ain_map[(uint32_t)shim];
+	return 0;
+}
+#else
+static int shim_nrf_lpcomp_psel_to_nrf(enum comp_nrf_lpcomp_psel shim,
+				       nrf_lpcomp_input_t *nrf)
+{
+	switch (shim) {
+	case COMP_NRF_LPCOMP_PSEL_AIN0:
+		*nrf = NRF_LPCOMP_INPUT_0;
+		break;
+
+	case COMP_NRF_LPCOMP_PSEL_AIN1:
+		*nrf = NRF_LPCOMP_INPUT_1;
+		break;
+
+	case COMP_NRF_LPCOMP_PSEL_AIN2:
+		*nrf = NRF_LPCOMP_INPUT_2;
+		break;
+
+	case COMP_NRF_LPCOMP_PSEL_AIN3:
+		*nrf = NRF_LPCOMP_INPUT_3;
+		break;
+
+	case COMP_NRF_LPCOMP_PSEL_AIN4:
+		*nrf = NRF_LPCOMP_INPUT_4;
+		break;
+
+	case COMP_NRF_LPCOMP_PSEL_AIN5:
+		*nrf = NRF_LPCOMP_INPUT_5;
+		break;
+
+	case COMP_NRF_LPCOMP_PSEL_AIN6:
+		*nrf = NRF_LPCOMP_INPUT_6;
+		break;
+
+	case COMP_NRF_LPCOMP_PSEL_AIN7:
+		*nrf = NRF_LPCOMP_INPUT_7;
+		break;
+
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+#endif
+
+#if (NRF_LPCOMP_HAS_AIN_AS_PIN)
+static int shim_nrf_lpcomp_extrefsel_to_nrf(enum comp_nrf_lpcomp_extrefsel shim,
+					    nrf_lpcomp_ext_ref_t *nrf)
+{
+	if (shim >= ARRAY_SIZE(shim_nrf_lpcomp_ain_map)) {
+		return -EINVAL;
+	}
+
+	*nrf = shim_nrf_lpcomp_ain_map[shim];
+	return 0;
+}
+#else
+static int shim_nrf_lpcomp_extrefsel_to_nrf(enum comp_nrf_lpcomp_extrefsel shim,
+					    nrf_lpcomp_ext_ref_t *nrf)
+{
+	switch (shim) {
+	case COMP_NRF_LPCOMP_EXTREFSEL_AIN0:
+		*nrf = NRF_LPCOMP_EXT_REF_REF0;
+		break;
+
+	case COMP_NRF_LPCOMP_EXTREFSEL_AIN1:
+		*nrf = NRF_LPCOMP_EXT_REF_REF1;
+		break;
+
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+#endif
+
+static int shim_nrf_lpcomp_refsel_to_nrf(enum comp_nrf_lpcomp_refsel shim,
+					 nrf_lpcomp_ref_t *nrf)
+{
+	switch (shim) {
+	case COMP_NRF_LPCOMP_REFSEL_VDD_1_8:
+		*nrf = NRF_LPCOMP_REF_SUPPLY_1_8;
+		break;
+
+	case COMP_NRF_LPCOMP_REFSEL_VDD_2_8:
+		*nrf = NRF_LPCOMP_REF_SUPPLY_2_8;
+		break;
+
+	case COMP_NRF_LPCOMP_REFSEL_VDD_3_8:
+		*nrf = NRF_LPCOMP_REF_SUPPLY_3_8;
+		break;
+
+	case COMP_NRF_LPCOMP_REFSEL_VDD_4_8:
+		*nrf = NRF_LPCOMP_REF_SUPPLY_4_8;
+		break;
+
+	case COMP_NRF_LPCOMP_REFSEL_VDD_5_8:
+		*nrf = NRF_LPCOMP_REF_SUPPLY_5_8;
+		break;
+
+	case COMP_NRF_LPCOMP_REFSEL_VDD_6_8:
+		*nrf = NRF_LPCOMP_REF_SUPPLY_6_8;
+		break;
+
+	case COMP_NRF_LPCOMP_REFSEL_VDD_7_8:
+		*nrf = NRF_LPCOMP_REF_SUPPLY_7_8;
+		break;
+
+#if (LPCOMP_REFSEL_RESOLUTION == 16)
+	case COMP_NRF_LPCOMP_REFSEL_VDD_1_16:
+		*nrf = NRF_LPCOMP_REF_SUPPLY_1_16;
+		break;
+
+	case COMP_NRF_LPCOMP_REFSEL_VDD_3_16:
+		*nrf = NRF_LPCOMP_REF_SUPPLY_3_16;
+		break;
+
+	case COMP_NRF_LPCOMP_REFSEL_VDD_5_16:
+		*nrf = NRF_LPCOMP_REF_SUPPLY_5_16;
+		break;
+
+	case COMP_NRF_LPCOMP_REFSEL_VDD_7_16:
+		*nrf = NRF_LPCOMP_REF_SUPPLY_7_16;
+		break;
+
+	case COMP_NRF_LPCOMP_REFSEL_VDD_9_16:
+		*nrf = NRF_LPCOMP_REF_SUPPLY_9_16;
+		break;
+
+	case COMP_NRF_LPCOMP_REFSEL_VDD_11_16:
+		*nrf = NRF_LPCOMP_REF_SUPPLY_11_16;
+		break;
+
+	case COMP_NRF_LPCOMP_REFSEL_VDD_13_16:
+		*nrf = NRF_LPCOMP_REF_SUPPLY_13_16;
+		break;
+
+	case COMP_NRF_LPCOMP_REFSEL_VDD_15_16:
+		*nrf = NRF_LPCOMP_REF_SUPPLY_15_16;
+		break;
+#endif
+
+	case COMP_NRF_LPCOMP_REFSEL_AREF:
+		*nrf = NRF_LPCOMP_REF_EXT_REF;
+		break;
+
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int shim_nrf_lpcomp_config_to_nrf(const struct comp_nrf_lpcomp_config *shim,
+					 nrfx_lpcomp_config_t *nrf)
+{
+	if (shim_nrf_lpcomp_refsel_to_nrf(shim->refsel, &nrf->reference)) {
+		return -EINVAL;
+	}
+
+	if (shim_nrf_lpcomp_extrefsel_to_nrf(shim->extrefsel, &nrf->ext_ref)) {
+		return -EINVAL;
+	}
+
+#if NRF_LPCOMP_HAS_HYST
+	if (shim->enable_hyst) {
+		nrf->hyst = NRF_LPCOMP_HYST_ENABLED;
+	} else {
+		nrf->hyst = NRF_LPCOMP_HYST_NOHYST;
+	}
+#else
+	if (shim->enable_hyst) {
+		return -EINVAL;
+	}
+#endif
+
+	if (shim_nrf_lpcomp_psel_to_nrf(shim->psel, &nrf->input)) {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static void shim_nrf_lpcomp_reconfigure(void)
+{
+	(void)nrfx_lpcomp_reconfigure(&shim_nrf_lpcomp_data0.config);
+}
+
+static int shim_nrf_lpcomp_get_output(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	return nrfx_lpcomp_sample();
+}
+
+static int shim_nrf_lpcomp_set_trigger(const struct device *dev,
+				       enum comparator_trigger trigger)
+{
+	shim_nrf_lpcomp_stop();
+
+	switch (trigger) {
+	case COMPARATOR_TRIGGER_NONE:
+		shim_nrf_lpcomp_data0.event_mask = 0;
+		shim_nrf_lpcomp_data0.config.detection = NRF_LPCOMP_DETECT_CROSS;
+		break;
+
+	case COMPARATOR_TRIGGER_RISING_EDGE:
+		shim_nrf_lpcomp_data0.event_mask = NRF_LPCOMP_INT_UP_MASK;
+		shim_nrf_lpcomp_data0.config.detection = NRF_LPCOMP_DETECT_UP;
+		break;
+
+	case COMPARATOR_TRIGGER_FALLING_EDGE:
+		shim_nrf_lpcomp_data0.event_mask = NRF_LPCOMP_INT_DOWN_MASK;
+		shim_nrf_lpcomp_data0.config.detection = NRF_LPCOMP_DETECT_DOWN;
+		break;
+
+	case COMPARATOR_TRIGGER_BOTH_EDGES:
+		shim_nrf_lpcomp_data0.event_mask = NRF_LPCOMP_INT_CROSS_MASK;
+		shim_nrf_lpcomp_data0.config.detection = NRF_LPCOMP_DETECT_CROSS;
+		break;
+	}
+
+	shim_nrf_lpcomp_reconfigure();
+
+	if (shim_nrf_lpcomp_is_resumed()) {
+		shim_nrf_lpcomp_start();
+	}
+
+	return 0;
+}
+
+static int shim_nrf_lpcomp_set_trigger_callback(const struct device *dev,
+						comparator_callback_t callback,
+						void *user_data)
+{
+	shim_nrf_lpcomp_stop();
+
+	shim_nrf_lpcomp_data0.callback = callback;
+	shim_nrf_lpcomp_data0.user_data = user_data;
+
+	if (callback != NULL && atomic_test_and_clear_bit(&shim_nrf_lpcomp_data0.triggered, 0)) {
+		callback(dev, user_data);
+	}
+
+	if (shim_nrf_lpcomp_is_resumed()) {
+		shim_nrf_lpcomp_start();
+	}
+
+	return 0;
+}
+
+static int shim_nrf_lpcomp_trigger_is_pending(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	return atomic_test_and_clear_bit(&shim_nrf_lpcomp_data0.triggered, 0);
+}
+
+static const struct comparator_driver_api shim_nrf_lpcomp_api = {
+	.get_output = shim_nrf_lpcomp_get_output,
+	.set_trigger = shim_nrf_lpcomp_set_trigger,
+	.set_trigger_callback = shim_nrf_lpcomp_set_trigger_callback,
+	.trigger_is_pending = shim_nrf_lpcomp_trigger_is_pending,
+};
+
+int comp_nrf_lpcomp_configure(const struct device *dev,
+			      const struct comp_nrf_lpcomp_config *config)
+{
+	nrfx_lpcomp_config_t nrf = {};
+
+	if (shim_nrf_lpcomp_config_to_nrf(config, &nrf)) {
+		return -EINVAL;
+	}
+
+	memcpy(&shim_nrf_lpcomp_data0.config, &nrf, sizeof(shim_nrf_lpcomp_data0.config));
+
+	shim_nrf_lpcomp_stop();
+	shim_nrf_lpcomp_reconfigure();
+	if (shim_nrf_lpcomp_is_resumed()) {
+		shim_nrf_lpcomp_start();
+	}
+
+	return 0;
+}
+
+static void shim_nrf_lpcomp_event_handler(nrf_lpcomp_event_t event)
+{
+	ARG_UNUSED(event);
+
+	if (shim_nrf_lpcomp_data0.callback == NULL) {
+		atomic_set_bit(&shim_nrf_lpcomp_data0.triggered, 0);
+		return;
+	}
+
+	shim_nrf_lpcomp_data0.callback(DEVICE_DT_INST_GET(0), shim_nrf_lpcomp_data0.user_data);
+	atomic_clear_bit(&shim_nrf_lpcomp_data0.triggered, 0);
+}
+
+static int shim_nrf_lpcomp_init(const struct device *dev)
+{
+	IRQ_CONNECT(DT_INST_IRQN(0),
+		    DT_INST_IRQ(0, priority),
+		    nrfx_isr,
+		    nrfx_lpcomp_irq_handler,
+		    0);
+
+	irq_enable(DT_INST_IRQN(0));
+
+	(void)shim_nrf_lpcomp_config_to_nrf(&shim_nrf_lpcomp_config0,
+					    &shim_nrf_lpcomp_data0.config);
+
+	if (nrfx_lpcomp_init(&shim_nrf_lpcomp_data0.config,
+			     shim_nrf_lpcomp_event_handler) != NRFX_SUCCESS) {
+		return -ENODEV;
+	}
+
+	return pm_device_driver_init(dev, shim_nrf_lpcomp_pm_callback);
+}
+
+PM_DEVICE_DT_INST_DEFINE(0, shim_nrf_lpcomp_pm_callback);
+
+DEVICE_DT_INST_DEFINE(0,
+		      shim_nrf_lpcomp_init,
+		      PM_DEVICE_DT_INST_GET(0),
+		      NULL,
+		      NULL,
+		      POST_KERNEL,
+		      CONFIG_COMPARATOR_INIT_PRIORITY,
+		      &shim_nrf_lpcomp_api);
diff --git a/dts/bindings/comparator/nordic,nrf-lpcomp.yaml b/dts/bindings/comparator/nordic,nrf-lpcomp.yaml
new file mode 100644
index 00000000000..8f9cd91a6b7
--- /dev/null
+++ b/dts/bindings/comparator/nordic,nrf-lpcomp.yaml
@@ -0,0 +1,83 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  Nordic nRF LPCOMP (analog Low-Power COMParator)
+
+  The following example displays the minimum node layout:
+
+    comp: comp@deadbeef {
+            compatible = "nordic,nrf-lpcomp";
+            reg = <0xdeadbeef 0x1000>;
+            interrupts = <0 NRF_DEFAULT_IRQ_PRIORITY>;
+            status = "disabled";
+    };
+
+  Enabling the comparator node requires setting the default
+  configuration of the comparator.
+
+  The following example displays enabling the comparator
+  using an internal reference:
+
+    &comp {
+            status = "okay";
+            psel = "AIN0";
+            refsel = "VDD_4_8";
+            hyst = "ENABLED";
+    };
+
+  To select an external reference, select the "AREF"
+  reference and add the external reference:
+
+    &comp {
+            ...
+            refsel = "AREF";
+            extrefsel = "AIN1";
+            ...
+    };
+
+compatible: "nordic,nrf-lpcomp"
+
+include: base.yaml
+
+properties:
+  psel:
+    type: string
+    enum:
+      - "AIN0"
+      - "AIN1"
+      - "AIN2"
+      - "AIN3"
+      - "AIN4"
+      - "AIN5"
+      - "AIN6"
+      - "AIN7"
+
+  extrefsel:
+    type: string
+    enum:
+      - "AIN0"
+      - "AIN1"
+
+  refsel:
+    type: string
+    enum:
+      - "VDD_1_8"
+      - "VDD_2_8"
+      - "VDD_3_8"
+      - "VDD_4_8"
+      - "VDD_5_8"
+      - "VDD_6_8"
+      - "VDD_7_8"
+      - "VDD_1_16"
+      - "VDD_3_16"
+      - "VDD_5_16"
+      - "VDD_7_16"
+      - "VDD_9_16"
+      - "VDD_11_16"
+      - "VDD_13_16"
+      - "VDD_15_16"
+      - "AREF"
+
+  enable-hyst:
+    type: boolean
diff --git a/dts/bindings/sensor/nordic,nrf-lpcomp.yaml b/dts/bindings/sensor/nordic,nrf-lpcomp.yaml
deleted file mode 100644
index 132b0980ac5..00000000000
--- a/dts/bindings/sensor/nordic,nrf-lpcomp.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2022, Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: Nordic nRF family LPCOMP (Low-power Comparator)
-
-compatible: "nordic,nrf-lpcomp"
-
-include: base.yaml
-
-properties:
-  reg:
-    required: true
-
-  interrupts:
-    required: true
-
-  "#io-channel-cells":
-    type: int
-    const: 1
-    required: true
-
-io-channel-cells:
-  - input
diff --git a/include/zephyr/drivers/comparator/nrf_lpcomp.h b/include/zephyr/drivers/comparator/nrf_lpcomp.h
new file mode 100644
index 00000000000..e1f2343a8de
--- /dev/null
+++ b/include/zephyr/drivers/comparator/nrf_lpcomp.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_COMP_NRF_LPCOMP_H_
+#define ZEPHYR_INCLUDE_DRIVERS_COMP_NRF_LPCOMP_H_
+
+#include <zephyr/drivers/comparator.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Positive input selection */
+enum comp_nrf_lpcomp_psel {
+	/** AIN0 external input */
+	COMP_NRF_LPCOMP_PSEL_AIN0,
+	/** AIN1 external input */
+	COMP_NRF_LPCOMP_PSEL_AIN1,
+	/** AIN2 external input */
+	COMP_NRF_LPCOMP_PSEL_AIN2,
+	/** AIN3 external input */
+	COMP_NRF_LPCOMP_PSEL_AIN3,
+	/** AIN4 external input */
+	COMP_NRF_LPCOMP_PSEL_AIN4,
+	/** AIN5 external input */
+	COMP_NRF_LPCOMP_PSEL_AIN5,
+	/** AIN6 external input */
+	COMP_NRF_LPCOMP_PSEL_AIN6,
+	/** AIN7 external input */
+	COMP_NRF_LPCOMP_PSEL_AIN7,
+};
+
+/** External reference selection */
+enum comp_nrf_lpcomp_extrefsel {
+	/** AIN0 external input */
+	COMP_NRF_LPCOMP_EXTREFSEL_AIN0,
+	/** AIN1 external input */
+	COMP_NRF_LPCOMP_EXTREFSEL_AIN1,
+};
+
+/** Reference selection */
+enum comp_nrf_lpcomp_refsel {
+	/** Use (VDD * (1/8)) as reference */
+	COMP_NRF_LPCOMP_REFSEL_VDD_1_8,
+	/** Use (VDD * (2/8)) as reference */
+	COMP_NRF_LPCOMP_REFSEL_VDD_2_8,
+	/** Use (VDD * (3/8)) as reference */
+	COMP_NRF_LPCOMP_REFSEL_VDD_3_8,
+	/** Use (VDD * (4/8)) as reference */
+	COMP_NRF_LPCOMP_REFSEL_VDD_4_8,
+	/** Use (VDD * (5/8)) as reference */
+	COMP_NRF_LPCOMP_REFSEL_VDD_5_8,
+	/** Use (VDD * (6/8)) as reference */
+	COMP_NRF_LPCOMP_REFSEL_VDD_6_8,
+	/** Use (VDD * (7/8)) as reference */
+	COMP_NRF_LPCOMP_REFSEL_VDD_7_8,
+	/** Use (VDD * (1/16)) as reference */
+	COMP_NRF_LPCOMP_REFSEL_VDD_1_16,
+	/** Use (VDD * (3/16)) as reference */
+	COMP_NRF_LPCOMP_REFSEL_VDD_3_16,
+	/** Use (VDD * (5/16)) as reference */
+	COMP_NRF_LPCOMP_REFSEL_VDD_5_16,
+	/** Use (VDD * (7/16)) as reference */
+	COMP_NRF_LPCOMP_REFSEL_VDD_7_16,
+	/** Use (VDD * (9/16)) as reference */
+	COMP_NRF_LPCOMP_REFSEL_VDD_9_16,
+	/** Use (VDD * (11/16)) as reference */
+	COMP_NRF_LPCOMP_REFSEL_VDD_11_16,
+	/** Use (VDD * (13/16)) as reference */
+	COMP_NRF_LPCOMP_REFSEL_VDD_13_16,
+	/** Use (VDD * (15/16)) as reference */
+	COMP_NRF_LPCOMP_REFSEL_VDD_15_16,
+	/** Use external analog reference */
+	COMP_NRF_LPCOMP_REFSEL_AREF,
+};
+
+/**
+ * @brief Configuration structure
+ *
+ * @note extrefsel is only used if refsel == COMP_NRF_LPCOMP_REFSEL_AREF
+ */
+struct comp_nrf_lpcomp_config {
+	/** Positive input selection */
+	enum comp_nrf_lpcomp_psel psel;
+	/** External reference selection */
+	enum comp_nrf_lpcomp_extrefsel extrefsel;
+	/** Reference selection */
+	enum comp_nrf_lpcomp_refsel refsel;
+	/** Hysteresis configuration */
+	bool enable_hyst;
+};
+
+/**
+ * @brief Configure comparator
+ *
+ * @param dev Comparator device instance
+ * @param config Configuration
+ *
+ * @retval 0 if successful
+ * @retval negative errno-code otherwise
+ */
+int comp_nrf_lpcomp_configure(const struct device *dev,
+			      const struct comp_nrf_lpcomp_config *config);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_COMP_NRF_LPCOMP_H_ */

From ffb82a2d7b8742b18fcb13dda5208cb6882e36f2 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Wed, 4 Sep 2024 11:52:51 +0200
Subject: [PATCH 0508/2913] [nrf fromtree] tests: drivers: build_all:
 comparator: add nrf_lpcomp

Add nrf_lpcomp to build_all comparator test suite.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit a4fce338acc1cc183177f98d2e8243ed0f4493a3)
(cherry picked from commit 2badeca4fdc01e73cec648909759a93aaace6b65)
---
 .../comparator/nrf_lpcomp/ext_ref.overlay     | 12 +++++++++++
 .../comparator/nrf_lpcomp/int_ref.overlay     | 13 ++++++++++++
 .../build_all/comparator/testcase.yaml        | 20 +++++++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 tests/drivers/build_all/comparator/nrf_lpcomp/ext_ref.overlay
 create mode 100644 tests/drivers/build_all/comparator/nrf_lpcomp/int_ref.overlay

diff --git a/tests/drivers/build_all/comparator/nrf_lpcomp/ext_ref.overlay b/tests/drivers/build_all/comparator/nrf_lpcomp/ext_ref.overlay
new file mode 100644
index 00000000000..95e44fbed3d
--- /dev/null
+++ b/tests/drivers/build_all/comparator/nrf_lpcomp/ext_ref.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&comp {
+	compatible = "nordic,nrf-lpcomp";
+	psel = "AIN0";
+	refsel = "VDD_4_8";
+	status = "okay";
+};
diff --git a/tests/drivers/build_all/comparator/nrf_lpcomp/int_ref.overlay b/tests/drivers/build_all/comparator/nrf_lpcomp/int_ref.overlay
new file mode 100644
index 00000000000..7aadd8b3fae
--- /dev/null
+++ b/tests/drivers/build_all/comparator/nrf_lpcomp/int_ref.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&comp {
+	compatible = "nordic,nrf-lpcomp";
+	psel = "AIN0";
+	refsel = "AREF";
+	extrefsel = "AIN1";
+	status = "okay";
+};
diff --git a/tests/drivers/build_all/comparator/testcase.yaml b/tests/drivers/build_all/comparator/testcase.yaml
index 9c94ef9a69e..8dbc9dfb32a 100644
--- a/tests/drivers/build_all/comparator/testcase.yaml
+++ b/tests/drivers/build_all/comparator/testcase.yaml
@@ -46,3 +46,23 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf9280pdk/nrf9280/cpuapp
+  drivers.build_all.comparator.nrf_lpcomp.ext_ref:
+    extra_args:
+      - DTC_OVERLAY_FILE="nrf_lpcomp/ext_ref.overlay"
+    platform_allow:
+      - nrf51dk/nrf51822
+      - nrf52dk/nrf52832
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf9280pdk/nrf9280/cpuapp
+  drivers.build_all.comparator.nrf_lpcomp.int_ref:
+    extra_args:
+      - DTC_OVERLAY_FILE="nrf_lpcomp/int_ref.overlay"
+    platform_allow:
+      - nrf51dk/nrf51822
+      - nrf52dk/nrf52832
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf9280pdk/nrf9280/cpuapp

From 4eff80882c0abe8c8b81831e0a76b55c11c370d7 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Mon, 19 Aug 2024 13:03:10 +0200
Subject: [PATCH 0509/2913] [nrf fromtree] sensor: mcux_acmp: namespace driver
 and kconfigs

The mcux_acmp will get support by the comparator subsystem. To avoid
namespace clashes, namespace the driver, kconfigs and use the
MCUX_ACMP config solely to select the MCUX SDK driver.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit e0363f252d09acd907c92bfc112d69ff3919587c)
(cherry picked from commit 67c448a615ad40b31519ec1700df7cf5106ded9f)
---
 drivers/sensor/nxp/CMakeLists.txt        |  2 +-
 drivers/sensor/nxp/mcux_acmp/Kconfig     |  7 ++++---
 drivers/sensor/nxp/mcux_acmp/mcux_acmp.c | 26 ++++++++++++------------
 modules/hal_nxp/Kconfig                  |  3 ++-
 samples/sensor/mcux_acmp/prj.conf        |  2 +-
 samples/sensor/mcux_acmp/sample.yaml     |  2 +-
 6 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/drivers/sensor/nxp/CMakeLists.txt b/drivers/sensor/nxp/CMakeLists.txt
index 73dc2cb274b..36e39e002bf 100644
--- a/drivers/sensor/nxp/CMakeLists.txt
+++ b/drivers/sensor/nxp/CMakeLists.txt
@@ -5,10 +5,10 @@
 add_subdirectory_ifdef(CONFIG_FXAS21002 fxas21002)
 add_subdirectory_ifdef(CONFIG_FXLS8974 fxls8974)
 add_subdirectory_ifdef(CONFIG_FXOS8700 fxos8700)
-add_subdirectory_ifdef(CONFIG_MCUX_ACMP mcux_acmp)
 add_subdirectory_ifdef(CONFIG_MCUX_LPCMP mcux_lpcmp)
 add_subdirectory_ifdef(CONFIG_NXP_TEMPMON nxp_tempmon)
 add_subdirectory_ifdef(CONFIG_QDEC_MCUX qdec_mcux)
 add_subdirectory_ifdef(CONFIG_QDEC_NXP_S32 qdec_nxp_s32)
+add_subdirectory_ifdef(CONFIG_SENSOR_MCUX_ACMP mcux_acmp)
 add_subdirectory_ifdef(CONFIG_TEMP_KINETIS nxp_kinetis_temp)
 # zephyr-keep-sorted-stop
diff --git a/drivers/sensor/nxp/mcux_acmp/Kconfig b/drivers/sensor/nxp/mcux_acmp/Kconfig
index 0f976c65e21..1934e4d93f7 100644
--- a/drivers/sensor/nxp/mcux_acmp/Kconfig
+++ b/drivers/sensor/nxp/mcux_acmp/Kconfig
@@ -4,17 +4,18 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-config MCUX_ACMP
+config SENSOR_MCUX_ACMP
 	bool "NXP MCUX Analog Comparator (ACMP)"
 	default y
 	depends on DT_HAS_NXP_KINETIS_ACMP_ENABLED
 	select PINCTRL
+	select MCUX_ACMP
 	help
 	  Enable driver for the NXP MCUX Analog Comparator (ACMP).
 
-config MCUX_ACMP_TRIGGER
+config SENSOR_MCUX_ACMP_TRIGGER
 	bool "Trigger support"
-	depends on MCUX_ACMP
+	depends on SENSOR_MCUX_ACMP
 	help
 	  Enable trigger support for the NXP MCUX Analog Comparator
 	  (ACMP).
diff --git a/drivers/sensor/nxp/mcux_acmp/mcux_acmp.c b/drivers/sensor/nxp/mcux_acmp/mcux_acmp.c
index 30339f3e48d..69c01c3a5ff 100644
--- a/drivers/sensor/nxp/mcux_acmp/mcux_acmp.c
+++ b/drivers/sensor/nxp/mcux_acmp/mcux_acmp.c
@@ -45,9 +45,9 @@ struct mcux_acmp_config {
 	CMP_Type *base;
 	acmp_filter_config_t filter;
 	const struct pinctrl_dev_config *pincfg;
-#ifdef CONFIG_MCUX_ACMP_TRIGGER
+#ifdef CONFIG_SENSOR_MCUX_ACMP_TRIGGER
 	void (*irq_config_func)(const struct device *dev);
-#endif /* CONFIG_MCUX_ACMP_TRIGGER */
+#endif /* CONFIG_SENSOR_MCUX_ACMP_TRIGGER */
 	bool high_speed : 1;
 	bool unfiltered : 1;
 	bool output : 1;
@@ -61,7 +61,7 @@ struct mcux_acmp_data {
 #if MCUX_ACMP_HAS_DISCRETE_MODE
 	acmp_discrete_mode_config_t discrete_config;
 #endif
-#ifdef CONFIG_MCUX_ACMP_TRIGGER
+#ifdef CONFIG_SENSOR_MCUX_ACMP_TRIGGER
 	const struct device *dev;
 	sensor_trigger_handler_t rising_handler;
 	const struct sensor_trigger *rising_trigger;
@@ -69,7 +69,7 @@ struct mcux_acmp_data {
 	const struct sensor_trigger *falling_trigger;
 	struct k_work work;
 	volatile uint32_t status;
-#endif /* CONFIG_MCUX_ACMP_TRIGGER */
+#endif /* CONFIG_SENSOR_MCUX_ACMP_TRIGGER */
 	bool cout;
 };
 
@@ -370,7 +370,7 @@ static int mcux_acmp_channel_get(const struct device *dev,
 	return 0;
 }
 
-#ifdef CONFIG_MCUX_ACMP_TRIGGER
+#ifdef CONFIG_SENSOR_MCUX_ACMP_TRIGGER
 static int mcux_acmp_trigger_set(const struct device *dev,
 				 const struct sensor_trigger *trig,
 				 sensor_trigger_handler_t handler)
@@ -431,7 +431,7 @@ static void mcux_acmp_isr(const struct device *dev)
 
 	k_work_submit(&data->work);
 }
-#endif /* CONFIG_MCUX_ACMP_TRIGGER */
+#endif /* CONFIG_SENSOR_MCUX_ACMP_TRIGGER */
 
 static int mcux_acmp_init(const struct device *dev)
 {
@@ -462,7 +462,7 @@ static int mcux_acmp_init(const struct device *dev)
 	/* Disable DAC */
 	ACMP_SetDACConfig(config->base, NULL);
 
-#ifdef CONFIG_MCUX_ACMP_TRIGGER
+#ifdef CONFIG_SENSOR_MCUX_ACMP_TRIGGER
 	data->dev = dev;
 	k_work_init(&data->work, mcux_acmp_trigger_work_handler);
 
@@ -470,7 +470,7 @@ static int mcux_acmp_init(const struct device *dev)
 	ACMP_EnableInterrupts(config->base,
 			      kACMP_OutputRisingInterruptEnable |
 			      kACMP_OutputFallingInterruptEnable);
-#endif /* CONFIG_MCUX_ACMP_TRIGGER */
+#endif /* CONFIG_SENSOR_MCUX_ACMP_TRIGGER */
 
 	ACMP_Enable(config->base, true);
 
@@ -480,9 +480,9 @@ static int mcux_acmp_init(const struct device *dev)
 static const struct sensor_driver_api mcux_acmp_driver_api = {
 	.attr_set = mcux_acmp_attr_set,
 	.attr_get = mcux_acmp_attr_get,
-#ifdef CONFIG_MCUX_ACMP_TRIGGER
+#ifdef CONFIG_SENSOR_MCUX_ACMP_TRIGGER
 	.trigger_set = mcux_acmp_trigger_set,
-#endif /* CONFIG_MCUX_ACMP_TRIGGER */
+#endif /* CONFIG_SENSOR_MCUX_ACMP_TRIGGER */
 	.sample_fetch = mcux_acmp_sample_fetch,
 	.channel_get = mcux_acmp_channel_get,
 };
@@ -503,7 +503,7 @@ static const struct mcux_acmp_config mcux_acmp_config_##n = {		\
 	config_func_init						\
 }
 
-#ifdef CONFIG_MCUX_ACMP_TRIGGER
+#ifdef CONFIG_SENSOR_MCUX_ACMP_TRIGGER
 #define MCUX_ACMP_CONFIG_FUNC(n)					\
 	static void mcux_acmp_config_func_##n(const struct device *dev) \
 	{								\
@@ -517,12 +517,12 @@ static const struct mcux_acmp_config mcux_acmp_config_##n = {		\
 	.irq_config_func = mcux_acmp_config_func_##n
 #define MCUX_ACMP_INIT_CONFIG(n)					\
 	MCUX_ACMP_DECLARE_CONFIG(n, MCUX_ACMP_CONFIG_FUNC_INIT(n))
-#else /* !CONFIG_MCUX_ACMP_TRIGGER */
+#else /* !CONFIG_SENSOR_MCUX_ACMP_TRIGGER */
 #define MCUX_ACMP_CONFIG_FUNC(n)
 #define MCUX_ACMP_CONFIG_FUNC_INIT
 #define MCUX_ACMP_INIT_CONFIG(n)					\
 	MCUX_ACMP_DECLARE_CONFIG(n, MCUX_ACMP_CONFIG_FUNC_INIT)
-#endif /* !CONFIG_MCUX_ACMP_TRIGGER */
+#endif /* !CONFIG_SENSOR_MCUX_ACMP_TRIGGER */
 
 #define MCUX_ACMP_INIT(n)						\
 	static struct mcux_acmp_data mcux_acmp_data_##n;		\
diff --git a/modules/hal_nxp/Kconfig b/modules/hal_nxp/Kconfig
index aaec4e84aba..4f055faa07d 100644
--- a/modules/hal_nxp/Kconfig
+++ b/modules/hal_nxp/Kconfig
@@ -4,4 +4,5 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# file is empty and kept as a place holder if/when Kconfig is needed
+config MCUX_ACMP
+	bool "Include ACMP driver from MCUX SDK"
diff --git a/samples/sensor/mcux_acmp/prj.conf b/samples/sensor/mcux_acmp/prj.conf
index 8b70c7ae30b..202fe6b8564 100644
--- a/samples/sensor/mcux_acmp/prj.conf
+++ b/samples/sensor/mcux_acmp/prj.conf
@@ -1,2 +1,2 @@
 CONFIG_SENSOR=y
-CONFIG_MCUX_ACMP_TRIGGER=y
+CONFIG_SENSOR_MCUX_ACMP_TRIGGER=y
diff --git a/samples/sensor/mcux_acmp/sample.yaml b/samples/sensor/mcux_acmp/sample.yaml
index fa7782d896d..a00773fdbb6 100644
--- a/samples/sensor/mcux_acmp/sample.yaml
+++ b/samples/sensor/mcux_acmp/sample.yaml
@@ -27,4 +27,4 @@ tests:
   sample.sensor.mcux_acmp.no_trigger:
     build_only: true
     extra_configs:
-      - CONFIG_MCUX_ACMP_TRIGGER=n
+      - CONFIG_SENSOR_MCUX_ACMP_TRIGGER=n

From 8591383f08744958cc554bad4f688d580441b20a Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Wed, 18 Sep 2024 13:13:45 +0200
Subject: [PATCH 0510/2913] [nrf fromtree] drivers: sensor: mcux_acmp: update
 dts binding and adapt driver

Update the devicetree binding for the nxp,kinetis-acmp comparator and
move the binding to dts/bindings/comparator.

The update to the binding includes:
- Remove unused io-channel-cells property
- Remove unused sensor-device include
- Adding missing properties dac config, discrete mode config, and
  input configs.
- Rename properties to exclude redundant vendor prefix since props in
  this binding are not inhereted, and as such, don't need to be
  namespaced.
- Deprecate the old names of the renamed properties

The sensor based device driver has been updated to support both the
deprecated and new property names. This allows it to use both
nxp,enable-sample and filter-enable-sample for example.

Additionally, remove the unused io-channel-cells properties from
in-tree nodes of compatible = "nxp,kinetis-acmp"

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 4e55597527a4becf61ee35d38cd8e451f488c391)
(cherry picked from commit bee7df84c97cc4326b13d32c87cb2ad947c2eaed)
---
 drivers/sensor/nxp/mcux_acmp/mcux_acmp.c      |  59 +++++-
 dts/arm/nxp/nxp_ke1xf.dtsi                    |   3 -
 dts/arm/nxp/nxp_ke1xz.dtsi                    |   1 -
 dts/arm/nxp/nxp_rt118x.dtsi                   |   4 -
 dts/arm/nxp/nxp_rt11xx.dtsi                   |   4 -
 dts/bindings/comparator/nxp,kinetis-acmp.yaml | 195 ++++++++++++++++++
 dts/bindings/sensor/nxp,kinetis-acmp.yaml     |  58 ------
 7 files changed, 246 insertions(+), 78 deletions(-)
 create mode 100644 dts/bindings/comparator/nxp,kinetis-acmp.yaml
 delete mode 100644 dts/bindings/sensor/nxp,kinetis-acmp.yaml

diff --git a/drivers/sensor/nxp/mcux_acmp/mcux_acmp.c b/drivers/sensor/nxp/mcux_acmp/mcux_acmp.c
index 69c01c3a5ff..90dde17e83c 100644
--- a/drivers/sensor/nxp/mcux_acmp/mcux_acmp.c
+++ b/drivers/sensor/nxp/mcux_acmp/mcux_acmp.c
@@ -41,6 +41,49 @@ BUILD_ASSERT(kACMP_PortInputFromDAC == 0);
 BUILD_ASSERT(kACMP_PortInputFromMux == 1);
 #endif /* MCUX_ACMP_HAS_INPSEL || MCUX_ACMP_HAS_INNSEL */
 
+/*
+ * prop New property name
+ * depr Deprecated property name
+ */
+#define MCUX_ACMP_DT_INST_PROP(inst, prop, depr)						\
+	COND_CODE_1(										\
+		DT_INST_NODE_HAS_PROP(inst, prop),						\
+		(DT_INST_PROP(inst, prop)),							\
+		(DT_INST_PROP(inst, depr))							\
+	)
+
+/*
+ * prop New property name
+ * depr Deprecated property name
+ */
+#define MCUX_ACMP_DT_INST_PROP_OR(inst, prop, depr, default_value)				\
+	COND_CODE_1(										\
+		DT_INST_NODE_HAS_PROP(inst, prop) || DT_INST_NODE_HAS_PROP(inst, depr),		\
+		(MCUX_ACMP_DT_INST_PROP(inst, prop, depr)),					\
+		(default_value)									\
+	)
+
+#define MCUX_ACMP_DT_INST_ENABLE_SAMPLE(inst) \
+	MCUX_ACMP_DT_INST_PROP(inst, filter_enable_sample, nxp_enable_sample)
+
+#define MCUX_ACMP_DT_INST_FILTER_COUNT(inst) \
+	MCUX_ACMP_DT_INST_PROP_OR(inst, filter_count, nxp_filter_count, 0)
+
+#define MCUX_ACMP_DT_INST_FILTER_PERIOD(inst) \
+	MCUX_ACMP_DT_INST_PROP_OR(inst, filter_period, nxp_filter_period, 0)
+
+#define MCUX_ACMP_DT_INST_HIGH_SPEED(inst) \
+	MCUX_ACMP_DT_INST_PROP(inst, enable_high_speed_mode, nxp_high_speed_mode)
+
+#define MCUX_ACMP_DT_INST_USE_UNFILTERED_MODE(inst) \
+	MCUX_ACMP_DT_INST_PROP(inst, use_unfiltered_output, nxp_use_unfiltered_output)
+
+#define MCUX_ACMP_DT_INST_USE_ENABLE_PIN_OUT(inst) \
+	MCUX_ACMP_DT_INST_PROP(inst, enable_pin_out, nxp_enable_output_pin)
+
+#define MCUX_ACMP_DT_INST_ENABLE_WINDOW_MODE(inst) \
+	MCUX_ACMP_DT_INST_PROP(inst, enable_window_mode, nxp_window_mode)
+
 struct mcux_acmp_config {
 	CMP_Type *base;
 	acmp_filter_config_t filter;
@@ -487,18 +530,18 @@ static const struct sensor_driver_api mcux_acmp_driver_api = {
 	.channel_get = mcux_acmp_channel_get,
 };
 
-#define MCUX_ACMP_DECLARE_CONFIG(n, config_func_init)	\
+#define MCUX_ACMP_DECLARE_CONFIG(n, config_func_init)			\
 static const struct mcux_acmp_config mcux_acmp_config_##n = {		\
 	.base = (CMP_Type *)DT_INST_REG_ADDR(n),			\
 	.filter = {							\
-		.enableSample = DT_INST_PROP(n, nxp_enable_sample),	\
-		.filterCount = DT_INST_PROP_OR(n, nxp_filter_count, 0), \
-		.filterPeriod = DT_INST_PROP_OR(n, nxp_filter_period, 0), \
+		.enableSample = MCUX_ACMP_DT_INST_ENABLE_SAMPLE(n),	\
+		.filterCount = MCUX_ACMP_DT_INST_FILTER_COUNT(n),	\
+		.filterPeriod = MCUX_ACMP_DT_INST_FILTER_PERIOD(n),	\
 	},								\
-	.high_speed = DT_INST_PROP(n, nxp_high_speed_mode),		\
-	.unfiltered = DT_INST_PROP(n, nxp_use_unfiltered_output),	\
-	.output = DT_INST_PROP(n, nxp_enable_output_pin),		\
-	.window = DT_INST_PROP(n, nxp_window_mode),			\
+	.high_speed = MCUX_ACMP_DT_INST_HIGH_SPEED(n),			\
+	.unfiltered = MCUX_ACMP_DT_INST_USE_UNFILTERED_MODE(n),		\
+	.output = MCUX_ACMP_DT_INST_USE_ENABLE_PIN_OUT(n),		\
+	.window = MCUX_ACMP_DT_INST_ENABLE_WINDOW_MODE(n),		\
 	.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),			\
 	config_func_init						\
 }
diff --git a/dts/arm/nxp/nxp_ke1xf.dtsi b/dts/arm/nxp/nxp_ke1xf.dtsi
index 6aff4315889..8c880c06daf 100644
--- a/dts/arm/nxp/nxp_ke1xf.dtsi
+++ b/dts/arm/nxp/nxp_ke1xf.dtsi
@@ -575,7 +575,6 @@
 			interrupts = <40 0>;
 			clocks = <&scg KINETIS_SCG_BUS_CLK>;
 			status = "disabled";
-			#io-channel-cells = <2>;
 		};
 
 		cmp1: cmp@40074000 {
@@ -584,7 +583,6 @@
 			interrupts = <41 0>;
 			clocks = <&scg KINETIS_SCG_BUS_CLK>;
 			status = "disabled";
-			#io-channel-cells = <2>;
 		};
 
 		cmp2: cmp@40075000 {
@@ -593,7 +591,6 @@
 			interrupts = <70 0>;
 			clocks = <&scg KINETIS_SCG_BUS_CLK>;
 			status = "disabled";
-			#io-channel-cells = <2>;
 		};
 
 		flexio1: flexio@4005a000 {
diff --git a/dts/arm/nxp/nxp_ke1xz.dtsi b/dts/arm/nxp/nxp_ke1xz.dtsi
index 577f0e894fe..8e34d564845 100644
--- a/dts/arm/nxp/nxp_ke1xz.dtsi
+++ b/dts/arm/nxp/nxp_ke1xz.dtsi
@@ -419,7 +419,6 @@
 			interrupts = <16 0>;
 			clocks = <&scg KINETIS_SCG_BUS_CLK>;
 			status = "disabled";
-			#io-channel-cells = <2>;
 		};
 
 		lpspi0: spi@4002c000 {
diff --git a/dts/arm/nxp/nxp_rt118x.dtsi b/dts/arm/nxp/nxp_rt118x.dtsi
index b0f7c5e078a..4bb645e8979 100644
--- a/dts/arm/nxp/nxp_rt118x.dtsi
+++ b/dts/arm/nxp/nxp_rt118x.dtsi
@@ -299,7 +299,6 @@
 		reg = <0x2dc0000 0x4000>;
 		interrupts = <200 0>;
 		status = "disabled";
-		#io-channel-cells = <2>;
 	};
 
 	acmp2: cmp@2dd0000 {
@@ -307,7 +306,6 @@
 		reg = <0x2dd0000 0x4000>;
 		interrupts = <201 0>;
 		status = "disabled";
-		#io-channel-cells = <2>;
 	};
 
 	acmp3: cmp@2de0000 {
@@ -315,7 +313,6 @@
 		reg = <0x2de0000 0x4000>;
 		interrupts = <202 0>;
 		status = "disabled";
-		#io-channel-cells = <2>;
 	};
 
 	acmp4: cmp@2df0000 {
@@ -323,7 +320,6 @@
 		reg = <0x2df0000 0x4000>;
 		interrupts = <203 0>;
 		status = "disabled";
-		#io-channel-cells = <2>;
 	};
 };
 
diff --git a/dts/arm/nxp/nxp_rt11xx.dtsi b/dts/arm/nxp/nxp_rt11xx.dtsi
index 6e3644f58fa..5dd41ed398b 100644
--- a/dts/arm/nxp/nxp_rt11xx.dtsi
+++ b/dts/arm/nxp/nxp_rt11xx.dtsi
@@ -1011,7 +1011,6 @@
 			reg = <0x401a4000 0x4000>;
 			interrupts = <157 0>;
 			status = "disabled";
-			#io-channel-cells = <2>;
 		};
 
 		acmp2: cmp@401a8000 {
@@ -1019,7 +1018,6 @@
 			reg = <0x401a8000 0x4000>;
 			interrupts = <158 0>;
 			status = "disabled";
-			#io-channel-cells = <2>;
 		};
 
 		acmp3: cmp@401ac000 {
@@ -1027,7 +1025,6 @@
 			reg = <0x401ac000 0x4000>;
 			interrupts = <159 0>;
 			status = "disabled";
-			#io-channel-cells = <2>;
 		};
 
 		acmp4: cmp@401b0000 {
@@ -1035,7 +1032,6 @@
 			reg = <0x401b0000 0x4000>;
 			interrupts = <160 0>;
 			status = "disabled";
-			#io-channel-cells = <2>;
 		};
 
 		anatop: anatop@40c84000 {
diff --git a/dts/bindings/comparator/nxp,kinetis-acmp.yaml b/dts/bindings/comparator/nxp,kinetis-acmp.yaml
new file mode 100644
index 00000000000..76ce24b5bba
--- /dev/null
+++ b/dts/bindings/comparator/nxp,kinetis-acmp.yaml
@@ -0,0 +1,195 @@
+# Copyright (c) 2020 Vestas Wind Systems A/S
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: NXP Kinetis ACMP (Analog CoMParator)
+
+compatible: "nxp,kinetis-acmp"
+
+include:
+  - base.yaml
+  - pinctrl-device.yaml
+
+properties:
+  interrupts:
+    required: true
+
+  reg:
+    required: true
+
+  nxp,enable-output-pin:
+    type: boolean
+    deprecated: true
+    description: Deprecated. Please use enable-pin-out instead
+
+  nxp,use-unfiltered-output:
+    type: boolean
+    deprecated: true
+    description: Deprecated. Please use use-unfiltered-output instead
+
+  nxp,high-speed-mode:
+    type: boolean
+    deprecated: true
+    description: Deprecated. Please use enable-high-speed-mode instead
+
+  nxp,enable-sample:
+    type: boolean
+    deprecated: true
+    description: Deprecated. Please use filter-enable-sample instead
+
+  nxp,filter-count:
+    type: int
+    deprecated: true
+    description: Deprecated. Please use filter-count instead
+
+  nxp,filter-period:
+    type: int
+    deprecated: true
+    description: Deprecated. Please use filter-period instead
+
+  nxp,window-mode:
+    type: boolean
+    deprecated: true
+    description: Deprecated. Please use enable-window-mode instead
+
+  offset-mode:
+    type: string
+    enum:
+      - "LEVEL0"
+      - "LEVEL1"
+
+  hysteresis-mode:
+    type: string
+    enum:
+      - "LEVEL0"
+      - "LEVEL1"
+      - "LEVEL2"
+      - "LEVEL3"
+
+  enable-high-speed-mode:
+    type: boolean
+
+  invert-output:
+    type: boolean
+
+  use-unfiltered-output:
+    type: boolean
+
+  enable-pin-out:
+    type: boolean
+
+  enable-window-mode:
+    type: boolean
+
+  positive-mux-input:
+    type: string
+    enum:
+      - IN0
+      - IN1
+      - IN2
+      - IN3
+      - IN4
+      - IN5
+      - IN6
+      - IN7
+
+  negative-mux-input:
+    type: string
+    enum:
+      - IN0
+      - IN1
+      - IN2
+      - IN3
+      - IN4
+      - IN5
+      - IN6
+      - IN7
+
+  positive-port-input:
+    type: string
+    enum:
+      - DAC
+      - MUX
+
+  negative-port-input:
+    type: string
+    enum:
+      - DAC
+      - MUX
+
+  filter-enable-sample:
+    type: boolean
+
+  filter-count:
+    type: int
+    description: Filter sample count (0 to 7).
+
+  filter-period:
+    type: int
+    description: Filter sample period in bus clock cycles (0 to 255).
+
+  dac-vref-source:
+    type: string
+    enum:
+      - "VIN1"
+      - "VIN2"
+
+  dac-value:
+    type: int
+
+  dac-enable:
+    type: boolean
+
+  dac-enable-high-speed:
+    type: boolean
+
+  discrete-mode-enable-positive-channel:
+    type: boolean
+
+  discrete-mode-enable-negative-channel:
+    type: boolean
+
+  discrete-mode-enable-resistor-divider:
+    type: boolean
+
+  discrete-mode-clock-source:
+    type: string
+    enum:
+      - "SLOW"
+      - "FAST"
+
+  discrete-mode-sample-time:
+    type: string
+    enum:
+      - "T1"
+      - "T2"
+      - "T4"
+      - "T8"
+      - "T16"
+      - "T32"
+      - "T64"
+      - "T256"
+
+  discrete-mode-phase1-time:
+    type: string
+    enum:
+      - "ALT0"
+      - "ALT1"
+      - "ALT2"
+      - "ALT3"
+      - "ALT4"
+      - "ALT5"
+      - "ALT6"
+      - "ALT7"
+
+  discrete-mode-phase2-time:
+    type: string
+    enum:
+      - "ALT0"
+      - "ALT1"
+      - "ALT2"
+      - "ALT3"
+      - "ALT4"
+      - "ALT5"
+      - "ALT6"
+      - "ALT7"
diff --git a/dts/bindings/sensor/nxp,kinetis-acmp.yaml b/dts/bindings/sensor/nxp,kinetis-acmp.yaml
deleted file mode 100644
index 9608f9305c9..00000000000
--- a/dts/bindings/sensor/nxp,kinetis-acmp.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (c) 2020 Vestas Wind Systems A/S
-# SPDX-License-Identifier: Apache-2.0
-
-description: NXP Kinetis Analog Comparator (ACMP)
-
-compatible: "nxp,kinetis-acmp"
-
-include: [sensor-device.yaml, pinctrl-device.yaml]
-
-properties:
-  interrupts:
-    required: true
-
-  reg:
-    required: true
-
-  nxp,enable-output-pin:
-    type: boolean
-    description: |
-      Make the comparator output (CMP0) available on a packaged pin.
-
-  nxp,use-unfiltered-output:
-    type: boolean
-    description: |
-      Use the unfiltered comparator output for CMP0.
-
-  nxp,high-speed-mode:
-    type: boolean
-    description: |
-      Enable high speed comparison mode.
-
-  nxp,enable-sample:
-    type: boolean
-    description: |
-      Enable external sample signal as clock input.
-
-  nxp,filter-count:
-    type: int
-    description: |
-      Filter sample count (0 to 7).
-
-  nxp,filter-period:
-    type: int
-    description: |
-      Filter sample period in bus clock cycles (0 to 255).
-
-  nxp,window-mode:
-    type: boolean
-    description: |
-      Enable windowing mode.
-
-  "#io-channel-cells":
-    type: int
-    const: 2
-
-io-channel-cells:
-  - positive
-  - negative

From 55b01ab7478798a401399a18f3446281d9b939e7 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Sun, 22 Sep 2024 19:30:43 +0200
Subject: [PATCH 0511/2913] [nrf fromtree] doc: releases: migration-guide:
 deprecated nxp,kinetis-acmp props

Add entyr mentioning the deprecation of the nxp, prefixed properties
in the nxp,kinetis-acmp dts binding.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 3b08a08c7f1b9741de3bdeab103e7c4b27e6e24d)
(cherry picked from commit 28879e016e1045ff9ba447eb9fe19e99e7db7519)
---
 doc/releases/migration-guide-4.0.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/releases/migration-guide-4.0.rst b/doc/releases/migration-guide-4.0.rst
index 3699a7fedcb..3581625f830 100644
--- a/doc/releases/migration-guide-4.0.rst
+++ b/doc/releases/migration-guide-4.0.rst
@@ -150,6 +150,11 @@ Sensors
   to support all JEDEC JC 42.4 compatible temperature sensors. It now uses the
   :dtcompatible:`jedec,jc-42.4-temp` compatible string instead to the ``microchip,mcp9808`` string.
 
+* The ``nxp,`` prefixed properties in :dtcompatible:`nxp,kinetis-acmp` have been deprecated in favor
+  of properties without the prefix. The sensor based driver for the :dtcompatible:`nxp,kinetis-acmp`
+  has been updated to support both the new and deprecated property names. Uses of the deprecated
+  property names should be updated to the new property names.
+
 Serial
 ======
 

From 36eceeff4a4f548af4cd060a7a7041a21d4e5f19 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Mon, 19 Aug 2024 11:53:09 +0200
Subject: [PATCH 0512/2913] [nrf fromtree] drivers: comparator: add mcux acmp
 device driver

Add mcux SDK based kinetis acmp device driver implementing the
comparator device driver API.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit d37f8441043b064eabe5d924e93d103a91c40b44)
(cherry picked from commit 4f0b5225b967333c805fb39fdcb18c47ae57b4e1)
---
 drivers/comparator/CMakeLists.txt             |   1 +
 drivers/comparator/Kconfig                    |   1 +
 drivers/comparator/Kconfig.mcux_acmp          |   9 +
 drivers/comparator/comparator_mcux_acmp.c     | 651 ++++++++++++++++++
 dts/bindings/comparator/nxp,kinetis-acmp.yaml |  34 +-
 include/zephyr/drivers/comparator/mcux_acmp.h | 136 ++++
 6 files changed, 831 insertions(+), 1 deletion(-)
 create mode 100644 drivers/comparator/Kconfig.mcux_acmp
 create mode 100644 drivers/comparator/comparator_mcux_acmp.c
 create mode 100644 include/zephyr/drivers/comparator/mcux_acmp.h

diff --git a/drivers/comparator/CMakeLists.txt b/drivers/comparator/CMakeLists.txt
index d0dc726bf58..b5fe633a333 100644
--- a/drivers/comparator/CMakeLists.txt
+++ b/drivers/comparator/CMakeLists.txt
@@ -6,5 +6,6 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/comparator.h)
 zephyr_library()
 
 zephyr_library_sources_ifdef(CONFIG_USERSPACE comparator_handlers.c)
+zephyr_library_sources_ifdef(CONFIG_COMPARATOR_MCUX_ACMP comparator_mcux_acmp.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_COMP comparator_nrf_comp.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_LPCOMP comparator_nrf_lpcomp.c)
diff --git a/drivers/comparator/Kconfig b/drivers/comparator/Kconfig
index 819936024b9..871ee5d9ed6 100644
--- a/drivers/comparator/Kconfig
+++ b/drivers/comparator/Kconfig
@@ -18,6 +18,7 @@ config COMPARATOR_INIT_PRIORITY
 	help
 	  Comparator device driver initialization priority.
 
+rsource "Kconfig.mcux_acmp"
 rsource "Kconfig.nrf_comp"
 rsource "Kconfig.nrf_lpcomp"
 
diff --git a/drivers/comparator/Kconfig.mcux_acmp b/drivers/comparator/Kconfig.mcux_acmp
new file mode 100644
index 00000000000..8109cb1cdd2
--- /dev/null
+++ b/drivers/comparator/Kconfig.mcux_acmp
@@ -0,0 +1,9 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config COMPARATOR_MCUX_ACMP
+	bool "NXP MCUX ACMP comparator driver"
+	default y
+	depends on DT_HAS_NXP_KINETIS_ACMP_ENABLED
+	select PINCTRL
+	select MCUX_ACMP
diff --git a/drivers/comparator/comparator_mcux_acmp.c b/drivers/comparator/comparator_mcux_acmp.c
new file mode 100644
index 00000000000..4d76f105e34
--- /dev/null
+++ b/drivers/comparator/comparator_mcux_acmp.c
@@ -0,0 +1,651 @@
+/*
+ * Copyright (c) 2020 Vestas Wind Systems A/S
+ * Copyright (c) 2022 NXP
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <fsl_acmp.h>
+
+#include <zephyr/kernel.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/drivers/comparator.h>
+#include <zephyr/drivers/comparator/mcux_acmp.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/irq.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(nxp_kinetis_acmp, CONFIG_COMPARATOR_LOG_LEVEL);
+
+#define DT_DRV_COMPAT nxp_kinetis_acmp
+
+/*
+ * DAC is a register defined in the MCUX HAL. We don't need it here and it conflicts
+ * with the COMP_MCUX_ACMP_PORT_INPUT_DAC definition so undef it here.
+ */
+#ifdef DAC
+#undef DAC
+#endif
+
+#if defined(FSL_FEATURE_ACMP_HAS_C0_OFFSET_BIT) && (FSL_FEATURE_ACMP_HAS_C0_OFFSET_BIT == 1U)
+#define COMP_MCUX_ACMP_HAS_OFFSET 1
+#else
+#define COMP_MCUX_ACMP_HAS_OFFSET 0
+#endif
+
+#if defined(FSL_FEATURE_ACMP_HAS_C0_HYSTCTR_BIT) && (FSL_FEATURE_ACMP_HAS_C0_HYSTCTR_BIT == 1U)
+#define COMP_MCUX_ACMP_HAS_HYSTERESIS 1
+#else
+#define COMP_MCUX_ACMP_HAS_HYSTERESIS 0
+#endif
+
+#if defined(FSL_FEATURE_ACMP_HAS_C1_INPSEL_BIT) && (FSL_FEATURE_ACMP_HAS_C1_INPSEL_BIT == 1U)
+#define COMP_MCUX_ACMP_HAS_INPSEL 1
+#else
+#define COMP_MCUX_ACMP_HAS_INPSEL 0
+#endif
+
+#if defined(FSL_FEATURE_ACMP_HAS_C1_INNSEL_BIT) && (FSL_FEATURE_ACMP_HAS_C1_INNSEL_BIT == 1U)
+#define COMP_MCUX_ACMP_HAS_INNSEL 1
+#else
+#define COMP_MCUX_ACMP_HAS_INNSEL 0
+#endif
+
+#if defined(FSL_FEATURE_ACMP_HAS_C1_DACOE_BIT) && (FSL_FEATURE_ACMP_HAS_C1_DACOE_BIT == 1U)
+#define COMP_MCUX_ACMP_HAS_DAC_OUT_ENABLE 1
+#else
+#define COMP_MCUX_ACMP_HAS_DAC_OUT_ENABLE 0
+#endif
+
+#if defined(FSL_FEATURE_ACMP_HAS_C1_DMODE_BIT) && (FSL_FEATURE_ACMP_HAS_C1_DMODE_BIT == 1U)
+#define COMP_MCUX_ACMP_HAS_DAC_WORK_MODE 1
+#else
+#define COMP_MCUX_ACMP_HAS_DAC_WORK_MODE 0
+#endif
+
+#if defined(FSL_FEATURE_ACMP_HAS_C3_REG) && (FSL_FEATURE_ACMP_HAS_C3_REG != 0U)
+#define COMP_MCUX_ACMP_HAS_DISCRETE_MODE 1
+#else
+#define COMP_MCUX_ACMP_HAS_DISCRETE_MODE 0
+#endif
+
+#if !(defined(FSL_FEATURE_ACMP_HAS_NO_WINDOW_MODE) && (FSL_FEATURE_ACMP_HAS_NO_WINDOW_MODE == 1U))
+#define COMP_MCUX_ACMP_HAS_WINDOW_MODE 1
+#else
+#define COMP_MCUX_ACMP_HAS_WINDOW_MODE 0
+#endif
+
+#define MCUX_ACMP_ENUM(name, value) \
+	_CONCAT_4(COMP_MCUX_ACMP_, name, _, value)
+
+#define MCUX_ACMP_DT_INST_ENUM(inst, name, prop) \
+	MCUX_ACMP_ENUM(name, DT_INST_STRING_TOKEN(inst, prop))
+
+#define MCUX_ACMP_DT_INST_ENUM_OR(inst, name, prop, or)						\
+	COND_CODE_1(DT_INST_NODE_HAS_PROP(inst, prop),						\
+		    (MCUX_ACMP_DT_INST_ENUM(inst, name, prop)),					\
+		    (MCUX_ACMP_ENUM(name, or)))
+
+#define MCUX_ACMP_DT_INST_OFFSET_MODE(inst) \
+	MCUX_ACMP_DT_INST_ENUM_OR(inst, OFFSET_MODE, offset_mode, LEVEL0)
+
+#define MCUX_ACMP_DT_INST_HYST_MODE(inst) \
+	MCUX_ACMP_DT_INST_ENUM_OR(inst, HYSTERESIS_MODE, hysteresis_mode, LEVEL0)
+
+#define MCUX_ACMP_DT_INST_EN_HS_MODE(inst) \
+	DT_INST_PROP(inst, enable_high_speed_mode)
+
+#define MCUX_ACMP_DT_INST_INV_OUT(inst) \
+	DT_INST_PROP(inst, invert_output)
+
+#define MCUX_ACMP_DT_INST_USE_UNFILTERED_OUT(inst) \
+	DT_INST_PROP(inst, use_unfiltered_output)
+
+#define MCUX_ACMP_DT_INST_EN_PIN_OUT(inst) \
+	DT_INST_PROP(inst, enable_pin_out)
+
+#define MCUX_ACMP_DT_INST_MODE_CONFIG_INIT(inst)						\
+	{											\
+		.offset_mode = MCUX_ACMP_DT_INST_OFFSET_MODE(inst),				\
+		.hysteresis_mode = MCUX_ACMP_DT_INST_HYST_MODE(inst),				\
+		.enable_high_speed_mode = MCUX_ACMP_DT_INST_EN_HS_MODE(inst),			\
+		.invert_output = MCUX_ACMP_DT_INST_INV_OUT(inst),				\
+		.use_unfiltered_output = MCUX_ACMP_DT_INST_USE_UNFILTERED_OUT(inst),		\
+		.enable_pin_output = MCUX_ACMP_DT_INST_EN_PIN_OUT(inst),			\
+	}
+
+#define MCUX_ACMP_DT_INST_P_MUX_IN(inst) \
+	MCUX_ACMP_DT_INST_ENUM(inst, MUX_INPUT, positive_mux_input)
+
+#define MCUX_ACMP_DT_INST_N_MUX_IN(inst) \
+	MCUX_ACMP_DT_INST_ENUM(inst, MUX_INPUT, negative_mux_input)
+
+#define MCUX_ACMP_DT_INST_P_PORT_IN(inst) \
+	MCUX_ACMP_DT_INST_ENUM_OR(inst, PORT_INPUT, positive_port_input, MUX)
+
+#define MCUX_ACMP_DT_INST_N_PORT_IN(inst) \
+	MCUX_ACMP_DT_INST_ENUM_OR(inst, PORT_INPUT, negative_port_input, MUX)
+
+#define MCUX_ACMP_DT_INST_INPUT_CONFIG_INIT(inst)						\
+	{											\
+		.positive_mux_input = MCUX_ACMP_DT_INST_P_MUX_IN(inst),				\
+		.negative_mux_input = MCUX_ACMP_DT_INST_N_MUX_IN(inst),				\
+		.positive_port_input = MCUX_ACMP_DT_INST_P_PORT_IN(inst),			\
+		.negative_port_input = MCUX_ACMP_DT_INST_N_PORT_IN(inst),			\
+	}
+
+#define MCUX_ACMP_DT_INST_FILTER_EN_SAMPLE(inst) \
+	DT_INST_PROP(inst, filter_enable_sample)
+
+#define MCUX_ACMP_DT_INST_FILTER_COUNT(inst) \
+	DT_INST_PROP_OR(inst, filter_count, 0)
+
+#define MCUX_ACMP_DT_INST_FILTER_PERIOD(inst) \
+	DT_INST_PROP_OR(inst, filter_period, 0)
+
+#define MCUX_ACMP_DT_INST_FILTER_CONFIG_INIT(inst)						\
+	{											\
+		.enable_sample = MCUX_ACMP_DT_INST_FILTER_EN_SAMPLE(inst),			\
+		.filter_count = MCUX_ACMP_DT_INST_FILTER_COUNT(inst),				\
+		.filter_period = MCUX_ACMP_DT_INST_FILTER_PERIOD(inst),				\
+	}
+
+#define MCUX_ACMP_DT_INST_DAC_VREF_SOURCE(inst) \
+	MCUX_ACMP_DT_INST_ENUM_OR(inst, DAC_VREF_SOURCE, dac_vref_source, VIN1)
+
+#define MCUX_ACMP_DT_INST_DAC_VALUE(inst) \
+	DT_INST_PROP_OR(inst, dac_value, 0)
+
+#define MCUX_ACMP_DT_INST_DAC_EN(inst) \
+	DT_INST_PROP(inst, dac_enable)
+
+#define MCUX_ACMP_DT_INST_DAC_EN_HS(inst) \
+	DT_INST_PROP(inst, dac_enable_high_speed)
+
+#define MCUX_ACMP_DT_INST_DAC_CONFIG_INIT(inst)							\
+	{											\
+		.vref_source = MCUX_ACMP_DT_INST_DAC_VREF_SOURCE(inst),				\
+		.value = MCUX_ACMP_DT_INST_DAC_VALUE(inst),					\
+		.enable_output = MCUX_ACMP_DT_INST_DAC_EN(inst),				\
+		.enable_high_speed_mode = MCUX_ACMP_DT_INST_DAC_EN_HS(inst),			\
+	}
+
+#define MCUX_ACMP_DT_INST_DM_EN_P_CH(inst) \
+	DT_INST_PROP(inst, discrete_mode_enable_positive_channel)
+
+#define MCUX_ACMP_DT_INST_DM_EN_N_CH(inst) \
+	DT_INST_PROP(inst, discrete_mode_enable_negative_channel)
+
+#define MCUX_ACMP_DT_INST_DM_EN_RES_DIV(inst) \
+	DT_INST_PROP(inst, discrete_mode_enable_resistor_divider)
+
+#define MCUX_ACMP_DT_INST_DM_CLOCK_SOURCE(inst) \
+	MCUX_ACMP_DT_INST_ENUM_OR(inst, DM_CLOCK, discrete_mode_clock_source, SLOW)
+
+#define MCUX_ACMP_DT_INST_DM_SAMPLE_TIME(inst) \
+	MCUX_ACMP_DT_INST_ENUM_OR(inst, DM_SAMPLE_TIME, discrete_mode_sample_time, T1)
+
+#define MCUX_ACMP_DT_INST_DM_PHASE1_TIME(inst) \
+	MCUX_ACMP_DT_INST_ENUM_OR(inst, DM_PHASE_TIME, discrete_mode_phase1_time, ALT0)
+
+#define MCUX_ACMP_DT_INST_DM_PHASE2_TIME(inst) \
+	MCUX_ACMP_DT_INST_ENUM_OR(inst, DM_PHASE_TIME, discrete_mode_phase2_time, ALT0)
+
+#define MCUX_ACMP_DT_INST_DM_CONFIG_INIT(inst)							\
+	{											\
+		.enable_positive_channel = MCUX_ACMP_DT_INST_DM_EN_P_CH(inst),			\
+		.enable_negative_channel = MCUX_ACMP_DT_INST_DM_EN_N_CH(inst),			\
+		.enable_resistor_divider = MCUX_ACMP_DT_INST_DM_EN_RES_DIV(inst),		\
+		.clock_source = MCUX_ACMP_DT_INST_DM_CLOCK_SOURCE(inst),			\
+		.sample_time = MCUX_ACMP_DT_INST_DM_SAMPLE_TIME(inst),				\
+		.phase1_time = MCUX_ACMP_DT_INST_DM_PHASE1_TIME(inst),				\
+		.phase2_time = MCUX_ACMP_DT_INST_DM_PHASE2_TIME(inst),				\
+	}
+
+#define MCUX_ACMP_DT_INST_EN_WINDOW_MODE(inst) \
+	DT_INST_PROP(inst, enable_window_mode)
+
+struct mcux_acmp_config {
+	CMP_Type *base;
+	const struct pinctrl_dev_config *pincfg;
+	void (*irq_init)(void);
+	const struct comp_mcux_acmp_mode_config mode_config;
+	const struct comp_mcux_acmp_input_config input_config;
+	const struct comp_mcux_acmp_filter_config filter_config;
+	const struct comp_mcux_acmp_dac_config dac_config;
+#if COMP_MCUX_ACMP_HAS_DISCRETE_MODE
+	const struct comp_mcux_acmp_dm_config dm_config;
+#endif
+#if COMP_MCUX_ACMP_HAS_WINDOW_MODE
+	bool enable_window_mode;
+#endif
+};
+
+#if MCUX_ACMP_HAS_OFFSET
+BUILD_ASSERT((int)kACMP_OffsetLevel0 == (int)COMP_MCUX_ACMP_OFFSET_MODE_LEVEL0);
+BUILD_ASSERT((int)kACMP_OffsetLevel1 == (int)COMP_MCUX_ACMP_OFFSET_MODE_LEVEL1);
+#endif
+
+#if COMP_MCUX_ACMP_HAS_HYSTERESIS
+BUILD_ASSERT((int)kACMP_HysteresisLevel0 == (int)COMP_MCUX_ACMP_HYSTERESIS_MODE_LEVEL0);
+BUILD_ASSERT((int)kACMP_HysteresisLevel1 == (int)COMP_MCUX_ACMP_HYSTERESIS_MODE_LEVEL1);
+BUILD_ASSERT((int)kACMP_HysteresisLevel2 == (int)COMP_MCUX_ACMP_HYSTERESIS_MODE_LEVEL2);
+BUILD_ASSERT((int)kACMP_HysteresisLevel3 == (int)COMP_MCUX_ACMP_HYSTERESIS_MODE_LEVEL3);
+#endif
+
+BUILD_ASSERT((int)kACMP_VrefSourceVin1 == (int)COMP_MCUX_ACMP_DAC_VREF_SOURCE_VIN1);
+BUILD_ASSERT((int)kACMP_VrefSourceVin2 == (int)COMP_MCUX_ACMP_DAC_VREF_SOURCE_VIN2);
+
+#if MCUX_ACMP_HAS_INPSEL || MCUX_ACMP_HAS_INNSEL
+BUILD_ASSERT((int)kACMP_PortInputFromDAC == (int)COMP_MCUX_ACMP_PORT_INPUT_DAC);
+BUILD_ASSERT((int)kACMP_PortInputFromMux == (int)COMP_MCUX_ACMP_PORT_INPUT_MUX);
+#endif
+
+#if COMP_MCUX_ACMP_HAS_DISCRETE_MODE
+BUILD_ASSERT((int)kACMP_DiscreteClockSlow == (int)COMP_MCUX_ACMP_DM_CLOCK_SLOW);
+BUILD_ASSERT((int)kACMP_DiscreteClockFast == (int)COMP_MCUX_ACMP_DM_CLOCK_FAST);
+
+BUILD_ASSERT((int)kACMP_DiscreteSampleTimeAs1T == (int)COMP_MCUX_ACMP_DM_SAMPLE_TIME_T1);
+BUILD_ASSERT((int)kACMP_DiscreteSampleTimeAs2T == (int)COMP_MCUX_ACMP_DM_SAMPLE_TIME_T2);
+BUILD_ASSERT((int)kACMP_DiscreteSampleTimeAs4T == (int)COMP_MCUX_ACMP_DM_SAMPLE_TIME_T4);
+BUILD_ASSERT((int)kACMP_DiscreteSampleTimeAs8T == (int)COMP_MCUX_ACMP_DM_SAMPLE_TIME_T8);
+BUILD_ASSERT((int)kACMP_DiscreteSampleTimeAs16T == (int)COMP_MCUX_ACMP_DM_SAMPLE_TIME_T16);
+BUILD_ASSERT((int)kACMP_DiscreteSampleTimeAs32T == (int)COMP_MCUX_ACMP_DM_SAMPLE_TIME_T32);
+BUILD_ASSERT((int)kACMP_DiscreteSampleTimeAs64T == (int)COMP_MCUX_ACMP_DM_SAMPLE_TIME_T64);
+BUILD_ASSERT((int)kACMP_DiscreteSampleTimeAs256T == (int)COMP_MCUX_ACMP_DM_SAMPLE_TIME_T256);
+
+BUILD_ASSERT((int)kACMP_DiscretePhaseTimeAlt0 == (int)COMP_MCUX_ACMP_DM_PHASE_TIME_ALT0);
+BUILD_ASSERT((int)kACMP_DiscretePhaseTimeAlt1 == (int)COMP_MCUX_ACMP_DM_PHASE_TIME_ALT1);
+BUILD_ASSERT((int)kACMP_DiscretePhaseTimeAlt2 == (int)COMP_MCUX_ACMP_DM_PHASE_TIME_ALT2);
+BUILD_ASSERT((int)kACMP_DiscretePhaseTimeAlt3 == (int)COMP_MCUX_ACMP_DM_PHASE_TIME_ALT3);
+BUILD_ASSERT((int)kACMP_DiscretePhaseTimeAlt4 == (int)COMP_MCUX_ACMP_DM_PHASE_TIME_ALT4);
+BUILD_ASSERT((int)kACMP_DiscretePhaseTimeAlt5 == (int)COMP_MCUX_ACMP_DM_PHASE_TIME_ALT5);
+BUILD_ASSERT((int)kACMP_DiscretePhaseTimeAlt6 == (int)COMP_MCUX_ACMP_DM_PHASE_TIME_ALT6);
+BUILD_ASSERT((int)kACMP_DiscretePhaseTimeAlt7 == (int)COMP_MCUX_ACMP_DM_PHASE_TIME_ALT7);
+#endif
+
+struct mcux_acmp_data {
+	uint32_t interrupt_mask;
+	comparator_callback_t callback;
+	void *user_data;
+};
+
+#if CONFIG_PM_DEVICE
+static bool mcux_acmp_is_resumed(const struct device *dev)
+{
+	enum pm_device_state state;
+
+	(void)pm_device_state_get(dev, &state);
+	return state == PM_DEVICE_STATE_ACTIVE;
+}
+#else
+static bool mcux_acmp_is_resumed(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+	return true;
+}
+#endif
+
+static int mcux_acmp_get_output(const struct device *dev)
+{
+	const struct mcux_acmp_config *config = dev->config;
+	uint32_t status;
+
+	status = ACMP_GetStatusFlags(config->base);
+	return (status & kACMP_OutputAssertEventFlag) ? 1 : 0;
+}
+
+static int mcux_acmp_set_trigger(const struct device *dev,
+				 enum comparator_trigger trigger)
+{
+	const struct mcux_acmp_config *config = dev->config;
+	struct mcux_acmp_data *data = dev->data;
+
+	ACMP_DisableInterrupts(config->base, UINT32_MAX);
+
+	switch (trigger) {
+	case COMPARATOR_TRIGGER_NONE:
+		data->interrupt_mask = 0;
+		break;
+
+	case COMPARATOR_TRIGGER_RISING_EDGE:
+		data->interrupt_mask = kACMP_OutputRisingInterruptEnable;
+		break;
+
+	case COMPARATOR_TRIGGER_FALLING_EDGE:
+		data->interrupt_mask = kACMP_OutputFallingInterruptEnable;
+		break;
+
+	case COMPARATOR_TRIGGER_BOTH_EDGES:
+		data->interrupt_mask = kACMP_OutputFallingInterruptEnable |
+				       kACMP_OutputRisingInterruptEnable;
+		break;
+	}
+
+	if (data->interrupt_mask && data->callback != NULL) {
+		ACMP_EnableInterrupts(config->base, data->interrupt_mask);
+	}
+
+	return 0;
+}
+
+static int mcux_acmp_set_trigger_callback(const struct device *dev,
+					  comparator_callback_t callback,
+					  void *user_data)
+{
+	const struct mcux_acmp_config *config = dev->config;
+	struct mcux_acmp_data *data = dev->data;
+
+	ACMP_DisableInterrupts(config->base, UINT32_MAX);
+
+	data->callback = callback;
+	data->user_data = user_data;
+
+	if (data->callback == NULL) {
+		return 0;
+	}
+
+	if (data->interrupt_mask) {
+		ACMP_EnableInterrupts(config->base, data->interrupt_mask);
+	}
+
+	return 0;
+}
+
+static int mcux_acmp_trigger_is_pending(const struct device *dev)
+{
+	const struct mcux_acmp_config *config = dev->config;
+	struct mcux_acmp_data *data = dev->data;
+	uint32_t status_flags;
+
+	status_flags = ACMP_GetStatusFlags(config->base);
+	ACMP_ClearStatusFlags(config->base, UINT32_MAX);
+
+	if ((data->interrupt_mask & kACMP_OutputRisingInterruptEnable) &&
+	    (status_flags & kACMP_OutputRisingEventFlag)) {
+		return 1;
+	}
+
+	if ((data->interrupt_mask & kACMP_OutputFallingInterruptEnable) &&
+	    (status_flags & kACMP_OutputFallingEventFlag)) {
+		return 1;
+	}
+
+	return 0;
+}
+
+static const struct comparator_driver_api mcux_acmp_comp_api = {
+	.get_output = mcux_acmp_get_output,
+	.set_trigger = mcux_acmp_set_trigger,
+	.set_trigger_callback = mcux_acmp_set_trigger_callback,
+	.trigger_is_pending = mcux_acmp_trigger_is_pending,
+};
+
+static void comp_mcux_acmp_init_mode_config(const struct device *dev,
+					    const struct comp_mcux_acmp_mode_config *config)
+{
+	const struct mcux_acmp_config *dev_config = dev->config;
+	acmp_config_t acmp_config;
+
+#if COMP_MCUX_ACMP_HAS_OFFSET
+	acmp_config.offsetMode = (acmp_offset_mode_t)config->offset_mode;
+#endif
+
+#if COMP_MCUX_ACMP_HAS_HYSTERESIS
+	acmp_config.hysteresisMode = (acmp_hysteresis_mode_t)config->hysteresis_mode;
+#endif
+
+	acmp_config.enableHighSpeed = config->enable_high_speed_mode;
+	acmp_config.enableInvertOutput = config->invert_output;
+	acmp_config.useUnfilteredOutput = config->use_unfiltered_output;
+	acmp_config.enablePinOut = config->enable_pin_output;
+
+	ACMP_Init(dev_config->base, &acmp_config);
+}
+
+int comp_mcux_acmp_set_mode_config(const struct device *dev,
+				   const struct comp_mcux_acmp_mode_config *config)
+{
+	const struct mcux_acmp_config *dev_config = dev->config;
+
+	comp_mcux_acmp_init_mode_config(dev, config);
+
+	if (mcux_acmp_is_resumed(dev)) {
+		ACMP_Enable(dev_config->base, true);
+	}
+
+	return 0;
+}
+
+int comp_mcux_acmp_set_input_config(const struct device *dev,
+				    const struct comp_mcux_acmp_input_config *config)
+{
+	const struct mcux_acmp_config *dev_config = dev->config;
+	acmp_channel_config_t acmp_channel_config;
+
+#if COMP_MCUX_ACMP_HAS_INPSEL
+	acmp_channel_config.positivePortInput = (acmp_port_input_t)config->positive_port_input;
+#endif
+
+	acmp_channel_config.plusMuxInput = (uint32_t)config->positive_mux_input;
+
+#if COMP_MCUX_ACMP_HAS_INNSEL
+	acmp_channel_config.negativePortInput = (acmp_port_input_t)config->negative_port_input;
+#endif
+
+	acmp_channel_config.minusMuxInput = (uint32_t)config->negative_mux_input;
+
+	ACMP_SetChannelConfig(dev_config->base, &acmp_channel_config);
+	return 0;
+}
+
+int comp_mcux_acmp_set_filter_config(const struct device *dev,
+				     const struct comp_mcux_acmp_filter_config *config)
+{
+	const struct mcux_acmp_config *dev_config = dev->config;
+	acmp_filter_config_t acmp_filter_config;
+
+	if (config->enable_sample && config->filter_count == 0) {
+		return -EINVAL;
+	}
+
+	if (config->filter_count > 7) {
+		return -EINVAL;
+	}
+
+	acmp_filter_config.enableSample = config->enable_sample;
+	acmp_filter_config.filterCount = config->filter_count;
+	acmp_filter_config.filterPeriod = config->filter_period;
+
+	ACMP_SetFilterConfig(dev_config->base, &acmp_filter_config);
+	return 0;
+}
+
+int comp_mcux_acmp_set_dac_config(const struct device *dev,
+				  const struct comp_mcux_acmp_dac_config *config)
+{
+	const struct mcux_acmp_config *dev_config = dev->config;
+	acmp_dac_config_t acmp_dac_config;
+
+	acmp_dac_config.referenceVoltageSource =
+		(acmp_reference_voltage_source_t)config->vref_source;
+
+	acmp_dac_config.DACValue = config->value;
+
+#if COMP_MCUX_ACMP_HAS_DAC_OUT_ENABLE
+	acmp_dac_config.enableOutput = config->enable_output;
+#endif
+
+#if COMP_MCUX_ACMP_HAS_DAC_WORK_MODE
+	acmp_dac_config.workMode = config->enable_high_speed_mode
+				 ? kACMP_DACWorkHighSpeedMode
+				 : kACMP_DACWorkLowSpeedMode;
+#endif
+
+	ACMP_SetDACConfig(dev_config->base, &acmp_dac_config);
+	return 0;
+}
+
+#if COMP_MCUX_ACMP_HAS_DISCRETE_MODE
+int comp_mcux_acmp_set_dm_config(const struct device *dev,
+				 const struct comp_mcux_acmp_dm_config *config)
+{
+	const struct mcux_acmp_config *dev_config = dev->config;
+	acmp_discrete_mode_config_t acmp_dm_config;
+
+	acmp_dm_config.enablePositiveChannelDiscreteMode = config->enable_positive_channel;
+	acmp_dm_config.enableNegativeChannelDiscreteMode = config->enable_negative_channel;
+	acmp_dm_config.enableResistorDivider = config->enable_resistor_divider;
+	acmp_dm_config.clockSource = (acmp_discrete_clock_source_t)config->clock_source;
+	acmp_dm_config.sampleTime = (acmp_discrete_sample_time_t)config->sample_time;
+	acmp_dm_config.phase1Time = (acmp_discrete_phase_time_t)config->phase1_time;
+	acmp_dm_config.phase2Time = (acmp_discrete_phase_time_t)config->phase2_time;
+
+	ACMP_SetDiscreteModeConfig(dev_config->base, &acmp_dm_config);
+	return 0;
+}
+#endif
+
+#if COMP_MCUX_ACMP_HAS_WINDOW_MODE
+int comp_mcux_acmp_set_window_mode(const struct device *dev, bool enable)
+{
+	const struct mcux_acmp_config *config = dev->config;
+
+	ACMP_EnableWindowMode(config->base, enable);
+	return 0;
+}
+#endif
+
+static int mcux_acmp_pm_callback(const struct device *dev, enum pm_device_action action)
+{
+	const struct mcux_acmp_config *config = dev->config;
+
+	if (action == PM_DEVICE_ACTION_RESUME) {
+		ACMP_Enable(config->base, true);
+	}
+
+#if CONFIG_PM_DEVICE
+	if (action == PM_DEVICE_ACTION_SUSPEND) {
+		ACMP_Enable(config->base, false);
+	}
+#endif
+
+	return 0;
+}
+
+static void mcux_acmp_irq_handler(const struct device *dev)
+{
+	const struct mcux_acmp_config *config = dev->config;
+	struct mcux_acmp_data *data = dev->data;
+
+	ACMP_ClearStatusFlags(config->base, UINT32_MAX);
+
+	if (data->callback == NULL) {
+		return;
+	}
+
+	data->callback(dev, data->user_data);
+}
+
+static int mcux_acmp_init(const struct device *dev)
+{
+	const struct mcux_acmp_config *config = dev->config;
+	int ret;
+
+	ret = pinctrl_apply_state(config->pincfg, PINCTRL_STATE_DEFAULT);
+	if (ret) {
+		LOG_ERR("failed to set %s", "pincfg");
+		return ret;
+	}
+
+	comp_mcux_acmp_init_mode_config(dev, &config->mode_config);
+
+	ret = comp_mcux_acmp_set_input_config(dev, &config->input_config);
+	if (ret) {
+		LOG_ERR("failed to set %s", "input config");
+		return ret;
+	}
+
+	ret = comp_mcux_acmp_set_filter_config(dev, &config->filter_config);
+	if (ret) {
+		LOG_ERR("failed to set %s", "filter config");
+		return ret;
+	}
+
+	ret = comp_mcux_acmp_set_dac_config(dev, &config->dac_config);
+	if (ret) {
+		LOG_ERR("failed to set %s", "dac config");
+		return ret;
+	}
+
+#if COMP_MCUX_ACMP_HAS_DISCRETE_MODE
+	ret = comp_mcux_acmp_set_dm_config(dev, &config->dm_config);
+	if (ret) {
+		LOG_ERR("failed to set %s", "discrete mode config");
+		return ret;
+	}
+#endif
+
+#if COMP_MCUX_ACMP_HAS_WINDOW_MODE
+	ret = comp_mcux_acmp_set_window_mode(dev, config->enable_window_mode);
+	if (ret) {
+		LOG_ERR("failed to set %s", "window mode");
+		return ret;
+	}
+#endif
+
+	ACMP_DisableInterrupts(config->base, UINT32_MAX);
+	config->irq_init();
+
+	return pm_device_driver_init(dev, mcux_acmp_pm_callback);
+}
+
+#define MCUX_ACMP_IRQ_HANDLER_SYM(inst) \
+	_CONCAT(mcux_acmp_irq_init, inst)
+
+#define MCUX_ACMP_IRQ_HANDLER_DEFINE(inst)							\
+	static void MCUX_ACMP_IRQ_HANDLER_SYM(inst)(void)					\
+	{											\
+		IRQ_CONNECT(DT_INST_IRQN(inst),							\
+			    DT_INST_IRQ(inst, priority),					\
+			    mcux_acmp_irq_handler,						\
+			    DEVICE_DT_INST_GET(inst),						\
+			    0);									\
+												\
+		irq_enable(DT_INST_IRQN(inst));							\
+	}
+
+#define MCUX_ACMP_DEVICE(inst)									\
+	PINCTRL_DT_INST_DEFINE(inst);								\
+												\
+	static struct mcux_acmp_data _CONCAT(data, inst);					\
+												\
+	MCUX_ACMP_IRQ_HANDLER_DEFINE(inst)							\
+												\
+	static const struct mcux_acmp_config _CONCAT(config, inst) = {				\
+		.base = (CMP_Type *)DT_INST_REG_ADDR(inst),					\
+		.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),					\
+		.irq_init = MCUX_ACMP_IRQ_HANDLER_SYM(inst),					\
+		.mode_config = MCUX_ACMP_DT_INST_MODE_CONFIG_INIT(inst),			\
+		.input_config = MCUX_ACMP_DT_INST_INPUT_CONFIG_INIT(inst),			\
+		.filter_config = MCUX_ACMP_DT_INST_FILTER_CONFIG_INIT(inst),			\
+		.dac_config = MCUX_ACMP_DT_INST_DAC_CONFIG_INIT(inst),				\
+		IF_ENABLED(COMP_MCUX_ACMP_HAS_DISCRETE_MODE,					\
+			   (.dm_config = MCUX_ACMP_DT_INST_DM_CONFIG_INIT(inst),))		\
+		IF_ENABLED(COMP_MCUX_ACMP_HAS_WINDOW_MODE,					\
+			   (.enable_window_mode = MCUX_ACMP_DT_INST_EN_WINDOW_MODE(inst),))	\
+	};											\
+												\
+	PM_DEVICE_DT_INST_DEFINE(inst, mcux_acmp_pm_callback);					\
+												\
+	DEVICE_DT_INST_DEFINE(inst,								\
+			      mcux_acmp_init,							\
+			      PM_DEVICE_DT_INST_GET(inst),					\
+			      &_CONCAT(data, inst),						\
+			      &_CONCAT(config, inst),						\
+			      POST_KERNEL,							\
+			      CONFIG_COMPARATOR_INIT_PRIORITY,					\
+			      &mcux_acmp_comp_api);
+
+DT_INST_FOREACH_STATUS_OKAY(MCUX_ACMP_DEVICE)
diff --git a/dts/bindings/comparator/nxp,kinetis-acmp.yaml b/dts/bindings/comparator/nxp,kinetis-acmp.yaml
index 76ce24b5bba..21db936c2bf 100644
--- a/dts/bindings/comparator/nxp,kinetis-acmp.yaml
+++ b/dts/bindings/comparator/nxp,kinetis-acmp.yaml
@@ -2,7 +2,39 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-description: NXP Kinetis ACMP (Analog CoMParator)
+description: |
+  NXP Kinetis ACMP (Analog CoMParator)
+
+  The following example displays the minimum node layout:
+
+    acmp0: acmp@deadbeef {
+            compatible = "nxp,kinetis-acmp";
+            reg = <0xdeadbeef 0x1000>;
+            interrupts = <0 0>;
+            clocks = <&scg KINETIS_SCG_BUS_CLK>;
+            status = "disabled";
+    };
+
+  Enabling the comparator node requires setting the minimum default
+  configuration of the comparator. This includes selecting the
+  positive and negative inputs, and routing them using pinctrl:
+
+    &pinctrl {
+            acmp0_default: acmp0_default {
+                    group0 {
+                            ...
+                    };
+            };
+    };
+
+    &acmp0 {
+            status = "okay";
+            pinctrl-0 = <&acmp0_default>;
+            pinctrl-names = "default";
+
+            positive-mux-input = "IN0";
+            negative-mux-input = "IN1";
+    };
 
 compatible: "nxp,kinetis-acmp"
 
diff --git a/include/zephyr/drivers/comparator/mcux_acmp.h b/include/zephyr/drivers/comparator/mcux_acmp.h
new file mode 100644
index 00000000000..3d06644f0e8
--- /dev/null
+++ b/include/zephyr/drivers/comparator/mcux_acmp.h
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_COMP_MCUX_ACMP_H_
+#define ZEPHYR_INCLUDE_DRIVERS_COMP_MCUX_ACMP_H_
+
+#include <zephyr/drivers/comparator.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum comp_mcux_acmp_offset_mode {
+	COMP_MCUX_ACMP_OFFSET_MODE_LEVEL0 = 0,
+	COMP_MCUX_ACMP_OFFSET_MODE_LEVEL1,
+};
+
+enum comp_mcux_acmp_hysteresis_mode {
+	COMP_MCUX_ACMP_HYSTERESIS_MODE_LEVEL0 = 0,
+	COMP_MCUX_ACMP_HYSTERESIS_MODE_LEVEL1,
+	COMP_MCUX_ACMP_HYSTERESIS_MODE_LEVEL2,
+	COMP_MCUX_ACMP_HYSTERESIS_MODE_LEVEL3,
+};
+
+struct comp_mcux_acmp_mode_config {
+	enum comp_mcux_acmp_offset_mode offset_mode;
+	enum comp_mcux_acmp_hysteresis_mode hysteresis_mode;
+	bool enable_high_speed_mode;
+	bool invert_output;
+	bool use_unfiltered_output;
+	bool enable_pin_output;
+};
+
+enum comp_mcux_acmp_mux_input {
+	COMP_MCUX_ACMP_MUX_INPUT_IN0 = 0,
+	COMP_MCUX_ACMP_MUX_INPUT_IN1,
+	COMP_MCUX_ACMP_MUX_INPUT_IN2,
+	COMP_MCUX_ACMP_MUX_INPUT_IN3,
+	COMP_MCUX_ACMP_MUX_INPUT_IN4,
+	COMP_MCUX_ACMP_MUX_INPUT_IN5,
+	COMP_MCUX_ACMP_MUX_INPUT_IN6,
+	COMP_MCUX_ACMP_MUX_INPUT_IN7,
+};
+
+enum comp_mcux_acmp_port_input {
+	COMP_MCUX_ACMP_PORT_INPUT_DAC = 0,
+	COMP_MCUX_ACMP_PORT_INPUT_MUX,
+};
+
+struct comp_mcux_acmp_input_config {
+	enum comp_mcux_acmp_mux_input positive_mux_input;
+	enum comp_mcux_acmp_mux_input negative_mux_input;
+	enum comp_mcux_acmp_port_input positive_port_input;
+	enum comp_mcux_acmp_port_input negative_port_input;
+};
+
+struct comp_mcux_acmp_filter_config {
+	bool enable_sample;
+	uint8_t filter_count;
+	uint8_t filter_period;
+};
+
+enum comp_mcux_acmp_dac_vref_source {
+	COMP_MCUX_ACMP_DAC_VREF_SOURCE_VIN1 = 0,
+	COMP_MCUX_ACMP_DAC_VREF_SOURCE_VIN2,
+};
+
+struct comp_mcux_acmp_dac_config {
+	enum comp_mcux_acmp_dac_vref_source vref_source;
+	uint8_t value;
+	bool enable_output;
+	bool enable_high_speed_mode;
+};
+
+enum comp_mcux_acmp_dm_clock {
+	COMP_MCUX_ACMP_DM_CLOCK_SLOW = 0,
+	COMP_MCUX_ACMP_DM_CLOCK_FAST,
+};
+
+enum comp_mcux_acmp_dm_sample_time {
+	COMP_MCUX_ACMP_DM_SAMPLE_TIME_T1 = 0,
+	COMP_MCUX_ACMP_DM_SAMPLE_TIME_T2,
+	COMP_MCUX_ACMP_DM_SAMPLE_TIME_T4,
+	COMP_MCUX_ACMP_DM_SAMPLE_TIME_T8,
+	COMP_MCUX_ACMP_DM_SAMPLE_TIME_T16,
+	COMP_MCUX_ACMP_DM_SAMPLE_TIME_T32,
+	COMP_MCUX_ACMP_DM_SAMPLE_TIME_T64,
+	COMP_MCUX_ACMP_DM_SAMPLE_TIME_T256,
+};
+
+enum comp_mcux_acmp_dm_phase_time {
+	COMP_MCUX_ACMP_DM_PHASE_TIME_ALT0 = 0,
+	COMP_MCUX_ACMP_DM_PHASE_TIME_ALT1,
+	COMP_MCUX_ACMP_DM_PHASE_TIME_ALT2,
+	COMP_MCUX_ACMP_DM_PHASE_TIME_ALT3,
+	COMP_MCUX_ACMP_DM_PHASE_TIME_ALT4,
+	COMP_MCUX_ACMP_DM_PHASE_TIME_ALT5,
+	COMP_MCUX_ACMP_DM_PHASE_TIME_ALT6,
+	COMP_MCUX_ACMP_DM_PHASE_TIME_ALT7,
+};
+
+struct comp_mcux_acmp_dm_config {
+	bool enable_positive_channel;
+	bool enable_negative_channel;
+	bool enable_resistor_divider;
+	enum comp_mcux_acmp_dm_clock clock_source;
+	enum comp_mcux_acmp_dm_sample_time sample_time;
+	enum comp_mcux_acmp_dm_phase_time phase1_time;
+	enum comp_mcux_acmp_dm_phase_time phase2_time;
+};
+
+int comp_mcux_acmp_set_mode_config(const struct device *dev,
+				   const struct comp_mcux_acmp_mode_config *config);
+
+int comp_mcux_acmp_set_input_config(const struct device *dev,
+				    const struct comp_mcux_acmp_input_config *config);
+
+int comp_mcux_acmp_set_filter_config(const struct device *dev,
+				     const struct comp_mcux_acmp_filter_config *config);
+
+int comp_mcux_acmp_set_dac_config(const struct device *dev,
+				  const struct comp_mcux_acmp_dac_config *config);
+
+int comp_mcux_acmp_set_dm_config(const struct device *dev,
+				 const struct comp_mcux_acmp_dm_config *config);
+
+int comp_mcux_acmp_set_window_mode(const struct device *dev, bool enable);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_COMP_MCUX_ACMP_H_ */

From 6ec7d9e47e07ae19c352bf6db2a2696b0139d2ba Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Thu, 5 Sep 2024 13:32:24 +0200
Subject: [PATCH 0513/2913] [nrf fromtree] tests: drivers: build_all:
 comparator: add mcux_acmp

Add mcux_acmp device driver to build_all test suite.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 6ed855a53f8f911ba247f4d0c6414030a909df42)
(cherry picked from commit ef7cbeeac9531ba315d9ef0744bdad974aa49bff)
---
 .../mcux_acmp/mimxrt1176_mux_dac.dts          | 46 +++++++++++++++++++
 .../mcux_acmp/mimxrt1176_mux_mux.dts          | 26 +++++++++++
 .../comparator/mcux_acmp/mke15z7_mux_dac.dts  | 22 +++++++++
 .../comparator/mcux_acmp/mke15z7_mux_mux.dts  | 16 +++++++
 .../comparator/mcux_acmp/mke15z7_pinctrl.dtsi | 20 ++++++++
 .../build_all/comparator/testcase.yaml        | 22 +++++++++
 6 files changed, 152 insertions(+)
 create mode 100644 tests/drivers/build_all/comparator/mcux_acmp/mimxrt1176_mux_dac.dts
 create mode 100644 tests/drivers/build_all/comparator/mcux_acmp/mimxrt1176_mux_mux.dts
 create mode 100644 tests/drivers/build_all/comparator/mcux_acmp/mke15z7_mux_dac.dts
 create mode 100644 tests/drivers/build_all/comparator/mcux_acmp/mke15z7_mux_mux.dts
 create mode 100644 tests/drivers/build_all/comparator/mcux_acmp/mke15z7_pinctrl.dtsi

diff --git a/tests/drivers/build_all/comparator/mcux_acmp/mimxrt1176_mux_dac.dts b/tests/drivers/build_all/comparator/mcux_acmp/mimxrt1176_mux_dac.dts
new file mode 100644
index 00000000000..86ee224d74c
--- /dev/null
+++ b/tests/drivers/build_all/comparator/mcux_acmp/mimxrt1176_mux_dac.dts
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	acmp1_default: acmp1_default {
+		group0 {
+			pinmux = <&iomuxc_gpio_ad_01_acmp1_in2>;
+			drive-strength = "high";
+			bias-pull-up;
+			slew-rate = "fast";
+		};
+	};
+};
+
+&acmp1 {
+	status = "okay";
+	pinctrl-0 = <&acmp1_default>;
+	pinctrl-names = "default";
+
+	positive-mux-input = "IN2";
+	positive-port-input = "MUX";
+	negative-mux-input = "IN2";
+	negative-port-input = "DAC";
+
+	dac-vref-source = "VIN1";
+	dac-value = <128>;
+	dac-enable;
+
+	offset-mode = "LEVEL0";
+	hysteresis-mode = "LEVEL0";
+	enable-high-speed-mode;
+
+	filter-enable-sample;
+	filter-count = <4>;
+	filter-period = <32>;
+
+	discrete-mode-enable-positive-channel;
+	discrete-mode-enable-resistor-divider;
+	discrete-mode-clock-source = "FAST";
+	discrete-mode-sample-time = "T1";
+	discrete-mode-phase1-time = "ALT4";
+	discrete-mode-phase2-time = "ALT7";
+};
diff --git a/tests/drivers/build_all/comparator/mcux_acmp/mimxrt1176_mux_mux.dts b/tests/drivers/build_all/comparator/mcux_acmp/mimxrt1176_mux_mux.dts
new file mode 100644
index 00000000000..a240e8ce4fb
--- /dev/null
+++ b/tests/drivers/build_all/comparator/mcux_acmp/mimxrt1176_mux_mux.dts
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	acmp1_default: acmp1_default {
+		group0 {
+			pinmux = <&iomuxc_gpio_ad_00_acmp1_in1>,
+				 <&iomuxc_gpio_ad_01_acmp1_in2>;
+			drive-strength = "high";
+			bias-pull-up;
+			slew-rate = "fast";
+		};
+	};
+};
+
+&acmp1 {
+	status = "okay";
+	pinctrl-0 = <&acmp1_default>;
+	pinctrl-names = "default";
+
+	positive-mux-input = "IN1";
+	negative-mux-input = "IN2";
+};
diff --git a/tests/drivers/build_all/comparator/mcux_acmp/mke15z7_mux_dac.dts b/tests/drivers/build_all/comparator/mcux_acmp/mke15z7_mux_dac.dts
new file mode 100644
index 00000000000..23f8bb7c4fd
--- /dev/null
+++ b/tests/drivers/build_all/comparator/mcux_acmp/mke15z7_mux_dac.dts
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "mke15z7_pinctrl.dtsi"
+
+&cmp0 {
+	pinctrl-0 = <&cmp0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	positive-mux-input = "IN0";
+	positive-port-input = "MUX";
+	negative-mux-input = "IN0";
+	negative-port-input = "DAC";
+
+	dac-vref-source = "VIN1";
+	dac-value = <128>;
+	dac-enable;
+};
diff --git a/tests/drivers/build_all/comparator/mcux_acmp/mke15z7_mux_mux.dts b/tests/drivers/build_all/comparator/mcux_acmp/mke15z7_mux_mux.dts
new file mode 100644
index 00000000000..61e0353d5db
--- /dev/null
+++ b/tests/drivers/build_all/comparator/mcux_acmp/mke15z7_mux_mux.dts
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "mke15z7_pinctrl.dtsi"
+
+&cmp0 {
+	pinctrl-0 = <&cmp0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	positive-mux-input = "IN0";
+	negative-mux-input = "IN1";
+};
diff --git a/tests/drivers/build_all/comparator/mcux_acmp/mke15z7_pinctrl.dtsi b/tests/drivers/build_all/comparator/mcux_acmp/mke15z7_pinctrl.dtsi
new file mode 100644
index 00000000000..62bddf7b924
--- /dev/null
+++ b/tests/drivers/build_all/comparator/mcux_acmp/mke15z7_pinctrl.dtsi
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <nxp/kinetis/MKE17Z256VLL7-pinctrl.h>
+
+&pinctrl {
+	cmp0_default: cmp0_default {
+		group0 {
+			pinmux = <ACMP0_IN0_PTA0>,
+				 <ACMP0_IN1_PTA1>,
+				 <ACMP0_OUT_PTA4>,
+				 <ACMP0_IN5_PTC2>;
+
+			drive-strength = "high";
+		};
+	};
+};
diff --git a/tests/drivers/build_all/comparator/testcase.yaml b/tests/drivers/build_all/comparator/testcase.yaml
index 8dbc9dfb32a..a0578daa9ff 100644
--- a/tests/drivers/build_all/comparator/testcase.yaml
+++ b/tests/drivers/build_all/comparator/testcase.yaml
@@ -66,3 +66,25 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf9280pdk/nrf9280/cpuapp
+  drivers.build_all.comparator.mcux_acmp.mimxrt1176_mux_dac:
+    extra_args:
+      - DTC_OVERLAY_FILE="mcux_acmp/mimxrt1176_mux_dac.dts"
+    platform_allow:
+      - mimxrt1170_evk/mimxrt1176/cm4
+      - mimxrt1170_evk/mimxrt1176/cm7
+  drivers.build_all.comparator.mcux_acmp.mimxrt1176_mux_mux:
+    extra_args:
+      - DTC_OVERLAY_FILE="mcux_acmp/mimxrt1176_mux_mux.dts"
+    platform_allow:
+      - mimxrt1170_evk/mimxrt1176/cm4
+      - mimxrt1170_evk/mimxrt1176/cm7
+  drivers.build_all.comparator.mcux_acmp.mke15z7_mux_dac:
+    extra_args:
+      - DTC_OVERLAY_FILE="mcux_acmp/mke15z7_mux_dac.dts"
+    platform_allow:
+      - frdm_ke15z
+  drivers.build_all.comparator.mcux_acmp.mke15z7_mux_mux:
+    extra_args:
+      - DTC_OVERLAY_FILE="mcux_acmp/mke15z7_mux_mux.dts"
+    platform_allow:
+      - frdm_ke15z

From 39413b2822f26c0fa45f297a81d21b946449020a Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Sun, 1 Sep 2024 17:35:19 +0200
Subject: [PATCH 0514/2913] [nrf fromtree] drivers: comparator: add shell

Add shell for comparator device drivers.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit b7648f89c460641b34dfd90101bf995d584e8c7e)
(cherry picked from commit c12fade881c46ca0a081619350fc2d2563b4a66f)
---
 drivers/comparator/CMakeLists.txt     |   1 +
 drivers/comparator/Kconfig            |   1 +
 drivers/comparator/Kconfig.shell      |  21 ++
 drivers/comparator/comparator_shell.c | 279 ++++++++++++++++++++++++++
 4 files changed, 302 insertions(+)
 create mode 100644 drivers/comparator/Kconfig.shell
 create mode 100644 drivers/comparator/comparator_shell.c

diff --git a/drivers/comparator/CMakeLists.txt b/drivers/comparator/CMakeLists.txt
index b5fe633a333..f4378c76a77 100644
--- a/drivers/comparator/CMakeLists.txt
+++ b/drivers/comparator/CMakeLists.txt
@@ -9,3 +9,4 @@ zephyr_library_sources_ifdef(CONFIG_USERSPACE comparator_handlers.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_MCUX_ACMP comparator_mcux_acmp.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_COMP comparator_nrf_comp.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_LPCOMP comparator_nrf_lpcomp.c)
+zephyr_library_sources_ifdef(CONFIG_COMPARATOR_SHELL comparator_shell.c)
diff --git a/drivers/comparator/Kconfig b/drivers/comparator/Kconfig
index 871ee5d9ed6..f49ff182562 100644
--- a/drivers/comparator/Kconfig
+++ b/drivers/comparator/Kconfig
@@ -21,5 +21,6 @@ config COMPARATOR_INIT_PRIORITY
 rsource "Kconfig.mcux_acmp"
 rsource "Kconfig.nrf_comp"
 rsource "Kconfig.nrf_lpcomp"
+rsource "Kconfig.shell"
 
 endif # COMPARATOR
diff --git a/drivers/comparator/Kconfig.shell b/drivers/comparator/Kconfig.shell
new file mode 100644
index 00000000000..de244619be3
--- /dev/null
+++ b/drivers/comparator/Kconfig.shell
@@ -0,0 +1,21 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config COMPARATOR_SHELL
+	bool "Comparator shell"
+	default y
+	depends on SHELL
+	help
+	  Comparator device driver shell.
+
+if COMPARATOR_SHELL
+
+config COMPARATOR_SHELL_AWAIT_TRIGGER_DEFAULT_TIMEOUT
+	int "Default timeout for await_trigger command in seconds"
+	default 10
+
+config COMPARATOR_SHELL_AWAIT_TRIGGER_MAX_TIMEOUT
+	int "Max timeout for await_trigger command in seconds"
+	default 60
+
+endif # COMPARATOR_SHELL
diff --git a/drivers/comparator/comparator_shell.c b/drivers/comparator/comparator_shell.c
new file mode 100644
index 00000000000..2d747530871
--- /dev/null
+++ b/drivers/comparator/comparator_shell.c
@@ -0,0 +1,279 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/comparator.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/kernel.h>
+
+#include <stdlib.h>
+
+#define AWAIT_TRIGGER_DEFAULT_TIMEOUT \
+	CONFIG_COMPARATOR_SHELL_AWAIT_TRIGGER_DEFAULT_TIMEOUT
+
+#define AWAIT_TRIGGER_MAX_TIMEOUT \
+	CONFIG_COMPARATOR_SHELL_AWAIT_TRIGGER_MAX_TIMEOUT
+
+/* Mapped 1-1 to enum comparator_trigger */
+static const char *const trigger_lookup[] = {
+	"NONE",
+	"RISING_EDGE",
+	"FALLING_EDGE",
+	"BOTH_EDGES",
+};
+
+static K_SEM_DEFINE(triggered_sem, 0, 1);
+
+static int get_device_from_str(const struct shell *sh,
+			       const char *dev_str,
+			       const struct device **dev)
+{
+	*dev = device_get_binding(dev_str);
+
+	if (*dev == NULL) {
+		shell_error(sh, "%s not %s", dev_str, "found");
+		return -ENODEV;
+	}
+
+	if (!device_is_ready(*dev)) {
+		shell_error(sh, "%s not %s", dev_str, "ready");
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
+static int cmd_get_output(const struct shell *sh, size_t argc, char **argv)
+{
+	int ret;
+	const char *dev_str;
+	const struct device *dev;
+
+	ARG_UNUSED(argc);
+
+	dev_str = argv[1];
+	ret = get_device_from_str(sh, dev_str, &dev);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = comparator_get_output(dev);
+	if (ret < 0) {
+		shell_error(sh, "failed to %s %s", "get", "output");
+		return -EIO;
+	}
+
+	shell_print(sh, "%i", ret);
+	return 0;
+}
+
+static int get_trigger_from_str(const struct shell *sh,
+				const char *trigger_str,
+				enum comparator_trigger *trigger)
+{
+	ARRAY_FOR_EACH(trigger_lookup, i) {
+		if (strcmp(trigger_lookup[i], trigger_str) == 0) {
+			*trigger = (enum comparator_trigger)i;
+			return 0;
+		}
+	}
+
+	shell_error(sh, "%s not %s", trigger_str, "valid");
+	return -EINVAL;
+}
+
+static int cmd_set_trigger(const struct shell *sh, size_t argc, char **argv)
+{
+	const char *dev_str;
+	const char *trigger_str;
+	int ret;
+	const struct device *dev;
+	enum comparator_trigger trigger;
+
+	ARG_UNUSED(argc);
+
+	dev_str = argv[1];
+	ret = get_device_from_str(sh, dev_str, &dev);
+	if (ret < 0) {
+		return ret;
+	}
+
+	trigger_str = argv[2];
+	ret = get_trigger_from_str(sh, trigger_str, &trigger);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = comparator_set_trigger(dev, trigger);
+	if (ret < 0) {
+		shell_error(sh, "failed to %s %s", "set", "trigger");
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int get_timeout_from_str(const struct shell *sh,
+				const char *timeout_str,
+				k_timeout_t *timeout)
+{
+	long seconds;
+	char *end;
+
+	seconds = strtol(timeout_str, &end, 10);
+	if ((*end != '\0') ||
+	    (seconds < 1) ||
+	    (seconds > AWAIT_TRIGGER_MAX_TIMEOUT)) {
+		shell_error(sh, "%s not %s", timeout_str, "valid");
+		return -EINVAL;
+	}
+
+	*timeout = K_SECONDS(seconds);
+	return 0;
+}
+
+static void trigger_cb(const struct device *dev, void *user_data)
+{
+	ARG_UNUSED(dev);
+	ARG_UNUSED(user_data);
+
+	k_sem_give(&triggered_sem);
+}
+
+static int cmd_await_trigger(const struct shell *sh, size_t argc, char **argv)
+{
+	const char *dev_str;
+	const char *timeout_str;
+	int ret;
+	const struct device *dev;
+	k_timeout_t timeout;
+
+	dev_str = argv[1];
+	ret = get_device_from_str(sh, dev_str, &dev);
+	if (ret < 0) {
+		return ret;
+	}
+
+	if (argc == 3) {
+		timeout_str = argv[2];
+		ret = get_timeout_from_str(sh, timeout_str, &timeout);
+		if (ret < 0) {
+			return ret;
+		}
+	} else {
+		timeout = K_SECONDS(AWAIT_TRIGGER_DEFAULT_TIMEOUT);
+	}
+
+	k_sem_reset(&triggered_sem);
+
+	ret = comparator_set_trigger_callback(dev, trigger_cb, NULL);
+	if (ret < 0) {
+		shell_error(sh, "failed to %s %s", "set", "trigger callback");
+		return -EIO;
+	}
+
+	ret = k_sem_take(&triggered_sem, timeout);
+	if (ret == 0) {
+		shell_print(sh, "triggered");
+	} else if (ret == -EAGAIN) {
+		shell_print(sh, "timed out");
+	} else {
+		shell_error(sh, "internal error");
+	}
+
+	ret = comparator_set_trigger_callback(dev, NULL, NULL);
+	if (ret < 0) {
+		shell_error(sh, "failed to %s %s", "clear", "trigger callback");
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int cmd_trigger_is_pending(const struct shell *sh, size_t argc, char **argv)
+{
+	int ret;
+	const char *dev_str;
+	const struct device *dev;
+
+	ARG_UNUSED(argc);
+
+	dev_str = argv[1];
+	ret = get_device_from_str(sh, dev_str, &dev);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = comparator_trigger_is_pending(dev);
+	if (ret < 0) {
+		shell_error(sh, "failed to %s %s", "get", "trigger status");
+		return -EIO;
+	}
+
+	shell_print(sh, "%i", ret);
+	return 0;
+}
+
+static void dsub_set_trigger_lookup_1(size_t idx, struct shell_static_entry *entry)
+{
+	entry->syntax = (idx < ARRAY_SIZE(trigger_lookup)) ? trigger_lookup[idx] : NULL;
+	entry->handler = NULL;
+	entry->help = NULL;
+	entry->subcmd = NULL;
+}
+
+SHELL_DYNAMIC_CMD_CREATE(dsub_set_trigger_1, dsub_set_trigger_lookup_1);
+
+static void dsub_set_trigger_lookup_0(size_t idx, struct shell_static_entry *entry)
+{
+	const struct device *dev = shell_device_lookup(idx, NULL);
+
+	entry->syntax = dev != NULL ? dev->name : NULL;
+	entry->handler = NULL;
+	entry->help = NULL;
+	entry->subcmd = &dsub_set_trigger_1;
+}
+
+SHELL_DYNAMIC_CMD_CREATE(dsub_set_trigger_0, dsub_set_trigger_lookup_0);
+
+static void dsub_device_lookup_0(size_t idx, struct shell_static_entry *entry)
+{
+	const struct device *dev = shell_device_lookup(idx, NULL);
+
+	entry->syntax = (dev != NULL) ? dev->name : NULL;
+	entry->handler = NULL;
+	entry->help = NULL;
+	entry->subcmd = NULL;
+}
+
+SHELL_DYNAMIC_CMD_CREATE(dsub_device_0, dsub_device_lookup_0);
+
+#define GET_OUTPUT_HELP \
+	("comp get_output <device>")
+
+#define SET_TRIGGER_HELP \
+	("comp set_trigger <device> <NONE | RISING_EDGE | FALLING_EDGE | BOTH_EDGES>")
+
+#define AWAIT_TRIGGER_HELP								\
+	("comp await_trigger <device> [timeout] (default "				\
+	 STRINGIFY(AWAIT_TRIGGER_DEFAULT_TIMEOUT)					\
+	 "s, max "									\
+	 STRINGIFY(AWAIT_TRIGGER_MAX_TIMEOUT)						\
+	 "s)")
+
+#define TRIGGER_PENDING_HELP \
+	("comp trigger_is_pending <device>")
+
+SHELL_STATIC_SUBCMD_SET_CREATE(
+	sub_comp,
+	SHELL_CMD_ARG(get_output, &dsub_device_0, GET_OUTPUT_HELP, cmd_get_output, 2, 0),
+	SHELL_CMD_ARG(set_trigger, &dsub_set_trigger_0, SET_TRIGGER_HELP, cmd_set_trigger, 3, 0),
+	SHELL_CMD_ARG(await_trigger, &dsub_device_0, AWAIT_TRIGGER_HELP, cmd_await_trigger, 2, 1),
+	SHELL_CMD_ARG(trigger_is_pending, &dsub_device_0, TRIGGER_PENDING_HELP,
+		      cmd_trigger_is_pending, 2, 1),
+	SHELL_SUBCMD_SET_END
+);
+
+SHELL_CMD_REGISTER(comp, &sub_comp, "Comparator device commands", NULL);

From f88377ae2a11b1c5d0a2d69912b3ac60625a92bf Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Fri, 6 Sep 2024 10:51:31 +0200
Subject: [PATCH 0515/2913] [nrf fromtree] drivers: comparator: add fake
 comparator

Add fake comparator driver and bindings for use with testing.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 2fbe105a473bf58747cf868bfb8c3b3daf7ab089)
(cherry picked from commit 5a43ffeb705b70790625a7e83d08a69bc4e524f4)
---
 drivers/comparator/CMakeLists.txt             |  1 +
 drivers/comparator/Kconfig                    |  1 +
 drivers/comparator/Kconfig.fake_comp          |  8 +++
 drivers/comparator/comparator_fake_comp.c     | 65 +++++++++++++++++++
 dts/bindings/comparator/zephyr,comp-fake.yaml |  8 +++
 include/zephyr/drivers/comparator/fake_comp.h | 40 ++++++++++++
 6 files changed, 123 insertions(+)
 create mode 100644 drivers/comparator/Kconfig.fake_comp
 create mode 100644 drivers/comparator/comparator_fake_comp.c
 create mode 100644 dts/bindings/comparator/zephyr,comp-fake.yaml
 create mode 100644 include/zephyr/drivers/comparator/fake_comp.h

diff --git a/drivers/comparator/CMakeLists.txt b/drivers/comparator/CMakeLists.txt
index f4378c76a77..43462d64288 100644
--- a/drivers/comparator/CMakeLists.txt
+++ b/drivers/comparator/CMakeLists.txt
@@ -6,6 +6,7 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/comparator.h)
 zephyr_library()
 
 zephyr_library_sources_ifdef(CONFIG_USERSPACE comparator_handlers.c)
+zephyr_library_sources_ifdef(CONFIG_COMPARATOR_FAKE_COMP comparator_fake_comp.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_MCUX_ACMP comparator_mcux_acmp.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_COMP comparator_nrf_comp.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_LPCOMP comparator_nrf_lpcomp.c)
diff --git a/drivers/comparator/Kconfig b/drivers/comparator/Kconfig
index f49ff182562..978adc03251 100644
--- a/drivers/comparator/Kconfig
+++ b/drivers/comparator/Kconfig
@@ -18,6 +18,7 @@ config COMPARATOR_INIT_PRIORITY
 	help
 	  Comparator device driver initialization priority.
 
+rsource "Kconfig.fake_comp"
 rsource "Kconfig.mcux_acmp"
 rsource "Kconfig.nrf_comp"
 rsource "Kconfig.nrf_lpcomp"
diff --git a/drivers/comparator/Kconfig.fake_comp b/drivers/comparator/Kconfig.fake_comp
new file mode 100644
index 00000000000..5fca8db1878
--- /dev/null
+++ b/drivers/comparator/Kconfig.fake_comp
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config COMPARATOR_FAKE_COMP
+	bool "Fake comparator driver"
+	default y
+	depends on DT_HAS_ZEPHYR_FAKE_COMP_ENABLED
+	depends on ZTEST
diff --git a/drivers/comparator/comparator_fake_comp.c b/drivers/comparator/comparator_fake_comp.c
new file mode 100644
index 00000000000..85abbad2174
--- /dev/null
+++ b/drivers/comparator/comparator_fake_comp.c
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/comparator/fake_comp.h>
+
+#ifdef CONFIG_ZTEST
+#include <zephyr/ztest.h>
+#endif
+
+#define DT_DRV_COMPAT zephyr_fake_comp
+
+DEFINE_FAKE_VALUE_FUNC(int,
+		       comp_fake_comp_get_output,
+		       const struct device *);
+
+DEFINE_FAKE_VALUE_FUNC(int,
+		       comp_fake_comp_set_trigger,
+		       const struct device *,
+		       enum comparator_trigger);
+
+DEFINE_FAKE_VALUE_FUNC(int,
+		       comp_fake_comp_set_trigger_callback,
+		       const struct device *,
+		       comparator_callback_t,
+		       void *);
+
+DEFINE_FAKE_VALUE_FUNC(int,
+		       comp_fake_comp_trigger_is_pending,
+		       const struct device *);
+
+static const struct comparator_driver_api fake_comp_api = {
+	.get_output = comp_fake_comp_get_output,
+	.set_trigger = comp_fake_comp_set_trigger,
+	.set_trigger_callback = comp_fake_comp_set_trigger_callback,
+	.trigger_is_pending = comp_fake_comp_trigger_is_pending,
+};
+
+#ifdef CONFIG_ZTEST
+static void fake_comp_reset_rule_before(const struct ztest_unit_test *test, void *fixture)
+{
+	ARG_UNUSED(test);
+	ARG_UNUSED(fixture);
+
+	RESET_FAKE(comp_fake_comp_get_output);
+	RESET_FAKE(comp_fake_comp_set_trigger);
+	RESET_FAKE(comp_fake_comp_set_trigger_callback);
+	RESET_FAKE(comp_fake_comp_trigger_is_pending);
+}
+
+ZTEST_RULE(comp_fake_comp_reset_rule, fake_comp_reset_rule_before, NULL);
+#endif
+
+DEVICE_DT_INST_DEFINE(
+	0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	POST_KERNEL,
+	CONFIG_COMPARATOR_INIT_PRIORITY,
+	&fake_comp_api
+);
diff --git a/dts/bindings/comparator/zephyr,comp-fake.yaml b/dts/bindings/comparator/zephyr,comp-fake.yaml
new file mode 100644
index 00000000000..ac344f4639c
--- /dev/null
+++ b/dts/bindings/comparator/zephyr,comp-fake.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Fake comparator device used as stub or mock for testing
+
+compatible: "zephyr,fake-comp"
+
+include: base.yaml
diff --git a/include/zephyr/drivers/comparator/fake_comp.h b/include/zephyr/drivers/comparator/fake_comp.h
new file mode 100644
index 00000000000..c24858c1997
--- /dev/null
+++ b/include/zephyr/drivers/comparator/fake_comp.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_COMPARATOR_FAKE_H_
+#define ZEPHYR_INCLUDE_DRIVERS_COMPARATOR_FAKE_H_
+
+#include <zephyr/drivers/comparator.h>
+#include <zephyr/fff.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+DECLARE_FAKE_VALUE_FUNC(int,
+			comp_fake_comp_get_output,
+			const struct device *);
+
+DECLARE_FAKE_VALUE_FUNC(int,
+			comp_fake_comp_set_trigger,
+			const struct device *,
+			enum comparator_trigger);
+
+DECLARE_FAKE_VALUE_FUNC(int,
+			comp_fake_comp_set_trigger_callback,
+			const struct device *,
+			comparator_callback_t,
+			void *);
+
+DECLARE_FAKE_VALUE_FUNC(int,
+			comp_fake_comp_trigger_is_pending,
+			const struct device *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_COMPARATOR_FAKE_H_ */

From 305afdd52c6bec523f463325bea863492d876965 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Sun, 15 Sep 2024 18:06:37 +0200
Subject: [PATCH 0516/2913] [nrf fromtree] tests: drivers: comparator: add
 shell test suite

Add test suite for comparator device driver shell.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 4ff9886e48a31b79da35a4fbc465cfb5735984ce)
(cherry picked from commit c99b9328fef98806c892541c6d0c7af6706e4899)
---
 tests/drivers/comparator/shell/CMakeLists.txt |   8 +
 tests/drivers/comparator/shell/app.overlay    |  12 +
 tests/drivers/comparator/shell/prj.conf       |  10 +
 tests/drivers/comparator/shell/src/test.c     | 357 ++++++++++++++++++
 tests/drivers/comparator/shell/testcase.yaml  |  12 +
 5 files changed, 399 insertions(+)
 create mode 100644 tests/drivers/comparator/shell/CMakeLists.txt
 create mode 100644 tests/drivers/comparator/shell/app.overlay
 create mode 100644 tests/drivers/comparator/shell/prj.conf
 create mode 100644 tests/drivers/comparator/shell/src/test.c
 create mode 100644 tests/drivers/comparator/shell/testcase.yaml

diff --git a/tests/drivers/comparator/shell/CMakeLists.txt b/tests/drivers/comparator/shell/CMakeLists.txt
new file mode 100644
index 00000000000..c2f34f71e68
--- /dev/null
+++ b/tests/drivers/comparator/shell/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(comparator_shell)
+
+target_sources(app PRIVATE src/test.c)
diff --git a/tests/drivers/comparator/shell/app.overlay b/tests/drivers/comparator/shell/app.overlay
new file mode 100644
index 00000000000..3bb03b5a569
--- /dev/null
+++ b/tests/drivers/comparator/shell/app.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/{
+	fake_comp: fake_comp {
+		compatible = "zephyr,fake-comp";
+		status = "okay";
+	};
+};
diff --git a/tests/drivers/comparator/shell/prj.conf b/tests/drivers/comparator/shell/prj.conf
new file mode 100644
index 00000000000..a1eb4324cee
--- /dev/null
+++ b/tests/drivers/comparator/shell/prj.conf
@@ -0,0 +1,10 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_SHELL=y
+CONFIG_SHELL_BACKEND_SERIAL=n
+CONFIG_SHELL_VT100_COMMANDS=n
+CONFIG_SHELL_BACKEND_DUMMY=y
+CONFIG_COMPARATOR=y
+CONFIG_COMPARATOR_SHELL=y
+CONFIG_ZTEST=y
diff --git a/tests/drivers/comparator/shell/src/test.c b/tests/drivers/comparator/shell/src/test.c
new file mode 100644
index 00000000000..dacefc9311a
--- /dev/null
+++ b/tests/drivers/comparator/shell/src/test.c
@@ -0,0 +1,357 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/comparator.h>
+#include <zephyr/drivers/comparator/fake_comp.h>
+#include <zephyr/fff.h>
+#include <zephyr/kernel.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/shell/shell_dummy.h>
+#include <zephyr/ztest.h>
+
+DEFINE_FFF_GLOBALS;
+
+#define FAKE_COMP_NODE DT_NODELABEL(fake_comp)
+#define FAKE_COMP_NAME DEVICE_DT_NAME(FAKE_COMP_NODE)
+
+#define TEST_TRIGGER_DELAY K_SECONDS(1)
+
+#define TEST_AWAIT_TRIGGER_TIMEOUT_BELOW_MIN_CMD \
+	("comp await_trigger " FAKE_COMP_NAME " 0")
+
+#define TEST_AWAIT_TRIGGER_TIMEOUT_ABOVE_MAX_CMD						\
+	("comp await_trigger " FAKE_COMP_NAME " "						\
+	 STRINGIFY(CONFIG_COMPARATOR_SHELL_AWAIT_TRIGGER_MAX_TIMEOUT + 1))
+
+#define TEST_AWAIT_TRIGGER_TIMEOUT_BROKEN_CMD \
+	("comp await_trigger " FAKE_COMP_NAME " d")
+
+static const struct shell *test_sh;
+static const struct device *test_dev = DEVICE_DT_GET(FAKE_COMP_NODE);
+static comparator_callback_t test_callback;
+static void *test_callback_user_data;
+static struct k_spinlock test_callback_spinlock;
+static struct k_work_delayable test_trigger_dwork;
+
+static int test_get_output_stub_1(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	return 1;
+}
+
+static int test_get_output_stub_0(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	return 0;
+}
+
+static int test_get_output_stub_eio(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	return -EIO;
+}
+
+static int test_set_trigger_stub_ok(const struct device *dev, enum comparator_trigger trigger)
+{
+	ARG_UNUSED(dev);
+	ARG_UNUSED(trigger);
+
+	return 0;
+}
+
+static int test_set_trigger_stub_eio(const struct device *dev, enum comparator_trigger trigger)
+{
+	ARG_UNUSED(dev);
+	ARG_UNUSED(trigger);
+
+	return -EIO;
+}
+
+static int test_set_trigger_callback_mock_0(const struct device *dev,
+					    comparator_callback_t callback,
+					    void *user_data)
+{
+	ARG_UNUSED(dev);
+
+	K_SPINLOCK(&test_callback_spinlock) {
+		test_callback = callback;
+		test_callback_user_data = user_data;
+	}
+
+	return 0;
+}
+
+static int test_set_trigger_callback_stub_0(const struct device *dev,
+					    comparator_callback_t callback,
+					    void *user_data)
+{
+	ARG_UNUSED(dev);
+	ARG_UNUSED(callback);
+	ARG_UNUSED(user_data);
+
+	return 0;
+}
+
+static int test_set_trigger_callback_stub_eio(const struct device *dev,
+					      comparator_callback_t callback,
+					      void *user_data)
+{
+	ARG_UNUSED(dev);
+	ARG_UNUSED(callback);
+	ARG_UNUSED(user_data);
+
+	return -EIO;
+}
+
+static int test_trigger_is_pending_stub_1(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	return 1;
+}
+
+static int test_trigger_is_pending_stub_0(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	return 0;
+}
+
+static int test_trigger_is_pending_stub_eio(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	return -EIO;
+}
+
+
+static void test_trigger_handler(struct k_work *work)
+{
+	ARG_UNUSED(work);
+
+	test_callback(test_dev, test_callback_user_data);
+}
+
+static void test_schedule_trigger(void)
+{
+	k_work_schedule(&test_trigger_dwork, TEST_TRIGGER_DELAY);
+}
+
+static void test_cancel_trigger(void)
+{
+	struct k_work_sync sync;
+
+	k_work_cancel_delayable_sync(&test_trigger_dwork, &sync);
+}
+
+static void *test_setup(void)
+{
+	k_work_init_delayable(&test_trigger_dwork, test_trigger_handler);
+	test_sh = shell_backend_dummy_get_ptr();
+	WAIT_FOR(shell_ready(test_sh), 20000, k_msleep(1));
+	zassert_true(shell_ready(test_sh), "timed out waiting for dummy shell backend");
+	return NULL;
+}
+
+static void test_after(void *f)
+{
+	ARG_UNUSED(f);
+
+	test_cancel_trigger();
+}
+
+ZTEST(comparator_shell, test_get_output)
+{
+	int ret;
+	const char *out;
+	size_t out_size;
+
+	shell_backend_dummy_clear_output(test_sh);
+	comp_fake_comp_get_output_fake.custom_fake = test_get_output_stub_1;
+	ret = shell_execute_cmd(test_sh, "comp get_output " FAKE_COMP_NAME);
+	zassert_ok(ret);
+	zassert_equal(comp_fake_comp_get_output_fake.call_count, 1);
+	zassert_equal(comp_fake_comp_get_output_fake.arg0_val, test_dev);
+	out = shell_backend_dummy_get_output(test_sh, &out_size);
+	zassert_str_equal(out, "\r\n1\r\n");
+
+	comp_fake_comp_get_output_fake.custom_fake = test_get_output_stub_0;
+	ret = shell_execute_cmd(test_sh, "comp get_output " FAKE_COMP_NAME);
+	zassert_ok(ret);
+	zassert_equal(comp_fake_comp_get_output_fake.call_count, 2);
+	zassert_equal(comp_fake_comp_get_output_fake.arg0_val, test_dev);
+	out = shell_backend_dummy_get_output(test_sh, &out_size);
+	zassert_str_equal(out, "\r\n0\r\n");
+
+	comp_fake_comp_get_output_fake.custom_fake = test_get_output_stub_eio;
+	ret = shell_execute_cmd(test_sh, "comp get_output " FAKE_COMP_NAME);
+	zassert_equal(ret, -EIO);
+	zassert_equal(comp_fake_comp_get_output_fake.call_count, 3);
+	zassert_equal(comp_fake_comp_get_output_fake.arg0_val, test_dev);
+	out = shell_backend_dummy_get_output(test_sh, &out_size);
+	zassert_str_equal(out, "\r\nfailed to get output\r\n");
+}
+
+ZTEST(comparator_shell, test_set_trigger)
+{
+	int ret;
+	const char *out;
+	size_t out_size;
+
+	comp_fake_comp_set_trigger_fake.custom_fake = test_set_trigger_stub_ok;
+
+	ret = shell_execute_cmd(test_sh, "comp set_trigger " FAKE_COMP_NAME " NONE");
+	zassert_ok(ret);
+	zassert_equal(comp_fake_comp_set_trigger_fake.call_count, 1);
+	zassert_equal(comp_fake_comp_set_trigger_fake.arg0_val, test_dev);
+	zassert_equal(comp_fake_comp_set_trigger_fake.arg1_val, COMPARATOR_TRIGGER_NONE);
+
+	ret = shell_execute_cmd(test_sh, "comp set_trigger " FAKE_COMP_NAME " RISING_EDGE");
+	zassert_ok(ret);
+	zassert_equal(comp_fake_comp_set_trigger_fake.call_count, 2);
+	zassert_equal(comp_fake_comp_set_trigger_fake.arg0_val, test_dev);
+	zassert_equal(comp_fake_comp_set_trigger_fake.arg1_val, COMPARATOR_TRIGGER_RISING_EDGE);
+
+	ret = shell_execute_cmd(test_sh, "comp set_trigger " FAKE_COMP_NAME " FALLING_EDGE");
+	zassert_ok(ret);
+	zassert_equal(comp_fake_comp_set_trigger_fake.call_count, 3);
+	zassert_equal(comp_fake_comp_set_trigger_fake.arg0_val, test_dev);
+	zassert_equal(comp_fake_comp_set_trigger_fake.arg1_val, COMPARATOR_TRIGGER_FALLING_EDGE);
+
+	ret = shell_execute_cmd(test_sh, "comp set_trigger " FAKE_COMP_NAME " BOTH_EDGES");
+	zassert_ok(ret);
+	zassert_equal(comp_fake_comp_set_trigger_fake.call_count, 4);
+	zassert_equal(comp_fake_comp_set_trigger_fake.arg0_val, test_dev);
+	zassert_equal(comp_fake_comp_set_trigger_fake.arg1_val, COMPARATOR_TRIGGER_BOTH_EDGES);
+
+	ret = shell_execute_cmd(test_sh, "comp set_trigger " FAKE_COMP_NAME " INVALID");
+	zassert_equal(ret, -EINVAL);
+	zassert_equal(comp_fake_comp_set_trigger_fake.call_count, 4);
+
+	comp_fake_comp_set_trigger_fake.custom_fake = test_set_trigger_stub_eio;
+
+	shell_backend_dummy_clear_output(test_sh);
+	ret = shell_execute_cmd(test_sh, "comp set_trigger " FAKE_COMP_NAME " BOTH_EDGES");
+	zassert_equal(ret, -EIO);
+	zassert_equal(comp_fake_comp_set_trigger_fake.call_count, 5);
+	zassert_equal(comp_fake_comp_set_trigger_fake.arg0_val, test_dev);
+	zassert_equal(comp_fake_comp_set_trigger_fake.arg1_val, COMPARATOR_TRIGGER_BOTH_EDGES);
+	out = shell_backend_dummy_get_output(test_sh, &out_size);
+	zassert_str_equal(out, "\r\nfailed to set trigger\r\n");
+}
+
+ZTEST(comparator_shell, test_await_trigger_set_callback_fail)
+{
+	int ret;
+	const char *out;
+	size_t out_size;
+
+	shell_backend_dummy_clear_output(test_sh);
+	comp_fake_comp_set_trigger_callback_fake.custom_fake = test_set_trigger_callback_stub_eio;
+	ret = shell_execute_cmd(test_sh, "comp await_trigger " FAKE_COMP_NAME);
+	zassert_ok(0);
+	zassert_equal(comp_fake_comp_set_trigger_callback_fake.call_count, 1);
+	zassert_equal(comp_fake_comp_set_trigger_callback_fake.return_val, 0);
+	out = shell_backend_dummy_get_output(test_sh, &out_size);
+	zassert_str_equal(out, "\r\nfailed to set trigger callback\r\n");
+}
+
+ZTEST(comparator_shell, test_await_trigger_timeout)
+{
+	int ret;
+	const char *out;
+	size_t out_size;
+
+	shell_backend_dummy_clear_output(test_sh);
+	comp_fake_comp_set_trigger_callback_fake.custom_fake = test_set_trigger_callback_stub_0;
+	ret = shell_execute_cmd(test_sh, "comp await_trigger " FAKE_COMP_NAME);
+	zassert_ok(0);
+	zassert_equal(comp_fake_comp_set_trigger_callback_fake.call_count, 2);
+	zassert_equal(comp_fake_comp_set_trigger_callback_fake.return_val_history[0], 0);
+	zassert_equal(comp_fake_comp_set_trigger_callback_fake.return_val_history[1], 0);
+	out = shell_backend_dummy_get_output(test_sh, &out_size);
+	zassert_str_equal(out, "\r\ntimed out\r\n");
+}
+
+ZTEST(comparator_shell, test_await_trigger_invalid_timeout_arg)
+{
+	int ret;
+
+	ret = shell_execute_cmd(test_sh, TEST_AWAIT_TRIGGER_TIMEOUT_BELOW_MIN_CMD);
+	zassert_not_ok(ret);
+	zassert_equal(comp_fake_comp_set_trigger_callback_fake.call_count, 0);
+
+	ret = shell_execute_cmd(test_sh, TEST_AWAIT_TRIGGER_TIMEOUT_ABOVE_MAX_CMD);
+	zassert_not_ok(ret);
+	zassert_equal(comp_fake_comp_set_trigger_callback_fake.call_count, 0);
+
+	ret = shell_execute_cmd(test_sh, TEST_AWAIT_TRIGGER_TIMEOUT_BROKEN_CMD);
+	zassert_not_ok(ret);
+	zassert_equal(comp_fake_comp_set_trigger_callback_fake.call_count, 0);
+}
+
+ZTEST(comparator_shell, test_await_trigger)
+{
+	int ret;
+	const char *out;
+	size_t out_size;
+	comparator_api_set_trigger_callback seq[2];
+
+	shell_backend_dummy_clear_output(test_sh);
+	seq[0] = test_set_trigger_callback_mock_0;
+	seq[1] = test_set_trigger_callback_stub_0;
+	comp_fake_comp_set_trigger_callback_fake.custom_fake_seq = seq;
+	comp_fake_comp_set_trigger_callback_fake.custom_fake_seq_len = ARRAY_SIZE(seq);
+	test_schedule_trigger();
+	ret = shell_execute_cmd(test_sh, "comp await_trigger " FAKE_COMP_NAME);
+	zassert_ok(0);
+	zassert_equal(comp_fake_comp_set_trigger_callback_fake.call_count, 2);
+	zassert_equal(comp_fake_comp_set_trigger_callback_fake.arg0_history[0], test_dev);
+	zassert_not_equal(comp_fake_comp_set_trigger_callback_fake.arg1_history[0], NULL);
+	zassert_equal(comp_fake_comp_set_trigger_callback_fake.return_val_history[0], 0);
+	zassert_equal(comp_fake_comp_set_trigger_callback_fake.arg0_history[1], test_dev);
+	zassert_equal(comp_fake_comp_set_trigger_callback_fake.arg1_history[1], NULL);
+	zassert_equal(comp_fake_comp_set_trigger_callback_fake.return_val_history[1], 0);
+	out = shell_backend_dummy_get_output(test_sh, &out_size);
+	zassert_str_equal(out, "\r\ntriggered\r\n");
+}
+
+ZTEST(comparator_shell, test_trigger_is_pending)
+{
+	int ret;
+	const char *out;
+	size_t out_size;
+
+	shell_backend_dummy_clear_output(test_sh);
+	comp_fake_comp_trigger_is_pending_fake.custom_fake = test_trigger_is_pending_stub_1;
+	ret = shell_execute_cmd(test_sh, "comp trigger_is_pending " FAKE_COMP_NAME);
+	zassert_ok(ret);
+	zassert_equal(comp_fake_comp_trigger_is_pending_fake.call_count, 1);
+	zassert_equal(comp_fake_comp_trigger_is_pending_fake.arg0_val, test_dev);
+	out = shell_backend_dummy_get_output(test_sh, &out_size);
+	zassert_str_equal(out, "\r\n1\r\n");
+
+	comp_fake_comp_trigger_is_pending_fake.custom_fake = test_trigger_is_pending_stub_0;
+	ret = shell_execute_cmd(test_sh, "comp trigger_is_pending " FAKE_COMP_NAME);
+	zassert_ok(ret);
+	zassert_equal(comp_fake_comp_trigger_is_pending_fake.call_count, 2);
+	zassert_equal(comp_fake_comp_trigger_is_pending_fake.arg0_val, test_dev);
+	out = shell_backend_dummy_get_output(test_sh, &out_size);
+	zassert_str_equal(out, "\r\n0\r\n");
+
+	comp_fake_comp_trigger_is_pending_fake.custom_fake = test_trigger_is_pending_stub_eio;
+	ret = shell_execute_cmd(test_sh, "comp trigger_is_pending " FAKE_COMP_NAME);
+	zassert_equal(ret, -EIO);
+	zassert_equal(comp_fake_comp_trigger_is_pending_fake.call_count, 3);
+	zassert_equal(comp_fake_comp_trigger_is_pending_fake.arg0_val, test_dev);
+	out = shell_backend_dummy_get_output(test_sh, &out_size);
+	zassert_str_equal(out, "\r\nfailed to get trigger status\r\n");
+}
+
+ZTEST_SUITE(comparator_shell, NULL, test_setup, test_after, NULL, NULL);
diff --git a/tests/drivers/comparator/shell/testcase.yaml b/tests/drivers/comparator/shell/testcase.yaml
new file mode 100644
index 00000000000..9fa6249c833
--- /dev/null
+++ b/tests/drivers/comparator/shell/testcase.yaml
@@ -0,0 +1,12 @@
+# Copyright (c) 2024 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+tests:
+  drivers.comparator.shell:
+    integration_platforms:
+      - native_sim
+      - native_sim/native/64
+    tags:
+      - drivers
+      - comparator
+      - shell

From b631ff3818cac38b76a8cd184d2a976155f2f916 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Sun, 22 Sep 2024 13:22:25 +0200
Subject: [PATCH 0517/2913] [nrf fromtree] docs: hardware: peripherals: add
 comparator docs

Add documentation for the comparator peripheral and shell.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 183e58b19019bd6a83c4f2bb258db7452d17bd29)
(cherry picked from commit 45db13890b8af5ae41beae4ec8afd4c3804ef0c5)
---
 doc/hardware/peripherals/comparator.rst | 69 +++++++++++++++++++++++++
 doc/hardware/peripherals/index.rst      |  1 +
 2 files changed, 70 insertions(+)
 create mode 100644 doc/hardware/peripherals/comparator.rst

diff --git a/doc/hardware/peripherals/comparator.rst b/doc/hardware/peripherals/comparator.rst
new file mode 100644
index 00000000000..e0e63407661
--- /dev/null
+++ b/doc/hardware/peripherals/comparator.rst
@@ -0,0 +1,69 @@
+.. _comparator_api:
+
+Comparator
+##########
+
+Overview
+********
+
+An analog comparator compares the voltages of two analog signals connected to its negative and
+positive inputs. If the voltage at the positive input is higher than the negative input, the
+comparator's output will be high, otherwise, it will be low.
+
+Comparators can typically set a trigger which triggers on output changes. This trigger can
+either invoke a callback, or its status can be polled.
+
+Related configuration options:
+
+* :kconfig:option:`CONFIG_COMPARATOR`
+
+Configuration
+*************
+
+Embedded comparators can typically be configured at runtime. When enabled, an initial
+configuration must be provided using the devicetree. At runtime, comparators can have their
+configuration updated using device driver specific APIs. The configuration will be applied
+when the comparator is resumed.
+
+Power management
+****************
+
+Comparators are enabled using power management. When resumed, the comparator will actively
+compare its inputs, producing an output and detecting edges. When suspended, the comparator
+will be inactive.
+
+Comparator shell
+****************
+
+The comparator shell provides the ``comp`` command with a set of subcommands for the
+:ref:`shell <shell_api>` module.
+
+The ``comp`` shell command provides the following subcommands:
+
+* ``get_output`` See :c:func:`comparator_get_output`
+* ``set_trigger`` See :c:func:`comparator_set_trigger`
+* ``await_trigger`` Awaits trigger using the following flow:
+  * Set trigger callback using :c:func:`comparator_set_trigger_callback`
+  * Await callback or time out after default or optionally provided timeout
+  * Clear trigger callback using :c:func:`comparator_set_trigger_callback`
+* ``trigger_is_pending`` See :c:func:`comparator_trigger_is_pending`
+
+Related configuration options:
+
+* :kconfig:option:`CONFIG_SHELL`
+* :kconfig:option:`CONFIG_COMPARATOR_SHELL`
+* :kconfig:option:`CONFIG_COMPARATOR_SHELL_AWAIT_TRIGGER_DEFAULT_TIMEOUT`
+* :kconfig:option:`CONFIG_COMPARATOR_SHELL_AWAIT_TRIGGER_MAX_TIMEOUT`
+
+.. note::
+   The power management shell can optionally be enabled alongside the comparator shell.
+
+   Related configuration options:
+
+   * :kconfig:option:`CONFIG_PM_DEVICE`
+   * :kconfig:option:`CONFIG_PM_DEVICE_SHELL`
+
+API Reference
+*************
+
+.. doxygengroup:: comparator_interface
diff --git a/doc/hardware/peripherals/index.rst b/doc/hardware/peripherals/index.rst
index e2574e75993..2a7405aced2 100644
--- a/doc/hardware/peripherals/index.rst
+++ b/doc/hardware/peripherals/index.rst
@@ -18,6 +18,7 @@ Peripherals
    clock_control.rst
    can/index.rst
    charger.rst
+   comparator.rst
    coredump.rst
    counter.rst
    dac.rst

From 9e8b20d39338732fe902453843b384c5383b341f Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Sun, 22 Sep 2024 18:52:28 +0200
Subject: [PATCH 0518/2913] [nrf fromtree] doc: release notes: added comparator
 release notes

Added comparator support to release notes for release 4.0

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 43f88ca8e12596abcab2b33587c3aa8957b90235)
(cherry picked from commit 55e96fa1f4c6d9b5db156773306853e261537825)
---
 doc/releases/release-notes-4.0.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/releases/release-notes-4.0.rst b/doc/releases/release-notes-4.0.rst
index 70ed64dd770..85c2523ab00 100644
--- a/doc/releases/release-notes-4.0.rst
+++ b/doc/releases/release-notes-4.0.rst
@@ -145,6 +145,14 @@ Drivers and Sensors
 
 * Clock control
 
+* Comparator
+
+  * Introduced comparator device driver subsystem selected with :kconfig:option:`CONFIG_COMPARATOR`
+  * Introduced comparator shell commands selected with :kconfig:option:`CONFIG_COMPARATOR_SHELL`
+  * Added support for Nordic nRF COMP (:dtcompatible:`nordic,nrf-comp`)
+  * Added support for Nordic nRF LPCOMP (:dtcompatible:`nordic,nrf-lpcomp`)
+  * Added support for NXP Kinetis ACMP (:dtcompatible:`nxp,kinetis-acmp`)
+
 * Counter
 
 * DAC

From 1dd44b1f93ad7ed647c270f1363e72a5779eca54 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Sun, 22 Sep 2024 19:23:01 +0200
Subject: [PATCH 0519/2913] [nrf fromtree] MAINTAINERS: add entry for
 comparator drivers

Add entry for comparator drivers

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit e40fa8914fade81b91c6ef4f1e618ca5d9adf444)
(cherry picked from commit 82e1b01c4660be350baac668908c6c8cc66aa22f)
---
 MAINTAINERS.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index cc7cb9a1411..ad9c9bfde27 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -1156,6 +1156,25 @@ Release Notes:
   tests:
     - drivers.clock
 
+"Drivers: Comparator":
+  status: maintained
+  maintainers:
+    - bjarki-andreasen
+  files:
+    - drivers/comparator/
+    - dts/bindings/comparator/
+    - include/zephyr/drivers/comparator.h
+    - include/zephyr/drivers/comparator/
+    - include/zephyr/drivers/comparator/
+    - include/zephyr/dt-bindings/clock/
+    - tests/drivers/build_all/comparator/
+    - tests/drivers/comparator/
+    - doc/hardware/peripherals/comparator.rst
+  labels:
+    - "area: Comparator"
+  tests:
+    - drivers.comparator
+
 "Drivers: Console":
   status: odd fixes
   files:

From 7cd02815d71c5697870390ae8c12e6bfb112b8b2 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Fri, 11 Oct 2024 23:20:37 +0200
Subject: [PATCH 0520/2913] [nrf fromtree] MAINTAINERS.yml: patch comparator
 drivers area

The comparator drivers area contains the following incorrect area:

files:
  - include/zephyr/dt-bindings/clock/

and contains the following duplicate area:

files:
  - include/zephyr/drivers/comparator/

this commit removes them.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 1635d77c751e724dc1cdd710b23f47639dd3561b)
(cherry picked from commit 54ceaf9699c646ae9f1fa5d8c1a4cae65e1228f4)
---
 MAINTAINERS.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index ad9c9bfde27..a77bbf643c0 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -1165,8 +1165,6 @@ Release Notes:
     - dts/bindings/comparator/
     - include/zephyr/drivers/comparator.h
     - include/zephyr/drivers/comparator/
-    - include/zephyr/drivers/comparator/
-    - include/zephyr/dt-bindings/clock/
     - tests/drivers/build_all/comparator/
     - tests/drivers/comparator/
     - doc/hardware/peripherals/comparator.rst

From 8e5e35e4740e6841dd2cdab2e41465bc77b2a980 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Fri, 11 Oct 2024 15:06:05 +0200
Subject: [PATCH 0521/2913] [nrf fromtree] tests: drivers: comparator: add
 gpio_loopback test suite

Add test suite which uses GPIO loopback to produce a "very low" and
"very high" voltage at the positive input of the comparator using the
output of a GPIO. The negative input is set to a voltage between the
high and low output voltages of the GPIO using whichever internal
reference is available to the comparator.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 3272db87a41b178f1a8943713f0874fd95f0a27b)
(cherry picked from commit cd0d63d3dcd929e7caa59a950cc044c2db8e49ed)
---
 .../comparator/gpio_loopback/CMakeLists.txt   |   8 ++
 .../gpio_loopback/boards/frdm_ke15z.overlay   |  50 ++++++++
 .../boards/nrf5340dk_nrf5340_cpuapp.overlay   |  25 ++++
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  35 ++++++
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |  25 ++++
 .../drivers/comparator/gpio_loopback/prj.conf |   6 +
 .../boards/nrf5340dk_nrf5340_cpuapp.overlay   |  16 +++
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  16 +++
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |  16 +++
 .../snippets/nrf_comp/snippet.yml             |  15 +++
 .../boards/nrf5340dk_nrf5340_cpuapp.overlay   |  12 ++
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  12 ++
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |  12 ++
 .../snippets/nrf_lpcomp/snippet.yml           |  15 +++
 .../comparator/gpio_loopback/src/test.c       | 119 ++++++++++++++++++
 .../comparator/gpio_loopback/testcase.yaml    |  27 ++++
 16 files changed, 409 insertions(+)
 create mode 100644 tests/drivers/comparator/gpio_loopback/CMakeLists.txt
 create mode 100644 tests/drivers/comparator/gpio_loopback/boards/frdm_ke15z.overlay
 create mode 100644 tests/drivers/comparator/gpio_loopback/boards/nrf5340dk_nrf5340_cpuapp.overlay
 create mode 100644 tests/drivers/comparator/gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/drivers/comparator/gpio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/drivers/comparator/gpio_loopback/prj.conf
 create mode 100644 tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf5340dk_nrf5340_cpuapp.overlay
 create mode 100644 tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/snippet.yml
 create mode 100644 tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf5340dk_nrf5340_cpuapp.overlay
 create mode 100644 tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/snippet.yml
 create mode 100644 tests/drivers/comparator/gpio_loopback/src/test.c
 create mode 100644 tests/drivers/comparator/gpio_loopback/testcase.yaml

diff --git a/tests/drivers/comparator/gpio_loopback/CMakeLists.txt b/tests/drivers/comparator/gpio_loopback/CMakeLists.txt
new file mode 100644
index 00000000000..43c6821adab
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(comparator_gpio_loopback)
+
+target_sources(app PRIVATE src/test.c)
diff --git a/tests/drivers/comparator/gpio_loopback/boards/frdm_ke15z.overlay b/tests/drivers/comparator/gpio_loopback/boards/frdm_ke15z.overlay
new file mode 100644
index 00000000000..531275ceb63
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/boards/frdm_ke15z.overlay
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <nxp/kinetis/MKE17Z256VLL7-pinctrl.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/*
+ * PTA1 looped back to PTA0
+ */
+
+/ {
+	aliases {
+		test-comp = &cmp0;
+	};
+
+	zephyr,user {
+		test-gpios = <&gpioa 1 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&gpioa {
+	status = "okay";
+};
+
+&pinctrl {
+	cmp0_default: cmp0_default {
+		group0 {
+			pinmux = <ACMP0_IN0_PTA0>;
+			drive-strength = "high";
+		};
+	};
+};
+
+&cmp0 {
+	pinctrl-0 = <&cmp0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	positive-mux-input = "IN0";
+	positive-port-input = "MUX";
+	negative-mux-input = "IN0";
+	negative-port-input = "DAC";
+
+	dac-vref-source = "VIN1";
+	dac-value = <128>;
+	dac-enable;
+};
diff --git a/tests/drivers/comparator/gpio_loopback/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/boards/nrf5340dk_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..a837527e342
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/*
+ * P0.05 looped back to P0.04
+ */
+
+/ {
+	aliases {
+		test-comp = &comp;
+	};
+
+	zephyr,user {
+		test-gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&gpio0{
+	status = "okay";
+};
diff --git a/tests/drivers/comparator/gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..aa39ab60e9e
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/*
+ * P1.03 looped back to P1.02
+ */
+
+/ {
+	aliases {
+		test-comp = &comp;
+	};
+
+	zephyr,user {
+		test-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+/* Temporary workaround to reserve P1.03 for cpuapp */
+&led1 {
+	gpios = < &gpio1 0x3 0x0 >;
+};
+
+/* Temporary workaround to reserve P1.02 for cpuapp */
+&led2 {
+	gpios = < &gpio1 0x2 0x0 >;
+};
diff --git a/tests/drivers/comparator/gpio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..768965e7c58
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/*
+ * P1.10 looped back to P1.11
+ */
+
+/ {
+	aliases {
+		test-comp = &comp;
+	};
+
+	zephyr,user {
+		test-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&gpio1 {
+	status = "okay";
+};
diff --git a/tests/drivers/comparator/gpio_loopback/prj.conf b/tests/drivers/comparator/gpio_loopback/prj.conf
new file mode 100644
index 00000000000..5ca57533d76
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/prj.conf
@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_ZTEST=y
+CONFIG_GPIO=y
+CONFIG_COMPARATOR=y
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf5340dk_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..e11bdcd3173
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&comp {
+	main-mode = "SE";
+	psel = "AIN0"; /* P0.04 */
+	refsel = "VDD";
+	sp-mode = "HIGH";
+	th-up = <34>;
+	th-down = <30>;
+	isource = "DISABLED";
+	status = "okay";
+};
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..f90c2051255
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&comp {
+	main-mode = "SE";
+	psel = "AIN2"; /* P1.02 */
+	refsel = "INT_1V2";
+	sp-mode = "HIGH";
+	th-up = <63>;
+	th-down = <59>;
+	isource = "DISABLED";
+	status = "okay";
+};
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..3a7a8f0ef81
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&comp {
+	main-mode = "SE";
+	psel = "AIN4"; /* P1.11 */
+	refsel = "INT_1V2";
+	sp-mode = "HIGH";
+	th-up = <63>;
+	th-down = <59>;
+	isource = "DISABLED";
+	status = "okay";
+};
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/snippet.yml b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/snippet.yml
new file mode 100644
index 00000000000..e030c0e5543
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/snippet.yml
@@ -0,0 +1,15 @@
+# Copyright 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+name: gpio_loopback_nrf_comp
+
+boards:
+  nrf54h20dk/nrf54h20/cpuapp:
+    append:
+      EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+  nrf54l15dk/nrf54l15/cpuapp:
+    append:
+      EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+  nrf5340dk/nrf5340/cpuapp:
+    append:
+      EXTRA_DTC_OVERLAY_FILE: boards/nrf5340dk_nrf5340_cpuapp.overlay
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf5340dk_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..d35a20dfc22
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&comp {
+	compatible = "nordic,nrf-lpcomp";
+	psel = "AIN0"; /* P0.04 */
+	refsel = "VDD_4_8";
+	status = "okay";
+};
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..349cd7051f9
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&comp {
+	compatible = "nordic,nrf-lpcomp";
+	psel = "AIN2"; /* P1.02 */
+	refsel = "VDD_4_8";
+	status = "okay";
+};
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..ebb652bdd87
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&comp {
+	compatible = "nordic,nrf-lpcomp";
+	psel = "AIN4"; /* P1.11 */
+	refsel = "VDD_4_8";
+	status = "okay";
+};
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/snippet.yml b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/snippet.yml
new file mode 100644
index 00000000000..70ff2a7e314
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/snippet.yml
@@ -0,0 +1,15 @@
+# Copyright 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+name: gpio_loopback_nrf_lpcomp
+
+boards:
+  nrf54h20dk/nrf54h20/cpuapp:
+    append:
+      EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+  nrf54l15dk/nrf54l15/cpuapp:
+    append:
+      EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+  nrf5340dk/nrf5340/cpuapp:
+    append:
+      EXTRA_DTC_OVERLAY_FILE: boards/nrf5340dk_nrf5340_cpuapp.overlay
diff --git a/tests/drivers/comparator/gpio_loopback/src/test.c b/tests/drivers/comparator/gpio_loopback/src/test.c
new file mode 100644
index 00000000000..930422b1a65
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/src/test.c
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/comparator.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
+#include <zephyr/ztest.h>
+
+static const struct device *test_dev = DEVICE_DT_GET(DT_ALIAS(test_comp));
+static const struct gpio_dt_spec test_pin = GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), test_gpios);
+static K_SEM_DEFINE(test_sem, 0, 1);
+
+static void test_callback(const struct device *dev, void *user_data)
+{
+	zassert_equal(&test_sem, user_data);
+	k_sem_give(&test_sem);
+}
+
+static void *test_setup(void)
+{
+	zassert_ok(gpio_pin_configure_dt(&test_pin, GPIO_OUTPUT_INACTIVE));
+	return NULL;
+}
+
+static void test_before(void *f)
+{
+	ARG_UNUSED(f);
+
+	k_sem_reset(&test_sem);
+	zassert_ok(gpio_pin_set_dt(&test_pin, 0));
+	zassert_ok(comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_NONE));
+	zassert_ok(comparator_set_trigger_callback(test_dev, NULL, NULL));
+	zassert_between_inclusive(comparator_trigger_is_pending(test_dev), 0, 1);
+}
+
+ZTEST_SUITE(comparator_gpio_loopback, NULL, test_setup, test_before, NULL, NULL);
+
+ZTEST(comparator_gpio_loopback, test_get_output)
+{
+	zassert_equal(comparator_get_output(test_dev), 0);
+	k_msleep(1);
+	zassert_ok(gpio_pin_set_dt(&test_pin, 1));
+	k_msleep(1);
+	zassert_equal(comparator_get_output(test_dev), 1);
+	k_msleep(1);
+	zassert_ok(gpio_pin_set_dt(&test_pin, 0));
+	k_msleep(1);
+	zassert_equal(comparator_get_output(test_dev), 0);
+}
+
+ZTEST(comparator_gpio_loopback, test_no_trigger_no_pending)
+{
+	zassert_ok(gpio_pin_set_dt(&test_pin, 1));
+	k_msleep(1);
+	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
+	zassert_ok(gpio_pin_set_dt(&test_pin, 0));
+	k_msleep(1);
+	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
+}
+
+ZTEST(comparator_gpio_loopback, test_trigger_rising_edge_pending)
+{
+	zassert_ok(comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_RISING_EDGE));
+	k_msleep(1);
+	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
+	zassert_ok(gpio_pin_set_dt(&test_pin, 1));
+	k_msleep(1);
+	zassert_equal(comparator_trigger_is_pending(test_dev), 1);
+	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
+	zassert_ok(gpio_pin_set_dt(&test_pin, 0));
+	k_msleep(1);
+	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
+}
+
+ZTEST(comparator_gpio_loopback, test_trigger_falling_edge_pending)
+{
+	zassert_ok(comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_FALLING_EDGE));
+	k_msleep(1);
+	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
+	zassert_ok(gpio_pin_set_dt(&test_pin, 1));
+	k_msleep(1);
+	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
+	zassert_ok(gpio_pin_set_dt(&test_pin, 0));
+	k_msleep(1);
+	zassert_equal(comparator_trigger_is_pending(test_dev), 1);
+	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
+}
+
+ZTEST(comparator_gpio_loopback, test_trigger_both_edges_pending)
+{
+	zassert_ok(comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_BOTH_EDGES));
+	k_msleep(1);
+	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
+	zassert_ok(gpio_pin_set_dt(&test_pin, 1));
+	k_msleep(1);
+	zassert_equal(comparator_trigger_is_pending(test_dev), 1);
+	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
+	zassert_ok(gpio_pin_set_dt(&test_pin, 0));
+	k_msleep(1);
+	zassert_equal(comparator_trigger_is_pending(test_dev), 1);
+	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
+}
+
+ZTEST(comparator_gpio_loopback, test_trigger_callback)
+{
+	zassert_ok(comparator_set_trigger_callback(test_dev, test_callback, &test_sem));
+	k_msleep(1);
+	zassert_equal(k_sem_take(&test_sem, K_NO_WAIT), -EBUSY);
+	zassert_ok(comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_RISING_EDGE));
+	k_msleep(1);
+	zassert_equal(k_sem_take(&test_sem, K_NO_WAIT), -EBUSY);
+	zassert_ok(gpio_pin_set_dt(&test_pin, 1));
+	k_msleep(1);
+	zassert_ok(k_sem_take(&test_sem, K_NO_WAIT));
+	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
+}
diff --git a/tests/drivers/comparator/gpio_loopback/testcase.yaml b/tests/drivers/comparator/gpio_loopback/testcase.yaml
new file mode 100644
index 00000000000..beb5cd39276
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/testcase.yaml
@@ -0,0 +1,27 @@
+# Copyright (c) 2024 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+common:
+  harness_config:
+    fixture: gpio_loopback
+  tags:
+    - drivers
+    - comparator
+tests:
+  drivers.comparator.gpio_loopback.mcux_acmp:
+    platform_allow:
+      - frdm_ke15z
+  drivers.comparator.gpio_loopback.nrf_comp:
+    extra_args:
+      - SNIPPET="gpio_loopback_nrf_comp"
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf5340dk/nrf5340/cpuapp
+  drivers.comparator.gpio_loopback.nrf_lpcomp:
+    extra_args:
+      - SNIPPET="gpio_loopback_nrf_lpcomp"
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf5340dk/nrf5340/cpuapp

From 97b7c024d121418d6d9362807414bdb6d6be4eed Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Fri, 18 Oct 2024 12:28:56 +0200
Subject: [PATCH 0522/2913] [nrf fromtree] tests: drivers: comparator: shell:
 use platform_allow

Change integration_platform -> platform_allow to not build the
shell test suite for all supported boards.

Upstream PR #: 80049

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 0502189729a1020aaa10c3be312872d1a684fb88)
(cherry picked from commit 8a776b3bc2a927d819c623555bb50d85cd4c8c7d)
---
 tests/drivers/comparator/shell/testcase.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/drivers/comparator/shell/testcase.yaml b/tests/drivers/comparator/shell/testcase.yaml
index 9fa6249c833..26d1fc169c3 100644
--- a/tests/drivers/comparator/shell/testcase.yaml
+++ b/tests/drivers/comparator/shell/testcase.yaml
@@ -3,7 +3,7 @@
 
 tests:
   drivers.comparator.shell:
-    integration_platforms:
+    platform_allow:
       - native_sim
       - native_sim/native/64
     tags:

From 54473b498a01ea9d43ee7682c9aa6f7b154d6ea3 Mon Sep 17 00:00:00 2001
From: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
Date: Wed, 30 Oct 2024 07:42:09 +0100
Subject: [PATCH 0523/2913] [nrf fromtree] samples: boards: nordic: system_off:
 Update README.

Update DK naming - NRF54L15PDK is deprecated.

Signed-off-by: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>

(cherry picked from commit 8cd361a51a4e7954d58ca7f06ed554bd3a7ef076)
(cherry picked from commit d9f282cee5327f69155171c2b02e7f26a4b76f47)
---
 samples/boards/nordic/system_off/README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/boards/nordic/system_off/README.rst b/samples/boards/nordic/system_off/README.rst
index 7cf546d901d..7c98a4e8336 100644
--- a/samples/boards/nordic/system_off/README.rst
+++ b/samples/boards/nordic/system_off/README.rst
@@ -22,7 +22,7 @@ RAM is configured to keep the containing section powered while in system-off mod
 Requirements
 ************
 
-This application uses nRF51 DK, nRF52 DK or nRF54L15 PDK board for the demo.
+This application uses nRF51 DK, nRF52 DK or nRF54L15 DK board for the demo.
 
 Sample Output
 =============

From 73f8c9072074ebbcb7111d80d5436954cb4679b4 Mon Sep 17 00:00:00 2001
From: Piotr Krzyzanowski <piotr.krzyzanowski@nordicsemi.no>
Date: Tue, 29 Oct 2024 12:45:49 +0100
Subject: [PATCH 0524/2913] [nrf fromlist] samples: sensor: qdec: change pins
 used for qdec nrf54h20dk

Change pins that are used for qdec nrf54h20dk to align with shield
(loopbacks) used in internal CI. This change is needed to start
qdec driver power management testing.

Upstream PR #: 80562

Signed-off-by: Piotr Krzyzanowski <piotr.krzyzanowski@nordicsemi.no>
(cherry picked from commit 06d6b00c41b1ce0cd9e3ffc3d53958e4b5dc052b)
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay  | 14 +++++---------
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay  | 18 +++++++-----------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/samples/sensor/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/sensor/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index c4f6fc7876a..654e778af97 100644
--- a/samples/sensor/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/samples/sensor/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -13,10 +13,10 @@
 	encoder-emulate {
 		compatible = "gpio-leds";
 		phase_a: phase_a {
-			gpios = <&gpio7 2 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;
 		};
 		phase_b: phase_b {
-			gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio2 11 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
@@ -24,17 +24,13 @@
 &pinctrl {
 	qdec_pinctrl: qdec_pinctrl {
 		group1 {
-			psels = <NRF_PSEL(QDEC_A, 1, 0)>,
-				<NRF_PSEL(QDEC_B, 1, 2)>;
+			psels = <NRF_PSEL(QDEC_A, 2, 8)>,
+				<NRF_PSEL(QDEC_B, 2, 10)>;
 		};
 	};
 };
 
-&gpio1 {
-	status = "okay";
-};
-
-&gpio7 {
+&gpio2 {
 	status = "okay";
 };
 
diff --git a/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index 0e552906a00..7e6da5a3458 100644
--- a/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -13,10 +13,10 @@
 	encoder-emulate {
 		compatible = "gpio-leds";
 		phase_a: phase_a {
-			gpios = <&gpio7 2 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;
 		};
 		phase_b: phase_b {
-			gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio2 11 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
@@ -24,25 +24,21 @@
 &pinctrl {
 	qdec_pinctrl: qdec_pinctrl {
 		group1 {
-			psels = <NRF_PSEL(QDEC_A, 1, 0)>,
-				<NRF_PSEL(QDEC_B, 1, 2)>;
+			psels = <NRF_PSEL(QDEC_A, 2, 8)>,
+				<NRF_PSEL(QDEC_B, 2, 10)>;
 		};
 	};
 
 	qdec_sleep_pinctrl: qdec_sleep_pinctrl {
 		group1 {
-			psels = <NRF_PSEL(QDEC_A, 1, 0)>,
-				<NRF_PSEL(QDEC_B, 1, 2)>;
+			psels = <NRF_PSEL(QDEC_A, 2, 8)>,
+				<NRF_PSEL(QDEC_B, 2, 10)>;
 			low-power-enable;
 		};
 	};
 };
 
-&gpio1 {
-	status = "okay";
-};
-
-&gpio7 {
+&gpio2 {
 	status = "okay";
 };
 

From 44d4a7013a329aaf1595839d9fb158ab7da4929f Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Thu, 24 Oct 2024 13:21:01 +0200
Subject: [PATCH 0525/2913] [nrf fromlist] doc: doxygen: remove rst utilities

We no longer render Doxygen content in Sphinx after the removal of
breathe, so let's remove rst related aliases from Doxyfile. Also adjust
some headers that contained rst content.

Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/80362

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit b8cd03a1e512229cd60dc70b2cd038a087b808bb)
(cherry picked from commit 001d5ed9f05dd5f33791ffa31c2c4f0d8a30bdac)
---
 doc/zephyr.doxyfile.in             |  18 +-
 include/zephyr/net/socket.h        | 284 ++++++++++++-----------------
 include/zephyr/net/socket_select.h |  52 +++---
 3 files changed, 143 insertions(+), 211 deletions(-)

diff --git a/doc/zephyr.doxyfile.in b/doc/zephyr.doxyfile.in
index 05b541c517d..9245f598925 100644
--- a/doc/zephyr.doxyfile.in
+++ b/doc/zephyr.doxyfile.in
@@ -279,9 +279,7 @@ TAB_SIZE               = 8
 # with the commands \{ and \} for these it is advised to use the version @{ and
 # @} or use a double escape (\\{ and \\})
 
-ALIASES                = "rst=\verbatim embed:rst:leading-asterisk" \
-                         endrst=\endverbatim \
-                         "kconfig{1}=\htmlonly <code>\1</code> \endhtmlonly \xmlonly <verbatim>embed:rst:inline :kconfig:option:`\1`</verbatim> \endxmlonly" \
+ALIASES                = "kconfig{1}=\verbatim \1 \endverbatim" \
                          "req{1}=\ref ZEPH_\1 \"ZEPH-\1\"" \
                          "satisfy{1}=\xrefitem satisfy \"Satisfies requirement\" \"Requirement Implementation\" \1" \
                          "verify{1}=\xrefitem verify \"Verifies requirement\" \"Requirement Verification\" \1" \
@@ -289,14 +287,14 @@ ALIASES                = "rst=\verbatim embed:rst:leading-asterisk" \
                          "kconfig_dep{2}=\attention Available only when the following Kconfig options are enabled: \kconfig{\1}, \kconfig{\2}." \
                          "kconfig_dep{3}=\attention Available only when the following Kconfig options are enabled: \kconfig{\1}, \kconfig{\2}, \kconfig{\3}." \
                          "funcprops=\par \"Function properties (list may not be complete)\"" \
-                         "reschedule=\htmlonly reschedule \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_reschedule`</verbatim> \endxmlonly" \
-                         "sleep=\htmlonly sleep \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_sleep`</verbatim> \endxmlonly" \
-                         "no_wait=\htmlonly no-wait \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_no-wait`</verbatim> \endxmlonly" \
-                         "isr_ok=\htmlonly isr-ok \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_isr-ok`</verbatim> \endxmlonly" \
-                         "pre_kernel_ok=\htmlonly pre-kernel-ok \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_pre-kernel-ok`</verbatim> \endxmlonly" \
-                         "async=\htmlonly async \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_async`</verbatim> \endxmlonly" \
+                         "reschedule=\qualifier reschedule" \
+                         "sleep=\qualifier sleep" \
+                         "no_wait=\qualifier no-wait" \
+                         "isr_ok=\qualifier isr-ok" \
+                         "pre_kernel_ok=\qualifier pre-kernel-ok" \
+                         "async=\qualifier async" \
                          "atomic_api=As for all atomic APIs, includes a full/sequentially-consistent memory barrier (where applicable)." \
-                         "supervisor=\htmlonly supervisor \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_supervisor`</verbatim> \endxmlonly"
+                         "supervisor=\qualifier supervisor"
 
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
diff --git a/include/zephyr/net/socket.h b/include/zephyr/net/socket.h
index 34211d83759..05351c8cef0 100644
--- a/include/zephyr/net/socket.h
+++ b/include/zephyr/net/socket.h
@@ -333,13 +333,11 @@ __syscall void *zsock_get_context_object(int sock);
  * @brief Create a network socket
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/socket.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/socket.html
  * for normative description.
- * This function is also exposed as ``socket()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `socket()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  *
  * If CONFIG_USERSPACE is enabled, the caller will be granted access to the
  * context object associated with the returned file descriptor.
@@ -352,13 +350,11 @@ __syscall int zsock_socket(int family, int type, int proto);
  * @brief Create an unnamed pair of connected sockets
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <https://pubs.opengroup.org/onlinepubs/009695399/functions/socketpair.html>`__
+ * See POSIX.1-2017 article
+ * https://pubs.opengroup.org/onlinepubs/009695399/functions/socketpair.html
  * for normative description.
- * This function is also exposed as ``socketpair()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `socketpair()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 __syscall int zsock_socketpair(int family, int type, int proto, int *sv);
 
@@ -366,12 +362,10 @@ __syscall int zsock_socketpair(int family, int type, int proto, int *sv);
  * @brief Close a network socket
  *
  * @details
- * @rst
  * Close a network socket.
- * This function is also exposed as ``close()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined (in which case it
- * may conflict with generic POSIX ``close()`` function).
- * @endrst
+ * This function is also exposed as `close()`
+ * if @kconfig{CONFIG_POSIX_API} is defined (in which case it
+ * may conflict with generic POSIX `close()` function).
  */
 __syscall int zsock_close(int sock);
 
@@ -379,14 +373,12 @@ __syscall int zsock_close(int sock);
  * @brief Shutdown socket send/receive operations
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/shutdown.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/shutdown.html
  * for normative description, but currently this function has no effect in
  * Zephyr and provided solely for compatibility with existing code.
- * This function is also exposed as ``shutdown()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `shutdown()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 __syscall int zsock_shutdown(int sock, int how);
 
@@ -394,13 +386,11 @@ __syscall int zsock_shutdown(int sock, int how);
  * @brief Bind a socket to a local network address
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html
  * for normative description.
- * This function is also exposed as ``bind()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `bind()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 __syscall int zsock_bind(int sock, const struct sockaddr *addr,
 			 socklen_t addrlen);
@@ -409,13 +399,11 @@ __syscall int zsock_bind(int sock, const struct sockaddr *addr,
  * @brief Connect a socket to a peer network address
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/connect.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/connect.html
  * for normative description.
- * This function is also exposed as ``connect()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `connect()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 __syscall int zsock_connect(int sock, const struct sockaddr *addr,
 			    socklen_t addrlen);
@@ -424,13 +412,11 @@ __syscall int zsock_connect(int sock, const struct sockaddr *addr,
  * @brief Set up a STREAM socket to accept peer connections
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/listen.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/listen.html
  * for normative description.
- * This function is also exposed as ``listen()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `listen()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 __syscall int zsock_listen(int sock, int backlog);
 
@@ -438,13 +424,11 @@ __syscall int zsock_listen(int sock, int backlog);
  * @brief Accept a connection on listening socket
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/accept.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/accept.html
  * for normative description.
- * This function is also exposed as ``accept()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `accept()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 __syscall int zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen);
 
@@ -452,13 +436,11 @@ __syscall int zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen);
  * @brief Send data to an arbitrary network address
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/sendto.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/sendto.html
  * for normative description.
- * This function is also exposed as ``sendto()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `sendto()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 __syscall ssize_t zsock_sendto(int sock, const void *buf, size_t len,
 			       int flags, const struct sockaddr *dest_addr,
@@ -468,13 +450,11 @@ __syscall ssize_t zsock_sendto(int sock, const void *buf, size_t len,
  * @brief Send data to a connected peer
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/send.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/send.html
  * for normative description.
- * This function is also exposed as ``send()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `send()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 static inline ssize_t zsock_send(int sock, const void *buf, size_t len,
 				 int flags)
@@ -486,13 +466,11 @@ static inline ssize_t zsock_send(int sock, const void *buf, size_t len,
  * @brief Send data to an arbitrary network address
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/sendmsg.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/sendmsg.html
  * for normative description.
- * This function is also exposed as ``sendmsg()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `sendmsg()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 __syscall ssize_t zsock_sendmsg(int sock, const struct msghdr *msg,
 				int flags);
@@ -501,13 +479,11 @@ __syscall ssize_t zsock_sendmsg(int sock, const struct msghdr *msg,
  * @brief Receive data from an arbitrary network address
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/recvfrom.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/recvfrom.html
  * for normative description.
- * This function is also exposed as ``recvfrom()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `recvfrom()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 __syscall ssize_t zsock_recvfrom(int sock, void *buf, size_t max_len,
 				 int flags, struct sockaddr *src_addr,
@@ -517,13 +493,11 @@ __syscall ssize_t zsock_recvfrom(int sock, void *buf, size_t max_len,
  * @brief Receive a message from an arbitrary network address
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/recvmsg.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/recvmsg.html
  * for normative description.
- * This function is also exposed as ``recvmsg()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `recvmsg()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 __syscall ssize_t zsock_recvmsg(int sock, struct msghdr *msg, int flags);
 
@@ -531,13 +505,11 @@ __syscall ssize_t zsock_recvmsg(int sock, struct msghdr *msg, int flags);
  * @brief Receive data from a connected peer
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/recv.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/recv.html
  * for normative description.
- * This function is also exposed as ``recv()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `recv()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 static inline ssize_t zsock_recv(int sock, void *buf, size_t max_len,
 				 int flags)
@@ -549,13 +521,11 @@ static inline ssize_t zsock_recv(int sock, void *buf, size_t max_len,
  * @brief Control blocking/non-blocking mode of a socket
  *
  * @details
- * @rst
  * This functions allow to (only) configure a socket for blocking or
  * non-blocking operation (O_NONBLOCK).
- * This function is also exposed as ``fcntl()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined (in which case
- * it may conflict with generic POSIX ``fcntl()`` function).
- * @endrst
+ * This function is also exposed as `fcntl()`
+ * if @kconfig{CONFIG_POSIX_API} is defined (in which case
+ * it may conflict with generic POSIX `fcntl()` function).
  */
 __syscall int zsock_fcntl_impl(int sock, int cmd, int flags);
 
@@ -584,18 +554,16 @@ static inline int zsock_fcntl_wrapper(int sock, int cmd, ...)
  * @brief Control underlying socket parameters
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <https://pubs.opengroup.org/onlinepubs/9699919799/functions/ioctl.html>`__
+ * See POSIX.1-2017 article
+ * https://pubs.opengroup.org/onlinepubs/9699919799/functions/ioctl.html
  * for normative description.
  * This function enables querying or manipulating underlying socket parameters.
- * Currently supported @p request values include ``ZFD_IOCTL_FIONBIO``, and
- * ``ZFD_IOCTL_FIONREAD``, to set non-blocking mode, and query the number of
+ * Currently supported @p request values include `ZFD_IOCTL_FIONBIO`, and
+ * `ZFD_IOCTL_FIONREAD`, to set non-blocking mode, and query the number of
  * bytes available to read, respectively.
- * This function is also exposed as ``ioctl()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined (in which case
- * it may conflict with generic POSIX ``ioctl()`` function).
- * @endrst
+ * This function is also exposed as `ioctl()`
+ * if @kconfig{CONFIG_POSIX_API} is defined (in which case
+ * it may conflict with generic POSIX `ioctl()` function).
  */
 __syscall int zsock_ioctl_impl(int sock, unsigned long request, va_list ap);
 
@@ -621,14 +589,12 @@ static inline int zsock_ioctl_wrapper(int sock, unsigned long request, ...)
  * @brief Efficiently poll multiple sockets for events
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/poll.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/poll.html
  * for normative description.
- * This function is also exposed as ``poll()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined (in which case
- * it may conflict with generic POSIX ``poll()`` function).
- * @endrst
+ * This function is also exposed as `poll()`
+ * if @kconfig{CONFIG_POSIX_API} is defined (in which case
+ * it may conflict with generic POSIX `poll()` function).
  */
 __syscall int zsock_poll(struct zsock_pollfd *fds, int nfds, int timeout);
 
@@ -636,16 +602,14 @@ __syscall int zsock_poll(struct zsock_pollfd *fds, int nfds, int timeout);
  * @brief Get various socket options
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockopt.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockopt.html
  * for normative description. In Zephyr this function supports a subset of
  * socket options described by POSIX, but also some additional options
  * available in Linux (some options are dummy and provided to ease porting
  * of existing code).
- * This function is also exposed as ``getsockopt()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `getsockopt()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 __syscall int zsock_getsockopt(int sock, int level, int optname,
 			       void *optval, socklen_t *optlen);
@@ -654,16 +618,14 @@ __syscall int zsock_getsockopt(int sock, int level, int optname,
  * @brief Set various socket options
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/setsockopt.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/setsockopt.html
  * for normative description. In Zephyr this function supports a subset of
  * socket options described by POSIX, but also some additional options
  * available in Linux (some options are dummy and provided to ease porting
  * of existing code).
- * This function is also exposed as ``setsockopt()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `setsockopt()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 __syscall int zsock_setsockopt(int sock, int level, int optname,
 			       const void *optval, socklen_t optlen);
@@ -672,13 +634,11 @@ __syscall int zsock_setsockopt(int sock, int level, int optname,
  * @brief Get peer name
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/getpeername.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/getpeername.html
  * for normative description.
- * This function is also exposed as ``getpeername()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `getpeername()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 __syscall int zsock_getpeername(int sock, struct sockaddr *addr,
 				socklen_t *addrlen);
@@ -687,13 +647,11 @@ __syscall int zsock_getpeername(int sock, struct sockaddr *addr,
  * @brief Get socket name
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockname.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockname.html
  * for normative description.
- * This function is also exposed as ``getsockname()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `getsockname()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 __syscall int zsock_getsockname(int sock, struct sockaddr *addr,
 				socklen_t *addrlen);
@@ -702,13 +660,11 @@ __syscall int zsock_getsockname(int sock, struct sockaddr *addr,
  * @brief Get local host name
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/gethostname.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/gethostname.html
  * for normative description.
- * This function is also exposed as ``gethostname()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `gethostname()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 __syscall int zsock_gethostname(char *buf, size_t len);
 
@@ -716,13 +672,11 @@ __syscall int zsock_gethostname(char *buf, size_t len);
  * @brief Convert network address from internal to numeric ASCII form
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/inet_ntop.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/inet_ntop.html
  * for normative description.
- * This function is also exposed as ``inet_ntop()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `inet_ntop()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 static inline char *zsock_inet_ntop(sa_family_t family, const void *src,
 				    char *dst, size_t size)
@@ -734,13 +688,11 @@ static inline char *zsock_inet_ntop(sa_family_t family, const void *src,
  * @brief Convert network address from numeric ASCII form to internal representation
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/inet_pton.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/inet_pton.html
  * for normative description.
- * This function is also exposed as ``inet_pton()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `inet_pton()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 __syscall int zsock_inet_pton(sa_family_t family, const char *src, void *dst);
 
@@ -779,13 +731,11 @@ __syscall int z_zsock_getaddrinfo_internal(const char *host,
  * @brief Resolve a domain name to one or more network addresses
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/getaddrinfo.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/getaddrinfo.html
  * for normative description.
- * This function is also exposed as ``getaddrinfo()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `getaddrinfo()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 int zsock_getaddrinfo(const char *host, const char *service,
 		      const struct zsock_addrinfo *hints,
@@ -795,13 +745,11 @@ int zsock_getaddrinfo(const char *host, const char *service,
  * @brief Free results returned by zsock_getaddrinfo()
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/freeaddrinfo.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/freeaddrinfo.html
  * for normative description.
- * This function is also exposed as ``freeaddrinfo()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `freeaddrinfo()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 void zsock_freeaddrinfo(struct zsock_addrinfo *ai);
 
@@ -809,13 +757,11 @@ void zsock_freeaddrinfo(struct zsock_addrinfo *ai);
  * @brief Convert zsock_getaddrinfo() error code to textual message
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/gai_strerror.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/gai_strerror.html
  * for normative description.
- * This function is also exposed as ``gai_strerror()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `gai_strerror()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 const char *zsock_gai_strerror(int errcode);
 
@@ -846,13 +792,11 @@ const char *zsock_gai_strerror(int errcode);
  * @brief Resolve a network address to a domain name or ASCII address
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/getnameinfo.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/getnameinfo.html
  * for normative description.
- * This function is also exposed as ``getnameinfo()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `getnameinfo()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 int zsock_getnameinfo(const struct sockaddr *addr, socklen_t addrlen,
 		      char *host, socklen_t hostlen,
diff --git a/include/zephyr/net/socket_select.h b/include/zephyr/net/socket_select.h
index 5fca2950d6a..b0754d5fc86 100644
--- a/include/zephyr/net/socket_select.h
+++ b/include/zephyr/net/socket_select.h
@@ -35,17 +35,15 @@ typedef struct zsock_fd_set {
  * @brief Legacy function to poll multiple sockets for events
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html
  * for normative description. This function is provided to ease porting of
  * existing code and not recommended for usage due to its inefficiency,
  * use zsock_poll() instead. In Zephyr this function works only with
  * sockets, not arbitrary file descriptors.
- * This function is also exposed as ``select()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined (in which case
- * it may conflict with generic POSIX ``select()`` function).
- * @endrst
+ * This function is also exposed as `select()`
+ * if @kconfig{CONFIG_POSIX_API} is defined (in which case
+ * it may conflict with generic POSIX `select()` function).
  */
 __syscall int zsock_select(int nfds, zsock_fd_set *readfds,
 			   zsock_fd_set *writefds,
@@ -59,13 +57,11 @@ __syscall int zsock_select(int nfds, zsock_fd_set *readfds,
  * @brief Initialize (clear) fd_set
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html
  * for normative description.
- * This function is also exposed as ``FD_ZERO()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `FD_ZERO()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 void ZSOCK_FD_ZERO(zsock_fd_set *set);
 
@@ -73,13 +69,11 @@ void ZSOCK_FD_ZERO(zsock_fd_set *set);
  * @brief Check whether socket is a member of fd_set
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html
  * for normative description.
- * This function is also exposed as ``FD_ISSET()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `FD_ISSET()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 int ZSOCK_FD_ISSET(int fd, zsock_fd_set *set);
 
@@ -87,13 +81,11 @@ int ZSOCK_FD_ISSET(int fd, zsock_fd_set *set);
  * @brief Remove socket from fd_set
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html
  * for normative description.
- * This function is also exposed as ``FD_CLR()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `FD_CLR()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 void ZSOCK_FD_CLR(int fd, zsock_fd_set *set);
 
@@ -101,13 +93,11 @@ void ZSOCK_FD_CLR(int fd, zsock_fd_set *set);
  * @brief Add socket to fd_set
  *
  * @details
- * @rst
- * See `POSIX.1-2017 article
- * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html>`__
+ * See POSIX.1-2017 article
+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html
  * for normative description.
- * This function is also exposed as ``FD_SET()``
- * if :kconfig:option:`CONFIG_POSIX_API` is defined.
- * @endrst
+ * This function is also exposed as `FD_SET()`
+ * if @kconfig{CONFIG_POSIX_API} is defined.
  */
 void ZSOCK_FD_SET(int fd, zsock_fd_set *set);
 

From 3eaf51080bf36393d40a579141973fa9b4fa73c2 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Thu, 24 Oct 2024 14:08:45 +0200
Subject: [PATCH 0526/2913] [nrf fromlist] bluetooth: audio: bap: fix Doxygen
 issue

Doxygen was getting confused when expanding @kconfig (verbatim block
within []).

Upstream PR #: 80362

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit da385a518ec3dc4b87fafd07cd05f899d376dc18)
(cherry picked from commit a735c24d172361298102d4dc29fe22397f99f26a)
---
 include/zephyr/bluetooth/audio/bap.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/zephyr/bluetooth/audio/bap.h b/include/zephyr/bluetooth/audio/bap.h
index 83159bed43f..9f13cd2fdee 100644
--- a/include/zephyr/bluetooth/audio/bap.h
+++ b/include/zephyr/bluetooth/audio/bap.h
@@ -640,13 +640,13 @@ struct bt_bap_unicast_server_register_param {
 	/**
 	 * @brief Sink Count to register.
 	 *
-	 * Should be in range [0, @kconfig{CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT}]
+	 * Should be in range 0 to @kconfig{CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT}
 	 */
 	uint8_t snk_cnt;
 
 	/** @brief Source Count to register.
 	 *
-	 * Should be in range [0, @kconfig{CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT}]
+	 * Should be in range 0 to @kconfig{CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT}
 	 */
 	uint8_t src_cnt;
 };

From f4c8e3b6b40ea5f5266deb0162fd59401fe0000f Mon Sep 17 00:00:00 2001
From: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
Date: Thu, 31 Oct 2024 08:59:16 +0100
Subject: [PATCH 0527/2913] [nrf fromtree] tests: drivers: adc: add
 adc_error_cases tests.

Tests are checking error codes returned from adc_read() and
adc_channel_setup() used with invalid configurations.

Signed-off-by: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>

(cherry picked from commit da81490034d8ae1ebe826878852a3b889694f00e)
(cherry picked from commit 275c690afa69d1a73ea046d468ff50689b8a28c8)
---
 .../adc/adc_error_cases/CMakeLists.txt        |   9 +
 .../boards/nrf52840dk_nrf52840.overlay        |  11 +
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  11 +
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |  11 +
 tests/drivers/adc/adc_error_cases/prj.conf    |   3 +
 .../adc/adc_error_cases/src/adc_error_cases.c | 220 ++++++++++++++++++
 .../drivers/adc/adc_error_cases/testcase.yaml |   7 +
 7 files changed, 272 insertions(+)
 create mode 100644 tests/drivers/adc/adc_error_cases/CMakeLists.txt
 create mode 100644 tests/drivers/adc/adc_error_cases/boards/nrf52840dk_nrf52840.overlay
 create mode 100644 tests/drivers/adc/adc_error_cases/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/drivers/adc/adc_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/drivers/adc/adc_error_cases/prj.conf
 create mode 100644 tests/drivers/adc/adc_error_cases/src/adc_error_cases.c
 create mode 100644 tests/drivers/adc/adc_error_cases/testcase.yaml

diff --git a/tests/drivers/adc/adc_error_cases/CMakeLists.txt b/tests/drivers/adc/adc_error_cases/CMakeLists.txt
new file mode 100644
index 00000000000..7b240573c84
--- /dev/null
+++ b/tests/drivers/adc/adc_error_cases/CMakeLists.txt
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(adc_error_cases)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/drivers/adc/adc_error_cases/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/adc/adc_error_cases/boards/nrf52840dk_nrf52840.overlay
new file mode 100644
index 00000000000..18e74f72ee2
--- /dev/null
+++ b/tests/drivers/adc/adc_error_cases/boards/nrf52840dk_nrf52840.overlay
@@ -0,0 +1,11 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ */
+
+/ {
+	aliases {
+		adc = &adc;
+	};
+};
diff --git a/tests/drivers/adc/adc_error_cases/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/adc/adc_error_cases/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..18e74f72ee2
--- /dev/null
+++ b/tests/drivers/adc/adc_error_cases/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,11 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ */
+
+/ {
+	aliases {
+		adc = &adc;
+	};
+};
diff --git a/tests/drivers/adc/adc_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/adc/adc_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..18e74f72ee2
--- /dev/null
+++ b/tests/drivers/adc/adc_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,11 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ */
+
+/ {
+	aliases {
+		adc = &adc;
+	};
+};
diff --git a/tests/drivers/adc/adc_error_cases/prj.conf b/tests/drivers/adc/adc_error_cases/prj.conf
new file mode 100644
index 00000000000..40f19db980d
--- /dev/null
+++ b/tests/drivers/adc/adc_error_cases/prj.conf
@@ -0,0 +1,3 @@
+CONFIG_ZTEST=y
+
+CONFIG_ADC=y
diff --git a/tests/drivers/adc/adc_error_cases/src/adc_error_cases.c b/tests/drivers/adc/adc_error_cases/src/adc_error_cases.c
new file mode 100644
index 00000000000..0cfdf890d7b
--- /dev/null
+++ b/tests/drivers/adc/adc_error_cases/src/adc_error_cases.c
@@ -0,0 +1,220 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/ztest.h>
+#include <zephyr/drivers/adc.h>
+
+static const struct device *dev_adc = DEVICE_DT_GET(DT_ALIAS(adc));
+#define BUFFER_LEN 8
+static uint16_t m_sample_buffer[BUFFER_LEN];
+
+static const struct adc_channel_cfg valid_channel_cfg = {
+	.gain = ADC_GAIN_1,
+	.channel_id = 0,
+	.reference = ADC_REF_INTERNAL,
+	.acquisition_time = ADC_ACQ_TIME_DEFAULT,
+	.differential = false,
+	#ifdef CONFIG_ADC_CONFIGURABLE_INPUTS
+	.input_positive = 1,
+	#endif
+};
+
+static const struct adc_sequence valid_seq = {
+	.buffer = m_sample_buffer,
+	.buffer_size = BUFFER_LEN * sizeof(m_sample_buffer),
+	.options = NULL,
+	.resolution = 10,
+	.oversampling = 0,
+	.channels = 1,
+};
+
+/**
+ * @brief test adc_read() with invalid oversampling value
+ *
+ * function should return -EINVAL
+ */
+
+ZTEST(adc_error_cases, test_adc_read_invalid_oversampling)
+{
+	int ret;
+
+	adc_channel_setup(dev_adc, &valid_channel_cfg);
+
+	struct adc_sequence invalid_seq = valid_seq;
+	/* Set oversampling to invalid value */
+	invalid_seq.oversampling = 99;
+
+	ret = adc_read(dev_adc, &invalid_seq);
+
+	zassert_true(
+		ret == -EINVAL,
+		"adc_read() should return -EINVAL,"
+		" got unexpected value of %d",
+		ret
+	);
+}
+
+/**
+ * @brief test adc_read() with invalid resolution value
+ *
+ * function should return -EINVAL
+ */
+
+ZTEST(adc_error_cases, test_adc_read_invalid_resolution)
+{
+	int ret;
+
+	adc_channel_setup(dev_adc, &valid_channel_cfg);
+
+	struct adc_sequence invalid_seq = valid_seq;
+	/* Set resolution to invalid value */
+	invalid_seq.resolution = 99;
+
+	ret = adc_read(dev_adc, &invalid_seq);
+
+	zassert_true(
+		ret == -EINVAL,
+		"adc_read() should return -EINVAL,"
+		" got unexpected value of %d",
+		ret
+	);
+}
+
+/**
+ * @brief test adc_read() with invalid channels value
+ *
+ * function should return -EINVAL
+ */
+
+ZTEST(adc_error_cases, test_adc_read_invalid_channels)
+{
+	int ret;
+
+	adc_channel_setup(dev_adc, &valid_channel_cfg);
+
+	struct adc_sequence invalid_seq = valid_seq;
+	/* Set channels configuration to invalid value */
+	invalid_seq.channels = 0;
+
+	ret = adc_read(dev_adc, &invalid_seq);
+
+	zassert_true(
+		ret == -EINVAL,
+		"adc_read() should return -EINVAL,"
+		" got unexpected value of %d",
+		ret
+	);
+}
+
+/**
+ * @brief test adc_read() with not configured channel
+ *
+ * function should return -EINVAL
+ */
+
+ZTEST(adc_error_cases, test_adc_read_not_configured_channel)
+{
+	int ret;
+
+	adc_channel_setup(dev_adc, &valid_channel_cfg);
+
+	struct adc_sequence invalid_seq = valid_seq;
+	/* Set channels configuration to use not configured channel */
+	invalid_seq.channels = BIT(1);
+
+	ret = adc_read(dev_adc, &invalid_seq);
+
+	zassert_true(
+		ret == -EINVAL,
+		"adc_read() should return -EINVAL,"
+		" got unexpected value of %d",
+		ret
+	);
+}
+
+/**
+ * @brief test adc_read() with invalid buffer length
+ *
+ * function should return -ENOMEM
+ */
+
+ZTEST(adc_error_cases, test_adc_read_invalid_buffer)
+{
+	int ret;
+
+	adc_channel_setup(dev_adc, &valid_channel_cfg);
+
+	struct adc_sequence invalid_seq = valid_seq;
+	/* set buffer size to 0 bytes */
+	invalid_seq.buffer_size = 0;
+
+	ret = adc_read(dev_adc, &invalid_seq);
+
+	zassert_true(
+		ret == -ENOMEM,
+		"adc_read() should return -ENOMEM,"
+		" got unexpected value of %d",
+		ret
+	);
+}
+
+/**
+ * @brief test adc_channel_setup() with invalid reference value
+ *
+ * function should return -EINVAL
+ */
+
+ZTEST(adc_error_cases, test_adc_setup_invalid_reference)
+{
+	int ret;
+
+	struct adc_channel_cfg invalid_channel_cfg = valid_channel_cfg;
+	/* set invalid reference */
+	invalid_channel_cfg.reference = 99;
+
+	ret = adc_channel_setup(dev_adc, &invalid_channel_cfg);
+
+	zassert_true(
+		ret == -EINVAL,
+		"adc_channel_setup() should return -EINVAL,"
+		" got unexpected value of %d",
+		ret
+	);
+}
+
+/**
+ * @brief test adc_read() with invalid gain value
+ *
+ * function should return -EINVAL
+ */
+
+ZTEST(adc_error_cases, test_adc_setup_invalid_gain)
+{
+	int ret;
+
+	struct adc_channel_cfg invalid_channel_cfg = valid_channel_cfg;
+	/* set invalid gain value */
+	invalid_channel_cfg.gain = 99;
+	ret = adc_channel_setup(dev_adc, &invalid_channel_cfg);
+	zassert_true(
+		ret == -EINVAL,
+		"adc_channel_setup() should return -EINVAL,"
+		" got unexpected value of %d",
+		ret
+	);
+}
+
+static void *suite_setup(void)
+{
+	TC_PRINT("Test executed on %s\n", CONFIG_BOARD_TARGET);
+	TC_PRINT("===================================================================\n");
+
+	return NULL;
+}
+
+ZTEST_SUITE(adc_error_cases, NULL, suite_setup, NULL, NULL, NULL);
diff --git a/tests/drivers/adc/adc_error_cases/testcase.yaml b/tests/drivers/adc/adc_error_cases/testcase.yaml
new file mode 100644
index 00000000000..039be590b38
--- /dev/null
+++ b/tests/drivers/adc/adc_error_cases/testcase.yaml
@@ -0,0 +1,7 @@
+tests:
+  drivers.adc_error_cases:
+    depends_on: adc
+    platform_allow:
+      - nrf52840dk/nrf52840
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp

From 8735cb14b266a1f257afada5dc0207004adbb865 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Wed, 30 Oct 2024 16:11:11 +0100
Subject: [PATCH 0528/2913] [nrf fromlist] soc: nordic: nrf54l: fix
 configuration of DCDC regulator

DCDC regulator on nRF54L may not always works as intended.
Apply a fix addressing that.

Upstream PR #: 80635

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit d59b845455e7e4d1637ed994afabf95ea5af58f8)
---
 soc/nordic/nrf54l/soc.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index 56e48800ed4..2098b7f87df 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -154,6 +154,11 @@ static inline void power_and_clock_configuration(void)
 	}
 
 #if (DT_PROP(DT_NODELABEL(vregmain), regulator_initial_mode) == NRF5X_REG_MODE_DCDC)
+#if defined(__CORTEX_M) && !defined(NRF_TRUSTZONE_NONSECURE) && defined(__ARM_FEATURE_CMSE)
+	if (*(uint32_t *)0x00FFC334 <= 0x180A1D00) {
+		*(uint32_t *)0x50120640 = 0x1FAAE85C;
+	}
+#endif
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);
 #endif
 

From 6f01f10490806ea3c3e1c4d6f434106cd454051d Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Tue, 17 Sep 2024 14:01:51 +0200
Subject: [PATCH 0529/2913] [nrf fromtree] tests/bsim/bluetooth/host/att:
 Enable RealEncryption

Let's run tests with security/privacy with the HW models acutually
running the encryptions, so in case of missaligned keys
tests fail.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 53adf2c617658b9248a75fff2305193c6ea7ee2b)
(cherry picked from commit b4b2115efc9ad399257e0f79c9f044a6b918dc86)
---
 .../bsim/bluetooth/host/att/eatt/tests_scripts/autoconnect.sh | 4 ++--
 tests/bsim/bluetooth/host/att/eatt/tests_scripts/collision.sh | 4 ++--
 tests/bsim/bluetooth/host/att/eatt/tests_scripts/lowres.sh    | 4 ++--
 .../bluetooth/host/att/eatt/tests_scripts/multiple_conn.sh    | 4 ++--
 .../bsim/bluetooth/host/att/eatt/tests_scripts/reconfigure.sh | 4 ++--
 .../bluetooth/host/att/eatt_notif/test_scripts/eatt_notif.sh  | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/autoconnect.sh b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/autoconnect.sh
index 2d22d4b817e..057e76f1813 100755
--- a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/autoconnect.sh
+++ b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/autoconnect.sh
@@ -11,10 +11,10 @@ EXECUTE_TIMEOUT=120
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central_autoconnect
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central_autoconnect -RealEncryption=1
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_autoconnect
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_autoconnect -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=200e6 $@
diff --git a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/collision.sh b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/collision.sh
index d824a4b6895..c89bab27548 100755
--- a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/collision.sh
+++ b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/collision.sh
@@ -11,10 +11,10 @@ EXECUTE_TIMEOUT=120
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_collision_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central -RealEncryption=1
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_collision_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=200e6 $@
diff --git a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/lowres.sh b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/lowres.sh
index 36ff66d8ade..0d988761adf 100755
--- a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/lowres.sh
+++ b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/lowres.sh
@@ -10,10 +10,10 @@ verbosity_level=2
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central_lowres
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central_lowres -RealEncryption=1
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_lowres_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_lowres
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_lowres -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=200e6 $@
diff --git a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/multiple_conn.sh b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/multiple_conn.sh
index 962c10d5631..e3919eb4a26 100755
--- a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/multiple_conn.sh
+++ b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/multiple_conn.sh
@@ -11,10 +11,10 @@ EXECUTE_TIMEOUT=120
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_multiple_conn_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central -RealEncryption=1
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_multiple_conn_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=200e6 $@
diff --git a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/reconfigure.sh b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/reconfigure.sh
index e95468a522f..d2a51f29098 100755
--- a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/reconfigure.sh
+++ b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/reconfigure.sh
@@ -11,10 +11,10 @@ EXECUTE_TIMEOUT=120
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central_reconfigure
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central_reconfigure -RealEncryption=1
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_reconfigure
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_reconfigure -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=60e6 $@
diff --git a/tests/bsim/bluetooth/host/att/eatt_notif/test_scripts/eatt_notif.sh b/tests/bsim/bluetooth/host/att/eatt_notif/test_scripts/eatt_notif.sh
index d2df9216cf7..39000efbc74 100755
--- a/tests/bsim/bluetooth/host/att/eatt_notif/test_scripts/eatt_notif.sh
+++ b/tests/bsim/bluetooth/host/att/eatt_notif/test_scripts/eatt_notif.sh
@@ -13,10 +13,10 @@ EXECUTE_TIMEOUT=120
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_notif_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=client
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=client -RealEncryption=1
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_notif_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=server
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=server -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=60e6 $@

From db6cea41a2d4bcbb40019c82627be095cece42b6 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Tue, 17 Sep 2024 14:03:25 +0200
Subject: [PATCH 0530/2913] [nrf fromtree] tests/bsim/bluetooth/host/gatt:
 Enable RealEncryption

Let's run tests with security/privacy with the HW models acutually
running the encryption, so in case of missaligned keys
tests fail.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 342e2988bb3ab17ceb9066d3a058814e0cad1d87)
(cherry picked from commit 67b6339f07fd62154ff257ad077b58ddb23af77c)
---
 .../bluetooth/host/gatt/caching/test_scripts/_run_test.sh | 4 ++--
 .../host/gatt/ccc_store/test_scripts/ccc_store.sh         | 8 ++++----
 .../host/gatt/ccc_store/test_scripts/ccc_store_2.sh       | 8 ++++----
 .../bsim/bluetooth/host/gatt/general/test_scripts/gatt.sh | 4 ++--
 .../bluetooth/host/gatt/notify/test_scripts/_run_test.sh  | 4 ++--
 .../host/gatt/notify_multiple/test_scripts/notify.sh      | 4 ++--
 .../host/gatt/sc_indicate/test_scripts/sc_indicate.sh     | 4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/tests/bsim/bluetooth/host/gatt/caching/test_scripts/_run_test.sh b/tests/bsim/bluetooth/host/gatt/caching/test_scripts/_run_test.sh
index ed7876abe8b..5ba9e92e66f 100755
--- a/tests/bsim/bluetooth/host/gatt/caching/test_scripts/_run_test.sh
+++ b/tests/bsim/bluetooth/host/gatt/caching/test_scripts/_run_test.sh
@@ -11,10 +11,10 @@ BIN_SUFFIX=${bin_suffix:-}
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_caching_prj_conf${BIN_SUFFIX} \
-    -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=${client_id}
+    -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=${client_id} -RealEncryption=1
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_caching_prj_conf${BIN_SUFFIX} \
-    -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=${server_id}
+    -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=${server_id} -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
     -D=2 -sim_length=60e6 $@
diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store.sh b/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store.sh
index 108ce0ba219..c1bc4469739 100755
--- a/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store.sh
+++ b/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store.sh
@@ -13,13 +13,13 @@ cd ${BSIM_OUT_PATH}/bin
 if [ "${1}" != 'debug0' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
-    -flash="${simulation_id}_client.log.bin" -flash_rm -argstest 10
+    -flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1 -argstest 10
 fi
 
 if [ "${1}" != 'debug1' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral \
-    -flash="${simulation_id}_server.log.bin" -flash_rm -argstest 10
+    -flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1 -argstest 10
 fi
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
@@ -28,13 +28,13 @@ Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
 if [ "${1}" == 'debug0' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
-    -flash="${simulation_id}_client.log.bin" -flash_rm -argstest 10
+    -flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1 -argstest 10
 fi
 
 if [ "${1}" == 'debug1' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral \
-    -flash="${simulation_id}_server.log.bin" -flash_rm -argstest 10
+    -flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1 -argstest 10
 fi
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store_2.sh b/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store_2.sh
index 5907d7f1f66..5eb1219913d 100755
--- a/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store_2.sh
+++ b/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store_2.sh
@@ -13,13 +13,13 @@ cd ${BSIM_OUT_PATH}/bin
 if [ "${1}" != 'debug0' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
-    -flash="${simulation_id}_client.log.bin" -flash_rm -argstest 10
+    -flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1 -argstest 10
 fi
 
 if [ "${1}" != 'debug1' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral \
-    -flash="${simulation_id}_server.log.bin" -flash_rm -argstest 10
+    -flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1 -argstest 10
 fi
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
@@ -28,13 +28,13 @@ Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
 if [ "${1}" == 'debug0' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
-    -flash="${simulation_id}_client.log.bin" -flash_rm -argstest 10
+    -flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1 -argstest 10
 fi
 
 if [ "${1}" == 'debug1' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral \
-    -flash="${simulation_id}_server.log.bin" -flash_rm -argstest 10
+    -flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1 -argstest 10
 fi
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/gatt/general/test_scripts/gatt.sh b/tests/bsim/bluetooth/host/gatt/general/test_scripts/gatt.sh
index 4cae0b21812..df41707e832 100755
--- a/tests/bsim/bluetooth/host/gatt/general/test_scripts/gatt.sh
+++ b/tests/bsim/bluetooth/host/gatt/general/test_scripts/gatt.sh
@@ -15,10 +15,10 @@ EXECUTE_TIMEOUT=120
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_general_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=gatt_client
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=gatt_client -RealEncryption=1
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_general_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=gatt_server
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=gatt_server -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=60e6 $@
diff --git a/tests/bsim/bluetooth/host/gatt/notify/test_scripts/_run_test.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/_run_test.sh
index 0ed274c7b5d..faa4199dd04 100755
--- a/tests/bsim/bluetooth/host/gatt/notify/test_scripts/_run_test.sh
+++ b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/_run_test.sh
@@ -10,10 +10,10 @@ verbosity_level=2
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_notify_prj_conf \
-    -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=${client_id}
+    -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=${client_id} -RealEncryption=1
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_notify_prj_conf \
-    -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=${server_id}
+    -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=${server_id} -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
     -D=2 -sim_length=60e6 $@
diff --git a/tests/bsim/bluetooth/host/gatt/notify_multiple/test_scripts/notify.sh b/tests/bsim/bluetooth/host/gatt/notify_multiple/test_scripts/notify.sh
index 11e85961622..d89a5701fd9 100755
--- a/tests/bsim/bluetooth/host/gatt/notify_multiple/test_scripts/notify.sh
+++ b/tests/bsim/bluetooth/host/gatt/notify_multiple/test_scripts/notify.sh
@@ -12,10 +12,10 @@ EXECUTE_TIMEOUT=120
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_notify_multiple_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=gatt_client
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=gatt_client -RealEncryption=1
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_notify_multiple_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=gatt_server
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=gatt_server -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=60e6 $@
diff --git a/tests/bsim/bluetooth/host/gatt/sc_indicate/test_scripts/sc_indicate.sh b/tests/bsim/bluetooth/host/gatt/sc_indicate/test_scripts/sc_indicate.sh
index 4bd2dabdc5a..73ec66146ae 100755
--- a/tests/bsim/bluetooth/host/gatt/sc_indicate/test_scripts/sc_indicate.sh
+++ b/tests/bsim/bluetooth/host/gatt/sc_indicate/test_scripts/sc_indicate.sh
@@ -12,10 +12,10 @@ verbosity_level=2
 cd ${BSIM_OUT_PATH}/bin
 
 Execute "./${test_exe}" \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central -RealEncryption=1
 
 Execute "./${test_exe}" \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=60e6

From 86ab7ad2305bfa5c0ed5df8bd8718fb1d9734cbf Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Tue, 17 Sep 2024 14:04:24 +0200
Subject: [PATCH 0531/2913] [nrf fromtree] tests/bsim/bluetooth/host/security:
 Enable RealEncryption

Let's run tests with security/privacy with the HW models acutually
running the encryptions, so in case of missaligned keys
tests fail.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 9182a7e8c49870e73c4bcec8af4b989cbdc9dfa5)
(cherry picked from commit 8471888c563e58b434d4fc745f43c7e6e2741dd4)
---
 .../security/ccc_update/test_scripts/ccc_update.sh   | 12 ++++++------
 .../security/ccc_update/test_scripts/ccc_update_2.sh | 12 ++++++------
 .../test_scripts/security_changed_callback.sh        | 10 ++++++----
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update.sh b/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update.sh
index d577ad974ef..bb4aab2b0dc 100755
--- a/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update.sh
+++ b/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update.sh
@@ -14,19 +14,19 @@ cd ${BSIM_OUT_PATH}/bin
 if [ "${1}" != 'debug0' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
-    -flash="${simulation_id}_client.log.bin" -flash_rm
+    -flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1
 fi
 
 if [ "${1}" != 'debug1' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=bad_central \
-    -flash="${simulation_id}_bad_client.log.bin" -flash_rm
+    -flash="${simulation_id}_bad_client.log.bin" -flash_rm -RealEncryption=1
 fi
 
 if [ "${1}" != 'debug2' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=2 -testid=peripheral \
-    -flash="${simulation_id}_server.log.bin" -flash_rm
+    -flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1
 fi
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
@@ -35,19 +35,19 @@ Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
 if [ "${1}" == 'debug0' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
-    -flash="${simulation_id}_client.log.bin" -flash_rm
+    -flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1
 fi
 
 if [ "${1}" == 'debug1' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=bad_central \
-    -flash="${simulation_id}_bad_client.log.bin" -flash_rm
+    -flash="${simulation_id}_bad_client.log.bin" -flash_rm -RealEncryption=1
 fi
 
 if [ "${1}" == 'debug2' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=2 -testid=peripheral \
-    -flash="${simulation_id}_server.log.bin" -flash_rm
+    -flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1
 fi
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update_2.sh b/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update_2.sh
index 49a27c4524e..eb165fa85f0 100755
--- a/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update_2.sh
+++ b/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update_2.sh
@@ -14,19 +14,19 @@ cd ${BSIM_OUT_PATH}/bin
 if [ "${1}" != 'debug0' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
-    -flash="${simulation_id}_client.log.bin" -flash_rm
+    -flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1
 fi
 
 if [ "${1}" != 'debug1' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=bad_central \
-    -flash="${simulation_id}_bad_client.log.bin" -flash_rm
+    -flash="${simulation_id}_bad_client.log.bin" -flash_rm -RealEncryption=1
 fi
 
 if [ "${1}" != 'debug2' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=2 -testid=peripheral \
-    -flash="${simulation_id}_server.log.bin" -flash_rm
+    -flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1
 fi
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
@@ -35,19 +35,19 @@ Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
 if [ "${1}" == 'debug0' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
-    -flash="${simulation_id}_client.log.bin" -flash_rm
+    -flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1
 fi
 
 if [ "${1}" == 'debug1' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=bad_central \
-    -flash="${simulation_id}_bad_client.log.bin" -flash_rm
+    -flash="${simulation_id}_bad_client.log.bin" -flash_rm -RealEncryption=1
 fi
 
 if [ "${1}" == 'debug2' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=2 -testid=peripheral \
-    -flash="${simulation_id}_server.log.bin" -flash_rm
+    -flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1
 fi
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/security/security_changed_callback/test_scripts/security_changed_callback.sh b/tests/bsim/bluetooth/host/security/security_changed_callback/test_scripts/security_changed_callback.sh
index 5abb7bef444..287eeeee152 100755
--- a/tests/bsim/bluetooth/host/security/security_changed_callback/test_scripts/security_changed_callback.sh
+++ b/tests/bsim/bluetooth/host/security/security_changed_callback/test_scripts/security_changed_callback.sh
@@ -12,10 +12,11 @@ verbosity_level=2
 cd ${BSIM_OUT_PATH}/bin
 
 Execute "./${test_exe}" \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central -RealEncryption=1
 
 Execute "./${test_exe}" \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_disconnect_in_sec_cb
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_disconnect_in_sec_cb \
+  -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=60e6
@@ -23,10 +24,11 @@ Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
 wait_for_background_jobs
 
 Execute "./${test_exe}" \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central  -RealEncryption=1
 
 Execute "./${test_exe}" \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_unpair_in_sec_cb
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_unpair_in_sec_cb \
+  -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=60e6

From d8b297896726361cdd7a36146557175e6c0aca79 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Tue, 17 Sep 2024 14:04:54 +0200
Subject: [PATCH 0532/2913] [nrf fromtree]
 tests/bsim/bluetooth/host/adv/encrypted: Enable RealEncryption

Let's run tests with security/privacy with the HW models acutually
running the encryptions, so in case of missaligned keys
tests fail.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 3726cf369c84a7a4504b06440951ecd0afd8a64b)
(cherry picked from commit 79ab9ded039d8dda74ae0d28929b3632aca9e92b)
---
 .../host/adv/encrypted/ead_sample/test_scripts/ead_sample.sh  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/bsim/bluetooth/host/adv/encrypted/ead_sample/test_scripts/ead_sample.sh b/tests/bsim/bluetooth/host/adv/encrypted/ead_sample/test_scripts/ead_sample.sh
index ae3b7d53f00..adbe2b19b78 100755
--- a/tests/bsim/bluetooth/host/adv/encrypted/ead_sample/test_scripts/ead_sample.sh
+++ b/tests/bsim/bluetooth/host/adv/encrypted/ead_sample/test_scripts/ead_sample.sh
@@ -10,10 +10,10 @@ verbosity_level=2
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_encrypted_ead_sample_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central -RealEncryption=1
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_encrypted_ead_sample_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=60e6 $@

From 886c21075774647816bf2a311a95799d8d45c4cf Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Wed, 18 Sep 2024 15:49:47 +0200
Subject: [PATCH 0533/2913] [nrf fromtree] Bluetooth: Host: Set scan option
 type to uint8_t

Changed the scan option type from uint32_t to
uint8_t.

There are 2 reasons for this:
1) This reduces the size of the struct bt_le_scan_param.
   Since we are now storing two copies of scan parameters
   statically in the host, this is not insignficant.
2) This fixes a "hole" in the struct. There are no longer
   3 empty octets between the `type` and the `options`, which
   caused valgrind warnings when using `memcpy` and `memcmp`
   of the struct.

Currently we only need 8 bits for the options available.
If additional options are added later, the field need
to be increased. For the above reasons some additional
refactoring my be required to avoid significant size
increases and the valgrind issue.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit e1e4f2a2af7776011a58fc7754804c19745c33a4)
(cherry picked from commit a84fcc59dd0c181b84b62568c9056941ed22e1f4)
---
 include/zephyr/bluetooth/bluetooth.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/zephyr/bluetooth/bluetooth.h b/include/zephyr/bluetooth/bluetooth.h
index 6f565bd400f..bc5b7b0731c 100644
--- a/include/zephyr/bluetooth/bluetooth.h
+++ b/include/zephyr/bluetooth/bluetooth.h
@@ -2065,7 +2065,7 @@ struct bt_le_scan_param {
 	uint8_t  type;
 
 	/** Bit-field of scanning options. */
-	uint32_t options;
+	uint8_t options;
 
 	/** Scan interval (N * 0.625 ms).
 	 *

From dce4981851d3c18cefdbff157971ce11d2e05d6b Mon Sep 17 00:00:00 2001
From: Yong Cong Sin <ycsin@meta.com>
Date: Thu, 19 Sep 2024 11:25:59 +0800
Subject: [PATCH 0534/2913] [nrf fromtree] bluetooth: host: fix formatter
 warnings

Update the string formatter according to the type of the
variables that it is printing to eliminate compilation
warnings.

Signed-off-by: Yong Cong Sin <ycsin@meta.com>
Signed-off-by: Yong Cong Sin <yongcong.sin@gmail.com>
(cherry picked from commit d250664dc735007583b7049d2ffae3537c86dad2)
(cherry picked from commit a2bbc5a78a2faa552550be69436fbf1698247707)
---
 subsys/bluetooth/host/adv.c   | 2 +-
 subsys/bluetooth/host/buf.c   | 2 +-
 subsys/bluetooth/host/conn.c  | 4 ++--
 subsys/bluetooth/host/l2cap.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/subsys/bluetooth/host/adv.c b/subsys/bluetooth/host/adv.c
index 8420daea603..2191effefba 100644
--- a/subsys/bluetooth/host/adv.c
+++ b/subsys/bluetooth/host/adv.c
@@ -662,7 +662,7 @@ static int hci_set_ad_ext(struct bt_le_ext_adv *adv, uint16_t hci_op,
 	}
 
 	if (total_len_bytes > bt_dev.le.max_adv_data_len) {
-		LOG_WRN("adv or scan rsp data too large (%d > max %d)", total_len_bytes,
+		LOG_WRN("adv or scan rsp data too large (%zu > max %u)", total_len_bytes,
 			bt_dev.le.max_adv_data_len);
 		return -EDOM;
 	}
diff --git a/subsys/bluetooth/host/buf.c b/subsys/bluetooth/host/buf.c
index 2e639488481..2ce2477ff05 100644
--- a/subsys/bluetooth/host/buf.c
+++ b/subsys/bluetooth/host/buf.c
@@ -158,7 +158,7 @@ struct net_buf *bt_buf_make_view(struct net_buf *view,
 
 	__ASSERT_NO_MSG(!bt_buf_has_view(parent));
 
-	LOG_DBG("make-view %p viewsize %u meta %p", view, len, meta);
+	LOG_DBG("make-view %p viewsize %zu meta %p", view, len, meta);
 
 	net_buf_simple_clone(&parent->b, &view->b);
 	view->size = net_buf_headroom(parent) + len;
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 5e853d57be1..37aa3ed440b 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -160,7 +160,7 @@ static struct net_buf *get_data_frag(struct net_buf *outside, size_t winsize)
 	window = bt_buf_make_view(window, outside,
 				  winsize, &get_frag_md(window)->view_meta);
 
-	LOG_DBG("get-acl-frag: outside %p window %p size %d", outside, window, winsize);
+	LOG_DBG("get-acl-frag: outside %p window %p size %zu", outside, window, winsize);
 
 	return window;
 }
@@ -665,7 +665,7 @@ static int send_buf(struct bt_conn *conn, struct net_buf *buf,
 		return -EIO;
 	}
 
-	LOG_DBG("conn %p buf %p len %u buf->len %u cb %p ud %p",
+	LOG_DBG("conn %p buf %p len %zu buf->len %u cb %p ud %p",
 		conn, buf, len, buf->len, cb, ud);
 
 	/* Acquire the right to send 1 packet to the controller */
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index 8747eae4791..648e18183c4 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -937,7 +937,7 @@ struct net_buf *l2cap_data_pull(struct bt_conn *conn,
 		struct bt_l2cap_hdr *hdr;
 		uint16_t pdu_len = get_pdu_len(lechan, pdu);
 
-		LOG_DBG("Adding L2CAP PDU header: buf %p chan %p len %zu / %zu",
+		LOG_DBG("Adding L2CAP PDU header: buf %p chan %p len %u / %u",
 			pdu, lechan, pdu_len, pdu->len);
 
 		LOG_HEXDUMP_DBG(pdu->data, pdu->len, "PDU payload");

From 456faff53e2675ed3db17a1abb0cdb9a3bce512c Mon Sep 17 00:00:00 2001
From: Babak Arisian <bbaa@demant.com>
Date: Sun, 22 Sep 2024 12:30:15 +0200
Subject: [PATCH 0535/2913] [nrf fromtree] Bluetooth: Host: BT scan failure
 when connecting by name in shell

Added a timeout for active scans (instead of using the host's scan
timeout) in the shell by submitting a k_work that stops the scan
after a specified period.

Fixes #78659

Signed-off-by: Babak Arisian <bbaa@demant.com>
(cherry picked from commit d8c1d4d7b65926a2485007eb434cf91e106cd8bb)
(cherry picked from commit 4bec79b5f58b99cb0910456570c79b4f6fbe0bd6)
---
 subsys/bluetooth/shell/bt.c | 50 ++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/subsys/bluetooth/shell/bt.c b/subsys/bluetooth/shell/bt.c
index b08f67835e1..7b904f6262f 100644
--- a/subsys/bluetooth/shell/bt.c
+++ b/subsys/bluetooth/shell/bt.c
@@ -76,6 +76,8 @@ static struct bt_conn_auth_info_cb auth_info_cb;
  */
 #define HCI_CMD_MAX_PARAM 65
 
+#define DEFAULT_SCAN_TIMEOUT_SEC 10
+
 #if defined(CONFIG_BT_BROADCASTER)
 enum {
 	SHELL_ADV_OPT_CONNECTABLE,
@@ -218,9 +220,31 @@ static struct bt_auto_connect {
 	bool addr_set;
 	bool connect_name;
 } auto_connect;
-#endif
+#endif /* CONFIG_BT_CENTRAL */
 
 #if defined(CONFIG_BT_OBSERVER)
+static void active_scan_timeout(struct k_work *work)
+{
+	int err;
+
+	shell_print(ctx_shell, "Scan timeout");
+
+	err = bt_le_scan_stop();
+	if (err) {
+		shell_error(ctx_shell, "Failed to stop scan (err %d)", err);
+	}
+
+#if defined(CONFIG_BT_CENTRAL)
+	if (auto_connect.connect_name) {
+		auto_connect.connect_name = false;
+		/* "name" is what would be in argv[0] normally */
+		cmd_scan_filter_clear_name(ctx_shell, 1, (char *[]){ "name" });
+	}
+#endif /* CONFIG_BT_CENTRAL */
+}
+
+static K_WORK_DELAYABLE_DEFINE(active_scan_timeout_work, active_scan_timeout);
+
 static struct bt_scan_filter {
 	char name[NAME_LEN];
 	bool name_set;
@@ -591,14 +615,6 @@ static void scan_recv(const struct bt_le_scan_recv_info *info, struct net_buf_si
 static void scan_timeout(void)
 {
 	shell_print(ctx_shell, "Scan timeout");
-
-#if defined(CONFIG_BT_CENTRAL)
-	if (auto_connect.connect_name) {
-		auto_connect.connect_name = false;
-		/* "name" is what would be in argv[0] normally */
-		cmd_scan_filter_clear_name(ctx_shell, 1, (char *[]){ "name" });
-	}
-#endif /* CONFIG_BT_CENTRAL */
 }
 #endif /* CONFIG_BT_OBSERVER */
 
@@ -1602,7 +1618,7 @@ static int cmd_active_scan_on(const struct shell *sh, uint32_t options,
 			.options    = BT_LE_SCAN_OPT_NONE,
 			.interval   = BT_GAP_SCAN_FAST_INTERVAL,
 			.window     = BT_GAP_SCAN_FAST_WINDOW,
-			.timeout    = timeout, };
+			.timeout    = 0, };
 
 	param.options |= options;
 
@@ -1615,6 +1631,11 @@ static int cmd_active_scan_on(const struct shell *sh, uint32_t options,
 		shell_print(sh, "Bluetooth active scan enabled");
 	}
 
+	if (timeout != 0) {
+		/* Schedule the k_work to act as a timeout */
+		(void)k_work_reschedule(&active_scan_timeout_work, K_SECONDS(timeout));
+	}
+
 	return 0;
 }
 
@@ -1647,6 +1668,9 @@ static int cmd_scan_off(const struct shell *sh)
 {
 	int err;
 
+	/* Cancel the potentially pending scan timeout work */
+	(void)k_work_cancel_delayable(&active_scan_timeout_work);
+
 	err = bt_le_scan_stop();
 	if (err) {
 		shell_error(sh, "Stopping scanning failed (err %d)", err);
@@ -3327,13 +3351,12 @@ static int cmd_auto_conn(const struct shell *sh, size_t argc, char *argv[])
 
 static int cmd_connect_le_name(const struct shell *sh, size_t argc, char *argv[])
 {
-	const uint16_t timeout_seconds = 10;
 	const struct bt_le_scan_param param = {
 		.type       = BT_LE_SCAN_TYPE_ACTIVE,
 		.options    = BT_LE_SCAN_OPT_NONE,
 		.interval   = BT_GAP_SCAN_FAST_INTERVAL,
 		.window     = BT_GAP_SCAN_FAST_WINDOW,
-		.timeout    = timeout_seconds * 100, /* 10ms units */
+		.timeout    = 0,
 	};
 	int err;
 
@@ -3359,6 +3382,9 @@ static int cmd_connect_le_name(const struct shell *sh, size_t argc, char *argv[]
 	/* Set boolean to tell the scan callback to connect to this name */
 	auto_connect.connect_name = true;
 
+	/* Schedule the k_work to act as a timeout */
+	(void)k_work_reschedule(&active_scan_timeout_work, K_SECONDS(DEFAULT_SCAN_TIMEOUT_SEC));
+
 	return 0;
 }
 #endif /* CONFIG_BT_CENTRAL */

From 236fdfacf9fbaa438e5e9680885bc1655f266063 Mon Sep 17 00:00:00 2001
From: Lyle Zhu <lyle.zhu@nxp.com>
Date: Thu, 16 May 2024 15:29:35 +0800
Subject: [PATCH 0536/2913] [nrf fromtree] Bluetooth: Host: SSP: Correct BR
 bonding type

Currently, the bonding type of Authentication
_Requirements parameter is always `Dedicated
Bonding` if the device is pairing initiator.

But if the bonding is performed during
connection setup or channel establishment as
a precursor to accessing a service, the
bonding type should be `General bonding`.

Add a flag BT_CONN_BR_GENERAL_BONDING.
Set the flag if the bonding is performed in
the L2CAP_BR/RFCOMM channel establishment.

Set bonding type depends on the flag when
receiving IO cap request.

Signed-off-by: Lyle Zhu <lyle.zhu@nxp.com>
(cherry picked from commit 08ceb14299c921000705710917102c17d327f8ed)
(cherry picked from commit 08fbd11fa7e7b64b31c0c004f3d5bfbf5a713b45)
---
 subsys/bluetooth/host/classic/l2cap_br.c |  7 +++++++
 subsys/bluetooth/host/classic/rfcomm.c   |  7 +++++++
 subsys/bluetooth/host/classic/ssp.c      | 12 ++++++++++--
 subsys/bluetooth/host/conn.c             |  1 +
 subsys/bluetooth/host/conn_internal.h    |  1 +
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/subsys/bluetooth/host/classic/l2cap_br.c b/subsys/bluetooth/host/classic/l2cap_br.c
index 523cce4600b..4c1461c7f04 100644
--- a/subsys/bluetooth/host/classic/l2cap_br.c
+++ b/subsys/bluetooth/host/classic/l2cap_br.c
@@ -786,6 +786,13 @@ l2cap_br_conn_security(struct bt_l2cap_chan *chan, const uint16_t psm)
 	 * since service/profile requires that.
 	 */
 	if (check == 0) {
+		/*
+		 * General Bonding refers to the process of performing bonding
+		 * during connection setup or channel establishment procedures
+		 * as a precursor to accessing a service.
+		 * For current case, it is dedicated bonding.
+		 */
+		atomic_set_bit(chan->conn->flags, BT_CONN_BR_GENERAL_BONDING);
 		return L2CAP_CONN_SECURITY_PENDING;
 	}
 
diff --git a/subsys/bluetooth/host/classic/rfcomm.c b/subsys/bluetooth/host/classic/rfcomm.c
index 21ccba25e7e..f8742bff367 100644
--- a/subsys/bluetooth/host/classic/rfcomm.c
+++ b/subsys/bluetooth/host/classic/rfcomm.c
@@ -829,6 +829,13 @@ static enum security_result rfcomm_dlc_security(struct bt_rfcomm_dlc *dlc)
 	}
 
 	if (!bt_conn_set_security(conn, dlc->required_sec_level)) {
+		/*
+		 * General Bonding refers to the process of performing bonding
+		 * during connection setup or channel establishment procedures
+		 * as a precursor to accessing a service.
+		 * For current case, it is dedicated bonding.
+		 */
+		atomic_set_bit(conn->flags, BT_CONN_BR_GENERAL_BONDING);
 		/* If Security elevation is initiated or in progress */
 		return RFCOMM_SECURITY_PENDING;
 	}
diff --git a/subsys/bluetooth/host/classic/ssp.c b/subsys/bluetooth/host/classic/ssp.c
index 72ac72624a7..41a42f829f3 100644
--- a/subsys/bluetooth/host/classic/ssp.c
+++ b/subsys/bluetooth/host/classic/ssp.c
@@ -666,9 +666,17 @@ void bt_hci_io_capa_req(struct net_buf *buf)
 	 */
 	if (atomic_test_bit(conn->flags, BT_CONN_BR_PAIRING_INITIATOR)) {
 		if (get_io_capa() != BT_IO_NO_INPUT_OUTPUT) {
-			auth = BT_HCI_DEDICATED_BONDING_MITM;
+			if (atomic_test_bit(conn->flags, BT_CONN_BR_GENERAL_BONDING)) {
+				auth = BT_HCI_GENERAL_BONDING_MITM;
+			} else {
+				auth = BT_HCI_DEDICATED_BONDING_MITM;
+			}
 		} else {
-			auth = BT_HCI_DEDICATED_BONDING;
+			if (atomic_test_bit(conn->flags, BT_CONN_BR_GENERAL_BONDING)) {
+				auth = BT_HCI_GENERAL_BONDING;
+			} else {
+				auth = BT_HCI_DEDICATED_BONDING;
+			}
 		}
 	} else {
 		auth = ssp_get_auth(conn);
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 37aa3ed440b..21ed9de4a35 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -2633,6 +2633,7 @@ static void reset_pairing(struct bt_conn *conn)
 		atomic_clear_bit(conn->flags, BT_CONN_BR_PAIRING);
 		atomic_clear_bit(conn->flags, BT_CONN_BR_PAIRING_INITIATOR);
 		atomic_clear_bit(conn->flags, BT_CONN_BR_LEGACY_SECURE);
+		atomic_clear_bit(conn->flags, BT_CONN_BR_GENERAL_BONDING);
 	}
 #endif /* CONFIG_BT_CLASSIC */
 
diff --git a/subsys/bluetooth/host/conn_internal.h b/subsys/bluetooth/host/conn_internal.h
index 6b6c97b1902..f5e747febdd 100644
--- a/subsys/bluetooth/host/conn_internal.h
+++ b/subsys/bluetooth/host/conn_internal.h
@@ -60,6 +60,7 @@ enum {
 	BT_CONN_USER,                         /* user I/O when pairing */
 	BT_CONN_BR_PAIRING,                   /* BR connection in pairing context */
 	BT_CONN_BR_NOBOND,                    /* SSP no bond pairing tracker */
+	BT_CONN_BR_GENERAL_BONDING,           /* BR general bonding */
 	BT_CONN_BR_PAIRING_INITIATOR,         /* local host starts authentication */
 	BT_CONN_CLEANUP,                      /* Disconnected, pending cleanup */
 	BT_CONN_AUTO_INIT_PROCEDURES_DONE,    /* Auto-initiated procedures have run */

From 8fd9326ae1053ef63e94a24bab0b3f6b715924ed Mon Sep 17 00:00:00 2001
From: Lyle Zhu <lyle.zhu@nxp.com>
Date: Thu, 16 May 2024 19:31:02 +0800
Subject: [PATCH 0537/2913] [nrf fromtree] Bluetooth: Host: smp: Add function
 to get bonding setting

Add a function bt_get_bondable to get the bonding setting.

Signed-off-by: Lyle Zhu <lyle.zhu@nxp.com>
(cherry picked from commit c0ce5b419b774ff6878ab86ab6ecaec71cff0845)
(cherry picked from commit 2e4a644ff13c0a482576395d43c746cceb8965a5)
---
 include/zephyr/bluetooth/conn.h | 11 +++++++++++
 subsys/bluetooth/host/smp.c     |  5 +++++
 2 files changed, 16 insertions(+)

diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index 23dd9fb89f8..4d2da8d7a58 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -1980,6 +1980,17 @@ static inline const char *bt_security_err_to_str(enum bt_security_err err)
  */
 void bt_set_bondable(bool enable);
 
+/** @brief Get bonding flag.
+ *
+ *  Get current bonding flag.
+ *  The initial value of this flag depends on @kconfig{CONFIG_BT_BONDABLE} Kconfig
+ *  setting.
+ *  The Bonding flag can be updated using bt_set_bondable().
+ *
+ *  @return Current bonding flag.
+ */
+bool bt_get_bondable(void);
+
 /** @brief Set/clear the bonding flag for a given connection.
  *
  *  Set/clear the Bonding flag in the Authentication Requirements of
diff --git a/subsys/bluetooth/host/smp.c b/subsys/bluetooth/host/smp.c
index 1971f185f95..24ace96809d 100644
--- a/subsys/bluetooth/host/smp.c
+++ b/subsys/bluetooth/host/smp.c
@@ -2639,6 +2639,11 @@ void bt_set_bondable(bool enable)
 	bondable = enable;
 }
 
+bool bt_get_bondable(void)
+{
+	return bondable;
+}
+
 void bt_le_oob_set_sc_flag(bool enable)
 {
 	sc_oobd_present = enable;

From b5c17988a848418ee151d9e07948dd60cb83aa16 Mon Sep 17 00:00:00 2001
From: Lyle Zhu <lyle.zhu@nxp.com>
Date: Wed, 25 Sep 2024 21:22:34 +0800
Subject: [PATCH 0538/2913] [nrf fromtree] Bluetooth: host: Kconfig: Correct
 `help` of `BT_BONDABLE`

Correct the `help` of the configuration `BT_BONDABLE`.

Signed-off-by: Lyle Zhu <lyle.zhu@nxp.com>
(cherry picked from commit 0ed8866eb6776179871bf1146879a2ca92c32ab4)
(cherry picked from commit d2db8383590f02b03816a3d31dff4901a1cd6fc8)
---
 subsys/bluetooth/host/Kconfig | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index 4710f24e90c..3124b35b3df 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -661,9 +661,13 @@ config BT_BONDABLE
 	bool "Bondable Mode"
 	default y
 	help
-	  This option enables support for Bondable Mode. In this mode,
-	  Bonding flag in AuthReq of SMP Pairing Request/Response will be set
-	  indicating the support for this mode.
+	  This option is the default value of the bonding flag for any ACL connection.
+	  If the option is true, the default bonding flag is true. Or, the default
+	  bonding flag is false.
+	  After a connection is established, the bonding flag of the connection
+	  can also be changed by calling `bt_conn_set_bondable()` if the configuration
+	  `the bonding flag per-connection` (BT_BONDABLE_PER_CONNECTION) is
+	  enabled. Please see the BT_BONDABLE_PER_CONNECTION configuration.
 
 config BT_BONDING_REQUIRED
 	bool "Always require bonding"

From ba848524b837268d88389d4b1e4475707d07d883 Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Fri, 4 Oct 2024 11:02:13 +0200
Subject: [PATCH 0539/2913] [nrf fromtree] bluetooth: host: att: Implement
 disconnect on ATT timeout

The timeout state is local and can block new ATT operations, but does
not affect the remote side. Disconnecting the GATT connection upon ATT
timeout simplifies error handling for developers. This reduces rare
failure conditions to a common one, without needing special cases for
ATT timeouts.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit f712bde1220d1d4618858ea131d9adc50a1c1ab3)
(cherry picked from commit 723ca15909c8f5b67b938d0b1c8d9c1675d0e271)
---
 doc/connectivity/bluetooth/bluetooth-le-host.rst | 13 +++++++++++++
 doc/connectivity/bluetooth/img/att_timeout.svg   |  1 +
 doc/releases/release-notes-4.0.rst               |  2 ++
 subsys/bluetooth/host/att.c                      | 13 ++++++++++++-
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 doc/connectivity/bluetooth/img/att_timeout.svg

diff --git a/doc/connectivity/bluetooth/bluetooth-le-host.rst b/doc/connectivity/bluetooth/bluetooth-le-host.rst
index 3fad3425681..567961bc649 100644
--- a/doc/connectivity/bluetooth/bluetooth-le-host.rst
+++ b/doc/connectivity/bluetooth/bluetooth-le-host.rst
@@ -274,6 +274,19 @@ over LE connections. A more detailed description of this layer and the
 API reference can be found in the
 :ref:`GATT API reference section <bt_gatt>`.
 
+ATT timeout
+-----------
+
+If the peer device does not respond to an ATT request (such as read or write)
+within the ATT timeout, the host will automatically initiate a disconnect. This
+simplifies error handling by reducing rare failure conditions to a common
+disconnection, allowing developers to manage unexpected disconnects without
+special cases for ATT timeouts.
+
+.. image:: img/att_timeout.svg
+  :align: center
+  :alt: ATT timeout
+
 Mesh
 ====
 
diff --git a/doc/connectivity/bluetooth/img/att_timeout.svg b/doc/connectivity/bluetooth/img/att_timeout.svg
new file mode 100644
index 00000000000..8b1f2832b6e
--- /dev/null
+++ b/doc/connectivity/bluetooth/img/att_timeout.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="421.4523278203424" height="300.077684621"><desc>participant%20App%0Aparticipant%20Host%0Aparticipant%20Peer%0A%0AApp%20-%3E%20Host%3A%20bt_gatt_read(cb)%0A%0A%0A%0AHost%20-%3E%20Peer%3A%20ATT_READ_REQ%0Aactivate%20Host%0Aspace%20-4.1%0Aaboxright%20left%20of%20Host%3A%200%20seconds%20%20%0Aspace%20-2.8%0APeer%20-x%20Host%3A%20ATT_READ_RSP%0Aaboxright%20left%20of%20Host%3A%2030%20seconds%20%20%0Aspace%20-5.4%0AHost%20-%3E%20Host%3A%20bt_conn_disconnect%0Aspace%20-2.8%0Adeactivate%20Host</desc><defs/><g><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g><rect fill="white" stroke="none" x="0" y="0" width="421" height="300"/></g><g/><g><path fill="none" stroke="black" paint-order="fill stroke markers" d=" M 38.93352592923047 55.049635120999994 L 38.93352592923047 300.077684621" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray="12.565541,5.445067766666667"/><path fill="none" stroke="black" paint-order="fill stroke markers" d=" M 198.23498819400908 55.049635120999994 L 198.23498819400908 300.077684621" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray="12.565541,5.445067766666667"/><path fill="none" stroke="black" paint-order="fill stroke markers" d=" M 380.07786103417834 55.049635120999994 L 380.07786103417834 300.077684621" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray="12.565541,5.445067766666667"/></g><g><path fill="none" stroke="none"/><g><path fill="white" stroke="black" paint-order="fill stroke markers" d=" M 8.167601650000002 10.944586211000003 L 69.69945020846095 10.944586211000003 L 69.69945020846095 55.049635120999994 L 8.167601650000002 55.049635120999994 L 8.167601650000002 10.944586211000003 Z" stroke-miterlimit="10" stroke-width="2.613632528" stroke-dasharray=""/></g><g><g/><text fill="black" stroke="none" font-family="sans-serif" font-size="11pt" font-style="normal" font-weight="normal" text-decoration="normal" x="25.8912972305" y="38.71443182099999" text-anchor="start" dominant-baseline="alphabetic" xml:space="preserve">App</text></g><path fill="none" stroke="none"/><g><path fill="white" stroke="black" paint-order="fill stroke markers" d=" M 165.4397136340169 10.944586211000003 L 231.03026275400128 10.944586211000003 L 231.03026275400128 55.049635120999994 L 165.4397136340169 55.049635120999994 L 165.4397136340169 10.944586211000003 Z" stroke-miterlimit="10" stroke-width="2.613632528" stroke-dasharray=""/></g><g><g/><text fill="black" stroke="none" font-family="sans-serif" font-size="11pt" font-style="normal" font-weight="normal" text-decoration="normal" x="183.1634092145169" y="38.71443182099999" text-anchor="start" dominant-baseline="alphabetic" xml:space="preserve">Host</text></g><path fill="none" stroke="none"/><g><path fill="white" stroke="black" paint-order="fill stroke markers" d=" M 346.87099589801426 10.944586211000003 L 413.28472617034237 10.944586211000003 L 413.28472617034237 55.049635120999994 L 346.87099589801426 55.049635120999994 L 346.87099589801426 10.944586211000003 Z" stroke-miterlimit="10" stroke-width="2.613632528" stroke-dasharray=""/></g><g><g/><text fill="black" stroke="none" font-family="sans-serif" font-size="11pt" font-style="normal" font-weight="normal" text-decoration="normal" x="364.5946914785143" y="38.71443182099999" text-anchor="start" dominant-baseline="alphabetic" xml:space="preserve">Peer</text></g></g><g><path fill="white" stroke="black" paint-order="fill stroke markers" d=" M 190.06738654400908 154.694375251 L 206.40258984400907 154.694375251 L 206.40258984400907 242.904473071 L 190.06738654400908 242.904473071 L 190.06738654400908 154.694375251" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray=""/><g><rect fill="white" stroke="none" x="62.34731732589711" y="87.720041721" width="112.47387947144531" height="21.23576429"/><text fill="black" stroke="none" font-family="sans-serif" font-size="11pt" font-style="normal" font-weight="normal" text-decoration="normal" x="64.79759782089711" y="102.42172469100001" text-anchor="start" dominant-baseline="alphabetic" xml:space="preserve">bt_gatt_read(cb)</text></g><g><path fill="none" stroke="black" paint-order="fill stroke markers" d=" M 38.93352592923047 108.95580601099999 L 184.78567081034242 108.95580601099999" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray=""/><g transform="translate(198.23498819400908,108.95580601099999) translate(-198.23498819400908,-108.95580601099999)"><path fill="black" stroke="none" paint-order="stroke fill markers" d=" M 184.6223187773424 102.14947130266665 L 198.23498819400908 108.95580601099999 L 184.6223187773424 115.76214071933333 Z"/></g></g><g><rect fill="white" stroke="none" x="233.0877202126484" y="133.458610961" width="120.30501045289063" height="21.23576429"/><text fill="black" stroke="none" font-family="sans-serif" font-size="11pt" font-style="normal" font-weight="normal" text-decoration="normal" x="235.5380007076484" y="148.16029393099998" text-anchor="start" dominant-baseline="alphabetic" xml:space="preserve">ATT_READ_REQ</text></g><g><path fill="none" stroke="black" paint-order="fill stroke markers" d=" M 206.40258984400907 154.694375251 L 366.6285436505117 154.694375251" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray=""/><g transform="translate(380.07786103417834,154.694375251) translate(-380.07786103417834,-154.694375251)"><path fill="black" stroke="none" paint-order="stroke fill markers" d=" M 366.46519161751166 147.88804054266666 L 380.07786103417834 154.694375251 L 366.46519161751166 161.50070995933334 Z"/></g></g><path fill="white" stroke="black" paint-order="fill stroke markers" d=" M 190.06738654400908 155.511135416 L 181.8997848940091 155.511135416 M 61.18630110322784 136.725651621 L 167.19810192400908 136.725651621 L 181.8997848940091 155.511135416 L 167.19810192400908 174.296619211 L 61.18630110322784 174.296619211 L 61.18630110322784 136.725651621" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray=""/><g><text fill="black" stroke="none" font-family="sans-serif" font-size="11pt" font-style="normal" font-weight="normal" text-decoration="normal" x="84.05558572322784" y="159.59493624099997" text-anchor="start" dominant-baseline="alphabetic" xml:space="preserve">0 seconds  </text></g><g><rect fill="white" stroke="none" x="237.98398289067578" y="177.56365987100003" width="118.68008674683594" height="21.23576429"/><text fill="black" stroke="none" font-family="sans-serif" font-size="11pt" font-style="normal" font-weight="normal" text-decoration="normal" x="240.43426338567576" y="192.265342841" text-anchor="start" dominant-baseline="alphabetic" xml:space="preserve">ATT_READ_RSP</text></g><g><path fill="none" stroke="black" paint-order="fill stroke markers" d=" M 380.07786103417834 198.79942416100002 L 222.73779314400906 198.79942416100002" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray=""/><path fill="none" stroke="black" paint-order="fill stroke markers" d=" M 214.57019149400907 190.63182251100002 L 230.90539479400906 206.967025811 M 214.57019149400907 206.967025811 L 230.90539479400906 190.63182251100002" stroke-miterlimit="10" stroke-width="1.3612669416666667"/></g><path fill="white" stroke="black" paint-order="fill stroke markers" d=" M 190.06738654400908 242.08771290599998 L 181.8997848940091 242.08771290599998 M 53.0331181198294 223.30222911099997 L 167.19810192400908 223.30222911099997 L 181.8997848940091 242.08771290599998 L 167.19810192400908 260.873196701 L 53.0331181198294 260.873196701 L 53.0331181198294 223.30222911099997" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray=""/><g><text fill="black" stroke="none" font-family="sans-serif" font-size="11pt" font-style="normal" font-weight="normal" text-decoration="normal" x="75.9024027398294" y="246.17151373099995" text-anchor="start" dominant-baseline="alphabetic" xml:space="preserve">30 seconds  </text></g><g><rect fill="white" stroke="none" x="225.73258041567576" y="221.66870878100002" width="135.308519974375" height="21.23576429"/><text fill="black" stroke="none" font-family="sans-serif" font-size="11pt" font-style="normal" font-weight="normal" text-decoration="normal" x="228.18286091067574" y="236.370391751" text-anchor="start" dominant-baseline="alphabetic" xml:space="preserve">bt_conn_disconnect</text></g><g><path fill="none" stroke="black" paint-order="fill stroke markers" d=" M 206.40258984400907 242.904473071 L 271.7434030440091 242.904473071 L 271.7434030440091 264.140237361 L 219.85190722767572 264.140237361" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray=""/><g transform="translate(206.40258984400907,264.140237361) translate(-206.40258984400907,-264.140237361)"><path fill="black" stroke="none" paint-order="stroke fill markers" d=" M 220.01525926067575 257.33390265266667 L 206.40258984400907 264.140237361 L 220.01525926067575 270.94657206933334 Z"/></g></g></g><g/><g/><g/></g></svg>
\ No newline at end of file
diff --git a/doc/releases/release-notes-4.0.rst b/doc/releases/release-notes-4.0.rst
index 85c2523ab00..976b9b156fb 100644
--- a/doc/releases/release-notes-4.0.rst
+++ b/doc/releases/release-notes-4.0.rst
@@ -96,6 +96,8 @@ Bluetooth
   * Added API :c:func:`bt_gatt_get_uatt_mtu` to get current Unenhanced ATT MTU of a given
     connection (experimental).
 
+  * The host now disconnects from the peer upon ATT timeout.
+
 * HCI Drivers
 
 Boards & SoC Support
diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c
index 7af47a6a3b8..f5bca16d8d2 100644
--- a/subsys/bluetooth/host/att.c
+++ b/subsys/bluetooth/host/att.c
@@ -3150,9 +3150,10 @@ static void att_timeout(struct k_work *work)
 	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
 	struct bt_att_chan *chan = CONTAINER_OF(dwork, struct bt_att_chan,
 						timeout_work);
+	int err;
 
 	bt_addr_le_to_str(bt_conn_get_dst(chan->att->conn), addr, sizeof(addr));
-	LOG_ERR("ATT Timeout for device %s", addr);
+	LOG_ERR("ATT Timeout for device %s. Disconnecting...", addr);
 
 	/* BLUETOOTH SPECIFICATION Version 4.2 [Vol 3, Part F] page 480:
 	 *
@@ -3163,6 +3164,16 @@ static void att_timeout(struct k_work *work)
 	 * target device on this ATT Bearer.
 	 */
 	bt_att_disconnected(&chan->chan.chan);
+
+	/* The timeout state is local and can block new ATT operations, but does not affect the
+	 * remote side. Disconnecting the GATT connection upon ATT timeout simplifies error handling
+	 * for developers. This reduces rare failure conditions to a common one, allowing developers
+	 * to handle unexpected disconnections without needing special cases for ATT timeouts.
+	 */
+	err = bt_conn_disconnect(chan->chan.chan.conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
+	if (err) {
+		LOG_ERR("Disconnecting failed (err %d)", err);
+	}
 }
 
 static struct bt_att_chan *att_get_fixed_chan(struct bt_conn *conn)

From 0fcbba50a66e7736f2f143a02d6c392592cfb682 Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Tue, 8 Oct 2024 07:48:19 +0200
Subject: [PATCH 0540/2913] [nrf fromtree] tests: bsim: bluetooth: host: att:
 Add ATT timeout test

This commit tests that the host correctly disconnects from peer when ATT
timeout happens.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit f7e8a8717b1e64b7a295d4c0563e22563d29be0e)
(cherry picked from commit be772e1e3ad052ca515ba1f4d17f4ed3e5271195)
---
 subsys/bluetooth/host/att_internal.h          |   3 +-
 tests/bsim/bluetooth/host/att/compile.sh      |   1 +
 .../bluetooth/host/att/timeout/CMakeLists.txt |  24 ++
 .../bluetooth/host/att/timeout/compile.sh     |  14 +
 tests/bsim/bluetooth/host/att/timeout/main.c  | 292 ++++++++++++++++++
 .../bsim/bluetooth/host/att/timeout/prj.conf  |  25 ++
 .../host/att/timeout/test_scripts/run.sh      |  22 ++
 7 files changed, 380 insertions(+), 1 deletion(-)
 create mode 100644 tests/bsim/bluetooth/host/att/timeout/CMakeLists.txt
 create mode 100755 tests/bsim/bluetooth/host/att/timeout/compile.sh
 create mode 100644 tests/bsim/bluetooth/host/att/timeout/main.c
 create mode 100644 tests/bsim/bluetooth/host/att/timeout/prj.conf
 create mode 100755 tests/bsim/bluetooth/host/att/timeout/test_scripts/run.sh

diff --git a/subsys/bluetooth/host/att_internal.h b/subsys/bluetooth/host/att_internal.h
index 7898dcedb74..6eec4c5496e 100644
--- a/subsys/bluetooth/host/att_internal.h
+++ b/subsys/bluetooth/host/att_internal.h
@@ -10,7 +10,8 @@
 
 #define BT_EATT_PSM		0x27
 #define BT_ATT_DEFAULT_LE_MTU	23
-#define BT_ATT_TIMEOUT		K_SECONDS(30)
+#define BT_ATT_TIMEOUT_SEC	30
+#define BT_ATT_TIMEOUT		K_SECONDS(BT_ATT_TIMEOUT_SEC)
 
 /* Local ATT Rx MTU
  *
diff --git a/tests/bsim/bluetooth/host/att/compile.sh b/tests/bsim/bluetooth/host/att/compile.sh
index 46fddfa1419..e6e25cf9c29 100755
--- a/tests/bsim/bluetooth/host/att/compile.sh
+++ b/tests/bsim/bluetooth/host/att/compile.sh
@@ -22,5 +22,6 @@ run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/att/sequential/compil
 run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/att/pipeline/compile.sh
 run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/att/long_read/compile.sh
 run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/att/open_close/compile.sh
+run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/att/timeout/compile.sh
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/att/timeout/CMakeLists.txt b/tests/bsim/bluetooth/host/att/timeout/CMakeLists.txt
new file mode 100644
index 00000000000..66b7d8796c3
--- /dev/null
+++ b/tests/bsim/bluetooth/host/att/timeout/CMakeLists.txt
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
+project(app)
+
+add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/common/testlib testlib)
+
+target_sources(app PRIVATE
+  ../long_read/bs_main.c
+  ../long_read/bs_sync.c
+  main.c
+)
+
+zephyr_include_directories(
+  ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
+  ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
+  ../long_read/
+)
+
+target_link_libraries(app PRIVATE
+  testlib
+)
diff --git a/tests/bsim/bluetooth/host/att/timeout/compile.sh b/tests/bsim/bluetooth/host/att/timeout/compile.sh
new file mode 100755
index 00000000000..b7b1eea135e
--- /dev/null
+++ b/tests/bsim/bluetooth/host/att/timeout/compile.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# Copyright 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+set -eu
+: "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}"
+
+INCR_BUILD=1
+
+source ${ZEPHYR_BASE}/tests/bsim/compile.source
+
+app="$(guess_test_relpath)" compile
+
+wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/att/timeout/main.c b/tests/bsim/bluetooth/host/att/timeout/main.c
new file mode 100644
index 00000000000..322dd20d9ba
--- /dev/null
+++ b/tests/bsim/bluetooth/host/att/timeout/main.c
@@ -0,0 +1,292 @@
+/* Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <argparse.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/settings/settings.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/bluetooth/bluetooth.h>
+
+#include "host/att_internal.h"
+
+#include "testlib/adv.h"
+#include "testlib/att_read.h"
+#include "testlib/att_write.h"
+#include "bs_macro.h"
+#include "bs_sync.h"
+#include <testlib/conn.h>
+#include "testlib/log_utils.h"
+#include "testlib/scan.h"
+#include "testlib/security.h"
+
+/* This test uses system asserts to fail tests. */
+BUILD_ASSERT(__ASSERT_ON);
+
+LOG_MODULE_REGISTER(main, LOG_LEVEL_DBG);
+
+#define CENTRAL_DEVICE_NBR    0
+#define PERIPHERAL_DEVICE_NBR 1
+
+#define UUID_1                                                                                     \
+	BT_UUID_DECLARE_128(0xdb, 0x1f, 0xe2, 0x52, 0xf3, 0xc6, 0x43, 0x66, 0xb3, 0x92, 0x5d,      \
+			    0xc6, 0xe7, 0xc9, 0x59, 0x9d)
+
+#define UUID_2                                                                                     \
+	BT_UUID_DECLARE_128(0x3f, 0xa4, 0x7f, 0x44, 0x2e, 0x2a, 0x43, 0x05, 0xab, 0x38, 0x07,      \
+			    0x8d, 0x16, 0xbf, 0x99, 0xf1)
+
+static bool trigger_att_timeout;
+static K_SEM_DEFINE(disconnected_sem, 0, 1);
+
+static ssize_t read_chrc(struct bt_conn *conn, const struct bt_gatt_attr *attr, void *buf,
+			 uint16_t buf_len, uint16_t offset)
+{
+	ssize_t read_len;
+
+	LOG_INF("ATT timeout will %sbe triggered", trigger_att_timeout ? "" : "not ");
+
+	if (trigger_att_timeout) {
+		/* Sleep longer than ATT Timeout (section 3.3.3). */
+		k_sleep(K_SECONDS(BT_ATT_TIMEOUT_SEC + 1));
+	}
+
+	__ASSERT_NO_MSG(offset == 0);
+	read_len = buf_len;
+
+	__ASSERT_NO_MSG(read_len >= 2);
+	sys_put_le16(read_len, buf);
+
+	return read_len;
+}
+
+static struct bt_gatt_attr attrs[] = {
+	BT_GATT_PRIMARY_SERVICE(UUID_1),
+	BT_GATT_CHARACTERISTIC(UUID_2, BT_GATT_CHRC_READ, BT_GATT_PERM_READ, read_chrc, NULL, NULL),
+};
+
+static struct bt_gatt_service svc = {
+	.attrs = attrs,
+	.attr_count = ARRAY_SIZE(attrs),
+};
+
+static void bs_sync_all_log(char *log_msg)
+{
+	/* Everyone meets here. */
+	bt_testlib_bs_sync_all();
+
+	if (get_device_nbr() == 0) {
+		LOG_WRN("Sync point: %s", log_msg);
+	}
+
+	/* Everyone waits for d0 to finish logging. */
+	bt_testlib_bs_sync_all();
+}
+
+static inline void bt_enable_quiet(void)
+{
+	bt_testlib_log_level_set("bt_hci_core", LOG_LEVEL_ERR);
+	bt_testlib_log_level_set("bt_id", LOG_LEVEL_ERR);
+
+	EXPECT_ZERO(bt_enable(NULL));
+
+	bt_testlib_log_level_set("bt_hci_core", LOG_LEVEL_INF);
+	bt_testlib_log_level_set("bt_id", LOG_LEVEL_INF);
+}
+
+static struct bt_conn *peripheral_setup(enum bt_att_chan_opt bearer, bool timeout)
+{
+	struct bt_conn *conn = NULL;
+
+	EXPECT_ZERO(bt_testlib_adv_conn(&conn, BT_ID_DEFAULT, bt_get_name()));
+
+	trigger_att_timeout = timeout;
+
+	return conn;
+}
+
+static struct bt_conn *central_setup(enum bt_att_chan_opt bearer, bool timeout)
+{
+	bt_addr_le_t adva;
+	struct bt_conn *conn = NULL;
+
+	EXPECT_ZERO(bt_testlib_scan_find_name(&adva, "peripheral"));
+	EXPECT_ZERO(bt_testlib_connect(&adva, &conn));
+
+	/* Establish EATT bearers. */
+	EXPECT_ZERO(bt_testlib_secure(conn, BT_SECURITY_L2));
+
+	while (bt_eatt_count(conn) == 0) {
+		k_msleep(100);
+	};
+
+	return conn;
+}
+
+static void central_read(struct bt_conn *conn, enum bt_att_chan_opt bearer, bool timeout)
+{
+	uint16_t actual_read_len;
+	uint16_t remote_read_send_len;
+	uint16_t handle = 0;
+	int err;
+
+	NET_BUF_SIMPLE_DEFINE(attr_value, sizeof(remote_read_send_len));
+
+	err = bt_testlib_att_read_by_type_sync(&attr_value, &actual_read_len, &handle, NULL, conn,
+					       bearer, UUID_2, BT_ATT_FIRST_ATTRIBUTE_HANDLE,
+					       BT_ATT_LAST_ATTRIBUTE_HANDLE);
+
+	if (timeout) {
+		__ASSERT(err == BT_ATT_ERR_UNLIKELY, "Unexpected error %d", err);
+	} else {
+		__ASSERT(!err, "Unexpected error %d", err);
+		__ASSERT(attr_value.len >= sizeof(remote_read_send_len),
+			 "Remote sent too little data.");
+		remote_read_send_len = net_buf_simple_pull_le16(&attr_value);
+		__ASSERT(remote_read_send_len == actual_read_len, "Length mismatch. %u %u",
+			 remote_read_send_len, actual_read_len);
+	}
+}
+
+/**
+ * Test procedure:
+ *
+ * Central:
+ * 1. Connect to the peripheral.
+ * 2. Try to read a characteristic value.
+ * 3. Expect BT_ATT_ERR_UNLIKELY error.
+ * 4. Expect the peripheral to disconnect.
+ * 5. Reconnect to the peripheral.
+ * 6. Try to read a characteristic value.
+ * 7. Expect the peripheral to respond with the characteristic value.
+ * 8. Ensure that connection stays alive after a delay equal to ATT timeout.
+ * 9. Disconnect from the peripheral.
+ *
+ * Peripheral:
+ * 1. Start advertising.
+ * 2. Make the read callback sleep for more than ATT Timeout when the central tries to read.
+ * 3. Expect the disconnected callback to be called.
+ * 4. Start advertising again.
+ * 5. Make the read callback respond with the characteristic value when the central tries to read.
+ * 6. Expect the connection stay alive after a delay equal to ATT timeout.
+ * 7. Expect the central to disconnect.
+ */
+static void test_timeout(enum bt_att_chan_opt bearer)
+{
+	bool central = (get_device_nbr() == CENTRAL_DEVICE_NBR);
+	bool peripheral = (get_device_nbr() == PERIPHERAL_DEVICE_NBR);
+	struct bt_conn *conn;
+	int err;
+
+	/* Test ATT timeout. */
+	if (peripheral) {
+		conn = peripheral_setup(bearer, true);
+	}
+
+	if (central) {
+		conn = central_setup(bearer, true);
+	}
+
+	bs_sync_all_log("Ready to test ATT timeout");
+
+	if (central) {
+		central_read(conn, bearer, true);
+	}
+
+	err = k_sem_take(&disconnected_sem, K_SECONDS(BT_ATT_TIMEOUT_SEC + 2));
+	/* Here disconnect is triggered by the Central host due to ATT timeout. */
+	__ASSERT(!err, "Unexpected error %d", err);
+	bt_testlib_conn_unref(&conn);
+
+	/* Test successful read. */
+	if (peripheral) {
+		conn = peripheral_setup(bearer, false);
+	}
+
+	if (central) {
+		conn = central_setup(bearer, false);
+	}
+
+	bs_sync_all_log("Ready to test successful read");
+
+	if (central) {
+		central_read(conn, bearer, false);
+	}
+
+	err = k_sem_take(&disconnected_sem, K_SECONDS(BT_ATT_TIMEOUT_SEC + 2));
+	/* Check that disconnect doesn't happen during time > ATT timeout. */
+	__ASSERT(err == -EAGAIN, "Unexpected error %d", err);
+
+	if (central) {
+		/* This time disconnect from the peripheral. */
+		EXPECT_ZERO(bt_testlib_disconnect(&conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN));
+	}
+
+	if (peripheral) {
+		/* Wait for the central to disconnect. */
+		bt_testlib_wait_disconnected(conn);
+		bt_testlib_conn_unref(&conn);
+	}
+
+	/* Clear the semaphore. */
+	err = k_sem_take(&disconnected_sem, K_SECONDS(1));
+	__ASSERT_NO_MSG(!err);
+}
+
+static void connected(struct bt_conn *conn, uint8_t err)
+{
+	LOG_INF("Connected");
+}
+
+static void disconnected(struct bt_conn *conn, uint8_t reason)
+{
+	bool central = (get_device_nbr() == CENTRAL_DEVICE_NBR);
+	bool peripheral = (get_device_nbr() == PERIPHERAL_DEVICE_NBR);
+	uint8_t expected_reason;
+
+	LOG_INF("Disconnected: %u", reason);
+
+	if (central) {
+		expected_reason = BT_HCI_ERR_LOCALHOST_TERM_CONN;
+	}
+
+	if (peripheral) {
+		expected_reason = BT_HCI_ERR_REMOTE_USER_TERM_CONN;
+	}
+
+	__ASSERT(expected_reason == reason, "Unexpected reason %u", reason);
+
+	k_sem_give(&disconnected_sem);
+}
+
+BT_CONN_CB_DEFINE(conn_callbacks) = {
+	.connected = connected,
+	.disconnected = disconnected,
+};
+
+void the_test(void)
+{
+	bool peripheral = (get_device_nbr() == PERIPHERAL_DEVICE_NBR);
+
+	if (peripheral) {
+		EXPECT_ZERO(bt_gatt_service_register(&svc));
+	}
+
+	bt_enable_quiet();
+
+	if (peripheral) {
+		EXPECT_ZERO(bt_set_name("peripheral"));
+	}
+
+	bs_sync_all_log("Testing UATT");
+	test_timeout(BT_ATT_CHAN_OPT_UNENHANCED_ONLY);
+
+	bs_sync_all_log("Testing EATT");
+	test_timeout(BT_ATT_CHAN_OPT_ENHANCED_ONLY);
+
+	bs_sync_all_log("Test Complete");
+
+	PASS("Test complete\n");
+}
diff --git a/tests/bsim/bluetooth/host/att/timeout/prj.conf b/tests/bsim/bluetooth/host/att/timeout/prj.conf
new file mode 100644
index 00000000000..ddcef1bc3fe
--- /dev/null
+++ b/tests/bsim/bluetooth/host/att/timeout/prj.conf
@@ -0,0 +1,25 @@
+CONFIG_ASSERT=y
+CONFIG_BOOT_BANNER=n
+CONFIG_BT_BUF_ACL_RX_SIZE=204
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_DEVICE_NAME_DYNAMIC=y
+CONFIG_BT_EATT=y
+CONFIG_BT_EXT_ADV=y
+CONFIG_BT_GATT_CLIENT=y
+CONFIG_BT_GATT_DYNAMIC_DB=y
+CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
+CONFIG_BT_L2CAP_ECRED=y
+CONFIG_BT_L2CAP_TX_MTU=200
+CONFIG_BT_MAX_CONN=3
+CONFIG_BT_MAX_PAIRED=2
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_PRIVACY=n
+CONFIG_BT_SMP=y
+CONFIG_BT_TESTING=y
+CONFIG_BT=y
+CONFIG_FLASH_MAP=y
+CONFIG_FLASH=y
+CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP=n
+CONFIG_LOG_RUNTIME_FILTERING=y
+CONFIG_LOG_TAG_MAX_LEN=20
+CONFIG_LOG=y
diff --git a/tests/bsim/bluetooth/host/att/timeout/test_scripts/run.sh b/tests/bsim/bluetooth/host/att/timeout/test_scripts/run.sh
new file mode 100755
index 00000000000..bda0787f074
--- /dev/null
+++ b/tests/bsim/bluetooth/host/att/timeout/test_scripts/run.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# Copyright 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+set -eu -x
+
+source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
+
+simulation_id="timeout"
+dev_exe=bs_${BOARD_TS}_$(guess_test_long_name)_prj_conf
+args_all=(-s=${simulation_id} -D=2)
+args_dev=(-v=2 -RealEncryption=1 -testid=the_test)
+
+cd "${BSIM_OUT_PATH}/bin"
+
+Execute ./${dev_exe} "${args_all[@]}" "${args_dev[@]}" -d=0
+
+Execute ./${dev_exe} "${args_all[@]}" "${args_dev[@]}" -d=1
+
+Execute ./bs_2G4_phy_v1 "${args_all[@]}" -sim_length=200e6
+
+wait_for_background_jobs

From f2cd7e9b74cc09e86edecd380a02fa34311ce7b6 Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Mon, 21 Oct 2024 13:18:25 +0200
Subject: [PATCH 0541/2913] Revert "[nrf noup] bluetooth: conn: Skip buffer ref
 count check in send_buf"

This reverts commit 687cefae54d14d19010ec95b6a6a89eedb6da5b0.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit db82e54248dee6571624d2b0f53cefbd96ee6a55)
---
 subsys/bluetooth/host/conn.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 21ed9de4a35..bd3933d5b56 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -695,17 +695,13 @@ static int send_buf(struct bt_conn *conn, struct net_buf *buf,
 
 	uint16_t frag_len = MIN(conn_mtu(conn), len);
 
-	/* If ATT sent callback is delayed until data transmission is done by BLE controller, the
-	 * transmitted buffer may have an additional reference. The reference is used to extend
-	 * lifetime of the net buffer until the data transmission is confirmed by ACK of the remote.
-	 *
-	 * send_buf function can be called multiple times, if buffer has to be fragmented over HCI.
-	 * In that case, the callback is provided as an argument only for the last transmitted
-	 * fragment. The `buf->ref == 1` check is skipped because it's impossible to properly
-	 * validate number of references for the sent fragments if buffers may have the additional
-	 * reference.
-	 */
-	__ASSERT_NO_MSG(IS_ENABLED(CONFIG_BT_ATT_SENT_CB_AFTER_TX) || (buf->ref == 1));
+	if (buf->ref > 1 + (cb ? 1 : 0)) {
+		/* Allow for an additional buffer reference if callback is provided.
+		 * This can be used to extend lifetime of the net buffer until the
+		 * data transmission is confirmed by ACK of the remote.
+		 */
+		__ASSERT_NO_MSG(false);
+	}
 
 	if (buf->len > frag_len) {
 		LOG_DBG("keep %p around", buf);

From afb3ad5372a619a38a59f33b5560050acfee04a0 Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Mon, 21 Oct 2024 13:18:36 +0200
Subject: [PATCH 0542/2913] Revert "[nrf noup] bluetooth: conn: Allow for an
 extra ref in bt_l2cap_send_pdu"

This reverts commit b0ce7fe23a0c83ce3038baf2b8899e0e6b1497fc.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit 3b53c65eea41350fa8e9e805abd4d36d99a35463)
---
 subsys/bluetooth/host/conn.c  | 8 +-------
 subsys/bluetooth/host/l2cap.c | 8 ++------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index bd3933d5b56..bc3e43b73c2 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -695,13 +695,7 @@ static int send_buf(struct bt_conn *conn, struct net_buf *buf,
 
 	uint16_t frag_len = MIN(conn_mtu(conn), len);
 
-	if (buf->ref > 1 + (cb ? 1 : 0)) {
-		/* Allow for an additional buffer reference if callback is provided.
-		 * This can be used to extend lifetime of the net buffer until the
-		 * data transmission is confirmed by ACK of the remote.
-		 */
-		__ASSERT_NO_MSG(false);
-	}
+	__ASSERT_NO_MSG(buf->ref == 1);
 
 	if (buf->len > frag_len) {
 		LOG_DBG("keep %p around", buf);
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index 648e18183c4..b6ca2f3ea00 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -717,17 +717,13 @@ static void cancel_data_ready(struct bt_l2cap_le_chan *le_chan)
 int bt_l2cap_send_pdu(struct bt_l2cap_le_chan *le_chan, struct net_buf *pdu,
 		      bt_conn_tx_cb_t cb, void *user_data)
 {
-	/* Allow for an additional buffer reference if callback is provided. This can be used to
-	 * extend lifetime of the net buffer until the data transmission is confirmed by ACK of the
-	 * remote.
-	 */
-	if (pdu->ref > 1 + (cb ? 1 : 0)) {
+	if (pdu->ref != 1) {
 		/* The host may alter the buf contents when fragmenting. Higher
 		 * layers cannot expect the buf contents to stay intact. Extra
 		 * refs suggests a silent data corruption would occur if not for
 		 * this error.
 		 */
-		LOG_ERR("Expecting up to %d refs, got %d", cb ? 2 : 1, pdu->ref);
+		LOG_ERR("Expecting 1 ref, got %d", pdu->ref);
 		return -EINVAL;
 	}
 

From a1572f85f46db912d27f7010a6cea42076abbf02 Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Mon, 7 Oct 2024 14:19:05 +0200
Subject: [PATCH 0543/2913] [nrf fromtree] bluetooth: host: l2cap: Check conn
 state before queueing PDU

In case of UATT, if a connection was lost while user was holding a read
or write attribute callback, `bt_l2cap_send_pdu` (called from
`att.c::chan_send`) will anyway queue a PDU and trigger tx work. The PDU
won't be sent eventually, but neither will hold an error code, which
will allow it to bypass the error check in `att_on_sent_cb` and call
`att_sent` function.

For EATT `bt_l2cap_chan_send` is used which already handles this case
and the error code is passed to `att_on_sent_cb`.

This change adds connection state check to `bt_l2cap_send_pdu`
preventing from unnecessary code execution when connection does not
exist anymore.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit 74972e694b4916fa2b2d3d457155c1e3f3e24e79)
(cherry picked from commit 9efb149ec81e4788fd7ab0de0736eed4965ef867)
---
 subsys/bluetooth/host/l2cap.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index b6ca2f3ea00..3b5cfe82864 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -717,6 +717,10 @@ static void cancel_data_ready(struct bt_l2cap_le_chan *le_chan)
 int bt_l2cap_send_pdu(struct bt_l2cap_le_chan *le_chan, struct net_buf *pdu,
 		      bt_conn_tx_cb_t cb, void *user_data)
 {
+	if (!le_chan->chan.conn || le_chan->chan.conn->state != BT_CONN_CONNECTED) {
+		return -ENOTCONN;
+	}
+
 	if (pdu->ref != 1) {
 		/* The host may alter the buf contents when fragmenting. Higher
 		 * layers cannot expect the buf contents to stay intact. Extra

From db5300cf406ff1124e4047a6a3b2e0f1be0d94f8 Mon Sep 17 00:00:00 2001
From: Marek Pieta <Marek.Pieta@nordicsemi.no>
Date: Fri, 14 Jun 2024 12:08:55 +0200
Subject: [PATCH 0544/2913] [nrf noup] bluetooth: conn: Allow for an extra ref
 in bt_l2cap_send_pdu

Allow for an additional buffer reference if callback is provided. This
can be used to extend lifetime of the net buffer until the data
transmission is confirmed by ACK of the remote.

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
(cherry picked from commit ae06abb7d064dedc3cd6780f211404d9103965cc)
---
 subsys/bluetooth/host/conn.c  | 8 +++++++-
 subsys/bluetooth/host/l2cap.c | 8 ++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index bc3e43b73c2..bd3933d5b56 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -695,7 +695,13 @@ static int send_buf(struct bt_conn *conn, struct net_buf *buf,
 
 	uint16_t frag_len = MIN(conn_mtu(conn), len);
 
-	__ASSERT_NO_MSG(buf->ref == 1);
+	if (buf->ref > 1 + (cb ? 1 : 0)) {
+		/* Allow for an additional buffer reference if callback is provided.
+		 * This can be used to extend lifetime of the net buffer until the
+		 * data transmission is confirmed by ACK of the remote.
+		 */
+		__ASSERT_NO_MSG(false);
+	}
 
 	if (buf->len > frag_len) {
 		LOG_DBG("keep %p around", buf);
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index 3b5cfe82864..1e3850fd591 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -721,13 +721,17 @@ int bt_l2cap_send_pdu(struct bt_l2cap_le_chan *le_chan, struct net_buf *pdu,
 		return -ENOTCONN;
 	}
 
-	if (pdu->ref != 1) {
+	/* Allow for an additional buffer reference if callback is provided. This can be used to
+	 * extend lifetime of the net buffer until the data transmission is confirmed by ACK of the
+	 * remote.
+	 */
+	if (pdu->ref > 1 + (cb ? 1 : 0)) {
 		/* The host may alter the buf contents when fragmenting. Higher
 		 * layers cannot expect the buf contents to stay intact. Extra
 		 * refs suggests a silent data corruption would occur if not for
 		 * this error.
 		 */
-		LOG_ERR("Expecting 1 ref, got %d", pdu->ref);
+		LOG_ERR("Expecting up to %d refs, got %d", cb ? 2 : 1, pdu->ref);
 		return -EINVAL;
 	}
 

From 2f78c568f7016f5f9497a2420e55973a46d46018 Mon Sep 17 00:00:00 2001
From: Marek Pieta <Marek.Pieta@nordicsemi.no>
Date: Wed, 7 Aug 2024 10:29:21 +0200
Subject: [PATCH 0545/2913] [nrf noup] bluetooth: conn: Skip buffer ref count
 check in send_buf

If ATT sent callback is delayed until data transmission is done by BLE
controller, the transmitted buffer may have an additional reference. The
reference is used to extend lifetime of the net buffer until the data
transmission is confirmed by ACK of the remote.

send_buf function can be called multiple times, if buffer has to be
fragmented over HCI. In that case, the callback is provided as an
argument only for the last transmitted fragment. The `buf->ref == 1`
check is skipped because it's impossible to properly validate number of
references for the sent fragments if buffers may have the additional
reference.

Jira: NCSDK-28624

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
(cherry picked from commit 7718e6ecaf7c664b13c9a90e4f63cb296f09fad4)
---
 subsys/bluetooth/host/conn.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index bd3933d5b56..21ed9de4a35 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -695,13 +695,17 @@ static int send_buf(struct bt_conn *conn, struct net_buf *buf,
 
 	uint16_t frag_len = MIN(conn_mtu(conn), len);
 
-	if (buf->ref > 1 + (cb ? 1 : 0)) {
-		/* Allow for an additional buffer reference if callback is provided.
-		 * This can be used to extend lifetime of the net buffer until the
-		 * data transmission is confirmed by ACK of the remote.
-		 */
-		__ASSERT_NO_MSG(false);
-	}
+	/* If ATT sent callback is delayed until data transmission is done by BLE controller, the
+	 * transmitted buffer may have an additional reference. The reference is used to extend
+	 * lifetime of the net buffer until the data transmission is confirmed by ACK of the remote.
+	 *
+	 * send_buf function can be called multiple times, if buffer has to be fragmented over HCI.
+	 * In that case, the callback is provided as an argument only for the last transmitted
+	 * fragment. The `buf->ref == 1` check is skipped because it's impossible to properly
+	 * validate number of references for the sent fragments if buffers may have the additional
+	 * reference.
+	 */
+	__ASSERT_NO_MSG(IS_ENABLED(CONFIG_BT_ATT_SENT_CB_AFTER_TX) || (buf->ref == 1));
 
 	if (buf->len > frag_len) {
 		LOG_DBG("keep %p around", buf);

From e7ce11094bd0d55140b4394178d1c7ccd9e512ab Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Wed, 9 Oct 2024 14:50:43 +0200
Subject: [PATCH 0546/2913] [nrf fromtree] bluetooth: host: conn: Check if
 *conn is not NULL

This commit adds a warning and a Kconfig option to `bt_conn_le_create`
and `bt_conn_le_create_synced` functions which are meant to warn a user
of a potential leakage of an active connection object.

This change is implemented due to frequent incorrect use of the
connection pointer where a pointer to an existing connection object
is overwritten by `bt_conn_le_create` and `bt_conn_le_create_synced`
functions which in turns leads to sporadic critical bugs. See
https://github.com/zephyrproject-rtos/zephyr/pull/78284#discussion_r1754304535
for more details.

The Kconfig option is introduced instead of always returning the error
to not affect current implementations. However, it is recommended to
keep this option enabled to avoid potential bugs.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit 8acb1cc57786cd9aafd7772d1e50bf925d27bc01)
(cherry picked from commit fd0492a73780568aad695572bf62fd65e244a92b)
---
 .../bluetooth/api/connection_mgmt.rst         |  8 +++++
 doc/releases/release-notes-4.0.rst            |  7 ++++
 include/zephyr/bluetooth/conn.h               |  8 +++--
 subsys/bluetooth/host/Kconfig                 | 11 ++++++
 subsys/bluetooth/host/conn.c                  | 34 +++++++++++++++++++
 5 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/doc/connectivity/bluetooth/api/connection_mgmt.rst b/doc/connectivity/bluetooth/api/connection_mgmt.rst
index 3a3d8d02a82..1b7ea2788c3 100644
--- a/doc/connectivity/bluetooth/api/connection_mgmt.rst
+++ b/doc/connectivity/bluetooth/api/connection_mgmt.rst
@@ -15,6 +15,14 @@ longer period of time, since this ensures that the object remains valid
 :c:func:`bt_conn_unref` API is to be used when releasing a reference
 to a connection.
 
+A common mistake is to forget unreleasing a reference to a connection
+object created by functions :c:func:`bt_conn_le_create` and
+:c:func:`bt_conn_le_create_synced`. To protect against this, use the
+:kconfig:option:`CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE` Kconfig option,
+which forces these functions return an error if the connection pointer
+passed to them is not NULL. This helps to spot such issues and avoid
+sporadic bugs caused by not releasing the connection object.
+
 An application may track connections by registering a
 :c:struct:`bt_conn_cb` struct using the :c:func:`bt_conn_cb_register`
 or :c:macro:`BT_CONN_CB_DEFINE` APIs. This struct lets the application
diff --git a/doc/releases/release-notes-4.0.rst b/doc/releases/release-notes-4.0.rst
index 976b9b156fb..76eaa3ac62f 100644
--- a/doc/releases/release-notes-4.0.rst
+++ b/doc/releases/release-notes-4.0.rst
@@ -98,6 +98,13 @@ Bluetooth
 
   * The host now disconnects from the peer upon ATT timeout.
 
+  * Added a warning to :c:func:`bt_conn_le_create` and :c:func:`bt_conn_le_create_synced` if
+    the connection pointer passed as an argument is not NULL.
+
+  * Added Kconfig option :kconfig:option:`CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE` to enforce
+    :c:func:`bt_conn_le_create` and :c:func:`bt_conn_le_create_synced` return an error if the
+    connection pointer passed as an argument is not NULL.
+
 * HCI Drivers
 
 Boards & SoC Support
diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index 4d2da8d7a58..b4cf1c5c6ba 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -1336,7 +1336,9 @@ struct bt_conn_le_create_param {
  *  Allows initiate new LE link to remote peer using its address.
  *
  *  The caller gets a new reference to the connection object which must be
- *  released with bt_conn_unref() once done using the object.
+ *  released with bt_conn_unref() once done using the object. If
+ *  @kconfig{CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE} is enabled, this function
+ *  will return -EINVAL if dereferenced @p conn is not NULL.
  *
  *  This uses the General Connection Establishment procedure.
  *
@@ -1375,7 +1377,9 @@ struct bt_conn_le_create_synced_param {
  *  with Responses (PAwR) train.
  *
  *  The caller gets a new reference to the connection object which must be
- *  released with bt_conn_unref() once done using the object.
+ *  released with bt_conn_unref() once done using the object. If
+ *  @kconfig{CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE} is enabled, this function
+ *  will return -EINVAL if dereferenced @p conn is not NULL.
  *
  *  This uses the Periodic Advertising Connection Procedure.
  *
diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index 3124b35b3df..bf3dd13cce9 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -343,6 +343,17 @@ config BT_CONN_PARAM_ANY
 	  min and max connection intervals in order to verify whether the
 	  desired parameters have been established in the connection.
 
+config BT_CONN_CHECK_NULL_BEFORE_CREATE
+	bool "Check if *conn is NULL when creating a connection"
+	help
+	  Enable this option to ensure that bt_conn_le_create and
+	  bt_conn_le_create_synced return an error if *conn is not initialized
+	  to NULL. This option is recommended to use to catch programming
+	  errors where the application reuses the connection pointer of an
+	  active connection object without dereferencing it. Without
+	  dereferencing, the connection object stays alive which can lead to an
+	  unpredictable behavior.
+
 config BT_USER_PHY_UPDATE
 	bool "User control of PHY Update Procedure"
 	depends on BT_PHY_UPDATE
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 21ed9de4a35..9797337000a 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -3729,6 +3729,23 @@ int bt_conn_le_create(const bt_addr_le_t *peer, const struct bt_conn_le_create_p
 	struct bt_conn *conn;
 	int err;
 
+	CHECKIF(ret_conn == NULL) {
+		return -EINVAL;
+	}
+
+	CHECKIF(*ret_conn != NULL) {
+		/* This rule helps application developers prevent leaks of connection references. If
+		 * a bt_conn variable is not null, it presumably holds a reference and must not be
+		 * overwritten. To avoid this warning, initialize the variables to null, and set
+		 * them to null when moving the reference.
+		 */
+		LOG_WRN("*conn should be unreferenced and initialized to NULL");
+
+		if (IS_ENABLED(CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE)) {
+			return -EINVAL;
+		}
+	}
+
 	err = conn_le_create_common_checks(peer, conn_param);
 	if (err) {
 		return err;
@@ -3788,6 +3805,23 @@ int bt_conn_le_create_synced(const struct bt_le_ext_adv *adv,
 	struct bt_conn *conn;
 	int err;
 
+	CHECKIF(ret_conn == NULL) {
+		return -EINVAL;
+	}
+
+	CHECKIF(*ret_conn != NULL) {
+		/* This rule helps application developers prevent leaks of connection references. If
+		 * a bt_conn variable is not null, it presumably holds a reference and must not be
+		 * overwritten. To avoid this warning, initialize the variables to null, and set
+		 * them to null when moving the reference.
+		 */
+		LOG_WRN("*conn should be unreferenced and initialized to NULL");
+
+		if (IS_ENABLED(CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE)) {
+			return -EINVAL;
+		}
+	}
+
 	err = conn_le_create_common_checks(synced_param->peer, conn_param);
 	if (err) {
 		return err;

From 5b99bd62f67d132c8efa86a22769a0d8b71898ea Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Wed, 16 Oct 2024 14:03:59 +0200
Subject: [PATCH 0547/2913] [nrf fromtree] tests: bluetooth: host: conn: Add
 bt_conn_le_create unit test

Add a test that checks behavior of
CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE Kconfig option.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit 1fbcc0e6f9b64151274f395416d1a89a2e4c56e1)
(cherry picked from commit 765c23db7d168ba24938ba8d56c9b84f55d96e1a)
---
 tests/bluetooth/host/conn/CMakeLists.txt      |  27 ++++
 .../bluetooth/host/conn/mocks/CMakeLists.txt  |  34 +++++
 .../bluetooth/host/conn/mocks/addr_internal.c |  12 ++
 .../bluetooth/host/conn/mocks/addr_internal.h |  17 +++
 .../bluetooth/host/conn/mocks/att_internal.c  |  11 ++
 .../bluetooth/host/conn/mocks/att_internal.h  |  13 ++
 tests/bluetooth/host/conn/mocks/bt_str.c      |  19 +++
 tests/bluetooth/host/conn/mocks/bt_str.h      |  10 ++
 tests/bluetooth/host/conn/mocks/buf_view.c    |  14 ++
 tests/bluetooth/host/conn/mocks/buf_view.h    |  18 +++
 tests/bluetooth/host/conn/mocks/hci_core.c    |  32 +++++
 tests/bluetooth/host/conn/mocks/hci_core.h    |  41 ++++++
 tests/bluetooth/host/conn/mocks/id.c          |  11 ++
 tests/bluetooth/host/conn/mocks/id.h          |  13 ++
 tests/bluetooth/host/conn/mocks/kernel.c      |  33 +++++
 tests/bluetooth/host/conn/mocks/kernel.h      |  54 +++++++
 .../host/conn/mocks/l2cap_internal.c          |  17 +++
 .../host/conn/mocks/l2cap_internal.h          |  26 ++++
 .../host/conn/mocks/mock-sections.ld          |  29 ++++
 tests/bluetooth/host/conn/mocks/scan.c        |  13 ++
 tests/bluetooth/host/conn/mocks/scan.h        |  20 +++
 tests/bluetooth/host/conn/mocks/smp.c         |  11 ++
 tests/bluetooth/host/conn/mocks/smp.h         |  13 ++
 tests/bluetooth/host/conn/mocks/spinlock.c    |  13 ++
 tests/bluetooth/host/conn/mocks/spinlock.h    |  18 +++
 tests/bluetooth/host/conn/mocks/sys_clock.c   |  12 ++
 tests/bluetooth/host/conn/mocks/sys_clock.h   |  16 +++
 .../zephyr/drivers/bluetooth/hci_driver.h     |  11 ++
 .../host/conn/mocks/zephyr/syscalls/device.h  |  10 ++
 tests/bluetooth/host/conn/prj.conf            |  21 +++
 tests/bluetooth/host/conn/src/main.c          | 134 ++++++++++++++++++
 tests/bluetooth/host/conn/testcase.yaml       |  11 ++
 32 files changed, 734 insertions(+)
 create mode 100644 tests/bluetooth/host/conn/CMakeLists.txt
 create mode 100644 tests/bluetooth/host/conn/mocks/CMakeLists.txt
 create mode 100644 tests/bluetooth/host/conn/mocks/addr_internal.c
 create mode 100644 tests/bluetooth/host/conn/mocks/addr_internal.h
 create mode 100644 tests/bluetooth/host/conn/mocks/att_internal.c
 create mode 100644 tests/bluetooth/host/conn/mocks/att_internal.h
 create mode 100644 tests/bluetooth/host/conn/mocks/bt_str.c
 create mode 100644 tests/bluetooth/host/conn/mocks/bt_str.h
 create mode 100644 tests/bluetooth/host/conn/mocks/buf_view.c
 create mode 100644 tests/bluetooth/host/conn/mocks/buf_view.h
 create mode 100644 tests/bluetooth/host/conn/mocks/hci_core.c
 create mode 100644 tests/bluetooth/host/conn/mocks/hci_core.h
 create mode 100644 tests/bluetooth/host/conn/mocks/id.c
 create mode 100644 tests/bluetooth/host/conn/mocks/id.h
 create mode 100644 tests/bluetooth/host/conn/mocks/kernel.c
 create mode 100644 tests/bluetooth/host/conn/mocks/kernel.h
 create mode 100644 tests/bluetooth/host/conn/mocks/l2cap_internal.c
 create mode 100644 tests/bluetooth/host/conn/mocks/l2cap_internal.h
 create mode 100644 tests/bluetooth/host/conn/mocks/mock-sections.ld
 create mode 100644 tests/bluetooth/host/conn/mocks/scan.c
 create mode 100644 tests/bluetooth/host/conn/mocks/scan.h
 create mode 100644 tests/bluetooth/host/conn/mocks/smp.c
 create mode 100644 tests/bluetooth/host/conn/mocks/smp.h
 create mode 100644 tests/bluetooth/host/conn/mocks/spinlock.c
 create mode 100644 tests/bluetooth/host/conn/mocks/spinlock.h
 create mode 100644 tests/bluetooth/host/conn/mocks/sys_clock.c
 create mode 100644 tests/bluetooth/host/conn/mocks/sys_clock.h
 create mode 100644 tests/bluetooth/host/conn/mocks/zephyr/include/zephyr/drivers/bluetooth/hci_driver.h
 create mode 100644 tests/bluetooth/host/conn/mocks/zephyr/syscalls/device.h
 create mode 100644 tests/bluetooth/host/conn/prj.conf
 create mode 100644 tests/bluetooth/host/conn/src/main.c
 create mode 100644 tests/bluetooth/host/conn/testcase.yaml

diff --git a/tests/bluetooth/host/conn/CMakeLists.txt b/tests/bluetooth/host/conn/CMakeLists.txt
new file mode 100644
index 00000000000..23cf77fbd2f
--- /dev/null
+++ b/tests/bluetooth/host/conn/CMakeLists.txt
@@ -0,0 +1,27 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+project(conn)
+
+include_directories(BEFORE
+    ${ZEPHYR_BASE}/tests/bluetooth/host/conn
+    ${ZEPHYR_BASE}/tests/bluetooth/host/conn/mocks/zephyr/include
+)
+
+add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/host host_mocks)
+add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/host/conn/mocks mocks)
+
+target_link_libraries(testbinary PRIVATE mocks host_mocks)
+
+target_sources(testbinary
+    PRIVATE
+    src/main.c
+
+    ${ZEPHYR_BASE}/subsys/bluetooth/host/conn.c
+    ${ZEPHYR_BASE}/subsys/logging/log_minimal.c
+    ${ZEPHYR_BASE}/lib/net_buf/buf.c
+    ${ZEPHYR_BASE}/lib/net_buf/buf_simple.c
+)
diff --git a/tests/bluetooth/host/conn/mocks/CMakeLists.txt b/tests/bluetooth/host/conn/mocks/CMakeLists.txt
new file mode 100644
index 00000000000..2d4399c6b7d
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/CMakeLists.txt
@@ -0,0 +1,34 @@
+#
+# CMakeLists.txt file for creating of mocks library.
+#
+
+add_library(mocks STATIC
+	addr_internal.c
+	att_internal.c
+	bt_str.c
+	buf_view.c
+	hci_core.c
+	id.c
+	kernel.c
+	l2cap_internal.c
+	scan.c
+	smp.c
+	spinlock.c
+	sys_clock.c
+)
+
+target_include_directories(mocks PUBLIC
+	${ZEPHYR_BASE}/tests/bluetooth/host/conn/mocks
+	${ZEPHYR_BASE}/subsys/bluetooth
+)
+
+target_compile_options(test_interface INTERFACE -include ztest.h)
+target_link_libraries(mocks PRIVATE test_interface)
+target_link_options(mocks PUBLIC
+	"SHELL:-T ${ZEPHYR_BASE}/tests/bluetooth/host/conn/mocks/mock-sections.ld"
+)
+
+target_compile_options(mocks
+	PRIVATE
+	-DCONFIG_BT_ID_MAX=1
+)
diff --git a/tests/bluetooth/host/conn/mocks/addr_internal.c b/tests/bluetooth/host/conn/mocks/addr_internal.c
new file mode 100644
index 00000000000..c76067183ae
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/addr_internal.c
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#include "addr_internal.h"
+
+DEFINE_FAKE_VOID_FUNC(bt_addr_le_copy_resolved, bt_addr_le_t *, const bt_addr_le_t *);
+DEFINE_FAKE_VALUE_FUNC(bool, bt_addr_le_is_resolved, const bt_addr_le_t *);
diff --git a/tests/bluetooth/host/conn/mocks/addr_internal.h b/tests/bluetooth/host/conn/mocks/addr_internal.h
new file mode 100644
index 00000000000..20651ea485c
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/addr_internal.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/fff.h>
+#include <zephyr/bluetooth/addr.h>
+
+/* List of fakes used by this unit tester */
+#define ADDR_INTERNAL_MOCKS_FFF_FAKES_LIST(FAKE)                                                   \
+	FAKE(bt_addr_le_copy_resolved)                                                             \
+	FAKE(bt_addr_le_is_resolved)
+
+DECLARE_FAKE_VOID_FUNC(bt_addr_le_copy_resolved, bt_addr_le_t *, const bt_addr_le_t *);
+DECLARE_FAKE_VALUE_FUNC(bool, bt_addr_le_is_resolved, const bt_addr_le_t *);
diff --git a/tests/bluetooth/host/conn/mocks/att_internal.c b/tests/bluetooth/host/conn/mocks/att_internal.c
new file mode 100644
index 00000000000..61485478153
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/att_internal.c
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#include "att_internal.h"
+
+DEFINE_FAKE_VOID_FUNC(bt_att_init);
diff --git a/tests/bluetooth/host/conn/mocks/att_internal.h b/tests/bluetooth/host/conn/mocks/att_internal.h
new file mode 100644
index 00000000000..b7a37ee9b46
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/att_internal.h
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/fff.h>
+
+/* List of fakes used by this unit tester */
+#define ATT_INTERNAL_MOCKS_FFF_FAKES_LIST(FAKE) FAKE(bt_att_init)
+
+DECLARE_FAKE_VOID_FUNC(bt_att_init);
diff --git a/tests/bluetooth/host/conn/mocks/bt_str.c b/tests/bluetooth/host/conn/mocks/bt_str.c
new file mode 100644
index 00000000000..21a1c72751b
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/bt_str.c
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/bluetooth/addr.h>
+
+#include "bt_str.h"
+
+const char *bt_addr_le_str(const bt_addr_le_t *addr)
+{
+	static char str[BT_ADDR_LE_STR_LEN];
+
+	bt_addr_le_to_str(addr, str, sizeof(str));
+
+	return str;
+}
diff --git a/tests/bluetooth/host/conn/mocks/bt_str.h b/tests/bluetooth/host/conn/mocks/bt_str.h
new file mode 100644
index 00000000000..53786cd31e2
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/bt_str.h
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/bluetooth/addr.h>
+
+const char *bt_addr_le_str(const bt_addr_le_t *addr);
diff --git a/tests/bluetooth/host/conn/mocks/buf_view.c b/tests/bluetooth/host/conn/mocks/buf_view.c
new file mode 100644
index 00000000000..30c11cc59ec
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/buf_view.c
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#include "buf_view.h"
+
+DEFINE_FAKE_VALUE_FUNC(bool, bt_buf_has_view, const struct net_buf *);
+DEFINE_FAKE_VALUE_FUNC(struct net_buf *, bt_buf_make_view, struct net_buf *, struct net_buf *,
+		       size_t, struct bt_buf_view_meta *);
+DEFINE_FAKE_VOID_FUNC(bt_buf_destroy_view, struct net_buf *, struct bt_buf_view_meta *);
diff --git a/tests/bluetooth/host/conn/mocks/buf_view.h b/tests/bluetooth/host/conn/mocks/buf_view.h
new file mode 100644
index 00000000000..480510a8880
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/buf_view.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/fff.h>
+
+/* List of fakes used by this unit tester */
+#define BUF_VIEW_MOCKS_FFF_FAKES_LIST(FAKE) FAKE(bt_buf_has_view)                                  \
+	FAKE(bt_buf_make_view)                                                                     \
+	FAKE(bt_buf_destroy_view)
+
+DECLARE_FAKE_VALUE_FUNC(bool, bt_buf_has_view, const struct net_buf *);
+DECLARE_FAKE_VALUE_FUNC(struct net_buf *, bt_buf_make_view, struct net_buf *, struct net_buf *,
+			size_t, struct bt_buf_view_meta *);
+DECLARE_FAKE_VOID_FUNC(bt_buf_destroy_view, struct net_buf *, struct bt_buf_view_meta *);
diff --git a/tests/bluetooth/host/conn/mocks/hci_core.c b/tests/bluetooth/host/conn/mocks/hci_core.c
new file mode 100644
index 00000000000..363108dd3c0
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/hci_core.c
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/bluetooth/hci.h>
+
+#include <host/hci_core.h>
+
+#include "hci_core.h"
+
+DEFINE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_create, uint16_t, uint8_t);
+DEFINE_FAKE_VALUE_FUNC(int, bt_hci_cmd_send_sync, uint16_t, struct net_buf *, struct net_buf **);
+DEFINE_FAKE_VALUE_FUNC(int, bt_hci_le_read_remote_features, struct bt_conn *);
+DEFINE_FAKE_VALUE_FUNC(int, bt_hci_disconnect, uint16_t, uint8_t);
+DEFINE_FAKE_VALUE_FUNC(bool, bt_le_conn_params_valid, const struct bt_le_conn_param *);
+DEFINE_FAKE_VOID_FUNC(bt_tx_irq_raise);
+DEFINE_FAKE_VALUE_FUNC(int, bt_send, struct net_buf *);
+DEFINE_FAKE_VOID_FUNC(bt_send_one_host_num_completed_packets, uint16_t);
+DEFINE_FAKE_VOID_FUNC(bt_acl_set_ncp_sent, struct net_buf *, bool);
+DEFINE_FAKE_VALUE_FUNC(int, bt_le_create_conn, const struct bt_conn *);
+DEFINE_FAKE_VALUE_FUNC(int, bt_le_create_conn_cancel);
+DEFINE_FAKE_VALUE_FUNC(int, bt_le_create_conn_synced, const struct bt_conn *,
+		       const struct bt_le_ext_adv *, uint8_t);
+DEFINE_FAKE_VALUE_FUNC(const bt_addr_le_t *, bt_lookup_id_addr, uint8_t, const bt_addr_le_t *);
+DEFINE_FAKE_VALUE_FUNC(int, bt_le_set_phy, struct bt_conn *, uint8_t, uint8_t, uint8_t, uint8_t);
+
+struct bt_dev bt_dev = {
+	.manufacturer = 0x1234,
+};
diff --git a/tests/bluetooth/host/conn/mocks/hci_core.h b/tests/bluetooth/host/conn/mocks/hci_core.h
new file mode 100644
index 00000000000..abc609c58ce
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/hci_core.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/fff.h>
+
+/* List of fakes used by this unit tester */
+#define HCI_CORE_MOCKS_FFF_FAKES_LIST(FAKE)                                                        \
+	FAKE(bt_hci_cmd_create)                                                                    \
+	FAKE(bt_hci_cmd_send_sync)                                                                 \
+	FAKE(bt_hci_le_read_remote_features)                                                       \
+	FAKE(bt_hci_disconnect)                                                                    \
+	FAKE(bt_le_conn_params_valid)                                                              \
+	FAKE(bt_tx_irq_raise)                                                                      \
+	FAKE(bt_send)                                                                              \
+	FAKE(bt_send_one_host_num_completed_packets)                                               \
+	FAKE(bt_acl_set_ncp_sent)                                                                  \
+	FAKE(bt_le_create_conn)                                                                    \
+	FAKE(bt_le_create_conn_cancel)                                                             \
+	FAKE(bt_le_create_conn_synced)                                                             \
+	FAKE(bt_lookup_id_addr)                                                                    \
+	FAKE(bt_le_set_phy)
+
+DECLARE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_create, uint16_t, uint8_t);
+DECLARE_FAKE_VALUE_FUNC(int, bt_hci_cmd_send_sync, uint16_t, struct net_buf *, struct net_buf **);
+DECLARE_FAKE_VALUE_FUNC(int, bt_hci_le_read_remote_features, struct bt_conn *);
+DECLARE_FAKE_VALUE_FUNC(int, bt_hci_disconnect, uint16_t, uint8_t);
+DECLARE_FAKE_VALUE_FUNC(bool, bt_le_conn_params_valid, const struct bt_le_conn_param *);
+DECLARE_FAKE_VOID_FUNC(bt_tx_irq_raise);
+DECLARE_FAKE_VALUE_FUNC(int, bt_send, struct net_buf *);
+DECLARE_FAKE_VOID_FUNC(bt_send_one_host_num_completed_packets, uint16_t);
+DECLARE_FAKE_VOID_FUNC(bt_acl_set_ncp_sent, struct net_buf *, bool);
+DECLARE_FAKE_VALUE_FUNC(int, bt_le_create_conn, const struct bt_conn *);
+DECLARE_FAKE_VALUE_FUNC(int, bt_le_create_conn_cancel);
+DECLARE_FAKE_VALUE_FUNC(int, bt_le_create_conn_synced, const struct bt_conn *,
+			const struct bt_le_ext_adv *, uint8_t);
+DECLARE_FAKE_VALUE_FUNC(const bt_addr_le_t *, bt_lookup_id_addr, uint8_t, const bt_addr_le_t *);
+DECLARE_FAKE_VALUE_FUNC(int, bt_le_set_phy, struct bt_conn *, uint8_t, uint8_t, uint8_t, uint8_t);
diff --git a/tests/bluetooth/host/conn/mocks/id.c b/tests/bluetooth/host/conn/mocks/id.c
new file mode 100644
index 00000000000..887ea69caad
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/id.c
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#include "id.h"
+
+DEFINE_FAKE_VALUE_FUNC(bool, bt_id_scan_random_addr_check);
diff --git a/tests/bluetooth/host/conn/mocks/id.h b/tests/bluetooth/host/conn/mocks/id.h
new file mode 100644
index 00000000000..e6e3bb8f8a2
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/id.h
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/fff.h>
+
+/* List of fakes used by this unit tester */
+#define ID_MOCKS_FFF_FAKES_LIST(FAKE) FAKE(bt_id_scan_random_addr_check)
+
+DECLARE_FAKE_VALUE_FUNC(bool, bt_id_scan_random_addr_check);
diff --git a/tests/bluetooth/host/conn/mocks/kernel.c b/tests/bluetooth/host/conn/mocks/kernel.c
new file mode 100644
index 00000000000..ef56b52ec88
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/kernel.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#include "kernel.h"
+
+DEFINE_FAKE_VALUE_FUNC(bool, k_is_in_isr);
+DEFINE_FAKE_VALUE_FUNC(int, k_poll_signal_raise, struct k_poll_signal *, int);
+DEFINE_FAKE_VALUE_FUNC(int, k_sem_take, struct k_sem *, k_timeout_t);
+DEFINE_FAKE_VALUE_FUNC(unsigned int, k_sem_count_get, struct k_sem *);
+DEFINE_FAKE_VOID_FUNC(k_sem_give, struct k_sem *);
+DEFINE_FAKE_VALUE_FUNC(k_tid_t, k_sched_current_thread_query);
+DEFINE_FAKE_VOID_FUNC(k_work_init, struct k_work *, k_work_handler_t);
+DEFINE_FAKE_VOID_FUNC(k_work_init_delayable, struct k_work_delayable *, k_work_handler_t);
+DEFINE_FAKE_VALUE_FUNC(int, k_work_cancel_delayable, struct k_work_delayable *);
+DEFINE_FAKE_VALUE_FUNC(bool, k_work_flush, struct k_work *, struct k_work_sync *);
+DEFINE_FAKE_VALUE_FUNC(int, k_work_submit, struct k_work *);
+DEFINE_FAKE_VALUE_FUNC(int, k_work_submit_to_queue, struct k_work_q *, struct k_work *);
+DEFINE_FAKE_VALUE_FUNC(int, k_work_reschedule, struct k_work_delayable *, k_timeout_t);
+DEFINE_FAKE_VALUE_FUNC(int, k_work_schedule, struct k_work_delayable *, k_timeout_t);
+DEFINE_FAKE_VOID_FUNC(k_queue_init, struct k_queue *);
+DEFINE_FAKE_VOID_FUNC(k_queue_append, struct k_queue *, void *);
+DEFINE_FAKE_VALUE_FUNC(int, k_queue_is_empty, struct k_queue *);
+DEFINE_FAKE_VALUE_FUNC(void *, k_queue_get, struct k_queue *, k_timeout_t);
+DEFINE_FAKE_VOID_FUNC(k_queue_prepend, struct k_queue *, void *);
+DEFINE_FAKE_VALUE_FUNC(void *, k_heap_alloc, struct k_heap *, size_t, k_timeout_t);
+DEFINE_FAKE_VOID_FUNC(k_heap_free, struct k_heap *, void *);
+
+struct k_work_q k_sys_work_q;
diff --git a/tests/bluetooth/host/conn/mocks/kernel.h b/tests/bluetooth/host/conn/mocks/kernel.h
new file mode 100644
index 00000000000..d649c527d28
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/kernel.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/fff.h>
+
+/* List of fakes used by this unit tester */
+#define KERNEL_MOCKS_FFF_FAKES_LIST(FAKE)                                                          \
+	FAKE(k_is_in_isr)                                                                          \
+	FAKE(k_poll_signal_raise)                                                                  \
+	FAKE(k_sem_take)                                                                           \
+	FAKE(k_sem_count_get)                                                                      \
+	FAKE(k_sem_give)                                                                           \
+	FAKE(k_sched_current_thread_query)                                                         \
+	FAKE(k_work_init)                                                                          \
+	FAKE(k_work_init_delayable)                                                                \
+	FAKE(k_work_cancel_delayable)                                                              \
+	FAKE(k_work_flush)                                                                         \
+	FAKE(k_work_submit)                                                                        \
+	FAKE(k_work_submit_to_queue)                                                               \
+	FAKE(k_work_reschedule)                                                                    \
+	FAKE(k_work_schedule)                                                                      \
+	FAKE(k_queue_init)                                                                         \
+	FAKE(k_queue_append)                                                                       \
+	FAKE(k_queue_is_empty)                                                                     \
+	FAKE(k_queue_get)                                                                          \
+	FAKE(k_queue_prepend)                                                                      \
+	FAKE(k_heap_alloc)                                                                         \
+	FAKE(k_heap_free)
+
+DECLARE_FAKE_VALUE_FUNC(bool, k_is_in_isr);
+DECLARE_FAKE_VALUE_FUNC(int, k_poll_signal_raise, struct k_poll_signal *, int);
+DECLARE_FAKE_VALUE_FUNC(int, k_sem_take, struct k_sem *, k_timeout_t);
+DECLARE_FAKE_VALUE_FUNC(unsigned int, k_sem_count_get, struct k_sem *);
+DECLARE_FAKE_VOID_FUNC(k_sem_give, struct k_sem *);
+DECLARE_FAKE_VALUE_FUNC(k_tid_t, k_sched_current_thread_query);
+DECLARE_FAKE_VOID_FUNC(k_work_init, struct k_work *, k_work_handler_t);
+DECLARE_FAKE_VOID_FUNC(k_work_init_delayable, struct k_work_delayable *, k_work_handler_t);
+DECLARE_FAKE_VALUE_FUNC(int, k_work_cancel_delayable, struct k_work_delayable *);
+DECLARE_FAKE_VALUE_FUNC(bool, k_work_flush, struct k_work *, struct k_work_sync *);
+DECLARE_FAKE_VALUE_FUNC(int, k_work_submit, struct k_work *);
+DECLARE_FAKE_VALUE_FUNC(int, k_work_submit_to_queue, struct k_work_q *, struct k_work *);
+DECLARE_FAKE_VALUE_FUNC(int, k_work_reschedule, struct k_work_delayable *, k_timeout_t);
+DECLARE_FAKE_VALUE_FUNC(int, k_work_schedule, struct k_work_delayable *, k_timeout_t);
+DECLARE_FAKE_VOID_FUNC(k_queue_init, struct k_queue *);
+DECLARE_FAKE_VOID_FUNC(k_queue_append, struct k_queue *, void *);
+DECLARE_FAKE_VALUE_FUNC(int, k_queue_is_empty, struct k_queue *);
+DECLARE_FAKE_VALUE_FUNC(void *, k_queue_get, struct k_queue *, k_timeout_t);
+DECLARE_FAKE_VOID_FUNC(k_queue_prepend, struct k_queue *, void *);
+DECLARE_FAKE_VALUE_FUNC(void *, k_heap_alloc, struct k_heap *, size_t, k_timeout_t);
+DECLARE_FAKE_VOID_FUNC(k_heap_free, struct k_heap *, void *);
diff --git a/tests/bluetooth/host/conn/mocks/l2cap_internal.c b/tests/bluetooth/host/conn/mocks/l2cap_internal.c
new file mode 100644
index 00000000000..5f638fa12af
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/l2cap_internal.c
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#include "l2cap_internal.h"
+
+DEFINE_FAKE_VOID_FUNC(bt_l2cap_init);
+DEFINE_FAKE_VOID_FUNC(bt_l2cap_recv, struct bt_conn *, struct net_buf *, bool);
+DEFINE_FAKE_VOID_FUNC(bt_l2cap_connected, struct bt_conn *);
+DEFINE_FAKE_VALUE_FUNC(int, bt_l2cap_update_conn_param, struct bt_conn *,
+		       const struct bt_le_conn_param *);
+DEFINE_FAKE_VOID_FUNC(bt_l2cap_disconnected, struct bt_conn *);
+DEFINE_FAKE_VALUE_FUNC(struct net_buf *, l2cap_data_pull, struct bt_conn *, size_t, size_t *);
diff --git a/tests/bluetooth/host/conn/mocks/l2cap_internal.h b/tests/bluetooth/host/conn/mocks/l2cap_internal.h
new file mode 100644
index 00000000000..bf553d2cec7
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/l2cap_internal.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/fff.h>
+#include <zephyr/bluetooth/addr.h>
+
+/* List of fakes used by this unit tester */
+#define L2CAP_INTERNAL_MOCKS_FFF_FAKES_LIST(FAKE)                                                  \
+	FAKE(bt_l2cap_init)                                                                        \
+	FAKE(bt_l2cap_recv)                                                                        \
+	FAKE(bt_l2cap_connected)                                                                   \
+	FAKE(bt_l2cap_update_conn_param)                                                           \
+	FAKE(bt_l2cap_disconnected)                                                                \
+	FAKE(l2cap_data_pull)
+
+DECLARE_FAKE_VOID_FUNC(bt_l2cap_init);
+DECLARE_FAKE_VOID_FUNC(bt_l2cap_recv, struct bt_conn *, struct net_buf *, bool);
+DECLARE_FAKE_VOID_FUNC(bt_l2cap_connected, struct bt_conn *);
+DECLARE_FAKE_VALUE_FUNC(int, bt_l2cap_update_conn_param, struct bt_conn *,
+			const struct bt_le_conn_param *);
+DECLARE_FAKE_VOID_FUNC(bt_l2cap_disconnected, struct bt_conn *);
+DECLARE_FAKE_VALUE_FUNC(struct net_buf *, l2cap_data_pull, struct bt_conn *, size_t, size_t *);
diff --git a/tests/bluetooth/host/conn/mocks/mock-sections.ld b/tests/bluetooth/host/conn/mocks/mock-sections.ld
new file mode 100644
index 00000000000..3b296f55b1e
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/mock-sections.ld
@@ -0,0 +1,29 @@
+/* This is a stub file for the linker. None of the sections are used by the test. */
+
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+SECTIONS
+{
+	bt_conn_cb_area : ALIGN(4)
+	{
+		_bt_conn_cb_list_start = .;
+		KEEP(*(SORT_BY_NAME(._bt_conn_cb.static.*)))
+		_bt_conn_cb_list_end = .;
+	}
+}
+INSERT AFTER .data;
+
+SECTIONS
+{
+	net_buf_pool : ALIGN(4)
+	{
+		_net_buf_pool_list_start = .;
+		KEEP(*(SORT_BY_NAME(._net_buf_pool.static.*)))
+		_net_buf_pool_list_end_end = .;
+	}
+}
+INSERT AFTER .bss;
diff --git a/tests/bluetooth/host/conn/mocks/scan.c b/tests/bluetooth/host/conn/mocks/scan.c
new file mode 100644
index 00000000000..6ccccd7bb88
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/scan.c
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#include "scan.h"
+
+DEFINE_FAKE_VALUE_FUNC(int, bt_le_scan_user_add, enum bt_le_scan_user);
+DEFINE_FAKE_VALUE_FUNC(int, bt_le_scan_user_remove, enum bt_le_scan_user);
+DEFINE_FAKE_VALUE_FUNC(bool, bt_le_explicit_scanner_running);
diff --git a/tests/bluetooth/host/conn/mocks/scan.h b/tests/bluetooth/host/conn/mocks/scan.h
new file mode 100644
index 00000000000..b694e309d16
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/scan.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/fff.h>
+
+#include <host/scan.h>
+
+/* List of fakes used by this unit tester */
+#define SCAN_MOCKS_FFF_FAKES_LIST(FAKE)                                                            \
+	FAKE(bt_le_scan_user_add)                                                                  \
+	FAKE(bt_le_scan_user_remove)                                                               \
+	FAKE(bt_le_explicit_scanner_running)
+
+DECLARE_FAKE_VALUE_FUNC(int, bt_le_scan_user_add, enum bt_le_scan_user);
+DECLARE_FAKE_VALUE_FUNC(int, bt_le_scan_user_remove, enum bt_le_scan_user);
+DECLARE_FAKE_VALUE_FUNC(bool, bt_le_explicit_scanner_running);
diff --git a/tests/bluetooth/host/conn/mocks/smp.c b/tests/bluetooth/host/conn/mocks/smp.c
new file mode 100644
index 00000000000..2377f49a998
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/smp.c
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#include "smp.h"
+
+DEFINE_FAKE_VOID_FUNC(bt_smp_init);
diff --git a/tests/bluetooth/host/conn/mocks/smp.h b/tests/bluetooth/host/conn/mocks/smp.h
new file mode 100644
index 00000000000..3e64c15fd8d
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/smp.h
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/fff.h>
+
+/* List of fakes used by this unit tester */
+#define SMP_MOCKS_FFF_FAKES_LIST(FAKE) FAKE(bt_smp_init)
+
+DECLARE_FAKE_VOID_FUNC(bt_smp_init);
diff --git a/tests/bluetooth/host/conn/mocks/spinlock.c b/tests/bluetooth/host/conn/mocks/spinlock.c
new file mode 100644
index 00000000000..0fb772d1028
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/spinlock.c
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#include "spinlock.h"
+
+DEFINE_FAKE_VALUE_FUNC(bool, z_spin_lock_valid, struct k_spinlock *);
+DEFINE_FAKE_VALUE_FUNC(bool, z_spin_unlock_valid, struct k_spinlock *);
+DEFINE_FAKE_VOID_FUNC(z_spin_lock_set_owner, struct k_spinlock *);
diff --git a/tests/bluetooth/host/conn/mocks/spinlock.h b/tests/bluetooth/host/conn/mocks/spinlock.h
new file mode 100644
index 00000000000..578c7176d8d
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/spinlock.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/fff.h>
+
+/* List of fakes used by this unit tester */
+#define SPINLOCK_MOCKS_FFF_FAKES_LIST(FAKE)                                                        \
+	FAKE(z_spin_lock_valid)                                                                    \
+	FAKE(z_spin_unlock_valid)                                                                  \
+	FAKE(z_spin_lock_set_owner)
+
+DECLARE_FAKE_VALUE_FUNC(bool, z_spin_lock_valid, struct k_spinlock *);
+DECLARE_FAKE_VALUE_FUNC(bool, z_spin_unlock_valid, struct k_spinlock *);
+DECLARE_FAKE_VOID_FUNC(z_spin_lock_set_owner, struct k_spinlock *);
diff --git a/tests/bluetooth/host/conn/mocks/sys_clock.c b/tests/bluetooth/host/conn/mocks/sys_clock.c
new file mode 100644
index 00000000000..070d26855a6
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/sys_clock.c
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#include "sys_clock.h"
+
+DEFINE_FAKE_VALUE_FUNC(k_timepoint_t, sys_timepoint_calc, k_timeout_t);
+DEFINE_FAKE_VALUE_FUNC(k_timeout_t, sys_timepoint_timeout, k_timepoint_t);
diff --git a/tests/bluetooth/host/conn/mocks/sys_clock.h b/tests/bluetooth/host/conn/mocks/sys_clock.h
new file mode 100644
index 00000000000..1594386e7fc
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/sys_clock.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/fff.h>
+
+/* List of fakes used by this unit tester */
+#define SYS_CLOCK_MOCKS_FFF_FAKES_LIST(FAKE)                                                       \
+	FAKE(sys_timepoint_calc)                                                                   \
+	FAKE(sys_timepoint_timeout)
+
+DECLARE_FAKE_VALUE_FUNC(k_timepoint_t, sys_timepoint_calc, k_timeout_t);
+DECLARE_FAKE_VALUE_FUNC(k_timeout_t, sys_timepoint_timeout, k_timepoint_t);
diff --git a/tests/bluetooth/host/conn/mocks/zephyr/include/zephyr/drivers/bluetooth/hci_driver.h b/tests/bluetooth/host/conn/mocks/zephyr/include/zephyr/drivers/bluetooth/hci_driver.h
new file mode 100644
index 00000000000..68285925d81
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/zephyr/include/zephyr/drivers/bluetooth/hci_driver.h
@@ -0,0 +1,11 @@
+/* Stub for Bluetooth HCI driver API used to hide real hci_driver.h. */
+
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ZEPHYR_INCLUDE_DRIVERS_BLUETOOTH_HCI_DRIVER_H_
+#define ZEPHYR_INCLUDE_DRIVERS_BLUETOOTH_HCI_DRIVER_H_
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_BLUETOOTH_HCI_DRIVER_H_ */
diff --git a/tests/bluetooth/host/conn/mocks/zephyr/syscalls/device.h b/tests/bluetooth/host/conn/mocks/zephyr/syscalls/device.h
new file mode 100644
index 00000000000..db591a5b5e5
--- /dev/null
+++ b/tests/bluetooth/host/conn/mocks/zephyr/syscalls/device.h
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Dummy header file to avoid compiler errors
+ * intentionally left blank
+ */
diff --git a/tests/bluetooth/host/conn/prj.conf b/tests/bluetooth/host/conn/prj.conf
new file mode 100644
index 00000000000..f63ccd0a939
--- /dev/null
+++ b/tests/bluetooth/host/conn/prj.conf
@@ -0,0 +1,21 @@
+CONFIG_ZTEST=y
+CONFIG_ASSERT=y
+CONFIG_ASSERT_LEVEL=2
+CONFIG_ASSERT_VERBOSE=y
+
+CONFIG_BT=y
+CONFIG_BT_HCI=y
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_EXT_ADV=y
+CONFIG_BT_PER_ADV=y
+CONFIG_BT_PER_ADV_SYNC=y
+
+CONFIG_BT_MAX_CONN=1
+CONFIG_BT_L2CAP_TX_MTU=23
+CONFIG_BT_CONN_TX_MAX=3
+CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=5000
+CONFIG_BT_L2CAP_TX_BUF_COUNT=3
+CONFIG_BT_ID_MAX=1
+CONFIG_BT_CENTRAL=y
+
+CONFIG_NET_BUF=y
diff --git a/tests/bluetooth/host/conn/src/main.c b/tests/bluetooth/host/conn/src/main.c
new file mode 100644
index 00000000000..95220dc3873
--- /dev/null
+++ b/tests/bluetooth/host/conn/src/main.c
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/fff.h>
+#include <zephyr/kernel.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+
+#include "mocks/addr_internal.h"
+#include "mocks/att_internal.h"
+#include "mocks/bt_str.h"
+#include "mocks/buf_view.h"
+#include "mocks/hci_core.h"
+#include "mocks/id.h"
+#include "mocks/kernel.h"
+#include "mocks/l2cap_internal.h"
+#include "mocks/scan.h"
+#include "mocks/smp.h"
+#include "mocks/spinlock.h"
+#include "mocks/sys_clock.h"
+
+DEFINE_FFF_GLOBALS;
+
+static void fff_reset_rule_before(const struct ztest_unit_test *test, void *fixture)
+{
+	ADDR_INTERNAL_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
+	ATT_INTERNAL_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
+	BUF_VIEW_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
+	HCI_CORE_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
+	ID_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
+	KERNEL_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
+	L2CAP_INTERNAL_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
+	SCAN_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
+	SMP_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
+	SPINLOCK_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
+	SYS_CLOCK_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
+}
+
+ZTEST_RULE(fff_reset_rule, fff_reset_rule_before, NULL);
+
+ZTEST_SUITE(conn, NULL, NULL, NULL, NULL, NULL);
+
+/*
+ * Test that bt_conn_le_create() returns -EINVAL if conn is not NULL and
+ * CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE is enabled.
+ *
+ * The test must be compiled with and without CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE
+ * to ensure that the -EINVAL error is returned only when this Kconfig option is enabled.
+ */
+ZTEST(conn, test_bt_conn_le_create_check_null_conn)
+{
+	bt_addr_le_t peer = {.a.val = {0x01}};
+	const struct bt_conn_le_create_param create_param = {
+		.options = BT_CONN_LE_OPT_NONE,
+		.interval = BT_GAP_SCAN_FAST_INTERVAL,
+		.window = BT_GAP_SCAN_FAST_WINDOW,
+		.interval_coded = 0,
+		.window_coded = 0,
+		.timeout = 100UL * MSEC_PER_SEC / 10,
+	};
+	struct bt_conn *conn;
+	int err;
+
+	/* Set conn to any non-NULL value to trigger the check. */
+	conn = (struct bt_conn *)1;
+
+	err = bt_conn_le_create(&peer, &create_param, BT_LE_CONN_PARAM_DEFAULT, &conn);
+	/* err must not be -EINVAL if CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE is not enabled,
+	 * otherwise -EAGAIN is returned.
+	 *
+	 * The printk is used to see what actually was compiled.
+	 */
+#if defined(CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE)
+	printk("Expected error -EINVAL\n");
+	zassert_equal(err, -EINVAL, "Failed starting initiator (err %d)", err);
+#else
+	printk("Expected error -EAGAIN\n");
+	zassert_equal(err, -EAGAIN, "Failed starting initiator (err %d)", err);
+#endif
+
+	/* If the conn is NULL, next error must not be -EINVAL. */
+	conn = NULL;
+	err = bt_conn_le_create(&peer, &create_param, BT_LE_CONN_PARAM_DEFAULT, &conn);
+	zassert_not_equal(err, -EINVAL, "Failed starting initiator (err %d)", err);
+}
+
+/*
+ * Test that bt_conn_le_create_synced() returns -EINVAL if conn is not NULL and
+ * CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE is enabled.
+ *
+ * The test must be compiled with and without CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE
+ * to ensure that the -EINVAL error is returned only when this Kconfig option is enabled.
+ */
+ZTEST(conn, test_bt_conn_le_create_synced_check_null_conn)
+{
+	bt_addr_le_t peer = {.a.val = {0x01}};
+	struct bt_le_conn_param conn_param = {
+		.interval_min = 0x30,
+		.interval_max = 0x30,
+		.latency = 0,
+		.timeout = 400,
+	};
+	struct bt_conn_le_create_synced_param synced_param = {
+		.peer = &peer,
+	};
+	struct bt_le_ext_adv *adv = NULL;
+	struct bt_conn *conn;
+	int err;
+
+	/* Set conn to any non-NULL value to trigger the check. */
+	conn = (struct bt_conn *)1;
+	err = bt_conn_le_create_synced(adv, &synced_param, &conn_param, &conn);
+
+	/* err must not be -EINVAL if CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE is not enabled,
+	 * otherwise -EAGAIN is returned.
+	 *
+	 * The printk is used to see what actually was compiled.
+	 */
+#if defined(CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE)
+	printk("Expected error -EINVAL\n");
+	zassert_equal(err, -EINVAL, "Failed starting initiator (err %d)", err);
+#else
+	printk("Expected error -EAGAIN\n");
+	zassert_equal(err, -EAGAIN, "Failed starting initiator (err %d)", err);
+#endif
+
+	/* If the conn is NULL, next error must not be -EINVAL. */
+	conn = NULL;
+	err = bt_conn_le_create_synced(adv, &synced_param, &conn_param, &conn);
+	zassert_not_equal(err, -EINVAL, "Failed starting initiator (err %d)", err);
+}
diff --git a/tests/bluetooth/host/conn/testcase.yaml b/tests/bluetooth/host/conn/testcase.yaml
new file mode 100644
index 00000000000..1be5442b61d
--- /dev/null
+++ b/tests/bluetooth/host/conn/testcase.yaml
@@ -0,0 +1,11 @@
+common:
+  tags:
+    - bluetooth
+    - host
+tests:
+  bluetooth.host.conn.test_default:
+    type: unit
+  bluetooth.host.conn.check_null_before_create:
+    type: unit
+    extra_configs:
+      - CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE=y

From a40e6b16f49a743b74e316f89a41200ae6358336 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Thu, 24 Oct 2024 14:16:00 +0200
Subject: [PATCH 0548/2913] [nrf fromlist] soc: nordic: nrf54l15: fix APPROTECT
 handling

To configure APPROTECT on nRF54L15 different set of MDK symbols
must be used. Additionally, nRF54L15 does not support loading
APPROTECT configuration from the UICR in runtime.

Upstream PR #: 80366

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 015b317bc3242161f731a14a76333ad6c5d7f47d)
---
 modules/hal_nordic/nrfx/CMakeLists.txt |  9 ++++++---
 soc/nordic/Kconfig                     | 24 +++++++++++++++++++++---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 8d7adc114d7..565835ab1c8 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -75,11 +75,14 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9230_ENGB_CPUPPR NRF9230_ENGB_XXA
 zephyr_compile_definitions_ifdef(CONFIG_NRF_APPROTECT_LOCK
                                  ENABLE_APPROTECT)
 zephyr_compile_definitions_ifdef(CONFIG_NRF_APPROTECT_USER_HANDLING
-                                 ENABLE_APPROTECT_USER_HANDLING)
+                                 ENABLE_APPROTECT_USER_HANDLING
+                                 ENABLE_AUTHENTICATED_APPROTECT)
 zephyr_compile_definitions_ifdef(CONFIG_NRF_SECURE_APPROTECT_LOCK
-                                 ENABLE_SECURE_APPROTECT)
+                                 ENABLE_SECURE_APPROTECT
+                                 ENABLE_SECUREAPPROTECT)
 zephyr_compile_definitions_ifdef(CONFIG_NRF_SECURE_APPROTECT_USER_HANDLING
-                                 ENABLE_SECURE_APPROTECT_USER_HANDLING)
+                                 ENABLE_SECURE_APPROTECT_USER_HANDLING
+                                 ENABLE_AUTHENTICATED_SECUREAPPROTECT)
 zephyr_library_compile_definitions_ifdef(CONFIG_NRF_TRACE_PORT
                                  ENABLE_TRACE)
 
diff --git a/soc/nordic/Kconfig b/soc/nordic/Kconfig
index e0063b858ed..f76b1d19acc 100644
--- a/soc/nordic/Kconfig
+++ b/soc/nordic/Kconfig
@@ -98,15 +98,24 @@ config NFCT_PINS_AS_GPIOS
 
 choice NRF_APPROTECT_HANDLING
 	bool "APPROTECT handling"
-	depends on SOC_SERIES_NRF52X || SOC_NRF5340_CPUNET || \
-		   SOC_NRF5340_CPUAPP || SOC_SERIES_NRF91X
+	depends on SOC_SERIES_NRF52X || SOC_SERIES_NRF53X || SOC_NRF54L15_CPUAPP || \
+		   SOC_SERIES_NRF91X
+	default NRF_APPROTECT_DISABLE if SOC_NRF54L15_CPUAPP
 	default NRF_APPROTECT_USE_UICR
 	help
 	  Specifies how the SystemInit() function should handle the APPROTECT
 	  mechanism.
 
+config NRF_APPROTECT_DISABLE
+	bool "Disable"
+	depends on SOC_NRF54L15_CPUAPP
+	help
+	  When this option is selected, the SystemInit() disables
+	  the APPROTECT mechanism.
+
 config NRF_APPROTECT_USE_UICR
 	bool "Use UICR"
+	depends on SOC_SERIES_NRF52X || SOC_SERIES_NRF53X || SOC_SERIES_NRF91X
 	help
 	  When this option is selected, the SystemInit() function loads the
 	  firmware branch state of the APPROTECT mechanism from UICR, so if
@@ -131,14 +140,23 @@ endchoice
 
 choice NRF_SECURE_APPROTECT_HANDLING
 	bool "Secure APPROTECT handling"
-	depends on SOC_NRF5340_CPUAPP || SOC_SERIES_NRF91X
+	depends on SOC_NRF5340_CPUAPP || SOC_NRF54L15_CPUAPP || SOC_SERIES_NRF91X
+	default NRF_SECURE_APPROTECT_DISABLE if SOC_NRF54L15_CPUAPP
 	default NRF_SECURE_APPROTECT_USE_UICR
 	help
 	  Specifies how the SystemInit() function should handle the secure
 	  APPROTECT mechanism.
 
+config NRF_SECURE_APPROTECT_DISABLE
+	bool "Disable"
+	depends on SOC_NRF54L15_CPUAPP
+	help
+	  When this option is selected, the SystemInit() disables
+	  the secure APPROTECT mechanism.
+
 config NRF_SECURE_APPROTECT_USE_UICR
 	bool "Use UICR"
+	depends on SOC_NRF5340_CPUAPP || SOC_SERIES_NRF91X
 	help
 	  When this option is selected, the SystemInit() function loads the
 	  firmware branch state of the secure APPROTECT mechanism from UICR,

From ab64d9637e07cd6d372c79b9716e3c42f7b12f54 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Thu, 31 Oct 2024 11:54:12 +0100
Subject: [PATCH 0549/2913] [nrf fromlist] soc: nordic: dmm: Fix
 DMM_REG_ALIGN_SIZE macro when CONFIG_DCACHE=n

Upstream PR #: 80676

Make sure this expansion doesn't include `CONFIG_DCACHE_LINE_SIZE`,
which would be undefined and produce a build error.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit cf5405a59931a55b34ed7223ec82f30e3548f339)
(cherry picked from commit 3440378f9918e9ccdfbe6b08edcf0de593f0f0bd)
---
 soc/nordic/common/dmm.h | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/soc/nordic/common/dmm.h b/soc/nordic/common/dmm.h
index e92f01d07b8..34b517c92df 100644
--- a/soc/nordic/common/dmm.h
+++ b/soc/nordic/common/dmm.h
@@ -23,12 +23,13 @@ extern "C" {
 
 /** @cond INTERNAL_HIDDEN */
 
+#ifdef CONFIG_DCACHE
+
 /* Determine if memory region is cacheable. */
-#define DMM_IS_REG_CACHEABLE(node_id)					 \
-	COND_CODE_1(CONFIG_DCACHE,					 \
-	   (COND_CODE_1(DT_NODE_HAS_PROP(node_id, zephyr_memory_attr),	 \
-	    ((DT_PROP(node_id, zephyr_memory_attr) & DT_MEM_CACHEABLE)), \
-	    (0))), (0))
+#define DMM_IS_REG_CACHEABLE(node_id)					     \
+	COND_CODE_1(DT_NODE_HAS_PROP(node_id, zephyr_memory_attr),	     \
+		((DT_PROP(node_id, zephyr_memory_attr) & DT_MEM_CACHEABLE)), \
+		(0))
 
 /* Determine required alignment of the data buffers in specified memory region.
  * Cache line alignment is required if region is cacheable and data cache is enabled.
@@ -36,6 +37,13 @@ extern "C" {
 #define DMM_REG_ALIGN_SIZE(node_id) \
 	(DMM_IS_REG_CACHEABLE(node_id) ? CONFIG_DCACHE_LINE_SIZE : sizeof(uint8_t))
 
+#else
+
+#define DMM_IS_REG_CACHEABLE(node_id) 0
+#define DMM_REG_ALIGN_SIZE(node_id) (sizeof(uint8_t))
+
+#endif /* CONFIG_DCACHE */
+
 /* Determine required alignment of the data buffers in memory region
  * associated with specified device node.
  */

From 85b9857c88e578a59f6dc445d9b620ffd87eb117 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 16 Oct 2024 23:39:40 +0530
Subject: [PATCH 0550/2913] [nrf fromtree] drivers: nrfwifi: Fix regulatory
 domain regression

Recent WPA supplicant changes have broken nRF regulatory support,
implement the new set/get country WPA supplicant ops.

WPA supplicant: Regulatory SET through WPA supplicant, GET is direct to
the driver

Scan only: SET and GET direct calls to the driver

Fixes #79916.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 2ea25ea238e0cdb2d948f59bf24fa3a26bfd7f4b)
(cherry picked from commit 50ee9cb026be0c60e16e2edafdf8fd1ed2a95d70)
---
 drivers/wifi/nrfwifi/inc/wpa_supp_if.h |  2 +
 drivers/wifi/nrfwifi/src/fmac_main.c   | 77 +++++++++++---------------
 drivers/wifi/nrfwifi/src/wpa_supp_if.c | 73 ++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 46 deletions(-)

diff --git a/drivers/wifi/nrfwifi/inc/wpa_supp_if.h b/drivers/wifi/nrfwifi/inc/wpa_supp_if.h
index 06a13261a70..c543644e312 100644
--- a/drivers/wifi/nrfwifi/inc/wpa_supp_if.h
+++ b/drivers/wifi/nrfwifi/inc/wpa_supp_if.h
@@ -123,6 +123,8 @@ int nrf_wifi_supp_get_conn_info(void *if_priv, struct wpa_conn_info *info);
 void nrf_wifi_supp_event_proc_get_conn_info(void *os_vif_ctx,
 					    struct nrf_wifi_umac_event_conn_info *info,
 					    unsigned int event_len);
+int nrf_wifi_supp_set_country(void *if_priv, const char *alpha2);
+int nrf_wifi_supp_get_country(void *if_priv, char *alpha2);
 
 #endif /* CONFIG_NRF70_STA_MODE */
 #ifdef CONFIG_NRF70_AP_MODE
diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c
index f2f7ba41340..eb67e156800 100644
--- a/drivers/wifi/nrfwifi/src/fmac_main.c
+++ b/drivers/wifi/nrfwifi/src/fmac_main.c
@@ -343,28 +343,8 @@ int nrf_wifi_reg_domain(const struct device *dev, struct wifi_reg_domain *reg_do
 		goto err;
 	}
 
+#ifdef CONFIG_NRF70_SCAN_ONLY
 	if (reg_domain->oper == WIFI_MGMT_SET) {
-#ifndef CONFIG_NRF70_RADIO_TEST
-#ifdef CONFIG_NRF70_STA_MODE
-		/* Need to check if WPA supplicant is initialized or not.
-		 * Must be checked when CONFIG_WIFI_NM_WPA_SUPPLICANT is enabled.
-		 * Not applicable for RADIO_TEST or when
-		 * CONFIG_WIFI_NM_WPA_SUPPLICANT is not enabled.
-		 */
-		/* It is possbile that during supplicant initialization driver may
-		 * get the command. lock will try to ensure that supplicant
-		 * initialization is complete.
-		 */
-		k_mutex_lock(&vif_ctx_zep->vif_lock, K_FOREVER);
-		if ((!vif_ctx_zep->supp_drv_if_ctx) ||
-		    (!wifi_nm_get_instance_iface(vif_ctx_zep->zep_net_if_ctx))) {
-			LOG_ERR("%s: WPA supplicant initialization not complete yet", __func__);
-			k_mutex_unlock(&vif_ctx_zep->vif_lock);
-			goto err;
-		}
-		k_mutex_unlock(&vif_ctx_zep->vif_lock);
-#endif /* CONFIG_NRF70_STA_MODE */
-#endif /* !CONFIG_NRF70_RADIO_TEST */
 		memcpy(reg_domain_info.alpha2, reg_domain->country_code, WIFI_COUNTRY_CODE_LEN);
 
 		reg_domain_info.force = reg_domain->force;
@@ -374,36 +354,39 @@ int nrf_wifi_reg_domain(const struct device *dev, struct wifi_reg_domain *reg_do
 			LOG_ERR("%s: Failed to set regulatory domain", __func__);
 			goto err;
 		}
-	} else if (reg_domain->oper == WIFI_MGMT_GET) {
 
-		if (!reg_domain->chan_info)	{
-			LOG_ERR("%s: Invalid regulatory info (NULL)\n", __func__);
-			goto err;
-		}
+		goto err;
+	}
+#endif
+	if (reg_domain->oper != WIFI_MGMT_GET) {
+		LOG_ERR("%s: Invalid operation: %d", __func__, reg_domain->oper);
+		goto err;
+	}
 
-		status = nrf_wifi_fmac_get_reg(fmac_dev_ctx, &reg_domain_info);
-		if (status != NRF_WIFI_STATUS_SUCCESS) {
-			LOG_ERR("%s: Failed to get regulatory domain", __func__);
-			goto err;
-		}
+	if (!reg_domain->chan_info)	{
+		LOG_ERR("%s: Invalid regulatory info (NULL)\n", __func__);
+		goto err;
+	}
 
-		memcpy(reg_domain->country_code, reg_domain_info.alpha2, WIFI_COUNTRY_CODE_LEN);
-		reg_domain->num_channels = reg_domain_info.reg_chan_count;
-
-		for (chan_idx = 0; chan_idx < reg_domain_info.reg_chan_count; chan_idx++) {
-			chan_info = &(reg_domain->chan_info[chan_idx]);
-			reg_domain_chan_info = &(reg_domain_info.reg_chan_info[chan_idx]);
-			chan_info->center_frequency = reg_domain_chan_info->center_frequency;
-			chan_info->dfs = !!reg_domain_chan_info->dfs;
-			chan_info->max_power = reg_domain_chan_info->max_power;
-			chan_info->passive_only = !!reg_domain_chan_info->passive_channel;
-			chan_info->supported = !!reg_domain_chan_info->supported;
-		}
-	} else {
-		LOG_ERR("%s: Invalid operation: %d", __func__, reg_domain->oper);
+	status = nrf_wifi_fmac_get_reg(fmac_dev_ctx, &reg_domain_info);
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		LOG_ERR("%s: Failed to get regulatory domain", __func__);
 		goto err;
 	}
 
+	memcpy(reg_domain->country_code, reg_domain_info.alpha2, WIFI_COUNTRY_CODE_LEN);
+	reg_domain->num_channels = reg_domain_info.reg_chan_count;
+
+	for (chan_idx = 0; chan_idx < reg_domain_info.reg_chan_count; chan_idx++) {
+		chan_info = &(reg_domain->chan_info[chan_idx]);
+		reg_domain_chan_info = &(reg_domain_info.reg_chan_info[chan_idx]);
+		chan_info->center_frequency = reg_domain_chan_info->center_frequency;
+		chan_info->dfs = !!reg_domain_chan_info->dfs;
+		chan_info->max_power = reg_domain_chan_info->max_power;
+		chan_info->passive_only = !!reg_domain_chan_info->passive_channel;
+		chan_info->supported = !!reg_domain_chan_info->supported;
+	}
+
 	ret = 0;
 err:
 	k_mutex_unlock(&reg_lock);
@@ -850,7 +833,7 @@ static struct wifi_mgmt_ops nrf_wifi_mgmt_ops = {
 	.get_power_save_config = nrf_wifi_get_power_save_config,
 	.set_rts_threshold = nrf_wifi_set_rts_threshold,
 	.get_rts_threshold = nrf_wifi_get_rts_threshold,
-#endif /* CONFIG_NRF70_STA_MODE */
+#endif
 #ifdef CONFIG_NRF70_SYSTEM_WITH_RAW_MODES
 	.mode = nrf_wifi_mode,
 #endif
@@ -883,6 +866,8 @@ static struct zep_wpa_supp_dev_ops wpa_supp_ops = {
 	.register_frame = nrf_wifi_supp_register_frame,
 	.get_capa = nrf_wifi_supp_get_capa,
 	.get_conn_info = nrf_wifi_supp_get_conn_info,
+	.set_country = nrf_wifi_supp_set_country,
+	.get_country = nrf_wifi_supp_get_country,
 #ifdef CONFIG_NRF70_AP_MODE
 	.init_ap = nrf_wifi_wpa_supp_init_ap,
 	.start_ap = nrf_wifi_wpa_supp_start_ap,
diff --git a/drivers/wifi/nrfwifi/src/wpa_supp_if.c b/drivers/wifi/nrfwifi/src/wpa_supp_if.c
index b022c8d5af1..292c1b9117a 100644
--- a/drivers/wifi/nrfwifi/src/wpa_supp_if.c
+++ b/drivers/wifi/nrfwifi/src/wpa_supp_if.c
@@ -1861,6 +1861,79 @@ int nrf_wifi_supp_get_conn_info(void *if_priv, struct wpa_conn_info *info)
 	return ret;
 }
 
+int nrf_wifi_supp_set_country(void *if_priv, const char *alpha2)
+{
+	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
+	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
+	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
+	struct nrf_wifi_fmac_reg_info reg_domain_info = {0};
+
+	if (!if_priv || !alpha2) {
+		LOG_ERR("%s: Invalid params", __func__);
+		return -1;
+	}
+
+	vif_ctx_zep = if_priv;
+	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
+	if (!rpu_ctx_zep) {
+		LOG_ERR("%s: rpu_ctx_zep is NULL", __func__);
+		return -1;
+	}
+
+	k_mutex_lock(&vif_ctx_zep->vif_lock, K_FOREVER);
+	if (!rpu_ctx_zep->rpu_ctx) {
+		LOG_DBG("%s: RPU context not initialized", __func__);
+		goto out;
+	}
+
+	memcpy(reg_domain_info.alpha2, alpha2, NRF_WIFI_COUNTRY_CODE_LEN);
+
+	status = nrf_wifi_fmac_set_reg(rpu_ctx_zep->rpu_ctx, &reg_domain_info);
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		LOG_ERR("%s: nrf_wifi_fmac_set_reg failed", __func__);
+		goto out;
+	}
+out:
+	k_mutex_unlock(&vif_ctx_zep->vif_lock);
+	return status;
+}
+
+int nrf_wifi_supp_get_country(void *if_priv, char *alpha2)
+{
+	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
+	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
+	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
+	struct nrf_wifi_fmac_reg_info reg_domain_info = {0};
+
+	if (!if_priv || !alpha2) {
+		LOG_ERR("%s: Invalid params", __func__);
+		return -1;
+	}
+
+	vif_ctx_zep = if_priv;
+	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
+	if (!rpu_ctx_zep) {
+		LOG_ERR("%s: rpu_ctx_zep is NULL", __func__);
+		return -1;
+	}
+
+	k_mutex_lock(&vif_ctx_zep->vif_lock, K_FOREVER);
+	if (!rpu_ctx_zep->rpu_ctx) {
+		LOG_DBG("%s: RPU context not initialized", __func__);
+		goto out;
+	}
+
+	status = nrf_wifi_fmac_get_reg(rpu_ctx_zep->rpu_ctx, &reg_domain_info);
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		LOG_ERR("%s: nrf_wifi_fmac_get_reg failed", __func__);
+		goto out;
+	}
+
+	memcpy(alpha2, reg_domain_info.alpha2, NRF_WIFI_COUNTRY_CODE_LEN);
+out:
+	k_mutex_unlock(&vif_ctx_zep->vif_lock);
+	return status;
+}
 
 void nrf_wifi_supp_event_proc_get_conn_info(void *if_priv,
 					   struct nrf_wifi_umac_event_conn_info *info,

From 15301015749e9f16afa699d4b8a94d36421ad324 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Thu, 17 Oct 2024 00:34:21 +0530
Subject: [PATCH 0551/2913] [nrf fromtree] drivers: nrfwifi: Fix label name

The label is used for both positive and negative cases, so, should be
called "out".

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 7d696f5b69f02909337699ac3828a2fbe4571923)
(cherry picked from commit d0acfbdb4165a0755a5958d6f2f06752a67ee59e)
---
 drivers/wifi/nrfwifi/src/fmac_main.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c
index eb67e156800..470be6c8055 100644
--- a/drivers/wifi/nrfwifi/src/fmac_main.c
+++ b/drivers/wifi/nrfwifi/src/fmac_main.c
@@ -320,27 +320,27 @@ int nrf_wifi_reg_domain(const struct device *dev, struct wifi_reg_domain *reg_do
 	k_mutex_lock(&reg_lock, K_FOREVER);
 
 	if (!dev || !reg_domain) {
-		goto err;
+		goto out;
 	}
 
 	vif_ctx_zep = dev->data;
 
 	if (!vif_ctx_zep) {
 		LOG_ERR("%s: vif_ctx_zep is NULL", __func__);
-		goto err;
+		goto out;
 	}
 
 	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
 
 	if (!rpu_ctx_zep) {
 		LOG_ERR("%s: rpu_ctx_zep is NULL", __func__);
-		goto err;
+		goto out;
 	}
 
 	fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
 	if (!fmac_dev_ctx) {
 		LOG_ERR("%s: fmac_dev_ctx is NULL", __func__);
-		goto err;
+		goto out;
 	}
 
 #ifdef CONFIG_NRF70_SCAN_ONLY
@@ -352,26 +352,26 @@ int nrf_wifi_reg_domain(const struct device *dev, struct wifi_reg_domain *reg_do
 		status = nrf_wifi_fmac_set_reg(fmac_dev_ctx, &reg_domain_info);
 		if (status != NRF_WIFI_STATUS_SUCCESS) {
 			LOG_ERR("%s: Failed to set regulatory domain", __func__);
-			goto err;
+			goto out;
 		}
 
-		goto err;
+		goto out;
 	}
 #endif
 	if (reg_domain->oper != WIFI_MGMT_GET) {
 		LOG_ERR("%s: Invalid operation: %d", __func__, reg_domain->oper);
-		goto err;
+		goto out;
 	}
 
 	if (!reg_domain->chan_info)	{
 		LOG_ERR("%s: Invalid regulatory info (NULL)\n", __func__);
-		goto err;
+		goto out;
 	}
 
 	status = nrf_wifi_fmac_get_reg(fmac_dev_ctx, &reg_domain_info);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: Failed to get regulatory domain", __func__);
-		goto err;
+		goto out;
 	}
 
 	memcpy(reg_domain->country_code, reg_domain_info.alpha2, WIFI_COUNTRY_CODE_LEN);
@@ -388,7 +388,7 @@ int nrf_wifi_reg_domain(const struct device *dev, struct wifi_reg_domain *reg_do
 	}
 
 	ret = 0;
-err:
+out:
 	k_mutex_unlock(&reg_lock);
 	return ret;
 }

From f4e0b640c9a8984d13826ff8bc1a2b5f16a411b3 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Fri, 1 Nov 2024 21:03:32 +0530
Subject: [PATCH 0552/2913] [nrf fromlist] boards: thingy53: Fix missing GPIOs

Status and request GPIOs are missing from the edge connector, add those
to fix Thingy53 + nRF7002EB build.

Upstream PR #: 80748

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit b1c242fe3c04dd21186eb0181a957a3cbc80acae)
---
 boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts b/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts
index aa4d4df909c..3003d4924ce 100644
--- a/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts
+++ b/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts
@@ -72,7 +72,9 @@
 		#gpio-cells = <2>;
 		gpio-map-mask = <0xffffffff 0xffffffc0>;
 		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map = <8 0 &gpio0 5 0>,	/* P8, P0.05/AIN1 */
+		gpio-map = <5 0 &gpio1 1 0>,    /* P5, P1.01/GRANT */
+			   <6 0 &gpio1 0 0>,    /* P6, P1.00/REQ */
+			   <8 0 &gpio0 5 0>,	/* P8, P0.05/AIN1 */
 			   <9 0 &gpio0 4 0>,	/* P9, P0.04/AIN0 */
 			   <15 0 &gpio0 8 0>,	/* P15, P0.08/TRACEDATA3 */
 			   <16 0 &gpio0 9 0>,	/* P16, P0.09/TRACEDATA2 */

From 43e0485afd33d6f23a1571770613d4d732d82c61 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Sat, 2 Nov 2024 17:14:23 +0530
Subject: [PATCH 0553/2913] [nrf fromlist] drivers: nrfwifi: Fix the undefined
 macro usage

This works because undefined macro in conditional is treated as zero,
but could end up choosing the wrong divider.

Fix the macro with the new name.

Upstream PR #: 80780

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 4250055bbbb735bf09439b517df9fdc58f968e4d)
---
 drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c b/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c
index 26d9249248c..46c92def8f7 100644
--- a/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c
+++ b/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c
@@ -85,7 +85,7 @@ BUILD_ASSERT(QSPI_IF_DEVICE_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 16),
  * PCLK192M frequency"), but after that operation is complete, the default
  * divider needs to be restored to avoid increased current consumption.
  */
-#if (INST_0_SCK_FREQUENCY >= NRF_QSPI_BASE_CLOCK_FREQ)
+#if (QSPI_IF_DEVICE_FREQUENCY >= NRF_QSPI_BASE_CLOCK_FREQ)
 /* For requested SCK >= 96 MHz, use HFCLK192M / 1 / (2*1) = 96 MHz */
 #define BASE_CLOCK_DIV NRF_CLOCK_HFCLK_DIV_1
 #define INST_0_SCK_CFG NRF_QSPI_FREQ_DIV1
@@ -93,12 +93,12 @@ BUILD_ASSERT(QSPI_IF_DEVICE_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 16),
 #elif NRF53_ERRATA_159_ENABLE_WORKAROUND
 #define BASE_CLOCK_DIV NRF_CLOCK_HFCLK_DIV_1
 #define INST_0_SCK_CFG (DIV_ROUND_UP(NRF_QSPI_BASE_CLOCK_FREQ, \
-				     INST_0_SCK_FREQUENCY) - 1)
-#elif (INST_0_SCK_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 2))
+				     QSPI_IF_DEVICE_FREQUENCY) - 1)
+#elif (QSPI_IF_DEVICE_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 2))
 /* For 96 MHz > SCK >= 48 MHz, use HFCLK192M / 2 / (2*1) = 48 MHz */
 #define BASE_CLOCK_DIV NRF_CLOCK_HFCLK_DIV_2
 #define INST_0_SCK_CFG NRF_QSPI_FREQ_DIV1
-#elif (INST_0_SCK_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 3))
+#elif (QSPI_IF_DEVICE_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 3))
 /* For 48 MHz > SCK >= 32 MHz, use HFCLK192M / 1 / (2*3) = 32 MHz */
 #define BASE_CLOCK_DIV NRF_CLOCK_HFCLK_DIV_1
 #define INST_0_SCK_CFG NRF_QSPI_FREQ_DIV3

From 7a55d595709a141017b0ffa513e46e48717c4d2d Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Mon, 28 Oct 2024 12:58:49 +0100
Subject: [PATCH 0554/2913] [nrf fromtree] linker: lto: Remove experimental
 label

LTO support was added with Zephyr 3.6.0, and it has been used in
production with Nordic devices for a long time. Remove the experimental
label to mark it ready for production.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit 2fd8cc8d881940f1c5b1c5499cc5384fc1a93c73)
(cherry picked from commit b6c23193700be7e7744bccf0c3aec159c1aaedfb)
---
 Kconfig.zephyr | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Kconfig.zephyr b/Kconfig.zephyr
index f97819896d9..68abf89b42f 100644
--- a/Kconfig.zephyr
+++ b/Kconfig.zephyr
@@ -536,11 +536,10 @@ config NO_OPTIMIZATIONS
 endchoice
 
 config LTO
-	bool "Link Time Optimization [EXPERIMENTAL]"
+	bool "Link Time Optimization"
 	depends on !(GEN_ISR_TABLES || GEN_IRQ_VECTOR_TABLE) || ISR_TABLES_LOCAL_DECLARATION
 	depends on !NATIVE_LIBRARY
 	depends on !CODE_DATA_RELOCATION
-	select EXPERIMENTAL
 	help
 	  This option enables Link Time Optimization.
 

From 33c27e339d862765c1a1a89150f12bea91ad6fa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hubert=20Mi=C5=9B?= <hubert.mis@gmail.com>
Date: Mon, 23 Sep 2024 21:49:06 +0200
Subject: [PATCH 0555/2913] [nrf fromtree] net: coap: add no-response option
 definition and values
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Constrained application can require to avoid waiting for response
from a server. CoAP No-response option defined in RFC 7967 allows
to do that by suppressing selected response types.

Signed-off-by: Hubert Miś <hubert.mis@gmail.com>
(cherry picked from commit 70c9bf1da7049432933d27a1617c59de5cbef423)
(cherry picked from commit 67983c5b87795e642fb0b42cf70d2867c384116d)
---
 include/zephyr/net/coap.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/include/zephyr/net/coap.h b/include/zephyr/net/coap.h
index 11d2c3711f2..bf0d86cfaf7 100644
--- a/include/zephyr/net/coap.h
+++ b/include/zephyr/net/coap.h
@@ -64,6 +64,7 @@ enum coap_option_num {
 	COAP_OPTION_PROXY_SCHEME = 39,   /**< Proxy-Scheme */
 	COAP_OPTION_SIZE1 = 60,          /**< Size1 */
 	COAP_OPTION_ECHO = 252,          /**< Echo (RFC 9175) */
+	COAP_OPTION_NO_RESPONSE = 258,   /**< No-Response (RFC 7967) */
 	COAP_OPTION_REQUEST_TAG = 292    /**< Request-Tag (RFC 9175) */
 };
 
@@ -222,6 +223,22 @@ enum coap_content_format {
 	COAP_CONTENT_FORMAT_APP_CBOR = 60               /**< application/cbor */
 };
 
+/**
+ * @brief Set of No-Response option values for CoAP.
+ *
+ * To be used when encoding or decoding a No-Response option defined
+ * in RFC 7967.
+ */
+enum coap_no_response {
+	COAP_NO_RESPONSE_SUPPRESS_2_XX = 0x02,
+	COAP_NO_RESPONSE_SUPPRESS_4_XX = 0x08,
+	COAP_NO_RESPONSE_SUPPRESS_5_XX = 0x10,
+
+	COAP_NO_RESPONSE_SUPPRESS_ALL = COAP_NO_RESPONSE_SUPPRESS_2_XX |
+					COAP_NO_RESPONSE_SUPPRESS_4_XX |
+					COAP_NO_RESPONSE_SUPPRESS_5_XX,
+};
+
 /** @cond INTERNAL_HIDDEN */
 
 /* block option helper */

From 18f355666bcd42f5afdfd8887a5b3e7ff388bcb3 Mon Sep 17 00:00:00 2001
From: Francois Gervais <francoisgervais@gmail.com>
Date: Tue, 24 Sep 2024 21:26:44 -0400
Subject: [PATCH 0556/2913] [nrf fromtree] net: lib: coap_client: wait for all
 acknowledgements

This commit makes sure we continue to wait for extra confirmations even
after the request is done so we can handle duplicate confirmations if any.

Detailed description:

rfc7252#section-4.5 specifies that:

"The recipient SHOULD acknowledge each duplicate copy of a
 Confirmable message".

So if, for example, the client sends to a multicast destination address,
the server will get multiple requests and will confirm all of them.

Without this commit, the client will set the request to done after
receiving the first answer.
From here the request object will be marked as free and the duplicate
acknowledgements will stay buffered in the network stack.
Once the client tries to send a new request, it will unbuffer those
duplicate acknowledgements but now the request object is unallocated
so the client won't be able to handle those acknowledgements as duplicates.
It will instead treat it as an unexpected ACK.

To work around this issue, rfc7252#section-4.8.2 states that:

"EXCHANGE_LIFETIME is the time from starting to send a Confirmable
 message to the time when an acknowledgement is no longer expected,
 i.e., message-layer information about the message exchange can be
 purged."

Keeping the request object allocated for EXCHANGE_LIFETIME ensures that
duplicate acknowledgements can be handled accordingly.

This commit adds a basic implementation of what is stated in the RFC.

EXCHANGE_LIFETIME has been arbitrarily set to 3 * ACK_TIMEOUT which
seems more reasonable than the 247 seconds stated in the RFC.

Signed-off-by: Francois Gervais <francoisgervais@gmail.com>
(cherry picked from commit bfed8d0966993c4218f8a85fd41e724831ba2657)
(cherry picked from commit b56bec6e91c4f2075408d6ec876c8514eff04d74)
---
 subsys/net/lib/coap/coap_client.c | 53 +++++++++++++++++++++++++++----
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 7c49a90981b..e841a1998dc 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -16,6 +16,7 @@ LOG_MODULE_DECLARE(net_coap, CONFIG_COAP_LOG_LEVEL);
 #define COAP_VERSION 1
 #define COAP_SEPARATE_TIMEOUT 6000
 #define COAP_PERIODIC_TIMEOUT 500
+#define COAP_EXCHANGE_LIFETIME_FACTOR 3
 #define BLOCK1_OPTION_SIZE 4
 #define PAYLOAD_MARKER_SIZE 1
 
@@ -86,6 +87,21 @@ static int coap_client_schedule_poll(struct coap_client *client, int sock,
 	return 0;
 }
 
+static bool exchange_lifetime_exceeded(struct coap_client_internal_request *internal_req)
+{
+	int64_t time_since_t0, exchange_lifetime;
+
+	if (coap_header_get_type(&internal_req->request) == COAP_TYPE_NON_CON) {
+		return true;
+	}
+
+	time_since_t0 = k_uptime_get() - internal_req->pending.t0;
+	exchange_lifetime =
+		(internal_req->pending.params.ack_timeout * COAP_EXCHANGE_LIFETIME_FACTOR);
+
+	return time_since_t0 > exchange_lifetime;
+}
+
 static bool has_ongoing_request(struct coap_client *client)
 {
 	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
@@ -97,10 +113,23 @@ static bool has_ongoing_request(struct coap_client *client)
 	return false;
 }
 
+static bool has_ongoing_exchange(struct coap_client *client)
+{
+	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
+		if (client->requests[i].request_ongoing == true ||
+		    !exchange_lifetime_exceeded(&client->requests[i])) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
 static struct coap_client_internal_request *get_free_request(struct coap_client *client)
 {
 	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
-		if (client->requests[i].request_ongoing == false) {
+		if (client->requests[i].request_ongoing == false &&
+		    exchange_lifetime_exceeded(&client->requests[i])) {
 			return &client->requests[i];
 		}
 	}
@@ -110,13 +139,24 @@ static struct coap_client_internal_request *get_free_request(struct coap_client
 
 static bool has_ongoing_requests(void)
 {
-	bool has_requests = false;
+	for (int i = 0; i < num_clients; i++) {
+		if (has_ongoing_request(clients[i])) {
+			return true;
+		}
+	}
 
+	return false;
+}
+
+static bool has_ongoing_exchanges(void)
+{
 	for (int i = 0; i < num_clients; i++) {
-		has_requests |= has_ongoing_request(clients[i]);
+		if (has_ongoing_exchange(clients[i])) {
+			return true;
+		}
 	}
 
-	return has_requests;
+	return false;
 }
 
 static enum coap_block_size coap_client_default_block_size(void)
@@ -618,7 +658,8 @@ static struct coap_client_internal_request *get_request_with_token(
 	response_tkl = coap_header_get_token(resp, response_token);
 
 	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
-		if (client->requests[i].request_ongoing) {
+		if (client->requests[i].request_ongoing ||
+		    !exchange_lifetime_exceeded(&client->requests[i])) {
 			if (client->requests[i].request_tkl != response_tkl) {
 				continue;
 			}
@@ -921,7 +962,7 @@ static void coap_client_recv(void *coap_cl, void *a, void *b)
 		}
 
 		/* There are more messages coming */
-		if (has_ongoing_requests()) {
+		if (has_ongoing_exchanges()) {
 			continue;
 		} else {
 idle:

From 6150de094e86f6949dab5deb8e15e5f02b1ed696 Mon Sep 17 00:00:00 2001
From: Francois Gervais <francoisgervais@gmail.com>
Date: Tue, 24 Sep 2024 18:51:56 -0400
Subject: [PATCH 0557/2913] [nrf fromtree] tests: coap_client: wait enough for
 requests to be unallocated

As confirmable requests will stay allocated for (3 * ACK_TIMEOUT), we
need to adjust the timings so all requests are unallocated by the end
of the test.

Signed-off-by: Francois Gervais <francoisgervais@gmail.com>
(cherry picked from commit 13cad59542d15e57fd4a70dfc9354b7251a8b0f4)
(cherry picked from commit 04d4c68e4126da99993bdcaf19f4b9ffdce5ce88)
---
 tests/net/lib/coap_client/CMakeLists.txt |  2 +-
 tests/net/lib/coap_client/src/main.c     | 18 ++++--------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/tests/net/lib/coap_client/CMakeLists.txt b/tests/net/lib/coap_client/CMakeLists.txt
index d99bb3145f9..e12214fc6a9 100644
--- a/tests/net/lib/coap_client/CMakeLists.txt
+++ b/tests/net/lib/coap_client/CMakeLists.txt
@@ -26,7 +26,7 @@ add_compile_definitions(CONFIG_COAP_CLIENT_MESSAGE_HEADER_SIZE=48)
 add_compile_definitions(CONFIG_COAP_CLIENT_STACK_SIZE=1024)
 add_compile_definitions(CONFIG_COAP_CLIENT_THREAD_PRIORITY=10)
 add_compile_definitions(CONFIG_COAP_LOG_LEVEL=4)
-add_compile_definitions(CONFIG_COAP_INIT_ACK_TIMEOUT_MS=200)
+add_compile_definitions(CONFIG_COAP_INIT_ACK_TIMEOUT_MS=10)
 add_compile_definitions(CONFIG_COAP_CLIENT_MAX_REQUESTS=2)
 add_compile_definitions(CONFIG_COAP_CLIENT_MAX_INSTANCES=2)
 add_compile_definitions(CONFIG_COAP_MAX_RETRANSMIT=4)
diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 665aab30892..b487bdf7d5a 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -377,7 +377,6 @@ ZTEST(coap_client, test_get_request)
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(5));
 	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
@@ -406,7 +405,7 @@ ZTEST(coap_client, test_resend_request)
 	LOG_INF("Send request");
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-	k_sleep(K_MSEC(300));
+	k_sleep(K_MSEC(15));
 	set_socket_events(ZSOCK_POLLIN);
 
 	k_sleep(K_MSEC(100));
@@ -440,7 +439,6 @@ ZTEST(coap_client, test_echo_option)
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(5));
 	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
@@ -471,7 +469,6 @@ ZTEST(coap_client, test_echo_option_next_req)
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(5));
 	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
@@ -486,7 +483,6 @@ ZTEST(coap_client, test_echo_option_next_req)
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(5));
 	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
@@ -540,7 +536,6 @@ ZTEST(coap_client, test_send_large_data)
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(5));
 	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
@@ -574,8 +569,8 @@ ZTEST(coap_client, test_no_response)
 	ret = coap_client_req(&client, 0, &address, &client_request, &params);
 
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-	k_sleep(K_MSEC(300));
 
+	k_sleep(K_MSEC(700));
 	zassert_equal(last_response_code, -ETIMEDOUT, "Unexpected response");
 }
 
@@ -605,9 +600,7 @@ ZTEST(coap_client, test_separate_response)
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(5));
 	k_sleep(K_MSEC(100));
-
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
 
@@ -638,11 +631,9 @@ ZTEST(coap_client, test_multiple_requests)
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
-	k_sleep(K_MSEC(5));
 	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
-	k_sleep(K_MSEC(5));
 	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
@@ -676,9 +667,8 @@ ZTEST(coap_client, test_unmatching_tokens)
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(1));
-	k_sleep(K_MSEC(1));
+	k_sleep(K_MSEC(2));
 	clear_socket_events();
-	k_sleep(K_MSEC(500));
+	k_sleep(K_MSEC(700));
 	zassert_equal(last_response_code, -ETIMEDOUT, "Unexpected response");
 }

From 3b68ab4b691424e368a5b11c5d52e7da0aa45a0d Mon Sep 17 00:00:00 2001
From: Pieter De Gendt <pieter.degendt@basalte.be>
Date: Mon, 30 Sep 2024 13:55:00 +0200
Subject: [PATCH 0558/2913] [nrf fromtree] include: zephyr: net: coap_service:
 Use _CONCAT expansion

Passing MACRO arguments that need expansion require _CONCAT.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
(cherry picked from commit 476c12fddec44c372d7369aa8ee7c255b31157c1)
(cherry picked from commit ce8edeba76cdbc4016dda0244f54a4d6f2f8e534)
---
 include/zephyr/net/coap_service.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/zephyr/net/coap_service.h b/include/zephyr/net/coap_service.h
index 718d1fb1cfc..f5bf3f8405b 100644
--- a/include/zephyr/net/coap_service.h
+++ b/include/zephyr/net/coap_service.h
@@ -59,7 +59,7 @@ struct coap_service {
 };
 
 #define __z_coap_service_define(_name, _host, _port, _flags, _res_begin, _res_end)		\
-	static struct coap_service_data coap_service_data_##_name = {				\
+	static struct coap_service_data _CONCAT(coap_service_data_, _name) = {			\
 		.sock_fd = -1,									\
 	};											\
 	const STRUCT_SECTION_ITERABLE(coap_service, _name) = {					\
@@ -69,7 +69,7 @@ struct coap_service {
 		.flags = _flags,								\
 		.res_begin = (_res_begin),							\
 		.res_end = (_res_end),								\
-		.data = &coap_service_data_##_name,						\
+		.data = &_CONCAT(coap_service_data_, _name),					\
 	}
 
 /** @endcond */
@@ -111,8 +111,8 @@ struct coap_service {
  * @param _service Name of the associated service.
  */
 #define COAP_RESOURCE_DEFINE(_name, _service, ...)						\
-	STRUCT_SECTION_ITERABLE_ALTERNATE(coap_resource_##_service, coap_resource, _name)	\
-		= __VA_ARGS__
+	STRUCT_SECTION_ITERABLE_ALTERNATE(_CONCAT(coap_resource_, _service), coap_resource,	\
+					  _name) = __VA_ARGS__
 
 /**
  * @brief Define a CoAP service with static resources.
@@ -132,11 +132,11 @@ struct coap_service {
  * @param _flags Configuration flags @see @ref COAP_SERVICE_FLAGS.
  */
 #define COAP_SERVICE_DEFINE(_name, _host, _port, _flags)					\
-	extern struct coap_resource _CONCAT(_coap_resource_##_name, _list_start)[];		\
-	extern struct coap_resource _CONCAT(_coap_resource_##_name, _list_end)[];		\
+	extern struct coap_resource _CONCAT(_CONCAT(_coap_resource_, _name), _list_start)[];	\
+	extern struct coap_resource _CONCAT(_CONCAT(_coap_resource_, _name), _list_end)[];	\
 	__z_coap_service_define(_name, _host, _port, _flags,					\
-				&_CONCAT(_coap_resource_##_name, _list_start)[0],		\
-				&_CONCAT(_coap_resource_##_name, _list_end)[0])
+				&_CONCAT(_CONCAT(_coap_resource_, _name), _list_start)[0],	\
+				&_CONCAT(_CONCAT(_coap_resource_, _name), _list_end)[0])
 
 /**
  * @brief Count the number of CoAP services.
@@ -177,7 +177,7 @@ struct coap_service {
  * @param _it Name of iterator (of type @ref coap_resource)
  */
 #define COAP_RESOURCE_FOREACH(_service, _it)							\
-	STRUCT_SECTION_FOREACH_ALTERNATE(coap_resource_##_service, coap_resource, _it)
+	STRUCT_SECTION_FOREACH_ALTERNATE(_CONCAT(coap_resource_, _service), coap_resource, _it)
 
 /**
  * @brief Iterate over all static resources associated with @p _service .

From 3ce3d7f4e2c3059271ee492e585f3c3f7cbaa43d Mon Sep 17 00:00:00 2001
From: Francois Gervais <francoisgervais@gmail.com>
Date: Sat, 28 Sep 2024 08:43:57 -0400
Subject: [PATCH 0559/2913] [nrf fromtree] tests: coap_client: optimize/reduce
 sleep time

The goal of this commit is to reduce the overall test time by optimizing
the time spent sleeping.

However while doing so, a few glitches became apparent and those have
been fixed as well.

1. The way the ZSOCK_POLLIN event is managed has been modified

In most tests, the event would stick for the whole test and this would
sometimes results in the client receiving more data than intended which
in turn would results in various unexpected warnings and errors.

The management of the ZSOCK_POLLIN event has now been mostly moved to
the send/receive overrides which better represent how things would
happen outside of the test scenario.

For example, when sending data, if this send would normally result in
receiving some response, the send function sets the ZSOCK_POLLIN event.
Then when receiving, we clear the event as the data has been received.

There are a few exceptions to this for cases where we need to simulate
some specific abnormal behavior.

2. The `messages_needing_response` queue now includes a valid bit

The test manages a queue of messages id to be able to respond to the
correct id in the receive hooks.

It was built in a way that the id 0 would be treated as invalid
although it is a valid id.
In practice, it would not be an issue in most cases however, it would
result in an unexpected behavior if the `test_multiple_requests` test
would be run first.

To fix this issue in the simplest way, the queue has been changed to
uint32_t which gives us 16 extra bits for the management of the queue,
1 of which is used to tell if the entry is valid or not.

Signed-off-by: Francois Gervais <francoisgervais@gmail.com>
(cherry picked from commit 736344b31093beb158b65839ce21f09573e20604)
(cherry picked from commit 6983b3cbd6c6ca0a462c4128f58cd88cebce5a7f)
---
 tests/net/lib/coap_client/src/main.c  | 311 +++++++++++++-------------
 tests/net/lib/coap_client/src/stubs.c |   9 +-
 2 files changed, 156 insertions(+), 164 deletions(-)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index b487bdf7d5a..25c2c58f2fd 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -16,87 +16,123 @@ LOG_MODULE_REGISTER(coap_client_test);
 DEFINE_FFF_GLOBALS;
 #define FFF_FAKES_LIST(FAKE)
 
+#define LONG_ACK_TIMEOUT_MS                 200
+#define MORE_THAN_EXCHANGE_LIFETIME_MS      4 * CONFIG_COAP_INIT_ACK_TIMEOUT_MS
+#define MORE_THAN_LONG_EXCHANGE_LIFETIME_MS 4 * LONG_ACK_TIMEOUT_MS
+#define MORE_THAN_ACK_TIMEOUT_MS                                                                   \
+	(CONFIG_COAP_INIT_ACK_TIMEOUT_MS + CONFIG_COAP_INIT_ACK_TIMEOUT_MS / 2)
+
+#define VALID_MESSAGE_ID BIT(31)
+
 static int16_t last_response_code;
 static const char *test_path = "test";
 
-static uint16_t messages_needing_response[2];
+static uint32_t messages_needing_response[2];
 
 static struct coap_client client;
 
 static char *short_payload = "testing";
 static char *long_payload = LOREM_IPSUM_SHORT;
 
+static uint16_t get_next_pending_message_id(void)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(messages_needing_response); i++) {
+		if (messages_needing_response[i] & VALID_MESSAGE_ID) {
+			messages_needing_response[i] &= ~VALID_MESSAGE_ID;
+			return messages_needing_response[i];
+		}
+	}
+
+	return UINT16_MAX;
+}
+
+static void set_next_pending_message_id(uint16_t id)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(messages_needing_response); i++) {
+		if (!(messages_needing_response[i] & VALID_MESSAGE_ID)) {
+			messages_needing_response[i] = id;
+			messages_needing_response[i] |= VALID_MESSAGE_ID;
+			return;
+		}
+	}
+}
+
 static ssize_t z_impl_zsock_recvfrom_custom_fake(int sock, void *buf, size_t max_len, int flags,
-					  struct sockaddr *src_addr, socklen_t *addrlen)
+						 struct sockaddr *src_addr, socklen_t *addrlen)
 {
 	uint16_t last_message_id = 0;
 
 	LOG_INF("Recvfrom");
-	uint8_t ack_data[] = {
-		0x68, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	};
+	uint8_t ack_data[] = {0x68, 0x40, 0x00, 0x00, 0x00, 0x00,
+			      0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-	if (messages_needing_response[0] != 0) {
-		last_message_id = messages_needing_response[0];
-		messages_needing_response[0] = 0;
-	} else {
-		last_message_id = messages_needing_response[1];
-		messages_needing_response[1] = 0;
-	}
+	last_message_id = get_next_pending_message_id();
 
-	ack_data[2] = (uint8_t) (last_message_id >> 8);
-	ack_data[3] = (uint8_t) last_message_id;
+	ack_data[2] = (uint8_t)(last_message_id >> 8);
+	ack_data[3] = (uint8_t)last_message_id;
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
+	clear_socket_events();
+
 	return sizeof(ack_data);
 }
 
-static ssize_t z_impl_zsock_sendto_custom_fake(int sock, void *buf, size_t len,
-			       int flags, const struct sockaddr *dest_addr,
-			       socklen_t addrlen)
+static ssize_t z_impl_zsock_sendto_custom_fake(int sock, void *buf, size_t len, int flags,
+					       const struct sockaddr *dest_addr, socklen_t addrlen)
 {
 	uint16_t last_message_id = 0;
+	uint8_t type;
+
+	last_message_id |= ((uint8_t *)buf)[2] << 8;
+	last_message_id |= ((uint8_t *)buf)[3];
 
-	last_message_id |= ((uint8_t *) buf)[2] << 8;
-	last_message_id |= ((uint8_t *) buf)[3];
+	type = (((uint8_t *)buf)[0] & 0x30) >> 4;
 
-	if (messages_needing_response[0] == 0) {
-		messages_needing_response[0] = last_message_id;
-	} else {
-		messages_needing_response[1] = last_message_id;
+	set_next_pending_message_id(last_message_id);
+	LOG_INF("Latest message ID: %d", last_message_id);
+
+	if (type == 0) {
+		set_socket_events(ZSOCK_POLLIN);
 	}
 
-	last_response_code = ((uint8_t *) buf)[1];
+	return 1;
+}
 
+static ssize_t z_impl_zsock_sendto_custom_fake_no_reply(int sock, void *buf, size_t len, int flags,
+							const struct sockaddr *dest_addr,
+							socklen_t addrlen)
+{
+	uint16_t last_message_id = 0;
+
+	last_message_id |= ((uint8_t *)buf)[2] << 8;
+	last_message_id |= ((uint8_t *)buf)[3];
+
+	set_next_pending_message_id(last_message_id);
 	LOG_INF("Latest message ID: %d", last_message_id);
 
 	return 1;
 }
 
-static ssize_t z_impl_zsock_sendto_custom_fake_echo(int sock, void *buf, size_t len,
-			       int flags, const struct sockaddr *dest_addr,
-			       socklen_t addrlen)
+static ssize_t z_impl_zsock_sendto_custom_fake_echo(int sock, void *buf, size_t len, int flags,
+						    const struct sockaddr *dest_addr,
+						    socklen_t addrlen)
 {
 	uint16_t last_message_id = 0;
 	struct coap_packet response = {0};
 	struct coap_option option = {0};
 
-	last_message_id |= ((uint8_t *) buf)[2] << 8;
-	last_message_id |= ((uint8_t *) buf)[3];
-
-	if (messages_needing_response[0] == 0) {
-		messages_needing_response[0] = last_message_id;
-	} else {
-		messages_needing_response[1] = last_message_id;
-	}
-
-	last_response_code = ((uint8_t *) buf)[1];
+	last_message_id |= ((uint8_t *)buf)[2] << 8;
+	last_message_id |= ((uint8_t *)buf)[3];
 
+	set_next_pending_message_id(last_message_id);
 	LOG_INF("Latest message ID: %d", last_message_id);
 
 	int ret = coap_packet_parse(&response, buf, len, NULL, 0);
-
 	if (ret < 0) {
 		LOG_ERR("Invalid data received");
 	}
@@ -108,32 +144,27 @@ static ssize_t z_impl_zsock_sendto_custom_fake_echo(int sock, void *buf, size_t
 
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake;
 
+	set_socket_events(ZSOCK_POLLIN);
+
 	return 1;
 }
 
 static ssize_t z_impl_zsock_sendto_custom_fake_echo_next_req(int sock, void *buf, size_t len,
-			       int flags, const struct sockaddr *dest_addr,
-			       socklen_t addrlen)
+							     int flags,
+							     const struct sockaddr *dest_addr,
+							     socklen_t addrlen)
 {
 	uint16_t last_message_id = 0;
 	struct coap_packet response = {0};
 	struct coap_option option = {0};
 
-	last_message_id |= ((uint8_t *) buf)[2] << 8;
-	last_message_id |= ((uint8_t *) buf)[3];
-
-	if (messages_needing_response[0] == 0) {
-		messages_needing_response[0] = last_message_id;
-	} else {
-		messages_needing_response[1] = last_message_id;
-	}
-
-	last_response_code = ((uint8_t *) buf)[1];
+	last_message_id |= ((uint8_t *)buf)[2] << 8;
+	last_message_id |= ((uint8_t *)buf)[3];
 
+	set_next_pending_message_id(last_message_id);
 	LOG_INF("Latest message ID: %d", last_message_id);
 
 	int ret = coap_packet_parse(&response, buf, len, NULL, 0);
-
 	if (ret < 0) {
 		LOG_ERR("Invalid data received");
 	}
@@ -153,6 +184,8 @@ static ssize_t z_impl_zsock_sendto_custom_fake_echo_next_req(int sock, void *buf
 
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake;
 
+	set_socket_events(ZSOCK_POLLIN);
+
 	return 1;
 }
 
@@ -162,50 +195,17 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_response(int sock, void *buf, s
 {
 	uint16_t last_message_id = 0;
 
-	static uint8_t ack_data[] = {
-		0x48, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	};
+	static uint8_t ack_data[] = {0x48, 0x40, 0x00, 0x00, 0x00, 0x00,
+				     0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-	if (messages_needing_response[0] != 0) {
-		last_message_id = messages_needing_response[0];
-		messages_needing_response[0] = 0;
-	} else {
-		last_message_id = messages_needing_response[1];
-		messages_needing_response[1] = 0;
-	}
+	last_message_id = get_next_pending_message_id();
 
-	ack_data[2] = (uint8_t) (last_message_id >> 8);
-	ack_data[3] = (uint8_t) last_message_id;
+	ack_data[2] = (uint8_t)(last_message_id >> 8);
+	ack_data[3] = (uint8_t)last_message_id;
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
-	return sizeof(ack_data);
-}
-
-static ssize_t z_impl_zsock_recvfrom_custom_fake_delayed_response(int sock, void *buf,
-								  size_t max_len, int flags,
-								  struct sockaddr *src_addr,
-								  socklen_t *addrlen)
-{
-	uint16_t last_message_id = 0;
-
-	static uint8_t ack_data[] = {
-		0x68, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	};
-
-	if (messages_needing_response[0] != 0) {
-		last_message_id = messages_needing_response[0];
-		messages_needing_response[0] = 0;
-	} else {
-		last_message_id = messages_needing_response[1];
-		messages_needing_response[1] = 0;
-	}
-
-	ack_data[2] = (uint8_t) (last_message_id >> 8);
-	ack_data[3] = (uint8_t) last_message_id;
-
-	memcpy(buf, ack_data, sizeof(ack_data));
-	k_sleep(K_MSEC(10));
+	clear_socket_events();
 
 	return sizeof(ack_data);
 }
@@ -216,20 +216,13 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_empty_ack(int sock, void *buf,
 {
 	uint16_t last_message_id = 0;
 
-	static uint8_t ack_data[] = {
-		0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	};
+	static uint8_t ack_data[] = {0x68, 0x00, 0x00, 0x00, 0x00, 0x00,
+				     0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-	if (messages_needing_response[0] != 0) {
-		last_message_id = messages_needing_response[0];
-		messages_needing_response[0] = 0;
-	} else {
-		last_message_id = messages_needing_response[1];
-		messages_needing_response[1] = 0;
-	}
+	last_message_id = get_next_pending_message_id();
 
-	ack_data[2] = (uint8_t) (last_message_id >> 8);
-	ack_data[3] = (uint8_t) last_message_id;
+	ack_data[2] = (uint8_t)(last_message_id >> 8);
+	ack_data[3] = (uint8_t)last_message_id;
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
@@ -244,23 +237,18 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_unmatching(int sock, void *buf,
 {
 	uint16_t last_message_id = 0;
 
-	static uint8_t ack_data[] = {
-		0x68, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
-	};
+	static uint8_t ack_data[] = {0x68, 0x40, 0x00, 0x00, 0x00, 0x00,
+				     0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
 
-	if (messages_needing_response[0] != 0) {
-		last_message_id = messages_needing_response[0];
-		messages_needing_response[0] = 0;
-	} else {
-		last_message_id = messages_needing_response[1];
-		messages_needing_response[1] = 0;
-	}
+	last_message_id = get_next_pending_message_id();
 
-	ack_data[2] = (uint8_t) (last_message_id >> 8);
-	ack_data[3] = (uint8_t) last_message_id;
+	ack_data[2] = (uint8_t)(last_message_id >> 8);
+	ack_data[3] = (uint8_t)last_message_id;
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
+	clear_socket_events();
+
 	return sizeof(ack_data);
 }
 
@@ -275,22 +263,18 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_echo(int sock, void *buf, size_
 			      0x00, 0x00, 0x00, 0x00, 0xda, 0xef, 'e',  'c',
 			      'h',  'o',  '_',  'v',  'a',  'l',  'u',  'e'};
 
-	if (messages_needing_response[0] != 0) {
-		last_message_id = messages_needing_response[0];
-		messages_needing_response[0] = 0;
-	} else {
-		last_message_id = messages_needing_response[1];
-		messages_needing_response[1] = 0;
-	}
+	last_message_id = get_next_pending_message_id();
 
-	ack_data[2] = (uint8_t) (last_message_id >> 8);
-	ack_data[3] = (uint8_t) last_message_id;
+	ack_data[2] = (uint8_t)(last_message_id >> 8);
+	ack_data[3] = (uint8_t)last_message_id;
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_response;
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_echo;
 
+	clear_socket_events();
+
 	return sizeof(ack_data);
 }
 
@@ -305,22 +289,18 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_echo_next_req(int sock, void *b
 			      0x00, 0x00, 0x00, 0x00, 0xda, 0xef, 'e',  'c',
 			      'h',  'o',  '_',  'v',  'a',  'l',  'u',  'e'};
 
-	if (messages_needing_response[0] != 0) {
-		last_message_id = messages_needing_response[0];
-		messages_needing_response[0] = 0;
-	} else {
-		last_message_id = messages_needing_response[1];
-		messages_needing_response[1] = 0;
-	}
+	last_message_id = get_next_pending_message_id();
 
-	ack_data[2] = (uint8_t) (last_message_id >> 8);
-	ack_data[3] = (uint8_t) last_message_id;
+	ack_data[2] = (uint8_t)(last_message_id >> 8);
+	ack_data[3] = (uint8_t)last_message_id;
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_response;
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_echo_next_req;
 
+	clear_socket_events();
+
 	return sizeof(ack_data);
 }
 
@@ -333,6 +313,8 @@ static void *suite_setup(void)
 
 static void test_setup(void *data)
 {
+	int i;
+
 	/* Register resets */
 	DO_FOREACH_FAKE(RESET_FAKE);
 	/* reset common FFF internal structures */
@@ -340,8 +322,12 @@ static void test_setup(void *data)
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake;
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake;
-	messages_needing_response[0] = 0;
-	messages_needing_response[1] = 0;
+
+	for (i = 0; i < ARRAY_SIZE(messages_needing_response); i++) {
+		messages_needing_response[i] = 0;
+	}
+
+	last_response_code = 0;
 }
 
 void coap_callback(int16_t code, size_t offset, const uint8_t *payload, size_t len, bool last_block,
@@ -375,10 +361,10 @@ ZTEST(coap_client, test_get_request)
 	LOG_INF("Send request");
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(100));
+	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
+	LOG_INF("Test done");
 }
 
 ZTEST(coap_client, test_resend_request)
@@ -398,19 +384,20 @@ ZTEST(coap_client, test_resend_request)
 	client_request.payload = short_payload;
 	client_request.len = strlen(short_payload);
 
-	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_delayed_response;
+	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
 
 	k_sleep(K_MSEC(1));
 
 	LOG_INF("Send request");
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-	k_sleep(K_MSEC(15));
+	k_sleep(K_MSEC(MORE_THAN_ACK_TIMEOUT_MS));
 	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(100));
+	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 	zassert_equal(z_impl_zsock_sendto_fake.call_count, 2);
+	LOG_INF("Test done");
 }
 
 ZTEST(coap_client, test_echo_option)
@@ -437,10 +424,10 @@ ZTEST(coap_client, test_echo_option)
 	LOG_INF("Send request");
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(100));
+	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
+	LOG_INF("Test done");
 }
 
 ZTEST(coap_client, test_echo_option_next_req)
@@ -467,9 +454,8 @@ ZTEST(coap_client, test_echo_option_next_req)
 	LOG_INF("Send request");
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(100));
+	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
 	char *payload = "echo testing";
@@ -481,9 +467,8 @@ ZTEST(coap_client, test_echo_option_next_req)
 	LOG_INF("Send next request");
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(100));
+	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
 
@@ -534,9 +519,8 @@ ZTEST(coap_client, test_send_large_data)
 	LOG_INF("Send request");
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(100));
+	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
 
@@ -554,7 +538,7 @@ ZTEST(coap_client, test_no_response)
 		.len = 0
 	};
 	struct coap_transmission_parameters params = {
-		.ack_timeout = 200,
+		.ack_timeout = LONG_ACK_TIMEOUT_MS,
 		.coap_backoff_percent = 200,
 		.max_retransmission = 0
 	};
@@ -562,15 +546,16 @@ ZTEST(coap_client, test_no_response)
 	client_request.payload = short_payload;
 	client_request.len = strlen(short_payload);
 
+	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
+
 	k_sleep(K_MSEC(1));
 
 	LOG_INF("Send request");
-	clear_socket_events();
 	ret = coap_client_req(&client, 0, &address, &client_request, &params);
 
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
-	k_sleep(K_MSEC(700));
+	k_sleep(K_MSEC(MORE_THAN_LONG_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, -ETIMEDOUT, "Unexpected response");
 }
 
@@ -598,15 +583,16 @@ ZTEST(coap_client, test_separate_response)
 	LOG_INF("Send request");
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(100));
+	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
 
 ZTEST(coap_client, test_multiple_requests)
 {
 	int ret = 0;
+	int retry = MORE_THAN_EXCHANGE_LIFETIME_MS;
+
 	struct sockaddr address = {0};
 	struct coap_client_request client_request = {
 		.method = COAP_METHOD_GET,
@@ -621,8 +607,9 @@ ZTEST(coap_client, test_multiple_requests)
 	client_request.payload = short_payload;
 	client_request.len = strlen(short_payload);
 
+	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
+
 	k_sleep(K_MSEC(1));
-	set_socket_events(ZSOCK_POLLIN);
 
 	LOG_INF("Send request");
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
@@ -631,10 +618,15 @@ ZTEST(coap_client, test_multiple_requests)
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
-	k_sleep(K_MSEC(100));
+	set_socket_events(ZSOCK_POLLIN);
+	while (last_response_code == 0 && retry > 0) {
+		retry--;
+		k_sleep(K_MSEC(1));
+	}
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
-	k_sleep(K_MSEC(100));
+	set_socket_events(ZSOCK_POLLIN);
+	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
 
@@ -652,7 +644,7 @@ ZTEST(coap_client, test_unmatching_tokens)
 		.len = 0
 	};
 	struct coap_transmission_parameters params = {
-		.ack_timeout = 200,
+		.ack_timeout = LONG_ACK_TIMEOUT_MS,
 		.coap_backoff_percent = 200,
 		.max_retransmission = 0
 	};
@@ -662,13 +654,12 @@ ZTEST(coap_client, test_unmatching_tokens)
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_unmatching;
 
+	k_sleep(K_MSEC(1));
+
 	LOG_INF("Send request");
 	ret = coap_client_req(&client, 0, &address, &client_request, &params);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(2));
-	clear_socket_events();
-	k_sleep(K_MSEC(700));
+	k_sleep(K_MSEC(MORE_THAN_LONG_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, -ETIMEDOUT, "Unexpected response");
 }
diff --git a/tests/net/lib/coap_client/src/stubs.c b/tests/net/lib/coap_client/src/stubs.c
index 13effd8f91b..471cc8642bc 100644
--- a/tests/net/lib/coap_client/src/stubs.c
+++ b/tests/net/lib/coap_client/src/stubs.c
@@ -13,7 +13,7 @@ DEFINE_FAKE_VALUE_FUNC(uint32_t, z_impl_sys_rand32_get);
 DEFINE_FAKE_VOID_FUNC(z_impl_sys_rand_get, void *, size_t);
 DEFINE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_recvfrom, int, void *, size_t, int, struct sockaddr *,
 		       socklen_t *);
-DEFINE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_sendto, int, void*, size_t, int,
+DEFINE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_sendto, int, void *, size_t, int,
 		       const struct sockaddr *, socklen_t);
 
 struct zsock_pollfd {
@@ -42,11 +42,12 @@ int z_impl_zsock_socket(int family, int type, int proto)
 int z_impl_zsock_poll(struct zsock_pollfd *fds, int nfds, int poll_timeout)
 {
 	LOG_INF("Polling, events %d", my_events);
-	k_sleep(K_MSEC(10));
+	k_sleep(K_MSEC(1));
 	fds->revents = my_events;
+
 	if (my_events) {
 		return 1;
-	} else {
-		return 0;
 	}
+
+	return 0;
 }

From aa630f05b2ba65ee1e202f80c2a3d495b4099969 Mon Sep 17 00:00:00 2001
From: Adrian Friedli <adrian.friedli@husqvarnagroup.com>
Date: Thu, 26 Sep 2024 15:12:00 +0200
Subject: [PATCH 0560/2913] [nrf fromtree] net: lib: coap: make ACK random
 factor runtime configurable

Extend the `coap_transmission_parameters` struct with the field
`ack_random_percent`. This was the last remaining CoAP transmission
parameter that was not configurable at runtime.

Signed-off-by: Adrian Friedli <adrian.friedli@husqvarnagroup.com>
(cherry picked from commit 98289e594ded291a934b32c8b0672d095e7ffe7d)
(cherry picked from commit adb4d33b28ad904a6af4abd2ce4eb229ee486683)
---
 include/zephyr/net/coap.h     | 9 ++++++++-
 subsys/net/lib/coap/coap.c    | 8 ++++++--
 tests/net/lib/coap/src/main.c | 6 ++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/include/zephyr/net/coap.h b/include/zephyr/net/coap.h
index bf0d86cfaf7..7a0c7ee7f91 100644
--- a/include/zephyr/net/coap.h
+++ b/include/zephyr/net/coap.h
@@ -355,8 +355,15 @@ typedef int (*coap_reply_t)(const struct coap_packet *response,
  * @brief CoAP transmission parameters.
  */
 struct coap_transmission_parameters {
-	/**  Initial ACK timeout. Value is used as a base value to retry pending CoAP packets. */
+	/** Initial ACK timeout. Value is used as a base value to retry pending CoAP packets. */
 	uint32_t ack_timeout;
+#if defined(CONFIG_COAP_RANDOMIZE_ACK_TIMEOUT) || defined(__DOXYGEN__)
+	/**
+	 * Set CoAP ack random factor. A value of 150 means a factor of 1.5. A value of 0 defaults
+	 * to @kconfig{CONFIG_COAP_ACK_RANDOM_PERCENT}. The value must be >= 100.
+	 */
+	uint16_t ack_random_percent;
+#endif /* defined(CONFIG_COAP_RANDOMIZE_ACK_TIMEOUT) */
 	/** Set CoAP retry backoff factor. A value of 200 means a factor of 2.0. */
 	uint16_t coap_backoff_percent;
 	/** Maximum number of retransmissions. */
diff --git a/subsys/net/lib/coap/coap.c b/subsys/net/lib/coap/coap.c
index c557f3c424b..25ad262c923 100644
--- a/subsys/net/lib/coap/coap.c
+++ b/subsys/net/lib/coap/coap.c
@@ -59,6 +59,9 @@ static uint16_t message_id;
 static struct coap_transmission_parameters coap_transmission_params = {
 	.max_retransmission = CONFIG_COAP_MAX_RETRANSMIT,
 	.ack_timeout = CONFIG_COAP_INIT_ACK_TIMEOUT_MS,
+#if defined(CONFIG_COAP_RANDOMIZE_ACK_TIMEOUT)
+	.ack_random_percent = CONFIG_COAP_ACK_RANDOM_PERCENT,
+#endif /* defined(CONFIG_COAP_RANDOMIZE_ACK_TIMEOUT) */
 	.coap_backoff_percent = CONFIG_COAP_BACKOFF_PERCENT
 };
 
@@ -1706,8 +1709,9 @@ struct coap_pending *coap_pending_next_to_expire(
 static uint32_t init_ack_timeout(const struct coap_transmission_parameters *params)
 {
 #if defined(CONFIG_COAP_RANDOMIZE_ACK_TIMEOUT)
-	const uint32_t max_ack = params->ack_timeout *
-				 CONFIG_COAP_ACK_RANDOM_PERCENT / 100;
+	const uint16_t random_percent = params->ack_random_percent ? params->ack_random_percent
+								   : CONFIG_COAP_ACK_RANDOM_PERCENT;
+	const uint32_t max_ack = params->ack_timeout * random_percent / 100U;
 	const uint32_t min_ack = params->ack_timeout;
 
 	/* Randomly generated initial ACK timeout
diff --git a/tests/net/lib/coap/src/main.c b/tests/net/lib/coap/src/main.c
index 18012cc7873..10c7cef1d2c 100644
--- a/tests/net/lib/coap/src/main.c
+++ b/tests/net/lib/coap/src/main.c
@@ -1750,12 +1750,15 @@ ZTEST(coap, test_transmission_parameters)
 
 	params = coap_get_transmission_parameters();
 	zassert_equal(params.ack_timeout, CONFIG_COAP_INIT_ACK_TIMEOUT_MS, "Wrong ACK timeout");
+	zassert_equal(params.ack_random_percent, CONFIG_COAP_ACK_RANDOM_PERCENT,
+		      "Wrong ACK random percent");
 	zassert_equal(params.coap_backoff_percent, CONFIG_COAP_BACKOFF_PERCENT,
 		      "Wrong backoff percent");
 	zassert_equal(params.max_retransmission, CONFIG_COAP_MAX_RETRANSMIT,
 		      "Wrong max retransmission value");
 
 	params.ack_timeout = 1000;
+	params.ack_random_percent = 110;
 	params.coap_backoff_percent = 150;
 	params.max_retransmission = 2;
 
@@ -1772,6 +1775,7 @@ ZTEST(coap, test_transmission_parameters)
 	zassert_not_null(pending, "No free pending");
 
 	params.ack_timeout = 3000;
+	params.ack_random_percent = 130;
 	params.coap_backoff_percent = 250;
 	params.max_retransmission = 3;
 
@@ -1780,6 +1784,7 @@ ZTEST(coap, test_transmission_parameters)
 	zassert_equal(r, 0, "Could not initialize packet");
 
 	zassert_equal(pending->params.ack_timeout, 3000, "Wrong ACK timeout");
+	zassert_equal(pending->params.ack_random_percent, 130, "Wrong ACK random percent");
 	zassert_equal(pending->params.coap_backoff_percent, 250, "Wrong backoff percent");
 	zassert_equal(pending->params.max_retransmission, 3, "Wrong max retransmission value");
 
@@ -1788,6 +1793,7 @@ ZTEST(coap, test_transmission_parameters)
 	zassert_equal(r, 0, "Could not initialize packet");
 
 	zassert_equal(pending->params.ack_timeout, 1000, "Wrong ACK timeout");
+	zassert_equal(pending->params.ack_random_percent, 110, "Wrong ACK random percent");
 	zassert_equal(pending->params.coap_backoff_percent, 150, "Wrong backoff percent");
 	zassert_equal(pending->params.max_retransmission, 2, "Wrong max retransmission value");
 }

From 69d77ff432f98de07429c09fd46f96cc0d80ec96 Mon Sep 17 00:00:00 2001
From: Benjamin Lindqvist <benjamin@eub.se>
Date: Wed, 23 Oct 2024 14:26:25 +0200
Subject: [PATCH 0561/2913] [nrf fromtree] net: coap_client: signal socket
 error to user

Before this patch, any unexpected socket error during poll (caused by
LTE disconnects for instance) would lead to a infinite loop because the
error state was never cleared, handled or even signaled to the user.

Signed-off-by: Benjamin Lindqvist <benjamin@eub.se>
(cherry picked from commit f8a7035c0aa289a391fbc848998b4d03dc5e530e)
(cherry picked from commit c5074d7413da295193d414ac3d693846da0ac44b)
---
 include/zephyr/net/coap_client.h  |  1 +
 subsys/net/lib/coap/coap_client.c | 30 +++++++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/include/zephyr/net/coap_client.h b/include/zephyr/net/coap_client.h
index a4f35374c93..00b97af60af 100644
--- a/include/zephyr/net/coap_client.h
+++ b/include/zephyr/net/coap_client.h
@@ -115,6 +115,7 @@ struct coap_client {
 	struct coap_client_internal_request requests[CONFIG_COAP_CLIENT_MAX_REQUESTS];
 	struct coap_option echo_option;
 	bool send_echo;
+	int socket_error;
 };
 /** @endcond */
 
diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index e841a1998dc..24b1767fea5 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -550,19 +550,24 @@ static int handle_poll(void)
 
 		} else {
 			for (int i = 0; i < nfds; i++) {
+
 				if (fds[i].revents & ZSOCK_POLLERR) {
 					LOG_ERR("Error in poll for socket %d", fds[i].fd);
+					clients[i]->socket_error = -EIO;
 				}
 				if (fds[i].revents & ZSOCK_POLLHUP) {
 					LOG_ERR("Error in poll: POLLHUP for socket %d", fds[i].fd);
+					clients[i]->socket_error = -ENOTCONN;
 				}
 				if (fds[i].revents & ZSOCK_POLLNVAL) {
 					LOG_ERR("Error in poll: POLLNVAL - fd %d not open",
 						fds[i].fd);
+					clients[i]->socket_error = -EINVAL;
 				}
 				if (fds[i].revents & ZSOCK_POLLIN) {
 					clients[i]->response_ready = true;
 				}
+
 			}
 
 			return 0;
@@ -918,7 +923,24 @@ void coap_client_cancel_requests(struct coap_client *client)
 	k_sleep(K_MSEC(COAP_PERIODIC_TIMEOUT));
 }
 
-static void coap_client_recv(void *coap_cl, void *a, void *b)
+static void signal_socket_error(struct coap_client *cli)
+{
+	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
+		struct coap_client_internal_request *req = &cli->requests[i];
+
+		if (!req->request_ongoing) {
+			continue;
+		}
+
+		req->request_ongoing = false;
+		if (req->coap_request.cb) {
+			req->coap_request.cb(cli->socket_error, 0, NULL, 0,
+					     true, req->coap_request.user_data);
+		}
+	}
+}
+
+void coap_client_recv(void *coap_cl, void *a, void *b)
 {
 	int ret;
 
@@ -959,6 +981,12 @@ static void coap_client_recv(void *coap_cl, void *a, void *b)
 				clients[i]->response_ready = false;
 				k_mutex_unlock(&clients[i]->lock);
 			}
+
+			if (clients[i]->socket_error) {
+				signal_socket_error(clients[i]);
+				clients[i]->socket_error = 0;
+			}
+
 		}
 
 		/* There are more messages coming */

From ac333fc51bef57534b46fd0f7d64543d6e939552 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Wed, 23 Oct 2024 16:41:17 +0300
Subject: [PATCH 0562/2913] [nrf fromtree] net: lib: coap_client: Protect
 initialization with mutex

Protect global list of clients with mutex.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 1ea569d7764a3b12fe9cd5841ee6c9b73bad7a5b)
(cherry picked from commit a75540ee554da265bbadea1897116c56f5e394c2)
---
 subsys/net/lib/coap/coap_client.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 24b1767fea5..bfe6aa323cf 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -20,6 +20,7 @@ LOG_MODULE_DECLARE(net_coap, CONFIG_COAP_LOG_LEVEL);
 #define BLOCK1_OPTION_SIZE 4
 #define PAYLOAD_MARKER_SIZE 1
 
+static K_MUTEX_DEFINE(coap_client_mutex);
 static struct coap_client *clients[CONFIG_COAP_CLIENT_MAX_INSTANCES];
 static int num_clients;
 static K_SEM_DEFINE(coap_client_recv_sem, 0, 1);
@@ -1006,7 +1007,9 @@ int coap_client_init(struct coap_client *client, const char *info)
 		return -EINVAL;
 	}
 
+	k_mutex_lock(&coap_client_mutex, K_FOREVER);
 	if (num_clients >= CONFIG_COAP_CLIENT_MAX_INSTANCES) {
+		k_mutex_unlock(&coap_client_mutex);
 		return -ENOSPC;
 	}
 
@@ -1015,6 +1018,7 @@ int coap_client_init(struct coap_client *client, const char *info)
 	clients[num_clients] = client;
 	num_clients++;
 
+	k_mutex_unlock(&coap_client_mutex);
 	return 0;
 }
 

From 2f805a195833fb05bd2197408292194fd83227c7 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Wed, 23 Oct 2024 16:42:41 +0300
Subject: [PATCH 0563/2913] [nrf fromtree] net: lib: coap_client: Release
 internal request when failed to send

When transmission of first request fails, reset the internal request
buffer as there is no ongoing CoAP transaction.

Application can deal with the failure.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 46b7c8451291cb88ee72d22b367ff1b70062aca5)
(cherry picked from commit 42a691bc3411f382c5840cbf4d470dd79da09db8)
---
 subsys/net/lib/coap/coap_client.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index bfe6aa323cf..d7cfcdd680e 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -69,6 +69,7 @@ static void reset_internal_request(struct coap_client_internal_request *request)
 	request->offset = 0;
 	request->last_id = 0;
 	request->last_response_id = -1;
+	request->request_ongoing = false;
 	reset_block_contexts(request);
 }
 
@@ -426,6 +427,7 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
 			  &client->address, client->socklen);
 	if (ret < 0) {
 		LOG_ERR("Transmission failed: %d", errno);
+		reset_internal_request(internal_req);
 	} else {
 		/* Do not return the number of bytes sent */
 		ret = 0;

From f4cab744bdd198c0787ba25f71721f3ac23fb4b1 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Thu, 24 Oct 2024 13:25:37 +0300
Subject: [PATCH 0564/2913] [nrf fromtree] net: lib: coap_client: check poll()
 condition before retrying CoAP msg

Refactor the CoAP retry handling into the handle_poll() function,
so that we only try to send retries if the socket reports POLLOUT.

Also move the receiving into same loop, so when poll() reports POLLIN
we recv() the message and handle it before proceeding to other sockets.

Also fix tests to handle POLLOUT flag and add support for testing
multiple clients.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 4c6dd4c7b7d0d3dc75a6d4800beabb176ffec85b)
(cherry picked from commit a10fdc4fb523ca34804c0e3b66aab2181c85f385)
---
 include/zephyr/net/coap_client.h         |   2 -
 subsys/net/lib/coap/coap_client.c        | 204 +++++++++--------------
 tests/net/lib/coap_client/CMakeLists.txt |   1 +
 tests/net/lib/coap_client/src/main.c     |  94 +++++++++--
 tests/net/lib/coap_client/src/stubs.c    |  17 +-
 tests/net/lib/coap_client/src/stubs.h    |  23 ++-
 6 files changed, 194 insertions(+), 147 deletions(-)

diff --git a/include/zephyr/net/coap_client.h b/include/zephyr/net/coap_client.h
index 00b97af60af..90a691de4e9 100644
--- a/include/zephyr/net/coap_client.h
+++ b/include/zephyr/net/coap_client.h
@@ -108,14 +108,12 @@ struct coap_client {
 	int fd;
 	struct sockaddr address;
 	socklen_t socklen;
-	bool response_ready;
 	struct k_mutex lock;
 	uint8_t send_buf[MAX_COAP_MSG_LEN];
 	uint8_t recv_buf[MAX_COAP_MSG_LEN];
 	struct coap_client_internal_request requests[CONFIG_COAP_CLIENT_MAX_REQUESTS];
 	struct coap_option echo_option;
 	bool send_echo;
-	int socket_error;
 };
 /** @endcond */
 
diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index d7cfcdd680e..896161b1a75 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -26,6 +26,13 @@ static int num_clients;
 static K_SEM_DEFINE(coap_client_recv_sem, 0, 1);
 static atomic_t coap_client_recv_active;
 
+static bool timeout_expired(struct coap_client_internal_request *internal_req);
+static void cancel_requests_with(struct coap_client *client, int error);
+static int recv_response(struct coap_client *client, struct coap_packet *response, bool *truncated);
+static int handle_response(struct coap_client *client, const struct coap_packet *response,
+			   bool response_truncated);
+
+
 static int send_request(int sock, const void *buf, size_t len, int flags,
 			const struct sockaddr *dest_addr, socklen_t addrlen)
 {
@@ -127,27 +134,26 @@ static bool has_ongoing_exchange(struct coap_client *client)
 	return false;
 }
 
-static struct coap_client_internal_request *get_free_request(struct coap_client *client)
+static bool has_timeout_expired(struct coap_client *client)
 {
 	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
-		if (client->requests[i].request_ongoing == false &&
-		    exchange_lifetime_exceeded(&client->requests[i])) {
-			return &client->requests[i];
+		if (timeout_expired(&client->requests[i])) {
+			return true;
 		}
 	}
-
-	return NULL;
+	return false;
 }
 
-static bool has_ongoing_requests(void)
+static struct coap_client_internal_request *get_free_request(struct coap_client *client)
 {
-	for (int i = 0; i < num_clients; i++) {
-		if (has_ongoing_request(clients[i])) {
-			return true;
+	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
+		if (client->requests[i].request_ongoing == false &&
+		    exchange_lifetime_exceeded(&client->requests[i])) {
+			return &client->requests[i];
 		}
 	}
 
-	return false;
+	return NULL;
 }
 
 static bool has_ongoing_exchanges(void)
@@ -498,86 +504,91 @@ static int resend_request(struct coap_client *client,
 	return ret;
 }
 
-static int coap_client_resend_handler(void)
+static void coap_client_resend_handler(struct coap_client *client)
 {
 	int ret = 0;
 
-	for (int i = 0; i < num_clients; i++) {
-		k_mutex_lock(&clients[i]->lock, K_FOREVER);
+	k_mutex_lock(&client->lock, K_FOREVER);
 
-		for (int j = 0; j < CONFIG_COAP_CLIENT_MAX_REQUESTS; j++) {
-			if (timeout_expired(&clients[i]->requests[j])) {
-				ret = resend_request(clients[i], &clients[i]->requests[j]);
+	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
+		if (timeout_expired(&client->requests[i])) {
+			ret = resend_request(client, &client->requests[i]);
+			if (ret < 0) {
+				report_callback_error(&client->requests[i], ret);
+				reset_internal_request(&client->requests[i]);
 			}
 		}
-
-		k_mutex_unlock(&clients[i]->lock);
 	}
 
-	return ret;
+	k_mutex_unlock(&client->lock);
 }
 
 static int handle_poll(void)
 {
 	int ret = 0;
 
-	while (1) {
-		struct zsock_pollfd fds[CONFIG_COAP_CLIENT_MAX_INSTANCES] = {0};
-		int nfds = 0;
-
-		/* Use periodic timeouts */
-		for (int i = 0; i < num_clients; i++) {
-			fds[i].fd = clients[i]->fd;
-			fds[i].events = ZSOCK_POLLIN;
-			fds[i].revents = 0;
-			nfds++;
-		}
+	struct zsock_pollfd fds[CONFIG_COAP_CLIENT_MAX_INSTANCES] = {0};
+	int nfds = 0;
 
-		ret = zsock_poll(fds, nfds, COAP_PERIODIC_TIMEOUT);
+	/* Use periodic timeouts */
+	for (int i = 0; i < num_clients; i++) {
+		fds[i].fd = clients[i]->fd;
+		fds[i].events = (has_ongoing_exchange(clients[i]) ? ZSOCK_POLLIN : 0) |
+				(has_timeout_expired(clients[i]) ? ZSOCK_POLLOUT : 0);
+		fds[i].revents = 0;
+		nfds++;
+	}
 
-		if (ret < 0) {
-			LOG_ERR("Error in poll:%d", errno);
-			errno = 0;
-			return ret;
-		} else if (ret == 0) {
-			/* Resend all the expired pending messages */
-			ret = coap_client_resend_handler();
+	ret = zsock_poll(fds, nfds, COAP_PERIODIC_TIMEOUT);
 
-			if (ret < 0) {
-				LOG_ERR("Error resending request: %d", ret);
-			}
+	if (ret < 0) {
+		ret = -errno;
+		LOG_ERR("Error in poll:%d", ret);
+		return ret;
+	} else if (ret == 0) {
+		return 0;
+	}
 
-			if (!has_ongoing_requests()) {
-				return ret;
-			}
+	for (int i = 0; i < nfds; i++) {
+		if (fds[i].revents & ZSOCK_POLLOUT) {
+			coap_client_resend_handler(clients[i]);
+		}
+		if (fds[i].revents & ZSOCK_POLLIN) {
+			struct coap_packet response;
+			bool response_truncated = false;
 
-		} else {
-			for (int i = 0; i < nfds; i++) {
+			k_mutex_lock(&clients[i]->lock, K_FOREVER);
 
-				if (fds[i].revents & ZSOCK_POLLERR) {
-					LOG_ERR("Error in poll for socket %d", fds[i].fd);
-					clients[i]->socket_error = -EIO;
-				}
-				if (fds[i].revents & ZSOCK_POLLHUP) {
-					LOG_ERR("Error in poll: POLLHUP for socket %d", fds[i].fd);
-					clients[i]->socket_error = -ENOTCONN;
-				}
-				if (fds[i].revents & ZSOCK_POLLNVAL) {
-					LOG_ERR("Error in poll: POLLNVAL - fd %d not open",
-						fds[i].fd);
-					clients[i]->socket_error = -EINVAL;
-				}
-				if (fds[i].revents & ZSOCK_POLLIN) {
-					clients[i]->response_ready = true;
-				}
+			ret = recv_response(clients[i], &response, &response_truncated);
+			if (ret < 0) {
+				LOG_ERR("Error receiving response");
+				cancel_requests_with(clients[i], -EIO);
+				k_mutex_unlock(&clients[i]->lock);
+				continue;
+			}
 
+			ret = handle_response(clients[i], &response, response_truncated);
+			if (ret < 0) {
+				LOG_ERR("Error handling response");
 			}
 
-			return 0;
+			k_mutex_unlock(&clients[i]->lock);
+		}
+		if (fds[i].revents & ZSOCK_POLLERR) {
+			LOG_ERR("Error in poll for socket %d", fds[i].fd);
+			cancel_requests_with(clients[i], -EIO);
+		}
+		if (fds[i].revents & ZSOCK_POLLHUP) {
+			LOG_ERR("Error in poll: POLLHUP for socket %d", fds[i].fd);
+			cancel_requests_with(clients[i], -EIO);
+		}
+		if (fds[i].revents & ZSOCK_POLLNVAL) {
+			LOG_ERR("Error in poll: POLLNVAL - fd %d not open", fds[i].fd);
+			cancel_requests_with(clients[i], -EIO);
 		}
 	}
 
-	return ret;
+	return 0;
 }
 
 static bool token_compare(struct coap_client_internal_request *internal_req,
@@ -895,14 +906,13 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 		}
 	}
 fail:
-	client->response_ready = false;
 	if (ret < 0 || !internal_req->is_observe) {
 		internal_req->request_ongoing = false;
 	}
 	return ret;
 }
 
-void coap_client_cancel_requests(struct coap_client *client)
+static void cancel_requests_with(struct coap_client *client, int error)
 {
 	k_mutex_lock(&client->lock, K_FOREVER);
 
@@ -914,33 +924,20 @@ void coap_client_cancel_requests(struct coap_client *client)
 			 * do not reenter it. In that case, the user knows their
 			 * request was cancelled anyway.
 			 */
-			report_callback_error(&client->requests[i], -ECANCELED);
-			client->requests[i].request_ongoing = false;
-			client->requests[i].is_observe = false;
+			report_callback_error(&client->requests[i], error);
+			reset_internal_request(&client->requests[i]);
 		}
 	}
 	atomic_clear(&coap_client_recv_active);
 	k_mutex_unlock(&client->lock);
 
-	/* Wait until after zsock_poll() can time out and return. */
-	k_sleep(K_MSEC(COAP_PERIODIC_TIMEOUT));
 }
 
-static void signal_socket_error(struct coap_client *cli)
+void coap_client_cancel_requests(struct coap_client *client)
 {
-	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
-		struct coap_client_internal_request *req = &cli->requests[i];
-
-		if (!req->request_ongoing) {
-			continue;
-		}
-
-		req->request_ongoing = false;
-		if (req->coap_request.cb) {
-			req->coap_request.cb(cli->socket_error, 0, NULL, 0,
-					     true, req->coap_request.user_data);
-		}
-	}
+	cancel_requests_with(client, -ECANCELED);
+	/* Wait until after zsock_poll() can time out and return. */
+	k_sleep(K_MSEC(COAP_PERIODIC_TIMEOUT));
 }
 
 void coap_client_recv(void *coap_cl, void *a, void *b)
@@ -957,41 +954,6 @@ void coap_client_recv(void *coap_cl, void *a, void *b)
 			goto idle;
 		}
 
-		for (int i = 0; i < num_clients; i++) {
-			if (clients[i]->response_ready) {
-				struct coap_packet response;
-				bool response_truncated = false;
-
-				k_mutex_lock(&clients[i]->lock, K_FOREVER);
-
-				ret = recv_response(clients[i], &response, &response_truncated);
-				if (ret < 0) {
-					LOG_ERR("Error receiving response");
-					clients[i]->response_ready = false;
-					k_mutex_unlock(&clients[i]->lock);
-					if (ret == -EOPNOTSUPP) {
-						LOG_ERR("Socket misconfigured.");
-						goto idle;
-					}
-					continue;
-				}
-
-				ret = handle_response(clients[i], &response, response_truncated);
-				if (ret < 0) {
-					LOG_ERR("Error handling response");
-				}
-
-				clients[i]->response_ready = false;
-				k_mutex_unlock(&clients[i]->lock);
-			}
-
-			if (clients[i]->socket_error) {
-				signal_socket_error(clients[i]);
-				clients[i]->socket_error = 0;
-			}
-
-		}
-
 		/* There are more messages coming */
 		if (has_ongoing_exchanges()) {
 			continue;
diff --git a/tests/net/lib/coap_client/CMakeLists.txt b/tests/net/lib/coap_client/CMakeLists.txt
index e12214fc6a9..d7f0c0cce5e 100644
--- a/tests/net/lib/coap_client/CMakeLists.txt
+++ b/tests/net/lib/coap_client/CMakeLists.txt
@@ -31,3 +31,4 @@ add_compile_definitions(CONFIG_COAP_CLIENT_MAX_REQUESTS=2)
 add_compile_definitions(CONFIG_COAP_CLIENT_MAX_INSTANCES=2)
 add_compile_definitions(CONFIG_COAP_MAX_RETRANSMIT=4)
 add_compile_definitions(CONFIG_COAP_BACKOFF_PERCENT=200)
+add_compile_definitions(CONFIG_COAP_LOG_LEVEL=4)
diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 25c2c58f2fd..20f1e4d8381 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -77,7 +77,7 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake(int sock, void *buf, size_t max
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
-	clear_socket_events();
+	clear_socket_events(ZSOCK_POLLIN);
 
 	return sizeof(ack_data);
 }
@@ -205,7 +205,7 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_response(int sock, void *buf, s
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
-	clear_socket_events();
+	clear_socket_events(ZSOCK_POLLIN);
 
 	return sizeof(ack_data);
 }
@@ -247,7 +247,7 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_unmatching(int sock, void *buf,
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
-	clear_socket_events();
+	clear_socket_events(ZSOCK_POLLIN);
 
 	return sizeof(ack_data);
 }
@@ -273,7 +273,7 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_echo(int sock, void *buf, size_
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_response;
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_echo;
 
-	clear_socket_events();
+	clear_socket_events(ZSOCK_POLLIN);
 
 	return sizeof(ack_data);
 }
@@ -299,7 +299,7 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_echo_next_req(int sock, void *b
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_response;
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_echo_next_req;
 
-	clear_socket_events();
+	clear_socket_events(ZSOCK_POLLIN);
 
 	return sizeof(ack_data);
 }
@@ -335,6 +335,9 @@ void coap_callback(int16_t code, size_t offset, const uint8_t *payload, size_t l
 {
 	LOG_INF("CoAP response callback, %d", code);
 	last_response_code = code;
+	if (user_data) {
+		k_sem_give((struct k_sem *) user_data);
+	}
 }
 
 ZTEST_SUITE(coap_client, NULL, suite_setup, test_setup, NULL, NULL);
@@ -392,7 +395,7 @@ ZTEST(coap_client, test_resend_request)
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	k_sleep(K_MSEC(MORE_THAN_ACK_TIMEOUT_MS));
-	set_socket_events(ZSOCK_POLLIN);
+	set_socket_events(ZSOCK_POLLIN | ZSOCK_POLLOUT);
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
@@ -547,6 +550,7 @@ ZTEST(coap_client, test_no_response)
 	client_request.len = strlen(short_payload);
 
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
+	set_socket_events(ZSOCK_POLLOUT);
 
 	k_sleep(K_MSEC(1));
 
@@ -592,30 +596,35 @@ ZTEST(coap_client, test_multiple_requests)
 {
 	int ret = 0;
 	int retry = MORE_THAN_EXCHANGE_LIFETIME_MS;
+	struct k_sem sem1, sem2;
 
 	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
+	struct coap_client_request req1 = {
 		.method = COAP_METHOD_GET,
 		.confirmable = true,
 		.path = test_path,
 		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
 		.cb = coap_callback,
-		.payload = NULL,
-		.len = 0
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem1
 	};
+	struct coap_client_request req2 = req1;
 
-	client_request.payload = short_payload;
-	client_request.len = strlen(short_payload);
+	req2.user_data = &sem2;
+
+	k_sem_init(&sem1, 0, 1);
+	k_sem_init(&sem2, 0, 1);
 
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
 
 	k_sleep(K_MSEC(1));
 
 	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	ret = coap_client_req(&client, 0, &address, &req1, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	ret = coap_client_req(&client, 0, &address, &req2, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
 	set_socket_events(ZSOCK_POLLIN);
@@ -625,8 +634,10 @@ ZTEST(coap_client, test_multiple_requests)
 	}
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
+	last_response_code = 0;
 	set_socket_events(ZSOCK_POLLIN);
-	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
+	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
 
@@ -653,6 +664,7 @@ ZTEST(coap_client, test_unmatching_tokens)
 	client_request.len = strlen(short_payload);
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_unmatching;
+	set_socket_events(ZSOCK_POLLIN | ZSOCK_POLLOUT);
 
 	k_sleep(K_MSEC(1));
 
@@ -663,3 +675,57 @@ ZTEST(coap_client, test_unmatching_tokens)
 	k_sleep(K_MSEC(MORE_THAN_LONG_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, -ETIMEDOUT, "Unexpected response");
 }
+
+ZTEST(coap_client, test_multiple_clients)
+{
+	int ret;
+	int retry = MORE_THAN_EXCHANGE_LIFETIME_MS;
+	static struct coap_client client2 = {
+		.fd = 2,
+	};
+	struct k_sem sem1, sem2;
+	struct sockaddr address = {0};
+	struct coap_client_request req1 = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem1
+	};
+	struct coap_client_request req2 = req1;
+
+	req2.user_data = &sem2;
+	req2.payload = long_payload;
+	req2.len = strlen(long_payload);
+
+	zassert_ok(k_sem_init(&sem1, 0, 1));
+	zassert_ok(k_sem_init(&sem2, 0, 1));
+
+	zassert_ok(coap_client_init(&client2, NULL));
+
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Sending requests");
+	ret = coap_client_req(&client, 1, &address, &req1, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+
+	ret = coap_client_req(&client2, 2, &address, &req2, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+
+	while (last_response_code == 0 && retry > 0) {
+		retry--;
+		k_sleep(K_MSEC(1));
+	}
+	set_socket_events(ZSOCK_POLLIN);
+
+	k_sleep(K_SECONDS(1));
+
+	/* ensure we got both responses */
+	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
+
+}
diff --git a/tests/net/lib/coap_client/src/stubs.c b/tests/net/lib/coap_client/src/stubs.c
index 471cc8642bc..63307e27fb7 100644
--- a/tests/net/lib/coap_client/src/stubs.c
+++ b/tests/net/lib/coap_client/src/stubs.c
@@ -29,9 +29,9 @@ void set_socket_events(short events)
 	my_events |= events;
 }
 
-void clear_socket_events(void)
+void clear_socket_events(short events)
 {
-	my_events = 0;
+	my_events &= ~events;
 }
 
 int z_impl_zsock_socket(int family, int type, int proto)
@@ -41,13 +41,14 @@ int z_impl_zsock_socket(int family, int type, int proto)
 
 int z_impl_zsock_poll(struct zsock_pollfd *fds, int nfds, int poll_timeout)
 {
-	LOG_INF("Polling, events %d", my_events);
+	int events = 0;
 	k_sleep(K_MSEC(1));
-	fds->revents = my_events;
-
-	if (my_events) {
-		return 1;
+	for (int i = 0; i < nfds; i++) {
+		fds[i].revents = my_events & (fds[i].events | ZSOCK_POLLERR | ZSOCK_POLLHUP);
+		if (fds[i].revents) {
+			events++;
+		}
 	}
 
-	return 0;
+	return events;
 }
diff --git a/tests/net/lib/coap_client/src/stubs.h b/tests/net/lib/coap_client/src/stubs.h
index eb340d914eb..9a9f929ce76 100644
--- a/tests/net/lib/coap_client/src/stubs.h
+++ b/tests/net/lib/coap_client/src/stubs.h
@@ -15,11 +15,30 @@
 
 #include <zephyr/net/coap_client.h>
 
-#define ZSOCK_POLLIN  1
+
+/* Copy from zephyr/include/zephyr/net/socket.h */
+/**
+ * @name Options for poll()
+ * @{
+ */
+/* ZSOCK_POLL* values are compatible with Linux */
+/** zsock_poll: Poll for readability */
+#define ZSOCK_POLLIN 1
+/** zsock_poll: Poll for exceptional condition */
+#define ZSOCK_POLLPRI 2
+/** zsock_poll: Poll for writability */
 #define ZSOCK_POLLOUT 4
+/** zsock_poll: Poll results in error condition (output value only) */
+#define ZSOCK_POLLERR 8
+/** zsock_poll: Poll detected closed connection (output value only) */
+#define ZSOCK_POLLHUP 0x10
+/** zsock_poll: Invalid socket (output value only) */
+#define ZSOCK_POLLNVAL 0x20
+/** @} */
+
 
 void set_socket_events(short events);
-void clear_socket_events(void);
+void clear_socket_events(short events);
 
 DECLARE_FAKE_VALUE_FUNC(uint32_t, z_impl_sys_rand32_get);
 DECLARE_FAKE_VOID_FUNC(z_impl_sys_rand_get, void *, size_t);

From 249027597c1cbd5bbef762470b1923684cdb5765 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Fri, 25 Oct 2024 15:47:44 +0300
Subject: [PATCH 0565/2913] [nrf fromtree] net: lib: coap_client: Forward
 recv() errors to handling loop

Forward recv() errors to handle_poll(), so there is only one place to
handle error codes.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 6481b0ec6ca5e668c12184181642bd7a150957ff)
(cherry picked from commit dec45781d42c0c884c6dc1ff4ed33405fcfb546e)
---
 subsys/net/lib/coap/coap_client.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 896161b1a75..f10adc39d98 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -557,16 +557,17 @@ static int handle_poll(void)
 			struct coap_packet response;
 			bool response_truncated = false;
 
-			k_mutex_lock(&clients[i]->lock, K_FOREVER);
-
 			ret = recv_response(clients[i], &response, &response_truncated);
 			if (ret < 0) {
+				if (ret == -EAGAIN) {
+					continue;
+				}
 				LOG_ERR("Error receiving response");
 				cancel_requests_with(clients[i], -EIO);
-				k_mutex_unlock(&clients[i]->lock);
 				continue;
 			}
 
+			k_mutex_lock(&clients[i]->lock, K_FOREVER);
 			ret = handle_response(clients[i], &response, response_truncated);
 			if (ret < 0) {
 				LOG_ERR("Error handling response");
@@ -622,14 +623,11 @@ static int recv_response(struct coap_client *client, struct coap_packet *respons
 			    flags, &client->address, &client->socklen);
 
 	if (total_len < 0) {
-		LOG_ERR("Error reading response: %d", errno);
-		if (errno == EOPNOTSUPP) {
-			return -errno;
-		}
-		return -EINVAL;
+		ret = -errno;
+		return ret;
 	} else if (total_len == 0) {
-		LOG_ERR("Zero length recv");
-		return -EINVAL;
+		/* Ignore, UDP can be zero length, but it is not CoAP anymore */
+		return 0;
 	}
 
 	available_len = MIN(total_len, sizeof(client->recv_buf));
@@ -640,7 +638,6 @@ static int recv_response(struct coap_client *client, struct coap_packet *respons
 	ret = coap_packet_parse(response, client->recv_buf, available_len, NULL, 0);
 	if (ret < 0) {
 		LOG_ERR("Invalid data received");
-		return ret;
 	}
 
 	return ret;

From 87168c280c7d9e9ad62c43fc21c19e7d2ecbd9bc Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Fri, 25 Oct 2024 15:51:26 +0300
Subject: [PATCH 0566/2913] [nrf fromtree] net: lib: coap_client: Don't
 decrease retry counter on send() failure

If send() fails, we have not technically send the CoAP retry yet, so
restore the same pending structure, so our timeouts and retry counters
stay the same.

This will trigger a retry next time the poll() return POLLOUT, so we
know that we can send.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 623a1ffd5221c571a307ed95a28e93a8bebb3918)
(cherry picked from commit 179c07fb12e0bc24e8ed31c9b2d3917693d59902)
---
 subsys/net/lib/coap/coap_client.c | 34 +++++++++++++++++++------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index f10adc39d98..79c4c883f12 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -471,10 +471,13 @@ static int resend_request(struct coap_client *client,
 {
 	int ret = 0;
 
+	/* Copy the pending structure if we need to restore it */
+	struct coap_pending tmp = internal_req->pending;
+
 	if (internal_req->request_ongoing &&
 	    internal_req->pending.timeout != 0 &&
 	    coap_pending_cycle(&internal_req->pending)) {
-		LOG_ERR("Timeout in poll, retrying send");
+		LOG_ERR("Timeout, retrying send");
 
 		/* Reset send block context as it was updated in previous init from packet */
 		if (internal_req->send_blk_ctx.total_size > 0) {
@@ -483,22 +486,27 @@ static int resend_request(struct coap_client *client,
 		ret = coap_client_init_request(client, &internal_req->coap_request,
 					       internal_req, true);
 		if (ret < 0) {
-			LOG_ERR("Error re-creating CoAP request");
+			LOG_ERR("Error re-creating CoAP request %d", ret);
+			return ret;
+		}
+
+		ret = send_request(client->fd, internal_req->request.data,
+					internal_req->request.offset, 0, &client->address,
+					client->socklen);
+		if (ret > 0) {
+			ret = 0;
+		} else if (ret == -1 && errno == EAGAIN) {
+			/* Restore the pending structure, retry later */
+			internal_req->pending = tmp;
+			/* Not a fatal socket error, will trigger a retry */
+			ret = 0;
 		} else {
-			ret = send_request(client->fd, internal_req->request.data,
-					   internal_req->request.offset, 0, &client->address,
-					   client->socklen);
-			if (ret > 0) {
-				ret = 0;
-			} else {
-				LOG_ERR("Failed to resend request, %d", ret);
-			}
+			ret = -errno;
+			LOG_ERR("Failed to resend request, %d", ret);
 		}
 	} else {
-		LOG_ERR("Timeout in poll, no more retries left");
+		LOG_ERR("Timeout, no more retries left");
 		ret = -ETIMEDOUT;
-		report_callback_error(internal_req, ret);
-		internal_req->request_ongoing = false;
 	}
 
 	return ret;

From 6d0b7ca7344682bae0f62c494ebdec802aa46026 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Fri, 25 Oct 2024 15:58:39 +0300
Subject: [PATCH 0567/2913] [nrf fromtree] net: lib: coap_client: Use
 reset_internal_request() instead of flagging

It is error prone to flag separate booleans, so try to use
reset_internal_request() every time we release the internal request
structure.

Also refactor the reset_internal_request() so that we reset the
timeout value so it does not trigger again.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit a14f08303065c5c6e528ae84ee264084a8d5f5b4)
(cherry picked from commit a3c908a0641f8f3bee5de3a0e6d420ccdaa93c9d)
---
 subsys/net/lib/coap/coap_client.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 79c4c883f12..550c790f69b 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -60,24 +60,16 @@ static int receive(int sock, void *buf, size_t max_len, int flags,
 	return err;
 }
 
-static void reset_block_contexts(struct coap_client_internal_request *request)
-{
-	request->recv_blk_ctx.block_size = 0;
-	request->recv_blk_ctx.total_size = 0;
-	request->recv_blk_ctx.current = 0;
-
-	request->send_blk_ctx.block_size = 0;
-	request->send_blk_ctx.total_size = 0;
-	request->send_blk_ctx.current = 0;
-}
-
 static void reset_internal_request(struct coap_client_internal_request *request)
 {
 	request->offset = 0;
 	request->last_id = 0;
 	request->last_response_id = -1;
 	request->request_ongoing = false;
-	reset_block_contexts(request);
+	request->is_observe = false;
+	request->pending.timeout = 0;
+	request->recv_blk_ctx = (struct coap_block_context){ 0 };
+	request->send_blk_ctx = (struct coap_block_context){ 0 };
 }
 
 static int coap_client_schedule_poll(struct coap_client *client, int sock,
@@ -912,7 +904,7 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 	}
 fail:
 	if (ret < 0 || !internal_req->is_observe) {
-		internal_req->request_ongoing = false;
+		reset_internal_request(internal_req);
 	}
 	return ret;
 }

From b0716323b17f51f4fa2e89a30e2d827efb7285a4 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Thu, 24 Oct 2024 17:38:14 +0300
Subject: [PATCH 0568/2913] [nrf fromtree] net: lib: coap_client: Fix reset
 handling

Fix handling of received CoAP reset.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 1890dbd63732c0075f0fde39c46cd78ee118ae65)
(cherry picked from commit 95c1c85c7d98fe8f74e3fa4314b42a23e5e668d2)
---
 include/zephyr/net/coap_client.h  |  2 +-
 subsys/net/lib/coap/coap_client.c | 54 ++++++++++++++++++++++++-------
 2 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/include/zephyr/net/coap_client.h b/include/zephyr/net/coap_client.h
index 90a691de4e9..1d68661da3b 100644
--- a/include/zephyr/net/coap_client.h
+++ b/include/zephyr/net/coap_client.h
@@ -88,7 +88,7 @@ struct coap_client_option {
 struct coap_client_internal_request {
 	uint8_t request_token[COAP_TOKEN_MAX_LEN];
 	uint32_t offset;
-	uint32_t last_id;
+	uint16_t last_id;
 	uint8_t request_tkl;
 	bool request_ongoing;
 	atomic_t in_callback;
diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 550c790f69b..ca592291ddf 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -31,6 +31,8 @@ static void cancel_requests_with(struct coap_client *client, int error);
 static int recv_response(struct coap_client *client, struct coap_packet *response, bool *truncated);
 static int handle_response(struct coap_client *client, const struct coap_packet *response,
 			   bool response_truncated);
+static struct coap_client_internal_request *get_request_with_mid(
+	struct coap_client *client, const struct coap_packet *resp);
 
 
 static int send_request(int sock, const void *buf, size_t len, int flags,
@@ -689,6 +691,23 @@ static struct coap_client_internal_request *get_request_with_token(
 	return NULL;
 }
 
+static struct coap_client_internal_request *get_request_with_mid(
+	struct coap_client *client, const struct coap_packet *resp)
+{
+	uint16_t mid = coap_header_get_id(resp);
+
+	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
+		if (client->requests[i].request_ongoing) {
+			if (client->requests[i].last_id == mid) {
+				return &client->requests[i];
+			}
+		}
+	}
+
+	return NULL;
+}
+
+
 static bool find_echo_option(const struct coap_packet *response, struct coap_option *option)
 {
 	return coap_find_options(response, COAP_OPTION_ECHO, option, 1);
@@ -698,7 +717,6 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 			   bool response_truncated)
 {
 	int ret = 0;
-	int response_type;
 	int block_option;
 	int block_num;
 	bool blockwise_transfer = false;
@@ -711,33 +729,45 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 	 * NCON request results only as a separate CON or NCON message as there is no ACK
 	 * With RESET, just drop gloves and call the callback.
 	 */
-	response_type = coap_header_get_type(response);
-
-	internal_req = get_request_with_token(client, response);
-	/* Reset and Ack need to match the message ID with request */
-	if ((response_type == COAP_TYPE_ACK || response_type == COAP_TYPE_RESET) &&
-	     internal_req == NULL)  {
-		LOG_ERR("Unexpected ACK or Reset");
-		return -EFAULT;
-	} else if (response_type == COAP_TYPE_RESET) {
-		coap_pending_clear(&internal_req->pending);
-	}
 
 	/* CON, NON_CON and piggybacked ACK need to match the token with original request */
 	uint16_t payload_len;
+	uint8_t response_type = coap_header_get_type(response);
 	uint8_t response_code = coap_header_get_code(response);
 	uint16_t response_id = coap_header_get_id(response);
 	const uint8_t *payload = coap_packet_get_payload(response, &payload_len);
 
+	if (response_type == COAP_TYPE_RESET) {
+		internal_req = get_request_with_mid(client, response);
+		if (!internal_req) {
+			LOG_WRN("No matching request for RESET");
+			return 0;
+		}
+		report_callback_error(internal_req, -ECONNRESET);
+		reset_internal_request(internal_req);
+		return 0;
+	}
+
 	/* Separate response coming */
 	if (payload_len == 0 && response_type == COAP_TYPE_ACK &&
 	    response_code == COAP_CODE_EMPTY) {
+		internal_req = get_request_with_mid(client, response);
+		if (!internal_req) {
+			LOG_WRN("No matching request for ACK");
+			return 0;
+		}
 		internal_req->pending.t0 = k_uptime_get();
 		internal_req->pending.timeout = internal_req->pending.t0 + COAP_SEPARATE_TIMEOUT;
 		internal_req->pending.retries = 0;
 		return 1;
 	}
 
+	internal_req = get_request_with_token(client, response);
+	if (!internal_req) {
+		LOG_WRN("No matching request for response");
+		return 0;
+	}
+
 	if (internal_req == NULL || !token_compare(internal_req, response)) {
 		LOG_WRN("Not matching tokens");
 		return 1;

From eccfce9174344aad6690ba3e6c25bc9890f8e219 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Fri, 25 Oct 2024 13:30:37 +0300
Subject: [PATCH 0569/2913] [nrf fromtree] net: coap: Add API to send reset
 message

Add helper API to construct CoAP Reset message.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit e96e95b6f63046dad3e77af8fb46cf995381a1d6)
(cherry picked from commit eb52d8c7437ea0ef2e8ce27b59ac0527edccc679)
---
 include/zephyr/net/coap.h  | 15 +++++++++++++++
 subsys/net/lib/coap/coap.c | 13 +++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/include/zephyr/net/coap.h b/include/zephyr/net/coap.h
index 7a0c7ee7f91..09df1e98f8a 100644
--- a/include/zephyr/net/coap.h
+++ b/include/zephyr/net/coap.h
@@ -552,6 +552,21 @@ int coap_packet_init(struct coap_packet *cpkt, uint8_t *data, uint16_t max_len,
 int coap_ack_init(struct coap_packet *cpkt, const struct coap_packet *req,
 		  uint8_t *data, uint16_t max_len, uint8_t code);
 
+/**
+ * @brief Create a new CoAP Reset message for given request.
+ *
+ * This function works like @ref coap_packet_init, filling CoAP header type,
+ * and CoAP header message id fields.
+ *
+ * @param cpkt New packet to be initialized using the storage from @a data.
+ * @param req CoAP request packet that is being acknowledged
+ * @param data Data that will contain a CoAP packet information
+ * @param max_len Maximum allowable length of data
+ *
+ * @return 0 in case of success or negative in case of error.
+ */
+int coap_rst_init(struct coap_packet *cpkt, const struct coap_packet *req,
+		  uint8_t *data, uint16_t max_len);
 /**
  * @brief Returns a randomly generated array of 8 bytes, that can be
  * used as a message's token.
diff --git a/subsys/net/lib/coap/coap.c b/subsys/net/lib/coap/coap.c
index 25ad262c923..70f2610adf0 100644
--- a/subsys/net/lib/coap/coap.c
+++ b/subsys/net/lib/coap/coap.c
@@ -232,6 +232,19 @@ int coap_ack_init(struct coap_packet *cpkt, const struct coap_packet *req,
 				token, code, id);
 }
 
+int coap_rst_init(struct coap_packet *cpkt, const struct coap_packet *req,
+		  uint8_t *data, uint16_t max_len)
+{
+	uint16_t id;
+	uint8_t ver;
+
+	ver = coap_header_get_version(req);
+	id = coap_header_get_id(req);
+
+	return coap_packet_init(cpkt, data, max_len, ver, COAP_TYPE_RESET, 0,
+				NULL, 0, id);
+}
+
 static void option_header_set_delta(uint8_t *opt, uint8_t delta)
 {
 	*opt = (delta & 0xF) << 4;

From 4dd06365cf5253e4971ae7c900de1d926243fdaf Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Fri, 25 Oct 2024 13:32:43 +0300
Subject: [PATCH 0570/2913] [nrf fromtree] net: lib: coap_client: Remove
 duplicate token comparison

Response tokens are already compared in get_request_with_token().

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 1dc24872ce833bcfd702963b1eff98e84d64fb43)
(cherry picked from commit 72d0c391c066d68e5f1abd1c43800a82ba5e8331)
---
 subsys/net/lib/coap/coap_client.c | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index ca592291ddf..31b065be951 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -594,21 +594,6 @@ static int handle_poll(void)
 	return 0;
 }
 
-static bool token_compare(struct coap_client_internal_request *internal_req,
-			  const struct coap_packet *resp)
-{
-	uint8_t response_token[COAP_TOKEN_MAX_LEN];
-	uint8_t response_tkl;
-
-	response_tkl = coap_header_get_token(resp, response_token);
-
-	if (internal_req->request_tkl != response_tkl) {
-		return false;
-	}
-
-	return memcmp(&internal_req->request_token, &response_token, response_tkl) == 0;
-}
-
 static int recv_response(struct coap_client *client, struct coap_packet *response, bool *truncated)
 {
 	int total_len;
@@ -768,11 +753,6 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 		return 0;
 	}
 
-	if (internal_req == NULL || !token_compare(internal_req, response)) {
-		LOG_WRN("Not matching tokens");
-		return 1;
-	}
-
 	/* MID-based deduplication */
 	if (response_id == internal_req->last_response_id) {
 		LOG_WRN("Duplicate MID, dropping");

From 19e6b8f1d0b1ddda62fd4ecaca82c44fb5acbeb9 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Fri, 25 Oct 2024 13:58:15 +0300
Subject: [PATCH 0571/2913] [nrf fromtree] net: lib: coap_client: Send RST for
 unknown queries

When receiving unknown response, respond with CoAP Reset.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 350d20e027a9a13e741c8c72a4f642f748a27f99)
(cherry picked from commit d199300dad34b07aab5f6ed0023151d41bf22807)
---
 subsys/net/lib/coap/coap_client.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 31b065be951..cfbf8c42c05 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -651,6 +651,26 @@ static int send_ack(struct coap_client *client, const struct coap_packet *req,
 	return 0;
 }
 
+static int send_rst(struct coap_client *client, const struct coap_packet *req)
+{
+	int ret;
+	struct coap_packet rst;
+
+	ret = coap_rst_init(&rst, req, client->send_buf, MAX_COAP_MSG_LEN);
+	if (ret < 0) {
+		LOG_ERR("Failed to initialize CoAP RST-message");
+		return ret;
+	}
+
+	ret = send_request(client->fd, rst.data, rst.offset, 0, &client->address, client->socklen);
+	if (ret < 0) {
+		LOG_ERR("Error sending a CoAP RST-message");
+		return ret;
+	}
+
+	return 0;
+}
+
 static struct coap_client_internal_request *get_request_with_token(
 	struct coap_client *client, const struct coap_packet *resp)
 {
@@ -750,6 +770,7 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 	internal_req = get_request_with_token(client, response);
 	if (!internal_req) {
 		LOG_WRN("No matching request for response");
+		(void) send_rst(client, response); /* Ignore errors, unrelated to our queries */
 		return 0;
 	}
 

From a73c6e406b1d55c08f1bf739fb3b7cfa490114c4 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Fri, 25 Oct 2024 16:27:20 +0300
Subject: [PATCH 0572/2913] [nrf fromtree] tests: coap_client: Add tests for
 poll() errors

If we receive poll() error during a request, it must
be forwarded to application.

If instead receive poll() error later, it should not be
forwarded as it might be result of application closing the
socket.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 9c9dc9f760e77d462fb5649fc63f9acc22d9ac03)
(cherry picked from commit 2e57969acb300f61f947d98a0f6e6baee5a8730b)
---
 tests/net/lib/coap_client/src/main.c | 61 ++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 20f1e4d8381..f06a0ce646c 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -322,6 +322,7 @@ static void test_setup(void *data)
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake;
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake;
+	clear_socket_events(ZSOCK_POLLIN | ZSOCK_POLLOUT | ZSOCK_POLLERR);
 
 	for (i = 0; i < ARRAY_SIZE(messages_needing_response); i++) {
 		messages_needing_response[i] = 0;
@@ -727,5 +728,65 @@ ZTEST(coap_client, test_multiple_clients)
 	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
+}
+
+
+ZTEST(coap_client, test_poll_err)
+{
+	int ret = 0;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+	};
+
+	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
+	set_socket_events(ZSOCK_POLLERR);
+
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+
+	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
+	zassert_equal(last_response_code, -EIO, "Unexpected response");
+}
+
+ZTEST(coap_client, test_poll_err_after_response)
+{
+	int ret = 0;
+	struct k_sem sem1;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem1
+	};
+
+	zassert_ok(k_sem_init(&sem1, 0, 1));
+	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
+	set_socket_events(ZSOCK_POLLIN);
+
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+
+	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
+	set_socket_events(ZSOCK_POLLERR);
+	zassert_not_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 }

From ba49975f4d076b59f144ae9ee7c56f4d1d60323a Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Mon, 28 Oct 2024 13:29:14 +0200
Subject: [PATCH 0573/2913] [nrf fromtree] net: lib: coap_client: Remove
 unnecessary atomic variable

In receiving thread, continuing the loops is based on
has_ongoing_exchanges() so it does not need atomic
coap_client_recv_active variable.

When idling, it wakes from semaphore. But there was potential
deadlock when coap_client_schedule_poll() would not signal the
semaphore, if atomic variable was already showing that it runs.
Removing the atomic variable removes this deadlock.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 1e5a537adee75805a9f3f52801c845876bf6c265)
(cherry picked from commit 53b26fb1c89ad33052ac1c0fe89b8f41eb1b005e)
---
 subsys/net/lib/coap/coap_client.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index cfbf8c42c05..ebf99bade9f 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -24,7 +24,6 @@ static K_MUTEX_DEFINE(coap_client_mutex);
 static struct coap_client *clients[CONFIG_COAP_CLIENT_MAX_INSTANCES];
 static int num_clients;
 static K_SEM_DEFINE(coap_client_recv_sem, 0, 1);
-static atomic_t coap_client_recv_active;
 
 static bool timeout_expired(struct coap_client_internal_request *internal_req);
 static void cancel_requests_with(struct coap_client *client, int error);
@@ -82,10 +81,7 @@ static int coap_client_schedule_poll(struct coap_client *client, int sock,
 	memcpy(&internal_req->coap_request, req, sizeof(struct coap_client_request));
 	internal_req->request_ongoing = true;
 
-	if (!coap_client_recv_active) {
-		k_sem_give(&coap_client_recv_sem);
-	}
-	atomic_set(&coap_client_recv_active, 1);
+	k_sem_give(&coap_client_recv_sem);
 
 	return 0;
 }
@@ -956,7 +952,6 @@ static void cancel_requests_with(struct coap_client *client, int error)
 			reset_internal_request(&client->requests[i]);
 		}
 	}
-	atomic_clear(&coap_client_recv_active);
 	k_mutex_unlock(&client->lock);
 
 }
@@ -974,7 +969,6 @@ void coap_client_recv(void *coap_cl, void *a, void *b)
 
 	k_sem_take(&coap_client_recv_sem, K_FOREVER);
 	while (true) {
-		atomic_set(&coap_client_recv_active, 1);
 		ret = handle_poll();
 		if (ret < 0) {
 			/* Error in polling */
@@ -987,7 +981,6 @@ void coap_client_recv(void *coap_cl, void *a, void *b)
 			continue;
 		} else {
 idle:
-			atomic_set(&coap_client_recv_active, 0);
 			k_sem_take(&coap_client_recv_sem, K_FOREVER);
 		}
 	}

From 70299cb5e2c29696ba24b6ec24db3e5f0b19d94a Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 17 Oct 2024 12:28:03 +0200
Subject: [PATCH 0574/2913] [nrf fromtree] arch: arm: cortex_m: pm_s2ram:
 Rework S2RAM mark functions

The S2RAM procedure requires marker checking after reset.
Such checking is performed on very early stage of the system initialization
and must ensure that the stack is not used due to the TLS pointer which is
not initialized yet.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 474d4c3249c190b3261bc128ec1847e0a4f7b176)
(cherry picked from commit 2a43406ba91c50704122e5bc5d578e8df5daa0dd)
---
 arch/arm/core/cortex_m/pm_s2ram.S     | 23 +++++++--------
 arch/arm/core/cortex_m/pm_s2ram.c     | 40 +++++++++++++++++++++------
 include/zephyr/arch/common/pm_s2ram.h | 10 +++++++
 3 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/arch/arm/core/cortex_m/pm_s2ram.S b/arch/arm/core/cortex_m/pm_s2ram.S
index f9c82b4069b..27c2a1e96a7 100644
--- a/arch/arm/core/cortex_m/pm_s2ram.S
+++ b/arch/arm/core/cortex_m/pm_s2ram.S
@@ -70,7 +70,9 @@ SECTION_FUNC(TEXT, arch_pm_s2ram_suspend)
 	/*
 	 * Mark entering suspend to RAM.
 	 */
-	bl pm_s2ram_mark_set
+	mov 	r1, lr
+	bl 	pm_s2ram_mark_set
+	mov	lr, r1
 
 	/*
 	 * Call the system_off function passed as parameter. This should never
@@ -86,7 +88,9 @@ SECTION_FUNC(TEXT, arch_pm_s2ram_suspend)
 	/*
 	 * Reset the marking of suspend to RAM, return is ignored.
 	 */
-	bl pm_s2ram_mark_check_and_clear
+	mov 	r1, lr
+	bl	pm_s2ram_mark_check_and_clear
+	mov 	lr, r1
 
 	/* Move system_off back to r0 as return value */
 	mov	r0, r4
@@ -99,16 +103,13 @@ GTEXT(arch_pm_s2ram_resume)
 SECTION_FUNC(TEXT, arch_pm_s2ram_resume)
 	/*
 	 * Check if reset occurred after suspending to RAM.
-	 * Store LR to ensure we can continue boot when we are not suspended
-	 * to RAM. In addition to LR, R0 is pushed too, to ensure "SP mod 8 = 0",
-	 * as stated by ARM rule 6.2.1.2 for AAPCS32.
 	 */
-	push    {r0, lr}
-	bl      pm_s2ram_mark_check_and_clear
-	cmp	r0, #0x1
-	pop     {r0, lr}
-	beq	resume
-	bx	lr
+	mov 	r1, lr
+	bl 	pm_s2ram_mark_check_and_clear
+	mov 	lr, r1
+	cmp     r0, #0x1
+	beq     resume
+	bx      lr
 
 resume:
 	/*
diff --git a/arch/arm/core/cortex_m/pm_s2ram.c b/arch/arm/core/cortex_m/pm_s2ram.c
index 2657d48dc32..b7fe5d9b626 100644
--- a/arch/arm/core/cortex_m/pm_s2ram.c
+++ b/arch/arm/core/cortex_m/pm_s2ram.c
@@ -22,20 +22,44 @@ __noinit _cpu_context_t _cpu_context;
  */
 static __noinit uint32_t marker;
 
-void pm_s2ram_mark_set(void)
+void __attribute__((naked)) pm_s2ram_mark_set(void)
 {
-	marker = MAGIC;
+	__asm__ volatile(
+		/* Set the marker to MAGIC value */
+		"str	%[_magic_val], [%[_marker]]\n"
+
+		"bx	lr\n"
+		:
+		: [_magic_val] "r"(MAGIC), [_marker] "r"(&marker)
+		: "r1", "r4", "memory");
 }
 
-bool pm_s2ram_mark_check_and_clear(void)
+bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
 {
-	if (marker == MAGIC) {
-		marker = 0;
+	__asm__ volatile(
+		/* Set return value to 0 */
+		"mov	r0, #0\n"
+
+		/* Check the marker */
+		"ldr	r3, [%[_marker]]\n"
+		"cmp	r3, %[_magic_val]\n"
+		"bne	exit\n"
+
+		/*
+		 * Reset the marker
+		 */
+		"str	r0, [%[_marker]]\n"
 
-		return true;
-	}
+		/*
+		 * Set return value to 1
+		 */
+		"mov	r0, #1\n"
 
-	return false;
+		"exit:\n"
+		"bx lr\n"
+		:
+		: [_magic_val] "r"(MAGIC), [_marker] "r"(&marker)
+		: "r0", "r1", "r3", "r4", "memory");
 }
 
 #endif /* CONFIG_PM_S2RAM_CUSTOM_MARKING */
diff --git a/include/zephyr/arch/common/pm_s2ram.h b/include/zephyr/arch/common/pm_s2ram.h
index 34c544c769b..ad9ab8ad7a4 100644
--- a/include/zephyr/arch/common/pm_s2ram.h
+++ b/include/zephyr/arch/common/pm_s2ram.h
@@ -65,6 +65,11 @@ int arch_pm_s2ram_suspend(pm_s2ram_system_off_fn_t system_off);
  *
  * Default implementation is setting a magic word in RAM. CONFIG_PM_S2RAM_CUSTOM_MARKING
  * allows custom implementation.
+ * The following requirements must be fulfilled:
+ * - the function cannot use stack (asm function or function with 'naked' attribute)
+ * - the content of the R1 and R4 registers must remain unchanged
+ * - returning from the function should be performed with the `bx lr` instruction
+ *
  */
 void pm_s2ram_mark_set(void);
 
@@ -76,6 +81,11 @@ void pm_s2ram_mark_set(void);
  *
  * Default implementation is checking a magic word in RAM. CONFIG_PM_S2RAM_CUSTOM_MARKING
  * allows custom implementation.
+ * The following requirements must be fulfilled:
+ * - the function cannot use stack (most likely asm function)
+ * - the content of the R1 and R4 registers must remain unchanged
+ * - the function's return value is passed by R0 register
+ * - returning from the function should be performed with the `bx lr` instruction
  *
  * @retval true if marking is found which indicates resuming after suspend-to-RAM.
  * @retval false if marking is not found which indicates standard boot.

From f5af365d61227e22be23cb361f64c36ffeedcb36 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 24 Oct 2024 14:45:28 +0200
Subject: [PATCH 0575/2913] [nrf fromtree] soc: nordic: s2ram: Align s2ram
 marking procedures

Rework Nordic specific S2RAM marking procedures.
The S2RAM marking procedures must not disrupt the stack due to
the TLS pointer not yet being initialized during their execution.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 59629d0039b053dd96b27c7c366e892e8d9fc7e5)
(cherry picked from commit b16abc629da9584ce27042396d6e5beca5b947f8)
---
 soc/nordic/nrf54h/pm_s2ram.c | 49 ++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/soc/nordic/nrf54h/pm_s2ram.c b/soc/nordic/nrf54h/pm_s2ram.c
index 10cdd36a762..88529c4bb75 100644
--- a/soc/nordic/nrf54h/pm_s2ram.c
+++ b/soc/nordic/nrf54h/pm_s2ram.c
@@ -127,25 +127,48 @@ int soc_s2ram_suspend(pm_s2ram_system_off_fn_t system_off)
 	return ret;
 }
 
-void pm_s2ram_mark_set(void)
+void __attribute__((naked)) pm_s2ram_mark_set(void)
 {
 	/* empty */
+	__asm__ volatile("bx	lr\n");
 }
 
-bool pm_s2ram_mark_check_and_clear(void)
+bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
 {
-	bool unretained_wake;
-	bool restore_valid;
-	uint32_t reset_reason = nrf_resetinfo_resetreas_local_get(NRF_RESETINFO);
+	__asm__ volatile(
+		/* Set return value to 0 */
+		"mov	r0, #0\n"
 
-	if (reset_reason != NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK) {
-		return false;
-	}
-	unretained_wake = reset_reason & NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK;
-	nrf_resetinfo_resetreas_local_set(NRF_RESETINFO, 0);
+		/* Load and check RESETREAS register */
+		"ldr	r3, [%[resetinfo_addr], %[resetreas_offs]]\n"
+		"cmp	r3, %[resetreas_unretained_mask]\n"
+
+		"bne	exit\n"
+
+		/* Clear RESETREAS register */
+		"str	r0, [%[resetinfo_addr], %[resetreas_offs]]\n"
+
+		/* Load RESTOREVALID register */
+		"ldr	r3, [%[resetinfo_addr], %[restorevalid_offs]]\n"
+
+		/* Clear RESTOREVALID */
+		"str	r0, [%[resetinfo_addr], %[restorevalid_offs]]\n"
+
+		/* Check RESTOREVALID register */
+		"cmp	r3, %[restorevalid_present_mask]\n"
+		"bne	exit\n"
+
+		/* Set return value to 1 */
+		"mov	r0, #1\n"
 
-	restore_valid = nrf_resetinfo_restore_valid_check(NRF_RESETINFO);
-	nrf_resetinfo_restore_valid_set(NRF_RESETINFO, false);
+		"exit:\n"
+		"bx	lr\n"
+		:
+		: [resetinfo_addr] "r"(NRF_RESETINFO),
+		  [resetreas_offs] "r"(offsetof(NRF_RESETINFO_Type, RESETREAS.LOCAL)),
+		  [resetreas_unretained_mask] "r"(NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK),
+		  [restorevalid_offs] "r"(offsetof(NRF_RESETINFO_Type, RESTOREVALID)),
+		  [restorevalid_present_mask] "r"(RESETINFO_RESTOREVALID_RESTOREVALID_Msk)
 
-	return (unretained_wake & restore_valid) ? true : false;
+		: "r0", "r1", "r3", "r4", "memory");
 }

From 1100e23b7a257e75087d4ad56f57ee097d921368 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Tue, 10 Sep 2024 09:42:45 -0400
Subject: [PATCH 0576/2913] [nrf fromtree] soc: snps: move init code from
 SYS_INIT to hooks

Replace SYS_INIT with SoC hooks and adapt SoC init code

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
(cherry picked from commit 49f7204530528d5efd15a1ab1a6fddce2d8a509c)
(cherry picked from commit de466b5de0e0c1cb8376356c674bec3ffb8c2284)
---
 soc/snps/arc_iot/Kconfig   |  1 +
 soc/snps/arc_iot/soc.c     | 11 ++---------
 soc/snps/emsk/Kconfig      |  4 ++++
 soc/snps/emsk/soc_config.c |  6 +-----
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/soc/snps/arc_iot/Kconfig b/soc/snps/arc_iot/Kconfig
index 362d2d1ae71..0ea361d2325 100644
--- a/soc/snps/arc_iot/Kconfig
+++ b/soc/snps/arc_iot/Kconfig
@@ -6,3 +6,4 @@ config SOC_ARC_IOT
 	select ARC
 	select CPU_HAS_MPU
 	select CPU_HAS_FPU
+	select SOC_EARLY_INIT_HOOK
diff --git a/soc/snps/arc_iot/soc.c b/soc/snps/arc_iot/soc.c
index 832c6df5f51..d42ed3f9d9c 100644
--- a/soc/snps/arc_iot/soc.c
+++ b/soc/snps/arc_iot/soc.c
@@ -15,14 +15,7 @@
 
 #define CPU_FREQ DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
 
-static int arc_iot_init(void)
+void soc_early_init_hook(void)
 {
-
-	if (arc_iot_pll_fout_config(CPU_FREQ / 1000000) < 0) {
-		return -1;
-	}
-
-	return 0;
+	arc_iot_pll_fout_config(CPU_FREQ / 1000000);
 }
-
-SYS_INIT(arc_iot_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/soc/snps/emsk/Kconfig b/soc/snps/emsk/Kconfig
index 88cdfe70671..014d5357f0a 100644
--- a/soc/snps/emsk/Kconfig
+++ b/soc/snps/emsk/Kconfig
@@ -4,12 +4,16 @@
 
 config SOC_EMSK
 	select ARC
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_EMSK_EM7D
 	select CPU_HAS_MPU
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_EMSK_EM9D
 	select CPU_HAS_FPU
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_EMSK_EM11D
 	select CPU_HAS_FPU
+	select SOC_EARLY_INIT_HOOK
diff --git a/soc/snps/emsk/soc_config.c b/soc/snps/emsk/soc_config.c
index adca19b683c..c43942facb0 100644
--- a/soc/snps/emsk/soc_config.c
+++ b/soc/snps/emsk/soc_config.c
@@ -11,7 +11,7 @@
 
 #ifdef CONFIG_UART_NS16550
 
-static int uart_ns16550_init(void)
+void soc_early_init_hook(void)
 {
 
 	/* On ARC EM Starter kit board,
@@ -25,10 +25,6 @@ static int uart_ns16550_init(void)
 	sys_write32(0, DT_REG_ADDR(DT_INST(1, ns16550))+0x4);
 	sys_write32(0, DT_REG_ADDR(DT_INST(1, ns16550))+0x10);
 #endif /* DT_NODE_HAS_STATUS(DT_INST(1, ns16550), okay) */
-
-	return 0;
 }
 
-SYS_INIT(uart_ns16550_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
-
 #endif /* CONFIG_UART_NS16550 */

From 9415b1f6bf81c18e66c0e3a47b61afc2c44f0869 Mon Sep 17 00:00:00 2001
From: Jiafei Pan <Jiafei.Pan@nxp.com>
Date: Mon, 26 Aug 2024 19:12:31 +0800
Subject: [PATCH 0577/2913] [nrf fromtree] soc: imx8m: change RDC configuration
 based on device tree

Can disable RDC configuration if RDC node is disabled.

Signed-off-by: Jiafei Pan <Jiafei.Pan@nxp.com>
(cherry picked from commit bd03883744d49598dbb6755632e25469159906cc)
(cherry picked from commit 889a23e600c3eac35351a0308c5b690d555cb53e)
---
 soc/nxp/imx/imx8m/a53/soc.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/soc/nxp/imx/imx8m/a53/soc.c b/soc/nxp/imx/imx8m/a53/soc.c
index 002b884daa0..c5eaa312370 100644
--- a/soc/nxp/imx/imx8m/a53/soc.c
+++ b/soc/nxp/imx/imx8m/a53/soc.c
@@ -12,40 +12,50 @@
 #include <fsl_common.h>
 #include <fsl_rdc.h>
 
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(rdc), okay)
+
+#define rdc_inst ((RDC_Type *)DT_REG_ADDR(DT_NODELABEL(rdc)))
+
 /* set RDC permission for peripherals */
 static void soc_rdc_init(void)
 {
 	rdc_domain_assignment_t assignment = {0};
 	rdc_periph_access_config_t periphConfig;
 
-	RDC_Init(RDC);
+	RDC_Init(rdc_inst);
 	assignment.domainId = A53_DOMAIN_ID;
-	RDC_SetMasterDomainAssignment(RDC, kRDC_Master_A53, &assignment);
+	RDC_SetMasterDomainAssignment(rdc_inst, kRDC_Master_A53, &assignment);
 
 	RDC_GetDefaultPeriphAccessConfig(&periphConfig);
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) && DT_NODE_HAS_PROP(DT_NODELABEL(uart2), rdc)
 	periphConfig.periph = kRDC_Periph_UART2;
 	periphConfig.policy = RDC_DT_VAL(uart2);
-	RDC_SetPeriphAccessConfig(RDC, &periphConfig);
+	RDC_SetPeriphAccessConfig(rdc_inst, &periphConfig);
 #endif
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay) && DT_NODE_HAS_PROP(DT_NODELABEL(uart4), rdc)
 	periphConfig.periph = kRDC_Periph_UART4;
 	periphConfig.policy = RDC_DT_VAL(uart4);
-	RDC_SetPeriphAccessConfig(RDC, &periphConfig);
+	RDC_SetPeriphAccessConfig(rdc_inst, &periphConfig);
 #endif
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay) && DT_NODE_HAS_PROP(DT_NODELABEL(enet), rdc)
 	periphConfig.periph = kRDC_Periph_ENET1;
 	periphConfig.policy = RDC_DT_VAL(enet);
-	RDC_SetPeriphAccessConfig(RDC, &periphConfig);
+	RDC_SetPeriphAccessConfig(rdc_inst, &periphConfig);
 #endif
 }
+#else
+
+#define soc_rdc_init() do { } while (false)
+
+#endif
 
 static int soc_init(void)
 {
 	soc_rdc_init();
+
 	return 0;
 }
 

From 145d15b4fb6ac85b3425a593e8d9fe52b78aae66 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Tue, 10 Sep 2024 09:42:40 -0400
Subject: [PATCH 0578/2913] [nrf fromtree] soc: nxp: move init code from
 SYS_INIT to hooks

Replace SYS_INIT with SoC hooks and adapt SoC init code

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
(cherry picked from commit f519f00f1665d75c3a5bdcff9e396c8158fbac45)
(cherry picked from commit 5b8db135873ccba80bca29034f3a926be8dd16aa)
---
 soc/nxp/imx/imx6sx/Kconfig           |  1 +
 soc/nxp/imx/imx6sx/soc.c             |  6 +-----
 soc/nxp/imx/imx7d/Kconfig            |  1 +
 soc/nxp/imx/imx7d/soc.c              |  6 +-----
 soc/nxp/imx/imx8m/Kconfig            |  5 +++++
 soc/nxp/imx/imx8m/a53/soc.c          |  6 +-----
 soc/nxp/imx/imx8m/m4_mini/soc.c      |  6 +-----
 soc/nxp/imx/imx8m/m4_quad/soc.c      |  6 +-----
 soc/nxp/imx/imx8m/m7/soc.c           |  6 +-----
 soc/nxp/imxrt/imxrt10xx/Kconfig      |  3 ++-
 soc/nxp/imxrt/imxrt10xx/lpm_rt1064.c |  6 +-----
 soc/nxp/imxrt/imxrt10xx/power.c      |  7 +------
 soc/nxp/imxrt/imxrt10xx/soc.c        | 18 ++++++++++--------
 soc/nxp/imxrt/imxrt118x/Kconfig      |  1 +
 soc/nxp/imxrt/imxrt118x/soc.c        |  6 +-----
 soc/nxp/imxrt/imxrt5xx/Kconfig       |  1 +
 soc/nxp/imxrt/imxrt5xx/cm33/power.c  |  7 +------
 soc/nxp/imxrt/imxrt5xx/cm33/soc.c    | 12 ++++++------
 soc/nxp/imxrt/imxrt6xx/Kconfig       |  1 +
 soc/nxp/imxrt/imxrt6xx/cm33/soc.c    |  8 +-------
 soc/nxp/kinetis/k2x/Kconfig          |  1 +
 soc/nxp/kinetis/k2x/soc.c            |  6 +-----
 soc/nxp/kinetis/k6x/Kconfig          |  1 +
 soc/nxp/kinetis/k6x/soc.c            |  7 +------
 soc/nxp/kinetis/k8x/Kconfig          |  1 +
 soc/nxp/kinetis/k8x/soc.c            |  6 +-----
 soc/nxp/kinetis/ke1xf/Kconfig        |  1 +
 soc/nxp/kinetis/ke1xf/soc.c          |  6 +-----
 soc/nxp/kinetis/ke1xz/Kconfig        |  1 +
 soc/nxp/kinetis/ke1xz/soc.c          |  6 +-----
 soc/nxp/kinetis/kl2x/Kconfig         |  1 +
 soc/nxp/kinetis/kl2x/soc.c           |  6 +-----
 soc/nxp/kinetis/kv5x/Kconfig         |  1 +
 soc/nxp/kinetis/kv5x/soc.c           |  6 +-----
 soc/nxp/kinetis/kwx/Kconfig          |  1 +
 soc/nxp/kinetis/kwx/soc_kw2xd.c      |  6 +-----
 soc/nxp/kinetis/kwx/soc_kw4xz.c      |  6 +-----
 soc/nxp/lpc/lpc51u68/Kconfig         |  1 +
 soc/nxp/lpc/lpc51u68/soc.c           |  8 +-------
 soc/nxp/mcx/mcxc/Kconfig             |  1 +
 soc/nxp/mcx/mcxc/soc.c               |  5 +----
 soc/nxp/rw/Kconfig                   |  1 +
 soc/nxp/rw/power.c                   |  6 +-----
 soc/nxp/rw/soc.c                     | 12 +++++-------
 soc/nxp/s32/s32k1/Kconfig            |  1 +
 soc/nxp/s32/s32k1/soc.c              |  6 +-----
 soc/nxp/s32/s32k3/Kconfig            |  1 +
 soc/nxp/s32/s32k3/soc.c              |  6 +-----
 soc/nxp/s32/s32ze/Kconfig            |  1 +
 soc/nxp/s32/s32ze/soc.c              |  6 +-----
 50 files changed, 73 insertions(+), 158 deletions(-)

diff --git a/soc/nxp/imx/imx6sx/Kconfig b/soc/nxp/imx/imx6sx/Kconfig
index 901b2c90a64..f83d462be4c 100644
--- a/soc/nxp/imx/imx6sx/Kconfig
+++ b/soc/nxp/imx/imx6sx/Kconfig
@@ -9,6 +9,7 @@ config SOC_SERIES_IMX6SX
 	select CPU_HAS_FPU
 	select CPU_HAS_ARM_MPU
 	select CLOCK_CONTROL
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_MCIMX6X_M4
 	select HAS_IMX_HAL
diff --git a/soc/nxp/imx/imx6sx/soc.c b/soc/nxp/imx/imx6sx/soc.c
index a968e5d5cb1..11cbac10002 100644
--- a/soc/nxp/imx/imx6sx/soc.c
+++ b/soc/nxp/imx/imx6sx/soc.c
@@ -287,7 +287,7 @@ static void SOC_ClockInit(void)
  *
  * @return 0
  */
-static int mcimx6x_m4_init(void)
+void soc_early_init_hook(void)
 {
 	/* Configure RDC */
 	SOC_RdcInit();
@@ -300,8 +300,4 @@ static int mcimx6x_m4_init(void)
 
 	/* Initialize clock */
 	SOC_ClockInit();
-
-	return 0;
 }
-
-SYS_INIT(mcimx6x_m4_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/imx/imx7d/Kconfig b/soc/nxp/imx/imx7d/Kconfig
index fbebe524242..1aa97734285 100644
--- a/soc/nxp/imx/imx7d/Kconfig
+++ b/soc/nxp/imx/imx7d/Kconfig
@@ -8,6 +8,7 @@ config SOC_SERIES_IMX7D
 	select CLOCK_CONTROL
 	select CPU_HAS_FPU
 	select CPU_HAS_ARM_MPU
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_MCIMX7D_M4
 	select HAS_IMX_HAL
diff --git a/soc/nxp/imx/imx7d/soc.c b/soc/nxp/imx/imx7d/soc.c
index 5ebf3ec0738..df3ee95f2e1 100644
--- a/soc/nxp/imx/imx7d/soc.c
+++ b/soc/nxp/imx/imx7d/soc.c
@@ -222,7 +222,7 @@ static void nxp_mcimx7_mu_config(void)
 }
 #endif /* CONFIG_IPM_IMX */
 
-static int nxp_mcimx7_init(void)
+void soc_early_init_hook(void)
 {
 
 	/* SoC specific RDC settings */
@@ -250,8 +250,4 @@ static int nxp_mcimx7_init(void)
 #ifdef CONFIG_IPM_IMX
 	nxp_mcimx7_mu_config();
 #endif /* CONFIG_IPM_IMX */
-
-	return 0;
 }
-
-SYS_INIT(nxp_mcimx7_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/imx/imx8m/Kconfig b/soc/nxp/imx/imx8m/Kconfig
index fe206de1527..a1344a8c38e 100644
--- a/soc/nxp/imx/imx8m/Kconfig
+++ b/soc/nxp/imx/imx8m/Kconfig
@@ -10,6 +10,7 @@ config SOC_MIMX8MM6_A53
 	select HAS_MCUX_IOMUXC if PINCTRL
 	select HAS_MCUX_RDC
 	select HAS_MCUX_CACHE
+	select SOC_PREP_HOOK
 
 config SOC_MIMX8MM6_M4
 	select ARM
@@ -21,6 +22,7 @@ config SOC_MIMX8MM6_M4
 	select HAS_MCUX_RDC
 	select HAS_MCUX_IGPIO
 	select HAS_MCUX_IOMUXC
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_MIMX8ML8_A53
 	select ARM64
@@ -31,6 +33,7 @@ config SOC_MIMX8ML8_A53
 	select HAS_MCUX_IOMUXC if PINCTRL
 	select HAS_MCUX_RDC
 	select HAS_MCUX_CACHE
+	select SOC_PREP_HOOK
 
 config SOC_MIMX8MN6_A53
 	select ARM64
@@ -41,6 +44,7 @@ config SOC_MIMX8MN6_A53
 	select HAS_MCUX_IOMUXC if PINCTRL
 	select HAS_MCUX_RDC
 	select HAS_MCUX_CACHE
+	select SOC_PREP_HOOK
 
 config SOC_MIMX8ML8_ADSP
 	select XTENSA
@@ -71,6 +75,7 @@ config SOC_MIMX8ML8_M7
 	select ARM_MPU
 	select HAS_MCUX_IGPIO
 	select HAS_MCUX_IOMUXC
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_MIMX8MQ6_M4
 	select ARM
diff --git a/soc/nxp/imx/imx8m/a53/soc.c b/soc/nxp/imx/imx8m/a53/soc.c
index c5eaa312370..a20ae395f18 100644
--- a/soc/nxp/imx/imx8m/a53/soc.c
+++ b/soc/nxp/imx/imx8m/a53/soc.c
@@ -52,11 +52,7 @@ static void soc_rdc_init(void)
 
 #endif
 
-static int soc_init(void)
+void soc_prep_hook(void)
 {
 	soc_rdc_init();
-
-	return 0;
 }
-
-SYS_INIT(soc_init, EARLY, 1);
diff --git a/soc/nxp/imx/imx8m/m4_mini/soc.c b/soc/nxp/imx/imx8m/m4_mini/soc.c
index fab49d98bff..784c39fcc04 100644
--- a/soc/nxp/imx/imx8m/m4_mini/soc.c
+++ b/soc/nxp/imx/imx8m/m4_mini/soc.c
@@ -148,7 +148,7 @@ static void SOC_ClockInit(void)
 	CLOCK_EnableClock(kCLOCK_Sec_Debug);
 }
 
-static int nxp_mimx8mm6_init(void)
+void soc_early_init_hook(void)
 {
 
 	/* SoC specific RDC settings */
@@ -156,8 +156,4 @@ static int nxp_mimx8mm6_init(void)
 
 	/* SoC specific Clock settings */
 	SOC_ClockInit();
-
-	return 0;
 }
-
-SYS_INIT(nxp_mimx8mm6_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/imx/imx8m/m4_quad/soc.c b/soc/nxp/imx/imx8m/m4_quad/soc.c
index e2849f62fe4..031121bc424 100644
--- a/soc/nxp/imx/imx8m/m4_quad/soc.c
+++ b/soc/nxp/imx/imx8m/m4_quad/soc.c
@@ -111,7 +111,7 @@ static void SOC_ClockInit(void)
 	CLOCK_EnableClock(kCLOCK_Sec_Debug);
 }
 
-static int nxp_mimx8mq6_init(void)
+void soc_early_init_hook(void)
 {
 
 	/* SoC specific RDC settings */
@@ -119,8 +119,4 @@ static int nxp_mimx8mq6_init(void)
 
 	/* SoC specific Clock settings */
 	SOC_ClockInit();
-
-	return 0;
 }
-
-SYS_INIT(nxp_mimx8mq6_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/imx/imx8m/m7/soc.c b/soc/nxp/imx/imx8m/m7/soc.c
index 724368eac37..683d550b149 100644
--- a/soc/nxp/imx/imx8m/m7/soc.c
+++ b/soc/nxp/imx/imx8m/m7/soc.c
@@ -203,7 +203,7 @@ static void gpio_init(void)
 #endif
 }
 
-static int nxp_mimx8ml8_init(void)
+void soc_early_init_hook(void)
 {
 
 	/* SoC specific RDC settings */
@@ -213,8 +213,4 @@ static int nxp_mimx8ml8_init(void)
 	SOC_ClockInit();
 
 	gpio_init();
-
-	return 0;
 }
-
-SYS_INIT(nxp_mimx8ml8_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/imxrt/imxrt10xx/Kconfig b/soc/nxp/imxrt/imxrt10xx/Kconfig
index 05eb7b5e8ac..c86f946aab8 100644
--- a/soc/nxp/imxrt/imxrt10xx/Kconfig
+++ b/soc/nxp/imxrt/imxrt10xx/Kconfig
@@ -6,7 +6,6 @@ config SOC_SERIES_IMXRT10XX
 	select CPU_CORTEX_M_HAS_DWT
 	select CPU_HAS_ICACHE
 	select CPU_HAS_DCACHE
-	select SOC_RESET_HOOK
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
 	select ARM
 	select CLOCK_CONTROL
@@ -29,6 +28,8 @@ config SOC_SERIES_IMXRT10XX
 	select HAS_MCUX_USB_EHCI
 	select HAS_SWO
 	select HAS_PM
+	select SOC_RESET_HOOK
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_MIMXRT1011
 	select CPU_HAS_FPU
diff --git a/soc/nxp/imxrt/imxrt10xx/lpm_rt1064.c b/soc/nxp/imxrt/imxrt10xx/lpm_rt1064.c
index c7cc46d0307..ad850f138f9 100644
--- a/soc/nxp/imxrt/imxrt10xx/lpm_rt1064.c
+++ b/soc/nxp/imxrt/imxrt10xx/lpm_rt1064.c
@@ -339,7 +339,7 @@ void clock_lpm_init(void)
 	XTALOSC24M->OSC_CONFIG1 = tmp_reg;
 }
 
-static int imxrt_lpm_init(void)
+void imxrt_lpm_init(void)
 {
 
 	struct clock_callbacks callbacks;
@@ -464,8 +464,4 @@ static int imxrt_lpm_init(void)
 
 	/* Install LPM callbacks */
 	imxrt_clock_pm_callbacks_register(&callbacks);
-	return 0;
 }
-
-
-SYS_INIT(imxrt_lpm_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/imxrt/imxrt10xx/power.c b/soc/nxp/imxrt/imxrt10xx/power.c
index fac3180c0db..5936b70e02a 100644
--- a/soc/nxp/imxrt/imxrt10xx/power.c
+++ b/soc/nxp/imxrt/imxrt10xx/power.c
@@ -240,7 +240,7 @@ void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
 }
 
 /* Initialize power system */
-static int rt10xx_power_init(void)
+void rt10xx_power_init(void)
 {
 	dcdc_internal_regulator_config_t reg_config;
 
@@ -268,9 +268,4 @@ static int rt10xx_power_init(void)
 
 	/* Enable high gate drive on power FETs to reduce leakage current */
 	PMU_CoreEnableIncreaseGateDrive(PMU, true);
-
-
-	return 0;
 }
-
-SYS_INIT(rt10xx_power_init, PRE_KERNEL_2, 0);
diff --git a/soc/nxp/imxrt/imxrt10xx/soc.c b/soc/nxp/imxrt/imxrt10xx/soc.c
index 9b197163567..d8a11dafd34 100644
--- a/soc/nxp/imxrt/imxrt10xx/soc.c
+++ b/soc/nxp/imxrt/imxrt10xx/soc.c
@@ -332,25 +332,29 @@ void imxrt_audio_codec_pll_init(uint32_t clock_name, uint32_t clk_src,
 }
 #endif
 
+extern void rt10xx_power_init(void);
+extern void imxrt_lpm_init(void);
+
 /**
  *
  * @brief Perform basic hardware initialization
  *
  * Initialize the interrupt controller device drivers.
  * Also initialize the timer device driver, if required.
- *
- * @return 0
  */
-
-static int imxrt_init(void)
+void soc_early_init_hook(void)
 {
 	sys_cache_instr_enable();
 	sys_cache_data_enable();
 
 	/* Initialize system clock */
 	clock_init();
-
-	return 0;
+#ifdef CONFIG_PM
+#ifdef CONFIG_SOC_MIMXRT1064
+	imxrt_lpm_init();
+#endif
+	rt10xx_power_init();
+#endif
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -365,5 +369,3 @@ void soc_reset_hook(void)
 #endif
 }
 #endif
-
-SYS_INIT(imxrt_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/imxrt/imxrt118x/Kconfig b/soc/nxp/imxrt/imxrt118x/Kconfig
index 10c8180c300..8dc3afe19f9 100644
--- a/soc/nxp/imxrt/imxrt118x/Kconfig
+++ b/soc/nxp/imxrt/imxrt118x/Kconfig
@@ -21,6 +21,7 @@ config SOC_SERIES_IMXRT118X
 	select HAS_MCUX_IOMUXC
 	select HAS_SWO
 	select HAS_MCUX_FLEXSPI
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_MIMXRT1189_CM33
 	select CPU_CORTEX_M33
diff --git a/soc/nxp/imxrt/imxrt118x/soc.c b/soc/nxp/imxrt/imxrt118x/soc.c
index 2576c858b9e..85299643de7 100644
--- a/soc/nxp/imxrt/imxrt118x/soc.c
+++ b/soc/nxp/imxrt/imxrt118x/soc.c
@@ -394,7 +394,7 @@ static ALWAYS_INLINE void trdc_enable_all_access(void)
  * @return 0
  */
 
-static int imxrt_init(void)
+void soc_early_init_hook(void)
 {
 	/* Initialize system clock */
 	clock_init();
@@ -409,8 +409,6 @@ static int imxrt_init(void)
 #endif
 	__ISB();
 	__DSB();
-
-	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -419,5 +417,3 @@ void soc_reset_hook(void)
 	SystemInit();
 }
 #endif
-
-SYS_INIT(imxrt_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/imxrt/imxrt5xx/Kconfig b/soc/nxp/imxrt/imxrt5xx/Kconfig
index dcaf50b03b1..81ccd78df6e 100644
--- a/soc/nxp/imxrt/imxrt5xx/Kconfig
+++ b/soc/nxp/imxrt/imxrt5xx/Kconfig
@@ -31,6 +31,7 @@ config SOC_MIMXRT595S_CM33
 	select HAS_MCUX_USDHC2
 	select HAS_MCUX_USB_LPCIP3511
 	select HAS_MCUX_CTIMER
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_MIMXRT595S_F1
 	select XTENSA
diff --git a/soc/nxp/imxrt/imxrt5xx/cm33/power.c b/soc/nxp/imxrt/imxrt5xx/cm33/power.c
index 3599dcfa646..30911cbb22d 100644
--- a/soc/nxp/imxrt/imxrt5xx/cm33/power.c
+++ b/soc/nxp/imxrt/imxrt5xx/cm33/power.c
@@ -61,10 +61,8 @@ void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
 }
 
 /* Initialize power system */
-static int rt5xx_power_init(void)
+void rt5xx_power_init(void)
 {
-	int ret = 0;
-
 	/* This function is called to set vddcore low voltage detection
 	 * falling trip voltage, this is not impacting the voltage in anyway.
 	 */
@@ -75,7 +73,4 @@ static int rt5xx_power_init(void)
 	POWER_UpdatePmicRecoveryTime(1);
 #endif
 
-	return ret;
 }
-
-SYS_INIT(rt5xx_power_init, PRE_KERNEL_2, 0);
diff --git a/soc/nxp/imxrt/imxrt5xx/cm33/soc.c b/soc/nxp/imxrt/imxrt5xx/cm33/soc.c
index c10b404ed48..f4371511e4e 100644
--- a/soc/nxp/imxrt/imxrt5xx/cm33/soc.c
+++ b/soc/nxp/imxrt/imxrt5xx/cm33/soc.c
@@ -511,16 +511,16 @@ void __weak imxrt_deinit_display_interface(void)
 
 #endif
 
+extern void rt5xx_power_init(void);
+
 /**
  *
  * @brief Perform basic hardware initialization
  *
  * Initialize the interrupt controller device drivers.
  * Also initialize the timer device driver, if required.
- *
- * @return 0
  */
-static int nxp_rt500_init(void)
+void soc_early_init_hook(void)
 {
 	/* Initialize clocks with tool generated code */
 	rt5xx_clock_init();
@@ -536,8 +536,8 @@ static int nxp_rt500_init(void)
 	IOPCTL->PIO[1][15] = 0;
 	IOPCTL->PIO[3][28] = 0;
 	IOPCTL->PIO[3][29] = 0;
+#ifdef CONFIG_PM
+	rt5xx_power_init();
+#endif
 
-	return 0;
 }
-
-SYS_INIT(nxp_rt500_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/imxrt/imxrt6xx/Kconfig b/soc/nxp/imxrt/imxrt6xx/Kconfig
index b68855292e3..831b8b1b1ab 100644
--- a/soc/nxp/imxrt/imxrt6xx/Kconfig
+++ b/soc/nxp/imxrt/imxrt6xx/Kconfig
@@ -30,6 +30,7 @@ config SOC_MIMXRT685S_CM33
 	select INIT_SYS_PLL
 	select HAS_MCUX_USB_LPCIP3511
 	select HAS_MCUX_CTIMER
+	select SOC_EARLY_INIT_HOOK
 
 if SOC_SERIES_IMXRT6XX
 
diff --git a/soc/nxp/imxrt/imxrt6xx/cm33/soc.c b/soc/nxp/imxrt/imxrt6xx/cm33/soc.c
index d829558754e..9071a20bd68 100644
--- a/soc/nxp/imxrt/imxrt6xx/cm33/soc.c
+++ b/soc/nxp/imxrt/imxrt6xx/cm33/soc.c
@@ -360,11 +360,9 @@ void imxrt_usdhc_dat3_pull(bool pullup)
  *
  * Initialize the interrupt controller device drivers.
  * Also initialize the timer device driver, if required.
- *
- * @return 0
  */
 
-static int nxp_rt600_init(void)
+void soc_early_init_hook(void)
 {
 	/* Initialize clock */
 	clock_init();
@@ -372,8 +370,6 @@ static int nxp_rt600_init(void)
 #ifndef CONFIG_IMXRT6XX_CODE_CACHE
 	CACHE64_DisableCache(CACHE64);
 #endif
-
-	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -400,5 +396,3 @@ void soc_reset_hook(void)
 }
 
 #endif
-
-SYS_INIT(nxp_rt600_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/kinetis/k2x/Kconfig b/soc/nxp/kinetis/k2x/Kconfig
index cf61f57132b..f89d6c86b4c 100644
--- a/soc/nxp/kinetis/k2x/Kconfig
+++ b/soc/nxp/kinetis/k2x/Kconfig
@@ -14,6 +14,7 @@ config SOC_SERIES_KINETIS_K2X
 	select CPU_CORTEX_M_HAS_DWT
 	select CLOCK_CONTROL
 	select SOC_RESET_HOOK
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_MK22F51212
 	select HAS_MCUX
diff --git a/soc/nxp/kinetis/k2x/soc.c b/soc/nxp/kinetis/k2x/soc.c
index 82aecf9b687..e89526f5556 100644
--- a/soc/nxp/kinetis/k2x/soc.c
+++ b/soc/nxp/kinetis/k2x/soc.c
@@ -118,15 +118,13 @@ static ALWAYS_INLINE void clock_init(void)
  * @return 0
  */
 
-static int fsl_frdm_k22f_init(void)
+void soc_early_init_hook(void)
 {
 	/* release I/O power hold to allow normal run state */
 	PMC->REGSC |= PMC_REGSC_ACKISO_MASK;
 
 	/* Initialize PLL/system clock to 120 MHz */
 	clock_init();
-
-	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -137,5 +135,3 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
-
-SYS_INIT(fsl_frdm_k22f_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/kinetis/k6x/Kconfig b/soc/nxp/kinetis/k6x/Kconfig
index 5ec9c9acf21..af342ae30ca 100644
--- a/soc/nxp/kinetis/k6x/Kconfig
+++ b/soc/nxp/kinetis/k6x/Kconfig
@@ -11,6 +11,7 @@ config SOC_SERIES_KINETIS_K6X
 	select HAS_MCUX_PIT
 	select CLOCK_CONTROL
 	select SOC_RESET_HOOK
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_MK64F12
 	select HAS_MCUX
diff --git a/soc/nxp/kinetis/k6x/soc.c b/soc/nxp/kinetis/k6x/soc.c
index 41708af7954..c8eb6ba7870 100644
--- a/soc/nxp/kinetis/k6x/soc.c
+++ b/soc/nxp/kinetis/k6x/soc.c
@@ -124,10 +124,9 @@ static ALWAYS_INLINE void clock_init(void)
  * Initialize the interrupt controller device drivers.
  * Also initialize the timer device driver, if required.
  *
- * @return 0
  */
 
-static int k6x_init(void)
+void soc_early_init_hook(void)
 {
 #if !defined(CONFIG_ARM_MPU)
 	uint32_t temp_reg;
@@ -162,8 +161,6 @@ static int k6x_init(void)
 #endif
 	/* Initialize PLL/system clock up to 180 MHz */
 	clock_init();
-
-	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -174,5 +171,3 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
-
-SYS_INIT(k6x_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/kinetis/k8x/Kconfig b/soc/nxp/kinetis/k8x/Kconfig
index 649300c3dba..bf30d20797e 100644
--- a/soc/nxp/kinetis/k8x/Kconfig
+++ b/soc/nxp/kinetis/k8x/Kconfig
@@ -27,6 +27,7 @@ config SOC_SERIES_KINETIS_K8X
 	select HAS_MCUX_RCM
 	select HAS_MCUX_CACHE
 	select SOC_RESET_HOOK
+	select SOC_EARLY_INIT_HOOK
 
 if SOC_SERIES_KINETIS_K8X
 
diff --git a/soc/nxp/kinetis/k8x/soc.c b/soc/nxp/kinetis/k8x/soc.c
index 19d6f2df341..d338ad72a96 100644
--- a/soc/nxp/kinetis/k8x/soc.c
+++ b/soc/nxp/kinetis/k8x/soc.c
@@ -92,7 +92,7 @@ static ALWAYS_INLINE void clk_init(void)
 #endif
 }
 
-static int k8x_init(void)
+void soc_early_init_hook(void)
 {
 #if !defined(CONFIG_ARM_MPU)
 	uint32_t temp_reg;
@@ -116,8 +116,6 @@ static int k8x_init(void)
 
 	/* Initialize system clocks and PLL */
 	clk_init();
-
-	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -128,5 +126,3 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
-
-SYS_INIT(k8x_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/kinetis/ke1xf/Kconfig b/soc/nxp/kinetis/ke1xf/Kconfig
index a89888edaad..b3cf86dd935 100644
--- a/soc/nxp/kinetis/ke1xf/Kconfig
+++ b/soc/nxp/kinetis/ke1xf/Kconfig
@@ -30,6 +30,7 @@ config SOC_SERIES_KINETIS_KE1XF
 	select HAS_MCUX_PWT
 	select HAS_MCUX_RCM
 	select SOC_RESET_HOOK
+	select SOC_EARLY_INIT_HOOK
 	select HAS_PM
 
 config SOC_MKE16F16
diff --git a/soc/nxp/kinetis/ke1xf/soc.c b/soc/nxp/kinetis/ke1xf/soc.c
index 7ada4249dfa..5d3e2291fe6 100644
--- a/soc/nxp/kinetis/ke1xf/soc.c
+++ b/soc/nxp/kinetis/ke1xf/soc.c
@@ -237,7 +237,7 @@ static ALWAYS_INLINE void clk_init(void)
 #endif
 }
 
-static int ke1xf_init(void)
+void soc_early_init_hook(void)
 
 {
 #if !defined(CONFIG_ARM_MPU)
@@ -264,8 +264,6 @@ static int ke1xf_init(void)
 	/* SystemInit will have enabled the code cache. Disable it here */
 	L1CACHE_DisableCodeCache();
 #endif
-
-	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -314,5 +312,3 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
-
-SYS_INIT(ke1xf_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/kinetis/ke1xz/Kconfig b/soc/nxp/kinetis/ke1xz/Kconfig
index 2563a220041..f8e878cb13a 100644
--- a/soc/nxp/kinetis/ke1xz/Kconfig
+++ b/soc/nxp/kinetis/ke1xz/Kconfig
@@ -13,3 +13,4 @@ config SOC_SERIES_KE1XZ
 	select HAS_MCUX
 	select HAS_PM
 	select SOC_RESET_HOOK
+	select SOC_EARLY_INIT_HOOK
diff --git a/soc/nxp/kinetis/ke1xz/soc.c b/soc/nxp/kinetis/ke1xz/soc.c
index 38521bccc85..5a6b443c1fe 100644
--- a/soc/nxp/kinetis/ke1xz/soc.c
+++ b/soc/nxp/kinetis/ke1xz/soc.c
@@ -144,13 +144,11 @@ static ALWAYS_INLINE void clk_init(void)
 #endif
 }
 
-static int ke1xz_init(void)
+void soc_early_init_hook(void)
 
 {
 	/* Initialize system clocks and PLL */
 	clk_init();
-
-	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -162,5 +160,3 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
-
-SYS_INIT(ke1xz_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/kinetis/kl2x/Kconfig b/soc/nxp/kinetis/kl2x/Kconfig
index c2e5255e00a..e545c2a6800 100644
--- a/soc/nxp/kinetis/kl2x/Kconfig
+++ b/soc/nxp/kinetis/kl2x/Kconfig
@@ -10,6 +10,7 @@ config SOC_SERIES_KINETIS_KL2X
 	select CPU_CORTEX_M_HAS_VTOR
 	select CLOCK_CONTROL
 	select SOC_RESET_HOOK
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_MKL25Z4
 	select CPU_CORTEX_M0PLUS
diff --git a/soc/nxp/kinetis/kl2x/soc.c b/soc/nxp/kinetis/kl2x/soc.c
index 9a525b2632c..71fe3d35a35 100644
--- a/soc/nxp/kinetis/kl2x/soc.c
+++ b/soc/nxp/kinetis/kl2x/soc.c
@@ -79,12 +79,10 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 }
 
-static int kl2x_init(void)
+void soc_early_init_hook(void)
 {
 	/* Initialize system clock to 48 MHz */
 	clock_init();
-
-	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -95,5 +93,3 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
-
-SYS_INIT(kl2x_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/kinetis/kv5x/Kconfig b/soc/nxp/kinetis/kv5x/Kconfig
index 6c9cd6f34ef..d4d977ce212 100644
--- a/soc/nxp/kinetis/kv5x/Kconfig
+++ b/soc/nxp/kinetis/kv5x/Kconfig
@@ -22,3 +22,4 @@ config SOC_SERIES_KINETIS_KV5X
 	select HAS_MCG
 	select HAS_MCUX_RCM
 	select SOC_RESET_HOOK
+	select SOC_EARLY_INIT_HOOK
diff --git a/soc/nxp/kinetis/kv5x/soc.c b/soc/nxp/kinetis/kv5x/soc.c
index 91c4823e4e2..cd5d4048c42 100644
--- a/soc/nxp/kinetis/kv5x/soc.c
+++ b/soc/nxp/kinetis/kv5x/soc.c
@@ -78,7 +78,7 @@ static ALWAYS_INLINE void clk_init(void)
 	CLOCK_SetSimConfig(&sim_config);
 }
 
-static int kv5x_init(void)
+void soc_early_init_hook(void)
 {
 	/* release I/O power hold to allow normal run state */
 	PMC->REGSC |= PMC_REGSC_ACKISO_MASK;
@@ -93,8 +93,6 @@ static int kv5x_init(void)
 
 	sys_cache_instr_enable();
 	sys_cache_data_enable();
-
-	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -105,5 +103,3 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
-
-SYS_INIT(kv5x_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/kinetis/kwx/Kconfig b/soc/nxp/kinetis/kwx/Kconfig
index 49a9f78c04b..150de248d4e 100644
--- a/soc/nxp/kinetis/kwx/Kconfig
+++ b/soc/nxp/kinetis/kwx/Kconfig
@@ -9,6 +9,7 @@ config SOC_SERIES_KINETIS_KWX
 	select CPU_CORTEX_M_HAS_VTOR
 	select CLOCK_CONTROL
 	select SOC_RESET_HOOK
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_MKW22D5
 	select CPU_CORTEX_M4
diff --git a/soc/nxp/kinetis/kwx/soc_kw2xd.c b/soc/nxp/kinetis/kwx/soc_kw2xd.c
index 95e5a955acc..c2fcddfa6ed 100644
--- a/soc/nxp/kinetis/kwx/soc_kw2xd.c
+++ b/soc/nxp/kinetis/kwx/soc_kw2xd.c
@@ -147,15 +147,13 @@ static ALWAYS_INLINE void clock_init(void)
  *
  * @return 0
  */
-static int kw2xd_init(void)
+void soc_early_init_hook(void)
 {
 	/* release I/O power hold to allow normal run state */
 	PMC->REGSC |= PMC_REGSC_ACKISO_MASK;
 
 	/* Initialize PLL/system clock to 48 MHz */
 	clock_init();
-
-	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -166,5 +164,3 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
-
-SYS_INIT(kw2xd_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/kinetis/kwx/soc_kw4xz.c b/soc/nxp/kinetis/kwx/soc_kw4xz.c
index a14fe28c165..4e33f4df5b8 100644
--- a/soc/nxp/kinetis/kwx/soc_kw4xz.c
+++ b/soc/nxp/kinetis/kwx/soc_kw4xz.c
@@ -79,12 +79,10 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 }
 
-static int kwx_init(void)
+void soc_early_init_hook(void)
 {
 	/* Initialize system clock to 40 MHz */
 	clock_init();
-
-	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -95,5 +93,3 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
-
-SYS_INIT(kwx_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/lpc/lpc51u68/Kconfig b/soc/nxp/lpc/lpc51u68/Kconfig
index 8a2436d1237..37c8231d7f6 100644
--- a/soc/nxp/lpc/lpc51u68/Kconfig
+++ b/soc/nxp/lpc/lpc51u68/Kconfig
@@ -16,6 +16,7 @@ config SOC_SERIES_LPC51U68
 	select CPU_CORTEX_M_HAS_SYSTICK
 	select CPU_CORTEX_M_HAS_VTOR
 	select SOC_RESET_HOOK
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_LPC51U68
 	select CLOCK_CONTROL
diff --git a/soc/nxp/lpc/lpc51u68/soc.c b/soc/nxp/lpc/lpc51u68/soc.c
index b38b601baaa..fd8f23800b3 100644
--- a/soc/nxp/lpc/lpc51u68/soc.c
+++ b/soc/nxp/lpc/lpc51u68/soc.c
@@ -11,7 +11,7 @@
 #include <fsl_power.h>
 #include <fsl_clock.h>
 
-int soc_init(void)
+void soc_early_init_hook(void)
 {
 	POWER_DisablePD(kPDRUNCFG_PD_FRO_EN);
 	CLOCK_SetupFROClocking(12000000U);
@@ -42,17 +42,11 @@ int soc_init(void)
 	POWER_DisablePD(kPDRUNCFG_PD_VD7_ENA);
 	POWER_DisablePD(kPDRUNCFG_PD_VREFP_SW);
 	POWER_DisablePD(kPDRUNCFG_PD_TEMPS);
-
-	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
-
 void soc_reset_hook(void)
 {
 	SystemInit();
 }
-
 #endif /* CONFIG_SOC_RESET_HOOK */
-
-SYS_INIT(soc_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/mcx/mcxc/Kconfig b/soc/nxp/mcx/mcxc/Kconfig
index 02ed4233bc0..ff49d66ae65 100644
--- a/soc/nxp/mcx/mcxc/Kconfig
+++ b/soc/nxp/mcx/mcxc/Kconfig
@@ -16,6 +16,7 @@ config SOC_SERIES_MCXC
 	select HAS_MCUX_LPUART
 	select HAS_MCUX_LPI2C
 	select HAS_MCUX_TPM
+	select SOC_EARLY_INIT_HOOK
 
 if SOC_SERIES_MCXC
 
diff --git a/soc/nxp/mcx/mcxc/soc.c b/soc/nxp/mcx/mcxc/soc.c
index a6d0d8bd9fd..00001999a49 100644
--- a/soc/nxp/mcx/mcxc/soc.c
+++ b/soc/nxp/mcx/mcxc/soc.c
@@ -93,10 +93,9 @@ static void clock_init(void)
 #endif
 }
 
-static int mcxc_init(void)
+void soc_early_init_hook(void)
 {
 	clock_init();
-	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -107,5 +106,3 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
-
-SYS_INIT(mcxc_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/rw/Kconfig b/soc/nxp/rw/Kconfig
index e67d0013721..272d7073bfa 100644
--- a/soc/nxp/rw/Kconfig
+++ b/soc/nxp/rw/Kconfig
@@ -17,6 +17,7 @@ config SOC_SERIES_RW6XX
 	select HAS_MCUX_FLEXCOMM
 	select HAS_MCUX_CACHE
 	select HAS_PM
+	select SOC_EARLY_INIT_HOOK
 
 if SOC_SERIES_RW6XX
 
diff --git a/soc/nxp/rw/power.c b/soc/nxp/rw/power.c
index 2979d48ff5b..1f0255a388f 100644
--- a/soc/nxp/rw/power.c
+++ b/soc/nxp/rw/power.c
@@ -109,7 +109,7 @@ __weak void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
 	__enable_irq();
 }
 
-static int nxp_rw6xx_power_init(void)
+void nxp_rw6xx_power_init(void)
 {
 	uint32_t suspend_sleepconfig[5] = DT_PROP_OR(NODE_ID, deep_sleep_config, {});
 
@@ -142,8 +142,4 @@ static int nxp_rw6xx_power_init(void)
 	IRQ_CONNECT(DT_IRQN(DT_NODELABEL(pin1)), DT_IRQ(DT_NODELABEL(pin1), priority), pin1_isr,
 		    NULL, 0);
 #endif
-
-	return 0;
 }
-
-SYS_INIT(nxp_rw6xx_power_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/soc/nxp/rw/soc.c b/soc/nxp/rw/soc.c
index 8aa3d6f6dee..1a52626a053 100644
--- a/soc/nxp/rw/soc.c
+++ b/soc/nxp/rw/soc.c
@@ -268,17 +268,16 @@ __ramfunc void clock_init(void)
 
 }
 
+extern void nxp_rw6xx_power_init(void);
 /**
  *
  * @brief Perform basic hardware initialization
  *
  * Initialize the interrupt controller device drivers.
  * Also initialize the timer device driver, if required.
- *
- * @return 0
  */
 
-static int nxp_rw600_init(void)
+void soc_early_init_hook(void)
 {
 #if (DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(wwdt), nxp_lpc_wwdt, okay))
 	POWER_EnableResetSource(kPOWER_ResetSourceWdt);
@@ -305,8 +304,9 @@ static int nxp_rw600_init(void)
 #if defined(CONFIG_ADC_MCUX_GAU) ||  defined(CONFIG_DAC_MCUX_GAU)
 	POWER_PowerOnGau();
 #endif
-
-	return 0;
+#if CONFIG_PM
+	nxp_rw6xx_power_init();
+#endif
 }
 
 void soc_reset_hook(void)
@@ -314,5 +314,3 @@ void soc_reset_hook(void)
 	/* This is provided by the SDK */
 	SystemInit();
 }
-
-SYS_INIT(nxp_rw600_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/s32/s32k1/Kconfig b/soc/nxp/s32/s32k1/Kconfig
index 0883614c82b..2bb3a271904 100644
--- a/soc/nxp/s32/s32k1/Kconfig
+++ b/soc/nxp/s32/s32k1/Kconfig
@@ -19,6 +19,7 @@ config SOC_SERIES_S32K1
 	select HAS_MCUX_WDOG32
 	select HAS_MCUX_RTC
 	select HAS_MCUX_ADC12
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_S32K116
 	select CPU_CORTEX_M0PLUS
diff --git a/soc/nxp/s32/s32k1/soc.c b/soc/nxp/s32/s32k1/soc.c
index 20a27eb13c0..484838cf68c 100644
--- a/soc/nxp/s32/s32k1/soc.c
+++ b/soc/nxp/s32/s32k1/soc.c
@@ -48,7 +48,7 @@ void z_arm_watchdog_init(void)
 }
 #endif /* CONFIG_WDOG_INIT */
 
-static int soc_init(void)
+void soc_early_init_hook(void)
 {
 #if !defined(CONFIG_ARM_MPU)
 	uint32_t tmp;
@@ -71,8 +71,4 @@ static int soc_init(void)
 #endif
 
 	OsIf_Init(NULL);
-
-	return 0;
 }
-
-SYS_INIT(soc_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/s32/s32k3/Kconfig b/soc/nxp/s32/s32k3/Kconfig
index fdf0bba2687..627898f7231 100644
--- a/soc/nxp/s32/s32k3/Kconfig
+++ b/soc/nxp/s32/s32k3/Kconfig
@@ -22,6 +22,7 @@ config SOC_SERIES_S32K3
 	select HAS_MCUX_LPSPI
 	select HAS_MCUX_CACHE
 	select HAS_MCUX_EDMA
+	select SOC_EARLY_INIT_HOOK
 
 if SOC_SERIES_S32K3
 
diff --git a/soc/nxp/s32/s32k3/soc.c b/soc/nxp/s32/s32k3/soc.c
index be822677189..e2ecba3c6fb 100644
--- a/soc/nxp/s32/s32k3/soc.c
+++ b/soc/nxp/s32/s32k3/soc.c
@@ -49,14 +49,10 @@ const struct ivt ivt_header __attribute__((section(".ivt_header"))) = {
 };
 #endif /* CONFIG_XIP */
 
-static int soc_init(void)
+void soc_early_init_hook(void)
 {
 	sys_cache_instr_enable();
 	sys_cache_data_enable();
 
 	OsIf_Init(NULL);
-
-	return 0;
 }
-
-SYS_INIT(soc_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/s32/s32ze/Kconfig b/soc/nxp/s32/s32ze/Kconfig
index 8c9041a2fe3..9ee9aaa1429 100644
--- a/soc/nxp/s32/s32ze/Kconfig
+++ b/soc/nxp/s32/s32ze/Kconfig
@@ -18,6 +18,7 @@ config SOC_SERIES_S32ZE
 	select HAS_MCUX_PIT
 	select HAS_MCUX_FLEXCAN
 	select HAS_MCUX_LPI2C
+	select SOC_EARLY_INIT_HOOK
 
 if SOC_SERIES_S32ZE
 
diff --git a/soc/nxp/s32/s32ze/soc.c b/soc/nxp/s32/s32ze/soc.c
index 801e0173ae3..da05a2085b7 100644
--- a/soc/nxp/s32/s32ze/soc.c
+++ b/soc/nxp/s32/s32ze/soc.c
@@ -44,11 +44,7 @@ void soc_reset_hook(void)
 	}
 }
 
-static int soc_init(void)
+void soc_early_init_hook(void)
 {
 	OsIf_Init(NULL);
-
-	return 0;
 }
-
-SYS_INIT(soc_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);

From caa01767d22d85d0c1ef284b8b6b67f799aacad1 Mon Sep 17 00:00:00 2001
From: Declan Snyder <declan.snyder@nxp.com>
Date: Tue, 6 Aug 2024 11:33:22 -0500
Subject: [PATCH 0579/2913] [nrf fromtree] drivers: kinetis-pinctrl: Account
 for SCG K4

Add support for SCG K4 clock control in kinetis pinctrl.

Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
(cherry picked from commit 2db9ea94de253398942c8a5aa6b9dc0ddab509e1)
(cherry picked from commit 9a68f13b535ea576d2d23829670d530b5a3c0113)
---
 drivers/pinctrl/pinctrl_kinetis.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/pinctrl/pinctrl_kinetis.c b/drivers/pinctrl/pinctrl_kinetis.c
index 13b0c8ac720..7a8151c7be1 100644
--- a/drivers/pinctrl/pinctrl_kinetis.c
+++ b/drivers/pinctrl/pinctrl_kinetis.c
@@ -76,9 +76,13 @@ static int pinctrl_mcux_init(const struct device *dev)
 }
 
 #if DT_NODE_HAS_STATUS(DT_INST(0, nxp_kinetis_sim), okay)
-#define PINCTRL_MCUX_DT_INST_CLOCK_SUBSYS(n) \
-	CLK_GATE_DEFINE(DT_INST_CLOCKS_CELL(n, offset), \
-			DT_INST_CLOCKS_CELL(n, bits))
+#define PINCTRL_MCUX_DT_INST_CLOCK_SUBSYS(n)                                                       \
+	CLK_GATE_DEFINE(DT_INST_CLOCKS_CELL(n, offset), DT_INST_CLOCKS_CELL(n, bits))
+#elif DT_HAS_COMPAT_STATUS_OKAY(nxp_scg_k4)
+#define PINCTRL_MCUX_DT_INST_CLOCK_SUBSYS(n)                                                       \
+	(DT_INST_CLOCKS_CELL(n, mrcc_offset) == 0                                                  \
+		 ? 0                                                                               \
+		 : MAKE_MRCC_REGADDR(MRCC_BASE, DT_INST_CLOCKS_CELL(n, mrcc_offset)))
 #else
 #define PINCTRL_MCUX_DT_INST_CLOCK_SUBSYS(n) \
 	DT_INST_CLOCKS_CELL(n, name)

From dd57835df6039b2019f8a8fa8923efd5c07d86cb Mon Sep 17 00:00:00 2001
From: Yong Cong Sin <ycsin@meta.com>
Date: Fri, 20 Sep 2024 10:34:24 +0800
Subject: [PATCH 0580/2913] [nrf fromtree] devicetree: add
 `DT_NODE_HAS_STATUS_OKAY`

We already have `DT_HAS_COMPAT_STATUS_OKAY` and
`DT_NUM_INST_STATUS_OKAY`, it seems intuitive to assume that
`DT_NODE_HAS_STATUS_OKAY` exists, so much so that it was used
before it's implemented.

This patch implements `DT_NODE_HAS_STATUS_OKAY`, which is
equivalent to: `DT_NODE_HAS_STATUS(<node_id>, okay)`

Added test for it in `tests/lib/devicetree/api`

Signed-off-by: Yong Cong Sin <ycsin@meta.com>
Signed-off-by: Yong Cong Sin <yongcong.sin@gmail.com>
(cherry picked from commit 5aebd1276d68af036c30d544d6ef92f0893b53d7)
(cherry picked from commit 7b42e049fe1aa882486eab7dd8cf2ed42ff08f66)
---
 include/zephyr/devicetree.h         | 22 ++++++++++++++++++++++
 tests/lib/devicetree/api/src/main.c | 11 +++++++++++
 2 files changed, 33 insertions(+)

diff --git a/include/zephyr/devicetree.h b/include/zephyr/devicetree.h
index 38c5656079c..eb894a1f9a9 100644
--- a/include/zephyr/devicetree.h
+++ b/include/zephyr/devicetree.h
@@ -3403,6 +3403,28 @@
 #define DT_NODE_HAS_STATUS(node_id, status) \
 	DT_NODE_HAS_STATUS_INTERNAL(node_id, status)
 
+/**
+ * @brief Does a node identifier refer to a node with a status `okay`?
+ *
+ * Example uses:
+ *
+ * @code{.c}
+ *     DT_NODE_HAS_STATUS_OKAY(DT_PATH(soc, i2c_12340000))
+ * @endcode
+ *
+ * Tests whether a node identifier refers to a node which:
+ *
+ * - exists in the devicetree, and
+ * - has a status property as `okay`
+ *
+ * As usual, both a missing status and an `ok` status are treated as
+ * `okay`.
+ *
+ * @param node_id a node identifier
+ * @return 1 if the node has status as `okay`, 0 otherwise.
+ */
+#define DT_NODE_HAS_STATUS_OKAY(node_id) DT_NODE_HAS_STATUS(node_id, okay)
+
 /**
  * @brief Does the devicetree have a status `okay` node with a compatible?
  *
diff --git a/tests/lib/devicetree/api/src/main.c b/tests/lib/devicetree/api/src/main.c
index 9de03524d8a..aacbc16b404 100644
--- a/tests/lib/devicetree/api/src/main.c
+++ b/tests/lib/devicetree/api/src/main.c
@@ -366,6 +366,17 @@ ZTEST(devicetree_api, test_has_status)
 		      0, "");
 }
 
+ZTEST(devicetree_api, test_has_status_okay)
+{
+	zassert_equal(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(test_gpio_1)), 1);
+
+	zassert_equal(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(test_no_status)), 1);
+
+	zassert_equal(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(disabled_gpio)), 0);
+
+	zassert_equal(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(reserved_gpio)), 0);
+}
+
 ZTEST(devicetree_api, test_bus)
 {
 	int pin, flags;

From 4270d8ac31d2b34f56d73e0ed9b14a5b5f041687 Mon Sep 17 00:00:00 2001
From: Yong Cong Sin <ycsin@meta.com>
Date: Fri, 20 Sep 2024 12:47:40 +0800
Subject: [PATCH 0581/2913] [nrf fromtree] zephyr: bulk update to
 DT_NODE_HAS_STATUS_OKAY

Change instances of:

DT_NODE_HAS_STATUS(<node_id>, okay)

to

DT_NODE_HAS_STATUS_OKAY(<node_id>)

Signed-off-by: Yong Cong Sin <ycsin@meta.com>
Signed-off-by: Yong Cong Sin <yongcong.sin@gmail.com>
(cherry picked from commit 52a202309bd383c3c60770ab5e6e6ac4d263f5c4)
(cherry picked from commit 8fc34fce468426117856f2954d0007b20b051ea8)
---
 arch/arm/core/cortex_m/fault.c                |   2 +-
 boards/arm/v2m_musca_b1/pinmux.c              |   2 +-
 boards/arm/v2m_musca_s1/pinmux.c              |   2 +-
 boards/digilent/arty_a7/board.c               |   4 +-
 boards/nordic/nrf9160dk/board.c               |   4 +-
 boards/nordic/nrf9160dk/nrf52840_reset.c      |   4 +-
 boards/nxp/frdm_mcxa156/board.c               |  22 +--
 boards/nxp/frdm_mcxn236/board.c               |  36 ++--
 boards/nxp/frdm_mcxn947/board.c               |  58 +++---
 boards/silabs/dev_kits/sltb004a/board.c       |   2 +-
 drivers/adc/adc_gd32.c                        |   6 +-
 drivers/audio/dmic_mcux.c                     |   2 +-
 drivers/clock_control/clock_control_gd32.c    |   2 +-
 .../clock_control/clock_control_ifx_cat1.c    | 174 +++++++++---------
 drivers/clock_control/clock_control_litex.h   |   2 +-
 drivers/clock_control/clock_control_max32.c   |  12 +-
 .../clock_control/clock_control_mcux_ccm.c    |  14 +-
 .../clock_control/clock_control_mcux_scg.c    |   4 +-
 .../clock_control/clock_control_mcux_sim.c    |   2 +-
 .../clock_control/clock_control_nrf2_fll16m.c |   2 +-
 .../clock_control/clock_control_nrf2_lfclk.c  |   2 +-
 .../clock_control/clock_control_renesas_ra.c  |   2 +-
 .../clock_control_renesas_ra_cgc.c            |   2 +-
 .../clock_control/clock_control_smartbond.c   |  18 +-
 drivers/clock_control/clock_stm32_ll_wb0.c    |   2 +-
 drivers/counter/counter_mcux_snvs.c           |   4 +-
 drivers/counter/counter_smartbond_timer.c     |   2 +-
 drivers/disk/sdmmc_stm32.c                    |   2 +-
 drivers/dma/dma_mcux_edma.c                   |   6 +-
 drivers/dma/dma_stm32.c                       |  16 +-
 drivers/dma/dma_stm32_bdma.c                  |   4 +-
 drivers/dma/dmamux_stm32.c                    |  28 +--
 drivers/espi/espi_mchp_xec_host_v2.c          |   6 +-
 drivers/ethernet/eth_stm32_hal.c              |   4 +-
 drivers/ethernet/nxp_enet/eth_mcux.c          |  10 +-
 drivers/ethernet/nxp_enet/eth_nxp_enet.c      |   2 +-
 drivers/ethernet/phy/phy_adin2111.c           |   2 +-
 drivers/flash/soc_flash_lpc.c                 |   4 +-
 drivers/flash/soc_flash_mcux.c                |  12 +-
 drivers/flash/soc_flash_nrf.c                 |   8 +-
 drivers/gpio/gpio_esp32.c                     |  14 +-
 drivers/gpio/gpio_gd32.c                      |   2 +-
 drivers/gpio/gpio_lpc11u6x.c                  |  12 +-
 drivers/gpio/gpio_mchp_xec.c                  |  24 +--
 drivers/gpio/gpio_nrfx.c                      |   2 +-
 drivers/gpio/gpio_nxp_s32.c                   |   8 +-
 drivers/gpio/gpio_renesas_ra_ioport.c         |   2 +-
 drivers/gpio/gpio_sam0.c                      |   8 +-
 drivers/gpio/gpio_stm32.c                     |   4 +-
 drivers/gpio/gpio_xlnx_axi.c                  |   2 +-
 drivers/i2c/i2c_esp32.c                       |   8 +-
 drivers/i2s/i2s_litex.c                       |   4 +-
 .../interrupt_controller/intc_mchp_ecia_xec.c |   2 +-
 drivers/led_strip/lpd880x.c                   |   2 +-
 drivers/lora/shell.c                          |   2 +-
 drivers/memc/memc_nxp_s32_qspi.c              |   2 +-
 drivers/pinctrl/pinctrl_esp32.c               |   4 +-
 drivers/pinctrl/pinctrl_ite_it8xxx2.c         |   2 +-
 drivers/pinctrl/pinctrl_kinetis.c             |   2 +-
 drivers/rtc/rtc_smartbond.c                   |   2 +-
 drivers/sensor/bosch/bmi08x/bmi08x.h          |   2 +-
 drivers/sensor/st/stm32_temp/stm32_temp.c     |   4 +-
 drivers/sensor/st/stm32_vbat/stm32_vbat.c     |   2 +-
 drivers/sensor/st/stm32_vref/stm32_vref.c     |   4 +-
 drivers/serial/leuart_gecko.c                 |   8 +-
 drivers/serial/uart_cmsdk_apb.c               |  20 +-
 drivers/serial/uart_lpc11u6x.c                |  84 ++++-----
 drivers/serial/uart_lpc11u6x.h                |  16 +-
 drivers/serial/uart_miv.c                     |   4 +-
 drivers/spi/spi_smartbond.c                   |   4 +-
 drivers/spi/spi_xec_qmspi.c                   |   4 +-
 drivers/timer/mcux_os_timer.c                 |  10 +-
 drivers/timer/nrf_grtc_timer.c                |   4 +-
 drivers/timer/smartbond_timer.c               |   2 +-
 drivers/usb/device/usb_dc_mcux.c              |   8 +-
 drivers/usb/device/usb_dc_nrfx.c              |   4 +-
 drivers/usb/udc/udc_nrf.c                     |   4 +-
 drivers/watchdog/wdt_esp32.c                  |   4 +-
 include/zephyr/device.h                       |   2 +-
 .../clock_control/stm32_clock_control.h       |   6 +-
 include/zephyr/drivers/emul.h                 |   2 +-
 include/zephyr/linker/linker-defs.h           |   9 +-
 include/zephyr/pm/state.h                     |   6 +-
 kernel/init.c                                 |   6 +-
 kernel/xip.c                                  |   6 +-
 modules/hal_nordic/nrfx/nrfx_config.h         |   2 +-
 samples/basic/button/src/main.c               |   2 +-
 samples/basic/threads/src/main.c              |   4 +-
 samples/bluetooth/central_otc/src/main.c      |   4 +-
 .../encrypted_advertising/central/src/main.c  |   2 +-
 .../peripheral/src/main.c                     |   2 +-
 samples/bluetooth/iso_receive/src/main.c      |   2 +-
 samples/bluetooth/mesh_provisioner/src/main.c |   8 +-
 samples/bluetooth/periodic_sync/src/main.c    |   2 +-
 samples/bluetooth/peripheral_hids/src/hog.c   |   2 +-
 samples/bluetooth/peripheral_hr/src/main.c    |   2 +-
 .../boards/espressif/deep_sleep/src/main.c    |   2 +-
 .../boards/espressif/light_sleep/src/main.c   |   2 +-
 samples/boards/nordic/battery/src/battery.c   |   4 +-
 .../nxp/mimxrt1060_evk/system_off/src/main.c  |   4 +-
 samples/boards/st/i2c_timing/src/main.c       |   2 +-
 samples/boards/st/mco/src/main.c              |   2 +-
 .../st/power_mgmt/standby_shutdown/src/main.c |   2 +-
 .../boards/st/power_mgmt/wkup_pins/src/main.c |   2 +-
 samples/drivers/espi/src/main.c               |  10 +-
 samples/drivers/i2s/echo/src/main.c           |  12 +-
 samples/drivers/lora/receive/src/main.c       |   2 +-
 samples/drivers/lora/send/src/main.c          |   2 +-
 samples/shields/x_nucleo_53l0a1/src/main.c    |   2 +-
 .../subsys/mgmt/osdp/control_panel/src/main.c |   2 +-
 .../mgmt/osdp/peripheral_device/src/main.c    |   2 +-
 samples/subsys/task_wdt/src/main.c            |   2 +-
 soc/arm/beetle/power.c                        |  12 +-
 soc/atmel/sam/common/soc_power.c              |   4 +-
 soc/intel/intel_adsp/common/clk.c             |   4 +-
 .../intel_adsp/common/include/adsp_clk.h      |   4 +-
 soc/intel/intel_adsp/common/mem_window.c      |   8 +-
 soc/ite/ec/it8xxx2/soc.c                      |   8 +-
 soc/microchip/mec/common/soc_dt.h             |   2 +-
 soc/microchip/mec/mec172x/device_power.c      |   6 +-
 .../common/nrf54hx_nrf92x_mpu_regions.c       |   6 +-
 soc/nordic/nrf52/soc.c                        |   2 +-
 soc/nordic/nrf53/soc.c                        |   2 +-
 soc/nordic/nrf54h/soc.c                       |   2 +-
 soc/nordic/nrf92/soc.c                        |   2 +-
 soc/nordic/validate_enabled_instances.c       |   6 +-
 soc/nxp/imx/imx6sx/soc.c                      |  86 ++++-----
 soc/nxp/imx/imx7d/soc.c                       |  26 +--
 soc/nxp/imx/imx8m/a53/soc.c                   |   8 +-
 soc/nxp/imx/imx8m/m4_mini/soc.c               |   8 +-
 soc/nxp/imx/imx8m/m4_quad/soc.c               |   8 +-
 soc/nxp/imx/imx8m/m7/soc.c                    |  24 +--
 soc/nxp/imxrt/imxrt10xx/flexspi.c             |   2 +-
 soc/nxp/imxrt/imxrt10xx/soc.c                 |  24 +--
 soc/nxp/imxrt/imxrt118x/soc.c                 |  36 ++--
 soc/nxp/imxrt/imxrt11xx/soc.c                 |  24 +--
 soc/nxp/imxrt/imxrt5xx/cm33/soc.c             |   4 +-
 soc/nxp/imxrt/imxrt6xx/cm33/soc.c             |   4 +-
 soc/nxp/imxrt/imxrt6xx/cm33/soc.h             |   4 +-
 soc/nxp/kinetis/k6x/soc.c                     |   2 +-
 soc/nxp/kinetis/ke1xf/soc.c                   |  32 ++--
 soc/nxp/kinetis/ke1xz/soc.c                   |  18 +-
 soc/nxp/kinetis/kl2x/soc.c                    |   2 +-
 soc/nxp/kinetis/kwx/soc_kw4xz.c               |   8 +-
 soc/nxp/lpc/lpc55xxx/soc.c                    |   2 +-
 soc/nxp/mcx/mcxc/soc.c                        |   2 +-
 soc/nxp/rw/power.c                            |  14 +-
 soc/nxp/rw/soc.c                              |  10 +-
 soc/openisa/rv32m1/soc.c                      |   8 +-
 soc/renesas/ra/ra4m1/soc.c                    |   2 +-
 soc/renesas/smartbond/da1469x/power.c         |   2 +-
 soc/snps/emsk/soc_config.c                    |   8 +-
 soc/st/stm32/stm32h7x/mpu_regions.c           |   4 +-
 soc/xlnx/zynq7000/xc7zxxx/soc.c               |   8 +-
 soc/xlnx/zynq7000/xc7zxxxs/soc.c              |   8 +-
 .../nordic/hal/nrf5/radio/radio_nrf5_fem.h    |   4 +-
 subsys/pm/policy.c                            |   4 +-
 subsys/tracing/sysview/sysview_config.c       |   2 +-
 subsys/usb/device/usb_device.c                |   2 +-
 .../host/id/mocks/zephyr/linker/linker-defs.h |   4 +
 tests/drivers/adc/adc_api/src/test_adc.c      |   4 +-
 .../src/test_stm32_clock_configuration_adc.c  |   2 +-
 .../src/test_stm32_clock_configuration_i2c.c  |   2 +-
 .../src/test_stm32_clock_configuration_i2s.c  |   2 +-
 .../test_stm32_clock_configuration_lptim.c    |   2 +-
 .../src/test_stm32_clock_configuration.c      |   2 +-
 tests/drivers/eeprom/api/src/main.c           |   4 +-
 tests/drivers/gpio/gpio_basic_api/src/main.c  |   2 +-
 .../gpio/gpio_basic_api/src/test_gpio.h       |   8 +-
 .../gpio/gpio_reserved_ranges/src/main.c      |  12 +-
 tests/drivers/i2c/i2c_api/src/test_i2c.c      |   6 +-
 tests/drivers/i2c/i2c_ram/src/test_i2c_ram.c  |   2 +-
 tests/drivers/i2c/i2c_tca954x/src/main.c      |   4 +-
 tests/drivers/memc/ram/src/main.c             |  24 +--
 tests/drivers/pwm/pwm_api/src/test_pwm.c      |   8 +-
 .../drivers/smbus/smbus_api/src/test_smbus.c  |   2 +-
 .../smbus/smbus_api/src/test_smbus_qemu.c     |   2 +-
 .../watchdog/wdt_basic_api/src/test_wdt.c     |   4 +-
 .../watchdog/wdt_basic_reset_none/src/main.c  |   2 +-
 .../watchdog/wdt_error_cases/src/main.c       |   4 +-
 180 files changed, 743 insertions(+), 738 deletions(-)

diff --git a/arch/arm/core/cortex_m/fault.c b/arch/arm/core/cortex_m/fault.c
index 4cc01f87129..4e604ba8033 100644
--- a/arch/arm/core/cortex_m/fault.c
+++ b/arch/arm/core/cortex_m/fault.c
@@ -743,7 +743,7 @@ static inline bool z_arm_is_pc_valid(uintptr_t pc)
 		return true;
 	}
 
-#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_itcm), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_itcm))
 	/* Is it in the ITCM */
 	if ((((uintptr_t)&__itcm_start) <= pc) && (pc < ((uintptr_t)&__itcm_end))) {
 		return true;
diff --git a/boards/arm/v2m_musca_b1/pinmux.c b/boards/arm/v2m_musca_b1/pinmux.c
index 443d462eb21..2a2c44d62b9 100644
--- a/boards/arm/v2m_musca_b1/pinmux.c
+++ b/boards/arm/v2m_musca_b1/pinmux.c
@@ -40,7 +40,7 @@ static void arm_musca_b1_pinmux_defaults(void)
 	scc[IOMUX_ALTF1_OUTSEL] = 0xffff;
 	scc[IOMUX_ALTF1_OENSEL] = 0xffff;
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart0))
 	/* clear bit 0/1 for GPIO0/1 to steer from ALTF1 */
 	scc[IOMUX_MAIN_INSEL] &= ~(BIT(0) | BIT(1));
 	scc[IOMUX_MAIN_OUTSEL] &= ~(BIT(0) | BIT(1));
diff --git a/boards/arm/v2m_musca_s1/pinmux.c b/boards/arm/v2m_musca_s1/pinmux.c
index a1a1a4ad252..3affa53dadf 100644
--- a/boards/arm/v2m_musca_s1/pinmux.c
+++ b/boards/arm/v2m_musca_s1/pinmux.c
@@ -40,7 +40,7 @@ static void arm_musca_s1_pinmux_defaults(void)
 	scc[IOMUX_ALTF1_OUTSEL] = 0xffff;
 	scc[IOMUX_ALTF1_OENSEL] = 0xffff;
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart0))
 	/* clear bit 0/1 for GPIO0/1 to steer from ALTF1 */
 	scc[IOMUX_MAIN_INSEL]  &= ~(BIT(0) | BIT(1));
 	scc[IOMUX_MAIN_OUTSEL] &= ~(BIT(0) | BIT(1));
diff --git a/boards/digilent/arty_a7/board.c b/boards/digilent/arty_a7/board.c
index 984cd34ab43..0e087c212b4 100644
--- a/boards/digilent/arty_a7/board.c
+++ b/boards/digilent/arty_a7/board.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(board, CONFIG_LOG_DEFAULT_LEVEL);
 
 #define DAPLINK_QSPI_MUX_NODE DT_NODELABEL(daplink_qspi_mux)
 
-#if DT_NODE_HAS_STATUS(DAPLINK_QSPI_MUX_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(DAPLINK_QSPI_MUX_NODE)
 int board_daplink_qspi_mux_select(enum board_daplink_qspi_mux_mode mode)
 {
 	struct gpio_dt_spec mux = GPIO_DT_SPEC_GET(DAPLINK_QSPI_MUX_NODE, mux_gpios);
@@ -77,4 +77,4 @@ static int board_init(void)
 }
 
 SYS_INIT(board_init, POST_KERNEL, CONFIG_BOARD_INIT_PRIORITY);
-#endif /* DT_NODE_HAS_STATUS(DAPLINK_QSPI_MUX_NODE, okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DAPLINK_QSPI_MUX_NODE) */
diff --git a/boards/nordic/nrf9160dk/board.c b/boards/nordic/nrf9160dk/board.c
index adf137df196..c8e680c4539 100644
--- a/boards/nordic/nrf9160dk/board.c
+++ b/boards/nordic/nrf9160dk/board.c
@@ -32,7 +32,7 @@ LOG_MODULE_REGISTER(board_control, CONFIG_BOARD_NRF9160DK_LOG_LEVEL);
 				 GET_PORT(reset_input, gpios, 0) == 0 && \
 				 GET_PIN(reset_input, gpios, 0) == 18)
 #define USE_RESET_GPIO \
-	(DT_NODE_HAS_STATUS(DT_NODELABEL(reset_input), okay) && \
+	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(reset_input)) && \
 	 !RESET_INPUT_IS_PINRESET)
 
 struct switch_cfg {
@@ -47,7 +47,7 @@ struct switch_cfg {
 #endif
 };
 
-#define ROUTING_ENABLED(_name) DT_NODE_HAS_STATUS(DT_NODELABEL(_name), okay)
+#define ROUTING_ENABLED(_name) DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(_name))
 #define SWITCH_CFG(_name, _idx)					\
 {								\
 	.gpio  = GET_DEV(_name, control_gpios, _idx),		\
diff --git a/boards/nordic/nrf9160dk/nrf52840_reset.c b/boards/nordic/nrf9160dk/nrf52840_reset.c
index e639b5765b7..aa9f9d4b620 100644
--- a/boards/nordic/nrf9160dk/nrf52840_reset.c
+++ b/boards/nordic/nrf9160dk/nrf52840_reset.c
@@ -12,7 +12,7 @@
 
 #define RESET_NODE DT_NODELABEL(nrf52840_reset)
 
-#if DT_NODE_HAS_STATUS(RESET_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(RESET_NODE)
 
 #define RESET_GPIO_CTRL  DT_GPIO_CTLR(RESET_NODE, gpios)
 #define RESET_GPIO_PIN   DT_GPIO_PIN(RESET_NODE, gpios)
@@ -65,4 +65,4 @@ int bt_hci_transport_setup(const struct device *h4)
 	return 0;
 }
 
-#endif /* DT_NODE_HAS_STATUS(RESET_NODE, okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(RESET_NODE) */
diff --git a/boards/nxp/frdm_mcxa156/board.c b/boards/nxp/frdm_mcxa156/board.c
index 98801c47a1a..84347c4715c 100644
--- a/boards/nxp/frdm_mcxa156/board.c
+++ b/boards/nxp/frdm_mcxa156/board.c
@@ -66,52 +66,52 @@ static int frdm_mcxa156_init(void)
 	CLOCK_SetClockDiv(kCLOCK_DivAHBCLK, 1U);     /* !< Set AHBCLKDIV divider to value 1 */
 	CLOCK_SetClockDiv(kCLOCK_DivFRO_HF_DIV, 1U); /* !< Set FROHFDIV divider to value 1 */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(porta), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(porta))
 	RESET_ReleasePeripheralReset(kPORT0_RST_SHIFT_RSTn);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(portb), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portb))
 	RESET_ReleasePeripheralReset(kPORT1_RST_SHIFT_RSTn);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(portc), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portc))
 	RESET_ReleasePeripheralReset(kPORT2_RST_SHIFT_RSTn);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(portd), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portd))
 	RESET_ReleasePeripheralReset(kPORT3_RST_SHIFT_RSTn);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(porte), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(porte))
 	RESET_ReleasePeripheralReset(kPORT4_RST_SHIFT_RSTn);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
 	RESET_ReleasePeripheralReset(kGPIO0_RST_SHIFT_RSTn);
 	CLOCK_EnableClock(kCLOCK_GateGPIO0);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
 	RESET_ReleasePeripheralReset(kGPIO1_RST_SHIFT_RSTn);
 	CLOCK_EnableClock(kCLOCK_GateGPIO1);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
 	RESET_ReleasePeripheralReset(kGPIO2_RST_SHIFT_RSTn);
 	CLOCK_EnableClock(kCLOCK_GateGPIO2);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio3))
 	RESET_ReleasePeripheralReset(kGPIO3_RST_SHIFT_RSTn);
 	CLOCK_EnableClock(kCLOCK_GateGPIO3);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio4))
 	RESET_ReleasePeripheralReset(kGPIO4_RST_SHIFT_RSTn);
 	CLOCK_EnableClock(kCLOCK_GateGPIO4);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart0))
 	CLOCK_SetClockDiv(kCLOCK_DivLPUART0, 1u);
 	CLOCK_AttachClk(kFRO12M_to_LPUART0);
 #endif
diff --git a/boards/nxp/frdm_mcxn236/board.c b/boards/nxp/frdm_mcxn236/board.c
index 8f0d1fd7976..fbaf20ccd65 100644
--- a/boards/nxp/frdm_mcxn236/board.c
+++ b/boards/nxp/frdm_mcxn236/board.c
@@ -88,84 +88,84 @@ static int frdm_mcxn236_init(void)
 	/* Set AHBCLKDIV divider to value 1 */
 	CLOCK_SetClkDiv(kCLOCK_DivAhbClk, 1U);
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm1))
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom1Clk, 1u);
 	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM1);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm2))
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom2Clk, 1u);
 	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM2);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm3))
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom3Clk, 1u);
 	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM3);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm4))
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom4Clk, 1u);
 	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM4);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm5), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm5))
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom5Clk, 1u);
 	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM5);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(os_timer), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(os_timer))
 	CLOCK_AttachClk(kCLK_1M_to_OSTIMER);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
 	CLOCK_EnableClock(kCLOCK_Gpio0);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
 	CLOCK_EnableClock(kCLOCK_Gpio1);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
 	CLOCK_EnableClock(kCLOCK_Gpio2);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio3))
 	CLOCK_EnableClock(kCLOCK_Gpio3);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio4))
 	CLOCK_EnableClock(kCLOCK_Gpio4);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio5), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio5))
 	CLOCK_EnableClock(kCLOCK_Gpio5);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(wwdt0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(wwdt0))
 	CLOCK_SetClkDiv(kCLOCK_DivWdt0Clk, 1u);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer0))
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer0Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER0);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer1))
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer1Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER1);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer2))
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer2Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER2);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer3))
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer3Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER3);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer4))
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer4Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER4);
 #endif
diff --git a/boards/nxp/frdm_mcxn947/board.c b/boards/nxp/frdm_mcxn947/board.c
index 37ec5f4dd6d..db21a4ae194 100644
--- a/boards/nxp/frdm_mcxn947/board.c
+++ b/boards/nxp/frdm_mcxn947/board.c
@@ -127,7 +127,7 @@ static int frdm_mcxn947_init(void)
 
 	CLOCK_SetupExtClocking(BOARD_XTAL0_CLK_HZ);
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcan0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcan0))
 	/* Set up PLL1 for 80 MHz FlexCAN clock */
 	const pll_setup_t pll1Setup = {
 		.pllctrl = SCG_SPLLCTRL_SOURCE(1U) | SCG_SPLLCTRL_SELI(27U) |
@@ -146,50 +146,50 @@ static int frdm_mcxn947_init(void)
 	CLOCK_SetClkDiv(kCLOCK_DivPLL1Clk0, 1U);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm1))
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom1Clk, 1u);
 	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM1);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm2))
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom2Clk, 1u);
 	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM2);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm4))
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom4Clk, 1u);
 	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM4);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(os_timer), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(os_timer))
 	CLOCK_AttachClk(kCLK_1M_to_OSTIMER);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
 	CLOCK_EnableClock(kCLOCK_Gpio0);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
 	CLOCK_EnableClock(kCLOCK_Gpio1);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
 	CLOCK_EnableClock(kCLOCK_Gpio2);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio3))
 	CLOCK_EnableClock(kCLOCK_Gpio3);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio4))
 	CLOCK_EnableClock(kCLOCK_Gpio4);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio5), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio5))
 	CLOCK_EnableClock(kCLOCK_Gpio5);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(dac0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dac0))
 	SPC_EnableActiveModeAnalogModules(SPC0, kSPC_controlDac0);
 	CLOCK_SetClkDiv(kCLOCK_DivDac0Clk, 1u);
 	CLOCK_AttachClk(kFRO_HF_to_DAC0);
@@ -197,7 +197,7 @@ static int frdm_mcxn947_init(void)
 	CLOCK_EnableClock(kCLOCK_Dac0);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(dac1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dac1))
 	SPC_EnableActiveModeAnalogModules(SPC0, kSPC_controlDac1);
 	CLOCK_SetClkDiv(kCLOCK_DivDac1Clk, 1u);
 	CLOCK_AttachClk(kFRO_HF_to_DAC1);
@@ -205,7 +205,7 @@ static int frdm_mcxn947_init(void)
 	CLOCK_EnableClock(kCLOCK_Dac1);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet))
 	CLOCK_AttachClk(kNONE_to_ENETRMII);
 	CLOCK_EnableClock(kCLOCK_Enet);
 	SYSCON0->PRESETCTRL2 = SYSCON_PRESETCTRL2_ENET_RST_MASK;
@@ -214,41 +214,41 @@ static int frdm_mcxn947_init(void)
 	SYSCON->ENET_PHY_INTF_SEL = SYSCON_ENET_PHY_INTF_SEL_PHY_SEL(1);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(wwdt0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(wwdt0))
 	CLOCK_SetClkDiv(kCLOCK_DivWdt0Clk, 1u);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer0))
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer0Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER0);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer1))
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer1Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER1);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer2))
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer2Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER2);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer3))
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer3Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER3);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer4))
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer4Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER4);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcan0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcan0))
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcan0Clk, 1U);
 	CLOCK_AttachClk(kPLL1_CLK0_to_FLEXCAN0);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc0))
 	CLOCK_SetClkDiv(kCLOCK_DivUSdhcClk, 1u);
 	CLOCK_AttachClk(kFRO_HF_to_USDHC);
 #endif
@@ -260,17 +260,17 @@ static int frdm_mcxn947_init(void)
 	enable_cache64();
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(vref), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(vref))
 	CLOCK_EnableClock(kCLOCK_Vref);
 	SPC_EnableActiveModeAnalogModules(SPC0, kSPC_controlVref);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpadc0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpadc0))
 	CLOCK_SetClkDiv(kCLOCK_DivAdc0Clk, 1U);
 	CLOCK_AttachClk(kFRO_HF_to_ADC0);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb1), okay) && CONFIG_USB_DC_NXP_EHCI
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb1)) && CONFIG_USB_DC_NXP_EHCI
 	usb_phy_config_struct_t usbPhyConfig = {
 		BOARD_USB_PHY_D_CAL, BOARD_USB_PHY_TXCAL45DP, BOARD_USB_PHY_TXCAL45DM,
 	};
@@ -312,13 +312,13 @@ static int frdm_mcxn947_init(void)
 	USB_EhciPhyInit(kUSB_ControllerEhci0, BOARD_XTAL0_CLK_HZ, &usbPhyConfig);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpcmp0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpcmp0))
 	CLOCK_SetClkDiv(kCLOCK_DivCmp0FClk, 1U);
 	CLOCK_AttachClk(kFRO12M_to_CMP0F);
 	SPC_EnableActiveModeAnalogModules(SPC0, (kSPC_controlCmp0 | kSPC_controlCmp0Dac));
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lptmr0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lptmr0))
 
 /*
  * Clock Select Decides what input source the lptmr will clock from
@@ -340,9 +340,9 @@ static int frdm_mcxn947_init(void)
 	CLOCK_SetupClockCtrl(kCLOCK_CLKIN_ENA_FM_USBH_LPT);
 #endif /* DT_PROP(DT_NODELABEL(lptmr0), clk_source) */
 
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(lptmr0), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lptmr0)) */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexio0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexio0))
 	CLOCK_SetClkDiv(kCLOCK_DivFlexioClk, 1u);
 	CLOCK_AttachClk(kPLL0_to_FLEXIO);
 #endif
diff --git a/boards/silabs/dev_kits/sltb004a/board.c b/boards/silabs/dev_kits/sltb004a/board.c
index 43dd2a6b3b2..1b09177ce69 100644
--- a/boards/silabs/dev_kits/sltb004a/board.c
+++ b/boards/silabs/dev_kits/sltb004a/board.c
@@ -37,7 +37,7 @@ static int efr32mg_sltb004a_init(void)
 
 #define CCS811 DT_NODELABEL(ccs811)
 
-#if DT_NODE_HAS_STATUS(CCS811, okay)
+#if DT_NODE_HAS_STATUS_OKAY(CCS811)
 	cfg = (struct supply_cfg){
 		.gpio = DEVICE_DT_GET(DT_GPIO_CTLR(CCS811, supply_gpios)),
 		.pin = DT_GPIO_PIN(CCS811, supply_gpios),
diff --git a/drivers/adc/adc_gd32.c b/drivers/adc/adc_gd32.c
index 75760de6713..46fbfc783b7 100644
--- a/drivers/adc/adc_gd32.c
+++ b/drivers/adc/adc_gd32.c
@@ -41,9 +41,9 @@ LOG_MODULE_REGISTER(adc_gd32, CONFIG_ADC_LOG_LEVEL);
 #define ADC1_NODE		DT_NODELABEL(adc1)
 #define ADC2_NODE		DT_NODELABEL(adc2)
 
-#define ADC0_ENABLE		DT_NODE_HAS_STATUS(ADC0_NODE, okay)
-#define ADC1_ENABLE		DT_NODE_HAS_STATUS(ADC1_NODE, okay)
-#define ADC2_ENABLE		DT_NODE_HAS_STATUS(ADC2_NODE, okay)
+#define ADC0_ENABLE		DT_NODE_HAS_STATUS_OKAY(ADC0_NODE)
+#define ADC1_ENABLE		DT_NODE_HAS_STATUS_OKAY(ADC1_NODE)
+#define ADC2_ENABLE		DT_NODE_HAS_STATUS_OKAY(ADC2_NODE)
 
 #ifndef	ADC0
 /**
diff --git a/drivers/audio/dmic_mcux.c b/drivers/audio/dmic_mcux.c
index ff357fda9bb..0f032e8368c 100644
--- a/drivers/audio/dmic_mcux.c
+++ b/drivers/audio/dmic_mcux.c
@@ -686,7 +686,7 @@ static const struct _dmic_ops dmic_ops = {
 
 /* Gets pointer for a given PDM channel node */
 #define PDM_DMIC_CHAN_GET(pdm_node)						\
-	COND_CODE_1(DT_NODE_HAS_STATUS(pdm_node, okay),				\
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(pdm_node),				\
 		    (&pdm_channel_##pdm_node), (NULL)),
 
 /* Gets array of pointers to PDM channels */
diff --git a/drivers/clock_control/clock_control_gd32.c b/drivers/clock_control/clock_control_gd32.c
index 1a20d5e4ab2..52b197e2029 100644
--- a/drivers/clock_control/clock_control_gd32.c
+++ b/drivers/clock_control/clock_control_gd32.c
@@ -43,7 +43,7 @@ struct clock_control_gd32_config {
 #if DT_HAS_COMPAT_STATUS_OKAY(gd_gd32_timer)
 /* timer identifiers */
 #define TIMER_ID_OR_NONE(nodelabel)                                            \
-	COND_CODE_1(DT_NODE_HAS_STATUS(DT_NODELABEL(nodelabel), okay),         \
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(nodelabel)),          \
 		    (DT_CLOCKS_CELL(DT_NODELABEL(nodelabel), id),), ())
 
 static const uint16_t timer_ids[] = {
diff --git a/drivers/clock_control/clock_control_ifx_cat1.c b/drivers/clock_control/clock_control_ifx_cat1.c
index 1d89ed0fbe0..606e06c4e46 100644
--- a/drivers/clock_control/clock_control_ifx_cat1.c
+++ b/drivers/clock_control/clock_control_ifx_cat1.c
@@ -18,111 +18,111 @@
 
 /* Enumeration of enabled in device tree Clock, uses for indexing clock info table */
 enum {
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_imo), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_imo))
 	INFINEON_CAT1_CLOCK_IMO,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_iho), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_iho))
 	INFINEON_CAT1_CLOCK_IHO,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux0))
 	INFINEON_CAT1_CLOCK_PATHMUX0,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux1))
 	INFINEON_CAT1_CLOCK_PATHMUX1,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux2))
 	INFINEON_CAT1_CLOCK_PATHMUX2,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux3))
 	INFINEON_CAT1_CLOCK_PATHMUX3,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux4))
 	INFINEON_CAT1_CLOCK_PATHMUX4,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf0))
 	INFINEON_CAT1_CLOCK_HF0,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf1))
 	INFINEON_CAT1_CLOCK_HF1,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf2))
 	INFINEON_CAT1_CLOCK_HF2,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf3))
 	INFINEON_CAT1_CLOCK_HF3,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf4))
 	INFINEON_CAT1_CLOCK_HF4,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf5), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf5))
 	INFINEON_CAT1_CLOCK_HF5,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf6), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf6))
 	INFINEON_CAT1_CLOCK_HF6,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf7), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf7))
 	INFINEON_CAT1_CLOCK_HF7,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf8), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf8))
 	INFINEON_CAT1_CLOCK_HF8,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf9), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf9))
 	INFINEON_CAT1_CLOCK_HF9,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf10), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf10))
 	INFINEON_CAT1_CLOCK_HF10,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf11), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf11))
 	INFINEON_CAT1_CLOCK_HF11,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf12), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf12))
 	INFINEON_CAT1_CLOCK_HF12,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf13), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf13))
 	INFINEON_CAT1_CLOCK_HF13,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_fast), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_fast))
 	INFINEON_CAT1_CLOCK_FAST,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_slow), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_slow))
 	INFINEON_CAT1_CLOCK_SLOW,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_peri), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_peri))
 	INFINEON_CAT1_CLOCK_PERI,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pll0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll0))
 	INFINEON_CAT1_CLOCK_PLL0,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pll1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll1))
 	INFINEON_CAT1_CLOCK_PLL1,
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(fll0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(fll0))
 	INFINEON_CAT1_CLOCK_FLL0,
 #endif
 
@@ -142,111 +142,111 @@ struct infineon_cat1_clock_info_t {
 static struct infineon_cat1_clock_info_t
 	clock_info_table[INFINEON_CAT1_ENABLED_CLOCK_COUNT] = {
 	/* We always have IMO */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_imo), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_imo))
 	[INFINEON_CAT1_CLOCK_IMO] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_imo)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_iho), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_iho))
 	[INFINEON_CAT1_CLOCK_IHO] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_iho)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux0))
 	[INFINEON_CAT1_CLOCK_PATHMUX0] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(path_mux0)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux1))
 	[INFINEON_CAT1_CLOCK_PATHMUX1] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(path_mux1)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux2))
 	[INFINEON_CAT1_CLOCK_PATHMUX2] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(path_mux2)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux3))
 	[INFINEON_CAT1_CLOCK_PATHMUX3] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(path_mux3)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux4))
 	[INFINEON_CAT1_CLOCK_PATHMUX4] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(path_mux4)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf0))
 	[INFINEON_CAT1_CLOCK_HF0] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf0)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf1))
 	[INFINEON_CAT1_CLOCK_HF1] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf1)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf2))
 	[INFINEON_CAT1_CLOCK_HF2] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf2)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf3))
 	[INFINEON_CAT1_CLOCK_HF3] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf3)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf4))
 	[INFINEON_CAT1_CLOCK_HF4] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf4)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf5), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf5))
 	[INFINEON_CAT1_CLOCK_HF5] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf5)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf6), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf6))
 	[INFINEON_CAT1_CLOCK_HF6] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf6)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf7), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf7))
 	[INFINEON_CAT1_CLOCK_HF7] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf7)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf8), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf8))
 	[INFINEON_CAT1_CLOCK_HF8] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf8)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf9), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf9))
 	[INFINEON_CAT1_CLOCK_HF9] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf9)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf10), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf10))
 	[INFINEON_CAT1_CLOCK_HF10] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf10)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf11), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf11))
 	[INFINEON_CAT1_CLOCK_HF11] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf11)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf12), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf12))
 	[INFINEON_CAT1_CLOCK_HF12] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf12)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf13), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf13))
 	[INFINEON_CAT1_CLOCK_HF13] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf13)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_fast), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_fast))
 	[INFINEON_CAT1_CLOCK_FAST] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_fast)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_slow), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_slow))
 	[INFINEON_CAT1_CLOCK_SLOW] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_slow)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_peri), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_peri))
 	[INFINEON_CAT1_CLOCK_PERI] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_peri)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pll0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll0))
 	[INFINEON_CAT1_CLOCK_PLL0] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(pll0)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pll1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll1))
 	[INFINEON_CAT1_CLOCK_PLL1] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(pll1)) },
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(fll0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(fll0))
 	[INFINEON_CAT1_CLOCK_FLL0] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(fll0)) },
 #endif
 };
@@ -326,7 +326,7 @@ static cyhal_clock_t *_get_hal_obj_from_ord(uint32_t dt_ord)
 	return ret_obj;
 }
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(dpll_hp), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dpll_hp))
 __WEAK void cycfg_ClockStartupError(uint32_t error)
 {
 	(void)error; /* Suppress the compiler warning */
@@ -390,25 +390,25 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 	uint32 clock_div;
 
 	/* Configure IMO */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_imo), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_imo))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_IMO].obj;
 	if (cyhal_clock_get(clock_obj, &CYHAL_CLOCK_RSC_IMO)) {
 		return -EIO;
 	}
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_iho), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_iho))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_IHO].obj;
 	if (cyhal_clock_get(clock_obj, &CYHAL_CLOCK_RSC_IHO)) {
 		return -EIO;
 	}
 #endif
-#if !DT_NODE_HAS_STATUS(DT_NODELABEL(clk_imo), okay) && \
-	!DT_NODE_HAS_STATUS(DT_NODELABEL(clk_iho), okay)
+#if !DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_imo)) && \
+	!DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_iho))
 	#error "IMO clock or IHO clock must be enabled"
 #endif
 
 	/* Configure the PathMux[0] to source defined in tree device 'path_mux0' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux0))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_PATHMUX0].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(path_mux0));
 
@@ -418,7 +418,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the PathMux[1] to source defined in tree device 'path_mux1' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux1))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_PATHMUX1].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(path_mux1));
 
@@ -428,7 +428,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the PathMux[2] to source defined in tree device 'path_mux2' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux2))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_PATHMUX2].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(path_mux2));
 
@@ -438,7 +438,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the PathMux[3] to source defined in tree device 'path_mux3' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux3))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_PATHMUX3].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(path_mux3));
 
@@ -448,7 +448,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the PathMux[4] to source defined in tree device 'path_mux4' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux4))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_PATHMUX4].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(path_mux4));
 
@@ -458,7 +458,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure FLL0 */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(fll0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(fll0))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_FLL0].obj;
 	frequency = DT_PROP(DT_NODELABEL(fll0), clock_frequency);
 
@@ -470,7 +470,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure PLL0 */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pll0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll0))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_PLL0].obj;
 	frequency = DT_PROP(DT_NODELABEL(pll0), clock_frequency);
 
@@ -483,7 +483,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure PLL1 */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pll1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll1))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_PLL1].obj;
 	frequency = DT_PROP(DT_NODELABEL(pll1), clock_frequency);
 
@@ -495,7 +495,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[0] to source defined in tree device 'clk_hf0' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf0))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF0].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf0));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf0), clock_div);
@@ -506,7 +506,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[1] to source defined in tree device 'clk_hf1' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf1))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF1].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf1));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf1), clock_div);
@@ -517,7 +517,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[2] to source defined in tree device 'clk_hf2' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf2))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF2].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf2));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf2), clock_div);
@@ -528,7 +528,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[3] to source defined in tree device 'clk_hf3' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf3))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF3].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf3));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf3), clock_div);
@@ -539,7 +539,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[4] to source defined in tree device 'clk_hf4' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf4))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF4].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf4));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf4), clock_div);
@@ -550,7 +550,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[5] to source defined in tree device 'clk_hf5' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf5), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf5))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF5].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf5));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf5), clock_div);
@@ -561,7 +561,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[6] to source defined in tree device 'clk_hf6' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf6), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf6))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF6].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf6));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf6), clock_div);
@@ -572,7 +572,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[7] to source defined in tree device 'clk_hf7' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf7), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf7))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF7].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf7));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf7), clock_div);
@@ -583,7 +583,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[8] to source defined in tree device 'clk_hf8' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf8), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf8))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF8].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf8));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf8), clock_div);
@@ -594,7 +594,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[9] to source defined in tree device 'clk_hf9' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf9), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf9))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF9].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf9));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf9), clock_div);
@@ -605,7 +605,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[10] to source defined in tree device 'clk_hf10' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf10), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf10))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF10].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf10));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf10), clock_div);
@@ -616,7 +616,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[11] to source defined in tree device 'clk_hf11' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf11), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf11))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF11].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf11));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf11), clock_div);
@@ -627,7 +627,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[12] to source defined in tree device 'clk_hf12' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf12), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf12))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF12].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf12));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf12), clock_div);
@@ -638,7 +638,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[13] to source defined in tree device 'clk_hf13' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf13), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf13))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF13].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf13));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf13), clock_div);
@@ -649,7 +649,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the clock fast to source defined in tree device 'clk_fast' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_fast), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_fast))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_FAST].obj;
 	clock_div = DT_PROP(DT_NODELABEL(clk_fast), clock_div);
 
@@ -663,7 +663,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the clock peri to source defined in tree device 'clk_peri' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_peri), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_peri))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_PERI].obj;
 	clock_div = DT_PROP(DT_NODELABEL(clk_peri), clock_div);
 
@@ -677,7 +677,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the clock slow to source defined in tree device 'clk_slow' node */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_slow), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_slow))
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_SLOW].obj;
 	clock_div = DT_PROP(DT_NODELABEL(clk_slow), clock_div);
 
@@ -690,7 +690,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 	}
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(dpll_hp), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dpll_hp))
 	Cy_SysClk_Dpll_Hp0_Init();
 	SystemCoreClockUpdate();
 #endif
@@ -713,7 +713,7 @@ static const struct clock_control_driver_api clock_control_infineon_cat1_api = {
 	.off = clock_control_infineon_cat_on_off
 };
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_imo), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_imo))
 DEVICE_DT_DEFINE(DT_NODELABEL(clk_imo),
 		 clock_control_infineon_cat1_init,
 		 NULL,
@@ -723,7 +723,7 @@ DEVICE_DT_DEFINE(DT_NODELABEL(clk_imo),
 		 CONFIG_CLOCK_CONTROL_INIT_PRIORITY,
 		 &clock_control_infineon_cat1_api);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_iho), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_iho))
 DEVICE_DT_DEFINE(DT_NODELABEL(clk_iho),
 		 clock_control_infineon_cat1_init,
 		 NULL,
diff --git a/drivers/clock_control/clock_control_litex.h b/drivers/clock_control/clock_control_litex.h
index 14d371c077c..8a1b25de400 100644
--- a/drivers/clock_control/clock_control_litex.h
+++ b/drivers/clock_control/clock_control_litex.h
@@ -73,7 +73,7 @@
 	lcko->margin.exp = CLKOUT_MARGIN_EXP(N);
 
 /* Devicetree clkout defines */
-#define CLKOUT_EXIST(N)		DT_NODE_HAS_STATUS(DT_NODELABEL(clk##N), okay)
+#define CLKOUT_EXIST(N)		DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk##N))
 #define CLKOUT_ID(N)		DT_REG_ADDR(DT_NODELABEL(clk##N))
 #define CLKOUT_FREQ(N)		DT_PROP(DT_NODELABEL(clk##N), \
 				litex_clock_frequency)
diff --git a/drivers/clock_control/clock_control_max32.c b/drivers/clock_control/clock_control_max32.c
index 2cbed41bd23..29d7cc2fef4 100644
--- a/drivers/clock_control/clock_control_max32.c
+++ b/drivers/clock_control/clock_control_max32.c
@@ -106,27 +106,27 @@ static void setup_fixed_clocks(void)
 	MXC_SYS_ClockSourceDisable(ADI_MAX32_CLK_EXTCLK);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_ipo), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_ipo))
 	MXC_SYS_ClockSourceEnable(ADI_MAX32_CLK_IPO);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_erfo), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_erfo))
 	MXC_SYS_ClockSourceEnable(ADI_MAX32_CLK_ERFO);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_ibro), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_ibro))
 	MXC_SYS_ClockSourceEnable(ADI_MAX32_CLK_IBRO);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_iso), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_iso))
 	MXC_SYS_ClockSourceEnable(ADI_MAX32_CLK_ISO);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_inro), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_inro))
 	MXC_SYS_ClockSourceEnable(ADI_MAX32_CLK_INRO);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_ertco), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_ertco))
 	MXC_SYS_ClockSourceEnable(ADI_MAX32_CLK_ERTCO);
 #endif
 
diff --git a/drivers/clock_control/clock_control_mcux_ccm.c b/drivers/clock_control/clock_control_mcux_ccm.c
index 8ff09672352..c3b7f2416c4 100644
--- a/drivers/clock_control/clock_control_mcux_ccm.c
+++ b/drivers/clock_control/clock_control_mcux_ccm.c
@@ -216,14 +216,14 @@ static int mcux_ccm_get_subsys_rate(const struct device *dev,
 #endif
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc1), okay) && CONFIG_IMX_USDHC
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc1)) && CONFIG_IMX_USDHC
 	case IMX_CCM_USDHC1_CLK:
 		*rate = CLOCK_GetSysPfdFreq(kCLOCK_Pfd0) /
 				(CLOCK_GetDiv(kCLOCK_Usdhc1Div) + 1U);
 		break;
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc2), okay) && CONFIG_IMX_USDHC
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc2)) && CONFIG_IMX_USDHC
 	case IMX_CCM_USDHC2_CLK:
 		*rate = CLOCK_GetSysPfdFreq(kCLOCK_Pfd0) /
 				(CLOCK_GetDiv(kCLOCK_Usdhc2Div) + 1U);
@@ -339,12 +339,12 @@ static int mcux_ccm_get_subsys_rate(const struct device *dev,
 				/ (CLOCK_GetDiv(kCLOCK_Sai3Div) + 1);
 		break;
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexspi), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexspi))
 	case IMX_CCM_FLEXSPI_CLK:
 		*rate = CLOCK_GetClockRootFreq(kCLOCK_FlexspiClkRoot);
 		break;
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexspi2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexspi2))
 	case IMX_CCM_FLEXSPI2_CLK:
 		*rate = CLOCK_GetClockRootFreq(kCLOCK_Flexspi2ClkRoot);
 		break;
@@ -354,7 +354,7 @@ static int mcux_ccm_get_subsys_rate(const struct device *dev,
 		*rate = CLOCK_GetFreq(kCLOCK_PerClk);
 		break;
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexio1), okay) && CONFIG_MCUX_FLEXIO
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexio1)) && CONFIG_MCUX_FLEXIO
 	case IMX_CCM_FLEXIO1_CLK:
 	{
 		uint32_t flexio_mux = CLOCK_GetMux(kCLOCK_Flexio1Mux);
@@ -376,8 +376,8 @@ static int mcux_ccm_get_subsys_rate(const struct device *dev,
 					/ (CLOCK_GetDiv(kCLOCK_Flexio1Div) + 1);
 	} break;
 #endif
-#if (DT_NODE_HAS_STATUS(DT_NODELABEL(flexio2), okay) \
-		 || DT_NODE_HAS_STATUS(DT_NODELABEL(flexio3), okay)) && CONFIG_MCUX_FLEXIO
+#if (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexio2)) \
+		 || DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexio3))) && CONFIG_MCUX_FLEXIO
 	case IMX_CCM_FLEXIO2_3_CLK:
 	{
 		uint32_t flexio_mux = CLOCK_GetMux(kCLOCK_Flexio2Mux);
diff --git a/drivers/clock_control/clock_control_mcux_scg.c b/drivers/clock_control/clock_control_mcux_scg.c
index 5642aabe8dd..684cb8f2aa2 100644
--- a/drivers/clock_control/clock_control_mcux_scg.c
+++ b/drivers/clock_control/clock_control_mcux_scg.c
@@ -125,7 +125,7 @@ static int mcux_scg_get_rate(const struct device *dev,
 
 static int mcux_scg_init(const struct device *dev)
 {
-#if DT_NODE_HAS_STATUS(MCUX_SCG_CLOCK_NODE(clkout_clk), okay)
+#if DT_NODE_HAS_STATUS_OKAY(MCUX_SCG_CLOCK_NODE(clkout_clk))
 #if DT_SAME_NODE(DT_CLOCKS_CTLR(MCUX_SCG_CLOCK_NODE(clkout_clk)), MCUX_SCG_CLOCK_NODE(slow_clk))
 	CLOCK_SetClkOutSel(kClockClkoutSelScgSlow);
 #elif DT_SAME_NODE(DT_CLOCKS_CTLR(MCUX_SCG_CLOCK_NODE(clkout_clk)), MCUX_SCG_CLOCK_NODE(sosc_clk))
@@ -139,7 +139,7 @@ static int mcux_scg_init(const struct device *dev)
 #else
 #error Unsupported SCG clkout clock source
 #endif
-#endif /* DT_NODE_HAS_STATUS(MCUX_SCG_CLOCK_NODE(clkout_clk), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(MCUX_SCG_CLOCK_NODE(clkout_clk)) */
 
 	return 0;
 }
diff --git a/drivers/clock_control/clock_control_mcux_sim.c b/drivers/clock_control/clock_control_mcux_sim.c
index 26c9a3c1c2a..2b16e5d6361 100644
--- a/drivers/clock_control/clock_control_mcux_sim.c
+++ b/drivers/clock_control/clock_control_mcux_sim.c
@@ -67,7 +67,7 @@ static int mcux_sim_get_subsys_rate(const struct device *dev,
 	return 0;
 }
 
-#if DT_NODE_HAS_STATUS(DT_INST(0, nxp_kinetis_ke1xf_sim), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_kinetis_ke1xf_sim))
 #define NXP_KINETIS_SIM_NODE DT_INST(0, nxp_kinetis_ke1xf_sim)
 #if DT_NODE_HAS_PROP(DT_INST(0, nxp_kinetis_ke1xf_sim), clkout_source)
 	#define NXP_KINETIS_SIM_CLKOUT_SOURCE \
diff --git a/drivers/clock_control/clock_control_nrf2_fll16m.c b/drivers/clock_control/clock_control_nrf2_fll16m.c
index 4fdf9220c27..7462d822f44 100644
--- a/drivers/clock_control/clock_control_nrf2_fll16m.c
+++ b/drivers/clock_control/clock_control_nrf2_fll16m.c
@@ -26,7 +26,7 @@ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
 #define FLL16M_LFXO_NODE DT_INST_PHANDLE_BY_NAME(0, clocks, lfxo)
 #define FLL16M_HFXO_NODE DT_INST_PHANDLE_BY_NAME(0, clocks, hfxo)
 
-#define FLL16M_HAS_LFXO DT_NODE_HAS_STATUS(FLL16M_LFXO_NODE, okay)
+#define FLL16M_HAS_LFXO DT_NODE_HAS_STATUS_OKAY(FLL16M_LFXO_NODE)
 
 #define FLL16M_LFXO_ACCURACY DT_PROP(FLL16M_LFXO_NODE, accuracy_ppm)
 #define FLL16M_HFXO_ACCURACY DT_PROP(FLL16M_HFXO_NODE, accuracy_ppm)
diff --git a/drivers/clock_control/clock_control_nrf2_lfclk.c b/drivers/clock_control/clock_control_nrf2_lfclk.c
index 9ce7974570e..36b8e247297 100644
--- a/drivers/clock_control/clock_control_nrf2_lfclk.c
+++ b/drivers/clock_control/clock_control_nrf2_lfclk.c
@@ -19,7 +19,7 @@ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
 #define LFCLK_LFXO_NODE DT_INST_PHANDLE_BY_NAME(0, clocks, lfxo)
 #define LFCLK_HFXO_NODE DT_INST_PHANDLE_BY_NAME(0, clocks, hfxo)
 
-#define LFCLK_HAS_LFXO DT_NODE_HAS_STATUS(LFCLK_LFXO_NODE, okay)
+#define LFCLK_HAS_LFXO DT_NODE_HAS_STATUS_OKAY(LFCLK_LFXO_NODE)
 
 #define LFCLK_LFLPRC_ACCURACY DT_INST_PROP(0, lflprc_accuracy_ppm)
 #define LFCLK_LFRC_ACCURACY DT_INST_PROP(0, lfrc_accuracy_ppm)
diff --git a/drivers/clock_control/clock_control_renesas_ra.c b/drivers/clock_control/clock_control_renesas_ra.c
index 0b058633151..3065c94e785 100644
--- a/drivers/clock_control/clock_control_renesas_ra.c
+++ b/drivers/clock_control/clock_control_renesas_ra.c
@@ -38,7 +38,7 @@
 
 #define CLKSRC_FREQ(clk) DT_PROP(DT_PATH(clocks, clk), clock_frequency)
 
-#define IS_CLKSRC_ENABLED(clk) DT_NODE_HAS_STATUS(DT_PATH(clocks, clk), okay)
+#define IS_CLKSRC_ENABLED(clk) DT_NODE_HAS_STATUS_OKAY(DT_PATH(clocks, clk))
 
 #define SCKSCR_INIT_VALUE _CONCAT(CLKSRC_, SYSCLK_SRC)
 
diff --git a/drivers/clock_control/clock_control_renesas_ra_cgc.c b/drivers/clock_control/clock_control_renesas_ra_cgc.c
index b03852fc86e..70512905be7 100644
--- a/drivers/clock_control/clock_control_renesas_ra_cgc.c
+++ b/drivers/clock_control/clock_control_renesas_ra_cgc.c
@@ -12,7 +12,7 @@
 #include <zephyr/dt-bindings/clock/ra_clock.h>
 #include <zephyr/drivers/clock_control/renesas_ra_cgc.h>
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pclkblock), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pclkblock))
 #define MSTP_REGS_ELEM(node_id, prop, idx)                                                         \
 	[DT_STRING_TOKEN_BY_IDX(node_id, prop, idx)] =                                             \
 		(volatile uint32_t *)DT_REG_ADDR_BY_IDX(node_id, idx),
diff --git a/drivers/clock_control/clock_control_smartbond.c b/drivers/clock_control/clock_control_smartbond.c
index ed0cc205264..3d866fb4c58 100644
--- a/drivers/clock_control/clock_control_smartbond.c
+++ b/drivers/clock_control/clock_control_smartbond.c
@@ -265,7 +265,7 @@ static inline int smartbond_clock_control_off(const struct device *dev,
 	switch (clk) {
 	case SMARTBOND_CLK_RC32K:
 		/* RC32K is used by POWERUP and WAKEUP HW FSM */
-		BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_NODELABEL(rc32k), okay),
+		BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(rc32k)),
 				"RC32K is not allowed to be turned off");
 		ret = -EPERM;
 		break;
@@ -472,12 +472,12 @@ static void smartbond_clock_control_update_memory_settings(uint32_t sys_clock_fr
 {
 	if (sys_clock_freq > 32000000) {
 		da1469x_qspi_set_read_pipe_delay(QSPIC_ID, 7);
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(memc), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(memc))
 		da1469x_qspi_set_read_pipe_delay(QSPIC2_ID, 7);
 #endif
 	} else {
 		da1469x_qspi_set_read_pipe_delay(QSPIC_ID, 2);
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(memc), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(memc))
 		da1469x_qspi_set_read_pipe_delay(QSPIC2_ID, 2);
 #endif
 	}
@@ -485,7 +485,7 @@ static void smartbond_clock_control_update_memory_settings(uint32_t sys_clock_fr
 	da1469x_qspi_set_cs_delay(QSPIC_ID, SystemCoreClock,
 		DT_PROP(DT_NODELABEL(flash_controller), read_cs_idle_delay),
 		DT_PROP(DT_NODELABEL(flash_controller), erase_cs_idle_delay));
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(memc), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(memc))
 	da1469x_qspi_set_cs_delay(QSPIC2_ID, SystemCoreClock,
 		DT_PROP(DT_NODELABEL(memc), read_cs_idle_min_ns),
 		DT_PROP_OR(DT_NODELABEL(memc), erase_cs_idle_min_ns, 0));
@@ -565,7 +565,7 @@ int smartbond_clocks_init(const struct device *dev)
 
 	ARG_UNUSED(dev);
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(memc), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(memc))
 	/* Make sure QSPIC2 is enabled */
 	da1469x_clock_amba_enable(CRG_TOP_CLK_AMBA_REG_QSPI2_ENABLE_Msk);
 #endif
@@ -579,12 +579,12 @@ int smartbond_clocks_init(const struct device *dev)
 	DT_FOREACH_CHILD_STATUS_OKAY_SEP(DT_PATH(crg, osc), ENABLE_OSC, (;));
 
 	/* Make sure that selected sysclock is enabled */
-	BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_PROP(DT_NODELABEL(sys_clk), clock_src), okay),
+	BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DT_PROP(DT_NODELABEL(sys_clk), clock_src)),
 		     "Clock selected as system clock no enabled in DT");
-	BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_PROP(DT_NODELABEL(lp_clk), clock_src), okay),
+	BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DT_PROP(DT_NODELABEL(lp_clk), clock_src)),
 		     "Clock selected as LP clock no enabled in DT");
 	BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_NODELABEL(pll), disabled) ||
-		     DT_NODE_HAS_STATUS(DT_NODELABEL(xtal32m), okay),
+		     DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(xtal32m)),
 		     "PLL enabled in DT but XTAL32M is disabled");
 
 	clk_id = DT_DEP_ORD(DT_PROP(DT_NODELABEL(lp_clk), clock_src));
@@ -616,7 +616,7 @@ static int smartbond_clocks_pm_action(const struct device *dev, enum pm_device_a
 	case PM_DEVICE_ACTION_SUSPEND:
 		break;
 	case PM_DEVICE_ACTION_RESUME:
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(memc), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(memc))
 		/* Make sure QSPIC2 is enabled */
 		da1469x_clock_amba_enable(CRG_TOP_CLK_AMBA_REG_QSPI2_ENABLE_Msk);
 #endif
diff --git a/drivers/clock_control/clock_stm32_ll_wb0.c b/drivers/clock_control/clock_stm32_ll_wb0.c
index 6654867e01e..3a08cf64067 100644
--- a/drivers/clock_control/clock_stm32_ll_wb0.c
+++ b/drivers/clock_control/clock_stm32_ll_wb0.c
@@ -39,7 +39,7 @@
 
 #if DT_NODE_HAS_PROP(STM32_CLOCK_CONTROL_NODE, slow_clock)
 
-#	if !DT_NODE_HAS_STATUS(DT_RCC_SLOWCLK_NODE, okay)
+#	if !DT_NODE_HAS_STATUS_OKAY(DT_RCC_SLOWCLK_NODE)
 #		error slow-clock source is not enabled
 #	endif
 
diff --git a/drivers/counter/counter_mcux_snvs.c b/drivers/counter/counter_mcux_snvs.c
index 3346cc21e75..172b4b894a3 100644
--- a/drivers/counter/counter_mcux_snvs.c
+++ b/drivers/counter/counter_mcux_snvs.c
@@ -311,7 +311,7 @@ static const struct counter_driver_api mcux_snvs_driver_api = {
 BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) <= 1,
 	     "unsupported snvs instance");
 
-#if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0))
 static struct mcux_snvs_data mcux_snvs_data_0;
 
 static void mcux_snvs_irq_config_0(const struct device *dev);
@@ -339,4 +339,4 @@ static void mcux_snvs_irq_config_0(const struct device *dev)
 		    mcux_snvs_isr, DEVICE_DT_INST_GET(0), 0);
 	irq_enable(DT_INST_IRQN(0));
 }
-#endif  /* DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) */
+#endif  /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0)) */
diff --git a/drivers/counter/counter_smartbond_timer.c b/drivers/counter/counter_smartbond_timer.c
index 8dc3baba045..8ee8f006dae 100644
--- a/drivers/counter/counter_smartbond_timer.c
+++ b/drivers/counter/counter_smartbond_timer.c
@@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(counter_timer, CONFIG_COUNTER_LOG_LEVEL);
 
 #define COUNTER_DT_DEVICE(_idx) DEVICE_DT_GET_OR_NULL(DT_NODELABEL(timer##_idx))
 
-#define PDC_XTAL_EN (DT_NODE_HAS_STATUS(DT_NODELABEL(xtal32m), okay) ? \
+#define PDC_XTAL_EN (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(xtal32m)) ? \
 					MCU_PDC_EN_XTAL : MCU_PDC_EN_NONE)
 
 struct counter_smartbond_data {
diff --git a/drivers/disk/sdmmc_stm32.c b/drivers/disk/sdmmc_stm32.c
index a344bb9d192..393950fb664 100644
--- a/drivers/disk/sdmmc_stm32.c
+++ b/drivers/disk/sdmmc_stm32.c
@@ -710,7 +710,7 @@ static int disk_stm32_sdmmc_init(const struct device *dev)
 	return err;
 }
 
-#if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0))
 
 #if STM32_SDMMC_USE_DMA
 
diff --git a/drivers/dma/dma_mcux_edma.c b/drivers/dma/dma_mcux_edma.c
index 26c7cf58c34..7da8bf79b06 100644
--- a/drivers/dma/dma_mcux_edma.c
+++ b/drivers/dma/dma_mcux_edma.c
@@ -55,11 +55,11 @@ struct dma_mcux_edma_config {
 
 #ifdef CONFIG_DMA_MCUX_USE_DTCM_FOR_DMA_DESCRIPTORS
 
-#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm))
 #define EDMA_TCDPOOL_CACHE_ATTR __dtcm_noinit_section
-#else /* DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay) */
+#else /* DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm)) */
 #error Selected DTCM for MCUX DMA descriptors but no DTCM section.
-#endif /* DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm)) */
 
 #elif defined(CONFIG_NOCACHE_MEMORY)
 #define EDMA_TCDPOOL_CACHE_ATTR __nocache
diff --git a/drivers/dma/dma_stm32.c b/drivers/dma/dma_stm32.c
index 178d83665b4..e2941a77cdc 100644
--- a/drivers/dma/dma_stm32.c
+++ b/drivers/dma/dma_stm32.c
@@ -29,7 +29,7 @@ LOG_MODULE_REGISTER(dma_stm32, CONFIG_DMA_LOG_LEVEL);
 #define DT_DRV_COMPAT st_stm32_dma_v2bis
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0))
 #if DT_INST_IRQ_HAS_IDX(0, 7)
 #define DMA_STM32_0_STREAM_COUNT 8
 #elif DT_INST_IRQ_HAS_IDX(0, 6)
@@ -41,9 +41,9 @@ LOG_MODULE_REGISTER(dma_stm32, CONFIG_DMA_LOG_LEVEL);
 #else
 #define DMA_STM32_0_STREAM_COUNT 3
 #endif
-#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0)) */
 
-#if DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1))
 #if DT_INST_IRQ_HAS_IDX(1, 7)
 #define DMA_STM32_1_STREAM_COUNT 8
 #elif DT_INST_IRQ_HAS_IDX(1, 6)
@@ -53,7 +53,7 @@ LOG_MODULE_REGISTER(dma_stm32, CONFIG_DMA_LOG_LEVEL);
 #else
 #define DMA_STM32_1_STREAM_COUNT 5
 #endif
-#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1)) */
 
 static const uint32_t table_m_size[] = {
 	LL_DMA_MDATAALIGN_BYTE,
@@ -755,7 +755,7 @@ static void dma_stm32_irq_##dma##_##chan(const struct device *dev)	\
 #endif /* CONFIG_DMA_STM32_SHARED_IRQS */
 
 
-#if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0))
 
 DMA_STM32_DEFINE_IRQ_HANDLER(0, 0);
 DMA_STM32_DEFINE_IRQ_HANDLER(0, 1);
@@ -803,10 +803,10 @@ static void dma_stm32_config_irq_0(const struct device *dev)
 
 DMA_STM32_INIT_DEV(0);
 
-#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0)) */
 
 
-#if DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1))
 
 DMA_STM32_DEFINE_IRQ_HANDLER(1, 0);
 DMA_STM32_DEFINE_IRQ_HANDLER(1, 1);
@@ -855,4 +855,4 @@ static void dma_stm32_config_irq_1(const struct device *dev)
 
 DMA_STM32_INIT_DEV(1);
 
-#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1)) */
diff --git a/drivers/dma/dma_stm32_bdma.c b/drivers/dma/dma_stm32_bdma.c
index 1df5746facb..7f769f47ac4 100644
--- a/drivers/dma/dma_stm32_bdma.c
+++ b/drivers/dma/dma_stm32_bdma.c
@@ -901,7 +901,7 @@ static void bdma_stm32_irq_##bdma##_##chan(const struct device *dev)	\
 	} while (false)
 
 
-#if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0))
 
 #define BDMA_STM32_DEFINE_IRQ_HANDLER_GEN(i, _) \
 	BDMA_STM32_DEFINE_IRQ_HANDLER(0, i)
@@ -918,4 +918,4 @@ static void bdma_stm32_config_irq_0(const struct device *dev)
 
 BDMA_STM32_INIT_DEV(0);
 
-#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0)) */
diff --git a/drivers/dma/dmamux_stm32.c b/drivers/dma/dmamux_stm32.c
index d12a294eb7f..27e02b1c188 100644
--- a/drivers/dma/dmamux_stm32.c
+++ b/drivers/dma/dmamux_stm32.c
@@ -108,7 +108,7 @@ struct dmamux_stm32_dma_fops {
 };
 
 #if (defined(CONFIG_DMA_STM32_V1) || defined(CONFIG_DMA_STM32_V2)) && \
-	DT_NODE_HAS_STATUS(DT_NODELABEL(dmamux1), okay)
+	DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmamux1))
 static const struct dmamux_stm32_dma_fops dmamux1 = {
 	dma_stm32_configure,
 	dma_stm32_start,
@@ -118,7 +118,7 @@ static const struct dmamux_stm32_dma_fops dmamux1 = {
 };
 #endif
 
-#if defined(CONFIG_DMA_STM32_BDMA) && DT_NODE_HAS_STATUS(DT_NODELABEL(dmamux2), okay)
+#if defined(CONFIG_DMA_STM32_BDMA) && DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmamux2))
 static const struct dmamux_stm32_dma_fops dmamux2 = {
 	bdma_stm32_configure,
 	bdma_stm32_start,
@@ -130,17 +130,17 @@ static const struct dmamux_stm32_dma_fops dmamux2 = {
 
 const struct dmamux_stm32_dma_fops *get_dma_fops(const struct dmamux_stm32_config *dev_config)
 {
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(dmamux1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmamux1))
 	if (dev_config->base == DT_REG_ADDR(DT_NODELABEL(dmamux1))) {
 		return &dmamux1;
 	}
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(dmamux1), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmamux1)) */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(dmamux2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmamux2))
 	if (dev_config->base == DT_REG_ADDR(DT_NODELABEL(dmamux2))) {
 		return &dmamux2;
 	}
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(dmamux2), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmamux2)) */
 
 	__ASSERT(false, "Unknown dma base address %x", dev_config->base);
 	return (void *)0;
@@ -298,24 +298,24 @@ static int dmamux_stm32_init(const struct device *dev)
 	}
 #endif /* DT_INST_NODE_HAS_PROP(0, clocks) */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(dmamux1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmamux1))
 	/* DMA 1 and DMA2 for DMAMUX1, BDMA for DMAMUX2 */
 	if (config->base == DT_REG_ADDR(DT_NODELABEL(dmamux1))) {
 		/* DMAs assigned to DMAMUX channels at build time might not be ready. */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(dma1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dma1))
 		if (device_is_ready(DEVICE_DT_GET(DT_NODELABEL(dma1))) == false) {
 			return -ENODEV;
 		}
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(dma2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dma2))
 		if (device_is_ready(DEVICE_DT_GET(DT_NODELABEL(dma2))) == false) {
 			return -ENODEV;
 		}
 #endif
 	}
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(dmamux1), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmamux1)) */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(dmamux2), okay) && DT_NODE_HAS_STATUS(DT_NODELABEL(bdma1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmamux2)) && DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(bdma1))
 	if (config->base == DT_REG_ADDR(DT_NODELABEL(dmamux2))) {
 		if (device_is_ready(DEVICE_DT_GET(DT_NODELABEL(bdma1))) == false) {
 			return -ENODEV;
@@ -346,19 +346,19 @@ static const struct dma_driver_api dma_funcs = {
 #define DMA_1_BEGIN_DMAMUX_CHANNEL DT_PROP_OR(DT_NODELABEL(dma1), dma_offset, 0)
 #define DMA_1_END_DMAMUX_CHANNEL (DMA_1_BEGIN_DMAMUX_CHANNEL + \
 				DT_PROP_OR(DT_NODELABEL(dma1), dma_requests, 0))
-#define DEV_DMA1 COND_CODE_1(DT_NODE_HAS_STATUS(DT_NODELABEL(dma1), okay), \
+#define DEV_DMA1 COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dma1)), \
 			     DEVICE_DT_GET(DT_NODELABEL(dma1)), NULL)
 
 #define DMA_2_BEGIN_DMAMUX_CHANNEL DT_PROP_OR(DT_NODELABEL(dma2), dma_offset, 0)
 #define DMA_2_END_DMAMUX_CHANNEL (DMA_2_BEGIN_DMAMUX_CHANNEL + \
 				DT_PROP_OR(DT_NODELABEL(dma2), dma_requests, 0))
-#define DEV_DMA2 COND_CODE_1(DT_NODE_HAS_STATUS(DT_NODELABEL(dma2), okay), \
+#define DEV_DMA2 COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dma2)), \
 			     DEVICE_DT_GET(DT_NODELABEL(dma2)), NULL)
 
 #define BDMA_1_BEGIN_DMAMUX_CHANNEL DT_PROP_OR(DT_NODELABEL(bdma1), dma_offset, 0)
 #define BDMA_1_END_DMAMUX_CHANNEL (BDMA_1_BEGIN_DMAMUX_CHANNEL + \
 				DT_PROP_OR(DT_NODELABEL(bdma1), dma_requests, 0))
-#define DEV_BDMA COND_CODE_1(DT_NODE_HAS_STATUS(DT_NODELABEL(bdma1), okay), \
+#define DEV_BDMA COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(bdma1)), \
 			     DEVICE_DT_GET(DT_NODELABEL(bdma1)), NULL)
 
 #define DEV_DMA_BINDING(mux_channel) \
diff --git a/drivers/espi/espi_mchp_xec_host_v2.c b/drivers/espi/espi_mchp_xec_host_v2.c
index 8cf4e085ed5..12d32007e84 100644
--- a/drivers/espi/espi_mchp_xec_host_v2.c
+++ b/drivers/espi/espi_mchp_xec_host_v2.c
@@ -108,7 +108,7 @@ static uint8_t ec_host_cmd_sram[CONFIG_ESPI_XEC_PERIPHERAL_HOST_CMD_PARAM_SIZE]
 
 #ifdef CONFIG_ESPI_PERIPHERAL_XEC_MAILBOX
 
-BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_NODELABEL(mbox0), okay),
+BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(mbox0)),
 	     "XEC mbox0 DT node is disabled!");
 
 static struct xec_mbox_config {
@@ -171,7 +171,7 @@ static int init_mbox0(const struct device *dev)
 
 #ifdef CONFIG_ESPI_PERIPHERAL_8042_KBC
 
-BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_NODELABEL(kbc0), okay),
+BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(kbc0)),
 	     "XEC kbc0 DT node is disabled!");
 
 struct xec_kbc0_config {
@@ -665,7 +665,7 @@ static int init_acpi_ec1(const struct device *dev)
 
 #ifdef CONFIG_ESPI_PERIPHERAL_EC_HOST_CMD
 
-BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_NODELABEL(emi0), okay),
+BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(emi0)),
 	     "XEC EMI0 DT node is disabled!");
 
 struct xec_emi_config {
diff --git a/drivers/ethernet/eth_stm32_hal.c b/drivers/ethernet/eth_stm32_hal.c
index 02ae6830f60..4186039a1be 100644
--- a/drivers/ethernet/eth_stm32_hal.c
+++ b/drivers/ethernet/eth_stm32_hal.c
@@ -50,7 +50,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #endif
 
 #if defined(CONFIG_ETH_STM32_HAL_USE_DTCM_FOR_DMA_BUFFER) && \
-	    !DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
+	    !DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm))
 #error DTCM for DMA buffer is activated but zephyr,dtcm is not present in dts
 #endif
 
@@ -91,7 +91,7 @@ static const struct device *eth_stm32_phy_dev = DEVICE_PHY_BY_NAME(0);
 #define ETH_DMA_TX_TIMEOUT_MS	20U  /* transmit timeout in milliseconds */
 
 #if defined(CONFIG_ETH_STM32_HAL_USE_DTCM_FOR_DMA_BUFFER) && \
-	    DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
+	    DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm))
 #define __eth_stm32_desc __dtcm_noinit_section
 #define __eth_stm32_buf  __dtcm_noinit_section
 #elif defined(CONFIG_SOC_SERIES_STM32H7X)
diff --git a/drivers/ethernet/nxp_enet/eth_mcux.c b/drivers/ethernet/nxp_enet/eth_mcux.c
index 2ac0296d6b2..397fa58bae1 100644
--- a/drivers/ethernet/nxp_enet/eth_mcux.c
+++ b/drivers/ethernet/nxp_enet/eth_mcux.c
@@ -149,7 +149,7 @@ static const char *eth_name(ENET_Type *base)
 	switch ((int)base) {
 	case DT_INST_REG_ADDR(0):
 		return "ETH_0";
-#if DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1))
 	case DT_INST_REG_ADDR(1):
 		return "ETH_1";
 #endif
@@ -964,10 +964,10 @@ static void eth_mcux_init(const struct device *dev)
 	context->phy_handle->ops = &phyksz8081_ops;
 
 #if defined(CONFIG_SOC_SERIES_IMXRT10XX)
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet))
 	sys_clock = CLOCK_GetFreq(kCLOCK_IpgClk);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet2))
 	sys_clock = CLOCK_GetFreq(kCLOCK_EnetPll1Clk);
 #endif
 #elif defined(CONFIG_SOC_SERIES_IMXRT11XX)
@@ -1350,7 +1350,7 @@ static void eth_mcux_err_isr(const struct device *dev)
 	} while (false)
 
 #define ETH_MCUX_IRQ_PTP(n)						\
-	COND_CODE_1(DT_NODE_HAS_STATUS(PTP_INST_NODEID(n), okay),	\
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(PTP_INST_NODEID(n)),	\
 		    (ETH_MCUX_IRQ_PTP_INIT(n)),				\
 		    (ETH_MCUX_NONE))
 
@@ -1454,7 +1454,7 @@ static void eth_mcux_err_isr(const struct device *dev)
 #define ETH_MCUX_PINCTRL_INIT(n)
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay) && \
+#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm)) && \
 	CONFIG_ETH_MCUX_USE_DTCM_FOR_DMA_BUFFER
 /* Use DTCM for hardware DMA buffers */
 #define _mcux_dma_desc __dtcm_bss_section
diff --git a/drivers/ethernet/nxp_enet/eth_nxp_enet.c b/drivers/ethernet/nxp_enet/eth_nxp_enet.c
index a92b13f8da9..b80e0cc34bd 100644
--- a/drivers/ethernet/nxp_enet/eth_nxp_enet.c
+++ b/drivers/ethernet/nxp_enet/eth_nxp_enet.c
@@ -854,7 +854,7 @@ static const struct ethernet_api api_funcs = {
 #define NXP_ENET_DT_PHY_DEV(node_id, phy_phandle, idx)						\
 	DEVICE_DT_GET(DT_PHANDLE_BY_IDX(node_id, phy_phandle, idx))
 
-#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay) && \
+#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm)) && \
 	CONFIG_ETH_NXP_ENET_USE_DTCM_FOR_DMA_BUFFER
 #define _nxp_enet_dma_desc_section __dtcm_bss_section
 #define _nxp_enet_dma_buffer_section __dtcm_noinit_section
diff --git a/drivers/ethernet/phy/phy_adin2111.c b/drivers/ethernet/phy/phy_adin2111.c
index 380def0ebe7..902838bd08d 100644
--- a/drivers/ethernet/phy/phy_adin2111.c
+++ b/drivers/ethernet/phy/phy_adin2111.c
@@ -7,7 +7,7 @@
 
 #include <zephyr/logging/log.h>
 
-#if DT_NODE_HAS_STATUS(DT_INST(0, adi_adin2111_phy), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, adi_adin2111_phy))
 #define DT_DRV_COMPAT adi_adin2111_phy
 #else
 #define DT_DRV_COMPAT adi_adin1100_phy
diff --git a/drivers/flash/soc_flash_lpc.c b/drivers/flash/soc_flash_lpc.c
index ae457fe926b..5f931a1bf73 100644
--- a/drivers/flash/soc_flash_lpc.c
+++ b/drivers/flash/soc_flash_lpc.c
@@ -17,9 +17,9 @@
 #include "fsl_flashiap.h"
 
 
-#if DT_NODE_HAS_STATUS(DT_INST(0, nxp_iap_fmc11), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_iap_fmc11))
 #define DT_DRV_COMPAT nxp_iap_fmc11
-#elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_iap_fmc54), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_iap_fmc54))
 #define DT_DRV_COMPAT nxp_iap_fmc54
 #else
 #error No matching compatible for soc_flash_lpc.c
diff --git a/drivers/flash/soc_flash_mcux.c b/drivers/flash/soc_flash_mcux.c
index 6eaf90cd010..cc743371baa 100644
--- a/drivers/flash/soc_flash_mcux.c
+++ b/drivers/flash/soc_flash_mcux.c
@@ -22,19 +22,19 @@
 LOG_MODULE_REGISTER(flash_mcux);
 
 
-#if DT_NODE_HAS_STATUS(DT_INST(0, nxp_kinetis_ftfa), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_kinetis_ftfa))
 #define DT_DRV_COMPAT nxp_kinetis_ftfa
-#elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_kinetis_ftfe), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_kinetis_ftfe))
 #define DT_DRV_COMPAT nxp_kinetis_ftfe
-#elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_kinetis_ftfl), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_kinetis_ftfl))
 #define DT_DRV_COMPAT nxp_kinetis_ftfl
-#elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_iap_fmc55), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_iap_fmc55))
 #define DT_DRV_COMPAT nxp_iap_fmc55
 #define SOC_HAS_IAP 1
-#elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_iap_fmc553), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_iap_fmc553))
 #define DT_DRV_COMPAT nxp_iap_fmc553
 #define SOC_HAS_IAP 1
-#elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_iap_msf1), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_iap_msf1))
 #define DT_DRV_COMPAT nxp_iap_msf1
 #define SOC_HAS_IAP_MSF1 1
 #else
diff --git a/drivers/flash/soc_flash_nrf.c b/drivers/flash/soc_flash_nrf.c
index 16ab00b9660..a960656f5d2 100644
--- a/drivers/flash/soc_flash_nrf.c
+++ b/drivers/flash/soc_flash_nrf.c
@@ -23,13 +23,13 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(flash_nrf);
 
-#if DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf51_flash_controller), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nordic_nrf51_flash_controller))
 #define DT_DRV_COMPAT nordic_nrf51_flash_controller
-#elif DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf52_flash_controller), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nordic_nrf52_flash_controller))
 #define DT_DRV_COMPAT nordic_nrf52_flash_controller
-#elif DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf53_flash_controller), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nordic_nrf53_flash_controller))
 #define DT_DRV_COMPAT nordic_nrf53_flash_controller
-#elif DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf91_flash_controller), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nordic_nrf91_flash_controller))
 #define DT_DRV_COMPAT nordic_nrf91_flash_controller
 #else
 #error No matching compatible for soc_flash_nrf.c
diff --git a/drivers/gpio/gpio_esp32.c b/drivers/gpio/gpio_esp32.c
index ea12070235e..d0c933ca37d 100644
--- a/drivers/gpio/gpio_esp32.c
+++ b/drivers/gpio/gpio_esp32.c
@@ -284,7 +284,7 @@ static int gpio_esp32_port_get_raw(const struct device *port, uint32_t *value)
 
 	if (cfg->gpio_port == 0) {
 		*value = cfg->gpio_dev->in;
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
 	} else {
 		*value = cfg->gpio_dev->in1.data;
 #endif
@@ -302,7 +302,7 @@ static int gpio_esp32_port_set_masked_raw(const struct device *port,
 
 	if (cfg->gpio_port == 0) {
 		cfg->gpio_dev->out = (cfg->gpio_dev->out & ~mask) | (mask & value);
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
 	} else {
 		cfg->gpio_dev->out1.data = (cfg->gpio_dev->out1.data & ~mask) | (mask & value);
 #endif
@@ -320,7 +320,7 @@ static int gpio_esp32_port_set_bits_raw(const struct device *port,
 
 	if (cfg->gpio_port == 0) {
 		cfg->gpio_dev->out_w1ts = pins;
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
 	} else {
 		cfg->gpio_dev->out1_w1ts.data = pins;
 #endif
@@ -336,7 +336,7 @@ static int gpio_esp32_port_clear_bits_raw(const struct device *port,
 
 	if (cfg->gpio_port == 0) {
 		cfg->gpio_dev->out_w1tc = pins;
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
 	} else {
 		cfg->gpio_dev->out1_w1tc.data = pins;
 #endif
@@ -353,7 +353,7 @@ static int gpio_esp32_port_toggle_bits(const struct device *port,
 
 	if (cfg->gpio_port == 0) {
 		cfg->gpio_dev->out ^= pins;
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
 	} else {
 		cfg->gpio_dev->out1.data ^= pins;
 #endif
@@ -531,11 +531,11 @@ static void IRAM_ATTR gpio_esp32_isr(void *param)
 {
 	ARG_UNUSED(param);
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
 	gpio_esp32_fire_callbacks(DEVICE_DT_INST_GET(0));
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
 	gpio_esp32_fire_callbacks(DEVICE_DT_INST_GET(1));
 #endif
 }
diff --git a/drivers/gpio/gpio_gd32.c b/drivers/gpio/gpio_gd32.c
index 744f5e4a776..1c40be4de4c 100644
--- a/drivers/gpio/gpio_gd32.c
+++ b/drivers/gpio/gpio_gd32.c
@@ -365,7 +365,7 @@ static int gpio_gd32_init(const struct device *port)
 		},							       \
 		.reg = DT_INST_REG_ADDR(n),				       \
 		.clkid = DT_INST_CLOCKS_CELL(n, id),			       \
-		COND_CODE_1(DT_NODE_HAS_STATUS(SYSCFG_NODE, okay),	       \
+		COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(SYSCFG_NODE),	       \
 			    (.clkid_exti = DT_CLOCKS_CELL(SYSCFG_NODE, id),),  \
 			    (.clkid_exti = DT_CLOCKS_CELL(AFIO_NODE, id),))    \
 		.reset = RESET_DT_SPEC_INST_GET(n),			       \
diff --git a/drivers/gpio/gpio_lpc11u6x.c b/drivers/gpio/gpio_lpc11u6x.c
index a44deceed9b..102d8c3e8b6 100644
--- a/drivers/gpio/gpio_lpc11u6x.c
+++ b/drivers/gpio/gpio_lpc11u6x.c
@@ -459,21 +459,21 @@ static void gpio_lpc11u6x_isr(const void *arg)
 		}
 	}
 	/* For each port with active pins, fire the GPIO interrupt callbacks. */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
 	if (pins[0]) {
 		port = DEVICE_DT_GET(DT_NODELABEL(gpio0));
 		data = port->data;
 		gpio_fire_callbacks(&data->cb_list, port, pins[0]);
 	}
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
 	if (pins[1]) {
 		port = DEVICE_DT_GET(DT_NODELABEL(gpio1));
 		data = port->data;
 		gpio_fire_callbacks(&data->cb_list, port, pins[1]);
 	}
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
 	if (pins[2]) {
 		port = DEVICE_DT_GET(DT_NODELABEL(gpio2));
 		data = port->data;
@@ -589,14 +589,14 @@ DEVICE_DT_DEFINE(DT_NODELABEL(gpio##id),				\
 		    PRE_KERNEL_2, CONFIG_GPIO_INIT_PRIORITY,		\
 		    &gpio_lpc11u6x_driver_api)
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
 GPIO_LPC11U6X_INIT(0);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
 GPIO_LPC11U6X_INIT(1);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
 GPIO_LPC11U6X_INIT(2);
 #endif
diff --git a/drivers/gpio/gpio_mchp_xec.c b/drivers/gpio/gpio_mchp_xec.c
index 86d9f2a5d7a..e96130a0941 100644
--- a/drivers/gpio/gpio_mchp_xec.c
+++ b/drivers/gpio/gpio_mchp_xec.c
@@ -341,7 +341,7 @@ static const struct gpio_driver_api gpio_xec_driver_api = {
 	.manage_callback = gpio_xec_manage_callback,
 };
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_000_036), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_000_036))
 static int gpio_xec_port000_036_init(const struct device *dev);
 
 static const struct gpio_xec_config gpio_xec_port000_036_config = {
@@ -385,9 +385,9 @@ static int gpio_xec_port000_036_init(const struct device *dev)
 #endif
 	return 0;
 }
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_000_036), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_000_036)) */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_040_076), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_040_076))
 static int gpio_xec_port040_076_init(const struct device *dev);
 
 static const struct gpio_xec_config gpio_xec_port040_076_config = {
@@ -431,9 +431,9 @@ static int gpio_xec_port040_076_init(const struct device *dev)
 #endif
 	return 0;
 }
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_040_076), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_040_076)) */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_100_136), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_100_136))
 static int gpio_xec_port100_136_init(const struct device *dev);
 
 static const struct gpio_xec_config gpio_xec_port100_136_config = {
@@ -477,9 +477,9 @@ static int gpio_xec_port100_136_init(const struct device *dev)
 #endif
 	return 0;
 }
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_100_136), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_100_136)) */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_140_176), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_140_176))
 static int gpio_xec_port140_176_init(const struct device *dev);
 
 static const struct gpio_xec_config gpio_xec_port140_176_config = {
@@ -523,9 +523,9 @@ static int gpio_xec_port140_176_init(const struct device *dev)
 #endif
 	return 0;
 }
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_140_176), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_140_176)) */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_200_236), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_200_236))
 static int gpio_xec_port200_236_init(const struct device *dev);
 
 static const struct gpio_xec_config gpio_xec_port200_236_config = {
@@ -569,9 +569,9 @@ static int gpio_xec_port200_236_init(const struct device *dev)
 #endif
 	return 0;
 }
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_200_236), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_200_236)) */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_240_276), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_240_276))
 static int gpio_xec_port240_276_init(const struct device *dev);
 
 static const struct gpio_xec_config gpio_xec_port240_276_config = {
@@ -615,4 +615,4 @@ static int gpio_xec_port240_276_init(const struct device *dev)
 #endif
 	return 0;
 }
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_240_276), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_240_276)) */
diff --git a/drivers/gpio/gpio_nrfx.c b/drivers/gpio/gpio_nrfx.c
index d89c964cc90..151cf1a830c 100644
--- a/drivers/gpio/gpio_nrfx.c
+++ b/drivers/gpio/gpio_nrfx.c
@@ -446,7 +446,7 @@ static const struct gpio_driver_api gpio_nrfx_drv_api_funcs = {
 
 #define GPIOTE_CHECK(id)						       \
 	COND_CODE_1(DT_INST_NODE_HAS_PROP(id, gpiote_instance),		       \
-		(BUILD_ASSERT(DT_NODE_HAS_STATUS(GPIOTE_PHANDLE(id), okay),    \
+		(BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(GPIOTE_PHANDLE(id)),    \
 			"Please enable GPIOTE instance for used GPIO port!")), \
 		())
 
diff --git a/drivers/gpio/gpio_nxp_s32.c b/drivers/gpio/gpio_nxp_s32.c
index e9bcc29c907..5e9e7a55471 100644
--- a/drivers/gpio/gpio_nxp_s32.c
+++ b/drivers/gpio/gpio_nxp_s32.c
@@ -519,7 +519,7 @@ static const struct gpio_driver_api gpio_nxp_s32_driver_api = {
 			DT_NODE_HAS_PROP(DT_DRV_INST(n), interrupts)),		\
 			"interrupts and interrupt-parent must be set when "	\
 			"using external interrupts");				\
-	IF_ENABLED(DT_NODE_HAS_STATUS(GPIO_NXP_S32_EIRQ_NODE(n), okay), (	\
+	IF_ENABLED(DT_NODE_HAS_STATUS_OKAY(GPIO_NXP_S32_EIRQ_NODE(n)), (	\
 		static uint8_t gpio_nxp_s32_eirq_data_##n[] = {			\
 			LISTIFY(DT_NUM_IRQS(DT_DRV_INST(n)),			\
 				GPIO_NXP_S32_EIRQ_PIN_LINE, (,), n)		\
@@ -533,7 +533,7 @@ static const struct gpio_driver_api gpio_nxp_s32_driver_api = {
 	))
 
 #define GPIO_NXP_S32_GET_EIRQ_INFO(n)						\
-	.eirq_info = UTIL_AND(DT_NODE_HAS_STATUS(GPIO_NXP_S32_EIRQ_NODE(n), okay),\
+	.eirq_info = UTIL_AND(DT_NODE_HAS_STATUS_OKAY(GPIO_NXP_S32_EIRQ_NODE(n)),\
 				&gpio_nxp_s32_eirq_##n),
 #else
 #define GPIO_NXP_S32_SET_EIRQ_INFO(n)
@@ -547,7 +547,7 @@ static const struct gpio_driver_api gpio_nxp_s32_driver_api = {
 	BUILD_ASSERT((DT_INST_NODE_HAS_PROP(n, nxp_wkpu) ==			\
 			DT_INST_NODE_HAS_PROP(n, nxp_wkpu_interrupts)),		\
 			"nxp,wkpu and nxp,wkpu-interrupts must be provided");	\
-	IF_ENABLED(DT_NODE_HAS_STATUS(GPIO_NXP_S32_WKPU_NODE(n), okay), (	\
+	IF_ENABLED(DT_NODE_HAS_STATUS_OKAY(GPIO_NXP_S32_WKPU_NODE(n)), (	\
 		static uint8_t gpio_nxp_s32_wkpu_data_##n[] =			\
 			DT_INST_PROP(n, nxp_wkpu_interrupts);			\
 		static struct gpio_nxp_s32_irq_config gpio_nxp_s32_wkpu_##n = {	\
@@ -560,7 +560,7 @@ static const struct gpio_driver_api gpio_nxp_s32_driver_api = {
 	))
 
 #define GPIO_NXP_S32_GET_WKPU_INFO(n)						\
-	.wkpu_info = UTIL_AND(DT_NODE_HAS_STATUS(GPIO_NXP_S32_WKPU_NODE(n), okay),\
+	.wkpu_info = UTIL_AND(DT_NODE_HAS_STATUS_OKAY(GPIO_NXP_S32_WKPU_NODE(n)),\
 				&gpio_nxp_s32_wkpu_##n)
 #else
 #define GPIO_NXP_S32_SET_WKPU_INFO(n)
diff --git a/drivers/gpio/gpio_renesas_ra_ioport.c b/drivers/gpio/gpio_renesas_ra_ioport.c
index 8005acab360..65fc946438a 100644
--- a/drivers/gpio/gpio_renesas_ra_ioport.c
+++ b/drivers/gpio/gpio_renesas_ra_ioport.c
@@ -176,7 +176,7 @@ static const struct gpio_driver_api gpio_ra_drv_api_funcs = {
 			 DT_REG_ADDR(DT_NODELABEL(ioport##suffix)))
 
 #define GPIO_DEVICE_INIT_RA_IF_OKAY(suffix)                                                        \
-	COND_CODE_1(DT_NODE_HAS_STATUS(DT_NODELABEL(ioport##suffix), okay),                        \
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ioport##suffix)),                         \
 		    (GPIO_DEVICE_INIT_RA(suffix)),                                                 \
 		    ())
 
diff --git a/drivers/gpio/gpio_sam0.c b/drivers/gpio/gpio_sam0.c
index 03cfab48e60..98234d3319d 100644
--- a/drivers/gpio/gpio_sam0.c
+++ b/drivers/gpio/gpio_sam0.c
@@ -286,7 +286,7 @@ static const struct gpio_driver_api gpio_sam0_api = {
 static int gpio_sam0_init(const struct device *dev) { return 0; }
 
 /* Port A */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(porta), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(porta))
 
 static const struct gpio_sam0_config gpio_sam0_config_0 = {
 	.common = {
@@ -308,7 +308,7 @@ DEVICE_DT_DEFINE(DT_NODELABEL(porta),
 #endif
 
 /* Port B */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(portb), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portb))
 
 static const struct gpio_sam0_config gpio_sam0_config_1 = {
 	.common = {
@@ -330,7 +330,7 @@ DEVICE_DT_DEFINE(DT_NODELABEL(portb),
 #endif
 
 /* Port C */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(portc), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portc))
 
 static const struct gpio_sam0_config gpio_sam0_config_2 = {
 	.common = {
@@ -352,7 +352,7 @@ DEVICE_DT_DEFINE(DT_NODELABEL(portc),
 #endif
 
 /* Port D */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(portd), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portd))
 
 static const struct gpio_sam0_config gpio_sam0_config_3 = {
 	.common = {
diff --git a/drivers/gpio/gpio_stm32.c b/drivers/gpio/gpio_stm32.c
index 407c1a414e6..23edb977755 100644
--- a/drivers/gpio/gpio_stm32.c
+++ b/drivers/gpio/gpio_stm32.c
@@ -697,7 +697,7 @@ static int gpio_stm32_init(const struct device *dev)
 	}
 
 #if (defined(PWR_CR2_IOSV) || defined(PWR_SVMCR_IO2SV)) && \
-	DT_NODE_HAS_STATUS(DT_NODELABEL(gpiog), okay)
+	DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpiog))
 	z_stm32_hsem_lock(CFG_HW_RCC_SEMID, HSEM_LOCK_DEFAULT_RETRY);
 	/* Port G[15:2] requires external power supply */
 	/* Cf: L4/L5 RM, Chapter "Independent I/O supply rail" */
@@ -747,7 +747,7 @@ static int gpio_stm32_init(const struct device *dev)
 			 DT_CLOCKS_CELL(DT_NODELABEL(gpio##__suffix), bus))
 
 #define GPIO_DEVICE_INIT_STM32_IF_OKAY(__suffix, __SUFFIX) \
-	COND_CODE_1(DT_NODE_HAS_STATUS(DT_NODELABEL(gpio##__suffix), okay), \
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio##__suffix)), \
 		    (GPIO_DEVICE_INIT_STM32(__suffix, __SUFFIX)), \
 		    ())
 
diff --git a/drivers/gpio/gpio_xlnx_axi.c b/drivers/gpio/gpio_xlnx_axi.c
index 4b50bf85cd6..3b1238310f9 100644
--- a/drivers/gpio/gpio_xlnx_axi.c
+++ b/drivers/gpio/gpio_xlnx_axi.c
@@ -382,7 +382,7 @@ static const struct gpio_driver_api gpio_xlnx_axi_driver_api = {
 
 #define GPIO_XLNX_AXI_GPIO2_HAS_COMPAT_STATUS_OKAY(n)                                              \
 	UTIL_AND(DT_NODE_HAS_COMPAT(DT_INST_CHILD(n, gpio2), xlnx_xps_gpio_1_00_a_gpio2),          \
-		 DT_NODE_HAS_STATUS(DT_INST_CHILD(n, gpio2), okay))
+		 DT_NODE_HAS_STATUS_OKAY(DT_INST_CHILD(n, gpio2)))
 
 #define GPIO_XLNX_AXI_GPIO2_COND_INIT(n)                                                           \
 	IF_ENABLED(UTIL_AND(DT_INST_PROP_OR(n, xlnx_is_dual, 1),                                   \
diff --git a/drivers/i2c/i2c_esp32.c b/drivers/i2c/i2c_esp32.c
index 3c138172209..07c8ea536ca 100644
--- a/drivers/i2c/i2c_esp32.c
+++ b/drivers/i2c/i2c_esp32.c
@@ -843,7 +843,7 @@ static int IRAM_ATTR i2c_esp32_init(const struct device *dev)
 			     &i2c_esp32_config_##idx, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY,	   \
 			     &i2c_esp32_driver_api);
 
-#if DT_NODE_HAS_STATUS(I2C(0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(I2C(0))
 #ifndef SOC_I2C_SUPPORT_HW_CLR_BUS
 #if !DT_NODE_HAS_PROP(I2C(0), sda_gpios) || !DT_NODE_HAS_PROP(I2C(0), scl_gpios)
 #error "Missing <sda-gpios> and <scl-gpios> properties to build for this target."
@@ -854,9 +854,9 @@ static int IRAM_ATTR i2c_esp32_init(const struct device *dev)
 #endif
 #endif /* !SOC_I2C_SUPPORT_HW_CLR_BUS */
 ESP32_I2C_INIT(0);
-#endif /* DT_NODE_HAS_STATUS(I2C(0), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(I2C(0)) */
 
-#if DT_NODE_HAS_STATUS(I2C(1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(I2C(1))
 #ifndef SOC_I2C_SUPPORT_HW_CLR_BUS
 #if !DT_NODE_HAS_PROP(I2C(1), sda_gpios) || !DT_NODE_HAS_PROP(I2C(1), scl_gpios)
 #error "Missing <sda-gpios> and <scl-gpios> properties to build for this target."
@@ -867,4 +867,4 @@ ESP32_I2C_INIT(0);
 #endif
 #endif /* !SOC_I2C_SUPPORT_HW_CLR_BUS */
 ESP32_I2C_INIT(1);
-#endif /* DT_NODE_HAS_STATUS(I2C(1), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(I2C(1)) */
diff --git a/drivers/i2s/i2s_litex.c b/drivers/i2s/i2s_litex.c
index e66eaed7972..6105804d8ce 100644
--- a/drivers/i2s/i2s_litex.c
+++ b/drivers/i2s/i2s_litex.c
@@ -634,9 +634,9 @@ static const struct i2s_driver_api i2s_litex_driver_api = {
 		irq_enable(DT_IRQN(DT_NODELABEL(i2s_##dir)));                  \
 	}
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2s_rx), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2s_rx))
 I2S_INIT(rx);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2s_tx), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2s_tx))
 I2S_INIT(tx);
 #endif
diff --git a/drivers/interrupt_controller/intc_mchp_ecia_xec.c b/drivers/interrupt_controller/intc_mchp_ecia_xec.c
index f1fc0f8c28b..c4844643ccb 100644
--- a/drivers/interrupt_controller/intc_mchp_ecia_xec.c
+++ b/drivers/interrupt_controller/intc_mchp_ecia_xec.c
@@ -445,7 +445,7 @@ int mchp_ecia_info_unset_callback(int ecia_info)
  * Leaving a node disabled also allows another driver/application to take over
  * aggregation by managing the GIRQ itself.
  */
-#define XEC_CHK_REQ_AGGR(n) DT_NODE_HAS_STATUS(n, okay) |
+#define XEC_CHK_REQ_AGGR(n) DT_NODE_HAS_STATUS_OKAY(n) |
 
 #define XEC_ECIA_REQUIRE_AGGR_ISR					\
 	(								\
diff --git a/drivers/led_strip/lpd880x.c b/drivers/led_strip/lpd880x.c
index 991e2e3fb57..d4b56509db1 100644
--- a/drivers/led_strip/lpd880x.c
+++ b/drivers/led_strip/lpd880x.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 #include <string.h>
 
-#if DT_NODE_HAS_STATUS(DT_INST(0, greeled_lpd8806), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, greeled_lpd8806))
 #define DT_DRV_COMPAT greeled_lpd8806
 #else
 #define DT_DRV_COMPAT greeled_lpd8803
diff --git a/drivers/lora/shell.c b/drivers/lora/shell.c
index 692446b06cf..7d3775c9d5c 100644
--- a/drivers/lora/shell.c
+++ b/drivers/lora/shell.c
@@ -13,7 +13,7 @@
 LOG_MODULE_REGISTER(lora_shell, CONFIG_LORA_LOG_LEVEL);
 
 #define DEFAULT_RADIO_NODE DT_ALIAS(lora0)
-BUILD_ASSERT(DT_NODE_HAS_STATUS(DEFAULT_RADIO_NODE, okay),
+BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DEFAULT_RADIO_NODE),
 	     "No default LoRa radio specified in DT");
 
 static struct lora_modem_config modem_config = {
diff --git a/drivers/memc/memc_nxp_s32_qspi.c b/drivers/memc/memc_nxp_s32_qspi.c
index f588a0bd9af..e1d5c60bd67 100644
--- a/drivers/memc/memc_nxp_s32_qspi.c
+++ b/drivers/memc/memc_nxp_s32_qspi.c
@@ -139,7 +139,7 @@ uint8_t memc_nxp_s32_qspi_get_instance(const struct device *dev)
 
 #define QSPI_PORT_SIZE_FN(node_id, side_upper, port)					\
 	COND_CODE_1(IS_EQ(DT_REG_ADDR(node_id), QSPI_PCSF##side_upper##port),		\
-		(COND_CODE_1(DT_NODE_HAS_STATUS(node_id, okay),				\
+		(COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(node_id),				\
 			(.memSize##side_upper##port = DT_PROP(node_id, size) / 8,),	\
 			(.memSize##side_upper##port = 0,))),				\
 		(EMPTY))
diff --git a/drivers/pinctrl/pinctrl_esp32.c b/drivers/pinctrl/pinctrl_esp32.c
index 89c1ba43b41..4ed39229d56 100644
--- a/drivers/pinctrl/pinctrl_esp32.c
+++ b/drivers/pinctrl/pinctrl_esp32.c
@@ -254,7 +254,7 @@ static int esp32_pin_configure(const uint32_t pin_mux, const uint32_t pin_cfg)
 			gpio_dev_t *const gpio_dev =
 				(gpio_dev_t *)DT_REG_ADDR(DT_NODELABEL(gpio0));
 			gpio_dev->out_w1ts = BIT(pin_num);
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
 		} else {
 			gpio_dev_t *const gpio_dev =
 				(gpio_dev_t *)DT_REG_ADDR(DT_NODELABEL(gpio1));
@@ -268,7 +268,7 @@ static int esp32_pin_configure(const uint32_t pin_mux, const uint32_t pin_cfg)
 			gpio_dev_t *const gpio_dev =
 				(gpio_dev_t *)DT_REG_ADDR(DT_NODELABEL(gpio0));
 			gpio_dev->out_w1tc = BIT(pin_num);
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
 		} else {
 			gpio_dev_t *const gpio_dev =
 				(gpio_dev_t *)DT_REG_ADDR(DT_NODELABEL(gpio1));
diff --git a/drivers/pinctrl/pinctrl_ite_it8xxx2.c b/drivers/pinctrl/pinctrl_ite_it8xxx2.c
index 91ca93ea293..422f8c6c67f 100644
--- a/drivers/pinctrl/pinctrl_ite_it8xxx2.c
+++ b/drivers/pinctrl/pinctrl_ite_it8xxx2.c
@@ -366,7 +366,7 @@ static int pinctrl_it8xxx2_init(const struct device *dev)
 	gpio_base->GPIO_GCR &= ~IT8XXX2_GPIO_LPCRSTEN;
 
 #ifdef CONFIG_SOC_IT8XXX2_REG_SET_V2
-#if defined(CONFIG_I2C_ITE_ENHANCE) && DT_NODE_HAS_STATUS(DT_NODELABEL(i2c5), okay)
+#if defined(CONFIG_I2C_ITE_ENHANCE) && DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c5))
 	const struct gpio_dt_spec scl_gpios = GPIO_DT_SPEC_GET(DT_NODELABEL(i2c5), scl_gpios);
 	const struct gpio_dt_spec sda_gpios = GPIO_DT_SPEC_GET(DT_NODELABEL(i2c5), sda_gpios);
 
diff --git a/drivers/pinctrl/pinctrl_kinetis.c b/drivers/pinctrl/pinctrl_kinetis.c
index 7a8151c7be1..bc250d742cf 100644
--- a/drivers/pinctrl/pinctrl_kinetis.c
+++ b/drivers/pinctrl/pinctrl_kinetis.c
@@ -75,7 +75,7 @@ static int pinctrl_mcux_init(const struct device *dev)
 	return 0;
 }
 
-#if DT_NODE_HAS_STATUS(DT_INST(0, nxp_kinetis_sim), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_kinetis_sim))
 #define PINCTRL_MCUX_DT_INST_CLOCK_SUBSYS(n)                                                       \
 	CLK_GATE_DEFINE(DT_INST_CLOCKS_CELL(n, offset), DT_INST_CLOCKS_CELL(n, bits))
 #elif DT_HAS_COMPAT_STATUS_OKAY(nxp_scg_k4)
diff --git a/drivers/rtc/rtc_smartbond.c b/drivers/rtc/rtc_smartbond.c
index 7aa0d461d27..3d171e58f69 100644
--- a/drivers/rtc/rtc_smartbond.c
+++ b/drivers/rtc/rtc_smartbond.c
@@ -626,7 +626,7 @@ static int rtc_smartbond_init(const struct device *dev)
 
 	/* Wakeup device from RTC events (alarm/roll over) */
 #if CONFIG_PM
-	bool is_xtal32m_enabled = DT_NODE_HAS_STATUS(DT_NODELABEL(xtal32m), okay);
+	bool is_xtal32m_enabled = DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(xtal32m));
 	int pdc_idx = da1469x_pdc_add(MCU_PDC_TRIGGER_RTC_ALARM, MCU_PDC_MASTER_M33,
 					is_xtal32m_enabled ? MCU_PDC_EN_XTAL : 0);
 
diff --git a/drivers/sensor/bosch/bmi08x/bmi08x.h b/drivers/sensor/bosch/bmi08x/bmi08x.h
index 6b8b33f8ec7..83926126e48 100644
--- a/drivers/sensor/bosch/bmi08x/bmi08x.h
+++ b/drivers/sensor/bosch/bmi08x/bmi08x.h
@@ -427,7 +427,7 @@ enum bmi08x_odr {
 #define BMI08X_GYR_SCALE(range_dps) ((2 * range_dps * SENSOR_PI) / 180LL / 65536LL)
 
 /* report of data sync is selected */
-#define BMI08X_ACCEL_DATA_SYNC_EN(inst) DT_NODE_HAS_STATUS(DT_INST_PHANDLE(inst, data_sync), okay)
+#define BMI08X_ACCEL_DATA_SYNC_EN(inst) DT_NODE_HAS_STATUS_OKAY(DT_INST_PHANDLE(inst, data_sync))
 /* Macro used for compile time optimization to compile in/out code used for data-sync
  * if at least 1 bmi08x has data-sync enabled
  */
diff --git a/drivers/sensor/st/stm32_temp/stm32_temp.c b/drivers/sensor/st/stm32_temp/stm32_temp.c
index aa746e0c699..787eb4c99e6 100644
--- a/drivers/sensor/st/stm32_temp/stm32_temp.c
+++ b/drivers/sensor/st/stm32_temp/stm32_temp.c
@@ -188,7 +188,7 @@ static int stm32_temp_init(const struct device *dev)
  * this driver even if the ADC used for measurement is disabled. In such cases,
  * fail build with an explicit error message.
  */
-#if !DT_NODE_HAS_STATUS(DT_INST_IO_CHANNELS_CTLR(0), okay)
+#if !DT_NODE_HAS_STATUS_OKAY(DT_INST_IO_CHANNELS_CTLR(0))
 
 /* Use BUILD_ASSERT to get preprocessing on the message */
 BUILD_ASSERT(0,	"ADC '" DT_NODE_FULL_NAME(DT_INST_IO_CHANNELS_CTLR(0)) "' needed by "
@@ -235,4 +235,4 @@ SENSOR_DEVICE_DT_INST_DEFINE(0, stm32_temp_init, NULL,
 			     POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 			     &stm32_temp_driver_api);
 
-#endif /* !DT_NODE_HAS_STATUS(DT_INST_IO_CHANNELS_CTLR(0), okay) */
+#endif /* !DT_NODE_HAS_STATUS_OKAY(DT_INST_IO_CHANNELS_CTLR(0)) */
diff --git a/drivers/sensor/st/stm32_vbat/stm32_vbat.c b/drivers/sensor/st/stm32_vbat/stm32_vbat.c
index b74e0cf8b7f..98bebad37fa 100644
--- a/drivers/sensor/st/stm32_vbat/stm32_vbat.c
+++ b/drivers/sensor/st/stm32_vbat/stm32_vbat.c
@@ -125,7 +125,7 @@ static int stm32_vbat_init(const struct device *dev)
 }
 
 #define ASSERT_VBAT_ADC_ENABLED(inst)	\
-	BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_INST_IO_CHANNELS_CTLR(inst), okay),			\
+	BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DT_INST_IO_CHANNELS_CTLR(inst)),			\
 		"ADC instance '" DT_NODE_FULL_NAME(DT_INST_IO_CHANNELS_CTLR(inst)) "' needed "	\
 		"by Vbat sensor '" DT_NODE_FULL_NAME(DT_DRV_INST(inst)) "' is not enabled")
 
diff --git a/drivers/sensor/st/stm32_vref/stm32_vref.c b/drivers/sensor/st/stm32_vref/stm32_vref.c
index b2cf7222fad..b76c2ea0e6e 100644
--- a/drivers/sensor/st/stm32_vref/stm32_vref.c
+++ b/drivers/sensor/st/stm32_vref/stm32_vref.c
@@ -154,7 +154,7 @@ static int stm32_vref_init(const struct device *dev)
  * possible to compile this driver even if the ADC used for measurement is
  * disabled. In such cases, fail build with an explicit error message.
  */
-#if !DT_NODE_HAS_STATUS(DT_INST_IO_CHANNELS_CTLR(0), okay)
+#if !DT_NODE_HAS_STATUS_OKAY(DT_INST_IO_CHANNELS_CTLR(0))
 
 /* Use BUILD_ASSERT to get preprocessing on the message */
 BUILD_ASSERT(0,	"ADC '" DT_NODE_FULL_NAME(DT_INST_IO_CHANNELS_CTLR(0)) "' needed by "
@@ -183,4 +183,4 @@ static const struct stm32_vref_config stm32_vref_dev_config = {
 SENSOR_DEVICE_DT_INST_DEFINE(0, stm32_vref_init, NULL, &stm32_vref_dev_data, &stm32_vref_dev_config,
 			     POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &stm32_vref_driver_api);
 
-#endif /* !DT_NODE_HAS_STATUS(DT_INST_IO_CHANNELS_CTLR(0), okay) */
+#endif /* !DT_NODE_HAS_STATUS_OKAY(DT_INST_IO_CHANNELS_CTLR(0)) */
diff --git a/drivers/serial/leuart_gecko.c b/drivers/serial/leuart_gecko.c
index daaff59069c..9eec982802c 100644
--- a/drivers/serial/leuart_gecko.c
+++ b/drivers/serial/leuart_gecko.c
@@ -317,7 +317,7 @@ static const struct uart_driver_api leuart_gecko_driver_api = {
 #endif
 };
 
-#if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0))
 
 #define PIN_LEUART_0_RXD {DT_INST_PROP_BY_IDX(0, location_rx, 1), \
 		DT_INST_PROP_BY_IDX(0, location_rx, 2), gpioModeInput, 1}
@@ -368,9 +368,9 @@ static void leuart_gecko_config_func_0(const struct device *dev)
 }
 #endif
 
-#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0)) */
 
-#if DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1))
 
 #define PIN_LEUART_1_RXD {DT_INST_PROP_BY_IDX(1, location_rx, 1), \
 		DT_INST_PROP_BY_IDX(1, location_rx, 2), gpioModeInput, 1}
@@ -421,4 +421,4 @@ static void leuart_gecko_config_func_1(const struct device *dev)
 }
 #endif
 
-#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1)) */
diff --git a/drivers/serial/uart_cmsdk_apb.c b/drivers/serial/uart_cmsdk_apb.c
index a6568133b72..e4ceb883bd6 100644
--- a/drivers/serial/uart_cmsdk_apb.c
+++ b/drivers/serial/uart_cmsdk_apb.c
@@ -475,7 +475,7 @@ static const struct uart_driver_api uart_cmsdk_apb_driver_api = {
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN */
 };
 
-#if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0))
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void uart_cmsdk_apb_irq_config_func_0(const struct device *dev);
@@ -538,9 +538,9 @@ static void uart_cmsdk_apb_irq_config_func_0(const struct device *dev)
 #endif
 #endif
 
-#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0)) */
 
-#if DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1))
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void uart_cmsdk_apb_irq_config_func_1(const struct device *dev);
@@ -603,9 +603,9 @@ static void uart_cmsdk_apb_irq_config_func_1(const struct device *dev)
 #endif
 #endif
 
-#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1)) */
 
-#if DT_NODE_HAS_STATUS(DT_DRV_INST(2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(2))
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void uart_cmsdk_apb_irq_config_func_2(const struct device *dev);
@@ -668,9 +668,9 @@ static void uart_cmsdk_apb_irq_config_func_2(const struct device *dev)
 #endif
 #endif
 
-#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(2), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(2)) */
 
-#if DT_NODE_HAS_STATUS(DT_DRV_INST(3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(3))
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void uart_cmsdk_apb_irq_config_func_3(const struct device *dev);
@@ -733,9 +733,9 @@ static void uart_cmsdk_apb_irq_config_func_3(const struct device *dev)
 #endif
 #endif
 
-#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(3), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(3)) */
 
-#if DT_NODE_HAS_STATUS(DT_DRV_INST(4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(4))
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void uart_cmsdk_apb_irq_config_func_4(const struct device *dev);
@@ -798,4 +798,4 @@ static void uart_cmsdk_apb_irq_config_func_4(const struct device *dev)
 #endif
 #endif
 
-#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(4), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(4)) */
diff --git a/drivers/serial/uart_lpc11u6x.c b/drivers/serial/uart_lpc11u6x.c
index 5645fb7910b..3a13850429f 100644
--- a/drivers/serial/uart_lpc11u6x.c
+++ b/drivers/serial/uart_lpc11u6x.c
@@ -13,7 +13,7 @@
 
 #include "uart_lpc11u6x.h"
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart0))
 static int lpc11u6x_uart0_poll_in(const struct device *dev, unsigned char *c)
 {
 	const struct lpc11u6x_uart0_config *cfg = dev->config;
@@ -443,12 +443,12 @@ static void lpc11u6x_uart0_isr_config(const struct device *dev)
 }
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN */
 
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart0), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart0)) */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) ||		\
-	DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) ||	\
-	DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay) ||	\
-	DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) ||                                                \
+	DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) ||                                            \
+	DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3)) ||                                            \
+	DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4))
 
 static int lpc11u6x_uartx_poll_in(const struct device *dev, unsigned char *c)
 {
@@ -810,18 +810,18 @@ static int lpc11u6x_uartx_init(const struct device *dev)
 		LPC11U6X_UARTX_CFG_ENABLE;
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) || \
-	DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) || \
+	DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4))
 	lpc11u6x_uartx_isr_config_1(dev);
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) ||
-	* DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) ||
+	* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4))
 	*/
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) || \
-	DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) || \
+	DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3))
 	lpc11u6x_uartx_isr_config_2(dev);
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) ||
-	* DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay)
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) ||
+	* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3))
 	*/
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN */
 	return 0;
@@ -876,44 +876,44 @@ DEVICE_DT_DEFINE(DT_NODELABEL(uart##idx), 				      \
 		    PRE_KERNEL_1, CONFIG_SERIAL_INIT_PRIORITY,		      \
 		    &uartx_api)
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1))
 LPC11U6X_UARTX_INIT(1);
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2))
 LPC11U6X_UARTX_INIT(2);
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3))
 LPC11U6X_UARTX_INIT(3);
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3)) */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4))
 LPC11U6X_UARTX_INIT(4);
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4)) */
 
 #if CONFIG_UART_INTERRUPT_DRIVEN &&				\
-	(DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) ||	\
-	 DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay))
+	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) ||	\
+	 DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4)))
 
 struct lpc11u6x_uartx_shared_irq lpc11u6x_uartx_shared_irq_info_1 = {
 	.devices = {
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1))
 		DEVICE_DT_GET(DT_NODELABEL(uart1)),
 #else
 		NULL,
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) */
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4))
 		DEVICE_DT_GET(DT_NODELABEL(uart4)),
 #else
 		NULL,
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4)) */
 	},
 };
 
 static void lpc11u6x_uartx_isr_config_1(const struct device *dev)
 {
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1))
 	IRQ_CONNECT(DT_IRQN(DT_NODELABEL(uart1)),
 		    DT_IRQ(DT_NODELABEL(uart1), priority),
 		    lpc11u6x_uartx_shared_isr,
@@ -927,34 +927,34 @@ static void lpc11u6x_uartx_isr_config_1(const struct device *dev)
 		    &lpc11u6x_uartx_shared_irq_info_1,
 		    0);
 	irq_enable(DT_IRQN(DT_NODELABEL(uart4)));
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) */
 }
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN &&
-	* (DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) ||
-	* DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay))
+	* (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) ||
+	* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4)))
 	*/
 
 #if CONFIG_UART_INTERRUPT_DRIVEN && \
-	(DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) || \
-	 DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay))
+	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) || \
+	 DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3)))
 struct lpc11u6x_uartx_shared_irq lpc11u6x_uartx_shared_irq_info_2 = {
 	.devices = {
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2))
 		DEVICE_DT_GET(DT_NODELABEL(uart2)),
 #else
 		NULL,
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay)
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) */
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3))
 		DEVICE_DT_GET(DT_NODELABEL(uart3)),
 #else
 		NULL,
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3)) */
 	},
 };
 
 static void lpc11u6x_uartx_isr_config_2(const struct device *dev)
 {
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2))
 	IRQ_CONNECT(DT_IRQN(DT_NODELABEL(uart2)),
 		    DT_IRQ(DT_NODELABEL(uart2), priority),
 		    lpc11u6x_uartx_shared_isr,
@@ -968,11 +968,11 @@ static void lpc11u6x_uartx_isr_config_2(const struct device *dev)
 		    &lpc11u6x_uartx_shared_irq_info_2,
 		    0);
 	irq_enable(DT_IRQN(DT_NODELABEL(uart3)));
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) */
 }
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN &&
-	* (DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) ||
-	* DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay))
+	* (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) ||
+	* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3)))
 	*/
 #endif  /* DT_NODE_EXISTS(DT_NODELABEL(uart1) ||
 	 * DT_NODE_EXISTS(DT_NODELABEL(uart2) ||
diff --git a/drivers/serial/uart_lpc11u6x.h b/drivers/serial/uart_lpc11u6x.h
index 8951945e65a..257846cbdd4 100644
--- a/drivers/serial/uart_lpc11u6x.h
+++ b/drivers/serial/uart_lpc11u6x.h
@@ -199,20 +199,20 @@ struct lpc11u6x_uartx_shared_irq {
 };
 
 #if CONFIG_UART_INTERRUPT_DRIVEN &&				\
-	(DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) ||	\
-	 DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay))
+	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) ||	\
+	 DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4)))
 static void lpc11u6x_uartx_isr_config_1(const struct device *dev);
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN &&
-	* (DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) ||
-	* DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay))
+	* (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) ||
+	* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3)))
 	*/
 
 #if CONFIG_UART_INTERRUPT_DRIVEN &&				\
-	(DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) ||	\
-	 DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay))
+	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) ||	\
+	 DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3)))
 static void lpc11u6x_uartx_isr_config_2(const struct device *dev);
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN &&
-	* (DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) ||
-	* DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay))
+	* (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) ||
+	* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3)))
 	*/
 #endif /* ZEPHYR_DRIVERS_SERIAL_UART_LPC11U6X_H_ */
diff --git a/drivers/serial/uart_miv.c b/drivers/serial/uart_miv.c
index bf35b4cf656..d1b5cfb0e26 100644
--- a/drivers/serial/uart_miv.c
+++ b/drivers/serial/uart_miv.c
@@ -387,7 +387,7 @@ static const struct uart_driver_api uart_miv_driver_api = {
 BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) <= 1,
 	     "unsupported uart_miv instance");
 
-#if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0))
 
 static struct uart_miv_data uart_miv_data_0;
 
@@ -424,4 +424,4 @@ static void uart_miv_irq_cfg_func_0(const struct device *dev)
 }
 #endif
 
-#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0)) */
diff --git a/drivers/spi/spi_smartbond.c b/drivers/spi/spi_smartbond.c
index 324273bc12e..7a2be279e98 100644
--- a/drivers/spi/spi_smartbond.c
+++ b/drivers/spi/spi_smartbond.c
@@ -1227,11 +1227,11 @@ static int spi_smartbond_isr_connect(const struct device *dev)
 
 	switch ((uint32_t)cfg->regs) {
 	case (uint32_t)SPI:
-		COND_CODE_1(DT_NODE_HAS_STATUS(DT_NODELABEL(spi), okay),
+		COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(spi)),
 			(SPI_SMARTBOND_ISR_CONNECT), (NULL));
 		break;
 	case (uint32_t)SPI2:
-		COND_CODE_1(DT_NODE_HAS_STATUS(DT_NODELABEL(spi2), okay),
+		COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(spi2)),
 			(SPI2_SMARTBOND_ISR_CONNECT), (NULL));
 		break;
 	default:
diff --git a/drivers/spi/spi_xec_qmspi.c b/drivers/spi/spi_xec_qmspi.c
index f606f3145c3..02cd34d259f 100644
--- a/drivers/spi/spi_xec_qmspi.c
+++ b/drivers/spi/spi_xec_qmspi.c
@@ -681,7 +681,7 @@ static const struct spi_driver_api spi_qmspi_driver_api = {
 				DT_INST_PROP(0, dldh),			\
 				DT_INST_PROP(0, dcsda))
 
-#if DT_NODE_HAS_STATUS(DT_INST(0, microchip_xec_qmspi), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, microchip_xec_qmspi))
 
 PINCTRL_DT_INST_DEFINE(0);
 
@@ -708,4 +708,4 @@ DEVICE_DT_INST_DEFINE(0,
 		    &spi_qmspi_0_config, POST_KERNEL,
 		    CONFIG_SPI_INIT_PRIORITY, &spi_qmspi_driver_api);
 
-#endif /* DT_NODE_HAS_STATUS(DT_INST(0, microchip_xec_qmspi), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_INST(0, microchip_xec_qmspi)) */
diff --git a/drivers/timer/mcux_os_timer.c b/drivers/timer/mcux_os_timer.c
index 74580e684b0..c6eb776e43a 100644
--- a/drivers/timer/mcux_os_timer.c
+++ b/drivers/timer/mcux_os_timer.c
@@ -36,7 +36,7 @@ static OSTIMER_Type *base;
  * certain deep sleep modes and the time elapsed when it is powered off.
  */
 static uint64_t cyc_sys_compensated;
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(standby), okay) && CONFIG_PM
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(standby)) && CONFIG_PM
 static const struct device *counter_dev;
 #endif
 
@@ -71,7 +71,7 @@ void mcux_lpc_ostick_isr(const void *arg)
 	sys_clock_announce(IS_ENABLED(CONFIG_TICKLESS_KERNEL) ? dticks : 1);
 }
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(standby), okay) && CONFIG_PM
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(standby)) && CONFIG_PM
 
 /* The OS Timer is disabled in certain low power modes and cannot wakeup the system
  * on timeout. This function will be called by the low power code to allow the
@@ -178,7 +178,7 @@ void sys_clock_set_timeout(int32_t ticks, bool idle)
 		return;
 	}
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(standby), okay) && CONFIG_PM
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(standby)) && CONFIG_PM
 	if (idle) {
 		/* OS Timer may not be able to wakeup in certain low power modes.
 		 * For these cases, we start a counter that can wakeup
@@ -247,7 +247,7 @@ uint64_t sys_clock_cycle_get_64(void)
 
 void sys_clock_idle_exit(void)
 {
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(standby), okay) && CONFIG_PM
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(standby)) && CONFIG_PM
 	/* The tick should be compensated for states where the
 	 * OS Timer is disabled
 	 */
@@ -280,7 +280,7 @@ static int sys_clock_driver_init(void)
 	irq_enable(DT_INST_IRQN(0));
 
 /* On some SoC's, OS Timer cannot wakeup from low power mode in standby modes */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(standby), okay) && CONFIG_PM
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(standby)) && CONFIG_PM
 	counter_dev = DEVICE_DT_GET_OR_NULL(DT_INST_PHANDLE(0, deep_sleep_counter));
 #endif
 
diff --git a/drivers/timer/nrf_grtc_timer.c b/drivers/timer/nrf_grtc_timer.c
index 07d58e402c9..fb9c859caeb 100644
--- a/drivers/timer/nrf_grtc_timer.c
+++ b/drivers/timer/nrf_grtc_timer.c
@@ -426,7 +426,7 @@ int z_nrf_grtc_wakeup_prepare(uint64_t wake_time_us)
 		nrfy_grtc_timeout_get(NRF_GRTC) * CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC / 32768 +
 		MAX_CC_LATCH_WAIT_TIME_US;
 	k_busy_wait(wait_time);
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lfxo), okay) && NRF_GRTC_HAS_CLKSEL
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lfxo)) && NRF_GRTC_HAS_CLKSEL
 	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFXO);
 #endif
 	k_spin_unlock(&lock, key);
@@ -502,7 +502,7 @@ static int sys_clock_driver_init(void)
 #endif
 
 #if defined(CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT) &&                                             \
-	DT_NODE_HAS_STATUS(DT_NODELABEL(lfxo), okay) && NRF_GRTC_HAS_CLKSEL
+	DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lfxo)) && NRF_GRTC_HAS_CLKSEL
 	/* Switch to LFXO as the low-frequency clock source. */
 	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFXO);
 #endif
diff --git a/drivers/timer/smartbond_timer.c b/drivers/timer/smartbond_timer.c
index ceef22ce5fa..afa86617e0e 100644
--- a/drivers/timer/smartbond_timer.c
+++ b/drivers/timer/smartbond_timer.c
@@ -199,7 +199,7 @@ static int sys_clock_driver_init(void)
 	uint8_t pdc_idx;
 	uint8_t en_xtal;
 
-	en_xtal = DT_NODE_HAS_STATUS(DT_NODELABEL(xtal32m), okay) ? MCU_PDC_EN_XTAL : 0;
+	en_xtal = DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(xtal32m)) ? MCU_PDC_EN_XTAL : 0;
 
 	/* Enable wakeup by TIMER2 */
 	pdc_idx = da1469x_pdc_add(MCU_PDC_TRIGGER_TIMER2, MCU_PDC_MASTER_M33, en_xtal);
diff --git a/drivers/usb/device/usb_dc_mcux.c b/drivers/usb/device/usb_dc_mcux.c
index b28499db1d6..14a8918d106 100644
--- a/drivers/usb/device/usb_dc_mcux.c
+++ b/drivers/usb/device/usb_dc_mcux.c
@@ -84,17 +84,17 @@ BUILD_ASSERT(NUM_INSTS <= 1, "Only one USB device supported");
 #elif defined(CONFIG_SOC_LPC55S36)
 #define CONTROLLER_ID	kUSB_ControllerLpcIp3511Fs0
 #elif defined(CONFIG_SOC_LPC55S69_CPU0) || defined(CONFIG_SOC_LPC55S69_CPU1)
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usbhs), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usbhs))
 #define CONTROLLER_ID	kUSB_ControllerLpcIp3511Hs0
-#elif DT_NODE_HAS_STATUS(DT_NODELABEL(usbfs), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usbfs))
 #define CONTROLLER_ID	kUSB_ControllerLpcIp3511Fs0
 #endif /* LPC55s69 */
 #elif defined(CONFIG_SOC_SERIES_IMXRT11XX) || \
 	defined(CONFIG_SOC_SERIES_IMXRT10XX) || \
 	defined(CONFIG_SOC_SERIES_MCXN)
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb1))
 #define CONTROLLER_ID kUSB_ControllerEhci0
-#elif DT_NODE_HAS_STATUS(DT_NODELABEL(usb2), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb2))
 #define CONTROLLER_ID kUSB_ControllerEhci1
 #endif /* IMX RT */
 #elif defined(CONFIG_SOC_SERIES_RW6XX)
diff --git a/drivers/usb/device/usb_dc_nrfx.c b/drivers/usb/device/usb_dc_nrfx.c
index a165c24f789..c8442cb8f64 100644
--- a/drivers/usb/device/usb_dc_nrfx.c
+++ b/drivers/usb/device/usb_dc_nrfx.c
@@ -1900,8 +1900,8 @@ static int usb_init(void)
 			   == NRF5X_REG_MODE_DCDC),
 #if NRFX_POWER_SUPPORTS_DCDCEN_VDDH
 		.dcdcenhv = COND_CODE_1(CONFIG_SOC_SERIES_NRF52X,
-			(DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf52x_regulator_hv), okay)),
-			(DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf53x_regulator_hv), okay))),
+			(DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nordic_nrf52x_regulator_hv))),
+			(DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nordic_nrf53x_regulator_hv)))),
 #endif
 	};
 
diff --git a/drivers/usb/udc/udc_nrf.c b/drivers/usb/udc/udc_nrf.c
index c6951074c85..c024d2a6a18 100644
--- a/drivers/usb/udc/udc_nrf.c
+++ b/drivers/usb/udc/udc_nrf.c
@@ -824,8 +824,8 @@ static const struct udc_nrf_config udc_nrf_cfg = {
 			   == NRF5X_REG_MODE_DCDC),
 #if NRFX_POWER_SUPPORTS_DCDCEN_VDDH
 		.dcdcenhv = COND_CODE_1(CONFIG_SOC_SERIES_NRF52X,
-			(DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf52x_regulator_hv), okay)),
-			(DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf53x_regulator_hv), okay))),
+			(DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nordic_nrf52x_regulator_hv))),
+			(DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nordic_nrf53x_regulator_hv)))),
 #endif
 	},
 
diff --git a/drivers/watchdog/wdt_esp32.c b/drivers/watchdog/wdt_esp32.c
index 8fe4c877fd0..1c7ee61ee64 100644
--- a/drivers/watchdog/wdt_esp32.c
+++ b/drivers/watchdog/wdt_esp32.c
@@ -226,10 +226,10 @@ static void wdt_esp32_isr(void *arg)
 }
 
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(wdt0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(wdt0))
 ESP32_WDT_INIT(0);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(wdt1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(wdt1))
 ESP32_WDT_INIT(1);
 #endif
diff --git a/include/zephyr/device.h b/include/zephyr/device.h
index 52b8604db80..5f93954a9ff 100644
--- a/include/zephyr/device.h
+++ b/include/zephyr/device.h
@@ -309,7 +309,7 @@ typedef int16_t device_handle_t;
  * @return a @ref device reference for the node identifier, which may be `NULL`.
  */
 #define DEVICE_DT_GET_OR_NULL(node_id)                                         \
-	COND_CODE_1(DT_NODE_HAS_STATUS(node_id, okay),                         \
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(node_id),                          \
 		    (DEVICE_DT_GET(node_id)), (NULL))
 
 /**
diff --git a/include/zephyr/drivers/clock_control/stm32_clock_control.h b/include/zephyr/drivers/clock_control/stm32_clock_control.h
index c33714be976..b03fa790027 100644
--- a/include/zephyr/drivers/clock_control/stm32_clock_control.h
+++ b/include/zephyr/drivers/clock_control/stm32_clock_control.h
@@ -250,7 +250,7 @@
 #endif
 
 /** PLL/PLL1 clock source */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pll), okay) && \
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll)) && \
 	DT_NODE_HAS_PROP(DT_NODELABEL(pll), clocks)
 #define DT_PLL_CLOCKS_CTRL	DT_CLOCKS_CTLR(DT_NODELABEL(pll))
 #if DT_SAME_NODE(DT_PLL_CLOCKS_CTRL, DT_NODELABEL(clk_msi))
@@ -275,7 +275,7 @@
 #endif
 
 /** PLL2 clock source */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pll2), okay) && \
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll2)) && \
 	DT_NODE_HAS_PROP(DT_NODELABEL(pll2), clocks)
 #define DT_PLL2_CLOCKS_CTRL	DT_CLOCKS_CTLR(DT_NODELABEL(pll2))
 #if DT_SAME_NODE(DT_PLL2_CLOCKS_CTRL, DT_NODELABEL(clk_msis))
@@ -291,7 +291,7 @@
 #endif
 
 /** PLL3 clock source */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pll3), okay) && \
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll3)) && \
 	DT_NODE_HAS_PROP(DT_NODELABEL(pll3), clocks)
 #define DT_PLL3_CLOCKS_CTRL	DT_CLOCKS_CTLR(DT_NODELABEL(pll3))
 #if DT_SAME_NODE(DT_PLL3_CLOCKS_CTRL, DT_NODELABEL(clk_msis))
diff --git a/include/zephyr/drivers/emul.h b/include/zephyr/drivers/emul.h
index c0830bb0205..a20679573e4 100644
--- a/include/zephyr/drivers/emul.h
+++ b/include/zephyr/drivers/emul.h
@@ -195,7 +195,7 @@ struct emul {
  * @return a @ref emul reference for the node identifier, which may be `NULL`.
  */
 #define EMUL_DT_GET_OR_NULL(node_id)                                                               \
-	COND_CODE_1(DT_NODE_HAS_STATUS(node_id, okay), (EMUL_DT_GET(node_id)), (NULL))
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(node_id), (EMUL_DT_GET(node_id)), (NULL))
 
 /**
  * @brief Set up a list of emulators
diff --git a/include/zephyr/linker/linker-defs.h b/include/zephyr/linker/linker-defs.h
index 5c1089c0fcf..ff3cbe6ca6c 100644
--- a/include/zephyr/linker/linker-defs.h
+++ b/include/zephyr/linker/linker-defs.h
@@ -32,6 +32,7 @@
  */
 #ifdef ZTEST_UNITTEST
 #define DT_NODE_HAS_STATUS(node, status) 0
+#define DT_NODE_HAS_STATUS_OKAY(node) 0
 #else
 #include <zephyr/devicetree.h>
 #endif
@@ -159,7 +160,7 @@ extern char __gcov_bss_size[];
 /* end address of image, used by newlib for the heap */
 extern char _end[];
 
-#if (DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_ccm), okay))
+#if (DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_ccm)))
 extern char __ccm_data_rom_start[];
 extern char __ccm_start[];
 extern char __ccm_data_start[];
@@ -171,14 +172,14 @@ extern char __ccm_noinit_end[];
 extern char __ccm_end[];
 #endif
 
-#if (DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_itcm), okay))
+#if (DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_itcm)))
 extern char __itcm_start[];
 extern char __itcm_end[];
 extern char __itcm_size[];
 extern char __itcm_load_start[];
 #endif
 
-#if (DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay))
+#if (DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm)))
 extern char __dtcm_data_start[];
 extern char __dtcm_data_end[];
 extern char __dtcm_bss_start[];
@@ -190,7 +191,7 @@ extern char __dtcm_start[];
 extern char __dtcm_end[];
 #endif
 
-#if (DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_ocm), okay))
+#if (DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_ocm)))
 extern char __ocm_data_start[];
 extern char __ocm_data_end[];
 extern char __ocm_bss_start[];
diff --git a/include/zephyr/pm/state.h b/include/zephyr/pm/state.h
index 87363ea27d2..6590b90c385 100644
--- a/include/zephyr/pm/state.h
+++ b/include/zephyr/pm/state.h
@@ -194,7 +194,7 @@ struct pm_state_constraint {
  * @param idx Index within the array.
  */
 #define Z_DT_PHANDLE_01(node_id, prop, idx) \
-	COND_CODE_1(DT_NODE_HAS_STATUS(DT_PHANDLE_BY_IDX(node_id, prop, idx), okay), \
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_PHANDLE_BY_IDX(node_id, prop, idx)), \
 		    (1), (0))
 
 /**
@@ -207,7 +207,7 @@ struct pm_state_constraint {
  * @param node_id A node identifier with compatible zephyr,power-state
  */
 #define Z_PM_STATE_INFO_FROM_DT_CPU(i, node_id)                                                   \
-	COND_CODE_1(DT_NODE_HAS_STATUS(DT_PHANDLE_BY_IDX(node_id, cpu_power_states, i), okay),    \
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_PHANDLE_BY_IDX(node_id, cpu_power_states, i)),     \
 		    (PM_STATE_INFO_DT_INIT(DT_PHANDLE_BY_IDX(node_id, cpu_power_states, i)),), ())
 
 /**
@@ -220,7 +220,7 @@ struct pm_state_constraint {
  * @param node_id A node identifier with compatible zephyr,power-state
  */
 #define Z_PM_STATE_FROM_DT_CPU(i, node_id)                                                        \
-	COND_CODE_1(DT_NODE_HAS_STATUS(DT_PHANDLE_BY_IDX(node_id, cpu_power_states, i), okay),    \
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_PHANDLE_BY_IDX(node_id, cpu_power_states, i)),     \
 		    (PM_STATE_DT_INIT(DT_PHANDLE_BY_IDX(node_id, cpu_power_states, i)),), ())
 
 /** @endcond */
diff --git a/kernel/init.c b/kernel/init.c
index 1c24c5fc2b2..cd361e74936 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -226,17 +226,17 @@ void z_bss_zero(void)
 	}
 
 	z_early_memset(__bss_start, 0, __bss_end - __bss_start);
-#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_ccm), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_ccm))
 	z_early_memset(&__ccm_bss_start, 0,
 		       (uintptr_t) &__ccm_bss_end
 		       - (uintptr_t) &__ccm_bss_start);
 #endif
-#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm))
 	z_early_memset(&__dtcm_bss_start, 0,
 		       (uintptr_t) &__dtcm_bss_end
 		       - (uintptr_t) &__dtcm_bss_start);
 #endif
-#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_ocm), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_ocm))
 	z_early_memset(&__ocm_bss_start, 0,
 		       (uintptr_t) &__ocm_bss_end
 		       - (uintptr_t) &__ocm_bss_start);
diff --git a/kernel/xip.c b/kernel/xip.c
index a5752560c85..34e92ef1844 100644
--- a/kernel/xip.c
+++ b/kernel/xip.c
@@ -31,15 +31,15 @@ void z_data_copy(void)
 	z_early_memcpy(&__ramfunc_start, &__ramfunc_load_start,
 		       (uintptr_t) &__ramfunc_size);
 #endif /* CONFIG_ARCH_HAS_RAMFUNC_SUPPORT */
-#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_ccm), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_ccm))
 	z_early_memcpy(&__ccm_data_start, &__ccm_data_rom_start,
 		       __ccm_data_end - __ccm_data_start);
 #endif
-#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_itcm), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_itcm))
 	z_early_memcpy(&__itcm_start, &__itcm_load_start,
 		       (uintptr_t) &__itcm_size);
 #endif
-#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm))
 	z_early_memcpy(&__dtcm_data_start, &__dtcm_data_load_start,
 		       __dtcm_data_end - __dtcm_data_start);
 #endif
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index c7a7f169c01..47a12f90925 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -1006,7 +1006,7 @@
 
 #define NRFX_IPCT_PUB_OR_SUB_MASK(inst_num) \
 	COND_CODE_1(IS_EMPTY(inst_num), \
-		(DT_NODE_HAS_STATUS(NRFX_CONFIG_IPCT_LOCAL_NODE, okay)), \
+		(DT_NODE_HAS_STATUS_OKAY(NRFX_CONFIG_IPCT_LOCAL_NODE)), \
 		(DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(ipct, inst_num)), owned_channels)))
 
 /* Variables names generation. */
diff --git a/samples/basic/button/src/main.c b/samples/basic/button/src/main.c
index b181afcc34e..a86407a65c2 100644
--- a/samples/basic/button/src/main.c
+++ b/samples/basic/button/src/main.c
@@ -18,7 +18,7 @@
  * Get button configuration from the devicetree sw0 alias. This is mandatory.
  */
 #define SW0_NODE	DT_ALIAS(sw0)
-#if !DT_NODE_HAS_STATUS(SW0_NODE, okay)
+#if !DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
 #error "Unsupported board: sw0 devicetree alias is not defined"
 #endif
 static const struct gpio_dt_spec button = GPIO_DT_SPEC_GET_OR(SW0_NODE, gpios,
diff --git a/samples/basic/threads/src/main.c b/samples/basic/threads/src/main.c
index 0554ddd9daf..529df15908a 100644
--- a/samples/basic/threads/src/main.c
+++ b/samples/basic/threads/src/main.c
@@ -20,11 +20,11 @@
 #define LED0_NODE DT_ALIAS(led0)
 #define LED1_NODE DT_ALIAS(led1)
 
-#if !DT_NODE_HAS_STATUS(LED0_NODE, okay)
+#if !DT_NODE_HAS_STATUS_OKAY(LED0_NODE)
 #error "Unsupported board: led0 devicetree alias is not defined"
 #endif
 
-#if !DT_NODE_HAS_STATUS(LED1_NODE, okay)
+#if !DT_NODE_HAS_STATUS_OKAY(LED1_NODE)
 #error "Unsupported board: led1 devicetree alias is not defined"
 #endif
 
diff --git a/samples/bluetooth/central_otc/src/main.c b/samples/bluetooth/central_otc/src/main.c
index 23a2968e14a..171bbe7187c 100644
--- a/samples/bluetooth/central_otc/src/main.c
+++ b/samples/bluetooth/central_otc/src/main.c
@@ -77,8 +77,8 @@ static void print_hex_number(const uint8_t *num, size_t len)
 #define SW1_NODE DT_ALIAS(sw1)
 #define SW2_NODE DT_ALIAS(sw2)
 #define SW3_NODE DT_ALIAS(sw3)
-#if !DT_NODE_HAS_STATUS(SW0_NODE, okay) || !DT_NODE_HAS_STATUS(SW1_NODE, okay) ||                  \
-	!DT_NODE_HAS_STATUS(SW2_NODE, okay) || !DT_NODE_HAS_STATUS(SW3_NODE, okay)
+#if !DT_NODE_HAS_STATUS_OKAY(SW0_NODE) || !DT_NODE_HAS_STATUS_OKAY(SW1_NODE) ||                    \
+	!DT_NODE_HAS_STATUS_OKAY(SW2_NODE) || !DT_NODE_HAS_STATUS_OKAY(SW3_NODE)
 #error "Unsupported board: This sample need 4 buttons to run"
 #endif
 
diff --git a/samples/bluetooth/encrypted_advertising/central/src/main.c b/samples/bluetooth/encrypted_advertising/central/src/main.c
index 888940af780..122641b311a 100644
--- a/samples/bluetooth/encrypted_advertising/central/src/main.c
+++ b/samples/bluetooth/encrypted_advertising/central/src/main.c
@@ -30,7 +30,7 @@ LOG_MODULE_DECLARE(ead_central_sample, CONFIG_BT_EAD_LOG_LEVEL);
  * Get button configuration from the devicetree sw0 alias. This is mandatory.
  */
 #define SW0_NODE DT_ALIAS(sw0)
-#if !DT_NODE_HAS_STATUS(SW0_NODE, okay)
+#if !DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
 #error "Unsupported board: sw0 devicetree alias is not defined"
 #endif
 static const struct gpio_dt_spec button = GPIO_DT_SPEC_GET_OR(SW0_NODE, gpios, {0});
diff --git a/samples/bluetooth/encrypted_advertising/peripheral/src/main.c b/samples/bluetooth/encrypted_advertising/peripheral/src/main.c
index 6b269d30513..affa5430af2 100644
--- a/samples/bluetooth/encrypted_advertising/peripheral/src/main.c
+++ b/samples/bluetooth/encrypted_advertising/peripheral/src/main.c
@@ -26,7 +26,7 @@ LOG_MODULE_DECLARE(ead_peripheral_sample, CONFIG_BT_EAD_LOG_LEVEL);
  * Get button configuration from the devicetree sw0 alias. This is mandatory.
  */
 #define SW0_NODE DT_ALIAS(sw0)
-#if !DT_NODE_HAS_STATUS(SW0_NODE, okay)
+#if !DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
 #error "Unsupported board: sw0 devicetree alias is not defined"
 #endif
 static const struct gpio_dt_spec button = GPIO_DT_SPEC_GET_OR(SW0_NODE, gpios, {0});
diff --git a/samples/bluetooth/iso_receive/src/main.c b/samples/bluetooth/iso_receive/src/main.c
index 3b7c051f387..989694907b4 100644
--- a/samples/bluetooth/iso_receive/src/main.c
+++ b/samples/bluetooth/iso_receive/src/main.c
@@ -42,7 +42,7 @@ static K_SEM_DEFINE(sem_big_sync_lost, 0, BIS_ISO_CHAN_COUNT);
 /* The devicetree node identifier for the "led0" alias. */
 #define LED0_NODE DT_ALIAS(led0)
 
-#if DT_NODE_HAS_STATUS(LED0_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(LED0_NODE)
 static const struct gpio_dt_spec led_gpio = GPIO_DT_SPEC_GET(LED0_NODE, gpios);
 #define HAS_LED     1
 #define BLINK_ONOFF K_MSEC(500)
diff --git a/samples/bluetooth/mesh_provisioner/src/main.c b/samples/bluetooth/mesh_provisioner/src/main.c
index 472dc020d43..d4be8601304 100644
--- a/samples/bluetooth/mesh_provisioner/src/main.c
+++ b/samples/bluetooth/mesh_provisioner/src/main.c
@@ -20,7 +20,7 @@ static uint8_t node_uuid[16];
 
 K_SEM_DEFINE(sem_unprov_beacon, 0, 1);
 K_SEM_DEFINE(sem_node_added, 0, 1);
-#if DT_NODE_HAS_STATUS(SW0_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
 K_SEM_DEFINE(sem_button_pressed, 0, 1);
 #endif
 
@@ -315,7 +315,7 @@ static uint8_t check_unconfigured(struct bt_mesh_cdb_node *node, void *data)
 	return BT_MESH_CDB_ITER_CONTINUE;
 }
 
-#if DT_NODE_HAS_STATUS(SW0_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
 static const struct gpio_dt_spec button = GPIO_DT_SPEC_GET_OR(SW0_NODE, gpios, {0});
 static struct gpio_callback button_cb_data;
 
@@ -366,7 +366,7 @@ int main(void)
 	printk("Bluetooth initialized\n");
 	bt_ready();
 
-#if DT_NODE_HAS_STATUS(SW0_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
 	button_init();
 #endif
 
@@ -383,7 +383,7 @@ int main(void)
 
 		bin2hex(node_uuid, 16, uuid_hex_str, sizeof(uuid_hex_str));
 
-#if DT_NODE_HAS_STATUS(SW0_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
 		k_sem_reset(&sem_button_pressed);
 		printk("Device %s detected, press button 1 to provision.\n", uuid_hex_str);
 		err = k_sem_take(&sem_button_pressed, K_SECONDS(30));
diff --git a/samples/bluetooth/periodic_sync/src/main.c b/samples/bluetooth/periodic_sync/src/main.c
index 44c5a8530b4..a8baf5d2600 100644
--- a/samples/bluetooth/periodic_sync/src/main.c
+++ b/samples/bluetooth/periodic_sync/src/main.c
@@ -24,7 +24,7 @@ static K_SEM_DEFINE(sem_per_sync_lost, 0, 1);
 /* The devicetree node identifier for the "led0" alias. */
 #define LED0_NODE DT_ALIAS(led0)
 
-#if DT_NODE_HAS_STATUS(LED0_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(LED0_NODE)
 #define HAS_LED     1
 static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(LED0_NODE, gpios);
 #define BLINK_ONOFF K_MSEC(500)
diff --git a/samples/bluetooth/peripheral_hids/src/hog.c b/samples/bluetooth/peripheral_hids/src/hog.c
index cf67521517d..9aefdf2ea98 100644
--- a/samples/bluetooth/peripheral_hids/src/hog.c
+++ b/samples/bluetooth/peripheral_hids/src/hog.c
@@ -180,7 +180,7 @@ void hog_init(void)
 
 void hog_button_loop(void)
 {
-#if DT_NODE_HAS_STATUS(SW0_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
 	const struct gpio_dt_spec sw0 = GPIO_DT_SPEC_GET(SW0_NODE, gpios);
 
 	gpio_pin_configure_dt(&sw0, GPIO_INPUT);
diff --git a/samples/bluetooth/peripheral_hr/src/main.c b/samples/bluetooth/peripheral_hr/src/main.c
index 8d7f73e5440..19c640ca91b 100644
--- a/samples/bluetooth/peripheral_hr/src/main.c
+++ b/samples/bluetooth/peripheral_hr/src/main.c
@@ -123,7 +123,7 @@ static void hrs_notify(void)
 /* The devicetree node identifier for the "led0" alias. */
 #define LED0_NODE DT_ALIAS(led0)
 
-#if DT_NODE_HAS_STATUS(LED0_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(LED0_NODE)
 #include <zephyr/drivers/gpio.h>
 #define HAS_LED     1
 static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(LED0_NODE, gpios);
diff --git a/samples/boards/espressif/deep_sleep/src/main.c b/samples/boards/espressif/deep_sleep/src/main.c
index edf8b559705..519a1a550df 100644
--- a/samples/boards/espressif/deep_sleep/src/main.c
+++ b/samples/boards/espressif/deep_sleep/src/main.c
@@ -17,7 +17,7 @@
 #endif
 
 #ifdef CONFIG_EXAMPLE_GPIO_WAKEUP
-#if !DT_NODE_HAS_STATUS(DT_ALIAS(wakeup_button), okay)
+#if !DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(wakeup_button))
 #error "Unsupported: wakeup-button alias is not defined"
 #else
 static const struct gpio_dt_spec wakeup_button = GPIO_DT_SPEC_GET(DT_ALIAS(wakeup_button), gpios);
diff --git a/samples/boards/espressif/light_sleep/src/main.c b/samples/boards/espressif/light_sleep/src/main.c
index 50cb920d159..9134f6a2006 100644
--- a/samples/boards/espressif/light_sleep/src/main.c
+++ b/samples/boards/espressif/light_sleep/src/main.c
@@ -16,7 +16,7 @@
  */
 #define SW0_NODE	DT_ALIAS(sw0)
 
-#if !DT_NODE_HAS_STATUS(SW0_NODE, okay)
+#if !DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
 #error "unsupported board: sw0 devicetree alias is not defined"
 #endif
 
diff --git a/samples/boards/nordic/battery/src/battery.c b/samples/boards/nordic/battery/src/battery.c
index a0fbb651b58..3a31a91398b 100644
--- a/samples/boards/nordic/battery/src/battery.c
+++ b/samples/boards/nordic/battery/src/battery.c
@@ -51,7 +51,7 @@ struct divider_config {
 };
 
 static const struct divider_config divider_config = {
-#if DT_NODE_HAS_STATUS(VBATT, okay)
+#if DT_NODE_HAS_STATUS_OKAY(VBATT)
 	.io_channel = {
 		DT_IO_CHANNELS_INPUT(VBATT),
 	},
@@ -72,7 +72,7 @@ struct divider_data {
 	int16_t raw;
 };
 static struct divider_data divider_data = {
-#if DT_NODE_HAS_STATUS(VBATT, okay)
+#if DT_NODE_HAS_STATUS_OKAY(VBATT)
 	.adc = DEVICE_DT_GET(DT_IO_CHANNELS_CTLR(VBATT)),
 #else
 	.adc = DEVICE_DT_GET(DT_IO_CHANNELS_CTLR(ZEPHYR_USER)),
diff --git a/samples/boards/nxp/mimxrt1060_evk/system_off/src/main.c b/samples/boards/nxp/mimxrt1060_evk/system_off/src/main.c
index 57b0298f861..af5dbf4b845 100644
--- a/samples/boards/nxp/mimxrt1060_evk/system_off/src/main.c
+++ b/samples/boards/nxp/mimxrt1060_evk/system_off/src/main.c
@@ -17,12 +17,12 @@
 #define SOFT_OFF_S 10U
 
 #define SW0_NODE DT_ALIAS(sw0)
-#if !DT_NODE_HAS_STATUS(SW0_NODE, okay)
+#if !DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
 #error "Unsupported board: sw0 devicetree alias is not defined"
 #endif
 
 #define SNVS_RTC_NODE DT_NODELABEL(snvs_rtc)
-#if !DT_NODE_HAS_STATUS(SNVS_RTC_NODE, okay)
+#if !DT_NODE_HAS_STATUS_OKAY(SNVS_RTC_NODE)
 #error "Unsupported board: snvs_rtc node is not enabled"
 #endif
 
diff --git a/samples/boards/st/i2c_timing/src/main.c b/samples/boards/st/i2c_timing/src/main.c
index 41b8dfa2dee..80f8001318d 100644
--- a/samples/boards/st/i2c_timing/src/main.c
+++ b/samples/boards/st/i2c_timing/src/main.c
@@ -10,7 +10,7 @@
 #include <zephyr/kernel.h>
 
 
-#if DT_NODE_HAS_STATUS(DT_ALIAS(i2c_0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(i2c_0))
 #define I2C_DEV_NODE	DT_ALIAS(i2c_0)
 #else
 #error "Please set the correct I2C device"
diff --git a/samples/boards/st/mco/src/main.c b/samples/boards/st/mco/src/main.c
index 966e80f8525..7e79d1e8cd8 100644
--- a/samples/boards/st/mco/src/main.c
+++ b/samples/boards/st/mco/src/main.c
@@ -25,7 +25,7 @@ int main(void)
 		return -1;
 	}
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(mco2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(mco2))
 	dev = DEVICE_DT_GET(DT_NODELABEL(mco2));
 	if (device_is_ready(dev)) {
 		printk("MCO2 device successfully configured\n");
diff --git a/samples/boards/st/power_mgmt/standby_shutdown/src/main.c b/samples/boards/st/power_mgmt/standby_shutdown/src/main.c
index 6610f01f955..b74051bc99f 100644
--- a/samples/boards/st/power_mgmt/standby_shutdown/src/main.c
+++ b/samples/boards/st/power_mgmt/standby_shutdown/src/main.c
@@ -23,7 +23,7 @@
 #define SLEEP_TIME_MS   3000
 
 #define SW0_NODE	DT_ALIAS(sw0)
-#if !DT_NODE_HAS_STATUS(SW0_NODE, okay)
+#if !DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
 #error "Unsupported board: sw0 devicetree alias is not defined"
 #endif
 
diff --git a/samples/boards/st/power_mgmt/wkup_pins/src/main.c b/samples/boards/st/power_mgmt/wkup_pins/src/main.c
index 2284a76b035..c83db862d43 100644
--- a/samples/boards/st/power_mgmt/wkup_pins/src/main.c
+++ b/samples/boards/st/power_mgmt/wkup_pins/src/main.c
@@ -15,7 +15,7 @@
 #define WAIT_TIME_US 4000000
 
 #define WKUP_SRC_NODE DT_ALIAS(wkup_src)
-#if !DT_NODE_HAS_STATUS(WKUP_SRC_NODE, okay)
+#if !DT_NODE_HAS_STATUS_OKAY(WKUP_SRC_NODE)
 #error "Unsupported board: wkup_src devicetree alias is not defined"
 #endif
 
diff --git a/samples/drivers/espi/src/main.c b/samples/drivers/espi/src/main.c
index fff0998459d..aa6b92a4725 100644
--- a/samples/drivers/espi/src/main.c
+++ b/samples/drivers/espi/src/main.c
@@ -45,7 +45,7 @@ LOG_MODULE_DECLARE(espi, CONFIG_ESPI_LOG_LEVEL);
 /* The devicetree node identifier for the board power rails pins. */
 #define BRD_PWR_NODE DT_NODELABEL(board_power)
 
-#if DT_NODE_HAS_STATUS(BRD_PWR_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(BRD_PWR_NODE)
 static const struct gpio_dt_spec pwrgd_gpio = GPIO_DT_SPEC_GET(BRD_PWR_NODE, pwrg_gpios);
 static const struct gpio_dt_spec rsm_gpio = GPIO_DT_SPEC_GET(BRD_PWR_NODE, rsm_gpios);
 #endif
@@ -911,7 +911,7 @@ int espi_init(void)
 	return ret;
 }
 
-#if DT_NODE_HAS_STATUS(BRD_PWR_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(BRD_PWR_NODE)
 static int wait_for_pin(const struct gpio_dt_spec *gpio, uint16_t timeout, int exp_level)
 {
 	uint16_t loop_cnt = timeout;
@@ -1172,7 +1172,7 @@ int espi_test(void)
 	 */
 	k_sleep(K_SECONDS(1));
 
-#if DT_NODE_HAS_STATUS(BRD_PWR_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(BRD_PWR_NODE)
 	if (!gpio_is_ready_dt(&pwrgd_gpio)) {
 		LOG_ERR("%s: device not ready.", pwrgd_gpio.port->name);
 		return -ENODEV;
@@ -1201,7 +1201,7 @@ int espi_test(void)
 
 	LOG_INF("Hello eSPI test %s", CONFIG_BOARD);
 
-#if DT_NODE_HAS_STATUS(BRD_PWR_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(BRD_PWR_NODE)
 	ret = gpio_pin_configure_dt(&pwrgd_gpio, GPIO_INPUT);
 	if (ret) {
 		LOG_ERR("Unable to configure %d:%d", pwrgd_gpio.pin, ret);
@@ -1252,7 +1252,7 @@ int espi_test(void)
 	}
 #endif
 
-#if DT_NODE_HAS_STATUS(BRD_PWR_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(BRD_PWR_NODE)
 	ret = wait_for_pin(&pwrgd_gpio, PWR_SEQ_TIMEOUT, 1);
 	if (ret) {
 		LOG_ERR("RSMRST_PWRGD timeout");
diff --git a/samples/drivers/i2s/echo/src/main.c b/samples/drivers/i2s/echo/src/main.c
index c0ac1505d7b..bffa794158b 100644
--- a/samples/drivers/i2s/echo/src/main.c
+++ b/samples/drivers/i2s/echo/src/main.c
@@ -30,12 +30,12 @@
 #define TIMEOUT             1000
 
 #define SW0_NODE        DT_ALIAS(sw0)
-#if DT_NODE_HAS_STATUS(SW0_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
 static struct gpio_dt_spec sw0_spec = GPIO_DT_SPEC_GET(SW0_NODE, gpios);
 #endif
 
 #define SW1_NODE        DT_ALIAS(sw1)
-#if DT_NODE_HAS_STATUS(SW1_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(SW1_NODE)
 static struct gpio_dt_spec sw1_spec = GPIO_DT_SPEC_GET(SW1_NODE, gpios);
 #endif
 
@@ -47,7 +47,7 @@ static int16_t echo_block[SAMPLES_PER_BLOCK];
 static volatile bool echo_enabled = true;
 static K_SEM_DEFINE(toggle_transfer, 1, 1);
 
-#if DT_NODE_HAS_STATUS(SW0_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
 static void sw0_handler(const struct device *dev, struct gpio_callback *cb,
 			uint32_t pins)
 {
@@ -58,7 +58,7 @@ static void sw0_handler(const struct device *dev, struct gpio_callback *cb,
 }
 #endif
 
-#if DT_NODE_HAS_STATUS(SW1_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(SW1_NODE)
 static void sw1_handler(const struct device *dev, struct gpio_callback *cb,
 			uint32_t pins)
 {
@@ -70,7 +70,7 @@ static bool init_buttons(void)
 {
 	int ret;
 
-#if DT_NODE_HAS_STATUS(SW0_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
 	static struct gpio_callback sw0_cb_data;
 
 	if (!gpio_is_ready_dt(&sw0_spec)) {
@@ -98,7 +98,7 @@ static bool init_buttons(void)
 	printk("Press \"%s\" to toggle the echo effect\n", sw0_spec.port->name);
 #endif
 
-#if DT_NODE_HAS_STATUS(SW1_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(SW1_NODE)
 	static struct gpio_callback sw1_cb_data;
 
 	if (!gpio_is_ready_dt(&sw1_spec)) {
diff --git a/samples/drivers/lora/receive/src/main.c b/samples/drivers/lora/receive/src/main.c
index 9b503354001..e6ba6086ae0 100644
--- a/samples/drivers/lora/receive/src/main.c
+++ b/samples/drivers/lora/receive/src/main.c
@@ -11,7 +11,7 @@
 #include <zephyr/kernel.h>
 
 #define DEFAULT_RADIO_NODE DT_ALIAS(lora0)
-BUILD_ASSERT(DT_NODE_HAS_STATUS(DEFAULT_RADIO_NODE, okay),
+BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DEFAULT_RADIO_NODE),
 	     "No default LoRa radio specified in DT");
 
 #define MAX_DATA_LEN 255
diff --git a/samples/drivers/lora/send/src/main.c b/samples/drivers/lora/send/src/main.c
index 63cce8367af..7988fa8762e 100644
--- a/samples/drivers/lora/send/src/main.c
+++ b/samples/drivers/lora/send/src/main.c
@@ -11,7 +11,7 @@
 #include <zephyr/kernel.h>
 
 #define DEFAULT_RADIO_NODE DT_ALIAS(lora0)
-BUILD_ASSERT(DT_NODE_HAS_STATUS(DEFAULT_RADIO_NODE, okay),
+BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DEFAULT_RADIO_NODE),
 	     "No default LoRa radio specified in DT");
 
 #define MAX_DATA_LEN 10
diff --git a/samples/shields/x_nucleo_53l0a1/src/main.c b/samples/shields/x_nucleo_53l0a1/src/main.c
index e2688eec21b..9de9469ba7d 100644
--- a/samples/shields/x_nucleo_53l0a1/src/main.c
+++ b/samples/shields/x_nucleo_53l0a1/src/main.c
@@ -15,7 +15,7 @@
  * Get button configuration from the devicetree sw0 alias. This is mandatory.
  */
 #define SW0_NODE        DT_ALIAS(sw0)
-#if !DT_NODE_HAS_STATUS(SW0_NODE, okay)
+#if !DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
 #error "Unsupported board: sw0 devicetree alias is not defined"
 #endif
 
diff --git a/samples/subsys/mgmt/osdp/control_panel/src/main.c b/samples/subsys/mgmt/osdp/control_panel/src/main.c
index 1942e822733..2b58692e926 100644
--- a/samples/subsys/mgmt/osdp/control_panel/src/main.c
+++ b/samples/subsys/mgmt/osdp/control_panel/src/main.c
@@ -12,7 +12,7 @@
 /* The devicetree node identifier for the "led0" alias. */
 #define LED0_NODE DT_ALIAS(led0)
 
-#if !DT_NODE_HAS_STATUS(LED0_NODE, okay)
+#if !DT_NODE_HAS_STATUS_OKAY(LED0_NODE)
 #error "BOARD does not define a debug LED"
 #endif
 
diff --git a/samples/subsys/mgmt/osdp/peripheral_device/src/main.c b/samples/subsys/mgmt/osdp/peripheral_device/src/main.c
index 8ffdd10f081..74d4fed6d2c 100644
--- a/samples/subsys/mgmt/osdp/peripheral_device/src/main.c
+++ b/samples/subsys/mgmt/osdp/peripheral_device/src/main.c
@@ -12,7 +12,7 @@
 /* The devicetree node identifier for the "led0" alias. */
 #define LED0_NODE DT_ALIAS(led0)
 
-#if !DT_NODE_HAS_STATUS(LED0_NODE, okay)
+#if !DT_NODE_HAS_STATUS_OKAY(LED0_NODE)
 #error "BOARD does not define a debug LED"
 #endif
 
diff --git a/samples/subsys/task_wdt/src/main.c b/samples/subsys/task_wdt/src/main.c
index f06ef1faef2..a366b3683eb 100644
--- a/samples/subsys/task_wdt/src/main.c
+++ b/samples/subsys/task_wdt/src/main.c
@@ -21,7 +21,7 @@
  * from there. Otherwise, the task watchdog will be used without a
  * hardware watchdog fallback.
  */
-#if DT_NODE_HAS_STATUS(DT_ALIAS(watchdog0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(watchdog0))
 #define WDT_NODE DT_ALIAS(watchdog0)
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_window_watchdog)
 #define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(st_stm32_window_watchdog)
diff --git a/soc/arm/beetle/power.c b/soc/arm/beetle/power.c
index 4377d79d3f0..700969f4673 100644
--- a/soc/arm/beetle/power.c
+++ b/soc/arm/beetle/power.c
@@ -11,13 +11,13 @@
 #include <soc_power.h>
 #include <zephyr/arch/cpu.h>
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
 #define CLK_BIT_GPIO0	_BEETLE_GPIO0
 #else
 #define CLK_BIT_GPIO0	0
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
 #define CLK_BIT_GPIO1	_BEETLE_GPIO1
 #else
 #define CLK_BIT_GPIO1	0
@@ -25,13 +25,13 @@
 
 #define AHB_CLK_BITS (CLK_BIT_GPIO0 | CLK_BIT_GPIO1)
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(timer0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(timer0))
 #define CLK_BIT_TIMER0	_BEETLE_TIMER0
 #else
 #define CLK_BIT_TIMER0	0
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(timer1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(timer1))
 #define CLK_BIT_TIMER1	_BEETLE_TIMER1
 #else
 #define CLK_BIT_TIMER1	0
@@ -43,13 +43,13 @@
 #define CLK_BIT_WDOG	0
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart0))
 #define CLK_BIT_UART0	_BEETLE_UART0
 #else
 #define CLK_BIT_UART0	0
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1))
 #define CLK_BIT_UART1	_BEETLE_UART1
 #else
 #define CLK_BIT_UART1	0
diff --git a/soc/atmel/sam/common/soc_power.c b/soc/atmel/sam/common/soc_power.c
index 08499b98b10..0b477f9fbe9 100644
--- a/soc/atmel/sam/common/soc_power.c
+++ b/soc/atmel/sam/common/soc_power.c
@@ -12,7 +12,7 @@
 #endif
 
 #if defined(CONFIG_REBOOT)
-#if DT_NODE_HAS_STATUS(SAM_DT_RSTC_DRIVER, okay)
+#if DT_NODE_HAS_STATUS_OKAY(SAM_DT_RSTC_DRIVER)
 
 void sys_arch_reboot(int type)
 {
@@ -33,5 +33,5 @@ void sys_arch_reboot(int type)
 	}
 }
 
-#endif /* DT_NODE_HAS_STATUS */
+#endif /* DT_NODE_HAS_STATUS_OKAY */
 #endif /* CONFIG_REBOOT */
diff --git a/soc/intel/intel_adsp/common/clk.c b/soc/intel/intel_adsp/common/clk.c
index 3cb4b0e2db7..ebcda7be1e7 100644
--- a/soc/intel/intel_adsp/common/clk.c
+++ b/soc/intel/intel_adsp/common/clk.c
@@ -129,10 +129,10 @@ struct adsp_clock_source_desc adsp_clk_src_info[ADSP_CLOCK_SOURCE_COUNT] = {
 	 */
 	[ADSP_CLOCK_SOURCE_XTAL_OSC] = { CONFIG_DAI_DMIC_HW_IOCLK },
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(audioclk), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(audioclk))
 	[ADSP_CLOCK_SOURCE_AUDIO_CARDINAL] = { DT_PROP(DT_NODELABEL(audioclk), clock_frequency) },
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pllclk), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pllclk))
 	[ADSP_CLOCK_SOURCE_AUDIO_PLL_FIXED] = { DT_PROP(DT_NODELABEL(pllclk), clock_frequency) },
 #endif
 	[ADSP_CLOCK_SOURCE_MLCK_INPUT] = { 0 },
diff --git a/soc/intel/intel_adsp/common/include/adsp_clk.h b/soc/intel/intel_adsp/common/include/adsp_clk.h
index ccfb5cdc7e7..591116c5561 100644
--- a/soc/intel/intel_adsp/common/include/adsp_clk.h
+++ b/soc/intel/intel_adsp/common/include/adsp_clk.h
@@ -64,10 +64,10 @@ struct adsp_cpu_clock_info *adsp_cpu_clocks_get(void);
 
 /* Clock sources used by dai */
 #define ADSP_CLOCK_SOURCE_XTAL_OSC		0
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(audioclk), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(audioclk))
 #define ADSP_CLOCK_SOURCE_AUDIO_CARDINAL	1
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pllclk), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pllclk))
 #define ADSP_CLOCK_SOURCE_AUDIO_PLL_FIXED	2
 #endif
 
diff --git a/soc/intel/intel_adsp/common/mem_window.c b/soc/intel/intel_adsp/common/mem_window.c
index 8ca591deb36..ae5abcb77bf 100644
--- a/soc/intel/intel_adsp/common/mem_window.c
+++ b/soc/intel/intel_adsp/common/mem_window.c
@@ -58,15 +58,15 @@ void mem_window_idle_exit(void)
 			&mem_win_config_##n, PRE_KERNEL_1,                                         \
 			CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, NULL);
 
-#if DT_NODE_HAS_STATUS(MEM_WINDOW_NODE(0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(MEM_WINDOW_NODE(0))
 MEM_WINDOW_DEFINE(0)
 #endif
-#if DT_NODE_HAS_STATUS(MEM_WINDOW_NODE(1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(MEM_WINDOW_NODE(1))
 MEM_WINDOW_DEFINE(1)
 #endif
-#if DT_NODE_HAS_STATUS(MEM_WINDOW_NODE(2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(MEM_WINDOW_NODE(2))
 MEM_WINDOW_DEFINE(2)
 #endif
-#if DT_NODE_HAS_STATUS(MEM_WINDOW_NODE(3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(MEM_WINDOW_NODE(3))
 MEM_WINDOW_DEFINE(3)
 #endif
diff --git a/soc/ite/ec/it8xxx2/soc.c b/soc/ite/ec/it8xxx2/soc.c
index 0f2501111be..2c2660ac3b1 100644
--- a/soc/ite/ec/it8xxx2/soc.c
+++ b/soc/ite/ec/it8xxx2/soc.c
@@ -403,7 +403,7 @@ static int ite_it8xxx2_init(void)
 	IT8XXX2_EGPIO_EGCR |= IT8XXX2_EGPIO_EEPODD;
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1))
 	/* UART1 board init */
 	/* bit2: clocks to UART1 modules are not gated. */
 	IT8XXX2_ECPM_CGCTRL3R &= ~BIT(2);
@@ -417,9 +417,9 @@ static int ite_it8xxx2_init(void)
 	/* switch UART1 on without hardware flow control */
 	gpio_regs->GPIO_GCR1 |= IT8XXX2_GPIO_U1CTRL_SIN0_SOUT0_EN;
 
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2))
 	/* UART2 board init */
 	/* setting voltage 3.3v */
 	gpio_regs->GPIO_GCR21 &= ~(IT8XXX2_GPIO_GPH1VS | IT8XXX2_GPIO_GPH2VS);
@@ -435,7 +435,7 @@ static int ite_it8xxx2_init(void)
 	/* switch UART2 on without hardware flow control */
 	gpio_regs->GPIO_GCR1 |= IT8XXX2_GPIO_U2CTRL_SIN1_SOUT1_EN;
 
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) */
 
 #if (SOC_USBPD_ITE_PHY_PORT_COUNT > 0)
 	int port;
diff --git a/soc/microchip/mec/common/soc_dt.h b/soc/microchip/mec/common/soc_dt.h
index cfaa8821da9..39f772f964f 100644
--- a/soc/microchip/mec/common/soc_dt.h
+++ b/soc/microchip/mec/common/soc_dt.h
@@ -35,7 +35,7 @@
 #define MCHP_DT_ESPI_VW_FLAG_RST_SRC_MSK0	0x7
 
 #define MCHP_DT_NODE_FROM_VWTABLE(name) DT_CHILD(DT_PATH(mchp_xec_espi_vw_routing), name)
-#define MCHP_DT_VW_NODE_HAS_STATUS(name) DT_NODE_HAS_STATUS(MCHP_DT_NODE_FROM_VWTABLE(name), okay)
+#define MCHP_DT_VW_NODE_HAS_STATUS(name) DT_NODE_HAS_STATUS_OKAY(MCHP_DT_NODE_FROM_VWTABLE(name))
 
 /* Macro to store eSPI virtual wire DT flags
  * b[0] = DT status property 0 is disabled, 1 enabled,
diff --git a/soc/microchip/mec/mec172x/device_power.c b/soc/microchip/mec/mec172x/device_power.c
index 8a35d6ddd00..eab5bfb0419 100644
--- a/soc/microchip/mec/mec172x/device_power.c
+++ b/soc/microchip/mec/mec172x/device_power.c
@@ -93,14 +93,14 @@ void soc_deep_sleep_non_wake_dis(void)
 void soc_deep_sleep_wake_en(void)
 {
 #if defined(CONFIG_KSCAN) ||	\
-	(!defined(CONFIG_PM_DEVICE) && DT_NODE_HAS_STATUS(DT_NODELABEL(ps2_0), okay))
+	(!defined(CONFIG_PM_DEVICE) && DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ps2_0)))
 	struct ecia_named_regs *regs = ECIA_XEC_REG_BASE;
 #if defined(CONFIG_KSCAN)
 	/* Enable PLL wake via KSCAN  */
 	regs->GIRQ21.SRC = MCHP_KEYSCAN_GIRQ_BIT;
 	regs->GIRQ21.EN_SET = MCHP_KEYSCAN_GIRQ_BIT;
 #endif
-#if !defined(CONFIG_PM_DEVICE) && DT_NODE_HAS_STATUS(DT_NODELABEL(ps2_0), okay)
+#if !defined(CONFIG_PM_DEVICE) && DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ps2_0))
 	/* Enable PS2_0B_WK */
 	regs->GIRQ21.SRC = MCHP_PS2_0_PORT0B_WK_GIRQ_BIT;
 	regs->GIRQ21.EN_SET = MCHP_PS2_0_PORT0B_WK_GIRQ_BIT;
@@ -110,7 +110,7 @@ void soc_deep_sleep_wake_en(void)
 
 void soc_deep_sleep_wake_dis(void)
 {
-#if !defined(CONFIG_PM_DEVICE) && DT_NODE_HAS_STATUS(DT_NODELABEL(ps2_0), okay)
+#if !defined(CONFIG_PM_DEVICE) && DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ps2_0))
 	struct ecia_named_regs *regs = ECIA_XEC_REG_BASE;
 
 	/* Enable PS2_0B_WK */
diff --git a/soc/nordic/common/nrf54hx_nrf92x_mpu_regions.c b/soc/nordic/common/nrf54hx_nrf92x_mpu_regions.c
index 66659588411..b76fac86bcd 100644
--- a/soc/nordic/common/nrf54hx_nrf92x_mpu_regions.c
+++ b/soc/nordic/common/nrf54hx_nrf92x_mpu_regions.c
@@ -28,15 +28,15 @@ static struct arm_mpu_region mpu_regions[] = {
 			 REGION_RAM_ATTR(CONFIG_SRAM_BASE_ADDRESS,
 				CONFIG_SRAM_SIZE * 1024)),
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usbhs), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usbhs))
 	MPU_REGION_ENTRY("USBHS_CORE", USBHS_BASE,
 			 REGION_RAM_NOCACHE_ATTR(USBHS_BASE, USBHS_SIZE)),
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(can120), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(can120))
 	MPU_REGION_ENTRY("CAN120_MCAN", CAN120_BASE,
 			 REGION_RAM_NOCACHE_ATTR(CAN120_BASE, CAN120_SIZE)),
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(can121), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(can121))
 	MPU_REGION_ENTRY("CAN121_MCAN", CAN121_BASE,
 			 REGION_RAM_NOCACHE_ATTR(CAN121_BASE, CAN121_SIZE)),
 #endif
diff --git a/soc/nordic/nrf52/soc.c b/soc/nordic/nrf52/soc.c
index 3262b84bc85..4bb3b8640e5 100644
--- a/soc/nordic/nrf52/soc.c
+++ b/soc/nordic/nrf52/soc.c
@@ -37,7 +37,7 @@ static int nordicsemi_nrf52_init(void)
 	nrf_power_dcdcen_set(NRF_POWER, true);
 #endif
 #if NRF_POWER_HAS_DCDCEN_VDDH && (defined(CONFIG_SOC_DCDC_NRF52X_HV) || \
-	DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf52x_regulator_hv), okay))
+	DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nordic_nrf52x_regulator_hv)))
 	nrf_power_dcdcen_vddh_set(NRF_POWER, true);
 #endif
 
diff --git a/soc/nordic/nrf53/soc.c b/soc/nordic/nrf53/soc.c
index 46e8e5ca20d..67eb5dfb67b 100644
--- a/soc/nordic/nrf53/soc.c
+++ b/soc/nordic/nrf53/soc.c
@@ -531,7 +531,7 @@ static int nordicsemi_nrf53_init(void)
 	(DT_PROP(DT_NODELABEL(vregradio), regulator_initial_mode) == NRF5X_REG_MODE_DCDC)
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_RADIO, true);
 #endif
-#if defined(CONFIG_SOC_DCDC_NRF53X_HV) || DT_NODE_HAS_STATUS(DT_NODELABEL(vregh), okay)
+#if defined(CONFIG_SOC_DCDC_NRF53X_HV) || DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(vregh))
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_HIGH, true);
 #endif
 
diff --git a/soc/nordic/nrf54h/soc.c b/soc/nordic/nrf54h/soc.c
index 2699a3ebd54..4ffb17bef51 100644
--- a/soc/nordic/nrf54h/soc.c
+++ b/soc/nordic/nrf54h/soc.c
@@ -143,7 +143,7 @@ static int nordicsemi_nrf54h_init(void)
 		return err;
 	}
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ccm030), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ccm030))
 	/* DMASEC is set to non-secure by default, which prevents CCM from
 	 * accessing secure memory. Change DMASEC to secure.
 	 */
diff --git a/soc/nordic/nrf92/soc.c b/soc/nordic/nrf92/soc.c
index 1a40bb58dda..d9a54e4f1aa 100644
--- a/soc/nordic/nrf92/soc.c
+++ b/soc/nordic/nrf92/soc.c
@@ -93,7 +93,7 @@ static int nordicsemi_nrf92_init(void)
 
 	trim_hsfll();
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ccm030), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ccm030))
 	/* DMASEC is set to non-secure by default, which prevents CCM from
 	 * accessing secure memory. Change DMASEC to secure.
 	 */
diff --git a/soc/nordic/validate_enabled_instances.c b/soc/nordic/validate_enabled_instances.c
index b3e4dd70bbf..afcfc6e8ca8 100644
--- a/soc/nordic/validate_enabled_instances.c
+++ b/soc/nordic/validate_enabled_instances.c
@@ -7,16 +7,16 @@
 #include <zephyr/kernel.h>
 
 #define I2C_ENABLED(idx)  (IS_ENABLED(CONFIG_I2C) && \
-			   DT_NODE_HAS_STATUS(DT_NODELABEL(i2c##idx), okay))
+			   DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c##idx)))
 
 #define SPI_ENABLED(idx)  (IS_ENABLED(CONFIG_SPI) && \
-			   DT_NODE_HAS_STATUS(DT_NODELABEL(spi##idx), okay))
+			   DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(spi##idx)))
 
 #define UART_ENABLED(idx) (IS_ENABLED(CONFIG_SERIAL) && \
 			   (IS_ENABLED(CONFIG_SOC_SERIES_NRF53X) || \
 			    IS_ENABLED(CONFIG_SOC_SERIES_NRF54LX) || \
 			    IS_ENABLED(CONFIG_SOC_SERIES_NRF91X)) && \
-			   DT_NODE_HAS_STATUS(DT_NODELABEL(uart##idx), okay))
+			   DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart##idx)))
 
 /*
  * In most Nordic SoCs, SPI and TWI peripherals with the same instance number
diff --git a/soc/nxp/imx/imx6sx/soc.c b/soc/nxp/imx/imx6sx/soc.c
index 11cbac10002..516c2e9bcf6 100644
--- a/soc/nxp/imx/imx6sx/soc.c
+++ b/soc/nxp/imx/imx6sx/soc.c
@@ -23,55 +23,55 @@ static void SOC_RdcInit(void)
 			RDC_DOMAIN_PERM(M4_DOMAIN_ID, RDC_DOMAIN_PERM_RW),
 			false, false);
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1))
 	/* Set access to UART_1 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapUart1, RDC_DT_VAL(uart1), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2))
 	/* Set access to UART_2 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapUart2, RDC_DT_VAL(uart2), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3))
 	/* Set access to UART_3 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapUart3, RDC_DT_VAL(uart3), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4))
 	/* Set access to UART_4 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapUart4, RDC_DT_VAL(uart4), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart5), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart5))
 	/* Set access to UART_5 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapUart5, RDC_DT_VAL(uart5), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart6), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart6))
 	/* Set access to UART_6 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapUart6, RDC_DT_VAL(uart6), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
 	/* Set access to GPIO_1 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapGpio1, RDC_DT_VAL(gpio1), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
 	/* Set access to GPIO_2 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapGpio2, RDC_DT_VAL(gpio2), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio3))
 	/* Set access to GPIO_3 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapGpio3, RDC_DT_VAL(gpio3), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio4))
 	/* Set access to GPIO_4 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapGpio4, RDC_DT_VAL(gpio4), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio5), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio5))
 	/* Set access to GPIO_5 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapGpio5, RDC_DT_VAL(gpio5), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio6), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio6))
 	/* Set access to GPIO_6 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapGpio6, RDC_DT_VAL(gpio6), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio7), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio7))
 	/* Set access to GPIO_7 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapGpio7, RDC_DT_VAL(gpio7), false, false);
 #endif
@@ -81,69 +81,69 @@ static void SOC_RdcInit(void)
 	RDC_SetPdapAccess(RDC, rdcPdapMuB, RDC_DT_VAL(mub), false, false);
 #endif /* CONFIG_IPM_IMX */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(epit1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(epit1))
 	/* Set access to EPIT_1 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapEpit1, RDC_DT_VAL(epit1), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(epit2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(epit2))
 	/* Set access to EPIT_2 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapEpit2, RDC_DT_VAL(epit2), false, false);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c1))
 	/* Set access to I2C-1 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapI2c1, RDC_DT_VAL(i2c1), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c2))
 	/* Set access to I2C-2 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapI2c2, RDC_DT_VAL(i2c2), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c3))
 	/* Set access to I2C-3 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapI2c3, RDC_DT_VAL(i2c3), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c4))
 	/* Set access to I2C-4 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapI2c4, RDC_DT_VAL(i2c4), false, false);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm1))
 	/* Set access to PWM-1 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm1, RDC_DT_VAL(pwm1), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm2))
 	/* Set access to PWM-2 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm2, RDC_DT_VAL(pwm2), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm3))
 	/* Set access to PWM-3 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm3, RDC_DT_VAL(pwm3), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm4))
 	/* Set access to PWM-4 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm4, RDC_DT_VAL(pwm4), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm5), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm5))
 	/* Set access to PWM-5 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm5, RDC_DT_VAL(pwm5), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm6), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm6))
 	/* Set access to PWM-6 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm6, RDC_DT_VAL(pwm6), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm7), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm7))
 	/* Set access to PWM-7 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm7, RDC_DT_VAL(pwm7), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm8), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm8))
 	/* Set access to PWM-8 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm8, RDC_DT_VAL(pwm8), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(adc1))
 	/* Set access to ADC-1 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapAdc1, RDC_DT_VAL(adc1), false, false);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(adc2))
 	/* Set access to ADC-2 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapAdc2, RDC_DT_VAL(adc2), false, false);
 #endif
@@ -213,10 +213,10 @@ static void SOC_ClockInit(void)
 	CCM_SetRootDivider(CCM, ccmRootPerclkPodf, 0);
 
 	/* Enable EPIT clocks */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(epit1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(epit1))
 	CCM_ControlGate(CCM, ccmCcgrGateEpit1Clk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(epit2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(epit2))
 	CCM_ControlGate(CCM, ccmCcgrGateEpit2Clk, ccmClockNeededAll);
 #endif
 #endif /* CONFIG_COUNTER_IMX_EPIT */
@@ -229,16 +229,16 @@ static void SOC_ClockInit(void)
 	CCM_SetRootDivider(CCM, ccmRootPerclkPodf, 0);
 
 	/* Enable I2C clock */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c1))
 	CCM_ControlGate(CCM, ccmCcgrGateI2c1Serialclk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c2))
 	CCM_ControlGate(CCM, ccmCcgrGateI2c2Serialclk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c3))
 	CCM_ControlGate(CCM, ccmCcgrGateI2c3Serialclk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c4))
 	CCM_ControlGate(CCM, ccmCcgrGateI2c4Serialclk, ccmClockNeededAll);
 #endif
 #endif /* CONFIG_I2C_IMX */
@@ -251,28 +251,28 @@ static void SOC_ClockInit(void)
 	CCM_SetRootDivider(CCM, ccmRootPerclkPodf, 0);
 
 	/* Enable PWM clock */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm1))
 	CCM_ControlGate(CCM, ccmCcgrGatePwm1Clk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm2))
 	CCM_ControlGate(CCM, ccmCcgrGatePwm2Clk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm3))
 	CCM_ControlGate(CCM, ccmCcgrGatePwm3Clk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm4))
 	CCM_ControlGate(CCM, ccmCcgrGatePwm4Clk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm5), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm5))
 	CCM_ControlGate(CCM, ccmCcgrGatePwm5Clk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm6), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm6))
 	CCM_ControlGate(CCM, ccmCcgrGatePwm6Clk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm7), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm7))
 	CCM_ControlGate(CCM, ccmCcgrGatePwm7Clk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm8), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm8))
 	CCM_ControlGate(CCM, ccmCcgrGatePwm8Clk, ccmClockNeededAll);
 #endif
 #endif /* CONFIG_PWM_IMX */
diff --git a/soc/nxp/imx/imx7d/soc.c b/soc/nxp/imx/imx7d/soc.c
index df3ee95f2e1..780c405a0bb 100644
--- a/soc/nxp/imx/imx7d/soc.c
+++ b/soc/nxp/imx/imx7d/soc.c
@@ -57,21 +57,21 @@ void SOC_RdcInit(void)
 static void nxp_mcimx7_gpio_config(void)
 {
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
 	RDC_SetPdapAccess(RDC, rdcPdapGpio1, RDC_DT_VAL(gpio1), false, false);
 	/* Enable gpio clock gate */
 	CCM_ControlGate(CCM, ccmCcgrGateGpio1, ccmClockNeededRunWait);
 #endif
 
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
 	RDC_SetPdapAccess(RDC, rdcPdapGpio2, RDC_DT_VAL(gpio2), false, false);
 	/* Enable gpio clock gate */
 	CCM_ControlGate(CCM, ccmCcgrGateGpio2, ccmClockNeededRunWait);
 #endif
 
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio7), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio7))
 	RDC_SetPdapAccess(RDC, rdcPdapGpio7, RDC_DT_VAL(gpio7), false, false);
 	/* Enable gpio clock gate */
 	CCM_ControlGate(CCM, ccmCcgrGateGpio7, ccmClockNeededRunWait);
@@ -84,7 +84,7 @@ static void nxp_mcimx7_gpio_config(void)
 static void nxp_mcimx7_uart_config(void)
 {
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2))
 	/* We need to grasp board uart exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapUart2, RDC_DT_VAL(uart2), false, false);
 	/* Select clock derived from OSC clock(24M) */
@@ -99,7 +99,7 @@ static void nxp_mcimx7_uart_config(void)
 	CCM_ControlGate(CCM, ccmCcgrGateUart2, ccmClockNeededAll);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart6), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart6))
 	/* We need to grasp board uart exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapUart6, RDC_DT_VAL(uart6), false, false);
 	/* Select clock derived from OSC clock(24M) */
@@ -121,7 +121,7 @@ static void nxp_mcimx7_uart_config(void)
 static void nxp_mcimx7_i2c_config(void)
 {
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c1))
 	/* In this example, we need to grasp board I2C exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapI2c1, RDC_DT_VAL(i2c1), false, false);
 	/* Select I2C clock derived from OSC clock(24M) */
@@ -131,7 +131,7 @@ static void nxp_mcimx7_i2c_config(void)
 	CCM_ControlGate(CCM, ccmCcgrGateI2c1, ccmClockNeededRunWait);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c2))
 	/* In this example, we need to grasp board I2C exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapI2c2, RDC_DT_VAL(i2c2), false, false);
 	/* Select I2C clock derived from OSC clock(24M) */
@@ -141,7 +141,7 @@ static void nxp_mcimx7_i2c_config(void)
 	CCM_ControlGate(CCM, ccmCcgrGateI2c2, ccmClockNeededRunWait);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c3))
 	/* In this example, we need to grasp board I2C exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapI2c3, RDC_DT_VAL(i2c3), false, false);
 	/* Select I2C clock derived from OSC clock(24M) */
@@ -151,7 +151,7 @@ static void nxp_mcimx7_i2c_config(void)
 	CCM_ControlGate(CCM, ccmCcgrGateI2c3, ccmClockNeededRunWait);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c4))
 	/* In this example, we need to grasp board I2C exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapI2c4, RDC_DT_VAL(i2c4), false, false);
 	/* Select I2C clock derived from OSC clock(24M) */
@@ -168,7 +168,7 @@ static void nxp_mcimx7_i2c_config(void)
 static void nxp_mcimx7_pwm_config(void)
 {
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm1))
 	/* We need to grasp board pwm exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm1, RDC_DT_VAL(pwm1), false, false);
 	/* Select clock derived from OSC clock(24M) */
@@ -178,7 +178,7 @@ static void nxp_mcimx7_pwm_config(void)
 	CCM_ControlGate(CCM, ccmCcgrGatePwm1, ccmClockNeededAll);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm2))
 	/* We need to grasp board pwm exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm2, RDC_DT_VAL(pwm2), false, false);
 	/* Select clock derived from OSC clock(24M) */
@@ -188,7 +188,7 @@ static void nxp_mcimx7_pwm_config(void)
 	CCM_ControlGate(CCM, ccmCcgrGatePwm2, ccmClockNeededAll);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm3))
 	/* We need to grasp board pwm exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm3, RDC_DT_VAL(pwm3), false, false);
 	/* Select clock derived from OSC clock(24M) */
@@ -198,7 +198,7 @@ static void nxp_mcimx7_pwm_config(void)
 	CCM_ControlGate(CCM, ccmCcgrGatePwm3, ccmClockNeededAll);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm4))
 	/* We need to grasp board pwm exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm4, RDC_DT_VAL(pwm4), false, false);
 	/* Select clock derived from OSC clock(24M) */
diff --git a/soc/nxp/imx/imx8m/a53/soc.c b/soc/nxp/imx/imx8m/a53/soc.c
index a20ae395f18..a110213e2b6 100644
--- a/soc/nxp/imx/imx8m/a53/soc.c
+++ b/soc/nxp/imx/imx8m/a53/soc.c
@@ -12,7 +12,7 @@
 #include <fsl_common.h>
 #include <fsl_rdc.h>
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(rdc), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(rdc))
 
 #define rdc_inst ((RDC_Type *)DT_REG_ADDR(DT_NODELABEL(rdc)))
 
@@ -28,19 +28,19 @@ static void soc_rdc_init(void)
 
 	RDC_GetDefaultPeriphAccessConfig(&periphConfig);
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) && DT_NODE_HAS_PROP(DT_NODELABEL(uart2), rdc)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) && DT_NODE_HAS_PROP(DT_NODELABEL(uart2), rdc)
 	periphConfig.periph = kRDC_Periph_UART2;
 	periphConfig.policy = RDC_DT_VAL(uart2);
 	RDC_SetPeriphAccessConfig(rdc_inst, &periphConfig);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay) && DT_NODE_HAS_PROP(DT_NODELABEL(uart4), rdc)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4)) && DT_NODE_HAS_PROP(DT_NODELABEL(uart4), rdc)
 	periphConfig.periph = kRDC_Periph_UART4;
 	periphConfig.policy = RDC_DT_VAL(uart4);
 	RDC_SetPeriphAccessConfig(rdc_inst, &periphConfig);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay) && DT_NODE_HAS_PROP(DT_NODELABEL(enet), rdc)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet)) && DT_NODE_HAS_PROP(DT_NODELABEL(enet), rdc)
 	periphConfig.periph = kRDC_Periph_ENET1;
 	periphConfig.policy = RDC_DT_VAL(enet);
 	RDC_SetPeriphAccessConfig(rdc_inst, &periphConfig);
diff --git a/soc/nxp/imx/imx8m/m4_mini/soc.c b/soc/nxp/imx/imx8m/m4_mini/soc.c
index 784c39fcc04..b809a900e11 100644
--- a/soc/nxp/imx/imx8m/m4_mini/soc.c
+++ b/soc/nxp/imx/imx8m/m4_mini/soc.c
@@ -104,25 +104,25 @@ static void SOC_ClockInit(void)
 	CLOCK_SetRootMux(kCLOCK_RootAudioAhb, kCLOCK_AudioAhbRootmuxSysPll1);
 
 #if defined(CONFIG_UART_MCUX_IUART)
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1))
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart1, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootUart1, 1U, 1U);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2))
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart2, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootUart2, 1U, 1U);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3))
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart3, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootUart3, 1U, 1U);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4))
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart4, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
diff --git a/soc/nxp/imx/imx8m/m4_quad/soc.c b/soc/nxp/imx/imx8m/m4_quad/soc.c
index 031121bc424..eea984fc172 100644
--- a/soc/nxp/imx/imx8m/m4_quad/soc.c
+++ b/soc/nxp/imx/imx8m/m4_quad/soc.c
@@ -67,25 +67,25 @@ static void SOC_ClockInit(void)
 	CLOCK_SetRootMux(kCLOCK_RootM4, kCLOCK_M4RootmuxSysPll1Div3);
 
 #if defined(CONFIG_UART_MCUX_IUART)
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1))
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart1, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootUart1, 1U, 1U);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2))
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart2, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootUart2, 1U, 1U);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3))
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart3, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootUart3, 1U, 1U);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4))
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart4, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
diff --git a/soc/nxp/imx/imx8m/m7/soc.c b/soc/nxp/imx/imx8m/m7/soc.c
index 683d550b149..7cd42b3bb5d 100644
--- a/soc/nxp/imx/imx8m/m7/soc.c
+++ b/soc/nxp/imx/imx8m/m7/soc.c
@@ -107,25 +107,25 @@ static void SOC_ClockInit(void)
 	CLOCK_SetRootMux(kCLOCK_RootAhb, kCLOCK_AhbRootmuxSysPll1Div6);
 
 #if defined(CONFIG_UART_MCUX_IUART)
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1))
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart1, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootUart1, 1U, 1U);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2))
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart2, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootUart2, 1U, 1U);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3))
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart3, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootUart3, 1U, 1U);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4))
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart4, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
@@ -134,21 +134,21 @@ static void SOC_ClockInit(void)
 #endif
 
 #if defined(CONFIG_SPI_MCUX_ECSPI)
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ecspi1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ecspi1))
 	/* Set ECSPI1 source to SYSTEM PLL1 800MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootEcspi1, kCLOCK_EcspiRootmuxSysPll1);
 	/* Set root clock to 800MHZ / 10 = 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootEcspi1, 2U, 5U);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ecspi2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ecspi2))
 	/* Set ECSPI2 source to SYSTEM PLL1 800MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootEcspi2, kCLOCK_EcspiRootmuxSysPll1);
 	/* Set root clock to 800MHZ / 10 = 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootEcspi2, 2U, 5U);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ecspi3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ecspi3))
 	/* Set ECSPI3 source to SYSTEM PLL1 800MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootEcspi3, kCLOCK_EcspiRootmuxSysPll1);
 	/* Set root clock to 800MHZ / 10 = 80MHZ */
@@ -175,27 +175,27 @@ static void gpio_init(void)
 {
 
 #if defined(CONFIG_GPIO_MCUX_IGPIO)
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
 
 	CLOCK_EnableClock(kCLOCK_Gpio1);
 
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
 
 	CLOCK_EnableClock(kCLOCK_Gpio2);
 
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio3))
 
 	CLOCK_EnableClock(kCLOCK_Gpio3);
 
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio4), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio4))
 
 	CLOCK_EnableClock(kCLOCK_Gpio4);
 
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio5), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio5))
 
 	CLOCK_EnableClock(kCLOCK_Gpio5);
 
diff --git a/soc/nxp/imxrt/imxrt10xx/flexspi.c b/soc/nxp/imxrt/imxrt10xx/flexspi.c
index a6a6239e9e7..5f288747c1a 100644
--- a/soc/nxp/imxrt/imxrt10xx/flexspi.c
+++ b/soc/nxp/imxrt/imxrt10xx/flexspi.c
@@ -28,7 +28,7 @@ uint32_t flexspi_clock_set_freq(uint32_t clock_name, uint32_t rate)
 		div_sel = kCLOCK_FlexspiDiv;
 		clk_name = kCLOCK_FlexSpi;
 		break;
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexspi2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexspi2))
 	case IMX_CCM_FLEXSPI2_CLK:
 		/* Get clock root frequency */
 		root_rate = CLOCK_GetClockRootFreq(kCLOCK_Flexspi2ClkRoot) *
diff --git a/soc/nxp/imxrt/imxrt10xx/soc.c b/soc/nxp/imxrt/imxrt10xx/soc.c
index d8a11dafd34..941ae1d3474 100644
--- a/soc/nxp/imxrt/imxrt10xx/soc.c
+++ b/soc/nxp/imxrt/imxrt10xx/soc.c
@@ -67,10 +67,10 @@ const clock_enet_pll_config_t ethPllConfig = {
 	.enableClkOutput500M = true,
 #endif
 #if defined(CONFIG_ETH_NXP_ENET) || defined(CONFIG_ETH_MCUX)
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet))
 	.enableClkOutput = true,
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet2))
 	.enableClkOutput1 = true,
 #endif
 #endif
@@ -79,10 +79,10 @@ const clock_enet_pll_config_t ethPllConfig = {
 #else
 	.enableClkOutput25M = false,
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet))
 	.loopDivider = 1,
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet2))
 	.loopDivider1 = 1,
 #endif
 };
@@ -226,7 +226,7 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay) && CONFIG_NET_L2_ETHERNET
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet)) && CONFIG_NET_L2_ETHERNET
 #if CONFIG_ETH_MCUX_RMII_EXT_CLK
 	/* Enable clock input for ENET1 */
 	IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1TxClkOutputDir, false);
@@ -236,43 +236,43 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet2), okay) && CONFIG_NET_L2_ETHERNET
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet2)) && CONFIG_NET_L2_ETHERNET
 	/* Set ENET2 ref clock to be generated by External OSC,*/
 	/* direction as output and frequency to 50MHz */
 	IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET2TxClkOutputDir |
 				kIOMUXC_GPR_ENET2RefClkMode, true);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb1), okay) && \
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb1)) && \
 	(CONFIG_USB_DC_NXP_EHCI || CONFIG_UDC_NXP_EHCI)
 	CLOCK_EnableUsbhs0PhyPllClock(kCLOCK_Usb480M,
 		DT_PROP_BY_PHANDLE(DT_NODELABEL(usb1), clocks, clock_frequency));
 	CLOCK_EnableUsbhs0Clock(kCLOCK_Usb480M,
 		DT_PROP_BY_PHANDLE(DT_NODELABEL(usb1), clocks, clock_frequency));
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb1), okay) && CONFIG_USB_DC_NXP_EHCI
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb1)) && CONFIG_USB_DC_NXP_EHCI
 	USB_EhciPhyInit(kUSB_ControllerEhci0, CPU_XTAL_CLK_HZ, &usbPhyConfig);
 #endif
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb2), okay) && \
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb2)) && \
 	(CONFIG_USB_DC_NXP_EHCI || CONFIG_UDC_NXP_EHCI)
 	CLOCK_EnableUsbhs1PhyPllClock(kCLOCK_Usb480M,
 		DT_PROP_BY_PHANDLE(DT_NODELABEL(usb2), clocks, clock_frequency));
 	CLOCK_EnableUsbhs1Clock(kCLOCK_Usb480M,
 		DT_PROP_BY_PHANDLE(DT_NODELABEL(usb2), clocks, clock_frequency));
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb1), okay) && CONFIG_USB_DC_NXP_EHCI
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb1)) && CONFIG_USB_DC_NXP_EHCI
 	USB_EhciPhyInit(kUSB_ControllerEhci1, CPU_XTAL_CLK_HZ, &usbPhyConfig);
 #endif
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc1), okay) && CONFIG_IMX_USDHC
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc1)) && CONFIG_IMX_USDHC
 	/* Configure USDHC clock source and divider */
 	CLOCK_InitSysPfd(kCLOCK_Pfd0, 24U);
 	CLOCK_SetDiv(kCLOCK_Usdhc1Div, 1U);
 	CLOCK_SetMux(kCLOCK_Usdhc1Mux, 1U);
 	CLOCK_EnableClock(kCLOCK_Usdhc1);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc2), okay) && CONFIG_IMX_USDHC
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc2)) && CONFIG_IMX_USDHC
 	/* Configure USDHC clock source and divider */
 	CLOCK_InitSysPfd(kCLOCK_Pfd0, 24U);
 	CLOCK_SetDiv(kCLOCK_Usdhc2Div, 1U);
diff --git a/soc/nxp/imxrt/imxrt118x/soc.c b/soc/nxp/imxrt/imxrt118x/soc.c
index 85299643de7..1809d6b4b02 100644
--- a/soc/nxp/imxrt/imxrt118x/soc.c
+++ b/soc/nxp/imxrt/imxrt118x/soc.c
@@ -208,16 +208,16 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 
 #if defined(CONFIG_UART_MCUX_LPUART) && \
-	(DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart1), okay) \
-	|| DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart2), okay))
+	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart1)) \
+	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart2)))
 	/* Configure LPUART0102 using SYS_PLL3_DIV2_CLK */
 	rootCfg.mux = kCLOCK_LPUART0102_ClockRoot_MuxSysPll3Div2;
 	rootCfg.div = 10;
 #endif
 
 #if defined(CONFIG_I2C_MCUX_LPI2C) && \
-	(DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay) \
-	|| DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c2), okay))
+	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c1)) \
+	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c2)))
 	/* Configure LPI2C0102 using SYS_PLL3_DIV2_CLK */
 	rootCfg.mux = kCLOCK_LPI2C0102_ClockRoot_MuxSysPll3Div2;
 	rootCfg.div = 4;
@@ -225,8 +225,8 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 
 #if defined(CONFIG_I2C_MCUX_LPI2C) && \
-	(DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c3), okay) \
-	|| DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c4), okay))
+	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c3)) \
+	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c4)))
 	/* Configure LPI2C0304 using SYS_PLL3_DIV2_CLK */
 	rootCfg.mux = kCLOCK_LPI2C0304_ClockRoot_MuxSysPll3Div2;
 	rootCfg.div = 4;
@@ -234,8 +234,8 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 
 #if defined(CONFIG_I2C_MCUX_LPI2C) && \
-	(DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c5), okay) \
-	|| DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c6), okay))
+	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c5)) \
+	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c6)))
 	/* Configure LPI2C0506 using SYS_PLL3_DIV2_CLK */
 	rootCfg.mux = kCLOCK_LPI2C0506_ClockRoot_MuxSysPll3Div2;
 	rootCfg.div = 4;
@@ -243,8 +243,8 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 
 #if defined(CONFIG_SPI_MCUX_LPSPI) && \
-	(DT_NODE_HAS_STATUS(DT_NODELABEL(lpspi1), okay) \
-	|| DT_NODE_HAS_STATUS(DT_NODELABEL(lpspi2), okay))
+	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpspi1)) \
+	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpspi2)))
 	/* Configure LPSPI0102 using SYS_PLL3_PFD1_CLK */
 	rootCfg.mux = kCLOCK_LPSPI0102_ClockRoot_MuxSysPll3Pfd1;
 	rootCfg.div = 2;
@@ -253,28 +253,28 @@ static ALWAYS_INLINE void clock_init(void)
 
 #if defined(CONFIG_COUNTER_MCUX_GPT)
 
-#if (DT_NODE_HAS_STATUS(DT_NODELABEL(gpt1), okay))
+#if (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpt1)))
 	/* Configure GPT1 using SYS_PLL3_DIV2_CLK */
 	rootCfg.mux = kCLOCK_GPT1_ClockRoot_MuxSysPll3Div2;
 	rootCfg.div = 1;
 	CLOCK_SetRootClock(kCLOCK_Root_Gpt1, &rootCfg);
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpt1), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpt1)) */
 
-#if (DT_NODE_HAS_STATUS(DT_NODELABEL(gpt2), okay))
+#if (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpt2)))
 	/* Configure GPT2 using SYS_PLL3_DIV2_CLK */
 	rootCfg.mux = kCLOCK_GPT2_ClockRoot_MuxSysPll3Div2;
 	rootCfg.div = 1;
 	CLOCK_SetRootClock(kCLOCK_Root_Gpt2, &rootCfg);
-#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpt2), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpt2)) */
 
 #endif /* CONFIG_COUNTER_MCUX_GPT */
 
 #ifdef CONFIG_MCUX_ACMP
 
-#if (DT_NODE_HAS_STATUS(DT_NODELABEL(acmp1), okay)  \
-	|| DT_NODE_HAS_STATUS(DT_NODELABEL(acmp2), okay) \
-	|| DT_NODE_HAS_STATUS(DT_NODELABEL(acmp3), okay) \
-	|| DT_NODE_HAS_STATUS(DT_NODELABEL(acmp4), okay))
+#if (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(acmp1))  \
+	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(acmp2)) \
+	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(acmp3)) \
+	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(acmp4)))
 	/* Configure ACMP using MuxSysPll3Out */
 	rootCfg.mux = kCLOCK_ACMP_ClockRoot_MuxSysPll3Out;
 	rootCfg.div = 2;
diff --git a/soc/nxp/imxrt/imxrt11xx/soc.c b/soc/nxp/imxrt/imxrt11xx/soc.c
index 7648052177b..10ae6866d13 100644
--- a/soc/nxp/imxrt/imxrt11xx/soc.c
+++ b/soc/nxp/imxrt/imxrt11xx/soc.c
@@ -409,7 +409,7 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 
 #if CONFIG_ETH_MCUX || CONFIG_ETH_NXP_ENET
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet))
 	/* 50 MHz ENET clock */
 	rootCfg.mux = kCLOCK_ENET1_ClockRoot_MuxSysPll1Div2;
 	rootCfg.div = 10;
@@ -424,7 +424,7 @@ static ALWAYS_INLINE void clock_init(void)
 		(IOMUXC_GPR_GPR4_ENET_REF_CLK_DIR(0x01U) | IOMUXC_GPR_GPR4_ENET_TX_CLK_SEL(0x1U));
 #endif
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet1g), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet1g))
 	rootCfg.mux = kCLOCK_ENET2_ClockRoot_MuxSysPll1Div2;
 #if DT_ENUM_HAS_VALUE(DT_CHILD(DT_NODELABEL(enet1g), ethernet), phy_connection_type, rgmii)
 	/* 125 MHz ENET1G clock */
@@ -491,13 +491,13 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 
 #ifdef CONFIG_CAN_MCUX_FLEXCAN
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcan1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcan1))
 	/* Configure CAN1 using Osc48MDiv2 */
 	rootCfg.mux = kCLOCK_CAN1_ClockRoot_MuxOscRc48MDiv2;
 	rootCfg.div = 1;
 	CLOCK_SetRootClock(kCLOCK_Root_Can1, &rootCfg);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcan3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcan3))
 	/* Configure CAN1 using Osc48MDiv2 */
 	rootCfg.mux = kCLOCK_CAN3_ClockRoot_MuxOscRc48MDiv2;
 	rootCfg.div = 1;
@@ -506,7 +506,7 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 
 #ifdef CONFIG_MCUX_ACMP
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(acmp1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(acmp1))
 	/* Configure ACMP1 using Osc48MDiv2*/
 	rootCfg.mux = kCLOCK_ACMP_ClockRoot_MuxOscRc48MDiv2;
 	rootCfg.div = 1;
@@ -532,28 +532,28 @@ static ALWAYS_INLINE void clock_init(void)
 	CLOCK_SetRootClock(kCLOCK_Root_Gpt1, &rootCfg);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb1), okay) && (CONFIG_USB_DC_NXP_EHCI || CONFIG_UDC_NXP_EHCI)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb1)) && (CONFIG_USB_DC_NXP_EHCI || CONFIG_UDC_NXP_EHCI)
 	CLOCK_EnableUsbhs0PhyPllClock(
 		kCLOCK_Usb480M, DT_PROP_BY_PHANDLE(DT_NODELABEL(usb1), clocks, clock_frequency));
 	CLOCK_EnableUsbhs0Clock(kCLOCK_Usb480M,
 				DT_PROP_BY_PHANDLE(DT_NODELABEL(usb1), clocks, clock_frequency));
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb1), okay) && CONFIG_USB_DC_NXP_EHCI
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb1)) && CONFIG_USB_DC_NXP_EHCI
 	USB_EhciPhyInit(kUSB_ControllerEhci0, CPU_XTAL_CLK_HZ, &usbPhyConfig);
 #endif
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb2), okay) && (CONFIG_USB_DC_NXP_EHCI || CONFIG_UDC_NXP_EHCI)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb2)) && (CONFIG_USB_DC_NXP_EHCI || CONFIG_UDC_NXP_EHCI)
 	CLOCK_EnableUsbhs1PhyPllClock(
 		kCLOCK_Usb480M, DT_PROP_BY_PHANDLE(DT_NODELABEL(usb2), clocks, clock_frequency));
 	CLOCK_EnableUsbhs1Clock(kCLOCK_Usb480M,
 				DT_PROP_BY_PHANDLE(DT_NODELABEL(usb2), clocks, clock_frequency));
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb1), okay) && CONFIG_USB_DC_NXP_EHCI
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb1)) && CONFIG_USB_DC_NXP_EHCI
 	USB_EhciPhyInit(kUSB_ControllerEhci1, CPU_XTAL_CLK_HZ, &usbPhyConfig);
 #endif
 #endif
 
 #if CONFIG_IMX_USDHC
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc1))
 	/* Configure USDHC1 using  SysPll2Pfd2*/
 	rootCfg.mux = kCLOCK_USDHC1_ClockRoot_MuxSysPll2Pfd2;
 	rootCfg.div = 2;
@@ -561,7 +561,7 @@ static ALWAYS_INLINE void clock_init(void)
 	CLOCK_EnableClock(kCLOCK_Usdhc1);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc2))
 	/* Configure USDHC2 using  SysPll2Pfd2*/
 	rootCfg.mux = kCLOCK_USDHC2_ClockRoot_MuxSysPll2Pfd2;
 	rootCfg.div = 2;
@@ -571,7 +571,7 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 
 #if !(DT_NODE_HAS_COMPAT(DT_CHOSEN(zephyr_flash), nxp_imx_flexspi)) &&                             \
-	defined(CONFIG_MEMC_MCUX_FLEXSPI) && DT_NODE_HAS_STATUS(DT_NODELABEL(flexspi), okay)
+	defined(CONFIG_MEMC_MCUX_FLEXSPI) && DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexspi))
 	/* Configure FLEXSPI1 using OSC_RC_48M_DIV2 */
 	rootCfg.mux = kCLOCK_FLEXSPI1_ClockRoot_MuxOscRc48MDiv2;
 	rootCfg.div = 1;
diff --git a/soc/nxp/imxrt/imxrt5xx/cm33/soc.c b/soc/nxp/imxrt/imxrt5xx/cm33/soc.c
index f4371511e4e..5d99d069da9 100644
--- a/soc/nxp/imxrt/imxrt5xx/cm33/soc.c
+++ b/soc/nxp/imxrt/imxrt5xx/cm33/soc.c
@@ -351,7 +351,7 @@ void __weak rt5xx_clock_init(void)
 	/* Switch CLKOUT to FRO_DIV2 */
 	CLOCK_AttachClk(kFRO_DIV2_to_CLKOUT);
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc0), okay) && CONFIG_IMX_USDHC
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc0)) && CONFIG_IMX_USDHC
 	/* Make sure USDHC ram buffer has been power up*/
 	POWER_DisablePD(kPDRUNCFG_APD_USDHC0_SRAM);
 	POWER_DisablePD(kPDRUNCFG_PPD_USDHC0_SRAM);
@@ -366,7 +366,7 @@ void __weak rt5xx_clock_init(void)
 	RESET_PeripheralReset(kSDIO0_RST_SHIFT_RSTn);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(smartdma), okay) && CONFIG_DMA_MCUX_SMARTDMA
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(smartdma)) && CONFIG_DMA_MCUX_SMARTDMA
 	/* Power up SMARTDMA ram */
 	POWER_DisablePD(kPDRUNCFG_APD_SMARTDMA_SRAM);
 	POWER_DisablePD(kPDRUNCFG_PPD_SMARTDMA_SRAM);
diff --git a/soc/nxp/imxrt/imxrt6xx/cm33/soc.c b/soc/nxp/imxrt/imxrt6xx/cm33/soc.c
index 9071a20bd68..a81c8bc201a 100644
--- a/soc/nxp/imxrt/imxrt6xx/cm33/soc.c
+++ b/soc/nxp/imxrt/imxrt6xx/cm33/soc.c
@@ -286,7 +286,7 @@ static ALWAYS_INLINE void clock_init(void)
 	CLOCK_AttachClk(kNONE_to_WDT0_CLK);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc0), okay) && CONFIG_IMX_USDHC
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc0)) && CONFIG_IMX_USDHC
 	/* Make sure USDHC ram buffer has been power up*/
 	POWER_DisablePD(kPDRUNCFG_APD_USDHC0_SRAM);
 	POWER_DisablePD(kPDRUNCFG_PPD_USDHC0_SRAM);
@@ -343,7 +343,7 @@ static ALWAYS_INLINE void clock_init(void)
 #endif /* CONFIG_SOC_MIMXRT685S_CM33 */
 }
 
-#if (DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc0), okay) && CONFIG_IMX_USDHC)
+#if (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc0)) && CONFIG_IMX_USDHC)
 
 void imxrt_usdhc_pinmux(uint16_t nusdhc, bool init, uint32_t speed, uint32_t strength)
 {
diff --git a/soc/nxp/imxrt/imxrt6xx/cm33/soc.h b/soc/nxp/imxrt/imxrt6xx/cm33/soc.h
index 356b0e5727c..71e5d69544e 100644
--- a/soc/nxp/imxrt/imxrt6xx/cm33/soc.h
+++ b/soc/nxp/imxrt/imxrt6xx/cm33/soc.h
@@ -85,8 +85,8 @@ extern "C" {
 #endif
 
 #if CONFIG_IMX_USDHC &&					\
-	(DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc0), okay) ||	\
-	 DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc1), okay))
+	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc0)) ||	\
+	 DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc1)))
 
 void imxrt_usdhc_pinmux(uint16_t nusdhc,
 	bool init, uint32_t speed, uint32_t strength);
diff --git a/soc/nxp/kinetis/k6x/soc.c b/soc/nxp/kinetis/k6x/soc.c
index c8eb6ba7870..32832dc8a0a 100644
--- a/soc/nxp/kinetis/k6x/soc.c
+++ b/soc/nxp/kinetis/k6x/soc.c
@@ -101,7 +101,7 @@ static ALWAYS_INLINE void clock_init(void)
 
 	CLOCK_SetSimConfig(&simConfig);
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart0))
 	CLOCK_SetLpuartClock(LPUART0SRC_OSCERCLK);
 #endif
 
diff --git a/soc/nxp/kinetis/ke1xf/soc.c b/soc/nxp/kinetis/ke1xf/soc.c
index 5d3e2291fe6..35968f6acf0 100644
--- a/soc/nxp/kinetis/ke1xf/soc.c
+++ b/soc/nxp/kinetis/ke1xf/soc.c
@@ -61,7 +61,7 @@ static const scg_sys_clk_config_t scg_sys_clk_config = {
 #endif
 };
 
-#if DT_NODE_HAS_STATUS(SCG_CLOCK_NODE(sosc_clk), okay)
+#if DT_NODE_HAS_STATUS_OKAY(SCG_CLOCK_NODE(sosc_clk))
 /* System Oscillator (SOSC) configuration */
 ASSERT_ASYNC_CLK_DIV_VALID(SCG_CLOCK_DIV(soscdiv1_clk),
 		       "Invalid SCG SOSC divider 1 value");
@@ -155,7 +155,7 @@ static ALWAYS_INLINE void clk_init(void)
 	};
 	scg_sys_clk_config_t current;
 
-#if DT_NODE_HAS_STATUS(SCG_CLOCK_NODE(sosc_clk), okay)
+#if DT_NODE_HAS_STATUS_OKAY(SCG_CLOCK_NODE(sosc_clk))
 	/* Optionally initialize system oscillator */
 	CLOCK_InitSysOsc(&scg_sosc_config);
 	CLOCK_SetXtal0Freq(scg_sosc_config.freq);
@@ -179,59 +179,59 @@ static ALWAYS_INLINE void clk_init(void)
 		CLOCK_GetCurSysClkConfig(&current);
 	} while (current.src != scg_sys_clk_config.src);
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart0))
 	CLOCK_SetIpSrc(kCLOCK_Lpuart0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpuart0), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart1))
 	CLOCK_SetIpSrc(kCLOCK_Lpuart1,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpuart1), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart2))
 	CLOCK_SetIpSrc(kCLOCK_Lpuart2,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpuart2), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c0))
 	CLOCK_SetIpSrc(kCLOCK_Lpi2c0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpi2c0), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c1))
 	CLOCK_SetIpSrc(kCLOCK_Lpi2c1,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpi2c1), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpspi0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpspi0))
 	CLOCK_SetIpSrc(kCLOCK_Lpspi0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpspi0), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpspi1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpspi1))
 	CLOCK_SetIpSrc(kCLOCK_Lpspi1,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpspi1), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(adc0))
 	CLOCK_SetIpSrc(kCLOCK_Adc0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(adc0), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(adc1))
 	CLOCK_SetIpSrc(kCLOCK_Adc1,
 		       DT_CLOCKS_CELL(DT_NODELABEL(adc1), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(adc2))
 	CLOCK_SetIpSrc(kCLOCK_Adc2,
 		       DT_CLOCKS_CELL(DT_NODELABEL(adc2), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ftm0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ftm0))
 	CLOCK_SetIpSrc(kCLOCK_Ftm0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(ftm0), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ftm1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ftm1))
 	CLOCK_SetIpSrc(kCLOCK_Ftm1,
 		       DT_CLOCKS_CELL(DT_NODELABEL(ftm1), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ftm2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ftm2))
 	CLOCK_SetIpSrc(kCLOCK_Ftm2,
 		       DT_CLOCKS_CELL(DT_NODELABEL(ftm2), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ftm3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ftm3))
 	CLOCK_SetIpSrc(kCLOCK_Ftm3,
 		       DT_CLOCKS_CELL(DT_NODELABEL(ftm3), ip_source));
 #endif
diff --git a/soc/nxp/kinetis/ke1xz/soc.c b/soc/nxp/kinetis/ke1xz/soc.c
index 5a6b443c1fe..0f8ad0de6ac 100644
--- a/soc/nxp/kinetis/ke1xz/soc.c
+++ b/soc/nxp/kinetis/ke1xz/soc.c
@@ -106,39 +106,39 @@ static ALWAYS_INLINE void clk_init(void)
 		CLOCK_GetCurSysClkConfig(&current);
 	} while (current.src != scg_sys_clk_config.src);
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart0))
 	CLOCK_SetIpSrc(kCLOCK_Lpuart0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpuart0), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart1))
 	CLOCK_SetIpSrc(kCLOCK_Lpuart1,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpuart1), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart2))
 	CLOCK_SetIpSrc(kCLOCK_Lpuart2,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpuart2), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c0))
 	CLOCK_SetIpSrc(kCLOCK_Lpi2c0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpi2c0), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c1))
 	CLOCK_SetIpSrc(kCLOCK_Lpi2c1,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpi2c1), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexio), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexio))
 	CLOCK_SetIpSrc(kCLOCK_Flexio0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(flexio), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpspi0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpspi0))
 	CLOCK_SetIpSrc(kCLOCK_Lpspi0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpspi0), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpspi1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpspi1))
 	CLOCK_SetIpSrc(kCLOCK_Lpspi1,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpspi1), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(adc0))
 	CLOCK_SetIpSrc(kCLOCK_Adc0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(adc0), ip_source));
 #endif
diff --git a/soc/nxp/kinetis/kl2x/soc.c b/soc/nxp/kinetis/kl2x/soc.c
index 71fe3d35a35..8ab125d4c7c 100644
--- a/soc/nxp/kinetis/kl2x/soc.c
+++ b/soc/nxp/kinetis/kl2x/soc.c
@@ -70,7 +70,7 @@ static ALWAYS_INLINE void clock_init(void)
 	CLOCK_SetInternalRefClkConfig(kMCG_IrclkEnable, kMCG_IrcSlow, 0);
 	CLOCK_SetSimConfig(&simConfig);
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart0))
 	CLOCK_SetLpsci0Clock(LPSCI0SRC_MCGFLLCLK);
 #endif
 #if CONFIG_USB_KINETIS || CONFIG_UDC_KINETIS
diff --git a/soc/nxp/kinetis/kwx/soc_kw4xz.c b/soc/nxp/kinetis/kwx/soc_kw4xz.c
index 4e33f4df5b8..f6baedb07b7 100644
--- a/soc/nxp/kinetis/kwx/soc_kw4xz.c
+++ b/soc/nxp/kinetis/kwx/soc_kw4xz.c
@@ -67,14 +67,14 @@ static ALWAYS_INLINE void clock_init(void)
 
 	CLOCK_SetSimConfig(&simConfig);
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart0))
 	CLOCK_SetLpuartClock(LPUART0SRC_OSCERCLK);
 #endif
 
 #if defined(CONFIG_PWM) && \
-	(DT_NODE_HAS_STATUS(DT_NODELABEL(pwm0), okay) || \
-	 DT_NODE_HAS_STATUS(DT_NODELABEL(pwm1), okay) || \
-	 DT_NODE_HAS_STATUS(DT_NODELABEL(pwm2), okay))
+	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm0)) || \
+	 DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm1)) || \
+	 DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm2)))
 	CLOCK_SetTpmClock(TPMSRC_MCGPLLCLK);
 #endif
 }
diff --git a/soc/nxp/lpc/lpc55xxx/soc.c b/soc/nxp/lpc/lpc55xxx/soc.c
index 233ab0d9d82..1959b525e92 100644
--- a/soc/nxp/lpc/lpc55xxx/soc.c
+++ b/soc/nxp/lpc/lpc55xxx/soc.c
@@ -193,7 +193,7 @@ static ALWAYS_INLINE void clock_init(void)
 	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM4);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(hs_lspi), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(hs_lspi))
 	/* Attach 12 MHz clock to HSLSPI */
 	CLOCK_AttachClk(kFRO_HF_DIV_to_HSLSPI);
 #endif
diff --git a/soc/nxp/mcx/mcxc/soc.c b/soc/nxp/mcx/mcxc/soc.c
index 00001999a49..01b42984b31 100644
--- a/soc/nxp/mcx/mcxc/soc.c
+++ b/soc/nxp/mcx/mcxc/soc.c
@@ -88,7 +88,7 @@ static void clock_init(void)
 	/* Set SystemCoreClock variable. */
 	SystemCoreClock = DT_PROP(DT_NODELABEL(cpu0), clock_frequency);
 	/* Set LPUART0 clock source. */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart0))
 	CLOCK_SetLpuart0Clock(LPUART_CLOCK_SEL(lpuart0));
 #endif
 }
diff --git a/soc/nxp/rw/power.c b/soc/nxp/rw/power.c
index 1f0255a388f..f4176b6349c 100644
--- a/soc/nxp/rw/power.c
+++ b/soc/nxp/rw/power.c
@@ -28,11 +28,11 @@ LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 power_sleep_config_t slp_cfg;
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pin0), okay) || DT_NODE_HAS_STATUS(DT_NODELABEL(pin1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin0)) || DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin1))
 pinctrl_soc_pin_t pin_cfg;
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pin0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin0))
 static void pin0_isr(const struct device *dev)
 {
 	uint8_t level = ~(DT_ENUM_IDX(DT_NODELABEL(pin0), wakeup_level)) & 0x1;
@@ -44,7 +44,7 @@ static void pin0_isr(const struct device *dev)
 }
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pin1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin1))
 static void pin1_isr(const struct device *dev)
 {
 	uint8_t level = ~(DT_ENUM_IDX(DT_NODELABEL(pin1), wakeup_level)) & 0x1;
@@ -61,7 +61,7 @@ __weak void pm_state_set(enum pm_state state, uint8_t substate_id)
 {
 	ARG_UNUSED(substate_id);
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pin0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin0))
 	pin_cfg = IOMUX_GPIO_IDX(24) | IOMUX_TYPE(IOMUX_GPIO);
 	pinctrl_configure_pins(&pin_cfg, 1, 0);
 	POWER_ConfigWakeupPin(kPOWER_WakeupPin0, DT_ENUM_IDX(DT_NODELABEL(pin0), wakeup_level));
@@ -70,7 +70,7 @@ __weak void pm_state_set(enum pm_state state, uint8_t substate_id)
 	EnableIRQ(DT_IRQN(DT_NODELABEL(pin0)));
 	POWER_EnableWakeup(DT_IRQN(DT_NODELABEL(pin0)));
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pin1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin1))
 	pin_cfg = IOMUX_GPIO_IDX(25) | IOMUX_TYPE(IOMUX_GPIO);
 	pinctrl_configure_pins(&pin_cfg, 1, 0);
 	POWER_ConfigWakeupPin(kPOWER_WakeupPin1, DT_ENUM_IDX(DT_NODELABEL(pin1), wakeup_level));
@@ -119,7 +119,7 @@ void nxp_rw6xx_power_init(void)
 	slp_cfg.memPdCfg = suspend_sleepconfig[3];
 	slp_cfg.pm3BuckCfg = suspend_sleepconfig[4];
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pin0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin0))
 	/* PIN 0 uses GPIO0_24, confiure the pin as GPIO */
 	pin_cfg = IOMUX_GPIO_IDX(24) | IOMUX_TYPE(IOMUX_GPIO);
 	pinctrl_configure_pins(&pin_cfg, 1, 0);
@@ -131,7 +131,7 @@ void nxp_rw6xx_power_init(void)
 		    NULL, 0);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(pin1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin1))
 	/* PIN 1 uses GPIO0_25, confiure the pin as GPIO */
 	pin_cfg = IOMUX_GPIO_IDX(25) | IOMUX_TYPE(IOMUX_GPIO);
 	pinctrl_configure_pins(&pin_cfg, 1, 0);
diff --git a/soc/nxp/rw/soc.c b/soc/nxp/rw/soc.c
index 1a52626a053..9d3b6c548f1 100644
--- a/soc/nxp/rw/soc.c
+++ b/soc/nxp/rw/soc.c
@@ -221,7 +221,7 @@ __ramfunc void clock_init(void)
 #endif
 #endif /* CONFIG_SPI */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(dmic0), okay) && CONFIG_AUDIO_DMIC_MCUX
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmic0)) && CONFIG_AUDIO_DMIC_MCUX
 	/* Clock DMIC from Audio PLL. PLL output is sourced from AVPLL
 	 * channel 1, which is clocked at 12.288 MHz. We can divide this
 	 * by 4 to achieve the desired DMIC bit clk of 3.072 MHz
@@ -230,7 +230,7 @@ __ramfunc void clock_init(void)
 	CLOCK_SetClkDiv(kCLOCK_DivDmicClk, 4);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lcdic), okay) && CONFIG_MIPI_DBI_NXP_LCDIC
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lcdic)) && CONFIG_MIPI_DBI_NXP_LCDIC
 	CLOCK_AttachClk(kMAIN_CLK_to_LCD_CLK);
 	RESET_PeripheralReset(kLCDIC_RST_SHIFT_RSTn);
 #endif
@@ -250,7 +250,7 @@ __ramfunc void clock_init(void)
 #endif
 #endif /* CONFIG_COUNTER_MCUX_CTIMER */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb_otg), okay) && CONFIG_USB_DC_NXP_EHCI
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb_otg)) && CONFIG_USB_DC_NXP_EHCI
 	/* Enable system xtal from Analog */
 	SYSCTL2->ANA_GRP_CTRL |= SYSCTL2_ANA_GRP_CTRL_PU_AG_MASK;
 	/* reset USB */
@@ -261,7 +261,7 @@ __ramfunc void clock_init(void)
 	CLOCK_EnableUsbhsPhyClock();
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay) && CONFIG_NET_L2_ETHERNET
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet)) && CONFIG_NET_L2_ETHERNET
 	RESET_PeripheralReset(kENET_IPG_RST_SHIFT_RSTn);
 	RESET_PeripheralReset(kENET_IPG_S_RST_SHIFT_RSTn);
 #endif
@@ -289,7 +289,7 @@ void soc_early_init_hook(void)
 #define PMU_RESET_CAUSES \
 	COND_CODE_0(IS_EMPTY(PMU_RESET_CAUSES_), (PMU_RESET_CAUSES_), (0))
 #define WDT_RESET \
-	COND_CODE_1(DT_NODE_HAS_STATUS(wwdt, okay), (kPOWER_ResetSourceWdt), (0))
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(wwdt), (kPOWER_ResetSourceWdt), (0))
 #define RESET_CAUSES \
 	(PMU_RESET_CAUSES | WDT_RESET)
 #else
diff --git a/soc/openisa/rv32m1/soc.c b/soc/openisa/rv32m1/soc.c
index 95edf0c5383..0f41fc69ca6 100644
--- a/soc/openisa/rv32m1/soc.c
+++ b/soc/openisa/rv32m1/soc.c
@@ -197,16 +197,16 @@ static void rv32m1_switch_to_sirc(void)
  */
 static void rv32m1_setup_peripheral_clocks(void)
 {
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(tpm0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(tpm0))
 	CLOCK_SetIpSrc(kCLOCK_Tpm0, kCLOCK_IpSrcFircAsync);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(tpm1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(tpm1))
 	CLOCK_SetIpSrc(kCLOCK_Tpm1, kCLOCK_IpSrcFircAsync);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(tpm2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(tpm2))
 	CLOCK_SetIpSrc(kCLOCK_Tpm2, kCLOCK_IpSrcFircAsync);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(tpm3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(tpm3))
 	CLOCK_SetIpSrc(kCLOCK_Tpm3, kCLOCK_IpSrcFircAsync);
 #endif
 }
diff --git a/soc/renesas/ra/ra4m1/soc.c b/soc/renesas/ra/ra4m1/soc.c
index 7f021ba17fa..7d8f2744914 100644
--- a/soc/renesas/ra/ra4m1/soc.c
+++ b/soc/renesas/ra/ra4m1/soc.c
@@ -107,7 +107,7 @@ const struct opt_set_mem ops __attribute__((section(".opt_set_mem"))) = {
 		.LVDAS = 0x1, /* Disable voltage monitor 0 following reset */
 		.VDSEL1 = 0x3,
 		.RSVD2 = 0x3,
-		.HOCOEN = !DT_NODE_HAS_STATUS(DT_PATH(clocks, hoco), okay),
+		.HOCOEN = !DT_NODE_HAS_STATUS_OKAY(DT_PATH(clocks, hoco)),
 		.RSVD3 = 0x7,
 		.HOCOFRQ1 = OFS1_HOCO_FREQ,
 		.RSVD4 = 0x1ffff,
diff --git a/soc/renesas/smartbond/da1469x/power.c b/soc/renesas/smartbond/da1469x/power.c
index 80a497acff5..fec9b5f6c62 100644
--- a/soc/renesas/smartbond/da1469x/power.c
+++ b/soc/renesas/smartbond/da1469x/power.c
@@ -48,7 +48,7 @@ void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
 static int renesas_da1469x_pm_init(void)
 {
 	static const struct da1469x_sleep_config sleep_cfg = {
-		.enable_xtal_on_wakeup = DT_NODE_HAS_STATUS(DT_NODELABEL(xtal32m), okay),
+		.enable_xtal_on_wakeup = DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(xtal32m)),
 	};
 
 	da1469x_sleep_config(&sleep_cfg);
diff --git a/soc/snps/emsk/soc_config.c b/soc/snps/emsk/soc_config.c
index c43942facb0..5c18898ecd2 100644
--- a/soc/snps/emsk/soc_config.c
+++ b/soc/snps/emsk/soc_config.c
@@ -17,14 +17,14 @@ void soc_early_init_hook(void)
 	/* On ARC EM Starter kit board,
 	 * send the UART the command to clear the interrupt
 	 */
-#if DT_NODE_HAS_STATUS(DT_INST(0, ns16550), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, ns16550))
 	sys_write32(0, DT_REG_ADDR(DT_INST(0, ns16550))+0x4);
 	sys_write32(0, DT_REG_ADDR(DT_INST(0, ns16550))+0x10);
-#endif /* DT_NODE_HAS_STATUS(DT_INST(0, ns16550), okay) */
-#if DT_NODE_HAS_STATUS(DT_INST(1, ns16550), okay)
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_INST(0, ns16550)) */
+#if DT_NODE_HAS_STATUS_OKAY(DT_INST(1, ns16550))
 	sys_write32(0, DT_REG_ADDR(DT_INST(1, ns16550))+0x4);
 	sys_write32(0, DT_REG_ADDR(DT_INST(1, ns16550))+0x10);
-#endif /* DT_NODE_HAS_STATUS(DT_INST(1, ns16550), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_INST(1, ns16550)) */
 }
 
 #endif /* CONFIG_UART_NS16550 */
diff --git a/soc/st/stm32/stm32h7x/mpu_regions.c b/soc/st/stm32/stm32h7x/mpu_regions.c
index 29825ad226a..8582db60724 100644
--- a/soc/st/stm32/stm32h7x/mpu_regions.c
+++ b/soc/st/stm32/stm32h7x/mpu_regions.c
@@ -21,8 +21,8 @@ static const struct arm_mpu_region mpu_regions[] = {
 					REGION_512K |
 					MPU_RASR_XN_Msk | P_RW_U_NA_Msk) }),
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(mac), okay)
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(sram3), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(mac))
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sram3))
 	MPU_REGION_ENTRY("SRAM3_ETH_BUF",
 					 DT_REG_ADDR(DT_NODELABEL(sram3)),
 					 REGION_RAM_NOCACHE_ATTR(REGION_16K)),
diff --git a/soc/xlnx/zynq7000/xc7zxxx/soc.c b/soc/xlnx/zynq7000/xc7zxxx/soc.c
index 37d30b02426..c1dad84ff36 100644
--- a/soc/xlnx/zynq7000/xc7zxxx/soc.c
+++ b/soc/xlnx/zynq7000/xc7zxxx/soc.c
@@ -39,13 +39,13 @@ static const struct arm_mmu_region mmu_regions[] = {
 	/* ARM Arch timer, GIC are covered by the MPCore mapping */
 
 /* GEMs */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gem0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gem0))
 	MMU_REGION_FLAT_ENTRY("gem0",
 			      DT_REG_ADDR(DT_NODELABEL(gem0)),
 			      DT_REG_SIZE(DT_NODELABEL(gem0)),
 			      MT_DEVICE | MATTR_SHARED | MPERM_R | MPERM_W),
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gem1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gem1))
 	MMU_REGION_FLAT_ENTRY("gem1",
 			      DT_REG_ADDR(DT_NODELABEL(gem1)),
 			      DT_REG_SIZE(DT_NODELABEL(gem1)),
@@ -53,7 +53,7 @@ static const struct arm_mmu_region mmu_regions[] = {
 #endif
 
 /* GPIO controller */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(psgpio), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(psgpio))
 	MMU_REGION_FLAT_ENTRY("psgpio",
 			      DT_REG_ADDR(DT_NODELABEL(psgpio)),
 			      DT_REG_SIZE(DT_NODELABEL(psgpio)),
@@ -106,7 +106,7 @@ void soc_reset_hook(void)
 	sctlr &= ~SCTLR_A_Msk;
 	__set_SCTLR(sctlr);
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(slcr), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(slcr))
 	mm_reg_t addr = DT_REG_ADDR(DT_NODELABEL(slcr));
 
 	/* Unlock System Level Control Registers (SLCR) */
diff --git a/soc/xlnx/zynq7000/xc7zxxxs/soc.c b/soc/xlnx/zynq7000/xc7zxxxs/soc.c
index a46d9a21784..982ee094e01 100644
--- a/soc/xlnx/zynq7000/xc7zxxxs/soc.c
+++ b/soc/xlnx/zynq7000/xc7zxxxs/soc.c
@@ -39,13 +39,13 @@ static const struct arm_mmu_region mmu_regions[] = {
 	/* ARM Arch timer, GIC are covered by the MPCore mapping */
 
 /* GEMs */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gem0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gem0))
 	MMU_REGION_FLAT_ENTRY("gem0",
 			      DT_REG_ADDR(DT_NODELABEL(gem0)),
 			      DT_REG_SIZE(DT_NODELABEL(gem0)),
 			      MT_DEVICE | MATTR_SHARED | MPERM_R | MPERM_W),
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(gem1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gem1))
 	MMU_REGION_FLAT_ENTRY("gem1",
 			      DT_REG_ADDR(DT_NODELABEL(gem1)),
 			      DT_REG_SIZE(DT_NODELABEL(gem1)),
@@ -53,7 +53,7 @@ static const struct arm_mmu_region mmu_regions[] = {
 #endif
 
 /* GPIO controller */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(psgpio), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(psgpio))
 	MMU_REGION_FLAT_ENTRY("psgpio",
 			      DT_REG_ADDR(DT_NODELABEL(psgpio)),
 			      DT_REG_SIZE(DT_NODELABEL(psgpio)),
@@ -106,7 +106,7 @@ void soc_reset_hook(void)
 	sctlr &= ~SCTLR_A_Msk;
 	__set_SCTLR(sctlr);
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(slcr), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(slcr))
 	mm_reg_t addr = DT_REG_ADDR(DT_NODELABEL(slcr));
 
 	/* Unlock System Level Control Registers (SLCR) */
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_fem.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_fem.h
index b9ada56b5ab..a80de9f85e5 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_fem.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_fem.h
@@ -17,9 +17,9 @@
 
 #if DT_NODE_HAS_PROP(DT_NODELABEL(radio), fem)
 #define FEM_NODE             DT_PHANDLE(DT_NODELABEL(radio), fem)
-#if DT_NODE_HAS_STATUS(FEM_NODE, okay)
+#if DT_NODE_HAS_STATUS_OKAY(FEM_NODE)
 #define HAL_RADIO_HAVE_FEM
-#endif	/* DT_NODE_HAS_STATUS(FEM_NODE, okay) */
+#endif	/* DT_NODE_HAS_STATUS_OKAY(FEM_NODE) */
 #endif	/* DT_NODE_HAS_PROP(DT_NODELABEL(radio), fem)) */
 
 /* Does FEM_NODE have a particular DT compatible? */
diff --git a/subsys/pm/policy.c b/subsys/pm/policy.c
index b13017f1603..39742cdf38c 100644
--- a/subsys/pm/policy.c
+++ b/subsys/pm/policy.c
@@ -77,8 +77,8 @@ struct pm_state_device_constraint {
  * @brief Helper macro to define a device pm constraints.
  */
 #define PM_STATE_CONSTRAINT_DEFINE(i, node_id)                                  \
-	COND_CODE_1(DT_NODE_HAS_STATUS(DT_PHANDLE_BY_IDX(node_id,               \
-		zephyr_disabling_power_states, i), okay),                       \
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_PHANDLE_BY_IDX(node_id,          \
+		zephyr_disabling_power_states, i)),                             \
 		(PM_STATE_CONSTRAINT_INIT(DT_PHANDLE_BY_IDX(node_id,            \
 		zephyr_disabling_power_states, i)),), ())
 
diff --git a/subsys/tracing/sysview/sysview_config.c b/subsys/tracing/sysview/sysview_config.c
index e68cb4f8a79..0ef395e4516 100644
--- a/subsys/tracing/sysview/sysview_config.c
+++ b/subsys/tracing/sysview/sysview_config.c
@@ -97,7 +97,7 @@ void SEGGER_SYSVIEW_Conf(void)
 	SEGGER_SYSVIEW_Init(sys_clock_hw_cycles_per_sec(),
 			    sys_clock_hw_cycles_per_sec(),
 			    &SYSVIEW_X_OS_TraceAPI, cbSendSystemDesc);
-#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_sram), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_sram))
 	SEGGER_SYSVIEW_SetRAMBase(DT_REG_ADDR(DT_CHOSEN(zephyr_sram)));
 #else
 	/* Setting RAMBase is just an optimization: this value is subtracted
diff --git a/subsys/usb/device/usb_device.c b/subsys/usb/device/usb_device.c
index e3a065fae1a..c285817e8ed 100644
--- a/subsys/usb/device/usb_device.c
+++ b/subsys/usb/device/usb_device.c
@@ -1295,7 +1295,7 @@ static void forward_status_cb(enum usb_dc_status_code status, const uint8_t *par
 static int usb_vbus_set(bool on)
 {
 #define USB_DEV_NODE DT_CHOSEN(zephyr_usb_device)
-#if DT_NODE_HAS_STATUS(USB_DEV_NODE, okay) && \
+#if DT_NODE_HAS_STATUS_OKAY(USB_DEV_NODE) && \
     DT_NODE_HAS_PROP(USB_DEV_NODE, vbus_gpios)
 	int ret = 0;
 	struct gpio_dt_spec gpio_dev = GPIO_DT_SPEC_GET(USB_DEV_NODE, vbus_gpios);
diff --git a/tests/bluetooth/host/id/mocks/zephyr/linker/linker-defs.h b/tests/bluetooth/host/id/mocks/zephyr/linker/linker-defs.h
index f2f32310870..7bd7faa7935 100644
--- a/tests/bluetooth/host/id/mocks/zephyr/linker/linker-defs.h
+++ b/tests/bluetooth/host/id/mocks/zephyr/linker/linker-defs.h
@@ -10,6 +10,10 @@
 #undef DT_NODE_HAS_STATUS
 #endif
 
+#ifdef DT_NODE_HAS_STATUS_OKAY
+#undef DT_NODE_HAS_STATUS_OKAY
+#endif
+
 #ifdef DT_FOREACH_OKAY_HELPER
 #undef DT_FOREACH_OKAY_HELPER
 #endif
diff --git a/tests/drivers/adc/adc_api/src/test_adc.c b/tests/drivers/adc/adc_api/src/test_adc.c
index 7d778cc6ef7..e7d1958cd5a 100644
--- a/tests/drivers/adc/adc_api/src/test_adc.c
+++ b/tests/drivers/adc/adc_api/src/test_adc.c
@@ -55,7 +55,7 @@ const struct device *get_adc_device(void)
 	return adc_channels[0].dev;
 }
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(test_counter), okay) && \
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(test_counter)) && \
 	defined(CONFIG_COUNTER)
 static void init_counter(void)
 {
@@ -90,7 +90,7 @@ static void init_adc(void)
 		m_sample_buffer[i] = INVALID_ADC_VALUE;
 	}
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(test_counter), okay) && \
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(test_counter)) && \
 	defined(CONFIG_COUNTER)
 	init_counter();
 #endif
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_adc.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_adc.c
index fd28729a376..4ff7aec59db 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_adc.c
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_adc.c
@@ -10,7 +10,7 @@
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include <zephyr/logging/log.h>
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(adc1))
 
 #undef DT_DRV_COMPAT
 #define DT_DRV_COMPAT st_stm32_adc
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_i2c.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_i2c.c
index 05a6dc0528f..5a1f1998289 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_i2c.c
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_i2c.c
@@ -11,7 +11,7 @@
 #include <zephyr/logging/log.h>
 
 #if !defined(CONFIG_SOC_SERIES_STM32F4X)
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c1))
 
 #if DT_HAS_COMPAT_STATUS_OKAY(st_stm32_i2c_v1)
 #define DT_DRV_COMPAT st_stm32_i2c_v1
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_i2s.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_i2s.c
index 4235f04207b..c4d9c37726b 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_i2s.c
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_i2s.c
@@ -10,7 +10,7 @@
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include <zephyr/logging/log.h>
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2s2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2s2))
 
 #if DT_HAS_COMPAT_STATUS_OKAY(st_stm32_i2s)
 #define DT_DRV_COMPAT st_stm32_i2s
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_lptim.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_lptim.c
index 3c85739dce9..0b04e0882e2 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_lptim.c
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_lptim.c
@@ -10,7 +10,7 @@
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include <zephyr/logging/log.h>
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(lptim1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lptim1))
 
 #undef DT_DRV_COMPAT
 #define DT_DRV_COMPAT st_stm32_lptim
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32h7_devices/src/test_stm32_clock_configuration.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32h7_devices/src/test_stm32_clock_configuration.c
index d7b05edd7f6..aaa86026df4 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32h7_devices/src/test_stm32_clock_configuration.c
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32h7_devices/src/test_stm32_clock_configuration.c
@@ -80,7 +80,7 @@ ZTEST(stm32h7_devices_clocks, test_spi_clk_config)
 					RCC_SPI123CLKSOURCE_CLKP, spi1_actual_domain_clk);
 
 			/* Check perclk configuration */
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(perck), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(perck))
 			uint32_t perclk_dt_domain_clk, perclk_actual_domain_clk;
 
 			perclk_dt_domain_clk = DT_CLOCKS_CELL_BY_IDX(DT_NODELABEL(perck), 0, bus);
diff --git a/tests/drivers/eeprom/api/src/main.c b/tests/drivers/eeprom/api/src/main.c
index 5a14565cccb..5d311b7567d 100644
--- a/tests/drivers/eeprom/api/src/main.c
+++ b/tests/drivers/eeprom/api/src/main.c
@@ -185,9 +185,9 @@ void test_main(void)
 {
 	run_tests_on_eeprom(DEVICE_DT_GET(DT_ALIAS(eeprom_0)));
 
-#if DT_NODE_HAS_STATUS(DT_ALIAS(eeprom_1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(eeprom_1))
 	run_tests_on_eeprom(DEVICE_DT_GET(DT_ALIAS(eeprom_1)));
-#endif /* DT_NODE_HAS_STATUS(DT_ALIAS(eeprom_1), okay) */
+#endif /* DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(eeprom_1)) */
 
 	ztest_verify_all_test_suites_ran();
 }
diff --git a/tests/drivers/gpio/gpio_basic_api/src/main.c b/tests/drivers/gpio/gpio_basic_api/src/main.c
index 67326505e98..3e11722cf8c 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/main.c
+++ b/tests/drivers/gpio/gpio_basic_api/src/main.c
@@ -20,7 +20,7 @@
 
 static void board_setup(void)
 {
-#if DT_NODE_HAS_STATUS(DT_INST(0, test_gpio_basic_api), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, test_gpio_basic_api))
 	/* PIN_IN and PIN_OUT must be on same controller. */
 	const struct device *const in_dev = DEVICE_DT_GET(DEV_OUT);
 	const struct device *const out_dev = DEVICE_DT_GET(DEV_IN);
diff --git a/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h b/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
index ba3d3ae5eba..78709937089 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
+++ b/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
@@ -12,7 +12,7 @@
 #include <zephyr/sys/util.h>
 #include <zephyr/ztest.h>
 
-#if DT_NODE_HAS_STATUS(DT_INST(0, test_gpio_basic_api), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, test_gpio_basic_api))
 
 /* Execution of the test requires hardware configuration described in
  * devicetree.  See the test,gpio_basic_api binding local to this test
@@ -29,11 +29,11 @@
 #define PIN_IN DT_GPIO_PIN(DT_INST(0, test_gpio_basic_api), in_gpios)
 #define PIN_IN_FLAGS DT_GPIO_FLAGS(DT_INST(0, test_gpio_basic_api), in_gpios)
 
-#elif DT_NODE_HAS_STATUS(DT_ALIAS(gpio_0), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(gpio_0))
 #define DEV DT_GPIO_CTLR(DT_ALIAS(gpio_0))
-#elif DT_NODE_HAS_STATUS(DT_ALIAS(gpio_1), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(gpio_1))
 #define DEV DT_GPIO_CTLR(DT_ALIAS(gpio_1))
-#elif DT_NODE_HAS_STATUS(DT_ALIAS(gpio_3), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(gpio_3))
 #define DEV DT_GPIO_CTLR(DT_ALIAS(gpio_3))
 #else
 #error Unsupported board
diff --git a/tests/drivers/gpio/gpio_reserved_ranges/src/main.c b/tests/drivers/gpio/gpio_reserved_ranges/src/main.c
index 1a56df9adc0..351a525d2ea 100644
--- a/tests/drivers/gpio/gpio_reserved_ranges/src/main.c
+++ b/tests/drivers/gpio/gpio_reserved_ranges/src/main.c
@@ -33,12 +33,12 @@ ZTEST(gpio_reserved_ranges, test_path_props)
 
 ZTEST(gpio_reserved_ranges, test_has_status)
 {
-	zassert_equal(DT_NODE_HAS_STATUS(TEST_GPIO_1, okay), 1, "");
-	zassert_equal(DT_NODE_HAS_STATUS(TEST_GPIO_2, okay), 1, "");
-	zassert_equal(DT_NODE_HAS_STATUS(TEST_GPIO_3, okay), 1, "");
-	zassert_equal(DT_NODE_HAS_STATUS(TEST_GPIO_4, okay), 1, "");
-	zassert_equal(DT_NODE_HAS_STATUS(TEST_GPIO_5, okay), 1, "");
-	zassert_equal(DT_NODE_HAS_STATUS(TEST_GPIO_6, okay), 1, "");
+	zassert_equal(DT_NODE_HAS_STATUS_OKAY(TEST_GPIO_1), 1, "");
+	zassert_equal(DT_NODE_HAS_STATUS_OKAY(TEST_GPIO_2), 1, "");
+	zassert_equal(DT_NODE_HAS_STATUS_OKAY(TEST_GPIO_3), 1, "");
+	zassert_equal(DT_NODE_HAS_STATUS_OKAY(TEST_GPIO_4), 1, "");
+	zassert_equal(DT_NODE_HAS_STATUS_OKAY(TEST_GPIO_5), 1, "");
+	zassert_equal(DT_NODE_HAS_STATUS_OKAY(TEST_GPIO_6), 1, "");
 }
 
 ZTEST(gpio_reserved_ranges, test_reserved_ranges)
diff --git a/tests/drivers/i2c/i2c_api/src/test_i2c.c b/tests/drivers/i2c/i2c_api/src/test_i2c.c
index 9ed4162b04b..ce0256b4500 100644
--- a/tests/drivers/i2c/i2c_api/src/test_i2c.c
+++ b/tests/drivers/i2c/i2c_api/src/test_i2c.c
@@ -16,11 +16,11 @@
 #include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
-#if DT_NODE_HAS_STATUS(DT_ALIAS(i2c_0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(i2c_0))
 #define I2C_DEV_NODE DT_ALIAS(i2c_0)
-#elif DT_NODE_HAS_STATUS(DT_ALIAS(i2c_1), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(i2c_1))
 #define I2C_DEV_NODE DT_ALIAS(i2c_1)
-#elif DT_NODE_HAS_STATUS(DT_ALIAS(i2c_2), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(i2c_2))
 #define I2C_DEV_NODE DT_ALIAS(i2c_2)
 #else
 #error "Please set the correct I2C device"
diff --git a/tests/drivers/i2c/i2c_ram/src/test_i2c_ram.c b/tests/drivers/i2c/i2c_ram/src/test_i2c_ram.c
index 3992897d90f..8fb39de2517 100644
--- a/tests/drivers/i2c/i2c_ram/src/test_i2c_ram.c
+++ b/tests/drivers/i2c/i2c_ram/src/test_i2c_ram.c
@@ -20,7 +20,7 @@
 
 #define RAM_ADDR (0b10100010 >> 1)
 
-#if DT_NODE_HAS_STATUS(DT_ALIAS(i2c_ram), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(i2c_ram))
 #define I2C_DEV_NODE	DT_ALIAS(i2c_ram)
 #define TX_DATA_OFFSET 2
 static uint8_t tx_data[9] = {0x00, 0x00, 'Z', 'e', 'p', 'h', 'y', 'r', '\n'};
diff --git a/tests/drivers/i2c/i2c_tca954x/src/main.c b/tests/drivers/i2c/i2c_tca954x/src/main.c
index 5524b1ed4dd..c5433f93a4a 100644
--- a/tests/drivers/i2c/i2c_tca954x/src/main.c
+++ b/tests/drivers/i2c/i2c_tca954x/src/main.c
@@ -8,13 +8,13 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/i2c.h>
 
-#if DT_NODE_HAS_STATUS(DT_ALIAS(i2c_channel_0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(i2c_channel_0))
 #define I2C_0_CTRL_NODE_ID      DT_ALIAS(i2c_channel_0)
 #else
 #error "I2C 0 controller device not found"
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_ALIAS(i2c_channel_1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(i2c_channel_1))
 #define I2C_1_CTRL_NODE_ID      DT_ALIAS(i2c_channel_1)
 #else
 #error "I2C 1 controller device not found"
diff --git a/tests/drivers/memc/ram/src/main.c b/tests/drivers/memc/ram/src/main.c
index c8de856aa46..666f422da51 100644
--- a/tests/drivers/memc/ram/src/main.c
+++ b/tests/drivers/memc/ram/src/main.c
@@ -32,23 +32,23 @@ static void test_ram_rw(uint32_t *mem, size_t size)
 	}
 }
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(sdram1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sdram1))
 BUF_DEF(sdram1);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(sdram2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sdram2))
 BUF_DEF(sdram2);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(sram1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sram1))
 BUF_DEF(sram1);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(sram2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sram2))
 BUF_DEF(sram2);
 #endif
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(memc), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(memc))
 BUF_DEF(psram);
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ram0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ram0))
 #define RAM_SIZE DT_REG_SIZE(DT_NODELABEL(ram0))
 static uint32_t *buf_ram0 = (uint32_t *)DT_REG_ADDR(DT_NODELABEL(ram0));
 #endif
@@ -57,7 +57,7 @@ ZTEST_SUITE(test_ram, NULL, NULL, NULL, NULL, NULL);
 
 ZTEST(test_ram, test_sdram1)
 {
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(sdram1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sdram1))
 	test_ram_rw(buf_sdram1, BUF_SIZE);
 #else
 	ztest_test_skip();
@@ -66,7 +66,7 @@ ZTEST(test_ram, test_sdram1)
 
 ZTEST(test_ram, test_ram0)
 {
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(ram0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ram0))
 	test_ram_rw(buf_ram0, RAM_SIZE);
 #else
 	ztest_test_skip();
@@ -75,7 +75,7 @@ ZTEST(test_ram, test_ram0)
 
 ZTEST(test_ram, test_sdram2)
 {
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(sdram2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sdram2))
 	test_ram_rw(buf_sdram2, BUF_SIZE);
 #else
 	ztest_test_skip();
@@ -84,7 +84,7 @@ ZTEST(test_ram, test_sdram2)
 
 ZTEST(test_ram, test_sram1)
 {
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(sram1), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sram1))
 	test_ram_rw(buf_sram1, BUF_SIZE);
 #else
 	ztest_test_skip();
@@ -93,7 +93,7 @@ ZTEST(test_ram, test_sram1)
 
 ZTEST(test_ram, test_sram2)
 {
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(sram2), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sram2))
 	test_ram_rw(buf_sram2, BUF_SIZE);
 #else
 	ztest_test_skip();
@@ -102,7 +102,7 @@ ZTEST(test_ram, test_sram2)
 
 ZTEST(test_ram, test_psram)
 {
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(memc), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(memc))
 	test_ram_rw(buf_psram, BUF_SIZE);
 #else
 	ztest_test_skip();
diff --git a/tests/drivers/pwm/pwm_api/src/test_pwm.c b/tests/drivers/pwm/pwm_api/src/test_pwm.c
index b5fc72b37e8..69a4dcaeacc 100644
--- a/tests/drivers/pwm/pwm_api/src/test_pwm.c
+++ b/tests/drivers/pwm/pwm_api/src/test_pwm.c
@@ -29,13 +29,13 @@
 #include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
-#if DT_NODE_HAS_STATUS(DT_ALIAS(pwm_0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(pwm_0))
 #define PWM_DEV_NODE DT_ALIAS(pwm_0)
-#elif DT_NODE_HAS_STATUS(DT_ALIAS(pwm_1), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(pwm_1))
 #define PWM_DEV_NODE DT_ALIAS(pwm_1)
-#elif DT_NODE_HAS_STATUS(DT_ALIAS(pwm_2), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(pwm_2))
 #define PWM_DEV_NODE DT_ALIAS(pwm_2)
-#elif DT_NODE_HAS_STATUS(DT_ALIAS(pwm_3), okay)
+#elif DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(pwm_3))
 #define PWM_DEV_NODE DT_ALIAS(pwm_3)
 
 #elif DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_pwm)
diff --git a/tests/drivers/smbus/smbus_api/src/test_smbus.c b/tests/drivers/smbus/smbus_api/src/test_smbus.c
index 5d1dd9ca49a..7743e04fbda 100644
--- a/tests/drivers/smbus/smbus_api/src/test_smbus.c
+++ b/tests/drivers/smbus/smbus_api/src/test_smbus.c
@@ -14,7 +14,7 @@
 
 #include <smbus_utils.h>
 
-BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_NODELABEL(smbus0), okay),
+BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(smbus0)),
 	     "SMBus node is disabled!");
 
 #define FAKE_ADDRESS	0x10
diff --git a/tests/drivers/smbus/smbus_api/src/test_smbus_qemu.c b/tests/drivers/smbus/smbus_api/src/test_smbus_qemu.c
index 74d8ba4408e..182794e7dc9 100644
--- a/tests/drivers/smbus/smbus_api/src/test_smbus_qemu.c
+++ b/tests/drivers/smbus/smbus_api/src/test_smbus_qemu.c
@@ -16,7 +16,7 @@
 #include <zephyr/ztest.h>
 #include <zephyr/drivers/smbus.h>
 
-BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_NODELABEL(smbus0), okay),
+BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(smbus0)),
 	     "SMBus node is disabled!");
 
 /* Qemu q35 has default emulated EEPROM-like devices */
diff --git a/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c b/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c
index 3166176de43..353d189db54 100644
--- a/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c
+++ b/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c
@@ -66,7 +66,7 @@
  * 'watchdog0' property, or one of the following watchdog compatibles
  * must have an enabled node.
  */
-#if DT_NODE_HAS_STATUS(DT_ALIAS(watchdog0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(watchdog0))
 #define WDT_NODE DT_ALIAS(watchdog0)
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_window_watchdog)
 #define WDT_NODE DT_INST(0, st_stm32_window_watchdog)
@@ -148,7 +148,7 @@ static struct wdt_timeout_cfg m_cfg_wdt1;
 #define DATATYPE uint32_t
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm))
 #define NOINIT_SECTION ".dtcm_noinit.test_wdt"
 #else
 #define NOINIT_SECTION ".noinit.test_wdt"
diff --git a/tests/drivers/watchdog/wdt_basic_reset_none/src/main.c b/tests/drivers/watchdog/wdt_basic_reset_none/src/main.c
index 6a025a1478c..9fa3e0bd752 100644
--- a/tests/drivers/watchdog/wdt_basic_reset_none/src/main.c
+++ b/tests/drivers/watchdog/wdt_basic_reset_none/src/main.c
@@ -13,7 +13,7 @@
  * 'watchdog0' property, or one of the following watchdog compatibles
  * must have an enabled node.
  */
-#if DT_NODE_HAS_STATUS(DT_ALIAS(watchdog0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(watchdog0))
 #define WDT_NODE DT_ALIAS(watchdog0)
 #elif DT_HAS_COMPAT_STATUS_OKAY(nxp_s32_swt)
 #define WDT_NODE DT_INST(0, nxp_s32_swt)
diff --git a/tests/drivers/watchdog/wdt_error_cases/src/main.c b/tests/drivers/watchdog/wdt_error_cases/src/main.c
index c1adc43eea3..b05bedf01c3 100644
--- a/tests/drivers/watchdog/wdt_error_cases/src/main.c
+++ b/tests/drivers/watchdog/wdt_error_cases/src/main.c
@@ -13,7 +13,7 @@
  * 'watchdog0' property, or one of the following watchdog compatibles
  * must have an enabled node.
  */
-#if DT_NODE_HAS_STATUS(DT_ALIAS(watchdog0), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(watchdog0))
 #define WDT_NODE DT_ALIAS(watchdog0)
 #elif DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_wdt)
 #define WDT_NODE DT_INST(0, nordic_nrf_wdt)
@@ -21,7 +21,7 @@
 #define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(zephyr_counter_watchdog)
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm))
 #define NOINIT_SECTION ".dtcm_noinit.test_wdt"
 #else
 #define NOINIT_SECTION ".noinit.test_wdt"

From 630e9b374cd4e22f024975c05896058849e3c291 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Tue, 22 Oct 2024 16:00:54 +0200
Subject: [PATCH 0582/2913] [nrf fromtree] pm: policy: split policy APIs
 implementations

policy.c has grown organically, it contained many independent pieces of
code. This patch splits each logical unit into its own C file, making it
easier to browse the code.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 6f4bb118a8002acf2059d34b4408c97716577815)
(cherry picked from commit d7e9470628f78b897246e81b711dec82eb9c5930)
---
 subsys/pm/CMakeLists.txt              |   4 +-
 subsys/pm/Kconfig                     |  31 +-
 subsys/pm/policy.c                    | 456 --------------------------
 subsys/pm/policy/CMakeLists.txt       |  14 +
 subsys/pm/policy/Kconfig              |  34 ++
 subsys/pm/policy/policy_default.c     |  79 +++++
 subsys/pm/policy/policy_device_lock.c | 120 +++++++
 subsys/pm/policy/policy_events.c      | 101 ++++++
 subsys/pm/policy/policy_latency.c     | 107 ++++++
 subsys/pm/policy/policy_state_lock.c  |  86 +++++
 10 files changed, 546 insertions(+), 486 deletions(-)
 delete mode 100644 subsys/pm/policy.c
 create mode 100644 subsys/pm/policy/CMakeLists.txt
 create mode 100644 subsys/pm/policy/Kconfig
 create mode 100644 subsys/pm/policy/policy_default.c
 create mode 100644 subsys/pm/policy/policy_device_lock.c
 create mode 100644 subsys/pm/policy/policy_events.c
 create mode 100644 subsys/pm/policy/policy_latency.c
 create mode 100644 subsys/pm/policy/policy_state_lock.c

diff --git a/subsys/pm/CMakeLists.txt b/subsys/pm/CMakeLists.txt
index 0e961abda78..67d67729d8a 100644
--- a/subsys/pm/CMakeLists.txt
+++ b/subsys/pm/CMakeLists.txt
@@ -1,10 +1,12 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(CONFIG_PM)
-  zephyr_sources(pm.c policy.c state.c)
+  zephyr_sources(pm.c state.c)
   zephyr_sources_ifdef(CONFIG_PM_STATS pm_stats.c)
 endif()
 
+add_subdirectory(policy)
+
 zephyr_sources_ifdef(CONFIG_PM_DEVICE device.c)
 zephyr_sources_ifdef(CONFIG_PM_DEVICE_RUNTIME device_runtime.c)
 zephyr_sources_ifdef(CONFIG_PM_DEVICE_SHELL pm_shell.c)
diff --git a/subsys/pm/Kconfig b/subsys/pm/Kconfig
index bf69f778081..8acee7c6848 100644
--- a/subsys/pm/Kconfig
+++ b/subsys/pm/Kconfig
@@ -19,6 +19,8 @@ config PM
 	  power management subsystem of the number of ticks until the next kernel
 	  timer is due to expire.
 
+rsource "policy/Kconfig"
+
 if PM
 
 module = PM
@@ -51,35 +53,6 @@ config PM_NEED_ALL_DEVICES_IDLE
 	  When this option is enabled, check that no devices are busy before
 	  entering into system low power mode.
 
-choice PM_POLICY
-	prompt "Idle State Power Management Policy"
-	default PM_POLICY_DEFAULT
-	help
-	  Select the idle state power management policy.
-
-config PM_POLICY_DEFAULT
-	bool "Default PM policy"
-	help
-	  This option selects the default PM policy. Default policy is based
-	  on CPU residency times and other constraints imposed by the drivers or
-	  application.
-
-config PM_POLICY_CUSTOM
-	bool "Custom PM Policy"
-	help
-	  This options allows applications to override the default policy with
-	  a custom implementation.
-
-endchoice
-
-config PM_POLICY_DEVICE_CONSTRAINTS
-	bool "Power state constraints per device"
-	help
-	  This option allows devices to have a list of power states
-	  that when the system transition to them, cause power loss in the device.
-	  This used to set and release power state constraints when
-	  it is needed by the device.
-
 endif # PM
 
 config PM_DEVICE
diff --git a/subsys/pm/policy.c b/subsys/pm/policy.c
deleted file mode 100644
index 39742cdf38c..00000000000
--- a/subsys/pm/policy.c
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
- * Copyright (c) 2018 Intel Corporation.
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/pm/pm.h>
-#include <zephyr/pm/policy.h>
-#include <zephyr/pm/state.h>
-#include <zephyr/spinlock.h>
-#include <zephyr/sys_clock.h>
-#include <zephyr/sys/__assert.h>
-#include <zephyr/sys/time_units.h>
-#include <zephyr/sys/atomic.h>
-#include <zephyr/sys/util_macro.h>
-#include <zephyr/toolchain.h>
-#include <zephyr/pm/device.h>
-
-#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
-
-#define DT_SUB_LOCK_INIT(node_id)				\
-	{ .state = PM_STATE_DT_INIT(node_id),			\
-	  .substate_id = DT_PROP_OR(node_id, substate_id, 0),	\
-	  .lock = ATOMIC_INIT(0),				\
-	},
-
-/**
- * State and substate lock structure.
- *
- * This struct is associating a reference counting to each <state,substate>
- * couple to be used with the pm_policy_substate_lock_* functions.
- *
- * Operations on this array are in the order of O(n) with the number of power
- * states and this is mostly due to the random nature of the substate value
- * (that can be anything from a small integer value to a bitmask). We can
- * probably do better with an hashmap.
- */
-static struct {
-	enum pm_state state;
-	uint8_t substate_id;
-	atomic_t lock;
-} substate_lock_t[] = {
-	DT_FOREACH_STATUS_OKAY(zephyr_power_state, DT_SUB_LOCK_INIT)
-};
-
-#endif
-
-#if defined(CONFIG_PM_POLICY_DEVICE_CONSTRAINTS)
-
-struct pm_state_device_constraint {
-	const struct device *const dev;
-	size_t pm_constraints_size;
-	struct pm_state_constraint *constraints;
-};
-
-/**
- * @brief Synthesize the name of the object that holds a device pm constraint.
- *
- * @param dev_id Device identifier.
- */
-#define PM_CONSTRAINTS_NAME(node_id) _CONCAT(__devicepmconstraints_, node_id)
-
-/**
- * @brief initialize a device pm constraint with information from devicetree.
- *
- * @param node_id Node identifier.
- */
-#define PM_STATE_CONSTRAINT_INIT(node_id)                                     \
-	{                                                                     \
-		.state = PM_STATE_DT_INIT(node_id),                           \
-		.substate_id = DT_PROP_OR(node_id, substate_id, 0),           \
-	}
-
-/**
- * @brief Helper macro to define a device pm constraints.
- */
-#define PM_STATE_CONSTRAINT_DEFINE(i, node_id)                                  \
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_PHANDLE_BY_IDX(node_id,          \
-		zephyr_disabling_power_states, i)),                             \
-		(PM_STATE_CONSTRAINT_INIT(DT_PHANDLE_BY_IDX(node_id,            \
-		zephyr_disabling_power_states, i)),), ())
-
-/**
- * @brief Helper macro to generate a list of device pm constraints.
- */
-#define PM_STATE_CONSTRAINTS_DEFINE(node_id)                                           \
-	{                                                                              \
-		LISTIFY(DT_PROP_LEN_OR(node_id, zephyr_disabling_power_states, 0),     \
-			PM_STATE_CONSTRAINT_DEFINE, (), node_id)                       \
-	}
-
-/**
- * @brief Helper macro to define an array of device pm constraints.
- */
-#define CONSTRAINTS_DEFINE(node_id)                         \
-	Z_DECL_ALIGN(struct pm_state_constraint)            \
-		PM_CONSTRAINTS_NAME(node_id)[] =            \
-		PM_STATE_CONSTRAINTS_DEFINE(node_id);
-
-#define DEVICE_CONSTRAINTS_DEFINE(node_id)                                           \
-	COND_CODE_0(DT_NODE_HAS_PROP(node_id, zephyr_disabling_power_states), (),    \
-		(CONSTRAINTS_DEFINE(node_id)))
-
-DT_FOREACH_STATUS_OKAY_NODE(DEVICE_CONSTRAINTS_DEFINE)
-
-/**
- * @brief Helper macro to initialize a pm state device constraint
- */
-#define PM_STATE_DEVICE_CONSTRAINT_INIT(node_id)                                              \
-	{                                                                                     \
-		.dev = DEVICE_DT_GET(node_id),                                                \
-		.pm_constraints_size = DT_PROP_LEN(node_id, zephyr_disabling_power_states),   \
-		.constraints = PM_CONSTRAINTS_NAME(node_id),                                  \
-	},
-
-/**
- * @brief Helper macro to initialize a pm state device constraint
- */
-#define PM_STATE_DEVICE_CONSTRAINT_DEFINE(node_id)                                      \
-	COND_CODE_0(DT_NODE_HAS_PROP(node_id, zephyr_disabling_power_states), (),       \
-		(PM_STATE_DEVICE_CONSTRAINT_INIT(node_id)))
-
-static struct pm_state_device_constraint _devices_constraints[] = {
-	DT_FOREACH_STATUS_OKAY_NODE(PM_STATE_DEVICE_CONSTRAINT_DEFINE)
-};
-
-#endif /* CONFIG_PM_POLICY_DEVICE_CONSTRAINTS */
-
-/** Lock to synchronize access to the latency request list. */
-static struct k_spinlock latency_lock;
-/** List of maximum latency requests. */
-static sys_slist_t latency_reqs;
-/** Maximum CPU latency in us */
-static int32_t max_latency_us = SYS_FOREVER_US;
-/** Maximum CPU latency in cycles */
-static int32_t max_latency_cyc = -1;
-/** List of latency change subscribers. */
-static sys_slist_t latency_subs;
-
-/** Lock to synchronize access to the events list. */
-static struct k_spinlock events_lock;
-/** List of events. */
-static sys_slist_t events_list;
-/** Pointer to Next Event. */
-static struct pm_policy_event *next_event;
-
-/** @brief Update maximum allowed latency. */
-static void update_max_latency(void)
-{
-	int32_t new_max_latency_us = SYS_FOREVER_US;
-	struct pm_policy_latency_request *req;
-
-	SYS_SLIST_FOR_EACH_CONTAINER(&latency_reqs, req, node) {
-		if ((new_max_latency_us == SYS_FOREVER_US) ||
-		    ((int32_t)req->value_us < new_max_latency_us)) {
-			new_max_latency_us = (int32_t)req->value_us;
-		}
-	}
-
-	if (max_latency_us != new_max_latency_us) {
-		struct pm_policy_latency_subscription *sreq;
-		int32_t new_max_latency_cyc = -1;
-
-		SYS_SLIST_FOR_EACH_CONTAINER(&latency_subs, sreq, node) {
-			sreq->cb(new_max_latency_us);
-		}
-
-		if (new_max_latency_us != SYS_FOREVER_US) {
-			new_max_latency_cyc = (int32_t)k_us_to_cyc_ceil32(new_max_latency_us);
-		}
-
-		max_latency_us = new_max_latency_us;
-		max_latency_cyc = new_max_latency_cyc;
-	}
-}
-
-/** @brief Update next event. */
-static void update_next_event(uint32_t cyc)
-{
-	int64_t new_next_event_cyc = -1;
-	struct pm_policy_event *evt;
-
-	/* unset the next event pointer */
-	next_event = NULL;
-
-	SYS_SLIST_FOR_EACH_CONTAINER(&events_list, evt, node) {
-		uint64_t cyc_evt = evt->value_cyc;
-
-		/*
-		 * cyc value is a 32-bit rolling counter:
-		 *
-		 * |---------------->-----------------------|
-		 * 0               cyc                  UINT32_MAX
-		 *
-		 * Values from [0, cyc) are events happening later than
-		 * [cyc, UINT32_MAX], so pad [0, cyc) with UINT32_MAX + 1 to do
-		 * the comparison.
-		 */
-		if (cyc_evt < cyc) {
-			cyc_evt += (uint64_t)UINT32_MAX + 1U;
-		}
-
-		if ((new_next_event_cyc < 0) || (cyc_evt < new_next_event_cyc)) {
-			new_next_event_cyc = cyc_evt;
-			next_event = evt;
-		}
-	}
-}
-
-int32_t pm_policy_next_event_ticks(void)
-{
-	int32_t cyc_evt = -1;
-
-	if ((next_event) && (next_event->value_cyc > 0)) {
-		cyc_evt = next_event->value_cyc - k_cycle_get_32();
-		cyc_evt = MAX(0, cyc_evt);
-		BUILD_ASSERT(CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC >= CONFIG_SYS_CLOCK_TICKS_PER_SEC,
-			     "HW Cycles per sec should be greater that ticks per sec");
-		return k_cyc_to_ticks_floor32(cyc_evt);
-	}
-
-	return -1;
-}
-
-#ifdef CONFIG_PM_POLICY_DEFAULT
-const struct pm_state_info *pm_policy_next_state(uint8_t cpu, int32_t ticks)
-{
-	int64_t cyc = -1;
-	uint8_t num_cpu_states;
-	const struct pm_state_info *cpu_states;
-
-#ifdef CONFIG_PM_NEED_ALL_DEVICES_IDLE
-	if (pm_device_is_any_busy()) {
-		return NULL;
-	}
-#endif
-
-	if (ticks != K_TICKS_FOREVER) {
-		cyc = k_ticks_to_cyc_ceil32(ticks);
-	}
-
-	num_cpu_states = pm_state_cpu_get_all(cpu, &cpu_states);
-
-	if ((next_event) && (next_event->value_cyc >= 0)) {
-		uint32_t cyc_curr = k_cycle_get_32();
-		int64_t cyc_evt = next_event->value_cyc - cyc_curr;
-
-		/* event happening after cycle counter max value, pad */
-		if (next_event->value_cyc <= cyc_curr) {
-			cyc_evt += UINT32_MAX;
-		}
-
-		if (cyc_evt > 0) {
-			/* if there's no system wakeup event always wins,
-			 * otherwise, who comes earlier wins
-			 */
-			if (cyc < 0) {
-				cyc = cyc_evt;
-			} else {
-				cyc = MIN(cyc, cyc_evt);
-			}
-		}
-	}
-
-	for (int16_t i = (int16_t)num_cpu_states - 1; i >= 0; i--) {
-		const struct pm_state_info *state = &cpu_states[i];
-		uint32_t min_residency_cyc, exit_latency_cyc;
-
-		/* check if there is a lock on state + substate */
-		if (pm_policy_state_lock_is_active(state->state, state->substate_id)) {
-			continue;
-		}
-
-		min_residency_cyc = k_us_to_cyc_ceil32(state->min_residency_us);
-		exit_latency_cyc = k_us_to_cyc_ceil32(state->exit_latency_us);
-
-		/* skip state if it brings too much latency */
-		if ((max_latency_cyc >= 0) &&
-		    (exit_latency_cyc >= max_latency_cyc)) {
-			continue;
-		}
-
-		if ((cyc < 0) ||
-		    (cyc >= (min_residency_cyc + exit_latency_cyc))) {
-			return state;
-		}
-	}
-
-	return NULL;
-}
-#endif
-
-void pm_policy_state_lock_get(enum pm_state state, uint8_t substate_id)
-{
-#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
-	for (size_t i = 0; i < ARRAY_SIZE(substate_lock_t); i++) {
-		if (substate_lock_t[i].state == state &&
-		   (substate_lock_t[i].substate_id == substate_id ||
-		    substate_id == PM_ALL_SUBSTATES)) {
-			atomic_inc(&substate_lock_t[i].lock);
-		}
-	}
-#endif
-}
-
-void pm_policy_state_lock_put(enum pm_state state, uint8_t substate_id)
-{
-#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
-	for (size_t i = 0; i < ARRAY_SIZE(substate_lock_t); i++) {
-		if (substate_lock_t[i].state == state &&
-		   (substate_lock_t[i].substate_id == substate_id ||
-		    substate_id == PM_ALL_SUBSTATES)) {
-			atomic_t cnt = atomic_dec(&substate_lock_t[i].lock);
-
-			ARG_UNUSED(cnt);
-
-			__ASSERT(cnt >= 1, "Unbalanced state lock get/put");
-		}
-	}
-#endif
-}
-
-bool pm_policy_state_lock_is_active(enum pm_state state, uint8_t substate_id)
-{
-#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
-	for (size_t i = 0; i < ARRAY_SIZE(substate_lock_t); i++) {
-		if (substate_lock_t[i].state == state &&
-		   (substate_lock_t[i].substate_id == substate_id ||
-		    substate_id == PM_ALL_SUBSTATES)) {
-			return (atomic_get(&substate_lock_t[i].lock) != 0);
-		}
-	}
-#endif
-
-	return false;
-}
-
-void pm_policy_latency_request_add(struct pm_policy_latency_request *req,
-				   uint32_t value_us)
-{
-	req->value_us = value_us;
-
-	k_spinlock_key_t key = k_spin_lock(&latency_lock);
-
-	sys_slist_append(&latency_reqs, &req->node);
-	update_max_latency();
-
-	k_spin_unlock(&latency_lock, key);
-}
-
-void pm_policy_latency_request_update(struct pm_policy_latency_request *req,
-				      uint32_t value_us)
-{
-	k_spinlock_key_t key = k_spin_lock(&latency_lock);
-
-	req->value_us = value_us;
-	update_max_latency();
-
-	k_spin_unlock(&latency_lock, key);
-}
-
-void pm_policy_latency_request_remove(struct pm_policy_latency_request *req)
-{
-	k_spinlock_key_t key = k_spin_lock(&latency_lock);
-
-	(void)sys_slist_find_and_remove(&latency_reqs, &req->node);
-	update_max_latency();
-
-	k_spin_unlock(&latency_lock, key);
-}
-
-void pm_policy_latency_changed_subscribe(struct pm_policy_latency_subscription *req,
-					 pm_policy_latency_changed_cb_t cb)
-{
-	k_spinlock_key_t key = k_spin_lock(&latency_lock);
-
-	req->cb = cb;
-	sys_slist_append(&latency_subs, &req->node);
-
-	k_spin_unlock(&latency_lock, key);
-}
-
-void pm_policy_latency_changed_unsubscribe(struct pm_policy_latency_subscription *req)
-{
-	k_spinlock_key_t key = k_spin_lock(&latency_lock);
-
-	(void)sys_slist_find_and_remove(&latency_subs, &req->node);
-
-	k_spin_unlock(&latency_lock, key);
-}
-
-void pm_policy_event_register(struct pm_policy_event *evt, uint32_t time_us)
-{
-	k_spinlock_key_t key = k_spin_lock(&events_lock);
-	uint32_t cyc = k_cycle_get_32();
-
-	evt->value_cyc = cyc + k_us_to_cyc_ceil32(time_us);
-	sys_slist_append(&events_list, &evt->node);
-	update_next_event(cyc);
-
-	k_spin_unlock(&events_lock, key);
-}
-
-void pm_policy_event_update(struct pm_policy_event *evt, uint32_t cycle)
-{
-	k_spinlock_key_t key = k_spin_lock(&events_lock);
-
-	evt->value_cyc = cycle;
-	update_next_event(k_cycle_get_32());
-
-	k_spin_unlock(&events_lock, key);
-}
-
-void pm_policy_event_unregister(struct pm_policy_event *evt)
-{
-	k_spinlock_key_t key = k_spin_lock(&events_lock);
-
-	(void)sys_slist_find_and_remove(&events_list, &evt->node);
-	update_next_event(k_cycle_get_32());
-
-	k_spin_unlock(&events_lock, key);
-}
-
-void pm_policy_device_power_lock_get(const struct device *dev)
-{
-#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state) && defined(CONFIG_PM_POLICY_DEVICE_CONSTRAINTS)
-	for (size_t i = 0; i < ARRAY_SIZE(_devices_constraints); i++) {
-		if (_devices_constraints[i].dev == dev) {
-			for (size_t j = 0; j < _devices_constraints[i].pm_constraints_size; j++) {
-				pm_policy_state_lock_get(
-						_devices_constraints[i].constraints[j].state,
-						_devices_constraints[i].constraints[j].substate_id);
-			}
-			break;
-		}
-	}
-#endif
-}
-
-void pm_policy_device_power_lock_put(const struct device *dev)
-{
-#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state) && defined(CONFIG_PM_POLICY_DEVICE_CONSTRAINTS)
-	for (size_t i = 0; i < ARRAY_SIZE(_devices_constraints); i++) {
-		if (_devices_constraints[i].dev == dev) {
-			for (size_t j = 0; j < _devices_constraints[i].pm_constraints_size; j++) {
-				pm_policy_state_lock_put(
-						_devices_constraints[i].constraints[j].state,
-						_devices_constraints[i].constraints[j].substate_id);
-			}
-			break;
-		}
-	}
-#endif
-}
diff --git a/subsys/pm/policy/CMakeLists.txt b/subsys/pm/policy/CMakeLists.txt
new file mode 100644
index 00000000000..e9d7d791ec5
--- /dev/null
+++ b/subsys/pm/policy/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if(CONFIG_PM)
+  zephyr_library_sources(policy_events.c policy_latency.c policy_state_lock.c)
+
+  if(CONFIG_PM_POLICY_DEVICE_CONSTRAINTS)
+    zephyr_library_sources(policy_device_lock.c)
+  endif()
+
+  if(CONFIG_PM_POLICY_DEFAULT)
+    zephyr_library_sources(policy_default.c)
+  endif()
+endif()
diff --git a/subsys/pm/policy/Kconfig b/subsys/pm/policy/Kconfig
new file mode 100644
index 00000000000..2060c52cb13
--- /dev/null
+++ b/subsys/pm/policy/Kconfig
@@ -0,0 +1,34 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if PM
+choice PM_POLICY
+	prompt "Idle State Power Management Policy"
+	default PM_POLICY_DEFAULT
+	help
+	  Select the idle state power management policy.
+
+config PM_POLICY_DEFAULT
+	bool "Default PM policy"
+	help
+	  This option selects the default PM policy. Default policy is based
+	  on CPU residency times and other constraints imposed by the drivers or
+	  application.
+
+config PM_POLICY_CUSTOM
+	bool "Custom PM Policy"
+	help
+	  This options allows applications to override the default policy with
+	  a custom implementation.
+
+endchoice
+
+config PM_POLICY_DEVICE_CONSTRAINTS
+	bool "Power state constraints per device"
+	help
+	  This option allows devices to have a list of power states
+	  that when the system transition to them, cause power loss in the device.
+	  This used to set and release power state constraints when
+	  it is needed by the device.
+
+endif # PM
diff --git a/subsys/pm/policy/policy_default.c b/subsys/pm/policy/policy_default.c
new file mode 100644
index 00000000000..74a0443e6cd
--- /dev/null
+++ b/subsys/pm/policy/policy_default.c
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2018 Intel Corporation.
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/pm/policy.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/pm/device.h>
+
+extern struct pm_policy_event *next_event;
+extern int32_t max_latency_cyc;
+
+const struct pm_state_info *pm_policy_next_state(uint8_t cpu, int32_t ticks)
+{
+	int64_t cyc = -1;
+	uint8_t num_cpu_states;
+	const struct pm_state_info *cpu_states;
+
+#ifdef CONFIG_PM_NEED_ALL_DEVICES_IDLE
+	if (pm_device_is_any_busy()) {
+		return NULL;
+	}
+#endif
+
+	if (ticks != K_TICKS_FOREVER) {
+		cyc = k_ticks_to_cyc_ceil32(ticks);
+	}
+
+	num_cpu_states = pm_state_cpu_get_all(cpu, &cpu_states);
+
+	if ((next_event) && (next_event->value_cyc >= 0)) {
+		uint32_t cyc_curr = k_cycle_get_32();
+		int64_t cyc_evt = next_event->value_cyc - cyc_curr;
+
+		/* event happening after cycle counter max value, pad */
+		if (next_event->value_cyc <= cyc_curr) {
+			cyc_evt += UINT32_MAX;
+		}
+
+		if (cyc_evt > 0) {
+			/* if there's no system wakeup event always wins,
+			 * otherwise, who comes earlier wins
+			 */
+			if (cyc < 0) {
+				cyc = cyc_evt;
+			} else {
+				cyc = MIN(cyc, cyc_evt);
+			}
+		}
+	}
+
+	for (int16_t i = (int16_t)num_cpu_states - 1; i >= 0; i--) {
+		const struct pm_state_info *state = &cpu_states[i];
+		uint32_t min_residency_cyc, exit_latency_cyc;
+
+		/* check if there is a lock on state + substate */
+		if (pm_policy_state_lock_is_active(state->state, state->substate_id)) {
+			continue;
+		}
+
+		min_residency_cyc = k_us_to_cyc_ceil32(state->min_residency_us);
+		exit_latency_cyc = k_us_to_cyc_ceil32(state->exit_latency_us);
+
+		/* skip state if it brings too much latency */
+		if ((max_latency_cyc >= 0) &&
+		    (exit_latency_cyc >= max_latency_cyc)) {
+			continue;
+		}
+
+		if ((cyc < 0) ||
+		    (cyc >= (min_residency_cyc + exit_latency_cyc))) {
+			return state;
+		}
+	}
+
+	return NULL;
+}
diff --git a/subsys/pm/policy/policy_device_lock.c b/subsys/pm/policy/policy_device_lock.c
new file mode 100644
index 00000000000..b508819fb73
--- /dev/null
+++ b/subsys/pm/policy/policy_device_lock.c
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2018 Intel Corporation.
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/pm/policy.h>
+#include <zephyr/pm/state.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/pm/device.h>
+
+struct pm_state_device_constraint {
+	const struct device *const dev;
+	size_t pm_constraints_size;
+	struct pm_state_constraint *constraints;
+};
+
+/**
+ * @brief Synthesize the name of the object that holds a device pm constraint.
+ *
+ * @param dev_id Device identifier.
+ */
+#define PM_CONSTRAINTS_NAME(node_id) _CONCAT(__devicepmconstraints_, node_id)
+
+/**
+ * @brief initialize a device pm constraint with information from devicetree.
+ *
+ * @param node_id Node identifier.
+ */
+#define PM_STATE_CONSTRAINT_INIT(node_id)                                     \
+	{                                                                     \
+		.state = PM_STATE_DT_INIT(node_id),                           \
+		.substate_id = DT_PROP_OR(node_id, substate_id, 0),           \
+	}
+
+/**
+ * @brief Helper macro to define a device pm constraints.
+ */
+#define PM_STATE_CONSTRAINT_DEFINE(i, node_id)                                  \
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_PHANDLE_BY_IDX(node_id,          \
+		zephyr_disabling_power_states, i)),                             \
+		(PM_STATE_CONSTRAINT_INIT(DT_PHANDLE_BY_IDX(node_id,            \
+		zephyr_disabling_power_states, i)),), ())
+
+/**
+ * @brief Helper macro to generate a list of device pm constraints.
+ */
+#define PM_STATE_CONSTRAINTS_DEFINE(node_id)                                           \
+	{                                                                              \
+		LISTIFY(DT_PROP_LEN_OR(node_id, zephyr_disabling_power_states, 0),     \
+			PM_STATE_CONSTRAINT_DEFINE, (), node_id)                       \
+	}
+
+/**
+ * @brief Helper macro to define an array of device pm constraints.
+ */
+#define CONSTRAINTS_DEFINE(node_id)                         \
+	Z_DECL_ALIGN(struct pm_state_constraint)            \
+		PM_CONSTRAINTS_NAME(node_id)[] =            \
+		PM_STATE_CONSTRAINTS_DEFINE(node_id);
+
+#define DEVICE_CONSTRAINTS_DEFINE(node_id)                                           \
+	COND_CODE_0(DT_NODE_HAS_PROP(node_id, zephyr_disabling_power_states), (),    \
+		(CONSTRAINTS_DEFINE(node_id)))
+
+DT_FOREACH_STATUS_OKAY_NODE(DEVICE_CONSTRAINTS_DEFINE)
+
+/**
+ * @brief Helper macro to initialize a pm state device constraint
+ */
+#define PM_STATE_DEVICE_CONSTRAINT_INIT(node_id)                                              \
+	{                                                                                     \
+		.dev = DEVICE_DT_GET(node_id),                                                \
+		.pm_constraints_size = DT_PROP_LEN(node_id, zephyr_disabling_power_states),   \
+		.constraints = PM_CONSTRAINTS_NAME(node_id),                                  \
+	},
+
+/**
+ * @brief Helper macro to initialize a pm state device constraint
+ */
+#define PM_STATE_DEVICE_CONSTRAINT_DEFINE(node_id)                                      \
+	COND_CODE_0(DT_NODE_HAS_PROP(node_id, zephyr_disabling_power_states), (),       \
+		(PM_STATE_DEVICE_CONSTRAINT_INIT(node_id)))
+
+static struct pm_state_device_constraint _devices_constraints[] = {
+	DT_FOREACH_STATUS_OKAY_NODE(PM_STATE_DEVICE_CONSTRAINT_DEFINE)
+};
+
+void pm_policy_device_power_lock_get(const struct device *dev)
+{
+#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
+	for (size_t i = 0; i < ARRAY_SIZE(_devices_constraints); i++) {
+		if (_devices_constraints[i].dev == dev) {
+			for (size_t j = 0; j < _devices_constraints[i].pm_constraints_size; j++) {
+				pm_policy_state_lock_get(
+						_devices_constraints[i].constraints[j].state,
+						_devices_constraints[i].constraints[j].substate_id);
+			}
+			break;
+		}
+	}
+#endif
+}
+
+void pm_policy_device_power_lock_put(const struct device *dev)
+{
+#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
+	for (size_t i = 0; i < ARRAY_SIZE(_devices_constraints); i++) {
+		if (_devices_constraints[i].dev == dev) {
+			for (size_t j = 0; j < _devices_constraints[i].pm_constraints_size; j++) {
+				pm_policy_state_lock_put(
+						_devices_constraints[i].constraints[j].state,
+						_devices_constraints[i].constraints[j].substate_id);
+			}
+			break;
+		}
+	}
+#endif
+}
diff --git a/subsys/pm/policy/policy_events.c b/subsys/pm/policy/policy_events.c
new file mode 100644
index 00000000000..dc06bffdf55
--- /dev/null
+++ b/subsys/pm/policy/policy_events.c
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2018 Intel Corporation.
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdint.h>
+
+#include <zephyr/kernel.h>
+#include <zephyr/pm/policy.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/sys/time_units.h>
+
+/** Lock to synchronize access to the events list. */
+static struct k_spinlock events_lock;
+/** List of events. */
+static sys_slist_t events_list;
+/** Pointer to Next Event. */
+struct pm_policy_event *next_event;
+
+/** @brief Update next event. */
+static void update_next_event(uint32_t cyc)
+{
+	int64_t new_next_event_cyc = -1;
+	struct pm_policy_event *evt;
+
+	/* unset the next event pointer */
+	next_event = NULL;
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&events_list, evt, node) {
+		uint64_t cyc_evt = evt->value_cyc;
+
+		/*
+		 * cyc value is a 32-bit rolling counter:
+		 *
+		 * |---------------->-----------------------|
+		 * 0               cyc                  UINT32_MAX
+		 *
+		 * Values from [0, cyc) are events happening later than
+		 * [cyc, UINT32_MAX], so pad [0, cyc) with UINT32_MAX + 1 to do
+		 * the comparison.
+		 */
+		if (cyc_evt < cyc) {
+			cyc_evt += (uint64_t)UINT32_MAX + 1U;
+		}
+
+		if ((new_next_event_cyc < 0) || (cyc_evt < new_next_event_cyc)) {
+			new_next_event_cyc = cyc_evt;
+			next_event = evt;
+		}
+	}
+}
+
+int32_t pm_policy_next_event_ticks(void)
+{
+	int32_t cyc_evt = -1;
+
+	if ((next_event) && (next_event->value_cyc > 0)) {
+		cyc_evt = next_event->value_cyc - k_cycle_get_32();
+		cyc_evt = MAX(0, cyc_evt);
+		BUILD_ASSERT(CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC >= CONFIG_SYS_CLOCK_TICKS_PER_SEC,
+			     "HW Cycles per sec should be greater that ticks per sec");
+		return k_cyc_to_ticks_floor32(cyc_evt);
+	}
+
+	return -1;
+}
+
+void pm_policy_event_register(struct pm_policy_event *evt, uint32_t time_us)
+{
+	k_spinlock_key_t key = k_spin_lock(&events_lock);
+	uint32_t cyc = k_cycle_get_32();
+
+	evt->value_cyc = cyc + k_us_to_cyc_ceil32(time_us);
+	sys_slist_append(&events_list, &evt->node);
+	update_next_event(cyc);
+
+	k_spin_unlock(&events_lock, key);
+}
+
+void pm_policy_event_update(struct pm_policy_event *evt, uint32_t cycle)
+{
+	k_spinlock_key_t key = k_spin_lock(&events_lock);
+
+	evt->value_cyc = cycle;
+	update_next_event(k_cycle_get_32());
+
+	k_spin_unlock(&events_lock, key);
+}
+
+void pm_policy_event_unregister(struct pm_policy_event *evt)
+{
+	k_spinlock_key_t key = k_spin_lock(&events_lock);
+
+	(void)sys_slist_find_and_remove(&events_list, &evt->node);
+	update_next_event(k_cycle_get_32());
+
+	k_spin_unlock(&events_lock, key);
+}
diff --git a/subsys/pm/policy/policy_latency.c b/subsys/pm/policy/policy_latency.c
new file mode 100644
index 00000000000..68e6ffcc5d5
--- /dev/null
+++ b/subsys/pm/policy/policy_latency.c
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2018 Intel Corporation.
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdint.h>
+
+#include <zephyr/pm/policy.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/sys/time_units.h>
+
+/** Lock to synchronize access to the latency request list. */
+static struct k_spinlock latency_lock;
+/** List of maximum latency requests. */
+static sys_slist_t latency_reqs;
+/** Maximum CPU latency in us */
+static int32_t max_latency_us = SYS_FOREVER_US;
+/** Maximum CPU latency in cycles */
+int32_t max_latency_cyc = -1;
+/** List of latency change subscribers. */
+static sys_slist_t latency_subs;
+
+/** @brief Update maximum allowed latency. */
+static void update_max_latency(void)
+{
+	int32_t new_max_latency_us = SYS_FOREVER_US;
+	struct pm_policy_latency_request *req;
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&latency_reqs, req, node) {
+		if ((new_max_latency_us == SYS_FOREVER_US) ||
+		    ((int32_t)req->value_us < new_max_latency_us)) {
+			new_max_latency_us = (int32_t)req->value_us;
+		}
+	}
+
+	if (max_latency_us != new_max_latency_us) {
+		struct pm_policy_latency_subscription *sreq;
+		int32_t new_max_latency_cyc = -1;
+
+		SYS_SLIST_FOR_EACH_CONTAINER(&latency_subs, sreq, node) {
+			sreq->cb(new_max_latency_us);
+		}
+
+		if (new_max_latency_us != SYS_FOREVER_US) {
+			new_max_latency_cyc = (int32_t)k_us_to_cyc_ceil32(new_max_latency_us);
+		}
+
+		max_latency_us = new_max_latency_us;
+		max_latency_cyc = new_max_latency_cyc;
+	}
+}
+
+void pm_policy_latency_request_add(struct pm_policy_latency_request *req,
+				   uint32_t value_us)
+{
+	req->value_us = value_us;
+
+	k_spinlock_key_t key = k_spin_lock(&latency_lock);
+
+	sys_slist_append(&latency_reqs, &req->node);
+	update_max_latency();
+
+	k_spin_unlock(&latency_lock, key);
+}
+
+void pm_policy_latency_request_update(struct pm_policy_latency_request *req,
+				      uint32_t value_us)
+{
+	k_spinlock_key_t key = k_spin_lock(&latency_lock);
+
+	req->value_us = value_us;
+	update_max_latency();
+
+	k_spin_unlock(&latency_lock, key);
+}
+
+void pm_policy_latency_request_remove(struct pm_policy_latency_request *req)
+{
+	k_spinlock_key_t key = k_spin_lock(&latency_lock);
+
+	(void)sys_slist_find_and_remove(&latency_reqs, &req->node);
+	update_max_latency();
+
+	k_spin_unlock(&latency_lock, key);
+}
+
+void pm_policy_latency_changed_subscribe(struct pm_policy_latency_subscription *req,
+					 pm_policy_latency_changed_cb_t cb)
+{
+	k_spinlock_key_t key = k_spin_lock(&latency_lock);
+
+	req->cb = cb;
+	sys_slist_append(&latency_subs, &req->node);
+
+	k_spin_unlock(&latency_lock, key);
+}
+
+void pm_policy_latency_changed_unsubscribe(struct pm_policy_latency_subscription *req)
+{
+	k_spinlock_key_t key = k_spin_lock(&latency_lock);
+
+	(void)sys_slist_find_and_remove(&latency_subs, &req->node);
+
+	k_spin_unlock(&latency_lock, key);
+}
diff --git a/subsys/pm/policy/policy_state_lock.c b/subsys/pm/policy/policy_state_lock.c
new file mode 100644
index 00000000000..3876b76c804
--- /dev/null
+++ b/subsys/pm/policy/policy_state_lock.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2018 Intel Corporation.
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/pm/policy.h>
+#include <zephyr/pm/state.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/toolchain.h>
+
+#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
+
+#define DT_SUB_LOCK_INIT(node_id)				\
+	{ .state = PM_STATE_DT_INIT(node_id),			\
+	  .substate_id = DT_PROP_OR(node_id, substate_id, 0),	\
+	  .lock = ATOMIC_INIT(0),				\
+	},
+
+/**
+ * State and substate lock structure.
+ *
+ * This struct is associating a reference counting to each <state,substate>
+ * couple to be used with the pm_policy_substate_lock_* functions.
+ *
+ * Operations on this array are in the order of O(n) with the number of power
+ * states and this is mostly due to the random nature of the substate value
+ * (that can be anything from a small integer value to a bitmask). We can
+ * probably do better with an hashmap.
+ */
+static struct {
+	enum pm_state state;
+	uint8_t substate_id;
+	atomic_t lock;
+} substate_lock_t[] = {
+	DT_FOREACH_STATUS_OKAY(zephyr_power_state, DT_SUB_LOCK_INIT)
+};
+
+#endif
+
+void pm_policy_state_lock_get(enum pm_state state, uint8_t substate_id)
+{
+#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
+	for (size_t i = 0; i < ARRAY_SIZE(substate_lock_t); i++) {
+		if (substate_lock_t[i].state == state &&
+		   (substate_lock_t[i].substate_id == substate_id ||
+		    substate_id == PM_ALL_SUBSTATES)) {
+			atomic_inc(&substate_lock_t[i].lock);
+		}
+	}
+#endif
+}
+
+void pm_policy_state_lock_put(enum pm_state state, uint8_t substate_id)
+{
+#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
+	for (size_t i = 0; i < ARRAY_SIZE(substate_lock_t); i++) {
+		if (substate_lock_t[i].state == state &&
+		   (substate_lock_t[i].substate_id == substate_id ||
+		    substate_id == PM_ALL_SUBSTATES)) {
+			atomic_t cnt = atomic_dec(&substate_lock_t[i].lock);
+
+			ARG_UNUSED(cnt);
+
+			__ASSERT(cnt >= 1, "Unbalanced state lock get/put");
+		}
+	}
+#endif
+}
+
+bool pm_policy_state_lock_is_active(enum pm_state state, uint8_t substate_id)
+{
+#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
+	for (size_t i = 0; i < ARRAY_SIZE(substate_lock_t); i++) {
+		if (substate_lock_t[i].state == state &&
+		   (substate_lock_t[i].substate_id == substate_id ||
+		    substate_id == PM_ALL_SUBSTATES)) {
+			return (atomic_get(&substate_lock_t[i].lock) != 0);
+		}
+	}
+#endif
+
+	return false;
+}

From 51d8e76bc280c175ce94469290c1fb7ee7c998bc Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Tue, 22 Oct 2024 16:07:52 +0200
Subject: [PATCH 0583/2913] [nrf fromtree] pm: policy: allow using latency API
 in standalone mode

This option allows using the pm_policy_latency* APIs to gather latency
requirements on systems that do not support PM (e.g. systems whithout
CPU idle states). Because the API has a subscription mechanism, it can
be useful to perform system-level adjustments based on latency
requirements gathered from multiple system components.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 578008cd472e6d091f2960ec9dc40c233329f372)
(cherry picked from commit 6d97e327aac0ba67f6fe6205a71f45606a6b4002)
---
 include/zephyr/pm/policy.h      | 129 ++++++++++++++++----------------
 subsys/pm/policy/CMakeLists.txt |   2 +
 subsys/pm/policy/Kconfig        |  10 +++
 3 files changed, 78 insertions(+), 63 deletions(-)

diff --git a/include/zephyr/pm/policy.h b/include/zephyr/pm/policy.h
index caba887805a..e1e910f3e0a 100644
--- a/include/zephyr/pm/policy.h
+++ b/include/zephyr/pm/policy.h
@@ -137,49 +137,6 @@ void pm_policy_state_lock_put(enum pm_state state, uint8_t substate_id);
  */
 bool pm_policy_state_lock_is_active(enum pm_state state, uint8_t substate_id);
 
-/**
- * @brief Add a new latency requirement.
- *
- * The system will not enter any power state that would make the system to
- * exceed the given latency value.
- *
- * @param req Latency request.
- * @param value_us Maximum allowed latency in microseconds.
- */
-void pm_policy_latency_request_add(struct pm_policy_latency_request *req,
-				   uint32_t value_us);
-
-/**
- * @brief Update a latency requirement.
- *
- * @param req Latency request.
- * @param value_us New maximum allowed latency in microseconds.
- */
-void pm_policy_latency_request_update(struct pm_policy_latency_request *req,
-				      uint32_t value_us);
-
-/**
- * @brief Remove a latency requirement.
- *
- * @param req Latency request.
- */
-void pm_policy_latency_request_remove(struct pm_policy_latency_request *req);
-
-/**
- * @brief Subscribe to maximum latency changes.
- *
- * @param req Subscription request.
- * @param cb Callback function (NULL to disable).
- */
-void pm_policy_latency_changed_subscribe(struct pm_policy_latency_subscription *req,
-					 pm_policy_latency_changed_cb_t cb);
-
-/**
- * @brief Unsubscribe to maximum latency changes.
- *
- * @param req Subscription request.
- */
-void pm_policy_latency_changed_unsubscribe(struct pm_policy_latency_subscription *req);
 
 /**
  * @brief Register an event.
@@ -277,26 +234,6 @@ static inline bool pm_policy_state_lock_is_active(enum pm_state state, uint8_t s
 	return false;
 }
 
-static inline void pm_policy_latency_request_add(
-	struct pm_policy_latency_request *req, uint32_t value_us)
-{
-	ARG_UNUSED(req);
-	ARG_UNUSED(value_us);
-}
-
-static inline void pm_policy_latency_request_update(
-	struct pm_policy_latency_request *req, uint32_t value_us)
-{
-	ARG_UNUSED(req);
-	ARG_UNUSED(value_us);
-}
-
-static inline void pm_policy_latency_request_remove(
-	struct pm_policy_latency_request *req)
-{
-	ARG_UNUSED(req);
-}
-
 static inline void pm_policy_event_register(struct pm_policy_event *evt, uint32_t cycle)
 {
 	ARG_UNUSED(evt);
@@ -331,6 +268,72 @@ static inline int32_t pm_policy_next_event_ticks(void)
 
 #endif /* CONFIG_PM */
 
+#if defined(CONFIG_PM) || defined(CONFIG_PM_POLICY_LATENCY_STANDALONE) || defined(__DOXYGEN__)
+/**
+ * @brief Add a new latency requirement.
+ *
+ * The system will not enter any power state that would make the system to
+ * exceed the given latency value.
+ *
+ * @param req Latency request.
+ * @param value_us Maximum allowed latency in microseconds.
+ */
+void pm_policy_latency_request_add(struct pm_policy_latency_request *req,
+				   uint32_t value_us);
+
+/**
+ * @brief Update a latency requirement.
+ *
+ * @param req Latency request.
+ * @param value_us New maximum allowed latency in microseconds.
+ */
+void pm_policy_latency_request_update(struct pm_policy_latency_request *req,
+				      uint32_t value_us);
+
+/**
+ * @brief Remove a latency requirement.
+ *
+ * @param req Latency request.
+ */
+void pm_policy_latency_request_remove(struct pm_policy_latency_request *req);
+
+/**
+ * @brief Subscribe to maximum latency changes.
+ *
+ * @param req Subscription request.
+ * @param cb Callback function (NULL to disable).
+ */
+void pm_policy_latency_changed_subscribe(struct pm_policy_latency_subscription *req,
+					 pm_policy_latency_changed_cb_t cb);
+
+/**
+ * @brief Unsubscribe to maximum latency changes.
+ *
+ * @param req Subscription request.
+ */
+void pm_policy_latency_changed_unsubscribe(struct pm_policy_latency_subscription *req);
+#else
+static inline void pm_policy_latency_request_add(
+	struct pm_policy_latency_request *req, uint32_t value_us)
+{
+	ARG_UNUSED(req);
+	ARG_UNUSED(value_us);
+}
+
+static inline void pm_policy_latency_request_update(
+	struct pm_policy_latency_request *req, uint32_t value_us)
+{
+	ARG_UNUSED(req);
+	ARG_UNUSED(value_us);
+}
+
+static inline void pm_policy_latency_request_remove(
+	struct pm_policy_latency_request *req)
+{
+	ARG_UNUSED(req);
+}
+#endif /* CONFIG_PM CONFIG_PM_POLICY_LATENCY_STANDALONE */
+
 /**
  * @}
  */
diff --git a/subsys/pm/policy/CMakeLists.txt b/subsys/pm/policy/CMakeLists.txt
index e9d7d791ec5..899e9f60b20 100644
--- a/subsys/pm/policy/CMakeLists.txt
+++ b/subsys/pm/policy/CMakeLists.txt
@@ -11,4 +11,6 @@ if(CONFIG_PM)
   if(CONFIG_PM_POLICY_DEFAULT)
     zephyr_library_sources(policy_default.c)
   endif()
+elseif(CONFIG_PM_POLICY_LATENCY_STANDALONE)
+  zephyr_library_sources(policy_latency.c)
 endif()
diff --git a/subsys/pm/policy/Kconfig b/subsys/pm/policy/Kconfig
index 2060c52cb13..1a224c4ecc7 100644
--- a/subsys/pm/policy/Kconfig
+++ b/subsys/pm/policy/Kconfig
@@ -32,3 +32,13 @@ config PM_POLICY_DEVICE_CONSTRAINTS
 	  it is needed by the device.
 
 endif # PM
+
+config PM_POLICY_LATENCY_STANDALONE
+	bool "Allow gathering latency requirements in standalone mode"
+	depends on !PM
+	help
+	  This option allows using the pm_policy_latency* APIs to gather latency
+	  requirements on systems that do not support PM (e.g. systems whithout
+	  CPU idle states). Because the API has a subscription mechanism, it can
+	  be useful to perform system-level adjustments based on latency
+	  requirements gathered from multiple system components.

From acc650623e552f2f561e8e89a02aafceeb80bf5e Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 4 Nov 2024 21:47:06 +0530
Subject: [PATCH 0584/2913] [nrf fromlist] manifest: hal_nordic: Pull logging
 level fix

Fix the noise during boot.

Upstream PR #: 80858

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 0d1bb86bc5943a11c53e3ef842a4f997164cdf6a)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index f2a65b025c9..7aec642cf8a 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: cb7600a1be4c8b177867e6d463729c07dd3f6d73
+      revision: 2d78179cc4f0601a891553132b13184fa51b6ef9
       path: modules/hal/nordic
       groups:
         - hal

From 6ef5dce7ea538848ee4fa0f265b8cfa818a1e3e1 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 4 Nov 2024 21:42:53 +0530
Subject: [PATCH 0585/2913] [nrf fromlist] drivers: nrfwifi: Add a NULL check
 for FMAC context

In case the driver UP fails, the FMAC context will be NULL, so, add a
NULL check in the DOWN.

Fixes a crash seen when working with unprogrammed OTP (no MAC) that
fails the interface UP.

Upstream PR #: 80858

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 0debaa0df79a6528c6b952155eaa6626136d4f8e)
---
 drivers/wifi/nrfwifi/src/net_if.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
index a4404cfb1a7..1a8b0c7361a 100644
--- a/drivers/wifi/nrfwifi/src/net_if.c
+++ b/drivers/wifi/nrfwifi/src/net_if.c
@@ -877,7 +877,7 @@ int nrf_wifi_if_stop_zep(const struct device *dev)
 	}
 
 	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
-	if (!rpu_ctx_zep) {
+	if (!rpu_ctx_zep || !rpu_ctx_zep->rpu_ctx) {
 		LOG_ERR("%s: rpu_ctx_zep is NULL",
 			__func__);
 		goto unlock;

From cdea08647bf0b46e6f115819c64dd1ef2073435b Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 4 Nov 2024 15:53:42 +0530
Subject: [PATCH 0586/2913] [nrf fromlist] drivers: nrfiwif: Enable recovery by
 default

This is needed to ensure Wi-Fi can always be used.

Upstream PR #: 80822

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit f2efee5e5f8eafd2438b36485bbab0f30588f1e6)
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 36935ed8ba1..7087e20beb6 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -661,6 +661,7 @@ config NRF_WIFI_AP_DEAD_DETECT_TIMEOUT
 config NRF_WIFI_RPU_RECOVERY
 	bool "RPU recovery mechanism"
 	depends on NRF_WIFI_LOW_POWER
+	default y
 	select EXPERIMENTAL
 	help
 		Enable RPU recovery mechanism to recover from RPU (nRF70) hang.

From 54bd7dcd3a0c344ca94531af2f043c09dccc367c Mon Sep 17 00:00:00 2001
From: Hongquan Li <hongquan.prog@gmail.com>
Date: Sun, 3 Nov 2024 14:23:25 +0800
Subject: [PATCH 0587/2913] [nrf fromlist] drivers/wifi/nrfwifi: Add buffer for
 discard bytes

Some spi drivers do not allow the send buffer
and receive buffer to be empty at the same time,
if this happens it will cause the spi to be unable
to communicate with the nrf7002, so add the receive
buffer for the discard byte in the spim_xfer_rx.

Fix #80686

Upstream PR #: 80787

Signed-off-by: Hongquan Li <hongquan.prog@gmail.com>
(cherry picked from commit e26e2a2bec50a85a42f81cb2fd23ec65a4f9c438)
---
 drivers/wifi/nrfwifi/src/qspi/src/spi_if.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/src/qspi/src/spi_if.c b/drivers/wifi/nrfwifi/src/qspi/src/spi_if.c
index 2cdf3662fd5..4bf9f464391 100644
--- a/drivers/wifi/nrfwifi/src/qspi/src/spi_if.c
+++ b/drivers/wifi/nrfwifi/src/qspi/src/spi_if.c
@@ -58,6 +58,7 @@ static int spim_xfer_rx(unsigned int addr, void *data, unsigned int len, unsigne
 		addr & 0xFF,
 		0 /* dummy byte */
 	};
+	uint8_t discard[sizeof(hdr) + 2 * 4];
 
 	const struct spi_buf tx_buf[] = {
 		{.buf = hdr,  .len = sizeof(hdr) },
@@ -67,12 +68,17 @@ static int spim_xfer_rx(unsigned int addr, void *data, unsigned int len, unsigne
 	const struct spi_buf_set tx = { .buffers = tx_buf, .count = 2 };
 
 	const struct spi_buf rx_buf[] = {
-		{.buf = NULL,  .len = sizeof(hdr) + discard_bytes},
+		{.buf = discard,  .len = sizeof(hdr) + discard_bytes},
 		{.buf = data, .len = len },
 	};
 
 	const struct spi_buf_set rx = { .buffers = rx_buf, .count = 2 };
 
+	if (rx_buf[0].len > sizeof(discard)) {
+		LOG_ERR("Discard bytes too large, please adjust buf size");
+		return -EINVAL;
+	}
+
 	return spi_transceive_dt(&spi_spec, &tx, &rx);
 }
 

From 6b120485b8e524dbfc6ac0273059b1a304341824 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 5 Nov 2024 02:52:17 +0530
Subject: [PATCH 0588/2913] [nrf fromlist] drivers: nrfwifi: Fix CSUM support

With introduction of Raw modes, nRF70 driver now advertises get_c
onfig OP, but doesn't implement all types.

This causes problems two-fold with checksum calculations:
  1. The "config" isn't uninitialized, so, every call returns differnet
     values. So, for UDP header checksum would be done and
     pkt->chksumdone would be set. But for IPv4 header checksum might be
     skipped.
  2. Even if we initialize to zero, then network stack gets all zeros
     and calculates checksum by itself rendering offload moot.

There is another problem in #1, as there is only single flag for pkt for
all checksum, nRF70 driver sees this and tells UMAC to skip checksum for
the entire packet. The design isn't coherent, and should be converted to
communicate per-type checksum status (some are filled by network stack
and some HW).

But as nRF70 support all checksum offloads, advertise all types for both
RX and TX.

Upstream PR #: 80882

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 3017425856235f492647bb088892ee97ad74833c)
---
 drivers/wifi/nrfwifi/src/net_if.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
index 1a8b0c7361a..19b232b6fe3 100644
--- a/drivers/wifi/nrfwifi/src/net_if.c
+++ b/drivers/wifi/nrfwifi/src/net_if.c
@@ -980,10 +980,23 @@ int nrf_wifi_if_get_config_zep(const struct device *dev,
 		goto unlock;
 	}
 
+	memset(config, 0, sizeof(struct ethernet_config));
+
 	if (type == ETHERNET_CONFIG_TYPE_TXINJECTION_MODE) {
 		config->txinjection_mode =
 			def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->txinjection_mode;
 	}
+#ifdef CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD
+	if (type  == ETHERNET_CONFIG_TYPE_TX_CHECKSUM_SUPPORT ||
+	    type == ETHERNET_CONFIG_TYPE_RX_CHECKSUM_SUPPORT) {
+		config->chksum_support = ETHERNET_CHECKSUM_SUPPORT_IPV4_HEADER |
+					 ETHERNET_CHECKSUM_SUPPORT_IPV4_ICMP |
+					 ETHERNET_CHECKSUM_SUPPORT_IPV6_HEADER |
+					 ETHERNET_CHECKSUM_SUPPORT_IPV6_ICMP |
+					 ETHERNET_CHECKSUM_SUPPORT_TCP |
+					 ETHERNET_CHECKSUM_SUPPORT_UDP;
+	}
+#endif
 	ret = 0;
 unlock:
 	k_mutex_unlock(&vif_ctx_zep->vif_lock);

From 5d0724fe93d14b44517ae7e83f7de4fc8fb889a9 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Mon, 4 Nov 2024 10:56:54 +0100
Subject: [PATCH 0589/2913] [nrf fromlist] soc: nordic: nrf54l: tune
 configuration of DCDC regulator

DCDC regulator on nRF54L may not always works as intended.
Tune the fix addressing that.

Upstream PR #: 80635

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 9ee72ff9751e3ef0183c9f9e9896bd4b474fa350)
---
 soc/nordic/nrf54l/soc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index 2098b7f87df..65f6cc183ce 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -155,8 +155,8 @@ static inline void power_and_clock_configuration(void)
 
 #if (DT_PROP(DT_NODELABEL(vregmain), regulator_initial_mode) == NRF5X_REG_MODE_DCDC)
 #if defined(__CORTEX_M) && !defined(NRF_TRUSTZONE_NONSECURE) && defined(__ARM_FEATURE_CMSE)
-	if (*(uint32_t *)0x00FFC334 <= 0x180A1D00) {
-		*(uint32_t *)0x50120640 = 0x1FAAE85C;
+	if (*(uint32_t volatile *)0x00FFC334 <= 0x180A1D00) {
+		*(uint32_t volatile *)0x50120640 = 0x1EA9E040;
 	}
 #endif
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);

From bbc43a302df9df02bb4bec275b2168edaa5cfa54 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 6 Nov 2024 02:14:53 +0530
Subject: [PATCH 0590/2913] [nrf fromlist] drivers: nrfwifi: WAR for
 performance regression

With the newly introduced settling time for PLLS, we are seeing a peak
performance drop of 3Mbps in Zperf benchmarks, and also other
performance tests are also impacted.

This settling time was introduced based on observations in lab and not
because of any real problem or bug reported, so, for now, use zero
settling time (same as earlier) till we fully investigate and understand
the impacts and need.

Fixes #80951.

Upstream PR #: 80952

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit d9bec0654e9ed31c981d963c91494c351f10d0c8)
---
 drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c b/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c
index 46c92def8f7..754fe149713 100644
--- a/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c
+++ b/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c
@@ -125,7 +125,10 @@ BUILD_ASSERT(QSPI_IF_DEVICE_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 16),
  * starts. It was measured with a logic analyzer (unfortunately, the nRF5340
  * specification does not provide any numbers in this regard).
  */
-#define BASE_CLOCK_SWITCH_DELAY_US 7
+/* FIXME: This has adverse impact on performance, ~3Mbps, so, for now, it is
+ * disabled till further investigation.
+ */
+#define BASE_CLOCK_SWITCH_DELAY_US 0
 
 #else
 /*

From ea682c0c51a4e195686a75da7fb902d3ca7b592d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 6 Nov 2024 08:05:22 +0100
Subject: [PATCH 0591/2913] [nrf fromlist] drivers: serial: nrfx_uarte: Fix RX
 path without low power modes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

RX FIFO flushing on RXTO event should only be performed when
UARTE peripheral might be disable during inactivity and that
happens when low power modes is enabled or when device runtime
PM is used. Flushing was incrementing flush_cnt which was not
used (flushed data is not copied to the next buffer) which
was causing data loss and invalid RX data length reporting.

Upstream PR #: 80968

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit b27ed6f1c4b1833d2479068581fcc0f8f3213392)
---
 drivers/serial/uart_nrfx_uarte.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 5c19485946c..2fb2ab3537e 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -1516,7 +1516,7 @@ static void rxto_isr(const struct device *dev)
 			async_rx->total_user_byte_cnt += rx_flush(dev);
 		}
 #endif
-	} else {
+	} else if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || LOW_POWER_ENABLED(config)) {
 		async_rx->flush_cnt = rx_flush(dev);
 	}
 

From d200a119c745723cad4cd61d6c06e3a6b4206820 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 31 Oct 2024 12:48:35 +0100
Subject: [PATCH 0592/2913] [nrf fromlist] drivers: timer: grtc: Add LFPRC as
 the source of GRTC

This commit allows to switch the GRTC clock source to an RC oscillator.

Upstream PR #: 80622

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 822bd4f6d37746bc9b060e1d5d24327d4cf73ae1)
---
 drivers/timer/nrf_grtc_timer.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/timer/nrf_grtc_timer.c b/drivers/timer/nrf_grtc_timer.c
index fb9c859caeb..ee3f35e09d0 100644
--- a/drivers/timer/nrf_grtc_timer.c
+++ b/drivers/timer/nrf_grtc_timer.c
@@ -426,8 +426,12 @@ int z_nrf_grtc_wakeup_prepare(uint64_t wake_time_us)
 		nrfy_grtc_timeout_get(NRF_GRTC) * CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC / 32768 +
 		MAX_CC_LATCH_WAIT_TIME_US;
 	k_busy_wait(wait_time);
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lfxo)) && NRF_GRTC_HAS_CLKSEL
+#if NRF_GRTC_HAS_CLKSEL
+#if defined(CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC)
+	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFLPRC);
+#elif DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lfxo))
 	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFXO);
+#endif
 #endif
 	k_spin_unlock(&lock, key);
 	return 0;
@@ -501,11 +505,15 @@ static int sys_clock_driver_init(void)
 	z_nrf_clock_control_lf_on(mode);
 #endif
 
-#if defined(CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT) &&                                             \
-	DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lfxo)) && NRF_GRTC_HAS_CLKSEL
+#if defined(CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT) && NRF_GRTC_HAS_CLKSEL
+#if defined(CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC)
+	/* Switch to LFPRC as the low-frequency clock source. */
+	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFLPRC);
+#elif DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lfxo))
 	/* Switch to LFXO as the low-frequency clock source. */
 	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFXO);
 #endif
+#endif
 
 #if defined(CONFIG_NRF_GRTC_ALWAYS_ON)
 	nrfx_grtc_active_request_set(true);

From 625f08237074e17dbdcf8d24f4f8223f8bc87b6f Mon Sep 17 00:00:00 2001
From: Sean Madigan <sean.madigan@nordicsemi.no>
Date: Tue, 15 Oct 2024 16:19:00 +0100
Subject: [PATCH 0593/2913] [nrf fromtree] soc: nordic: nrf53:
 SOC_NRF53_CPUNET_ENABLE should not depend on !BT

The previous changes in
https://github.com/zephyrproject-rtos/zephyr/pull/74304
assumed that because this is also handled in
`bt_hci_transport_setup` that it shouldn't be done on
initialisation too.

However, if someone wants to develop their own app which
uses BT and also wants to enable the CPUNET by default this
KConfig should be available to them.

Signed-off-by: Sean Madigan <sean.madigan@nordicsemi.no>
(cherry picked from commit e4fa386882269c34cdbaca1ae874de46e2b8aca6)
(cherry picked from commit 91e394a6321c8dae05131e704b7c8c0fd570f31f)
---
 soc/nordic/nrf53/Kconfig | 2 --
 1 file changed, 2 deletions(-)

diff --git a/soc/nordic/nrf53/Kconfig b/soc/nordic/nrf53/Kconfig
index 6527509a1f8..823d1be8e2d 100644
--- a/soc/nordic/nrf53/Kconfig
+++ b/soc/nordic/nrf53/Kconfig
@@ -197,7 +197,6 @@ config SOC_NRF53_CPUNET_MGMT
 
 config SOC_NRF53_CPUNET_ENABLE
 	bool "NRF53 Network MCU is enabled at boot time"
-	depends on !BT
 	default y if NRF_802154_SER_HOST
 	select SOC_NRF53_CPUNET_MGMT
 	help
@@ -215,7 +214,6 @@ config BOARD_ENABLE_CPUNET
 	bool "[DEPRECATED] NRF53 Network MCU is enabled at boot time"
 	select SOC_NRF53_CPUNET_ENABLE
 	select DEPRECATED
-	depends on !BT
 	help
 	  Use SOC_NRF53_CPUNET_ENABLE instead.
 

From 0127206ce0dcbd4271cf24d82abe1188a39c1a7e Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Wed, 16 Oct 2024 21:48:17 +0200
Subject: [PATCH 0594/2913] [nrf fromtree] boards: nordic: nrf54l15dk: Fix
 references to pdk

A bunch of copy-paste mistakes when adding the nRF54L15 DK added stale
references to the Preview DK (PDK).

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit c85e418edab51101c39a65e28af24fae1d16ca3b)
(cherry picked from commit 8d25ca20b5c39fc84051535cdcf7e8c47c295544)
---
 boards/nordic/nrf54l15dk/doc/index.rst                          | 2 +-
 ...pdk_nrf54l15_common.dtsi => nrf54l15dk_nrf54l15_common.dtsi} | 0
 tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 2 +-
 .../boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay  | 2 +-
 .../boards/nrf54l15bsim_nrf54l15_cpuapp.overlay                 | 2 +-
 ...f54l15_cpuapp.overlay => nrf54l15dk_nrf54l15_cpuapp.overlay} | 0
 tests/drivers/spi/spi_controller_peripheral/README.txt          | 2 +-
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename tests/boards/nrf/qdec/boards/{nrf54l15pdk_nrf54l15_common.dtsi => nrf54l15dk_nrf54l15_common.dtsi} (100%)
 rename tests/drivers/counter/counter_basic_api/boards/{nrf54l15pdk_nrf54l15_cpuapp.overlay => nrf54l15dk_nrf54l15_cpuapp.overlay} (100%)

diff --git a/boards/nordic/nrf54l15dk/doc/index.rst b/boards/nordic/nrf54l15dk/doc/index.rst
index f7b927bdc86..4886cadde76 100644
--- a/boards/nordic/nrf54l15dk/doc/index.rst
+++ b/boards/nordic/nrf54l15dk/doc/index.rst
@@ -101,7 +101,7 @@ to be built as multicore configuration with code snippet called ``vpr_launcher``
 for the application core.
 
 Enter the following command to compile ``hello_world`` for the FLPR core::
- west build -p -b nrf54l15pdk/nrf54l15/cpuflpr --sysbuild -- -DSB_VPR_LAUNCHER=y
+ west build -p -b nrf54l15dk/nrf54l15/cpuflpr --sysbuild -- -DSB_VPR_LAUNCHER=y
 
 Flashing
 ========
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_common.dtsi
similarity index 100%
rename from tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi
rename to tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_common.dtsi
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index dc39be6deb3..65d42ec4086 100644
--- a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "nrf54l15pdk_nrf54l15_common.dtsi"
+#include "nrf54l15dk_nrf54l15_common.dtsi"
 
 /* To prevent enabling console receiver. */
 &uart20 {
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
index 059222c801b..76038a2fa01 100644
--- a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "nrf54l15pdk_nrf54l15_common.dtsi"
+#include "nrf54l15dk_nrf54l15_common.dtsi"
 
 /* To prevent enabling console receiver. */
 &uart30 {
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
index b1942e1f84f..e26399cd4c4 100644
--- a/tests/drivers/counter/counter_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/counter/counter_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
@@ -1 +1 @@
-#include "nrf54l15pdk_nrf54l15_cpuapp.overlay"
+#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/drivers/counter/counter_basic_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
rename to tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/spi/spi_controller_peripheral/README.txt b/tests/drivers/spi/spi_controller_peripheral/README.txt
index 3098b50d0f4..5d04e8da4f9 100644
--- a/tests/drivers/spi/spi_controller_peripheral/README.txt
+++ b/tests/drivers/spi/spi_controller_peripheral/README.txt
@@ -2,7 +2,7 @@ In this test suite two instances of the SPI peripheral are connected together.
 One SPI instance works as a controller, second one is configured as a peripheral.
 In each test, both instances get identical configuration (CPOL, CPHA, bitrate, etc.).
 
-Four GPIO loopbacks are required (see overlay for nrf54l15pdk for reference):
+Four GPIO loopbacks are required (see overlay for nrf54l15dk for reference):
 1. spi22-SPIM_SCK connected with spi21-SPIS_SCK,
 2. spi22-SPIM_MISO connected with spi21-SPIS_MISO,
 3. spi22-SPIM_MOSI connected with spi21-SPIS_MOSI,

From 05a00eeb72ceeb67bf8ab728c4a5b81a6f562f46 Mon Sep 17 00:00:00 2001
From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
Date: Mon, 30 Sep 2024 13:22:27 +0300
Subject: [PATCH 0595/2913] [nrf fromtree] dts: bindings: power-domain: add
 binding for NXP's SCU-managed PDs

Add DT binding for NXP's SCU-managed PDs. This binding describes
exactly _one_ power domain.

Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
(cherry picked from commit fb84f4f53f34f33a90578c9e0855366814eab0b9)
(cherry picked from commit 2463da2dd74dc4e0d60de48fae61764aae938c5c)
---
 dts/bindings/power-domain/nxp,scu-pd.yaml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 dts/bindings/power-domain/nxp,scu-pd.yaml

diff --git a/dts/bindings/power-domain/nxp,scu-pd.yaml b/dts/bindings/power-domain/nxp,scu-pd.yaml
new file mode 100644
index 00000000000..7e1d0855389
--- /dev/null
+++ b/dts/bindings/power-domain/nxp,scu-pd.yaml
@@ -0,0 +1,17 @@
+# Copyright 2024 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+description: NXP SCU-managed power domain
+
+compatible: "nxp,scu-pd"
+
+include: power-domain.yaml
+
+properties:
+  nxp,resource-id:
+    type: int
+    required: true
+    description:
+      Number used by the firmware running on the SCU to identify
+      the resource on which the PD-related operations are to be
+      performed.

From 2fc4b357feedbf7643255de5c3b67398a7adfc86 Mon Sep 17 00:00:00 2001
From: Grzegorz Bernat <grzegorzx.bernat@intel.com>
Date: Mon, 23 Sep 2024 13:14:55 +0200
Subject: [PATCH 0596/2913] [nrf fromtree] soc: intel: renamed soc from
 ace30_ptl to ace30

Renamed soc from ace30_ptl to ace30.
We were previously using the wrong soc name.
The correct name is ace30.

There is only one ptl platform, but there can be several ace30 platforms.

Signed-off-by: Grzegorz Bernat <grzegorzx.bernat@intel.com>
(cherry picked from commit a654bfbdfa002ac5ab32d8593d762f5ef3dc4868)
(cherry picked from commit b2f577cd153fb35b4755255d99a6da876d217699)
---
 boards/intel/adsp/Kconfig.intel_adsp          |   4 +-
 boards/intel/adsp/board.yml                   |   6 +-
 boards/intel/adsp/intel_adsp_ace30_defconfig  |  12 +
 boards/intel/adsp/intel_adsp_ace30_ptl.yaml   |   2 +-
 .../intel/adsp/intel_adsp_ace30_ptl_sim.yaml  |   2 +-
 drivers/dai/intel/dmic/dmic.c                 |  14 +-
 drivers/dai/intel/dmic/dmic.h                 |   2 +-
 drivers/dai/intel/dmic/dmic_nhlt.c            |   4 +-
 drivers/dai/intel/ssp/dai-params-intel-ipc4.h |   2 +-
 drivers/dai/intel/ssp/ssp.c                   |  30 +-
 drivers/dai/intel/ssp/ssp.h                   |   4 +-
 drivers/dma/dma_intel_adsp_hda.c              |   2 +-
 dts/xtensa/intel/intel_adsp_ace30.dtsi        | 682 ++++++++++++++++++
 soc/intel/intel_adsp/ace/CMakeLists.txt       |   2 +-
 ...nfig.ace30_ptl => Kconfig.defconfig.ace30} |   2 +-
 soc/intel/intel_adsp/ace/Kconfig.soc          |   6 +-
 .../include/{ace30_ptl => ace30}/adsp_boot.h  |   0
 .../{ace30_ptl => ace30}/adsp_interrupt.h     |   0
 .../{ace30_ptl => ace30}/adsp_ipc_regs.h      |   0
 .../include/{ace30_ptl => ace30}/adsp_power.h |   0
 .../include/{ace30_ptl => ace30}/adsp_shim.h  |   0
 .../{ace30_ptl => ace30}/dmic_regs_ace3x.h    |   0
 soc/intel/intel_adsp/ace/include/dmic_regs.h  |   4 +-
 soc/intel/intel_adsp/common/clk.c             |   2 +-
 soc/intel/intel_adsp/soc.yml                  |   2 +-
 ...p_ace30_ptl.conf => intel_adsp_ace30.conf} |   0
 ...p_ace30_ptl.conf => intel_adsp_ace30.conf} |   0
 ...p_ace30_ptl.conf => intel_adsp_ace30.conf} |   0
 ...p_ace30_ptl.conf => intel_adsp_ace30.conf} |   0
 29 files changed, 740 insertions(+), 44 deletions(-)
 create mode 100644 boards/intel/adsp/intel_adsp_ace30_defconfig
 create mode 100644 dts/xtensa/intel/intel_adsp_ace30.dtsi
 rename soc/intel/intel_adsp/ace/{Kconfig.defconfig.ace30_ptl => Kconfig.defconfig.ace30} (96%)
 rename soc/intel/intel_adsp/ace/include/{ace30_ptl => ace30}/adsp_boot.h (100%)
 rename soc/intel/intel_adsp/ace/include/{ace30_ptl => ace30}/adsp_interrupt.h (100%)
 rename soc/intel/intel_adsp/ace/include/{ace30_ptl => ace30}/adsp_ipc_regs.h (100%)
 rename soc/intel/intel_adsp/ace/include/{ace30_ptl => ace30}/adsp_power.h (100%)
 rename soc/intel/intel_adsp/ace/include/{ace30_ptl => ace30}/adsp_shim.h (100%)
 rename soc/intel/intel_adsp/ace/include/{ace30_ptl => ace30}/dmic_regs_ace3x.h (100%)
 rename tests/kernel/mem_protect/sys_sem/boards/{intel_adsp_ace30_ptl.conf => intel_adsp_ace30.conf} (100%)
 rename tests/kernel/mutex/sys_mutex/boards/{intel_adsp_ace30_ptl.conf => intel_adsp_ace30.conf} (100%)
 rename tests/kernel/queue/boards/{intel_adsp_ace30_ptl.conf => intel_adsp_ace30.conf} (100%)
 rename tests/lib/c_lib/thrd/boards/{intel_adsp_ace30_ptl.conf => intel_adsp_ace30.conf} (100%)

diff --git a/boards/intel/adsp/Kconfig.intel_adsp b/boards/intel/adsp/Kconfig.intel_adsp
index 67c3989fe32..225a2747ad5 100644
--- a/boards/intel/adsp/Kconfig.intel_adsp
+++ b/boards/intel/adsp/Kconfig.intel_adsp
@@ -8,5 +8,5 @@ config BOARD_INTEL_ADSP
 	select SOC_INTEL_ACE15_MTPM if BOARD_INTEL_ADSP_ACE15_MTPM_SIM
 	select SOC_INTEL_ACE20_LNL if BOARD_INTEL_ADSP_ACE20_LNL
 	select SOC_INTEL_ACE20_LNL if BOARD_INTEL_ADSP_ACE20_LNL_SIM
-	select SOC_INTEL_ACE30_PTL if BOARD_INTEL_ADSP_ACE30_PTL
-	select SOC_INTEL_ACE30_PTL if BOARD_INTEL_ADSP_ACE30_PTL_SIM
+	select SOC_INTEL_ACE30 if BOARD_INTEL_ADSP_ACE30_PTL
+	select SOC_INTEL_ACE30 if BOARD_INTEL_ADSP_ACE30_PTL_SIM
diff --git a/boards/intel/adsp/board.yml b/boards/intel/adsp/board.yml
index 5eadeb4fe1a..43004e8f2a4 100644
--- a/boards/intel/adsp/board.yml
+++ b/boards/intel/adsp/board.yml
@@ -11,6 +11,8 @@ boards:
       - name: ace20_lnl
         variants:
           - name: 'sim'
-      - name: ace30_ptl
+      - name: ace30
         variants:
-          - name: 'sim'
+          - name: 'ptl'
+            variants:
+              - name: 'sim'
diff --git a/boards/intel/adsp/intel_adsp_ace30_defconfig b/boards/intel/adsp/intel_adsp_ace30_defconfig
new file mode 100644
index 00000000000..913d2a8c3e3
--- /dev/null
+++ b/boards/intel/adsp/intel_adsp_ace30_defconfig
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_MAIN_STACK_SIZE=4096
+
+CONFIG_GEN_ISR_TABLES=y
+CONFIG_GEN_IRQ_VECTOR_TABLE=n
+
+CONFIG_BUILD_OUTPUT_BIN=n
+
+CONFIG_DAI_SSP_HAS_POWER_CONTROL=y
+
+CONFIG_DCACHE_LINE_SIZE=64
diff --git a/boards/intel/adsp/intel_adsp_ace30_ptl.yaml b/boards/intel/adsp/intel_adsp_ace30_ptl.yaml
index bdfe837bd08..061ac9cd742 100644
--- a/boards/intel/adsp/intel_adsp_ace30_ptl.yaml
+++ b/boards/intel/adsp/intel_adsp_ace30_ptl.yaml
@@ -1,4 +1,4 @@
-identifier: intel_adsp/ace30_ptl
+identifier: intel_adsp/ace30/ptl
 name: ACE 3.0 Panther Lake Audio DSP
 type: mcu
 arch: xtensa
diff --git a/boards/intel/adsp/intel_adsp_ace30_ptl_sim.yaml b/boards/intel/adsp/intel_adsp_ace30_ptl_sim.yaml
index 3bf48d4c383..42b07e49ee3 100644
--- a/boards/intel/adsp/intel_adsp_ace30_ptl_sim.yaml
+++ b/boards/intel/adsp/intel_adsp_ace30_ptl_sim.yaml
@@ -1,4 +1,4 @@
-identifier: intel_adsp/ace30_ptl/sim
+identifier: intel_adsp/ace30/ptl/sim
 name: ACE 3.0 Panther Lake Audio DSP
 type: sim
 simulation: custom
diff --git a/drivers/dai/intel/dmic/dmic.c b/drivers/dai/intel/dmic/dmic.c
index b0d44d4da55..e528e96f38d 100644
--- a/drivers/dai/intel/dmic/dmic.c
+++ b/drivers/dai/intel/dmic/dmic.c
@@ -160,7 +160,7 @@ static inline void dai_dmic_release_ownership(const struct dai_intel_dmic *dmic)
 
 static inline uint32_t dai_dmic_base(const struct dai_intel_dmic *dmic)
 {
-#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30_PTL)
+#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30)
 	return dmic->hdamldmic_base;
 #else
 	return dmic->shim_base;
@@ -173,7 +173,7 @@ static inline void dai_dmic_set_sync_period(uint32_t period, const struct dai_in
 	uint32_t val = CONFIG_DAI_DMIC_HW_IOCLK / period - 1;
 	uint32_t base = dai_dmic_base(dmic);
 	/* DMIC Change sync period */
-#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30_PTL)
+#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30)
 	sys_write32(sys_read32(base + DMICSYNC_OFFSET) | FIELD_PREP(DMICSYNC_SYNCPRD, val),
 		    base + DMICSYNC_OFFSET);
 	sys_write32(sys_read32(base + DMICSYNC_OFFSET) | DMICSYNC_SYNCPU,
@@ -287,7 +287,7 @@ static void dai_dmic_irq_handler(const void *data)
 static inline void dai_dmic_dis_clk_gating(const struct dai_intel_dmic *dmic)
 {
 	/* Disable DMIC clock gating */
-#if (CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30_PTL)
+#if (CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30)
 	sys_write32((sys_read32(dmic->vshim_base + DMICLVSCTL_OFFSET) | DMICLVSCTL_DCGD),
 		    dmic->vshim_base + DMICLVSCTL_OFFSET);
 #else
@@ -299,7 +299,7 @@ static inline void dai_dmic_dis_clk_gating(const struct dai_intel_dmic *dmic)
 static inline void dai_dmic_en_clk_gating(const struct dai_intel_dmic *dmic)
 {
 	/* Enable DMIC clock gating */
-#if (CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30_PTL)
+#if (CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30)
 	sys_write32((sys_read32(dmic->vshim_base + DMICLVSCTL_OFFSET) & ~DMICLVSCTL_DCGD),
 		    dmic->vshim_base + DMICLVSCTL_OFFSET);
 #else /* All other CAVS and ACE platforms */
@@ -313,7 +313,7 @@ static inline void dai_dmic_program_channel_map(const struct dai_intel_dmic *dmi
 						const struct dai_config *cfg,
 						uint32_t index)
 {
-#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30_PTL)
+#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30)
 	uint16_t pcmsycm = cfg->link_config;
 	uint32_t reg_add = dmic->shim_base + DMICXPCMSyCM_OFFSET + 0x0004*index;
 
@@ -322,7 +322,7 @@ static inline void dai_dmic_program_channel_map(const struct dai_intel_dmic *dmi
 	ARG_UNUSED(dmic);
 	ARG_UNUSED(cfg);
 	ARG_UNUSED(index);
-#endif /* defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30_PTL) */
+#endif /* defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30) */
 }
 
 static inline void dai_dmic_en_power(const struct dai_intel_dmic *dmic)
@@ -332,7 +332,7 @@ static inline void dai_dmic_en_power(const struct dai_intel_dmic *dmic)
 	sys_write32((sys_read32(base + DMICLCTL_OFFSET) | DMICLCTL_SPA),
 			base + DMICLCTL_OFFSET);
 
-#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30_PTL)
+#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30)
 	while (!(sys_read32(base + DMICLCTL_OFFSET) & DMICLCTL_CPA)) {
 		k_sleep(K_USEC(100));
 	}
diff --git a/drivers/dai/intel/dmic/dmic.h b/drivers/dai/intel/dmic/dmic.h
index c507ec1c0ee..9b7d8c03ea8 100644
--- a/drivers/dai/intel/dmic/dmic.h
+++ b/drivers/dai/intel/dmic/dmic.h
@@ -173,7 +173,7 @@ struct dai_intel_dmic {
 	/* hardware parameters */
 	uint32_t reg_base;
 	uint32_t shim_base;
-#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30_PTL)
+#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30)
 	uint32_t hdamldmic_base;
 	uint32_t vshim_base;
 #endif
diff --git a/drivers/dai/intel/dmic/dmic_nhlt.c b/drivers/dai/intel/dmic/dmic_nhlt.c
index f71b0d47f2f..d041ef438ce 100644
--- a/drivers/dai/intel/dmic/dmic_nhlt.c
+++ b/drivers/dai/intel/dmic/dmic_nhlt.c
@@ -282,7 +282,7 @@ static int dai_nhlt_dmic_dai_params_get(struct dai_intel_dmic *dmic, const int c
 static inline void dai_dmic_clock_select_set(const struct dai_intel_dmic *dmic, uint32_t source)
 {
 	uint32_t val;
-#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30_PTL) /* ACE 2.0,3.0 */
+#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30) /* ACE 2.0,3.0 */
 	val = sys_read32(dmic->vshim_base + DMICLVSCTL_OFFSET);
 	val &= ~DMICLVSCTL_MLCS;
 	val |= FIELD_PREP(DMICLVSCTL_MLCS, source);
@@ -303,7 +303,7 @@ static inline void dai_dmic_clock_select_set(const struct dai_intel_dmic *dmic,
 static inline uint32_t dai_dmic_clock_select_get(const struct dai_intel_dmic *dmic)
 {
 	uint32_t val;
-#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30_PTL) /* ACE 2.0,3.0 */
+#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30) /* ACE 2.0,3.0 */
 	val = sys_read32(dmic->vshim_base + DMICLVSCTL_OFFSET);
 	return FIELD_GET(DMICLVSCTL_MLCS, val);
 #else
diff --git a/drivers/dai/intel/ssp/dai-params-intel-ipc4.h b/drivers/dai/intel/ssp/dai-params-intel-ipc4.h
index 6d078cd0941..46acee049ce 100644
--- a/drivers/dai/intel/ssp/dai-params-intel-ipc4.h
+++ b/drivers/dai/intel/ssp/dai-params-intel-ipc4.h
@@ -269,7 +269,7 @@ struct dai_intel_ipc4_ssp_mclk_config_2 {
 } __packed;
 
 struct dai_intel_ipc4_ssp_driver_config {
-#ifdef CONFIG_SOC_INTEL_ACE30_PTL
+#ifdef CONFIG_SOC_INTEL_ACE30
 	struct dai_intel_ipc4_ssp_config_ver_3_0 i2s_config;
 #else
 	struct dai_intel_ipc4_ssp_config i2s_config;
diff --git a/drivers/dai/intel/ssp/ssp.c b/drivers/dai/intel/ssp/ssp.c
index 58ab0c10170..218f3c33162 100644
--- a/drivers/dai/intel/ssp/ssp.c
+++ b/drivers/dai/intel/ssp/ssp.c
@@ -800,7 +800,7 @@ static void dai_ssp_pm_runtime_en_ssp_power(struct dai_intel_ssp *dp, uint32_t s
 	ret = dai_ssp_poll_for_register_delay(dai_ip_base(dp) + I2SLCTL_OFFSET,
 					      I2SLCTL_CPA(ssp_index), I2SLCTL_CPA(ssp_index),
 					      DAI_INTEL_SSP_MAX_SEND_TIME_PER_SAMPLE);
-#elif CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30_PTL
+#elif CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30
 	sys_write32(sys_read32(dai_hdamlssp_base(dp) + I2SLCTL_OFFSET) |
 			       I2SLCTL_SPA(ssp_index),
 			       dai_hdamlssp_base(dp) + I2SLCTL_OFFSET);
@@ -835,7 +835,7 @@ static void dai_ssp_pm_runtime_dis_ssp_power(struct dai_intel_ssp *dp, uint32_t
 					      I2SLCTL_CPA(ssp_index), 0,
 					      DAI_INTEL_SSP_MAX_SEND_TIME_PER_SAMPLE);
 
-#elif CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30_PTL
+#elif CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30
 	sys_write32(sys_read32(dai_hdamlssp_base(dp) + I2SLCTL_OFFSET) & (~I2SLCTL_SPA(ssp_index)),
 			dai_hdamlssp_base(dp) + I2SLCTL_OFFSET);
 
@@ -873,7 +873,7 @@ static void dai_ssp_program_channel_map(struct dai_intel_ssp *dp,
 		/* Program HDA input stream parameters */
 		sys_write16((pcmsycm & 0xffff), reg_add);
 	}
-#elif defined(CONFIG_SOC_INTEL_ACE30_PTL)
+#elif defined(CONFIG_SOC_INTEL_ACE30)
 	const struct dai_intel_ipc4_ssp_configuration_blob_ver_3_0 *blob30 = spec_config;
 	const struct dai_intel_ipc4_ssp_configuration_blob *blob = spec_config;
 	uint64_t time_slot_map = 0;
@@ -930,7 +930,7 @@ static void dai_ssp_empty_tx_fifo(struct dai_intel_ssp *dp)
 	 * SSSR_TNF is cleared when TX FIFO is empty or full,
 	 * so wait for set TNF then for TFL zero - order matter.
 	 */
-#ifdef CONFIG_SOC_INTEL_ACE30_PTL
+#ifdef CONFIG_SOC_INTEL_ACE30
 	ret = dai_ssp_poll_for_register_delay(dai_base(dp) + SSMODyCS(dp->tdm_slot_group),
 							SSMODyCS_TNF, SSMODyCS_TNF,
 							DAI_INTEL_SSP_MAX_SEND_TIME_PER_SAMPLE);
@@ -959,7 +959,7 @@ static void dai_ssp_empty_tx_fifo(struct dai_intel_ssp *dp)
 	}
 }
 
-#ifdef CONFIG_SOC_INTEL_ACE30_PTL
+#ifdef CONFIG_SOC_INTEL_ACE30
 static void ssp_empty_rx_fifo_on_start(struct dai_intel_ssp *dp)
 {
 	uint32_t retry = DAI_INTEL_SSP_RX_FLUSH_RETRY_MAX;
@@ -1191,7 +1191,7 @@ static int dai_ssp_bclk_prepare_enable(struct dai_intel_ssp *dp)
 	mdiv = ft[DAI_INTEL_SSP_DEFAULT_IDX].freq / ssp_plat_data->params.bclk_rate;
 #endif
 
-#ifndef CONFIG_SOC_INTEL_ACE30_PTL
+#ifndef CONFIG_SOC_INTEL_ACE30
 	if (need_ecs) {
 		sscr0 |= SSCR0_ECS;
 	}
@@ -1724,7 +1724,7 @@ static int dai_ssp_set_config_tplg(struct dai_intel_ssp *dp, const struct dai_co
 	sys_write32(sspsp2, dai_base(dp) + SSPSP2);
 	sys_write32(ssioc, dai_base(dp) + SSIOC);
 	sys_write32(ssto, dai_base(dp) + SSTO);
-#ifdef CONFIG_SOC_INTEL_ACE30_PTL
+#ifdef CONFIG_SOC_INTEL_ACE30
 	for (uint32_t idx = 0; idx < I2SIPCMC; ++idx) {
 		sys_write64(sstsa, dai_base(dp) + SSMODyTSA(idx));
 	}
@@ -1777,7 +1777,7 @@ static int dai_ssp_set_config_tplg(struct dai_intel_ssp *dp, const struct dai_co
 			ssp_plat_data->clk_active |= SSP_CLK_BCLK_ES_REQ;
 
 			if (enable_sse) {
-#ifdef CONFIG_SOC_INTEL_ACE30_PTL
+#ifdef CONFIG_SOC_INTEL_ACE30
 				dai_ssp_update_bits(dp, SSMIDyCS(dp->tdm_slot_group),
 						    SSMIDyCS_RSRE, SSMIDyCS_RSRE);
 				dai_ssp_update_bits(dp, SSMODyCS(dp->tdm_slot_group),
@@ -1806,7 +1806,7 @@ static int dai_ssp_set_config_tplg(struct dai_intel_ssp *dp, const struct dai_co
 			LOG_INF("hw_free stage: releasing BCLK clocks for SSP%d...",
 					dp->dai_index);
 			if (ssp_plat_data->clk_active & SSP_CLK_BCLK_ACTIVE) {
-#ifdef CONFIG_SOC_INTEL_ACE30_PTL
+#ifdef CONFIG_SOC_INTEL_ACE30
 				for (uint32_t idx = 0; idx < I2SOPCMC; ++idx) {
 					dai_ssp_update_bits(dp, SSMODyCS(idx), SSMODyCS_TSRE, 0);
 				}
@@ -1985,7 +1985,7 @@ static int dai_ssp_parse_tlv(struct dai_intel_ssp *dp, const uint8_t *aux_ptr, s
 				    ~I2CLCTL_MLCS(0x7)) |
 				    I2CLCTL_MLCS(link->clock_source), dai_ip_base(dp) +
 				    I2SLCTL_OFFSET);
-#elif CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30_PTL
+#elif CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30
 			sys_write32((sys_read32(dai_i2svss_base(dp) + I2SLCTL_OFFSET) &
 				    ~I2CLCTL_MLCS(0x7)) |
 				    I2CLCTL_MLCS(link->clock_source),
@@ -2065,7 +2065,7 @@ static int dai_ssp_set_clock_control_ver_1(struct dai_intel_ssp *dp,
 	return 0;
 }
 
-#ifdef CONFIG_SOC_INTEL_ACE30_PTL
+#ifdef CONFIG_SOC_INTEL_ACE30
 static void dai_ssp_set_reg_config(struct dai_intel_ssp *dp, const struct dai_config *cfg,
 				   const void *spec_config)
 {
@@ -2184,7 +2184,7 @@ static int dai_ssp_set_config_blob(struct dai_intel_ssp *dp, const struct dai_co
 	struct dai_intel_ssp_plat_data *ssp_plat_data = dai_get_plat_data(dp);
 	int err;
 
-#ifdef CONFIG_SOC_INTEL_ACE30_PTL
+#ifdef CONFIG_SOC_INTEL_ACE30
 	dp->tdm_slot_group = cfg->tdm_slot_group;
 #endif
 
@@ -2322,7 +2322,7 @@ static void dai_ssp_start(struct dai_intel_ssp *dp, int direction)
 
 
 	/* enable DMA */
-#if CONFIG_SOC_INTEL_ACE30_PTL
+#if CONFIG_SOC_INTEL_ACE30
 	if (direction == DAI_DIR_PLAYBACK) {
 		dai_ssp_update_bits(dp, SSMODyCS(dp->tdm_slot_group),
 				    SSMODyCS_TSRE, SSMODyCS_TSRE);
@@ -2392,7 +2392,7 @@ static void dai_ssp_stop(struct dai_intel_ssp *dp, int direction)
 	if (direction == DAI_DIR_CAPTURE &&
 	    dp->state[DAI_DIR_CAPTURE] != DAI_STATE_PRE_RUNNING) {
 		LOG_INF("SSP%d RX", dp->dai_index);
-#if CONFIG_SOC_INTEL_ACE30_PTL
+#if CONFIG_SOC_INTEL_ACE30
 		dai_ssp_update_bits(dp, SSMIDyCS(dp->tdm_slot_group), SSMIDyCS_RXEN, 0);
 		dai_ssp_update_bits(dp, SSMIDyCS(dp->tdm_slot_group), SSMIDyCS_RSRE, 0);
 #else
@@ -2407,7 +2407,7 @@ static void dai_ssp_stop(struct dai_intel_ssp *dp, int direction)
 	if (direction == DAI_DIR_PLAYBACK &&
 	    dp->state[DAI_DIR_PLAYBACK] != DAI_STATE_PRE_RUNNING) {
 		LOG_INF("SSP%d TX", dp->dai_index);
-#if CONFIG_SOC_INTEL_ACE30_PTL
+#if CONFIG_SOC_INTEL_ACE30
 		dai_ssp_update_bits(dp, SSMODyCS(dp->tdm_slot_group), SSMODyCS_TSRE, 0);
 		dai_ssp_empty_tx_fifo(dp);
 		dai_ssp_update_bits(dp, SSMODyCS(dp->tdm_slot_group), SSMODyCS_TXEN, 0);
diff --git a/drivers/dai/intel/ssp/ssp.h b/drivers/dai/intel/ssp/ssp.h
index 560b5d3df5f..5d1c2943724 100644
--- a/drivers/dai/intel/ssp/ssp.h
+++ b/drivers/dai/intel/ssp/ssp.h
@@ -52,7 +52,7 @@
 #include "ssp_regs_v1.h"
 #elif defined(CONFIG_SOC_INTEL_ACE20_LNL)
 #include "ssp_regs_v2.h"
-#elif defined(CONFIG_SOC_INTEL_ACE30_PTL)
+#elif defined(CONFIG_SOC_INTEL_ACE30)
 #include "ssp_regs_v3.h"
 #else
 #error "Missing ssp definitions"
@@ -116,7 +116,7 @@ struct dai_intel_ssp_plat_data {
 	uint32_t base;
 	uint32_t ip_base;
 	uint32_t shim_base;
-#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30_PTL)
+#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30)
 	uint32_t hdamlssp_base;
 	uint32_t i2svss_base;
 #endif
diff --git a/drivers/dma/dma_intel_adsp_hda.c b/drivers/dma/dma_intel_adsp_hda.c
index 5a2dc1a1e0f..2f9b98ed74b 100644
--- a/drivers/dma/dma_intel_adsp_hda.c
+++ b/drivers/dma/dma_intel_adsp_hda.c
@@ -235,7 +235,7 @@ int intel_adsp_hda_dma_status(const struct device *dev, uint32_t channel,
 	stat->pending_length = used;
 	stat->free = unused;
 
-#if CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30_PTL
+#if CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30
 	/* Linear Link Position via HDA-DMA is only supported on ACE2 or newer */
 	if (cfg->direction == MEMORY_TO_PERIPHERAL || cfg->direction == PERIPHERAL_TO_MEMORY) {
 		uint32_t tmp;
diff --git a/dts/xtensa/intel/intel_adsp_ace30.dtsi b/dts/xtensa/intel/intel_adsp_ace30.dtsi
new file mode 100644
index 00000000000..97be77eb757
--- /dev/null
+++ b/dts/xtensa/intel/intel_adsp_ace30.dtsi
@@ -0,0 +1,682 @@
+/*
+ * Copyright (c) 2024 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <xtensa/xtensa.dtsi>
+#include <mem.h>
+
+/ {
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "cdns,tensilica-xtensa-lx7";
+			reg = <0>;
+			cpu-power-states = <&d0i3 &d3>;
+			i-cache-line-size = <64>;
+			d-cache-line-size = <64>;
+		};
+
+		cpu1: cpu@1 {
+			device_type = "cpu";
+			compatible = "cdns,tensilica-xtensa-lx7";
+			reg = <1>;
+			cpu-power-states = <&d0i3 &d3>;
+		};
+
+		cpu2: cpu@2 {
+			device_type = "cpu";
+			compatible = "cdns,tensilica-xtensa-lx7";
+			reg = <2>;
+			cpu-power-states = <&d0i3 &d3>;
+		};
+
+		cpu3: cpu@3 {
+			device_type = "cpu";
+			compatible = "cdns,tensilica-xtensa-lx7";
+			reg = <3>;
+			cpu-power-states = <&d0i3 &d3>;
+		};
+
+		cpu4: cpu@4 {
+			device_type = "cpu";
+			compatible = "cdns,tensilica-xtensa-lx7";
+			reg = <4>;
+			cpu-power-states = <&d0i3 &d3>;
+		};
+	};
+
+	power-states {
+		d0i3: idle {
+			compatible = "zephyr,power-state";
+			power-state-name = "runtime-idle";
+			min-residency-us = <200>;
+			exit-latency-us = <100>;
+		};
+		/* PM_STATE_SOFT_OFF can be entered only by calling pm_state_force.
+		 * The procedure is triggered by IPC from the HOST (SET_DX).
+		 */
+		d3: off {
+			compatible = "zephyr,power-state";
+			power-state-name = "soft-off";
+			min-residency-us = <0>;
+			exit-latency-us = <0>;
+			status = "disabled";
+		};
+	};
+
+	sram0: memory@a0020000 {
+		device_type = "memory";
+		compatible = "mmio-sram";
+		reg = <0xa0020000 DT_SIZE_K(4608)>;
+	};
+
+	sram0virtual: virtualmemory@a0020000 {
+		device_type = "memory";
+		compatible = "mmio-sram";
+		reg = <0xa0020000 DT_SIZE_K(8192)>;
+	};
+
+	sram1: memory@a0000000 {
+		device_type = "memory";
+		compatible = "mmio-sram";
+		reg = <0xa0000000 DT_SIZE_K(64)>;
+	};
+
+	sysclk: system-clock {
+		compatible = "fixed-clock";
+		clock-frequency = <38400000>;
+		#clock-cells = <0>;
+	};
+
+	clkctl: clkctl {
+		compatible = "intel,adsp-shim-clkctl";
+		adsp-clkctl-clk-wovcro = <0>;
+		adsp-clkctl-clk-ipll = <1>;
+		adsp-clkctl-freq-enc = <0xc 0x4>;
+		adsp-clkctl-freq-mask = <0x0 0x0>;
+		adsp-clkctl-freq-default = <1>;
+		adsp-clkctl-freq-lowest = <0>;
+		wovcro-supported;
+	};
+
+	audioclk: audio-clock {
+		compatible = "fixed-clock";
+		clock-frequency = <24576000>;
+		#clock-cells = <0>;
+	};
+
+	pllclk: pll-clock {
+		compatible = "fixed-clock";
+		clock-frequency = <96000000>;
+		#clock-cells = <0>;
+	};
+
+	IMR1: memory@A1000000 {
+		compatible = "intel,adsp-imr";
+		reg = <0xA1000000 DT_SIZE_M(16)>;
+		block-size = <0x1000>;
+		zephyr,memory-region = "IMR1";
+	};
+
+	soc {
+		l1ccap: l1ccap@3fe80080 {
+			compatible = "intel,adsp-l1ccap";
+			reg = <0x3fe80080 0x4>;
+		};
+
+		l1ccfg: l1ccfg@3fe80084 {
+			compatible = "intel,adsp-l1ccfg";
+			reg = <0x3fe80084 0x4>;
+		};
+
+		l1pcfg: l1pcfg@3fe80088 {
+			compatible = "intel,adsp-l1pcfg";
+			reg = <0x3fe80088 0x4>;
+		};
+
+		lsbpm: lsbpm@71d80 {
+			compatible = "intel,adsp-lsbpm";
+			reg = <0x71d80 0x0008>;
+		};
+
+		hsbpm: hsbpm@17a800 {
+			compatible = "intel,adsp-hsbpm";
+			reg = <0x17a800 0x0008>;
+		};
+
+		core_intc: core_intc@0 {
+			compatible = "cdns,xtensa-core-intc";
+			reg = <0x00 0x400>;
+			interrupt-controller;
+			#interrupt-cells = <3>;
+		};
+
+		hdamlddmic: hdamlddmic@cc0 {
+			compatible = "intel,adsp-hda-dmic-cap";
+			reg = <0xcc0 0x40>;
+			status = "okay";
+		};
+
+		dmic0: dai-dmic0@10100 {
+			compatible = "intel,dai-dmic";
+			reg = <0x10100 0x8000>;
+			shim = <0x10000>;
+			fifo = <0x0008>;
+			interrupts = <0x08 0 0>;
+			interrupt-parent = <&ace_intc>;
+			power-domain = <&hub_ulp_domain>;
+		};
+
+		dmic1: dai-dmic1@10100 {
+			compatible = "intel,dai-dmic";
+			reg = <0x10100 0x8000>;
+			shim = <0x10000>;
+			fifo = <0x0108>;
+			interrupts = <0x08 0 0>;
+			interrupt-parent = <&ace_intc>;
+			power-domain = <&hub_ulp_domain>;
+		};
+
+		dmicvss: dmicvss@16000 {
+			compatible = "intel,adsp-dmic-vss";
+			reg = <0x16000 0x2000>;
+			status = "okay";
+		};
+
+		sspbase: ssp_base@28000 {
+			compatible = "intel,ssp-sspbase";
+			reg = <0x28000 0x1000>;
+		};
+
+		hdamlssp: hdamlssp@d00 {
+			compatible = "intel,adsp-hda-ssp-cap";
+			reg = <0xD00 0x40>;
+			status = "okay";
+		};
+
+		ssp0: ssp@28100 {
+			compatible = "intel,ssp";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x00028100 0x1000
+				   0x00079C00 0x200>;
+			i2svss = <0x00028C00 0x1000>;
+			interrupts = <0x00 0 0>;
+			interrupt-parent = <&ace_intc>;
+			dmas = <&hda_link_out 1
+				&hda_link_in 1>;
+			dma-names = "tx", "rx";
+			ssp-index = <0>;
+			power-domain = <&io0_domain>;
+			status = "okay";
+
+			ssp00: ssp@0 {
+				compatible = "intel,ssp-dai";
+				reg = <0x0>;
+				status = "okay";
+			};
+
+			ssp01: ssp@1 {
+				compatible = "intel,ssp-dai";
+				reg = <0x1>;
+				status = "okay";
+			};
+
+			ssp02: ssp@2 {
+				compatible = "intel,ssp-dai";
+				reg = <0x2>;
+				status = "okay";
+			};
+
+			ssp03: ssp@3 {
+				compatible = "intel,ssp-dai";
+				reg = <0x3>;
+				status = "okay";
+			};
+
+			ssp04: ssp@4 {
+				compatible = "intel,ssp-dai";
+				reg = <0x4>;
+				status = "okay";
+			};
+
+			ssp05: ssp@5 {
+				compatible = "intel,ssp-dai";
+				reg = <0x5>;
+				status = "okay";
+			};
+
+			ssp06: ssp@6 {
+				compatible = "intel,ssp-dai";
+				reg = <0x6>;
+				status = "okay";
+			};
+
+			ssp07: ssp@7 {
+				compatible = "intel,ssp-dai";
+				reg = <0x7>;
+				status = "okay";
+			};
+		};
+
+		ssp1: ssp@29100 {
+			compatible = "intel,ssp";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x00029100 0x1000
+				   0x00079C00 0x200>;
+			i2svss = <0x00029C00 0x1000>;
+			interrupts = <0x01 0 0>;
+			interrupt-parent = <&ace_intc>;
+			dmas = <&hda_link_out 2
+				&hda_link_in 2>;
+			dma-names = "tx", "rx";
+			ssp-index = <1>;
+			power-domain = <&io0_domain>;
+			status = "okay";
+
+			ssp10: ssp@10 {
+				compatible = "intel,ssp-dai";
+				reg = <0x10>;
+				status = "okay";
+			};
+
+			ssp11: ssp@11 {
+				compatible = "intel,ssp-dai";
+				reg = <0x11>;
+				status = "okay";
+			};
+
+			ssp12: ssp@12 {
+				compatible = "intel,ssp-dai";
+				reg = <0x12>;
+				status = "okay";
+			};
+
+			ssp13: ssp@13 {
+				compatible = "intel,ssp-dai";
+				reg = <0x13>;
+				status = "okay";
+			};
+
+			ssp14: ssp@14 {
+				compatible = "intel,ssp-dai";
+				reg = <0x14>;
+				status = "okay";
+			};
+
+			ssp15: ssp@15 {
+				compatible = "intel,ssp-dai";
+				reg = <0x15>;
+				status = "okay";
+			};
+
+			ssp16: ssp@16 {
+				compatible = "intel,ssp-dai";
+				reg = <0x16>;
+				status = "okay";
+			};
+
+			ssp17: ssp@17 {
+				compatible = "intel,ssp-dai";
+				reg = <0x17>;
+				status = "okay";
+			};
+		};
+
+		ssp2: ssp@2a100 {
+			compatible = "intel,ssp";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x0002a100 0x1000
+				   0x00079C00 0x200>;
+			i2svss = <0x0002AC00 0x1000>;
+			interrupts = <0x02 0 0>;
+			interrupt-parent = <&ace_intc>;
+			dmas = <&hda_link_out 3
+				&hda_link_in 3>;
+			dma-names = "tx", "rx";
+			ssp-index = <2>;
+			power-domain = <&io0_domain>;
+			status = "okay";
+
+			ssp20: ssp@20 {
+				compatible = "intel,ssp-dai";
+				reg = <0x20>;
+				status = "okay";
+			};
+
+			ssp21: ssp@21 {
+				compatible = "intel,ssp-dai";
+				reg = <0x21>;
+				status = "okay";
+			};
+
+			ssp22: ssp@22 {
+				compatible = "intel,ssp-dai";
+				reg = <0x22>;
+				status = "okay";
+			};
+
+			ssp23: ssp@23 {
+				compatible = "intel,ssp-dai";
+				reg = <0x23>;
+				status = "okay";
+			};
+
+			ssp24: ssp@24 {
+				compatible = "intel,ssp-dai";
+				reg = <0x24>;
+				status = "okay";
+			};
+
+			ssp25: ssp@25 {
+				compatible = "intel,ssp-dai";
+				reg = <0x25>;
+				status = "okay";
+			};
+
+			ssp26: ssp@26 {
+				compatible = "intel,ssp-dai";
+				reg = <0x26>;
+				status = "okay";
+			};
+
+			ssp27: ssp@27 {
+				compatible = "intel,ssp-dai";
+				reg = <0x27>;
+				status = "okay";
+			};
+		};
+
+		mem_window0: mem_window@70200 {
+			compatible = "intel,adsp-mem-window";
+			reg = <0x70200 0x8>;
+			offset = <0x4000>;
+			memory = <&sram0>;
+			initialize;
+			read-only;
+		};
+
+		mem_window1: mem_window@70208 {
+			compatible = "intel,adsp-mem-window";
+			reg = <0x70208 0x8>;
+			memory = <&sram0>;
+		};
+
+		mem_window2: mem_window@70210 {
+			compatible = "intel,adsp-mem-window";
+			reg = <0x70210 0x8>;
+			memory = <&sram0>;
+		};
+
+		mem_window3: mem_window@70218 {
+			compatible = "intel,adsp-mem-window";
+			reg = <0x70218 0x8>;
+			memory = <&sram0>;
+			read-only;
+		};
+
+		adsp_idc: ace_idc@92000 {
+			compatible = "intel,adsp-idc";
+			reg = <0x92000 0x0400>;
+			interrupts = <24 0 0>;
+			interrupt-parent = <&ace_intc>;
+		};
+
+		dfpmcch: dfpmcch@71ac0 {
+			compatible = "intel,adsp-dfpmcch";
+			reg = <0x00071ac0 0x40>;
+		};
+
+		dfpmccu: dfpmccu@71b00 {
+			compatible = "intel,adsp-dfpmccu";
+			reg = <0x71b00 0x100>;
+
+			hub_ulp_domain: hub_ulp_domain {
+				compatible = "intel,adsp-power-domain";
+				bit-position = <15>;
+			};
+			ml0_domain: ml0_domain {
+				compatible = "intel,adsp-power-domain";
+				bit-position = <12>;
+			};
+			io1_domain: io1_domain {
+				compatible = "intel,adsp-power-domain";
+				bit-position = <9>;
+			};
+			io0_domain: io0_domain {
+				compatible = "intel,adsp-power-domain";
+				bit-position = <8>;
+			};
+			hub_hp_domain: hub_hpp_domain {
+				compatible = "intel,adsp-power-domain";
+				bit-position = <6>;
+			};
+			hst_domain: hst_domain {
+				compatible = "intel,adsp-power-domain";
+				bit-position = <5>;
+			};
+		};
+
+		shim: shim@71f00 {
+			compatible = "intel,cavs-shim";
+			reg = <0x71f00 0x100>;
+		};
+
+		tts: tts@72000 {
+			compatible = "intel,adsp-tts";
+			reg = <0x72000 0x70>;
+			status = "okay";
+		};
+
+		ace_rtc_counter: ace_rtc_counter@72008 {
+			compatible = "intel,ace-rtc-counter";
+			reg = <0x72008 0x0064>;
+		};
+
+		ace_timestamp: ace_timestamp@72040 {
+			compatible = "intel,ace-timestamp";
+			reg = <0x72040 0x0032>;
+		};
+
+		ace_art_counter: ace_art_counter@72058 {
+			compatible = "intel,ace-art-counter";
+			reg = <0x72058 0x0064>;
+		};
+
+		hda_host_out: dma@72800 {
+			compatible = "intel,adsp-hda-host-out";
+			#dma-cells = <1>;
+			reg = <0x00072800 0x40>;
+			dma-channels = <9>;
+			dma-buf-addr-alignment = <128>;
+			dma-buf-size-alignment = <32>;
+			dma-copy-alignment = <32>;
+			power-domain = <&hst_domain>;
+			interrupts = <13 0 0>;
+			interrupt-parent = <&ace_intc>;
+			status = "okay";
+		};
+
+		hda_host_in: dma@72c00 {
+			compatible = "intel,adsp-hda-host-in";
+			#dma-cells = <1>;
+			reg = <0x00072c00 0x40>;
+			dma-channels = <11>;
+			dma-buf-addr-alignment = <128>;
+			dma-buf-size-alignment = <32>;
+			dma-copy-alignment = <32>;
+			power-domain = <&hst_domain>;
+			interrupts = <12 0 0>;
+			interrupt-parent = <&ace_intc>;
+			status = "okay";
+		};
+
+		adsp_host_ipc: ace_host_ipc@73000 {
+			compatible = "intel,adsp-host-ipc";
+			status = "okay";
+			reg = <0x73000 0x30>;
+			interrupts = <0 0 0>;
+			interrupt-parent = <&ace_intc>;
+		};
+
+		hda_link_out: dma@79400 {
+			compatible = "intel,adsp-hda-link-out";
+			#dma-cells = <1>;
+			reg = <0x00079400 0x40>;
+			dma-channels = <9>;
+			dma-buf-addr-alignment = <128>;
+			dma-buf-size-alignment = <32>;
+			dma-copy-alignment = <32>;
+			power-domain = <&io0_domain>;
+			status = "okay";
+		};
+
+		hda_link_in: dma@79800 {
+			compatible = "intel,adsp-hda-link-in";
+			#dma-cells = <1>;
+			reg = <0x00079800 0x40>;
+			dma-channels = <11>;
+			dma-buf-addr-alignment = <128>;
+			dma-buf-size-alignment = <32>;
+			dma-copy-alignment = <32>;
+			power-domain = <&io0_domain>;
+			status = "okay";
+		};
+
+		/* This is actually an array of per-core designware
+		 * controllers, but the special setup and extra
+		 * masking layer makes it easier for MTL to handle
+		 * this internally.
+		 */
+		ace_intc: ace_intc@94000  {
+			compatible = "intel,ace-intc";
+			reg = <0x94000 0xc00>;
+			interrupt-controller;
+			#interrupt-cells = <3>;
+			interrupts = <4 0 0>;
+			num-irqs = <28>;
+			interrupt-parent = <&core_intc>;
+		};
+
+		tlb: tlb@17e000 {
+			compatible = "intel,adsp-mtl-tlb";
+			reg = <0x17e000 0x1000>;
+			paddr-size = <12>;
+			exec-bit-idx = <14>;
+			write-bit-idx= <15>;
+		};
+
+		timer: timer {
+			compatible = "intel,adsp-timer";
+			syscon = <&tts>;
+		};
+	};
+
+	hdas {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		hda0: hda@0 {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <0>;
+		};
+		hda1: hda@1 {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <1>;
+		};
+		hda2: hda@2 {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <2>;
+		};
+		hda3: hda@3 {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <3>;
+		};
+		hda4: hda@4 {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <4>;
+		};
+		hda5: hda@5 {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <5>;
+		};
+		hda6: hda@6 {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <6>;
+		};
+		hda7: hda@7 {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <7>;
+		};
+		hda8: hda@8 {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <8>;
+		};
+		hda9: hda@9 {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <9>;
+		};
+		hda10: hda@a {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <0x0a>;
+		};
+		hda11: hda@b {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <0x0b>;
+		};
+		hda12: hda@c {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <0x0c>;
+		};
+		hda13: hda@d {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <0x0d>;
+		};
+		hda14: hda@e {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <0x0e>;
+		};
+		hda15: hda@f {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <0x0f>;
+		};
+		hda16: hda@10 {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <0x10>;
+		};
+		hda17: hda@11 {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <0x11>;
+		};
+		hda18: hda@12 {
+			compatible = "intel,hda-dai";
+			status = "okay";
+			reg = <0x12>;
+		};
+	};
+};
diff --git a/soc/intel/intel_adsp/ace/CMakeLists.txt b/soc/intel/intel_adsp/ace/CMakeLists.txt
index 0c9c43eb339..519275d9047 100644
--- a/soc/intel/intel_adsp/ace/CMakeLists.txt
+++ b/soc/intel/intel_adsp/ace/CMakeLists.txt
@@ -20,7 +20,7 @@ zephyr_library_sources_ifdef(CONFIG_SOC_INTEL_COMM_WIDGET comm_widget.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_INTEL_COMM_WIDGET comm_widget_messages.c)
 
 if (CONFIG_XTENSA_MMU)
-  zephyr_library_sources_ifdef(CONFIG_SOC_INTEL_ACE30_PTL mmu_ptl.c)
+  zephyr_library_sources_ifdef(CONFIG_SOC_INTEL_ACE30 mmu_ace30.c)
 endif()
 
 set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld CACHE INTERNAL "")
diff --git a/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace30_ptl b/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace30
similarity index 96%
rename from soc/intel/intel_adsp/ace/Kconfig.defconfig.ace30_ptl
rename to soc/intel/intel_adsp/ace/Kconfig.defconfig.ace30
index b5c67ea0f0b..a11e50a2af0 100644
--- a/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace30_ptl
+++ b/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace30
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 
-if SOC_INTEL_ACE30_PTL
+if SOC_INTEL_ACE30
 
 config MP_MAX_NUM_CPUS
 	default 5
diff --git a/soc/intel/intel_adsp/ace/Kconfig.soc b/soc/intel/intel_adsp/ace/Kconfig.soc
index 89ef2eb30db..729cd1eb4ab 100644
--- a/soc/intel/intel_adsp/ace/Kconfig.soc
+++ b/soc/intel/intel_adsp/ace/Kconfig.soc
@@ -20,7 +20,7 @@ config SOC_INTEL_ACE20_LNL
 	help
 	  ACE 2.0 Lunar Lake PCH
 
-config SOC_INTEL_ACE30_PTL
+config SOC_INTEL_ACE30
 	bool
 	select SOC_SERIES_INTEL_ADSP_ACE
 	help
@@ -32,9 +32,9 @@ config SOC_SERIES
 config SOC_TOOLCHAIN_NAME
 	default "intel_ace15_mtpm" if SOC_INTEL_ACE15_MTPM
 	default "intel_ace15_mtpm" if SOC_INTEL_ACE20_LNL
-	default "intel_ace30_ptl" if SOC_INTEL_ACE30_PTL
+	default "intel_ace30_ptl" if SOC_INTEL_ACE30
 
 config SOC
 	default "ace15_mtpm" if SOC_INTEL_ACE15_MTPM
 	default "ace20_lnl" if SOC_INTEL_ACE20_LNL
-	default "ace30_ptl" if SOC_INTEL_ACE30_PTL
+	default "ace30" if SOC_INTEL_ACE30
diff --git a/soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_boot.h b/soc/intel/intel_adsp/ace/include/ace30/adsp_boot.h
similarity index 100%
rename from soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_boot.h
rename to soc/intel/intel_adsp/ace/include/ace30/adsp_boot.h
diff --git a/soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_interrupt.h b/soc/intel/intel_adsp/ace/include/ace30/adsp_interrupt.h
similarity index 100%
rename from soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_interrupt.h
rename to soc/intel/intel_adsp/ace/include/ace30/adsp_interrupt.h
diff --git a/soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_ipc_regs.h b/soc/intel/intel_adsp/ace/include/ace30/adsp_ipc_regs.h
similarity index 100%
rename from soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_ipc_regs.h
rename to soc/intel/intel_adsp/ace/include/ace30/adsp_ipc_regs.h
diff --git a/soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_power.h b/soc/intel/intel_adsp/ace/include/ace30/adsp_power.h
similarity index 100%
rename from soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_power.h
rename to soc/intel/intel_adsp/ace/include/ace30/adsp_power.h
diff --git a/soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_shim.h b/soc/intel/intel_adsp/ace/include/ace30/adsp_shim.h
similarity index 100%
rename from soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_shim.h
rename to soc/intel/intel_adsp/ace/include/ace30/adsp_shim.h
diff --git a/soc/intel/intel_adsp/ace/include/ace30_ptl/dmic_regs_ace3x.h b/soc/intel/intel_adsp/ace/include/ace30/dmic_regs_ace3x.h
similarity index 100%
rename from soc/intel/intel_adsp/ace/include/ace30_ptl/dmic_regs_ace3x.h
rename to soc/intel/intel_adsp/ace/include/ace30/dmic_regs_ace3x.h
diff --git a/soc/intel/intel_adsp/ace/include/dmic_regs.h b/soc/intel/intel_adsp/ace/include/dmic_regs.h
index df69d3687f1..bff34b2dfc9 100644
--- a/soc/intel/intel_adsp/ace/include/dmic_regs.h
+++ b/soc/intel/intel_adsp/ace/include/dmic_regs.h
@@ -351,8 +351,8 @@
 #include <ace20_lnl/dmic_regs_ace2x.h>
 #elif CONFIG_SOC_INTEL_ACE15_MTPM
 #include <ace15_mtpm/dmic_regs_ace1x.h>
-#elif CONFIG_SOC_INTEL_ACE30_PTL
-#include <ace30_ptl/dmic_regs_ace3x.h>
+#elif CONFIG_SOC_INTEL_ACE30
+#include <ace30/dmic_regs_ace3x.h>
 #else
 #error "Unknown SoC"
 #endif
diff --git a/soc/intel/intel_adsp/common/clk.c b/soc/intel/intel_adsp/common/clk.c
index ebcda7be1e7..66c86202198 100644
--- a/soc/intel/intel_adsp/common/clk.c
+++ b/soc/intel/intel_adsp/common/clk.c
@@ -96,7 +96,7 @@ void adsp_clock_init(void)
 	} else {
 		platform_lowest_freq_idx = ADSP_CPU_CLOCK_FREQ_IPLL;
 	}
-#if CONFIG_SOC_INTEL_ACE30_PTL
+#if CONFIG_SOC_INTEL_ACE30
 	/* Set the Cardinal clock divider to 18 to get 24.576MHz */
 	ACE_DfPMCCU.dfcrodiv &= ACE_CRODIV_CARCDS_MASK;
 	ACE_DfPMCCU.dfcrodiv |= ACE_CRODIV_CARCDS(0x12);
diff --git a/soc/intel/intel_adsp/soc.yml b/soc/intel/intel_adsp/soc.yml
index 0f889aea963..e797abd9de6 100644
--- a/soc/intel/intel_adsp/soc.yml
+++ b/soc/intel/intel_adsp/soc.yml
@@ -5,7 +5,7 @@ family:
         socs:
           - name: ace15_mtpm
           - name: ace20_lnl
-          - name: ace30_ptl
+          - name: ace30
       - name: intel_adsp_cavs
         socs:
           - name: cavs25
diff --git a/tests/kernel/mem_protect/sys_sem/boards/intel_adsp_ace30_ptl.conf b/tests/kernel/mem_protect/sys_sem/boards/intel_adsp_ace30.conf
similarity index 100%
rename from tests/kernel/mem_protect/sys_sem/boards/intel_adsp_ace30_ptl.conf
rename to tests/kernel/mem_protect/sys_sem/boards/intel_adsp_ace30.conf
diff --git a/tests/kernel/mutex/sys_mutex/boards/intel_adsp_ace30_ptl.conf b/tests/kernel/mutex/sys_mutex/boards/intel_adsp_ace30.conf
similarity index 100%
rename from tests/kernel/mutex/sys_mutex/boards/intel_adsp_ace30_ptl.conf
rename to tests/kernel/mutex/sys_mutex/boards/intel_adsp_ace30.conf
diff --git a/tests/kernel/queue/boards/intel_adsp_ace30_ptl.conf b/tests/kernel/queue/boards/intel_adsp_ace30.conf
similarity index 100%
rename from tests/kernel/queue/boards/intel_adsp_ace30_ptl.conf
rename to tests/kernel/queue/boards/intel_adsp_ace30.conf
diff --git a/tests/lib/c_lib/thrd/boards/intel_adsp_ace30_ptl.conf b/tests/lib/c_lib/thrd/boards/intel_adsp_ace30.conf
similarity index 100%
rename from tests/lib/c_lib/thrd/boards/intel_adsp_ace30_ptl.conf
rename to tests/lib/c_lib/thrd/boards/intel_adsp_ace30.conf

From 178340cb720906a1b24339ff1ed65bd99db470cb Mon Sep 17 00:00:00 2001
From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
Date: Mon, 30 Sep 2024 13:25:49 +0300
Subject: [PATCH 0597/2913] [nrf fromtree] dts: xtensa: nxp_imx8: add power
 domain for irqsteer

Add power domain DT node for the irqsteer and a reference to
it in irqsteer's DT node.

Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
(cherry picked from commit fdbf4d23df69f796fb73d8cfc90cf583634e3d57)
(cherry picked from commit 6e6555ebc6384edad019dfbdd07379224a3a7269)
---
 dts/xtensa/nxp/nxp_imx8.dtsi | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/dts/xtensa/nxp/nxp_imx8.dtsi b/dts/xtensa/nxp/nxp_imx8.dtsi
index 87713a71200..8dba2b7af08 100644
--- a/dts/xtensa/nxp/nxp_imx8.dtsi
+++ b/dts/xtensa/nxp/nxp_imx8.dtsi
@@ -8,6 +8,7 @@
 #include <mem.h>
 #include <zephyr/dt-bindings/clock/imx_ccm.h>
 #include <zephyr/dt-bindings/dai/esai.h>
+#include <zephyr/dt-bindings/power/imx_scu_rsrc.h>
 
 / {
 	cpus {
@@ -34,6 +35,7 @@
 	irqsteer: interrupt-controller@510a0000 {
 		compatible = "nxp,irqsteer-intc";
 		reg = <0x510a0000 DT_SIZE_K(64)>;
+		power-domain = <&irqstr_pd>;
 
 		#size-cells = <0>;
 		#address-cells = <1>;
@@ -167,6 +169,17 @@
 				compatible = "nxp,imx8-pinctrl";
 			};
 		};
+
+		power-domains {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			irqstr_pd: pd@0 {
+				compatible = "nxp,imx8qm-scu-pd", "nxp,scu-pd";
+				reg = <0>;
+				nxp,resource-id = <IMX_SC_R_IRQSTR_DSP>;
+			};
+		};
 	};
 
 	lpuart2: serial@5a080000 {

From df1f799a48a535c40cf023f00ddfc4845fa60c88 Mon Sep 17 00:00:00 2001
From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
Date: Wed, 9 Oct 2024 15:53:56 +0300
Subject: [PATCH 0598/2913] [nrf fromtree] dts: xtensa: nxp_imx8: add bus clock
 for sai1

Add bus clock for `sai1` node.

Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
(cherry picked from commit 1174ea522ffa218cf4dc87d714f93742c508f3c2)
(cherry picked from commit de83970002ce47e8d403ef2eee836f1480d90d26)
---
 dts/xtensa/nxp/nxp_imx8.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dts/xtensa/nxp/nxp_imx8.dtsi b/dts/xtensa/nxp/nxp_imx8.dtsi
index 8dba2b7af08..21347b595fe 100644
--- a/dts/xtensa/nxp/nxp_imx8.dtsi
+++ b/dts/xtensa/nxp/nxp_imx8.dtsi
@@ -132,6 +132,8 @@
 		reg = <0x59050000 DT_SIZE_K(64)>;
 		interrupt-parent = <&master5>;
 		interrupts = <28>;
+		clocks = <&ccm IMX_CCM_SAI1_CLK 0x0 0x0>;
+		clock-names = "bus";
 		dai-index = <1>;
 		dmas = <&edma0 15 0>, <&edma0 14 0>;
 		dma-names = "tx", "rx";

From a4906a78ae576aa1f9e9cd169cc73aa3a86cddf9 Mon Sep 17 00:00:00 2001
From: TOKITA Hiroshi <tokita.hiroshi@gmail.com>
Date: Wed, 18 Sep 2024 06:30:39 +0900
Subject: [PATCH 0599/2913] [nrf fromtree] tests: drivers: build_all: Add
 power_domain drivers test

Add build_all test for power_domain drivers.

Signed-off-by: TOKITA Hiroshi <tokita.hiroshi@gmail.com>
(cherry picked from commit 2c1274f6a9c1d62505783eb47f5817bf50877d39)
(cherry picked from commit 65c16d3aaa3f7392bd0735b6425583cf44613438)
---
 .../build_all/power_domain/CMakeLists.txt     |  8 +++++
 .../build_all/power_domain/app.overlay        | 31 +++++++++++++++++++
 tests/drivers/build_all/power_domain/prj.conf |  4 +++
 .../drivers/build_all/power_domain/src/main.c | 10 ++++++
 .../build_all/power_domain/testcase.yaml      | 14 +++++++++
 5 files changed, 67 insertions(+)
 create mode 100644 tests/drivers/build_all/power_domain/CMakeLists.txt
 create mode 100644 tests/drivers/build_all/power_domain/app.overlay
 create mode 100644 tests/drivers/build_all/power_domain/prj.conf
 create mode 100644 tests/drivers/build_all/power_domain/src/main.c
 create mode 100644 tests/drivers/build_all/power_domain/testcase.yaml

diff --git a/tests/drivers/build_all/power_domain/CMakeLists.txt b/tests/drivers/build_all/power_domain/CMakeLists.txt
new file mode 100644
index 00000000000..0ee1f839afd
--- /dev/null
+++ b/tests/drivers/build_all/power_domain/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(build_all_power_domain)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/drivers/build_all/power_domain/app.overlay b/tests/drivers/build_all/power_domain/app.overlay
new file mode 100644
index 00000000000..0551d1b0289
--- /dev/null
+++ b/tests/drivers/build_all/power_domain/app.overlay
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2024 TOKITA Hiroshi
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	test {
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		test_gpio: gpio@deadbeef {
+			compatible = "vnd,gpio";
+			gpio-controller;
+			reg = <0xdeadbeef 0x1000>;
+			#gpio-cells = <0x2>;
+			status = "okay";
+		};
+
+		power_domain_gpio {
+			compatible = "power-domain-gpio";
+			enable-gpios = <&test_gpio 0 0>;
+			zephyr,pm-device-runtime-auto;
+		};
+
+		power_domain_gpio_monitor {
+			compatible = "power-domain-gpio-monitor";
+			status = "okay";
+			gpios = <&test_gpio 0 0>;
+		};
+	};
+};
diff --git a/tests/drivers/build_all/power_domain/prj.conf b/tests/drivers/build_all/power_domain/prj.conf
new file mode 100644
index 00000000000..3a4d0d53f65
--- /dev/null
+++ b/tests/drivers/build_all/power_domain/prj.conf
@@ -0,0 +1,4 @@
+CONFIG_TEST=y
+CONFIG_TEST_USERSPACE=y
+CONFIG_GPIO=y
+CONFIG_POWER_DOMAIN=y
diff --git a/tests/drivers/build_all/power_domain/src/main.c b/tests/drivers/build_all/power_domain/src/main.c
new file mode 100644
index 00000000000..19f5ee731af
--- /dev/null
+++ b/tests/drivers/build_all/power_domain/src/main.c
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2024 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+int main(void)
+{
+	return 0;
+}
diff --git a/tests/drivers/build_all/power_domain/testcase.yaml b/tests/drivers/build_all/power_domain/testcase.yaml
new file mode 100644
index 00000000000..e1e10d2f8e2
--- /dev/null
+++ b/tests/drivers/build_all/power_domain/testcase.yaml
@@ -0,0 +1,14 @@
+common:
+  build_only: true
+  tags:
+    - drivers
+    - power_domain
+  platform_allow:
+    - native_sim
+    - native_sim/native/64
+tests:
+  drivers.power_domain.build: {}
+  drivers.power_domain.build.pm:
+    extra_configs:
+      - CONFIG_PM_DEVICE=y
+      - CONFIG_PM_DEVICE_RUNTIME=y

From 7a696b4ba7abe8deca2f71b0c5a010ca7bb8fdc3 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Wed, 16 Oct 2024 10:33:59 +0200
Subject: [PATCH 0600/2913] [nrf fromtree] pm: s/power-domain/power-domains and
 add power-domain-names

Some devices may belong to >1 power domain, so with the current design
this is something not possible to describe. It's worth to note that
Linux also uses the `power-domains` naming scheme, not `power-domain`.
This patch also introduces `power-domain-names` so that each entry in
`power-domains` can be given a name if needed. `#power-domain-cells`
is now required as well.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit f989711a60d434fc6a2023adda690ba21e586bb3)
(cherry picked from commit 0b1e0ffa508921927b8356c9087faf11685c0a03)
---
 doc/services/pm/device_runtime.rst            |  2 +-
 doc/services/pm/power_domain.rst              |  4 +--
 dts/bindings/base/base.yaml                   | 12 +++++++
 dts/bindings/base/pm.yaml                     |  9 -----
 .../power-domain/intel,adsp-power-domain.yaml |  3 ++
 dts/bindings/power-domain/nxp,scu-pd.yaml     |  3 ++
 .../power-domain-gpio-monitor.yaml            |  3 ++
 .../power-domain/power-domain-gpio.yaml       |  3 ++
 dts/bindings/power-domain/power-domain.yaml   |  4 +++
 dts/xtensa/intel/intel_adsp_ace15_mtpm.dtsi   | 33 ++++++++++++-------
 dts/xtensa/intel/intel_adsp_ace20_lnl.dtsi    | 12 +++++--
 dts/xtensa/intel/intel_adsp_ace30.dtsi        | 24 +++++++++-----
 dts/xtensa/intel/intel_adsp_ace30_ptl.dtsi    | 24 +++++++++-----
 dts/xtensa/nxp/nxp_imx8.dtsi                  |  3 +-
 include/zephyr/pm/device.h                    |  2 +-
 .../build_all/power_domain/app.overlay        |  2 ++
 tests/kernel/device/app.overlay               |  7 ++--
 .../device/boards/hifive_unmatched.overlay    |  4 +--
 .../subsys/pm/device_driver_init/app.overlay  | 15 ++++++---
 .../pm/device_power_domains/app.overlay       |  7 ++--
 tests/subsys/pm/power_domain/app.overlay      |  8 +++--
 21 files changed, 124 insertions(+), 60 deletions(-)

diff --git a/doc/services/pm/device_runtime.rst b/doc/services/pm/device_runtime.rst
index c6173ef66f1..350874009b9 100644
--- a/doc/services/pm/device_runtime.rst
+++ b/doc/services/pm/device_runtime.rst
@@ -26,7 +26,7 @@ asynchronously, it will be put into the
 :c:enumerator:`PM_DEVICE_STATE_SUSPENDING` state first and then into the
 :c:enumerator:`PM_DEVICE_STATE_SUSPENDED` state when the action is run.
 
-For devices on a power domain (via the devicetree 'power-domain' property), device runtime
+For devices on a power domain (via the devicetree 'power-domains' property), device runtime
 power management automatically attempts to request and release the dependent domain
 in response to :c:func:`pm_device_runtime_get` and :c:func:`pm_device_runtime_put`
 calls on the child device.
diff --git a/doc/services/pm/power_domain.rst b/doc/services/pm/power_domain.rst
index faa677b796a..bdab54a54e7 100644
--- a/doc/services/pm/power_domain.rst
+++ b/doc/services/pm/power_domain.rst
@@ -131,13 +131,13 @@ Devices belonging to this device can be declared referring it in the
         &gpio0 {
                 compatible = "zephyr,gpio-emul";
                 gpio-controller;
-                power-domain = <&gpio_domain>;
+                power-domains = <&gpio_domain>;
         };
 
         &gpio1 {
                 compatible = "zephyr,gpio-emul";
                 gpio-controller;
-                power-domain = <&gpio_domain>;
+                power-domains = <&gpio_domain>;
         };
 
 All devices under a domain will be notified when the domain changes
diff --git a/dts/bindings/base/base.yaml b/dts/bindings/base/base.yaml
index b2e670fb5d8..676292a296a 100644
--- a/dts/bindings/base/base.yaml
+++ b/dts/bindings/base/base.yaml
@@ -93,6 +93,18 @@ properties:
     type: string-array
     description: Provided names of mailbox / IPM channel specifiers
 
+  power-domains:
+    type: phandle-array
+    description: Power domain specifiers
+
+  power-domain-names:
+    type: string-array
+    description: Provided names of power domain specifiers
+
+  "#power-domain-cells":
+    type: int
+    description: Number of cells in power-domains property
+
   zephyr,deferred-init:
     type: boolean
     description: |
diff --git a/dts/bindings/base/pm.yaml b/dts/bindings/base/pm.yaml
index 50c016d07bd..6c0ffb1f637 100644
--- a/dts/bindings/base/pm.yaml
+++ b/dts/bindings/base/pm.yaml
@@ -16,15 +16,6 @@ properties:
       Wake up capable devices are disabled (interruptions will not wake up
       the system) by default but they can be enabled at runtime if necessary.
 
-  power-domain:
-    type: phandle
-    description: |
-
-      Power domain the device belongs to.
-
-      The device will be notified when the power domain it belongs to is either
-      suspended or resumed.
-
   zephyr,pm-device-runtime-auto:
     type: boolean
     description: |
diff --git a/dts/bindings/power-domain/intel,adsp-power-domain.yaml b/dts/bindings/power-domain/intel,adsp-power-domain.yaml
index 70bf2a2c1ba..08533f9ea4c 100644
--- a/dts/bindings/power-domain/intel,adsp-power-domain.yaml
+++ b/dts/bindings/power-domain/intel,adsp-power-domain.yaml
@@ -17,3 +17,6 @@ properties:
       read_address (PWRSTS) to set power active or confirm power active
       for a desired domain.
       Same for write and read addresses
+
+  "#power-domain-cells":
+    const: 0
diff --git a/dts/bindings/power-domain/nxp,scu-pd.yaml b/dts/bindings/power-domain/nxp,scu-pd.yaml
index 7e1d0855389..30f7b2e6474 100644
--- a/dts/bindings/power-domain/nxp,scu-pd.yaml
+++ b/dts/bindings/power-domain/nxp,scu-pd.yaml
@@ -15,3 +15,6 @@ properties:
       Number used by the firmware running on the SCU to identify
       the resource on which the PD-related operations are to be
       performed.
+
+  "#power-domain-cells":
+    const: 0
diff --git a/dts/bindings/power-domain/power-domain-gpio-monitor.yaml b/dts/bindings/power-domain/power-domain-gpio-monitor.yaml
index 734aab8e6f7..45cee1387be 100644
--- a/dts/bindings/power-domain/power-domain-gpio-monitor.yaml
+++ b/dts/bindings/power-domain/power-domain-gpio-monitor.yaml
@@ -20,3 +20,6 @@ properties:
     required: true
     description: |
       GPIO to use to sense if rail is powered on.
+
+  "#power-domain-cells":
+    const: 0
diff --git a/dts/bindings/power-domain/power-domain-gpio.yaml b/dts/bindings/power-domain/power-domain-gpio.yaml
index 1ece08fb5e3..bba4c8602fe 100644
--- a/dts/bindings/power-domain/power-domain-gpio.yaml
+++ b/dts/bindings/power-domain/power-domain-gpio.yaml
@@ -28,3 +28,6 @@ properties:
     type: int
     default: 0
     description: Off delay time, in microseconds
+
+  "#power-domain-cells":
+    const: 0
diff --git a/dts/bindings/power-domain/power-domain.yaml b/dts/bindings/power-domain/power-domain.yaml
index 429667fbb2e..1040f5c43b7 100644
--- a/dts/bindings/power-domain/power-domain.yaml
+++ b/dts/bindings/power-domain/power-domain.yaml
@@ -6,3 +6,7 @@ description: Properties for power domains
 compatible: "power-domain"
 
 include: base.yaml
+
+properties:
+  "#power-domain-cells":
+    const: 0
diff --git a/dts/xtensa/intel/intel_adsp_ace15_mtpm.dtsi b/dts/xtensa/intel/intel_adsp_ace15_mtpm.dtsi
index 7c2050b109f..3500e51f761 100644
--- a/dts/xtensa/intel/intel_adsp_ace15_mtpm.dtsi
+++ b/dts/xtensa/intel/intel_adsp_ace15_mtpm.dtsi
@@ -150,7 +150,7 @@
 			fifo = <0x0008>;
 			interrupts = <0x08 0 0>;
 			interrupt-parent = <&ace_intc>;
-			power-domain = <&hub_ulp_domain>;
+			power-domains = <&hub_ulp_domain>;
 		};
 
 		dmic1: dmic1@10000 {
@@ -160,7 +160,7 @@
 			fifo = <0x0108>;
 			interrupts = <0x09 0 0>;
 			interrupt-parent = <&ace_intc>;
-			power-domain = <&hub_ulp_domain>;
+			power-domains = <&hub_ulp_domain>;
 		};
 
 		/*
@@ -285,7 +285,7 @@
 			dmas = <&lpgpdma0 2
 					&lpgpdma0 3>;
 			dma-names = "tx", "rx";
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			ssp-index = <0>;
 			status = "okay";
 
@@ -307,7 +307,7 @@
 			dmas = <&lpgpdma0 4
 					&lpgpdma0 5>;
 			dma-names = "tx", "rx";
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			ssp-index = <1>;
 			status = "okay";
 
@@ -329,7 +329,7 @@
 			dmas = <&lpgpdma0 6
 					&lpgpdma0 7>;
 			dma-names = "tx", "rx";
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			ssp-index = <2>;
 			status = "okay";
 
@@ -387,38 +387,47 @@
 			hub_ulp_domain: hub_ulp_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <15>;
+				#power-domain-cells = <0>;
 			};
 			ml1_domain: ml1_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <13>;
+				#power-domain-cells = <0>;
 			};
 			ml0_domain: ml0_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <12>;
+				#power-domain-cells = <0>;
 			};
 			io3_domain: io3_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <11>;
+				#power-domain-cells = <0>;
 			};
 			io2_domain: io2_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <10>;
+				#power-domain-cells = <0>;
 			};
 			io1_domain: io1_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <9>;
+				#power-domain-cells = <0>;
 			};
 			io0_domain: io0_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <8>;
+				#power-domain-cells = <0>;
 			};
 			hub_hp_domain: hub_hp_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <6>;
+				#power-domain-cells = <0>;
 			};
 			hst_domain: hst_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <4>;
+				#power-domain-cells = <0>;
 			};
 		};
 
@@ -464,7 +473,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <16>;
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			status = "okay";
 		};
 
@@ -476,7 +485,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <16>;
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			status = "okay";
 		};
 
@@ -488,7 +497,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <16>;
-			power-domain = <&hst_domain>;
+			power-domains = <&hst_domain>;
 			interrupts = <13 0 0>;
 			interrupt-parent = <&ace_intc>;
 			status = "okay";
@@ -502,7 +511,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <16>;
-			power-domain = <&hst_domain>;
+			power-domains = <&hst_domain>;
 			interrupts = <12 0 0>;
 			interrupt-parent = <&ace_intc>;
 			status = "okay";
@@ -541,7 +550,7 @@
 			dma-buf-size-alignment = <4>;
 			dma-copy-alignment = <4>;
 			status = "okay";
-			power-domain = <&hub_ulp_domain>;
+			power-domains = <&hub_ulp_domain>;
 			zephyr,pm-device-runtime-auto;
 		};
 
@@ -555,7 +564,7 @@
 			dma-buf-size-alignment = <4>;
 			dma-copy-alignment = <4>;
 			status = "okay";
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			zephyr,pm-device-runtime-auto;
 		};
 
@@ -568,7 +577,7 @@
 			interrupt-parent = <&core_intc>;
 			dma-buf-size-alignment = <4>;
 			dma-copy-alignment = <4>;
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			status = "okay";
 			zephyr,pm-device-runtime-auto;
 		};
diff --git a/dts/xtensa/intel/intel_adsp_ace20_lnl.dtsi b/dts/xtensa/intel/intel_adsp_ace20_lnl.dtsi
index c26d2b815fe..8dc4489d0ee 100644
--- a/dts/xtensa/intel/intel_adsp_ace20_lnl.dtsi
+++ b/dts/xtensa/intel/intel_adsp_ace20_lnl.dtsi
@@ -215,7 +215,7 @@
 			dmas = <&hda_link_out 1
 				&hda_link_in 1>;
 			dma-names = "tx", "rx";
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			ssp-index = <0>;
 			status = "okay";
 
@@ -238,7 +238,7 @@
 			dmas = <&hda_link_out 2
 				&hda_link_in 2>;
 			dma-names = "tx", "rx";
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			ssp-index = <1>;
 			status = "okay";
 
@@ -261,7 +261,7 @@
 			dmas = <&hda_link_out 3
 				&hda_link_in 3>;
 			dma-names = "tx", "rx";
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			ssp-index = <2>;
 			status = "okay";
 
@@ -319,26 +319,32 @@
 			hub_ulp_domain: hub_ulp_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <15>;
+				#power-domain-cells = <0>;
 			};
 			ml0_domain: ml0_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <12>;
+				#power-domain-cells = <0>;
 			};
 			io1_domain: io1_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <9>;
+				#power-domain-cells = <0>;
 			};
 			io0_domain: io0_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <8>;
+				#power-domain-cells = <0>;
 			};
 			hub_hp_domain: hub_hp_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <6>;
+				#power-domain-cells = <0>;
 			};
 			hst_domain: hst_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <5>;
+				#power-domain-cells = <0>;
 			};
 		};
 
diff --git a/dts/xtensa/intel/intel_adsp_ace30.dtsi b/dts/xtensa/intel/intel_adsp_ace30.dtsi
index 97be77eb757..26ae1c47f56 100644
--- a/dts/xtensa/intel/intel_adsp_ace30.dtsi
+++ b/dts/xtensa/intel/intel_adsp_ace30.dtsi
@@ -169,7 +169,7 @@
 			fifo = <0x0008>;
 			interrupts = <0x08 0 0>;
 			interrupt-parent = <&ace_intc>;
-			power-domain = <&hub_ulp_domain>;
+			power-domains = <&hub_ulp_domain>;
 		};
 
 		dmic1: dai-dmic1@10100 {
@@ -179,7 +179,7 @@
 			fifo = <0x0108>;
 			interrupts = <0x08 0 0>;
 			interrupt-parent = <&ace_intc>;
-			power-domain = <&hub_ulp_domain>;
+			power-domains = <&hub_ulp_domain>;
 		};
 
 		dmicvss: dmicvss@16000 {
@@ -212,7 +212,7 @@
 				&hda_link_in 1>;
 			dma-names = "tx", "rx";
 			ssp-index = <0>;
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			status = "okay";
 
 			ssp00: ssp@0 {
@@ -277,7 +277,7 @@
 				&hda_link_in 2>;
 			dma-names = "tx", "rx";
 			ssp-index = <1>;
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			status = "okay";
 
 			ssp10: ssp@10 {
@@ -342,7 +342,7 @@
 				&hda_link_in 3>;
 			dma-names = "tx", "rx";
 			ssp-index = <2>;
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			status = "okay";
 
 			ssp20: ssp@20 {
@@ -441,26 +441,32 @@
 			hub_ulp_domain: hub_ulp_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <15>;
+				#power-domain-cells = <0>;
 			};
 			ml0_domain: ml0_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <12>;
+				#power-domain-cells = <0>;
 			};
 			io1_domain: io1_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <9>;
+				#power-domain-cells = <0>;
 			};
 			io0_domain: io0_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <8>;
+				#power-domain-cells = <0>;
 			};
 			hub_hp_domain: hub_hpp_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <6>;
+				#power-domain-cells = <0>;
 			};
 			hst_domain: hst_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <5>;
+				#power-domain-cells = <0>;
 			};
 		};
 
@@ -498,7 +504,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <32>;
-			power-domain = <&hst_domain>;
+			power-domains = <&hst_domain>;
 			interrupts = <13 0 0>;
 			interrupt-parent = <&ace_intc>;
 			status = "okay";
@@ -512,7 +518,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <32>;
-			power-domain = <&hst_domain>;
+			power-domains = <&hst_domain>;
 			interrupts = <12 0 0>;
 			interrupt-parent = <&ace_intc>;
 			status = "okay";
@@ -534,7 +540,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <32>;
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			status = "okay";
 		};
 
@@ -546,7 +552,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <32>;
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			status = "okay";
 		};
 
diff --git a/dts/xtensa/intel/intel_adsp_ace30_ptl.dtsi b/dts/xtensa/intel/intel_adsp_ace30_ptl.dtsi
index 97be77eb757..26ae1c47f56 100644
--- a/dts/xtensa/intel/intel_adsp_ace30_ptl.dtsi
+++ b/dts/xtensa/intel/intel_adsp_ace30_ptl.dtsi
@@ -169,7 +169,7 @@
 			fifo = <0x0008>;
 			interrupts = <0x08 0 0>;
 			interrupt-parent = <&ace_intc>;
-			power-domain = <&hub_ulp_domain>;
+			power-domains = <&hub_ulp_domain>;
 		};
 
 		dmic1: dai-dmic1@10100 {
@@ -179,7 +179,7 @@
 			fifo = <0x0108>;
 			interrupts = <0x08 0 0>;
 			interrupt-parent = <&ace_intc>;
-			power-domain = <&hub_ulp_domain>;
+			power-domains = <&hub_ulp_domain>;
 		};
 
 		dmicvss: dmicvss@16000 {
@@ -212,7 +212,7 @@
 				&hda_link_in 1>;
 			dma-names = "tx", "rx";
 			ssp-index = <0>;
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			status = "okay";
 
 			ssp00: ssp@0 {
@@ -277,7 +277,7 @@
 				&hda_link_in 2>;
 			dma-names = "tx", "rx";
 			ssp-index = <1>;
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			status = "okay";
 
 			ssp10: ssp@10 {
@@ -342,7 +342,7 @@
 				&hda_link_in 3>;
 			dma-names = "tx", "rx";
 			ssp-index = <2>;
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			status = "okay";
 
 			ssp20: ssp@20 {
@@ -441,26 +441,32 @@
 			hub_ulp_domain: hub_ulp_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <15>;
+				#power-domain-cells = <0>;
 			};
 			ml0_domain: ml0_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <12>;
+				#power-domain-cells = <0>;
 			};
 			io1_domain: io1_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <9>;
+				#power-domain-cells = <0>;
 			};
 			io0_domain: io0_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <8>;
+				#power-domain-cells = <0>;
 			};
 			hub_hp_domain: hub_hpp_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <6>;
+				#power-domain-cells = <0>;
 			};
 			hst_domain: hst_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <5>;
+				#power-domain-cells = <0>;
 			};
 		};
 
@@ -498,7 +504,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <32>;
-			power-domain = <&hst_domain>;
+			power-domains = <&hst_domain>;
 			interrupts = <13 0 0>;
 			interrupt-parent = <&ace_intc>;
 			status = "okay";
@@ -512,7 +518,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <32>;
-			power-domain = <&hst_domain>;
+			power-domains = <&hst_domain>;
 			interrupts = <12 0 0>;
 			interrupt-parent = <&ace_intc>;
 			status = "okay";
@@ -534,7 +540,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <32>;
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			status = "okay";
 		};
 
@@ -546,7 +552,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <32>;
-			power-domain = <&io0_domain>;
+			power-domains = <&io0_domain>;
 			status = "okay";
 		};
 
diff --git a/dts/xtensa/nxp/nxp_imx8.dtsi b/dts/xtensa/nxp/nxp_imx8.dtsi
index 21347b595fe..701f2a1dc39 100644
--- a/dts/xtensa/nxp/nxp_imx8.dtsi
+++ b/dts/xtensa/nxp/nxp_imx8.dtsi
@@ -35,7 +35,7 @@
 	irqsteer: interrupt-controller@510a0000 {
 		compatible = "nxp,irqsteer-intc";
 		reg = <0x510a0000 DT_SIZE_K(64)>;
-		power-domain = <&irqstr_pd>;
+		power-domains = <&irqstr_pd>;
 
 		#size-cells = <0>;
 		#address-cells = <1>;
@@ -180,6 +180,7 @@
 				compatible = "nxp,imx8qm-scu-pd", "nxp,scu-pd";
 				reg = <0>;
 				nxp,resource-id = <IMX_SC_R_IRQSTR_DSP>;
+				#power-domain-cells = <0>;
 			};
 		};
 	};
diff --git a/include/zephyr/pm/device.h b/include/zephyr/pm/device.h
index a6e2ef032c0..f7c008f3cf2 100644
--- a/include/zephyr/pm/device.h
+++ b/include/zephyr/pm/device.h
@@ -208,7 +208,7 @@ BUILD_ASSERT(offsetof(struct pm_device_isr, base) == 0);
 #ifdef CONFIG_PM_DEVICE_POWER_DOMAIN
 #define	Z_PM_DEVICE_POWER_DOMAIN_INIT(_node_id)			\
 	.domain = DEVICE_DT_GET_OR_NULL(DT_PHANDLE(_node_id,	\
-				   power_domain)),
+				   power_domains)),
 #else
 #define Z_PM_DEVICE_POWER_DOMAIN_INIT(obj)
 #endif /* CONFIG_PM_DEVICE_POWER_DOMAIN */
diff --git a/tests/drivers/build_all/power_domain/app.overlay b/tests/drivers/build_all/power_domain/app.overlay
index 0551d1b0289..79437b515f2 100644
--- a/tests/drivers/build_all/power_domain/app.overlay
+++ b/tests/drivers/build_all/power_domain/app.overlay
@@ -19,6 +19,7 @@
 		power_domain_gpio {
 			compatible = "power-domain-gpio";
 			enable-gpios = <&test_gpio 0 0>;
+			#power-domain-cells = <0>;
 			zephyr,pm-device-runtime-auto;
 		};
 
@@ -26,6 +27,7 @@
 			compatible = "power-domain-gpio-monitor";
 			status = "okay";
 			gpios = <&test_gpio 0 0>;
+			#power-domain-cells = <0>;
 		};
 	};
 };
diff --git a/tests/kernel/device/app.overlay b/tests/kernel/device/app.overlay
index 108f14bdb3e..ac77f271cc5 100644
--- a/tests/kernel/device/app.overlay
+++ b/tests/kernel/device/app.overlay
@@ -69,17 +69,20 @@
 	fakedomain_0: fakedomain_0 {
 		compatible = "fakedomain";
 		status = "okay";
-		power-domain = <&fakedomain_2>;
+		power-domains = <&fakedomain_2>;
+		#power-domain-cells = <0>;
 	};
 
 	fakedomain_1: fakedomain_1 {
 		compatible = "fakedomain";
 		status = "okay";
-		power-domain = <&fakedomain_0>;
+		power-domains = <&fakedomain_0>;
+		#power-domain-cells = <0>;
 	};
 
 	fakedomain_2: fakedomain_2 {
 		compatible = "fakedomain";
 		status = "okay";
+		#power-domain-cells = <0>;
 	};
 };
diff --git a/tests/kernel/device/boards/hifive_unmatched.overlay b/tests/kernel/device/boards/hifive_unmatched.overlay
index 05f9992d889..6f16d2d9b7b 100644
--- a/tests/kernel/device/boards/hifive_unmatched.overlay
+++ b/tests/kernel/device/boards/hifive_unmatched.overlay
@@ -66,13 +66,13 @@
 	fakedomain_0: fakedomain_0 {
 		compatible = "fakedomain";
 		status = "okay";
-		power-domain = <&fakedomain_2>;
+		power-domains = <&fakedomain_2>;
 	};
 
 	fakedomain_1: fakedomain_1 {
 		compatible = "fakedomain";
 		status = "okay";
-		power-domain = <&fakedomain_0>;
+		power-domains = <&fakedomain_0>;
 	};
 
 	fakedomain_2: fakedomain_2 {
diff --git a/tests/subsys/pm/device_driver_init/app.overlay b/tests/subsys/pm/device_driver_init/app.overlay
index a5518b74be2..ea02a035ba8 100644
--- a/tests/subsys/pm/device_driver_init/app.overlay
+++ b/tests/subsys/pm/device_driver_init/app.overlay
@@ -2,43 +2,50 @@
 	test_reg: test_reg {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 0 0>;
+		#power-domain-cells = <0>;
 	};
 
 	test_reg_chained: test_reg_chained {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 1 0>;
-		power-domain = <&test_reg>;
+		power-domains = <&test_reg>;
+		#power-domain-cells = <0>;
 	};
 
 	test_reg_chained_auto: test_reg_chained_auto {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 2 0>;
-		power-domain = <&test_reg>;
+		power-domains = <&test_reg>;
+		#power-domain-cells = <0>;
 		zephyr,pm-device-runtime-auto;
 	};
 
 	test_reg_auto: test_reg_auto {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 3 0>;
+		#power-domain-cells = <0>;
 		zephyr,pm-device-runtime-auto;
 	};
 
 	test_reg_auto_chained: test_reg_auto_chained {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 4 0>;
-		power-domain = <&test_reg_auto>;
+		#power-domain-cells = <0>;
+		power-domains = <&test_reg_auto>;
 	};
 
 	test_reg_auto_chained_auto: test_reg_auto_chained_auto {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 5 0>;
-		power-domain = <&test_reg_auto>;
+		power-domains = <&test_reg_auto>;
+		#power-domain-cells = <0>;
 		zephyr,pm-device-runtime-auto;
 	};
 
 	test_reg_disabled: test_reg_disabled {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 6 0>;
+		#power-domain-cells = <0>;
 		status = "disabled";
 	};
 };
diff --git a/tests/subsys/pm/device_power_domains/app.overlay b/tests/subsys/pm/device_power_domains/app.overlay
index 0d6dfdfbbd0..e97f3827a2a 100644
--- a/tests/subsys/pm/device_power_domains/app.overlay
+++ b/tests/subsys/pm/device_power_domains/app.overlay
@@ -2,23 +2,26 @@
 	test_reg_0: test_reg_0 {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 0 0>;
+		#power-domain-cells = <0>;
 	};
 
 	test_reg_1: test_reg_1 {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 1 0>;
+		#power-domain-cells = <0>;
 	};
 
 	test_reg_chained: test_reg_chained {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 2 0>;
-		power-domain = <&test_reg_0>;
+		power-domains = <&test_reg_0>;
+		#power-domain-cells = <0>;
 	};
 
 	test_dev: test_dev {
 		compatible = "test-device-pm";
 		status = "okay";
-		power-domain = <&test_reg_1>;
+		power-domains = <&test_reg_1>;
 		alternate-domain = <&test_reg_chained>;
 	};
 };
diff --git a/tests/subsys/pm/power_domain/app.overlay b/tests/subsys/pm/power_domain/app.overlay
index b855ddbac89..2b8acd67b50 100644
--- a/tests/subsys/pm/power_domain/app.overlay
+++ b/tests/subsys/pm/power_domain/app.overlay
@@ -8,28 +8,30 @@
 	test_domain: test_domain {
 		compatible = "power-domain";
 		status = "okay";
+		#power-domain-cells = <0>;
 	};
 
 	test_dev_a: test_dev_a {
 		compatible = "test-device-pm";
 		status = "okay";
-		power-domain = <&test_domain>;
+		power-domains = <&test_domain>;
 	};
 
 	test_dev_b: test_dev_b {
 		compatible = "test-device-pm";
 		status = "okay";
-		power-domain = <&test_domain>;
+		power-domains = <&test_domain>;
 	};
 
 	test_domain_balanced: test_domain_balanced {
 		compatible = "power-domain";
 		status = "okay";
+		#power-domain-cells = <0>;
 	};
 
 	test_dev_balanced: test_dev_balanced {
 		compatible = "test-device-pm";
 		status = "okay";
-		power-domain = <&test_domain_balanced>;
+		power-domains = <&test_domain_balanced>;
 	};
 };

From 7b74e8a87d1123c718c30509aa7809a0cdd460b3 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Thu, 10 Oct 2024 14:17:52 +0200
Subject: [PATCH 0601/2913] [nrf fromtree] dts: bindings: power: add
 nordic,nrf-global-pd

Add binding for Global Power Domain found in nRF54Hx SoCs.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit f3d29d6fd29d04fdec441d5e1fbbdbeb4c3888c4)
(cherry picked from commit 49d80982dadf39077558b56eaea2a4535c6fb1da)
---
 dts/bindings/power/nordic,nrf-gpd.yaml          | 11 +++++++++++
 .../zephyr/dt-bindings/power/nordic-nrf-gpd.h   | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 dts/bindings/power/nordic,nrf-gpd.yaml
 create mode 100644 include/zephyr/dt-bindings/power/nordic-nrf-gpd.h

diff --git a/dts/bindings/power/nordic,nrf-gpd.yaml b/dts/bindings/power/nordic,nrf-gpd.yaml
new file mode 100644
index 00000000000..feb5f2862e9
--- /dev/null
+++ b/dts/bindings/power/nordic,nrf-gpd.yaml
@@ -0,0 +1,11 @@
+# Copyright 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Nordic nRF Global Power Domain
+
+compatible: "nordic,nrf-gpd"
+
+include: base.yaml
+
+power-domain-cells:
+  - id
diff --git a/include/zephyr/dt-bindings/power/nordic-nrf-gpd.h b/include/zephyr/dt-bindings/power/nordic-nrf-gpd.h
new file mode 100644
index 00000000000..7f6952f6f0b
--- /dev/null
+++ b/include/zephyr/dt-bindings/power/nordic-nrf-gpd.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_POWER_NORDIC_NRF_GLOBAL_PD
+#define ZEPHYR_INCLUDE_DT_BINDINGS_POWER_NORDIC_NRF_GLOBAL_PD
+
+/* numbers aligned to nrfs service identifiers */
+#define NRF_GPD_SLOW_MAIN 2U
+#define NRF_GPD_SLOW_ACTIVE 1U
+#define NRF_GPD_FAST_MAIN 3U
+#define NRF_GPD_FAST_ACTIVE1 0U
+#define NRF_GPD_FAST_ACTIVE0 4U
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_POWER_NORDIC_NRF_GLOBAL_PD */

From dd1dd4918e1b0f1b250efd535e5cb5456f218931 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Wed, 16 Oct 2024 10:47:17 +0200
Subject: [PATCH 0602/2913] [nrf fromtree] dts: nordic: nrf54h20: define global
 power domain

Add the global power domain entry. This domain is not memory-mapped
but controlled using NRFS services.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit a56a170b7e4009d020969e17f3f82554c5f0b580)
(cherry picked from commit 08a808e8ce3eb37c1077334749ffa31cdd3ce9e6)
---
 dts/common/nordic/nrf54h20.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 282da95ab64..672a098b111 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -194,6 +194,11 @@
 		};
 	};
 
+	gpd: global-power-domain {
+		compatible = "nordic,nrf-gpd";
+		#power-domain-cells = <1>;
+	};
+
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;

From 0c4b34257f0ee3d2f49e3b0bbfa66df93ea93916 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Thu, 10 Oct 2024 14:18:51 +0200
Subject: [PATCH 0603/2913] [nrf fromtree] dts: nordic: nrf54h20: add power
 domain information

So that it can be used to manually control certain power domains.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 01e285c1bad4e1f175502a0bc39b13815c9055c9)
(cherry picked from commit e5ea30fc716f2988406d9c955ce1a79f90c99375)
---
 dts/common/nordic/nrf54h20.dtsi | 84 +++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 672a098b111..e72ca15bbaa 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -13,6 +13,7 @@
 #include <zephyr/dt-bindings/misc/nordic-owner-id-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-tddconf.h>
 #include <zephyr/dt-bindings/reserved-memory/nordic-owned-memory.h>
+#include <zephyr/dt-bindings/power/nordic-nrf-gpd.h>
 
 /delete-node/ &sw_pwm;
 
@@ -206,6 +207,7 @@
 		mram1x: mram@e000000 {
 			compatible = "nordic,mram";
 			reg = <0xe000000 DT_SIZE_K(2048)>;
+			power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 			erase-block-size = <4096>;
 			write-block-size = <16>;
 		};
@@ -491,6 +493,7 @@
 				reg = <0x86000 0x1000>, <0x2f700000 0x40000>;
 				reg-names = "wrapper", "core";
 				interrupts = <134 NRF_DEFAULT_IRQ_PRIORITY>;
+				power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 				num-in-eps = <8>;
 				num-out-eps = <10>;
 				ghwcfg1 = <0xaa555000>;
@@ -506,6 +509,7 @@
 				reg = <0x95000 0x500 0x95500 0xb00>;
 				reg-names = "wrapper", "core";
 				interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>;
+				power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 				clock-frequency = <DT_FREQ_M(400)>;
 				fifo-depth = <32>;
 				max-xfer-size = <16>;
@@ -515,18 +519,21 @@
 			cpusec_bellboard: mailbox@99000 {
 				reg = <0x99000 0x1000>;
 				status = "disabled";
+				power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 				#mbox-cells = <1>;
 			};
 
 			cpuapp_bellboard: mailbox@9a000 {
 				reg = <0x9a000 0x1000>;
 				status = "disabled";
+				power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 				#mbox-cells = <1>;
 			};
 
 			cpurad_bellboard: mailbox@9b000 {
 				reg = <0x9b000 0x1000>;
 				status = "disabled";
+				power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 				#mbox-cells = <1>;
 			};
 
@@ -567,6 +574,7 @@
 				compatible = "nordic,nrf-vpr-coprocessor";
 				reg = <0x8d4000 0x1000>;
 				status = "disabled";
+				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				ranges = <0x0 0x8d4000 0x1000>;
@@ -587,6 +595,7 @@
 				reg-names = "wrapper", "m_can", "message_ram";
 				interrupts = <216 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&canpll>;
+				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				bosch,mram-cfg = <0x0 28 8 3 3 0 1 1>;
 				status = "disabled";
 			};
@@ -595,6 +604,7 @@
 				compatible = "nordic,nrf-dppic-global";
 				reg = <0x8e1000 0x1000>;
 				status = "disabled";
+				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 			};
 
 			timer120: timer@8e2000 {
@@ -603,6 +613,7 @@
 				status = "disabled";
 				cc-num = <6>;
 				interrupts = <226 NRF_DEFAULT_IRQ_PRIORITY>;
+				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				max-bit-width = <32>;
 				max-frequency = <DT_FREQ_M(320)>;
 				prescaler = <0>;
@@ -614,6 +625,7 @@
 				status = "disabled";
 				cc-num = <6>;
 				interrupts = <227 NRF_DEFAULT_IRQ_PRIORITY>;
+				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				max-bit-width = <32>;
 				max-frequency = <DT_FREQ_M(320)>;
 				prescaler = <0>;
@@ -624,6 +636,7 @@
 				reg = <0x8e4000 0x1000>;
 				status = "disabled";
 				interrupts = <228 NRF_DEFAULT_IRQ_PRIORITY>;
+				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				#pwm-cells = <3>;
 			};
 
@@ -631,6 +644,7 @@
 				compatible = "nordic,nrf-spim";
 				reg = <0x8e6000 0x1000>;
 				status = "disabled";
+				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				easydma-maxcnt-bits = <15>;
 				interrupts = <230 NRF_DEFAULT_IRQ_PRIORITY>;
 				max-frequency = <DT_FREQ_M(32)>;
@@ -648,6 +662,7 @@
 				status = "disabled";
 				interrupts = <230 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&hsfll120>;
+				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;
 			};
@@ -658,6 +673,7 @@
 				status = "disabled";
 				easydma-maxcnt-bits = <15>;
 				interrupts = <231 NRF_DEFAULT_IRQ_PRIORITY>;
+				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				max-frequency = <DT_FREQ_M(32)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -674,6 +690,7 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 				ranges = <0x0 0x908000 0x1000>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 
 				cpuppr_vevif_tx: mailbox@0 {
 					compatible = "nordic,nrf-vevif-task-tx";
@@ -689,6 +706,7 @@
 				compatible = "nordic,nrf-ipct-global";
 				reg = <0x921000 0x1000>;
 				status = "disabled";
+				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 				channels = <8>;
 				global-domain-id = <13>;
 			};
@@ -697,6 +715,7 @@
 				compatible = "nordic,nrf-dppic-global";
 				reg = <0x922000 0x1000>;
 				status = "disabled";
+				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 			};
 
 			rtc130: rtc@928000 {
@@ -706,6 +725,7 @@
 				cc-num = <4>;
 				clock-frequency = <32768>;
 				interrupts = <296 NRF_DEFAULT_IRQ_PRIORITY>;
+				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 				clocks = <&lfclk>;
 				prescaler = <1>;
 			};
@@ -717,6 +737,7 @@
 				cc-num = <4>;
 				clock-frequency = <32768>;
 				interrupts = <297 NRF_DEFAULT_IRQ_PRIORITY>;
+				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 				clocks = <&lfclk>;
 				prescaler = <1>;
 			};
@@ -727,6 +748,7 @@
 				status = "disabled";
 				interrupts = <299 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&lfclk>;
+				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 			};
 
 			wdt132: watchdog@92c000 {
@@ -735,6 +757,7 @@
 				status = "disabled";
 				interrupts = <300 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&lfclk>;
+				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 			};
 
 			egu130: egu@92d000 {
@@ -742,12 +765,14 @@
 				reg = <0x92d000 0x1000>;
 				status = "disabled";
 				interrupts = <301 NRF_DEFAULT_IRQ_PRIORITY>;
+				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 			};
 
 			gpiote130: gpiote@934000 {
 				compatible = "nordic,nrf-gpiote";
 				reg = <0x934000 0x1000>;
 				status = "disabled";
+				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 				instance = <130>;
 			};
 
@@ -757,6 +782,7 @@
 				status = "disabled";
 				#gpio-cells = <2>;
 				gpio-controller;
+				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 				gpiote-instance = <&gpiote130>;
 				ngpios = <12>;
 				port = <0>;
@@ -768,6 +794,7 @@
 				status = "disabled";
 				#gpio-cells = <2>;
 				gpio-controller;
+				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 				gpiote-instance = <&gpiote130>;
 				ngpios = <12>;
 				port = <1>;
@@ -779,6 +806,7 @@
 				status = "disabled";
 				#gpio-cells = <2>;
 				gpio-controller;
+				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 				gpiote-instance = <&gpiote130>;
 				ngpios = <12>;
 				port = <2>;
@@ -790,6 +818,9 @@
 				status = "disabled";
 				#gpio-cells = <2>;
 				gpio-controller;
+				power-domains = <&gpd NRF_GPD_SLOW_MAIN>,
+						<&gpd NRF_GPD_FAST_ACTIVE1>;
+				power-domain-names = "peripheral", "pad";
 				ngpios = <14>;
 				port = <6>;
 			};
@@ -800,6 +831,9 @@
 				status = "disabled";
 				#gpio-cells = <2>;
 				gpio-controller;
+				power-domains = <&gpd NRF_GPD_SLOW_MAIN>,
+						<&gpd NRF_GPD_FAST_ACTIVE1>;
+				power-domain-names = "peripheral", "pad";
 				ngpios = <8>;
 				port = <7>;
 			};
@@ -810,6 +844,7 @@
 				status = "disabled";
 				#gpio-cells = <2>;
 				gpio-controller;
+				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 				gpiote-instance = <&gpiote130>;
 				ngpios = <6>;
 				port = <9>;
@@ -819,6 +854,7 @@
 				compatible = "nordic,nrf-dppic-global";
 				reg = <0x981000 0x1000>;
 				status = "disabled";
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			adc: adc@982000 {
@@ -827,6 +863,7 @@
 				interrupts = <386 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				#io-channel-cells = <1>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			comp: comparator@983000 {
@@ -838,6 +875,7 @@
 				reg = <0x983000 0x1000>;
 				status = "disabled";
 				interrupts = <387 NRF_DEFAULT_IRQ_PRIORITY>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			temp: temperature-sensor@984000 {
@@ -845,6 +883,7 @@
 				reg = <0x984000 0x1000>;
 				interrupts = <388 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			nfct: nfct@985000 {
@@ -852,12 +891,14 @@
 				reg = <0x985000 0x1000>;
 				status = "disabled";
 				interrupts = <389 NRF_DEFAULT_IRQ_PRIORITY>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			dppic132: dppic@991000 {
 				compatible = "nordic,nrf-dppic-global";
 				reg = <0x991000 0x1000>;
 				status = "disabled";
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			qdec130: qdec@994000 {
@@ -865,6 +906,7 @@
 				reg = <0x994000 0x1000>;
 				status = "disabled";
 				interrupts = <404 NRF_DEFAULT_IRQ_PRIORITY>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			qdec131: qdec@995000 {
@@ -872,6 +914,7 @@
 				reg = <0x995000 0x1000>;
 				status = "disabled";
 				interrupts = <405 NRF_DEFAULT_IRQ_PRIORITY>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			grtc: grtc@99c000 {
@@ -884,12 +927,14 @@
 				 *  one is linked here.
 				 */
 				clocks = <&lfclk>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			dppic133: dppic@9a1000 {
 				compatible = "nordic,nrf-dppic-global";
 				reg = <0x9a1000 0x1000>;
 				status = "disabled";
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			timer130: timer@9a2000 {
@@ -899,6 +944,7 @@
 				cc-num = <6>;
 				interrupts = <418 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-bit-width = <32>;
 				prescaler = <0>;
 			};
@@ -910,6 +956,7 @@
 				cc-num = <6>;
 				interrupts = <419 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-bit-width = <32>;
 				prescaler = <0>;
 			};
@@ -920,6 +967,7 @@
 				status = "disabled";
 				interrupts = <420 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				#pwm-cells = <3>;
 			};
 
@@ -929,6 +977,7 @@
 				status = "disabled";
 				interrupts = <421 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				easydma-maxcnt-bits = <15>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -943,6 +992,7 @@
 				easydma-maxcnt-bits = <15>;
 				interrupts = <421 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-frequency = <DT_FREQ_M(8)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -960,6 +1010,7 @@
 				status = "disabled";
 				interrupts = <421 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;
@@ -971,6 +1022,7 @@
 				status = "disabled";
 				interrupts = <422 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				easydma-maxcnt-bits = <15>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -985,6 +1037,7 @@
 				easydma-maxcnt-bits = <15>;
 				interrupts = <422 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-frequency = <DT_FREQ_M(8)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1002,6 +1055,7 @@
 				status = "disabled";
 				interrupts = <422 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;
@@ -1011,6 +1065,7 @@
 				compatible = "nordic,nrf-dppic-global";
 				reg = <0x9b1000 0x1000>;
 				status = "disabled";
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			timer132: timer@9b2000 {
@@ -1020,6 +1075,7 @@
 				cc-num = <6>;
 				interrupts = <434 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-bit-width = <32>;
 				prescaler = <0>;
 			};
@@ -1031,6 +1087,7 @@
 				cc-num = <6>;
 				interrupts = <435 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-bit-width = <32>;
 				prescaler = <0>;
 			};
@@ -1041,6 +1098,7 @@
 				status = "disabled";
 				interrupts = <436 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				#pwm-cells = <3>;
 			};
 
@@ -1050,6 +1108,7 @@
 				status = "disabled";
 				interrupts = <437 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				easydma-maxcnt-bits = <15>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1064,6 +1123,7 @@
 				easydma-maxcnt-bits = <15>;
 				interrupts = <437 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-frequency = <DT_FREQ_M(8)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1081,6 +1141,7 @@
 				status = "disabled";
 				interrupts = <437 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;
@@ -1092,6 +1153,7 @@
 				status = "disabled";
 				interrupts = <438 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				easydma-maxcnt-bits = <15>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1106,6 +1168,7 @@
 				easydma-maxcnt-bits = <15>;
 				interrupts = <438 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-frequency = <DT_FREQ_M(8)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1123,6 +1186,7 @@
 				status = "disabled";
 				interrupts = <438 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;
@@ -1132,6 +1196,7 @@
 				compatible = "nordic,nrf-dppic-global";
 				reg = <0x9c1000 0x1000>;
 				status = "disabled";
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			timer134: timer@9c2000 {
@@ -1141,6 +1206,7 @@
 				cc-num = <6>;
 				interrupts = <450 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-bit-width = <32>;
 				prescaler = <0>;
 			};
@@ -1152,6 +1218,7 @@
 				cc-num = <6>;
 				interrupts = <451 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-bit-width = <32>;
 				prescaler = <0>;
 			};
@@ -1163,6 +1230,7 @@
 				interrupts = <452 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
 				#pwm-cells = <3>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			i2c134: i2c@9c5000 {
@@ -1171,6 +1239,7 @@
 				status = "disabled";
 				interrupts = <453 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				easydma-maxcnt-bits = <15>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1185,6 +1254,7 @@
 				easydma-maxcnt-bits = <15>;
 				interrupts = <453 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-frequency = <DT_FREQ_M(8)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1202,6 +1272,7 @@
 				status = "disabled";
 				interrupts = <453 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;
@@ -1213,6 +1284,7 @@
 				status = "disabled";
 				interrupts = <454 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				easydma-maxcnt-bits = <15>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1227,6 +1299,7 @@
 				easydma-maxcnt-bits = <15>;
 				interrupts = <454 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-frequency = <DT_FREQ_M(8)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1244,6 +1317,7 @@
 				status = "disabled";
 				interrupts = <454 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;
@@ -1253,6 +1327,7 @@
 				compatible = "nordic,nrf-dppic-global";
 				reg = <0x9d1000 0x1000>;
 				status = "disabled";
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			timer136: timer@9d2000 {
@@ -1262,6 +1337,7 @@
 				cc-num = <6>;
 				interrupts = <466 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-bit-width = <32>;
 				prescaler = <0>;
 			};
@@ -1273,6 +1349,7 @@
 				cc-num = <6>;
 				interrupts = <467 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-bit-width = <32>;
 				prescaler = <0>;
 			};
@@ -1284,6 +1361,7 @@
 				interrupts = <468 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
 				#pwm-cells = <3>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			i2c136: i2c@9d5000 {
@@ -1292,6 +1370,7 @@
 				status = "disabled";
 				interrupts = <469 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				easydma-maxcnt-bits = <15>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1306,6 +1385,7 @@
 				easydma-maxcnt-bits = <15>;
 				interrupts = <469 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-frequency = <DT_FREQ_M(8)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1323,6 +1403,7 @@
 				status = "disabled";
 				interrupts = <469 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;
@@ -1334,6 +1415,7 @@
 				status = "disabled";
 				interrupts = <470 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				easydma-maxcnt-bits = <15>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1348,6 +1430,7 @@
 				easydma-maxcnt-bits = <15>;
 				interrupts = <470 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-frequency = <DT_FREQ_M(8)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1365,6 +1448,7 @@
 				status = "disabled";
 				interrupts = <470 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;

From d805bf3c313164784466d655db396331c4109cdd Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Thu, 10 Oct 2024 15:57:52 +0200
Subject: [PATCH 0604/2913] [nrf fromtree] drivers: pinctrl: nrf: add flag to
 signal the FAST_ACTIVE1 peripherals

This patch introduces a new flag to indicate if a peripheral belongs
to FAST_ACTIVE1 domain. This way, pinctrl knows when to request the
SLOW_ACTIVE domain (where CTRLSEL multiplexer resides).

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 9925ec99fddfe26bfd34a8cd4fce1642964573cb)
(cherry picked from commit 2f86d8b9c90e553c4b51a69432b9630dd86be92e)
---
 drivers/pinctrl/pinctrl_nrf.c                 | 32 +++++++++++++++++++
 .../zephyr/dt-bindings/pinctrl/nrf-pinctrl.h  | 12 +++++--
 soc/nordic/common/pinctrl_soc.h               | 22 ++++++++++++-
 3 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 7c6d83020bf..1e80de8fe67 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -7,6 +7,9 @@
 #include <zephyr/drivers/pinctrl.h>
 
 #include <hal/nrf_gpio.h>
+#ifdef CONFIG_SOC_NRF54H20_GPD
+#include <nrf/gpd.h>
+#endif
 
 BUILD_ASSERT(((NRF_PULL_NONE == NRF_GPIO_PIN_NOPULL) &&
 	      (NRF_PULL_DOWN == NRF_GPIO_PIN_PULLDOWN) &&
@@ -352,6 +355,21 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 		if (psel != PSEL_DISCONNECTED) {
 			uint32_t pin = psel;
 
+#ifdef CONFIG_SOC_NRF54H20_GPD
+			if (NRF_GET_GPD_FAST_ACTIVE1(pins[i]) == 1U) {
+				int ret;
+				uint32_t d_pin = pin;
+				NRF_GPIO_Type *port = nrf_gpio_pin_port_decode(&d_pin);
+
+				ret = nrf_gpd_request(NRF_GPD_SLOW_ACTIVE);
+				if (ret < 0) {
+					return ret;
+				}
+
+				port->RETAINCLR = BIT(d_pin);
+			}
+#endif /* CONFIG_SOC_NRF54H20_GPD */
+
 			if (write != NO_WRITE) {
 				nrf_gpio_pin_write(pin, write);
 			}
@@ -367,6 +385,20 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 #if NRF_GPIO_HAS_CLOCKPIN
 			nrf_gpio_pin_clock_set(pin, NRF_GET_CLOCKPIN_ENABLE(pins[i]));
 #endif
+#ifdef CONFIG_SOC_NRF54H20_GPD
+			if (NRF_GET_GPD_FAST_ACTIVE1(pins[i]) == 1U) {
+				int ret;
+				uint32_t d_pin = pin;
+				NRF_GPIO_Type *port = nrf_gpio_pin_port_decode(&d_pin);
+
+				port->RETAINSET = BIT(d_pin);
+
+				ret = nrf_gpd_release(NRF_GPD_SLOW_ACTIVE);
+				if (ret < 0) {
+					return ret;
+				}
+			}
+#endif /* CONFIG_SOC_NRF54H20_GPD */
 		}
 	}
 
diff --git a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
index 7afa6783814..4611baef95c 100644
--- a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
@@ -10,7 +10,9 @@
  * The whole nRF pin configuration information is encoded in a 32-bit bitfield
  * organized as follows:
  *
- * - 31..18: Pin function.
+ * - 31..24: Pin function.
+ * - 19-23:  Reserved.
+ * - 18:     Associated peripheral belongs to GD FAST ACTIVE1 (nRF54H only)
  * - 17:     Clockpin enable.
  * - 16:     Pin inversion mode.
  * - 15:     Pin low power mode.
@@ -25,9 +27,13 @@
  */
 
 /** Position of the function field. */
-#define NRF_FUN_POS 18U
+#define NRF_FUN_POS 24U
 /** Mask for the function field. */
-#define NRF_FUN_MSK 0x3FFFU
+#define NRF_FUN_MSK 0xFFU
+/** Position of the GPD FAST ACTIVE1 */
+#define NRF_GPD_FAST_ACTIVE1_POS 18U
+/** Mask for the GPD FAST ACTIVE1 */
+#define NRF_GPD_FAST_ACTIVE1_MSK 0x1U
 /** Position of the clockpin enable field. */
 #define NRF_CLOCKPIN_ENABLE_POS 17U
 /** Mask for the clockpin enable field. */
diff --git a/soc/nordic/common/pinctrl_soc.h b/soc/nordic/common/pinctrl_soc.h
index ea0f0196e2b..f1d3b6357f9 100644
--- a/soc/nordic/common/pinctrl_soc.h
+++ b/soc/nordic/common/pinctrl_soc.h
@@ -14,6 +14,7 @@
 
 #include <zephyr/devicetree.h>
 #include <zephyr/dt-bindings/pinctrl/nrf-pinctrl.h>
+#include <zephyr/dt-bindings/power/nordic-nrf-gpd.h>
 #include <zephyr/types.h>
 
 #ifdef __cplusplus
@@ -55,6 +56,16 @@ typedef uint32_t pinctrl_soc_pin_t;
 			(), NRF_GET_FUN(DT_PROP_BY_IDX(node_id, prop, idx)))        \
 		      0)), (0))
 
+/**
+ * @brief Utility macro to get the GPD_FAST_ACTIVE1 flag
+ *
+ * @param p_node_id Parent node identifier.
+ */
+#define Z_GET_GPD_FAST_ACTIVE1(p_node_id)				       \
+	COND_CODE_1(DT_NODE_HAS_PROP(p_node_id, power_domains),		       \
+		    ((DT_PHA(p_node_id, power_domains, id) ==		       \
+		      NRF_GPD_FAST_ACTIVE1) << NRF_GPD_FAST_ACTIVE1_POS), (0))
+
 /**
  * @brief Utility macro to initialize each pin.
  *
@@ -70,7 +81,8 @@ typedef uint32_t pinctrl_soc_pin_t;
 	 (DT_PROP(node_id, nordic_drive_mode) << NRF_DRIVE_POS) |	       \
 	 ((NRF_LP_ENABLE * DT_PROP(node_id, low_power_enable)) << NRF_LP_POS) |\
 	 (DT_PROP(node_id, nordic_invert) << NRF_INVERT_POS) |		       \
-	 Z_GET_CLOCKPIN_ENABLE(node_id, prop, idx, p_node_id)		       \
+	 Z_GET_CLOCKPIN_ENABLE(node_id, prop, idx, p_node_id) |		       \
+	 Z_GET_GPD_FAST_ACTIVE1(p_node_id)				       \
 	),
 
 /**
@@ -99,6 +111,14 @@ typedef uint32_t pinctrl_soc_pin_t;
 #define NRF_GET_CLOCKPIN_ENABLE(pincfg) \
 	(((pincfg) >> NRF_CLOCKPIN_ENABLE_POS) & NRF_CLOCKPIN_ENABLE_MSK)
 
+/**
+ * @brief Utility macro to obtain GPD_FAST_ACTIVE1 flag
+ *
+ * @param pincfg Pin configuration bit field.
+ */
+#define NRF_GET_GPD_FAST_ACTIVE1(pincfg) \
+	(((pincfg) >> NRF_GPD_FAST_ACTIVE1_POS) & NRF_GPD_FAST_ACTIVE1_MSK)
+
 /**
  * @brief Utility macro to obtain pin inversion flag.
  *

From ddfcaa314a5a9c7dbc1614ff2f49062ca8ba619a Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Thu, 10 Oct 2024 14:19:26 +0200
Subject: [PATCH 0605/2913] [nrf fromtree] soc: nordic: nrf54h: add SoC level
 API to request/release GPD

Add a new soc-level API that allows to manually request/release global
power domains.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 87a42a89cb60a0f725b6ef0e0d4e84dff5f461ba)
(cherry picked from commit b9a4d5cd0ba651177261f9048b02a096c486e2b3)
---
 soc/nordic/nrf54h/CMakeLists.txt        |   2 +
 soc/nordic/nrf54h/Kconfig               |   2 +
 soc/nordic/nrf54h/gpd/CMakeLists.txt    |   5 +
 soc/nordic/nrf54h/gpd/Kconfig           |  12 ++
 soc/nordic/nrf54h/gpd/gpd.c             | 276 ++++++++++++++++++++++++
 soc/nordic/nrf54h/gpd/include/nrf/gpd.h |  33 +++
 6 files changed, 330 insertions(+)
 create mode 100644 soc/nordic/nrf54h/gpd/CMakeLists.txt
 create mode 100644 soc/nordic/nrf54h/gpd/Kconfig
 create mode 100644 soc/nordic/nrf54h/gpd/gpd.c
 create mode 100644 soc/nordic/nrf54h/gpd/include/nrf/gpd.h

diff --git a/soc/nordic/nrf54h/CMakeLists.txt b/soc/nordic/nrf54h/CMakeLists.txt
index 0496841ffe7..7edc4d43ea1 100644
--- a/soc/nordic/nrf54h/CMakeLists.txt
+++ b/soc/nordic/nrf54h/CMakeLists.txt
@@ -15,3 +15,5 @@ zephyr_include_directories(.)
 # Ensure that image size aligns with 16 bytes so that MRAMC finalizes all writes
 # for the image correctly
 zephyr_linker_sources(SECTIONS SORT_KEY zzz_place_align_at_end align.ld)
+
+add_subdirectory(gpd)
diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
index 9132ca8458b..1b667e25985 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -75,3 +75,5 @@ config SOC_NRF54H20_CPUFLPR
 
 config SOC_NRF54H20_ENGB_CPUFLPR
 	depends on RISCV_CORE_NORDIC_VPR
+
+rsource "gpd/Kconfig"
diff --git a/soc/nordic/nrf54h/gpd/CMakeLists.txt b/soc/nordic/nrf54h/gpd/CMakeLists.txt
new file mode 100644
index 00000000000..7d029d2c8fc
--- /dev/null
+++ b/soc/nordic/nrf54h/gpd/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Copyright (c) 2024 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library_sources_ifdef(CONFIG_SOC_NRF54H20_GPD gpd.c)
+zephyr_include_directories(include)
diff --git a/soc/nordic/nrf54h/gpd/Kconfig b/soc/nordic/nrf54h/gpd/Kconfig
new file mode 100644
index 00000000000..b9bd568cda6
--- /dev/null
+++ b/soc/nordic/nrf54h/gpd/Kconfig
@@ -0,0 +1,12 @@
+# Copyright (c) 2024 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_NRF54H20_GPD
+	bool "Global Power Domain service"
+	imply NRFS
+	imply NRFS_GDPWR_SERVICE_ENABLED
+	select ONOFF
+	default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || \
+		     SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
+	help
+	  This option enables the Global Power Domain service.
diff --git a/soc/nordic/nrf54h/gpd/gpd.c b/soc/nordic/nrf54h/gpd/gpd.c
new file mode 100644
index 00000000000..33cdb876e16
--- /dev/null
+++ b/soc/nordic/nrf54h/gpd/gpd.c
@@ -0,0 +1,276 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <errno.h>
+
+#include <zephyr/init.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/onoff.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/sys/util.h>
+
+#include <nrf/gpd.h>
+#include <nrfs_gdpwr.h>
+#include <nrfs_backend_ipc_service.h>
+
+LOG_MODULE_REGISTER(gpd, CONFIG_SOC_LOG_LEVEL);
+
+/* enforce alignment between DT<->nrfs */
+BUILD_ASSERT(GDPWR_POWER_DOMAIN_ACTIVE_FAST == NRF_GPD_FAST_ACTIVE1);
+BUILD_ASSERT(GDPWR_POWER_DOMAIN_ACTIVE_SLOW == NRF_GPD_SLOW_ACTIVE);
+BUILD_ASSERT(GDPWR_POWER_DOMAIN_MAIN_SLOW == NRF_GPD_SLOW_MAIN);
+
+struct gpd_onoff_manager {
+	struct onoff_manager mgr;
+	onoff_notify_fn notify;
+	uint8_t id;
+};
+
+static void start(struct onoff_manager *mgr, onoff_notify_fn notify);
+static void stop(struct onoff_manager *mgr, onoff_notify_fn notify);
+
+#define GPD_READY_TIMEOUT_MS 1000
+
+#define GPD_SERVICE_READY   BIT(0)
+#define GPD_SERVICE_ERROR   BIT(1)
+#define GPD_SERVICE_REQ_OK  BIT(2)
+#define GPD_SERVICE_REQ_ERR BIT(3)
+static atomic_t gpd_service_status = ATOMIC_INIT(0);
+
+static struct gpd_onoff_manager fast_active1 = {.id = NRF_GPD_FAST_ACTIVE1};
+static struct gpd_onoff_manager slow_active = {.id = NRF_GPD_SLOW_ACTIVE};
+static struct gpd_onoff_manager slow_main = {.id = NRF_GPD_SLOW_MAIN};
+
+static const struct onoff_transitions transitions =
+	ONOFF_TRANSITIONS_INITIALIZER(start, stop, NULL);
+
+static struct gpd_onoff_manager *get_mgr(uint8_t id)
+{
+	switch (id) {
+	case NRF_GPD_FAST_ACTIVE1:
+		return &fast_active1;
+	case NRF_GPD_SLOW_ACTIVE:
+		return &slow_active;
+	case NRF_GPD_SLOW_MAIN:
+		return &slow_main;
+	default:
+		return NULL;
+	}
+}
+
+static int nrf_gpd_sync(struct gpd_onoff_manager *gpd_mgr)
+{
+	int64_t start;
+	nrfs_err_t err;
+	gdpwr_request_type_t request;
+
+	K_SPINLOCK(&gpd_mgr->mgr.lock) {
+		if (gpd_mgr->mgr.refs == 0) {
+			request = GDPWR_POWER_REQUEST_CLEAR;
+		} else {
+			request = GDPWR_POWER_REQUEST_SET;
+		}
+	}
+
+	atomic_clear_bit(&gpd_service_status, GPD_SERVICE_REQ_ERR);
+	atomic_clear_bit(&gpd_service_status, GPD_SERVICE_REQ_OK);
+
+	err = nrfs_gdpwr_power_request(gpd_mgr->id, request, gpd_mgr);
+	if (err != NRFS_SUCCESS) {
+		return -EIO;
+	}
+
+	start = k_uptime_get();
+	while (k_uptime_get() - start < GPD_READY_TIMEOUT_MS) {
+		if (atomic_test_bit(&gpd_service_status, GPD_SERVICE_REQ_ERR)) {
+			return -EIO;
+		}
+
+		if (atomic_test_bit(&gpd_service_status, GPD_SERVICE_REQ_OK)) {
+			return 0;
+		}
+	}
+
+	LOG_ERR("nRFs GDPWR request timed out");
+
+	return -ETIMEDOUT;
+}
+
+static void evt_handler(nrfs_gdpwr_evt_t const *p_evt, void *context)
+{
+	if (atomic_test_bit(&gpd_service_status, GPD_SERVICE_READY)) {
+		struct gpd_onoff_manager *gpd_mgr = context;
+
+		switch (p_evt->type) {
+		case NRFS_GDPWR_REQ_APPLIED:
+			gpd_mgr->notify(&gpd_mgr->mgr, 0);
+			break;
+		default:
+			LOG_ERR("nRFs GDPWR request not applied");
+			gpd_mgr->notify(&gpd_mgr->mgr, -EIO);
+			break;
+		}
+	} else {
+		switch (p_evt->type) {
+		case NRFS_GDPWR_REQ_APPLIED:
+			atomic_set_bit(&gpd_service_status, GPD_SERVICE_REQ_OK);
+			break;
+		default:
+			LOG_ERR("nRFs GDPWR request not applied");
+			atomic_set_bit(&gpd_service_status, GPD_SERVICE_REQ_ERR);
+			break;
+		}
+	}
+}
+
+static void start(struct onoff_manager *mgr, onoff_notify_fn notify)
+{
+	struct gpd_onoff_manager *gpd_mgr = CONTAINER_OF(mgr, struct gpd_onoff_manager, mgr);
+
+	gpd_mgr->notify = notify;
+
+	if (!atomic_test_bit(&gpd_service_status, GPD_SERVICE_READY)) {
+		notify(mgr, 0);
+	} else {
+		nrfs_err_t err;
+
+		err = nrfs_gdpwr_power_request(gpd_mgr->id, GDPWR_POWER_REQUEST_SET, gpd_mgr);
+		if (err != NRFS_SUCCESS) {
+			LOG_ERR("nRFs GDPWR request failed (%d)", err);
+			notify(mgr, -EIO);
+		}
+	}
+}
+
+static void stop(struct onoff_manager *mgr, onoff_notify_fn notify)
+{
+	struct gpd_onoff_manager *gpd_mgr = CONTAINER_OF(mgr, struct gpd_onoff_manager, mgr);
+
+	gpd_mgr->notify = notify;
+
+	if (!atomic_test_bit(&gpd_service_status, GPD_SERVICE_READY)) {
+		notify(mgr, 0);
+	} else {
+		nrfs_err_t err;
+
+		err = nrfs_gdpwr_power_request(gpd_mgr->id, GDPWR_POWER_REQUEST_CLEAR, gpd_mgr);
+		if (err != NRFS_SUCCESS) {
+			LOG_ERR("nRFs GDPWR request failed (%d)", err);
+			notify(mgr, -EIO);
+		}
+	}
+}
+
+int nrf_gpd_request(uint8_t id)
+{
+	int ret;
+	struct onoff_client client;
+	struct gpd_onoff_manager *gpd_mgr;
+
+	gpd_mgr = get_mgr(id);
+	if (gpd_mgr == NULL) {
+		return -EINVAL;
+	}
+
+	if (atomic_test_bit(&gpd_service_status, GPD_SERVICE_ERROR)) {
+		LOG_ERR("GPD service did not initialize properly");
+		return -EIO;
+	}
+
+	sys_notify_init_spinwait(&client.notify);
+
+	onoff_request(&gpd_mgr->mgr, &client);
+
+	while (sys_notify_fetch_result(&client.notify, &ret) == -EAGAIN) {
+	}
+
+	return ret;
+}
+
+int nrf_gpd_release(uint8_t id)
+{
+	struct gpd_onoff_manager *gpd_mgr;
+
+	gpd_mgr = get_mgr(id);
+	if (gpd_mgr == NULL) {
+		return -EINVAL;
+	}
+
+	if (atomic_test_bit(&gpd_service_status, GPD_SERVICE_ERROR)) {
+		LOG_ERR("GPD service did not initialize properly");
+		return -EIO;
+	}
+
+	return onoff_release(&gpd_mgr->mgr);
+}
+
+static int nrf_gpd_pre_init(void)
+{
+	int ret;
+
+	ret = onoff_manager_init(&fast_active1.mgr, &transitions);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = onoff_manager_init(&slow_active.mgr, &transitions);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = onoff_manager_init(&slow_main.mgr, &transitions);
+	if (ret < 0) {
+		return ret;
+	}
+
+	return 0;
+}
+
+static int nrf_gpd_post_init(void)
+{
+	nrfs_err_t err;
+	int ret;
+
+	err = nrfs_backend_wait_for_connection(K_FOREVER);
+	if (err != NRFS_SUCCESS) {
+		ret = -EIO;
+		goto err;
+	}
+
+	err = nrfs_gdpwr_init(evt_handler);
+	if (err != NRFS_SUCCESS) {
+		ret = -EIO;
+		goto err;
+	}
+
+	/* submit GD requests now to align collected statuses */
+	ret = nrf_gpd_sync(&fast_active1);
+	if (ret < 0) {
+		goto err;
+	}
+
+	ret = nrf_gpd_sync(&slow_active);
+	if (ret < 0) {
+		goto err;
+	}
+
+	ret = nrf_gpd_sync(&slow_main);
+	if (ret < 0) {
+		goto err;
+	}
+
+	atomic_set_bit(&gpd_service_status, GPD_SERVICE_READY);
+
+	return 0;
+
+err:
+	atomic_set_bit(&gpd_service_status, GPD_SERVICE_ERROR);
+
+	return ret;
+}
+
+SYS_INIT(nrf_gpd_pre_init, PRE_KERNEL_1, 0);
+SYS_INIT(nrf_gpd_post_init, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY);
diff --git a/soc/nordic/nrf54h/gpd/include/nrf/gpd.h b/soc/nordic/nrf54h/gpd/include/nrf/gpd.h
new file mode 100644
index 00000000000..0504f94e858
--- /dev/null
+++ b/soc/nordic/nrf54h/gpd/include/nrf/gpd.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_NORDIC_NRF54H_GPD_INCLUDE_NRF_GPD_H_
+#define ZEPHYR_SOC_NORDIC_NRF54H_GPD_INCLUDE_NRF_GPD_H_
+
+#include <stdint.h>
+
+#include <zephyr/dt-bindings/power/nordic-nrf-gpd.h>
+
+/**
+ * @brief Request a global power domain.
+ *
+ * @param id Domain ID.
+ *
+ * @retval 0 If the request was successful.
+ * @retval -errno If the request was not successful.
+ */
+int nrf_gpd_request(uint8_t id);
+
+/**
+ * @brief Release a global power domain.
+ *
+ * @param id Domain ID.
+ *
+ * @retval 0 If the request was successful.
+ * @retval -errno If the request was not successful.
+ */
+int nrf_gpd_release(uint8_t id);
+
+#endif /* ZEPHYR_SOC_NORDIC_NRF54H_GPD_INCLUDE_NRF_GPD_H_ */

From e61d08929180e8f45d020b1956923284988d5cb9 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Wed, 30 Oct 2024 11:20:41 +0100
Subject: [PATCH 0606/2913] [nrf fromtree] modules: hal_nordic: bump regtool to
 8.0.0

It is required for some pinctrl changes.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 0b18f31246cd5d0bcdd10a3ad6e3bd108bf3f95d)
(cherry picked from commit 883d2b5edc8e7f3f5e3224df0880c1eab1dda946)
---
 modules/hal_nordic/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt
index 3bed5a033b5..4e3f388b266 100644
--- a/modules/hal_nordic/CMakeLists.txt
+++ b/modules/hal_nordic/CMakeLists.txt
@@ -15,7 +15,7 @@ if(CONFIG_NRF_REGTOOL_GENERATE_BICR)
   list(APPEND nrf_regtool_components GENERATE:BICR)
 endif()
 if(DEFINED nrf_regtool_components)
-  find_package(nrf-regtool 7.0.0 REQUIRED
+  find_package(nrf-regtool 8.0.0
     COMPONENTS ${nrf_regtool_components}
     PATHS ${CMAKE_CURRENT_LIST_DIR}/nrf-regtool
     NO_CMAKE_PATH

From 07d5f0c6aa1022d8fa2da1693c86ae6a3fc641be Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Thu, 10 Oct 2024 15:58:41 +0200
Subject: [PATCH 0607/2913] [nrf fromtree] drivers: gpio: nrfx: add support for
 ports with pad on FAST_ACTIVE1

This patch allows to _safely_ configure GPIO ports that have their pad
on FAST_ACTIVE1 domain.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 56c5b1e2da11318844f6bb19414efac32e77613d)
(cherry picked from commit 1d5064f9bf075034609b188d8b04c4af98d7da71)
---
 drivers/gpio/gpio_nrfx.c | 116 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 108 insertions(+), 8 deletions(-)

diff --git a/drivers/gpio/gpio_nrfx.c b/drivers/gpio/gpio_nrfx.c
index 151cf1a830c..d9eb9129937 100644
--- a/drivers/gpio/gpio_nrfx.c
+++ b/drivers/gpio/gpio_nrfx.c
@@ -14,6 +14,10 @@
 
 #include <zephyr/drivers/gpio/gpio_utils.h>
 
+#ifdef CONFIG_SOC_NRF54H20_GPD
+#include <nrf/gpd.h>
+#endif
+
 struct gpio_nrfx_data {
 	/* gpio_driver_data needs to be first */
 	struct gpio_driver_data common;
@@ -27,6 +31,9 @@ struct gpio_nrfx_cfg {
 	uint32_t edge_sense;
 	uint8_t port_num;
 	nrfx_gpiote_t gpiote;
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	uint8_t pad_pd;
+#endif
 };
 
 static inline struct gpio_nrfx_data *get_port_data(const struct device *port)
@@ -55,9 +62,59 @@ static nrf_gpio_pin_pull_t get_pull(gpio_flags_t flags)
 	return NRF_GPIO_PIN_NOPULL;
 }
 
+static int gpio_nrfx_gpd_retain_set(const struct device *port, uint32_t mask, gpio_flags_t flags)
+{
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	const struct gpio_nrfx_cfg *cfg = get_port_cfg(port);
+
+	if (cfg->pad_pd == NRF_GPD_FAST_ACTIVE1) {
+		int ret;
+
+		if (flags & GPIO_OUTPUT) {
+			cfg->port->RETAINSET = mask;
+		}
+
+		ret = nrf_gpd_release(NRF_GPD_FAST_ACTIVE1);
+		if (ret < 0) {
+			return ret;
+		}
+	}
+#else
+	ARG_UNUSED(port);
+	ARG_UNUSED(mask);
+	ARG_UNUSED(flags);
+#endif
+
+	return 0;
+}
+
+static int gpio_nrfx_gpd_retain_clear(const struct device *port, uint32_t mask)
+{
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	const struct gpio_nrfx_cfg *cfg = get_port_cfg(port);
+
+	if (cfg->pad_pd == NRF_GPD_FAST_ACTIVE1) {
+		int ret;
+
+		ret = nrf_gpd_request(NRF_GPD_FAST_ACTIVE1);
+		if (ret < 0) {
+			return ret;
+		}
+
+		cfg->port->RETAINCLR = mask;
+	}
+#else
+	ARG_UNUSED(port);
+	ARG_UNUSED(mask);
+#endif
+
+	return 0;
+}
+
 static int gpio_nrfx_pin_configure(const struct device *port, gpio_pin_t pin,
 				   gpio_flags_t flags)
 {
+	int ret = 0;
 	nrfx_err_t err = NRFX_SUCCESS;
 	uint8_t ch;
 	bool free_ch = false;
@@ -95,6 +152,11 @@ static int gpio_nrfx_pin_configure(const struct device *port, gpio_pin_t pin,
 		return -EINVAL;
 	}
 
+	ret = gpio_nrfx_gpd_retain_clear(port, BIT(pin));
+	if (ret < 0) {
+		return ret;
+	}
+
 	if (flags & GPIO_OUTPUT_INIT_HIGH) {
 		nrf_gpio_port_out_set(cfg->port, BIT(pin));
 	} else if (flags & GPIO_OUTPUT_INIT_LOW) {
@@ -110,7 +172,8 @@ static int gpio_nrfx_pin_configure(const struct device *port, gpio_pin_t pin,
 					   : NRF_GPIO_PIN_INPUT_DISCONNECT;
 
 		nrf_gpio_reconfigure(abs_pin, &dir, &input, &pull, &drive, NULL);
-		return 0;
+
+		goto end;
 	}
 
 	/* Get the GPIOTE channel associated with this pin, if any. It needs
@@ -137,7 +200,8 @@ static int gpio_nrfx_pin_configure(const struct device *port, gpio_pin_t pin,
 			err = nrfx_gpiote_input_configure(&cfg->gpiote,
 				abs_pin, &input_pin_config);
 			if (err != NRFX_SUCCESS) {
-				return -EINVAL;
+				ret = -EINVAL;
+				goto end;
 			}
 		}
 
@@ -162,7 +226,8 @@ static int gpio_nrfx_pin_configure(const struct device *port, gpio_pin_t pin,
 		}
 
 		if (err != NRFX_SUCCESS) {
-			return -EINVAL;
+			ret = -EINVAL;
+			goto end;
 		}
 	}
 
@@ -171,7 +236,9 @@ static int gpio_nrfx_pin_configure(const struct device *port, gpio_pin_t pin,
 		__ASSERT_NO_MSG(err == NRFX_SUCCESS);
 	}
 
-	return 0;
+end:
+	(void)gpio_nrfx_gpd_retain_set(port, BIT(pin), flags);
+	return ret;
 }
 
 static int gpio_nrfx_port_get_raw(const struct device *port,
@@ -189,34 +256,52 @@ static int gpio_nrfx_port_set_masked_raw(const struct device *port,
 					 gpio_port_value_t value)
 {
 	NRF_GPIO_Type *reg = get_port_cfg(port)->port;
+	int ret;
 
 	const uint32_t set_mask = value & mask;
 	const uint32_t clear_mask = (~set_mask) & mask;
 
+	ret = gpio_nrfx_gpd_retain_clear(port, mask);
+	if (ret < 0) {
+		return ret;
+	}
+
 	nrf_gpio_port_out_set(reg, set_mask);
 	nrf_gpio_port_out_clear(reg, clear_mask);
 
-	return 0;
+	return gpio_nrfx_gpd_retain_set(port, mask, GPIO_OUTPUT);
 }
 
 static int gpio_nrfx_port_set_bits_raw(const struct device *port,
 				       gpio_port_pins_t mask)
 {
 	NRF_GPIO_Type *reg = get_port_cfg(port)->port;
+	int ret;
+
+	ret = gpio_nrfx_gpd_retain_clear(port, mask);
+	if (ret < 0) {
+		return ret;
+	}
 
 	nrf_gpio_port_out_set(reg, mask);
 
-	return 0;
+	return gpio_nrfx_gpd_retain_set(port, mask, GPIO_OUTPUT);
 }
 
 static int gpio_nrfx_port_clear_bits_raw(const struct device *port,
 					 gpio_port_pins_t mask)
 {
 	NRF_GPIO_Type *reg = get_port_cfg(port)->port;
+	int ret;
+
+	ret = gpio_nrfx_gpd_retain_clear(port, mask);
+	if (ret < 0) {
+		return ret;
+	}
 
 	nrf_gpio_port_out_clear(reg, mask);
 
-	return 0;
+	return gpio_nrfx_gpd_retain_set(port, mask, GPIO_OUTPUT);
 }
 
 static int gpio_nrfx_port_toggle_bits(const struct device *port,
@@ -226,11 +311,17 @@ static int gpio_nrfx_port_toggle_bits(const struct device *port,
 	const uint32_t value = nrf_gpio_port_out_read(reg) ^ mask;
 	const uint32_t set_mask = value & mask;
 	const uint32_t clear_mask = (~value) & mask;
+	int ret;
+
+	ret = gpio_nrfx_gpd_retain_clear(port, mask);
+	if (ret < 0) {
+		return ret;
+	}
 
 	nrf_gpio_port_out_set(reg, set_mask);
 	nrf_gpio_port_out_clear(reg, clear_mask);
 
-	return 0;
+	return gpio_nrfx_gpd_retain_set(port, mask, GPIO_OUTPUT);
 }
 
 #ifdef CONFIG_GPIO_NRFX_INTERRUPT
@@ -450,6 +541,14 @@ static const struct gpio_driver_api gpio_nrfx_drv_api_funcs = {
 			"Please enable GPIOTE instance for used GPIO port!")), \
 		())
 
+#ifdef CONFIG_SOC_NRF54H20_GPD
+#define PAD_PD(inst) \
+	.pad_pd = DT_INST_PHA_BY_NAME_OR(inst, power_domains, pad, id,	       \
+					 NRF_GPD_SLOW_MAIN),
+#else
+#define PAD_PD(inst)
+#endif
+
 #define GPIO_NRF_DEVICE(id)						\
 	GPIOTE_CHECK(id);						\
 	static const struct gpio_nrfx_cfg gpio_nrfx_p##id##_cfg = {	\
@@ -461,6 +560,7 @@ static const struct gpio_driver_api gpio_nrfx_drv_api_funcs = {
 		.port_num = DT_INST_PROP(id, port),			\
 		.edge_sense = DT_INST_PROP_OR(id, sense_edge_mask, 0),	\
 		.gpiote = GPIOTE_INSTANCE(id),				\
+		PAD_PD(id)						\
 	};								\
 									\
 	static struct gpio_nrfx_data gpio_nrfx_p##id##_data;		\

From 629c2592d1f1cea6b6e29c20900b1041dff05642 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Wed, 30 Oct 2024 11:42:28 +0100
Subject: [PATCH 0608/2913] [nrf fromtree] scripts: checkpatch: add
 NRF_GPIO_Type to typedefs file

So that we do not get false warnings about consistent spacing around
'*'.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 5e8905bb9483b33b4412e7c0a30e0e4dfa7f80b3)
(cherry picked from commit 23126163d14383a6a3d900f84744ec6dddfefb0e)
---
 scripts/checkpatch/typedefsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/checkpatch/typedefsfile b/scripts/checkpatch/typedefsfile
index 62febe44e1b..0fc22b9779b 100644
--- a/scripts/checkpatch/typedefsfile
+++ b/scripts/checkpatch/typedefsfile
@@ -8,3 +8,4 @@ io_rw_32
 \b[a-zA-Z_][a-zA-Z0-9_]*TypeDef
 Pwm
 FILE
+NRF_GPIO_Type

From 820f0ba0b5fe245c7af498578fdac310f342c6d9 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Tue, 29 Oct 2024 10:25:25 +0100
Subject: [PATCH 0609/2913] [nrf fromtree] soc: nordic: nrf54h: gpd: add API to
 set/clear pin retention

This API needs to be called by FAST peripherals before/after
disabling/enabling them.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 77fc18327aa965625c60c958b5303cb14e456c00)
(cherry picked from commit 1adb9e170028a944ca06c4201aa0a3a14b0cbba4)
---
 soc/nordic/nrf54h/gpd/gpd.c             | 29 +++++++++++++++++++++++++
 soc/nordic/nrf54h/gpd/include/nrf/gpd.h | 12 ++++++++++
 2 files changed, 41 insertions(+)

diff --git a/soc/nordic/nrf54h/gpd/gpd.c b/soc/nordic/nrf54h/gpd/gpd.c
index 33cdb876e16..ea439a54460 100644
--- a/soc/nordic/nrf54h/gpd/gpd.c
+++ b/soc/nordic/nrf54h/gpd/gpd.c
@@ -12,6 +12,7 @@
 #include <zephyr/spinlock.h>
 #include <zephyr/sys/util.h>
 
+#include <hal/nrf_gpio.h>
 #include <nrf/gpd.h>
 #include <nrfs_gdpwr.h>
 #include <nrfs_backend_ipc_service.h>
@@ -207,6 +208,34 @@ int nrf_gpd_release(uint8_t id)
 	return onoff_release(&gpd_mgr->mgr);
 }
 
+int nrf_gpd_retain_pins_set(const struct pinctrl_dev_config *pcfg, bool retain)
+{
+	const struct pinctrl_state *state;
+	int ret;
+
+	ret = pinctrl_lookup_state(pcfg, PINCTRL_STATE_DEFAULT, &state);
+	if (ret < 0) {
+		return ret;
+	}
+
+	for (uint8_t i = 0U; i < state->pin_cnt; i++) {
+		uint32_t pin = NRF_GET_PIN(state->pins[i]);
+		NRF_GPIO_Type *reg = nrf_gpio_pin_port_decode(&pin);
+
+		if (pin == NRF_PIN_DISCONNECTED) {
+			continue;
+		}
+
+		if (retain) {
+			reg->RETAINSET = BIT(pin);
+		} else {
+			reg->RETAINCLR = BIT(pin);
+		}
+	}
+
+	return 0;
+}
+
 static int nrf_gpd_pre_init(void)
 {
 	int ret;
diff --git a/soc/nordic/nrf54h/gpd/include/nrf/gpd.h b/soc/nordic/nrf54h/gpd/include/nrf/gpd.h
index 0504f94e858..b8aab94accb 100644
--- a/soc/nordic/nrf54h/gpd/include/nrf/gpd.h
+++ b/soc/nordic/nrf54h/gpd/include/nrf/gpd.h
@@ -9,6 +9,7 @@
 #include <stdint.h>
 
 #include <zephyr/dt-bindings/power/nordic-nrf-gpd.h>
+#include <zephyr/drivers/pinctrl.h>
 
 /**
  * @brief Request a global power domain.
@@ -30,4 +31,15 @@ int nrf_gpd_request(uint8_t id);
  */
 int nrf_gpd_release(uint8_t id);
 
+/**
+ * @brief Retain set/clear a set of pins.
+ *
+ * @param pcfg Device pin configuration.
+ * @param retain Retain or not.
+ *
+ * @retval 0 If the request was successful.
+ * @retval -errno If the request was not successful.
+ */
+int nrf_gpd_retain_pins_set(const struct pinctrl_dev_config *pcfg, bool retain);
+
 #endif /* ZEPHYR_SOC_NORDIC_NRF54H_GPD_INCLUDE_NRF_GPD_H_ */

From 29536e577d7a1f5c258a6d236295dc7ee21a155f Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Tue, 29 Oct 2024 10:26:39 +0100
Subject: [PATCH 0610/2913] [nrf fromtree] drivers: serial: nrfx_uarte:
 set/clear pins retention

When GPD is managed by pinctrl, pins retention needs to be controlled by
the driver to avoid glitches.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit b6d45423c60b950d02c389262745c2fdcd27b4f0)
(cherry picked from commit 1032cba84237f7175c39b5f1b7b0cd400f13850d)
---
 drivers/serial/uart_nrfx_uarte.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 2fb2ab3537e..452307acaa8 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -23,6 +23,11 @@
 #include <zephyr/linker/devicetree_regions.h>
 #include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
+
+#ifdef CONFIG_SOC_NRF54H20_GPD
+#include <nrf/gpd.h>
+#endif
+
 LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 
 #if !defined(CONFIG_ARCH_POSIX)
@@ -2098,6 +2103,9 @@ static void uarte_pm_resume(const struct device *dev)
 
 	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || !LOW_POWER_ENABLED(cfg)) {
 		uarte_periph_enable(dev);
+#ifdef CONFIG_SOC_NRF54H20_GPD
+		nrf_gpd_retain_pins_set(cfg->pcfg, false);
+#endif
 	}
 }
 
@@ -2160,6 +2168,10 @@ static void uarte_pm_suspend(const struct device *dev)
 		wait_for_tx_stopped(dev);
 	}
 
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	nrf_gpd_retain_pins_set(cfg->pcfg, true);
+#endif
+
 	nrf_uarte_disable(uarte);
 
 	(void)pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_SLEEP);

From b907313cd47df1a1f548a63000952ed993fe95f9 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Tue, 29 Oct 2024 15:17:27 +0100
Subject: [PATCH 0611/2913] [nrf fromtree] soc: nordic: nrf54h: disable
 PM_DEVICE_POWER_DOMAIN

It is enabled by default if we enable device PM, but we do not want
this, otherwise we get linker errors (PM subsys, fun guaranteed!).

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 969326bfff2d90dfc1481fecb636d39a66a9581e)
(cherry picked from commit 579e766c3c85cdaf104ba9685a4e984725ed1435)
---
 soc/nordic/nrf54h/Kconfig.defconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/soc/nordic/nrf54h/Kconfig.defconfig b/soc/nordic/nrf54h/Kconfig.defconfig
index b09b24e5e70..65023fc18ca 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig
+++ b/soc/nordic/nrf54h/Kconfig.defconfig
@@ -39,4 +39,7 @@ config SPI_DW_HSSI
 config SPI_DW_ACCESS_WORD_ONLY
 	default y if SPI_DW
 
+config PM_DEVICE_POWER_DOMAIN
+	default n if PM_DEVICE
+
 endif # SOC_SERIES_NRF54HX

From 8758068d4570a4e34e0da2391144af7d5274e45c Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Wed, 30 Oct 2024 16:37:13 +0100
Subject: [PATCH 0612/2913] [nrf noup] moduled: hal_nordic: require nrf-regtool

Upstream not ready yet, revert once applied there.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 6384b5876f5b4c4c16a343d396de14d6ce52b4fe)
---
 modules/hal_nordic/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt
index 4e3f388b266..0dd750d457e 100644
--- a/modules/hal_nordic/CMakeLists.txt
+++ b/modules/hal_nordic/CMakeLists.txt
@@ -15,7 +15,7 @@ if(CONFIG_NRF_REGTOOL_GENERATE_BICR)
   list(APPEND nrf_regtool_components GENERATE:BICR)
 endif()
 if(DEFINED nrf_regtool_components)
-  find_package(nrf-regtool 8.0.0
+  find_package(nrf-regtool 8.0.0 REQUIRED
     COMPONENTS ${nrf_regtool_components}
     PATHS ${CMAKE_CURRENT_LIST_DIR}/nrf-regtool
     NO_CMAKE_PATH

From d13e33785b806178dc79a43c3e830abf6a3bcf14 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Mon, 4 Nov 2024 10:14:36 +0100
Subject: [PATCH 0613/2913] [nrf fromlist] soc: nrf54h: gpd: use callback to
 fetch nrfs async result

Busy-waiting for the result of the nrfs service calls can stall, so
let's use a callback that flags a semaphore instead. Since the API is
supposed to be callable in the context of pre-kernel, fallback to
busy-wait on that scenario.

Upstream PR #: 80819

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 714d82d232977309e0bdc8dadd2d7a71ee914a4b)
(cherry picked from commit 254501b0705d364d8946dd339316887246b8db33)
---
 soc/nordic/nrf54h/gpd/gpd.c | 55 +++++++++++++++++++++++++++++++++----
 1 file changed, 49 insertions(+), 6 deletions(-)

diff --git a/soc/nordic/nrf54h/gpd/gpd.c b/soc/nordic/nrf54h/gpd/gpd.c
index ea439a54460..994b2c02b96 100644
--- a/soc/nordic/nrf54h/gpd/gpd.c
+++ b/soc/nordic/nrf54h/gpd/gpd.c
@@ -28,6 +28,9 @@ struct gpd_onoff_manager {
 	struct onoff_manager mgr;
 	onoff_notify_fn notify;
 	uint8_t id;
+	struct k_mutex lock;
+	struct k_sem sem;
+	int res;
 };
 
 static void start(struct onoff_manager *mgr, onoff_notify_fn notify);
@@ -41,9 +44,21 @@ static void stop(struct onoff_manager *mgr, onoff_notify_fn notify);
 #define GPD_SERVICE_REQ_ERR BIT(3)
 static atomic_t gpd_service_status = ATOMIC_INIT(0);
 
-static struct gpd_onoff_manager fast_active1 = {.id = NRF_GPD_FAST_ACTIVE1};
-static struct gpd_onoff_manager slow_active = {.id = NRF_GPD_SLOW_ACTIVE};
-static struct gpd_onoff_manager slow_main = {.id = NRF_GPD_SLOW_MAIN};
+static struct gpd_onoff_manager fast_active1 = {
+	.id = NRF_GPD_FAST_ACTIVE1,
+	.lock = Z_MUTEX_INITIALIZER(fast_active1.lock),
+	.sem = Z_SEM_INITIALIZER(fast_active1.sem, 0, 1),
+};
+static struct gpd_onoff_manager slow_active = {
+	.id = NRF_GPD_SLOW_ACTIVE,
+	.lock = Z_MUTEX_INITIALIZER(slow_active.lock),
+	.sem = Z_SEM_INITIALIZER(slow_active.sem, 0, 1),
+};
+static struct gpd_onoff_manager slow_main = {
+	.id = NRF_GPD_SLOW_MAIN,
+	.lock = Z_MUTEX_INITIALIZER(slow_main.lock),
+	.sem = Z_SEM_INITIALIZER(slow_main.sem, 0, 1),
+};
 
 static const struct onoff_transitions transitions =
 	ONOFF_TRANSITIONS_INITIALIZER(start, stop, NULL);
@@ -62,6 +77,18 @@ static struct gpd_onoff_manager *get_mgr(uint8_t id)
 	}
 }
 
+static void request_cb(struct onoff_manager *mgr_, struct onoff_client *cli, uint32_t state,
+		       int res)
+{
+	ARG_UNUSED(cli);
+	ARG_UNUSED(state);
+
+	struct gpd_onoff_manager *gpd_mgr = CONTAINER_OF(mgr_, struct gpd_onoff_manager, mgr);
+
+	gpd_mgr->res = res;
+	k_sem_give(&gpd_mgr->sem);
+}
+
 static int nrf_gpd_sync(struct gpd_onoff_manager *gpd_mgr)
 {
 	int64_t start;
@@ -181,11 +208,27 @@ int nrf_gpd_request(uint8_t id)
 		return -EIO;
 	}
 
-	sys_notify_init_spinwait(&client.notify);
+	if (k_is_pre_kernel()) {
+		sys_notify_init_spinwait(&client.notify);
+
+		ret = onoff_request(&gpd_mgr->mgr, &client);
+		if (ret < 0) {
+			return ret;
+		}
 
-	onoff_request(&gpd_mgr->mgr, &client);
+		while (sys_notify_fetch_result(&client.notify, &ret) == -EAGAIN) {
+		}
+	} else {
+		sys_notify_init_callback(&client.notify, request_cb);
+		k_mutex_lock(&gpd_mgr->lock, K_FOREVER);
+
+		ret = onoff_request(&gpd_mgr->mgr, &client);
+		if (ret >= 0) {
+			(void)k_sem_take(&gpd_mgr->sem, K_FOREVER);
+			ret = gpd_mgr->res;
+		}
 
-	while (sys_notify_fetch_result(&client.notify, &ret) == -EAGAIN) {
+		k_mutex_unlock(&gpd_mgr->lock);
 	}
 
 	return ret;

From 561806338cbed3b3d78c2b820cb3fa06268cdc2a Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Tue, 5 Nov 2024 12:53:36 +0100
Subject: [PATCH 0614/2913] [nrf fromtree] soc: nordic: nrf54h: gpd: fix
 compile warning when CONFIG_DEBUG=y

Usage of K_SPINLOCK with CONFIG_DEBUG=y seems to trigger a compiler
warning about request not always being initialized. Fallback to
k_spin_lock/unlock calls to fix this issue.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 5249619f6a19a3265852ae8a7ceba1b703be4c58)
(cherry picked from commit 40ac0cca86ebc2a7af34221f643ec616804a02fa)
---
 soc/nordic/nrf54h/gpd/gpd.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/soc/nordic/nrf54h/gpd/gpd.c b/soc/nordic/nrf54h/gpd/gpd.c
index 994b2c02b96..a4d1889e53f 100644
--- a/soc/nordic/nrf54h/gpd/gpd.c
+++ b/soc/nordic/nrf54h/gpd/gpd.c
@@ -93,16 +93,19 @@ static int nrf_gpd_sync(struct gpd_onoff_manager *gpd_mgr)
 {
 	int64_t start;
 	nrfs_err_t err;
+	k_spinlock_key_t key;
 	gdpwr_request_type_t request;
 
-	K_SPINLOCK(&gpd_mgr->mgr.lock) {
-		if (gpd_mgr->mgr.refs == 0) {
-			request = GDPWR_POWER_REQUEST_CLEAR;
-		} else {
-			request = GDPWR_POWER_REQUEST_SET;
-		}
+	key = k_spin_lock(&gpd_mgr->mgr.lock);
+
+	if (gpd_mgr->mgr.refs == 0) {
+		request = GDPWR_POWER_REQUEST_CLEAR;
+	} else {
+		request = GDPWR_POWER_REQUEST_SET;
 	}
 
+	k_spin_unlock(&gpd_mgr->mgr.lock, key);
+
 	atomic_clear_bit(&gpd_service_status, GPD_SERVICE_REQ_ERR);
 	atomic_clear_bit(&gpd_service_status, GPD_SERVICE_REQ_OK);
 

From 92f8b824f525f0f9320937086d77e2614fa31b14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Mon, 4 Nov 2024 08:24:14 +0100
Subject: [PATCH 0615/2913] [nrf fromlist] dts: common: nordic: Add clock
 property for fast PWM120
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added hsfll120 clock for fast PWM120 nodes.

Upstream PR #: 80672

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit 3617ee908e4e76697fdb56c50d07adfc9bea3d3a)
---
 dts/common/nordic/nrf54h20.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index e72ca15bbaa..f76c273449f 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -636,6 +636,7 @@
 				reg = <0x8e4000 0x1000>;
 				status = "disabled";
 				interrupts = <228 NRF_DEFAULT_IRQ_PRIORITY>;
+				clocks = <&hsfll120>;
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				#pwm-cells = <3>;
 			};

From 3fc04b2538bcf48c792dcf718807f12a6bcea0cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Mon, 4 Nov 2024 08:25:52 +0100
Subject: [PATCH 0616/2913] [nrf fromlist] drivers: pwm: nrfx: adjust PWM
 driver to fast PWM120
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fast PWM120 instance works with 320MHz clock, thus
pwm_nrfx_get_cycles_per_sec needs to be adjusted,
applying correct clock frequency.
Also, it uses cachable RAM, thus sys_cache function
needs to be added to flush the cached sequence.

Upstream PR #: 80672

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit ada0489ebf78d4f1db1da831a6d886fb819346da)
---
 drivers/pwm/pwm_nrfx.c | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index 420a9078c59..5161b299c3a 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -11,6 +11,8 @@
 #include <hal/nrf_gpio.h>
 #include <stdbool.h>
 #include <zephyr/linker/devicetree_regions.h>
+#include <zephyr/cache.h>
+#include <zephyr/mem_mgmt/mem_attr.h>
 
 #include <zephyr/logging/log.h>
 
@@ -40,6 +42,10 @@ struct pwm_nrfx_config {
 	nrfx_pwm_config_t initial_config;
 	nrf_pwm_sequence_t seq;
 	const struct pinctrl_dev_config *pcfg;
+	uint32_t clock_freq;
+#ifdef CONFIG_DCACHE
+	uint32_t mem_attr;
+#endif
 };
 
 struct pwm_nrfx_data {
@@ -176,6 +182,12 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 
 	seq_values_ptr_get(dev)[channel] = PWM_NRFX_CH_VALUE(compare_value, inverted);
 
+#ifdef CONFIG_DCACHE
+	if (config->mem_attr & DT_MEM_CACHEABLE) {
+		sys_cache_data_flush_range(seq_values_ptr_get(dev), config->seq.length);
+	}
+#endif
+
 	LOG_DBG("channel %u, pulse %u, period %u, prescaler: %u.",
 		channel, pulse_cycles, period_cycles, data->prescaler);
 
@@ -243,11 +255,9 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 static int pwm_nrfx_get_cycles_per_sec(const struct device *dev, uint32_t channel,
 				       uint64_t *cycles)
 {
-	/* TODO: Since this function might be removed, we will always return
-	 * 16MHz from this function and handle the conversion with prescaler,
-	 * etc, in the pin set function. See issue #6958.
-	 */
-	*cycles = 16ul * 1000ul * 1000ul;
+	const struct pwm_nrfx_config *config = dev->config;
+
+	*cycles = config->clock_freq;
 
 	return 0;
 }
@@ -333,13 +343,18 @@ static int pwm_nrfx_init(const struct device *dev)
 #define PWM(dev_idx) DT_NODELABEL(pwm##dev_idx)
 #define PWM_PROP(dev_idx, prop) DT_PROP(PWM(dev_idx), prop)
 #define PWM_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(PWM(idx), prop)
+#define PWM_MEM_REGION(idx)     DT_PHANDLE(PWM(idx), memory_regions)
 
 #define PWM_MEMORY_SECTION(idx)						      \
 	COND_CODE_1(PWM_HAS_PROP(idx, memory_regions),			      \
 		(__attribute__((__section__(LINKER_DT_NODE_REGION_NAME(	      \
-			DT_PHANDLE(PWM(idx), memory_regions)))))),	      \
+			PWM_MEM_REGION(idx)))))),			      \
 		())
 
+#define PWM_GET_MEM_ATTR(idx)						      \
+	COND_CODE_1(PWM_HAS_PROP(idx, memory_regions),			      \
+		(DT_PROP_OR(PWM_MEM_REGION(idx), zephyr_memory_attr, 0)), (0))
+
 #define PWM_NRFX_DEVICE(idx)						      \
 	NRF_DT_CHECK_NODE_HAS_PINCTRL_SLEEP(PWM(idx));			      \
 	static struct pwm_nrfx_data pwm_nrfx_##idx##_data;		      \
@@ -362,6 +377,11 @@ static int pwm_nrfx_init(const struct device *dev)
 		.seq.values.p_raw = pwm_##idx##_seq_values,		      \
 		.seq.length = NRF_PWM_CHANNEL_COUNT,			      \
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(PWM(idx)),		      \
+		.clock_freq = COND_CODE_1(DT_CLOCKS_HAS_IDX(PWM(idx), 0),     \
+			(DT_PROP(DT_CLOCKS_CTLR(PWM(idx)), clock_frequency)), \
+			(16ul * 1000ul * 1000ul)),			      \
+		IF_ENABLED(CONFIG_DCACHE,				      \
+			(.mem_attr = PWM_GET_MEM_ATTR(idx),))		      \
 	};								      \
 	static int pwm_nrfx_init##idx(const struct device *dev)		      \
 	{								      \

From 3b420ee1bb5438b42b26a1f9322dac8884bdc285 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Fri, 1 Nov 2024 21:49:25 +0530
Subject: [PATCH 0617/2913] [nrf fromtree] drivers: nrfwifi: Fixes from doc
 review

Help text fixes from doc-team.

Signed-off-by: Richa Pandey <richa.pandey@nordicsemi.no>
Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 580707ed4d29299d7c3b1bb306aca378634cfe8b)
(cherry picked from commit 7d6d73412444c3f6fd150799110d80f707b46900)
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 144 +++++++++++++--------------
 1 file changed, 68 insertions(+), 76 deletions(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 7087e20beb6..d1073933f58 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -69,15 +69,14 @@ config NRF70_RADIO_TEST
 	bool "Radio test mode of the nRF70 driver"
 
 config NRF70_OFFLOADED_RAW_TX
-	bool "Offloaded raw Tx mode of the nRF70 driver"
+	bool "Offloaded raw TX mode of the nRF70 driver"
 
 config NRF70_SYSTEM_WITH_RAW_MODES
 	bool "nRF70 system mode with raw modes"
 	depends on WIFI_NRF7002 || WIFI_NRF7001
 	select WIFI_NM_WPA_SUPPLICANT
 	help
-	  Select this option to enable system mode of the nRF70 driver with raw modes
-
+	  Select this option to enable system mode of the nRF70 driver with raw modes.
 endchoice
 
 config NRF70_SYSTEM_MODE_COMMON
@@ -88,7 +87,7 @@ config NET_L2_ETHERNET
 	default y if (!NRF70_RADIO_TEST && !NRF70_OFFLOADED_RAW_TX)
 
 config HEAP_MEM_POOL_ADD_SIZE_NRF70
-	# Use a maximum that works for typical usecases and boards, each sample/app can override
+	# Use a maximum that works for typical use cases and boards, each sample/app can override
 	# this value if needed by using CONFIG_HEAP_MEM_POOL_IGNORE_MIN
 	def_int 25000 if NRF70_SCAN_ONLY
 	def_int 150000
@@ -98,7 +97,7 @@ config NRF70_STA_MODE
 	bool "nRF70 STA mode"
 	default y
 	help
-	  Select this option to enable STA mode of the nRF70 driver
+	  Select this option to enable STA mode of the nRF70 driver.
 
 config NRF70_AP_MODE
 	bool "Access point mode"
@@ -117,7 +116,7 @@ config NRF70_RAW_DATA_RX
 	select EXPERIMENTAL
 
 config NRF70_PROMISC_DATA_RX
-	bool "promiscuous RX sniffer operation in the driver"
+	bool "Promiscuous RX sniffer operation in the driver"
 	select WIFI_NM_WPA_SUPPLICANT
 	select EXPERIMENTAL
 	select NET_PROMISCUOUS_MODE
@@ -154,7 +153,7 @@ config NRF_WIFI_PATCHES_EXTERNAL
 endchoice
 
 config NRF_WIFI_LOW_POWER
-	bool "low power mode in nRF Wi-Fi chipsets"
+	bool "Low power mode in nRF Wi-Fi chipsets"
 	default y
 
 config NRF70_TCP_IP_CHECKSUM_OFFLOAD
@@ -235,7 +234,7 @@ config NRF70_PCB_LOSS_2G
 	range 0 4
 	help
 	  Specifies PCB loss from the antenna connector to the RF pin.
-	  The values are in dB scale in steps of 1dB and range of 0-4dB.
+	  The values are in dB scale in steps of 1 dB and range of 0-4 dB.
 	  The loss is considered in the RX path only.
 
 config NRF70_PCB_LOSS_5G_BAND1
@@ -244,7 +243,7 @@ config NRF70_PCB_LOSS_5G_BAND1
 	range 0 4
 	help
 	  Specifies PCB loss from the antenna connector to the RF pin.
-	  The values are in dB scale in steps of 1dB and range of 0-4dB.
+	  The values are in dB scale in steps of 1 dB and range of 0-4 dB.
 	  The loss is considered in the RX path only.
 
 config NRF70_PCB_LOSS_5G_BAND2
@@ -253,7 +252,7 @@ config NRF70_PCB_LOSS_5G_BAND2
 	range 0 4
 	help
 	  Specifies PCB loss from the antenna connector to the RF pin.
-	  The values are in dB scale in steps of 1dB and range of 0-4dB.
+	  The values are in dB scale in steps of 1 dB and range of 0-4 dB.
 	  The loss is considered in the RX path only.
 
 config NRF70_PCB_LOSS_5G_BAND3
@@ -262,7 +261,7 @@ config NRF70_PCB_LOSS_5G_BAND3
 	range 0 4
 	help
 	  Specifies PCB loss from the antenna connector to the RF pin.
-	  The values are in dB scale in steps of 1dB and range of 0-4dB.
+	  The values are in dB scale in steps of 1 dB and range of 0-4 dB.
 	  The loss is considered in the RX path only.
 
 config NRF70_ANT_GAIN_2G
@@ -491,25 +490,23 @@ config NRF70_RPU_PS_IDLE_TIMEOUT_MS
 config NRF70_RPU_EXTEND_TWT_SP
 	bool "extending TWT service period"
 	help
-	  In case frames accepted before beginning of SP are not
-	  transmitted before the SP completes then typically they are
-	  dropped to conform to SP window as per specification i.e., no
+	  In case frames accepted before the beginning of SP are not
+	  transmitted before the SP completes, then typically they are
+	  dropped to conform to the SP window as per the specification that is, no
 	  transmission outside SP window.
-
-	  This feature mitigates the frame loss by transmitting even after SP
-	  completion by using standard contention mechanism which is allowed
+	  This feature mitigates frame loss by transmitting even after SP
+	  completion by using a standard contention mechanism, which is allowed
 	  in specification but not recommended. As the device is actively transmitting
 	  beyond SP, the power consumption increases depending on the amount
-	  of traffic available at the start of SP.
-
-	  Please note that if a frame is sent after SP starts it will be queued and this
+	  of traffic available at the start of the SP.
+	  Note that if a frame is sent after the SP starts, it will be queued, and this
 	  mechanism is not used.
 endif # NRF_WIFI_LOW_POWER
 
 config WIFI_FIXED_MAC_ADDRESS
-	string "WiFi Fixed MAC address in format XX:XX:XX:XX:XX:XX"
+	string "Wi-Fi Fixed MAC address in format XX:XX:XX:XX:XX:XX"
 	help
-	  This overrides the MAC address read from OTP. Strictly for testing purposes only.
+	  This option overrides the MAC address read from OTP. It is strictly for testing purposes only.
 
 choice
 	prompt "Wi-Fi MAC address type"
@@ -529,7 +526,7 @@ config WIFI_FIXED_MAC_ADDRESS_ENABLED
 	  Enable fixed MAC address
 
 config WIFI_RANDOM_MAC_ADDRESS
-	bool "random MAC address generation at runtime"
+	bool "Random MAC address generation at runtime"
 	depends on ENTROPY_GENERATOR
 	help
 	  This option enables random MAC address generation at runtime.
@@ -541,17 +538,17 @@ config NRF70_RSSI_STALE_TIMEOUT_MS
 	int "RSSI stale timeout in milliseconds"
 	default 1000
 	help
-	  RSSI stale timeout is the period after which driver queries
-	  RPU to get the RSSI the value.
-	  If data is active (e.g. ping), driver stores the RSSI value from
+	  RSSI stale timeout is the period after which the driver queries
+	  RPU to get the RSSI value.
+	  If data is active (for example, ping), the driver stores the RSSI value from
 	  the received frames and provides this stored information
-	  to wpa_supplicant. In this case a higher value will be suitable
-	  as stored RSSI value at driver will be updated regularly.
+	  to wpa_supplicant. In this case, a higher value will be suitable
+	  as the stored RSSI value at the driver will be updated regularly.
 	  If data is not active or after the stale timeout duration,
-	  driver queries the RPU to get the RSSI value
-	  and provides it to wpa_supplicant. The value should be set to lower
-	  value as driver does not store it and requires RPU to provide the
-	  info.
+	  the driver queries the RPU to get the RSSI value
+	  and provides it to wpa_supplicant. The value should be set to a lower
+	  value as the driver does not store it and requires RPU to provide the
+	  information.
 
 if NETWORKING
 # Finetune defaults for certain system components used by the driver
@@ -581,7 +578,7 @@ config MAIN_STACK_SIZE
 config SHELL_STACK_SIZE
 	default 4096
 
-# Override the Wi-Fi subsytems WIFI_MGMT_SCAN_SSID_FILT_MAX parameter,
+# Override the Wi-Fi subsystems WIFI_MGMT_SCAN_SSID_FILT_MAX parameter,
 # since we support a maximum of 2 SSIDs for scan result filtering.
 config WIFI_MGMT_SCAN_SSID_FILT_MAX
 	default 2
@@ -594,7 +591,7 @@ config NRF_WIFI_SCAN_MAX_BSS_CNT
 	  Maximum number of scan results to return. 0 represents unlimited number of BSSes.
 
 config NRF_WIFI_BEAMFORMING
-	bool "Wi-Fi beamforming. Enabling beamforming can provide slight improvement in performance where as disabling it can provide better power saving in low network activity applications"
+	bool "Wi-Fi beamforming. Enabling beamforming can provide a slight improvement in performance, whereas disabling it can provide better power savings in low network activity applications"
 	default y
 
 config WIFI_NRF70_SCAN_TIMEOUT_S
@@ -631,19 +628,18 @@ config NRF_WIFI_IFACE_MTU
 	default 1500
 
 config WIFI_NRF70_SKIP_LOCAL_ADMIN_MAC
-	bool "Suppress networks with non-individual MAC address as BSSID in the scan results"
+	bool "Suppress networks with non-individual MAC addresses as BSSID in the scan results"
 	help
-	  Wi-Fi access points use locally administered MAC address to manage
-	  multiple virtual interfaces, for geo-location usecase these networks
-	  from the virtual interfaces do not help in anyway as they are co-located with the primary interface
-	  that has globally unique MAC address.
-
+	  Wi-Fi access points use locally administered MAC addresses to manage
+	  multiple virtual interfaces. For geo-location use cases, these networks
+	  from the virtual interfaces do not help in any way as they are co-located with the primary interface
+	  that has a globally unique MAC address.
 	  So, to save resources, this option drops such networks from the scan results.
 
 config WIFI_NRF70_SCAN_DISABLE_DFS_CHANNELS
 	bool "Disables DFS channels in scan operation"
 	help
-	  This option disables inclusion of DFS channels in scan operation.
+	  This option disables inclusion of the DFS channels in the scan operation.
 	  This is useful to reduce the scan time, as DFS channels are seldom used.
 
 config NET_INTERFACE_NAME_LEN
@@ -655,8 +651,8 @@ config NRF_WIFI_AP_DEAD_DETECT_TIMEOUT
 	range 1 30
 	default 20
 	help
-		The number of seconds after which AP is declared dead if no beacons
-		are received from the AP. Used to detect AP silently going down e.g., power off.
+		The number of seconds after which the AP is declared dead if no beacons
+		are received from the AP. This is used to detect AP silently going down, for example, due to power off.
 
 config NRF_WIFI_RPU_RECOVERY
 	bool "RPU recovery mechanism"
@@ -664,21 +660,20 @@ config NRF_WIFI_RPU_RECOVERY
 	default y
 	select EXPERIMENTAL
 	help
-		Enable RPU recovery mechanism to recover from RPU (nRF70) hang.
-		This feature performs an interface reset (down and up) which triggers
-		a RPU coldboot. Application's network connection will be lost during
-		the recovery process and it is application's responsibility to
+		Enable the RPU recovery mechanism to recover from an RPU (nRF70) hang.
+		This feature performs an interface reset (down and up), which triggers
+		a RPU cold boot. The application's network connection will be lost during
+		the recovery process, and it is the application's responsibility to
 		re-establish the network connection.
 
 if NRF_WIFI_RPU_RECOVERY
-
 config NRF_WIFI_RPU_RECOVERY_PROPAGATION_DELAY_MS
 	int "RPU recovery propagation delay in milliseconds"
 	default 2000
 	help
 		Propagation delay in milliseconds to wait after RPU is powered down
 		before powering it up. This delay is required to ensure that the recovery
-		is propagted to all the applications and stack and have enough time to
+		is propagated to all the applications and stack and have enough time to
 		clean up the resources.
 
 config NET_MGMT_EVENT_QUEUE_SIZE
@@ -689,16 +684,16 @@ config NRF_WIFI_RPU_RECOVERY_PROPAGATION_DELAY_MS
 	int "RPU recovery propagation delay in milliseconds"
 	default 10
 	help
-	  Propagation delay in milliseconds to wait after RPU is powered down
+	  Propagation delay in milliseconds to wait after the RPU is powered down
 	  before powering it up. This delay is required to ensure that the recovery
-	  is propagated to all the applications and stack and have enough time to
+	  is propagated to all the applications and stack, and has enough time to
 	  clean up the resources.
 
 config NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS
 	int "RPU recovery power save active timeout in milliseconds"
 	default 50000
 	help
-	  Power save active timeout in milliseconds after which RPU recovery
+	  Power save active timeout in milliseconds, after which the RPU recovery
 	  mechanism will be triggered. This timeout is used to ensure that the
 	  RPU attempts to enter power save mode in case of inactivity.
 
@@ -713,7 +708,7 @@ config NRF_WIFI_RPU_MIN_TIME_TO_ENTER_SLEEP_MS
 config NRF_WIFI_RPU_RECOVERY_DEBUG
 	bool "RPU recovery debug logs"
 	help
-		Enable RPU recovery debug logs to help debug RPU recovery mechanism.
+		Enable RPU recovery debug logs to help debug the RPU recovery mechanism.
 
 config NRF_WIFI_RPU_RECOVERY_QUIET_PERIOD_MS
 	int "RPU recovery quiet period in milliseconds"
@@ -727,7 +722,7 @@ config NRF_WIFI_RPU_RECOVERY_MAX_RETRIES
 	default 0
 	help
 	  Maximum number of consecutive RPU recovery retries before giving up
-	  and resetting the system. Set to 0 to keep retrying indefinitely.
+	  and resetting the system. Set it to 0 to keep retrying indefinitely.
 
 config NRF_WIFI_RPU_RECOVERY_RETRY_WINDOW_S
 	int "RPU recovery retry window in seconds"
@@ -741,16 +736,14 @@ config NRF_WIFI_RPU_RECOVERY_RETRY_WINDOW_S
 config NRF_WIFI_RPU_RECOVERY_PS_STATE_DEBUG
 	bool "RPU recovery power save state debug logs"
 	help
-	  Enable RPU recovery power save state debug logs to help debug RPU recovery mechanism.
-
-
+	  Enable RPU recovery power save state debug logs to help debug the RPU recovery mechanism.
 endif # NRF_WIFI_RPU_RECOVERY
 
 config NRF_WIFI_FEAT_WMM
 	bool "WMM/QoS support"
 	default y
 	help
-	  This option controls disable/enable of the WMM(Wireless Multi-Media) feature.
+	  This option controls disable/enable of the WMM (Wireless Multi-Media) feature.
 
 choice NRF_WIFI_PS_DATA_RETRIEVAL_MECHANISM
 	prompt "Power save data retrieval mechanism"
@@ -759,37 +752,36 @@ choice NRF_WIFI_PS_DATA_RETRIEVAL_MECHANISM
 	  Select the mechanism to retrieve buffered data from AP.
 
 config NRF_WIFI_PS_POLL_BASED_RETRIEVAL
-	bool "PS-Poll frame based mechanism to retrieve buffered data from AP"
+	bool "PS-Poll frame-based mechanism to retrieve buffered data from AP"
 	help
-	  When AP notifies about availability of buffered data, the STA stays in power save
-	  and retrieves the frames one-by-one, this conserved more power but adds latency
-	  to the traffic. Ideal for minimum number of frames.
+	  When the AP notifies about the availability of buffered data, the STA stays in power save
+	  and retrieves the frames one-by-one. This conserves more power but adds latency
+	  to the traffic. It is ideal for minimum number of frames.
 
 config NRF_WIFI_QOS_NULL_BASED_RETRIEVAL
-	bool "QoS null frame based mechanism to retrieve buffered data from AP"
+	bool "QoS null frame-based mechanism to retrieve buffered data from AP"
 	help
-	  When AP notifies about availability of buffered data, the STA comes out of
-	  power save and then AP can deliver all buffered frames without any additional
+	  When the AP notifies about the availability of buffered data, the STA comes out of
+	  power save, and then AP can deliver all buffered frames without any additional
 	  overhead or latency, but STA enters power save after a delay costing more power
-	  depending on the delay. Ideal for heavy buffered traffic.
-
+	  depending on the delay. It is ideal for heavy buffered traffic.
 endchoice
 
 config NRF_WIFI_MGMT_BUFF_OFFLOAD
-	bool "management buffer offload"
+	bool "Management buffer offload"
 	default y
 	help
-	  This option offloads the refilling of management buffers to UMAC, saves host
-	  having to exchange commands and events for every management packet even if it is
+	  This option offloads the refilling of management buffers to the UMAC, saving the host
+	  from having to exchange commands and events for every management packet even if it is
 	  consumed by UMAC.
 
 config NRF_WIFI_FEAT_KEEPALIVE
 	bool "Wi-Fi keepalive feature for connection maintenance"
 	depends on NRF70_STA_MODE
 	help
-	  Enable Wi-Fi keepalive feature to keep the connection alive by sending
-	  keepalive packets to the AP. Primarily intended to interoperate with APs
-	  that disconnect idle clients without any explicit checks. Slightly increases
+	  Enable the Wi-Fi keepalive feature to keep the connection alive by sending
+	  keepalive packets to the AP. This feature is primarily intended to interoperate with APs
+	  that disconnect idle clients without any explicit checks. It slightly increases
 	  power consumption.
 
 if NRF_WIFI_FEAT_KEEPALIVE
@@ -816,9 +808,9 @@ config NRF_WIFI_PS_EXIT_EVERY_TIM
 config NRF_WIFI_PS_INT_PS
 	bool "Exit power save based on an intelligent algorithm"
 	help
-	  Exit power save based on an intelligent algorithm to retrieve buffered data from AP.
+	  Exit power save based on an intelligent algorithm to retrieve buffered data from the AP.
 	  The algorithm tracks the buffered data at the AP and then dynamically decides
-	  whether to stay in PS (for lower amount of buffered data) or exit PS (for higher
+	  whether to stay in PS (for a lower amount of buffered data) or exit PS (for a higher
 	  amount of buffered data).
 endchoice
 
@@ -827,5 +819,5 @@ config NRF70_PASSIVE_SCAN_ONLY
 	depends on NRF70_SCAN_ONLY
 	help
 	  Enable this configuration to force passive scan on all channels.
-	  This will override application specified scan type.
+	  This will override application-specified scan type.
 endif # WIFI_NRF70

From 433e9c4a2e5f705aa09c09cb9a461636aeaccbc4 Mon Sep 17 00:00:00 2001
From: Karun Kumar Eagalapati <karun.kumar@nordicsemi.no>
Date: Wed, 6 Nov 2024 18:49:21 +0530
Subject: [PATCH 0618/2913] [nrf fromlist] manifest: Update hal_nordic

Updated manifest to include fix for incorrect display of scan
results when APs have EAP and PMF enabled.

Fixes #80995.

Upstream PR #: 80998

Signed-off-by: Karun Kumar Eagalapati <karun.kumar@nordicsemi.no>
(cherry picked from commit 57dd05f7e713ec8c70a5820a7c289a37cc1eb9d9)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 7aec642cf8a..40c149d4dbd 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 2d78179cc4f0601a891553132b13184fa51b6ef9
+      revision: 5c8d109371ebb740fbef1f440a3b59e488a36717
       path: modules/hal/nordic
       groups:
         - hal

From f478e8de4645d63d6835c29c49a7b1e818759000 Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Wed, 23 Oct 2024 13:52:42 +0200
Subject: [PATCH 0619/2913] [nrf noup] sample/smp_svr: nrf54l15dk test cases

Added nrf54l15dk testcases as copies of nrf54l15pdk.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Signed-off-by: Mateusz Michalek <mateusz.michalek@nordicsemi.no>
(cherry picked from commit 3adbc32d808ab54dde47f0ec04dded8555e7593a)
(cherry picked from commit 503a6de8dbb145847c7824990af65a6d04e773cf)
---
 ...54l15dk_nrf54l15_cpuapp_ext_flash.overlay} |  0
 .../subsys/mgmt/mcumgr/smp_svr/sample.yaml    | 33 +++++++++++--------
 2 files changed, 19 insertions(+), 14 deletions(-)
 rename samples/subsys/mgmt/mcumgr/smp_svr/boards/{nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay => nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay} (100%)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay
similarity index 100%
rename from samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
rename to samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 3aa3ca449e5..33b37512615 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -12,11 +12,12 @@ tests:
       - nrf52840dk/nrf52840
       - pinnacle_100_dvk
       - mg100
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l10/cpuapp
     integration_platforms:
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
   sample.mcumgr.smp_svr.bt_static_svc:
     extra_args: OVERLAY_CONFIG="overlay-bt.conf"
     extra_configs:
@@ -104,26 +105,30 @@ tests:
       - mg100
     integration_platforms:
       - nrf52840dk/nrf52840
-  sample.mcumgr.smp_svr.bt.nrf54l15pdk.ext_flash:
+  sample.mcumgr.smp_svr.bt.nrf54l15dk.ext_flash:
     extra_args:
       - OVERLAY_CONFIG="overlay-bt.conf"
-      - DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
-      - mcuboot_CONF_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.conf"
-      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
+      - DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
+      - mcuboot_CONF_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.conf"
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
     extra_configs:
       - CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
     platform_allow:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l10/cpuapp
+      - nrf54l15dk/nrf54l05/cpuapp
     integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp
-  sample.mcumgr.smp_svr.bt.nrf54l15pdk.ext_flash.pure_dts:
+      - nrf54l15dk/nrf54l15/cpuapp
+  sample.mcumgr.smp_svr.bt.nrf54l15dk.ext_flash.pure_dts:
     extra_args:
       - OVERLAY_CONFIG="overlay-bt.conf"
-      - DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
-      - mcuboot_CONF_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.conf"
-      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
+      - DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
+      - mcuboot_CONF_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.conf"
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
       - SB_CONFIG_PARTITION_MANAGER=n
     platform_allow:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l10/cpuapp
+      - nrf54l15dk/nrf54l05/cpuapp
     integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp

From f5704f33313d8fbc87885cf053a7eefb5005c4ab Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon.janc@codecoup.pl>
Date: Wed, 23 Oct 2024 11:23:28 +0200
Subject: [PATCH 0620/2913] [nrf fromlist] Bluetooth: Host: L2CAP: Fix seg_recv
 call on SDU overflow

This fix calling seg_recv() callback being called even though channel
is being disconnected due to SDU overflow.

Upstream PR #: 80911

Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl>
(cherry picked from commit 1c79ce030faab3347ea00bca836fb5a857e477e8)
---
 subsys/bluetooth/host/l2cap.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index 1e3850fd591..69197326df2 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -2557,6 +2557,7 @@ static void l2cap_chan_le_recv_seg_direct(struct bt_l2cap_le_chan *chan, struct
 	if (seg->len > sdu_remaining) {
 		LOG_WRN("L2CAP RX PDU total exceeds SDU");
 		bt_l2cap_chan_disconnect(&chan->chan);
+		return;
 	}
 
 	/* Commit receive. */

From 3ac9a1d87beccef8272e542c17eae79730f77f71 Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon.janc@codecoup.pl>
Date: Wed, 23 Oct 2024 11:26:33 +0200
Subject: [PATCH 0621/2913] [nrf fromlist] Bluetooth: Tester: Use
 BT_L2CAP_SEG_RECV for L2CAP tests

This API gives better control on L2CAP COC credits and suits better
for Upper Tester implementation.

Upstream PR #: 80911

Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl>
(cherry picked from commit 17c202dde8fdb10437942404e78c0cbaf15a2875)
---
 include/zephyr/bluetooth/l2cap.h       |  21 ++++++
 subsys/bluetooth/host/Kconfig.l2cap    |   8 ++
 subsys/bluetooth/host/l2cap.c          | 100 +++++++++++++++++++++++++
 tests/bluetooth/tester/prj.conf        |   3 +-
 tests/bluetooth/tester/src/btp_l2cap.c |  86 ++++++++++++++++++---
 5 files changed, 205 insertions(+), 13 deletions(-)

diff --git a/include/zephyr/bluetooth/l2cap.h b/include/zephyr/bluetooth/l2cap.h
index 0117da5ebb9..d3a49f9b3a9 100644
--- a/include/zephyr/bluetooth/l2cap.h
+++ b/include/zephyr/bluetooth/l2cap.h
@@ -18,6 +18,7 @@
  * @{
  */
 
+#include <stdint.h>
 #include <sys/types.h>
 
 #include <zephyr/sys/atomic.h>
@@ -552,6 +553,26 @@ int bt_l2cap_ecred_chan_connect(struct bt_conn *conn,
  */
 int bt_l2cap_ecred_chan_reconfigure(struct bt_l2cap_chan **chans, uint16_t mtu);
 
+/** @brief Reconfigure Enhanced Credit Based L2CAP channels
+ *
+ *  Experimental API to reconfigure with explicit MPS and MTU values.
+ *
+ *  Reconfigure up to 5 L2CAP channels. Channels must be from the same bt_conn.
+ *  Once reconfiguration is completed each channel reconfigured() callback will
+ *  be called. MTU cannot be decreased on any of provided channels.
+ *
+ *  @kconfig_dep{CONFIG_BT_L2CAP_RECONFIGURE_EXPLICIT}
+ *
+ *  @param chans Array of channel objects. Null-terminated. Elements after the
+ *               first 5 are silently ignored.
+ *  @param mtu Channel MTU to reconfigure to.
+ *  @param mps Channel MPS to reconfigure to.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_l2cap_ecred_chan_reconfigure_explicit(struct bt_l2cap_chan **chans, uint16_t mtu,
+					     uint16_t mps);
+
 /** @brief Connect L2CAP channel
  *
  *  Connect L2CAP channel by PSM, once the connection is completed channel
diff --git a/subsys/bluetooth/host/Kconfig.l2cap b/subsys/bluetooth/host/Kconfig.l2cap
index ed1428aade7..b886dc9d740 100644
--- a/subsys/bluetooth/host/Kconfig.l2cap
+++ b/subsys/bluetooth/host/Kconfig.l2cap
@@ -70,4 +70,12 @@ config BT_L2CAP_SEG_RECV
 	  This API enforces conformance with L2CAP TS, but is otherwise as
 	  flexible and semantically simple as possible.
 
+config BT_L2CAP_RECONFIGURE_EXPLICIT
+	bool "L2CAP Explicit reconfigure API [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	help
+
+	  Enable API for explicit reconfiguration of an L2CAP channel's MTU and
+	  MPS.
+
 endmenu
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index 69197326df2..ed185d12fd7 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -41,6 +41,7 @@ LOG_MODULE_REGISTER(bt_l2cap, CONFIG_BT_L2CAP_LOG_LEVEL);
 
 #define L2CAP_LE_MIN_MTU		23
 #define L2CAP_ECRED_MIN_MTU		64
+#define L2CAP_ECRED_MIN_MPS             64
 
 #define L2CAP_LE_MAX_CREDITS		(CONFIG_BT_BUF_ACL_RX_COUNT - 1)
 
@@ -3032,6 +3033,105 @@ int bt_l2cap_ecred_chan_reconfigure(struct bt_l2cap_chan **chans, uint16_t mtu)
 	return 0;
 }
 
+#if defined(CONFIG_BT_L2CAP_RECONFIGURE_EXPLICIT)
+int bt_l2cap_ecred_chan_reconfigure_explicit(struct bt_l2cap_chan **chans, uint16_t mtu,
+					     uint16_t mps)
+{
+	struct bt_l2cap_ecred_reconf_req *req;
+	struct bt_conn *conn = NULL;
+	struct bt_l2cap_le_chan *ch;
+	struct net_buf *buf;
+	bool multiple_chan;
+	uint8_t ident;
+	int i;
+
+	LOG_DBG("chans %p mtu 0x%04x mps 0x%04x", chans, mtu, mps);
+
+	if (!chans) {
+		return -EINVAL;
+	}
+
+	if (chans[0] == NULL) {
+		return -EINVAL;
+	}
+
+	if (mps < L2CAP_ECRED_MIN_MPS || mps > BT_L2CAP_RX_MTU) {
+		return -EINVAL;
+	}
+
+	multiple_chan = chans[1] != NULL;
+
+	for (i = 0; i < L2CAP_ECRED_CHAN_MAX_PER_REQ; i++) {
+		if (!chans[i]) {
+			break;
+		}
+
+		/* validate that all channels are from same connection */
+		if (conn) {
+			if (conn != chans[i]->conn) {
+				return -EINVAL;
+			}
+		} else {
+			conn = chans[i]->conn;
+		}
+
+		/* validate MTU is not decreased */
+		if (mtu < BT_L2CAP_LE_CHAN(chans[i])->rx.mtu) {
+			return -EINVAL;
+		}
+
+		/* MPS is not allowed to decrease when reconfiguring multiple channels.
+		 * Core Specification 3.A.4.27 v6.0
+		 */
+		if (multiple_chan && mps < BT_L2CAP_LE_CHAN(chans[i])->rx.mps) {
+			return -EINVAL;
+		}
+	}
+
+	if (!conn) {
+		return -ENOTCONN;
+	}
+
+	if (conn->type != BT_CONN_TYPE_LE) {
+		return -EINVAL;
+	}
+
+	/* allow only 1 request at time */
+	if (l2cap_find_pending_reconf(conn)) {
+		return -EBUSY;
+	}
+
+	ident = get_ident();
+
+	buf = l2cap_create_le_sig_pdu(BT_L2CAP_ECRED_RECONF_REQ, ident,
+				      sizeof(*req) + (i * sizeof(uint16_t)));
+	if (!buf) {
+		return -ENOMEM;
+	}
+
+	req = net_buf_add(buf, sizeof(*req));
+	req->mtu = sys_cpu_to_le16(mtu);
+	req->mps = sys_cpu_to_le16(mps);
+
+	for (int j = 0; j < i; j++) {
+		ch = BT_L2CAP_LE_CHAN(chans[j]);
+
+		ch->ident = ident;
+		ch->pending_rx_mtu = mtu;
+
+		net_buf_add_le16(buf, ch->rx.cid);
+	};
+
+	/* We set the RTX timer on one of the supplied channels, but when the
+	 * request resolves or times out we will act on all the channels in the
+	 * supplied array, using the ident field to find them.
+	 */
+	l2cap_chan_send_req(chans[0], buf, L2CAP_CONN_TIMEOUT);
+
+	return 0;
+}
+#endif /* defined(CONFIG_BT_L2CAP_RECONFIGURE_EXPLICIT) */
+
 #endif /* defined(CONFIG_BT_L2CAP_ECRED) */
 
 int bt_l2cap_chan_connect(struct bt_conn *conn, struct bt_l2cap_chan *chan,
diff --git a/tests/bluetooth/tester/prj.conf b/tests/bluetooth/tester/prj.conf
index ba5a40d078b..3046bebcba5 100644
--- a/tests/bluetooth/tester/prj.conf
+++ b/tests/bluetooth/tester/prj.conf
@@ -16,6 +16,8 @@ CONFIG_BT_BONDABLE=y
 CONFIG_BT_ATT_PREPARE_COUNT=12
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
+CONFIG_BT_L2CAP_SEG_RECV=y
+CONFIG_BT_L2CAP_RECONFIGURE_EXPLICIT=y
 CONFIG_BT_DEVICE_NAME="Tester"
 CONFIG_BT_DEVICE_NAME_MAX=32
 CONFIG_BT_DEVICE_NAME_DYNAMIC=y
@@ -33,7 +35,6 @@ CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_EXT_ADV=y
 CONFIG_BT_PER_ADV=y
 CONFIG_BT_PER_ADV_SYNC=y
-CONFIG_BT_BUF_ACL_RX_SIZE=100
 CONFIG_BT_RX_STACK_SIZE=4096
 
 CONFIG_BT_TESTING=y
diff --git a/tests/bluetooth/tester/src/btp_l2cap.c b/tests/bluetooth/tester/src/btp_l2cap.c
index 69c438f7f6f..6b62811eaf3 100644
--- a/tests/bluetooth/tester/src/btp_l2cap.c
+++ b/tests/bluetooth/tester/src/btp_l2cap.c
@@ -19,14 +19,15 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 
 #include "btp/btp.h"
 
-#define DATA_MTU_INITIAL 128
-#define DATA_MTU 256
-#define DATA_BUF_SIZE BT_L2CAP_SDU_BUF_SIZE(DATA_MTU)
+#define L2CAP_MPS        96
+#define DATA_MTU         (3 * L2CAP_MPS)
+#define DATA_MTU_INITIAL (2 * L2CAP_MPS)
+
 #define CHANNELS 2
 #define SERVERS 1
 
-NET_BUF_POOL_FIXED_DEFINE(data_pool, CHANNELS, DATA_BUF_SIZE, CONFIG_BT_CONN_TX_USER_DATA_SIZE,
-			  NULL);
+NET_BUF_POOL_FIXED_DEFINE(data_pool, CHANNELS, BT_L2CAP_SDU_BUF_SIZE(DATA_MTU),
+			  CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
 
 static bool authorize_flag;
 static uint8_t req_keysize;
@@ -36,18 +37,51 @@ static struct channel {
 	struct bt_l2cap_le_chan le;
 	bool in_use;
 	bool hold_credit;
+#if defined(CONFIG_BT_L2CAP_SEG_RECV)
+	unsigned int pending_credits;
+	uint8_t recv_cb_buf[DATA_MTU + sizeof(struct btp_l2cap_data_received_ev)];
+#else
 	struct net_buf *pending_credit;
+#endif
 } channels[CHANNELS];
 
 /* TODO Extend to support multiple servers */
 static struct bt_l2cap_server servers[SERVERS];
 
+#if defined(CONFIG_BT_L2CAP_SEG_RECV)
+static void seg_recv_cb(struct bt_l2cap_chan *l2cap_chan, size_t sdu_len, off_t seg_offset,
+			struct net_buf_simple *seg)
+{
+	struct btp_l2cap_data_received_ev *ev;
+	struct bt_l2cap_le_chan *l2cap_le_chan =
+		CONTAINER_OF(l2cap_chan, struct bt_l2cap_le_chan, chan);
+	struct channel *chan = CONTAINER_OF(l2cap_le_chan, struct channel, le);
+
+	ev = (void *)chan->recv_cb_buf;
+	memcpy(&ev->data[seg_offset], seg->data, seg->len);
+
+	/* complete SDU received */
+	if (seg_offset + seg->len == sdu_len) {
+		ev->chan_id = chan->chan_id;
+		ev->data_length = sys_cpu_to_le16(sdu_len);
+
+		tester_event(BTP_SERVICE_ID_L2CAP, BTP_L2CAP_EV_DATA_RECEIVED, chan->recv_cb_buf,
+			     sizeof(*ev) + sdu_len);
+	}
+
+	if (chan->hold_credit) {
+		chan->pending_credits++;
+	} else {
+		bt_l2cap_chan_give_credits(l2cap_chan, 1);
+	}
+}
+#else
 static struct net_buf *alloc_buf_cb(struct bt_l2cap_chan *chan)
 {
 	return net_buf_alloc(&data_pool, K_FOREVER);
 }
 
-static uint8_t recv_cb_buf[DATA_BUF_SIZE + sizeof(struct btp_l2cap_data_received_ev)];
+static uint8_t recv_cb_buf[DATA_MTU + sizeof(struct btp_l2cap_data_received_ev)];
 
 static int recv_cb(struct bt_l2cap_chan *l2cap_chan, struct net_buf *buf)
 {
@@ -73,6 +107,7 @@ static int recv_cb(struct bt_l2cap_chan *l2cap_chan, struct net_buf *buf)
 
 	return 0;
 }
+#endif
 
 static void connected_cb(struct bt_l2cap_chan *l2cap_chan)
 {
@@ -111,11 +146,13 @@ static void disconnected_cb(struct bt_l2cap_chan *l2cap_chan)
 	struct channel *chan = CONTAINER_OF(l2cap_le_chan, struct channel, le);
 	struct bt_conn_info info;
 
+#if !defined(CONFIG_BT_L2CAP_SEG_RECV)
 	/* release netbuf on premature disconnection */
 	if (chan->pending_credit) {
 		net_buf_unref(chan->pending_credit);
 		chan->pending_credit = NULL;
 	}
+#endif
 
 	(void)memset(&ev, 0, sizeof(struct btp_l2cap_disconnected_ev));
 
@@ -160,12 +197,16 @@ static void reconfigured_cb(struct bt_l2cap_chan *l2cap_chan)
 #endif
 
 static const struct bt_l2cap_chan_ops l2cap_ops = {
-	.alloc_buf	= alloc_buf_cb,
-	.recv		= recv_cb,
-	.connected	= connected_cb,
-	.disconnected	= disconnected_cb,
+#if defined(CONFIG_BT_L2CAP_SEG_RECV)
+	.seg_recv = seg_recv_cb,
+#else
+	.alloc_buf = alloc_buf_cb,
+	.recv = recv_cb,
+#endif
+	.connected = connected_cb,
+	.disconnected = disconnected_cb,
 #if defined(CONFIG_BT_L2CAP_ECRED)
-	.reconfigured	= reconfigured_cb,
+	.reconfigured = reconfigured_cb,
 #endif
 };
 
@@ -222,10 +263,15 @@ static uint8_t connect(const void *cmd, uint16_t cmd_len,
 		}
 		chan->le.chan.ops = &l2cap_ops;
 		chan->le.rx.mtu = mtu;
+#if defined(CONFIG_BT_L2CAP_SEG_RECV)
+		chan->le.rx.mps = L2CAP_MPS;
+#endif
 		rp->chan_id[i] = chan->chan_id;
 		allocated_channels[i] = &chan->le.chan;
 
 		chan->hold_credit = cp->options & BTP_L2CAP_CONNECT_OPT_HOLD_CREDIT;
+
+		bt_l2cap_chan_give_credits(&chan->le.chan, 1);
 	}
 
 	if (cp->num == 1 && !ecfc) {
@@ -289,6 +335,7 @@ static uint8_t reconfigure(const void *cmd, uint16_t cmd_len,
 {
 	const struct btp_l2cap_reconfigure_cmd *cp = cmd;
 	uint16_t mtu;
+	uint16_t mps;
 	struct bt_conn *conn;
 	int err;
 	struct bt_l2cap_chan *reconf_channels[CHANNELS + 1] = {};
@@ -321,7 +368,8 @@ static uint8_t reconfigure(const void *cmd, uint16_t cmd_len,
 		return BTP_STATUS_FAILED;
 	}
 
-	err = bt_l2cap_ecred_chan_reconfigure(reconf_channels, mtu);
+	mps = MIN(L2CAP_MPS, BT_L2CAP_RX_MTU);
+	err = bt_l2cap_ecred_chan_reconfigure_explicit(reconf_channels, mtu, mps);
 	if (err) {
 		bt_conn_unref(conn);
 		return BTP_STATUS_FAILED;
@@ -454,9 +502,14 @@ static int accept(struct bt_conn *conn, struct bt_l2cap_server *server,
 
 	chan->le.chan.ops = &l2cap_ops;
 	chan->le.rx.mtu = DATA_MTU_INITIAL;
+#if defined(CONFIG_BT_L2CAP_SEG_RECV)
+	chan->le.rx.mps = L2CAP_MPS;
+#endif
 
 	*l2cap_chan = &chan->le.chan;
 
+	bt_l2cap_chan_give_credits(&chan->le.chan, 1);
+
 	return 0;
 }
 
@@ -524,7 +577,15 @@ static uint8_t credits(const void *cmd, uint16_t cmd_len,
 	if (!chan->in_use) {
 		return BTP_STATUS_FAILED;
 	}
+#if defined(CONFIG_BT_L2CAP_SEG_RECV)
+	if (chan->pending_credits) {
+		if (bt_l2cap_chan_give_credits(&chan->le.chan, chan->pending_credits) < 0) {
+			return BTP_STATUS_FAILED;
+		}
 
+		chan->pending_credits = 0;
+	}
+#else
 	if (chan->pending_credit) {
 		if (bt_l2cap_chan_recv_complete(&chan->le.chan,
 						chan->pending_credit) < 0) {
@@ -533,6 +594,7 @@ static uint8_t credits(const void *cmd, uint16_t cmd_len,
 
 		chan->pending_credit = NULL;
 	}
+#endif
 
 	return BTP_STATUS_SUCCESS;
 }

From 05fc1b41186ca67260a3bbe89a257ff323b7c1e4 Mon Sep 17 00:00:00 2001
From: Aleksander Wasaznik <aleksander.wasaznik@nordicsemi.no>
Date: Thu, 7 Nov 2024 14:05:36 +0100
Subject: [PATCH 0622/2913] [nrf fromlist] Bluetooth: Tester: Increase config
 values to make tests pass

Without this PTS tests do not pass. These values are copied from a
commit aimed at unifying the prj.conf files in this directory. I do not
know which of these are strictly necessary to make the tests pass.
Copying them all poses no harm since the unification will be done later
anyway.

Upstream PR #: 80911

Co-authored-by: Szymon Janc <szymon.janc@codecoup.pl>
Signed-off-by: Aleksander Wasaznik <aleksander.wasaznik@nordicsemi.no>
(cherry picked from commit 54adfa782b384701fd8c645e371f339135b4a3a2)
---
 tests/bluetooth/tester/prj.conf | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/bluetooth/tester/prj.conf b/tests/bluetooth/tester/prj.conf
index 3046bebcba5..db254d1f668 100644
--- a/tests/bluetooth/tester/prj.conf
+++ b/tests/bluetooth/tester/prj.conf
@@ -16,6 +16,7 @@ CONFIG_BT_BONDABLE=y
 CONFIG_BT_ATT_PREPARE_COUNT=12
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
+CONFIG_BT_L2CAP_TX_MTU=255
 CONFIG_BT_L2CAP_SEG_RECV=y
 CONFIG_BT_L2CAP_RECONFIGURE_EXPLICIT=y
 CONFIG_BT_DEVICE_NAME="Tester"
@@ -27,8 +28,8 @@ CONFIG_BT_L2CAP_ECRED=y
 CONFIG_BT_EATT_MAX=5
 CONFIG_BT_FILTER_ACCEPT_LIST=y
 CONFIG_BT_EATT_AUTO_CONNECT=n
-CONFIG_BT_MAX_CONN=2
-CONFIG_BT_MAX_PAIRED=2
+CONFIG_BT_MAX_CONN=3
+CONFIG_BT_MAX_PAIRED=3
 CONFIG_BT_GATT_NOTIFY_MULTIPLE=y
 CONFIG_BT_ATT_RETRY_ON_SEC_ERR=n
 CONFIG_BT_GATT_DYNAMIC_DB=y
@@ -55,3 +56,9 @@ CONFIG_BT_DIS_SERIAL_NUMBER=y
 CONFIG_BT_DIS_FW_REV=y
 CONFIG_BT_DIS_HW_REV=y
 CONFIG_BT_DIS_SW_REV=y
+
+CONFIG_BT_BUF_EVT_RX_COUNT=16
+CONFIG_BT_BUF_EVT_RX_SIZE=255
+CONFIG_BT_BUF_CMD_TX_SIZE=255
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+CONFIG_BT_BUF_ACL_RX_SIZE=255

From ef56b95358d5b61e2b46d70b05c5b86cbde099f9 Mon Sep 17 00:00:00 2001
From: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
Date: Thu, 7 Nov 2024 23:21:32 +0100
Subject: [PATCH 0623/2913] [nrf fromlist] tests: drivers: gpio:
 gpio_basic_api: enable for nrf54l15dk

Incorrectly removed during transfer pdk->dk.

Upstream PR #: 81107

Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
(cherry picked from commit 5b1dd8bca2c954127403710b3224204ecc933906)
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..8eb1b3c9f9f
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	resources {
+		compatible = "test-gpio-basic-api";
+		out-gpios = <&gpio1 10 0>;
+		in-gpios = <&gpio1 11 0>;
+	};
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};

From e9ac1d5855a9cee183bcb690d36ac9a6a10bdf37 Mon Sep 17 00:00:00 2001
From: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
Date: Thu, 7 Nov 2024 23:23:20 +0100
Subject: [PATCH 0624/2913] [nrf fromlist] tests: drivers: sensor: temp_sensor:
 enable for nrf54l15dk

Incorrectly removed during transfer pdk->dk.

Upstream PR #: 81107

Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
(cherry picked from commit 1e549f5f6eb8ff6cf212af7fc2b5df7082a0d3c3)
---
 .../temp_sensor/boards/nrf54l15dk_nrf54l15_cpuapp.overlay      | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 tests/drivers/sensor/temp_sensor/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/sensor/temp_sensor/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/sensor/temp_sensor/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..435e4f4a6cc
--- /dev/null
+++ b/tests/drivers/sensor/temp_sensor/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,3 @@
+temp_sensor: &temp {
+	status = "okay";
+};

From 7c830fa139055b0d69e46c4d23a77cd9ac9c80fa Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Fri, 8 Nov 2024 17:31:04 +0530
Subject: [PATCH 0625/2913] [nrf fromlist] drivers: nrfwifi: Fix recovery for
 SAP

nRF70 recovery relies on power-management feature which isn't applicable
for SAP, so, we keep seeing false recovery causing interface restart.

Disabled recovery for SAP to fix the issue.

Fixes #81130.

Upstream PR #: 81131

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 5a391483191e8720b7556107337c8adf0ae655e0)
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index d1073933f58..4aabc46106a 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -656,7 +656,9 @@ config NRF_WIFI_AP_DEAD_DETECT_TIMEOUT
 
 config NRF_WIFI_RPU_RECOVERY
 	bool "RPU recovery mechanism"
+	# Relies on power-save mode, so, LPM is needed and AP mode is not supported
 	depends on NRF_WIFI_LOW_POWER
+	depends on !NRF70_AP_MODE
 	default y
 	select EXPERIMENTAL
 	help

From 13eddc5b9fa0c250ef198aafc8d1a84c5eab1120 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Tue, 15 Oct 2024 16:25:34 +0200
Subject: [PATCH 0626/2913] Revert "[nrf noup] boards: nordic: Turn off MRAM
 suspend for NRF54H20 DK"

This reverts commit 38f2104a801b1db40ab4596f972c0178f21821c5.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 4b246a0b9ed88077a8581956e562cba8606aca9b)
---
 boards/nordic/nrf54h20dk/CMakeLists.txt |  6 ---
 boards/nordic/nrf54h20dk/board.c        | 58 -------------------------
 modules/hal_nordic/nrfs/Kconfig         |  3 --
 3 files changed, 67 deletions(-)
 delete mode 100644 boards/nordic/nrf54h20dk/CMakeLists.txt
 delete mode 100644 boards/nordic/nrf54h20dk/board.c

diff --git a/boards/nordic/nrf54h20dk/CMakeLists.txt b/boards/nordic/nrf54h20dk/CMakeLists.txt
deleted file mode 100644
index a5a06d8805a..00000000000
--- a/boards/nordic/nrf54h20dk/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-zephyr_library()
-if(CONFIG_NRFS_MRAM_SERVICE_ENABLED)
-  zephyr_library_sources(board.c)
-endif()
diff --git a/boards/nordic/nrf54h20dk/board.c b/boards/nordic/nrf54h20dk/board.c
deleted file mode 100644
index 0699e93a7c3..00000000000
--- a/boards/nordic/nrf54h20dk/board.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/init.h>
-
-#define MODULE mram_suspend_off
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(MODULE);
-
-#include <services/nrfs_mram.h>
-#include <nrfs_backend_ipc_service.h>
-
-#define MRAM_SUSPEND_OFF_INIT_PRIO 90
-
-void mram_latency_handler(nrfs_mram_latency_evt_t const *p_evt, void *context)
-{
-	switch (p_evt->type) {
-	case NRFS_MRAM_LATENCY_REQ_APPLIED:
-		LOG_DBG("MRAM latency handler: response received");
-		break;
-	case NRFS_MRAM_LATENCY_REQ_REJECTED:
-		LOG_ERR("MRAM latency handler - request rejected!");
-		break;
-	default:
-		LOG_ERR("MRAM latency handler - unexpected event: 0x%x", p_evt->type);
-		break;
-	}
-}
-
-static int turn_off_suspend_mram(void)
-{
-	/* Turn off mram automatic suspend as it causes delays in time depended code sections. */
-
-	nrfs_err_t err = NRFS_SUCCESS;
-
-	/* Wait for ipc initialization */
-	nrfs_backend_wait_for_connection(K_FOREVER);
-
-	err = nrfs_mram_init(mram_latency_handler);
-	if (err != NRFS_SUCCESS) {
-		LOG_ERR("MRAM service init failed: %d", err);
-	} else {
-		LOG_DBG("MRAM service initialized");
-	}
-
-	LOG_DBG("MRAM: set latency: NOT ALLOWED");
-	err = nrfs_mram_set_latency(MRAM_LATENCY_NOT_ALLOWED, NULL);
-	if (err) {
-		LOG_ERR("MRAM: set latency failed (%d)", err);
-	}
-
-	return err;
-}
-
-SYS_INIT(turn_off_suspend_mram, APPLICATION, MRAM_SUSPEND_OFF_INIT_PRIO);
diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig
index 8325c8db3bc..eafe0616764 100644
--- a/modules/hal_nordic/nrfs/Kconfig
+++ b/modules/hal_nordic/nrfs/Kconfig
@@ -46,8 +46,6 @@ config NRFS
 				    SOC_NRF9280_CPUAPP || \
 				    SOC_NRF9280_CPURAD
 	depends on HAS_NRFS
-	depends on !MISRA_SANE
-	default y if !ZTEST
 	help
 	  This option enables the nRF Services library.
 
@@ -82,7 +80,6 @@ config NRFS_RESET_SERVICE_ENABLED
 config NRFS_MRAM_SERVICE_ENABLED
 	bool "MRAM latency service"
 	depends on NRFS_HAS_MRAM_SERVICE
-	default y
 
 config NRFS_TEMP_SERVICE_ENABLED
 	bool "Temperature service"

From 3629a679d9e75d25f68f81c9b4b92be9614372e4 Mon Sep 17 00:00:00 2001
From: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
Date: Tue, 5 Nov 2024 14:58:13 +0100
Subject: [PATCH 0627/2913] [nrf fromtree] dp: swdp_bitbang: fix missing reset
 pin error

This patch fixes an issue where the reset pin is used even when it's
not given.

Signed-off-by: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
(cherry picked from commit 4f85ce6eda93199946277d09bd5220b5eddd997e)
(cherry picked from commit 02718211f9a98f9967eeef14305148483a8bb048)
---
 drivers/dp/swdp_bitbang.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/dp/swdp_bitbang.c b/drivers/dp/swdp_bitbang.c
index 7822315ab8e..8dec65b6c10 100644
--- a/drivers/dp/swdp_bitbang.c
+++ b/drivers/dp/swdp_bitbang.c
@@ -601,9 +601,11 @@ static int sw_port_on(const struct device *dev)
 		return ret;
 	}
 
-	ret = gpio_pin_configure_dt(&config->reset, GPIO_OUTPUT_ACTIVE);
-	if (ret) {
-		return ret;
+	if (config->reset.port) {
+		ret = gpio_pin_configure_dt(&config->reset, GPIO_OUTPUT_ACTIVE);
+		if (ret) {
+			return ret;
+		}
 	}
 
 	return 0;

From b5fda5ef3743044a9470cfb1e1e7747fa094b7a5 Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Tue, 12 Nov 2024 11:13:38 +0000
Subject: [PATCH 0628/2913] [nrf noup] mcuboot: Add
 CONFIG_MCUBOOT_BOOTLOADER_USES_SHA512

The option notifies application that MCUboot has been configured
to use SHA512 for image hashing.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit dcb8c6a499724ec98efc38eb8c0ae9ce345f652c)
---
 modules/Kconfig.mcuboot | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/Kconfig.mcuboot b/modules/Kconfig.mcuboot
index b46c709d8ef..457a5b332f4 100644
--- a/modules/Kconfig.mcuboot
+++ b/modules/Kconfig.mcuboot
@@ -256,6 +256,11 @@ config MCUBOOT_BOOTLOADER_NO_DOWNGRADE
 	  MCUBOOT_DOWNGRADE_PREVENTION option enabled.
 endif
 
+config MCUBOOT_BOOTLOADER_USES_SHA512
+	bool "MCUboot uses SHA512 for image hash"
+	help
+	  MCUboot has been compiled to verify images using SHA512.
+
 endmenu # On board MCUboot operation mode
 
 endif # BOOTLOADER_MCUBOOT

From 56b14cc5ac248991e18241a63f9ab863fd89acca Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Tue, 12 Nov 2024 12:50:38 +0000
Subject: [PATCH 0629/2913] [nrf noup] mgmt/mcumgr: Add support for SHA512 in
 images

Adds support for images signed with SHA512.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 61555a39fa1588f5333f9f0241b70c9c957f1d71)
---
 .../include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h |  8 ++++++++
 subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c       | 12 ++++++------
 subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c |  8 ++++----
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h b/subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h
index 133a1abf054..d584467ee2b 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h
@@ -18,6 +18,14 @@
 extern "C" {
 #endif
 
+#ifdef CONFIG_MCUBOOT_BOOTLOADER_USES_SHA512
+#define IMAGE_TLV_SHA		IMAGE_TLV_SHA512
+#define IMAGE_SHA_LEN		64
+#else
+#define IMAGE_TLV_SHA		IMAGE_TLV_SHA256
+#define IMAGE_SHA_LEN		32
+#endif
+
 /**
  * @brief Ensures the spare slot (slot 1) is fully erased.
  *
diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
index e10953a155a..78cd8b736af 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
@@ -253,7 +253,7 @@ int img_mgmt_read_info(int image_slot, struct image_version *ver, uint8_t *hash,
 		if (tlv.it_type == 0xff && tlv.it_len == 0xffff) {
 			return IMG_MGMT_ERR_INVALID_TLV;
 		}
-		if (tlv.it_type != IMAGE_TLV_SHA256 || tlv.it_len != IMAGE_HASH_LEN) {
+		if (tlv.it_type != IMAGE_TLV_SHA || tlv.it_len != IMAGE_SHA_LEN) {
 			/* Non-hash TLV.  Skip it. */
 			data_off += sizeof(tlv) + tlv.it_len;
 			continue;
@@ -267,10 +267,10 @@ int img_mgmt_read_info(int image_slot, struct image_version *ver, uint8_t *hash,
 
 		data_off += sizeof(tlv);
 		if (hash != NULL) {
-			if (data_off + IMAGE_HASH_LEN > data_end) {
+			if (data_off + IMAGE_SHA_LEN > data_end) {
 				return IMG_MGMT_ERR_TLV_INVALID_SIZE;
 			}
-			rc = img_mgmt_read(image_slot, data_off, hash, IMAGE_HASH_LEN);
+			rc = img_mgmt_read(image_slot, data_off, hash, IMAGE_SHA_LEN);
 			if (rc != 0) {
 				return rc;
 			}
@@ -313,13 +313,13 @@ int
 img_mgmt_find_by_hash(uint8_t *find, struct image_version *ver)
 {
 	int i;
-	uint8_t hash[IMAGE_HASH_LEN];
+	uint8_t hash[IMAGE_SHA_LEN];
 
 	for (i = 0; i < 2 * CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER; i++) {
 		if (img_mgmt_read_info(i, ver, hash, NULL) != 0) {
 			continue;
 		}
-		if (!memcmp(hash, find, IMAGE_HASH_LEN)) {
+		if (!memcmp(hash, find, IMAGE_SHA_LEN)) {
 			return i;
 		}
 	}
@@ -441,7 +441,7 @@ img_mgmt_upload_good_rsp(struct smp_streamer *ctxt)
 static int
 img_mgmt_upload_log(bool is_first, bool is_last, int status)
 {
-	uint8_t hash[IMAGE_HASH_LEN];
+	uint8_t hash[IMAGE_SHA_LEN];
 	const uint8_t *hashp;
 	int rc;
 
diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
index 6a4a0aeeea3..60c377c79e9 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
@@ -415,8 +415,8 @@ static bool img_mgmt_state_encode_slot(struct smp_streamer *ctxt, uint32_t slot,
 	zcbor_state_t *zse = ctxt->writer->zs;
 	uint32_t flags;
 	char vers_str[IMG_MGMT_VER_MAX_STR_LEN];
-	uint8_t hash[IMAGE_HASH_LEN]; /* SHA256 hash */
-	struct zcbor_string zhash = { .value = hash, .len = IMAGE_HASH_LEN };
+	uint8_t hash[IMAGE_SHA_LEN];
+	struct zcbor_string zhash = { .value = hash, .len = IMAGE_SHA_LEN};
 	struct image_version ver;
 	bool ok;
 	int rc = img_mgmt_read_info(slot, &ver, hash, &flags);
@@ -719,14 +719,14 @@ img_mgmt_state_write(struct smp_streamer *ctxt)
 					     IMG_MGMT_ERR_INVALID_HASH);
 			goto end;
 		}
-	} else if (zhash.len != IMAGE_HASH_LEN) {
+	} else if (zhash.len != IMAGE_SHA_LEN) {
 		/* The img_mgmt_find_by_hash does exact length compare
 		 * so just fail here.
 		 */
 		ok = smp_add_cmd_err(zse, MGMT_GROUP_ID_IMAGE, IMG_MGMT_ERR_INVALID_HASH);
 		goto end;
 	} else {
-		uint8_t hash[IMAGE_HASH_LEN];
+		uint8_t hash[IMAGE_SHA_LEN];
 
 		memcpy(hash, zhash.value, zhash.len);
 

From f70627b9dec3c9dcd5c0451bdea4893d95272c75 Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Tue, 12 Nov 2024 12:52:03 +0000
Subject: [PATCH 0630/2913] [nrf noup] samples/smp_svr: Increase stack size
 required

Increase stack size as support for SHA512 requires more data.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit c5efe1f601490fdb365fb17f28ec33d59409e54f)
---
 samples/subsys/mgmt/mcumgr/smp_svr/prj.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/prj.conf b/samples/subsys/mgmt/mcumgr/smp_svr/prj.conf
index 06a27644bac..925ac0c93a2 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/prj.conf
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/prj.conf
@@ -8,7 +8,7 @@ CONFIG_FLASH_MAP=y
 
 # Some command handlers require a large stack.
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2304
-CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_MAIN_STACK_SIZE=2176
 
 # Ensure an MCUboot-compatible binary is generated.
 CONFIG_BOOTLOADER_MCUBOOT=y

From e8126dc55517fe74141777ea174deb29583af117 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Fri, 8 Nov 2024 10:57:20 +0100
Subject: [PATCH 0631/2913] [nrf fromlist] drivers: spi: nrfx_spim: set/clear
 pins retention

Add pins retention control when GPD is enabled for SPIM.

Upstream PR #: 81134

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 87e5b3f36d215898b127ad25aadf56f0e3d162ed)
---
 drivers/spi/spi_nrfx_spim.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c
index 01191caa829..aacf863e3b4 100644
--- a/drivers/spi/spi_nrfx_spim.c
+++ b/drivers/spi/spi_nrfx_spim.c
@@ -12,6 +12,9 @@
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
 #include <soc.h>
+#ifdef CONFIG_SOC_NRF54H20_GPD
+#include <nrf/gpd.h>
+#endif
 #ifdef CONFIG_SOC_NRF52832_ALLOW_SPIM_DESPITE_PAN_58
 #include <nrfx_ppi.h>
 #endif
@@ -592,6 +595,11 @@ static int spim_nrfx_pm_action(const struct device *dev,
 		/* nrfx_spim_init() will be called at configuration before
 		 * the next transfer.
 		 */
+
+#ifdef CONFIG_SOC_NRF54H20_GPD
+		nrf_gpd_retain_pins_set(dev_config->pcfg, false);
+#endif
+
 		break;
 
 	case PM_DEVICE_ACTION_SUSPEND:
@@ -600,6 +608,10 @@ static int spim_nrfx_pm_action(const struct device *dev,
 			dev_data->initialized = false;
 		}
 
+#ifdef CONFIG_SOC_NRF54H20_GPD
+		nrf_gpd_retain_pins_set(dev_config->pcfg, true);
+#endif
+
 		ret = pinctrl_apply_state(dev_config->pcfg,
 					  PINCTRL_STATE_SLEEP);
 		break;

From bfcbcf4e59439d6574e121718fea30874a6693ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Wed, 13 Nov 2024 10:51:09 +0100
Subject: [PATCH 0632/2913] [nrf fromlist] drivers: pwm: nrfx: add pin
 retention
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add pin retenion if GPD is enabled for nRF54H20.

Upstream PR #: 80672

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit b524b0e61990b415fe3b011611d031b28c29d279)
---
 drivers/pwm/pwm_nrfx.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index 5161b299c3a..230a90d6cdf 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -13,6 +13,9 @@
 #include <zephyr/linker/devicetree_regions.h>
 #include <zephyr/cache.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
+#ifdef CONFIG_SOC_NRF54H20_GPD
+#include <nrf/gpd.h>
+#endif
 
 #include <zephyr/logging/log.h>
 
@@ -274,6 +277,10 @@ static void pwm_resume(const struct device *dev)
 
 	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
 
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	nrf_gpd_retain_pins_set(config->pcfg, false);
+#endif
+
 	for (size_t i = 0; i < NRF_PWM_CHANNEL_COUNT; i++) {
 		uint32_t psel;
 
@@ -302,6 +309,10 @@ static void pwm_suspend(const struct device *dev)
 	while (!nrfx_pwm_stopped_check(&config->pwm)) {
 	}
 
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	nrf_gpd_retain_pins_set(config->pcfg, true);
+#endif
+
 	memset(dev->data, 0, sizeof(struct pwm_nrfx_data));
 	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
 }

From e606246f0fc3e9299cb5bdd3c1e34a091e5d85a1 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Date: Wed, 13 Nov 2024 10:13:44 +0100
Subject: [PATCH 0633/2913] [nrf noup] drivers: spi: dw: turn on FAST_ACTIVE1
 domain

FAST_ACTIVE1 domain needs to be kept ON while the peripheral is
active (always in this driver).

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
(cherry picked from commit b9bc0846b926d339b042c4faa3c43c8276a37009)
---
 drivers/spi/spi_dw.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
index b4f772b158b..5801c2744b4 100644
--- a/drivers/spi/spi_dw.c
+++ b/drivers/spi/spi_dw.c
@@ -45,6 +45,10 @@ LOG_MODULE_REGISTER(spi_dw);
 #include <nrfx.h>
 #endif
 
+#ifdef CONFIG_SOC_NRF54H20_GPD
+#include <nrf/gpd.h>
+#endif
+
 static inline bool spi_dw_is_slave(struct spi_dw_data *spi)
 {
 	return (IS_ENABLED(CONFIG_SPI_SLAVE) &&
@@ -560,6 +564,13 @@ int spi_dw_init(const struct device *dev)
 #ifdef CONFIG_HAS_NRFX
 	NRF_EXMIF->INTENSET = BIT(0);
 	NRF_EXMIF->TASKS_START = 1;
+
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	err = nrf_gpd_request(NRF_GPD_FAST_ACTIVE1);
+	if (err < 0) {
+		return err;
+	}
+#endif
 #endif
 
 	info->config_func();

From 083162656d638aba0d5bf5733cc5a0deeba206a2 Mon Sep 17 00:00:00 2001
From: Krzysztof Szromek <krzysztof.szromek@nordicsemi.no>
Date: Tue, 12 Nov 2024 10:28:23 +0100
Subject: [PATCH 0634/2913] [nrf noup] ci: fix suit-dfu-test entries in
 test-spec

Fix and update triggers for SUIT DFU tests.

Signed-off-by: Krzysztof Szromek <krzysztof.szromek@nordicsemi.no>
(cherry picked from commit df2fd0e7a8a278f5b1ebb4d2c404cbdc3a6db2ec)
---
 .github/test-spec.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/test-spec.yml b/.github/test-spec.yml
index 63a29824c11..bf09724ea49 100644
--- a/.github/test-spec.yml
+++ b/.github/test-spec.yml
@@ -391,10 +391,11 @@
   - "drivers/mbox/**/*"
   - "drivers/serial/**/*"
   - "drivers/console/**/*"
+  - "drivers/gpio/**/*"
   - "dts/common/nordic/*"
-  - "dts/arm/nordic/nrf54h*"
-  - "dts/riscv/nordic/nrf54h*"
-  - "boards/nordic/nrf54h*"
+  - "dts/arm/nordic/nrf54h*/**/*"
+  - "dts/riscv/nordic/nrf54h*/**/*"
+  - "boards/nordic/nrf54h*/**/*"
   - "soc/nordic/nrf54h/**/*"
   - "include/zephyr/**/*"
   - "subsys/logging/**/*"

From 14b7851df94ceb31a42be8eb727a1f01a946ad94 Mon Sep 17 00:00:00 2001
From: Hessel van der Molen <hvandermolen@dexels.com>
Date: Wed, 30 Oct 2024 17:33:08 +0100
Subject: [PATCH 0635/2913] [nrf fromlist] arch: arm: cortex_m: pm_s2ram: fix
 system_off rv as rv of s2ram_suspend

The return value of the system_off call is overwritten by the the call to
pm_s2ram_mark_check_and_clear. As arch_pm_s2ram_suspend needs to specify
why system_off failed, we need to make sure the rv of system_off is moved
to a safe register before calling pm_s2ram_mark_check_and_clear and moved
to r0 als rv of arch_pm_s2ram_suspend when the suspend call exits.

Upstream PR #: 80642

Signed-off-by: Hessel van der Molen <hvandermolen@dexels.com>
(cherry picked from commit a93ae9d0e20b23441151d9c092757d3587c96a4f)
---
 arch/arm/core/cortex_m/pm_s2ram.S | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/arch/arm/core/cortex_m/pm_s2ram.S b/arch/arm/core/cortex_m/pm_s2ram.S
index 27c2a1e96a7..aed8cf5b692 100644
--- a/arch/arm/core/cortex_m/pm_s2ram.S
+++ b/arch/arm/core/cortex_m/pm_s2ram.S
@@ -85,6 +85,9 @@ SECTION_FUNC(TEXT, arch_pm_s2ram_suspend)
 	 * not successful (in r0 the return value).
 	 */
 
+	/* Move return value of system_off to callee-saved register. */
+	mov 	r4, r0
+
 	/*
 	 * Reset the marking of suspend to RAM, return is ignored.
 	 */
@@ -92,7 +95,9 @@ SECTION_FUNC(TEXT, arch_pm_s2ram_suspend)
 	bl	pm_s2ram_mark_check_and_clear
 	mov 	lr, r1
 
-	/* Move system_off back to r0 as return value */
+	/* Move the stored return value of system_off back to r0,
+	 * setting it as return value for this function.
+	 */
 	mov	r0, r4
 
 	pop	{r4-r12, lr}

From 1c73db7ef4897adf261b8a319c656cb09c8e9f8f Mon Sep 17 00:00:00 2001
From: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
Date: Fri, 15 Nov 2024 07:39:00 +0100
Subject: [PATCH 0636/2913] [nrf fromlist] soc: nordic: add configuration for
 nrf54h20 flpr core

To properly execute erase, recover and reset.

Upstream PR #: 81420

Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
(cherry picked from commit d0fbc494f513f09e9a93a76c373f2cd7ac3f00ab)
---
 soc/nordic/soc.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/soc/nordic/soc.yml b/soc/nordic/soc.yml
index 27db57b9099..9879f82f61a 100644
--- a/soc/nordic/soc.yml
+++ b/soc/nordic/soc.yml
@@ -103,6 +103,7 @@ runners:
               - nrf54h20/cpuapp
               - nrf54h20/cpurad
               - nrf54h20/cpuppr
+              - nrf54h20/cpuflpr
           - qualifiers:
               - nrf9280/cpuapp
               - nrf9280/cpurad
@@ -156,6 +157,7 @@ runners:
               - nrf54h20/cpuapp
               - nrf54h20/cpurad
               - nrf54h20/cpuppr
+              - nrf54h20/cpuflpr
           - qualifiers:
               - nrf9280/cpuapp
               - nrf9280/cpurad
@@ -207,6 +209,7 @@ runners:
               - nrf54h20/cpuapp
               - nrf54h20/cpurad
               - nrf54h20/cpuppr
+              - nrf54h20/cpuflpr
           - qualifiers:
               - nrf9280/cpuapp
               - nrf9280/cpurad

From c530d584fe8fc371281dac2c4c273c6007873864 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Wed, 13 Nov 2024 12:58:56 +0000
Subject: [PATCH 0637/2913] [nrf fromlist] cmake: dts: Use temporary file for
 dts.cmake

Uses a temporary file for dts output then uses CMake to copy to the
correct file if it has changed. This prevents a ping-pong issue when
sysbuild is used of configuring and building cycle when nothing has
changed and there is sysbuild code which loads in the devicetree
data from an image

Upstream PR #: 81340

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit aa40507997a0052c04856db1ad6f290eb1f727cb)
---
 cmake/modules/dts.cmake | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/cmake/modules/dts.cmake b/cmake/modules/dts.cmake
index 82c5a302fbc..42e822c6c91 100644
--- a/cmake/modules/dts.cmake
+++ b/cmake/modules/dts.cmake
@@ -319,17 +319,26 @@ endif()
 #
 # Run GEN_DTS_CMAKE_SCRIPT.
 #
+# A temporary file is copied to the original file if it differs. This prevents issue such as a
+# cycle when sysbuild is used of configuring and building multiple times due to the dts.cmake file
+# of images having a newer modification time than the sysbuild build.ninja file, despite the
+# output having not changed
+#
+set(dts_cmake_tmp ${DTS_CMAKE}.new)
 
 execute_process(
   COMMAND ${PYTHON_EXECUTABLE} ${GEN_DTS_CMAKE_SCRIPT}
   --edt-pickle ${EDT_PICKLE}
-  --cmake-out ${DTS_CMAKE}
+  --cmake-out ${dts_cmake_tmp}
   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
   RESULT_VARIABLE ret
   )
 if(NOT "${ret}" STREQUAL "0")
   message(FATAL_ERROR "gen_dts_cmake.py failed with return code: ${ret}")
 else()
+  zephyr_file_copy(${dts_cmake_tmp} ${DTS_CMAKE} ONLY_IF_DIFFERENT)
+  file(REMOVE ${dts_cmake_tmp})
+  set(dts_cmake_tmp)
   message(STATUS "Including generated dts.cmake file: ${DTS_CMAKE}")
   include(${DTS_CMAKE})
 endif()

From 43d99039d3ba7a543b6a0600488c6654898a083a Mon Sep 17 00:00:00 2001
From: Olivier Lesage <olivier.lesage@nordicsemi.no>
Date: Thu, 24 Oct 2024 13:46:00 +0200
Subject: [PATCH 0638/2913] [nrf fromtree] bluetooth: host: Unit tests for
 bt_le_cs_step_data_parse

Add unit tests for bt_le_cs_step_data_parse.
Also exit early (without calling the function pointer) if the next
step would seem to read out of bounds.

Signed-off-by: Olivier Lesage <olivier.lesage@nordicsemi.no>
(cherry picked from commit 635d03b7e0b1fe61f218e8eb66091168e7cc7ae7)

Signed-off-by: Sean Madigan <sean.madigan@nordicsemi.no>
(cherry picked from commit 343700b6437df149db829e72f417f3f60f00d298)
---
 subsys/bluetooth/host/cs.c                    |   5 +
 .../bt_le_cs_step_data_parse/CMakeLists.txt   |  25 +++
 .../host/cs/bt_le_cs_step_data_parse/prj.conf |  10 +
 .../cs/bt_le_cs_step_data_parse/src/main.c    | 171 ++++++++++++++++++
 .../cs/bt_le_cs_step_data_parse/testcase.yaml |   7 +
 tests/bluetooth/host/cs/mocks/CMakeLists.txt  |  17 ++
 tests/bluetooth/host/cs/mocks/conn.c          |  22 +++
 tests/bluetooth/host/cs/mocks/conn.h          |  37 ++++
 tests/bluetooth/host/cs/mocks/hci_core.c      |  19 ++
 tests/bluetooth/host/cs/mocks/hci_core.h      |  16 ++
 tests/bluetooth/host/cs/mocks/net_buf.c       |  17 ++
 tests/bluetooth/host/cs/mocks/net_buf.h       |  21 +++
 12 files changed, 367 insertions(+)
 create mode 100644 tests/bluetooth/host/cs/bt_le_cs_step_data_parse/CMakeLists.txt
 create mode 100644 tests/bluetooth/host/cs/bt_le_cs_step_data_parse/prj.conf
 create mode 100644 tests/bluetooth/host/cs/bt_le_cs_step_data_parse/src/main.c
 create mode 100644 tests/bluetooth/host/cs/bt_le_cs_step_data_parse/testcase.yaml
 create mode 100644 tests/bluetooth/host/cs/mocks/CMakeLists.txt
 create mode 100644 tests/bluetooth/host/cs/mocks/conn.c
 create mode 100644 tests/bluetooth/host/cs/mocks/conn.h
 create mode 100644 tests/bluetooth/host/cs/mocks/hci_core.c
 create mode 100644 tests/bluetooth/host/cs/mocks/hci_core.h
 create mode 100644 tests/bluetooth/host/cs/mocks/net_buf.c
 create mode 100644 tests/bluetooth/host/cs/mocks/net_buf.h

diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index b22877d31b8..aa1e1beadf3 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -1313,6 +1313,11 @@ void bt_le_cs_step_data_parse(struct net_buf_simple *step_data_buf,
 
 		step.data = step_data_buf->data;
 
+		if (step.data_len > step_data_buf->len) {
+			LOG_WRN("Step data appears malformed.");
+			return;
+		}
+
 		if (!func(&step, user_data)) {
 			return;
 		}
diff --git a/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/CMakeLists.txt b/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/CMakeLists.txt
new file mode 100644
index 00000000000..089406a316f
--- /dev/null
+++ b/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/CMakeLists.txt
@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+project(bt_step_data_parse)
+
+include_directories(BEFORE
+    ${ZEPHYR_BASE}/tests/bluetooth/host/cs/mocks
+)
+
+add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/host host_mocks)
+add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/host/cs/mocks mocks)
+
+target_link_libraries(testbinary PRIVATE mocks host_mocks)
+
+target_sources(testbinary
+    PRIVATE
+    src/main.c
+
+    ${ZEPHYR_BASE}/subsys/bluetooth/host/cs.c
+    ${ZEPHYR_BASE}/lib/net_buf/buf_simple.c
+    ${ZEPHYR_BASE}/subsys/logging/log_minimal.c
+)
diff --git a/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/prj.conf b/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/prj.conf
new file mode 100644
index 00000000000..8ff995b6f04
--- /dev/null
+++ b/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/prj.conf
@@ -0,0 +1,10 @@
+CONFIG_ZTEST=y
+CONFIG_BT=y
+CONFIG_BT_HCI=y
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_CHANNEL_SOUNDING=y
+CONFIG_ASSERT=y
+CONFIG_ASSERT_LEVEL=2
+CONFIG_ASSERT_VERBOSE=y
+CONFIG_ASSERT_ON_ERRORS=y
+CONFIG_NET_BUF=y
diff --git a/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/src/main.c b/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/src/main.c
new file mode 100644
index 00000000000..1ed0f2d640b
--- /dev/null
+++ b/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/src/main.c
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "mocks/conn.h"
+#include "mocks/hci_core.h"
+#include "mocks/net_buf.h"
+
+#include <zephyr/kernel.h>
+#include <zephyr/bluetooth/cs.h>
+#include <zephyr/fff.h>
+
+DEFINE_FFF_GLOBALS;
+
+FAKE_VALUE_FUNC(bool, bt_le_cs_step_data_parse_func, struct bt_le_cs_subevent_step *, void *);
+
+static void fff_reset_rule_before(const struct ztest_unit_test *test, void *fixture)
+{
+	RESET_FAKE(bt_le_cs_step_data_parse_func);
+	CONN_FFF_FAKES_LIST(RESET_FAKE);
+}
+
+ZTEST_RULE(fff_reset_rule, fff_reset_rule_before, NULL);
+
+ZTEST_SUITE(bt_le_cs_step_data_parse, NULL, NULL, NULL, NULL, NULL);
+
+/*
+ *  Test empty data buffer
+ *
+ *  Constraints:
+ *   - buffer len set to 0
+ *
+ *  Expected behaviour:
+ *   - Callback function is not called
+ */
+ZTEST(bt_le_cs_step_data_parse, test_parsing_empty_buf)
+{
+	struct net_buf_simple *buf = NET_BUF_SIMPLE(0);
+
+	bt_le_cs_step_data_parse(buf, bt_le_cs_step_data_parse_func, NULL);
+
+	zassert_equal(bt_le_cs_step_data_parse_func_fake.call_count, 0);
+}
+
+/*
+ *  Test malformed step data
+ *
+ *  Constraints:
+ *   - step data with a step length going out of bounds
+ *
+ *  Expected behaviour:
+ *   - Callback function is called once
+ */
+ZTEST(bt_le_cs_step_data_parse, test_parsing_invalid_length)
+{
+	struct net_buf_simple buf;
+	uint8_t data[] = {
+		0x00, 0x01, 0x01, 0x00,       /* mode 0 */
+		0x03, 0x20, 0x03, 0x00, 0x11, /* mode 3 step with bad length */
+	};
+
+	bt_le_cs_step_data_parse_func_fake.return_val = true;
+
+	net_buf_simple_init_with_data(&buf, data, ARRAY_SIZE(data));
+
+	bt_le_cs_step_data_parse(&buf, bt_le_cs_step_data_parse_func, NULL);
+
+	zassert_equal(1, bt_le_cs_step_data_parse_func_fake.call_count, "called %d",
+		      bt_le_cs_step_data_parse_func_fake.call_count);
+}
+
+/*
+ *  Test parsing stopped
+ *
+ *  Constraints:
+ *   - Data contains valid step data
+ *   - Callback function returns false to stop parsing
+ *
+ *  Expected behaviour:
+ *   - Once parsing is stopped, the callback is not called anymore
+ */
+ZTEST(bt_le_cs_step_data_parse, test_parsing_stopped)
+{
+	struct net_buf_simple buf;
+	uint8_t data[] = {
+		0x00, 0x05, 0x01, 0x00,       /* mode 0 */
+		0x01, 0x10, 0x02, 0x00, 0x11, /* mode 1 */
+		0x02, 0x11, 0x02, 0x00, 0x11, /* mode 2 */
+	};
+
+	bt_le_cs_step_data_parse_func_fake.return_val = false;
+
+	net_buf_simple_init_with_data(&buf, data, ARRAY_SIZE(data));
+
+	bt_le_cs_step_data_parse(&buf, bt_le_cs_step_data_parse_func, NULL);
+
+	zassert_equal(1, bt_le_cs_step_data_parse_func_fake.call_count, "called %d",
+		      bt_le_cs_step_data_parse_func_fake.call_count);
+}
+
+struct custom_user_data {
+	const uint8_t *data;
+	size_t len;
+};
+
+static bool bt_le_cs_step_data_parse_func_custom_fake(struct bt_le_cs_subevent_step *step,
+						      void *user_data)
+{
+	struct custom_user_data *ud = user_data;
+
+	/* mode check */
+	zassert_true(ud->len-- > 0);
+	zassert_equal(step->mode, *ud->data);
+	ud->data++;
+
+	/* channel check */
+	zassert_true(ud->len-- > 0);
+	zassert_equal(step->channel, *ud->data);
+	ud->data++;
+
+	/* step data length check */
+	zassert_true(ud->len-- > 0);
+	zassert_equal(step->data_len, *ud->data);
+	ud->data++;
+
+	/* value check */
+	zassert_true(ud->len >= step->data_len);
+	zassert_mem_equal(step->data, ud->data, step->data_len);
+	ud->data += step->data_len;
+	ud->len -= step->data_len;
+
+	return true;
+}
+
+/*
+ *  Test parsing successfully
+ *
+ *  Constraints:
+ *   - Data contains valid step data
+ *   - Callback function returns false to stop parsing
+ *
+ *  Expected behaviour:
+ *   - Data passed to the callback match the expected data
+ */
+ZTEST(bt_le_cs_step_data_parse, test_parsing_success)
+{
+	struct net_buf_simple buf;
+	uint8_t data[] = {
+		0x00, 0x05, 0x01, 0x00,       /* mode 0 */
+		0x03, 0x11, 0x01, 0x11,       /* mode 3 */
+		0x02, 0x12, 0x02, 0x00, 0x11, /* mode 2 */
+		0x03, 0x13, 0x01, 0x11,       /* mode 3 */
+		0x02, 0x14, 0x02, 0x00, 0x11, /* mode 2 */
+	};
+
+	struct custom_user_data user_data = {
+		.data = data,
+		.len = ARRAY_SIZE(data),
+	};
+
+	bt_le_cs_step_data_parse_func_fake.custom_fake = bt_le_cs_step_data_parse_func_custom_fake;
+
+	net_buf_simple_init_with_data(&buf, data, ARRAY_SIZE(data));
+
+	bt_le_cs_step_data_parse(&buf, bt_le_cs_step_data_parse_func, &user_data);
+
+	zassert_equal(5, bt_le_cs_step_data_parse_func_fake.call_count, "called %d",
+		      bt_le_cs_step_data_parse_func_fake.call_count);
+}
diff --git a/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/testcase.yaml b/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/testcase.yaml
new file mode 100644
index 00000000000..2e65668c519
--- /dev/null
+++ b/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/testcase.yaml
@@ -0,0 +1,7 @@
+common:
+  tags:
+    - bluetooth
+    - host
+tests:
+  bluetooth.host.cs.bt_le_cs_step_data_parse:
+    type: unit
diff --git a/tests/bluetooth/host/cs/mocks/CMakeLists.txt b/tests/bluetooth/host/cs/mocks/CMakeLists.txt
new file mode 100644
index 00000000000..1ab1a58a1d0
--- /dev/null
+++ b/tests/bluetooth/host/cs/mocks/CMakeLists.txt
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mocks STATIC
+            conn.c
+            hci_core.c
+            net_buf.c
+)
+
+target_include_directories(mocks PUBLIC
+  ..
+  ${ZEPHYR_BASE}/subsys/bluetooth
+  ${ZEPHYR_BASE}/subsys/bluetooth/host
+  ${ZEPHYR_BASE}/tests/bluetooth/host
+  ${ZEPHYR_BASE}/tests/bluetooth/host/cs/mocks
+)
+
+target_link_libraries(mocks PRIVATE test_interface)
diff --git a/tests/bluetooth/host/cs/mocks/conn.c b/tests/bluetooth/host/cs/mocks/conn.c
new file mode 100644
index 00000000000..910a06e3ce3
--- /dev/null
+++ b/tests/bluetooth/host/cs/mocks/conn.c
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "mocks/conn.h"
+
+#include <zephyr/kernel.h>
+
+DEFINE_FAKE_VOID_FUNC(bt_conn_unref, struct bt_conn *);
+DEFINE_FAKE_VALUE_FUNC(struct bt_conn *, bt_conn_lookup_handle, uint16_t, enum bt_conn_type);
+DEFINE_FAKE_VOID_FUNC(notify_remote_cs_capabilities, struct bt_conn *,
+		      struct bt_conn_le_cs_capabilities);
+DEFINE_FAKE_VOID_FUNC(notify_remote_cs_fae_table, struct bt_conn *, struct bt_conn_le_cs_fae_table);
+DEFINE_FAKE_VOID_FUNC(notify_cs_config_created, struct bt_conn *, struct bt_conn_le_cs_config *);
+DEFINE_FAKE_VOID_FUNC(notify_cs_config_removed, struct bt_conn *, uint8_t);
+DEFINE_FAKE_VOID_FUNC(notify_cs_subevent_result, struct bt_conn *,
+		      struct bt_conn_le_cs_subevent_result *);
+DEFINE_FAKE_VOID_FUNC(notify_cs_security_enable_available, struct bt_conn *);
+DEFINE_FAKE_VOID_FUNC(notify_cs_procedure_enable_available, struct bt_conn *,
+		      struct bt_conn_le_cs_procedure_enable_complete *);
diff --git a/tests/bluetooth/host/cs/mocks/conn.h b/tests/bluetooth/host/cs/mocks/conn.h
new file mode 100644
index 00000000000..70aa9bdfd26
--- /dev/null
+++ b/tests/bluetooth/host/cs/mocks/conn.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/fff.h>
+#include <zephyr/kernel.h>
+
+#include <host/conn_internal.h>
+
+/* List of fakes used by this unit tester */
+#define CONN_FFF_FAKES_LIST(FAKE)                                                                  \
+	FAKE(bt_conn_unref)                                                                        \
+	FAKE(bt_conn_lookup_handle)                                                                \
+	FAKE(notify_remote_cs_capabilities)                                                        \
+	FAKE(notify_cs_config_created)                                                             \
+	FAKE(notify_cs_config_removed)                                                             \
+	FAKE(notify_cs_subevent_result)                                                            \
+	FAKE(notify_cs_security_enable_available)                                                  \
+	FAKE(notify_cs_procedure_enable_available)                                                 \
+	FAKE(notify_remote_cs_fae_table)
+
+DECLARE_FAKE_VOID_FUNC(bt_conn_unref, struct bt_conn *);
+DECLARE_FAKE_VALUE_FUNC(struct bt_conn *, bt_conn_lookup_handle, uint16_t, enum bt_conn_type);
+DECLARE_FAKE_VOID_FUNC(notify_remote_cs_capabilities, struct bt_conn *,
+		       struct bt_conn_le_cs_capabilities);
+DECLARE_FAKE_VOID_FUNC(notify_remote_cs_fae_table, struct bt_conn *,
+		       struct bt_conn_le_cs_fae_table);
+DECLARE_FAKE_VOID_FUNC(notify_cs_config_created, struct bt_conn *, struct bt_conn_le_cs_config *);
+DECLARE_FAKE_VOID_FUNC(notify_cs_config_removed, struct bt_conn *, uint8_t);
+DECLARE_FAKE_VOID_FUNC(notify_cs_subevent_result, struct bt_conn *,
+		       struct bt_conn_le_cs_subevent_result *);
+DECLARE_FAKE_VOID_FUNC(notify_cs_security_enable_available, struct bt_conn *);
+DECLARE_FAKE_VOID_FUNC(notify_cs_procedure_enable_available, struct bt_conn *,
+		       struct bt_conn_le_cs_procedure_enable_complete *);
diff --git a/tests/bluetooth/host/cs/mocks/hci_core.c b/tests/bluetooth/host/cs/mocks/hci_core.c
new file mode 100644
index 00000000000..34ae77164cc
--- /dev/null
+++ b/tests/bluetooth/host/cs/mocks/hci_core.c
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "mocks/hci_core.h"
+
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/kernel.h>
+
+#include <host/hci_core.h>
+
+struct bt_dev bt_dev = {
+	.manufacturer = 0x1234,
+};
+
+DEFINE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_create, uint16_t, uint8_t);
+DEFINE_FAKE_VALUE_FUNC(int, bt_hci_cmd_send_sync, uint16_t, struct net_buf *, struct net_buf **);
diff --git a/tests/bluetooth/host/cs/mocks/hci_core.h b/tests/bluetooth/host/cs/mocks/hci_core.h
new file mode 100644
index 00000000000..8dc28890755
--- /dev/null
+++ b/tests/bluetooth/host/cs/mocks/hci_core.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/fff.h>
+#include <zephyr/kernel.h>
+
+/* List of fakes used by this unit tester */
+#define HCI_CORE_FFF_FAKES_LIST(FAKE)                                                              \
+	FAKE(bt_hci_cmd_create)                                                                    \
+	FAKE(bt_hci_cmd_send_sync)
+
+DECLARE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_create, uint16_t, uint8_t);
+DECLARE_FAKE_VALUE_FUNC(int, bt_hci_cmd_send_sync, uint16_t, struct net_buf *, struct net_buf **);
diff --git a/tests/bluetooth/host/cs/mocks/net_buf.c b/tests/bluetooth/host/cs/mocks/net_buf.c
new file mode 100644
index 00000000000..22ceb93a25e
--- /dev/null
+++ b/tests/bluetooth/host/cs/mocks/net_buf.c
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/net_buf.h>
+
+#include "mocks/net_buf.h"
+
+const struct net_buf_data_cb net_buf_fixed_cb;
+
+DEFINE_FAKE_VOID_FUNC(net_buf_unref, struct net_buf *);
+DEFINE_FAKE_VOID_FUNC(net_buf_reset, struct net_buf *);
+DEFINE_FAKE_VOID_FUNC(net_buf_slist_put, sys_slist_t *, struct net_buf *);
+DEFINE_FAKE_VALUE_FUNC(struct net_buf *, net_buf_alloc_fixed, struct net_buf_pool *, k_timeout_t);
diff --git a/tests/bluetooth/host/cs/mocks/net_buf.h b/tests/bluetooth/host/cs/mocks/net_buf.h
new file mode 100644
index 00000000000..14437d3d158
--- /dev/null
+++ b/tests/bluetooth/host/cs/mocks/net_buf.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/fff.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net_buf.h>
+
+/* List of fakes used by this unit tester */
+#define NET_BUF_FFF_FAKES_LIST(FAKE)                                                               \
+	FAKE(net_buf_unref)                                                                        \
+	FAKE(net_buf_reset)                                                                        \
+	FAKE(net_buf_slist_put)                                                                    \
+	FAKE(net_buf_alloc_fixed)
+
+DECLARE_FAKE_VOID_FUNC(net_buf_unref, struct net_buf *);
+DECLARE_FAKE_VOID_FUNC(net_buf_reset, struct net_buf *);
+DECLARE_FAKE_VOID_FUNC(net_buf_slist_put, sys_slist_t *, struct net_buf *);
+DECLARE_FAKE_VALUE_FUNC(struct net_buf *, net_buf_alloc_fixed, struct net_buf_pool *, k_timeout_t);

From e14e72cf2ed118f921a723099be0a3b4e9531189 Mon Sep 17 00:00:00 2001
From: Olivier Lesage <olivier.lesage@nordicsemi.no>
Date: Tue, 22 Oct 2024 13:44:35 +0200
Subject: [PATCH 0639/2913] [nrf fromtree] bluetooth: host: Add helper function
 for parsing PCTs

The 12-bit signed values for the results of PBR are a bit
cumbersome, so this adds a helper function to make it easier to work
with the HCI formatted steps.

Signed-off-by: Olivier Lesage <olivier.lesage@nordicsemi.no>
(cherry picked from commit 7e72d46e2e79e780307246374e1a0ab7e8aae0a4)

Signed-off-by: Sean Madigan <sean.madigan@nordicsemi.no>
(cherry picked from commit e168bcf82df592774dd0deb260c7e9df2c7c4f93)
---
 include/zephyr/bluetooth/cs.h                 |  18 +++
 include/zephyr/bluetooth/hci_types.h          |   3 +-
 subsys/bluetooth/host/cs.c                    |  18 +++
 .../host/cs/bt_le_cs_parse_pct/CMakeLists.txt |  25 +++++
 .../host/cs/bt_le_cs_parse_pct/prj.conf       |  10 ++
 .../host/cs/bt_le_cs_parse_pct/src/main.c     | 106 ++++++++++++++++++
 .../host/cs/bt_le_cs_parse_pct/testcase.yaml  |   7 ++
 7 files changed, 186 insertions(+), 1 deletion(-)
 create mode 100644 tests/bluetooth/host/cs/bt_le_cs_parse_pct/CMakeLists.txt
 create mode 100644 tests/bluetooth/host/cs/bt_le_cs_parse_pct/prj.conf
 create mode 100644 tests/bluetooth/host/cs/bt_le_cs_parse_pct/src/main.c
 create mode 100644 tests/bluetooth/host/cs/bt_le_cs_parse_pct/testcase.yaml

diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index d5d34039d27..e7043f66762 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -551,6 +551,24 @@ struct bt_le_cs_subevent_step {
 	const uint8_t *data;
 };
 
+/** Sign-extended IQ value extracted from step data. */
+struct bt_le_cs_iq_sample {
+	int16_t i;
+	int16_t q;
+};
+
+/** @brief Extract in-phase and quadrature terms from HCI-formatted PCT.
+ *
+ * Convenience function for processing 24-bit phase correction terms found
+ * in CS step data. The 12-bit signed real and imaginary components are
+ * converted to host endianness and sign-extended.
+ *
+ * @param pct 24-bit little-endian phase correction term.
+ *
+ * @return struct bt_le_cs_iq_sample containing real and imaginary terms as int16_t
+ */
+struct bt_le_cs_iq_sample bt_le_cs_parse_pct(const uint8_t pct[3]);
+
 /** @brief Set all valid channel map bits
  *
  * This command is used to enable all valid channels in a
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 1b22e172fcc..719accabfc6 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -3607,7 +3607,8 @@ struct bt_hci_evt_le_cs_config_complete {
 
 #define BT_HCI_LE_CS_REF_POWER_LEVEL_UNAVAILABLE 0x7F
 
-#define BT_HCI_LE_CS_PCT_MASK 0xFFF
+#define BT_HCI_LE_CS_PCT_I_MASK 0x000FFF
+#define BT_HCI_LE_CS_PCT_Q_MASK 0xFFF000
 
 #define BT_HCI_LE_CS_TONE_QUALITY_HIGH        0x0
 #define BT_HCI_LE_CS_TONE_QUALITY_MED         0x1
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index aa1e1beadf3..c11f262b5d2 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -240,6 +240,24 @@ static void reset_reassembly_results(void)
 	memset(&reassembled_result, 0, sizeof(struct bt_conn_le_cs_subevent_result));
 }
 
+/** @brief Converts PCT to a pair of int16_t
+ *
+ */
+struct bt_le_cs_iq_sample bt_le_cs_parse_pct(const uint8_t pct[3])
+{
+	uint32_t pct_u32 = sys_get_le24(pct);
+
+	/* Extract I and Q. */
+	uint16_t i_u16 = pct_u32 & BT_HCI_LE_CS_PCT_I_MASK;
+	uint16_t q_u16 = (pct_u32 & BT_HCI_LE_CS_PCT_Q_MASK) >> 12;
+
+	/* Convert from 12-bit 2's complement to int16_t */
+	int16_t i = (i_u16 ^ BIT(11)) - BIT(11);
+	int16_t q = (q_u16 ^ BIT(11)) - BIT(11);
+
+	return (struct bt_le_cs_iq_sample){.i = i, .q = q};
+}
+
 void bt_le_cs_set_valid_chmap_bits(uint8_t channel_map[10])
 {
 	memset(channel_map, 0xFF, 10);
diff --git a/tests/bluetooth/host/cs/bt_le_cs_parse_pct/CMakeLists.txt b/tests/bluetooth/host/cs/bt_le_cs_parse_pct/CMakeLists.txt
new file mode 100644
index 00000000000..089406a316f
--- /dev/null
+++ b/tests/bluetooth/host/cs/bt_le_cs_parse_pct/CMakeLists.txt
@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+project(bt_step_data_parse)
+
+include_directories(BEFORE
+    ${ZEPHYR_BASE}/tests/bluetooth/host/cs/mocks
+)
+
+add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/host host_mocks)
+add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/host/cs/mocks mocks)
+
+target_link_libraries(testbinary PRIVATE mocks host_mocks)
+
+target_sources(testbinary
+    PRIVATE
+    src/main.c
+
+    ${ZEPHYR_BASE}/subsys/bluetooth/host/cs.c
+    ${ZEPHYR_BASE}/lib/net_buf/buf_simple.c
+    ${ZEPHYR_BASE}/subsys/logging/log_minimal.c
+)
diff --git a/tests/bluetooth/host/cs/bt_le_cs_parse_pct/prj.conf b/tests/bluetooth/host/cs/bt_le_cs_parse_pct/prj.conf
new file mode 100644
index 00000000000..8ff995b6f04
--- /dev/null
+++ b/tests/bluetooth/host/cs/bt_le_cs_parse_pct/prj.conf
@@ -0,0 +1,10 @@
+CONFIG_ZTEST=y
+CONFIG_BT=y
+CONFIG_BT_HCI=y
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_CHANNEL_SOUNDING=y
+CONFIG_ASSERT=y
+CONFIG_ASSERT_LEVEL=2
+CONFIG_ASSERT_VERBOSE=y
+CONFIG_ASSERT_ON_ERRORS=y
+CONFIG_NET_BUF=y
diff --git a/tests/bluetooth/host/cs/bt_le_cs_parse_pct/src/main.c b/tests/bluetooth/host/cs/bt_le_cs_parse_pct/src/main.c
new file mode 100644
index 00000000000..70f07748f53
--- /dev/null
+++ b/tests/bluetooth/host/cs/bt_le_cs_parse_pct/src/main.c
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/bluetooth/cs.h>
+#include <zephyr/fff.h>
+
+DEFINE_FFF_GLOBALS;
+
+ZTEST_SUITE(bt_le_cs_parse_pct, NULL, NULL, NULL, NULL, NULL);
+
+/*
+ *  Test success case
+ *
+ *  Constraints:
+ *   - Valid PCT is passed in
+ *
+ *  Expected behaviour:
+ *   - IQ term matches expected values
+ */
+ZTEST(bt_le_cs_parse_pct, test_parsing_success)
+{
+	struct bt_le_cs_iq_sample iq;
+
+	struct {
+		uint8_t input[3];
+		struct bt_le_cs_iq_sample output;
+	} test_vector[] = {
+		/* Edge cases */
+		{.input = {0x00, 0x00, 0x00}, .output = {.i = 0, .q = 0}},
+		{.input = {0xFF, 0xFF, 0xFF}, .output = {.i = -1, .q = -1}},
+		{.input = {0xFF, 0x00, 0xFF}, .output = {.i = 255, .q = -16}},
+		{.input = {0xFF, 0x00, 0x00}, .output = {.i = 255, .q = 0}},
+		{.input = {0x00, 0xFF, 0x00}, .output = {.i = -256, .q = 15}},
+		{.input = {0x00, 0x00, 0xFF}, .output = {.i = 0, .q = -16}},
+		{.input = {0x00, 0x08, 0x80}, .output = {.i = -2048, .q = -2048}},
+		{.input = {0xFF, 0xF7, 0x7F}, .output = {.i = 2047, .q = 2047}},
+
+		/* Randomly generated using python */
+		{.input = {0xEF, 0xCD, 0xAB}, .output = {.i = -529, .q = -1348}},
+		{.input = {0x30, 0x75, 0x44}, .output = {.i = 1328, .q = 1095}},
+		{.input = {0x46, 0x5D, 0xEB}, .output = {.i = -698, .q = -331}},
+		{.input = {0xE8, 0x14, 0x45}, .output = {.i = 1256, .q = 1105}},
+		{.input = {0x23, 0xCA, 0x5C}, .output = {.i = -1501, .q = 1484}},
+		{.input = {0x68, 0xA0, 0x15}, .output = {.i = 104, .q = 346}},
+		{.input = {0x39, 0x73, 0x1B}, .output = {.i = 825, .q = 439}},
+		{.input = {0x23, 0x72, 0x3D}, .output = {.i = 547, .q = 983}},
+		{.input = {0xF5, 0xF8, 0x3D}, .output = {.i = -1803, .q = 991}},
+		{.input = {0xF7, 0xB4, 0xB9}, .output = {.i = 1271, .q = -1125}},
+		{.input = {0x61, 0x9F, 0xD5}, .output = {.i = -159, .q = -679}},
+		{.input = {0x9B, 0x21, 0xC6}, .output = {.i = 411, .q = -926}},
+		{.input = {0x14, 0x86, 0x0F}, .output = {.i = 1556, .q = 248}},
+		{.input = {0x8E, 0xBB, 0xC6}, .output = {.i = -1138, .q = -917}},
+		{.input = {0x5B, 0xD1, 0xC2}, .output = {.i = 347, .q = -979}},
+		{.input = {0x99, 0x4A, 0x28}, .output = {.i = -1383, .q = 644}},
+		{.input = {0x32, 0x16, 0x2B}, .output = {.i = 1586, .q = 689}},
+		{.input = {0x3E, 0x8C, 0xD4}, .output = {.i = -962, .q = -696}},
+		{.input = {0x2B, 0x1F, 0x95}, .output = {.i = -213, .q = -1711}},
+		{.input = {0x22, 0xE6, 0xD6}, .output = {.i = 1570, .q = -658}},
+		{.input = {0x0B, 0x31, 0xD6}, .output = {.i = 267, .q = -669}},
+		{.input = {0x1B, 0x98, 0x9D}, .output = {.i = -2021, .q = -1575}},
+		{.input = {0x8E, 0x97, 0x63}, .output = {.i = 1934, .q = 1593}},
+		{.input = {0x97, 0x91, 0x8D}, .output = {.i = 407, .q = -1831}},
+		{.input = {0x67, 0xF7, 0x1F}, .output = {.i = 1895, .q = 511}},
+		{.input = {0xD6, 0x5C, 0x23}, .output = {.i = -810, .q = 565}},
+		{.input = {0x92, 0xD3, 0x0B}, .output = {.i = 914, .q = 189}},
+		{.input = {0xE8, 0xF3, 0x23}, .output = {.i = 1000, .q = 575}},
+		{.input = {0xE6, 0xE3, 0xAD}, .output = {.i = 998, .q = -1314}},
+		{.input = {0x6E, 0x70, 0xA9}, .output = {.i = 110, .q = -1385}},
+		{.input = {0x63, 0x65, 0x28}, .output = {.i = 1379, .q = 646}},
+		{.input = {0x27, 0x0F, 0x32}, .output = {.i = -217, .q = 800}},
+		{.input = {0x3F, 0x8C, 0xE1}, .output = {.i = -961, .q = -488}},
+		{.input = {0x4E, 0x86, 0xAA}, .output = {.i = 1614, .q = -1368}},
+		{.input = {0x9E, 0xD1, 0xF6}, .output = {.i = 414, .q = -147}},
+		{.input = {0x86, 0x09, 0x56}, .output = {.i = -1658, .q = 1376}},
+		{.input = {0xFF, 0x09, 0x41}, .output = {.i = -1537, .q = 1040}},
+		{.input = {0x89, 0xC5, 0x1F}, .output = {.i = 1417, .q = 508}},
+		{.input = {0x1A, 0xE2, 0x9A}, .output = {.i = 538, .q = -1618}},
+		{.input = {0x7E, 0x03, 0xB8}, .output = {.i = 894, .q = -1152}},
+		{.input = {0x5E, 0x28, 0xB3}, .output = {.i = -1954, .q = -1230}},
+		{.input = {0xFF, 0x50, 0xF0}, .output = {.i = 255, .q = -251}},
+		{.input = {0xB0, 0x07, 0x87}, .output = {.i = 1968, .q = -1936}},
+		{.input = {0x7E, 0xD7, 0x0C}, .output = {.i = 1918, .q = 205}},
+		{.input = {0x26, 0xA2, 0xC9}, .output = {.i = 550, .q = -870}},
+		{.input = {0x97, 0x71, 0x72}, .output = {.i = 407, .q = 1831}},
+		{.input = {0x73, 0x0E, 0xC1}, .output = {.i = -397, .q = -1008}},
+		{.input = {0xAC, 0x20, 0x6B}, .output = {.i = 172, .q = 1714}},
+		{.input = {0x85, 0x7D, 0xB4}, .output = {.i = -635, .q = -1209}},
+		{.input = {0xCC, 0xE3, 0x1B}, .output = {.i = 972, .q = 446}},
+		{.input = {0x88, 0x48, 0x65}, .output = {.i = -1912, .q = 1620}},
+	};
+
+	for (uint16_t k = 0; k < ARRAY_SIZE(test_vector); k++) {
+		iq = bt_le_cs_parse_pct(test_vector[k].input);
+
+		zassert_equal(iq.i, test_vector[k].output.i,
+			      "Failed for k = %u, expected %d, not %d", k, test_vector[k].output.i,
+			      iq.i);
+		zassert_equal(iq.q, test_vector[k].output.q,
+			      "Failed for k = %u, expected %d, not %d", k, test_vector[k].output.q,
+			      iq.q);
+	}
+}
diff --git a/tests/bluetooth/host/cs/bt_le_cs_parse_pct/testcase.yaml b/tests/bluetooth/host/cs/bt_le_cs_parse_pct/testcase.yaml
new file mode 100644
index 00000000000..deab8ebd294
--- /dev/null
+++ b/tests/bluetooth/host/cs/bt_le_cs_parse_pct/testcase.yaml
@@ -0,0 +1,7 @@
+common:
+  tags:
+    - bluetooth
+    - host
+tests:
+  bluetooth.host.cs.bt_le_cs_parse_pct:
+    type: unit

From 6855f20b092be1bd692b2899ec1fd06d380598bc Mon Sep 17 00:00:00 2001
From: Adam Cavender <adam.cavender@nordicsemi.no>
Date: Thu, 31 Oct 2024 10:48:02 +0000
Subject: [PATCH 0640/2913] [nrf fromtree] bluetooth: host: Update FAE table
 type for HCI commands

Update FAE table type from array of uint8_t to int8_t. From Vol 6.0,
Part B, section 2.4.2.52: "The ChFAE field contains the per-channel
mode-0 FAE table of the local Controller. Every per-channel mode-0
FAE value is represented by an 8-bit signed integer"

Signed-off-by: Adam Cavender <adam.cavender@nordicsemi.no>
(cherry picked from commit a68a0a4a5b7fda82971cb7d5005757103d3473bf)

Signed-off-by: Sean Madigan <sean.madigan@nordicsemi.no>
(cherry picked from commit ad4c704d097e7c88c4ed9b4e84111c8c9124370e)
---
 include/zephyr/bluetooth/conn.h      | 2 +-
 include/zephyr/bluetooth/cs.h        | 2 +-
 include/zephyr/bluetooth/hci_types.h | 4 ++--
 subsys/bluetooth/host/cs.c           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index b4cf1c5c6ba..4231bf1dea0 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -410,7 +410,7 @@ struct bt_conn_le_cs_capabilities {
 
 /** Remote FAE Table for LE connections supporting CS */
 struct bt_conn_le_cs_fae_table {
-	uint8_t *remote_fae_table;
+	int8_t *remote_fae_table;
 };
 
 /** Channel sounding main mode */
diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index e7043f66762..0c9ce50043c 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -886,7 +886,7 @@ int bt_le_cs_write_cached_remote_supported_capabilities(
  *
  * @return Zero on success or (negative) error code on failure.
  */
-int bt_le_cs_write_cached_remote_fae_table(struct bt_conn *conn, uint8_t remote_fae_table[72]);
+int bt_le_cs_write_cached_remote_fae_table(struct bt_conn *conn, int8_t remote_fae_table[72]);
 
 #ifdef __cplusplus
 }
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 719accabfc6..d31efb38dea 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -2499,7 +2499,7 @@ struct bt_hci_cp_le_read_remote_fae_table {
 
 struct bt_hci_cp_le_write_cached_remote_fae_table {
 	uint16_t handle;
-	uint8_t remote_fae_table[72];
+	int8_t remote_fae_table[72];
 } __packed;
 
 #define BT_HCI_OP_LE_CS_SET_CHANNEL_CLASSIFICATION BT_OP(BT_OGF_LE, 0x0092) /* 0x2092 */
@@ -3534,7 +3534,7 @@ struct bt_hci_evt_le_cs_read_remote_supported_capabilities_complete {
 struct bt_hci_evt_le_cs_read_remote_fae_table_complete {
 	uint8_t status;
 	uint16_t conn_handle;
-	uint8_t remote_fae_table[72];
+	int8_t remote_fae_table[72];
 } __packed;
 
 #define BT_HCI_LE_CS_CONFIG_ACTION_REMOVED 0x00
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index c11f262b5d2..03cc3a8e95f 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -1171,7 +1171,7 @@ int bt_le_cs_write_cached_remote_supported_capabilities(
 				    NULL);
 }
 
-int bt_le_cs_write_cached_remote_fae_table(struct bt_conn *conn, uint8_t remote_fae_table[72])
+int bt_le_cs_write_cached_remote_fae_table(struct bt_conn *conn, int8_t remote_fae_table[72])
 {
 	struct bt_hci_cp_le_write_cached_remote_fae_table *cp;
 	struct net_buf *buf;

From 30a68404464fa41cbb2c5acee64c8ea2484696e3 Mon Sep 17 00:00:00 2001
From: Timothy Keys <timothy.keys@nordicsemi.no>
Date: Mon, 4 Nov 2024 12:21:05 +0000
Subject: [PATCH 0641/2913] [nrf fromtree] Bluetooth: Host: Fix spelling
 mistakes in cs.h

Fix a spelling mistake in the enum bt_le_cs_procedure_phy, and various
mistakes in comments.

Signed-off-by: Timothy Keys <timothy.keys@nordicsemi.no>
(cherry picked from commit 59126aca7ec6fc5e8d688e2962187339f2910014)

Signed-off-by: Sean Madigan <sean.madigan@nordicsemi.no>
(cherry picked from commit 9bfb654503ca195a90fb63db0b74841bcec255f0)
---
 include/zephyr/bluetooth/cs.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index 0c9ce50043c..2c661c09c57 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -215,7 +215,7 @@ enum bt_le_cs_test_override_4_tone_antenna_permutation {
 	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_21 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_21,
 	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_22 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_22,
 	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_23 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_23,
-	/** Loop through all valid Antenna Permuation Indices starting
+	/** Loop through all valid Antenna Permutation Indices starting
 	 *  from the lowest index.
 	 */
 	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_LOOP =
@@ -638,7 +638,7 @@ int bt_le_cs_test_cb_register(struct bt_le_cs_test_cb cs_test_cb);
  * of either the initiator or reflector.
  *
  * The first mode-0 channel in the list is used as the starting channel for
- * the test. At the beginning of any test, the IUT in the flector role shall
+ * the test. At the beginning of any test, the IUT in the reflector role shall
  * listen on the first mode-0 channel until it receives the first transmission
  * from the initiator. Similarly, with the IUT in the initiator role, the tester
  * will start by listening on the first mode-0 channel and the IUT shall transmit
@@ -718,7 +718,7 @@ void bt_le_cs_step_data_parse(struct net_buf_simple *step_data_buf,
 
 /** @brief CS Security Enable
  *
- * This commmand is used to start or restart the Channel Sounding Security
+ * This command is used to start or restart the Channel Sounding Security
  * Start procedure in the local Controller for the ACL connection identified
  * in the conn parameter.
  *
@@ -753,7 +753,7 @@ int bt_le_cs_procedure_enable(struct bt_conn *conn,
 
 enum bt_le_cs_procedure_phy {
 	BT_LE_CS_PROCEDURE_PHY_1M = BT_HCI_OP_LE_CS_PROCEDURE_PHY_1M,
-	BT_LE_CS_PROCEUDRE_PHY_2M = BT_HCI_OP_LE_CS_PROCEDURE_PHY_2M,
+	BT_LE_CS_PROCEDURE_PHY_2M = BT_HCI_OP_LE_CS_PROCEDURE_PHY_2M,
 	BT_LE_CS_PROCEDURE_PHY_CODED_S8 = BT_HCI_OP_LE_CS_PROCEDURE_PHY_CODED_S8,
 	BT_LE_CS_PROCEDURE_PHY_CODED_S2 = BT_HCI_OP_LE_CS_PROCEDURE_PHY_CODED_S2,
 };

From 293c7bdd20bfec22f0818fbf60b68b2a1fc85bd8 Mon Sep 17 00:00:00 2001
From: Timothy Keys <timothy.keys@nordicsemi.no>
Date: Mon, 4 Nov 2024 12:29:43 +0000
Subject: [PATCH 0642/2913] [nrf fromtree] Bluetooth: Host: Remove code causing
 build error

This code is redundant and causes a build error if called more than
once.

Signed-off-by: Timothy Keys <timothy.keys@nordicsemi.no>
(cherry picked from commit 97399d4027ccd027b3c8756405c7a3fb9cc30f32)

Signed-off-by: Sean Madigan <sean.madigan@nordicsemi.no>
(cherry picked from commit 26d1cc367ea310bcedaea38965e44cca4ea3275e)
---
 tests/bluetooth/host/cs/mocks/hci_core.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/bluetooth/host/cs/mocks/hci_core.c b/tests/bluetooth/host/cs/mocks/hci_core.c
index 34ae77164cc..5830c302a47 100644
--- a/tests/bluetooth/host/cs/mocks/hci_core.c
+++ b/tests/bluetooth/host/cs/mocks/hci_core.c
@@ -9,11 +9,5 @@
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/kernel.h>
 
-#include <host/hci_core.h>
-
-struct bt_dev bt_dev = {
-	.manufacturer = 0x1234,
-};
-
 DEFINE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_create, uint16_t, uint8_t);
 DEFINE_FAKE_VALUE_FUNC(int, bt_hci_cmd_send_sync, uint16_t, struct net_buf *, struct net_buf **);

From d1e15258d7057915c290a4158b7055c66c0219e5 Mon Sep 17 00:00:00 2001
From: Timothy Keys <timothy.keys@nordicsemi.no>
Date: Thu, 31 Oct 2024 15:08:18 +0000
Subject: [PATCH 0643/2913] [nrf fromtree] Bluetooth: Host: Unit test for
 bt_le_cs_set_valid_chmap_bits

Add coverage of the bt_le_cs_set_valid_chmap_bits function to unit tests

Signed-off-by: Timothy Keys <timothy.keys@nordicsemi.no>
(cherry picked from commit e976a01bedff4ef4c122c2d7e63cb480784a5dde)

Signed-off-by: Sean Madigan <sean.madigan@nordicsemi.no>
(cherry picked from commit 90eeeeb6b616d628ba84f3df65c2072bff6b7506)
---
 .../CMakeLists.txt                            | 26 ++++++++++++++++
 .../cs/bt_le_cs_set_valid_chmap_bits/prj.conf | 10 +++++++
 .../bt_le_cs_set_valid_chmap_bits/src/main.c  | 30 +++++++++++++++++++
 .../testcase.yaml                             |  7 +++++
 4 files changed, 73 insertions(+)
 create mode 100644 tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/CMakeLists.txt
 create mode 100644 tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/prj.conf
 create mode 100644 tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/src/main.c
 create mode 100644 tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/testcase.yaml

diff --git a/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/CMakeLists.txt b/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/CMakeLists.txt
new file mode 100644
index 00000000000..aee0c445f6b
--- /dev/null
+++ b/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/CMakeLists.txt
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+get_filename_component(project_name ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+project(${project_name})
+
+include_directories(BEFORE
+    ${ZEPHYR_BASE}/tests/bluetooth/host/cs/mocks
+)
+
+add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/host host_mocks)
+add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/host/cs/mocks mocks)
+
+target_link_libraries(testbinary PRIVATE mocks host_mocks)
+
+target_sources(testbinary
+    PRIVATE
+    src/main.c
+
+    ${ZEPHYR_BASE}/subsys/bluetooth/host/cs.c
+    ${ZEPHYR_BASE}/lib/net_buf/buf_simple.c
+    ${ZEPHYR_BASE}/subsys/logging/log_minimal.c
+)
diff --git a/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/prj.conf b/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/prj.conf
new file mode 100644
index 00000000000..8ff995b6f04
--- /dev/null
+++ b/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/prj.conf
@@ -0,0 +1,10 @@
+CONFIG_ZTEST=y
+CONFIG_BT=y
+CONFIG_BT_HCI=y
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_CHANNEL_SOUNDING=y
+CONFIG_ASSERT=y
+CONFIG_ASSERT_LEVEL=2
+CONFIG_ASSERT_VERBOSE=y
+CONFIG_ASSERT_ON_ERRORS=y
+CONFIG_NET_BUF=y
diff --git a/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/src/main.c b/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/src/main.c
new file mode 100644
index 00000000000..72784fba71d
--- /dev/null
+++ b/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/src/main.c
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/bluetooth/cs.h>
+#include <zephyr/fff.h>
+
+DEFINE_FFF_GLOBALS;
+
+ZTEST_SUITE(bt_le_cs_set_valid_chmap_bits, NULL, NULL, NULL, NULL, NULL);
+
+/*
+ *  Test uninitialized chmap buffer is populated correctly
+ *
+ *  Expected behaviour:
+ *   - test_chmap matches correct_chmap
+ */
+ZTEST(bt_le_cs_set_valid_chmap_bits, test_uninitialized_chmap)
+{
+	uint8_t test_chmap[10];
+
+	bt_le_cs_set_valid_chmap_bits(test_chmap);
+
+	uint8_t correct_chmap[10] = {0xFC, 0xFF, 0x7F, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F};
+
+	zassert_mem_equal(test_chmap, correct_chmap, 10);
+}
diff --git a/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/testcase.yaml b/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/testcase.yaml
new file mode 100644
index 00000000000..b040e501559
--- /dev/null
+++ b/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/testcase.yaml
@@ -0,0 +1,7 @@
+common:
+  tags:
+    - bluetooth
+    - host
+tests:
+  bluetooth.host.cs.bt_le_cs_set_valid_chmap_bits:
+    type: unit

From c1db9f739ad5286939099b5f81fb4b00aed55c2d Mon Sep 17 00:00:00 2001
From: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
Date: Fri, 25 Oct 2024 10:23:07 +0200
Subject: [PATCH 0644/2913] [nrf fromtree] net: openthread: Add platform
 message management

* Add CONFIG_OPENTHREAD_PLATFORM_MESSAGE_MANAGEMENT to allow enabling
message management by the platform.
* Add implementation of `otPlatMessagePoolInit`, `otPlatMessagePoolNew`
and `otPlatMessagePoolFree`.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
(cherry picked from commit 9fd9e231df238c4f76e64289ac18901b7a8050e4)
(cherry picked from commit 4f3ef0aa00b54dc19da82629c3402b2af149dfb5)
---
 modules/openthread/platform/CMakeLists.txt    |  1 +
 modules/openthread/platform/messagepool.c     | 68 +++++++++++++++++++
 .../platform/openthread-core-zephyr-config.h  | 10 +++
 subsys/net/l2/openthread/Kconfig              |  5 ++
 4 files changed, 84 insertions(+)
 create mode 100644 modules/openthread/platform/messagepool.c

diff --git a/modules/openthread/platform/CMakeLists.txt b/modules/openthread/platform/CMakeLists.txt
index 542aa5186ea..29e827c1584 100644
--- a/modules/openthread/platform/CMakeLists.txt
+++ b/modules/openthread/platform/CMakeLists.txt
@@ -16,6 +16,7 @@ zephyr_library_sources_ifdef(CONFIG_OPENTHREAD_COPROCESSOR uart.c)
 zephyr_library_sources_ifdef(CONFIG_OPENTHREAD_CRYPTO_PSA crypto_psa.c)
 zephyr_library_sources_ifdef(CONFIG_OPENTHREAD_SHELL shell.c)
 zephyr_library_sources_ifdef(CONFIG_OPENTHREAD_EXTERNAL_HEAP memory.c)
+zephyr_library_sources_ifdef(CONFIG_OPENTHREAD_PLATFORM_MESSAGE_MANAGEMENT messagepool.c)
 zephyr_library_sources_ifdef(CONFIG_SETTINGS settings.c)
 zephyr_library_sources_ifndef(CONFIG_LOG_BACKEND_SPINEL logging.c)
 
diff --git a/modules/openthread/platform/messagepool.c b/modules/openthread/platform/messagepool.c
new file mode 100644
index 00000000000..cb9a64674c4
--- /dev/null
+++ b/modules/openthread/platform/messagepool.c
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+
+#include <openthread/platform/messagepool.h>
+
+#define LOG_MODULE_NAME net_otPlat_messagepool
+#define LOG_LEVEL       CONFIG_OPENTHREAD_LOG_LEVEL
+
+LOG_MODULE_REGISTER(LOG_MODULE_NAME);
+
+#define BUF_TIMEOUT K_MSEC(50)
+
+#define MESSAGE_POOL_SIZE                                                                          \
+	(CONFIG_OPENTHREAD_NUM_MESSAGE_BUFFERS * CONFIG_OPENTHREAD_MESSAGE_BUFFER_SIZE)
+#define MAX_ALIGNMENT __alignof__(z_max_align_t)
+
+BUILD_ASSERT(CONFIG_OPENTHREAD_MESSAGE_BUFFER_SIZE % MAX_ALIGNMENT == 0,
+	     "Invalid message buffer size");
+
+static struct k_mem_slab message_pool;
+__aligned(MAX_ALIGNMENT) static uint8_t message_pool_buffer[MESSAGE_POOL_SIZE];
+
+void otPlatMessagePoolInit(otInstance *aInstance, uint16_t aMinNumFreeBuffers, size_t aBufferSize)
+{
+	ARG_UNUSED(aInstance);
+
+	__ASSERT(aBufferSize == CONFIG_OPENTHREAD_MESSAGE_BUFFER_SIZE,
+		 "Message buffer size does not match configuration");
+
+	if (aMinNumFreeBuffers > CONFIG_OPENTHREAD_NUM_MESSAGE_BUFFERS) {
+		LOG_WRN("Minimum number of free buffers (%d) is greater than number of allocated "
+			"buffers (%d)",
+			aMinNumFreeBuffers, CONFIG_OPENTHREAD_NUM_MESSAGE_BUFFERS);
+	}
+
+	if (k_mem_slab_init(&message_pool, message_pool_buffer, aBufferSize,
+			    CONFIG_OPENTHREAD_NUM_MESSAGE_BUFFERS) != 0) {
+		__ASSERT(false, "Failed to initialize message pool");
+	}
+}
+
+otMessageBuffer *otPlatMessagePoolNew(otInstance *aInstance)
+{
+	ARG_UNUSED(aInstance);
+
+	otMessageBuffer *buffer;
+
+	if (k_mem_slab_alloc(&message_pool, (void **)&buffer, BUF_TIMEOUT) != 0) {
+		LOG_ERR("Failed to allocate message buffer");
+		return NULL;
+	}
+
+	buffer->mNext = NULL;
+	return buffer;
+}
+
+void otPlatMessagePoolFree(otInstance *aInstance, otMessageBuffer *aBuffer)
+{
+	ARG_UNUSED(aInstance);
+
+	k_mem_slab_free(&message_pool, (void *)aBuffer);
+}
diff --git a/modules/openthread/platform/openthread-core-zephyr-config.h b/modules/openthread/platform/openthread-core-zephyr-config.h
index 20f424ee2fe..434d69783be 100644
--- a/modules/openthread/platform/openthread-core-zephyr-config.h
+++ b/modules/openthread/platform/openthread-core-zephyr-config.h
@@ -416,6 +416,16 @@
 #define OPENTHREAD_CONFIG_MESSAGE_BUFFER_SIZE CONFIG_OPENTHREAD_MESSAGE_BUFFER_SIZE
 #endif
 
+/**
+ * @def OPENTHREAD_CONFIG_PLATFORM_MESSAGE_MANAGEMENT
+ *
+ * The message pool is managed by platform defined logic.
+ *
+ */
+#ifdef CONFIG_OPENTHREAD_PLATFORM_MESSAGE_MANAGEMENT
+#define OPENTHREAD_CONFIG_PLATFORM_MESSAGE_MANAGEMENT CONFIG_OPENTHREAD_PLATFORM_MESSAGE_MANAGEMENT
+#endif
+
 /**
  * @def OPENTHREAD_CONFIG_MAC_STAY_AWAKE_BETWEEN_FRAGMENTS
  *
diff --git a/subsys/net/l2/openthread/Kconfig b/subsys/net/l2/openthread/Kconfig
index 958de6f8179..0f3c83ef763 100644
--- a/subsys/net/l2/openthread/Kconfig
+++ b/subsys/net/l2/openthread/Kconfig
@@ -273,6 +273,11 @@ config OPENTHREAD_MESSAGE_BUFFER_SIZE
 	help
 	  "The size of a message buffer in bytes"
 
+config OPENTHREAD_PLATFORM_MESSAGE_MANAGEMENT
+	bool "Use platform message management"
+	help
+	  The message pool is managed by platform defined logic.
+
 config OPENTHREAD_MAX_STATECHANGE_HANDLERS
 	int "The maximum number of state-changed callback handlers"
 	default 2

From 3e3716dc93b94e70e46d6ab84402366841a13d3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Fri, 15 Nov 2024 11:46:41 +0100
Subject: [PATCH 0645/2913] [nrf fromlist] tests: drivers: watchdog: disable
 DCACHE for nRF54H20dk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Disabled data caching for nRF54H20dk in wdt_basic_api test.
It caused variables stored in noinit section to be cached,
resulting in reset loop.

Upstream PR #: 81438

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit 3d0bbe4b8ddbbb4645f5b7178afe5ad24864ae22)
---
 .../wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf        | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf

diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..45e31e2fae4
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1,2 @@
+# Disable dcache
+CONFIG_DCACHE=n

From 1ff30764cf33a998927d899892e068f695b6432d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= <rafal.kuznia@nordicsemi.no>
Date: Tue, 15 Oct 2024 11:48:32 +0200
Subject: [PATCH 0646/2913] [nrf fromtree] manifest: update hal_nordic revision
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The hal_nordic revision was updated to bring in NRFX v3.8.0.

Aligned the uses of single-instance API to use multi-instance instead.

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
(cherry picked from commit d6007690de71a1364797de088806b1e642619c2d)
(cherry picked from commit 17a8b68e3af475af1200950958f65078fcd92ccd)
---
 drivers/counter/counter_nrfx_rtc.c           | 11 +--
 modules/hal_nordic/nrfx/Kconfig              | 73 +++++++++++++++++++-
 modules/hal_nordic/nrfx/nrfx_config.h        | 42 +++++++++++
 modules/hal_nordic/nrfx/nrfx_config_common.h |  2 +-
 soc/nordic/nrf53/sync_rtc.c                  |  8 ++-
 west.yml                                     |  2 +-
 6 files changed, 127 insertions(+), 11 deletions(-)

diff --git a/drivers/counter/counter_nrfx_rtc.c b/drivers/counter/counter_nrfx_rtc.c
index 203f980e78d..f6d7a936dba 100644
--- a/drivers/counter/counter_nrfx_rtc.c
+++ b/drivers/counter/counter_nrfx_rtc.c
@@ -387,7 +387,9 @@ static int ppi_setup(const struct device *dev, uint8_t chan)
 
 	nrfy_rtc_event_enable(rtc, NRF_RTC_CHANNEL_INT_MASK(chan));
 #ifdef DPPI_PRESENT
-	result = nrfx_dppi_channel_alloc(&data->ppi_ch);
+	nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
+
+	result = nrfx_dppi_channel_alloc(&dppi, &data->ppi_ch);
 	if (result != NRFX_SUCCESS) {
 		ERR("Failed to allocate PPI channel.");
 		return -ENODEV;
@@ -395,7 +397,7 @@ static int ppi_setup(const struct device *dev, uint8_t chan)
 
 	nrfy_rtc_subscribe_set(rtc, NRF_RTC_TASK_CLEAR, data->ppi_ch);
 	nrfy_rtc_publish_set(rtc, evt, data->ppi_ch);
-	(void)nrfx_dppi_channel_enable(data->ppi_ch);
+	(void)nrfx_dppi_channel_enable(&dppi, data->ppi_ch);
 #else /* DPPI_PRESENT */
 	uint32_t evt_addr;
 	uint32_t task_addr;
@@ -429,11 +431,12 @@ static void ppi_free(const struct device *dev, uint8_t chan)
 	nrfy_rtc_event_disable(rtc, NRF_RTC_CHANNEL_INT_MASK(chan));
 #ifdef DPPI_PRESENT
 	nrf_rtc_event_t evt = NRF_RTC_CHANNEL_EVENT_ADDR(chan);
+	nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
 
-	(void)nrfx_dppi_channel_disable(ppi_ch);
+	(void)nrfx_dppi_channel_disable(&dppi, ppi_ch);
 	nrfy_rtc_subscribe_clear(rtc, NRF_RTC_TASK_CLEAR);
 	nrfy_rtc_publish_clear(rtc, evt);
-	(void)nrfx_dppi_channel_free(ppi_ch);
+	(void)nrfx_dppi_channel_free(&dppi, ppi_ch);
 #else /* DPPI_PRESENT */
 	(void)nrfx_ppi_channel_disable(ppi_ch);
 	(void)nrfx_ppi_channel_free(ppi_ch);
diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 83ce3f157cc..16729bf68ae 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -26,8 +26,77 @@ config NRFX_COMP
 	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_COMP))
 
 config NRFX_DPPI
-	bool "DPPI allocator"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_DPPIC))
+	bool
+
+config NRFX_DPPI0
+	bool "DPPI0 driver instance"
+	depends on $(dt_nodelabel_has_compat,dppic,$(DT_COMPAT_NORDIC_NRF_DPPIC))
+	select NRFX_DPPI
+
+config NRFX_DPPI00
+	bool "DPPI00 driver instance"
+	depends on $(dt_nodelabel_has_compat,dppic00,$(DT_COMPAT_NORDIC_NRF_DPPIC))
+	select NRFX_DPPI
+
+config NRFX_DPPI10
+	bool "DPPI10 driver instance"
+	depends on $(dt_nodelabel_has_compat,dppic10,$(DT_COMPAT_NORDIC_NRF_DPPIC))
+	select NRFX_DPPI
+
+config NRFX_DPPI20
+	bool "DPPI20 driver instance"
+	depends on $(dt_nodelabel_has_compat,dppic20,$(DT_COMPAT_NORDIC_NRF_DPPIC))
+	select NRFX_DPPI
+
+config NRFX_DPPI30
+	bool "DPPI30 driver instance"
+	depends on $(dt_nodelabel_has_compat,dppic30,$(DT_COMPAT_NORDIC_NRF_DPPIC))
+	select NRFX_DPPI
+
+config NRFX_DPPI020
+	bool "DPPI020 driver instance"
+	depends on $(dt_nodelabel_has_compat,dppic020,$(DT_COMPAT_NORDIC_NRF_DPPIC_LOCAL))
+	select NRFX_DPPI
+
+config NRFX_DPPI120
+	bool "DPPI120 driver instance"
+	depends on $(dt_nodelabel_has_compat,dppic120,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	select NRFX_DPPI
+
+config NRFX_DPPI130
+	bool "DPPI130 driver instance"
+	depends on $(dt_nodelabel_has_compat,dppic130,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	select NRFX_DPPI
+
+config NRFX_DPPI131
+	bool "DPPI131 driver instance"
+	depends on $(dt_nodelabel_has_compat,dppic131,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	select NRFX_DPPI
+
+config NRFX_DPPI132
+	bool "DPPI132 driver instance"
+	depends on $(dt_nodelabel_has_compat,dppic132,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	select NRFX_DPPI
+
+config NRFX_DPPI133
+	bool "DPPI133 driver instance"
+	depends on $(dt_nodelabel_has_compat,dppic133,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	select NRFX_DPPI
+
+config NRFX_DPPI134
+	bool "DPPI134 driver instance"
+	depends on $(dt_nodelabel_has_compat,dppic134,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	select NRFX_DPPI
+
+config NRFX_DPPI135
+	bool "DPPI135 driver instance"
+	depends on $(dt_nodelabel_has_compat,dppic135,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	select NRFX_DPPI
+
+config NRFX_DPPI136
+	bool "DPPI136 driver instance"
+	depends on $(dt_nodelabel_has_compat,dppic136,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	select NRFX_DPPI
 
 config NRFX_EGU
 	bool
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index 47a12f90925..b85df4c33a7 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -84,6 +84,48 @@
 #ifdef CONFIG_NRFX_DPPI_LOG
 #define NRFX_DPPI_CONFIG_LOG_ENABLED 1
 #endif
+#ifdef CONFIG_NRFX_DPPI0
+#define NRFX_DPPI0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI00
+#define NRFX_DPPI00_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI10
+#define NRFX_DPPI10_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI20
+#define NRFX_DPPI20_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI30
+#define NRFX_DPPI30_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI020
+#define NRFX_DPPI020_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI120
+#define NRFX_DPPI120_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI130
+#define NRFX_DPPI130_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI131
+#define NRFX_DPPI131_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI132
+#define NRFX_DPPI132_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI133
+#define NRFX_DPPI133_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI134
+#define NRFX_DPPI134_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI135
+#define NRFX_DPPI135_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI136
+#define NRFX_DPPI136_ENABLED 1
+#endif
 
 #ifdef CONFIG_NRFX_EGU
 #define NRFX_EGU_ENABLED 1
diff --git a/modules/hal_nordic/nrfx/nrfx_config_common.h b/modules/hal_nordic/nrfx/nrfx_config_common.h
index e04a11c6df8..0cf80068038 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_common.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_common.h
@@ -18,7 +18,7 @@
 
 /** @brief Symbol specifying minor version of the nrfx API to be used. */
 #ifndef NRFX_CONFIG_API_VER_MINOR
-#define NRFX_CONFIG_API_VER_MINOR 7
+#define NRFX_CONFIG_API_VER_MINOR 8
 #endif
 
 /** @brief Symbol specifying micro version of the nrfx API to be used. */
diff --git a/soc/nordic/nrf53/sync_rtc.c b/soc/nordic/nrf53/sync_rtc.c
index 94616ee3a0c..724453583b3 100644
--- a/soc/nordic/nrf53/sync_rtc.c
+++ b/soc/nordic/nrf53/sync_rtc.c
@@ -107,13 +107,14 @@ static void ppi_rtc_to_ipc(union rtc_sync_channels channels, bool setup)
 /* Free DPPI and RTC channels */
 static void free_resources(union rtc_sync_channels channels)
 {
+	nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
 	nrfx_err_t err;
 
 	nrfx_gppi_channels_disable(BIT(channels.ch.ppi));
 
 	z_nrf_rtc_timer_chan_free(channels.ch.rtc);
 
-	err = nrfx_dppi_channel_free(channels.ch.ppi);
+	err = nrfx_dppi_channel_free(&dppi, channels.ch.ppi);
 	__ASSERT_NO_MSG(err == NRFX_SUCCESS);
 }
 
@@ -224,12 +225,13 @@ static int mbox_rx_init(void *user_data)
 /* Setup RTC synchronization. */
 static int sync_rtc_setup(void)
 {
+	nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
 	nrfx_err_t err;
 	union rtc_sync_channels channels;
 	int32_t sync_rtc_ch;
 	int rv;
 
-	err = nrfx_dppi_channel_alloc(&channels.ch.ppi);
+	err = nrfx_dppi_channel_alloc(&dppi, &channels.ch.ppi);
 	if (err != NRFX_SUCCESS) {
 		rv = -ENODEV;
 		goto bail;
@@ -237,7 +239,7 @@ static int sync_rtc_setup(void)
 
 	sync_rtc_ch = z_nrf_rtc_timer_chan_alloc();
 	if (sync_rtc_ch < 0) {
-		nrfx_dppi_channel_free(channels.ch.ppi);
+		nrfx_dppi_channel_free(&dppi, channels.ch.ppi);
 		rv = sync_rtc_ch;
 		goto bail;
 	}
diff --git a/west.yml b/west.yml
index 40c149d4dbd..dd0275031a6 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 5c8d109371ebb740fbef1f440a3b59e488a36717
+      revision: 2dbb2ed6cf461062bbac59a65b6e9d4576656350
       path: modules/hal/nordic
       groups:
         - hal

From d40b426076182a750031231b438d696e16a540ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= <rafal.kuznia@nordicsemi.no>
Date: Tue, 15 Oct 2024 13:13:36 +0200
Subject: [PATCH 0647/2913] [nrf fromtree] dts: nordic: 54l: Add PPIB device
 tree nodes and bindings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added a binding description for the PPIB peripheral and added the device
tree nodes of the PPIB instances to the nRF54L15 and nRF54L20.

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
(cherry picked from commit 61d72936cb9072d8435a9450f4b0edcb4cb168fc)
(cherry picked from commit 9338e2a316a93872edcfc7c089385182c73936f9)
---
 dts/bindings/misc/nordic,nrf-ppib.yaml | 13 +++++++
 dts/common/nordic/nrf54l15.dtsi        | 48 ++++++++++++++++++++++++++
 dts/common/nordic/nrf54l20.dtsi        | 48 ++++++++++++++++++++++++++
 3 files changed, 109 insertions(+)
 create mode 100644 dts/bindings/misc/nordic,nrf-ppib.yaml

diff --git a/dts/bindings/misc/nordic,nrf-ppib.yaml b/dts/bindings/misc/nordic,nrf-ppib.yaml
new file mode 100644
index 00000000000..2bacbf28675
--- /dev/null
+++ b/dts/bindings/misc/nordic,nrf-ppib.yaml
@@ -0,0 +1,13 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    Nordic PPIB (Programmable Peripheral Interconnect Bridge)
+
+compatible: "nordic,nrf-ppib"
+
+include: base.yaml
+
+properties:
+  reg:
+    required: true
diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index d3c0c551823..6299e2f675c 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -113,6 +113,18 @@
 				status = "disabled";
 			};
 
+			ppib00: ppib@43000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x43000 0x1000>;
+				status = "disabled";
+			};
+
+			ppib01: ppib@44000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x44000 0x1000>;
+				status = "disabled";
+			};
+
 			spi00: spi@4a000 {
 				/*
 				 * This spi node can be either SPIM or SPIS,
@@ -186,6 +198,18 @@
 				status = "disabled";
 			};
 
+			ppib10: ppib@83000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x83000 0x1000>;
+				status = "disabled";
+			};
+
+			ppib11: ppib@84000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x84000 0x1000>;
+				status = "disabled";
+			};
+
 			timer10: timer@85000 {
 				compatible = "nordic,nrf-timer";
 				status = "disabled";
@@ -236,6 +260,24 @@
 				status = "disabled";
 			};
 
+			ppib20: ppib@c3000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0xc3000 0x1000>;
+				status = "disabled";
+			};
+
+			ppib21: ppib@c4000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0xc4000 0x1000>;
+				status = "disabled";
+			};
+
+			ppib22: ppib@c5000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0xc5000 0x1000>;
+				status = "disabled";
+			};
+
 			i2c20: i2c@c6000 {
 				compatible = "nordic,nrf-twim";
 				#address-cells = <1>;
@@ -524,6 +566,12 @@
 				status = "disabled";
 			};
 
+			ppib30: ppib@103000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x103000 0x1000>;
+				status = "disabled";
+			};
+
 			i2c30: i2c@104000 {
 				compatible = "nordic,nrf-twim";
 				#address-cells = <1>;
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index dfe8d7b4531..258cc856e5d 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -82,6 +82,18 @@
 				status = "disabled";
 			};
 
+			ppib00: ppib@44000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x44000 0x1000>;
+				status = "disabled";
+			};
+
+			ppib01: ppib@45000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x45000 0x1000>;
+				status = "disabled";
+			};
+
 			spi00: spi@4d000 {
 				/*
 				 * This spi node can be either SPIM or SPIS,
@@ -137,6 +149,18 @@
 				status = "disabled";
 			};
 
+			ppib10: ppib@83000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x83000 0x1000>;
+				status = "disabled";
+			};
+
+			ppib11: ppib@84000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x84000 0x1000>;
+				status = "disabled";
+			};
+
 			timer10: timer@85000 {
 				compatible = "nordic,nrf-timer";
 				status = "disabled";
@@ -186,6 +210,24 @@
 				status = "disabled";
 			};
 
+			ppib20: ppib@c3000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0xc3000 0x1000>;
+				status = "disabled";
+			};
+
+			ppib21: ppib@c4000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0xc4000 0x1000>;
+				status = "disabled";
+			};
+
+			ppib22: ppib@c5000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0xc5000 0x1000>;
+				status = "disabled";
+			};
+
 			i2c20: i2c@c6000 {
 				compatible = "nordic,nrf-twim";
 				#address-cells = <1>;
@@ -465,6 +507,12 @@
 				status = "disabled";
 			};
 
+			ppib30: ppib@103000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x103000 0x1000>;
+				status = "disabled";
+			};
+
 			i2c30: i2c@104000 {
 				compatible = "nordic,nrf-twim";
 				#address-cells = <1>;

From 7c15c1540bebd2e5ab63eb8326c987dfd4427193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= <rafal.kuznia@nordicsemi.no>
Date: Tue, 15 Oct 2024 13:07:20 +0200
Subject: [PATCH 0648/2913] [nrf fromtree] modules: hal_nordic: Enable
 nrfx_ppib drivers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The new nrfx_ppib driver can now be enabled, when the corrensponding
device tree node has the okay status.

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
(cherry picked from commit bf66012544a9d1ceb9f7046409592ef39264507a)
(cherry picked from commit 0c45635d173b99be37d0d7abeaf65373b422b308)
---
 modules/hal_nordic/nrfx/CMakeLists.txt  |  1 +
 modules/hal_nordic/nrfx/Kconfig         | 43 +++++++++++++++++++++++++
 modules/hal_nordic/nrfx/Kconfig.logging |  4 +++
 modules/hal_nordic/nrfx/nrfx_config.h   | 31 ++++++++++++++++++
 4 files changed, 79 insertions(+)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 565835ab1c8..6c29b0b6156 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -135,6 +135,7 @@ zephyr_library_sources_ifdef(CONFIG_NRFX_NVMC    ${SRC_DIR}/nrfx_nvmc.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_PDM     ${SRC_DIR}/nrfx_pdm.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_POWER   ${SRC_DIR}/nrfx_power.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_PPI     ${SRC_DIR}/nrfx_ppi.c)
+zephyr_library_sources_ifdef(CONFIG_NRFX_PPIB    ${SRC_DIR}/nrfx_ppib.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_PWM     ${SRC_DIR}/nrfx_pwm.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_QDEC    ${SRC_DIR}/nrfx_qdec.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_QSPI    ${SRC_DIR}/nrfx_qspi.c)
diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 16729bf68ae..f374e028b93 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -259,6 +259,49 @@ config NRFX_PPI
 	bool "PPI allocator"
 	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_PPI))
 
+config NRFX_PPIB
+	bool
+
+config NRFX_PPIB00
+	bool "PPIB00 driver instance"
+	depends on $(dt_nodelabel_has_compat,ppib00,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	select NRFX_PPIB
+
+config NRFX_PPIB01
+	bool "PPIB01 driver instance"
+	depends on $(dt_nodelabel_has_compat,ppib01,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	select NRFX_PPIB
+
+config NRFX_PPIB10
+	bool "PPIB10 driver instance"
+	depends on $(dt_nodelabel_has_compat,ppib10,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	select NRFX_PPIB
+
+config NRFX_PPIB11
+	bool "PPIB11 driver instance"
+	depends on $(dt_nodelabel_has_compat,ppib11,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	select NRFX_PPIB
+
+config NRFX_PPIB20
+	bool "PPIB20 driver instance"
+	depends on $(dt_nodelabel_has_compat,ppib20,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	select NRFX_PPIB
+
+config NRFX_PPIB21
+	bool "PPIB21 driver instance"
+	depends on $(dt_nodelabel_has_compat,ppib21,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	select NRFX_PPIB
+
+config NRFX_PPIB22
+	bool "PPIB22 driver instance"
+	depends on $(dt_nodelabel_has_compat,ppib22,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	select NRFX_PPIB
+
+config NRFX_PPIB30
+	bool "PPIB30 driver instance"
+	depends on $(dt_nodelabel_has_compat,ppib30,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	select NRFX_PPIB
+
 config NRFX_PWM
 	bool
 
diff --git a/modules/hal_nordic/nrfx/Kconfig.logging b/modules/hal_nordic/nrfx/Kconfig.logging
index b24d683d3de..2bf24721880 100644
--- a/modules/hal_nordic/nrfx/Kconfig.logging
+++ b/modules/hal_nordic/nrfx/Kconfig.logging
@@ -64,6 +64,10 @@ config NRFX_PPI_LOG
 	bool "PPI driver logging"
 	depends on NRFX_PPI
 
+config NRFX_PPIB_LOG
+	bool "PPIB driver logging"
+	depends on NRFX_PPIB
+
 config NRFX_PRS_LOG
 	bool "PRS driver logging"
 	depends on NRFX_PRS
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index b85df4c33a7..d0d3a671ae2 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -278,6 +278,37 @@
 #define NRFX_PPI_CONFIG_LOG_ENABLED 1
 #endif
 
+#ifdef CONFIG_NRFX_PPIB
+#define NRFX_PPIB_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPIB_LOG
+#define NRFX_PPIB_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPIB00
+#define NRFX_PPIB00_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPIB01
+#define NRFX_PPIB01_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPIB10
+#define NRFX_PPIB10_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPIB11
+#define NRFX_PPIB11_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPIB20
+#define NRFX_PPIB20_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPIB21
+#define NRFX_PPIB21_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPIB22
+#define NRFX_PPIB22_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPIB30
+#define NRFX_PPIB30_ENABLED 1
+#endif
+
 #ifdef CONFIG_NRFX_PRS
 #define NRFX_PRS_ENABLED 1
 #endif

From 667325ef8d445631ba197c7e3d9f13e34f51d3fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= <rafal.kuznia@nordicsemi.no>
Date: Mon, 21 Oct 2024 08:16:07 +0200
Subject: [PATCH 0649/2913] [nrf fromtree] modules: hal_nordic: rework resource
 reservations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The resource reservation definitions were moved to a separate header
file.

The PPIB and DPPI channel and group resources can now be statically
allocated for each individual instance.

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
(cherry picked from commit 40d9dae867dfe66fa21f1adae55e8505c4d6ae72)
(cherry picked from commit cb32d9304b3492f847eca8accf63e0e93f1f5f2f)
---
 .../nrfx/nrfx_config_reserved_resources.h     | 710 ++++++++++++++++++
 modules/hal_nordic/nrfx/nrfx_glue.h           |  99 +--
 2 files changed, 711 insertions(+), 98 deletions(-)
 create mode 100644 modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h

diff --git a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h
new file mode 100644
index 00000000000..132ba4cd89a
--- /dev/null
+++ b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h
@@ -0,0 +1,710 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef NRFX_CONFIG_RESERVED_RESOURCES_H__
+#define NRFX_CONFIG_RESERVED_RESOURCES_H__
+
+/** @brief Bitmask that defines GPIOTE130 channels reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_GPIOTE130_CHANNELS_USED                                                               \
+	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), owned_channels) |                           \
+	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), child_owned_channels))
+
+/** @brief Bitmask that defines GPIOTE131 channels reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_GPIOTE131_CHANNELS_USED                                                               \
+	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), owned_channels) |                           \
+	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), child_owned_channels))
+
+/** @brief Bitmask that defines EGU instances that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_EGUS_USED 0
+
+/** @brief Bitmask that defines TIMER instances that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_TIMERS_USED 0
+
+/*
+ * The enabled Bluetooth controller subsystem is responsible for providing
+ * definitions of the BT_CTLR_USED_* symbols used below in a file named
+ * bt_ctlr_used_resources.h and for adding its location to global include
+ * paths so that the file can be included here for all Zephyr libraries that
+ * are to be built.
+ */
+#if defined(CONFIG_BT_LL_SW_SPLIT)
+#include <bt_ctlr_used_resources.h>
+#if defined(DPPI_PRESENT)
+#if defined(NRF53_SERIES)
+#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
+#define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
+#elif defined(LUMOS_XXAA)
+#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
+#define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
+#endif
+#else /* defined(DPPI_PRESENT) */
+#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
+#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
+#endif /* defined(DPPI_PRESENT) */
+#endif /* defined(CONFIG_BT_LL_SW_SPLIT) */
+
+#if defined(CONFIG_NRF_802154_RADIO_DRIVER)
+#if defined(NRF52_SERIES)
+#include <../src/nrf_802154_peripherals_nrf52.h>
+#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV NRF_802154_PPI_CHANNELS_USED_MASK
+#define NRFX_PPI_GROUPS_USED_BY_802154_DRV   NRF_802154_PPI_GROUPS_USED_MASK
+#elif defined(NRF53_SERIES)
+#include <../src/nrf_802154_peripherals_nrf53.h>
+#define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
+#define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
+#elif defined(NRF54L_SERIES)
+#include <../src/nrf_802154_peripherals_nrf54l.h>
+#define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
+#define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
+#elif defined(NRF54H_SERIES)
+#include <../src/nrf_802154_peripherals_nrf54h.h>
+#define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
+#define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
+#else
+#error Unsupported chip family
+#endif
+#endif /* CONFIG_NRF_802154_RADIO_DRIVER */
+
+#ifndef NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI0_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI0_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI0_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI0_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI0_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI00_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI00_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI00_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI00_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI00_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI00_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI10_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI10_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI10_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI10_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI10_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI20_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI20_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI20_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI20_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI20_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI20_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI30_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI30_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI30_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI30_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI30_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI30_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI020_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI020_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI020_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI020_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI020_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI030_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI030_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI030_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI030_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI030_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI030_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI120_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI120_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI120_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI120_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI120_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI120_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI130_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI130_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI130_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI130_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI130_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI130_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI131_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI131_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI131_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI131_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI131_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI131_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI132_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI132_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI132_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI132_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI132_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI132_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI133_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI133_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI133_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI133_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI133_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI133_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI134_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI134_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI134_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI134_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI134_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI134_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI135_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI135_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI135_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI135_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI135_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI135_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI136_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI136_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI136_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI136_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI136_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI136_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPI_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPI_GROUPS_USED_BY_BT_CTLR
+#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR 0
+#endif
+
+#ifndef NRFX_PPI_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPI_GROUPS_USED_BY_802154_DRV
+#define NRFX_PPI_GROUPS_USED_BY_802154_DRV 0
+#endif
+
+#ifndef NRFX_PPI_CHANNELS_USED_BY_MPSL
+#define NRFX_PPI_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_PPI_GROUPS_USED_BY_MPSL
+#define NRFX_PPI_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL 0
+#endif
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI0_CHANNELS_USED                                                                   \
+	(NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI0_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI0_GROUPS_USED                                                                     \
+	(NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI0_GROUPS_USED_BY_802154_DRV |                \
+	 NRFX_DPPI0_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI00_CHANNELS_USED                                                                  \
+	(NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI00_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI00_GROUPS_USED                                                                    \
+	(NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI00_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI00_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI10_CHANNELS_USED                                                                  \
+	(NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI10_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI10_GROUPS_USED                                                                    \
+	(NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI10_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI10_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI20_CHANNELS_USED                                                                  \
+	(NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI20_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI20_GROUPS_USED                                                                    \
+	(NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI20_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI20_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI30_CHANNELS_USED                                                                  \
+	(NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI30_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI30_GROUPS_USED                                                                    \
+	(NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI30_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI30_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI020_CHANNELS_USED                                                                 \
+	(NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI020_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI020_GROUPS_USED                                                                   \
+	(NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI020_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI020_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI030_CHANNELS_USED                                                                 \
+	(NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI030_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI030_GROUPS_USED                                                                   \
+	(NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI030_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI030_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI120_CHANNELS_USED                                                                 \
+	(NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI120_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI120_GROUPS_USED                                                                   \
+	(NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI120_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI120_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI130_CHANNELS_USED                                                                 \
+	(NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI130_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI130_GROUPS_USED                                                                   \
+	(NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI130_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI130_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI131_CHANNELS_USED                                                                 \
+	(NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI131_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI131_GROUPS_USED                                                                   \
+	(NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI131_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI131_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI132_CHANNELS_USED                                                                 \
+	(NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI132_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI132_GROUPS_USED                                                                   \
+	(NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI132_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI132_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI133_CHANNELS_USED                                                                 \
+	(NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI133_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI133_GROUPS_USED                                                                   \
+	(NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI133_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI133_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI134_CHANNELS_USED                                                                 \
+	(NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI134_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI134_GROUPS_USED                                                                   \
+	(NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI134_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI134_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI135_CHANNELS_USED                                                                 \
+	(NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI135_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI135_GROUPS_USED                                                                   \
+	(NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI135_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI135_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI136_CHANNELS_USED                                                                 \
+	(NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI136_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI136_GROUPS_USED                                                                   \
+	(NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI136_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI136_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines PPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_PPI_CHANNELS_USED                                                                     \
+	(NRFX_PPI_CHANNELS_USED_BY_BT_CTLR | NRFX_PPI_CHANNELS_USED_BY_802154_DRV |                \
+	 NRFX_PPI_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_DPPI_CHANNELS_USED NRFX_DPPI0_CHANNELS_USED
+#define NRFX_DPPI_GROUPS_USED   NRFX_DPPI0_GROUPS_USED
+
+/** @brief Bitmask that defines PPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_PPI_GROUPS_USED                                                                       \
+	(NRFX_PPI_GROUPS_USED_BY_BT_CTLR | NRFX_PPI_GROUPS_USED_BY_802154_DRV |                    \
+	 NRFX_PPI_GROUPS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_00_10_CHANNELS_USED                                                 \
+	(NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_01_20_CHANNELS_USED                                                 \
+	(NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_11_21_CHANNELS_USED                                                 \
+	(NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_22_30_CHANNELS_USED                                                 \
+	(NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_02_03_CHANNELS_USED                                                 \
+	(NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_04_12_CHANNELS_USED                                                 \
+	(NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_020_030_CHANNELS_USED                                               \
+	(NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR |                                              \
+	 NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV | NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL)
+
+#endif /* NRFX_CONFIG_RESERVED_RESOURCES_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_glue.h b/modules/hal_nordic/nrfx/nrfx_glue.h
index b7365e5163a..c65318f1fe3 100644
--- a/modules/hal_nordic/nrfx/nrfx_glue.h
+++ b/modules/hal_nordic/nrfx/nrfx_glue.h
@@ -314,104 +314,7 @@ void nrfx_busy_wait(uint32_t usec_to_wait);
 
 /*------------------------------------------------------------------------------*/
 
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside of the nrfx library. */
-#define NRFX_DPPI_CHANNELS_USED   (NRFX_PPI_CHANNELS_USED_BY_BT_CTLR |    \
-				   NRFX_PPI_CHANNELS_USED_BY_802154_DRV | \
-				   NRFX_PPI_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside of the nrfx library. */
-#define NRFX_DPPI_GROUPS_USED     (NRFX_PPI_GROUPS_USED_BY_BT_CTLR |    \
-				   NRFX_PPI_GROUPS_USED_BY_802154_DRV | \
-				   NRFX_PPI_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines PPI channels that are reserved for use outside of the nrfx library. */
-#define NRFX_PPI_CHANNELS_USED    (NRFX_PPI_CHANNELS_USED_BY_BT_CTLR |    \
-				   NRFX_PPI_CHANNELS_USED_BY_802154_DRV | \
-				   NRFX_PPI_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines PPI groups that are reserved for use outside of the nrfx library. */
-#define NRFX_PPI_GROUPS_USED      (NRFX_PPI_GROUPS_USED_BY_BT_CTLR |    \
-				   NRFX_PPI_GROUPS_USED_BY_802154_DRV | \
-				   NRFX_PPI_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines GPIOTE130 channels reserved for use outside of the nrfx library. */
-#define NRFX_GPIOTE130_CHANNELS_USED \
-	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), owned_channels) | \
-	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), child_owned_channels))
-
-/** @brief Bitmask that defines GPIOTE131 channels reserved for use outside of the nrfx library. */
-#define NRFX_GPIOTE131_CHANNELS_USED \
-	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), owned_channels) | \
-	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), child_owned_channels))
-
-
-#if defined(CONFIG_BT_CTLR)
-/*
- * The enabled Bluetooth controller subsystem is responsible for providing
- * definitions of the BT_CTLR_USED_* symbols used below in a file named
- * bt_ctlr_used_resources.h and for adding its location to global include
- * paths so that the file can be included here for all Zephyr libraries that
- * are to be built.
- */
-#include <bt_ctlr_used_resources.h>
-#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR    BT_CTLR_USED_PPI_CHANNELS
-#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR      BT_CTLR_USED_PPI_GROUPS
-#else
-#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR    0
-#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR      0
-#endif
-
-#if defined(CONFIG_NRF_802154_RADIO_DRIVER)
-#if defined(NRF52_SERIES)
-#include <../src/nrf_802154_peripherals_nrf52.h>
-#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV   NRF_802154_PPI_CHANNELS_USED_MASK
-#define NRFX_PPI_GROUPS_USED_BY_802154_DRV     NRF_802154_PPI_GROUPS_USED_MASK
-#elif defined(NRF53_SERIES)
-#include <../src/nrf_802154_peripherals_nrf53.h>
-#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV   NRF_802154_DPPI_CHANNELS_USED_MASK
-#define NRFX_PPI_GROUPS_USED_BY_802154_DRV     NRF_802154_DPPI_GROUPS_USED_MASK
-#elif defined(NRF54L_SERIES)
-#include <../src/nrf_802154_peripherals_nrf54l.h>
-#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV   NRF_802154_DPPI_CHANNELS_USED_MASK
-#define NRFX_PPI_GROUPS_USED_BY_802154_DRV     NRF_802154_DPPI_GROUPS_USED_MASK
-#elif defined(NRF54H_SERIES)
-#include <../src/nrf_802154_peripherals_nrf54h.h>
-#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV   NRF_802154_DPPI_CHANNELS_USED_MASK
-#define NRFX_PPI_GROUPS_USED_BY_802154_DRV     NRF_802154_DPPI_GROUPS_USED_MASK
-#else
-#error Unsupported chip family
-#endif
-#else // CONFIG_NRF_802154_RADIO_DRIVER
-#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV   0
-#define NRFX_PPI_GROUPS_USED_BY_802154_DRV     0
-#endif // CONFIG_NRF_802154_RADIO_DRIVER
-
-#if defined(CONFIG_NRF_802154_RADIO_DRIVER) && !defined(CONFIG_NRF_802154_SL_OPENSOURCE)
-#include <mpsl.h>
-#define NRFX_PPI_CHANNELS_USED_BY_MPSL   MPSL_RESERVED_PPI_CHANNELS
-#define NRFX_PPI_GROUPS_USED_BY_MPSL     0
-#else
-#define NRFX_PPI_CHANNELS_USED_BY_MPSL   0
-#define NRFX_PPI_GROUPS_USED_BY_MPSL     0
-#endif
-
-#if defined(NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL)
-BUILD_ASSERT(
-	(NRFX_PPI_CHANNELS_USED_BY_802154_DRV & NRFX_PPI_CHANNELS_USED_BY_MPSL) == 0,
-	"PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	"assigned to the MPSL.");
-
-BUILD_ASSERT(
-	(NRFX_PPI_GROUPS_USED_BY_802154_DRV & NRFX_PPI_GROUPS_USED_BY_MPSL) == 0,
-	"PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	"assigned to the MPSL.");
-#endif // NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL
-
-/** @brief Bitmask that defines EGU instances that are reserved for use outside of the nrfx library. */
-#define NRFX_EGUS_USED            0
-
-/** @brief Bitmask that defines TIMER instances that are reserved for use outside of the nrfx library. */
-#define NRFX_TIMERS_USED          0
+#include "nrfx_config_reserved_resources.h"
 
 //------------------------------------------------------------------------------
 

From 44e582f8dc7228ffd24e550c7302e6169e3a1b53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= <rafal.kuznia@nordicsemi.no>
Date: Wed, 23 Oct 2024 00:35:45 +0200
Subject: [PATCH 0650/2913] [nrf fromtree] modules: hal_nordic: add NRFX_GPPI
 config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The nrfx_gppi module is an abstraction over nrfx_ppi and nrfx_dppi
drivers. It now has a Kconfig option that is separate from nrfx_dppi and
by default it enables all PPI/DPPI instances, if available.

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
(cherry picked from commit e18410944ed32bc31642a2659f8ac6086133d5f8)
(cherry picked from commit 39b4822629f05e2d6c77409500061bfb06c05521)
---
 drivers/pwm/Kconfig.nrf_sw                |  3 +--
 drivers/serial/Kconfig.nrfx_uart_instance |  6 ++---
 modules/hal_nordic/nrfx/CMakeLists.txt    |  4 ++--
 modules/hal_nordic/nrfx/Kconfig           | 29 +++++++++++++++++++++++
 samples/boards/nordic/nrfx/Kconfig        |  6 -----
 samples/boards/nordic/nrfx/prj.conf       |  1 +
 soc/nordic/nrf53/Kconfig                  |  2 +-
 soc/nordic/nrf53/Kconfig.sync_rtc         |  2 +-
 8 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/drivers/pwm/Kconfig.nrf_sw b/drivers/pwm/Kconfig.nrf_sw
index 1d68993db5a..915ceaa8b4a 100644
--- a/drivers/pwm/Kconfig.nrf_sw
+++ b/drivers/pwm/Kconfig.nrf_sw
@@ -8,8 +8,7 @@ config PWM_NRF_SW
 	default y if !PWM_NRFX
 	depends on DT_HAS_NORDIC_NRF_SW_PWM_ENABLED
 	select NRFX_GPIOTE
-	select NRFX_PPI if HAS_HW_NRF_PPI
-	select NRFX_DPPI if HAS_HW_NRF_DPPIC
+	select NRFX_GPPI
 	help
 	  Enable driver to utilize PWM on the Nordic Semiconductor nRF SoCs.
 
diff --git a/drivers/serial/Kconfig.nrfx_uart_instance b/drivers/serial/Kconfig.nrfx_uart_instance
index d44c1ab7e02..8bc3f6c5e2c 100644
--- a/drivers/serial/Kconfig.nrfx_uart_instance
+++ b/drivers/serial/Kconfig.nrfx_uart_instance
@@ -24,8 +24,7 @@ config UART_$(nrfx_uart_num)_ENHANCED_POLL_OUT
 	default y
 	depends on HAS_HW_NRF_UARTE$(nrfx_uart_num)
 	depends on HAS_HW_NRF_PPI || HAS_HW_NRF_DPPIC
-	select NRFX_PPI if HAS_HW_NRF_PPI
-	select NRFX_DPPI if HAS_HW_NRF_DPPIC
+	select NRFX_GPPI
 	help
 	  When enabled, polling out does not trigger interrupt which stops TX.
 	  Feature uses a PPI channel.
@@ -55,8 +54,7 @@ config UART_$(nrfx_uart_num)_NRF_HW_ASYNC
 	depends on UART_ASYNC_API
 	depends on UART_NRFX_UARTE_LEGACY_SHIM
 	depends on HAS_HW_NRF_PPI || HAS_HW_NRF_DPPIC
-	select NRFX_PPI if HAS_HW_NRF_PPI
-	select NRFX_DPPI if HAS_HW_NRF_DPPIC
+	select NRFX_GPPI
 	help
 	  If default driver uses interrupts to count incoming bytes, it is possible
 	  that with higher speeds and/or high cpu load some data can be lost.
diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 6c29b0b6156..d451f5f1a54 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -115,7 +115,7 @@ zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF92X  ${MDK_DIR}/system_nrf92.c
 zephyr_library_sources(nrfx_glue.c)
 zephyr_library_sources(${HELPERS_DIR}/nrfx_flag32_allocator.c)
 zephyr_library_sources_ifdef(CONFIG_RETAINED_MEM_NRF_RAM_CTRL ${HELPERS_DIR}/nrfx_ram_ctrl.c)
-zephyr_library_sources_ifdef(CONFIG_NRFX_DPPI                 ${HELPERS_DIR}/nrfx_gppi_dppi.c)
+zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI                 ${HELPERS_DIR}/nrfx_gppi_dppi.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_PPI                  ${HELPERS_DIR}/nrfx_gppi_ppi.c)
 
 zephyr_library_sources_ifdef(CONFIG_NRFX_PRS     ${SRC_DIR}/prs/nrfx_prs.c)
@@ -199,7 +199,7 @@ if(CONFIG_SOC_NRF54L20_ENGA_CPUAPP)
   zephyr_compile_definitions(NRF_SKIP_TAMPC_SETUP)
 endif()
 
-if(CONFIG_SOC_SERIES_NRF54LX AND CONFIG_NRFX_DPPI)
+if(CONFIG_SOC_SERIES_NRF54LX AND CONFIG_NRFX_GPPI)
   zephyr_library_sources(${HELPERS_DIR}/nrfx_gppi_dppi_ppib_lumos.c)
   zephyr_library_sources(${NRFX_DIR}/soc/interconnect/dppic_ppib/nrfx_interconnect_dppic_ppib.c)
 endif()
diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index f374e028b93..1ffff73b356 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -30,71 +30,85 @@ config NRFX_DPPI
 
 config NRFX_DPPI0
 	bool "DPPI0 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic,$(DT_COMPAT_NORDIC_NRF_DPPIC))
 	select NRFX_DPPI
 
 config NRFX_DPPI00
 	bool "DPPI00 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic00,$(DT_COMPAT_NORDIC_NRF_DPPIC))
 	select NRFX_DPPI
 
 config NRFX_DPPI10
 	bool "DPPI10 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic10,$(DT_COMPAT_NORDIC_NRF_DPPIC))
 	select NRFX_DPPI
 
 config NRFX_DPPI20
 	bool "DPPI20 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic20,$(DT_COMPAT_NORDIC_NRF_DPPIC))
 	select NRFX_DPPI
 
 config NRFX_DPPI30
 	bool "DPPI30 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic30,$(DT_COMPAT_NORDIC_NRF_DPPIC))
 	select NRFX_DPPI
 
 config NRFX_DPPI020
 	bool "DPPI020 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic020,$(DT_COMPAT_NORDIC_NRF_DPPIC_LOCAL))
 	select NRFX_DPPI
 
 config NRFX_DPPI120
 	bool "DPPI120 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic120,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
 	select NRFX_DPPI
 
 config NRFX_DPPI130
 	bool "DPPI130 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic130,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
 	select NRFX_DPPI
 
 config NRFX_DPPI131
 	bool "DPPI131 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic131,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
 	select NRFX_DPPI
 
 config NRFX_DPPI132
 	bool "DPPI132 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic132,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
 	select NRFX_DPPI
 
 config NRFX_DPPI133
 	bool "DPPI133 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic133,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
 	select NRFX_DPPI
 
 config NRFX_DPPI134
 	bool "DPPI134 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic134,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
 	select NRFX_DPPI
 
 config NRFX_DPPI135
 	bool "DPPI135 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic135,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
 	select NRFX_DPPI
 
 config NRFX_DPPI136
 	bool "DPPI136 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic136,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
 	select NRFX_DPPI
 
@@ -192,6 +206,12 @@ config NRFX_GPIOTE_NUM_OF_EVT_HANDLERS
 	  Specifies number of handlers that can be registered to nrfx_gpiote driver
 	  by the user.
 
+config NRFX_GPPI
+	bool "Generic PPI layer"
+	help
+	   Enable the nrfx_gppi utilities providing unified API for creating PPI
+	   connections across SoC families.
+
 config NRFX_GRTC
 	bool "GRTC driver"
 	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_GRTC))
@@ -257,6 +277,7 @@ config NRFX_POWER
 
 config NRFX_PPI
 	bool "PPI allocator"
+	default y if NRFX_GPPI
 	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_PPI))
 
 config NRFX_PPIB
@@ -264,41 +285,49 @@ config NRFX_PPIB
 
 config NRFX_PPIB00
 	bool "PPIB00 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,ppib00,$(DT_COMPAT_NORDIC_NRF_PPIB))
 	select NRFX_PPIB
 
 config NRFX_PPIB01
 	bool "PPIB01 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,ppib01,$(DT_COMPAT_NORDIC_NRF_PPIB))
 	select NRFX_PPIB
 
 config NRFX_PPIB10
 	bool "PPIB10 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,ppib10,$(DT_COMPAT_NORDIC_NRF_PPIB))
 	select NRFX_PPIB
 
 config NRFX_PPIB11
 	bool "PPIB11 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,ppib11,$(DT_COMPAT_NORDIC_NRF_PPIB))
 	select NRFX_PPIB
 
 config NRFX_PPIB20
 	bool "PPIB20 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,ppib20,$(DT_COMPAT_NORDIC_NRF_PPIB))
 	select NRFX_PPIB
 
 config NRFX_PPIB21
 	bool "PPIB21 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,ppib21,$(DT_COMPAT_NORDIC_NRF_PPIB))
 	select NRFX_PPIB
 
 config NRFX_PPIB22
 	bool "PPIB22 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,ppib22,$(DT_COMPAT_NORDIC_NRF_PPIB))
 	select NRFX_PPIB
 
 config NRFX_PPIB30
 	bool "PPIB30 driver instance"
+	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,ppib30,$(DT_COMPAT_NORDIC_NRF_PPIB))
 	select NRFX_PPIB
 
diff --git a/samples/boards/nordic/nrfx/Kconfig b/samples/boards/nordic/nrfx/Kconfig
index 67d02ef981b..776090f5bd2 100644
--- a/samples/boards/nordic/nrfx/Kconfig
+++ b/samples/boards/nordic/nrfx/Kconfig
@@ -3,12 +3,6 @@
 
 source "Kconfig.zephyr"
 
-config NRFX_DPPI
-	default $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_DPPIC))
-
-config NRFX_PPI
-	default $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_PPI))
-
 config NRFX_GPIOTE0
 	default y if SOC_SERIES_NRF51X || \
 		     SOC_SERIES_NRF52X || \
diff --git a/samples/boards/nordic/nrfx/prj.conf b/samples/boards/nordic/nrfx/prj.conf
index d4f0c29699f..224fa224132 100644
--- a/samples/boards/nordic/nrfx/prj.conf
+++ b/samples/boards/nordic/nrfx/prj.conf
@@ -1,3 +1,4 @@
 CONFIG_GPIO=n
 CONFIG_LOG=y
 CONFIG_LOG_PROCESS_THREAD_SLEEP_MS=100
+CONFIG_NRFX_GPPI=y
diff --git a/soc/nordic/nrf53/Kconfig b/soc/nordic/nrf53/Kconfig
index 823d1be8e2d..f696ab95478 100644
--- a/soc/nordic/nrf53/Kconfig
+++ b/soc/nordic/nrf53/Kconfig
@@ -82,7 +82,7 @@ config SOC_NRF53_ANOMALY_168_WORKAROUND_FOR_EXECUTION_FROM_RAM
 config SOC_NRF53_RTC_PRETICK
 	bool "Pre-tick workaround for nRF5340 anomaly 165"
 	depends on (SYS_CLOCK_EXISTS && SOC_NRF5340_CPUNET) || SOC_NRF5340_CPUAPP
-	select NRFX_DPPI
+	select NRFX_GPPI
 	select ARM_ON_ENTER_CPU_IDLE_HOOK if SOC_NRF5340_CPUNET
 	select ARM_ON_ENTER_CPU_IDLE_PREPARE_HOOK if SOC_NRF5340_CPUNET
 	help
diff --git a/soc/nordic/nrf53/Kconfig.sync_rtc b/soc/nordic/nrf53/Kconfig.sync_rtc
index 475db911c67..b960465e442 100644
--- a/soc/nordic/nrf53/Kconfig.sync_rtc
+++ b/soc/nordic/nrf53/Kconfig.sync_rtc
@@ -5,7 +5,7 @@ config NRF53_SYNC_RTC
 	bool "RTC clock synchronization"
 	default y if LOG && !LOG_MODE_MINIMAL
 	depends on NRF_RTC_TIMER
-	select NRFX_DPPI
+	select NRFX_GPPI
 	select MBOX if !IPM
 
 if NRF53_SYNC_RTC

From 8ca30e0d4dff91feaa19720dca1053d4a3b34d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= <rafal.kuznia@nordicsemi.no>
Date: Mon, 18 Nov 2024 15:40:50 +0100
Subject: [PATCH 0651/2913] [nrf fromlist] modules: hal_nordic: add Kconfig
 selecting resource header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The resource reservation header is now included according to a Kconfig
value. The Kconfig can be overriden out-of-tree in case a different
header is needed.

Upstream PR #: 81602

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
(cherry picked from commit b115083642c676b894e8ffef1a287d0bc318ea21)
---
 modules/hal_nordic/nrfx/Kconfig     | 4 ++++
 modules/hal_nordic/nrfx/nrfx_glue.h | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 1ffff73b356..1fbb694a291 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -1209,4 +1209,8 @@ config NRFX_PRS_BOX_4
 
 endmenu
 
+config NRFX_RESERVED_RESOURCES_HEADER
+	string
+	default "nrfx_config_reserved_resources.h"
+
 endmenu # "nrfx drivers"
diff --git a/modules/hal_nordic/nrfx/nrfx_glue.h b/modules/hal_nordic/nrfx/nrfx_glue.h
index c65318f1fe3..8f1109f4a79 100644
--- a/modules/hal_nordic/nrfx/nrfx_glue.h
+++ b/modules/hal_nordic/nrfx/nrfx_glue.h
@@ -314,7 +314,9 @@ void nrfx_busy_wait(uint32_t usec_to_wait);
 
 /*------------------------------------------------------------------------------*/
 
-#include "nrfx_config_reserved_resources.h"
+#ifdef CONFIG_NRFX_RESERVED_RESOURCES_HEADER
+#include CONFIG_NRFX_RESERVED_RESOURCES_HEADER
+#endif
 
 //------------------------------------------------------------------------------
 

From aaa68d845034bff98737974d4cf3a4d241eaf1b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= <rafal.kuznia@nordicsemi.no>
Date: Tue, 19 Nov 2024 16:14:28 +0100
Subject: [PATCH 0652/2913] [nrf fromlist] modules: hal_nordic: replace
 LUMOS_XXAA with NRF54L_SERIES
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The NRF54L_SERIES define is more specific and should be used in favor of
LUMOS_XXAA.

Upstream PR #: 81602

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
(cherry picked from commit dc36d3ba9d6180551426aa40d79102dcf69836ad)
---
 modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h
index 132ba4cd89a..c40e22c17d7 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h
@@ -44,7 +44,7 @@
 #if defined(NRF53_SERIES)
 #define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
 #define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
-#elif defined(LUMOS_XXAA)
+#elif defined(NRF54L_SERIES)
 #define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
 #define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
 #endif

From bcf61aa430eb39b9f0146307b78187f2b8a2161f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= <rafal.kuznia@nordicsemi.no>
Date: Tue, 19 Nov 2024 16:16:23 +0100
Subject: [PATCH 0653/2913] [nrf fromlist] dts: nordic: Add dppic0 label to
 nRF53 and nRF91 devices
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added dppic0 node label, alongside the dppic to maintain backward
compatibility. The use of dppic0 is preferred.

Upstream PR #: 81602

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
(cherry picked from commit 2e2ce12a041f3507b459fd49982d70fbc1b7d554)
---
 dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi | 2 +-
 dts/arm/nordic/nrf5340_cpunet.dtsi             | 2 +-
 dts/arm/nordic/nrf91_peripherals.dtsi          | 2 +-
 modules/hal_nordic/nrfx/Kconfig                | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
index 50842fb3801..d91bb508d30 100644
--- a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
@@ -328,7 +328,7 @@ rtc1: rtc@15000 {
 	prescaler = <1>;
 };
 
-dppic: dppic@17000 {
+dppic0: dppic: dppic@17000 {
 	compatible = "nordic,nrf-dppic";
 	reg = <0x17000 0x1000>;
 	status = "okay";
diff --git a/dts/arm/nordic/nrf5340_cpunet.dtsi b/dts/arm/nordic/nrf5340_cpunet.dtsi
index 0da1e06866f..a179c7649c7 100644
--- a/dts/arm/nordic/nrf5340_cpunet.dtsi
+++ b/dts/arm/nordic/nrf5340_cpunet.dtsi
@@ -160,7 +160,7 @@
 			status = "okay";
 		};
 
-		dppic: dppic@4100f000 {
+		dppic0: dppic: dppic@4100f000 {
 			compatible = "nordic,nrf-dppic";
 			reg = <0x4100f000 0x1000>;
 			status = "okay";
diff --git a/dts/arm/nordic/nrf91_peripherals.dtsi b/dts/arm/nordic/nrf91_peripherals.dtsi
index 93abc17d48b..14d05d27cee 100644
--- a/dts/arm/nordic/nrf91_peripherals.dtsi
+++ b/dts/arm/nordic/nrf91_peripherals.dtsi
@@ -28,7 +28,7 @@ adc: adc@e000 {
 	#io-channel-cells = <1>;
 };
 
-dppic: dppic@17000 {
+dppic0: dppic: dppic@17000 {
 	compatible = "nordic,nrf-dppic";
 	reg = <0x17000 0x1000>;
 	status = "okay";
diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 1fbb694a291..9fbd6587c80 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -31,7 +31,8 @@ config NRFX_DPPI
 config NRFX_DPPI0
 	bool "DPPI0 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic,$(DT_COMPAT_NORDIC_NRF_DPPIC))
+	depends on ($(dt_nodelabel_has_compat,dppic,$(DT_COMPAT_NORDIC_NRF_DPPIC)) || \
+		    $(dt_nodelabel_has_compat,dppic0,$(DT_COMPAT_NORDIC_NRF_DPPIC)))
 	select NRFX_DPPI
 
 config NRFX_DPPI00

From 3467a9ba9ef51fa296c1dc8960d1e936cab3b271 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= <rafal.kuznia@nordicsemi.no>
Date: Tue, 22 Oct 2024 08:55:47 +0200
Subject: [PATCH 0654/2913] [nrf noup] modules: hal_nordic: adjust nrfx
 reservations to NCS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added ncs-specific modules to nrfx_config_reserved_resources.
The modules are:
- mpsl
- nrfe

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
(cherry picked from commit 89bad3f2d60239a2e3503d7d79e4f92eeba0a5ba)
---
 modules/hal_nordic/nrfx/Kconfig               |   2 +-
 .../nrfx/nrfx_config_reserved_resources_ncs.h | 916 ++++++++++++++++++
 2 files changed, 917 insertions(+), 1 deletion(-)
 create mode 100644 modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h

diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 9fbd6587c80..14087daf8c5 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -1212,6 +1212,6 @@ endmenu
 
 config NRFX_RESERVED_RESOURCES_HEADER
 	string
-	default "nrfx_config_reserved_resources.h"
+	default "nrfx_config_reserved_resources_ncs.h"
 
 endmenu # "nrfx drivers"
diff --git a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h
new file mode 100644
index 00000000000..554b049f29f
--- /dev/null
+++ b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h
@@ -0,0 +1,916 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef NRFX_CONFIG_RESERVED_RESOURCES_H__
+#define NRFX_CONFIG_RESERVED_RESOURCES_H__
+
+/** @brief Bitmask that defines GPIOTE130 channels reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_GPIOTE130_CHANNELS_USED                                                               \
+	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), owned_channels) |                           \
+	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), child_owned_channels))
+
+/** @brief Bitmask that defines GPIOTE131 channels reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_GPIOTE131_CHANNELS_USED                                                               \
+	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), owned_channels) |                           \
+	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), child_owned_channels))
+
+/** @brief Bitmask that defines EGU instances that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_EGUS_USED 0
+
+/** @brief Bitmask that defines TIMER instances that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_TIMERS_USED 0
+
+/*
+ * The enabled Bluetooth controller subsystem is responsible for providing
+ * definitions of the BT_CTLR_USED_* symbols used below in a file named
+ * bt_ctlr_used_resources.h and for adding its location to global include
+ * paths so that the file can be included here for all Zephyr libraries that
+ * are to be built.
+ */
+#if defined(CONFIG_BT_LL_SW_SPLIT)
+#include <bt_ctlr_used_resources.h>
+#if defined(DPPI_PRESENT)
+#if defined(NRF53_SERIES)
+#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
+#define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
+#elif defined(NRF54L_SERIES)
+#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
+#define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
+#endif
+#else /* defined(DPPI_PRESENT) */
+#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
+#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
+#endif /* defined(DPPI_PRESENT) */
+#endif /* defined(CONFIG_BT_LL_SW_SPLIT) */
+
+#if defined(CONFIG_BT_LL_SOFTDEVICE)
+#include <sdc_soc.h>
+#if defined(NRF52_SERIES)
+#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR SDC_PPI_CHANNELS_USED_MASK
+#elif defined(NRF53_SERIES)
+#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR SDC_DPPI_CHANNELS_USED_MASK
+#elif defined(NRF54L_SERIES)
+#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC10_CHANNELS_USED_MASK
+#define NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC00_CHANNELS_USED_MASK
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR                                                   \
+	(SDC_PPIB00_CHANNELS_USED_MASK | SDC_PPIB10_CHANNELS_USED_MASK)
+#elif defined(NRF54H_SERIES)
+#define NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC020_CHANNELS_USED_MASK
+#define NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC030_CHANNELS_USED_MASK
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR                                                 \
+	(SDC_PPIB020_CHANNELS_USED_MASK | SDC_PPIB030_CHANNELS_USED_MASK)
+#else
+#error Unsupported chip family
+#endif
+#endif /* defined(CONFIG_BT_LL_SOFTDEVICE) */
+
+#if defined(CONFIG_NRF_802154_RADIO_DRIVER)
+#if defined(NRF52_SERIES)
+#include <../src/nrf_802154_peripherals_nrf52.h>
+#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV NRF_802154_PPI_CHANNELS_USED_MASK
+#define NRFX_PPI_GROUPS_USED_BY_802154_DRV   NRF_802154_PPI_GROUPS_USED_MASK
+#elif defined(NRF53_SERIES)
+#include <../src/nrf_802154_peripherals_nrf53.h>
+#define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
+#define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
+#elif defined(NRF54L_SERIES)
+#include <../src/nrf_802154_peripherals_nrf54l.h>
+#define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
+#define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
+#elif defined(NRF54H_SERIES)
+#include <../src/nrf_802154_peripherals_nrf54h.h>
+#define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
+#define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
+#else
+#error Unsupported chip family
+#endif
+#endif /* CONFIG_NRF_802154_RADIO_DRIVER */
+
+#if defined(CONFIG_MPSL)
+#include <mpsl.h>
+#if defined(NRF52_SERIES)
+#define NRFX_PPI_CHANNELS_USED_BY_MPSL MPSL_PPI_CHANNELS_USED_MASK
+#elif defined(NRF53_SERIES)
+#define NRFX_DPPI0_CHANNELS_USED_BY_MPSL MPSL_DPPIC_CHANNELS_USED_MASK
+#elif defined(NRF54L_SERIES)
+#define NRFX_DPPI10_CHANNELS_USED_BY_MPSL MPSL_DPPIC10_CHANNELS_USED_MASK
+#define NRFX_DPPI20_CHANNELS_USED_BY_MPSL MPSL_DPPIC20_CHANNELS_USED_MASK
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL                                                      \
+	(MPSL_PPIB11_CHANNELS_USED_MASK | MPSL_PPIB21_CHANNELS_USED_MASK)
+#elif defined(NRF54H_SERIES)
+#define NRFX_DPPI020_CHANNELS_USED_BY_MPSL MPSL_DPPIC020_CHANNELS_USED_MASK
+#else
+#error Unsupported chip family
+#endif
+#endif
+
+#ifndef NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI0_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI0_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI0_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI0_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI0_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI00_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI00_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI00_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI00_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI00_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI00_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI10_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI10_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI10_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI10_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI10_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI20_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI20_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI20_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI20_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI20_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI20_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI30_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI30_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI30_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI30_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI30_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI30_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI020_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI020_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI020_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI020_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI020_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI030_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI030_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI030_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI030_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI030_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI030_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI120_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI120_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI120_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI120_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI120_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI120_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI130_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI130_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI130_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI130_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI130_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI130_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI131_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI131_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI131_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI131_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI131_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI131_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI132_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI132_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI132_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI132_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI132_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI132_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI133_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI133_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI133_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI133_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI133_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI133_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI134_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI134_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI134_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI134_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI134_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI134_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI135_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI135_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI135_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI135_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI135_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI135_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI136_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI136_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI136_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI136_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI136_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI136_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPI_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPI_GROUPS_USED_BY_BT_CTLR
+#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR 0
+#endif
+
+#ifndef NRFX_PPI_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPI_GROUPS_USED_BY_802154_DRV
+#define NRFX_PPI_GROUPS_USED_BY_802154_DRV 0
+#endif
+
+#ifndef NRFX_PPI_CHANNELS_USED_BY_MPSL
+#define NRFX_PPI_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_PPI_GROUPS_USED_BY_MPSL
+#define NRFX_PPI_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#if defined(NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL)
+
+BUILD_ASSERT((NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI0_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI0_GROUPS_USED_BY_802154_DRV & NRFX_DPPI0_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI00_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI00_GROUPS_USED_BY_802154_DRV & NRFX_DPPI00_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI10_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI10_GROUPS_USED_BY_802154_DRV & NRFX_DPPI10_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI20_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI20_GROUPS_USED_BY_802154_DRV & NRFX_DPPI20_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI30_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI30_GROUPS_USED_BY_802154_DRV & NRFX_DPPI30_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI020_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI020_GROUPS_USED_BY_802154_DRV & NRFX_DPPI020_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI030_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI030_GROUPS_USED_BY_802154_DRV & NRFX_DPPI030_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI120_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI120_GROUPS_USED_BY_802154_DRV & NRFX_DPPI120_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI130_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI130_GROUPS_USED_BY_802154_DRV & NRFX_DPPI130_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI131_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI131_GROUPS_USED_BY_802154_DRV & NRFX_DPPI131_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI132_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI132_GROUPS_USED_BY_802154_DRV & NRFX_DPPI132_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI133_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI133_GROUPS_USED_BY_802154_DRV & NRFX_DPPI133_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI134_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI134_GROUPS_USED_BY_802154_DRV & NRFX_DPPI134_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI135_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI135_GROUPS_USED_BY_802154_DRV & NRFX_DPPI135_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI136_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI136_GROUPS_USED_BY_802154_DRV & NRFX_DPPI136_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPI_CHANNELS_USED_BY_802154_DRV & NRFX_PPI_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPI_GROUPS_USED_BY_802154_DRV & NRFX_PPI_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+#endif /* NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL */
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI0_CHANNELS_USED                                                                   \
+	(NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI0_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI0_GROUPS_USED                                                                     \
+	(NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI0_GROUPS_USED_BY_802154_DRV |                \
+	 NRFX_DPPI0_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI00_CHANNELS_USED                                                                  \
+	(NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI00_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI00_GROUPS_USED                                                                    \
+	(NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI00_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI00_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI10_CHANNELS_USED                                                                  \
+	(NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI10_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI10_GROUPS_USED                                                                    \
+	(NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI10_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI10_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI20_CHANNELS_USED                                                                  \
+	(NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI20_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI20_GROUPS_USED                                                                    \
+	(NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI20_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI20_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI30_CHANNELS_USED                                                                  \
+	(NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI30_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI30_GROUPS_USED                                                                    \
+	(NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI30_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI30_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI020_CHANNELS_USED                                                                 \
+	(NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI020_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI020_GROUPS_USED                                                                   \
+	(NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI020_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI020_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI030_CHANNELS_USED                                                                 \
+	(NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI030_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI030_GROUPS_USED                                                                   \
+	(NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI030_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI030_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI120_CHANNELS_USED                                                                 \
+	(NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI120_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI120_GROUPS_USED                                                                   \
+	(NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI120_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI120_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI130_CHANNELS_USED                                                                 \
+	(NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI130_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI130_GROUPS_USED                                                                   \
+	(NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI130_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI130_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI131_CHANNELS_USED                                                                 \
+	(NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI131_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI131_GROUPS_USED                                                                   \
+	(NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI131_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI131_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI132_CHANNELS_USED                                                                 \
+	(NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI132_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI132_GROUPS_USED                                                                   \
+	(NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI132_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI132_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI133_CHANNELS_USED                                                                 \
+	(NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI133_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI133_GROUPS_USED                                                                   \
+	(NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI133_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI133_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI134_CHANNELS_USED                                                                 \
+	(NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI134_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI134_GROUPS_USED                                                                   \
+	(NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI134_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI134_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI135_CHANNELS_USED                                                                 \
+	(NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI135_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI135_GROUPS_USED                                                                   \
+	(NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI135_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI135_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI136_CHANNELS_USED                                                                 \
+	(NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI136_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI136_GROUPS_USED                                                                   \
+	(NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI136_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI136_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines PPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_PPI_CHANNELS_USED                                                                     \
+	(NRFX_PPI_CHANNELS_USED_BY_BT_CTLR | NRFX_PPI_CHANNELS_USED_BY_802154_DRV |                \
+	 NRFX_PPI_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_DPPI_CHANNELS_USED NRFX_DPPI0_CHANNELS_USED
+#define NRFX_DPPI_GROUPS_USED   NRFX_DPPI0_GROUPS_USED
+
+/** @brief Bitmask that defines PPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_PPI_GROUPS_USED                                                                       \
+	(NRFX_PPI_GROUPS_USED_BY_BT_CTLR | NRFX_PPI_GROUPS_USED_BY_802154_DRV |                    \
+	 NRFX_PPI_GROUPS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_00_10_CHANNELS_USED                                                 \
+	(NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_01_20_CHANNELS_USED                                                 \
+	(NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_11_21_CHANNELS_USED                                                 \
+	(NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_22_30_CHANNELS_USED                                                 \
+	(NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_02_03_CHANNELS_USED                                                 \
+	(NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_04_12_CHANNELS_USED                                                 \
+	(NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_020_030_CHANNELS_USED                                               \
+	(NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR |                                              \
+	 NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV | NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL)
+
+#endif /* NRFX_CONFIG_RESERVED_RESOURCES_H__ */

From fa58e795d190daf173dbda0f61d195a49bd26a3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Wed, 25 Sep 2024 07:28:55 +0200
Subject: [PATCH 0655/2913] [nrf fromtree] samples: boards: nordic:
 coresight_stm: Test STM dictionary mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extend STM logger test.
Use nrfutil trace to decode STM logs in dictionary mode.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit f0eba332588be7aff3adf479c23c836cb81c9f61)
(cherry picked from commit 4ba47686ab416ed3a01b5dbac1c0b6f4a478e1fb)
---
 .../boards/nordic/coresight_stm/README.rst    | 102 +++++++
 .../nordic/coresight_stm/pytest/test_stm.py   | 258 ++++++++++++++++++
 .../boards/nordic/coresight_stm/sample.yaml   |  44 ++-
 3 files changed, 380 insertions(+), 24 deletions(-)
 create mode 100644 samples/boards/nordic/coresight_stm/README.rst
 create mode 100644 samples/boards/nordic/coresight_stm/pytest/test_stm.py

diff --git a/samples/boards/nordic/coresight_stm/README.rst b/samples/boards/nordic/coresight_stm/README.rst
new file mode 100644
index 00000000000..370253cf41c
--- /dev/null
+++ b/samples/boards/nordic/coresight_stm/README.rst
@@ -0,0 +1,102 @@
+.. zephyr:code-sample:: coresight_stm_sample
+   :name: Coresight STM benchmark
+   :relevant-api: log_api
+
+Overview
+********
+
+This sample presents how to enable STM logging on nRF54H20 platform.
+
+Also, it prints timing for different log messages.
+Thus, performance of different loggers can be compared.
+
+There are three sample configurations in the :file:`sample.yaml`.
+
+* **sample.boards.nrf.coresight_stm.local_uart**
+
+  This configuration doesn't use STM.
+  Logs are printed on local console.
+
+* **sample.boards.nrf.coresight_stm**
+
+  This configuration use STM.
+  Application, Radio, PPR and FLPR cores send logs to an ETR buffer.
+  Proxy (Application core) gets logs from the ETR buffer, decodes STPv2 data
+  and prints human readable logs on UART.
+
+* **sample.boards.nrf.coresight_stm.dict**
+
+  This sample uses STM logging in dictionary mode.
+  Application, Radio, PPR and FLPR cores send logs to the ETR buffer.
+  Proxy (Application core) forwards data from the ETR to the host using UART.
+  Host tool is needed to decode the logs.
+
+Requirements
+************
+
+This application uses nRF54H20 DK board for the demo.
+
+**sample.boards.nrf.coresight_stm.dict** requires host tool like ``nrfutil trace``
+to decode the traces.
+
+Building and running
+********************
+
+To build the sample, use configuration setups from the :file:`sample.yaml` using the ``-T`` option.
+See the example:
+
+nRF54H20 DK
+
+  .. code-block:: console
+
+     west build -p -b nrf54h20dk/nrf54h20/cpuapp -T sample.boards.nrf.coresight_stm .
+
+Sample Output
+=============
+
+.. code-block:: console
+
+   *** Using Zephyr OS v3.6.99-5bb7bb0af17c ***
+   (...)
+   [00:00:00.227,264] <inf> app/app: test with one argument 100
+   [00:00:00.227,265] <inf> app/app: test with one argument 100
+   (...)
+   [00:00:00.585,558] <inf> rad/app: test with one argument 100
+   [00:00:00.585,569] <inf> rad/app: test with one argument 100
+   (...)
+   [00:00:00.624,408] <inf> ppr/app: test with one argument 100
+   [00:00:00.624,433] <inf> ppr/app: test with one argument 100
+   (...)
+   [00:00:00.625,249] <inf> flpr/app: test with one argument 100
+   [00:00:00.625,251] <inf> flpr/app: test with one argument 100
+   (...)
+   rad: Timing for log message with 0 arguments: 5.10us
+   rad: Timing for log message with 1 argument: 6.10us
+   rad: Timing for log message with 2 arguments: 6.0us
+   rad: Timing for log message with 3 arguments: 6.40us
+   rad: Timing for log_message with string: 7.10us
+   rad: Timing for tracepoint: 0.5us
+   rad: Timing for tracepoint_d32: 0.5us
+   flpr: Timing for log message with 0 arguments: 1.20us
+   flpr: Timing for log message with 1 argument: 1.20us
+   flpr: Timing for log message with 2 arguments: 1.20us
+   flpr: Timing for log message with 3 arguments: 1.30us
+   flpr: Timing for log_message with string: 3.0us
+   flpr: Timing for tracepoint: 0.0us
+   flpr: Timing for tracepoint_d32: 0.0us
+   app: Timing for log message with 0 arguments: 1.80us
+   app: Timing for log message with 1 argument: 2.0us
+   app: Timing for log message with 2 arguments: 2.0us
+   app: Timing for log message with 3 arguments: 2.10us
+   app: Timing for log_message with string: 4.40us
+   app: Timing for tracepoint: 0.10us
+   app: Timing for tracepoint_d32: 0.10us
+   ppr: Timing for log message with 0 arguments: 25.20us
+   ppr: Timing for log message with 1 argument: 26.20us
+   ppr: Timing for log message with 2 arguments: 26.90us
+   ppr: Timing for log message with 3 arguments: 27.40us
+   ppr: Timing for log_message with string: 64.80us
+   ppr: Timing for tracepoint: 0.30us
+   ppr: Timing for tracepoint_d32: 0.25us
+
+For logging on NRF54H20 using ARM Coresight STM see :ref:`logging_cs_stm`.
diff --git a/samples/boards/nordic/coresight_stm/pytest/test_stm.py b/samples/boards/nordic/coresight_stm/pytest/test_stm.py
new file mode 100644
index 00000000000..2187805f15f
--- /dev/null
+++ b/samples/boards/nordic/coresight_stm/pytest/test_stm.py
@@ -0,0 +1,258 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+import logging
+import re
+import subprocess
+from pathlib import Path
+from time import sleep
+
+import psutil
+from twister_harness import DeviceAdapter
+
+logger = logging.getLogger(__name__)
+
+SB_CONFIG_APP_CPUPPR_RUN = None
+SB_CONFIG_APP_CPUFLPR_RUN = None
+
+# https://github.com/zephyrproject-rtos/zephyr/blob/main/drivers/misc/coresight/nrf_etr.c#L102
+STM_M_ID = {
+    "sec": 33,
+    "app": 34,
+    "rad": 35,
+    "mod": 36,
+    "sys": 44,
+    "flpr": 45,
+    "ppr": 46,
+    "hw": 128,
+}
+
+
+def _analyse_autoconf(filepath: str) -> None:
+    global SB_CONFIG_APP_CPUPPR_RUN
+    global SB_CONFIG_APP_CPUFLPR_RUN
+
+    SB_CONFIG_APP_CPUPPR_RUN = False
+    SB_CONFIG_APP_CPUFLPR_RUN = False
+
+    # Parse contents of {BUILD_DIR}/_sysbuild/autoconf.h
+    with open(f"{filepath}", errors="ignore") as autoconf:
+        for line in autoconf:
+            if "SB_CONFIG_APP_CPUPPR_RUN 1" in line:
+                SB_CONFIG_APP_CPUPPR_RUN = True
+                continue
+            if "SB_CONFIG_APP_CPUFLPR_RUN 1" in line:
+                SB_CONFIG_APP_CPUFLPR_RUN = True
+    logger.debug(f"{SB_CONFIG_APP_CPUPPR_RUN=}")
+    logger.debug(f"{SB_CONFIG_APP_CPUFLPR_RUN=}")
+
+
+def _check_benchmark_results(output: str, core: str) -> None:
+    """
+    Use regular expressions to parse 'output' string.
+    Search for benchmark results related to 'core' coprocessor.
+    """
+
+    latency_msg_0_str = re.search(
+        rf"{core}: Timing for log message with 0 arguments: (.+)us", output
+    ).group(1)
+    assert latency_msg_0_str is not None, "Timing for log message with 0 arguments NOT found"
+
+    latency_msg_1_str = re.search(
+        rf"{core}: Timing for log message with 1 argument: (.+)us", output
+    ).group(1)
+    assert latency_msg_1_str is not None, "Timing for log message with 1 argument NOT found"
+
+    latency_msg_2_str = re.search(
+        rf"{core}: Timing for log message with 2 arguments: (.+)us", output
+    ).group(1)
+    assert latency_msg_2_str is not None, "Timing for log message with 2 arguments NOT found"
+
+    latency_msg_3_str = re.search(
+        rf"{core}: Timing for log message with 3 arguments: (.+)us", output
+    ).group(1)
+    assert latency_msg_3_str is not None, "Timing for log message with 3 arguments NOT found"
+
+    latency_msg_string_str = re.search(
+        rf"{core}: Timing for log_message with string: (.+)us", output
+    ).group(1)
+    assert latency_msg_string_str is not None, "Timing for log_message with string NOT found"
+
+    latency_tracepoint_str = re.search(
+        rf"{core}: Timing for tracepoint: (.+)us", output
+    ).group(1)
+    assert latency_tracepoint_str is not None, "Timing for tracepoint NOT found"
+
+    latency_tracepoint_d32_str = re.search(
+        rf"{core}: Timing for tracepoint_d32: (.+)us", output
+    ).group(1)
+    assert latency_tracepoint_d32_str is not None, "Timing for tracepoint_d32 NOT found"
+
+
+# nrfutil starts children processes
+# when subprocess.terminate(nrfutil_process) is executed, only the parent terminates
+# this blocks serial port for other uses
+def _kill(proc):
+    try:
+        for child in psutil.Process(proc.pid).children(recursive=True):
+            child.kill()
+        proc.kill()
+    except Exception as e:
+        logger.exception(f'Could not kill nrfutil - {e}')
+
+
+def _nrfutil_dictionary_from_serial(
+    dut: DeviceAdapter,
+    decoded_file_name: str = "output.txt",
+    collect_time: float = 60.0,
+) -> None:
+    UART_PATH = dut.device_config.serial
+    UART_BAUDRATE = dut.device_config.baud
+    dut.close()
+
+    logger.debug(f"Using serial: {UART_PATH}")
+
+    if Path(f"{decoded_file_name}").exists():
+        logger.warning("Output file already exists!")
+
+    # prepare database config string
+    BUILD_DIR = str(dut.device_config.build_dir)
+    logger.debug(f"{BUILD_DIR=}")
+    config_str = f"{STM_M_ID['app']}:{BUILD_DIR}/coresight_stm/zephyr/log_dictionary.json"
+    config_str = config_str + f",{STM_M_ID['rad']}:{BUILD_DIR}/remote_rad/zephyr/log_dictionary.json"
+    if SB_CONFIG_APP_CPUPPR_RUN:
+        config_str = config_str + f",{STM_M_ID['ppr']}:{BUILD_DIR}/remote_ppr/zephyr/log_dictionary.json"
+    if SB_CONFIG_APP_CPUFLPR_RUN:
+        config_str = config_str + f",{STM_M_ID['flpr']}:{BUILD_DIR}/remote_flpr/zephyr/log_dictionary.json"
+    logger.debug(f"{config_str=}")
+
+    cmd = (
+        "nrfutil trace stm --database-config "
+        f"{config_str} "
+        f"--input-serialport {UART_PATH} --baudrate {UART_BAUDRATE} "
+        f"--output-ascii {decoded_file_name}"
+    )
+    try:
+        # run nrfutil trace in background non-blocking
+        logger.info(f"Executing:\n{cmd}")
+        proc = subprocess.Popen(cmd.split(), stdout=subprocess.DEVNULL)
+    except OSError as exc:
+        logger.error(f"Unable to start nrfutil trace:\n{cmd}\n{exc}")
+    try:
+        proc.wait(collect_time)
+    except subprocess.TimeoutExpired:
+        pass
+    finally:
+        _kill(proc)
+
+
+def test_STM_decoded(dut: DeviceAdapter):
+    """
+    Run sample.boards.nrf.coresight_stm from samples/boards/nrf/coresight_stm sample.
+    Both Application and Radio cores use STM for logging.
+    STM proxy (Application core) decodes logs from all domains.
+    After reset, coprocessors execute code in expected way and Application core
+    outputs STM traces on UART port.
+    """
+    BUILD_DIR = str(dut.device_config.build_dir)
+    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
+
+    # nrf54h20 prints immediately after it is flashed.
+    # Wait a bit to skipp logs from previous test.
+    sleep(4)
+
+    # Get output from serial port
+    output = "\n".join(dut.readlines())
+
+    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
+    _analyse_autoconf(autoconf_file)
+
+    # check that LOGs from Application core are present
+    _check_benchmark_results(
+        output=output,
+        core='app',
+    )
+
+    # check that LOGs from Radio core are present
+    _check_benchmark_results(
+        output=output,
+        core='rad',
+    )
+
+    if SB_CONFIG_APP_CPUPPR_RUN:
+        # check that LOGs from PPR core are present
+        _check_benchmark_results(
+            output=output,
+            core='ppr',
+        )
+
+    if SB_CONFIG_APP_CPUFLPR_RUN:
+        # check that LOGs from FLPR core are present
+        _check_benchmark_results(
+            output=output,
+            core='flpr',
+        )
+
+
+def test_STM_dictionary_mode(dut: DeviceAdapter):
+    """
+    Run sample.boards.nrf.coresight_stm.dict from samples/boards/nrf/coresight_stm sample.
+    Both Application and Radio cores use STM for logging.
+    STM proxy (Application core) prints on serial port raw logs from all domains.
+    Nrfutil trace is used to decode STM logs.
+    After reset, coprocessors execute code in expected way and Application core
+    outputs STM traces on UART port.
+    """
+    BUILD_DIR = str(dut.device_config.build_dir)
+    test_filename = f"{BUILD_DIR}/coresight_stm_dictionary.txt"
+    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
+    COLLECT_TIMEOUT = 10.0
+
+    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
+    # this information is needed to build nrfutil database-config
+    _analyse_autoconf(autoconf_file)
+
+    # use nrfutil trace to decode logs
+    _nrfutil_dictionary_from_serial(
+        dut=dut,
+        decoded_file_name=f"{test_filename}",
+        collect_time=COLLECT_TIMEOUT,
+    )
+
+    # read decoded logs
+    with open(f"{test_filename}", errors="ignore") as decoded_file:
+        decoded_file_content = decoded_file.read()
+
+    # if nothing in decoded_file, stop test
+    assert(
+        len(decoded_file_content) > 0
+    ), f"File {test_filename} is empty"
+
+    # check that LOGs from Application core are present
+    _check_benchmark_results(
+        output=decoded_file_content,
+        core='app',
+    )
+
+    # check that LOGs from Radio core are present
+    _check_benchmark_results(
+        output=decoded_file_content,
+        core='rad',
+    )
+
+    if SB_CONFIG_APP_CPUPPR_RUN:
+        # check that LOGs from PPR core are present
+        _check_benchmark_results(
+            output=decoded_file_content,
+            core='ppr',
+        )
+
+    if SB_CONFIG_APP_CPUFLPR_RUN:
+        # check that LOGs from FLPR core are present
+        _check_benchmark_results(
+            output=decoded_file_content,
+            core='flpr',
+        )
diff --git a/samples/boards/nordic/coresight_stm/sample.yaml b/samples/boards/nordic/coresight_stm/sample.yaml
index eb3971a2f4e..4251c5d6df8 100644
--- a/samples/boards/nordic/coresight_stm/sample.yaml
+++ b/samples/boards/nordic/coresight_stm/sample.yaml
@@ -1,44 +1,40 @@
 sample:
   name: Logging using Coresight STM on nrf54h20
+
 common:
+  tags: stm
   sysbuild: true
+  platform_allow:
+    - nrf54h20dk/nrf54h20/cpuapp
+  integration_platforms:
+    - nrf54h20dk/nrf54h20/cpuapp
+
 tests:
   sample.boards.nrf.coresight_stm.dict:
-    platform_allow:
-      - nrf54h20dk/nrf54h20/cpuapp
-    integration_platforms:
-      - nrf54h20dk/nrf54h20/cpuapp
-    build_only: true
+    harness: pytest
+    harness_config:
+      pytest_dut_scope: session
+      pytest_root:
+        - "pytest/test_stm.py::test_STM_dictionary_mode"
     required_snippets:
       - nordic-log-stm-dict
     extra_args:
       - SB_CONFIG_APP_CPUPPR_RUN=y
       - SB_CONFIG_APP_CPUFLPR_RUN=y
+
   sample.boards.nrf.coresight_stm:
-    platform_allow:
-      - nrf54h20dk/nrf54h20/cpuapp
-    integration_platforms:
-      - nrf54h20dk/nrf54h20/cpuapp
-    harness: console
+    harness: pytest
     harness_config:
-      type: multi_line
-      ordered: true
-      regex:
-        - "Timing for log message with 0 arguments:"
-        - "Timing for log message with 1 argument:"
-        - "Timing for log message with 2 arguments:"
-        - "Timing for log message with 3 arguments:"
-        - "Timing for log_message with string:"
+      pytest_dut_scope: session
+      pytest_root:
+        - "pytest/test_stm.py::test_STM_decoded"
+    required_snippets:
+      - nordic-log-stm
     extra_args:
       - SB_CONFIG_APP_CPUPPR_RUN=y
       - SB_CONFIG_APP_CPUFLPR_RUN=y
-    required_snippets:
-      - nordic-log-stm
+
   sample.boards.nrf.coresight_stm.local_uart:
-    platform_allow:
-      - nrf54h20dk/nrf54h20/cpuapp
-    integration_platforms:
-      - nrf54h20dk/nrf54h20/cpuapp
     harness: console
     harness_config:
       type: multi_line

From 17dbcbc137b90a2b9d685562e07913f21d93a850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Wed, 30 Oct 2024 13:14:58 +0100
Subject: [PATCH 0656/2913] [nrf fromtree] usb: device_next: check wIndex on
 Set Address
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Set Address behavior is not specified when wValue is greater than 127,
or if wIndex or wLength are non-zero. USB stack did check wValue and
wLength but didn't care about wIndex value. Extend the check so non-zero
wIndex also results in STALL response.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 54dc01153caa38de6f6065b74768bcc766879a82)
(cherry picked from commit f2032ba82ec75df785ee50a95bf280df7aabb257)
---
 subsys/usb/device_next/usbd_ch9.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/subsys/usb/device_next/usbd_ch9.c b/subsys/usb/device_next/usbd_ch9.c
index 45775e88c53..6910c6df147 100644
--- a/subsys/usb/device_next/usbd_ch9.c
+++ b/subsys/usb/device_next/usbd_ch9.c
@@ -86,8 +86,8 @@ static int sreq_set_address(struct usbd_context *const uds_ctx)
 	struct usb_setup_packet *setup = usbd_get_setup_pkt(uds_ctx);
 	struct udc_device_caps caps = udc_caps(uds_ctx->dev);
 
-	/* Not specified if wLength is non-zero, treat as error */
-	if (setup->wValue > 127 || setup->wLength) {
+	/* Not specified if wIndex or wLength is non-zero, treat as error */
+	if (setup->wValue > 127 || setup->wIndex || setup->wLength) {
 		errno = -ENOTSUP;
 		return 0;
 	}

From 21d29cd34b946cdb943fdd233087db398362a803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Wed, 30 Oct 2024 06:33:09 +0100
Subject: [PATCH 0657/2913] [nrf fromtree] drivers: udc_nrf: handle overwritten
 Set Address commands
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

USBD peripheral automatically handles Set Address command which can
lead to state mismatch between USB stack and the host. Keep track of
device address and issue fake Set Address commands on mismatch.

This fixes default vs addressed state mismatch that can occur due to
sufficently high SETUP handling latency. The state mismatch was most
commonly seen as SET CONFIGURATION failure when the enumeration happened
during periods with increased latency.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit e3acf5fa043af0e8ac9cc911b224be6fc58613dd)
(cherry picked from commit ee1a57a8dc8f6bb2469ea2936b56f389be226135)
---
 drivers/usb/udc/udc_nrf.c | 119 +++++++++++++++++++++++++++++++++++---
 1 file changed, 110 insertions(+), 9 deletions(-)

diff --git a/drivers/usb/udc/udc_nrf.c b/drivers/usb/udc/udc_nrf.c
index c024d2a6a18..0a1987eb017 100644
--- a/drivers/usb/udc/udc_nrf.c
+++ b/drivers/usb/udc/udc_nrf.c
@@ -70,7 +70,8 @@ static struct k_thread drv_stack_data;
 
 static struct udc_ep_config ep_cfg_out[CFG_EPOUT_CNT + CFG_EP_ISOOUT_CNT + 1];
 static struct udc_ep_config ep_cfg_in[CFG_EPIN_CNT + CFG_EP_ISOIN_CNT + 1];
-static bool udc_nrf_setup_rcvd;
+static bool udc_nrf_setup_rcvd, udc_nrf_setup_set_addr, udc_nrf_fake_setup;
+static uint8_t udc_nrf_address;
 const static struct device *udc_nrf_dev;
 
 struct udc_nrf_config {
@@ -143,7 +144,9 @@ static void udc_event_xfer_ctrl_in(const struct device *dev,
 	/* Update to next stage of control transfer */
 	udc_ctrl_update_stage(dev, buf);
 
-	nrf_usbd_common_setup_clear();
+	if (!udc_nrf_setup_set_addr) {
+		nrf_usbd_common_setup_clear();
+	}
 }
 
 static void udc_event_fake_status_in(const struct device *dev)
@@ -317,6 +320,7 @@ static int usbd_ctrl_feed_dout(const struct device *dev,
 
 static int udc_event_xfer_setup(const struct device *dev)
 {
+	nrf_usbd_common_setup_t *setup;
 	struct net_buf *buf;
 	int err;
 
@@ -328,7 +332,77 @@ static int udc_event_xfer_setup(const struct device *dev)
 	}
 
 	udc_ep_buf_set_setup(buf);
-	nrf_usbd_common_setup_get((nrf_usbd_common_setup_t *)buf->data);
+	setup = (nrf_usbd_common_setup_t *)buf->data;
+	nrf_usbd_common_setup_get(setup);
+
+	/* USBD peripheral automatically handles Set Address in slightly
+	 * different manner than the USB stack.
+	 *
+	 * USBD peripheral doesn't care about wLength, but the peripheral
+	 * switches to new address only after status stage. The device won't
+	 * automatically accept Data Stage packets.
+	 *
+	 * However, in the case the host:
+	 *   * sends SETUP Set Address with non-zero wLength
+	 *   * does not send corresponding OUT DATA packets (to match wLength)
+	 *     or sends the packets but disregards NAK
+	 *     or sends the packets that device ACKs
+	 *   * sends IN token (either incorrectly proceeds to status stage, or
+	 *     manages to send IN before SW sets STALL)
+	 * then the USBD peripheral will accept the address and USB stack won't.
+	 * This will lead to state mismatch between the stack and peripheral.
+	 *
+	 * In cases where the USB stack would like to STALL the request there is
+	 * a race condition between host issuing Set Address status stage (IN
+	 * token) and SW setting STALL bit. If host wins the race, the device
+	 * ACKs status stage and use new address. If device wins the race, the
+	 * device STALLs status stage and address remains unchanged.
+	 */
+	udc_nrf_setup_set_addr =
+		setup->bmRequestType == 0 &&
+		setup->bRequest == USB_SREQ_SET_ADDRESS;
+	if (udc_nrf_setup_set_addr) {
+		if (setup->wLength) {
+			/* Currently USB stack only STALLs OUT Data Stage when
+			 * buffer allocation fails. To prevent the device from
+			 * ACKing the Data Stage, simply ignore the request
+			 * completely.
+			 *
+			 * If host incorrectly proceeds to status stage there
+			 * will be address mismatch (unless the new address is
+			 * equal to current device address). If host does not
+			 * issue IN token then the mismatch will be avoided.
+			 */
+			net_buf_unref(buf);
+			return 0;
+		}
+
+		/* nRF52/nRF53 USBD doesn't care about wValue bits 8..15 and
+		 * wIndex value but USB device stack does.
+		 *
+		 * Just clear the bits so stack will handle the request in the
+		 * same way as USBD peripheral does, avoiding the mismatch.
+		 */
+		setup->wValue &= 0x7F;
+		setup->wIndex = 0;
+	}
+
+	if (!udc_nrf_setup_set_addr && udc_nrf_address != NRF_USBD->USBADDR) {
+		/* Address mismatch detected. Fake Set Address handling to
+		 * correct the situation, then repeat handling.
+		 */
+		udc_nrf_fake_setup = true;
+		udc_nrf_setup_set_addr = true;
+
+		setup->bmRequestType = 0;
+		setup->bRequest = USB_SREQ_SET_ADDRESS;
+		setup->wValue = NRF_USBD->USBADDR;
+		setup->wIndex = 0;
+		setup->wLength = 0;
+	} else {
+		udc_nrf_fake_setup = false;
+	}
+
 	net_buf_add(buf, sizeof(nrf_usbd_common_setup_t));
 	udc_nrf_setup_rcvd = true;
 
@@ -494,7 +568,8 @@ static void udc_nrf_fake_status_in(const struct device *dev)
 		.ep = USB_CONTROL_EP_IN,
 	};
 
-	if (nrf_usbd_common_last_setup_dir_get() == USB_CONTROL_EP_OUT) {
+	if (nrf_usbd_common_last_setup_dir_get() == USB_CONTROL_EP_OUT ||
+	    udc_nrf_fake_setup) {
 		/* Let controller perform status IN stage */
 		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
 	}
@@ -608,12 +683,38 @@ static int udc_nrf_ep_clear_halt(const struct device *dev,
 
 static int udc_nrf_set_address(const struct device *dev, const uint8_t addr)
 {
-	/**
-	 * Nothing to do here. The USBD HW already takes care of initiating
-	 * STATUS stage. Just double check the address for sanity.
+	/*
+	 * If the status stage already finished (which depends entirely on when
+	 * the host sends IN token) then NRF_USBD->USBADDR will have the same
+	 * address, otherwise it won't (unless new address is unchanged).
+	 *
+	 * Store the address so the driver can detect address mismatches
+	 * between USB stack and USBD peripheral. The mismatches can occur if:
+	 *   * SW has high enough latency in SETUP handling, or
+	 *   * Host did not issue Status Stage after Set Address request
+	 *
+	 * The SETUP handling latency is a problem because the Set Address is
+	 * automatically handled by device. Because whole Set Address handling
+	 * can finish in less than 21 us, the latency required (with perfect
+	 * timing) to hit the issue is relatively short (2 ms Set Address
+	 * recovery interval + negligible Set Address handling time). If host
+	 * sends new SETUP before SW had a chance to read the Set Address one,
+	 * the Set Address one will be overwritten without a trace.
 	 */
-	if (addr != (uint8_t)NRF_USBD->USBADDR) {
-		LOG_WRN("USB Address incorrect 0x%02x", addr);
+	udc_nrf_address = addr;
+
+	if (udc_nrf_fake_setup) {
+		struct udc_nrf_evt evt = {
+			.type = UDC_NRF_EVT_HAL,
+			.hal_evt = {
+				.type = NRF_USBD_COMMON_EVT_SETUP,
+			},
+		};
+
+		/* Finished handling lost Set Address, now handle the pending
+		 * SETUP transfer.
+		 */
+		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
 	}
 
 	return 0;

From 6df36e5c12b58eea81577081e27bfda3e6951f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Mon, 21 Oct 2024 10:54:34 +0200
Subject: [PATCH 0658/2913] [nrf fromtree] drivers: udc_dwc2: Handle IN events
 before OUT events
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

DWC2 otg OUT transfers are being used for SETUP DATA0, OUT Data Stage
packets and OUT Status Stage ZLP. On High-Speed it is possible for IN
Data Stage, OUT Status Stage ZLP and subsequent SETUP DATA0 to happen
in very quick succession, making all the three events appear at the same
time to the handler thread.

The handler thread is picking up next endpoint to handle based on the
least significant bit set. When OUT endpoints were on bits 0-15 and IN
endpoints were on bits 16-31, the least significant bit policy favored
OUT endpoints over IN endpoints. This caused problems in Completer mode
(but suprisingly not in Buffer DMA mode) that lead to incorrect control
transfer handling.

The choice between least significant bit first or most significant bit
first is arbitrary. Switching from least to most significant bit first
would have resolved the issue. It would also favor higher numbered
endpoints over lower numbered endpoints.

Swap the order of endpoints in bitmaps to have IN on bits 0-15 and OUT
on bits 16-31 to keep handling lower numbered endpoints first and
resolve the control transfer handling in Completer mode.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 94a6b8257206c2dc02828f2ca4c27e6dfdd33ef2)
(cherry picked from commit 2096dde5713e35abf0f12744dfa54f12f3d77bcd)
---
 drivers/usb/udc/udc_dwc2.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 917910ad26d..00e4a370bac 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -99,9 +99,9 @@ struct udc_dwc2_data {
 	struct k_thread thread_data;
 	/* Main events the driver thread waits for */
 	struct k_event drv_evt;
-	/* Transfer triggers (OUT on bits 0-15, IN on bits 16-31) */
+	/* Transfer triggers (IN on bits 0-15, OUT on bits 16-31) */
 	struct k_event xfer_new;
-	/* Finished transactions (OUT on bits 0-15, IN on bits 16-31) */
+	/* Finished transactions (IN on bits 0-15, OUT on bits 16-31) */
 	struct k_event xfer_finished;
 	struct dwc2_reg_backup backup;
 	uint32_t ghwcfg1;
@@ -1554,9 +1554,9 @@ static int udc_dwc2_ep_clear_halt(const struct device *dev,
 		uint32_t ep_bit;
 
 		if (USB_EP_DIR_IS_IN(cfg->addr)) {
-			ep_bit = BIT(16 + USB_EP_GET_IDX(cfg->addr));
-		} else {
 			ep_bit = BIT(USB_EP_GET_IDX(cfg->addr));
+		} else {
+			ep_bit = BIT(16 + USB_EP_GET_IDX(cfg->addr));
 		}
 
 		k_event_post(&priv->xfer_new, ep_bit);
@@ -1579,9 +1579,9 @@ static int udc_dwc2_ep_enqueue(const struct device *dev,
 		uint32_t ep_bit;
 
 		if (USB_EP_DIR_IS_IN(cfg->addr)) {
-			ep_bit = BIT(16 + USB_EP_GET_IDX(cfg->addr));
-		} else {
 			ep_bit = BIT(USB_EP_GET_IDX(cfg->addr));
+		} else {
+			ep_bit = BIT(16 + USB_EP_GET_IDX(cfg->addr));
 		}
 
 		k_event_post(&priv->xfer_new, ep_bit);
@@ -2346,7 +2346,7 @@ static inline void dwc2_handle_in_xfercompl(const struct device *dev,
 		return;
 	}
 
-	k_event_post(&priv->xfer_finished, BIT(16 + ep_idx));
+	k_event_post(&priv->xfer_finished, BIT(ep_idx));
 	k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
 }
 
@@ -2452,7 +2452,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 	    net_buf_tailroom(buf)) {
 		dwc2_prep_rx(dev, buf, ep_cfg);
 	} else {
-		k_event_post(&priv->xfer_finished, BIT(ep_idx));
+		k_event_post(&priv->xfer_finished, BIT(16 + ep_idx));
 		k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
 	}
 }
@@ -2803,9 +2803,9 @@ static uint8_t pull_next_ep_from_bitmap(uint32_t *bitmap)
 	*bitmap &= ~BIT(bit);
 
 	if (bit >= 16) {
-		return USB_EP_DIR_IN | (bit - 16);
+		return USB_EP_DIR_OUT | (bit - 16);
 	} else {
-		return USB_EP_DIR_OUT | bit;
+		return USB_EP_DIR_IN | bit;
 	}
 }
 

From 097679811ab9f39020f3822c4079c3e9f4065126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Fri, 18 Oct 2024 13:43:37 +0200
Subject: [PATCH 0659/2913] [nrf fromtree] drivers: udc_dwc2: Reduce TxFIFO0
 allocation size
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

DWC2 peripherals can have TxFIFO sizes configured to any value between
16 and 32768. The value configured during synthesis is the maximum value
the software can program. Designs that give full flexibility configure
the TxFIFO sizes to value equal to total SPRAM size.

Currently DWC2 driver does not have prior knowledge about the endpoints
used within available configurations and has to come up with TxFIFO0
value up front. The original approach was to use MAX(16, max allowed).
locations. Because DWC2 peripheral cannot have TxFIFO0 with size lower
than 16 locations, always the max allowed was used. This logic prevented
any IN endpoint other than EP0 on designs that have TxFIFO0 size set to
total SPRAM size.

Change the logic to MIN(2 * 16, max allowed) to have sufficient memory
available on flexible designs and allow simultaneous operation if
possible (i.e. when maximum TxFIFO0 size is at least 32).

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 19955f6478a2b0d540512c816e534cc2ddff6974)
(cherry picked from commit a2b2330a3c74e77655e50e3ce3e4ac6129795d8c)
---
 drivers/usb/udc/udc_dwc2.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 00e4a370bac..7e716201d3c 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -54,8 +54,11 @@ enum dwc2_drv_event_type {
  */
 #define UDC_DWC2_GRXFSIZ_HS_DEFAULT	(13 + 1 + 774)
 
-/* TX FIFO0 depth in 32-bit words (used by control IN endpoint) */
-#define UDC_DWC2_FIFO0_DEPTH		16U
+/* TX FIFO0 depth in 32-bit words (used by control IN endpoint)
+ * Try 2 * bMaxPacketSize0 to allow simultaneous operation with a fallback to
+ * whatever is available when 2 * bMaxPacketSize0 is not possible.
+ */
+#define UDC_DWC2_FIFO0_DEPTH		(2 * 16U)
 
 /* Get Data FIFO access register */
 #define UDC_DWC2_EP_FIFO(base, idx)	((mem_addr_t)base + 0x1000 * (idx + 1))
@@ -1184,7 +1187,7 @@ static int dwc2_set_dedicated_fifo(const struct device *dev,
 				  dwc2_get_txfaddr(dev, ep_idx - 2);
 		} else {
 			txfaddr = priv->rxfifo_depth +
-				MAX(UDC_DWC2_FIFO0_DEPTH, priv->max_txfifo_depth[0]);
+				MIN(UDC_DWC2_FIFO0_DEPTH, priv->max_txfifo_depth[0]);
 		}
 
 		/* Make sure to not set TxFIFO greater than hardware allows */
@@ -1939,7 +1942,7 @@ static int udc_dwc2_init_controller(const struct device *dev)
 		sys_write32(usb_dwc2_set_grxfsiz(priv->rxfifo_depth), grxfsiz_reg);
 
 		/* Set TxFIFO 0 depth */
-		val = MAX(UDC_DWC2_FIFO0_DEPTH, priv->max_txfifo_depth[0]);
+		val = MIN(UDC_DWC2_FIFO0_DEPTH, priv->max_txfifo_depth[0]);
 		gnptxfsiz = usb_dwc2_set_gnptxfsiz_nptxfdep(val) |
 			    usb_dwc2_set_gnptxfsiz_nptxfstaddr(priv->rxfifo_depth);
 

From 71743aca0eee341ce85c1f8bd1113cb027f6312f Mon Sep 17 00:00:00 2001
From: Johann Fischer <johann.fischer@nordicsemi.no>
Date: Wed, 23 Oct 2024 11:23:23 +0200
Subject: [PATCH 0660/2913] [nrf fromtree] drivers: udc_nrf: fix enqueue of
 control IN transfer with length 0

If the direction of the last setup packet is not to the device but to
the host, then the transfer is not a status stage and should be queued.
This is not checked and prevents a zero length control IN transfer to
the host, e.g. used by the DFU class to indicate the end of the upload
process.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit 973f914b90a2e204165e9e32cdf4a653acc00cd9)
(cherry picked from commit 16bcaed54230e3d86aeaf2b2f1d47393967254fd)
---
 drivers/usb/udc/udc_nrf.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/udc/udc_nrf.c b/drivers/usb/udc/udc_nrf.c
index 0a1987eb017..bf04a274ad6 100644
--- a/drivers/usb/udc/udc_nrf.c
+++ b/drivers/usb/udc/udc_nrf.c
@@ -561,7 +561,7 @@ static void udc_nrf_power_handler(nrfx_power_usb_evt_t pwr_evt)
 	}
 }
 
-static void udc_nrf_fake_status_in(const struct device *dev)
+static bool udc_nrf_fake_status_in(const struct device *dev)
 {
 	struct udc_nrf_evt evt = {
 		.type = UDC_NRF_EVT_STATUS_IN,
@@ -572,7 +572,10 @@ static void udc_nrf_fake_status_in(const struct device *dev)
 	    udc_nrf_fake_setup) {
 		/* Let controller perform status IN stage */
 		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+		return true;
 	}
+
+	return false;
 }
 
 static int udc_nrf_ep_enqueue(const struct device *dev,
@@ -587,8 +590,9 @@ static int udc_nrf_ep_enqueue(const struct device *dev,
 	udc_buf_put(cfg, buf);
 
 	if (cfg->addr == USB_CONTROL_EP_IN && buf->len == 0) {
-		udc_nrf_fake_status_in(dev);
-		return 0;
+		if (udc_nrf_fake_status_in(dev)) {
+			return 0;
+		}
 	}
 
 	k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);

From 46b124ab786c3ff7f6605889789b002e2d4c99ea Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Fri, 18 Oct 2024 13:44:41 +0200
Subject: [PATCH 0661/2913] [nrf fromtree] tests: Bluetooth: tester: Add
 nRF5340 ADK as platform

Add support for building and running the BT tester on the
nrf5340_audio_dk.

This is copying the configuration used for the nRF5340 DK.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit afb7d961d21c161cf66f85418c1f9992a1586fdd)
(cherry picked from commit 32f0c662b1c8fb763f8f606657f038d52a1d7e8f)
---
 .../nrf5340_audio_dk_nrf5340_cpuapp.conf      | 25 +++++++++++++++++++
 .../nrf5340_audio_dk_nrf5340_cpuapp.overlay   | 14 +++++++++++
 tests/bluetooth/tester/testcase.yaml          |  1 +
 3 files changed, 40 insertions(+)
 create mode 100644 tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
 create mode 100644 tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.overlay

diff --git a/tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
new file mode 100644
index 00000000000..6f723ffa160
--- /dev/null
+++ b/tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -0,0 +1,25 @@
+# CONFIG_TEST enforces minimal logging, which we don't want
+CONFIG_TEST=n
+
+CONFIG_ASSERT=y
+# Enable the option below to measure stack usage
+#CONFIG_INIT_STACKS=y
+CONFIG_THREAD_NAME=y
+CONFIG_HW_STACK_PROTECTION=y
+
+CONFIG_LOG=y
+CONFIG_LOG_BUFFER_SIZE=4096
+CONFIG_RTT_CONSOLE=y
+CONFIG_LOG_BACKEND_RTT=y
+CONFIG_LOG_BACKEND_RTT_MODE_DROP=y
+CONFIG_USE_SEGGER_RTT=y
+CONFIG_SEGGER_RTT_BUFFER_SIZE_UP=4096
+CONFIG_LOG_BACKEND_SHOW_COLOR=n
+CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1024
+
+CONFIG_LOG_DEFAULT_LEVEL=3
+CONFIG_BTTESTER_LOG_LEVEL_DBG=y
+
+CONFIG_UART_INTERRUPT_DRIVEN=y
+
+CONFIG_BT_TINYCRYPT_ECC=y
diff --git a/tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.overlay b/tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..12d45e2d0f2
--- /dev/null
+++ b/tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+/ {
+	chosen {
+		zephyr,uart-pipe = &uart0;
+	};
+};
+
+&uart0 {
+	compatible = "nordic,nrf-uarte";
+	current-speed = <115200>;
+	status = "okay";
+	hw-flow-control;
+};
diff --git a/tests/bluetooth/tester/testcase.yaml b/tests/bluetooth/tester/testcase.yaml
index 93868152f7d..25a4fcf83d0 100644
--- a/tests/bluetooth/tester/testcase.yaml
+++ b/tests/bluetooth/tester/testcase.yaml
@@ -24,6 +24,7 @@ tests:
       - native_posix
       - native_sim
       - nrf5340dk/nrf5340/cpuapp
+      - nrf5340_audio_dk/nrf5340/cpuapp
     extra_args: OVERLAY_CONFIG="overlay-le-audio.conf"
     tags: bluetooth
     harness: bluetooth

From f51aec622f26ce6e526a3cba20edee8cb11d19a3 Mon Sep 17 00:00:00 2001
From: Abderrahmane Jarmouni <git@jarmouni.me>
Date: Sat, 19 Oct 2024 00:03:30 +0200
Subject: [PATCH 0662/2913] [nrf fromtree] tests: testcase.yaml: replace
 deprecated OVERLAY_CONFIG w\ EXTRA_CONF_FILE

Replace some OVERLAY_CONFIG that were missed in a pervious PR.

Signed-off-by: Abderrahmane Jarmouni <git@jarmouni.me>
(cherry picked from commit 94b000591d1da4771d8f544234f0e608b5007f5a)
(cherry picked from commit b342a34588091e309b0ee3c3b0f99631ef72c013)
---
 tests/bluetooth/shell/testcase.yaml       | 2 +-
 tests/bluetooth/tester/testcase.yaml      | 4 ++--
 tests/bsim/bluetooth/ll/bis/testcase.yaml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/bluetooth/shell/testcase.yaml b/tests/bluetooth/shell/testcase.yaml
index cec0a9d0046..26b2ae81efb 100644
--- a/tests/bluetooth/shell/testcase.yaml
+++ b/tests/bluetooth/shell/testcase.yaml
@@ -53,7 +53,7 @@ tests:
     build_only: true
   bluetooth.shell.cdc_acm:
     extra_args:
-      - OVERLAY_CONFIG=cdc_acm.conf
+      - EXTRA_CONF_FILE=cdc_acm.conf
       - DTC_OVERLAY_FILE="usb.overlay"
     depends_on: usb_device
     platform_allow:
diff --git a/tests/bluetooth/tester/testcase.yaml b/tests/bluetooth/tester/testcase.yaml
index 25a4fcf83d0..f0f8187112d 100644
--- a/tests/bluetooth/tester/testcase.yaml
+++ b/tests/bluetooth/tester/testcase.yaml
@@ -25,7 +25,7 @@ tests:
       - native_sim
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340_audio_dk/nrf5340/cpuapp
-    extra_args: OVERLAY_CONFIG="overlay-le-audio.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-le-audio.conf"
     tags: bluetooth
     harness: bluetooth
   bluetooth.general.tester_mesh:
@@ -35,6 +35,6 @@ tests:
       - native_posix
       - native_sim
       - nrf52840dk/nrf52840
-    extra_args: OVERLAY_CONFIG="overlay-mesh.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-mesh.conf"
     tags: bluetooth
     harness: bluetooth
diff --git a/tests/bsim/bluetooth/ll/bis/testcase.yaml b/tests/bsim/bluetooth/ll/bis/testcase.yaml
index c13d68f3fb7..befc282922f 100644
--- a/tests/bsim/bluetooth/ll/bis/testcase.yaml
+++ b/tests/bsim/bluetooth/ll/bis/testcase.yaml
@@ -19,7 +19,7 @@ tests:
     harness_config:
       bsim_exe_name: tests_bsim_bluetooth_ll_bis_prj_conf
   bluetooth.ll.bis_ticker_expire_info:
-    extra_args: OVERLAY_CONFIG=overlay-ticker_expire_info.conf
+    extra_args: EXTRA_CONF_FILE=overlay-ticker_expire_info.conf
     platform_allow:
       - nrf52_bsim
       - nrf5340bsim/nrf5340/cpunet

From ce3e3b7c5dae126f6bf4d4c2066c45cea00ed952 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Wed, 6 Nov 2024 12:40:45 +0100
Subject: [PATCH 0663/2913] [nrf fromtree] tests: Bluetooth: tester: Workaround
 Bus Fault in nRF53x using full RAM

Workaround failing autopts weekly run due to tester
application having Bus Fault in the nRF53 NET core hci_ipc
firmware at startup.

Having atleast 32 bytes free in nRF53x hci_ipc sample to
avoid Bus Fault when Zephyr Kernel does SYSINIT calls.

Reduce supported ISO Broadcaster instance and ISO TX buffer
counts in the Controller hci_ipc firmware.

Add sysbuild support for tester application so that the
build is CI verified.

sysbuild commandline for LE audio PTS testing:

  # west build --sysbuild -b nrf5340_audio_dk/nrf5340/cpuapp
    -d build/tester tests/bluetooth/tester
    -DEXTRA_CONF_FILE="overlay-le-audio.conf"

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 525ba389bc8255125dbd56b803c8ae3ce7f71281)
(cherry picked from commit 89bffb3f6d621f7217da8f68e5a31bbb39911800)
---
 tests/bluetooth/tester/Kconfig.sysbuild       | 14 +++++++++
 .../tester/nrf5340_hci_ipc_cpunet.conf        | 10 +++++--
 tests/bluetooth/tester/sysbuild.cmake         | 29 +++++++++++++++++++
 tests/bluetooth/tester/testcase.yaml          |  7 ++++-
 4 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 tests/bluetooth/tester/Kconfig.sysbuild
 create mode 100644 tests/bluetooth/tester/sysbuild.cmake

diff --git a/tests/bluetooth/tester/Kconfig.sysbuild b/tests/bluetooth/tester/Kconfig.sysbuild
new file mode 100644
index 00000000000..5256fa48d88
--- /dev/null
+++ b/tests/bluetooth/tester/Kconfig.sysbuild
@@ -0,0 +1,14 @@
+# Copyright 2023-2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+source "share/sysbuild/Kconfig"
+
+config NET_CORE_BOARD
+	string
+	default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk"
+	default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk"
+
+config NET_CORE_IMAGE_HCI_IPC
+	bool "HCI IPC image on network core"
+	default y
+	depends on NET_CORE_BOARD != ""
diff --git a/tests/bluetooth/tester/nrf5340_hci_ipc_cpunet.conf b/tests/bluetooth/tester/nrf5340_hci_ipc_cpunet.conf
index 91f6566f208..c224508d51a 100644
--- a/tests/bluetooth/tester/nrf5340_hci_ipc_cpunet.conf
+++ b/tests/bluetooth/tester/nrf5340_hci_ipc_cpunet.conf
@@ -1,5 +1,11 @@
 # Apply this overlay at hci_ipc controller build
-CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
+
+# Changes towards reduced RAM usage, in order to fit the tweaks
+CONFIG_HEAP_MEM_POOL_SIZE=7168
+
+# PTS required counts
+CONFIG_BT_MAX_CONN=3
+
+# PTS tests specific tweaks
 CONFIG_BT_CTLR_PERIPHERAL_ISO_EARLY_CIG_START=y
 CONFIG_BT_CTLR_ISOAL_PSN_IGNORE=y
-CONFIG_BT_MAX_CONN=3
diff --git a/tests/bluetooth/tester/sysbuild.cmake b/tests/bluetooth/tester/sysbuild.cmake
new file mode 100644
index 00000000000..605d7ab74da
--- /dev/null
+++ b/tests/bluetooth/tester/sysbuild.cmake
@@ -0,0 +1,29 @@
+# Copyright (c) 2023-2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
+	# For builds in the nrf5340, we build the netcore image with the controller
+
+	set(NET_APP hci_ipc)
+	set(NET_APP_SRC_DIR ${ZEPHYR_BASE}/samples/bluetooth/${NET_APP})
+
+	ExternalZephyrProject_Add(
+		APPLICATION ${NET_APP}
+		SOURCE_DIR  ${NET_APP_SRC_DIR}
+		BOARD       ${SB_CONFIG_NET_CORE_BOARD}
+	)
+
+	set(${NET_APP}_CONF_FILE
+	 ${NET_APP_SRC_DIR}/nrf5340_cpunet_iso-bt_ll_sw_split.conf
+	 CACHE INTERNAL ""
+	)
+
+	set(${NET_APP}_EXTRA_CONF_FILE
+	 ${APP_DIR}/nrf5340_hci_ipc_cpunet.conf
+	 CACHE INTERNAL ""
+	)
+
+	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
+endif()
+
+native_simulator_set_final_executable(${DEFAULT_IMAGE})
diff --git a/tests/bluetooth/tester/testcase.yaml b/tests/bluetooth/tester/testcase.yaml
index f0f8187112d..d58a878bf3c 100644
--- a/tests/bluetooth/tester/testcase.yaml
+++ b/tests/bluetooth/tester/testcase.yaml
@@ -25,9 +25,14 @@ tests:
       - native_sim
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340_audio_dk/nrf5340/cpuapp
-    extra_args: EXTRA_CONF_FILE="overlay-le-audio.conf"
+    integration_platforms:
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf5340_audio_dk/nrf5340/cpuapp
+    extra_args:
+      - EXTRA_CONF_FILE="overlay-le-audio.conf"
     tags: bluetooth
     harness: bluetooth
+    sysbuild: true
   bluetooth.general.tester_mesh:
     build_only: true
     platform_allow:

From a7c968ab77b97a1480a80e6baa31a29a6abc0f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ayt=C3=BCrk=20D=C3=BCzen?= <ayturk.duzen@nordicsemi.no>
Date: Wed, 20 Nov 2024 13:06:23 +0100
Subject: [PATCH 0664/2913] [nrf noup] tests: bluetooth: tester: sysbuild
 configurable 53/54H
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add support for sysbuild 54h20 building
added nrf54h20 cpurad configuration to hci_ipc sample.

Signed-off-by: Aytürk Düzen <ayturk.duzen@nordicsemi.no>
Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 21bb19c5d49c75c5062cee97d50348d7a6612f11)
---
 .../nrf54h20_cpurad-bt_ll_softdevice.conf     | 33 +++++++++++++++++++
 tests/bluetooth/tester/Kconfig.sysbuild       |  1 +
 tests/bluetooth/tester/sysbuild.cmake         | 23 +++++++++----
 3 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 samples/bluetooth/hci_ipc/nrf54h20_cpurad-bt_ll_softdevice.conf

diff --git a/samples/bluetooth/hci_ipc/nrf54h20_cpurad-bt_ll_softdevice.conf b/samples/bluetooth/hci_ipc/nrf54h20_cpurad-bt_ll_softdevice.conf
new file mode 100644
index 00000000000..1f7748e5cd7
--- /dev/null
+++ b/samples/bluetooth/hci_ipc/nrf54h20_cpurad-bt_ll_softdevice.conf
@@ -0,0 +1,33 @@
+CONFIG_IPC_SERVICE=y
+CONFIG_MBOX=y
+
+CONFIG_ISR_STACK_SIZE=1024
+CONFIG_IDLE_STACK_SIZE=256
+CONFIG_MAIN_STACK_SIZE=512
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512
+CONFIG_HEAP_MEM_POOL_SIZE=8192
+
+CONFIG_BT=y
+CONFIG_BT_HCI_RAW=y
+
+CONFIG_BT_BUF_EVT_RX_COUNT=16
+CONFIG_BT_BUF_EVT_RX_SIZE=255
+CONFIG_BT_BUF_ACL_RX_SIZE=255
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+CONFIG_BT_BUF_CMD_TX_SIZE=255
+
+# Host
+CONFIG_BT_BROADCASTER=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_OBSERVER=y
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_EXT_ADV=y
+CONFIG_BT_PER_ADV=y
+CONFIG_BT_PER_ADV_SYNC=y
+
+# Controller
+CONFIG_BT_LL_SW_SPLIT=n
+CONFIG_BT_LL_SOFTDEVICE=y
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
+CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191
diff --git a/tests/bluetooth/tester/Kconfig.sysbuild b/tests/bluetooth/tester/Kconfig.sysbuild
index 5256fa48d88..6d3a155c660 100644
--- a/tests/bluetooth/tester/Kconfig.sysbuild
+++ b/tests/bluetooth/tester/Kconfig.sysbuild
@@ -5,6 +5,7 @@ source "share/sysbuild/Kconfig"
 
 config NET_CORE_BOARD
 	string
+	default "nrf54h20dk/nrf54h20/cpurad" if "$(BOARD)" = "nrf54h20dk"
 	default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk"
 	default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk"
 
diff --git a/tests/bluetooth/tester/sysbuild.cmake b/tests/bluetooth/tester/sysbuild.cmake
index 605d7ab74da..31d50a8cec3 100644
--- a/tests/bluetooth/tester/sysbuild.cmake
+++ b/tests/bluetooth/tester/sysbuild.cmake
@@ -2,8 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
-	# For builds in the nrf5340, we build the netcore image with the controller
-
 	set(NET_APP hci_ipc)
 	set(NET_APP_SRC_DIR ${ZEPHYR_BASE}/samples/bluetooth/${NET_APP})
 
@@ -13,10 +11,23 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 		BOARD       ${SB_CONFIG_NET_CORE_BOARD}
 	)
 
-	set(${NET_APP}_CONF_FILE
-	 ${NET_APP_SRC_DIR}/nrf5340_cpunet_iso-bt_ll_sw_split.conf
-	 CACHE INTERNAL ""
-	)
+	if(SB_CONFIG_SOC_NRF5340_CPUAPP)
+		set(${NET_APP}_CONF_FILE
+		${NET_APP_SRC_DIR}/nrf5340_cpunet_iso-bt_ll_sw_split.conf
+		CACHE INTERNAL ""
+		)
+		set(${NET_APP}_SNIPPET
+		"bt-ll-sw-split"
+		CACHE INTERNAL ""
+		)
+	endif()
+
+	if(SB_CONFIG_SOC_NRF54H20_CPUAPP)
+		set(${NET_APP}_CONF_FILE
+		${NET_APP_SRC_DIR}/nrf54h20_cpurad-bt_ll_softdevice.conf
+		CACHE INTERNAL ""
+		)
+	endif()
 
 	set(${NET_APP}_EXTRA_CONF_FILE
 	 ${APP_DIR}/nrf5340_hci_ipc_cpunet.conf

From 79fa53e6d022384dfe1805219945ea78418e5e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ayt=C3=BCrk=20D=C3=BCzen?= <ayturk.duzen@nordicsemi.no>
Date: Fri, 22 Nov 2024 10:53:50 +0100
Subject: [PATCH 0665/2913] [nrf fromlist] tests: bluetooth: tester: make
 hci_ipc confs generic for multi-core
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

nrf5340_hci_ipc.conf and nrf5340_hci_ipc_cpunet.conf were board specific
rename them for generic multi-core board support

Upstream PR #: 81755

Signed-off-by: Aytürk Düzen <ayturk.duzen@nordicsemi.no>
(cherry picked from commit 84477d9e44b1b6ac46bbd6aa5ced2aa7f228714b)
---
 tests/bluetooth/tester/{nrf5340_hci_ipc.conf => hci_ipc.conf}   | 0
 .../tester/{nrf5340_hci_ipc_cpunet.conf => hci_ipc_cpunet.conf} | 0
 tests/bluetooth/tester/sysbuild.cmake                           | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename tests/bluetooth/tester/{nrf5340_hci_ipc.conf => hci_ipc.conf} (100%)
 rename tests/bluetooth/tester/{nrf5340_hci_ipc_cpunet.conf => hci_ipc_cpunet.conf} (100%)

diff --git a/tests/bluetooth/tester/nrf5340_hci_ipc.conf b/tests/bluetooth/tester/hci_ipc.conf
similarity index 100%
rename from tests/bluetooth/tester/nrf5340_hci_ipc.conf
rename to tests/bluetooth/tester/hci_ipc.conf
diff --git a/tests/bluetooth/tester/nrf5340_hci_ipc_cpunet.conf b/tests/bluetooth/tester/hci_ipc_cpunet.conf
similarity index 100%
rename from tests/bluetooth/tester/nrf5340_hci_ipc_cpunet.conf
rename to tests/bluetooth/tester/hci_ipc_cpunet.conf
diff --git a/tests/bluetooth/tester/sysbuild.cmake b/tests/bluetooth/tester/sysbuild.cmake
index 31d50a8cec3..e2fc2ed0de8 100644
--- a/tests/bluetooth/tester/sysbuild.cmake
+++ b/tests/bluetooth/tester/sysbuild.cmake
@@ -30,7 +30,7 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	endif()
 
 	set(${NET_APP}_EXTRA_CONF_FILE
-	 ${APP_DIR}/nrf5340_hci_ipc_cpunet.conf
+	 ${APP_DIR}/hci_ipc_cpunet.conf
 	 CACHE INTERNAL ""
 	)
 

From 70bff191c4d64eb5d5be2bc80a371591639ae2e1 Mon Sep 17 00:00:00 2001
From: Lingao Meng <menglingao@xiaomi.com>
Date: Tue, 24 Sep 2024 14:41:44 +0800
Subject: [PATCH 0666/2913] [nrf fromtree] Bluetooth: Mesh: Introduce separate
 workq for ADV EXT

this PR is to make the host always send packets.

Signed-off-by: Lingao Meng <menglingao@xiaomi.com>
(cherry picked from commit b9fbfc9a23167ed3c490d02ef91360195a7c40ec)
Signed-off-by: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
(cherry picked from commit 2f9a65d3edef935fe86bd339a2466ffe2b5e1388)
---
 doc/releases/release-notes-4.0.rst            |  5 ++
 subsys/bluetooth/mesh/Kconfig                 | 58 +++++++++++++++++++
 subsys/bluetooth/mesh/adv.h                   |  2 +
 subsys/bluetooth/mesh/adv_ext.c               | 39 +++++++++++--
 subsys/bluetooth/mesh/adv_legacy.c            |  5 ++
 subsys/bluetooth/mesh/proxy_msg.c             | 49 +++++++++++++++-
 subsys/bluetooth/mesh/proxy_msg.h             |  3 +
 subsys/bluetooth/mesh/proxy_srv.c             |  2 +-
 tests/bsim/bluetooth/mesh/compile.sh          |  5 +-
 .../bluetooth/mesh/overlay_workq_sys.conf     |  1 +
 tests/bsim/bluetooth/mesh/src/test_suspend.c  |  3 +
 .../mesh/tests_scripts/advertiser/disable.sh  |  3 +
 .../tests_scripts/advertiser/proxy_mixin.sh   |  3 +
 .../tests_scripts/advertiser/random_order.sh  |  3 +
 .../tests_scripts/advertiser/reverse_order.sh |  3 +
 .../tests_scripts/advertiser/send_order.sh    |  3 +
 .../tests_scripts/advertiser/tx_cb_multi.sh   |  3 +
 .../tests_scripts/advertiser/tx_cb_single.sh  |  3 +
 .../tests_scripts/proxy_sol/sol_replay.sh     | 12 ++++
 19 files changed, 197 insertions(+), 8 deletions(-)
 create mode 100644 tests/bsim/bluetooth/mesh/overlay_workq_sys.conf

diff --git a/doc/releases/release-notes-4.0.rst b/doc/releases/release-notes-4.0.rst
index 76eaa3ac62f..44527737e3b 100644
--- a/doc/releases/release-notes-4.0.rst
+++ b/doc/releases/release-notes-4.0.rst
@@ -107,6 +107,11 @@ Bluetooth
 
 * HCI Drivers
 
+* Mesh
+
+  * Introduced a mesh-specific workqueue to increase reliability of the mesh messages
+    transmission. To get the old behavior enable :kconfig:option:`CONFIG_BT_MESH_WORKQ_SYS`.
+
 Boards & SoC Support
 ********************
 
diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 3c362ce2641..ecbe1a7305b 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -107,6 +107,64 @@ menuconfig BT_MESH_ADV_EXT
 
 if BT_MESH_ADV_EXT
 
+choice BT_MESH_WORKQ_CONTEXT
+	prompt "Advertising thread selection"
+	default BT_MESH_WORKQ_MESH
+	help
+	  Defines a context for mesh messages transmission.
+
+config BT_MESH_WORKQ_MESH
+	bool "Mesh-specific workqueue"
+	help
+	  When this option is selected, the mesh sends messages from the
+	  mesh-specific workqueue. This will ensure that messages are always sent.
+	  The application needs to ensure the mesh-specific workqueue size is large
+	  enough. Refer to BT_MESH_ADV_STACK_SIZE for the recommended minimum.
+
+config BT_MESH_WORKQ_SYS
+	bool "System workqueue"
+	help
+	  When this option is selected, the mesh sends messages from
+	  the system work queue. The application needs to ensure the system
+	  workqueue stack size (SYSTEM_WORKQUEUE_STACK_SIZE) is large enough,
+	  refer to BT_MESH_ADV_STACK_SIZE for the recommended minimum.
+
+	  When this option is enabled and the mesh tries to send a message,
+	  and the host ran out the HCI command buffers controlled by
+	  CONFIG_BT_BUF_CMD_TX_COUNT, the host returns -ENOBUFS immediately
+	  and the mesh drops the message transmission. To mitigate this
+	  issue, make sure to have sufficient number of HCI command buffers.
+	  When this option is enabled, the latency of sending mesh messages
+	  will be affected by other users on the system work queue, resulting in
+	  reduced reliability for sending mesh messages.
+
+endchoice
+
+if BT_MESH_WORKQ_MESH
+
+config BT_MESH_ADV_STACK_SIZE
+	int "Mesh extended advertiser thread stack size"
+	default 1536 if BT_MESH_PROXY
+	default 1024 if BT_HOST_CRYPTO
+	default 776 if BT_MESH_PRIV_BEACONS
+	default 768
+	help
+	  Size of bt mesh adv thread stack.
+
+	  NOTE: This is an advanced setting and should not be changed unless
+	  absolutely necessary
+
+config BT_MESH_ADV_PRIO
+	int "Mesh advertiser thread priority"
+	default 7
+	help
+	  Priority of bt mesh adv thread.
+
+	  NOTE: This is an advanced setting and should not be changed unless
+	  absolutely necessary
+
+endif # BT_MESH_WORKQ_MESH
+
 config BT_MESH_RELAY_ADV_SETS
 	int "Maximum of simultaneous relay message support"
 	default 0
diff --git a/subsys/bluetooth/mesh/adv.h b/subsys/bluetooth/mesh/adv.h
index cbe4f6e9adb..563a2118b71 100644
--- a/subsys/bluetooth/mesh/adv.h
+++ b/subsys/bluetooth/mesh/adv.h
@@ -123,4 +123,6 @@ int bt_mesh_scan_active_set(bool active);
 int bt_mesh_adv_bt_data_send(uint8_t num_events, uint16_t adv_interval,
 			     const struct bt_data *ad, size_t ad_len);
 
+int bt_mesh_wq_submit(struct k_work *work);
+
 #endif /* ZEPHYR_SUBSYS_BLUETOOTH_MESH_ADV_H_ */
diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index 0dcdab9adf8..0ee63079ea5 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -36,6 +36,14 @@ LOG_MODULE_REGISTER(bt_mesh_adv_ext);
 #define CONFIG_BT_MESH_RELAY_ADV_SETS 0
 #endif
 
+#ifdef CONFIG_BT_MESH_ADV_STACK_SIZE
+#define MESH_WORKQ_PRIORITY   CONFIG_BT_MESH_ADV_PRIO
+#define MESH_WORKQ_STACK_SIZE CONFIG_BT_MESH_ADV_STACK_SIZE
+#else
+#define MESH_WORKQ_PRIORITY   0
+#define MESH_WORKQ_STACK_SIZE 0
+#endif
+
 enum {
 	/** Controller is currently advertising */
 	ADV_FLAG_ACTIVE,
@@ -72,6 +80,15 @@ struct bt_mesh_ext_adv {
 static void send_pending_adv(struct k_work *work);
 static bool schedule_send(struct bt_mesh_ext_adv *ext_adv);
 
+static struct k_work_q bt_mesh_workq;
+static K_KERNEL_STACK_DEFINE(thread_stack, MESH_WORKQ_STACK_SIZE);
+
+#if defined(CONFIG_BT_MESH_WORKQ_MESH)
+#define MESH_WORKQ &bt_mesh_workq
+#else /* CONFIG_BT_MESH_WORKQ_SYS */
+#define MESH_WORKQ &k_sys_work_q
+#endif /* CONFIG_BT_MESH_WORKQ_MESH */
+
 static struct bt_mesh_ext_adv advs[] = {
 	[0] = {
 		.tags = (
@@ -283,7 +300,7 @@ static bool schedule_send_with_mask(struct bt_mesh_ext_adv *ext_adv, int ignore_
 	}
 
 	atomic_clear_bit(ext_adv->flags, ADV_FLAG_SCHEDULE_PENDING);
-	k_work_submit(&ext_adv->work);
+	bt_mesh_wq_submit(&ext_adv->work);
 
 	return true;
 }
@@ -432,7 +449,7 @@ int bt_mesh_adv_terminate(struct bt_mesh_adv *adv)
 
 		atomic_set_bit(ext_adv->flags, ADV_FLAG_SENT);
 
-		k_work_submit(&ext_adv->work);
+		bt_mesh_wq_submit(&ext_adv->work);
 
 		return 0;
 	}
@@ -454,6 +471,13 @@ void bt_mesh_adv_init(void)
 	for (int i = 0; i < ARRAY_SIZE(advs); i++) {
 		(void)memcpy(&advs[i].adv_param, &adv_param, sizeof(adv_param));
 	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_WORKQ_MESH)) {
+		k_work_queue_init(&bt_mesh_workq);
+		k_work_queue_start(&bt_mesh_workq, thread_stack, MESH_WORKQ_STACK_SIZE,
+				   K_PRIO_COOP(MESH_WORKQ_PRIORITY), NULL);
+		k_thread_name_set(&bt_mesh_workq.thread, "BT MESH WQ");
+	}
 }
 
 static struct bt_mesh_ext_adv *adv_instance_find(struct bt_le_ext_adv *instance)
@@ -483,7 +507,7 @@ static void adv_sent(struct bt_le_ext_adv *instance,
 
 	atomic_set_bit(ext_adv->flags, ADV_FLAG_SENT);
 
-	k_work_submit(&ext_adv->work);
+	bt_mesh_wq_submit(&ext_adv->work);
 }
 
 #if defined(CONFIG_BT_MESH_GATT_SERVER)
@@ -537,13 +561,13 @@ int bt_mesh_adv_enable(void)
 
 int bt_mesh_adv_disable(void)
 {
-	int err;
 	struct k_work_sync sync;
+	int err;
 
 	for (int i = 0; i < ARRAY_SIZE(advs); i++) {
 		atomic_set_bit(advs[i].flags, ADV_FLAG_SUSPENDING);
 
-		if (k_current_get() != &k_sys_work_q.thread ||
+		if (k_current_get() != k_work_queue_thread_get(MESH_WORKQ) ||
 		    (k_work_busy_get(&advs[i].work) & K_WORK_RUNNING) == 0) {
 			k_work_flush(&advs[i].work, &sync);
 		}
@@ -596,3 +620,8 @@ int bt_mesh_adv_bt_data_send(uint8_t num_events, uint16_t adv_interval,
 {
 	return bt_data_send(advs, num_events, adv_interval, ad, ad_len);
 }
+
+int bt_mesh_wq_submit(struct k_work *work)
+{
+	return k_work_submit_to_queue(MESH_WORKQ, work);
+}
diff --git a/subsys/bluetooth/mesh/adv_legacy.c b/subsys/bluetooth/mesh/adv_legacy.c
index c79a118cf15..8b14055bd75 100644
--- a/subsys/bluetooth/mesh/adv_legacy.c
+++ b/subsys/bluetooth/mesh/adv_legacy.c
@@ -258,3 +258,8 @@ int bt_mesh_adv_gatt_start(const struct bt_le_adv_param *param, int32_t duration
 	adv_timeout = duration;
 	return bt_le_adv_start(param, ad, ad_len, sd, sd_len);
 }
+
+int bt_mesh_wq_submit(struct k_work *work)
+{
+	return k_work_submit(work);
+}
diff --git a/subsys/bluetooth/mesh/proxy_msg.c b/subsys/bluetooth/mesh/proxy_msg.c
index e2818f8634b..861935f58cc 100644
--- a/subsys/bluetooth/mesh/proxy_msg.c
+++ b/subsys/bluetooth/mesh/proxy_msg.c
@@ -64,6 +64,15 @@ static void proxy_sar_timeout(struct k_work *work)
 	LOG_WRN("Proxy SAR timeout");
 
 	role = CONTAINER_OF(dwork, struct bt_mesh_proxy_role, sar_timer);
+
+	while (!k_fifo_is_empty(&role->pending)) {
+		struct bt_mesh_adv *adv = k_fifo_get(&role->pending, K_NO_WAIT);
+
+		__ASSERT_NO_MSG(adv);
+
+		bt_mesh_adv_unref(adv);
+	}
+
 	if (role->conn) {
 		bt_conn_disconnect(role->conn,
 				   BT_HCI_ERR_REMOTE_USER_TERM_CONN);
@@ -200,7 +209,7 @@ static void buf_send_end(struct bt_conn *conn, void *user_data)
 	bt_mesh_adv_unref(adv);
 }
 
-int bt_mesh_proxy_relay_send(struct bt_conn *conn, struct bt_mesh_adv *adv)
+static int proxy_relay_send(struct bt_conn *conn, struct bt_mesh_adv *adv)
 {
 	int err;
 
@@ -230,6 +239,41 @@ int bt_mesh_proxy_relay_send(struct bt_conn *conn, struct bt_mesh_adv *adv)
 	return err;
 }
 
+int bt_mesh_proxy_relay_send(struct bt_conn *conn, struct bt_mesh_adv *adv)
+{
+	struct bt_mesh_proxy_role *role = &roles[bt_conn_index(conn)];
+
+	k_fifo_put(&role->pending, bt_mesh_adv_ref(adv));
+
+	bt_mesh_wq_submit(&role->work);
+
+	return 0;
+}
+
+static void proxy_msg_send_pending(struct k_work *work)
+{
+	struct bt_mesh_proxy_role *role;
+	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
+	struct bt_mesh_adv *adv;
+
+	role = CONTAINER_OF(dwork, struct bt_mesh_proxy_role, sar_timer);
+	if (!role->conn) {
+		return;
+	}
+
+	adv = k_fifo_get(&role->pending, K_NO_WAIT);
+	if (!adv) {
+		return;
+	}
+
+	(void)proxy_relay_send(role->conn, adv);
+	bt_mesh_adv_unref(adv);
+
+	if (!k_fifo_is_empty(&role->pending)) {
+		bt_mesh_wq_submit(&role->work);
+	}
+}
+
 static void proxy_msg_init(struct bt_mesh_proxy_role *role)
 {
 	/* Check if buf has been allocated, in this way, we no longer need
@@ -247,6 +291,9 @@ static void proxy_msg_init(struct bt_mesh_proxy_role *role)
 
 	net_buf_simple_reset(&role->buf);
 
+	k_fifo_init(&role->pending);
+	k_work_init(&role->work, proxy_msg_send_pending);
+
 	k_work_init_delayable(&role->sar_timer, proxy_sar_timeout);
 }
 
diff --git a/subsys/bluetooth/mesh/proxy_msg.h b/subsys/bluetooth/mesh/proxy_msg.h
index 7ad4be7ae5d..99564b71693 100644
--- a/subsys/bluetooth/mesh/proxy_msg.h
+++ b/subsys/bluetooth/mesh/proxy_msg.h
@@ -37,6 +37,9 @@ struct bt_mesh_proxy_role {
 	struct bt_conn *conn;
 	uint8_t msg_type;
 
+	struct k_fifo pending;
+	struct k_work work;
+
 	struct {
 		proxy_send_cb_t send;
 		proxy_recv_cb_t recv;
diff --git a/subsys/bluetooth/mesh/proxy_srv.c b/subsys/bluetooth/mesh/proxy_srv.c
index c3b33035a3f..32e865773b3 100644
--- a/subsys/bluetooth/mesh/proxy_srv.c
+++ b/subsys/bluetooth/mesh/proxy_srv.c
@@ -917,7 +917,7 @@ static ssize_t proxy_ccc_write(struct bt_conn *conn,
 	client = find_client(conn);
 	if (client->filter_type == NONE) {
 		client->filter_type = ACCEPT;
-		k_work_submit(&client->send_beacons);
+		bt_mesh_wq_submit(&client->send_beacons);
 	}
 
 	return sizeof(value);
diff --git a/tests/bsim/bluetooth/mesh/compile.sh b/tests/bsim/bluetooth/mesh/compile.sh
index aa86e6ccb25..05c51f7bfe1 100755
--- a/tests/bsim/bluetooth/mesh/compile.sh
+++ b/tests/bsim/bluetooth/mesh/compile.sh
@@ -15,12 +15,15 @@ app=tests/bsim/bluetooth/mesh conf_overlay=overlay_pst.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_gatt.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_low_lat.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_psa.conf compile
+app=tests/bsim/bluetooth/mesh conf_overlay=overlay_workq_sys.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_pst.conf;overlay_psa.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_gatt.conf;overlay_psa.conf" compile
+app=tests/bsim/bluetooth/mesh conf_overlay="overlay_gatt.conf;overlay_workq_sys.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_low_lat.conf;overlay_psa.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_gatt.conf;overlay_low_lat.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_pst.conf;overlay_gatt.conf" compile
 app=tests/bsim/bluetooth/mesh \
   conf_overlay="overlay_pst.conf;overlay_gatt.conf;overlay_psa.conf" compile
-
+app=tests/bsim/bluetooth/mesh \
+  conf_overlay="overlay_pst.conf;overlay_gatt.conf;overlay_workq_sys.conf" compile
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/mesh/overlay_workq_sys.conf b/tests/bsim/bluetooth/mesh/overlay_workq_sys.conf
new file mode 100644
index 00000000000..b4ee51bf8d5
--- /dev/null
+++ b/tests/bsim/bluetooth/mesh/overlay_workq_sys.conf
@@ -0,0 +1 @@
+CONFIG_BT_MESH_WORKQ_SYS=y
diff --git a/tests/bsim/bluetooth/mesh/src/test_suspend.c b/tests/bsim/bluetooth/mesh/src/test_suspend.c
index 5ec6a8dc685..ada25b0a22f 100644
--- a/tests/bsim/bluetooth/mesh/src/test_suspend.c
+++ b/tests/bsim/bluetooth/mesh/src/test_suspend.c
@@ -295,6 +295,9 @@ static void dut_pub_common(bool disable_bt)
 		ASSERT_OK_MSG(k_sem_take(&publish_sem, K_SECONDS(30)), "Pub timed out");
 	}
 
+	/* Allow publishing to finish before suspending. */
+	k_sleep(K_MSEC(100));
+
 	ASSERT_OK_MSG(bt_mesh_suspend(), "Failed to suspend Mesh.");
 
 	if (disable_bt) {
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/disable.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/disable.sh
index 50d2a53a16d..d0288a3964b 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/disable.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/disable.sh
@@ -36,3 +36,6 @@ RunTest mesh_adv_disable adv_tx_disable adv_rx_disable
 # Low latency overlay uses legacy advertiser
 overlay=overlay_low_lat_conf
 RunTest mesh_adv_disable adv_tx_disable adv_rx_disable
+
+overlay=overlay_workq_sys_conf
+RunTest mesh_adv_disable_workq adv_tx_disable adv_rx_disable
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh
index 6c49d03fe9f..fb6af48f651 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh
@@ -21,5 +21,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 overlay=overlay_gatt_conf
 RunTest mesh_adv_proxy_mixin adv_tx_proxy_mixin adv_rx_proxy_mixin
 
+overlay=overlay_gatt_conf_overlay_workq_sys_conf
+RunTest mesh_adv_proxy_mixin_workq adv_tx_proxy_mixin adv_rx_proxy_mixin
+
 overlay="overlay_gatt_conf_overlay_psa_conf"
 RunTest mesh_adv_proxy_mixin_psa adv_tx_proxy_mixin adv_rx_proxy_mixin
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh
index a171ffd60f3..5808d2cd508 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh
@@ -7,5 +7,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # test buffer management by filling buffers and sending them in random order.
 RunTest mesh_adv_random_order adv_tx_random_order adv_rx_random_order
 
+overlay=overlay_workq_sys_conf
+RunTest mesh_adv_random_order_workq adv_tx_random_order adv_rx_random_order
+
 overlay=overlay_psa_conf
 RunTest mesh_adv_random_order_psa adv_tx_random_order adv_rx_random_order
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh
index 2b047138109..1428833a35b 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh
@@ -7,5 +7,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # test buffer management by filling all the buffer and sending them in reversed order.
 RunTest mesh_adv_reverse_order adv_tx_reverse_order adv_rx_receive_order
 
+overlay=overlay_workq_sys_conf
+RunTest mesh_adv_reverse_order_workq adv_tx_reverse_order adv_rx_receive_order
+
 overlay=overlay_psa_conf
 RunTest mesh_adv_reverse_order_psa adv_tx_reverse_order adv_rx_receive_order
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh
index a9e8d1ea861..5122d7fdf05 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh
@@ -7,5 +7,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # test buffer management by filling all the buffer and sending them all in order.
 RunTest mesh_adv_send_order adv_tx_send_order adv_rx_receive_order
 
+overlay=overlay_workq_sys_conf
+RunTest mesh_adv_send_order_workq adv_tx_send_order adv_rx_receive_order
+
 overlay=overlay_psa_conf
 RunTest mesh_adv_send_order_psa adv_tx_send_order adv_rx_receive_order
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh
index 4ca2838ddf9..a7e3ec95437 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh
@@ -7,5 +7,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # test tx callbacks sequence for multiple advs
 RunTest mesh_adv_tx_cb_multi adv_tx_cb_multi
 
+overlay=overlay_workq_sys_conf
+RunTest mesh_adv_tx_cb_multi_workq adv_tx_cb_multi
+
 overlay=overlay_psa_conf
 RunTest mesh_adv_tx_cb_multi_psa adv_tx_cb_multi
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh
index a2b1ad0e961..48d81a60136 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh
@@ -7,5 +7,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # test tx callbacks parameters and xmit sequence for single adv
 RunTest mesh_adv_tx_cb_single adv_tx_cb_single adv_rx_xmit
 
+overlay=overlay_workq_sys_conf
+RunTest mesh_adv_tx_cb_single_workq adv_tx_cb_single adv_rx_xmit
+
 overlay=overlay_psa_conf
 RunTest mesh_adv_tx_cb_single_psa adv_tx_cb_single adv_rx_xmit
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/proxy_sol/sol_replay.sh b/tests/bsim/bluetooth/mesh/tests_scripts/proxy_sol/sol_replay.sh
index c3da4435eb1..02f7c933254 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/proxy_sol/sol_replay.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/proxy_sol/sol_replay.sh
@@ -32,6 +32,18 @@ RunTest mesh_srpl_replay_attack \
 	proxy_sol_iut_power_replay_attack \
 	-flash=../results/mesh_srpl_replay_attack/flash.bin -flash_rm
 
+overlay="overlay_pst_conf_overlay_gatt_conf_overlay_workq_sys_conf"
+RunTest mesh_srpl_replay_attack_workq \
+	proxy_sol_tester_immediate_replay_attack \
+	proxy_sol_iut_immediate_replay_attack \
+	-flash=../results/mesh_srpl_replay_attack/flash.bin -flash_erase
+
+overlay="overlay_pst_conf_overlay_gatt_conf_overlay_workq_sys_conf"
+RunTest mesh_srpl_replay_attack_workq \
+	proxy_sol_tester_power_replay_attack \
+	proxy_sol_iut_power_replay_attack \
+	-flash=../results/mesh_srpl_replay_attack/flash.bin -flash_rm
+
 overlay="overlay_pst_conf_overlay_gatt_conf_overlay_psa_conf"
 RunTest mesh_srpl_replay_attack_psa \
 	proxy_sol_tester_immediate_replay_attack \

From f2772ab39ad889d5a0133364436e172ee6eb52b8 Mon Sep 17 00:00:00 2001
From: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
Date: Tue, 21 May 2024 13:59:58 +0200
Subject: [PATCH 0667/2913] [nrf noup] Bluetooth: Mesh: Disable processing of
 ext ADV packets

Disable processing of extended ADV packets by mesh scanner.
This is done to prevent loss of scan time due to reception
of pointer packets while scanning for mesh packets.

Signed-off-by: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
(cherry picked from commit 378c13f60496d0b61630a444fdc27af5e26d69f2)
Signed-off-by: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
(cherry picked from commit f4cb3034fc6db139d2917b2f0fff2946ac034e90)
---
 subsys/bluetooth/mesh/Kconfig   | 11 +++++++++++
 subsys/bluetooth/mesh/adv_ext.c | 12 ++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index ecbe1a7305b..5232ed081d6 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -210,6 +210,17 @@ config BT_MESH_ADV_EXT_FRIEND_SEPARATE
 	  messages as close to the start of the ReceiveWindow as possible,
 	  thus reducing the scanning time on the Low Power node.
 
+config BT_MESH_ADV_EXT_ACCEPT_EXT_ADV_PACKETS
+	bool "Reject or accept extended advertising packets"
+	depends on BT_LL_SOFTDEVICE
+	help
+	  Configure the scanner and initiator to either reject or accept extended
+	  advertising packets by the SoftDevice Controller. This is set to false
+	  by default, to prevent loss of scan time when receiving a pointer packet
+	  while scanning for Bluetooth Mesh packets. Set to true if extended
+	  advertising packets are to be received by the SoftDevice Controller for
+	  purposes other than Bluetooth Mesh.
+
 endif # BT_MESH_ADV_EXT
 
 endchoice
diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index 0ee63079ea5..519485c3135 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -478,6 +478,18 @@ void bt_mesh_adv_init(void)
 				   K_PRIO_COOP(MESH_WORKQ_PRIORITY), NULL);
 		k_thread_name_set(&bt_mesh_workq.thread, "BT MESH WQ");
 	}
+
+#if defined(CONFIG_BT_LL_SOFTDEVICE)
+	const sdc_hci_cmd_vs_scan_accept_ext_adv_packets_set_t cmd_params = {
+		.accept_ext_adv_packets = IS_ENABLED(CONFIG_BT_MESH_ADV_EXT_ACCEPT_EXT_ADV_PACKETS),
+	};
+
+	int err = sdc_hci_cmd_vs_scan_accept_ext_adv_packets_set(&cmd_params);
+
+	if (err) {
+		LOG_ERR("Failed to set accept_ext_adv_packets: %d", err);
+	}
+#endif
 }
 
 static struct bt_mesh_ext_adv *adv_instance_find(struct bt_le_ext_adv *instance)

From 714a26b9397865ec9f92848660728d51bc96321d Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Mon, 28 Oct 2024 15:36:52 +0100
Subject: [PATCH 0668/2913] [nrf fromtree] tests: Bluetooth: Tester: Fix use of
 uninitialized cig_id for CAP

The CAP tests used u_group->cig->index but the u_group->cig may
have been deleted when the stream is released, which meant
that u_group->cig == NULL when e.g. unicast_stop_complete_cb
was called and that could cause failing tests as the index
would just be a uninitialized value.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit 5ebe1194be5daf2c8a023de53d6fe3766a807525)
(cherry picked from commit c8146765ef8b9de2e7d13ca17986c24f70efc8e1)
---
 tests/bluetooth/tester/src/audio/btp_bap_unicast.c | 1 +
 tests/bluetooth/tester/src/audio/btp_bap_unicast.h | 4 ++++
 tests/bluetooth/tester/src/audio/btp_cap.c         | 8 ++++----
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tests/bluetooth/tester/src/audio/btp_bap_unicast.c b/tests/bluetooth/tester/src/audio/btp_bap_unicast.c
index 0a78441f013..f71096bc167 100644
--- a/tests/bluetooth/tester/src/audio/btp_bap_unicast.c
+++ b/tests/bluetooth/tester/src/audio/btp_bap_unicast.c
@@ -1131,6 +1131,7 @@ int btp_bap_unicast_group_create(uint8_t cig_id,
 	}
 
 	cigs[cig_id].in_use = true;
+	cigs[cig_id].cig_id = cig_id;
 	*out_unicast_group = &cigs[cig_id];
 
 	return 0;
diff --git a/tests/bluetooth/tester/src/audio/btp_bap_unicast.h b/tests/bluetooth/tester/src/audio/btp_bap_unicast.h
index 1ac0bac1aa9..24651ec5a19 100644
--- a/tests/bluetooth/tester/src/audio/btp_bap_unicast.h
+++ b/tests/bluetooth/tester/src/audio/btp_bap_unicast.h
@@ -2,10 +2,13 @@
 
 /*
  * Copyright (c) 2023 Codecoup
+ * Copyright (c) 2024 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdint.h>
+
 #include <zephyr/bluetooth/audio/cap.h>
 
 #define BTP_BAP_UNICAST_MAX_SNK_STREAMS_COUNT MIN(CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT, \
@@ -20,6 +23,7 @@
 struct btp_bap_unicast_group {
 	struct bt_audio_codec_qos qos[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT];
 	struct bt_bap_unicast_group *cig;
+	uint8_t cig_id;
 	bool in_use;
 };
 
diff --git a/tests/bluetooth/tester/src/audio/btp_cap.c b/tests/bluetooth/tester/src/audio/btp_cap.c
index 19986060b94..3c42ad292f7 100644
--- a/tests/bluetooth/tester/src/audio/btp_cap.c
+++ b/tests/bluetooth/tester/src/audio/btp_cap.c
@@ -104,13 +104,13 @@ static void unicast_start_complete_cb(int err, struct bt_conn *conn)
 
 	if (err != 0) {
 		LOG_DBG("Failed to unicast-start, err %d", err);
-		btp_send_cap_unicast_start_completed_ev(u_group->cig->index,
+		btp_send_cap_unicast_start_completed_ev(u_group->cig_id,
 							BTP_CAP_UNICAST_START_STATUS_FAILED);
 
 		return;
 	}
 
-	btp_send_cap_unicast_start_completed_ev(u_group->cig->index,
+	btp_send_cap_unicast_start_completed_ev(u_group->cig_id,
 						BTP_CAP_UNICAST_START_STATUS_SUCCESS);
 }
 
@@ -129,13 +129,13 @@ static void unicast_stop_complete_cb(int err, struct bt_conn *conn)
 
 	if (err != 0) {
 		LOG_DBG("Failed to unicast-stop, err %d", err);
-		btp_send_cap_unicast_stop_completed_ev(u_group->cig->index,
+		btp_send_cap_unicast_stop_completed_ev(u_group->cig_id,
 						       BTP_CAP_UNICAST_START_STATUS_FAILED);
 
 		return;
 	}
 
-	btp_send_cap_unicast_stop_completed_ev(u_group->cig->index,
+	btp_send_cap_unicast_stop_completed_ev(u_group->cig_id,
 					       BTP_CAP_UNICAST_START_STATUS_SUCCESS);
 }
 

From e988078915c69310c87300d3fcf48ab6b7a87ea2 Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Fri, 1 Nov 2024 15:05:30 +0100
Subject: [PATCH 0669/2913] [nrf fromtree] Bluetooth: CSIP: Handle disconnects
 while in procedure

If a device disconnects while we are in a procedure then
get_next_active_instance would return a service instance pointer
with the `conn` set to NULL.

The issue was caused by the set_info being potentially memset
when the device that disconnected was the one that held the
set_info pointer.
The solution is to not use a pointer, but rather a copy of the
set_info, so that the active.set_info value is still valid
after a disconnect.

Since the set_info is not longer a pointer to a specific
set_info from one of the members, the logs have been updated
as well, as the pointer of the active.set_info is useless
for debugging.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit 1f1e4afa4f145699677f8ee50dac5c5890d42dd9)
(cherry picked from commit fe0302fd479eb39448a5008dd39fd7aa3f0fea68)
---
 subsys/bluetooth/audio/csip_set_coordinator.c | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/subsys/bluetooth/audio/csip_set_coordinator.c b/subsys/bluetooth/audio/csip_set_coordinator.c
index 2b0c53db23c..b09d32dd890 100644
--- a/subsys/bluetooth/audio/csip_set_coordinator.c
+++ b/subsys/bluetooth/audio/csip_set_coordinator.c
@@ -58,7 +58,7 @@ LOG_MODULE_REGISTER(bt_csip_set_coordinator, CONFIG_BT_CSIP_SET_COORDINATOR_LOG_
 
 static struct active_members {
 	struct bt_csip_set_coordinator_set_member *members[CONFIG_BT_MAX_CONN];
-	const struct bt_csip_set_coordinator_set_info *info;
+	struct bt_csip_set_coordinator_set_info info;
 	uint8_t members_count;
 	uint8_t members_handled;
 	uint8_t members_restored;
@@ -169,7 +169,7 @@ static struct bt_csip_set_coordinator_svc_inst *lookup_instance_by_set_info(
 
 		member_set_info = &member->insts[i].info;
 		if (member_set_info->set_size == set_info->set_size &&
-		    memcmp(&member_set_info->sirk, &set_info->sirk, sizeof(set_info->sirk)) == 0) {
+		    memcmp(member_set_info->sirk, set_info->sirk, sizeof(set_info->sirk)) == 0) {
 			return bt_csip_set_coordinator_lookup_instance_by_index(inst->conn, i);
 		}
 	}
@@ -184,9 +184,9 @@ static struct bt_csip_set_coordinator_svc_inst *get_next_active_instance(void)
 
 	member = active.members[active.members_handled];
 
-	svc_inst =  lookup_instance_by_set_info(member, active.info);
+	svc_inst = lookup_instance_by_set_info(member, &active.info);
 	if (svc_inst == NULL) {
-		LOG_DBG("Failed to lookup instance by set_info %p", active.info);
+		LOG_DBG("Failed to lookup instance by set_info");
 	}
 
 	return svc_inst;
@@ -201,8 +201,8 @@ static int member_rank_compare_asc(const void *m1, const void *m2)
 	struct bt_csip_set_coordinator_svc_inst *svc_inst_1;
 	struct bt_csip_set_coordinator_svc_inst *svc_inst_2;
 
-	svc_inst_1 = lookup_instance_by_set_info(member_1, active.info);
-	svc_inst_2 = lookup_instance_by_set_info(member_2, active.info);
+	svc_inst_1 = lookup_instance_by_set_info(member_1, &active.info);
+	svc_inst_2 = lookup_instance_by_set_info(member_2, &active.info);
 
 	if (svc_inst_1 == NULL) {
 		LOG_ERR("svc_inst_1 was NULL for member %p", member_1);
@@ -232,7 +232,7 @@ static void active_members_store_ordered(const struct bt_csip_set_coordinator_se
 {
 	(void)memcpy(active.members, members, count * sizeof(members[0U]));
 	active.members_count = count;
-	active.info = info;
+	memcpy(&active.info, info, sizeof(active.info));
 
 	if (count > 1U && CONFIG_BT_MAX_CONN > 1) {
 		qsort(active.members, count, sizeof(members[0U]),
@@ -1080,7 +1080,7 @@ static void csip_set_coordinator_write_restore_cb(struct bt_conn *conn,
 		int csip_err;
 
 		member = active.members[active.members_handled - active.members_restored - 1];
-		client->cur_inst = lookup_instance_by_set_info(member, active.info);
+		client->cur_inst = lookup_instance_by_set_info(member, &active.info);
 		if (client->cur_inst == NULL) {
 			release_set_complete(-ENOENT);
 
@@ -1115,9 +1115,9 @@ static void csip_set_coordinator_write_lock_cb(struct bt_conn *conn,
 			active.members_restored = 0;
 
 			member = active.members[active.members_handled - active.members_restored];
-			client->cur_inst = lookup_instance_by_set_info(member, active.info);
+			client->cur_inst = lookup_instance_by_set_info(member, &active.info);
 			if (client->cur_inst == NULL) {
-				LOG_DBG("Failed to lookup instance by set_info %p", active.info);
+				LOG_DBG("Failed to lookup instance by set_info");
 
 				lock_set_complete(-ENOENT);
 				return;
@@ -1215,7 +1215,7 @@ static void csip_set_coordinator_write_release_cb(struct bt_conn *conn, uint8_t
 
 static void csip_set_coordinator_lock_state_read_cb(int err, bool locked)
 {
-	const struct bt_csip_set_coordinator_set_info *info = active.info;
+	const struct bt_csip_set_coordinator_set_info *info = &active.info;
 	struct bt_csip_set_coordinator_set_member *cur_member = NULL;
 
 	if (err || locked) {
@@ -1607,9 +1607,9 @@ csip_set_coordinator_get_lock_state(const struct bt_csip_set_coordinator_set_mem
 	for (uint8_t i = 0U; i < count; i++) {
 		struct bt_csip_set_coordinator_svc_inst *svc_inst;
 
-		svc_inst = lookup_instance_by_set_info(active.members[i], active.info);
+		svc_inst = lookup_instance_by_set_info(active.members[i], &active.info);
 		if (svc_inst == NULL) {
-			LOG_DBG("Failed to lookup instance by set_info %p", active.info);
+			LOG_DBG("Failed to lookup instance by set_info");
 
 			active_members_reset();
 			return -ENOENT;
@@ -1633,11 +1633,11 @@ csip_set_coordinator_get_lock_state(const struct bt_csip_set_coordinator_set_mem
 		 * here.
 		 */
 		if (active.oap_cb == NULL ||
-		    !active.oap_cb(active.info, active.members, active.members_count)) {
+		    !active.oap_cb(&active.info, active.members, active.members_count)) {
 			err = -ECANCELED;
 		}
 
-		ordered_access_complete(active.info, err, false, NULL);
+		ordered_access_complete(&active.info, err, false, NULL);
 	}
 
 	return err;
@@ -1690,9 +1690,9 @@ int bt_csip_set_coordinator_lock(
 
 	active_members_store_ordered(members, count, set_info, true);
 
-	svc_inst = lookup_instance_by_set_info(active.members[0], active.info);
+	svc_inst = lookup_instance_by_set_info(active.members[0], &active.info);
 	if (svc_inst == NULL) {
-		LOG_DBG("Failed to lookup instance by set_info %p", active.info);
+		LOG_DBG("Failed to lookup instance by set_info");
 
 		active_members_reset();
 		return -ENOENT;
@@ -1732,9 +1732,9 @@ int bt_csip_set_coordinator_release(const struct bt_csip_set_coordinator_set_mem
 
 	active_members_store_ordered(members, count, set_info, false);
 
-	svc_inst = lookup_instance_by_set_info(active.members[0], active.info);
+	svc_inst = lookup_instance_by_set_info(active.members[0], &active.info);
 	if (svc_inst == NULL) {
-		LOG_DBG("Failed to lookup instance by set_info %p", active.info);
+		LOG_DBG("Failed to lookup instance by set_info");
 
 		active_members_reset();
 		return -ENOENT;

From 482819def8f79d7be107d99fdea982bd0e42e9ce Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Tue, 5 Nov 2024 17:53:56 +0100
Subject: [PATCH 0670/2913] [nrf fromtree] Bluetooth: CSIP: Fix off-by-one in
 in lock restore

If the lock request was rejected by a set member we should
restore any previously written logs in reverse order.

However there was a off-by-one error in
csip_set_coordinator_write_lock_cb which caused us to attempt to
release member[1] instead of member[0] if member[1] was the
one that rejected the lock request.

Additionally, the lock_set_complete would be called
prematurely before we get the response from the restore
request.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit 7c40b071e448f57868b56b67d2f5bd23443c232a)
(cherry picked from commit c1fb1979fe8aeb4f214a343e418962d7a50f9e9c)
---
 subsys/bluetooth/audio/csip_set_coordinator.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/subsys/bluetooth/audio/csip_set_coordinator.c b/subsys/bluetooth/audio/csip_set_coordinator.c
index b09d32dd890..2d83aa41c6a 100644
--- a/subsys/bluetooth/audio/csip_set_coordinator.c
+++ b/subsys/bluetooth/audio/csip_set_coordinator.c
@@ -1114,7 +1114,7 @@ static void csip_set_coordinator_write_lock_cb(struct bt_conn *conn,
 
 			active.members_restored = 0;
 
-			member = active.members[active.members_handled - active.members_restored];
+			member = active.members[active.members_handled - 1];
 			client->cur_inst = lookup_instance_by_set_info(member, &active.info);
 			if (client->cur_inst == NULL) {
 				LOG_DBG("Failed to lookup instance by set_info");
@@ -1131,10 +1131,10 @@ static void csip_set_coordinator_write_lock_cb(struct bt_conn *conn,
 				active_members_reset();
 				return;
 			}
+		} else {
+			lock_set_complete(err);
 		}
 
-		lock_set_complete(err);
-
 		return;
 	}
 

From f9004d8a50f07bdd72657aba0bfc48ab6094b094 Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Wed, 12 Jun 2024 19:09:24 +0200
Subject: [PATCH 0671/2913] [nrf fromtree] Bluetooth: CAP: Add support for
 doing just disable for unicast stop

The unicast_stop function is changed to primarily do a
BAP disable instead of a release, with optional
support for releasing the streams once they have been disabled.

This also adds unittests for the procedure which also
allow us to remove the invalid param testing from the BSIM tests.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit fa4f2ffc47d49a17e04f11da14d12ca317124ecc)
(cherry picked from commit 7baefd3cae21dfd974cbca43e059eee4b79234dd)
---
 include/zephyr/bluetooth/audio/cap.h          |   8 +-
 subsys/bluetooth/audio/bap_stream.c           |   4 +-
 subsys/bluetooth/audio/cap_common.c           |  10 +
 subsys/bluetooth/audio/cap_initiator.c        | 484 ++++++++++++++----
 subsys/bluetooth/audio/cap_internal.h         |   8 +
 subsys/bluetooth/audio/cap_stream.c           |  10 +
 subsys/bluetooth/audio/shell/cap_initiator.c  |   1 +
 .../audio/cap_initiator/CMakeLists.txt        |   1 +
 tests/bluetooth/audio/cap_initiator/prj.conf  |   2 +
 .../bluetooth/audio/cap_initiator/src/main.c  |   2 -
 .../audio/cap_initiator/src/test_common.c     |   2 +
 .../cap_initiator/src/test_unicast_start.c    |   2 -
 .../cap_initiator/src/test_unicast_stop.c     | 482 +++++++++++++++++
 .../cap_initiator/uut/bap_unicast_client.c    |  95 +++-
 tests/bluetooth/tester/src/audio/btp_cap.c    |   1 +
 .../audio/src/cap_initiator_unicast_test.c    |  34 +-
 .../bsim/bluetooth/audio/src/gmap_ugg_test.c  |   1 +
 17 files changed, 1022 insertions(+), 125 deletions(-)
 create mode 100644 tests/bluetooth/audio/cap_initiator/src/test_unicast_stop.c

diff --git a/include/zephyr/bluetooth/audio/cap.h b/include/zephyr/bluetooth/audio/cap.h
index 50c29640a73..4417477860d 100644
--- a/include/zephyr/bluetooth/audio/cap.h
+++ b/include/zephyr/bluetooth/audio/cap.h
@@ -312,6 +312,9 @@ struct bt_cap_unicast_audio_stop_param {
 
 	/** Array of streams to stop */
 	struct bt_cap_stream **streams;
+
+	/** Whether to release the streams after they have stopped */
+	bool release;
 };
 
 /**
@@ -379,7 +382,10 @@ int bt_cap_initiator_unicast_audio_update(const struct bt_cap_unicast_audio_upda
  *
  * @param param Stop parameters.
  *
- * @return 0 on success or negative error value on failure.
+ * @return 0 on success
+ * @retval -EBUSY if a CAP procedure is already in progress
+ * @retval -EINVAL if any parameter is invalid
+ * @retval -EALREADY if no state changes will occur
  */
 int bt_cap_initiator_unicast_audio_stop(const struct bt_cap_unicast_audio_stop_param *param);
 
diff --git a/subsys/bluetooth/audio/bap_stream.c b/subsys/bluetooth/audio/bap_stream.c
index dbc6a6d5a18..ebc9a87712a 100644
--- a/subsys/bluetooth/audio/bap_stream.c
+++ b/subsys/bluetooth/audio/bap_stream.c
@@ -445,7 +445,7 @@ void bt_bap_stream_detach(struct bt_bap_stream *stream)
 {
 	const bool is_broadcast = bt_bap_stream_is_broadcast(stream);
 
-	LOG_DBG("stream %p", stream);
+	LOG_DBG("stream %p conn %p ep %p", stream, (void *)stream->conn, (void *)stream->ep);
 
 	if (stream->conn != NULL) {
 		bt_conn_unref(stream->conn);
@@ -523,7 +523,7 @@ int bt_bap_stream_config(struct bt_conn *conn, struct bt_bap_stream *stream, str
 	       codec_cfg, codec_cfg ? codec_cfg->id : 0, codec_cfg ? codec_cfg->cid : 0,
 	       codec_cfg ? codec_cfg->vid : 0);
 
-	CHECKIF(conn == NULL || stream == NULL || codec_cfg == NULL) {
+	CHECKIF(conn == NULL || stream == NULL || codec_cfg == NULL || ep == NULL) {
 		LOG_DBG("NULL value(s) supplied)");
 		return -EINVAL;
 	}
diff --git a/subsys/bluetooth/audio/cap_common.c b/subsys/bluetooth/audio/cap_common.c
index 56e7741d2ee..8780a3e357a 100644
--- a/subsys/bluetooth/audio/cap_common.c
+++ b/subsys/bluetooth/audio/cap_common.c
@@ -64,6 +64,11 @@ void bt_cap_common_set_subproc(enum bt_cap_common_subproc_type subproc_type)
 	active_proc.subproc_type = subproc_type;
 }
 
+bool bt_cap_common_proc_is_type(enum bt_cap_common_proc_type proc_type)
+{
+	return active_proc.proc_type == proc_type;
+}
+
 bool bt_cap_common_subproc_is_type(enum bt_cap_common_subproc_type subproc_type)
 {
 	return active_proc.subproc_type == subproc_type;
@@ -122,7 +127,12 @@ void bt_cap_common_abort_proc(struct bt_conn *conn, int err)
 		return;
 	}
 
+#if defined(CONFIG_BT_CAP_INITIATOR_UNICAST)
+	LOG_DBG("Aborting proc %d with subproc %d for %p: %d", active_proc.proc_type,
+		active_proc.subproc_type, (void *)conn, err);
+#else  /* !CONFIG_BT_CAP_INITIATOR_UNICAST */
 	LOG_DBG("Aborting proc %d for %p: %d", active_proc.proc_type, (void *)conn, err);
+#endif /* CONFIG_BT_CAP_INITIATOR_UNICAST */
 
 	active_proc.err = err;
 	active_proc.failed_conn = conn;
diff --git a/subsys/bluetooth/audio/cap_initiator.c b/subsys/bluetooth/audio/cap_initiator.c
index 20d5011ebde..23295848b14 100644
--- a/subsys/bluetooth/audio/cap_initiator.c
+++ b/subsys/bluetooth/audio/cap_initiator.c
@@ -513,6 +513,17 @@ static void update_proc_done_cnt(struct bt_cap_common_proc *active_proc)
 			state = stream_get_state(bap_stream);
 
 			switch (subproc_type) {
+			case BT_CAP_COMMON_SUBPROC_TYPE_DISABLE:
+				if (state == BT_BAP_EP_STATE_QOS_CONFIGURED ||
+				    state == BT_BAP_EP_STATE_DISABLING) {
+					proc_done_cnt++;
+				}
+				break;
+			case BT_CAP_COMMON_SUBPROC_TYPE_STOP:
+				if (state == BT_BAP_EP_STATE_QOS_CONFIGURED) {
+					proc_done_cnt++;
+				}
+				break;
 			case BT_CAP_COMMON_SUBPROC_TYPE_RELEASE:
 				if (state == BT_BAP_EP_STATE_IDLE ||
 				    state == BT_BAP_EP_STATE_CODEC_CONFIGURED) {
@@ -574,47 +585,60 @@ get_next_proc_param(struct bt_cap_common_proc *active_proc)
 		struct bt_cap_initiator_proc_param *proc_param;
 		struct bt_cap_stream *cap_stream;
 		struct bt_bap_stream *bap_stream;
+		enum bt_bap_ep_state state;
 
 		proc_param = &active_proc->proc_param.initiator[i];
 		cap_stream = proc_param->stream;
 		bap_stream = &cap_stream->bap_stream;
+		state = stream_get_state(bap_stream);
 
 		switch (subproc_type) {
 		case BT_CAP_COMMON_SUBPROC_TYPE_CODEC_CONFIG:
-			if (stream_is_in_state(bap_stream, BT_BAP_EP_STATE_IDLE)) {
+			if (state == BT_BAP_EP_STATE_IDLE) {
 				return proc_param;
 			}
 			break;
 		case BT_CAP_COMMON_SUBPROC_TYPE_QOS_CONFIG:
-			if (stream_is_in_state(bap_stream, BT_BAP_EP_STATE_CODEC_CONFIGURED)) {
+			if (state == BT_BAP_EP_STATE_CODEC_CONFIGURED) {
 				return proc_param;
 			}
 			break;
 		case BT_CAP_COMMON_SUBPROC_TYPE_ENABLE:
-			if (stream_is_in_state(bap_stream, BT_BAP_EP_STATE_QOS_CONFIGURED)) {
+			if (state == BT_BAP_EP_STATE_QOS_CONFIGURED) {
 				return proc_param;
 			}
 			break;
 		case BT_CAP_COMMON_SUBPROC_TYPE_CONNECT:
-			if (stream_is_in_state(bap_stream, BT_BAP_EP_STATE_ENABLING) &&
-			    !proc_param->start.connected) {
+			if (state == BT_BAP_EP_STATE_ENABLING && !proc_param->start.connected) {
 				return proc_param;
 			}
 			break;
 		case BT_CAP_COMMON_SUBPROC_TYPE_START:
-			if (stream_is_in_state(bap_stream, BT_BAP_EP_STATE_ENABLING)) {
+			if (state == BT_BAP_EP_STATE_ENABLING) {
 				/* TODO: Add check for connected */
 				return proc_param;
 			}
 			break;
 		case BT_CAP_COMMON_SUBPROC_TYPE_META_UPDATE:
-			if (stream_is_in_state(bap_stream, BT_BAP_EP_STATE_ENABLING) ||
-			    stream_is_in_state(bap_stream, BT_BAP_EP_STATE_STREAMING)) {
+			if (state == BT_BAP_EP_STATE_ENABLING ||
+			    state == BT_BAP_EP_STATE_STREAMING) {
+				return proc_param;
+			}
+			break;
+		case BT_CAP_COMMON_SUBPROC_TYPE_DISABLE:
+			if (state == BT_BAP_EP_STATE_ENABLING ||
+			    state == BT_BAP_EP_STATE_STREAMING) {
+				return proc_param;
+			}
+			break;
+		case BT_CAP_COMMON_SUBPROC_TYPE_STOP:
+			if (state == BT_BAP_EP_STATE_DISABLING) {
 				return proc_param;
 			}
 			break;
 		case BT_CAP_COMMON_SUBPROC_TYPE_RELEASE:
-			if (!stream_is_in_state(bap_stream, BT_BAP_EP_STATE_IDLE)) {
+			if (proc_param->stop.release && state != BT_BAP_EP_STATE_IDLE &&
+			    state != BT_BAP_EP_STATE_CODEC_CONFIGURED) {
 				return proc_param;
 			}
 			break;
@@ -848,6 +872,7 @@ static int cap_initiator_unicast_audio_configure(
 	/* Since BAP operations may require a write long or a read long on the notification,
 	 * we cannot assume that we can do multiple streams at once, thus do it one at a time.
 	 * TODO: We should always be able to do one per ACL, so there is room for optimization.
+	 * This applies to all BAP calls in this file.
 	 */
 	err = bt_bap_stream_config(conn, bap_stream, ep, codec_cfg);
 	if (err != 0) {
@@ -946,12 +971,6 @@ void bt_cap_initiator_codec_configured(struct bt_cap_stream *cap_stream)
 		next_bap_stream = &next_cap_stream->bap_stream;
 		active_proc->proc_initiated_cnt++;
 
-		/* Since BAP operations may require a write long or a read long on the notification,
-		 * we cannot assume that we can do multiple streams at once, thus do it one at a
-		 * time.
-		 * TODO: We should always be able to do one per ACL, so there is room for
-		 * optimization.
-		 */
 		err = bt_bap_stream_config(conn, next_bap_stream, ep, codec_cfg);
 		if (err != 0) {
 			LOG_DBG("Failed to config stream %p: %d", next_cap_stream, err);
@@ -1042,10 +1061,6 @@ void bt_cap_initiator_codec_configured(struct bt_cap_stream *cap_stream)
 void bt_cap_initiator_qos_configured(struct bt_cap_stream *cap_stream)
 {
 	struct bt_cap_common_proc *active_proc = bt_cap_common_get_active_proc();
-	struct bt_cap_initiator_proc_param *proc_param;
-	struct bt_cap_stream *next_cap_stream;
-	struct bt_bap_stream *bap_stream;
-	int err;
 
 	if (!bt_cap_common_stream_in_active_proc(cap_stream)) {
 		/* State change happened outside of a procedure; ignore */
@@ -1054,7 +1069,9 @@ void bt_cap_initiator_qos_configured(struct bt_cap_stream *cap_stream)
 
 	LOG_DBG("cap_stream %p", cap_stream);
 
-	if (!bt_cap_common_subproc_is_type(BT_CAP_COMMON_SUBPROC_TYPE_QOS_CONFIG)) {
+	if (!(bt_cap_common_proc_is_type(BT_CAP_COMMON_PROC_TYPE_START) &&
+	      bt_cap_common_subproc_is_type(BT_CAP_COMMON_SUBPROC_TYPE_QOS_CONFIG)) &&
+	    !(bt_cap_common_proc_is_type(BT_CAP_COMMON_PROC_TYPE_STOP))) {
 		/* Unexpected callback - Abort */
 		bt_cap_common_abort_proc(cap_stream->bap_stream.conn, -EBADMSG);
 	} else {
@@ -1072,36 +1089,60 @@ void bt_cap_initiator_qos_configured(struct bt_cap_stream *cap_stream)
 		return;
 	}
 
-	if (!bt_cap_common_proc_is_done()) {
-		/* Not yet finished, wait for all */
-		return;
-	}
+	if (bt_cap_common_proc_is_type(BT_CAP_COMMON_PROC_TYPE_START)) {
+		struct bt_cap_initiator_proc_param *proc_param;
+		struct bt_cap_stream *next_cap_stream;
+		struct bt_bap_stream *bap_stream;
+		int err;
 
-	bt_cap_common_set_subproc(BT_CAP_COMMON_SUBPROC_TYPE_ENABLE);
-	proc_param = get_next_proc_param(active_proc);
-	if (proc_param == NULL) {
-		/* If proc_param is NULL then this step is a no-op and we can skip to the next step
-		 */
-		bt_cap_initiator_enabled(active_proc->proc_param.initiator[0].stream);
+		if (!bt_cap_common_proc_is_done()) {
+			/* Not yet finished, wait for all */
+			return;
+		}
 
-		return;
-	}
+		bt_cap_common_set_subproc(BT_CAP_COMMON_SUBPROC_TYPE_ENABLE);
+		proc_param = get_next_proc_param(active_proc);
+		if (proc_param == NULL) {
+			/* If proc_param is NULL then this step is a no-op and we can skip to the
+			 * next step
+			 */
+			bt_cap_initiator_enabled(active_proc->proc_param.initiator[0].stream);
 
-	next_cap_stream = proc_param->stream;
-	bap_stream = &next_cap_stream->bap_stream;
-	active_proc->proc_initiated_cnt++;
+			return;
+		}
 
-	/* Since BAP operations may require a write long or a read long on the notification, we
-	 * cannot assume that we can do multiple streams at once, thus do it one at a time.
-	 * TODO: We should always be able to do one per ACL, so there is room for optimization.
-	 */
-	err = bt_bap_stream_enable(bap_stream, bap_stream->codec_cfg->meta,
-				   bap_stream->codec_cfg->meta_len);
-	if (err != 0) {
-		LOG_DBG("Failed to enable stream %p: %d", next_cap_stream, err);
+		next_cap_stream = proc_param->stream;
+		bap_stream = &next_cap_stream->bap_stream;
+		active_proc->proc_initiated_cnt++;
 
-		bt_cap_common_abort_proc(bap_stream->conn, err);
-		cap_initiator_unicast_audio_proc_complete();
+		err = bt_bap_stream_enable(bap_stream, bap_stream->codec_cfg->meta,
+					   bap_stream->codec_cfg->meta_len);
+		if (err != 0) {
+			LOG_DBG("Failed to enable stream %p: %d", next_cap_stream, err);
+
+			bt_cap_common_abort_proc(bap_stream->conn, err);
+			cap_initiator_unicast_audio_proc_complete();
+		}
+	} else if (bt_cap_common_subproc_is_type(BT_CAP_COMMON_SUBPROC_TYPE_RELEASE)) {
+		struct bt_cap_initiator_proc_param *proc_param;
+		struct bt_cap_stream *next_cap_stream;
+		struct bt_bap_stream *next_bap_stream;
+		int err;
+
+		proc_param = get_next_proc_param(active_proc);
+		__ASSERT(proc_param != NULL, "proc is not done, but could not get next proc_param");
+
+		next_cap_stream = proc_param->stream;
+		next_bap_stream = &next_cap_stream->bap_stream;
+		active_proc->proc_initiated_cnt++;
+
+		err = bt_bap_stream_release(next_bap_stream);
+		if (err != 0) {
+			LOG_DBG("Failed to release stream %p: %d", next_cap_stream, err);
+
+			bt_cap_common_abort_proc(next_bap_stream->conn, err);
+			cap_initiator_unicast_audio_proc_complete();
+		}
 	}
 }
 
@@ -1148,12 +1189,6 @@ void bt_cap_initiator_enabled(struct bt_cap_stream *cap_stream)
 
 		active_proc->proc_initiated_cnt++;
 
-		/* Since BAP operations may require a write long or a read long on the notification,
-		 * we cannot assume that we can do multiple streams at once, thus do it one at a
-		 * time.
-		 * TODO: We should always be able to do one per ACL, so there is room for
-		 * optimization.
-		 */
 		err = bt_bap_stream_enable(next_bap_stream, next_bap_stream->codec_cfg->meta,
 					   next_bap_stream->codec_cfg->meta_len);
 		if (err != 0) {
@@ -1276,12 +1311,6 @@ void bt_cap_initiator_connected(struct bt_cap_stream *cap_stream)
 
 	bap_stream = &proc_param->stream->bap_stream;
 	if (stream_is_dir(bap_stream, BT_AUDIO_DIR_SOURCE)) {
-		/* Since BAP operations may require a write long or a read long on the notification,
-		 * we cannot assume that we can do multiple streams at once, thus do it one at a
-		 * time.
-		 * TODO: We should always be able to do one per ACL, so there is room for
-		 * optimization.
-		 */
 		err = bt_bap_stream_start(bap_stream);
 		if (err != 0) {
 			LOG_DBG("Failed to start stream %p: %d", proc_param->stream, err);
@@ -1330,12 +1359,6 @@ void bt_cap_initiator_started(struct bt_cap_stream *cap_stream)
 		if (stream_is_dir(next_bap_stream, BT_AUDIO_DIR_SOURCE)) {
 			int err;
 
-			/* Since BAP operations may require a write long or a read long on
-			 * the notification, we cannot assume that we can do multiple
-			 * streams at once, thus do it one at a time.
-			 * TODO: We should always be able to do one per ACL, so there is
-			 * room for optimization.
-			 */
 			err = bt_bap_stream_start(next_bap_stream);
 			if (err != 0) {
 				LOG_DBG("Failed to start stream %p: %d", next_cap_stream, err);
@@ -1478,6 +1501,9 @@ int bt_cap_initiator_unicast_audio_update(const struct bt_cap_unicast_audio_upda
 			&param->stream_params[i];
 		struct bt_cap_stream *cap_stream = stream_param->stream;
 
+		/* Ensure that ops are registered before any procedures are started */
+		bt_cap_stream_ops_register_bap(cap_stream);
+
 		active_proc->proc_param.initiator[i].stream = cap_stream;
 		active_proc->proc_param.initiator[i].meta_update.meta_len = stream_param->meta_len;
 		memcpy(&active_proc->proc_param.initiator[i].meta_update.meta, stream_param->meta,
@@ -1562,13 +1588,6 @@ void bt_cap_initiator_metadata_updated(struct bt_cap_stream *cap_stream)
 		bap_stream = &next_cap_stream->bap_stream;
 		active_proc->proc_initiated_cnt++;
 
-		/* Since BAP operations may require a write long or a read long on the notification,
-		 * we cannot assume that we can do multiple streams at once, thus do it one at a
-		 * time.
-		 * TODO: We should always be able to do one per ACL, so there is room for
-		 * optimization.
-		 */
-
 		err = bt_bap_stream_metadata(bap_stream, meta, meta_len);
 		if (err != 0) {
 			LOG_DBG("Failed to update metadata for stream %p: %d", next_cap_stream,
@@ -1584,13 +1603,43 @@ void bt_cap_initiator_metadata_updated(struct bt_cap_stream *cap_stream)
 	cap_initiator_unicast_audio_proc_complete();
 }
 
-static bool can_release(const struct bt_bap_stream *bap_stream)
+static bool can_release_stream(const struct bt_bap_stream *bap_stream)
+{
+	enum bt_bap_ep_state state;
+
+	if (bap_stream->conn == NULL) {
+		return false;
+	}
+
+	state = stream_get_state(bap_stream);
+
+	/* We cannot release idle endpoints.
+	 * We do not know if we can release endpoints in the Codec Configured state as servers may
+	 * cache it, so treat it as idle
+	 */
+	return state != BT_BAP_EP_STATE_IDLE && state != BT_BAP_EP_STATE_CODEC_CONFIGURED;
+}
+
+static bool can_disable_stream(const struct bt_bap_stream *bap_stream)
+{
+	enum bt_bap_ep_state state;
+
+	if (bap_stream->conn == NULL) {
+		return false;
+	}
+
+	state = stream_get_state(bap_stream);
+
+	return state == BT_BAP_EP_STATE_STREAMING || state == BT_BAP_EP_STATE_ENABLING;
+}
+
+static bool can_stop_stream(const struct bt_bap_stream *bap_stream)
 {
 	if (bap_stream->conn == NULL) {
 		return false;
 	}
 
-	return !stream_is_in_state(bap_stream, BT_BAP_EP_STATE_IDLE);
+	return stream_is_in_state(bap_stream, BT_BAP_EP_STATE_DISABLING);
 }
 
 static bool valid_unicast_audio_stop_param(const struct bt_cap_unicast_audio_stop_param *param)
@@ -1637,6 +1686,18 @@ static bool valid_unicast_audio_stop_param(const struct bt_cap_unicast_audio_sto
 			return -EINVAL;
 		}
 
+		if (param->type == BT_CAP_SET_TYPE_CSIP) {
+			struct bt_cap_common_client *client = bt_cap_common_get_client_by_acl(conn);
+
+			if (client->csis_inst == NULL) {
+				LOG_DBG("param->streams[%zu]->bap_stream.conn not part of a "
+					"coordinated set",
+					i);
+
+				return false;
+			}
+		}
+
 		CHECKIF(bap_stream->group == NULL) {
 			LOG_DBG("param->streams[%zu] is not in a unicast group", i);
 			return false;
@@ -1653,12 +1714,6 @@ static bool valid_unicast_audio_stop_param(const struct bt_cap_unicast_audio_sto
 			}
 		}
 
-		if (!can_release(bap_stream)) {
-			LOG_DBG("Cannot stop param->streams[%zu]", i);
-
-			return false;
-		}
-
 		for (size_t j = 0U; j < i; j++) {
 			if (param->streams[j] == cap_stream) {
 				LOG_DBG("param->stream_params[%zu] (%p) is "
@@ -1676,8 +1731,9 @@ static bool valid_unicast_audio_stop_param(const struct bt_cap_unicast_audio_sto
 int bt_cap_initiator_unicast_audio_stop(const struct bt_cap_unicast_audio_stop_param *param)
 {
 	struct bt_cap_common_proc *active_proc = bt_cap_common_get_active_proc();
-	struct bt_cap_initiator_proc_param *proc_param;
-	struct bt_bap_stream *bap_stream;
+	bool can_release = false;
+	bool can_disable = false;
+	bool can_stop = false;
 	int err;
 
 	if (bt_cap_common_proc_is_active()) {
@@ -1692,34 +1748,259 @@ int bt_cap_initiator_unicast_audio_stop(const struct bt_cap_unicast_audio_stop_p
 
 	for (size_t i = 0U; i < param->count; i++) {
 		struct bt_cap_stream *cap_stream = param->streams[i];
+		struct bt_bap_stream *bap_stream = &cap_stream->bap_stream;
+
+		/* Ensure that ops are registered before any procedures are started */
+		bt_cap_stream_ops_register_bap(cap_stream);
 
 		active_proc->proc_param.initiator[i].stream = cap_stream;
-	}
+		active_proc->proc_param.initiator[i].stop.release = param->release;
 
-	bt_cap_common_start_proc(BT_CAP_COMMON_PROC_TYPE_STOP, param->count);
+		if (!can_disable && can_disable_stream(bap_stream)) {
+			can_disable = true;
+		}
 
-	bt_cap_common_set_subproc(BT_CAP_COMMON_SUBPROC_TYPE_RELEASE);
+		if (!can_stop && can_stop_stream(bap_stream)) {
+			can_stop = true;
+		}
 
+		if (!can_release && param->release && can_release_stream(bap_stream)) {
+			can_release = true;
+		}
+	}
+
+	if (!can_disable && !can_stop && !can_release) {
+		LOG_DBG("Cannot %s any streams", !can_disable ? "disable"
+						 : !can_stop  ? "stop"
+							      : "release");
+		return -EALREADY;
+	}
+
+	bt_cap_common_start_proc(BT_CAP_COMMON_PROC_TYPE_STOP, param->count);
 	/** TODO: If this is a CSIP set, then the order of the procedures may
 	 * not match the order in the parameters, and the CSIP ordered access
 	 * procedure should be used.
 	 */
-	proc_param = get_next_proc_param(active_proc);
-	__ASSERT(proc_param != NULL, "proc is not done, but could not get next proc_param");
 
-	bap_stream = &proc_param->stream->bap_stream;
-	active_proc->proc_initiated_cnt++;
+	if (can_disable) {
+		struct bt_cap_initiator_proc_param *proc_param;
+		struct bt_bap_stream *bap_stream;
 
-	err = bt_bap_stream_release(bap_stream);
-	if (err != 0) {
-		LOG_DBG("Failed to stop bap_stream %p: %d", proc_param->stream, err);
+		bt_cap_common_set_subproc(BT_CAP_COMMON_SUBPROC_TYPE_DISABLE);
 
-		bt_cap_common_clear_active_proc();
+		proc_param = get_next_proc_param(active_proc);
+		__ASSERT(proc_param != NULL,
+			 "proc is not started, but could not get next proc_param");
+		bap_stream = &proc_param->stream->bap_stream;
+		active_proc->proc_initiated_cnt++;
+
+		err = bt_bap_stream_disable(bap_stream);
+		if (err != 0) {
+			LOG_DBG("Failed to disable bap_stream %p: %d", proc_param->stream, err);
+
+			bt_cap_common_clear_active_proc();
+		}
+	} else if (can_stop) {
+		struct bt_cap_initiator_proc_param *proc_param;
+		struct bt_bap_stream *bap_stream;
+
+		bt_cap_common_set_subproc(BT_CAP_COMMON_SUBPROC_TYPE_STOP);
+
+		proc_param = get_next_proc_param(active_proc);
+		__ASSERT(proc_param != NULL,
+			 "proc is not started, but could not get next proc_param");
+		bap_stream = &proc_param->stream->bap_stream;
+		active_proc->proc_initiated_cnt++;
+
+		err = bt_bap_stream_stop(bap_stream);
+		if (err != 0) {
+			LOG_DBG("Failed to stop bap_stream %p: %d", proc_param->stream, err);
+
+			bt_cap_common_clear_active_proc();
+		}
+	} else {
+		struct bt_cap_initiator_proc_param *proc_param;
+		struct bt_bap_stream *bap_stream;
+
+		bt_cap_common_set_subproc(BT_CAP_COMMON_SUBPROC_TYPE_RELEASE);
+
+		proc_param = get_next_proc_param(active_proc);
+		__ASSERT(proc_param != NULL,
+			 "proc is not started, but could not get next proc_param");
+		bap_stream = &proc_param->stream->bap_stream;
+		active_proc->proc_initiated_cnt++;
+
+		err = bt_bap_stream_release(bap_stream);
+		if (err != 0) {
+			LOG_DBG("Failed to release bap_stream %p: %d", proc_param->stream, err);
+
+			bt_cap_common_clear_active_proc();
+		}
 	}
 
 	return err;
 }
 
+void bt_cap_initiator_disabled(struct bt_cap_stream *cap_stream)
+{
+	struct bt_cap_common_proc *active_proc = bt_cap_common_get_active_proc();
+
+	if (!bt_cap_common_stream_in_active_proc(cap_stream)) {
+		/* State change happened outside of a procedure; ignore */
+		return;
+	}
+
+	if (!bt_cap_common_subproc_is_type(BT_CAP_COMMON_SUBPROC_TYPE_DISABLE)) {
+		/* Unexpected callback - Abort */
+		bt_cap_common_abort_proc(cap_stream->bap_stream.conn, -EBADMSG);
+	} else {
+		update_proc_done_cnt(active_proc);
+
+		LOG_DBG("Stream %p disabled (%zu/%zu streams done)", cap_stream,
+			active_proc->proc_done_cnt, active_proc->proc_cnt);
+	}
+
+	if (bt_cap_common_proc_is_aborted()) {
+		if (bt_cap_common_proc_all_handled()) {
+			cap_initiator_unicast_audio_proc_complete();
+		}
+
+		return;
+	}
+
+	if (!bt_cap_common_proc_is_done()) {
+		struct bt_cap_initiator_proc_param *proc_param;
+		struct bt_cap_stream *next_cap_stream;
+		struct bt_bap_stream *next_bap_stream;
+		int err;
+
+		proc_param = get_next_proc_param(active_proc);
+		__ASSERT(proc_param != NULL, "proc is not done, but could not get next proc_param");
+		next_cap_stream = proc_param->stream;
+		next_bap_stream = &next_cap_stream->bap_stream;
+		active_proc->proc_initiated_cnt++;
+
+		err = bt_bap_stream_disable(next_bap_stream);
+		if (err != 0) {
+			LOG_DBG("Failed to disable stream %p: %d", next_cap_stream, err);
+
+			bt_cap_common_abort_proc(next_bap_stream->conn, err);
+			cap_initiator_unicast_audio_proc_complete();
+		}
+	} else {
+		struct bt_cap_initiator_proc_param *proc_param;
+		struct bt_cap_stream *next_cap_stream;
+		struct bt_bap_stream *next_bap_stream;
+		int err;
+
+		bt_cap_common_set_subproc(BT_CAP_COMMON_SUBPROC_TYPE_STOP);
+
+		proc_param = get_next_proc_param(active_proc);
+		if (proc_param == NULL) {
+			/* If proc_param is NULL then this step is a no-op and we can skip to the
+			 * next step
+			 */
+			bt_cap_initiator_stopped(active_proc->proc_param.initiator[0].stream);
+
+			return;
+		}
+
+		next_cap_stream = proc_param->stream;
+		next_bap_stream = &next_cap_stream->bap_stream;
+		active_proc->proc_initiated_cnt++;
+
+		err = bt_bap_stream_stop(next_bap_stream);
+		if (err != 0) {
+			LOG_DBG("Failed to stop stream %p: %d", next_cap_stream, err);
+
+			bt_cap_common_abort_proc(next_bap_stream->conn, err);
+			cap_initiator_unicast_audio_proc_complete();
+		}
+	}
+}
+
+void bt_cap_initiator_stopped(struct bt_cap_stream *cap_stream)
+{
+	struct bt_cap_common_proc *active_proc = bt_cap_common_get_active_proc();
+
+	if (!bt_cap_common_stream_in_active_proc(cap_stream)) {
+		/* State change happened outside of a procedure; ignore */
+		return;
+	}
+
+	if (!bt_cap_common_proc_is_type(BT_CAP_COMMON_PROC_TYPE_STOP)) {
+		/* Unexpected callback - Abort */
+		bt_cap_common_abort_proc(cap_stream->bap_stream.conn, -EBADMSG);
+	} else {
+		if (bt_cap_common_subproc_is_type(BT_CAP_COMMON_SUBPROC_TYPE_STOP)) {
+			update_proc_done_cnt(active_proc);
+
+			LOG_DBG("Stream %p stopped (%zu/%zu streams done)", cap_stream,
+				active_proc->proc_done_cnt, active_proc->proc_cnt);
+		} else {
+			/* We are still doing disable - Wait for those to be done, as stopped may
+			 * also be called when we are disabling sink ASEs
+			 */
+			return;
+		}
+	}
+
+	if (bt_cap_common_proc_is_aborted()) {
+		if (bt_cap_common_proc_all_handled()) {
+			cap_initiator_unicast_audio_proc_complete();
+		}
+
+		return;
+	}
+
+	if (!bt_cap_common_proc_is_done()) {
+		struct bt_cap_initiator_proc_param *proc_param;
+		struct bt_cap_stream *next_cap_stream;
+		struct bt_bap_stream *next_bap_stream;
+		int err;
+
+		proc_param = get_next_proc_param(active_proc);
+		__ASSERT(proc_param != NULL, "proc is not done, but could not get next proc_param");
+		next_cap_stream = proc_param->stream;
+		next_bap_stream = &next_cap_stream->bap_stream;
+
+		active_proc->proc_initiated_cnt++;
+
+		err = bt_bap_stream_stop(next_bap_stream);
+		if (err != 0) {
+			LOG_DBG("Failed to stop stream %p: %d", next_cap_stream, err);
+
+			bt_cap_common_abort_proc(next_bap_stream->conn, err);
+			cap_initiator_unicast_audio_proc_complete();
+		}
+	} else {
+		/* We are done stopping streams now - We mark the next subproc. If
+		 * get_next_proc_param returns a NULL value it means that we are complete done. If
+		 * it returns a non-NULL value, it means that we need to start releasing streams.
+		 * However, since the QoS Configured state is better suited to trigger this, we
+		 * simply wait until bt_cap_initiator_qos_configured is called.
+		 */
+		struct bt_cap_initiator_proc_param *proc_param;
+
+		if (!bt_cap_common_proc_is_done()) {
+			/* We are still disabling or stopping some */
+			return;
+		}
+
+		bt_cap_common_set_subproc(BT_CAP_COMMON_SUBPROC_TYPE_RELEASE);
+
+		proc_param = get_next_proc_param(active_proc);
+		if (proc_param == NULL) {
+			/* If proc_param is NULL then this step is a no-op and we can finish the
+			 * procedure
+			 */
+			cap_initiator_unicast_audio_proc_complete();
+
+			return;
+		} /* wait for bt_cap_initiator_qos_configured */
+	}
+}
+
 void bt_cap_initiator_released(struct bt_cap_stream *cap_stream)
 {
 	struct bt_cap_common_proc *active_proc = bt_cap_common_get_active_proc();
@@ -1748,23 +2029,22 @@ void bt_cap_initiator_released(struct bt_cap_stream *cap_stream)
 	}
 
 	if (!bt_cap_common_proc_is_done()) {
-		struct bt_cap_stream *next_cap_stream =
-			active_proc->proc_param.initiator[active_proc->proc_done_cnt].stream;
-		struct bt_bap_stream *bap_stream = &next_cap_stream->bap_stream;
+		struct bt_cap_initiator_proc_param *proc_param;
+		struct bt_cap_stream *next_cap_stream;
+		struct bt_bap_stream *next_bap_stream;
 		int err;
 
+		proc_param = get_next_proc_param(active_proc);
+		__ASSERT(proc_param != NULL, "proc is not done, but could not get next proc_param");
+		next_cap_stream = proc_param->stream;
+		next_bap_stream = &next_cap_stream->bap_stream;
 		active_proc->proc_initiated_cnt++;
-		/* Since BAP operations may require a write long or a read long on the
-		 * notification, we cannot assume that we can do multiple streams at once,
-		 * thus do it one at a time.
-		 * TODO: We should always be able to do one per ACL, so there is room for
-		 * optimization.
-		 */
-		err = bt_bap_stream_release(bap_stream);
+
+		err = bt_bap_stream_release(next_bap_stream);
 		if (err != 0) {
 			LOG_DBG("Failed to release stream %p: %d", next_cap_stream, err);
 
-			bt_cap_common_abort_proc(bap_stream->conn, err);
+			bt_cap_common_abort_proc(next_bap_stream->conn, err);
 			cap_initiator_unicast_audio_proc_complete();
 		}
 	} else {
diff --git a/subsys/bluetooth/audio/cap_internal.h b/subsys/bluetooth/audio/cap_internal.h
index 839d4a31757..3543b35c387 100644
--- a/subsys/bluetooth/audio/cap_internal.h
+++ b/subsys/bluetooth/audio/cap_internal.h
@@ -30,6 +30,8 @@ void bt_cap_initiator_enabled(struct bt_cap_stream *cap_stream);
 void bt_cap_initiator_started(struct bt_cap_stream *cap_stream);
 void bt_cap_initiator_connected(struct bt_cap_stream *cap_stream);
 void bt_cap_initiator_metadata_updated(struct bt_cap_stream *cap_stream);
+void bt_cap_initiator_disabled(struct bt_cap_stream *cap_stream);
+void bt_cap_initiator_stopped(struct bt_cap_stream *cap_stream);
 void bt_cap_initiator_released(struct bt_cap_stream *cap_stream);
 void bt_cap_stream_ops_register_bap(struct bt_cap_stream *cap_stream);
 
@@ -61,6 +63,8 @@ enum bt_cap_common_subproc_type {
 	BT_CAP_COMMON_SUBPROC_TYPE_CONNECT,
 	BT_CAP_COMMON_SUBPROC_TYPE_START,
 	BT_CAP_COMMON_SUBPROC_TYPE_META_UPDATE,
+	BT_CAP_COMMON_SUBPROC_TYPE_DISABLE,
+	BT_CAP_COMMON_SUBPROC_TYPE_STOP,
 	BT_CAP_COMMON_SUBPROC_TYPE_RELEASE,
 };
 
@@ -79,6 +83,9 @@ struct bt_cap_initiator_proc_param {
 			/** Codec Specific Capabilities Metadata */
 			uint8_t meta[CONFIG_BT_AUDIO_CODEC_CFG_MAX_METADATA_SIZE];
 		} meta_update;
+		struct {
+			bool release;
+		} stop;
 	};
 };
 
@@ -173,6 +180,7 @@ struct bt_cap_common_proc *bt_cap_common_get_active_proc(void);
 void bt_cap_common_clear_active_proc(void);
 void bt_cap_common_start_proc(enum bt_cap_common_proc_type proc_type, size_t proc_cnt);
 void bt_cap_common_set_subproc(enum bt_cap_common_subproc_type subproc_type);
+bool bt_cap_common_proc_is_type(enum bt_cap_common_proc_type proc_type);
 bool bt_cap_common_subproc_is_type(enum bt_cap_common_subproc_type subproc_type);
 struct bt_conn *bt_cap_common_get_member_conn(enum bt_cap_set_type type,
 					      const union bt_cap_set_member *member);
diff --git a/subsys/bluetooth/audio/cap_stream.c b/subsys/bluetooth/audio/cap_stream.c
index e1ee733a448..bbc645daa3e 100644
--- a/subsys/bluetooth/audio/cap_stream.c
+++ b/subsys/bluetooth/audio/cap_stream.c
@@ -132,6 +132,11 @@ static void cap_stream_disabled_cb(struct bt_bap_stream *bap_stream)
 
 	LOG_DBG("%p", cap_stream);
 
+	if (IS_ENABLED(CONFIG_BT_CAP_INITIATOR) && IS_ENABLED(CONFIG_BT_BAP_UNICAST_CLIENT) &&
+	    stream_is_central(bap_stream)) {
+		bt_cap_initiator_disabled(cap_stream);
+	}
+
 	if (ops != NULL && ops->disabled != NULL) {
 		ops->disabled(bap_stream);
 	}
@@ -188,6 +193,11 @@ static void cap_stream_stopped_cb(struct bt_bap_stream *bap_stream, uint8_t reas
 
 	LOG_DBG("%p", cap_stream);
 
+	if (IS_ENABLED(CONFIG_BT_CAP_INITIATOR) && IS_ENABLED(CONFIG_BT_BAP_UNICAST_CLIENT) &&
+	    stream_is_central(bap_stream)) {
+		bt_cap_initiator_stopped(cap_stream);
+	}
+
 	if (ops != NULL && ops->stopped != NULL) {
 		ops->stopped(bap_stream, reason);
 	}
diff --git a/subsys/bluetooth/audio/shell/cap_initiator.c b/subsys/bluetooth/audio/shell/cap_initiator.c
index 197c46059be..3027edf4d73 100644
--- a/subsys/bluetooth/audio/shell/cap_initiator.c
+++ b/subsys/bluetooth/audio/shell/cap_initiator.c
@@ -532,6 +532,7 @@ static int cmd_cap_initiator_unicast_stop(const struct shell *sh, size_t argc,
 
 	param.streams = streams;
 	param.type = BT_CAP_SET_TYPE_AD_HOC;
+	param.release = true;
 
 	err = bt_cap_initiator_unicast_audio_stop(&param);
 	if (err != 0) {
diff --git a/tests/bluetooth/audio/cap_initiator/CMakeLists.txt b/tests/bluetooth/audio/cap_initiator/CMakeLists.txt
index 2c7096e8c32..8502038e975 100644
--- a/tests/bluetooth/audio/cap_initiator/CMakeLists.txt
+++ b/tests/bluetooth/audio/cap_initiator/CMakeLists.txt
@@ -17,4 +17,5 @@ target_sources(testbinary
     src/main.c
     src/test_common.c
     src/test_unicast_start.c
+    src/test_unicast_stop.c
 )
diff --git a/tests/bluetooth/audio/cap_initiator/prj.conf b/tests/bluetooth/audio/cap_initiator/prj.conf
index 18afc819e24..7f34c72a09a 100644
--- a/tests/bluetooth/audio/cap_initiator/prj.conf
+++ b/tests/bluetooth/audio/cap_initiator/prj.conf
@@ -22,3 +22,5 @@ CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SRC_COUNT=2
 CONFIG_ASSERT=y
 CONFIG_ASSERT_LEVEL=2
 CONFIG_ASSERT_VERBOSE=y
+
+CONFIG_BT_BAP_STREAM_LOG_LEVEL_DBG=y
diff --git a/tests/bluetooth/audio/cap_initiator/src/main.c b/tests/bluetooth/audio/cap_initiator/src/main.c
index 54b78f0efe2..a15c1fc1c1f 100644
--- a/tests/bluetooth/audio/cap_initiator/src/main.c
+++ b/tests/bluetooth/audio/cap_initiator/src/main.c
@@ -24,8 +24,6 @@
 #include "ztest_assert.h"
 #include "ztest_test.h"
 
-DEFINE_FFF_GLOBALS;
-
 static void mock_init_rule_before(const struct ztest_unit_test *test, void *fixture)
 {
 	test_mocks_init();
diff --git a/tests/bluetooth/audio/cap_initiator/src/test_common.c b/tests/bluetooth/audio/cap_initiator/src/test_common.c
index dbb0c8a9470..fc8d2b10ae2 100644
--- a/tests/bluetooth/audio/cap_initiator/src/test_common.c
+++ b/tests/bluetooth/audio/cap_initiator/src/test_common.c
@@ -18,6 +18,8 @@
 #include "test_common.h"
 #include "ztest_assert.h"
 
+DEFINE_FFF_GLOBALS;
+
 void test_mocks_init(void)
 {
 	mock_cap_initiator_init();
diff --git a/tests/bluetooth/audio/cap_initiator/src/test_unicast_start.c b/tests/bluetooth/audio/cap_initiator/src/test_unicast_start.c
index 7ff7f2472ff..27eb4773926 100644
--- a/tests/bluetooth/audio/cap_initiator/src/test_unicast_start.c
+++ b/tests/bluetooth/audio/cap_initiator/src/test_unicast_start.c
@@ -30,8 +30,6 @@
 #include "ztest_assert.h"
 #include "ztest_test.h"
 
-#define FFF_GLOBALS
-
 struct cap_initiator_test_unicast_start_fixture {
 	struct bt_cap_stream cap_streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT];
 	struct bt_bap_ep eps[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT];
diff --git a/tests/bluetooth/audio/cap_initiator/src/test_unicast_stop.c b/tests/bluetooth/audio/cap_initiator/src/test_unicast_stop.c
new file mode 100644
index 00000000000..50175f588d0
--- /dev/null
+++ b/tests/bluetooth/audio/cap_initiator/src/test_unicast_stop.c
@@ -0,0 +1,482 @@
+/* test_unicast_stop.c - unit test for unicast stop procedure */
+
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <errno.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/bap.h>
+#include <zephyr/bluetooth/audio/bap_lc3_preset.h>
+#include <zephyr/bluetooth/audio/cap.h>
+#include <zephyr/bluetooth/hci_types.h>
+#include <zephyr/fff.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
+#include <sys/errno.h>
+
+#include "bap_endpoint.h"
+#include "cap_initiator.h"
+#include "conn.h"
+#include "expects_util.h"
+#include "test_common.h"
+#include "ztest_assert.h"
+#include "ztest_test.h"
+
+struct cap_initiator_test_unicast_stop_fixture {
+	struct bt_cap_stream cap_streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT];
+	struct bt_bap_ep eps[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT];
+	struct bt_bap_unicast_group unicast_group;
+	struct bt_conn conns[CONFIG_BT_MAX_CONN];
+	struct bt_bap_lc3_preset preset;
+};
+
+static void cap_initiator_test_unicast_stop_fixture_init(
+	struct cap_initiator_test_unicast_stop_fixture *fixture)
+{
+	fixture->preset = (struct bt_bap_lc3_preset)BT_BAP_LC3_UNICAST_PRESET_16_2_1(
+		BT_AUDIO_LOCATION_MONO_AUDIO, BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED);
+
+	for (size_t i = 0U; i < ARRAY_SIZE(fixture->conns); i++) {
+		test_conn_init(&fixture->conns[i]);
+	}
+
+	for (size_t i = 0U; i < ARRAY_SIZE(fixture->eps); i++) {
+		fixture->eps[i].dir = (i & 1) + 1; /* Makes it either 1 or 2 (sink or source)*/
+	}
+
+	for (size_t i = 0U; i < ARRAY_SIZE(fixture->cap_streams); i++) {
+		struct bt_cap_stream *cap_stream = &fixture->cap_streams[i];
+		struct bt_bap_stream *bap_stream = &cap_stream->bap_stream;
+
+		sys_slist_append(&fixture->unicast_group.streams, &bap_stream->_node);
+		bap_stream->group = &fixture->unicast_group;
+	}
+}
+
+static void *cap_initiator_test_unicast_stop_setup(void)
+{
+	struct cap_initiator_test_unicast_stop_fixture *fixture;
+
+	fixture = malloc(sizeof(*fixture));
+	zassert_not_null(fixture);
+
+	return fixture;
+}
+
+static void cap_initiator_test_unicast_stop_before(void *f)
+{
+	int err;
+
+	memset(f, 0, sizeof(struct cap_initiator_test_unicast_stop_fixture));
+	cap_initiator_test_unicast_stop_fixture_init(f);
+
+	err = bt_cap_initiator_register_cb(&mock_cap_initiator_cb);
+	zassert_equal(0, err, "Unexpected return value %d", err);
+}
+
+static void cap_initiator_test_unicast_stop_after(void *f)
+{
+	struct cap_initiator_test_unicast_stop_fixture *fixture = f;
+
+	bt_cap_initiator_unregister_cb(&mock_cap_initiator_cb);
+
+	for (size_t i = 0; i < ARRAY_SIZE(fixture->conns); i++) {
+		mock_bt_conn_disconnected(&fixture->conns[i], BT_HCI_ERR_REMOTE_USER_TERM_CONN);
+	}
+
+	/* In the case of a test failing, we cancel the procedure so that subsequent won't fail */
+	bt_cap_initiator_unicast_audio_cancel();
+}
+
+static void cap_initiator_test_unicast_stop_teardown(void *f)
+{
+	free(f);
+}
+
+ZTEST_SUITE(cap_initiator_test_unicast_stop, NULL, cap_initiator_test_unicast_stop_setup,
+	    cap_initiator_test_unicast_stop_before, cap_initiator_test_unicast_stop_after,
+	    cap_initiator_test_unicast_stop_teardown);
+
+static ZTEST_F(cap_initiator_test_unicast_stop,
+	       test_initiator_unicast_stop_disable_state_codec_configured)
+{
+	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
+	const struct bt_cap_unicast_audio_stop_param param = {
+		.type = BT_CAP_SET_TYPE_AD_HOC,
+		.count = ARRAY_SIZE(streams),
+		.streams = streams,
+		.release = false,
+	};
+	int err;
+
+	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
+		streams[i] = &fixture->cap_streams[i];
+
+		test_unicast_set_state(streams[i], &fixture->conns[i % ARRAY_SIZE(fixture->conns)],
+				       &fixture->eps[i], &fixture->preset,
+				       BT_BAP_EP_STATE_CODEC_CONFIGURED);
+	}
+
+	err = bt_cap_initiator_unicast_audio_stop(&param);
+	zassert_equal(err, -EALREADY, "Unexpected return value %d", err);
+
+	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 0,
+			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
+
+	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
+		const struct bt_bap_stream *bap_stream = &fixture->cap_streams[i].bap_stream;
+		const enum bt_bap_ep_state state = bap_stream->ep->status.state;
+
+		zassert_equal(state, BT_BAP_EP_STATE_CODEC_CONFIGURED,
+			      "[%zu]: Stream %p unexpected state: %d", i, bap_stream, state);
+	}
+}
+
+static ZTEST_F(cap_initiator_test_unicast_stop,
+	       test_initiator_unicast_stop_disable_state_qos_configured)
+{
+	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
+	const struct bt_cap_unicast_audio_stop_param param = {
+		.type = BT_CAP_SET_TYPE_AD_HOC,
+		.count = ARRAY_SIZE(streams),
+		.streams = streams,
+		.release = false,
+	};
+	int err;
+
+	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
+		streams[i] = &fixture->cap_streams[i];
+
+		test_unicast_set_state(streams[i], &fixture->conns[i % ARRAY_SIZE(fixture->conns)],
+				       &fixture->eps[i], &fixture->preset,
+				       BT_BAP_EP_STATE_QOS_CONFIGURED);
+	}
+
+	err = bt_cap_initiator_unicast_audio_stop(&param);
+	zassert_equal(err, -EALREADY, "Unexpected return value %d", err);
+
+	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 0,
+			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
+
+	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
+		const struct bt_bap_stream *bap_stream = &fixture->cap_streams[i].bap_stream;
+		const enum bt_bap_ep_state state = bap_stream->ep->status.state;
+
+		zassert_equal(state, BT_BAP_EP_STATE_QOS_CONFIGURED,
+			      "[%zu]: Stream %p unexpected state: %d", i, bap_stream, state);
+	}
+}
+
+static ZTEST_F(cap_initiator_test_unicast_stop, test_initiator_unicast_stop_disable_state_enabling)
+{
+	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
+	const struct bt_cap_unicast_audio_stop_param param = {
+		.type = BT_CAP_SET_TYPE_AD_HOC,
+		.count = ARRAY_SIZE(streams),
+		.streams = streams,
+		.release = false,
+	};
+	int err;
+
+	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
+		streams[i] = &fixture->cap_streams[i];
+
+		test_unicast_set_state(streams[i], &fixture->conns[i % ARRAY_SIZE(fixture->conns)],
+				       &fixture->eps[i], &fixture->preset,
+				       BT_BAP_EP_STATE_ENABLING);
+	}
+
+	err = bt_cap_initiator_unicast_audio_stop(&param);
+	zassert_equal(err, 0, "Unexpected return value %d", err);
+
+	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 1,
+			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
+
+	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
+		const struct bt_bap_stream *bap_stream = &fixture->cap_streams[i].bap_stream;
+		const enum bt_bap_ep_state state = bap_stream->ep->status.state;
+
+		zassert_equal(state, BT_BAP_EP_STATE_QOS_CONFIGURED,
+			      "[%zu]: Stream %p unexpected state: %d", i, bap_stream, state);
+	}
+}
+
+static ZTEST_F(cap_initiator_test_unicast_stop, test_initiator_unicast_stop_disable_state_streaming)
+{
+	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
+	const struct bt_cap_unicast_audio_stop_param param = {
+		.type = BT_CAP_SET_TYPE_AD_HOC,
+		.count = ARRAY_SIZE(streams),
+		.streams = streams,
+		.release = false,
+	};
+	int err;
+
+	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
+		streams[i] = &fixture->cap_streams[i];
+
+		test_unicast_set_state(streams[i], &fixture->conns[i % ARRAY_SIZE(fixture->conns)],
+				       &fixture->eps[i], &fixture->preset,
+				       BT_BAP_EP_STATE_STREAMING);
+	}
+
+	err = bt_cap_initiator_unicast_audio_stop(&param);
+	zassert_equal(err, 0, "Unexpected return value %d", err);
+
+	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 1,
+			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
+
+	for (size_t i = 0U; i < ARRAY_SIZE(fixture->cap_streams); i++) {
+		const struct bt_bap_stream *bap_stream = &fixture->cap_streams[i].bap_stream;
+		const enum bt_bap_ep_state state = bap_stream->ep->status.state;
+
+		zassert_equal(state, BT_BAP_EP_STATE_QOS_CONFIGURED,
+			      "[%zu]: Stream %p unexpected state: %d", i, bap_stream, state);
+	}
+}
+
+static ZTEST_F(cap_initiator_test_unicast_stop,
+	       test_initiator_unicast_stop_release_state_codec_configured)
+{
+	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
+	const struct bt_cap_unicast_audio_stop_param param = {
+		.type = BT_CAP_SET_TYPE_AD_HOC,
+		.count = ARRAY_SIZE(streams),
+		.streams = streams,
+		.release = true,
+	};
+	int err;
+
+	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
+		streams[i] = &fixture->cap_streams[i];
+
+		test_unicast_set_state(streams[i], &fixture->conns[i % ARRAY_SIZE(fixture->conns)],
+				       &fixture->eps[i], &fixture->preset,
+				       BT_BAP_EP_STATE_CODEC_CONFIGURED);
+	}
+
+	err = bt_cap_initiator_unicast_audio_stop(&param);
+	zassert_equal(err, -EALREADY, "Unexpected return value %d", err);
+
+	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 0,
+			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
+
+	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
+		const struct bt_bap_stream *bap_stream = &fixture->cap_streams[i].bap_stream;
+		const enum bt_bap_ep_state state = bap_stream->ep->status.state;
+
+		zassert_equal(state, BT_BAP_EP_STATE_CODEC_CONFIGURED,
+			      "[%zu]: Stream %p unexpected state: %d", i, bap_stream, state);
+	}
+}
+
+static ZTEST_F(cap_initiator_test_unicast_stop,
+	       test_initiator_unicast_stop_release_state_qos_configured)
+{
+	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
+	const struct bt_cap_unicast_audio_stop_param param = {
+		.type = BT_CAP_SET_TYPE_AD_HOC,
+		.count = ARRAY_SIZE(streams),
+		.streams = streams,
+		.release = true,
+	};
+	int err;
+
+	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
+		streams[i] = &fixture->cap_streams[i];
+
+		test_unicast_set_state(streams[i], &fixture->conns[i % ARRAY_SIZE(fixture->conns)],
+				       &fixture->eps[i], &fixture->preset,
+				       BT_BAP_EP_STATE_QOS_CONFIGURED);
+	}
+
+	err = bt_cap_initiator_unicast_audio_stop(&param);
+	zassert_equal(err, 0, "Unexpected return value %d", err);
+
+	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 1,
+			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
+
+	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
+		const struct bt_bap_stream *bap_stream = &fixture->cap_streams[i].bap_stream;
+		const enum bt_bap_ep_state state = fixture->eps[i].status.state;
+
+		zassert_equal(state, BT_BAP_EP_STATE_IDLE, "[%zu]: Stream %p unexpected state: %d",
+			      i, bap_stream, state);
+	}
+}
+
+static ZTEST_F(cap_initiator_test_unicast_stop, test_initiator_unicast_stop_release_state_enabling)
+{
+	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
+	const struct bt_cap_unicast_audio_stop_param param = {
+		.type = BT_CAP_SET_TYPE_AD_HOC,
+		.count = ARRAY_SIZE(streams),
+		.streams = streams,
+		.release = true,
+	};
+	int err;
+
+	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
+		streams[i] = &fixture->cap_streams[i];
+
+		test_unicast_set_state(streams[i], &fixture->conns[i % ARRAY_SIZE(fixture->conns)],
+				       &fixture->eps[i], &fixture->preset,
+				       BT_BAP_EP_STATE_ENABLING);
+	}
+
+	err = bt_cap_initiator_unicast_audio_stop(&param);
+	zassert_equal(err, 0, "Unexpected return value %d", err);
+
+	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 1,
+			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
+
+	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
+		const struct bt_bap_stream *bap_stream = &fixture->cap_streams[i].bap_stream;
+		const enum bt_bap_ep_state state = fixture->eps[i].status.state;
+
+		zassert_equal(state, BT_BAP_EP_STATE_IDLE, "[%zu]: Stream %p unexpected state: %d",
+			      i, bap_stream, state);
+	}
+}
+
+static ZTEST_F(cap_initiator_test_unicast_stop, test_initiator_unicast_stop_release_state_streaming)
+{
+	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
+	const struct bt_cap_unicast_audio_stop_param param = {
+		.type = BT_CAP_SET_TYPE_AD_HOC,
+		.count = ARRAY_SIZE(streams),
+		.streams = streams,
+		.release = true,
+	};
+	int err;
+
+	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
+		streams[i] = &fixture->cap_streams[i];
+
+		test_unicast_set_state(streams[i], &fixture->conns[i % ARRAY_SIZE(fixture->conns)],
+				       &fixture->eps[i], &fixture->preset,
+				       BT_BAP_EP_STATE_ENABLING);
+	}
+
+	err = bt_cap_initiator_unicast_audio_stop(&param);
+	zassert_equal(err, 0, "Unexpected return value %d", err);
+
+	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 1,
+			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
+
+	for (size_t i = 0U; i < ARRAY_SIZE(fixture->cap_streams); i++) {
+		const struct bt_bap_stream *bap_stream = &fixture->cap_streams[i].bap_stream;
+		const enum bt_bap_ep_state state = fixture->eps[i].status.state;
+
+		zassert_equal(state, BT_BAP_EP_STATE_IDLE, "[%zu]: Stream %p unexpected state: %d",
+			      i, bap_stream, state);
+	}
+}
+
+static ZTEST_F(cap_initiator_test_unicast_stop, test_initiator_unicast_stop_inval_param_null)
+{
+	int err;
+
+	err = bt_cap_initiator_unicast_audio_stop(NULL);
+	zassert_equal(err, -EINVAL, "Unexpected return value %d", err);
+
+	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 0,
+			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
+}
+
+static ZTEST_F(cap_initiator_test_unicast_stop,
+	       test_initiator_unicast_stop_inval_param_null_streams)
+{
+	const struct bt_cap_unicast_audio_stop_param param = {
+		.type = BT_CAP_SET_TYPE_AD_HOC,
+		.count = CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT,
+		.streams = NULL,
+		.release = true,
+	};
+	int err;
+
+	err = bt_cap_initiator_unicast_audio_stop(&param);
+	zassert_equal(err, -EINVAL, "Unexpected return value %d", err);
+
+	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 0,
+			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
+}
+
+static ZTEST_F(cap_initiator_test_unicast_stop, test_initiator_unicast_stop_inval_missing_cas)
+{
+	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
+	const struct bt_cap_unicast_audio_stop_param param = {
+		.type = BT_CAP_SET_TYPE_CSIP, /* CSIP requires CAS */
+		.count = ARRAY_SIZE(streams),
+		.streams = streams,
+		.release = true,
+	};
+	int err;
+
+	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
+		streams[i] = &fixture->cap_streams[i];
+
+		test_unicast_set_state(streams[i], &fixture->conns[i % ARRAY_SIZE(fixture->conns)],
+				       &fixture->eps[i], &fixture->preset,
+				       BT_BAP_EP_STATE_STREAMING);
+	}
+
+	err = bt_cap_initiator_unicast_audio_stop(&param);
+	zassert_equal(err, -EINVAL, "Unexpected return value %d", err);
+
+	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 0,
+			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
+}
+
+static ZTEST_F(cap_initiator_test_unicast_stop, test_initiator_unicast_stop_inval_param_zero_count)
+{
+	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
+	const struct bt_cap_unicast_audio_stop_param param = {
+		.type = BT_CAP_SET_TYPE_AD_HOC,
+		.count = 0U,
+		.streams = streams,
+		.release = true,
+	};
+	int err;
+
+	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
+		streams[i] = &fixture->cap_streams[i];
+	}
+
+	err = bt_cap_initiator_unicast_audio_stop(&param);
+	zassert_equal(err, -EINVAL, "Unexpected return value %d", err);
+
+	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 0,
+			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
+}
+
+static ZTEST_F(cap_initiator_test_unicast_stop, test_initiator_unicast_stop_inval_param_inval_count)
+{
+	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
+	const struct bt_cap_unicast_audio_stop_param param = {
+		.type = BT_CAP_SET_TYPE_AD_HOC,
+		.count = CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT + 1U,
+		.streams = streams,
+		.release = true,
+	};
+	int err;
+
+	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
+		streams[i] = &fixture->cap_streams[i];
+	}
+
+	err = bt_cap_initiator_unicast_audio_stop(&param);
+	zassert_equal(err, -EINVAL, "Unexpected return value %d", err);
+
+	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 0,
+			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
+}
diff --git a/tests/bluetooth/audio/cap_initiator/uut/bap_unicast_client.c b/tests/bluetooth/audio/cap_initiator/uut/bap_unicast_client.c
index 52feeeb15d3..387aeaf41ba 100644
--- a/tests/bluetooth/audio/cap_initiator/uut/bap_unicast_client.c
+++ b/tests/bluetooth/audio/cap_initiator/uut/bap_unicast_client.c
@@ -12,6 +12,7 @@
 
 #include <zephyr/bluetooth/audio/audio.h>
 #include <zephyr/bluetooth/audio/bap.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/slist.h>
 #include <sys/errno.h>
@@ -149,7 +150,6 @@ int bt_bap_unicast_client_connect(struct bt_bap_stream *stream)
 	if (stream->ep != NULL && stream->ep->dir == BT_AUDIO_DIR_SINK) {
 		/* Mocking that the unicast server automatically starts the stream */
 		stream->ep->status.state = BT_BAP_EP_STATE_STREAMING;
-		printk("A %s %p\n", __func__, stream);
 
 		if (stream->ops != NULL && stream->ops->started != NULL) {
 			stream->ops->started(stream);
@@ -184,18 +184,105 @@ int bt_bap_unicast_client_start(struct bt_bap_stream *stream)
 
 int bt_bap_unicast_client_disable(struct bt_bap_stream *stream)
 {
-	zassert_unreachable("Unexpected call to '%s()' occurred", __func__);
+	printk("%s %p %d\n", __func__, stream, stream->ep->dir);
+
+	if (stream == NULL || stream->ep == NULL) {
+		return -EINVAL;
+	}
+
+	switch (stream->ep->status.state) {
+	case BT_BAP_EP_STATE_ENABLING:
+	case BT_BAP_EP_STATE_STREAMING:
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	/* Even though the ASCS spec does not have the disabling state for sink ASEs, the unicast
+	 * client implementation fakes the behavior of it and always calls the disabled callback
+	 * when leaving the streaming state in a non-release manner
+	 */
+
+	/* Disabled sink ASEs go directly to the QoS configured state */
+	if (stream->ep->dir == BT_AUDIO_DIR_SINK) {
+		stream->ep->status.state = BT_BAP_EP_STATE_QOS_CONFIGURED;
+
+		if (stream->ops != NULL && stream->ops->disabled != NULL) {
+			stream->ops->disabled(stream);
+		}
+
+		if (stream->ops != NULL && stream->ops->stopped != NULL) {
+			stream->ops->stopped(stream, BT_HCI_ERR_LOCALHOST_TERM_CONN);
+		}
+
+		if (stream->ops != NULL && stream->ops->qos_set != NULL) {
+			stream->ops->qos_set(stream);
+		}
+	} else if (stream->ep->dir == BT_AUDIO_DIR_SOURCE) {
+		stream->ep->status.state = BT_BAP_EP_STATE_DISABLING;
+
+		if (stream->ops != NULL && stream->ops->disabled != NULL) {
+			stream->ops->disabled(stream);
+		}
+	}
+
 	return 0;
 }
 
 int bt_bap_unicast_client_stop(struct bt_bap_stream *stream)
 {
-	zassert_unreachable("Unexpected call to '%s()' occurred", __func__);
+	printk("%s %p\n", __func__, stream);
+
+	/* As per the ASCS spec, only source streams can be stopped by the client */
+	if (stream == NULL || stream->ep == NULL || stream->ep->dir == BT_AUDIO_DIR_SINK) {
+		return -EINVAL;
+	}
+
+	switch (stream->ep->status.state) {
+	case BT_BAP_EP_STATE_DISABLING:
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	stream->ep->status.state = BT_BAP_EP_STATE_QOS_CONFIGURED;
+
+	if (stream->ops != NULL && stream->ops->stopped != NULL) {
+		stream->ops->stopped(stream, BT_HCI_ERR_LOCALHOST_TERM_CONN);
+	}
+
+	if (stream->ops != NULL && stream->ops->qos_set != NULL) {
+		stream->ops->qos_set(stream);
+	}
+
 	return 0;
 }
 
 int bt_bap_unicast_client_release(struct bt_bap_stream *stream)
 {
-	zassert_unreachable("Unexpected call to '%s()' occurred", __func__);
+	printk("%s %p\n", __func__, stream);
+
+	if (stream == NULL || stream->ep == NULL) {
+		return -EINVAL;
+	}
+
+	switch (stream->ep->status.state) {
+	case BT_BAP_EP_STATE_CODEC_CONFIGURED:
+	case BT_BAP_EP_STATE_QOS_CONFIGURED:
+	case BT_BAP_EP_STATE_ENABLING:
+	case BT_BAP_EP_STATE_STREAMING:
+	case BT_BAP_EP_STATE_DISABLING:
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	stream->ep->status.state = BT_BAP_EP_STATE_IDLE;
+	bt_bap_stream_reset(stream);
+
+	if (stream->ops != NULL && stream->ops->released != NULL) {
+		stream->ops->released(stream);
+	}
+
 	return 0;
 }
diff --git a/tests/bluetooth/tester/src/audio/btp_cap.c b/tests/bluetooth/tester/src/audio/btp_cap.c
index 3c42ad292f7..fda96ee3602 100644
--- a/tests/bluetooth/tester/src/audio/btp_cap.c
+++ b/tests/bluetooth/tester/src/audio/btp_cap.c
@@ -438,6 +438,7 @@ static uint8_t btp_cap_unicast_audio_stop(const void *cmd, uint16_t cmd_len,
 	param.streams = streams;
 	param.count = stream_cnt;
 	param.type = BT_CAP_SET_TYPE_AD_HOC;
+	param.release = true;
 
 	err = bt_cap_initiator_unicast_audio_stop(&param);
 	if (err != 0) {
diff --git a/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c b/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c
index 24c697e0339..719ef3f742c 100644
--- a/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c
+++ b/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c
@@ -682,17 +682,6 @@ static void unicast_audio_update(void)
 	printk("READ LONG META\n");
 }
 
-static void unicast_audio_stop_inval(void)
-{
-	int err;
-
-	err = bt_cap_initiator_unicast_audio_stop(NULL);
-	if (err == 0) {
-		FAIL("bt_cap_initiator_unicast_audio_stop with NULL param did not fail\n");
-		return;
-	}
-}
-
 static void unicast_audio_stop(struct bt_bap_unicast_group *unicast_group)
 {
 	struct bt_cap_unicast_audio_stop_param param;
@@ -701,8 +690,30 @@ static void unicast_audio_stop(struct bt_bap_unicast_group *unicast_group)
 	param.type = BT_CAP_SET_TYPE_AD_HOC;
 	param.count = non_idle_streams_cnt;
 	param.streams = non_idle_streams;
+	param.release = false;
+
+	/* Stop without release first to verify that we enter the QoS Configured state */
+	UNSET_FLAG(flag_stopped);
+
+	err = bt_cap_initiator_unicast_audio_stop(&param);
+	if (err != 0) {
+		FAIL("Failed to stop unicast audio without release: %d\n", err);
+		return;
+	}
+
+	WAIT_FOR_FLAG(flag_stopped);
+
+	/* Verify that it cannot be stopped twice */
+	err = bt_cap_initiator_unicast_audio_stop(&param);
+	if (err == 0) {
+		FAIL("bt_cap_initiator_unicast_audio_stop without release with already-stopped "
+		     "streams did not fail\n");
+		return;
+	}
 
+	/* Stop with release first to verify that we enter the idle state */
 	UNSET_FLAG(flag_stopped);
+	param.release = true;
 
 	err = bt_cap_initiator_unicast_audio_stop(&param);
 	if (err != 0) {
@@ -820,7 +831,6 @@ static void test_main_cap_initiator_unicast_inval(void)
 	unicast_audio_update_inval();
 	unicast_audio_update();
 
-	unicast_audio_stop_inval();
 	unicast_audio_stop(unicast_group);
 
 	unicast_group_delete_inval();
diff --git a/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c b/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c
index be16111858e..a9d80d39dd6 100644
--- a/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c
+++ b/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c
@@ -928,6 +928,7 @@ static void unicast_audio_stop(struct bt_bap_unicast_group *unicast_group)
 	param.type = BT_CAP_SET_TYPE_AD_HOC;
 	param.count = started_unicast_streams_cnt;
 	param.streams = started_unicast_streams;
+	param.release = true;
 
 	err = bt_cap_initiator_unicast_audio_stop(&param);
 	if (err != 0) {

From 865e0aac5827999356601e6edb0e13c0a70859bf Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Thu, 10 Oct 2024 21:03:33 +0200
Subject: [PATCH 0672/2913] [nrf fromtree] Bluetooth: Tester: Added flag
 parameter to CAP stop cmd

Added a flag parameter so that it is possible
to use the bt_cap_initiator_unicast_audio_stop to perform
disable+stop without releasing the streams by setting the
RELEASE flag.

This allows us to use the bt_cap_initiator_unicast_audio_stop
function to just disable streams without releasing them,
as that is requested by some PTS tests such as
CAP/INI/UST/BV-40-C.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit 0fa9701a260d49f946e46841a607b14065b715c3)
(cherry picked from commit 4e720cc0a057d14451d050c56c65378aa23eb650)
---
 tests/bluetooth/tester/src/audio/btp/btp_cap.h | 2 ++
 tests/bluetooth/tester/src/audio/btp_cap.c     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/bluetooth/tester/src/audio/btp/btp_cap.h b/tests/bluetooth/tester/src/audio/btp/btp_cap.h
index 4369e87536a..1d0f9037abb 100644
--- a/tests/bluetooth/tester/src/audio/btp/btp_cap.h
+++ b/tests/bluetooth/tester/src/audio/btp/btp_cap.h
@@ -60,7 +60,9 @@ struct btp_cap_unicast_audio_update_data {
 #define BTP_CAP_UNICAST_AUDIO_STOP		0x06
 struct btp_cap_unicast_audio_stop_cmd {
 	uint8_t cig_id;
+	uint8_t flags;
 } __packed;
+#define BTP_CAP_UNICAST_AUDIO_STOP_FLAG_RELEASE BIT(0)
 
 #define BTP_CAP_BROADCAST_SOURCE_SETUP_STREAM	0x07
 struct btp_cap_broadcast_source_setup_stream_cmd {
diff --git a/tests/bluetooth/tester/src/audio/btp_cap.c b/tests/bluetooth/tester/src/audio/btp_cap.c
index fda96ee3602..0009abedb63 100644
--- a/tests/bluetooth/tester/src/audio/btp_cap.c
+++ b/tests/bluetooth/tester/src/audio/btp_cap.c
@@ -438,7 +438,7 @@ static uint8_t btp_cap_unicast_audio_stop(const void *cmd, uint16_t cmd_len,
 	param.streams = streams;
 	param.count = stream_cnt;
 	param.type = BT_CAP_SET_TYPE_AD_HOC;
-	param.release = true;
+	param.release = (cp->flags & BTP_CAP_UNICAST_AUDIO_STOP_FLAG_RELEASE) != 0;
 
 	err = bt_cap_initiator_unicast_audio_stop(&param);
 	if (err != 0) {

From cb361af71f3d060b5f4277e483a8423820109dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Rist=20Sk=C3=B8ien?=
 <kristoffer.skoien@nordicsemi.no>
Date: Sun, 8 Sep 2024 13:44:26 +0200
Subject: [PATCH 0673/2913] [nrf fromtree] shell: Added assert
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Assert to check columns. Averts a potential divide by zero

Signed-off-by: Kristoffer Rist Skøien <kristoffer.skoien@nordicsemi.no>
(cherry picked from commit c73c5d985e15c728729f9ef47a1abceae4fe61c4)
(cherry picked from commit 371a3a5e67d88dc59b3489e73fa06dc423d96b29)
---
 subsys/shell/Kconfig      | 1 +
 subsys/shell/shell.c      | 1 +
 subsys/shell/shell_cmds.c | 7 ++-----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/subsys/shell/Kconfig b/subsys/shell/Kconfig
index 626431b4cae..444e953dddd 100644
--- a/subsys/shell/Kconfig
+++ b/subsys/shell/Kconfig
@@ -91,6 +91,7 @@ config SHELL_PRINTF_BUFF_SIZE
 
 config SHELL_DEFAULT_TERMINAL_WIDTH
 	int "Default terminal width"
+	range 1 $(UINT16_MAX)
 	default 80
 	help
 	  Default terminal width is used to break lines.
diff --git a/subsys/shell/shell.c b/subsys/shell/shell.c
index 3ffe2691417..f55d5002a28 100644
--- a/subsys/shell/shell.c
+++ b/subsys/shell/shell.c
@@ -141,6 +141,7 @@ static void tab_item_print(const struct shell *sh, const char *option,
 
 	columns = (sh->ctx->vt100_ctx.cons.terminal_wid
 			- z_shell_strlen(tab)) / longest_option;
+	__ASSERT_NO_MSG(columns != 0);
 	diff = longest_option - z_shell_strlen(option);
 
 	if (sh->ctx->vt100_ctx.printed_cmd++ % columns == 0U) {
diff --git a/subsys/shell/shell_cmds.c b/subsys/shell/shell_cmds.c
index b1a29799a88..ef82c2b1c68 100644
--- a/subsys/shell/shell_cmds.c
+++ b/subsys/shell/shell_cmds.c
@@ -69,9 +69,6 @@
 /* 10 == {esc, [, 2, 5, 0, ;, 2, 5, 0, '\0'} */
 #define SHELL_CURSOR_POSITION_BUFFER	(10u)
 
-#define SHELL_DEFAULT_TERMINAL_WIDTH 80
-#define SHELL_DEFAULT_TERMINAL_HEIGHT 24
-
 /* Function reads cursor position from terminal. */
 static int cursor_position_get(const struct shell *sh, uint16_t *x, uint16_t *y)
 {
@@ -408,8 +405,8 @@ static int cmd_resize_default(const struct shell *sh,
 	ARG_UNUSED(argv);
 
 	Z_SHELL_VT100_CMD(sh, SHELL_VT100_SETCOL_80);
-	sh->ctx->vt100_ctx.cons.terminal_wid = SHELL_DEFAULT_TERMINAL_WIDTH;
-	sh->ctx->vt100_ctx.cons.terminal_hei = SHELL_DEFAULT_TERMINAL_HEIGHT;
+	sh->ctx->vt100_ctx.cons.terminal_wid = CONFIG_SHELL_DEFAULT_TERMINAL_WIDTH;
+	sh->ctx->vt100_ctx.cons.terminal_hei = CONFIG_SHELL_DEFAULT_TERMINAL_HEIGHT;
 
 	return 0;
 }

From 5c672343d3084e92823aae9c7ea811d8200359a3 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 21 Oct 2024 15:45:16 +0200
Subject: [PATCH 0674/2913] [nrf fromtree] boards nrf_bsim: Add
 NVIC_GetPendingIRQ() equivalent

Add a substitute for NVIC_GetPendingIRQ()

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 1c7540883fb3d2c1c80ef416724e75acc260e762)
(cherry picked from commit a895b2ee4d50e9411c288008b40492b199fb9800)
---
 boards/native/nrf_bsim/common/cmsis/cmsis.c | 5 +++++
 boards/native/nrf_bsim/common/cmsis/cmsis.h | 1 +
 2 files changed, 6 insertions(+)

diff --git a/boards/native/nrf_bsim/common/cmsis/cmsis.c b/boards/native/nrf_bsim/common/cmsis/cmsis.c
index e80aea6b4ff..dac5f82e699 100644
--- a/boards/native/nrf_bsim/common/cmsis/cmsis.c
+++ b/boards/native/nrf_bsim/common/cmsis/cmsis.c
@@ -30,6 +30,11 @@ void NVIC_DisableIRQ(IRQn_Type IRQn)
 	hw_irq_ctrl_disable_irq(CONFIG_NATIVE_SIMULATOR_MCU_N, IRQn);
 }
 
+uint32_t NVIC_GetPendingIRQ(IRQn_Type IRQn)
+{
+	return hw_irq_ctrl_is_irq_pending(CONFIG_NATIVE_SIMULATOR_MCU_N, IRQn);
+}
+
 void NVIC_EnableIRQ(IRQn_Type IRQn)
 {
 	hw_irq_ctrl_enable_irq(CONFIG_NATIVE_SIMULATOR_MCU_N, IRQn);
diff --git a/boards/native/nrf_bsim/common/cmsis/cmsis.h b/boards/native/nrf_bsim/common/cmsis/cmsis.h
index ff9030ca547..2afc6e9ae50 100644
--- a/boards/native/nrf_bsim/common/cmsis/cmsis.h
+++ b/boards/native/nrf_bsim/common/cmsis/cmsis.h
@@ -30,6 +30,7 @@ void __set_PRIMASK(uint32_t primask);
 void NVIC_SetPendingIRQ(IRQn_Type IRQn);
 void NVIC_ClearPendingIRQ(IRQn_Type IRQn);
 void NVIC_DisableIRQ(IRQn_Type IRQn);
+uint32_t NVIC_GetPendingIRQ(IRQn_Type IRQn);
 void NVIC_EnableIRQ(IRQn_Type IRQn);
 void NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority);
 uint32_t NVIC_GetPriority(IRQn_Type IRQn);

From a65ec83749c94e331396c43c72c5542555d642ac Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 21 Oct 2024 14:27:59 +0200
Subject: [PATCH 0675/2913] [nrf fromtree] boards nrf_bsim: Provide
 IRQ_PRIO_LOWEST

Some apps use it, so let's provide it.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit c4e6ec89a7db966a5d36fd70d3aa8cfb7a78e6a1)
(cherry picked from commit 1ee4051f27c78e7da40e0091b3b03b722d31165b)
---
 boards/native/nrf_bsim/board_irq.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boards/native/nrf_bsim/board_irq.h b/boards/native/nrf_bsim/board_irq.h
index e1a385194fb..38f359fdf62 100644
--- a/boards/native/nrf_bsim/board_irq.h
+++ b/boards/native/nrf_bsim/board_irq.h
@@ -18,6 +18,7 @@ void nrfbsim_WFE_model(void);
 void nrfbsim_SEV_model(void);
 
 #define IRQ_ZERO_LATENCY	BIT(1) /* Unused in this board*/
+#define IRQ_PRIO_LOWEST		UINT8_MAX
 
 #ifdef __cplusplus
 }

From 86d9e18824b24e36f3540bfb62398616caad1230 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 21 Oct 2024 14:25:34 +0200
Subject: [PATCH 0676/2913] [nrf fromtree] manifest: Update nRF hw models to
 latest

Update the HW models module to:
aca798cf7cf0c5dc1fd89c66cf62670051feb8d0

Including the following:
* aca798c IRQ controller: Add missing prototype
* 4f108bc IRQ controller: Add API to check if int is pending
* a514448 MDK: provide replacement for SystemCoreClock*

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 15a7819a9bab2682efcb6aad320e374aa4693d66)
(cherry picked from commit da860c60f950e760de02caee640cef507dec48b5)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index dd0275031a6..d5545988bef 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: eeed2591d38e5e9bf89658df67555f2777249fc0
+      revision: aca798cf7cf0c5dc1fd89c66cf62670051feb8d0
       path: modules/bsim_hw_models/nrf_hw_models
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719

From f8e302b7ec0facc8607140bd073fd23e52955037 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 21 Oct 2024 13:42:20 +0200
Subject: [PATCH 0677/2913] [nrf fromtree] native_simulator: Get latest from
 upstream

Align with native_simulator's upstream main
51b27b67addd0073dc86e3d83f492c5cac5c3361

Which includes:
* 51b27b nsi_utils: Add macro for weak declarations

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 6ffbb8c72878c3f3f605f13455b28e23d8d36de0)
(cherry picked from commit 01976a7968bd9fa0a601079c35022e06bfc809e7)
---
 scripts/native_simulator/common/src/include/nsi_utils.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/native_simulator/common/src/include/nsi_utils.h b/scripts/native_simulator/common/src/include/nsi_utils.h
index 997eac30005..43d171a8e89 100644
--- a/scripts/native_simulator/common/src/include/nsi_utils.h
+++ b/scripts/native_simulator/common/src/include/nsi_utils.h
@@ -28,6 +28,7 @@
 #define NSI_CODE_UNREACHABLE __builtin_unreachable()
 
 #define NSI_FUNC_NORETURN __attribute__((__noreturn__))
+#define NSI_WEAK __attribute__((__weak__))
 
 #if defined(__clang__)
   /* The address sanitizer in llvm adds padding (redzones) after data

From 1ddd67a0d20e4f99fffb17f8da52cb9a14981554 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Wed, 6 Nov 2024 08:32:29 +0100
Subject: [PATCH 0678/2913] Revert "[nrf noup] dts: Select SoftDevice
 Controller DTS binding as default"

This reverts commit 8d6a853718ee5be65221d5187fa32793e44b8bdb.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 4ce1668444206583c0e6d8d6d7f85cdcadf2060c)
---
 dts/arm/nordic/nrf52805.dtsi                  |  11 +-
 dts/arm/nordic/nrf52810.dtsi                  |  11 +-
 dts/arm/nordic/nrf52811.dtsi                  |  11 +-
 dts/arm/nordic/nrf52820.dtsi                  |  11 +-
 dts/arm/nordic/nrf52832.dtsi                  |  11 +-
 dts/arm/nordic/nrf52833.dtsi                  |  11 +-
 dts/arm/nordic/nrf52840.dtsi                  |   9 +-
 dts/arm/nordic/nrf5340_cpunet.dtsi            |  11 +-
 dts/arm/nordic/nrf54h20_cpurad.dtsi           |   4 +-
 dts/arm/nordic/nrf54l15_cpuapp.dtsi           |   2 +-
 dts/common/nordic/nrf54h20.dtsi               |   7 +-
 dts/common/nordic/nrf54l15.dtsi               |   7 +-
 .../bluetooth/bap_broadcast_sink/sample.yaml  |   4 +-
 .../bap_broadcast_source/sample.yaml          |   4 +-
 .../bap_broadcast_source/sysbuild.cmake       |   4 -
 .../bluetooth/bap_unicast_client/sample.yaml  |   4 +-
 .../bap_unicast_client/sysbuild.cmake         |   4 -
 .../bluetooth/bap_unicast_server/sample.yaml  |   4 +-
 .../bap_unicast_server/sysbuild.cmake         |   4 -
 samples/bluetooth/beacon/sample.yaml          |   4 +-
 .../bluetooth/cap_initiator/sysbuild.cmake    |   4 -
 .../direction_finding_central/sample.yaml     |  15 +--
 .../sample.yaml                               |  14 +--
 .../sample.yaml                               |  14 +--
 .../direction_finding_peripheral/sample.yaml  |  15 +--
 samples/bluetooth/hci_ipc/sample.yaml         |  34 ++----
 samples/bluetooth/hci_uart/sample.yaml        |  18 +---
 samples/bluetooth/hci_vs_scan_req/sample.yaml |   2 -
 samples/bluetooth/iso_central/sample.yaml     |   6 +-
 .../pbp_public_broadcast_sink/sample.yaml     |   4 +-
 .../pbp_public_broadcast_sink/sysbuild.cmake  |   4 -
 .../pbp_public_broadcast_source/sample.yaml   |   4 +-
 .../sysbuild.cmake                            |   4 -
 .../controller/ll_sw/nordic/lll/lll.c         |   2 +-
 .../controller/ctrl_api/testcase.yaml         |   2 -
 .../controller/ctrl_chmu/testcase.yaml        |   2 -
 .../controller/ctrl_cis_create/testcase.yaml  |   2 -
 .../ctrl_cis_terminate/testcase.yaml          |   2 -
 .../controller/ctrl_collision/testcase.yaml   |   2 -
 .../controller/ctrl_conn_update/testcase.yaml |  11 +-
 .../controller/ctrl_cte_req/testcase.yaml     |   2 -
 .../ctrl_data_length_update/testcase.yaml     |  10 +-
 .../controller/ctrl_encrypt/testcase.yaml     |   2 -
 .../ctrl_feature_exchange/testcase.yaml       |   2 -
 .../controller/ctrl_hci/testcase.yaml         |   2 -
 .../controller/ctrl_invalid/testcase.yaml     |   2 -
 .../controller/ctrl_le_ping/testcase.yaml     |   2 -
 .../ctrl_min_used_chans/testcase.yaml         |   2 -
 .../controller/ctrl_phy_update/testcase.yaml  |   6 +-
 .../controller/ctrl_sca_update/testcase.yaml  |   2 -
 .../controller/ctrl_sw_privacy/testcase.yaml  |   2 -
 .../controller/ctrl_terminate/testcase.yaml   |   2 -
 .../ctrl_tx_buffer_alloc/testcase.yaml        |  22 +---
 .../controller/ctrl_tx_queue/testcase.yaml    |   2 -
 .../controller/ctrl_unsupported/testcase.yaml |   6 +-
 .../controller/ctrl_user_ext/testcase.yaml    |   2 -
 .../controller/ctrl_version/testcase.yaml     |   2 -
 .../df/connection_cte_req/testcase.yaml       |   2 -
 .../df/connection_cte_tx_params/testcase.yaml |   2 -
 .../connectionless_cte_chains/testcase.yaml   |   2 -
 .../df/connectionless_cte_rx/testcase.yaml    |   2 -
 .../df/connectionless_cte_tx/testcase.yaml    |   2 -
 tests/bluetooth/init/testcase.yaml            | 101 +++++-------------
 63 files changed, 118 insertions(+), 362 deletions(-)

diff --git a/dts/arm/nordic/nrf52805.dtsi b/dts/arm/nordic/nrf52805.dtsi
index 8966c4bf684..bd768ca85fe 100644
--- a/dts/arm/nordic/nrf52805.dtsi
+++ b/dts/arm/nordic/nrf52805.dtsi
@@ -11,7 +11,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -97,13 +97,12 @@
 			status = "okay";
 			ble-2mbps-supported;
 
-			bt_hci_sdc: bt_hci_sdc {
-				compatible = "nordic,bt-hci-sdc";
-				status = "okay";
-			};
+			/* Note: In the nRF Connect SDK the SoftDevice Controller
+			 * is added and set as the default Bluetooth Controller.
+			 */
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "disabled";
+				status = "okay";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
index a67d677e7a2..df3e7ab9fa6 100644
--- a/dts/arm/nordic/nrf52810.dtsi
+++ b/dts/arm/nordic/nrf52810.dtsi
@@ -7,7 +7,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -101,13 +101,12 @@
 			status = "okay";
 			ble-2mbps-supported;
 
-			bt_hci_sdc: bt_hci_sdc {
-				compatible = "nordic,bt-hci-sdc";
-				status = "okay";
-			};
+			/* Note: In the nRF Connect SDK the SoftDevice Controller
+			 * is added and set as the default Bluetooth Controller.
+			 */
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "disabled";
+				status = "okay";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi
index 41391b7eb3d..415ece78612 100644
--- a/dts/arm/nordic/nrf52811.dtsi
+++ b/dts/arm/nordic/nrf52811.dtsi
@@ -11,7 +11,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -113,13 +113,12 @@
 				status = "disabled";
 			};
 
-			bt_hci_sdc: bt_hci_sdc {
-				compatible = "nordic,bt-hci-sdc";
-				status = "okay";
-			};
+			/* Note: In the nRF Connect SDK the SoftDevice Controller
+			 * is added and set as the default Bluetooth Controller.
+			 */
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "disabled";
+				status = "okay";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52820.dtsi b/dts/arm/nordic/nrf52820.dtsi
index 4d05bc741a0..4ddecb86a85 100644
--- a/dts/arm/nordic/nrf52820.dtsi
+++ b/dts/arm/nordic/nrf52820.dtsi
@@ -11,7 +11,7 @@
 / {
 
 	chosen {
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -115,13 +115,12 @@
 				status = "disabled";
 			};
 
-			bt_hci_sdc: bt_hci_sdc {
-				compatible = "nordic,bt-hci-sdc";
-				status = "okay";
-			};
+			/* Note: In the nRF Connect SDK another Bluetooth controller
+			 * is added and set as the default.
+			 */
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "disabled";
+				status = "okay";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
index 32245608a80..cd2115028ca 100644
--- a/dts/arm/nordic/nrf52832.dtsi
+++ b/dts/arm/nordic/nrf52832.dtsi
@@ -7,7 +7,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -101,13 +101,12 @@
 			status = "okay";
 			ble-2mbps-supported;
 
-			bt_hci_sdc: bt_hci_sdc {
-				compatible = "nordic,bt-hci-sdc";
-				status = "okay";
-			};
+			/* Note: In the nRF Connect SDK the SoftDevice Controller
+			 * is added and set as the default Bluetooth Controller.
+			 */
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "disabled";
+				status = "okay";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi
index b576401803a..60291420be9 100644
--- a/dts/arm/nordic/nrf52833.dtsi
+++ b/dts/arm/nordic/nrf52833.dtsi
@@ -11,7 +11,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -115,13 +115,12 @@
 				status = "disabled";
 			};
 
-			bt_hci_sdc: bt_hci_sdc {
-				compatible = "nordic,bt-hci-sdc";
-				status = "okay";
-			};
+			/* Note: In the nRF Connect SDK the SoftDevice Controller
+			 * is added and set as the default Bluetooth Controller.
+			 */
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "disabled";
+				status = "okay";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index 98f5e689227..b9c1655a614 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -103,13 +103,12 @@
 				status = "disabled";
 			};
 
-			bt_hci_sdc: bt_hci_sdc {
-				compatible = "nordic,bt-hci-sdc";
-				status = "okay";
-			};
+			/* Note: In the nRF Connect SDK the SoftDevice Controller
+			 * is added and set as the default Bluetooth Controller.
+			 */
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "disabled";
+				status = "okay";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf5340_cpunet.dtsi b/dts/arm/nordic/nrf5340_cpunet.dtsi
index a179c7649c7..4b6c590858c 100644
--- a/dts/arm/nordic/nrf5340_cpunet.dtsi
+++ b/dts/arm/nordic/nrf5340_cpunet.dtsi
@@ -9,7 +9,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -102,13 +102,12 @@
 				status = "disabled";
 			};
 
-			bt_hci_sdc: bt_hci_sdc {
-				compatible = "nordic,bt-hci-sdc";
-				status = "okay";
-			};
+			/* Note: In the nRF Connect SDK the SoftDevice Controller
+			 * is added and set as the default Bluetooth Controller.
+			 */
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "disabled";
+				status = "okay";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf54h20_cpurad.dtsi b/dts/arm/nordic/nrf54h20_cpurad.dtsi
index e8ff2dac3a4..2cfda47afc5 100644
--- a/dts/arm/nordic/nrf54h20_cpurad.dtsi
+++ b/dts/arm/nordic/nrf54h20_cpurad.dtsi
@@ -24,7 +24,7 @@ wdt011: &cpurad_wdt011 {};
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 	};
 
 	soc {
@@ -104,6 +104,6 @@ wdt011: &cpurad_wdt011 {};
 	status = "okay";
 };
 
-&bt_hci_sdc {
+&bt_hci_controller {
 	status = "okay";
 };
diff --git a/dts/arm/nordic/nrf54l15_cpuapp.dtsi b/dts/arm/nordic/nrf54l15_cpuapp.dtsi
index 21d5d1dd6f7..458d5a2e12a 100644
--- a/dts/arm/nordic/nrf54l15_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l15_cpuapp.dtsi
@@ -32,7 +32,7 @@ nvic: &cpuapp_nvic {};
 	};
 };
 
-&bt_hci_sdc {
+&bt_hci_controller {
 	status = "okay";
 };
 
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index f76c273449f..a5391d6dfe4 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -425,10 +425,9 @@
 					status = "disabled";
 				};
 
-				bt_hci_sdc: bt_hci_sdc {
-					compatible = "nordic,bt-hci-sdc";
-					status = "disabled";
-				};
+				/* Note: In the nRF Connect SDK the SoftDevice Controller
+				 * is added and set as the default Bluetooth Controller.
+				 */
 				bt_hci_controller: bt_hci_controller {
 					compatible = "zephyr,bt-hci-ll-sw-split";
 					status = "disabled";
diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index 6299e2f675c..7d59b20d36b 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -244,10 +244,9 @@
 					status = "disabled";
 				};
 
-				bt_hci_sdc: bt_hci_sdc {
-					compatible = "nordic,bt-hci-sdc";
-					status = "disabled";
-				};
+				/* Note: In the nRF Connect SDK the SoftDevice Controller
+				 * is added and set as the default Bluetooth Controller.
+				 */
 				bt_hci_controller: bt_hci_controller {
 					compatible = "zephyr,bt-hci-ll-sw-split";
 					status = "disabled";
diff --git a/samples/bluetooth/bap_broadcast_sink/sample.yaml b/samples/bluetooth/bap_broadcast_sink/sample.yaml
index e19e17d57a0..b6360768f0a 100644
--- a/samples/bluetooth/bap_broadcast_sink/sample.yaml
+++ b/samples/bluetooth/bap_broadcast_sink/sample.yaml
@@ -24,7 +24,5 @@ tests:
       - nrf52_bsim
       - nrf52833dk/nrf52833
       - nrf52840dongle/nrf52840
-    extra_args:
-      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/bap_broadcast_source/sample.yaml b/samples/bluetooth/bap_broadcast_source/sample.yaml
index 4b9b7c705e5..27262103b29 100644
--- a/samples/bluetooth/bap_broadcast_source/sample.yaml
+++ b/samples/bluetooth/bap_broadcast_source/sample.yaml
@@ -25,7 +25,5 @@ tests:
       - nrf52_bsim
       - nrf52833dk/nrf52833
       - nrf52840dongle/nrf52840
-    extra_args:
-      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/bap_broadcast_source/sysbuild.cmake b/samples/bluetooth/bap_broadcast_source/sysbuild.cmake
index d5d260789ff..2523aac8ea7 100644
--- a/samples/bluetooth/bap_broadcast_source/sysbuild.cmake
+++ b/samples/bluetooth/bap_broadcast_source/sysbuild.cmake
@@ -18,10 +18,6 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
-	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
-	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
-	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
-
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/bap_unicast_client/sample.yaml b/samples/bluetooth/bap_unicast_client/sample.yaml
index e69083f2669..536ab9144f0 100644
--- a/samples/bluetooth/bap_unicast_client/sample.yaml
+++ b/samples/bluetooth/bap_unicast_client/sample.yaml
@@ -22,7 +22,5 @@ tests:
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52dk/nrf52832
-    extra_args:
-      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/bap_unicast_client/sysbuild.cmake b/samples/bluetooth/bap_unicast_client/sysbuild.cmake
index d5d260789ff..2523aac8ea7 100644
--- a/samples/bluetooth/bap_unicast_client/sysbuild.cmake
+++ b/samples/bluetooth/bap_unicast_client/sysbuild.cmake
@@ -18,10 +18,6 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
-	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
-	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
-	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
-
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/bap_unicast_server/sample.yaml b/samples/bluetooth/bap_unicast_server/sample.yaml
index 744833234b9..fc14175a2d1 100644
--- a/samples/bluetooth/bap_unicast_server/sample.yaml
+++ b/samples/bluetooth/bap_unicast_server/sample.yaml
@@ -22,7 +22,5 @@ tests:
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52dk/nrf52832
-    extra_args:
-      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/bap_unicast_server/sysbuild.cmake b/samples/bluetooth/bap_unicast_server/sysbuild.cmake
index d5d260789ff..2523aac8ea7 100644
--- a/samples/bluetooth/bap_unicast_server/sysbuild.cmake
+++ b/samples/bluetooth/bap_unicast_server/sysbuild.cmake
@@ -18,10 +18,6 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
-	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
-	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
-	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
-
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/beacon/sample.yaml b/samples/bluetooth/beacon/sample.yaml
index 48a235b481c..6952be223ec 100644
--- a/samples/bluetooth/beacon/sample.yaml
+++ b/samples/bluetooth/beacon/sample.yaml
@@ -17,9 +17,7 @@ tests:
       - nrf52dk/nrf52832
       - nrf54l15dk/nrf54l15/cpuapp
   sample.bluetooth.beacon-coex:
-    extra_args:
-      - CONF_FILE="prj-coex.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE="prj-coex.conf"
     harness: bluetooth
     platform_allow:
       - nrf52840dk/nrf52840
diff --git a/samples/bluetooth/cap_initiator/sysbuild.cmake b/samples/bluetooth/cap_initiator/sysbuild.cmake
index d5d260789ff..2523aac8ea7 100644
--- a/samples/bluetooth/cap_initiator/sysbuild.cmake
+++ b/samples/bluetooth/cap_initiator/sysbuild.cmake
@@ -18,10 +18,6 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
-	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
-	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
-	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
-
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/direction_finding_central/sample.yaml b/samples/bluetooth/direction_finding_central/sample.yaml
index c1d1adae2c4..b0c94537b51 100644
--- a/samples/bluetooth/direction_finding_central/sample.yaml
+++ b/samples/bluetooth/direction_finding_central/sample.yaml
@@ -14,24 +14,15 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding.central.aod_with_controller:
+  sample.bluetooth.direction_finding.central.aod:
     harness: bluetooth
-    extra_args:
-      - OVERLAY_CONFIG="overlay-aod.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG="overlay-aod.conf"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+      - nrf5340dk/nrf5340/cpuapp
     tags: bluetooth
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-  sample.bluetooth.direction_finding.central.aod_host_only:
-    harness: bluetooth
-    extra_args:
-      - OVERLAY_CONFIG="overlay-aod.conf"
-    platform_allow:
-      - nrf5340dk/nrf5340/cpuapp
-    tags: bluetooth
-    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
index 97d4fea9e69..1c79df41275 100644
--- a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
+++ b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
@@ -12,22 +12,14 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding_connectionless_rx.aod_with_controller:
+  sample.bluetooth.direction_finding_connectionless_rx.aod:
     harness: bluetooth
-    extra_args:
-      - OVERLAY_CONFIG="overlay-aod.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG="overlay-aod.conf"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+      - nrf5340dk/nrf5340/cpuapp
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-  sample.bluetooth.direction_finding_connectionless_rx.aod_host_only:
-    harness: bluetooth
-    extra_args:
-      - OVERLAY_CONFIG="overlay-aod.conf"
-    platform_allow:
-      - nrf5340dk/nrf5340/cpuapp
-    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
index e1833b9be8a..1ea189f5088 100644
--- a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
+++ b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
@@ -12,22 +12,14 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding_connectionless.aoa_with_controller:
+  sample.bluetooth.direction_finding_connectionless.aoa:
     harness: bluetooth
-    extra_args:
-      - OVERLAY_CONFIG="overlay-aoa.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG="overlay-aoa.conf"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+      - nrf5340dk/nrf5340/cpuapp
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-  sample.bluetooth.direction_finding_connectionless.aoa_host_only:
-    harness: bluetooth
-    extra_args:
-      - OVERLAY_CONFIG="overlay-aoa.conf"
-    platform_allow:
-      - nrf5340dk/nrf5340/cpuapp
-    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_peripheral/sample.yaml b/samples/bluetooth/direction_finding_peripheral/sample.yaml
index 00a8c0b79d1..126355a735f 100644
--- a/samples/bluetooth/direction_finding_peripheral/sample.yaml
+++ b/samples/bluetooth/direction_finding_peripheral/sample.yaml
@@ -14,24 +14,15 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding.peripheral.aod_with_controller:
+  sample.bluetooth.direction_finding.peripheral.aod:
     harness: bluetooth
-    extra_args:
-      - OVERLAY_CONFIG="overlay-aoa.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG="overlay-aoa.conf"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+      - nrf5340dk/nrf5340/cpuapp
     tags: bluetooth
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-  sample.bluetooth.direction_finding.peripheral.aod_host_only:
-    harness: bluetooth
-    extra_args:
-      - OVERLAY_CONFIG="overlay-aoa.conf"
-    platform_allow:
-      - nrf5340dk/nrf5340/cpuapp
-    tags: bluetooth
-    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/hci_ipc/sample.yaml b/samples/bluetooth/hci_ipc/sample.yaml
index 15d47e6866e..e88726aa45f 100644
--- a/samples/bluetooth/hci_ipc/sample.yaml
+++ b/samples/bluetooth/hci_ipc/sample.yaml
@@ -15,9 +15,7 @@ tests:
   sample.bluetooth.hci_ipc.iso_broadcast.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args:
-      - CONF_FILE="nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE="nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -28,9 +26,7 @@ tests:
   sample.bluetooth.hci_ipc.iso_receive.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args:
-      - CONF_FILE="nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE="nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -40,9 +36,7 @@ tests:
   sample.bluetooth.hci_ipc.bis.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args:
-      - CONF_FILE="nrf5340_cpunet_bis-bt_ll_sw_split.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE="nrf5340_cpunet_bis-bt_ll_sw_split.conf"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -52,9 +46,7 @@ tests:
   sample.bluetooth.hci_ipc.iso_central.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args:
-      - CONF_FILE="nrf5340_cpunet_iso_central-bt_ll_sw_split.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE="nrf5340_cpunet_iso_central-bt_ll_sw_split.conf"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -64,9 +56,7 @@ tests:
   sample.bluetooth.hci_ipc.iso_peripheral.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args:
-      - CONF_FILE="nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE="nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -76,9 +66,7 @@ tests:
   sample.bluetooth.hci_ipc.cis.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args:
-      - CONF_FILE="nrf5340_cpunet_cis-bt_ll_sw_split.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE="nrf5340_cpunet_cis-bt_ll_sw_split.conf"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -88,9 +76,7 @@ tests:
   sample.bluetooth.hci_ipc.iso.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args:
-      - CONF_FILE="nrf5340_cpunet_iso-bt_ll_sw_split.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE="nrf5340_cpunet_iso-bt_ll_sw_split.conf"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340bsim/nrf5340/cpunet
@@ -102,7 +88,6 @@ tests:
     extra_args:
       - CONF_FILE="nrf5340_cpunet_df-bt_ll_sw_split.conf"
       - DTC_OVERLAY_FILE="nrf5340_cpunet_df-bt_ll_sw_split.overlay"
-      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
@@ -113,16 +98,13 @@ tests:
       - CONF_FILE="nrf5340_cpunet_df-bt_ll_sw_split.conf"
       - DTC_OVERLAY_FILE="nrf5340_cpunet_df-bt_ll_sw_split.overlay"
       - CONFIG_BT_CTLR_PHY_CODED=n
-      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
   sample.bluetooth.hci_ipc.mesh.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args:
-      - CONF_FILE="nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE="nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
diff --git a/samples/bluetooth/hci_uart/sample.yaml b/samples/bluetooth/hci_uart/sample.yaml
index 8e64558736a..6c87e6edede 100644
--- a/samples/bluetooth/hci_uart/sample.yaml
+++ b/samples/bluetooth/hci_uart/sample.yaml
@@ -12,9 +12,7 @@ tests:
   sample.bluetooth.hci_uart.nrf52833.df:
     harness: bluetooth
     platform_allow: nrf52833dk/nrf52833
-    extra_args:
-      - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
     tags:
@@ -23,9 +21,7 @@ tests:
   sample.bluetooth.hci_uart.nrf5340_netcore.df:
     harness: bluetooth
     platform_allow: nrf5340dk/nrf5340/cpunet
-    extra_args:
-      - DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
     tags:
@@ -34,9 +30,7 @@ tests:
   sample.bluetooth.hci_uart.nrf52833.df.iq_report:
     harness: bluetooth
     platform_allow: nrf52833dk/nrf52833
-    extra_args:
-      - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
       - CONFIG_BT_CTLR_DTM_HCI_DF_IQ_REPORT=y
@@ -46,9 +40,7 @@ tests:
   sample.bluetooth.hci_uart.nrf5340_netcore.df.iq_report:
     harness: bluetooth
     platform_allow: nrf5340dk/nrf5340/cpunet
-    extra_args:
-      - DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
       - CONFIG_BT_CTLR_DTM_HCI_DF_IQ_REPORT=y
@@ -63,7 +55,6 @@ tests:
     extra_args:
       - OVERLAY_CONFIG=overlay-all-bt_ll_sw_split.conf
       - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
-      - SNIPPET="bt-ll-sw-split"
     tags:
       - uart
       - bluetooth
@@ -86,7 +77,6 @@ tests:
     extra_args:
       - OVERLAY_CONFIG=overlay-all-bt_ll_sw_split.conf
       - DTC_OVERLAY_FILE=./boards/nrf54l15pdk_nrf54l15_cpuapp_df.overlay
-      - SNIPPET="bt-ll-sw-split"
     tags:
       - uart
       - bluetooth
diff --git a/samples/bluetooth/hci_vs_scan_req/sample.yaml b/samples/bluetooth/hci_vs_scan_req/sample.yaml
index 49526522d16..245a83aa0d9 100644
--- a/samples/bluetooth/hci_vs_scan_req/sample.yaml
+++ b/samples/bluetooth/hci_vs_scan_req/sample.yaml
@@ -9,6 +9,4 @@ tests:
       - nrf52dk/nrf52832
     extra_configs:
       - CONFIG_BT_LL_SW_SPLIT=y
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/iso_central/sample.yaml b/samples/bluetooth/iso_central/sample.yaml
index fd5ec7ac4fe..d4350e0d9cf 100644
--- a/samples/bluetooth/iso_central/sample.yaml
+++ b/samples/bluetooth/iso_central/sample.yaml
@@ -11,11 +11,11 @@ tests:
   sample.bluetooth.iso_central.bt_ll_sw_split:
     harness: bluetooth
     platform_allow:
+      - qemu_cortex_m3
+      - qemu_x86
       - nrf52_bsim
       - nrf52833dk/nrf52833
     integration_platforms:
       - nrf52833dk/nrf52833
-    extra_args:
-      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml b/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
index daa63336080..2c4d31fd4b9 100644
--- a/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
+++ b/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
@@ -23,7 +23,5 @@ tests:
     integration_platforms:
       - nrf52_bsim
       - nrf52833dk/nrf52833
-    extra_args:
-      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake b/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake
index d5d260789ff..2523aac8ea7 100644
--- a/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake
+++ b/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake
@@ -18,10 +18,6 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
-	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
-	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
-	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
-
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/pbp_public_broadcast_source/sample.yaml b/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
index 75cdc80ec6f..31809027f29 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
+++ b/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
@@ -23,7 +23,5 @@ tests:
     integration_platforms:
       - nrf52_bsim
       - nrf52833dk/nrf52833
-    extra_args:
-      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake b/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake
index e0a7fd9d175..d3bf7be5b6c 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake
+++ b/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake
@@ -18,10 +18,6 @@ if(NOT("${SB_CONFIG_NET_CORE_BOARD}" STREQUAL ""))
 	 CACHE INTERNAL ""
 	)
 
-	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
-	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
-	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
-
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
index 956834765ce..77b4360cabd 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
@@ -62,7 +62,7 @@ static struct {
 /* FIXME: This could probably use a chosen entropy device instead on relying on
  * the nodelabel being the same as for the old nrf rng.
  */
-static const struct device *const dev_entropy = DEVICE_DT_GET(DT_CHOSEN(zephyr_entropy));
+static const struct device *const dev_entropy = DEVICE_DT_GET(DT_NODELABEL(rng));
 #endif /* CONFIG_ENTROPY_HAS_DRIVER */
 
 static int init_reset(void);
diff --git a/tests/bluetooth/controller/ctrl_api/testcase.yaml b/tests/bluetooth/controller/ctrl_api/testcase.yaml
index 21f178bf9b2..19bf6c9ab49 100644
--- a/tests/bluetooth/controller/ctrl_api/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_api/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_api.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_chmu/testcase.yaml b/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
index 9c3ee626433..f7e8068d60e 100644
--- a/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_chmu.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml b/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
index 2371d7063eb..99612a89bc3 100644
--- a/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_cis_create.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml b/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
index a98229ba45f..956172a89b2 100644
--- a/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_cis_terminate.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_collision/testcase.yaml b/tests/bluetooth/controller/ctrl_collision/testcase.yaml
index daa8f3bc6c3..6086a9a4ebc 100644
--- a/tests/bluetooth/controller/ctrl_collision/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_collision/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_collision.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml b/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
index fc4ecb0b647..5b0bda4b908 100644
--- a/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
@@ -7,18 +7,11 @@ common:
 tests:
   bluetooth.controller.ctrl_conn_update.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_conn_update.apm_test:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_apm.conf
-      - SNIPPET="bt-ll-sw-split"
-
+    extra_args: CONF_FILE=prj_apm.conf
 
   bluetooth.controller.ctrl_conn_update.no_param_req_test:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_no_param_req.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_no_param_req.conf
diff --git a/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml b/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
index c6288aecc43..fd6ff51118d 100644
--- a/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_cte_req.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml b/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
index c7d1174e12b..9778af435b4 100644
--- a/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
@@ -6,17 +6,11 @@ common:
 tests:
   bluetooth.controller.ctrl_data_length_update.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_data_length_update.test_nocodedphy:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_nocoded.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_nocoded.conf
 
   bluetooth.controller.ctrl_data_length_update.test_nophy:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_nophy.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_nophy.conf
diff --git a/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml b/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
index 86dd5bfe4d3..d5bb2cb8b11 100644
--- a/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_encrypt.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml b/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
index 087e49575ff..257542f3612 100644
--- a/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_feature_exchange.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_hci/testcase.yaml b/tests/bluetooth/controller/ctrl_hci/testcase.yaml
index 5e00c85f6f4..c750ebc8dd8 100644
--- a/tests/bluetooth/controller/ctrl_hci/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_hci/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_hci.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_invalid/testcase.yaml b/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
index cee54e6b09e..2d1741931e3 100644
--- a/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_invalid.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml b/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
index 54178905da1..b6a77528f32 100644
--- a/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_le_ping.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml b/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
index a9445cbf8c4..0991b0cdd43 100644
--- a/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_min_used_chans.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml b/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
index d5c49d587a8..1d7da169f1d 100644
--- a/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
@@ -6,10 +6,6 @@ common:
 tests:
   bluetooth.controller.ctrl_phy_update.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
   bluetooth.controller.ctrl_phy_update.test_reduced_buf:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_rx_cnt.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_rx_cnt.conf
diff --git a/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml b/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
index cbc3c3faf72..cbf63aa1b57 100644
--- a/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_sca_update.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml b/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml
index ac5dd6e957e..778606d6954 100644
--- a/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml
@@ -4,5 +4,3 @@ common:
 tests:
   bluetooth.ctrl_sw_privacy.test:
     platform_allow: nrf52_bsim
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_terminate/testcase.yaml b/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
index 6b1409e9653..cbe639401ea 100644
--- a/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_terminate.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml
index 363986bd3d3..614eb7fe94c 100644
--- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml
@@ -6,35 +6,23 @@ common:
 tests:
   bluetooth.controller.ctrl_tx_buffer_alloc.test_0_per_conn:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_1_per_conn:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_1.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_1.conf
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_2_per_conn:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_2.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_2.conf
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_3_per_conn:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_3.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_3.conf
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_max_per_conn_alloc:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_max.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_max.conf
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_max_common_alloc:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_max_common.conf
-       - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_max_common.conf
diff --git a/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml b/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml
index 282b620b317..295ad891a63 100644
--- a/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml
@@ -5,5 +5,3 @@ common:
 tests:
   bluetooth.ctrl_tx_queue.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml b/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml
index 48b18af9353..28aba1a752a 100644
--- a/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml
@@ -6,11 +6,7 @@ common:
 tests:
   bluetooth.controller.ctrl_unsupported.default.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_unsupported.test:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_unsupported.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_unsupported.conf
diff --git a/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml b/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml
index be963df24a8..af319a7a719 100644
--- a/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml
@@ -4,5 +4,3 @@ common:
 tests:
   bluetooth.ctrl_user_ext.test:
     platform_allow: nrf52_bsim
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_version/testcase.yaml b/tests/bluetooth/controller/ctrl_version/testcase.yaml
index 5df86b9bca9..6badcbc7254 100644
--- a/tests/bluetooth/controller/ctrl_version/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_version/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_version.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connection_cte_req/testcase.yaml b/tests/bluetooth/df/connection_cte_req/testcase.yaml
index fbfe4b0d9a1..768aba4a51f 100644
--- a/tests/bluetooth/df/connection_cte_req/testcase.yaml
+++ b/tests/bluetooth/df/connection_cte_req/testcase.yaml
@@ -2,5 +2,3 @@ tests:
   bluetooth.df.conection_cte_req:
     platform_allow: nrf52_bsim
     tags: bluetooth
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml b/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml
index a9986c5b0e5..38a23b0950e 100644
--- a/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml
+++ b/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml
@@ -2,5 +2,3 @@ tests:
   bluetooth.df.conection_cte_tx_params:
     platform_allow: nrf52_bsim
     tags: bluetooth
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml b/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
index 844a7bbb524..6aa5bb0f0c1 100644
--- a/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
@@ -2,5 +2,3 @@ tests:
   bluetooth.df.connectionless_cte_chains:
     platform_allow: nrf52_bsim
     tags: bluetooth
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml b/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml
index c8f08a90843..f839b1910eb 100644
--- a/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml
@@ -2,5 +2,3 @@ tests:
   bluetooth.df.connectionless_cte_rx:
     platform_allow: nrf52_bsim
     tags: bluetooth
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml b/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml
index 491cc0e7e59..77d651d0cbc 100644
--- a/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml
@@ -2,5 +2,3 @@ tests:
   bluetooth.df.connectionless_cte_tx:
     platform_allow: nrf52_bsim
     tags: bluetooth
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/init/testcase.yaml b/tests/bluetooth/init/testcase.yaml
index d0f917f1fe2..69afaaf8b08 100644
--- a/tests/bluetooth/init/testcase.yaml
+++ b/tests/bluetooth/init/testcase.yaml
@@ -74,9 +74,7 @@ tests:
     extra_args: CONF_FILE=prj_9.conf
     platform_allow: qemu_cortex_m3
   bluetooth.init.test_ctlr:
-    extra_args:
-      - CONF_FILE=prj_ctlr.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -88,9 +86,7 @@ tests:
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_4_0:
-    extra_args:
-      - CONF_FILE=prj_ctlr_4_0.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_4_0.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -99,9 +95,7 @@ tests:
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_4_0_dbg:
-    extra_args:
-      - CONF_FILE=prj_ctlr_4_0_dbg.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_4_0_dbg.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -110,9 +104,7 @@ tests:
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_tiny:
-    extra_args:
-      - CONF_FILE=prj_ctlr_tiny.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_tiny.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -124,7 +116,6 @@ tests:
     extra_args:
       - CONF_FILE=prj_ctlr_dbg.conf
       - DTC_OVERLAY_FILE=pa_lna.overlay
-      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -135,7 +126,6 @@ tests:
     extra_args:
       - CONF_FILE=prj_ctlr_5_x_dbg.conf
       - DTC_OVERLAY_FILE=pa_lna.overlay
-      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -147,7 +137,6 @@ tests:
       - CONF_FILE=prj_ctlr.conf
       - CONFIG_BT_CTLR_ADVANCED_FEATURES=y
       - CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER=y
-      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf52840dk/nrf52840
@@ -159,7 +148,6 @@ tests:
   bluetooth.init.test_ctlr_ticker:
     extra_args:
       - CONF_FILE=prj_ctlr_ticker.conf
-      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -167,36 +155,28 @@ tests:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
   bluetooth.init.test_ctlr_broadcaster:
-    extra_args:
-      - CONF_FILE=prj_ctlr_broadcaster.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_broadcaster.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_peripheral:
-    extra_args:
-      - CONF_FILE=prj_ctlr_peripheral.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_peripheral.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_peripheral_priv:
-    extra_args:
-      - CONF_FILE=prj_ctlr_peripheral_priv.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_peripheral_priv.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_observer:
-    extra_args:
-      - CONF_FILE=prj_ctlr_observer.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_observer.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -207,9 +187,7 @@ tests:
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_central:
-    extra_args:
-      - CONF_FILE=prj_ctlr_central.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_central.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -220,9 +198,7 @@ tests:
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_central_priv:
-    extra_args:
-      - CONF_FILE=prj_ctlr_central_priv.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_central_priv.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -233,9 +209,7 @@ tests:
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_broadcaster_ext:
-    extra_args:
-      - CONF_FILE=prj_ctlr_broadcaster_ext.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_broadcaster_ext.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -244,9 +218,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_peripheral_ext:
-    extra_args:
-      - CONF_FILE=prj_ctlr_peripheral_ext.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_peripheral_ext.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -255,9 +227,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_peripheral_ext_priv:
-    extra_args:
-      - CONF_FILE=prj_ctlr_peripheral_ext_priv.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_peripheral_ext_priv.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -266,9 +236,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_oberver_ext:
-    extra_args:
-      - CONF_FILE=prj_ctlr_observer_ext.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_observer_ext.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -277,9 +245,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_central_ext:
-    extra_args:
-      - CONF_FILE=prj_ctlr_central_ext.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_central_ext.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -288,9 +254,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_central_ext_priv:
-    extra_args:
-      - CONF_FILE=prj_ctlr_central_ext_priv.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_central_ext_priv.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -299,9 +263,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_adv:
-    extra_args:
-      - CONF_FILE=prj_ctlr_per_adv.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_per_adv.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -310,9 +272,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_adv_no_adi:
-    extra_args:
-      - CONF_FILE=prj_ctlr_per_adv_no_adi.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_per_adv_no_adi.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -321,9 +281,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_sync:
-    extra_args:
-      - CONF_FILE=prj_ctlr_per_sync.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_per_sync.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -332,9 +290,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_sync_no_adi:
-    extra_args:
-      - CONF_FILE=prj_ctlr_per_sync_no_adi.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_per_sync_no_adi.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -343,9 +299,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_sync_no_filter:
-    extra_args:
-      - CONF_FILE=prj_ctlr_per_sync_no_filter.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_per_sync_no_filter.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -354,9 +308,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_peripheral_iso:
-    extra_args:
-      - CONF_FILE=prj_ctlr_peripheral_iso.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_peripheral_iso.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -365,9 +317,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_central_iso:
-    extra_args:
-      - CONF_FILE=prj_ctlr_central_iso.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_central_iso.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -386,9 +336,7 @@ tests:
       - DTC_OVERLAY_FILE=h5.overlay
     platform_allow: qemu_cortex_m3
   bluetooth.init.test_llcp:
-    extra_args:
-      - CONF_FILE=prj_llcp.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_llcp.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -401,6 +349,5 @@ tests:
     extra_args:
       - CONF_FILE=prj_ctlr.conf
       - CONFIG_BT_RECV_WORKQ_BT=y
-      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840

From 7d515ca485fb0331dd098403361e76cbf8111eea Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Wed, 6 Nov 2024 08:32:29 +0100
Subject: [PATCH 0679/2913] Revert "[nrf noup] boards: nordic: 54L: Complete
 rewrite of the 54l_ns DT"

This reverts commit e02f019aaac99993da5e39a986c2345eeac22dfc.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit ff78b92edf894055eb4de8ebfddeff9d7d8675fc)
---
 ...rf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi |  38 ++++++
 .../nrf54l15pdk_nrf54l15_cpuapp_ns.dts        | 119 ++++++++++++++++--
 2 files changed, 148 insertions(+), 9 deletions(-)
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi

diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi
new file mode 100644
index 00000000000..b4b924e90ef
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+&pinctrl {
+	uart20_default: uart20_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 4)>,
+				<NRF_PSEL(UART_RX, 1, 5)>;
+		};
+	};
+
+	uart20_sleep: uart20_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 4)>,
+				<NRF_PSEL(UART_RX, 1, 5)>;
+			low-power-enable;
+		};
+	};
+
+	uart30_default: uart30_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RX, 0, 1)>;
+		};
+	};
+
+	uart30_sleep: uart30_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RX, 0, 1)>;
+			low-power-enable;
+		};
+	};
+
+};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.dts b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.dts
index 6e05c69c5f9..49fd1ac0ece 100644
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.dts
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.dts
@@ -1,25 +1,90 @@
 /*
  * Copyright (c) 2024 Nordic Semiconductor ASA
  *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
 /dts-v1/;
+#include <nordic/nrf54l15_cpuapp_ns.dtsi>
+#include "nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi"
 
-#define USE_NON_SECURE_ADDRESS_MAP 1
+/ {
+	chosen {
+		zephyr,console = &uart20;
+		/* TODO: NCSDK-24862: We don't support configuring RRAM and SRAM
+		 * regions in the DTS file yet. The partition manager configures
+		 * these regions now.
+		 */
+		zephyr,shell-uart = &uart20;
+		zephyr,flash = &rram0;
+		zephyr,sram = &sram0;
+		zephyr,ieee802154 = &ieee802154;
+	};
 
-#include "nrf54l15_cpuapp_common.dtsi"
+	leds {
+		compatible = "gpio-leds";
+		led0: led_0 {
+			gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
+			label = "Green LED 0";
+		};
+		led1: led_1 {
+			gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
+			label = "Green LED 1";
+		};
+		led2: led_2 {
+			gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+			label = "Green LED 2";
+		};
+		led3: led_3 {
+			gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
+			label = "Green LED 3";
+		};
+	};
 
-/ {
-	compatible = "nordic,nrf54l15pdk_nrf54l15-cpuapp";
-	model = "Nordic nRF54L15 PDK nRF54L15 Application MCU";
+	buttons {
+		compatible = "gpio-keys";
+		button0: button_0 {
+			gpios = <&gpio1 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button 0";
+			zephyr,code = <INPUT_KEY_0>;
+		};
+		button1: button_1 {
+			gpios = <&gpio1 10 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button 1";
+			zephyr,code = <INPUT_KEY_1>;
+		};
+		button2: button_2 {
+			gpios = <&gpio2 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button 2";
+			zephyr,code = <INPUT_KEY_2>;
+		};
+		button3: button_3 {
+			gpios = <&gpio2 10 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button 3";
+			zephyr,code = <INPUT_KEY_3>;
+		};
+	};
 
-	chosen {
-		zephyr,code-partition = &slot0_partition;
-		zephyr,sram = &cpuapp_sram;
+	aliases {
+		led0 = &led0;
+		led1 = &led1;
+		led2 = &led2;
+		led3 = &led3;
+		sw0 = &button0;
+		sw1 = &button1;
+		sw2 = &button2;
+		sw3 = &button3;
 	};
 };
 
+&uart20 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart20_default>;
+	pinctrl-1 = <&uart20_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
 &uart30 {
 	/* Disable so that TF-M can use this UART */
 	status = "disabled";
@@ -29,3 +94,39 @@
 	pinctrl-1 = <&uart30_sleep>;
 	pinctrl-names = "default", "sleep";
 };
+
+&grtc {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpiote30 {
+	status = "okay";
+};
+
+&ieee802154 {
+	status = "okay";
+};
+
+&temp {
+	status = "okay";
+};
+
+&clock {
+	status = "okay";
+};

From f60bfc66ffc288d03097161a6c4388051664aabe Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Wed, 6 Nov 2024 08:32:29 +0100
Subject: [PATCH 0680/2913] Revert "[nrf noup] boards: add
 nrf54l15/nrf54l15/cpuapp/ns as board variant"

This reverts commit 500609863634bf00a675146dcb78f5137aed330a.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 7e8e87e10aab054ebde9074dac836fb8c5e754a5)
---
 boards/nordic/nrf54l15pdk/Kconfig             |  34 -----
 boards/nordic/nrf54l15pdk/Kconfig.defconfig   |  18 ---
 boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk |   2 +-
 boards/nordic/nrf54l15pdk/board.cmake         |   8 --
 boards/nordic/nrf54l15pdk/board.yml           |   2 -
 ...rf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi |  38 -----
 .../nrf54l15pdk_nrf54l15_cpuapp_ns.dts        | 132 ------------------
 .../nrf54l15pdk_nrf54l15_cpuapp_ns.yaml       |  22 ---
 .../nrf54l15pdk_nrf54l15_cpuapp_ns_defconfig  |  31 ----
 9 files changed, 1 insertion(+), 286 deletions(-)
 delete mode 100644 boards/nordic/nrf54l15pdk/Kconfig
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.dts
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.yaml
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns_defconfig

diff --git a/boards/nordic/nrf54l15pdk/Kconfig b/boards/nordic/nrf54l15pdk/Kconfig
deleted file mode 100644
index 8c937c8c890..00000000000
--- a/boards/nordic/nrf54l15pdk/Kconfig
+++ /dev/null
@@ -1,34 +0,0 @@
-# nRF54L15 PDK board configuration
-
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS
-
-config NRF_MPC_REGION_SIZE
-	hex
-	default 0x1000
-	help
-	  Region size for the Memory Protection Controller (MPC) in bytes.
-
-config NRF_TRUSTZONE_FLASH_REGION_SIZE
-	hex
-	default NRF_MPC_REGION_SIZE
-	help
-	  This defines the flash region size from the TRUSTZONE perspective.
-	  It is used when configuring the TRUSTZONE and when setting alignments
-	  requirements for the partitions.
-	  This abstraction allows us to configure TRUSTZONE without depending
-	  on peripheral specific symbols.
-
-config NRF_TRUSTZONE_RAM_REGION_SIZE
-	hex
-	default NRF_MPC_REGION_SIZE
-	help
-	  This defines the RAM region size from the TRUSTZONE perspective.
-	  It is used when configuring the TRUSTZONE and when setting alignments
-	  requirements for the partitions.
-	  This abstraction allows us to configure TRUSTZONE without depending
-	  on peripheral specific symbols.
-
-endif #BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS
diff --git a/boards/nordic/nrf54l15pdk/Kconfig.defconfig b/boards/nordic/nrf54l15pdk/Kconfig.defconfig
index 819ddf25aba..46df08cfa84 100644
--- a/boards/nordic/nrf54l15pdk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l15pdk/Kconfig.defconfig
@@ -12,24 +12,6 @@ config ROM_START_OFFSET
 
 endif # BOARD_NRF54L15PDK_NRF54L15_CPUAPP
 
-if BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS
-
-config BT_CTLR
-	default BT
-
-# By default, if we build for a Non-Secure version of the board,
-# enable building with TF-M as the Secure Execution Environment.
-config BUILD_WITH_TFM
-	default y if BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS
-
-# By default, if we build with TF-M, instruct build system to
-# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
-config TFM_FLASH_MERGED_BINARY
-	default y
-	depends on BUILD_WITH_TFM
-
-endif #BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS
-
 if BOARD_NRF54L15PDK_NRF54L15_CPUFLPR || BOARD_NRF54L15PDK_NRF54L15_CPUFLPR_XIP
 
 # As FLPR has limited memory most of tests does not fit with asserts enabled.
diff --git a/boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk b/boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk
index 09afebc2e09..d5116bd50c6 100644
--- a/boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk
+++ b/boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk
@@ -2,6 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF54L15PDK
-	select SOC_NRF54L15_ENGA_CPUAPP if BOARD_NRF54L15PDK_NRF54L15_CPUAPP || BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS
+	select SOC_NRF54L15_ENGA_CPUAPP if BOARD_NRF54L15PDK_NRF54L15_CPUAPP
 	select SOC_NRF54L15_ENGA_CPUFLPR if BOARD_NRF54L15PDK_NRF54L15_CPUFLPR || \
 					    BOARD_NRF54L15PDK_NRF54L15_CPUFLPR_XIP
diff --git a/boards/nordic/nrf54l15pdk/board.cmake b/boards/nordic/nrf54l15pdk/board.cmake
index 46a6f896e0c..4a6a86a8f8a 100644
--- a/boards/nordic/nrf54l15pdk/board.cmake
+++ b/boards/nordic/nrf54l15pdk/board.cmake
@@ -7,14 +7,6 @@ elseif (CONFIG_SOC_NRF54L15_ENGA_CPUFLPR)
   board_runner_args(jlink "--speed=4000")
 endif()
 
-if(BOARD_NRF54L15PDK_NRF54L15_CPUAPP_NS)
-  set(TFM_PUBLIC_KEY_FORMAT "full")
-endif()
-
-if(CONFIG_TFM_FLASH_MERGED_BINARY)
-  set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex)
-endif()
-
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf54l15pdk/board.yml b/boards/nordic/nrf54l15pdk/board.yml
index 5df0270abe3..e692040f7bd 100644
--- a/boards/nordic/nrf54l15pdk/board.yml
+++ b/boards/nordic/nrf54l15pdk/board.yml
@@ -6,8 +6,6 @@ board:
     variants:
     - name: xip
       cpucluster: cpuflpr
-    - name: ns
-      cpucluster: cpuapp
   revision:
     format: major.minor.patch
     default: "0.3.0"
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi
deleted file mode 100644
index b4b924e90ef..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
- */
-
-&pinctrl {
-	uart20_default: uart20_default {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 1, 4)>,
-				<NRF_PSEL(UART_RX, 1, 5)>;
-		};
-	};
-
-	uart20_sleep: uart20_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 1, 4)>,
-				<NRF_PSEL(UART_RX, 1, 5)>;
-			low-power-enable;
-		};
-	};
-
-	uart30_default: uart30_default {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 0, 0)>,
-				<NRF_PSEL(UART_RX, 0, 1)>;
-		};
-	};
-
-	uart30_sleep: uart30_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 0, 0)>,
-				<NRF_PSEL(UART_RX, 0, 1)>;
-			low-power-enable;
-		};
-	};
-
-};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.dts b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.dts
deleted file mode 100644
index 49fd1ac0ece..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.dts
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
- */
-
-/dts-v1/;
-#include <nordic/nrf54l15_cpuapp_ns.dtsi>
-#include "nrf54l15pdk_nrf54l15_cpuapp_ns-pinctrl.dtsi"
-
-/ {
-	chosen {
-		zephyr,console = &uart20;
-		/* TODO: NCSDK-24862: We don't support configuring RRAM and SRAM
-		 * regions in the DTS file yet. The partition manager configures
-		 * these regions now.
-		 */
-		zephyr,shell-uart = &uart20;
-		zephyr,flash = &rram0;
-		zephyr,sram = &sram0;
-		zephyr,ieee802154 = &ieee802154;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		led0: led_0 {
-			gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
-			label = "Green LED 0";
-		};
-		led1: led_1 {
-			gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
-			label = "Green LED 1";
-		};
-		led2: led_2 {
-			gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
-			label = "Green LED 2";
-		};
-		led3: led_3 {
-			gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
-			label = "Green LED 3";
-		};
-	};
-
-	buttons {
-		compatible = "gpio-keys";
-		button0: button_0 {
-			gpios = <&gpio1 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-			label = "Push button 0";
-			zephyr,code = <INPUT_KEY_0>;
-		};
-		button1: button_1 {
-			gpios = <&gpio1 10 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-			label = "Push button 1";
-			zephyr,code = <INPUT_KEY_1>;
-		};
-		button2: button_2 {
-			gpios = <&gpio2 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-			label = "Push button 2";
-			zephyr,code = <INPUT_KEY_2>;
-		};
-		button3: button_3 {
-			gpios = <&gpio2 10 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-			label = "Push button 3";
-			zephyr,code = <INPUT_KEY_3>;
-		};
-	};
-
-	aliases {
-		led0 = &led0;
-		led1 = &led1;
-		led2 = &led2;
-		led3 = &led3;
-		sw0 = &button0;
-		sw1 = &button1;
-		sw2 = &button2;
-		sw3 = &button3;
-	};
-};
-
-&uart20 {
-	status = "okay";
-	current-speed = <115200>;
-	pinctrl-0 = <&uart20_default>;
-	pinctrl-1 = <&uart20_sleep>;
-	pinctrl-names = "default", "sleep";
-};
-
-&uart30 {
-	/* Disable so that TF-M can use this UART */
-	status = "disabled";
-
-	current-speed = <115200>;
-	pinctrl-0 = <&uart30_default>;
-	pinctrl-1 = <&uart30_sleep>;
-	pinctrl-names = "default", "sleep";
-};
-
-&grtc {
-	status = "okay";
-};
-
-&gpio0 {
-	status = "okay";
-};
-
-&gpio1 {
-	status = "okay";
-};
-
-&gpio2 {
-	status = "okay";
-};
-
-&gpiote20 {
-	status = "okay";
-};
-
-&gpiote30 {
-	status = "okay";
-};
-
-&ieee802154 {
-	status = "okay";
-};
-
-&temp {
-	status = "okay";
-};
-
-&clock {
-	status = "okay";
-};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.yaml b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.yaml
deleted file mode 100644
index 460803eaa53..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
-
-identifier: nrf54l15pdk/nrf54l15/cpuapp/ns
-name: nRF54l15-PDK-nRF54l15-Application-Non-Secure
-type: mcu
-arch: arm
-toolchain:
-  - gnuarmemb
-  - xtools
-  - zephyr
-ram: 256
-flash: 1524
-supported:
-  - adc
-  - gpio
-  - i2c
-  - spi
-  - counter
-  - watchdog
-  - adc
-  - i2s
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns_defconfig b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns_defconfig
deleted file mode 100644
index 70f01d7c9ba..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns_defconfig
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
-
-# Enable MPU
-CONFIG_ARM_MPU=y
-
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
-CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
-
-# Enable TrustZone-M
-CONFIG_ARM_TRUSTZONE_M=y
-
-# This Board implies building Non-Secure firmware
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
-
-# Don't enable the cache in the non-secure image as it is a
-# secure-only peripheral on 54l
-CONFIG_CACHE_MANAGEMENT=n
-CONFIG_EXTERNAL_CACHE=n
-
-CONFIG_UART_CONSOLE=y
-CONFIG_CONSOLE=y
-CONFIG_SERIAL=y
-
-# Enable GPIO
-CONFIG_GPIO=y
-
-# Start SYSCOUNTER on driver init
-CONFIG_NRF_GRTC_START_SYSCOUNTER=y

From 69cdca50b8ff3a55a5a7c3981cdbf4b26bb6cec9 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Wed, 6 Nov 2024 08:32:29 +0100
Subject: [PATCH 0681/2913] Revert "[nrf noup] boards: nrf54l15pdk:
 ROM_START_OFFSET"

This reverts commit 9a0b81bf553b937f2ecb729a4ae9dff6df93919f.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit da7b10de18fc1d149fff255cb900fe3cb327925a)
---
 boards/nordic/nrf54l15pdk/Kconfig.defconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/boards/nordic/nrf54l15pdk/Kconfig.defconfig b/boards/nordic/nrf54l15pdk/Kconfig.defconfig
index 46df08cfa84..7a9177fcbf7 100644
--- a/boards/nordic/nrf54l15pdk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l15pdk/Kconfig.defconfig
@@ -7,7 +7,6 @@ config BT_CTLR
 	default BT
 
 config ROM_START_OFFSET
-	default 0 if PARTITION_MANAGER_ENABLED
 	default 0x800 if BOOTLOADER_MCUBOOT
 
 endif # BOARD_NRF54L15PDK_NRF54L15_CPUAPP

From 78b75aba8dad640cf7d2a41c24327bef2381b4fe Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Wed, 6 Nov 2024 08:32:29 +0100
Subject: [PATCH 0682/2913] Revert "[nrf fromlist] boards: nordic: nrf54l15pdk:
 Disable asserts on flpr"

This reverts commit a278ee4af1397201e4b9a8431d601c3e64d34a6b.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit df059cc25beb0a914e874ec246eebaf83deab3fc)
---
 boards/nordic/nrf54l15pdk/Kconfig.defconfig | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/boards/nordic/nrf54l15pdk/Kconfig.defconfig b/boards/nordic/nrf54l15pdk/Kconfig.defconfig
index 7a9177fcbf7..1c83abbb020 100644
--- a/boards/nordic/nrf54l15pdk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l15pdk/Kconfig.defconfig
@@ -10,11 +10,3 @@ config ROM_START_OFFSET
 	default 0x800 if BOOTLOADER_MCUBOOT
 
 endif # BOARD_NRF54L15PDK_NRF54L15_CPUAPP
-
-if BOARD_NRF54L15PDK_NRF54L15_CPUFLPR || BOARD_NRF54L15PDK_NRF54L15_CPUFLPR_XIP
-
-# As FLPR has limited memory most of tests does not fit with asserts enabled.
-config ASSERT
-	default n if ZTEST
-
-endif # BOARD_NRF54L15PDK_NRF54L15_CPUFLPR || BOARD_NRF54L15PDK_NRF54L15_CPUFLPR_XIP

From d269d6fcc54c9f03bb19419120ce3a57f69a6a88 Mon Sep 17 00:00:00 2001
From: Jan Zyczkowski <jan.zyczkowski@nordicsemi.no>
Date: Mon, 24 Jun 2024 13:20:33 +0200
Subject: [PATCH 0683/2913] [nrf noup] soc: nordic: nrf54h20: Turn off MRAM
 suspend

Turn off suspending MRAM for nRF54H20 SoC.
This change is required so sections of code depending on critical
timings will not have unacceptable latency.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
Signed-off-by: Jan Zyczkowski <jan.zyczkowski@nordicsemi.no>
Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
(cherry picked from commit 58284ff0e1b85f24d1be928860e9e6eb0e86b4e5)
(cherry picked from commit 9b6cae8d899a67341963671963d58fb161462edb)
(cherry picked from commit 2c2f60d1ebd959900405e448cee45c03ecdc6646)
(cherry picked from commit a70d6bd9660a3450f264d1d7017828196a964b3f)
(cherry picked from commit 8027617116b66548dc6d115af8cca84282adc87e)
---
 soc/nordic/nrf54h/CMakeLists.txt |  2 ++
 soc/nordic/nrf54h/Kconfig        |  6 ++++
 soc/nordic/nrf54h/mram.c         | 59 ++++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)
 create mode 100644 soc/nordic/nrf54h/mram.c

diff --git a/soc/nordic/nrf54h/CMakeLists.txt b/soc/nordic/nrf54h/CMakeLists.txt
index 7edc4d43ea1..10c59b04583 100644
--- a/soc/nordic/nrf54h/CMakeLists.txt
+++ b/soc/nordic/nrf54h/CMakeLists.txt
@@ -12,6 +12,8 @@ zephyr_library_sources_ifdef(CONFIG_PM_S2RAM pm_s2ram.c)
 
 zephyr_include_directories(.)
 
+zephyr_library_sources_ifdef(CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY mram.c)
+
 # Ensure that image size aligns with 16 bytes so that MRAMC finalizes all writes
 # for the image correctly
 zephyr_linker_sources(SECTIONS SORT_KEY zzz_place_align_at_end align.ld)
diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
index 1b667e25985..d6eb5b78f81 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -77,3 +77,9 @@ config SOC_NRF54H20_ENGB_CPUFLPR
 	depends on RISCV_CORE_NORDIC_VPR
 
 rsource "gpd/Kconfig"
+
+config SOC_NRF54H20_NO_MRAM_LATENCY
+	bool "Disallow MRAM latency"
+	imply NRFS
+	imply NRFS_MRAM_SERVICE_ENABLED
+	default y if SOC_NRF54H20_CPUAPP
diff --git a/soc/nordic/nrf54h/mram.c b/soc/nordic/nrf54h/mram.c
new file mode 100644
index 00000000000..5549a2437df
--- /dev/null
+++ b/soc/nordic/nrf54h/mram.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/toolchain.h>
+
+#include <services/nrfs_mram.h>
+#include <nrfs_backend_ipc_service.h>
+
+LOG_MODULE_REGISTER(mram, CONFIG_SOC_LOG_LEVEL);
+
+static void mram_latency_handler(nrfs_mram_latency_evt_t const *p_evt, void *context)
+{
+	ARG_UNUSED(context);
+
+	switch (p_evt->type) {
+	case NRFS_MRAM_LATENCY_REQ_APPLIED:
+		LOG_DBG("MRAM latency not allowed setting applied");
+		break;
+	case NRFS_MRAM_LATENCY_REQ_REJECTED:
+		LOG_ERR("MRAM latency not allowed setting rejected");
+		k_panic();
+		break;
+	default:
+		LOG_WRN("Unexpected event: %d", p_evt->type);
+	}
+}
+
+/* Turn off mram automatic suspend as it causes delays in time depended code sections. */
+static int turn_off_suspend_mram(void)
+{
+	nrfs_err_t err;
+
+	/* Wait for ipc initialization */
+	nrfs_backend_wait_for_connection(K_FOREVER);
+
+	err = nrfs_mram_init(mram_latency_handler);
+	if (err != NRFS_SUCCESS) {
+		LOG_ERR("MRAM service init failed: %d", err);
+		return -EIO;
+	}
+
+	LOG_DBG("MRAM service initialized, disallow latency");
+
+	err = nrfs_mram_set_latency(MRAM_LATENCY_NOT_ALLOWED, NULL);
+	if (err != NRFS_SUCCESS) {
+		LOG_ERR("MRAM: set latency failed (%d)", err);
+		return -EIO;
+	}
+
+	return 0;
+}
+
+SYS_INIT(turn_off_suspend_mram, APPLICATION, 90);

From 5b54935f621b97d4e5ee8bd36f87ab8413d1db09 Mon Sep 17 00:00:00 2001
From: Neil Chen <cheng.chen_1@nxp.com>
Date: Thu, 4 Jul 2024 10:54:18 +0800
Subject: [PATCH 0684/2913] [nrf fromtree] soc: mcxc444: add soc support for
 mcxc444

Add MCXC444 support

Signed-off-by: Neil Chen <cheng.chen_1@nxp.com>
(cherry picked from commit 880952d35a99e2430f29b3f145ded30f996e0884)
(cherry picked from commit 6a61766e818ab6df497956b39aeefcd7f6381b1c)
---
 soc/nxp/mcx/mcxc/Kconfig.soc | 13 +++++++++++++
 soc/nxp/mcx/soc.yml          |  1 +
 2 files changed, 14 insertions(+)

diff --git a/soc/nxp/mcx/mcxc/Kconfig.soc b/soc/nxp/mcx/mcxc/Kconfig.soc
index 3ee9f9fc187..67948a6d958 100644
--- a/soc/nxp/mcx/mcxc/Kconfig.soc
+++ b/soc/nxp/mcx/mcxc/Kconfig.soc
@@ -20,10 +20,15 @@ config SOC_MCXC242
 	bool
 	select SOC_SERIES_MCXC
 
+config SOC_MCXC444
+	bool
+	select SOC_SERIES_MCXC
+
 config SOC
 	default "mcxc141" if SOC_MCXC141
 	default "mcxc142" if SOC_MCXC142
 	default "mcxc242" if SOC_MCXC242
+	default "mcxc444" if SOC_MCXC444
 
 config SOC_PART_NUMBER_MCXC141VLH
 	bool
@@ -40,9 +45,17 @@ config SOC_PART_NUMBER_MCXC242VLH
 config SOC_PART_NUMBER_MCXC242VFM
 	bool
 
+config SOC_PART_NUMBER_MCXC444VLH
+	bool
+
+config SOC_PART_NUMBER_MCXC444VMP
+	bool
+
 config SOC_PART_NUMBER
 	default "MCXC141VFM" if SOC_PART_NUMBER_MCXC141VLH
 	default "MCXC141VFM" if SOC_PART_NUMBER_MCXC141VFM
 	default "MCXC141VFM" if SOC_PART_NUMBER_MCXC142VFM
 	default "MCXC242VLH" if SOC_PART_NUMBER_MCXC242VLH
 	default "MCXC242VFM" if SOC_PART_NUMBER_MCXC242VFM
+	default "MCXC444VLH" if SOC_PART_NUMBER_MCXC444VLH
+	default "MCXC444VMP" if SOC_PART_NUMBER_MCXC444VMP
diff --git a/soc/nxp/mcx/soc.yml b/soc/nxp/mcx/soc.yml
index cf7a97c9966..1f1087348b5 100644
--- a/soc/nxp/mcx/soc.yml
+++ b/soc/nxp/mcx/soc.yml
@@ -13,6 +13,7 @@ family:
     - name: mcxc141
     - name: mcxc142
     - name: mcxc242
+    - name: mcxc444
   - name: mcxa
     socs:
     - name: mcxa156

From 2e6e310ad79bd79dbfd06c1e94fe262485cf780d Mon Sep 17 00:00:00 2001
From: Neil Chen <cheng.chen_1@nxp.com>
Date: Fri, 6 Sep 2024 14:02:46 +0800
Subject: [PATCH 0685/2913] [nrf fromtree] boards: frdm_mcxc444: add
 frdm_mcxc444 support

add frdm_mcxc444 support

Signed-off-by: Neil Chen <cheng.chen_1@nxp.com>
(cherry picked from commit 16bd2e8e7d4f682b884bd47cc1bb36c45db035a7)
(cherry picked from commit abda8c910cd57ff7bb7963ec20d5408073e0aaf0)
---
 boards/nxp/frdm_mcxc444/Kconfig.frdm_mcxc444  |   6 +
 boards/nxp/frdm_mcxc444/board.cmake           |  13 ++
 boards/nxp/frdm_mcxc444/board.yml             |   5 +
 boards/nxp/frdm_mcxc444/doc/frdm_mcxc444.webp | Bin 0 -> 55062 bytes
 boards/nxp/frdm_mcxc444/doc/index.rst         | 220 ++++++++++++++++++
 .../frdm_mcxc444/frdm_mcxc444-pinctrl.dtsi    |  19 ++
 boards/nxp/frdm_mcxc444/frdm_mcxc444.dts      |  98 ++++++++
 boards/nxp/frdm_mcxc444/frdm_mcxc444.yaml     |  23 ++
 .../nxp/frdm_mcxc444/frdm_mcxc444_defconfig   |  10 +
 9 files changed, 394 insertions(+)
 create mode 100644 boards/nxp/frdm_mcxc444/Kconfig.frdm_mcxc444
 create mode 100644 boards/nxp/frdm_mcxc444/board.cmake
 create mode 100644 boards/nxp/frdm_mcxc444/board.yml
 create mode 100644 boards/nxp/frdm_mcxc444/doc/frdm_mcxc444.webp
 create mode 100644 boards/nxp/frdm_mcxc444/doc/index.rst
 create mode 100644 boards/nxp/frdm_mcxc444/frdm_mcxc444-pinctrl.dtsi
 create mode 100644 boards/nxp/frdm_mcxc444/frdm_mcxc444.dts
 create mode 100644 boards/nxp/frdm_mcxc444/frdm_mcxc444.yaml
 create mode 100644 boards/nxp/frdm_mcxc444/frdm_mcxc444_defconfig

diff --git a/boards/nxp/frdm_mcxc444/Kconfig.frdm_mcxc444 b/boards/nxp/frdm_mcxc444/Kconfig.frdm_mcxc444
new file mode 100644
index 00000000000..1fcfeb8fb36
--- /dev/null
+++ b/boards/nxp/frdm_mcxc444/Kconfig.frdm_mcxc444
@@ -0,0 +1,6 @@
+# Copyright 2024 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_FRDM_MCXC444
+	select SOC_MCXC444
+	select SOC_PART_NUMBER_MCXC444VLH
diff --git a/boards/nxp/frdm_mcxc444/board.cmake b/boards/nxp/frdm_mcxc444/board.cmake
new file mode 100644
index 00000000000..0e2a64644b3
--- /dev/null
+++ b/boards/nxp/frdm_mcxc444/board.cmake
@@ -0,0 +1,13 @@
+#
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+board_runner_args(jlink "--device=MCXC444")
+board_runner_args(linkserver "--device=MCXC444:FRDM-MCXC444")
+board_runner_args(pyocd "--target=mcxc444")
+
+include(${ZEPHYR_BASE}/boards/common/linkserver.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nxp/frdm_mcxc444/board.yml b/boards/nxp/frdm_mcxc444/board.yml
new file mode 100644
index 00000000000..d32af7cc92c
--- /dev/null
+++ b/boards/nxp/frdm_mcxc444/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: frdm_mcxc444
+  vendor: nxp
+  socs:
+    - name: mcxc444
diff --git a/boards/nxp/frdm_mcxc444/doc/frdm_mcxc444.webp b/boards/nxp/frdm_mcxc444/doc/frdm_mcxc444.webp
new file mode 100644
index 0000000000000000000000000000000000000000..7ab0bb19ac05a7c72f4bf437e0f958adc191b9e5
GIT binary patch
literal 55062
zcmV((K;XYpNk&Ev*8l)lMM6+kP&il$0000G0002v0sx-@06|PpNc<K6009|BZ6iri
z_M7l0JXdQGMD%|GP+2{L79Ad|A)U$``^Nl}V>}7Y++K;|O)7YXisUG0+eSKvKknT}
zAR;DUDH>Dgw8KAi%u{uWZaUjd#Y_c|5dPm+A|@bxZQHiCv2APD{YY}`aH~|WYMuLF
zW@cvi<71DRM`I4h*8AKWmYtMcz4z+RRzysIZ%L9YNs?@fNIkM({{L?qDqQJ7%{}ar
z-RWub5)l(1B@~h-BqRb{L<mB(fWRf7McN92-ZNmWrSnyEy=((|B`v*Z5fH?!0GE6f
zZb<Y_2!as!Mz~>%F9HFVaKn}$>_=`%Ak-4jRvRt-K=76Lh8r#}BJ@rOh!nKZ;^JFE
zg@MqL5EQg!P((x<SAM$w;4tJ>voM~Jkc6NDRg4*+FG3Uw0|NtGnlms0(wS|{^lL)>
za4;YG5C{bkL@1~NMUDY8D3=Nf+=`j4U{4ui8{u3oA4UUygp46h&wFKJfiQw$i$HA!
zg+PEPDyp;*0|=$91}IQLU<5f(FhT^37C{Jn5uu_KC<(L?Kp{c|ITmHBq97xZXd{U1
zg`@(wF%TheLnL+aMO%{rs>~wVis6Ru&6&IkK&obKWr%L*yPM0;S8YOigw>r~ynPV9
zU#76ZKuC&^RCA_|q4g{nFG?B1=8^zTa4hrtIdh<})7h2}%jIf(9dz@reCvn4^6Y5n
z6d{E|P>76S2-I*8&{9o^5Qt!Y&pGIOLTTh|b~CM|?eX@b|Np<w@3FI4fI(6y+iHxn
zU;g!rMc<rEI$;oNRt==5%qHV8nBqTQ;~}mC3Tq+-f*6r9998s!SvVGEg+rqXhJpbM
zm1?r6l|TpqL)JoBt3VZ@8Bq{AK(=!MCP=ge4w(coTxq5v5Cx#Tj5b1WND+WkfkQxO
zLvahV0z|C&e9j5F7<Dr(|LgDn=7Y;biteBbNI)W6>yLiur+?vO(WMb)LIOevVgjf@
z6tWr9fdeRFD-eNZ^NFMZ1$Upk|G)2lJbK@T)35#D_kaJlzH~P4Lkb~j4OoPfNM((L
zNgHAW)N`hM7uZ0iou=i){ipA}^VtJ(wu~T|P~^BA<NRlT{(Ros-bywD3WcULV~jz_
zug4gss1QK4Aqx<IDn&p-RH8@~pb`bR5P~RF04gj27z=IyTfAVYh=|pJfNzk6K!mI+
z1*IZVDO<6@tJn+{GzerZLYH?p*uV&6t2t+>0k$-F`Od%n-G`S6ivC~-vo3J9Zt<-j
z`q86VC&c6$fY=y-yv#NTL<HX0l(p5wgcLE%X7O<O?ngJdSN-u1{LUYL|HZruWDu`e
zgE2Pt>i*`gsaH04L0S?foa3m)*=ZMnKx^L{G}x=V+nWbt)Xlms2}w3!#bQ2J@Y*&~
zi0<_Hix>U<zrORy*!HOV*3bUlPk;Z(K__0%X3~J&S~HT303!gIG~F-=!S@;<TN~3d
zk^(?%*>xRyeQg;rfA;qI_}&MX<KE1l{rn&P`d5!btZN5+qm#T|rBis8w){aad?yeB
zf7XUu0Up)Q+^_dMAn=WTCbZ=aonx~>?7e4c2Z8#-^NacN<4<ndp2W$I{r;alI}qO)
z|7Jd^uZN4PAKtz={qV!jR^E^EAN=hfKOgi8Ji;q@LYw>)dNsTDjxSE@KJMX$yZD}G
z@QnZu@hraQF7D?Uyu}l1N80de!WxdA&sHDZEcZd(SAO!BzO|5ea``XlHEsHCS^hWn
z20hKLx^ZUP1>|mVb`qam-FOdT{=>igV;ADv`*&ymE58<gqZ$@pTHJnm+4f-m;)j0Z
zY?u<@#|8fOzQ^5$zX3saxX|5A^Ui7h_BX$_=%~?RJ|FJy$K1JCyf~W&WqLR`T;46c
z52pj`n$jk3^6ugJB=ChF(e<-&9QR=U{J7Ve*Tk0EbjOw5BYKaydzu~1VxmYZY_s#x
zAM}zo8C55lJy7%^Dzm`bf!RZ+snlsndjKj=@)pMIg+i)MTiXQts0g-IO%mS1g!TZT
zZOXHa#2(tzcjuTcPevQ$1nmcvT8Y@h9GeSOAkuq)y-8Kc+5%zZJqU`k5nIdbqom^W
zSOw`lAV9!-6yP=F-t3EBT{5v-(@%Xgy8w{4DBHm30>M3MQ%Wuv$emicf=Nr@{YfU5
z^fBAGOP5}t#2Zyg7a-(iczaU1gw~5Yv=5q{E={_*t;y@~2GzVk$c=iLUBSTn6p)=R
zFnQ_i2_ep3C^zbmYj&raQ^pmHcf)&AJsDTf=#AU6%(}weTH=C{c%L$*PG?iOM@#Vd
zVt${G;4N=Ry%0cu)w9kPiErGW{h~QJy8zvzLhxbFP6xi@ElC1o+d<LUA{a03&`k#y
z6rg*PZ~16;J~0CDzV!b1)pK^b2$b9O<NxOO_xV8LPMus(Ypzie%>Vq`1uSZH|Ni^k
z`LGZ!RCCTNlxw-Duw16(qB2-uP=Nxy1hzzRcS@pE>lKUu1Q^vPsSDt=BvGg1{BHND
ze&_%M1{J5`A`E>mzydI+FjZY4WjdKMeUyZ@5Ey|Xl<S3xL!;|M0!xT>ff(d*xmwwP
zT%nHb4lkac&Ibr2iHK0wDY*W>_ddNJ+ggnl4;W5gynWO$ZLm>-+s(&cJd92(yg{W2
z**^}>zVdRRM0VPCrdzhmmYKEz18A)}dq6jkV<wv=Gij=I9T2^<84OwjO&IV7m8gjJ
zQbeXH;T5}E;#H_p9ce7_Xl+re)!mvE@u-?T#$bOpM`%sO3pujkZlba)Em6Q#53oU~
zbhQ9_kSO29ktR(@<qJFldyNua`(ayB{gOkS5Tbqucz}(h`bBc2?Vx~_9s??15bkH$
z1O;4ZH)A9UxB%@1WQJ6}Oo-i$p@6NqA1w$|z$b$Pg^UYWa;S=!kw=7+`t6|FO$hAL
zB>|WRNF=o@TmpAPl3lybD1l7@4{$FLq$%K~94N_Iz!*UXfGOa@Az)O%NRE}M;G+%@
zm;#<c2gta9(R6U6zy%EHC|tiZ+RvhftMdQ>E?_o-_7WhwbS01yyW5yh>Dq28?u7tT
z!DkNk79D99u%@~j5u#-QJ6MvF(rti+`^h9xyIxMvy#U#&U_$IJVO+sRv48ZiDq&Oi
zlRBJPyChJe{d%&wc5RP{-MZe{>;jhTFLk(?5}vyeq0HhHE`fWAPK?ECvrzUnMxufX
z?M9APA8S_Wa%ry|AJoq#%D1t5j&}_6DL+o7N}LDWsGs)}wOgtER(GRkLr549pb3TW
zCe^0^ZMSxJbz^l{HbR;Z!~A&G3r%<%)uUuhu$>rh-+T9RX|N2SUJ{Dqw}0f~WDu3w
z*gcnDeEj)+8VG}(2@q#L`e)ylrci6No7?r(^|FBjFwQiXw|?=X+m?O;qmm>>9O$$G
z85uyVFYhkzR;Ex(9BZC(yuZ9p>U2)@n5WI<%?jyps!9~%>F5@NDAY|EoL>FmtgBQA
zosa(TpwkvAOa{2o>70$&ra&i`Y)ArBrSJm6h)NxJKHSoUsz5xQvn8cEkn?AAts2D@
zZC5H2I-PB^t|A2zxA!sm|BX_S3cQ4KtxOAa0o$%rNL(^&6=<E$#+54Mng;ADMR<)`
zT`Jw&ER*v~fK;F)43g6;BvGjc(dq0oU{@)DIKQ!})DjnzM78b$;0Zs8Csc{@5p_PB
zDjkAabh>gqU~+y*uRsM!fKDfg3LUtZ5U00m)SF@#Kosck6~+aHu-ELm^md8ov(r@S
zzVk6ohi&5tmnAnOsL6x#i(0KSJYC*>e7(vIc2R0Egi_A$<rlXrZveX-1-K;ZyhK{#
zxJ`i$JR}4N5a127qq9Ya3l+wJad0s7k`YM8Yhv-uubmH~FblmmqWxn2;>&Lx&Fz#F
zvTcF-!<Rqw)kRdMA3JQeTYvoG#YrTR*M+c992}h;4WZg3^a_yOG#p(#KX99BRtP{K
zB<iz38)>#vbc<;B%@~B37WLX;O?Fn-<I!eY@mSR;9x&Srb#}6@4Mkfa+RG_oqIi#A
z%<tIQHWI2|elh26xS<dQOgVrA6)y>T>R@-<MDf~eqVAVgpaS+}4EDCbqPiPI2^ZRr
z1gU`ekZ0{?T*8<lyBkYZ{c7Ua56g%OUX0x=iwa(7dszlmFiPADCxi-^4`;QTK@|*j
z#_qO61#gUMKPY0P>}R187IFYas$T`VUtmoA_A!ei1ukG(?PnuVz?B1xEJ|49ZWvL6
zTf9`Vy98N-F8_3Jq-0kx1lmmky8?MVi@hymD)>X5`+>j}421R)$hd$#WpJRtpz2lW
z5mh|E1B6SM#Qp|U!Bl3ufkg=yIHHJGIQBE30>(r+(xQR~M+jWPj@6pWTgbKxnB@^T
zso@8RfOG+iZ0tp-h%sZZyE-zd;K}|X<TMx+uL03cC~Q-}eb9`Z)eYpz6-?-Wo*XL}
z7`uzkP6~LX?xvY?<pM?^yLY{EEMfBqsdFX;JZiWXN)r_flKtIKsDh=mTaKu&U_Dj$
z%JG4I76PmZZ>JI!LLs}g)h+#^2aqS^ErcgjoVK4b*gNk(zgnK19EZYS%iuLhqEtI`
zH?J-~{w(`G0uVrgrEY$Fe$Wf8StW|tzumn1zn|PI0wW1qHvPfN@B8Vujyh4N2Sj_(
z9<D#XzG=;p!4k5gd-=0}{jD@5S_0BIaJ9U-TV{d{C@cdn{^h;vag$MH+73C^wlUjl
zdG-DmD|@O$&ln!^q_$C@LM71IpgTP1f@xK#VUyEqesMf#LxuK1v(pjtUJ|HE36l$U
zL8%TrUxd?@YW_R<XPizl*eX+1<06$>Cv>`OiAvRjIk`Yfq*BF`&em3|W(u_rnNLnH
zVHYYOIlb1X)M1_ufhtu~<@9D4Iu$A`yg=6lg<2_2AF^GlhRk_7z<|nB#qa{g6zab7
z>jI)y&u_;#pVJ16iWEYeKAS1k<BR$1bme;dqUY>v(Y?wc&p3T_t4i$x=)LMYzQ*Z_
zoAm@af3thlkV&Ugy;J#U#s!Cf_bACxb%EQpK&R6WT8kf^Y9MD<{hWP%Lng=-@HTZ_
zhw?G^6QoVghjO2m9L+pm-Kf?PbiVtwPR_4?n|k4&NC-mbo3s8d{qY8J`nX*Oo{qqK
z)m7zhw0|x`CY?|IGQ08TD#GOMF2n`9R|Vh|x>Zrg=?l77(Kz4zT8z#X;GIfk#@S`o
zoeH$`5jX4Pg0UIiq$2cmRB@-CT;hIRgY!#Lsj|4DsP7U2RHwpA2vMm6&j%8fIsh+F
ztpho~s?}9hti(E>y=GLVBsv|~l<N3@i!N8;>1<H7k_$?J%9L?Q#af{r(G?_>Dl|Hq
zDApx%dw-_h-I_VLpo>*-0h?N_5S<O-QiT?$7hqvjr4Tw@y$-peU97Y#)ay$qRIRQk
zsag%F^MwSePJ!XZnCC+h#X98dl2EB~BIg(7x+{ctC|^06ov-K)wMxK<3qahfQ@X%r
z`1xt^<JEHv>2z&;eq%d-&>LQ=#oq9bZaTPPpP>(W;Q8WjZ2rj!U7!s=L+;>jLiz#W
zX9ZmD(=MGaKEwX*1f)*@2z0jS1JDbv^k33XK#ftHUHkz2Rh|FAU*mMhy}F5dzT350
zovu$p`1iwyJ>&F#0;CNHJY7GLe&VNTSar5BJ^_DKwK3!LeFAzfFV?54Cq2gLq9y#3
z`>R@$;puMJ<@v_&<7DsnfwJrZd>TESK<^0B3;8@t;pyt*@VB$ckn_z7KL%dKANj!|
zz|+lHtoaf6JDQwdZr0*FpWs&b$0lv~cjUpWv*F-Y?HJ4_XRpXVKmVRECKqfLAL%yy
zJegep;#M7wd4Xud4@KY=dKJFa;^!s=h3IS|HDS;jhgkChZ|6Ik`LWq3+3b2KJyE6Y
z2;*IoQ|L{Z(8mV>X7|mT3tPN`^vbsYKR6cPFh)Bkf&Hf9uVhO_u!piH^d`c;2u2fb
zrqe!P-ay-@Y0H-GV&^2~8>tU=BC!VszloB-&yh7H!uB2@n{}f%N+6$T$KaN`2SyV`
z+9_%GjKi9;ijqNFm|zcV1$EjW_Mwek7aNSK6F3R&T((s|XhTgl+RBMLc5htHdZ{u!
zHk%dQ&W-oChw~0?Fseq@cJ`Q_Y3Ek=SBFQv*wO-nUSkHm>FFo_**w;5Y?^gDH{O1H
zdNRZ|#W`1Zbo1D`y!|BR=Ur@L5E$)U8`{d7{B&CLgx;V8{vny=!(BI<Yv;KAbk#pU
z5Zbh}EpGKA<F&WiM?V7rzUM}-fbb8<;QRZ#elf87?e72XzIwXgJJb)s2QkOn+ttxg
zw+GqY`Rw50S&w$Bt@i5o0r+31w|p-^0{^S@BK(<4|AV!7hPJfH%GK@VLw_>U9^el?
zyngxRSqEr4znbfMLU=+uacO(U7ro;<z4LyHZLI-xF<<qLdj!UjfyA4EzlFekJfX+5
zheri29U{c8Zui%pFBeDb=lIFre%Afmi$#cUyRW^E?0(-?cXM8T`oVB~*6&H)zWd?T
z;rX-U`Am8eH#(8fes-oU2_%64<24CAi5ndy^dq6S+M}I%%cb8<yR=h3Xor?w2>llJ
z*MuMA9v$T=_B7b5`%f?LkI#Gd)$N`C{@=r|ynO4Z6A}ir&F%s2^K*kXq}ysarn*iM
zJxD=jvL2xbZ=v1#y%vJYUqrjzUA}iWJMGxx@$Q3nKX}mW_;4N(5&{snA|U8hf@4T3
z1gHWbv@~I}E(P|uy#C^g>+HIax`pUMxqKK?I5oU=aoWaa8xYeW5R(9v2&p9sl!pd7
z1llkpCZRCK02C5jQH79#p*0_m>EnAcLj_e50f9hJfsg=ehN226pjHSdw53A|BlHI|
zY|c5qevQZYVm{}y=41>5r4nXp^ZE3FDj+x%3KY~=ArMBWB!fT=bQw|#0R<{xJkgdn
z*SD+YAqWwqQTO=u_3PKKuOStRi$Wj-N))O~R1lF%0vaI%SpkKNv!&fu4`1Beo?V;{
z?6X&2eDd-2GP^DWLSUf?L2bmFiDLoBhK?nGHZWjpkV63;AHMkPv+Fh}pj${?s6E`T
zGVI3e#mi^oIHq$`GGE1eQOm0O7#rh_WNmfhF+e2{$1)sCOFo9P=hxR9kMC!%hC`-`
zyy;ts%_qwki(A8*C=IPZV7#CdH(Y84JfF|`>z}W$$3H#4pU*j$$Ch)VZ9SjgeBlrg
z7-MXt;Mj0OA+UI%E<+Y!s9Ok3R}>h@&K#FxOIs2M3?awkF~%592#|o-Oob+!0|A17
zfSenELK|~ozOXzA*_z||QLyJ;-d=wG`PI#RrZJe!5=#KO5hx0VA}O*4K>)@E8zCe_
zj;mz@A%qY((_l=@4hEdIdCC?OuvlBzR3Q)~77Qss0NIpPKtLo2K-o0000Ctc1f&fF
zLV$oE5Zyo!q!LgHAV7&#gapYYAPUDA!=4nxOIeiyV^$!BfjS@p7)pu&L)JwDG|&g4
z(ij8A<WW8zLwJ1AjOa;4xQ*6qaWDj9lD6q3XU{olHj{*!#C(!6eMsLu2M)36;|UE6
zKxa^8Yy=Ri7P20aG#s2fI~v5^+v7N{niE?#vU-EqmhA*#16k$G*fwCW00aVOGAV<=
zU;u+c0XBdEk?-)P@iN|gV>6Ckj+JD4Yg1nK0|_8O5LmVYWHWv&Z%Zr?pi1$&1s5c?
zi;y=Jh*b<;$O~W#5(N>!5ymKo3S&^tB(RCD8)p3=$u{c-dp_s)^EoG?1dT-5p5$Nv
z(FEo|5Hx8JL=q6YN(v!GH|xdg(P<llSvP<E?GeaiTeEJ!>(BZ9oUul{8_XGNK$9qb
z$5v1{And;Y0MPORodGK30-ymtokE&PFe@o0E3@tpuoH=CZUy%(zNkb$i3MYjTvsty
zoLkOkLJ6rDFU>h&^8fdL=l>l2%>2Lk5A}bTUUU9S^l#(;yMLSikNw}=tLYym{=xl^
z{x9^NrvEeh{reB@-{wDNeqnz{|400H<j1Q2AivE2CH`~vm*hM1FX<oaKfeA@d~E(7
z?bm~r+5YGMcl$44A8@|u|EK)lkeAe+xPGDjQ}&nO8~RW9AN@b%z03d4;~nhY!C$U@
zS^w1k^ZyI}53=vpzux}Yd<_1^e#$c_gZP}8ta^k~AI@x;Gx6Ht#zBY&v#=rUg{+po
zLJ51w?c)v!V0PQNyQZw4>}0GKj?{G?b8d1FTu<0mD^{$Do@nF$!uwU>3BWI|3~leS
zlyWd60nqCG_$<<Z(y9>$=>M7St$7mmTzba>T{Ak)lk`|kw4QIzS7bY6xWW_oE$+8j
zdnsFB)q0rhfL$vTA4Yl$8)VIe%){`XO5}-vB+m)0_&FY7EKbM>W3=eLOH=`^?hOJr
zP!d-5TArxg{@zgjDfxaoo<$w$7JjU5UPJHD#l6`D<jx`}>KCcRZQZe$dqH{gr&^db
zZA$F`GZ4dxcCgu#?%!##0ZCWRJG1wPN8W~YVwcnB56U_K;7Aa&0-y9pa+gisOIujO
zcw$VOpDb8Y?NNOyFi&voX7l`NKPDYFmznedAbEXSHq*>O@54aP0r*SSiAHPHw8(TM
z)*2+FyFMK^E~ETzEp6hD*NJ`!`mH}G^=Ol0tm}m9DDm1k<P|O-Ww+EBTGq^5R6aE1
zi)sicK@EhUsm@atp!Bewb07|Z4!`cznv@-K%&FY>Fm9BHZxjxCwx#Tj0t)zgxgizC
zL+qV})AL~Wa|8JOOMf?j4Z(G7VW*kmwg&%2O(NoUmOMjy1X9{xSqHGknQKzoRTkMC
z<27_@C0<8e%NE(x;b;POfM$qR)XpW-k(Uaq5vWb^QgMavHPy1z+`$Q7h~N7)ALAlk
z!BHaW587K2zCii^Ig)3Sac>yDG(@zLyU4>dx3U`l&4YJ4P2~eM1t~v3D9#}?FgPDM
zIc2+VTn*Lk_=HIPx=>Tg_QV~VOtkKdQEgPy5kj3F_#K(;gr!bsjKBLBVZ6o<;57I>
z3!=6W6F`!OVQ`}5n~w#yCX7Ol-026~(6C1CO1ap=kRZ*gK6;nL!$iZ&Ht)K@26)*6
zqlb%UKr>I)Uj7N7zOPjydmhS)7=nr!u0zS!zS>oQ<^ND{Ef~T&k^l2w6zZzxh*O~@
z4ew+{tBr|P(dOtKnl`I->Axm!8Ce(eok2i1{G*gWAmk2{7QITyR*baLJ-<ATs~CTo
zIdyuR{JKYXscoH8J=i>-Hby(;G>Z7;GB{7CCnd4zhH}6;EXcaA4sF4Rg<oeqI$|)j
z@UYgJm;4gI(u|jdW5vY*q$ym`+YY$-z4Gh!U}LW$tBQ8{qxUh?!6?*6+e{sdQsnCH
zWl|&75&Y?isG9BYJ8N{Cw&YFJA0Y|?TXwkFe>*dL_A~jKSk?Em9oz}&TSuU;FgEdW
zXA(OU^?Q-~)ceUBl;G`fn#?`!FYgC#i_F0qWpnc5F-CR%cq<^ucu-8@MN&<3yibLG
z#|IzD%ABqcxprcKYuTC;^7oFw8e>YdoQ(R#DoCz>4qR38;0Wt4v_z}GRS@i@^xZ)m
z?!BB>>7gs=l-steP%3yjW5|P|!vpsoPh}DC$U#Nwz+g;O#cac=M`6EH%tvmsI{Qh~
z&kxcCB2au&Y2|wCgo6cO1&0u6bs0=OMIzl%lN}HgjO-#WFNs7u(L>kWb-}p}!D4Y+
zUd!h`oI^ZS2T`?!Fz>onTeLczk6vRf<)&8`fDZmaz;29=E=;DS7h8@lK)+NP_Uy)3
zH>jyH(MBU{ktPXCK(atdLZN($zIMc}nZqX#$PUY<l5wbu(FQomM<lMyu0!8GGZ^Kx
z0@gzQBB^nbW*k80YQ9->6tA@~r#%^=KM~xd`u?OSQE;SKSISiz6?`**@3FK>6Qb@^
zY7SJ(om;Kz83fiGbf|nfkW!SAdk~k?H5aBtc;4X63X(OTWm?J>=ZaS0Jt==tx<i0_
ze}$9SnavNsyP`mQLwJ~I1bBK^T(w5AHs@dbeavj?#7)P~Bdxa7`2743C3s3U^WmS&
z%#6aaF+U|sT?yQ6r`<`NDRzZ3L6cX6PID}w2*#oQgud23FwlfuJtS0k7@T$`TIO=!
z(O7CN0#OI>mQ~<yE#zq?XVKM}V5am3ccqOh^alyD?yc%JQ+X$>Lr+?OB;hsoax+(L
zB+Gfg$j=Mr%YM!a`&2eGXvo$Nvp#?YBLtetq*u;9J9fq3zi4g2y67Pzw}zohgdVUo
z{TEADW~r3#N$ej*#9{SAm0(>j_KudI5nEYbhG+A+E{2I{bWd8y3Q9SC(?n`~MFmCe
zRr`-oR;V;af0;`iNgjJkjM^#@V!L9u$HvAyP2l4A;=!>~Wyqi>#EvTZCAr_w515A7
z=%5Om))|aRfgc;T2m#?v@4~G=iXC4ciyDZ{SDeK0Z+O08{@lyWK58FELJ6y<3?XGF
z7TSy2j=;U^-lw)aCw_VL*1m4uf<^pBbiL1ghe$gKND5DWoBv8t&fUMFFzr3BPQ6u{
z3#E!Nnen`}QGKDEkhk?yZ00FqW&|t_pg1buh;$j~JWO`O{etaX%&hj(Om9MDBRJGF
zk4)PtMsS{3bCK6q9jwNg11ebcTCM>a+Oa^dXWZL7JJ~6KJE<__=*-JB@uc!=JLCEn
z1Tz1;k;T{?PhXT$RolKhreM$AEi7gn2+C>9ON>6UR4aB3Lqn`|j@sjb(ak9#&dKOP
zX2UtjTghh&2Q9oaLpWX4-L3#S)VlnH@*==J1QK)n`;7?k^cL-_`Uz%llOgujvk1$B
z3&*&If$;2Xaus=57O2QzW*vDHqfeBiS8VGSB3xr<GYiOQt~l@2smDB-n3x-tybH_b
z6Z2R%N2V2(#(g6s+&*}eYvU@tAul;!NBt1@RhU<m%<8%%bUXe1^Dd%gOrNsf74p32
zzulmZ%h6cL#A&Q1?0-o;mE%ueg-n(VLRE_@bPHHCaM#IKSZ|(E>&E&Yj7Mz*yXJKC
zu1oFoJr*BbbE20djWh0~3%of2UyExm-mLJ&aS-jiVpWPJ<k!+1Hu+1Ovil`%s{sxb
zQET_@s77M9Xk7X*He1?1MKO~BvO~$lijw7VmVZhKccVMBop86_`uLxjA@BF>#5b||
zF3ckL%?vYjx$4%VobPC&X8gUvvB$Ks3jRf-QfarMjpQ!gEO9hADhkzTT5R^?6%<c^
z^|8@|m+K8|K$$Cr4P7ygwTA0Ynu7+%KiVDRyU-u?f3!gJ>`uCEG8Cd7_D-OhE3&-7
zU{((s4G;kxh8W#w2t~v~iQ~B9eim6ocO6a&Y&~Kr+60-2Pun<ez{x1QI?cO+%S&ZP
zbbkB8>&IqL<CpH5mAZ{V>kgSURhtfbMO$G{G~UlEOhNoH;RPb|6`g3JKG<DGP1$4{
zb7YYb#G=VJGhdJmc%Q`vy<({;hJ<32oVtUAiyAl%&h0Bme0%~Mqrd7j{cVigs9hID
zB7E@uz1mqH{_8&0Th$ESZxg|J;6$HmoTiedM~`++>h$|5U7WJh$TvX>JEJhdu9V+F
zgTk)sz+EsS>JNOlCn)axU=#9Ht$j;v#mM;|^sbYDPvtNE&w48IU<3;pF`?ryliOIs
zd&ZfPS&Ykq?eD1N>&e3K$=icG5L<tjoKbo?GnL|~T+>VSK$7diwM3PMP(jDW(7_Tu
zW-nZDt<Dno;s}}cGLQ)>;Vi{uPn58UsXc}CTiIw4#dI`(RMb5uMwk{83LhFwGmz_<
z1DV8s!cHqA%(SmCVV$>o6|PvsZ`6DP)-#|5WmmA~-W23g>vwhsRgOAY?Ge<`EGcpq
zngpJ+wL^7-2Lm3ZT-+HFncv)Xl!&sIfO%N!dcWbo{euTl&Da@?bLQk>&Puu{EU3yV
zcl!P6vb>9ZQgqueY^Gh{k$g0KPXQ2Tx=xmk6&M-8$2{g2yJ2P2Z80-t3MxdK{{dV!
z>!t`>w>G`Ho1izm&-eh;SA9`nxkE7vN|eiO%j0+dDR%I|Ykuzrh*40c7pzz5B--GI
z>$&}nOX1V@EQT|(j8V~&=y1E%cGSuuWB(!6nnpfhKTl`t&Zz)=fq8=298X-79xN{v
zCIfiTaAmJ8?zh+|m3u&3axh?GpDz`>(EC21P}P>FI@FMj%vNa`SK?xBHl7|!0Y$#F
z{(lrCJNCgcaK~rGxvwJ2>pm{om4?)_9}|h=-l)KX*#6oLcv>+i(a_ZVmIq}aA3_n}
z5B>#?qpl!EtW)A4L|%#SdD&)+8I}1~XA5!W7EJdPg$oj!V1n98AwO-~wrVBonxw@C
zAN~Ob9_BN-DUsTyFS;lWp|$kKfXU7?=K=@AUoG6ohI9le?0XAE{JWO=&>+Z)PzAQ~
zz%S-RyA`&L2wN9g4M{G@oZFegQ(|{pq6c<aHupMCM3uoaY9DicPhzE%n>=}M2M3n^
zWvY0m$6He5NuqpA@3jiskKW3|gy+*)XQ)T)k1wVd4IWumtY--Y9?V4k6c2gWv-_zW
zo}+vSgmX7v+O9C1*kO8kt0)cn=m`;^v#orYZK{dFn#BB_@epgn5f)^llT=7OC6{Ue
zE0_iU_3Q8@o*C9^(d17O!k^AAU`lK(S`Vphy?l~_pA=@v164ss90{^sYeemnOzPO`
z-%SC~pB+3%i%nmlygLnTb*l2_1UNERy`Pjs-BR-U;)HjNlE)(asGBgfRg~thK4{AO
z@Ox;xDIYWdlr9i7BcX<#8(SJk>yHFB5#>#G^vZemmScdT!VttGIpFqUyzc%a3RdM<
zU)%K7Xqt!zTJ;AmQp*&Ku@E#eq9|Ky*L8UJqo;g`J8WMEpN)eNEEiX{x2gXKsKI>%
z|DK#79ogVO9A+ue(!;3LTDGx{LLT_%2~ch~sT4@99G-5mD}5Xc%fu@?896LRt+;wR
z-9jclyVu49u>D!(m1U>w3qIi-??jbxaFBoL1B=!Skx$aLtwif!q3L*Ru}`&?q_)u}
z)}#GX`^97L^-T;R@Sfl)Om1VFj_8~#Z>J%wq?b2r@p@79HY-@zW|BlZ!6ah@mV<_a
ziIKiB5$pc?@+#g`#`Y+Y0J&72D;qi6_ravu){0MJ^5JvJv)MFF4*qu_Shw8xGuu^{
zt7)5JHn=h;x^8(t#9qQUE;qo}-pv&<Bg%G8t_U98*ZL89IGuKU?fe4e!f8{?-1yX#
zSA1cB!JI3_h9m14LyLF&y)Dm%NrGk?I02@0Bk=)v8c3qw#^E+o05ggjvCZWx?K9`5
zsl9S^1$XLyV&7$VbgF)kO`j0=vy{z2FN|^b;jivcc-uVA+h9~OB?VdWv^eLJxa{O3
zNG>M-NOzh|q@WgtUEm&ITVv!C9rwBC^Yi8z5W>$+IlHN?j!t&Dqg)|GG5H2w=Hnon
z`b64I$dC_R+tp>LvN=Wt)AFYC5SDeZ5|oLo4IH@q(6nGEK^UhIAJBgO7bE;<j47i7
zA;u-j<xRn_J$fJ@sSQW^!o)bBTS=d}Dz^Yo$JjaIa{XT<$qsnrLsQbwHrSo&h|zK@
z4#tLYXGD7}O4dO@617%BBviNLR#XoCwW*=$Mk`_P>tX0Xb6)|v*-MSNS(Dj;M+KaD
zMwa8msoM!(EjK@f9uQd)1^Q6-(YSx<Nv@_sdY!=fq|tyz^S|02wjI=!?GwDb-PAsP
zHw5Ax84O+}yMb_BK8n#VuzQ;1BJcZ~9JD%eEdSk$_dgT|FK_1oUQgww%1Jwd4D^}1
z1aexaDZjgp>T@Vf+TCy+$VIUyy%kZ(&+-YhHqJPm%kjTI_mYAAH3?db$u7C*V~D^H
z>l#tnu_n>uUQ*Tve0BUy9~WA;1TE1KtThLkcIsd@c9<Ef1A-KnU`VA9R}9-zPJ>?i
zX`D0;gDEdj5lYB{9%PfaB3;8@!RM8eic#X^GZ6x!9Yh)lg2@CLu+UHbZ0>>gX$DKx
zy6gA7LADAR^^^R_XKpyaP)3fbd*@nX1mAYANW|IMvc&jL(p+vP+bdhjCB#%dsA;m9
z9eN?doSO<y$Z<R*a31a^xSK3$kN`6f+c%<n2e`;@Ym+#wML%pJ#rsV)HeSIlCw<%~
z(4rB(Q+YD@JoqwbjN(AER9-V%Kto+n2slH1u{4>OPw_GiDB6ss&+NMp@v0=z-f=8s
z46v?q2LMmnc)gR5u+p=%O^br}hCaP|KtN62b)m>i;K))L=^`wD{ZY{+V*7!_Y32_w
z%F8=-;+2p4y2#=<bxRhSzR-=FWER8tu5kn0xyX`V13xDON=wSp<41_|Earr)YQ?9i
zHX;U+d-`%5!^_euOB<QfVz~w$pK&cqs54|1AQgTJ(sQf~XO7te!{<sZ!f^+@+TW>X
zeu5^fr<_6{@~SqXN)hT1s9IoRu{%c;qxexoNZcEsE<1St3PO~nYO3<s$dQr96qJP5
z-djYg4y6JcW1N>;3K8Z6ppkrI{6F(_P)XCGF;mHE7<PRHZLZu^93tbJ02}cp{<<d;
zqdH;X-q5nYlH*?cqRQ4Pd{NDU^lr71c>zs`mC%c4B}bl>Qdu^M_!uU&cYVTm+L|%-
z6=yGD6z34~-i=br`f5?=?D-k`47J*@L}EZ8o2+5y=5Qq3_>WOi^n2I#;^I+v@+e1C
z(6~}9i6k0D-VmL^O`2=&*R|`m0Zba(eT%Ko9o6)<;q5vLH8fThz5*w3w$`Ou46C?7
zwNFXY8l%zuJyF2!?m?>Ghz3?vgA55c2&^pqCA)ZnWe5KGAj3v1jeEx8Eh*!lO2!V}
zRu}dKd`EUl0Ds|nW=5hy4^$H&g*31FhQ{l4!6@<}p+az|jnMQ^bUfiO`%r|B%W%Et
z9*}R>%tL-BDff{x3QfVm=ZtoHK(2W$Go5eL+=waXRM~#U{Se{{Xyp6Rrhzp2hgs~8
zjBDfA<Ww2)u{3zK*x=ubUYlaNJq_4f@LNP}oQz76&AP$pIExL~0;CtcgYrrC-28In
zKC0z%>?ny67p)4A8S(W@v(ms9y#I8yuM6L6@*@g=5?)?Y4;8(-oHuTfa^!q+m`pn0
z9H8QbQ!wAg2e|sK5L&%`AaQP)eZDoc4yZYc<5|#V%~UbBS|FNe#?5D9r|*r?i~aL?
zXQ=_3`KT#F*%wwy0<Y5F^u{gQe`DqQEgC2(NRzB)^P(^q{esF{1k6wdfQ~sWFnbHW
zN<(3`SPQkQ2Nbhvn;fP956?Kafnw_PFNpG08h0U)X5o?%Lc&?P_6P>*;CYsOz8ot0
z3<?9XiIllD-ejM6CO|=UvB8Wa%3gTD$BciGXlTVknBP%28pCmqgO=?xV`n8*q?M}N
z=ZdxZ;wnb7RaFe%=pSShTWJ=(4j?{C>yTnp#`fCD`VuS_9<ls?04L7EmE@x5)PzQK
zO)Fk*(y5zc-yYUu2t3-~!@ABb?R*=W(|>6Rk+P-gzpQW!CObr1nb`58Y{aLDgI#~a
zc>weFfzMhPuURICUfT-y7@;WE9!Virk#yjY5#>Fzco!5Wa1-n{x8+w8O!IUSTn<U1
zKMm&!F2tAO#yLPjKe{NfMu7x#goNul)z@J_`k542)!ABOpiBVd2(CR2Qg?S;WAwc-
zRx&$Xup@t<c%*`p0fc`VMpIkWzk1(IEOMKl01l$SWB|O@<w`4*(+uM^yAU=*!e3`O
zN({oImtonwY;m(a<r~MT5SLe0HP>M4<tZ*^Y1Q{%Tdjg*xn1nGrVYu$ohczWaKxe>
zpse8?wfL8lPy-%Txc34B;VNX}c;Eo`Hia`Drah%~w1nXQ9k(E$F!I+`5q2y$uSg0p
ztDBbMD}}gpG*V9&{det1#d@9I)+b2N0RG+B65z9!Uu7Tk6QHW`B#&GSMUb=qT(BRC
z8%ri{-HHaFpl*<a@hufeJ-5-6crD)rndZz1JgY)HLN4ig2qcq?^!NQAw7(}?yP`a4
zu;niL0Nq?9yaWe4aF7>Uf^Q~Xu97P{e&0~km_XDa=My$`N!gJd5U^nC?M>JY1C<T<
z5}%Z_;&9gLJ&bUt=k_YVo)kUL=9W%de!||^lm`Jq+btC@2h)RK8Z3SG%L@4Vnc>?O
z8%;3iq(M%Xyc^HYk<8#5Z6%tsN3wD<CHip0|C8O#JP3BXuKAA=t&TKVxKZ+jNZV9V
z6I-a8AwhTqgLlTVqYsux_Cy4q+QAgDpCu=3Pc2%A{R=Um{MIC}i&H>izoiZWNj0vn
z`8QlTdii**U&c~m030J2ReFXMVYuYI0@%hG&AJ#~6<@Q+JU<VdmttC9zz=jG0;V}^
zN;dy+$Iy{`)`ZST&+rYV?*v>Z!g%E*L)eKM&VT`5e!A>zZjdEw3d|^+TKmzUA7h>>
z6lKfgzu3Oj2c6BH^3}o0yFbJ*>{?o@_5Bxt*MVM~#IcGzer5?+mO^5-Hq#m-m>nZ5
z^Cl@%*7{L%;xNJ&wKKbtEdUZ78D9frGaHg3V6X(4WQ3ed<(+3xSVQLhO@3)#kcEKr
zjM?-n=r0As?wK1L-@O6G;>FcHbrVvgcW+*VPdk4}RWQ7(y1iFgTO161J$VUeJ+t06
zr{21;RBjEqf%a$k!s5v$9LEGZAC0U7kkF#O@raTIiU=-FRUD{)>R%ySCV&y>i%J@1
zSoF%&K?y9hpjiH@I}JYO9+M_0DSD2AAeq0I`YDE@c8SQfNEJ4WDNf;>b+IZdL6G$X
zZxv#;6K%v0oRqMlwO|mhsN}K)p&~U+hx1~>OJC_2Fggf<*e(-hHcbmWL+_bN4N$O_
z<UtH>_KX`q1IG-7&uLrjJAS?N66nq=oga(Odtw2W5{(pV{mVASXF~X`m+By6iGVU{
z6il|yx;6J?0#!)VpBKV?Bf8RP&DML2KpD*!jdHN!HgBR&_EJ{NAp=P6$=h&2cV#`c
z(8=1iJL;-R(|k9u<*Xarc4t|hisn5b{sXxot;?g+b}*8g%3kFnkRj=_pebKq$;Pvi
ztOihydxT^<RE{ud{Bto^oIi^8xfZlmc@vf&CQAmi0MIlupjEd>;3tXI^#;2FhBuV}
zTUzdQ0};lpb?qx)NIFk8?fZZM3uvd+<6&WgV9n$~CwRs2TM6e9X9p@t6)jwZuhuhv
zF}k#K8u6AQR{Dc`m}j@pweFCN(^#-G{p@}){p{~w4cy%MRY=hU(dVKrZ}w<1gQGQF
zIdB=?Ur&U<(cc8bjJuT{b|BQ7=F4S^!Fu7Qu`k<10#M{{7EbfZ8hA_@y#^u=9dx3l
zjX<J96EV`C!}bryLQGDIQZwST#2RmKS~NK*@M)8K;0Fim*55P>P0(?HZY<pPysG1Z
z_~eBp4Rk9>mRyfg;4laac9m3C##s~XO!?htZJmIstNK|tu#h={cka0R<CwNAkrI+x
z$<_#WLJG3LFPLZt7zdY8(-6l>*Q93wT4q4NZ2#Zu^YdZjbj?H;z7v7WYHJi4h`$NO
zohMW{`|1<+e$&X-Hs9(>3^iOb#o}+M12eHebxHjc{L|Z9PIlTKZ50Jl2MdkGWR3`3
z>C`+=Ua(=a)e4_7B-`$l89UBBd)Z}Z!UH)?=ZebqK&|}Kfsi`&4rV%Zba^x_ZB+qq
z@1`ZSs>a9CYrE5ks+(Ggv-o`4UiWjg9FiIFdA28%ZATM(bNHHL1pE|4Y&t_qrnGn7
zcs(SQ{ZRiUnFz%OtM(!iG-#|k+Oq1P$b^%nrna9|&>z2edbf=otrTB`6kPXOVX|D!
zQjN<V|7kSU2jPk|Guq0EF=`)Os=bFSMYMZn$-_mS<W^~?1n;8ex{v?rq8jt2c$f1k
zI$p`aj5O2ttrS<PM1j4?S~JiEdWZFnbu~JHM$<B{SsmD!Ubf^9?yXqSwGB>p*s{zM
zXoC%F7ec`W7?3*#bqd+harhti0PSA%?RrNqQ$yp&6Ht=AW{FT0)LHJtekvY_2^&_y
zItqWCO`@?3e(^4st72)U{boq;+Q0<=ckd+;LgEg{E_*R!*)^D=@#j<vgFOZ<)3u`Q
zF)2Gwo#?ZpLKqc}YvpfwMU|<Ev=5y|1G#5DMTzdTXO`TD5l|h`zc{iITGoe8>Z@8Z
zV$a}d?o#c&qyp#))Be1+n%XFwIFLXTaUuN7HY2ZkqYOAg$~c>__Ndr`I$gzsk{$|p
zzXOK{_$+hWmzri2oQW>I@W7g#vdtr(%1oX&2?5+B8&Vn@m*NXCjh4BwBY~j6^7Vmz
zRn%6v0Iue~`G-nW2$t>xJsf^Vqyt2%>l_ef+x!U3R94M(?rGZpvCKcaPK>*2Gnz}#
zq!3fvt3<2LGRs!LUkKX86@tk+ySY(;E?CG(CrTtv$c}dVu!X0i!^^SkH?MyTXtXFs
z`g?6b?BCaR8mA7O)a}2w4mh1BLI{p;xiDDiZz!JkV;D8pG&y^cR$wAKu~0)&<)4AE
zXEqZ}>YQJsidj+@odDIf;TV<6++8~j!p70|=9r-Lq8QSgAzgqEu7%--n5G@kS6>CF
zElF5BmzkLXd`(aE2PxQ2Uq3vYeee8+k(<%>nnVp;dBWjLc^Gfp4X@z(yjSrFxxu;m
zC<b7kj2_rT<3L*9-lE%XUSRYkqFGu!%F3xbav<WnopAHB3C%67x+k`=HA`?lW4X5@
z>BQ1xakR!#B#M8gGvP#po;vU3P*2%9y=o?3e({9!L1#jz9Wab06!2@A#ZeByk+%6A
zrcA*|c@j20-aI|1*$!{_C1+eH+TNh2H(shCs)v`QpNpSPA^m~VOW^XL<KhlzuC^V8
zB*Ft)ijz$@8jr+}4wv53R<sot_;riyS4WVQWo-@tIZjdGI!ZP3?~c&|%%&H;<Slb}
z^B~mKl;e=pE_oUMcKVoUO+qCA*^IN%vQRz51MNfT1>>dTi>61HFBgR$gFWgUbcTX*
zj+-QZCz5OfK~JC(LL13Q#r@5?`|aGL#1MTNtetHb+kVHJ`yweilCgve5(P6D{|BI_
z&4zsZrGVl*ThS;q23oW^WponNioF&Z8|URLj77uyeN!&{W?Irul-VK*ul7J1AYi&>
zB8=gcO`9#xw4_)T!n>Vk7IjtlpeNKYJ@+D*^{E?|EP3SU;)9rIZAHpK9|Z<k6@Sll
z3b7{<8NC5)=*wW^1Ev~KfBv3n)dl<?ra<9w{=)fGAOcldCtjrFj12n^eUC40jpEr~
zVsZT{Z@%Yg5OgH`x2Kp-OoKG}bQi$zY4pjx98MuIXdVnZGuhIzq}P)*CdS5}O-J1z
zI0*?nxK18<lz-C#je|mo(pAOaS;P&f1&Zrg*oHmc_Pge2qTB0cx-BUy@6i9#;X(D;
zlLMb`NakA*t|w6aLuXTJg%<w6N~m%JjCcy!+z53w0VyaO5GyztgPESj;R)NT+Do4_
z2||-d2D#OO{K0w!JYpVvb%uCO6KQcW01MK20awaLp2@8&iy5wZOFxw&D2s0)TV+)S
z?3iLro2ZnbR~}fL-3d9O*NN9zQZjc%p^mGU_0_Dp*g#@nAmqZoW)cb5&s+*D{SWeO
z2*x8UL4oe3hYtrvjnEef_R%EwtYF#5w`=HnZ<qHV6c#jTdRjvkS6g{h7qTT4Es(%k
z#GTO?HWw(ZO**W{j_@x*<+p-mMx2;icLd!=cT;C__mAlNs4sQXgy8lYZnYJn{m#7}
z?{F?r>m!n7lolB1WPb(kCREjt)h!PP%X2c0hPAx04ywCOV!ZfI=+Je~C*i_#yRd_h
z)TBOOjNT#ua7@|`x{`bbC^{?Hj^-p9Vxa;RR)Q43a(f7~JFFMv77{a5ZoW+>5XLXN
zJ}l<h!f@h?%Om3zA!wH9dY;bl<TuJLg#`0PXHHffy+IX3n#<}>3@+Ari~@z_)KIHw
z`a#kEh2f%D0+i+EqkR-a1W-+I>t`Izb`X1%fSu9SA2calM<e+ZSGTQRMkSCZq}PJY
zMBopARVhfrLo!3Dal1|0w{>AZlj0;pthvt*WZQ}Mp;8eRDdHkMgx&b`<R+-h79J!D
zlB;&q@~dS=QBz{cp2sP@+*;4FTT$b)9inBw^9RkVEBCgUfR<EZUM~01Qf0Vy$wyjX
z5_KX}b}U{jSLFkOR=*8RX{d*?8rrO*U^BSR1QWsZdmgJ_Tn5uf-G<=NP1$N};lPnR
z?H|KOlV~i`i2%Dx!YGCoZP}~f(IX+D)8u!`X8qnaz;nI#r*t!=0BB9aclBNNe3c3H
zOiIQ*7E=V+q(UH>%*C<R;R}T?E1sO({<?W`A2TqnAG&&8YL!OXBQIr)X(OtR0G~yN
ze{5P=?kA7zo%THYq^<?Iz?e}KIa_*U;AP=RLRKkW$tYe=Lmb~yi6t6_P(E$LPD1e0
zAh!Dn7@qX|<d1hzvHXn5)11p_ob>;Ku%trRgo_5@_Cv|(vg0&4E7>y}uMRaR!KFnF
zV9e}(5lh$g`XSKckCjFl>QXBt61{UtG7D=xRLlyvj`M~=yZY}Q^mDxVb=o^zL3o-J
zC5N-d;tKoyYzo;~{{;u>v4E$BsmG*DK|md}8N|x(zgcPu(Z{RAyx}F?K;k6OwspMY
zo2;P5))hOvT!t4bRDY3q@fXSHDN9SPnB?V(ob3w?ZhKOYKwU$x9<VX3U&vO!J+cD|
zj`fsT{cnBaTYzeVXTPZ<aonT7rA8u{E0w^ii=8<Q0E_v14y;FX;u;;sc9{$WXsV~&
zq-%uE6*9)2Ifbt>cWEDv351&?yAj_n)^_q~*fJ8YejqXpEl&ioql%*&MM@9p;egLX
ziUML~tvU=)#MdIIhoxDN!M)gYcSAi?=j}a>x+zZ*_MBL5ZA1XxcX&O4_XeKtV;ybH
z;$b%P)!2Hd3~~n#K|hPEA|$lfN4u|iE0Oikn78^SI5AGcH*NH4WsADk6O8aN$j0$K
zRAOY4mnY+;c`eZyX4QKYN57ww30%`r?k?*VFMtTj1Pr7`$Zk(z;2is)%icjWae{xC
z9!uZVNUJR9Hs%6SIzR%?3Df?vfJMnI|4xJX-8x1{2FPjFm`gF*R7wd68G%*sk%TNo
zDddYib0a>d_tMU3>Jc*!0K)ldkQyL$%H!@N)2EQ$XhUa|#C3(18Hx|7-3vvLl!rYb
z_OBPD?T8p~G_gX@{67}>Tx?<fMqJ=YgkZodMD%<qS09iR7TYz00lSono425(hjnUr
zVo5)c`P}&}@O8A)31;%6!B<lt9CY%Uyvx;P{F4Z@3>dOPB}$q*O_tkC{RUzySfSW`
zwG%nl;bq7(&xB*jtXFyopy+Y6fCVl1uqhrv>(|bympt-5hj*J?x7SMHoIcDB`3<`i
z*3iUjrkHOEWdR}ZSy4tB1XR_c9b_R1kX96RS565!kyjJYHDq&c{{SeIefSLz@bt5U
zOWY@^$CCi6DuYw-T)j1_X;hlt4}Iyf{SW5QmyL-@YrL{8ZkD^%aW$8?DF$z*ux)dr
zsZ6%^MS}#)BNju;Me)%OoN_nahT79T$?c<Z1CoJi6SG?aYJ{9nJcLEU6DEPXQu@m5
zRBntPGDTciOzXx{;J3d~GXBjI3;`UUN_CJ^65h^=c}5rYY!*5xmC;OR)%qTG&*ll|
zZ(j*12t23h@gkwdgRV=?t{1AyTvN!sW}T01{T=ejJlBL@-(L5vZRemBb0;7}iUX#f
z{Vxkle>rg)<rrt_XFW(<5BTn?M+#E23C@~RL^f0?V_&nLXF=ff66pXTK;FNW>)oyD
zOmwJfp|?MLD({co{y|gA45WG5_wlrU8Xv2z^$zk77>+i=M$mjB&+{H2I=7X~o9}w>
ze<Dc_B@#4*)j99;bzghRt1nF^^3`Xz-OBcfK&>^3W{$plSuIsLRWm)D+GZEg_qN4X
z5Z){QI}p<=JPx!Ms-m7fN3Mjbu&>1Y&d1IvWl;Iy&u<;uX4?@#^Axw#BC_BsLRU|Q
z!7i^v9aF8ahk|%M(d2M<fkU9(_hev*+ndy$6l_f_J|`~f|JpDNQ&P}`?yP@N<2o|n
zMfjt>4D3^Ss;HpL+88569rmEud9+d%BC_~V2Oyq6E4{u?X1Oj%d|ERd+9rJgFO%@{
z^&`U+qIl2%u!e>NmlxH@&}2B9nS{DI@D0g4f<`>L&y?JanGNEv3&Tt3jj49t0GAb^
zAtcp;K$ov(&@eu5IVVIWXin-V%~<?b9U9!O`x0VDO+KXo%5+@9YXIw}v;v~Fb{clS
z=p|k=;5Xu9Bxh_*%>6#1;wp>f@=D)OTBp+I7(RJv8ybd~Ei{@$3t=n<8S*RLbJl*P
zH1J8gD8i^&q{<Y3ZG=M+lz<+4+a645oe}^bt)#$d15^vgR;Ab5E+~Y#4=&$@*&;%Y
zLCfeuGMJt6x_t3$?C^VKFfzxZIC?F)oZ!>hCS3F&`q)`%cyoAG3w#N7aO*x3J^>--
zwxX1UTEDH;6b~~UI`j<?S9lKTSH}!>`N>Q-5E_ne!>#Ed+Pf&wUZQkRn`p>z=oRqi
zJgBBK=XYxGGUg2<|5_MMKGY0d8NFJmYH^ajgt{1-lb^>Q4yS_kAtKC%dq{+pSJb*k
z)Ve!dyU_UW_A5f~%zQ%v`Ljg{^G+#R&uvPt@v?=V$@{EZxYRy4q_&eqlQlriTP0xq
zvLj&j#HFu7l}RsjCi1S&u@GlN5<e<tQ<3JEk=m^Ade;=6ahz#JdHL&F$@VDKjkR^~
z1VYlC*NXR+zjsCZ0_CxydKMH2bPsmgP!fcArm0t*s;+2f9JRw60AS;%rBcG`B#Fbs
zu~v4L2dQ&$m{%L0OQ#>WxcSxg0(PkN1EqN`D8x=1A+FjUQ|;*E$)!#wDyrG$hQ(vP
zLiBZwE=;5J?vL13LP=NvaV|x%s}GL5RKT`<q?7OF`d+mPghN|7DGrp?oGub|iY&}J
z&dfI_HV?w!Tr{qKyu?BK`I~dB2Tq1t*q_y@;tFU4Fx2ukx`Dn9Ixnb4fQ|UE&hn!X
zJkMIw812OCkkl4zAKwGg=VQs%t_5jY9kY9*p5$%t;yxa=_|vp=Ohwxb)@8&BgwScJ
zJ>%#99nRBjtG=KRAN>EtQ~)viMX5LMidg37B=~s@R<+soczBme%%=?HmIa>l2(%JO
zmxWaJKfaifsYOW7PdiaTKu2y3sJW=O>`^;;njx4X*vM7hfK3fU$o>vri0}7ydQ*=9
z7UzD!i|VH2V>Dm9@iO!n;8cyzpDI>nLcIL-Ph`3(vr9&LX}$mWEv^$ez|gfuy*^>C
z8ztlVupnzydPlb~rQZit0f_xo?vjwLYvv)TlT_N@V9m21sEo~ofad<YV~1iNxROep
zg8*`6%tv8;X$P=<%R~5^(}5?$J@2ZB(A}Kf5qCF@UbgC%fgLp%abSXXTgvynd-qeA
zw`W1j&D@O*l~3kz7u@d^q7~W5DBXxFoG}WKYPjI{9qxx5h;Z8)IN~hN4i(p9eW^n2
z(hc)1>G1(_dlNw3+a(|^zD<$Q1RorUY#|VUdU|=B2BUDr5=r(D#Eq`ZwBNsZ)xFs{
zBtU_(xpeC5NeqAth0=W7ogD)T0~wsC2(D1*cJ&gmJBR4Lecvu{TS52urtXJFLNGl!
zSWlM~Q|_<KrGFpipFva*snvjEu#9sWRE7pHb9G$L7zUiTxMj3-2hf;SGQ@~sq%m)?
zS$fojg?6+x5v|Ya<3FP|@F|5le*P#dI`5T={W1fn&xg9rQ-we&X>^RH8kugP8@B@X
z<O&NP75L7mlsIPgywYUj<?^!ZGU8SU<eBCtkNHCR4gpn!e>S1`$eXaC67<<>?7p*l
z85D9Ge4mxs!IZ@*W(E^rH_A~*$t8l(BbObfMFJbEa7^t-*X3DQEOP8uMDd~m3WB|6
zx1n2vp$*G!6_~cO7n?W6RY-9)Oqx_s7mvp>MuG6wqm&Mpyh$5gbEbK>DCOWy0wypI
zC31-ilwt180$53;0S#lK!E%w70U<zOBjHyTW1kwy!d;fmQSgYO-#PSi+YkVQ-k!C$
z7mF;B=3$qp&N&|#MB@Q&8LMrErNwl2W4PucEAen>qMb8X2ck!q#j&y_$_fJ4pb09y
zfPs}O+v+lNwKvnm1-J$1xJAK_U|diOXU~nkBO9>b&SzsrV%43&53<Ku5vc~#)BFen
z1FaJHex;N3+;GI2r5Jx&E?{A`ynX%|=*=*Gz)vO`k9HYZNWvE!ZFqbb#5A;*G)IY`
zrJ8+ITfBw?@GVHAize-F)vM)hkFYP4`N394!B4r&{aa?2j!5}Jf1t1b!U<Ls_6@O+
zWZgwKeqTdiV&v&H;bi+U_G!os7La=ms&j4hsYgtDl+Uw3JYV>(Y$E*2Fb-X%9D=jw
z9>o)iK-XvXgGENLG7xFiv~Z%EAb_XYbl4p&vYayWQhKDVITBIZEH1)|5biY0W?+xy
ztgiFP3=wdJprJ1i_cD{E{{{E2@&zH#{u`U7?}wU=c6}YfPWxWj$|<vsgL5jkJ1WV$
zS^z}KukYfE6ER=6T}tgC0NZ*+;ow48*b{FEnsd19@UjEb^)nT_r8$7EP&u=J?;rMA
z8N9lQmgDG^k}okI*EYCUs+~-~l{cE@H5gZOHSM9n#!#;vxZ!!<eEOLj<rt6Le60Q+
z0IH&_55<usRKZQ?|HRO2fOOt}{El)j(Ke2A#zY&*E&CWBdtTfxwF=WrLpO+j6CO!W
zKe04O38Gv4$yBpD;AzjXhip?efSc7*wI*^5y~qsCVtW0TIp87Lwxc>m?0-$ziNz&R
z4l~Z3YJc@qzE;$;!RBl2ghMpzo9%P&*(0|<9V%NO4yhX+*G*gleGkU`lH~}cBq{+A
z@t&qdiPD9L20H7!`GrYXWRd{c#{4o1O#1ilXMZFId!&#myv3PASgKVt;N3&;YY?AU
z+>(usC3WTjKREnd9S3k2fNkhI4IV|_p<rLr(cBka$t?9!+y4vF^R?1P7~*bhK;1y_
zBHb$I^DIO%hV1z3rn&VqVy)!=;oh}i{<naAQNG=x$ex?_));zd$8OupfX2%MiiQ{4
z{N*(k1Y;vc#P=HAT)`bCH|v6^+9YzUBN83FxM^dJ?v@@b+(<Rs^6fmY<Tr}1<>KQ^
zUCD-AcAk}?U#^#+%qiQ^tCNMlEz_&i^k=6JW3Lx@|4$Q;WIT_MIR9N4F2{%OtTI;&
zpF1=93H{N-PjMx=fI;CwKb50JI|D3Es9IITQ`g)q|JyCh;+bJ!B0JOzoT|_JHXopk
z;|{bLtG9oCthOYdd)8`=s+oO5x+96}pn|$Qk}DlGx{;PeqZV5>7^}=ZW)Eo%9wap!
zJtJ8e!WzGJ7;zEZL4LEgHHLbf%Sw!IF%cyc&`rIj?qv+BDX9yP6mSXNkNqIl6Bm3Z
z`;D;Bp!l+SwU`tYPwc&_?Mrx6;KY|mT0JggE>@7UjKF$D!WTZtS#FUOB*DZ>Ur`Ip
zee!~vLYePD0%IC;GUA*_<WfHtfB<JWuA)Q(O^&Dt1P(yEp4%0Hs+MjLVDCPW0=%O*
zZ4MD&3F^=e=oT+*dSpiYmgwsTvS)h6RI3e2pO3J?iPgRI@qH+5)ZxU`fA+N4mQW3B
z+X~+22WycKJ@on@R(Hy3_;UlAs(WghD?Jw;Fh9=XaW3nK>f^;9aVkIa>Z5r{z3H6O
z%B@T1>id(?C*-W15F;{R-$haZ#;>0!(dP&y&q$bMZr5H^|GG^hgf3eS$59y2+#<E7
z$Wh~V)-u3YOrhtdG&{<lPG5U=tjv4n8DHs94wflG7%vueTNw8O^i;QGk0fP2bB34N
z%XjtrHMFS#>`YtwMpjS1tqnY#yObz}(kxz+G3Ce`NZ9UH+2=#vGPm#j72Ji~a=XM=
zZo1;;;v^ag)<l*{eqK>^M}2k5Tj4!f`8$TJhC*29H;$D$LXu)JaY$Y#nOxqJvfoM2
zc^HHcN?B_1pt1GOwUk6}vG;6d#_lW=p5DE`*b6*+S}vmD3PBus9$V;d_oYG?qNgQ)
zbkYL(aR|lXO*c*K=o~nGz>_YjJYzxep49@nYW!U=RcJxoHwQk!&tb9Cl8J(C0ly>K
z`Oi;UHVcJq7>FArr&isl56uO7J=C-Qg4ee7U9bwiwYT6amP<w$jD%A-QsCMqRLNV4
z$2>0>XPjK+4}CVa@_zoE`PW-)^fn%^Dmq7u(qHxG;Z9LMo>Je42pKvBK`POFFX@#+
zqZ}9;GH>^Y3?|<(f{<<X`!3ku6pW<bdw(7LM;jDmy{al3+NJg?Zrc=OuLo4~`pD;=
zf@@MIl&B3Qz2oZh^3A4(jxm6<{^1%as|lBJ;Z`8n487Yam3{JI0|^&VTcE7|pw7;0
zwE0(S22qM+Ozs%yh&&nK7LiPi^5a7gXu0`7zDe34`@VlRgC3)<r0XC-B{nXH)P&5c
z#z|!}8edEujlE2d2u?$;Fg#mV>`6Pb$9jQB=v1g=%oYb_XX^?tOCSrd#J$X>SkMNl
zV4N;*;bh|INw?_Vg_^1htf=ibb-njJOxX}$ozIZ!&WbpbL1~I#2kf8$!MUjiz{{D}
z+#b^%;q2&HmkvFUFPg|2HfNl$S5uw2(k)RNa|ve#@jYovUGH|NkUCJ6Zf<Q2-rLs~
z8ON(IvAug7^vGEQ*~k4Wqz@vCk>?mqe&49tv-3=-0TVN8q-cU>188sXEsF`<niJ13
zR?6@MErFpslsMl&bnedvkH9SRu=9C@1f#JFn~SEQsPhAnPKRdkFd75sJ6!)mO;r$l
z6h%xYk&?kOr!=^2Co>`BPPbxt*Q;J-{_w8~I-5@d+u)VRz_D4&r|t>XWHLt87;Q)*
z{hW+1dU-vH!O4PTp2{DTOlITS1>ApO+_TEq9Sh)!<h@dH-$;EL@tUKIZW7Q`^M_S9
zJ9(2>IFxl|#GYr`CwvwsQQE~}7zIN8Rzhx94NKc|`oF#Eiw>+xmu*sj?xU(8W`X^q
zD%DAsX8KL*t7M1deGQyUSLQrykBB<c2dJ)nY-3}kdQ=XNyg6eb7TCdqG~$c-+8l5b
z1Vrbo_X;{!3!a5~39>ACb92ATwQKT?(<Rt6*9-4)<54g*O{2H<$As7qCr|Qn7%tSO
ztmS>@lZxf=x@X&OdxH+GsLT-D*BeyOY>H%`0hc=YR`Qt&Q9Y{+!!-ENJ2hu7QK{GH
z3xU$K;Fj@x_LC_eVjJ~GZJ3ei&2jbO2(3{B^D~kE*dLJ_5O-#lD=`J*gD9^HLC)R?
zniL<5W`rhDCHyR)>s9(!k&L7#s(AbQ2aNz~JY^Na`EDnjHl&%1Pio1!@0peKEW%=F
zbf7~TXL(U2ble7lxpQ>1`@rM}8VD*?p{)Fvn2@M)0$4VV+<0^@*yvI;Y%gMIgj?%Y
ze!_ZU%8yC0P@d^sSyX8w40MxiIlQ^ZOyV`Z$FUeM<a0UFFZ)2I<5Kpz-9F4Kbd*FZ
zHy++ay$b2u<kkRIOS7|G>X@m42e{Cr6}QR{$gI*nRwJ!5RQ`edG%9ZGgM#QBa?Q=v
zBbrn%E7MAid2AB~?qS)__*<v?Kard{Uv|!#%&76YT`VAjdLJA#D#a2#a^CX+i3p<5
zPTv$9iAHG)AZ@P`N#+w+$%Nhy`+VX40*dZj_2~!_RBW~_<mGEmf$v6>P(vGA%mlkq
za(_N>kg}tPR1QU}NRu@XL%Zd3G&;V<KwcUlo_{?my(((6J^|t?)?2X3H|Ro$`s2Rr
zZGS(j@73?=PS}b~Vkg6DLegTmHtm9Ki*a7#ODbznA82&Cs-fK2@q9^$H26(UZeo(U
zvr9O@6zC0WDb$Nj_s|+8_K*HSLb5d%X&g-$qPl(^)>>ZP?BgTHp2{~=;=i`%A=?DM
zCa=t|ch(8#Vzy*Q^5TciL;+jlfM+Eh;sSt+E7`ciyyk$RySk5_4(8s*J{`xkn)!J9
z!X4RoRD({4G{gq?pT<-|3#C}S^~F&EtSF`i%LWyy?+JjjgcEq7+DlFW%w28;mb40Z
z`11q=MW6?sVVn-jSa<%f(+l`t0u2R3Vff6(0B>{{FrZ6utM5PY_}~VN@JCe4rA^S`
z2mnEbzKY;NX6&g^3>LPavdPh<`^Ox_nZ0&S=%kGZBr*TAgO9#MJslj+_ix7%5S{uE
zU57dO&DUb@if+B2{|KwCmkuw9ZcS5U!p6B{yD<B=x)FDBG;FAaun8ckl+?eirq|LN
zz1&`!cOO+0ou0FQd1I~Z-8JR9A3pCDa2S0{*js0rOeCCfm|Tg0y)Iypgbl!S@#&;Y
zb4fapWIZ$RKid02Pa>nJ@p47a1o3mx+*}g9)cmG@9=+Y~d;YYlWwyRNwzG`?-9!c|
zg8`r&{~f1*l>drek$3w!U_+Mo$1=IAz$dBKKpCsN4*cP(m|4#7WFEwG-t)P4oVt<q
zI~ki8%IoCSJC886u+e5FQ=^VY6HDuChnSdIw>SrP{539cEa{n8wW3SE^44C&8yCVi
zr=8iCx@)N6O6%S)`kN8cQ74+=B0!Vv1oD7WJtI9YP81%hpbl<cE$Jfy%C3IV^bNjB
z^_=hrfFyUK^UGY<GN!X0!8Ec#YH(nW+B=>+aX-22GH92Jv26apn=4KpQpTUhQQ<Hu
zXrEgPion6}2=2I$au=kGn`ZSjB*Tv&t50Fls47BzRJxhzT1wobd0gYfARv^?KHA3-
zOo!0;=wlp`A~l)T%*N<ls)XIrgbQU@p#V!crGj7w1LeGST+`xoB(MCj6Ft?lCqxdI
zlGx1>1Og{r*RciOFX?~mj=Ag&VOAc@+;VntE@^cxoJZxlBGD)#;r~YTM2Q?oml0$5
zd$14XV)LN^THB>*+5S%X&G#?7h_FR`_a(o1+^*0wQcaGQCJ;lLSuda$y0@jtU!A8v
zx$VPqcDaS{vHIaeT8O?pb`H!?95qE^;Hmw?UVw|WU?i8<st2j;BIA7`s1F&{lZ8s@
zoMwpW(%%*LEZ9__dEn~F8$?(xS048;9*bj?mNmsE%YC7o1F!KV6KMn`J4H<ywK2j#
z-o@u8b!*$VC2D(*hn8eE>|7E57zcWvU}KHy>B1Nh`rBRQ%?ZR#y{z0-{QDDKjREdd
z63a|<L3`jCAG7|%8g1|C^i32&V3s*KWVpmX9D3DqHW|)czq2=pV<{bLm4NGbLxE1D
z<SDPdv8McC&QzzT;Hk~72uCm32{Z4!a`lj9p^vp|7<rj|{|NMQd#Ag&s*)sRcq%mp
zGx%$CDykvZCvn1j1({=K-B9xAJ^qDxoBstzJ&Z-Rx_e2R5A~_zi*|H)#Xm%J6p5gx
ztRWY{ul~{*SADmEBg&X;f*2SN&2<1mitzBJO7_6%Yx$QAgMfl)?Eg^!KKi`AXUR$>
zI{Uo0trjKTA6c)Qt3#pxm)w2xzX{o<R6*&Q47RpTK!98GSG`&|ZnncyZdxXK5yxKb
z_@$TLOCLK~#4Tux<wjU_s>B|fHJHa~X7znte4S!N)Q)SxMT)*@Qs+O=Oa>&a55>$4
zqtA|7ce^6uj8?>Cv@roP2wktUGujmTe4_{`@CKrAubqZU1Lml&B)6Kw>|(RN*!h%W
zA4h6@$HZ^^e0S!YRiR>W!1;%BvsSXv3K{)--_zfNB1tjZ(O$eczqb*)93fpH8j!pq
zQ>`|5oS*@B@J3#)?$pE6?7~Y6uRr9ofC{n5?{sfbFS~u`+1xQX|9lr{&PL7NyKN3I
z0n~qC5nrYRePSIx@0@$*o?`Su1%GVdCJ~o?D0punyMe?M`kg;U!F)#nX#{C-JS#PK
zF$gjxsS(`NNcw;KYnn*_%F4VY73SL&j?nPPa8)(BCZkWIYTfHpDjH4L8}Y|w9RnKd
zTz$$H`Xp&XN;5c-^Y?S=9$_znk0u){dJay|r57#H1gwG|9<e)*?m-)cq@?9H*+~z$
zOozx~Ph8E2sOKALnM_DehOumBM;~w-uN4aX6D`nZQw>$Q3P4&g#(my?Ctp6bTK*#w
zOACuVY&ZJUT>}Oft@81J9dO`-J$p22VUXjE8_JCy-L2=1caen-j3rlE3>DW&Q@j|I
z4DB4Eh@%)fTDV|xRD8vck7l3a78pLl!j!h1fT0c*Zrqc@)1?JGe!Ul7Sil3EII)ew
z;%36^e$HK$TPK)_u_Q!Xv`KI>2A<zvCM`o=(ae;M@dnhh69BMugWQ;7*{Ni=E^DIj
z;Ifz-Ok$5A@~ceYYBw+u*kofUzryZmF-wHRAXJvQ%|{c6cThzrQ?ItelC#1M%ygoz
zUKjl+=>lhRdzMaTpw*3<<8YoqJ3G|K7$@|XJ!T}m#I*5T%yJH*Q#Qz0su^woW4Mn9
z%Y%4oe+8{m@$OD<x%ocBXRk(U^*%Hcm3dw+mSChi17b5fMnbl~;ZVw#L(+B%SCOaH
zmtvJLbUGBK(R*iGzdmIOP8xPx3|?%+l3L3A1JgBjm6s<PYNN2(%ZzRU;)}dBir7VE
z--zWk>gegeE~u9%`xc8C(;>U0Sj{P&{i-Ds8P5)-XH~}073U8$+0v^b5}Y9X>0^A7
z`nzxVCnB|rJ8}y)mZpujipt=t!fOgt7UHe_tIf$B90rjs7}N&j_DyZ7lic${&=zl8
zfuHGlkHD^rn41{zj<ix*@=Vt;9o!yg%WgK`>Y8<DIMJGEz&5pVo!fyQ31U31hFckj
z$gWEG3h;`O&j4z(Z%$5hCT+6;vzHjuDl<_$i!919GL^%a)R~0fbq)t<DXGiJE^EAn
zpburbjM{LKe<SAWrA_H=JgZu3&n_Y;);=1#6S-gKBaMY_^|TUOye%Evw6yUsKaE|)
z8S=<(a4VX@q~ys!IUKrm7O_7<2x;RyJq0}IDiGdf5h)+VNj`BTW^*zvpz06z9WE=f
z2u=Xx?o#Tu1Kz89h~koN3>_-b+?WFdjKWbAQ_SsL<Jws^Gk?|Elzx|7BZMkBH>iM=
z+!lXLo{g7l;FnlCO=AeOtVx;VD(<+37-0oFyG*o%2Xs*UHBjwN{rGLH6XP)K5!N=R
z!b?|LG3-XUIeE-l6uPeFP|#o%&7Y%zisT!7%~iB1qM$3C6_P3ej@T>~fz6j63Msn&
zrU#@0E8!~=SL3WKE?xz67QZDym&!Sa@pZ|fk%=t4wvq{8Ybji=+<2pHcC6}e+qL-q
zu-h)?rHLrJV4&B!HWG>@3<k%~|GFKTrO>Sd&=X{M1{LvUKMiBwP~Df&tx7WR+X=J`
z3zEI)Q7YEV*|#;Do-I4$+gu1?Br#j*2)f0RZ^~F~gH(5}N(HTHy*Z@Khq!P%!?<@g
zZw{ww4)#0?<2SU>2r{Z^(a=NRi6s;%5}9w6qsZYv6<gCF`42KBE`3UzKGjyOWp$S9
z5U5-LphW}Kb*W@kG1qnk5f2|Q1`%7)QY0DGpDu={;%`UIyfnc|j|b#&x&$h;>7o*V
zF6rvhxjO%Q&BkCo6IJ9Lyw9Cj^}c9`0aVi`UE52u%~=O*So#zV@(3`Smy6bMGI6<z
zEKvG4;{^_?M_dVlSchEg*`2KU^Je(Y2tt$=J?mPkR3PKXpEp~<Vc}0ic)ylLB>A+>
zyuAkHaMGZ9qaMCe5s*mFh%uZizL$Eq*rdp7?t$P7@@=1V*;pl&65Q1yjPo!NLJH|F
zWdfdBIREP22~<J<B8VvQB-93dpp}7boLcx=rHBgHO{o*ika{sXa_ZWdz30IW9$1i*
zBwtcZT%<d)HN6_P=NJh_*0w3Mj?^dH!KxXvK`(uGSLmufc@20m-`jNPOuzTYF?0Os
zEP&h*_$T+%Xk1%;IC)v|Og+mUPnaMtKw^7lE$2i?Z*iiNC$Y~mhvfd^G)u3qxUv(8
zGcl7>ttCss%6!OB%8X2D0Ih!(YlUk!RdNJ;DgVSgc6low4=K{A=Qj_Dr7^LGvuOG1
z%)P0PP*0*fOm)!qIUudypM`PKIXHI3?r6+^ioDI%Oim^Lwjs4ApGc8iznENaG1e(?
z_(=rw5<r{`!I6EYM$aeD{SEyT8U>b!>ldr#7R546VTj<632Xm6%S`=xpp<Ti)e}X>
z(s|B)j{w@LCsQqo=^eWgmLmXAw9hwvbjaVa=MWskMOfauf7U$e`@VemPopCpWs52R
zf|U}`Fw?_zeBLH5X8hx7;&YwuY51q1uhfRmeH#?MZAxv6zdU=p(Yq$Quq|G;8^8UN
ze+;PpO?^c^E5Bjk6^-=g_750ZwKnPYcDEX9<0Z-=HBus)|7McB-TW0!y`^&>*9M@&
z;+Qx**dN+2xZZ9Iyaq@pkPj$dy)a8~oX3$}cWw9{kQ-jUIj*pIt57p8e?7r8C#fR}
zcA=+)oftQ-2uX_Co41ilL)K@G6&k<Jw{EU>qqzXR8D97<xl#?pVkDL?DMNqKzw-dT
zT}NGY%Fd!=bsM5fgr=P>P5o(KDkw~VIjMr<a1q{2JO+&hjlR5$q=d3bW&q(rtXU@V
zD#(}&p?R5Tvt3QarK;3nBrtRmRu{4f1kvRa<Hl>|@|+PXr+qg+7Qaf?t=ArSI(7CX
zK&MUO#={mvqnj&XX1abq+ijF{=SC-+H`+}p!xM*B{iJJ18;5zeIFAVLZC)-u1hPHL
zQi+okpz``fNJk^8*4M*zUm4{If-?krSqv#^l}-zeUL`J^A^b>fe`4(_V)mAkk_Am<
zqAqq|v%f6eJJ1iW>UKD>c8Fv+*|)S_W~Gh2Tc^tKCg{Xvh>07RU*H}*Ss>Uu{%Zxr
zDDrd*z|av%2+~7^oshr5BfahgJoY>*V118mC$>p$;NaPF7Y`VmiFoyp4jNO)5omzg
z+T5SFkX&O>=Cjq0_=BI<5^k%N=c^^iV9!~_mPCfdW900Ma=zjrwaFPh^msCe)@_A1
zzXi>HKWox%du-96^4;-){kYQubVx73mQ_l$lp60Nhtoj`l&8IUpM-FY@o@Sud19o<
zB`PUa_+O5N(hZ7Ma6l?6S)F3tcW0&Uv2he@Ml#Pv-`10QJTn-qryi`sg#Rt*IQkVv
z@sF{{XvZwc&a?SK(yj~2FYwV505eQAlO|!7&BC5M-t_1;YpNBbz?Y-|9oTRCdG@v~
zB^BcGw@%X-XB(Qwb9Jzr^p(e4;+cBrZ_>kLZG^*>dDJE59xWvLpp&2$7cM1tok0sK
zBYL61!m$u+8Q)gl1%;_NO}1|1B1H$nKV}1V3=ykX4|6?_`ctUZMY7Yg1@`ssYn>d?
zrfd6EnH{q10~sUQg?6yqV<s(KeSVhc^i1^7GT=AK39p|h-)R!J{12vPU+w^<JlR9)
z`EWC}<cyGfxfCSy?=`}iw+BU11et~%%Kl)T0#?I7!~N_Ti&8^dDI|*C-UV^(XDzj(
zVG7>u1Rtut$3O|f>oN^METGo;_caY(@ic6BENI45v=}Jwa?|Xd*3K!F*mo|jw80fG
zwYY~eBl_nuG@`gMbR)iJ3n;5-{6&=|TPb;ebFk%C?6EC`CP|VT>gx{{o8?c?O>oA}
z>?|fz1a3F6Y!$aG3C9BJ!*)I~U>~(yFW@{scwEJ^cz%93Rds=~${yX~eVaD(`I8lu
zghOd2Z{lr{Yt=)T%%^Md$f7q!JD%@_z6|ba_y-LpPO8^aH|)VubjZB4rn9_8jH!x%
zcXbc8>WKtuVer63WTkN=XW!=dp1lF}P-}0y>Nv)qB4lzW1CPxc#*D37EJ>9zFTBNg
z&wNAv9sNfK^*6MrIVa6Y7;~3cj<1*gK{z415h0gvJx{OJ&#O1kJa{hF$I8Ym#p((i
zwzQe@@2U1Y_dfxG4A#F91YSg7@o!1gaabA_Fp)U-sGe3hW(I6olAko~5K64Ant;LO
z*glv{A`JZzh9<v{g0rlycj2eV*sI-!(hgo1v5@`Ih;t@Hw?`$EBEG4!Q=zN2S~eBQ
z{IMV#)3JE%DzQ-@XyE5>)WiUE)n`EnO_P&S{CR^@5|}UEyFOnu0@8Wmak(cJ;dVJd
zRk2yIDZ>9SLK1<+)aTUNLJzpqg<?@%y<rUiD($-U9>(Y-9_v{q9Mm@huBuAs^nMQO
z(BlzGFE=;!7??-*KFHqmY-sCeIHf%upz883vI`RrG49FrW8&8V;a?cELae_vq|BV|
z86+uoQ~+~7OXgK#6X?ZUf=(cK-0l~0-)4#{H)(ai3z*rDJ{PYwz8d5QTCD<8cw`E#
zPfGNLx@A-U6{Yjw{w2=L8=HNT!`b)Em#Gkqc-DTjj8ykjxCh>)dMcSKy)-k`l%=0D
z|4dFF<*@q-;5m1=UF@5uQ1%65@I`w-@cKG=FAytTg^j3>=p9&-f3S%SvPcoTNuBIo
zs91qG@Wns-W05(J$Ku2DPGDj3B}=|28kR;}LfTn}*X%_*=aa%}KNsDaZYm~-Al_JO
zOLwt5GC)kyJWiKFJay<I6kh3^`~F@xfs~bYgiXL_WuM|YEoYu3kR?a2#snG<{u9xb
zn`NkD(BttBoPDDnwlADNFF?+|V|ZyT&+S7BE+OcqF{Sr*Z=>?qLBlt6c&4InPfE*l
zcgT{~huUM%sOS1}H<@L{vB>-m>G1mh)9NWrY`asE%i;I)7#hMtD8Wi<ydzk!w<H1S
z;{54qhs7r9AvN=2H;DR6oqppCW6mHbOI#ZQ?0GGNL$c;E3ulbG?$fen@*R*Wh4WSa
z`0}2$+f-*G_S3u2Gd(q$vD}F&S~Or`AC;|_Pbov9mp(ovLDTA&F;jx8%q{DWOXPT_
zFoa;Nppo5J)tbFhjpmtnz=T;F$dgL6>Vg5<^LV_f8sD4sN4C?85ZwGyxQcb~`~qT^
z_A^$yuN>%dY-*D)uHs}}NY0?R3j^s1xr5_CSZ+G&Cgb(GrDcKqb{`XUMYf%j_HAD{
zl7h2OpG8VA?70}J<da~h$iQc6CjnR7{IzzEQzeK-V_Hiz*+cB5{NgjvebD_`TbqTa
zvx)M3AoZqn<NEv}Fn38;GMVY{d9`>9^N)HzhUTyrB)L24ekpU#sX;FC;R!(i5!M6-
zzjnw9YY{eh!*1lj&aU!DujN|6ZF5wD@`L`I?Cbo|D5kJVnSgBV60qt3&(E8S_AW(N
zflV{QT@@{+gKu4Km9j;ltsmNnf{+R9#dk@xJj1=<zV9yYOqxv6f_{F86Xh;C)VDi@
zp<n^Wu}(!wlZIu+*Z(AwmC7Dow*(@sjO2A|BO9aU`$;F`33O+`s*5<jL3F5gQlq%=
zH|EH4Pj|>)z5}{0DZWwy0o)_^Ko9GMB??SA1jP<xo;du?y^|qktJt$#5heToOL*R;
znFu|A=8zsB!v22bFajS^f^#IbY@RZK$Wd5SCIdR3Mw4MbOv|J?AnBtQ+ypC|vwZ5s
z$0QS$req^YYVtyU3DAM_quIB(hN;5f+#Etx?X^@By4Jom(=nTk1H|wPcoJnJ^Y}L;
zsdJ@)@o2Db>I|Z?u#;rkzb~?<8~H2U5}TV8`^qEZpDuAh!$kh}%G@<8HpvW92QmR+
zD^NEjsj+;+j>@J+s`@X{0K~z<-hK#+y?*UZ_z|E;HUC|H!7<Ua;slTqBP_O7ASGp}
z*%obkw`@9VZVI^FMm_Xkj}w_P3RSQ&!7_+~lMSjY%VAFhrj`-MGFL!eXPJrOvu@LD
z%l}tCuE(%_#mI_pqVC{`t$*lyRR3c56YXt#(cFHfIRRdL<VAB@cA)9R@r#~fp&*|q
z$2&eR;JxA6#sWOCpHc=Xw(e=O`Atyyl0ySTc@Krm$2-4DyE~Y9(@Nqvp}_EqO0<e{
zXAI*`22fw=*xRgc9)AQK^yF{ISA`(H=S$buFWtyCMX8P}j1Q4+<LmZb%8K^ajD12)
z;6}MP2H(c$lv47EoULJ@uf;p7csvF@jgJmD>cr<F+&VE&{%J5>wihd2TN@qhxI(oM
z1O&X+-l{3Hvj8wwzrE+9(+*w_Ar*rM-g7CPGkpQlk&Mixz4>7P`i5TtXfGixhQ<I>
zV`H@M?Ow~JS1>02tM8~HuplLkPPp7|6#AlADbEYZkMF{t)V%tY!{L^-I2!qoinc>>
zop0Aud1R*4|0t8pqt=^@5Ta|)pSJUAI11nqVy0B&D3sJk(*5B58v5=+Pnw=Dr%4>J
z&B-OT2}jR5^(3fyhCnKh$ugUo1PB+(F%eK72WY8hxCfo7e~QMfV4)AV6NgDC0Ge=J
zQZ2h9E}oy~AheGgtwB6u8YXEk5Tn!m*x3wC1&L?DT(S?BT9S3wFXZm~x97pH)5UCg
zu>M47%dR8!ZF@7-2|L1RD~FPIq=9ka$;ZkQ45W9tq@^!r@4oiUP$hvc(RBzLf-ckX
zq!d4J)p`p>3pF}cSgd$GU7b7$ZgxYug_oBY83K#$(^fXf#7UW5*;`^$OX<PV5pUO4
z6SypcPX8E>Z-fRl-(3w_Uw8F0vsacC%_5->Ekm0WXc>{Aii(>x>N#&U*d$H2ptQJ`
zmWny59fB9#Gg9Us{fiFsnzx4&IY6G3*uGehDjz6s*p$BgP4!mGK0LQ;)472$rsg`9
z$z8<yXtY#D;}snK)DmTeSpZJQjeFc&mm$L#<lxF9%03WEF@i~eN|UW*ofC>^76i3w
z3?nT~<h{nLJNdXxXLtD<JJ!O$09^NU*R%e@@tSUNT#ptXS7nTakiTZkgQ}P03Y{}!
z%6dSd6db`(`R}eAUWsfoTP3*7A*6c6+HP)_bSH;UDSp9<93Eub9FqRyIohXc)RmS%
zq>>FiOZFQ0%QA!+#L-Zal!T}0Wc^-i_>H3avF>OSpSW7MY|trP?*WKX$nLuxhAViG
zf&sRdWX(?D<)d!q1ISxwL?QbFsWX~ON7VUQw@JGcQSky9wRBj3Wa8d=MZhrWT6UP)
z?NcbU{;!_S2~MYdp>#`-Bg>3b4uOZ=gj{f`;jHT}CuC!&OZ@XKj_TK5i6{(aFKc?*
zpF;c`2+%Gl5VwWDSOtW;Me^l~k*3^+UZBJ$dT)@ATz8gyS^`9#ZPE@H42E=f{izg9
zNSe4A<ZvcUNRuX<1{rB|=WTY$tkJk!B9Ne<fy6O{Jzm17wD8LqRi8AKiV9HIo(2(4
zSkwYhOy3dpn4wz6uZv;jovGi=Z8fg3FCuB&ssD2@BMw;op@Oc0m@EYlOT2o1LwHi|
z5LvdqXnQdn1A@sgmZE}>J$YjR9ZT;M)|v>YcL#&oMXcP2{1O;R3T=nN;EW6!?f#9X
zL)LC*VvwDfqoo)Nw}ps!t-d2`VIf5729nESWWpvyAo0V4oB4m<%ur>Xm@8Kt3zX3K
zJB~aODyqSVzTSxci)3?p4D4g+=Yw}-`BFxtT*`MLpU&OD=PtCEcz8aaAW|j1XTi?Z
zFfy(_+-GkLCA@>$T&DnZ>}?h?;a`j+a7gA#XXYS{$j!+U-$?B;q^)<Qa6Cx9&U<8n
zzQU7sM(a0gAO5w)X5U3z{3Q)hiR0&EOavbuJH;q0FfOadXp2Tb>o1yZR|X6u`osir
zuB0`EFB`(cEsc3^cZQFsCf|{XoNBXXhL-2o6)B5<1pWCn0K#OgEuvMmv-B#Qkz&oo
zpMUlV43HQ~wO(`I<B1$lEiwWp(RC03o50BA*q>fT=HA7c(KXi_>m)w*Q0G8zVl<2A
z57sHuY_qtJ`Y_Qc$YQSX{49-pfs~Q$CQYp;^OwP<a>ZwgJ_#OZbWm$rpE@TiEn>^2
z^Hx=LDn2g=XQtFlk~hh9{d8sMCW3rGUdg-L^z)mzs)sVV!2>-ak`>(z%Mg@Rih%b7
z5wXXydDX{)c1_34-wfJH7#j*lH5OLZYsFOAV-|(%HJ*?Lm3+>|FQ*V_7rYxjxXzT?
z`ZmIW*I?+iZyVl?T5;e8KH2ptDAg%((Y9_;MMOubcEdf;NJ5xo|3xY}p4iS%FJ2TG
zU*$||ifCy6<Lfu%z6^~kv)+X$DG&>#%2bQKiQVJ5sz|F99n3090-SXhQI0j$d%vFM
z3uog?>fb(`k3Y1sy3bIN^)kjsqO+C5-<RC!8DxI2DD(baT0!Icko^wg=AIZ3wk_1|
zld^uRB=M{%X(G>jSJr&b48{a9+{7WiX%{DUXktSDfAQ(ArbeI5tUlOHI3t<6YlzlM
z_tYKoI?{~5Ux3cOXA26r7VbGDlmDuOGiBtuRVEz<g6|zB2LT^|ak|X&2+gWZggdh0
zYSGNuSRDTOw8p-=Zyz0u)4HS$De1p2ETS@?75Tc`pSnEb_ri9u*#iYjNh;Hfjuyg0
z%#Bt)M*Yyj^q(Lt8hPBE;}`kDp@g{tO(-7-EvAB1-@5+EYL{`)@nM`cG_JSJ&zW<g
z^C(_mot`(rAEGBr_@Id)4h?P?5CD8}oL7C+MbMij$bjV!Vwj7Q3wLGvzDvE~fhbbg
z(#pH&t=CQ7xzERG*l5tAFMhcV?1~jo+E6}+8H?%hfT<$fueauxa{ve<uCy}(V(jK%
zkQoSQ>N|iP7Z!n$=*Cc9L-i^||8rVt1&qLNU2DWYoBs;E6&l{-bFw-SPK2gUWRGE~
z$NZm=nK8pRdgF<5Z0MS^<FX2VcV1%l9c{hnz4T6Ju(|m4o>Iwdj&<;;UH?!#Bu}UR
z|1rjAJU#M6UpJ=}%ZX?DppqA6Fi<z(O3YrF%H$KpI^J}uJil$|R1T{F4~12*j}mz!
zd3nAKh2f-oIEoN!A&!GUFc_}cy*(FzH&9d**-MqoDBRr{vZ^PbAD^$A8&%Q)>Cgb4
zV#e|o91S_s844S%f@lc~?Msn>R?OnOXzMo1otgfA{wPzH2?;Y<ljw>%oun;TY|O;0
ziA7&fXVxzwG=L#WE=5~odOR6E>8VPL1+ns3#zDnaOLp;o1n1<~ZQdBKn5hB0ZN*tB
ziJgTL{3`i)^bb#mv0~Kuoch<zq>7P;NRMy#%d+CSO{>rx*aJnV%|-yX3X?3j-42^H
zpXB*JPcS05#IF}$_Si{^rG1inV4Se|N#3hL{{PzBizl_0k9_fgryFR3qg0H=JJNH)
zy~{q^7mlf)MJ-{x)@?xf0+1E|J%$dYl2z_N-1t_gYNH6-p9YDZsztv!V2mI={Fa8q
z7Jab>_u;Lja#1ws!B4g1O#Ue|75S9-^w;x&x2Lzy_x#0yiUXo612B<WkXMDm2^#Jn
zF0?GM@%Wj4rJK(fr`Xq{5_3hjAoZ$V=Y|<wOFBfc>09^&A)=ZEjF2R`YgrW9S}aWo
zZ@K%5z`uDVu*p@lZMO%6KzlprZ7?2^?3TePM&EdXU!W3G(&H!LZxcrypHN@8Vd_9+
z>hTziMk2nBgSMmgg}2ms@-+jFCj<c2xcs%8EDrx=PK%UPMs?aUUE;tZ^zfl8M~`t7
zmT3XNuZ#34B0@nmRg}2jRc`)UO!e4a`JdrStS^cZ!CD%fAD9e~6Qn8_h}}*af?Ppn
z;wC27eiMpR4u(dn;wdYa0DIT*8>dZME+&@SqmG%t%LfoZ!^-;cN}Vn-f+`<a%_Ei)
zR0M0^mvZsGrTd~cX9xjBup<!)^lCy*(%R<aZb9wiv<&!^x0cJl6`iNKj6GtmEkYy5
zZF<uSN`ka|%ryJk%%FiU41c@iIVGYLtFC|=WN$ICw$uW26Kh<o-eSLmkiEeW_d}WL
zU>&EY-(b{Drh%uKmai5D{3ey)%-FF4VTiL#VHc!!tlcBiBXwWP-CNuA)i-*^7<U^`
znc_@jarh%w5@jKFd}*L)Gn`I6!G9;2R2d@9z@6bugg$G<q5v?frtkFM24#imR_tVg
zHfNnOQllps6=0E01arGT23TO!6Lu*}cH+$i5_UNVp@E7!RTi3e3kgCo*rH+Zs$#fb
z-Wfg~J@99z1?VO`&x6mWi!x6jU!|S4j2kT(hMA3o8D!eWf%#MEp;C;SA`aTbM(Cyu
zgu9byS2$qEXuhg3j?Bs4oxbXXACw@ESi`C}=_m+3YUiAqCv%c*^w*~%#lCNH*y?c>
zQdDl+u^VtY`(*7*z=&5FJ&ejx1dMlga0Xt!#KbGSKScUdoYWubXzu`@PK;{=_&3+|
z>bjI$CWVB~8I%@gewnd)K4ln>6g12?R;;Ze>brwxMf%777O_c2XbSDY66jdG`9Jgv
zthKm)Qc-9-3Hyrhb4n~<DOLRPmcEZcYIzrzWm%o;GKP>$l<0hW=WVtY<6S4sozO`2
z<sER>1KIU4@Zz6$CJg5mL-$}!3@>FR&K`$}<@kv3;{;H|h(?*<nUmLRNh(+Qitokg
zgTY7fV~4bFoLmaYbUv;UbWulfl04u6`D@Hr!flP)d_eiZ@Ne|A_q@{>kx?_i?}-0G
z^}m!S22Vrel_$!zdBZY&!BhYOSC?9<#=t7D!OV-AeQXpGMETMj6~Zls`5Ta$tFAtr
zhm*uY=={y|ZGTmW=ULh^Mj;et&=Cl%jzFqbKe{R+FtSdFxc1EY7uHq-1WHjEZ0Q&X
zyp&5S$rD<hVRL>2Dq=dyabWN2xlmwt_-w^BZv5n72<)0Z?aP}F5*JBxMc96;{}8|*
z?tdY91sypZRGL|00`=L>t=z<6pjL~cxDKS0CjwFSB%jiSzLTPlTjGWRYDCe=fL8=M
z!+|Ful2uljLE)zkq)?Z@TYma)46jk3Kg)h{wy%<f!s~-Djv}#C91EB^G`Ogmqj!Fo
zMrqjuR5;%7mDYg;+UN|IHYQ8*D)h$!2uRyUZqP;-CI?8v(}1Oep2X8wYT+x=ItVql
zL}@ts$6uTR>c5V4z2RHNrM1g|bi#ME#`MqMbd0yb;k51KMyUKh0QX-0wg~lPgQT&w
zu<~xU>_|eJ#AXid<iJwajq<&dMQ<TbVeMCH2KRm?4CGVpE@CY$!N%w=8&tXAF8-L)
z-E+qSaD6&lUN0lTyZKO}c;h{+<!X5C*begcn5MQabF7*VB;DEy(0XiO_~hepltD7w
zP!mCZKq<-kWMMr0weqwn491z%J%|dk(vRc2)0n~t3f6cT#aUbYBC<!;;Vlpzi%5Pd
zmTSnC0_9%}J|56c+8F3x?th=2<vR|WCR~7iK_<*ZO{bVK(4&;ofW>DAS@&@bB2`(u
z)?alyV#CYv0%zx9C{?RYJc^KrnWerWf9BV27TC1bWn^BG!ygv#51j1fIH1L|4hFSy
zv;jkXH3k&l;=><%K${{Lmqi_GvU<*S9X$=f^o@<|>4!4tvTl<_WCc!o^|&c-`eqRO
zNps%N=tf*wPqxq`r@8Ca?|2K2rwxIrPeSRH4M(FO3CatoGPK9<DNoa&QjvirNXg9s
z{OJ@_u_9|`lJbPl5iTx=hoJ`FGnJ{@O7ZUJHJCjDY>a&J<FTZqH4bgOzdPuu!3$Cv
z-xwvk6j@0>btu}|AXC44ia(D%(O4A!gvRU;<hieTQ5)h{N9TqFN_&mEX(R(YoF+-}
zs`)AYa_YXVkfap^%&qbB-@;y6Dw%OcV^u%%*+&`3P8*=C<1S$M`_|AIN~idx^>j($
z6W8P;dtW_R3i+wXV5-$=>+X!#tUpiUhCF!PKjdC6$hUQldn-VGoXKj*u*3Cs>mjXz
z-L^_eKr1tvu{<lgHZBC!yCNMj?xT^SP55Xn%{L`90|)v2HuMym4D5o$$|X~|<o-kR
zFUUNEDB$roIZkZ6E$CyKt(T59IYb|(yHUCll~v<t9KD{v(Ly(1>h4;fHLZi8Dw=yU
z#jELWf40QEe=unVdT-5?k3pdLZP_+*V7cGsOVz!&O$kUyCIx$yG3_TiAhduq(l4*e
zs3tw#|6mx%kHi`E!v75rRFiU|oY<zOSyq@Q?!CIqVqT4Omzc-2oWwd@{Ta&~xp9t&
zcybX}8`i8C<D!SElg9(t#p1a@Lw`V65^tDRgkM}^stjbS_VnitV&><CbCCfVyoUO%
zx`_CWoOp)~?c=nGLKOccEK}h@eLYcoaxM&wb>iVSj#1)kRPxE#?r1Qm=a3{Bfw7LI
zTWh>ra-nM;^viN|b&fgGrg&Dg|1`q2qsR8-q7Z5soyXg7JryoJ1;zG(?P@msXB-AE
zm}I!kqMo?CY=pPH5QJ`?#qjj%%`(pbVV2ifMo#EYzgnkyp`20GtJoG4%O5D%`$;&q
z3;pIQo<W}e&@TS)lSLN?DESHEbITeLrXz}c*G#C7tHs)p?#_C6y&pq~ssd7>(ZG;7
zUgu|7rm!!d+$HA#JpM-tj)Ft|&Im!3!#g5dRY)K8i1<(KyV9am^oXW`@1@vsKvoXl
z4u1b+8<(r+5yQkzz1{S4?Ha7XH`T-Z%}yHzJ<I3<YKyk_AKep`<rzIKz*#1;X^LQ2
z4YyymzwIima>}zFV4Rdy;caNawbVosqA}afmAuLjk+tFCTki>_Wc&dbelt_6G|#PV
zyyp}$M>ls$DU<rM!T~d38$XFXY43vdCKOB@ViLQ~RlsOIjh9olUYbSF$-4GaIpkK~
z&y4NVM1fg_1^r!DT{rf$g;l5jlN||r#2ZB{ERKOY_hO|hJaW4~>-*SH0g`>qaofEt
zP+L>)9!tZPqUKc=Gf#(;dV0V)UVJw3^s!j%LZfSs@-{jdQa>Y(6aP2T6qPFP{WWT7
zGpJPW99IGRvdE;dWRj{z8A3?Tuw=MrsI>triKK9o%CL`6ZELwk+@{4SVE&4x&mgl^
zLV9ygx;5YK>EOqo2w54RSSq1p0JOaUd8+QlxICwmPXt=8vSEmKA4&Bz08zLasrMck
zkUx&d6A%jkHDITO_oA{;t2u>~aY5$T-F7HKQ*cw~!c(Q%Gvkc+AXgT=X{d?Hz<U{?
zyBh8qgN%%Nn@g2d0GdXObi*$TYoTQhpyv94{m+onr-i>=HzOZp!!meXgwYs>)-hAM
z#i7DPqH9vCnsTn?i3zu~4uT&Dfu=2~IRtbae_M!2Al17!`eV3QdHD;KBbauMXrfo8
zWc3rOL|B$A`@}AYr$ukG96yF-*r>ho6jPQ#_~9)B2GGP8enPB<v}*rKJx!Xzjm>H5
z-RPqI*ehg6|D>A#OY|sJVyP9+{9N;Dk(xNtsqAEPdMUjF!5-#I^NLO66;`wskuJBO
z$ms{fxAqi%?c(R;E#VghLA(*;`2Rb@Ri?S)qZM{S&692TPc++VD}tVjT6nJ9bBxlK
z5GjcPc3kuK+zqaF7_eN47KN@VIDLn!cnI){P5W3Y8G{z!_f@DokA_`cM@3nY|HgiM
z65Y?L>w7&Z220`j4Ua!wK?)P=zi23AMv1T{P5z`b#_KFAu(T#C1@F63jf)8stvYKE
zV@!fLl_VgrwbNk_G2#txVs}JntNJNU3WK*W3!rpK16_Er+e7pLvL<Vu|977J0n863
z8G6N==#F*5ploZUoZ<6r{RHV+r+_Cj@MW6VaZU$$#M~hMj^CE=#W)iN^Xl7WxskXM
z)V3Npz1tQ_PD`N0SJ|bv*!-DfBKrR6hoc*3{67R)07F2$zv(=BCw4R*OKwYRf%Vof
zZC1(+(gWMMu{P8?#n>smzPi<DMr;9%Bc8;P@7K(N@wx?`lAdI;2j)e4jY&i>cm7DV
z7J}G8k6fVgBEw$hu^~VRYwBdTI5tSEDkFvU4Ml(^dRl+Qf`#$8FK0=JGjZ)V*pxRI
zPc!7;nW2k2dXHdNms+yZsnbj=2I{prwtz=8#zBX&#Wo}@5<UY^U=sYPhNk2hNQtN@
zZfi?J(Hi%Qpj;dzY8^zj&Yxv-7lVGM54}wID;`H2!{bU#MZP{iwH-@qi{5%f!mfl~
zLFNW)u`Td<gfm%U!h>%~p#TI7i}*L)Mg!Rtwi-hRV=|T-!aQydJi#S_bQj=4)HGIt
zu`V6urd&q84q+Pr!yiRXekY6e0}&v7w^!7RMhVUF5;Wx`zUTr=MWb)3&U<UMxoS#M
z_JQoja_fTFdU8ubaY^0uVm(&T`e%K3&n^qH(Ld%_pvdt4&nr4p8!*?b@f&@8$heZd
zno^||bky#?nLogrL*~<nKwu%}M->1bdI$QW{}^jlo|ifqsSpr>L7qhOok8Lx)#m93
zO-`mSeM^vZ$_mhYYpgbgXjKhGfd9w^Oj*1fHau<b6*S(VclpshX2ZkyB>ICu5_9|I
zKlbQC+$4RNAbx>!9d%;}Ki{o|t4*q+b0fRAWB0&fX~@a}-URy?wW!}X&A@aN9fubx
z=VQU_Ui~xA^U1r^nOjow-@bhgb+@GfRfuM(dxN?4z%SVFAA0WnnLj*B-ee45+-ae6
zyUGsPx;Djz3`dg8x|kc*b<&@)Bgroi7KFOfb2JuJn}%&i2$y%{JH@)J7We!3H~AYg
zHVV<XCn$s#5jEVt{+;`-r|Ny|i1ad>$V#ICI3?@zmj5M+%F+51ux#CleUcpF=xyoY
zXTdKL-`;l4(6eyW?ZoAM7YZaS4M?a$^0z87|Ftg6=Fmy(kgA05(<cn~T@`H3)JOO3
z?8@S1lSj-%2)M%C_!ykl<6hWrg9Kmjl(x1eF(W=-Pb19x#oA0bOQ_YrRJ|>(7l%Y8
zv>UM@V<?Oy#@E}8YhM1LijYXP^?1tk{!DM;X1+q)8ZhT<mVHh<Hp_>k(ZjKlFo~<`
zACfb_3hpd_cm+}DSnTID>o$3e5_PDD2ss+2WqO_QM-VSas#LURYwJO}`hFM*IMkYS
z`@g@f5SwTUt(?3Cbk!UQc`Z_NQ^h64v(SWBN_}qkcDRbKDGtw9spFH?Vh+QEzXA<?
zz8X!mrfyS$PTh5W)Pe`uyS~+G+);x(QKzQ7tC4HL=VAXhO=;YLOrm^}U+Qz4B}SZ6
zAS?Hl`A|y73)o5|oHRx?)%8toA<+590xmH<vx$lr#MUr{x^EyKkQ25^a74i5A_}MJ
z`nWp0CxVV?A~zU`;W@Aj_xhqublm021!7F>4M46v6s-=r<xny>YFTN)skHr*FEQ=^
zT<kL?P)O}j05OuZQ&o9*jmD@d+c$!lW<j*Eac8#sbcu=Y%)IEHmSL`+%%Z~$W1JsI
zz}HA^*t=b>jLv}hYEL%TA<1i3PIQpHgc*07V|-ho?alypdHI%=c0~iC?BqE352w7(
zs@916&BCPohA38?`U?3$VK4|%wu^Wn-J);~n03NmD{MBl_az-<kdc5TMo1by=+#KR
zjl(fD_r#V=0gXYN4676Z`b^%!agHoX^ooRJ@w2Dk9!HY8i(?zAQIT%o`v&MPyod$C
z2tw#f=E-XFa9;>;@7cB1^QFWj{vl!o7sl3E$m}te=>k#@D`cu<fVduzB3zYt5~Z-B
z3*#n?-OMn0r?%cGV1Rm=%Z|FU`%JLLemmck&Htp`14-I$R*Zu<#-&T-+=b`e5rPzP
zOtF)C)Gajugma%(XKT=$%>>L%9(RV{fCui@{K+t3-7lP~Jr^><5NB7Y#XTM}2L;S#
z-6@8Q^)4=P;o`JBIrx=A{U*fxuCWx0=e-~q+hhZ{=G$34@W_p8)M6Y00t+m0NHmNF
z4~h%?8m!Jq2#4al+pFWeHjms@q>W&ykB}6WlM7sEis8c}xFamsc4kuu(MIGC<AO{X
zAH`s1zdo+K9jR&FJu@kx#K2H(6_MPU6e6?kAQx|k;_G;4kyAK=G%N;W<%_%5j1?x3
z4eT@6qswT1xyEN*@iGE$g($Lb7@yT^HL2|yvwPLdq=8pf^bovFZr|x15z6BOkcmhY
zQlNm@*me(0M*@B{u62M#0Y;=}B*F>x9ztAAfa5wX7Ar+RA37b8fP(L3jR|s}*&~+r
zseMMXow#%&QYTG&smD!Rx<14%pSy^?Yv-T-&5G)OFqw80KG5=SOzMmB0hMF$kfyo5
z9sXj3bJKg+L{}ViC_2gz>ZcZKs?nD;g0BZX96E--GpIEVG7#ddQ3uE{Y+y1edbL;c
zLda)n*p{znQq*SO6iFBCqBC;jw}1@4%F+#xwrWuJ=|**`ot>-@G3adJFEyeZf2ghm
zz<B+kMdBZhY5mVa7w^)$`wrcfOdIO_ZmWhFRnEvvEZr`MFWjT<@a&6zzf6F%Yv#+y
z{{u+TtRus^m^Hs~jzEgTF^K(DecojG%n@LBPUjmq1lv%V!2lGBFx#ZD&InuwC(`4x
z1oA%J#>1LNC11ay9D`uf6}~;aueN-FU4`1|lI6F0AEH4rSgjQb#+=4037hgM%Ic&t
z$!?#Tv*L@H$15u*LK2iD6tYV&JFM*EB0^PIK9+T?T~w=+F&tZ!$I@!WY2_?%k#AUl
zG+n{WAIX&-9O!x?{(uMtPy$S(8?qD{WPJiC0tKULNP4=pR2Qa@Y{oS=M$1ZD-oBAC
z-o541MtJ&FUJ_>3IuYSWHewzMMcCMPbkHexcOIDb^dWa<piR#SRqGeXXr;;bQ4OJR
znC!PgtHDudYl7+a+dV1a|KUoC<{ofSg~$?dVd_K<6~B0psM9Z&DSPY)M<z>Mk*`hh
zW;R&PV5EmP!)fibrIQWR*u>DaUggnj2L>t>(ot*Cpl29kd{Y}JUZrxlPt(^4ql-~K
zi&2ih<r<FMVl^kRW%JtxX=@;w!9y|zZ-4&qu46$yu~s0dIWM73sJuO6l;H^!WwhnJ
zElv@fj{km_1{U|?Z5%uk4GsX4ppQQ-S#A36rPtcR7X~>Q)Zkw4pR7=`o4+dx?S8HZ
z{w!NCQAV$|mFY<7XTJqHwEqI@^yZwpr0Vyj8B`!)@C8FVqRBvH^wLZm2Pfc_tDK8r
zH5ZNoa|ZtMu(^5-&KRB>bZL#xzLAGaD?BHv#P?C<WCrd|R#-=6V&!s4<$OYB>Cn2t
zl_laq^)+2Mj3IM$NO3wO%M}-8+?4QGubpURAGD)zl%nV@2l+~2<L=KaX@(F$%vM$x
z*}FtU0uOZpsx|V|$<?=MOM`A5kCqZ&BAjl5%xil3jJs@-HS<JM>-}KDzZhQw@~3EX
zviYD>@0e7wFQQ=f*dsa|1^c&>S6a<$q{spV4w-dWj6@~6(~0Vzq;8>s#N&b_DuoFU
zqa<JCOm0IpalMEH0CDtGR6Gz8z;>xrOrurM`Vz`7I&&1F5!cG$JKhOjdj=0;1$s2b
zd7IUsZZNK!kstk<6`_?^Oj5!@N0ewPC@li52|Vk89;1}O=bH1-c|1hn=0DcywwbB?
zn0=w_w0ji=iGgs=+&&32df3{F)PzlElwL+4M!1o#knOfsWKcswL91_y);|lby)trR
z*ax{nFs~L_3{r5d#(QCSyTCK28f2H3M$Htmj&*NQMZ4U@fV<nZnq}w1*}4e?`vhk}
z+RlURqHF9`<saw2%u$z??RiMEC36^-BLg0N!&J8~D0ryxjHNA9IG<#f>ab*U&yV8}
z9p@V2Ydk34+>gbp<ZDx2bLEU*NT{L)M~plGdD_D=p%P*Z0uT)Mc1*f_OhiW!B?DRx
zW_u711n?#`FLf}Y0>PfNeEsC_`R(j#)W&c#hSOjx2SL_eOq5$(Z_+HDW^?gd_u0%i
zx|9(JgRO8CyT%0TASd8~kTs;il@l=XlkWoVMyJgdw<vc1pU1qy6bJuOd!ZEC<?_Gy
z(7hz)G!ge7Yq+v%&|dt(a-q5<u6vr(8ZpWlu%v{eCoU=*)O^95Yl0aZYq+wcu8~7Y
zh`pR@4N<9t@boYZjBsXEfsBJ}v1L9noT;$>6OyMx==9=TO!3d>NCcCmDVl9hVfki<
zO+<q2UYsE17BY|KcnI+z{>^iS+#gvqVDMHi`mJ?HwQgh1;l$u`yamQMw`F#jb5WM~
zxcE&RG^BW*iH_7D+YyOs-maF4O4s@o5Na0Kzgi%z+=|w=#!g|uK|DuM!!g@kl!B3y
z*(BKK`KN%T&)1Y&6QbLU_m;VNrTk9vx8yyRh1S9GR;fwRiRH;KBmSldVafWlLAkfc
zVGl8~7c-uQ!rw-7wFR{$eTL+Iip4Dl!Esnw%O{?JWcE2YL0O&R>vKA&5cgWZ1O9(&
z{eum#{m}zLk^Ga-Sm0hySoj;uH@y_8eU=E9(5W^K?wIj62piTIzl0n99YYvLHPL~=
zuN--SfoayI-ELZJXDPcP15bgT!a0e7ImmLlY0(~)^)a~adKwRq>^yGqKtH>k0P@0Y
zGa{Q9L_OEgc$}eC>WF^SvrR7hcpMacF>g(07KS}{!haZ(I@1s+>RrlXI!_iZgl(>f
zfWzXWJLVhWv=E85{BFl|yZDz^Wzb_ceecB47WVHCHmQQxT=49wa=@Lp6*b&WWg_bJ
z7nR|@85-ItVTL98A>&kV#-B5*qz|o$<nAVeYw2fiR@)%NBMyT$zD<PuCl(6LJ1A*s
zOQ_^wQ!j$CW;UuDk}|&?P%9!$(7j_F$*J5OPZb3bml1jRv-c_V2WSmCd)k*jQd%kw
zA#psV-f7!B><<A8mu||uhSOm+hG3`xJNlYT_)qE&3Nkr5hepHd)WdGd>>ZFO=NSj8
zjConB<OMg>cZ@Lvf`Y!{KwXqTk@7myq@|1<0SAo096(jn@WN`X(9)u)OWV5FFLa){
z{WOcW(wb)E&-W6;`yRlC1-L3tuezN%a7$?BsBvg>Xy`@iSLLd+aWL3Z;%S^hgnqV4
z$rsjf=5_I+aa2N@eZCxR8HWJT20-TFPO2?LIndQyWXVlP(jj=E2e^v*g8bgtkDEm>
zlpSkGvINmza3C7rR>b~D+Ce9#zM+nc@`WqyfS{@*W&v>Rw4dwiy{wwtDl1Kc%#g<R
z%9+1S#z3ho1dT72bWBioO2cubHIr&fj*En=F)6f4Yh)lSON&9Ed>gVb7MctCFSTXR
zZ$=~7FfZvhzfq3Rc+eZims7z^CopdF`R;HZKVYjmmQOKVqL*KNVOB;+^jEaM1QcAj
z7l4z*2as&AJ2Aj_p2SBg4X$L3H(kbvA+)r9%Ai@n07AhTaJ5~%@)t%#>;cwz&(63s
zBa|~abhe;(TIPH~T7OYN70GDHyjS*Zwnf_*M}OpBcOsPQ;oy3xsQKZ8G$UalJNgX3
z>>9%C(3**FZsdpYiZT2@aDCu>QTlq`n6JC($?;4kN(0NIbbs5){z*F8oJ}FAQ+f19
zu~cDeMz8NVKkcRCsJ1g~3<6`eUz=k*ICX4Vy>aC;DeVaoAfev-vi3FHiG1V&09q*I
znQI4wIbK8R&Xh1^7h~Ql)-UEABkhF}XK~mpV_d~Ts7?+o2&$|6rzh@Y>TK0CT+!1e
zlQF*#IN)8Ai(1$WsV~+(M%xprBur%EGtES28OJk1JE&k1&h~`~A>jl#ov6@srJ^6b
zszt$o=}FD+m;TVfmE>BHG1hiOLyjA&gw}G6uF#4KGA<qN!*Zgb%3e|RVw<}IU;)DT
z7Tq>kdt_cy^54>s%FK^^#_>u%yJ)G;5g6Pmcs8#312V2@hGf!eJl1a>>h4mn_4il9
z*~2my|4#I+t9}{_;8W7YEp+YtPxDwm<Vd2h`b~41oE;Ku9&-iu-chiIqS2ojk*T&Q
zXPc+Ca<||i5DeDgs{^Wa%Yt#(c`jb>T=w6&uLGFXPbs}$3dnRbcN`PSSkxto0a)$>
z#DwhqX>IA55!_YCQJ2qtx=E6e#G+?IzO1OyX=3=JPH!j*H_+Kp;%Ejl@xIIv!HjDA
z4=KYT#s&eQVovBd<B}K#`909W3^mjgmHxc81}ruzlMS^H5AZ=E00LuXy{Z$)UGZfV
zsVR5onb^_!s*Mv5!jGHkB34a&K0^+CE$2u4PfX`tGE{-7(nhfwg%`4oyUkt19LO@n
zS^x4h;7s%u#6^Yp*NAR;>jLK`SkoT)L!s_a0w=RIntE{6Mb8XPa@?o4#r1^1W?T3O
zWDqF3QIGJ|n=!VK!eZh4qXEE_GxH42E~uV5HTG7rx`-rao4y#Ws|o6*#I;RAEH^uF
zFOF&j?hl7PXDHL_r;TO5Vu}y7J^dg5Q!!(%NcItuzd>jHxp)lwf{%kynf5h3Oi3i$
zjdq>+d^lyL=Jut=?(I%xYh1(PFh~8!<{sYt6w83j3kba_9eWTeE0k_Xmv{-NM(Jop
zmP^9@U`>)gK)3+20p41wx35?CDq#%lzi;yh`O$Xh4*~NN?6r6?^cy6Ps&(aV04Fth
zCl&`wWqx|=^cG5bDD#A%Y!49ILOyj}6CX=-I0xbGDD{lc8f&7$IIh&D`*2dNln39C
z3aAWK!&wKx%S#g;Tb-Bny)>X~|9+!DxZ`sSupSxXEZVpe(+`P+jZ16L-?@IuKun!j
zL4verfnv<hRy2D0p|H{F$|&IlXL(3`-H_PHmdh(U{1%m3UwVy{{$ZwC6~E7P!2Glq
z{#aZ{giLd>ZHSq+fD6{h+!&r<L45SZMFIVKK8yt^a*ekvuNThg<f`X#8OdIe@AyL@
zE9j+B#LPk?tHEb_^IMe6TD<EB3vlov`)b^sy-Hrq!_{svYX`a$jloHn7meS*%(ev@
z&lbce>|s3MQK>8daqK|kRgL3jUag1ic8~qiN4+GGr%pP?VuwKLtoV&Os`K!XSJ3oR
zkHpTB(TApG_$*B`hAW$7>}EwG{9+9UBr?8Va)|P(DNf(b{QvAI)N4jHDWgaCWl(z;
zUjT^VgTdJ1!N4RM_`;d+_6ni-JCiF?ptXmDZ<Q?+J_XGo=0tf(CcPQ(?~U6Vf(Wj&
ze@%gYPNAV|bg+dACe4~{0sMYEu=)7YHQzHv5o^iXG84jWpGd9OkTOXP%@GU-vd~lu
z&L!6R;#<(<<PW}K?X1-A^(+L`5n#;>Y=21xTLCU-@g#9Je6Opd>;6m$bH=pZJn+==
z{*qMM$siI_D3udUKJ6NABF1l^<`dG@XdJmRv<-|!MEB4**{WscLB6+v((!Cd7$Hq{
zS^4qaE4Eqw#K_*&b1)g;9+MC!>G!a->G$DxL~H(7<x;+AMjm-_x^g^PJ@~+)Ctd%m
z)}!q9W+S`37q(ELllGY>n_>rONiHqWg%|psGdcV!jm;Eqp>{z}7gx%P5uI5F-Dr*#
zZP4A~Gv{@57Ng_RGnmvcLtyB#WVKFc2w+N$uV;+jM-N<jAG&$T<rQ7%^qttgl@8)%
z2;Dg5xO<{#i~w}H{!hLD|Liz5w;-oEf23IYLLp`0l-+3MSwWUi255T3x+}Zz>ogsq
zMMTU>&kofzPkQ!0K5BsFGePZ5jZ(gQZ)%9ZHRKz(chPKBCKsK<7r#rj_$cZ^y0b@k
zE7DzRvj#S}(Uc$Xi*pbsFg_QR4%~fl@RaLat*Cgh$kqUBnKs3nafn+~9YdC?CA=)g
z*P9LX5LjhBqi{9Ah+YS;4j!<iW3qOt$pvo+CBD^<tSS?x<<o+V^A@*jIYL%jMr9-`
zTb|QMf`Z#s0)3N*l?fu*Kf!n^jmZI_FzsWUG_O0*z`(O272r!{uaj`$p5SRE6}1(p
zLnlUZ02yK{p_4S}f@SESCUj9a9^UAf=T1AAyV3So-uVuMbDkX_ef}o;RMyWzXIazj
zX`XK#aOlVK{e>i3%4s0#|Nq#tZaRkU)ik3VRK@y=v1z3Ub{mQefXy%K`6*ZQqfmQb
z%%^S(qn}4~a|No=2nqPlaq@D=Y&pRW$xa))R;$%+ITx?294~-oP+I1nCMt-suutLw
zh29obx8d>JvSFY%FfNhO)K2t|qu;eRWZNSVDgZO@xSZkbn-Q;i#`RQv+EZLf>oc8>
z;NTWQF2ub^BnX3k<TOTm8MQ*q1SpdK1S{49poD<wx?U?1*>@=hTY2#;iBLP%;ZSFo
zr(_CpM>0<U&XZVaqx&O`Q0=H*K(jBH!*x+x;;O9AiY)$C-;FrRIINwxRCZvG%+&R<
z7=Kxg?c55iJ@hMN<lL@JMIOD6Juz&6LXstU2(sbv=a`K6Bg3bpR{onhGnQesVx%h1
zI3Vf_jZpLW|GB(jbDa{h-$+C_(J^QFXdbfuTm8X%A4QHPH9CT2<?H9U1)(xfnzu3J
z7J2sqm=`+BO$Oe-B51^)3U_S>x(CC@0kQ5&F$wSZZzhQ2cPMTx7U`$9J$mKNSR)rt
znSm9zo(dA&iZ@OFt!?;ZrSUaZr{HOa7jhY=bByWKl2MaFo7UDIiOvKOJ#V;PrnhIO
zzFSsesPrTNg)um?zjf1sq7j(t-}jM8Es%1lgGL&2vVhzX8WCHd#nv=HSs)q^EHGK;
z`S#5oLWTv|t4l|_5JXSp6)H0XZoBaN!*%34snAWF!2o{A!+Hi=LYrGP778vt(Bkr5
zj>{+`D^l`VgO|cr*ZLPAdNxj1n6p*I{HH8_EzQCrlDdh@eoYHHks#Alz-9=h@-CTt
z3e>dPSytY{+TsA=H5!I+m~3J_RXjq<w%MRFxTC9L<2Q({beT#l=~yUV5q=F+q;%a>
zysbeOr%43hRSY`@9JRAWe`vk^jiRtfU}KoO1c6H^%Xogt+|dYaZMnY&+Pv9)Z_weL
zW>&vO!hIbGtK#eAE2Fw1qf2REL2@_JoXPTr{K_Per3zC){)!==6ZlBhX%((#@>iuC
zHHH8Ne_;?X82v>QNSuh(l?07(PsY-dg8lSoo@v(ndR6nD7rQt4@{MG9pCDr16UoiH
zw259$k1|vP&w9E^>>q2zLB<>q>>>J`b=FQ{b_dTM17`cH-cwQZ-aBRE1<r0}d}XCB
z&l*8wSFZkUvif_~*EP*EM)I>M^imiyFGLgXU9^HRfmo@hmo4>IDs4u8ofr353ni?s
zQ#h^qFD5B!3kX1zfyt8ooPgsRl_api{irG%c;Scpz{ykn@cDW}U|x5zR#ZdWd6-#8
zobGD?R3I=+(S-q%SaSQGg`6(D%Kc)%i}C9j2%YR}-C*<rRZ~odfV#K2h6dA=64A&8
zw|5!>`OIE8u9a{+^rm*s>go;TnfX8HRAEluu3Z19On6x1U^q0$<;Mq)<xMc@a3D}q
zmx<*N-D8bqHtD+nA<8c7Dq4a}IDFq4i`W?7I|ZBx84>%%CAO4XOqHTCYptaMQseb-
z=8UkGlEe$kCehDLN)tz;m)y+{SpEvd#i2A0oJ$CM`C^#VpGgxJ$W~S>yG0?BrsSCj
z@q&AIpU=p1Yu{yfVV{&q4ZUh@f}OQKH2?{PR?}!R-lwYKUI^*@0_WQi9B{A85JCV|
zer+^1lgGcd)YoLJ&C}4_%Z<%N$N@%~P~}w8SNeH3O>jG!YAM~b;p2IFAp{R~xVHoF
zb~{2n&s=<5erAkoLOM>SfF)bVEkyw)+xDpSWS~%Xsg74;8jjJwNMLB7lcWjz?=k1L
zW<dGoNuVRI5D$a0L4az<2XOP=!3{11Xtn}@lk#a*fbM!DId98*4&A>JCtM}qlMih;
zbN{NlnHAjkvbAk0ROh>X--xX2(Uc^yI4Y^j1jtmzJ0{;PrX+@e%)ti4T8SN;?v%X^
zQ8Kz!6x=sUf;d}Zd|GEpjb&>`k}pskMp)Eni{FLd%?}N*5Oj@92A&uTs0pcsBavd2
zUa|zhh_CZf5NBu1ciTXi(aW}hTiR#~jvC|aOEF7jrXK7OZwflX5xce#ZM+g0Nx{HV
z*0^h!Pb0IHe`Ohc`*Gtp>&?SusRZSVecRNV3gvX=1h|@<IXiUu?iG7wr;Mf@3=GC5
z6+RH)pTr-9?b)#;k<!?as?U0PU%m`7Jh{B;kB+3pkh|qOn{yb+wtFHV=_y0N(zDpL
z^!#XnEdS&44YRyzZE-YnUBbGIfy?p7?s8-VFlZ;rrv^MkD_;%|@vpTFlCSvIoi{cv
zk~O6aHg(pwGGuFu;afM|JYF#Z6K73h5M#o&Z6U)g;WGyT^VJQo6HJ0buH8653jV#O
z2K4%p`)JM_gGX13ZF582>XM7SY0=+tfk7$N>mLcW0<DQ%W7|4alA?A%aEny<^OaTH
zj(*faTK#X}(uG5Io+@Yn|E>CNqRX6*oOYGksMu4c&Af!cXl7pdwE1?ne4;|&Hqq5J
zM$_U5YJlioBXDM-J3nzi9(+mD-sX_Xev~A~(yQuz;DzcDy}+R_WQh2+i3K}sDJ?W=
z%TxFUs)1;QO8z|S289r9edBEkswbuddGZ&uMO;9Fe#d`x@o^o7i9~)@V_gROl#x-U
znnqlr(99xlDxziN$09)B@sYN4pWk(zDiQp<6kPdxi&k;D=3mSM!djZdj-G?~fI$SX
z`CT9VsP+w^)x5G1XdCf3%-<(+baOga)vIi#G;RBjSy8HBssMbmP(FA=xH0`#1H%^b
z10X@Oi?H$~#_#3#jV(I_X2Ln^vgAntdn!llu+hMX>3b>IF(tz;Y{g#@l%3BAi+RGm
z+(D(kPa&=B*w;49upuI9b%R(KqOTFXPkQf9Hqi$y-n_Dm4bAz!QW{1b(-b$gl8s4L
zvB&_MEdt#h%SsWo1j5n_98txYxj3IDLs1N;7Vt+1R?ZTinLzo;J4mXgPvTHs{MSQf
z@*Qk;us{P&V#GNZZ2KwMQ}me+`6WM8ObN@`sryr@ZdG+QyfNF1LW`aa3OMyv0;=#b
zhLJG9$mXFSwj+nTC4Mg-!A8yq;T7pq5bk!V3`Qabn~UDB=6;>#wU>`swP!wW_@$FM
z`qjcP$98hE{|=D&F@uqL)J{oD3-#Zii>mm=K#FX0F|0pz^`=a7L1M^JKw!<C>p8l$
z6D_ZpTr+~WRM1i$@?$c{T6Vw8$*^FL`?<qF5ki+f4kE8D<retV<B$gn6+MxZ@=9a2
z%|Zub^PTGH)Eak9Zy#!4<o!@xrf0RPL6T=Pl5cNV=2T5~K(13Ms`QygTIXlA9u8!(
zd&Tclb~~oG%tOOL?*Nfs0hP`Z(*|=aIVcB-d=ygCbqZ5@3w}tP4XBVIk(pC9dkv>m
ztPldFh><C|Tt|eG)N{&oC(D^#??8^{G9d2+DGd<Ig@fc``NkPUnl}vreeJw8N)v(I
z&r#b4G6V8#huNhOErYmRJCtMjx!=__|5yKVayT?y87Of}5847C>f6(ea`}QgWip6~
zo6Ng5>t7-fVY&2%vm`~AghyvqSRvTk&F8YY`cY;Hd0tmi(Eq%;kZh$v@{Z{ep@y$x
zr-vz*f!dU`k;N+7<cg~9{Dagp?;-ZcuG^NUVwoURtYF%yWA{#<30wW{Y_h(4YAebJ
zXZ1erVl`?0?0w`z<*0UnU`|a2TL0^g8qnbYSACa#Hqo4Rzpc4Z;gqoZWb9}4Hi77D
z>)2O$Q;2<!!q4~(N0>fK`Zwp{e+%B-+A{VZ$UCpyM@)%7a33ART2`<?Tm1TU&OWoU
zRUAWlYPdKe{Lu8x|E|_Nty+#d)5*;H-0^?0Zh*Z4;CNC3B6;4rQ%oGrA(_`#Mz8MM
zS^s28%W?Hw)1<&>Dx1|oTeOigkdhIaQPM3vjW*ijf%#YHjU0t!Y^CGoWxeaK*$xa|
z7)Lm=>OkxWaW%o(e;N;=u-vXEIs1nc$OT5KO#nJ$U7+>!Z!pDZGP$&jJrMs-3qM+)
z&(B#828nb}83?t=_-!F;1-o5bM*N98^XJXs@I6Ka#{(wuO6J)?10i-oi^$VR{MTs&
z#J98G4-P&Kk6NitI}Q-^d_TIj4~3rG!wg*i@i8c{h65R5G^Et0C<e6VY_-kk|1N;!
z>`>m<XG9-DSs5~5<&p)a<WRy=ZyC{yrDuovgqu&gRDD@KuiAbd_A!RKx>i5w)n9Qt
zvyL4dpRiTBQTgjWG~E;LHOMN!0BpT!r@E5r?o~>j$vOT%lJ7yjjbY<e6>m3?r1fn2
z%O93g?$QYLE64Ur3q2}*t1|-FrzXKB@C<XT{I4;8%yBHn`MAueyY+LspghuYZ<o4=
zT30<^s$b*+Jwj{O`a0gmK613zj+l+8_?|sS=}`X_J~vlzd3u$U-aW(9v;foY*Tf6D
zVS#N8)DntgQ_?$^bFE;n(^|*F7$MCjkQj|s9TFG{((og-hau@g8TojqD>iEMqy9r%
z0ToCQ@SF(9X`O0U%d~9WK{J4{;p%j}{J*4MIM?FZeB!v3OPadryR1jug5_}|ubq*E
z*05+wf~+Z-MI_LemSP@rUE6gpfJEPQ05{{znVXtvec<M9<2l`(GNM)Q0LW8meC8MC
z1y2S?bR4)wZ%$e>hJua|=^G7RbX33GVI8Hq+Yp*<yb{&7Bf0F{hh$A*SJ+}KwA%wz
z6SKbnguZhfRxM|E@{GWo+YAZElkN1|r)$;vzQhp5lk`u*ESs93t1e|K9PXQg0@jKW
zo&Hsa;_a}o%C!f^0NF_nj6pkDmC%Uu`yZ#A*?EeEJM^W1*UGVl$Lu{crzSc3UeJJ+
z=8e5M)flHNDJ1JYs-5AMsQX8mwuMOk43TTBA;XY2ZP!(6HovsclnV&4MZs5rm;Zc>
zC{N&Ud^pJA2U_7gsD(C9X>J+;C~b%?cEXv95jrLMF9raRg65RCNTemg7I=Ktl(;I`
zqusAQ46a(>Y%jy9A}R<^500mcf@Y$F&GxwbLCSi8K4A{Qc{2)H&VSXAI#R|NE||wz
z5VpnjiTg-B<Z96EJ1G1w2Fb^@e3y?|p@JMObN)c~#_+GXhEXmm=&Fai#xU_g{c8I0
zIFBpPnfn6K(<RA(oyGnY2&qsi0J6*7U+_R;`52y{P)vqQC4t71iFuoqK~c^b55=Lk
ze!Hj6B62)@U{@}Fj;)RzqB~26(4xk_r}*dE+mi^sav;kKSBDyOHU8IKRtg49kw|ux
z2iz`u+v-IVh3W58#t2%vG>x2u?6NU^1LmpdisBPQuVRWe_Oi&sLVM++%I`I_lXXng
zgbN!z>J^cs3<!P6;Ypkik5kgd#|ftmme~M}`RTVYBxp+G6)M()k?2S2O*-)7gkjt{
zo_Df_hR#1#Y~L+n?Dg_S@2tdRt;YCK(#UC|zJm&W>HwSrsrru#PJ|4s$+rY;W{G~U
zzQM%yp;G@+)kWcfX=Z<ny8w_A7#}QO8RZQ0IDz9v8Yd?bk1l&?(SNh~mb&43R=e0e
zSDPJ^1px4UD1h5P)xJwC2_A~`diS8PSIzZqz5;HUBduHN0A(JpWewJlvh#GL>qlz(
zN=tduwM2)}xFvp&wA8bMTyg8^%>2X02RBsZgdcZGJ|%2BNipoyl`+ZH7esHax<@fN
za^(~u`qY~0H(PnPrYQehmWXX!6_DXMMBr86s%!aeRE-UkZhW}aAYyZR8ZVR_sg7hZ
zyegs0Gk2hfz`G`GIgOyE^yLkkiUF@<wmeF$`uRGP1qBQMyzr<#dSO8(4$6Zndb*Re
zo<Q0IS{PC1@}iJo!f7q!Ix%*6*pEEM(gkP$J5lTS?VsaV&>4Ouzu^tRSHQc>tcmF+
ze(4X=3!%PUPKwujDx4C8nZ4Y!79G|EZq)u&2_dI){Jtbf_r=Eix5(OT_OAmPsf?*q
zMsVehcuQSN%uU(@RZRQM@iN;cuQ(M_?AXz~=G#mNe2|(J=b&Nbe_!)(w{N%m=A$7V
zcXE^|FuF<HTA1(dc@!`YZH0Kl>*X=)+U$1;v#Z+Te`DBX+Vqx0HFUb5?)EM|N%6*I
z9{KE|ljLKpm-1g-WSKOY=epR`<Fmq79{$R_my5L3lp9jhc=ZIycGE%cL0~bXZHKi-
z&{)4`xWuH6{aF)VBkHV7Wk?h6D<~ldgHlVU1^?8mYf5aoFD*gdD@x}(RUo^W&aI3K
z4nt*gUp*#i&?`exv>0PYXrZg$0x#2Mbh<K1X88T5_1y*<=e(WZ6Gx{>`pB$Ud?vQE
z`ga6~TWMujBu=?vWKzQ^Cy8pF`g*@gw6$o`?<Zz~QXJ-;S^sVR-TMX)o$^|M@c57C
z%UabmkzZA%H;uXP#%b^h;GBG)*g&NqLX>VAfJ21t#A%D`J!cU;xo8;ki;Bmb`d^An
ztZy?3Gc;$lZ(yW3J<QIta0+?n4YuKMTq!7=hH=p=1Z)LBYI#^OBv#uoQt9VWjKLgm
zg>Oq0FD!3NvL~OAgJVZ@k>t&d3=Z*i$_{5FpR8i(Es0aANXoTU((9KGxX7>zJ)7Yy
zXi{~>ptoH7QwB+Hr+H)zZYbrtNuz=g!`?f}5K;x&seU_o-WkBTZNe?O%(dP1@9M8`
zVuRxKz$a&WxI;omkm;b=Yy_RDrXj*RrO=M1aZ;eO5u1r3nq!r10(w(>bPd|~e}XG@
zhoQ@RK7qi9s{HLhrYZ7rFkZOh%~_*SE>kUeq_60;OFcD(^4CJ=;j~gl62Q!UG1<A|
zfwhy*1$3V5SWhVfJDd^z=%S$iiu1W-hP@SxJ)mSpKSGB1NSCWyf?Fnt@*e9B(a-yF
z`fgK(7ibEeVpcMO4m_IT4<8xcD*K2W7&|lB<-xVxU!<AzjGknN5H~Qs!7lx!Naf}p
zJjU^ZX$KTMI0=buc$v8DW~w-=YCv5q^my1z!dj{P-^P~_V5wGJ+l1KTKb>?1bK2ys
zl!`nzO5j?vO*M1w{fJh4c-ZquwmHK+R_6a8mlJ}ib9loQAJH>q-s!fZRbXEF1+eYn
z8|TzR-G&J@pqV^U{TTorwD8=W>xn!0I}fOK^HD;y=<KDG|IHv-L~#F2W}Fasv>Gjj
z6Z&=5UnnZa*5WEnm45a{oI<X4-I+dZCh-sg)GPi;pX&(f8m&CjFRD0Os=W>27H6l%
zS#V}bQJ%mte~I7XLVp@Dq{?vM1RJNh`z!F(sPAzRF~QR6x_uGzq>+W=U9l{OZqz*z
z<ubOzMsI=m7EuH=Sg`#E5{9*fRLal?)sp{&4$BE0@6$CQh(mh}8bp@E6`Yk2`2o(v
ziB+C^X==uusgIve3ERs5(tJ<uS3!Q#IASXZ0YPFkatex<39UI7DB_e6a6^BCkjr$Q
zP`#l`gpVzB_;M}O8l>gEvxf_j?&(w&jb>Q1TxOXT&62VON!+1^6(QC%np-S<1lzro
zsVLgCo&O-O?->AOPG_FWlra!Oh)_WsvIVZJB>BgnFI0;i3)>bO!DzyU_z<oQT%#U8
zrpm(^u)l3<Dw!uoaJbNOaU~YB!76`geOaV)(G6iO(YMtCxa4^_g{>rh{_P6^XNFaM
zQ>^DOF<xIlRoc~j;_)zWGoadDv;#iNgJ77ZrYrSqLe7zd=D!ollWP|4@vB_9C+FZ%
z2aB*Qo6oYjkV44cG>{&%^_KGvHUS^uS8C85;~tY2R~-U&uW)O_+84(!nO9S0@LAcj
zbm^DhM_^3*_7{Xgg<3l@L)fq=Nku^dG1U>nT-XVYvq8@%`$>ZhOqOoohAW_+*KcW;
z;WAW2Z<r-qn)=_dK@%v;>WF6L_))WK!uJsDgMByJ(Ig_Q5cU3hS|?>G!Y};1OF<Wa
zl*ZFL;jvPM9Z0z#V<R%<U+cs-0D$<+!i)gnpZe4=Uo4y%6s6otr0J>}o-mvLON2AZ
zn|BT}4*&f$ijgzHWo~51hu^bcZnzA1oFg-fo+uAm0QmqEvPheAq>+?blg9>&<52d;
z^mjX2^m#4lqXFk;+yUc_yXN59ep=C5wahObG$F5YAAvGn6)$5UV+>{1pBiVz_9tOb
zmdFBK_M*3Jo6LvaYI#7YX+$VdcPobSbCsfF|E6j;b&$vZEx+p12UL%_#F?SRoJ;t-
zFOI4MfY1BnXamRlx?Lh~bO}jw_Oa*o1z7Imo@7sKrcg77j6mG3P?-oF<~gB7>KX&i
zCx0tqfXNKv7M3X(VCs31%8VqWM?r3J#m&wF18L42t%6S8j&rju#yTsJlRmfT<!DUE
zO&OQc%81~U=<nb<e1NJ}yrcP!suTaJkvk|Iz-J&VaW(1g$|!9#B+y7%{a3@;68<mG
z;WZ#!W|olMls(UkTg!)OdJ{};I8o_7A>7ey6^hs#FjmJGc@t}{hka&QFPE_duhiU)
z?;Hl67&dOI65?@bx9aJC&3{pw>p-kpSvfaB*O`DGmsx!w)~f9lfGm|hW#0OG$-=V-
z142jyqm()@?0BxNOd0xovs;wWjW|jXocB=rg2A+T*`A-3NRHfYS`3YP|3fTrKMIXb
zG?K#cxR6fP>fh6mDa&6_8?BAtn=9sSu_IAxd|e4HW&pQg@5|k^C!*dymO2ZXPwDS|
zAC9c%^yP|n@NXUa!bayuU~vIqi(?$2N(US&ySY(+*dx}clBHqi7S=V_Gj&AZ|0|5-
z=uTQV1)9*Bh1l~3D*|WQB6;Cc=BfbOz&&nyHN{wC$yd<p1-@{?*i8`V22;w+4pCiF
zvPk&rKxbfE`PrT~@9M9GtYwdOD1LVq*jS5=#`g=UQcF$*WK~G{)Y|Ccx(AWf^a-V+
zt{N_rwm2cZ?<8>l++t+VRuN6{6kU(8vJBW&5@Tz)HGl`0svU;CpvC=zn<zX`B~yjW
z8p*8yBEL!f78j+`Qx52*Lg!0QFGF_rjsz{p>kqbYpImcYZy7HbT6fl}-HfU;R1rsp
z;oeks!J{U?L~D%qU}^i_H8DL_X3++K6GUSN^b@2_(3nE_0ZmhmTL+rYzOa^L3TdDr
zfQaDar*f#?87YQc&ad6u7xN8yJN6YnMO{y@SY^X&VFqfINC@cBcrSV3dv>*q?_m(Z
z=FN<9cE`h)p75<(jy*_v`5--K2N}{hfxYSRP_0^YDWvZDJ9UrKU6}Aht}mhaTDFQo
z_i0!%SwH&FGnbP@lt?U9op2%?B~u;NL8%@}4v{K%aAAiToYhwUVXVI^zkLEc0|sv?
zB6aR2$vTHd-|>fWpH;Xg2eH(M;W20TH5~InE&jo|C2bk<x+9_vf_-`!5SkIh>n{m$
z?s6Jnl)(8JpVu@o$?J!CK-!Y1ZqT+0Vrm^ifzQFyWm5VcdI-hUxWvyg9Em+{dY*@s
zOKEeC>oA1_!Q3KV34%Ht;1M%;pD=i6Ggur?O!rEM91TGi3ejC(hk?+80bvBdidCM}
zf#7Sjt8lNbdF(zP6-*ba71{@%dL7ZPn7z*LZF<|l=CfqFI_w0wJz5bq6Ps6{$?Ra1
zTyJY2kav+zk%KrDIqw;S(6f!S@igXp%4V|h)U+Xr*+h+YNtGJ^#or*BWQ}KaR;e*$
zm%OVXr{{HEJ|3PCLF0VrsEN{hJRa{})l1nVLjR-@{AZs6Ve-pR9d6)>#Nv?T`02ih
z$mEQ&uPKq*$}CLwG)~i{@qD5_Q8p+jfoZBnnGW$zP;Xd;R7~tfA@&@Xi{YDp*1)$a
z<N^Zv>wcwlOCZE*2>U9k{C5$-sQ6y?`-9Q9GNj^Cb6n?f|8)ZtZ2-9zk|wczdT8cP
zP&oInM{XDUq!YQ7K=+%cM($Cy0-?Z*MY9wyK<1|xa`81MKO7tE?}}`&aFCvZpb)!e
zrLFpP;DODs{^)cQ3|Cz#3QXqc1O>*1^=zMt6*6Z$#_&d^26Va9{V^)bkpfhh_*mPV
zp)9*@36&yS7T@t#-so^A0lc5YKA!fEx2Fp<o)B^2CdszjVHT$U2dW`cxxocEi9%Jx
zRVMIqEX|ya4&=aAL!dMO+=cLKEWeC1@;3S@uGpat7+$5o;~)LsW><zllys-9!>Z4l
zSkbt-Vfb{MU*r&!F7=@|B3GHDrl;xwiL2tUYK_z=voGy4c+jkuEGz4Qq!PrCD=o#i
z5jGcVp0$F`71=hHOI-~h?xXQ%6|zJGjNMMZ5j`E^ZDQke+SJZ~{bhwZ_XD1Em(2Rb
zqY%%1u8Y#z_`bfVJ><iJ+Zqwk((&ob&6@T_iK40)qp^11@Ue6V(@rTKuSth!*uE$p
z4Rhv!B;u+vDSyrJ{GQlINQwK~v2j}mb;078=GL(5p1-2h-%|rb@jvqx)v!$*!E7$!
zdiS0xR;4I`=RW><iHD2sHhKVWNMC&{uJ>7YVsoX9{SDNUIvx6vdN^%3BZKy`jOlkp
z$naK&bT&s_=cWM@Liy2aA`!|rI@}YZnd+8gvkXr};n`QpPWi&XBa^<rA7PtdETJnz
zKDS&aYZDnnHdcu;_V-#JErBsZOAme?Pr7rTBTRkP&pl^oN3F71JFoo_h>D^a7*89e
zP>IQAY+-RHd1QCJk`J`GX_8NzuA#NA=S14|=V2?{?PWYymoy2kc135!-&J=qJ}vtg
zw|T^kf~|J2yDC{x_zV!H1X<#wg4n7-#6B&U(zKW;Q4TAg$49EkgzowScKQ0=gGE%x
zlggzCgx|e64)32;uOohNwa_VUTrX794A`XKL-PwAqo!HEy(`T<xKniCe@ekaoA5MT
z_Ap@z7ZlWT<^C@N2>;cRz@nqc)9i<*A*tVZZghP|GqX=1mxhS39SpP;ZssCDz6@r5
zRx5k4x^Onkds^V})1CpLC{*C5gh?l9l#+rwo4i1jWZ1l}Rsl)H;CN!z5~PL~NcT(&
zq@pTPpj<(2yzfxpX&jN*F_XMpZb@paThAW%`Z>cxB{G0q8*yj%`}ce}6h6iZcVL8z
zu^DKPg3)48j}K0NRx36<9}HIW8mW}ciIsxA&YIczsJJEWOa$%h2Jp%djJHu#O|_;y
z=FP5?cURJI@#)`1&<goaINJUx7wqUq#Ed^oA0FO>oeh4cwKEmAd7Y{KoNH%y(o5!5
zW>ZlrKDs;XQL$Rwf;~PapdY9KVJcjnFyhL93NhCPn4!yd;=r=c@2(~5+9&lkhn6B%
z;t&uU0&8<CM8+uYT1OGL-_P*`DVqF=4>=*qyM<xQpXnny*=wCf{!JV!c&bp0+=jN7
zs3hx91(F*!1s%3wGjnF=lZ1^Gvj9amLSFZ!a|Ea0Y^$pCB)trNLcXGjuP2W~|CcXO
zy9>gP<Nw$#meTYIt}onP=`1MUarn3MQXbPeH`ss(O?|^|!S(B<Xi1C#`i6V;5D7p&
z4)M82ix9V_oo7-2WhVfwSHzCR<(yvYjjy;!=pwflvPnw9x8{wWA=1y6IpM-9fsEwa
zg5~q<{E*@e^Q@Z^?C!9mvZb$O^PbW~4k4~v7;%2aG&B4p1^BmImZQ?YKN#1Uy!JPU
zMQemFiTul)NK!w>-^)3E`#SgXr`M@GPFRNFlkN!n`<?OaR=JqXr6v67f?hMy^I3#@
z%X@6d-2G3O?!1&*JvCwKH69!Rh6fYr-?cFnpYK*CEJ>{KcTqaZzGN3t?eLC7<XkX;
zq5?lS{u6+?*D`+S^~eO(3~Gm}6Kq561K~`~P%(BQute`n|1OjFBi>7MP6J=T&#BSZ
zgLw8UprE#DB94}lD#5NLzkJ7|z74?sLYW41icJz~31b?mQWEHz=Y>Z>wy#6{8jLUN
zi1{>lFd4X##_@TM?*Tl$jd(vw?&BIAV}7{zRw+~07yhD{o<AZ6hid}4qSNG?Z^}Bb
zfOISlGKD$*VJE(vcDs^IO5ORTxw7Rh6mS~2WaEQ;RK9(m)tM+P{V1R1Z~5U3InqS%
z2fNe7$Ph7R#wu!!Dv*8O%J{#BZRR0ip#oWO!7wONN@7orMw?oJ=6TG-x*KZt%G<u?
z=T|~L6ogD=?(L)DF|8;$eP1h-cc5Jb*uk~0Ax?ebU3FJz&Fvn6arnQq<zS%820lP%
z>=v|+*NvbIO|aV80wKg_jNeO!R7yhlw!$!EDpqytpws{S89Nq&AOpE!{1$=?B3EQs
zpZDy{#2982L>-^E==$uFDXKyjijP>t+0Y(-p@aEsujg)WHiiY<??uuH1>CgHaH6DN
zMbnfH0i>Q-TXbo2hM;kJWYsit{ia96AX~k~Rjp>y?U8bH!Z4gv(K2UAj{A>Y=Klu8
zQY*zLF-nQBO#FNR>V|+c*dyP!e~Fh5-zhPRr0jJEaR?;x#toM%;>-4T<gfl!o~&xc
z$8h4$ZN&3C1}+5ZbX`Q{u&vx=ecezM4Hy{094e^15=S#q9W+B>Y*fN%ioYIhrE$@b
z5GD)i121?dL_Nn^ry4DitXcF)KfIiLIT28S#=9ab&wNYB5#<6o(l&<!4$H%EGS|yu
zla9zb7#8VHfB70M4Ypj9F0wk5-mGq!SXe~yyHx!rD0L2Q{rJ6pX$dfF-yt`hcSCf8
zW?-&%`qK&><P*Kh&Q{4Nl|iiDX|C;HSl`TybV>(uTHi2lV{eU89!Dg=mIM-SOE8<~
z)^;^av@^VT6Rm|^(X=x&w1eMvE*RO1i7PTHdAf|xmEY)sDGU^>haZ=cwRp6wS;Az@
zsY%gJX~x#u6@eACo_xO#l){pOmi2St5#}q8B-|p`pZFK$>_S7>sG~q3ilXm}1Tjy1
zd2#<~Yj`SXlAS-<kO93PQ)oA((_sfRT4oee_J&aEVX(a!WOSl1BXt^e<)G?%Zq8xN
zXUu^xe)8DOmn$<nt-$&|{w-XB=-8H4PEmRJK-r&p@nUm-Y@5MwI@&P>4kjmveBdjp
zTj<iH;=<n52drE&N=_<f5~uh8Ek-Et{^lv_?C2^yS_ne={{1aVIXZ>osStVee$oF~
zvIP)jmcmh8(GJ@1kxR?N(#({Dc&YcJYoa_lb^{k8e7Q`$YQ3jbc^v;Si_xFgxIbDX
z=^e`%7MNYz5imgE!J^EKO4XhKLj@jymx`%V^gbbF#qQNi!Nt(p>^%m<$RV_gav2;i
zV}>3-W7b&!%PshR(1}~D;mMtmh5V)(5f3Xy81l2YlUJ)yc#)|r7!pn5MjALC?IDvN
z0=W!wwbuUsvYm_XDdockha}1(AXI?#dcvV#$h!3Mb@xH><`^a<r9IA~Jf+6Hbl%C?
zCMOT7jf9Lf6oq~U_f~Q#b(9^5wujyqVF~>f_bCXRHYDN4^*myCVOR0V6xd{VE=1GG
zd6jK&TT;Un_)Q5oPZ?1E3P0W0Is)dL-3))OK>i%H=?r-;?=4Iyn$bkh^GL#fGAR>^
ziK~f_xv4+%PT!wWl3IU69mLkn%tJoCh#3fWdc>K^M?>k~5s(w<Dzvr_$IjBO(E4og
z@)(2LBmhK#q%8u26sKyohoFI?9yO;Vb@cYyBuHo>kXD`=1j3CpBBm`1ica%RxxglE
zlEA;1kzm4Zx^+S26hy~ScZR~igV1jMR8E?doI6iV14zPFtT1)EobGLV2GfD>QRrXK
z(V(=uXt=m@O!R=f_r6kYYO8|sT7iEEBD;Yd%0B<!&4O-ps}-oAh#U;uL1V}7Q)$jJ
zp69^ST2j7ZcdW?@Y07j(BLZ%`jXT^~8lBQBtt4e~o^4DXsUnzMHgaeU^_f&$*HypE
zYF|;rnzX5r?=<!s5Dn8vEqqMoUa|V%jnUA!&v?<GhTyA*okA#PRhss#GqG9#U|1O<
zt;In60h1PN=_YCmov*XCIwkH*Mmm<pX&@4}3AMUB35II$uBUC--);7mNx)q6*0MM(
z(R=Xb=<+C>tsOL~FY%zoL#&+pAd~teE4+ADTnPNQy0<v#vzL)`NRnZPF~bwLPutTf
z?UoGtQ-Nr9+}v%9PT0&KLZU17n8t}%UD;6i$@z1xnGbk?+&yCQj^N^}j~kI)0^BRm
z+E4DK5lkJMtLngI^@VbINJ)espQIdoSNzWQDr*K&4`uZ&ko8Olv}fkqMdd8MD+gN(
zT1lL3gv~P_J&e?vWx4fz*+lEN?gbxV34xmJ8ajq8x1=F+9>6pBLPeZvCIl$IefBK<
zmDy@NGBb`d9P+~m(WNX>?^QU-!|||kL%|G$$}X5;QJ+bU`i;Ovb_P<K-@1l`V3q4Z
zSRSoz_U3=FL&KRJ3Pb<0^O|t_2x5Y(y8b$dCZrC9ufR`Gf9mXq(>Z#=+j8$D1#*=!
z!Mpi=@0gHD;MpO!cfP}GqStXoSY`PHxzabekQx9D9w7M*gxpb93!p0eE^5|H8o5$t
z+1_^2>T2p3XmW5GfU6%9rrk14={S^$i&cdW7UBCc<HDkdBu=a+)!h&x{VvUZ&gE@v
zS$lX#yONE+0`Q~sk+7>CPPBZlldE+wSPuPiEd?qp71M53wwQn%zyPLy3`ny3ac+TV
zJzWpJPvK4)?q}Ken?{3@6>fv4Lx6KfQLqNkr`V{2bE$rx<ME{Le8jI*W+MMB{tN|+
z<&ZR3EdJgy*|`vB!)^V8BI&WCoa%gQ8J><#Q|8(9zY35;C!XD}<8TK>7$A`RwYSMm
zk3pYtQJKVAC{r~yeiHl+srP+=>fV7SfcNqzTx*j>9cB(bh(^hs-l=}eEO71?64ZGi
zE!vBu`8$qQDJqutXINIF;%uO7F)FxWV_W)O83^M-Oz1;u>u0yilrj>=)FjSd6x~Ae
zLqVz^3w1k|!|{vjrHs!cy5Zvm&~TThFo{i%A#x7IUbuA_#phwn>X3GD9|h<Bz`c+a
zXJpVa5L9{RoDa+vw<D?NWcM@{UZ7j<i4otZ0~;T#_Xvau%W~W($e;^Qe?I+x1@v_O
zpLV~Pj{1&RL-90NO?EYTAUcqkQND`V1?K7Lm#+|hpiq3mDeC?wgowBK3-A;QQ&>l4
zNko@9b=!ak<MYU}d+S@uG(Wk~B1$YQeYI;z271d`0lmw4Z_ba+4e?*Cp{Lt+_~aKb
z0+sP4QURad|Ly!fp3db2+I^>KWV}{pn6+oEymaEJ1|bTmyPT)?_w;ePi~@!`G?nj}
zh@ffWl@d;`96N9nN6DO-{RsC*I!|lNW&+a&bm^hKcFZdQMiU(Z|H$tv9;nMH(rO3r
zfCNg_oUR*UxG!;~xIrVCSww-nwdE!i`#Ih$^?PGtfPd$`NWU%~-%%5TYS{{c(#_Gi
zZbP<CzY-5Q4V*CUcS5XtMc99pwaCa~QzL|E;+2{`0i(d1H<ZZXtkjPQ`;#vKnEH98
ztuH;-1=m`Xg1-C8&aocn>a8J&|DJ~jKFu$qY}S=@t?|?E+(kX~5_CkOvLflprL_$X
z69;&Ab&+d;(D4c^Q2Q1FSdUj&7~n#_R)tJOI5mySn4dTLm9DWh$+VB2%>UpWu96-s
z;5!m_P<BzZ?NknvyM9%Hdom{PO+ax%Kfm(=DI)5N>%Hj!oRGZ32Y(g}w5Q9e#uT<o
zr)2#N3)gz5Uvm;<$V8z9pPQG%W(5`QV;uWVR5V~m@`YMK*Ky0LlR4XhPWVU6nBI~J
zAg`!(Sef{h4MppK<}!Qi>U=iP1wkwAcfUe1TPDpS&_!V^FOn8Yl&P>q8uI}l*mOIq
zg775I(k%rHYqm83K<?4Feao{e&G?DFVe4;B?DkRfLrHX40;YrcC9KnfJa?}7`dB2I
zNt++OMnm0f-4;3nEM#P>?}m}*W|SUR-LI5qt!t?Q<AH)u=K91Mv5>3L=iMr%0g$aQ
z0+f@9yfzDI0jIlSW@Vnp5<K3FmFud(4Jc!oq5rnB@Ck9ykD<<cR)bB6)KwHv8yM)W
z_1;oV#4xA*fQa6-^dDhX1Nf`W;~CWj<Qf-iyCWB02vx~`Tb$dkSdM@^<js=X%&r!A
z=)UriUDFo|BlpV6q@b06zm55EC|8PMTtt(rQ;pWlR3J7$y-kqlTmH=bl4Op0O;f`N
zQ)s83?8@T?;y9yHJ}5+sK4Vvmv+#3QQ-#29NMn;Q&|)qVe`Qof#xk81yAbE{^NQ4z
zG8QQck%?UZQJvb)YZQlmIc{(`Xf#-w$3e`x%4je?h$q;J<#1Y(RMH)@S18*QhYW0+
zcp5TS;Xy2}`h6a=y4NbFM<eWQ((`8#+IbY4@Kf#$t48i7xT_h8`ZDKm9w4dkQ0e&t
zQR!5iRdGnltkPqg7Zq#FnOQKGj?s*JXmce|R3yUf-(wAl_E!_<4VIj(*iDVvSj_1M
zM_B7y$J|9){TN*gakT&WBQZjnkSPC;51FmJSTD_aUaZm3VS%gC`xZU83<D~n53IwD
z3A$>;QFPa8oN0Z2dZA4FH1Q)ugR9c05;QM|imb4>1dyoQy*xTnC$F_!79;1|EQA%@
zLhOFP4t{*0H7K10lz<V+Y=iyZ-Z%GaJ{xd>&VKY}2S@^}X4<?%8Vf|!TaY#f$^J<Z
zyf1dDUoQM+>yR0I$WjveDC=RG=;L7h#LLH=DmoYd<P=tpcbtx_p}(y3AH;#`?MI?5
z?_7C#J+OufG`i1Xq2wQ$mc%TBf*7h`;jfa5V|ZE#+wr>of>)Eexz(208~Yg86@4o#
zJe1(uuXx&bKSdwN1Y?PorJ>rTQB?SC$3Enn++$)iJA*Skv&K-{4_Dv~8i(t+58A7R
zP=(Nmkdn?O%PvP>t!8+NF+cC`LVcsNBtya?U;)TL&*F4FDfeVzZ_YNEDqtkZ%O>V!
z@y8Z@KNUd3dD|s^wNF{We|8j7Bl*(f(;&*tM~x_0<jJw1ozVH)%?>IDNKDAYj%kqZ
z@1L3&PKMX_hY@m(DGMa=VvKh8Y7jD$4#W&7EOUb+Kr;^75F+!%R{O-YPAFTe;FhO%
zO~Ml8TXQ>vQ+p>kZZsq5ulvYSj><wjaj?&7h(;h7Ud?P3etE!fQC;-y`^lIK?9_Bj
z9gG<^N$1VmXFRq1l4F3D{M`U$WsI<O&h6tO8Na2^?o3FQIbm!T(c>UiFFj&<%}l&c
zkk2qs`z^|S)_N_$8jLH$UjqT80(~&T;ujT6|1V=yw*5hCBCys9;j%IA+=0Dft%MZ+
zLJ4|wp-zmjk$)tR2!f49O7&p~`C*Mh3rSuINzV$WJbk7+I3I{gGD%93lnc~EjF+su
zkJ-?r>_NccMMpB4t&&(z6L7%UPXCGNc~%&;_q(UJ1OwvPNP-ua-49cK%QDj}dW4QD
zi%bBEET4#B>M8XA%dMxH!hhH)x0dK>?_JSU?~cl~U*)p+3H;k?cE4!-FUaV?GLV|M
z+D(bbctYU?F8$isOb~MhHG-PAp4jzZL;hLR=wAQyA;jnq;NxCzi<);E<4cCJ{?5SI
zWXAjwq#)N($t0`F>%b2Z4akD=;3^&T`Jc&b2prO&ef(yO;!jh-_1&liacTxjlg#o+
z!@nmxJ;5NYm%Y3+cOuF-Y0ZpYXQdmcfT;uwqt20ndiH;CGMv(rxz%(KDyGb4)2$o~
z#^h1yp0v<^6Ya5czx46;OKw5X^!ZML7o;HCuwVRX_IIP&qFpKakfn1aJ@qZOd7W_f
z(Uke4@?G)DRo?a&6=$Xfs%9oUKwHhJJtLzq;*108F8KJ`gDK|*FnNp?=}VR59l{tu
z`U#Uh;&0kHZOu`F;2Z~aelluEN&pQLVgt-O?;ScRfy4v$M*qtg75-u0!^<<Z%*)*B
zUHkrZjng@nW@1x`e5RW@k8X1L@CuDICu50zjP3ACE883mMdtkSFu$?d`Okm4dU+pq
z0awh_@&DzP+u@j1OAe3HXlG|DYqa%E?UzG7@?p(}q>PhYvl|Qi>Hs;1lU9t$tiu+1
zELR}+XE9vI4oyQj^XEM|{*W04PTWFOqe}lXIUhOmzHI`+R?Ue*QcjbeWya9uxtWe6
z`C~&GuJU5kUL^2=#`hK#d4^E<*kTJ=%y(#ZW}+N%3}42qaX4mBvmuNz{RI?!Y3Fe+
z_#0e;UMS?iv}=J2cq@Q>6LSCE?F{EtLCKPh1Z2YQp>>Mym46_Eu=snkZfn1B>4p+O
z@U>q=+Vv5pV#S#Zk(K6WkT-L`uuYC565tvfFO>RB#%^Kr+@;_qpoCG%Mp95rgwTW+
z;Jv;s<CO$o^L#SM%Y7Q-$Wr|D<(PAv8)TiPjCWg)D1Ygy#qZ+g{~&lltAm_#vHSvt
zq>hlD0x#;tSqcRSUkRvO8f<l_cSB1CRg|ZI14cqKjF-?1lU6*JZ76HoNzYFDun;m^
zT-U;q+fl(G$f+kYRFzM{+u1EZoAx{ki;qwmz4WAwu^y1$=h5*1HwELj0__OJHr(n<
z3F>hJ;Al_<I6oiXHlOT^6IlR+W+Xs3!I%#US^you9-rY8L;-hXE6oIlE*zoeFD1=>
zufOEMYzo|djw$B*$1~_B(w4yAYavB}wmgTP1&Nv<kXo60cgFn`$t$1d`lX}_UUdPk
zFeFvR6R7zW=ap;#J(Q4h>cp5BCIeZGqYYp#w6Fj~zWld=8nYjZEtuLlu!2^}lX3v!
zZmdI24$o@R;>~8ey$VL_g2N>h0~kMV<MKcWKw~rGyZN=zT9Czad!VHeZ7m0)daPBE
zAOfk?%V~Z%<<LqZK6>J4*^4CX;#_M(md#Nii$2c<jKW*kBQJ=ZZ((gBRx7yE5i~@0
zJYeRa?lpCgRv^wo#B5-MD92C?UL4|&U#l^fvVOb?)I^H|GD&0>KZKbP<w{7ym2Gj;
z9)%l#RIf(IP^-5k?=J@PXT%XcMpjLR@o&4WsY{0Dwfsev4Fq*w5M{%+f$c4j@0?sL
z-EIf`{HjTE(%`(a|6E2_|Lu6Zwa<@>V%UxWvd&$+d=3V+4-D<C#{n+NF}g?0kE`+m
zA(q~2xIum!gtUI%5}Y*TOhHK5YB)ecek{xp))Gw0f@kZqWEM=5LMA{pIVFnvV~<C>
z6egmHoqHRz@zIJ%%E4A%D^W9QrX6b1Ox7nailAU}^3?gqI$RVe;m4<_m=`toZ%o>d
z5P%~(^%aJS015;Hh>Q?CEPgn(2rh%d(C$afTfE!>y6NXt=k~AtJ{h^8AR@kn^AAK(
z*m?|uYUXd+8(C~p5I|NWPH_tbequE6>XK!Gvu4MBmmd|Qf-|f?Ph5e^TtU`|TO+#<
z->hvE61_Nt#eiopi+uSz4bL-`76nC)gi#A#V9sAk#&giEjb@kU133{7A?egcim<=Y
zf}M}J#58NYx|Hv<z1U94<H*kp!3xjLT7)U&L?{2|sXv;5CHIC2UuuE|BMs%u@lH`z
z<Dbz%)`s+E)ck+CToyyz7?Q*jX@oLKwFBs;yOQ>?$~0q!M<;yzt~VD4Ki)FKN-v01
z`L@RQNRL1E*lPix@C>w9RNt$2unC7r@h~KoOL`#Al((=lxuve}H5#+(*S$$RusaHG
zX@k>bovyG{s~Ypa8WO&f>|~{^`b~=?PRxOcoG|`Z$?1Znzk^pjH=SCveOD4E7jiWo
z?;WiQhAH%?>olbq=Y!>9)maQLa`rwroV;?zZyQ|O4w5sxZtMCMWR=Gb9RP|~cgeV=
zg}DMpz7oR|>MZwS?*7?|bTDR%y@b@HVNh`v?o-6y$oVR*?PK(byeo{4GM8uQr__bc
zTQ|cQtx{Eou=ie2`V{)dI`WL#HH)MV`>vh9RscuJVUk>2?*^_A1MpN)Tq>KidaIWw
zE~l}1H0~#!R~crtvrxDiW4xV61e6|&7Gs{Ox}5<Ci^Y?F{x-wvPn&=8h=&CHg{EDq
zoA=CAVh1`f@3gI)E5XFsCu`%!6EH!<F^t#YcDIA`hwXEW7t0RlsBYJ<2Mq@-un6Xo
z^FQXB8)s^Mi}1bF{_fM0OneCj%@S{C8BXZlxUcU;x?8yZj3^OQ5A#!7E|)s50eZ==
zWKlONMnh6xDP}M`YlsTd-)RU2+!=~^fAv+-z<VGbVue@PH~c`LXc+Ma=cmCx@56Ar
zZj(=6;9i9>ihf(LQ&I>SC<D_e4a6F5ik4b6e7a$65!T&Kp1;C7-m=QCkMcd#qsBz$
zzJUM0xgcGSQU5?5>m0xJA!hagc5GWY=I+_))EH7-Cx?k$Wxv{L7!xiKTDvk3(j2h2
zY>qL^!$t;dgKm2wi4)s0E(Li_5AfgCHL-G_$BeMxbf8YS5R4d|hAeZBd;*qpxzb?p
z)gY2*$11Xxto(?h0OD{|ZXJR0;iFnUvTtNHC`kxLCR+n~>XWA(1UOq&{FEKz!`Vg;
z4~hK&s6>x!CQy=_*~Qsor$3xiWCHdtCmz|we`w1wI0W5mO&*tg;po5m<zXQEy8)-=
zsHv%-D_&x4s>JthNHI0gFx?$z;%&0Ozo%bkeXc1gUz_;4SICi5#}zpB6WP&93KKcH
z`+Q{z_Zv~}5b?r<T~1~{LJlP}nnKlTwUS~GGx<2-|7-bLa4|_JFMyA|4c<hc@yuft
zvur3zh!%6j6V%CHW}d5EZOh+k($W|V^E-7=Mo~5P)MD!K^49m6%m-@dLP}v1*AwgN
z0B8k~XjJp;_Y}-v@Q~PL>3rzTeSL5$Q{&V3l-R*TPTR;Mz{mgu1LR7<Ndm$SVFROP
z_$7LmOO1e20K|-bFSlNJMpJet<Ld<)<J`&wo+yZ~5tP-Fh3z+HFJfjf5Iu$q@_<{$
z79z9}@cpIo<TUAxJ5b@A?=K16p0*==Kmm*$?Lzxmtgc_e3<Mv*jyRcqE7Yl)C_7sM
z=`@~yh?~HH=dVNO;At8)n~-yv$4=c_AE#YK5igc4N(ed+XaQ78$HR<oCJG9Q%*SUQ
zfHwxD9uP^pQ|A19{QhbAKVMO}$0YfuLTy#5594B4Rn_<vLq**%Tt}U|BjHb%LiXmp
z^nYu&RxJM5^1J8K!<kJ&>;n!Bg;P`FdBN^JDdMh@-y4mS^G-zP$I(Wm`>dOFZ6mD{
zlZ!`4vs`_*seMIK5=dN9AH8fn$^pHKyqeO<N@n@ZH1^!SHlz7UuDMlBF}o*aCpT?F
zr{shztlKdU+~XpTk2x@Am<=V{zg?D?xx9r8dU_L}#NnB+>F+Z6btXSLrC))OVJzKb
z74*``D*oGopp`b7p<EW;Un!MYbgB?670%7phF)xj$7CUqr}`-Dp>EI*z-$|N|2YDF
zkB&eaH}>ap&8@uGT0;MZXqUiLqre&V%{aEel$<a3{a&l4i!i@Ijq$nK8UBx1@8-eY
zYs9{YC+|v0@ru2Q9z6rB6bH6LR#)id9oRlO@-iZ!bQ<Vq^Z~&+W?f($%w4fqRO~FY
z{h;Svi;|dnA4Cs_B^FxaTKEgi@I2(V*Hakf>RmH=3Cj2DA_ZM*%I|WJZKXVdiet;x
z3OSE}T87GyLQ1y-I&eFg40#*&=g{Ii1OzQ3jo_AimeR;bu^&)E3+JUonNA<kC89X#
TwDRBM33vNJAX69R_xJz+2lD&n

literal 0
HcmV?d00001

diff --git a/boards/nxp/frdm_mcxc444/doc/index.rst b/boards/nxp/frdm_mcxc444/doc/index.rst
new file mode 100644
index 00000000000..db72f8d6fad
--- /dev/null
+++ b/boards/nxp/frdm_mcxc444/doc/index.rst
@@ -0,0 +1,220 @@
+.. _frdm_mcxc444:
+
+NXP FRDM-MCXC444
+################
+
+Overview
+********
+
+FRDM-MCXC444 is a compact and scalable development board for rapid
+prototyping of MCX C444 MCU. It offers industry standard headers
+for easy access to the MCU's I/Os, integrated open-standard serial
+interfaces and on-board MCU-Link debugger.
+The MCXC is a general purpose ultra-low-power MCU family,
+providing additional memory, communications and analog peripheral.
+
+
+.. image:: frdm_mcxc444.webp
+   :align: center
+   :alt: FRDM-MCXC444
+
+Hardware
+********
+
+- MCXC444VLH Arm Cortex-M0+ microcontroller running at 48 MHz
+- 64LQFP package
+- 256 KB flash
+- 32 KB SRAM
+- USB FS 2.0
+- 2x low-power UART, 1x UART, 2x I2C, 2x SPI
+- FXLS8974CF accelerometer
+- Tri-color LED
+- On-board MCU-Link debugger with CMSIS-DAP
+- Arduino Header, mikroBUS, Pmod
+
+For more information about the MCXC444 SoC and FRDM-MCXC444 board, see
+these references:
+
+- `MCX C14x/24x/44x Website`_
+- `MCX C44x Datasheet`_
+- `MCX C44x Reference Manual`_
+- `FRDM-MCXC444 Website`_
+- `FRDM-MCXC444 User Manual`_
+- `FRDM-MCXC444 Design Files`_
+
+Supported Features
+==================
+
+The ``frdm_mcxc444`` board target supports the following hardware features:
+
++-----------+------------+-------------------------------------+
+| Interface | Controller | Driver/Component                    |
++===========+============+=====================================+
+| NVIC      | on-chip    | nested vector interrupt controller  |
++-----------+------------+-------------------------------------+
+| SYSTICK   | on-chip    | systick                             |
++-----------+------------+-------------------------------------+
+| PINMUX    | on-chip    | pinmux                              |
++-----------+------------+-------------------------------------+
+| GPIO      | on-chip    | gpio                                |
++-----------+------------+-------------------------------------+
+| UART      | on-chip    | serial port-polling;                |
+|           |            | serial port-interrupt               |
++-----------+------------+-------------------------------------+
+| FLASH     | on-chip    | soc flash                           |
++-----------+------------+-------------------------------------+
+
+
+Targets available
+==================
+
+The default configuration can be found in
+:zephyr_file:`boards/nxp/frdm_mcxc444/frdm_mcxc444_defconfig`
+
+Other hardware features are not currently supported by the port.
+
+Connections and IOs
+===================
+
+The MCXC444 SoC has five pairs of pinmux/gpio controllers (PORTA/GPIOA,
+PORTB/GPIOB, PORTC/GPIOC, PORTD/GPIOD, and PORTE/GPIOE) for the FRDM-MCXC444 board.
+
++-------+-------------+---------------------------+
+| Name  | Function    | Usage                     |
++=======+=============+===========================+
+| PTE20 | ADC         | ADC0 channel 1            |
++-------+-------------+---------------------------+
+| PTE31 | GPIO        | Red LED                   |
++-------+-------------+---------------------------+
+| PTD5  | GPIO        | Green LED                 |
++-------+-------------+---------------------------+
+| PTE29 | GPIO        | Blue LED                  |
++-------+-------------+---------------------------+
+| PTA1  | LPUART0_RX  | UART Console              |
++-------+-------------+---------------------------+
+| PTA2  | LPUART0_TX  | UART Console              |
++-------+-------------+---------------------------+
+| PTA20 | RESET       | RESET Button SW1          |
++-------+-------------+---------------------------+
+| PTC3  | GPIO        | User button SW2           |
++-------+-------------+---------------------------+
+| PTA4  | GPIO        | User button SW3           |
++-------+-------------+---------------------------+
+| PTE25 | I2C0_SDA    | I2C accelerometer         |
++-------+-------------+---------------------------+
+| PTE24 | I2C0_SCL    | I2C accelerometer         |
++-------+-------------+---------------------------+
+
+System Clock
+============
+
+The MCXC444 SoC is configured to use HIRC running at 48 MHz as a system clock source.
+
+Serial Port
+===========
+
+The MCXC444 LPUART0 is used for the console.
+
+Programming and Debugging
+*************************
+
+Build and flash applications as usual (see :ref:`build_an_application` and
+:ref:`application_run` for more details).
+
+Configuring a Debug Probe
+=========================
+
+A debug probe is used for both flashing and debugging the board. This board is
+configured by default to use the MCU-Link CMSIS-DAP Onboard Debug Probe.
+
+Using LinkServer
+----------------
+
+Linkserver is the default runner for this board, and supports the factory
+default MCU-Link firmware. Follow the instructions in
+:ref:`mcu-link-cmsis-onboard-debug-probe` to reprogram the default MCU-Link
+firmware. This only needs to be done if the default onboard debug circuit
+firmware was changed. To put the board in ``DFU mode`` to program the firmware,
+short jumper JP2.
+
+Using J-Link
+------------
+
+There are two options. The onboard debug circuit can be updated with Segger
+J-Link firmware by following the instructions in
+:ref:`mcu-link-jlink-onboard-debug-probe`.
+To be able to program the firmware, you need to put the board in ``DFU mode``
+by shortening the jumper JP1.
+The second option is to attach a :ref:`jlink-external-debug-probe` to the
+10-pin SWD connector (J10) of the board. Additionally, the jumper JP4 must
+be shortened.
+For both options use the ``-r jlink`` option with west to use the jlink runner.
+
+.. code-block:: console
+
+   west flash -r jlink
+
+Configuring a Console
+=====================
+
+Connect a USB cable from your PC to J13, and use the serial terminal of your choice
+(minicom, putty, etc.) with the following settings:
+
+- Speed: 115200
+- Data: 8 bits
+- Parity: None
+- Stop bits: 1
+
+Flashing
+========
+
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: frdm_mcxc444
+   :goals: flash
+
+Open a serial terminal, reset the board (press the SW1 button), and you should
+see the following message in the terminal:
+
+.. code-block:: console
+
+   *** Booting Zephyr OS build v3.6.0-4475-gfa5bd8bb098e ***
+   Hello World! frdm_mcxc444/mcxc444
+
+Debugging
+=========
+
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: frdm_mcxc444
+   :goals: debug
+
+Open a serial terminal, step through the application in your debugger, and you
+should see the following message in the terminal:
+
+.. code-block:: console
+
+   *** Booting Zephyr OS build v3.6.0-4475-gfa5bd8bb098e ***
+   Hello World! frdm_mcxc444/mcxc444
+
+.. _MCX C14x/24x/44x Website:
+   https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/mcx-arm-cortex-m/mcx-c-series-microcontrollers/mcx-c14x-24x-44x-mcus-with-arm-cortex-m0-plus-entry-level-mcus-with-usb-segment-lcd-and-classical-peripherals:MCX-C14x-24x-44x
+
+.. _MCX C44x Datasheet:
+   https://www.nxp.com/docs/en/data-sheet/MCXC44XP64M48SF6.pdf
+
+.. _MCX C44x Reference Manual:
+   https://www.nxp.com/webapp/Download?colCode=MCXC44XP64M48RM
+
+.. _FRDM-MCXC444 Website:
+   https://www.nxp.com/design/design-center/development-boards-and-designs/general-purpose-mcus/frdm-development-board-for-mcx-c444-mcus:FRDM-MCXC444
+
+.. _FRDM-MCXC444 User Manual:
+   https://www.nxp.com/webapp/Download?colCode=UM12120
+
+.. _FRDM-MCXC444 Design Files:
+   https://www.nxp.com/webapp/Download?colCode=FRDM-MCXC444-DESIGNFILES
diff --git a/boards/nxp/frdm_mcxc444/frdm_mcxc444-pinctrl.dtsi b/boards/nxp/frdm_mcxc444/frdm_mcxc444-pinctrl.dtsi
new file mode 100644
index 00000000000..7f0010c3cbe
--- /dev/null
+++ b/boards/nxp/frdm_mcxc444/frdm_mcxc444-pinctrl.dtsi
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+#include <nxp/mcx/MCXC444VLH-pinctrl.h>
+
+&pinctrl {
+	pinmux_lpuart0: pinmux_lpuart0 {
+		group0 {
+			pinmux = <LPUART0_RX_PTA1>,
+				<LPUART0_TX_PTA2>;
+			drive-strength = "low";
+			slew-rate = "slow";
+		};
+	};
+};
diff --git a/boards/nxp/frdm_mcxc444/frdm_mcxc444.dts b/boards/nxp/frdm_mcxc444/frdm_mcxc444.dts
new file mode 100644
index 00000000000..7e771a60725
--- /dev/null
+++ b/boards/nxp/frdm_mcxc444/frdm_mcxc444.dts
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <nxp/nxp_mcxc444.dtsi>
+#include "frdm_mcxc444-pinctrl.dtsi"
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "NXP FRDM-MCXC444 board";
+	compatible = "nxp,mcxc444", "nxp,mcx";
+
+	aliases {
+		led0 = &red_led;
+		led1 = &green_led;
+		led2 = &red_led;
+		sw0 = &user_button_2;
+		sw1 = &user_button_3;
+	};
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,console = &lpuart0;
+		zephyr,shell-uart = &lpuart0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		red_led: led_0 {
+			gpios = <&gpioe 31 GPIO_ACTIVE_LOW>;
+			label = "Red LED";
+		};
+		green_led: led_1 {
+			gpios = <&gpiob 5 GPIO_ACTIVE_LOW>;
+			label = "Green LED";
+		};
+		blue_led: led_2 {
+			gpios = <&gpioe 29 GPIO_ACTIVE_LOW>;
+			label = "Blue LED";
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		user_button_2: button_2 {
+			label = "User SW2";
+			gpios = <&gpioc 3 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+		user_button_3: button_3 {
+			label = "User SW3";
+			gpios = <&gpioa 4 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_1>;
+		};
+	};
+};
+
+&sim {
+	pllfll-select = <KINETIS_SIM_PLLFLLSEL_MCGPLLCLK>;
+	er32k-select = <KINETIS_SIM_ER32KSEL_LPO1KHZ>;
+};
+
+&cpu0 {
+	clock-frequency = <48000000>;
+};
+
+&osc {
+	clock-frequency = <32768>;
+	mode = "low-power";
+};
+
+&gpioa {
+	status = "okay";
+};
+
+&gpiob {
+	status = "okay";
+};
+
+&gpioc {
+	status = "okay";
+};
+
+&gpioe {
+	status = "okay";
+};
+
+&lpuart0 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&pinmux_lpuart0>;
+	pinctrl-names = "default";
+};
diff --git a/boards/nxp/frdm_mcxc444/frdm_mcxc444.yaml b/boards/nxp/frdm_mcxc444/frdm_mcxc444.yaml
new file mode 100644
index 00000000000..dc92b7dfeb2
--- /dev/null
+++ b/boards/nxp/frdm_mcxc444/frdm_mcxc444.yaml
@@ -0,0 +1,23 @@
+#
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+identifier: frdm_mcxc444
+name: NXP FRDM-MCXC444
+type: mcu
+arch: arm
+ram: 32
+flash: 256
+toolchain:
+  - zephyr
+  - gnuarmemb
+  - xtools
+supported:
+  - gpio
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
+vendor: nxp
diff --git a/boards/nxp/frdm_mcxc444/frdm_mcxc444_defconfig b/boards/nxp/frdm_mcxc444/frdm_mcxc444_defconfig
new file mode 100644
index 00000000000..3d640c35842
--- /dev/null
+++ b/boards/nxp/frdm_mcxc444/frdm_mcxc444_defconfig
@@ -0,0 +1,10 @@
+#
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_GPIO=y

From 0d2e0e9dad80188c84235d50c72317991ca683e7 Mon Sep 17 00:00:00 2001
From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
Date: Thu, 12 Sep 2024 15:05:52 +0300
Subject: [PATCH 0686/2913] [nrf fromtree] west.yml: hal_nxp: update hash

Update hal_nxp hash to point to the latest version.

Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
(cherry picked from commit 93c2b293b95b49844468623274ff8d916df3f3ff)
(cherry picked from commit 568b22be64279e2a75662fc268f9677a24da79a0)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index d5545988bef..b2240abbb96 100644
--- a/west.yml
+++ b/west.yml
@@ -198,7 +198,7 @@ manifest:
       groups:
         - hal
     - name: hal_nxp
-      revision: 77815705c465627b8436cbac51f0bf0594bbeba2
+      revision: 17aac63df44266c4ea0e111c731ca7664fe51e70
       path: modules/hal/nxp
       groups:
         - hal

From b0f9fe5b12ae186788257b1ea5fef9db84080193 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Tue, 10 Sep 2024 09:42:46 -0400
Subject: [PATCH 0687/2913] [nrf fromtree] soc: ti: move init code from
 SYS_INIT to hooks

Replace SYS_INIT with SoC hooks and adapt SoC init code

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
(cherry picked from commit b73c5578e3563f370d4fab0f7161a017020c114c)
(cherry picked from commit 75079bf39aa8254542a20235e936e16072503117)
---
 soc/ti/k3/am6x/Kconfig                      | 1 +
 soc/ti/k3/am6x/m4/soc.c                     | 5 +----
 soc/ti/simplelink/cc13x2_cc26x2/Kconfig     | 1 +
 soc/ti/simplelink/cc13x2_cc26x2/soc.c       | 6 +-----
 soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig | 1 +
 soc/ti/simplelink/cc13x2x7_cc26x2x7/soc.c   | 6 +-----
 soc/ti/simplelink/cc32xx/Kconfig            | 1 +
 soc/ti/simplelink/cc32xx/soc.c              | 6 +-----
 soc/ti/simplelink/msp432p4xx/Kconfig        | 1 +
 soc/ti/simplelink/msp432p4xx/soc.c          | 6 +-----
 10 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/soc/ti/k3/am6x/Kconfig b/soc/ti/k3/am6x/Kconfig
index f5596944bf8..39eaf92c858 100644
--- a/soc/ti/k3/am6x/Kconfig
+++ b/soc/ti/k3/am6x/Kconfig
@@ -17,6 +17,7 @@ config SOC_SERIES_AM6X_M4
 	select EXTERNAL_ADDRESS_TRANSLATION
 	select MM_DRV
 	select MM_TI_RAT
+	select SOC_PREP_HOOK
 
 config SOC_PART_NUMBER
 	default "AM6234" if SOC_AM6234_A53
diff --git a/soc/ti/k3/am6x/m4/soc.c b/soc/ti/k3/am6x/m4/soc.c
index b2e261a4e9c..519a3fab21b 100644
--- a/soc/ti/k3/am6x/m4/soc.c
+++ b/soc/ti/k3/am6x/m4/soc.c
@@ -62,12 +62,9 @@ static void am6x_mmr_unlock(void)
 	sys_write32(KICK1_UNLOCK_VAL, kickAddr);   /* KICK 1 */
 }
 
-static int am6x_m4_init(void)
+void soc_prep_hook(void)
 {
 	sys_mm_drv_ti_rat_init(am6x_region_config, ADDR_TRANSLATE_RAT_BASE_ADDR,
 		ARRAY_SIZE(am6x_region_config));
 	am6x_mmr_unlock();
-	return 0;
 }
-
-SYS_INIT(am6x_m4_init, EARLY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/soc/ti/simplelink/cc13x2_cc26x2/Kconfig b/soc/ti/simplelink/cc13x2_cc26x2/Kconfig
index 01acc8f48d8..6885038cc16 100644
--- a/soc/ti/simplelink/cc13x2_cc26x2/Kconfig
+++ b/soc/ti/simplelink/cc13x2_cc26x2/Kconfig
@@ -14,6 +14,7 @@ config SOC_SERIES_CC13X2_CC26X2
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select HAS_PM
 	select HAS_POWEROFF
+	select SOC_EARLY_INIT_HOOK
 
 menu "Customer Configuration (CCFG)"
 depends on SOC_SERIES_CC13X2_CC26X2
diff --git a/soc/ti/simplelink/cc13x2_cc26x2/soc.c b/soc/ti/simplelink/cc13x2_cc26x2/soc.c
index 452c73254e7..c896cf2691f 100644
--- a/soc/ti/simplelink/cc13x2_cc26x2/soc.c
+++ b/soc/ti/simplelink/cc13x2_cc26x2/soc.c
@@ -8,13 +8,9 @@
 
 #include <driverlib/setup.h>
 
-static int ti_cc13x2_cc26x2_init(void)
+void soc_early_init_hook(void)
 {
 
 	/* Performs necessary trim of the device. */
 	SetupTrimDevice();
-
-	return 0;
 }
-
-SYS_INIT(ti_cc13x2_cc26x2_init, PRE_KERNEL_1, 0);
diff --git a/soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig b/soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig
index e5c5a01eedf..d1b2fc58bd3 100644
--- a/soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig
+++ b/soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig
@@ -14,6 +14,7 @@ config SOC_SERIES_CC13X2X7_CC26X2X7
 	select HAS_TI_CCFG if !BOOTLOADER_MCUBOOT
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select HAS_PM
+	select SOC_EARLY_INIT_HOOK
 
 menu "Customer Configuration (CCFG)"
 depends on SOC_SERIES_CC13X2X7_CC26X2X7
diff --git a/soc/ti/simplelink/cc13x2x7_cc26x2x7/soc.c b/soc/ti/simplelink/cc13x2x7_cc26x2x7/soc.c
index 8c2ea2f5350..22efa243e67 100644
--- a/soc/ti/simplelink/cc13x2x7_cc26x2x7/soc.c
+++ b/soc/ti/simplelink/cc13x2x7_cc26x2x7/soc.c
@@ -8,13 +8,9 @@
 
 #include <driverlib/setup.h>
 
-static int ti_cc13x7_cc26x7_init(void)
+void soc_early_init_hook(void)
 {
 
 	/* Performs necessary trim of the device. */
 	SetupTrimDevice();
-
-	return 0;
 }
-
-SYS_INIT(ti_cc13x7_cc26x7_init, PRE_KERNEL_1, 0);
diff --git a/soc/ti/simplelink/cc32xx/Kconfig b/soc/ti/simplelink/cc32xx/Kconfig
index d8ec2f20715..8698ddd3452 100644
--- a/soc/ti/simplelink/cc32xx/Kconfig
+++ b/soc/ti/simplelink/cc32xx/Kconfig
@@ -7,6 +7,7 @@ config SOC_SERIES_CC32XX
 	select CPU_CORTEX_M4
 	select CPU_CORTEX_M_HAS_DWT
 	select DYNAMIC_INTERRUPTS
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_CC3220SF
 	select HAS_CC3220SDK
diff --git a/soc/ti/simplelink/cc32xx/soc.c b/soc/ti/simplelink/cc32xx/soc.c
index f95141f5ddd..7e127ddfcba 100644
--- a/soc/ti/simplelink/cc32xx/soc.c
+++ b/soc/ti/simplelink/cc32xx/soc.c
@@ -18,7 +18,7 @@ void sys_arch_reboot(int type)
 	MAP_PRCMMCUReset(!!type);
 }
 
-static int ti_cc32xx_init(void)
+void soc_early_init_hook(void)
 {
 
 	/* Note: This function also performs CC3220 Initialization */
@@ -32,8 +32,4 @@ static int ti_cc32xx_init(void)
 	MAP_PRCMPeripheralClkEnable(PRCM_UARTA0, PRCM_RUN_MODE_CLK |
 				    PRCM_SLP_MODE_CLK);
 #endif
-
-	return 0;
 }
-
-SYS_INIT(ti_cc32xx_init, PRE_KERNEL_1, 0);
diff --git a/soc/ti/simplelink/msp432p4xx/Kconfig b/soc/ti/simplelink/msp432p4xx/Kconfig
index 9b44c5f34ab..d4a9b6cfac9 100644
--- a/soc/ti/simplelink/msp432p4xx/Kconfig
+++ b/soc/ti/simplelink/msp432p4xx/Kconfig
@@ -9,6 +9,7 @@ config SOC_SERIES_MSP432P4XX
 	select DYNAMIC_INTERRUPTS
 	select CPU_HAS_FPU
 	select CPU_HAS_ARM_MPU
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_MSP432P401R
 	select HAS_MSP432P4XXSDK
diff --git a/soc/ti/simplelink/msp432p4xx/soc.c b/soc/ti/simplelink/msp432p4xx/soc.c
index 8faf547fdb1..185124d7ec0 100644
--- a/soc/ti/simplelink/msp432p4xx/soc.c
+++ b/soc/ti/simplelink/msp432p4xx/soc.c
@@ -9,12 +9,8 @@
 #include <zephyr/init.h>
 #include <soc.h>
 
-static int ti_msp432p4xx_init(void)
+void soc_early_init_hook(void)
 {
 
 	SystemInit();
-
-	return 0;
 }
-
-SYS_INIT(ti_msp432p4xx_init, PRE_KERNEL_1, 0);

From 50eb94ab51e708d16a248c7356efdbaf3c1f51f0 Mon Sep 17 00:00:00 2001
From: Declan Snyder <declan.snyder@nxp.com>
Date: Thu, 8 Aug 2024 14:37:15 -0500
Subject: [PATCH 0688/2913] [nrf fromtree] soc: nxp: Add MCXW71

Add MCXW71 SOC, which inherits some qualitiies
of kinetis heritage platforms.

Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
(cherry picked from commit cbee39ef711e13c2acf1fae090e9c0c123986af2)
(cherry picked from commit bf6c403cef9144d6eec1733e33981996edbc0244)
---
 soc/nxp/mcx/mcxw/CMakeLists.txt         |   9 ++
 soc/nxp/mcx/mcxw/Kconfig                |  16 +++
 soc/nxp/mcx/mcxw/Kconfig.defconfig      |  12 ++
 soc/nxp/mcx/mcxw/Kconfig.soc            |  22 ++++
 soc/nxp/mcx/mcxw/linker.ld              |  25 ++++
 soc/nxp/mcx/mcxw/mcxw71_platform_init.S |  59 +++++++++
 soc/nxp/mcx/mcxw/pinctrl_soc.h          |   7 +
 soc/nxp/mcx/mcxw/soc.c                  | 166 ++++++++++++++++++++++++
 soc/nxp/mcx/mcxw/soc.h                  |  13 ++
 soc/nxp/mcx/soc.yml                     |   3 +
 west.yml                                |   2 +-
 11 files changed, 333 insertions(+), 1 deletion(-)
 create mode 100644 soc/nxp/mcx/mcxw/CMakeLists.txt
 create mode 100644 soc/nxp/mcx/mcxw/Kconfig
 create mode 100644 soc/nxp/mcx/mcxw/Kconfig.defconfig
 create mode 100644 soc/nxp/mcx/mcxw/Kconfig.soc
 create mode 100644 soc/nxp/mcx/mcxw/linker.ld
 create mode 100644 soc/nxp/mcx/mcxw/mcxw71_platform_init.S
 create mode 100644 soc/nxp/mcx/mcxw/pinctrl_soc.h
 create mode 100644 soc/nxp/mcx/mcxw/soc.c
 create mode 100644 soc/nxp/mcx/mcxw/soc.h

diff --git a/soc/nxp/mcx/mcxw/CMakeLists.txt b/soc/nxp/mcx/mcxw/CMakeLists.txt
new file mode 100644
index 00000000000..47cef05f237
--- /dev/null
+++ b/soc/nxp/mcx/mcxw/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright 2023 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_sources(soc.c mcxw71_platform_init.S)
+
+zephyr_include_directories(.)
+
+set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld CACHE INTERNAL "")
diff --git a/soc/nxp/mcx/mcxw/Kconfig b/soc/nxp/mcx/mcxw/Kconfig
new file mode 100644
index 00000000000..39028b33226
--- /dev/null
+++ b/soc/nxp/mcx/mcxw/Kconfig
@@ -0,0 +1,16 @@
+# Copyright 2024 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_MCXW
+	select ARM
+	select CPU_CORTEX_M33
+	select CPU_CORTEX_M_HAS_DWT
+	select ARM_TRUSTZONE_M
+	select CPU_CORTEX_M_HAS_SYSTICK
+	select CPU_HAS_FPU
+	select CPU_HAS_ARM_SAU
+	select CPU_HAS_ARM_MPU
+	select ARMV8_M_DSP
+	select HAS_MCUX
+	select PLATFORM_SPECIFIC_INIT
+	select CLOCK_CONTROL
diff --git a/soc/nxp/mcx/mcxw/Kconfig.defconfig b/soc/nxp/mcx/mcxw/Kconfig.defconfig
new file mode 100644
index 00000000000..b57cb97a8ff
--- /dev/null
+++ b/soc/nxp/mcx/mcxw/Kconfig.defconfig
@@ -0,0 +1,12 @@
+# Copyright 2023-2024 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_SERIES_MCXW
+
+config NUM_IRQS
+	default 76
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default 96000000 if CORTEX_M_SYSTICK
+
+endif # SOC_SERIES_MCXW
diff --git a/soc/nxp/mcx/mcxw/Kconfig.soc b/soc/nxp/mcx/mcxw/Kconfig.soc
new file mode 100644
index 00000000000..f6b03d9b893
--- /dev/null
+++ b/soc/nxp/mcx/mcxw/Kconfig.soc
@@ -0,0 +1,22 @@
+# Copyright 2024 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_MCXW
+	bool
+	select SOC_FAMILY_NXP_MCX
+
+config SOC_SERIES
+	default "mcxw" if SOC_SERIES_MCXW
+
+config SOC_MCXW716C
+	bool
+	select SOC_SERIES_MCXW
+
+config SOC
+	default "mcxw716c" if SOC_MCXW716C
+
+config SOC_PART_NUMBER_MCXW716CMFTA
+	bool
+
+config SOC_PART_NUMBER
+	default "MCXW716CMFTA" if SOC_PART_NUMBER_MCXW716CMFTA
diff --git a/soc/nxp/mcx/mcxw/linker.ld b/soc/nxp/mcx/mcxw/linker.ld
new file mode 100644
index 00000000000..91fd2750e64
--- /dev/null
+++ b/soc/nxp/mcx/mcxw/linker.ld
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2023 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/devicetree.h>
+
+m_sector_size                       = 0x2000;
+m_flash_end                         = 0x000FFFFF;
+
+
+m_fsl_prodInfo_size                 = m_sector_size;
+m_fsl_prodInfo_start                = m_flash_end - m_fsl_prodInfo_size + 1;
+m_fsl_prodInfo_end                  = m_flash_end;
+PROD_DATA_BASE_ADDR                 = m_fsl_prodInfo_start;
+
+/*
+ * We perform all custom placement before including the generic linker file. This
+ * is done because calling this linker at the beginning will place some sections
+ * first, such as .noinit*, and this includes the rpmsg_sh_mem, which results
+ * in placing the rpmsg section in RAM instead of shared mem.
+ */
+
+#include <zephyr/arch/arm/cortex_m/scripts/linker.ld>
diff --git a/soc/nxp/mcx/mcxw/mcxw71_platform_init.S b/soc/nxp/mcx/mcxw/mcxw71_platform_init.S
new file mode 100644
index 00000000000..c161f7e8eb0
--- /dev/null
+++ b/soc/nxp/mcx/mcxw/mcxw71_platform_init.S
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2023 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief MCXW71 Platform-Specific Initialization
+ *
+ * MCXW71 SOC reset code that initializes RAM
+ * to prevent ECC causing faults, and calls SystemInit
+ */
+
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+
+_ASM_FILE_PROLOGUE
+#ifdef CONFIG_PLATFORM_SPECIFIC_INIT
+
+
+GTEXT(z_arm_platform_init)
+SECTION_SUBSEC_FUNC(TEXT,_reset_section,z_arm_platform_init)
+
+.z_arm_platform_init:
+    ldr r0, =0x14000000
+    ldr r1, =.ram_init_ctcm01
+    bics r1, #0x10000000
+    cmp r0, r1
+    bcc .ram_init_done
+.ram_init_ctcm01: /* Initialize ctcm01 */
+    ldr r0, =0x14000000
+    ldr r1, =0x14004000
+    ldr r2, =0
+    ldr r3, =0
+    ldr r4, =0
+    ldr r5, =0
+.loop01:
+    stmia r0!, {r2 - r5}
+    cmp r0, r1
+    bcc .loop01
+.ram_init_stcm012: /* Initialize stcm012 */
+    ldr r0, =0x30000000
+    ldr r1, =0x30010000
+.loop012:
+    stmia r0!, {r2 - r5}
+    cmp r0, r1
+    bcc .loop012
+.ram_init_stcm5:
+    ldr r0, =0x3001a000
+    ldr r1, =0x3001c000
+.loop5: /* Initialize stcm5 */
+    stmia r0!, {r2 - r5}
+    cmp r0, r1
+    bcc .loop5
+.ram_init_done:
+    b SystemInit
+
+#endif /* CONFIG_PLATFORM_SPECIFIC_INIT */
diff --git a/soc/nxp/mcx/mcxw/pinctrl_soc.h b/soc/nxp/mcx/mcxw/pinctrl_soc.h
new file mode 100644
index 00000000000..9a6c34358d0
--- /dev/null
+++ b/soc/nxp/mcx/mcxw/pinctrl_soc.h
@@ -0,0 +1,7 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/pinctrl/pinctrl_soc_kinetis_common.h>
diff --git a/soc/nxp/mcx/mcxw/soc.c b/soc/nxp/mcx/mcxw/soc.c
new file mode 100644
index 00000000000..f37424ad198
--- /dev/null
+++ b/soc/nxp/mcx/mcxw/soc.c
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2023 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/arch/cpu.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/linker/sections.h>
+
+#include <soc.h>
+
+#include <fsl_ccm32k.h>
+#include <fsl_common.h>
+#include <fsl_clock.h>
+
+extern uint32_t SystemCoreClock;
+
+static ALWAYS_INLINE void clock_init(void)
+{
+	/* Unlock Reference Clock Status Registers to allow writes */
+	CLOCK_UnlockFircControlStatusReg();
+	CLOCK_UnlockSircControlStatusReg();
+	CLOCK_UnlockRoscControlStatusReg();
+	CLOCK_UnlockSysOscControlStatusReg();
+
+	/*
+	 * Configuration for the 32 kHz Oscillator module
+	 * Internal capatitor bank is required in order to use the more stable OSC32K source
+	 */
+	ccm32k_osc_config_t ccm32k_osc_config = {
+		.coarseAdjustment = kCCM32K_OscCoarseAdjustmentRange0, /* ESR_Range0 */
+		.enableInternalCapBank = true,      /* Internal capacitance bank is enabled */
+		.xtalCap = kCCM32K_OscXtal8pFCap,   /* 8 pF */
+		.extalCap = kCCM32K_OscExtal8pFCap, /* 8 pF */
+	};
+	/* Enable OSC32K */
+	CCM32K_Set32kOscConfig(CCM32K, kCCM32K_Enable32kHzCrystalOsc, &ccm32k_osc_config);
+	/* Disable ROSC Monitor, because switching the source would generate an expected error */
+	CLOCK_SetRoscMonitorMode(kSCG_RoscMonitorDisable);
+	/* Select the Real Time Clock (RTC) source as OSC32K */
+	CCM32K_SelectClockSource(CCM32K, kCCM32K_ClockSourceSelectOsc32k);
+	/* Wait for RTC Oscillator to be Valid */
+	while (!CLOCK_IsRoscValid())
+		;
+	/* Re-enable monitor */
+	CLOCK_SetRoscMonitorMode(kSCG_RoscMonitorInt);
+	/* Disable the FRO32K to save power */
+	CCM32K_Enable32kFro(CCM32K, false);
+
+	/* Configuration to set FIRC to maximum frequency */
+	scg_firc_config_t scg_firc_config = {
+		.enableMode = kSCG_FircEnable, /* Fast IRC is enabled */
+		.range = kSCG_FircRange96M,    /* 96 Mhz FIRC clock selected */
+		.trimConfig = NULL,
+	};
+
+	scg_sys_clk_config_t sys_clk_safe_config_source = {
+		.divSlow = (uint32_t)kSCG_SysClkDivBy4,
+		.divCore = (uint32_t)kSCG_SysClkDivBy1,
+		.src = (uint32_t)kSCG_SysClkSrcSirc,
+	};
+
+	CLOCK_SetRunModeSysClkConfig(&sys_clk_safe_config_source);
+
+	scg_sys_clk_config_t cur_config;
+
+	do {
+		CLOCK_GetCurSysClkConfig(&cur_config);
+	} while (cur_config.src != sys_clk_safe_config_source.src);
+
+	(void)CLOCK_InitFirc(&scg_firc_config);
+
+	scg_sys_clk_config_t sys_clk_config = {
+		.divSlow = (uint32_t)kSCG_SysClkDivBy4, /* Slow Clock Divider: divided by 4 */
+		.divBus = (uint32_t)kSCG_SysClkDivBy1,  /* Bus Clock Divider: divided by 1 */
+		.divCore = (uint32_t)kSCG_SysClkDivBy1, /* Core Clock Divider: divided by 1 */
+		.src = (uint32_t)kSCG_SysClkSrcFirc,    /* Select Fast IRC as System Clock */
+	};
+	CLOCK_SetRunModeSysClkConfig(&sys_clk_config);
+
+	/* Wait for clock source switch to finish */
+	do {
+		CLOCK_GetCurSysClkConfig(&cur_config);
+	} while (cur_config.src != sys_clk_config.src);
+
+	SystemCoreClock = 96000000U;
+
+	/* OSC-RF / System Oscillator Configuration */
+	scg_sosc_config_t sosc_config = {
+		.freq = 32000U,
+		.monitorMode = kSCG_SysOscMonitorDisable,
+		.enableMode = kSCG_SoscEnable,
+	};
+
+	/* Init OSC-RF / SOSC */
+	(void)CLOCK_InitSysOsc(&sosc_config);
+	CLOCK_SetXtal0Freq(sosc_config.freq);
+
+	/* Slow internal reference clock (SIRC) configuration */
+	scg_sirc_config_t sirc_config = {
+		.enableMode = kSCG_SircDisableInSleep,
+	};
+
+	/* Init SIRC */
+	(void)CLOCK_InitSirc(&sirc_config);
+
+	/* Attach Clocks */
+	CLOCK_SetIpSrc(kCLOCK_Lpuart0, kCLOCK_IpSrcFro192M);
+	CLOCK_SetIpSrc(kCLOCK_Lpuart1, kCLOCK_IpSrcFro192M);
+	CLOCK_SetIpSrc(kCLOCK_Lpspi0, kCLOCK_IpSrcFro192M);
+	CLOCK_SetIpSrc(kCLOCK_Lpspi1, kCLOCK_IpSrcFro192M);
+	CLOCK_SetIpSrc(kCLOCK_Can0, kCLOCK_IpSrcFro192M);
+	CLOCK_SetIpSrc(kCLOCK_Tpm0, kCLOCK_IpSrcFro192M);
+	CLOCK_SetIpSrc(kCLOCK_Tpm1, kCLOCK_IpSrcFro192M);
+	CLOCK_SetIpSrc(kCLOCK_Lpi2c0, kCLOCK_IpSrcFro192M);
+	CLOCK_SetIpSrcDiv(kCLOCK_Lpi2c0, kSCG_SysClkDivBy16);
+	CLOCK_SetIpSrc(kCLOCK_Lpi2c1, kCLOCK_IpSrcFro192M);
+	CLOCK_SetIpSrcDiv(kCLOCK_Lpi2c1, kSCG_SysClkDivBy16);
+
+	/* Ungate clocks if the peripheral is enabled in devicetree */
+#if (DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(lpuart0), nxp_lpc_lpuart, okay))
+	CLOCK_EnableClock(kCLOCK_Lpuart0);
+#endif
+#if (DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(lpuart1), nxp_lpc_lpuart, okay))
+	CLOCK_EnableClock(kCLOCK_Lpuart1);
+#endif
+}
+
+static void vbat_init(void)
+{
+	VBAT_Type *base = (VBAT_Type *)DT_REG_ADDR(DT_NODELABEL(vbat));
+
+	/* Write 1 to Clear POR detect status bit.
+	 *
+	 * Clearing this bit is acknowledement
+	 * that software has recognized a power on reset.
+	 *
+	 * This avoids also niche issues with NVIC read/write
+	 * when searching for available interrupt lines.
+	 */
+	base->STATUSA |= VBAT_STATUSA_POR_DET_MASK;
+};
+
+static int nxp_mcxw71_init(void)
+{
+	unsigned int oldLevel; /* old interrupt lock level */
+
+	/* disable interrupts */
+	oldLevel = irq_lock();
+
+	/* Initialize system clock to 40 MHz */
+	clock_init();
+
+	/* Smart power switch initialization */
+	vbat_init();
+
+	/* restore interrupt state */
+	irq_unlock(oldLevel);
+
+	return 0;
+}
+
+SYS_INIT(nxp_mcxw71_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/mcx/mcxw/soc.h b/soc/nxp/mcx/mcxw/soc.h
new file mode 100644
index 00000000000..bd6650d57c8
--- /dev/null
+++ b/soc/nxp/mcx/mcxw/soc.h
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2023 NXP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef _SOC__H_
+#define _SOC__H_
+
+#include <fsl_port.h>
+
+#define PORT_MUX_GPIO kPORT_MuxAsGpio
+
+#endif /* _SOC__H_ */
diff --git a/soc/nxp/mcx/soc.yml b/soc/nxp/mcx/soc.yml
index 1f1087348b5..de7fee7da33 100644
--- a/soc/nxp/mcx/soc.yml
+++ b/soc/nxp/mcx/soc.yml
@@ -17,6 +17,9 @@ family:
   - name: mcxa
     socs:
     - name: mcxa156
+  - name: mcxw
+    socs:
+    - name: mcxw716c
 runners:
   run_once:
     '--erase':
diff --git a/west.yml b/west.yml
index b2240abbb96..0b7fdfece41 100644
--- a/west.yml
+++ b/west.yml
@@ -198,7 +198,7 @@ manifest:
       groups:
         - hal
     - name: hal_nxp
-      revision: 17aac63df44266c4ea0e111c731ca7664fe51e70
+      revision: f4e26fad2cfd8b8e8988e835a28667573ed072cf
       path: modules/hal/nxp
       groups:
         - hal

From ac4d00d3420c7e88e85f001da1261434e29c7bea Mon Sep 17 00:00:00 2001
From: Declan Snyder <declan.snyder@nxp.com>
Date: Thu, 8 Aug 2024 15:50:53 -0500
Subject: [PATCH 0689/2913] [nrf fromtree] boards: nxp: Add FRDM-MCXW71

Add FRDM-MCXW71 initial board.

Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
(cherry picked from commit 846601f260ccf376e3b81b9310fdd5e68c15c22e)
(cherry picked from commit d5b97267a1736588ff4d8464e9bec186f04dcf2c)
---
 boards/nxp/frdm_mcxw71/Kconfig.frdm_mcxw71    |   6 +
 boards/nxp/frdm_mcxw71/board.cmake            |   6 +
 boards/nxp/frdm_mcxw71/board.yml              |   5 +
 boards/nxp/frdm_mcxw71/doc/frdm_mcxw71.webp   | Bin 0 -> 95412 bytes
 boards/nxp/frdm_mcxw71/doc/index.rst          | 141 ++++++++++++++++++
 .../nxp/frdm_mcxw71/frdm_mcxw71-pinctrl.dtsi  |  16 ++
 boards/nxp/frdm_mcxw71/frdm_mcxw71.dts        |  62 ++++++++
 boards/nxp/frdm_mcxw71/frdm_mcxw71.yaml       |  15 ++
 boards/nxp/frdm_mcxw71/frdm_mcxw71_defconfig  |  13 ++
 9 files changed, 264 insertions(+)
 create mode 100644 boards/nxp/frdm_mcxw71/Kconfig.frdm_mcxw71
 create mode 100644 boards/nxp/frdm_mcxw71/board.cmake
 create mode 100644 boards/nxp/frdm_mcxw71/board.yml
 create mode 100644 boards/nxp/frdm_mcxw71/doc/frdm_mcxw71.webp
 create mode 100644 boards/nxp/frdm_mcxw71/doc/index.rst
 create mode 100644 boards/nxp/frdm_mcxw71/frdm_mcxw71-pinctrl.dtsi
 create mode 100644 boards/nxp/frdm_mcxw71/frdm_mcxw71.dts
 create mode 100644 boards/nxp/frdm_mcxw71/frdm_mcxw71.yaml
 create mode 100644 boards/nxp/frdm_mcxw71/frdm_mcxw71_defconfig

diff --git a/boards/nxp/frdm_mcxw71/Kconfig.frdm_mcxw71 b/boards/nxp/frdm_mcxw71/Kconfig.frdm_mcxw71
new file mode 100644
index 00000000000..1febea3fe4a
--- /dev/null
+++ b/boards/nxp/frdm_mcxw71/Kconfig.frdm_mcxw71
@@ -0,0 +1,6 @@
+# Copyright 2024 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_FRDM_MCXW71
+	select SOC_MCXW716C
+	select SOC_PART_NUMBER_MCXW716CMFTA
diff --git a/boards/nxp/frdm_mcxw71/board.cmake b/boards/nxp/frdm_mcxw71/board.cmake
new file mode 100644
index 00000000000..27c59c8d358
--- /dev/null
+++ b/boards/nxp/frdm_mcxw71/board.cmake
@@ -0,0 +1,6 @@
+# Copyright 2024 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(jlink "--device=mcxw716" "--reset-after-load")
+
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nxp/frdm_mcxw71/board.yml b/boards/nxp/frdm_mcxw71/board.yml
new file mode 100644
index 00000000000..2a40433c84b
--- /dev/null
+++ b/boards/nxp/frdm_mcxw71/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: frdm_mcxw71
+  vendor: nxp
+  socs:
+    - name: mcxw716c
diff --git a/boards/nxp/frdm_mcxw71/doc/frdm_mcxw71.webp b/boards/nxp/frdm_mcxw71/doc/frdm_mcxw71.webp
new file mode 100644
index 0000000000000000000000000000000000000000..25c7ca3feb5f280564f684eef66e02e335590af5
GIT binary patch
literal 95412
zcmdqI1&k%Tk~Ub()y2$=-Nnqz%uHR(%*@Qp%*@rr%*@Qp%(Z>r%<8?7=GX1JT4|+C
zDUZXEk+zTRw8If!$cqUJS2zFys0i`PD$BB}LID5(;QzkAzyZ8L0K^0YWMP1QX90j<
zEDS8|f#3lEEUg^u<VE=LRn^q-!Pfx*0Wbi70Vn|2^bG86_+(`z|C0XSugAsT(!Z~{
z?|+r`zsvj|xllh1?G1iEegA!H8`#)60001L{-&Xw9c=!hO@7nJ`sV+lJ^rHYemC$p
zKjtsm_`m3af64q8-SRIPMR|eWGULB#UgQ6u_5XwZ?|OfW000}%|CRi|dpQ`o{BA!0
zfG|G*z+Zj(U#0)Mul~&gM*ZCchTmgR@Nb@V9smIA!*71fzj^wp007N_008K#|K<_r
z006)R001;i893TG{Z}0Tn7`98z!6{r&^QQl=tp=S6gezLf*Xn$dUTFBVNf||tqXG-
zH_*`9G>;0?F3-8X6WXt@-?IeY%?=QN_7*G?kP-mG2ZXy(y-0?Pgy=g_a>+;zYN)Bz
z<?yH`C5E#X!W7t)>v^l;c1-2fbvFYoz~|mp{H)PdG}EVpwryt;j&cX=W?fgis^QnU
z_o$b&`{2ve?bn6(px3G!_>1@ASMuk}r~Sv((^MMVMA!Ds+*0;y*OFWM`>$)BGw*Ki
z%#Y+(;E(7J>pO0`Pv;M~54c;N_%8ges4vzpp^v#+nS;5DFSD+rXJs4jbDl@<j7Nya
z;B)V%uKus8$M@H*_pL)ur%$r?ug|MnZvdUyua2*?FM=zU4;d&p)kmNY|I@8cl`reZ
zuiGyVu31lwuf7lCcet3X6Q1?2i?66Jl{fR7udlD&p`+iw;X5J`&ghqP>jo`Dwo!XH
zgB<@q$$p;?<><2Y_ToYoU=Ff`S;c5zFfp2*$W8y_?36iTG`x4^Y$*cgiJCj62(jKC
zJlr3@{U231R<C%U&7bo@mVR+GhC|LkMDgLZ8Li$l?wJoRMOI^JGq+p1{7H6kY(*kf
zpK!gM30gv=vj@wp(BAoJ<4|A_ANQaB#g&U?xzv(0Boay^2b@8zI&oU2CORI4Pngp%
z);Z>X)T+OPHE6iXq7f`D>)bhnWcE&<Mb*AC(g#4-Ua+T(=za`qSJ(f;&i~zg$(C-d
z>CkY#P62`;D`FcgLir7^&F|TqddUT`;nuDg{m{Hr<KI9Q<D=h4hE*npiF$7sQLCCa
z*2)^(0vAJP;rx03@w{$+nynu1NPk>I|Mg|wn4=u5;z<x<)f&-UR;^`b4G8a(l7g&x
zJgbps!C$5O-2B<LO&!mU>FWWqW>Ym$yh`bWgAU>xDe2J&iYdu5>{z{gErb`Q?}1^6
z8Rw`bf$V+r)IwvUz1`8{?)L<G3B8W?w^=23CL_iuu!3d}N(BYn1%!CbW*t5ISVF60
z$gNu;YB`Bcz3&)h7?)BxucGZ@uJ97sUla)g9k*DMCKZslSvo&NslFa#j`L%G+$%*d
zg3D2WRwRRKyWTsJ;6kgf{<B#)Du<jv15h&6vPiGWWk--DYNxe{nOam^;YGAkCFLN$
z+#9k#U*Wbtn|d`LZ~(j|WuU4^vWZ@lIFs-lx?%JU1bK}+lG^7p5W+uU8;cK9cNDB@
zUM210rI)l$bqwg1B7jpL@c56vQq%*=WF+$ETK}L?vgZ=+E<g9QELU2~M@y0d5VBLd
zIXxl~@s{a%BM9sXqO+JivoEQ`KveZ|x?K<AEf1yD?%Vm7UQc~yEIA$>$LKqchs4?j
zs4p5qsinK9EmXUR%cx5Sszwh1&0BE|dO1AkV%>i*Y>GQW!RHP2D%hry``>{t8SFNL
zYH`Kq(WN!s=B8Tt9+=_s2GWxsF0%E@fzK~ardvZC?Bc8p&t^o8^P;|coyuM6ediS^
zii>HM`r$`s=~L4UG3WX=qFYoKz(JtYSFCh7>2!pPiV92%_-n!OEbEpInyf5rwk(h@
zpF1Pa$I%O0rb`W3cO_f(&zG#JpB^kQx{8MjN6EN`^6VQmGnn&Uvc%|GRa2|P@%R^P
zY#V-is6m9idoX^+LXWxr+K3eJ1E>8GzX%Fu7VakHTxMGt6y?1t)kWbxSuJp>HRMnl
zVq=(|cB)0fqE&CaYSr<8XkUqKHhq{@$E`^3>wZ``R%O`amUc-P>jtK$jki!I?(tc$
zKWJ3-e))~4zLT^4`Ib~kw9{gMB;~%y?pH(JLnxX<u+5!i70+d6FN9&Ocjsqgz878p
zgWw#=vs<X3SA}5F9L%&nsp~PRXS~#CHkRCowT(7Qz;Fr&A%4r3=_Ze-iPJjYDPUT_
zR+&=3^lW`9@C5rk(^yk+LN(ncSCfyWpg>7lag?ZXo!7u>JG#BY_2XG}%3@@2Wl5VO
zxcaS}8p=JxM9tc^BdB)2y}iod#cSgEIHNJEA_N+3{EeV{M!q_!yCy^C54RMZZ(TH%
za`gx^NI4~@#@~Fbcx|u8qj}F|h^X%Sn_m{MJR-ESD(jou;{%2r5HWgBktyNpA46<k
z&-ta@VXY&E4c^Wfegxle_>Z>Lp)wg*`=Fq5opDVoK&TgPbWaRHKep^phgQ`d8RVph
zXS!IS`k))^5a0?bYIinRz3r8q3(iG^f+bg+?^;fpfosScSC)!Cw7&*bRcw|yPFzrH
z%f2kf)vxpU6ZO%N8$*^<C<h#9!S28-;Mq-<m)qtiL5U+1kcxy`325z0a>Bjzkmdj3
zc3K^b4xSy(0{{e7#!aktg@ci1RorMXtASQm;1PPEGee#>6PC|FI0IB>(yke19AFFb
zd{5%9E?H<k&`uiu^&ZH0bq_-q86F&i_+)Ix;R+A_&6x%%H4U=L%sV*f&I4e#*n(lm
z6nI+A>D>^Ibf?`IpS1eY*Ao^3zI7>*W?ed%n8_LxLGB}pG==Se2qHP;$KLz$;YR8}
z5qy}i3xm4%y`-ws(S$74bv=lTRb09IYBFh06;G}eF{lDR%6&{BHNv_&MzyP$GZffR
z0jX?yBlbCuQE&Xvr#9HbLcOk!+n;DB^}gmP3(&7Mv0Y7^{*#*`zFkfB)J&_09EKZW
zjO!GZBmma1*pk%z!$UBM(;p^#WXeocimc!lXQmTj5F0!nYgtnHB}ee03}2x4_4Pes
zL3|dYoiwyzdA{tHdn9V(3-rqGh(TBy!lImC`{+4i?`S`lw5`mA8&LPs-@nhZfB5wj
z&^cPyj)@_di(wEvB(Eo`;2$8!X3(Cl1wGu=gAVT_UsxGJ5kw7)^rTs*v-OS5%G;=x
z?VC+Y5I*8<Q6Hgi*Rxy-dcfq?Ka`BWB;U~->Wp`#deeUzzK{Ly+0Nw2qQsDMfyfMG
zL42I~kInp{nl!_X(}y*1>)oBKRKLLrcIOS+du+=@xTWkp8!pqI!L)e5Y}}$?no!Q>
zoe?mtHTfaMp%sVq5seYdn7OE73o!h35M`}!kM>YYWW^>(Y_58EPM&3n#t$yGnUp4R
z`n1ti-45w!Pyzii{A7rB8V`#}sNyI*;rST9)(3ev71-zMof41tFtINDXlz$B4CqKr
zVKT=!Bt(LVi^V_gdPA8b<5Fz`5VwZ)VEeMwdF6*0u^Y#>W`+>1!(umr!ifp$;<RRl
zv1JY*!2duU)q2QmIly4;?zF>=C1$svf?1M==(9K|Glw0O7PNo-3BVW5@onT305&Q)
z^Pw|XS|v@5Al8oSB^r7Oz+=4XBZan4@DgW*&eUoWPAPgyYHiv~9WCz>dz#k%aL`70
zS1!&z(Z9va#?vkV%%}p9^INo7cY&LgvbJhZuQ~W)I3J#-=}UJ8Qq>CIO^j>vd@%8c
z2NTKi?TY0v684($<}K}yHjJ;7{ZjT8YTa(89#4vpcx*AF6*PjzC7-$ZJBPgEne--Y
z%D!O;<Tm%#FN?XQ%QbK|@5%rgqjFOW{qNUMwgIKX%6LrX%?W)eElSc<x}@cU;<MCS
zr^7D&!2h90|8FXMvy2g+`r*O4p45iXVL52tB#K-f(O4p5;mNFW>mGO{T7u<z{hKhZ
z1J5FE&Y%nk8;d?OG)g*#rilVL+~p#t7i*}uxoIOLcWgm-5U7pOz5|uvO*4!7PQ^lg
z1WOmQ{V}j@;gYkKZ-<N_y+>EjBufo;dN^u()PypEpAN_Shpcs;Ts8e^v`iTtj|~aR
zSd?}YH;j*Od%UvPkRk4S!{i;{j>Z6ASgSZn??zAech|Pn5-T#P?y0wpXhtms(b0->
z$}MWv1abB~1Drj!$=+Ig$*Guw!2G9IO<Xn#rLXvEyXm4c2sz>BKTu}}IhkpXuAt=D
zX*f>Z(G#FVzf%mJr7Bi2&dmkY-56~;n#R;LDCX-D69g3MtFMSSPWO?UxiIa^^!iK+
z_@w;eVmxk}xr8D^xURTgO?>$A{tXprsz}5D%~*I;WQ{x_FgnfWVo03b><(gT9uE^(
zZI7A*E5dUN_E|M4!Q{+KQ4V&lJfX3!cRXaYn!pHr<U-6*$x%FV??faz*%ZkzShe;v
zI16XT=dfELSp{kk@X4$<e!!C74!dy0xm|weo^ACubEL>pkvZd=fFdBOOf6sm*qexY
zakgSLcM0AAx*IfOSE5M=;f$UV(jT0hoX;tHOHLG7BBv3)kA&QI^{>i(Sby^YEL-`A
z7JM`*aU>HDj4G~1Im2GRM`ugTbX6nz^_fu$_5zYB&se>6Qp&e5Qxmf{NRR#;q<`M#
z-oz&A0M2C1`pwmv!$T4hDe$s6R!&?S!^_3Y3eb}V)vC8hYl2-VlFLI|5sgzcTSuf)
zv)Ax`x4$*(ohsoM>KpXlDZkyfRaRZW_e7-$_hla{%I#gp7c4)f=PVz^wAN$)YMhx{
ztRQUh^@|)}J_-Y-5^Ycj@cAXLT3i5@192wtR$*oPRs$btcSyGTMMdnRCawha*9<HB
zPl@Z2m(4#oORjJLiMg*J>^d+lUTB6!fvPOZmO&}(w4s7WMBC)vfJAtTtE`%eV=<<9
z001@25N!9Z5%vbB=`JF&{`jTDP?)oDPM{sj0c$u%a(NAsJEv0mDGT%(Kg&MqXNi#X
zv(^8oO6>96#XHGeY1-z4slm~cVFkBQX-pJCuyMLibTCG9Y|ZZ?`WZFcRa%J3njQaz
z_6<gBSbl@*;)`Ae1LM~-XtDE*zQr}oHg;5XeACULqL9-DL-o(G5336hw|grk9?7@O
z&zlm6&R6G7_%y1W?+kx`fUcKpQ&eN?B0=4!uX$dGZ&qU_|2hvQ$oayakhu9p<JUb`
zzlYki;=f{1?zeOdrd=d{jbvXtHqsiYr45&uanKyU@mXS~w9lM!Ee|$GMpgjJjjS1S
zjuk%<!~U~F@em(`RDhyejL^;x_|T;vCxGfkTr)m{zgWn%wYZhXIr`vc!bf4#@eX+*
zLWBGbE=J`?N)=lHxz&RP#+3xo4Y?uU<Zz)Lu&!R@>j12bTJgm=5qfYjEsh`uDi_@?
zhJy&wkn>MGqrJ+r6obr-98n&jE&lKMWkaewEq1Kxs&7S>e``sgH!P?aHW!Hp(frOO
zq-(e#T$0T*zjDRG-4e=m+criEj7T%`>DZ+Bwi}kHf4qj7yOEPJP*}>#$*)+qHoxh7
zh@t4-TN@~tv<(l!1q{&6j5(~5Z&OEMPA-ORv}}(4-h|zMqWX-cAnh?GM@JwUlUU<m
zp;-5YN;)3o7q$^yho&2u!Z))D{7QP*v9){Qe<!Re`XE)fp}vL9>7(}OnrKX}l{~^<
z6jc`Df|??v-ae{H=m~RxThTP_K0R1dp~r!3Am#GPh6x<otK9+!22jA|gKutKx|{t6
zwkvwD<Wg7jwfSPSokF_^r;}yEYW*^C)P4Al3E$~*lft&ctUYO)nnIHRy_6nJ3=~2C
zV>U^z2afTKm9r>9Ws}>{m-=9KWblef!eZ>6t1-hP2WTcv){rJ|Lp&9S%R9JvB)$q;
z3To?y+$F>PCuT>>X|$Cml(fxYZoD-TZAqS<7d8haS55;UPoac{xbBXIwwdF#hLg6|
z*xPxyOdaU*!c%F$n{?y+flFt6dQR4_?*_ReQK#(3<I2`sgzH^@VlL38Fp=$W&V7HJ
z9T}Wt@;Ku1zpy_acVuH(3eP2$K%i0eIG@9LizFlh^R6e*Ll2VS8jPh?G;mOe_00~#
zSTgJfH+uQ(#j1*l0yz|<)yj@(R(9e@i*qcqW2s(wAUU%%qMI(^Ulm2WY0WRpus0L7
z{UW|{pp_+C{I<Y}##op>G+nK=TkmUG2MsQgm&{I8uc*gGaXu{+V_jA&ZGbr@Y729T
z5QDak^g-c^rJ(xi%8yVTH<3GSe;^gIq(<CMSvd`8;SEN!A4fSY&rrhLQo#N9MiTAq
zGWjvj)ze_rbJ%bT^~Go-4E-2rw#&d1mz1-+)L1(oIk3<j_6+K1mOi#|`AG?Il?@)G
zE<T+L8qV`V*H4cKI6o{4y6WyIEjO^1J_a;F?I^hEZH~!p@B2}XJyHJm0C&`1^bniY
z4Fpl4S#_%@nh1SvGJWeCBhDF^+`p0leQO65W)u-@(MO2b<aTGZa!|XFXO@#+{re$l
z#QFt!pxW;x=(c~H@7K=J^{?O5SB8HaIY+#WB}4K#U6@>{lA@!l^_+G>?X+hDPXo;w
zqZ)zZq|UiXcN|Aa_VXjb1-Y!bY85s7fgzLrtlYqa4f?c;qyI>}-oOpFqNXEC{rc{w
z<<H1o3_#sSAIf5qlAoRCWN6%CMPvl-SP_`2e8)Gc)NYES&+cYA-%*&X-pwQn9$sOY
z*izRAAH<2(82l8&3M+-gz@Oka7?u@TLsJ2bIL}@KMBOrCtb&-VRPoL@46x*pMT=AK
z>GRa}NPHzCUa+$4;IvM--6`CFJ<0s~jTZr7=Cml;eb#!amZ>!!w+L8qy)l>W(oG)8
z*Fhz2ObPR&x0Pm7q{oDPl#P9RJ6*BYT_WHK9~BWhLSOXCgT#`)MW*^#3g7NwUarpi
znVXl3^gex!UYmTM|6T(@5)D;ISrHt;%k?+L-e1=^^CWFrK$l<v3u~S6kO>i!-<6IV
zoNo1zu@kr*Y1(~!uvIidjZSnKbBSsg=t@cFYT|)9@{3ROri{gFJouNgqm7-S=9+<J
z5ppYFJ)GvDoCg-+9vArDg!l4r=N*w~mKktMzo^Vf21}M6T3qsaSst6L^ce?@<&Bf6
zC>z<$4$~Sz+v*<R%zX;bH5D}rZm!;sexRUlK7tSaTE~S}I|e`-)Y4E_OyoYHS;@FP
zNap?V&H3s5r5@>ZQ4pZh`m5M+(4It>#CZw#2nIFiKy2`bYBcXiPwg-UjA0ZN!(oPJ
z5JNoO&Cq*yB-hVoZ$F01Q=K#6p#H-@F!Wnr73w7J@KS^LNvs^)B+u%|te_N<Vb~ik
zPS|grz@6Qlgj4fBuJPD@q6WU#_NDVDc7>$L(~{N^AYn%En~()(VaiO`tFK3&xy0I*
zr$W4zEGG-zKU#FR9!&EVy`9ZQgL1hq!#DZW0BFF526v<=#0dtZ(_Gx60>h6QalX2O
zLQ~Ztvx}dtO>Tu9_?X?7KmiI5M6x%*pi1f99z^8c^edo;J-9JW-Pk?9u7>PWOWy5t
z8B^g*MZ*#B<D228%ZAeG_hL57!e*88Sa68vdfIMsG`xz5re2HCL81ciV(@H3N{E7!
zrZdZF{Zs;M$UCijT||lWC3V3219O@AWds+}i`F4;Fdcd(T{ed!bV}nYGH!kbAo1%@
z%%HiYhHwG8e)}n+{?Q4~iOGvFhmt!y)Z~a3eUuc*2oGcc!8Q<E%eCbbO<DPU#8{_s
z<ZmM=Krn{K0zJt(xu>ShfVpb{0R$KpASv9z@lgD9gQO;J#lj>u>wssq<z_2vJT~_~
ze#!u5$H*EQ0}qlUfK@?=+abQjb1nBp5m_?+a-Hk%f1#Bz6xh`+K-qfY=%ea{F<`O2
z4Xj``*hd;_#+H5uw33Ld(>!;9@%QCm1K(tcXpfeQO8;W!NB#hoGXlLoeqkKLKr&pW
z$(Q^r-ea3RcZ`?boo{PCB7J!=J$-~1=yK9OF@C=2p%H!~LJ?Ppm`wS52Zph%B-p7u
z^R*|y@oua7IutNj{yB;7{gIpOa_<ga*z~(&nD%oD>O_Y&EmU^1ehwRuG`75qkUL==
zBM{<myX-C1F@mIL*1ciRGy+(b&gTKJbMZL~wjvV^fGnor!q!#0J~}Z-IO?IyXciP^
z$rV^jD-889LarSQ(c*?nSuIk*wcpOP_7o!Ntk-GrFyqeoo;?AxMaj~zWW8mk%aMPj
z&gV+f*Ebr5qTtYGyTbNJ#0sb^v0y4q-}#2qS^FPv2Th{3o072&go2Spa}QGla_r8N
z`8?yC6w0~>!r?kITkLmA^{K2j*TyNnY*+yd6n&6rWS8{t!=~&&xcFh27O-D=X>@Hn
zkOT982c#^6!Xb{we{cV@cof7$77jSY<#}cr|A?NzQ^gg&Rt@a4xAb_;H+=}W5|@9b
z)`mJ7^drYE4-L2UEP?cW2jtICFqom_p+-;XSnj6s=ADcNDl3lRdy|bFh;_;8R?auq
zdcY`!8mi%*^I;`x!juIyks>EYY?anbE>6l|deDNYS(4vfm@tFQnPOZrsG{gG1D*<9
zKv|J*QfyQ`62a8eu?#xx;gGNHRA@NVmXl8rjX+6#?$0aFUHLJg=zeSblO$M!rDa-5
zo*9apEr(1dH7dD?neSIYG!!4`yrtMVjVsw5k8NmJP#e1TIkj&|>jE79q{kCAMfj8~
zbXsoTMLR13t1vo5=zLEEx&ZN?xG8ZNf}m;;r2`dRgow{8%w$(f2;ON<8->`ReB=m9
z*Gi^^nnvzSjFhX)h-$|vo}4>2ofwRibou(BAY?6>3~bl^Id7)Vhy}l`b<|jeD}{bb
z@g;q?nh#qOf2kzEX3qC>0(TNZTxY7`e;O^O;E!B}O8+@Zqr;SoWHOAbLAmwAk;dkF
zD$RO}TPf-XJ4K<yHaANlzSg(oW_dD?=(2`_#cd$c(qvZRkWkN*GIqflZUe8GFpvWe
z|2DCyizR2PUl%bkPRoNVIf1eMh;<g@p1KTP>H?=K5*IM+CSAaOfc%i;fvX^$?Ghav
zOmF6Yp!TvagbJTXnuQRh$qeBTqJ6X|oPYA&Bp#H9?<zE~S<weBNl;ee;08!o69O*w
zE;h#n2f423va#tyJ8EetcGi{DA1(LZEvxB<t!z5gIq0-c!MX8m7FG%}{J06r;o2rI
z2i7T%A=h_|u8|rVIec%V>eP=xxir&H8&qz{Z~pK}m-qM0*7z14bIN8O)=-I)bc*u?
z6{48wGXPc&|7?3BoK`jGmYFFIyV;7{Is_)`=HI^$1<(KSP{#Cyw!@lG;=ZbOB+8Kx
zQY_t+U$Bf5o`fWhG=Rc#2m=%s0uJ@1E^C?`8u>93rm``jwE^wT<m=H8v(Wn$o&!pp
z^9PPm)a)LG_*(5D*L)FeEsH|O<H9-<!9xulOEd!jPc0V4_P4WIbo}<w<~(4dZ~h&$
zgdzx_^^s)bQQdl2ENs1MihNx7$N(N<=M^v(uBvIM^YEpatnWUd)Jj*Wv$WiNS(+{S
z9{6jUH&q%_l5=8j0>D{EoQZgFw6QS-xm7Y7W{MXfiT$=)Pdoz(9&Lp6Z%%I@;-U%n
z*SL&x>s}i6GF=djDwx^wv%bszR?`J{%*bn#;+)zBpLC8P#B_IeR>NVdPmc0>gT+u6
zz_DchnhJeWv_~nF8x`HoW&wz+fm{2jZ)m;rpHur-cJxdx+<&4ZwPUPb<6bR%YnAi&
zN&x~Tacfe@xD>7B(@A-W6>kl`$q92{CyJiL?7h-oZ`Y0(F>Yyr%dIvn-k&w60d}En
zcjY1f$<PtqqUR~`RB6ua2q?8Etr?<aheVIg*0T_sIi%3l&v(cxOP5vu?Lz5FJNfK>
zyc}9b$1Uw{klM!>2SP$S)mSlds{2<-wRDab69u&T+9r*VY<nl3n~X{54BY3vhn;W7
z8HPDix)IbikISyxEC9uz^GyzCNl}W$P+-TcKrn|ik=1gBIT@`8pkE0Og@IX;Myh`T
z3u9Vd3;8e1nD?cNy>;?wSvV)Q6J{s!$UiW~n(t4Q)%rP><JeThNRAsSfng}b_h>eS
zwMFg4W>nt0ZLT-O!Q;%z1o-$>QWDX7I7VPfc+&q!>t2mH8I*B5P7Ex<hQYX+DA5po
z9T5p}1aAl9SOKF$B5|YSp=|Ih!fx}$Dg|Z~9DQSGZ^Bn~^)D+V-=m!wyyd4#HIy}t
z3!`dX2Vm<jcg^+#9iK9bguDYIedXpbI7cMa+wf#M0I~KBKgi6sR$uSrrVHk_dKYzm
zYqFeQ9wRnVPR%~Wim!G?tiz=Pxc?h4gbx2hS)poejFNp|t1rCAXInD;pigP;aos%C
zI`WG9#>-fv-NDv&o5LFVTEDk|!QK@uB6|+V=AClD<^;7f-WQ|xKyr;%Z#=+`r`E6j
zbjQ5jh#{3OzAgS7*ZR!2w>U#r8(FC~|6jSG)CSTH5jV#7&n<O!1(e`w@F>7Ih()bg
z0Yzh7<ocOP?Ho~N`xNQ*-xY05%4?WF9;ofqGZzHV{gYm_O|mP1s5l)IIIE!;`fxBW
zvGuHSo_nE`)k|^kK%PzORgV$suMGac&1CUZ&6t_#8t;=xFV+lIIC&DG1<nqv<@=&^
z5UHg9+;yWq9%e9Kq2}G@05+s?(<MRK3QP)21ks}hYN3}W$;ra~?R2ebrbM?yfJmWm
z>IOIsv9z6r!xBu_PL>%?Y&u5lL_YQ-%BObhv7uXlIvdI6Ko2@2GM9B<4n%DZb_Tkd
z&E_?MmCrEvyGS}Y?jCCSrj0q=e0XZ!V-M4CfC^TJvn(}8gMIl7&Xl66oC*9q1GilC
z9J!+>bOU%Y?{b4))O_>vAGms<#ZC+xAF+8pmtkU~@DFK<7Irr3tTbG}=K}(`-qfvL
zY2SqhHe;TqVOc6_vDo20tXgS>K`TY9GFxR@e9>(qF^!hoTv4e*BhAn<=C8K`psbx#
zAa(nk_$n5%#BzxJ%*9%czPcFky4RkX^S)OX=1B+PLg>^*g&<5XT5)=Vy(QQg^rvC-
z!id`^<?=f%2!&6Ofbfkfi&v_#$sjK$|4eU0JKiC)u(yf68^kR2Wo_Y<iJVxLLAd$4
z5UnO&dx|a=+>{eH)sS5KJKW5#4<3n#`;uB#ATK{o6z5KLEj^F3>Kxjxl_U}&aZXbw
z=hk8P89~u01YhV5iVlU@{t1TxGps<C^7ChG2tvY<LT>Xq5@K|(1zl+#&1*){C!e^6
z`;d>-4dtuydJ{Ctm`3sBY1ePyh#;h_yJG19gwqp5H5kvljke40fp-YH?d>Y<0fm#)
z*`-}0JmY#s^ak-KM=3)3?cGvPjgX3_wEbO&!mrtF5bMVNba0o<5$#k`5#UcwAT0=7
zmC1|J37v3<hYy|`Q6!YP1M6sagWp&$1NJpjL-j?Mwp!iDn2NNm^PWZj!1Bl36bsLx
z*@EW#ZZXWWH^>_|l(Ys`*mtc>7M}}u2W?i|IQ>j6N2=Cjl)6`C%TxC~sPnG#;N@P8
zghxdLn<;km^XN{A=vwElE41epqUmKo{psEFP`po-!>G>PD~tIu0Qr!eeBaLxJ4M7R
zvQ+GruS4t`t)r_{jNrVdiS5c*o@~2b>g)y#5+EBvoqhDgHLA8t+WS+NkJ&7Rb41wd
zM4<$z2yW3D`OX}xyzfrz0R|wG>chZ<&dbi8K>AjCqe|Xg+Y9&lt-16E&0gg)vk$}j
z@@J&)x~nV~Q9sq6AfSG&kk7yez+U{yI>0*%lhY_LkSQQ%A8l$pZL@T8w~j`(Ckr7d
znnBVksW2MEu`NXs$WQPlwY(9+RR_8W3HzaHyaz?*oFN#mv{yWv=n2fU-_a0)`9-5q
zIqWnq=d>F%g>M3tBL*(68=w<+4tw1K#~8RwSMZg8_$K5g!n8nr@}ef+;TS9d3^ZOJ
zXpd@yi-F}MN#lMgl9#|vJBg7E@qYEuGRBgy%yEe2@5e)x3Og|<LLVn$rR-NzvhE>}
z{T((!T<Y^rw(q6U^7g!++9REXW+*bdVMJW=MIuF-QTD^Q@_DfFf?z{l0c#PjhN#9S
z3rq~q=6PXe`H~yk@+>>HKzO2>7cTfsG7x#sYPhoZIUjZcPEMT=ba&afa2NvyCUeGN
z#g}X8kCqG(Oz_3LB*vw*of(&YQlpYJ!M*y2{kcw1)yM)0!J9P?g2kOYo`{N_lFj#=
zy7J`%a2XC!lP#3M`*Ukv5~<KEkD(IxTE-p<9-09I*RHb+RA%d)B^1F~yxb)Hy{S5J
z^}7Z6+TX}Xvg7{<k=EocRakP>o!pFVp`jPZo~i&Ja%1aIl1{~Z<i&jQp*`KP!$|ro
zRi2@E3p4BJrVxFo{cOlIlxfhaL(SO&8~dZAtrik<)XstcE=jaxOe_B$`Bt~Sakh2h
z@@3vYFCJ28df$*D5TeS-2;dW*Ae5gjDNZ0Z5y7;_#Bw*`nBQdWJN>I&_YP(dMRnxs
zY<(B?t_+y%CvqN~haK15u!@9*=4<=lvFlGlk%76O79w+I5Ik575Rom;Av`qYE%ZNv
z0W3x0+h&C@At46^W;jfM09)!I2Uw#YA!JR_SkzO6AJ0W{Se<tR#my5HvU}&K3Ry<f
zhQkdTq7b@}RB_v!mg2<E=feosK#!QFB+@6r2As$99}TLJOC26KUlGDa%o!%|pm?v;
z$k*8v#MIaew5i93mQ=a1pSy_WD{ygzfKDQ_j#1_1auIf&1~)4f0Vc`&`P|D_X6Dgq
zdsp5|YU7d6=*NG8mwkktIp^uVnPB7Jg#3w{+Y+Wd@Q48T3qO^alvEoaU1ek~7(JfK
zyk}F{uoB;2BpHLkv%I*30}Hh|t3k;P!QSd8Rnw^t&&!ATL(d4Z>GiY_@cu60ATskr
zmUo-(qkC$C0&drF5412l77JKDw`lxE_Bt+zJBO?^B*WAT{%oR0LL8UZCxuUKC^3M)
z|1h3{Q|_kwuVQmpZLPJ7v2+S=^;P;;>s$!D;&zZIT;jp&W}p@EMN%TGZ+Eg;=lg4>
z7k}V&`WMDC>dlD&Te}ydf86{5;9hU;vCGGtR%$CIOPSD=<6Fk81P(_(8&gduj0Hr4
zo7${--VFM{IQ)t(J11fPdiOD)SDVIU3{=P^Hc)>DLeLU0z?QkIza$&BlxB~f$Ic2L
zEUWFC&@t0@5XI*Z0wq`1r%LuvCu`GImi?6JZ*9@Bk$!A$fpL5&hq@t5SMQ~Ch1tGg
z4InUsyuPNqF5G3;SvQLO>XND_K+)&oi$G#tL=;%EcI3hnIi&}E*Wm_Lw!+#=r>Mez
zjtZ@}=;0>Af_$equ_|jLNybGL>fMIO$xL$;DKJxe1q|+Qjfg9A<%4Wo%-1aI`L&q#
zYiVJQZ{D+REHK_R-i{j)m0yaOgy+&4EYvHQ`Nu_33J2yf|Auo)jHLhC4_3a{quR6r
zw?le>eNANh=;j)^CtWnGJJ26b62YN684>{I@pwzRIb_+(A$g2=a1+Z>TPmdrgDgc+
z@1I^wKOj8ghSp**l*Z{;L!Z~QIR~6u@Zd5XFJpYjtAjKK#x@wQP=5Y7649=W<83l9
zYE0lq^j$PQ_Pez9N4g>k!GP*EYipw0OWFMGFOd4EAHkIbif|g&Dk{^`@V%0hokyTR
zS+ql;%cH!GnR(&L-|kb4$Ej8wuzC90a@8MAN4hO)Yy5^PiILY>n|<;pHRW&B8aFRz
zL|7jDIxa>@o-;hon`e_xrVOV(VpCllS4Mf`*p4)YgoS%5OsC-Yp_v(a`@ScY{4nxD
zNe;cKe$QIft;RER!qXsnA^In{;|FMcc_uhs%hJGOBkhF(WqxVAJ%Hrb2r?AIl#JRg
zJ+qBZNuVr4GxcReBDAsaoNBp94UGeWrw~L!%E#TKVtM4WP)aNzTbR4`vO*{>oEU-I
zZaroC85)wDQP|!PWx7zMw)D5;XJQ1Af?XTcOdk$jOj$o4E%a3I!H{fQif0;t{rk@V
zr#%<S^MuY7uXj0pK1iV+13pKQ49GsH5rTh$%ARtoPSvRIZ;wE5wK}8*1@^sL89YPR
zD_}E>r_`0G<t8wwmkPZ|1MJ%e+m#<-SN#O)3Ym?6zGBgG5xEU11clijB}z<-m)0_+
zrp^GDBYWivuG-MfyykT^`6w**A(0v_mni8(otYqXi_1fxLc^WZVW{6=ceSb5e4sXk
zS)~JdM`fP$F`()F2$jm8xKaK`SZgB&`*YNAsgV9u`G81HJKk=JcGY!Us<J^608?z!
zT-wPFhplRR9jyBG28f1P!eDGZ$6=!blYx%2>DVnUr6h0jC`|w&*t3$G?6~2#CkTbT
zOKfDXGd1!qwr6C^pXWkcEy$>vsA)Pux|#%_aA*S**HxL2e6$O*=ly(PSVBPeon1zC
zX8;jyq>n5N9KzoNpFR9m{{W=(Z`ghPw&&8LgwHBVbCP<z5biC1Ux`tsbs3xpcyJ=h
zRO2)|DTm8KyD0Dwv$ib=HWR+6uz&imw6PY)@^8lrPv-?tu|In~Lh-ucE;p77BQIro
z2=*9f^;GH|ZQKk9Z0|RUYk!K{iv#X#?-tt3{UUr*ETurltG^3(H5RBZ%|@);yYgS4
z9%&Mo#<Bpd2+G?=szd({i%5L;53%@0t-X`=Im$0YOUl@v)eG&7ly1~mcP+c+6ONyR
z@mXvKa{?bxqnB_PL3NQeY;x}_Xljt;e2)HogD;|WOwI5~$yx{z4od1%(ItoRyUYC~
zlJO1^x`@*Z2!H?vy%=c}@@HMSQ7{2c-8j1?En)PV3!K^;Y}hBI^J#t=dZ^X37z(UV
zSw1_hqD?H{&%{@e^5LiDp8ozw^dEr+RiC7};#f7kJNZmV_HLQ!_>PC@aZ|)$d<&?8
zE`zAr6vSgiPBzsdsH!C=s9TRLS}H<Dj(t1!*3OhsAwi%8`uY7LjHmVh`GXgXr>$lY
zG9E#&1&v<be#DXs5{tyxsc2VDwG|`8;%pgj>#B-B=q`r`-G8zM`FYa`(ET~A_rJqZ
z3@%jft&1&>bTUWTxO>dpaPoM)yKuVM^a~{IINMJhh%Yileh@#x_L{9p<RvlYBp%%E
z4nC*)5~Jas^Lk;)Oxqqc?Bs6ce$m~?I>K+fQEp_|N$6UtcFP^)n}Tu}9M9$zXJlmH
z6a0C6$o~yYgXV(P`KhbQ5LykvIMbQ4U~J*%j^O2z$XzV0M&=SL2iD3P2Rj6`K$uV2
z1Xrk~6E#~+{v$9MKtD2TX;OMc+cntib=qJZP8@Cj9{*A-sUfK=PaZ$^54EQM5!hm7
ziU;@Br8MiEH8|3X6&FD<w0JWRTW#;RY4OGv#JP2oQqJ=J;gWEdlIRf1FcyX*d4jc>
zw_q56%YYfvl&{4OZ~Ff%3W$xFIg&gC;r$l;$FbPBVMHVkljN|wn37~_`aTNy=KaHW
zl1_JQA7Q<#j$AFoVM7K(s-=zuF_j=&+JCPN{~NsT|MZj;i3P^YjDz^PqL|JcIsi<}
zXiQLbHdW1#S&zK(wZG#Ddq?q~#1i}m05>poJONh%AUpQ)(q@mOPD$f#&5Q*D4VwD9
zZ>|C}{@=Nm|Hpv*+h1QWzH^-F5o_tmEE!2wvUi!<^dH~i-y(PZjp|ynVfb@B?4Jf0
z{eM>S@8HMJuNubx4)OaR39N4ue}FLZ^MRav`_}h}TMY{BDD1|S@*Z(};zjwC^5Qn8
zs*ic<kkEVzgXQC&y8n8aEWo945Mc5-qjPmbr2|4vV5gnfKRFS)X+89jzb6&7*78+H
zOU6@n<MGSbh_#F)t(FKmJtz=T=5pCHaLec<x_077fgL^>=H9xMC*@y7BL1A;M=~PL
z2`h|UeAEcF-P|$=uBJ&Rk&eSHIGqwO@s^8%G51lxB#iE6S`ND4E0I$T$)8N~yy+mw
zV3+SF$R;ZK70P$B{Ln#x25a4hW}f|5BqIQT2h3Hok;^x%qOz6Zu-XwQA+x-Gsl$LX
zUhgQ??Ve>|0%GlAmE{Q$pkIpTlO}U%!)RSTurRBFeW^dnHNJit4LOB<fepzVpLppu
zf2SHL);4iHTzvblvT0<(J_;nfOwRTOg2fJ{oFS7Ao3=X$^YWpqhO(u6bltG+5JN~q
znQbOx;7=V|o29N>kI7@;_RMOk{DygVDaIXAbjiS)=u0VaJq4!2%lj7zUEwGoi=_V5
zav)y<lqy<aLLC_ZPgQqc={K*&oo}RKQ9UpNYH<yLiHuC+!Q4gOiHl<j%7ANLu{XjC
zhRRp{sT(+A7p~mS*;xU6`yT2DjHQ>xpqaAEWe72I>~~g<#^(4r7nW$yI_XA(KEEph
z4&yagh`ZFJ)Xsfhj!VC%8UBO@vI(KU)sp5rT;%(8?2U53yntvak(_fH5Dd6w3M6ZM
zsV@-r<1R0V7yv~-$$h3U$&)B}ChQlwI~OSCBhJw43lK$HQAPMnpYKypX@;uJvo-4^
zyl`ccI)caTrD=m*n?uCMNSJ9Zk~`9*p<TQIpGmU1D{62bH7=Kwc_&c?wjIK`gBF&$
zkLT4!qS2FJe|>YeOB|Y8$(vwx$F`f(!maQtL~MaR?wXJq2S{zoFC_R%;$;$XpO(Ai
zUh)~jk3!5BGanHb%N1*~vvM8+8+Kpcdj(&KPvYeCdEYBDkO6xjuxn&}w^E7M2k+za
zsI-7$5GYbMCg2|TMrDlHV_+HRb#=aM@~Cop+8pA-)HS47O+1F84<<S5){lj7Krn%;
z&ef!qvI^J=o!_ua7AH;v(5h!&e*1A3L>~OVh7ZfM*0X3uo9<&(V7_xF131f~G>~@m
z*(Ef!t`PO8o_UvVv*|)Z-wig1Z-*G;L{_Uluc06KtZG2d95p}LU4pcR@caH(Cf2Qc
zUv!$@HzINpB`|rfktZTt!!Z<~o7A51VV!g6cPekOtfcr}@1HBzd31nG1qUz@j<L!K
zv%Xs(wV8Y&*^L_VOnDJ#&fzjaSx{c}^S65P`bBu6#lQkmZC3zS&oo`{as{$Gz^u;g
z>}_|I-Wl8Y3Kp$C-Q=S;0yDmO{;;0PTa3UiFevSC$9|+IAbhBO_vgBssZ~*Vu<A%9
zm$;cH?^tabo;G)40`UQrb*+{a9ir>!`9-r!ZAx=rz6??C9cLabxq7vmG!xiD(0dYu
z<w~QGc~LZ3BE2K7M*-3yk<fAinGc9dEAZz%p@>$Uv)h)0Dg3}|ks1yzm$H^N*T{+{
zWtwiaDt%)UN%c*qWU|C@bW0gZ-kK8T3w!11W-q{$-BP(@JudB719PI>3a1vj>>VgI
zrYl^%#uuwmsVz8b9&Rfp3*HsiCmw(g40#>}Yt>kRM?58DtT$f=@Br)1WOmA`Zr~2*
z#%=mUcD@Q)Y$otU>E$&j2~A6tRvokCys5O^B@9HI??8FzMWb6M$!U4R<G_eg0bxXS
zuDzNwJZPg<avl&}0I~?yg>lY~b%=CeXc#9)a=-N!^_))Viah%V`L`aN-^QC32HUOf
zjw0H>CJAq{o1M*kLBupo$;I|DvJ7AW6g~=zDZI`Nts&KD0JLz9*9nI3gSXQh0rE^{
zbD`cYVePKF3}L{vWW+FjeAPAAoU5#gtb6M0>2j{Ggv$*}0>n=AVWEd6qIshKqHJiq
zeWV@Ws+5)s9)A1Lzy&dPVzM^r@bcWTS-=~qaJMw&>!G<a=C)V3G%M<wJ+Dt}6jPgv
ze2-0d<#sAtJ73^t?fjq&nGrHw&MN<w<(l4DgBVp_%cIuSfIgT_Ag18ML0AyeqnEEE
zf)QWIfwVg|HLuy_Z0)mu$rzcDQr~niH@*sX-pkB)Rkq>}%WR7R15=1(pDi-$B>HF`
zvx)qKk<y;tHRI+KO(wUQ<(EPeYUc|A`MXmH&)Oj9Ta?WSd8*YeM)d$O_-oaNj@@<=
z#5OK5`XB!LlDyk^KbyqYTH{AA;kQ~Bt>_t91!tO`E8<Bu8R{$FR7YQeE~pjwlCjO}
z#WsZ%PKHcHC#L*?(^Ma9X(p5MHf8|9-ItqBH1^D{?x*n&`-QV5AS0>Kfg|Gw11s4S
zCN2v$VdObAGJ&lgg@y}+TnSdf`G%}CZVJ=+C{b9y8(exxT#~W}Xy5~fn5zT}Iop$`
zbU?<XKejcD2~vsM6lu(MIpKqbkc;Bvm*2;?0jKb%td;t%=!_wBdkTZTC*k+WdGa;=
zKy?$#42MvW@o_Q+S%yIOP%e(INm9W7JvRW!Zsp)7Vc$4UH>tcGGf{L3f&pztzWLU3
zv52IWUklp;8;9`jPf;6&R*QZNbsZ;hN}MT7OKO6mne2~lRVHGmK=y`fd@s1@5zb#l
z%a5@Q815cM2#=T~4a~kC>!79^a0p??p>!~yoie^Onk%oL`lReHy1<aRzYy!ybY+mN
z8x}PIYM~M!d8NoCbcCvXp&VTIs+Z6gPKa~!`wnBzmqMb?s^`qBH{5s)A+^P*g<;4M
zeYb#z(k=ECsq#F&z=_1vIH&$#dCQV!mZB^4ZO(b&`J~}j(6jMLvD(EY;sAs`o%2{q
zNoaHORP4pa^jYa-Yzb^*=+ulMea(Y2v(&dT#<<T+RaD32pDVwYlrqwD@}A_k5@jRy
zIF{n~MK_gKzvYV-NTY=etBr{0Zq3{Y0r4F>H5J~M5Fn(^c}185Ub9yi!uz6?r!_h{
zZ|rlF(Q+HPR7W>5nX1hO_-v}LdAk5!Fy5*}JbiP|2u020)KWM_W)W2B4?~%~#b2X1
zlkAwxir=yAYKS0{tb}>)aooLu*sMqeW}co!nGmTAeO846+AB(?D<i4UA-B&H(ZE=Y
zdMULbj&dyeo5j6$iwsEc$P4+v?hW9>XNFjO`j}YaccU`O*F&)H#PX&ZAAA^D@@E&t
zwYpw%f*v1SMfV=2Mg{vt^;yn$v2}h9Ja2FF1`BE<HxS*LWj1jsbo?NAD`<ocZ8&jl
zH)54I8g;;~{Pi^Yjv61r3Dg~+bq!q)011j4EEIuKK`#52mAH#R5*t#F(x<rzb#oH)
zmbjM}y?d`4!9qks_SXUgzz`O@UDKJSfAJG-_4#gC)WdY2q)h~>NzRLa)NR6}>dq*~
ztQXv;JRQjgqkl4)Y0Nsyr7FZ~h@Co%?*k2%3`08@r@~3tv7}g%vF!Vp?Plqt+n%`k
z&l~(bAJ?UVo?)kB(HM6#Y_AeRx)Er<#CyxDg;-vS&kSEhZw9TWIoN{gPoRSYki6^a
zC0&;$+9f1fUcT`ODRWYzO9*EaC`mCF4(g^)F?f4uh1-CZsnVHs?bp7VSwyp5airZ^
zC=2;d{Iep6nKoP+M6z}PsI5vR6U5DL1csv~&+^N^Tq;&qc8eW{`=-mqqf}eyn2~%5
ze_Se%V$68xOdrNNgCrQX?_vlzvI10G;wAa1EM&ajiTa?+e{{{!tZB+0E4h#+ta*ve
z%5M+jU9WFxQ?2~Kk6+;i5HDXSU;>b9E+@Ne#g8h~l@}1jf{X-X?+z2MDi2q9xh#vo
zB}mX)!kMt!51_~2w{?SDq|J&DX2eoS79{-y-db3qvCIm!=uAR5SS0o?MsIV9_kq{?
zVR?0X<;-~I@+A)@W02+OI*nQQsAELrywrivvHEN+l>nOKsDNpBaPN$4;&xGoVF5$k
z*Oc~7gUmVI?kSYZ;N+;W3L7Bk6TX#QfCCM!TSaEpOC0g#m<xf=-iuRA+p18&I;987
zt$@*fA+}jMGm&^NnJj_9_b4hfF|t`c&t*BD@JLY|O+<*n){)7%s&7kP5=%z~Zc7SV
z@Nkv^=Kt#{Yaz_9$#>|wMHuD2cYC2#XK+m~3<?0=+OuGSc*sqh!5$27X8MN6r4S(u
z1zCdyyk{S}*{x0!TVZGDhm>;%aVq_^Dhvb~&VD8#J3Lhj>3I3cSYP9hMjmNQj_`7}
z8DiU^f?dOjzOyK2!nT0Ju3xIJd$Oge!^AXi;^u&R5viV6D60@ZlJv2`Od_S%&YyyN
z#D(v-Dcq?AFKBL7!gSgyk8i@N2I=yOLn0>H9;+gI#>f==M!;qqLD$Op?IPAKSyF07
zC-EUP-R26~E(Tc(!I+AI3d^J9kmI4gj2E*(2#ivOy}K-~e0;O~Ccz`Ed6b~@gEM@7
ze=mR(oiJ<cm2N``jl$mvyTdPE4<&rIpv|m0r(G3kZPofnP-Y@>Qo&MPPFMntoH9Py
zC$$D9Az@+?$77GmH94x$tAhr*x?UY<e-<i@n<cCE(>Cnyn^g>IEFFMpCCyz1?Ij^3
zF}IJk(|Qg`$5JGH=LLNm*`O2syv%yWdu7JKu?6`FRXR$S>kV|em#euI2$aT%$_?DN
zyW{D%1;Ge5L)$$uw@n;<2%bPg3^C;9Z+`fze@>-@I6oL=j#Zc?)@TAA3frJugMxTF
zQCWoY&HZGgN0xdNrMw(S(9Ul!j+Y(H@=gyRjk48#B><@R=x2TcI?~%A*2Ha8V*k14
z8OTeZQrr9{Dv7*%6t<`t*3{F6Dww6?BY+0PMA6E6Xh6>Pu^yl35{~mUw~3XC+??Oj
znj|BfqF$hbMiUPTjB*lQiDkxja~|e2xZ@^i6n-U7b4+#`^8xz{rwJ}kW(h&t_h$kD
z`Za>-O#N4oNMQxHQd=E;mA%9bIFo0S3z&?7P&RM+8otvRXwj8M#OZQxSkRQ~CQI%f
zjQoo4ma62-*4Tbs9V*Ge9mgw<8)149#Wxje7_KWS-U=47D#j*>>8Bpc$vL7BA)iyt
zWU41WKYRfL^|FTTpTF|Tq{SA<GQgJdl&}TJY!M6_Z=EH99Es#Y-fM`nUk_*Hn)X=X
zSDn;fU4xZ%a4z^y6O}|9cUM3MvQ`LPYqyVSm!6GDP`g7<bYFcqIHQa}Z5aEE{NA;W
zNIrB5>Ny~|{Zi52D|3FR?Z9(<q9_DN;r|HLm*XJTlGI><`-aymAm56}70;P9BaTdn
zbjvAPDoYeXY_wS+bwvCT#11<9a*|e~J#$>zDQQL=clCZ*`S5wem@1b|Ye^CcEEU>!
zPLHx7O@zP!^_`ENn^Vx3aeSb7cuv%l-W{6;*9RR9)o!gG-;p3^Zpygc`=@veYk&g0
zDwg<CtQ0;!GMB9t8z##L@}P6x=iU{<7+p(U=Jqi$1}VQB*2YQ~6^HDlrq7caa0Cw`
zJNO-mmSDJ!_vqOWgtjN}=*}n+eRdrl*PhE^*E~3#9uOqc4$2l3HWK|D2rhi$(FYO#
zyaov+UCOQSwj{0OI1HK0Ed{)U)PuvbH-aOicEsnwb#EkYJu(xN#in1i0Whu#YDVOZ
z<zraP^AxRK@#32p6Ku2uf1*_OkEaDmW#e48pD{E#E^&8}H*2Ee^zqZ8VPV!)uaAYC
z2`A-gj*jcRQ#qRZJn=!%i(R^o&4VPnb^h5Ls02jQG_!#932?7^MzAl)s)Q8;PK*n|
z$Ayf5q8keD(l24;D<%9oN=z+4B@59lmMEOjUFs;v1-rPw&VOx~K-Axn5zN_vCXo3;
zWPZ_bF(wS#O!4>iIu2<~V;w^t3~+M{bIC$55Ni-$+6tUcqEPt+m2-Eh#zv?u8m(c#
z#Jl*N2R-EesDV(AXs&Jj1xes!z>x&p*nnj?>1vnBlrW$={(`Z&$YNPSF_1b45*CSJ
z5Npk_K(C}45thYmJ=IgKizS!n{F5E59M-PDhC%cBcXX~Wq~rU;NhWh+j+y$3HNcm3
zc>R;+2PZ0E41Cju2CrD8lWY&#EO>wjqQTHWsYY@GBW()%{?i`8g2R$>D_YyduY->W
zwE&HvXa{JUg!zen^$#kHQuT+cYDKd>lKI0brI<*<iQ@S0s|4VSX%)KaWAqa*@CSsm
zQ{e*ATSRt6<4Q9IK|<!-UIc(HoL(2T$K1s2rY5ra7iY;Lo`b^Tc{#|vn$|l~4x>Hp
zO+(b@G8!ef+;*vvdWVO#sJG$<y*1!GIhZ8|7yFu)kY*B7Wz37hd>yl8zeYeP?bR6H
z$IdK!uisr+?XSgU`Dk%UaaNOT-7?5+Dw8UT#YEE*E?A6l7_)vYK#tQ)F|)}=U-fL%
zC+-EFf$&UT<H!vcynLoL+ntCxdmJg%kUoa~UjQ*c&cB_^%hpzBaIXh-ln0><B7KhR
zV6ub{a?w->^&_#?QcozlJM+YNYb-1-0XdC5E$(dgrXqy>dS!vtaSl2+1?~%=`~F=9
zQto9m?{sORv&LM4>4_}6Eh12+vAS3X826qFRcrW*L3g-^LNyx9Zs+SbYd!QCw;IA;
z8nv3-d)Sl6kiSHMW6h`KY!;U4a2NgV2M9|Cw8iD~9+e(r{mf&sNmKvM+I*qy8yq#W
zwCdKbtNK2`a4%bBI<fCK6Un{Sd+`&77x<o06u9?Q#Ff-z`aZNyw3@Z$Ddd7=eE8!g
zEdMnnE6>Qx0RS^2T;;joujJC>ZrL~7V7|C!7oe2y`T%#N9NiOic4o;aX&z0%I(2p;
z-J>A}O$&@4g~{a&6IG70m?a~lh}+rUd}aM9#ZY8usfAJX!7|$3A9Ey}pkNlKI(dk2
zYgT2%=Oj*4dc)!_G%=}R+2E9QzKox8VT7?|e!Zt{+>g$FPM6&Bm>?N}sR<y%=z8Rj
z65&HIyXu7eYitVBZ*ogSwRt!(jE(4L_v~JzqKHi}fgXDdhdYP!3_WX&N4#m4#kJKG
zp-N;j=Rx-7<$*{27$=h7Ax(=Wrj*_ip^p)Cqk$=V`cMA+2xE)-_|WtzG$BwZ>;gLw
z25Hj=M2TP8*7mYI=!(ASc|`Ep^PT|^xIHPepPDmQ+ZzMscooQ1jQMW;y7o&uj}D0O
zQZ?ET9l}z2?J47ayhNv;cYI}?{xt>z>&$SDL9uv`B4+88c3xmqL7Iay>F|}+B(pIx
z`{}<0g~z}X2=Mn;-4!!zzLHegC6<#GMMf47VJV9~gu8#IrLd%#tYMZ52;gs@(`C@n
zSC3ZmycmiBDvf*4#qQOu(R@O=cNmsd5`s5Pa1#9ve_gOkl;b((7lqH@Nz$}s-#6SC
zl-0824;FKTt+ytBEdh-lDNO^w)nWhu001Ov2!Q4I)!S?EpN)~2%%`};I_^Du=x4E^
zYFR~v_#<q9HsZ+$A7Hy7ogVH`@#mCraKI21Zpqi8k1^H4e0j%6Kw{2V$-IdhJy=in
z`M)DelZ+7Z^2!<g5>8>Ih8R|&PN{*V2Ve=+i&GTjvOnsM#XS3)T<r$7ZZY8`h(9AH
zUW3SCPG=3$tfzC@@oHcF@$V46a1}e9$-$@7V(bkRQA*sZ5S-8Bzgj3eC6ik}>z77i
zqVW`U?Y$CEB^Xxkwjv4;dR6ZQZj%K{2Oim10s2oC!gs~J;iIw{V;(!6V@>O?im~>8
zmP)5(gN#PB#IikrEP}9o9}c}zhjSXbD7?`uVu4Q#W7<@^g?HHuKQ3ck%}=1zmuJON
z<iK?wMH{;la^QODmtp!`Bf=3;`f2P&y{3Us5*CygB9D$vJ)}Y(&=yQJhzGpRF{t_d
z-B$qyM3xn=L<MULws(-(LLvBPo4Cq;&oxi&-V^{~LZ`-CnPD=H=z3KAh5SiOm^Lh`
zUP^a4LX~y6a>|UgzlEGvYG^oM2m_l<LMN}gK&|mc6LkoL0?AWkno~C&?>$*=k;kvA
z2X7HW*m1fG<E|!>l{wej68+TZ#o_FuMpVImWNyLg%rWpuC(aiK6>}eEtfvhn#*X~*
zZKO(ZkL`LWQ{d+mW;>NpAyUDL*K@;C+eIPF$6Y@9X$yi6It}(qS#-iwu-{_WFnb7X
zZHAg<?nMPqvo@=3dVHI9xVk&k3=h65%LVT%P#n79pm4@IP9Ve+QmnwC@R9>2o*{Qn
zQ|%<%I~Ubzo0m+r(V<4UMPa-pp-y6j(wg>`xvxwMC060W0!w$cXyZ9+d&k1fCjMap
zcPo~Qu~qf227J#555Qk+LMI@nLJ;LEyV%9}u>zdZT`Mfy%-Ie8fK9p@xmSw0huqHf
zVCz++{|`ILSD2})n?fMiv<M31K+dD=^vrhUcHI3*JzX;br<0x@fHlLTt)h^up1SpN
z*I8bK`SZ;He#9-}lIamgh3`s{oiL-p**2!H&QH2f#(FjZ7wS8ck2a<1Pm;l~o+d2M
zPP&GwCfH&<+RwveDzFnk9Yr8t>|br(R+Gy-nW+nW-bLtarj*R2Z!{cLhiU>th1nqW
z3O2_sc4|jIB|?w=nCCOZ_SJwY+dmO$=^u8kbdN?XqtDG;E@D8aVu?4_z*o@tmjmr+
zC+b4Yy|wOW)!{Q!?cre56?PDcYEdifZuyrthCE!iED%Wj0iFQ;K(thsPAK(N4?j<)
z1&q3P28FghgVGIU8UqEJI0Ktck)UMD9J7gK3?!9Z4gh+W&jCUmM_n-By$bk{Y{7}A
zO;ydi!1V1^ed`JK0#cWnCN!*{DT0q0O^<(0U-kYsV3UHpNug}%fK8bAseotZx5VjG
zk;Cj5^n9%tpVp$0Qy>;cM%XtK40%_M?FJ#>4a#}Jw1j|ikX+bgwzVmeZU~4q$&26}
zD=`uBnZg*n?*7Uvw?QZDKoewF6)T{F7P&`;i8SAVq3fykqx*aBhiIA?D|?%IdKhhR
zs22znzq)Jh{&gT=Z<Tr4As{wxL-7f`vxs9VuoCOj<^M{ABfO`{pbmeNruy_BY^?b%
zU{SS*Z0;6g0<hmkw})i6Q#FdB^fFt2&}uU?7f3t~NZs%&XwOMD%n<YvVZH(Yze80b
zV?;*1<*Vr2yqo0pZS<)>5m-jx#RETooQ|1%(|f^q%!L91=Z@qI)&|V;>h5NBu|r|D
z&^|s>n?RAk&A6d>GRzl5`{|2g<W<cs*k=e0c^?woV_^4U1H^9<A>+T2I2|U>$h83j
zzDuNEOS071_Fk#G@6^gXd5~c3;d&x??Zvd1s}~vx+mvCOh57tajsJa%_R@KKuj0%%
z*vT`S2?2)J$N&HU5#XAhoEiEwVR-`*IbY%Uy421|IbQDpffb2%@h}5+xnJRwhr;Ts
z9U$j;Peu(qGEVsm5GYaB^1pP0>|UlBWl_fqr~BG^-`hvT(Kpxp{De*-FoH=HC(UTO
zMDR4f_fLVewKTDy6{{7l(6jo!N$#)2@mgt^gX`ML<)X3a$}mFvR3P8A%~F_kH9ApQ
z6J@6#1BX69z7K+afq0go?<S;7?6zfiiTabt+dsoa_&?fhffy)jkh}W^;u8<9Nz3T!
z=#^``T#4$VLkqyLL3j^<Q#hrmZNH$R)ws+BJ^!Q<h*vdEB<-Jm$v4<d#q7UJxtI0Y
z>$bgmaP`Nm1AT5zI~N8T4E+h~EGi=HdqHoT_O(ZAzrB{5wEE^e9-r)Z8&;8Fe@2@N
z_pWwK<YJ(PB6$yOpnl81Ki$MG6UtDw1DBn3UAp;puq12qr6>(q#7<qN|B8PDH<a4K
zX+EUw`rUtOi|mzmUwSR*r1}o;QBMsw!%~q^4VcI{$;#dIUiK_ntaXt0KIw*s>tS7P
z+Ex3&r|L|L|2IlGK=Dt;hcwrTZK||ZK8MsryFAFjkuZG~U5F3CQKH;{`$0+7qu5Kq
zvCfKvf!q$E3J=zRKUl+wSSK41*^sPFh&3VXqs0#R7*MwH#@kZU`v#+a5CcG1(sml>
zG9%g~Cl8Es*iRS*TWYv8W9()_NR%DzsYdW3nw`mfFI@+>YB;Be`nne*SJ|B1z{7Wd
zU^5l;ahC{PgZz=LStM-VRnMFO`Vre{fY``vMB8QALNb8JSeH=lIYXWQ%i?m?<0~C6
zg;*{1;nq}3Ac?9A1fT&lEJ(@cB&|c9;cZO%f3*^GL!OOj9(|dvtc<XI_Da<(knj{%
z(^@?l<uCVp7YakKv6nfIw4vV8QiU}EW28|e?l;gQtKyN9#2}mCZLd_9&E#Qs5vf6D
zRUNLDGsVOx313q?T}IdzPvfj1M@e|5b%s&wZpHz06H|(7*th!oJZFO!q<yD?+psK-
zo4P8KGGKM!do3F@V7Q?SNOBGGEet}~L4q*yl1#3_;gW6lu;ltt9u_L@EVFaiN>K|B
zdbeau#m51#1%^uWz#JHn<e70*ar1TaMaqDL<=Hp#=@cYWlV7DzQ)BV!b}wAAXwjHK
zAY=Zm!KUnq0;o_MW9(byDe^|vzKDD&H$OW5jJ;NZG5?WskkutCjw<B+`=@&ab2e%I
zuo(GC5a4Qq&HbMub3_UF%c;4?PVW|-peU;EWA&bN@7LP6#<p467i0>^KCH9$QXG>E
z;TCX?hpyAM9Bws?P<S|0v$qRbR%<;u14-fC7%sQ2gP<bgn<)P4;rR-2&Xt_g^#8f9
z<@&Mh(8>I%QEnH(SSA%bTNO=)(8tT^vqx^MJNxeul36!uHHOeCWUjmQEvAjE4++tx
zLleTv%Rf`*Su>pf!mG6O0UP^{P&ChN8k*Ud$OZAU{g-8eW7F!`uG2JqW}768*eyl`
zw>l2*?N)&6A4AF#VX!zHK#`00jrU>v<V;%6rb>wrI|`izwZ%&=A<QL&L9SNT6{4tR
zIoQ=mZgy<XbBroW->9ILZI|-9NK*^HEucXPm$kklB4c7Cy&fG7X07du?J9{&eTZwN
zXme04<rD*v(7|?T{JiyX>p;p8PFgGEg<9w%MT=99EI15bwGZ&&bnjPSpQ97DS>+f~
zv-t3}r7$%4RTS*DaZl=JQ*d%KgX>?i6;PW(C%435h;hES-c%`&%y7sKSDnZuIdHNs
zcY@)r(f!WSUq>dW&O;?LLukb}vk}5Jf|kV9{l8)?)364`@qM#(%V!_bV|%w3HG4^Z
zRUmeu-6qPs4K$T=VmjVci6v2_%1!wD-#Zz9nPMj$|8;JyvR4kYM9VA)Qw_tD+@G=o
zB;x!#%LPpsJWG+7y}kky4M~j-L#;^5G6^7UtRR{z`3F<zcnM?1GG+`5t?mkWzoih~
zZ*l05Um(`|_2{+SIe6gx<f~bm2WP+p-Z;iSao{9aonW3n0G?wxz;xDrKkT|xN>&qK
zM@lave3Br~(cY2ym`ECzY25O0Y0G<T_?5BQWzB~NE&<;_slv6kys6m1WJ}Q8Tz5ln
z2BGFq-KR@J3h|4&=tw8v#GzEYfB*mhBCqG>H|DtpUpKa%dO+2+ANd!EzWWFik0Su!
zZMnet3)Sx*IZ$(#{dl!I(s>vd?7`SgNHONL0(T}gD;Sn9OF_YP+NKQZEvzQb*8F<Y
z?VJCqF-I3f#l3ZD3lBT7?fwYv=#9S}jtI=l(4w2`IYBCSUQ=5>oqxfSxqZo}o&4nO
z@R;$*o(n&l;n<v!)_ig01Yu=_ML|y=QDokB(5yn;X27{u7-V@q+7Kuw21Om>P0OB2
zvO%di&Fw1a8zNHmZ=J?u%B^-IR!a}p7_Yq_Q#*B=@}8u05&5o$=IHPImFmBwcu`)q
zibz7O)STh1dVM2{m6{GNX+d+ImBoUUNXJ0lIvQ`HH3fG@;__?I1a`YK-lgao^Ga{3
zJ5!*Qk&rIQ!hcY7y=79s*0KSec~A#5+4Z})VXucLqYbx1tEQp!?tMPcsVz|g>bHu$
zVv0V2QNk_r`Lcc&>~i>xmtf>9z_ew9tv}}}q|uRW1E|!C5=NkrR7@lsXBUL6uzM(#
z6J#{}UVxEF4o-IX5m9_M)aGXrr|T3$;@puj(fH@9&q1P|DOSN*l;A2TUX0z(mZTIY
z_Z6TB4A;)P>4A3|8ul*&xryoNaInwWZYguh!0_bfeQ34<sBnSRB!Q}1a~SP6N&(Kw
zN?npFqC6B<iPIJPlLWqS{S@$TCaY~c<HTtouPlFg<jou9aolroh;tIP$f%Y*cY6$i
zQ$UEbv)<P4O@C)e&${r>xpMu0V0MOZ6God*$SG!S)=gy3<!XP5sN*f}Z=hX1;+yVg
z=&q2*jBy>6*M|T1X76T2-%cC$So+8xz|@q4R9kAuZoe!(Gg2G`!&kX+SIBWV6ef02
z3IE~m)E#Hvdg=5fXH&30nl9`_)5c()J{1G5kI#w`LDOWaXCTF)FG!O-1_ygkvB%3T
zdps2F&@Yp0)su9QLIM77BR{a~L*>3@$Dv>qsUA=Kx2v`Si**L^y=m+?OHH~uC=*rl
zwTvmVZEW;E>_}(8O%6D0q?!W;h%w$0g+KM`R(l9bc9csMV;PpWv{RxbL`uwfs7`ci
zP%NN?%SWJUG0qX!*i)d@cCOr@6W4+xMuGizkWvLNP0_deql;n}L7D0aZfXrZk9|ke
z48<Pu7)^VlMyH|IW8ozwrN-JwavE$!w1$g~b2kmX<258rBMCY7pnR1S`5{C90qU78
zq(rldeM5Iy-@_I`kuYp~F?To>e|y>ycc6^(@v%V|s%^=G6Cq|PC@Pkc`wBeW<PMnt
zs(G5Da0s-H!l14d%C`;zKxfyZtAkpdK+_?1uubP?1Bo?EG)Ksa=l22DNfd6#gHltp
z;NeH_%8k++sfsh!4x+hE+>X#)F?&33%6_x>0Z<$MJxREWq_SdA!}U&wU`@<PZyRyw
zFV0~n3ZBT%{9J<3F2(eAuH>l!THprggUdBQA~;&NL;pY~XxwO_ldAw{(yD8bfpKj_
z8CC{n8~ees64#{n=HPxt$kd{BglxdzA^U^LD(jQnYNy}-{H#sSj_#F3IY{EICQ1`I
z%x>;i%uWz?qjleJ?83vZ?R3_=6RjL$71ISX@7`@qHEE++{2Nx3bHS7h1Z0-*SjvSS
ztjw>!7zu)%G&`OU!1Uxka5yeO<nPC9?4*B!`YL(6;J75jY18kthTuIG6RzYy(?^1s
zI{J%2oE}9fx6*C$h@zj@Fav)^{VQoFnjcpLw)ZK&8DQnLx5NWD_Xd4Se}gLYUC}`;
zk)pH=T@l46byPp=te9zQ06Hds*nf*WzH2mYc>f5Cv)_IM+HIq;G;Q=oow$(6bi^GG
z2@V7h#XdIIQ@==jl}>%g?kxbDayQWg9ILACn$(^;t>RDXjD>Q9m{1iUgT5Ir-;;G$
zz3SKZ^wqMI1;ceg6z12?HY+ZYvLss|78S!#mWLPe=fh$x0*?inu{17}jAiONozU;V
zc~?;gV{ZssW<Dtp9l{}18>k9zd2-VrFy4qd&Lpjhr@+bjmu&yhK!gQyZS`%RJd7dA
zUs5JCyCuw(q4@+IHW&QRIoAkL`g~e_+%f#dG*yrS%8Ejo1bIl}Ljiq$W)d}iG&MJD
z%6T%|TXC#XeO0D?kb%G7vr71@@;VXzXbaTgfTuuUpyr5y%;~ag9?nA^fr}sn<<4rD
z!TIYNT$IFD2z50wv}c<zAs`$0mj`%)OGd{%7~s5q1lDdA9wCZLUk;WSe7#Bv#oB#<
zS6bm4!rHw4lWPX;8kr!N!T8|E!H8bLiU?(YsO35In$jcE0de%&x@n;cV(*l@$$YKD
zp)=f7i`q5T)jien-C!sCXa=_fJv4K7|5``XL|^X4yvFME7>Z-i1nQCVJzLHFlHI6o
z%S=Ss*l{2r0003Qb~hIZ>x^iy_tu>1>FWghsS|M@L1}b(XBLVsBPXF`=c$|s2OW52
z6kI~WhciG0v)C5Yy49>0HynroVfIcK;eQJaKblM`*y=wgat%RY+I=;F%`>7{zr?ct
z{T#AB0<jl#6PM}naLLr1ix*A)N~||Qovgq98WxJ2z@9RRQueT|0S*_9+|6N6_rWYE
zaMuPZZo#HCV9`l|x@~LA8wm8D!&fk6k<&97+(b<H(A?-yJPqRGvI8}KZQdQ(LsQ)$
zHX3d)?>r_p?na756NyoBMoC?sDWReuA~7q-nY6o235!f+b>41&$Uf1qkn}R?KnUr%
z0g6bL$MH@TtP4ayXv64UEu}huXpQpb10Y`$PMLbaF4gGuyu4Pd1AM&%MTwvz9#K$s
zod>pSNY7=rHg7U!{@2yrUgqj1X(DF+#A2wPD@M$W3O(fwI>2yq;WupZI<US%0(DlQ
zyrT}Qz-)j`d)l7N{Hg=;Lz6s*!&DWLc!q<!hRD7%=Bbs&9z-gMUu&FGUx}k>x}1jf
z++V&6qZc@{Q<bYarEE+j^*AgvgQo<MvU*ZAS`*}*2Y}J0fl!*}Yz0OGoAFGXz=485
zNdUa+s?>``5eWaqQpTvpdkw8I+YMVus$A!5_0Wb$X=#|-FcJpgooVGT*E^e#Sez3G
z$Vzs+i>PRbOX<XsZYcIAnceZY-|-_fZQ)P1D`M5Ti*?pX@sSv*V-i*VvIr3ZhI(KS
zi?{j6jYglzse_^nG+-zjcj0vAnzAed6K#Wdg00jGqGC(VU}o80pR@Vs?dtd%ccgMs
z2KC3PV(ywB@1QTR3abO*`(WLA|5%87K}js)5&M}Z=FoE8C@Pw=e!2=CG5SRBhat?*
z(ndZF&LUa|PC+k4Z-M^wjqvelta_$~BJIEa)%GztyF$Cw!zdl4Mh&hsj_5xY9H5I6
z$;GO8w{x@YyYQ&2O%f%J*_24YCf^^2HBCS%Kh<=%r)ddwvYH_rlY;>zVkqm0&iKZ3
z@AKW;cyw1pBeof_x^ry-sVug{*1WTYycMM1-|O>7xmR7=V`>TH#__ab4Z4!inh2$_
z%iZu4Erpv{SOOS>84G@;@O7E3*JtPkPMK0pXr`pYCFrUH{H}rjIIH!)Solz|5Ar<M
zk<k(1B8Ufz<y|4<b*w8Nv+AmTMNp!tuGBYHPR2p;LD=I}!vWg}_)d0$z+CV-9%(Us
zv+<^)HVbZ<r?J>$QX0am#~fJ|UZsP?pQuohx0UgiuwhVwe2lH*!-Yj!am9KDw@1Is
z$vXFi?rI8^-6+wVzT*V(Fl~Q^bU%aU|5@^hDm>uyE@7B!9g9#r)(u&IrR3xpk3LF0
ztuKwzCu<N9n=pAjlS`!UZ#hHXOvQ$OU>51J*w+`Yas;_#P?w^H21xl`sx!wHThMfN
zLlOw#AG>5VX0ja?5HTzj6`}sP<|gdg1^Ox(Wq13%^hWFG;Uwq502tTVYA4T+CSLv}
z(vIETe%+|@;zk#vjKS&aQYFOsNWD};BpGyGUBL<%oXay!u!sZC%*r<GTBG0<p|0X7
zZ3a_yigR3CRq;mtt<#i~h#UZrU?`GE$1lkD7JSSfyu`o{q+40L;rq}3SF!{FbQo;g
z8F9Z@{QG!BvY@91HCc5v4`EnawzaC--|TdWl2taOsla9`kRq=?Q8Ap3+y7S7t(o6K
zkVW6xn3BGJ^-jW`CW;)qahnaEaK%aR7)VIu%i))g)#Guocsv!mX6!-Dlyrd1f1SiD
ze5%^KQcZILoyn8HiMWf@-F}x!eAl|RodOhhBG3u}S6*gB;+5h$O4iEdhmRQNriq-;
z%{MC&+DL<jl0@5DLma&ZM7ZzMYmvuR%#|DD*JNI>yCV9j7WV%%`grUrPoK(GRcA~r
zx0zNrp1QN+-(ZjcqHbZ;9K+`9lwEd+9<y|rQS37>du}HfcKCf<Mi3P+3dWwEkDL^?
zy26|83vw&5ktgwY5O%{Q8C7SE7i#Iq6kH1cW26EIhZg~X+aZ(Q0hq1!Q>&j4*m%bJ
ztK@(4nr;z>IR}3x&Ge3F*X7K1pC!CbW?^1DaFiu9B&ueXQ8gg9@#mH4#c`~hzofv;
z000016oRhn*Vv(o7YI6U*eqXdueUC9EF9R(w?Grg0&mAEQNyQD&6!0F2gM-#Gd*fA
z{`XzEpl5QVW-^3?-tbEUVS7l5yhfBudo+Q}5YckqZ1CqM&B>ePk_065k-wV5lDXBv
z%nNp<O|5^Y3iM2o?|jwwNNl{-2{5T@-WQO%-a7IOF7zx>qPec7ue|tVR^bK#m$oBC
z%<rw{wBBx6IoFYXyU*Od&QY~aBlK?IWkdI0G8-BLWB*h^&D}B`b+#jUI&2GdF7sm@
z#a;Yjae3L^EZnSJ=J4&RoHFc!a2Q$LAL6V$@*|39VL;81sk0^2{7mvnHxYRcWd16&
z#sbugKue)vKKb{)h_Rf)dnrKV{O@`oPe-j4xz6(swe7c*#(?NFOFUMZOiV4bTfk5F
zaa$6s?xj8{Eb`1$i0)l$*L_>%B3v#L+?|u|elG;|#uw?E)=uOy3eyvA=e2SypxRjW
z6Ba3)9bOl}6b>kn{WJRa`H=ymk5HYhK@Gana<{}D@HX7BGj~bLlSnRGAub`K%Qp@6
z5J(&QuEPa|0Rml|ql$j)ZIFHRtqQV~A_~udNT6QpXdPS9JTFw{5rvN}Z|BhOAi~YJ
z$vUFD5f^tkcf2-esD-nOsGx!&{9ML9y2sy`8x{x33p=}$*44c+?+iW9@v)-UJPujs
z{_$17TX4uY`xvKr-@R4+aMwhOB~VXF!f`+00Tl${yCgR@3rOe*!rU^yo7ad<F-Jbm
z9(5u2c$Zkb&idub0--Yiwu%H)=Y;DpA7_tal;`Fx$x;c(_|PLha2ax$x4?e7)tR6)
zKFKY34|+?xM1YnpeU^PYt%|hah#{?3T2Fnz%G~xvpi|o2U5?KtvhD|O>mKX(LV(-$
zEO-p;KfMq-V@1h1T+B0!8bOQk33vL_+>l5zKr?1=?$)2mSI~)E#j#M*U#XCv+=$5{
z2ipH(iG@Qp2Kw(Gn@e_9WZhzq>G9}t4g@ShoEll$F4R8DywDdRbITjGcy7NhWFdKb
z$O+s-YI-5)Y%mMDWtlPf%|)V0Kg0G$O<Lg*SV()h$HU#p0o@z1Np%6TqR8KBJ#zv9
zK9%rzp$+ciiew}VUf*ImQ$Cv0al^o9#-WGnLpDhsqv1OanF;n5{p$bJ6l-=%wgUU!
zx7RD5vg`d5ofJ%W@6iM8nF?a!`J!*2SN=6?6RcnoAc5>fN22Hlp^ahrIv}hZASR%z
zIp)GimkRwp*Nxvy+9v*6iSz?0{AKrs-mB!qNpuIAQNT{!_!IY8CV)Aql-oWyRU{uw
zHSY+Jtx|ERNV)DDc0WY~uAPlWct~JxTi!XYSnkpkEFM~4CT_)RP`><_QRNzAdCAtB
zh3QJqZ;987k3~`8EvrSy?rQcQrBQ-<Y_)a(ik}iSg8g~u=9?{L<b4i>0Z4o%{X5a9
zBCSlnD$x?JRUT7>_X#wla<NG)oAleq(Sdxy=FjoB8mr)Bz(;Ch3|N0#Lat7uD;yFX
z5Cq$iGVt!deQLu!>t)`?#5U!r3HH$t{Cf}E>P2+W8kIor`fc()S;~lM`W?58$V=!5
z0yWh!b9-cPtggmrvDY^Xkbc$<>Dk4WCL96zYE!~4^M_4czg7DRemoNLFZJm6&(Jpd
zcIDE6&PlQ=ZY)s8zL;rnrK#LnX~6`hYk!zB!X>rN{HwFdj50#?BhQ=w57#Al1_jDF
zy+Bq@*qlKZHo>jRwTq7bz((wd0MFoc3-COWvs(SWH@Qiv8u3iw(XG(EsdT2Y7`o|n
z`?G7;|33!m+zlbMr6D!G&-M}bU=?^1G)i<sOsTuB7|vwFA%b%QI>uTSAG{y6Vl2&?
zw3P~M&(A^nWFey>g*NLGe$&FtkXs8tGF@wnQgRoCdaN?cSdqI+yc+AYtzk_&$q9t-
z95Doe{8%DS=JM*lZyrw-ml?nt@T))xK(b=@tgj|RLZAX}+;g+16Yf4nrhBR)ET=SS
zraS{#%FIeQIL3P+`GXgUG&6Ke?>j#ylugx{lGr8dMR@Uf)XC?H$W&1`?nke#E4yk?
znp?xqH{TQunWjSP_mSQg%tXp2LHhh&c|)@>lkbB4?Hisx`YoA^u{jQkI)njsXp|xH
zC(m?SKrISrmMC#8)V$P0mrmZIcY>|7gJNAj3Y3w*Eu;KTgQ2Y&cGLhRR(*d7{8~s+
zOR2c$30nXtVmTIGy|~}7?jot%_M5SqcG#{SpCemWiVm<UY2`ZWb42EM(hOjkuchzT
z-%hd7dfB|Jf}(}L3P!*H01^>TAq#s#U!ME;Z9Qw3^u{(qlsH!=o?%(JHamzljQ~|f
zT-=0gWg~GdYCday_gIh>)Nx~RHMU`QC;e|$a#m#k0Jqygyu(a9$iH8c73c>PPmZ{l
z9zc7yUq1*JjJt8ORGM$Yc?7tM*h)#~v<vxc(!sbG$%`{b>2q+uBi=~=JY$E2DXBOx
zALB}|OV~0ar&Nfud*c1VGh-2AKa<6Tj$9UQG#IpadNkqy(sQtgU8gv_$LOd{>|q2s
zoDE<lDEuwO=hBzb&hS5<Q|$%SGC^6)cW3RI16Sku8Ub>Ro&EXsz=eubs1eOpQ^&hN
z&-#ms{59O=wnzc+bj6CX?c;4e&kCwCr_hw8;Ohhs4(gLw<=lFUN*_A04YH*{KJ2X>
z?M0p_{XXG+SCrq@`7aeE9Ew>`*6MgsYacODM3S+sjNtik!aurdb9*<aXf&sy?+(&Z
z;;6!`9P#lp_BZCV7=hA9@p@^ek$kiyYND>5>DMkG8)I2RlS8UV#P)>z@FMPU2Rh_N
zFd7=HrCtD~*_PIIyGQcmqt??jLUrzC$LcE<&KNCpd|HEYZAwNKZ<@PH9YrcT5>3#H
z1g(>fumKbjhpxg;-R54f4JwZEv6!kyj}ClVUcY|hVvjm)vo8_LBD3zyY2?@@2Qx`@
zM~Q-Jv#&H56_YQKBOiS+D_zwl#N^Jjx$Wr_9O;f_Qa~pOF}ndM;V32XIO@AHZx=4g
zIq7e{Bfn9?{xptbnd|ECLp-eWIjMsZ+m2nxN4s^Mr9oejL>w7Z!gSYdBJv`vWA=3t
z+|~6gsLV*Q)KK@(_MrE#*U;F8`S>>=UqQRsc`_D0=04b)j^;X6$99h*c`~<!yjeXc
znpL3P6ohd5oLSG0{^ys-CnGEjabD^cZf!JDNS~wp7+=Zqg^Kzd_2;jc2~R^Ek!pOL
z%j>Zbrndb4vkC}wTwFCvdc4aTVFAN9k;>B`Z+J`A=Y>BP_;#2ig|cBmws(f5K8DPH
zk=MXA#Fl{s-nI8SLeec1{XX>2590Xj$519OAE-Iiilb}VZDun0A?m@6pLMfBF$9?*
zy`*~zkg(g;s{!Zf4cCk{@xY*Ffdg}$o^!p9nDUM3F8*iiAhlvlvEN|!07TP(p?y`9
zpksErlsb+xy4lZ9?)<PX1_};NgN!lmLVlP{b>3W*(fl`qjL~V@icJt)GTrz=uykrf
zWajzZ#wjG|s;p#eC$@cI-MJx#t#NOa91+G)t<CD7O~2-xEc`#T(cp%=lhS?5Z$Oth
zcupV*T&Kn%glaJ>dk6Opk1+N6=`yKC6+)+Ml8&V={&vTB&uh`SSU?b)<{`6~^@>Kr
z87iO5?lwx|GC<fT>5Vgkd+&ULL<kB3`L2Sga2DAWr?#9F-|#0DICH5~!m#x*n~&lK
zG~?RZ$}m`1$g~Xyo_;q-j?lig2GPd;=D>(YTq{~Kbrp;8!8`34tu8{{!yf*a;C>qh
zQG!a%g><FZk4rWxTq*+aD|uw^+-h9&U{CONM4~;AF#`A&GM_d?{yw>g_sh+!z+1ag
zgGvWy1@D#CdZM(RG$I2q`B;C&twHAkbgSH%{J76RhEqKnJVjjMZn<}_Qbd`If#08$
z$gMNEZA?%$F)xJwR>YjvuRZ~X%!4$CXGX?uF|0KSI17+sC`{@{f~+rO#k|W?@qBZt
z(myUOQHirKL7BkY`i$DdPz^%X+iv4WCclCEPHU-TtYrIS=}|iDfuUXpJKW!`xnN~n
zv*;>{56G`IgiCbqjjZYDTwqr@v>bjXamDU}`+a7ZN`>0Mc(r%ZTWLXxqPh|=Rj}lu
zEQdTR3|v6C`+v(njM70T{Th7Xk}IJMaCcO;Tnd5!WnM>{pAXd-ZMHAo?JUr|i}dhZ
z222U^H-B8&?o09dn3PU8-L}dHL#FHbWU5C}C@6G=sjV5}+#S%Iw!`ywMsn)wGkI3Y
z1}45EtTghwtWlMy{oTgyJl+`bplOg>vZnWiUv2=|QSKiD8x)o_o;8jo4>P#5M>U_x
zF6OLx&DB}(La}Bh+m?-HP+z6md6gwmR_|T-{by0)<aAU`vt%diV50Bw=*oXi8qBc3
zpBfelG{RW76Nl&I56y4kZJD@_#Y(lm$)MsJSFaYsVhu?5ZWQa?SQ4Qnzr|A*-++3X
z!<7sbRgCPq<`P=O$vsHWO3HwKVqoFu!x~5?=2zx;*^guV9Hc1CNHJHAwA%^)lKgBA
zb@sqi7vsLt#I4oW<CLdMeS<;;a;O|C-m_By=_?EGK2>zSYB^EiUqu964{bI4nhVH3
zha9ZP!IPLX+?fjO`JPsBU2@Fb5?i-4qd45I$6p<6pneXs<iS4Eb)afVk@O(pmXNlt
zd3U^(A4}?NG`Ek0y(>|ML5YRf8Fk++5;ge^Hs4IgMWct0*D6{V*`65-D~i&oqP)BY
zo?{ljaKQ3KYjA{S=`HMz00001MYHlSMyV__{!w9a0n6?H?!*0hD_AVOjZnv$7N^J{
z=BW@GXx&EJBSNp__tuak`B%`rvIdXRoS=U>*mi14Tk(1*HXlCv8$r2=^GHcs$-)2b
zad&n~Al5AKn*!+rx6p&XTL3K;t+-z#Qm$Y><IWU3y*9iZ!A=YNWe}<T#5o57;$qHV
z^f|{&j6&4~TX<Lsa`IMEbf3$aF`H7`C@VJqyU&TfiKdSNbg1Wch6x}SZ;ap5cAo4T
z*x##rtXoT!0o{E0Z$ja8&;F{mio?C87R`7!0{U%QZjEHjMDDR!GRQVl;j$uoj0aQH
zqpHK4B8S~71+=jiyoG%?GuwYLd-ZZ-%<)a$!TN$rQ1`vL)rOo_LpInEqffD&@=Rp5
znL;1Qj0fhJJ+A%cQ0%I#i3l=d1dpAQ>Xl6^I>BY)%O*k)pK9pVk!4<5@ef>dHPg%L
zPekv(d5}!ReqggmIBx&&PZX#?Tx4GeAE+<fD@reSkpac6k2@N{Q4CYovzUpqS!6Ge
zADEtTchhoTe3EeKx=m_#9N)X2q90TR`<9ej`O`*5M`}Q0m4uL4{9fSeC^g)wco~9S
z6j~fsYk_1TVslzyY;u^-Vld{lx}8+M`kod~NE*@$SEGx~%2NH@=B2pcQZuGG^uQl~
z@N5RF!WWI_7#MczJQw{AK+I{#`{4RUxr2hIO^w$oOED_=z#BiAb(*L=k<~IM>V&UM
zxjo9u<G41&<4`iFvC7S8Xbx6~Zz<}L6hKWDsAQ|HDW%VS6Bz^VA_kqnhY)+k9Eb`E
z_)NFo!~w8w>^mEF)DzsfXiIJQ?qz(^blr5frU(q>Xw?bwVNy?jK_}o3yY_`-eO|i}
z;c**k4khuJ&)<rJ&BW=Dql*xGT$M~=ZwLtO_{9c^ww`X*%up;gTPbuE1v7D=Exqha
zrTmTcfD_lT&B>ffqhkx8^`X7RQ5ZKzsq8?jp>HQwzPQ@(1caLu0Cg`>>Ttnyyd26f
z#Vr<1YRaWp#)s!LU{_T~jPu;Cl+WFF-H)tlOOs)Mgp)dPO2UvB5eT#4PMZAe@yUMt
zL;3+cZoF0THC1S=Kk)D{XuqT7=PH>T<Yd=tL-helhch})Iq`UZ<4<Z_quq9U`P2r#
z{56(~w4~p?x~Bt<7GXH#lTnln0Vz5?PC3wz9Rv(fST-6EF0LPyQvoEiz$5LOR<b6@
z>n+fz@r%4;#LL@eq*s#H<G8sPVKl!kq;#>02mC*&Vy8Q>^JJ1ac0&a1*>YfFEoy!#
zyY%T=!{6f(=lP>0qVfqx2RofZ{v2An2=Db-z@r`PmL{!A_6@jUH@S3F2T{OsAfexk
z(RbtZ^G4pft1V@7@9xg4AmW=%!6=~&wIm#hAUdf%tI8sY#4N9sG5{or%tC8npY68W
zAYe9*3+sk@f!}>0{5P`Sqm!M?YIok|4@2ZnhbbUhQStsVm(s$g7s>;$h6D-a=Qm%@
zY8Z*8fAw1l>phPL>-3~gA^RZH&Uv}p_&Gg61R$R)VoqSw^7XqfV&p@7{t`;A%vwuj
zvF{QzL!6W*k&;W&z|~w;g%i;g+zxC}>!@9pHBF%TuO*QCH2*KVV9+H!8Qk*S8C!oM
zn0t*`r^ezpkt=6t`<ubC=RR&8h@oS92=IF*F@^`LvQ99v`|Uz0z&pS=YIG5){z8(v
zJ)80>$wbR+Nn}SLn<Go#X0Md=+AKL*OA&9&vFZ*tk-8LH7;x!f;GJFP*_k#5t<<Fh
zsRD;K?e?;jbzx2ZV?@ZUkN2=@tag#mtMcdyED`A|iI|BdHdnB;{gvaY)H{-QR(w*&
z?9UP(0v$vS0=?d*eBW4X85lQE#^->}yr*;-bHnD?fg*6441|MJ{>v|}Mv(hTmsYAR
zD)(N#3rs{ginyjit96WH1N`ag-5+gTE%4?mxMt9LRwRG4Hc+pPjp(L|t^TuWpHo!Q
z4(PTu$H$k*#=A2zdJj&N-5H0$M)`vEb!-V)UhxNiLZBtOy#Ps2mH<nYyzjYJ_SoJ1
zr1TyaD<?#PCbl;L8V#@UyF_+w&)^XHw8IejdLLhF_J(QDEAiiu=RW;3eoH!c&*Oj8
z$MOJKOKvG$Kz^&@Ei#Y@cI+V7=Dt9U-D-ZF02iaL5rlH=fV|zEGMXu;rLU7Wf30!A
zM7Zk-oEaKXLTlnoiX?A|3w@HE%o?=jRK5eP!+MksI$nrhu=a0yqpt0HFibAXW=Q!U
zm!amCJwuRJ&L^eZ<&Kytop+P$#vg-sGw56hSD0!}QHB6>xI0g%B!wpJqmXrQ$<$E_
zy(*OAttQIeFu1WA5blQ?po4WL-d)J)`Z`tTxl8Q=2>MqlIJ>hSkh>pE1tvH~6nzpV
zG51Py2-ft}xM(BGbtA&tTL4FmC!b(K#!Sv2*Ngwh2iFi!HI=JkZSd+n`yoG;XThZM
z>B3~-T&M-LyzO3hiJ?Ueqi4+?a_8WEO?q?O?VB0MgoO+6(-@afK(`-tG{&8_p70<9
z|8NL__xW%vGt{>PC-IzW#I^^30000R^KK)#v-RqzhZW{On(MnfI3I~O%*FfYxD&_l
zjA{DWTJ}<JEt1F7UW6@!m*awM>o+*mBS<P#bj!Rzj56jC%EBY9-CrE=42XDX?-)w<
zIWKj*NP!-0RCEhHD>Bvxj9Qg#f=^4-s^Tk=ghI<+9m4UUj(?!`VEZ$-Z>(q5Zy&^%
z1;m64YdtAp<V0NaBHm--!wfi^V4`Sz{|KwT7!+O=#}<Ta&_1AI8?WdfM+N-+hpj{j
zAfvk*g{b-l3ErO=Wy#d??2v2^%}z}VY0S!6jm&TX{;li^0^EU5(;_;lBzs4$U;R|4
zaRib`MwD3~<l6;pG!lz1BUBL2$UBv-MAO9!nLw~C8C;z??pW`-LdOE@Nz`&|4d8W=
z$9@O?R^qW|nR5{T8ySlaRaNVFi^NiO^ToMg^V6Lb2t~L@((D@%QAp0(uDh6FrSVA(
zc94HQg5aqpDL)L^k*OMNr>Y@MykR!23#T)p9;0evYMg&=O522FsQmU7$p7uIr3yJt
zP%VHYYftYn=HOW5Ch<z7)S;e~FKp6((~8^IPT-z(YsgH)N}>OfYT*PIRlPlY+;rUS
zJmQ_cF?1%4Ld1`dtC+o3NJ)$D;~%C&GUFV%4WCkRV0FrN<G0tx_(Qlb>f=i2n-g9C
zMY<Mx8d4EqS-%`O$-Ay6<rV;>Axd8*g>f>kjd%in)8DvmE~b~uP_eqnkOsNs)lX;D
z0Zh1@ZnS34if56-H^O<uLi;|ykYo5B3V&Ix^Xkr`dQ^B|R0kFJ*RI}jY5I9jp>gWc
zJ9Le@MIzEkC3`Cm$58C>wUPKAKv(X2BmM!dSru_HxDvqp;ebsX#;S6SjXBb!MslWx
zNT8`l4mLX=0#e+`_u>X=?g+!~(KCtI^GL$mu<Fq-+!V<n=5?B}cBrFbesw_#vlj6T
z!&+4lnvZ7y`YeC8pmieO{kywn-FQ~@69s6G;FZY~?yXgi8vb?kQM@|2ve_;33&1>Y
z0XvO?K=HjD{{ZRtW!+ebBc*hXfo+dx)?RKUuj1kLKx*R7hGFqS<cF|f1=-~!Q`dJF
z)Ck<^xzDlK9$;i~X(7JpO~#xCDmb&>vs&&wt9z)M-sZ*(9?c5xM|@7<a5s7X?rhV1
zWrX<c<`T%_x`|e>XcHJ!Cv?M>RTX$ocB*#VaTbonS)cE(B3bX_|E$P~w;v?8JEwj2
zOm!68c8%Qfr?$>$WKaXRe(0o^cw2gxaNbEL>aP_abWj@NH=V_zfM;(iV%VoC2QISP
z1tv4f1M;WIxRB!?pXiJ@6+nvM=kv<6h(2Te;qdYf7j(3#jElqnHx_w=a@U=Hb=r6!
za5d>zklg8TsNfM@-<$~hCsDQi0wxK;6c){J@Sw2Hb~nkJDm3QV1!U}<&x2%Lmwj`k
zA3r%VZ{TSf^16u4hsu!BMX~O+Ar3juh+;xJy8H?pa=4`o3YP<U@QkV0jCZMO-~3gJ
zM@!%P9`4j^apNqkJVdg4w-|?j3m*)Cw~Qls>0XDk;2*9%3T@VP6NtXq3?SA|j=Y*Q
zaUPKfpfCeaO(Op;N62p(Epv5}?=NhM2*CH2xi`B|V=RZEHDzVh^y(6;XQZ>51)3tZ
zIiqr4P_>s7ahA2rz224L69D)4EkiNrC=ba%v|Q4hFRB|dere2n#EHTQ$k&lg!$l%3
zH)46ZDT}ieBbO9@w=CbxgjYryRlcNu2jPDT?5gB^xJfeH(Twa7lvNDbN8DOtEduUq
zxL}9^0~~sYGY}D7pMARl6G;($1~D;mXYoYVxo-)DTpXb>#<=MYCHbk9A0N;SW^MOo
zn0YVR>FVTqoQj2<x)IseKG*t(=l}{qfXynOY{war3#1VxRA=p&_bQR&lL-!j*K=j1
zscUAEN5-9Y(V#IK{8rddTH8Z%+^D1PYeaadxvz^}_?O??j}CcZbjyP!cG{WuRpo{D
zG{_oZ_}J{FvG1RvpdVJWh|McP5-f>NDvHmDxI0u}j9&@02+=-wK}}b-n)VxE1X>G~
zkPR8Z8#I*p=OuB7Bzp>2{g5)q5FYs9ph6(#|FxiYNFv)_o^at9;sE%xb7dunw5ajS
z)3A1q8~Ch6h6Pi3NwJRL@?Em&jspX=bf>U#drEj~xf)-J1!lIJjQtW5y@gQf#)+2=
zwdi}R4RID#D(0wxBHH4Hn56@4BI0|%z!w@8^@7de?qal>K2f3HpnFnf>y;O2b^d(*
z<+#bwgY>NOe!wR%9c%3asflw5?61)_j0&sG3wlJdgRW79i$7VGGjOjOZmiC{S<INY
zx7Sg4Oc!A;Wo*Urt~N1~4ze$vi<uZ_Zl!BX;orFIcl^I(DGWp2TCkLR6Ig0se~j59
zrPK?tSV%x<k3yg^twEs;@Mc8j=I*%CYTyj*Dnez`jsLsK5X>C%cq(Vz(>1ZoOocb4
z?O`s&>H*3dWf52|AL8ZU=k1yzIv(|&0BT!UQ%fH#PDiT*m_p_coX7vfY<$nk>8Pu8
zFfe)8L$&k@Y4?OrX39YRV;0?SfD!-z003#H@Pl!blH5ge0jY%-Zo-jXdnx?#v_`d3
zju}Jr4eM)k(m`lz-)Re^-+%oPcpUwQ;{|72k*0-$zWx2H7|DLmt{*NDYkpo|X&Dd+
zyX%w4ZK=L!AznUHIhXb*tjSo+LwUj{CbvOF$mC~g@ldGe{gK-Msah_uXoB?c-Tph$
zgW&(z#tc2y?oER!R<a<u2+oMI>qp<S-&$TFCJG^K<ky#${;#MLyJuB(ENvy<(<D@z
zh~Uzqsf>bpLx}?Hv5%c5(B`F_09#Mw{@QJ)Pm;WGadj&~Y!4XT7jLGy6!DaM&i$gP
z6YIaMXXcR6izKi}X@Z%@M97HnK>j9Mn@0_zg14wqun$1YRW*V+YCI6c58e0N@#GFN
z$_*NXx4AaiSx)U(^M)yL$Sh#;W&!FRQq*!^u&`f7=%+3oh4wIzJd4y#YCs#=H|Xu$
z?k=>Pp1Zg%&7(+nocqf#4vF54Rmtknb5n0Td!hY4TZVw_5`-X{m&1X|=&4^$9+4@}
z&*-jSG%njQk#bd9%OH2EjLbzq{()tnET;;ur0_AB6zU%7tKzcwj@1_5aV;|l1vB=*
z!mr&c#a+VbAU#z3ypOPUb}x(k?iOyS45Y1=<caS6xMtbo_!C45bNtC#crYt?M#FQT
zR3xYdh-MqW4=C|f)@Ps6rIA`R_hDi?$E}3q*f9Y#x$Jb>f?aYP6anfes0>gcBY%@O
zZ0F;>UZI?DyLRl2LGECVsdc*S1n(E8Hy)<#UuM+LUun|CGp4?9r2ZJwL8f3&cEReT
zQRsduTW#qSZYF+f1QZIXXLrlk!Rv;#Mg~1#+y6SO<kNEXaUo;oPQ<Sgjf`(Z2B8*{
zp7<b!-HW59CzLog&WGLg#HF|EQNrK?o%I<}KF&d&1}tnK6}<|fYn%kv5IZE?e`WQv
zn+Y8_@Vbd*1evvOX#cU`4tjgkCc{&)+CN2cv~{l7i-T7~8RO50eVZedzVvqJ_ivul
zO7Fd9q;}nw;SnuZsFX)S9{1UT)2SD${O`gb$(>jbZ@}b2RepDzwtno7x*!+IB&ez;
z90Z0HW*`XIQL@*0mETR;FJ*%@!m1&2k`BB7rwQIHsHCJ<?<sZFAG;!2Lg<l>AnHH7
zpkK{O!^TQy_HbQ3h0_!NK>+6q6_M_fvQo8dxU>F{G8)xKwxo614PRjNi@zi4sZC(x
zaVRF?Ye1#;-Huy8;%VmENaETyvT@=r)|PXq<T%dR%CFpZ0tent_0&HneO%op@*a$C
zgrMT*Zj&-7^QnzhZR@PjQaU7W!RNQ*vpD2Mz|L9H;7vA3VuKrURd*vs@Hp~QP)Fj-
zozAB}{?=QI+w)7a)ChdA4vr#TNaC#sB6SD_VXJ;^L<mjttkMmBVdOaPQL4@{kOj?D
zf|Kw+E_%P}F0n!t*>sDdau935{9&<2&9%E)&NVa#^*UcCKBcqq_Q}w4nm{d9O&iL)
zuwoFKtyPo=&sZRN_*N=VI^b?Z6Ii`6A1C-`)kXnvx;WSvYS#F*Lryx*Kx9-kC#-9v
z2k+(dGj)8G<`9TE;J_0<ZgBi5nv!7&r}n_|A!O4<GoG-_YIK*oU;#o)fIfBX_`yJN
zGqA9(^%Z_eTBdDxQpqE&rea*bBA@-isU$gp71l$(ga4J#>Kaq{E~2T;nIX(|;M9u9
z!|b56iriFS+iGZ3x}#Ir^)s14F>);vSp>fyn$t*z^nNJDwFRXi2K=Z6gh|sT$sFu3
zuI-f@JgN<aviL%#y&gk+eMfGITmDJ$RMCdNU>*+Tenn=nnetD3&0OQk#BnizrT7ap
z@?zeuLRQdDb#2k2VYcN$JiiUk<O?Xe9!he6s2tR+bWo_dgsiTF<pj+dP(6p@RbIXY
z0}eN5Y`dBQCx{3pcY`*Z5We#9ne7O=U|kcyzO$}Pm%anMVR4&n-_`puLT=9g?B|w&
z8;>BM3X>Zf><ivYqP^go$P)MXN2#<=f3Zi^h`$8YTd?`=GkZr3br|UVeAqE2cFus1
zNQi1y-iwjp9S!;etl1bd&5WT_3e?3o9Vw04K3^N6_oxa%Hfx!^SR{@BwNV7D6+G4A
zIj-8^s{qb&0ID(59#E-aUR}I*xgS5tq<j!g)PV*=9Tbdlj2eNLu(LC6aAHsBIO9g(
zMyn4O4JiG(-czSfuwR?n0>=A|aMBDsn?Bl-gz{jgBk&oBWqZ_5?@0}k2Z9#KZb|4m
z6L+}*?q-%e@~e|rs<3JK=>tASs<wJC))m+W>6KVgPX>OYBPAQ?f`Qe??l$s<&q7Fy
z_Lx0e2w+*lNO$SfOP{yoqp50`YuR-AEd?xoq!Iykg+~(rM?kp0D4?k8#Q*>R2({#G
z!v}Rb)c39}QQ9G(U{c$MP~~WIx|EZ%2;;@Z<zG$VO`A^A$H}r6?_7N=(bBY)9N;#(
z4pKhXJ|*6j(8*j{_=y$TAFH36krFW={L(2H<=hUXlkx&+FnbowTsFioSe5-BxVeu_
zR#m3mC2Ib9uK`$l3xB0i&M)Oygx5N;SO6MNr?uk2A}#N-E;iBsyyTW4$th$6u{TeV
z!Q6=67usi?sZ*9&fiO}ZDh4t>)gx;uxNRs!dKGe{^>V=xw+|aHaz!bVeu)^}?@r^K
zX6vU<=>)MchP?feY_zpvh(F<Ff2$QHn}bhs0L;}E<E!@qM-8{1ujPyq@MBCvN^;n0
zV@ioI5J|pOkPBC1b62IF%mjn25&{k+mMtE&U<{om^Xu1KSp8IfVjob%nB2pkHDct4
zzlS7+*ChG*!ftRzEep}NE7jo&_7$8V??G5}q1EwJ7_gUwT=;16wXgpJF;sShEi1?-
zmp#n*ILLy_gpw%wN5}z;)NTt0RI!2rv@O0%%`HS;Y*A9eJ(3vGbBrSY`v*{V0f5X=
z*;G{CZ_*LfvzY^NZg-VwjSAgsEW?He50=05R#H^vEqDsRNG%V#ns8_iH`2GmVb5|k
zixBbObzko)Sxh%gDt%O3U4~Ql5g)7C^te`R4zfN;f9eK==ZurJ51#LV7@$?U;4CfW
z%LKh2?(fhwo*Feo^oM^K!3%2mfuA9Q8Ay%{h|@KhAB93N>PieOFa1mndA^jQ2*4gw
zKKuQ{VPk`tK)qw5fJD7jxpY9D{wdgFIk!7<=E7E<LuEf3rHX?aZMyNXUF{BDg~LZQ
z0A3pUM&dQ}nN@j<)6kNBfl?8uplPWDCxV>i+bw;x${juWiZ;IV!?exl7AgXuwpNQN
zZq+rXD#5aM5;jcnpNtr)PmKIGBoVg7k1~WwGE6isQ8|e<O-SptzuYd4xb55z=8td)
zeO{+=$DtL31Tro%p4})B=3^t)U80JC`*q;f!uF+N{aIOPR{~FGXi{$@>S0mMuzmbY
z9N;a@v5@>D3-j>DgbiRVT7N@e-mD<H9(9U!bqyG4LnHdK$Q!af$A=k>ACr+BEFh$z
zx{so5_CkGV7W4x;6#&o)G{B=)ssPF`#1r$+K;?9Cvub*awUcnS3&HV@IRqgSf-|SI
zzkb<pMZ{}J#30GL{jIpE#Wagz%xOx3@hK~pT)KrdOr(JzIAP@v6OD_-;+N+Y2!T<B
zaa@qUe<vI&*F)ijCsO3Xfz7H9Saw05J1=AqMBDshK!O;np!{C+)^#j7P+(FA&Z|+V
zWW-?=c$9^KjM6)ba<1c<^Sx|NVWgj$Ciee7aFQj?0lnR~)Jj#B4F!iY!N0gqzzM{E
z1Q4}$4gq<<rzgn3$CSdP3B<|S6ebiL!WJqOKA^{W(`HHceN&Utisk?dT3R&tchb4-
z4!a@(d+O+7?r=`f;kMwh#Hs}A1@)}gO2*AKepOKZ8s21lmzG7`#iB}%m97TaWhhEu
zU8I4NUM!Sh=!<r?^Lb;Dfq!dPll_83H{+Tx{b6RSnb4fOsyP?mbVj;JJojs_*qQ@@
z=0ii3Kc7jVx;B6MLh4tF00bvB>`!ajyAZf9&hv}SK+d)dI0(%a!NPOIEV|VV{Kq8&
z#`El8!$$#<j=nbALUKjdOC$s*^tdvHhTP?d_A@W+YUM`<Uqt8d0MKi}t!VUiM-lZG
zifP;wjbCbA+yNe4!zXv=9`X^_3pE?J9zpEjS99HFe>B;%+i5Bp<-#_~96jLmuuDQh
zqi%y@=%qORI8!PRr+6(jqX6=H;29y<I-f*J$FEmqq;-w8so6G<?UGK+(4Ch^4cQ^z
zrmDiv?WH`4xY^&fgM95?HpiAL5WRv|xCscQ3u4*Na_PaalfCsSL9Z2;4iv3iXh*AL
z@`>okK(B;}1Fx@Wfo5GU!gAZ+`#19Uep0>5>u;Vh#w)J*uEs{}#VhRT*a!+G^i^@M
zjMPqosXjXrr-b%Y3~AY=87WXl{w@WjnG#O_o(uB`z0oC18AT7F&`cnD2U%n`IM0FC
z?<O^}*S-rZ=$a#o$R%_s_j<^FZ%o9;@>#p|WICu>rYDcx9)*L04lXbuB#M_J)Xbt<
zJf~?8%i}bRx#Df5?ghP3@O{%p^)mKG!tZjJmVf{N0BjAi79`^HFvu_GbX|n3oI6B#
z-y>u!P<%oZ_tXUjtwqA>P)xA$LV<&MP;Pei=+yA5un*#GS;Wog;VHj-_@-NM*j&JP
z7+UBflo_(dXSZv>a+*r$Oe-Jai<q=g0Zh^++ZN#Dr!MSOIJry=Z+hNT#hwnz()RTK
z6v#$^cjxq7jkuikp{H82Dh9kQh~NZW#N^6pG!dF55_MswOg08Ofl_F8`E_htGuM6C
zu4w<I*t)mmw~5cj&*<FtdiRVvyQ*KA%SUUJ4B#+q7QFr~9we?*pJTJqLH?pak-_p-
zVY~*g1CyWJt0dbm)U(QrX<watuBtA@{_REg;al2{C_ig>U*-`GMq2#252^MrWdwcD
zO@JlsmC84<4$^Buk__kQf=>aiVud%ztkAzA=Yb%;-)fcUb51!?heZZqC&(dr4f+J^
z$l+!Vxv06GEGzSs=n^TV#Hadh#|$(n@!NYB4hcL_>lE}1{Xs4;WBiH-d_MgCzfElQ
zb(E^oIwMBYfM7j9c3NE<{fM7@=7BC6ozw0|Ou5XhVKqavQpVvnJ&-{;ZeMV{NF;AE
z&3H*L3Q@|!oSqy#)O!1RCC`L6?N9S?6SEk(ZjL>Zn|==sdtTO7qgOVtnA;g8QwYEF
zY3)<+M0j*GB0!s>-1=oB7YG3<NdQhpT~QxZgp|i%+lopayR-imWcT}7R+hI3*IUYm
zu5zdV*G@XV=mqpn`2nJ|3jxGgU_pG$eL0FIG2;UH(^y!vzTgo6D{GGo^Ei;PPhO6>
zyGp@{zb{x$Z+c4cw^r^b&MYElAA(p;_84A@XZHY*qOf&ERtP^3ZvxkhC3`qGwrSYA
zln9E&WiNOi&lq~+jpM%+kNDqg;V6lgkzG;@H(-q}Ag*+>{KbfC1*pi<8yyuGnW<cc
z<(9$VqU$?NdxM`NTsp;YJkd|>mOL7v{!M-Tb*oN+A8pKnFXOU?E_5T&>F*e9ZDG?L
zM=XFePizXHA5CD|-8acorjKfLe!&@3wR$Bd>2_zdUK(OPzhtD4NQ?LU)2y(i)Mk)q
zC=iKj!pR_CaBIm#o-OpU2Ft((PU?ymbmi~s7Bk!Z#{0#dJYTaD-@bsmk4<e@B{r_6
zbDvV>>9UL-onMG6<(i~GoUE`%L9vWGYtc6M5a-81S}rDAf<1M|JRTJAdC<avksu__
zB9}_T$VTTvU*juVS#Fv=%@~_^ywWlPv2)ekbJwMA^wmon^lDkaeqCD4x|0JnJI{@o
zS#JH}O;CTE;{sA)+CF#Lz8`%=&hGfoeec7$Zgw#$jgN?p0SkO{v~59B0J@PO^5Ltc
z`@^vV9U*&Fme0(q<(xzxNtUic`EMh$j_Hg|<XzH{-j)`<pSMh^R%}R&+VL7=PpX||
z;C4jAp4R6bx}Z`#Wd&lsEottnU7<P6|B*28W-9T&Nl5KrZyDDVMxY1C!ikWoUnzg*
zTXFec8uLbP(U!YKS?cgy6q!cFq344LeLDeFAAkU1aqR90#0f{>`=9kqVZLNWj}02}
zoapvpK<U<8kEW7=G&J$tm$ZEieS=i0FOh=tH+DQZEp^Is#Dn}0M90MJWYDbv7m3P~
zRRp5|Z+75aa8*rX*QB_%k2IeOhycO7oT;~Dm@r2~mz*VWjbZ+LQT!0p5eCML@Qj}A
zgV`pBA!#y!cql6&<jBnzVe%3RMi^}u$<-M~E0#w&v@TPXSAum`zhGJyS<8dX;B0AF
zXI>(c+$yDiy%Mpc8q#ijm`~53!=&^Z(L_5!IaKv?+1G#gXV6UA@<^5Yir#tmUHlwX
z=Ptk0^ER5E2WySug3(D$H|qsKkHEw>aexrc!fJ3ekuUT*PE=xK@lvM6`*z#WzRmvI
zbN6>sQftzfeycDyjbZ_sMR|Yn=c*hh!cHFQs^4jsDI<q+Q6nDYX9hB-qMfm^*yp;O
zQodSjfditkQ=r%TX#Ic2+)&P(SmhdSEcbbT=>B_J^`8fuwU0gZCIZ)Vh1AkF>rPFf
z_FAB6jjosfqY328Qz43kzvqGFn)%TxMd4>1LRLsLX*-Tzi_b@LOj+;Yjg>Yn+OAxb
zn_PKd*G%V&Z<Gzi5T(?S6&S1nx7hdINtl|DWByt&JV~bGkjjE75)YGAmTrPoSvyQV
zisxYGW~u+z^Jv(>+M~AY>J1@+TXr3ZveI)$@>*Bw06J;ME79K_bsZ+}vXe755P2na
z5VE(BL`o~pQeG9J45I-9ThMzij+y_aC+zSND&z~)28AioetdOYp2v^?005`qA{VrD
zgl|u<WMt0MUEN%2d$OFQe4)<yQ+~gax-3$%vYQM$B=`)jw#;p_?MgpB7*QKvN+boF
zrm^z<_uo{Sdw4cQ#G<|ql6MnI!X5@+gp4V^(Z9RxaH`%5O8Y%pWU0oVAioTShB<M}
zVe2pS(evTl-wJ2x^9Xvaa;waU{BO?DyJEe4-qLMADlm9yvvgfX9XziX;xb8eUNZ;8
zNv1;sLzSATBM5j3;Y4k*lC5V6An&NIf{{j5Nl||8k#dth^J`fmWDs#mvLj95*WpSE
zpAn&fyl_nO7x>gnekn|T5*}@OaX^5VWQ-8Rir|(bYg0oQav&qV;~#*)Z3*YOI+Z4b
zC|kM{i8dnAz!vP@xw11T`_bhM@DT?&t2=;VY<;oOXzX(ahzLpqf*%wEwOLtq{b?l}
zn~qN!wz5nzj$WSma@lkN+4Sz|vXL*BTw?q>6z5Yb=#zo|F$S~r5f(tgPBIwCTF;&!
z-w)Ud+K~Vc;h6A|I)Bh_3GwRbrJrk#{6mOD3#q1HuOm@)O5-MpSWN%`s6=(hYPrKj
zRV=QhDs;U^Rlz7TSYS}UD6xmg<RMq@?`;<zl`VRGauqcynhYv?KSTj3VaY0s?vmjT
zvLC7twr@J@nlt&Ha=NC<v$lM2Q@fgD?qs6O(Y9!bB$fb`;eJTF@sRTvq(CgtLu-Yj
zwo_^ZVn{sQQ0fw*-hJ3n(t<-m_Gfd*N*>;8C{O;y{=L*lnNAuJzLx)F_|T}=z+`BD
z?cnSRqrX!(pJD2iE`kO(+kSBzH(pL05kWehf8UcH|0d%bbKkoQWPV>%>CoOm7!Z+C
z4=QB)`s96pkP8aAjdJJ%YAk;;2Q2!;tvgA2WZ2)28%7MQ%}jM0(+312RF_sm%0AY<
z$I6oB9_5(y@snuh0I$^8ZJvMzE`mR64PJ!GsO4sOY-?pVK^W6Gk*c~e26m-7fyTL|
z&7==q?$3zGi$8F9_RZUQSmOYy?&~zN$tl}|q~;O~u7_YIY@^rN1LW>&W)7MPvS5(h
zLh_yMh@eQoWU_CTCnUOO3jZ8-rnl3He$ZeXne|27#p;HoudX4B+=q+;QY2^&qc@qR
zb#|~AWQz=tB-9g*Y_$|8^U~=PZ*Bq*ANmA+F2k5#x2bjPgk)#s<ezs4s$V!A-hb>c
zgz56?L6)pf3fOFmKhvZcSIC~s8>BN{AV)b#@!2Haqj={3?CEwgwaGrRc%2n0KVHj2
z9-z)Xvm6kq1B-YbvpApVCwE-3VoeNNAT~cdCg{3VOwb?qYYG1hIxi6RyjGabxLiH0
z*$fW6=R5}B)~XE2u1yR|JZD_UpNoJrOR+WAH||nHTxHSKN~6w{Yiq-F9OzW8&EI1j
zpo_ut7TX33(VfS|1{D1ezY$+Yt#}dZ24yIzr!$}W3Kc2Uy}yL&3Ji-y8eS^MSQY~2
zj~937UH45@u&Q%<luH7#D`yqKR%2;Eo~$pH$Q$_Kvd0Fc2E6WIt1TBqeuj|>8+d15
zX@5SS+#@~&5wk=q#l!jx_H8@Nb;EnJYOa6M{*_;<C$OTL1P2`9rOau0HhY5A)Cvgs
z<M)3rS;?qiG>NVTs)`&0(PhAqN6ut;VTJ1<RQkmYQ12KIK+W^=No8HP$5zrtM$Ok|
zu1-1^AX(%xA;u|)x%rqy2BZ<MjN6wM6(tv}*u{X?lh7W=C&Q$bbmlVCoXV2){6U3}
zl}1}&!<@dg2C%zZMyj2Xc>rj}6vFnziY(Z6YyLE9w8wE6bc`a_%v5*%HorxB|Lr8j
z&OeO8Md9AnjMF2$M*A0+OK@I%jpwF(XUF{L?QjZj$t2>(Nf^J|ImceUR>h(nD}~jP
zf~%S~)I+|ALYBuo>vmrotT~>x4aa7ar+zp>V-^553r)ca_%c?@1!k*YX&1xPd`^0?
zbUiT!4_A?tK||?<bm2}s+M6~tpF+u05;EK&A!8)cgmXT0WS@+602UB-5jJq8kFM?<
zwtX_J4QYeU<M18Jf>*fXeNNGh@+;Y5E?SE<rR&Vmib+3G-t1yXEnwU3bCM^6`aBF2
zny`6xMU1rjg&&6ONRF!A8VK%|z$4Omf=f1eTETqkdOQA;{+2+r00002Gn>d(8wQ`M
za1{|osWPnHJ2Nh;hjeyz5H%M)cRGt()aJIMr@`=sQl?5k&4PBMgKgG1jr$Zqu!^>|
zmsg7D@!S1j=m&5|0$A4WjSrN)l_S055IxdnJHansx=@#`gS~OF!zqTT^Lug*nP_b=
z4zOOU)%_N1%d@D2P<#&vRea7MzXJHZ){r~N*71|V^uMMO8G$uEH<)FlOg)<M+UK-U
zv@5M4PVFZl2h~R0ZB{nCgVy=zX8yJ+ti9Lt@`u!U$Xt~1a8s(`sMkIVrD|0vB}@Kn
zb*JYts9KzdhR^H<!~Z7cco-o|twrTjtknwpN3ht?LUX+7bzNK~80Vr7Auz3vKjqEi
zgk-{B^@URMQPOlOoQ6aYU@^Vi@~M$kzMj^6=^p?SS2%kSCvaqX-62!b6A`Aoe$x1!
zm+Cm_GHXvC=)&hJKwGCzoSJu9ze^G*lMRfgxnHT=De8uLy}x#9Op+bm{QzOAbPB~Z
zUi1E`Z4rR8xT$rm5?R%BFw+dq{LVKsw$#LMPIcI9>IDfD%4;#&&v$=PT~2aDZ^<X)
zV?f4Xn^H}dgGAzF)ykHrTJ~)2*+)e)>iIzlsEh5~8*S){?;<;-!)L5_e&jvKpBFUb
z4$POYn%O~gc*h#cR^csVS*MYZz34h{XjIz!lQsZMp+KX?UNmErZS`$Ard>Hp&4OGG
znZ|qt-+m57qAHdKiIzTB6M?l>{k+Q-u%m}^McrT<b(3t4-RokkG~Q!rY)lC89W<-x
z`jqlUD^r+4f+bo=Xg$BdrX`RkAUyRrZ<2TfVRSU1HYABG@{1tojlB5uCu0AP-q}x2
zA7?4fn$_9+=QX%a&#^tMloh>Y6p03DShhOj$fY;-0aR2z7v>8K6(}IMoR^>eo=Slm
z8N08Yx4RtCZd9REMFd-K^=h$KHlhB69i+?3j9T+;!!}_Q%1eO!j<j+P+JxJ!Z0cRr
zrO$?VNJuYMf$m5A=MhC%K$pYdmozzzKPaPXn`OV0z**VV&2&zI&OfrOkiQ;ufxWX_
zc`c$x*3nUkDMfoJ=8V_H3Z7sf8<`lB^XITELWBPJ((f8p;v@!tOSWI$<YON*x}aI#
z5pW6VJ^UP4#RtMPaMnwfCl~PIzzKH%067&Uxm|Og1k5{|k&}t;--wS-ZibG4-FatQ
zBG8_Fq^BQpu&cYho1{r$lKt6pIF=gEr@H{Wd)VyLK3%L&yk8-{!k!kUb#QN=Xkjn}
zd0IMp&=Vdk=NJFR3-&QYfR|6UpW7pnjd1KwZegeu!p&UvJm5&srNHn8q4VtiUOT<?
z&Mn2|JL`)Rz=NG)5pWB{@)GfW%Qi<2AKl%n1_OtFjA>W8JS_op4zhA-EsuH%DegOe
zAAw68!FfHY`v*whBcmmOtK1h?Tc@i1pVmg7DwVX%l;?S=?l#I*uu#EyjZ~G4H!;Iu
zlg~z_y0e^aAT6Fn$D8l)(GvX!cEC<5t+4e9vmzS6*U}Hv5JC0%N&6m)vE*tl&YZuo
z75m_b0m62peEG~9tWslUB_#Yvfyq2x|5<N0^DIQn<Oa^A+}9h_J9Lbg2-Pfo+7HqX
z!ty8Vkj8J^%91y86G#nxqI*(n_y+`|jE#YcVZv)UKX3{3h6xJXJ~;I-;Q*o7(H4#1
z(__^^UrvivZ)3tJV7ZAO1q>n!evX{U^gdfyE63wN)Bh9vQ9^2lCn2exKvQ@wy<M;z
zRinYrH3d_B4(cj;G3ZSo)W;a<tetch#!*x}jbuMXIDLE0HB_$J0000v_Nq$~WmZH+
z^4q;|ALsIAS*a+lD-!E*vkkOj63=lyfPI6WA>duLQ>vKrp{t`&MFR+}UkP&36-q)I
z)9z+m0Xo}O)->S>UIXRSORmElQMjLhOkN-Nq^LX(F#l3D9Hh99Y;H|^S+9WZoR4J^
z`_i%i=X_BEl^r6(mNFY;b>uj0xTQ#L`_cH$i)>Z%lGNnxtShyD3i$3F4RLyAJHrb&
z@q-hux|#bP`nzREO-r3nhH*B3Z?S~meWbo-hjzQzZ#^R66z2j4O6YCZc{w#WnYeYc
zKndz{Sg+w3L0OA_Rh`bp)B&eGMM;qx6NwMAmq9zPpNh8u)2zWr0!C>536AY{Kmh#Y
zcS%xe8gEnPv>lvx?>Hey!Iguk_g+xwxHwYZ0U4RN0_E)$lk1y}uOt@Jk%J#s36^X3
z>=a`Ez8Y4=YXgs<G5J+$ts5v(ElU>bXFtkcj<&6F&g=pFV&gL^<>#WUz}~z2aB@;y
z7nhJ+s`yb8oLU!UN>n=fbR|T#B=RnHy><l4n0(4Gc+LnLDe`l;p@ECHqlZekpEh<j
z9@`#Q*kx9}JCw{=zggU6D>Z@F8lt58j~I`#DGG}W`dd^=WtDgw?Blk}aq@6Ve40#!
zg79+E1c4rRh(~akMMEj7`r211Jauyh^%ME__aE2wgY&t(v0{Rc?kM<b<&K<NW@J`@
z7fQ2=@MJCVw~V9KEmu(>QDE$9cRmqW<;9^as3PjtU%1)0|5bq9#ye?fVZzAd{_3s@
z{9Vgp-{G7nKqQb1&@f{mpg+eyRnz5>X!<E&9y%LWCUA=JBYius!wbrvJ+z6AAX-a(
z6jz;}y~8zb<v=0%r#-D4UvTWoM4N%h+Qc!taH)+4b)=yQ+rBLq;{%wC*Fzs0h#z}U
z`#IOGG-Hz;2&zdiWP)I&0!eJKV^$s*Tpx{lii>Lc@+{F1F~WWsPb!jqz@&;0^0Z1C
z)K6G=6UYRt@67Bjp#8&|t1lsRdI|gdW~m%y&51X~b{+oqs-|F~_@c=j98;8O^#W+{
z(+t2M7-hZJwj&WS9P*O5u?SgiczRO2!$Ykrg}+9>MV}9!vi9R}XqNn<_iq3JB1hYz
zw+FLeO*zUu)>79(9-r~{7c7`tXin-dU9~#Jg*r7Ge;&Nzou6tWH@wLFJNC&ErrVa{
z*3HuYUjDZpOp3`5-ThAZBS80#R$!9Sl$T^r_8hg4$!)d`t?wx%z;x(fr3)rfULtoG
z4oHkU014i_8EzXvT4Ny5X2wsAbDMxr*h*~nk%*sq8~m^~!$foQ;ud^`9T&;fr=mhe
z(Rp`vw1GvyyjZW0Bw-%Z`GF*@Z~PE?jo>Kj_PwYh&k^!Eitlvx{F$Z=hV7S{?s8(!
zJiWqrtKSZ>Uei71ySaH1RYTVLgNdmV_|mWsK%p54TaHkaRVrs97NA<;;g_CD^xn@l
z%e=!a!A3$^9c_khb+78Ij%e0EFLx&@eJVAWaChp>L!0G4KtsDOQH{swPtrPFw$x}6
z8fZ8*1zcZ-4$xtnPye@*SZ1+V4kZ+jid=nm2O2^r3jQvlAl!R;wGLAtM|b#a`4BDN
z#-<~=owsR_dU){b&ij5<0HwAyRgtku3W|zj9HghIW54s!17bkDSO%?82&2B7Q#Y_K
z6NeEu#YW6|vv~Ypr;g$<9x^nu0y*W&T0qx?eweNi0=x7~_?ZQnA6Bsx(Iwjr2ho+5
zC#nW{icuB*)BPnR!P5~80<@Z6krKoyr~}Ia6M1Z0vaAk&%_*NZzIK``eB>efA4>to
zOLSF-bzwH2dPh|Z=vx5a)O{hzcP<^tLogZPut0E>x&#|g6Y~@9tGrMro*1hUEpx7T
zaub$K(oFkB9m{oq)gJKs6}oJ!NGhMT{74~U&bN}RM^1(-^QKx=mY`;sXWn1lNDY5I
zS_BU!HP05^Kekw)fvIUfi_GQ6x`XVa&WBfApNlY^e%^fyaWo&rLT+8!rzT#_z_f1F
zUR$Iz0000TM$thQv!E=`^QW-o9=e>LVSXu92_NgV2)(#n#}ZeQDmm8<=N$XK{ymx}
zQ}2D+(ozt^_2$H0JE@7vU#{pD5Eb&|J-U9qWxt~0V56xg)m!_Tng{9^m<hGOlQ36o
z=!ZL%?ei;mv+@+?0lt8y5QAm27P?ba3b7H?bBt@r^38RNB)lY9u2c+EII#o_@-nFT
zkKTt{5NGldH9*O@C#(>o9sgJG&jfAukQe>F5Z!CU+yc@}KwxQZ%x`MrL$N>EFz+ro
zIb3T7BN$X0eKW8u3T{ldOo2YZLQ!rLQ_rJzEZ#<LQ7!Hmasf2wr@(X^+K}|wgjCk=
zv~#zJQz$o{MP`4}^=}3lASBnhe<*nKn%7dSl!2#ZmVjFb3J1UVbVfC0N#8QV?2c-k
zjtKW|?;mAWW0?iIFclP<weF=}(oaN5zQ5Osmut+Jmh8pz`yvZ9M`MWk|6}}1Yu2gn
zP&C`Z%M3sW!^-xkf&oA<fMZSnkW%b03DRd9(;l7Tw<RFJRuUdaEHyB&#d+GzA$_+V
zrXun8-Aos_UdU-jB>h-2sFSpl>*N#SV<FNsn!F9G^t=o>^^zUbLX=qzSQ5kcn6FA$
z0tG+ZTn=4Sw`EGRWiL-el*WCSrCTheS1T>SD{kJ-wY|0WGxG(Y;D>4?QD-FXsz>gf
z)5AdP8I}z1N;Nlj@Ko?kQT=>rCue1c+BXxToyU(*QbL1LA$TrdT#T#^0zo^%`nm*N
zWD9>mYlV?ZR6@qm%o16oY=G0(PldZ=1U?1(SzNx#`PLHEVxT$3e>{^L(r!?5TzPGP
zixucWf%gGzs7!cPfJ75SZi)tIQ_&A?j<(EJ`fwb;x0WN}-iu$rA`dpsMy9T89)$$=
z99n_3Wyzd~`v<dAHWEN2aE<tk<|CqlN@N8!x4RVH)gC#zboVF6ynOdTPndS>GK5SE
zOg*3MaG4@uBbW%bY5XsEj2LHLRkQ@nX`+ki3g9wIO?7OS*Fd1t_vs7nAR(9HK2#dI
zjd*&*%Ny)Q#j9~atQMu299k^>X_fPH+rofUtF$}x!YMev*#92tK0lMpeD=v^Qlm9;
z+5UU8;@6Fcz?w)Sk{4v-j}Pp)hC*M5`iWkg8}cb)k9mn|{`zahN_b=5sTLrsM1s46
zUuR_qcOVIjQtak@XMsFwTpaR^?3wsQiZi0dXUXr|ta<W&!6OMzG#;ne|Ha7C&&`Qh
zF`WTqG{H!U#QG26XieP*fq|W#NQ0$vL05d06dvclp0Hlgjp~7*Mu!?<NVuzjrtu+3
zd>SWY!|4haDy-WjQR^KA&jmhHAzV?SCLaCs1F$2v{9z>F5C4@bB<~5q_kSgr@p6hO
zfKzDBTD=T_HFkivd3(|v8}@yC$m=DL#SPn5R7$+>aYeWmvHia3&u+uS9Gguwt1@^F
z&p$)jfU6(8TL(k8Z&az40?DYdEPiJ6Eyxhu4;|HZpT%t%wzl#6kB}~zbJe^}h>my!
zV9Qe;%Vryy$=<N5$%%*1Au$8|5(|*A9U_i@cEXAZcc8ogm?PV-ElXZfj#+}-kkz^T
zV2jnQP1s_2K6>t;F%k^4$Cfo%xi3{>H`Hko<Mt)nmcQ%d3MEzLN<<@I(mP_<xk*46
z-f3Kx4N61hAj4w@cwR$E=8oqdKldsVCOm(YtQAj<d~`<UVly3-4R%4^xs+-2+fX03
zdjmI<AB8QiGI9{_c$U?rBg<h@g^jn0uEPfnz^m}w99c%FEoQ(k=3sbRbWSBC=$Dg^
zpAP@F8ok|xZ)NvNnUnD*7w1&916p)wNn{bM%?vg%S(ki+0>6axBj3#o%5z2zcJ-0$
zgy`Ns!5jvn&9<q-?YOtpjh1b9YIwew1^$cfvI%}!li|zihgNu^mI3ArxUwZiyK@FM
z3{S@}nVk#e1<|LH4|2e^7^BElmVBjWEO1a=D5vg!*Sfp6ADN3FV`HVz@R6~)m4U<x
zesQ&BO^hdwtwWXrcR8KE3*R1RWQ2qF4*Oh8NOK9!Gep3#^GNK-5q)U2B*X6=oq(J5
zS7ZDqe7@ylCdtYrh;W9MzC$kOD-LerRP2WyEyv?ya~0oxeDEGR?5)p%cx2EWz}M_T
zl>U(j!qWySMp_`yrX0P^&x{zz%IwY1aK2&&;-f<lGB>m*x+T!Z3(FbQ#h8N!NmJcd
zZ&S}n0{AFcW_vO*D$G~wVw6$S<-M{%7MG~QBh^?ab&F?#5607XbeTqcluT(MYNJsY
zgT5iCy#Ac?GJ0OT2X7Vt!hiq(EadnkS&l`dni8_|CZ5^-f-7kKaer-8DJ?q~nC3#O
zH7-=-`p6)ybi=1Ut^(1#SM*t*I$Ni>l=ukH>y0k%dLPa%u-JU%ZOEO?h#vv!O4l8Q
zh$lYtCmYm?xGva9^48K;07@<5bopV|%?oWBR90TBbMx@Mq{^a;l{2!)M`UyL7Ln)5
zZ5VkqhLf{@f!)u*&_^E?ZywOo76|v(;>u}4xO=}?lR>b7iI|?ylHf%v-|`Pl(b+pi
zQw@)FWwaeQr;YI&`drCgF<XU~)+w<MKjgY+<$T2zJ8_lRf7JB@&e-Fvz&a)7n-0P7
zQ<`$>lB_|m8_oIcIZdyv`a?DEvnp5nbTb0>u+U5lz3~7I-5nybNwlE1x3pA<?|@n;
z_;Lp5X`<q_z5+B?vLqLKJI-@SIR=SV$Fh0n4uh!Od-Gfp2s;hNfM#sTX%ve0d|Qw5
zz3{uuI7d{9K>)ndAId0E$fkC$=~%XR+Ms<)aS&x3d%RO>>Jfltivbi5t*UA!udIg?
z-hd&vKJdwP{f;$v@5&>M`;C>rRn}z9Vyf0+fw>?TW?xf(ft@|!4|kU2i7uQ%HA4BR
z7G@tG4J6_!2Q@SO0C!H-fF59Ry&s)+l)pvAvPfQy^|;f=vqncW3hMJEQ%RJ%Bg69a
z`|dxa1GU>$x1PB2jW`foMZHfNYkQ(`VjLk=wo>MOwQ(z8wmIh60+c<o3CG>GMRekV
z_m|0RB5#WXP?oyPD`HuCs8_o!ze}EBTlx-I*bJ;AUiTx0s2Wg6zyX9n*B#g2C!EhT
zErI|tOg!Y-MHq3DB|v_ziSb@Wm~i}2AQA`0At={244JxY`{S5^R(K@ny8`LT-2F9u
zG)6be{4g&b_{D`%8If+K%d#v#ljUByitWX~A-*rje|y!w-U6c^JWKuMw>!elblRSR
zjM2l&>0gUzM;R##L;yA&*S4o@Y52qkbjXvdL{-z*aDNk!wOS+Mvm{5%XqVnXJ8h_#
zHk`|6cR1;9(j7}+*V{2UjSV0hSXaFv);=^-fE|Ss0t*!QWpI7k0fQQHhl_d-rMks+
zeYx9eu;E()MkO7&dY~t5{SA0{HojE+Q061G<o*ofdm`DJ(dH`PAx?~i%bl9VKeHMS
z{C-#41PGjYjKFiz61Xhd!+%16OJ#D2bTMTNU0z903~Hup`4MN`SLgC$oX{I#bc&O#
zN2`;jxnrBq3A1wRgogd*c!tHF_2un(Yob@Y9IQ8n+?G@jX&5PGiFxigh|MA@Oe-})
zQU1)SeJ7zSXkuA1=tbILF;n58JtZ)eS{3Pc-NX9DIYE`u|GS1{e@rm6VVE3g`*0Q$
zy`)0DfGHF-MyR|T3SY<j3F3T&cusH_n%)X_)^iC2o<8c*9uZ7B!vd;g0F9`vx0-44
zb&603%irxOBoP4&f5GgqRl3AHO8x;H$fQ~P_8@yHjMw<7)$eOUEiZtSKqG~*mf&@J
zD@2vpPw5_eH!gVT$rMdNcr4X~#Nv&<zIkkiU##43VNB<4aTP3QGwf%{K49C%J};&J
z^%{$j0;ie2|4X+}0}{b$HLG}_8%JFsdRFY(iw(c+pQ#7xmB9dW<U?YqDf1G{bJQ`2
z=Fn)YaSeS84=!A0fO{tB7rd35R+=aWm;XQztI9TXc%HG~(`$QBB=id(eUby`Ig2{E
zJ_-Zykcs8L5#sPV1>l=b!rv1h$VE!cK#eg3Y?EUd(?orQ%B%t_RWzCScG#pc_~%vl
zLHUJ<tF9C)i-))z*XKxRIw{@41Bu!^bliX|hKY+YdK@ngV?ay#MTU&H|M6zxeBXt)
z2%Lt#L&zSZ5`Pq4y3Qk*TC7$XX1)lzE?_O*0{-_&6;Bt<M5nGOVB$sVw;6VlrhxZ^
zQv~_~I+lQ^e{S34?f7z4&5&d&N3fowaZ-Va36_&<SoJW`)BK76<C_-Ku#db)UrH3I
z444r7msxCPomTNjg&OtLf5u;n>sytA+O+C$TpM%EYCxjhkJ%q2@U`>%3Sef1P8N9c
zk_?4a?E+9*=fsC)s303*VpHR}@r@s-#t3nE2xxf=$m(G$+gdAe9zt1FABHZ}Kq7Av
zf!$J~e@zvyXkQ2vj+|+YRYy*&2a0HaW=`|bx#9zu$6O6usji&R-0&X`N%~fYE)oOy
zZ1y1|Yg2AzH&ry3IQbBMkb9y%KHw(5-2KbUb7S{^klP8`@WgZ+cA6vzQJM-@X@Gcc
zJGb*`99Z8c<@l~#<%Uvh-&J+<snBV;T6ZMf%4f{Wq7hd4>P^_b#CSviz>-k^_>REc
zs0{6QWZZ{3ktb~`+2$?G$IinQaxcPkD(O5*8Y8x<3?F4Yqx(kpQU+<y+W^h=|9{+d
zHca&)Ik9|rr*@}%!AB$dIFFDV5u8<NVYuyKg4UspFGb*W$^r=FbwHc#i=$E!8>b7J
zbX1<mX#S5Tdh4ca<KT&4Tp4H&0?~6@e{9;-iQ211d1Z^q8v>rg4k=hL)AXDT#C{`d
z<CY16ei#gS$CL^PEYri`k61<v6W1*yqbfxh{ArG;i;h~7bCy_U^qgQ@QFw_sqg1Sh
zBw@4X>&ww*nJ~*oDFZ-ww(8%BG#5N@wEwX=92RuE{d6?D8%WQt^^*S+TUk3smq$L7
z=PhMRPg0y~M_3fg>*xbI+M<*Zf<v-$-!mV|scXPaVvcUcUR3_1mOsmHdb2Q|7(V`}
ze(*F|^0-sdfaBT@m0=p7W0+$C{4Re^dcx4rI18=?|6aFpf5-p;5o_*Owm`Mr_1rPl
zHTi6oTnXJvK}EwtD~J9#LCsbxsA|uq8ap&pLeHmj9-k*oM;McA_e3$BhGl_-mO6R4
z!9M#p7m{v-SvFBmk{H0$YyZ0%_HxL!=>(l<JDJ4rGwmzwI3j$IHc3d@7l^A&R6jaH
zPlmksgM6k7=W!;87?DcJV@wV8^b&M7F!qxq&=T~`ya#Sd;T{dnZ6n)RT1{+BX|Fdi
z?P$jcbG$tW?@ojx^Gpk)CDNgiq=y-sbyrBU18X-QlI~8{fm<ixn4N$fy&!=l@kH36
zN^f%wDBcp35tc*skL5O8+I08@J9v~XZz$9fDZQD*(5eZmGc3z0fK&l@_f2=j@9QTF
z8B4f2o6F@bE=lDoi!EGFUZ`?0MqULFBtbc)(hC{)-;-DQ@ZSiWg0qAL4g1TN2T_*;
z!%xq@EAZA~7MS4ayAph>aLd?7Buw$Y7xTkARakQ8X>CMDQM^S+B<a3pQ1R@&5Ff`;
zun&x$SQR-}7dX?ncqr@c5!h8`X|9}?p*WeqHtRmrTQ&eex6_*mxKqWLN7c)o7ie}K
zK%Qtp(&eX~K>=>6)}lj|LKgGgvn~<<6O{o@Sk_1RZE;C7=#;d7L85m=6><EKEV@h5
zsq&hG*RDxFd2_mQg%QB<)gf6<CM(Kb)5*s|%8R(8Fr^`0=>Kb_0%T3t*+Vq;cMtMV
zm|I^R@K%y0I(z_^rTAl%v#agXt-wbhi8_zU8{P=bx20%_yN+y>+A_|F1q}6T<fW8E
zgo7+AQeVTsT0&8>$=_vnB>LJptZ3?TwXGHv!nmXNkb!^;>1GOo1cvD*)m<8AzJ{DZ
zoB1iyMlbPPJ>Sv8m%IbEI)GnSP<&2{E0|h@`q>?m&s&GTuZ12J;Ywdivcz;hf<}tT
zHt{keQV%nm+2q3bRky^d!kKhRSF>PYmfPfC8ArT4;k);qMrD(}JuY*bb7FRJrBZ01
zLWER}!s{O~9B}xnjG}H>!w=;9={tF9*8Y3VcRaOo@W1`H!ZiHr?~+7&Y$&IfNfs-K
z10#wVom31nK0p%X5e^MAOgFFVX_w`R6+Xk<zmPDGr$|bTG3kJE7Zfy12-4M26D2fj
zm&Xp7I}jb55U8CY%uB?e76tD)!kkBYD;tHBxQcajQQycN^>&*8#+FwMQq;by1DoC%
zOJa3~%o4`AJaUBD;3?q=;(5(vkO`}V|3>6w4dp3;=>6m5g(VC#tB~$8zFSYuhq+@i
zxP{$XBL$-mdSv!rb139`Dq#XZiw2@$!!i6vlkk?|sf8p*HLSBbctQnF%S<)aF0PrI
zgTs{h&Yb;yOGT2Ic}nHGFCsrngcGy<Zc8A+Hug$-$2_+I!@<NPo&dkYqQA6@j9+)W
zVzul6G)Quk4nNshnFyOc^X}Nwt~?xMyURU!TJHb*bzF2mqaSvi5j+@d<+*mf$0qrM
zmb8=k{0(*J*~1b?ts^^=30)7cIU|kZFwhXZ8Rb14oLNsW^s(R(QWs#$memHRSRh)u
z{+I=LkE%dl#sceEvR2C>G^rwT@)m<+36@5Y?5<Uk^mA4xf>X(c@!(3*=Z=p`19fug
zENzj%`{V7|!rkAJuaP0Z2OOO8!GZ7`<{z}GU+B}y(iHeedfrdlnf!3g6mHj|OmABl
z9L^(c-51h+`hlvJG^&da7n5a1@uNv~h?(SjKhCciiE+^D661JK;E{f%TQhWAg7V=n
z=Ynv8QSrL2r9M}-Go4GzrCe1EC1wd_TUQUZgTA@Q<AT1N@5aWS79`6V<ADsde7IB>
z&M4niC*8B`%_ww((!P!b^XcuvH#$8@vsC+&s|z_G1E;ZVMkJv#p#h_o3vd-=n~j6$
z<IPSCuHY#~`=E%QRK?CC@>LfT)WZy5;YJu{*zOe-U%_(0bK2*Ng=G@d*h_|29yq2X
zkT~D)6!S@&opk|;GTnS574*0Sf>Hc`p*{D7F}9?#hJJ>>OnC3*vN6Na>2yT1Yibp)
zUb2pt*x<Z`NkTX+Jp;SY{VS5xHIg-{?igT=VsQv5BN8x`${2bwaL#ES?~v`<YjFF`
z02%oW0Nw?9baK(Uq{Y(TB#HCJzpv21Yu&gJcC}l5saB-u*=#vh5nJ>yn<m$y)_vUV
zQMx1<PW-@mmvPzpaav8g0g>I!(Arv}?)y<K`KZf!{5w`gaT+qG@dN;1nKDivorw<4
zWs@osOU;Cu8w_wYAx=Tl`Ai89)m+?#lgL*vNzo}5e`f>q1Mf=ks{tu#5$e(hqv-cL
zS;7ohs;NTV7xU%`s1>a)*7VlEuMNqeaIF`hHt>NVU;6(S@Qo9F&60}{DcG9{+_aGO
z;S<`dij*%EEh`+hz2vksP{qLA_2bJcf4teiu+dFG8*+n%t1BGjY;plSOFfxm+I!j{
zqFF{H!cjS;L+7<Y*~U*7)%t(~@oo}<ITtJ6c1bi`s&_8fQaFDZXApx@rej(tgY$-^
zC{0r&J|V&Tc2AhSwM$G-GT0*3Wj!H!=~p7n3MwS6^m8{IiL!-2PwOy8KTem&KcV8m
zZ}#z|&UQB0+I<j#zDx=Y55noI&v7Rc4bkntG$zdqP|+UXLdjK9t!wbnm)^i|rPMd<
zN56FPZz$CEw#&ou>^mYYF}Co+M2&kw-~g)X!2AWPKmY&&2kF6xF5AEcV~P*Xu9o9%
z;!mOD7IJI9*b6n4vZ>+Zy-fR0UZ5xHrZ0V>u6)$9jeq>6y!S`Hd<T3Z00$I1P3xx`
z0XXKbxLPgSGD?>?ZAUb$sa*Zgkeb8qG1sJvSl)tKvrVC$-~5*F6LfzP4Z$NKhh<D)
zl-oc+{JpX3vjpPne+&69<I7G_Cq?5{3Dc50`I$YU0M*rivD~9@^mH;?=gKfXgZl-e
z#P9m=_lP??8!=x2O!pH3?UuHW7wf<;kXqKVh=rAGckdQs)HhRu<=^09`?pctXH5L`
z;#79M^Qx{X$cqM*dJh7PyY#4kI@kM1h~-SI4=BcAU$JZ=0Rx5?&dslAtP!>lu1|46
zrTjN0PSO29jh-JEAu++peb=Q&`e~2j3TJi3WG-q`PCN(&5JC~XxK@N8lbsfXJ;}Ul
z^M$S-Pd!eYox%b)l!M`Txt~+~NdxRn-MN%cf9z>4&q+W-w8z3m#yt$OJ-zQ{yW`~m
zU@zzIp*<>nbDdwcTpMvOf<W489<$AmSXt(C;orY1s$d20=NseMefcBpP5{1(+^C4J
z;@1mQ;&dGW>M~ct`u7+>M*aG6dlOb_^#n_W`Sg#qR%^$(u(zKGGQ1jRn9ziL&a?36
zI2nF|d~|oZWILoQN<f14`PakMiCP7W{V^V1rIE&VS^igjZ2w`dWYk#isL#JOmnS<x
z;U~V~g<8JSchsvRlLKnX)Xd;*hfnzJG-&o^efzrU)E^?_yhnk8k3&IuI|{j^acWDC
zXAxNc5Js4Z*<c^ZzY<x*1jv}ZZcmldzPWcZT;*j)72Qa%-Cak1`s7^_zI0I-=~xQp
z2lXaioI#AMrKNAX31!LUq51%rHH*q|k{n2j?uxZ*B$1xrbq1*d<mjX&miZ)_C$H>H
zSz$1Rv3=0guPc0zyvyXz>+`EW!}u5N-Q22|yEbH$iM)$4gk|L^KZUK>j<aR+MK}(!
z!rM~&9vn}5poqa(1K!n|m0tT?N(E?MO^lMrpr;g{Y0I-7Lw9gY2$Ki6nR^KkYY@?X
z7jw7GX{f_)mr;ly2d!5r`#rzZ^vc4iDsjw21@54RVL?RccCN<lspOt@!+>qmX3rQ(
zq5CAllbfn>D3Y+zp@?`ZVZM+TA=q4v^fGi%S?Zmr<wGcn2r0P^ou@n>qCzl3e3NS1
z88LFz72U@`fD~Dp(3}qm6&8GRe!W^_SMV9{xoX`6-#&Y(8FH&WG(0J=T@MV!GI%<5
zS_o~~tgt-2d+t*!!3=AogO<lmduw-6xbnIhNo&`y1SY|*0z%5M2=6N(s>HvZ4c3(H
zDp`qTk5x)Hphus1y;|DK`dQ1zc;Fb&-I#67OePQ^5`>^xNBh@Li2h2yls9e9IqQhZ
z`^EC;1gc!8sxau5P#Cbp7Um$0AsurYW+y!aUm<e2_hOoy8N{_ivC~4JfCJ){t9eyt
z@!qnqD`RQ~ty*ElWTc&fUBJZCjF@7>fDh$=#U>7S&D5k+Ul8&6p%_nyUX+tsO?=8l
zU^hTU)ibBVzS+wET>u1L!ckdC9RY7g5dNM-Pz#I)zSc&deu$P_OwPGh8Jxw?;|9zK
z)Zk>ciw|TKY%TfcsVW9Id3sI;tqWhzNp3;vK+k^OLB9xLG0oa)=?%~d9C_j+1oD)e
zf1T57FE-JOb1%K5?P6WD=QAbFX_v}62!{q7E6X^V1kOR_i5++UW~y>`ZMI_c#LS7E
zef+P7GG4Wf<daiC-pOP!!1xqeTdRZHpQ+Y!Y3mZH<|$y-AjS0-Jo-ZZwLAC7KSfe7
zAZdSkvri9jPOkw7hxA+Pe2A?EXhmxggC+hBG35PPZeN=GEr2qYpnn+%)@&62%a9Ox
zG3HueUIRVVT)~~peYqBEa~`v#5C8bFoEQ$gsUdu08It@IqoNS|s<C!Rr3qPI`2I8F
z-JioQnvJe7KWkLfy?+S_yZkuZPnL4X_j5hrBq$F^qEfyBx*57LV3tHv?%=;)E=3x6
z<T81WTozY~HT}!bqtgE^bGsyJO($Q;=S5&L<_3|k|7gA01tR5n-h0!a*4PY;ym{{&
zw=LX+Ko{#({SA+&Eq!SWAXp(;Ho@^XJEb#;%29Y}pIeI0e7(T+N%`|Jp=~fA>~Q>=
zt|K)RcOsr<w0A|15^--rl--U;Q1x<V;9nZ2xkPK^v7ZLj2vs3(^YHZ**cANUY~yWP
zNEE;ac-)KgEW6i6i;eIVR-TNoKt5jsPUFgT$B&960x7WVQ(ueDPrh{4`!iSQZ;AXh
zoog7z9pp?-D4mADQnBs%!%^_{CoFl)n3Rd4kn?}gp|Y7bG?kgv%jQY`6iu!}q-aMn
zdfAgS90(@!#9)mII_Dz&%;P8YwkfL-0iFp4*pFVY3e7*foo4_&KLs?5FAUR1?{(>J
zRev~+AHxl6GT$IkrM(Y72$S1vX`m0Yh+gvk9TM$6*5EnGxWT)4Si*2oA_ti(69op*
zmbrG5)ejKTz-yUv9sWg&@;fkkmQ|5jKO%m^;#-s4O`3r#1NCQcH>7yBvUaH8!Zwe~
zDUTP4+@Ca{VCc*zeo=JaJn}Yx=AjDx!aLs|{F8gn2xhl?#ci0DIPH>B_aZw7)_F_C
z>7rynVQ<m!eH}TTsBkRA3Q*4C4AD=K`9dq_YfeY`?!N52uiwMFatk^LQQn=3|3QLJ
z3L_%q3zhJu_v{@_P0K33N^f<4if!(WLsK1zoR}kIy8hy;OLEwipt`JHo?0`DSW1El
zz0HT8ile@|w29n72=XYFj^|O(m!||v>{dH8=M^+_gx?LJc5{<b3Y%zg{<KZ=D+d;P
z09^3Jeb%(`Eh>q{!<VXm<fepIAgR`Q0000koCe(hH?&$l?Ea9gga{&c!bV&=wh7uZ
zu$82VdK;$N2dD7*1rrvP?`wFHil-`!9B+g~`I#ZDQd<%IrB-dCrOuk>D;Lc)5u+oN
z$xA*+O`$Qf*XOd3n4eb6n;q)Eshz1fRVT*nFsHXYtM$B<1F&y@XrmO9Amdynv+XX&
zX6z0PKn1Cl6MH>}LuD%?7(!ppS88(9cDLhxBDXBIeet?wP6Y0dD+C&Zr7hT%%3zXO
zO9jxzO-5rxn~dd-An<Kjdsm}<H!G_9EUcG=LY-r#Dv2OpTCCGoFr*B-Mc*6ZaxPj8
z%%m<@g=e=3_#!t>$mU?F>v-mVifd~~iG>QPv*BAk%H)C`os+hwImz>AnC75)TrFE@
zsbd)Rsp4tBX`qH&WJi3cc^e)<-+N;8wu3g|_{2NJv@=rosW?U|!Kk@RRadGQS2Cul
zG9tkxk?aD3xak^}K3O7Hm!|JZsf|Na53tw760+X~`RNx-BW^6YG)oa&bWk|ki^V0h
z2Rl;a<&TN*VklT_e3M6lq|&6`K9*8ri3rihFW1<ihV|~o5+W=latDr$o7$*ANs_(-
zpb`VIa<)Aq0GD5ndV-Dn!+aMMCO~E6-QXo2abS5@pU#M!!~C%!Z|cTp_u=sLs+?Ot
z(TT^`@s%QD4F3OXZFKom)5_a*d2uC>QS^~2^cSo?Znw-N=(zTV#Yg6E0TNSZ%i3oF
zuqbQ)<B_jQw?0PzQ9!Q0s)IkRF<nuwwb=4j%<fp>u4nOci|Y_k-npt_+2mszI{g7X
z<15=}CPz#5<S|^p)YbUI(r4lrBhCmeXV~}1l0+jk5uaKYt}c&^%RmPewa%9LudPC}
zO5|Yqujj?rw}wk9w#3JMk?Zxty#-TW7&#JB=D7yp2YLk55wO2U$-U+4XSqvJ?C~Hy
zS_<hRz=gNP{fP?pXZTD;oTv_p-~aL7sn2xQM<dy>O_iJT0i(_sygrgNUbv-*Cpj$h
z=q*ov|8(?gxy&f8HAx}rDPP?#y!(SoC8=7oMj<svM$`+*#ptKqz;Xw`ch^WWqSs-f
zy@;LW;rY%O^1ku)g^#g7;DK#pvun0pPRARs3%pW2a+f4z2d8WQvC4fTk$`jK|M3<R
zDFUVGYVKNZmQU~`F7jK?c$%Gz=!=}<4Tv*_$v5(}IVurEv;@A|HZBzMxcTsddnWr4
zpwQ)Yy~!(VS1P>F<!^u4ZI)N3Q&Q+v#bLi@Z7TKZVL1zU^+Xv~yk~x}Dfb28yqG&U
zc1j%O0_?35?opc>rtMLyn+l8xXUiI%A#lNVV&bzJ2G=rl73B3-E5EnY;oB}2`vCe<
z?PKKOhNX%{S^ofQX`WMW<`MgfX3+nL#86%-rzI_;7mmM`$6*bg9s-bR>}*(5$|&eM
z!WTLPGfePoQVTYFOrz=KO|*9?g75LgjgPGu<q(N#lGkbCsbQjCzk!DaxI<)|BD@Ib
zij!9G_b6%JpcNZb66^&_)E?fUf{X(HgOvstn4Sd(oZV6QWQ3KjV{5yex{PRuj?&<?
z$4uc#qMONTL=Ql}AW;E2Mi&C~O6P2#r_)p`vTSqzfcKVW{7|b~VFfw)7ez&rM~KzT
ziVezoLv?6NLDjZT2z>_ARM{rN{1mWhMInXL1`d@fW8ajP8r&x(1}czztq*qu;sDSb
z+-#qmpf9ugmko|l?gH=T8dcG(1P!Y(1cj0tBtqY*Di>LS>L65kg1~O)+Y22G1w>$6
z8OdiUsE_clllF^8rm+klhXjT2oBB(W`nsfU`Y(#;rG0cG13BS)X6Vr2;8_ZJo;p~x
zwrM$T;QZVLherXNd8+?tc<ca(<}tr@_uDr4y)7}lw_^W&piY^gvMZjroWHlE!`N4#
zved6hQUJlQv5}N^UF`Q<Sw&c&B}YxN3JCh4#nt?C>D4kYv>*Qcj+VoeGPE)EP!}Vh
z8cRx~4A*HS4YFq$H19a~?%^cJf+w}j1zb%dGbne6KxR`ITHqeyTo7QU&Y^UoC23pP
z3Y_mAxRwE!@D5H4Z*pH<q_*iqxn}u4So^oC>91*9^NyZQH*N{;rmvE?*z~PBc&$R6
zM|ae-w=4I4Q>%fRDCKc%Bg`!8P%UD#5u**@3Aq64CRLr)whVocblYwUibX;<8nQxN
z4UZ@B)}Griz0<>8;s5W88@)!xX4V=_e0};=_d~lNlf`rt$DjQyW?F|VDqh{`3-XsR
z`TzAPqsKTs9+B<CaNgo~uqOF$qr1io#WJ}AxD$BH<YZZXELd7$ytdqsK8cIvQ)utY
z_N@4JVe2GwJpHE%ouM{H?{8gFA&SDUF^kG-G3{qPF?w}63raFeHNx>SQ1n(m1*?DO
zZ66vbC8-~mFnW*S;1C!BNRFl2qYAD+Umu^~QM0_^T)KTdv_y{<_^bZaUFsc&Jp&Nb
z$xq4FOPq=<Zb3$mNfyhyiSgIXY>@(CJ?%R)a=k{M<k2*JM*=L7AN7ZM=q!}o`k@%r
zxd!V)Ua%O}0kW=`JYS3!Rnv*Znd&_Jo7Fu(c%CgA?A+xN=Z^8b51A)cic|0FMJxM}
zgn38}0cP1krm_&lx!k;~5QpvEyO|SXFzlUdFHYgiO1x{r!ed9od8>GJ?MMErOM_Jg
z)=~IN<|kBPkk#muu$?EMHt^eoQK98juF)`YY@T6V#FU^-D{wsB8?5K~bD%m(52N*3
zui<{uLfT?I-sV=WKIYG`f(V%l*F^tuM#;9h=o$$MgsJ!hSYniwI9@1uyu(pgDXziv
zFWJF3#gjKX;wyeLUS-%96p(iJcLlB3OANVhRX_T@Mzb90S3(PQ(o7bNUls|XH1;--
z)o9$X&bSHm>1eyu=;$^fRDn3goj>wu+tf4nzqM*jcOY2$bKu=DiBpW^&7m2Dp7O_C
zcRB~_qq>mVb>jroQh#P>J*`V~L-@BO9o=3!tU^c~V5Hy;oK$*pV_<s4jttuq8b|FA
zpMK;ZZJO0cNwXF|;$je`0{bVG&1gdG?_j!TqEU>M`|1S{@5%HbV3?uqkbX@HZ+|d=
zzIbQ=001T2uH?N%Z_eYpsKGnm4PHkF%IRsdUhSpxWjwEsu00r%1lW036o#$>;|v3A
zl<WbG0!0bh4BSvgv_^-yZuZ+`3NFW?LQ|H~)bc{i4uZMj_J}6{%?iPHK*vmt17iGD
zz{e%-AT@w;;qbigoQegf1dcm1P^B;oq~n_Z8AYT@b1~*Us7KkZ-?j$1FF+=_b5qcO
z9{9483k50^?n9kFZbF{?tHGAm-*~otFag5!!q+?uJM8|z44gj`av!>BM-75o4Yjpo
z@U#gb*X<<p|Cd-kHuyF`F^%|E1(eM7zY}AxgY<Fa*A~6>Gk1nRrQ?w+yUJFOm|vBI
zfz1arODXz<4)t2q!6Jpe^|@*rp+r~W?Rm^uo1PaV$AQI^ELoAxvJ7+c1=k$?@0M9X
zk0r!GdwB;<qYGz3CSBPL=3kcmVG<sZrpg_Qol_Cs)FG+a=rh&)tA`+}LoIXD=7acv
z!-SkHTaJpVe*y4tJk#3Ybr_oUR&0gG%35?HF9ZFo$6s-eE&+ISR5n9Vm>{f;pJ;KX
zc^Y0b4!&f0Qk3Ipc&X1nG~Iiy(T_EZCnj@k!%|D55>*^|jj1C0-4O~$AS06K{81oY
z(>R4zY#i0b2{c47Xd9`{?k-*KF4kn+n*_+Lq49H%A5za>52Fo2x=v$v%)o;#JnjfH
zCZ%-m3Q>R1c|PK-^esIxCdg7un>dsRO-uukXV_$iBQHa49!{I}yw=>nB-UjcB>(88
zZy3$!XVxzpc6s=Y6_bIWThzCulwYlu{AZG#N*pUSn-pP!CezfQAok0uy_KsJvj)ww
zexXz^3`DNGv*2700FSwBd}ca!we7wQ9E>*HQ3x1@;fz0p%pxdKy~>q;CAO-PzTQuv
zG;*db!;ku1cNCXv@+<dfXwOy&F%Gc|B`Mk%4};T6pR%ICBP{8$B$#k!fbcO9PPnQS
zKg28Qlz-L9{&A^<&5WNGiur6^qw!@I{kY|ow^xr%N3qX}Cc6Crwk@CUIZnl}-l1p>
z(a)a%3^)0u6Mt}V;K3yzKdIF2IdGM0=%GDkZ^s`w*F8j_f42F!3I=oB`PqgBHH2k&
zIb6<UJKy&(41;mfojw{60NK1vovf)mAs5O263}#Wt{mbXNhlU7sYk%!$R}JJk1!c?
z!*>v2?SwteU2LJ7eH~US6;0#I-tJkpYI@9J4wI>rxjY*1;+X@FH75nxzA)TK8nv~B
z#~9sI$kBDa2|KmLZFzxMjy8Y@pJg7d@}D!Kshn2PVPoJ#Ma>E1lisDS{a3Gm(|N0V
zxK-xb$H9KlRv_1`4ICh6rrDvn^bEp0y{2Y_m-kM8u{Iz>l(Gli7L5C#K{Q{n?kH9a
z3PR_dm7>#9NQG}xMn0r=mUEaDNdsYR-;x7vgUb35A%8b3+FewJ2L)o^L+xV-&&|v;
z^@u|Z_`G#iOTQ|X0@C_oZXc^bu~Dy;a*PefEwX^u;ff7?j(gr@?y;H%rYVUeE8OaI
zVB5mDTIVvE(5`Xh_|aZXY4Zj0#*kZ!T)hI~hyN?h+9$2~lUxl4=y%w$bPw_*aUv5N
zyBs*!xM^So<QLVSv}egG-Qihzu05#`mn}l?7&T*7pmNX4B7+P1ZHxTc(;ywrXGQDP
zy-I0gYh3^kpYaP$q>c3&)yvGeiamzW0Opg)d|xOry4-G8y`+hoy#Bpry=BNHU`xV)
zKANXiCO6YLWn2=@y9E)8<{8@o`KV1b(ywk+LA7WG$5jZjkO1eyF?3^>4>8zQzw)w6
ze76uFo!|cl+%xB#9wE@Jif5s2qZk#+5^QjMG`d<#$|}pz&)Iz@8B}1a$IqB%7SlNY
zUYKDqJ{bM<5%?qr;lL|Ne?fq9VDU&gH6ey+^UDCxTq~c8hAU9#C_~REE!J-zGh#5=
zWmz|JGzG*0M&Dgd5C$5d@<Vozwz$5F!C4>w!IbYO)dzU#7=h+mfM<#_ZcP*Hojw|U
zGuj>E%L4n5<T^qs+vIJ;x%Y3>%+`x%t~2`d`c^4$z}8U&jK-Yn+i{emK(Sf)2Y=ZN
za4}_she@I}EsJ-MtwZrPX_TdP++?K5s)nzIVUg*p?=}9ciS}{y*&o=H^K1z~KLGjx
z>-rF52j**cx3`pRszmI+xIMu535<hT_5KqeBQdu|Whw#i<v;Ntt%#gcW1(9c?}d#n
z)hq6u)HY_QeeDn}N)_1lP>!wccx2%^%BmoUE54dn5fmG8o8dj`QP=TPixj?0a@o4u
zJB5f?eYfI8%Bza;N!nw!@!>u+TX;*(4u?of7%qxq4Oz~NlIZaufz@)<$TJb5uKW{S
zs%1SWF~v)n1L4GlD*NavWMD2b5umPzqe;)2MBkx2NE1>CS*{xpmOv9-Q+$<8*@sQT
zBi_WuEMu5mOcRKT0u~n$h+j(H59P)>j7%$?aYPpR&*hVAT!zT7W^<zC@?`qA2%cIz
za6kFtSLX3dAai&6KwWifYs2+Y1}ksK_1JA~F(N*C&!opKXp`h!qFfK4T;at%(G?=E
z%8Uu20L748i5O*9>doGD{YL9yp7hLAos9pdubs;%u;oQ0iYTXv306B}sgx_8z#x+0
zW(R#4mXMj_4tHosJcyetYN;770hV@wH)#cs2UEyu+Sw<2->*Yz&D7ULk^c|HKn%Li
zEClNnRXxma$*<h?{}hNFRDv?^fXQcvLp#K#Pj01RE7kzmgPF<FHLvp*?ENPJ#iHc+
zg?L38cH{w$2IXXQ4MdW2lv|Q}`-Q6#@lM?5EAbr8Mnpg+bWO9NOwRHn5qd}&XQYU9
zRn1y4k`X)*19Ac0RdB0BV~i2`rh=!u=kpWuS#eyzXo}1xc0oQ49%SIdr1a7d%SlTw
z+GZ-&L)KKjq=+;DOsSdywfv_8`!{g-Bp&{}03tjTiE7ZFb7$Pl$Q{cEDNX`%21?Tt
z^9R>U1f_xlQSt|AD@Rdh*5(0o?=D}|f?xxiL4;b-y+1_8M4975S*z3Oh+kXZ1t(jH
z6235hO_s5mx`kzD*pKjLlcD>H(=+1Q?d<r0FimDF!!7|0Vzuu(k01a50B_9`v2`?g
z_~2Trx8R_t|2YJD#d};uUp>Ojs*wt)CBufzr+~=fNj3}JXr3e$bf@S6YbaXtaVy7b
z|B`X@D#TzQLan5fglWg+@NxRQuzI&%<LO?rK%F?;EoJl@Qq2W0eYBb$+^msieV`6A
zITMkeo&$Q#IZU@}<S$(JZ+z7PGDV5oZ2ppnjou<qJ)q-89q%bX?+X3J{;cCHK^3b)
z7>p4|pcq1T9i)>d9Rv7j>AiTDumQkFeW0G+0;9nWV6y)rsztBE1vMhD`*G}}p0^)V
zLk(ZK7}~D;g%GQ~aA>w9gig%mLWEK$4Uu37wpJQJ^uxp#i;$;nX5dX&xecgL*fiol
zoD5hFi`B3W%F?FZ*=vuGIW$G&PXf+`bYzAUYi2nKvbRfK0TqC8y$ZV4%FKl`==MwH
z?(oyLY*PfjnA1CP1?A+@fZ6%J?Hc7@p#_BO4mqx}*~w1j_YXhl@f@<CoTCZyG4M8<
z(+3w+w$gYfA%FfA2XC8q2rHy5C3m<@A4jM4c@Ht3zT#k(+Hk?QkDj_<Rwh-9$zgtJ
z-k2!PG%!eR$f5G{;BA?yZekd473S4Rcvk+;Uk<jP*+D#bHQJ5#M>_0SZK9QqxWLni
z#;)d1qXf=pPEY@&R{3;h_ZK)jh&=avcdNenK-1|9z$^$@tzwj2SRGDlvl5)JNsDcU
z>?=KBI1Cp|lVdmYO(Lt7XfZ?IZ=)L6K9SB206|vq7|F>Kb8zaa-f7sHfsT0%b*I7v
z33a!KPr=y5otU7>OQ<j3IA!yG@V-i(HH)Y+-mm!9E43qW{kx6|2X@`S-HW!hJ@b1g
z4XfetxD5KE9F@7c5#Po~lNfcXY9&+`L-;e;Tsq~H^>IAWOCHd~_vj9_=2F^rVq8;a
zpoFOqF%pv3MB=<NpOmnyTt90tf|y;ugagvwq;!O-M5jVy+yGW&>~NG&U=sMIZj!^H
z<Ah#QRCHIiEbyN^xc9Vc0I8uH-4^LOW=AwCuXb+p6Rm))yiTEy@7XMI_q3VO1&ly2
z1bn-L>~pW5lL3MSA}^2PmJMH9Of1TpqaXy!rArEPXC;+W$PYocplqjcbJ7*w_5|0J
z#^aRfRO`|Q?Hx}#YxgvB+p9hkrjElHe&maEo6iXYO*RbYz6Scx7)Tv^jOY~Z)<?66
zPLFe`B1j~X+9h2N&MRd0N9Rs4VELtaJ0w}}C8CwEOYSS5wS?%F#ToW5iaWgxzU4ik
zx1$~GbSH?)AL8EC7MuRTDfyU@aidM^bPh`OvYRcMOkD2gqE(i6>+f*q;Ed4ZOh@QV
zx`@S)zBS!}lIOf4Uym{97k?kxGJ1CrGwfM)Uy;ilYD3gYjzVBLyB^}~o8HQ)j+8;a
zci}8Y>|EdPtA-vlI*<=2?@YxlcEI&B`@s$7iMQsl`G>UszR@li&Q{#BB2GL3BAW&w
zrfx|;GgXbf64p9!Mf4F#1f(kzPgGrR=@WHrth1(G2#pJ?4=Jg710SB87|H<cz0hV7
zNLCyAYf*sjH<<}jL)YX-&`{~r+L*rV0Cp&6dR|^B2T#Y1a{mE`rOrjkr3GNuM4DeN
z#e$jL94nqJs!vuHQyy|G^S(_v9!tcz=5mlrb_Bk2{j+6GW~X+T$cIzMY+`M|USs5d
zRVMJX$T#33ksC0QpvmXqiN=EX;`x1ZI9&7b5b#Xv3!U}fUhJ5xqM(gzXW>?UxF@15
z5(oZ4xb{A~dk)hu5HD$xG>K$WKJcUPWG6-zzF6%``|_ANdD2&mmT>T!&8oyuSyx^z
zgi~rAUd}5Zmjr39#V!CG1ds6in;uHkhkUgP8ZQ>#D@c<raQ@aL%bQbXjAsU4eh%Y=
ziQbyr?&8fNrG_8b`He9z>dMit9<)nygJtp<xbEP^Y|tkN1Pa3h1$1f!t%z7nZ|*u}
z{Ofarc@`&H0p`>~*8J?|5U49=)O#wKL^!x7M(->eI&I}!aUq37b^&Y1BoXdw+9LnC
z6XH-_>DkO{Qz=u%+$ZOMx8-`)x4flelm9v=rFyJ<V;1I3L_qPaLb~-Z^B9S__Q!f`
zAH3$^s~Jq%qboGT2-rdC$oUgc@$IfVmCq)in9ls*GQ^6(2crBzFEas=&=8`~Y|-Ud
ziE02WXo0bI-Bck~`BKCw{e?8w{3y3vt*!A$ShG@TzvQmPo_~K)Jd-kC8aUXm<GeDa
z12*g{7Rog{dkoW-^~+<X*u2hdIx-L6O5enjsyJAXrd}UqQ6V9|6K@>l?PBT?)MV+C
z7~wI{t^~b$8cK=l<wFr7hOxa#-1M->)v;ipxpT68*cP2x_pc5ju;I%Vw22_TrNyH7
zUJ{(Eg~Nspv9Lm%)dvIJY*(L_l)bnVM=wMcDiR62h^1i88|`i|M@Abci_!yJ0s5$@
zEbUMx{D4s&X%&}whtnC^-q%ekiW&xhtpWLE(XZOxBZ7zD>tVQpnHceTwpxFVuHkVq
z!>M4j>!<~taQX+H*YMw7c-k|PJ#A&8VXIQ{lAZEZ?90W){fw;eGZE0~L4ejoMNDD+
z<t;tdT#T_93RA(O!1w5iHpeeC0000RWDb;=z0rhaeYSt#AhbH6_$-)x&M?L9xR5#r
z6?$}%9QE_=PsT}ARqz{Mmqhf-EpQvV8+Pr)8230b`>hMf>3QIP*UASMY~K+{1Im(f
zzW_3mm`!dZ4c|^pd93X)naEF3my2X&-!Kx}CLA!t0fzgfbHfo1Ce4BR?_oznd~=P|
z6Rd$)&y<|Ku|Ko}wjPZuHRDzAQt8@2)X^BDxavi(h`rKjp(7#P^loh#R>H~5R0!%u
z`uCB4E-O<PH|X|$STiP2qkaI4r9f%ctoSIErHBNqdaE8>ZPc5vWX*o(M#h+s$^KTw
zv?qvzf2=2JMEsjD>ML^?;w0n(UkG;37}vsPnNXy-J{)~)cOKejuX{~=*H(y{JxQet
zbh5?ya^dmvA{>EU*I+m>Am1`WXRew@9w-6eEc#khoYNJL$WC`AtawHwJjnL-ci~nT
zJns=T3^+n8+10sMC2%)ps}+@+XC@qqfIha1B8ia?;%gRfT(|6ESH*i=+mQmu?NPp)
zNO4?|KkPYxic6IV=fHu1P^2tea5F08J^GH(bSgixm5^KtYArF-07PTD$jx`+Xc~gz
zcxR)M`si}MCa^YFJ`3oXC@*Z*pOOV$B0xfQw?ApS4(k`Ifk__f>Xa{l%KyWT$9M&R
zSbJho_~?0S`bS{dq^5<nP(`Z?P3uE@x^UaaBKrSsc5%y{v&Nib!&;Xk?%_2++R~rY
z{#J61`~jp&&A!LX0ZN+trnacfh+?oVC`){e+WWeL4#84(V%Bmz==@n4(w(ahT1fr-
z<1!77@K}#>q7@wV>RfnbGmHun$*rSJE-jXwuTu9cxSk}>5T8y6+51z}rI`KjA)$K{
zt+^KgBCS3<UELXkSeuTbwh<I9fbk$x?ylZ0_zU7QGX0Pl2!G0Jt3({JP`o<w{#2O6
zcB(Ok5w}7>Qw$jc=}3;R8TqM!<N$((UwXmo4T{>Nf8u4gKJc+Qt2P>>i3(V3WLq#M
zUPVg-`QL9ios-+`Wbxl0>{|+EWLLc04rL=6?M(ND2-gi+W22CTc3xb{zHCGgwcyrH
zwy5ukn=Vm`Fr)<dksyo;DaLh@xOoYjg2m=3E_-2#l_h+k+eN9OfXD1KlAG>Pt3WJW
zSy?C`)Rl^eJ9JSMcGO_|u3|a^WQ#+v;nbsiKLaSN4p$3==F&>alvS?~o#yj`7xn&V
zeRW-68Ah@C!kW%n1Y`9a>HS?`M*FmtZUDz~jB$(-rLeBifmI1K=etlHR#5@m<3oi~
zp{CL?S164~cj`-fMi7ZcF!=!u7OvXyk+TGWKS0)>@O<v5avr-a&~qXF1NlOmcR;BT
zYYPUSY7n>c&3(^|KG*{ZeWQDMZq(3*eu^JyK1hs1e=;pydX6G@>N3zg8g;0!(9Di?
zz;>*Sn7da0iM~1Q@4J{BY#+fE=?B8pEohZQQ-Y=*W0WTUhJ~F?=3uit0e?=HgxBb6
z6$~7#sYbE{UP!$eoF&5j9j*CdN*@c)ZXc=FlsTRf2Sm7g{>BU2<1WW;k^nw3&(+p2
zbYN!)vGBa3Y-R2Fgne<}Ls}@s-DeC21HboASUK$u*4HarBUl^oB&PXtf{dtK5et2$
z!}3FLQ1u>f)6iVv#F3zpb2K|*ZMJ6gdaRy+u6yq#+RRuV3#a-DU*8Q9z&h0AebNT(
zVdP|cGC^_3f)*l=5ib`g=-8-e3{Zd*@xwWxX^~04i4`{Z@601Yn2RcMsgj!;`G!je
zIi3)p=Lh_4bqVT5pH!`i`SOLjNkE@m&^PerHogW$z@l}t2vM2y@reL^ONnTR9aNu$
zJ!-oV77lCI>M{!YJx}0Z-~KE?jyYukJM4I_J)#G$ch-fRB4`8{){QH?#RY)E0?A3l
z)z0Y7plP5T9|IziVTs+)0PG2pQ@iw(BzD8=6R9i65C%BhWUHsiV^{ijY<xT;;aQxw
z)uJj?aQl)Va4Lh_8K*0M@Rduq#pNh8#0E}2*)!E1_yN=ygT?HC+dgD#NoCp+wKF}~
z%tPp&>9Tp*&Qor>k(kx4dh?EdN4k4*gGx&tTy~YKICd`ETQeI{MNoEkGWB>mQ5X+8
zK{#k%a?xE+zU|Fwcp*X9+jbp-dU?PiQ-noe(w0;X-3(T{pl({?*rXAV!$@}vP058N
zDWqTQ94W|vohs>m&*3#J-&Wh@D(57?*USwOl<D*)Qr$G)Sw2!5+-8`O5clqk#-924
zPKy7>31|f;*yM8QVR}18QT*D5Tqy_?q@a?cShSpWnB(}Vh=ZQ8%?yM)vAdn^Ly&yN
zCc|eROgkT7CnJg@t5B@7u8%~J-4Y)qz*yS1`aA(@Si+FRAR9F_h~EBfU9I>#vRFkR
zsADq<!OrFP$N&HUSdSaYZ3*Omk)oWtd`r)I`3A9{5y)?nGTi+Io3}LIN7J0xY6Pp!
zSdd)<=$#m-KQw~eR0$fmVO;PLjvN9e>PXwTUmQyfRv<;PxmK{OG3&+s{Fwyl|5Sx{
z02|H1!jmC`Nzhqkh8Q3;1K+8Tbu?}>@E24->wV3(Z$_34*knQ@9`O4J>*}#R9I$v%
zNLBhasjF94hxNAf_){m-22FPZfL$eXw!nrvhjU=m+Nw7-brqRC9=w>x;pW}-WBpBv
ztBm7Y55ZFgA$JWk><Gj$7<2cD8N}gJ5wuwjYCRy<p3Cf7^0;5Uv%gg0lj6{{AMqDN
zxD647=-Dwm3x=2u@z25NKeF9P^^et^r}J5D9=gl~u>a236$CC{Hzgs9!3ix7Y){ee
zm%8Wp-1-{sMbvhlRu|<igZF_dM>SlFyl_9zU{W6wZQ<9c@{^K2J~mLNXejSQ=T-f*
zR_9dtCOXzVS0xeq)z6ibV~ej13uW;qDB=$kJ2JpaUMwMOY-;HoSA(^gPz|y;KBviS
zkIp8V3ln?07ce0xJL%TiyTLn0o}O!r$XRO_Hi^4#G+-cXS|+sTFod5I)ZJKEJMFF(
za|S@mb##<*L-f+zn?#+C@i8X-r!a`e-r4sY?sUWD0|tmF+QKj8P(X~;P=*<2fam?U
zct8%5td!Zzb}1nlS#-qZ!@BGL;_#MiP?I{l%(?j$&B)vu<^c}c-aBQVjmAJ1Q>&K>
z7PxXtg{AgRmeeQ3X>e?oWy*ASU923qIAr7r6C1&V^Qb<m!$K~pyNjmd;X%|QXfNa#
zZW@mqix1B5PCxd%xl^xqBkFk4cYKLa*;)Jl)1xZ!%@lfs7m;#74q8@8#EswTe>?q?
zUfplu`sZibbt?*M`oic)00BLF<YW_zFX?v|WLH+BeIbKLz_}Act~ndLM_Fy5nTt!f
zY=<lxu!EE8xUy4yia@+JIBQ1mVuu5A*M{TjEpBtG4*bb!Ia#D1+=pOg@_4HpM~8nE
zAeVTG0_2RAq}8oM)mkuF3|HR=CFY?#AKaSW=vN>wR(Y6}9t;5}c1VovVQ&>;p>dMc
zJ(p>67z0n7MVAnlIi|q)7PQ`}4|-K8`E&qs0yTHWbAMtHX(}Gojpv3-{OjK^b5MUO
zeqTq+$g~Qfc)!i7BiXToZG}2tNRlpBoi6NX{De8$1$4ZUg>bWSZy%-I8yVC+u^*6(
zKMp@cN|Q+e<YjVFpE07H8uvm1qfDGElj|qNTB9&FcWF$GADNovtP)fHjo<BRbt9|9
z2$Yvg#`rPHjar}@HM(6w+Cn9mbAPa0%!pp)8Z@qXPat9{(i(qMc~jLPlu~i2<&6EV
z`cSR91MW03J^b0k)RTBlks2$V%V*88_gnyrZq;G1<RmSMnOPi~e*Yv3@*pcDqDP<9
z`6RuFDyC{Xvg!>Za-Cjg)=9D==m8_mkbDTrb%8vJe{T1I=tF1k?A~gL;2~Fg7q1BS
z%`6ivG9*~nk;{!nOn#kye~vizQB5cWh!TK0Tp?#kyy2)}sWH)~YD1)mjlP7*hl%qE
zN&7_cL%ttHM-V@39wIahj=X>R?jpvzK-S#t`ui%KFOmX8%HF?j`Y&8Vs0$;0E;Ekq
z2Wq(2?(+`e2Dz1<^q@^u&q^!yiV*$t=B-|V9s;HAu+O&7NHwt;(c56e<#!Rr1TXkd
z9U%STt|Wy@FF*aJnouXqQSL_PwJ=I`;{>Vhu0(sg(vX!0A7cYgZ2D#c6t0w&EgExt
zVpZe$6FC2~<J#p8e!GBS21UzceoNmy_6U30!gOo#Foc0}kO0nh@98J$X4!KYfLJnE
z&BzIAjhq0SB1jtqD`n*Ok}SQ9SudBeKxvY6^TomAVifYHQ#`u*g@tII!cFkLw$^@W
z#`!7inwbXx-dDXL&k0YqIgivqV|dGKdQj#KoT1qVvQ1Sh3Dqm@&fxzz5_v+c+?ya5
zuwXgDRrCQaKuKL<?+xA!1k!^wLca(;xh0X8eG2c%pR;;RGZ-6B9*#xfyu%ZQMX*dQ
zv5A`RtYS@E9U%!qHUAr|rgoNb@sb!#+#DE{V8_+J6hjCxtub#~RHghOi0L&BKAVSX
z%$h6@1A#tZ*pydG?mAu2Q+Mqns}%*?-a1RzJohr7kT8lv$9aQb-Zhn<;vzCo+Q5GN
zdpg5uMxcji1sOgU%sx*sKC0=6-P`47^_*W*zVn#MBpt{gNwEhGr5~vRq^>JE(^fLy
z5gO3MMwd=o5;wFe#u`Dw>QbTIF;uvkoB-H7!id;zbFNx!BlTm5xgad^wNSPrnNu*5
zi;XfBQY;j8j2!xKs!VA)I0pMJxm={ulJ{ZxI4=zpIxB{Zo(i5Mx8E*E@9^lh<@+hB
zWzKYDTx~3kj$pAaAAf~6-P5|T9_Jv>Qk*-&`<tk_ZdlmAU=N*#pbfRkyj}R859acg
z)#k}%q-1jby?gLywb8-aS_0ws@~CpQ_6S}3ikbib0e^cV5VRLuo?DjTXM%bl%T6pI
zrfk4%=TKC~Jt@04B&6=L=W2&{zHEu_Z*MADuQRWF$4@n~NRMwgG_Hb@FFs1L0BGHR
z_>%kqHnwat=R(xS3oNwlNv7}R!ohYP^P87|L5H<WV^-^DUQ55T(@3;U5<`vz!{qQF
zGh?^a_HwA&49`cRi3>v?W8`D(pdcR(f(#Oo$E`?Y#`0ay>}UY`DWx0^mQBSzZU1Ys
zoHL_;w3g@t#k=H9ytorNFH+n;m%pT2%s}5FFmGPI04e7e?_KPR)zRjuuKR}I6^1^|
zi@K^!9PTUWg8o=a@~2*XvS(H@2V~;}@3dJhZ7YET8Fr)aZT{wM4WVvxRB_KcX#|^g
zEeO)L@!_zcF;_cgFrx-+t|T_V95q>mr?|-PqnmA=!2Zogo(Mgm9WEG?Zrs|?IBPED
zxcfnHSmt^cN$bWs{p2n&$S;_Y=g^TfNb20h_M<#wJfVx08=q^_BXAQd&UqCS8MT7K
zL@ULmLGjISz~Io{ZLu=x7<-w22!x@|rew)wa+!c>(@Ve&8Q9!48ipHarbO*MfH)@w
zVK(APXDzWbXN~Vcv(_RxlhL92<&Lra)9j@wkueUL{tTfSEv}*`m#6E}NeG?kmm(O6
z6NSaeIe6!gHE1>ls_PtHkIQ&6fwrNyt?2AEjf2Rd_B(#zm+0S~p`IDM{C@@5*}ugY
zrn?Zj9)a7^%WK+qF$9m~;gQ^gJ~qLJ<n^&|nH3@DRYWkFUWB!`u{J0x^eUA!gC>#g
zati;u%kq#{pxmzSK}r1HN^u?dOu!;YsCY2Dj8-cn1y;1r`i!7P$^GPjj2zYBL*k$e
z+_NHfs}muMd(>(#bZv3RV(bj{!w4D3nAoLyk*6Axx-Duk&~+orIryF|2UO`Pq39zj
z&ht6;jk{};6>LUP-;6S2GpF>R2ga><u8cE;a8HH3tVj(ONWo~vg>)ffWd#zgi(t|-
zD`4vsLT05T>lKfbmFrO@8`l87-RiaO-2hlUkuNb^e4+2c?hak0vmKL3AZV~q`?Kbk
zKm<V6Jw&YfJt0n#G|&k^4T<Sudri@OB0T9ZnNd!kdS}$U!`ijd^$0P4#eT0JJlC|4
z=d0gtVKfT2d`4h<9Ff240~<W)GD2zqXN~j&E5UfL-YkXCZsb-3J4y2e<8EdmqL%lx
z5x&tUuX>*d+wJodaQFO-LkY34kN6C%!c)ljMwP%TYL-0VbpV82nz4f=(SDV#GtKI@
zqS72YURQ5iPe<T?nHUUsc%A)b>##T4m4kp)Q;Hg}RaqA%n4Ua^U`>3XBK9pK;$J0M
z<~{f0VNtsQap9J+LZ3xb22)7mxpLDWnD;#rX#o-whTu@VTMx6n7#}4vT`D@_ji~iX
zLMeZ;*j)B${LpRmIh4@OHloJ8LbM6TjhshUhOEdnivR|)y}5xNGJG?&2r~$IZB$XS
z&?xJD6n##30~-vE77OjLebM|+ZVToizL={*LJ=dN%QBRS<}>EiN@J~<;ae9$ty?QK
zu7GX5s)^$RwmT_DGaMVIEvW$!JK{Kgr#u7c5UjOVzEH;BjjT}g`YCo7+G8Ftf*7ID
zkm%H5B<%?e;ambS2*_PnGDo|j5Nr6VHWrmW6HWUE!F2_vW6d~UdCQv30)0yS<}cea
z;5`Q1W6PNeEh}-Cmo`OCHff~;;-AvLo8f(B-ny%cE9rg!I6VA-_}G$kmYlgTYC_$f
zxK&^MKe+F~hgbjs01a0rqS_=Gumkd*J0fvqJH=vmwuKo1-;`uo_T?Xn%slUAbVR02
znOx_zDUVCyiABg(T?lx4Kx}*iMKR=?x#~+}%7iJqat-e;5A=v|UE+5Y;iq&}9*KgT
zPSm~ve>WrU7tql^pr9F#vU3}a!zXA$v__8l8hDS9XOBl?LH)fXZ*t15%8_D2+1iml
zDL{{Uw2DhZZO+5vxi`3rm?#o3DNtArkSHbB-Ze^n$f0M}vC(W>J-SzLPkwE=--Y8w
zhxRxI({mDzBSZAX3F_bYJHFGU1MgK7`qqV$FLC?x_G0bd?^D?VXIF^Gvu|kFXklt&
z@Sji>3>#E19XvPgx9Ov(_z9lph`GUstD7D+z2vxRE|oKasOxJCPCQJ4Jq=F>pK@^w
z0#^eHk%d<0PL9O}b|8Q{=Qlrjjpemw)r5;*EgOFU21cxgnIT8|3Q{&KzhN$hip%`~
z*ib`Pd5ftT51IvQZvsIZJ;(pCrWDvH`j`@P_UVJsw#P2R^{ja#H~q8IE&3!p>~ttU
zA0-JJ=394*+E>wDfm-N#dqyimeWKi2fWS%olp5PfxFU_w4@3hB7T#SzQ*KvW8DP}%
z*BMnyRLXXea@KWY?hhuPCmz)0<JFLYHzmz=8RS*LGg$O(1dY*3jFez3M}?wYu}c*7
zfEvCGX@nBmh>=p*kzNz2N9*2{rbJecEIG%E{8GkUg>ITidqErK&-X}kQP<9yn#uhI
zRs%HA%`GIV%Z~scix5W$+XE6XmE-^b01Kn8;ZS2B!eB+LrTz|JkA^@&Sg&c}?nh-m
zdUVJy9a?M{97jL!fB-h7Px?KNy{hT(B7TP)rKhMFC`CL%xMpuSjZJ32zR^s8h!_rS
z%Q>sClr}B<#i#sj7Rz1gh5}D1myew;UIL`DprAzcA>jL89k63Yh;N1=3sO(h0u%F$
z1|AX;ypu)c!MdU`ep4iqM~M&#NqX%ylaq@^BBc-IFR_bD6z<v}IL&ktlaCqql^5*v
zN|M}xt+$k>bG3*c=_xP47C0<%P~2K7+PU5WMr#2ke29e{@L28`VmxoZN;m`*rh}t9
zOv^<K_VoTaQPBL_z|AfN)t6x`l^Si)G9j5w6g3j@ql5@6dg{FQi_PYhLu<j(Z0CjZ
znbJqnV9%!dc!09EXzC7!?tWPHZ%Ic5Ot~iBa7Z+cE|E`09+ap0Bo4{#@WIk}B6#A7
zDG4p{n=_~{39#ky(z28tLuFI<-KwN=ez}rLZ!O8-_SAbcjoL~qn8w++6kv*Ew6ZM%
zID0s3RW5>DvQ115O>GwBzBa0sdy!&u)<EzkXzIl~8C({^WZVlAOZRGL7!*{=a!7S@
zV*f5av?kURuX7L?o!un{0a}+7I&&8SgC;I*jSgx+^JlC{bBi(5#rAdlXl@_7y9<H@
z=!>#JWreC>;SU*qD$$C=79%;Hnp*NP<+w}et}DF*`$e_!PFoA)B3cHe$ai(_J|duu
zw0JRhx+lOOSRhPVEB~!$4nk#yfF$6_ThBn^wE|o!XLP7KER4`*dxjcUg!6c7@yd?R
z2hZeYbHa<-@$zB@KJ^gp5C{G=6gF(|i5eThf5=hBBICihuJTf%t|rpY2uZ6pnF+U`
z5>TJ91sS2}ZigrPct9FMR;7EUVF7RS<D6*%z$H`=!SR5?>Vfazx%P0L6IhLTF{M9z
zy+r!`h959}dsIS!H0hS8V3P*vlE5O0)i})d5I3<unc1{UXR54_Nv^-UnL@@Ynwy_H
zu<OGpaq3`0ls;O3Z*(#2*4=0x*>M>gjXtn1uRjc7;UBb}@Ua0_114v&ZpaKEL8_Ws
zUGbfv(~9|4`O@U@ym8fJG3pXV_GH?-{u0DKp%J~(5>ug+Z1ysR3%|l!6&$&~S2VQD
zf~1R}N=ui0eOh4RG}@#iytZh2#3T@Qtxl<yJLjTPuh%Egp`z0fWRB8}awfsgj+Dbw
zcAp@;B<-5Jf8f?SjXgDVlk)bx!l2)|<KEqa?}sR6;LUt>c=9paT%oEYGH7P|U@Vte
z_!=zNDhk7efa^>(^@@=K_h3!&p5NU0Sl}{N$}n`qQ+}K{PG!eeVh1-UE<-u`BV_ex
z|B^@AK#l=^Si?p$am{&$GhIhXkleoi5#JenRR`VRm_@E|J@t{d_tSY<jPUnxE8qQX
zJg8tdo33lLGR9&66MhKEv^T5~Bm(<#0>7=1y${!$8iUS#AEBmDsBT89Gr@ejN}7`v
z0Ush?&m58gw~<Z-b_^K6B>PbHQWS;odaZmO%148t8C1v|pr4L`R}L$C5J^E;aM~bd
z*3=ZiEXVsDMUl%Q1%Xv!=f?sbG=R~yQO{*QF8nZXMd={!TYlR+&FBtn7mhLT?@zHU
z61%|OR$1zi;*Et2?t=dJ#SNOU6kjbB1R)N&$(}CY$CnIWZKRKBoyI;Gcl#x+?2+Qp
z1&~tn(Yj;<YD}sV%zb}17&L9l5t125%VC=JQhnNqE+UNOI)e7d5F9^B6sezT#~vV*
z44P+mtgwqzg1N(gWk9;6FgtE$(G@yWkX7$OI}!fUNT1r^LAu%)W}$&jJ&j9wX)nPp
z26-SkBi79EGnIk~X9I+q&)IoWT>IWy0rKFPl#&v*MtFI{#YfZ`Yzy$da(cE7U7^l2
zu5X2H8(%J$&3HyV`P)_*`(sxwx*Cr*FY?X)?Mr(O8OjV$ozF*PxcgJl|AMC;ln*f<
zEgroG4aD?N3SLY>F;^6_riPB9xErpz`Q|9I<$om(bcT#OOcVfM<`9yE3heiXn}Am6
z90m@ZA{JnwaCVvO-zUVQuw00|jf2X|QMkVcLa3F>FHRGGS4@%w_h6F9G*WeB3TbAS
z6ylJplNs7Gs!8O#uN9jGivhuw_JLvSSenh)72E+oRY18W<H$tTbATowQL3Px6u>Vz
z;R;+9_VH{&BVt#sO78$h8qh$TcvvU^006=rC)1Wbk5#>pKZeMIl*G27<+4jzF)&N9
zYpak?fNOC9E@qZ!2L)#7HksgDQw`qBgc!olRVHxl@*8-_{5{Cd!M>BuMf)}4oXS7!
zK3tAQs};!lT(k{We?e<(+(zevFqeJ9KQzt_qW(U})COZ>pjVej%*Y{pcj9!*HS&{{
znsfc5%XQrTuu1{XD_Ws^kgi>9{`upY&7wUX%>hk;jn#5JUoih^LzMUn)+0Jf_rg?k
ztU=KrjL;6&27MPG!&}w&*CV3zgv-zbT_HNXl*H~%Ku2>>P24n2s4T=I0RXbBJPgrt
z!83`xa}=o@O}2f*QszZRFv;mR56$g8#D;Av6WT!Quye{}%qMz9Z&}0E_zS=9Rn1X)
z0`hq`6ykW^;?n01E}H}eh<97zPbcg^BM~@-FoeWHEw-`oPw}&E``zfs0y1hQBO*-M
z5E7sUw4m>OAU<z?4oyt|u(RX32;*pJL7&$zyFfU>GzeC29$68>h%NnKa$O(ygko62
zipd>%inzcu!D-bK_>r)ZQSozcNRw%h&H)2bSOP_`KoVJ!X+9e7Ws6B$#kC?KA7L+m
z>pLpiQf*gVLweb~Wwr;8=-W*`<l(kOBRL-AY`a5hK7#JO{<EGEprfbi&o2W7{nY`W
zdx(lQFBbT>8ah^>3Gvkz&sf*SWDVvZB(YF52pEkFB#kE{AHOD-Q&smuz(vW^NsE-A
zsY(hrf@eUk)@EA{(%Amw3*EZ|ap*6WX#BeGDfqaKCLOn7WIe=+Uc&Ew9@8m8zd4te
zmap8+5elLe=0*$om5p5$sqv@Lf_WWr(6bU0)m6tkTx0vWj;UJaV;b;i8XZ;<h|M>;
z=@!N0qcY)5mqW8*3~2ked!*zG)c|oEToWoF_`dG}sOQ;uKB>!m4PS11&n$syzx1+v
zc1Sh0?a&H|TJ=~u4;!6iEV%x&d@DPiui2846Wsadn|Fr=vO;rk&}KTNe)f$3%}$lg
zT1^fV{4~jMvzwg!+c0Tf&ECH}pP_p}hduIC2ip7STRVOLPS%RXSe!rP`6GZb>cb{b
zr2<Oui<O&({gB`Qh8HHC*2!UYVo6N+Z-P0_#qYM452?zPJ2;45^IZ+Wj_%@BD=0IM
zKzEyC8kBtMIobr~T`EgA|2%#nvd16l<28vzy=^QrP>fE}*BlXY)jGx3PoW+Lot_ez
zeruqBLe{U7`GPP_=<%?rUkuiE;8e+i#y(QEnvXs+tv)|z);*0U2d`!eDXh1$?Q9VV
zXyehEu43ScqYe|!%x^5!Tkj1fn8+B{tWJ0S$6On|AcM5zW?+k(;EiAvmVfY3%0wLr
zEtmr`G$r-G;|qXfbr!S!(O`X6h+rs=e%FFS%vBfgsve~Pl|C6`UB+Tnqv@dNbSKz-
zyfaJBhScl%6eyjdPA9POZ^pwspnj!26yOS5B-Vz?hQE`5^=>7TM^Y3#sE^ITTGf4K
zuJ3nf;);84O+vY3P0-;f7WL#=QYe*<iN3aBsnCn<;-b#bwKx+$$g}_e05qJ<vFib{
z?8Q^|<a}N^*j3Qpfn~nDP4;?o3%&1{Yl^rrH`j`m(MZM1Y^0~^n=6{?XUd1mdwlO{
zA$nmFY1$e<69?w+h~}gwie^&CIlTaBrH$H&9S`nQnHnnbP(o9~Xf5VL%_$VhZf4OQ
zFxO3~4%x+CPfBp49nRuhh`{}nRKQqPvw;4GrGo^l%8;4kmsS3zu!oGN^xCJj7hmp)
zatlHT-Ml_6fo;jvMsbT<Q>ohrT_aTtoh}gNSD3fV*#~sPO9D0)fMVcT;GxUT9@(GA
z)M&0*S9fl&CXoKQ533bddd0{rJz@bo0Li*Vbj4(7Q6a>gvQ0=9fMo&=dc)1Rf~Obg
zMDjGVkDv*<oXMFJ@HpV@71rb`C3Kr|*A|Th?nyRh&c7@irE}cENAf{Iw~npIxdw2I
zXY#u)FJQN*ZKGu&9JfMDV^#R`X8ia%yPw-nJeqMsG85>xn2#d#rEhU{QC}4_U4Y~g
z7=_1jkQ+Q@1mgq&M7}O~*c%*Y0Ppc6n+3R0DI#|B{{ebx;$HJdFdZ~~Hu+5PETe*?
z`OwGbjNP$NI~oo`gMv$m(V%ebdVtUsecPWRNTk&i2(;fK6N288v1XO2DE1t=*dibL
zATc=2z?Q9Vx2O-e3{;=KB(Iv%1u38zvQy7!C&{s}0);zeA)0YzA;;TX{@-P@=5~sK
zWhzH63u%+cA<%Uii28V}b`^6b)!S8q$F=V&jw~%BgpXAg?d5I}6bQ_?roZ0>;Tjt?
z$54`r_~Ux4V}gr_t3oK<Z)S77wQ=x`%Yga#=9Y@av*)@<&fsNYI(9aRdGR0{Lg&7C
zicTi3^{^Ox457Gs!_Jve(L;-LLY3CHY%b8B;$DAWUBEEE<>&)Ov7TY8(4GKgt10Py
z=N72fO@WZbZ9&aMJ}jNR{9hgNQDJ|M)VL6$1H}ydfR~Z<{_eN({>NjIf~M6DSaSgE
zz|D}HOr#XqiVNX3Kt52`K>pm{cs%DnCgaWJ!4C|7JR6U$D_$~}$@?K1)<vJ`%OG&$
ze`t@iSoi<>@<IqdIDr|_?~2|5iA7-4!H8$U+iEa?ZvJMD1OAavWIJ*{lWs)O^>q{O
z%q96PZDDtl{9FC&oOZ1b@O+hv1(QCooT;+{c|#OMI1wZ|(J@uUA+FVGTswznH_8>?
zDA~D}5<htChmKT(b;IpmUa@*6LHYAu#YVOOHb-GA&Mm3OHA!Q4mt%riAykG{#cj_G
znZxQHFIK9al&hLS;>(p?u!h|9wX1kjAV~1;^O{eb(z5qz*ySSfFPH0`J`qHhQ4ytA
znHfT7Tv6;d-vz_^R*h@I8!#~dS!u<!htw?vZRk>D3Oxs;OY_^#*iar+W~vPPRH+O@
zzXGGo+JV!rPp)qMKMtN?&b!-vPH69)DPP%KJoxLU2{AYmVW}ERAKcycM$?g;b8-9E
z6#zWcd`LKK3yu3v?{|cv8uTmx%ARq`WME`$pd+C4IOuH)nXVY3^UypM@@hZgCVt}~
z*;W5g6>#oCG`ZdffUw6k7NzJeZeUzF|4Soq+5i9mildXZQ00{zxo9L|p+FG19^y+v
zg+82lz^vF?plWahSw-cY<!U|Js$Uu@C1^x1-Z`Cb?a{7U1#;o%`(ZxUgYv9aT+GFf
z)zl!B$LuE1N7}1t^>*6Z#D;M}I2+K|Cd}7o6%sx49DT5_iQ9BYRhL)yV^0j^(Pbhc
z;)G;jO+!yA<@LTaZ5O6zRhI<vW~oIu?lC;X&~kG36YrdYN{W_V+gF#EK`O87S-nMF
zBh5m^?6fLXLfudUypon+4Ag={iSDmHrNyQ5?B_3-SyX?$NjAkZma@db-#tZE@Is5n
z*hn1xF3WQD5#r|e=ejM(*@mrb&Q3UxF~sVxZUzyE?G4qXrbp}!F@|OJI_wOItYLSL
zsEa#PQvbYe-r(92+Jy!*u)xV-?sfLI(x?xen!%u#9V<E=Xk}?)I_sH!_3(|8Ycz2Z
zxwR#vXnH13!`L+cIA9Q*N#*JcatE{KXR*H*O6|K*g~FF?-&Q?XnprvO=6XxVJtyIF
zo)HJ3Y~RRTBsN<TC}%a{(F7Z*@7S;)Y4wOG*BmNH0XIaZZH*fWciuCS6;oNSNmF1&
z69U4;!mN-&22e`qB7}k32!I#ik6xKAK^&e%$tgl)NK(_<+Mo0}Y=9TL$!dY5@wuQ(
z)syAdXn;TulS*GG8h8M07eU_;AUsGIDrrvt|IwcqhD)kGiL>XDi~swHAXb=CUPB)v
zm8#hVum0EI6ffUjVdwgy@HmkGo`*)EX5Wch<&`R7Z0v4;5{=xtU|qog*4DwJ4cB~F
zI$o&`pUlE)HhXV~_!k)2OaCW>jFaCJq*MJOpK~z#ALtp+Y3JR0v9zXP*C--daK9o{
z!|eVD3q=06TAw_7jZupIG+oKfFf2?>c58E0-GB-&cG~Y+_A%(c%m7%1#VFx{B>y(Y
zg^$+U^(#9t-q0aqH5$}TaY{VJVHm+zyw&*&AM?zPcgQ^0I~Lbd+H5yaK+@tFkvn;N
zCDUkoq`u*A`For<H%61ZQgHpJC-~N!mm&luanyiJpDsi>BiNw)i{|*aF&s>C+yGBN
zu)jD;mMz69dgFTik*C{Xb7G^z=De@zV$yy@{6-P0gT>LdH32G?!Ud4as1@GR+N8z>
z2iQTmFY9J}M<sN~mN8evwZ5Msjk%|EAMu-G_7Jp^3NRc2%o$tE`34Q0ZFFd?jNBxv
zQDu&O_H<}Tym#uEH%YUx+o3RD__w=^jn9imN`qT6(HROu5cLFh?cr&lU;RL8cLz^=
zfih*D)_G?q67Ayix&TLx8=Zmd=fc_v<YSALG2Uw<YQ5kE>>jz%`H)Siygee9SM>$S
z6?O=Ebnm{aW<|U6hx;p}@u-!hak)<d$(B#c*bXEENxB&o(*5*%M7NrmUqm<0D0e@`
z%$VkRd)u#A@I2l&x;K>_g4zH?4@V%-0h0WjaGYV`cZVdk=gpq9R`)>v&&2yl;K%}x
z23U0X;*3b2q^PW8&ZvwegSpM|UUm#G)m2Gq=A0hPe@w#o<9Y(y1xJXh3Yu99;m3f2
z+JJo#HU<IMn-v+P_#ooyE@G+|ZmByjT}1efO3&K?`^Ko}ZnNZG`jt`Mzb9FeS?nvE
zqRkE2`lSjQ;6CzwcIN60^iej<^KVzA<&=%LI>p|3)-)WKLP!?FYDu0lErNS2n&`SW
zZzK7v#BSGO)Qwg(8jAbDYKJ%M5&$^`oZD4M9wi6>00ABh0{A`pYqg{CVeQ*Bg_#oz
zKIw=kucNDDC9@rvlV|YG-P?1gn05u1zBg8CJ*+(u3xecAGLHib<spL=Ivv^6J4F4N
z;09LPvPQuQF)f>+sydqR$}(2tuTPdI9q82r)-XUSv<zzo?f0D;DeX^3Pd=yi9e@zC
z2vwt7TINn+OT75m3!7KfdB?zsdNcdoc-@4mI`RPo%QL$9pJFQW+aINp2>yj;*T;AU
zQvnJ`dw+Jgq1m(PZu{4He`#fYSG7^ApkVWq5XS3Ec#s)pF1HU`chR_tA}0`qS4*@R
zge1W;VNUK_3(RK4Xr-K6?j^5?mDUn#FfJwvsQ^Z*T^gbRTWh!*>s^yOm8$(d%hnpy
zDIY9Hsl{quyyxjPCwQcsistCFOu9tn{7^pbkjNL0t1mY0)~-RV8<;hVDFl0nB-G7l
zySy5m^Htr{Q2fA9YIK@w-4<jW=6l`JPy-V7&6YH@PuZ38<akHz1*?}vwG4bnEPVmR
zy<SUY6-SDxF|#<?3<rcfa}aN`gAU9mUD1{`{w57&Bzr(0XGRY}BvVIv+oTOI(5b|v
zh-Wk(@=r6}Ri=t99l0}LhhQXw&2;$wZP>{}eE`U?nie|))T5sEnB}<{`Uld)B9*@K
zZBRJ*5)62#I@)m^+ruu_<NS!JIjk?3m2-Q&DSvZJz@oW#Ro$Wk%@|4q@uYrXk^@3b
zKWBb2aoFF0g=&ky4+ZiBBe(mvCa-U*M6|#+$i`*{B6`0mcj+syRro@JR9iJ#l{9Oi
zfq6-<B;{PU#R)0CI#^D5kvxC@ijQm_CW3bn@H{AvC+;dNz96r95!lf}n+Uy5-S`jP
z7vuFV2oosFXGvNBVCRnkZ!o3p445I;Bum1*xIQ8jXs27L*qn4FkA;BO$(PGo-4@@>
zYCdnL6Ufi66mDBWS;asg%1O0Q`@4#sLD)0FhfuYav4pri!Nq%^yV8>}*&`BUL7|Ac
z$c|9X<I2Mf)biFqd9Vnv3r%Mo<n+{L)xnL6eU@A%HaC7O0}TOyO2w7@3^xS$vs0s#
zD+7Sq5X{!X7<o_0FuQG>Db6K_g)e~@t5pa>c2~|ww|hShorLo=@6nJ~+hqiClE7uP
z1qruXwd?`q>i>!+?_l*E`-Tt7(W0qqYZUdUXFap1E@X0%Uj;7Bble;W*aFWoNc&Yp
z6r(tP3^yZl$nrf>qZZ5Om~&eq?$K#V(9L8+j4d5q!jV=bJk1~}kOx(=sf{q>e=&Tx
zSp|x(gVQwDBDzIVd$)z$lw-s?HHfAWer~2Jqjf;uG}hA@cvD*@((5OEb=8ZFUaE-G
zeCov!y8xZQC<0oh=p{ih;3U%+X1LisSpeD}{ANKV%GBTIZLdu#79(VsWFYnoT)2Q@
z6fIzvL-!XkJz`{BCl&*RvOpMIrZngH?|dfj;WHIT>ISN4mz(Q^m?yENxvxu@MhQS<
zHz!8DlSuY^>4HY0YI9y&14af<F3*&MuM_{aej51dB(^{yxHo9A4bFO0saBLx)~Kti
zRNC4dIgBITtFuOU&|PqGn0tEI!o<NmbV~LW#&a}&T-BLtWIBU3hu$yHf+bYYm)KLu
zvO3XhupH0)jIu@;m4Vf;n*necHTrlra?FafR`)_>q;Rf9xuTM`tZ+vYN&V&wYg6yj
zwM3m`h5TX+oDQ5|Ea;M8Q1=h}V<xrd5Ht_XIk?%z(=uW5^*K{~m#SmGZNYJ_2Uf%o
zs~<Mk!`r!;Yzp6~{G^x%?h8Lf2BWYm4WAVzIrv;<*!D0f%9!`i7&a09vWpK~Yw+KU
zZa9|rY8afI{=jqdvzJujgNTgLkCY*0B~P2%0f|L1@4r`EP9P95;KU1)Gi4eOj|y9$
z<Kq^b?N23eyEa_QjW1U}qaXlm4X%-ybgaNn<zN5+0yQwPByYgEBbuT5J!yKS{4u!a
zhR9`tR{;g(5ZZxsg4*+5Jtn{2lSge&b51TNP-r>pVGU7ZhY#mZd*|FBd0R3Z>rLT-
z4FOHp@2y(3>WzN18uUo%A9#AqC+Hji>yfl-q(Qb)p;-i!G7Ul3G_>Rj6u%<z$@aWJ
z(>@PJpt<qR=Zew)%~TIaMZe4@*+C&x_s%7>kT<8&q>G&#qt~y#fndp~HY3qS0+9?n
zC)&}717nuQL8>|cxBRDNc1T=50|laT(x&M=)A3Y_PEZGv;w8b(So+;-Su3(^5`ioL
zjcjrscyCEU)*kL+KpBzU_$Js;;tQWHGDe?*u`w6}2BLfVh=hr6nO0!zZCaf)^nZa}
z6%jP7XECtpfPQ=n*oF9G)>juo`(Q}nwf+<h-t|8n?dNqxWYNM5$K;I*pTbd&t-Wph
z<)^p)e@ePzpfE-BPrnHL!$0`s^L!U$UovxmUW)X4Jo}=>=!==&Xrfcn(KGGU1}i)H
zbLX%jKB4Svws$$nuv5_j27U2mDuPe#rP$@L4@K4&J;t}qon#g>l?olci!vHkOiH93
z8&}U);RZCA86k%fjGpLF*|x?M_Ngi|YI*Le-eRU8ZovC)ru5&P5djgl3D&+VVFTD4
z_uWk$7pmp4C<z{HBeUt(eYBo!8$;q0fTYi2bpI1in0G9*Ln!Dnxm~Eq9VCJ7`4E%(
zETt?2a%ZRlO7UwXAdvuGeKTJav$21uLWycOH6G9@5+X3?)tf;uKrN`Dp&RK))N-bm
z*A&CNYbg84y@vjf1Llwb0)yYm&BEP{f*dhK5F2&6IE1}=6e4<Vvd1Cr#+YUCz5hVA
zZ%NB-j{AA7lV^Jj=>@NYxSj0C_~iBbR}4^f^#6zplMwTz=x_*qWE2^9wwvH(h}Ke{
zG)zB@xiM{}_IJAjcQrw08f>@V=ya;y2rqi2Z-KPtZ7==(AI%*WPN{5^Bm;2zkWMJ!
z=kg+lJ}zR_ANlp>uXnQQDU;5N;s^l$$XmDz&GIo!_uT-Knj(}iejhHu(a$s!n<pd*
zT%^<G+bIt?YKC%Qrk};-ZpB^LK=@S?3+7@}QS+YxqRXhK&fRu#K|Fi><TpRn+^Vf<
zfWPm`{b`bgwPK0}0tyyLH>C59yX;^*c1Sq(rUZEl6y<?_G6fh}U67T!C3}w`QPe%^
z<lEBnWrAfElU6)^L`JN5{S{P~(IkVHOi#r^JY5*?xh3@MuY3b<)kfsQZ+l0M^?1uO
zVo1go4$o^v^+&ted7tOgf|+}JI$0U9m8NCA9QksJ$h@7cg$ibNqAdn6KANfO2$cg8
z*f}N_8~$jif?arR$3<3FT(mUJD!>|UfV=fMg+U@<MR}9|omUqQ2j6y8e-)*PFGY{z
zFgh;}b4F2j@)!Hv%T#?oTs>D1dR@QZ*&9e>Pqv!lW5u^c2Tse)%~YEvsAOYcS*-ah
z81xe4rYkTlsjw$~ZufuZ=krs#$i~!IgqHO1J!QTt9HAL}y;Q0(_a}~0SpqxQv6G2h
z-xj4@+(}-nr&J<q89&nF*sJAEIm+dB>SNii7)f{0NDc%*+xr`<BrOV?*d5q7Q$r@9
zWUkOqqR#cEF>HSGZRY2zQrFB?SzNJO$-d@)@C~myWs#%FuA9`OIltaulb?<1k5+4P
zZLb^^j5a&mtn&w_T|xHxdE|Q}=nk&C=na!=X3xO<q4e2CpF2WJAU-QMYPTGKC%u?|
z*+?k4dP8Z@zet4DtkUyB*Cs(AX})xJP!9bMOj|+Hm0q#L^gM{w*SLunA+&mVRSg2G
zihgR4>!1@qWEbBMeM{e)qNzJ@g8GDxdi?75>@s0oCS);DEFlt8Iu|MQb+*9M$;g*+
zl}Vlc-1~VR_yrruOt|DN7LH1wBh12}(-A~;MBD2Ku{1z%qA^r_e&`|cbVh!`!PZ4B
zti_%MyAmCUJw}oQXR#3RhsZhaKpLo?&{ccU>b<2|W*#qlG{7B5t#T`ifOgRH7As2P
z)QUsG$C*pg`X~%gs&Zl5Afs4q6u?JYZyR2;Ii3OAr~m)}4rK+UVIXTXzW?C3A)hi3
z(F5!|M9vOi9WdUmqTNZl5~DuCnOw3d`zqMI2Fy?xj}Q8oLd$}asek=`ByyP3Bou3;
zE&g9+2EPs{HR;%c>kxMlG<{hjGqy(!RSZ9Q3KV&9yPdKVd4iWIBS+2`0((AaYhO>0
zD)8Dk!J(o-)z6o)ETodtXx@?L<C}#d{aGM@zdgw;hJR4#EID$KUeYxK?e-U0oXa_1
zOuH+36LpRi<}LBvcsuFFcAhnew^AtPTl#1?bwL})Mndjr*xZb0giI*>5OmjofvDTu
zQJmdnp!g9|tD3;|1ElBx7cT<j$X0BC=ZaPMs)Hjq9neq75Uy&57(E7J8Rf6fA-g8A
zx<`!<@VAC*lhDdtH71W#Ql)jLrT-c9vc#0mz79o5O}!uQzzw<{%Jd@^I{BepG#(F%
z<Y?M}N;c|7_>i1!wz)dP{XcnkPG?qXCp=CVw4^W6YttolXH!GUlKc-qm*!3iFyS1f
zFutJx4oyF7v#zeW%jasb)kd3<KFm1oks)%i^TtXH6H#UPad|C@6&<^^dHuVlO(Ufp
zHm0l0_^^kqU*hP;qI`xB$nI7Uc%nvP4CHMIdW~-B*MBCG%1YIX`sbT}bRMmi*+m<g
zb5)~+joZJ;Ot`~rh_anM2$QlXB9jxej4ni$SnonXgQ^$RXhj=syW&@Zsk0-{KQZOt
zP(i`ZeNgTvNqJC*e}KP05xqdt!p;azpGp2IH*dW#(2p~QD4*uh3b{*FU$Dyh07+k#
z(n4YBEF)RRD5&$!5sF+U{Txsz7|LvHu3Qj#GJ{#4!?Xk99Oc4d>=95E?#Z<2X`?mP
zODh<zlwX3wi_`=JE4g|1t$3N1yeIpHCXou-u%R!Z*k(p$z8@oOe=5d<RDK~-PWz7m
z)UeO+5qHVKgiq}ujg8Ew{5`u`n~z8A>uyfY2n`u<uny+TC_R`(kbHR9OJYR#%1zgr
zCDHGA2wUi@@`^6r=>YAu1i{sVuHb7*kk{1DDXgRb_&!^db&*LNkWHakR4Ss6W=Mkp
zJ)SSm_w4pqtz@ytUY85$Vg*qNsJKc;U)P7Pe#i!5GA&icqaO!pY$ktNejO~V9JG>Q
z=VU3j<sdq^0o|x9_lmV8#l(TK$DKa>Ldn-+N~_l9b~Lzr(pO4nd%bUc#EExD8J*)l
zGA1GaVZ=n0f4Hqf>m>9OjC$yM!jtfGy(%x&#C@H;V!a;cC8KlXeWc2U-j`$ID4ALC
z$Kf4@m8as|GP9iNYR%Dpy!A&mrU(}IcBux(5?8TxmE8fb#lb_xK)_N#Zu?IarIVT!
z>8gn4)YnzVjX`-wmWwbIQHlj@?=onGjy9^U;BnpLDVf0wMOBe-^D-J}`TpYjt;hwt
zLQ>Pdj%OcvAwURbH$nlD-C55m1@zL=G5@e^irN&4IQcVZ{C-Uq%iuwwp|uI0yKGaU
zc#}>F?7V8wM2INseM5Kx$fEF(0KD>SYIEinNTZ3<Kr6K}xg|Di6_`ZL2T$*6aaAvR
zyP0!gEYC{`a(L>Gu_f^!QaCl0-(2{RUNt-&v>oT)9XIAiU~bpkteljHpc7S}$7ZA$
zwed5ACQtgOD#i*++arDPvb8kI!2Bs%;z`pi0D>e)uheeVC?uMXc;!2xUhV!ZEmjea
zb%5V4dK|Wx;AL^YKV={oF$~%JfodlKj+Jxr_f;@7cJiY^&c4B^)Llqfx|(f*Wq(y#
zm{`v?mBb>j`_|%TtFY3p8^c*}M4IUu?4Xm)XfZ?;IPRuOu}auT{H_IVCLfy!UN1)G
zy<}pz=+~gh#oPB|pT2!y*T#!5cnTBUdrN-c3xG1M?%JgNS0zZqH4s;;nq0zPI_!&0
zO^h$QbDROP@VUWbA8cPR?HnEKwWpucp0G^eO9iM7z2kR6fB*m?0w^z{{BMUbDrx3n
zr9NU>7jwHW%0gX=d+mW^h{RO4?p_K?SRB}0rVk7afa{Q0D!NMp?4?eULPe}E0|w-u
z=l<5&?hW4gv~ud3P9?mQ3S&i1D}KLr!E>*60C5{;jtQk{qmiY2O_Lm2gDve!ehC_D
zfR+5q+{{7!vX-6$A)v5V^@Oh1!c(S(|893G$Dl-FWMh_o9ivrlgJNPFmx33MnZ%}l
z_K&mrDq5S&qm;Ufao*tzYDI$Vfiv_v*7X=Vf8a{=Bpcx1;dQ9>f^490snYZCHK*{2
zv{P4T+b*8ti2Cu*{qON}dCyi+hV5$zGVePz%{<#&6s}YQ0H@$K67S?1j&}v&Hu4*!
zyB+``e&+qc-Y4J%ou0@gUCKMlmpTQ4q~Rre*9CH#7gyF3I8e$92}{aW?rUsl+Mp`=
zu-l-i>CMYjvCfx2So=1iD0dzdc7q$(rkfF#7i-sdNh`TTCV<c>kirX3ZBf<7;HG!U
za0T4<n$)vAM{5GKf1Ze1A};e0OuQUPG&rj?DHccx86od<>lhqvx%KQ`7B~a^fu!Ws
zo@#2E5N4Q~1V!D%x+e8NwJm#}UrjooQx(_zzW$|2YLxEIRdG|DNNBo1);}lbBNL$#
zReglowy@Sp-~EcBA#3A*mcR}5+c(Aud3Aeg%WY?h#z``SXa9c*G(Meb{-?ZR;%(T<
zC!Ko6qFMBd7hnK36WxAQEFJ#bF3=BaftXbKUgo>(ON$=9bY?tA?asI+%`>jS#_>38
zU3vlMgK_V+Jo-ACxav_Dzg@t2se#^RuR;qbbrP9o5t7MWov`x8xXR|=+8fP0`?Bpy
z5oifAGzOXGyf|RVdo4?r{uN;=zC0@wy>b2%sdUq`%)V6{J{;%aD#o}X|EoBj6ehP|
zAY^s++OHHk^ROEplk>a>xvc+qO-dKrfSZ-tqh`v_?+GuoS)jI$Jg{(Xp2pMMaCuHF
z%=;XbN4shfA$>xz6ImEt&JCe*PXVr7v*~h#Df4sg2RVe_(mvkkj2Uik6`4##&HL*{
z#BW*-W_yr-*_xGb19K!WkXRqvx>)jrP;7#oD+<U5+ya>~3KC_9{K%o|KdNt?Yo0M?
zJZ8$JJ|lwRT;4|k@RwEc0wDO)E#~{=IvK1hwv$Q_;QoFxblU%dbo`fdYRDNBeDP_d
z>y45h!t8Mo{m~%l*8URU;=!>Ga%Wx$9ip12Y%^$g3dNrBlIPFCGMD=%(~z_Y(z6cV
zFg?>xe5qc>ssawTN}yGc_jnqsye#<{ej&8oK*u_Rb~cHwSZ^MjI~N1iQ9w*hTV!y%
zyMe=-*$_hY|ETdwwfF!oF{;iP{hoZv^`!V3D@<EBg^&Q(H$O#oRt|<VaPym5;1pcm
z#&&9j)q_H0Uvu_iX^R$5#bZP|ymO4wMN(Uh&@L&vvm}@&F$gs7p-!$RF*(av+hPpv
z<vq9int|A1`g&9IiI&f75y7dj`DayTYmqZvv^M_z_7{YTvlJbT(@FplV(biR3V^mU
zT^*hLKHEl@;}|%JH;KL-2~*GFqeT<aJ;0kB<W|~=U_AZFU<1<raOn?LZ?rz6p(Lv5
zB`)dB;%=ySTL4e60bEauWB=bCiRkQXM&s6_hy=3uCf<Fn8mfVjK!w_E6tnGOne&QV
z=3zjWWE~s@qNjAH$qgy>0w)yFX@;_H$5CodlYH%Cd{v4~^%meME;PO0#rmQw?8T}m
zhf|N-F4nwbOH}lD*7AaBhMQ~MIBZq|5y<sG+I4=YARf6<qi3zD=C%Lcxb{!r6Sc9E
zGIF0;gS-HL9Kov$TAos3x{yhl6k+Bqp3Hut9WM({`HD7!stgLDSbks{S^0X%(Eove
z)>$|zlNnfJ&BI+b?tlnk_X~BBYi1DiIIT(&+oA+@{Ud||RFvbi8lTCBtaK?mAm}-O
z`4F?{Og|^z|GI^-4NLVvXb&aGv+Ofehd_yw`{@Q!Zwy(xq7-(Npgsh%Os0-bQ{dOR
z42Q7|5DTa8l6*(=KmY(6koQl?(E(|mjkME!2Nh~mh;)56tiXEW36#0jsv71lOU-$#
zX^E%=IUH`Z1|q_ZuwgrVKJ#z!fhEDbSi_u|>C}GD8Ja+4y-VogN%8UhJy%yViF$lH
ztwwG-&SR*3m<QH_NpXO3$6<F+te&0Wg_>C`98o-GU%Ao21dA&tx7|+AL6QF>=06`&
zL2Dy6r-pw{(#f(7U(m(NTQi@`x$>i9r*xxu(tJaO-csBF)US!*mx?rPYnbq9;N@Yl
z8;)~d+FiE+7YjqUD=oHB`4zDQ#^IbqBaGMCzKPf)kU6+{8+p)f3@IP9+hiu{efou$
zh~C;Rp<mzAZlqh@Vb{u+5H-e=+GNJZbrSw54Q)7ZwHQ_9(odr$NycW0jH1t&=&nyG
zteMlxkf8o28N|d78S_W`Y^E7y&LzfC0WIiSZJPzu+ZpnU6C-^a?yM4=vmkF_;zDXu
zFIBpZcF_T5CT{ittkc~~L+r^9B-BnT{x8OVjk_%r%iESw(;;OiG7VVtSiT~a<~)5Z
zzTcen{oSr>DTKAWPLv1-XW|Pik=^ZW*F*<q0MUJM^_}<l^iK=dTMs=kcoIIhOW%oH
zbCk1_k)VLwQ!4IMm>Wq{>Hyb*McQ$Xcf2I2NqJ=dy0}WdRUBZ?cV8?nYW5wbrZ{W|
zsn^&U$~!y-7H(Gb%Vr?yr?4&LxiDQ^L;IY_=#bBu4d`00vgxVrV5bj2o;UA5s%hDw
zT#AyZ3x@DMAMSm-b$saZ<-3Rq9cyf;Fv~GbfM_Y3_TiPWmCkqlou)@d@)D)PFJj@4
z5f%}V*F9tMCn8%%YAPmJGk=Lwwm`u3VDu9a4}Wl-v$bCEHK0^dh+j#6>Oc}ioKF^)
zjE05h=K<gE+z%8h&&znmav&4_2ttjBBvAF<vm;?Ap?<px>V`=dl=Os7`W(gXfW(i=
z;7lT0y3snUnrP@I>$j+Lj1PKZU$UBL#*n5=0mC6{ggyB6^^hkKN?{(`H1gXh4D5uB
zVXa$93fFt~&c-aGU))E%K45GQK7@^gn89l9WYcF1oCMsYE+P^shKt?k3;^_jShq&5
zAybyeC=Msqt5EO<y3RG`eyIVQXX>M3eQYfqdCr~au#OMI=|@*s5FtQVi-DMwv>^3(
zkYcM_U_{4Y{)e9ig(O4q*U$8)(g4O3hG{g5o8Xa5;yMHZP8vPJhwF6R?;p=E7~?f9
zo}H|m?36R^G`c0nIYCsDYSAEHeQSw_k$%L9oY!1(JZg4GPE!yfE0r_eRNzay;Y!;^
z9$)uPCVM`zrH7k%BW$xU+I+poO!p{3v^~p~ChKvAHEf8I!`)v=Kcw1IxBhm9Svv@%
zbY5|xY;<{tEKi>6!z>nTG%!?FE?bKeb=dw2x|}gTW}c0YWr-?jYL%TI++7F<5#D;g
zX)W1v!IN;**JSNRx#FvJHkwsBW8gYS-4VI=GeQh~>3aMxeSgeYjI$G6IRDWhQc!XR
z4oVx=vw;_(IFB2Ehynf}P<JB@LLKlivL9IhUu2Q9L$#rHDsp-3&x>J$GB%fKrgb_o
zz>0u_;f13|r}8^=quZ;VLxiEgWN4k@+S0oakl>~TyuGmKbsS~18c7IQf~~W$=bNy(
zcvJROtk?2}+$OuIn<1M_-uECXflEp6gnVom{TGU*t=A=E`x$<n5eH05UDQ_h-k+QJ
z4|8pP2BUMztw+bOIi#pDTB5MFMjDe#wElzNFgv<n|Dr{rS>T&e)I|%Wl@=^W?_*(?
zL5>)EmWXF9k|&Y7aHR58Wmjv=Vu|1+b9h7Tm4NE<M2@uWp~A~>>eN+i%bQ@#h+&wY
zeoq+E1oD$%wC*T(^`E<)a=ZC}IFUGm4><7E_mtRj01D&Qs7?U%b_FWEb=vIz0ikuY
zjITu&I{do)2=~Yfbo>zK-<_WOtk`Uo^1Y=SI7x6OA(>i=&YDXBa~nAyr{;G2LDtvm
zR@-U0lmh8^fxCOt^A;XpLbZd*qz5=-7nQauXYU(Vpd>~g07F(E`g<M5c^w0iDw8-M
z#wEW}o7B!f;*GC5{70F5K_CDC03kDM!66O9kTh%=#h@%Jqij=cFoxNYGoD2#y&+uJ
z0F9auFXi*L{Y%AZ>}_aK9bT3~LN`!VGX=IRZvJ#<QN$R5n@#P{8EK9^i@9-U%Ny<y
ztCP)J#;FV8D3NQe_R5iiY;!eLQBqsnl<%F{f2QHamvGYvU&rddhaoq2(Q|{{%HhSG
zeMpLA2`}flbWpXrZm|Ta##(c@J1TP&9nt7gc|NEK(02Ex+4EB?v-v*S<8Vn9R->9&
z@>ZGAG$xVtesWKb6}Qg8YLUOnQS90(6j?Y!pwS}l;Th{U%z+1xS^`FGxayq}B_sb$
zPrnYsCR<?pqhO?5lo-lZ0Ht9Z8m*#jl^q%t@-q8By3nBwESqtZ7PH*p2|WcnPnA5>
zf277xdk{qXwa*ZE^<HASzRa=5D@n-2mJAB}_hBh^(6~kFg?%KLyik!G=-~a1p#6O+
zgCg17DC#?Z=R)Zrsm+wH*k;OQ1Px^`);&Tqs8;EAX1V`p8bc+jGVArkwB=c{$tTEG
zJg<!0_);-=XYqYw+tA@9Q)ucFn5`>a8xTU|f~V?4Z(`9=t9mxUz|o+&IyJ6ZXx`*s
zZ#qCfglKbB!SB6!lqKc~>7io!uJ4P9NE^UwL9;-)5DE*Ex&KDQ#Xh{u>ukRfcC&85
z#=+EGkh1wj1W?Jn4Mlr7Z272Tsqu5ud~kUgKp`&#_A&l*ltI5Eq}53-j+Xc@s@5Xo
zPQ^B=3v}hHJc@qqtP)D)AQtWrX9^g%ffduhSf!8s7SCs3HPj-?^lJ{G=d1Hzd7%rq
zBeFC5j@`huExC>LS9LI}`K=YFH%)BECvjT9Y8j1De(l#pX{m8yX=|8?Lh4d(JfK})
z!=WtXLq_6zTwV+%gPN97X|H;cZbt>VUMI}R1_25SzZ5yat|oDyV&A9u;;@u$223^&
zLl{-~EhF4lu`?7cClJlm$S{pROzF}$@CO+?pog*7m!rIJlc%dvsuLOKiX2Ptf_wAH
zTdU(0wpz<u8L8!^%BIk#jYK47382x}j?j!WcSwOVk+Iord}b?DX@<zF+ek7VHycX5
z?D4k9SZG-jdTJdRNA0fRy1pBb)XoTmH+S)fLLke!VklA_y?xB>@j>VFt1Fx+`%O45
zCap{_q1GQzAslb=w98BRy!(4-iG3aIAkFSG$)D>q@Q}EMEIqSHTEpKA)mm<?Z>E-B
z*Ahnv{s*eK80P?&_op~pVLmDt7dT7F#h07@p8Bg3X4jawsF>zJX0|A%cmK1d)vPsX
zzBU|lBT6HiXK;vR{iKKSdA8R>B+WK5hFoc{L|J*<!5w9hbNd>Q9$rv&)mV7}fad0v
z&OtG<J_449897mbCSCn?z%4jf;b-8St4lZ`+d47KIVEzyJsXKwv9vwSzd@7Erz%N>
zr>1sAn`Pn+pGNXKn`8fZdY@yF?6|)VGUyIUT$qX=0k#5lA)f}97_T|0Fz7hHG$CZ-
zyAQnZT#7<!E{XR1iU^T32~+=+wpRc%@ESc2fGlG)a_X4H4HtsZiOf8Fo1~uH;j;rW
zaDKp+gk)F$M79dmWS=^9lqINF{aq6Th}p)}5PxLUt_5k5t_x|3mba(yyIu+6RrjiX
z=gAH|V3|FAgCl=$A&b)ob%vW&i}XnEll~&OegqM9=BLVQB@Hh8DHf_(t_4U_|4JhU
z6>YXGuJ`3D%_A>qY0Nhm0=r-P(g_1f>CiLZSKLT600009RxpiBY^vaXqcRZT;IC*R
zh@<TMQ;_acFQ*Xv#u*{MJh!-rdH(^rLm<hxzCA^p*S`00RV<7IHzU?6hCgl&?W!;q
zIh1M1pkWm#I|%Sn0ir?!p;yA)b3p(~pMbzLMUX2Jq&$viBb^x&|Eh}p3ZOSMs=s3T
ze&c0z01`3)3m|V1-8q`p6EuBkj$7yaqtHwh#lXXxYjn%Czej|~@N8sBV0PT3LJiS*
z9_XIvoK%W}ap&;&U~Z(OO{8?;$Xe}1Q|9OL@iR;P>q*P142p@(zb}_6V6kM8QGy!X
z>7diSm*^Li2%REpuU6h*Jtnk@(2bGaQOVlmJpfq%T5Y_U1A9f0%@hJmDz>8V!<(fG
z^X#alAXZoV_~EIncfj<dEWqBF81)wTmw`wruTp$PRT_1w@#Fb!h|dkal&E3C7=WrL
zl(x96GK858UzA3Zre~?mLdtdfzR~#uge`<6PK-7mlAH2uUdbkl5c2Ep3!yt+i5Fbz
z-EvN->S7V!$`+HP>l(CNW(SHIYd08@F#ElS)PGJSTHR$39-2gwW6J>#aAtLYtI=Vy
z&A-~=X@he@0KmVWyA46|;sESrFIaW8o6@iRG$E!EbKs*}k_#dDF0<LYz)}<8=uf(y
zIi^NwlLPr)W1&Iq&+!mQm<CgSY}pJekB@R`ChRxM9(*`}+8dB8NV$L|<SE*EopRr+
z28eycSY&yoWE%|=Fngj?HiswZ;C6eZ76Xap<jt)7IAM1x`l;F*UlSVk@?vyxECZsI
zk){UyfnD|ag802bHmi%%xL(NofJFQU#;PlE-5dw`WRD~3FtSD1H_GB&LC?Z3$b#hk
zJlx8+v9Wc?ePoa?R~k(FTDt01$wN}t>LiA@ae~yQ*OgBf!}xwY95vFDWv=0<1d+VP
zBO!Ht^lO$a8EdCo)fuD>%L?njunG-OkD$sV63stV*fliU3kImOG>U(zSZmP6mjev;
z@4o$^3N=xcli2&i?ymo6P!xxrP)AD-^)Y17mZ#|;RsH#krB+q^3>cNQ<)K>Pe}tf|
zy3de*dqfKDZCYM>r9&;u#7T7~7*~nOGwxu||GJp&(7pXVhmOBZb{A^l40q*Z&W&u>
zRh{EIyq)&_nHm}Ci&TbKU|g$>IYSAH^Exv^u7$WZ+nfbe2kGsKuIm`b;c=0jHITj)
zR@<5wbej*$$l;~lZOX@pRw}Ql!?2l+K$<*x-hdR`Q>+w_sT#f(4Ef1A3FIrM9!DLO
zO}%SK(1{58@HDzrVq!LAdElWNlOgkl47+B-5))0PwtfUCSTKSaMAG=~j1P-iC{uGH
zSo~TF=>=nf+dAVzXM$k=5Ev27#!sAo`l+}qe1pZFpu0(jV$~%_L@kr{#Bv@V>~YEg
z7L3AyGa{dOn%e#Dq3w((qD12xWRrQ1BQJYareKJ8%}45@7vwlKR|{%oD2Qr_#2LuH
zi0WvM$upZ{NZ|Gu<dZ}z9Jg3`OZk5}_SBB{4L;q{rlPRv3<u`E4uAn8>7A5DEsg+I
zyV@iiKL~*9-#YT@qThkr3${y7cuNPH>ruYxFS^gVW$HoMfOR6lwRJC-G;&lt8Du1c
zSSj`bJSFiDjA_od(5*I?A-BJ`3T@_Gy_Kek35<#lwu5e}D);3kMpDv{kL?130~|eS
z_)h=;004!h+>X`#m<uAY0>z+9z?v7FM)f<}4h*60f>~Mw{o9lFhsvd^SF%Y1ItYwf
zoSGu<y$NW)6W3e`rcn+=6vCCjL45Vuy8}{+iGtq8kt6^1pZ7_?8HD9_n9UUeMQbpt
z&#Bzek?E@={ZNnajxI;Jcwm6^^&$R28fs9(OoK%x3j2P*hF*UWOQa#pKA#ePrw#uG
zN-}>4Q+u+S>BbU(f18sPK%Nbhq?2b?x)+EVV+hqI_;^JEGV&?#!T=O;D7I*_*`Q<a
z4yTLtJ~4jdE)S`o9A!@%W!U4hZwndU3+cWZAGc1TseV;tn)2(vdl$Xa$1%PB<dVgK
zNn~{#CSjQ(Qr}C1;kQYJsbezwr7Di0tMKCTOg}R${Ct%`mA$IBXEj1qf|ifv+B#ok
zSh!Le66o`IZyPJ#bo&KBie{_ZZh}T(rL(VVTNs2lxX3V{>Ln$F5{|by@rdcQpY>f0
z(`^Rwj?#vlH9^L-r0N$hCX0}7n!>4ZaI8i@T99{8sQXz>l{GQ=C!dg-v9Ekk<}Dqy
zK(%&;i7K!O5N<MLc9C&4Q&6bc#tuxuvH45^1<mOTf{3K!8Z3Z@Y06QHB!be5QU%{U
zEVxHS>)z>BZ47=vjim$tFQV(Kemj9C`-&G0kLZX<=a}PPEcLzo@%Go$f1Ii_SaJl{
z2WiufcvEixD@Cfy!mCaUI9qC@w`=nu4QRA$!X3?#(a@xt#|?Lq8=BZh8s&6FAcCxE
zebVPckOqEIf<$7E(O|;<RV6=$UR_}EDt0I=)Wh*%;gh4|-q8zlE%Y=kyBdIR2z18I
zl1cvEVX(j^0zDKhun(OJ;(QxMamC91qAmEUkBs64dz@8=1ikT4jtZdjvRfj+b5ksi
z#ayF@|6*}Jn$6=o4=kCD`6af)_CL{=qlK(AZoQ0$Ixg?B%=EwAr&#nrR5^_dYRI?5
z2gMb(m}$ix^mZ<R3pdv}>ok(yoKl4^z2d*?`}kP0#)z@*-wiTuHTih`y1nKNrP)vi
z#+%uni+{URz`ZRyCk2|hac|1MwggvT{kpxe);|!UR}MlV9%x5ue1ar1Sz&^jm#*Pw
zR~$2fMCZ7`NU9QoA1|smv~zzPja&aDeEwX-?%Z>=XpTN%)_x{Ht{V<u?Y9n-4AX0c
zB98E3Mo2v6)xs(n0ZJC7vs#kJXs;)<m@bG$#^W1Wvh1*`Gh6jlmWO(Y{#xw52azMx
zDr$U?vgq<Y2`ysVz-q`X{KqGtS=RUvt$47QyRAXODl6ZxtNW^b|C8K==!R$EP`Oji
zUf~w_WfELwNh!AaU<p3ohk*C~eT5Xy2~U*gu~VB&d5Yb~L@U}u*2k``i07re&+J?{
z6fMLW)3$r;%?Hf$<}1ZR!Q6f#dmc8;$5ART=n@yoMROrq7=SAkeyFrD`WP3li@YnT
z`BJW@6j2x4a?tR)M0VYjnwWWw(}4(-h{k=Gl;RwY)T4>z6ih}BVTI#c>jA7AX`+eW
z*`W1TBhubiQD_W=mhE?S+|8!G%(qy<FoIgSQiZ#SHyXZ+XJdqi&3UhgWd)2?P9#PR
z0q2&FP!O;v&{&NcG*bHqeJ-&Y?c^|qVx!(0%s0A+ueyOPeE!HWI-fAHkx1)4HxrEx
ze3HX-koKz{mSoDkpBU%G2TQl)6C3Gu9)e?l23~PEa0m6TPhL?u7#Ta5&;ohD6>*;p
z1T+8u00Ef|7kyStK$b#)B|Fa9t^Rjfa7p1uIV&-7$Pnbhm8i}V^bu)Oo+{@N#XTt1
zW-)}de$<?_4r&w;3u8?V$f$?9U9^|7;)Ym%yVtK<60*j&9W$=dL^GOHGlEx7Z0daa
zrzd%WXKyfwfl@PnlwqA3MtIz`2i0TRyn1KMw}++8fq3BErkFu9ZxK1}2^c*^8j8pc
zr<B;&ci_<YFF8h<n$>m5NPSaSSGq#ZM~V8xorN~mtn4b1=OASG)n%>#>CJUf*8yqF
zuI&BAnY!2kb@9}^jm;*LF$mv^O%gJ4j0!Ll5ki5k`?mm+i4|a1dRs^BE)AiKd6p>C
zpnYVQt&&(6Ku!H*z}+v&-QKE7F&V8C+BKR87LeVuRjmjNJZbfG|GPj{xWszGiK8uZ
z^yh;&mgZdfk%P0E6NZjR2n~FK^A))@^tGK!N&!iD5o(T=G=)FR&b7m6-C2H{2vY{m
zjZ=%6l`$T)9}|S`Z*&cQ`Oh#~#z$6j!}Y0jeIuoA;nunpx<mYp;t^pOW}AZox{k4f
zUV@GH6Mb+B>$!Ec1@EdUZaOfLXM08Ug_o*<NK#605PP*99*c?9+;$;aQsG^M(vBep
z?yZv=8#xfRE=BTvzM|04@@T6em5wA*rC^}qIk?YrOV;bbo&Ebashe-W`!>R7Vzc$I
z3v^o;oqT3!zH)=1GpF{nXkJ8JUKf+<219{hEs%lELFfoQgi#n_oF$qdb}*xE(JWuA
z$Dsnb8f>s>F^TFJGoykdp{08*nuRRK3|d{G`q)|~!2#|v`I?m$s2Zj6E1X4&d4Kh)
zN=v>kdj-n5Sz?Hc(*P>SI0HPF;a4Vp%QW1#TVk(at*`3dQpQ2W4L3RZIb6(u5ltbR
z=!nF~bwy%I9yF*~_PmRfTyO`B6zVxAovK*kJi>hx*MJPWF#?i&AI*-$od1F=;$(ok
zynaC?rngo6B3RM%As?aIZ*3Au>*JAkg>8po6n-2GpyqA2A7Av^f+!5j2qSre?`gne
ztTTRF8un^rR?GQ|j9Q^&{AH***WVWU-bXs-ZFAI5A_Lrf@_HCN2we5d(~dKaP3)IG
zgv>gP0vm&MkFPjIJ<#uc1ZSU-fXilh=68{4dvWexhysB`P47mj#WeH}-11e~6I~6|
z8(4w-tii5u$jS4cTnli5?P7ORWVgqq_^t+8*u~r}+YhSPa_0qIXRt1iwd@l~$7_Sj
zDaI@k6tI7#NjIJOD;$w7vCm8;$>1xlkUyDqC1JgQcG9YhHnW3URwSsW6*bX!$@Ab>
zF2x0%-(@PNo{jPbZYJxCN@SnT(xRSL(Ll+&hQMNd?<q}8t1oA<WLmhTQdlWJ?bIlH
zsy2;H$}y*?xGiv;P%$pReTDraqZ+3N^rzd@7jnm{;iTQ~e^&IbPmE;GPRCIR#3`h)
zO3p%GxNwgoj@>Zm)pFo>ibPVD5AcfyiSXpelBD78YAp&xChkzuQ+Cy5?#{c={F5o4
z_K{jhxa;MbRgp(+A@WiPfH!Hxl?oWTNuj4Lpf2pzS_X>&S}5SH7PQfzO`wI57F`4*
z01k6}|3D3R-(#OJ;_0=6?7Ly><!EN$D23*Za-j>Ym15u#rx=qYJ$42^!&M>DyqoJ&
z?_mWb>=tRsSEu-yR`-o{Cyl(>8b=bbor%Lk)V1UfdpQLuW*l?=K?V?QOC~4wXrhSs
zeEEipd!i|p4ytBc9_$L>`XjcE+P0`Z*S!$2J_GzMIg1x8#L0;}R3)wkBxMFCdq8R6
zRpQoUA7719){{Q>FNV+g!-_XPQ*@c)v5jC$FkfYA#h6U^E@5sq|Jj6aea$^}7t%U>
zCc4eUsh3nVN+1g?)_^7Y?m+^Wn!Z5uaC~-7Fd28Vpw)xI&V$zu?2~kv6v}LnFl8Rs
zkiHJs5_66d?6<FyA5apkqd-8UZ$D3X1oaxDmzJl^L=qVcoM6Km000008vbF+s>gjW
zAQToIiU<y^YH(*K4?DFY<WUJ^PBud<jWR-1A51;vVn9GCc_G3aD+In!GZ0>tuK_c%
zUw3pRJ-$?O)c>cx;Ry1`VHOgA7EnMze5TVaJk4B)*LE;$?H6&2dZO6Np!p%XvZ;SD
z4>`mJziQN<j&Ad3Q@7FLx=bvEI67(Z+0#G~J30wK&&`AR`h;k7gJ(_A<DX<^{o*Rr
z$<H++TAOZ%*156;85?>u!lrG&722nL#%`@~tUQ>(Gk-o6@N8uNqhoS(ok(g(9XU|F
zu=ssiMSmJe9bMoe^9suo$P>VTu;AhL7yze@Gi_xiB9hepQX??guM{`D`~b;37;qY&
zH(>WMIx*Ejmi_GvDi$Yb6-F5j4uk;x^>}5QXEy&XMQ0xz+V{ePH2(cBqZN4)vHeEU
znd%)2D`Iz>Y$bXAjbYIRL@C|t!OS=6<VN%j+cS5Mg<TebSN0uW`&+O0i{RH|$$WDN
z*^=QI5VD=SRvOF5m<UPsp!d4BIsyrF*hgX!8RO|l1xFYH>hU|+i=8XUR({CCR-KH<
zAp*qpOfm6P=#O%3da;I!uFqZ!056*a$;!IMhG>gSmci$WIS~O5&}+vElT>4`6kRJz
zJLiHlHvmU=!$T+$zeB6RH5`4;wm$|oY$X2%7Ywqivj_ue3uJ1XkyVo(K@)OmlHEba
z^%64^c3$V4gl)nI;YVM6y!0FHczlqj;Cbc6N^2nZv-x`Cy5K6MAWpCmBu<+LK9=oj
zwf)rDc&Xld2uk#?I&f98z4pO^==fS~d$V6|C6EKLZDb|s5+19fVAzQ5MwL@J$vNr)
z*bE7wtKDf|)BgeXY8e55`w&7%>`Xkv=frFSh8MDq&s27^pH!P!UT`Ks9PuEh8m$=f
za2{l>MDr_m)9XW_?@Jg-yp@Ooi@Esdcq)FPjI4?cUT9OsLyYR@Xf%oDJj+`7|GuG_
zE9;n^;&G*fbBKpmuUIHQ%UbX|=PpVJ1{@=^70)c*X<Z-ATI;_uL~PTDV#7q$D*0=Z
zM8ly4K+8J8tf1riBpXTjBST*pZ<7SEfa)-+CU5MXu6S^j{ZiD{_zl0xX!XA*bs&vm
zfaulYh0F+*jsE1#*9becqvPTeq@#h4r2(%GvhPLhYsia+<XTy(hU1IzW8Mh8tX4Nd
zXQnv&$mgE_KDIkP9yeoYP{y9T&vb1j&5`z*g95%Od*8J1CAN_Qu*8FT=?rl&jASlF
zEVSfTsvbZ_m#=*&6iscpJH@BFZ9oX(S_#5#*Y=ho0pemckwpbvjOZ#5r5GQA`d^89
zHIesxz5#<ad_x%rfbG!p?T!{t>KxvLBN<AFFm{*cb7_x}Kmo`gDGH@kScj$8*!w>;
zXIX(d92AsFj2Ab?#PwTFzvS7c8uNR|+&aUNLASL_3m5HV>CIRn6XKk~Ns~qYZazW;
zfdEL_0hhn#?@!T{2G{)3Cbm7piai4Tq&<-uc&p3G{c{7i%W8&h-6Mk)#iVfXub!_#
z1LHofB_e-IeAsm`aryGHq+)FR*dG|2&bm=3BXkOi>!q|lRJ-xzXa#iEnh@#$S*@Us
za>?NLkv)YY<1$;;HYXdpr9;5_l?t0k{&Um_B_DX$Tgt}<ot3*FvI2FwcP4Gu24t#A
zx{xC0`}DAjB#x+IP$3~b=}Xgy#FGNEr(ye1*Y2AiTq+W(l25cbNIRP!P$j(0WJ~Qa
z`O6mU!|LdfBOqqDa{^M3HFSIn7O%gX@k|TlB2}7YM>usAeIUt`S(osN7)Y};$Z);l
zP{r^4iZSAw_T<-rOP(f^=g$f>#a{8X#5s_n2fxzQ6$Z$Qpo8;1P<v*)ida2<h%CE_
z{f#b@Tv(wT#>f4-?zH35R{`m)+y)J>p$u<Jpb^+MzAlk(YNUgc-F$355z$mD(j0Z_
zdDFAU3s&B)*ADIAKf73=^xVveP_-ascQvN`xIw-mi(t^gDY{XrW<lF@#mKv5D4n)(
zwEJpp7RNf1LzWeU<1Dd&fB*mh1j8Z1;u5RvA6*w0hym!1h?S^;V@innL7+l^>>xk}
zpcO9%%sKd4GD$}Flgk@h))06J&K#|U-dHv;baM~S1%znqAPZv>g!ca5>roZwjkX?)
z-TTv9F{@<P>`2hBC^UP}(h+Cu8=8M5A~g!KPziF9X%H8ejd$Rt9RD($B0-yOPMMqm
zS;CjWldD=o%@VcHB@dVoQ7`cN4Wl+A!7wnH0XgXVU>Xo+jrJ3Zf@6$-9QsSfkLC2G
zW_<bLjiw{DBQQm!iHbL*2xok|j_@eOg_xu=y;_S!S4s%}X9xgS4%j^~f<z<T3Fmn6
z%NA*k-T53;8YFAGSK6(36DD5l2I?4y6`4c%dPUdJ=<&^PDwNfP&WKVsx;zo%MB0)g
zk7A#74_q**Jk?J(SQyk0SwDB6U?0&B<n%db8Rp4IXro*F^py;Sp$AKeph3XA)E_oC
zc@SP}t!qnfIwHsCJ^|j;sG8|z1r*{mzmet(GmYF3vv-PN{yyd{XivpRF%!8{+Z_$X
zTjDkMVG-~#EH%K0K$K!p_PLp?jF^BMLz~qY%kiva?0lztFmOXWfcM@8bvR%rtMix(
z>&Vj(PmR`R@VL_U@|a8bDa1jCVrCDG!Rbj}xN8|WuWaI0>vc{4z7qT6!F=Ds4@af(
zz8WtRbGBgWrw*X!i;Ss?nVs-%P}#eaJamXy%&_dyX7dkmMqVRR_t_j_gOyl$gulFS
zkza4@y?MCE5Ta4VS9aaz;Ue|#ite?ua;Fs;l_(WOzV}RpMmYz;yQjEK%eu<*;3Rr8
z=T!xTB45Hgw_ukl9|pTp0^p-gybefi0T!Bes|>aGWdPZ>AUV!_7FACS7HvQCLIiQ1
z9CadAW5KRzb=ghdQOsqw4EVmSexK7{{PO2bJst&gD1vhe@?l$~lg<RTy@)qIa-Du>
z&sW{S9LBZ$-c7G8oW<)LEJfS!1gB5FcaA!@pf-JSu4F&ncz)v?Wh(|@Zaseso(8d9
zWzOQKQh6F|>z@VHU-@Jj=dsrpw5Ctv8rAx6sf=Y^Ml76@5gJ1Gwm~k$`m9^V9LuUA
zLfN>ZglSECAtf{*%{v2`2M5MM>_EGYBn0LJeP<TU*6DSlMOj>iu^|kOc~1Mc6EIJM
z#=1U{&rafI0mQ5s^$W?=H1K{51yO};2~(nRr>EXid?C<cyB;U&JcHqte??PclaY#M
zK3f;uR+V@HRkwHhdy{bACN*@8#SFg?H2cm-oBM^39!K(RN^bxt336(lnl4A#R<Id)
zV2RYV$QjG4khS;lD~nc_169VAj-V7n!6A30PC$a#O-(gyuYx}=Ai(@sf%FX-%3&cr
z7msp>x>v)t*xiBB>-g9|wxn9@aq#Iox<*J9F#c`aHd$0b;uIs*JK;+h>Q=v=SG&Tn
z*HNFX+(R(N7&*7C-c@TwyJx>WXUtbV=&`8AS7yr9RNCO*I>-N)<)Oc<#Y)cXnPU{Y
z-qc~mmklFGp@|Uu5ZCmIw>y?*m#$)@_eVNj*~N@L(W|Ns(l9h602<d9G)O)a_stpl
z<mdS|g{<>t)(-Wsc7%Kib2DMEb|023O${$=vpFnggtslGn>`@%@8P2l)tj(5vuDKJ
zEL-}HONuFm#}L%%FJKU8jA29N!1W%dQ}~h9tJ2ED%Sfj_-t!EJ)C39bv&;(pdTq@$
zU{JVcW-{uUKtwhq-(9_^<OZi;YUMPTju(n5kWrR60&*Jxzoa6)tis(I7K|%4u@WXO
z8w<j9%4Z=GiokG_QDQ)KQ331KOXP%W0ViGn000055aG_sphwCV+_8<{VtbJkn84^d
z?53@$GFX$-<$+TlgJzXz-K&B6gXKfzGVnB~_Sge1+Nrwa+Ox=(EpU7d{&l!vO+v10
z&t$k4Wsq6eG+Z8dr#F~@p?E6iGYN8^m!<!rM70(TTmiWzM%gkw*DwG695EA+ITA2Z
zNl;rCjf<20a3`q?Kr`L;R92zkcq3ptM0=UHM<V6QQ|O~8r8M1DseRWx8RC$_&zzld
z`lh~!y-$#prK^VF;B*xvvefJn0#;hlv}327fl(~Mg<n5&fz^2pfd&A4aopi)^{3|6
z!VO#po62_9THrL{_eoU~8=4$#GdE)6&$FppXXdJ?S@f9P0sS#>OIXpT^1Rs07eRhw
z?lHq686IaL5E*le{G(M?PmSqSx5pz8OnyX)44UxwM`&z6*UhTRX_Kc_OzPH?p{0~G
zAU}NtDwUV+)><FwzzsR4W0*3CHX6?Y;uo5cKU|R-iQs7H`zto;+K*e!GJrr~0h&81
z)@$+OA3!(c1SKrY@RSOZCACqNH%17xS$I#_y4_wnq`WB4IVST*9?7id8R4vY#-xD&
zB>tJ|%I_{jszkU8?&T~0q1r4NW|LL7IM^_NM8y(f1jV=aA|PVxFxq5wz#U|#2xT8T
zuequ^(X&dgfuv&u4(PUY|I~YI+RRet?gPAfYJFS6>PlCGAKI64;IG#UI~y5h2dd`o
z#pzy~`K!&PMz*q&Yr~pUBPXwk0pr}aGsnK_d*O!XG{4{#=Z)^1t$BQ1ljYJ{*%(Bv
z3iY=$6x^`&BeqJabzF6>=Wzt`GGr7nMff3+Kmbwa6M1?r5d2Aa>sbv$D;hMPnf*Id
zw5ayEyKx4&{w=%I=)UcU*`sr%HE~QIhGI;h-gvAyg`|1a?e;`KO_aATM@0lr{rh4?
zei9U0paoZ(o(_)54IJA{P!{&i-KhoET%J+4<uQiuTGik?ACsLMt1~LV@c{POj07b?
z&5ozD9Ut(0_IOB~Ur{{AT2>0)hq@ZSi6hvUv-Adle5zi_I3SB$n`!xHyO^CDal!Gu
zZgb8)8Z?(&oiAk$%hY<Adf-0~!~<VY>vHiA4N^POXHy2;$UlM~mH(TCRkGwRrI?w;
zSS|mD0)oN8%QVtf4U&c71G=r+HxpiPbEACaGv}KBTankRO)KT${8N_yC~;Y`lDE*K
z>2sjK@^-5TVuOQjc59D{=ncb;Gxa~+XcW!3I<x)de&|j>ilG&CDy}pS0ZAW0Bk@!B
zN#<JK)?8!W0Wkbn2s~ntKXpva(>1VmWrdI5msT`W(Z4+SH0p#x`%3^YZGX1(bLSwB
zq>~2`*4{*Vpn?vJtW!Zca~d(i$&E?)1PB9h7Bq6+UCo}+#o3pLIG!sxeFZ?W{Sgm%
z0k9nvE{_ZW5f$f~_hDXLFii6lTw_1Vs5QGkWpE0RzF+Q89r=3Xgwyg`>q{T;;`0m?
zkb!h3w$V?W=WAt?n?92bDj-OTSZUkgqvi4S=_Cx*Tr<@<SaMTlO@xJd4jXJnU;-mr
z;H-v$wqU931)#818Ac6|h6#5@h*=<f<-YmIfXny&$k<oZ7Xv%-(G-<ZL~<V)iS|Jz
zbEg-*1RIkU3(7WF@U$;+KmY&$0fFsTuQ5I870&dDp|9oL`A5eka=R&zNx{I&o#?5T
z#MRC(YiK-mny8jPxMBwRfBIJK3Vj%ZB$H8srHUU)$I+N=icS4spDiv6xb-cMg>$}^
zaQm_hvDybcbXge&?RBWa6i=5%ot?4#8ekDNN6Y~a<hzfQFo~X+G`OsEsozWNP(UAC
z?wi*$7ytU-XYv2>GOxAT^p9LzLZd#pP6%79%X1&*nJl&G!mRun`ffwa5@=e$_hZgA
zE9Zrmr@c(|XT?^%G;~9w5BjVTj)CANQ+x5|Z0t{vHAuqg*Q~Tl+nii!O;2Sf)v;p0
zD^HiLE)Ivm(cmc-y@unU^c$PCu46dG7ls~cHAL!DF1#fGlYz|oeIPJ&fHc7Kp--EO
z3ej+&rO#JK>O*!TECpuXq;s(I6&*A<c*t{X7A-^#$@XPgG4_B&5ba>e7#=v1;-3=!
z^++X=(E1Xzd$Eyy_o5NeIU$JM83GMJAGBq+P6o^~ekt_Our76E4lJ%;Zioj^efZEq
zosfumuP4JZ2emOtX-IY1o#f?-@t@9>^1j$S%>>q#K-W_!7lH~~?SQ>a^X<<!T}f7d
zD&C8PIaUn_JQnLIQ__UppMrM$L-if~_6%1xe+vWknAYZNQbITUBNQxJx<m-FE+#(Q
zrj3W&8^M9V1Y5vO3SH{P-xG1Usy8Dxgt>qk=FNpY2EMQ@_MRS!OPNH!N)S;hU0JFU
z{2Ouim6akY106NmyKTbF^=JHxc8!@!7us0jFlH*<u*JHff!KwGRn||9L_6+kDVIE{
z562o*1ADgU!ZcNikEbu9FecwC)p+rO5k4kI!LQi9^yt8WVmNL@s8_P9j~9K&D;zhh
z-}$UuhhzJ8&(JZ{d|0o1LOzH=TPJp3lnYp^=c2$Sv>v{@6UJ_ydC_8)wiE{)<H;_?
zwptaURP~|x+<PJ8mQzqiU9@Y9`TW3biurw}yn-`rJp&6p9@g(Z%7p$&{{jm^dGndi
z@Mmc9Af=5egJxhneG>EFS3^Cwn%*Rj9fO=oq!q%3+n)Y!N(RyZ#|bRw+{`E}I%cba
zJq<83tLv7R&jyi(a2vdB>uFj2rZ{B+6<(8H45TJ7`*8se3>PH)r_aEc1l&8j;IGNU
zs+G}l7Gs5rN)(SfBr+D4iwd@s`Npg#M$P+0tC+L<TtQaV*4xe?Bl@17otOXPm(ZWd
zHJ`eaRRQ>x^5^#2We@k>YMTk61UwMovAnh}W8)_{W5PFkWxR<*v%vRc2q}VJY?Pf-
zL-?lN&R$%`Y3$v}M&R6jbEs>0b9^evmVoABy^`h(i<6rwuGc72GDkvw08=M$i&B!d
z%u&P`x{!H>t7HI?cH!lf4*ilDh4X5i4neace8Jloie0+SV)=r0eh<1cbe~oA6Cv04
zG`!1Dof!BUl8`>={xHgAOQm>;>;@Z1VbA(hvYaRY0003w)K@YLK&nr7@;RMiY)Bh*
zJI@?_fmbe352cyM3W)*D7arI6lazV#NyfT+1?64)wHRdFdjwM0z$9V0HEZByqKV|D
zty<l2cxRqGqj%PkIEekDmOxY`@3NwS5q?!)g~EMnPf{#sh-_~D-09PKByaYB^+AqV
z-1u+5ByBU0KneUj#<KwHS%&lEso|>^g!G^K6)v|QdSckRbf^`uW8$d^2H4;XEdC=#
z683t#jY1n|nG}sQE*`_8e@*^rUhA&<OlLgN4yQpG>RHBfMrB;7@85aerK*&IeTT&U
z%W&&$Af%MUhKtC$d9T}o7i^H?C?g-5h5N2|@6N<IQK88c%B~0PE05zcg0gYB_iEz4
z`;RPvUVT#1JmL4&Tk3ildea7ypi6|P%Ss{j@(9}Q%{AhSqZ8TooQ8)o#pqc{fjt+}
z6L>l86;?E|_0_*-Mf`{^4KANm5C2;kSt{k{-IL#N^I6JS-*V~{rs=&ywE1DTmL)LF
zGS|=LVE&<|QTo{v*-l2*Vko!;`h&b+V7AJ`ws7g{7L5P0j?FgOmr&Nn1n(Om?D9Tl
zm5q}o(kY4?j4EAq9x^xl$;Hn&9crUdoG@q5%|9$Afgu0WCTy~5FTA4R$fC^1C-S{l
zFgTuO&MUGB@}hD}d|2WaFJJ~U9r7s``YV^07FGwlG5p3z>t(2CtT0q}E!4i4tu?w>
z2s5Um{ArOAcSAHJfE-Zlr{&GeT-IB3NiHItrED<zt`u+I^%OGa-(*`<8Fu2`)j5{$
z9Y(vl{mGr1ZcP!PYb)TJK59nyM18<l+ns!InM;+xMG7BQOK;2X(n;2V&O&pQ*|nxo
z;r%cHh2a!KScHY8qv2QKra2TpU&+`{UE>P(UVbT&t7tO8<NO%`$!ROR|28a4NQHEM
zbaeIEQ9AbAC3F!6T;UR5wVeVi+IIM9csOU1K3>nBp><Vr_0`d9IU7PRk0)0loT8+x
zU2L?b^vZ5R$eZ(T7%0lJ{6f162>ny`sX;P1O_qt6*p4)g>wCepI~J~e6=_9jIJ+4G
zg0m9H?2><I+O|mUZmc%%@bSKFL&0+pK002IHj4r_pVK0Szb*PaNWWAm(9Wy(<^fLn
zr#ex^mUN@v^aL|TFlWdJrEn!~#r@wH+EHo!*;1n)-cSSq$u6L)QWOoMc5Y2T9AnpN
zpW7YJ^A~L;&d4UzVv96n)cqZ(odq;&$p}r8ADKLFb$rCrQBcIW%9O&nh%f16v{#vi
zhi(-(kg6H(O2&qgQ6IhCXrw|pBmLXc4=^;|63gS%dw=t7#vCC`mtmUwkOny^33f7m
z9T3uMCb%`0X@^5%W}*iG3LlF_>Wa;=OS%ZjU?j+|uX%C1b)IL^7#k`tV%)D!RP?5Z
z8gOUWbXq_p0<-SrYKRs{xWpZKhgF>IW%+N!AvV{r*#0P+Qy4t(kGbK+KH1%L1<&Qs
z0X(&P`uFK=rGCqVkSC(&Gk%Ho26wtz{)2}L*VKZtl&!O+f-LgT`!HS(;$nI962vPH
zK-j*87icLpQytNBSvpLAiIjCr9()K>N59ZxGsiNXa(pDKh@^B{f<eurA^EYaKNwoZ
zMNA$4O%2xZNBQ*^eJuhr(>Q6yZP2qKo;<?i^cKENLvh$B>g4ytfB*mh007Kh@O9JA
z(1<*)T;Da>OIvh!zNl5|DPXAQAx_{>Hn$;hO$>0U2l1>?w6y({+G$te^o7_Lm3)!<
zEEQm(1<y5<=T7Vce~20F>C+FUd!(x6?|Yf+LP3A$R;m_|{LyKkOv1by@!{%}gv%Vl
z@lldZmS8h-6FRcy#UNtwK|nsui>Gq~!=}g!Y89Ys2|?Z#&axL=BL)`RK(}|G|G<S;
zbCw3GYoG|7)%iM7g6@dt%ltMaCB9n#=!CrKC+pisaE>0_nC?uTl(P-+qX{z+Hc)Fg
zY+Z#&SG6|^_MTUfEO%b79}w^mRU|d>7SzzpJ09W!J!J6_*)e(wgde{@$LOsyd@NW^
zg&)BxK81dSL)Tu7tj55I(NJ8h;A(!PIozlA$ATs6=FETHRx#dmqb+ZsMJ|wTfJPPx
zTWnQPhQk^idMB|uZVjI=UrUZrz+B2$L&G_&PDEpUVs44@J{kXz%{Mk;7Bv|KG<Zop
z9DkT08s9<Sm^F|eQAseTl1!+#NmgO6Kl|iDm*?2_I5SL*?q1;I0OP<G;Cx_$0_Sjp
zpVLw+vxKM=!LK=z3Y6jYy7U?mbwFp3D5rcp*YXy5D>qJ&AOdTfCN=+DP(~DI_P^!W
z0DY@(+12j#_tJk;UDvv)oztU5uJ7}DduiOoO(TL=e@RaMh_|c79PJklM9RLk<9LV?
zX9Np}AdMk%oqc}jQdvBESQ|f1=Jj@y>L1Z+1d6ekJe%M+L0ZmzA9?r+uw2GF(Ae)C
zL~G_zp9RM3G6zR}zF=MW|IUH9iJPcGS$}twRTYVLR||TJZGuhL4%WA|?7qZpg0T8-
zJ4L3N9+{!uC;!Wp&=^><<tb>=N@bsoWNc=c`Z_9zZnPHFYSZqJ;7A1-x~2T_u<ReI
z+Q;0V;Wm$<{Qda40fE;aS*B9A8rSOWETP=OQTI04Omjbkqf{fTRS(u5R;DtCfR7+~
zpR!-(I6E0`A(h%B&NZzVhCjJ(JJ^WNE4gzQ%mFI5oD#iMv=G?O_^@PBqQ;EE&qYBo
zCV&($^{1O}c~;w@GRh}(+AhwVj06GoVSpQ#h-#}5Tuo$M>_i<)TeirWy{|XMWx?m{
zR^dhV7kiYTicM7+j6)g+5vkT?co}mc&&;LZ@x6*QF*=u5i@s4_T-ivb$9wAF&ez<P
z7mOHVq`|##gqMmu2ubbfs8LGCJ`r1FtK(z&+p;Bh|Na7s&DG==Om46DIvheHXltEc
z3}Cz`ZzjTJUJb3-{s=4BWfKkJeWZNlUx|Ky;^OTFFkmgHD6C7>qT^NM8dR0W(m)uk
zBH}xb-g!5T_F#nk4TXk#klMV=qYAJQ3XqLJ>BNSfbUfvO+RzQ1JPd%Fe}J5<N4KcU
zh;-+@YgKKQWVYcrP27%&FCLtRJztjBQyuRn02-pb4~mR#jC_^R*Q?DQu=LzZ*MNoH
z)ET(saDBHuNmIdbuld?G+jf7avAr><z4NoricEZ~R46qaIU@L&qH(~#?Z64db1bvv
zV)*=534f-Zi@l+?MBVrYrF2^X_)q`<002cICP?bx@#*EU%OQxf>I9(kH*UbrSDUdv
zWDnc${dzu99v|@WUB(ia_XC4MwOmqyG_hrnvCaN#T%(GHZZnyF|CJbEhI;}1=0jIR
zC+pD4sx~1x3CmbRlA)k5{2(i<`_;}<#1F=NhZZ^c&T`Qi&YOX;)0C-#boWQLSfGEn
zs3iYY>;pmkFU84k2f^Gck-t%qLh-US{kehs@6DH<ci#vq?68{Rz&t$4YCz^e26jOp
zD8oYzZnE68Br1_`%Af@jxU({yHV`9&Q)G(i*W;&$UOJ<dho>Z*MQcBBz`+sc4cTAc
z4?UQO1EL$NZlT%g6pI^BO^1m5yW|9gFwnqnnIA;TTA(rr_KWda`i1BDg%E0KZ<%yc
zd0v2cZpba{wqxOPu{R`5YfiM5wlp_c6+Gur@Yh07=pqR7X({rz_lhF^r@P??Byikz
zxT(j2QH8ArU4PX%JyAM{!H)1w0>a)auL`p9p{o90(k9Ta-WTs?dQ8I7QsDITbCk)%
zuEOGKg|4twgf`#eafl?oLg1ZdX#&oA^Lm4ei_urRa+6<-m}w^u<^P+~P94Yrlih<y
z#0*CurmJzTi<c6K{BZf{8@z=@MJxrJ(sL6Kwi-9QB4QLL`fnQslLCi%rGCB!z)jjg
z`VJCSP<^UZ^bF1EHrYOW4nkh`*8XK;iiy*E7^0R@5`nf-!bs>0^y`*<K(_H2-3ocE
zsvT*6vHtM6+sKpex*H;sEfm-ycBN!r@6$7vz_mfO(q)xYhMHUw3EoF$TL*R`d`p?3
zc;(qT3|HQt#wIA(e{y}J=D{<9d`AZCe1<fxj!Q;?Yv;jg^@4TTVWqbtN^^Rma&@fO
zGiChk!u;b3u;WI{bqJ?M>zKftrpTt-X68g)=f)8WXt^6)&PX^`q{xJn>1BY=_iLDM
zXx4XAd@JEedqP>%{0Q29ymf|qYfzb8xXrX|G(tAsAExth544m(N?n<b{I{nxJoAfS
zIiq^fl}>ii_hLP-q?^^Gz=Xl7Vblv?;5$gBp<YGB0n-?SURuqGh~4@@>Z?no+wWPW
z#6(5KC=;{xSmLEw!(bP!n`zaOA+}0~U)v-uf>ou=k#0v2p1d=%!do~t#d$dv&0vY0
zi#!%rs}+uzT8ebZL<~Yy!Xn}8hYRsWXnqkz-t(B5*Vr$be$rB29GY9=ucU!yB)*^<
ze@?`F5XXmX`dZ=U(Ix}ay-87CvB(vQ{i62?G^^<~m^4mor=|hn0V`5Nk{#ITCa{Rx
zPTwLNyxwD+7)S1z>ebC}wa91l4KuaukaxUxT0_4g-8Te0r2{1@^LdcD-o|JJ8TP69
zrW-}vkEWNwn-C1oZJ8(`Bl#!8-G~BiPax>%5S$3wqphvl&jfk9JEkxxxnffx?IszK
zA#w#hE!(C+rO;FLw(KKk{<pC}UH;Ep6KT>CJp8+`u;_Qj8&4Gbza;k-M%ri2DIlMa
z3TW1G<Mi?T4Icvyvnw-ck|bww+N0)G>?=arP8ITTH-BvCKdd0rqo*#6+)G@)L-d}*
z6SZ%aYb(vW*~OVUa0KrpN_>28yM=BAR3Sq>4Kq0-*R?E#?m413NSR&vM4R0(k+We?
zb})+N6@3eQ)LPEpVM1H~8=aS-7SLZ-P?eyw7Ni)?OXfI*UFBNip9&tqQVl<G!U|h$
zTVt448G$xV;#fd*9*u=FNSm;f&~4|jYN!#ZP$o1%oid~uZF0cZF$XrX!{&eh000St
zwQT;%xO+^1Wr_heOjq=K<PEek_K|&R=YYp<PaNu}&}um-b@04WkhDT5BNkFC1Q-aV
zx8|_uNFn8X@^U##%(=S;v#{2|2sos6!SWxq5N$v5F}7YyA`o(^`4FP?u|K)!(HgaV
z5J5soLvzI^$|&lQaVY?lRPDH%Z$cy2hW}odA8vxhZhf+R+r}i4)G{b6?f|+1CE2l@
zLU8<6`%`YzpV&er^}#C=vb8Orq8+%er=~mkrarwg3WhObDI>w854<XdP5BRndZgNI
z$=<`=|0UOLDq20-yO`LMMKiBmB5EZ>@?yMu?8kdgl?s&9@@Vzes*jqhVVkx|AN9}N
zat2l^b$b)U<6RTI@+KwuJ+q4{)Pwhg2o&*PX5~x*QTzFXerQ8K7@F{a1;Nl_rem_9
z;j4<D3$}gam$fzvRU%n<@kpL#grUc~VWmy<o4yAcPzdr$mymtYP*OU}A-Ef`0S)cT
zZz&A!&%$qzU|;|z%ZmU#ip-3<I-Xt9TPp^9{G@*~N(&x>A1J8s@xj-4y4(FY1to<J
zO?(qynzy?)%G4aDjF%7C-lPk4@)PXycrP1p_C>>osI*$Re_fS4cqR)|7y1}Y`0PC@
z9Ndmot=Th1(SZYqj?ogK$VF$-OmT9^I?!u#v#z+I=y+E)ta##RyDt1w0Ez0L>9p3<
zemkTAJ#ud%+VK>>Dz$|nR>3U$wn<~7i-)0i-2vb5J$ThuY~c^2?nOTCe`y+tP&WW^
z!Lb#s78|OKY^9Gib$yUJo@MlPq6e+4wl?*%Mts-Ra1^%b1~)f20{_*4`$%}brRat@
zq<=KNooiWwP8lZbV^U)`J9X<aDN?Nz^fyp_ly73h;rxlXdvsnY4~$F4JMcOa=7co>
zC_XC?Uj8wfL9N4N3WR$mYk!<{i`Z9$L*nJ$ARkdk0JR#zEbHzu@Op7n0+&JYTRXS;
z(FS;lfl@`F?(u=f4t(8h`!Pn>Q2P+hZPWv@nsY>eQ{XgTK@D_{*G|$}!r5)li9jSj
zu?aPM8cu4T1=aglCO)G?IJ~)67%jv;0Vc0vMBs-DpT;F#rk5|F4o4r1A0pWWJkpT<
znK=wYR$=ZcyFK4k(pB9>WP7Cd7CppOOhI^3o=G&HETJ9o%6{UtgG;Jn%vO~?Z#k^n
zTZ>71bPW7KC7S9F`Why3bo3qPH*%l%IWu0$ns3!4wvWyD_<DZ&b0e|2KWVBXEY#*z
z%d0z;$sSe+G!j)6l22FNbto^PVCn-Xi53!HfyLoP;sxeH7OlJSvZgiAEGPPA{>AOO
zKYO1pYSR{6j3kzXsmg)xb)#2kh{qGst_JWKA2*ok<nVC}(zrk7lWk+dcNHBA+)=Vt
zHh9nLxvu<ckUm`PEx;efmH@tF(etwOk^D{u+Y+1Ysjd`>GB}N)umFRd(&+0tI4f!W
z#fbA#@vW!XXneZB@Q~y%6!8ud@#&Zz!za)lP_IA`fIq0QEdT%j001W(=zN!y*ajjD
z>RDRyYRS+(<093xN#MP;3gUBz<E_^xqAIY$GlFHouByX8E^pX-4ImJTiUtY=B8w=t
zjn=E3<?*W(ntI{#Hg}g985?TB+MHINbZn|r2k(XHeJJt}b-wW|WWio$@9Vv98u*_8
zf8Mgf#lnz%;}L(OR<g=ScPi}Vq~~HH$xi$$^K!Tz=eIRAitR_?bj+_UoYjR0aDl{5
z)Pi=AvlO{}u!<f>>ppIHN!<l?p`>yc7JsRTpNpSoAxrM73Zc*L5Alqtk{6H*9;-_9
z%?)OAHb$&)Wg(77%~|#L9CAeuhfFNi2tN|nZVM)Y_UdsN?A7h~=w~>MZ#gVJctZgf
zdqFN7mCt~VFY-*(a9o)fw`>x4tgv{MwN2|a!U0a882zDBCr?kfz?yp&!(a+C*u`QW
zvI&lMhz)+mWGhbJUyamA(saGQvD^dvgZaQdvS9F|f1p9}K{)PYe>>v|0;gCaVOC(}
z(ewtq1bLIijGNj#Ic>Rh7Y3cN;UQ7A^6F9n!xM&MV<m<~tJXnAHGkHyfaQfA)h6X$
zwsN_FAd#xlb(<vK&+1;tKA72^QC8S;LDoaZjX&onC3x$zFolExX`zOQhy<xE6j_+G
zQ0bC56AX?B+a5Z{UASTfQamrfnY-1j6jG1G%!8gF*H7h|+*YGT0VskDZ{ZI^#zt-~
zgAe-6*b`1<qDJ9rK5XbPYKXU2ospVV6<c7Ac*GeiG<{voV8`1YQmoqm+ujZ&WptBG
z36y?te=`ju+7LXL03H!a4X+VZhN&eenBFDwJ&bZdDeu#stH4n__%d$K0f3^8n}>yF
z#!r&ZUJh5sB@$-du5g03uYXaW2wCC&jr`yMhd71c_fA#2-73taMlXCJWuQ95b_?@?
zM}{lnTPnW62;;o7YpAf9w|h{K)Z7C~?2DH_(ZC~1doI6~-cVArj7D&v7smTsqS}}}
zm|c1QD6VNvOl<nj2=O{O%vh<)1w&)N!vkTtu+sR7&gM;4lbzzi!L_H_R2RE8Smf(<
z(F%rC%%VF48WqavPMKp@lVl~7Kd~1%W0Hvf6u?7`$aA@)JrsL|000000eTn?9$!C@
zncBr64Y;)~l$xTTm!CE4oigT$pn{@VnyZO=I+uM)ij-k&SVGThoVdi6@=RIHMtc{$
zbxTj$kLp%9oD+BD53Kta?MN=Z7ukRrZoNDxu%s<bu$lO6B7@;4|F13$Z(uNSa(T|*
z#}T^Rg;wBOOzR=gS^NwE>{3hA@e+yEX}iQD>7J1a@cAKNUO?kw1TMI|!;GNd2zPS`
zi&mf9jCT3k!(rmFL(32&gAauMIXS2wkr7LfStvx292pJ?<SEx=%6(${R?oq=T}bfg
z?@$HGp{nF&Erf1NA$)Z|vv|4n->#hG9NaDU3x@aI9xll2@&e-LAs|4ZKZDm@?9o?n
z@yyglJiw|^D_|9SU)JCw?fq(6Wq}$pbV&=5UXY(_TgW(^;(WwH3|6NP9pn+BX))hn
zWO*YwnGuh5K9}-uu}4+0QB$<s@8$!I&FK0Kx}u}<YtN+FY_?v}iH{3YyF;phT;QeY
zBXKd~IPx#@7cobg3uN_DQzQ?`0aE8QyZh9o1Af&h)#)PU;>90o9(_nTIW=r$G@5_@
zt9dgdB(RL}*i1Z%t@AgZ!txmzy5GM==JVG(R0oD&(A#TuIeXH1Ky{p%b_xWJ2Fbj>
zH2cJ1jg<!wwiP)uVg#<3e~r`bl&@lTVZYyb_+&<Ctk$JTlGfyLRDBhiIGad4!en*}
z-8hx@oqA9f;6!=}9;_vG6!>3tAqBRG-xd>2+#xTpR*&I&q%qpHB|TIyhLGxOW_h6F
zM=~xD4LkMW*q$7W(4;4KLy}r=&NBF5;hec`tssE4Y%K%eMh0z0yg&c|0004YFKWtP
zF_dUvuWr43jb3aV@w5)g=IX>5l~nzrAr89iO<<2mGSHd+^OM4o&2i>Rdvn--*tOMV
z+}8iR)8p&rdU)>QJt&UthlU$eL1<y|fSn>*4)hyGrvRG>LcHQb?xZfSte>)?b1FtQ
zP?D_oy5a_*&p%(E%(T8NIk|HA6|7odMr>{}x5lo-n8JiW*Ek>kO0y*IEKFjMUXpq|
zUf;;8`7DXwM;Yp(Z!9%C7Lyt*PC4$7d_lL4BMBb3m>>4>2({;%a-%(@7%UWrL}E+i
zaB}B*O<3DNW5cYUR~v6lSD`D@mFV(_fVy>F;_Met-rg>g4jXTB)SM{*^A<8qCh}PP
zX?hl}tWbP1Z;<@A7}}ADZp)<?qgIQG`hHDReyhzg$zYZ{G>l1{<wpGKd%6Y@e-6Jx
zoUflL{zBRQm2hl14w#0Z(mvfb62*Ol*lRyzzUlCl^e?6K433*|F;~=HINk-cHB+1o
z#h?nFv-4m>YtRK<VX#((=JbAT`kcdWz4G(eU+aBk`ks(?yBzxYbLjm9cgxQtn7_O5
zrfwh)fCFujd-=%xIM)K8^T<+*dK*Kx`2YX_0001ZQs0t{#8cODh*BVZ%jx9yD>JWE
z2xDGr`AUA(x{$Bh^4rX(B{NAhQv6<8tRc^0V>%x<4W}>objdtX4bRSG;V)-W0*|*6
zoG05YM0nVuOxFloG08w5={?)GBY1Kie9^{Dru{{iMAY@L&Xh!QMLqDV2-7=Ja@rnj
z8&GCu+n#3kBR(mB!rg$zW4L?4FJ%a;oQ$s6oi7<EH{0M>_dkZG^+gHJF{YpBUN?iP
zC!gAM?|;Y>eREGpv&xs}Q8^?{!NCF|zn+BC8lkC#tINRPZj(Qokx+}gbQG-!ZEbs3
zIth8%RBu<r{7LlWOuyEa2iMkNLgrCRmy+L->ZB)(RCjvmVjwngZ*TjF7z3{1A?aeS
zExkCeb&6BErOq;dIxQgsC)4!qw5hqdDs{cm>3Gv5sPar%PlOK>w~w$&Fpbwe0SRN%
z2~Y(nP2t~x)U@n2<DFpJY`1_5Cd~~1000005WY&3hVNTRyl`jb>O9fe`SfyB#iIpk
zpqFi4`lxQEG7^}i1t?u$UA3nB$3Ei|B~G-2`9*}U;JeRPImq*c(u+MW7(Xt8@oqJq
z&SFO#BV3PKiV)cO>kEwKfb|RA$2<(3=l-w#i%?%S42pSEO~Q5YuoQg#0SxEaIwuKY
zJzqrVCm12QlcwR@p{HTFqMJlwxE1%G_k@UlO|TT4x{vXd=g~S`Q0gd)dcGy;|HPH7
zMnze)29ktvG}?P5<oMLsSnOvfB0`v_J9B_0Z+UauQ8rndEvii_9~yS$|Mi6gYpt^k
z1_n%*8AkvB0001U2>1^sTAdjj2)rIh;8K)ig-60s1kK0X%pN6$fw?ZmU-iOcH;rb0
zg-_J<JgqcS0`Ol7Sj>H~bJ?rL(<+(Qx#|htBn^_JKjK$Ra=MkXr6IosxHX1MsGkEZ
z1xKf2l3+El&rvUvHh07Y>D_u=o2GYYKF%&Ox0m5Y?l{Jf%FTx4xFM6wP<1o_00000
zLiFoKfC3DI)j|JcNG8FKMHOGa)BhuAMhcQcnY8g9)iBp{ErC|x4uq1vN9JNi!xa~Y
zg6{c)Bh(8<=8CHgy!$Oy2#p-6%~ZWbZPRcEYd=GP3&J)$p+!L-<ZS=|0000000000
W000000000000000000000001=p{HE{

literal 0
HcmV?d00001

diff --git a/boards/nxp/frdm_mcxw71/doc/index.rst b/boards/nxp/frdm_mcxw71/doc/index.rst
new file mode 100644
index 00000000000..2ed258c39a4
--- /dev/null
+++ b/boards/nxp/frdm_mcxw71/doc/index.rst
@@ -0,0 +1,141 @@
+.. _frdm_mcxw71:
+
+NXP FRDM-MCXW71
+################
+
+Overview
+********
+
+The FRDM-MCXW71 is a compact and scalable development board for rapid
+prototyping of the MCX W71 wireless MCU. It offers easy evaluation of the MCX
+W71's multiprotocol wireless support for Bluetooth LE, Zigbee, Thread and
+Matter. The board includes an on-board MCU-Link debugger, industry standard
+headers for easy access to the MCU’s I/Os, an accelerometer, a light sensor and
+external SPI flash memory.
+
+The MCX W71x family features a 96 MHz Arm® Cortex®-M33 core coupled with a
+multiprotocol radio subsystem supporting Matter, Thread, Zigbee and Bluetooth
+LE. The independent radio subsystem, with a dedicated core and memory, offloads
+the main CPU, preserving it for the primary application and allowing firmware
+updates to support future wireless standards.
+
+.. image:: frdm_mcxw71.webp
+   :align: center
+   :alt: FRDM-MCXW71
+
+Hardware
+********
+
+- MCXW71 Arm Cortex-M33 microcontroller running up to 96 MHz
+- 1MB on-chip Flash memory unit
+- 128 KB TCM RAM
+- On-board MCU-Link debugger with CMSIS-DAP
+
+For more information about the MCXW71 SoC and FRDM-MCXW71 board, see:
+
+- `MCXW71 SoC Website`_
+- `FRDM-MCXW71 Website`_
+
+Supported Features
+==================
+
+The ``frdm_mcxw71`` board target in Zephyr currently supports the following features:
+
++-----------+------------+-------------------------------------+
+| Interface | Controller | Driver/Component                    |
++===========+============+=====================================+
+| NVIC      | on-chip    | nested vector interrupt controller  |
++-----------+------------+-------------------------------------+
+| SYSTICK   | on-chip    | systick                             |
++-----------+------------+-------------------------------------+
+| PINMUX    | on-chip    | pinctrl                             |
++-----------+------------+-------------------------------------+
+| GPIO      | on-chip    | gpio                                |
++-----------+------------+-------------------------------------+
+| LPUART    | on-chip    | serial port-polling;                |
+|           |            | serial port-interrupt               |
++-----------+------------+-------------------------------------+
+
+Programming and Debugging
+*************************
+
+Build and flash applications as usual (see :ref:`build_an_application` and
+:ref:`application_run` for more details).
+
+Configuring a Debug Probe
+=========================
+
+A debug probe is used for both flashing and debugging the board. This board is
+configured by default to use the MCU-Link CMSIS-DAP Onboard Debug Probe.
+
+Using J-Link
+------------
+
+There are two options. The onboard debug circuit can be updated with Segger
+J-Link firmware by following the instructions in
+:ref:`mcu-link-jlink-onboard-debug-probe`.
+To be able to program the firmware, you need to put the board in ``DFU mode``
+by shortening the jumper JP5.
+The second option is to attach a :ref:`jlink-external-debug-probe` to the
+10-pin SWD connector (J12) of the board.
+For both options use the ``-r jlink`` option with west to use the jlink runner.
+
+.. code-block:: console
+
+   west flash -r jlink
+
+Configuring a Console
+=====================
+
+Connect a USB cable from your PC to J10, and use the serial terminal of your choice
+(minicom, putty, etc.) with the following settings:
+
+- Speed: 115200
+- Data: 8 bits
+- Parity: None
+- Stop bits: 1
+
+Flashing
+========
+
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: frdm_mcxw71/mcxw716c
+   :goals: flash
+
+Open a serial terminal, reset the board (press the RESET button), and you should
+see the following message in the terminal:
+
+.. code-block:: console
+
+   *** Booting Zephyr OS build v3.7.0-xxx-xxxx ***
+   Hello World! frdm_mcxw71/mcxw716c
+
+Debugging
+=========
+
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: frdm_mcxw71/mcxw716c
+   :goals: debug
+
+Open a serial terminal, step through the application in your debugger, and you
+should see the following message in the terminal:
+
+.. code-block:: console
+
+   *** Booting Zephyr OS build v3.7.0-xxx-xxxx ***
+   Hello World! frdm_mcxw71/mcxw716c
+
+References
+**********
+
+.. _MCXW71 SoC Website:
+   https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/mcx-arm-cortex-m/mcx-w-series-microcontrollers/mcx-w71x-secure-and-ultra-low-power-mcus-for-matter-thread-zigbee-and-bluetooth-le:MCX-W71X
+
+.. _FRDM-MCXW71 Website:
+   https://www.nxp.com/design/design-center/development-boards-and-designs/general-purpose-mcus/frdm-development-board-for-mcx-w71x-wireless-mcus:FRDM-MCXW71
diff --git a/boards/nxp/frdm_mcxw71/frdm_mcxw71-pinctrl.dtsi b/boards/nxp/frdm_mcxw71/frdm_mcxw71-pinctrl.dtsi
new file mode 100644
index 00000000000..d834ed38453
--- /dev/null
+++ b/boards/nxp/frdm_mcxw71/frdm_mcxw71-pinctrl.dtsi
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 NXP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <nxp/mcx/MCXW716CMFTA-pinctrl.h>
+
+&pinctrl {
+	pinmux_lpuart1: pinmux_lpuart1 {
+		group0 {
+			pinmux = <LPUART1_RX_PTC2>, <LPUART1_TX_PTC3>;
+			drive-strength = "low";
+			slew-rate = "fast";
+		};
+	};
+};
diff --git a/boards/nxp/frdm_mcxw71/frdm_mcxw71.dts b/boards/nxp/frdm_mcxw71/frdm_mcxw71.dts
new file mode 100644
index 00000000000..6577fe5ccca
--- /dev/null
+++ b/boards/nxp/frdm_mcxw71/frdm_mcxw71.dts
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2024 NXP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <nxp/nxp_mcxw71.dtsi>
+#include "frdm_mcxw71-pinctrl.dtsi"
+
+/ {
+	model = "NXP FRDM-MCXW71 board";
+
+	aliases {
+		led0 = &green_led;
+	};
+
+	chosen {
+		zephyr,flash = &flash;
+		zephyr,code-partition = &code_partition;
+		zephyr,sram = &stcm0;
+		zephyr,console = &lpuart1;
+		zephyr,shell-uart = &lpuart1;
+	};
+
+	user_led {
+		compatible = "gpio-leds";
+		green_led: led {
+			gpios = <&gpioc 1 GPIO_ACTIVE_LOW>;
+		};
+	};
+};
+
+&gpioc {
+	status = "okay";
+};
+
+&lpuart1 {
+	current-speed = <115200>;
+	status =  "okay";
+	pinctrl-0 = <&pinmux_lpuart1>;
+	pinctrl-names = "default";
+};
+
+&flash {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		code_partition: partition@0 {
+			reg = <0x0 DT_SIZE_K(896)>;
+			label = "code";
+			read-only;
+		};
+
+		storage_partition: partition@e0000 {
+			reg = <0xe0000 DT_SIZE_K(128)>;
+			label = "storage";
+		};
+	};
+};
diff --git a/boards/nxp/frdm_mcxw71/frdm_mcxw71.yaml b/boards/nxp/frdm_mcxw71/frdm_mcxw71.yaml
new file mode 100644
index 00000000000..bdc3c13959b
--- /dev/null
+++ b/boards/nxp/frdm_mcxw71/frdm_mcxw71.yaml
@@ -0,0 +1,15 @@
+identifier: frdm_mcxw71
+name: NXP FRDM_MCXW71
+type: mcu
+arch: arm
+ram: 64
+flash: 1024
+toolchain:
+  - zephyr
+  - gnuarmemb
+  - xtools
+supported:
+  - gpio
+  - uart
+  - pinctrl
+  - flash
diff --git a/boards/nxp/frdm_mcxw71/frdm_mcxw71_defconfig b/boards/nxp/frdm_mcxw71/frdm_mcxw71_defconfig
new file mode 100644
index 00000000000..ef284e16e65
--- /dev/null
+++ b/boards/nxp/frdm_mcxw71/frdm_mcxw71_defconfig
@@ -0,0 +1,13 @@
+#
+# Copyright 2023 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_ARM_MPU=y
+CONFIG_TRUSTED_EXECUTION_SECURE=y
+CONFIG_PINCTRL=y
+CONFIG_SERIAL=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_GPIO=y

From 23be9f1d9a52acea905d5ad35b35dc8607e3d85d Mon Sep 17 00:00:00 2001
From: Jason Kridner <jkridner@beagleboard.org>
Date: Wed, 22 Mar 2023 11:14:11 -0400
Subject: [PATCH 0690/2913] [nrf fromtree] boards: beagle: add BeaglePlay
 on-board CC1352P7

Add support for BeaglePlay, a TI AM6254 SoC based development board with a
CC1352P7 wireless microcontroller for supporting software defined 2.4GHz
and SubGHz wireless protocols. Support for running Zephyr on the
quad-A53 SoC or the programmable M4 on the SoC would be provided
separately.

See https://beagleplay.org for details.

Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
Signed-off-by: Ayush Singh <ayush@beagleboard.org>
(cherry picked from commit 2eda5f3e10f653525a79c18e5acfbc7877dced42)
(cherry picked from commit 054629f97bfe23ed33b582e0e60d988979a92d93)
---
 boards/beagle/beagleplay/CMakeLists.txt       |   8 +
 boards/beagle/beagleplay/Kconfig              |  18 ++
 boards/beagle/beagleplay/Kconfig.beagleplay   |  11 +
 .../beagleplay-cc1352p7-pinctrl.dtsi          |  38 ++++
 .../beagle/beagleplay/beagleplay_cc1352p7.dts |  95 +++++++++
 .../beagleplay/beagleplay_cc1352p7.yaml       |  15 ++
 .../beagleplay/beagleplay_cc1352p7_defconfig  |  20 ++
 boards/beagle/beagleplay/board.cmake          |  15 ++
 boards/beagle/beagleplay/board.yml            |   5 +
 .../beagleplay/doc/beagleplay_cc1352p7.rst    | 194 ++++++++++++++++++
 .../beagleplay/doc/img/beagle_play.webp       | Bin 0 -> 39536 bytes
 boards/beagle/beagleplay/support/openocd.cfg  |   8 +
 soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig   |   1 +
 13 files changed, 428 insertions(+)
 create mode 100644 boards/beagle/beagleplay/CMakeLists.txt
 create mode 100644 boards/beagle/beagleplay/Kconfig
 create mode 100644 boards/beagle/beagleplay/Kconfig.beagleplay
 create mode 100644 boards/beagle/beagleplay/beagleplay-cc1352p7-pinctrl.dtsi
 create mode 100644 boards/beagle/beagleplay/beagleplay_cc1352p7.dts
 create mode 100644 boards/beagle/beagleplay/beagleplay_cc1352p7.yaml
 create mode 100644 boards/beagle/beagleplay/beagleplay_cc1352p7_defconfig
 create mode 100644 boards/beagle/beagleplay/board.cmake
 create mode 100644 boards/beagle/beagleplay/board.yml
 create mode 100644 boards/beagle/beagleplay/doc/beagleplay_cc1352p7.rst
 create mode 100644 boards/beagle/beagleplay/doc/img/beagle_play.webp
 create mode 100644 boards/beagle/beagleplay/support/openocd.cfg

diff --git a/boards/beagle/beagleplay/CMakeLists.txt b/boards/beagle/beagleplay/CMakeLists.txt
new file mode 100644
index 00000000000..b772e653618
--- /dev/null
+++ b/boards/beagle/beagleplay/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+
+if(CONFIG_SOC_CC1352P7)
+  zephyr_library_sources(../beagleconnect_freedom/board_antenna.c)
+  zephyr_library_compile_definitions("DeviceFamily_CC13X2X7")
+endif()
diff --git a/boards/beagle/beagleplay/Kconfig b/boards/beagle/beagleplay/Kconfig
new file mode 100644
index 00000000000..373566d6f26
--- /dev/null
+++ b/boards/beagle/beagleplay/Kconfig
@@ -0,0 +1,18 @@
+# BeaglePlay CC1352 board configuration
+
+# Copyright (c) 2020 Erik Larson
+# Copyright (c) 2021-2022 Jason Kridner, BeagleBoard.org Foundation
+# Copyright (c) 2024 Ayush Singh <ayushdevel1325@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_BEAGLEPLAY_CC1352P7
+
+config BOARD_ANTENNA_INIT_PRIO
+	int "Board antenna switch initialization priority"
+	default 70
+	help
+	  Set the priority for board init, must be greater than
+	  KERNEL_INIT_PRIORITY_DEVICE but smaller than
+	  IEEE802154_CC13XX_CC26XX_SUB_GHZ_INIT_PRIO.
+
+endif # BOARD_BEAGLEPLAY_CC1352
diff --git a/boards/beagle/beagleplay/Kconfig.beagleplay b/boards/beagle/beagleplay/Kconfig.beagleplay
new file mode 100644
index 00000000000..e0f220288d5
--- /dev/null
+++ b/boards/beagle/beagleplay/Kconfig.beagleplay
@@ -0,0 +1,11 @@
+# BeaglePlay board configuration
+
+# Copyright (c) 2020 Erik Larson
+# Copyright (c) 2021-2022 Jason Kridner, BeagleBoard.org Foundation
+# Copyright (c) 2024 Ayush Singh, BeagleBoard.org Foundation
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_BEAGLEPLAY
+	select SOC_CC1352P7 if BOARD_BEAGLEPLAY_CC1352P7
+	help
+	  BeagleBoard.org BeaglePlay CC1352P7
diff --git a/boards/beagle/beagleplay/beagleplay-cc1352p7-pinctrl.dtsi b/boards/beagle/beagleplay/beagleplay-cc1352p7-pinctrl.dtsi
new file mode 100644
index 00000000000..9f6b33da2ff
--- /dev/null
+++ b/boards/beagle/beagleplay/beagleplay-cc1352p7-pinctrl.dtsi
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2022 Vaishnav Achath
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/cc13xx_cc26xx-pinctrl.h>
+
+&pinctrl {
+	/* UART0 */
+	uart0_tx_default: uart0_tx_default {
+		pinmux = <13 IOC_PORT_MCU_UART0_TX>;
+		bias-disable;
+	};
+	uart0_rx_default: uart0_rx_default {
+		pinmux = <12 IOC_PORT_MCU_UART0_RX>;
+		bias-disable;
+		input-enable;
+	};
+
+	/* Antenna pinmux states */
+	board_ant_tx_pa_off: board_ant_tx_pa_off {
+		pinmux = <29 IOC_PORT_GPIO>;
+		bias-disable;
+	};
+	board_ant_tx_pa_on: board_ant_tx_pa_on {
+		pinmux = <29 IOC_PORT_RFC_GPO3>;
+		bias-disable;
+	};
+	board_ant_subg_off: board_ant_subg_off {
+		pinmux = <30 IOC_PORT_GPIO>;
+		bias-disable;
+	};
+	board_ant_subg_on: board_ant_subg_on {
+		pinmux = <30 IOC_PORT_RFC_GPO0>;
+		bias-disable;
+	};
+};
diff --git a/boards/beagle/beagleplay/beagleplay_cc1352p7.dts b/boards/beagle/beagleplay/beagleplay_cc1352p7.dts
new file mode 100644
index 00000000000..858ca21d162
--- /dev/null
+++ b/boards/beagle/beagleplay/beagleplay_cc1352p7.dts
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2022 Jason Kridner, BeagleBoard.org Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <ti/cc1352r7.dtsi>
+#include "beagleplay-cc1352p7-pinctrl.dtsi"
+
+/ {
+	model = "beagleplay";
+	compatible = "beagle,beagleplay-cc1352p7";
+
+	aliases {
+		led0 = &led0;
+		led1 = &led1;
+	};
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,flash = &flash0;
+		zephyr,ieee802154 = &ieee802154g;
+	};
+
+	leds: leds {
+		compatible = "gpio-leds";
+		led0: led_0 {
+			gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>;
+			label = "LED1";
+		};
+
+		led1: led_1 {
+			gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
+			label = "LED2";
+		};
+	};
+
+	/**
+	 * The BeaglePlay cc1352 has an on-board antenna switch (SKY13317-373LF) used to
+	 * select the appropriate RF signal port based on the currently-used PHY.
+	 *
+	 * Truth table:
+	 *
+	 * Path         DIO29 DIO30
+	 * ===========  ===== =====
+	 * Off          0     0
+	 * Sub-1 GHz    0     1     // DIO30 mux to IOC_PORT_RFC_GPO0 for auto
+	 * 20 dBm TX    1     0     // DIO29 mux to IOC_PORT_RFC_GPO3 for auto
+	 */
+	antenna_mux0: antenna_mux0 {
+		compatible = "skyworks,sky13317";
+		status = "okay";
+		gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>, <&gpio0 30 GPIO_ACTIVE_HIGH>;
+		pinctrl-0 = <&board_ant_tx_pa_off &board_ant_subg_off>;
+		pinctrl-1 = <&board_ant_tx_pa_off &board_ant_subg_on>;
+		pinctrl-2 = <&board_ant_tx_pa_on &board_ant_subg_on>;
+		pinctrl-names = "default", "ant_subg", "ant_subg_pa";
+	};
+};
+
+&cpu0 {
+	clock-frequency = <48000000>;
+	cpu-power-states = <&idle &standby>;
+};
+
+&trng {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&uart0 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart0_rx_default &uart0_tx_default>;
+	pinctrl-names = "default";
+};
+
+&rtc {
+	status = "okay";
+};
+
+&ieee802154 {
+	status = "okay";
+};
+
+&ieee802154g {
+	status = "okay";
+};
diff --git a/boards/beagle/beagleplay/beagleplay_cc1352p7.yaml b/boards/beagle/beagleplay/beagleplay_cc1352p7.yaml
new file mode 100644
index 00000000000..816b755471f
--- /dev/null
+++ b/boards/beagle/beagleplay/beagleplay_cc1352p7.yaml
@@ -0,0 +1,15 @@
+identifier: beagleplay/cc1352p7
+name: BeaglePlay CC1352P7
+type: mcu
+arch: arm
+ram: 144
+flash: 704
+toolchain:
+  - zephyr
+  - gnuarmemb
+  - xtools
+supported:
+  - gpio
+  - uart
+  - hwinfo
+vendor: beagle
diff --git a/boards/beagle/beagleplay/beagleplay_cc1352p7_defconfig b/boards/beagle/beagleplay/beagleplay_cc1352p7_defconfig
new file mode 100644
index 00000000000..b56ce4d3e8d
--- /dev/null
+++ b/boards/beagle/beagleplay/beagleplay_cc1352p7_defconfig
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2022 Jason Kridner, BeagleBoard.org Foundation
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_GPIO=y
+
+CONFIG_BUILD_OUTPUT_HEX=y
+# Custom callback for the antenna switch configuration
+CONFIG_CC13X2_CC26X2_HAS_CUSTOM_RF_HWATTRS=y
+CONFIG_CC13X2_CC26X2_BOOTLOADER_ENABLE=y
+CONFIG_CC13X2_CC26X2_BOOTLOADER_BACKDOOR_ENABLE=y
+CONFIG_CC13X2_CC26X2_BOOTLOADER_BACKDOOR_PIN=15
+
+CONFIG_ARM_MPU=y
+CONFIG_HW_STACK_PROTECTION=y
+
+# Adjust for oscillator capacitors
+CONFIG_CC13X2_CC26X2_XOSC_CAPARRAY_DELTA=0x02
diff --git a/boards/beagle/beagleplay/board.cmake b/boards/beagle/beagleplay/board.cmake
new file mode 100644
index 00000000000..61ee3cc2358
--- /dev/null
+++ b/boards/beagle/beagleplay/board.cmake
@@ -0,0 +1,15 @@
+# Copyright (c) 2020 Erik Larson
+# Copyright (c) 2023 Jason Kridner, BeagleBoard.org Foundation
+# Copyright (c) 2024 Ayush Singh, BeagleBoard.org Foundation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Download cc1352-flasher (https://pypi.org/project/cc1352-flasher/) using the following command:
+# pip3 install cc1352-flasher
+# Be sure to disable the bcfserial driver because it will capture /dev/ttyS4
+
+if(CONFIG_SOC_CC1352P7)
+  find_program(CC1352_FLASHER NAMES cc1352_flasher)
+  board_set_flasher_ifnset(misc-flasher)
+  board_finalize_runner_args(misc-flasher ${CC1352_FLASHER} --play)
+endif()
diff --git a/boards/beagle/beagleplay/board.yml b/boards/beagle/beagleplay/board.yml
new file mode 100644
index 00000000000..b412fda0ef3
--- /dev/null
+++ b/boards/beagle/beagleplay/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: beagleplay
+  vendor: beagle
+  socs:
+  - name: cc1352p7
diff --git a/boards/beagle/beagleplay/doc/beagleplay_cc1352p7.rst b/boards/beagle/beagleplay/doc/beagleplay_cc1352p7.rst
new file mode 100644
index 00000000000..fc36f0ce430
--- /dev/null
+++ b/boards/beagle/beagleplay/doc/beagleplay_cc1352p7.rst
@@ -0,0 +1,194 @@
+.. _beagleplay_cc1352p7:
+
+BeaglePlay (CC1352)
+###################
+
+Overview
+********
+
+BeagleBoard.org BeaglePlay is an open hardware single board computer based on a TI Sitara AM6254
+quad-core ARM Cortex-A53 SoC with an external TI SimpleLink multi-standard CC1352P7 wireless MCU
+providing long-range, low-power connectivity.
+
+
+.. figure:: img/beagle_play.webp
+   :align: center
+   :width: 500px
+   :alt: BeagleBoard.org BeaglePlay
+
+   BeagleBoard.org BeaglePlay
+
+Hardware
+********
+
+* Processors
+
+  * TI Sitara AM6252 SoC
+
+    * 4x ARM Cortex-A53
+    * ARM Cortex-R5
+    * ARM Cortex-M4
+    * Dual-core 32-bit RISC Programmble Real-Time Unit (PRU)
+
+  * TI SimpleLink CC1352P7 Wireless MCU
+
+    * ARM Cortex-M4F programmable MCU
+    * ARM Cortex-M0+ software-defined radio processor
+
+* Memory
+
+  * 2GB DDR4
+  * 16GB eMMC flash
+  * I2C EEPROM
+
+* Wired connectivity
+
+  * Gigabit Ethernet (RJ45)
+  * Single-pair Ethernet with 5V/250mA PoDL output (RJ11)
+  * HDMI
+  * USB Type-A (host)
+  * USB Type-C (client/power)
+
+* Wireless connectivity
+
+  * TI WL1807 2.4GHz/5GHz WiFi
+  * BLE/SubG via CC1352P7
+
+* Expansion
+
+  * mikroBUS
+  * Grove
+  * QWIIC
+
+BeaglePlay ARM Cortex-A53 CPUs typically run Linux, while the CC1352P7 Cortex-M4 typically runs Zephyr.
+
+
+Supported Features
+==================
+
+The ``beagleplay/cc1352p7`` board target supports the following hardware features:
+
++-----------+------------+----------------------+
+| Interface | Controller | Driver/Component     |
++===========+============+======================+
+| GPIO      | on-chip    | gpio                 |
++-----------+------------+----------------------+
+| MPU       | on-chip    | arch/arm             |
++-----------+------------+----------------------+
+| NVIC      | on-chip    | arch/arm             |
++-----------+------------+----------------------+
+| PINMUX    | on-chip    | pinmux               |
++-----------+------------+----------------------+
+| UART      | on-chip    | serial               |
++-----------+------------+----------------------+
+| RADIO     | on-chip    | ieee802154           |
++-----------+------------+----------------------+
+
+Connections and IOs
+===================
+
+CC1352 reset is connected to AM62 GPIO0_14.
+
++-------+--------------+-------------------------------------+
+| Pin   | Function     | Usage                               |
++=======+==============+=====================================+
+| DIO5  | N/C          |                                     |
++-------+--------------+-------------------------------------+
+| DIO6  | N/C          |                                     |
++-------+--------------+-------------------------------------+
+| DIO7  | N/C          |                                     |
++-------+--------------+-------------------------------------+
+| DIO8  | N/C          |                                     |
++-------+--------------+-------------------------------------+
+| DIO9  | N/C          |                                     |
++-------+--------------+-------------------------------------+
+| DIO10 | N/C          |                                     |
++-------+--------------+-------------------------------------+
+| DIO11 | N/C          |                                     |
++-------+--------------+-------------------------------------+
+| DIO12 | CC1352_RX    | AM62 UART6_TXD                      |
++-------+--------------+-------------------------------------+
+| DIO13 | CC1352_TX    | AM62 UART6_RXD                      |
++-------+--------------+-------------------------------------+
+| DIO14 | N/C          |                                     |
++-------+--------------+-------------------------------------+
+| DIO15 | CC1352_BOOT  | AM62 GPIO0_13                       |
++-------+--------------+-------------------------------------+
+| DIO16 | CC1352_TDO   | TAG-CONNECT TDO                     |
++-------+--------------+-------------------------------------+
+| DIO17 | CC1352_TDI   | TAG-CONNECT TDI                     |
++-------+--------------+-------------------------------------+
+| DIO18 | N/C          |                                     |
++-------+--------------+-------------------------------------+
+| DIO19 | N/C          |                                     |
++-------+--------------+-------------------------------------+
+| DIO20 | N/C          |                                     |
++-------+--------------+-------------------------------------+
+| DIO21 | N/C          |                                     |
++-------+--------------+-------------------------------------+
+| DIO22 | N/C          |                                     |
++-------+--------------+-------------------------------------+
+| DIO23 | N/C          |                                     |
++-------+--------------+-------------------------------------+
+| DIO24 | N/C          |                                     |
++-------+--------------+-------------------------------------+
+| DIO25 | N/C          |                                     |
++-------+--------------+-------------------------------------+
+| DIO26 | N/C          |                                     |
++-------+--------------+-------------------------------------+
+| DIO27 | LED1         | CC1352_LED1 yellow LED9             |
++-------+--------------+-------------------------------------+
+| DIO28 | LED2         | CC1352_LED2 yellow LED8             |
++-------+--------------+-------------------------------------+
+| DIO29 | RF_PA        | SubG/PA Antenna mux PA enable       |
++-------+--------------+-------------------------------------+
+| DIO30 | RF_SUB1G     | SubG/PA Antenna mux SubG enable     |
++-------+--------------+-------------------------------------+
+
+Programming and Debugging
+*************************
+
+Flashing
+========
+
+To flash, disable the existing driver that ties up the serial port and use
+the customized BSL Python script.
+
+1. Ensure the bcfserial or gb-beagleplay driver isn’t blocking the serial port. This can be done by
+   loading :file: ``/overlays/k3-am625-beagleplay-bcfserial-no-firmware.dtbo`` or selecting uboot
+   entry which disables bcfserial/gb-beagleplay.
+
+2. Now reboot the board.
+
+   .. code-block:: console
+
+      sudo shutdown -r now
+
+3. Install CC1352-flasher if not already installed
+
+   .. code-block:: console
+
+      if ! command -v cc1352_flasher &> /dev/null; then pip install cc1352-flasher; fi
+
+
+4. Flash the CC1352P7
+
+   .. code-block:: console
+
+      west flash
+
+Debugging
+=========
+
+For debugging, you can use the serial port or JTAG. You can use OpenOCD
+over the Tag-Connect header on the board.
+
+* Tagconnect JTAG
+
+References
+**********
+
+.. target-notes::
+
+.. _BeagleBoard.org BeaglePlay: https://beagleplay.org
+.. _Tagconnect JTAG: https://docs.beagleboard.org/latest/accessories/cables.html#tagconnect-jtag
diff --git a/boards/beagle/beagleplay/doc/img/beagle_play.webp b/boards/beagle/beagleplay/doc/img/beagle_play.webp
new file mode 100644
index 0000000000000000000000000000000000000000..031cfc7e754132a7dd22ef3c859dffdbe615caf2
GIT binary patch
literal 39536
zcmYIvV{~OfvvzFTwrxyo+nyK`JDJ$d#5pl0I7ucpCbl!NZTozA?|tw3e(cq|dv#Y;
zKULlR>{`9m<)o!;vcbS~q{LOVRrz!gz`(%Jz8*XXusd)tF-28bSz0hK^t#CREtk@N
zPlrO@s>-`!@R$QsatM)f7|IONJ1&hn{g!;|MY>41vGK<GOwxqR#`x3*o$N%|#mqQr
zTn<>sxUmsCE)96UsN^up<uJx>3L*#Go&!K5idS!s{7*N)s7x?R2`!_GDrVgn-A|cp
zBE6JrWVwWhUu0o2vdVv}evvI8__(-vZD52=QngTsHbNDqD=wMQ?=JCKxlgKx)y$_|
zTIq&7uR;wQi0g)Un`Y02Q%9ZJ$X|9Q|A8VuN*QT0WD<)rEODo25?jA+c^>}iwZb)8
zxuF}glDU6u|5XT37N_fm;0Z8v8b?t_B|~<<6AfZW0&`p$U=`3}->3rc6wn!8`R|hT
zV^sOaEIEHsEQub<BLAY`QFd*GP(b&h<~RIV8U-jR?ZHz(a}#-d(STAwlh}#|`JgaW
zY4Xsy$IaE6{)-`0(XkF%IJ!rrU*TSV41Slg@)Iwo`iC^`D=e;l+91SOD_eyAYqEpM
z|I^pg`aoi6E5gw}{LfTp%A}qTV4k_o>2m%bhCu`0StR}%#M$rAPp0Vamd?wlH*);v
z9iA!EPqk8y%}%+fc4k{eW+`d&=$6ie<=)Qx=Y$uO2g8T$XbmmQsYFa+0mWU4CZeb0
zIcxdbT@))`FOJGw^p+lp&z(j{Z?(kc)!_d&p8PlCdb@M-Z?-rry`HEJp5V?6cn2jB
z8#)~6jbnPd&+>oRAvUycCZ`#G)pDfyjU%gTpW;hU{py@QG(>8ow0YeVZsC~>MaOOk
zEIkHrB~j=R9rJc|nZE|v%8{ynb;BBFOkQMe?_Utn^_GcyV)&|D?rCx|t@BO39gLi6
z5Apqh#Hl4Y`bZx+{e^n7^Ig|_7%x&Gd9fz2e^jZ?xk9*4REMH!Ep7Y5PWL(3g)FA}
z@@(D}2=%Dtm-=3Xr?<fj?<r%tHFLt{%q*kbLfx06wxZ*K;1`>;_`ycqbJ*7pC^=ZB
zYiK7enTO5j>pq19EW0L8A_p9fL+k1iW4>^s>TNhnDn~Mvtj>3mi1927ravb7)d63b
zCK=In^%ikj>(}jfNrU6JaN1H}1$!7j)Np_KC47>sJb&;35BsMEG57PtpS0ZLD>v$H
zz;~|3O%JYrmWwxx`=oCk?Gx7h=wQvbH9bPvxl27rsCs7yI7Y@B_#01#=dFeRd1|jI
zVozA^9ddr@B=}jnX1pDA(r8SYK1^u3*AnoV1*?F2@4ED<ebA7tPQ(xy&#QQyh+X%<
zKlN%2Zs<7=b(PjPbSC|eG`vPfl#-fWSgrM(_{XLZJRz^5i#xvqF)`Ue?<)-|ONWpA
zYpm(sP&ttyxIxCfdTmefc5@4@4>>H)CYrSawnNPnd%!~Io|DS>py5iZU6{&m)3YLj
z6cME5uHlS7Bo2lmW6?ThX9rzrDm$%<YJg#E2g6%h+U5SGwibHP2%?Nv@%KFvhfcew
zd8N9hcDh?5I48mTu4}sL&UX<F=Ygfd={Z*psFpl8xqZtO`PnVLI~Iq$yF%7HlJ#Z*
zdRHMRLYdmxEl7J(Tz<@uH533EKMdnhUb%mD_2RD-fZKL+mm9@!TDmwc9W9o_M=~q!
zSJQybU(q5{iz~t8D{O}^JFg^M){;q&NyG9$w61D>OU!bQ-Y#o9&XOp-Q*U$c>_`UA
zaxP>DEqPu)Kb=<ECNmUB9J)@~WtMs!BU$IR5CwV5pY8FQjXD1gYq_kAJH>3F2s(QY
z*+bWPO!Dn<yR7-}9``^CE>rWVLm1$0>`4l*dwyQ!+J@#;4L#d%JLCmLrsnK4y8-2Y
z<9iyj_pS)6tO_!Ivb0|GuW`(R31-B*`Z79P7~ur5u6v51mbdgxLG$u&AlZ}BBn~*r
zyz>7+_C)c}K<QmNEtt+HYH2#hkvTK91}g01Rd+Em<Mz9(QV0F;MLe%gh;k3BUPL=G
z#Z&g1MAI-ZJHgpO{hEwZNMg)(V{8Q93j@<ezNHCNGfUhLf6iRb7o&v5zB%L{C^!R4
zgF&2a$jW{P0Yfdlb3h@pAby9759uJ@T+b8XA(QaZSdv>gXoni*Xrj=0W6p_Z9^H1+
z%ss8TM_dZ)^m%>Gzuv-3d0sL@<E9s0bDg=c8C||nAkF@{Q=tR0>JRyl0DhN$=_-7k
z1i!RtrBM1-35T9ru~_^pauXTNY_D2JY^`c;&1mel8_x3UfN;%$D&G7^21gqfuC#`p
zj&TEDXj{be9Q7~lu+Ze}G;Bq=l|VGtk{oQXIS{u?1>qV#HbeQzo1JM<5}806L@GzS
z_gY=u`4poyvk)B~3+TQXC3Et#*q2Wmywp835Z<@+t$J9T$M+glNyve8MI7?hCfyOM
zjX1}KrCgQ^EhuQst}xRE#`K||__SfYF7mMR@6Vf9CsPrcA6YmS!MrYvFkYY@H}@3E
zLuwZJ<$4gky57qadrHr>h>x1s9BR6MEs(dK?TWk#nqK{;?bLy=zrxIq=wRuZuKd2z
z;hvWGg%b=QgW}R|63znHw<+btrv`1m{P%^9bgJDfE^(=UbCa8f(DdSAkEk~I&nDMY
z<eBLW%9pr{_a44>m?>YG6i7zX8?O{sqQ`FK%E&)XN)13P9A~*3*Mu$sNo5A>CPw-m
zDYKh)D8K%?M-r3It3I_VR)0_?Y^+Y4YaP*2ZQ>t6)C7Hx7=OqdAf9D4*3u@&l<4hF
zMb|uq$-rS-SMKkhO|df1bfgIaR}`fh|Crpf=fCt{D=BLZs6_%f0>1Sf0_0xF&I2N%
zb#}_M4onm;!WN&Bwt81j-Q=!9bF|kia&5vFw=&I~SBx(xOnQ~7KykA{I(jv}aRcLK
z7vBLJZBFvsN-n;MA(M;|&y5gYM!8Wz(AIb=y4V3jCJ|xzwGr)s+1sL3J0)6oP_zcv
z4kVxH^J``oxne{1|7pY8t3lvF%`57GU7Gqx|1@x!`|S}ky^2*G82pa0q-{-q;WB4u
z9dg41UBz3zuQ*~1h|ayvO|z3@+blDEc!l4b`q^X<F6!qpYj=dTcg3LF_0A4kT<1A}
z6=VW~Ta&$)Yo}4?`wtDEJ+R7+>930L)mFy0_%-$#nda2=;$XmE{i~m+qUs~PuCV*h
zTb63#OS4l^m$`Tqxi+l&>{Bd$6#Ju%q<e6_lXwd%`k+N0oHa%v;)Y+RCGNd)8J`3H
zJ}$ME?38Zgp_ZI*14&)gOM^xb=~PyQ1Q+A#o$;%?_@}DSTaQx=a{m}sHL4A241L)`
zNb_6($0BePG7*1!Zd&W{Ys0LQXvz2?vv|>E_Jvr)ME~`S3A4M;owAzvV$WTes8Qcd
zgAWkR8sktjHMfOqAKA{o0R>y54{*)5DxtPSekdKGw_^5C+z;S8mbH$#1BjS7#A+ua
zA}oney-&HR{C;e95d)k*RM!P$_t5Khj2`8|<^EX}><fQn)zK~RjiY2VyNLgRBDs@`
z*z;Jq^A{I=US5X30cMG%d$?X_J6i&XtU4dWLtotAa?;Yf%D<u5+|TV7iLt=r(Y!!*
z)j7hVyVgN5%F}wddlgPF?%iQML7rS(_w*wf)X!cu8M<Iti$ySZepk|<lQYdY#vcBp
ztO_ETjykn99uI9g1Ju(ZwGi>sa=8d>h25%&(1kTs<^Lc<D6b~CLQo<y`Q957sO<Q&
z3DLse5Wc+gTs1^mIf!6RC9ix7&YtzG&;+);^R#_t<ZmI{y(sk@ihb2yT7b)F;SepC
zx^K?FOi++~x7MStC^MjsI#N)bYwn6E<mUr?KH|VCGyP|Qq56SRVKm3mWnb?t{Lrs~
zRV|HoZX~bVjwkr|w0r_+$h)stMzGI7;narl>O9ZEiqGXsLB(8zR_+0}k91<MhreuX
zP_ZdOa@JvMkl5GIH3*=sY}tt$5R|dCe0^oeeED_FbpC;VK$ZLBlOG^G^mNoe!90H+
zzf!e$1bq-^_ZCJocI=6#f1gCDrrYs7B}ir`>JCMDMi%5ikEFHX|Bg^iOuREM&$o-c
zVN1a8u@YKo5_=xjRLq;T0>N9|{Laj!M&cM!zm{@~eg47xLDRa^$%?_H{%Z2G{tWY-
zdDs|Ms(m|R9EcEq-(!GcQ5@>831RQ7bZ55$UwKh1j%igvjymMq!(ohUuM_Xq3dX{B
z6iQD(-!g9I0(-!$`?cxqS-JFui<a41{;tA;X({oR)?*avy+3p5-F!4FOa`694{ZOo
zb!BxR7NB(1<S!`N6ZwKpJ(H+Q#r05iMIDe#i@omr54kWoI)Ngy+R0_9!$aFn;m>gB
zofas1Ru+HtvTwitj)PD`=Js48V_TIx*ZDI;j(}bici=d}Y|7(U%POm1O<A+=;kOP5
zi{QlTV8HU>hU@4u$iy<e)8O7D@=WVW1e1V&Jqb3ocsZO^xS7^6G1raaZO0d}-Jc-q
zvmQy>nP}Hv{>jduLV4`SrHi{uoKhptEc2W=cSnd8)z@={v9p9orNTB>dhGg=O_Aji
zXR71gv92#$4h0yz#w?Iumh4*dB?bQ=ghpkbu!UiWR?DURx0$5P{=zH~Uf0%<xTp<B
z^)-t|yi5DeG$xmNL`(ni`=9<7Y!hQienM`!k8dw<%3cRPg~_hg!g004yF#M=UOtnc
z6jm}?FGBZk-b5@qj-+K-qs7o{uNP29Z@Cb413~EX%T<cD*@vw8<I(;+5}Xz_2sDu@
z@JB}NF%mwJRw(-uV$)ICa-Yelkp{EOUv6LOJI)qiIlkA;Wu^BzL$1I(wBcW`S>>YO
zngewsNnd4`JXR()AwId55nMLcaf)%$icW=(`WT5re)vx=fap7RoW}jaq{l=JuoY{M
zi<2wWCqETV!a6n{Gr!X$9t<24tJoeY9dGar7*Frqe|c~1qHlj4Q=IZ3(Y$MEkWU>h
zQqUpny&haT<8fZGhZCu$7&5myZ2V&$3gnL^%_~}*Wl=M;)-kAwnR~e^HtW<Wj7k&P
zF~@bM4Slao{N*$6V%qQbDW7)GsXCuZoU}b-;fIlu?c4rZ14+t(I#|-qB*j_NkKdlO
zcYyhC;0P+EjnP5*h^Ygx);5PW#O@~8M_&<CXGet2ygwxkoqESQuh^yywW09FZ;Y&C
z=*v(k_L~x-_)Ny8ENCM1a>tm4a65??c@$#wk1&ZM3NcRhO9}pK5Vb3uGQZc>e#pqS
zG#+u6vcy|VA&6wB#iiioZCcv_bTMGa9L)S=`I!=lVCud>H<<=H5(6#oy>p*`i<v?k
zrlIfAIsSPZy)QIcj02szXa@M6&_sW1!r!+;ms{RqAI9qc+FcI4Q1!t<>T1s%$MTvL
zfr8W5dyEFq8t}pKpy88gQ!91{qW}z>ummtb6!Rj@EAr=|LUs|}d-eMK+CrZa_GwT>
zEO<<qQ2KO4{8|#8A>V04kox|jBvZQN4}z`_Wb}oZliaA-aZf7M*xHVBXC`F0*&2-Y
z8;^uKEpn&tr_<$OD{7t&petG3Ox-`|kS|!mlH=(g!?pzmh(~?M%M)-<!6ZQdUuEfR
zq0H*d{K72G$bPm4%ZTaUre-P!orhK^Rn9*?VOto8x4E}4<-OSBj2}a1CX$!UzVE9v
zpg(E>kPY9ImaGwe+omD%2l!{9d{cYdF@k1mw~LB+WQok$giZ-i8WZRUr)sf;^BGPx
z)WzS#o$Y(?`jJg9de}F!A)YeVGQ{)r{2stcsp}!ux_v^3y=3s1Ix{hvM}kzN;_~>n
zuuiKVK80db3qRNnujrSBpKwP_w}Ql#Q&=UV^s_m>U87vOP)6Xj{B<mmtg6O~Ro>u2
zEq*rr5rWz8_7VO!>*B`>Om!y}6J{iT>Z5>DLeaVj?H!iFtP>Py3(<_WWEK51<`{D-
zkic?WFz_@oOh6&1D{t)8#^&53bM5@D^dpw>yg&pyWi+uX_~^qcrJYs<Tkm+%noGks
z#?&EDC;RT@N@N-a051n(hI&t_<+9GhBalB9Pv|6WP<&2P;nV=#nV$b%%e6kKWOLTY
zo^!hw#y($I3gWY`W=6syo{#ucDb=QLlajDdVr#L@y%P=4#edY#C1U#4JN@CE`$rl0
zw>ob%$>L4OuQ6_Z<|hXpp+NGX_*fS~@tDQEg#r5Y_*5x>$JVbq!xs|*H75t8f8^`b
zTpCkSW)7psEcf@xhHl!!nchm|+rW--{;_XI(SS>uO0Qe@LgXSHTN_ssxFM$iN#wUP
zrRYzk9&B*Y20`h)13*pw4`k5XOrKrmTf($YpljVh?{VxgAQ}(7O@Ti+7!b5nj;vu_
z{QbcH@+)`=!|P`e`(J9oRQ;c%_V;i~O_XsDII*vnHgQ(fF0YXAHT}aQ%22~i&$H2|
zKs9v1m~MslX?DwE`FCi?0~ac`Dj@YXcI0Urn`)B7W~$btJ!=)ibpGVji+tlqDJO5Z
z`@tiBeUI}GBFcUfYTL5=w0>P6qtZsHSCevwMrU3q8PM($jyXrf#O&LB#LUD(A6uN!
zA|==L4MIROHNR#U8Q@JV7bjl`YpKRFDni*Iq-|}N>yKVeJG=<9L{eh@t*up?TBVLw
zNW`WItQ#t=ZCToxI^N!bK9qM;n~BYtcf59_O_^a-@5;4RVb)wB*C;4-J|6Bm`H9x%
z2Iftv3p=EKQ9_(^J`(HxKG4FK6vDsHOT_UrLi=EVM(B4)TZgsHagVcv##QwQF5IP^
z1z_eBS-<eP^O%PA)~xy|PlfXUfN|`rUNVm8v<bV{=pX5;d;+m3AkuO_IS?7B%qn@S
zk=fB686j_t*G_`IsR?(UJgw0faC&yTJGRlHjAIK?eV*Kw3mt6q`7T@=+V&ssmBWh9
zJalngVUgDX-=$jN5=0-uZ*79qy5}GYy=V{FZWw|O>R(bwV@(|@IF%$K#|ke5<xp@b
zE2@UnSjs3)6c+Wttd{qobNPJ=_Rx?1i4y;;p9O?{A7dSyX?BXhv`1gKOQ2~z9ztcE
zhp+?naIA?dH`C*FSY<|xE%VPbznjoBQ&eP_;Ij0)wy2$eRljKA$i6a~R<DXmNzm#S
zT>UmHYo;uSY~DJe5T4ii4ek0kgey5EY38ucr9@owvpYF(%oytaJ;9b`bMMX718mHB
z?0vEmXzHLPik!|^I>Y;fJH`ulETt0`+qPb*BS3a9=bvwB$~h6hDJD@WA+`sUnu>&2
z9fCDH*C<!;09#s5dAXj(?ORbTpHcK#LdxqQ3qqz$k`W=W1|!<YsDkYD8Zu^iFv;w=
zjhLA+IGAY*i0~?c+y7GVQ`Kpa4mr39cc1!lv44G%l1o$hNc`vmK0ylo?_yaG9v-G>
z^&I%=^}S(<HFlg<WLQK3DV*4mPC37NG?}r>Ha=vDki#t(7=!Z|;(IZ|5RMTR0f7N(
z&9bPKIcJFXKP9s|MH8R~LGPRUA%E5iidz-wjB1+}N{vEfmXidS&chSFQ0f+z4OpkI
z!m%h_WSb)=muC0W&m}8~v_$mYfh#5Uq(>R|;Fh!fUu<#A9ZXzYv$X{t`vRpJ&~^QH
zwlEt1irv{d%+n&qu4#^I0<rQ{;Wi0j@O3eb4p>#m8My~-PUEd+4Dw105hz{!E>!R>
zEkI(&4+%rN39ylOHJBo&^E3PCsM%N8#_*Ibz^;AHl_7#v+T-Ccj=EKjStkO9Xx>7<
z)M>vLxOD>(j_a~8)^(?h2UOeBE&GBu1CdC1^u___curXpxHU`XkchExI(J~Sn;mnA
z=f7|+$fn!|nM)OMiFs1SV`KIqP0SEaE7s6Qe0$A@`GwiZnQqJAPZX&0>kbwC#tua0
zLeD{4J7@Mr6VKEWVYrpqc@fBF&<n>3ySt)|O*<p%D(hL9e{8VP2X1KdR;}sqE=hLw
zv#i)#F5>>6Y8}Ew6uV1#qK~Jyu(U>`z3H~vtv(8b$9<3-j7!k6LfBcXA{?>eyy^*k
z*iV`8t~R&@Lcj2z{x*w-;>^4$Dk5X^wG}yKV<$v-D=hxHVc$Lgc%iSyo7afH0xnY1
z7~5-z3oCD0OwHZ0i?QM6l3B~~*XLX8t@S*WpWltTH2p#%<V~m*s{#9x$RYQqTlnXg
zk(9k-0RFdtQjJUe!a`RbBus?}e4uo&_GBXd^P3&d`T?Q_Blqv~@=8upZ?+#75;Xc~
z1z&tB6MRbXdhj+zq=UxhbiRhIfkHZn7UG_<Yl5p(I%5Vsn_*ddU}QZfZ5l0CqJu=?
zuwEtgT8n*96h9&vnm6o7(<LS_*%HQAJQb3Q`v+PCNvR<`CEM~Q#&@T@vN+BDnSuRD
zAt)>7H#$xYqfJhU!1(?dBU_Yxayr}~&H<!{G@3$S0OZ`TFkbukkqdl?s}CyY(&qa=
zO>eW{Wf^06f4u_hNw%iIn0k4reU~-L@3pSQ=WWMN^@)^-p~reb$|tFWzjz;6M|uS^
z_0g@1aKQOr9aHcx{-C<mAM&Pz0;{0GH;MAcTVcuk-9GpGIWqO%(kh8Fn;I3Nb3Fnk
zyx&kockf0qOTVOr-^Y53ppJC$IHz9uu{FJmd>DBL?k#eWHdcaR+L2h%e3Wooixo5{
zc16_#rs7??zw&ktJEV#r-02o7Idv8sm|w^BRGjuNUB=8%s_sh0b-}K}2o{L#^pW6X
z?thQY>pfXB7rvlb=cJ9ng|eI0&?5usqQoHwsJ!$*ptX&*J=Vfg#It|juMgM>2P-<V
z5~K0z+Xf|zhJ$Nv9<A?P`G`@vQuQGjIn^4VRT#}9UfU2OeR53_@`E)e+*ut=y_%{$
zDr9H9wS|LgdyEUcWE8PI7fk<z0P_o&vUrshb5V5`F{KIeDcmN`%Fd7s4e9HcBVvK+
zoDP_}I({rbJIOSc4zleFZqnI5$Y1E)7ZxF{f$Y!Vzna5FhO%!D&-(B|-VPAB!?=B8
z$Xq|<)JCc97!M~}E5s3gI80(20Lj4?d;<98%0otx<%Z6JhuB%F-GRpYu8+f6H==Zl
z5Xly!xWa3trnj$nsX(!SeYeX!;z;Gqn<Gi(?(T}3ZYK9&Ui(I{CDbvdCq`5ElO9EG
z^7qhdYC`aRBVYJ@g9#qwd1M-tL%W~3%78S)aJKe+k&iCAi$eu~I@s?6>I4>J{x{lV
zgoCT^DzK(^qvMVU(m*^jUtWgDms?j`i_ym*z9;X+qNZEJY!vnniDaBZ+|5Fw_~tm(
z@tYdmlEt#1W4uVhv=8ld3RXwabB*yGeWp3%Gpam`TlMgZBFO!w+FCA;Gy}#uS=@Ir
z_vAfT*BYElYU)SWCPhHB=@0F-$YZ(#<(dYaDf|>HyAx7P-CRTzrCB2yWvn&%ykAH6
zip{3U##^an^F)p})oE_Z6&HJsx+Q0kd}sIZf6CtmrDl5S`lXL5YVNVjeoP7S_344C
zAqujG459GtC!69=u^jiSBc=4ZT$T9FTu8ouj482gXjtJc(l0E6h6ajqJ6LIQKb)O^
zz4|4D<O=25r+zQ2Ju%YFy-T2eF~=8BZ}S8}11{AQ3`*$5j8X;b`GDPDZlG|_86dak
zDyul#CSaQS;vy{q=J8!}r>h2WQv9G)Yxf$7<_e`Rj%<dHb8uTFezaPCuF5W@q!B5^
zG_=_q=?+X~t}`FR<IY=&k!q`;B)_D7gsIkjOv^@DGFM}{LT_L088aQ+?WsK3;9wf!
zpQLmLx_04dGo6&@yOyEF{`kD1+OU5WN3U+JPV^m1M#I^Q*$TVlo>hZlWVtHMzu^g&
z(p?lTK~&mob3MtQAa9-w#dZU#P0#v%Nqb9mFF0Y<flwukFkw@L6#V)=&HpIXjngqw
zo(~rpAE?gzW26Tz$djO^a1w3KUQ19$m@c}-s1bGUduw?62kv|&t?1X>j+vT>m^H(R
z<T`Fj+?85g(W`XDfg&T$$^4~d!k!>@wXVN$#lg&Xrlq_~t5&tX80yf4JAgXV>aby~
zp&q>8l1R}n*HXOLCj;A-T>#QR%xQrN^L+VTT~rliw}KoI{6LIPWVrt86&=&1^XHlJ
zP>y)r?(J5%zQ{&|RL?o>4=Pkbv*A;-Q+~r}u;UAWJB4s*orO`H{#ZN)l(^Pi6(4HP
zA2e-E=R^$!{xfpAh(v1Q;R!KRZ6soByR2ubu<eRwWP$i-9@H;bG3~NeqD=8W>{gB9
z7WxwiFEz#&Mw{TW?dAh?W_!Rr{W+DHOP3|U;sY~0(Qh@#t1Cnl)D_xtW54~@H@_tJ
zp&-?s;HO{Uc!7tozoGtt6um*NTfgmmnq?yuJjsvch47W9)n0$(eITlkEYKqK9VEW*
zDKZ^=3iI8hlbnh7PjP{Ats>H%c$2Ou-O>sMGX(X*%Pza>vV#a7?h`5TGCuaL12z1<
z5E#OHh-)FEi}Xyi^2Ky!(EV{l_YkK=`3-pTE6%AztS<&Oz>dBP8*X7IK!uaHO%I0g
z&<nmP?NSKp;+8R`aFlhhZud9IX_iPeTIXFPCnrc3y!v?+?;$r(hdc@}J~Ct=yrSBb
zT9l7!BEcq_6fImGiQNSZ)0Yoohj_h2ss_SnBblJt(P!MEFCaR}M^I-VnhqYTEO54w
zf{Xb2(-hyT91X<eNLL(rLqc@@?qJTEzyE}*eiqC1MRAs#c@oJTOZ#-xtTStss3?8c
zNZ1AvTq;Prw;*U62E_Z0Wtdrp4d!W3&7Vw^wLoZB`$!8PREU@9`iztQ+u)$fQh0sC
z(ETyZ^$^EPZ<(-jYaX6*7g)yOL58aR&Y;BnAp<18oA|I{;>34WuQPl0&ek6Tyo|`|
zd}dC4gW>IsVT7$HH=K}(I1NY};d9F9i!mTko8C7@#jjdjrNx(e^@n$;5V@|j?nK7F
zXqdL<h}uskTA2}45k64k<}iFXH63DmY=$Moc~Vt5nUXo|5XmQxTNsGp9$3&&j!1&P
z%7`oQBCcNHk`Vr)R+fKvL^;9Qu)>iSler%Jm#UM<uWlg$K|%<G(m?nJqJP10{7<;>
z-lI<vb!G>E1&yg1Nf=_`J=peWBLp6QtCZ|OTyg1|=0sW3)WTOZCcM?ug8b1$@sY+@
zR=Ly5JWH@t69%(^b<zr3e@>3;+(ThC=i%bsgCN46$m7nc^Pl>bm*YLDrs?kts62)r
zalZ1->>NIe_f)dN|MCzCySc@L4{{@sdTtwpXfc8#jCJZvpYNz1a=m$B@q1dlgz!e=
zwd!_mN$d!Kk(h>F1|z+DUWfe=O-~gkdpg^2l##Uf?wGKyrecdCQcA#I{lwa+vUSm2
zg{FNoW`+5#T(~ShVo7Zx&P)e70pY$hs0@6Aw`7#d<E8^K;C2GtGUNsn8AWwFj1~*`
zPW*-z!CCy-sEEIt`M58bf4VU#z@$t1!QmhQ3d-j2!~O0>UU)O(t`Pb{7-1z-PZF_m
zEf<O5$vzCQnV!eUxZ}GJboAWK8Ei&MAy(?Rm4y!y8Cn&z{6z5S_B-I1jxU}n%MGU@
z=O=9Oled$El3)>WHp|LRFcE71_^O78cWU*8ETUGNJd;2_=?RndZI9+4;P_i)XN#<Y
z(ds`BN}{!DRGD_K0!s34hxPf?wOr}yS4w*(BcTU|=NInfQHbm=f|=|_Df#QRv%&2c
ztnaopi}N^Rbvv<n9HKPlC96U#w2%{VYK9HW20Q`T30i%9zW@r%@*J9|h!F{h4{6B=
zeE(Dp9MErBfj^-UJHma(p7>pwng(K(Z&g{Cbl+IHA4KoAovNHhcT=9ppb#%rROe|0
zx7~~LDhDl#grV*RhQE#@X}-<t+71p{^qh}3W4J@y4{0N3shz;sX(|9_eV)6FS>Gz`
zf~Ek4OCNuHPpRCLxF2<*jA>uqbcO9LCA5s8i(NKVYCZm{swGb{|DXZ(1S+wz+I&4t
zs|9eUR`xuvA5xC-Sv>j362(FgdxG^dw0+YUvE1<U<6k^NGOacmNcrvT%3qK@L&ljQ
z(}Y`I2{RILr^wBm$JD_d4s7i5hv$n$UdRhDQ9~u`A0%(y-3o#q`&<6MIh}FS?$i59
z+jmiyh0S2({fu|L&b>b+-BG>o@AKkHpiLO-4`zDv-1}y%qr=4yu8;M<D5!@(;(}V<
z*zH<TbjF!PQ9m9D^jkGZrWK6xGFKji$h;ueh@r_YAj+ZNu)m$ae9?BJTlUoig*jxK
zI?|n6Ej)Ku5Au|tFOMT4$PM){V+-9*KouI6#OJCz3CDY>!Zc7Ku021#KRzQ5Ktpf7
zG~lc2vW3K*4hr8H>pINL<k5t@yXy$cR&Jzgb<^@-kxMP<AUf1R(O6FQZGFfM!1Onc
zyPjqVeOUylE_ZXZdOn<9eY%<VP9$5g8D9iRD;>y#6ZvmWiLsj(DfK<C--#=Ie91l>
zuYIPH`qQ_J7022pXJj$y@|bL)A&#E6@5w*0g;iXOsy(n%^^l>VFXx3Hr_+J4@Su+6
zB>L1#1;Cvp|Cfxo=azuTot|pe8rbBantx}tLz9CYXA+p&p3p*0sOzgHn;h=fh<xbm
zCvHS*mqg6O$K7|Nv4NY4crAlGv6WR&i>pI!P{A-wHM&p<0pzB+qgu`wc(y7J&mIeB
zYlt$w+g_>n2V<NX?|ddU!!vos^>`4~9${f&MA&)BeZ29J^*`@>J{4Seuw`t>&<YwG
z|GOrP*TX8Mbg;uX@*Ri7SD>YkS19u`AiJox1tICc(9ME{cd7Sz*Eu}<)%rH+;r=mU
z@(?f{d81Xlz}-!#H``z!?z*chqNp>ux3JLDOrke8a+zwKs7aqmBEYb~wb%lo_pl2H
z&;FWd!zuN^0(Tp+p2y-Vt4DxpXtnRNU}4!@3yI!Ckx9kb{ta8hDIuxa{QZTr<#LN~
zaT#U@R>SG$*D`*<XgJ%c`f>s(LW4bZz=9^m#Yk<Bpqx_a*R>jthdwUu^lov>MZ`dC
zyKJGVBrRaOg3$+#<>F#Klt-S!H*MjoPSxc?0?Wlazlw_ub<0Jac=hFbFLcYrCz{Gi
zDuZM#9n$g&+Xg?zhEpq@xdlz9bh4^$tC)6WuE=C9kV|&^>szu`VlLLHKr^=9L(10I
zCa_^LmaH{Rysa>{AwkL`nvdFsCiSZ;o7GPQsleZo<nuAfkyXBX0$nKR`oO9B+v7)T
z=ihxCXsmVLta|&Zq;OO~avM9h%WV~V_r5!S!~GkkTaFBV0H)sCBCjR6Wf7d-`+D)`
zyIc@;!&`j)i@Zm8@&&61>s`ubB6V=#-lve_xt0QWFt5yk6^Ub?df!MQ2klAi-#M|X
znSG)Z(Bwc$fBT)rA7rPYlz|$|Y2@l5jKA5*mb;c%wK!il?8shS!N9H^!Slcw@FDKO
zMcDD8C5p%kG5n~%kwHTJX$ce^_8e!00)f4QeSm#}zrqEo<6v!Z?t3PT1sQddmY}w6
z0eXVg@Agjs!rig&y`oyajy};JjUT~J_4kvXTMM*r)^ExUpl_&)K;<h-)C-gQ9?xzF
zQQe@!&!G3<poa%A(A_Ecip6{4HRuuc&1(S^7g+hhdSmif{@&9nn&3bDh&qaTx%D8r
z@vawCeuz021OyH5M_$nG1a$>vf(kzgpA;@LZh}rgBcIZ~tS>EBpo{Jk5wReQPpOaT
zH|L9|XVOhju}V3pYQ3ip6bZ`t^jpDQVl4~;eqMZPfJ|Od6%rqW@!udp66>%pG7rvA
zJv$(O(K!(4HTEOpXXJX%TF@d$?IryY@_qTu`W<*HdMxVPoeoO-QZDhqdSTr#Jt^7^
zS^&|0=77pyKp;@C$w*IOP}S$zryEH0MHB>j>ptk&`}BL?`$z><z1-X@z2<$s-JKV2
zE4`_71u;jM-qtFOza@!SRbQsHYXvQ3If^{IH{*wnweep3=MCpQC%eVauR__XIvEkz
z?oR<R^q(RBH(0}g#rIjC(ph(KIU>7prh{i|>W+(1T36Kf(*UXOz%b_#;QNk~K*qP*
z0vA+yu0>_{doovO_R&yn=^c%U6E@w|c{Skd#eoynjOOpIP%%C08cW<}1DGR?LWd-5
zapl48VS96<7xTHAT4RwX{6WrtwHG?T6vGOnng5&DDKhxS4ij^&s-a<0=_GPRrZ29w
zIEDG-3HUz~l0xM$d+3%p%LSVXJ`C3eREmtjIRXNM1AaEbqDk=i{wYr&6Sk+_?D;jo
z=A#3ZVd^lyTnNm3Hpl^WA_ectBWN$@)^7Ezsng{?a7fC*iVzY$+GKo9?0=^SY0G{i
zMx*S_&vLOy(yY}x1Soa`x8j3RorD=yEa^g0X-Qii=Z*UxFtR@~?M=)4*S+Z=<>>{i
z9VN>C`Q}lwBT#CtbK^RO@YU`~xeaL2e3bvMF;p9#h3F{qQ2Ll2_}QWi!9<0+n`o^$
z0WNp_kTJ5wwf561#LVCBc+0;_ND^%}U<S@#nT(rdl0*xgZCQ4lDkS_v=#K$le79k*
zh(UAvk#~_9wQPq$Y6Cg+)A$04!|{1@ksui%8Dc49>Hj<qfavH>eQ5!U7yxD!x63ei
zuVK1_($2!WQuC#1A`!RaHWi|K8B3BcbVJZZHcRXO6^c~I{1@x}MCZf&N0=k+Y5rvK
zkLKlekvOL=-FheNbc%HnHooP4h0kK0U)V{Xf4ZSPy5x?Y24M(({MEGhS7n`&iFD5E
zh{^AglEOon_}{>UXYd&6_PaGKUu`kP#bHy8Ux|N+zURyM*}{SULo@g<B9I5^kOK88
zNwlvkRx=z;Vg(>2)7589e+Gg0_tt?S3nBj;H&|st^-|M#z`itV6fPm;P=|L|?9_|s
zk^aN|@XOztcIPoT)90k%c)}M^h0bp>xdC6qTfHx67!UNO(ru<9PBndcoEauiO04`(
z8!xc~hC<s!>+cZD9p#i#o$hEXk_4{0%*~w#ck>wWy2)9NQtALxUdpZ=5r-7yy?jHm
zX=CK+EQZ&1FWO=}9;MNu{8!Y}fS4}Xi-#$+^Y6Ml7d0^OGjQl}5|DZsFy@O`MJa9)
z?0Mh;iVsIt{&<}Rm>sSi3rQze(%|=mXz(kS6%3Hjs6fk%pSO_b-#b1?`((05U-cuD
zQ@czBb5?^RBko{{K7rti@c!YPbI^kkc5jbrwFu1V<Lrr}`<<9yi~HxX>-sS}G8~q1
zg>h{}X%T@wPfTPuYJLdxW%A-c$Ge$qmd0<lvK+~A$bE9Lvcsx0IM}M|@01T6rdf3#
z4^Hl+S3>rIqmVTV?mgxZju@qvoy=8S)My3+j!^QK*Jpo%D)$8P(cr(^Crv$d%7Be8
z1j4Xyj)I@*iChVf$sK69k)8O9)3pV>MCiU!pV#EQq#sRIhH5VavxQD?)nizcNY9aC
zE^CJE2?Co|>(?nExcbmO>1){jC3E?lL!m?&BdbAiS5zb7eD?YWIJda6C0yQ|dqh`Q
zi%%@}AazTDqi3E+!Q$_VO;oe{{1oJ-#9bWTeV_YWm>$LTQ|z4{AQ;!u)50va2fJhu
zUd&IR9XTbr=%^&ZtE;2Z+YDWg9FchQ>y-AwMuo?pA;Mh1g3AgplWU&GYf{2lbV9~J
z|7(69kVE;yX#)*Eh&=uQ_hNcC!LIkaqcj+S_TqborI!>s_HzKN<w87MYu2)Rj<j_$
zB{qUQVVEX938VKOZu;~3Vq*r(;i(s1@(5}`FsPQB`RAX2*&lxpd(w~TeLF?jpsqeC
zWe2T-_SI=R#ERs#`r1jk-BpCRbM=0&K(fa<H4csQ>50@L+3V8MIl&cq+NCZ$^*>CN
zd{`6vUCdG=^XjfJ4@w{6ao+!GPp{S0=W@RO)-z*csP)S_P;V`$(oNBQBI&5o9HYl~
z;O*XWC+&;~3sqoG2j`u@Z~ABQ-5b7uAkP&}m^V)zq_vuii@R^{kU`wWLei*XiU_B~
zT9x6yP}o6%{i+n{QY1A^EOM=phC58Oy4yMP)-912PYr!6Sk=KABOXW~vR1@GK-J7e
zj7}}?lhu55;!=)@FN|kdX3nt0RVRK2>7*c*$zf=MJ^ZDQC$2!Vohxks`&q@>AM})t
zGQ0#f*VM%qQZwu9&*Nz9-H7@To6|RCdylLoUq^+L(Zw+y&6pguqaGg$^y9c=e$Qyh
zti-lQ+^HiLXIzR}uOz(IotA}*Oq}g=%NKKtqn2h262RGmql{mjs!(}-P<Vje=yx}C
zJejQam$wkO>xgd<la2Dhj3$x4=hED5_ow4p#YiP`Va+9<;E7*`UIdzwCG=n)@<6<~
z!uP6m=-_#TRydyfi=ZtQ3yXjZ^fb#~0wnK(8KmihkL;e545@#GmkYs?`<-su-RUTM
z(Oo{vaNL<TIbj_-w<fcEdV)O_l>OgZX&qr=xA)F<M~!H3b{`eKvfmF_B>(y>$Th?s
zJ5k+fc;2mPtoJLM+`3+K-oz9~Drl0Z`Kf$7T-eU=IU)1ndIV*m9?qnFTz^ydoVb-K
z6~&__Q$?G@;mWFPH9}`sqAb8(Pu#gvBra6+=p9mrNcu<r=Zsf*qTzK%;F*TaI90i=
zJWE2<Hnr4}CRC87;|bs9`#YT&>d8DY6X%{Ty(3)I>18ijlugh-qP(<b_gMsM%_z(b
z8!IsLQ&P}(Y4EUBbV`)}Ll#bnZ?&1M@yCSVOP&<;QPcsBadt&4^Z%$jKq)!G^fa=P
zUtq8N9?h_}@kXn#3@>Zzsaip|5@Y(&CZqTvRiX|VEO`gOd2QnU^CMyoj}S#$jFAk6
z<w>|LLpM^WhiG?U<Shl`U~u|BFn%$J(Lh1O@#DVorm~a8to2aAj99Uxn2kj)T@&;b
zeh81$r%$dhQI@VKZ4Yy9!X>Bj@8o{cwZDA}Vl*;+K$B3gAGfcD5?HZykRA&OdJc*t
zTBAL-Pch7l(}wSqrkED~T0i28;H?6$s`K4>Xhqe7GM#R|x%MC6ua#E`xSVCzpnf{a
zqV4WKALouKk5oiw&EAWOOzwSgiT^ps6W!zaNR1Qg5bvmVTeGrCW<E~(G%1e=F_xM^
z<hteTjVZ_SACQ|VPKFtfnE%U|{>z;z@jA+ad<0zY^pveALfarTasNvr{+D{}XSKzS
zg6+F@y{P8)@qiq=B*_!o)^Gp6<}W_uIq3#8)2wtWsA7w*O8qZC5cmf6>7@k*25q>l
zQf0o}NBZn4yM=q2y-bxVkBt$V8`S9TCoGBeC{i|#Iz{nT6Fd=*1E-BXvdHnft(t{3
zkT0fdF$w1#Bd~hCqQ%+G?R>0L+oD1vAA?FZ&*KMIl3c24_KKuwCdJCbgD#s3V(34i
zyez{aI&+KTfN`EmlD#cBz1u|R44SY1Yrp|L9L;iIc}*O%X`_}L6xBY+c}{}Q@_3Cs
z=E-qNA^5_Jvi7_9*C%ZS9^q=e#;sX#_xqmivq{ZonN^vmOh^8um6s>VsCG9U^UmSV
zSRJedcxbu+Y_&Gbr(d9HJtj|<u5=%E#0-pr9%aFSvC;i=Lryv6ZU488A#{!kb5(gR
z+GC>ZZZms~<v_EQ9Tc+NFRSWqM<sZybL4IOW1$b1nz_S8t8?WH&;D{XkXeQxqyS6Y
z@p^3s{q;m9uE~sRNwg2QYoP3}JNj_R>g<l39J*BvTZIb}YUE+sRiT;`YHpJq`$&Gg
z{XBYyKhT+VF1Y!on}eZ3`>Wu&mS7O?xrSDGCP~&_m8ZYu1FLPPlg(P7@84kA^WPjf
zH&I@XIW!wL(qeLCVNQu8!~NQ5DT_K$n01lZr=5_e9_3cTI22b-OV@AH5(10LOZ!a$
zDX}er8skjNiql@^DbjFArNaB)XVkm#W3kI_BXD}bz;H<P#P2p&qG2vmLX5y_?QuRr
zt7ARIk^9*8QwDZd>qAs>wJFvKQ%|k(PKtj<>*vf8aaf`mn4G|A-L}}(DL(U>{`34b
z_m%?z)IgAfqV+1%u;32#6Nj5Y*bGkKB`E{7y<n1W%sUdLQb9B(ozNI0RKc|GgfktB
z=k$7+53C3dVnN?mU{)dcCud_Gbwej3{Mn%>Pq}oZpd*ns!7`KRi<zW9{&Y8%9^^{J
zZp&xCGCAjQPA`a=DOO;=1_MLHVQLzkS$^Pm<DoVmPi#GvC)AwzCJUtX%WEH`)$S5U
zyM`6A10y7`6VtIO;4HM=f@mK}$oRV$18f)UGVAm_#l5&$*p77q`ukcmhfHRA@#J>s
z%B!nq=7_gKttzek(v!)MOVbK9A~FC_YRQKokO{$zJoYIXhud2uYFo<ASF<zOCj3>h
zwqjynaQgH=RWx?gJdmP_2)r;%HEq^4ETirB#Uw%&z=LQc`+TzYYd-dcLIWk^ePqUv
z99DY78GIrU7qDXbMOGRxBBw#|ZDAKH(`<mF`fZS4<UL)zZ+48Ye%H8W(3$?Jk+@!e
z8hZcB-y73LD3p1RzbPqKqDs)@(~WfIdh50hkrK4Utfi`Sf<PcnDKw3rAIK0?q8W(z
z@CNy=nH&ZN28_GYyK$g|J&%Ul%$=_Oc7N!X(Qp>=mFOxYjQ~4dGgrkiYnbo9E2ZX2
zsDOJTfLSq+pZ`oCTWl4^iE*L`#yaVtXtLgHx)I%LI4Rl{P7G+DaBAy_Vw3^%1+D=c
z!6xPrQkLML%S(3aR1pqfLwK(!kNY$b6YdVUmp$x!3zls+e4pyJfe$oThNZrN5Mwzr
z2>dcUa4PsCvX_jyP}x5e|7bnX+ESLkHv}7=8+H@jwS<!823mK<@^??x_tqZ$m@=kR
zJlYCf0>`xW;TM5jJUCs|oT$Zf7_-6cC%L!H=3+31b1lb9(zux9txfvLDdq|{PXRf=
z;Ej|bPHWurAV&wGy$%L$cG*7iaJ_&tCSR0X?6BhFOq<l1vK_UKnm$Am!);J14wR|t
zEIub3n;MATyJ#j--uagpNREbUnbN?x+}wye0%;5PV-UIP6xv~-(w#GSjmi*%uR<U>
z>f_8jk|GuORv^_XD)5jm<Ec9$)*ZlC#Mk-v*(~q^Nn<oy?XY-yZenO|0J-YTgifPQ
zhFE;J7>sLoT>w)4&<SVlRx#I6>Dan{mQJPa&YlbD*f|}gzap@28Mb#WMMyoHqQ&@k
zL>t{K(CWi??zLP_&$(Gb)PWogC0z_mANI72IsrhvRgs!(A6p*3VIxtV;>Q{^rDosO
zloetV{ieoM57U!8#gY3)`%cRR{|5{VpG{ifr~Q#6RURx~L>rFX*UfOvsBbgwQePzu
zwk$Y}1sK?nT-}O2p%obf0^x>exPQ9F?42l^QnWob-y9GT=;HqZW)@litPtMZ-Ch_Z
zSU}DL0lN$#7)7B@TYJPY$^AsZ7g3Q6G?+=iwvoJM=}wux%kp~JXDGEWVQ<p#dJ_k+
zo#nQgjUsx{=dtcltTFLvuc;Eb@jbg8BPpiakFIEMcVliH%|}VxCrWfC%=yU<q|>)C
zr!7^mv6WfbDE_G``OG(Hks0690XYmhvLUtll9nRM)aT@wfn_bO8!?D3lR&@Hb)iUM
zG@4Jklh3Q`{Pr`|Ghn8Ng$AbHRi;*Q%=~rq&<}K%1yTS6baQ?!_h4ykYhOeF{&Lpa
z*C^6Wy!n8E!2s8qlipLeSa$Feo%sy=>YnveXAN@>S)#TbESg_)8XfPhSwNj*@v`a(
zZV{6VhC7=gXj^EE92W?QM&aM+gBhb`=7*ztwu^7aM%9m<vEaq^hm;L#F%pkB%@5Pr
zPsTHnB#+lvT5v18M{yXeW9EcaS4vO(G7f?)_UL36LMkCU_9K{$R7TckQ`Qpan5+vw
zsN95@&_LuvuK#p9hqfq|6OQ<Dy4nLP>W&TdE6aoYJl(MfXePt7>E}sgK%g~K(Bt%1
zfdlG$czyE=j9KpjSA!2l67hyBL>w8nj8W3m4-%@>*6S;=CSDstWN`9e)qi)34LO9~
zt#`e3#>8fyjQ8>wrE$BiKT^9n#lv=ec@WZ4{XTgKWeS~RVp$^aqktQV1$}Ni!6UR&
z>6*c&<Yhr|2#rizx)uzKpobdbo1Knb{m7FLKL1cUl%jfFK4-oT-kxCLEqx~e7PhC=
zt$n7_;3tZbV{S-iVxE3pkQ|d2#5!~>cTt>VgpV3!LjvfZD{F(u{P_1+zcw`!%e7$z
zojCAH%iv*e(eIj4o_mcq#as!`T|t%K7U15@Smg<{7EW&%S91eF!sfv$Xbz5UA`{fa
zBN(<7d8js*YZ#jav@c~C*v6z}kNf1t7R6=vkW{C-=5r0G=VJUv>_(p@95~5h1rKNr
zlLE_AN+p{60EVcaM$+)oVZ{(VIZzV&E;Rb<xceCV5Jj9;IoiJ)=r|xm=oeFnf(!Fv
z9!`E`SZ~CTFiUzfK-DWo-DpZ-9I}Wj>WYR56f3}#|FGQbIgD7zpe{aUw6#d$1q?nZ
z0xsBcxG|Bit#X>=6a7C*+m3#=%cV|6tvEZ^Skf@|9MjASRnqqJ^tj$uCj>0Cj3Htf
zDKVC(u6Q#R5*_*r@_s6vOq)e+I&BxAuY+T=`SkHl-KTpGN$^{$sFz-;<5>m&4UiVd
zO$wU4%T}PI7F=aI!~X^b##O|k7*Bh!;X<ub3j9a3T8O2i<?=T+VU(u5S|K5u^t=9(
zvu?2f;B)HTb$QK&6-Fe@5%=7*WNiFl%}PQphP`%C=GpmpJOlc``&XRppvCtKfS8dg
z;qQLrh7DEZHorI1Pr1P%+->kr=WGm10@2ypMPC1CCN|6_i$NPmh<$9CQ6lL64i-I0
z%f}x@`C;2{xw=aDJn&v!JudYvg3Lux_~QN%-L@0ahC@AEufOM`^AQM9m|&H=JOXw*
zL&8jhb=UDBXSaj9CPYuw)^wQh#p;MTTO?Afw1^N4IuiPnLKqWUQ(W%B)7v;Y{;&d*
zHN0ry-~}3~rcWBRhgEUXx102($>&|xxK9w8Z^CFa@zwtZ^LehH$Mhjww6x8VyM~#!
zuyS#U+Kf#qqoj+l)I{VezPmsH-Gl8QQXPOOoJVN&lPh{#2-pn2As2ENM=5waf762L
z9#>=9-3V1NK7IQQq=?tf-!J3%Pz-N%!<tq-ZOcq>J34+=o(WDpJRf6NkB_?*DjSl~
zEP-I3qI)DoujtoO;BLNDQNw8}YOF(ToUvZvdMXI?SFi&bW0;Y>osILU#WJeOlLUi7
zdsT^%aZ`cK&hw7Q&xZu@D^=jut^PHCw9y`tduK>2VykmYXwHv>GIgI7++ErECUarn
zVXx7|Fri!Kd`=W2MEaR%?!tj%-7w2_**mIPcsLN{g{b}`B1d2T)aHY9!Y4|Hk~4?m
z>b%NjcuQ#VRoeFB)U9^PoJ|ejyxO_VLF0sIk^gR=XTN*zza8&89R3R^-i9QEdTENL
zX2mhD{k^=_SVxphRuQ_mBBiyU`IaEV;LvXW(A?`|{%%9x3hBm;2IjkfGHfPWotg>)
zn#~W5RhU@*uJ<CYC1IPy7oIG|tTfTXy~Dns7R&vwzx3@n#9>>$u|ED(ZZk~{Xk%Bk
zt)}rie~TiR35ogh$CJp~qvHZLSUmVo$<|3T_aB6M?WDW%FB0$Ef-HQhHhSN)72Dr4
zcoKt4`-u>$-KS{1wtk{`$xmg7T35X}+rL$NBTtk5QX9pkXiB9nHLJi4Fb7a_T*74G
zS6a_*IH7;vg_tCe!sqX-ulxt-3}8;}gm@!5gC)rwu9EGFCS-K-Fw4z)F3#{>4~1DC
z;;&%%^`ht8xtb;Zf-W+MdZM+e1l1l=%?hQ>v(1wCB;&)qVQ*Y(*8E1jTG^I2)DzF2
z&r9oNG#p#$$|+w<<{C5Qp!D3y+m7>1!>k5tXwFw8hqntJuJce?s%vtvQBd)V*RNfl
zMD~J1`=;7)ua=yUnqYN&cP*zqBwr<KNV!;S7tf{jV>)NsyGZH3a#u1av5hSdq8{4k
zC0QE3`+opAK*qlo4~c=%Gu)P@AnQ<S!nSbr`yoc#%~4E<1CG1eW?b3Dt`NR-d59O;
znK7PT+mr|bRzZ2h4~OWRl3RQzLTJ6yGdKT)#`3MjG5ejh1SJ#A%7yKeX3sQ^oY<(-
zvfOw-oVmTH=Z(JNRtd@VnuQ1hNKm)zO6mnYUpBmS%%7nola>XJkE0fOh`|gO74`BN
zikpW?jr9!+FUOO?t-WQ+^`<{+iZd;HX;)9dW7J18FRa~*tPCVrG}4lu0AG|SnChZ(
zTJ!+7LNJd~G-8*6NcBfWxZKz;EQiMm6oRL$UqOo#W+Z?Q`>v_bVu_5;ybjS@TDnnm
zxIuYS#YH6$meNPN5*l@Yn>z;#enS!|?CC~VjL^WkHtuD4Cm1P{rdOF58*0ZOYI+>G
zKNV(aE)Vw^<GiQwSQ6C-v0EWT#YA}rs9upwM1%%DKX~*+VJ5KFbb)-y{-p4b?NyT(
zP9TJOqMW-M(P1}|_lt&$QO3y;FM3?2x-T!zYT^0+eXq7^pGJuCqqvJW4kjt=ci3k2
z1`t!_p_>m2pK|*`(eZWlup_~qqYtFcXg_XVL~9IZ(+cPLp|m5Ep?n#(3SEP9&HO*P
zFe3vOEt+XffNh-qjj6^;@5plAth4l4|M2gvtU{${JUmKBX=yJmI4eM}Jiq`2&(aPY
zI%EQH5Vk$?AF#69B8t=j1<ZxpIi*N8SrZ<Dacbw94WRI3!VNppO=QbJ9cxAo^8$P^
z6Qjg$=MMpBbc-OLE$vb$XHO0Kq8Ewu4zxiLoA0FPk(KK)&YfSMZM_q*d+Bgp%!c5k
zdE*W8Yw9UWx0~~ep|dvL{(;Fnki}y=jwX3tT$PeH(ZvUL10E$6<!$CjQ;6P8$b^uE
z1maVdCcs4b)7rdhMH=MJ(jw|RQ!@tkG0#T9BZvd`_To8g-8WhLxB81hwwGSA@ptPD
zzV&RPS>0P9J<k+#W0H8<X_?($X^>#rMW7eeYi3bxu4tNFgLwIeyM{r0C}WPhi<t8M
zZBKjM;_V=aUxc>!`RQeiK=RVu_rh8NkB7m;V^GW3xVphmeAn=D$s{jz7H8L<SPOu(
z{FFR#gtcVYi%Fi^Pw?}HLdM5ed)<?z^`_vol&u0nyh2yg{$9JDnC><rA}Vcb%O^!f
zfR;EUEWZdT&H|4NGPZETRueNMenIBvP9woOivZ3BzRR%$M+$mP&RP}jvc;O+^wPvM
z$M7#hA2C8-g@5~!yi~p=<d*R=LmQ4&Jh)cqnn+;-$LdR`&fD{e%G<i>7RYB4&Z$FC
zF(nbv0!veXE5WSio60TtEVS33G>DH+b*pny;AH?{5ovSS#BlkTcMit#fCB?(6U{8w
zU2?O=oW!;!0ezJqtO#3q>eLVf?l+#^GMP(vXjsdlda^;x)2@6nmtnJHota!*L?w$m
z(m@JZF+Lt8<Q_65YS@<5`ah$eO|pD}%mH`TuSoNf&BQJLb6eHbqiy0`qxu|0#}%uN
zx;ZPb`VHoWbRvce0^15F#utBl6WVLcOh$YufPet0`6v<syDi*JyoG<z=GqqGASthK
z;$vM2|6bytV%COtALfFG^KFgdb4fR6%DQIv&e+<31^^Kf&F8UMVwRC}AMKLpEbJPT
zF4vW=czra#oGf2UzKVX1mc7?UjlBzTFhc9=Jf%pQGe&!_1Lf?@rD*3A$JosSg}@@%
zz!r!eg^S3wR~VeB+Q_DV2FUQ6jL)N@LQuYZ;JzYoSH6di{@8K)iG@5Ol7;5SjVBVH
zp1UTv?PW}$IBu{40xh3sK*GD%n;q?|s7|gFf_&n!W>=+BQ{V5FBrlR$DD+6wOr<tT
z$V2`F<ZU)ui6_WG-@#=F)!+S>My;~P2xD;K>e35KdS0r;mfOwI@Cs=032nRqfsHB2
zV0Wpbe^rb3x{Pj_6x}5;;`lvl(EW!6<H*J1IeFu?Ke2dYv#ZW^Fq1@7tctx3#{uII
zsf|n^pKl%NeI-81V_-WB2uS((os#c&w8vkjQ3$C!qar?Vo5799r@AdxWtCR|8L1=T
zBd*P6Vqbm>Dw72|DW6SylZja4^X&lA*?xaFq7J4xg6v^FEHO`5V1i{9+X*-S>ZGCW
z=#9GpKXWP}aDd^xJhnNSXk(P}DhYW9cQR2S!GnunW8!xU+S`u~h_TC(EAf)-Oy(jY
zciv73>u3x$wi;0A7;dv$AANFK;L&%ADmycP0Eg_bCkq8_B{fXRP-bkY!llQ2N(EZ>
z#h@8kda*?uRO8rJupw};?|2VH*z#0GlV9-_O+YEaZOx5kRMYS5KUO%#kl+;EAe2z8
zrKF!cQc216gnWJ+N1*Q3OxzqZVpaYK<Qfd<HnwZV;tmdEIB`Dgem%K?5dW8hY2s_L
zc2?(nGG#X+I@Q46wtfi_w-$}}SXPB5`Lf8)fy8TukFe2b{0nOE+;>w2FFUh3%7Q&6
ziF{4wKk7IB%yZ_+K8L&h2{hZtVO&ptEkl+zX2MymzHtPI?^)Yz>468Jy(j|gHqa25
zpq$YHRQ1x-h7BFJwUKD_joSj6{kUzw(`Tqeg&Or<2^rG|c6_;bP+iMAv{dQID7xuJ
zQgKq4?st_?t2VJIt}9v>j$$C-M)J(8UBhb&{<t~yHX?pSq}_d^wC*0vOHJw@oOQ>D
z<Hi(N(F$IkK>rdY4{;T-$2`y@-o?~JNVcnX@%}%@c;#5AarOacEmLS9G7$@(d(8u)
zT~>iwKDQ{+`sk&?(7q@TBW^^yl!iE)lo9oDi0Q$h&B(<p#*^wq9a@Y5BsKaX83$4B
zKoRl_vk(G20RTjAk_qQJF8%j)$%rfCcpa~`k@d4prIo@YUhr?&-r!1;D_;8mP;+jD
zHtX+~Dke0P%lHX6Ko>s)MIi69nyIA$T=9VyqwKe}2}}ifiGtj57{1L&@!=Z;;U=h2
zwF2G=`?*usYO(4JRrWNSKvtroxqK2ed66!%3GWRl-DJK4qxv>;CW-U;8NO=cz=iV`
zR|HO_W&;$Kb%C9uw${@XsI`GHP>_K%wuJt5=AnkzbM><3mo-s!^U`CD6iP;AcBM8`
z7!Fp*1(L^yoB&sxIJ|8@_G8f}1+{S59Ytv=&0O>!e|fr~nK{9|2FfuHVE8Z^8AfTG
z!snGUv=M=KL?<$XO&^d0Q+d$5t)$}|?dWptRpa`wij5u({PUrJ7u=Cutg$YvdPm6?
zwG2PIlb})T!uMx3oPmPsb_Uu;um*%&4yOD6enxj)O61*BUcS2mqDlzV@MKZM!Y->h
zWeCc4Y~3#m-R$$a5_|!3V+L~YLyK>n?E?HBpPek*J-YF+h9O$jf1ATCbk{Uaf|!UZ
z_!VdvIgLnS|AT0#<d~{Z#8bFJ95=aPFuh|Np}d5?l#MoAg3tWY(>KfZOPr7U>x2r9
zU<5-Wde8o;T4N-mf`{9(B7<+=lVxl)2+_nK4Y=|qi`dz6nRt4mDsO7UE?`T}@V=3v
z9rjaEy9S3bGk4J6FjfqOi`}(E09o3cdMGL#VE7<*!n;sVYYv#ObkHb&JF~Mxhi$<1
z#2VQw%(y8Du3nPO3A(98T1=tZ4o=AmShS1{PooVw*wzXyr7F@`oGa6v!JE;%s@-R>
zX^`}pUtqUHqSH3P6Y~zs#Adbb_JN#K;{7`k=Wx`r>LyoXmxMe*;3nfSKeh^itm`#e
zwQvoq`(=@RmNkn$`*DDd`BBTq0RfxoLLLc6eMeL!jjW^GcuNP&t}TrQ0~(y7y$?<j
ztuF{j@cMZ-c9KY186c)=A7yi(Sr4^w8Zc>5UPa`3o;$Jgvrzokw^J*8==2O^T$ZGz
zTXcFcWJ820F7eKZXV5*agpjd{TRePY4i$<j;IM?TybF0o%tfxZ;XW_1i?e02Ojvtj
z0q)qDpIb>gJmv5#`ouFCBEBhd>=e2FR));I&Eo>p@<WXNlwmh}g~)#8U<5bV1{}R_
z4zWZUk+6Z95P8iZBO3Vo`Uy;+HeX{`zQc|=b1H}^gG)mT>G%r8GJZ)}>O;e8!D&fl
z)6jEHh-(D@y^)>0#Xzg(A4{)Ts=)mDQ9l@B7&=%shGwQ^fL_a`A^E!uIhIFj1AT6Z
z?=5@cw5n(N?}Ciipv~SP?kWYU7MQk+T-T-ZZCY$+&#W@~F}^VfrBGPm$~q0S3IL3F
zF}plY-z{nH5`~_b1tlgJ5~c`v{qieB86+fLxs10ltJJ?_cA~@^^`Oq0?MMGx@#W!2
zaY*Opj)vgY61jky+%Mh~PZYxd-INuNlPgJ3jG~Gn;`a-XGXg|ZlB_vDZ*c}U57)vu
z=XxkJGU5x1)MaKSjf3uKaE|IMRCP*IfhoIFIIy~)@rxzE=fJaBa%G|dyIC5+UPz2c
z;SII2Ssj&YMpj53?=46P3jIu^*2SNs!u$4;B$TlEBjK<EUm~aG#Fv|)FGo&_S^2?C
zF=?+m@xm8IfJ1x%Y=&dkeq5wz9Ytwq*C{++@#A1+lJkwR-H1tfuyOZ7DPN<PzPTZC
zb7Ksjk6cAAwN&kkW-C?YRcPxMf(Ny_DijokxH5m4)fI0DI-&a4Bw8Kbe;G6Pkhq6K
z-%)pD_PDQd|A<FqUw&7(ct)K5G+kyy9CU(nd}h0t@``m>hCS~DLV1b5e>6PZ9yv_W
z%Yx*CuN_%+glpzzV;^!RIy~lJM(MKu@F00E-+t1q7|P8E^5*vWsRP3EjjMgw8+g0M
z;MXA)$dABcA>WW6pzocaumIX+FrzwtsvzJEg_$rP9Z<|me`s1F(}#`X5zY<8Xmp&K
z0J#)MrEiQSni$!c!KddPxWnK!cUbv*Tyo=do-vS6c37AE)Ug|g>wY~GFkS5OFdBO5
z59~ed0-c1-1n$<1+$Esst*(%so%DBQ1z<hm5ib*!KmH}lVUhN)%_CO10;4AN#-DN@
zWp{<r&OGV=k*KX@3JIc4Lx|gY1VnqBBK*fo@nTy=mW&RXm6R!_Key8zvzp_}#`#vL
z&Hr-`=k74?h3We)4**_JBbt+^q0`{s@r?VeFta0@OVMv-#pddAmL}W36(YYZ=wWEy
z=%(+g0@<=iSGB}*Ndw$iFPOG_!&ut?8enD58Ii`PRF_Ad=g8q|0-kX+&8OK|KqFIE
z4X=L8DVAghj}se8S$=`S&ciRshrU<5KF^Uui|5r`Bh{7lX3xH^4Q?k~!HEo<E>-IW
zk*B1w-(F;TO#0ZrL4%LGe|it}A$(18YnEZM#{m8=&@bF@F1_8DF$V{N&XFwz!_RV7
zB;~<57!YYYCCDWBbE13It^+<e{-Y-2(z>)p<(^xQ*}%-O$+9Ci30505%x(=DHkJ`W
z{CmNWXt*T>)fsDVFm?c1+ikm)KMu&FBpPT!ASzTRl%c-7L<o%6Xg6k_y6)axuHD&@
zKT$ms%lHpChz4ZV1Mq(lVMoy5Se!kaLg~i^??|)Zpx-F?MtN;(xg&8^YRZ>{BS)^P
zoNWBQtO`&1G;xUMFY7DQC%Tj>4;EAnkN}=(n}PrgICeL$MCl@H;R>=xKAomn{}0zv
z!j+EoQFrJGz^u$@=5SlV;4xqIWO8{ZQc&O!M*KvMax{>3B|(}8(k<p;{V~6J!npo?
zoq;JeY(aw;1OrX;ehYWX;f(74{>t%_e1m{J+cs;m;KIrQG3!h8_00I1@xuzVS=tyw
zTP0w<0?dg<x~|S9(pchvh{R71DZ!How^65+U((>nxD)FBekA(&t|sL$>k;g_;_t4q
zBv@(RSppsgD3d-G)d-%#LnFp}o{Hh06hKaF0Wu_)-yajR!Jm_!^m^>Knz&76nR_Z7
zRx}tSRd*PxBAvb%#sLdMF|w&<@<Co;&^Vh8N>?_oON`C!3%QagkNfw`NIuwIOtSEl
zOy>nC&fdF0IIrRGd|Be8ZkkxXp+X=H{TMaXft~`bak|-T)d~ucl_rlio<R^w=m>?U
zzbvaco4&c81j5=Mm~ECJD^oieGz5p=Wui{HPQOg^Cz8pEuio_((jhl?c2(z&7lq4m
zH^5Dp5Bk}7cg>!2HwL}1)<{gn^VP%Y?$p%wGW;s;W|gsa(53Fi8tN+Za@p5$SUPd5
z)flsT-X3zrKE&wxav_&^5r6YVPsaU1=^*XeV+${(PXWYP65{2Ups_7RU{AwqKBp4N
zW`bCIHbVsYq3=fGeTQ_30tT!|skuFTO5nXL0{XU<ZOZ%!3EQ{Q@N6xaR`vUJWln1p
z)gz#HrY?EsfG_K(deA!O5}f1}HVPH&j3TVdT}5#||4{!U&0X+#0*}F>L@On}r_+Ak
zP$s*=I)--HA4d|8`33{y5#-@cYW`phN6y+AhPEGIQ+)7sL{GiHwGG$JKTSxl660_9
zdVtJze{Mbx`_bT<nf+t9G4isx$!aLpMYGbb3!dQko;Vf59P(TeR_g_L+XgZ)#9nTw
z<_52hP&XoSWE8c)g4ca1h8j|f)>JlXRhR*PJsxP44fdk{NpkQ#ai-Zp#(5!FN0UwE
zejqXk4z}HEj=b*^UFy89{mbjY`Z<iauz*sGsDjVyfhB3N7y(g#B<H$qFYqm{3~_}A
zzyS$DW?5iy<F&LPe_os^uj<bBQrBBOYs#G#A_yYIvFI5UIf!p?4G{aE9Psu%*42Ot
zN#c!{2pF7VN;$fHoey?uA^exq1{$D%!X5*M_)1~qy=7r%Zzj}4chqT8;jMP)ICS{;
zPdg_k0V)bUvEggZoa>BFlB1Jln2BRh>E;kn*D_7Yy;G!u{tNtsb{3wKhaH2`w?J%k
zFiJ)O%dTR(u3({Ts$Kl_UGKt*OLVqp(6WXs<9on^{Jnop(TpmFhTNfif94no77-T`
z%VYFVUlHZ15W|!VaFdwhr`M!nXb)b^)ghB@w+l?f^mQ_rY$HY24UDaBFUp$~z^}v;
z0S#s2V+uljtbb=^Vx!b3kPdKI^UFK>p=AzPJsrcplW&+6ZC6krkr0~%4sLe*68&8K
zBU?dd#Zp|%v1_DB$?Ej8u@rlYVO-NWl01@qLVUu6f%~Hmj+0F@tYW*2JGXhl&LqZV
zLJ=<k2v=fPzmK>Hl1y=4lQb0Igq&1I?J+Nmk@lK%k@FCka@0ZIC=oxX*3bZpm~FZ<
z7m?YzwV?8}5W7JlvL)?inWSGmhHwvADe9kLF<>8Obo^eq?K0m}3#{GF+OU?MXGX*w
zUDZh7Pubb6)u$gMA06TLbs%_m`=KjDP868DN&!$s8>tb`nTly|R{}~4L5;)0?V7o+
zkn6&3)$1VNBr*B}awvg9KKSQUZnC=m+mhTcV5AJFA*ww1TL-Z=ZjH9`o5O;A#(bf+
zWf$<F3flE+)HK|E?-c7r_u-SD7Esx|61@M`vmdvZ9T|hiq&?Ul@7k2$0SAY>kv$@U
zr}jv1ly>QXV`klrY`-F;kxtx5l8E4YOkeH`Y6j~^iRzRQP?XvSg+Un^sl57A^h@$<
zH{*H^k>KqvZ3ZVQegBWGgTn|YUAGfd3K@i6nn-EO8`8MdlEtR^VbkF7q!yV}$&h5R
zEXV|X3l4y9fkC6~GDBsNwG+G9>fUJ&kViX<1US)M@Zi15mJ}r=&goIYL?9_EkwB+M
zv$vVxHmBli(%~fAXCj^1&*jn|gmOd!sVNA_9JR!=3cxcuSIXbvfiBHu$ZpBXWeu$;
z)~7&|6kqCDTafw{mzNj2Z=h(87ytR3O@<SF@J5{8s4vKS(NfXb*>f|o;k}Deo*~-q
zWOiAL<#v2I8p2KXKUblfu6SRO=YO-(45Y}>%DC4U+*GAVP0)qPtFQF^FIDDOAep*i
z#K_V?Zw{-Ub|~Aftd^VP*hASJeSdnK5t#6P#V7D`YN=4|IYHW-+^nXFXN*Ps9~>_a
zN4>XH-&$v@n?q3e`K`fm!J;RX;5*~GYl6I!n}*=wO`m!>EB!@EXr-kCvOgQ~2dx{j
zOelb`05O_k!nH^P-7P*^lnUelO%xYNRJY6hUm&@ug6dWxjuH0aG^-4hh6E&4b7P;(
zitZhr@65)+Kz^iHU$lmr&V!-*o`pDc0Bvs@Ll!b_vYw1PjJ)>oDP4Qzq_Yjz8MGeg
zCxd$O4x_drgl%7HM&1TACWP@MJ~fB!o-3T4YzC_B3lp|2T)p@o#;Y#``Q;OYw(0u}
zi(bXS%b+v*&!^o^7Ki<QX^%~jYM1!|?LOsA->0vo*BMYt@URpQI@l4e$3qPJKf^P7
zQa!YHY?VeOcXw~g&)=~`Qd&7f+IXDJi}<_enP0j|_?XALh+W*w4fI<Ikk~mthKgD6
zEJSQPnr?KuKTB!($1WNdtZziOHsFsXeM%`J1N75T+IkW004lWYsSf$amARH_UFHYL
z$G3s&`t@&~fq~bbQGG?R->|aW<CqX0w3Y}n>9iFkK4R=&RI4?4=XJjS`n``ei$%}4
z15Mn7FWU6Q=jQyelGzbRKio)`6WTXC3++cdSE0eGgz2zmldr!Nd!(s(;Yi`@fQP5g
zdCVSjiZD1;OUXuWJwUs-nFwq>8B2Y@Wo}J>R7R2#P4+`QNTyc#>N8jY)hODkZd5rI
zwDnf89%972_W%E43@9Kh{+tASjqW8*QxOP5>+Xgi$c)*01i84U{kK1Egm-;-n|+{G
z8qKyOp?FDC%*I0~iF#4@GQSsmq%AfO2CVqiDm)?dvW|QBR4gWAvl|=Gbj0~g_iVb+
zT_vD!#F01x#ge;4#Tew{u+?5u?T*v#<juA3^(;%aq@2t-*~A^x84)tZj5%%?(bMfJ
zHU674+@`Z(vG;MNx8Duh(#Uc-(B>(j6Zqk!Pfmn7Z36HPVYK%CXz0mSBRocVTsCp?
z7^&i>9nwH0mH;GT(gyD;6Lw}OeHrXc2KDWG$ntG*1N&iw_23tzZW`J^hd7{<k(7j-
z!m5hCc?}VVw)wk_*><ft=0`gCQR#A_w0fKnq}JS*;vCFIa3nt?w2hsXk8$!!`#sBw
z7intlH9F83^*@{jJQvo`43{_NZ_YV7B~Jy$o-alWF2bkUt<kXaZ7Z=v@UPDJMAj&?
zTMs=NW7c=0A4PohSoe;kgPuU|h;O7?lv3daZ?YI;$K}HY@BSWh<ize79AJ727Ku#_
z_{z|BkU1KO2DdLw^vpNvWvDVfn8ON8bM;Y?Z%@W;8Edh5#eSkjTy7d5YM~IhwGway
z!l+mx8RjVxzG7Bu&{90KRp1#<cTByrzzWg*`ggZLU*ze1vCrSJHin5A2ig$%*}`M{
z(f_LtFjCCn_w~8XD|@|R4oato2a6SbsPo2t8+m-X(U6zOiSP(N4r&{vsi;^)B3H-L
zbQfHuH?{T;ASHUioEGqT!kqbo#FjF!rJ35CUD<*BT1~@*xmo@B5Xcnj@uwqIUxlv+
zY~7pkr$uvQAZc_bJ3E*wF8zxtinx@%l9#^38eKn=H&KMde1)vX1%P$vWXWN0aP9%Y
z`ad^0;cj|B{|K`$3)<J}y`h5{I{;eyJ?bTNXii`pFOfs2nh{}P0*;)nT2Lf4?q_ZE
zt#8wsoaU7dx9wn&*FQ7_&N<JprOEcRGq5m2InWEG&J5eM4fzWTy#J=wZ=i{=ya^^b
zp?z;p$U03TBTMDlw(9KCeE!D+m`6hn1-HtqOQpN-(+e^=v;sKH=yk1#zOg8`+*OIK
z3qE!MBjSD$l^kF?&^+1LcBEd^U{Y0|18!}OSWrmsK(j1mY1T4-o^1d+K*znnW2A!n
z4z+5b+s})=UIKbeEL<9fq!Yj~!wDRl$tPBUeT)XT^GA!(8QMrfj}mvliT?>qtt<(%
zbNQDt@)o=z<nCA|zeg+!Zv)D<j(0h|TSy@SAT=Di%~6#`rkE|V4DN-<UrF#-4IYTT
z152*?$s}nre%L`PBrWo}g=S1pquze#SA%(0a=j)Eb}r;SXi+_14##BMfM?j25JSW;
z+s^nYc+NBXhlmwvbC9yX+-Hks+eiJI8e5zQFg}{qt5c*O`m)qPwN4<u@TfAp5G~F6
zzCiR=s%+`DBeM#OcTpY9z$D$94@;LAZIGpcV9@HbDvGk#8&E;o!t=4wvAPGxaS}$3
z@TbtXo#7IYDnRg?(L!7U{`-D34T3%`rb+srRhi`Qp543U-Ps^V9JKdabw;-lX8*J-
z6#_EY!6($aN5!1;vUa<PKcPXZax)>r#QD?uHgwsNL^zj*YLKgI6>(3`c3F|-RX33?
zS-JW*>;V{xzbVJVjd34CSv&Z_8pIC?m^<qA9ys;()R%pC(|-1H@G2kZdA&zbf)2@d
zZN2f7fAdoj3`gt`4Ji$XTr31jQ*pZf0a}fS@yinEo~Ac%9Ph)s-C}Ks<4Y<5t#5#3
zf@k!qpEih#MqRiJ-;m03F|V~Y2X4wR6y8&5FA;#4x2$*SmR=J!X^HFpgw=`C>STD$
z6}kI&O?!k)gl*pBzD)R%;^zuky!{9&)Ci-7OP~rNZkH0mp--jlQDagj+0iRSa2FWL
z2bK&j{YuI}ezDNvZ7e&&Ax(Txx0^?Y6+M`Gj!O!A{O^?~8|p$C^P&FPNk;xk8n$pJ
z<Yu-YOT{2e{eQKljemOgocXrY(rNw<!?UO*mXB!Mq9|NrjrCiT?Pe$Qx%L(}_?(b>
zct)Gto!SYdEkJD4(A%g8Y{4|{>MF;k_9x=h`(PUM#e%Dek}kRrwkb%_jE+-h7?gW_
zRegTsK<O|}Pn{OlvUYqOhgIN*?v>hQAp!2s_P9q4!-zyav|oqn-?`G%y^zmL|I{6}
zjR2aK8GfjsE9j5cQZRrjWP7-QoQ1PH(&w7RltH>78tdAf4;LjtK$9)&B0>(J4!>s`
z`V>-IV5PhNxPmgDXGVgb#<zEmkk?o<b>}S)8`n>DP@~9Om+3_?@In9rVWjLmgd2-M
zLD%sgmhXF_x3vtBX@Lcw8=wm^32bQYpq$~c%8h>lmiww|KDBP~oR$^T46aP<kh}i)
z-`D1x3;IJsNVV@B1h%eID9+aU>*Rk46#NG)`sf?r;ScJyc4tw$@KR|ZZ^0EzQTFT!
zpF71j`AGBb{@*Kvs_)H<OC)TJ5ZW@K7vHeySpkfxEXsIQ`r&X(dgJ{o0Plabr9_Gu
zeIT%GnBaHgRWV64z8F>hEzb^v(CK^+#r;H5X-lXfx*DSF6Vn0Eqw-CzUyl)IURZ#M
z_3ok#7IRh%Z06k$QnqZa*G}^rmaQRKq_IYZ(ks_9goKD#r=YMR*jr@X&WnSW0QzVs
z6#3^82#JJmo5!8g3Kv9TVeGuS9gX96`T^E`{W<7{<)fNE#Jn5FZe&e}K~R(yDWr;N
zZT*}F{}4Cj4p8%k`qTZuW2~<>5T05*ANH9ZulU&8cOp6!XQBIU)?UJZ)YLYg=Mt-L
z!T^lienle_oxm{pLz{HbS;^AM<Msd&Cixk0;eHkpSg)K=J^p3H-7xd+A+br_lv_Cf
zot@_QT}@7x|01)c17PUUUf4&_w4tT#A6g%tLn|D!6vWxT^8Cg{yTm+*=PE(d?zTzd
z^lc?6;aI=fva7-Mpktr@cL~~54!GQNYC0e@7JA<X^r;K*vPr`5&pDn(0a=0#bp4rg
z^&xhk_9qQuTk{?{2<A{)9utDIKB}$OdVDd^ATN$0u9RpU&QyKv@XR|zhH;VFKS!Bl
zB*fnBeUyaLL!I$0j!<NX&7wSK*<AW)4;GB2z7kkBIVFLI$ju3p{xv4h-wZ<YV4$D%
z&}?JTt-Hj{-IXm9YX1y2*;JNu2NyKJ>L4w6I7B^&2=SveF&dJEFSS_?e!9HFb^<5?
zt<NoQU)i&)_07w)tLGvYNtg=R&mZVTMSr%)8^a0-dRO-XPn9ZK?z?3yUTRn0r<0J;
ztkii3D;*o7Y(mwE&5?h-<P#)H1lgN=O>QzDmuPP*bfd#p0j(ktHaWu>D&zwz`i|R@
zA-p;GTk?A_3GO@Gy$rB)46An7_GQiOyIsZtF|c0kI@FRaXXMqDYTj(xwr3xz)m+UN
zshr)^1Z5*6C~a(+S~5US3_Ef3yG873pIvuiI1HxPARjL#@k<=2A6|QD9dsD}N~qsi
zU&Us?MNv)Sio57n5jYNqC1}_l-Wc`a<ErnS5MFitc(;6K%@S&+y_@Ue9KVVx5W_Gn
zuy8BQO!1ku@FWPb?_ea<bSyYz2$XOK=|Y;r>wmYvCTd+s3$8+ll+)8Q!eQ$;$+TYc
z)m~*3M?l4Z);VXj-3B9ebHVtKBmDU=+_aIo2Q?1B;Rzz@DqWus%D|4c16GnewMiia
z2?Z?Hcj@Y%Uu<7abQORp@(6ucUBP9T!B?|RTG>%n6_E=zZen`dgc^-_#`9~HaE%FS
z<tqp!rW1kWX14Am7t0=FFymz3_e}_mMgOh8XfgL>joY{=2(vlA&t-QR>!|Z|5xLR7
z<Dc;$U)m4ipKFqTr@F}y?`H@iOD@CtUB&uUR_=A6v{3>4MSJ+)GUomv1lGA3MhvOB
z&h<8C6w4<~GSi@>iEixCeE|LTr*hDm+gaB9fzWW=Tn@&dZz&*7`(Vy&maEsOx8Gwm
z*u2cuxx5VzOf8<=eL{Hf69Ro?id(X+A7$~7aO?iw2(1TEwv10{g6HS^k(QQ_X*V2|
ztKPvf{2xab-)3gAK5j<$a~F<!xZe|uH-EN%?>3F5qw$=Jc=@K`)7>|-G!6-~e9=+k
z*!t(RCSo69k`z*N8|t^)hW|r(K}T%7#15o!f!!M~9cp4%X#kb`!5*dG0kzlXX#KH(
z+S<<)i{t-#I9LC}mIM-zOwx>(z%H=0dzl@81IwV3Eyx-JHo~Rjg~zlVx4k<=_`#sq
zBe04>7VRr8+Iz6TiF-tB>Hv&e$$pRpG{Jl(TvD;+5awQW>islYh5n>j0&LjB!CGBw
zNo00bKs)Y2CgVG3Q9eN^^)w-yGuiS5kp_%4NSjsnff{<moY*I^eqOYXL8}r58ba0#
zaq(AXX})zpGd56f^;*M`9QEuth#1TNS{MXnhL7PEc>ztlD2*eObz8*bZsKoDG~OYO
zH~JkNs5r0j6nXmcpxGGP20lLA>DMpRqz|CB!WR>PRuUBL#ZcKup(g~;Ax=+xnB}m9
zT7E|XAXrBrJur_J+46xAd?Fq%ls~NOjz!#jqP+HKTVkVdBdASYfapo<z(5d;yiVP7
z-k9~UF5+L=o?4UX0-a^`%#9x7Yjvv?baz$GFNP^L9^Fx(`}PEA#KN>!g&C$I2b)ny
z7YLpfCLpUg(cI)65jAKPBLoP*-V1NV&xe?9q$AG;W6&l>>JL~>u#j#Iovort`5jsJ
zI3EbO%kG+D`iwX;@mT9qt1+kpo5^%q*DBMLYWmVmURYY7Hqdo-hvnctIdB$oP7bSo
zpuSD_VsCEZmt69mI{LvzZt~PB@w5zu%b!Wt8U^YC9`g!dz)7P-PML3OEYqfkpIx6w
zH_}@p4{7+6!u5&-t~*COMrX0HL@NhL*A=`d4gkOA*AGq?g~1HO?@3cXBBNznA=ah=
zd1K!#7sg@Lq!dOTOALU}qiusF@A9l*@>$hgEAha=k9nNgJapo%u>+D*lgbwT%I*3W
zkI~nvJ|~4)Y@t)mp|<rnY?w!c!!Ji`%U@A0sI_`2_-hcq0+a96!J0h<Zo4R~HYV*}
z$a!;#QMeDU^BJ5rEHi)nao=_nikLWY8o?`i@==uJ)2^5=_92^tQ#uud$<RKW6;3x(
zlppifA`Uu}@(MlzGTjlRl^(=XHiU|FD$ZIk<gKTlCy0F8yw<^|_2k=V0*&ZCKf)RG
zqRBDK6qr9$;E!(oFtB>Y`@0z!*V4EJ0-0b<<tTyCp{|)IYcn$Ca<AC*u8d<(vdgOO
zAD*M9F)Dx66?p#!Bb?Pbcj%kQAST1Jka^t>>&hcB#(LguwPu+%xLi%}n~Ku$c9T!@
zUe9}$rBZzPu)~*=YoDy2;W2OGEj`QjVF%e$vW{Vo>rRJnaSFxpW^A>+$^;%|5txLc
zQLpdq${Gq;Gu=%u(r6-gTb>UuGKLs2fX2}^<l<7&M{lti{FfP@a%!Jx@2k)bJ!T2_
zu5GVo9jeCc3=rTx2EDZfy<*76L$_#{M0`ekz*+g#3<m1!UMLtA{+%vrDN?J(5%b>n
zNP(Z&-U_TH)PPlRl#B!9X9tNg>(Igk)2%eXWAM{>{5{^7a4#v0tGy%ylHv9`Cf~Td
zn>)2%aYx-{kI2`Vhzjrvvn18o-^|1|sD|Yk3B!vT)|>L1eEMl)s3DKJ^&K&EtQAnr
z5*Jh&DTAty@MQ8}_1xv9=OLcDwoXy)d0GuBoYDV%u(m9YZhLeJ%15jXOE~ydRBk)V
zNj&K*t@j*0m)MR-od11&@<BSHo6U=GJ-Tb(3Rm1c`FL4_0UO&tK~aKlyl}+*>8qm!
zUc2@TK2-Kt7WW^OCebHXGjDWixXhtRt_#wD<0oQ<8I1Z$B^X0})b;~%op)XRuE0ZD
z3uu;;|3UhD8*8s~!Q>x~hGA*_!I~wLb4+k;oT{Zj>_3qEWJjYRkMiyxfgl{w@X6;&
z+VMz`2+yA24juK*fJRyszFYP|JX%)wYp?IU)`vXJFG>1pt0AgaOQ9DFCgO5G1xqhA
zslTfMsamZOzg8IMZ<r+=&ji1!(_$zskFjA@Kz!UX2Fk}_MT;3>GLu@%ON?-|oBdX(
zdOT~WKoMcUrR;qsz4t1QaYt9O<tbk2NbD6}?THsXm_9GI{Qr5s;emcz)+!!WR6k6*
zO*na<IET?CMfk!QHJt?^L->#l2j4`W*gZ`xSa1a<lP#v3_|Ui$3EMceYFFE(rI#at
z)(#<|t%e&Z(jP=Qv+8aiJar~tX(ww-rCg37SE`30Ael^HLNbHBxbE5DA-JrYX+TBH
z+?TALw$akjXntrUK9mhe1GwxpC@D;nB!RmBy0?ZE`RGXj!a8taEade<sr)G;<1Q!7
z^n_*ir1_AB^{Y`M70ROWHmpPBR2CApHs}XY_D4qQ6@q!}*9t$Dca<33&Z`;djyI$M
zuf{GEj06kitGJh<#&GZHJV@K`Wfo<X0)@;=-Uus8!e4@uU$fXUmI}mc%()YJOKuX`
zO=W&kcBF)3AE;qYW_H#Qb^;YBnNshTR~!?mz?YJzMRg;sFtNV6cp*o*wU`qiv~l-5
zp4Uc;ue-e}?4)IAV$?u)M>5=01#+|;nOi{%V`>?+Yhw3lq7eu>R`}{F&0Lp;^dsfO
z-Axbi?RX1D_rl}lLUu|93chT`!&oX#svDl2iK}ZgdI7s2`j%nV1MUz<ra9zNr~_)b
zKSQ*hQ^VBHJu&k^VcX^;v^>>UTKORLVrEb`zt%7T3*8FTL|pI5n|~%TYmE5shJ;wJ
z5=$WAtF$}rl8ty<)I%f7Z?+x!dFP3_5yyYA<8z7~$`Mi<skKZbrY;hk>BTM<#!}?1
z5@3AaF&0@(XMYYCEjWsC>iP0HWZLpe`Z1LcYUdrmVSJP+Mnj?N1CaGGX~>l;MV~99
zlE5GFoQ?;OTH;+X{MWbibi1@}_K;~%5Iem{?N#&)+D~cN?c6wFIYO^hVb=NbRIbSi
zet<5!@N;t{_>ZyvH@Zgd|D*nmQJCPFsvhhVAz#?f;`AZ^ItpOuh7+;jUkJhN)o~R9
zVY03D3m883aRODFQnOnPVFE8>-RhY|^t<Sm&MWc0o%b-@bHmwMT86G{u024Y#J4G{
zJpQKB8Ot3R<|QRuo<5`MWt0>{E!22!#<rK2f_7f?$V$W6F5z&PyZV$jEW4e5fjDfn
zL<vGO&O2l2Qa>21N}mNiMT=5w#!lgWk0tk^_4j^cw^QmV#4`FJPO}rZJkTbcE`g$;
zG6%S|$=}tX2m^0$-QtHCp%_BVT}QhWKF+Xwzj8pK(Tqyd`Mx){$F9#PE#E*<`_Pzs
zaiND8Ocw5KhvvaE)0G)~M>!dmjqP5=yM~g)1uY%2>)lLo+zRxsi;PE7i$&C;X4unb
z$3U{E(IBt2VEV-e#&&SNl`t4k4cl7Brnkcr+tpCDGf^~>C99Bclbt_es|h+79T)?|
z3&RHgF&&>=s~IPkjZLx}btq=3XjPBMJ=2&~lH-My6~fmM(h}eP+IR3B9a*@G&A*dP
zYYlbLa*6wAMT)n~**Uj*ZT1<slQT<`T<n_J1N8@SHBJURWd02W)!hA@YkFxg+a%Kz
z(PhV7b8cXzA@(8N@vU1^PlTjkRmhuog2*WuL4NJ0bG5LQ?g={yRMy{{uFj!yBHz1d
zd(-TY>D5D=^5SNPC&WA$nOA!u5q9sf_`V2Ino0i3P|KkfrX9*;S3BbzUv?;&qF|>c
zxP@(PgSbr>O&oj2=sq=diU8ynw-$L4R)x@6vO9?FxRKiJkelrTs?nBLXEHnp*^tj}
z^pFx(<yE_L;zm7q&te2C0SJp~TIA03Sfqf%0!S|mXBu~K9Z|H~S6vtIh6h8p0=Ix!
zhnl#m_TK<H6F>>BzUVQGZjUJ~qPrPAD^Cw=&M8^Asw7Lscd#>weDNBeJ8f)CSK+-}
zMlC{lNOV<B>2@fZ@-o=8ht0!!OM}3jVei@vpYz)d5zat^?yt--rM)$AW6sG%75VX;
z8<O6@-@NLf=2$WE&3j(9G|c7-K5=cx$lkAi^5}IUjgfDPkr67~^e6|&Dy$1;W(a@q
zhmjcc@94MB5(I5G1YZ`eKqw22G1mn>A1kPlZSdhwS(4j^+fw0s6y!eRvRk#n&F+O+
zIdYso5!gJ!<L{m!9tbs)aP}erkDK+Hlw|^Dks6PR@W;_8%OoN<h$?FZ=bh&96EpKW
zm2R2=F<!;{=Igj70yXl+X!2fG>DcRaN%~VY=&wJ04w02X`v4QoYQoqDVOiZ?0J6ty
z1F;>EB(@);Hr3ml!D?Ww%c{3ifrbi8uTAr73Y(6xWQ2NJu-AeKPNrgNOmww`8NDQW
zfX$nmCbV`Sl!ukvMi6)V#H1%1Eb*~=P&YUXX8PGOhJd#s%I4^y=Z(}IHbCqr*TOcQ
zLKgJz<?$!5Z}93W;JHeMoalHO>%hbYjbAcG$3;FmVTf48VO(*<-mVSN;rYNDz-NYZ
z^VVj`1OlGDPj6(j&Jy^O>YW53_`<kuEdI67@Z~mcCV;RIgc%qt2)-L#8#^!%ZdW0D
zH(hwwGRrDI3ZRMv3;6mTK(FW_u%OX}pGwDt;gx6NrzCT&l=16b)5<_3jyQiQ=2V}A
zymevP?$WIuJZ4Mp;h*j}Gi|D$nud$FzUHYazV&{$v#mYBlU?9hBDdxSP3@UmR$(B2
z|I`m`#0D6l&AP)83^sUucw@-x{l&k@C^(I_<dGzHzK(rNX2PE0r>Gu>!D*vYTFSBK
z`XHD}Kdo@@p(JJPtzdJhu1OKbK3S|nJ-Q~SL5Mvy1J`|8-bsKxX(b(IlH>Z<cQF|j
z-3wXbU66D><0*31n!BJgQ3CIzx*KnOr&01aPR;7oSUU2R=e9kW(tPJl=DuBq#GN0I
zb%OoH`s6Ls<e%=-{hvhNy>C?`gTtDV&cGfn6Cmn2NP|&T>$j@nzL0mT6QGNolGp!;
z1>=A>PwOSeXh$P|Z%O8;f;~qID$`QES3BR3RstW<LdS)hdH6KjZzd#r8Bjha%TSv<
zYd3SO)UO$`QLL1IjWw*D{Sis#0+J(Lkm(zfT(kY1znD8*9gf~!Iv2K^JNNlHWKL@l
z8M?wzLP|c&u7Y<kpI(ipMl;>vhmkW!>F|?+p1abq;!<=e9#$M3-KC>0TFQd^$K8@F
z(Okxi{q8?<y?p4aPAe;CZpdWC9@PJMC<A|E%Qs#Z2zryiCMG9}Kb0>@%^p~>Cr8!r
zgd>hVhL}b0-K0WQiQo63w$DAO3!h~xK9lzspp=~tobhu-4fbKH{Pwp&RqkC8pY9d2
zv6w_BIj8=gWn$vhSPp+5@)}7icmK0lIZ|0u1O~iT;viLi<{r|*>%h~_h_~PJ-GsO5
zFO=*P2gIw5W$G=~A+WrUT5=EWnl63Oj9pij$zZtw!ZjaEcH^PPJcu57GL8Le3^WQ9
zKVFewEBTvT`JQlfq+<GT!9OZ?o}wn4KvxbvxXKXvEcY7xH)xyR1}n@TBEWq30A<j=
z6h18Py4&iXIWVQ>x46oU4tf-_LDaiX;pXRpTzp-Re&0#gxasyubrPh~Sa+-uxgxPE
z_Qa1n>ATvq6^2b_FRnyv`#2ukDootWis%a%SZ|)oJ>1&>DJB3T^_0}-8XMIJW|H%G
z9;eKTx^~s2L<&g?@33tA6HTc_U8;pAukMd!aox2oLz?`wWtaB*-jN)O54(|u87MS^
zJc>v9^g9Sz$usb10kJucn=W`Emp+4(Rl$Bo!(n8=W*&?I2?pLvl_M(kT9lHLG9GAP
zwui`6A5DDhKiSqGWr4WB)UWQF=bAM=3rLF3ymk8=N$eEw4P3H#o&3lSDlys~tM4Tr
zirt><@EPmJVPqSAb~5d-M+T*g32VMvUZVYJUK{y%FO68}7=n5B^W|rynk?f)ZheX=
z^<-54F?lL!N$<`Ke>B-<P4W~W=Exs5`ksN+Y#A?z6?5ANGW-)^63{XV#*iH5qmv$0
z10;nNNq!d<ptsa>kLME;o*OzMUQmq3=9zI5MEBkHQ(+nzpu8vJuKX^=U4KJ$D&@uU
zB$`?#K-&m<+pE2l0nWN)0M$bn7#y2ZJzwsV;H+i+Fi-`L#%nqg@M9KfUumc7{}YZ!
z9v)B$h0DA9-0X(3I{=L`fAOG4bM(4T*fu-Q-#a62t0*?KRHV9ku|X)(Cqo+|lDdx4
zHI#m95+>`oOH2}(k1x8!&{8z4p8w2|>YCl@>mV@{b7I_EenbrHG97=OQR=DzxBE2D
zxiU+A#+CA?<?x^y`bB@!-4yI@r1aliCr#`FttQud_LOn+FY?Q~Ou^B6>F~D3H`TrI
zQal!4pK`HctR$P~)qot#y9yUOZaA67k0E{2bu@AIO;v{7g|&;`C8SauOu=33eOw41
zbOgo%W##)V1y5<wi7l&q1;M21>EXSrCCAg~oSq7Zpw!DveX$hZcis|jN%GzfXE8IB
zcFol8R3cWCDqfBkAUX7x0;LHxN;`I~i-+=E+V@wHA6U@V#cYpcs1cEqz;0_W)yKC*
z+;+@FcCWAYJXf>!3A<e)T&|vj%cuIg@S>9nCiAj%-h&iVZOpsZm`fb2$x@(Gclh`2
z#NlfM45mDW(pcJw+KuR>+GHnX6BBRX-AG`8O$fh8Lr`%1zOKp3kAakYGS-JVYsJ)T
zAVNk&WxYG%|Eud6Zuf$1y4&wPy8JN>;y}M(K-wwg@IQDeLMcceP+|id=1!8m^oXR}
zqSc>TLmZOJ?~@R5faSftd0u7FVAes4xdvgNRlpJ-A5{<z8sP%ML^3l|(t?7WS<mhx
zx#J`B&tYv<eacm9(16F{HlBL-&Y>y+JKmA=bT!=u?dg6_bNSC@XL@CpyWwq(DkJ8v
z7r_rGooR;vT6dmgtaN}OhB;|PN%Q_bnVy!sDDBwlHoR?FbxT7(-0A|-$`^n&1C4)t
z)!*?lg#uM04gXWNj&xs3zB_LRmCWPwAZOU0WC_fPrpl1uBGA2K9!f}PK~77<z1?n>
zBn;HsZM?T%y`?rU>c1YlF)i;iat%iS2on&HUhNNqfC^w!+X+aJ9lk_2V)usoXi(;0
zRpVC%4yp$~K_tlw9{5h&!;X53#eCn;ym|8fUETqQg!xtUlY<-!(@||DF$E}1I!d1<
zC8%WyF@c|C&ufZ<yhws{^y&!dW0mLcYRxW4ojJLut*>8Vecf2!R7LP-TT`Jg$?H%*
zBIle1N0O`>C^;dXNZF*Jca~q)0qDGm0x~-Qq=&<@Z~h0Yv`#P>OI7<ps6f45cRX6d
z&fPm880Nap|D_++H0M-b?NsAu19DE6qz?Mhs!NRGdYvah%EXFfJN^rZZYnLsqHzM!
zIK=pTSE=<GbR4Z2kgF4p+v>?q_<+_XDPQ;c2%SyZg0`yCl&08BMfS7R9K&p|9(<6L
zg%sg1?>C(vywnU*@iyARZ&`#D^gQS`$Z8nrQ+(9_Ly8Z&@U}^#a+O1WF;pTtDqW`O
z1K@2?lIH%D4h8Ah*LUa#@%ea-A2(KdxBtf4+g2A2_;luWQcrI}V&EkEFoah&1wIWY
z=TztKVAW(QJomehuh<AfM5)($$0k2KsW<kvo#fT^9O$P861wkF)}*kn=^3J<b_9pt
z8pzt}`XbzltE%uRLX~Mycuz(VBS;siX08+l7~sCb%{Exlgd!KitAP^b6|1zRCV$S*
z*HGzh(kVE&>?aGrI043s*nK6!lvm>x>ojASoKz-z#~ZpT$;EI-h&FiRSNoW2g~&oo
zV)zV|CkU6W7%iykRywZdiXiN}jiFWL59?AVq|hf4UJO<oQO<pV1TuMcHpznyY9HxI
zi#u#MivG)z|IH9O&r<=XCCp9b#ai{|Y%IGWUZHj*w7?GlmsSO>e+(~L@2<vEN+O}I
zZK;{uR2S#IECM6l+m}bnkaAbDkN^x|T3Ip<3MX-Xa#OoHCSVG)uqP1$aaptYpbE6{
zROw7ms3!z~2^f6T$4oS!ZDGdjtAFi^$j<)AtzRnlp_^A=#HVdFm_e(IHAMQv-NoDa
z6oZeF<Ny?-|D?R?T8fv$BxBpqxH59*l}k&<hoWsvPNjjvPDM^o*-H2z$vg$9-V)Kc
z)4>4Sl3kbxp+ej`k1{?DD)d^`)u=16FJ5<}<6q?B(Z$F??&Nw&@wHyOu;sj39l%Q6
zgu7htjG8ZKI!qvCA8$?tbh$oVg{xbG{i&|LfB=;Hevfxd_1V%ZJ*F8=`6b2?`f8|$
zKd1=~pkPO$T2bWDtr?`jn2R3@F{9TTh1}`+T;6Hs=n)05=`#pmiYZLo{;<xGV9<_i
zooaOU%dHekig!mhxaM)~hi5lIpPqQ>F_AlxnDLha`DkD4g*3P_pPJ3@1Qt|lNZquR
zn)BBHab-E<zj>C4*beE}bofEZ7&Rh1;$q|Dq3)lhTT-pLdUWxfi8*oo<SxDky9X;U
z88L8AUb>%48||$`MpFEy+|*yMe_{!$vU3{W8<_=2mY$>)uBJk~`9dTC1w?$(lWb?*
z7&yKUl35DRTTenWte9Vbgjf?`u?U(FuVp|w89yP!e{#TE!|S#QS>@BWecZvkSm62f
z^pWOutAXBUfC|s;>w$DOFN$N9RYu{!0E^eREN_ijmv=z@n$)H^nD%ve7C_xP5Q7Mm
z%4W_1#&+0xcUm1G+OoHa#7vb0qkzKf01VyBC8y9<%-2&Ktxo0xlZMh>HE{_zdsJi8
z3@UbO+B=P0Y<1m~1ahV->=(uj_Xnz691Q!A>#+N2R;n%o(uTURc{Xu<e>$)}f`9&+
z-$O`i?)WZ)8|4#mH;auhEI0>iXKhSJ<;9$c=hX_^Mqo2(F)SNCq5<dRUDo@lwtYNb
z(84xS{&(bZmduaZER4{`o#U>^buGA#!7&3-{|1}dcU`qt;B$Ua?=kV;UjmE44`ZWW
zB_wwFhY7A!!2L#%hi|RcRY<JW8SJfB_e32>VE{H=mM)7<s?>m)n6K2pZ6uR%UKaK{
za<h`h9d<+PH|U-=bIp=D_*m!M6T4km^I8t`rr!U%<bA%{GJ!vUhT>D{L(6AK5g)@+
zm7ccI%&g{?E`D1JEN#iaAOyx?0XP}Q=7^fMRs?S@^v9e`90q~7KA*p3oOFPL+be(v
z^UD=pJ%&l%<s^SFpn7Jb|Cb4>sf^bp8k=UeME)4_OO|@oV%87u(~^?ZfGit=YIVDT
zN1j)Txm$_eH7=};uARuz(7Q=tv0m|F<a+#`GOv8v{n%wX?i<BpZ8zIK5&!_K4H<e{
zpb4t`V@;eQHKD2n-m#%#F(0!E8??}Wkba$}W`$HmG{WztGaZDP1p4%wLl(<BAGAqg
z$cbgCP_N-uAX#?@5LT%AVQt}^G=agebk1l9I@MP%D}Ml<KYMK4f4KO^%7vT&0djnO
zf_;{{#lwBmj0tQ~T#^+$<isf*r4qcG`<56d6Y^CnU@=cEi+1e@Ge+~g0kO{lr4<T9
zaO;b58Nl)bnO(5p;T}`aMgFpcVx2*#Id1IOfM)2m!x&BxL70WyG<$Q&)fRJyv{pf=
z?y>&EW_;f2uZtnbc3I(VYCGW^r)P{qBD8qeXTAg@^AQjW9zT8gi&86XcCDqs&9My!
zt~u)BvzLPX)+FEgLrKCIzRkPvNDBA<K3+fjCEKUD=M&d=(g0@S>mu0$9{g6$mn7OG
zK=#v6<pj;a2S_XW&HVm8A$pCLKdCV4qp}b6MS15&9V{s!T%(EFmgOBMZGcD7X8I-x
zFs4R1xEgbqtKBNS?2YDP^b1qcZIh`;QF@kPwv35heum#f{E7o_<{6{5!~kuaCEJ`0
zy&W|AnxsLQb!~)$U`{_2Qe;X*leyD_tuny?c^&wDS2<Mm{=wM<DGxl67S-TDBP!X9
z;x;{HT^{fRz;;nvW`yBwM*jixX2tbEluuawS0=G%#`q+zxAK9bv^ME~sldaS_k`AA
zxd?3XN)egSJ<pblHO2;K>J|bZT?gubMTcicCht>a4%TsJS@2<*)GYhGi_E0&89*p4
z=>m@VHfSnuu62}1cP3vHoMGu!h+9J7XJj?L1Uv%4a3lD@TUb)JHZ5%-*9s&>tH3^e
z#oeNa#3~iraamjUi0<$R$7ny<o!y8jl|7uA|2mv@n84hal?HS{poX4GB^NZZq3Max
zH^6N>a!O9p8l>@JH8gN?szLd55-?u6mI^p9$e|@jv}PH48Ft6PzEB4>+(?u|i*?#a
z7a%o~Kp%SIn{YICSc$4iAd0q}&!g-xK6INF`v}*LnYnvA6wqq%6&-)fMUaDg{+5Vx
zy)|UZJQ3wKL|q30c4NP?*9RZ1uiDSU#_W6prU!!Au*o<IQ=`&P91FM5-6x8WLuH&s
z7b&rG!xJ$^ddlKvviJAKbwFfU0av0KQ8m7P5apJ0LnOb$`0&Gj`W3ufX&{u;<o_e`
z(O;Tf^yKs^`6YTEHmeZrq)!UfdmDB>1$O`9q4${DSuQ;G0i<_2&O%25%9QwH7{9ce
zZmOVc_25lBe3M(O#&=iID^>~_;}MPYloZ_ajq~_&JQZ=~e3|A*^f!Uzh$nTEp<v!g
zOLn0#h@w@HNv^ccsGU@Qo3m3_v|n5oRbrjfG(^a<Q~<aqP0#il$G+}$L*##95szWi
zU-4@yVbmkLl($vhUeAe5Abkdr?&Q5t2a!?cJ~d@&y~EYoa{08zt_lHIb8*8vd_&F}
zHSCc`%aRS)=TOnt-q(NMz{>KPln87NTFYO|eRR?s@()-kc=RAa5{+Tg1MFE4lWsfW
z9~$_5eRB!9X7h@}gw&)f8~1SzAWq@J8jpZU3UtEyj)BCU`@vdmXkEfHUqJYceYVgf
z9q9eXKiU^c^zg?GS(x5j>($^^rI(knQq^-3K#Bzm#sTL53`Zd9@*!J$5z<BbW_M{y
z0G#m$)a8S_{2p^T4cW)>_gVqh#xIz}8&UfBphK9Ejk3WgcpWu@XjKgd3FsAZlktMt
zUy;uH8%s|+`i4>E8}^5y$JO^?Nz@F>=~K=1c~cd-g9QBDmC)`iTwS^4W{6Ld&4(e|
zY=mM&_Zcj3F`Gw0aNW^C*Ev@lv(gE^Gm3``Vaz!hw4!AMbJ=IkD=~@s7!_`yBrQ{m
zqpJNI_RP1Kin0sG&XrbfcH-p{7D52l5wy%T&YnG37WEQW6FV&9y#VGRKIp<l8-hui
z?1B!On*mpF0V>{lfB|a%!NI4R>&On}2I<I-YIIT48&tfb^2gMxn+$F)3$HgW(h~dT
z)8zAXCP{S<^`+EP*Lmn?ef=mNWCW~Z=>>V^VCNMM$~nHb3sfpd!^$`P88AZvlN9%X
zT2~$!x6j*YPf_5ViGIQDTc%fpYlI0Vd#hYep9j?r4bZAMi}y-^o$NEeVEvb#hrwV6
z+(1b+Z6;ZzcbDvU5KJJB!}kyer%G=vez5#F@^cOxXaQ5|eb&dX_tBL99w3FbwE^rA
z7T4SNFcQ>Eynq+D`rF6(f4opIPrw28Xize7(HxMeDBYs)(gh$OROL+Oxu7fjAvO&#
z7|WU?bBv4j_5WeK$m1xd0(}44?H`TRB;jF2Uaq?d=+4+xyw(#nwEA278xXI}rVkyC
zDEK&!cGZhAv8<w_m0=DYWMj~3U9{kednvtwH$^~roQt6vGiAGJ5-tRLSjaItY1L&c
z=O1ynccI3R)%u*M$hd7KIZQ`l&nxeQua-VD4?CFgfiE)zVsw#-ibPuRArY8SW+hs-
z=&AePrAb3z7-d<l`d9Sdfzlz4x<%wAsc@tzi%3rg8VVa}a?D<B&}5egzKmCNP6u8e
zR0ps3T?*6k##Mn;h$DgIc0ToxqQIFPyF_~))56MG+uGRko(UY_*LeDYPzqOU^9{h?
z6zlGeP&2tTfbVZ<Yy$wMoP1vq&^zo|wvmUCxhHs!vyap5T18%U2o<j~aN7!_-vz>y
zIZcW1)PaikR!}Y2MeJ!5rom;DtY)?qFUsA5H}UeYf4T0L++!d)=|5+L&y%3D?^U3=
z03;2f--5_8HfJp4ji>=0#CT<E<DdV<&5$ZbHGIvV_fA4_M;>OuuE<qK3U|%D_~VGB
zu0dT8G9;4PO6k)@X1V&WD!05w|F{d!tZb_blR5ceWH|#$5B36CR-(9=`QOpDDZsVT
zwavv1%5<@}8k7&7s`+mfCY0Qnh@$>!amQ}9kAxN|0GxCw8m#&qTbjP~9lg&=cL_zC
zUF0(XWwmGUU3(JjPvfSiOxDlMUtW{$&%rXw6{9@jm6T>T%$9x{jqh!)^^n{Xs5AKh
zV{Wad=$qX%MmSXJW)0GFs4T1UDJf(_2ALZwqEiNH#!Lt^r9JwPgt2Ef3440;aO-7}
z&tUS7_SnDqOI+tu64yIv@IR)&i@?+3x<K_{A#rEd3T)@p;pf6Xd{yTBK!&^ye6M9w
z7||}+`<%hj9tyeNi*-kFMVvd*;s%a}+F5M)4%(;Iz=Mr2;`o`D0+)H0PS%LhvS@>=
zSf8Q@?m$Y2*Wj$iUdn7jDcX*PH<1n&n&-k3MZs%rwlv$MDHyEI_=A3Iz_q0F2Zb_E
zr%l90dgX+A!G%)voDc<<V-9awH~mKrcQeX{$q0N;c$;TsEreykR<pc%i2zJBP6GGp
z-^~X&ISHGg7@-0a>)qOKeY-cOl!tGw^~e?5<u+wi5Hy@6B)wU*X#(8@A_03ewx(MF
z;O|Q(X=I2KdG&oNt-qg0)}t<)shgOI7LgNVZVY!o3kPFL{GISj1@qw#{aXZrw(^C^
z8;20+D9mh2n77-ONwjC{`K-QircCGYyaGW)>Ox}=yH`e7d(?Lm?r?)7oqi8ppc|9i
zL^onk<@CIwHKo9LsrgZHzh}p>=(s=&Vc2ejQa@#+Zvu^uN$Dx7F*Ld$`WU;Etx-^=
zfMzsnaG=K1t%-~gXHuWNF)qFus$O*aqvr7G1t`Bk@;COomiXV(EuTBS5?|<v3i7$?
zCbsq3>3Lggo;J^GLARKNx!5mDB8wBOCBTXtgvXi7T$WPOAB&b&JOmsYDLi?(q6;)b
zeZFeEc^_(}u(ao52;ElD85^OFuS14?X<EJyW~;!xpNwP#wSM$%nRk#2Mzv1o-MSVX
z>l?2UQpJ}QhoKyql{nU|CN&(NEBAmgz?Q0L#<x~K9$q6i^X{Vq+Yy7Jjd1;ty3oh~
z0crRIahUNAZ0K%>ep^tFX69qT8V?=xvSzjpMy}R1nCk5QXyZ|u9XCHam>A|TA7@l0
z`?uMoqn49UKC9IEM-V+i<~fJ_AUnhCOtTtrxX;Bmks=~5Rv`9XWrqMHYGR!?C`+dZ
z{4WiDBg11o53Q&u(1q*M-KqVE81#lrq4IeMH+7-lEM5K;G-9LM!yuU~t8ZzD6`69;
z9vlq)N47TR#PR=idvfKWo;mdWDey%Bnh#;6ogax_dzqN!JgtIx5huFZC9W%6w@hAm
zW8;!P22HmISF$HK$3v8N>1cO6-H=RQ342mp74z>&cQRncRIHYd2yVpvNxX;1y}P-y
zYU^kI4;WSM9{z!=g)Gi4ntn8<MXvZqKn;ce(S8VXb|h$-f%Z=+I$S(^)AMSO9+j;t
z7@IX#^}3JMB|Kz$QzYLLfVma#Qn#s8@*5Q3!KdpdpdZXc6hQjVLk?AWuguCpkwFFq
zn=FgD4=_#70pnwH%E`O*`5Oc^t4&F;QuDeKqSaCW9u`D*(`WZrrs<aPLG?64?C})h
zRW?MELWlEiCTn+>g9^o@uZI$!(VsPUOZ{u?_4J!iyyGmv0S?60{;FUXy$qE$mX{jJ
z<6tp1t`h565<Kn*#PDIn_fs$Jp?W+(0TLPiSe-A&Tnlj;T`(+jJ5(sm%_ZBQO%6r?
z4JNgHb9)F>|6Qib9+xf9$Ti5C9r4E_tFeEM?x!r8&~l{^9IJEC@-JG4nDk9#k6gH?
zf;d8YiO|Z!ylo0JR%B6KLjp7Nqrf;5T4kkN9>T%T1}q$dc0Kk_YX1DOeYY{Lw2JgO
z8EyWv=NlQs-FHQ{?^fb#-v9Mm8?d-hc8I*tDVLXjID9wP%S^On#a<$|XgxM1;-s*U
zzXPK^+9Z?xNaLitbGh6*I)<bJy^tcnFji6<w1$2dyG$qH`jA0@8~e!-rQ_E04R^%w
zQzW0{Q>XgK`>-HV#!9;dgmKpFf$&HEVmdlX_KJ0x+QauOLNE1N=PmV1YT$EUtBaJC
z-OWQhh?<01^GCXjbwGcNCup|IPl#SZbf<R;CR1!MH%ZiY52){pTU|n+p@&jo`Q_*{
zXmAe8zPxKU@CXYa&mS}V;c3G<teHgZF1Xe+UyHMV?Be~yD;$Qid4<o)B9tUAXj&E7
z=y_KqO(*(!HGq@V=P2C93PB!Sx7KUM?s2P1%if`|Ao|!w8R=AP-or+dV88$rm})7z
zh#@^=T8DtkRTP75lDIN;jP5cl67K);x-|i4SmUvEhBdM8_ztHS^r8~Z0Il|0%J$NP
zO`<j?&Xqo=#!~QflTSp(YGmwuncpI4l}_Ff_l7738_i`|mJPf(Y{d{t7j{iZ;OTM_
ze{r?Ko@el;TZ<(~=&F0a*QLKx)SGe|hnZup*~<$s$o*F*?2Ek!0?AyG%L1>pHJ_pR
zLhO<LEjToT{W`^x%1F7VeSu@}%Ln?Go=l;G4mNL~&>N#vQM7K;$1MZX7K0Q&q7;{m
zcj|U^`Dld*DKJo!4!>JqQVroB3fPs%WaNWv9v`ma5C&mh9R!`F!p3tye^NaTt|6Pw
z7VbTnK$P-{dy;_>U!^O9aw5@MemyNV#+`}ozhPm&vwD%-zdIn_WF@T)XBl!HY7GpE
zZ($5_2G<{!^eo3r0-j_znXPqZw~b0#&XF^(4S%4J+MVNZF${@tAAV<0cwSX%jH*dZ
zr^cam*f&6sY_nG^<8w4aDgM4<a?RD^*KVECDt>SU1ZA^mNHvxtuWL)uH$g%Fms8tk
zh@x~mqp%o>7{&(R;08hk6cWS@jh5zA+MrL3(AMy`t*Lv>tS5bIO5jw=iicEYNfxus
zz3c7`w-(N0OjU1tldsqf*!O+u_iq*XVMK&{nS_i_JXHG8Podp0rJN9=eH(@?4B#5m
z)(hcR%+H~%7qOakx2kw@CEH?CW%pWa=39WdN}U9pfrA>erVXFLlsaXT8+3d}j%5a9
zl3Xg67`miqM~fuzO&TFh-S>n<9qLxRD`;U;Jf3w-vJ<;(9Dn+%&wu(AR8D@4OJc6Z
zVkk$!P09hXe(fi&4{1V=6R=RXtkJMJ(J%9BLqz7Vsmx~1sTe#S)XZd?nI*^=E>+H;
zM)TvdE1(VDK|tXeKsHOsAlAv4gFhV|OzFcyH<LFnuRbDgVH1^@kej+lCXby!&>Brn
z{g;gI+rJ|}SrFdWZ)d`s#>~wH+#l-e^;Q?vc8E2Wp;~n%;XRR|i@2DlxAkcc<6+>p
zt=6>~^(9Mhx%xD3_>~G;1)N5EB!nV%ZO_QEK3Gj8nwd*irB}rPUh^z;>FIb2|IH+V
zCABGSKmY<RJrrC|VwF~tRJ*2hY&P)B_K0KzX(lZdP$~y89zRX44XG+<B3>5Ba|$5|
zx#_{We`HKKi!MJR`va4RZKFDNw{IGEXDR`zN>;0EdZZddMwS8CAXs~I!HAo!U{obY
z=rJ@NQih5@+Zmpmf|Xz`RhyTwGe;o^uaaAW6Hq|a|AURgm^s}L+iFp@@W(#<q5uLA
zUl6uEO<FxSxpqnuNXRB}SYc-^BlI;}3gpzBHA(?Z_~FtFzAJD+DMcXziU!T{@nz=E
z!U_aYHjsWR8|t~?K$%5D3L;qEPv1o@$AynAyNacp&_1bl>vfOCH+VY{&>)$~Rsuh`
zZB(L*s!aO776BwMKg4E1=<7idggJl(EE$ysz_otGYC9n`Rw7d3?I+@+`XGzIzY_$H
zz;Hj!tzmeFoN!A4f$4YBw!ZBJLv))_B21NcDf4G;tnFmp0nTCNAyiOu<i?szvw~N?
zZga|Y;YOWZ5Ok?S-wTa^v7|v<>+FK3;da>l0EKqGEdkC%YSl;a{n7_g2K&2}IqVYo
zM+jJCofz=--!!CeWVDt~_f9OeJ#fU4uMS#j{K;jewsFT$69p~%TOIn*#LzVHgrKdf
zE)r{~&{CwT_rmBkU={@CAAw@kyd6vYbSe!6H9qU9vTec(PcMTrvU*-zAQTJ)n9g~Q
z01TvL!|zsVvODX&=!GL|Ewx%;%GC8v6CaL+m`U0#rCV{yno|yjH-%7k!kejo?i_(|
z>dSE&QpG6Bvo@uEYvA3fWC!bt%y;KqUWl=w#MhV33A!*#TwfKlkX>*Ie}P-M35*rk
zZ+Cw?8$t&9Cpo;3O)XB2uLidTT`;H$v_x<P6()!P01RMr!&itPW;rYTEVfOQTuw_3
zv`3q&|7RXLF%X5rm-4T4SCxaG+E+cXi1*JzPl^7Sv$uLh4)KJe=YSpnTU)*qpk@`)
zR23V7%^BN;P_!w+tq3qJ=C-fhBcq4L5?@u1trRc?ybO$qS)7f+lXNb%li^YnpdcE$
zd9y(pFWWF@EppBgP3@PevnFRtpLw}=Td;!h73s%;*ZG%;ADeY<D$HBzxzojbKRA;k
zNlA_I3kY~jC8D8G)uJS>QhkV3*dqrQ;>b5rl}raop#v$FM{5M$FvoZk-*y;=g^Hra
zpvk11N$}B@!<gY?p=HR)9=wOoG@tDX^{TxL6Q+jf{~X=jT|}Zfim-GYyLhNAiF5;z
zA48#-Lbol2KUxU+0*Gy_76~ggy2^r=XJXz+{t~p5((gxk-^sz7t<jH>uR`y<S@`GW
zhWyZ>w=NaGqbe0|Zpgd-<UoU>AOHXW0AKpF5%KcyymAOMXCANqb34KqRPz5p@31My
zbY!7%>Z5XlyROgXk%s(j>9YfYzyz){;ff_|$p5rw>z_4ki66?fZg6lT4nMv+Xo%M0
z^zdu7&Frm3TCZH|q1bX<5TP4-n-1*__u3ovJ{KS@na!#=8)YMg27}YFXIxvqkiF0(
zawtKE_nh4GUs~o)3IQu~EYiEoBa2gO0{luUgjl2ot_V?ot@pP76@grwIq5_^*#XoE
zgyOTfNHS$ev1rU3mN(<6YY3~(i<kn5U;qFDnZ@xsK_TA`_huiud5#+xQ_fzv8?cPC
zBI7UPRq);nF92V0a7L(Y$QV;8Yf)+4HdgB->4+g_c0SRW=GjW2s*4x|Sr#R6wT@sI
zn1Ohgaz_QEpG46Yv2hifCeXuyQIc<E#pt{?wnoVTdP>J9PccTiLXF7jMaN0UDBe6}
zyZw#8KeY>mv-F|kwTI4~iOO2(uK+0B!NS;#A&Kn~l&x}38({T|G+t6$pS%-aqL4kT
zf$Pyezy<6w?iz4|PL(@UE1f%{r#%{G0m9MIl7ApvfOyr(j!_{XJ)1oL`<<;<U8H^P
zZk>#tfzPXHOt}kRUJ->v-M{v!w$F82b5DqLd5FYXI^Degd|XnF6$XsMyzZB;IH4fw
zi&ZaV0001678MUZD%ld1a=l#WVQ;K_7JB>*%r&%d3@X8A6(E<E;+cG0)Kx#2AX}-T
kmUY)<vj6JW531pUx;f{}1VkK-O|=)I)s}-WZ~y=R028Kp_y7O^

literal 0
HcmV?d00001

diff --git a/boards/beagle/beagleplay/support/openocd.cfg b/boards/beagle/beagleplay/support/openocd.cfg
new file mode 100644
index 00000000000..64adba40393
--- /dev/null
+++ b/boards/beagle/beagleplay/support/openocd.cfg
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+#
+# TI CC13x2 LaunchPad Evaluation Kit
+#
+# Since BeaglePlay CC1352 does not have a built in debugger, we use XDS110 in launchpad
+#
+source [find board/ti_cc13x2_launchpad.cfg]
diff --git a/soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig b/soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig
index d1b2fc58bd3..9e9f3cb321a 100644
--- a/soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig
+++ b/soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig
@@ -15,6 +15,7 @@ config SOC_SERIES_CC13X2X7_CC26X2X7
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select HAS_PM
 	select SOC_EARLY_INIT_HOOK
+	select PINCTRL
 
 menu "Customer Configuration (CCFG)"
 depends on SOC_SERIES_CC13X2X7_CC26X2X7

From c0c37ae48f4ba45f3ab29be37715b2a36c00d9a5 Mon Sep 17 00:00:00 2001
From: Michal Smola <michal.smola@nxp.com>
Date: Fri, 13 Sep 2024 15:10:37 +0200
Subject: [PATCH 0691/2913] [nrf fromtree] tests: adc: Enable ADC tests for
 frdm_mcxc242 board

Enable ADC tests for frdm_mcxc242 board.

Signed-off-by: Michal Smola <michal.smola@nxp.com>
(cherry picked from commit f810e1318f385ade00b12a5bdddc4324c177f02a)
(cherry picked from commit 2b4e7c61374e7cf538c4d630e4de9f3ad655fa1f)
---
 .../boards/frdm_mcxc242.conf                  |  1 +
 .../boards/frdm_mcxc242.overlay               | 28 +++++++++++++++
 .../adc/adc_accuracy_test/testcase.yaml       |  1 +
 .../adc/adc_api/boards/frdm_mcxc242.conf      |  1 +
 .../adc/adc_api/boards/frdm_mcxc242.overlay   | 34 +++++++++++++++++++
 5 files changed, 65 insertions(+)
 create mode 100644 tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.conf
 create mode 100644 tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.overlay
 create mode 100644 tests/drivers/adc/adc_api/boards/frdm_mcxc242.conf
 create mode 100644 tests/drivers/adc/adc_api/boards/frdm_mcxc242.overlay

diff --git a/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.conf b/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.conf
new file mode 100644
index 00000000000..3201f7a9cc4
--- /dev/null
+++ b/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.conf
@@ -0,0 +1 @@
+CONFIG_ADC_MCUX_ADC16_VREF_ALTERNATE=y
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.overlay b/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.overlay
new file mode 100644
index 00000000000..7d0c761c944
--- /dev/null
+++ b/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.overlay
@@ -0,0 +1,28 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright 2024 NXP
+ */
+
+ /* Please connect voltage reference to J6.AN pin to run the test. */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc0 1>;
+		reference_mv = <1650>;
+	};
+};
+
+&adc0 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_VDD_1";
+		zephyr,vref-mv = <3300>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+	};
+};
diff --git a/tests/drivers/adc/adc_accuracy_test/testcase.yaml b/tests/drivers/adc/adc_accuracy_test/testcase.yaml
index e33f7237339..8f6978a49fc 100644
--- a/tests/drivers/adc/adc_accuracy_test/testcase.yaml
+++ b/tests/drivers/adc/adc_accuracy_test/testcase.yaml
@@ -19,3 +19,4 @@ tests:
     platform_allow:
       - frdm_kl25z
       - ek_ra8m1
+      - frdm_mcxc242
diff --git a/tests/drivers/adc/adc_api/boards/frdm_mcxc242.conf b/tests/drivers/adc/adc_api/boards/frdm_mcxc242.conf
new file mode 100644
index 00000000000..3201f7a9cc4
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/frdm_mcxc242.conf
@@ -0,0 +1 @@
+CONFIG_ADC_MCUX_ADC16_VREF_ALTERNATE=y
diff --git a/tests/drivers/adc/adc_api/boards/frdm_mcxc242.overlay b/tests/drivers/adc/adc_api/boards/frdm_mcxc242.overlay
new file mode 100644
index 00000000000..020abbd2355
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/frdm_mcxc242.overlay
@@ -0,0 +1,34 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright 2024 NXP
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc0 0>, <&adc0 1>;
+	};
+};
+
+&adc0 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_VDD_1";
+		zephyr,vref-mv = <3300>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_VDD_1";
+		zephyr,vref-mv = <3300>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+	};
+};

From 5d6a154941e5837be7c8a4fcfd95d8494655123c Mon Sep 17 00:00:00 2001
From: Krzysztof Sychla <ksychla@antmicro.com>
Date: Mon, 25 Mar 2024 12:57:21 +0100
Subject: [PATCH 0692/2913] [nrf fromtree] arch: Add Cortex-R8 support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enable Cortex R8 support, similar to Cortex-R5.

Signed-off-by: Krzysztof Sychla <ksychla@antmicro.com>
Signed-off-by: Marek Slowinski <mslowinski@antmicro.com>
Signed-off-by: Piotr Zierhoffer <pzierhoffer@antmicro.com>
Signed-off-by: Mateusz Hołenko <mholenko@antmicro.com>
(cherry picked from commit 5d76b563ea971564505cfb425028aa680a4a8670)
Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit 57c31e71fc210a5810f50674c3cf41ae326b6db2)
---
 arch/arm/core/cortex_a_r/Kconfig                       |  8 ++++++++
 cmake/gcc-m-cpu.cmake                                  |  9 +++++++++
 cmake/gcc-m-fpu.cmake                                  |  2 +-
 include/zephyr/arch/arm/cortex_a_r/mpu.h               |  2 +-
 modules/cmsis/cmsis_core_a_r.h                         |  2 ++
 .../mcumgr/grp/os_mgmt/include/os_mgmt_processor.h     | 10 ++++++++++
 6 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/arch/arm/core/cortex_a_r/Kconfig b/arch/arm/core/cortex_a_r/Kconfig
index 4095a277c61..2ee3c945644 100644
--- a/arch/arm/core/cortex_a_r/Kconfig
+++ b/arch/arm/core/cortex_a_r/Kconfig
@@ -93,6 +93,14 @@ config CPU_CORTEX_R7
 	help
 	  This option signifies the use of a Cortex-R7 CPU
 
+config CPU_CORTEX_R8
+	bool
+	select CPU_AARCH32_CORTEX_R
+	select ARMV7_R
+	select ARMV7_R_FP if CPU_HAS_FPU
+	help
+	  This option signifies the use of a Cortex-R8 CPU
+
 config CPU_CORTEX_R52
 	bool
 	select CPU_AARCH32_CORTEX_R
diff --git a/cmake/gcc-m-cpu.cmake b/cmake/gcc-m-cpu.cmake
index 8cb777c4769..6f00283b6b8 100644
--- a/cmake/gcc-m-cpu.cmake
+++ b/cmake/gcc-m-cpu.cmake
@@ -68,6 +68,15 @@ if("${ARCH}" STREQUAL "arm")
     else()
       set(GCC_M_CPU ${GCC_M_CPU}+nofp)
     endif()
+  elseif(CONFIG_CPU_CORTEX_R8)
+    set(GCC_M_CPU cortex-r8)
+    if(CONFIG_FPU AND CONFIG_CPU_HAS_VFP)
+      if(NOT CONFIG_VFP_FEATURE_DOUBLE_PRECISION)
+        set(GCC_M_CPU ${GCC_M_CPU}+nofp.dp)
+      endif()
+    else()
+      set(GCC_M_CPU ${GCC_M_CPU}+nofp)
+    endif()
   elseif(CONFIG_CPU_CORTEX_R52)
     set(GCC_M_CPU cortex-r52)
     if(CONFIG_FPU AND CONFIG_CPU_HAS_VFP)
diff --git a/cmake/gcc-m-fpu.cmake b/cmake/gcc-m-fpu.cmake
index a25cdf05679..d1ce9655b46 100644
--- a/cmake/gcc-m-fpu.cmake
+++ b/cmake/gcc-m-fpu.cmake
@@ -7,7 +7,7 @@ if(CONFIG_FPU)
 
 if("${ARCH}" STREQUAL "arm")
   if(CONFIG_CPU_AARCH32_CORTEX_R)
-    if(CONFIG_CPU_CORTEX_R4 OR CONFIG_CPU_CORTEX_R5) # VFPv3
+    if(CONFIG_CPU_CORTEX_R4 OR CONFIG_CPU_CORTEX_R5 OR CONFIG_CPU_CORTEX_R8) # VFPv3
       if(CONFIG_VFP_FEATURE_DOUBLE_PRECISION)
         set(GCC_M_FPU vfpv3-d16)
       elseif(CONFIG_VFP_FEATURE_SINGLE_PRECISION)
diff --git a/include/zephyr/arch/arm/cortex_a_r/mpu.h b/include/zephyr/arch/arm/cortex_a_r/mpu.h
index e660247e4aa..896b73e20a2 100644
--- a/include/zephyr/arch/arm/cortex_a_r/mpu.h
+++ b/include/zephyr/arch/arm/cortex_a_r/mpu.h
@@ -32,7 +32,7 @@
 #define MPU_RASR_B_Pos                  0
 #define MPU_RASR_B_Msk                  (1UL << MPU_RASR_B_Pos)
 
-#if defined(CONFIG_CPU_CORTEX_R4) || defined(CONFIG_CPU_CORTEX_R5)
+#if defined(CONFIG_CPU_CORTEX_R4) || defined(CONFIG_CPU_CORTEX_R5) || defined(CONFIG_CPU_CORTEX_R8)
 #define ARM_MPU_REGION_SIZE_32B         ((uint8_t)0x04U)
 #define ARM_MPU_REGION_SIZE_64B         ((uint8_t)0x05U)
 #define ARM_MPU_REGION_SIZE_128B        ((uint8_t)0x06U)
diff --git a/modules/cmsis/cmsis_core_a_r.h b/modules/cmsis/cmsis_core_a_r.h
index 9f4514edb47..bef0f602813 100644
--- a/modules/cmsis/cmsis_core_a_r.h
+++ b/modules/cmsis/cmsis_core_a_r.h
@@ -46,6 +46,8 @@ extern "C" {
 #include <core_cr5.h>
 #elif defined(CONFIG_CPU_CORTEX_R7)
 #include <core_cr7.h>
+#elif defined(CONFIG_CPU_CORTEX_R8)
+#include <core_cr8.h>
 #elif defined(CONFIG_CPU_CORTEX_R52)
 #include <core_cr52.h>
 #elif defined(CONFIG_CPU_AARCH32_CORTEX_A)
diff --git a/subsys/mgmt/mcumgr/grp/os_mgmt/include/os_mgmt_processor.h b/subsys/mgmt/mcumgr/grp/os_mgmt/include/os_mgmt_processor.h
index 83b2f598735..71dfda7c193 100644
--- a/subsys/mgmt/mcumgr/grp/os_mgmt/include/os_mgmt_processor.h
+++ b/subsys/mgmt/mcumgr/grp/os_mgmt/include/os_mgmt_processor.h
@@ -83,6 +83,16 @@ extern "C" {
 #else
 #define PROCESSOR_NAME "cortex-r7+nofp"
 #endif
+#elif defined(CONFIG_CPU_CORTEX_R8)
+#if defined(CONFIG_FPU) && defined(CONFIG_CPU_HAS_VFP)
+#if !defined(CONFIG_VFP_FEATURE_DOUBLE_PRECISION)
+#define PROCESSOR_NAME "cortex-r8+nofp.dp"
+#else
+#define PROCESSOR_NAME "cortex-r8"
+#endif
+#else
+#define PROCESSOR_NAME "cortex-r8+nofp"
+#endif
 #elif defined(CONFIG_CPU_CORTEX_R52)
 #if defined(CONFIG_FPU) && defined(CONFIG_CPU_HAS_VFP)
 #if !defined(CONFIG_VFP_FEATURE_DOUBLE_PRECISION)

From 1fe081db47056e2e31f06d14e153ae7c4d484017 Mon Sep 17 00:00:00 2001
From: Krzysztof Sychla <ksychla@antmicro.com>
Date: Wed, 27 Mar 2024 14:54:24 +0100
Subject: [PATCH 0693/2913] [nrf fromtree] soc: renode: Add cortex_r8_virtual
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add virtual Cortex R8 SoC. This target does not represent a real SoC,
but can be easily run in Renode.

This will allow to easily test basic architecture support.

Signed-off-by: Krzysztof Sychla <ksychla@antmicro.com>
Signed-off-by: Marek Slowinski <mslowinski@antmicro.com>
Signed-off-by: Piotr Zierhoffer <pzierhoffer@antmicro.com>
Signed-off-by: Mateusz Hołenko <mholenko@antmicro.com>
(cherry picked from commit dc433dd6bdb21c2e02d8b97194b7f4764a562c4d)
(cherry picked from commit 7facdccb175815f4b18db1586daa5cc358675fbe)
---
 dts/arm/cortex_r8_virt.dtsi                   | 63 ++++++++++++++++++
 soc/renode/cortex_r8_virtual/CMakeLists.txt   | 13 ++++
 soc/renode/cortex_r8_virtual/Kconfig          |  9 +++
 .../cortex_r8_virtual/Kconfig.defconfig       | 20 ++++++
 soc/renode/cortex_r8_virtual/Kconfig.soc      | 10 +++
 .../cortex_r8_virtual/arm_mpu_regions.c       | 66 +++++++++++++++++++
 soc/renode/cortex_r8_virtual/soc.c            | 23 +++++++
 soc/renode/cortex_r8_virtual/soc.h            | 16 +++++
 soc/renode/cortex_r8_virtual/soc.yml          |  2 +
 9 files changed, 222 insertions(+)
 create mode 100644 dts/arm/cortex_r8_virt.dtsi
 create mode 100644 soc/renode/cortex_r8_virtual/CMakeLists.txt
 create mode 100644 soc/renode/cortex_r8_virtual/Kconfig
 create mode 100644 soc/renode/cortex_r8_virtual/Kconfig.defconfig
 create mode 100644 soc/renode/cortex_r8_virtual/Kconfig.soc
 create mode 100644 soc/renode/cortex_r8_virtual/arm_mpu_regions.c
 create mode 100644 soc/renode/cortex_r8_virtual/soc.c
 create mode 100644 soc/renode/cortex_r8_virtual/soc.h
 create mode 100644 soc/renode/cortex_r8_virtual/soc.yml

diff --git a/dts/arm/cortex_r8_virt.dtsi b/dts/arm/cortex_r8_virt.dtsi
new file mode 100644
index 00000000000..704f17ed8ef
--- /dev/null
+++ b/dts/arm/cortex_r8_virt.dtsi
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2024 Antmicro <www.antmicro.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-r8f";
+			reg = <0>;
+		};
+	};
+	soc {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "simple-bus";
+		ranges;
+		interrupt-parent = < &gic >;
+		flash0: flash@c0000000 {
+			compatible = "soc-nv-flash";
+			reg = < 0xc0000000 0x2000000 >;
+		};
+		sram0: memory@0 {
+			compatible = "mmio-sram";
+			reg = < 0x0 0x4000000 >;
+		};
+		uart0: uart@ff000000 {
+			compatible = "xlnx,xuartps";
+			reg = < 0xff000000 0x4c >;
+			status = "disabled";
+			interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL
+					IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "irq_0";
+		};
+		ttc0: timer@ff110000 {
+			compatible = "xlnx,ttcps";
+			status = "okay";
+			interrupts = < 0x0 0x24 0x2 0xa0 >,
+				< 0x0 0x25 0x2 0xa0 >,
+				< 0x0 0x26 0x2 0xa0 >;
+			interrupt-names = "irq_0", "irq_1", "irq_2";
+			reg = < 0xff110000 0x1000 >;
+			clock-frequency = < 5000000 >;
+		};
+		gic: interrupt-controller@f9000000 {
+			compatible = "arm,gic-v1", "arm,gic";
+			reg = < 0xf9000000 0x1000 >, < 0xf9001000 0x100 >;
+			interrupt-controller;
+			#interrupt-cells = < 0x4 >;
+			status = "okay";
+			phandle = < 0x1 >;
+		};
+	};
+};
diff --git a/soc/renode/cortex_r8_virtual/CMakeLists.txt b/soc/renode/cortex_r8_virtual/CMakeLists.txt
new file mode 100644
index 00000000000..2b8f495b04e
--- /dev/null
+++ b/soc/renode/cortex_r8_virtual/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Copyright (c) 2024 Antmicro <www.antmicro.com>
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_sources(soc.c)
+
+zephyr_sources_ifdef(
+  CONFIG_ARM_MPU
+  arm_mpu_regions.c
+)
+
+zephyr_include_directories(.)
+
+set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_a_r/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/renode/cortex_r8_virtual/Kconfig b/soc/renode/cortex_r8_virtual/Kconfig
new file mode 100644
index 00000000000..769ee5e4af8
--- /dev/null
+++ b/soc/renode/cortex_r8_virtual/Kconfig
@@ -0,0 +1,9 @@
+# Copyright (c) 2024 Antmicro <www.antmicro.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_CORTEX_R8_VIRTUAL
+	select ARM
+	select CPU_CORTEX_R8
+	select PLATFORM_SPECIFIC_INIT
+	select CPU_HAS_ARM_MPU
+	select VFP_DP_D16
diff --git a/soc/renode/cortex_r8_virtual/Kconfig.defconfig b/soc/renode/cortex_r8_virtual/Kconfig.defconfig
new file mode 100644
index 00000000000..114978755a9
--- /dev/null
+++ b/soc/renode/cortex_r8_virtual/Kconfig.defconfig
@@ -0,0 +1,20 @@
+# Copyright (c) 2024 Antmicro <www.antmicro.com>
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_CORTEX_R8_VIRTUAL
+
+config NUM_IRQS
+	default 220
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default 5000000
+
+DT_CHOSEN_Z_FLASH := zephyr,flash
+
+config FLASH_SIZE
+	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_FLASH),0,K)
+
+config FLASH_BASE_ADDRESS
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH))
+
+endif # SOC_CORTEX_R8_VIRTUAL
diff --git a/soc/renode/cortex_r8_virtual/Kconfig.soc b/soc/renode/cortex_r8_virtual/Kconfig.soc
new file mode 100644
index 00000000000..c326279f27b
--- /dev/null
+++ b/soc/renode/cortex_r8_virtual/Kconfig.soc
@@ -0,0 +1,10 @@
+# Copyright (c) 2024 Antmicro <www.antmicro.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_CORTEX_R8_VIRTUAL
+	bool
+	help
+	  Cortex R8 Virtual system implementation
+
+config SOC
+	default "cortex_r8_virtual" if SOC_CORTEX_R8_VIRTUAL
diff --git a/soc/renode/cortex_r8_virtual/arm_mpu_regions.c b/soc/renode/cortex_r8_virtual/arm_mpu_regions.c
new file mode 100644
index 00000000000..8287a0651d4
--- /dev/null
+++ b/soc/renode/cortex_r8_virtual/arm_mpu_regions.c
@@ -0,0 +1,66 @@
+/* SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2021 Lexmark International, Inc.
+ * Copyright (c) 2024 Antmicro <www.antmicro.com>
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/arch/arm/mpu/arm_mpu.h>
+
+#define MPUTYPE_READ_ONLY \
+	{ \
+		.rasr = (P_RO_U_RO_Msk \
+				| (7 << MPU_RASR_TEX_Pos) \
+				| MPU_RASR_C_Msk \
+				| MPU_RASR_B_Msk \
+				| MPU_RASR_XN_Msk) \
+	}
+
+#define MPUTYPE_READ_ONLY_PRIV \
+	{ \
+		.rasr = (P_RO_U_RO_Msk \
+				| (5 << MPU_RASR_TEX_Pos) \
+				| MPU_RASR_B_Msk) \
+	}
+
+#define MPUTYPE_PRIV_WBWACACHE_XN \
+	{ \
+		.rasr = (P_RW_U_NA_Msk \
+				| (5 << MPU_RASR_TEX_Pos) \
+				| MPU_RASR_B_Msk \
+				| MPU_RASR_XN_Msk) \
+	}
+
+#define MPUTYPE_PRIV_DEVICE \
+	{ \
+		.rasr = (P_RW_U_NA_Msk \
+				| (2 << MPU_RASR_TEX_Pos)) \
+	}
+
+extern uint32_t _image_rom_end_order;
+static const struct arm_mpu_region mpu_regions[] = {
+	MPU_REGION_ENTRY("FLASH0",
+			0xc0000000,
+			REGION_32M,
+			MPUTYPE_READ_ONLY),
+
+	MPU_REGION_ENTRY("SRAM_PRIV",
+			0x00000000,
+			REGION_2G,
+			MPUTYPE_PRIV_WBWACACHE_XN),
+
+	MPU_REGION_ENTRY("SRAM",
+			0x00000000,
+			((uint32_t)&_image_rom_end_order),
+			MPUTYPE_READ_ONLY_PRIV),
+
+	MPU_REGION_ENTRY("REGISTERS",
+			0xf8000000,
+			REGION_128M,
+			MPUTYPE_PRIV_DEVICE),
+};
+
+const struct arm_mpu_config mpu_config = {
+	.num_regions = ARRAY_SIZE(mpu_regions),
+	.mpu_regions = mpu_regions,
+};
diff --git a/soc/renode/cortex_r8_virtual/soc.c b/soc/renode/cortex_r8_virtual/soc.c
new file mode 100644
index 00000000000..b5ec39c8108
--- /dev/null
+++ b/soc/renode/cortex_r8_virtual/soc.c
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2019 Lexmark International, Inc.
+ * Copyright (c) 2024 Antmicro <www.antmicro.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+
+#include <cmsis_core.h>
+
+void z_arm_platform_init(void)
+{
+	/*
+	 * Use normal exception vectors address range (0x0-0x1C).
+	 */
+	unsigned int sctlr = __get_SCTLR();
+
+	sctlr &= ~SCTLR_V_Msk;
+	__set_SCTLR(sctlr);
+}
diff --git a/soc/renode/cortex_r8_virtual/soc.h b/soc/renode/cortex_r8_virtual/soc.h
new file mode 100644
index 00000000000..952a91d5e3f
--- /dev/null
+++ b/soc/renode/cortex_r8_virtual/soc.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2024 Antmicro <www.antmicro.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+#ifndef ZEPHYR_SOC_CORTEX_R8_VIRTUAL_SOC_H_
+#define ZEPHYR_SOC_CORTEX_R8_VIRTUAL_SOC_H_
+
+#define __CR_REV		1U
+
+#define __GIC_PRESENT		0U
+#define __TIM_PRESENT		0U
+
+#endif /* ZEPHYR_SOC_CORTEX_R8_VIRTUAL_SOC_H_ */
diff --git a/soc/renode/cortex_r8_virtual/soc.yml b/soc/renode/cortex_r8_virtual/soc.yml
new file mode 100644
index 00000000000..8d0a0b279da
--- /dev/null
+++ b/soc/renode/cortex_r8_virtual/soc.yml
@@ -0,0 +1,2 @@
+socs:
+  - name: cortex_r8_virtual

From 6e4259d1e4268fce22b1e2fa2e1462fef80afc7a Mon Sep 17 00:00:00 2001
From: Krzysztof Sychla <ksychla@antmicro.com>
Date: Wed, 27 Mar 2024 14:55:54 +0100
Subject: [PATCH 0694/2913] [nrf fromtree] boards: renode: Add virtual
 Cortex-R8 board
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit adds a virtual target using the `cortex_r8_virtual` SoC.
It can be used for testing purposes and a starting point to add new R8
platforms.

Signed-off-by: Krzysztof Sychla <ksychla@antmicro.com>
Signed-off-by: Marek Slowinski <mslowinski@antmicro.com>
Signed-off-by: Piotr Zierhoffer <pzierhoffer@antmicro.com>
Signed-off-by: Mateusz Hołenko <mholenko@antmicro.com>
(cherry picked from commit 92d4a88c7a813e65bab58efc5dd7c8896798d95a)
(cherry picked from commit b7e52a19f4018afa5150ef3648faea91acd44024)
---
 .../Kconfig.cortex_r8_virtual                 |  5 ++
 boards/renode/cortex_r8_virtual/board.cmake   |  6 ++
 boards/renode/cortex_r8_virtual/board.yml     |  5 ++
 .../cortex_r8_virtual/cortex_r8_virtual.dts   | 26 ++++++++
 .../cortex_r8_virtual/cortex_r8_virtual.yaml  | 18 ++++++
 .../cortex_r8_virtual_defconfig               | 22 +++++++
 boards/renode/cortex_r8_virtual/doc/index.rst | 62 +++++++++++++++++++
 .../support/cortex_r8_virtual.repl            | 31 ++++++++++
 .../support/cortex_r8_virtual.resc            | 18 ++++++
 9 files changed, 193 insertions(+)
 create mode 100644 boards/renode/cortex_r8_virtual/Kconfig.cortex_r8_virtual
 create mode 100644 boards/renode/cortex_r8_virtual/board.cmake
 create mode 100644 boards/renode/cortex_r8_virtual/board.yml
 create mode 100644 boards/renode/cortex_r8_virtual/cortex_r8_virtual.dts
 create mode 100644 boards/renode/cortex_r8_virtual/cortex_r8_virtual.yaml
 create mode 100644 boards/renode/cortex_r8_virtual/cortex_r8_virtual_defconfig
 create mode 100644 boards/renode/cortex_r8_virtual/doc/index.rst
 create mode 100644 boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.repl
 create mode 100644 boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.resc

diff --git a/boards/renode/cortex_r8_virtual/Kconfig.cortex_r8_virtual b/boards/renode/cortex_r8_virtual/Kconfig.cortex_r8_virtual
new file mode 100644
index 00000000000..e9830df9f05
--- /dev/null
+++ b/boards/renode/cortex_r8_virtual/Kconfig.cortex_r8_virtual
@@ -0,0 +1,5 @@
+# Copyright (c) 2024 Antmicro <www.antmicro.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_CORTEX_R8_VIRTUAL
+	select SOC_CORTEX_R8_VIRTUAL
diff --git a/boards/renode/cortex_r8_virtual/board.cmake b/boards/renode/cortex_r8_virtual/board.cmake
new file mode 100644
index 00000000000..272149871d0
--- /dev/null
+++ b/boards/renode/cortex_r8_virtual/board.cmake
@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Antmicro <www.antmicro.com>
+# SPDX-License-Identifier: Apache-2.0
+
+set(SUPPORTED_EMU_PLATFORMS renode)
+set(RENODE_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/support/cortex_r8_virtual.resc)
+set(RENODE_UART sysbus.uart0)
diff --git a/boards/renode/cortex_r8_virtual/board.yml b/boards/renode/cortex_r8_virtual/board.yml
new file mode 100644
index 00000000000..799b2a9ba12
--- /dev/null
+++ b/boards/renode/cortex_r8_virtual/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: cortex_r8_virtual
+  vendor: renode
+  socs:
+  - name: cortex_r8_virtual
diff --git a/boards/renode/cortex_r8_virtual/cortex_r8_virtual.dts b/boards/renode/cortex_r8_virtual/cortex_r8_virtual.dts
new file mode 100644
index 00000000000..9e8bd04f7df
--- /dev/null
+++ b/boards/renode/cortex_r8_virtual/cortex_r8_virtual.dts
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2024 Antmicro <www.antmicro.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <cortex_r8_virt.dtsi>
+
+/ {
+	model = "Cortex-R8 Virtual target";
+	compatible = "renode,cortex-r8-virtual";
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+	};
+};
+
+&uart0 {
+	status = "okay";
+	current-speed = <115200>;
+	clock-frequency = <99999901>;
+};
diff --git a/boards/renode/cortex_r8_virtual/cortex_r8_virtual.yaml b/boards/renode/cortex_r8_virtual/cortex_r8_virtual.yaml
new file mode 100644
index 00000000000..8d888e8806c
--- /dev/null
+++ b/boards/renode/cortex_r8_virtual/cortex_r8_virtual.yaml
@@ -0,0 +1,18 @@
+identifier: cortex_r8_virtual
+name: Cortex R8 Virtual Board
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+ram: 131072
+simulation: renode
+simulation_exec: renode
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
+  renode:
+    uart: sysbus.uart0
+    resc: boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.resc
+supported:
+  - uart
diff --git a/boards/renode/cortex_r8_virtual/cortex_r8_virtual_defconfig b/boards/renode/cortex_r8_virtual/cortex_r8_virtual_defconfig
new file mode 100644
index 00000000000..1c358355b1e
--- /dev/null
+++ b/boards/renode/cortex_r8_virtual/cortex_r8_virtual_defconfig
@@ -0,0 +1,22 @@
+# Copyright (c) 2024 Antmicro <www.antmicro.com>
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_XIP=n
+
+CONFIG_ISR_STACK_SIZE=512
+CONFIG_THREAD_STACK_INFO=y
+
+CONFIG_MAX_DOMAIN_PARTITIONS=24
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable serial port
+CONFIG_UART_XLNX_PS=y
+
+CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
+CONFIG_ARM_MPU=y
diff --git a/boards/renode/cortex_r8_virtual/doc/index.rst b/boards/renode/cortex_r8_virtual/doc/index.rst
new file mode 100644
index 00000000000..07a18a77650
--- /dev/null
+++ b/boards/renode/cortex_r8_virtual/doc/index.rst
@@ -0,0 +1,62 @@
+.. _cortex_r8_virtual:
+
+Cortex-R8 Virtual
+#################
+
+Overview
+********
+
+The Cortex-R8 Virtual board is a virtual platform that can be emulated with Renode.
+Edit the :zephyr_file:`boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.repl` file to adapt the platform layout to your needs.
+
+Refer to the `Renode documentation <https://renode.readthedocs.io/en/latest/>`_
+to learn how to obtain Renode for your host.
+
+Programming and debugging
+*************************
+
+Building
+========
+
+Applications for the ``cortex_r8_virtual`` board target can be built
+using the standard build flow (see :ref:`build_an_application`):
+
+.. zephyr-app-commands::
+   :board: cortex_r8_virtual
+   :goals: build
+
+Flashing
+========
+
+Your software will run in simulation and you don't need to "flash" the board in a traditional way,
+but you can use this configuration to run Zephyr applications
+and kernel tests directly in Renode with the use of the ``run`` command.
+
+For example, with the :zephyr:code-sample:`synchronization` sample:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/synchronization
+   :host-os: unix
+   :board: cortex_r8_virtual
+   :goals: run
+
+This will build an image with the synchronization sample app, boot it using
+Renode, and display the following console output:
+
+.. code-block:: console
+
+        *** Booting Zephyr OS build v3.6.0-5689-g2a5c606abfa7 ***
+        thread_a: Hello World from cpu 0 on cortex_r8_virtual!
+        thread_b: Hello World from cpu 0 on cortex_r8_virtual!
+        thread_a: Hello World from cpu 0 on cortex_r8_virtual!
+        thread_b: Hello World from cpu 0 on cortex_r8_virtual!
+
+Exit Renode by pressing :kbd:`CTRL+C`.
+
+Debugging
+=========
+
+Refer to the detailed overview about :ref:`application_debugging`.
+
+Renode can serve as a GDB server. For more information, refer to the
+`Renode documentation about GDB debugging <https://renode.readthedocs.io/en/latest/debugging/gdb.html>`_.
diff --git a/boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.repl b/boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.repl
new file mode 100644
index 00000000000..2c4c9d4cc6f
--- /dev/null
+++ b/boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.repl
@@ -0,0 +1,31 @@
+cpu: CPU.ARMv7R @ sysbus
+    cpuType: "cortex-r8"
+    genericInterruptController: gic
+    numberOfMPURegions: 24
+    cpuId: 0
+
+scu: Miscellaneous.ArmSnoopControlUnit @ sysbus 0xae000000
+
+gic: IRQControllers.ARM_GenericInterruptController @ {
+        sysbus new Bus.BusMultiRegistration { address: 0xf9001000; size: 0x100; region: "cpuInterface" };
+        sysbus new Bus.BusMultiRegistration { address: 0xf9000000; size: 0x1000; region: "distributor" }
+    }
+    [0,1] -> cpu@[0,1]
+    architectureVersion: IRQControllers.ARM_GenericInterruptControllerVersion.GICv1
+    supportsTwoSecurityStates: false
+
+privateTimer0: Timers.ARM_PrivateTimer @ {
+        sysbus new Bus.BusPointRegistration { address: 0xae000600; cpu: cpu }
+    }
+    -> gic#0@29
+    frequency: 667000000
+
+mem: Memory.MappedMemory @ sysbus 0x0
+    size: 0x8000000
+
+uart0: UART.Cadence_UART @ sysbus 0xff000000
+    -> gic@21
+
+ttc0: Timers.Cadence_TTC @ sysbus 0xff110000
+    [0-2] -> gic@[36-38]
+    frequency: 5000000
diff --git a/boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.resc b/boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.resc
new file mode 100644
index 00000000000..6fbf739750a
--- /dev/null
+++ b/boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.resc
@@ -0,0 +1,18 @@
+:name: Cortex-R8-Virtual
+:description: This script is prepared to run Zephyr on a virtual Cortex-R8 board.
+
+$name?="Cortex-R8-Virtual"
+
+using sysbus
+mach create $name
+machine LoadPlatformDescription $ORIGIN/cortex_r8_virtual.repl
+
+
+showAnalyzer uart0
+cpu PerformanceInMips 5
+
+macro reset
+"""
+    sysbus LoadELF $elf
+"""
+runMacro $reset

From d1900a66eb7a1e59304dd7e84fc228194620de81 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Fri, 22 Nov 2024 12:26:57 +0100
Subject: [PATCH 0695/2913] [nrf noup] revertme: Cover up merge conflicts

This automated patch is inserted before a cherry-pick of:

50ffc77 boards: add board full_name field

This allows the above commit to be applied cleanly, even though it
appears to conflict with the following commit(s):

ad3a56e [nrf fromlist] cmake: scripts: support board extension

The conflicts are left to be fixed in a follow-up patch, instead of
doing so in the cherry-pick itself.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit a888d4a04177801f5a9c43dc5675019257bf555e)
---
 scripts/schemas/board-schema.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/schemas/board-schema.yml b/scripts/schemas/board-schema.yml
index 3ca85af73c6..c24c7f0b4d1 100644
--- a/scripts/schemas/board-schema.yml
+++ b/scripts/schemas/board-schema.yml
@@ -43,9 +43,6 @@ schema;board-schema:
       required: false # Note: either name or extend is required, but that is handled in python
       type: str
       desc: Name of the board
-    extend:
-      required: false # Note: either name or extend is required, but that is handled in python
-      type: str
     vendor:
       required: false
       type: str

From 73c99fe49b57c22074d20706c804bdac6b2a4cf5 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Fri, 4 Oct 2024 07:20:29 -0400
Subject: [PATCH 0696/2913] [nrf fromtree] boards: add board full_name field

Full name or description of a board is something we are missing in
HWVv2. It is right now being added to yaml files parsed by twister. This
should be generically available to tooling and documentation
independently from twister.

As we rework how twister parses board meta-data (#77250) and how we
generate board documentation (#79160), this becomes neceassry.

Moving the board full name/description from the twister yaml files to
the board.yaml is something we can automate once the schema is agreed
upon.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
(cherry picked from commit 50ffc771bf089fc705da6f7e88fcc0b7aec6318f)
(cherry picked from commit 64e76de0290facade8aa250fdcb88be8ebeb1c44)
---
 scripts/list_boards.py           | 2 ++
 scripts/schemas/board-schema.yml | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/scripts/list_boards.py b/scripts/list_boards.py
index c2b8e3740b3..9c21e53541a 100755
--- a/scripts/list_boards.py
+++ b/scripts/list_boards.py
@@ -94,6 +94,7 @@ class Board:
     # HWMv1 only supports a single Path, and requires Board dataclass to be hashable.
     directories: Union[Path, List[Path]]
     hwm: str
+    full_name: str = None
     arch: str = None
     vendor: str = None
     revision_format: str = None
@@ -278,6 +279,7 @@ def load_v2_boards(board_name, board_yml, systems):
                 name=board['name'],
                 directories=[board_yml.parent],
                 vendor=board.get('vendor'),
+                full_name=board.get('full_name'),
                 revision_format=board.get('revision', {}).get('format'),
                 revision_default=board.get('revision', {}).get('default'),
                 revision_exact=board.get('revision', {}).get('exact', False),
diff --git a/scripts/schemas/board-schema.yml b/scripts/schemas/board-schema.yml
index c24c7f0b4d1..94f291580c1 100644
--- a/scripts/schemas/board-schema.yml
+++ b/scripts/schemas/board-schema.yml
@@ -43,6 +43,10 @@ schema;board-schema:
       required: false # Note: either name or extend is required, but that is handled in python
       type: str
       desc: Name of the board
+    full_name:
+      required: false
+      type: str
+      desc: Full name of the board. Typically set to the commercial name of the board.
     vendor:
       required: false
       type: str

From eb8407396e80830d893bd969d545ec4ec50a4507 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Fri, 22 Nov 2024 12:26:57 +0100
Subject: [PATCH 0697/2913] [nrf noup] revertme: Resolve merge conflicts

This patch finalizes the 3-way merge between:

50ffc77 boards: add board full_name field

and:

ad3a56e [nrf fromlist] cmake: scripts: support board extension

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 16ffccd9006775ad16eb3e8797819b8531675c40)
---
 scripts/schemas/board-schema.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/schemas/board-schema.yml b/scripts/schemas/board-schema.yml
index 94f291580c1..4c86c9d000c 100644
--- a/scripts/schemas/board-schema.yml
+++ b/scripts/schemas/board-schema.yml
@@ -47,6 +47,9 @@ schema;board-schema:
       required: false
       type: str
       desc: Full name of the board. Typically set to the commercial name of the board.
+    extend:
+      required: false # Note: either name or extend is required, but that is handled in python
+      type: str
     vendor:
       required: false
       type: str

From 432b3468c4bb9e81659f7990ba7f910632c9cf40 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Fri, 4 Oct 2024 08:20:00 -0400
Subject: [PATCH 0698/2913] [nrf fromtree] boards: qemu_x86: add board
 description

Use the description field for the full name/description of the boards.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
(cherry picked from commit 55489f5787fb04c2a6713ac5d1760012f4c19254)
(cherry picked from commit 9e8730cc1a82f63cf762efa1e22da65837a0138f)
---
 boards/qemu/x86/board.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/boards/qemu/x86/board.yml b/boards/qemu/x86/board.yml
index 75d0cd6eb4b..dafcffba24f 100644
--- a/boards/qemu/x86/board.yml
+++ b/boards/qemu/x86/board.yml
@@ -1,6 +1,7 @@
 boards:
 
   - name: qemu_x86
+    full_name: 'QEMU Emulation for X86'
     socs:
       - name: atom
         variants:
@@ -11,15 +12,18 @@ boards:
           - name: 'xip'
 
   - name: qemu_x86_lakemont
+    full_name: 'QEMU Emulation for X86 / Lakemont CPU'
     socs:
       - name: lakemont
 
   - name: qemu_x86_64
+    full_name: 'QEMU Emulation for X86 64bit'
     socs:
       - name: atom
         variants:
           - name: 'nokpti'
 
   - name: qemu_x86_tiny
+    full_name: 'QEMU Emulation for X86 Minimal Configuration'
     socs:
       - name: atom

From 755861bed7934f02c19bd4b92a85b60f99cee74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Cab=C3=A9?= <benjamin@zephyrproject.org>
Date: Wed, 9 Oct 2024 10:00:48 +0200
Subject: [PATCH 0699/2913] [nrf fromtree] west: boards: add full_name support
 in format string
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The recently introduced board.full_name property can now be used as part
of the format string in the `west boards -f ...` command.

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
(cherry picked from commit acbda31707a7afe54a0d878adcf710b7ba87ee7e)
(cherry picked from commit 96a76412f17191622bdf77f994c53ea505151b23)
---
 scripts/west_commands/boards.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/west_commands/boards.py b/scripts/west_commands/boards.py
index f329ea54217..6c4ee168466 100644
--- a/scripts/west_commands/boards.py
+++ b/scripts/west_commands/boards.py
@@ -49,6 +49,7 @@ def do_add_parser(self, parser_adder):
             The following arguments are available:
 
             - name: board name
+            - full_name: board full name (typically, its commercial name)
             - qualifiers: board qualifiers (will be empty for legacy boards)
             - arch: board architecture (deprecated)
                     (arch is ambiguous for boards described in new hw model)
@@ -102,6 +103,7 @@ def do_run(self, args, _):
             log.inf(
                 args.format.format(
                     name=board.name,
+                    full_name=board.full_name,
                     dir=board.dir,
                     hwm=board.hwm,
                     vendor=board.vendor,

From fc2f0301cd28a1bceed299a88d4a82bfb69d8ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Cab=C3=A9?= <benjamin@zephyrproject.org>
Date: Tue, 8 Oct 2024 20:03:25 +0200
Subject: [PATCH 0700/2913] [nrf fromtree] boards: Set full_name for all boards
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Full name was set based on the information available either in board
documentation or in Twister files.
Whenever applicable, vendor name was dropped from the full name so that
all boards have a consistent naming scheme.

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
(cherry picked from commit 05d59f720731c66e0129bbfceff3eba64ca2ef14)
(cherry picked from commit 7dddb0bd0c1f1d3c48e544421ddc1570c26549fe)
---
 boards/01space/esp32c3_042_oled/board.yml              | 1 +
 boards/96boards/aerocore2/board.yml                    | 1 +
 boards/96boards/argonkey/board.yml                     | 1 +
 boards/96boards/avenger96/board.yml                    | 1 +
 boards/96boards/carbon/board.yml                       | 1 +
 boards/96boards/meerkat96/board.yml                    | 1 +
 boards/96boards/neonkey/board.yml                      | 1 +
 boards/96boards/nitrogen/board.yml                     | 1 +
 boards/96boards/stm32_sensor_mez/board.yml             | 1 +
 boards/96boards/wistrio/board.yml                      | 1 +
 boards/aconno/acn52832/board.yml                       | 1 +
 boards/acrn/acrn/board.yml                             | 2 ++
 boards/actinius/icarus/board.yml                       | 1 +
 boards/actinius/icarus_bee/board.yml                   | 1 +
 boards/actinius/icarus_som/board.yml                   | 1 +
 boards/actinius/icarus_som_dk/board.yml                | 1 +
 boards/adafruit/feather_m0_basic_proto/board.yml       | 1 +
 boards/adafruit/feather_m0_lora/board.yml              | 1 +
 boards/adafruit/feather_nrf52840/board.yml             | 1 +
 boards/adafruit/feather_stm32f405/board.yml            | 1 +
 boards/adafruit/grand_central_m4_express/board.yml     | 1 +
 boards/adafruit/itsybitsy/board.yml                    | 1 +
 boards/adafruit/itsybitsy_m4_express/board.yml         | 1 +
 boards/adafruit/kb2040/board.yml                       | 1 +
 boards/adafruit/nrf52_adafruit_feather/board.yml       | 1 +
 boards/adafruit/qt_py_rp2040/board.yml                 | 1 +
 boards/adafruit/trinket_m0/board.yml                   | 1 +
 boards/adi/apard32690/board.yml                        | 1 +
 boards/adi/eval_adin1110ebz/board.yml                  | 1 +
 boards/adi/eval_adin2111ebz/board.yml                  | 1 +
 boards/adi/max32655evkit/board.yml                     | 1 +
 boards/adi/max32655fthr/board.yml                      | 1 +
 boards/adi/max32662evkit/board.yml                     | 1 +
 boards/adi/max32666evkit/board.yml                     | 1 +
 boards/adi/max32666fthr/board.yml                      | 1 +
 boards/adi/max32670evkit/board.yml                     | 1 +
 boards/adi/max32672evkit/board.yml                     | 1 +
 boards/adi/max32672fthr/board.yml                      | 1 +
 boards/adi/max32675evkit/board.yml                     | 1 +
 boards/adi/max32680evkit/board.yml                     | 1 +
 boards/adi/max32690evkit/board.yml                     | 1 +
 boards/adi/max32690fthr/board.yml                      | 1 +
 boards/adi/sdp_k1/board.yml                            | 1 +
 boards/alientek/pandora_stm32l475/board.yml            | 1 +
 boards/altr/max10/board.yml                            | 1 +
 boards/ambiq/apollo3_evb/board.yml                     | 1 +
 boards/ambiq/apollo3p_evb/board.yml                    | 1 +
 boards/ambiq/apollo4p_blue_kxr_evb/board.yml           | 1 +
 boards/ambiq/apollo4p_evb/board.yml                    | 1 +
 boards/amd/kv260_r5/board.yml                          | 1 +
 boards/andestech/adp_xc7k_ae350/board.yml              | 1 +
 boards/arduino/due/board.yml                           | 1 +
 boards/arduino/giga_r1/board.yml                       | 1 +
 boards/arduino/mkrzero/board.yml                       | 1 +
 boards/arduino/nano_33_ble/board.yml                   | 1 +
 boards/arduino/nano_33_iot/board.yml                   | 1 +
 boards/arduino/nicla_sense_me/board.yml                | 1 +
 boards/arduino/nicla_vision/board.yml                  | 1 +
 boards/arduino/opta/board.yml                          | 1 +
 boards/arduino/portenta_h7/board.yml                   | 1 +
 boards/arduino/uno_r4/board.yml                        | 2 ++
 boards/arduino/zero/board.yml                          | 1 +
 boards/arm/fvp_base_revc_2xaemv8a/board.yml            | 1 +
 boards/arm/fvp_baser_aemv8r/board.yml                  | 1 +
 boards/arm/mps2/board.yml                              | 1 +
 boards/arm/mps3/board.yml                              | 1 +
 boards/arm/v2m_beetle/board.yml                        | 1 +
 boards/arm/v2m_musca_b1/board.yml                      | 1 +
 boards/arm/v2m_musca_s1/board.yml                      | 1 +
 boards/aspeed/ast1030_evb/board.yml                    | 1 +
 boards/atmarktechno/degu_evk/board.yml                 | 1 +
 boards/atmel/sam/sam4e_xpro/board.yml                  | 1 +
 boards/atmel/sam/sam4l_ek/board.yml                    | 1 +
 boards/atmel/sam/sam4s_xplained/board.yml              | 1 +
 boards/atmel/sam/sam_e70_xplained/board.yml            | 1 +
 boards/atmel/sam/sam_v71_xult/board.yml                | 1 +
 boards/atmel/sam0/samc21n_xpro/board.yml               | 1 +
 boards/atmel/sam0/samd20_xpro/board.yml                | 1 +
 boards/atmel/sam0/samd21_xpro/board.yml                | 1 +
 boards/atmel/sam0/same54_xpro/board.yml                | 1 +
 boards/atmel/sam0/saml21_xpro/board.yml                | 1 +
 boards/atmel/sam0/samr21_xpro/board.yml                | 1 +
 boards/atmel/sam0/samr34_xpro/board.yml                | 1 +
 boards/bbc/microbit/board.yml                          | 1 +
 boards/bbc/microbit_v2/board.yml                       | 1 +
 boards/bcdevices/plt_demo_v2/board.yml                 | 1 +
 boards/beagle/beagleconnect_freedom/board.yml          | 1 +
 boards/beagle/beagleplay/board.yml                     | 1 +
 boards/beagle/beaglev_fire/board.yml                   | 1 +
 boards/blues/swan_r5/board.yml                         | 1 +
 boards/brcm/bcm958401m2/board.yml                      | 1 +
 boards/brcm/bcm958402m2/board.yml                      | 1 +
 boards/bytesatwork/bytesensi_l/board.yml               | 1 +
 boards/cdns/xt-sim/board.yml                           | 1 +
 boards/circuitdojo/feather/board.yml                   | 1 +
 boards/contextualelectronics/abc/board.yml             | 1 +
 boards/croxel/croxel_cx1825/board.yml                  | 1 +
 boards/ct/ctcc/board.yml                               | 1 +
 boards/cypress/cy8ckit_062_ble/board.yml               | 1 +
 boards/cypress/cy8ckit_062_wifi_bt/board.yml           | 1 +
 boards/digilent/arty_a7/board.yml                      | 1 +
 boards/digilent/zybo/board.yml                         | 1 +
 boards/dptechnics/walter/board.yml                     | 1 +
 boards/dragino/lsn50/board.yml                         | 1 +
 boards/dragino/nbsn95/board.yml                        | 1 +
 boards/ebyte/e73_tbb/board.yml                         | 1 +
 boards/efinix/titanium_ti60_f225/board.yml             | 1 +
 boards/electronut/nrf52840_blip/board.yml              | 1 +
 boards/electronut/nrf52840_papyr/board.yml             | 1 +
 boards/element14/warp7/board.yml                       | 1 +
 boards/enclustra/mercury_xu/board.yml                  | 1 +
 boards/ene/kb1200_evb/board.yml                        | 1 +
 boards/enjoydigital/litex_vexriscv/board.yml           | 1 +
 boards/espressif/esp32_devkitc_wroom/board.yml         | 1 +
 boards/espressif/esp32_devkitc_wrover/board.yml        | 1 +
 boards/espressif/esp32_ethernet_kit/board.yml          | 1 +
 boards/espressif/esp32c3_devkitc/board.yml             | 1 +
 boards/espressif/esp32c3_devkitm/board.yml             | 1 +
 boards/espressif/esp32c3_rust/board.yml                | 1 +
 boards/espressif/esp32c6_devkitc/board.yml             | 1 +
 boards/espressif/esp32s2_devkitc/board.yml             | 1 +
 boards/espressif/esp32s2_saola/board.yml               | 1 +
 boards/espressif/esp32s3_devkitc/board.yml             | 1 +
 boards/espressif/esp32s3_devkitm/board.yml             | 1 +
 boards/espressif/esp32s3_eye/board.yml                 | 1 +
 boards/espressif/esp8684_devkitm/board.yml             | 1 +
 boards/espressif/esp_wrover_kit/board.yml              | 1 +
 boards/ezurio/bl5340_dvk/board.yml                     | 1 +
 boards/ezurio/bl652_dvk/board.yml                      | 1 +
 boards/ezurio/bl653_dvk/board.yml                      | 1 +
 boards/ezurio/bl654_dvk/board.yml                      | 1 +
 boards/ezurio/bl654_sensor_board/board.yml             | 1 +
 boards/ezurio/bl654_usb/board.yml                      | 1 +
 boards/ezurio/bt510/board.yml                          | 1 +
 boards/ezurio/bt610/board.yml                          | 1 +
 boards/ezurio/mg100/board.yml                          | 1 +
 boards/ezurio/pinnacle_100_dvk/board.yml               | 1 +
 boards/ezurio/rm1xx_dvk/board.yml                      | 1 +
 boards/fanke/fk7b0m1_vbt6/board.yml                    | 1 +
 boards/firefly/roc_rk3568_pc/board.yml                 | 1 +
 boards/franzininho/esp32s2_franzininho/board.yml       | 1 +
 boards/gaisler/generic_leon3/board.yml                 | 1 +
 boards/gaisler/gr716a_mini/board.yml                   | 1 +
 boards/gd/gd32a503v_eval/board.yml                     | 1 +
 boards/gd/gd32e103v_eval/board.yml                     | 1 +
 boards/gd/gd32e507v_start/board.yml                    | 1 +
 boards/gd/gd32e507z_eval/board.yml                     | 1 +
 boards/gd/gd32f350r_eval/board.yml                     | 1 +
 boards/gd/gd32f403z_eval/board.yml                     | 1 +
 boards/gd/gd32f407v_start/board.yml                    | 1 +
 boards/gd/gd32f450i_eval/board.yml                     | 1 +
 boards/gd/gd32f450v_start/board.yml                    | 1 +
 boards/gd/gd32f450z_eval/board.yml                     | 1 +
 boards/gd/gd32f470i_eval/board.yml                     | 1 +
 boards/gd/gd32l233r_eval/board.yml                     | 1 +
 boards/gd/gd32vf103c_starter/board.yml                 | 1 +
 boards/gd/gd32vf103v_eval/board.yml                    | 1 +
 boards/google/dragonclaw/board.yml                     | 1 +
 boards/google/twinkie_v2/board.yml                     | 1 +
 boards/hardkernel/odroid_go/board.yml                  | 1 +
 boards/heltec/heltec_wifi_lora32_v2/board.yml          | 1 +
 boards/heltec/heltec_wireless_stick_lite_v3/board.yml  | 1 +
 boards/holyiot/yj16019/board.yml                       | 1 +
 boards/infineon/cy8ckit_062s4/board.yml                | 1 +
 boards/infineon/cy8cproto_062_4343w/board.yml          | 1 +
 boards/infineon/cy8cproto_063_ble/board.yml            | 1 +
 boards/infineon/cyw920829m2evk_02/board.yml            | 1 +
 boards/infineon/xmc45_relax_kit/board.yml              | 1 +
 boards/infineon/xmc47_relax_kit/board.yml              | 1 +
 boards/innblue/innblue21/board.yml                     | 1 +
 boards/innblue/innblue22/board.yml                     | 1 +
 boards/intel/adl/board.yml                             | 2 ++
 boards/intel/adsp/board.yml                            | 1 +
 boards/intel/ehl/board.yml                             | 1 +
 boards/intel/ish/board.yml                             | 3 +++
 boards/intel/niosv_g/board.yml                         | 1 +
 boards/intel/niosv_m/board.yml                         | 1 +
 boards/intel/rpl/board.yml                             | 2 ++
 boards/intel/socfpga/agilex5_socdk/board.yml           | 1 +
 boards/intel/socfpga/agilex_socdk/board.yml            | 1 +
 boards/intel/socfpga_std/cyclonev_socdk/board.yml      | 1 +
 boards/ite/it82xx2_evb/board.yml                       | 1 +
 boards/ite/it8xxx2_evb/board.yml                       | 1 +
 boards/khadas/edgev/board.yml                          | 1 +
 boards/kincony/kincony_kc868_a32/board.yml             | 1 +
 boards/lilygo/ttgo_lora32/board.yml                    | 1 +
 boards/lilygo/ttgo_t8c3/board.yml                      | 1 +
 boards/lowrisc/opentitan_earlgrey/board.yml            | 1 +
 boards/luatos/esp32c3_luatos_core/board.yml            | 1 +
 boards/luatos/esp32s3_luatos_core/board.yml            | 1 +
 boards/m5stack/m5stack_atom_lite/board.yml             | 1 +
 boards/m5stack/m5stack_atoms3/board.yml                | 1 +
 boards/m5stack/m5stack_atoms3_lite/board.yml           | 1 +
 boards/m5stack/m5stack_core2/board.yml                 | 1 +
 boards/m5stack/m5stack_stamps3/board.yml               | 1 +
 boards/m5stack/m5stickc_plus/board.yml                 | 1 +
 boards/m5stack/stamp_c3/board.yml                      | 1 +
 boards/madmachine/mm_feather/board.yml                 | 1 +
 boards/madmachine/mm_swiftio/board.yml                 | 1 +
 boards/makerdiary/nrf52832_mdk/board.yml               | 1 +
 boards/makerdiary/nrf52840_mdk/board.yml               | 1 +
 boards/makerdiary/nrf52840_mdk_usb_dongle/board.yml    | 1 +
 boards/mediatek/mt8195_adsp/board.yml                  | 1 +
 boards/microchip/ev11l78a/board.yml                    | 1 +
 boards/microchip/m2gl025_miv/board.yml                 | 1 +
 boards/microchip/mec1501modular_assy6885/board.yml     | 1 +
 boards/microchip/mec15xxevb_assy6853/board.yml         | 1 +
 boards/microchip/mec172xevb_assy6906/board.yml         | 1 +
 boards/microchip/mec172xmodular_assy6930/board.yml     | 1 +
 boards/microchip/mpfs_icicle/board.yml                 | 1 +
 boards/mikroe/clicker_2/board.yml                      | 1 +
 boards/mikroe/clicker_ra4m1/board.yml                  | 1 +
 boards/mikroe/mini_m4_for_stm32/board.yml              | 1 +
 boards/mikroe/stm32_m4_clicker/board.yml               | 1 +
 boards/mxchip/az3166_iotdevkit/board.yml               | 1 +
 boards/native/native_posix/board.yml                   | 1 +
 boards/native/native_sim/board.yml                     | 1 +
 boards/native/nrf_bsim/board.yml                       | 3 +++
 boards/nordic/nrf21540dk/board.yml                     | 1 +
 boards/nordic/nrf51dk/board.yml                        | 1 +
 boards/nordic/nrf51dongle/board.yml                    | 1 +
 boards/nordic/nrf52833dk/board.yml                     | 1 +
 boards/nordic/nrf52840dk/board.yml                     | 1 +
 boards/nordic/nrf52840dongle/board.yml                 | 1 +
 boards/nordic/nrf52dk/board.yml                        | 1 +
 boards/nordic/nrf5340_audio_dk/board.yml               | 1 +
 boards/nordic/nrf5340dk/board.yml                      | 1 +
 boards/nordic/nrf54h20dk/board.yml                     | 1 +
 boards/nordic/nrf54l15dk/board.yml                     | 1 +
 boards/nordic/nrf54l15pdk/board.yml                    | 1 +
 boards/nordic/nrf54l20pdk/board.yml                    | 1 +
 boards/nordic/nrf7002dk/board.yml                      | 1 +
 boards/nordic/nrf9131ek/board.yml                      | 1 +
 boards/nordic/nrf9151dk/board.yml                      | 1 +
 boards/nordic/nrf9160dk/board.yml                      | 1 +
 boards/nordic/nrf9161dk/board.yml                      | 1 +
 boards/nordic/nrf9280pdk/board.yml                     | 1 +
 boards/nordic/thingy52/board.yml                       | 1 +
 boards/nordic/thingy53/board.yml                       | 1 +
 boards/nuvoton/npcm400_evb/board.yml                   | 1 +
 boards/nuvoton/npcx4m8f_evb/board.yml                  | 1 +
 boards/nuvoton/npcx7m6fb_evb/board.yml                 | 1 +
 boards/nuvoton/npcx9m6f_evb/board.yml                  | 1 +
 boards/nuvoton/numaker_m2l31ki/board.yml               | 1 +
 boards/nuvoton/numaker_pfm_m467/board.yml              | 1 +
 boards/nuvoton/numaker_pfm_m487/board.yml              | 1 +
 boards/nxp/frdm_k22f/board.yml                         | 1 +
 boards/nxp/frdm_k64f/board.yml                         | 1 +
 boards/nxp/frdm_k82f/board.yml                         | 1 +
 boards/nxp/frdm_ke15z/board.yml                        | 1 +
 boards/nxp/frdm_ke17z/board.yml                        | 1 +
 boards/nxp/frdm_ke17z512/board.yml                     | 1 +
 boards/nxp/frdm_kl25z/board.yml                        | 1 +
 boards/nxp/frdm_kw41z/board.yml                        | 1 +
 boards/nxp/frdm_mcxa156/board.yml                      | 1 +
 boards/nxp/frdm_mcxc242/board.yml                      | 1 +
 boards/nxp/frdm_mcxc444/board.yml                      | 1 +
 boards/nxp/frdm_mcxn236/board.yml                      | 1 +
 boards/nxp/frdm_mcxn947/board.yml                      | 1 +
 boards/nxp/frdm_mcxw71/board.yml                       | 1 +
 boards/nxp/frdm_rw612/board.yml                        | 1 +
 boards/nxp/hexiwear/board.yml                          | 1 +
 boards/nxp/imx8mm_evk/board.yml                        | 1 +
 boards/nxp/imx8mn_evk/board.yml                        | 1 +
 boards/nxp/imx8mp_evk/board.yml                        | 1 +
 boards/nxp/imx8mq_evk/board.yml                        | 1 +
 boards/nxp/imx8qm_mek/board.yml                        | 1 +
 boards/nxp/imx8qxp_mek/board.yml                       | 1 +
 boards/nxp/imx8ulp_evk/board.yml                       | 1 +
 boards/nxp/imx93_evk/board.yml                         | 1 +
 boards/nxp/imx95_evk/board.yml                         | 1 +
 boards/nxp/lpcxpresso11u68/board.yml                   | 1 +
 boards/nxp/lpcxpresso51u68/board.yml                   | 1 +
 boards/nxp/lpcxpresso54114/board.yml                   | 1 +
 boards/nxp/lpcxpresso55s06/board.yml                   | 1 +
 boards/nxp/lpcxpresso55s16/board.yml                   | 1 +
 boards/nxp/lpcxpresso55s28/board.yml                   | 1 +
 boards/nxp/lpcxpresso55s36/board.yml                   | 1 +
 boards/nxp/lpcxpresso55s69/board.yml                   | 1 +
 boards/nxp/ls1046ardb/board.yml                        | 1 +
 boards/nxp/mimxrt1010_evk/board.yml                    | 1 +
 boards/nxp/mimxrt1015_evk/board.yml                    | 1 +
 boards/nxp/mimxrt1020_evk/board.yml                    | 1 +
 boards/nxp/mimxrt1024_evk/board.yml                    | 1 +
 boards/nxp/mimxrt1040_evk/board.yml                    | 1 +
 boards/nxp/mimxrt1050_evk/board.yml                    | 1 +
 boards/nxp/mimxrt1060_evk/board.yml                    | 2 ++
 boards/nxp/mimxrt1062_fmurt6/board.yml                 | 1 +
 boards/nxp/mimxrt1064_evk/board.yml                    | 1 +
 boards/nxp/mimxrt1160_evk/board.yml                    | 1 +
 boards/nxp/mimxrt1170_evk/board.yml                    | 1 +
 boards/nxp/mimxrt1180_evk/board.yml                    | 1 +
 boards/nxp/mimxrt595_evk/board.yml                     | 1 +
 boards/nxp/mimxrt685_evk/board.yml                     | 1 +
 boards/nxp/mr_canhubk3/board.yml                       | 1 +
 boards/nxp/rd_rw612_bga/board.yml                      | 1 +
 boards/nxp/rddrone_fmuk66/board.yml                    | 1 +
 boards/nxp/s32z2xxdc2/board.yml                        | 1 +
 boards/nxp/twr_ke18f/board.yml                         | 1 +
 boards/nxp/twr_kv58f220m/board.yml                     | 1 +
 boards/nxp/ucans32k1sic/board.yml                      | 1 +
 boards/nxp/usb_kw24d512/board.yml                      | 1 +
 boards/nxp/vmu_rt1170/board.yml                        | 1 +
 boards/olimex/lora_stm32wl_devkit/board.yml            | 1 +
 boards/olimex/olimex_esp32_evb/board.yml               | 1 +
 boards/olimex/olimexino_stm32/board.yml                | 1 +
 boards/olimex/stm32_e407/board.yml                     | 1 +
 boards/olimex/stm32_h103/board.yml                     | 1 +
 boards/olimex/stm32_h405/board.yml                     | 1 +
 boards/olimex/stm32_h407/board.yml                     | 1 +
 boards/olimex/stm32_p405/board.yml                     | 1 +
 boards/openisa/rv32m1_vega/board.yml                   | 1 +
 boards/others/black_f407ve/board.yml                   | 1 +
 boards/others/black_f407zg_pro/board.yml               | 1 +
 boards/others/icev_wireless/board.yml                  | 1 +
 boards/others/neorv32/board.yml                        | 1 +
 boards/others/serpente/board.yml                       | 1 +
 boards/others/stm32_min_dev/board.yml                  | 1 +
 boards/others/stm32f030_demo/board.yml                 | 1 +
 boards/others/stm32f103_mini/board.yml                 | 1 +
 boards/others/stm32f401_mini/board.yml                 | 1 +
 boards/panasonic/pan1770_evb/board.yml                 | 1 +
 boards/panasonic/pan1780_evb/board.yml                 | 1 +
 boards/panasonic/pan1781_evb/board.yml                 | 1 +
 boards/panasonic/pan1782_evb/board.yml                 | 1 +
 boards/panasonic/pan1783/board.yml                     | 3 +++
 boards/particle/argon/board.yml                        | 1 +
 boards/particle/boron/board.yml                        | 1 +
 boards/particle/nrf51_blenano/board.yml                | 1 +
 boards/particle/nrf52_blenano2/board.yml               | 1 +
 boards/particle/xenon/board.yml                        | 1 +
 boards/phytec/mimx8mm_phyboard_polis/board.yml         | 1 +
 boards/phytec/mimx8mp_phyboard_pollux/board.yml        | 1 +
 boards/phytec/phyboard_electra/board.yml               | 1 +
 boards/phytec/phyboard_lyra/board.yml                  | 1 +
 boards/phytec/reel_board/board.yml                     | 1 +
 boards/pine64/pinetime_devkit0/board.yml               | 1 +
 boards/pjrc/teensy4/board.yml                          | 2 ++
 boards/qemu/arc/board.yml                              | 1 +
 boards/qemu/cortex_a53/board.yml                       | 1 +
 boards/qemu/cortex_a9/board.yml                        | 1 +
 boards/qemu/cortex_m0/board.yml                        | 1 +
 boards/qemu/cortex_m3/board.yml                        | 1 +
 boards/qemu/cortex_r5/board.yml                        | 1 +
 boards/qemu/kvm_arm64/board.yml                        | 1 +
 boards/qemu/leon3/board.yml                            | 1 +
 boards/qemu/malta/board.yml                            | 1 +
 boards/qemu/nios2/board.yml                            | 1 +
 boards/qemu/riscv32/board.yml                          | 1 +
 boards/qemu/riscv32_xip/board.yml                      | 1 +
 boards/qemu/riscv32e/board.yml                         | 1 +
 boards/qemu/riscv64/board.yml                          | 1 +
 boards/qemu/x86/board.yml                              | 8 ++++----
 boards/qemu/xtensa/board.yml                           | 1 +
 boards/qorvo/decawave_dwm1001_dev/board.yml            | 1 +
 boards/quicklogic/qomu/board.yml                       | 1 +
 boards/quicklogic/quick_feather/board.yml              | 1 +
 boards/rak/rak11720/board.yml                          | 1 +
 boards/rak/rak4631/board.yml                           | 1 +
 boards/rak/rak5010/board.yml                           | 1 +
 boards/raspberrypi/rpi_4b/board.yml                    | 1 +
 boards/raspberrypi/rpi_5/board.yml                     | 1 +
 boards/raspberrypi/rpi_pico/board.yml                  | 1 +
 boards/raytac/mdbt50q_db_33/board.yml                  | 1 +
 boards/raytac/mdbt50q_db_40/board.yml                  | 1 +
 boards/raytac/mdbt53_db_40/board.yml                   | 1 +
 boards/raytac/mdbt53v_db_40/board.yml                  | 1 +
 boards/renesas/da14695_dk_usb/board.yml                | 1 +
 boards/renesas/da1469x_dk_pro/board.yml                | 1 +
 boards/renesas/ek_ra2a1/board.yml                      | 1 +
 boards/renesas/ek_ra4e2/board.yml                      | 1 +
 boards/renesas/ek_ra4m2/board.yml                      | 1 +
 boards/renesas/ek_ra4m3/board.yml                      | 1 +
 boards/renesas/ek_ra4w1/board.yml                      | 1 +
 boards/renesas/ek_ra6e2/board.yml                      | 1 +
 boards/renesas/ek_ra6m1/board.yml                      | 1 +
 boards/renesas/ek_ra6m2/board.yml                      | 1 +
 boards/renesas/ek_ra6m3/board.yml                      | 1 +
 boards/renesas/ek_ra6m4/board.yml                      | 1 +
 boards/renesas/ek_ra6m5/board.yml                      | 1 +
 boards/renesas/ek_ra8d1/board.yml                      | 1 +
 boards/renesas/ek_ra8m1/board.yml                      | 1 +
 boards/renesas/fpb_ra6e1/board.yml                     | 1 +
 boards/renesas/fpb_ra6e2/board.yml                     | 1 +
 boards/renesas/mck_ra8t1/board.yml                     | 1 +
 boards/renesas/rcar_h3ulcb/board.yml                   | 1 +
 boards/renesas/rcar_salvator_x/board.yml               | 1 +
 boards/renesas/rcar_salvator_xs/board.yml              | 1 +
 boards/renesas/rcar_spider_s4/board.yml                | 1 +
 boards/renesas/rzt2m_starterkit/board.yml              | 1 +
 boards/renode/cortex_r8_virtual/board.yml              | 1 +
 boards/renode/riscv32_virtual/board.yml                | 1 +
 boards/ronoth/lodev/board.yml                          | 1 +
 boards/ruuvi/ruuvitag/board.yml                        | 1 +
 boards/sc/scobc_module1/board.yml                      | 1 +
 boards/seagate/faze/board.yml                          | 1 +
 boards/seagate/legend/board.yml                        | 1 +
 boards/seco/stm32f3_seco_d23/board.yml                 | 1 +
 boards/seeed/lora_e5_dev_board/board.yml               | 1 +
 boards/seeed/lora_e5_mini/board.yml                    | 1 +
 boards/seeed/seeeduino_xiao/board.yml                  | 1 +
 boards/seeed/wio_terminal/board.yml                    | 1 +
 boards/seeed/xiao_ble/board.yml                        | 1 +
 boards/seeed/xiao_esp32c3/board.yml                    | 1 +
 boards/seeed/xiao_esp32s3/board.yml                    | 1 +
 boards/seeed/xiao_rp2040/board.yml                     | 1 +
 boards/segger/ip_k66f/board.yml                        | 1 +
 boards/segger/trb_stm32f407/board.yml                  | 1 +
 boards/sensry/ganymed_bob/board.yml                    | 1 +
 boards/sifive/hifive1/board.yml                        | 1 +
 boards/sifive/hifive_unleashed/board.yml               | 1 +
 boards/sifive/hifive_unmatched/board.yml               | 1 +
 boards/silabs/dev_kits/sim3u1xx_dk/board.yml           | 1 +
 boards/silabs/dev_kits/sltb004a/board.yml              | 1 +
 boards/silabs/dev_kits/sltb009a/board.yml              | 1 +
 boards/silabs/dev_kits/sltb010a/board.yml              | 1 +
 boards/silabs/dev_kits/xg24_dk2601b/board.yml          | 1 +
 boards/silabs/dev_kits/xg27_dk2602a/board.yml          | 1 +
 boards/silabs/radio_boards/slwrb4104a/board.yml        | 1 +
 boards/silabs/radio_boards/slwrb4161a/board.yml        | 1 +
 boards/silabs/radio_boards/slwrb4170a/board.yml        | 1 +
 boards/silabs/radio_boards/slwrb4180a/board.yml        | 1 +
 boards/silabs/radio_boards/slwrb4250b/board.yml        | 1 +
 boards/silabs/radio_boards/slwrb4255a/board.yml        | 1 +
 boards/silabs/radio_boards/slwrb4321a/board.yml        | 1 +
 boards/silabs/radio_boards/xg24_rb4187c/board.yml      | 1 +
 boards/silabs/starter_kits/efm32wg_stk3800/board.yml   | 1 +
 boards/silabs/starter_kits/slstk3400a/board.yml        | 1 +
 boards/silabs/starter_kits/slstk3401a/board.yml        | 1 +
 boards/silabs/starter_kits/slstk3402a/board.yml        | 1 +
 boards/silabs/starter_kits/slstk3701a/board.yml        | 1 +
 boards/sipeed/longan_nano/board.yml                    | 1 +
 boards/snps/em_starterkit/board.yml                    | 1 +
 boards/snps/emsdp/board.yml                            | 1 +
 boards/snps/hsdk/board.yml                             | 1 +
 boards/snps/hsdk4xd/board.yml                          | 1 +
 boards/snps/iotdk/board.yml                            | 1 +
 boards/snps/nsim/arc_classic/board.yml                 | 1 +
 boards/snps/nsim/arc_v/board.yml                       | 1 +
 boards/sparkfun/micromod/board.yml                     | 1 +
 boards/sparkfun/nrf52_sparkfun/board.yml               | 1 +
 boards/sparkfun/pro_micro_rp2040/board.yml             | 1 +
 boards/sparkfun/red_v_things_plus/board.yml            | 1 +
 boards/sparkfun/thing_plus/board.yml                   | 1 +
 boards/sparkfun/thing_plus_matter_mgm240p/board.yml    | 1 +
 boards/st/b_g474e_dpow1/board.yml                      | 1 +
 boards/st/b_l072z_lrwan1/board.yml                     | 1 +
 boards/st/b_l4s5i_iot01a/board.yml                     | 1 +
 boards/st/b_u585i_iot02a/board.yml                     | 1 +
 boards/st/disco_l475_iot1/board.yml                    | 1 +
 boards/st/nucleo_c031c6/board.yml                      | 1 +
 boards/st/nucleo_f030r8/board.yml                      | 1 +
 boards/st/nucleo_f031k6/board.yml                      | 1 +
 boards/st/nucleo_f042k6/board.yml                      | 1 +
 boards/st/nucleo_f070rb/board.yml                      | 1 +
 boards/st/nucleo_f091rc/board.yml                      | 1 +
 boards/st/nucleo_f103rb/board.yml                      | 1 +
 boards/st/nucleo_f207zg/board.yml                      | 1 +
 boards/st/nucleo_f302r8/board.yml                      | 1 +
 boards/st/nucleo_f303k8/board.yml                      | 1 +
 boards/st/nucleo_f303re/board.yml                      | 1 +
 boards/st/nucleo_f334r8/board.yml                      | 1 +
 boards/st/nucleo_f401re/board.yml                      | 1 +
 boards/st/nucleo_f410rb/board.yml                      | 1 +
 boards/st/nucleo_f411re/board.yml                      | 1 +
 boards/st/nucleo_f412zg/board.yml                      | 1 +
 boards/st/nucleo_f413zh/board.yml                      | 1 +
 boards/st/nucleo_f429zi/board.yml                      | 1 +
 boards/st/nucleo_f446re/board.yml                      | 1 +
 boards/st/nucleo_f446ze/board.yml                      | 1 +
 boards/st/nucleo_f722ze/board.yml                      | 1 +
 boards/st/nucleo_f746zg/board.yml                      | 1 +
 boards/st/nucleo_f756zg/board.yml                      | 1 +
 boards/st/nucleo_f767zi/board.yml                      | 1 +
 boards/st/nucleo_g031k8/board.yml                      | 1 +
 boards/st/nucleo_g070rb/board.yml                      | 1 +
 boards/st/nucleo_g071rb/board.yml                      | 1 +
 boards/st/nucleo_g0b1re/board.yml                      | 1 +
 boards/st/nucleo_g431rb/board.yml                      | 1 +
 boards/st/nucleo_g474re/board.yml                      | 1 +
 boards/st/nucleo_h503rb/board.yml                      | 1 +
 boards/st/nucleo_h533re/board.yml                      | 1 +
 boards/st/nucleo_h563zi/board.yml                      | 1 +
 boards/st/nucleo_h723zg/board.yml                      | 1 +
 boards/st/nucleo_h743zi/board.yml                      | 1 +
 boards/st/nucleo_h745zi_q/board.yml                    | 1 +
 boards/st/nucleo_h753zi/board.yml                      | 1 +
 boards/st/nucleo_h755zi_q/board.yml                    | 1 +
 boards/st/nucleo_h7a3zi_q/board.yml                    | 1 +
 boards/st/nucleo_l011k4/board.yml                      | 1 +
 boards/st/nucleo_l031k6/board.yml                      | 1 +
 boards/st/nucleo_l053r8/board.yml                      | 1 +
 boards/st/nucleo_l073rz/board.yml                      | 1 +
 boards/st/nucleo_l152re/board.yml                      | 1 +
 boards/st/nucleo_l412rb_p/board.yml                    | 1 +
 boards/st/nucleo_l432kc/board.yml                      | 1 +
 boards/st/nucleo_l433rc_p/board.yml                    | 1 +
 boards/st/nucleo_l452re/board.yml                      | 1 +
 boards/st/nucleo_l476rg/board.yml                      | 1 +
 boards/st/nucleo_l496zg/board.yml                      | 1 +
 boards/st/nucleo_l4a6zg/board.yml                      | 1 +
 boards/st/nucleo_l4r5zi/board.yml                      | 1 +
 boards/st/nucleo_l552ze_q/board.yml                    | 1 +
 boards/st/nucleo_u031r8/board.yml                      | 1 +
 boards/st/nucleo_u083rc/board.yml                      | 1 +
 boards/st/nucleo_u575zi_q/board.yml                    | 1 +
 boards/st/nucleo_u5a5zj_q/board.yml                    | 1 +
 boards/st/nucleo_wb05kz/board.yml                      | 1 +
 boards/st/nucleo_wb09ke/board.yml                      | 1 +
 boards/st/nucleo_wb55rg/board.yml                      | 1 +
 boards/st/nucleo_wba52cg/board.yml                     | 1 +
 boards/st/nucleo_wba55cg/board.yml                     | 1 +
 boards/st/nucleo_wl55jc/board.yml                      | 1 +
 boards/st/sensortile_box/board.yml                     | 1 +
 boards/st/sensortile_box_pro/board.yml                 | 1 +
 boards/st/st25dv_mb1283_disco/board.yml                | 1 +
 boards/st/steval_fcu001v1/board.yml                    | 1 +
 boards/st/steval_stwinbx1/board.yml                    | 1 +
 boards/st/stm3210c_eval/board.yml                      | 1 +
 boards/st/stm32373c_eval/board.yml                     | 1 +
 boards/st/stm32c0116_dk/board.yml                      | 1 +
 boards/st/stm32f072_eval/board.yml                     | 1 +
 boards/st/stm32f072b_disco/board.yml                   | 1 +
 boards/st/stm32f0_disco/board.yml                      | 1 +
 boards/st/stm32f3_disco/board.yml                      | 1 +
 boards/st/stm32f411e_disco/board.yml                   | 1 +
 boards/st/stm32f412g_disco/board.yml                   | 1 +
 boards/st/stm32f429i_disc1/board.yml                   | 1 +
 boards/st/stm32f469i_disco/board.yml                   | 1 +
 boards/st/stm32f4_disco/board.yml                      | 1 +
 boards/st/stm32f723e_disco/board.yml                   | 1 +
 boards/st/stm32f746g_disco/board.yml                   | 1 +
 boards/st/stm32f7508_dk/board.yml                      | 1 +
 boards/st/stm32f769i_disco/board.yml                   | 1 +
 boards/st/stm32g0316_disco/board.yml                   | 1 +
 boards/st/stm32g071b_disco/board.yml                   | 1 +
 boards/st/stm32g081b_eval/board.yml                    | 1 +
 boards/st/stm32h573i_dk/board.yml                      | 1 +
 boards/st/stm32h735g_disco/board.yml                   | 1 +
 boards/st/stm32h745i_disco/board.yml                   | 1 +
 boards/st/stm32h747i_disco/board.yml                   | 1 +
 boards/st/stm32h750b_dk/board.yml                      | 1 +
 boards/st/stm32h7b3i_dk/board.yml                      | 1 +
 boards/st/stm32h7s78_dk/board.yml                      | 1 +
 boards/st/stm32l1_disco/board.yml                      | 2 ++
 boards/st/stm32l476g_disco/board.yml                   | 1 +
 boards/st/stm32l496g_disco/board.yml                   | 1 +
 boards/st/stm32l4r9i_disco/board.yml                   | 1 +
 boards/st/stm32l562e_dk/board.yml                      | 1 +
 boards/st/stm32mp157c_dk2/board.yml                    | 1 +
 boards/st/stm32u083c_dk/board.yml                      | 1 +
 boards/st/stm32u5a9j_dk/board.yml                      | 1 +
 boards/st/stm32vl_disco/board.yml                      | 1 +
 boards/st/stm32wb5mm_dk/board.yml                      | 1 +
 boards/st/stm32wb5mmg/board.yml                        | 1 +
 boards/starfive/visionfive2/board.yml                  | 1 +
 boards/tdk/robokit1/board.yml                          | 1 +
 boards/technexion/pico_pi/board.yml                    | 1 +
 boards/telink/tlsr9518adk80d/board.yml                 | 1 +
 boards/ti/cc1352p1_launchxl/board.yml                  | 1 +
 boards/ti/cc1352p7_launchpad/board.yml                 | 1 +
 boards/ti/cc1352r1_launchxl/board.yml                  | 1 +
 boards/ti/cc1352r_sensortag/board.yml                  | 1 +
 boards/ti/cc26x2r1_launchxl/board.yml                  | 1 +
 boards/ti/cc3220sf_launchxl/board.yml                  | 1 +
 boards/ti/cc3235sf_launchxl/board.yml                  | 1 +
 boards/ti/msp_exp432p401r_launchxl/board.yml           | 1 +
 boards/ti/sk_am62/board.yml                            | 1 +
 boards/toradex/colibri_imx7d/board.yml                 | 1 +
 boards/toradex/verdin_imx8mp/board.yml                 | 1 +
 boards/u-blox/ubx_bmd300eval/board.yml                 | 1 +
 boards/u-blox/ubx_bmd330eval/board.yml                 | 1 +
 boards/u-blox/ubx_bmd340eval/board.yml                 | 1 +
 boards/u-blox/ubx_bmd345eval/board.yml                 | 1 +
 boards/u-blox/ubx_bmd360eval/board.yml                 | 1 +
 boards/u-blox/ubx_bmd380eval/board.yml                 | 1 +
 boards/u-blox/ubx_evkannab1/board.yml                  | 1 +
 boards/u-blox/ubx_evkninab1/board.yml                  | 1 +
 boards/u-blox/ubx_evkninab3/board.yml                  | 1 +
 boards/u-blox/ubx_evkninab4/board.yml                  | 1 +
 boards/udoo/udoo_neo_full/board.yml                    | 1 +
 boards/up-bridge-the-gap/up_squared/board.yml          | 1 +
 boards/up-bridge-the-gap/up_squared_pro_7000/board.yml | 1 +
 boards/vcc-gnd/yd_esp32/board.yml                      | 1 +
 boards/vcc-gnd/yd_stm32h750vb/board.yml                | 1 +
 boards/vngiotlab/nrf51_vbluno51/board.yml              | 1 +
 boards/vngiotlab/nrf52_vbluno52/board.yml              | 1 +
 boards/waveshare/esp32s3_touch_lcd_1_28/board.yml      | 1 +
 boards/waveshare/nrf51_ble400/board.yml                | 1 +
 boards/waveshare/open103z/board.yml                    | 1 +
 boards/we/ophelia1ev/board.yml                         | 1 +
 boards/we/proteus2ev/board.yml                         | 1 +
 boards/we/proteus3ev/board.yml                         | 1 +
 boards/weact/blackpill_f401cc/board.yml                | 1 +
 boards/weact/blackpill_f401ce/board.yml                | 1 +
 boards/weact/blackpill_f411ce/board.yml                | 1 +
 boards/weact/mini_stm32h743/board.yml                  | 1 +
 boards/weact/stm32f405_core/board.yml                  | 1 +
 boards/weact/stm32g431_core/board.yml                  | 1 +
 boards/wemos/esp32s2_lolin_mini/board.yml              | 1 +
 boards/witte/linum/board.yml                           | 1 +
 boards/wiznet/w5500_evb_pico/board.yml                 | 1 +
 boards/xen/xenvm/board.yml                             | 1 +
 603 files changed, 619 insertions(+), 4 deletions(-)

diff --git a/boards/01space/esp32c3_042_oled/board.yml b/boards/01space/esp32c3_042_oled/board.yml
index 40b7b0f5816..35bcbdc0e60 100644
--- a/boards/01space/esp32c3_042_oled/board.yml
+++ b/boards/01space/esp32c3_042_oled/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp32c3_042_oled
+  full_name: ESP32C3 0.42 OLED
   vendor: 01space
   socs:
   - name: esp32c3
diff --git a/boards/96boards/aerocore2/board.yml b/boards/96boards/aerocore2/board.yml
index 42c4b7cae96..cc94ae02283 100644
--- a/boards/96boards/aerocore2/board.yml
+++ b/boards/96boards/aerocore2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: 96b_aerocore2
+  full_name: Aerocore2
   vendor: 96boards
   socs:
     - name: stm32f427xx
diff --git a/boards/96boards/argonkey/board.yml b/boards/96boards/argonkey/board.yml
index 9e78ee2394a..c142ce4d98c 100644
--- a/boards/96boards/argonkey/board.yml
+++ b/boards/96boards/argonkey/board.yml
@@ -1,5 +1,6 @@
 board:
   name: 96b_argonkey
+  full_name: Argonkey
   vendor: 96boards
   socs:
     - name: stm32f412cx
diff --git a/boards/96boards/avenger96/board.yml b/boards/96boards/avenger96/board.yml
index 042bb6a472f..35f4e4b24f9 100644
--- a/boards/96boards/avenger96/board.yml
+++ b/boards/96boards/avenger96/board.yml
@@ -1,5 +1,6 @@
 board:
   name: 96b_avenger96
+  full_name: Avenger96
   vendor: 96boards
   socs:
     - name: stm32mp157cxx
diff --git a/boards/96boards/carbon/board.yml b/boards/96boards/carbon/board.yml
index 79101f957be..28a04570b7a 100644
--- a/boards/96boards/carbon/board.yml
+++ b/boards/96boards/carbon/board.yml
@@ -1,5 +1,6 @@
 board:
   name: 96b_carbon
+  full_name: Carbon
   vendor: 96boards
   socs:
   - name: stm32f401xe
diff --git a/boards/96boards/meerkat96/board.yml b/boards/96boards/meerkat96/board.yml
index 48d60ae6888..4e1425d035a 100644
--- a/boards/96boards/meerkat96/board.yml
+++ b/boards/96boards/meerkat96/board.yml
@@ -1,5 +1,6 @@
 board:
   name: 96b_meerkat96
+  full_name: Meerkat96
   vendor: 96boards
   socs:
     - name: mcimx7d
diff --git a/boards/96boards/neonkey/board.yml b/boards/96boards/neonkey/board.yml
index 214cdc883bb..a9204af01c8 100644
--- a/boards/96boards/neonkey/board.yml
+++ b/boards/96boards/neonkey/board.yml
@@ -1,5 +1,6 @@
 board:
   name: 96b_neonkey
+  full_name: Neonkey
   vendor: 96boards
   socs:
     - name: stm32f411xe
diff --git a/boards/96boards/nitrogen/board.yml b/boards/96boards/nitrogen/board.yml
index 279d2c63a66..8c3156c9c19 100644
--- a/boards/96boards/nitrogen/board.yml
+++ b/boards/96boards/nitrogen/board.yml
@@ -1,5 +1,6 @@
 board:
   name: 96b_nitrogen
+  full_name: Nitrogen
   vendor: 96boards
   socs:
   - name: nrf52832
diff --git a/boards/96boards/stm32_sensor_mez/board.yml b/boards/96boards/stm32_sensor_mez/board.yml
index e410dcc9e65..19d96543563 100644
--- a/boards/96boards/stm32_sensor_mez/board.yml
+++ b/boards/96boards/stm32_sensor_mez/board.yml
@@ -1,5 +1,6 @@
 board:
   name: 96b_stm32_sensor_mez
+  full_name: STM32 Sensor Mezzanine
   vendor: st
   socs:
     - name: stm32f446xx
diff --git a/boards/96boards/wistrio/board.yml b/boards/96boards/wistrio/board.yml
index 508c590a6b5..9cc1efae22e 100644
--- a/boards/96boards/wistrio/board.yml
+++ b/boards/96boards/wistrio/board.yml
@@ -1,5 +1,6 @@
 board:
   name: 96b_wistrio
+  full_name: WisTrio
   vendor: 96boards
   socs:
     - name: stm32l151xba
diff --git a/boards/aconno/acn52832/board.yml b/boards/aconno/acn52832/board.yml
index 179637e1ded..3b7d75c68a2 100644
--- a/boards/aconno/acn52832/board.yml
+++ b/boards/aconno/acn52832/board.yml
@@ -1,5 +1,6 @@
 board:
   name: acn52832
+  full_name: acn52832
   vendor: aconno
   socs:
   - name: nrf52832
diff --git a/boards/acrn/acrn/board.yml b/boards/acrn/acrn/board.yml
index 4130a85b8f6..dce367c0f96 100644
--- a/boards/acrn/acrn/board.yml
+++ b/boards/acrn/acrn/board.yml
@@ -1,9 +1,11 @@
 boards:
 
   - name: acrn
+    full_name: ACRN hypervisor
     socs:
       - name: atom
 
   - name: acrn_ehl_crb
+    full_name: ACRN on EHL hypervisor
     socs:
       - name: elkhart_lake
diff --git a/boards/actinius/icarus/board.yml b/boards/actinius/icarus/board.yml
index 69d6aa45707..9f5b6450cf9 100644
--- a/boards/actinius/icarus/board.yml
+++ b/boards/actinius/icarus/board.yml
@@ -1,5 +1,6 @@
 board:
   name: actinius_icarus
+  full_name: Icarus
   vendor: actinius
   socs:
   - name: nrf9160
diff --git a/boards/actinius/icarus_bee/board.yml b/boards/actinius/icarus_bee/board.yml
index 653294a9cf5..648306ed93c 100644
--- a/boards/actinius/icarus_bee/board.yml
+++ b/boards/actinius/icarus_bee/board.yml
@@ -1,5 +1,6 @@
 board:
   name: actinius_icarus_bee
+  full_name: Icarus Bee
   vendor: actinius
   socs:
   - name: nrf9160
diff --git a/boards/actinius/icarus_som/board.yml b/boards/actinius/icarus_som/board.yml
index 9acf3b4fa5e..b3cf4ca8cb6 100644
--- a/boards/actinius/icarus_som/board.yml
+++ b/boards/actinius/icarus_som/board.yml
@@ -1,5 +1,6 @@
 board:
   name: actinius_icarus_som
+  full_name: Icarus SoM
   vendor: actinius
   socs:
   - name: nrf9160
diff --git a/boards/actinius/icarus_som_dk/board.yml b/boards/actinius/icarus_som_dk/board.yml
index 137f39705d1..9e5a596828e 100644
--- a/boards/actinius/icarus_som_dk/board.yml
+++ b/boards/actinius/icarus_som_dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: actinius_icarus_som_dk
+  full_name: Icarus SoM DK
   vendor: actinius
   socs:
   - name: nrf9160
diff --git a/boards/adafruit/feather_m0_basic_proto/board.yml b/boards/adafruit/feather_m0_basic_proto/board.yml
index cf9353bf78c..15ee020f8a6 100644
--- a/boards/adafruit/feather_m0_basic_proto/board.yml
+++ b/boards/adafruit/feather_m0_basic_proto/board.yml
@@ -1,5 +1,6 @@
 board:
   name: adafruit_feather_m0_basic_proto
+  full_name: Feather M0 Basic Proto
   vendor: adafruit
   socs:
     - name: samd21g18a
diff --git a/boards/adafruit/feather_m0_lora/board.yml b/boards/adafruit/feather_m0_lora/board.yml
index b720fc95ffe..afef7ea91df 100644
--- a/boards/adafruit/feather_m0_lora/board.yml
+++ b/boards/adafruit/feather_m0_lora/board.yml
@@ -1,5 +1,6 @@
 board:
   name: adafruit_feather_m0_lora
+  full_name: Feather M0 LoRa
   vendor: adafruit
   socs:
     - name: samd21g18a
diff --git a/boards/adafruit/feather_nrf52840/board.yml b/boards/adafruit/feather_nrf52840/board.yml
index 5841c2f4bf0..535b60d2f78 100644
--- a/boards/adafruit/feather_nrf52840/board.yml
+++ b/boards/adafruit/feather_nrf52840/board.yml
@@ -1,5 +1,6 @@
 board:
   name: adafruit_feather_nrf52840
+  full_name: Feather nRF52840 (Express, Sense)
   vendor: adafruit
   socs:
     - name: nrf52840
diff --git a/boards/adafruit/feather_stm32f405/board.yml b/boards/adafruit/feather_stm32f405/board.yml
index e30f5c0cbcf..839cd4b24c3 100644
--- a/boards/adafruit/feather_stm32f405/board.yml
+++ b/boards/adafruit/feather_stm32f405/board.yml
@@ -1,5 +1,6 @@
 board:
   name: adafruit_feather_stm32f405
+  full_name: Feather STM32F405 Express
   vendor: adafruit
   socs:
     - name: stm32f405xx
diff --git a/boards/adafruit/grand_central_m4_express/board.yml b/boards/adafruit/grand_central_m4_express/board.yml
index 92a48d1b2b3..4393f3040c7 100644
--- a/boards/adafruit/grand_central_m4_express/board.yml
+++ b/boards/adafruit/grand_central_m4_express/board.yml
@@ -1,5 +1,6 @@
 board:
   name: adafruit_grand_central_m4_express
+  full_name: Grand Central M4 Express
   vendor: adafruit
   socs:
     - name: samd51p20a
diff --git a/boards/adafruit/itsybitsy/board.yml b/boards/adafruit/itsybitsy/board.yml
index 484a68e348b..baf9310f83c 100644
--- a/boards/adafruit/itsybitsy/board.yml
+++ b/boards/adafruit/itsybitsy/board.yml
@@ -1,5 +1,6 @@
 board:
   name: adafruit_itsybitsy
+  full_name: ItsyBitsy nRF52840
   vendor: adafruit
   socs:
   - name: nrf52840
diff --git a/boards/adafruit/itsybitsy_m4_express/board.yml b/boards/adafruit/itsybitsy_m4_express/board.yml
index 7d295017fc9..31c9cd6354e 100644
--- a/boards/adafruit/itsybitsy_m4_express/board.yml
+++ b/boards/adafruit/itsybitsy_m4_express/board.yml
@@ -1,5 +1,6 @@
 board:
   name: adafruit_itsybitsy_m4_express
+  full_name: ItsyBitsy M4 Express
   vendor: adafruit
   socs:
     - name: samd51g19a
diff --git a/boards/adafruit/kb2040/board.yml b/boards/adafruit/kb2040/board.yml
index 5fbe751090e..39363e321aa 100644
--- a/boards/adafruit/kb2040/board.yml
+++ b/boards/adafruit/kb2040/board.yml
@@ -1,5 +1,6 @@
 board:
   name: adafruit_kb2040
+  full_name: KB2040
   vendor: adafruit
   socs:
   - name: rp2040
diff --git a/boards/adafruit/nrf52_adafruit_feather/board.yml b/boards/adafruit/nrf52_adafruit_feather/board.yml
index a3d6b4274ce..301d270465e 100644
--- a/boards/adafruit/nrf52_adafruit_feather/board.yml
+++ b/boards/adafruit/nrf52_adafruit_feather/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf52_adafruit_feather
+  full_name: nRF52 Adafruit Feather
   vendor: adafruit
   socs:
   - name: nrf52832
diff --git a/boards/adafruit/qt_py_rp2040/board.yml b/boards/adafruit/qt_py_rp2040/board.yml
index e07cab669c6..ba0a3f89485 100644
--- a/boards/adafruit/qt_py_rp2040/board.yml
+++ b/boards/adafruit/qt_py_rp2040/board.yml
@@ -1,5 +1,6 @@
 board:
   name: adafruit_qt_py_rp2040
+  full_name: QT Py RP2040
   vendor: adafruit
   socs:
   - name: rp2040
diff --git a/boards/adafruit/trinket_m0/board.yml b/boards/adafruit/trinket_m0/board.yml
index 6d7a783ae3e..44b19bf565e 100644
--- a/boards/adafruit/trinket_m0/board.yml
+++ b/boards/adafruit/trinket_m0/board.yml
@@ -1,5 +1,6 @@
 board:
   name: adafruit_trinket_m0
+  full_name: Trinket M0
   vendor: adafruit
   socs:
     - name: samd21e18a
diff --git a/boards/adi/apard32690/board.yml b/boards/adi/apard32690/board.yml
index 269b5789345..fc6aeac3b24 100644
--- a/boards/adi/apard32690/board.yml
+++ b/boards/adi/apard32690/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: apard32690
+  full_name: AD-APARD32690-SL
   vendor: adi
   socs:
     - name: max32690
diff --git a/boards/adi/eval_adin1110ebz/board.yml b/boards/adi/eval_adin1110ebz/board.yml
index e5af49e3f35..27763c338c6 100644
--- a/boards/adi/eval_adin1110ebz/board.yml
+++ b/boards/adi/eval_adin1110ebz/board.yml
@@ -1,5 +1,6 @@
 board:
   name: adi_eval_adin1110ebz
+  full_name: EVAL-ADIN1110EVB Evaluation board
   vendor: adi
   socs:
     - name: stm32l4s5xx
diff --git a/boards/adi/eval_adin2111ebz/board.yml b/boards/adi/eval_adin2111ebz/board.yml
index 0151d544aca..d63f5c14edd 100644
--- a/boards/adi/eval_adin2111ebz/board.yml
+++ b/boards/adi/eval_adin2111ebz/board.yml
@@ -1,5 +1,6 @@
 board:
   name: adi_eval_adin2111ebz
+  full_name: EVAL-ADIN2111EVB Evaluation board
   vendor: adi
   socs:
     - name: stm32l4s5xx
diff --git a/boards/adi/max32655evkit/board.yml b/boards/adi/max32655evkit/board.yml
index 4824c6fe8e5..a3182fa647a 100644
--- a/boards/adi/max32655evkit/board.yml
+++ b/boards/adi/max32655evkit/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: max32655evkit
+  full_name: MAX32655EVKIT
   vendor: adi
   socs:
     - name: max32655
diff --git a/boards/adi/max32655fthr/board.yml b/boards/adi/max32655fthr/board.yml
index 087b51d8d95..81c6e41ae32 100644
--- a/boards/adi/max32655fthr/board.yml
+++ b/boards/adi/max32655fthr/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: max32655fthr
+  full_name: MAX32655FTHR
   vendor: adi
   socs:
     - name: max32655
diff --git a/boards/adi/max32662evkit/board.yml b/boards/adi/max32662evkit/board.yml
index 628de9d7668..66ba25e1175 100644
--- a/boards/adi/max32662evkit/board.yml
+++ b/boards/adi/max32662evkit/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: max32662evkit
+  full_name: MAX32662EVKIT
   vendor: adi
   socs:
     - name: max32662
diff --git a/boards/adi/max32666evkit/board.yml b/boards/adi/max32666evkit/board.yml
index 5d1beff7716..6cacbe69acf 100644
--- a/boards/adi/max32666evkit/board.yml
+++ b/boards/adi/max32666evkit/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: max32666evkit
+  full_name: MAX32666EVKIT
   vendor: adi
   socs:
     - name: max32666
diff --git a/boards/adi/max32666fthr/board.yml b/boards/adi/max32666fthr/board.yml
index a071afb909e..a73062b5bfa 100644
--- a/boards/adi/max32666fthr/board.yml
+++ b/boards/adi/max32666fthr/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: max32666fthr
+  full_name: MAX32666FTHR
   vendor: adi
   socs:
     - name: max32666
diff --git a/boards/adi/max32670evkit/board.yml b/boards/adi/max32670evkit/board.yml
index 1d0aabb3954..530810b3be9 100644
--- a/boards/adi/max32670evkit/board.yml
+++ b/boards/adi/max32670evkit/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: max32670evkit
+  full_name: MAX32670EVKIT
   vendor: adi
   socs:
     - name: max32670
diff --git a/boards/adi/max32672evkit/board.yml b/boards/adi/max32672evkit/board.yml
index 5df99f681bf..cd2e29f832c 100644
--- a/boards/adi/max32672evkit/board.yml
+++ b/boards/adi/max32672evkit/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: max32672evkit
+  full_name: MAX32672EVKIT
   vendor: adi
   socs:
     - name: max32672
diff --git a/boards/adi/max32672fthr/board.yml b/boards/adi/max32672fthr/board.yml
index c99d16ad4a1..aa19cea2609 100644
--- a/boards/adi/max32672fthr/board.yml
+++ b/boards/adi/max32672fthr/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: max32672fthr
+  full_name: MAX32672FTHR
   vendor: adi
   socs:
     - name: max32672
diff --git a/boards/adi/max32675evkit/board.yml b/boards/adi/max32675evkit/board.yml
index d51c7284c7f..59ca667e03b 100644
--- a/boards/adi/max32675evkit/board.yml
+++ b/boards/adi/max32675evkit/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: max32675evkit
+  full_name: MAX32675EVKIT
   vendor: adi
   socs:
     - name: max32675
diff --git a/boards/adi/max32680evkit/board.yml b/boards/adi/max32680evkit/board.yml
index 23b5102a97f..11cb8a55c09 100644
--- a/boards/adi/max32680evkit/board.yml
+++ b/boards/adi/max32680evkit/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: max32680evkit
+  full_name: MAX32680EVKIT
   vendor: adi
   socs:
     - name: max32680
diff --git a/boards/adi/max32690evkit/board.yml b/boards/adi/max32690evkit/board.yml
index 53f531e193b..b5d3be3c679 100644
--- a/boards/adi/max32690evkit/board.yml
+++ b/boards/adi/max32690evkit/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: max32690evkit
+  full_name: MAX32690EVKIT
   vendor: adi
   socs:
     - name: max32690
diff --git a/boards/adi/max32690fthr/board.yml b/boards/adi/max32690fthr/board.yml
index 328035bdccd..b97f7e0e6ac 100644
--- a/boards/adi/max32690fthr/board.yml
+++ b/boards/adi/max32690fthr/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: max32690fthr
+  full_name: MAX32690FTHR
   vendor: adi
   socs:
     - name: max32690
diff --git a/boards/adi/sdp_k1/board.yml b/boards/adi/sdp_k1/board.yml
index c659c3b14c8..26b2e819276 100644
--- a/boards/adi/sdp_k1/board.yml
+++ b/boards/adi/sdp_k1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: adi_sdp_k1
+  full_name: SDP-K1
   vendor: adi
   socs:
     - name: stm32f469xx
diff --git a/boards/alientek/pandora_stm32l475/board.yml b/boards/alientek/pandora_stm32l475/board.yml
index 725d13c5f30..1cb4fd9a9ff 100644
--- a/boards/alientek/pandora_stm32l475/board.yml
+++ b/boards/alientek/pandora_stm32l475/board.yml
@@ -1,5 +1,6 @@
 board:
   name: pandora_stm32l475
+  full_name: STM32L475 Pandora
   vendor: alientek
   socs:
     - name: stm32l475xx
diff --git a/boards/altr/max10/board.yml b/boards/altr/max10/board.yml
index 976a0f83a80..9106b7e15ec 100644
--- a/boards/altr/max10/board.yml
+++ b/boards/altr/max10/board.yml
@@ -1,5 +1,6 @@
 board:
   name: altera_max10
+  full_name: MAX10
   vendor: altr
   socs:
   - name: zephyr_nios2f
diff --git a/boards/ambiq/apollo3_evb/board.yml b/boards/ambiq/apollo3_evb/board.yml
index 8c3925245c3..9e3a5bd5304 100644
--- a/boards/ambiq/apollo3_evb/board.yml
+++ b/boards/ambiq/apollo3_evb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: apollo3_evb
+  full_name: Apollo3 Blue EVB
   vendor: ambiq
   socs:
   - name: apollo3_blue
diff --git a/boards/ambiq/apollo3p_evb/board.yml b/boards/ambiq/apollo3p_evb/board.yml
index 507a85548b0..b6de5218ca8 100644
--- a/boards/ambiq/apollo3p_evb/board.yml
+++ b/boards/ambiq/apollo3p_evb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: apollo3p_evb
+  full_name: Apollo3 Blue Plus EVB
   vendor: ambiq
   socs:
   - name: apollo3p_blue
diff --git a/boards/ambiq/apollo4p_blue_kxr_evb/board.yml b/boards/ambiq/apollo4p_blue_kxr_evb/board.yml
index 16a9a6cc979..ff5f3768774 100644
--- a/boards/ambiq/apollo4p_blue_kxr_evb/board.yml
+++ b/boards/ambiq/apollo4p_blue_kxr_evb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: apollo4p_blue_kxr_evb
+  full_name: Apollo4 Blue Plus KXR EVB
   vendor: ambiq
   socs:
   - name: apollo4p_blue
diff --git a/boards/ambiq/apollo4p_evb/board.yml b/boards/ambiq/apollo4p_evb/board.yml
index 023487c3ecd..1716e415cd6 100644
--- a/boards/ambiq/apollo4p_evb/board.yml
+++ b/boards/ambiq/apollo4p_evb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: apollo4p_evb
+  full_name: Apollo4P EVB
   vendor: ambiq
   socs:
   - name: apollo4p
diff --git a/boards/amd/kv260_r5/board.yml b/boards/amd/kv260_r5/board.yml
index 9e43962bfc3..da3d08a19c0 100644
--- a/boards/amd/kv260_r5/board.yml
+++ b/boards/amd/kv260_r5/board.yml
@@ -1,5 +1,6 @@
 board:
   name: kv260_r5
+  full_name: KV260 Development Board RPU Cortex-R5
   vendor: amd
   socs:
   - name: zynqmp_rpu
diff --git a/boards/andestech/adp_xc7k_ae350/board.yml b/boards/andestech/adp_xc7k_ae350/board.yml
index 09ade0170f3..7c8ace7d5a0 100644
--- a/boards/andestech/adp_xc7k_ae350/board.yml
+++ b/boards/andestech/adp_xc7k_ae350/board.yml
@@ -1,5 +1,6 @@
 board:
   name: adp_xc7k
+  full_name: ADP-XC7K AE350
   vendor: andestech
   socs:
   - name: ae350
diff --git a/boards/arduino/due/board.yml b/boards/arduino/due/board.yml
index 351bc719a15..5c7cc707137 100644
--- a/boards/arduino/due/board.yml
+++ b/boards/arduino/due/board.yml
@@ -1,5 +1,6 @@
 board:
   name: arduino_due
+  full_name: Arduino Due
   vendor: arduino
   socs:
     - name: sam3x8e
diff --git a/boards/arduino/giga_r1/board.yml b/boards/arduino/giga_r1/board.yml
index 3079c2f0d5c..cfafa1282fd 100644
--- a/boards/arduino/giga_r1/board.yml
+++ b/boards/arduino/giga_r1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: arduino_giga_r1
+  full_name: Arduino GIGA R1 WiFi
   vendor: arduino
   socs:
     - name: stm32h747xx
diff --git a/boards/arduino/mkrzero/board.yml b/boards/arduino/mkrzero/board.yml
index a53c04cbd18..776deeb6c23 100644
--- a/boards/arduino/mkrzero/board.yml
+++ b/boards/arduino/mkrzero/board.yml
@@ -1,5 +1,6 @@
 board:
   name: arduino_mkrzero
+  full_name: Arduino MKR Zero
   vendor: arduino
   socs:
     - name: samd21g18a
diff --git a/boards/arduino/nano_33_ble/board.yml b/boards/arduino/nano_33_ble/board.yml
index 919864839ed..b1cbb7a9212 100644
--- a/boards/arduino/nano_33_ble/board.yml
+++ b/boards/arduino/nano_33_ble/board.yml
@@ -1,5 +1,6 @@
 board:
   name: arduino_nano_33_ble
+  full_name: Arduino Nano 33 BLE (Sense)
   vendor: arduino
   socs:
   - name: nrf52840
diff --git a/boards/arduino/nano_33_iot/board.yml b/boards/arduino/nano_33_iot/board.yml
index 63b7dab7992..56977e0f6e8 100644
--- a/boards/arduino/nano_33_iot/board.yml
+++ b/boards/arduino/nano_33_iot/board.yml
@@ -1,5 +1,6 @@
 board:
   name: arduino_nano_33_iot
+  full_name: Arduino Nano 33 IOT
   vendor: arduino
   socs:
     - name: samd21g18a
diff --git a/boards/arduino/nicla_sense_me/board.yml b/boards/arduino/nicla_sense_me/board.yml
index 0a470e79ce5..58398263882 100644
--- a/boards/arduino/nicla_sense_me/board.yml
+++ b/boards/arduino/nicla_sense_me/board.yml
@@ -1,5 +1,6 @@
 board:
   name: arduino_nicla_sense_me
+  full_name: Arduino Nicla Sense ME
   vendor: arduino
   socs:
   - name: nrf52832
diff --git a/boards/arduino/nicla_vision/board.yml b/boards/arduino/nicla_vision/board.yml
index 660cb3ca8aa..90b90977ae3 100644
--- a/boards/arduino/nicla_vision/board.yml
+++ b/boards/arduino/nicla_vision/board.yml
@@ -1,5 +1,6 @@
 board:
   name: arduino_nicla_vision
+  full_name: Arduino Nicla Vision
   vendor: arduino
   socs:
     - name: stm32h747xx
diff --git a/boards/arduino/opta/board.yml b/boards/arduino/opta/board.yml
index c572627b348..013bfa1c06e 100644
--- a/boards/arduino/opta/board.yml
+++ b/boards/arduino/opta/board.yml
@@ -1,5 +1,6 @@
 board:
   name: arduino_opta
+  full_name: Arduino OPTA
   vendor: arduino
   socs:
     - name: stm32h747xx
diff --git a/boards/arduino/portenta_h7/board.yml b/boards/arduino/portenta_h7/board.yml
index 01e28f0b5fd..fbea7ec271a 100644
--- a/boards/arduino/portenta_h7/board.yml
+++ b/boards/arduino/portenta_h7/board.yml
@@ -1,5 +1,6 @@
 board:
   name: arduino_portenta_h7
+  full_name: Arduino Portenta H7
   vendor: arduino
   socs:
     - name: stm32h747xx
diff --git a/boards/arduino/uno_r4/board.yml b/boards/arduino/uno_r4/board.yml
index 8286850b76c..9c168c300c2 100644
--- a/boards/arduino/uno_r4/board.yml
+++ b/boards/arduino/uno_r4/board.yml
@@ -1,9 +1,11 @@
 boards:
   - name: arduino_uno_r4_minima
+    full_name: Arduino UNO R4 Minima
     vendor: arduino
     socs:
       - name: r7fa4m1ab3cfm
   - name: arduino_uno_r4_wifi
+    full_name: Arduino UNO R4 WiFi
     vendor: arduino
     socs:
       - name: r7fa4m1ab3cfm
diff --git a/boards/arduino/zero/board.yml b/boards/arduino/zero/board.yml
index 86d4a97c112..495bca3dace 100644
--- a/boards/arduino/zero/board.yml
+++ b/boards/arduino/zero/board.yml
@@ -1,5 +1,6 @@
 board:
   name: arduino_zero
+  full_name: Arduino/Genuino Zero
   vendor: arduino
   socs:
     - name: samd21g18a
diff --git a/boards/arm/fvp_base_revc_2xaemv8a/board.yml b/boards/arm/fvp_base_revc_2xaemv8a/board.yml
index 8c881c9d86a..3af023b670e 100644
--- a/boards/arm/fvp_base_revc_2xaemv8a/board.yml
+++ b/boards/arm/fvp_base_revc_2xaemv8a/board.yml
@@ -1,5 +1,6 @@
 board:
   name: fvp_base_revc_2xaemv8a
+  full_name: BASE RevC AEMv8A Fixed Virtual Platforms
   vendor: arm
   socs:
   - name: fvp_base_revc_2xaemv8a
diff --git a/boards/arm/fvp_baser_aemv8r/board.yml b/boards/arm/fvp_baser_aemv8r/board.yml
index f80eb3a6ed0..a11d3e00811 100644
--- a/boards/arm/fvp_baser_aemv8r/board.yml
+++ b/boards/arm/fvp_baser_aemv8r/board.yml
@@ -1,5 +1,6 @@
 board:
   name: fvp_baser_aemv8r
+  full_name: Debug with Arm DS
   vendor: arm
   socs:
   - name: fvp_aemv8r_aarch64
diff --git a/boards/arm/mps2/board.yml b/boards/arm/mps2/board.yml
index a069852c1c6..779a8ed21cc 100644
--- a/boards/arm/mps2/board.yml
+++ b/boards/arm/mps2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mps2
+  full_name: V2M MPS2
   vendor: arm
   socs:
   - name: an385
diff --git a/boards/arm/mps3/board.yml b/boards/arm/mps3/board.yml
index 5ee7ed7c037..9eea26dc244 100644
--- a/boards/arm/mps3/board.yml
+++ b/boards/arm/mps3/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mps3
+  full_name: MPS3 AN547
   vendor: arm
   socs:
   - name: 'an547'
diff --git a/boards/arm/v2m_beetle/board.yml b/boards/arm/v2m_beetle/board.yml
index b19e9bfec75..9104c0335cc 100644
--- a/boards/arm/v2m_beetle/board.yml
+++ b/boards/arm/v2m_beetle/board.yml
@@ -1,5 +1,6 @@
 board:
   name: v2m_beetle
+  full_name: V2M Beetle
   vendor: arm
   socs:
   - name: beetle_r0
diff --git a/boards/arm/v2m_musca_b1/board.yml b/boards/arm/v2m_musca_b1/board.yml
index 47cebc33bb1..40d16232d90 100644
--- a/boards/arm/v2m_musca_b1/board.yml
+++ b/boards/arm/v2m_musca_b1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: v2m_musca_b1
+  full_name: V2M Musca B1
   vendor: arm
   socs:
   - name: musca_b1
diff --git a/boards/arm/v2m_musca_s1/board.yml b/boards/arm/v2m_musca_s1/board.yml
index a7a3e18358d..8cbc49ca31e 100644
--- a/boards/arm/v2m_musca_s1/board.yml
+++ b/boards/arm/v2m_musca_s1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: v2m_musca_s1
+  full_name: V2M Musca-S1
   vendor: arm
   socs:
   - name: musca_s1
diff --git a/boards/aspeed/ast1030_evb/board.yml b/boards/aspeed/ast1030_evb/board.yml
index e129a899425..002da5215bf 100644
--- a/boards/aspeed/ast1030_evb/board.yml
+++ b/boards/aspeed/ast1030_evb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ast1030_evb
+  full_name: AST1030_EVB
   vendor: aspeed
   socs:
   - name: ast1030
diff --git a/boards/atmarktechno/degu_evk/board.yml b/boards/atmarktechno/degu_evk/board.yml
index 19859fc1e7d..483521e3a36 100644
--- a/boards/atmarktechno/degu_evk/board.yml
+++ b/boards/atmarktechno/degu_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: degu_evk
+  full_name: Degu Evaluation Kit
   vendor: atmarktechno
   socs:
   - name: nrf52840
diff --git a/boards/atmel/sam/sam4e_xpro/board.yml b/boards/atmel/sam/sam4e_xpro/board.yml
index 017a22d62cd..52c0e9e8dee 100644
--- a/boards/atmel/sam/sam4e_xpro/board.yml
+++ b/boards/atmel/sam/sam4e_xpro/board.yml
@@ -1,5 +1,6 @@
 board:
   name: sam4e_xpro
+  full_name: SAM4E Xplained Pro
   vendor: atmel
   socs:
     - name: sam4e16e
diff --git a/boards/atmel/sam/sam4l_ek/board.yml b/boards/atmel/sam/sam4l_ek/board.yml
index 7045ba351ce..02dbed9f7e1 100644
--- a/boards/atmel/sam/sam4l_ek/board.yml
+++ b/boards/atmel/sam/sam4l_ek/board.yml
@@ -1,5 +1,6 @@
 board:
   name: sam4l_ek
+  full_name: SAM4L-EK
   vendor: atmel
   socs:
     - name: sam4lc4c
diff --git a/boards/atmel/sam/sam4s_xplained/board.yml b/boards/atmel/sam/sam4s_xplained/board.yml
index c406301245b..0bbbe3a0590 100644
--- a/boards/atmel/sam/sam4s_xplained/board.yml
+++ b/boards/atmel/sam/sam4s_xplained/board.yml
@@ -1,5 +1,6 @@
 board:
   name: sam4s_xplained
+  full_name: SAM4S Xplained
   vendor: atmel
   socs:
     - name: sam4s16c
diff --git a/boards/atmel/sam/sam_e70_xplained/board.yml b/boards/atmel/sam/sam_e70_xplained/board.yml
index 1308363814a..905bcdf1887 100644
--- a/boards/atmel/sam/sam_e70_xplained/board.yml
+++ b/boards/atmel/sam/sam_e70_xplained/board.yml
@@ -1,5 +1,6 @@
 board:
   name: sam_e70_xplained
+  full_name: SAM E70(B) Xplained
   vendor: atmel
   socs:
     - name: same70q21
diff --git a/boards/atmel/sam/sam_v71_xult/board.yml b/boards/atmel/sam/sam_v71_xult/board.yml
index 68996e06485..2cf3c436ecb 100644
--- a/boards/atmel/sam/sam_v71_xult/board.yml
+++ b/boards/atmel/sam/sam_v71_xult/board.yml
@@ -1,5 +1,6 @@
 board:
   name: sam_v71_xult
+  full_name: SAM V71(B) Xplained Ultra
   vendor: atmel
   socs:
     - name: samv71q21
diff --git a/boards/atmel/sam0/samc21n_xpro/board.yml b/boards/atmel/sam0/samc21n_xpro/board.yml
index 2037cde2398..72ab82fecd8 100644
--- a/boards/atmel/sam0/samc21n_xpro/board.yml
+++ b/boards/atmel/sam0/samc21n_xpro/board.yml
@@ -1,5 +1,6 @@
 board:
   name: samc21n_xpro
+  full_name: SAM C21N Xplained Pro Evaluation Kit
   vendor: atmel
   socs:
     - name: samc21n18a
diff --git a/boards/atmel/sam0/samd20_xpro/board.yml b/boards/atmel/sam0/samd20_xpro/board.yml
index c6c44e37830..b9b4f5f91c1 100644
--- a/boards/atmel/sam0/samd20_xpro/board.yml
+++ b/boards/atmel/sam0/samd20_xpro/board.yml
@@ -1,5 +1,6 @@
 board:
   name: samd20_xpro
+  full_name: SAM D20 Xplained Pro Evaluation Kit
   vendor: atmel
   socs:
     - name: samd20j18
diff --git a/boards/atmel/sam0/samd21_xpro/board.yml b/boards/atmel/sam0/samd21_xpro/board.yml
index d4fd578dd35..80a77b66591 100644
--- a/boards/atmel/sam0/samd21_xpro/board.yml
+++ b/boards/atmel/sam0/samd21_xpro/board.yml
@@ -1,5 +1,6 @@
 board:
   name: samd21_xpro
+  full_name: SAM D21 Xplained Pro Evaluation Kit
   vendor: atmel
   socs:
     - name: samd21j18a
diff --git a/boards/atmel/sam0/same54_xpro/board.yml b/boards/atmel/sam0/same54_xpro/board.yml
index d10fef7e7b7..5f9db4f9cac 100644
--- a/boards/atmel/sam0/same54_xpro/board.yml
+++ b/boards/atmel/sam0/same54_xpro/board.yml
@@ -1,5 +1,6 @@
 board:
   name: same54_xpro
+  full_name: SAM E54 Xplained Pro Evaluation Kit
   vendor: atmel
   socs:
     - name: same54p20a
diff --git a/boards/atmel/sam0/saml21_xpro/board.yml b/boards/atmel/sam0/saml21_xpro/board.yml
index 10e2284d58b..84e7735c208 100644
--- a/boards/atmel/sam0/saml21_xpro/board.yml
+++ b/boards/atmel/sam0/saml21_xpro/board.yml
@@ -1,5 +1,6 @@
 board:
   name: saml21_xpro
+  full_name: SAM L21 Xplained Pro Evaluation Kit
   vendor: atmel
   socs:
     - name: saml21j18b
diff --git a/boards/atmel/sam0/samr21_xpro/board.yml b/boards/atmel/sam0/samr21_xpro/board.yml
index c56b60ffc6f..c84a465484a 100644
--- a/boards/atmel/sam0/samr21_xpro/board.yml
+++ b/boards/atmel/sam0/samr21_xpro/board.yml
@@ -1,5 +1,6 @@
 board:
   name: samr21_xpro
+  full_name: SAM R21 Xplained Pro Evaluation Kit
   vendor: atmel
   socs:
     - name: samr21g18a
diff --git a/boards/atmel/sam0/samr34_xpro/board.yml b/boards/atmel/sam0/samr34_xpro/board.yml
index 39df0e0451b..22e7d8ba93a 100644
--- a/boards/atmel/sam0/samr34_xpro/board.yml
+++ b/boards/atmel/sam0/samr34_xpro/board.yml
@@ -1,5 +1,6 @@
 board:
   name: samr34_xpro
+  full_name: SAM R34 Xplained Pro Evaluation Kit
   vendor: atmel
   socs:
     - name: samr34j18b
diff --git a/boards/bbc/microbit/board.yml b/boards/bbc/microbit/board.yml
index 3983adf061e..228452b8afc 100644
--- a/boards/bbc/microbit/board.yml
+++ b/boards/bbc/microbit/board.yml
@@ -1,5 +1,6 @@
 board:
   name: bbc_microbit
+  full_name: "micro:bit"
   vendor: bbc
   socs:
   - name: nrf51822
diff --git a/boards/bbc/microbit_v2/board.yml b/boards/bbc/microbit_v2/board.yml
index 1355002a7d1..11ceee12980 100644
--- a/boards/bbc/microbit_v2/board.yml
+++ b/boards/bbc/microbit_v2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: bbc_microbit_v2
+  full_name: "micro:bit V2"
   vendor: bbc
   socs:
   - name: nrf52833
diff --git a/boards/bcdevices/plt_demo_v2/board.yml b/boards/bcdevices/plt_demo_v2/board.yml
index 2d0c58bf628..f95af32a2ac 100644
--- a/boards/bcdevices/plt_demo_v2/board.yml
+++ b/boards/bcdevices/plt_demo_v2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: blueclover_plt_demo_v2
+  full_name: Blue Clover PLT Demo V2 nRF52832
   vendor: bcdevices
   socs:
   - name: nrf52832
diff --git a/boards/beagle/beagleconnect_freedom/board.yml b/boards/beagle/beagleconnect_freedom/board.yml
index a0d11fb2410..b7ce3ced0a0 100644
--- a/boards/beagle/beagleconnect_freedom/board.yml
+++ b/boards/beagle/beagleconnect_freedom/board.yml
@@ -1,5 +1,6 @@
 board:
   name: beagleconnect_freedom
+  full_name: BeagleConnect Freedom
   vendor: beagle
   socs:
   - name: cc1352p7
diff --git a/boards/beagle/beagleplay/board.yml b/boards/beagle/beagleplay/board.yml
index b412fda0ef3..bd63c308242 100644
--- a/boards/beagle/beagleplay/board.yml
+++ b/boards/beagle/beagleplay/board.yml
@@ -1,5 +1,6 @@
 board:
   name: beagleplay
+  full_name: BeaglePlay (CC1352)
   vendor: beagle
   socs:
   - name: cc1352p7
diff --git a/boards/beagle/beaglev_fire/board.yml b/boards/beagle/beaglev_fire/board.yml
index 60520301134..7275bd7aafd 100644
--- a/boards/beagle/beaglev_fire/board.yml
+++ b/boards/beagle/beaglev_fire/board.yml
@@ -1,5 +1,6 @@
 board:
   name: beaglev_fire
+  full_name: BeagleV®-Fire
   vendor: beagle
   socs:
   - name: polarfire
diff --git a/boards/blues/swan_r5/board.yml b/boards/blues/swan_r5/board.yml
index d9d4096e352..48db6d2a4e7 100644
--- a/boards/blues/swan_r5/board.yml
+++ b/boards/blues/swan_r5/board.yml
@@ -1,5 +1,6 @@
 board:
   name: swan_r5
+  full_name: Swan
   vendor: blues
   socs:
     - name: stm32l4r5xx
diff --git a/boards/brcm/bcm958401m2/board.yml b/boards/brcm/bcm958401m2/board.yml
index 06c116fe825..ac55cec0fe9 100644
--- a/boards/brcm/bcm958401m2/board.yml
+++ b/boards/brcm/bcm958401m2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: bcm958401m2
+  full_name: BCM958401M2
   vendor: brcm
   socs:
   - name: bcm58400
diff --git a/boards/brcm/bcm958402m2/board.yml b/boards/brcm/bcm958402m2/board.yml
index e9ad1770ed5..85a0692a3f7 100644
--- a/boards/brcm/bcm958402m2/board.yml
+++ b/boards/brcm/bcm958402m2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: bcm958402m2
+  full_name: BCM958402M2 (Cortex-M7)
   vendor: brcm
   socs:
   - name: bcm58402
diff --git a/boards/bytesatwork/bytesensi_l/board.yml b/boards/bytesatwork/bytesensi_l/board.yml
index 04e4cd9ad11..b3c88c01c84 100644
--- a/boards/bytesatwork/bytesensi_l/board.yml
+++ b/boards/bytesatwork/bytesensi_l/board.yml
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 board:
   name: bytesensi_l
+  full_name: byteSENSI-L
   vendor: bytesatwork
   socs:
   - name: nrf52832
diff --git a/boards/cdns/xt-sim/board.yml b/boards/cdns/xt-sim/board.yml
index d162e416a3b..b3a0b332df0 100644
--- a/boards/cdns/xt-sim/board.yml
+++ b/boards/cdns/xt-sim/board.yml
@@ -1,5 +1,6 @@
 board:
   name: xt-sim
+  full_name: Xtensa simulator
   vendor: cdns
   socs:
   - name: xtensa_sample_controller
diff --git a/boards/circuitdojo/feather/board.yml b/boards/circuitdojo/feather/board.yml
index 0eb6ff5c4c0..19758e27b6b 100644
--- a/boards/circuitdojo/feather/board.yml
+++ b/boards/circuitdojo/feather/board.yml
@@ -1,5 +1,6 @@
 board:
   name: circuitdojo_feather
+  full_name: nRF9160 Feather
   vendor: circuitdojo
   socs:
   - name: nrf9160
diff --git a/boards/contextualelectronics/abc/board.yml b/boards/contextualelectronics/abc/board.yml
index 5c921f05256..6209af4e9c4 100644
--- a/boards/contextualelectronics/abc/board.yml
+++ b/boards/contextualelectronics/abc/board.yml
@@ -1,5 +1,6 @@
 board:
   name: contextualelectronics_abc
+  full_name: Advanced BLE Cell
   vendor: contextualelectronics
   socs:
   - name: nrf52840
diff --git a/boards/croxel/croxel_cx1825/board.yml b/boards/croxel/croxel_cx1825/board.yml
index eed390e4a2c..8c32a6c2acd 100644
--- a/boards/croxel/croxel_cx1825/board.yml
+++ b/boards/croxel/croxel_cx1825/board.yml
@@ -1,5 +1,6 @@
 board:
   name: croxel_cx1825
+  full_name: CX1825 nRF52840
   vendor: croxel
   socs:
   - name: nrf52840
diff --git a/boards/ct/ctcc/board.yml b/boards/ct/ctcc/board.yml
index 780a02f7e7c..b6212047d79 100644
--- a/boards/ct/ctcc/board.yml
+++ b/boards/ct/ctcc/board.yml
@@ -1,4 +1,5 @@
 board:
   name: ctcc
+  full_name: Connectivity Card nRF52840
   socs:
     - name: nrf52840
diff --git a/boards/cypress/cy8ckit_062_ble/board.yml b/boards/cypress/cy8ckit_062_ble/board.yml
index f0b1325911a..8640f1e7d98 100644
--- a/boards/cypress/cy8ckit_062_ble/board.yml
+++ b/boards/cypress/cy8ckit_062_ble/board.yml
@@ -1,5 +1,6 @@
 board:
   name: cy8ckit_062_ble
+  full_name: PSoC63 BLE Pioneer Kit
   vendor: cypress
   revision:
     format: "major.minor.patch"
diff --git a/boards/cypress/cy8ckit_062_wifi_bt/board.yml b/boards/cypress/cy8ckit_062_wifi_bt/board.yml
index f5113e41a55..f070d6f3960 100644
--- a/boards/cypress/cy8ckit_062_wifi_bt/board.yml
+++ b/boards/cypress/cy8ckit_062_wifi_bt/board.yml
@@ -1,5 +1,6 @@
 board:
   name: cy8ckit_062_wifi_bt
+  full_name: PSoC6 WiFi-BT Pioneer Kit
   vendor: cypress
   socs:
   - name: cy8c6247
diff --git a/boards/digilent/arty_a7/board.yml b/boards/digilent/arty_a7/board.yml
index 14a2c9ef418..3ae72eb903b 100644
--- a/boards/digilent/arty_a7/board.yml
+++ b/boards/digilent/arty_a7/board.yml
@@ -1,5 +1,6 @@
 board:
   name: arty_a7
+  full_name: Arty
   vendor: digilent
   socs:
   - name: designstart_fpga_cortex_m1
diff --git a/boards/digilent/zybo/board.yml b/boards/digilent/zybo/board.yml
index f9c9c98bea2..c8970300955 100644
--- a/boards/digilent/zybo/board.yml
+++ b/boards/digilent/zybo/board.yml
@@ -1,5 +1,6 @@
 board:
   name: zybo
+  full_name: Zybo
   vendor: digilent
   socs:
   - name: xc7z010
diff --git a/boards/dptechnics/walter/board.yml b/boards/dptechnics/walter/board.yml
index c416d547fb2..7d5b0e1cc85 100644
--- a/boards/dptechnics/walter/board.yml
+++ b/boards/dptechnics/walter/board.yml
@@ -1,5 +1,6 @@
 board:
   name: walter
+  full_name: Walter
   vendor: dptechnics
   socs:
   - name: esp32s3
diff --git a/boards/dragino/lsn50/board.yml b/boards/dragino/lsn50/board.yml
index e7c09a9c7bd..20732b34290 100644
--- a/boards/dragino/lsn50/board.yml
+++ b/boards/dragino/lsn50/board.yml
@@ -1,5 +1,6 @@
 board:
   name: dragino_lsn50
+  full_name: LSN50 LoRA Sensor Node
   vendor: dragino
   socs:
     - name: stm32l072xx
diff --git a/boards/dragino/nbsn95/board.yml b/boards/dragino/nbsn95/board.yml
index 66d568935ec..fd039983458 100644
--- a/boards/dragino/nbsn95/board.yml
+++ b/boards/dragino/nbsn95/board.yml
@@ -1,5 +1,6 @@
 board:
   name: dragino_nbsn95
+  full_name: NBSN95 NB-IoT Sensor Node
   vendor: dragino
   socs:
     - name: stm32l072xx
diff --git a/boards/ebyte/e73_tbb/board.yml b/boards/ebyte/e73_tbb/board.yml
index 3ae94fab665..bd8dc6ca8b0 100644
--- a/boards/ebyte/e73_tbb/board.yml
+++ b/boards/ebyte/e73_tbb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ebyte_e73_tbb
+  full_name: E73-TBB
   vendor: ebyte
   socs:
   - name: nrf52832
diff --git a/boards/efinix/titanium_ti60_f225/board.yml b/boards/efinix/titanium_ti60_f225/board.yml
index 7daa700f0b3..5dfb38b38b0 100644
--- a/boards/efinix/titanium_ti60_f225/board.yml
+++ b/boards/efinix/titanium_ti60_f225/board.yml
@@ -1,5 +1,6 @@
 board:
   name: titanium_ti60_f225
+  full_name: Titanium Ti60 F225
   vendor: efinix
   socs:
   - name: efinix_sapphire
diff --git a/boards/electronut/nrf52840_blip/board.yml b/boards/electronut/nrf52840_blip/board.yml
index 3964f015c2f..874c923a092 100644
--- a/boards/electronut/nrf52840_blip/board.yml
+++ b/boards/electronut/nrf52840_blip/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf52840_blip
+  full_name: Labs Blip
   vendor: electronut
   socs:
   - name: nrf52840
diff --git a/boards/electronut/nrf52840_papyr/board.yml b/boards/electronut/nrf52840_papyr/board.yml
index fcb089ad625..e24da1b0b51 100644
--- a/boards/electronut/nrf52840_papyr/board.yml
+++ b/boards/electronut/nrf52840_papyr/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf52840_papyr
+  full_name: Labs Papyr
   vendor: electronut
   socs:
   - name: nrf52840
diff --git a/boards/element14/warp7/board.yml b/boards/element14/warp7/board.yml
index 99b037ded48..492d4e53898 100644
--- a/boards/element14/warp7/board.yml
+++ b/boards/element14/warp7/board.yml
@@ -1,5 +1,6 @@
 board:
   name: warp7
+  full_name: WaRP7 - Next Generation IoT and Wearable Development Platform
   vendor: element14
   socs:
     - name: mcimx7d
diff --git a/boards/enclustra/mercury_xu/board.yml b/boards/enclustra/mercury_xu/board.yml
index 739a5c95857..2f88257c1ef 100644
--- a/boards/enclustra/mercury_xu/board.yml
+++ b/boards/enclustra/mercury_xu/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mercury_xu
+  full_name: MERCURY-XU
   vendor: enclustra
   socs:
   - name: zynqmp_rpu
diff --git a/boards/ene/kb1200_evb/board.yml b/boards/ene/kb1200_evb/board.yml
index d8dd4b412c7..7bff5726453 100644
--- a/boards/ene/kb1200_evb/board.yml
+++ b/boards/ene/kb1200_evb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: kb1200_evb
+  full_name: ENE KB1200_EVB
   vendor: ene
   socs:
   - name: kb1200
diff --git a/boards/enjoydigital/litex_vexriscv/board.yml b/boards/enjoydigital/litex_vexriscv/board.yml
index 18ea360bb83..c5cd6829183 100644
--- a/boards/enjoydigital/litex_vexriscv/board.yml
+++ b/boards/enjoydigital/litex_vexriscv/board.yml
@@ -1,5 +1,6 @@
 board:
   name: litex_vexriscv
+  full_name: LiteX VexRiscv
   vendor: litex
   socs:
   - name: litex_vexriscv
diff --git a/boards/espressif/esp32_devkitc_wroom/board.yml b/boards/espressif/esp32_devkitc_wroom/board.yml
index 42d9d88dc23..e0d766da0d1 100644
--- a/boards/espressif/esp32_devkitc_wroom/board.yml
+++ b/boards/espressif/esp32_devkitc_wroom/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp32_devkitc_wroom
+  full_name: ESP32-DevKitC-WROOM
   vendor: espressif
   socs:
   - name: esp32
diff --git a/boards/espressif/esp32_devkitc_wrover/board.yml b/boards/espressif/esp32_devkitc_wrover/board.yml
index e0eae97f70f..2a8e2a226fd 100644
--- a/boards/espressif/esp32_devkitc_wrover/board.yml
+++ b/boards/espressif/esp32_devkitc_wrover/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp32_devkitc_wrover
+  full_name: ESP32-DevKitC-WROVER
   vendor: espressif
   socs:
   - name: esp32
diff --git a/boards/espressif/esp32_ethernet_kit/board.yml b/boards/espressif/esp32_ethernet_kit/board.yml
index 747690f38a6..b7a96265433 100644
--- a/boards/espressif/esp32_ethernet_kit/board.yml
+++ b/boards/espressif/esp32_ethernet_kit/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp32_ethernet_kit
+  full_name: ESP32-Ethernet-Kit
   vendor: espressif
   socs:
   - name: esp32
diff --git a/boards/espressif/esp32c3_devkitc/board.yml b/boards/espressif/esp32c3_devkitc/board.yml
index 22db88f664c..5f122687f00 100644
--- a/boards/espressif/esp32c3_devkitc/board.yml
+++ b/boards/espressif/esp32c3_devkitc/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp32c3_devkitc
+  full_name: ESP32-C3-DevKitC
   vendor: espressif
   socs:
   - name: esp32c3
diff --git a/boards/espressif/esp32c3_devkitm/board.yml b/boards/espressif/esp32c3_devkitm/board.yml
index 649dce34a7d..90bd85dacc8 100644
--- a/boards/espressif/esp32c3_devkitm/board.yml
+++ b/boards/espressif/esp32c3_devkitm/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp32c3_devkitm
+  full_name: ESP32-C3-DevKitM
   vendor: espressif
   socs:
   - name: esp32c3
diff --git a/boards/espressif/esp32c3_rust/board.yml b/boards/espressif/esp32c3_rust/board.yml
index 36dd9b55248..b8beeef6819 100644
--- a/boards/espressif/esp32c3_rust/board.yml
+++ b/boards/espressif/esp32c3_rust/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: esp32c3_rust
+  full_name: ESP32-C3-DevKit-RUST
   vendor: espressif
   socs:
   - name: esp32c3
diff --git a/boards/espressif/esp32c6_devkitc/board.yml b/boards/espressif/esp32c6_devkitc/board.yml
index ad88f3a9315..485d35b548d 100644
--- a/boards/espressif/esp32c6_devkitc/board.yml
+++ b/boards/espressif/esp32c6_devkitc/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp32c6_devkitc
+  full_name: ESP32-C6-DevKitC
   vendor: espressif
   socs:
   - name: esp32c6
diff --git a/boards/espressif/esp32s2_devkitc/board.yml b/boards/espressif/esp32s2_devkitc/board.yml
index b3d62e88686..8ec0a493d8c 100644
--- a/boards/espressif/esp32s2_devkitc/board.yml
+++ b/boards/espressif/esp32s2_devkitc/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp32s2_devkitc
+  full_name: ESP32-S2-DevKitC
   vendor: espressif
   socs:
   - name: esp32s2
diff --git a/boards/espressif/esp32s2_saola/board.yml b/boards/espressif/esp32s2_saola/board.yml
index aafb5f3ee1e..69eacbf8a2c 100644
--- a/boards/espressif/esp32s2_saola/board.yml
+++ b/boards/espressif/esp32s2_saola/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp32s2_saola
+  full_name: ESP32-S2-Saola
   vendor: espressif
   socs:
   - name: esp32s2
diff --git a/boards/espressif/esp32s3_devkitc/board.yml b/boards/espressif/esp32s3_devkitc/board.yml
index a949122fd57..9d2eb9508e0 100644
--- a/boards/espressif/esp32s3_devkitc/board.yml
+++ b/boards/espressif/esp32s3_devkitc/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp32s3_devkitc
+  full_name: ESP32-S3-DevKitC
   vendor: espressif
   socs:
   - name: esp32s3
diff --git a/boards/espressif/esp32s3_devkitm/board.yml b/boards/espressif/esp32s3_devkitm/board.yml
index 2d0195fc27d..0e4abbade2e 100644
--- a/boards/espressif/esp32s3_devkitm/board.yml
+++ b/boards/espressif/esp32s3_devkitm/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp32s3_devkitm
+  full_name: ESP32-S3-DevKitM
   vendor: espressif
   socs:
   - name: esp32s3
diff --git a/boards/espressif/esp32s3_eye/board.yml b/boards/espressif/esp32s3_eye/board.yml
index b16a5a1605c..9396b3c45db 100644
--- a/boards/espressif/esp32s3_eye/board.yml
+++ b/boards/espressif/esp32s3_eye/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp32s3_eye
+  full_name: ESP32-S3-EYE
   vendor: espressif
   socs:
   - name: esp32s3
diff --git a/boards/espressif/esp8684_devkitm/board.yml b/boards/espressif/esp8684_devkitm/board.yml
index 5173f52326d..c6e86e6f11b 100644
--- a/boards/espressif/esp8684_devkitm/board.yml
+++ b/boards/espressif/esp8684_devkitm/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp8684_devkitm
+  full_name: ESP8684-DevKitM
   vendor: espressif
   socs:
   - name: esp32c2
diff --git a/boards/espressif/esp_wrover_kit/board.yml b/boards/espressif/esp_wrover_kit/board.yml
index edfaae90477..feb5c6b8bb0 100644
--- a/boards/espressif/esp_wrover_kit/board.yml
+++ b/boards/espressif/esp_wrover_kit/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp_wrover_kit
+  full_name: ESP-WROVER-KIT
   vendor: espressif
   socs:
   - name: esp32
diff --git a/boards/ezurio/bl5340_dvk/board.yml b/boards/ezurio/bl5340_dvk/board.yml
index 69be46ffe62..db71cf9ebe0 100644
--- a/boards/ezurio/bl5340_dvk/board.yml
+++ b/boards/ezurio/bl5340_dvk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: bl5340_dvk
+  full_name: BL5340 DVK
   vendor: ezurio
   socs:
   - name: 'nrf5340'
diff --git a/boards/ezurio/bl652_dvk/board.yml b/boards/ezurio/bl652_dvk/board.yml
index b573627457f..2e8064165c0 100644
--- a/boards/ezurio/bl652_dvk/board.yml
+++ b/boards/ezurio/bl652_dvk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: bl652_dvk
+  full_name: BL652 DVK
   vendor: ezurio
   socs:
   - name: nrf52832
diff --git a/boards/ezurio/bl653_dvk/board.yml b/boards/ezurio/bl653_dvk/board.yml
index dc42555309a..5f6dac2d9ae 100644
--- a/boards/ezurio/bl653_dvk/board.yml
+++ b/boards/ezurio/bl653_dvk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: bl653_dvk
+  full_name: BL653 DVK
   vendor: ezurio
   socs:
   - name: nrf52833
diff --git a/boards/ezurio/bl654_dvk/board.yml b/boards/ezurio/bl654_dvk/board.yml
index fdc9035ff68..e92ddc965cf 100644
--- a/boards/ezurio/bl654_dvk/board.yml
+++ b/boards/ezurio/bl654_dvk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: bl654_dvk
+  full_name: BL654 DVK
   vendor: ezurio
   socs:
   - name: nrf52840
diff --git a/boards/ezurio/bl654_sensor_board/board.yml b/boards/ezurio/bl654_sensor_board/board.yml
index 566c992411d..dacfa7f7276 100644
--- a/boards/ezurio/bl654_sensor_board/board.yml
+++ b/boards/ezurio/bl654_sensor_board/board.yml
@@ -1,5 +1,6 @@
 board:
   name: bl654_sensor_board
+  full_name: BL654 Sensor Board
   vendor: ezurio
   socs:
   - name: nrf52840
diff --git a/boards/ezurio/bl654_usb/board.yml b/boards/ezurio/bl654_usb/board.yml
index 13642fbe712..6329e4db30c 100644
--- a/boards/ezurio/bl654_usb/board.yml
+++ b/boards/ezurio/bl654_usb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: bl654_usb
+  full_name: BL654 USB (451-00004)
   vendor: ezurio
   socs:
   - name: nrf52840
diff --git a/boards/ezurio/bt510/board.yml b/boards/ezurio/bt510/board.yml
index e4692ed4526..d95dcc4edfb 100644
--- a/boards/ezurio/bt510/board.yml
+++ b/boards/ezurio/bt510/board.yml
@@ -1,5 +1,6 @@
 board:
   name: bt510
+  full_name: Sentrius BT510 Sensor
   vendor: ezurio
   socs:
   - name: nrf52840
diff --git a/boards/ezurio/bt610/board.yml b/boards/ezurio/bt610/board.yml
index 0e4f29742c5..b586cf0a5ca 100644
--- a/boards/ezurio/bt610/board.yml
+++ b/boards/ezurio/bt610/board.yml
@@ -1,5 +1,6 @@
 board:
   name: bt610
+  full_name: Sentrius BT610 Sensor
   vendor: ezurio
   socs:
   - name: nrf52840
diff --git a/boards/ezurio/mg100/board.yml b/boards/ezurio/mg100/board.yml
index 4c62320fc5e..5a44c139a68 100644
--- a/boards/ezurio/mg100/board.yml
+++ b/boards/ezurio/mg100/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mg100
+  full_name: Sentrius™ MG100 Gateway
   vendor: ezurio
   socs:
   - name: nrf52840
diff --git a/boards/ezurio/pinnacle_100_dvk/board.yml b/boards/ezurio/pinnacle_100_dvk/board.yml
index 8ed639a9a0a..f2b98cd1577 100644
--- a/boards/ezurio/pinnacle_100_dvk/board.yml
+++ b/boards/ezurio/pinnacle_100_dvk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: pinnacle_100_dvk
+  full_name: Pinnacle 100 DVK
   vendor: ezurio
   socs:
   - name: nrf52840
diff --git a/boards/ezurio/rm1xx_dvk/board.yml b/boards/ezurio/rm1xx_dvk/board.yml
index 4a8792eecc5..f293c416c2d 100644
--- a/boards/ezurio/rm1xx_dvk/board.yml
+++ b/boards/ezurio/rm1xx_dvk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: rm1xx_dvk
+  full_name: RM1xx DVK
   vendor: ezurio
   socs:
   - name: nrf51822
diff --git a/boards/fanke/fk7b0m1_vbt6/board.yml b/boards/fanke/fk7b0m1_vbt6/board.yml
index 204e3538a93..e4ce6586425 100644
--- a/boards/fanke/fk7b0m1_vbt6/board.yml
+++ b/boards/fanke/fk7b0m1_vbt6/board.yml
@@ -1,5 +1,6 @@
 board:
   name: fk7b0m1_vbt6
+  full_name: FK7B0M1-VBT6
   vendor: fanke
   socs:
     - name: stm32h7b0xx
diff --git a/boards/firefly/roc_rk3568_pc/board.yml b/boards/firefly/roc_rk3568_pc/board.yml
index 8a60a165dc4..a123b1f37cc 100644
--- a/boards/firefly/roc_rk3568_pc/board.yml
+++ b/boards/firefly/roc_rk3568_pc/board.yml
@@ -1,5 +1,6 @@
 board:
   name: roc_rk3568_pc
+  full_name: ROC-RK3568-PC (Quad-core Cortex-A55)
   vendor: firefly
   socs:
   - name: rk3568
diff --git a/boards/franzininho/esp32s2_franzininho/board.yml b/boards/franzininho/esp32s2_franzininho/board.yml
index 913c4d4232f..530d5dcec4e 100644
--- a/boards/franzininho/esp32s2_franzininho/board.yml
+++ b/boards/franzininho/esp32s2_franzininho/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp32s2_franzininho
+  full_name: ESP32-S2 Franzininho
   vendor: espressif
   socs:
   - name: esp32s2
diff --git a/boards/gaisler/generic_leon3/board.yml b/boards/gaisler/generic_leon3/board.yml
index 33c4d806add..582dd45593b 100644
--- a/boards/gaisler/generic_leon3/board.yml
+++ b/boards/gaisler/generic_leon3/board.yml
@@ -1,5 +1,6 @@
 board:
   name: generic_leon3
+  full_name: Generic LEON3
   vendor: gaisler
   socs:
   - name: leon3
diff --git a/boards/gaisler/gr716a_mini/board.yml b/boards/gaisler/gr716a_mini/board.yml
index 0de80629b40..b9155b69a92 100644
--- a/boards/gaisler/gr716a_mini/board.yml
+++ b/boards/gaisler/gr716a_mini/board.yml
@@ -1,5 +1,6 @@
 board:
   name: gr716a_mini
+  full_name: GR716-MINI Development Board
   vendor: gaisler
   socs:
   - name: gr716a
diff --git a/boards/gd/gd32a503v_eval/board.yml b/boards/gd/gd32a503v_eval/board.yml
index 129cf4b0b50..6097143109e 100644
--- a/boards/gd/gd32a503v_eval/board.yml
+++ b/boards/gd/gd32a503v_eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: gd32a503v_eval
+  full_name: GD32A503V-EVAL
   vendor: gd
   socs:
     - name: gd32a503
diff --git a/boards/gd/gd32e103v_eval/board.yml b/boards/gd/gd32e103v_eval/board.yml
index 1c489697783..cc70a188967 100644
--- a/boards/gd/gd32e103v_eval/board.yml
+++ b/boards/gd/gd32e103v_eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: gd32e103v_eval
+  full_name: GD32E103V-EVAL
   vendor: gd
   socs:
     - name: gd32e103
diff --git a/boards/gd/gd32e507v_start/board.yml b/boards/gd/gd32e507v_start/board.yml
index b364620f61a..09e4310394c 100644
--- a/boards/gd/gd32e507v_start/board.yml
+++ b/boards/gd/gd32e507v_start/board.yml
@@ -1,5 +1,6 @@
 board:
   name: gd32e507v_start
+  full_name: GD32E507V-START
   vendor: gd
   socs:
     - name: gd32e507
diff --git a/boards/gd/gd32e507z_eval/board.yml b/boards/gd/gd32e507z_eval/board.yml
index 2325550db5d..2eaba014c2c 100644
--- a/boards/gd/gd32e507z_eval/board.yml
+++ b/boards/gd/gd32e507z_eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: gd32e507z_eval
+  full_name: GD32E507Z-EVAL
   vendor: gd
   socs:
     - name: gd32e507
diff --git a/boards/gd/gd32f350r_eval/board.yml b/boards/gd/gd32f350r_eval/board.yml
index ee486b17983..a272193e2e8 100644
--- a/boards/gd/gd32f350r_eval/board.yml
+++ b/boards/gd/gd32f350r_eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: gd32f350r_eval
+  full_name: GD32F350R-EVAL
   vendor: gd
   socs:
     - name: gd32f350
diff --git a/boards/gd/gd32f403z_eval/board.yml b/boards/gd/gd32f403z_eval/board.yml
index 222ba863858..3d45844a0c5 100644
--- a/boards/gd/gd32f403z_eval/board.yml
+++ b/boards/gd/gd32f403z_eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: gd32f403z_eval
+  full_name: GD32F403Z-EVAL
   vendor: gd
   socs:
     - name: gd32f403
diff --git a/boards/gd/gd32f407v_start/board.yml b/boards/gd/gd32f407v_start/board.yml
index c4a99ab566e..bf6d7af7c34 100644
--- a/boards/gd/gd32f407v_start/board.yml
+++ b/boards/gd/gd32f407v_start/board.yml
@@ -1,5 +1,6 @@
 board:
   name: gd32f407v_start
+  full_name: GD32F407V-START
   vendor: gd
   socs:
     - name: gd32f407
diff --git a/boards/gd/gd32f450i_eval/board.yml b/boards/gd/gd32f450i_eval/board.yml
index a5da3b33c36..56b3f1eebed 100644
--- a/boards/gd/gd32f450i_eval/board.yml
+++ b/boards/gd/gd32f450i_eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: gd32f450i_eval
+  full_name: GD32F450I-EVAL
   vendor: gd
   socs:
     - name: gd32f450
diff --git a/boards/gd/gd32f450v_start/board.yml b/boards/gd/gd32f450v_start/board.yml
index 96e00536946..02b20c36692 100644
--- a/boards/gd/gd32f450v_start/board.yml
+++ b/boards/gd/gd32f450v_start/board.yml
@@ -1,5 +1,6 @@
 board:
   name: gd32f450v_start
+  full_name: GD32F450V-START
   vendor: gd
   socs:
     - name: gd32f450
diff --git a/boards/gd/gd32f450z_eval/board.yml b/boards/gd/gd32f450z_eval/board.yml
index 53e30794b6a..f82107573f7 100644
--- a/boards/gd/gd32f450z_eval/board.yml
+++ b/boards/gd/gd32f450z_eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: gd32f450z_eval
+  full_name: GD32F450Z-EVAL
   vendor: gd
   socs:
     - name: gd32f450
diff --git a/boards/gd/gd32f470i_eval/board.yml b/boards/gd/gd32f470i_eval/board.yml
index a4205dc69d2..c6cc2501b15 100644
--- a/boards/gd/gd32f470i_eval/board.yml
+++ b/boards/gd/gd32f470i_eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: gd32f470i_eval
+  full_name: GD32F470I-EVAL
   vendor: gd
   socs:
     - name: gd32f470
diff --git a/boards/gd/gd32l233r_eval/board.yml b/boards/gd/gd32l233r_eval/board.yml
index 847def4fe2c..5b731d9bcff 100644
--- a/boards/gd/gd32l233r_eval/board.yml
+++ b/boards/gd/gd32l233r_eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: gd32l233r_eval
+  full_name: GD32L233R-EVA
   vendor: gd
   socs:
     - name: gd32l233
diff --git a/boards/gd/gd32vf103c_starter/board.yml b/boards/gd/gd32vf103c_starter/board.yml
index e91c7178af8..d46555ad96f 100644
--- a/boards/gd/gd32vf103c_starter/board.yml
+++ b/boards/gd/gd32vf103c_starter/board.yml
@@ -1,5 +1,6 @@
 board:
   name: gd32vf103c_starter
+  full_name: GD32VF103C-STARTER
   vendor: gd
   socs:
     - name: gd32vf103
diff --git a/boards/gd/gd32vf103v_eval/board.yml b/boards/gd/gd32vf103v_eval/board.yml
index 3d12d916d38..58c34ef2232 100644
--- a/boards/gd/gd32vf103v_eval/board.yml
+++ b/boards/gd/gd32vf103v_eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: gd32vf103v_eval
+  full_name: GD32VF103V-EVAL
   vendor: gd
   socs:
     - name: gd32vf103
diff --git a/boards/google/dragonclaw/board.yml b/boards/google/dragonclaw/board.yml
index 18e233f99b6..be55d603e76 100644
--- a/boards/google/dragonclaw/board.yml
+++ b/boards/google/dragonclaw/board.yml
@@ -1,5 +1,6 @@
 board:
   name: google_dragonclaw
+  full_name: Dragonclaw Development Board
   vendor: google
   socs:
     - name: stm32f412cx
diff --git a/boards/google/twinkie_v2/board.yml b/boards/google/twinkie_v2/board.yml
index b77d79328f7..f7129ebec4f 100644
--- a/boards/google/twinkie_v2/board.yml
+++ b/boards/google/twinkie_v2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: google_twinkie_v2
+  full_name: Twinkie V2
   vendor: google
   socs:
     - name: stm32g0b1xx
diff --git a/boards/hardkernel/odroid_go/board.yml b/boards/hardkernel/odroid_go/board.yml
index fad513c5ee9..390cff4aa57 100644
--- a/boards/hardkernel/odroid_go/board.yml
+++ b/boards/hardkernel/odroid_go/board.yml
@@ -1,5 +1,6 @@
 board:
   name: odroid_go
+  full_name: ODROID-GO
   vendor: hardkernel
   socs:
   - name: esp32
diff --git a/boards/heltec/heltec_wifi_lora32_v2/board.yml b/boards/heltec/heltec_wifi_lora32_v2/board.yml
index e87344a9766..dee24b3f3b6 100644
--- a/boards/heltec/heltec_wifi_lora32_v2/board.yml
+++ b/boards/heltec/heltec_wifi_lora32_v2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: heltec_wifi_lora32_v2
+  full_name: WiFi LoRa 32 (V2)
   vendor: heltec
   socs:
   - name: esp32
diff --git a/boards/heltec/heltec_wireless_stick_lite_v3/board.yml b/boards/heltec/heltec_wireless_stick_lite_v3/board.yml
index 12cb133cb4f..315b46477ed 100644
--- a/boards/heltec/heltec_wireless_stick_lite_v3/board.yml
+++ b/boards/heltec/heltec_wireless_stick_lite_v3/board.yml
@@ -1,5 +1,6 @@
 board:
   name: heltec_wireless_stick_lite_v3
+  full_name: Wireless Stick Lite (V3)
   vendor: heltec
   socs:
   - name: esp32s3
diff --git a/boards/holyiot/yj16019/board.yml b/boards/holyiot/yj16019/board.yml
index e8ab16bc427..db082ff6428 100644
--- a/boards/holyiot/yj16019/board.yml
+++ b/boards/holyiot/yj16019/board.yml
@@ -1,5 +1,6 @@
 board:
   name: holyiot_yj16019
+  full_name: YJ-16019
   vendor: holyiot
   socs:
   - name: nrf52832
diff --git a/boards/infineon/cy8ckit_062s4/board.yml b/boards/infineon/cy8ckit_062s4/board.yml
index c460d9f0503..12d2f987008 100644
--- a/boards/infineon/cy8ckit_062s4/board.yml
+++ b/boards/infineon/cy8ckit_062s4/board.yml
@@ -1,5 +1,6 @@
 board:
   name: cy8ckit_062s4
+  full_name: PSOC 62S4 Pioneer Kit
   vendor: infineon
   socs:
   - name: cy8c6244lqi_s4d92
diff --git a/boards/infineon/cy8cproto_062_4343w/board.yml b/boards/infineon/cy8cproto_062_4343w/board.yml
index f89df6ee65e..6d697b9b142 100644
--- a/boards/infineon/cy8cproto_062_4343w/board.yml
+++ b/boards/infineon/cy8cproto_062_4343w/board.yml
@@ -1,5 +1,6 @@
 board:
   name: cy8cproto_062_4343w
+  full_name: CY8CPROTO-062-4343W
   vendor: infineon
   socs:
   - name: cy8c624abzi_s2d44
diff --git a/boards/infineon/cy8cproto_063_ble/board.yml b/boards/infineon/cy8cproto_063_ble/board.yml
index 6ef5bd8e9d7..d6083a9b171 100644
--- a/boards/infineon/cy8cproto_063_ble/board.yml
+++ b/boards/infineon/cy8cproto_063_ble/board.yml
@@ -1,5 +1,6 @@
 board:
   name: cy8cproto_063_ble
+  full_name: CY8CPROTO-063-BLE
   vendor: infineon
   socs:
   - name: cyble_416045_02
diff --git a/boards/infineon/cyw920829m2evk_02/board.yml b/boards/infineon/cyw920829m2evk_02/board.yml
index e25e3922b53..c6103646441 100644
--- a/boards/infineon/cyw920829m2evk_02/board.yml
+++ b/boards/infineon/cyw920829m2evk_02/board.yml
@@ -1,5 +1,6 @@
 board:
   name: cyw920829m2evk_02
+  full_name: CYW920829M2EVK-02
   vendor: infineon
   socs:
   - name: cyw20829b0lkml
diff --git a/boards/infineon/xmc45_relax_kit/board.yml b/boards/infineon/xmc45_relax_kit/board.yml
index 9622337aa30..77d1049bf4c 100644
--- a/boards/infineon/xmc45_relax_kit/board.yml
+++ b/boards/infineon/xmc45_relax_kit/board.yml
@@ -1,5 +1,6 @@
 board:
   name: xmc45_relax_kit
+  full_name: XMC45-RELAX-KIT
   vendor: infineon
   socs:
   - name: xmc4500
diff --git a/boards/infineon/xmc47_relax_kit/board.yml b/boards/infineon/xmc47_relax_kit/board.yml
index e0077321e3a..4a081064beb 100644
--- a/boards/infineon/xmc47_relax_kit/board.yml
+++ b/boards/infineon/xmc47_relax_kit/board.yml
@@ -1,5 +1,6 @@
 board:
   name: xmc47_relax_kit
+  full_name: XMC47-RELAX-KIT
   vendor: infineon
   socs:
   - name: xmc4700
diff --git a/boards/innblue/innblue21/board.yml b/boards/innblue/innblue21/board.yml
index 8d62be56790..e8250dccf0c 100644
--- a/boards/innblue/innblue21/board.yml
+++ b/boards/innblue/innblue21/board.yml
@@ -1,5 +1,6 @@
 board:
   name: innblue21
+  full_name: nRF9160 INNBLUE21
   vendor: innblue
   socs:
   - name: nrf9160
diff --git a/boards/innblue/innblue22/board.yml b/boards/innblue/innblue22/board.yml
index eeb4f946ffb..2b7f6691aba 100644
--- a/boards/innblue/innblue22/board.yml
+++ b/boards/innblue/innblue22/board.yml
@@ -1,5 +1,6 @@
 board:
   name: innblue22
+  full_name: nRF9160 INNBLUE22
   vendor: innblue
   socs:
   - name: nrf9160
diff --git a/boards/intel/adl/board.yml b/boards/intel/adl/board.yml
index fe51b63f813..29b9272757c 100644
--- a/boards/intel/adl/board.yml
+++ b/boards/intel/adl/board.yml
@@ -1,9 +1,11 @@
 boards:
   - name: intel_adl_crb
+    full_name: Alder Lake CRB
     vendor: intel
     socs:
       - name: alder_lake
   - name: intel_adl_rvp
+    full_name: Alder Lake RVP
     vendor: intel
     socs:
       - name: alder_lake
diff --git a/boards/intel/adsp/board.yml b/boards/intel/adsp/board.yml
index 43004e8f2a4..c169a14487b 100644
--- a/boards/intel/adsp/board.yml
+++ b/boards/intel/adsp/board.yml
@@ -1,5 +1,6 @@
 boards:
   - name: intel_adsp
+    full_name: Intel ADSP
     vendor: intel
     socs:
       - name: cavs25
diff --git a/boards/intel/ehl/board.yml b/boards/intel/ehl/board.yml
index 5f8d3cafa1b..05bb75ffe05 100644
--- a/boards/intel/ehl/board.yml
+++ b/boards/intel/ehl/board.yml
@@ -1,5 +1,6 @@
 board:
   name: intel_ehl_crb
+  full_name: Elkhart Lake CRB
   vendor: intel
   socs:
     - name: elkhart_lake
diff --git a/boards/intel/ish/board.yml b/boards/intel/ish/board.yml
index ee7c4661800..3083cc961db 100644
--- a/boards/intel/ish/board.yml
+++ b/boards/intel/ish/board.yml
@@ -1,16 +1,19 @@
 boards:
 
   - name: intel_ish_5_4_1
+    full_name: Integrated Sensor Hub (ISH) 5.4.1
     vendor: intel
     socs:
       - name: intel_ish_5_4_1
 
   - name: intel_ish_5_6_0
+    full_name: Integrated Sensor Hub (ISH) 5.6.0
     vendor: intel
     socs:
       - name: intel_ish_5_6_0
 
   - name: intel_ish_5_8_0
+    full_name: Integrated Sensor Hub (ISH) 5.8.0
     vendor: intel
     socs:
       - name: intel_ish_5_8_0
diff --git a/boards/intel/niosv_g/board.yml b/boards/intel/niosv_g/board.yml
index 7f6cc30ce62..811aee73f34 100644
--- a/boards/intel/niosv_g/board.yml
+++ b/boards/intel/niosv_g/board.yml
@@ -1,4 +1,5 @@
 board:
   name: niosv_g
+  full_name: INTEL FPGA niosv_g
   socs:
     - name: niosv_g
diff --git a/boards/intel/niosv_m/board.yml b/boards/intel/niosv_m/board.yml
index a77efa39ff1..cc7b9bb3bf5 100644
--- a/boards/intel/niosv_m/board.yml
+++ b/boards/intel/niosv_m/board.yml
@@ -1,4 +1,5 @@
 board:
   name: niosv_m
+  full_name: INTEL FPGA niosv_m
   socs:
     - name: niosv_m
diff --git a/boards/intel/rpl/board.yml b/boards/intel/rpl/board.yml
index cc3969adced..9f35b648699 100644
--- a/boards/intel/rpl/board.yml
+++ b/boards/intel/rpl/board.yml
@@ -1,9 +1,11 @@
 boards:
   - name: intel_rpl_p_crb
+    full_name: Raptor Lake P CRB
     vendor: intel
     socs:
       - name: raptor_lake
   - name: intel_rpl_s_crb
+    full_name: Raptor Lake S CRB
     vendor: intel
     socs:
       - name: raptor_lake
diff --git a/boards/intel/socfpga/agilex5_socdk/board.yml b/boards/intel/socfpga/agilex5_socdk/board.yml
index fd4f5c91d66..f8ccbf5d8c5 100644
--- a/boards/intel/socfpga/agilex5_socdk/board.yml
+++ b/boards/intel/socfpga/agilex5_socdk/board.yml
@@ -1,4 +1,5 @@
 board:
   name: intel_socfpga_agilex5_socdk
+  full_name: Agilex™ 5 SoC FPGA Development Kit
   socs:
     - name: agilex5
diff --git a/boards/intel/socfpga/agilex_socdk/board.yml b/boards/intel/socfpga/agilex_socdk/board.yml
index 1c09cba0491..80763baa41b 100644
--- a/boards/intel/socfpga/agilex_socdk/board.yml
+++ b/boards/intel/socfpga/agilex_socdk/board.yml
@@ -1,4 +1,5 @@
 board:
   name: intel_socfpga_agilex_socdk
+  full_name: Agilex SoC Development Kit
   socs:
     - name: agilex
diff --git a/boards/intel/socfpga_std/cyclonev_socdk/board.yml b/boards/intel/socfpga_std/cyclonev_socdk/board.yml
index 420762dda3f..222de69429a 100644
--- a/boards/intel/socfpga_std/cyclonev_socdk/board.yml
+++ b/boards/intel/socfpga_std/cyclonev_socdk/board.yml
@@ -1,4 +1,5 @@
 board:
   name: cyclonev_socdk
+  full_name: Cyclone® V SoC Development Kit
   socs:
     - name: cyclonev
diff --git a/boards/ite/it82xx2_evb/board.yml b/boards/ite/it82xx2_evb/board.yml
index f986050cad3..b36117cb4b4 100644
--- a/boards/ite/it82xx2_evb/board.yml
+++ b/boards/ite/it82xx2_evb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: it82xx2_evb
+  full_name: IT82XX2 series
   vendor: ite
   socs:
     - name: it82202ax
diff --git a/boards/ite/it8xxx2_evb/board.yml b/boards/ite/it8xxx2_evb/board.yml
index a676ec35fa8..55f12393958 100644
--- a/boards/ite/it8xxx2_evb/board.yml
+++ b/boards/ite/it8xxx2_evb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: it8xxx2_evb
+  full_name: IT8XXX2 series
   vendor: ite
   socs:
     - name: it81302bx
diff --git a/boards/khadas/edgev/board.yml b/boards/khadas/edgev/board.yml
index fc70dcf0a44..3feee76d7df 100644
--- a/boards/khadas/edgev/board.yml
+++ b/boards/khadas/edgev/board.yml
@@ -1,5 +1,6 @@
 board:
   name: khadas_edgev
+  full_name: Edge-V
   vendor: khadas
   socs:
   - name: rk3399
diff --git a/boards/kincony/kincony_kc868_a32/board.yml b/boards/kincony/kincony_kc868_a32/board.yml
index 99bf4fa715b..9a2144f7cd6 100644
--- a/boards/kincony/kincony_kc868_a32/board.yml
+++ b/boards/kincony/kincony_kc868_a32/board.yml
@@ -1,5 +1,6 @@
 board:
   name: kincony_kc868_a32
+  full_name: KC868-A32
   vendor: kincony
   socs:
   - name: esp32
diff --git a/boards/lilygo/ttgo_lora32/board.yml b/boards/lilygo/ttgo_lora32/board.yml
index 8cccfbbf7d2..3997b696fc9 100644
--- a/boards/lilygo/ttgo_lora32/board.yml
+++ b/boards/lilygo/ttgo_lora32/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ttgo_lora32
+  full_name: TTGO LoRa32
   vendor: lilygo
   socs:
   - name: esp32
diff --git a/boards/lilygo/ttgo_t8c3/board.yml b/boards/lilygo/ttgo_t8c3/board.yml
index 8b1084a4493..e6c08739aff 100644
--- a/boards/lilygo/ttgo_t8c3/board.yml
+++ b/boards/lilygo/ttgo_t8c3/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ttgo_t8c3
+  full_name: TTGO T8-C3
   vendor: lilygo
   socs:
   - name: esp32c3
diff --git a/boards/lowrisc/opentitan_earlgrey/board.yml b/boards/lowrisc/opentitan_earlgrey/board.yml
index d7e8a24879c..2659998727c 100644
--- a/boards/lowrisc/opentitan_earlgrey/board.yml
+++ b/boards/lowrisc/opentitan_earlgrey/board.yml
@@ -1,5 +1,6 @@
 board:
   name: opentitan_earlgrey
+  full_name: OpenTitan Earl Grey
   vendor: lowrisc
   socs:
   - name: opentitan
diff --git a/boards/luatos/esp32c3_luatos_core/board.yml b/boards/luatos/esp32c3_luatos_core/board.yml
index e1a5ed42046..0269d7dc85a 100644
--- a/boards/luatos/esp32c3_luatos_core/board.yml
+++ b/boards/luatos/esp32c3_luatos_core/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp32c3_luatos_core
+  full_name: ESP32C3_LUATOS_CORE
   vendor: luatos
   socs:
   - name: esp32c3
diff --git a/boards/luatos/esp32s3_luatos_core/board.yml b/boards/luatos/esp32s3_luatos_core/board.yml
index cd29886c969..e806b61e906 100644
--- a/boards/luatos/esp32s3_luatos_core/board.yml
+++ b/boards/luatos/esp32s3_luatos_core/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp32s3_luatos_core
+  full_name: ESP32S3-Luatos-Core
   vendor: luatos
   socs:
   - name: esp32s3
diff --git a/boards/m5stack/m5stack_atom_lite/board.yml b/boards/m5stack/m5stack_atom_lite/board.yml
index d7202eda266..964abb52f7e 100644
--- a/boards/m5stack/m5stack_atom_lite/board.yml
+++ b/boards/m5stack/m5stack_atom_lite/board.yml
@@ -1,5 +1,6 @@
 board:
   name: m5stack_atom_lite
+  full_name: ATOM Lite
   vendor: m5stack
   socs:
   - name: esp32
diff --git a/boards/m5stack/m5stack_atoms3/board.yml b/boards/m5stack/m5stack_atoms3/board.yml
index 4126aa17d2e..c74186cdcd5 100644
--- a/boards/m5stack/m5stack_atoms3/board.yml
+++ b/boards/m5stack/m5stack_atoms3/board.yml
@@ -1,5 +1,6 @@
 board:
   name: m5stack_atoms3
+  full_name: AtomS3
   vendor: m5stack
   socs:
   - name: esp32s3
diff --git a/boards/m5stack/m5stack_atoms3_lite/board.yml b/boards/m5stack/m5stack_atoms3_lite/board.yml
index c9204d5159c..6445b3d9a4f 100644
--- a/boards/m5stack/m5stack_atoms3_lite/board.yml
+++ b/boards/m5stack/m5stack_atoms3_lite/board.yml
@@ -1,5 +1,6 @@
 board:
   name: m5stack_atoms3_lite
+  full_name: AtomS3 Lite
   vendor: m5stack
   socs:
   - name: esp32s3
diff --git a/boards/m5stack/m5stack_core2/board.yml b/boards/m5stack/m5stack_core2/board.yml
index 1ff253f8201..9a002aa2859 100644
--- a/boards/m5stack/m5stack_core2/board.yml
+++ b/boards/m5stack/m5stack_core2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: m5stack_core2
+  full_name: Core2
   vendor: m5stack
   socs:
   - name: esp32
diff --git a/boards/m5stack/m5stack_stamps3/board.yml b/boards/m5stack/m5stack_stamps3/board.yml
index e723d91c19a..0ac071b1667 100644
--- a/boards/m5stack/m5stack_stamps3/board.yml
+++ b/boards/m5stack/m5stack_stamps3/board.yml
@@ -1,5 +1,6 @@
 board:
   name: m5stack_stamps3
+  full_name: StampS3
   vendor: m5stack
   socs:
   - name: esp32s3
diff --git a/boards/m5stack/m5stickc_plus/board.yml b/boards/m5stack/m5stickc_plus/board.yml
index 3a604266d07..20a1d324a9d 100644
--- a/boards/m5stack/m5stickc_plus/board.yml
+++ b/boards/m5stack/m5stickc_plus/board.yml
@@ -1,5 +1,6 @@
 board:
   name: m5stickc_plus
+  full_name: M5StickC PLUS
   vendor: m5stack
   socs:
   - name: esp32
diff --git a/boards/m5stack/stamp_c3/board.yml b/boards/m5stack/stamp_c3/board.yml
index aa24963edd6..244d9b12302 100644
--- a/boards/m5stack/stamp_c3/board.yml
+++ b/boards/m5stack/stamp_c3/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stamp_c3
+  full_name: STAMP-C3
   vendor: m5stack
   socs:
   - name: esp32c3
diff --git a/boards/madmachine/mm_feather/board.yml b/boards/madmachine/mm_feather/board.yml
index 1b9ca3f2c7c..23adcce1a2f 100644
--- a/boards/madmachine/mm_feather/board.yml
+++ b/boards/madmachine/mm_feather/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mm_feather
+  full_name: SwiftIO Feather
   vendor: madmachine
   socs:
     - name: mimxrt1062
diff --git a/boards/madmachine/mm_swiftio/board.yml b/boards/madmachine/mm_swiftio/board.yml
index 784e79c52ad..0f3f04f5526 100644
--- a/boards/madmachine/mm_swiftio/board.yml
+++ b/boards/madmachine/mm_swiftio/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mm_swiftio
+  full_name: SwiftIO
   vendor: madmachine
   socs:
     - name: mimxrt1052
diff --git a/boards/makerdiary/nrf52832_mdk/board.yml b/boards/makerdiary/nrf52832_mdk/board.yml
index 70028809dc3..7faf1088ce7 100644
--- a/boards/makerdiary/nrf52832_mdk/board.yml
+++ b/boards/makerdiary/nrf52832_mdk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf52832_mdk
+  full_name: nRF52832-mdk
   vendor: makerdiary
   socs:
   - name: nrf52832
diff --git a/boards/makerdiary/nrf52840_mdk/board.yml b/boards/makerdiary/nrf52840_mdk/board.yml
index 09e13811fc3..dddbb5a3bb3 100644
--- a/boards/makerdiary/nrf52840_mdk/board.yml
+++ b/boards/makerdiary/nrf52840_mdk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf52840_mdk
+  full_name: nRF52840-mdk
   vendor: makerdiary
   socs:
   - name: nrf52840
diff --git a/boards/makerdiary/nrf52840_mdk_usb_dongle/board.yml b/boards/makerdiary/nrf52840_mdk_usb_dongle/board.yml
index 1c3020c52b5..4326881bc4d 100644
--- a/boards/makerdiary/nrf52840_mdk_usb_dongle/board.yml
+++ b/boards/makerdiary/nrf52840_mdk_usb_dongle/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf52840_mdk_usb_dongle
+  full_name: nRF52840 MDK USB Dongle
   vendor: makerdiary
   socs:
   - name: nrf52840
diff --git a/boards/mediatek/mt8195_adsp/board.yml b/boards/mediatek/mt8195_adsp/board.yml
index 22c31deb1a0..a58b33ecf8d 100644
--- a/boards/mediatek/mt8195_adsp/board.yml
+++ b/boards/mediatek/mt8195_adsp/board.yml
@@ -1,5 +1,6 @@
 boards:
   - name: mt8195_adsp
+    full_name: MT8195 ADSP
     vendor: mediatek
     socs:
       - name: mt8195_adsp
diff --git a/boards/microchip/ev11l78a/board.yml b/boards/microchip/ev11l78a/board.yml
index abaabec67ab..b078a725e8c 100644
--- a/boards/microchip/ev11l78a/board.yml
+++ b/boards/microchip/ev11l78a/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ev11l78a
+  full_name: UPD301C Basic Sink Application Example
   vendor: microchip
   socs:
     - name: samd20e16
diff --git a/boards/microchip/m2gl025_miv/board.yml b/boards/microchip/m2gl025_miv/board.yml
index 84e61821f35..f3fba2a9720 100644
--- a/boards/microchip/m2gl025_miv/board.yml
+++ b/boards/microchip/m2gl025_miv/board.yml
@@ -1,5 +1,6 @@
 board:
   name: m2gl025_miv
+  full_name: M2GL025 Mi-V
   vendor: microchip
   socs:
   - name: miv
diff --git a/boards/microchip/mec1501modular_assy6885/board.yml b/boards/microchip/mec1501modular_assy6885/board.yml
index d45ec4217f7..62f58a26666 100644
--- a/boards/microchip/mec1501modular_assy6885/board.yml
+++ b/boards/microchip/mec1501modular_assy6885/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mec1501modular_assy6885
+  full_name: MEC1501 Modular card ASSY6885
   vendor: microchip
   socs:
     - name: mec1501_hsz
diff --git a/boards/microchip/mec15xxevb_assy6853/board.yml b/boards/microchip/mec15xxevb_assy6853/board.yml
index ae558489438..c4cba01d0dd 100644
--- a/boards/microchip/mec15xxevb_assy6853/board.yml
+++ b/boards/microchip/mec15xxevb_assy6853/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mec15xxevb_assy6853
+  full_name: MEC15xxEVB ASSY6853
   vendor: microchip
   socs:
     - name: mec1501_hsz
diff --git a/boards/microchip/mec172xevb_assy6906/board.yml b/boards/microchip/mec172xevb_assy6906/board.yml
index 5f3f57b29a7..0ad61bcc1c7 100644
--- a/boards/microchip/mec172xevb_assy6906/board.yml
+++ b/boards/microchip/mec172xevb_assy6906/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mec172xevb_assy6906
+  full_name: MEC172xEVB ASSY6906
   vendor: microchip
   socs:
     - name: mec172x_nsz
diff --git a/boards/microchip/mec172xmodular_assy6930/board.yml b/boards/microchip/mec172xmodular_assy6930/board.yml
index 1fe04eba6e8..e7a176038af 100644
--- a/boards/microchip/mec172xmodular_assy6930/board.yml
+++ b/boards/microchip/mec172xmodular_assy6930/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mec172xmodular_assy6930
+  full_name: MEC172x Modular Card ASSY6930 (Rev. B)
   vendor: microchip
   socs:
     - name: mec172x_nsz
diff --git a/boards/microchip/mpfs_icicle/board.yml b/boards/microchip/mpfs_icicle/board.yml
index b9799c5830e..fb03fb4c8c4 100644
--- a/boards/microchip/mpfs_icicle/board.yml
+++ b/boards/microchip/mpfs_icicle/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mpfs_icicle
+  full_name: mpfs_icicle
   vendor: microchip
   socs:
   - name: polarfire
diff --git a/boards/mikroe/clicker_2/board.yml b/boards/mikroe/clicker_2/board.yml
index 8ffead86036..11b092291cc 100644
--- a/boards/mikroe/clicker_2/board.yml
+++ b/boards/mikroe/clicker_2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mikroe_clicker_2
+  full_name: Clicker 2 for STM32
   vendor: mikroe
   socs:
     - name: stm32f407xx
diff --git a/boards/mikroe/clicker_ra4m1/board.yml b/boards/mikroe/clicker_ra4m1/board.yml
index 1635cd26a5d..7d4c5beee0e 100644
--- a/boards/mikroe/clicker_ra4m1/board.yml
+++ b/boards/mikroe/clicker_ra4m1/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: mikroe_clicker_ra4m1
+  full_name: Clicker RA4M1
   vendor: mikroe
   socs:
     - name: r7fa4m1ab3cfm
diff --git a/boards/mikroe/mini_m4_for_stm32/board.yml b/boards/mikroe/mini_m4_for_stm32/board.yml
index 60dde764fe6..84a50a3e090 100644
--- a/boards/mikroe/mini_m4_for_stm32/board.yml
+++ b/boards/mikroe/mini_m4_for_stm32/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mikroe_mini_m4_for_stm32
+  full_name: MINI-M4 for STM32
   vendor: mikroe
   socs:
     - name: stm32f415xx
diff --git a/boards/mikroe/stm32_m4_clicker/board.yml b/boards/mikroe/stm32_m4_clicker/board.yml
index 56a329a900f..ad387120bc5 100644
--- a/boards/mikroe/stm32_m4_clicker/board.yml
+++ b/boards/mikroe/stm32_m4_clicker/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: mikroe_stm32_m4_clicker
+  full_name: STM32 M4 Clicker
   vendor: mikroe
   socs:
     - name: stm32f415xx
diff --git a/boards/mxchip/az3166_iotdevkit/board.yml b/boards/mxchip/az3166_iotdevkit/board.yml
index 4ac727ed1c2..3cf58f575eb 100644
--- a/boards/mxchip/az3166_iotdevkit/board.yml
+++ b/boards/mxchip/az3166_iotdevkit/board.yml
@@ -1,5 +1,6 @@
 board:
   name: az3166_iotdevkit
+  full_name: AZ3166 MXChip IoT DevKit
   vendor: mxchip
   socs:
     - name: stm32f412rx
diff --git a/boards/native/native_posix/board.yml b/boards/native/native_posix/board.yml
index 0f03465c79b..07defd4185b 100644
--- a/boards/native/native_posix/board.yml
+++ b/boards/native/native_posix/board.yml
@@ -1,5 +1,6 @@
 boards:
 - name: native_posix
+  full_name: Native POSIX execution (native_posix)
   vendor: zephyr
   socs:
   - name: native
diff --git a/boards/native/native_sim/board.yml b/boards/native/native_sim/board.yml
index 19492170138..cebff14d48a 100644
--- a/boards/native/native_sim/board.yml
+++ b/boards/native/native_sim/board.yml
@@ -1,5 +1,6 @@
 boards:
 - name: native_sim
+  full_name: Native simulator - native_sim
   vendor: zephyr
   socs:
   - name: native
diff --git a/boards/native/nrf_bsim/board.yml b/boards/native/nrf_bsim/board.yml
index ba14ed8aef6..0ba40b33677 100644
--- a/boards/native/nrf_bsim/board.yml
+++ b/boards/native/nrf_bsim/board.yml
@@ -1,13 +1,16 @@
 boards:
 - name: nrf52_bsim
+  full_name: nRF52 simulated board (BabbleSim)
   vendor: zephyr
   socs:
   - name: native
 - name: nrf5340bsim
+  full_name: nRF5340 simulated boards (BabbleSim)
   vendor: zephyr
   socs:
   - name: nrf5340
 - name: nrf54l15bsim
+  full_name: nRF54L15 simulated boards (BabbleSim)
   vendor: zephyr
   socs:
   - name: nrf54l15
diff --git a/boards/nordic/nrf21540dk/board.yml b/boards/nordic/nrf21540dk/board.yml
index 4c9cf5943fe..3c977f4489f 100644
--- a/boards/nordic/nrf21540dk/board.yml
+++ b/boards/nordic/nrf21540dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf21540dk
+  full_name: nRF21540 DK
   vendor: nordic
   socs:
   - name: nrf52840
diff --git a/boards/nordic/nrf51dk/board.yml b/boards/nordic/nrf51dk/board.yml
index 788be3d79bc..888f9c883b5 100644
--- a/boards/nordic/nrf51dk/board.yml
+++ b/boards/nordic/nrf51dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf51dk
+  full_name: nRF51 DK
   vendor: nordic
   socs:
   - name: nrf51822
diff --git a/boards/nordic/nrf51dongle/board.yml b/boards/nordic/nrf51dongle/board.yml
index 4c89cac7fdc..99d423528ed 100644
--- a/boards/nordic/nrf51dongle/board.yml
+++ b/boards/nordic/nrf51dongle/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf51dongle
+  full_name: nRF51 Dongle
   vendor: nordic
   socs:
   - name: nrf51822
diff --git a/boards/nordic/nrf52833dk/board.yml b/boards/nordic/nrf52833dk/board.yml
index 2d6b6e5b12f..dbb8e020d51 100644
--- a/boards/nordic/nrf52833dk/board.yml
+++ b/boards/nordic/nrf52833dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf52833dk
+  full_name: nRF52833 DK
   vendor: nordic
   socs:
   - name: nrf52820
diff --git a/boards/nordic/nrf52840dk/board.yml b/boards/nordic/nrf52840dk/board.yml
index d15e1975027..8b6bdef90e2 100644
--- a/boards/nordic/nrf52840dk/board.yml
+++ b/boards/nordic/nrf52840dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf52840dk
+  full_name: nRF52840 DK
   vendor: nordic
   socs:
   # Physical nRF52840 SoC on PCA10056
diff --git a/boards/nordic/nrf52840dongle/board.yml b/boards/nordic/nrf52840dongle/board.yml
index a22449e5519..59eae5b3429 100644
--- a/boards/nordic/nrf52840dongle/board.yml
+++ b/boards/nordic/nrf52840dongle/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf52840dongle
+  full_name: nRF52840 Dongle
   vendor: nordic
   socs:
   - name: nrf52840
diff --git a/boards/nordic/nrf52dk/board.yml b/boards/nordic/nrf52dk/board.yml
index 1f21be9c60e..bf4d819be0f 100644
--- a/boards/nordic/nrf52dk/board.yml
+++ b/boards/nordic/nrf52dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf52dk
+  full_name: nRF52 DK
   vendor: nordic
   socs:
   - name: nrf52805
diff --git a/boards/nordic/nrf5340_audio_dk/board.yml b/boards/nordic/nrf5340_audio_dk/board.yml
index 443381b9461..4dc67d1bb6f 100644
--- a/boards/nordic/nrf5340_audio_dk/board.yml
+++ b/boards/nordic/nrf5340_audio_dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf5340_audio_dk
+  full_name: nRF5340 Audio DK
   vendor: nordic
   socs:
   - name: 'nrf5340'
diff --git a/boards/nordic/nrf5340dk/board.yml b/boards/nordic/nrf5340dk/board.yml
index fd90df34350..2454c47862b 100644
--- a/boards/nordic/nrf5340dk/board.yml
+++ b/boards/nordic/nrf5340dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf5340dk
+  full_name: nRF5340 DK
   vendor: nordic
   socs:
   - name: 'nrf5340'
diff --git a/boards/nordic/nrf54h20dk/board.yml b/boards/nordic/nrf54h20dk/board.yml
index 7d57b61cd53..82a738d8b03 100644
--- a/boards/nordic/nrf54h20dk/board.yml
+++ b/boards/nordic/nrf54h20dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf54h20dk
+  full_name: nRF54H20 DK
   vendor: nordic
   socs:
   - name: nrf54h20
diff --git a/boards/nordic/nrf54l15dk/board.yml b/boards/nordic/nrf54l15dk/board.yml
index 7a8bf2f5cf1..8d750b3d14b 100644
--- a/boards/nordic/nrf54l15dk/board.yml
+++ b/boards/nordic/nrf54l15dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf54l15dk
+  full_name: nRF54L15 DK
   vendor: nordic
   socs:
   - name: nrf54l15
diff --git a/boards/nordic/nrf54l15pdk/board.yml b/boards/nordic/nrf54l15pdk/board.yml
index e692040f7bd..1432bfc3ea6 100644
--- a/boards/nordic/nrf54l15pdk/board.yml
+++ b/boards/nordic/nrf54l15pdk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf54l15pdk
+  full_name: nRF54L15 PDK
   vendor: nordic
   socs:
   - name: nrf54l15
diff --git a/boards/nordic/nrf54l20pdk/board.yml b/boards/nordic/nrf54l20pdk/board.yml
index 717adf8e75e..4eaa66669fc 100644
--- a/boards/nordic/nrf54l20pdk/board.yml
+++ b/boards/nordic/nrf54l20pdk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf54l20pdk
+  full_name: nRF54L20 PDK
   vendor: nordic
   socs:
   - name: nrf54l20
diff --git a/boards/nordic/nrf7002dk/board.yml b/boards/nordic/nrf7002dk/board.yml
index ca94d73429e..39db5dcfa3a 100644
--- a/boards/nordic/nrf7002dk/board.yml
+++ b/boards/nordic/nrf7002dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf7002dk
+  full_name: nRF7002 DK
   vendor: nordic
   socs:
     - name: nrf5340
diff --git a/boards/nordic/nrf9131ek/board.yml b/boards/nordic/nrf9131ek/board.yml
index 246aef6f4e3..6e91098f63b 100644
--- a/boards/nordic/nrf9131ek/board.yml
+++ b/boards/nordic/nrf9131ek/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf9131ek
+  full_name: nRF9131 EK
   vendor: nordic
   socs:
   - name: nrf9131
diff --git a/boards/nordic/nrf9151dk/board.yml b/boards/nordic/nrf9151dk/board.yml
index f765134a460..468b8f0fa2a 100644
--- a/boards/nordic/nrf9151dk/board.yml
+++ b/boards/nordic/nrf9151dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf9151dk
+  full_name: nRF9151 DK
   vendor: nordic
   socs:
   - name: nrf9151
diff --git a/boards/nordic/nrf9160dk/board.yml b/boards/nordic/nrf9160dk/board.yml
index 5e6dcfad89b..1f043a0af8c 100644
--- a/boards/nordic/nrf9160dk/board.yml
+++ b/boards/nordic/nrf9160dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf9160dk
+  full_name: nRF9160 DK
   vendor: nordic
   socs:
   - name: nrf9160
diff --git a/boards/nordic/nrf9161dk/board.yml b/boards/nordic/nrf9161dk/board.yml
index 9bffcec81a6..da9bafb11d0 100644
--- a/boards/nordic/nrf9161dk/board.yml
+++ b/boards/nordic/nrf9161dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf9161dk
+  full_name: nRF9161 DK
   vendor: nordic
   socs:
   - name: nrf9161
diff --git a/boards/nordic/nrf9280pdk/board.yml b/boards/nordic/nrf9280pdk/board.yml
index 450ef9db901..963eae59ba0 100644
--- a/boards/nordic/nrf9280pdk/board.yml
+++ b/boards/nordic/nrf9280pdk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf9280pdk
+  full_name: nRF9280 PDK
   vendor: nordic
   socs:
   - name: nrf9280
diff --git a/boards/nordic/thingy52/board.yml b/boards/nordic/thingy52/board.yml
index 425e24fb596..010d40677db 100644
--- a/boards/nordic/thingy52/board.yml
+++ b/boards/nordic/thingy52/board.yml
@@ -1,5 +1,6 @@
 board:
   name: thingy52
+  full_name: "Thingy:52"
   vendor: nordic
   socs:
   - name: nrf52832
diff --git a/boards/nordic/thingy53/board.yml b/boards/nordic/thingy53/board.yml
index 4659222a346..46c8112cc95 100644
--- a/boards/nordic/thingy53/board.yml
+++ b/boards/nordic/thingy53/board.yml
@@ -1,5 +1,6 @@
 board:
   name: thingy53
+  full_name: "Thingy:53"
   vendor: nordic
   socs:
   - name: 'nrf5340'
diff --git a/boards/nuvoton/npcm400_evb/board.yml b/boards/nuvoton/npcm400_evb/board.yml
index 1a428cc5fe1..c73b1d69caa 100644
--- a/boards/nuvoton/npcm400_evb/board.yml
+++ b/boards/nuvoton/npcm400_evb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: npcm400_evb
+  full_name: NPCM400_EVB
   vendor: nuvoton
   socs:
   - name: npcm400
diff --git a/boards/nuvoton/npcx4m8f_evb/board.yml b/boards/nuvoton/npcx4m8f_evb/board.yml
index 16f6190d195..39fcc762796 100644
--- a/boards/nuvoton/npcx4m8f_evb/board.yml
+++ b/boards/nuvoton/npcx4m8f_evb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: npcx4m8f_evb
+  full_name: NPCX4M8F_EVB
   vendor: nuvoton
   socs:
   - name: npcx4m8f
diff --git a/boards/nuvoton/npcx7m6fb_evb/board.yml b/boards/nuvoton/npcx7m6fb_evb/board.yml
index 33528cde347..71c0df6ba3d 100644
--- a/boards/nuvoton/npcx7m6fb_evb/board.yml
+++ b/boards/nuvoton/npcx7m6fb_evb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: npcx7m6fb_evb
+  full_name: NPCX7M6FB_EVB
   vendor: nuvoton
   socs:
   - name: npcx7m6fb
diff --git a/boards/nuvoton/npcx9m6f_evb/board.yml b/boards/nuvoton/npcx9m6f_evb/board.yml
index 7baeb00dfa3..ff77a27a292 100644
--- a/boards/nuvoton/npcx9m6f_evb/board.yml
+++ b/boards/nuvoton/npcx9m6f_evb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: npcx9m6f_evb
+  full_name: NPCX9M6F_EVB
   vendor: nuvoton
   socs:
   - name: npcx9m6f
diff --git a/boards/nuvoton/numaker_m2l31ki/board.yml b/boards/nuvoton/numaker_m2l31ki/board.yml
index f01805447fa..610fc26e81f 100644
--- a/boards/nuvoton/numaker_m2l31ki/board.yml
+++ b/boards/nuvoton/numaker_m2l31ki/board.yml
@@ -1,5 +1,6 @@
 board:
   name: numaker_m2l31ki
+  full_name: NUMAKER M2L31KI
   vendor: nuvoton
   socs:
   - name: m2l31xxx
diff --git a/boards/nuvoton/numaker_pfm_m467/board.yml b/boards/nuvoton/numaker_pfm_m467/board.yml
index d9b195940ee..e57042889ff 100644
--- a/boards/nuvoton/numaker_pfm_m467/board.yml
+++ b/boards/nuvoton/numaker_pfm_m467/board.yml
@@ -1,5 +1,6 @@
 board:
   name: numaker_pfm_m467
+  full_name: NUMAKER PFM M467
   vendor: nuvoton
   socs:
   - name: m467
diff --git a/boards/nuvoton/numaker_pfm_m487/board.yml b/boards/nuvoton/numaker_pfm_m487/board.yml
index cc9dc43fe6a..82a0720db53 100644
--- a/boards/nuvoton/numaker_pfm_m487/board.yml
+++ b/boards/nuvoton/numaker_pfm_m487/board.yml
@@ -1,5 +1,6 @@
 board:
   name: numaker_pfm_m487
+  full_name: NUMAKER PFM M487
   vendor: nuvoton
   socs:
   - name: m487
diff --git a/boards/nxp/frdm_k22f/board.yml b/boards/nxp/frdm_k22f/board.yml
index 0498d799129..0e8ad732f39 100644
--- a/boards/nxp/frdm_k22f/board.yml
+++ b/boards/nxp/frdm_k22f/board.yml
@@ -1,5 +1,6 @@
 board:
   name: frdm_k22f
+  full_name: FRDM-K22F
   vendor: nxp
   socs:
     - name: mk22f51212
diff --git a/boards/nxp/frdm_k64f/board.yml b/boards/nxp/frdm_k64f/board.yml
index a338af6b99c..2de73a4ea2c 100644
--- a/boards/nxp/frdm_k64f/board.yml
+++ b/boards/nxp/frdm_k64f/board.yml
@@ -1,5 +1,6 @@
 board:
   name: frdm_k64f
+  full_name: FRDM-K64F
   vendor: nxp
   socs:
     - name: mk64f12
diff --git a/boards/nxp/frdm_k82f/board.yml b/boards/nxp/frdm_k82f/board.yml
index cf7bc47e121..513136f3e09 100644
--- a/boards/nxp/frdm_k82f/board.yml
+++ b/boards/nxp/frdm_k82f/board.yml
@@ -1,5 +1,6 @@
 board:
   name: frdm_k82f
+  full_name: FRDM-K82F
   vendor: nxp
   socs:
     - name: mk82f25615
diff --git a/boards/nxp/frdm_ke15z/board.yml b/boards/nxp/frdm_ke15z/board.yml
index c637334b8b8..927356cf0db 100644
--- a/boards/nxp/frdm_ke15z/board.yml
+++ b/boards/nxp/frdm_ke15z/board.yml
@@ -1,5 +1,6 @@
 board:
   name: frdm_ke15z
+  full_name: FRDM-KE15Z
   vendor: nxp
   socs:
     - name: mke15z7
diff --git a/boards/nxp/frdm_ke17z/board.yml b/boards/nxp/frdm_ke17z/board.yml
index a6b72f27f20..9576c95012a 100644
--- a/boards/nxp/frdm_ke17z/board.yml
+++ b/boards/nxp/frdm_ke17z/board.yml
@@ -1,5 +1,6 @@
 board:
   name: frdm_ke17z
+  full_name: FRDM-KE17Z
   vendor: nxp
   socs:
     - name: mke17z7
diff --git a/boards/nxp/frdm_ke17z512/board.yml b/boards/nxp/frdm_ke17z512/board.yml
index 46839e065b1..306ddf305bf 100644
--- a/boards/nxp/frdm_ke17z512/board.yml
+++ b/boards/nxp/frdm_ke17z512/board.yml
@@ -1,5 +1,6 @@
 board:
   name: frdm_ke17z512
+  full_name: FRDM-KE17Z512
   vendor: nxp
   socs:
     - name: mke17z9
diff --git a/boards/nxp/frdm_kl25z/board.yml b/boards/nxp/frdm_kl25z/board.yml
index 0caf35c690e..de3270eba7c 100644
--- a/boards/nxp/frdm_kl25z/board.yml
+++ b/boards/nxp/frdm_kl25z/board.yml
@@ -1,5 +1,6 @@
 board:
   name: frdm_kl25z
+  full_name: FRDM-KL25Z
   vendor: nxp
   socs:
     - name: mkl25z4
diff --git a/boards/nxp/frdm_kw41z/board.yml b/boards/nxp/frdm_kw41z/board.yml
index b17c67beb3e..94a99c91974 100644
--- a/boards/nxp/frdm_kw41z/board.yml
+++ b/boards/nxp/frdm_kw41z/board.yml
@@ -1,5 +1,6 @@
 board:
   name: frdm_kw41z
+  full_name: FRDM-KW41Z
   vendor: nxp
   socs:
     - name: mkw41z4
diff --git a/boards/nxp/frdm_mcxa156/board.yml b/boards/nxp/frdm_mcxa156/board.yml
index fd3cb5a5c6d..8107aa33aee 100644
--- a/boards/nxp/frdm_mcxa156/board.yml
+++ b/boards/nxp/frdm_mcxa156/board.yml
@@ -1,5 +1,6 @@
 board:
   name: frdm_mcxa156
+  full_name: FRDM-MCXA156
   vendor: nxp
   socs:
   - name: mcxa156
diff --git a/boards/nxp/frdm_mcxc242/board.yml b/boards/nxp/frdm_mcxc242/board.yml
index 2aa0aaa3da1..9dc5bbe7f5f 100644
--- a/boards/nxp/frdm_mcxc242/board.yml
+++ b/boards/nxp/frdm_mcxc242/board.yml
@@ -1,5 +1,6 @@
 board:
   name: frdm_mcxc242
+  full_name: FRDM-MCXC242
   vendor: nxp
   socs:
     - name: mcxc242
diff --git a/boards/nxp/frdm_mcxc444/board.yml b/boards/nxp/frdm_mcxc444/board.yml
index d32af7cc92c..960d2c3f377 100644
--- a/boards/nxp/frdm_mcxc444/board.yml
+++ b/boards/nxp/frdm_mcxc444/board.yml
@@ -1,5 +1,6 @@
 board:
   name: frdm_mcxc444
+  full_name: FRDM-MCXC444
   vendor: nxp
   socs:
     - name: mcxc444
diff --git a/boards/nxp/frdm_mcxn236/board.yml b/boards/nxp/frdm_mcxn236/board.yml
index 0bd2d3928ba..6c1645c9272 100644
--- a/boards/nxp/frdm_mcxn236/board.yml
+++ b/boards/nxp/frdm_mcxn236/board.yml
@@ -1,5 +1,6 @@
 board:
   name: frdm_mcxn236
+  full_name: FRDM-MCXN236
   vendor: nxp
   socs:
   - name: mcxn236
diff --git a/boards/nxp/frdm_mcxn947/board.yml b/boards/nxp/frdm_mcxn947/board.yml
index b4a64533333..dd17fc68dc4 100644
--- a/boards/nxp/frdm_mcxn947/board.yml
+++ b/boards/nxp/frdm_mcxn947/board.yml
@@ -1,5 +1,6 @@
 board:
   name: frdm_mcxn947
+  full_name: FRDM-MCXN947
   vendor: nxp
   socs:
   - name: mcxn947
diff --git a/boards/nxp/frdm_mcxw71/board.yml b/boards/nxp/frdm_mcxw71/board.yml
index 2a40433c84b..e0243a0f32b 100644
--- a/boards/nxp/frdm_mcxw71/board.yml
+++ b/boards/nxp/frdm_mcxw71/board.yml
@@ -1,5 +1,6 @@
 board:
   name: frdm_mcxw71
+  full_name: FRDM-MCXW71
   vendor: nxp
   socs:
     - name: mcxw716c
diff --git a/boards/nxp/frdm_rw612/board.yml b/boards/nxp/frdm_rw612/board.yml
index e52333358c4..17ec6bda829 100644
--- a/boards/nxp/frdm_rw612/board.yml
+++ b/boards/nxp/frdm_rw612/board.yml
@@ -1,5 +1,6 @@
 board:
   name: frdm_rw612
+  full_name: FRDM_RW612
   vendor: nxp
   socs:
     - name: rw612
diff --git a/boards/nxp/hexiwear/board.yml b/boards/nxp/hexiwear/board.yml
index c478fa02678..63a0e80de9a 100644
--- a/boards/nxp/hexiwear/board.yml
+++ b/boards/nxp/hexiwear/board.yml
@@ -1,5 +1,6 @@
 board:
   name: hexiwear
+  full_name: Hexiwear
   vendor: nxp
   socs:
     - name: mk64f12
diff --git a/boards/nxp/imx8mm_evk/board.yml b/boards/nxp/imx8mm_evk/board.yml
index 0c46177f70b..3b760999b3f 100644
--- a/boards/nxp/imx8mm_evk/board.yml
+++ b/boards/nxp/imx8mm_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: imx8mm_evk
+  full_name: i.MX8MM EVK
   vendor: nxp
   socs:
   - name: mimx8mm6
diff --git a/boards/nxp/imx8mn_evk/board.yml b/boards/nxp/imx8mn_evk/board.yml
index 294060de506..c26c08d5bb6 100644
--- a/boards/nxp/imx8mn_evk/board.yml
+++ b/boards/nxp/imx8mn_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: imx8mn_evk
+  full_name: i.MX8MN EVK (Cortex-A53)
   vendor: nxp
   socs:
   - name: mimx8mn6
diff --git a/boards/nxp/imx8mp_evk/board.yml b/boards/nxp/imx8mp_evk/board.yml
index d810c27a596..c9616826269 100644
--- a/boards/nxp/imx8mp_evk/board.yml
+++ b/boards/nxp/imx8mp_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: imx8mp_evk
+  full_name: i.MX8MP EVK
   vendor: nxp
   socs:
   - name: mimx8ml8
diff --git a/boards/nxp/imx8mq_evk/board.yml b/boards/nxp/imx8mq_evk/board.yml
index c599f0a7afd..cb272769958 100644
--- a/boards/nxp/imx8mq_evk/board.yml
+++ b/boards/nxp/imx8mq_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: imx8mq_evk
+  full_name: MIMX8MQ EVK
   vendor: nxp
   socs:
   - name: mimx8mq6
diff --git a/boards/nxp/imx8qm_mek/board.yml b/boards/nxp/imx8qm_mek/board.yml
index d044277a622..c97d6c179e8 100644
--- a/boards/nxp/imx8qm_mek/board.yml
+++ b/boards/nxp/imx8qm_mek/board.yml
@@ -1,5 +1,6 @@
 board:
   name: imx8qm_mek
+  full_name: i.MX 8QuadMax Multisensory Enablement Kit (MEK)
   vendor: nxp
   socs:
     - name: mimx8qm6
diff --git a/boards/nxp/imx8qxp_mek/board.yml b/boards/nxp/imx8qxp_mek/board.yml
index e31754086d7..a2c838ef239 100644
--- a/boards/nxp/imx8qxp_mek/board.yml
+++ b/boards/nxp/imx8qxp_mek/board.yml
@@ -1,5 +1,6 @@
 board:
   name: imx8qxp_mek
+  full_name: i.MX 8QuadXPlus Multisensory Enablement Kit (MEK)
   vendor: nxp
   socs:
     - name: mimx8qx6
diff --git a/boards/nxp/imx8ulp_evk/board.yml b/boards/nxp/imx8ulp_evk/board.yml
index bd5e16dc93d..45167a37f26 100644
--- a/boards/nxp/imx8ulp_evk/board.yml
+++ b/boards/nxp/imx8ulp_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: imx8ulp_evk
+  full_name: i.MX 8ULP Evaluation Kit
   vendor: nxp
   socs:
     - name: mimx8ud7
diff --git a/boards/nxp/imx93_evk/board.yml b/boards/nxp/imx93_evk/board.yml
index 110334be558..008156c5fa5 100644
--- a/boards/nxp/imx93_evk/board.yml
+++ b/boards/nxp/imx93_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: imx93_evk
+  full_name: i.MX93 EVK
   vendor: nxp
   socs:
   - name: mimx9352
diff --git a/boards/nxp/imx95_evk/board.yml b/boards/nxp/imx95_evk/board.yml
index 14909074457..9f170d32918 100644
--- a/boards/nxp/imx95_evk/board.yml
+++ b/boards/nxp/imx95_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: imx95_evk
+  full_name: i.MX95 EVK
   vendor: nxp
   socs:
   - name: mimx9596
diff --git a/boards/nxp/lpcxpresso11u68/board.yml b/boards/nxp/lpcxpresso11u68/board.yml
index 30712d42e69..b0e31a04eab 100644
--- a/boards/nxp/lpcxpresso11u68/board.yml
+++ b/boards/nxp/lpcxpresso11u68/board.yml
@@ -1,5 +1,6 @@
 board:
   name: lpcxpresso11u68
+  full_name: LPCXpresso11U68
   vendor: nxp
   socs:
     - name: lpc11u68
diff --git a/boards/nxp/lpcxpresso51u68/board.yml b/boards/nxp/lpcxpresso51u68/board.yml
index 7eb0f17095e..b27419f0f99 100644
--- a/boards/nxp/lpcxpresso51u68/board.yml
+++ b/boards/nxp/lpcxpresso51u68/board.yml
@@ -1,5 +1,6 @@
 board:
   name: lpcxpresso51u68
+  full_name: LPCXPRESSO51U68
   vendor: nxp
   socs:
     - name: lpc51u68
diff --git a/boards/nxp/lpcxpresso54114/board.yml b/boards/nxp/lpcxpresso54114/board.yml
index 64477bf2ac8..d891073c5f7 100644
--- a/boards/nxp/lpcxpresso54114/board.yml
+++ b/boards/nxp/lpcxpresso54114/board.yml
@@ -1,5 +1,6 @@
 board:
   name: lpcxpresso54114
+  full_name: LPCXPRESSO54114
   vendor: nxp
   socs:
     - name: lpc54114
diff --git a/boards/nxp/lpcxpresso55s06/board.yml b/boards/nxp/lpcxpresso55s06/board.yml
index a15c5a1da85..e8924e0d941 100644
--- a/boards/nxp/lpcxpresso55s06/board.yml
+++ b/boards/nxp/lpcxpresso55s06/board.yml
@@ -1,5 +1,6 @@
 board:
   name: lpcxpresso55s06
+  full_name: LPCXpresso55S06
   vendor: nxp
   socs:
     - name: lpc55s06
diff --git a/boards/nxp/lpcxpresso55s16/board.yml b/boards/nxp/lpcxpresso55s16/board.yml
index 5b4c627af1c..33328c04d1d 100644
--- a/boards/nxp/lpcxpresso55s16/board.yml
+++ b/boards/nxp/lpcxpresso55s16/board.yml
@@ -1,5 +1,6 @@
 board:
   name: lpcxpresso55s16
+  full_name: LPCXpresso55S16
   vendor: nxp
   socs:
     - name: lpc55s16
diff --git a/boards/nxp/lpcxpresso55s28/board.yml b/boards/nxp/lpcxpresso55s28/board.yml
index d4309c4e3df..9cedc7e450c 100644
--- a/boards/nxp/lpcxpresso55s28/board.yml
+++ b/boards/nxp/lpcxpresso55s28/board.yml
@@ -1,5 +1,6 @@
 board:
   name: lpcxpresso55s28
+  full_name: LPCXpresso55S28
   vendor: nxp
   socs:
     - name: lpc55s28
diff --git a/boards/nxp/lpcxpresso55s36/board.yml b/boards/nxp/lpcxpresso55s36/board.yml
index e888d768815..7257c1d421a 100644
--- a/boards/nxp/lpcxpresso55s36/board.yml
+++ b/boards/nxp/lpcxpresso55s36/board.yml
@@ -1,5 +1,6 @@
 board:
   name: lpcxpresso55s36
+  full_name: LPCXpresso55S36
   vendor: nxp
   socs:
     - name: lpc55s36
diff --git a/boards/nxp/lpcxpresso55s69/board.yml b/boards/nxp/lpcxpresso55s69/board.yml
index 605ab7b3e9f..6c38dd06b0a 100644
--- a/boards/nxp/lpcxpresso55s69/board.yml
+++ b/boards/nxp/lpcxpresso55s69/board.yml
@@ -1,5 +1,6 @@
 board:
   name: lpcxpresso55s69
+  full_name: LPCXPRESSO55S69
   vendor: nxp
   socs:
   - name: lpc55s69
diff --git a/boards/nxp/ls1046ardb/board.yml b/boards/nxp/ls1046ardb/board.yml
index 9ad69170480..64001359b9a 100644
--- a/boards/nxp/ls1046ardb/board.yml
+++ b/boards/nxp/ls1046ardb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ls1046ardb
+  full_name: LS1046A RDB
   vendor: nxp
   socs:
   - name: ls1046a
diff --git a/boards/nxp/mimxrt1010_evk/board.yml b/boards/nxp/mimxrt1010_evk/board.yml
index 8c5dd6f1d75..6a82a521460 100644
--- a/boards/nxp/mimxrt1010_evk/board.yml
+++ b/boards/nxp/mimxrt1010_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mimxrt1010_evk
+  full_name: MIMXRT1010-EVK
   vendor: nxp
   socs:
     - name: mimxrt1011
diff --git a/boards/nxp/mimxrt1015_evk/board.yml b/boards/nxp/mimxrt1015_evk/board.yml
index 5f26dc3898b..8661e008230 100644
--- a/boards/nxp/mimxrt1015_evk/board.yml
+++ b/boards/nxp/mimxrt1015_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mimxrt1015_evk
+  full_name: MIMXRT1015-EVK
   vendor: nxp
   socs:
     - name: mimxrt1015
diff --git a/boards/nxp/mimxrt1020_evk/board.yml b/boards/nxp/mimxrt1020_evk/board.yml
index 4df4def13bc..c56ebb2360d 100644
--- a/boards/nxp/mimxrt1020_evk/board.yml
+++ b/boards/nxp/mimxrt1020_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mimxrt1020_evk
+  full_name: MIMXRT1020-EVK
   vendor: nxp
   socs:
     - name: mimxrt1021
diff --git a/boards/nxp/mimxrt1024_evk/board.yml b/boards/nxp/mimxrt1024_evk/board.yml
index c9420ad2b75..e3858413637 100644
--- a/boards/nxp/mimxrt1024_evk/board.yml
+++ b/boards/nxp/mimxrt1024_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mimxrt1024_evk
+  full_name: MIMXRT1024-EVK
   vendor: nxp
   socs:
     - name: mimxrt1024
diff --git a/boards/nxp/mimxrt1040_evk/board.yml b/boards/nxp/mimxrt1040_evk/board.yml
index ded85cfce4a..a5e5803ca22 100644
--- a/boards/nxp/mimxrt1040_evk/board.yml
+++ b/boards/nxp/mimxrt1040_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mimxrt1040_evk
+  full_name: MIMXRT1040-EVK
   vendor: nxp
   socs:
     - name: mimxrt1042
diff --git a/boards/nxp/mimxrt1050_evk/board.yml b/boards/nxp/mimxrt1050_evk/board.yml
index c1276214baa..48b8680e4b5 100644
--- a/boards/nxp/mimxrt1050_evk/board.yml
+++ b/boards/nxp/mimxrt1050_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mimxrt1050_evk
+  full_name: MIMXRT1050-EVK
   vendor: nxp
   socs:
     - name: mimxrt1052
diff --git a/boards/nxp/mimxrt1060_evk/board.yml b/boards/nxp/mimxrt1060_evk/board.yml
index 6682fbd7228..c3787a5385e 100644
--- a/boards/nxp/mimxrt1060_evk/board.yml
+++ b/boards/nxp/mimxrt1060_evk/board.yml
@@ -1,11 +1,13 @@
 boards:
   - name: mimxrt1060_evk
+    full_name: MIMXRT1060-EVK
     vendor: nxp
     socs:
       - name: mimxrt1062
     revision:
       format: "custom"
   - name: mimxrt1060_evkb
+    full_name: MIMXRT1060-EVKB
     vendor: nxp
     socs:
       - name: mimxrt1062
diff --git a/boards/nxp/mimxrt1062_fmurt6/board.yml b/boards/nxp/mimxrt1062_fmurt6/board.yml
index bebcb6c7954..60541a7f361 100644
--- a/boards/nxp/mimxrt1062_fmurt6/board.yml
+++ b/boards/nxp/mimxrt1062_fmurt6/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mimxrt1062_fmurt6
+  full_name: FMURT6
   vendor: nxp
   socs:
     - name: mimxrt1062
diff --git a/boards/nxp/mimxrt1064_evk/board.yml b/boards/nxp/mimxrt1064_evk/board.yml
index b3116560663..9800be05066 100644
--- a/boards/nxp/mimxrt1064_evk/board.yml
+++ b/boards/nxp/mimxrt1064_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mimxrt1064_evk
+  full_name: MIMXRT1064-EVK
   vendor: nxp
   socs:
     - name: mimxrt1064
diff --git a/boards/nxp/mimxrt1160_evk/board.yml b/boards/nxp/mimxrt1160_evk/board.yml
index 4fe56f8d256..85136c78580 100644
--- a/boards/nxp/mimxrt1160_evk/board.yml
+++ b/boards/nxp/mimxrt1160_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mimxrt1160_evk
+  full_name: MIMXRT1160-EVK
   vendor: nxp
   socs:
     - name: mimxrt1166
diff --git a/boards/nxp/mimxrt1170_evk/board.yml b/boards/nxp/mimxrt1170_evk/board.yml
index 0b8e2b058e0..4a6a25318b0 100644
--- a/boards/nxp/mimxrt1170_evk/board.yml
+++ b/boards/nxp/mimxrt1170_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mimxrt1170_evk
+  full_name: MIMXRT1170-EVK/EVKB
   vendor: nxp
   socs:
     - name: mimxrt1176
diff --git a/boards/nxp/mimxrt1180_evk/board.yml b/boards/nxp/mimxrt1180_evk/board.yml
index 0153cf4260d..3c3a3680cb3 100644
--- a/boards/nxp/mimxrt1180_evk/board.yml
+++ b/boards/nxp/mimxrt1180_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mimxrt1180_evk
+  full_name: MIMXRT1180-EVK
   vendor: nxp
   socs:
     - name: mimxrt1189
diff --git a/boards/nxp/mimxrt595_evk/board.yml b/boards/nxp/mimxrt595_evk/board.yml
index 5982f346712..052648e5b86 100644
--- a/boards/nxp/mimxrt595_evk/board.yml
+++ b/boards/nxp/mimxrt595_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mimxrt595_evk
+  full_name: MIMXRT595-EVK
   vendor: nxp
   socs:
     - name: mimxrt595s
diff --git a/boards/nxp/mimxrt685_evk/board.yml b/boards/nxp/mimxrt685_evk/board.yml
index 41956acbb31..c65a7e860bc 100644
--- a/boards/nxp/mimxrt685_evk/board.yml
+++ b/boards/nxp/mimxrt685_evk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mimxrt685_evk
+  full_name: MIMXRT685-EVK
   vendor: nxp
   socs:
     - name: mimxrt685s
diff --git a/boards/nxp/mr_canhubk3/board.yml b/boards/nxp/mr_canhubk3/board.yml
index 3840a8f3d30..fcf396d2c45 100644
--- a/boards/nxp/mr_canhubk3/board.yml
+++ b/boards/nxp/mr_canhubk3/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mr_canhubk3
+  full_name: MR-CANHUBK3
   vendor: nxp
   socs:
     - name: s32k344
diff --git a/boards/nxp/rd_rw612_bga/board.yml b/boards/nxp/rd_rw612_bga/board.yml
index 3316d695614..e5b918b3ec9 100644
--- a/boards/nxp/rd_rw612_bga/board.yml
+++ b/boards/nxp/rd_rw612_bga/board.yml
@@ -1,5 +1,6 @@
 board:
   name: rd_rw612_bga
+  full_name: RD-RW612-BGA
   vendor: nxp
   socs:
     - name: rw612
diff --git a/boards/nxp/rddrone_fmuk66/board.yml b/boards/nxp/rddrone_fmuk66/board.yml
index 40707b2f2e4..5d83c0d237f 100644
--- a/boards/nxp/rddrone_fmuk66/board.yml
+++ b/boards/nxp/rddrone_fmuk66/board.yml
@@ -1,5 +1,6 @@
 board:
   name: rddrone_fmuk66
+  full_name: RDDRONE-FMUK66
   vendor: nxp
   socs:
     - name: mk66f18
diff --git a/boards/nxp/s32z2xxdc2/board.yml b/boards/nxp/s32z2xxdc2/board.yml
index bffe1839c3c..ab7e2be4c38 100644
--- a/boards/nxp/s32z2xxdc2/board.yml
+++ b/boards/nxp/s32z2xxdc2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: s32z2xxdc2
+  full_name: X-S32Z27X-DC (DC2)
   vendor: nxp
   revision:
     format: letter
diff --git a/boards/nxp/twr_ke18f/board.yml b/boards/nxp/twr_ke18f/board.yml
index ffaf5fb235f..0f18fed1466 100644
--- a/boards/nxp/twr_ke18f/board.yml
+++ b/boards/nxp/twr_ke18f/board.yml
@@ -1,5 +1,6 @@
 board:
   name: twr_ke18f
+  full_name: TWR-KE18F
   vendor: nxp
   socs:
     - name: mke18f16
diff --git a/boards/nxp/twr_kv58f220m/board.yml b/boards/nxp/twr_kv58f220m/board.yml
index 536e16c178f..d7ec86a420e 100644
--- a/boards/nxp/twr_kv58f220m/board.yml
+++ b/boards/nxp/twr_kv58f220m/board.yml
@@ -1,5 +1,6 @@
 board:
   name: twr_kv58f220m
+  full_name: TWR-KV58F220M
   vendor: nxp
   socs:
     - name: mkv58f24
diff --git a/boards/nxp/ucans32k1sic/board.yml b/boards/nxp/ucans32k1sic/board.yml
index 87964b5201f..d4cdb83314b 100644
--- a/boards/nxp/ucans32k1sic/board.yml
+++ b/boards/nxp/ucans32k1sic/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ucans32k1sic
+  full_name: UCANS32K1SIC
   vendor: nxp
   socs:
     - name: s32k146
diff --git a/boards/nxp/usb_kw24d512/board.yml b/boards/nxp/usb_kw24d512/board.yml
index 21dae9f8435..a166d3bdca8 100644
--- a/boards/nxp/usb_kw24d512/board.yml
+++ b/boards/nxp/usb_kw24d512/board.yml
@@ -1,5 +1,6 @@
 board:
   name: usb_kw24d512
+  full_name: USB-KW24D512
   vendor: nxp
   socs:
     - name: mkw24d5
diff --git a/boards/nxp/vmu_rt1170/board.yml b/boards/nxp/vmu_rt1170/board.yml
index 91d9d2e83b2..45e37ad7898 100644
--- a/boards/nxp/vmu_rt1170/board.yml
+++ b/boards/nxp/vmu_rt1170/board.yml
@@ -1,5 +1,6 @@
 board:
   name: vmu_rt1170
+  full_name: VMU RT1170
   vendor: nxp
   socs:
     - name: mimxrt1176
diff --git a/boards/olimex/lora_stm32wl_devkit/board.yml b/boards/olimex/lora_stm32wl_devkit/board.yml
index 511de6634d2..6b1397bf3b5 100644
--- a/boards/olimex/lora_stm32wl_devkit/board.yml
+++ b/boards/olimex/lora_stm32wl_devkit/board.yml
@@ -1,5 +1,6 @@
 board:
   name: olimex_lora_stm32wl_devkit
+  full_name: LoRa STM32WL DevKit
   vendor: olimex
   revision:
     format: letter
diff --git a/boards/olimex/olimex_esp32_evb/board.yml b/boards/olimex/olimex_esp32_evb/board.yml
index 8dc816efceb..ab25d5859c2 100644
--- a/boards/olimex/olimex_esp32_evb/board.yml
+++ b/boards/olimex/olimex_esp32_evb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: olimex_esp32_evb
+  full_name: ESP32-EVB
   vendor: olimex
   socs:
   - name: esp32
diff --git a/boards/olimex/olimexino_stm32/board.yml b/boards/olimex/olimexino_stm32/board.yml
index 0944c4bb280..6f2276da7b0 100644
--- a/boards/olimex/olimexino_stm32/board.yml
+++ b/boards/olimex/olimexino_stm32/board.yml
@@ -1,5 +1,6 @@
 board:
   name: olimexino_stm32
+  full_name: OLIMEXINO-STM32
   vendor: olimex
   socs:
     - name: stm32f103xb
diff --git a/boards/olimex/stm32_e407/board.yml b/boards/olimex/stm32_e407/board.yml
index b01060566dc..d15c9456c2c 100644
--- a/boards/olimex/stm32_e407/board.yml
+++ b/boards/olimex/stm32_e407/board.yml
@@ -1,5 +1,6 @@
 board:
   name: olimex_stm32_e407
+  full_name: OLIMEX-STM32-E407
   vendor: olimex
   socs:
     - name: stm32f407xx
diff --git a/boards/olimex/stm32_h103/board.yml b/boards/olimex/stm32_h103/board.yml
index 2917e4e19d9..eb8195402ae 100644
--- a/boards/olimex/stm32_h103/board.yml
+++ b/boards/olimex/stm32_h103/board.yml
@@ -1,5 +1,6 @@
 board:
   name: olimex_stm32_h103
+  full_name: OLIMEX-STM32-H103
   vendor: olimex
   socs:
     - name: stm32f103xb
diff --git a/boards/olimex/stm32_h405/board.yml b/boards/olimex/stm32_h405/board.yml
index bd0e8f4beaa..aa10f3c9ef9 100644
--- a/boards/olimex/stm32_h405/board.yml
+++ b/boards/olimex/stm32_h405/board.yml
@@ -1,5 +1,6 @@
 board:
   name: olimex_stm32_h405
+  full_name: OLIMEX-STM32-H405
   vendor: olimex
   socs:
     - name: stm32f405xx
diff --git a/boards/olimex/stm32_h407/board.yml b/boards/olimex/stm32_h407/board.yml
index 5d2f0d7a783..452a712f595 100644
--- a/boards/olimex/stm32_h407/board.yml
+++ b/boards/olimex/stm32_h407/board.yml
@@ -1,5 +1,6 @@
 board:
   name: olimex_stm32_h407
+  full_name: OLIMEX-STM32-H407
   vendor: olimex
   socs:
     - name: stm32f407xx
diff --git a/boards/olimex/stm32_p405/board.yml b/boards/olimex/stm32_p405/board.yml
index 12201ed22c9..8ac0ac264ab 100644
--- a/boards/olimex/stm32_p405/board.yml
+++ b/boards/olimex/stm32_p405/board.yml
@@ -1,5 +1,6 @@
 board:
   name: olimex_stm32_p405
+  full_name: OLIMEX-STM32-P405
   vendor: olimex
   socs:
     - name: stm32f405xx
diff --git a/boards/openisa/rv32m1_vega/board.yml b/boards/openisa/rv32m1_vega/board.yml
index 5813a21b54f..4e60beab435 100644
--- a/boards/openisa/rv32m1_vega/board.yml
+++ b/boards/openisa/rv32m1_vega/board.yml
@@ -1,5 +1,6 @@
 board:
   name: rv32m1_vega
+  full_name: OpenISA VEGAboard
   vendor: openisa
   socs:
   - name: openisa_rv32m1
diff --git a/boards/others/black_f407ve/board.yml b/boards/others/black_f407ve/board.yml
index 472d766cbc7..6c14732f07c 100644
--- a/boards/others/black_f407ve/board.yml
+++ b/boards/others/black_f407ve/board.yml
@@ -1,5 +1,6 @@
 board:
   name: black_f407ve
+  full_name: Black STM32 F407VE Development Board
   vendor: others
   socs:
     - name: stm32f407xx
diff --git a/boards/others/black_f407zg_pro/board.yml b/boards/others/black_f407zg_pro/board.yml
index dc322315620..96f2891f768 100644
--- a/boards/others/black_f407zg_pro/board.yml
+++ b/boards/others/black_f407zg_pro/board.yml
@@ -1,5 +1,6 @@
 board:
   name: black_f407zg_pro
+  full_name: Black STM32 F407ZG Pro Development Board
   vendor: others
   socs:
     - name: stm32f407xx
diff --git a/boards/others/icev_wireless/board.yml b/boards/others/icev_wireless/board.yml
index 2dcef96cbdf..b810e970f76 100644
--- a/boards/others/icev_wireless/board.yml
+++ b/boards/others/icev_wireless/board.yml
@@ -1,5 +1,6 @@
 board:
   name: icev_wireless
+  full_name: ICE-V Wireless
   vendor: others
   socs:
   - name: esp32c3
diff --git a/boards/others/neorv32/board.yml b/boards/others/neorv32/board.yml
index f12fa42b78f..9154d90e8a9 100644
--- a/boards/others/neorv32/board.yml
+++ b/boards/others/neorv32/board.yml
@@ -1,5 +1,6 @@
 board:
   name: neorv32
+  full_name: NEORV32
   vendor: others
   revision:
     format: major.minor.patch
diff --git a/boards/others/serpente/board.yml b/boards/others/serpente/board.yml
index e5775329a06..0be3e94ffe6 100644
--- a/boards/others/serpente/board.yml
+++ b/boards/others/serpente/board.yml
@@ -1,5 +1,6 @@
 board:
   name: serpente
+  full_name: Arturo182 Serpente
   vendor: solderparty
   socs:
     - name: samd21e18a
diff --git a/boards/others/stm32_min_dev/board.yml b/boards/others/stm32_min_dev/board.yml
index 28a35697379..3ac7dfb8958 100644
--- a/boards/others/stm32_min_dev/board.yml
+++ b/boards/others/stm32_min_dev/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32_min_dev
+  full_name: STM32 Minimum Development Board
   vendor: others
   revision:
     format: custom
diff --git a/boards/others/stm32f030_demo/board.yml b/boards/others/stm32f030_demo/board.yml
index 348d40a665b..b0f19e11846 100644
--- a/boards/others/stm32f030_demo/board.yml
+++ b/boards/others/stm32f030_demo/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32f030_demo
+  full_name: STM32F030 DEMO BOARD
   vendor: others
   socs:
     - name: stm32f030x6
diff --git a/boards/others/stm32f103_mini/board.yml b/boards/others/stm32f103_mini/board.yml
index 4ea8f6fbb2d..f88d33224dd 100644
--- a/boards/others/stm32f103_mini/board.yml
+++ b/boards/others/stm32f103_mini/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32f103_mini
+  full_name: STM32F103 Mini
   vendor: st
   socs:
     - name: stm32f103xe
diff --git a/boards/others/stm32f401_mini/board.yml b/boards/others/stm32f401_mini/board.yml
index b6ec3cd3af8..6c057c149df 100644
--- a/boards/others/stm32f401_mini/board.yml
+++ b/boards/others/stm32f401_mini/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32f401_mini
+  full_name: STM32 Mini F401
   vendor: others
   socs:
     - name: stm32f401xc
diff --git a/boards/panasonic/pan1770_evb/board.yml b/boards/panasonic/pan1770_evb/board.yml
index 0808b91b99b..91d8a8c01b7 100644
--- a/boards/panasonic/pan1770_evb/board.yml
+++ b/boards/panasonic/pan1770_evb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: pan1770_evb
+  full_name: PAN1770 Evaluation Board
   vendor: panasonic
   socs:
   - name: nrf52840
diff --git a/boards/panasonic/pan1780_evb/board.yml b/boards/panasonic/pan1780_evb/board.yml
index 53a9a68192a..fcb9c21e6f5 100644
--- a/boards/panasonic/pan1780_evb/board.yml
+++ b/boards/panasonic/pan1780_evb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: pan1780_evb
+  full_name: PAN1780 Evaluation Board
   vendor: panasonic
   socs:
   - name: nrf52840
diff --git a/boards/panasonic/pan1781_evb/board.yml b/boards/panasonic/pan1781_evb/board.yml
index 64a5a239961..9f4fae581f7 100644
--- a/boards/panasonic/pan1781_evb/board.yml
+++ b/boards/panasonic/pan1781_evb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: pan1781_evb
+  full_name: PAN1781 Evaluation Board
   vendor: panasonic
   socs:
   - name: nrf52820
diff --git a/boards/panasonic/pan1782_evb/board.yml b/boards/panasonic/pan1782_evb/board.yml
index 649e5507d82..f4bfec853e0 100644
--- a/boards/panasonic/pan1782_evb/board.yml
+++ b/boards/panasonic/pan1782_evb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: pan1782_evb
+  full_name: PAN1782 Evaluation Board
   vendor: panasonic
   socs:
   - name: nrf52833
diff --git a/boards/panasonic/pan1783/board.yml b/boards/panasonic/pan1783/board.yml
index 461763d86f2..750f82b7848 100644
--- a/boards/panasonic/pan1783/board.yml
+++ b/boards/panasonic/pan1783/board.yml
@@ -1,13 +1,16 @@
 boards:
 - name: pan1783_evb
+  full_name: PAN1783 Evaluation Board
   vendor: panasonic
   socs:
   - name: nrf5340
 - name: pan1783a_evb
+  full_name: PAN1783A Evaluation Board
   vendor: panasonic
   socs:
   - name: nrf5340
 - name: pan1783a_pa_evb
+  full_name: PAN1783A-PA Evaluation Board
   vendor: panasonic
   socs:
   - name: nrf5340
diff --git a/boards/particle/argon/board.yml b/boards/particle/argon/board.yml
index 08eadfda743..b4cf83969ec 100644
--- a/boards/particle/argon/board.yml
+++ b/boards/particle/argon/board.yml
@@ -1,5 +1,6 @@
 board:
   name: particle_argon
+  full_name: Argon
   vendor: particle
   socs:
   - name: nrf52840
diff --git a/boards/particle/boron/board.yml b/boards/particle/boron/board.yml
index bb77655e8c0..25742d7ee79 100644
--- a/boards/particle/boron/board.yml
+++ b/boards/particle/boron/board.yml
@@ -1,5 +1,6 @@
 board:
   name: particle_boron
+  full_name: Boron
   vendor: particle
   socs:
   - name: nrf52840
diff --git a/boards/particle/nrf51_blenano/board.yml b/boards/particle/nrf51_blenano/board.yml
index bc651160fa4..f4b6bc29495 100644
--- a/boards/particle/nrf51_blenano/board.yml
+++ b/boards/particle/nrf51_blenano/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf51_blenano
+  full_name: Redbear Labs Nano
   vendor: particle
   socs:
   - name: nrf51822
diff --git a/boards/particle/nrf52_blenano2/board.yml b/boards/particle/nrf52_blenano2/board.yml
index fedad35babc..dc90277b7e7 100644
--- a/boards/particle/nrf52_blenano2/board.yml
+++ b/boards/particle/nrf52_blenano2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf52_blenano2
+  full_name: Redbear Labs Nano v2
   vendor: particle
   socs:
   - name: nrf52832
diff --git a/boards/particle/xenon/board.yml b/boards/particle/xenon/board.yml
index a681db97a1f..894b1cf6c90 100644
--- a/boards/particle/xenon/board.yml
+++ b/boards/particle/xenon/board.yml
@@ -1,5 +1,6 @@
 board:
   name: particle_xenon
+  full_name: Xenon
   vendor: particle
   socs:
   - name: nrf52840
diff --git a/boards/phytec/mimx8mm_phyboard_polis/board.yml b/boards/phytec/mimx8mm_phyboard_polis/board.yml
index 1c416b90eb1..8f834205354 100644
--- a/boards/phytec/mimx8mm_phyboard_polis/board.yml
+++ b/boards/phytec/mimx8mm_phyboard_polis/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mimx8mm_phyboard_polis
+  full_name: PhyBOARD Polis (NXP i.MX8M Mini)
   vendor: phytec
   socs:
     - name: mimx8mm6
diff --git a/boards/phytec/mimx8mp_phyboard_pollux/board.yml b/boards/phytec/mimx8mp_phyboard_pollux/board.yml
index b871a53e370..a8e5cbf9a0a 100644
--- a/boards/phytec/mimx8mp_phyboard_pollux/board.yml
+++ b/boards/phytec/mimx8mp_phyboard_pollux/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mimx8mp_phyboard_pollux
+  full_name: PhyBOARD Pollux (NXP i.MX8M Plus)
   vendor: phytec
   socs:
     - name: mimx8ml8
diff --git a/boards/phytec/phyboard_electra/board.yml b/boards/phytec/phyboard_electra/board.yml
index d5c24f15cbd..5e58cfb5431 100644
--- a/boards/phytec/phyboard_electra/board.yml
+++ b/boards/phytec/phyboard_electra/board.yml
@@ -1,5 +1,6 @@
 board:
   name: phyboard_electra
+  full_name: phyBOARD-Electra AM64x M4F Core
   vendor: phytec
   socs:
   - name: am6442
diff --git a/boards/phytec/phyboard_lyra/board.yml b/boards/phytec/phyboard_lyra/board.yml
index 2b98d77f510..c9a6c3a9b14 100644
--- a/boards/phytec/phyboard_lyra/board.yml
+++ b/boards/phytec/phyboard_lyra/board.yml
@@ -1,5 +1,6 @@
 board:
   name: phyboard_lyra
+  full_name: phyBOARD-Lyra AM62x A53 Core
   vendor: phytec
   socs:
   - name: am6234
diff --git a/boards/phytec/reel_board/board.yml b/boards/phytec/reel_board/board.yml
index 75878900418..2fd1363c0d7 100644
--- a/boards/phytec/reel_board/board.yml
+++ b/boards/phytec/reel_board/board.yml
@@ -1,5 +1,6 @@
 board:
   name: reel_board
+  full_name: reel board
   vendor: phytec
   socs:
   - name: nrf52840
diff --git a/boards/pine64/pinetime_devkit0/board.yml b/boards/pine64/pinetime_devkit0/board.yml
index e4c926cf96b..448cbca23b8 100644
--- a/boards/pine64/pinetime_devkit0/board.yml
+++ b/boards/pine64/pinetime_devkit0/board.yml
@@ -1,5 +1,6 @@
 board:
   name: pinetime_devkit0
+  full_name: PineTime DevKit0
   vendor: pine64
   socs:
   - name: nrf52832
diff --git a/boards/pjrc/teensy4/board.yml b/boards/pjrc/teensy4/board.yml
index 7906ae3b823..0ae483ebc2c 100644
--- a/boards/pjrc/teensy4/board.yml
+++ b/boards/pjrc/teensy4/board.yml
@@ -1,9 +1,11 @@
 boards:
   - name: teensy40
+    full_name: Teensy 4.0
     vendor: pjrc
     socs:
       - name: mimxrt1062
   - name: teensy41
+    full_name: Teensy 4.1
     vendor: pjrc
     socs:
       - name: mimxrt1062
diff --git a/boards/qemu/arc/board.yml b/boards/qemu/arc/board.yml
index 1fb49911afa..27571b6c5ce 100644
--- a/boards/qemu/arc/board.yml
+++ b/boards/qemu/arc/board.yml
@@ -1,5 +1,6 @@
 board:
   name: qemu_arc
+  full_name: QEMU Emulation for ARCv2 & ARCv3
   vendor: qemu
   socs:
   - name: qemu_arc_em
diff --git a/boards/qemu/cortex_a53/board.yml b/boards/qemu/cortex_a53/board.yml
index ab04f6ac8f1..d096f5495a1 100644
--- a/boards/qemu/cortex_a53/board.yml
+++ b/boards/qemu/cortex_a53/board.yml
@@ -1,5 +1,6 @@
 board:
   name: qemu_cortex_a53
+  full_name: QEMU Emulation for ARM Cortex-A53
   vendor: arm
   socs:
   - name: qemu_cortex_a53
diff --git a/boards/qemu/cortex_a9/board.yml b/boards/qemu/cortex_a9/board.yml
index 72cba6ce8d9..4b48ca9d2ad 100644
--- a/boards/qemu/cortex_a9/board.yml
+++ b/boards/qemu/cortex_a9/board.yml
@@ -1,5 +1,6 @@
 board:
   name: qemu_cortex_a9
+  full_name: QEMU Emulation for Cortex-A9
   vendor: qemu
   socs:
   - name: xc7z007s
diff --git a/boards/qemu/cortex_m0/board.yml b/boards/qemu/cortex_m0/board.yml
index fc71c63896b..aa58b1a0ef4 100644
--- a/boards/qemu/cortex_m0/board.yml
+++ b/boards/qemu/cortex_m0/board.yml
@@ -1,5 +1,6 @@
 board:
   name: qemu_cortex_m0
+  full_name: QEMU Emulation for ARM Cortex-M0
   vendor: nordic
   socs:
   - name: nrf51822
diff --git a/boards/qemu/cortex_m3/board.yml b/boards/qemu/cortex_m3/board.yml
index 5566adb5e02..6422e416ef3 100644
--- a/boards/qemu/cortex_m3/board.yml
+++ b/boards/qemu/cortex_m3/board.yml
@@ -1,5 +1,6 @@
 board:
   name: qemu_cortex_m3
+  full_name: QEMU Emulation for ARM Cortex-M3
   vendor: qemu
   socs:
   - name: ti_lm3s6965
diff --git a/boards/qemu/cortex_r5/board.yml b/boards/qemu/cortex_r5/board.yml
index 6cf5b2fee95..ae013f0a4ba 100644
--- a/boards/qemu/cortex_r5/board.yml
+++ b/boards/qemu/cortex_r5/board.yml
@@ -1,5 +1,6 @@
 board:
   name: qemu_cortex_r5
+  full_name: QEMU Emulation for ARM Cortex-R5
   vendor: qemu
   socs:
   - name: zynqmp_rpu
diff --git a/boards/qemu/kvm_arm64/board.yml b/boards/qemu/kvm_arm64/board.yml
index dd0edf80316..ff9a9e4c2be 100644
--- a/boards/qemu/kvm_arm64/board.yml
+++ b/boards/qemu/kvm_arm64/board.yml
@@ -1,5 +1,6 @@
 board:
   name: qemu_kvm_arm64
+  full_name: QEMU Emulation for ARM AArch64 Virt KVM
   vendor: arm
   socs:
   - name: qemu_virt_arm64
diff --git a/boards/qemu/leon3/board.yml b/boards/qemu/leon3/board.yml
index 6d4fdc189bf..61d3cd2f71a 100644
--- a/boards/qemu/leon3/board.yml
+++ b/boards/qemu/leon3/board.yml
@@ -1,5 +1,6 @@
 board:
   name: qemu_leon3
+  full_name: QEMU Emulation for LEON3
   vendor: gaisler
   socs:
   - name: leon3
diff --git a/boards/qemu/malta/board.yml b/boards/qemu/malta/board.yml
index 050bd381c73..acb375c5804 100644
--- a/boards/qemu/malta/board.yml
+++ b/boards/qemu/malta/board.yml
@@ -1,5 +1,6 @@
 board:
   name: qemu_malta
+  full_name: QEMU Emulation for MIPS Malta
   vendor: qemu
   socs:
   - name: qemu_malta
diff --git a/boards/qemu/nios2/board.yml b/boards/qemu/nios2/board.yml
index 93f6487d318..aae11848062 100644
--- a/boards/qemu/nios2/board.yml
+++ b/boards/qemu/nios2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: qemu_nios2
+  full_name: QEMU Emulation for Altera Nios-II
   vendor: altr
   socs:
   - name: qemu_nios2
diff --git a/boards/qemu/riscv32/board.yml b/boards/qemu/riscv32/board.yml
index 0ba208612a9..00b7b794e24 100644
--- a/boards/qemu/riscv32/board.yml
+++ b/boards/qemu/riscv32/board.yml
@@ -1,5 +1,6 @@
 board:
   name: qemu_riscv32
+  full_name: QEMU Emulation for RISCV32
   vendor: qemu
   socs:
     - name: qemu_virt_riscv32
diff --git a/boards/qemu/riscv32_xip/board.yml b/boards/qemu/riscv32_xip/board.yml
index beca29532f4..4c43b4d73c8 100644
--- a/boards/qemu/riscv32_xip/board.yml
+++ b/boards/qemu/riscv32_xip/board.yml
@@ -1,5 +1,6 @@
 board:
   name: qemu_riscv32_xip
+  full_name: QEMU Emulation for RISCV32 XIP
   vendor: qemu
   socs:
     - name: fe310
diff --git a/boards/qemu/riscv32e/board.yml b/boards/qemu/riscv32e/board.yml
index cc8e6f0becc..e4b41d79f3e 100644
--- a/boards/qemu/riscv32e/board.yml
+++ b/boards/qemu/riscv32e/board.yml
@@ -1,5 +1,6 @@
 board:
   name: qemu_riscv32e
+  full_name: QEMU Emulation for RISCV32E Emulation
   vendor: qemu
   socs:
     - name: qemu_virt_riscv32e
diff --git a/boards/qemu/riscv64/board.yml b/boards/qemu/riscv64/board.yml
index aa51fd1fdba..eeab9480a24 100644
--- a/boards/qemu/riscv64/board.yml
+++ b/boards/qemu/riscv64/board.yml
@@ -1,5 +1,6 @@
 board:
   name: qemu_riscv64
+  full_name: QEMU Emulation for RISCV64
   vendor: qemu
   socs:
     - name: qemu_virt_riscv64
diff --git a/boards/qemu/x86/board.yml b/boards/qemu/x86/board.yml
index dafcffba24f..7e0fa76a043 100644
--- a/boards/qemu/x86/board.yml
+++ b/boards/qemu/x86/board.yml
@@ -1,7 +1,7 @@
 boards:
 
   - name: qemu_x86
-    full_name: 'QEMU Emulation for X86'
+    full_name: QEMU Emulation for X86
     socs:
       - name: atom
         variants:
@@ -12,18 +12,18 @@ boards:
           - name: 'xip'
 
   - name: qemu_x86_lakemont
-    full_name: 'QEMU Emulation for X86 / Lakemont CPU'
+    full_name: QEMU Emulation for X86 / Lakemont CPU
     socs:
       - name: lakemont
 
   - name: qemu_x86_64
-    full_name: 'QEMU Emulation for X86 64bit'
+    full_name: QEMU Emulation for X86 64bit
     socs:
       - name: atom
         variants:
           - name: 'nokpti'
 
   - name: qemu_x86_tiny
-    full_name: 'QEMU Emulation for X86 Minimal Configuration'
+    full_name: QEMU Emulation for X86 Minimal Configuration
     socs:
       - name: atom
diff --git a/boards/qemu/xtensa/board.yml b/boards/qemu/xtensa/board.yml
index 1441dcc25fc..116a53db80b 100644
--- a/boards/qemu/xtensa/board.yml
+++ b/boards/qemu/xtensa/board.yml
@@ -1,5 +1,6 @@
 board:
   name: qemu_xtensa
+  full_name: QEMU Emulation for Xtensa
   vendor: cdns
   socs:
   - name: dc233c
diff --git a/boards/qorvo/decawave_dwm1001_dev/board.yml b/boards/qorvo/decawave_dwm1001_dev/board.yml
index f1d0ae7def0..3197993cc38 100644
--- a/boards/qorvo/decawave_dwm1001_dev/board.yml
+++ b/boards/qorvo/decawave_dwm1001_dev/board.yml
@@ -1,5 +1,6 @@
 board:
   name: decawave_dwm1001_dev
+  full_name: Decawave DWM1001
   vendor: qorvo
   socs:
   - name: nrf52832
diff --git a/boards/quicklogic/qomu/board.yml b/boards/quicklogic/qomu/board.yml
index e71125610fa..b1c9dd2ce60 100644
--- a/boards/quicklogic/qomu/board.yml
+++ b/boards/quicklogic/qomu/board.yml
@@ -1,5 +1,6 @@
 board:
   name: qomu
+  full_name: Qomu
   vendor: quicklogic
   socs:
   - name: quicklogic_eos_s3
diff --git a/boards/quicklogic/quick_feather/board.yml b/boards/quicklogic/quick_feather/board.yml
index 3ca618cbe34..d271954fb97 100644
--- a/boards/quicklogic/quick_feather/board.yml
+++ b/boards/quicklogic/quick_feather/board.yml
@@ -1,5 +1,6 @@
 board:
   name: quick_feather
+  full_name: QuickFeather
   vendor: quicklogic
   socs:
   - name: quicklogic_eos_s3
diff --git a/boards/rak/rak11720/board.yml b/boards/rak/rak11720/board.yml
index 827beef7e76..418094b216c 100644
--- a/boards/rak/rak11720/board.yml
+++ b/boards/rak/rak11720/board.yml
@@ -1,5 +1,6 @@
 board:
   name: rak11720
+  full_name: RAK11720
   vendor: rakwireless
   socs:
   - name: apollo3_blue
diff --git a/boards/rak/rak4631/board.yml b/boards/rak/rak4631/board.yml
index a3b88672823..5a97085dd0a 100644
--- a/boards/rak/rak4631/board.yml
+++ b/boards/rak/rak4631/board.yml
@@ -1,5 +1,6 @@
 board:
   name: rak4631
+  full_name: RAK4631
   vendor: rakwireless
   socs:
   - name: nrf52840
diff --git a/boards/rak/rak5010/board.yml b/boards/rak/rak5010/board.yml
index c681ac27cb7..d3fc3948831 100644
--- a/boards/rak/rak5010/board.yml
+++ b/boards/rak/rak5010/board.yml
@@ -1,5 +1,6 @@
 board:
   name: rak5010
+  full_name: RAK5010
   vendor: rakwireless
   socs:
   - name: nrf52840
diff --git a/boards/raspberrypi/rpi_4b/board.yml b/boards/raspberrypi/rpi_4b/board.yml
index a84904f9b29..9c8a7ad5bc2 100644
--- a/boards/raspberrypi/rpi_4b/board.yml
+++ b/boards/raspberrypi/rpi_4b/board.yml
@@ -1,5 +1,6 @@
 board:
   name: rpi_4b
+  full_name: Raspberry Pi 4 Model B (Cortex-A72)
   vendor: raspberrypi
   socs:
   - name: bcm2711
diff --git a/boards/raspberrypi/rpi_5/board.yml b/boards/raspberrypi/rpi_5/board.yml
index d604b7f4e51..2c90e5c2db0 100644
--- a/boards/raspberrypi/rpi_5/board.yml
+++ b/boards/raspberrypi/rpi_5/board.yml
@@ -1,5 +1,6 @@
 board:
   name: rpi_5
+  full_name: Raspberry Pi 5 (Cortex-A76)
   vendor: raspberrypi
   socs:
   - name: bcm2712
diff --git a/boards/raspberrypi/rpi_pico/board.yml b/boards/raspberrypi/rpi_pico/board.yml
index e4f8e5bc8d5..c7378a32801 100644
--- a/boards/raspberrypi/rpi_pico/board.yml
+++ b/boards/raspberrypi/rpi_pico/board.yml
@@ -1,5 +1,6 @@
 board:
   name: rpi_pico
+  full_name: Raspberry Pi Pico
   vendor: raspberrypi
   socs:
   - name: rp2040
diff --git a/boards/raytac/mdbt50q_db_33/board.yml b/boards/raytac/mdbt50q_db_33/board.yml
index dbad99fd489..c15a873add0 100644
--- a/boards/raytac/mdbt50q_db_33/board.yml
+++ b/boards/raytac/mdbt50q_db_33/board.yml
@@ -1,5 +1,6 @@
 board:
   name: raytac_mdbt50q_db_33
+  full_name: MDBT50Q-DB-33
   vendor: raytac
   socs:
   - name: nrf52833
diff --git a/boards/raytac/mdbt50q_db_40/board.yml b/boards/raytac/mdbt50q_db_40/board.yml
index a8c109b715f..1d06509fb2f 100644
--- a/boards/raytac/mdbt50q_db_40/board.yml
+++ b/boards/raytac/mdbt50q_db_40/board.yml
@@ -1,5 +1,6 @@
 board:
   name: raytac_mdbt50q_db_40
+  full_name: MDBT50Q-DB-40
   vendor: raytac
   socs:
   - name: nrf52840
diff --git a/boards/raytac/mdbt53_db_40/board.yml b/boards/raytac/mdbt53_db_40/board.yml
index 84bef186b33..823043b0c01 100644
--- a/boards/raytac/mdbt53_db_40/board.yml
+++ b/boards/raytac/mdbt53_db_40/board.yml
@@ -1,5 +1,6 @@
 board:
   name: raytac_mdbt53_db_40
+  full_name: MDBT53-DB-40
   vendor: raytac
   socs:
   - name: 'nrf5340'
diff --git a/boards/raytac/mdbt53v_db_40/board.yml b/boards/raytac/mdbt53v_db_40/board.yml
index 9d3bfd4689b..56fe6f20294 100644
--- a/boards/raytac/mdbt53v_db_40/board.yml
+++ b/boards/raytac/mdbt53v_db_40/board.yml
@@ -1,5 +1,6 @@
 board:
   name: raytac_mdbt53v_db_40
+  full_name: MDBT53V-DB-40
   vendor: raytac
   socs:
   - name: 'nrf5340'
diff --git a/boards/renesas/da14695_dk_usb/board.yml b/boards/renesas/da14695_dk_usb/board.yml
index b9d3f06cb1d..fa0ea2c2bc2 100644
--- a/boards/renesas/da14695_dk_usb/board.yml
+++ b/boards/renesas/da14695_dk_usb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: da14695_dk_usb
+  full_name: DA14695 Development Kit USB
   vendor: renesas
   socs:
   - name: da14695
diff --git a/boards/renesas/da1469x_dk_pro/board.yml b/boards/renesas/da1469x_dk_pro/board.yml
index 09ab03c0b26..6c7388567ac 100644
--- a/boards/renesas/da1469x_dk_pro/board.yml
+++ b/boards/renesas/da1469x_dk_pro/board.yml
@@ -1,5 +1,6 @@
 board:
   name: da1469x_dk_pro
+  full_name: DA1469x Development Kit Pro
   vendor: renesas
   socs:
   - name: da14699
diff --git a/boards/renesas/ek_ra2a1/board.yml b/boards/renesas/ek_ra2a1/board.yml
index 82c498850aa..6c47b918ec5 100644
--- a/boards/renesas/ek_ra2a1/board.yml
+++ b/boards/renesas/ek_ra2a1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ek_ra2a1
+  full_name: RA2A1 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa2a1ab3cfm
diff --git a/boards/renesas/ek_ra4e2/board.yml b/boards/renesas/ek_ra4e2/board.yml
index 8baa0819ff2..161c7543ff9 100644
--- a/boards/renesas/ek_ra4e2/board.yml
+++ b/boards/renesas/ek_ra4e2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ek_ra4e2
+  full_name: RA4E2 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa4e2b93cfm
diff --git a/boards/renesas/ek_ra4m2/board.yml b/boards/renesas/ek_ra4m2/board.yml
index c19484eff8a..31a7e8e269a 100644
--- a/boards/renesas/ek_ra4m2/board.yml
+++ b/boards/renesas/ek_ra4m2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ek_ra4m2
+  full_name: RA4M2 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa4m2ad3cfp
diff --git a/boards/renesas/ek_ra4m3/board.yml b/boards/renesas/ek_ra4m3/board.yml
index 30b3b39ac4e..b84c06cd531 100644
--- a/boards/renesas/ek_ra4m3/board.yml
+++ b/boards/renesas/ek_ra4m3/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ek_ra4m3
+  full_name: RA4M3 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa4m3af3cfb
diff --git a/boards/renesas/ek_ra4w1/board.yml b/boards/renesas/ek_ra4w1/board.yml
index 709a8435475..8783b2b957c 100644
--- a/boards/renesas/ek_ra4w1/board.yml
+++ b/boards/renesas/ek_ra4w1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ek_ra4w1
+  full_name: RA4W1 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa4w1ad2cng
diff --git a/boards/renesas/ek_ra6e2/board.yml b/boards/renesas/ek_ra6e2/board.yml
index 972476c9b2e..5c2629250d7 100644
--- a/boards/renesas/ek_ra6e2/board.yml
+++ b/boards/renesas/ek_ra6e2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ek_ra6e2
+  full_name: RA6E2 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa6e2bb3cfm
diff --git a/boards/renesas/ek_ra6m1/board.yml b/boards/renesas/ek_ra6m1/board.yml
index db68eb8a068..003486b48ff 100644
--- a/boards/renesas/ek_ra6m1/board.yml
+++ b/boards/renesas/ek_ra6m1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ek_ra6m1
+  full_name: RA6M1 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa6m1ad3cfp
diff --git a/boards/renesas/ek_ra6m2/board.yml b/boards/renesas/ek_ra6m2/board.yml
index 325b1601c9a..ec00a66bf19 100644
--- a/boards/renesas/ek_ra6m2/board.yml
+++ b/boards/renesas/ek_ra6m2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ek_ra6m2
+  full_name: RA6M2 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa6m2af3cfb
diff --git a/boards/renesas/ek_ra6m3/board.yml b/boards/renesas/ek_ra6m3/board.yml
index 2bf115b0a18..084afa42ced 100644
--- a/boards/renesas/ek_ra6m3/board.yml
+++ b/boards/renesas/ek_ra6m3/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ek_ra6m3
+  full_name: RA6M3 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa6m3ah3cfc
diff --git a/boards/renesas/ek_ra6m4/board.yml b/boards/renesas/ek_ra6m4/board.yml
index 5c7e34ff180..c7bb851f8d7 100644
--- a/boards/renesas/ek_ra6m4/board.yml
+++ b/boards/renesas/ek_ra6m4/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ek_ra6m4
+  full_name: RA6M4 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa6m4af3cfb
diff --git a/boards/renesas/ek_ra6m5/board.yml b/boards/renesas/ek_ra6m5/board.yml
index 826e64f943e..d084f775ec1 100644
--- a/boards/renesas/ek_ra6m5/board.yml
+++ b/boards/renesas/ek_ra6m5/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ek_ra6m5
+  full_name: RA6M5 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa6m5bh3cfc
diff --git a/boards/renesas/ek_ra8d1/board.yml b/boards/renesas/ek_ra8d1/board.yml
index 9b48ea9b942..d109cd234a3 100644
--- a/boards/renesas/ek_ra8d1/board.yml
+++ b/boards/renesas/ek_ra8d1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ek_ra8d1
+  full_name: RA8D1 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa8d1bhecbd
diff --git a/boards/renesas/ek_ra8m1/board.yml b/boards/renesas/ek_ra8m1/board.yml
index 136846ecc81..f98587420bc 100644
--- a/boards/renesas/ek_ra8m1/board.yml
+++ b/boards/renesas/ek_ra8m1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ek_ra8m1
+  full_name: RA8M1 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa8m1ahecbd
diff --git a/boards/renesas/fpb_ra6e1/board.yml b/boards/renesas/fpb_ra6e1/board.yml
index ed1e0a18bfd..d2f980d6acc 100644
--- a/boards/renesas/fpb_ra6e1/board.yml
+++ b/boards/renesas/fpb_ra6e1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: fpb_ra6e1
+  full_name: RA6E1 Fast Prototyping Board
   vendor: renesas
   socs:
   - name: r7fa6e10f2cfp
diff --git a/boards/renesas/fpb_ra6e2/board.yml b/boards/renesas/fpb_ra6e2/board.yml
index 0d28094c404..586b7c74810 100644
--- a/boards/renesas/fpb_ra6e2/board.yml
+++ b/boards/renesas/fpb_ra6e2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: fpb_ra6e2
+  full_name: RA6E2 Fast Prototyping Board
   vendor: renesas
   socs:
   - name: r7fa6e2bb3cfm
diff --git a/boards/renesas/mck_ra8t1/board.yml b/boards/renesas/mck_ra8t1/board.yml
index d7227163611..b7897016bbe 100644
--- a/boards/renesas/mck_ra8t1/board.yml
+++ b/boards/renesas/mck_ra8t1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mck_ra8t1
+  full_name: RA8T1 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa8t1ahecbd
diff --git a/boards/renesas/rcar_h3ulcb/board.yml b/boards/renesas/rcar_h3ulcb/board.yml
index 7989c688e81..a0e38a44a90 100644
--- a/boards/renesas/rcar_h3ulcb/board.yml
+++ b/boards/renesas/rcar_h3ulcb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: rcar_h3ulcb
+  full_name: R-CAR H3 ARM CA57 (ARMv8)
   vendor: renesas
   socs:
   - name: r8a77951
diff --git a/boards/renesas/rcar_salvator_x/board.yml b/boards/renesas/rcar_salvator_x/board.yml
index b85c3aebe67..11166fb0a2c 100644
--- a/boards/renesas/rcar_salvator_x/board.yml
+++ b/boards/renesas/rcar_salvator_x/board.yml
@@ -1,5 +1,6 @@
 board:
   name: rcar_salvator_x
+  full_name: R-Car H3 Salvator-X
   vendor: renesas
   socs:
   - name: r8a77951
diff --git a/boards/renesas/rcar_salvator_xs/board.yml b/boards/renesas/rcar_salvator_xs/board.yml
index b48fda7ff48..2b8ded23f8a 100644
--- a/boards/renesas/rcar_salvator_xs/board.yml
+++ b/boards/renesas/rcar_salvator_xs/board.yml
@@ -1,5 +1,6 @@
 board:
   name: rcar_salvator_xs
+  full_name: R-CAR Salvator XS M3 ARM CA57 (ARMv8)
   vendor: renesas
   socs:
   - name: r8a77961
diff --git a/boards/renesas/rcar_spider_s4/board.yml b/boards/renesas/rcar_spider_s4/board.yml
index 560ed7f2ae8..caf9b8cf5ad 100644
--- a/boards/renesas/rcar_spider_s4/board.yml
+++ b/boards/renesas/rcar_spider_s4/board.yml
@@ -1,5 +1,6 @@
 board:
   name: rcar_spider_s4
+  full_name: R-CAR Spider S4 (ARM64)
   vendor: renesas
   socs:
   - name: r8a779f0
diff --git a/boards/renesas/rzt2m_starterkit/board.yml b/boards/renesas/rzt2m_starterkit/board.yml
index def32c06cd2..21be12a29b2 100644
--- a/boards/renesas/rzt2m_starterkit/board.yml
+++ b/boards/renesas/rzt2m_starterkit/board.yml
@@ -1,5 +1,6 @@
 board:
   name: rzt2m_starter_kit
+  full_name: Starter Kit+ for RZ/T2M
   vendor: renesas
   socs:
   - name: renesas_rzt2m
diff --git a/boards/renode/cortex_r8_virtual/board.yml b/boards/renode/cortex_r8_virtual/board.yml
index 799b2a9ba12..b201b3e96c3 100644
--- a/boards/renode/cortex_r8_virtual/board.yml
+++ b/boards/renode/cortex_r8_virtual/board.yml
@@ -1,5 +1,6 @@
 board:
   name: cortex_r8_virtual
+  full_name: Cortex-R8 Virtual
   vendor: renode
   socs:
   - name: cortex_r8_virtual
diff --git a/boards/renode/riscv32_virtual/board.yml b/boards/renode/riscv32_virtual/board.yml
index b059266009a..27c5eb7c368 100644
--- a/boards/renode/riscv32_virtual/board.yml
+++ b/boards/renode/riscv32_virtual/board.yml
@@ -1,5 +1,6 @@
 board:
   name: riscv32_virtual
+  full_name: RISCV32 Virtual
   vendor: renode
   socs:
   - name: riscv_virtual_renode
diff --git a/boards/ronoth/lodev/board.yml b/boards/ronoth/lodev/board.yml
index 008f2e5a7f5..db71507ae8a 100644
--- a/boards/ronoth/lodev/board.yml
+++ b/boards/ronoth/lodev/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ronoth_lodev
+  full_name: LoDev
   vendor: ronoth
   socs:
     - name: stm32l073xx
diff --git a/boards/ruuvi/ruuvitag/board.yml b/boards/ruuvi/ruuvitag/board.yml
index c8d45886d82..e0e6fc40a55 100644
--- a/boards/ruuvi/ruuvitag/board.yml
+++ b/boards/ruuvi/ruuvitag/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ruuvi_ruuvitag
+  full_name: RuuviTag
   vendor: ruuvi
   socs:
   - name: nrf52832
diff --git a/boards/sc/scobc_module1/board.yml b/boards/sc/scobc_module1/board.yml
index d8f83a733ac..2ffbcc51e54 100644
--- a/boards/sc/scobc_module1/board.yml
+++ b/boards/sc/scobc_module1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: scobc_module1
+  full_name: OBC module 1
   vendor: spacecubics
   socs:
   - name: designstart_fpga_cortex_m3
diff --git a/boards/seagate/faze/board.yml b/boards/seagate/faze/board.yml
index bd672fe549f..29ad19a2d55 100644
--- a/boards/seagate/faze/board.yml
+++ b/boards/seagate/faze/board.yml
@@ -1,5 +1,6 @@
 board:
   name: faze
+  full_name: FireCuda Gaming SSD (FaZe) board
   vendor: seagate
   socs:
     - name: lpc11u67
diff --git a/boards/seagate/legend/board.yml b/boards/seagate/legend/board.yml
index 0c100284bde..a015c60bc4e 100644
--- a/boards/seagate/legend/board.yml
+++ b/boards/seagate/legend/board.yml
@@ -1,5 +1,6 @@
 board:
   name: legend
+  full_name: Legend
   vendor: seagate
   revision:
     format: custom
diff --git a/boards/seco/stm32f3_seco_d23/board.yml b/boards/seco/stm32f3_seco_d23/board.yml
index a7976211a2c..75a16bd3b48 100644
--- a/boards/seco/stm32f3_seco_d23/board.yml
+++ b/boards/seco/stm32f3_seco_d23/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32f3_seco_d23
+  full_name: SECO SBC-3.5-PX30 (JUNO - D23) (STM32F302)
   vendor: seco
   socs:
     - name: stm32f302xc
diff --git a/boards/seeed/lora_e5_dev_board/board.yml b/boards/seeed/lora_e5_dev_board/board.yml
index b6691948f2b..e53e5451e0c 100644
--- a/boards/seeed/lora_e5_dev_board/board.yml
+++ b/boards/seeed/lora_e5_dev_board/board.yml
@@ -1,5 +1,6 @@
 board:
   name: lora_e5_dev_board
+  full_name: LoRa-E5 Dev Board
   vendor: seeed
   socs:
     - name: stm32wle5xx
diff --git a/boards/seeed/lora_e5_mini/board.yml b/boards/seeed/lora_e5_mini/board.yml
index 1643caea3c1..7f1080afb5d 100644
--- a/boards/seeed/lora_e5_mini/board.yml
+++ b/boards/seeed/lora_e5_mini/board.yml
@@ -1,5 +1,6 @@
 board:
   name: lora_e5_mini
+  full_name: LoRa-E5 mini
   vendor: seeed
   socs:
     - name: stm32wle5xx
diff --git a/boards/seeed/seeeduino_xiao/board.yml b/boards/seeed/seeeduino_xiao/board.yml
index 386a3b3cbb6..642e7e750e3 100644
--- a/boards/seeed/seeeduino_xiao/board.yml
+++ b/boards/seeed/seeeduino_xiao/board.yml
@@ -1,5 +1,6 @@
 board:
   name: seeeduino_xiao
+  full_name: Seeeduino XIAO
   vendor: seeed
   socs:
     - name: samd21g18a
diff --git a/boards/seeed/wio_terminal/board.yml b/boards/seeed/wio_terminal/board.yml
index a7080a87777..7972eeb9de5 100644
--- a/boards/seeed/wio_terminal/board.yml
+++ b/boards/seeed/wio_terminal/board.yml
@@ -1,5 +1,6 @@
 board:
   name: wio_terminal
+  full_name: Wio Terminal
   vendor: seeed
   socs:
     - name: samd51p19a
diff --git a/boards/seeed/xiao_ble/board.yml b/boards/seeed/xiao_ble/board.yml
index 3f83399a7fb..ecc63f716ad 100644
--- a/boards/seeed/xiao_ble/board.yml
+++ b/boards/seeed/xiao_ble/board.yml
@@ -1,5 +1,6 @@
 board:
   name: xiao_ble
+  full_name: XIAO BLE (Sense)
   vendor: seeed
   socs:
   - name: nrf52840
diff --git a/boards/seeed/xiao_esp32c3/board.yml b/boards/seeed/xiao_esp32c3/board.yml
index 2bd54cf346f..d9c7cef765c 100644
--- a/boards/seeed/xiao_esp32c3/board.yml
+++ b/boards/seeed/xiao_esp32c3/board.yml
@@ -1,5 +1,6 @@
 board:
   name: xiao_esp32c3
+  full_name: XIAO ESP32C3
   vendor: seeed
   socs:
   - name: esp32c3
diff --git a/boards/seeed/xiao_esp32s3/board.yml b/boards/seeed/xiao_esp32s3/board.yml
index 02ba87e5bc2..c3eb3a0204d 100644
--- a/boards/seeed/xiao_esp32s3/board.yml
+++ b/boards/seeed/xiao_esp32s3/board.yml
@@ -1,5 +1,6 @@
 board:
   name: xiao_esp32s3
+  full_name: XIAO ESP32S3
   vendor: seeed
   socs:
   - name: esp32s3
diff --git a/boards/seeed/xiao_rp2040/board.yml b/boards/seeed/xiao_rp2040/board.yml
index 7eaca915972..75b352e9aee 100644
--- a/boards/seeed/xiao_rp2040/board.yml
+++ b/boards/seeed/xiao_rp2040/board.yml
@@ -1,5 +1,6 @@
 board:
   name: xiao_rp2040
+  full_name: XIAO RP2040
   vendor: seeed
   socs:
   - name: rp2040
diff --git a/boards/segger/ip_k66f/board.yml b/boards/segger/ip_k66f/board.yml
index c1593280a49..21b7c0b65e4 100644
--- a/boards/segger/ip_k66f/board.yml
+++ b/boards/segger/ip_k66f/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ip_k66f
+  full_name: IP Switch Board
   vendor: segger
   socs:
     - name: mk66f18
diff --git a/boards/segger/trb_stm32f407/board.yml b/boards/segger/trb_stm32f407/board.yml
index 52ba24a33eb..1fc912e38ca 100644
--- a/boards/segger/trb_stm32f407/board.yml
+++ b/boards/segger/trb_stm32f407/board.yml
@@ -1,5 +1,6 @@
 board:
   name: segger_trb_stm32f407
+  full_name: Cortex-M Trace Reference Board V1.2
   vendor: segger
   socs:
     - name: stm32f407xx
diff --git a/boards/sensry/ganymed_bob/board.yml b/boards/sensry/ganymed_bob/board.yml
index cc6591f6253..5e444b0dbb8 100644
--- a/boards/sensry/ganymed_bob/board.yml
+++ b/boards/sensry/ganymed_bob/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: ganymed_bob
+  full_name: Ganymed Break-Out-Board (BOB)
   vendor: sensry
   socs:
     - name: sy120_gbm
diff --git a/boards/sifive/hifive1/board.yml b/boards/sifive/hifive1/board.yml
index 2909cb5aaeb..a83c4f2e2c7 100644
--- a/boards/sifive/hifive1/board.yml
+++ b/boards/sifive/hifive1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: hifive1
+  full_name: HiFive1
   vendor: sifive
   socs:
     - name: fe310
diff --git a/boards/sifive/hifive_unleashed/board.yml b/boards/sifive/hifive_unleashed/board.yml
index f9dd3ce6e6b..5535b9ca544 100644
--- a/boards/sifive/hifive_unleashed/board.yml
+++ b/boards/sifive/hifive_unleashed/board.yml
@@ -1,5 +1,6 @@
 board:
   name: hifive_unleashed
+  full_name: HiFive Unleashed
   vendor: sifive
   socs:
     - name: fu540
diff --git a/boards/sifive/hifive_unmatched/board.yml b/boards/sifive/hifive_unmatched/board.yml
index 703d94e852b..eb61e98e55c 100644
--- a/boards/sifive/hifive_unmatched/board.yml
+++ b/boards/sifive/hifive_unmatched/board.yml
@@ -1,5 +1,6 @@
 board:
   name: hifive_unmatched
+  full_name: HiFive Unmatched
   vendor: sifive
   socs:
     - name: fu740
diff --git a/boards/silabs/dev_kits/sim3u1xx_dk/board.yml b/boards/silabs/dev_kits/sim3u1xx_dk/board.yml
index c70d5420483..facdc0f817a 100644
--- a/boards/silabs/dev_kits/sim3u1xx_dk/board.yml
+++ b/boards/silabs/dev_kits/sim3u1xx_dk/board.yml
@@ -4,6 +4,7 @@
 
 board:
   name: sim3u1xx_dk
+  full_name: SiM3U1xx 32-bit MCU USB Development Kit
   vendor: silabs
   socs:
     - name: sim3u167
diff --git a/boards/silabs/dev_kits/sltb004a/board.yml b/boards/silabs/dev_kits/sltb004a/board.yml
index 2141aa3817d..73c4c2aced7 100644
--- a/boards/silabs/dev_kits/sltb004a/board.yml
+++ b/boards/silabs/dev_kits/sltb004a/board.yml
@@ -1,5 +1,6 @@
 board:
   name: sltb004a
+  full_name: EFR32MG12 Thunderboard (SLTB004A)
   vendor: silabs
   socs:
   - name: efr32mg12p332f1024gl125
diff --git a/boards/silabs/dev_kits/sltb009a/board.yml b/boards/silabs/dev_kits/sltb009a/board.yml
index af69758728d..e42c7cd0b66 100644
--- a/boards/silabs/dev_kits/sltb009a/board.yml
+++ b/boards/silabs/dev_kits/sltb009a/board.yml
@@ -1,5 +1,6 @@
 board:
   name: sltb009a
+  full_name: EFM32GG12 Thunderboard (SLTB009A)
   vendor: silabs
   socs:
   - name: efm32gg12b810f1024gm64
diff --git a/boards/silabs/dev_kits/sltb010a/board.yml b/boards/silabs/dev_kits/sltb010a/board.yml
index 4586a51ef72..8e2cf705005 100644
--- a/boards/silabs/dev_kits/sltb010a/board.yml
+++ b/boards/silabs/dev_kits/sltb010a/board.yml
@@ -1,5 +1,6 @@
 boards:
   - name: sltb010a
+    full_name: EFR32BG22 Thunderboard (SLTB010A)
     vendor: silabs
     socs:
       - name: efr32bg22c224f512im40
diff --git a/boards/silabs/dev_kits/xg24_dk2601b/board.yml b/boards/silabs/dev_kits/xg24_dk2601b/board.yml
index f946744d228..46b2e55a2ce 100644
--- a/boards/silabs/dev_kits/xg24_dk2601b/board.yml
+++ b/boards/silabs/dev_kits/xg24_dk2601b/board.yml
@@ -1,5 +1,6 @@
 board:
   name: xg24_dk2601b
+  full_name: EFR32xG24 Dev Kit (xG24-DK2601B)
   vendor: silabs
   socs:
   - name: efr32mg24b310f1536im48
diff --git a/boards/silabs/dev_kits/xg27_dk2602a/board.yml b/boards/silabs/dev_kits/xg27_dk2602a/board.yml
index 83a3037a1a7..1d6d016ecf5 100644
--- a/boards/silabs/dev_kits/xg27_dk2602a/board.yml
+++ b/boards/silabs/dev_kits/xg27_dk2602a/board.yml
@@ -1,5 +1,6 @@
 boards:
   - name: xg27_dk2602a
+    full_name: EFR32xG27 Dev Kit (xG27-DK2602A)
     vendor: silabs
     socs:
       - name: efr32bg27c140f768im40
diff --git a/boards/silabs/radio_boards/slwrb4104a/board.yml b/boards/silabs/radio_boards/slwrb4104a/board.yml
index 5ca377b2c8f..d1122ace331 100644
--- a/boards/silabs/radio_boards/slwrb4104a/board.yml
+++ b/boards/silabs/radio_boards/slwrb4104a/board.yml
@@ -1,4 +1,5 @@
 boards:
   - name: slwrb4104a
+    full_name: EFR32BG13 2.4 GHz 10 dBm (SLWRB4104A)
     socs:
       - name: efr32bg13p632f512gm48
diff --git a/boards/silabs/radio_boards/slwrb4161a/board.yml b/boards/silabs/radio_boards/slwrb4161a/board.yml
index a05542a40d8..fd0c68e48b2 100644
--- a/boards/silabs/radio_boards/slwrb4161a/board.yml
+++ b/boards/silabs/radio_boards/slwrb4161a/board.yml
@@ -1,4 +1,5 @@
 boards:
   - name: slwrb4161a
+    full_name: EFR32MG12 2.4 GHz 19 dBm (SLWRB4161A)
     socs:
       - name: efr32mg12p432f1024gl125
diff --git a/boards/silabs/radio_boards/slwrb4170a/board.yml b/boards/silabs/radio_boards/slwrb4170a/board.yml
index 3137d819edb..5d9fd340d3e 100644
--- a/boards/silabs/radio_boards/slwrb4170a/board.yml
+++ b/boards/silabs/radio_boards/slwrb4170a/board.yml
@@ -1,4 +1,5 @@
 boards:
   - name: slwrb4170a
+    full_name: EFR32MG12 2400/868-915 MHz 19 dBm Dual Band (SLWRB4170A)
     socs:
       - name: efr32mg12p433f1024gm68
diff --git a/boards/silabs/radio_boards/slwrb4180a/board.yml b/boards/silabs/radio_boards/slwrb4180a/board.yml
index c6f825f735a..f77ecb3f65b 100644
--- a/boards/silabs/radio_boards/slwrb4180a/board.yml
+++ b/boards/silabs/radio_boards/slwrb4180a/board.yml
@@ -1,4 +1,5 @@
 boards:
   - name: slwrb4180a
+    full_name: EFR32xG21 2.4 GHz 20 dBm (SLWRB4180A)
     socs:
       - name: efr32mg21a020f1024im32
diff --git a/boards/silabs/radio_boards/slwrb4250b/board.yml b/boards/silabs/radio_boards/slwrb4250b/board.yml
index cffd4c63dbb..052b39f83c3 100644
--- a/boards/silabs/radio_boards/slwrb4250b/board.yml
+++ b/boards/silabs/radio_boards/slwrb4250b/board.yml
@@ -1,4 +1,5 @@
 boards:
   - name: slwrb4250b
+    full_name: EFR32FG1 2400/868 MHz 13 dBm Dual Band (SLWRB4250B)
     socs:
       - name: efr32fg1p133f256gm48
diff --git a/boards/silabs/radio_boards/slwrb4255a/board.yml b/boards/silabs/radio_boards/slwrb4255a/board.yml
index 4b76604b170..841a0858e13 100644
--- a/boards/silabs/radio_boards/slwrb4255a/board.yml
+++ b/boards/silabs/radio_boards/slwrb4255a/board.yml
@@ -1,4 +1,5 @@
 boards:
   - name: slwrb4255a
+    full_name: EFR32FG13 2400/915 MHz 19 dBm Dual Band (SLWRB4255A)
     socs:
       - name: efr32fg13p233f512gm48
diff --git a/boards/silabs/radio_boards/slwrb4321a/board.yml b/boards/silabs/radio_boards/slwrb4321a/board.yml
index a86f5c2d620..c0ad89de758 100644
--- a/boards/silabs/radio_boards/slwrb4321a/board.yml
+++ b/boards/silabs/radio_boards/slwrb4321a/board.yml
@@ -1,5 +1,6 @@
 board:
   name: slwrb4321a
+  full_name: WGM160P Wi-Fi Module (SLWRB4321A)
   vendor: silabs
   socs:
   - name: efm32gg11b820f2048gm64
diff --git a/boards/silabs/radio_boards/xg24_rb4187c/board.yml b/boards/silabs/radio_boards/xg24_rb4187c/board.yml
index 09a4d074370..36457142237 100644
--- a/boards/silabs/radio_boards/xg24_rb4187c/board.yml
+++ b/boards/silabs/radio_boards/xg24_rb4187c/board.yml
@@ -1,4 +1,5 @@
 boards:
   - name: xg24_rb4187c
+    full_name: EFR32xG24 2.4 GHz 20 dBm (xG24-RB4187C)
     socs:
       - name: efr32mg24b220f1536im48
diff --git a/boards/silabs/starter_kits/efm32wg_stk3800/board.yml b/boards/silabs/starter_kits/efm32wg_stk3800/board.yml
index 034c623141b..ab827f8b346 100644
--- a/boards/silabs/starter_kits/efm32wg_stk3800/board.yml
+++ b/boards/silabs/starter_kits/efm32wg_stk3800/board.yml
@@ -1,5 +1,6 @@
 board:
   name: efm32wg_stk3800
+  full_name: EFM32 Wonder Gecko (EFM32WG-STK3800)
   vendor: silabs
   socs:
   - name: efm32wg990f256
diff --git a/boards/silabs/starter_kits/slstk3400a/board.yml b/boards/silabs/starter_kits/slstk3400a/board.yml
index e6573ac89f5..30d6090012d 100644
--- a/boards/silabs/starter_kits/slstk3400a/board.yml
+++ b/boards/silabs/starter_kits/slstk3400a/board.yml
@@ -1,5 +1,6 @@
 board:
   name: slstk3400a
+  full_name: EFM32 Happy Gecko (SLSTK3400A)
   vendor: silabs
   socs:
   - name: efm32hg322f64
diff --git a/boards/silabs/starter_kits/slstk3401a/board.yml b/boards/silabs/starter_kits/slstk3401a/board.yml
index 98ae08c1992..99ce00a0ad2 100644
--- a/boards/silabs/starter_kits/slstk3401a/board.yml
+++ b/boards/silabs/starter_kits/slstk3401a/board.yml
@@ -1,5 +1,6 @@
 board:
   name: slstk3401a
+  full_name: EFM32 Pearl Gecko (SLSTK3401A)
   vendor: silabs
   socs:
   - name: efm32pg1b200f256gm48
diff --git a/boards/silabs/starter_kits/slstk3402a/board.yml b/boards/silabs/starter_kits/slstk3402a/board.yml
index 539af134c6d..6c9350d31bf 100644
--- a/boards/silabs/starter_kits/slstk3402a/board.yml
+++ b/boards/silabs/starter_kits/slstk3402a/board.yml
@@ -1,5 +1,6 @@
 board:
   name: slstk3402a
+  full_name: EFM32 Pearl Gecko 12 (SLSTK3402A)
   vendor: silabs
   socs:
   - name: efm32pg12b500f1024gl125
diff --git a/boards/silabs/starter_kits/slstk3701a/board.yml b/boards/silabs/starter_kits/slstk3701a/board.yml
index 5c1db884a42..86615b1e8fe 100644
--- a/boards/silabs/starter_kits/slstk3701a/board.yml
+++ b/boards/silabs/starter_kits/slstk3701a/board.yml
@@ -1,5 +1,6 @@
 board:
   name: slstk3701a
+  full_name: EFM32 Giant Gecko 11 (SLSTK3701A)
   vendor: silabs
   socs:
   - name: efm32gg11b820f2048gl192
diff --git a/boards/sipeed/longan_nano/board.yml b/boards/sipeed/longan_nano/board.yml
index 035ea8f540d..4f1fedeba77 100644
--- a/boards/sipeed/longan_nano/board.yml
+++ b/boards/sipeed/longan_nano/board.yml
@@ -1,5 +1,6 @@
 board:
   name: longan_nano
+  full_name: Longan Nano
   vendor: sipeed
   socs:
     - name: gd32vf103
diff --git a/boards/snps/em_starterkit/board.yml b/boards/snps/em_starterkit/board.yml
index b5c30f1ba9d..c9279e060f2 100644
--- a/boards/snps/em_starterkit/board.yml
+++ b/boards/snps/em_starterkit/board.yml
@@ -1,5 +1,6 @@
 board:
   name: em_starterkit
+  full_name: ARC EM Starter Kit
   vendor: snps
   socs:
   - name: emsk_em7d
diff --git a/boards/snps/emsdp/board.yml b/boards/snps/emsdp/board.yml
index 463c30bc2fc..6a5f944733d 100644
--- a/boards/snps/emsdp/board.yml
+++ b/boards/snps/emsdp/board.yml
@@ -1,5 +1,6 @@
 board:
   name: emsdp
+  full_name: ARC EM Software Development Platform
   vendor: snps
   socs:
   - name: emsdp_em4
diff --git a/boards/snps/hsdk/board.yml b/boards/snps/hsdk/board.yml
index 44363f8a9b8..164b176bae6 100644
--- a/boards/snps/hsdk/board.yml
+++ b/boards/snps/hsdk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: hsdk
+  full_name: ARC HS Development Kit
   vendor: snps
   socs:
   - name: arc_hsdk
diff --git a/boards/snps/hsdk4xd/board.yml b/boards/snps/hsdk4xd/board.yml
index 70e04fa7e80..147e75e69f0 100644
--- a/boards/snps/hsdk4xd/board.yml
+++ b/boards/snps/hsdk4xd/board.yml
@@ -1,5 +1,6 @@
 board:
   name: hsdk4xd
+  full_name: ARC HS4x/HS4xD Development Kit
   vendor: snps
   socs:
   - name: arc_hsdk4xd
diff --git a/boards/snps/iotdk/board.yml b/boards/snps/iotdk/board.yml
index 5222ad815cf..9889a3762f8 100644
--- a/boards/snps/iotdk/board.yml
+++ b/boards/snps/iotdk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: iotdk
+  full_name: ARC IoT Development Kit
   vendor: snps
   socs:
   - name: arc_iot
diff --git a/boards/snps/nsim/arc_classic/board.yml b/boards/snps/nsim/arc_classic/board.yml
index a5089774c47..20bbd3071ec 100644
--- a/boards/snps/nsim/arc_classic/board.yml
+++ b/boards/snps/nsim/arc_classic/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nsim
+  full_name: ARC nSIM and HAPS FPGA boards
   vendor: snps
   socs:
   - name: nsim_em
diff --git a/boards/snps/nsim/arc_v/board.yml b/boards/snps/nsim/arc_v/board.yml
index a91eaffd90a..4a8d44eee29 100644
--- a/boards/snps/nsim/arc_v/board.yml
+++ b/boards/snps/nsim/arc_v/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nsim_arc_v
+  full_name: RISC-V nSIM and HAPS FPGA boards
   vendor: snps
   socs:
   - name: rmx100
diff --git a/boards/sparkfun/micromod/board.yml b/boards/sparkfun/micromod/board.yml
index 851ac345bc5..2f7df46ca0c 100644
--- a/boards/sparkfun/micromod/board.yml
+++ b/boards/sparkfun/micromod/board.yml
@@ -1,5 +1,6 @@
 board:
   name: micromod
+  full_name: MicroMod board Processor
   vendor: sparkfun
   socs:
   - name: nrf52840
diff --git a/boards/sparkfun/nrf52_sparkfun/board.yml b/boards/sparkfun/nrf52_sparkfun/board.yml
index 5e44e8a072b..d892ab054bb 100644
--- a/boards/sparkfun/nrf52_sparkfun/board.yml
+++ b/boards/sparkfun/nrf52_sparkfun/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf52_sparkfun
+  full_name: nRF52832 breakout
   vendor: sparkfun
   socs:
   - name: nrf52832
diff --git a/boards/sparkfun/pro_micro_rp2040/board.yml b/boards/sparkfun/pro_micro_rp2040/board.yml
index ed9e449e8aa..e4c96de669d 100644
--- a/boards/sparkfun/pro_micro_rp2040/board.yml
+++ b/boards/sparkfun/pro_micro_rp2040/board.yml
@@ -1,5 +1,6 @@
 board:
   name: sparkfun_pro_micro_rp2040
+  full_name: Pro Micro RP2040
   vendor: sparkfun
   socs:
   - name: rp2040
diff --git a/boards/sparkfun/red_v_things_plus/board.yml b/boards/sparkfun/red_v_things_plus/board.yml
index 6ef8e39c2f9..fe588482767 100644
--- a/boards/sparkfun/red_v_things_plus/board.yml
+++ b/boards/sparkfun/red_v_things_plus/board.yml
@@ -1,5 +1,6 @@
 board:
   name: sparkfun_red_v_things_plus
+  full_name: RED-V Things Plus
   vendor: sparkfun
   socs:
     - name: fe310
diff --git a/boards/sparkfun/thing_plus/board.yml b/boards/sparkfun/thing_plus/board.yml
index 18037dfd5b6..f632d9feab0 100644
--- a/boards/sparkfun/thing_plus/board.yml
+++ b/boards/sparkfun/thing_plus/board.yml
@@ -1,5 +1,6 @@
 board:
   name: sparkfun_thing_plus
+  full_name: nRF9160 Thing Plus
   vendor: sparkfun
   socs:
   - name: nrf9160
diff --git a/boards/sparkfun/thing_plus_matter_mgm240p/board.yml b/boards/sparkfun/thing_plus_matter_mgm240p/board.yml
index 69ecc88a5b8..e2d94d63e1c 100644
--- a/boards/sparkfun/thing_plus_matter_mgm240p/board.yml
+++ b/boards/sparkfun/thing_plus_matter_mgm240p/board.yml
@@ -1,5 +1,6 @@
 board:
   name: sparkfun_thing_plus_matter_mgm240p
+  full_name: THING PLUS MATTER
   vendor: sparkfun
   socs:
   - name: efr32mg24b020f1536im40
diff --git a/boards/st/b_g474e_dpow1/board.yml b/boards/st/b_g474e_dpow1/board.yml
index 06d037f81a0..c2c81d97489 100644
--- a/boards/st/b_g474e_dpow1/board.yml
+++ b/boards/st/b_g474e_dpow1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: b_g474e_dpow1
+  full_name: B-G474E-DPOW1 Discovery
   vendor: st
   socs:
     - name: stm32g474xx
diff --git a/boards/st/b_l072z_lrwan1/board.yml b/boards/st/b_l072z_lrwan1/board.yml
index 1a7b494de19..70a1d334a4a 100644
--- a/boards/st/b_l072z_lrwan1/board.yml
+++ b/boards/st/b_l072z_lrwan1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: b_l072z_lrwan1
+  full_name: B-L072Z-LRWAN1 Discovery kit
   vendor: st
   socs:
     - name: stm32l072xx
diff --git a/boards/st/b_l4s5i_iot01a/board.yml b/boards/st/b_l4s5i_iot01a/board.yml
index e41cb4b1002..de0a620a93f 100644
--- a/boards/st/b_l4s5i_iot01a/board.yml
+++ b/boards/st/b_l4s5i_iot01a/board.yml
@@ -1,5 +1,6 @@
 board:
   name: b_l4s5i_iot01a
+  full_name: B-L4S5I-IOT01A Discovery kit
   vendor: st
   socs:
     - name: stm32l4s5xx
diff --git a/boards/st/b_u585i_iot02a/board.yml b/boards/st/b_u585i_iot02a/board.yml
index 55e740ec45d..c5ae28435f0 100644
--- a/boards/st/b_u585i_iot02a/board.yml
+++ b/boards/st/b_u585i_iot02a/board.yml
@@ -1,5 +1,6 @@
 board:
   name: b_u585i_iot02a
+  full_name: B-U585I-IOT02A Discovery kit
   vendor: st
   socs:
     - name: stm32u585xx
diff --git a/boards/st/disco_l475_iot1/board.yml b/boards/st/disco_l475_iot1/board.yml
index c11f22591a5..1179b080028 100644
--- a/boards/st/disco_l475_iot1/board.yml
+++ b/boards/st/disco_l475_iot1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: disco_l475_iot1
+  full_name: Disco L475 IOT01 (B-L475E-IOT01A)
   vendor: st
   socs:
     - name: stm32l475xx
diff --git a/boards/st/nucleo_c031c6/board.yml b/boards/st/nucleo_c031c6/board.yml
index 37d48de4d52..412db17f2df 100644
--- a/boards/st/nucleo_c031c6/board.yml
+++ b/boards/st/nucleo_c031c6/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_c031c6
+  full_name: Nucleo C031C6
   vendor: st
   socs:
     - name: stm32c031xx
diff --git a/boards/st/nucleo_f030r8/board.yml b/boards/st/nucleo_f030r8/board.yml
index 515aae8c5b0..bc62b0f7a8d 100644
--- a/boards/st/nucleo_f030r8/board.yml
+++ b/boards/st/nucleo_f030r8/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f030r8
+  full_name: Nucleo F030R8
   vendor: st
   revision:
     format: number
diff --git a/boards/st/nucleo_f031k6/board.yml b/boards/st/nucleo_f031k6/board.yml
index 01fc79ac033..4e0c5730751 100644
--- a/boards/st/nucleo_f031k6/board.yml
+++ b/boards/st/nucleo_f031k6/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f031k6
+  full_name: Nucleo F031K6
   vendor: st
   socs:
     - name: stm32f031x6
diff --git a/boards/st/nucleo_f042k6/board.yml b/boards/st/nucleo_f042k6/board.yml
index 89d8b050428..787d8d41b3d 100644
--- a/boards/st/nucleo_f042k6/board.yml
+++ b/boards/st/nucleo_f042k6/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f042k6
+  full_name: Nucleo F042K6
   vendor: st
   socs:
     - name: stm32f042x6
diff --git a/boards/st/nucleo_f070rb/board.yml b/boards/st/nucleo_f070rb/board.yml
index 8f3a6a49878..4ed7f75d40b 100644
--- a/boards/st/nucleo_f070rb/board.yml
+++ b/boards/st/nucleo_f070rb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f070rb
+  full_name: Nucleo F070RB
   vendor: st
   socs:
     - name: stm32f070xb
diff --git a/boards/st/nucleo_f091rc/board.yml b/boards/st/nucleo_f091rc/board.yml
index 9f3fe67f8f6..7e7b8e5876e 100644
--- a/boards/st/nucleo_f091rc/board.yml
+++ b/boards/st/nucleo_f091rc/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f091rc
+  full_name: Nucleo F091RC
   vendor: st
   socs:
     - name: stm32f091xc
diff --git a/boards/st/nucleo_f103rb/board.yml b/boards/st/nucleo_f103rb/board.yml
index 57425f7832d..230bda28975 100644
--- a/boards/st/nucleo_f103rb/board.yml
+++ b/boards/st/nucleo_f103rb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f103rb
+  full_name: Nucleo F103RB
   vendor: st
   socs:
     - name: stm32f103xb
diff --git a/boards/st/nucleo_f207zg/board.yml b/boards/st/nucleo_f207zg/board.yml
index 8b35f4457cd..ea2312af9a7 100644
--- a/boards/st/nucleo_f207zg/board.yml
+++ b/boards/st/nucleo_f207zg/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f207zg
+  full_name: Nucleo F207ZG
   vendor: st
   socs:
     - name: stm32f207xx
diff --git a/boards/st/nucleo_f302r8/board.yml b/boards/st/nucleo_f302r8/board.yml
index a39ae3dc6d2..dd7c32ff7d7 100644
--- a/boards/st/nucleo_f302r8/board.yml
+++ b/boards/st/nucleo_f302r8/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f302r8
+  full_name: Nucleo F302R8
   vendor: st
   socs:
     - name: stm32f302x8
diff --git a/boards/st/nucleo_f303k8/board.yml b/boards/st/nucleo_f303k8/board.yml
index ae44e2bbb55..50a409d7358 100644
--- a/boards/st/nucleo_f303k8/board.yml
+++ b/boards/st/nucleo_f303k8/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f303k8
+  full_name: Nucleo F303K8
   vendor: st
   socs:
     - name: stm32f303x8
diff --git a/boards/st/nucleo_f303re/board.yml b/boards/st/nucleo_f303re/board.yml
index dc99dcc1d6a..5b33354408c 100644
--- a/boards/st/nucleo_f303re/board.yml
+++ b/boards/st/nucleo_f303re/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f303re
+  full_name: Nucleo F303RE
   vendor: st
   socs:
     - name: stm32f303xe
diff --git a/boards/st/nucleo_f334r8/board.yml b/boards/st/nucleo_f334r8/board.yml
index 7a8a3e642d8..8ae552c4895 100644
--- a/boards/st/nucleo_f334r8/board.yml
+++ b/boards/st/nucleo_f334r8/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f334r8
+  full_name: Nucleo F334R8
   vendor: st
   socs:
     - name: stm32f334x8
diff --git a/boards/st/nucleo_f401re/board.yml b/boards/st/nucleo_f401re/board.yml
index 4cb781427b5..8d322a5d408 100644
--- a/boards/st/nucleo_f401re/board.yml
+++ b/boards/st/nucleo_f401re/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f401re
+  full_name: Nucleo F401RE
   vendor: st
   socs:
     - name: stm32f401xe
diff --git a/boards/st/nucleo_f410rb/board.yml b/boards/st/nucleo_f410rb/board.yml
index 23c247e3bad..b2a93fcb445 100644
--- a/boards/st/nucleo_f410rb/board.yml
+++ b/boards/st/nucleo_f410rb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f410rb
+  full_name: Nucleo F410RB
   vendor: st
   socs:
     - name: stm32f410rx
diff --git a/boards/st/nucleo_f411re/board.yml b/boards/st/nucleo_f411re/board.yml
index 6ed17fdc2c4..e3cfe259304 100644
--- a/boards/st/nucleo_f411re/board.yml
+++ b/boards/st/nucleo_f411re/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f411re
+  full_name: Nucleo F411RE
   vendor: st
   socs:
     - name: stm32f411xe
diff --git a/boards/st/nucleo_f412zg/board.yml b/boards/st/nucleo_f412zg/board.yml
index b4bb8372f50..07919c3f445 100644
--- a/boards/st/nucleo_f412zg/board.yml
+++ b/boards/st/nucleo_f412zg/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f412zg
+  full_name: Nucleo F412ZG
   vendor: st
   socs:
     - name: stm32f412zx
diff --git a/boards/st/nucleo_f413zh/board.yml b/boards/st/nucleo_f413zh/board.yml
index a372cec4b8a..a207e5e0357 100644
--- a/boards/st/nucleo_f413zh/board.yml
+++ b/boards/st/nucleo_f413zh/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f413zh
+  full_name: Nucleo F413ZH
   vendor: st
   socs:
     - name: stm32f413xx
diff --git a/boards/st/nucleo_f429zi/board.yml b/boards/st/nucleo_f429zi/board.yml
index ecf8e93828b..c2a2b867a11 100644
--- a/boards/st/nucleo_f429zi/board.yml
+++ b/boards/st/nucleo_f429zi/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f429zi
+  full_name: Nucleo F429ZI
   vendor: st
   socs:
     - name: stm32f429xx
diff --git a/boards/st/nucleo_f446re/board.yml b/boards/st/nucleo_f446re/board.yml
index d68a45990b8..659fff64636 100644
--- a/boards/st/nucleo_f446re/board.yml
+++ b/boards/st/nucleo_f446re/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f446re
+  full_name: Nucleo F446RE
   vendor: st
   socs:
     - name: stm32f446xx
diff --git a/boards/st/nucleo_f446ze/board.yml b/boards/st/nucleo_f446ze/board.yml
index eb577af456b..32861aa1789 100644
--- a/boards/st/nucleo_f446ze/board.yml
+++ b/boards/st/nucleo_f446ze/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f446ze
+  full_name: Nucleo F446ZE
   vendor: st
   socs:
     - name: stm32f446xx
diff --git a/boards/st/nucleo_f722ze/board.yml b/boards/st/nucleo_f722ze/board.yml
index 793193bc2ca..80ab328c14e 100644
--- a/boards/st/nucleo_f722ze/board.yml
+++ b/boards/st/nucleo_f722ze/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f722ze
+  full_name: Nucleo F722ZE
   vendor: st
   socs:
     - name: stm32f722xx
diff --git a/boards/st/nucleo_f746zg/board.yml b/boards/st/nucleo_f746zg/board.yml
index 1df68107ece..d21d7faab75 100644
--- a/boards/st/nucleo_f746zg/board.yml
+++ b/boards/st/nucleo_f746zg/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f746zg
+  full_name: Nucleo F746ZG
   vendor: st
   socs:
     - name: stm32f746xx
diff --git a/boards/st/nucleo_f756zg/board.yml b/boards/st/nucleo_f756zg/board.yml
index 791d7601754..f95bc53df7f 100644
--- a/boards/st/nucleo_f756zg/board.yml
+++ b/boards/st/nucleo_f756zg/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f756zg
+  full_name: Nucleo F756ZG
   vendor: st
   socs:
     - name: stm32f756xx
diff --git a/boards/st/nucleo_f767zi/board.yml b/boards/st/nucleo_f767zi/board.yml
index 810b80a5fdc..30dea098842 100644
--- a/boards/st/nucleo_f767zi/board.yml
+++ b/boards/st/nucleo_f767zi/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_f767zi
+  full_name: Nucleo F767ZI
   vendor: st
   socs:
     - name: stm32f767xx
diff --git a/boards/st/nucleo_g031k8/board.yml b/boards/st/nucleo_g031k8/board.yml
index 690afd52fb0..2382e3e70fd 100644
--- a/boards/st/nucleo_g031k8/board.yml
+++ b/boards/st/nucleo_g031k8/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_g031k8
+  full_name: Nucleo G031K8
   vendor: st
   socs:
     - name: stm32g031xx
diff --git a/boards/st/nucleo_g070rb/board.yml b/boards/st/nucleo_g070rb/board.yml
index 88306b0d7f0..a0074bc9449 100644
--- a/boards/st/nucleo_g070rb/board.yml
+++ b/boards/st/nucleo_g070rb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_g070rb
+  full_name: Nucleo G070RB
   vendor: st
   socs:
     - name: stm32g070xx
diff --git a/boards/st/nucleo_g071rb/board.yml b/boards/st/nucleo_g071rb/board.yml
index 05e948a2f36..63c1ce9add4 100644
--- a/boards/st/nucleo_g071rb/board.yml
+++ b/boards/st/nucleo_g071rb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_g071rb
+  full_name: Nucleo G071RB
   vendor: st
   socs:
     - name: stm32g071xx
diff --git a/boards/st/nucleo_g0b1re/board.yml b/boards/st/nucleo_g0b1re/board.yml
index b9d0f93261f..f7732c1330f 100644
--- a/boards/st/nucleo_g0b1re/board.yml
+++ b/boards/st/nucleo_g0b1re/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_g0b1re
+  full_name: Nucleo G0B1RE
   vendor: st
   socs:
     - name: stm32g0b1xx
diff --git a/boards/st/nucleo_g431rb/board.yml b/boards/st/nucleo_g431rb/board.yml
index 460dcf740e8..e338c94cbaa 100644
--- a/boards/st/nucleo_g431rb/board.yml
+++ b/boards/st/nucleo_g431rb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_g431rb
+  full_name: Nucleo G431RB
   vendor: st
   socs:
     - name: stm32g431xx
diff --git a/boards/st/nucleo_g474re/board.yml b/boards/st/nucleo_g474re/board.yml
index 7cf7857f527..9921219d1e5 100644
--- a/boards/st/nucleo_g474re/board.yml
+++ b/boards/st/nucleo_g474re/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_g474re
+  full_name: Nucleo G474RE
   vendor: st
   socs:
     - name: stm32g474xx
diff --git a/boards/st/nucleo_h503rb/board.yml b/boards/st/nucleo_h503rb/board.yml
index bbf3662873b..15f7b72e306 100644
--- a/boards/st/nucleo_h503rb/board.yml
+++ b/boards/st/nucleo_h503rb/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: nucleo_h503rb
+  full_name: Nucleo H503RB
   vendor: st
   socs:
     - name: stm32h503xx
diff --git a/boards/st/nucleo_h533re/board.yml b/boards/st/nucleo_h533re/board.yml
index 4b633011b71..11b0d6aa069 100644
--- a/boards/st/nucleo_h533re/board.yml
+++ b/boards/st/nucleo_h533re/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_h533re
+  full_name: Nucleo H533RE
   vendor: st
   socs:
     - name: stm32h533xx
diff --git a/boards/st/nucleo_h563zi/board.yml b/boards/st/nucleo_h563zi/board.yml
index 42319f55755..fec89e6d37b 100644
--- a/boards/st/nucleo_h563zi/board.yml
+++ b/boards/st/nucleo_h563zi/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_h563zi
+  full_name: Nucleo H563ZI
   vendor: st
   socs:
     - name: stm32h563xx
diff --git a/boards/st/nucleo_h723zg/board.yml b/boards/st/nucleo_h723zg/board.yml
index 56a6d5cfb52..2efee3e24c4 100644
--- a/boards/st/nucleo_h723zg/board.yml
+++ b/boards/st/nucleo_h723zg/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_h723zg
+  full_name: Nucleo H723ZG
   vendor: st
   socs:
     - name: stm32h723xx
diff --git a/boards/st/nucleo_h743zi/board.yml b/boards/st/nucleo_h743zi/board.yml
index e133a6fc034..8feba5b5c7a 100644
--- a/boards/st/nucleo_h743zi/board.yml
+++ b/boards/st/nucleo_h743zi/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_h743zi
+  full_name: Nucleo H743ZI
   vendor: st
   socs:
     - name: stm32h743xx
diff --git a/boards/st/nucleo_h745zi_q/board.yml b/boards/st/nucleo_h745zi_q/board.yml
index 7ba025f5bb7..6d9df5de248 100644
--- a/boards/st/nucleo_h745zi_q/board.yml
+++ b/boards/st/nucleo_h745zi_q/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_h745zi_q
+  full_name: Nucleo H745ZI-Q
   vendor: st
   socs:
     - name: stm32h745xx
diff --git a/boards/st/nucleo_h753zi/board.yml b/boards/st/nucleo_h753zi/board.yml
index 12dc4b5a501..704face7bc9 100644
--- a/boards/st/nucleo_h753zi/board.yml
+++ b/boards/st/nucleo_h753zi/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_h753zi
+  full_name: Nucleo H753ZI
   vendor: st
   socs:
     - name: stm32h753xx
diff --git a/boards/st/nucleo_h755zi_q/board.yml b/boards/st/nucleo_h755zi_q/board.yml
index ecffd3b0fd1..73e4e8e0cf1 100644
--- a/boards/st/nucleo_h755zi_q/board.yml
+++ b/boards/st/nucleo_h755zi_q/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_h755zi_q
+  full_name: Nucleo H755ZI-Q
   vendor: st
   socs:
     - name: stm32h755xx
diff --git a/boards/st/nucleo_h7a3zi_q/board.yml b/boards/st/nucleo_h7a3zi_q/board.yml
index 0c64ac88228..f3e32247481 100644
--- a/boards/st/nucleo_h7a3zi_q/board.yml
+++ b/boards/st/nucleo_h7a3zi_q/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_h7a3zi_q
+  full_name: Nucleo H7A3ZI-Q
   vendor: st
   socs:
     - name: stm32h7a3xx
diff --git a/boards/st/nucleo_l011k4/board.yml b/boards/st/nucleo_l011k4/board.yml
index be64789e754..4f9e1429176 100644
--- a/boards/st/nucleo_l011k4/board.yml
+++ b/boards/st/nucleo_l011k4/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_l011k4
+  full_name: Nucleo L011K4
   vendor: st
   socs:
     - name: stm32l011xx
diff --git a/boards/st/nucleo_l031k6/board.yml b/boards/st/nucleo_l031k6/board.yml
index 7fc334c0c2d..43bbdbd2c22 100644
--- a/boards/st/nucleo_l031k6/board.yml
+++ b/boards/st/nucleo_l031k6/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_l031k6
+  full_name: Nucleo L031K6
   vendor: st
   socs:
     - name: stm32l031xx
diff --git a/boards/st/nucleo_l053r8/board.yml b/boards/st/nucleo_l053r8/board.yml
index a31629d6443..0952d7d4b8e 100644
--- a/boards/st/nucleo_l053r8/board.yml
+++ b/boards/st/nucleo_l053r8/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_l053r8
+  full_name: Nucleo L053R8
   vendor: st
   socs:
     - name: stm32l053xx
diff --git a/boards/st/nucleo_l073rz/board.yml b/boards/st/nucleo_l073rz/board.yml
index 232170aa06d..01d4430d252 100644
--- a/boards/st/nucleo_l073rz/board.yml
+++ b/boards/st/nucleo_l073rz/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_l073rz
+  full_name: Nucleo L073RZ
   vendor: st
   socs:
     - name: stm32l073xx
diff --git a/boards/st/nucleo_l152re/board.yml b/boards/st/nucleo_l152re/board.yml
index 2838a81f7b0..80adf11ee4d 100644
--- a/boards/st/nucleo_l152re/board.yml
+++ b/boards/st/nucleo_l152re/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_l152re
+  full_name: Nucleo L152RE
   vendor: st
   socs:
     - name: stm32l152xe
diff --git a/boards/st/nucleo_l412rb_p/board.yml b/boards/st/nucleo_l412rb_p/board.yml
index 92ab56d2df3..37a8159f3c5 100644
--- a/boards/st/nucleo_l412rb_p/board.yml
+++ b/boards/st/nucleo_l412rb_p/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_l412rb_p
+  full_name: Nucleo L412RB-P
   vendor: st
   socs:
     - name: stm32l412xx
diff --git a/boards/st/nucleo_l432kc/board.yml b/boards/st/nucleo_l432kc/board.yml
index 25ccfc0ddf9..badd59ab6a5 100644
--- a/boards/st/nucleo_l432kc/board.yml
+++ b/boards/st/nucleo_l432kc/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_l432kc
+  full_name: Nucleo L432KC
   vendor: st
   socs:
     - name: stm32l432xx
diff --git a/boards/st/nucleo_l433rc_p/board.yml b/boards/st/nucleo_l433rc_p/board.yml
index 03c1f3c6f6f..3f5b40b949d 100644
--- a/boards/st/nucleo_l433rc_p/board.yml
+++ b/boards/st/nucleo_l433rc_p/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_l433rc_p
+  full_name: Nucleo L433RC
   vendor: st
   socs:
     - name: stm32l433xx
diff --git a/boards/st/nucleo_l452re/board.yml b/boards/st/nucleo_l452re/board.yml
index 9bbf9630497..32318946ec8 100644
--- a/boards/st/nucleo_l452re/board.yml
+++ b/boards/st/nucleo_l452re/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_l452re
+  full_name: Nucleo L452RE
   vendor: st
   socs:
     - name: stm32l452xx
diff --git a/boards/st/nucleo_l476rg/board.yml b/boards/st/nucleo_l476rg/board.yml
index c6b21713e34..c250fa89a58 100644
--- a/boards/st/nucleo_l476rg/board.yml
+++ b/boards/st/nucleo_l476rg/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_l476rg
+  full_name: Nucleo L476RG
   vendor: st
   socs:
     - name: stm32l476xx
diff --git a/boards/st/nucleo_l496zg/board.yml b/boards/st/nucleo_l496zg/board.yml
index 3d1c909cffc..4b0e2a75e3e 100644
--- a/boards/st/nucleo_l496zg/board.yml
+++ b/boards/st/nucleo_l496zg/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_l496zg
+  full_name: Nucleo L496ZG
   vendor: st
   socs:
     - name: stm32l496xx
diff --git a/boards/st/nucleo_l4a6zg/board.yml b/boards/st/nucleo_l4a6zg/board.yml
index 6e935c5d082..5cf94c4be2e 100644
--- a/boards/st/nucleo_l4a6zg/board.yml
+++ b/boards/st/nucleo_l4a6zg/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_l4a6zg
+  full_name: Nucleo L4A6ZG
   vendor: st
   socs:
     - name: stm32l4a6xx
diff --git a/boards/st/nucleo_l4r5zi/board.yml b/boards/st/nucleo_l4r5zi/board.yml
index 46ead4d8831..86befedebd2 100644
--- a/boards/st/nucleo_l4r5zi/board.yml
+++ b/boards/st/nucleo_l4r5zi/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_l4r5zi
+  full_name: Nucleo L4R5ZI
   vendor: st
   socs:
     - name: stm32l4r5xx
diff --git a/boards/st/nucleo_l552ze_q/board.yml b/boards/st/nucleo_l552ze_q/board.yml
index 713b695aeba..58e78575e12 100644
--- a/boards/st/nucleo_l552ze_q/board.yml
+++ b/boards/st/nucleo_l552ze_q/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_l552ze_q
+  full_name: Nucleo L552ZE Q
   vendor: st
   socs:
     - name: stm32l552xx
diff --git a/boards/st/nucleo_u031r8/board.yml b/boards/st/nucleo_u031r8/board.yml
index afbb6b5b6b6..1a3d7fdf20b 100644
--- a/boards/st/nucleo_u031r8/board.yml
+++ b/boards/st/nucleo_u031r8/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_u031r8
+  full_name: Nucleo U031R8
   vendor: st
   socs:
     - name: stm32u031xx
diff --git a/boards/st/nucleo_u083rc/board.yml b/boards/st/nucleo_u083rc/board.yml
index 65d9734b288..c26a846edc6 100644
--- a/boards/st/nucleo_u083rc/board.yml
+++ b/boards/st/nucleo_u083rc/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_u083rc
+  full_name: Nucleo U083RC
   vendor: st
   socs:
     - name: stm32u083xx
diff --git a/boards/st/nucleo_u575zi_q/board.yml b/boards/st/nucleo_u575zi_q/board.yml
index ced9ac720b3..66fc909baef 100644
--- a/boards/st/nucleo_u575zi_q/board.yml
+++ b/boards/st/nucleo_u575zi_q/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_u575zi_q
+  full_name: Nucleo U575ZI Q
   vendor: st
   socs:
     - name: stm32u575xx
diff --git a/boards/st/nucleo_u5a5zj_q/board.yml b/boards/st/nucleo_u5a5zj_q/board.yml
index 9e594c30fb1..d5376588b21 100644
--- a/boards/st/nucleo_u5a5zj_q/board.yml
+++ b/boards/st/nucleo_u5a5zj_q/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_u5a5zj_q
+  full_name: Nucleo U5A5ZJ Q
   vendor: st
   socs:
     - name: stm32u5a5xx
diff --git a/boards/st/nucleo_wb05kz/board.yml b/boards/st/nucleo_wb05kz/board.yml
index 645506c7953..7b519b73009 100644
--- a/boards/st/nucleo_wb05kz/board.yml
+++ b/boards/st/nucleo_wb05kz/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_wb05kz
+  full_name: Nucleo WB05KZ
   vendor: st
   socs:
     - name: stm32wb05
diff --git a/boards/st/nucleo_wb09ke/board.yml b/boards/st/nucleo_wb09ke/board.yml
index 2bff9e912b5..faba2d61bd4 100644
--- a/boards/st/nucleo_wb09ke/board.yml
+++ b/boards/st/nucleo_wb09ke/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_wb09ke
+  full_name: Nucleo WB09KE
   vendor: st
   socs:
     - name: stm32wb09
diff --git a/boards/st/nucleo_wb55rg/board.yml b/boards/st/nucleo_wb55rg/board.yml
index 49366ba9e62..8b161072dee 100644
--- a/boards/st/nucleo_wb55rg/board.yml
+++ b/boards/st/nucleo_wb55rg/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_wb55rg
+  full_name: Nucleo WB55RG
   vendor: st
   socs:
     - name: stm32wb55xx
diff --git a/boards/st/nucleo_wba52cg/board.yml b/boards/st/nucleo_wba52cg/board.yml
index 70950acf34d..0b12139fcf2 100644
--- a/boards/st/nucleo_wba52cg/board.yml
+++ b/boards/st/nucleo_wba52cg/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_wba52cg
+  full_name: Nucleo WBA52CG
   vendor: st
   socs:
     - name: stm32wba52xx
diff --git a/boards/st/nucleo_wba55cg/board.yml b/boards/st/nucleo_wba55cg/board.yml
index 2fbe6b2bca4..0963755cc50 100644
--- a/boards/st/nucleo_wba55cg/board.yml
+++ b/boards/st/nucleo_wba55cg/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_wba55cg
+  full_name: Nucleo WBA55CG
   vendor: st
   socs:
     - name: stm32wba55xx
diff --git a/boards/st/nucleo_wl55jc/board.yml b/boards/st/nucleo_wl55jc/board.yml
index 930da79b199..9313b6a7ef7 100644
--- a/boards/st/nucleo_wl55jc/board.yml
+++ b/boards/st/nucleo_wl55jc/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nucleo_wl55jc
+  full_name: Nucleo WL55JC
   vendor: st
   socs:
     - name: stm32wl55xx
diff --git a/boards/st/sensortile_box/board.yml b/boards/st/sensortile_box/board.yml
index 4ac086b2cb7..f314a51c356 100644
--- a/boards/st/sensortile_box/board.yml
+++ b/boards/st/sensortile_box/board.yml
@@ -1,5 +1,6 @@
 board:
   name: sensortile_box
+  full_name: SensorTile.box
   vendor: st
   socs:
     - name: stm32l4r9xx
diff --git a/boards/st/sensortile_box_pro/board.yml b/boards/st/sensortile_box_pro/board.yml
index d3bb8ca9ee9..bfa681499cc 100644
--- a/boards/st/sensortile_box_pro/board.yml
+++ b/boards/st/sensortile_box_pro/board.yml
@@ -1,5 +1,6 @@
 board:
   name: sensortile_box_pro
+  full_name: SensorTile.box PRO
   vendor: st
   socs:
     - name: stm32u585xx
diff --git a/boards/st/st25dv_mb1283_disco/board.yml b/boards/st/st25dv_mb1283_disco/board.yml
index 8fc19fff61e..054880ab5d9 100644
--- a/boards/st/st25dv_mb1283_disco/board.yml
+++ b/boards/st/st25dv_mb1283_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: st25dv_mb1283_disco
+  full_name: ST25DV Discovery, MB1283 version
   vendor: st
   socs:
     - name: stm32f405xx
diff --git a/boards/st/steval_fcu001v1/board.yml b/boards/st/steval_fcu001v1/board.yml
index 16357770fa4..23fb900e8c7 100644
--- a/boards/st/steval_fcu001v1/board.yml
+++ b/boards/st/steval_fcu001v1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: steval_fcu001v1
+  full_name: STM32 Flight Controller Unit
   vendor: st
   socs:
     - name: stm32f401xc
diff --git a/boards/st/steval_stwinbx1/board.yml b/boards/st/steval_stwinbx1/board.yml
index 64319223253..e72eee7c5d2 100644
--- a/boards/st/steval_stwinbx1/board.yml
+++ b/boards/st/steval_stwinbx1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: steval_stwinbx1
+  full_name: STEVAL STWINBX1 Development kit
   vendor: st
   socs:
     - name: stm32u585xx
diff --git a/boards/st/stm3210c_eval/board.yml b/boards/st/stm3210c_eval/board.yml
index bb8003f01ab..d204be60d35 100644
--- a/boards/st/stm3210c_eval/board.yml
+++ b/boards/st/stm3210c_eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm3210c_eval
+  full_name: STM3210C Evaluation
   vendor: st
   socs:
     - name: stm32f107xc
diff --git a/boards/st/stm32373c_eval/board.yml b/boards/st/stm32373c_eval/board.yml
index 32da748e9a7..6817d43bdb8 100644
--- a/boards/st/stm32373c_eval/board.yml
+++ b/boards/st/stm32373c_eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32373c_eval
+  full_name: STM32373C Evaluation
   vendor: st
   socs:
     - name: stm32f373xc
diff --git a/boards/st/stm32c0116_dk/board.yml b/boards/st/stm32c0116_dk/board.yml
index 1764907618b..db0eb8377ae 100644
--- a/boards/st/stm32c0116_dk/board.yml
+++ b/boards/st/stm32c0116_dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32c0116_dk
+  full_name: STM32C0116-DK Discovery Kit
   vendor: st
   socs:
     - name: stm32c011xx
diff --git a/boards/st/stm32f072_eval/board.yml b/boards/st/stm32f072_eval/board.yml
index 43e4ec82854..70ea37e0567 100644
--- a/boards/st/stm32f072_eval/board.yml
+++ b/boards/st/stm32f072_eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32f072_eval
+  full_name: STM32F072 Evaluation
   vendor: st
   socs:
     - name: stm32f072xb
diff --git a/boards/st/stm32f072b_disco/board.yml b/boards/st/stm32f072b_disco/board.yml
index ca3e636655f..9152aa3b6a2 100644
--- a/boards/st/stm32f072b_disco/board.yml
+++ b/boards/st/stm32f072b_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32f072b_disco
+  full_name: STM32F072B Discovery
   vendor: st
   socs:
     - name: stm32f072xb
diff --git a/boards/st/stm32f0_disco/board.yml b/boards/st/stm32f0_disco/board.yml
index a195ae98ae7..df8b2b52b90 100644
--- a/boards/st/stm32f0_disco/board.yml
+++ b/boards/st/stm32f0_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32f0_disco
+  full_name: STM32F0 Discovery
   vendor: st
   socs:
     - name: stm32f051x8
diff --git a/boards/st/stm32f3_disco/board.yml b/boards/st/stm32f3_disco/board.yml
index ae48f138fa5..7c2626178f5 100644
--- a/boards/st/stm32f3_disco/board.yml
+++ b/boards/st/stm32f3_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32f3_disco
+  full_name: STM32F3 Discovery
   vendor: st
   revision:
     format: letter
diff --git a/boards/st/stm32f411e_disco/board.yml b/boards/st/stm32f411e_disco/board.yml
index f42b1ada4a4..fa455d610e8 100644
--- a/boards/st/stm32f411e_disco/board.yml
+++ b/boards/st/stm32f411e_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32f411e_disco
+  full_name: STM32F411E Discovery
   vendor: st
   revision:
     format: letter
diff --git a/boards/st/stm32f412g_disco/board.yml b/boards/st/stm32f412g_disco/board.yml
index 836972823ad..ab33ccba899 100644
--- a/boards/st/stm32f412g_disco/board.yml
+++ b/boards/st/stm32f412g_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32f412g_disco
+  full_name: STM32F412G Discovery
   vendor: st
   socs:
     - name: stm32f412zx
diff --git a/boards/st/stm32f429i_disc1/board.yml b/boards/st/stm32f429i_disc1/board.yml
index e8e33228307..5843685a476 100644
--- a/boards/st/stm32f429i_disc1/board.yml
+++ b/boards/st/stm32f429i_disc1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32f429i_disc1
+  full_name: STM32F429I Discovery
   vendor: st
   socs:
     - name: stm32f429xx
diff --git a/boards/st/stm32f469i_disco/board.yml b/boards/st/stm32f469i_disco/board.yml
index 2f7407bbc38..cd76731d91f 100644
--- a/boards/st/stm32f469i_disco/board.yml
+++ b/boards/st/stm32f469i_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32f469i_disco
+  full_name: STM32F469I Discovery
   vendor: st
   socs:
     - name: stm32f469xx
diff --git a/boards/st/stm32f4_disco/board.yml b/boards/st/stm32f4_disco/board.yml
index 663f8613eec..55f96320600 100644
--- a/boards/st/stm32f4_disco/board.yml
+++ b/boards/st/stm32f4_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32f4_disco
+  full_name: STM32F4 Discovery
   vendor: st
   socs:
     - name: stm32f407xx
diff --git a/boards/st/stm32f723e_disco/board.yml b/boards/st/stm32f723e_disco/board.yml
index 65248705234..b90191d201f 100644
--- a/boards/st/stm32f723e_disco/board.yml
+++ b/boards/st/stm32f723e_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32f723e_disco
+  full_name: STM32F723E Discovery
   vendor: st
   socs:
     - name: stm32f723xx
diff --git a/boards/st/stm32f746g_disco/board.yml b/boards/st/stm32f746g_disco/board.yml
index 3522ea40ac3..2417218da2f 100644
--- a/boards/st/stm32f746g_disco/board.yml
+++ b/boards/st/stm32f746g_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32f746g_disco
+  full_name: STM32F746G Discovery
   vendor: st
   socs:
     - name: stm32f746xx
diff --git a/boards/st/stm32f7508_dk/board.yml b/boards/st/stm32f7508_dk/board.yml
index 46e12e5a6f0..ec81a75c0f0 100644
--- a/boards/st/stm32f7508_dk/board.yml
+++ b/boards/st/stm32f7508_dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32f7508_dk
+  full_name: STM32F7508-DK Discovery Kit
   vendor: st
   socs:
     - name: stm32f750xx
diff --git a/boards/st/stm32f769i_disco/board.yml b/boards/st/stm32f769i_disco/board.yml
index de83c60be99..552b7dd5ee3 100644
--- a/boards/st/stm32f769i_disco/board.yml
+++ b/boards/st/stm32f769i_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32f769i_disco
+  full_name: STM32F769I Discovery
   vendor: st
   socs:
     - name: stm32f769xx
diff --git a/boards/st/stm32g0316_disco/board.yml b/boards/st/stm32g0316_disco/board.yml
index 5a67daf81d6..a032c898a75 100644
--- a/boards/st/stm32g0316_disco/board.yml
+++ b/boards/st/stm32g0316_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32g0316_disco
+  full_name: STM32G0316 Discovery
   vendor: st
   socs:
     - name: stm32g031xx
diff --git a/boards/st/stm32g071b_disco/board.yml b/boards/st/stm32g071b_disco/board.yml
index 5445391255f..78b83fac451 100644
--- a/boards/st/stm32g071b_disco/board.yml
+++ b/boards/st/stm32g071b_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32g071b_disco
+  full_name: STM32G071B Discovery
   vendor: st
   socs:
     - name: stm32g071xx
diff --git a/boards/st/stm32g081b_eval/board.yml b/boards/st/stm32g081b_eval/board.yml
index 5cdb22ef9b8..2a6fa75aadd 100644
--- a/boards/st/stm32g081b_eval/board.yml
+++ b/boards/st/stm32g081b_eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32g081b_eval
+  full_name: STM32G081B Evaluation
   vendor: st
   socs:
     - name: stm32g081xx
diff --git a/boards/st/stm32h573i_dk/board.yml b/boards/st/stm32h573i_dk/board.yml
index e6a08a9197f..55f38200999 100644
--- a/boards/st/stm32h573i_dk/board.yml
+++ b/boards/st/stm32h573i_dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32h573i_dk
+  full_name: STM32H573I-DK Discovery
   vendor: st
   socs:
     - name: stm32h573xx
diff --git a/boards/st/stm32h735g_disco/board.yml b/boards/st/stm32h735g_disco/board.yml
index 146a622647e..acf25fbe1a2 100644
--- a/boards/st/stm32h735g_disco/board.yml
+++ b/boards/st/stm32h735g_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32h735g_disco
+  full_name: STM32H735G Discovery
   vendor: st
   socs:
     - name: stm32h735xx
diff --git a/boards/st/stm32h745i_disco/board.yml b/boards/st/stm32h745i_disco/board.yml
index e1da9c4b2f4..cbd323cb9ce 100644
--- a/boards/st/stm32h745i_disco/board.yml
+++ b/boards/st/stm32h745i_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32h745i_disco
+  full_name: STM32H745I Discovery
   vendor: st
   socs:
     - name: stm32h745xx
diff --git a/boards/st/stm32h747i_disco/board.yml b/boards/st/stm32h747i_disco/board.yml
index 431d3e4f486..67649b5dab6 100644
--- a/boards/st/stm32h747i_disco/board.yml
+++ b/boards/st/stm32h747i_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32h747i_disco
+  full_name: STM32H747I Discovery
   vendor: st
   socs:
     - name: stm32h747xx
diff --git a/boards/st/stm32h750b_dk/board.yml b/boards/st/stm32h750b_dk/board.yml
index 95275ee2e42..9c95b1c77d1 100644
--- a/boards/st/stm32h750b_dk/board.yml
+++ b/boards/st/stm32h750b_dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32h750b_dk
+  full_name: STM32H750B Discovery Kit
   vendor: st
   socs:
     - name: stm32h750xx
diff --git a/boards/st/stm32h7b3i_dk/board.yml b/boards/st/stm32h7b3i_dk/board.yml
index 5516412eac9..6a9e0626b7c 100644
--- a/boards/st/stm32h7b3i_dk/board.yml
+++ b/boards/st/stm32h7b3i_dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32h7b3i_dk
+  full_name: STM32H7B3I Discovery kit
   vendor: st
   socs:
     - name: stm32h7b3xx
diff --git a/boards/st/stm32h7s78_dk/board.yml b/boards/st/stm32h7s78_dk/board.yml
index c17be71480c..fdc77091323 100644
--- a/boards/st/stm32h7s78_dk/board.yml
+++ b/boards/st/stm32h7s78_dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32h7s78_dk
+  full_name: STM32H7S78-DK Discovery
   vendor: st
   socs:
     - name: stm32h7s7xx
diff --git a/boards/st/stm32l1_disco/board.yml b/boards/st/stm32l1_disco/board.yml
index 97a69b88157..1f606b80070 100644
--- a/boards/st/stm32l1_disco/board.yml
+++ b/boards/st/stm32l1_disco/board.yml
@@ -1,9 +1,11 @@
 boards:
   - name: stm32l1_disco
+    full_name: STM32L1 Discovery
     vendor: st
     socs:
       - name: stm32l151xb
   - name: stm32l152c_disco
+    full_name: STM32L152C Discovery
     vendor: st
     socs:
       - name: stm32l152xc
diff --git a/boards/st/stm32l476g_disco/board.yml b/boards/st/stm32l476g_disco/board.yml
index c82c2c61843..7899adc9ea0 100644
--- a/boards/st/stm32l476g_disco/board.yml
+++ b/boards/st/stm32l476g_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32l476g_disco
+  full_name: STM32L476G Discovery
   vendor: st
   socs:
     - name: stm32l476xx
diff --git a/boards/st/stm32l496g_disco/board.yml b/boards/st/stm32l496g_disco/board.yml
index 9d6b18a598d..e5b9ec923c4 100644
--- a/boards/st/stm32l496g_disco/board.yml
+++ b/boards/st/stm32l496g_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32l496g_disco
+  full_name: STM32L496G Discovery
   vendor: st
   socs:
     - name: stm32l496xx
diff --git a/boards/st/stm32l4r9i_disco/board.yml b/boards/st/stm32l4r9i_disco/board.yml
index 267fd87932d..eedbfcd51e2 100644
--- a/boards/st/stm32l4r9i_disco/board.yml
+++ b/boards/st/stm32l4r9i_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32l4r9i_disco
+  full_name: STM32L4R9I Discovery
   vendor: st
   socs:
     - name: stm32l4r9xx
diff --git a/boards/st/stm32l562e_dk/board.yml b/boards/st/stm32l562e_dk/board.yml
index 225f25adc2e..93e80fb9f5d 100644
--- a/boards/st/stm32l562e_dk/board.yml
+++ b/boards/st/stm32l562e_dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32l562e_dk
+  full_name: STM32L562E-DK Discovery
   vendor: st
   socs:
     - name: stm32l562xx
diff --git a/boards/st/stm32mp157c_dk2/board.yml b/boards/st/stm32mp157c_dk2/board.yml
index d8ffb9a66b5..6226ea364e1 100644
--- a/boards/st/stm32mp157c_dk2/board.yml
+++ b/boards/st/stm32mp157c_dk2/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32mp157c_dk2
+  full_name: STM32MP157C-DK2 Discovery
   vendor: st
   socs:
     - name: stm32mp157cxx
diff --git a/boards/st/stm32u083c_dk/board.yml b/boards/st/stm32u083c_dk/board.yml
index 7bcf691ac69..18deefdfecc 100644
--- a/boards/st/stm32u083c_dk/board.yml
+++ b/boards/st/stm32u083c_dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32u083c_dk
+  full_name: STM32U083C-DK
   vendor: st
   socs:
     - name: stm32u083xx
diff --git a/boards/st/stm32u5a9j_dk/board.yml b/boards/st/stm32u5a9j_dk/board.yml
index 93bcec39743..665d0bbc419 100644
--- a/boards/st/stm32u5a9j_dk/board.yml
+++ b/boards/st/stm32u5a9j_dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32u5a9j_dk
+  full_name: STM32U5A9J Discovery Kit
   vendor: st
   socs:
     - name: stm32u5a9xx
diff --git a/boards/st/stm32vl_disco/board.yml b/boards/st/stm32vl_disco/board.yml
index 15c8b5b3cac..011d7f7e71a 100644
--- a/boards/st/stm32vl_disco/board.yml
+++ b/boards/st/stm32vl_disco/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32vl_disco
+  full_name: STM32VL Discovery
   vendor: st
   socs:
     - name: stm32f100xb
diff --git a/boards/st/stm32wb5mm_dk/board.yml b/boards/st/stm32wb5mm_dk/board.yml
index 5df998d28c1..019c11d7905 100644
--- a/boards/st/stm32wb5mm_dk/board.yml
+++ b/boards/st/stm32wb5mm_dk/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32wb5mm_dk
+  full_name: STM32WB5MM-DK
   vendor: st
   socs:
     - name: stm32wb55xx
diff --git a/boards/st/stm32wb5mmg/board.yml b/boards/st/stm32wb5mmg/board.yml
index dc90a918930..29ce1a3426b 100644
--- a/boards/st/stm32wb5mmg/board.yml
+++ b/boards/st/stm32wb5mmg/board.yml
@@ -1,5 +1,6 @@
 board:
   name: stm32wb5mmg
+  full_name: STM32WB5MMG
   vendor: st
   socs:
     - name: stm32wb55xx
diff --git a/boards/starfive/visionfive2/board.yml b/boards/starfive/visionfive2/board.yml
index cc856efaa92..9d106a29a48 100644
--- a/boards/starfive/visionfive2/board.yml
+++ b/boards/starfive/visionfive2/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: visionfive2
+  full_name: VisionFive 2 JH7110
   vendor: starfive
   socs:
     - name: jh7110
diff --git a/boards/tdk/robokit1/board.yml b/boards/tdk/robokit1/board.yml
index c97c2a0c940..2aafcdd702e 100644
--- a/boards/tdk/robokit1/board.yml
+++ b/boards/tdk/robokit1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: robokit1
+  full_name: RoboKit 1
   vendor: tdk
   socs:
     - name: same70q21b
diff --git a/boards/technexion/pico_pi/board.yml b/boards/technexion/pico_pi/board.yml
index 61c6713a925..297ee427131 100644
--- a/boards/technexion/pico_pi/board.yml
+++ b/boards/technexion/pico_pi/board.yml
@@ -1,5 +1,6 @@
 board:
   name: pico_pi
+  full_name: Pico-Pi i.MX7D - Android Things IoT Development Platform
   vendor: technexion
   socs:
     - name: mcimx7d
diff --git a/boards/telink/tlsr9518adk80d/board.yml b/boards/telink/tlsr9518adk80d/board.yml
index b4d45ba665d..454b29592eb 100644
--- a/boards/telink/tlsr9518adk80d/board.yml
+++ b/boards/telink/tlsr9518adk80d/board.yml
@@ -1,5 +1,6 @@
 board:
   name: tlsr9518adk80d
+  full_name: TLSR9518ADK80D
   vendor: telink
   socs:
   - name: tlsr9518
diff --git a/boards/ti/cc1352p1_launchxl/board.yml b/boards/ti/cc1352p1_launchxl/board.yml
index 5d9b234947d..8ac020cd134 100644
--- a/boards/ti/cc1352p1_launchxl/board.yml
+++ b/boards/ti/cc1352p1_launchxl/board.yml
@@ -1,5 +1,6 @@
 board:
   name: cc1352p1_launchxl
+  full_name: CC1352P1 LaunchXL
   vendor: ti
   socs:
   - name: cc1352p
diff --git a/boards/ti/cc1352p7_launchpad/board.yml b/boards/ti/cc1352p7_launchpad/board.yml
index 0e97ad4ff43..cf29dd69e6a 100644
--- a/boards/ti/cc1352p7_launchpad/board.yml
+++ b/boards/ti/cc1352p7_launchpad/board.yml
@@ -1,5 +1,6 @@
 board:
   name: cc1352p7_lp
+  full_name: CC1352P7 LaunchPad
   vendor: ti
   socs:
   - name: cc1352p7
diff --git a/boards/ti/cc1352r1_launchxl/board.yml b/boards/ti/cc1352r1_launchxl/board.yml
index a96d6d89a10..b7b52e31053 100644
--- a/boards/ti/cc1352r1_launchxl/board.yml
+++ b/boards/ti/cc1352r1_launchxl/board.yml
@@ -1,5 +1,6 @@
 board:
   name: cc1352r1_launchxl
+  full_name: CC1352R1 LaunchXL
   vendor: ti
   socs:
   - name: cc1352r
diff --git a/boards/ti/cc1352r_sensortag/board.yml b/boards/ti/cc1352r_sensortag/board.yml
index b359f530fa2..055e40a74e1 100644
--- a/boards/ti/cc1352r_sensortag/board.yml
+++ b/boards/ti/cc1352r_sensortag/board.yml
@@ -1,5 +1,6 @@
 board:
   name: cc1352r_sensortag
+  full_name: CC1352R SensorTag
   vendor: ti
   socs:
   - name: cc1352r
diff --git a/boards/ti/cc26x2r1_launchxl/board.yml b/boards/ti/cc26x2r1_launchxl/board.yml
index 3361b2ccff7..3c9e65ea3dd 100644
--- a/boards/ti/cc26x2r1_launchxl/board.yml
+++ b/boards/ti/cc26x2r1_launchxl/board.yml
@@ -1,5 +1,6 @@
 board:
   name: cc26x2r1_launchxl
+  full_name: CC26x2R1 LaunchXL
   vendor: ti
   socs:
   - name: cc2652r
diff --git a/boards/ti/cc3220sf_launchxl/board.yml b/boards/ti/cc3220sf_launchxl/board.yml
index f902db4d392..498fbe37fb7 100644
--- a/boards/ti/cc3220sf_launchxl/board.yml
+++ b/boards/ti/cc3220sf_launchxl/board.yml
@@ -1,5 +1,6 @@
 board:
   name: cc3220sf_launchxl
+  full_name: CC3220SF LaunchXL
   vendor: ti
   socs:
   - name: cc3220sf
diff --git a/boards/ti/cc3235sf_launchxl/board.yml b/boards/ti/cc3235sf_launchxl/board.yml
index 6cf8104545a..89dee3ce673 100644
--- a/boards/ti/cc3235sf_launchxl/board.yml
+++ b/boards/ti/cc3235sf_launchxl/board.yml
@@ -1,5 +1,6 @@
 board:
   name: cc3235sf_launchxl
+  full_name: CC3235SF LaunchXL
   vendor: ti
   socs:
   - name: cc3235sf
diff --git a/boards/ti/msp_exp432p401r_launchxl/board.yml b/boards/ti/msp_exp432p401r_launchxl/board.yml
index 1e9ed0b7ed3..c8f10746b46 100644
--- a/boards/ti/msp_exp432p401r_launchxl/board.yml
+++ b/boards/ti/msp_exp432p401r_launchxl/board.yml
@@ -1,5 +1,6 @@
 board:
   name: msp_exp432p401r_launchxl
+  full_name: MSP-EXP432P401R LaunchXL
   vendor: ti
   socs:
   - name: msp432p401r
diff --git a/boards/ti/sk_am62/board.yml b/boards/ti/sk_am62/board.yml
index da6e946fe02..f0083b00434 100644
--- a/boards/ti/sk_am62/board.yml
+++ b/boards/ti/sk_am62/board.yml
@@ -1,5 +1,6 @@
 board:
   name: sk_am62
+  full_name: SK-AM62 M4F Core
   vendor: ti
   socs:
   - name: am6234
diff --git a/boards/toradex/colibri_imx7d/board.yml b/boards/toradex/colibri_imx7d/board.yml
index 7a6ffe62495..32a4e1db7eb 100644
--- a/boards/toradex/colibri_imx7d/board.yml
+++ b/boards/toradex/colibri_imx7d/board.yml
@@ -1,5 +1,6 @@
 board:
   name: colibri_imx7d
+  full_name: i.MX 7 Computer on Module - Colibri iMX7
   vendor: toradex
   socs:
     - name: mcimx7d
diff --git a/boards/toradex/verdin_imx8mp/board.yml b/boards/toradex/verdin_imx8mp/board.yml
index 6ffbf4561a2..bc2f8ff6ba6 100644
--- a/boards/toradex/verdin_imx8mp/board.yml
+++ b/boards/toradex/verdin_imx8mp/board.yml
@@ -1,5 +1,6 @@
 board:
   name: verdin_imx8mp
+  full_name: Verdin iMX8M Plus SoM
   vendor: toradex
   socs:
   - name: mimx8ml8
diff --git a/boards/u-blox/ubx_bmd300eval/board.yml b/boards/u-blox/ubx_bmd300eval/board.yml
index 522c0808eed..759e2345665 100644
--- a/boards/u-blox/ubx_bmd300eval/board.yml
+++ b/boards/u-blox/ubx_bmd300eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ubx_bmd300eval
+  full_name: "EVK-BMD-30/35: BMD-300-EVAL, BMD-301-EVAL, and BMD-350-EVAL"
   vendor: u-blox
   socs:
   - name: nrf52832
diff --git a/boards/u-blox/ubx_bmd330eval/board.yml b/boards/u-blox/ubx_bmd330eval/board.yml
index d50ce8816f7..6c842ef563f 100644
--- a/boards/u-blox/ubx_bmd330eval/board.yml
+++ b/boards/u-blox/ubx_bmd330eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ubx_bmd330eval
+  full_name: "EVK-BMD-330: BMD-330-EVAL"
   vendor: u-blox
   socs:
   - name: nrf52810
diff --git a/boards/u-blox/ubx_bmd340eval/board.yml b/boards/u-blox/ubx_bmd340eval/board.yml
index 2440541fc45..2e57087548a 100644
--- a/boards/u-blox/ubx_bmd340eval/board.yml
+++ b/boards/u-blox/ubx_bmd340eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ubx_bmd340eval
+  full_name: "EVK-BMD-34/38: BMD-340-EVAL and BMD-341-EVAL"
   vendor: u-blox
   socs:
   - name: nrf52840
diff --git a/boards/u-blox/ubx_bmd345eval/board.yml b/boards/u-blox/ubx_bmd345eval/board.yml
index eec2be0b7d9..2f84225aea8 100644
--- a/boards/u-blox/ubx_bmd345eval/board.yml
+++ b/boards/u-blox/ubx_bmd345eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ubx_bmd345eval
+  full_name: "EVK-BMD-34/38: BMD-345-EVAL"
   vendor: u-blox
   socs:
   - name: nrf52840
diff --git a/boards/u-blox/ubx_bmd360eval/board.yml b/boards/u-blox/ubx_bmd360eval/board.yml
index a06d24dd008..1866bd39f41 100644
--- a/boards/u-blox/ubx_bmd360eval/board.yml
+++ b/boards/u-blox/ubx_bmd360eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ubx_bmd360eval
+  full_name: "EVK-BMD-360: BMD-360-EVAL"
   vendor: u-blox
   socs:
   - name: nrf52811
diff --git a/boards/u-blox/ubx_bmd380eval/board.yml b/boards/u-blox/ubx_bmd380eval/board.yml
index 0f7ec7263e7..b830ad7da0e 100644
--- a/boards/u-blox/ubx_bmd380eval/board.yml
+++ b/boards/u-blox/ubx_bmd380eval/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ubx_bmd380eval
+  full_name: "EVK-BMD-34/48: BMD-380-EVAL"
   vendor: u-blox
   socs:
   - name: nrf52840
diff --git a/boards/u-blox/ubx_evkannab1/board.yml b/boards/u-blox/ubx_evkannab1/board.yml
index 3aeac881aba..2a7540ed01d 100644
--- a/boards/u-blox/ubx_evkannab1/board.yml
+++ b/boards/u-blox/ubx_evkannab1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ubx_evkannab1
+  full_name: EVK-ANNA-B11x
   vendor: u-blox
   socs:
   - name: nrf52832
diff --git a/boards/u-blox/ubx_evkninab1/board.yml b/boards/u-blox/ubx_evkninab1/board.yml
index 3073c5833d2..e6b70d481e6 100644
--- a/boards/u-blox/ubx_evkninab1/board.yml
+++ b/boards/u-blox/ubx_evkninab1/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ubx_evkninab1
+  full_name: EVK NINA-B11x
   vendor: u-blox
   socs:
   - name: nrf52832
diff --git a/boards/u-blox/ubx_evkninab3/board.yml b/boards/u-blox/ubx_evkninab3/board.yml
index 3914fd28149..7b96e215daf 100644
--- a/boards/u-blox/ubx_evkninab3/board.yml
+++ b/boards/u-blox/ubx_evkninab3/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ubx_evkninab3
+  full_name: EVK-NINA-B3
   vendor: u-blox
   socs:
   - name: nrf52840
diff --git a/boards/u-blox/ubx_evkninab4/board.yml b/boards/u-blox/ubx_evkninab4/board.yml
index 787ae9c4cdf..f8dc4ba07e1 100644
--- a/boards/u-blox/ubx_evkninab4/board.yml
+++ b/boards/u-blox/ubx_evkninab4/board.yml
@@ -1,5 +1,6 @@
 board:
   name: ubx_evkninab4
+  full_name: EVK NINA-B40x
   vendor: u-blox
   socs:
   - name: nrf52833
diff --git a/boards/udoo/udoo_neo_full/board.yml b/boards/udoo/udoo_neo_full/board.yml
index 1c20ebdc15f..c304b49b367 100644
--- a/boards/udoo/udoo_neo_full/board.yml
+++ b/boards/udoo/udoo_neo_full/board.yml
@@ -1,5 +1,6 @@
 board:
   name: udoo_neo_full
+  full_name: Neo Full
   vendor: udoo
   socs:
     - name: mcimx6x
diff --git a/boards/up-bridge-the-gap/up_squared/board.yml b/boards/up-bridge-the-gap/up_squared/board.yml
index 0955b6967af..1525911058f 100644
--- a/boards/up-bridge-the-gap/up_squared/board.yml
+++ b/boards/up-bridge-the-gap/up_squared/board.yml
@@ -1,4 +1,5 @@
 board:
   name: up_squared
+  full_name: UP Squared
   socs:
     - name: apollo_lake
diff --git a/boards/up-bridge-the-gap/up_squared_pro_7000/board.yml b/boards/up-bridge-the-gap/up_squared_pro_7000/board.yml
index b929cca9967..c3546042dea 100644
--- a/boards/up-bridge-the-gap/up_squared_pro_7000/board.yml
+++ b/boards/up-bridge-the-gap/up_squared_pro_7000/board.yml
@@ -1,4 +1,5 @@
 board:
   name: up_squared_pro_7000
+  full_name: UP Squared Pro 7000
   socs:
     - name: alder_lake
diff --git a/boards/vcc-gnd/yd_esp32/board.yml b/boards/vcc-gnd/yd_esp32/board.yml
index a930386ed84..86c8d22885f 100644
--- a/boards/vcc-gnd/yd_esp32/board.yml
+++ b/boards/vcc-gnd/yd_esp32/board.yml
@@ -1,5 +1,6 @@
 board:
   name: yd_esp32
+  full_name: YD-ESP32
   vendor: vcc-gnd
   socs:
   - name: esp32
diff --git a/boards/vcc-gnd/yd_stm32h750vb/board.yml b/boards/vcc-gnd/yd_stm32h750vb/board.yml
index f26fffaa901..fd8114075b1 100644
--- a/boards/vcc-gnd/yd_stm32h750vb/board.yml
+++ b/boards/vcc-gnd/yd_stm32h750vb/board.yml
@@ -1,5 +1,6 @@
 board:
   name: yd_stm32h750vb
+  full_name: YD-STM32H750VB
   vendor: vcc-gnd
   socs:
     - name: stm32h750xx
diff --git a/boards/vngiotlab/nrf51_vbluno51/board.yml b/boards/vngiotlab/nrf51_vbluno51/board.yml
index 8e3a9bf9488..05958c1e11f 100644
--- a/boards/vngiotlab/nrf51_vbluno51/board.yml
+++ b/boards/vngiotlab/nrf51_vbluno51/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf51_vbluno51
+  full_name: nRF51-VBLUno51
   vendor: vngiotlab
   socs:
   - name: nrf51822
diff --git a/boards/vngiotlab/nrf52_vbluno52/board.yml b/boards/vngiotlab/nrf52_vbluno52/board.yml
index be59c421baa..1f3e21cc1ba 100644
--- a/boards/vngiotlab/nrf52_vbluno52/board.yml
+++ b/boards/vngiotlab/nrf52_vbluno52/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf52_vbluno52
+  full_name: nRF52-VBLUno52
   vendor: vngiotlab
   socs:
   - name: nrf52832
diff --git a/boards/waveshare/esp32s3_touch_lcd_1_28/board.yml b/boards/waveshare/esp32s3_touch_lcd_1_28/board.yml
index 821fd367821..d9a110650fc 100644
--- a/boards/waveshare/esp32s3_touch_lcd_1_28/board.yml
+++ b/boards/waveshare/esp32s3_touch_lcd_1_28/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp32s3_touch_lcd_1_28
+  full_name: ESP32-S3-Touch-LCD-1.28
   vendor: waveshare
   socs:
   - name: esp32s3
diff --git a/boards/waveshare/nrf51_ble400/board.yml b/boards/waveshare/nrf51_ble400/board.yml
index d2c7da1f732..ea2be773ad3 100644
--- a/boards/waveshare/nrf51_ble400/board.yml
+++ b/boards/waveshare/nrf51_ble400/board.yml
@@ -1,5 +1,6 @@
 board:
   name: nrf51_ble400
+  full_name: BLE400
   vendor: waveshare
   socs:
   - name: nrf51822
diff --git a/boards/waveshare/open103z/board.yml b/boards/waveshare/open103z/board.yml
index 7504feebf9f..4e98a29413a 100644
--- a/boards/waveshare/open103z/board.yml
+++ b/boards/waveshare/open103z/board.yml
@@ -1,5 +1,6 @@
 board:
   name: waveshare_open103z
+  full_name: Open103Z
   vendor: waveshare
   socs:
     - name: stm32f103xe
diff --git a/boards/we/ophelia1ev/board.yml b/boards/we/ophelia1ev/board.yml
index ac80e1ed6e4..b69567e089d 100644
--- a/boards/we/ophelia1ev/board.yml
+++ b/boards/we/ophelia1ev/board.yml
@@ -1,5 +1,6 @@
 board:
   name: we_ophelia1ev
+  full_name: Ophelia-I EV NRF52805
   vendor: wurth
   socs:
   - name: nrf52805
diff --git a/boards/we/proteus2ev/board.yml b/boards/we/proteus2ev/board.yml
index 38cc08204e5..d246b6d1b4d 100644
--- a/boards/we/proteus2ev/board.yml
+++ b/boards/we/proteus2ev/board.yml
@@ -1,5 +1,6 @@
 board:
   name: we_proteus2ev
+  full_name: Proteus-II-EV
   vendor: wurth
   socs:
   - name: nrf52832
diff --git a/boards/we/proteus3ev/board.yml b/boards/we/proteus3ev/board.yml
index 6def880d7a5..fa498a28014 100644
--- a/boards/we/proteus3ev/board.yml
+++ b/boards/we/proteus3ev/board.yml
@@ -1,5 +1,6 @@
 board:
   name: we_proteus3ev
+  full_name: Proteus-III-EV
   vendor: wurth
   socs:
   - name: nrf52840
diff --git a/boards/weact/blackpill_f401cc/board.yml b/boards/weact/blackpill_f401cc/board.yml
index e72de492ef8..246a7e1cdfb 100644
--- a/boards/weact/blackpill_f401cc/board.yml
+++ b/boards/weact/blackpill_f401cc/board.yml
@@ -1,5 +1,6 @@
 board:
   name: blackpill_f401cc
+  full_name: Black Pill V1.2
   vendor: weact
   socs:
     - name: stm32f401xc
diff --git a/boards/weact/blackpill_f401ce/board.yml b/boards/weact/blackpill_f401ce/board.yml
index 83d26820943..84bd3b98354 100644
--- a/boards/weact/blackpill_f401ce/board.yml
+++ b/boards/weact/blackpill_f401ce/board.yml
@@ -1,5 +1,6 @@
 board:
   name: blackpill_f401ce
+  full_name: Black Pill V3.0
   vendor: weact
   socs:
     - name: stm32f401xe
diff --git a/boards/weact/blackpill_f411ce/board.yml b/boards/weact/blackpill_f411ce/board.yml
index b145c5e7f01..deee6cbdd06 100644
--- a/boards/weact/blackpill_f411ce/board.yml
+++ b/boards/weact/blackpill_f411ce/board.yml
@@ -1,5 +1,6 @@
 board:
   name: blackpill_f411ce
+  full_name: Black Pill V2.0
   vendor: weact
   socs:
     - name: stm32f411xe
diff --git a/boards/weact/mini_stm32h743/board.yml b/boards/weact/mini_stm32h743/board.yml
index 0789b364dfa..76ddce890ed 100644
--- a/boards/weact/mini_stm32h743/board.yml
+++ b/boards/weact/mini_stm32h743/board.yml
@@ -1,5 +1,6 @@
 board:
   name: mini_stm32h743
+  full_name: MiniSTM32H743 Core Board
   vendor: weact
   socs:
     - name: stm32h743xx
diff --git a/boards/weact/stm32f405_core/board.yml b/boards/weact/stm32f405_core/board.yml
index 8f85783cde9..1c97b9e6d2f 100644
--- a/boards/weact/stm32f405_core/board.yml
+++ b/boards/weact/stm32f405_core/board.yml
@@ -1,5 +1,6 @@
 board:
   name: weact_stm32f405_core
+  full_name: STM32F405 Core Board V1.0
   vendor: weact
   socs:
     - name: stm32f405xx
diff --git a/boards/weact/stm32g431_core/board.yml b/boards/weact/stm32g431_core/board.yml
index 359e74ed0d7..ba6032cf52d 100644
--- a/boards/weact/stm32g431_core/board.yml
+++ b/boards/weact/stm32g431_core/board.yml
@@ -1,5 +1,6 @@
 board:
   name: weact_stm32g431_core
+  full_name: STM32G431 Core Board
   vendor: weact
   socs:
     - name: stm32g431xx
diff --git a/boards/wemos/esp32s2_lolin_mini/board.yml b/boards/wemos/esp32s2_lolin_mini/board.yml
index 7df1267c214..06336f66be0 100644
--- a/boards/wemos/esp32s2_lolin_mini/board.yml
+++ b/boards/wemos/esp32s2_lolin_mini/board.yml
@@ -1,5 +1,6 @@
 board:
   name: esp32s2_lolin_mini
+  full_name: ESP32-S2 Lolin Mini
   vendor: wemos
   socs:
   - name: esp32s2
diff --git a/boards/witte/linum/board.yml b/boards/witte/linum/board.yml
index e9ae2c0307d..0bebfe2dec1 100644
--- a/boards/witte/linum/board.yml
+++ b/boards/witte/linum/board.yml
@@ -1,5 +1,6 @@
 board:
   name: linum
+  full_name: Linum Board
   vendor: witte
   socs:
     - name: stm32h753xx
diff --git a/boards/wiznet/w5500_evb_pico/board.yml b/boards/wiznet/w5500_evb_pico/board.yml
index 17ce17eea15..eb4eed60b88 100644
--- a/boards/wiznet/w5500_evb_pico/board.yml
+++ b/boards/wiznet/w5500_evb_pico/board.yml
@@ -1,5 +1,6 @@
 board:
   name: w5500_evb_pico
+  full_name: W5500 Evaluation Pico
   vendor: wiznet
   socs:
   - name: rp2040
diff --git a/boards/xen/xenvm/board.yml b/boards/xen/xenvm/board.yml
index 5b5aec44c55..f10f659206a 100644
--- a/boards/xen/xenvm/board.yml
+++ b/boards/xen/xenvm/board.yml
@@ -1,5 +1,6 @@
 board:
   name: xenvm
+  full_name: ARMv8 Xen Virtual Machine Example
   vendor: xen
   socs:
   - name: xenvm

From fc2f7fb645ca2fa4581f70821eb3798e4d78baf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Wed, 25 Sep 2024 10:47:44 +0200
Subject: [PATCH 0701/2913] [nrf fromtree] modules: hal_nordic: Add nrfx
 configuration for nRF54L15 FP1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added dedicated nrfx configuration files for
nRF54L15 FP1, which differ from ENGA variant with
inclusion of PDM.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit 005587fd610647f98cd5690f010e0b4ef575b29c)
(cherry picked from commit 0d281b955a904dd162235bcaf40ca82427b07eee)
---
 modules/hal_nordic/nrfx/nrfx_config.h         |    8 +-
 .../nrfx/nrfx_config_nrf54l15_application.h   | 1643 ++++++++++++++++
 .../nrfx/nrfx_config_nrf54l15_flpr.h          | 1652 +++++++++++++++++
 3 files changed, 3301 insertions(+), 2 deletions(-)
 create mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h
 create mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h

diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index d0d3a671ae2..3c91aae6de6 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -1129,10 +1129,14 @@
     #include <nrfx_config_nrf54h20_ppr.h>
 #elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_FLPR)
     #include <nrfx_config_nrf54h20_flpr.h>
-#elif (defined(NRF54L15_XXAA) || defined(NRF54L15_ENGA_XXAA)) && defined(NRF_APPLICATION)
+#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_APPLICATION)
     #include <nrfx_config_nrf54l15_enga_application.h>
-#elif (defined(NRF54L15_XXAA) || defined(NRF54L15_ENGA_XXAA)) && defined(NRF_FLPR)
+#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_FLPR)
     #include <nrfx_config_nrf54l15_enga_flpr.h>
+#elif defined(NRF54L15_XXAA) && defined(NRF_APPLICATION)
+    #include <nrfx_config_nrf54l15_application.h>
+#elif defined(NRF54L15_XXAA) && defined(NRF_FLPR)
+    #include <nrfx_config_nrf54l15_flpr.h>
 #elif (defined(NRF54L20_XXAA) || defined(NRF54L20_ENGA_XXAA)) && defined(NRF_APPLICATION)
     #include <nrfx_config_nrf54l20_enga_application.h>
 #elif defined(NRF9120_XXAA) || defined(NRF9160_XXAA)
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h
new file mode 100644
index 00000000000..e423c8b515d
--- /dev/null
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h
@@ -0,0 +1,1643 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef NRFX_CONFIG_NRF54L15_APPLICATION_H__
+#define NRFX_CONFIG_NRF54L15_APPLICATION_H__
+
+#ifndef NRFX_CONFIG_H__
+#error "This file should not be included directly. Include nrfx_config.h instead."
+#endif
+
+
+/**
+ * @brief NRFX_DEFAULT_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_DEFAULT_IRQ_PRIORITY
+#define NRFX_DEFAULT_IRQ_PRIORITY 7
+#endif
+
+/**
+ * @brief NRFX_CLOCK_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_ENABLED
+#define NRFX_CLOCK_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LF_SRC
+ *
+ * Integer value.
+ * Supported values:
+ * - RC    = 0
+ * - XTAL  = 1
+ * - Synth = 2
+ */
+#ifndef NRFX_CLOCK_CONFIG_LF_SRC
+#define NRFX_CLOCK_CONFIG_LF_SRC 1
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
+#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
+#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
+#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
+#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_COMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COMP_ENABLED
+#define NRFX_COMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_COMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
+#define NRFX_COMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_COMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
+#define NRFX_COMP_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
+#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
+#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_EGU_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU_ENABLED
+#define NRFX_EGU_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_EGU10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU10_ENABLED
+#define NRFX_EGU10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU20_ENABLED
+#define NRFX_EGU20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE_ENABLED
+#define NRFX_GPIOTE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
+ *
+ * Integer value. Minimum: 0. Maximum: 15.
+ */
+#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
+#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
+#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
+#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_GPIOTE20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE20_ENABLED
+#define NRFX_GPIOTE20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE30_ENABLED
+#define NRFX_GPIOTE30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_ENABLED
+#define NRFX_GRTC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 1
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
+ *
+ * Integer value.
+ */
+#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
+#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 8
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
+ */
+#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
+#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x00000f0f
+#endif
+
+/**
+ * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
+#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
+#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_I2S_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S_ENABLED
+#define NRFX_I2S_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_I2S_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
+#define NRFX_I2S_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_I2S_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
+#define NRFX_I2S_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_I2S20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S20_ENABLED
+#define NRFX_I2S20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_LPCOMP_ENABLED
+#define NRFX_LPCOMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
+#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
+#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_NFCT_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_NFCT_ENABLED
+#define NRFX_NFCT_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
+ *
+ * Integer value. Minimum: 0. Maximum: 5.
+ */
+#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
+#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
+#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
+#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PDM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM_ENABLED
+#define NRFX_PDM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PDM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
+#define NRFX_PDM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
+#define NRFX_PDM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PDM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM20_ENABLED
+#define NRFX_PDM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM21_ENABLED
+#define NRFX_PDM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_POWER_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_POWER_ENABLED
+#define NRFX_POWER_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PRS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_ENABLED
+#define NRFX_PRS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
+#define NRFX_PRS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
+#define NRFX_PRS_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_0_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_0_ENABLED
+#define NRFX_PRS_BOX_0_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_1_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_1_ENABLED
+#define NRFX_PRS_BOX_1_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_2_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_2_ENABLED
+#define NRFX_PRS_BOX_2_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_3_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_3_ENABLED
+#define NRFX_PRS_BOX_3_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_4_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_4_ENABLED
+#define NRFX_PRS_BOX_4_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_5_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_5_ENABLED
+#define NRFX_PRS_BOX_5_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM_ENABLED
+#define NRFX_PWM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PWM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
+#define NRFX_PWM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
+#define NRFX_PWM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PWM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM20_ENABLED
+#define NRFX_PWM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM21_ENABLED
+#define NRFX_PWM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM22_ENABLED
+#define NRFX_PWM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC_ENABLED
+#define NRFX_QDEC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
+#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
+#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_QDEC20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC20_ENABLED
+#define NRFX_QDEC20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC21_ENABLED
+#define NRFX_QDEC21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RRAMC_ENABLED
+#define NRFX_RRAMC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
+#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
+#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_RTC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC_ENABLED
+#define NRFX_RTC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_RTC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
+#define NRFX_RTC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
+#define NRFX_RTC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_RTC10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC10_ENABLED
+#define NRFX_RTC10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC30_ENABLED
+#define NRFX_RTC30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SAADC_ENABLED
+#define NRFX_SAADC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
+#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
+#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_SPIM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM_ENABLED
+#define NRFX_SPIM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
+#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
+#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_SPIM00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM00_ENABLED
+#define NRFX_SPIM00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM20_ENABLED
+#define NRFX_SPIM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM21_ENABLED
+#define NRFX_SPIM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM22_ENABLED
+#define NRFX_SPIM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM30_ENABLED
+#define NRFX_SPIM30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS_ENABLED
+#define NRFX_SPIS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
+#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
+#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_SPIS00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS00_ENABLED
+#define NRFX_SPIS00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS20_ENABLED
+#define NRFX_SPIS20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS21_ENABLED
+#define NRFX_SPIS21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS22_ENABLED
+#define NRFX_SPIS22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS30_ENABLED
+#define NRFX_SPIS30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SYSTICK_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SYSTICK_ENABLED
+#define NRFX_SYSTICK_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TEMP_ENABLED
+#define NRFX_TEMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
+#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
+#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TIMER_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER_ENABLED
+#define NRFX_TIMER_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
+#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
+#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TIMER00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER00_ENABLED
+#define NRFX_TIMER00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER10_ENABLED
+#define NRFX_TIMER10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER20_ENABLED
+#define NRFX_TIMER20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER21_ENABLED
+#define NRFX_TIMER21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER22_ENABLED
+#define NRFX_TIMER22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER23_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER23_ENABLED
+#define NRFX_TIMER23_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER24_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER24_ENABLED
+#define NRFX_TIMER24_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM_ENABLED
+#define NRFX_TWIM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
+#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
+#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TWIM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM20_ENABLED
+#define NRFX_TWIM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM21_ENABLED
+#define NRFX_TWIM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM22_ENABLED
+#define NRFX_TWIM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM30_ENABLED
+#define NRFX_TWIM30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_ENABLED
+#define NRFX_TWIS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
+#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
+ *        Assume that any instance would be initialized only once.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
+#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_NO_SYNC_MODE
+#define NRFX_TWIS_NO_SYNC_MODE 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
+#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TWIS20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS20_ENABLED
+#define NRFX_TWIS20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS21_ENABLED
+#define NRFX_TWIS21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS22_ENABLED
+#define NRFX_TWIS22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS30_ENABLED
+#define NRFX_TWIS30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_ENABLED
+#define NRFX_UARTE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
+ *        If enabled, support for configuring GPIO pins is removed from the driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
+#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
+ *        If enabled, support for configuring PSEL registers is removed from the driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
+#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_TX_LINK
+#define NRFX_UARTE_CONFIG_TX_LINK 1
+#endif
+
+/**
+ * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
+ *
+ * Integer value. Minimum: 0. Maximum: 255.
+ */
+#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
+#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
+#endif
+
+/**
+ * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
+#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
+#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_UARTE00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE00_ENABLED
+#define NRFX_UARTE00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE20_ENABLED
+#define NRFX_UARTE20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE21_ENABLED
+#define NRFX_UARTE21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE22_ENABLED
+#define NRFX_UARTE22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE30_ENABLED
+#define NRFX_UARTE30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_ENABLED
+#define NRFX_WDT_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_CONFIG_NO_IRQ
+#define NRFX_WDT_CONFIG_NO_IRQ 0
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
+#define NRFX_WDT_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
+#define NRFX_WDT_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_WDT30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT30_ENABLED
+#define NRFX_WDT30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT31_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT31_ENABLED
+#define NRFX_WDT31_ENABLED 0
+#endif
+
+#endif /* NRFX_CONFIG_NRF54L15_APPLICATION_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h
new file mode 100644
index 00000000000..a036f8c0a26
--- /dev/null
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h
@@ -0,0 +1,1652 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef NRFX_CONFIG_NRF54L15_FLPR_H__
+#define NRFX_CONFIG_NRF54L15_FLPR_H__
+
+#ifndef NRFX_CONFIG_H__
+#error "This file should not be included directly. Include nrfx_config.h instead."
+#endif
+
+
+/**
+ * @brief NRFX_DEFAULT_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_DEFAULT_IRQ_PRIORITY
+#define NRFX_DEFAULT_IRQ_PRIORITY 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_ENABLED
+#define NRFX_CLOCK_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LF_SRC
+ *
+ * Integer value.
+ * Supported values:
+ * - RC    = 0
+ * - XTAL  = 1
+ * - Synth = 2
+ */
+#ifndef NRFX_CLOCK_CONFIG_LF_SRC
+#define NRFX_CLOCK_CONFIG_LF_SRC 1
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
+#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
+#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
+#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
+#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_COMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COMP_ENABLED
+#define NRFX_COMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_COMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
+#define NRFX_COMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_COMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
+#define NRFX_COMP_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_COREDEP_VPR_LEGACY
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COREDEP_VPR_LEGACY
+#define NRFX_COREDEP_VPR_LEGACY 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
+#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
+#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_EGU_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU_ENABLED
+#define NRFX_EGU_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_EGU10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU10_ENABLED
+#define NRFX_EGU10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU20_ENABLED
+#define NRFX_EGU20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE_ENABLED
+#define NRFX_GPIOTE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
+ *
+ * Integer value. Minimum: 0. Maximum: 15.
+ */
+#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
+#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
+#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
+#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_GPIOTE20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE20_ENABLED
+#define NRFX_GPIOTE20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE30_ENABLED
+#define NRFX_GPIOTE30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_ENABLED
+#define NRFX_GRTC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 1
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
+ *
+ * Integer value.
+ */
+#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
+#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 4
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
+ */
+#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
+#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x000000f0
+#endif
+
+/**
+ * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
+#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
+#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_I2S_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S_ENABLED
+#define NRFX_I2S_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_I2S_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
+#define NRFX_I2S_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_I2S_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
+#define NRFX_I2S_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_I2S20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S20_ENABLED
+#define NRFX_I2S20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_LPCOMP_ENABLED
+#define NRFX_LPCOMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
+#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
+#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_NFCT_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_NFCT_ENABLED
+#define NRFX_NFCT_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
+ *
+ * Integer value. Minimum: 0. Maximum: 5.
+ */
+#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
+#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
+#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
+#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PDM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM_ENABLED
+#define NRFX_PDM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PDM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
+#define NRFX_PDM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
+#define NRFX_PDM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PDM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM20_ENABLED
+#define NRFX_PDM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM21_ENABLED
+#define NRFX_PDM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_POWER_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_POWER_ENABLED
+#define NRFX_POWER_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PRS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_ENABLED
+#define NRFX_PRS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
+#define NRFX_PRS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
+#define NRFX_PRS_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_0_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_0_ENABLED
+#define NRFX_PRS_BOX_0_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_1_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_1_ENABLED
+#define NRFX_PRS_BOX_1_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_2_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_2_ENABLED
+#define NRFX_PRS_BOX_2_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_3_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_3_ENABLED
+#define NRFX_PRS_BOX_3_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_4_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_4_ENABLED
+#define NRFX_PRS_BOX_4_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_5_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_5_ENABLED
+#define NRFX_PRS_BOX_5_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM_ENABLED
+#define NRFX_PWM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PWM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
+#define NRFX_PWM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
+#define NRFX_PWM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PWM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM20_ENABLED
+#define NRFX_PWM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM21_ENABLED
+#define NRFX_PWM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM22_ENABLED
+#define NRFX_PWM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC_ENABLED
+#define NRFX_QDEC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
+#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
+#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_QDEC20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC20_ENABLED
+#define NRFX_QDEC20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC21_ENABLED
+#define NRFX_QDEC21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RRAMC_ENABLED
+#define NRFX_RRAMC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
+#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
+#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_RTC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC_ENABLED
+#define NRFX_RTC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_RTC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
+#define NRFX_RTC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
+#define NRFX_RTC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_RTC10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC10_ENABLED
+#define NRFX_RTC10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC30_ENABLED
+#define NRFX_RTC30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SAADC_ENABLED
+#define NRFX_SAADC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
+#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
+#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_SPIM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM_ENABLED
+#define NRFX_SPIM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
+#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
+#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_SPIM00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM00_ENABLED
+#define NRFX_SPIM00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM20_ENABLED
+#define NRFX_SPIM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM21_ENABLED
+#define NRFX_SPIM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM22_ENABLED
+#define NRFX_SPIM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM30_ENABLED
+#define NRFX_SPIM30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS_ENABLED
+#define NRFX_SPIS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
+#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
+#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_SPIS00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS00_ENABLED
+#define NRFX_SPIS00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS20_ENABLED
+#define NRFX_SPIS20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS21_ENABLED
+#define NRFX_SPIS21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS22_ENABLED
+#define NRFX_SPIS22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS30_ENABLED
+#define NRFX_SPIS30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TEMP_ENABLED
+#define NRFX_TEMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
+#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
+#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TIMER_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER_ENABLED
+#define NRFX_TIMER_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
+#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
+#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TIMER00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER00_ENABLED
+#define NRFX_TIMER00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER10_ENABLED
+#define NRFX_TIMER10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER20_ENABLED
+#define NRFX_TIMER20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER21_ENABLED
+#define NRFX_TIMER21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER22_ENABLED
+#define NRFX_TIMER22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER23_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER23_ENABLED
+#define NRFX_TIMER23_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER24_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER24_ENABLED
+#define NRFX_TIMER24_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM_ENABLED
+#define NRFX_TWIM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
+#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
+#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TWIM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM20_ENABLED
+#define NRFX_TWIM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM21_ENABLED
+#define NRFX_TWIM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM22_ENABLED
+#define NRFX_TWIM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM30_ENABLED
+#define NRFX_TWIM30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_ENABLED
+#define NRFX_TWIS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
+#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
+ *        Assume that any instance would be initialized only once.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
+#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_NO_SYNC_MODE
+#define NRFX_TWIS_NO_SYNC_MODE 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
+#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TWIS20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS20_ENABLED
+#define NRFX_TWIS20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS21_ENABLED
+#define NRFX_TWIS21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS22_ENABLED
+#define NRFX_TWIS22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS30_ENABLED
+#define NRFX_TWIS30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_ENABLED
+#define NRFX_UARTE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
+ *        If enabled, support for configuring GPIO pins is removed from the driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
+#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
+ *        If enabled, support for configuring PSEL registers is removed from the driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
+#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_TX_LINK
+#define NRFX_UARTE_CONFIG_TX_LINK 1
+#endif
+
+/**
+ * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
+ *
+ * Integer value. Minimum: 0. Maximum: 255.
+ */
+#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
+#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
+#endif
+
+/**
+ * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
+#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
+#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_UARTE00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE00_ENABLED
+#define NRFX_UARTE00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE20_ENABLED
+#define NRFX_UARTE20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE21_ENABLED
+#define NRFX_UARTE21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE22_ENABLED
+#define NRFX_UARTE22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE30_ENABLED
+#define NRFX_UARTE30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_VEVIF_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_VEVIF_ENABLED
+#define NRFX_VEVIF_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_ENABLED
+#define NRFX_WDT_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_CONFIG_NO_IRQ
+#define NRFX_WDT_CONFIG_NO_IRQ 0
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
+#define NRFX_WDT_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
+#define NRFX_WDT_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_WDT30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT30_ENABLED
+#define NRFX_WDT30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT31_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT31_ENABLED
+#define NRFX_WDT31_ENABLED 0
+#endif
+
+#endif /* NRFX_CONFIG_NRF54L15_FLPR_H__ */

From a8888fd34d916848f858c1583fbbc96ae3f62789 Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Wed, 16 Oct 2024 21:47:51 +0200
Subject: [PATCH 0702/2913] [nrf fromtree] boards: nordic: Remove nRF54L15 PDK

The nRF54L15 Development Kit is now available, so remove the Preview
Development Kit (PDK).

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit cb47c62259a308e860038224a1118449c374e6e6)
(cherry picked from commit f514264613b57856eec29c0ca01ca403136dfd6e)
---
 boards/deprecated.cmake                       |   3 -
 boards/nordic/nrf54l15pdk/Kconfig.defconfig   |  12 --
 boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk |   7 -
 boards/nordic/nrf54l15pdk/board.cmake         |  12 --
 boards/nordic/nrf54l15pdk/board.yml           |  15 --
 .../doc/img/nrf54l15pdk_nrf54l15.webp         | Bin 35746 -> 0 bytes
 boards/nordic/nrf54l15pdk/doc/index.rst       | 142 ----------------
 .../nrf54l15pdk/nrf54l15_cpuapp_common.dtsi   | 156 ------------------
 .../nrf54l15pdk_nrf54l15-common.dtsi          | 100 -----------
 .../nrf54l15pdk_nrf54l15-pinctrl.dtsi         |  80 ---------
 .../nrf54l15pdk_nrf54l15_common_0_2_1.dtsi    |  52 ------
 .../nrf54l15pdk_nrf54l15_cpuapp.dts           |  19 ---
 .../nrf54l15pdk_nrf54l15_cpuapp.yaml          |  24 ---
 .../nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay |   7 -
 .../nrf54l15pdk_nrf54l15_cpuapp_defconfig     |  31 ----
 .../nrf54l15pdk_nrf54l15_cpuflpr.dts          |  71 --------
 .../nrf54l15pdk_nrf54l15_cpuflpr.yaml         |  18 --
 ...nrf54l15pdk_nrf54l15_cpuflpr_0_2_1.overlay |   7 -
 .../nrf54l15pdk_nrf54l15_cpuflpr_defconfig    |  17 --
 .../nrf54l15pdk_nrf54l15_cpuflpr_xip.dts      |  12 --
 .../nrf54l15pdk_nrf54l15_cpuflpr_xip.yaml     |  18 --
 ...4l15pdk_nrf54l15_cpuflpr_xip_0_2_1.overlay |   7 -
 ...nrf54l15pdk_nrf54l15_cpuflpr_xip_defconfig |  15 --
 doc/releases/release-notes-4.0.rst            |   1 +
 samples/bluetooth/beacon/sample.yaml          |   1 -
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  12 --
 .../nrf54l15pdk_nrf54l15_cpuapp_df.overlay    |  33 ----
 samples/bluetooth/hci_uart/sample.yaml        |  11 --
 samples/bluetooth/peripheral_hr/sample.yaml   |   1 -
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |   9 -
 samples/drivers/mbox/CMakeLists.txt           |   1 -
 samples/drivers/mbox/Kconfig.sysbuild         |   1 -
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  20 ---
 samples/drivers/mbox/remote/CMakeLists.txt    |   2 -
 .../nrf54l15pdk_nrf54l15_cpuflpr.overlay      |  24 ---
 .../nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay  |  24 ---
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |   9 -
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |   8 -
 .../nrf54l15pdk_nrf54l15_cpuflpr.overlay      |   8 -
 .../nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay  |   8 -
 .../boards/nrf54l15pdk_nrf54l15_cpuapp.conf   |  12 --
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  45 -----
 samples/subsys/fs/fs_sample/sample.yaml       |   3 -
 samples/subsys/fs/littlefs/sample.yaml        |   1 -
 .../ipc/ipc_service/icmsg/CMakeLists.txt      |   3 +-
 .../ipc/ipc_service/icmsg/Kconfig.sysbuild    |   1 -
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  41 -----
 .../nrf54l15pdk_nrf54l15_cpuflpr.overlay      |  45 -----
 .../boards/nrf54l15pdk_nrf54l15_cpuapp.conf   |   2 -
 samples/subsys/settings/sample.yaml           |   1 -
 samples/sysbuild/hello_world/sample.yaml      |   9 -
 .../nrf54l15pdk_nrf54l15_cpuflpr.conf         |   1 -
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  29 ----
 snippets/nordic-flpr-xip/snippet.yml          |   3 -
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  43 -----
 snippets/nordic-flpr/snippet.yml              |   3 -
 tests/boot/with_mcumgr/testcase.yaml          |   1 -
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  43 -----
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  21 ---
 .../nrf54l15pdk_nrf54l15_cpuflpr.overlay      |  21 ---
 .../nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay  |  21 ---
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  30 ----
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  30 ----
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  23 ---
 .../drivers/mbox/mbox_error_cases/sample.yaml |   1 -
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  20 ---
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |   3 -
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  36 ----
 .../nrf54l15pdk_nrf54l15_cpuflpr.overlay      |  30 ----
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  54 ------
 tests/lib/cpp/cxx/testcase.yaml               |   1 -
 tests/subsys/fs/fcb/testcase.yaml             |   1 -
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  22 ---
 tests/subsys/fs/littlefs/testcase.yaml        |   2 +-
 .../storage/stream/stream_flash/testcase.yaml |   1 -
 75 files changed, 3 insertions(+), 1598 deletions(-)
 delete mode 100644 boards/nordic/nrf54l15pdk/Kconfig.defconfig
 delete mode 100644 boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk
 delete mode 100644 boards/nordic/nrf54l15pdk/board.cmake
 delete mode 100644 boards/nordic/nrf54l15pdk/board.yml
 delete mode 100644 boards/nordic/nrf54l15pdk/doc/img/nrf54l15pdk_nrf54l15.webp
 delete mode 100644 boards/nordic/nrf54l15pdk/doc/index.rst
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15_cpuapp_common.dtsi
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15-common.dtsi
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15-pinctrl.dtsi
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_common_0_2_1.dtsi
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.dts
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.yaml
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_defconfig
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.dts
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.yaml
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_0_2_1.overlay
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_defconfig
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip.dts
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip.yaml
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip_0_2_1.overlay
 delete mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip_defconfig
 delete mode 100644 samples/bluetooth/hci_uart/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 delete mode 100644 samples/bluetooth/hci_uart/boards/nrf54l15pdk_nrf54l15_cpuapp_df.overlay
 delete mode 100644 samples/drivers/jesd216/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 delete mode 100644 samples/drivers/mbox/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 delete mode 100644 samples/drivers/mbox/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
 delete mode 100644 samples/drivers/mbox/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
 delete mode 100644 samples/drivers/spi_flash/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 delete mode 100644 samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 delete mode 100644 samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
 delete mode 100644 samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
 delete mode 100644 samples/subsys/fs/fs_sample/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
 delete mode 100644 samples/subsys/fs/fs_sample/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 delete mode 100644 samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 delete mode 100644 samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
 delete mode 100644 samples/subsys/settings/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
 delete mode 100644 samples/sysbuild/hello_world/sysbuild/nrf54l15pdk_nrf54l15_cpuflpr.conf
 delete mode 100644 snippets/nordic-flpr-xip/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 delete mode 100644 snippets/nordic-flpr/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 delete mode 100644 tests/drivers/adc/adc_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 delete mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 delete mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
 delete mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
 delete mode 100644 tests/drivers/i2s/i2s_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 delete mode 100644 tests/drivers/i2s/i2s_speed/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 delete mode 100644 tests/drivers/mbox/mbox_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 delete mode 100644 tests/drivers/pwm/pwm_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 delete mode 100644 tests/drivers/sensor/temp_sensor/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 delete mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 delete mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
 delete mode 100644 tests/drivers/uart/uart_errors/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 delete mode 100644 tests/subsys/fs/littlefs/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay

diff --git a/boards/deprecated.cmake b/boards/deprecated.cmake
index a96f68b12da..c2b49e34fef 100644
--- a/boards/deprecated.cmake
+++ b/boards/deprecated.cmake
@@ -508,9 +508,6 @@ set(nrf5340dk_nrf5340_cpuapp_ns_DEPRECATED
 set(nrf5340dk_nrf5340_cpunet_DEPRECATED
     nrf5340dk/nrf5340/cpunet
 )
-set(nrf54l15pdk_nrf54l15_cpuapp_DEPRECATED
-    nrf54l15pdk/nrf54l15/cpuapp
-)
 set(nrf9131ek_nrf9131_DEPRECATED
     nrf9131ek
 )
diff --git a/boards/nordic/nrf54l15pdk/Kconfig.defconfig b/boards/nordic/nrf54l15pdk/Kconfig.defconfig
deleted file mode 100644
index 1c83abbb020..00000000000
--- a/boards/nordic/nrf54l15pdk/Kconfig.defconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_NRF54L15PDK_NRF54L15_CPUAPP
-
-config BT_CTLR
-	default BT
-
-config ROM_START_OFFSET
-	default 0x800 if BOOTLOADER_MCUBOOT
-
-endif # BOARD_NRF54L15PDK_NRF54L15_CPUAPP
diff --git a/boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk b/boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk
deleted file mode 100644
index d5116bd50c6..00000000000
--- a/boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_NRF54L15PDK
-	select SOC_NRF54L15_ENGA_CPUAPP if BOARD_NRF54L15PDK_NRF54L15_CPUAPP
-	select SOC_NRF54L15_ENGA_CPUFLPR if BOARD_NRF54L15PDK_NRF54L15_CPUFLPR || \
-					    BOARD_NRF54L15PDK_NRF54L15_CPUFLPR_XIP
diff --git a/boards/nordic/nrf54l15pdk/board.cmake b/boards/nordic/nrf54l15pdk/board.cmake
deleted file mode 100644
index 4a6a86a8f8a..00000000000
--- a/boards/nordic/nrf54l15pdk/board.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if (CONFIG_SOC_NRF54L15_ENGA_CPUAPP)
-  board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
-elseif (CONFIG_SOC_NRF54L15_ENGA_CPUFLPR)
-  board_runner_args(jlink "--speed=4000")
-endif()
-
-include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
-include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf54l15pdk/board.yml b/boards/nordic/nrf54l15pdk/board.yml
deleted file mode 100644
index 1432bfc3ea6..00000000000
--- a/boards/nordic/nrf54l15pdk/board.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-board:
-  name: nrf54l15pdk
-  full_name: nRF54L15 PDK
-  vendor: nordic
-  socs:
-  - name: nrf54l15
-    variants:
-    - name: xip
-      cpucluster: cpuflpr
-  revision:
-    format: major.minor.patch
-    default: "0.3.0"
-    revisions:
-    - name: "0.2.1"
-    - name: "0.3.0"
diff --git a/boards/nordic/nrf54l15pdk/doc/img/nrf54l15pdk_nrf54l15.webp b/boards/nordic/nrf54l15pdk/doc/img/nrf54l15pdk_nrf54l15.webp
deleted file mode 100644
index 80fb2060a0772776c3ba1a4e092ba7c28f13bbd7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 35746
zcmZshLz6Cy4ur?HZQJ%4+qP}nwr!oUZQC}_*yek`A8@nks%%n~MdwMivXr=Zb_@`Z
zhM0(=x*``*{C~P(1vn3wW(cGPSm3X0feZy1MHyAA&cOmYwA?nnnpP_aZXpd2bOX*)
zJBGr$#hc*#XQ;D6OfKq`@OM3!kKpvzTtM<u8Gv)u<7NJ(Zy;b<aOkrJ@b|0w4)U#H
z1@oo<*`TZMitriW_;VDX_X7U=0YC)+TGoH>%n}~`iv^bgjsbv|%b%-v3ji!2V-52+
z001yV1pIFOko^P$z<=)6DZ>G=0PHW9U)tq>iQkBC!FPpS#=E@(Y>R736~>&O<Dd37
z2djdvfD(Y*huj6@n8I!Upbwb8)eq^<{9C`VLj6y{9ptLu3SbXFeT{rou>!aa@B=8E
z^8Nze=au`V0nh-MZ_WY4C&rtCH^AT*_wVtm&a}xb;f>%cAnzUY*W+gy!1y^oTVGyq
z+y5QV0C2m+y#)OBU-f|olm&!5-v9uB;e)q3MgZWq0CB&Ea<DbnfG82=11vCOf()!r
zn27ul8kjLr652OdNah3u<o`CI+TKwNVTtX|^8*0h?~DP*lu|Fe9mbh;>KM*jUF765
zL064Pv9%g$y=%<bw0|!8o>KSx7jwKM=P=_QM%)JG+KM@sSLkDvMo^V~ncloY;(XC8
zr~6_NZGEUC*c5R{K42-8ITK}Ads{)-+qLMRO--V#bK(iYZ~}8&i_Cnb%E$NgHD3`^
z;C@s4V&?5zAs-k$-#>TdT7<ZQNV=Vz!jN}q{<M`mcj0Vb(=(E#q(hWnKam|u570b5
z%!V7*=kli*6^N(A5Zv?J){>+ph;Df^Y&L#B3#tZAP*|Vr{q72b(FO_5tWMCZ?bTtg
zchU6ZG*`kA2F2_=STI+8Mae8}!dQHSK~qEwe&l_=^H!wdwjVP;J(@qInn9zrclk!x
zhW(=RTrpi}v1F`7M_n&i;7Ft+GE=sGkEX4X@bwjwdHfzpw1f0|*+>3BkGyML2Yn@o
zsp1o4*-&4Ob3>MC2bQ4fYg%`4-OQS9F7lbwhfg+HpO0MVVhL<%fS9k0tMAdH>wpm3
z15m>oT#vgJ8tTAut;?P@BMrCpZD%){`H<7V$C-?-6%hQW!8N+3Qs01W>|Mi?3}`cr
zN=dpeLIkGjvu9*J|7jv}f35<<>f`qHu2+>B=MBgDEwJ*-c+zZ>S)CRHjV6_fZrf1^
z1j#A+dB)fr;zYh$fDm$^eu~TSGOuu2j<FdrhnKTERCG%{xJa03xxx4vAh?fkOSr3T
zsRLnpq9TyS3eVigfGdC)Ttos<W@JICU@67}zj>wjHM}}3dVmX#ozr6w36w9}lM4~I
zKv)cVyvr#+@Dk!gi8#+pgyWzP1;ZWyp{44#T8&|ArP9lV5LHfuTQRh8yBc^SX!VG%
zzw2K?&g**uK0+qpEv)+z*|=w!Y4nXg*Xy?E)RubQYGx{z>2>PZrswnN_L_Rky+ZFx
ze#hME-z$Gw(iaGv^Iiz~DG@%{Ee>yk$D$XDqDHX;+$u<dVQ2?rp3g`&KaaLUF`=!G
zY<Lu4OAWCtgp}GsEKQ1$lUu$C%NJ(@-&-e_0vHmM9zbMctMj-D*E3ecaBfyO{F??v
z&fB^&9xm_ZdvpBldV~DP1D}##lI3P%hEHrrT4{5P%D06D*%ogP@s;!PlVs4~5-iY-
zOzt7W!quSg^2s{6ft}w-yFjZ$>8eLmb(dW38R$E-Ps&94RsF#-Ir!%2{=%%T^H5wv
z)l7XbZm=kwL>T-?l*>N6cNw{4#_YS*xEcekh!|tL!uf7NEZm1J+5ISFTOz|{L!ZVV
zaC}VrIdx}X#wSno6>J)c&$sX!&<WeH1hSRgo}xzY0a@LMEN#G*lz6Hu(Mm87ymy-)
zY_VzR`iyaZi;CmUOaez9yiX|Y#==jwMu?-6zOsSROp%9mh<VLzHkr&@Unac94KFdl
zwx?48D;<(9q{6oh{S*C%7V)7f{^Ahtz%*M9@Ax`y2j?zWe`idu?cgT$J^DShS+IB~
z=z;?Bs|h6Qb{H|Exby^T>*4oP*CjLeUQlQw=$-qe=HEjejZxuqyEBW@M%6))@IEfC
zV2OGvT861RTLeWR7vCX35kePuaU8H=yD?9l*K9eh0AkaV{<G(Ny~lbsakXH6Zx|Yh
z#Kt(I0u;GF0>XLKs+Z4J8QeO_lryTG%Zi86s^;|b`04L6Au*S4Z8C?6MEppm=?=X-
zX3~1k<syGXfaqmev0Sw8&}H3mC&by%#M@k#9qvZIClLv%K=pOpV-?)}>AnkEyrxm0
zA3q~0t^+=*!pIdj2q%n9!u<<a&+>HH4E+#aK!7m(jK9SI%QkTVknqzZ3jxWuN%|9q
zXV5m9iNl-89>s6rc9W2sy>w<h^-o9;y-w`nJA}3{k^QlyEK!nNW=KjIW;igQa`vl^
zQb6#Yh1D*}IlqQNFCqD+&%j^F_=pN5v&BW2$uM!(x@q?>o(LJ)_)?`&G^E3bY9}%;
z1*N;-2wh?Sm$-gcRkc}NkDa@nAU~o?nEY(iv*YatVpLAD5xQu&w#~8ZH~V}>ndaeI
z5p`rxHVg`|L6z!Z!%D*zeS=lxTqQKFFTR07vAorc+1BsO|C=~UK#*3Vt5H%1Y*=b!
zg)G<|mpyF%a%dxK;&|<i@|dyh@t6^7)r_bTQ(_?T6qgdQ+@?*U_{aHBD#_MC7V?lo
zr<t{qRIQg}4?*ar<vo<bxOC8u{bRFK=Q38$!sc=MiCfsgHp!%+YnX>e7|w8Hw=cP3
zli;6#Z{s88SCeejfW<hjpSOjktaOin_n7^f0Ol=f-9(rMO_Hjq#t7g{7|DJ0wX4%e
zIYHPL5!MSdT<3I54>6c)FZ@WgN5fu8ChJ)X-W)~{`ZHr$c=n*d_imW9yxXD%GI+<0
zTgKo|7|5xrGv<BeaKdFP^lLw=_NW<nzgilmU{(ADXzsNmh0Y0Y!-JK}q>U$)?IIa{
zO?c<jNe?R1JTc<zrLH=`>dQ>6)N;+J-bbeh_G(l_RirXpeO=xLUEj|n5;m`%)h6~V
z^{ej8`aOC1NH4MEaPm|lcjPo75_RAybT<iRhj(hvlq;%2xbW<B$X|U;$KCc0^8<c}
zfyNn?m1cTwx!iHqyimygFmPU7ywO32Qg1Pco(8tnQ(H8oAshbMHMK52Ry)7TG_&y-
zqY1POV)qZMLc@(1av23fgVi0gnSxg_#?BbAM?ZDF26tRcWAvpQ=1(2<N@p=5m?So?
zf+JClk9BvW=3pK!##HVCB^h59nCF(RLN(Gzs$Q>Ga1kI$hMD3S<+rD!xx@gixClRb
z!2>h-fGSN>EhGJVFn+n|p@u1rMFS??VuGsD`R8{ty13hcHEACDJ!2FdVDEd=f*(1j
zGY(X|l5MewDdpoF%OnP8@z`dHVMq%&xI<?$#&1(b2@&J8EqS#&ztLE=+U#q@whds3
zPx)pJN+lAZi{ET|eNt#NO1a;I#`}I$3U0U#1OmUC5>jlq=o5=dc8O7zT<Q@8E!9xc
zHS`bdW^Yss&d9#+yeW2bptQ)juz;Gm7Xy0p;(YG+RWkE>m);V=C+6?%;OBvqEZ>{2
zxwf@b**hqT%3An8>_s}oHv<%!7X{=7EdAH;4j3V#SohjVQtDjfCK6If65HPPdgF%$
z>_PH91hmCbXVVMSUl?X=`FqLtcD##iemBe*52aXn67HndsE-$4#zO9>0v=T<!Ncip
z9*DJij0AYMds1knGqbY=^?G&7`EKgbypK)zj-4klLBTfWzB**`kZizcxICNGO|LZ%
z_=S$(sA9|J$cX6=7RNC*XF~8Bk>HG{%Bsw8OAv&k5S5IeggwCM@(I{ij%AZ;JW9h>
z<OylcIVT!WlG0m?%o@X?Xo{k$(Lz#j(3>KFtz@lDT|Ukf?H>^CY;y13TSKTjq5bOJ
zOgsou&*?DS;z(nif2u$lS+cujP^w5!jN{qK?w22<=YH|PFj@C=i|uw{trsVbEpeaM
znzc@nYJy@B#P7iR$0@9P*)Ku+n7Pol`pYO10sh4{>`FrlO08PsK%A5sO5L`G$Lr;&
z$V6sHdtor_-*+XoOcL+x8kvGlQ_Xe5z027l%{ER0FF{xy0@8u3f)1kMi*xFdW&|^G
z+-n$&)B+v>A&VhxgH1%+YPkW&XlN22cRcOQTG;~|#)Ld2q{UydKaWI<USvlnU~rbi
zn>^5TI)r=HW^nCTkWp^IF!I5-^r8SmWFR345eWfP7h{{8Nt4hu@;^xVaBv6iGPu3Y
zDytWSpZ|#Uzj^XbV6_b6k~KQrnt9`j3@oAwm0+yB#l>tzM&%=`8MKOVzrr3)xnFJs
zGQbv?&ld_Q6-JfT3pg)2V%5Lv8TDnKWTy1=hD1{t{M)_jlej15=KoSqM)V*5$2{<B
z*9dzPr%?7+1+F6qS{L;+Ld8R1o<PP91MU1%Ea>;Pq>xZf1X?)PCMXGT9UY*IR((hr
zoYwRl@kV1ar8~v<hAr_=?jMh<z}^f_3(tt?mEM1$%03ZB0sp8Q$m%M~i@f!|7PW3K
z;pU~&n7gBC;(h+5{Bc5ay1F+QY8KWsWmE*26+07`D@vhe>U*4R!-ujoaE|pfjEn_c
zPhpHFP}SVpImT~@{o`C=0^vx#ZtV}S*m~!xnvHbk4h$2E`b)w9`hGS)!<TJZWrszE
z;y39n?>A7J%&czw!d{kj3jwl*YyuUZn7KGPXb`Eu^Q-jQ$ls>=xCL_F?Lm-Q^$SKm
zzKh#Sn9#i`-%Me<&y+EJitA(d!n=nT`o@J><Pz14Ui`|NQjDnc*k+*G#JNkBs>-b{
z<BNGmIC7WJhEaBgu<a+e9Y(L49b|?w?@sfQy$$}o99h6#4@-UM0pm83gYRyy<Y-!}
z%hREHZ;_zTot6Z0@#!(Y)fn!qp5n1X1D*I;8X|}g^?zZBI1uRfn_CFz{}ochUYW%i
znh*BlIk8bV-<zY;YjB=;X%?7-Z1u0R7t=oQA=E`s9jQ+c0`t6lVf3H#*oN7Q_UyVh
z(?u&NW8jl|st==@X|6rIy2dHqVp=5=4QBU=vw;uWK9!Ewe1bsgrNrXO&{q*uB(s>6
zB@I2(IgIi)i4GlyJToZ=A=Ks3mTkDwQr<)V7H6e5yr;G;h<`lW|9INrE7s1oRKYC!
z+O*Y_DcvVJZ^RKM5TTzx?OW%uHWLWQLvy<lXz&Sj<wP4Y$WfE*Xzxx+=-V{#w)m44
zy|J-$`h9;m=LY#c_;dJR)7OsIIOYgi!p4S)Lr&PEPwu1`{NU6^z<^@C9)46+Gt)$I
zh-BdHWhz}hGlK|S>r^YIGafV<h^5fe&CKl5OC)q1MX}-k)vkZv>r~u=pP>Flb%h=F
zWDd1Nj~3Cg6n3lqNa@DpZ3RQ+_MQ7~7Hrb?|Dt)1-A+753!CTBLX%0QDIZOk5^z2P
zmQM&p!abKKDFHHU=HU7?X8TdmHGJ?>V8^t_{UA_s=LoFsjKjJv5i|Xzhv*d#QZ<Rz
zruQRp8B^_G@)YU$ZO!Iv>-tXT$PX%VS3q)xOUJkp>7NcmL=7hn0dpMD_h|@_7oFCY
z2&%E8b)uQcYYPa%4mrYqD?ibHa6*vpeIs&Py2StBtA9Fl=Bil2%SNK%Y|FO&Z0dy6
zICCgk=3!ArR@1RygI3;~PfCH%+2~;`{VBhzaqaB06uQe{CYai2(4vtSLQ63eJaplr
z4x#JyRL%^j<b9OE9ySIQJB%Ff@-2oFCfI!qnK^*c7*T+eM9QZe|0aU;;xx6C*k)L?
z)<rjE+cBZ7pfKHN=be4;?=j&wM9m$X>8(<q$VYJ@9(qMQ=DBu-4>$z>rUa$JfHk^Q
zANj;w_ld~G<o(Az*=wrTrZir_gCuADa9hpRAYmiyc&0064fAg`@8Q^>r@(4bX!82j
z{1L}@Z1`<Cz#P&}J0YU9lwylqOH@LhBN|Xjs+^qc8Wk1Oy;G|>VI$ycsZwc@7T_7Z
zk9>BR#caz_WNi2E8YUEHz5vK~w!(6{!$cugtPC$(h{#*2+&+&~9~EL`pmvvosF&2c
z{#_Qxf;P5;ShTGV$7WswgwX&YeLX-rSJ}Y>q}d%-++p;(kfe6unGvUqc)jO>>b1jn
zFsE>pC9$9Iyr}kXl~1#20v^mfQJ-&c0)08?tU!Xs8NyF<`|c`z!3KN6rJ_X=!}HZ%
z!^z<3C65;=l1to1E9y29db8|ZEI9%Yi9`O!t4G5DtKA=?p!n$AFp&}*0n0v{@qcDt
zFpI=B$Hv)c?^{<Sry+8m5;5~y%l{m&EIHz-ma0-K(sXMKVSY4&MQ#}39F4BR`A9Vm
z-j5yNskt>tm*~r)fwv$}kOv_<llmRw0xns9k70s)Tx0x9G8m5EubqbXgjUt8ty=Kk
zQaBNqzjE=aA?VigWAHWZtQe7@dRxStS!L&@Y}W<G8!hmr$v-mI`xDxD4C=BnFlmut
z4E>fBI9fF9N{fqTz}gbc6|3jNVhxDkVo%az6<=$9I&K28SA-zb%#B&3;uUpJQ@bXY
zN5HQ1?M$6dn}zUEM-$d@YOojL<#vCzD_}+G_2%U7k=Bvi{YzbYLt9HtI+p~<G`2`I
zx3QT{j*)=5?dp&Xe7Ghgxt2X4<dZW+M#)PB>g`q=gWPFSUNb#yJAXTu4l{l)Hku*?
zCJ+>$W)g;jd-4uYV7rnfjNMqtX^!?s{Et%fwoXwz7?(20t<?$cf7KD>p@anX#pWm9
z;t8-%^1<kOXRHVjzOh@*7PtPYfe;b}1$<C<-?@0>b5C@~xwMlVXQ1a$7we-4M;qR6
z&_4VDdh^v0Y~mK@HY5tJv|$aAP2p@~#&z9Gx*Wz{i{18E)5q{#_EW<A%>L6iobx$D
z?SQ?skyzpKw}F=JH~NvC`NcpnjQgQ~daY$;YMj8Lw%M?~@Kj?8z2wQJpG%5LZeN&h
z>H7O5T|;>1w!U<=yv7eqo0|ZyUtYCH-^5ixvfw!%QtyX_y$WeZo=lwj{E?qSu{Q}X
z;~D;+=b-~8%C>&DI;DFAz3Po%5i#H?^2{SDzHTslMyICKGj-Sy2>;VoV2XKabf&Z)
zUjq+Atc5(twr%ZzWqSzJYKRyeV`sg-Tfu7o@;(g2v-s|KZkAG#=(5IsFI9~_tC(A8
z4daiJ%n6qMatwq_73G;faLEiR1kq}MHl$D<!meO|DwxX)d%-!Y@xz&?M<4^k$Bd*E
zvy7RtZMu<ZUN{K`vN$G#;skt?R*7BT^i`?klp7?hJ67@0A;oZHy1H_5ui8Z%5V%Hx
zXTsH#i`G@Vd(fx@3ajU|Jz>sfT{s#)6nOj^NF5Pd?HKi#py{`U$MUv8qQc)6Ebc}X
zs9;ik6HapWC!qT*hlZGe=*)G9+U@P;c<Px*QxA<odo>cSgqlHMLbz$F77VDavG6(M
zI#lMNr;H$z?z^ve#BghfXm}GNn0z<p?+utjaG_c$PW-<^(2Yj=h0K9>z53mH6|lcH
zhxyT>D#LR}MPn+0!Kr_tTTGE5RP7(aI`SYtB;;#j8JU8GZ9mS-K}TllHO4W#@SuDK
z1@j8z%zdHy->lA_RzWSTPOdjGb)ze0o0)&KAUL!=Lh+Tt<Qh2wYD?SxaH2u*-2Tmm
z^gBdj!)ROE97SSPC)`Pd-T8{}j+-aS=_bBvl%?yqD4>>b{Kn#CZe1c}T0@EcCXHH%
zjHh=!|L<`J^-&uxd51di!^~hUn#+o2@U4xYw&F#fh-(}Xy=5ynK&a$VZ&c5=&+&u-
z{(OC8x?6PCfk8<yw0lds&qlzr4Ya_5UuQJ1fQQl<JXmgQj$ho&n*w=Vj9RO&!qEzy
zaW>?VZ~Z1Q4;7)B;fQ*XU=n+s!C?EG9dpA(a=rP$%Dx_)&0{N2zp>zeKTF~IgQHCC
zFtEWHt%|xa?ei!h%RuJJCU0g^e1}JZxIh?e(#;1V$gzi2=E(NeO|Xb&5LKaMu?;UW
z_!T*N&AtzIA^d$jQ+<=pND}`eZ5UvaiZIH`F4k=Z&c=hRU2863OJUaP<zavm?t(j~
z`Dwti+j+Wq?8|C6{zAr*sq2dQB=zn7pY1Yl;;IG=N3xON{H<@9Zn6JW@DbMF8QjWn
z(Eb5OqQOiu4<mK`3Aejs`);tAp}pDV<GR@eZ4ale`SLU=rZZJXlkElpkEQ?8eIEI5
zXSyIESTjHQS5jL6jv1kU5Ix|ON3cCEvY4)DrT=o0YCS>|jYmwx&lQc_$s6x1Ch9~k
zXiA+^FNUDFT`#?Zd+t6JpxwePr|W$_I;}b*t`4272Z{q9E|mp#MppPF)N6djXv96$
z%d_x^rWA*i4d;3NL&_u+!i4+|9J$c|Hh6R6G05Su#~TSPBJf7yJl42E8iGZW{u%!%
zACF>Rhl4y8NasM{RMCjt&C!=4bHmFwnbjbNYX<eIS$|&DUn9lsKJ7f$KcCu#hUK<~
z94%HEew9)UEWxy*UU2|VNBDvr*cd29_4<3RW>%<!{tD06CmUl93CHOFo&uR8VrQw-
zoE7U457__4VvuOh)?kEb0>SR>QGyC05FXL56@SgbtHsMr5XTkNZp;(3*wgS>)a=&g
z>ac3?R>e_qwNbPiq(%G;?h%i!K8h9@lxmx~xm|VmNof?j&yu%TWx_9ZQtX|-VIw2t
zHP<pEdTwMDFH#R@`(ynf0PGU@2N8S*M#_gv2z+rB<6kY~ws6P-^10a{!GWD_b*gOt
z<3b}E+%^o(U8GtuD3J5t-p8+6^k0+)uvzB<m4Z|%PKoV$wrT@N0z7er25RC&N}QUn
z&yy&c`nA??1>T!jdS3LKX5+GM<2Aue11w|0hlgFuP$5xrMy!$8M3W#|FLs>3sot$#
zZq>5Tg9+<seXK;&vA)GnUb}8AvONXosJ<p4S`mdg_I|4?Z<p(;U*4?*G1h`_RitBG
zbkF_)D9^3+f_}{1x)i;1Gx4glso-a|ZQ4Qkvl4F8%rGt8$+wUxCvm)*b+q6i$=gBH
zN`%#ytB(9MIFm|9q}(ZV^YFer*1$pO)qZ7X7q?nUrJ=~cc!|Scdnc4#Q`b@qlqL26
za1ZCk9NzOKXw)VTLb6s9N7Od@p`3RUCnbeP#&Nr|cY~h0{@zd!ylm&SfB7??^=`_S
z>fZH0SE`GHI+ydhJ*y|o47}b{dG^k_J%BeZ^9xljU{A(pi*UVqCh5F>Oz#N(Y!*%M
z#D(!QwSf&E5G-7}Qe%x$N>0`i0WGMKjf$%nRdeQ~fz0Jg7y6Mu2E|{Ch0W%#w$$FB
z6yk?&(kvbvv^a=thvVSV5Mo@gG$T<?t{@laI_j#Zq)T{Cswse@g+OQwLGg+7(ZK0U
zt3^|WG!e;6<XC2g4L(mO-GFylV%+xz!S2AsD;M5v@$SrLg{h#|`HP(gJ%_q3?f8!G
zk{zXeeODWG*J2HOuFIiG<Wh>%ZafUHkfh?lB<%EmLt-D%G~@c8;3&?BRds=~0ad+b
z^hjUl<*na9iH>kc-{snPO(uB>>yhjb1I%FsM}>qXj)kMer<X|^cXe4qMTV4dEd2$n
z-D#tAnn3@w5-2DbX0+t}t)y7;enZYn`}^>)a|;DZaIk0_p3ay`y;(|C+6lp96Gs_R
z=mbm$qJ@TNTe`2?E-Z^be+dC#-_<!VatGeFvOBZ}Yz2X)g!<7VM|{6&P*KJB-bvY^
zK>oY?7@n&C&~{Y7X%N#g-GhM*RJceV;2iKe9<~*tP4%PX9yJq>*+|j`fIhV9tM9BO
z-RS0diuqqTk=`o}aVsP8dKhI{S?B~UVyoFhp^mh<Hk9jK9z4F$ph@%yK~~2Zy?)|+
z$$0H4xhdKRt5^~j{pJ>2!H0n%#$j$Nd6^?u@V=6v^vMy|gVRAGBKv3)wO<OCUD>TT
zf)lAvh^?79=cgCF86;d#K40AQ!?Nqu#*#%}wewLejHUikR@b<oB|3o5uMe6D>xP$V
zr&#ft22Yz+%{vLkr3DfVJdgu8NyT<vf`EId8sVgU;b|Fm!nJba?$=AOqp;J#SP~v)
zUpchKMOgkuGvat`l^8L0IFoi+CnJ)AT3m7;!o##Ao8o$+xeLs!1Wpe0Hf=Q9YNo@N
zdG4Lrth-+GRv_<ESGNQlKTq|FTA1*#|9&GbVijl<BC<hmc9eM?9#Xy*uW;qw$1LTv
zpY$u@u=!W9fwv%RC&qRm9h4VBP}hh?tq}wi<1IW;wkguvB>3P1o)xj7F^b9<Onp(2
zB#ohRFdOP~Q}vPTGe?pM_!D@HH<sJhYb`vsY22Wk)NIjY766uYgv#xNvQb4KHt(cW
zKhgH9N4BDFjiGZL+-5L(n%v+V^OShWYr-fw;%ig`K&;Bx7lls_%etnrODvdGRC<`k
ze5+_Oe2YMvDE6Dm%}@@XF|=x^KZtZ22%i@#@opUL1w%F3*-zb4Ir2aOI<*SZK`e~1
zeR$1#z1JKme4>HOO`ooi#iMs{TIuO<`T#l^(*eRvZgAi-7_k+7d2?Ov`;dz+1j#o7
z60f$;U>ObOlO&GdK~C4p7;y%^7+N5rNa}_d*Q-GEh?bXrC(q|lq2&Cfl_)q*=Ohd|
z=(Zi_O(qnU+s1F4Lwga(S=yg;)6`k$dt0Jl6w3amD4<gMAvCIT8i#ij^u0Emw9yB$
zEM-~*PM-RpjBO>uv7k2s!e~2yr9VbtYq@aMBBV};Xn$#?SQm*D8kH4Vcz==hy@q3l
zi>zcTw}7Hd7)^~^K`pM0p_?Abh+c@vN(c7ky;A;d+Ub;>S(iy#hSv+bzdOfj_SYv*
zBHhA5Vs{tX%^z=Rhj7cXq0vNbx{j`4Vp<_W#~zSsczTAwG3xtLVGnhwS1)5s4PGsF
z<<}1`qKc0pi705+E=Z;-IQE_zJ<pl`W~gA8+4d@4vj|cSF)LIN*#>>E7Iy4_a@S5U
zyeWA~M1@Zy>N=)ayHG83Ji}ZAjdt+%)+THIF#7rXzH=LQewRMZhtyot4`|jEr75<q
zhjltwNKtviQ32Becq}M(;#@BVBe1=fxl!zz2p+i4?#INl{C_ZCCzu~#dZ08DH7GVT
z7nz})+WL;}D8OEX(P88ibZE9y!KTS@&!{-1U{N{u$(Z#OZDx3I1p8g;QZ``50Fnxm
z<%MJq+I*)UQ>F3=o>`r*E2apWZrvCZ3ogd%a>tsgnEU@O;TZbA2=Lb^cQF~}d}k}8
z8dv$C)q>JHt}A^wq-rX88jHfS1cpXR>@M6QN+MrRl}(g$Gf?4jjS;v>jYwV<n%*Pt
znrn_@-c=&Pr%satK1LK5FOt*Zk9>5DCxs{FKrG(OGfMjn-TjwxL^M)lV}^3RQJ2^%
zX8422b-^g-QLVXJ06x9~U>{_PQx-?{V<1OM0B<FrzbV6xPa<LL1*gv0*cv~`RsY_s
zvdjyVu^lx6$9YjfoJ0WgAIjj!h7o9tz=h+FVwqu7+xGLA%Cg42M?FPAEbPy{z={)<
zvw>O8d^73q3HwZPXVCUjU)rSVMVhXtbw7YiE+YcAw6xH370#7OU*l1MdG+mLTrG*v
z@P3klVWEpi5v^GdL=eM%VM2U0{WKoxC=o2Rq#=VU?B6=6m!u9h0u?kRTA=wwT?;C_
zrnihr1P0TzBm$9G!<rYrL)ngwr82L3wXN2|)+qXu@~0(1i!kZyZ<&c(@5lUEaQ?U7
zd@gLZqF`wdWn^_Sf(FYb^y1*|WBjz%Lq39O?$UlgY3D@08ehFZwYJE_SPuL((w*0|
z_y<ctjEeUhiKvG6^~}EjHe*dh=friW;bsaDbvC(mvpqfI+1$y=bsllUXCDxVz*p=L
z)$mRu9)H*}p}&^kb?;|CytpCcju0wn;vt$tCw!mP8{YU|3WA+Q+_z)>*;Fa0ION{N
z%@roMFWg&gzs;x%=S2^7jK05Qa}6`dr*9@RR6gS{kC2-1$hRfm7?mq1fWO9N@Rmf@
z4Hq3Gb@J8fHyI5nR$EtcQ4j^-%ChN<2jKPQ7SmC5rE#uxnr3j4xt|KL-xv1mHQ3DW
zW)y`qi^brZ#1?8KK3S>pIZjMON2^*Yu_G^s4!pJeU;BLAAImCrxeqC)pp0t#@4*O}
zlES_H2a2ZBX35GWw!NO5i<40F{XqoGS%K8%B#;$0pTNhpOAOtj79N)>2O|adhued3
zKTb296HGl!{dE%S>bx73wE6WV?76@J6GgAQs_vx>2r}*pdwE_Jwwb5$p=r`w87sZ`
zp2F{XB6&KJ5jL_<S#xE$Db<q>yPu!x`t71&p307d-*dcyWDg%<n70I&HKfb4kj`5l
z^KjaCBi-cZKt{h^w|o~WM2maK_oJ_4e<-^Hzm{>w1)c(~Qp6vA=0nAzuI<Ai%~29N
z=x*Z?izFq^<qtcu@#ZXAuUUr6!E<;EB#<8bQsb;io(~ecCWVH{?fctFx72Y1(@LBd
z7vCp#+)Sc5M*vh9n_+~4_%gNxNE%)&?cbOwXfY?JC@^Xgz6aq=BYVWEDhPu^qjsmA
zHT<u8K9KZ~W9`DDR~^^MMIn)y`rFSm^F#wRRDuLfgBa3k9mG={iV-G3Gh7~hwq57%
z{4xYl`=-YrO}vECX5lub97uZh`}1Aq#Q5)$0kG;6i($z_wq!=e3vB=kf}EN?L|yuO
zi8?GkUIs<Jv_ESRO}K{x>J?fFZgaSwpc<ct5(oZ4%J_m82mXAw-)C-+=j44g?C_J=
z(1mtU!C5iF8*cS8gpe|5{UfxqZo+^c=JFFa7_8ZcQdik}yW*9#0OC1n_U%?w@FShk
zt7gbQ5#PIs*zwfZL?fl=Ue2W}ld+W-07CIx5@<^%j*-wsxh-)E)(fBodaqt|`%PX2
z*i;7@F`(Z4`<Pfux74fX!7{TeR>4C)2}lps1mS%O8**XQpahUAGbB1L&yG1RP8#nX
z1~g~<q(K>{2HN=+s}%<G^kfZ9G*7!ZaFsHjo~6ulF>sLL-=xCaY(*hz5GnL7Yn}^c
zIdkRNCCem-&bE|o!f86zo9yU5Uew>>Boxd-tIY2!+ryM=O7+=)2wK9DEdaZWz}p}}
z8?00fHx94^bJrEjg<^pQbI)3F-jn~b0z8w}s|_1)rl;vZ@mD+I9dR%@RLitFe&6Rs
zsu;~%B0$^S`$6EOxV;9YFErjyAPXz<Guz@AK1_k1I2Ie_%WXBVY5z9+dfH=2{&b=*
zG4P1*mBod*SGQa_r@6bs=d&mU1Vai9j?p%!AeC6;ZltapM;m@p?X!z?e}D$yjXrHu
z8-2v64f<KT9E@)4`m$_=X&DFIv4Wgvu}+9PSvQg$d=08voXz)KFm_8NhkthYE9-z^
zjM^0<SKt3|Io$Ir@C-*+nCwCXcp^CR$C+6TP1H^MNr}>W(fuQ0%GSU%UE5?+w}siX
zBxk4Oa3@2wbf^AB2|jJy8f<&u-DSm<wejC)(kR^4nSyi2<kBhI>v!0{X8x=oZ>f@D
zd9`3>w`ur*;ks|A?3Levy#wM8%9MOm@<Y4Hlet>~X*ea)sm>N=-k^Pyp?0|5{FnX-
zF?u99dyhgv%<iaVdB67;0PJybGsACt*5JRjpW{>-sn*ev`nZnEGR{_=sAD}mCBZh5
z(W}x>!;q^F9Ug^OlooQepdt;nO(l=v?01$#kEIesYcG$@v+8X3x3<GV(lr7bR5&hq
zwZnx{H47(UgLZmA)aN5QncHKE;cmE9mFfJri8R83imDw1$S2~}l`3A#Lo;a44&_mR
z(nFX4!b^J|B<$cVysnM!ue0qOu37DF;_Qgo+nei@@T6oSyVa3MxWm1zNWa&D_aG8!
zDXmRZgNXW%W*!V7->#=`3$>`%LlT%C(3XCbYO4?l5xd=81)d&d<ZBA^OKHlMUqD|`
zx!Pe&yg7eDi&Lrt?SgquJ9B2WfB+`28GM@t+BBR8yt{8BD{4{!VgtklYn4Ga&;3ce
zP(`Kft>CaFh?C=hAXySMCQNLpYkSaQ^u{{B{N6%##v(El)cV3hwY=SaL@d-)b!+>O
zb_YGk`%Ro+AYJ+lBL`@Kvw)L)5{$2GKs#s6fy2mAlJAoW^ke!qj19Jr2qwk2a`>jt
zb2{!OSaU&;7&uew65Ks49a8a~juzb5QrKY|GrG0Z_ZOO5N#*_75kqRE?N!9<Kou^7
zE2aTU;2DiZTIZ)N)cxd9SsmT=gsF6E8}E?!8V?O;X?wN+oU-_UaSvR*1Egr$DnvO{
zk-n673Dr+fuv!gUx!EDeDMqZ@I`xe)*7|nJzYp8}GVc^usC1p5Sg*}n39N1}u^0fO
z9H3zbh(##z)v<IsP`Tnxl8J^mMqR;``So0Np|E03H(eQ9VE`DGvLZj)7a$2S+7xVU
z_C`zeL+!;MX-m$X*NHv|jcg6Mc5%vbPH`saj-wuSO-Wvz%;^73gSe@c4p0903qru+
zd~~kz$BgGg?Oe+5DsW1q@@hsU=V7qA>63DE&NqSN1Y4LiPP4)6#$xl|Y3+rGVK9;o
z8eN=oU)lCIzeTtR<j0>;62gC6n~2w|5wltRUsCbS?Z9XeoMk+!lH||7lIly=ptR@`
zDo`Y+<xwM<;tKV23sRKKWEb@}yF;Rr54lXR#Qyn{Q}P_Z;Dpj7#cpOUy&b0}?ta0U
z<?o%oV|OB$WaQroY)z6z6p91jyVW#^H_knW=J-<y-xli#QWmaprrl;xR0zW?^iU|=
zB=<oB#!@oxl_QUpkBuDmcOJ<u(<{HI6LWb;N)#SvfAM?r;>#tJ@9jJJNJj;f%RXN`
z+DT#C#OxRH6@c~Y64i*@97q-lsqts={lRf$jDf1m7bJZ)WPqkfR=_?+F~|*v<qC7h
z8b7dcE7<VxK}`%w5#!kI6CCT{Ct2PG&gd7uK1j8Tl|BWg0mOz95<_mpzDVr9bDp|-
znFG@bI2@6)Ojt*+jIT^)M4e!CgR3iCJIg}*A>WF<32~=>e0j7)e#PPF=fUYLY?t5W
za3tb>Nxuk35+n^>V>c%vxxAq<hl`UIX{{04#fDc&wY=5G`W?Wt85B=BZB0i2(O%~q
zvVGw7Iak@=g9h2r`^gi!uHH=(&>rVr=&l#O;GWGLM#s<<(xfB*EwV&nx5s;33cpR}
zoYWr(gWiazF7Ru%DI=_E$5)U2qv)jZ2)eF20R1aMZWOP_BSJGTR#JFocQ<F4rz4X_
zjhQ*BrQmjyFcpEm*&7(!omnVn>jcVGkfR3MAXawp3<TI@2fN5h3Ot0InLzzM(ICah
zeURQdKI`R{*BT{SzM_5;Kw7_mxHF27u_i>x5t{S)Rst?PPWT772A3Mr-@M!bPEwiC
zU#e_lNO@w7EkKO`JqdgMi!oEPj^8f9wit9ew`bxvCB#bCe1ku;F%|;7=Po7-m4gn&
zOB>I=-qjO37WLq)aGXqBijpP2*1N(KNREElmDHh1k{TX>6xY=2O-B^|l``Z%7D4jm
zjQv&99p~`5Y<?R!Y7aSzl7GZV+2Yw4FRuO?*Y~3D-36B!v&Jh;?SZgk?YPLp?@kjZ
zYy&O22v0}98Gye?_nC?u=NANAgi?1GPS9T|Z3XLKx-c3MRj1qfWLc!@e)Ox#Wuk9i
z9T<}x*<;JWE|*=zs-Hav<Quv0S)=Q!c`*At759jS>d}iRz9~<LrO1~K><etedlXa=
zNoJe)KEH3q_zgs=Fc;Sgx%97`wBgtk(Vuwn#oPiiQfn&|^8!DOh><{?rKiCDfxO$1
zoV4@^*^iL9o5ItpNHOV|Tt6&ff+SJlGA(Q1v!%6M`ZzmLR;aEv+t%@_mJs%fKXqes
zRrhPDR~L_DecqNc4er)@&XXjv)`MDbk-x&{Eb8N~i^Zf<=5_#j>s05V?Fp*4cZUA~
z(Y&k`<)^7ibubpoXdoaj#5MKO(A3e`h3f1^soE@RXT&fSmo$yh#_6Cm5sqsDUNwvI
zP6*)N-J8G~tj%V%%ny(E*sS^6U5r`o$|xnD6#skX?tHK>kA8O@Kc=XgjAJg)3?&|*
z^Cufm+)}MIZ>)MCJJRmadw0qJmSR5hR3`89&2?XX3@o$Z-?hk6@O+&~Ek6pSv0wX)
zKFq#=AY&fCaS~tLXC?tnQXPEG{V3tjLDpVWua;52yi2Z{tnmbPc^amc1-6DqUWXs=
zM!1!`i1^|xnfNMWoiaUj(3U&SXUKGsBmrgjStW8md$Tc)RfNU1w_n*O&<c(o3m9uK
z%f2%IB_+RYWOYe+JSVrdsi%ny0z-51vX6{%t@tyIlf)(GGnBmm@lXU-j8g7l9xgE?
zcOwjGYE5IHNuO&!dSDujt}OB4`hx8tuu9k2#0YHM*q0HVGC&^XMq50_Nc;0aK92T$
z7DkMeTcRvt0&8%!QmqURyVt!333AhaT)qp6-k>r%){e78<mSt|kFyKYcC_m98tE0N
z<DI4fvdkrf36PWQ!LM1ldj=%U(J~pZ>|CT`fka;cniEx^6Q-SEq)2lrKx-b$bfQ7w
z@`RRjgkJw_!Vd`mY{}phFi`ckMVz#I51a-3ENr+X?30u7Wi|)P6HsIDmOrT2@f!jE
zy;N;*AKpxzO)CTb3(?e7XX&1jTla;NczY`SHxd;3aw!_a=M=$`Hc|x3lMD<$wxCcI
zHh>B7*|e{!LLy50ZR1@FHa)A_XtUt3?|saI9tmzM_6)RQ7Ba_yQ;Wkhy5oLoGW=R7
z{7G;`-Q%7VRKgJf4N@ilLxzIVXC4wXX@0wnT$SCtu6oGG$}#Mn6`Ztj?y!)jK<)lC
zn_%NntTl((0;kkTD?|?AU}e9c%E%9<6{{#m_6FC#k*x-h&MRvRCaA!B@J81oSeYk3
z_pjG}TqM2Pdzj2W9TS9qVl=`5zlsEk@Y>0Wci#SuOvVP%GJkon1}f7KH>{4CD%XF(
zvR_$C)-qR_s89ZPGB~v*-aF&l_*sQO6z&2k2uB9PC6sg^wxU#Vo@aMNg(hy-yGd0)
z>3b=AZq#%lo3cslE9qzFYws&1<OYlyX$xWWpLxMq<rt<;5*nnn?GSkq$4LP}nVBAg
zfK00*<LKE@(-7!X%_vAK4jG-f(#_ae`PybkoyO+EVA1%ZJiEga8LnwXDLw3^D0oMG
zScmS}BE|5W+W2d9XFGal34yhm@=PfzTEgRVINfrYtzZ`eRmz%WujaHi!5>)->Bh(L
z_fHjo1-W|5EGbOpsMBB)N)B!S#9Lr?mk?F_v;Oek6iERr>zVRyl1rJCJXV>~FqPM<
z_7iF|4NIzoW0oMnMz}K%OABbK0dq2rltl8ei^G1@(9Z|&vo2c^sD9;~V{~>N>3Dnh
z*oyft_e<FoiaFj_j?$~TD7iouCpgj${X36&VE56l=Spj2x_qK-C-L`SkeUUb1C-P8
z9+7<&wWDh`x}5PZJXr8tY8J<fubJRW-|4^cCLE7A8H4uv26maT`e*zfh*yD;Ud_*Q
z8;{G@ba|8i)ZF9;1l-MnoKpq=Xrr?tdc~~&A^P6Q#F0I`Woz*q-ob?*#Rgmjbu;c)
zng&1<-ZHHyQmuLGdpWSKRv~zw9p!h^crTnF|2si<vi4Ag**{UT9E!JE#5NDafj>iW
zG4ePsh!D*^gk3LT`oeNJxI-bn#46JxI7V{S(f#+8f2cDe*L>xF6EqA2iApy904mW(
zWD$nzk!|8TV|8o#jJGD)OoYkU8I2U2WDFZKfjUIqphRg&{uONgi{V{>^A_#K(4_uU
zC>u!bi#CI#M`e-#3obx7$GPNTT}_Y{FcTagyl!`rth{j1v;y^4)<E6u5644IjWEu1
zOec$Ol*ib6*I`BNeiB~O(lrcJ$T&$wsFwN0TWK?g%w5lcU^r=r`jK;pnJ(V#SD@6^
z=^$lnMK!$T4M`Q#zf|51tDWx`NADFc{m_?u9mgvJvN)>ik)lsI^E=&9_VFd>%kA))
zxiMi0ft567X%_soo(4PP2P{4URfk=iL|1n|2E#v|wRTpht8s(eryG2j#qdHfRqQm2
zu#1~N1OQX6X{NB`FfNf3b+Lpp{s`4tjS@<^Jnft>YsX*8<S&N)k=9|>QhqaJTv)zC
zdd~NtxI^TTUY8@ZB<LIRS?Bs$AU5e}9&XryK_V_uyLM*ab*<=KzR{jiIF^YB%c@69
z{I2<z21rE%dZ6O+Yz0M#ab3o35x+DG#6-hN=Bm0$Kn}qwDzJgjtB>c{w6l>~U>q4M
zaKO)l9|Jjqaj_u9Up)`)^C`G1JdrGP!EWUg`!F{h(w>di5OI67?a9AJkS~M|XQ&W6
z$(+h<`Ccei(UKn=7(t=`#gLj`!m=AVAOR{HLytf2?ng~^<S2b0&Z-Mm=f=9x#@DRt
z>5T(bK!5o~xu0yT&hNYzJ-8nZ%RfnH@hs-NSIdj{<k~bUTsBH7P#0<N@r5K7Fj=^Y
zhgz4E*?lQK5%|zx)`EeN-1#HEGn;qHeMsSUYtD@q6~SpBHMLCZ%)N{{tvxg$ulk({
zRzl!~jU?zO{4zsQ6L`c?&^$x@Tv(IcE%`JHkDHa`6_w3=kb(7DFr+TE($$c})Mymp
zqa2WTt3h9$+`|0L<0KTSt~cMNO}-X+lvP1b4GI*CdecQ*d>Ii;09qZ=?v^*`Yp~Rv
zkL8^^e$b$HDeeKCgi9c+lH3VCa!6H)f`SqUT@Y`z23+GI>J;-I$8w_knBc6F3*xNX
zJ={iDd!ZLA=hG|4?Do9iolEEfA{}WdbYWq#`V$?$g)0DSWy1+U7HC{gb{jV24LtvZ
z@|+M8@)oahC5g^4@(D&I6){d-@`lMH)r}&+_r{yMk<(1|`+^MLDNklw2h2lGg1k5D
z+;o?UCZ+m(bQ6a*#p3O^{Fm1bn5jEO2ddL1a`P=z#~+Mhg{dzx_k63i6cvSxW1Kyf
z>@cc`@h3Aat4fO|3{F*;(xjcl=iSG$kL<NS?l$^+i7mv~tBC{z5D@45`O6I}afQ7H
z%e!Arqxo0IP&c=xt~S%!9g@NrY9r@x^eF*HqL~9j<-vERT1X9(MmKKyhq1bFs}(p?
zv6J`|c@4JqJ3epS^sqprpz#{eN>F}ACf~c-lvEC@_lc+0YI6o=#Xf_V&z~A?Ak=~u
zN;e}_bh;EL_m=Q(O%YT`V=h$<{+Nnrl!%&17PQsH&l}!Q+>4>$@Ad5zn;2!MwI{-x
z^^`HyjDMvwQ5CS4^MM7{9lyYnp>ZCHP<wb%k!9V{i_3Dr9vTMgsk0{kn*WJIs#f}u
z&d+#z*z;OnWKhep<@;;Qv~}`g(MEm-?~qOc^#sSSatFC9JWi_1fv!@raqLkvS6jC;
z53kpRRP`o&>YJ7Bs$6UB3`FvP0#V=%npxQ~&^Kgn)sTB4psoTX0uj0xO-XK=tfr9w
zgiWJG@~nrpnREnOAewK`LPACOG8n+ajEr<f@?l|oe33*>aS7Z4E&w$+oH87UX@Aqu
zO0EkE8u`Y-Vu)FdkNy*dl$Ct_*ebTb@=mydl0Y3o(wc$mDtx?=6-axB`E2on<-H?Y
zf!z5uO;(QFHobnNkEwWWet`4d-9iP*S%D*jG`Q$NA`eA@UZ@X#n=GVnbbry2uy-#~
z@>m2OiACNwSa&adQa!U7%07#>1B8l|6Gp4nXw-N;$M~N2`lkf<AAY?MxamNt2u5h2
zce$YQe)DNx;+T52VXxvVOIMjqK|ygEdwCI3Jh=&?G5QFSjc4b!u^V^5oWuv|ocx25
z3}#xJYTe*By=N4JZHF0x{TaCY$TROWOwQw1kR{xqc`ZVt`{P1kb{ca4Q)@g}T?}}@
zq$$A|Zm%K3CjSy>A5f@lQ9XJuXMXI6&TP2W(lTwD7RJC2EXn{*1?<5N>@&qWC9BXt
z+`k%9YjBjpbPXp-J*Ivr;n-ea1S;?>lk;VcYh!~0w{BZH*x6ikhhJd9+DV^?HkV<5
z`p4C=p<Zhwg%;!W5|ajmT+A^A{FkvF3HTj%$@Leywt1j0yY$Z-wHaJ<e^Pv0-FPh>
zE2+lYorDQKxl)z`+{&xU(_dT}2SwF#+#;-BLFVR(h0?N1H<uJ7*Zlh}azkEPw=&M4
zs}Cn>d78h?P0+rAHvP`UW-+;oa>a`rMFK;fa3h@Wz-NOG_ivj@5z14B7c0kaPCq*t
zeydUjBow8A&WagVab4ai;}wD^{sulQ70|#3{$etWBZV(vq_^R@s!u55OOWp+C(Vx|
zue&zT2@~wIa@Yc4!E*T5r2cFV99eTJ-s&7+WI*LmLe;<cloS)ojMwm_t)r^_f;&!p
zWZA{u)(%&II@sO*a}O$Z^xm2yHDAYs&U>yHf47hEBG0;fi2f~B84*Z5e?b+Ullpm?
z+!&k)q3CNp^7M~IGj$lYFHN{qs9Qg<?#kz{GSIKEIDeYELOY9^;Hc9H^nS{$XCjnh
z=FG|j@txqnKZexTjW%>Rf)ZF!Ym!`etS(!>Z~2@ujF$cq8>KksU_9PTaY-^?$s@hF
zgaQ9e=Q)LRj#LSG+*mX&<IXUkT^|}M_bNtY`uD^&4BjR)^8C%?FQ(}3o0|#^7W5*p
z3EUq&JL>{<aga;VH0!h&T6NPsfA-6pVE3CclJPYo8Wzlq8`kK5&yxI{X6QrQ+T)t3
zp@$T?Y9gmPL2{JnmOh?2WCZOk83d9f1yl~7MN*82R5|zm5l*Ul@(n|r5W<neU$D+~
zkxkv?W#&&tqI=!Z*xw>6_!qJT&nFPycz@+q5xgWxLsX@qyWnil#B&^W^$G>LsvL0N
zACI`5Qn}JfrrzdJ@=0+;6&_4?G;w>{1$61l@X=^L=Q(&$8Y)xn_4Hq*f*u=N!Y7~p
zAOX83O5&5c8^)|_vL1ZwI^`jvf0WvsBk7>^X31?TvZI-l(FIdAaD?&oeM81QY^<3$
znNIK^L52e}unL@5>NLPRx7^x#gXp1-(jkcl&22yf)H9v3*wryO4d#ef?9fl6DHy_e
zHb(;Cmwtu6=J}cj)Whl>uYsR6G-;9Yotc+4NGw4aILb#Ns})(C&KPVb$_G)|XXy!-
zt6mlxBag98GKExeJVQe4=j5Z?sdaK^Bq1Eua+pa%eL%W%6~zK7T94<E$|H@p$d?k9
zOCv36OZHjE?ux{1VqhK~i$hthM%Bl~5Yglb#$WB?LGgfrVg6qHoDY`~MX{{QoTHlE
zBwz=wWc5Zh+0>*zg)|oh!v0hra28=}@1F-TN&z1%+JDeIc0c$y=~<I--U<S?jvg4E
z`(Wo+=1+giK)OJ*W^ES<K&6KoTp|-gJmp~bZFHb8&7q7>?N{X>qp`~*Oefc>MBcrX
zN@7?8Y`nmcCjD~fh*rrr3r~pEYxj@G)L_0fh`OIZ7V$qGna3o0&F-t2epIl<JEdVM
z$szVaQkCJ=FgkdaWA!_JO?Mm5h4=|dzNO6XF$b0GZcB<9G@M~)^>7XS`~yin3}m#s
zSELe{*zHf^Wfat~(w@3$%2{OHi<<pMC3sWRUodQl38nwc$+sqcN+&h->tuxxxK2^w
z6kXKi66Sv2+smDGIJ(ioz#jpIt(U0U6+0D$?eMIvn1K(qi3R?ExzWl?ghOoN(4+{w
zl@gCO4wem{8;8!;<5O*fPo+bL`Y@)D9NkCf3&nW9v<`wH!@VN*1ZN0P7~*?UvQz|>
zCk-X1#gPzC2J?q)!q3sGCf2?IPtg7kBS750a|?`<lgjyyE-Xi}!^x(~>vNLTr`Fy~
zV6DnGGTdyVqGBL23w8P7e?$?GrA7nXSZ!Yi*1|;LozC(;(Fw=5LFpV+(QsU2gTe+Z
z?b9&Bt+Lp0RN(;y7v5w3k0u7NoBmf)7QmXpMlu9<7g4}~7;p9j<2C0gxQvIhU`;Rt
zP&D*QMMNsC;)%DPZ7u7G%!#3YSFB<g3Q6`idQhW&L_(381$2qZac5F_H}k&PU_>(w
zC*v%z%!tT%gK)H!Wz(P(D~DG_#n_|Zc6SEYs`P&1GGowRrp^0EmnGc;zJ3V@FvK?(
z+#sJ!S$`pAVF3NcV2RJ3hHt<-I<Z5vNO8IWvf@X6inFedT_z|}>lb<__2(MZ@yu%&
zC0{eA{x}?J;yiavfX3r%d4?*uN;Lu0WkT<|AH{B~66RBTp&zZ^50LS-ais)aBAa=z
zymOsgd@Bn!LAB$hG4VXmK@Wn&KJLGLb~vtrMBnb1f3p17s}ecRlY){L5&?sp(_>iq
zjKgYj^Fh9x2}5ZvUi(TvFk$Jp)0FP3ofhwj&O6KS^=Od(=K0JFZNgiiagc*8iPV#f
zsFr7(SnN0`I28=7kzG#xfEpL7Yv!PmQ6}qSbtS&i*}5BRSLuJx+9H$Rh8`(E-NyPX
zsmK6#m76J|jX7<WZuxlHIGG75SM_8^Ru`GXi{@!x=VK6)BC8X{IGoa)&H+c9nx|zz
zEgmJ&l6GYWFGqP4EI3D%AqltiSZY9cCZ6$NjRdUI4}is!TjoQtEa^ITjHo2fXF<5X
z&2hGQjugJ`vqsk~%$Lt<y=z}Wv^|lsG&hp|Ylem0k92u_dLa<Q3=iGmrhq+(vhe4{
z4{?m7pn=0#(&i0rj@Hs_;4bL&-XM-@$ZCv_Dl69#<aN0<IgooK=VnvQCt{I=&_h3L
z6&35j^(Jlv{07{r1%a<UE!92yId<H!8&Q1wTzgzjk|=qx$D5eAXf@mCEQ>3|;tsu$
zE-%~n+Ymx?Wguz;Tq{!|9fX9%7fK2Av)Ln`JMla<KKPy*7Xx8TFCm%6&q>kTW#0&?
zAYG4R_SS{k0YLIj|83GSb8jL2%HJ>Hk#QR&@J2ArJ6CM9B4t0zf<GNLS1tR8J?0HU
z!`2{`CJ6%zcFXh%ffYG&dpnd(o^?4x(G*TgD`sx!7z6eB`Bunw9)#{CR29T;8)#wp
z&Y2`KJ2w)U`5}v}ZY7=i_tjMn7onS2PT5fcOB3vVanBYF8Cbw7Z{~zcj7C3w!(sRq
zjDlO`OVBuEb_cW)wBr$)7=@-slK6ASDkjo`oi14a<as#H&Mz@_3S7-Q4U*wunlwp?
zQMHr1t2L)qM+ZEx1#g(mqv(1ega38-Cn+s&Z4I9M6g43Kz*Py)Z}PkEp1@h(j@sM?
zUB12Zx6d+?mbYe@zk^fyoz-hw_^%nL<MTYqrNH!y^25bYHkAHHiu)eqb57fw0y)#f
zQVqogUdn#K9$x+q{V44#-vp~!Mpcdi43<qE&o#`~0=T^8$eb?n=}E@AkJ5>~)aFJW
zF~e|;f>p_CdwV|k(qQ+i)?0Tt$%aZ323bB&xh=JCiCZD0V3?1xAcAn3_&9y+(q9ZW
zNGyGX@kuhDD^@sLD6*^7mO!=r{2=<p<UU)=h;V|FM>AxKatIj}2db97Cw%LMW$4t=
zUtDpdB7p^39`hQY_oUPXovf40J5bQBIashcM${#CW35B-s9)Yh5XuAWTq5BBL4r%m
zK@6uVRXh3J7ALF{xU@>>>Zcaw2A@%G^Ip0+_?S~z;h*6|O0F^q%EJ)ahL}FWlHfxp
zPkOoPX>2Oj^Vco=YY~+Ub{UJQxN(}qH!-%bIgh2S?EnRAefc0p2c={aZfSMs^Pcnl
z=$`)Go0M?JMj^Q|te*Wp3s}O6XNlw0CUzz45sa@`O4sL_Z+v}u*IMc;&a=xZh(!V!
z0CVfDaqizU$sk~;|KBW`R19s!A`-OPBhp)x5uo_Ns4}M8py0LTx%tgPU0~wIOF6_1
ze?9Upiq&YKAHt<2n*Z<NOqtRs$8_R)3cPpdE7-F~PZT+H0KGYXZff8Rmi*?s3y}&k
zm~X_RCk_<6#<lR)5T??HT|9oxhm?uo#E!C~vB<3oT*KsO#V$BI>-hyi44i<p(0sB?
zqxe)vyomN0inZBwJXFLAM59o~E5=2>kE`;Bj`}$HVQRZmx3i(?gg$?`C>Q6)Hx%i;
zl>5{t{eW*wc?o1~QmY9|0$tfl^`1jb9%+CBnVh0qWEPzzUUL#9^Y{yg8#&3s`>drf
zZJPB?xu#)Nt3zb*)6re6yjm)6KdZ3LwaMk0*XHnHNldz0ExR(OT|^s>b+n%ymo`rP
zs;NUi?D2&n{JA!Y?_$TUu#pYRoe_hP8snip1o$r5`%VwfnJWY(cWdK9_G(Q6$PF;x
zUVh_Kyzd&rIM!eb^Xn*DXeYtB=+=H|Os_r-D#>+&vxEU!cjbOnapZ(lvp(1UGu;c8
ze5w??^f`4J;J;}SZ4AC=i6<BLIVEE2Qa&~R*e+h%lErP(%gN<@g8OZr1kkPAxs9iS
zSg*rB3=7=O{yEW~e?*_M^q8=*8%V5u9jcR;1_a3xZ2c>hPya^Vvr?rdkg7{uVkrWf
zz=Gc)_fNo|pJ#;XZn$3K5=bN7Z~(MQpQV|IwDnNCG;*=m04muF|K0Ru`yfVsYhCBm
zL$CBC#%tBLu5hPOWJ#?IEX@<>Om(~gl(t|`NKTOB9}RTw{%9qB|HylcA;&HI4J~qD
zyLK0oP;MT@MGv8rPyteQ(~-xD{G$FR-j#KXC&AH?6!>3}7xdPN0DI6nS?Wu6X0cfr
z5H*Rbw8hd}Mpd;DL;?(ns28@#@cZZEi>#2lrQ&}^lmxRjgy5&DVr;l+#LF<O$UYU9
zgqI{g+)?2j&T*IM>gY|ayy|4R6?rGHHkZxj;XQuZVnQ<0_0|o@kgDQFjd1{?(<B>6
zImVj!lejd8)**b4?r~P{CqT?;#YX2o6fd1?{5Bg<mWs0s2C!oCjX0B3lvH>5<e$Wl
zO{IaCpgS##ZRnxMLsmI<CDdpjX-+3|(u-e{nsAAe^PJFU%lhz=It=(rR;b@Fu6hWI
z<<=rtvv`B?1NoK0Ug*2NMowITsq<x61wDc%(!uyRWRT;aSfFx(iG8TLbtTq)C&9~j
zkSv5!GfsSS-jFdJWh^+9ajY{LF5l)rc!@XuL}j#}#jlLC&!Y^*!Gi?Y>n3gBZdsw1
z`JR1?HxWB3pf4Us<uI;7rNEvL7Eoi!pBpR9!=s5b=z2I(!E6bNtqm$IXKQ4f{#HhJ
zBbA%m`p~Km;QUspLeu6Xi-8(xg@Eh8j<rPo<b|>lY0*&H7aT5+Jx^p~?H|yp>3rw4
ziTdYw{wRK&u6rw^8j&6a74gK}zKm<{%CUI1%STvrttM^i&*L_vX6S`>Nls-C>sW-L
zkgR2P@L^mR0CU6Ho*FNs3v5hl+R1!I0nn3U^OpZx4wLG~R6<xr(NdlU2|=RL4NKn#
z!Jl~b@fe*LB3p!2;?uNRsMm0IgMjY`e1Slj1B7b%m#pOMT2Gx;6NRM8H>3q^;oLjt
zMch-g;EU70OAa!tL#|MVa~}C)De3ucN$28zrJEikx_eBWD=}iS>;tsYmy5z2JD9gF
zL{1I-Ua(qCtUy#=h=oIj=>Qn()~zBMB-<cBG<4~O>Eimj;=QXQL-PE`F2F@7y-HKU
zVGTmKy_Kwd=;91t>10WaU|)O!RN$jg{{k5-u#7km*J=rqL%~UZVs!vADz;k2WUf1h
z-sNf`A96N}b*$&`GaK|E32enJyc+R3S9W?$#Xol9VO!e%gmbM&f;_ykeBz$UA!ydT
zq-c3pBf<CmD=+cpOXU_jh}-+O{jPkT+)jLbYaD!d$BG7>1uPXlEzI=-Es~{yjTAQ+
zW@Xxd$-tiNsmc<a^Hz4<^X5GBPTKb$)lYm+CAwNDZ36AyU9WFv_QE!FquHIWsSJ+3
zq<gj9bM9z!mFpUEBu{2mE*TFxEeI*f*%uLg^`c**_^*j2VED!+=0&NNL)>p5h3^Hs
zAnc>6YMExyb&h-flah5I(z#!Lt~(xpoX<1v(P06C0oVGoWb21OkJ*?kY%fMQ)?`E8
zuCxuBnpdw2NKnD<c}cH)tStUW!m{nW7pO;q;Wrj4xuzd{Y>o_&lvL)i753?}cE8-m
zsYUE#$sFVugOyM`hW=Q%Gg(ICR~ulOQkICBc^;6#j=z7tOvHT`ZZ^Qt8S!V5lTw(D
z110|0vy2f~^o5YR!X0vjr18ke4ppMF;gQz9{RS|4=(gt+EBKU%4IZMSDpxM!4Z4`M
zsXhX7B_ku+h%2lOh+QdErt(#xk)rH-NgRFc<k=76N*^ms6>f}{KS`ch@%pFmfHnba
zeJkp)cbw;|u>k8#F_&%97d%&V;nyC1uEj_sS}G%$t&Q8eRj!wIS44lM=DIGTDBJQi
zS-HCc1P!<{+Z%jz^&H8YoJ5{eLs13%nI^DCJK8J35*`(?qXbvvll$y&p_3K!22w|n
zy_(IQq%*NaJKLabsN~JL9b`xX_N!=ZIV;k7<9!+wS1kVj=w0ByuPVLBF4}T+DplNc
z@c@8r)>BcRxjy>nkuP+&M+8xkrHA@Li~wq=C;I2LyXgF6Ox<pWjJ4%p*bJE)%j-Z;
zx|wg2>Ypqe^)qyTB}tq)mo>jp51bx}R*u6KiKhKA<2=2C+K_-aRKFZ^R)EP&r0PdZ
z(HvB2>yDL6%{biZKS<Lkb;X}qjDkBu1Qc-ycp37%t_&m9)4c*cDtVm*5k?tLl19|3
z*hp`>5UIuK26l!&9j`UsHQI+%K$or;b}i)88_o8CB&ZPSBG)B^hpBZ?un*c+7ko4}
z>d&S;DHnefh{mRCrz4p`nYS&nNIQxKdY--q$M6OyQdE>1&5p?l!NXexeR5T=68t!e
z%_MGjk_;COisEq%A62myn||Ze`ni0_JkOUS%C`=Nypb5c(M=3$F;|by{7>Qz`Mjj|
zXD~4)N<cF}cKf+S0fVpaCfM<-?&ed{PZl3t=qxHGG&eSfyrS~X_v>h}dE*dP-uj4D
z`gn|K1<mbfI7E)Uy7Qj}l7hJ#m@QcCWPYNT;Gd@E&ELB7Ebx$x*>)31<Im=vhHd6<
zYhR)dQJ>*<L$)AyFcx(YQnoY4p5?$xr{;9`7%S?sIatJS8bW|JRdW%mP{0!IR&(Rj
zV}1o(v5TtO=(|^Smd%+m)3k2lVF-+p4tkMdW>}GjWg8x2t$Svh1Haj=_M{V!@)sko
z;ip69V;%_0uo<kgRvgdRv6=~3`2D>{QWw690<!iU-k08FwRF%bF{xNr>BQKz(U@^+
zQOPO)AJ!c63v2K?;oK*OD?Y}XD^^qdc3+=+H7d4ONX9c^d;un&{T$GJeOsFGGzYDB
zQfE^TDk3M&Up0_(jYNAtqsiW(BbZ|bH<T+M563B#BF|y5S*JXy&U+S>gmhq2tnpS_
z+}LggatC@TF5TJpku@m$Oi>mRXy8^59V8^yyB3EtARDK+qgqI9^gAN!ro(&uRHAnJ
zSVKv+pWV)lt%k#10Ex{hg>m@;3eRC=t1+Min<wroU0tO0U!qr4Y=W-M=9cF2P#-8D
z4=TkU#K-cg7@SHwlKsJ_)FClsn8uUi{O-JUeqsOqe@JD%mreBMARDN%8R^IM--<-b
z+Ic=?(+a2|o(lW&GcD{|`!Lio5QtwPkUwB?M%X!^64+ztRcumQD<vu*|CA``_URnw
zOLX79ED}xmwVCZ>>-4AL$Z?hGFDQYU6KW~DTw7(oK}h%ODD0Ab^ds-9k3D+q%TeDZ
zoewN9@R_#SkgS$Ib!V<5wGY#Cx*9oi-vj`!y_?L<YmO!0&{3N1aN$$LciZrl9gvgM
z8V%BofD_H+ADmonnwQDI;DwqrePP?7f9)U7hC}<(uZDgq0Kx*!P}KRXmn%p{bCO=4
z=6e%A65YXAX_zpKp(OJSQ-)Npnbdu@m#09SX<S$uOEzZgeZTPHTSI@UeT>b#!<%84
zk~^ClC-HtQud}B48)CF8CWO!aAUFw_KxGJ79hK|)N?V%9GUAsPC*uo0a5C2%7maN#
zYZKZ_x8cBn{E4Jy#O-*4HgL!QM!-~xbY&J&@_UpPeZ}7S(S$kSsr9WLVZ8!wyT!ot
zm=6r~rqgUz2_$z<w0eLMlkwnYe>`0pYvQhy`Tw{jy}WNW<=phXNALBvRw|EUY8pXa
zc2GC|BR`dGeS279=lGbpY9*!YST$96lMhWr^Rein&381pU>vsY@m&KsMv|bfX-|nf
z4IE5{{-*n8*LuzySJlt%M&2ZrPXE?KZTA6;v|eDGV#5@vRgGH|d|L2vzq!$$G|evd
zAANLC!W}%`UQsgxq9PpLY~7H3UZm;k^eaEv`#LF1=MdFspW}#luaauS?CS#KbR=wI
z$l<VEE)1<!ZSh@Hj6}_>gO#s=<`Yn~X|dtEQ!uTU8>eh!At!05#FQ~Q2x%?}1d3j#
zmw(V5P^8TQF_@g<G!$K|aYnAEsjl(+%L8#(VE0cmA)>|u?>(W3Q-Z2fRVFmmZ2i#`
zCLGH&lEMzbs-M`tLPwt(`UIDolmIsYkY|=KD2GRn=kU@g`%!>@3QhVv>QEfz^Yu?0
z6<&iS7+Yw_aQXo{Na;t*&@M}Uu>Tu?TkTBy*F8lvPLs=r2@CfZ`rdD%nMMsrjkti{
z)XBd!q7$t;ig!$WDZj;2q5zTOCO?_aJa;Ap*I+04yq7lO%okJnGBN-m2#|$4&iOZW
z2?(l?<AdQcA^lEr0E-mb7+bp(H!q@(3~!cNTu#T}8)ikIbk_pUeZhuCAm!unMO@WK
zZG@PBq&NNO<D$+9A^E$_CGVKuSYBH>;&c~5utXT~z1CPavc+0Z8%(!FdMNa~v8+b|
zhfUnKcIj3v8`z=}Gl3Wh%}ZP>)$J@(O19?pJ0r&IZUM3#RRz}BW?w&^nX*nI2Z7f)
z)Tn6}b(v_Hc01}qm+H#mGMp7waABErTz<!9WFz6#X=WmL8M*W|)16=bdm<ppAjN?!
z=C^F%{^2Zt7RMv9(8_oEgUFvfhuQROADXZ!^i7{bVrWy3=cwAsDSH1f$QkTPEek@o
zLtQXmw%R$S$usXEo%~ih!x~y_20<AFtOuarZ8^qvn-()kPmduCxo`72_EFF9ACB>z
zJ_o(fyaJWscX}O1_Qxw)PN`bdY>aH*)%R1OonluEw3$nRlJ=n3;h)>z*IL@IVc-Bz
zY4clL04q$H(}~%Kz}mF}X_=d4gRf3xMa_)soj%Tke-*#cvKE7POR5?&jk%*x;+f}^
z?~_%0ASAwiB*~Le(=uK6nc@$9=ZzOfi_(h@rcmv?z04@z+zk>C&EB!Ap`x^X)BsuB
zNsa+SjREOzmj%yRQJ($;?Sx2UApQE0H*M<aqhI%A`jJ(^u7f{aTTj)tmQ4u48LJwb
zp)ZCEA;HVYpn{tClAVt1iO(T1d1N4!9F5GUJS6p1L2@xzGXubH$D*(t#iGsL4eu-8
zkk(v)JYjM^T{`YgQ@a3EX(^%a<1H^bbd5-SG(ayV)_M3r?x&-w23vVx%#T2guZ<6A
zIn&4-=0iXNS4@ELu95#<8ICZ-_JS@W{1R$8WXvRv-j{xrLE@<g(HumFlsHV_5r2^s
z7Y;&sqMXJ}u0zU%oFkzh)f5LsYU(tj`GPa?#4=gpY2J)67*^@elm5O?$QA5*kQq55
zarOGfoKdde^$}Oh$y(oXp^*({Bjjwj9jT&814$ouW>^BkCcBblNe-#26PpbZOKaFJ
zo8dNPRr|ObE;pF8$Go@nEgze`{m-Mo{OjM81~7^XnZq3*?Q@xt(`($Myr7MmCiJT^
zFYaZYg8_8WFN|m&Lq#OfLL%Ov{NSd-9i#?MX~Rdj7_MH<19B|)b&yf~MDGQEU#(&0
zaW_SVHxGUMAynQG(&onHlXtZusJ(P>wa*1;HF2Ekoz!M9ITkIaV9%e-S+;dsfWrB8
z6kOXLMubFNuLs<|^Pc&}0XpMd4-Yu7>vS&s>UTq9O)~A8LEvq?SW0BVD+o+k(=}=w
zJpf=%6?#;ToVS-r56;&nWFZMeCW3K(+YU$Y`H})RV})_+5+xyx_beoqg-CNw+buJ(
zoxE3OM`5`Ho06Qv8Dkc(Pm-4xC8b}obroBF0uTm;#YAI5G{`x}1#!J;$!K)SSr5@o
z8BU>yJ?d4y;hKJAvuG7rHfcfRCrZZp{aht98CO%RFOAEkd>V_}{UWwH65v`cnU>y!
z#+IzNq~{8a#aF?HENp+R5-wI9x%>sGxsCl@7qPu7p%U|bTfI+1x`wm|d{ChLF+YvZ
zNlXL^)iU}{bgRLsk4tpgZIEAf4?$X-zBK5MgM_}K+R`Kl^eHpRucICSu5<mWXB>Xw
z>Ae=X4@h9qWl!59-VHVxZ0CD|@+s;n+XU!(p1v?V9Uk5V0*1Owz`hg30|r<WH@Cj$
zrl6cKx}g(<o@eUrHWNNZ`p~_DE!YmLs4TzI%4DFhR_pATjZwKFq|%2p6Skd{+>mmm
z4*G$Q(17%b%^9MH5QfAMC!!UZ@5GVF=c1thV`9oq<2*iO^s}x#nn#r)Wv&L=u^7c1
znROXgVBMPM+wjz5<XI%6aU~LfR&P(kbYu^+9NN|MHP3$ngw!!Vzb}S2S}Z%|va9kq
zOn3q#ClrQ-V#6_=g_t~RvGtT_iFDovVO1slYIs#3%VHwnc0uuRCM`9~Ao}(wCS6&h
zbS^e|y8XsrC?vuOLss~Z)B*J+m8)i6VZ5jowwT6VZt*TDRh+ns@C^PCI+)ecg4b%=
zF0JJ&3W|-Q#PH&|E?c{q;AqYR_7hN2aLgG_XPDTmunvNxh%vhB=$ut#HMYB-;9mSn
z7%CTFXIc>>*W_21Tp7s1L47eVA%JKx@XfSAWv|nx)=gdNi&L>d%MY{Vb#xZ0B|)%j
zOY8$FzEyCU>=7Khgz8y2d};)X+0tr@XQAAfv8DUlYieEuBwjsWo;wZfWiKqq<5t*`
zH~<HFqCO2pHr)0|Blcwq1BO&ma~w?zN5Ii@ZOB#dk?L8J0LLvzI;_H9>Q=Jz>z3i0
z_+xL1>z(Pbso`n_&DeB2(K{Pny5sPsyQ8l3=sf4C+u}sWK)0cTQII=;5yq}_RW`*V
zFj}Q;YY;Rg>=QNmjfP5jZSB@XfZ>D5_6W4u`mMSWbJ%8CmYa{v{B6*D=DVTKFFJnK
zA@nVEim>f~V_}2k?T=Ts$g%6#@a-{_$`4q7-8%iNYKSQ`O9#427(O+`QHH*sCD3~^
zUy;L~6s`a=#MK-AC)j6_j*6lFaE!!G$?H5Ajxr$^Peoy=Q3&x?;;6W9HMfO>N0s=+
z5E!o}RdJkL)wCkX#Q*8@tmG|^Gr?y|D!9ZTOh_(<iK@v23kD7~Q)Y`Y)rh_NN}G$3
z`=QR8e63#!<CAR6-F+E}OiK5)Zk@UAFx+5FShgx&ybYolp`tFCd7(3uPr%`K42b!z
zeALSf0^wfn=3d>~91{Y1Nnc{cG;TCNlUPH{6suodkzFNrbD#guM!dWqExmhCHOYLQ
zg+iO3_l!q|{B_<C6y#Pv@(Of#U1%vYBsgSpOF}C1&0llD!aFgMwTj%+Uh^@PE?Z9y
ztN4<oGjS7kn@a%)mliy@-!dM+Odv25L;<3W@~X6P&e^~4&pLG|FcTjMTUH^Xd!Nq6
z6Ajk)e`O~m1_0!-2lDX9Y7Gs61+jeSLXP1ukk+wo#WZNO3zANHkD5K%zrt9{<=8v?
z=o)yw$}hJn$CpPZ39cwRG{4h+O66;}iX~!ns=MlDdJCcyMi!QH?y%HRA%!OhwcvNj
zJ8ri^<cLwiG0|ahM!(@DKT<|lmu_|2v3gU<Ox<Nsd~rFqaf3u%M*eV<@!!-fx`@qd
z^<%;s!J@7JrB5Lp<ce%x<)X5rXMNfYk_i&^Aa^A)<@@sH;>l4c(5j75{!A5Tv3g#J
zhAs3I<$cQ9)!QTQSc}K8W2!fsl_7Li5$xw({uS{j!;TR4Cds0yPWFG3f9o{uHX_ZO
z{A_P|8B^^jpY?&Gd%1cet<7hozj}ABak_pOpa*u{PiesqC;jYkpYQnRh=2HNhRV{u
zmD&8Vq7qT})5i7UEfwM~55pk&c&|Qb?2W-36u7BfEKj?H5!@%=M+i@3%{q3v)8am2
zCKF!JL&|V{=u?=i$4o>o`}B%}#{Y@skFbny)8cRP21lS3P=eAm3znL?d0b$w9mDJM
zGFRyBzmAQ;@$EcwG*5+fzl>$!H}Bp#4gvs!fo!?2BVBFZQD30fD^{+<hT)0F5^hC-
zqtJL-P~3Jnx~7N)cQ2L}2m@-5Tc5%&0U8#(v@(TEu_%&ZceH#DHG*~(tXlk7QPRod
zz~#?2<njkiV|12${wc01>s@KVxq8P_qn$S}K*9pK3<LD!KP}E{GMxALHBN-Uzh7bv
zM3Z>g(H${?Azsbq>+o^@v*UK1bv_%tj#v868k;HEyC0i~sZ|zy@;-+$Fa$!2G=GtB
zmrCdJ|Dc(sbbMD^ZdGg9xBhJB$f~`CCeMU$i~!nrmpFTg+>m~O7fIe2PiD;`io)h2
z8Ck4ia#O8oM14B6o<Vn=I0(;iiaZyBxQ9L1vw-f()@s@LHyDb~J|e^CXr3mXb=J+n
zlV3Xb*^m~VNO7;U!-A)@wGn}=BxCE|z(6dqFh~{a@AqM$e>~v1Id3sG99&F^bN(XO
z|CDZk^IVyx6rlKjAw&#(993>+Vff%(@~(r-+Y?xCLJF_wrNe3bGz2Z}rgSc=ylwO%
zLwn*LLMm9FurkHkr|@#wPLrvSOmfhtugqq1XorBL9bS2xpzUQ4N5V1_cFKkeb<9d6
zICy73>FO1L*Zs`bl`Ykc)o=I>Sv^y^8#i1-zLpq!Q}n*i8z&=98m#VPobW*JL0m*a
zch{dlbalNk#-UYt3eOCs;z0MNN3EuP)t8@oYUW#!-e4SadZ|YjPNhB0CnQNDJn8!@
z@RXz1{)O7T=cpRHSxBZ3<?o}f7H~UH|A?v}1gU{@33F96N)8#5Q)wCHGUiP?;zXHh
zQN8S%-M;`WsI<})8&4&5fs%J=mH95l@K5xY+H8rk+d`Vfq3(t36<jUW3bM`p-gMXN
zM-RCbn9=-`a9SXw@hPQb7HZn7{sjJFwlJe)>{#nHyn_(lDX$;hQt}aNVz7p&vKqWq
z)oJt~Sue4qfmv5Dc@|>-YCmBG=M)e1qO}oFsGuZZzw9@Y<Uu!(YpV&qb;ICnR(%Ki
zN_fJ4LECO$7kgRO!{u^2@c`4Y!3Ast7=ck*f>tt;UQG6Tyt2We8Vh7`SlBeyxyH%W
zn0YaqS}Fd9Cj3l0k{`Ra-*%`MOs+ko)_zuFoc-jr*9~qu_JuumU@*ZoOT@_$)ent8
zxe9oMM^{Z%B)i_?-C;7~d=^&P<?uT+^#z$a=#rO8|8|#TSL=|BF9kfLIory7(tWtc
zXS;H#O|UpBD7}e(Rd`(j+sKftQV(bl0wO+mD|vLGzx`#0MvJ5#5QV=IMV(Uh8d@A)
z?l|D&pMl^D^*x|Xo_iw^pwsPbQ?Sl8BX)%$gmlA9f(bl}u)E-e4gRDr_o2IN_axs4
zqj+h9lGkcG*95)<-C@DfbFW`zu}tqPaK(0iP7k?Ra}*Dc2O5M|_zc2Y3(K}gfa33s
zlb1G6|0#2{1E`_Q^V#2S-D)Mebz4>!Vw`yf1gqH>)Q=$RA>#ToSLp{Te7YXBc2i+=
zR;s>wZn<x>nW*nnsHTI+hpl8kudTUy(o2%)umX;JcwnUq@2i*(@*m*Cses48-_k<2
zI7MlM<H&d@z;k7#1b(3l;v>%xK4-`mk-42aeX*w);edE!EZO&gV;mSK<7_z=;ir`D
zs%ChvuvMGy0Kn9miz}NIl^dfFN4F0%LCCqp8qAr`*CjNTph|+MPeEKHFJK*&_aVH*
z_Oo&Q6vc<VyBFo@<2U6h^iv4=G6(N=twIlMCCLJJN@u!GfZr#5hb=@&6&JqDvi=Bp
zg*Z(ni~D3qA{v_dhnna2?+sLzi8WzY@r}!VT%Nj9<B%6N(uW|kUpmact>@{R_Y@`j
zkS)&DH{)dYehQ0Sf7}YkgVjm&=+>Zzv;Q!LO=get@8Et-zT*n!RLz2WSsa<tffniX
zs_J504dvGp+-VbA2m_`E1iy4i{TAUUsjer<i$BcWzi&F#^J|z&t9s3q+mjuhnE<p)
zZ8M1H2d_BpPoRw9BMw_mJDF?Mb8(=#7+D>BX8$*)UGXeB1`&a}*hwK<j+i{5#HvG4
zA3(<9^YmYYxT>N{J5wBZJY1oqf!3gtrUP-Orl1xaY9JZT!uG?kwl}B6pt}U^uva}G
z35qYx@b=)KF|!h6F3sylmXP^5EoD#_T4uTdS}b2PnY4QHx`+stpzQteY+FF^Fr$7n
z&Ap<CR8KR=+RKAo)XbB44136Q1R5S?{47pBnVSv90VM&LIfxXbpm*RM+t9gUf7pSF
zz^YAdQEF54{|lRp6k=F=2?4|WN!rbs4z3-#Oc#I^=kO~(Lp%&WNP^U9Wwb&g+DExq
zTF&JBWdbpqs^vIl&v6~K7FyUPGqyT)ol4l^@GH)XwtaOkq(0cBIiKKdMif~_5owz`
z*sq|pC$A=i9bynnMn+}G^D%S-0rd+URlDn%;7iRCJF5tBLGzA+jKb~DtQqYyj!3g-
z4^Py^mcuVimtgW4#289+lHo{@%@f@%ZLF`v<lM|5-i5jwH$6RnjoU!@DfG?Ef~5}~
z`sR#rUAwk8O!S2-uJdvb0(N3@&2A9+y_c!M0UDrZFe<K&a4f#h3Q5qGdxH6c;ToX}
zEgW;>6H5a`G;829Cr1H>c_qVv!XRh0dPJMQAZx~8cGR?VBxHmUaxzibQzv_K?kho7
z5TF$#2Tit}vd5oZf-|T>wy$}Kodo18u9m0#@U~E%IB}4BPp7dhJo-qR@{=Y@^ocIa
zfY?@GRJ;BmxHYYy;`gf6(^GFjX?EQkj}Wxs2vzxm4e5R-qoW<WHe6@C%(D)YyNS^q
zFJwVzB+N{}h+|mn`8>uFoCiFX#~9&V)v$k#xs{GRiY34$q6!K~j~c^hl2oQ(V-wB;
z!XuzNyav0hjeV7vo+t{aWeJcKmzRVnZs&7(%VH0H^bFWs$PhfaPk7RNd|u4aFOK_R
z(UC5x*A^P?z?Jn-zPMWo)iVC)=0_%qX|u2VW=$ixVmq_I7!FW<-}jhw`SG{~=9b`B
zJBjNKX`V8Sbh0K5$}%uGOmLdojn+KfiJ^LN-kA$F5UcDvD`v|GSU{9<4jiM*sY6v;
zzOxrypxjbfh0on*Mp;~mR%bsP^)~mwGZSMu_u6FX4~2HGd+YFttnt05IZ;5A|HM_I
zh!0s3qkTL1@+$*gNM$C)n|}<|rPW(N*;u|uS=9DeHM_Im&{d1xtZmha%zt-5j@$=!
zZ2~<i$Z90^;YWRxmhdVG5FW6j`z)5=J8w_+I`5|jNB9#3@a4{h_{)EA)#$_^G^*zq
z3=Kzg0S5q0XtY`AYEgt39khiWQ5z2B2CkkZizBP_oSf-D7}_<ofFwGtkPAm`=BwsE
zIu&<;@5wSGaq5n|-fbm#TOPLOLc9oX4!+xVdQRnAiUA$9ebg5PME>z5!{lAL>t8Uq
z+@FjkiObqBI2tGc#>XnIf4^p|!cFHX&P@Gp_&GYllNqeN|9n9C>$OTHSTl&2dNG=+
z!YV}Tx0LX>7ANGn&?<xy<9P~2-mhVnzdmOr!2poK*M)u&DD_vbuOE4JYce!<Yj0iB
zdIvlssm1(t3!O()vX$H9P(A|=`)W3<zTAt0aRVi$ah+UNRh<bAJc{JUb?MP3J1e2$
z=Vp-U>aRV%+n2Df^Q*GY_e16g7H0jyRXPxuU{+HOy3r~|`=%&7a*0)!#U*%)%@-;z
zKH(|=R||!^m3?d&UH~FlnYxofdGj>C8h3%;<yT>Puv}n=ot9`Te4q02xQ&`FEa`oq
z2>N~B7~AW)7QT}*uD9?pZC4MR&xr~lg~QKqcTdWYc&OA5-JQ#cVz+5o>F-Mqe;H~E
zh*0J9^_|b^97UXzrrh<>j(4@|cuR&s2Y}@bT!9}o>E@`)E597x^Bf>g+Kd<dAHxy1
z{b3-R_-0p~NBlMc_D-y>5RjNXJ}@i>zvYiDC^68zwhKv!aw|y0?7N6!5BZDnIzAMt
zJE~r=*8lqFpsTpn%l`|1>8`bWy552KgH2;yddj=LmLRPq#dUax+Z=0>$w59SP1lF_
zG>^0GY!I|&J8*vU#%49Ust(5CoO3f)T_=pn$aCouBSb8tgGi$uLHh2Ye)N>?dIRAJ
z{0YVjUNfcu-lOBZ${(Z95%%W__J$K>`0Sx>40@$(-4Sq+W-QTLdW+zo)>na^?CVe<
zd3)UQR1{|EmM&63tP9dH0>0r#{I}Q$^{1N*R2G|iS^X-*iDdmPji~b6a(yg<@~W~z
zinDJ=^5wpcdevSN$w{<7)p&L2O4aFFdfywAy!enYka+LZM)mtyzAr#D?^Y~7U2`K8
zFr8RN84X+Y>Fps&K1hHQh-953b!cssubC*5sbYf^e3#?f{^z|##L#<IqI2H2(RmO`
z74aD>HI}hPnDtX4N-iw#L6exaSMUs_)T&JMIp_b)^drMthTO6p=)DwF_G?ffbW?Se
z9L0<Je!ZUqWBVr3KSlI?cIfiqI~Q8FY)tnpNDFWm-UDGULgbIku!B*OgGj^B<Zs)Y
zl(5BJ*(?A**472zl{hk&Zz$qhHFp)Wqux$UdpR(pugT4o;TQXsV5iXS_pV%YzChD%
zRfwRzCT?IA(jn{l`RO*U&x76<6dheblE_{!mjz?}{JqJ?70QFgH_auGqQ;{kLr6cp
zTpo1Qmi3j&Ig-@Buh^#iq+xvL>L|nPB*J&kGWNuvS#18W*q)7(rf*JdGILA6@*-&>
z%Vg&e%OjGTX9zC2Y4(2x+#{IZ^3f?+f>cT21Cvt}Dd!0e2ry?gr5hcu!*QH$q<)Kv
zM)rHzA0*n>pJ9h*!}%qjtt9>57mla|!on3VOE3h7#FjmN%<tigkZumTBwb4|$0;5P
zDHuo;jQL8KzsSbfR0sbmE%S!Dq%CWp^reH6*-iHh4#SHRgUJ|@T7s;0(V@hQYeeGv
zP3Z;;ZX3%%(P*q>o~~bL0LQ#%rv}m!YdqOGrIgP%&O!ahB0{&FPll*a)FQf5B*soq
zZ7XQv-@o%2Hb!QAQ)@%d;lk<F5=wTd71C}7C?t+D5BYI*YB=Uy9iI3(5URhH)vEkS
zj1R<e4Pd&;jhui9ohom`0tEp9wZgk*&xp}4`v=?v3W{J6?3f%HD0?%zVI0A+R0w0&
zjBL|g+S>|_oM<p!55d_34Cx7*Nq{}GdRv8sD~RK46Isos>m`)GOu_epu?A#b8Wbaj
z&x^ve=1|5O!}z|tX3@-?p_Gikws%<D13$7W3AC_MTC)9TJUy%(8Hp)vxMY^KSKRzd
zkrro5aT){+)E-Uw*J~|k3RDQR6~F?}=<(KqjgD9>dqUo`R#uVv(sGS&lF<sQVV~dY
z3hsBKSHQ}f4}#bhS3y%5)PU1lL;?o9=`cEtFuw9Vx#>HYZ@cP|57MpjsjQd}pX-eI
z|1Sd`jGXBSnQuuRr++0SU#g%p-ZM1uRUkAP`UMNhEhwL_1P@|94BqwBSP=R$0DhN8
zh)KY5b2?JY2g84QhiKHNNe0zJB}#^skv?N2u3$Vcte~vMmF){0jbcL!KXf3UsFNE)
zWR<5a_w_hqkZ5vN)@DJ@IP;+lz$FH#gfaGJfZp`MaUbvb`R9u>$6QS!{DSX$k^wR{
zC64p{ZsE8@j^X1ovF*WtI7}hXz7^ouOq%*4gAL1v4^mWNGLubF#*tvy_0gXGnk?m>
zNUibw*P#)w#85cjdn>}Y<8&!V>;$LiU!#++N~{}n+{&MhrpmF((nKnof$lIrtQ|Ww
z^?^R@%A^};q*W?OWN9K+w?Yn2nK@1w^D2teaZlQPa4f@4h{8eWs~X~__4F&`RWX^9
zGFlcP0bIToxrNo+Vm_w|g&}V^8mM$UV!M@pOs^lJ$ZN@ko-`U)Z>C>M;I%NqI;CVk
zlUj)mU}TWT?8Xi!cM#7HHT;?@=S$~in7q^a1|pTz3}Z1^=X2Gjp)FmKCU&F%EMNmg
zcjB3orHNz+Sn*(ydkqUG{4Gh$;y5YLa<@n#Q#GBHLbZ1M51s$QV5(_Mzk=NKyUJ9R
z`d6QejNl_`0x1zKfAv>dG3E&SCuMf?(FFI21YRVNZkE^~{h*;hTPa}T<p<=@wg&C+
z)mYETC<Lvy3p<lT^JS3@MZO4721*PJ?ww<hUNBj`+5Q@Y*5WKJ9F(^?4rHl|5=i-m
z)d4j(&UT#IE+hafVyJb(mAt)6nb6!Q!h67UE_hVOJ>9b)m(V-vb}{D&UpiWu#Y0X|
z578>Q()z`|bK6qMRBKlr%-2ip45m(S3Dcqw8UQp?ihLn39k1I_kj-l7yrv72Iz=gk
zhS6&{p`+tO`+OfFdy!ELs4W+7UmR58#`CLjSq9VIKd@`GEEcYBY4bzrO34fuI=Tf{
z#?|}3F~g4@dVK+$W<?+Txi?@aNx07qZ(yNPogrcJj7fX$64tY8ck4MiQtjpJQ$t*0
z9mGhrIv9RKL5U#{8SBV-N_^~-Udg2^0sM+|9qt)FOQBCJU~%g5N4gzQK7=mb_xQ|X
z-ke4^R8CmLfHePTShK8d12U$}iF<6kpt|K}nfta<LMod+gpdW>TA4<_`YKb|8>uY_
z$Nl9q+(01|w3U~8eaJ<Y<BbP1pk#0Kc7^d~^dYJ&W%vnEJb-B?qD3(M4zCcDtMa}A
zp>mYKn4z(5JKI}ab2s5fTMey*mqfW|nzQaj{_+Rs1D=2in9<I0(gz&)pe}jIJ#+{G
zn=jx34R!E}Lo6%xa+D3VrW)X~kCP95mm>+ts1>88a?Zbf)8X7JAIju!b~GI7KU^&>
z(T8TTw;sAGTDL$d@p>cPr(7nuEJnOQ-J{fe3ASt8Q!Mt1S6;8T_hH~#sA9Sl#h_Tl
zD+UpjoH1=I*v@03*~P|K@rbvY-qv?{G@?el>`yg9jGYpkcmVfVECwLtK(5v<_RBEi
z3#|}zk$?md2`^y2cAtFdS_<H1z@+96^p~emq1cTO)ztCE0&>ve-Djh#1~%&(-AC`P
z(|O}&LlDr0Q?35KR&E6D;RYT~**7d|n~hw(Fh_JpFW=MN-KnGC0`s0dg`K2#%a5O;
z*(zyeamV2$CvCUINrtWfOgW#^5Ccd4qrQNafT#Zw-JFX+fM$QzrXZ5_P((9AIIdq>
zAcbF0Xd(q;?osWR1LQ1V^(=gsiUG|zOihnO9B0QeZ@vD3fCn*S2&o-(ULS+G$8^5T
zY=kNO+fG8P4X2agJIN{0z`=}k%SB*oKU5>j-Lflrhb>^{u&HhY9wa(U5`-Edjj=ru
zUGHVgHvpxG*TT#T5fAp&4D~A5(;=;2rj^SY?(1+TGox09aLq&tx!NH7A|PUBQsg86
z-?o{$68%r~jE|Nozs8a$p~M1dV<#<RtyWaR&E+0@!cW8DbBq-Yhr6el<vkg89ho{`
z;4k$4h5tQ;_6M0bWsprye6i494`+(bHb+rC0XJi0XH2Iaf9DzBG-~U2r%BLpc_3OD
z<6tC?h7r`Ia|4`jE>el=NLN{*wYqEHbZ-=Nea|M;n~$4Ma6u;6?iJI$4Dmk$gVN?n
z$J|~cV|;~K*wArSfQT7jbNZTc1y5JW=S4p-3&{c*XXQMwp6rl?Swi3TlMYggfEz7{
zJ%6kt@&@G-EKAd8ws}LJv&>^+20uqEV~FB%&8xcM3$We=K6V-kx{P@UT`?N4ZzLOs
zh@+!{pBW}<{yb4$R9?->U^?Ag;s2H-0OAqy<^{QB$SA^5za2I0jTX3~SF-@u^e*js
z)S7Lvv}@1trZbrfcSs_%*&7P7N(-ftUwki#^DmX%l?r{!L62d5?&S{#Xy1J~!tA<>
z7OvK(Qjc!z&EWDwPsbu%H1mW|sF9fq$mu`1#E%fr!nRllJ$S#s2KZy{GUjt>rD||?
z23AYwym5_Pv<0M-?d9ZqFY(YEREv|&>ywm?_mcCxUTlzf{><)_oJ@bb>ZmzMe#HNq
zPP;=7za9A%oMp^?bC+BfHTsdt8$(HRAg0ft7m$UaQ{wB26g1Ia)w<ulAMzppaC2N_
zY84jK0c+DGUqL+~Qf4mrT<Gtee>xX<u0)(3G_6KQFKLX5Aw+bPa?y>NIJWF|4cCI9
z6wCD+ke87muIVugb2!g9*&j!CxAN*3Pp6?>+q`igan?sf8HV|V{~I3{1YvN|ntFW7
zMAn{>;(y$*oitG9ChgrpR^ri#_6JqMFhOOM!pG%s2qU@8y>|WWFx}{jP^<!IW5)r;
ze8EhO2y-0*6ssyo6~VM~AAEjL!jT+$;k)DoBItwvDa%5e<JqXmAEY}_Ag6MGKlHfn
z1OGnKM76ArO5S<0wMUSjxD~jqk?Y>@*Uzx00J~YhUmpAQFVJK5%%L3#21votrlq&h
zTH}S8q^sJffGY^B5gZmk)h0&Q=D_~iP%R5uJO1o4t<f2?h|r^EW^FMyo!?hoC%L9j
zyO%AvIK*ilQXH_UV03@W)XqK#xsOA^u!G;2GW1EO5K!Q-RPo76zMzMauYRS77BV~)
z3oy1HqyJw88UfT3Zb19g2SM;2g>SYH7G#gNi7sZ4IO(DBU_yN0^FWQTd878XD0+s8
z`ratf6!$1$PL0UYyq)bEG0xQ6Wy*c?*9g0!V90=J^qw&!TWGURRLMn%4YO?QVVr1t
z?Hl40vqgQx0wZxz@ZaU|cAYiRH?&aU`bs4rc%AJE$c3W!7W{ZUYGK;t2UW-qLt!h3
zeb1Jd^#b=9a}%*;=!VioVMc38$6~^s<q#>w?cbHZ;)d=6P&A_suYfNvCBtKOXA_n7
z-^ihcQ2i<>>b#Eg0o7HMWC1ap<dth-sTUuHN-$bab`#(z>R*+sNk2Nq&jwbP4ILDt
z;aG&%)fRk*wvRRNP!z#%SD&G{`QORQj_r?AKIw1Va&>u&@9vVO501%$0Zo%&I?0jW
zSD+GROnLvS*!84`bw<jkwGgW7%XaaVG{mF~`w-Uh{O<|&q68j~aI^{II4aR^lbo9*
zz^s7-A=l3Pz(y3O3p+Y9w~rqf!;3*i^GtaD<^|oa*xEzcP%o>8ND;alF}IytsGjix
ze%lsoVLZZDkU@=kYlK8r9U9!%YZ`XRMOtV!cOotk>ROL!#r$<hDbeY61<AX^8nsS{
zd)c1`z~KfJKylB=0G46S=kt_Q9j31(TO`*hS+O<)D=us(kB4Hl-ZW;)*aRKl0@J|Z
za)MtUNHy&J0n)yFOewOydPl<Vb}EI^xfjQ@3N88~DQ1y{VmiU4`eCkqiQ+nh8^vHq
zzVg(Use`L5L6j}XrdD7z>v9jKh8=!qPrOm5t~d?2+(BS=Od}Td4dG#<Bl5X0zMhcb
zSk~Z@G7e>A4B%gx03SRmsZfVDtjtsWg<IzIX9G28JmE|SO%-vl$L0g(VHmzT%6n)E
zh?=PKiB#MK#epK72^83)uz<unpZs(eI+RB;3YqA06VC1v((1qPE|Iq<4B&Kp!|>M}
zi=2aK0t#)}NGL`M?US^iYMKw_&>+@CiBzzFZ?`dh>e+h<gqP^8(q!~FK(&j7*OJ4`
zOu3wH2yDWN4(2U76X|B!+zz%jRo>HPC}q*35xySZDHb^LeIV`{XrAr7KG%)fE=_|z
zs3>1i|AhcUQ5}yovwgP)Y&{pWN4NC@SXb=O**+O<xn6e4_DZOEOiwk*)}w5s?)O#p
z-VrB8<eD)~7d7m?xMd2J?T0)rb%(xE`Jq2BkRkcZI}lft0b+Fx+z@Gqw|S8ia|R@v
z;ijQ%k`<f@B`=}{1ldK@O%1d@evO+yZ1Gbq>CRx(o*zY?GObx$K_5kDFibalUY`^N
zNyz6LBQn%mJ@%3uTjcdL@N*nGV^lW;M!y&Y>nV&3V_&WDWmE{(d{SU_#3J6a-uU7~
zz)(pq&0Nyf`B;{mOwJA)C#`rIo+)_DuC`;50*>#nY<Q@X`dc!#F6jK>7tr5kMni+)
zLAoN0-1lA7FNdr*w<Z1^zzl<=FpmNAj?r41ox={wB7>9}F=6cL3OQ%WehZsR>Rs3r
zL<|JsOrT18t)250Z44hP^gbtX<6R-XA=!U+`S#ya@Bf&-wtY_3LT7dXoMaO`WMLv)
zD*2irK_pD~q5YNd{)f!n=!UC_iv)xTvv3`SK4L~92?4$)$R@4?AC9ix18*#w)AVp*
zL>3v|W9V#&g6{&>&Y@}Oed%NDNeAJ)6w0zQHJzqOS8|a~1!oiYZRZ%>-8qNGbtw^(
zOii3Od)>;tXh+V*eVA5~UmBPPs9~n5F(^FVF(vr&Q5_?AMoE6Wa>Lm0Y0(sPk9lJ3
zdNs9QcNNdrt*qijq@eQ4>f%s11@@?;YZrU|76=f}Ia5N}w`~swA}+OfJV&5O$QsG)
z0*Mnkv(uMMpPUnQ;XzM44PVJI+79eLnCw=GLSU5E0Vt2^B?Qe7f{MVIC1e3od{lsv
z$YWju3{a?;mzoKip6H_zDe@Qip>xq$P6&(7hBB3>Tq|R9zp=P2VQ1r8buBSg0lM2t
zP@S5J9^>0heI63Y!o93p;d)cjydksGZsqGV+T{px*9{FLwKDT-+fy8!h`hwW>0)9w
zw+~pSMLHnQw~M{Rs^@%ps|SZ$_#<cR#mOrfEZS9x+r4Xe?8}!L4rxi|TKSyZ26-l&
z^g&nvpbM=LS`{8NR%6_wD2mOg>~UF&Nck#7R-$k7sjq8;?|U2eOm4i8gU8ZnXVg4;
zb_or~vuU<#m9U?i+#^B{xN(~iPF1P(_a;gSXi(8dD_TDo_#5sZ^bT<&jFf+bO6DUn
ze+pqvb+279=VzVIPMCJP$f?@a;g@LZD-XW44ERt(9rL(MGy3!fx|DQP$whRq-^s&b
zl&qAL0;5k-$21}+-q077AaE)jJQFpnrQJy>m5HE@d!;t|$`Kpg_N99bx590U?0g<`
z5z{-g-yRT&4{%KkdG@>na=7}eeE960PnC%%B^$3Bw)Xw<Q1Td{T{leww6DU$x6(>;
z$QO&k^DP*A`!=17Oa}-xP;3cnXyne`AUA0B-E_P__s?+5D<@+F`~pxQ5cCRFtyK>X
z9dg%zzfocjp1XX$&=>ZJ{=tJMO(ziQKO@x-j~+<Tpvf*bfe20Sp!65&7PGuPy`r0(
znKH4>x~y;Ey2SY%XRf8>T_CY;0_&3xB4HMjyl9>tV=w~F1fG;=YK%H<XZJk8l7!Dp
z`vtN$eONL7zrB=e8gK6gKPY+WgkC<H^}6YWw{2rc#q<;0pKK*b!kLOT(X;X2nfw2t
zW%}mz$k>!q5k8H&z;j|HjfS#fBxYOouo-fIVT)p7X}W^Iv2Z{#`O3>uJCf~b?zx1L
zLq>VK>?U~#{9S8(C*+U;F$>Q0*cf@UAOJ52to|ybTj0Ab`{%OCv^+{$p~5%@Zrf>P
z9z0VE_=fM2K}6PS>^NX6loxjFL@9fVYew`bm#+GIh=EE10Ld^*=1I-xO<&Ng?Y2Y<
zo`y#eX&O1c!roqp_$cSf!1{4XWnPNu&i^T@QG3&Ti>{bG0yfysGZfTe^>LL=Y1sCY
zD|xMgKFN387irPu0QttZI}6l^B?!?u5wt`_zs!S`xu#!Hc&r4W)@qy&B^YC8(#vq?
z*B1!7m#M*`1rmTJL@Z&Vs=GX;z}_pnv#0>-#7^+{J1(SZ9!Tg1EYG;9J;%W)JUc78
zEr!iRe9wNO%8!B#XVy{#ARP<F9s2EeV-^S64wYtmmj7ZD3@}a+wxeW*7}U(;-6_;%
z;3TayrAN>!lm(QWO^8sj5-GT`8O8;}MS;h0>rz%3gXw0(br0MgJGBkl;**j;-;LkU
zt6Nz!hob;gb>zZX-3Sa%8{-Iu46X{~;Cx<iq)80<`cttyB0g+O5>z}O>*L%|KZL8i
zz>jTL`Z=LXU(zRXSy`bl6@8%C9kUl^mkjHW$9QY;vzzfh=k!a?;!+YIO4s&R0oNJ>
zbADBi*ktG)OxnDMtYw1C@`)km6R+kNHxavm*rnj8QdjfNV#f9HkT)Z@7F;ywkrwW%
zN<^K5n?)C^gn{igBc72Grh#r26~`1rDrK7UXfNR+y!b=mG0iqWtBtjoSD7Dh-59Vw
z+vCR$C+=lrHz{=(JTY9mDIK;yKen-8D=FXQ54t9vZD=Rj$)r?o`67AohrLR2R>ui%
zG|*Fla^A1DtYwQ!YS$KeCPl%ZmGXVJ;`87zmHhXB0!Nf!!Z4*%FanvflAx&5nCORx
z$UYHAa~#6Vx7^z72{Q#bZ6ti^4QU;IJp0-&riL~v&L|_RUj{<AoMS7A{XA9cYqSf^
zqR-?>b^_(-UnZfSa>c_Yp3BM^U@p--Q05B;q0I>@hWpS0wN?7le;m>LnY}HOWyI<Q
zG;?yQztatmYlI6A>rDJd(1dz7yFrZxBKfwQ+2(UT{0Dc6{OVr$Z?P~63;!pct|m}L
z@%|;@YpY2V-LX|QRZxGF^V!Qwlr^wF=}3*^fXsD>EA5~=lVLEMla?nqToBdAKVqKJ
z4+9o8_%7~Yw;slL82F2t%>K^JBgiJ=mx87RtV|6MBL~y#rnh_lrEH{?vf-0*vP}_5
za&w-^hq*2ZAU*j40%jWjX1#^0qs^l30}^ju{7&ld6eoU8Y|y*-1X%9q8XM)B7t7X(
zxY)R=3)B+Y!0!zhMHfZaf;K9AU33NAOK}w_V~2CaOeD|MUg^v3%QTnCfofJWuzNo@
zLm+zEu2H@m$RidKGlq)WDv->|d%pn(gvv>HjeTrK|F?Z!G^#k_^yG~b&#fNC8Kd`7
zn-5R0wKJ@8QumgYQMTdxh|aR`3(%4EYE%4@b4|M<GH1_%gTn`i(>0bJI&(7jZ89QM
zowJ07SfAxY<yrECBdG<tE;oNTZSm^z#?j6x14wJqAXxGsP6My@JZb&>;3cRXUlcub
zLP6DIY%#xDEiMs|PaOOEGK}&C@H%b&>udM=()JU@{W0i~Ezvt4=fBAEIdG%fNrL2#
zg+4Q-aLk<0Wy@UU_x-rWlI9-M>Ux5A(DeS1<I9MV+aFS*2i;u_MB`>-qgn6(!O#|t
zTYafoTw%VMXQUUUiEi<g8U14%)KLuSe=PD5n0^-XIVsVXy!-hA_!#OxT&%?VSz?V`
zN<++o$s<nNZDPiHRze!Fa^KadPf31H$>L7Si0=&yXa9kc6d9^jSjad3`%-Y<!LC8T
z;oJn(;cL7|+#Rddfw5w44aPDH#p;|jubOxowp#htTs#pq#B?@Ryo1Y_M>f8zg@?Q}
z>dsjM@BaLG<%k!HD>u_p(by+2<QAm*&N5~K1{-Im<8{}NHt50fjjKL{rW=%N!)AK(
zG=T5$UTCaLlo`a0?^*OPQ~8btQq9>~pnsdP%xbc!BARz6dIcTYx`kEpco_r7&6T$1
z{kyv^*JcPD5AmA`T@>d&Cbsq~@-{6`00GyTchvb_6kk?I;<()2R6Pm{x{w-RmIb>+
zXy^?6w{UF|n3nrQSN<XrbQb&R<d5%(9)E~1VK7zM>_Ije@~e0htJTM>cs?7l$s<r>
z&FW5U;WQf(W9A_vgax`qAk=eH9uU}T+Y<3WpC1ZgCq70ep<3M7Vbtbi?jW`=4nklI
z$vHMhA{bT|V=pv-;>-xyynSLiMsiGOl`f;+N}2kH3<WSN|7KCY(4pt?YqQ%3zoN}h
zzp6&9Hh=@RLIX1@j#2k+(O{BnTt{-7qp&TR#rh~sUQCD6sko>P)};lIz_isVwHenI
zh|H;@#b0!g0r9<UXUQNHsRn2gZt*n>Q2i;Xz<Z`WqdAxXFnq*BIrwjCUY&$)4p+&$
zz8T(DSAmx12_(S^>Bh6V>*cW0?#dbjy>Y$&>*F@+5$^26vN0{r?cQ*z<3`z!uEd9|
z5oOS9aI8IMJkiq-nA0A6B68Hx1z~egUYPhYT#VXk3^pL3;vd_2_#=3g5D~3@!geGp
zVp4-_SYmd?zY{It1=BWK1Z*M9o@-x;Xtf>Y!YSOS;k{7o>*+>$3V?-XKa=DNx#QS~
zz1LcfeP7ZD@zYP4NGQtM=-U@ZA7X+O+|)V#v`@qrjpHS6(05y8c2>ns6!NM7MlC2@
zh{}psQhZNd6!Mj{R%NDFqLg`Y?ho`(+0pCCp?lhdhJ_2=6&q!G7xNZZLb^Z{1<O!Q
zqxz+i$R5qPy<t2sxb&n4sc_5~*3`AFjsMmVP4XmqI}HZEUmYBZ3L#uRR}7OuX2!VT
z@4l`Qa7=SFD`)t|=ecPXL@V(XpDU5ciBb{Shf#m!ISQL1(W~3vG}?Qs<8aw#Vqk>d
z$S4F~B8-49n}iz+t6Buj1To3+oB2Ml9HK)xr`7aqV!vv3YJGE~zj0A;?*J8_Gr$wa
zd&|${Iw&AuVCE&vHT&&V+R%VtjRM%~&*XVb=G=VvVuDP{hUaLu;42<;f0ZhsU7vhn
zz5oZ|SPiH-`$4BRX_AHP;MEw~lytqy#)K4U4+Fh*Q!FKfs-|r;+W$%tM}n*`M<66t
z<R!r6hCBn2l${F0llf&q$KWzk8XrDDzfrH+4!?<80@MM1KxiXGANXi;pQ~)#s-Dtx
zt;vmdZx$|GjrJ^Y7i&FcV)Sdt!QG2EOpPK+%&V=EfS~807Y0~@eqqNd6stnJ2RHps
zb(QsL`=HaIYF=2JTBQ-@ufv|8{#5T8KzDUb6y2a{JnWW`BtKus81l7E?ayK)5(U_I
ziM}U09Sxi2Dn^rem*p@`!~ly9#aClkK5)VW2}RwDj|eZpRW8A~K=zl?FEQnUvQ8rp
zmwf|Vxc>v&NM%u@v3TNb#<?0WjMY}|S2(HQnTnA{Lsd%25nZ59VzGr!99mPNN9MJP
zt35JVhE-z}4OpJNGjUbT`m`goRr-{N869(3T`O5&m}egSZ9Cs^RxVb=_eU}$oY_#|
zFT)IyE8H+77uq%7siSg$4)kLczxyr~Ovii02Z&1yYrhVXMR=`%v$!I1IrM4btkk1I
zR?om5hb#mxj~PTxEp<SmM7&aAyS0EA(MOaDE*}%pTY%Xh@nB=nH57LqW?)RvN}?fK
z8({gz1+vnmLr%xeUx&4UKeBpJDGgr(jKAD&On|OWqjw_ow?>aAelSu6N}vD$00000
c0000000000000000000000000000000Kr;4x&QzG

diff --git a/boards/nordic/nrf54l15pdk/doc/index.rst b/boards/nordic/nrf54l15pdk/doc/index.rst
deleted file mode 100644
index 3fae82b713c..00000000000
--- a/boards/nordic/nrf54l15pdk/doc/index.rst
+++ /dev/null
@@ -1,142 +0,0 @@
-.. _nrf54l15pdk_nrf54l15:
-
-nRF54L15 PDK
-############
-
-Overview
-********
-
-.. note::
-
-   All software for the nRF54L15 SoC is experimental and hardware availability
-   is restricted to the participants in the limited sampling program.
-
-The nRF54L15 Preview Development Kit hardware provides
-support for the Nordic Semiconductor nRF54L15 Arm Cortex-M33 CPU and
-the following devices:
-
-* :abbr:`SAADC (Successive Approximation Analog to Digital Converter)`
-* CLOCK
-* RRAM
-* :abbr:`GPIO (General Purpose Input Output)`
-* :abbr:`TWIM (I2C-compatible two-wire interface master with EasyDMA)`
-* MEMCONF
-* :abbr:`MPU (Memory Protection Unit)`
-* :abbr:`NVIC (Nested Vectored Interrupt Controller)`
-* :abbr:`PWM (Pulse Width Modulation)`
-* :abbr:`GRTC (Global real-time counter)`
-* Segger RTT (RTT Console)
-* :abbr:`SPI (Serial Peripheral Interface)`
-* :abbr:`UARTE (Universal asynchronous receiver-transmitter)`
-* :abbr:`WDT (Watchdog Timer)`
-
-.. figure:: img/nrf54l15pdk_nrf54l15.webp
-     :align: center
-     :alt: nRF54L15 PDK
-
-     nRF54L15 PDK (Credit: Nordic Semiconductor)
-
-Hardware
-********
-
-nRF54L15 PDK has two crystal oscillators:
-
-* High-frequency 32 MHz crystal oscillator (HFXO)
-* Low-frequency 32.768 kHz crystal oscillator (LFXO)
-
-The crystal oscillators can be configured to use either
-internal or external capacitors.
-
-Supported Features
-==================
-
-The ``nrf54l15pdk/nrf54l15/cpuapp`` board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| SAADC     | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| RRAM      | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| TWIM      | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MEMCONF   | on-chip    | retained_mem         |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| GRTC      | on-chip    | counter              |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| SPU       | on-chip    | system protection    |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
-
-Programming and Debugging
-*************************
-
-Applications for the ``nrf54l15pdk/nrf54l15/cpuapp`` board can be
-built, flashed, and debugged in the usual way. See
-:ref:`build_an_application` and :ref:`application_run` for more details on
-building and running.
-
-Flashing
-========
-
-As an example, this section shows how to build and flash the :zephyr:code-sample:`hello_world`
-application.
-
-.. warning::
-
-   When programming the device, you might get an error similar to the following message::
-
-    ERROR: The operation attempted is unavailable due to readback protection in
-    ERROR: your device. Please use --recover to unlock the device.
-
-   This error occurs when readback protection is enabled.
-   To disable the readback protection, you must *recover* your device.
-
-   Enter the following command to recover the core::
-
-    west flash --recover
-
-   The ``--recover`` command erases the flash memory and then writes a small binary into
-   the recovered flash memory.
-   This binary prevents the readback protection from enabling itself again after a pin
-   reset or power cycle.
-
-Follow the instructions in the :ref:`nordic_segger` page to install
-and configure all the necessary software. Further information can be
-found in :ref:`nordic_segger_flashing`.
-
-To build and program the sample to the nRF54L15 PDK, complete the following steps:
-
-First, connect the nRF54L15 PDK to you computer using the IMCU USB port on the PDK.
-Next, build the sample by running the following command:
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/hello_world
-   :board: nrf54l15pdk/nrf54l15/cpuapp
-   :goals: build flash
-
-Testing the LEDs and buttons in the nRF54L15 PDK
-************************************************
-
-Test the nRF54L15 PDK with a :zephyr:code-sample:`blinky` sample.
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15_cpuapp_common.dtsi b/boards/nordic/nrf54l15pdk/nrf54l15_cpuapp_common.dtsi
deleted file mode 100644
index 474874d110c..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15_cpuapp_common.dtsi
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/* This file is common to the secure and non-secure domain */
-
-#include <nordic/nrf54l15_enga_cpuapp.dtsi>
-#include "nrf54l15pdk_nrf54l15-common.dtsi"
-
-/ {
-	chosen {
-		zephyr,console = &uart20;
-		zephyr,shell-uart = &uart20;
-		zephyr,uart-mcumgr = &uart20;
-		zephyr,bt-mon-uart = &uart20;
-		zephyr,bt-c2h-uart = &uart20;
-		zephyr,flash-controller = &rram_controller;
-		zephyr,flash = &cpuapp_rram;
-		zephyr,ieee802154 = &ieee802154;
-	};
-};
-
-&cpuapp_sram {
-	status = "okay";
-};
-
-&lfxo {
-	load-capacitors = "internal";
-	load-capacitance-femtofarad = <15500>;
-};
-
-&hfxo {
-	load-capacitors = "internal";
-	load-capacitance-femtofarad = <15000>;
-};
-
-&regulators {
-	status = "okay";
-};
-
-&vregmain {
-	status = "okay";
-	regulator-initial-mode = <NRF5X_REG_MODE_DCDC>;
-};
-
-&grtc {
-	owned-channels = <0 1 2 3 4 5 6 7 8 9 10 11>;
-	/* Channels 7-11 reserved for Zero Latency IRQs, 3-4 for FLPR */
-	child-owned-channels = <3 4 7 8 9 10 11>;
-	status = "okay";
-};
-
-&cpuapp_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-		boot_partition: partition@0 {
-			label = "mcuboot";
-			reg = <0x0 DT_SIZE_K(64)>;
-		};
-		slot0_partition: partition@10000 {
-			label = "image-0";
-			reg = <0x10000 DT_SIZE_K(324)>;
-		};
-		slot0_ns_partition: partition@61000 {
-			label = "image-0-nonsecure";
-			reg = <0x61000 DT_SIZE_K(324)>;
-		};
-		slot1_partition: partition@b2000 {
-			label = "image-1";
-			reg = <0xb2000 DT_SIZE_K(324)>;
-		};
-		slot1_ns_partition: partition@103000 {
-			label = "image-1-nonsecure";
-			reg = <0x103000 DT_SIZE_K(324)>;
-		};
-		/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
-		storage_partition: partition@15c000 {
-			label = "storage";
-			reg = <0x15c000 DT_SIZE_K(36)>;
-		};
-	};
-};
-
-&uart20 {
-	status = "okay";
-};
-
-&gpio0 {
-	status = "okay";
-};
-
-&gpio1 {
-	status = "okay";
-};
-
-&gpio2 {
-	status = "okay";
-};
-
-&gpiote20 {
-	status = "okay";
-};
-
-&gpiote30 {
-	status = "okay";
-};
-
-&radio {
-	status = "okay";
-};
-
-&ieee802154 {
-	status = "okay";
-};
-
-&temp {
-	status = "okay";
-};
-
-&clock {
-	status = "okay";
-};
-
-&spi00 {
-	status = "okay";
-	cs-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
-	pinctrl-0 = <&spi00_default>;
-	pinctrl-1 = <&spi00_sleep>;
-	pinctrl-names = "default", "sleep";
-
-	mx25r64: mx25r6435f@0 {
-		compatible = "jedec,spi-nor";
-		status = "disabled";
-		reg = <0>;
-		spi-max-frequency = <8000000>;
-		jedec-id = [c2 28 17];
-		sfdp-bfp = [
-			e5 20 f1 ff  ff ff ff 03  44 eb 08 6b  08 3b 04 bb
-			ee ff ff ff  ff ff 00 ff  ff ff 00 ff  0c 20 0f 52
-			10 d8 00 ff  23 72 f5 00  82 ed 04 cc  44 83 48 44
-			30 b0 30 b0  f7 c4 d5 5c  00 be 29 ff  f0 d0 ff ff
-		];
-		size = <67108864>;
-		has-dpd;
-		t-enter-dpd = <10000>;
-		t-exit-dpd = <35000>;
-	};
-};
-
-&adc {
-	status = "okay";
-};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15-common.dtsi b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15-common.dtsi
deleted file mode 100644
index 9668cbe5bbf..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15-common.dtsi
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf54l15pdk_nrf54l15-pinctrl.dtsi"
-
-/ {
-	leds {
-		compatible = "gpio-leds";
-		led0: led_0 {
-			gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;
-			label = "Green LED 0";
-		};
-		led1: led_1 {
-			gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
-			label = "Green LED 1";
-		};
-		led2: led_2 {
-			gpios = <&gpio2 7 GPIO_ACTIVE_HIGH>;
-			label = "Green LED 2";
-		};
-		led3: led_3 {
-			gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
-			label = "Green LED 3";
-		};
-	};
-
-	pwmleds {
-		compatible = "pwm-leds";
-		/*
-		 * PWM signal can be exposed on GPIO pin only within same domain.
-		 * There is only one domain which contains both PWM and GPIO:
-		 * PWM20/21/22 and GPIO Port P1.
-		 * Only LEDs connected to P1 can work with PWM, for example LED1.
-		 */
-		pwm_led1: pwm_led_1 {
-			pwms = <&pwm20 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-		};
-	};
-
-	buttons {
-		compatible = "gpio-keys";
-		button0: button_0 {
-			gpios = <&gpio1 13 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-			label = "Push button 0";
-			zephyr,code = <INPUT_KEY_0>;
-		};
-		button1: button_1 {
-			gpios = <&gpio1 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-			label = "Push button 1";
-			zephyr,code = <INPUT_KEY_1>;
-		};
-		button2: button_2 {
-			gpios = <&gpio1 8 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-			label = "Push button 2";
-			zephyr,code = <INPUT_KEY_2>;
-		};
-		button3: button_3 {
-			gpios = <&gpio0 4 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-			label = "Push button 3";
-			zephyr,code = <INPUT_KEY_3>;
-		};
-	};
-
-	aliases {
-		led0 = &led0;
-		led1 = &led1;
-		led2 = &led2;
-		led3 = &led3;
-		pwm-led0 = &pwm_led1;
-		sw0 = &button0;
-		sw1 = &button1;
-		sw2 = &button2;
-		sw3 = &button3;
-		watchdog0 = &wdt31;
-	};
-};
-
-&uart20 {
-	current-speed = <115200>;
-	pinctrl-0 = <&uart20_default>;
-	pinctrl-1 = <&uart20_sleep>;
-	pinctrl-names = "default", "sleep";
-};
-
-&uart30 {
-	current-speed = <115200>;
-	pinctrl-0 = <&uart30_default>;
-	pinctrl-1 = <&uart30_sleep>;
-	pinctrl-names = "default", "sleep";
-};
-
-&pwm20 {
-	status = "okay";
-	pinctrl-0 = <&pwm20_default>;
-	pinctrl-1 = <&pwm20_sleep>;
-	pinctrl-names = "default", "sleep";
-};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15-pinctrl.dtsi b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15-pinctrl.dtsi
deleted file mode 100644
index 0b6e2056a82..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15-pinctrl.dtsi
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&pinctrl {
-	/omit-if-no-ref/ uart20_default: uart20_default {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 1, 4)>,
-				<NRF_PSEL(UART_RTS, 1, 6)>;
-		};
-		group2 {
-			psels = <NRF_PSEL(UART_RX, 1, 5)>,
-				<NRF_PSEL(UART_CTS, 1, 7)>;
-			bias-pull-up;
-		};
-	};
-
-	/omit-if-no-ref/ uart20_sleep: uart20_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 1, 4)>,
-				<NRF_PSEL(UART_RX, 1, 5)>,
-				<NRF_PSEL(UART_RTS, 1, 6)>,
-				<NRF_PSEL(UART_CTS, 1, 7)>;
-			low-power-enable;
-		};
-	};
-
-	/omit-if-no-ref/ uart30_default: uart30_default {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 0, 0)>,
-				<NRF_PSEL(UART_RTS, 0, 2)>;
-		};
-		group2 {
-			psels = <NRF_PSEL(UART_RX, 0, 1)>,
-				<NRF_PSEL(UART_CTS, 0, 3)>;
-			bias-pull-up;
-		};
-	};
-
-	/omit-if-no-ref/ uart30_sleep: uart30_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 0, 0)>,
-				<NRF_PSEL(UART_RX, 0, 1)>,
-				<NRF_PSEL(UART_RTS, 0, 2)>,
-				<NRF_PSEL(UART_CTS, 0, 3)>;
-			low-power-enable;
-		};
-	};
-
-	/omit-if-no-ref/ spi00_default: spi00_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 2, 1)>,
-				<NRF_PSEL(SPIM_MOSI, 2, 2)>,
-				<NRF_PSEL(SPIM_MISO, 2, 4)>;
-		};
-	};
-
-	/omit-if-no-ref/ spi00_sleep: spi00_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 2, 1)>,
-				<NRF_PSEL(SPIM_MOSI, 2, 2)>,
-				<NRF_PSEL(SPIM_MISO, 2, 4)>;
-				low-power-enable;
-		};
-	};
-
-	/omit-if-no-ref/ pwm20_default: pwm20_default {
-		group1 {
-			psels = <NRF_PSEL(PWM_OUT0, 1, 10)>;
-		};
-	};
-
-	/omit-if-no-ref/ pwm20_sleep: pwm20_sleep {
-		group1 {
-			psels = <NRF_PSEL(PWM_OUT0, 1, 10)>;
-			low-power-enable;
-		};
-	};
-};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_common_0_2_1.dtsi b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_common_0_2_1.dtsi
deleted file mode 100644
index a37cf230966..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_common_0_2_1.dtsi
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&led0 {
-	gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
-};
-
-&led1 {
-	gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
-};
-
-&led2 {
-	gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
-};
-
-&led3 {
-	gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
-};
-
-&button0 {
-	gpios = <&gpio1 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-};
-
-&button1 {
-	gpios = <&gpio1 10 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-};
-
-&button2 {
-	gpios = <&gpio2 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-};
-
-&button3 {
-	gpios = <&gpio2 10 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-};
-
-&pinctrl {
-	/omit-if-no-ref/ pwm20_default: pwm20_default {
-		group1 {
-			psels = <NRF_PSEL(PWM_OUT0, 1, 8)>;
-		};
-	};
-
-	/omit-if-no-ref/ pwm20_sleep: pwm20_sleep {
-		group1 {
-			psels = <NRF_PSEL(PWM_OUT0, 1, 8)>;
-			low-power-enable;
-		};
-	};
-};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.dts b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.dts
deleted file mode 100644
index 831479ea950..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.dts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-
-#include "nrf54l15_cpuapp_common.dtsi"
-
-/ {
-	compatible = "nordic,nrf54l15pdk_nrf54l15-cpuapp";
-	model = "Nordic nRF54L15 PDK nRF54L15 Application MCU";
-
-	chosen {
-		zephyr,code-partition = &slot0_partition;
-		zephyr,sram = &cpuapp_sram;
-	};
-};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.yaml b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.yaml
deleted file mode 100644
index 4b900736910..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54l15pdk/nrf54l15/cpuapp
-name: nRF54l15-PDK-nRF54l15-Application
-type: mcu
-arch: arm
-toolchain:
-  - gnuarmemb
-  - xtools
-  - zephyr
-sysbuild: true
-ram: 188
-flash: 324
-supported:
-  - adc
-  - counter
-  - gpio
-  - i2c
-  - pwm
-  - retained_mem
-  - spi
-  - watchdog
-  - i2s
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay
deleted file mode 100644
index 1ca5cadaff9..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf54l15pdk_nrf54l15_common_0_2_1.dtsi"
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_defconfig b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_defconfig
deleted file mode 100644
index 25559850091..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_defconfig
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-# Enable UART driver
-CONFIG_SERIAL=y
-
-# Enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-
-# Enable GPIO
-CONFIG_GPIO=y
-
-# Enable MPU
-CONFIG_ARM_MPU=y
-
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
-# MPU-based null-pointer dereferencing detection cannot
-# be applied as the (0x0 - 0x400) is unmapped for this target.
-CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
-
-# Enable Cache
-CONFIG_CACHE_MANAGEMENT=y
-CONFIG_EXTERNAL_CACHE=y
-
-CONFIG_SOC_NRF_FORCE_CONSTLAT=y
-
-# Start SYSCOUNTER on driver init
-CONFIG_NRF_GRTC_START_SYSCOUNTER=y
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.dts b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.dts
deleted file mode 100644
index c8ed4abb79f..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.dts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-#include <nordic/nrf54l15_enga_cpuflpr.dtsi>
-#include "nrf54l15pdk_nrf54l15-common.dtsi"
-
-/ {
-	model = "Nordic nRF54L15 PDK nRF54L15 FLPR MCU";
-	compatible = "nordic,nrf54l15pdk_nrf54l15-cpuflpr";
-
-	chosen {
-		zephyr,console = &uart30;
-		zephyr,shell-uart = &uart30;
-		zephyr,code-partition = &cpuflpr_code_partition;
-		zephyr,flash = &cpuflpr_rram;
-		zephyr,sram = &cpuflpr_sram;
-	};
-};
-
-&cpuflpr_sram {
-	status = "okay";
-	/* size must be increased due to booting from SRAM */
-	reg = <0x20028000 DT_SIZE_K(96)>;
-	ranges = <0x0 0x20028000 0x18000>;
-};
-
-&cpuflpr_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		cpuflpr_code_partition: partition@0 {
-			label = "image-0";
-			reg = <0x0 DT_SIZE_K(96)>;
-		};
-	};
-};
-
-&grtc {
-	owned-channels = <3 4>;
-	status = "okay";
-};
-
-&uart30 {
-	status = "okay";
-};
-
-&gpio0 {
-	status = "okay";
-};
-
-&gpio1 {
-	status = "okay";
-};
-
-&gpio2 {
-	status = "okay";
-};
-
-&gpiote20 {
-	status = "okay";
-};
-
-&gpiote30 {
-	status = "okay";
-};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.yaml b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.yaml
deleted file mode 100644
index 6e8789aeab7..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54l15pdk/nrf54l15/cpuflpr
-name: nRF54L15-PDK-nRF54L15-Fast-Lightweight-Peripheral-Processor
-type: mcu
-arch: riscv
-toolchain:
-  - zephyr
-sysbuild: true
-ram: 96
-flash: 96
-supported:
-  - counter
-  - gpio
-  - i2c
-  - spi
-  - watchdog
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_0_2_1.overlay b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_0_2_1.overlay
deleted file mode 100644
index 1ca5cadaff9..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_0_2_1.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf54l15pdk_nrf54l15_common_0_2_1.dtsi"
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_defconfig b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_defconfig
deleted file mode 100644
index 256ac9103b4..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_defconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-# Enable UART driver
-CONFIG_SERIAL=y
-
-# Enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-
-# Enable GPIO
-CONFIG_GPIO=y
-
-CONFIG_USE_DT_CODE_PARTITION=y
-
-# Execute from SRAM
-CONFIG_XIP=n
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip.dts b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip.dts
deleted file mode 100644
index cab0eab896e..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip.dts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf54l15pdk_nrf54l15_cpuflpr.dts"
-
-&cpuflpr_sram {
-	reg = <0x2002f000 DT_SIZE_K(68)>;
-	ranges = <0x0 0x2002f000 0x11000>;
-};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip.yaml b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip.yaml
deleted file mode 100644
index 156cbb6f8b4..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54l15pdk/nrf54l15/cpuflpr/xip
-name: nRF54L15-PDK-nRF54L15-Fast-Lightweight-Peripheral-Processor (RRAM XIP)
-type: mcu
-arch: riscv
-toolchain:
-  - zephyr
-sysbuild: true
-ram: 68
-flash: 96
-supported:
-  - counter
-  - gpio
-  - i2c
-  - spi
-  - watchdog
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip_0_2_1.overlay b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip_0_2_1.overlay
deleted file mode 100644
index 1ca5cadaff9..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip_0_2_1.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf54l15pdk_nrf54l15_common_0_2_1.dtsi"
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip_defconfig b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip_defconfig
deleted file mode 100644
index 0a436a648b4..00000000000
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip_defconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-# Enable UART driver
-CONFIG_SERIAL=y
-
-# Enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-
-# Enable GPIO
-CONFIG_GPIO=y
-
-# Execute from RRAM
-CONFIG_XIP=y
diff --git a/doc/releases/release-notes-4.0.rst b/doc/releases/release-notes-4.0.rst
index 44527737e3b..8697497c8a6 100644
--- a/doc/releases/release-notes-4.0.rst
+++ b/doc/releases/release-notes-4.0.rst
@@ -131,6 +131,7 @@ Boards & SoC Support
   * Support for Google Kukui EC board (``google_kukui``) has been dropped.
   * STM32: Deprecated MCO configuration via Kconfig in favour of setting it through devicetree.
     See ``samples/boards/stm32/mco`` sample.
+  * Removed the ``nrf54l15pdk`` board, use :ref:`nrf54l15dk_nrf54l15` instead.
 
 * Added support for the following shields:
 
diff --git a/samples/bluetooth/beacon/sample.yaml b/samples/bluetooth/beacon/sample.yaml
index 6952be223ec..e0bf6d22fb9 100644
--- a/samples/bluetooth/beacon/sample.yaml
+++ b/samples/bluetooth/beacon/sample.yaml
@@ -9,7 +9,6 @@ tests:
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
       - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
     tags: bluetooth
     integration_platforms:
       - qemu_cortex_m3
diff --git a/samples/bluetooth/hci_uart/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/bluetooth/hci_uart/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 7ba5755c681..00000000000
--- a/samples/bluetooth/hci_uart/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
- &uart20 {
-	compatible = "nordic,nrf-uarte";
-	current-speed = <1000000>;
-	status = "okay";
-	hw-flow-control;
-};
diff --git a/samples/bluetooth/hci_uart/boards/nrf54l15pdk_nrf54l15_cpuapp_df.overlay b/samples/bluetooth/hci_uart/boards/nrf54l15pdk_nrf54l15_cpuapp_df.overlay
deleted file mode 100644
index 470bfdaa8c5..00000000000
--- a/samples/bluetooth/hci_uart/boards/nrf54l15pdk_nrf54l15_cpuapp_df.overlay
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&uart20 {
-	compatible = "nordic,nrf-uarte";
-	current-speed = <1000000>;
-	status = "okay";
-	hw-flow-control;
-};
-
-&radio {
-	status = "okay";
-	/* This is an example number of antennas that may be available
-	 * on antenna matrix board.
-	 */
-	dfe-antenna-num = <10>;
-	/* This is an example switch pattern that will be used to set an
-	 * antenna for Tx PDU (period before start of Tx CTE).
-	 */
-	dfe-pdu-antenna = <0x0>;
-
-	/* These are example GPIO pin numbers that are provided to
-	 * Radio peripheral. The pins will be acquired by Radio to
-	 * drive antenna switching when AoD is enabled.
-	 */
-	dfegpio0-gpios = <&gpio1 4 0>;
-	dfegpio1-gpios = <&gpio1 5 0>;
-	dfegpio2-gpios = <&gpio1 6 0>;
-	dfegpio3-gpios = <&gpio1 7 0>;
-};
diff --git a/samples/bluetooth/hci_uart/sample.yaml b/samples/bluetooth/hci_uart/sample.yaml
index 6c87e6edede..a83ac48cbf0 100644
--- a/samples/bluetooth/hci_uart/sample.yaml
+++ b/samples/bluetooth/hci_uart/sample.yaml
@@ -69,14 +69,3 @@ tests:
     tags:
       - uart
       - bluetooth
-  sample.bluetooth.hci_uart.nrf54l15pdk.all:
-    harness: bluetooth
-    platform_allow: nrf54l15pdk/nrf54l15/cpuapp
-    integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp
-    extra_args:
-      - OVERLAY_CONFIG=overlay-all-bt_ll_sw_split.conf
-      - DTC_OVERLAY_FILE=./boards/nrf54l15pdk_nrf54l15_cpuapp_df.overlay
-    tags:
-      - uart
-      - bluetooth
diff --git a/samples/bluetooth/peripheral_hr/sample.yaml b/samples/bluetooth/peripheral_hr/sample.yaml
index c0af932a3ea..b233fb48abc 100644
--- a/samples/bluetooth/peripheral_hr/sample.yaml
+++ b/samples/bluetooth/peripheral_hr/sample.yaml
@@ -14,7 +14,6 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - qemu_cortex_m3
       - nrf52_bsim
diff --git a/samples/drivers/jesd216/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/drivers/jesd216/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index fb87b49cc22..00000000000
--- a/samples/drivers/jesd216/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&mx25r64 {
-	status = "okay";
-};
diff --git a/samples/drivers/mbox/CMakeLists.txt b/samples/drivers/mbox/CMakeLists.txt
index 774377f894f..7ae21a6a8e9 100644
--- a/samples/drivers/mbox/CMakeLists.txt
+++ b/samples/drivers/mbox/CMakeLists.txt
@@ -21,7 +21,6 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR
    CONFIG_BOARD_ESP32S3_DEVKITM_ESP32S3_PROCPU OR
    CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR
    CONFIG_BOARD_NRF54H20DK_NRF54H20_CPURAD OR
-   CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUAPP OR
    CONFIG_BOARD_NRF54L15DK_NRF54L15_CPUAPP OR
    CONFIG_BOARD_STM32H747I_DISCO_STM32H747XX_M7)
   message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as Main in this sample")
diff --git a/samples/drivers/mbox/Kconfig.sysbuild b/samples/drivers/mbox/Kconfig.sysbuild
index 91397da7245..cc0a847f28d 100644
--- a/samples/drivers/mbox/Kconfig.sysbuild
+++ b/samples/drivers/mbox/Kconfig.sysbuild
@@ -15,7 +15,6 @@ config REMOTE_BOARD
 	default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk"
 	default "lpcxpresso55s69/lpc55s69/cpu1" if $(BOARD) = "lpcxpresso55s69"
 	default "nrf54h20dk/nrf54h20/cpuapp" if "$(BOARD)${BOARD_QUALIFIERS}" = "nrf54h20dk/nrf54h20/cpurad"
-	default "nrf54l15pdk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15pdk"
 	default "nrf54l15dk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15dk"
 	default "stm32h747i_disco/stm32h747xx/m4" if $(BOARD) = "stm32h747i_disco"
 	default "esp32_devkitc_wroom/esp32/appcpu" if "$(BOARD)${BOARD_QUALIFIERS}" = "esp32_devkitc_wroom/esp32/procpu"
diff --git a/samples/drivers/mbox/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/drivers/mbox/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 3ec014008e5..00000000000
--- a/samples/drivers/mbox/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	mbox-consumer {
-		compatible = "vnd,mbox-consumer";
-		mboxes = <&cpuapp_vevif_rx 15>, <&cpuapp_vevif_tx 16>;
-		mbox-names = "rx", "tx";
-	};
-};
-
-&cpuapp_vevif_rx {
-	status = "okay";
-};
-
-&cpuapp_vevif_tx {
-	status = "okay";
-};
diff --git a/samples/drivers/mbox/remote/CMakeLists.txt b/samples/drivers/mbox/remote/CMakeLists.txt
index 66ee8e60668..311e489177d 100644
--- a/samples/drivers/mbox/remote/CMakeLists.txt
+++ b/samples/drivers/mbox/remote/CMakeLists.txt
@@ -20,8 +20,6 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET OR
    CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUPPR OR
    CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUFLPR OR
    CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR
-   CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUFLPR OR
-   CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUFLPR_XIP OR
    CONFIG_BOARD_NRF54L15DK_NRF54L15_CPUFLPR OR
    CONFIG_BOARD_STM32H747I_DISCO_STM32H747XX_M4)
   message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as remote in this sample")
diff --git a/samples/drivers/mbox/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay b/samples/drivers/mbox/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
deleted file mode 100644
index 20ce53cf824..00000000000
--- a/samples/drivers/mbox/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	mbox-consumer {
-		compatible = "vnd,mbox-consumer";
-		mboxes = <&cpuflpr_vevif_rx 16>, <&cpuflpr_vevif_tx 15>;
-		mbox-names = "rx", "tx";
-	};
-};
-
-&cpuflpr_vevif_rx {
-	status = "okay";
-};
-
-&cpuflpr_vevif_tx {
-	status = "okay";
-};
-
-&uart30 {
-	/delete-property/ hw-flow-control;
-};
diff --git a/samples/drivers/mbox/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay b/samples/drivers/mbox/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
deleted file mode 100644
index 20ce53cf824..00000000000
--- a/samples/drivers/mbox/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	mbox-consumer {
-		compatible = "vnd,mbox-consumer";
-		mboxes = <&cpuflpr_vevif_rx 16>, <&cpuflpr_vevif_tx 15>;
-		mbox-names = "rx", "tx";
-	};
-};
-
-&cpuflpr_vevif_rx {
-	status = "okay";
-};
-
-&cpuflpr_vevif_tx {
-	status = "okay";
-};
-
-&uart30 {
-	/delete-property/ hw-flow-control;
-};
diff --git a/samples/drivers/spi_flash/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/drivers/spi_flash/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index fb87b49cc22..00000000000
--- a/samples/drivers/spi_flash/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&mx25r64 {
-	status = "okay";
-};
diff --git a/samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 5c765a8a896..00000000000
--- a/samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&wdt31 {
-	status = "okay";
-};
diff --git a/samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay b/samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
deleted file mode 100644
index 5c765a8a896..00000000000
--- a/samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&wdt31 {
-	status = "okay";
-};
diff --git a/samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay b/samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
deleted file mode 100644
index 5c765a8a896..00000000000
--- a/samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&wdt31 {
-	status = "okay";
-};
diff --git a/samples/subsys/fs/fs_sample/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/subsys/fs/fs_sample/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
deleted file mode 100644
index 949237fd4ba..00000000000
--- a/samples/subsys/fs/fs_sample/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_DISK_DRIVERS=y
-CONFIG_DISK_DRIVER_FLASH=y
-# There may be no files on internal SoC flash, so this Kconfig
-# options has ben enabled to create some if listing does not
-# find in the first place.
-CONFIG_FS_SAMPLE_CREATE_SOME_ENTRIES=y
diff --git a/samples/subsys/fs/fs_sample/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/subsys/fs/fs_sample/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 391afea75a4..00000000000
--- a/samples/subsys/fs/fs_sample/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/* Because FAT FS needs at least 64kiB partition and default
- * storage_partition is 36kiB for this board, we need to reorganize
- * partitions to get at least 64KiB.
- */
-/delete-node/ &slot0_partition;
-/delete-node/ &slot1_partition;
-/delete-node/ &slot0_ns_partition;
-/delete-node/ &slot1_ns_partition;
-/delete-node/ &storage_partition;
-
-&cpuapp_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		slot0_partition: parition@10000 {
-			reg = <0x00010000 DT_SIZE_K(300)>;
-		};
-		slot1_partition: partition@5b000 {
-			reg = <0x0005b000 DT_SIZE_K(300)>;
-		};
-
-		storage_partition: partition@a6000 {
-			label = "storage";
-			reg = <0x000a6000 DT_SIZE_K(128)>;
-		};
-	};
-};
-
-/ {
-	msc_disk0 {
-		status="okay";
-		compatible = "zephyr,flash-disk";
-		partition = <&storage_partition>;
-		disk-name = "SD";
-		cache-size = <512>;
-	};
-};
diff --git a/samples/subsys/fs/fs_sample/sample.yaml b/samples/subsys/fs/fs_sample/sample.yaml
index d54960c7589..b16976876be 100644
--- a/samples/subsys/fs/fs_sample/sample.yaml
+++ b/samples/subsys/fs/fs_sample/sample.yaml
@@ -55,9 +55,6 @@ tests:
     extra_args:
       - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_ram_disk.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_ram_disk_region.overlay
-  sample.filesystem.fat_fs.nrf54l15pdk:
-    build_only: true
-    platform_allow: nrf54l15pdk/nrf54l15/cpuapp
   sample.filesystem.fat_fs.nrf54l15dk:
     build_only: true
     platform_allow: nrf54l15dk/nrf54l15/cpuapp
diff --git a/samples/subsys/fs/littlefs/sample.yaml b/samples/subsys/fs/littlefs/sample.yaml
index 2d78141c9db..2160d38515e 100644
--- a/samples/subsys/fs/littlefs/sample.yaml
+++ b/samples/subsys/fs/littlefs/sample.yaml
@@ -25,7 +25,6 @@ tests:
       - stm32h747i_disco/stm32h747xx/m7
       - stm32h750b_dk
       - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
       - frdm_ke17z
       - frdm_ke17z512
     integration_platforms:
diff --git a/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt b/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt
index 21d9bafeab0..7fdf33f9621 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt
+++ b/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt
@@ -11,8 +11,7 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 if(NOT CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP AND
     NOT CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUAPP AND
     NOT CONFIG_BOARD_STM32H747I_DISCO AND
-    NOT CONFIG_BOARD_NRF54L15DK_NRF54L15_CPUAPP AND
-    NOT CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUAPP)
+    NOT CONFIG_BOARD_NRF54L15DK_NRF54L15_CPUAPP)
   message(FATAL_ERROR "${BOARD} is not supported for this sample")
 endif()
 
diff --git a/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild b/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild
index ef6f7df968b..8ef1b70793b 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild
+++ b/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild
@@ -8,6 +8,5 @@ config REMOTE_BOARD
 string
 	default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk"
 	default "nrf5340bsim/nrf5340/cpunet" if $(BOARD) = "nrf5340bsim"
-	default "nrf54l15pdk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15pdk"
 	default "nrf54l15dk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15dk"
 	default "stm32h747i_disco/stm32h747xx/m4" if $(BOARD) = "stm32h747i_disco"
diff --git a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 0cfaf565349..00000000000
--- a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	soc {
-		reserved-memory {
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			sram_rx: memory@20018000 {
-				reg = <0x20018000 0x0800>;
-			};
-
-			sram_tx: memory@20020000 {
-				reg = <0x20020000 0x0800>;
-			};
-		};
-	};
-
-	ipc {
-		ipc0: ipc0 {
-			compatible = "zephyr,ipc-icmsg";
-			tx-region = <&sram_tx>;
-			rx-region = <&sram_rx>;
-			mboxes = <&cpuapp_vevif_rx 15>, <&cpuapp_vevif_tx 16>;
-			mbox-names = "rx", "tx";
-			status = "okay";
-		};
-	};
-};
-
-&cpuapp_vevif_rx {
-	status = "okay";
-};
-
-&cpuapp_vevif_tx {
-	status = "okay";
-};
diff --git a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
deleted file mode 100644
index b0e1f0d5034..00000000000
--- a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	soc {
-		reserved-memory {
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			sram_tx: memory@20018000 {
-				reg = <0x20018000 0x0800>;
-			};
-
-			sram_rx: memory@20020000 {
-				reg = <0x20020000 0x0800>;
-			};
-		};
-	};
-
-	ipc {
-		ipc0: ipc0 {
-			compatible = "zephyr,ipc-icmsg";
-			tx-region = <&sram_tx>;
-			rx-region = <&sram_rx>;
-			mboxes = <&cpuflpr_vevif_rx 16>, <&cpuflpr_vevif_tx 15>;
-			mbox-names = "rx", "tx";
-			status = "okay";
-		};
-	};
-};
-
-&cpuflpr_vevif_rx {
-	status = "okay";
-};
-
-&cpuflpr_vevif_tx {
-	status = "okay";
-};
-
-&uart30 {
-	/delete-property/ hw-flow-control;
-};
diff --git a/samples/subsys/settings/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/subsys/settings/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
deleted file mode 100644
index 3746c13c741..00000000000
--- a/samples/subsys/settings/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/sample.yaml b/samples/subsys/settings/sample.yaml
index db06905ac90..09d191c352a 100644
--- a/samples/subsys/settings/sample.yaml
+++ b/samples/subsys/settings/sample.yaml
@@ -13,7 +13,6 @@ tests:
       - native_sim/native/64
       - mr_canhubk3
       - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
     integration_platforms:
       - native_sim
diff --git a/samples/sysbuild/hello_world/sample.yaml b/samples/sysbuild/hello_world/sample.yaml
index 444410f46a3..d0a750bc87c 100644
--- a/samples/sysbuild/hello_world/sample.yaml
+++ b/samples/sysbuild/hello_world/sample.yaml
@@ -47,15 +47,6 @@ tests:
       SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpuppr_xip.conf
       hello_world_SNIPPET=nordic-ppr-xip
 
-  sample.sysbuild.hello_world.nrf54l15pdk_nrf54l15_cpuflpr:
-    platform_allow:
-      - nrf54l15pdk/nrf54l15/cpuapp
-    integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp
-    extra_args:
-      SB_CONF_FILE=sysbuild/nrf54l15pdk_nrf54l15_cpuflpr.conf
-      hello_world_SNIPPET=nordic-flpr
-
   sample.sysbuild.hello_world.nrf54l15dk_nrf54l15_cpuflpr:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
diff --git a/samples/sysbuild/hello_world/sysbuild/nrf54l15pdk_nrf54l15_cpuflpr.conf b/samples/sysbuild/hello_world/sysbuild/nrf54l15pdk_nrf54l15_cpuflpr.conf
deleted file mode 100644
index f67b1bb74ec..00000000000
--- a/samples/sysbuild/hello_world/sysbuild/nrf54l15pdk_nrf54l15_cpuflpr.conf
+++ /dev/null
@@ -1 +0,0 @@
-SB_CONFIG_REMOTE_BOARD="nrf54l15pdk/nrf54l15/cpuflpr"
diff --git a/snippets/nordic-flpr-xip/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/snippets/nordic-flpr-xip/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 0007419e1f8..00000000000
--- a/snippets/nordic-flpr-xip/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	soc {
-		reserved-memory {
-			#address-cells = <1>;
-			#size-cells = <1>;
-			cpuflpr_code_partition: image@165000 {
-				/* FLPR core code partition */
-				reg = <0x165000 DT_SIZE_K(96)>;
-			};
-		};
-	};
-};
-
-&uart30 {
-	status = "reserved";
-};
-
-&cpuflpr_vpr {
-	execution-memory = <&cpuflpr_code_partition>;
-};
-
-&cpuapp_vevif_tx {
-	status = "okay";
-};
diff --git a/snippets/nordic-flpr-xip/snippet.yml b/snippets/nordic-flpr-xip/snippet.yml
index e67274f37aa..921b186b039 100644
--- a/snippets/nordic-flpr-xip/snippet.yml
+++ b/snippets/nordic-flpr-xip/snippet.yml
@@ -3,9 +3,6 @@ append:
   EXTRA_DTC_OVERLAY_FILE: nordic-flpr-xip.overlay
 
 boards:
-  nrf54l15pdk/nrf54l15/cpuapp:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
   nrf54l15dk/nrf54l15/cpuapp:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/snippets/nordic-flpr/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/snippets/nordic-flpr/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index beb9ece1340..00000000000
--- a/snippets/nordic-flpr/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	soc {
-		reserved-memory {
-			#address-cells = <1>;
-			#size-cells = <1>;
-			cpuflpr_code_partition: image@165000 {
-				/* FLPR core code partition */
-				reg = <0x165000 DT_SIZE_K(96)>;
-			};
-		};
-
-		cpuflpr_sram_code_data: memory@20028000 {
-			compatible = "mmio-sram";
-			reg = <0x20028000 DT_SIZE_K(96)>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0x0 0x20028000 0x18000>;
-		};
-	};
-};
-
-&uart30 {
-	status = "reserved";
-};
-
-&cpuapp_sram {
-	reg = <0x20000000 DT_SIZE_K(160)>;
-	ranges = <0x0 0x20000000 0x28000>;
-};
-
-&cpuflpr_vpr {
-	execution-memory = <&cpuflpr_sram_code_data>;
-	source-memory = <&cpuflpr_code_partition>;
-};
-
-&cpuapp_vevif_tx {
-	status = "okay";
-};
diff --git a/snippets/nordic-flpr/snippet.yml b/snippets/nordic-flpr/snippet.yml
index 55bc247ea55..17f99b8400f 100644
--- a/snippets/nordic-flpr/snippet.yml
+++ b/snippets/nordic-flpr/snippet.yml
@@ -3,9 +3,6 @@ append:
   EXTRA_DTC_OVERLAY_FILE: nordic-flpr.overlay
 
 boards:
-  nrf54l15pdk/nrf54l15/cpuapp:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
   nrf54l15dk/nrf54l15/cpuapp:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/tests/boot/with_mcumgr/testcase.yaml b/tests/boot/with_mcumgr/testcase.yaml
index 37e7d91ffaf..0500bbaddf5 100644
--- a/tests/boot/with_mcumgr/testcase.yaml
+++ b/tests/boot/with_mcumgr/testcase.yaml
@@ -4,7 +4,6 @@ common:
     - nrf52840dk/nrf52840
     - nrf5340dk/nrf5340/cpuapp
     - nrf54l15dk/nrf54l15/cpuapp
-    - nrf54l15pdk/nrf54l15/cpuapp
     - nrf9160dk/nrf9160
     - nucleo_wba55cg
   integration_platforms:
diff --git a/tests/drivers/adc/adc_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/adc/adc_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index a7252902a0c..00000000000
--- a/tests/drivers/adc/adc_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (c) 2024 Nordic Semiconductor ASA
- */
-
-/ {
-	zephyr,user {
-		io-channels = <&adc 0>, <&adc 1> , <&adc 2>;
-	};
-};
-
-&adc {
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
-		zephyr,input-positive = <NRF_SAADC_AIN1>;
-		zephyr,resolution = <10>;
-	};
-
-	channel@1 {
-		reg = <1>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_EXTERNAL0";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,input-positive = <NRF_SAADC_AIN4>;
-		zephyr,resolution = <12>;
-	};
-
-	channel@2 {
-		reg = <2>;
-		zephyr,gain = "ADC_GAIN_2_5";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
-		zephyr,input-positive = <NRF_SAADC_AIN2>;
-		zephyr,resolution = <10>;
-	};
-};
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 8eb1b3c9f9f..00000000000
--- a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	resources {
-		compatible = "test-gpio-basic-api";
-		out-gpios = <&gpio1 10 0>;
-		in-gpios = <&gpio1 11 0>;
-	};
-};
-
-&gpiote20 {
-	status = "okay";
-};
-
-&gpio1 {
-	status = "okay";
-};
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
deleted file mode 100644
index 8eb1b3c9f9f..00000000000
--- a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	resources {
-		compatible = "test-gpio-basic-api";
-		out-gpios = <&gpio1 10 0>;
-		in-gpios = <&gpio1 11 0>;
-	};
-};
-
-&gpiote20 {
-	status = "okay";
-};
-
-&gpio1 {
-	status = "okay";
-};
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
deleted file mode 100644
index 8eb1b3c9f9f..00000000000
--- a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	resources {
-		compatible = "test-gpio-basic-api";
-		out-gpios = <&gpio1 10 0>;
-		in-gpios = <&gpio1 11 0>;
-	};
-};
-
-&gpiote20 {
-	status = "okay";
-};
-
-&gpio1 {
-	status = "okay";
-};
diff --git a/tests/drivers/i2s/i2s_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/i2s/i2s_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 8b82825a0f2..00000000000
--- a/tests/drivers/i2s/i2s_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/* i2s-node0 is the transmitter/receiver */
-
-/ {
-	aliases {
-		i2s-node0 = &i2s20;
-	};
-};
-
-&pinctrl {
-	i2s20_default_alt: i2s20_default_alt {
-		group1 {
-			psels = <NRF_PSEL(I2S_SCK_M, 1, 11)>,
-				<NRF_PSEL(I2S_LRCK_M, 1, 12)>,
-				<NRF_PSEL(I2S_SDOUT, 1, 8)>,
-				<NRF_PSEL(I2S_SDIN, 1, 9)>;
-		};
-	};
-};
-
-&i2s20 {
-	status = "okay";
-	pinctrl-0 = <&i2s20_default_alt>;
-	pinctrl-names = "default";
-};
diff --git a/tests/drivers/i2s/i2s_speed/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/i2s/i2s_speed/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 8b82825a0f2..00000000000
--- a/tests/drivers/i2s/i2s_speed/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/* i2s-node0 is the transmitter/receiver */
-
-/ {
-	aliases {
-		i2s-node0 = &i2s20;
-	};
-};
-
-&pinctrl {
-	i2s20_default_alt: i2s20_default_alt {
-		group1 {
-			psels = <NRF_PSEL(I2S_SCK_M, 1, 11)>,
-				<NRF_PSEL(I2S_LRCK_M, 1, 12)>,
-				<NRF_PSEL(I2S_SDOUT, 1, 8)>,
-				<NRF_PSEL(I2S_SDIN, 1, 9)>;
-		};
-	};
-};
-
-&i2s20 {
-	status = "okay";
-	pinctrl-0 = <&i2s20_default_alt>;
-	pinctrl-names = "default";
-};
diff --git a/tests/drivers/mbox/mbox_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/mbox/mbox_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 182d7324b6b..00000000000
--- a/tests/drivers/mbox/mbox_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	mbox-consumer {
-		compatible = "vnd,mbox-consumer";
-		mboxes = <&cpuapp_vevif_tx 16>, <&cpuapp_vevif_tx 32>,
-				 <&cpuapp_vevif_rx 15>, <&cpuapp_vevif_rx 32>;
-		mbox-names = "remote_valid", "remote_incorrect",
-					 "local_valid", "local_incorrect";
-
-	};
-};
-
-&cpuapp_vevif_rx {
-	status = "okay";
-};
-
-&cpuapp_vevif_tx {
-	status = "okay";
-};
diff --git a/tests/drivers/mbox/mbox_error_cases/sample.yaml b/tests/drivers/mbox/mbox_error_cases/sample.yaml
index c6183d32d4f..2025564e9a0 100644
--- a/tests/drivers/mbox/mbox_error_cases/sample.yaml
+++ b/tests/drivers/mbox/mbox_error_cases/sample.yaml
@@ -15,7 +15,6 @@ tests:
   tests.drivers.mbox_error_cases.nrf54l:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     extra_args: SNIPPET=nordic-flpr
diff --git a/tests/drivers/pwm/pwm_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/pwm/pwm_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 013653617e4..00000000000
--- a/tests/drivers/pwm/pwm_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,20 +0,0 @@
-&pinctrl {
-	pwm_default: pwm_default {
-		group1 {
-			psels = <NRF_PSEL(PWM_OUT0, 1, 8)>;
-		};
-	};
-	pwm_sleep: pwm_sleep {
-		group1 {
-			psels = <NRF_PSEL(PWM_OUT0, 1, 8)>;
-			low-power-enable;
-		};
-	};
-};
-
-&pwm20 {
-	status = "okay";
-	pinctrl-0 = <&pwm_default>;
-	pinctrl-1 = <&pwm_sleep>;
-	pinctrl-names = "default", "sleep";
-};
diff --git a/tests/drivers/sensor/temp_sensor/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/sensor/temp_sensor/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 435e4f4a6cc..00000000000
--- a/tests/drivers/sensor/temp_sensor/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,3 +0,0 @@
-temp_sensor: &temp {
-	status = "okay";
-};
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 033aab401ac..00000000000
--- a/tests/drivers/uart/uart_async_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&pinctrl {
-	uart21_default: uart21_default {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 1, 10)>,
-				<NRF_PSEL(UART_RX, 1, 11)>;
-		};
-	};
-
-	uart21_sleep: uart21_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 1, 10)>,
-				<NRF_PSEL(UART_RX, 1, 11)>;
-			low-power-enable;
-		};
-	};
-};
-
-/ {
-	chosen {
-		zephyr,console = &uart20;
-	};
-};
-
-dut: &uart21 {
-	status = "okay";
-	current-speed = <115200>;
-	pinctrl-0 = <&uart21_default>;
-	pinctrl-1 = <&uart21_sleep>;
-	pinctrl-names = "default", "sleep";
-};
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
deleted file mode 100644
index 1b4f1c8f71e..00000000000
--- a/tests/drivers/uart/uart_async_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&pinctrl {
-	uart21_default: uart21_default {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 1, 10)>,
-				<NRF_PSEL(UART_RX, 1, 11)>;
-		};
-	};
-
-	uart21_sleep: uart21_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 1, 10)>,
-				<NRF_PSEL(UART_RX, 1, 11)>;
-			low-power-enable;
-		};
-	};
-};
-
-dut: &uart21 {
-	status = "okay";
-	current-speed = <115200>;
-	pinctrl-0 = <&uart21_default>;
-	pinctrl-1 = <&uart21_sleep>;
-	pinctrl-names = "default", "sleep";
-};
diff --git a/tests/drivers/uart/uart_errors/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_errors/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index babbc740133..00000000000
--- a/tests/drivers/uart/uart_errors/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,54 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-
-&pinctrl {
-	uart21_default: uart21_default {
-		group1 {
-			psels = <NRF_PSEL(UART_RX, 1, 8)>,
-				<NRF_PSEL(UART_RTS, 1, 10)>;
-		};
-	};
-
-	uart21_sleep: uart21_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_RX, 1, 8)>,
-				<NRF_PSEL(UART_RTS, 1, 10)>;
-			low-power-enable;
-		};
-	};
-
-	uart22_default: uart22_default {
-		group1 {
-			psels =
-				<NRF_PSEL(UART_CTS, 1, 11)>;
-				bias-pull-up;
-		};
-		group2 {
-			psels = <NRF_PSEL(UART_TX, 1, 9)>;
-		};
-	};
-
-	uart22_sleep: uart22_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 1, 9)>,
-				<NRF_PSEL(UART_CTS, 1, 11)>;
-			low-power-enable;
-		};
-	};
-};
-
-dut: &uart21 {
-	status = "okay";
-	current-speed = <115200>;
-	pinctrl-0 = <&uart21_default>;
-	pinctrl-1 = <&uart21_sleep>;
-	pinctrl-names = "default", "sleep";
-};
-
-dut_aux: &uart22 {
-	status = "okay";
-	current-speed = <115200>;
-	pinctrl-0 = <&uart22_default>;
-	pinctrl-1 = <&uart22_sleep>;
-	pinctrl-names = "default", "sleep";
-	disable-rx;
-};
diff --git a/tests/lib/cpp/cxx/testcase.yaml b/tests/lib/cpp/cxx/testcase.yaml
index 642a2ed984d..bd14285146d 100644
--- a/tests/lib/cpp/cxx/testcase.yaml
+++ b/tests/lib/cpp/cxx/testcase.yaml
@@ -37,7 +37,6 @@ tests:
     # Exclude nRF54L15, nRF54H20 and nRF9280 as Nordic HAL is not compatible with C++98.
     # Exclude CONFIG_HAS_RENESAS_RA_FSP as Renesas RA HAL is not compatible with C++98.
     platform_exclude:
-      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
diff --git a/tests/subsys/fs/fcb/testcase.yaml b/tests/subsys/fs/fcb/testcase.yaml
index 5ec3bbf2a19..315d3105e8f 100644
--- a/tests/subsys/fs/fcb/testcase.yaml
+++ b/tests/subsys/fs/fcb/testcase.yaml
@@ -15,7 +15,6 @@ tests:
   filesystem.fcb.no_erase:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
   filesystem.fcb.native_sim.no_erase:
     extra_args: CONFIG_FLASH_SIMULATOR_EXPLICIT_ERASE=n
     platform_allow: native_sim
diff --git a/tests/subsys/fs/littlefs/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/subsys/fs/littlefs/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 292e98c96a0..00000000000
--- a/tests/subsys/fs/littlefs/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/delete-node/ &slot0_ns_partition;
-/delete-node/ &slot1_partition;
-/delete-node/ &slot1_ns_partition;
-
-&cpuapp_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		small_partition: partition@67000 {
-			label = "small";
-			reg = <0x00067000 0x00010000>;
-		};
-	};
-};
diff --git a/tests/subsys/fs/littlefs/testcase.yaml b/tests/subsys/fs/littlefs/testcase.yaml
index 49f19492ab4..bacc696844a 100644
--- a/tests/subsys/fs/littlefs/testcase.yaml
+++ b/tests/subsys/fs/littlefs/testcase.yaml
@@ -15,7 +15,7 @@ common:
 tests:
   filesystem.littlefs.default:
     timeout: 60
-    platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
+    platform_allow: nrf54l15dk/nrf54l15/cpuapp
   filesystem.littlefs.custom:
     timeout: 180
     extra_configs:
diff --git a/tests/subsys/storage/stream/stream_flash/testcase.yaml b/tests/subsys/storage/stream/stream_flash/testcase.yaml
index 9d42d9c3182..b623b64e04b 100644
--- a/tests/subsys/storage/stream/stream_flash/testcase.yaml
+++ b/tests/subsys/storage/stream/stream_flash/testcase.yaml
@@ -22,7 +22,6 @@ tests:
   storage.stream_flash.no_explicit_erase:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp
   storage.stream_flash.dword_wbs:
     extra_args: DTC_OVERLAY_FILE=unaligned_flush.overlay
     tags: stream_flash

From cf8dece1fe3ceb19af4b0191872d4a2420a73eae Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Wed, 16 Oct 2024 22:06:22 +0200
Subject: [PATCH 0703/2913] [nrf fromtree] soc: nordic: Remove the nRF54L15
 EngA

The production version of the nRF54L15 SoC is now available, so remove
the initial Engineering A (EngA) preview version.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit 51c1e453016f068ff63d7d6d0110f8defcfa2688)
(cherry picked from commit 05600096da4a00bb7835a0fc7806aa227ec66d56)
---
 drivers/mbox/mbox_nrf_vevif_event_rx.c        |    5 -
 drivers/mbox/mbox_nrf_vevif_event_tx.c        |    4 -
 drivers/mbox/mbox_nrf_vevif_task_rx.c         |    5 -
 drivers/mbox/mbox_nrf_vevif_task_tx.c         |    4 -
 .../nordic_vpr_launcher/nordic_vpr_launcher.c |    6 +-
 dts/arm/nordic/nrf54l15_enga_cpuapp.dtsi      |   18 -
 dts/riscv/nordic/nrf54l15_enga_cpuflpr.dtsi   |   25 -
 modules/hal_nordic/nrfx/CMakeLists.txt        |    7 +-
 modules/hal_nordic/nrfx/nrfx_config.h         |    4 -
 .../nrfx_config_nrf54l15_enga_application.h   | 1667 ----------------
 .../nrfx/nrfx_config_nrf54l15_enga_flpr.h     | 1668 -----------------
 soc/nordic/common/vpr/Kconfig.sysbuild        |    2 +-
 soc/nordic/nrf54l/Kconfig                     |   14 -
 .../Kconfig.defconfig.nrf54l15_enga_cpuapp    |   14 -
 .../Kconfig.defconfig.nrf54l15_enga_cpuflpr   |   18 -
 soc/nordic/nrf54l/Kconfig.soc                 |   18 -
 tests/kernel/interrupt/src/nested_irq.c       |    2 +-
 17 files changed, 5 insertions(+), 3476 deletions(-)
 delete mode 100644 dts/arm/nordic/nrf54l15_enga_cpuapp.dtsi
 delete mode 100644 dts/riscv/nordic/nrf54l15_enga_cpuflpr.dtsi
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_application.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_flpr.h
 delete mode 100644 soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuapp
 delete mode 100644 soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuflpr

diff --git a/drivers/mbox/mbox_nrf_vevif_event_rx.c b/drivers/mbox/mbox_nrf_vevif_event_rx.c
index a7ec6dd9fff..b5be6a97b79 100644
--- a/drivers/mbox/mbox_nrf_vevif_event_rx.c
+++ b/drivers/mbox/mbox_nrf_vevif_event_rx.c
@@ -10,13 +10,8 @@
 
 #include <haly/nrfy_vpr.h>
 
-#if defined(CONFIG_SOC_NRF54L15_ENGA_CPUAPP)
-#define EVENTS_IDX_MIN 11U
-#define EVENTS_IDX_MAX 17U
-#else
 #define EVENTS_IDX_MIN NRF_VPR_EVENTS_TRIGGERED_MIN
 #define EVENTS_IDX_MAX NRF_VPR_EVENTS_TRIGGERED_MAX
-#endif
 
 /* callbacks */
 struct mbox_vevif_event_rx_cbs {
diff --git a/drivers/mbox/mbox_nrf_vevif_event_tx.c b/drivers/mbox/mbox_nrf_vevif_event_tx.c
index 6a9e51aab50..8bd731f56a5 100644
--- a/drivers/mbox/mbox_nrf_vevif_event_tx.c
+++ b/drivers/mbox/mbox_nrf_vevif_event_tx.c
@@ -12,11 +12,7 @@
 #include <hal/nrf_vpr_csr.h>
 #include <hal/nrf_vpr_csr_vevif.h>
 
-#if defined(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR)
-#define EVENTS_IDX_MAX 17U
-#else
 #define EVENTS_IDX_MAX NRF_VPR_EVENTS_TRIGGERED_MAX
-#endif
 
 #define VEVIF_EVENTS_NUM  DT_INST_PROP(0, nordic_events)
 #define VEVIF_EVENTS_MASK DT_INST_PROP(0, nordic_events_mask)
diff --git a/drivers/mbox/mbox_nrf_vevif_task_rx.c b/drivers/mbox/mbox_nrf_vevif_task_rx.c
index a489d4d3717..8783424ae98 100644
--- a/drivers/mbox/mbox_nrf_vevif_task_rx.c
+++ b/drivers/mbox/mbox_nrf_vevif_task_rx.c
@@ -12,13 +12,8 @@
 #include <hal/nrf_vpr_csr.h>
 #include <hal/nrf_vpr_csr_vevif.h>
 
-#if defined(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR)
-#define TASKS_IDX_MIN 11U
-#define TASKS_IDX_MAX 17U
-#else
 #define TASKS_IDX_MIN NRF_VPR_TASKS_TRIGGER_MIN
 #define TASKS_IDX_MAX NRF_VPR_TASKS_TRIGGER_MAX
-#endif
 
 #define VEVIF_TASKS_NUM  DT_INST_PROP(0, nordic_tasks)
 #define VEVIF_TASKS_MASK DT_INST_PROP(0, nordic_tasks_mask)
diff --git a/drivers/mbox/mbox_nrf_vevif_task_tx.c b/drivers/mbox/mbox_nrf_vevif_task_tx.c
index 191a94962d6..a409ef214b7 100644
--- a/drivers/mbox/mbox_nrf_vevif_task_tx.c
+++ b/drivers/mbox/mbox_nrf_vevif_task_tx.c
@@ -10,11 +10,7 @@
 
 #include <haly/nrfy_vpr.h>
 
-#if defined(CONFIG_SOC_NRF54L15_ENGA_CPUAPP)
-#define TASKS_IDX_MAX 17U
-#else
 #define TASKS_IDX_MAX NRF_VPR_TASKS_TRIGGER_MAX
-#endif
 
 struct mbox_vevif_task_tx_conf {
 	NRF_VPR_Type *vpr;
diff --git a/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c b/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
index e50161f214c..c688a97f654 100644
--- a/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
+++ b/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
@@ -14,8 +14,7 @@
 #include <zephyr/toolchain.h>
 
 #include <hal/nrf_vpr.h>
-#if (defined(CONFIG_SOC_NRF54L15_ENGA_CPUAPP) || defined(CONFIG_SOC_NRF54L15_CPUAPP)) && \
-	!defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
+#if defined(CONFIG_SOC_NRF54L15_CPUAPP) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
 #include <hal/nrf_spu.h>
 #endif
 
@@ -42,8 +41,7 @@ static int nordic_vpr_launcher_init(const struct device *dev)
 	}
 #endif
 
-#if (defined(CONFIG_SOC_NRF54L15_ENGA_CPUAPP) || defined(CONFIG_SOC_NRF54L15_CPUAPP)) && \
-	!defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
+#if defined(CONFIG_SOC_NRF54L15_CPUAPP) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
 	nrf_spu_periph_perm_secattr_set(NRF_SPU00, nrf_address_slave_get((uint32_t)config->vpr),
 					true);
 #endif
diff --git a/dts/arm/nordic/nrf54l15_enga_cpuapp.dtsi b/dts/arm/nordic/nrf54l15_enga_cpuapp.dtsi
deleted file mode 100644
index 0d62590839c..00000000000
--- a/dts/arm/nordic/nrf54l15_enga_cpuapp.dtsi
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <arm/nordic/nrf54l15_cpuapp.dtsi>
-
-/delete-node/ &pdm20;
-/delete-node/ &pdm21;
-
-&cpuapp_vevif_rx {
-	nordic,events-mask = <0x00008000>;
-};
-
-&cpuapp_vevif_tx {
-	nordic,tasks-mask = <0x0003f800>;
-};
diff --git a/dts/riscv/nordic/nrf54l15_enga_cpuflpr.dtsi b/dts/riscv/nordic/nrf54l15_enga_cpuflpr.dtsi
deleted file mode 100644
index 3f5e37ff405..00000000000
--- a/dts/riscv/nordic/nrf54l15_enga_cpuflpr.dtsi
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <riscv/nordic/nrf54l15_cpuflpr.dtsi>
-
-/delete-node/ &pdm20;
-/delete-node/ &pdm21;
-
-&cpuflpr_vevif_rx {
-	nordic,tasks-mask = <0x0003f800>;
-	interrupts = <11 NRF_DEFAULT_IRQ_PRIORITY>,
-			     <12 NRF_DEFAULT_IRQ_PRIORITY>,
-			     <13 NRF_DEFAULT_IRQ_PRIORITY>,
-			     <14 NRF_DEFAULT_IRQ_PRIORITY>,
-			     <15 NRF_DEFAULT_IRQ_PRIORITY>,
-			     <16 NRF_DEFAULT_IRQ_PRIORITY>,
-			     <17 NRF_DEFAULT_IRQ_PRIORITY>;
-};
-
-&cpuflpr_vevif_tx {
-		nordic,events-mask = <0x00008000>;
-};
diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index d451f5f1a54..1c854a822d5 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -52,9 +52,6 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR NRF54H20_ENGB_X
                                                                  NRF_PPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR NRF54H20_ENGB_XXAA
                                                                   NRF_FLPR)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA       NRF54L15_ENGA_XXAA)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUAPP NRF_APPLICATION)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15            NRF54L15_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR    NRF_FLPR)
@@ -183,7 +180,7 @@ if(DEFINED uicr_path)
   endif()
 endif()
 
-if(CONFIG_SOC_NRF54L15_ENGA_CPUAPP OR CONFIG_SOC_NRF54L15_CPUAPP OR CONFIG_SOC_NRF54L20_ENGA_CPUAPP)
+if(CONFIG_SOC_NRF54L15_CPUAPP OR CONFIG_SOC_NRF54L20_ENGA_CPUAPP)
 	dt_prop(clock_frequency PATH "/cpus/cpu@0" PROPERTY "clock-frequency")
 	math(EXPR clock_frequency_mhz "${clock_frequency} / 1000000")
 	zephyr_compile_definitions("NRF_CONFIG_CPU_FREQ_MHZ=${clock_frequency_mhz}")
@@ -237,8 +234,6 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP  nrf54h20_engb_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR  nrf54h20_engb_ppr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR nrf54h20_engb_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD  nrf54h20_engb_radiocore.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUAPP nrf54l15_enga_application.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR nrf54l15_enga_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP      nrf54l15_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR     nrf54l15_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54l20_enga_application.svd)
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index 3c91aae6de6..cfd70516972 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -1129,10 +1129,6 @@
     #include <nrfx_config_nrf54h20_ppr.h>
 #elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_FLPR)
     #include <nrfx_config_nrf54h20_flpr.h>
-#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_APPLICATION)
-    #include <nrfx_config_nrf54l15_enga_application.h>
-#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_FLPR)
-    #include <nrfx_config_nrf54l15_enga_flpr.h>
 #elif defined(NRF54L15_XXAA) && defined(NRF_APPLICATION)
     #include <nrfx_config_nrf54l15_application.h>
 #elif defined(NRF54L15_XXAA) && defined(NRF_FLPR)
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_application.h
deleted file mode 100644
index aa23f93c9e3..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_application.h
+++ /dev/null
@@ -1,1667 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54L15_ENGA_APPLICATION_H__
-#define NRFX_CONFIG_NRF54L15_ENGA_APPLICATION_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU10_ENABLED
-#define NRFX_EGU10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU20_ENABLED
-#define NRFX_EGU20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE20_ENABLED
-#define NRFX_GPIOTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE30_ENABLED
-#define NRFX_GPIOTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 10
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x00000fe7
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_I2S20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S20_ENABLED
-#define NRFX_I2S20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM20_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM20_ENABLED
-#define NRFX_PWM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM21_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM21_ENABLED
-#define NRFX_PWM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM22_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM22_ENABLED
-#define NRFX_PWM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC20_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC20_ENABLED
-#define NRFX_QDEC20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC21_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC21_ENABLED
-#define NRFX_QDEC21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_QDEC20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC20_ENABLED
-#define NRFX_QDEC20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC21_ENABLED
-#define NRFX_QDEC21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_ENABLED
-#define NRFX_RRAMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
-#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
-#define NRFX_RRAMC_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_RTC10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC10_ENABLED
-#define NRFX_RTC10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC30_ENABLED
-#define NRFX_RTC30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_EXTENDED_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_EXTENDED_ENABLED
-#define NRFX_SPIM_EXTENDED_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_SPIM00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM00_ENABLED
-#define NRFX_SPIM00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM20_ENABLED
-#define NRFX_SPIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM21_ENABLED
-#define NRFX_SPIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM22_ENABLED
-#define NRFX_SPIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM30_ENABLED
-#define NRFX_SPIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_SPIS00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS00_ENABLED
-#define NRFX_SPIS00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS20_ENABLED
-#define NRFX_SPIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS21_ENABLED
-#define NRFX_SPIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS22_ENABLED
-#define NRFX_SPIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS30_ENABLED
-#define NRFX_SPIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_TIMER00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER00_ENABLED
-#define NRFX_TIMER00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER10_ENABLED
-#define NRFX_TIMER10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER20_ENABLED
-#define NRFX_TIMER20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER21_ENABLED
-#define NRFX_TIMER21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER22_ENABLED
-#define NRFX_TIMER22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER23_ENABLED
-#define NRFX_TIMER23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER24_ENABLED
-#define NRFX_TIMER24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_TWIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM20_ENABLED
-#define NRFX_TWIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM21_ENABLED
-#define NRFX_TWIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM22_ENABLED
-#define NRFX_TWIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM30_ENABLED
-#define NRFX_TWIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
- *        Assume that any instance would be initialized only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_TWIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS20_ENABLED
-#define NRFX_TWIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS21_ENABLED
-#define NRFX_TWIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS22_ENABLED
-#define NRFX_TWIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS30_ENABLED
-#define NRFX_TWIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
- *        If enabled, support for configuring GPIO pins is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
- *        If enabled, support for configuring PSEL registers is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_UARTE00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE00_ENABLED
-#define NRFX_UARTE00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE20_ENABLED
-#define NRFX_UARTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE21_ENABLED
-#define NRFX_UARTE21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE22_ENABLED
-#define NRFX_UARTE22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE30_ENABLED
-#define NRFX_UARTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_WDT30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT30_ENABLED
-#define NRFX_WDT30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT31_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT31_ENABLED
-#define NRFX_WDT31_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54L15_ENGA_APPLICATION_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_flpr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_flpr.h
deleted file mode 100644
index 568790051a3..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_flpr.h
+++ /dev/null
@@ -1,1668 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54L15_ENGA_FLPR_H__
-#define NRFX_CONFIG_NRF54L15_ENGA_FLPR_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU10_ENABLED
-#define NRFX_EGU10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU20_ENABLED
-#define NRFX_EGU20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE20_ENABLED
-#define NRFX_GPIOTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE30_ENABLED
-#define NRFX_GPIOTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 2
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x00000018
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_I2S20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S20_ENABLED
-#define NRFX_I2S20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 3
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM20_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM20_ENABLED
-#define NRFX_PWM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM21_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM21_ENABLED
-#define NRFX_PWM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM22_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM22_ENABLED
-#define NRFX_PWM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 3
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC20_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC20_ENABLED
-#define NRFX_QDEC20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC21_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC21_ENABLED
-#define NRFX_QDEC21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_QDEC20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC20_ENABLED
-#define NRFX_QDEC20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC21_ENABLED
-#define NRFX_QDEC21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_ENABLED
-#define NRFX_RRAMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
-#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
-#define NRFX_RRAMC_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_RTC10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC10_ENABLED
-#define NRFX_RTC10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC30_ENABLED
-#define NRFX_RTC30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_EXTENDED_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_EXTENDED_ENABLED
-#define NRFX_SPIM_EXTENDED_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_SPIM00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM00_ENABLED
-#define NRFX_SPIM00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM20_ENABLED
-#define NRFX_SPIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM21_ENABLED
-#define NRFX_SPIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM22_ENABLED
-#define NRFX_SPIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM30_ENABLED
-#define NRFX_SPIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_SPIS00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS00_ENABLED
-#define NRFX_SPIS00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS20_ENABLED
-#define NRFX_SPIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS21_ENABLED
-#define NRFX_SPIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS22_ENABLED
-#define NRFX_SPIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS30_ENABLED
-#define NRFX_SPIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_TIMER00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER00_ENABLED
-#define NRFX_TIMER00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER10_ENABLED
-#define NRFX_TIMER10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER20_ENABLED
-#define NRFX_TIMER20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER21_ENABLED
-#define NRFX_TIMER21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER22_ENABLED
-#define NRFX_TIMER22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER23_ENABLED
-#define NRFX_TIMER23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER24_ENABLED
-#define NRFX_TIMER24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_TWIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM20_ENABLED
-#define NRFX_TWIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM21_ENABLED
-#define NRFX_TWIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM22_ENABLED
-#define NRFX_TWIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM30_ENABLED
-#define NRFX_TWIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
- *        Assume that any instance would be initialized only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_TWIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS20_ENABLED
-#define NRFX_TWIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS21_ENABLED
-#define NRFX_TWIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS22_ENABLED
-#define NRFX_TWIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS30_ENABLED
-#define NRFX_TWIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
- *        If enabled, support for configuring GPIO pins is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
- *        If enabled, support for configuring PSEL registers is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK
- *        If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_UARTE00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE00_ENABLED
-#define NRFX_UARTE00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE20_ENABLED
-#define NRFX_UARTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE21_ENABLED
-#define NRFX_UARTE21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE22_ENABLED
-#define NRFX_UARTE22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE30_ENABLED
-#define NRFX_UARTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_VEVIF_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_VEVIF_ENABLED
-#define NRFX_VEVIF_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 0
-#endif
-
-/**
- * @brief NRFX_WDT30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT30_ENABLED
-#define NRFX_WDT30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT31_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT31_ENABLED
-#define NRFX_WDT31_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54L15_ENGA_FLPR_H__ */
diff --git a/soc/nordic/common/vpr/Kconfig.sysbuild b/soc/nordic/common/vpr/Kconfig.sysbuild
index 54464f10bc4..cfbd619f623 100644
--- a/soc/nordic/common/vpr/Kconfig.sysbuild
+++ b/soc/nordic/common/vpr/Kconfig.sysbuild
@@ -4,7 +4,7 @@
 config VPR_LAUNCHER
 	bool "VPR launcher"
 	default y
-	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L15_ENGA_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR)
+	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR)
 	help
 	  Include VPR launcher in build.
 	  VPR launcher is a minimal sample built for an ARM core that starts given VPR core.
diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index 8c670b9355e..2db8e8248f9 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -9,17 +9,6 @@ config SOC_SERIES_NRF54LX
 	select HAS_NORDIC_DRIVERS
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 
-config SOC_NRF54L15_ENGA_CPUAPP
-	select ARM
-	select ARMV8_M_DSP
-	select CPU_CORTEX_M33
-	select CPU_HAS_ARM_MPU
-	select CPU_HAS_ICACHE
-	select CPU_HAS_ARM_SAU
-	select CPU_HAS_FPU
-	select HAS_HW_NRF_RADIO_IEEE802154
-	select HAS_POWEROFF
-
 config SOC_NRF54L15_CPUAPP
 	select ARM
 	select ARMV8_M_DSP
@@ -42,9 +31,6 @@ config SOC_NRF54L20_ENGA_CPUAPP
 	select HAS_HW_NRF_RADIO_IEEE802154
 	select HAS_POWEROFF
 
-config SOC_NRF54L15_ENGA_CPUFLPR
-	depends on RISCV_CORE_NORDIC_VPR
-
 config SOC_NRF54L15_CPUFLPR
 	depends on RISCV_CORE_NORDIC_VPR
 
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuapp b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuapp
deleted file mode 100644
index 80957abfdd7..00000000000
--- a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuapp
+++ /dev/null
@@ -1,14 +0,0 @@
-# Nordic Semiconductor nRF54L15 MCU
-
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_NRF54L15_ENGA_CPUAPP
-
-config NUM_IRQS
-	default 271
-
-config IEEE802154_NRF5
-	default IEEE802154
-
-endif # SOC_NRF54L15_ENGA_CPUAPP
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuflpr b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuflpr
deleted file mode 100644
index 86c80d08fc2..00000000000
--- a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuflpr
+++ /dev/null
@@ -1,18 +0,0 @@
-# Nordic Semiconductor nRF54L15 MCU
-
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_NRF54L15_ENGA_CPUFLPR
-
-config RISCV_HAS_CPU_IDLE
-	bool
-
-config NUM_IRQS
-	int
-	default 287
-# As FLPR has limited memory most of tests does not fit with asserts enabled.
-config ASSERT
-	default n
-
-endif # SOC_NRF54L15_ENGA_CPUFLPR
diff --git a/soc/nordic/nrf54l/Kconfig.soc b/soc/nordic/nrf54l/Kconfig.soc
index 9251c708c52..25deae9fade 100644
--- a/soc/nordic/nrf54l/Kconfig.soc
+++ b/soc/nordic/nrf54l/Kconfig.soc
@@ -9,24 +9,6 @@ config SOC_NRF54L15
 	help
 	  NRF54L15
 
-config SOC_NRF54L15_ENGA
-	bool
-	select SOC_NRF54L15
-	help
-	  NRF54L15 ENGA
-
-config SOC_NRF54L15_ENGA_CPUAPP
-	bool
-	select SOC_NRF54L15_ENGA
-	help
-	  NRF54L15 ENGA CPUAPP
-
-config SOC_NRF54L15_ENGA_CPUFLPR
-	bool
-	select SOC_NRF54L15_ENGA
-	help
-	  NRF54L15 ENGA CPUFLPR
-
 config SOC_NRF54L15_CPUAPP
 	bool
 	select SOC_NRF54L15
diff --git a/tests/kernel/interrupt/src/nested_irq.c b/tests/kernel/interrupt/src/nested_irq.c
index 1650a7b77ec..6d84dda2ef8 100644
--- a/tests/kernel/interrupt/src/nested_irq.c
+++ b/tests/kernel/interrupt/src/nested_irq.c
@@ -56,7 +56,7 @@
  */
 #define IRQ0_PRIO	IRQ_DEFAULT_PRIORITY
 #define IRQ1_PRIO	0x0
-#elif defined(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR) || defined(CONFIG_SOC_NRF54L15_CPUFLPR)
+#elif defined(CONFIG_SOC_NRF54L15_CPUFLPR)
 #define IRQ0_LINE	16
 #define IRQ1_LINE	17
 

From f3f8ba08b4d24a93c09b2f5bb5ddaf0ebe6501e8 Mon Sep 17 00:00:00 2001
From: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
Date: Fri, 19 Jul 2024 10:01:52 +0200
Subject: [PATCH 0704/2913] [nrf fromtree] tests: adc_accuracy: Add overlay for
 nrf52840dk.

Add overlay and enable test for nrf52840dk.

Signed-off-by: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
(cherry picked from commit dc9a9dcf40dc0f42d2532653aa4b7ac6f01eaecb)
(cherry picked from commit e480cb138a588e1db6c1c465847637efaa65db98)
---
 .../boards/nrf52840dk_nrf52840.overlay        | 28 +++++++++++++++++++
 .../adc/adc_accuracy_test/testcase.yaml       |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 tests/drivers/adc/adc_accuracy_test/boards/nrf52840dk_nrf52840.overlay

diff --git a/tests/drivers/adc/adc_accuracy_test/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/adc/adc_accuracy_test/boards/nrf52840dk_nrf52840.overlay
new file mode 100644
index 00000000000..85a8c6880c9
--- /dev/null
+++ b/tests/drivers/adc/adc_accuracy_test/boards/nrf52840dk_nrf52840.overlay
@@ -0,0 +1,28 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ */
+
+
+/ {
+	zephyr,user {
+		io-channels = <&adc 0>;
+		reference_mv = <3000>;
+	};
+};
+
+&adc {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1_6";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN1>; /* P0.03 */
+		zephyr,resolution = <14>;
+	};
+
+};
diff --git a/tests/drivers/adc/adc_accuracy_test/testcase.yaml b/tests/drivers/adc/adc_accuracy_test/testcase.yaml
index 8f6978a49fc..210ef2b70f0 100644
--- a/tests/drivers/adc/adc_accuracy_test/testcase.yaml
+++ b/tests/drivers/adc/adc_accuracy_test/testcase.yaml
@@ -20,3 +20,4 @@ tests:
       - frdm_kl25z
       - ek_ra8m1
       - frdm_mcxc242
+      - nrf52840dk/nrf52840

From 72828212a1cac53ceb61b9ae041db9569088f46a Mon Sep 17 00:00:00 2001
From: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
Date: Fri, 19 Jul 2024 11:42:10 +0200
Subject: [PATCH 0705/2913] [nrf fromtree] tests: adc_accuracy: Add overlay for
 nrf54h20dk.

Add overlay and enable test for nrf54h20dk.

Signed-off-by: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
(cherry picked from commit d4c8b358fa747d56cd685381d8f757c4a0adb788)
(cherry picked from commit 6a344f4df1ab64dec6a444487dfe28ecb65f1728)
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 26 +++++++++++++++++++
 .../adc/adc_accuracy_test/testcase.yaml       |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 tests/drivers/adc/adc_accuracy_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/tests/drivers/adc/adc_accuracy_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/adc/adc_accuracy_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..20bd3110aff
--- /dev/null
+++ b/tests/drivers/adc/adc_accuracy_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,26 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc 0>;
+		reference_mv = <1800>;
+	};
+};
+
+&adc {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1_2";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN4>;
+		zephyr,resolution = <14>;
+	};
+};
diff --git a/tests/drivers/adc/adc_accuracy_test/testcase.yaml b/tests/drivers/adc/adc_accuracy_test/testcase.yaml
index 210ef2b70f0..ccfaa02ed7d 100644
--- a/tests/drivers/adc/adc_accuracy_test/testcase.yaml
+++ b/tests/drivers/adc/adc_accuracy_test/testcase.yaml
@@ -21,3 +21,4 @@ tests:
       - ek_ra8m1
       - frdm_mcxc242
       - nrf52840dk/nrf52840
+      - nrf54h20dk/nrf54h20/cpuapp

From 2261985cfacdf16787f26cd1492c11d998927dc8 Mon Sep 17 00:00:00 2001
From: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
Date: Fri, 19 Jul 2024 12:03:56 +0200
Subject: [PATCH 0706/2913] [nrf fromtree] tests: adc_accuracy: add overlay for
 nrf54l15dk.

Add overlay and enable test for nrf54l15dk.

Signed-off-by: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
(cherry picked from commit 108f6cdf3a7a043f8511b67a614b73629b8e31ec)
(cherry picked from commit 03f4a983a7ae3cb3c2d84eb117b2ca2885029449)
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 26 +++++++++++++++++++
 .../adc/adc_accuracy_test/testcase.yaml       |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 tests/drivers/adc/adc_accuracy_test/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/adc/adc_accuracy_test/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/adc/adc_accuracy_test/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..950c52047f6
--- /dev/null
+++ b/tests/drivers/adc/adc_accuracy_test/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,26 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc 0>;
+		reference_mv = <1800>;
+	};
+};
+
+&adc {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1_2";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN2>;
+		zephyr,resolution = <14>;
+	};
+};
diff --git a/tests/drivers/adc/adc_accuracy_test/testcase.yaml b/tests/drivers/adc/adc_accuracy_test/testcase.yaml
index ccfaa02ed7d..4c7f2cfff5c 100644
--- a/tests/drivers/adc/adc_accuracy_test/testcase.yaml
+++ b/tests/drivers/adc/adc_accuracy_test/testcase.yaml
@@ -21,4 +21,5 @@ tests:
       - ek_ra8m1
       - frdm_mcxc242
       - nrf52840dk/nrf52840
+      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp

From 12ddfcb81c035a1a486aeac9e470a1e278c5cd72 Mon Sep 17 00:00:00 2001
From: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
Date: Fri, 19 Jul 2024 15:34:42 +0200
Subject: [PATCH 0707/2913] [nrf fromtree] tests: drivers: adc_api: change
 second channel gain for nrf54.

It will increase test coverage for adc driver, no test uses
ADC_GAIN_2_3 setting yet.

Signed-off-by: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
(cherry picked from commit 008f8babac6e4ccf7295dc82905e434e9cf20acc)
(cherry picked from commit e31be6fa1722d2ef33fe910870f2a180a9c4d0c1)
---
 .../adc/adc_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay       | 2 +-
 .../adc/adc_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/drivers/adc/adc_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/adc/adc_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index d9c1f965add..536366ec8d5 100644
--- a/tests/drivers/adc/adc_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/drivers/adc/adc_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -34,7 +34,7 @@
 
 	channel@2 {
 		reg = <2>;
-		zephyr,gain = "ADC_GAIN_1_2";
+		zephyr,gain = "ADC_GAIN_2_3";
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
 		zephyr,input-positive = <NRF_SAADC_AIN2>;
diff --git a/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index a7252902a0c..87707847eea 100644
--- a/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -34,7 +34,7 @@
 
 	channel@2 {
 		reg = <2>;
-		zephyr,gain = "ADC_GAIN_2_5";
+		zephyr,gain = "ADC_GAIN_2_3";
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
 		zephyr,input-positive = <NRF_SAADC_AIN2>;

From d080de6f944151701c1e2da76eec0c59a4498503 Mon Sep 17 00:00:00 2001
From: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
Date: Fri, 19 Jul 2024 15:34:42 +0200
Subject: [PATCH 0708/2913] [nrf fromtree] tests: drivers: adc_accuracy:
 parametrize expected accuracy

On nrf boards expected accuracy from ref voltage is 64 instead of 32.

Signed-off-by: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
(cherry picked from commit 557b5bda9a043c1f9f01c877fe123808a90a8f88)
(cherry picked from commit 13bd825d4792f15f7b23f021e30ad27b516409b7)
---
 tests/drivers/adc/adc_accuracy_test/boards/ek_ra8m1.overlay    | 1 +
 tests/drivers/adc/adc_accuracy_test/boards/frdm_kl25z.overlay  | 1 +
 .../drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.overlay  | 1 +
 .../adc/adc_accuracy_test/boards/nrf52840dk_nrf52840.overlay   | 1 +
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay                  | 1 +
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay                  | 1 +
 tests/drivers/adc/adc_accuracy_test/src/ref_volt.c             | 3 ++-
 7 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra8m1.overlay b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra8m1.overlay
index e3aced0a41b..83209ee3b9e 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra8m1.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra8m1.overlay
@@ -8,6 +8,7 @@
 	zephyr,user {
 		io-channels = <&adc0 0>;
 		reference_mv = <3300>;
+		expected_accuracy = <32>;
 	};
 };
 
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/frdm_kl25z.overlay b/tests/drivers/adc/adc_accuracy_test/boards/frdm_kl25z.overlay
index 148ecda4535..3be90387270 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/frdm_kl25z.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/frdm_kl25z.overlay
@@ -8,6 +8,7 @@
 	zephyr,user {
 		io-channels = <&adc0 12>;
 		reference_mv = <1100>;
+		expected_accuracy = <32>;
 	};
 };
 
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.overlay b/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.overlay
index 7d0c761c944..1397a540c92 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.overlay
@@ -10,6 +10,7 @@
 	zephyr,user {
 		io-channels = <&adc0 1>;
 		reference_mv = <1650>;
+		expected_accuracy = <32>;
 	};
 };
 
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/adc/adc_accuracy_test/boards/nrf52840dk_nrf52840.overlay
index 85a8c6880c9..08aa282bc60 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/nrf52840dk_nrf52840.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/nrf52840dk_nrf52840.overlay
@@ -9,6 +9,7 @@
 	zephyr,user {
 		io-channels = <&adc 0>;
 		reference_mv = <3000>;
+		expected_accuracy = <32>;
 	};
 };
 
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/adc/adc_accuracy_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index 20bd3110aff..f6ee92720ca 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -8,6 +8,7 @@
 	zephyr,user {
 		io-channels = <&adc 0>;
 		reference_mv = <1800>;
+		expected_accuracy = <64>;
 	};
 };
 
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/adc/adc_accuracy_test/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 950c52047f6..53facf3dc31 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -8,6 +8,7 @@
 	zephyr,user {
 		io-channels = <&adc 0>;
 		reference_mv = <1800>;
+		expected_accuracy = <64>;
 	};
 };
 
diff --git a/tests/drivers/adc/adc_accuracy_test/src/ref_volt.c b/tests/drivers/adc/adc_accuracy_test/src/ref_volt.c
index 1c4806b249e..66eaddd5b03 100644
--- a/tests/drivers/adc/adc_accuracy_test/src/ref_volt.c
+++ b/tests/drivers/adc/adc_accuracy_test/src/ref_volt.c
@@ -8,6 +8,7 @@
 #include <zephyr/ztest.h>
 
 #define REF_V DT_PROP(DT_PATH(zephyr_user), reference_mv)
+#define EXP_ACC DT_PROP(DT_PATH(zephyr_user), expected_accuracy)
 
 extern const struct adc_dt_spec *get_adc_channel(void);
 
@@ -31,7 +32,7 @@ static int test_ref_to_adc(void)
 	ret = adc_raw_to_millivolts_dt(adc_channel, &sample_buffer);
 	zassert_equal(ret, 0, "adc_raw_to_millivolts_dt() failed with code %d",
 		      ret);
-	zassert_within(sample_buffer, REF_V, 32,
+	zassert_within(sample_buffer, REF_V, EXP_ACC,
 		"Value %d mV read from ADC does not match expected range (%d mV).",
 		sample_buffer, REF_V);
 

From fd55e1cfa3a83bf469eaab6145e21524bba76296 Mon Sep 17 00:00:00 2001
From: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
Date: Wed, 31 Jul 2024 20:36:28 +0200
Subject: [PATCH 0709/2913] [nrf fromtree] tests: drivers: adc_accuracy: add
 calibration before sampling

Calibrate adc before taking measurement.

Signed-off-by: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
(cherry picked from commit dfbcea777a10e27d12539a4fd85b5203f5421151)
(cherry picked from commit be1fbef1488c5bf529ed8cc69b85bb11190e59df)
---
 tests/drivers/adc/adc_accuracy_test/src/ref_volt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/drivers/adc/adc_accuracy_test/src/ref_volt.c b/tests/drivers/adc/adc_accuracy_test/src/ref_volt.c
index 66eaddd5b03..9679720c51e 100644
--- a/tests/drivers/adc/adc_accuracy_test/src/ref_volt.c
+++ b/tests/drivers/adc/adc_accuracy_test/src/ref_volt.c
@@ -20,6 +20,7 @@ static int test_ref_to_adc(void)
 	struct adc_sequence sequence = {
 		.buffer      = &sample_buffer,
 		.buffer_size = sizeof(sample_buffer),
+		.calibrate = true,
 	};
 
 	const struct adc_dt_spec *adc_channel = get_adc_channel();

From f4bae77976d0ec749096575d9c9b7dc04fac8e57 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Wed, 23 Oct 2024 09:48:01 +0200
Subject: [PATCH 0710/2913] [nrf fromtree] soc: nordic: Enable VPR launcher on
 nRF54H20 EngB

Just like on nRF54H20 EngC.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit b3b0c63ad9534da8e0893ef4f26e8150119c38dd)
(cherry picked from commit d4fb388fdf9b419c5837eb516ba982d760abc796)
---
 soc/nordic/common/vpr/Kconfig.sysbuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soc/nordic/common/vpr/Kconfig.sysbuild b/soc/nordic/common/vpr/Kconfig.sysbuild
index cfbd619f623..8821810d63d 100644
--- a/soc/nordic/common/vpr/Kconfig.sysbuild
+++ b/soc/nordic/common/vpr/Kconfig.sysbuild
@@ -4,7 +4,7 @@
 config VPR_LAUNCHER
 	bool "VPR launcher"
 	default y
-	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR)
+	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR)
 	help
 	  Include VPR launcher in build.
 	  VPR launcher is a minimal sample built for an ARM core that starts given VPR core.

From a494acc07ff76df0b02e29626cc74a215d8ddeb7 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Mon, 28 Oct 2024 16:06:39 -0400
Subject: [PATCH 0711/2913] [nrf fromtree] twister: oot soc: set soc_root using
 Path

Set soc_root using Path to avoid wrong generated path in the list of
soc_roots and other roots read from module.yml file

Fixes #80531

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
(cherry picked from commit 2c43d7fe764b2ca9455a5c6a93903fcc89ce9089)
(cherry picked from commit caf9ee624aa830ebff9feeb6f259d1e749b7fd75)
---
 scripts/pylib/twister/twisterlib/environment.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/pylib/twister/twisterlib/environment.py b/scripts/pylib/twister/twisterlib/environment.py
index 315145b78c5..56c7b6255d1 100644
--- a/scripts/pylib/twister/twisterlib/environment.py
+++ b/scripts/pylib/twister/twisterlib/environment.py
@@ -972,13 +972,13 @@ def __init__(self, options, default_options=None) -> None:
         for module in modules:
             soc_root = module.meta.get("build", {}).get("settings", {}).get("soc_root")
             if soc_root:
-                self.soc_roots.append(os.path.join(module.project, soc_root))
+                self.soc_roots.append(Path(module.project) / Path(soc_root))
             dts_root = module.meta.get("build", {}).get("settings", {}).get("dts_root")
             if dts_root:
-                self.dts_roots.append(os.path.join(module.project, dts_root))
+                self.dts_roots.append(Path(module.project) / Path(dts_root))
             arch_root = module.meta.get("build", {}).get("settings", {}).get("arch_root")
             if arch_root:
-                self.arch_roots.append(os.path.join(module.project, arch_root))
+                self.arch_roots.append(Path(module.project) / Path(arch_root))
 
         self.hwm = None
 

From 467114626788df76caa6cbaba15788684a6d10ea Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Mon, 21 Oct 2024 17:22:37 +0200
Subject: [PATCH 0712/2913] [nrf fromtree] boards: nordic: Remove v0.8.0 of the
 nRF54H20 DK

The nRF54H20 Development Kit version 0.8.0 is no longer supported, given
that they should have all been replaced by 0.9.x.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit 5cb8d6c5b4f960d27233c25244aca4f2b47a25ec)
(cherry picked from commit f1e99ed47b05393a917d7c485855dbd88686e069)
---
 boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk   | 14 ++++-------
 boards/nordic/nrf54h20dk/board.yml            |  1 -
 .../nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi | 15 ------------
 .../nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay  |  7 ------
 .../nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml     | 24 -------------------
 .../nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay |  7 ------
 .../nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml    | 18 --------------
 ...nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml | 14 -----------
 .../nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay  |  7 ------
 .../nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml     | 18 --------------
 .../nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml | 14 -----------
 .../nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay  |  7 ------
 .../nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml     | 19 ---------------
 13 files changed, 4 insertions(+), 161 deletions(-)
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml

diff --git a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
index af29072fbd5..62ad7a0d21c 100644
--- a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
+++ b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
@@ -2,15 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF54H20DK
-	select SOC_NRF54H20_ENGB_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP && BOARD_REVISION = "0.8.0"
-	select SOC_NRF54H20_ENGB_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD && BOARD_REVISION = "0.8.0"
-	select SOC_NRF54H20_ENGB_CPUPPR if (BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
-				       BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP) && BOARD_REVISION = "0.8.0"
-	select SOC_NRF54H20_ENGB_CPUFLPR if (BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
-				        BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP) && BOARD_REVISION = "0.8.0"
-	select SOC_NRF54H20_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP && BOARD_REVISION = "0.9.0"
-	select SOC_NRF54H20_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD && BOARD_REVISION = "0.9.0"
+	select SOC_NRF54H20_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP
+	select SOC_NRF54H20_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD
 	select SOC_NRF54H20_CPUPPR if (BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
-				       BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP) && BOARD_REVISION = "0.9.0"
+				       BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP)
 	select SOC_NRF54H20_CPUFLPR if (BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
-				        BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP) && BOARD_REVISION = "0.9.0"
+				        BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP)
diff --git a/boards/nordic/nrf54h20dk/board.yml b/boards/nordic/nrf54h20dk/board.yml
index 82a738d8b03..2d3d40c20e0 100644
--- a/boards/nordic/nrf54h20dk/board.yml
+++ b/boards/nordic/nrf54h20dk/board.yml
@@ -13,5 +13,4 @@ board:
     format: major.minor.patch
     default: "0.9.0"
     revisions:
-    - name: "0.8.0"
     - name: "0.9.0"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi
deleted file mode 100644
index 940ac4d2391..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/delete-node/ &suit_storage_partition;
-
-/ {
-	reserved-memory {
-		suit_storage_partition: memory@e1eb000 {
-			reg = <0xe1eb000 DT_SIZE_K(24)>;
-		};
-	};
-};
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay
deleted file mode 100644
index dfee18c5b6f..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml
deleted file mode 100644
index 01c44b51577..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54h20dk@0.8.0/nrf54h20/cpuapp
-name: nRF54H20-DK-nRF54H20-Application (revision 0.8.0)
-type: mcu
-arch: arm
-toolchain:
-  - gnuarmemb
-  - xtools
-  - zephyr
-sysbuild: true
-ram: 256
-flash: 296
-supported:
-  - adc
-  - can
-  - counter
-  - gpio
-  - i2c
-  - pwm
-  - spi
-  - watchdog
-  - usbd
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay
deleted file mode 100644
index dfee18c5b6f..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml
deleted file mode 100644
index bd60b8d2af3..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54h20dk@0.8.0/nrf54h20/cpuflpr
-name: nRF54H20-DK-nRF54H20-FLPR (revision 0.8.0)
-type: mcu
-arch: riscv
-toolchain:
-  - zephyr
-sysbuild: true
-ram: 46
-flash: 46
-supported:
-  - counter
-  - gpio
-  - i2c
-  - pwm
-  - spi
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml
deleted file mode 100644
index 7deaf20135f..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54h20dk@0.8.0/nrf54h20/cpuflpr/xip
-name: nRF54H20-DK-nRF54H20-FLPR (MRAM XIP) (revision 0.8.0)
-type: mcu
-arch: riscv
-toolchain:
-  - zephyr
-sysbuild: true
-ram: 46
-flash: 48
-supported:
-  - gpio
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay
deleted file mode 100644
index dfee18c5b6f..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml
deleted file mode 100644
index 26412657070..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54h20dk@0.8.0/nrf54h20/cpuppr
-name: nRF54H20-DK-nRF54H20-PPR (revision 0.8.0)
-type: mcu
-arch: riscv
-toolchain:
-  - zephyr
-sysbuild: true
-ram: 62
-flash: 62
-supported:
-  - counter
-  - gpio
-  - i2c
-  - pwm
-  - spi
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml
deleted file mode 100644
index 0ce1718cb60..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54h20dk@0.8.0/nrf54h20/cpuppr/xip
-name: nRF54H20-DK-nRF54H20-PPR (MRAM XIP) (revision 0.8.0)
-type: mcu
-arch: riscv
-toolchain:
-  - zephyr
-sysbuild: true
-ram: 62
-flash: 64
-supported:
-  - gpio
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay
deleted file mode 100644
index dfee18c5b6f..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml
deleted file mode 100644
index 26df539a803..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54h20dk@0.8.0/nrf54h20/cpurad
-name: nRF54H20-DK-nRF54H20-Radio (revision 0.8.0)
-type: mcu
-arch: arm
-toolchain:
-  - gnuarmemb
-  - xtools
-  - zephyr
-sysbuild: true
-ram: 192
-flash: 256
-supported:
-  - counter
-  - gpio
-  - pwm
-  - spi

From 7102aeee5115312c48155c30e50cdbb037f3af44 Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Mon, 21 Oct 2024 17:13:13 +0200
Subject: [PATCH 0713/2913] [nrf fromtree] nordic: Remove the nRF54H20
 Engineering B

The production version of the nRF54H20 SoC is now available, so remove
the initial Engineering B (EngB) preview version.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit 9643ca20e9bc8df28c02aac923c3a794bbef6f5f)
(cherry picked from commit c24387fe90b0973bb673ac9972a9d692dc303eb8)
---
 drivers/cache/Kconfig.nrf                     |  2 +-
 modules/hal_nordic/Kconfig                    |  2 +-
 modules/hal_nordic/nrfs/Kconfig               |  4 +--
 modules/hal_nordic/nrfx/CMakeLists.txt        | 12 -------
 modules/hal_nordic/nrfx/nrfx_config.h         |  8 ++---
 scripts/west_commands/runners/nrf_common.py   |  2 --
 soc/nordic/common/vpr/Kconfig.sysbuild        |  2 +-
 soc/nordic/nrf54h/Kconfig                     | 12 -------
 .../nrf54h/Kconfig.defconfig.nrf54h20_cpuapp  |  4 +--
 .../nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr |  4 +--
 .../nrf54h/Kconfig.defconfig.nrf54h20_cpuppr  |  4 +--
 .../nrf54h/Kconfig.defconfig.nrf54h20_cpurad  |  4 +--
 soc/nordic/nrf54h/Kconfig.soc                 | 32 +------------------
 soc/nordic/nrf54h/gpd/Kconfig                 |  3 +-
 soc/nordic/nrf54h/soc.h                       |  4 +--
 subsys/logging/frontends/Kconfig              |  3 +-
 16 files changed, 21 insertions(+), 81 deletions(-)

diff --git a/drivers/cache/Kconfig.nrf b/drivers/cache/Kconfig.nrf
index ffcbfe66d19..c1cfc2c8c58 100644
--- a/drivers/cache/Kconfig.nrf
+++ b/drivers/cache/Kconfig.nrf
@@ -10,6 +10,6 @@ config CACHE_NRF_CACHE
 
 config CACHE_NRF_PATCH_LINEADDR
 	bool "Patch lineaddr"
-	default y if SOC_NRF54H20 || SOC_NRF54H20_ENGB
+	default y if SOC_NRF54H20
 	help
 	  Manually set 28th bit in the LINEADDR in Trustzone Secure build.
diff --git a/modules/hal_nordic/Kconfig b/modules/hal_nordic/Kconfig
index 9d54c15d715..dd4e0a0859b 100644
--- a/modules/hal_nordic/Kconfig
+++ b/modules/hal_nordic/Kconfig
@@ -55,7 +55,7 @@ endchoice
 
 config NRF_802154_TEMPERATURE_UPDATE
 	bool "nRF 802.15.4 temperature update"
-	default y if !SOC_NRF54H20 && !SOC_NRF54H20_ENGB
+	default y if !SOC_NRF54H20
 	help
 	  Enable temperature update for nRF 802.15.4 driver
 
diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig
index eafe0616764..8c5b61bb11f 100644
--- a/modules/hal_nordic/nrfs/Kconfig
+++ b/modules/hal_nordic/nrfs/Kconfig
@@ -40,9 +40,7 @@ config NRFS_HAS_VBUS_DETECTOR_SERVICE
 config NRFS
 	bool "nRF Services Support"
 	select NRFS_LOCAL_DOMAIN if SOC_NRF54H20_CPUAPP || \
-				    SOC_NRF54H20_ENGB_CPUAPP || \
 				    SOC_NRF54H20_CPURAD || \
-				    SOC_NRF54H20_ENGB_CPURAD || \
 				    SOC_NRF9280_CPUAPP || \
 				    SOC_NRF9280_CPURAD
 	depends on HAS_NRFS
@@ -103,7 +101,7 @@ config NRFS_PMIC_SERVICE_ENABLED
 config NRFS_DVFS_SERVICE_ENABLED
 	bool "DVFS service"
 	depends on NRFS_HAS_DVFS_SERVICE
-	default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || SOC_NRF9280_CPUAPP
+	default y if SOC_NRF54H20_CPUAPP || SOC_NRF9280_CPUAPP
 
 config NRFS_DIAG_SERVICE_ENABLED
 	bool "System Diagnostics service (only for development purposes)"
diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 1c854a822d5..e800b909ec4 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -44,14 +44,6 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUPPR     NRF54H20_XXAA
                                                                 NRF_PPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR    NRF54H20_XXAA
                                                                 NRF_FLPR)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP NRF54H20_ENGB_XXAA
-                                                                 NRF_APPLICATION)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD NRF54H20_ENGB_XXAA
-                                                                 NRF_RADIOCORE)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR NRF54H20_ENGB_XXAA
-                                                                 NRF_PPR)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR NRF54H20_ENGB_XXAA
-                                                                  NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15            NRF54L15_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR    NRF_FLPR)
@@ -230,10 +222,6 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUAPP      nrf54h20_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUPPR      nrf54h20_ppr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR     nrf54h20_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPURAD      nrf54h20_radiocore.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP  nrf54h20_engb_application.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR  nrf54h20_engb_ppr.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR nrf54h20_engb_flpr.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD  nrf54h20_engb_radiocore.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP      nrf54l15_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR     nrf54l15_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54l20_enga_application.svd)
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index cfd70516972..48b3b8226fb 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -1121,13 +1121,13 @@
     #include <nrfx_config_nrf5340_application.h>
 #elif defined(NRF5340_XXAA_NETWORK)
     #include <nrfx_config_nrf5340_network.h>
-#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_APPLICATION)
+#elif defined(NRF54H20_XXAA) && defined(NRF_APPLICATION)
     #include <nrfx_config_nrf54h20_application.h>
-#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_RADIOCORE)
+#elif defined(NRF54H20_XXAA) && defined(NRF_RADIOCORE)
     #include <nrfx_config_nrf54h20_radiocore.h>
-#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_PPR)
+#elif defined(NRF54H20_XXAA) && defined(NRF_PPR)
     #include <nrfx_config_nrf54h20_ppr.h>
-#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_FLPR)
+#elif defined(NRF54H20_XXAA) && defined(NRF_FLPR)
     #include <nrfx_config_nrf54h20_flpr.h>
 #elif defined(NRF54L15_XXAA) && defined(NRF_APPLICATION)
     #include <nrfx_config_nrf54l15_application.h>
diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index a42e841bdbd..1f4942972df 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -261,12 +261,10 @@ def program_hex(self):
 
             cpuapp = (
                 self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPUAPP') or
-                self.build_conf.getboolean('CONFIG_SOC_NRF54H20_ENGB_CPUAPP') or
                 self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPUAPP')
             )
             cpurad = (
                 self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPURAD') or
-                self.build_conf.getboolean('CONFIG_SOC_NRF54H20_ENGB_CPURAD') or
                 self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPURAD')
             )
 
diff --git a/soc/nordic/common/vpr/Kconfig.sysbuild b/soc/nordic/common/vpr/Kconfig.sysbuild
index 8821810d63d..cfbd619f623 100644
--- a/soc/nordic/common/vpr/Kconfig.sysbuild
+++ b/soc/nordic/common/vpr/Kconfig.sysbuild
@@ -4,7 +4,7 @@
 config VPR_LAUNCHER
 	bool "VPR launcher"
 	default y
-	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR)
+	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR)
 	help
 	  Include VPR launcher in build.
 	  VPR launcher is a minimal sample built for an ARM core that starts given VPR core.
diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
index d6eb5b78f81..3e46ce83077 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -34,9 +34,6 @@ config SOC_NRF54H20_CPUAPP_COMMON
 config SOC_NRF54H20_CPUAPP
 	select SOC_NRF54H20_CPUAPP_COMMON
 
-config SOC_NRF54H20_ENGB_CPUAPP
-	select SOC_NRF54H20_CPUAPP_COMMON
-
 config SOC_NRF54H20_CPURAD_COMMON
 	bool
 	select ARM
@@ -61,21 +58,12 @@ config SOC_NRF54H20_CPURAD_COMMON
 config SOC_NRF54H20_CPURAD
 	select SOC_NRF54H20_CPURAD_COMMON
 
-config SOC_NRF54H20_ENGB_CPURAD
-	select SOC_NRF54H20_CPURAD_COMMON
-
 config SOC_NRF54H20_CPUPPR
 	depends on RISCV_CORE_NORDIC_VPR
 
-config SOC_NRF54H20_ENGB_CPUPPR
-	depends on RISCV_CORE_NORDIC_VPR
-
 config SOC_NRF54H20_CPUFLPR
 	depends on RISCV_CORE_NORDIC_VPR
 
-config SOC_NRF54H20_ENGB_CPUFLPR
-	depends on RISCV_CORE_NORDIC_VPR
-
 rsource "gpd/Kconfig"
 
 config SOC_NRF54H20_NO_MRAM_LATENCY
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
index 597f7fbea22..61cc96da71f 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
@@ -3,7 +3,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
+if SOC_NRF54H20_CPUAPP
 
 config NUM_IRQS
 	default 471
@@ -14,4 +14,4 @@ config NRF_REGTOOL_GENERATE_UICR
 config NRF_REGTOOL_GENERATE_BICR
 	default y
 
-endif # SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
+endif # SOC_NRF54H20_CPUAPP
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
index 97b1e89a9c1..2b792e9f1b9 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR
+if SOC_NRF54H20_CPUFLPR
 
 config NUM_IRQS
 	default 496
@@ -10,4 +10,4 @@ config NUM_IRQS
 config ASSERT
 	default n
 
-endif # SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR
+endif # SOC_NRF54H20_CPUFLPR
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
index 02649146ad7..bf7c12a3a69 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR
+if SOC_NRF54H20_CPUPPR
 
 config NUM_IRQS
 	default 496
@@ -13,4 +13,4 @@ config SYS_CLOCK_TICKS_PER_SEC
 config ASSERT
 	default n
 
-endif # SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR
+endif # SOC_NRF54H20_CPUPPR
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad
index 9ad0b30e1c8..4437e7aadc4 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad
@@ -3,7 +3,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
+if SOC_NRF54H20_CPURAD
 
 config NUM_IRQS
 	default 471
@@ -11,4 +11,4 @@ config NUM_IRQS
 config NRF_REGTOOL_GENERATE_UICR
 	default y
 
-endif # SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
+endif # SOC_NRF54H20_CPURAD
diff --git a/soc/nordic/nrf54h/Kconfig.soc b/soc/nordic/nrf54h/Kconfig.soc
index 852e92bb138..459854e13b2 100644
--- a/soc/nordic/nrf54h/Kconfig.soc
+++ b/soc/nordic/nrf54h/Kconfig.soc
@@ -9,59 +9,29 @@ config SOC_NRF54H20
 	help
 	  nRF54H20
 
-config SOC_NRF54H20_ENGB
-	bool
-	select SOC_SERIES_NRF54HX
-	help
-	  nRF54H20 (EngB)
-
 config SOC_NRF54H20_CPUAPP
 	bool
 	select SOC_NRF54H20
 	help
 	  nRF54H20 CPUAPP
 
-config SOC_NRF54H20_ENGB_CPUAPP
-	bool
-	select SOC_NRF54H20_ENGB
-	help
-	  nRF54H20 (EngB) CPUAPP
-
 config SOC_NRF54H20_CPURAD
 	bool
 	select SOC_NRF54H20
 	help
 	  nRF54H20 CPURAD
 
-config SOC_NRF54H20_ENGB_CPURAD
-	bool
-	select SOC_NRF54H20_ENGB
-	help
-	  nRF54H20 (EngB) CPURAD
-
 config SOC_NRF54H20_CPUPPR
 	bool
 	select SOC_NRF54H20
 	help
 	  nRF54H20 CPUPPR
 
-config SOC_NRF54H20_ENGB_CPUPPR
-	bool
-	select SOC_NRF54H20_ENGB
-	help
-	  nRF54H20 (EngB) CPUPPR
-
 config SOC_NRF54H20_CPUFLPR
 	bool
 	select SOC_NRF54H20
 	help
 	  nRF54H20 CPUFLPR
 
-config SOC_NRF54H20_ENGB_CPUFLPR
-	bool
-	select SOC_NRF54H20_ENGB
-	help
-	  nRF54H20 (EngB) CPUFLPR
-
 config SOC
-	default "nrf54h20" if SOC_NRF54H20 || SOC_NRF54H20_ENGB
+	default "nrf54h20" if SOC_NRF54H20
diff --git a/soc/nordic/nrf54h/gpd/Kconfig b/soc/nordic/nrf54h/gpd/Kconfig
index b9bd568cda6..98b374f6de9 100644
--- a/soc/nordic/nrf54h/gpd/Kconfig
+++ b/soc/nordic/nrf54h/gpd/Kconfig
@@ -6,7 +6,6 @@ config SOC_NRF54H20_GPD
 	imply NRFS
 	imply NRFS_GDPWR_SERVICE_ENABLED
 	select ONOFF
-	default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || \
-		     SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
+	default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD
 	help
 	  This option enables the Global Power Domain service.
diff --git a/soc/nordic/nrf54h/soc.h b/soc/nordic/nrf54h/soc.h
index db79e2c8c72..566c07a8c2c 100644
--- a/soc/nordic/nrf54h/soc.h
+++ b/soc/nordic/nrf54h/soc.h
@@ -9,7 +9,7 @@
 
 #include <soc_nrf_common.h>
 
-#if defined(CONFIG_SOC_NRF54H20_CPUAPP) || defined(CONFIG_SOC_NRF54H20_ENGB_CPUAPP)
+#if defined(CONFIG_SOC_NRF54H20_CPUAPP)
 #define RAMBLOCK_CONTROL_BIT_ICACHE MEMCONF_POWER_CONTROL_MEM1_Pos
 #define RAMBLOCK_CONTROL_BIT_DCACHE MEMCONF_POWER_CONTROL_MEM2_Pos
 #define RAMBLOCK_POWER_ID           0
@@ -17,7 +17,7 @@
 #define RAMBLOCK_RET_MASK           (MEMCONF_POWER_RET_MEM0_Msk)
 #define RAMBLOCK_RET_BIT_ICACHE     MEMCONF_POWER_RET_MEM1_Pos
 #define RAMBLOCK_RET_BIT_DCACHE     MEMCONF_POWER_RET_MEM2_Pos
-#elif defined(CONFIG_SOC_NRF54H20_CPURAD) || defined(CONFIG_SOC_NRF54H20_ENGB_CPURAD)
+#elif defined(CONFIG_SOC_NRF54H20_CPURAD)
 #define RAMBLOCK_CONTROL_BIT_ICACHE MEMCONF_POWER_CONTROL_MEM6_Pos
 #define RAMBLOCK_CONTROL_BIT_DCACHE MEMCONF_POWER_CONTROL_MEM7_Pos
 #define RAMBLOCK_POWER_ID           0
diff --git a/subsys/logging/frontends/Kconfig b/subsys/logging/frontends/Kconfig
index 4d6d85e3e88..e35e252ba2b 100644
--- a/subsys/logging/frontends/Kconfig
+++ b/subsys/logging/frontends/Kconfig
@@ -47,8 +47,7 @@ config LOG_FRONTEND_STMESP_DICT
 config LOG_FRONTEND_STMESP_FSC
 	bool "Send fully self-contained messages"
 	select LOG_MSG_APPEND_RO_STRING_LOC if !(NRF_ETR || \
-			SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR || \
-			SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR)
+			SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR)
 
 config LOG_FRONTEND_STMESP_FLUSH_COUNT
 	int "Number of flushing words"

From c254826213b76410b7e3a9a0b710eafef6b24d2a Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 28 Oct 2024 12:17:09 +0100
Subject: [PATCH 0714/2913] [nrf fromtree] manifest: Update bsim to version
 v2.4

Main changes since v2.3:
* Support for immediate RSSI measurements during abort reevaluations
* Several minor improvements in the base components, including
  tolerating better under-setup docker images, improved C++
  compatibility, a new sanity check for problematic user provided
  sim_ids, and other minor improvements.

Note: Like before, bsim remains fully backwards compatible

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit a30e41f4d7b05679c22dda8c9d9eb2d3d430b717)
(cherry picked from commit 82ae6582a402247e795e323a25ce1a859b60ee42)
---
 west.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/west.yml b/west.yml
index 0b7fdfece41..33c3fdb14b5 100644
--- a/west.yml
+++ b/west.yml
@@ -34,7 +34,7 @@ manifest:
       path: modules/lib/acpica
     - name: bsim
       repo-path: babblesim-manifest
-      revision: 9ee22c707970f6621adba0375841c0a609e24628
+      revision: 1f242f4ed7fc141fdfcfeca8d21c6d9e801179d7
       path: tools/bsim
       groups:
         - babblesim
@@ -42,21 +42,21 @@ manifest:
       remote: babblesim
       repo-path: base
       path: tools/bsim/components
-      revision: a3dff9a57f334fb25daa9625841cd64cbfe56681
+      revision: 0cc70e78a88c1de9d8ec045a703b38134861e7e7
       groups:
         - babblesim
     - name: babblesim_ext_2G4_libPhyComv1
       remote: babblesim
       repo-path: ext_2G4_libPhyComv1
       path: tools/bsim/components/ext_2G4_libPhyComv1
-      revision: aa4951317cc7d84f24152ea38ac9ac21e6d78a76
+      revision: 15ae0f87fa049e04cbec48a866f3bc37d903f950
       groups:
         - babblesim
     - name: babblesim_ext_2G4_phy_v1
       remote: babblesim
       repo-path: ext_2G4_phy_v1
       path: tools/bsim/components/ext_2G4_phy_v1
-      revision: 04eeb3c3794444122fbeeb3715f4233b0b50cfbb
+      revision: 62e797b2c518e5bb6123a198382ed2b64b8c068e
       groups:
         - babblesim
     - name: babblesim_ext_2G4_channel_NtNcable

From 87840f4c71441db64e47abda628b4e0a5d45d2ae Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Thu, 7 Nov 2024 13:31:56 +0100
Subject: [PATCH 0715/2913] [nrf fromtree] manifest: Update nRF hw models to
 latest

Update the HW models module to:
aeef3db9fa9e4b9d12b3bbec44f9cedc8fcb7d9c

Including the following:
aeef3db GPIO & GPIOTE: Improve notes and documentation
93549c4 UART: Fix command line parameter description
dbab746 nrf_hack: Add a few missing peripherals
4b1a61b 53 UARTE: Correct subscribe sideeffects function name
197e9cf docs: UART can be used now for 5340 in Zephyr
dc18d14 53: GPIO+TE: Add app core instances
b236c08 GPIO+TE: Add to 5340's netcore
7a621f6 GPIO: Clarify function description
1a2e1e4 GPIO+TE: Build for 54L
d121db4 nrf_gpio hal: Add new nrf_gpio_port_pin_{in,out}put_set
9bc41ce GPIOTE: Connect to DPPI
7141042 GPIOTE: Add simple support for PORT.SECURE & NONSECURE
dc930ba GPIOTE: Support having or not sense functionality per instance
a07180d GPIO: Support multiple GPIOTEs
14bdce5 GPIO: Collect status in single struct
b91da53 GPIOTE: Add support for N interrupt lines
9963424 GPIO & GPIOTE: Generalize to N instances
7379c23 GPIO+TE: Fix indentation
8d691c6 Add SPU registers stub
dd68ca9 Add NFCT register stub
cf2cc5b HW_models: NHW_NVMC: fix buffer read validation
f3db727 zephyr: module.yml: add `depends` field
09fc98f CMakeLists: remove trailing whitespace

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 0efbca30a5d1d24816f461da113479e6465d3914)
(cherry picked from commit 0964a3f230da887123e42323dfd98c280415e6ec)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 33c3fdb14b5..244b91bbf84 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: aca798cf7cf0c5dc1fd89c66cf62670051feb8d0
+      revision: aeef3db9fa9e4b9d12b3bbec44f9cedc8fcb7d9c
       path: modules/bsim_hw_models/nrf_hw_models
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719

From 6872c92b817a4e3afc51e7ad00fd28d6e338cb43 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Mon, 23 Sep 2024 10:32:18 +0200
Subject: [PATCH 0716/2913] [nrf fromtree] drivers: i2c: nrfx_twim: simplify PM
 by using pm_device_driver_init

- Driver always initializes the device in the suspended state
- If CONFIG_PM_DEVICE_RUNTIME=n, device PM callback will be called with
  RESUME action, thus setting up pins to default state and enabling the
  peripheral

NOTE: when CONFIG_PM_DEVICE=n, the pinctrl sleep state will not be
available (-ENOENT) and so never applied, thus avoiding a pin
suspended->active transition.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 9f0ebb64a610745f2dd14a4b6adae8b7023134fe)
(cherry picked from commit f70e6806b8b31360afc785a43d00c6654d705e79)
---
 drivers/i2c/i2c_nrfx_twim.c                   | 39 +++----------------
 dts/arm/nordic/nrf52805.dtsi                  |  1 +
 dts/arm/nordic/nrf52810.dtsi                  |  1 +
 dts/arm/nordic/nrf52811.dtsi                  |  1 +
 dts/arm/nordic/nrf52820.dtsi                  |  2 +
 dts/arm/nordic/nrf52832.dtsi                  |  2 +
 dts/arm/nordic/nrf52833.dtsi                  |  2 +
 dts/arm/nordic/nrf52840.dtsi                  |  2 +
 .../nordic/nrf5340_cpuapp_peripherals.dtsi    |  4 ++
 dts/arm/nordic/nrf5340_cpunet.dtsi            |  1 +
 dts/arm/nordic/nrf91_peripherals.dtsi         |  4 ++
 dts/common/nordic/nrf54h20.dtsi               |  8 ++++
 dts/common/nordic/nrf54l15.dtsi               |  4 ++
 dts/common/nordic/nrf54l20.dtsi               |  4 ++
 dts/common/nordic/nrf9280.dtsi                |  8 ++++
 15 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c
index 4d1ff0f4640..e38512137ed 100644
--- a/drivers/i2c/i2c_nrfx_twim.c
+++ b/drivers/i2c/i2c_nrfx_twim.c
@@ -297,40 +297,26 @@ static const struct i2c_driver_api i2c_nrfx_twim_driver_api = {
 	.recover_bus = i2c_nrfx_twim_recover_bus,
 };
 
-#ifdef CONFIG_PM_DEVICE
 static int twim_nrfx_pm_action(const struct device *dev,
 			       enum pm_device_action action)
 {
 	const struct i2c_nrfx_twim_config *dev_config = dev->config;
-	int ret = 0;
 
 	switch (action) {
 	case PM_DEVICE_ACTION_RESUME:
-		ret = pinctrl_apply_state(dev_config->pcfg,
-					  PINCTRL_STATE_DEFAULT);
-		if (ret < 0) {
-			return ret;
-		}
+		(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_DEFAULT);
 		nrfx_twim_enable(&dev_config->twim);
 		break;
-
 	case PM_DEVICE_ACTION_SUSPEND:
 		nrfx_twim_disable(&dev_config->twim);
-
-		ret = pinctrl_apply_state(dev_config->pcfg,
-					  PINCTRL_STATE_SLEEP);
-		if (ret < 0) {
-			return ret;
-		}
+		(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
 		break;
-
 	default:
-		ret = -ENOTSUP;
+		return -ENOTSUP;
 	}
 
-	return ret;
+	return 0;
 }
-#endif /* CONFIG_PM_DEVICE */
 
 static int i2c_nrfx_twim_init(const struct device *dev)
 {
@@ -342,13 +328,7 @@ static int i2c_nrfx_twim_init(const struct device *dev)
 	k_sem_init(&dev_data->transfer_sync, 1, 1);
 	k_sem_init(&dev_data->completion_sync, 0, 1);
 
-	int err = pinctrl_apply_state(dev_config->pcfg,
-				      COND_CODE_1(CONFIG_PM_DEVICE_RUNTIME,
-						  (PINCTRL_STATE_SLEEP),
-						  (PINCTRL_STATE_DEFAULT)));
-	if (err < 0) {
-		return err;
-	}
+	(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
 
 	if (nrfx_twim_init(&dev_config->twim, &dev_config->twim_config,
 			   event_handler, dev_data) != NRFX_SUCCESS) {
@@ -356,14 +336,7 @@ static int i2c_nrfx_twim_init(const struct device *dev)
 		return -EIO;
 	}
 
-#ifdef CONFIG_PM_DEVICE_RUNTIME
-	pm_device_init_suspended(dev);
-	pm_device_runtime_enable(dev);
-#else
-	nrfx_twim_enable(&dev_config->twim);
-#endif
-
-	return 0;
+	return pm_device_driver_init(dev, twim_nrfx_pm_action);
 }
 
 #define I2C_NRFX_TWIM_INVALID_FREQUENCY  ((nrf_twim_frequency_t)-1)
diff --git a/dts/arm/nordic/nrf52805.dtsi b/dts/arm/nordic/nrf52805.dtsi
index bd768ca85fe..fbf89434690 100644
--- a/dts/arm/nordic/nrf52805.dtsi
+++ b/dts/arm/nordic/nrf52805.dtsi
@@ -131,6 +131,7 @@
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <14>;
 			status = "disabled";
+			zephyr,pm-device-runtime-auto;
 		};
 
 		spi0: spi@40004000 {
diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
index df3e7ab9fa6..3be690a987e 100644
--- a/dts/arm/nordic/nrf52810.dtsi
+++ b/dts/arm/nordic/nrf52810.dtsi
@@ -135,6 +135,7 @@
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <10>;
 			status = "disabled";
+			zephyr,pm-device-runtime-auto;
 		};
 
 		spi0: spi@40004000 {
diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi
index 415ece78612..83a66d77792 100644
--- a/dts/arm/nordic/nrf52811.dtsi
+++ b/dts/arm/nordic/nrf52811.dtsi
@@ -147,6 +147,7 @@
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <14>;
 			status = "disabled";
+			zephyr,pm-device-runtime-auto;
 		};
 
 		spi1: spi@40003000 {
diff --git a/dts/arm/nordic/nrf52820.dtsi b/dts/arm/nordic/nrf52820.dtsi
index 4ddecb86a85..71abcab55cc 100644
--- a/dts/arm/nordic/nrf52820.dtsi
+++ b/dts/arm/nordic/nrf52820.dtsi
@@ -149,6 +149,7 @@
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <15>;
 			status = "disabled";
+			zephyr,pm-device-runtime-auto;
 		};
 
 		spi0: spi@40003000 {
@@ -185,6 +186,7 @@
 			interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <15>;
 			status = "disabled";
+			zephyr,pm-device-runtime-auto;
 		};
 
 		spi1: spi@40004000 {
diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
index cd2115028ca..49acb441c57 100644
--- a/dts/arm/nordic/nrf52832.dtsi
+++ b/dts/arm/nordic/nrf52832.dtsi
@@ -135,6 +135,7 @@
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <8>;
 			status = "disabled";
+			zephyr,pm-device-runtime-auto;
 		};
 
 		spi0: spi@40003000 {
@@ -171,6 +172,7 @@
 			interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <8>;
 			status = "disabled";
+			zephyr,pm-device-runtime-auto;
 		};
 
 		spi1: spi@40004000 {
diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi
index 60291420be9..7d23e15f5f8 100644
--- a/dts/arm/nordic/nrf52833.dtsi
+++ b/dts/arm/nordic/nrf52833.dtsi
@@ -149,6 +149,7 @@
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
+			zephyr,pm-device-runtime-auto;
 		};
 
 		spi0: spi@40003000 {
@@ -185,6 +186,7 @@
 			interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
+			zephyr,pm-device-runtime-auto;
 		};
 
 		spi1: spi@40004000 {
diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index b9c1655a614..56712a6bccc 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -137,6 +137,7 @@
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
+			zephyr,pm-device-runtime-auto;
 		};
 
 		spi0: spi@40003000 {
@@ -173,6 +174,7 @@
 			interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
+			zephyr,pm-device-runtime-auto;
 		};
 
 		spi1: spi@40004000 {
diff --git a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
index d91bb508d30..745e23d87ce 100644
--- a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
@@ -108,6 +108,7 @@ i2c0: i2c@8000 {
 	interrupts = <8 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <16>;
 	status = "disabled";
+	zephyr,pm-device-runtime-auto;
 };
 
 spi0: spi@8000 {
@@ -149,6 +150,7 @@ i2c1: i2c@9000 {
 	interrupts = <9 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <16>;
 	status = "disabled";
+	zephyr,pm-device-runtime-auto;
 };
 
 spi1: spi@9000 {
@@ -203,6 +205,7 @@ i2c2: i2c@b000 {
 	interrupts = <11 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <16>;
 	status = "disabled";
+	zephyr,pm-device-runtime-auto;
 };
 
 spi2: spi@b000 {
@@ -244,6 +247,7 @@ i2c3: i2c@c000 {
 	interrupts = <12 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <16>;
 	status = "disabled";
+	zephyr,pm-device-runtime-auto;
 };
 
 spi3: spi@c000 {
diff --git a/dts/arm/nordic/nrf5340_cpunet.dtsi b/dts/arm/nordic/nrf5340_cpunet.dtsi
index 4b6c590858c..c17a8caf8f9 100644
--- a/dts/arm/nordic/nrf5340_cpunet.dtsi
+++ b/dts/arm/nordic/nrf5340_cpunet.dtsi
@@ -205,6 +205,7 @@
 			interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
+			zephyr,pm-device-runtime-auto;
 		};
 
 		spi0: spi@41013000 {
diff --git a/dts/arm/nordic/nrf91_peripherals.dtsi b/dts/arm/nordic/nrf91_peripherals.dtsi
index 14d05d27cee..75613b7df2c 100644
--- a/dts/arm/nordic/nrf91_peripherals.dtsi
+++ b/dts/arm/nordic/nrf91_peripherals.dtsi
@@ -160,6 +160,7 @@ i2c0: i2c@8000 {
 	interrupts = <8 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <13>;
 	status = "disabled";
+	zephyr,pm-device-runtime-auto;
 };
 
 i2c1: i2c@9000 {
@@ -176,6 +177,7 @@ i2c1: i2c@9000 {
 	interrupts = <9 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <13>;
 	status = "disabled";
+	zephyr,pm-device-runtime-auto;
 };
 
 i2c2: i2c@a000 {
@@ -192,6 +194,7 @@ i2c2: i2c@a000 {
 	interrupts = <10 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <13>;
 	status = "disabled";
+	zephyr,pm-device-runtime-auto;
 };
 
 i2c3: i2c@b000 {
@@ -208,6 +211,7 @@ i2c3: i2c@b000 {
 	interrupts = <11 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <13>;
 	status = "disabled";
+	zephyr,pm-device-runtime-auto;
 };
 
 spi0: spi@8000 {
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index a5391d6dfe4..7f322c0b900 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -983,6 +983,7 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi130: spi@9a5000 {
@@ -1028,6 +1029,7 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi131: spi@9a6000 {
@@ -1114,6 +1116,7 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi132: spi@9b5000 {
@@ -1159,6 +1162,7 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi133: spi@9b6000 {
@@ -1245,6 +1249,7 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi134: spi@9c5000 {
@@ -1290,6 +1295,7 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi135: spi@9c6000 {
@@ -1376,6 +1382,7 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi136: spi@9d5000 {
@@ -1421,6 +1428,7 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi137: spi@9d6000 {
diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index 7d59b20d36b..71639075aa9 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -286,6 +286,7 @@
 				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi20: spi@c6000 {
@@ -325,6 +326,7 @@
 				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi21: spi@c7000 {
@@ -364,6 +366,7 @@
 				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi22: spi@c8000 {
@@ -580,6 +583,7 @@
 				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi30: spi@104000 {
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 258cc856e5d..293f16e1910 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -237,6 +237,7 @@
 				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi20: spi@c6000 {
@@ -276,6 +277,7 @@
 				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi21: spi@c7000 {
@@ -315,6 +317,7 @@
 				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi22: spi@c8000 {
@@ -522,6 +525,7 @@
 				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi30: spi@104000 {
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 45b05f9262e..4fd64cd10be 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -815,6 +815,7 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi130: spi@9a5000 {
@@ -854,6 +855,7 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi131: spi@9a6000 {
@@ -927,6 +929,7 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi132: spi@9b5000 {
@@ -966,6 +969,7 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi133: spi@9b6000 {
@@ -1039,6 +1043,7 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi134: spi@9c5000 {
@@ -1078,6 +1083,7 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi135: spi@9c6000 {
@@ -1151,6 +1157,7 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi136: spi@9d5000 {
@@ -1190,6 +1197,7 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			spi137: spi@9d6000 {

From 67571ac7c65c6ddb47c7bd71a83a36991393825b Mon Sep 17 00:00:00 2001
From: Jordan Yates <jordan@embeint.com>
Date: Fri, 9 Aug 2024 17:02:08 +1000
Subject: [PATCH 0717/2913] [nrf fromtree] i2c: i2c_nrfx_twim: extract common
 code

Extract code useful for an RTIO implementation to a separate file.

Signed-off-by: Jordan Yates <jordan@embeint.com>
(cherry picked from commit 0218b36b4a3f5ef0f641d33006c9a9ed77471b99)
(cherry picked from commit 653f62623cab43630d5c71919ac03aea40c0a1ee)
---
 drivers/i2c/CMakeLists.txt         |   5 +-
 drivers/i2c/i2c_nrfx_twim.c        | 185 ++++-------------------------
 drivers/i2c/i2c_nrfx_twim_common.c | 140 ++++++++++++++++++++++
 drivers/i2c/i2c_nrfx_twim_common.h |  58 +++++++++
 4 files changed, 225 insertions(+), 163 deletions(-)
 create mode 100644 drivers/i2c/i2c_nrfx_twim_common.c
 create mode 100644 drivers/i2c/i2c_nrfx_twim_common.h

diff --git a/drivers/i2c/CMakeLists.txt b/drivers/i2c/CMakeLists.txt
index cf7155ecdd8..47dc4635f67 100644
--- a/drivers/i2c/CMakeLists.txt
+++ b/drivers/i2c/CMakeLists.txt
@@ -46,7 +46,10 @@ else()
 	)
 endif()
 
-zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWIM	i2c_nrfx_twim.c)
+zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWIM
+i2c_nrfx_twim.c
+i2c_nrfx_twim_common.c
+)
 zephyr_library_sources_ifdef(CONFIG_I2C_SAM_TWI		i2c_sam_twi.c)
 
 if(CONFIG_I2C_RTIO)
diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c
index e38512137ed..ea43e31811b 100644
--- a/drivers/i2c/i2c_nrfx_twim.c
+++ b/drivers/i2c/i2c_nrfx_twim.c
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/pm/device.h>
@@ -17,6 +16,9 @@
 
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
+
+#include "i2c_nrfx_twim_common.h"
+
 LOG_MODULE_REGISTER(i2c_nrfx_twim, CONFIG_I2C_LOG_LEVEL);
 
 #if CONFIG_I2C_NRFX_TRANSFER_TIMEOUT
@@ -31,31 +33,18 @@ struct i2c_nrfx_twim_data {
 	volatile nrfx_err_t res;
 };
 
-struct i2c_nrfx_twim_config {
-	nrfx_twim_t twim;
-	nrfx_twim_config_t twim_config;
-	uint16_t msg_buf_size;
-	void (*irq_connect)(void);
-	const struct pinctrl_dev_config *pcfg;
-	uint8_t *msg_buf;
-	uint16_t max_transfer_size;
-};
-
-static int i2c_nrfx_twim_recover_bus(const struct device *dev);
-
 static int i2c_nrfx_twim_transfer(const struct device *dev,
 				  struct i2c_msg *msgs,
 				  uint8_t num_msgs, uint16_t addr)
 {
 	struct i2c_nrfx_twim_data *dev_data = dev->data;
-	const struct i2c_nrfx_twim_config *dev_config = dev->config;
+	const struct i2c_nrfx_twim_common_config *dev_config = dev->config;
 	int ret = 0;
 	uint8_t *msg_buf = dev_config->msg_buf;
 	uint16_t msg_buf_used = 0;
 	uint16_t msg_buf_size = dev_config->msg_buf_size;
-	nrfx_twim_xfer_desc_t cur_xfer = {
-		.address = addr
-	};
+	uint8_t *buf;
+	uint16_t buf_len;
 
 	k_sem_take(&dev_data->transfer_sync, K_FOREVER);
 
@@ -116,35 +105,15 @@ static int i2c_nrfx_twim_transfer(const struct device *dev,
 		}
 
 		if (msg_buf_used == 0) {
-			cur_xfer.p_primary_buf = msgs[i].buf;
-			cur_xfer.primary_length = msgs[i].len;
+			buf = msgs[i].buf;
+			buf_len = msgs[i].len;
 		} else {
-			cur_xfer.p_primary_buf = msg_buf;
-			cur_xfer.primary_length = msg_buf_used;
-		}
-		cur_xfer.type = (msgs[i].flags & I2C_MSG_READ) ?
-			NRFX_TWIM_XFER_RX : NRFX_TWIM_XFER_TX;
-
-		if (cur_xfer.primary_length > dev_config->max_transfer_size) {
-			LOG_ERR("Trying to transfer more than the maximum size "
-				"for this device: %d > %d",
-				cur_xfer.primary_length,
-				dev_config->max_transfer_size);
-			return -ENOSPC;
+			buf = msg_buf;
+			buf_len = msg_buf_used;
 		}
-
-		nrfx_err_t res = nrfx_twim_xfer(&dev_config->twim,
-						&cur_xfer,
-						(msgs[i].flags & I2C_MSG_STOP) ?
-						 0 : NRFX_TWIM_FLAG_TX_NO_STOP);
-		if (res != NRFX_SUCCESS) {
-			if (res == NRFX_ERROR_BUSY) {
-				ret = -EBUSY;
-				break;
-			} else {
-				ret = -EIO;
-				break;
-			}
+		ret = i2c_nrfx_twim_msg_transfer(dev, msgs[i].flags, buf, buf_len, addr);
+		if (ret < 0) {
+			break;
 		}
 
 		ret = k_sem_take(&dev_data->completion_sync,
@@ -171,9 +140,7 @@ static int i2c_nrfx_twim_transfer(const struct device *dev,
 			break;
 		}
 
-		res = dev_data->res;
-
-		if (res != NRFX_SUCCESS) {
+		if (dev_data->res != NRFX_SUCCESS) {
 			ret = -EIO;
 			break;
 		}
@@ -181,8 +148,7 @@ static int i2c_nrfx_twim_transfer(const struct device *dev,
 		/* If concatenated messages were I2C_MSG_READ type, then
 		 * content of concatenation buffer has to be copied back into
 		 * buffers provided by user. */
-		if ((msgs[i].flags & I2C_MSG_READ)
-		    && cur_xfer.p_primary_buf == msg_buf) {
+		if ((msgs[i].flags & I2C_MSG_READ) && (buf == msg_buf)) {
 			int j = i;
 
 			while (msg_buf_used >= msgs[j].len) {
@@ -227,65 +193,14 @@ static void event_handler(nrfx_twim_evt_t const *p_event, void *p_context)
 	k_sem_give(&dev_data->completion_sync);
 }
 
-static int i2c_nrfx_twim_configure(const struct device *dev,
-				   uint32_t i2c_config)
-{
-	const struct i2c_nrfx_twim_config *dev_config = dev->config;
-
-	if (I2C_ADDR_10_BITS & i2c_config) {
-		return -EINVAL;
-	}
-
-	switch (I2C_SPEED_GET(i2c_config)) {
-	case I2C_SPEED_STANDARD:
-		nrf_twim_frequency_set(dev_config->twim.p_twim,
-				       NRF_TWIM_FREQ_100K);
-		break;
-	case I2C_SPEED_FAST:
-		nrf_twim_frequency_set(dev_config->twim.p_twim,
-				       NRF_TWIM_FREQ_400K);
-		break;
-#if NRF_TWIM_HAS_1000_KHZ_FREQ
-	case I2C_SPEED_FAST_PLUS:
-		nrf_twim_frequency_set(dev_config->twim.p_twim,
-				       NRF_TWIM_FREQ_1000K);
-		break;
-#endif
-	default:
-		LOG_ERR("unsupported speed");
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-static int i2c_nrfx_twim_recover_bus(const struct device *dev)
+static int i2c_nrfx_twim_init(const struct device *dev)
 {
-	const struct i2c_nrfx_twim_config *dev_config = dev->config;
-	enum pm_device_state state;
-	uint32_t scl_pin;
-	uint32_t sda_pin;
-	nrfx_err_t err;
-
-	scl_pin = nrf_twim_scl_pin_get(dev_config->twim.p_twim);
-	sda_pin = nrf_twim_sda_pin_get(dev_config->twim.p_twim);
-
-	/* disable peripheral if active (required to release SCL/SDA lines) */
-	(void)pm_device_state_get(dev, &state);
-	if (state == PM_DEVICE_STATE_ACTIVE) {
-		nrfx_twim_disable(&dev_config->twim);
-	}
+	struct i2c_nrfx_twim_data *data = dev->data;
 
-	err = nrfx_twim_bus_recover(scl_pin, sda_pin);
-
-	/* restore peripheral if it was active before */
-	if (state == PM_DEVICE_STATE_ACTIVE) {
-		(void)pinctrl_apply_state(dev_config->pcfg,
-					  PINCTRL_STATE_DEFAULT);
-		nrfx_twim_enable(&dev_config->twim);
-	}
+	k_sem_init(&data->transfer_sync, 1, 1);
+	k_sem_init(&data->completion_sync, 0, 1);
 
-	return (err == NRFX_SUCCESS ? 0 : -EBUSY);
+	return i2c_nrfx_twim_common_init(dev);
 }
 
 static const struct i2c_driver_api i2c_nrfx_twim_driver_api = {
@@ -297,62 +212,6 @@ static const struct i2c_driver_api i2c_nrfx_twim_driver_api = {
 	.recover_bus = i2c_nrfx_twim_recover_bus,
 };
 
-static int twim_nrfx_pm_action(const struct device *dev,
-			       enum pm_device_action action)
-{
-	const struct i2c_nrfx_twim_config *dev_config = dev->config;
-
-	switch (action) {
-	case PM_DEVICE_ACTION_RESUME:
-		(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_DEFAULT);
-		nrfx_twim_enable(&dev_config->twim);
-		break;
-	case PM_DEVICE_ACTION_SUSPEND:
-		nrfx_twim_disable(&dev_config->twim);
-		(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
-		break;
-	default:
-		return -ENOTSUP;
-	}
-
-	return 0;
-}
-
-static int i2c_nrfx_twim_init(const struct device *dev)
-{
-	const struct i2c_nrfx_twim_config *dev_config = dev->config;
-	struct i2c_nrfx_twim_data *dev_data = dev->data;
-
-	dev_config->irq_connect();
-
-	k_sem_init(&dev_data->transfer_sync, 1, 1);
-	k_sem_init(&dev_data->completion_sync, 0, 1);
-
-	(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
-
-	if (nrfx_twim_init(&dev_config->twim, &dev_config->twim_config,
-			   event_handler, dev_data) != NRFX_SUCCESS) {
-		LOG_ERR("Failed to initialize device: %s", dev->name);
-		return -EIO;
-	}
-
-	return pm_device_driver_init(dev, twim_nrfx_pm_action);
-}
-
-#define I2C_NRFX_TWIM_INVALID_FREQUENCY  ((nrf_twim_frequency_t)-1)
-#define I2C_NRFX_TWIM_FREQUENCY(bitrate)				       \
-	(bitrate == I2C_BITRATE_STANDARD  ? NRF_TWIM_FREQ_100K :	       \
-	 bitrate == 250000                ? NRF_TWIM_FREQ_250K :	       \
-	 bitrate == I2C_BITRATE_FAST      ? NRF_TWIM_FREQ_400K :	       \
-	IF_ENABLED(NRF_TWIM_HAS_1000_KHZ_FREQ,				       \
-	(bitrate == I2C_BITRATE_FAST_PLUS ? NRF_TWIM_FREQ_1000K :))	       \
-					    I2C_NRFX_TWIM_INVALID_FREQUENCY)
-
-#define I2C(idx) DT_NODELABEL(i2c##idx)
-#define I2C_HAS_PROP(idx, prop)	DT_NODE_HAS_PROP(I2C(idx), prop)
-#define I2C_FREQUENCY(idx)						       \
-	I2C_NRFX_TWIM_FREQUENCY(DT_PROP(I2C(idx), clock_frequency))
-
 #define CONCAT_BUF_SIZE(idx)						       \
 	COND_CODE_1(DT_NODE_HAS_PROP(I2C(idx), zephyr_concat_buf_size),	       \
 		    (DT_PROP(I2C(idx), zephyr_concat_buf_size)), (0))
@@ -381,13 +240,15 @@ static int i2c_nrfx_twim_init(const struct device *dev)
 		 I2C_MEMORY_SECTION(idx);))				       \
 	static struct i2c_nrfx_twim_data twim_##idx##_data;		       \
 	PINCTRL_DT_DEFINE(I2C(idx));					       \
-	static const struct i2c_nrfx_twim_config twim_##idx##z_config = {      \
+	static const							       \
+	struct i2c_nrfx_twim_common_config twim_##idx##z_config = {	       \
 		.twim = NRFX_TWIM_INSTANCE(idx),			       \
 		.twim_config = {					       \
 			.skip_gpio_cfg = true,				       \
 			.skip_psel_cfg = true,				       \
 			.frequency = I2C_FREQUENCY(idx),		       \
 		},							       \
+		.event_handler = event_handler,				       \
 		.msg_buf_size = MSG_BUF_SIZE(idx),			       \
 		.irq_connect = irq_connect##idx,			       \
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(I2C(idx)),		       \
diff --git a/drivers/i2c/i2c_nrfx_twim_common.c b/drivers/i2c/i2c_nrfx_twim_common.c
new file mode 100644
index 00000000000..be0b78ac6b8
--- /dev/null
+++ b/drivers/i2c/i2c_nrfx_twim_common.c
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2018, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/device_runtime.h>
+
+#include "i2c_nrfx_twim_common.h"
+
+LOG_MODULE_DECLARE(i2c_nrfx_twim);
+
+int i2c_nrfx_twim_recover_bus(const struct device *dev)
+{
+	const struct i2c_nrfx_twim_common_config *config = dev->config;
+	enum pm_device_state state;
+	uint32_t scl_pin;
+	uint32_t sda_pin;
+	nrfx_err_t err;
+
+	scl_pin = nrf_twim_scl_pin_get(config->twim.p_twim);
+	sda_pin = nrf_twim_sda_pin_get(config->twim.p_twim);
+
+	/* disable peripheral if active (required to release SCL/SDA lines) */
+	(void)pm_device_state_get(dev, &state);
+	if (state == PM_DEVICE_STATE_ACTIVE) {
+		nrfx_twim_disable(&config->twim);
+	}
+
+	err = nrfx_twim_bus_recover(scl_pin, sda_pin);
+
+	/* restore peripheral if it was active before */
+	if (state == PM_DEVICE_STATE_ACTIVE) {
+		(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+		nrfx_twim_enable(&config->twim);
+	}
+
+	return (err == NRFX_SUCCESS ? 0 : -EBUSY);
+}
+
+int i2c_nrfx_twim_configure(const struct device *dev, uint32_t i2c_config)
+{
+	const struct i2c_nrfx_twim_common_config *config = dev->config;
+
+	if (I2C_ADDR_10_BITS & i2c_config) {
+		return -EINVAL;
+	}
+
+	switch (I2C_SPEED_GET(i2c_config)) {
+	case I2C_SPEED_STANDARD:
+		nrf_twim_frequency_set(config->twim.p_twim, NRF_TWIM_FREQ_100K);
+		break;
+	case I2C_SPEED_FAST:
+		nrf_twim_frequency_set(config->twim.p_twim, NRF_TWIM_FREQ_400K);
+		break;
+#if NRF_TWIM_HAS_1000_KHZ_FREQ
+	case I2C_SPEED_FAST_PLUS:
+		nrf_twim_frequency_set(config->twim.p_twim, NRF_TWIM_FREQ_1000K);
+		break;
+#endif
+	default:
+		LOG_ERR("unsupported speed");
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+int i2c_nrfx_twim_msg_transfer(const struct device *dev, uint8_t flags, uint8_t *buf,
+			       size_t buf_len, uint16_t i2c_addr)
+{
+	const struct i2c_nrfx_twim_common_config *config = dev->config;
+	nrfx_twim_xfer_desc_t cur_xfer = {
+		.address = i2c_addr,
+		.type = (flags & I2C_MSG_READ) ? NRFX_TWIM_XFER_RX : NRFX_TWIM_XFER_TX,
+		.p_primary_buf = buf,
+		.primary_length = buf_len,
+	};
+	nrfx_err_t res;
+	int ret = 0;
+
+	if (buf_len > config->max_transfer_size) {
+		LOG_ERR("Trying to transfer more than the maximum size "
+			"for this device: %d > %d",
+			buf_len, config->max_transfer_size);
+		return -ENOSPC;
+	}
+
+	res = nrfx_twim_xfer(&config->twim, &cur_xfer,
+			     (flags & I2C_MSG_STOP) ? 0 : NRFX_TWIM_FLAG_TX_NO_STOP);
+	if (res != NRFX_SUCCESS) {
+		if (res == NRFX_ERROR_BUSY) {
+			ret = -EBUSY;
+		} else {
+			ret = -EIO;
+		}
+	}
+	return ret;
+}
+
+int twim_nrfx_pm_action(const struct device *dev, enum pm_device_action action)
+{
+	const struct i2c_nrfx_twim_common_config *config = dev->config;
+
+	switch (action) {
+	case PM_DEVICE_ACTION_RESUME:
+		(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+		nrfx_twim_enable(&config->twim);
+		break;
+	case PM_DEVICE_ACTION_SUSPEND:
+		nrfx_twim_disable(&config->twim);
+		(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+int i2c_nrfx_twim_common_init(const struct device *dev)
+{
+	const struct i2c_nrfx_twim_common_config *config = dev->config;
+
+	config->irq_connect();
+
+	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
+
+	if (nrfx_twim_init(&config->twim, &config->twim_config, config->event_handler, data) !=
+	    NRFX_SUCCESS) {
+		LOG_ERR("Failed to initialize device: %s", dev->name);
+		return -EIO;
+	}
+
+	return pm_device_driver_init(dev, twim_nrfx_pm_action);
+}
diff --git a/drivers/i2c/i2c_nrfx_twim_common.h b/drivers/i2c/i2c_nrfx_twim_common.h
new file mode 100644
index 00000000000..23811a225e7
--- /dev/null
+++ b/drivers/i2c/i2c_nrfx_twim_common.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2024, Croxel Inc
+ * Copyright (c) 2024, Embeint Inc
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_I2C_I2C_NRFX_TWIM_COMMON_H_
+#define ZEPHYR_DRIVERS_I2C_I2C_NRFX_TWIM_COMMON_H_
+
+#include <zephyr/device.h>
+#include <zephyr/pm/device.h>
+#include <nrfx_twim.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define I2C_NRFX_TWIM_INVALID_FREQUENCY ((nrf_twim_frequency_t)-1)
+#define I2C_NRFX_TWIM_FREQUENCY(bitrate)                                                           \
+	(bitrate == I2C_BITRATE_STANDARD ? NRF_TWIM_FREQ_100K                                      \
+	 : bitrate == 250000             ? NRF_TWIM_FREQ_250K                                      \
+	 : bitrate == I2C_BITRATE_FAST                                                             \
+		 ? NRF_TWIM_FREQ_400K                                                              \
+		 : IF_ENABLED(NRF_TWIM_HAS_1000_KHZ_FREQ,                                          \
+			      (bitrate == I2C_BITRATE_FAST_PLUS ? NRF_TWIM_FREQ_1000K :))          \
+			   I2C_NRFX_TWIM_INVALID_FREQUENCY)
+
+#define I2C(idx)                DT_NODELABEL(i2c##idx)
+#define I2C_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(I2C(idx), prop)
+#define I2C_FREQUENCY(idx)      I2C_NRFX_TWIM_FREQUENCY(DT_PROP(I2C(idx), clock_frequency))
+
+struct i2c_nrfx_twim_common_config {
+	nrfx_twim_t twim;
+	nrfx_twim_config_t twim_config;
+	nrfx_twim_evt_handler_t event_handler;
+	uint16_t msg_buf_size;
+	void (*irq_connect)(void);
+	const struct pinctrl_dev_config *pcfg;
+	uint8_t *msg_buf;
+	uint16_t max_transfer_size;
+};
+
+int i2c_nrfx_twim_common_init(const struct device *dev);
+int i2c_nrfx_twim_configure(const struct device *dev, uint32_t i2c_config);
+int i2c_nrfx_twim_recover_bus(const struct device *dev);
+int i2c_nrfx_twim_msg_transfer(const struct device *dev, uint8_t flags, uint8_t *buf,
+			       size_t buf_len, uint16_t i2c_addr);
+
+#ifdef CONFIG_PM_DEVICE
+int twim_nrfx_pm_action(const struct device *dev, enum pm_device_action action);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_DRIVERS_I2C_I2C_NRFX_TWIM_COMMON_H_ */

From 79e39ab8e420eb0691c1fa4d85c5ff0b2a086108 Mon Sep 17 00:00:00 2001
From: Jordan Yates <jordan@embeint.com>
Date: Sat, 10 Aug 2024 10:36:39 +1000
Subject: [PATCH 0718/2913] [nrf fromtree] i2c: i2c_nrfx_twim: update callback
 context to dev

Change the callback context to the dev pointer instead of the data
pointer, as the dev pointer is needed by RTIO.

Signed-off-by: Jordan Yates <jordan@embeint.com>
(cherry picked from commit 627be7d150c2842f095061797661abbcd01fc3a5)
(cherry picked from commit 2a3b7f6767bccde84e7ce8e86582c978f3dc8475)
---
 drivers/i2c/i2c_nrfx_twim.c        | 3 ++-
 drivers/i2c/i2c_nrfx_twim_common.c | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c
index ea43e31811b..9609709d8c3 100644
--- a/drivers/i2c/i2c_nrfx_twim.c
+++ b/drivers/i2c/i2c_nrfx_twim.c
@@ -173,7 +173,8 @@ static int i2c_nrfx_twim_transfer(const struct device *dev,
 
 static void event_handler(nrfx_twim_evt_t const *p_event, void *p_context)
 {
-	struct i2c_nrfx_twim_data *dev_data = p_context;
+	const struct device *dev = p_context;
+	struct i2c_nrfx_twim_data *dev_data = dev->data;
 
 	switch (p_event->type) {
 	case NRFX_TWIM_EVT_DONE:
diff --git a/drivers/i2c/i2c_nrfx_twim_common.c b/drivers/i2c/i2c_nrfx_twim_common.c
index be0b78ac6b8..1539d7c90dd 100644
--- a/drivers/i2c/i2c_nrfx_twim_common.c
+++ b/drivers/i2c/i2c_nrfx_twim_common.c
@@ -130,8 +130,8 @@ int i2c_nrfx_twim_common_init(const struct device *dev)
 
 	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
 
-	if (nrfx_twim_init(&config->twim, &config->twim_config, config->event_handler, data) !=
-	    NRFX_SUCCESS) {
+	if (nrfx_twim_init(&config->twim, &config->twim_config, config->event_handler,
+			   (void *)dev) != NRFX_SUCCESS) {
 		LOG_ERR("Failed to initialize device: %s", dev->name);
 		return -EIO;
 	}

From 6ea301d196a8177274c4eb3a42c8c7148945530e Mon Sep 17 00:00:00 2001
From: Jordan Yates <jordan@embeint.com>
Date: Sat, 10 Aug 2024 11:31:36 +1000
Subject: [PATCH 0719/2913] [nrf fromtree] i2c: nrfx_twim: native RTIO support

Add native support for RTIO to the TWIM hardware IP.

Signed-off-by: Jordan Yates <jordan@embeint.com>
(cherry picked from commit f443363f16e65e3ccbd26fa2a4f219e52e1cad5c)
(cherry picked from commit b94f27fb14ff0bc423ed2479ea69562f9a70eee2)
---
 drivers/i2c/CMakeLists.txt       |  15 +-
 drivers/i2c/i2c_nrfx_twim_rtio.c | 290 +++++++++++++++++++++++++++++++
 2 files changed, 301 insertions(+), 4 deletions(-)
 create mode 100644 drivers/i2c/i2c_nrfx_twim_rtio.c

diff --git a/drivers/i2c/CMakeLists.txt b/drivers/i2c/CMakeLists.txt
index 47dc4635f67..25a68ea5f8f 100644
--- a/drivers/i2c/CMakeLists.txt
+++ b/drivers/i2c/CMakeLists.txt
@@ -46,10 +46,17 @@ else()
 	)
 endif()
 
-zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWIM
-i2c_nrfx_twim.c
-i2c_nrfx_twim_common.c
-)
+if(CONFIG_I2C_RTIO)
+	zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWIM
+	i2c_nrfx_twim_rtio.c
+	i2c_nrfx_twim_common.c
+	)
+else()
+	zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWIM
+	i2c_nrfx_twim.c
+	i2c_nrfx_twim_common.c
+	)
+endif()
 zephyr_library_sources_ifdef(CONFIG_I2C_SAM_TWI		i2c_sam_twi.c)
 
 if(CONFIG_I2C_RTIO)
diff --git a/drivers/i2c/i2c_nrfx_twim_rtio.c b/drivers/i2c/i2c_nrfx_twim_rtio.c
new file mode 100644
index 00000000000..ad455433263
--- /dev/null
+++ b/drivers/i2c/i2c_nrfx_twim_rtio.c
@@ -0,0 +1,290 @@
+/*
+ * Copyright (c) 2018, Nordic Semiconductor ASA
+ * Copyright (c) 2024, Croxel Inc
+ * Copyright (c) 2024, Embeint Inc
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c/rtio.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <soc.h>
+#include <nrfx_twim.h>
+
+#include "i2c_nrfx_twim_common.h"
+
+LOG_MODULE_REGISTER(i2c_nrfx_twim, CONFIG_I2C_LOG_LEVEL);
+
+struct i2c_nrfx_twim_rtio_config {
+	struct i2c_nrfx_twim_common_config common;
+	struct i2c_rtio *ctx;
+};
+
+static bool i2c_nrfx_twim_rtio_msg_start(const struct device *dev, uint8_t flags, uint8_t *buf,
+					 size_t buf_len, uint16_t i2c_addr)
+{
+	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
+	struct i2c_rtio *ctx = config->ctx;
+	int ret = 0;
+
+	ret = i2c_nrfx_twim_msg_transfer(dev, flags, buf, buf_len, i2c_addr);
+	if (ret != 0) {
+		return i2c_rtio_complete(ctx, ret);
+	}
+
+	return false;
+}
+
+static bool i2c_nrfx_twim_rtio_start(const struct device *dev)
+{
+	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
+	struct i2c_rtio *ctx = config->ctx;
+	struct rtio_sqe *sqe = &ctx->txn_curr->sqe;
+	struct i2c_dt_spec *dt_spec = sqe->iodev->data;
+
+	switch (sqe->op) {
+	case RTIO_OP_RX:
+		return i2c_nrfx_twim_rtio_msg_start(dev, I2C_MSG_READ | sqe->iodev_flags,
+						    sqe->rx.buf, sqe->rx.buf_len, dt_spec->addr);
+	case RTIO_OP_TINY_TX:
+		return i2c_nrfx_twim_rtio_msg_start(dev, I2C_MSG_WRITE | sqe->iodev_flags,
+						    sqe->tiny_tx.buf, sqe->tiny_tx.buf_len,
+						    dt_spec->addr);
+	case RTIO_OP_TX:
+		/* If buffer is not accessible by DMA, copy it into the internal driver buffer */
+		if (!nrf_dma_accessible_check(&config->common.twim, sqe->tx.buf)) {
+			/* Validate buffer will fit */
+			if (sqe->tx.buf_len > config->common.msg_buf_size) {
+				LOG_ERR("Need to use the internal driver "
+					"buffer but its size is insufficient "
+					"(%u > %u). "
+					"Adjust the zephyr,concat-buf-size or "
+					"zephyr,flash-buf-max-size property "
+					"(the one with greater value) in the "
+					"\"%s\"' node.",
+					sqe->tx.buf_len, config->common.msg_buf_size, dev->name);
+				return i2c_rtio_complete(ctx, -ENOSPC);
+			}
+			memcpy(config->common.msg_buf, sqe->tx.buf, sqe->tx.buf_len);
+			sqe->tx.buf = config->common.msg_buf;
+		}
+		return i2c_nrfx_twim_rtio_msg_start(dev, I2C_MSG_WRITE | sqe->iodev_flags,
+						    sqe->tx.buf, sqe->tx.buf_len, dt_spec->addr);
+	case RTIO_OP_I2C_CONFIGURE:
+		(void)i2c_nrfx_twim_configure(dev, sqe->i2c_config);
+		return false;
+	case RTIO_OP_I2C_RECOVER:
+		(void)i2c_nrfx_twim_recover_bus(dev);
+		return false;
+	default:
+		LOG_ERR("Invalid op code %d for submission %p\n", sqe->op, (void *)sqe);
+		return i2c_rtio_complete(ctx, -EINVAL);
+	}
+}
+
+static void i2c_nrfx_twim_rtio_complete(const struct device *dev, int status)
+{
+	/** Finalize if there are no more pending xfers */
+	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
+	struct i2c_rtio *ctx = config->ctx;
+
+	if (i2c_rtio_complete(ctx, status)) {
+		(void)i2c_nrfx_twim_rtio_start(dev);
+	} else {
+		/* Release bus on completion */
+		pm_device_runtime_put(dev);
+	}
+}
+
+static int i2c_nrfx_twim_rtio_configure(const struct device *dev, uint32_t i2c_config)
+{
+	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
+	struct i2c_rtio *ctx = config->ctx;
+
+	return i2c_rtio_configure(ctx, i2c_config);
+}
+
+static int i2c_nrfx_twim_rtio_transfer(const struct device *dev, struct i2c_msg *msgs,
+				       uint8_t num_msgs, uint16_t addr)
+{
+	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
+	struct i2c_rtio *ctx = config->ctx;
+
+	return i2c_rtio_transfer(ctx, msgs, num_msgs, addr);
+}
+
+static int i2c_nrfx_twim_rtio_recover_bus(const struct device *dev)
+{
+	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
+	struct i2c_rtio *ctx = config->ctx;
+
+	return i2c_rtio_recover(ctx);
+}
+
+static void i2c_nrfx_twim_rtio_submit(const struct device *dev, struct rtio_iodev_sqe *iodev_seq)
+{
+	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
+	struct i2c_rtio *ctx = config->ctx;
+
+	if (i2c_rtio_submit(ctx, iodev_seq)) {
+		if (pm_device_runtime_get(dev) < 0) {
+			(void)i2c_rtio_complete(ctx, -EINVAL);
+		} else {
+			(void)i2c_nrfx_twim_rtio_start(dev);
+		}
+	}
+}
+
+static void event_handler(nrfx_twim_evt_t const *p_event, void *p_context)
+{
+	const struct device *dev = p_context;
+	int status = p_event->type == NRFX_TWIM_EVT_DONE ? 0 : -EIO;
+
+	i2c_nrfx_twim_rtio_complete(dev, status);
+}
+
+static const struct i2c_driver_api i2c_nrfx_twim_driver_api = {
+	.configure = i2c_nrfx_twim_rtio_configure,
+	.transfer = i2c_nrfx_twim_rtio_transfer,
+	.recover_bus = i2c_nrfx_twim_rtio_recover_bus,
+	.iodev_submit = i2c_nrfx_twim_rtio_submit,
+};
+
+int i2c_nrfx_twim_rtio_init(const struct device *dev)
+{
+	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
+
+	i2c_rtio_init(config->ctx, dev);
+	return i2c_nrfx_twim_common_init(dev);
+}
+
+#define CONCAT_BUF_SIZE(idx)                                                                       \
+	COND_CODE_1(DT_NODE_HAS_PROP(I2C(idx), zephyr_concat_buf_size),                            \
+		    (DT_PROP(I2C(idx), zephyr_concat_buf_size)), (0))
+#define FLASH_BUF_MAX_SIZE(idx)                                                                    \
+	COND_CODE_1(DT_NODE_HAS_PROP(I2C(idx), zephyr_flash_buf_max_size),                         \
+		    (DT_PROP(I2C(idx), zephyr_flash_buf_max_size)), (0))
+
+#define USES_MSG_BUF(idx)                                                                          \
+	COND_CODE_0(CONCAT_BUF_SIZE(idx), (COND_CODE_0(FLASH_BUF_MAX_SIZE(idx), (0), (1))), (1))
+#define MSG_BUF_SIZE(idx) MAX(CONCAT_BUF_SIZE(idx), FLASH_BUF_MAX_SIZE(idx))
+
+#define I2C_NRFX_TWIM_RTIO_DEVICE(idx)                                                             \
+	NRF_DT_CHECK_NODE_HAS_PINCTRL_SLEEP(I2C(idx));                                             \
+	BUILD_ASSERT(I2C_FREQUENCY(idx) != I2C_NRFX_TWIM_INVALID_FREQUENCY,                        \
+		     "Wrong I2C " #idx " frequency setting in dts");                               \
+	static void irq_connect##idx(void)                                                         \
+	{                                                                                          \
+		IRQ_CONNECT(DT_IRQN(I2C(idx)), DT_IRQ(I2C(idx), priority), nrfx_isr,               \
+			    nrfx_twim_##idx##_irq_handler, 0);                                     \
+	}                                                                                          \
+	IF_ENABLED(                                                                                \
+		USES_MSG_BUF(idx),                                                                 \
+		(static uint8_t twim_##idx##_msg_buf[MSG_BUF_SIZE(idx)] I2C_MEMORY_SECTION(idx);)) \
+	I2C_RTIO_DEFINE(_i2c##idx##_twim_rtio,                                                     \
+			DT_INST_PROP_OR(n, sq_size, CONFIG_I2C_RTIO_SQ_SIZE),                      \
+			DT_INST_PROP_OR(n, cq_size, CONFIG_I2C_RTIO_CQ_SIZE));                     \
+	PINCTRL_DT_DEFINE(I2C(idx));                                                               \
+	static const struct i2c_nrfx_twim_rtio_config twim_##idx##z_config = {                     \
+		.common =                                                                          \
+			{                                                                          \
+				.twim = NRFX_TWIM_INSTANCE(idx),                                   \
+				.twim_config =                                                     \
+					{                                                          \
+						.skip_gpio_cfg = true,                             \
+						.skip_psel_cfg = true,                             \
+						.frequency = I2C_FREQUENCY(idx),                   \
+					},                                                         \
+				.event_handler = event_handler,                                    \
+				.msg_buf_size = MSG_BUF_SIZE(idx),                                 \
+				.irq_connect = irq_connect##idx,                                   \
+				.pcfg = PINCTRL_DT_DEV_CONFIG_GET(I2C(idx)),                       \
+				IF_ENABLED(USES_MSG_BUF(idx), (.msg_buf = twim_##idx##_msg_buf,))  \
+					.max_transfer_size =                                       \
+					BIT_MASK(DT_PROP(I2C(idx), easydma_maxcnt_bits)),          \
+			},                                                                         \
+		.ctx = &_i2c##idx##_twim_rtio,                                                     \
+	};                                                                                         \
+	PM_DEVICE_DT_DEFINE(I2C(idx), twim_nrfx_pm_action);                                        \
+	I2C_DEVICE_DT_DEFINE(I2C(idx), i2c_nrfx_twim_rtio_init, PM_DEVICE_DT_GET(I2C(idx)), NULL,  \
+			     &twim_##idx##z_config, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY,         \
+			     &i2c_nrfx_twim_driver_api)
+
+#define I2C_MEMORY_SECTION(idx)                                                                    \
+	COND_CODE_1(I2C_HAS_PROP(idx, memory_regions),                                             \
+		    (__attribute__((__section__(                                                   \
+			    LINKER_DT_NODE_REGION_NAME(DT_PHANDLE(I2C(idx), memory_regions)))))),  \
+		    ())
+
+#ifdef CONFIG_HAS_HW_NRF_TWIM0
+I2C_NRFX_TWIM_RTIO_DEVICE(0);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_TWIM1
+I2C_NRFX_TWIM_RTIO_DEVICE(1);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_TWIM2
+I2C_NRFX_TWIM_RTIO_DEVICE(2);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_TWIM3
+I2C_NRFX_TWIM_RTIO_DEVICE(3);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_TWIM20
+I2C_NRFX_TWIM_RTIO_DEVICE(20);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_TWIM21
+I2C_NRFX_TWIM_RTIO_DEVICE(21);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_TWIM22
+I2C_NRFX_TWIM_RTIO_DEVICE(22);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_TWIM30
+I2C_NRFX_TWIM_RTIO_DEVICE(30);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_TWIM120
+I2C_NRFX_TWIM_RTIO_DEVICE(120);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_TWIM130
+I2C_NRFX_TWIM_RTIO_DEVICE(130);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_TWIM131
+I2C_NRFX_TWIM_RTIO_DEVICE(131);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_TWIM132
+I2C_NRFX_TWIM_RTIO_DEVICE(132);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_TWIM133
+I2C_NRFX_TWIM_RTIO_DEVICE(133);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_TWIM134
+I2C_NRFX_TWIM_RTIO_DEVICE(134);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_TWIM135
+I2C_NRFX_TWIM_RTIO_DEVICE(135);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_TWIM136
+I2C_NRFX_TWIM_RTIO_DEVICE(136);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_TWIM137
+I2C_NRFX_TWIM_RTIO_DEVICE(137);
+#endif

From 51c4fee51427a38de62ab5f3d5d8d61357acc300 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Tue, 15 Oct 2024 09:50:04 +0200
Subject: [PATCH 0720/2913] [nrf fromtree] drivers: i2c: nrfx_twi[m]: default
 to I2C_BITRATE_STANDARD

Instead of forcing a definition in Devicetree. Right now, SoC DT files
contain this default, but it should not be part of SoC DT files.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 92c34954935aeb19f243c05b51b65a16496485fe)
(cherry picked from commit 7f6f5798775844bf8e5d301230082cb81c4f9061)
---
 drivers/i2c/i2c_nrfx_twi_common.h  | 3 ++-
 drivers/i2c/i2c_nrfx_twim_common.h | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/i2c_nrfx_twi_common.h b/drivers/i2c/i2c_nrfx_twi_common.h
index a8925d3f75b..a3e9847bab5 100644
--- a/drivers/i2c/i2c_nrfx_twi_common.h
+++ b/drivers/i2c/i2c_nrfx_twi_common.h
@@ -22,7 +22,8 @@ extern "C" {
 					  : I2C_NRFX_TWI_INVALID_FREQUENCY)
 #define I2C(idx) DT_NODELABEL(i2c##idx)
 #define I2C_FREQUENCY(idx)						       \
-	I2C_NRFX_TWI_FREQUENCY(DT_PROP(I2C(idx), clock_frequency))
+	I2C_NRFX_TWI_FREQUENCY(DT_PROP_OR(I2C(idx), clock_frequency,	       \
+					  I2C_BITRATE_STANDARD))
 
 struct i2c_nrfx_twi_common_data {
 	uint32_t dev_config;
diff --git a/drivers/i2c/i2c_nrfx_twim_common.h b/drivers/i2c/i2c_nrfx_twim_common.h
index 23811a225e7..ba7fa72f019 100644
--- a/drivers/i2c/i2c_nrfx_twim_common.h
+++ b/drivers/i2c/i2c_nrfx_twim_common.h
@@ -28,7 +28,8 @@ extern "C" {
 
 #define I2C(idx)                DT_NODELABEL(i2c##idx)
 #define I2C_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(I2C(idx), prop)
-#define I2C_FREQUENCY(idx)      I2C_NRFX_TWIM_FREQUENCY(DT_PROP(I2C(idx), clock_frequency))
+#define I2C_FREQUENCY(idx)      I2C_NRFX_TWIM_FREQUENCY(DT_PROP_OR(I2C(idx), clock_frequency,      \
+								   I2C_BITRATE_STANDARD))
 
 struct i2c_nrfx_twim_common_config {
 	nrfx_twim_t twim;

From 527f5485ebc0c228ef960e5fed5d2a20eff682a8 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Tue, 15 Oct 2024 09:54:52 +0200
Subject: [PATCH 0721/2913] [nrf fromtree] dts: nordic: remove clock-frequency
 from all i2c nodes

Device driver now defaults to I2C_BITRATE_STANDARD if not specified.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 4e5df113c5b8b16eab45743a2ddfc74cb99735bb)
(cherry picked from commit 6b91fe16626b3809b9040eedde4e77e6abf218f1)
---
 dts/arm/nordic/nrf51822.dtsi                   | 2 --
 dts/arm/nordic/nrf52805.dtsi                   | 1 -
 dts/arm/nordic/nrf52810.dtsi                   | 1 -
 dts/arm/nordic/nrf52811.dtsi                   | 1 -
 dts/arm/nordic/nrf52820.dtsi                   | 2 --
 dts/arm/nordic/nrf52832.dtsi                   | 2 --
 dts/arm/nordic/nrf52833.dtsi                   | 2 --
 dts/arm/nordic/nrf52840.dtsi                   | 2 --
 dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi | 4 ----
 dts/arm/nordic/nrf5340_cpunet.dtsi             | 1 -
 dts/arm/nordic/nrf91_peripherals.dtsi          | 4 ----
 dts/common/nordic/nrf54l15.dtsi                | 4 ----
 dts/common/nordic/nrf54l20.dtsi                | 4 ----
 13 files changed, 30 deletions(-)

diff --git a/dts/arm/nordic/nrf51822.dtsi b/dts/arm/nordic/nrf51822.dtsi
index a11677ad934..c3c85b110a3 100644
--- a/dts/arm/nordic/nrf51822.dtsi
+++ b/dts/arm/nordic/nrf51822.dtsi
@@ -105,7 +105,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40003000 0x1000>;
-			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <8>;
 			status = "disabled";
@@ -133,7 +132,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40004000 0x1000>;
-			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <8>;
 			status = "disabled";
diff --git a/dts/arm/nordic/nrf52805.dtsi b/dts/arm/nordic/nrf52805.dtsi
index fbf89434690..e1c8e6a2efb 100644
--- a/dts/arm/nordic/nrf52805.dtsi
+++ b/dts/arm/nordic/nrf52805.dtsi
@@ -127,7 +127,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40003000 0x1000>;
-			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <14>;
 			status = "disabled";
diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
index 3be690a987e..40d872dda44 100644
--- a/dts/arm/nordic/nrf52810.dtsi
+++ b/dts/arm/nordic/nrf52810.dtsi
@@ -131,7 +131,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40003000 0x1000>;
-			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <10>;
 			status = "disabled";
diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi
index 83a66d77792..735bfee427b 100644
--- a/dts/arm/nordic/nrf52811.dtsi
+++ b/dts/arm/nordic/nrf52811.dtsi
@@ -143,7 +143,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40003000 0x1000>;
-			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <14>;
 			status = "disabled";
diff --git a/dts/arm/nordic/nrf52820.dtsi b/dts/arm/nordic/nrf52820.dtsi
index 71abcab55cc..82bdcb58934 100644
--- a/dts/arm/nordic/nrf52820.dtsi
+++ b/dts/arm/nordic/nrf52820.dtsi
@@ -145,7 +145,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40003000 0x1000>;
-			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <15>;
 			status = "disabled";
@@ -182,7 +181,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40004000 0x1000>;
-			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <15>;
 			status = "disabled";
diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
index 49acb441c57..abb1aed468c 100644
--- a/dts/arm/nordic/nrf52832.dtsi
+++ b/dts/arm/nordic/nrf52832.dtsi
@@ -131,7 +131,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40003000 0x1000>;
-			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <8>;
 			status = "disabled";
@@ -168,7 +167,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40004000 0x1000>;
-			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <8>;
 			status = "disabled";
diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi
index 7d23e15f5f8..e8a033b4002 100644
--- a/dts/arm/nordic/nrf52833.dtsi
+++ b/dts/arm/nordic/nrf52833.dtsi
@@ -145,7 +145,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40003000 0x1000>;
-			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
@@ -182,7 +181,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40004000 0x1000>;
-			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index 56712a6bccc..e2265c130b0 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -133,7 +133,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40003000 0x1000>;
-			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
@@ -170,7 +169,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40004000 0x1000>;
-			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
diff --git a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
index 745e23d87ce..a0c79972948 100644
--- a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
@@ -104,7 +104,6 @@ i2c0: i2c@8000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0x8000 0x1000>;
-	clock-frequency = <I2C_BITRATE_STANDARD>;
 	interrupts = <8 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <16>;
 	status = "disabled";
@@ -146,7 +145,6 @@ i2c1: i2c@9000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0x9000 0x1000>;
-	clock-frequency = <I2C_BITRATE_STANDARD>;
 	interrupts = <9 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <16>;
 	status = "disabled";
@@ -201,7 +199,6 @@ i2c2: i2c@b000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0xb000 0x1000>;
-	clock-frequency = <I2C_BITRATE_STANDARD>;
 	interrupts = <11 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <16>;
 	status = "disabled";
@@ -243,7 +240,6 @@ i2c3: i2c@c000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0xc000 0x1000>;
-	clock-frequency = <I2C_BITRATE_STANDARD>;
 	interrupts = <12 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <16>;
 	status = "disabled";
diff --git a/dts/arm/nordic/nrf5340_cpunet.dtsi b/dts/arm/nordic/nrf5340_cpunet.dtsi
index c17a8caf8f9..acf95077669 100644
--- a/dts/arm/nordic/nrf5340_cpunet.dtsi
+++ b/dts/arm/nordic/nrf5340_cpunet.dtsi
@@ -201,7 +201,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x41013000 0x1000>;
-			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
diff --git a/dts/arm/nordic/nrf91_peripherals.dtsi b/dts/arm/nordic/nrf91_peripherals.dtsi
index 75613b7df2c..58cc3142bcf 100644
--- a/dts/arm/nordic/nrf91_peripherals.dtsi
+++ b/dts/arm/nordic/nrf91_peripherals.dtsi
@@ -156,7 +156,6 @@ i2c0: i2c@8000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0x8000 0x1000>;
-	clock-frequency = <I2C_BITRATE_STANDARD>;
 	interrupts = <8 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <13>;
 	status = "disabled";
@@ -173,7 +172,6 @@ i2c1: i2c@9000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0x9000 0x1000>;
-	clock-frequency = <I2C_BITRATE_STANDARD>;
 	interrupts = <9 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <13>;
 	status = "disabled";
@@ -190,7 +188,6 @@ i2c2: i2c@a000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0xa000 0x1000>;
-	clock-frequency = <I2C_BITRATE_STANDARD>;
 	interrupts = <10 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <13>;
 	status = "disabled";
@@ -207,7 +204,6 @@ i2c3: i2c@b000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0xb000 0x1000>;
-	clock-frequency = <I2C_BITRATE_STANDARD>;
 	interrupts = <11 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <13>;
 	status = "disabled";
diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index 71639075aa9..5a49efd468d 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -282,7 +282,6 @@
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0xc6000 0x1000>;
-				clock-frequency = <I2C_BITRATE_STANDARD>;
 				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
@@ -322,7 +321,6 @@
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0xc7000 0x1000>;
-				clock-frequency = <I2C_BITRATE_STANDARD>;
 				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
@@ -362,7 +360,6 @@
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0xc8000 0x1000>;
-				clock-frequency = <I2C_BITRATE_STANDARD>;
 				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
@@ -579,7 +576,6 @@
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x104000 0x1000>;
-				clock-frequency = <I2C_BITRATE_STANDARD>;
 				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 293f16e1910..8479c6111a8 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -233,7 +233,6 @@
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0xc6000 0x1000>;
-				clock-frequency = <I2C_BITRATE_STANDARD>;
 				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
@@ -273,7 +272,6 @@
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0xc7000 0x1000>;
-				clock-frequency = <I2C_BITRATE_STANDARD>;
 				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
@@ -313,7 +311,6 @@
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0xc8000 0x1000>;
-				clock-frequency = <I2C_BITRATE_STANDARD>;
 				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
@@ -521,7 +518,6 @@
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x104000 0x1000>;
-				clock-frequency = <I2C_BITRATE_STANDARD>;
 				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";

From db73a7454bf5026f78e9b7173ee16177e945d76b Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Tue, 19 Nov 2024 18:51:24 +0100
Subject: [PATCH 0722/2913] [nrf fromtree] manifest: hal_nordic: Update to nrfx
 3.9.0

See https://github.com/zephyrproject-rtos/hal_nordic/pull/257.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit e92323f0c4a6aa30992b9e0568d788f71f5211f2)
(cherry picked from commit d6e902f73a467cd700f5ad045362d18da1be76d5)
---
 drivers/counter/counter_nrfx_timer.c | 2 +-
 west.yml                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/counter/counter_nrfx_timer.c b/drivers/counter/counter_nrfx_timer.c
index a9f0ed1d0bf..333a436c80e 100644
--- a/drivers/counter/counter_nrfx_timer.c
+++ b/drivers/counter/counter_nrfx_timer.c
@@ -70,7 +70,7 @@ static int stop(const struct device *dev)
 {
 	const struct counter_nrfx_config *config = dev->config;
 
-	nrf_timer_task_trigger(config->timer, NRF_TIMER_TASK_SHUTDOWN);
+	nrf_timer_task_trigger(config->timer, NRF_TIMER_TASK_STOP);
 
 	return 0;
 }
diff --git a/west.yml b/west.yml
index 244b91bbf84..1ea092dea59 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 2dbb2ed6cf461062bbac59a65b6e9d4576656350
+      revision: 54bde38c6f6ffb3780b26ae728cf79426184384e
       path: modules/hal/nordic
       groups:
         - hal

From 8c4b3cd2d30d822c185db4c054c856aa8f011391 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 18 Nov 2024 17:57:59 +0100
Subject: [PATCH 0723/2913] [nrf fromtree] manifest: Update nRF hw models to
 latest

Update the HW models module to:
42737c8ec8485987c7c9b0262b136de623e1ded2

Including the following:
42737c8 TIMER: Support devices without TASK_SHUTDOWN nrfx3.9 MDK 8.68
5fe6873 54 UARTE: Add frametimeout functionality
dc086d7 UARTE: Add basic 54 support
b046745 UARTE: Support better not having UART functionality
1c5f58c README: Mention the nRF54L15 models cover the L10 and L05
597c7d0 TEMP: Also build hal replacement for 54 and define NRF_TEMP_NS/S
fb2ca83 Makefile: Let's build libraries (specially HAL) as pic
200a1e3 Makefiles: move some common options to common snippet

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 30f0d85fa0da3aa0e010d1fa5b3134c93f01d87a)
(cherry picked from commit 22a1bf90efb333ad8b2cdab1eef5323700a0c041)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 1ea092dea59..6b0f4ce906a 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: aeef3db9fa9e4b9d12b3bbec44f9cedc8fcb7d9c
+      revision: 42737c8ec8485987c7c9b0262b136de623e1ded2
       path: modules/bsim_hw_models/nrf_hw_models
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719

From 5ba9c28b1a07f403a6197b01c18ae6e6644136ae Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Wed, 20 Nov 2024 14:13:22 +0100
Subject: [PATCH 0724/2913] [nrf fromtree] manifest: Update nRF hw models to
 version compatible with nrfx3.9

Update the HW models module to:
3cfca0192ff84da919e9bc7978bcc2239cd6a395

This includes 2 changes:
* 3cfca01 UART: Model more accurately TASKS_FLUSH behaviour
* 25cbd28: 54L15: Change CLOKPOWER IRQ line (MDK 8.68, nrfx 3.9.0)

    WARNING! This change breaks backwards compatibility with SW
    which expected this line to be 270 for 54L15 devices,
    and therefore with MDKs < 8.68 & nrfx < 3.9.0.
    This change requires updating to the MDK >=8.68 and nrfx >=3.9.0
    if building using the 54L15 models.
    52 and 53 models are not affected.

    Change the CLOCK_POWER interrupt line from 270 to 261.
    This has changed in the latest MDK (8.68) and the new
    value is used in the latest nrfx (3.9.0) drivers.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit ef55d65449f8391105b3de4ca4c13514dee2039a)
(cherry picked from commit 21b641bbb85c3e7b70c4cd6ff1f510ac7c429e97)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 6b0f4ce906a..976de15f4ee 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: 42737c8ec8485987c7c9b0262b136de623e1ded2
+      revision: 3cfca0192ff84da919e9bc7978bcc2239cd6a395
       path: modules/bsim_hw_models/nrf_hw_models
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719

From 5569bda1a12ca5afec819b9ea5c94dcad418329a Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Wed, 20 Nov 2024 10:23:20 +0100
Subject: [PATCH 0725/2913] [nrf fromtree] Bluetooth: Controller: nRF: Support
 MDK 8.68

TASK_SHUTDOWN was deprecated in newer SOCs and now removed
in MDK 8.68 (nrfx 3.9.0)

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 4294814a23b51b8d75744f169ee02548ba2eee3c)
(cherry picked from commit e0a6b5006d0c50fb63ac1390e17e97fab50021a0)
---
 .../bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
index 9d3a312f51f..cd8570ad0aa 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
@@ -1696,11 +1696,15 @@ uint32_t radio_tmr_start_get(void)
 void radio_tmr_stop(void)
 {
 	nrf_timer_task_trigger(EVENT_TIMER, NRF_TIMER_TASK_STOP);
+#if defined(TIMER_TASKS_SHUTDOWN_TASKS_SHUTDOWN_Msk)
 	nrf_timer_task_trigger(EVENT_TIMER, NRF_TIMER_TASK_SHUTDOWN);
+#endif
 
 #if !defined(CONFIG_BT_CTLR_TIFS_HW)
 	nrf_timer_task_trigger(SW_SWITCH_TIMER, NRF_TIMER_TASK_STOP);
+#if defined(TIMER_TASKS_SHUTDOWN_TASKS_SHUTDOWN_Msk)
 	nrf_timer_task_trigger(SW_SWITCH_TIMER, NRF_TIMER_TASK_SHUTDOWN);
+#endif
 #endif /* !CONFIG_BT_CTLR_TIFS_HW */
 
 #if defined(CONFIG_SOC_COMPATIBLE_NRF54LX)

From d7b903a694058afb591efcbc987b4410cb71701a Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Wed, 16 Oct 2024 21:42:12 +0200
Subject: [PATCH 0726/2913] [nrf fromtree] soc: nordic: nRF54L: Consolidate
 common Kconfig options

There are many common options to all ICs of the 54L series. Consolidate
them in a single entry so that they do not need to be re-typed for each
SoC series member.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit 0b3a15016bf51d950dc527611ede8bc71ed71f81)
(cherry picked from commit 0d1265c0443a721e44024c4a28a9522610f28213)
---
 soc/nordic/nrf54l/Kconfig | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index 2db8e8248f9..45a597de15e 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -9,7 +9,8 @@ config SOC_SERIES_NRF54LX
 	select HAS_NORDIC_DRIVERS
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 
-config SOC_NRF54L15_CPUAPP
+config SOC_NRF54L_CPUAPP_COMMON
+	bool
 	select ARM
 	select ARMV8_M_DSP
 	select CPU_CORTEX_M33
@@ -20,16 +21,11 @@ config SOC_NRF54L15_CPUAPP
 	select HAS_HW_NRF_RADIO_IEEE802154
 	select HAS_POWEROFF
 
+config SOC_NRF54L15_CPUAPP
+	select SOC_NRF54L_CPUAPP_COMMON
+
 config SOC_NRF54L20_ENGA_CPUAPP
-	select ARM
-	select ARMV8_M_DSP
-	select CPU_CORTEX_M33
-	select CPU_HAS_ARM_MPU
-	select CPU_HAS_ICACHE
-	select CPU_HAS_ARM_SAU
-	select CPU_HAS_FPU
-	select HAS_HW_NRF_RADIO_IEEE802154
-	select HAS_POWEROFF
+	select SOC_NRF54L_CPUAPP_COMMON
 
 config SOC_NRF54L15_CPUFLPR
 	depends on RISCV_CORE_NORDIC_VPR

From 56e5537b7ff7bb777f368370c57e18c50656ea8c Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Mon, 4 Nov 2024 17:48:40 +0100
Subject: [PATCH 0727/2913] [nrf fromtree] soc: nordic: Introduce the nRF54L05
 and nRF54L10

These two new ICs are variants of the nRF54L15 with different memory
sizes:

- nRF54L05: 500KB RRAM, 96KB RAM
- nRF54L10: 1022KB RRAM, 192KB RAM
- nRF54L15: 1524KB RRAM, 256KB RAM

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit e78832034f1ea3632524f2cbdbe290082483ddf6)
(cherry picked from commit 29e1f332eca198bdbbd30b3dfeeff0b284ab5bc2)
---
 drivers/adc/adc_nrfx_saadc.c                  |    4 +-
 drivers/comparator/comparator_nrf_comp.c      |    2 +-
 drivers/comparator/comparator_nrf_lpcomp.c    |    2 +-
 .../nordic_vpr_launcher/nordic_vpr_launcher.c |    4 +-
 dts/arm/nordic/nrf54l05_cpuapp.dtsi           |    8 +
 dts/arm/nordic/nrf54l10_cpuapp.dtsi           |    8 +
 dts/arm/nordic/nrf54l15_cpuapp.dtsi           |   82 +-
 dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi    |   86 +
 dts/common/nordic/nrf54l05.dtsi               |   39 +
 dts/common/nordic/nrf54l10.dtsi               |   39 +
 dts/common/nordic/nrf54l15.dtsi               |  750 +------
 dts/common/nordic/nrf54l_05_10_15.dtsi        |  734 +++++++
 dts/riscv/nordic/nrf54l05_cpuflpr.dtsi        |    8 +
 dts/riscv/nordic/nrf54l10_cpuflpr.dtsi        |    8 +
 dts/riscv/nordic/nrf54l15_cpuflpr.dtsi        |   61 +-
 dts/riscv/nordic/nrf54l_05_10_15_cpuflpr.dtsi |   65 +
 modules/hal_nordic/nrfx/CMakeLists.txt        |   12 +-
 modules/hal_nordic/nrfx/nrfx_config.h         |    8 +
 .../nrfx/nrfx_config_nrf54l05_application.h   | 1775 ++++++++++++++++
 .../nrfx/nrfx_config_nrf54l05_flpr.h          | 1784 +++++++++++++++++
 .../nrfx/nrfx_config_nrf54l10_application.h   | 1775 ++++++++++++++++
 .../nrfx/nrfx_config_nrf54l10_flpr.h          | 1784 +++++++++++++++++
 .../nrfx/nrfx_config_nrf54l15_application.h   |  170 +-
 .../nrfx/nrfx_config_nrf54l15_flpr.h          |  172 +-
 soc/nordic/nrf54l/Kconfig                     |   16 +-
 .../nrf54l/Kconfig.defconfig.nrf54l15_cpuapp  |   11 -
 .../Kconfig.defconfig.nrf54l_05_10_15_cpuapp  |   11 +
 ...Kconfig.defconfig.nrf54l_05_10_15_cpuflpr} |    6 +-
 soc/nordic/nrf54l/Kconfig.soc                 |   38 +
 soc/nordic/soc.yml                            |   26 +
 soc/nordic/validate_base_addresses.c          |    2 +-
 tests/drivers/flash/negative_tests/src/main.c |    2 +-
 .../drivers/mbox/mbox_error_cases/src/main.c  |    3 +-
 .../watchdog/wdt_error_cases/src/main.c       |    3 +-
 tests/kernel/interrupt/src/nested_irq.c       |    2 +-
 35 files changed, 8561 insertions(+), 939 deletions(-)
 create mode 100644 dts/arm/nordic/nrf54l05_cpuapp.dtsi
 create mode 100644 dts/arm/nordic/nrf54l10_cpuapp.dtsi
 create mode 100644 dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
 create mode 100644 dts/common/nordic/nrf54l05.dtsi
 create mode 100644 dts/common/nordic/nrf54l10.dtsi
 create mode 100644 dts/common/nordic/nrf54l_05_10_15.dtsi
 create mode 100644 dts/riscv/nordic/nrf54l05_cpuflpr.dtsi
 create mode 100644 dts/riscv/nordic/nrf54l10_cpuflpr.dtsi
 create mode 100644 dts/riscv/nordic/nrf54l_05_10_15_cpuflpr.dtsi
 create mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l05_application.h
 create mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l05_flpr.h
 create mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l10_application.h
 create mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l10_flpr.h
 delete mode 100644 soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuapp
 create mode 100644 soc/nordic/nrf54l/Kconfig.defconfig.nrf54l_05_10_15_cpuapp
 rename soc/nordic/nrf54l/{Kconfig.defconfig.nrf54l15_cpuflpr => Kconfig.defconfig.nrf54l_05_10_15_cpuflpr} (52%)

diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index b8782d02454..c5b68f564a8 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -31,7 +31,7 @@ static const uint8_t saadc_psels[NRF_SAADC_AIN7 + 1] = {
 	[NRF_SAADC_AIN6] = NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
 	[NRF_SAADC_AIN7] = NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
 };
-#elif defined(CONFIG_SOC_NRF54L15)
+#elif defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || defined(CONFIG_SOC_NRF54L15)
 static const uint32_t saadc_psels[NRF_SAADC_DVDD + 1] = {
 	[NRF_SAADC_AIN0] = NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
 	[NRF_SAADC_AIN1] = NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
@@ -667,7 +667,7 @@ static const struct adc_driver_api adc_nrfx_driver_api = {
 #ifdef CONFIG_ADC_ASYNC
 	.read_async    = adc_nrfx_read_async,
 #endif
-#if defined(CONFIG_SOC_NRF54L15)
+#if defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) ||  defined(CONFIG_SOC_NRF54L15)
 	.ref_internal  = 900,
 #elif defined(CONFIG_NRF_PLATFORM_HALTIUM)
 	.ref_internal  = 1024,
diff --git a/drivers/comparator/comparator_nrf_comp.c b/drivers/comparator/comparator_nrf_comp.c
index 339d24f8dcd..383b852fc33 100644
--- a/drivers/comparator/comparator_nrf_comp.c
+++ b/drivers/comparator/comparator_nrf_comp.c
@@ -78,7 +78,7 @@ static const uint32_t shim_nrf_comp_ain_map[] = {
 	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
-#elif defined(CONFIG_SOC_NRF54L15)
+#elif defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || defined(CONFIG_SOC_NRF54L15)
 	NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
diff --git a/drivers/comparator/comparator_nrf_lpcomp.c b/drivers/comparator/comparator_nrf_lpcomp.c
index 6c6710d337d..cfb64bccf27 100644
--- a/drivers/comparator/comparator_nrf_lpcomp.c
+++ b/drivers/comparator/comparator_nrf_lpcomp.c
@@ -49,7 +49,7 @@ static const uint32_t shim_nrf_lpcomp_ain_map[] = {
 	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
-#elif defined(CONFIG_SOC_NRF54L15)
+#elif defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) ||  defined(CONFIG_SOC_NRF54L15)
 	NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
diff --git a/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c b/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
index c688a97f654..2c2915a7984 100644
--- a/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
+++ b/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
@@ -14,7 +14,7 @@
 #include <zephyr/toolchain.h>
 
 #include <hal/nrf_vpr.h>
-#if defined(CONFIG_SOC_NRF54L15_CPUAPP) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
+#if defined(CONFIG_SOC_NRF54L_CPUAPP_COMMON) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
 #include <hal/nrf_spu.h>
 #endif
 
@@ -41,7 +41,7 @@ static int nordic_vpr_launcher_init(const struct device *dev)
 	}
 #endif
 
-#if defined(CONFIG_SOC_NRF54L15_CPUAPP) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
+#if defined(CONFIG_SOC_NRF54L_CPUAPP_COMMON) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
 	nrf_spu_periph_perm_secattr_set(NRF_SPU00, nrf_address_slave_get((uint32_t)config->vpr),
 					true);
 #endif
diff --git a/dts/arm/nordic/nrf54l05_cpuapp.dtsi b/dts/arm/nordic/nrf54l05_cpuapp.dtsi
new file mode 100644
index 00000000000..45bdfea1f9c
--- /dev/null
+++ b/dts/arm/nordic/nrf54l05_cpuapp.dtsi
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <nordic/nrf54l05.dtsi>
+#include "nrf54l_05_10_15_cpuapp.dtsi"
diff --git a/dts/arm/nordic/nrf54l10_cpuapp.dtsi b/dts/arm/nordic/nrf54l10_cpuapp.dtsi
new file mode 100644
index 00000000000..cf8bc6ab5ea
--- /dev/null
+++ b/dts/arm/nordic/nrf54l10_cpuapp.dtsi
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <nordic/nrf54l10.dtsi>
+#include "nrf54l_05_10_15_cpuapp.dtsi"
diff --git a/dts/arm/nordic/nrf54l15_cpuapp.dtsi b/dts/arm/nordic/nrf54l15_cpuapp.dtsi
index 458d5a2e12a..59ffca714dd 100644
--- a/dts/arm/nordic/nrf54l15_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l15_cpuapp.dtsi
@@ -5,84 +5,4 @@
  */
 
 #include <nordic/nrf54l15.dtsi>
-
-cpu: &cpuapp {};
-systick: &cpuapp_systick {};
-nvic: &cpuapp_nvic {};
-
-/delete-node/ &cpuflpr;
-/delete-node/ &cpuflpr_rram;
-/delete-node/ &cpuflpr_sram;
-/delete-node/ &cpuflpr_clic;
-
-/ {
-	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
-	};
-
-	soc {
-		compatible = "simple-bus";
-		interrupt-parent = <&cpuapp_nvic>;
-		ranges;
-	};
-
-	psa_rng: psa-rng {
-		compatible = "zephyr,psa-crypto-rng";
-		status = "disabled";
-	};
-};
-
-&bt_hci_controller {
-	status = "okay";
-};
-
-&cpuflpr_vpr {
-	cpuapp_vevif_rx: mailbox@1 {
-		compatible = "nordic,nrf-vevif-event-rx";
-		reg = <0x0 0x1000>;
-		status = "disabled";
-		interrupts = <76 NRF_DEFAULT_IRQ_PRIORITY>;
-		#mbox-cells = <1>;
-		nordic,events = <1>;
-		nordic,events-mask = <0x00100000>;
-	};
-
-	cpuapp_vevif_tx: mailbox@0 {
-		compatible = "nordic,nrf-vevif-task-tx";
-		reg = <0x0 0x1000>;
-		#mbox-cells = <1>;
-		nordic,tasks = <7>;
-		nordic,tasks-mask = <0x007f0000>;
-		status = "disabled";
-	};
-};
-
-&cpuapp_ppb {
-	compatible = "simple-bus";
-	ranges;
-};
-
-&grtc {
-#ifdef USE_NON_SECURE_ADDRESS_MAP
-	interrupts = <227 NRF_DEFAULT_IRQ_PRIORITY>,
-#else
-	interrupts = <228 NRF_DEFAULT_IRQ_PRIORITY>,
-#endif
-		<229 NRF_DEFAULT_IRQ_PRIORITY>; /* reserved for Zero Latency IRQs */
-};
-
-&gpiote20 {
-#ifdef USE_NON_SECURE_ADDRESS_MAP
-	interrupts = <218 NRF_DEFAULT_IRQ_PRIORITY>;
-#else
-	interrupts = <219 NRF_DEFAULT_IRQ_PRIORITY>;
-#endif
-};
-
-&gpiote30 {
-#ifdef USE_NON_SECURE_ADDRESS_MAP
-	interrupts = <268 NRF_DEFAULT_IRQ_PRIORITY>;
-#else
-	interrupts = <269 NRF_DEFAULT_IRQ_PRIORITY>;
-#endif
-};
+#include "nrf54l_05_10_15_cpuapp.dtsi"
diff --git a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
new file mode 100644
index 00000000000..33b0d2cd453
--- /dev/null
+++ b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+cpu: &cpuapp {};
+systick: &cpuapp_systick {};
+nvic: &cpuapp_nvic {};
+
+/delete-node/ &cpuflpr;
+/delete-node/ &cpuflpr_rram;
+/delete-node/ &cpuflpr_sram;
+/delete-node/ &cpuflpr_clic;
+
+/ {
+	chosen {
+		zephyr,bt-hci = &bt_hci_controller;
+	};
+
+	soc {
+		compatible = "simple-bus";
+		interrupt-parent = <&cpuapp_nvic>;
+		ranges;
+	};
+
+	psa_rng: psa-rng {
+		compatible = "zephyr,psa-crypto-rng";
+		status = "disabled";
+	};
+};
+
+&bt_hci_controller {
+	status = "okay";
+};
+
+&cpuflpr_vpr {
+	cpuapp_vevif_rx: mailbox@1 {
+		compatible = "nordic,nrf-vevif-event-rx";
+		reg = <0x0 0x1000>;
+		status = "disabled";
+		interrupts = <76 NRF_DEFAULT_IRQ_PRIORITY>;
+		#mbox-cells = <1>;
+		nordic,events = <1>;
+		nordic,events-mask = <0x00100000>;
+	};
+
+	cpuapp_vevif_tx: mailbox@0 {
+		compatible = "nordic,nrf-vevif-task-tx";
+		reg = <0x0 0x1000>;
+		#mbox-cells = <1>;
+		nordic,tasks = <7>;
+		nordic,tasks-mask = <0x007f0000>;
+		status = "disabled";
+	};
+};
+
+&cpuapp_ppb {
+	compatible = "simple-bus";
+	ranges;
+};
+
+&grtc {
+#ifdef USE_NON_SECURE_ADDRESS_MAP
+	interrupts = <227 NRF_DEFAULT_IRQ_PRIORITY>,
+#else
+	interrupts = <228 NRF_DEFAULT_IRQ_PRIORITY>,
+#endif
+		<229 NRF_DEFAULT_IRQ_PRIORITY>; /* reserved for Zero Latency IRQs */
+};
+
+&gpiote20 {
+#ifdef USE_NON_SECURE_ADDRESS_MAP
+	interrupts = <218 NRF_DEFAULT_IRQ_PRIORITY>;
+#else
+	interrupts = <219 NRF_DEFAULT_IRQ_PRIORITY>;
+#endif
+};
+
+&gpiote30 {
+#ifdef USE_NON_SECURE_ADDRESS_MAP
+	interrupts = <268 NRF_DEFAULT_IRQ_PRIORITY>;
+#else
+	interrupts = <269 NRF_DEFAULT_IRQ_PRIORITY>;
+#endif
+};
diff --git a/dts/common/nordic/nrf54l05.dtsi b/dts/common/nordic/nrf54l05.dtsi
new file mode 100644
index 00000000000..747fea0c549
--- /dev/null
+++ b/dts/common/nordic/nrf54l05.dtsi
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54l_05_10_15.dtsi"
+
+&cpuapp_sram {
+	reg = <0x20000000 DT_SIZE_K(72)>;
+	ranges = <0x0 0x20000000 DT_SIZE_K(72)>;
+};
+
+/* 72 + 24 = 96KB */
+/ {
+	soc {
+		cpuflpr_sram: memory@20012000 {
+			compatible = "mmio-sram";
+			reg = <0x20012000 DT_SIZE_K(24)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x20012000 DT_SIZE_K(24)>;
+		};
+	};
+};
+
+&cpuapp_rram {
+	reg = <0x0 DT_SIZE_K(470)>;
+};
+
+/* 470 + 30 = 500KB */
+&rram_controller {
+	cpuflpr_rram: rram@75800 {
+		compatible = "soc-nv-flash";
+		reg = <0x75800 DT_SIZE_K(30)>;
+		erase-block-size = <4096>;
+		write-block-size = <16>;
+	};
+};
diff --git a/dts/common/nordic/nrf54l10.dtsi b/dts/common/nordic/nrf54l10.dtsi
new file mode 100644
index 00000000000..a515fbb42f5
--- /dev/null
+++ b/dts/common/nordic/nrf54l10.dtsi
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54l_05_10_15.dtsi"
+
+&cpuapp_sram {
+	reg = <0x20000000 DT_SIZE_K(144)>;
+	ranges = <0x0 0x20000000 DT_SIZE_K(144)>;
+};
+
+/* 144 + 48 = 192KB */
+/ {
+	soc {
+		cpuflpr_sram: memory@20024000 {
+			compatible = "mmio-sram";
+			reg = <0x20024000 DT_SIZE_K(48)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x20024000 DT_SIZE_K(48)>;
+		};
+	};
+};
+
+&cpuapp_rram {
+	reg = <0x0 DT_SIZE_K(960)>;
+};
+
+/* 960 + 62 = 1022KB */
+&rram_controller {
+	cpuflpr_rram: rram@f0000 {
+		compatible = "soc-nv-flash";
+		reg = <0xf0000 DT_SIZE_K(62)>;
+		erase-block-size = <4096>;
+		write-block-size = <16>;
+	};
+};
diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index 5a49efd468d..56c97ae87ac 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -4,748 +4,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <mem.h>
-#include <nordic/nrf_common.dtsi>
-#include <zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h>
-#include <zephyr/dt-bindings/regulator/nrf5x.h>
+#include "nrf54l_05_10_15.dtsi"
 
-/delete-node/ &sw_pwm;
-
-/* Domain IDs. Can be used to specify channel links in IPCT nodes. */
-#define NRF_DOMAIN_ID_APPLICATION 0
-#define NRF_DOMAIN_ID_FLPR 1
+&cpuapp_sram {
+	reg = <0x20000000 DT_SIZE_K(188)>;
+	ranges = <0x0 0x20000000 DT_SIZE_K(188)>;
+};
 
+/* 188 + 68 = 256KB */
 / {
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpuapp: cpu@0 {
-			compatible = "arm,cortex-m33f";
-			reg = <0>;
-			device_type = "cpu";
-			clock-frequency = <DT_FREQ_M(128)>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			itm: itm@e0000000 {
-				compatible = "arm,armv8m-itm";
-				reg = <0xe0000000 0x1000>;
-				swo-ref-frequency = <DT_FREQ_M(128)>;
-			};
-		};
-
-		cpuflpr: cpu@1 {
-			compatible = "nordic,vpr";
-			reg = <1>;
-			device_type = "cpu";
-			clock-frequency = <DT_FREQ_M(128)>;
-			riscv,isa = "rv32emc";
-			nordic,bus-width = <32>;
-		};
-	};
-
-	clocks {
-		lfxo: lfxo {
-			compatible = "nordic,nrf-lfxo";
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
-
-		hfxo: hfxo {
-			compatible = "nordic,nrf-hfxo";
-			#clock-cells = <0>;
-			clock-frequency = <DT_FREQ_M(32)>;
-		};
-	};
-
 	soc {
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-#ifdef USE_NON_SECURE_ADDRESS_MAP
-		/* intentionally empty because UICR is hardware fixed to Secure */
-#else
-		uicr: uicr@ffd000 {
-			compatible = "nordic,nrf-uicr";
-			reg = <0xffd000 0x1000>;
-		};
-#endif
-		ficr: ficr@ffc000 {
-			compatible = "nordic,nrf-ficr";
-			reg = <0xffc000 0x1000>;
-			#nordic,ficr-cells = <1>;
-		};
-
-		cpuapp_sram: memory@20000000 {
-			compatible = "mmio-sram";
-			reg = <0x20000000 DT_SIZE_K(188)>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0x0 0x20000000 0x2f000>;
-		};
-
 		cpuflpr_sram: memory@2002f000 {
 			compatible = "mmio-sram";
 			reg = <0x2002f000 DT_SIZE_K(68)>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0x0 0x2002f000 0x11000>;
+			ranges = <0x0 0x2002f000 DT_SIZE_K(68)>;
 		};
+	};
+};
 
-#ifdef USE_NON_SECURE_ADDRESS_MAP
-		global_peripherals: peripheral@40000000 {
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0x0 0x40000000 0x10000000>;
-#else
-		global_peripherals: peripheral@50000000 {
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0x0 0x50000000 0x10000000>;
-#endif
-
-			dppic00: dppic@42000 {
-				compatible = "nordic,nrf-dppic";
-				reg = <0x42000 0x808>;
-				status = "disabled";
-			};
-
-			ppib00: ppib@43000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x43000 0x1000>;
-				status = "disabled";
-			};
-
-			ppib01: ppib@44000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x44000 0x1000>;
-				status = "disabled";
-			};
-
-			spi00: spi@4a000 {
-				/*
-				 * This spi node can be either SPIM or SPIS,
-				 * for the user to pick:
-				 * compatible = "nordic,nrf-spim" or
-				 *              "nordic,nrf-spis".
-				 */
-				compatible = "nordic,nrf-spim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0x4a000 0x1000>;
-				interrupts = <74 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(32)>;
-				easydma-maxcnt-bits = <16>;
-				rx-delay-supported;
-				rx-delay = <1>;
-				status = "disabled";
-			};
-
-			uart00: uart@4a000 {
-				compatible = "nordic,nrf-uarte";
-				reg = <0x4a000 0x1000>;
-				interrupts = <74 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				endtx-stoptx-supported;
-				frame-timeout-supported;
-			};
-
-			cpuflpr_vpr: vpr@4c000 {
-				compatible = "nordic,nrf-vpr-coprocessor";
-				reg = <0x4c000 0x1000>;
-				ranges = <0x0 0x4c000 0x1000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-				status = "disabled";
-
-				cpuflpr_clic: interrupt-controller@f0000000 {
-					compatible = "nordic,nrf-clic";
-					reg = <0xf0000000 0x1780>;
-					interrupt-controller;
-					#interrupt-cells = <2>;
-					#address-cells = <1>;
-					status = "disabled";
-				};
-			};
-
-			gpio2: gpio@50400 {
-				compatible = "nordic,nrf-gpio";
-				gpio-controller;
-				reg = <0x50400 0x300>;
-				#gpio-cells = <2>;
-				ngpios = <11>;
-				status = "disabled";
-				port = <2>;
-			};
-
-			timer00: timer@55000 {
-				compatible = "nordic,nrf-timer";
-				status = "disabled";
-				reg = <0x55000 0x1000>;
-				cc-num = <6>;
-				max-bit-width = <32>;
-				interrupts = <85 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(128)>;
-				prescaler = <0>;
-			};
-
-			dppic10: dppic@82000 {
-				compatible = "nordic,nrf-dppic";
-				reg = <0x82000 0x808>;
-				status = "disabled";
-			};
-
-			ppib10: ppib@83000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x83000 0x1000>;
-				status = "disabled";
-			};
-
-			ppib11: ppib@84000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x84000 0x1000>;
-				status = "disabled";
-			};
-
-			timer10: timer@85000 {
-				compatible = "nordic,nrf-timer";
-				status = "disabled";
-				reg = <0x85000 0x1000>;
-				cc-num = <8>;
-				max-bit-width = <32>;
-				interrupts = <133 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(32)>;
-				prescaler = <0>;
-			};
-
-			egu10: egu@87000 {
-				compatible = "nordic,nrf-egu";
-				reg = <0x87000 0x1000>;
-				interrupts = <135 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-
-			radio: radio@8a000 {
-				compatible = "nordic,nrf-radio";
-				reg = <0x8a000 0x1000>;
-				interrupts = <138 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				dfe-supported;
-				ieee802154-supported;
-				ble-2mbps-supported;
-				ble-coded-phy-supported;
-				cs-supported;
-
-				ieee802154: ieee802154 {
-					compatible = "nordic,nrf-ieee802154";
-					status = "disabled";
-				};
-
-				/* Note: In the nRF Connect SDK the SoftDevice Controller
-				 * is added and set as the default Bluetooth Controller.
-				 */
-				bt_hci_controller: bt_hci_controller {
-					compatible = "zephyr,bt-hci-ll-sw-split";
-					status = "disabled";
-				};
-			};
-
-			dppic20: dppic@c2000 {
-				compatible = "nordic,nrf-dppic";
-				reg = <0xc2000 0x808>;
-				status = "disabled";
-			};
-
-			ppib20: ppib@c3000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0xc3000 0x1000>;
-				status = "disabled";
-			};
-
-			ppib21: ppib@c4000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0xc4000 0x1000>;
-				status = "disabled";
-			};
-
-			ppib22: ppib@c5000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0xc5000 0x1000>;
-				status = "disabled";
-			};
-
-			i2c20: i2c@c6000 {
-				compatible = "nordic,nrf-twim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xc6000 0x1000>;
-				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
-				easydma-maxcnt-bits = <16>;
-				status = "disabled";
-				zephyr,pm-device-runtime-auto;
-			};
-
-			spi20: spi@c6000 {
-				/*
-				 * This spi node can be either SPIM or SPIS,
-				 * for the user to pick:
-				 * compatible = "nordic,nrf-spim" or
-				 *              "nordic,nrf-spis".
-				 */
-				compatible = "nordic,nrf-spim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xc6000 0x1000>;
-				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(8)>;
-				easydma-maxcnt-bits = <16>;
-				rx-delay-supported;
-				rx-delay = <1>;
-				status = "disabled";
-			};
-
-			uart20: uart@c6000 {
-				compatible = "nordic,nrf-uarte";
-				reg = <0xc6000 0x1000>;
-				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				endtx-stoptx-supported;
-				frame-timeout-supported;
-			};
-
-			i2c21: i2c@c7000 {
-				compatible = "nordic,nrf-twim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xc7000 0x1000>;
-				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
-				easydma-maxcnt-bits = <16>;
-				status = "disabled";
-				zephyr,pm-device-runtime-auto;
-			};
-
-			spi21: spi@c7000 {
-				/*
-				 * This spi node can be either SPIM or SPIS,
-				 * for the user to pick:
-				 * compatible = "nordic,nrf-spim" or
-				 *              "nordic,nrf-spis".
-				 */
-				compatible = "nordic,nrf-spim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xc7000 0x1000>;
-				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(8)>;
-				easydma-maxcnt-bits = <16>;
-				rx-delay-supported;
-				rx-delay = <1>;
-				status = "disabled";
-			};
-
-			uart21: uart@c7000 {
-				compatible = "nordic,nrf-uarte";
-				reg = <0xc7000 0x1000>;
-				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				endtx-stoptx-supported;
-				frame-timeout-supported;
-			};
-
-			i2c22: i2c@c8000 {
-				compatible = "nordic,nrf-twim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xc8000 0x1000>;
-				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
-				easydma-maxcnt-bits = <16>;
-				status = "disabled";
-				zephyr,pm-device-runtime-auto;
-			};
-
-			spi22: spi@c8000 {
-				/*
-				 * This spi node can be either SPIM or SPIS,
-				 * for the user to pick:
-				 * compatible = "nordic,nrf-spim" or
-				 *              "nordic,nrf-spis".
-				 */
-				compatible = "nordic,nrf-spim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xc8000 0x1000>;
-				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(8)>;
-				easydma-maxcnt-bits = <16>;
-				rx-delay-supported;
-				rx-delay = <1>;
-				status = "disabled";
-			};
-
-			uart22: uart@c8000 {
-				compatible = "nordic,nrf-uarte";
-				reg = <0xc8000 0x1000>;
-				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				endtx-stoptx-supported;
-				frame-timeout-supported;
-			};
-
-			egu20: egu@c9000 {
-				compatible = "nordic,nrf-egu";
-				reg = <0xc9000 0x1000>;
-				interrupts = <201 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-
-			timer20: timer@ca000 {
-				compatible = "nordic,nrf-timer";
-				status = "disabled";
-				reg = <0xca000 0x1000>;
-				cc-num = <6>;
-				max-bit-width = <32>;
-				interrupts = <202 NRF_DEFAULT_IRQ_PRIORITY>;
-				prescaler = <0>;
-			};
-
-			timer21: timer@cb000 {
-				compatible = "nordic,nrf-timer";
-				status = "disabled";
-				reg = <0xcb000 0x1000>;
-				cc-num = <6>;
-				max-bit-width = <32>;
-				interrupts = <203 NRF_DEFAULT_IRQ_PRIORITY>;
-				prescaler = <0>;
-			};
-
-			timer22: timer@cc000 {
-				compatible = "nordic,nrf-timer";
-				status = "disabled";
-				reg = <0xcc000 0x1000>;
-				cc-num = <6>;
-				max-bit-width = <32>;
-				interrupts = <204 NRF_DEFAULT_IRQ_PRIORITY>;
-				prescaler = <0>;
-			};
-
-			timer23: timer@cd000 {
-				compatible = "nordic,nrf-timer";
-				status = "disabled";
-				reg = <0xcd000 0x1000>;
-				cc-num = <6>;
-				max-bit-width = <32>;
-				interrupts = <205 NRF_DEFAULT_IRQ_PRIORITY>;
-				prescaler = <0>;
-			};
-
-			timer24: timer@ce000 {
-				compatible = "nordic,nrf-timer";
-				status = "disabled";
-				reg = <0xce000 0x1000>;
-				cc-num = <6>;
-				max-bit-width = <32>;
-				interrupts = <206 NRF_DEFAULT_IRQ_PRIORITY>;
-				prescaler = <0>;
-			};
-
-			pdm20: pdm@d0000 {
-				compatible = "nordic,nrf-pdm";
-				status = "disabled";
-				reg = <0xd0000 0x1000>;
-				interrupts = <208 NRF_DEFAULT_IRQ_PRIORITY>;
-			};
-
-			pdm21: pdm@d1000 {
-				compatible = "nordic,nrf-pdm";
-				status = "disabled";
-				reg = <0xd1000 0x1000>;
-				interrupts = <209 NRF_DEFAULT_IRQ_PRIORITY>;
-			};
-
-			pwm20: pwm@d2000 {
-				compatible = "nordic,nrf-pwm";
-				status = "disabled";
-				reg = <0xd2000 0x1000>;
-				interrupts = <210 NRF_DEFAULT_IRQ_PRIORITY>;
-				#pwm-cells = <3>;
-			};
-
-			pwm21: pwm@d3000 {
-				compatible = "nordic,nrf-pwm";
-				status = "disabled";
-				reg = <0xd3000 0x1000>;
-				interrupts = <211 NRF_DEFAULT_IRQ_PRIORITY>;
-				#pwm-cells = <3>;
-			};
-
-			pwm22: pwm@d4000 {
-				compatible = "nordic,nrf-pwm";
-				status = "disabled";
-				reg = <0xd4000 0x1000>;
-				interrupts = <212 NRF_DEFAULT_IRQ_PRIORITY>;
-				#pwm-cells = <3>;
-			};
-
-			adc: adc@d5000 {
-				compatible = "nordic,nrf-saadc";
-				reg = <0xd5000 0x1000>;
-				interrupts = <213 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				#io-channel-cells = <1>;
-			};
-
-			nfct: nfct@d6000 {
-				compatible = "nordic,nrf-nfct";
-				reg = <0xd6000 0x1000>;
-				interrupts = <214 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-
-			temp: temp@d7000 {
-				compatible = "nordic,nrf-temp";
-				reg = <0xd7000 0x1000>;
-				interrupts = <215 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-
-			gpio1: gpio@d8200 {
-				compatible = "nordic,nrf-gpio";
-				gpio-controller;
-				reg = <0xd8200 0x300>;
-				#gpio-cells = <2>;
-				ngpios = <16>;
-				status = "disabled";
-				port = <1>;
-				gpiote-instance = <&gpiote20>;
-			};
-
-			gpiote20: gpiote@da000 {
-				compatible = "nordic,nrf-gpiote";
-				reg = <0xda000 0x1000>;
-				status = "disabled";
-				instance = <20>;
-			};
-
-			i2s20: i2s@dd000 {
-				compatible = "nordic,nrf-i2s";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xdd000 0x1000>;
-				interrupts = <221 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-
-			qdec20: qdec@e0000 {
-				compatible = "nordic,nrf-qdec";
-				reg = <0xe0000 0x1000>;
-				interrupts = <224 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-
-			qdec21: qdec@e1000 {
-				compatible = "nordic,nrf-qdec";
-				reg = <0xe1000 0x1000>;
-				interrupts = <225 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-
-			grtc: grtc@e2000 {
-				compatible = "nordic,nrf-grtc";
-				reg = <0xe2000 0x1000>;
-				cc-num = <12>;
-				status = "disabled";
-			};
-
-			dppic30: dppic@102000 {
-				compatible = "nordic,nrf-dppic";
-				reg = <0x102000 0x808>;
-				status = "disabled";
-			};
-
-			ppib30: ppib@103000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x103000 0x1000>;
-				status = "disabled";
-			};
-
-			i2c30: i2c@104000 {
-				compatible = "nordic,nrf-twim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0x104000 0x1000>;
-				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
-				easydma-maxcnt-bits = <16>;
-				status = "disabled";
-				zephyr,pm-device-runtime-auto;
-			};
-
-			spi30: spi@104000 {
-				/*
-				 * This spi node can be either SPIM or SPIS,
-				 * for the user to pick:
-				 * compatible = "nordic,nrf-spim" or
-				 *              "nordic,nrf-spis".
-				 */
-				compatible = "nordic,nrf-spim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0x104000 0x1000>;
-				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(8)>;
-				easydma-maxcnt-bits = <16>;
-				rx-delay-supported;
-				rx-delay = <1>;
-				status = "disabled";
-			};
-
-			uart30: uart@104000 {
-				compatible = "nordic,nrf-uarte";
-				reg = <0x104000 0x1000>;
-				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				endtx-stoptx-supported;
-				frame-timeout-supported;
-			};
-
-			comp: comparator@106000 {
-				/*
-				 * Use compatible "nordic,nrf-comp" to configure as COMP
-				 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
-				 */
-				compatible = "nordic,nrf-comp";
-				reg = <0x106000 0x1000>;
-				status = "disabled";
-				interrupts = <262 NRF_DEFAULT_IRQ_PRIORITY>;
-			};
-
-#ifdef USE_NON_SECURE_ADDRESS_MAP
-			/* intentionally empty because WDT30 is hardware fixed to Secure */
-#else
-			wdt30: watchdog@108000 {
-				compatible = "nordic,nrf-wdt";
-				reg = <0x108000 0x620>;
-				interrupts = <264 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-#endif
-
-			wdt31: watchdog@109000 {
-				compatible = "nordic,nrf-wdt";
-				reg = <0x109000 0x620>;
-				interrupts = <265 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-
-			gpio0: gpio@10a000 {
-				compatible = "nordic,nrf-gpio";
-				gpio-controller;
-				reg = <0x10a000 0x300>;
-				#gpio-cells = <2>;
-				ngpios = <5>;
-				status = "disabled";
-				port = <0>;
-				gpiote-instance = <&gpiote30>;
-			};
-
-			gpiote30: gpiote@10c000 {
-				compatible = "nordic,nrf-gpiote";
-				reg = <0x10c000 0x1000>;
-				status = "disabled";
-				instance = <30>;
-			};
-
-			clock: clock@10e000 {
-				compatible = "nordic,nrf-clock";
-				reg = <0x10e000 0x1000>;
-				interrupts = <270 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-
-			power: power@10e000 {
-				compatible = "nordic,nrf-power";
-				reg = <0x10e000 0x1000>;
-				ranges = <0x0 0x10e000 0x1000>;
-				interrupts = <270 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				gpregret1: gpregret1@51c {
-					#address-cells = <1>;
-					#size-cells = <1>;
-					compatible = "nordic,nrf-gpregret";
-					reg = <0x51c 0x1>;
-					status = "disabled";
-				};
-
-				gpregret2: gpregret2@520 {
-					#address-cells = <1>;
-					#size-cells = <1>;
-					compatible = "nordic,nrf-gpregret";
-					reg = <0x520 0x1>;
-					status = "disabled";
-				};
-			};
-
-			regulators: regulator@120000 {
-				compatible = "nordic,nrf54l-regulators";
-				reg = <0x120000 0x1000>;
-				status = "disabled";
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				vregmain: regulator@120600 {
-					compatible = "nordic,nrf5x-regulator";
-					reg = <0x120600 0x1>;
-					status = "disabled";
-					regulator-name = "VREGMAIN";
-					regulator-initial-mode = <NRF5X_REG_MODE_LDO>;
-				};
-			};
-		};
-
-		rram_controller: rram-controller@5004b000 {
-			compatible = "nordic,rram-controller";
-			reg = <0x5004b000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			interrupts = <75 NRF_DEFAULT_IRQ_PRIORITY>;
-
-			cpuapp_rram: rram@0 {
-				compatible = "soc-nv-flash";
-				reg = <0x0 DT_SIZE_K(1428)>;
-				erase-block-size = <4096>;
-				write-block-size = <16>;
-			};
-			cpuflpr_rram: rram@165000 {
-				compatible = "soc-nv-flash";
-				reg = <0x165000 DT_SIZE_K(96)>;
-				erase-block-size = <4096>;
-				write-block-size = <16>;
-			};
-		};
-
-		cpuapp_ppb: cpuapp-ppb-bus {
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			cpuapp_nvic: interrupt-controller@e000e100  {
-				#address-cells = <1>;
-				compatible = "arm,v8m-nvic";
-				reg = <0xe000e100 0xc00>;
-				arm,num-irq-priority-bits = <3>;
-				interrupt-controller;
-				#interrupt-cells = <2>;
-			};
+&cpuapp_rram {
+	reg = <0x0 DT_SIZE_K(1428)>;
+};
 
-			cpuapp_systick: timer@e000e010 {
-				compatible = "arm,armv8m-systick";
-				reg = <0xe000e010 0x10>;
-				status = "disabled";
-			};
-		};
+/* 1428 + 96 = 1524KB */
+&rram_controller {
+	cpuflpr_rram: rram@165000 {
+		compatible = "soc-nv-flash";
+		reg = <0x165000 DT_SIZE_K(96)>;
+		erase-block-size = <4096>;
+		write-block-size = <16>;
 	};
 };
diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi
new file mode 100644
index 00000000000..04fae0272bc
--- /dev/null
+++ b/dts/common/nordic/nrf54l_05_10_15.dtsi
@@ -0,0 +1,734 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <nordic/nrf_common.dtsi>
+#include <zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h>
+#include <zephyr/dt-bindings/regulator/nrf5x.h>
+
+/delete-node/ &sw_pwm;
+
+/* Domain IDs. Can be used to specify channel links in IPCT nodes. */
+#define NRF_DOMAIN_ID_APPLICATION 0
+#define NRF_DOMAIN_ID_FLPR 1
+
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpuapp: cpu@0 {
+			compatible = "arm,cortex-m33f";
+			reg = <0>;
+			device_type = "cpu";
+			clock-frequency = <DT_FREQ_M(128)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			itm: itm@e0000000 {
+				compatible = "arm,armv8m-itm";
+				reg = <0xe0000000 0x1000>;
+				swo-ref-frequency = <DT_FREQ_M(128)>;
+			};
+		};
+
+		cpuflpr: cpu@1 {
+			compatible = "nordic,vpr";
+			reg = <1>;
+			device_type = "cpu";
+			clock-frequency = <DT_FREQ_M(128)>;
+			riscv,isa = "rv32emc";
+			nordic,bus-width = <32>;
+		};
+	};
+
+	clocks {
+		lfxo: lfxo {
+			compatible = "nordic,nrf-lfxo";
+			#clock-cells = <0>;
+			clock-frequency = <32768>;
+		};
+
+		hfxo: hfxo {
+			compatible = "nordic,nrf-hfxo";
+			#clock-cells = <0>;
+			clock-frequency = <DT_FREQ_M(32)>;
+		};
+	};
+
+	soc {
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+#ifdef USE_NON_SECURE_ADDRESS_MAP
+		/* intentionally empty because UICR is hardware fixed to Secure */
+#else
+		uicr: uicr@ffd000 {
+			compatible = "nordic,nrf-uicr";
+			reg = <0xffd000 0x1000>;
+		};
+#endif
+		ficr: ficr@ffc000 {
+			compatible = "nordic,nrf-ficr";
+			reg = <0xffc000 0x1000>;
+			#nordic,ficr-cells = <1>;
+		};
+
+		cpuapp_sram: memory@20000000 {
+			compatible = "mmio-sram";
+			#address-cells = <1>;
+			#size-cells = <1>;
+		};
+
+#ifdef USE_NON_SECURE_ADDRESS_MAP
+		global_peripherals: peripheral@40000000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x40000000 0x10000000>;
+#else
+		global_peripherals: peripheral@50000000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x50000000 0x10000000>;
+#endif
+
+			dppic00: dppic@42000 {
+				compatible = "nordic,nrf-dppic";
+				reg = <0x42000 0x808>;
+				status = "disabled";
+			};
+
+			ppib00: ppib@43000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x43000 0x1000>;
+				status = "disabled";
+			};
+
+			ppib01: ppib@44000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x44000 0x1000>;
+				status = "disabled";
+			};
+
+			spi00: spi@4a000 {
+				/*
+				 * This spi node can be either SPIM or SPIS,
+				 * for the user to pick:
+				 * compatible = "nordic,nrf-spim" or
+				 *              "nordic,nrf-spis".
+				 */
+				compatible = "nordic,nrf-spim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0x4a000 0x1000>;
+				interrupts = <74 NRF_DEFAULT_IRQ_PRIORITY>;
+				max-frequency = <DT_FREQ_M(32)>;
+				easydma-maxcnt-bits = <16>;
+				rx-delay-supported;
+				rx-delay = <1>;
+				status = "disabled";
+			};
+
+			uart00: uart@4a000 {
+				compatible = "nordic,nrf-uarte";
+				reg = <0x4a000 0x1000>;
+				interrupts = <74 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				endtx-stoptx-supported;
+				frame-timeout-supported;
+			};
+
+			cpuflpr_vpr: vpr@4c000 {
+				compatible = "nordic,nrf-vpr-coprocessor";
+				reg = <0x4c000 0x1000>;
+				ranges = <0x0 0x4c000 0x1000>;
+				#address-cells = <1>;
+				#size-cells = <1>;
+				status = "disabled";
+
+				cpuflpr_clic: interrupt-controller@f0000000 {
+					compatible = "nordic,nrf-clic";
+					reg = <0xf0000000 0x1780>;
+					interrupt-controller;
+					#interrupt-cells = <2>;
+					#address-cells = <1>;
+					status = "disabled";
+				};
+			};
+
+			gpio2: gpio@50400 {
+				compatible = "nordic,nrf-gpio";
+				gpio-controller;
+				reg = <0x50400 0x300>;
+				#gpio-cells = <2>;
+				ngpios = <11>;
+				status = "disabled";
+				port = <2>;
+			};
+
+			timer00: timer@55000 {
+				compatible = "nordic,nrf-timer";
+				status = "disabled";
+				reg = <0x55000 0x1000>;
+				cc-num = <6>;
+				max-bit-width = <32>;
+				interrupts = <85 NRF_DEFAULT_IRQ_PRIORITY>;
+				max-frequency = <DT_FREQ_M(128)>;
+				prescaler = <0>;
+			};
+
+			dppic10: dppic@82000 {
+				compatible = "nordic,nrf-dppic";
+				reg = <0x82000 0x808>;
+				status = "disabled";
+			};
+
+			ppib10: ppib@83000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x83000 0x1000>;
+				status = "disabled";
+			};
+
+			ppib11: ppib@84000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x84000 0x1000>;
+				status = "disabled";
+			};
+
+			timer10: timer@85000 {
+				compatible = "nordic,nrf-timer";
+				status = "disabled";
+				reg = <0x85000 0x1000>;
+				cc-num = <8>;
+				max-bit-width = <32>;
+				interrupts = <133 NRF_DEFAULT_IRQ_PRIORITY>;
+				max-frequency = <DT_FREQ_M(32)>;
+				prescaler = <0>;
+			};
+
+			egu10: egu@87000 {
+				compatible = "nordic,nrf-egu";
+				reg = <0x87000 0x1000>;
+				interrupts = <135 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+
+			radio: radio@8a000 {
+				compatible = "nordic,nrf-radio";
+				reg = <0x8a000 0x1000>;
+				interrupts = <138 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				dfe-supported;
+				ieee802154-supported;
+				ble-2mbps-supported;
+				ble-coded-phy-supported;
+				cs-supported;
+
+				ieee802154: ieee802154 {
+					compatible = "nordic,nrf-ieee802154";
+					status = "disabled";
+				};
+
+				/* Note: In the nRF Connect SDK the SoftDevice Controller
+				 * is added and set as the default Bluetooth Controller.
+				 */
+				bt_hci_controller: bt_hci_controller {
+					compatible = "zephyr,bt-hci-ll-sw-split";
+					status = "disabled";
+				};
+			};
+
+			dppic20: dppic@c2000 {
+				compatible = "nordic,nrf-dppic";
+				reg = <0xc2000 0x808>;
+				status = "disabled";
+			};
+
+			ppib20: ppib@c3000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0xc3000 0x1000>;
+				status = "disabled";
+			};
+
+			ppib21: ppib@c4000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0xc4000 0x1000>;
+				status = "disabled";
+			};
+
+			ppib22: ppib@c5000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0xc5000 0x1000>;
+				status = "disabled";
+			};
+
+			i2c20: i2c@c6000 {
+				compatible = "nordic,nrf-twim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xc6000 0x1000>;
+				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
+				easydma-maxcnt-bits = <16>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+
+			spi20: spi@c6000 {
+				/*
+				 * This spi node can be either SPIM or SPIS,
+				 * for the user to pick:
+				 * compatible = "nordic,nrf-spim" or
+				 *              "nordic,nrf-spis".
+				 */
+				compatible = "nordic,nrf-spim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xc6000 0x1000>;
+				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
+				max-frequency = <DT_FREQ_M(8)>;
+				easydma-maxcnt-bits = <16>;
+				rx-delay-supported;
+				rx-delay = <1>;
+				status = "disabled";
+			};
+
+			uart20: uart@c6000 {
+				compatible = "nordic,nrf-uarte";
+				reg = <0xc6000 0x1000>;
+				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				endtx-stoptx-supported;
+				frame-timeout-supported;
+			};
+
+			i2c21: i2c@c7000 {
+				compatible = "nordic,nrf-twim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xc7000 0x1000>;
+				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
+				easydma-maxcnt-bits = <16>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+
+			spi21: spi@c7000 {
+				/*
+				 * This spi node can be either SPIM or SPIS,
+				 * for the user to pick:
+				 * compatible = "nordic,nrf-spim" or
+				 *              "nordic,nrf-spis".
+				 */
+				compatible = "nordic,nrf-spim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xc7000 0x1000>;
+				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
+				max-frequency = <DT_FREQ_M(8)>;
+				easydma-maxcnt-bits = <16>;
+				rx-delay-supported;
+				rx-delay = <1>;
+				status = "disabled";
+			};
+
+			uart21: uart@c7000 {
+				compatible = "nordic,nrf-uarte";
+				reg = <0xc7000 0x1000>;
+				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				endtx-stoptx-supported;
+				frame-timeout-supported;
+			};
+
+			i2c22: i2c@c8000 {
+				compatible = "nordic,nrf-twim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xc8000 0x1000>;
+				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
+				easydma-maxcnt-bits = <16>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+
+			spi22: spi@c8000 {
+				/*
+				 * This spi node can be either SPIM or SPIS,
+				 * for the user to pick:
+				 * compatible = "nordic,nrf-spim" or
+				 *              "nordic,nrf-spis".
+				 */
+				compatible = "nordic,nrf-spim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xc8000 0x1000>;
+				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
+				max-frequency = <DT_FREQ_M(8)>;
+				easydma-maxcnt-bits = <16>;
+				rx-delay-supported;
+				rx-delay = <1>;
+				status = "disabled";
+			};
+
+			uart22: uart@c8000 {
+				compatible = "nordic,nrf-uarte";
+				reg = <0xc8000 0x1000>;
+				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				endtx-stoptx-supported;
+				frame-timeout-supported;
+			};
+
+			egu20: egu@c9000 {
+				compatible = "nordic,nrf-egu";
+				reg = <0xc9000 0x1000>;
+				interrupts = <201 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+
+			timer20: timer@ca000 {
+				compatible = "nordic,nrf-timer";
+				status = "disabled";
+				reg = <0xca000 0x1000>;
+				cc-num = <6>;
+				max-bit-width = <32>;
+				interrupts = <202 NRF_DEFAULT_IRQ_PRIORITY>;
+				prescaler = <0>;
+			};
+
+			timer21: timer@cb000 {
+				compatible = "nordic,nrf-timer";
+				status = "disabled";
+				reg = <0xcb000 0x1000>;
+				cc-num = <6>;
+				max-bit-width = <32>;
+				interrupts = <203 NRF_DEFAULT_IRQ_PRIORITY>;
+				prescaler = <0>;
+			};
+
+			timer22: timer@cc000 {
+				compatible = "nordic,nrf-timer";
+				status = "disabled";
+				reg = <0xcc000 0x1000>;
+				cc-num = <6>;
+				max-bit-width = <32>;
+				interrupts = <204 NRF_DEFAULT_IRQ_PRIORITY>;
+				prescaler = <0>;
+			};
+
+			timer23: timer@cd000 {
+				compatible = "nordic,nrf-timer";
+				status = "disabled";
+				reg = <0xcd000 0x1000>;
+				cc-num = <6>;
+				max-bit-width = <32>;
+				interrupts = <205 NRF_DEFAULT_IRQ_PRIORITY>;
+				prescaler = <0>;
+			};
+
+			timer24: timer@ce000 {
+				compatible = "nordic,nrf-timer";
+				status = "disabled";
+				reg = <0xce000 0x1000>;
+				cc-num = <6>;
+				max-bit-width = <32>;
+				interrupts = <206 NRF_DEFAULT_IRQ_PRIORITY>;
+				prescaler = <0>;
+			};
+
+			pdm20: pdm@d0000 {
+				compatible = "nordic,nrf-pdm";
+				status = "disabled";
+				reg = <0xd0000 0x1000>;
+				interrupts = <208 NRF_DEFAULT_IRQ_PRIORITY>;
+			};
+
+			pdm21: pdm@d1000 {
+				compatible = "nordic,nrf-pdm";
+				status = "disabled";
+				reg = <0xd1000 0x1000>;
+				interrupts = <209 NRF_DEFAULT_IRQ_PRIORITY>;
+			};
+
+			pwm20: pwm@d2000 {
+				compatible = "nordic,nrf-pwm";
+				status = "disabled";
+				reg = <0xd2000 0x1000>;
+				interrupts = <210 NRF_DEFAULT_IRQ_PRIORITY>;
+				#pwm-cells = <3>;
+			};
+
+			pwm21: pwm@d3000 {
+				compatible = "nordic,nrf-pwm";
+				status = "disabled";
+				reg = <0xd3000 0x1000>;
+				interrupts = <211 NRF_DEFAULT_IRQ_PRIORITY>;
+				#pwm-cells = <3>;
+			};
+
+			pwm22: pwm@d4000 {
+				compatible = "nordic,nrf-pwm";
+				status = "disabled";
+				reg = <0xd4000 0x1000>;
+				interrupts = <212 NRF_DEFAULT_IRQ_PRIORITY>;
+				#pwm-cells = <3>;
+			};
+
+			adc: adc@d5000 {
+				compatible = "nordic,nrf-saadc";
+				reg = <0xd5000 0x1000>;
+				interrupts = <213 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				#io-channel-cells = <1>;
+			};
+
+			nfct: nfct@d6000 {
+				compatible = "nordic,nrf-nfct";
+				reg = <0xd6000 0x1000>;
+				interrupts = <214 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+
+			temp: temp@d7000 {
+				compatible = "nordic,nrf-temp";
+				reg = <0xd7000 0x1000>;
+				interrupts = <215 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+
+			gpio1: gpio@d8200 {
+				compatible = "nordic,nrf-gpio";
+				gpio-controller;
+				reg = <0xd8200 0x300>;
+				#gpio-cells = <2>;
+				ngpios = <16>;
+				status = "disabled";
+				port = <1>;
+				gpiote-instance = <&gpiote20>;
+			};
+
+			gpiote20: gpiote@da000 {
+				compatible = "nordic,nrf-gpiote";
+				reg = <0xda000 0x1000>;
+				status = "disabled";
+				instance = <20>;
+			};
+
+			i2s20: i2s@dd000 {
+				compatible = "nordic,nrf-i2s";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xdd000 0x1000>;
+				interrupts = <221 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+
+			qdec20: qdec@e0000 {
+				compatible = "nordic,nrf-qdec";
+				reg = <0xe0000 0x1000>;
+				interrupts = <224 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+
+			qdec21: qdec@e1000 {
+				compatible = "nordic,nrf-qdec";
+				reg = <0xe1000 0x1000>;
+				interrupts = <225 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+
+			grtc: grtc@e2000 {
+				compatible = "nordic,nrf-grtc";
+				reg = <0xe2000 0x1000>;
+				cc-num = <12>;
+				status = "disabled";
+			};
+
+			dppic30: dppic@102000 {
+				compatible = "nordic,nrf-dppic";
+				reg = <0x102000 0x808>;
+				status = "disabled";
+			};
+
+			ppib30: ppib@103000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x103000 0x1000>;
+				status = "disabled";
+			};
+
+			i2c30: i2c@104000 {
+				compatible = "nordic,nrf-twim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0x104000 0x1000>;
+				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
+				easydma-maxcnt-bits = <16>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+
+			spi30: spi@104000 {
+				/*
+				 * This spi node can be either SPIM or SPIS,
+				 * for the user to pick:
+				 * compatible = "nordic,nrf-spim" or
+				 *              "nordic,nrf-spis".
+				 */
+				compatible = "nordic,nrf-spim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0x104000 0x1000>;
+				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
+				max-frequency = <DT_FREQ_M(8)>;
+				easydma-maxcnt-bits = <16>;
+				rx-delay-supported;
+				rx-delay = <1>;
+				status = "disabled";
+			};
+
+			uart30: uart@104000 {
+				compatible = "nordic,nrf-uarte";
+				reg = <0x104000 0x1000>;
+				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				endtx-stoptx-supported;
+				frame-timeout-supported;
+			};
+
+			clock: clock@10e000 {
+				compatible = "nordic,nrf-clock";
+				reg = <0x10e000 0x1000>;
+				interrupts = <261 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+
+			power: power@10e000 {
+				compatible = "nordic,nrf-power";
+				reg = <0x10e000 0x1000>;
+				ranges = <0x0 0x10e000 0x1000>;
+				interrupts = <261 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				gpregret1: gpregret1@51c {
+					#address-cells = <1>;
+					#size-cells = <1>;
+					compatible = "nordic,nrf-gpregret";
+					reg = <0x51c 0x1>;
+					status = "disabled";
+				};
+
+				gpregret2: gpregret2@520 {
+					#address-cells = <1>;
+					#size-cells = <1>;
+					compatible = "nordic,nrf-gpregret";
+					reg = <0x520 0x1>;
+					status = "disabled";
+				};
+			};
+
+			comp: comparator@106000 {
+				/*
+				 * Use compatible "nordic,nrf-comp" to configure as COMP
+				 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
+				 */
+				compatible = "nordic,nrf-comp";
+				reg = <0x106000 0x1000>;
+				status = "disabled";
+				interrupts = <262 NRF_DEFAULT_IRQ_PRIORITY>;
+			};
+
+#ifdef USE_NON_SECURE_ADDRESS_MAP
+			/* intentionally empty because WDT30 is hardware fixed to Secure */
+#else
+			wdt30: watchdog@108000 {
+				compatible = "nordic,nrf-wdt";
+				reg = <0x108000 0x620>;
+				interrupts = <264 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+#endif
+
+			wdt31: watchdog@109000 {
+				compatible = "nordic,nrf-wdt";
+				reg = <0x109000 0x620>;
+				interrupts = <265 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+
+			gpio0: gpio@10a000 {
+				compatible = "nordic,nrf-gpio";
+				gpio-controller;
+				reg = <0x10a000 0x300>;
+				#gpio-cells = <2>;
+				ngpios = <5>;
+				status = "disabled";
+				port = <0>;
+				gpiote-instance = <&gpiote30>;
+			};
+
+			gpiote30: gpiote@10c000 {
+				compatible = "nordic,nrf-gpiote";
+				reg = <0x10c000 0x1000>;
+				status = "disabled";
+				instance = <30>;
+			};
+
+			regulators: regulator@120000 {
+				compatible = "nordic,nrf54l-regulators";
+				reg = <0x120000 0x1000>;
+				status = "disabled";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				vregmain: regulator@120600 {
+					compatible = "nordic,nrf5x-regulator";
+					reg = <0x120600 0x1>;
+					status = "disabled";
+					regulator-name = "VREGMAIN";
+					regulator-initial-mode = <NRF5X_REG_MODE_LDO>;
+				};
+			};
+		};
+
+		rram_controller: rram-controller@5004b000 {
+			compatible = "nordic,rram-controller";
+			reg = <0x5004b000 0x1000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			interrupts = <75 NRF_DEFAULT_IRQ_PRIORITY>;
+
+			cpuapp_rram: rram@0 {
+				compatible = "soc-nv-flash";
+				erase-block-size = <4096>;
+				write-block-size = <16>;
+			};
+		};
+
+		cpuapp_ppb: cpuapp-ppb-bus {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			cpuapp_nvic: interrupt-controller@e000e100  {
+				#address-cells = <1>;
+				compatible = "arm,v8m-nvic";
+				reg = <0xe000e100 0xc00>;
+				arm,num-irq-priority-bits = <3>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+			};
+
+			cpuapp_systick: timer@e000e010 {
+				compatible = "arm,armv8m-systick";
+				reg = <0xe000e010 0x10>;
+				status = "disabled";
+			};
+		};
+	};
+};
diff --git a/dts/riscv/nordic/nrf54l05_cpuflpr.dtsi b/dts/riscv/nordic/nrf54l05_cpuflpr.dtsi
new file mode 100644
index 00000000000..d4725112a46
--- /dev/null
+++ b/dts/riscv/nordic/nrf54l05_cpuflpr.dtsi
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <nordic/nrf54l05.dtsi>
+#include "nrf54l_05_10_15_cpuflpr.dtsi"
diff --git a/dts/riscv/nordic/nrf54l10_cpuflpr.dtsi b/dts/riscv/nordic/nrf54l10_cpuflpr.dtsi
new file mode 100644
index 00000000000..cea4112d363
--- /dev/null
+++ b/dts/riscv/nordic/nrf54l10_cpuflpr.dtsi
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <nordic/nrf54l10.dtsi>
+#include "nrf54l_05_10_15_cpuflpr.dtsi"
diff --git a/dts/riscv/nordic/nrf54l15_cpuflpr.dtsi b/dts/riscv/nordic/nrf54l15_cpuflpr.dtsi
index fefa43b76c0..4dedf1fbca5 100644
--- a/dts/riscv/nordic/nrf54l15_cpuflpr.dtsi
+++ b/dts/riscv/nordic/nrf54l15_cpuflpr.dtsi
@@ -5,63 +5,4 @@
  */
 
 #include <nordic/nrf54l15.dtsi>
-
-cpu: &cpuflpr {};
-clic: &cpuflpr_clic {};
-
-/delete-node/ &cpuapp;
-/delete-node/ &cpuapp_rram;
-/delete-node/ &cpuapp_ppb;
-/delete-node/ &cpuapp_sram;
-
-/ {
-	soc {
-		compatible = "simple-bus";
-		interrupt-parent = <&cpuflpr_clic>;
-		ranges;
-	};
-};
-
-&cpuflpr {
-	cpuflpr_vevif_rx: mailbox {
-		compatible = "nordic,nrf-vevif-task-rx";
-		status = "disabled";
-		interrupt-parent = <&cpuflpr_clic>;
-		interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>,
-			     <17 NRF_DEFAULT_IRQ_PRIORITY>,
-			     <18 NRF_DEFAULT_IRQ_PRIORITY>,
-			     <19 NRF_DEFAULT_IRQ_PRIORITY>,
-			     <20 NRF_DEFAULT_IRQ_PRIORITY>,
-			     <21 NRF_DEFAULT_IRQ_PRIORITY>,
-			     <22 NRF_DEFAULT_IRQ_PRIORITY>;
-		#mbox-cells = <1>;
-		nordic,tasks = <7>;
-		nordic,tasks-mask = <0x007f0000>;
-	};
-};
-
-&cpuflpr_vpr {
-	cpuflpr_vevif_tx: mailbox {
-		compatible = "nordic,nrf-vevif-event-tx";
-		#mbox-cells = <1>;
-		nordic,events = <1>;
-		nordic,events-mask = <0x00100000>;
-		status = "disabled";
-	};
-};
-
-&cpuflpr_clic {
-	status = "okay";
-};
-
-&grtc {
-	interrupts = <226 NRF_DEFAULT_IRQ_PRIORITY>;
-};
-
-&gpiote20 {
-	interrupts = <218 NRF_DEFAULT_IRQ_PRIORITY>;
-};
-
-&gpiote30 {
-	interrupts = <268 NRF_DEFAULT_IRQ_PRIORITY>;
-};
+#include "nrf54l_05_10_15_cpuflpr.dtsi"
diff --git a/dts/riscv/nordic/nrf54l_05_10_15_cpuflpr.dtsi b/dts/riscv/nordic/nrf54l_05_10_15_cpuflpr.dtsi
new file mode 100644
index 00000000000..b20ddbb1bda
--- /dev/null
+++ b/dts/riscv/nordic/nrf54l_05_10_15_cpuflpr.dtsi
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+cpu: &cpuflpr {};
+clic: &cpuflpr_clic {};
+
+/delete-node/ &cpuapp;
+/delete-node/ &cpuapp_rram;
+/delete-node/ &cpuapp_ppb;
+/delete-node/ &cpuapp_sram;
+
+/ {
+	soc {
+		compatible = "simple-bus";
+		interrupt-parent = <&cpuflpr_clic>;
+		ranges;
+	};
+};
+
+&cpuflpr {
+	cpuflpr_vevif_rx: mailbox {
+		compatible = "nordic,nrf-vevif-task-rx";
+		status = "disabled";
+		interrupt-parent = <&cpuflpr_clic>;
+		interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <17 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <18 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <19 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <20 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <21 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <22 NRF_DEFAULT_IRQ_PRIORITY>;
+		#mbox-cells = <1>;
+		nordic,tasks = <7>;
+		nordic,tasks-mask = <0x007f0000>;
+	};
+};
+
+&cpuflpr_vpr {
+	cpuflpr_vevif_tx: mailbox {
+		compatible = "nordic,nrf-vevif-event-tx";
+		#mbox-cells = <1>;
+		nordic,events = <1>;
+		nordic,events-mask = <0x00100000>;
+		status = "disabled";
+	};
+};
+
+&cpuflpr_clic {
+	status = "okay";
+};
+
+&grtc {
+	interrupts = <226 NRF_DEFAULT_IRQ_PRIORITY>;
+};
+
+&gpiote20 {
+	interrupts = <218 NRF_DEFAULT_IRQ_PRIORITY>;
+};
+
+&gpiote30 {
+	interrupts = <268 NRF_DEFAULT_IRQ_PRIORITY>;
+};
diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index e800b909ec4..08c9610e7fe 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -44,6 +44,12 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUPPR     NRF54H20_XXAA
                                                                 NRF_PPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR    NRF54H20_XXAA
                                                                 NRF_FLPR)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05            NRF54L05_XXAA)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUAPP     NRF_APPLICATION)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR    NRF_FLPR)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10            NRF54L10_XXAA)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10_CPUAPP     NRF_APPLICATION)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10_CPUFLPR    NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15            NRF54L15_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR    NRF_FLPR)
@@ -172,7 +178,7 @@ if(DEFINED uicr_path)
   endif()
 endif()
 
-if(CONFIG_SOC_NRF54L15_CPUAPP OR CONFIG_SOC_NRF54L20_ENGA_CPUAPP)
+if(CONFIG_SOC_NRF54L_CPUAPP_COMMON)
 	dt_prop(clock_frequency PATH "/cpus/cpu@0" PROPERTY "clock-frequency")
 	math(EXPR clock_frequency_mhz "${clock_frequency} / 1000000")
 	zephyr_compile_definitions("NRF_CONFIG_CPU_FREQ_MHZ=${clock_frequency_mhz}")
@@ -222,6 +228,10 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUAPP      nrf54h20_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUPPR      nrf54h20_ppr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR     nrf54h20_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPURAD      nrf54h20_radiocore.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54L05_CPUAPP      nrf54l05_application.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR     nrf54l05_flpr.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUAPP      nrf54l10_application.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUFLPR     nrf54l10_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP      nrf54l15_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR     nrf54l15_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54l20_enga_application.svd)
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index 48b3b8226fb..5a6c8bf01c7 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -1129,6 +1129,14 @@
     #include <nrfx_config_nrf54h20_ppr.h>
 #elif defined(NRF54H20_XXAA) && defined(NRF_FLPR)
     #include <nrfx_config_nrf54h20_flpr.h>
+#elif defined(NRF54L05_XXAA) && defined(NRF_APPLICATION)
+    #include <nrfx_config_nrf54l05_application.h>
+#elif defined(NRF54L05_XXAA) && defined(NRF_FLPR)
+    #include <nrfx_config_nrf54l05_flpr.h>
+#elif defined(NRF54L10_XXAA) && defined(NRF_APPLICATION)
+    #include <nrfx_config_nrf54l10_application.h>
+#elif defined(NRF54L10_XXAA) && defined(NRF_FLPR)
+    #include <nrfx_config_nrf54l10_flpr.h>
 #elif defined(NRF54L15_XXAA) && defined(NRF_APPLICATION)
     #include <nrfx_config_nrf54l15_application.h>
 #elif defined(NRF54L15_XXAA) && defined(NRF_FLPR)
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l05_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l05_application.h
new file mode 100644
index 00000000000..503405b49f6
--- /dev/null
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54l05_application.h
@@ -0,0 +1,1775 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef NRFX_CONFIG_NRF54L05_APPLICATION_H__
+#define NRFX_CONFIG_NRF54L05_APPLICATION_H__
+
+#ifndef NRFX_CONFIG_H__
+#error "This file should not be included directly. Include nrfx_config.h instead."
+#endif
+
+
+/**
+ * @brief NRFX_DEFAULT_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_DEFAULT_IRQ_PRIORITY
+#define NRFX_DEFAULT_IRQ_PRIORITY 7
+#endif
+
+/**
+ * @brief NRFX_CLOCK_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_ENABLED
+#define NRFX_CLOCK_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LF_SRC
+ *
+ * Integer value.
+ * Supported values:
+ * - RC    = 0
+ * - XTAL  = 1
+ * - Synth = 2
+ */
+#ifndef NRFX_CLOCK_CONFIG_LF_SRC
+#define NRFX_CLOCK_CONFIG_LF_SRC 1
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
+#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
+#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
+#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
+#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_COMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COMP_ENABLED
+#define NRFX_COMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_COMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
+#define NRFX_COMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_COMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
+#define NRFX_COMP_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_DPPI_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI_ENABLED
+#define NRFX_DPPI_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
+#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
+#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_DPPI00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI00_ENABLED
+#define NRFX_DPPI00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI10_ENABLED
+#define NRFX_DPPI10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI20_ENABLED
+#define NRFX_DPPI20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI30_ENABLED
+#define NRFX_DPPI30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU_ENABLED
+#define NRFX_EGU_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_EGU10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU10_ENABLED
+#define NRFX_EGU10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU20_ENABLED
+#define NRFX_EGU20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE_ENABLED
+#define NRFX_GPIOTE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
+ *
+ * Integer value. Minimum: 0. Maximum: 15.
+ */
+#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
+#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
+#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
+#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_GPIOTE20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE20_ENABLED
+#define NRFX_GPIOTE20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE30_ENABLED
+#define NRFX_GPIOTE30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_ENABLED
+#define NRFX_GRTC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 1
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 1
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
+ *
+ * Integer value.
+ */
+#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
+#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 8
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
+ */
+#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
+#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x00000f0f
+#endif
+
+/**
+ * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
+#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
+#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_I2S_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S_ENABLED
+#define NRFX_I2S_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_I2S_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
+#define NRFX_I2S_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_I2S_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
+#define NRFX_I2S_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_I2S20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S20_ENABLED
+#define NRFX_I2S20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_LPCOMP_ENABLED
+#define NRFX_LPCOMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
+#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
+#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_NFCT_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_NFCT_ENABLED
+#define NRFX_NFCT_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
+ *
+ * Integer value. Minimum: 0. Maximum: 5.
+ */
+#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
+#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
+#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
+#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PDM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM_ENABLED
+#define NRFX_PDM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PDM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
+#define NRFX_PDM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
+#define NRFX_PDM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PDM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM20_ENABLED
+#define NRFX_PDM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM21_ENABLED
+#define NRFX_PDM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_POWER_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_POWER_ENABLED
+#define NRFX_POWER_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PPIB_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB_ENABLED
+#define NRFX_PPIB_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB_CONFIG_LOG_ENABLED
+#define NRFX_PPIB_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PPIB_CONFIG_LOG_LEVEL
+#define NRFX_PPIB_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PPIB00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB00_ENABLED
+#define NRFX_PPIB00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB01_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB01_ENABLED
+#define NRFX_PPIB01_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB10_ENABLED
+#define NRFX_PPIB10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB11_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB11_ENABLED
+#define NRFX_PPIB11_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB20_ENABLED
+#define NRFX_PPIB20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB21_ENABLED
+#define NRFX_PPIB21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB22_ENABLED
+#define NRFX_PPIB22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB30_ENABLED
+#define NRFX_PPIB30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_ENABLED
+#define NRFX_PRS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
+#define NRFX_PRS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
+#define NRFX_PRS_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_0_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_0_ENABLED
+#define NRFX_PRS_BOX_0_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_1_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_1_ENABLED
+#define NRFX_PRS_BOX_1_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_2_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_2_ENABLED
+#define NRFX_PRS_BOX_2_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_3_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_3_ENABLED
+#define NRFX_PRS_BOX_3_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_4_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_4_ENABLED
+#define NRFX_PRS_BOX_4_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_5_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_5_ENABLED
+#define NRFX_PRS_BOX_5_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM_ENABLED
+#define NRFX_PWM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PWM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
+#define NRFX_PWM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
+#define NRFX_PWM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PWM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM20_ENABLED
+#define NRFX_PWM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM21_ENABLED
+#define NRFX_PWM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM22_ENABLED
+#define NRFX_PWM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC_ENABLED
+#define NRFX_QDEC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
+#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
+#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_QDEC20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC20_ENABLED
+#define NRFX_QDEC20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC21_ENABLED
+#define NRFX_QDEC21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RRAMC_ENABLED
+#define NRFX_RRAMC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
+#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
+#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_RTC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC_ENABLED
+#define NRFX_RTC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_RTC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
+#define NRFX_RTC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
+#define NRFX_RTC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_RTC10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC10_ENABLED
+#define NRFX_RTC10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC30_ENABLED
+#define NRFX_RTC30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SAADC_ENABLED
+#define NRFX_SAADC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
+#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
+#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_SPIM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM_ENABLED
+#define NRFX_SPIM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
+#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
+#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_SPIM00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM00_ENABLED
+#define NRFX_SPIM00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM20_ENABLED
+#define NRFX_SPIM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM21_ENABLED
+#define NRFX_SPIM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM22_ENABLED
+#define NRFX_SPIM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM30_ENABLED
+#define NRFX_SPIM30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS_ENABLED
+#define NRFX_SPIS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
+#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
+#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_SPIS00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS00_ENABLED
+#define NRFX_SPIS00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS20_ENABLED
+#define NRFX_SPIS20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS21_ENABLED
+#define NRFX_SPIS21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS22_ENABLED
+#define NRFX_SPIS22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS30_ENABLED
+#define NRFX_SPIS30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SYSTICK_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SYSTICK_ENABLED
+#define NRFX_SYSTICK_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TEMP_ENABLED
+#define NRFX_TEMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
+#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
+#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TIMER_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER_ENABLED
+#define NRFX_TIMER_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
+#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
+#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TIMER00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER00_ENABLED
+#define NRFX_TIMER00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER10_ENABLED
+#define NRFX_TIMER10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER20_ENABLED
+#define NRFX_TIMER20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER21_ENABLED
+#define NRFX_TIMER21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER22_ENABLED
+#define NRFX_TIMER22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER23_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER23_ENABLED
+#define NRFX_TIMER23_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER24_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER24_ENABLED
+#define NRFX_TIMER24_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM_ENABLED
+#define NRFX_TWIM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
+#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
+#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TWIM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM20_ENABLED
+#define NRFX_TWIM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM21_ENABLED
+#define NRFX_TWIM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM22_ENABLED
+#define NRFX_TWIM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM30_ENABLED
+#define NRFX_TWIM30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_ENABLED
+#define NRFX_TWIS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
+#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
+ *        Assume that any instance would be initialized only once.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
+#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_NO_SYNC_MODE
+#define NRFX_TWIS_NO_SYNC_MODE 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
+#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TWIS20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS20_ENABLED
+#define NRFX_TWIS20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS21_ENABLED
+#define NRFX_TWIS21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS22_ENABLED
+#define NRFX_TWIS22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS30_ENABLED
+#define NRFX_TWIS30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_ENABLED
+#define NRFX_UARTE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
+ *        If enabled, support for configuring GPIO pins is removed from the driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
+#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
+ *        If enabled, support for configuring PSEL registers is removed from the driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
+#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_TX_LINK
+#define NRFX_UARTE_CONFIG_TX_LINK 1
+#endif
+
+/**
+ * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
+#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
+#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_UARTE00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE00_ENABLED
+#define NRFX_UARTE00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE20_ENABLED
+#define NRFX_UARTE20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE21_ENABLED
+#define NRFX_UARTE21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE22_ENABLED
+#define NRFX_UARTE22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE30_ENABLED
+#define NRFX_UARTE30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_ENABLED
+#define NRFX_WDT_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_CONFIG_NO_IRQ
+#define NRFX_WDT_CONFIG_NO_IRQ 0
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
+#define NRFX_WDT_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
+#define NRFX_WDT_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_WDT30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT30_ENABLED
+#define NRFX_WDT30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT31_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT31_ENABLED
+#define NRFX_WDT31_ENABLED 0
+#endif
+
+#endif /* NRFX_CONFIG_NRF54L05_APPLICATION_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l05_flpr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l05_flpr.h
new file mode 100644
index 00000000000..4d83d5cba22
--- /dev/null
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54l05_flpr.h
@@ -0,0 +1,1784 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef NRFX_CONFIG_NRF54L05_FLPR_H__
+#define NRFX_CONFIG_NRF54L05_FLPR_H__
+
+#ifndef NRFX_CONFIG_H__
+#error "This file should not be included directly. Include nrfx_config.h instead."
+#endif
+
+
+/**
+ * @brief NRFX_DEFAULT_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_DEFAULT_IRQ_PRIORITY
+#define NRFX_DEFAULT_IRQ_PRIORITY 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_ENABLED
+#define NRFX_CLOCK_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LF_SRC
+ *
+ * Integer value.
+ * Supported values:
+ * - RC    = 0
+ * - XTAL  = 1
+ * - Synth = 2
+ */
+#ifndef NRFX_CLOCK_CONFIG_LF_SRC
+#define NRFX_CLOCK_CONFIG_LF_SRC 1
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
+#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
+#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
+#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
+#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_COMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COMP_ENABLED
+#define NRFX_COMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_COMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
+#define NRFX_COMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_COMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
+#define NRFX_COMP_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_COREDEP_VPR_LEGACY
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COREDEP_VPR_LEGACY
+#define NRFX_COREDEP_VPR_LEGACY 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI_ENABLED
+#define NRFX_DPPI_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
+#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
+#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_DPPI00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI00_ENABLED
+#define NRFX_DPPI00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI10_ENABLED
+#define NRFX_DPPI10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI20_ENABLED
+#define NRFX_DPPI20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI30_ENABLED
+#define NRFX_DPPI30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU_ENABLED
+#define NRFX_EGU_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_EGU10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU10_ENABLED
+#define NRFX_EGU10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU20_ENABLED
+#define NRFX_EGU20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE_ENABLED
+#define NRFX_GPIOTE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
+ *
+ * Integer value. Minimum: 0. Maximum: 15.
+ */
+#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
+#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
+#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
+#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_GPIOTE20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE20_ENABLED
+#define NRFX_GPIOTE20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE30_ENABLED
+#define NRFX_GPIOTE30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_ENABLED
+#define NRFX_GRTC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 1
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
+ *
+ * Integer value.
+ */
+#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
+#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 4
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
+ */
+#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
+#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x000000f0
+#endif
+
+/**
+ * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
+#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
+#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_I2S_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S_ENABLED
+#define NRFX_I2S_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_I2S_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
+#define NRFX_I2S_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_I2S_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
+#define NRFX_I2S_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_I2S20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S20_ENABLED
+#define NRFX_I2S20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_LPCOMP_ENABLED
+#define NRFX_LPCOMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
+#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
+#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_NFCT_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_NFCT_ENABLED
+#define NRFX_NFCT_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
+ *
+ * Integer value. Minimum: 0. Maximum: 5.
+ */
+#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
+#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
+#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
+#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PDM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM_ENABLED
+#define NRFX_PDM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PDM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
+#define NRFX_PDM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
+#define NRFX_PDM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PDM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM20_ENABLED
+#define NRFX_PDM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM21_ENABLED
+#define NRFX_PDM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_POWER_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_POWER_ENABLED
+#define NRFX_POWER_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PPIB_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB_ENABLED
+#define NRFX_PPIB_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB_CONFIG_LOG_ENABLED
+#define NRFX_PPIB_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PPIB_CONFIG_LOG_LEVEL
+#define NRFX_PPIB_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PPIB00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB00_ENABLED
+#define NRFX_PPIB00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB01_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB01_ENABLED
+#define NRFX_PPIB01_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB10_ENABLED
+#define NRFX_PPIB10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB11_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB11_ENABLED
+#define NRFX_PPIB11_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB20_ENABLED
+#define NRFX_PPIB20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB21_ENABLED
+#define NRFX_PPIB21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB22_ENABLED
+#define NRFX_PPIB22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB30_ENABLED
+#define NRFX_PPIB30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_ENABLED
+#define NRFX_PRS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
+#define NRFX_PRS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
+#define NRFX_PRS_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_0_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_0_ENABLED
+#define NRFX_PRS_BOX_0_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_1_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_1_ENABLED
+#define NRFX_PRS_BOX_1_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_2_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_2_ENABLED
+#define NRFX_PRS_BOX_2_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_3_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_3_ENABLED
+#define NRFX_PRS_BOX_3_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_4_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_4_ENABLED
+#define NRFX_PRS_BOX_4_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_5_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_5_ENABLED
+#define NRFX_PRS_BOX_5_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM_ENABLED
+#define NRFX_PWM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PWM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
+#define NRFX_PWM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
+#define NRFX_PWM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PWM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM20_ENABLED
+#define NRFX_PWM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM21_ENABLED
+#define NRFX_PWM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM22_ENABLED
+#define NRFX_PWM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC_ENABLED
+#define NRFX_QDEC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
+#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
+#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_QDEC20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC20_ENABLED
+#define NRFX_QDEC20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC21_ENABLED
+#define NRFX_QDEC21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RRAMC_ENABLED
+#define NRFX_RRAMC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
+#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
+#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_RTC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC_ENABLED
+#define NRFX_RTC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_RTC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
+#define NRFX_RTC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
+#define NRFX_RTC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_RTC10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC10_ENABLED
+#define NRFX_RTC10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC30_ENABLED
+#define NRFX_RTC30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SAADC_ENABLED
+#define NRFX_SAADC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
+#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
+#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_SPIM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM_ENABLED
+#define NRFX_SPIM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
+#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
+#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_SPIM00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM00_ENABLED
+#define NRFX_SPIM00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM20_ENABLED
+#define NRFX_SPIM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM21_ENABLED
+#define NRFX_SPIM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM22_ENABLED
+#define NRFX_SPIM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM30_ENABLED
+#define NRFX_SPIM30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS_ENABLED
+#define NRFX_SPIS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
+#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
+#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_SPIS00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS00_ENABLED
+#define NRFX_SPIS00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS20_ENABLED
+#define NRFX_SPIS20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS21_ENABLED
+#define NRFX_SPIS21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS22_ENABLED
+#define NRFX_SPIS22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS30_ENABLED
+#define NRFX_SPIS30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TEMP_ENABLED
+#define NRFX_TEMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
+#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
+#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TIMER_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER_ENABLED
+#define NRFX_TIMER_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
+#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
+#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TIMER00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER00_ENABLED
+#define NRFX_TIMER00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER10_ENABLED
+#define NRFX_TIMER10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER20_ENABLED
+#define NRFX_TIMER20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER21_ENABLED
+#define NRFX_TIMER21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER22_ENABLED
+#define NRFX_TIMER22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER23_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER23_ENABLED
+#define NRFX_TIMER23_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER24_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER24_ENABLED
+#define NRFX_TIMER24_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM_ENABLED
+#define NRFX_TWIM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
+#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
+#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TWIM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM20_ENABLED
+#define NRFX_TWIM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM21_ENABLED
+#define NRFX_TWIM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM22_ENABLED
+#define NRFX_TWIM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM30_ENABLED
+#define NRFX_TWIM30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_ENABLED
+#define NRFX_TWIS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
+#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
+ *        Assume that any instance would be initialized only once.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
+#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_NO_SYNC_MODE
+#define NRFX_TWIS_NO_SYNC_MODE 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
+#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TWIS20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS20_ENABLED
+#define NRFX_TWIS20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS21_ENABLED
+#define NRFX_TWIS21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS22_ENABLED
+#define NRFX_TWIS22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS30_ENABLED
+#define NRFX_TWIS30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_ENABLED
+#define NRFX_UARTE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
+ *        If enabled, support for configuring GPIO pins is removed from the driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
+#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
+ *        If enabled, support for configuring PSEL registers is removed from the driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
+#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_TX_LINK
+#define NRFX_UARTE_CONFIG_TX_LINK 1
+#endif
+
+/**
+ * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
+#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
+#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_UARTE00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE00_ENABLED
+#define NRFX_UARTE00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE20_ENABLED
+#define NRFX_UARTE20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE21_ENABLED
+#define NRFX_UARTE21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE22_ENABLED
+#define NRFX_UARTE22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE30_ENABLED
+#define NRFX_UARTE30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_VEVIF_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_VEVIF_ENABLED
+#define NRFX_VEVIF_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_ENABLED
+#define NRFX_WDT_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_CONFIG_NO_IRQ
+#define NRFX_WDT_CONFIG_NO_IRQ 0
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
+#define NRFX_WDT_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
+#define NRFX_WDT_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_WDT30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT30_ENABLED
+#define NRFX_WDT30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT31_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT31_ENABLED
+#define NRFX_WDT31_ENABLED 0
+#endif
+
+#endif /* NRFX_CONFIG_NRF54L05_FLPR_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l10_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l10_application.h
new file mode 100644
index 00000000000..ab781f507e5
--- /dev/null
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54l10_application.h
@@ -0,0 +1,1775 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef NRFX_CONFIG_NRF54L10_APPLICATION_H__
+#define NRFX_CONFIG_NRF54L10_APPLICATION_H__
+
+#ifndef NRFX_CONFIG_H__
+#error "This file should not be included directly. Include nrfx_config.h instead."
+#endif
+
+
+/**
+ * @brief NRFX_DEFAULT_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_DEFAULT_IRQ_PRIORITY
+#define NRFX_DEFAULT_IRQ_PRIORITY 7
+#endif
+
+/**
+ * @brief NRFX_CLOCK_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_ENABLED
+#define NRFX_CLOCK_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LF_SRC
+ *
+ * Integer value.
+ * Supported values:
+ * - RC    = 0
+ * - XTAL  = 1
+ * - Synth = 2
+ */
+#ifndef NRFX_CLOCK_CONFIG_LF_SRC
+#define NRFX_CLOCK_CONFIG_LF_SRC 1
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
+#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
+#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
+#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
+#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_COMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COMP_ENABLED
+#define NRFX_COMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_COMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
+#define NRFX_COMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_COMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
+#define NRFX_COMP_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_DPPI_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI_ENABLED
+#define NRFX_DPPI_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
+#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
+#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_DPPI00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI00_ENABLED
+#define NRFX_DPPI00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI10_ENABLED
+#define NRFX_DPPI10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI20_ENABLED
+#define NRFX_DPPI20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI30_ENABLED
+#define NRFX_DPPI30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU_ENABLED
+#define NRFX_EGU_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_EGU10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU10_ENABLED
+#define NRFX_EGU10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU20_ENABLED
+#define NRFX_EGU20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE_ENABLED
+#define NRFX_GPIOTE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
+ *
+ * Integer value. Minimum: 0. Maximum: 15.
+ */
+#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
+#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
+#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
+#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_GPIOTE20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE20_ENABLED
+#define NRFX_GPIOTE20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE30_ENABLED
+#define NRFX_GPIOTE30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_ENABLED
+#define NRFX_GRTC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 1
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 1
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
+ *
+ * Integer value.
+ */
+#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
+#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 8
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
+ */
+#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
+#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x00000f0f
+#endif
+
+/**
+ * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
+#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
+#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_I2S_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S_ENABLED
+#define NRFX_I2S_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_I2S_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
+#define NRFX_I2S_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_I2S_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
+#define NRFX_I2S_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_I2S20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S20_ENABLED
+#define NRFX_I2S20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_LPCOMP_ENABLED
+#define NRFX_LPCOMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
+#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
+#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_NFCT_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_NFCT_ENABLED
+#define NRFX_NFCT_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
+ *
+ * Integer value. Minimum: 0. Maximum: 5.
+ */
+#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
+#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
+#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
+#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PDM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM_ENABLED
+#define NRFX_PDM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PDM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
+#define NRFX_PDM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
+#define NRFX_PDM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PDM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM20_ENABLED
+#define NRFX_PDM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM21_ENABLED
+#define NRFX_PDM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_POWER_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_POWER_ENABLED
+#define NRFX_POWER_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PPIB_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB_ENABLED
+#define NRFX_PPIB_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB_CONFIG_LOG_ENABLED
+#define NRFX_PPIB_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PPIB_CONFIG_LOG_LEVEL
+#define NRFX_PPIB_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PPIB00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB00_ENABLED
+#define NRFX_PPIB00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB01_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB01_ENABLED
+#define NRFX_PPIB01_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB10_ENABLED
+#define NRFX_PPIB10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB11_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB11_ENABLED
+#define NRFX_PPIB11_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB20_ENABLED
+#define NRFX_PPIB20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB21_ENABLED
+#define NRFX_PPIB21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB22_ENABLED
+#define NRFX_PPIB22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB30_ENABLED
+#define NRFX_PPIB30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_ENABLED
+#define NRFX_PRS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
+#define NRFX_PRS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
+#define NRFX_PRS_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_0_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_0_ENABLED
+#define NRFX_PRS_BOX_0_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_1_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_1_ENABLED
+#define NRFX_PRS_BOX_1_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_2_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_2_ENABLED
+#define NRFX_PRS_BOX_2_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_3_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_3_ENABLED
+#define NRFX_PRS_BOX_3_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_4_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_4_ENABLED
+#define NRFX_PRS_BOX_4_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_5_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_5_ENABLED
+#define NRFX_PRS_BOX_5_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM_ENABLED
+#define NRFX_PWM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PWM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
+#define NRFX_PWM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
+#define NRFX_PWM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PWM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM20_ENABLED
+#define NRFX_PWM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM21_ENABLED
+#define NRFX_PWM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM22_ENABLED
+#define NRFX_PWM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC_ENABLED
+#define NRFX_QDEC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
+#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
+#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_QDEC20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC20_ENABLED
+#define NRFX_QDEC20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC21_ENABLED
+#define NRFX_QDEC21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RRAMC_ENABLED
+#define NRFX_RRAMC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
+#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
+#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_RTC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC_ENABLED
+#define NRFX_RTC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_RTC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
+#define NRFX_RTC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
+#define NRFX_RTC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_RTC10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC10_ENABLED
+#define NRFX_RTC10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC30_ENABLED
+#define NRFX_RTC30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SAADC_ENABLED
+#define NRFX_SAADC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
+#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
+#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_SPIM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM_ENABLED
+#define NRFX_SPIM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
+#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
+#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_SPIM00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM00_ENABLED
+#define NRFX_SPIM00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM20_ENABLED
+#define NRFX_SPIM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM21_ENABLED
+#define NRFX_SPIM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM22_ENABLED
+#define NRFX_SPIM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM30_ENABLED
+#define NRFX_SPIM30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS_ENABLED
+#define NRFX_SPIS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
+#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
+#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_SPIS00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS00_ENABLED
+#define NRFX_SPIS00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS20_ENABLED
+#define NRFX_SPIS20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS21_ENABLED
+#define NRFX_SPIS21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS22_ENABLED
+#define NRFX_SPIS22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS30_ENABLED
+#define NRFX_SPIS30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SYSTICK_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SYSTICK_ENABLED
+#define NRFX_SYSTICK_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TEMP_ENABLED
+#define NRFX_TEMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
+#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
+#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TIMER_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER_ENABLED
+#define NRFX_TIMER_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
+#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
+#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TIMER00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER00_ENABLED
+#define NRFX_TIMER00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER10_ENABLED
+#define NRFX_TIMER10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER20_ENABLED
+#define NRFX_TIMER20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER21_ENABLED
+#define NRFX_TIMER21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER22_ENABLED
+#define NRFX_TIMER22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER23_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER23_ENABLED
+#define NRFX_TIMER23_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER24_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER24_ENABLED
+#define NRFX_TIMER24_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM_ENABLED
+#define NRFX_TWIM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
+#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
+#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TWIM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM20_ENABLED
+#define NRFX_TWIM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM21_ENABLED
+#define NRFX_TWIM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM22_ENABLED
+#define NRFX_TWIM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM30_ENABLED
+#define NRFX_TWIM30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_ENABLED
+#define NRFX_TWIS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
+#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
+ *        Assume that any instance would be initialized only once.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
+#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_NO_SYNC_MODE
+#define NRFX_TWIS_NO_SYNC_MODE 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
+#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TWIS20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS20_ENABLED
+#define NRFX_TWIS20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS21_ENABLED
+#define NRFX_TWIS21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS22_ENABLED
+#define NRFX_TWIS22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS30_ENABLED
+#define NRFX_TWIS30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_ENABLED
+#define NRFX_UARTE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
+ *        If enabled, support for configuring GPIO pins is removed from the driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
+#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
+ *        If enabled, support for configuring PSEL registers is removed from the driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
+#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_TX_LINK
+#define NRFX_UARTE_CONFIG_TX_LINK 1
+#endif
+
+/**
+ * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
+#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
+#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_UARTE00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE00_ENABLED
+#define NRFX_UARTE00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE20_ENABLED
+#define NRFX_UARTE20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE21_ENABLED
+#define NRFX_UARTE21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE22_ENABLED
+#define NRFX_UARTE22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE30_ENABLED
+#define NRFX_UARTE30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_ENABLED
+#define NRFX_WDT_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_CONFIG_NO_IRQ
+#define NRFX_WDT_CONFIG_NO_IRQ 0
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
+#define NRFX_WDT_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
+#define NRFX_WDT_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_WDT30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT30_ENABLED
+#define NRFX_WDT30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT31_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT31_ENABLED
+#define NRFX_WDT31_ENABLED 0
+#endif
+
+#endif /* NRFX_CONFIG_NRF54L10_APPLICATION_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l10_flpr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l10_flpr.h
new file mode 100644
index 00000000000..784cb0435a1
--- /dev/null
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54l10_flpr.h
@@ -0,0 +1,1784 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef NRFX_CONFIG_NRF54L10_FLPR_H__
+#define NRFX_CONFIG_NRF54L10_FLPR_H__
+
+#ifndef NRFX_CONFIG_H__
+#error "This file should not be included directly. Include nrfx_config.h instead."
+#endif
+
+
+/**
+ * @brief NRFX_DEFAULT_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_DEFAULT_IRQ_PRIORITY
+#define NRFX_DEFAULT_IRQ_PRIORITY 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_ENABLED
+#define NRFX_CLOCK_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LF_SRC
+ *
+ * Integer value.
+ * Supported values:
+ * - RC    = 0
+ * - XTAL  = 1
+ * - Synth = 2
+ */
+#ifndef NRFX_CLOCK_CONFIG_LF_SRC
+#define NRFX_CLOCK_CONFIG_LF_SRC 1
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
+#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
+#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
+#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
+#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_COMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COMP_ENABLED
+#define NRFX_COMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_COMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
+#define NRFX_COMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_COMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
+#define NRFX_COMP_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_COREDEP_VPR_LEGACY
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COREDEP_VPR_LEGACY
+#define NRFX_COREDEP_VPR_LEGACY 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI_ENABLED
+#define NRFX_DPPI_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
+#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
+#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_DPPI00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI00_ENABLED
+#define NRFX_DPPI00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI10_ENABLED
+#define NRFX_DPPI10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI20_ENABLED
+#define NRFX_DPPI20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI30_ENABLED
+#define NRFX_DPPI30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU_ENABLED
+#define NRFX_EGU_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_EGU10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU10_ENABLED
+#define NRFX_EGU10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU20_ENABLED
+#define NRFX_EGU20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE_ENABLED
+#define NRFX_GPIOTE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
+ *
+ * Integer value. Minimum: 0. Maximum: 15.
+ */
+#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
+#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
+#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
+#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_GPIOTE20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE20_ENABLED
+#define NRFX_GPIOTE20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE30_ENABLED
+#define NRFX_GPIOTE30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_ENABLED
+#define NRFX_GRTC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 1
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
+ *
+ * Integer value.
+ */
+#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
+#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 4
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
+ */
+#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
+#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x000000f0
+#endif
+
+/**
+ * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
+#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
+#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_I2S_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S_ENABLED
+#define NRFX_I2S_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_I2S_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
+#define NRFX_I2S_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_I2S_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
+#define NRFX_I2S_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_I2S20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S20_ENABLED
+#define NRFX_I2S20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_LPCOMP_ENABLED
+#define NRFX_LPCOMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
+#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
+#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_NFCT_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_NFCT_ENABLED
+#define NRFX_NFCT_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
+ *
+ * Integer value. Minimum: 0. Maximum: 5.
+ */
+#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
+#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
+#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
+#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PDM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM_ENABLED
+#define NRFX_PDM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PDM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
+#define NRFX_PDM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
+#define NRFX_PDM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PDM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM20_ENABLED
+#define NRFX_PDM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PDM21_ENABLED
+#define NRFX_PDM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_POWER_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_POWER_ENABLED
+#define NRFX_POWER_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PPIB_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB_ENABLED
+#define NRFX_PPIB_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB_CONFIG_LOG_ENABLED
+#define NRFX_PPIB_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PPIB_CONFIG_LOG_LEVEL
+#define NRFX_PPIB_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PPIB00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB00_ENABLED
+#define NRFX_PPIB00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB01_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB01_ENABLED
+#define NRFX_PPIB01_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB10_ENABLED
+#define NRFX_PPIB10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB11_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB11_ENABLED
+#define NRFX_PPIB11_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB20_ENABLED
+#define NRFX_PPIB20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB21_ENABLED
+#define NRFX_PPIB21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB22_ENABLED
+#define NRFX_PPIB22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB30_ENABLED
+#define NRFX_PPIB30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_ENABLED
+#define NRFX_PRS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
+#define NRFX_PRS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
+#define NRFX_PRS_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_0_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_0_ENABLED
+#define NRFX_PRS_BOX_0_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_1_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_1_ENABLED
+#define NRFX_PRS_BOX_1_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_2_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_2_ENABLED
+#define NRFX_PRS_BOX_2_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_3_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_3_ENABLED
+#define NRFX_PRS_BOX_3_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_4_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_4_ENABLED
+#define NRFX_PRS_BOX_4_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_5_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_5_ENABLED
+#define NRFX_PRS_BOX_5_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM_ENABLED
+#define NRFX_PWM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PWM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
+#define NRFX_PWM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
+#define NRFX_PWM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PWM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM20_ENABLED
+#define NRFX_PWM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM21_ENABLED
+#define NRFX_PWM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PWM22_ENABLED
+#define NRFX_PWM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC_ENABLED
+#define NRFX_QDEC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
+#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
+#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_QDEC20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC20_ENABLED
+#define NRFX_QDEC20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC21_ENABLED
+#define NRFX_QDEC21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RRAMC_ENABLED
+#define NRFX_RRAMC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
+#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
+#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_RTC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC_ENABLED
+#define NRFX_RTC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_RTC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
+#define NRFX_RTC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
+#define NRFX_RTC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_RTC10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC10_ENABLED
+#define NRFX_RTC10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC30_ENABLED
+#define NRFX_RTC30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SAADC_ENABLED
+#define NRFX_SAADC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
+#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
+#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_SPIM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM_ENABLED
+#define NRFX_SPIM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
+#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
+#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_SPIM00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM00_ENABLED
+#define NRFX_SPIM00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM20_ENABLED
+#define NRFX_SPIM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM21_ENABLED
+#define NRFX_SPIM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM22_ENABLED
+#define NRFX_SPIM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM30_ENABLED
+#define NRFX_SPIM30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS_ENABLED
+#define NRFX_SPIS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
+#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
+#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_SPIS00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS00_ENABLED
+#define NRFX_SPIS00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS20_ENABLED
+#define NRFX_SPIS20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS21_ENABLED
+#define NRFX_SPIS21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS22_ENABLED
+#define NRFX_SPIS22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS30_ENABLED
+#define NRFX_SPIS30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TEMP_ENABLED
+#define NRFX_TEMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
+#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
+#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TIMER_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER_ENABLED
+#define NRFX_TIMER_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
+#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
+#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TIMER00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER00_ENABLED
+#define NRFX_TIMER00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER10_ENABLED
+#define NRFX_TIMER10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER20_ENABLED
+#define NRFX_TIMER20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER21_ENABLED
+#define NRFX_TIMER21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER22_ENABLED
+#define NRFX_TIMER22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER23_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER23_ENABLED
+#define NRFX_TIMER23_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER24_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER24_ENABLED
+#define NRFX_TIMER24_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM_ENABLED
+#define NRFX_TWIM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
+#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
+#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TWIM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM20_ENABLED
+#define NRFX_TWIM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM21_ENABLED
+#define NRFX_TWIM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM22_ENABLED
+#define NRFX_TWIM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM30_ENABLED
+#define NRFX_TWIM30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_ENABLED
+#define NRFX_TWIS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
+#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
+ *        Assume that any instance would be initialized only once.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
+#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_NO_SYNC_MODE
+#define NRFX_TWIS_NO_SYNC_MODE 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
+#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_TWIS20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS20_ENABLED
+#define NRFX_TWIS20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS21_ENABLED
+#define NRFX_TWIS21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS22_ENABLED
+#define NRFX_TWIS22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS30_ENABLED
+#define NRFX_TWIS30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_ENABLED
+#define NRFX_UARTE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
+ *        If enabled, support for configuring GPIO pins is removed from the driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
+#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
+ *        If enabled, support for configuring PSEL registers is removed from the driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
+#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_TX_LINK
+#define NRFX_UARTE_CONFIG_TX_LINK 1
+#endif
+
+/**
+ * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
+#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
+#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_UARTE00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE00_ENABLED
+#define NRFX_UARTE00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE20_ENABLED
+#define NRFX_UARTE20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE21_ENABLED
+#define NRFX_UARTE21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE22_ENABLED
+#define NRFX_UARTE22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE30_ENABLED
+#define NRFX_UARTE30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_VEVIF_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_VEVIF_ENABLED
+#define NRFX_VEVIF_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_ENABLED
+#define NRFX_WDT_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_CONFIG_NO_IRQ
+#define NRFX_WDT_CONFIG_NO_IRQ 0
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
+#define NRFX_WDT_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
+#define NRFX_WDT_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_WDT30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT30_ENABLED
+#define NRFX_WDT30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT31_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT31_ENABLED
+#define NRFX_WDT31_ENABLED 0
+#endif
+
+#endif /* NRFX_CONFIG_NRF54L10_FLPR_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h
index e423c8b515d..cf49a5f4fa6 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h
@@ -136,6 +136,15 @@
 #define NRFX_COMP_CONFIG_LOG_LEVEL 3
 #endif
 
+/**
+ * @brief NRFX_DPPI_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI_ENABLED
+#define NRFX_DPPI_ENABLED 0
+#endif
+
 /**
  * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
  *
@@ -160,6 +169,42 @@
 #define NRFX_DPPI_CONFIG_LOG_LEVEL 3
 #endif
 
+/**
+ * @brief NRFX_DPPI00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI00_ENABLED
+#define NRFX_DPPI00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI10_ENABLED
+#define NRFX_DPPI10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI20_ENABLED
+#define NRFX_DPPI20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI30_ENABLED
+#define NRFX_DPPI30_ENABLED 0
+#endif
+
 /**
  * @brief NRFX_EGU_ENABLED
  *
@@ -274,22 +319,13 @@
 #define NRFX_GRTC_ENABLED 0
 #endif
 
-/**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
-#endif
-
 /**
  * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
  * Boolean. Accepted values: 0 and 1.
  */
 #ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
+#define NRFX_GRTC_CONFIG_AUTOEN 1
 #endif
 
 /**
@@ -581,6 +617,111 @@
 #define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
 #endif
 
+/**
+ * @brief NRFX_PPIB_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB_ENABLED
+#define NRFX_PPIB_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB_CONFIG_LOG_ENABLED
+#define NRFX_PPIB_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PPIB_CONFIG_LOG_LEVEL
+#define NRFX_PPIB_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PPIB00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB00_ENABLED
+#define NRFX_PPIB00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB01_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB01_ENABLED
+#define NRFX_PPIB01_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB10_ENABLED
+#define NRFX_PPIB10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB11_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB11_ENABLED
+#define NRFX_PPIB11_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB20_ENABLED
+#define NRFX_PPIB20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB21_ENABLED
+#define NRFX_PPIB21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB22_ENABLED
+#define NRFX_PPIB22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB30_ENABLED
+#define NRFX_PPIB30_ENABLED 0
+#endif
+
 /**
  * @brief NRFX_PRS_ENABLED
  *
@@ -1484,15 +1625,6 @@
 #define NRFX_UARTE_CONFIG_TX_LINK 1
 #endif
 
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
 /**
  * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
  *
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h
index a036f8c0a26..4d506938337 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h
@@ -145,6 +145,15 @@
 #define NRFX_COREDEP_VPR_LEGACY 0
 #endif
 
+/**
+ * @brief NRFX_DPPI_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI_ENABLED
+#define NRFX_DPPI_ENABLED 0
+#endif
+
 /**
  * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
  *
@@ -169,6 +178,42 @@
 #define NRFX_DPPI_CONFIG_LOG_LEVEL 3
 #endif
 
+/**
+ * @brief NRFX_DPPI00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI00_ENABLED
+#define NRFX_DPPI00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI10_ENABLED
+#define NRFX_DPPI10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI20_ENABLED
+#define NRFX_DPPI20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI30_ENABLED
+#define NRFX_DPPI30_ENABLED 0
+#endif
+
 /**
  * @brief NRFX_EGU_ENABLED
  *
@@ -283,22 +328,13 @@
 #define NRFX_GRTC_ENABLED 0
 #endif
 
-/**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
-#endif
-
 /**
  * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
  * Boolean. Accepted values: 0 and 1.
  */
 #ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
+#define NRFX_GRTC_CONFIG_AUTOEN 1
 #endif
 
 /**
@@ -307,7 +343,7 @@
  * Boolean. Accepted values: 0 and 1.
  */
 #ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 1
+#define NRFX_GRTC_CONFIG_AUTOSTART 0
 #endif
 
 /**
@@ -590,6 +626,111 @@
 #define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
 #endif
 
+/**
+ * @brief NRFX_PPIB_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB_ENABLED
+#define NRFX_PPIB_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB_CONFIG_LOG_ENABLED
+#define NRFX_PPIB_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PPIB_CONFIG_LOG_LEVEL
+#define NRFX_PPIB_CONFIG_LOG_LEVEL 3
+#endif
+
+/**
+ * @brief NRFX_PPIB00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB00_ENABLED
+#define NRFX_PPIB00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB01_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB01_ENABLED
+#define NRFX_PPIB01_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB10_ENABLED
+#define NRFX_PPIB10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB11_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB11_ENABLED
+#define NRFX_PPIB11_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB20_ENABLED
+#define NRFX_PPIB20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB21_ENABLED
+#define NRFX_PPIB21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB22_ENABLED
+#define NRFX_PPIB22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PPIB30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PPIB30_ENABLED
+#define NRFX_PPIB30_ENABLED 0
+#endif
+
 /**
  * @brief NRFX_PRS_ENABLED
  *
@@ -1484,15 +1625,6 @@
 #define NRFX_UARTE_CONFIG_TX_LINK 1
 #endif
 
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
 /**
  * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
  *
diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index 45a597de15e..c4cd8e6aa0f 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -21,15 +21,27 @@ config SOC_NRF54L_CPUAPP_COMMON
 	select HAS_HW_NRF_RADIO_IEEE802154
 	select HAS_POWEROFF
 
-config SOC_NRF54L15_CPUAPP
+config SOC_NRF54L05_CPUAPP
 	select SOC_NRF54L_CPUAPP_COMMON
 
-config SOC_NRF54L20_ENGA_CPUAPP
+config SOC_NRF54L10_CPUAPP
+	select SOC_NRF54L_CPUAPP_COMMON
+
+config SOC_NRF54L15_CPUAPP
 	select SOC_NRF54L_CPUAPP_COMMON
 
+config SOC_NRF54L05_CPUFLPR
+	depends on RISCV_CORE_NORDIC_VPR
+
+config SOC_NRF54L10_CPUFLPR
+	depends on RISCV_CORE_NORDIC_VPR
+
 config SOC_NRF54L15_CPUFLPR
 	depends on RISCV_CORE_NORDIC_VPR
 
+config SOC_NRF54L20_ENGA_CPUAPP
+	select SOC_NRF54L_CPUAPP_COMMON
+
 if SOC_SERIES_NRF54LX
 
 config SOC_NRF54LX_SKIP_CLOCK_CONFIG
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuapp b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuapp
deleted file mode 100644
index 9c8e0b4e34b..00000000000
--- a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuapp
+++ /dev/null
@@ -1,11 +0,0 @@
-# Nordic Semiconductor nRF54L15 MCU
-
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_NRF54L15_CPUAPP
-
-config NUM_IRQS
-	default 271
-
-endif # SOC_NRF54L15_CPUAPP
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l_05_10_15_cpuapp b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l_05_10_15_cpuapp
new file mode 100644
index 00000000000..ecc2e6124da
--- /dev/null
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l_05_10_15_cpuapp
@@ -0,0 +1,11 @@
+# Nordic Semiconductor nRF54 L05, L10 and L15 MCUs
+
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_NRF54L05_CPUAPP || SOC_NRF54L10_CPUAPP || SOC_NRF54L15_CPUAPP
+
+config NUM_IRQS
+	default 271
+
+endif # SOC_NRF54L05_CPUAPP || SOC_NRF54L10_CPUAPP || SOC_NRF54L15_CPUAPP
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuflpr b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l_05_10_15_cpuflpr
similarity index 52%
rename from soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuflpr
rename to soc/nordic/nrf54l/Kconfig.defconfig.nrf54l_05_10_15_cpuflpr
index 7c653d14b93..76af5524728 100644
--- a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuflpr
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l_05_10_15_cpuflpr
@@ -1,9 +1,9 @@
-# Nordic Semiconductor nRF54L15 MCU
+# Nordic Semiconductor nRF54 L05, L10 and L15 MCUs
 
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NRF54L15_CPUFLPR
+if SOC_NRF54L05_CPUFLPR || SOC_NRF54L10_CPUFLPR || SOC_NRF54L15_CPUFLPR
 
 config NUM_IRQS
 	default 287
@@ -12,4 +12,4 @@ config NUM_IRQS
 config ASSERT
 	default n
 
-endif # SOC_NRF54L15_CPUFLPR
+endif # SOC_NRF54L05_CPUFLPR || SOC_NRF54L10_CPUFLPR || SOC_NRF54L15_CPUFLPR
diff --git a/soc/nordic/nrf54l/Kconfig.soc b/soc/nordic/nrf54l/Kconfig.soc
index 25deae9fade..f7c5adf6924 100644
--- a/soc/nordic/nrf54l/Kconfig.soc
+++ b/soc/nordic/nrf54l/Kconfig.soc
@@ -3,6 +3,42 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
+config SOC_NRF54L05
+	bool
+	select SOC_SERIES_NRF54LX
+	help
+	  NRF54L05
+
+config SOC_NRF54L05_CPUAPP
+	bool
+	select SOC_NRF54L05
+	help
+	  NRF54L05 CPUAPP
+
+config SOC_NRF54L05_CPUFLPR
+	bool
+	select SOC_NRF54L05
+	help
+	  NRF54L05 CPUFLPR
+
+config SOC_NRF54L10
+	bool
+	select SOC_SERIES_NRF54LX
+	help
+	  NRF54L10
+
+config SOC_NRF54L10_CPUAPP
+	bool
+	select SOC_NRF54L10
+	help
+	  NRF54L10 CPUAPP
+
+config SOC_NRF54L10_CPUFLPR
+	bool
+	select SOC_NRF54L10
+	help
+	  NRF54L10 CPUFLPR
+
 config SOC_NRF54L15
 	bool
 	select SOC_SERIES_NRF54LX
@@ -40,5 +76,7 @@ config SOC_NRF54L20_ENGA_CPUAPP
 	  NRF54L20 ENGA CPUAPP
 
 config SOC
+	default "nrf54l05" if SOC_NRF54L05
+	default "nrf54l10" if SOC_NRF54L10
 	default "nrf54l15" if SOC_NRF54L15
 	default "nrf54l20" if SOC_NRF54L20
diff --git a/soc/nordic/soc.yml b/soc/nordic/soc.yml
index 9879f82f61a..ee79c7ee868 100644
--- a/soc/nordic/soc.yml
+++ b/soc/nordic/soc.yml
@@ -21,6 +21,14 @@ family:
               - name: cpunet
       - name: nrf54l
         socs:
+          - name: nrf54l05
+            cpuclusters:
+              - name: cpuapp
+              - name: cpuflpr
+          - name: nrf54l10
+            cpuclusters:
+              - name: cpuapp
+              - name: cpuflpr
           - name: nrf54l15
             cpuclusters:
               - name: cpuapp
@@ -94,6 +102,12 @@ runners:
           - qualifiers:
               - nrf9161
               - nrf9161/ns
+          - qualifiers:
+              - nrf54l05/cpuapp
+              - nrf54l05/cpuflpr
+          - qualifiers:
+              - nrf54l10/cpuapp
+              - nrf54l10/cpuflpr
           - qualifiers:
               - nrf54l15/cpuapp
               - nrf54l15/cpuflpr
@@ -148,6 +162,12 @@ runners:
           - qualifiers:
               - nrf9161
               - nrf9161/ns
+          - qualifiers:
+              - nrf54l05/cpuapp
+              - nrf54l05/cpuflpr
+          - qualifiers:
+              - nrf54l10/cpuapp
+              - nrf54l10/cpuflpr
           - qualifiers:
               - nrf54l15/cpuapp
               - nrf54l15/cpuflpr
@@ -202,6 +222,12 @@ runners:
           - qualifiers:
               - nrf9161
               - nrf9161/ns
+          - qualifiers:
+              - nrf54l05/cpuapp
+              - nrf54l05/cpuflpr
+          - qualifiers:
+              - nrf54l10/cpuapp
+              - nrf54l10/cpuflpr
           - qualifiers:
               - nrf54l15/cpuapp
               - nrf54l15/cpuflpr
diff --git a/soc/nordic/validate_base_addresses.c b/soc/nordic/validate_base_addresses.c
index 07ae94a233b..f47c3dc456e 100644
--- a/soc/nordic/validate_base_addresses.c
+++ b/soc/nordic/validate_base_addresses.c
@@ -338,7 +338,7 @@ CHECK_DT_REG(usbreg, NRF_USBREGULATOR);
 CHECK_DT_REG(vmc, NRF_VMC);
 CHECK_DT_REG(cpuflpr_clic, NRF_FLPR_VPRCLIC);
 CHECK_DT_REG(cpuppr_clic, NRF_PPR_VPRCLIC);
-#if defined(CONFIG_SOC_NRF54L15)
+#if defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || defined(CONFIG_SOC_NRF54L15)
 CHECK_DT_REG(cpuflpr_vpr, NRF_VPR00);
 #elif defined(CONFIG_NRF_PLATFORM_HALTIUM)
 CHECK_DT_REG(cpuflpr_vpr, NRF_VPR121);
diff --git a/tests/drivers/flash/negative_tests/src/main.c b/tests/drivers/flash/negative_tests/src/main.c
index 2c4eac7c6a8..f4d5751ba20 100644
--- a/tests/drivers/flash/negative_tests/src/main.c
+++ b/tests/drivers/flash/negative_tests/src/main.c
@@ -26,7 +26,7 @@
 #define TEST_AREA_SIZE   FIXED_PARTITION_SIZE(TEST_AREA)
 #define TEST_AREA_DEVICE FIXED_PARTITION_DEVICE(TEST_AREA)
 
-#if defined(CONFIG_SOC_NRF54L15)
+#if defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || defined(CONFIG_SOC_NRF54L15)
 #define TEST_FLASH_START (DT_REG_ADDR(DT_MEM_FROM_FIXED_PARTITION(DT_NODELABEL(TEST_AREA))))
 #define TEST_FLASH_SIZE  (DT_REG_SIZE(DT_MEM_FROM_FIXED_PARTITION(DT_NODELABEL(TEST_AREA))))
 #elif defined(CONFIG_SOC_NRF54H20)
diff --git a/tests/drivers/mbox/mbox_error_cases/src/main.c b/tests/drivers/mbox/mbox_error_cases/src/main.c
index 555a89e2883..54a4a628ec2 100644
--- a/tests/drivers/mbox/mbox_error_cases/src/main.c
+++ b/tests/drivers/mbox/mbox_error_cases/src/main.c
@@ -10,7 +10,8 @@
 
 int dummy_value;
 
-#if defined(CONFIG_SOC_NRF54L15) || defined(CONFIG_SOC_NRF54H20)
+#if defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || \
+	defined(CONFIG_SOC_NRF54L15) || defined(CONFIG_SOC_NRF54H20)
 #define EXPECTED_MTU_VALUE				(0)
 #define DATA_TRANSFER_MODE_SUPPORTED	(0)
 #define REMOTE_BUSY_SUPPORTED			(0)
diff --git a/tests/drivers/watchdog/wdt_error_cases/src/main.c b/tests/drivers/watchdog/wdt_error_cases/src/main.c
index b05bedf01c3..3182cdebd03 100644
--- a/tests/drivers/watchdog/wdt_error_cases/src/main.c
+++ b/tests/drivers/watchdog/wdt_error_cases/src/main.c
@@ -42,7 +42,8 @@
 #define DEFAULT_WINDOW_MIN (0U)
 
 /* Align tests to the specific target: */
-#if defined(CONFIG_SOC_NRF54L15) || defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280)
+#if defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || \
+	defined(CONFIG_SOC_NRF54L15) || defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280)
 #define WDT_TEST_FLAGS                                                                             \
 	(WDT_DISABLE_SUPPORTED | WDT_FLAG_RESET_SOC_SUPPORTED |                                    \
 	 WDT_FLAG_ONLY_ONE_TIMEOUT_VALUE_SUPPORTED | WDT_OPT_PAUSE_IN_SLEEP_SUPPORTED |            \
diff --git a/tests/kernel/interrupt/src/nested_irq.c b/tests/kernel/interrupt/src/nested_irq.c
index 6d84dda2ef8..d488be5b426 100644
--- a/tests/kernel/interrupt/src/nested_irq.c
+++ b/tests/kernel/interrupt/src/nested_irq.c
@@ -56,7 +56,7 @@
  */
 #define IRQ0_PRIO	IRQ_DEFAULT_PRIORITY
 #define IRQ1_PRIO	0x0
-#elif defined(CONFIG_SOC_NRF54L15_CPUFLPR)
+#elif defined(CONFIG_SOC_SERIES_NRF54LX) && defined(CONFIG_RISCV_CORE_NORDIC_VPR)
 #define IRQ0_LINE	16
 #define IRQ1_LINE	17
 

From a838f5afd7f6e14e90458203e0c9958b79d1b258 Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Wed, 6 Nov 2024 18:04:56 +0100
Subject: [PATCH 0728/2913] [nrf fromtree] boards: nordic: nrf54l15dk: Rename
 the board common file

Use the rather logical convention for the name that is applied to other
Nordic boards: <board>_common.dtsi for definitions that are common to
the board itself (LEDs, buttons, etc).

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit 1b84958f5a99de356b2938e9628f086fab1c0fce)
(cherry picked from commit af5e195c71636bf0c94e1ef0f8a6ba7deeabdc77)
---
 boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi            | 2 +-
 .../{nrf54l15dk_nrf54l15-common.dtsi => nrf54l15dk_common.dtsi} | 0
 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts        | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename boards/nordic/nrf54l15dk/{nrf54l15dk_nrf54l15-common.dtsi => nrf54l15dk_common.dtsi} (100%)

diff --git a/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi b/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi
index 191babb632f..f8714861936 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi
@@ -7,7 +7,7 @@
 /* This file is common to the secure and non-secure domain */
 
 #include <nordic/nrf54l15_cpuapp.dtsi>
-#include "nrf54l15dk_nrf54l15-common.dtsi"
+#include "nrf54l15dk_common.dtsi"
 
 / {
 	chosen {
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15-common.dtsi b/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi
similarity index 100%
rename from boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15-common.dtsi
rename to boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts
index 472e3f2b8d3..2bc4ba292be 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts
@@ -6,7 +6,7 @@
 
 /dts-v1/;
 #include <nordic/nrf54l15_cpuflpr.dtsi>
-#include "nrf54l15dk_nrf54l15-common.dtsi"
+#include "nrf54l15dk_common.dtsi"
 
 / {
 	model = "Nordic nRF54L15 DK nRF54L15 FLPR MCU";

From 2b2f0b6754af50b3d2231504d2625a0d4c7cf1bd Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Wed, 6 Nov 2024 18:42:45 +0100
Subject: [PATCH 0729/2913] [nrf fromtree] boards: nordic: nRF54L15DK: Add
 basic support for the L05 and L10 ICs

The nRF54L05 and nRF54L10 are identical to the nRF54L15 except for their
memory sizes. Add support for emulating those ICs on the nRF54L15DK.
This commit only adds support for the main application core. Support for
the FLPR core may be added later.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit 21475774fc412fed7273408de65ee69bcdd1b84e)
(cherry picked from commit 270c1e94a7f6cf876f644169ac499731025aee8c)
---
 boards/nordic/nrf54l15dk/Kconfig.defconfig    |  6 +-
 boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk   |  2 +
 boards/nordic/nrf54l15dk/board.cmake          |  6 +-
 boards/nordic/nrf54l15dk/board.yml            |  2 +
 .../nordic/nrf54l15dk/nrf54l15dk_common.dtsi  |  2 +-
 .../nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts | 63 +++++++++++++++++++
 .../nrf54l15dk_nrf54l05_cpuapp.yaml           | 24 +++++++
 .../nrf54l15dk_nrf54l05_cpuapp_defconfig      | 29 +++++++++
 .../nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts | 63 +++++++++++++++++++
 .../nrf54l15dk_nrf54l10_cpuapp.yaml           | 24 +++++++
 .../nrf54l15dk_nrf54l10_cpuapp_defconfig      | 29 +++++++++
 .../nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts | 36 ++++++++++-
 ...> nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi} |  0
 ...tsi => nrf54l_05_10_15_cpuapp_common.dtsi} | 34 ----------
 .../boards/nrf54l15dk_nrf54l05_cpuapp.overlay |  8 +++
 .../boards/nrf54l15dk_nrf54l10_cpuapp.overlay |  8 +++
 .../boards/nrf54l15dk_nrf54l05_cpuapp.overlay | 43 +++++++++++++
 .../boards/nrf54l15dk_nrf54l10_cpuapp.overlay | 43 +++++++++++++
 .../boards/nrf54l15dk_nrf54l05_cpuapp.overlay |  9 +++
 .../boards/nrf54l15dk_nrf54l10_cpuapp.overlay |  9 +++
 tests/lib/cpp/cxx/testcase.yaml               |  4 +-
 21 files changed, 403 insertions(+), 41 deletions(-)
 create mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts
 create mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.yaml
 create mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp_defconfig
 create mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts
 create mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.yaml
 create mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_defconfig
 rename boards/nordic/nrf54l15dk/{nrf54l15dk_nrf54l15-pinctrl.dtsi => nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi} (100%)
 rename boards/nordic/nrf54l15dk/{nrf54l15_cpuapp_common.dtsi => nrf54l_05_10_15_cpuapp_common.dtsi} (70%)
 create mode 100644 samples/drivers/watchdog/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
 create mode 100644 samples/drivers/watchdog/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
 create mode 100644 tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
 create mode 100644 tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
 create mode 100644 tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
 create mode 100644 tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay

diff --git a/boards/nordic/nrf54l15dk/Kconfig.defconfig b/boards/nordic/nrf54l15dk/Kconfig.defconfig
index 06a426bd8ed..d2d686fd576 100644
--- a/boards/nordic/nrf54l15dk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l15dk/Kconfig.defconfig
@@ -1,7 +1,8 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_NRF54L15DK_NRF54L15_CPUAPP
+if BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
+	BOARD_NRF54L15DK_NRF54L15_CPUAPP
 
 config BT_CTLR
 	default BT
@@ -10,4 +11,5 @@ config ROM_START_OFFSET
 	default 0 if PARTITION_MANAGER_ENABLED
 	default 0x800 if BOOTLOADER_MCUBOOT
 
-endif # BOARD_NRF54L15DK_NRF54L15_CPUAPP
+endif # BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
+	# BOARD_NRF54L15DK_NRF54L15_CPUAPP
diff --git a/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk b/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk
index e385ef84f89..25472cfff6c 100644
--- a/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk
+++ b/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk
@@ -2,6 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF54L15DK
+	select SOC_NRF54L05_CPUAPP if BOARD_NRF54L15DK_NRF54L05_CPUAPP
+	select SOC_NRF54L10_CPUAPP if BOARD_NRF54L15DK_NRF54L10_CPUAPP
 	select SOC_NRF54L15_CPUAPP if BOARD_NRF54L15DK_NRF54L15_CPUAPP
 	select SOC_NRF54L15_CPUFLPR if BOARD_NRF54L15DK_NRF54L15_CPUFLPR || \
 					    BOARD_NRF54L15DK_NRF54L15_CPUFLPR_XIP
diff --git a/boards/nordic/nrf54l15dk/board.cmake b/boards/nordic/nrf54l15dk/board.cmake
index 1fd92b7fced..c69f8460c0a 100644
--- a/boards/nordic/nrf54l15dk/board.cmake
+++ b/boards/nordic/nrf54l15dk/board.cmake
@@ -1,9 +1,11 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_SOC_NRF54L15_CPUAPP)
+if(CONFIG_SOC_NRF54L05_CPUAPP OR CONFIG_SOC_NRF54L10_CPUAPP OR
+		CONFIG_SOC_NRF54L15_CPUAPP)
   board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
-elseif(CONFIG_SOC_NRF54L15_CPUFLPR)
+elseif(CONFIG_SOC_NRF54L05_CPUFLPR OR CONFIG_SOC_NRF54L10_CPUFLPR OR
+		CONFIG_SOC_NRF54L15_CPUFLPR)
   board_runner_args(jlink "--speed=4000")
 endif()
 
diff --git a/boards/nordic/nrf54l15dk/board.yml b/boards/nordic/nrf54l15dk/board.yml
index 8d750b3d14b..f1a873cc35f 100644
--- a/boards/nordic/nrf54l15dk/board.yml
+++ b/boards/nordic/nrf54l15dk/board.yml
@@ -3,6 +3,8 @@ board:
   full_name: nRF54L15 DK
   vendor: nordic
   socs:
+  - name: nrf54l05
+  - name: nrf54l10
   - name: nrf54l15
     variants:
     - name: xip
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi b/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi
index 02170276476..33cfebb55d6 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "nrf54l15dk_nrf54l15-pinctrl.dtsi"
+#include "nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi"
 
 / {
 	leds {
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts
new file mode 100644
index 00000000000..e2215ce1294
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <nordic/nrf54l05_cpuapp.dtsi>
+#include "nrf54l_05_10_15_cpuapp_common.dtsi"
+
+/ {
+	compatible = "nordic,nrf54l15dk_nrf54l05-cpuapp";
+	model = "Nordic nRF54L15 DK nRF54L05 Application MCU";
+
+	chosen {
+		zephyr,code-partition = &slot0_partition;
+		zephyr,sram = &cpuapp_sram;
+	};
+};
+
+/* FLPR not supported yet, give all SRAM and RRAM to the APP core */
+&cpuapp_sram {
+	reg = <0x20000000 DT_SIZE_K(96)>;
+	ranges = <0x0 0x20000000 DT_SIZE_K(96)>;
+};
+
+&cpuapp_rram {
+	reg = <0x0 DT_SIZE_K(500)>;
+};
+
+/* These partition sizes assume no FLPR area in RRAM */
+&cpuapp_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x0 DT_SIZE_K(64)>;
+		};
+		slot0_partition: partition@10000 {
+			label = "image-0";
+			reg = <0x10000 DT_SIZE_K(100)>;
+		};
+		slot0_ns_partition: partition@29000 {
+			label = "image-0-nonsecure";
+			reg = <0x29000 DT_SIZE_K(100)>;
+		};
+		slot1_partition: partition@42000 {
+			label = "image-1";
+			reg = <0x42000 DT_SIZE_K(100)>;
+		};
+		slot1_ns_partition: partition@5b000 {
+			label = "image-1-nonsecure";
+			reg = <0x5b000 DT_SIZE_K(100)>;
+		};
+		storage_partition: partition@74000 {
+			label = "storage";
+			reg = <0x74000 DT_SIZE_K(36)>;
+		};
+	};
+};
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.yaml b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.yaml
new file mode 100644
index 00000000000..0c451b19a2e
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.yaml
@@ -0,0 +1,24 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54l15dk/nrf54l05/cpuapp
+name: nRF54L15-DK-nRF54L05-Application
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+sysbuild: true
+ram: 96
+flash: 100
+supported:
+  - adc
+  - counter
+  - gpio
+  - i2c
+  - pwm
+  - retained_mem
+  - spi
+  - watchdog
+  - i2s
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp_defconfig
new file mode 100644
index 00000000000..02796a1361e
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp_defconfig
@@ -0,0 +1,29 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# MPU-based null-pointer dereferencing detection cannot
+# be applied as the (0x0 - 0x400) is unmapped for this target.
+CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
+
+# Enable Cache
+CONFIG_CACHE_MANAGEMENT=y
+CONFIG_EXTERNAL_CACHE=y
+
+# Start SYSCOUNTER on driver init
+CONFIG_NRF_GRTC_START_SYSCOUNTER=y
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts
new file mode 100644
index 00000000000..1ae6be3e9e9
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <nordic/nrf54l10_cpuapp.dtsi>
+#include "nrf54l_05_10_15_cpuapp_common.dtsi"
+
+/ {
+	compatible = "nordic,nrf54l15dk_nrf54l10-cpuapp";
+	model = "Nordic nRF54L15 DK nRF54L10 Application MCU";
+
+	chosen {
+		zephyr,code-partition = &slot0_partition;
+		zephyr,sram = &cpuapp_sram;
+	};
+};
+
+/* FLPR not supported yet, give all SRAM and RRAM to the APP core */
+&cpuapp_sram {
+	reg = <0x20000000 DT_SIZE_K(192)>;
+	ranges = <0x0 0x20000000 DT_SIZE_K(192)>;
+};
+
+&cpuapp_rram {
+	reg = <0x0 DT_SIZE_K(1022)>;
+};
+
+/* These partition sizes assume no FLPR area in RRAM */
+&cpuapp_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x0 DT_SIZE_K(64)>;
+		};
+		slot0_partition: partition@10000 {
+			label = "image-0";
+			reg = <0x10000 DT_SIZE_K(230)>;
+		};
+		slot0_ns_partition: partition@49800 {
+			label = "image-0-nonsecure";
+			reg = <0x49800 DT_SIZE_K(230)>;
+		};
+		slot1_partition: partition@83000 {
+			label = "image-1";
+			reg = <0x83000 DT_SIZE_K(230)>;
+		};
+		slot1_ns_partition: partition@bc800 {
+			label = "image-1-nonsecure";
+			reg = <0xbc800 DT_SIZE_K(230)>;
+		};
+		storage_partition: partition@f6000 {
+			label = "storage";
+			reg = <0xf6000 DT_SIZE_K(38)>;
+		};
+	};
+};
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.yaml b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.yaml
new file mode 100644
index 00000000000..63afb059b93
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.yaml
@@ -0,0 +1,24 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54l15dk/nrf54l10/cpuapp
+name: nRF54L15-DK-nRF54L10-Application
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+sysbuild: true
+ram: 192
+flash: 230
+supported:
+  - adc
+  - counter
+  - gpio
+  - i2c
+  - pwm
+  - retained_mem
+  - spi
+  - watchdog
+  - i2s
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_defconfig
new file mode 100644
index 00000000000..02796a1361e
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_defconfig
@@ -0,0 +1,29 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# MPU-based null-pointer dereferencing detection cannot
+# be applied as the (0x0 - 0x400) is unmapped for this target.
+CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
+
+# Enable Cache
+CONFIG_CACHE_MANAGEMENT=y
+CONFIG_EXTERNAL_CACHE=y
+
+# Start SYSCOUNTER on driver init
+CONFIG_NRF_GRTC_START_SYSCOUNTER=y
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts
index b71f55c5fb4..79b16bd4125 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts
@@ -6,7 +6,8 @@
 
 /dts-v1/;
 
-#include "nrf54l15_cpuapp_common.dtsi"
+#include <nordic/nrf54l15_cpuapp.dtsi>
+#include "nrf54l_05_10_15_cpuapp_common.dtsi"
 
 / {
 	compatible = "nordic,nrf54l15dk_nrf54l15-cpuapp";
@@ -17,3 +18,36 @@
 		zephyr,sram = &cpuapp_sram;
 	};
 };
+
+&cpuapp_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x0 DT_SIZE_K(64)>;
+		};
+		slot0_partition: partition@10000 {
+			label = "image-0";
+			reg = <0x10000 DT_SIZE_K(324)>;
+		};
+		slot0_ns_partition: partition@61000 {
+			label = "image-0-nonsecure";
+			reg = <0x61000 DT_SIZE_K(324)>;
+		};
+		slot1_partition: partition@b2000 {
+			label = "image-1";
+			reg = <0xb2000 DT_SIZE_K(324)>;
+		};
+		slot1_ns_partition: partition@103000 {
+			label = "image-1-nonsecure";
+			reg = <0x103000 DT_SIZE_K(324)>;
+		};
+		/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
+		storage_partition: partition@15c000 {
+			label = "storage";
+			reg = <0x15c000 DT_SIZE_K(36)>;
+		};
+	};
+};
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15-pinctrl.dtsi b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi
similarity index 100%
rename from boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15-pinctrl.dtsi
rename to boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi
diff --git a/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi b/boards/nordic/nrf54l15dk/nrf54l_05_10_15_cpuapp_common.dtsi
similarity index 70%
rename from boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi
rename to boards/nordic/nrf54l15dk/nrf54l_05_10_15_cpuapp_common.dtsi
index f8714861936..323ebfd1a1b 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l15dk/nrf54l_05_10_15_cpuapp_common.dtsi
@@ -6,7 +6,6 @@
 
 /* This file is common to the secure and non-secure domain */
 
-#include <nordic/nrf54l15_cpuapp.dtsi>
 #include "nrf54l15dk_common.dtsi"
 
 / {
@@ -52,39 +51,6 @@
 	status = "okay";
 };
 
-&cpuapp_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-		boot_partition: partition@0 {
-			label = "mcuboot";
-			reg = <0x0 DT_SIZE_K(64)>;
-		};
-		slot0_partition: partition@10000 {
-			label = "image-0";
-			reg = <0x10000 DT_SIZE_K(324)>;
-		};
-		slot0_ns_partition: partition@61000 {
-			label = "image-0-nonsecure";
-			reg = <0x61000 DT_SIZE_K(324)>;
-		};
-		slot1_partition: partition@b2000 {
-			label = "image-1";
-			reg = <0xb2000 DT_SIZE_K(324)>;
-		};
-		slot1_ns_partition: partition@103000 {
-			label = "image-1-nonsecure";
-			reg = <0x103000 DT_SIZE_K(324)>;
-		};
-		/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
-		storage_partition: partition@15c000 {
-			label = "storage";
-			reg = <0x15c000 DT_SIZE_K(36)>;
-		};
-	};
-};
-
 &uart20 {
 	status = "okay";
 };
diff --git a/samples/drivers/watchdog/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/samples/drivers/watchdog/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
new file mode 100644
index 00000000000..5c765a8a896
--- /dev/null
+++ b/samples/drivers/watchdog/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/samples/drivers/watchdog/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/samples/drivers/watchdog/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
new file mode 100644
index 00000000000..5c765a8a896
--- /dev/null
+++ b/samples/drivers/watchdog/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
new file mode 100644
index 00000000000..87707847eea
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
@@ -0,0 +1,43 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc 0>, <&adc 1> , <&adc 2>;
+	};
+};
+
+&adc {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
+		zephyr,input-positive = <NRF_SAADC_AIN1>;
+		zephyr,resolution = <10>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1_4";
+		zephyr,reference = "ADC_REF_EXTERNAL0";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN4>;
+		zephyr,resolution = <12>;
+	};
+
+	channel@2 {
+		reg = <2>;
+		zephyr,gain = "ADC_GAIN_2_3";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
+		zephyr,input-positive = <NRF_SAADC_AIN2>;
+		zephyr,resolution = <10>;
+	};
+};
diff --git a/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
new file mode 100644
index 00000000000..87707847eea
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
@@ -0,0 +1,43 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc 0>, <&adc 1> , <&adc 2>;
+	};
+};
+
+&adc {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
+		zephyr,input-positive = <NRF_SAADC_AIN1>;
+		zephyr,resolution = <10>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1_4";
+		zephyr,reference = "ADC_REF_EXTERNAL0";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN4>;
+		zephyr,resolution = <12>;
+	};
+
+	channel@2 {
+		reg = <2>;
+		zephyr,gain = "ADC_GAIN_2_3";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
+		zephyr,input-positive = <NRF_SAADC_AIN2>;
+		zephyr,resolution = <10>;
+	};
+};
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
new file mode 100644
index 00000000000..8d3dce3b380
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
new file mode 100644
index 00000000000..8d3dce3b380
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/lib/cpp/cxx/testcase.yaml b/tests/lib/cpp/cxx/testcase.yaml
index bd14285146d..ef9cdf156cf 100644
--- a/tests/lib/cpp/cxx/testcase.yaml
+++ b/tests/lib/cpp/cxx/testcase.yaml
@@ -34,9 +34,11 @@ tests:
   # -std=c++98)
   cpp.main.cpp98:
     arch_exclude: posix
-    # Exclude nRF54L15, nRF54H20 and nRF9280 as Nordic HAL is not compatible with C++98.
+    # Exclude nRF54L series, nRF54H20 and nRF9280 as Nordic HAL is not compatible with C++98.
     # Exclude CONFIG_HAS_RENESAS_RA_FSP as Renesas RA HAL is not compatible with C++98.
     platform_exclude:
+      - nrf54l15dk/nrf54l05/cpuapp
+      - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp

From d651a29606395d80abe754ddbd12d73157f6c675 Mon Sep 17 00:00:00 2001
From: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Date: Fri, 27 Sep 2024 14:03:14 +0300
Subject: [PATCH 0730/2913] [nrf noup] boards: Add non-secure target for
 nrf54L15dk

This adds the nrf54l15dk/nrf54l15/cpuapp/ns board variant to
sdk-zephyr. It allows to build nRF54l15dk with TF-M in nRF Connect SDK.

This is done as a noup as the out-of-tree board extension feature is
not available. When zephyrproject-rtos/zephyr#69548 is completed this
commit can be reverted and the variant be placed in sdk-nrf.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
(cherry picked from commit 6b4c8404d24374b63546044c2e5752678ede1441)
(cherry picked from commit 6b48f846061032b4eda089ed5b9bab40eb12338d)
---
 boards/nordic/nrf54l15dk/Kconfig              | 34 ++++++++++
 boards/nordic/nrf54l15dk/Kconfig.defconfig    | 18 +++++
 boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk   |  2 +-
 boards/nordic/nrf54l15dk/board.cmake          |  8 +++
 boards/nordic/nrf54l15dk/board.yml            |  2 +
 .../nrf54l15dk_nrf54l15_cpuapp_ns.dts         | 65 +++++++++++++++++++
 .../nrf54l15dk_nrf54l15_cpuapp_ns.yaml        | 22 +++++++
 .../nrf54l15dk_nrf54l15_cpuapp_ns_defconfig   | 31 +++++++++
 8 files changed, 181 insertions(+), 1 deletion(-)
 create mode 100644 boards/nordic/nrf54l15dk/Kconfig
 create mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts
 create mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml
 create mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig

diff --git a/boards/nordic/nrf54l15dk/Kconfig b/boards/nordic/nrf54l15dk/Kconfig
new file mode 100644
index 00000000000..c8890bc4498
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/Kconfig
@@ -0,0 +1,34 @@
+# nRF54L15 DK board configuration
+
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
+
+config NRF_MPC_REGION_SIZE
+	hex
+	default 0x1000
+	help
+	  Region size for the Memory Protection Controller (MPC) in bytes.
+
+config NRF_TRUSTZONE_FLASH_REGION_SIZE
+	hex
+	default NRF_MPC_REGION_SIZE
+	help
+	  This defines the flash region size from the TRUSTZONE perspective.
+	  It is used when configuring the TRUSTZONE and when setting alignments
+	  requirements for the partitions.
+	  This abstraction allows us to configure TRUSTZONE without depending
+	  on peripheral specific symbols.
+
+config NRF_TRUSTZONE_RAM_REGION_SIZE
+	hex
+	default NRF_MPC_REGION_SIZE
+	help
+	  This defines the RAM region size from the TRUSTZONE perspective.
+	  It is used when configuring the TRUSTZONE and when setting alignments
+	  requirements for the partitions.
+	  This abstraction allows us to configure TRUSTZONE without depending
+	  on peripheral specific symbols.
+
+endif #BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
diff --git a/boards/nordic/nrf54l15dk/Kconfig.defconfig b/boards/nordic/nrf54l15dk/Kconfig.defconfig
index d2d686fd576..bffc4ac3c86 100644
--- a/boards/nordic/nrf54l15dk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l15dk/Kconfig.defconfig
@@ -13,3 +13,21 @@ config ROM_START_OFFSET
 
 endif # BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
 	# BOARD_NRF54L15DK_NRF54L15_CPUAPP
+
+if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
+
+config BT_CTLR
+	default BT
+
+# By default, if we build for a Non-Secure version of the board,
+# enable building with TF-M as the Secure Execution Environment.
+config BUILD_WITH_TFM
+	default y if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
+
+# By default, if we build with TF-M, instruct build system to
+# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
+config TFM_FLASH_MERGED_BINARY
+	default y
+	depends on BUILD_WITH_TFM
+
+endif #BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
diff --git a/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk b/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk
index 25472cfff6c..57b90e2c516 100644
--- a/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk
+++ b/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk
@@ -4,6 +4,6 @@
 config BOARD_NRF54L15DK
 	select SOC_NRF54L05_CPUAPP if BOARD_NRF54L15DK_NRF54L05_CPUAPP
 	select SOC_NRF54L10_CPUAPP if BOARD_NRF54L15DK_NRF54L10_CPUAPP
-	select SOC_NRF54L15_CPUAPP if BOARD_NRF54L15DK_NRF54L15_CPUAPP
+	select SOC_NRF54L15_CPUAPP if BOARD_NRF54L15DK_NRF54L15_CPUAPP || BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
 	select SOC_NRF54L15_CPUFLPR if BOARD_NRF54L15DK_NRF54L15_CPUFLPR || \
 					    BOARD_NRF54L15DK_NRF54L15_CPUFLPR_XIP
diff --git a/boards/nordic/nrf54l15dk/board.cmake b/boards/nordic/nrf54l15dk/board.cmake
index c69f8460c0a..664cb158a6a 100644
--- a/boards/nordic/nrf54l15dk/board.cmake
+++ b/boards/nordic/nrf54l15dk/board.cmake
@@ -9,5 +9,13 @@ elseif(CONFIG_SOC_NRF54L05_CPUFLPR OR CONFIG_SOC_NRF54L10_CPUFLPR OR
   board_runner_args(jlink "--speed=4000")
 endif()
 
+if(BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS)
+  set(TFM_PUBLIC_KEY_FORMAT "full")
+endif()
+
+if(CONFIG_TFM_FLASH_MERGED_BINARY)
+  set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex)
+endif()
+
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf54l15dk/board.yml b/boards/nordic/nrf54l15dk/board.yml
index f1a873cc35f..f4214f09d28 100644
--- a/boards/nordic/nrf54l15dk/board.yml
+++ b/boards/nordic/nrf54l15dk/board.yml
@@ -9,3 +9,5 @@ board:
     variants:
     - name: xip
       cpucluster: cpuflpr
+    - name: ns
+      cpucluster: cpuapp
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts
new file mode 100644
index 00000000000..e629a8b4ad7
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#define USE_NON_SECURE_ADDRESS_MAP 1
+
+#include <nordic/nrf54l15_cpuapp.dtsi>
+#include "nrf54l_05_10_15_cpuapp_common.dtsi"
+
+/ {
+	compatible = "nordic,nrf54l15dk_nrf54l15-cpuapp";
+	model = "Nordic nRF54L15 DK nRF54L15 Application MCU";
+
+	chosen {
+		zephyr,code-partition = &slot0_partition;
+		zephyr,sram = &cpuapp_sram;
+	};
+};
+
+&cpuapp_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x0 DT_SIZE_K(64)>;
+		};
+		slot0_partition: partition@10000 {
+			label = "image-0";
+			reg = <0x10000 DT_SIZE_K(324)>;
+		};
+		slot0_ns_partition: partition@61000 {
+			label = "image-0-nonsecure";
+			reg = <0x61000 DT_SIZE_K(324)>;
+		};
+		slot1_partition: partition@b2000 {
+			label = "image-1";
+			reg = <0xb2000 DT_SIZE_K(324)>;
+		};
+		slot1_ns_partition: partition@103000 {
+			label = "image-1-nonsecure";
+			reg = <0x103000 DT_SIZE_K(324)>;
+		};
+		/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
+		storage_partition: partition@15c000 {
+			label = "storage";
+			reg = <0x15c000 DT_SIZE_K(36)>;
+		};
+	};
+};
+
+&uart30 {
+	/* Disable so that TF-M can use this UART */
+	status = "disabled";
+
+	current-speed = <115200>;
+	pinctrl-0 = <&uart30_default>;
+	pinctrl-1 = <&uart30_sleep>;
+	pinctrl-names = "default", "sleep";
+};
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml
new file mode 100644
index 00000000000..56b8e9618c0
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml
@@ -0,0 +1,22 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+
+identifier: nrf54l15dk/nrf54l15/cpuapp/ns
+name: nRF54l15-DK-nRF54l15-Application-Non-Secure
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+ram: 256
+flash: 1524
+supported:
+  - adc
+  - gpio
+  - i2c
+  - spi
+  - counter
+  - watchdog
+  - adc
+  - i2s
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig
new file mode 100644
index 00000000000..70f01d7c9ba
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig
@@ -0,0 +1,31 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
+
+# Enable TrustZone-M
+CONFIG_ARM_TRUSTZONE_M=y
+
+# This Board implies building Non-Secure firmware
+CONFIG_TRUSTED_EXECUTION_NONSECURE=y
+
+# Don't enable the cache in the non-secure image as it is a
+# secure-only peripheral on 54l
+CONFIG_CACHE_MANAGEMENT=n
+CONFIG_EXTERNAL_CACHE=n
+
+CONFIG_UART_CONSOLE=y
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Start SYSCOUNTER on driver init
+CONFIG_NRF_GRTC_START_SYSCOUNTER=y

From 296400609adfab07a708db306d58bd7773918300 Mon Sep 17 00:00:00 2001
From: Joakim Andersson <joakim.andersson@nordicsemi.no>
Date: Mon, 16 Jan 2023 14:15:22 +0100
Subject: [PATCH 0731/2913] [nrf noup] dts: choose a crypto accelerator for
 entropy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a long-term noup patch because crypto driver support is
NCS-only for both cryptocell and CRACEN.

Set HAS_HW_NRF_CC3XX to be defined in NS build when cryptocell
is accessed through the PSA API.
We need to know which CC3XX features are available.

Set PSA as the entropy source for 54L.

PSA is the only NCS-supported interface to CRACEN.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
(cherry picked from commit d643f17fe4ac242e03542add1661b14d1bc93af1)
(cherry picked from commit de051d6ab581c468f499fa385c942a5067962ef4)
---
 dts/arm/nordic/nrf52840.dtsi               | 4 ++--
 dts/arm/nordic/nrf5340_cpuapp.dtsi         | 4 ++--
 dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi | 3 ++-
 dts/arm/nordic/nrf91.dtsi                  | 3 ++-
 soc/nordic/common/Kconfig.peripherals      | 6 ++++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index e2265c130b0..b0049bfa605 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -8,7 +8,7 @@
 / {
 	chosen {
 		zephyr,bt-hci = &bt_hci_controller;
-		zephyr,entropy = &rng;
+		zephyr,entropy = &cryptocell;
 		zephyr,flash-controller = &flash_controller;
 	};
 
@@ -562,7 +562,7 @@
 			reg = <0x5002a000 0x1000>, <0x5002b000 0x1000>;
 			reg-names = "wrapper", "core";
 			interrupts = <42 NRF_DEFAULT_IRQ_PRIORITY>;
-			status = "disabled";
+			status = "okay";
 		};
 	};
 };
diff --git a/dts/arm/nordic/nrf5340_cpuapp.dtsi b/dts/arm/nordic/nrf5340_cpuapp.dtsi
index c02f939a7fa..ec59f40ab9c 100644
--- a/dts/arm/nordic/nrf5340_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuapp.dtsi
@@ -34,7 +34,7 @@
 	};
 
 	chosen {
-		zephyr,entropy = &rng_hci;
+		zephyr,entropy = &cryptocell;
 		zephyr,flash-controller = &flash_controller;
 	};
 
@@ -103,7 +103,7 @@
 			reg = <0x50844000 0x1000>, <0x50845000 0x1000>;
 			reg-names = "wrapper", "core";
 			interrupts = <68 NRF_DEFAULT_IRQ_PRIORITY>;
-			status = "disabled";
+			status = "okay";
 		};
 	};
 
diff --git a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
index 33b0d2cd453..5b0fda68586 100644
--- a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
@@ -16,6 +16,7 @@ nvic: &cpuapp_nvic {};
 / {
 	chosen {
 		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,entropy = &psa_rng;
 	};
 
 	soc {
@@ -26,7 +27,7 @@ nvic: &cpuapp_nvic {};
 
 	psa_rng: psa-rng {
 		compatible = "zephyr,psa-crypto-rng";
-		status = "disabled";
+		status = "okay";
 	};
 };
 
diff --git a/dts/arm/nordic/nrf91.dtsi b/dts/arm/nordic/nrf91.dtsi
index 9a64ed92229..5e65519929e 100644
--- a/dts/arm/nordic/nrf91.dtsi
+++ b/dts/arm/nordic/nrf91.dtsi
@@ -28,6 +28,7 @@
 	};
 
 	chosen {
+		zephyr,entropy = &cryptocell;
 		zephyr,flash-controller = &flash_controller;
 	};
 
@@ -51,7 +52,7 @@
 			reg = <0x50840000 0x1000>, <0x50841000 0x1000>;
 			reg-names = "wrapper", "core";
 			interrupts = <64 NRF_DEFAULT_IRQ_PRIORITY>;
-			status = "disabled";
+			status = "okay";
 		};
 
 		ctrlap: ctrlap@50006000 {
diff --git a/soc/nordic/common/Kconfig.peripherals b/soc/nordic/common/Kconfig.peripherals
index 8ba97b225b9..9ea6ebc45c5 100644
--- a/soc/nordic/common/Kconfig.peripherals
+++ b/soc/nordic/common/Kconfig.peripherals
@@ -13,10 +13,12 @@ config HAS_HW_NRF_BPROT
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_BPROT))
 
 config HAS_HW_NRF_CC310
-	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_310))
+	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_310)) || \
+		 ($(dt_nodelabel_enabled,psa_rng) && SOC_SERIES_NRF91X)
 
 config HAS_HW_NRF_CC312
-	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_312))
+	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_312)) || \
+		 ($(dt_nodelabel_enabled,psa_rng) && SOC_NRF5340_CPUAPP)
 
 config HAS_HW_NRF_CCM
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_CCM))

From e88198c09a18ebf8a12aa0674cf535433d105018 Mon Sep 17 00:00:00 2001
From: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Date: Thu, 5 Sep 2024 08:04:15 +0200
Subject: [PATCH 0732/2913] [nrf noup] dts: Select SoftDevice Controller DTS
 binding as default

The SoftDevice Controller is a different controller than
the open source link layer with a different set of quirks.
It should therefore have its own device tree binding.

This commit converts the SoftDevice Controller driver
to use this new DTS binding instead of reusing the existing one.

This commit updates or adds additional overlays for
existing samples, applications and tests that were using the
open source link layer.

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
(cherry picked from commit 8d6a853718ee5be65221d5187fa32793e44b8bdb)
(cherry picked from commit 8bc628d8945cb7bb01f57c92c00b5f1550ed576c)
---
 dts/arm/nordic/nrf52805.dtsi                  |  11 +-
 dts/arm/nordic/nrf52810.dtsi                  |  11 +-
 dts/arm/nordic/nrf52811.dtsi                  |  11 +-
 dts/arm/nordic/nrf52820.dtsi                  |  11 +-
 dts/arm/nordic/nrf52832.dtsi                  |  11 +-
 dts/arm/nordic/nrf52833.dtsi                  |  11 +-
 dts/arm/nordic/nrf52840.dtsi                  |  11 +-
 dts/arm/nordic/nrf5340_cpunet.dtsi            |  11 +-
 dts/arm/nordic/nrf54h20_cpurad.dtsi           |   4 +-
 dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi    |   4 +-
 dts/common/nordic/nrf54h20.dtsi               |   7 +-
 dts/common/nordic/nrf54l_05_10_15.dtsi        |   8 +-
 .../bluetooth/bap_broadcast_sink/sample.yaml  |   4 +-
 .../bap_broadcast_source/sample.yaml          |   4 +-
 .../bap_broadcast_source/sysbuild.cmake       |   4 +
 .../bluetooth/bap_unicast_client/sample.yaml  |   4 +-
 .../bap_unicast_client/sysbuild.cmake         |   4 +
 .../bluetooth/bap_unicast_server/sample.yaml  |   4 +-
 .../bap_unicast_server/sysbuild.cmake         |   4 +
 samples/bluetooth/beacon/sample.yaml          |   4 +-
 .../bluetooth/cap_initiator/sysbuild.cmake    |   4 +
 .../direction_finding_central/sample.yaml     |  15 ++-
 .../sample.yaml                               |  14 ++-
 .../sample.yaml                               |  14 ++-
 .../direction_finding_peripheral/sample.yaml  |  15 ++-
 samples/bluetooth/hci_ipc/sample.yaml         |  34 ++++--
 samples/bluetooth/hci_uart/sample.yaml        |  18 +++-
 samples/bluetooth/hci_vs_scan_req/sample.yaml |   2 +
 samples/bluetooth/iso_central/sample.yaml     |   6 +-
 .../pbp_public_broadcast_sink/sample.yaml     |   4 +-
 .../pbp_public_broadcast_sink/sysbuild.cmake  |   4 +
 .../pbp_public_broadcast_source/sample.yaml   |   4 +-
 .../sysbuild.cmake                            |   4 +
 .../controller/ll_sw/nordic/lll/lll.c         |   2 +-
 .../controller/ctrl_api/testcase.yaml         |   2 +
 .../controller/ctrl_chmu/testcase.yaml        |   2 +
 .../controller/ctrl_cis_create/testcase.yaml  |   2 +
 .../ctrl_cis_terminate/testcase.yaml          |   2 +
 .../controller/ctrl_collision/testcase.yaml   |   2 +
 .../controller/ctrl_conn_update/testcase.yaml |  11 +-
 .../controller/ctrl_cte_req/testcase.yaml     |   2 +
 .../ctrl_data_length_update/testcase.yaml     |  10 +-
 .../controller/ctrl_encrypt/testcase.yaml     |   2 +
 .../ctrl_feature_exchange/testcase.yaml       |   2 +
 .../controller/ctrl_hci/testcase.yaml         |   2 +
 .../controller/ctrl_invalid/testcase.yaml     |   2 +
 .../controller/ctrl_le_ping/testcase.yaml     |   2 +
 .../ctrl_min_used_chans/testcase.yaml         |   2 +
 .../controller/ctrl_phy_update/testcase.yaml  |   6 +-
 .../controller/ctrl_sca_update/testcase.yaml  |   2 +
 .../controller/ctrl_sw_privacy/testcase.yaml  |   2 +
 .../controller/ctrl_terminate/testcase.yaml   |   2 +
 .../ctrl_tx_buffer_alloc/testcase.yaml        |  22 +++-
 .../controller/ctrl_tx_queue/testcase.yaml    |   2 +
 .../controller/ctrl_unsupported/testcase.yaml |   6 +-
 .../controller/ctrl_user_ext/testcase.yaml    |   2 +
 .../controller/ctrl_version/testcase.yaml     |   2 +
 .../df/connection_cte_req/testcase.yaml       |   2 +
 .../df/connection_cte_tx_params/testcase.yaml |   2 +
 .../connectionless_cte_chains/testcase.yaml   |   2 +
 .../df/connectionless_cte_rx/testcase.yaml    |   2 +
 .../df/connectionless_cte_tx/testcase.yaml    |   2 +
 tests/bluetooth/init/testcase.yaml            | 101 +++++++++++++-----
 63 files changed, 365 insertions(+), 120 deletions(-)

diff --git a/dts/arm/nordic/nrf52805.dtsi b/dts/arm/nordic/nrf52805.dtsi
index e1c8e6a2efb..aa9061d4aab 100644
--- a/dts/arm/nordic/nrf52805.dtsi
+++ b/dts/arm/nordic/nrf52805.dtsi
@@ -11,7 +11,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -97,12 +97,13 @@
 			status = "okay";
 			ble-2mbps-supported;
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
index 40d872dda44..8ed7a32bfec 100644
--- a/dts/arm/nordic/nrf52810.dtsi
+++ b/dts/arm/nordic/nrf52810.dtsi
@@ -7,7 +7,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -101,12 +101,13 @@
 			status = "okay";
 			ble-2mbps-supported;
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi
index 735bfee427b..4c5f4ca58f7 100644
--- a/dts/arm/nordic/nrf52811.dtsi
+++ b/dts/arm/nordic/nrf52811.dtsi
@@ -11,7 +11,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -113,12 +113,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52820.dtsi b/dts/arm/nordic/nrf52820.dtsi
index 82bdcb58934..f7ec2b926f6 100644
--- a/dts/arm/nordic/nrf52820.dtsi
+++ b/dts/arm/nordic/nrf52820.dtsi
@@ -11,7 +11,7 @@
 / {
 
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -115,12 +115,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK another Bluetooth controller
-			 * is added and set as the default.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
index abb1aed468c..f09793f5020 100644
--- a/dts/arm/nordic/nrf52832.dtsi
+++ b/dts/arm/nordic/nrf52832.dtsi
@@ -7,7 +7,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -101,12 +101,13 @@
 			status = "okay";
 			ble-2mbps-supported;
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi
index e8a033b4002..a881898a8f3 100644
--- a/dts/arm/nordic/nrf52833.dtsi
+++ b/dts/arm/nordic/nrf52833.dtsi
@@ -11,7 +11,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -115,12 +115,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index b0049bfa605..e331e8b422f 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -7,7 +7,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &cryptocell;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -103,12 +103,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf5340_cpunet.dtsi b/dts/arm/nordic/nrf5340_cpunet.dtsi
index acf95077669..d33b4080deb 100644
--- a/dts/arm/nordic/nrf5340_cpunet.dtsi
+++ b/dts/arm/nordic/nrf5340_cpunet.dtsi
@@ -9,7 +9,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -102,12 +102,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf54h20_cpurad.dtsi b/dts/arm/nordic/nrf54h20_cpurad.dtsi
index 2cfda47afc5..e8ff2dac3a4 100644
--- a/dts/arm/nordic/nrf54h20_cpurad.dtsi
+++ b/dts/arm/nordic/nrf54h20_cpurad.dtsi
@@ -24,7 +24,7 @@ wdt011: &cpurad_wdt011 {};
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 	};
 
 	soc {
@@ -104,6 +104,6 @@ wdt011: &cpurad_wdt011 {};
 	status = "okay";
 };
 
-&bt_hci_controller {
+&bt_hci_sdc {
 	status = "okay";
 };
diff --git a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
index 5b0fda68586..2de29fcdbd2 100644
--- a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
@@ -15,7 +15,7 @@ nvic: &cpuapp_nvic {};
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &psa_rng;
 	};
 
@@ -31,7 +31,7 @@ nvic: &cpuapp_nvic {};
 	};
 };
 
-&bt_hci_controller {
+&bt_hci_sdc {
 	status = "okay";
 };
 
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 7f322c0b900..479bd4e3298 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -425,9 +425,10 @@
 					status = "disabled";
 				};
 
-				/* Note: In the nRF Connect SDK the SoftDevice Controller
-				 * is added and set as the default Bluetooth Controller.
-				 */
+				bt_hci_sdc: bt_hci_sdc {
+					compatible = "nordic,bt-hci-sdc";
+					status = "disabled";
+				};
 				bt_hci_controller: bt_hci_controller {
 					compatible = "zephyr,bt-hci-ll-sw-split";
 					status = "disabled";
diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi
index 04fae0272bc..d997e01c488 100644
--- a/dts/common/nordic/nrf54l_05_10_15.dtsi
+++ b/dts/common/nordic/nrf54l_05_10_15.dtsi
@@ -234,9 +234,11 @@
 					status = "disabled";
 				};
 
-				/* Note: In the nRF Connect SDK the SoftDevice Controller
-				 * is added and set as the default Bluetooth Controller.
-				 */
+				bt_hci_sdc: bt_hci_sdc {
+					compatible = "nordic,bt-hci-sdc";
+					status = "disabled";
+				};
+
 				bt_hci_controller: bt_hci_controller {
 					compatible = "zephyr,bt-hci-ll-sw-split";
 					status = "disabled";
diff --git a/samples/bluetooth/bap_broadcast_sink/sample.yaml b/samples/bluetooth/bap_broadcast_sink/sample.yaml
index b6360768f0a..e19e17d57a0 100644
--- a/samples/bluetooth/bap_broadcast_sink/sample.yaml
+++ b/samples/bluetooth/bap_broadcast_sink/sample.yaml
@@ -24,5 +24,7 @@ tests:
       - nrf52_bsim
       - nrf52833dk/nrf52833
       - nrf52840dongle/nrf52840
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/bap_broadcast_source/sample.yaml b/samples/bluetooth/bap_broadcast_source/sample.yaml
index 27262103b29..4b9b7c705e5 100644
--- a/samples/bluetooth/bap_broadcast_source/sample.yaml
+++ b/samples/bluetooth/bap_broadcast_source/sample.yaml
@@ -25,5 +25,7 @@ tests:
       - nrf52_bsim
       - nrf52833dk/nrf52833
       - nrf52840dongle/nrf52840
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/bap_broadcast_source/sysbuild.cmake b/samples/bluetooth/bap_broadcast_source/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/bap_broadcast_source/sysbuild.cmake
+++ b/samples/bluetooth/bap_broadcast_source/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/bap_unicast_client/sample.yaml b/samples/bluetooth/bap_unicast_client/sample.yaml
index 536ab9144f0..e69083f2669 100644
--- a/samples/bluetooth/bap_unicast_client/sample.yaml
+++ b/samples/bluetooth/bap_unicast_client/sample.yaml
@@ -22,5 +22,7 @@ tests:
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52dk/nrf52832
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/bap_unicast_client/sysbuild.cmake b/samples/bluetooth/bap_unicast_client/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/bap_unicast_client/sysbuild.cmake
+++ b/samples/bluetooth/bap_unicast_client/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/bap_unicast_server/sample.yaml b/samples/bluetooth/bap_unicast_server/sample.yaml
index fc14175a2d1..744833234b9 100644
--- a/samples/bluetooth/bap_unicast_server/sample.yaml
+++ b/samples/bluetooth/bap_unicast_server/sample.yaml
@@ -22,5 +22,7 @@ tests:
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52dk/nrf52832
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/bap_unicast_server/sysbuild.cmake b/samples/bluetooth/bap_unicast_server/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/bap_unicast_server/sysbuild.cmake
+++ b/samples/bluetooth/bap_unicast_server/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/beacon/sample.yaml b/samples/bluetooth/beacon/sample.yaml
index e0bf6d22fb9..6ab2413ca8f 100644
--- a/samples/bluetooth/beacon/sample.yaml
+++ b/samples/bluetooth/beacon/sample.yaml
@@ -16,7 +16,9 @@ tests:
       - nrf52dk/nrf52832
       - nrf54l15dk/nrf54l15/cpuapp
   sample.bluetooth.beacon-coex:
-    extra_args: CONF_FILE="prj-coex.conf"
+    extra_args:
+      - CONF_FILE="prj-coex.conf"
+      - SNIPPET="bt-ll-sw-split"
     harness: bluetooth
     platform_allow:
       - nrf52840dk/nrf52840
diff --git a/samples/bluetooth/cap_initiator/sysbuild.cmake b/samples/bluetooth/cap_initiator/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/cap_initiator/sysbuild.cmake
+++ b/samples/bluetooth/cap_initiator/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/direction_finding_central/sample.yaml b/samples/bluetooth/direction_finding_central/sample.yaml
index b0c94537b51..c1d1adae2c4 100644
--- a/samples/bluetooth/direction_finding_central/sample.yaml
+++ b/samples/bluetooth/direction_finding_central/sample.yaml
@@ -14,15 +14,24 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding.central.aod:
+  sample.bluetooth.direction_finding.central.aod_with_controller:
     harness: bluetooth
-    extra_args: OVERLAY_CONFIG="overlay-aod.conf"
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aod.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     tags: bluetooth
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding.central.aod_host_only:
+    harness: bluetooth
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aod.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    tags: bluetooth
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
index 1c79df41275..97d4fea9e69 100644
--- a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
+++ b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
@@ -12,14 +12,22 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding_connectionless_rx.aod:
+  sample.bluetooth.direction_finding_connectionless_rx.aod_with_controller:
     harness: bluetooth
-    extra_args: OVERLAY_CONFIG="overlay-aod.conf"
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aod.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding_connectionless_rx.aod_host_only:
+    harness: bluetooth
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aod.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
index 1ea189f5088..e1833b9be8a 100644
--- a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
+++ b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
@@ -12,14 +12,22 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding_connectionless.aoa:
+  sample.bluetooth.direction_finding_connectionless.aoa_with_controller:
     harness: bluetooth
-    extra_args: OVERLAY_CONFIG="overlay-aoa.conf"
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aoa.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding_connectionless.aoa_host_only:
+    harness: bluetooth
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aoa.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_peripheral/sample.yaml b/samples/bluetooth/direction_finding_peripheral/sample.yaml
index 126355a735f..00a8c0b79d1 100644
--- a/samples/bluetooth/direction_finding_peripheral/sample.yaml
+++ b/samples/bluetooth/direction_finding_peripheral/sample.yaml
@@ -14,15 +14,24 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding.peripheral.aod:
+  sample.bluetooth.direction_finding.peripheral.aod_with_controller:
     harness: bluetooth
-    extra_args: OVERLAY_CONFIG="overlay-aoa.conf"
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aoa.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     tags: bluetooth
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding.peripheral.aod_host_only:
+    harness: bluetooth
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aoa.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    tags: bluetooth
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/hci_ipc/sample.yaml b/samples/bluetooth/hci_ipc/sample.yaml
index e88726aa45f..15d47e6866e 100644
--- a/samples/bluetooth/hci_ipc/sample.yaml
+++ b/samples/bluetooth/hci_ipc/sample.yaml
@@ -15,7 +15,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_broadcast.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -26,7 +28,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_receive.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -36,7 +40,9 @@ tests:
   sample.bluetooth.hci_ipc.bis.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_bis-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_bis-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -46,7 +52,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_central.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_central-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_central-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -56,7 +64,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_peripheral.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -66,7 +76,9 @@ tests:
   sample.bluetooth.hci_ipc.cis.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_cis-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_cis-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -76,7 +88,9 @@ tests:
   sample.bluetooth.hci_ipc.iso.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340bsim/nrf5340/cpunet
@@ -88,6 +102,7 @@ tests:
     extra_args:
       - CONF_FILE="nrf5340_cpunet_df-bt_ll_sw_split.conf"
       - DTC_OVERLAY_FILE="nrf5340_cpunet_df-bt_ll_sw_split.overlay"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
@@ -98,13 +113,16 @@ tests:
       - CONF_FILE="nrf5340_cpunet_df-bt_ll_sw_split.conf"
       - DTC_OVERLAY_FILE="nrf5340_cpunet_df-bt_ll_sw_split.overlay"
       - CONFIG_BT_CTLR_PHY_CODED=n
+      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
   sample.bluetooth.hci_ipc.mesh.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
diff --git a/samples/bluetooth/hci_uart/sample.yaml b/samples/bluetooth/hci_uart/sample.yaml
index a83ac48cbf0..c626906f1ea 100644
--- a/samples/bluetooth/hci_uart/sample.yaml
+++ b/samples/bluetooth/hci_uart/sample.yaml
@@ -12,7 +12,9 @@ tests:
   sample.bluetooth.hci_uart.nrf52833.df:
     harness: bluetooth
     platform_allow: nrf52833dk/nrf52833
-    extra_args: DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+    extra_args:
+      - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
     tags:
@@ -21,7 +23,9 @@ tests:
   sample.bluetooth.hci_uart.nrf5340_netcore.df:
     harness: bluetooth
     platform_allow: nrf5340dk/nrf5340/cpunet
-    extra_args: DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
+    extra_args:
+      - DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
     tags:
@@ -30,7 +34,9 @@ tests:
   sample.bluetooth.hci_uart.nrf52833.df.iq_report:
     harness: bluetooth
     platform_allow: nrf52833dk/nrf52833
-    extra_args: DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+    extra_args:
+      - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
       - CONFIG_BT_CTLR_DTM_HCI_DF_IQ_REPORT=y
@@ -40,7 +46,9 @@ tests:
   sample.bluetooth.hci_uart.nrf5340_netcore.df.iq_report:
     harness: bluetooth
     platform_allow: nrf5340dk/nrf5340/cpunet
-    extra_args: DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
+    extra_args:
+      - DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
       - CONFIG_BT_CTLR_DTM_HCI_DF_IQ_REPORT=y
@@ -55,6 +63,7 @@ tests:
     extra_args:
       - OVERLAY_CONFIG=overlay-all-bt_ll_sw_split.conf
       - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     tags:
       - uart
       - bluetooth
@@ -66,6 +75,7 @@ tests:
     extra_args:
       - OVERLAY_CONFIG=overlay-all-bt_ll_sw_split.conf
       - DTC_OVERLAY_FILE=./boards/nrf54l15dk_nrf54l15_cpuapp_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     tags:
       - uart
       - bluetooth
diff --git a/samples/bluetooth/hci_vs_scan_req/sample.yaml b/samples/bluetooth/hci_vs_scan_req/sample.yaml
index 245a83aa0d9..49526522d16 100644
--- a/samples/bluetooth/hci_vs_scan_req/sample.yaml
+++ b/samples/bluetooth/hci_vs_scan_req/sample.yaml
@@ -9,4 +9,6 @@ tests:
       - nrf52dk/nrf52832
     extra_configs:
       - CONFIG_BT_LL_SW_SPLIT=y
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/iso_central/sample.yaml b/samples/bluetooth/iso_central/sample.yaml
index d4350e0d9cf..fd5ec7ac4fe 100644
--- a/samples/bluetooth/iso_central/sample.yaml
+++ b/samples/bluetooth/iso_central/sample.yaml
@@ -11,11 +11,11 @@ tests:
   sample.bluetooth.iso_central.bt_ll_sw_split:
     harness: bluetooth
     platform_allow:
-      - qemu_cortex_m3
-      - qemu_x86
       - nrf52_bsim
       - nrf52833dk/nrf52833
     integration_platforms:
       - nrf52833dk/nrf52833
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml b/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
index 2c4d31fd4b9..daa63336080 100644
--- a/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
+++ b/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
@@ -23,5 +23,7 @@ tests:
     integration_platforms:
       - nrf52_bsim
       - nrf52833dk/nrf52833
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake b/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake
+++ b/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/pbp_public_broadcast_source/sample.yaml b/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
index 31809027f29..75cdc80ec6f 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
+++ b/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
@@ -23,5 +23,7 @@ tests:
     integration_platforms:
       - nrf52_bsim
       - nrf52833dk/nrf52833
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake b/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake
index d3bf7be5b6c..e0a7fd9d175 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake
+++ b/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake
@@ -18,6 +18,10 @@ if(NOT("${SB_CONFIG_NET_CORE_BOARD}" STREQUAL ""))
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
index 77b4360cabd..956834765ce 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
@@ -62,7 +62,7 @@ static struct {
 /* FIXME: This could probably use a chosen entropy device instead on relying on
  * the nodelabel being the same as for the old nrf rng.
  */
-static const struct device *const dev_entropy = DEVICE_DT_GET(DT_NODELABEL(rng));
+static const struct device *const dev_entropy = DEVICE_DT_GET(DT_CHOSEN(zephyr_entropy));
 #endif /* CONFIG_ENTROPY_HAS_DRIVER */
 
 static int init_reset(void);
diff --git a/tests/bluetooth/controller/ctrl_api/testcase.yaml b/tests/bluetooth/controller/ctrl_api/testcase.yaml
index 19bf6c9ab49..21f178bf9b2 100644
--- a/tests/bluetooth/controller/ctrl_api/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_api/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_api.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_chmu/testcase.yaml b/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
index f7e8068d60e..9c3ee626433 100644
--- a/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_chmu.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml b/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
index 99612a89bc3..2371d7063eb 100644
--- a/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_cis_create.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml b/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
index 956172a89b2..a98229ba45f 100644
--- a/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_cis_terminate.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_collision/testcase.yaml b/tests/bluetooth/controller/ctrl_collision/testcase.yaml
index 6086a9a4ebc..daa8f3bc6c3 100644
--- a/tests/bluetooth/controller/ctrl_collision/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_collision/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_collision.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml b/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
index 5b0bda4b908..fc4ecb0b647 100644
--- a/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
@@ -7,11 +7,18 @@ common:
 tests:
   bluetooth.controller.ctrl_conn_update.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_conn_update.apm_test:
     type: unit
-    extra_args: CONF_FILE=prj_apm.conf
+    extra_args:
+      - CONF_FILE=prj_apm.conf
+      - SNIPPET="bt-ll-sw-split"
+
 
   bluetooth.controller.ctrl_conn_update.no_param_req_test:
     type: unit
-    extra_args: CONF_FILE=prj_no_param_req.conf
+    extra_args:
+      - CONF_FILE=prj_no_param_req.conf
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml b/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
index fd6ff51118d..c6288aecc43 100644
--- a/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_cte_req.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml b/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
index 9778af435b4..c7d1174e12b 100644
--- a/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
@@ -6,11 +6,17 @@ common:
 tests:
   bluetooth.controller.ctrl_data_length_update.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_data_length_update.test_nocodedphy:
     type: unit
-    extra_args: CONF_FILE=prj_nocoded.conf
+    extra_args:
+      - CONF_FILE=prj_nocoded.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_data_length_update.test_nophy:
     type: unit
-    extra_args: CONF_FILE=prj_nophy.conf
+    extra_args:
+      - CONF_FILE=prj_nophy.conf
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml b/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
index d5bb2cb8b11..86dd5bfe4d3 100644
--- a/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_encrypt.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml b/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
index 257542f3612..087e49575ff 100644
--- a/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_feature_exchange.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_hci/testcase.yaml b/tests/bluetooth/controller/ctrl_hci/testcase.yaml
index c750ebc8dd8..5e00c85f6f4 100644
--- a/tests/bluetooth/controller/ctrl_hci/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_hci/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_hci.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_invalid/testcase.yaml b/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
index 2d1741931e3..cee54e6b09e 100644
--- a/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_invalid.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml b/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
index b6a77528f32..54178905da1 100644
--- a/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_le_ping.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml b/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
index 0991b0cdd43..a9445cbf8c4 100644
--- a/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_min_used_chans.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml b/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
index 1d7da169f1d..d5c49d587a8 100644
--- a/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
@@ -6,6 +6,10 @@ common:
 tests:
   bluetooth.controller.ctrl_phy_update.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
   bluetooth.controller.ctrl_phy_update.test_reduced_buf:
     type: unit
-    extra_args: CONF_FILE=prj_rx_cnt.conf
+    extra_args:
+      - CONF_FILE=prj_rx_cnt.conf
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml b/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
index cbf63aa1b57..cbc3c3faf72 100644
--- a/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_sca_update.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml b/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml
index 778606d6954..ac5dd6e957e 100644
--- a/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml
@@ -4,3 +4,5 @@ common:
 tests:
   bluetooth.ctrl_sw_privacy.test:
     platform_allow: nrf52_bsim
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_terminate/testcase.yaml b/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
index cbe639401ea..6b1409e9653 100644
--- a/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_terminate.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml
index 614eb7fe94c..363986bd3d3 100644
--- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml
@@ -6,23 +6,35 @@ common:
 tests:
   bluetooth.controller.ctrl_tx_buffer_alloc.test_0_per_conn:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_1_per_conn:
     type: unit
-    extra_args: CONF_FILE=prj_1.conf
+    extra_args:
+      - CONF_FILE=prj_1.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_2_per_conn:
     type: unit
-    extra_args: CONF_FILE=prj_2.conf
+    extra_args:
+      - CONF_FILE=prj_2.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_3_per_conn:
     type: unit
-    extra_args: CONF_FILE=prj_3.conf
+    extra_args:
+      - CONF_FILE=prj_3.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_max_per_conn_alloc:
     type: unit
-    extra_args: CONF_FILE=prj_max.conf
+    extra_args:
+      - CONF_FILE=prj_max.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_max_common_alloc:
     type: unit
-    extra_args: CONF_FILE=prj_max_common.conf
+    extra_args:
+      - CONF_FILE=prj_max_common.conf
+       - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml b/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml
index 295ad891a63..282b620b317 100644
--- a/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml
@@ -5,3 +5,5 @@ common:
 tests:
   bluetooth.ctrl_tx_queue.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml b/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml
index 28aba1a752a..48b18af9353 100644
--- a/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml
@@ -6,7 +6,11 @@ common:
 tests:
   bluetooth.controller.ctrl_unsupported.default.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_unsupported.test:
     type: unit
-    extra_args: CONF_FILE=prj_unsupported.conf
+    extra_args:
+      - CONF_FILE=prj_unsupported.conf
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml b/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml
index af319a7a719..be963df24a8 100644
--- a/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml
@@ -4,3 +4,5 @@ common:
 tests:
   bluetooth.ctrl_user_ext.test:
     platform_allow: nrf52_bsim
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_version/testcase.yaml b/tests/bluetooth/controller/ctrl_version/testcase.yaml
index 6badcbc7254..5df86b9bca9 100644
--- a/tests/bluetooth/controller/ctrl_version/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_version/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_version.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connection_cte_req/testcase.yaml b/tests/bluetooth/df/connection_cte_req/testcase.yaml
index 768aba4a51f..fbfe4b0d9a1 100644
--- a/tests/bluetooth/df/connection_cte_req/testcase.yaml
+++ b/tests/bluetooth/df/connection_cte_req/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.conection_cte_req:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml b/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml
index 38a23b0950e..a9986c5b0e5 100644
--- a/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml
+++ b/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.conection_cte_tx_params:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml b/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
index 6aa5bb0f0c1..844a7bbb524 100644
--- a/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.connectionless_cte_chains:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml b/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml
index f839b1910eb..c8f08a90843 100644
--- a/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.connectionless_cte_rx:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml b/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml
index 77d651d0cbc..491cc0e7e59 100644
--- a/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.connectionless_cte_tx:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/init/testcase.yaml b/tests/bluetooth/init/testcase.yaml
index 69afaaf8b08..d0f917f1fe2 100644
--- a/tests/bluetooth/init/testcase.yaml
+++ b/tests/bluetooth/init/testcase.yaml
@@ -74,7 +74,9 @@ tests:
     extra_args: CONF_FILE=prj_9.conf
     platform_allow: qemu_cortex_m3
   bluetooth.init.test_ctlr:
-    extra_args: CONF_FILE=prj_ctlr.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -86,7 +88,9 @@ tests:
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_4_0:
-    extra_args: CONF_FILE=prj_ctlr_4_0.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_4_0.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -95,7 +99,9 @@ tests:
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_4_0_dbg:
-    extra_args: CONF_FILE=prj_ctlr_4_0_dbg.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_4_0_dbg.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -104,7 +110,9 @@ tests:
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_tiny:
-    extra_args: CONF_FILE=prj_ctlr_tiny.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_tiny.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -116,6 +124,7 @@ tests:
     extra_args:
       - CONF_FILE=prj_ctlr_dbg.conf
       - DTC_OVERLAY_FILE=pa_lna.overlay
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -126,6 +135,7 @@ tests:
     extra_args:
       - CONF_FILE=prj_ctlr_5_x_dbg.conf
       - DTC_OVERLAY_FILE=pa_lna.overlay
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -137,6 +147,7 @@ tests:
       - CONF_FILE=prj_ctlr.conf
       - CONFIG_BT_CTLR_ADVANCED_FEATURES=y
       - CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER=y
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf52840dk/nrf52840
@@ -148,6 +159,7 @@ tests:
   bluetooth.init.test_ctlr_ticker:
     extra_args:
       - CONF_FILE=prj_ctlr_ticker.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -155,28 +167,36 @@ tests:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
   bluetooth.init.test_ctlr_broadcaster:
-    extra_args: CONF_FILE=prj_ctlr_broadcaster.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_broadcaster.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_peripheral:
-    extra_args: CONF_FILE=prj_ctlr_peripheral.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_peripheral_priv:
-    extra_args: CONF_FILE=prj_ctlr_peripheral_priv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral_priv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_observer:
-    extra_args: CONF_FILE=prj_ctlr_observer.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_observer.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -187,7 +207,9 @@ tests:
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_central:
-    extra_args: CONF_FILE=prj_ctlr_central.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -198,7 +220,9 @@ tests:
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_central_priv:
-    extra_args: CONF_FILE=prj_ctlr_central_priv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central_priv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -209,7 +233,9 @@ tests:
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_broadcaster_ext:
-    extra_args: CONF_FILE=prj_ctlr_broadcaster_ext.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_broadcaster_ext.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -218,7 +244,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_peripheral_ext:
-    extra_args: CONF_FILE=prj_ctlr_peripheral_ext.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral_ext.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -227,7 +255,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_peripheral_ext_priv:
-    extra_args: CONF_FILE=prj_ctlr_peripheral_ext_priv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral_ext_priv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -236,7 +266,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_oberver_ext:
-    extra_args: CONF_FILE=prj_ctlr_observer_ext.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_observer_ext.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -245,7 +277,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_central_ext:
-    extra_args: CONF_FILE=prj_ctlr_central_ext.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central_ext.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -254,7 +288,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_central_ext_priv:
-    extra_args: CONF_FILE=prj_ctlr_central_ext_priv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central_ext_priv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -263,7 +299,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_adv:
-    extra_args: CONF_FILE=prj_ctlr_per_adv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_adv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -272,7 +310,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_adv_no_adi:
-    extra_args: CONF_FILE=prj_ctlr_per_adv_no_adi.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_adv_no_adi.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -281,7 +321,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_sync:
-    extra_args: CONF_FILE=prj_ctlr_per_sync.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_sync.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -290,7 +332,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_sync_no_adi:
-    extra_args: CONF_FILE=prj_ctlr_per_sync_no_adi.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_sync_no_adi.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -299,7 +343,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_sync_no_filter:
-    extra_args: CONF_FILE=prj_ctlr_per_sync_no_filter.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_sync_no_filter.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -308,7 +354,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_peripheral_iso:
-    extra_args: CONF_FILE=prj_ctlr_peripheral_iso.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral_iso.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -317,7 +365,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_central_iso:
-    extra_args: CONF_FILE=prj_ctlr_central_iso.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central_iso.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -336,7 +386,9 @@ tests:
       - DTC_OVERLAY_FILE=h5.overlay
     platform_allow: qemu_cortex_m3
   bluetooth.init.test_llcp:
-    extra_args: CONF_FILE=prj_llcp.conf
+    extra_args:
+      - CONF_FILE=prj_llcp.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -349,5 +401,6 @@ tests:
     extra_args:
       - CONF_FILE=prj_ctlr.conf
       - CONFIG_BT_RECV_WORKQ_BT=y
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840

From dd09ff52f4bc4b751b10525546a8267ff6431ab3 Mon Sep 17 00:00:00 2001
From: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
Date: Tue, 26 Nov 2024 10:12:33 +0100
Subject: [PATCH 0733/2913] [nrf fromlist] tests: drivers: enable more tests
 for nrf54l10 and nrf54l05

counter_basic_api, i2s_api, i2s_speed, uart_async_api

Upstream PR #: 82028

Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
(cherry picked from commit c19304355a55e512d13cde72a177f98ec684d928)
---
 .../counter_basic_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay  | 1 +
 .../counter_basic_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay  | 1 +
 .../i2s/i2s_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay        | 1 +
 .../i2s/i2s_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay        | 1 +
 .../i2s/i2s_speed/boards/nrf54l15dk_nrf54l05_cpuapp.overlay      | 1 +
 .../i2s/i2s_speed/boards/nrf54l15dk_nrf54l10_cpuapp.overlay      | 1 +
 .../uart_async_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay     | 1 +
 .../uart_async_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay     | 1 +
 .../uart_async_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay    | 1 +
 9 files changed, 9 insertions(+)
 create mode 100644 tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
 create mode 100644 tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
 create mode 100644 tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
 create mode 100644 tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
 create mode 100644 tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
 create mode 100644 tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
 create mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
 create mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
 create mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay

diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
new file mode 100644
index 00000000000..e26399cd4c4
--- /dev/null
+++ b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
@@ -0,0 +1 @@
+#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
new file mode 100644
index 00000000000..e26399cd4c4
--- /dev/null
+++ b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
@@ -0,0 +1 @@
+#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
new file mode 100644
index 00000000000..e26399cd4c4
--- /dev/null
+++ b/tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
@@ -0,0 +1 @@
+#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
new file mode 100644
index 00000000000..e26399cd4c4
--- /dev/null
+++ b/tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
@@ -0,0 +1 @@
+#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
new file mode 100644
index 00000000000..e26399cd4c4
--- /dev/null
+++ b/tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
@@ -0,0 +1 @@
+#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
new file mode 100644
index 00000000000..e26399cd4c4
--- /dev/null
+++ b/tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
@@ -0,0 +1 @@
+#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
new file mode 100644
index 00000000000..e26399cd4c4
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
@@ -0,0 +1 @@
+#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
new file mode 100644
index 00000000000..e26399cd4c4
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
@@ -0,0 +1 @@
+#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
new file mode 100644
index 00000000000..e26399cd4c4
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
@@ -0,0 +1 @@
+#include "nrf54l15dk_nrf54l15_cpuapp.overlay"

From 9af112cd94ba685399956017f6bbfd5d9f28619b Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Thu, 21 Nov 2024 12:57:53 +0100
Subject: [PATCH 0734/2913] [nrf fromtree] boards: nrf54l15dk: Enable tests and
 samples for the L05 and L10

This is a follow-up to 21475774fc412fed7273408de65ee69bcdd1b84e,
extending the number of tests and samples that use the new L05 and L10.

(cherry picked from commit b06bf51459edb0b5f9e61da915b535061cda2d88)

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit 80573e9f50b2622da341237660680ae07f04f079)
---
 ...l15dk_nrf54l05_cpuapp_retained_mem.overlay | 25 +++++++++++++++++++
 ...l15dk_nrf54l10_cpuapp_retained_mem.overlay | 25 +++++++++++++++++++
 samples/boards/nordic/system_off/sample.yaml  |  2 ++
 .../boards/nrf54l15dk_nrf54l05_cpuapp.conf    |  2 ++
 .../boards/nrf54l15dk_nrf54l10_cpuapp.conf    |  2 ++
 samples/subsys/settings/sample.yaml           |  2 ++
 tests/drivers/flash/common/testcase.yaml      |  2 ++
 .../boards/nrf54l15dk_nrf54l05_cpuapp.conf    |  1 +
 .../boards/nrf54l15dk_nrf54l05_cpuapp.overlay | 25 +++++++++++++++++++
 .../boards/nrf54l15dk_nrf54l10_cpuapp.conf    |  1 +
 .../boards/nrf54l15dk_nrf54l10_cpuapp.overlay | 25 +++++++++++++++++++
 tests/drivers/retained_mem/api/testcase.yaml  |  2 ++
 12 files changed, 114 insertions(+)
 create mode 100644 samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l05_cpuapp_retained_mem.overlay
 create mode 100644 samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l10_cpuapp_retained_mem.overlay
 create mode 100644 samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf
 create mode 100644 samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf
 create mode 100644 tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l05_cpuapp.conf
 create mode 100644 tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
 create mode 100644 tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l10_cpuapp.conf
 create mode 100644 tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay

diff --git a/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l05_cpuapp_retained_mem.overlay b/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l05_cpuapp_retained_mem.overlay
new file mode 100644
index 00000000000..6f4a9be80f9
--- /dev/null
+++ b/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l05_cpuapp_retained_mem.overlay
@@ -0,0 +1,25 @@
+/ {
+	cpuapp_sram@20017000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x20017000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RetainedMem";
+		status = "okay";
+
+		retainedmem0: retainedmem {
+			compatible = "zephyr,retained-ram";
+			status = "okay";
+		};
+	};
+
+	aliases {
+		retainedmemdevice = &retainedmem0;
+	};
+};
+
+&cpuapp_sram {
+	/* Shrink SRAM size to avoid overlap with retained memory region:
+	 * 96 - 4 = 92KB = 0x17000
+	 */
+	reg = <0x20000000 0x17000>;
+	ranges = <0x0 0x20000000 0x17000>;
+};
diff --git a/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l10_cpuapp_retained_mem.overlay b/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l10_cpuapp_retained_mem.overlay
new file mode 100644
index 00000000000..9705cf335a7
--- /dev/null
+++ b/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l10_cpuapp_retained_mem.overlay
@@ -0,0 +1,25 @@
+/ {
+	cpuapp_sram@2002f000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x2002f000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RetainedMem";
+		status = "okay";
+
+		retainedmem0: retainedmem {
+			compatible = "zephyr,retained-ram";
+			status = "okay";
+		};
+	};
+
+	aliases {
+		retainedmemdevice = &retainedmem0;
+	};
+};
+
+&cpuapp_sram {
+	/* Shrink SRAM size to avoid overlap with retained memory region:
+	 * 192 - 4 = 188KB = 0x2f000
+	 */
+	reg = <0x20000000 0x2f000>;
+	ranges = <0x0 0x20000000 0x2f000>;
+};
diff --git a/samples/boards/nordic/system_off/sample.yaml b/samples/boards/nordic/system_off/sample.yaml
index ab6a12aeb16..32ce78c1c9e 100644
--- a/samples/boards/nordic/system_off/sample.yaml
+++ b/samples/boards/nordic/system_off/sample.yaml
@@ -8,6 +8,8 @@ tests:
     integration_platforms:
       - nrf52840dk/nrf52840
     platform_allow:
+      - nrf54l15dk/nrf54l05/cpuapp
+      - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
diff --git a/samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf
new file mode 100644
index 00000000000..3746c13c741
--- /dev/null
+++ b/samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf
@@ -0,0 +1,2 @@
+CONFIG_NVS=y
+CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf
new file mode 100644
index 00000000000..3746c13c741
--- /dev/null
+++ b/samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf
@@ -0,0 +1,2 @@
+CONFIG_NVS=y
+CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/sample.yaml b/samples/subsys/settings/sample.yaml
index 09d191c352a..a19c9baaa0d 100644
--- a/samples/subsys/settings/sample.yaml
+++ b/samples/subsys/settings/sample.yaml
@@ -12,6 +12,8 @@ tests:
       - native_sim
       - native_sim/native/64
       - mr_canhubk3
+      - nrf54l15dk/nrf54l05/cpuapp
+      - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
     integration_platforms:
diff --git a/tests/drivers/flash/common/testcase.yaml b/tests/drivers/flash/common/testcase.yaml
index 977fea9d0ed..5c8e755dc4d 100644
--- a/tests/drivers/flash/common/testcase.yaml
+++ b/tests/drivers/flash/common/testcase.yaml
@@ -38,6 +38,8 @@ tests:
       - mimxrt1060_evk
   drivers.flash.common.no_explicit_erase:
     platform_allow:
+      - nrf54l15dk/nrf54l05/cpuapp
+      - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
   drivers.flash.common.tfm_ns:
diff --git a/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l05_cpuapp.conf
new file mode 100644
index 00000000000..c15ba3ed96d
--- /dev/null
+++ b/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l05_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_POWEROFF=y
diff --git a/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
new file mode 100644
index 00000000000..300823ba9c0
--- /dev/null
+++ b/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
@@ -0,0 +1,25 @@
+/ {
+	cpuapp_sram@20017000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x20017000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RetainedMem";
+		status = "okay";
+
+		retainedmem0: retainedmem {
+			compatible = "zephyr,retained-ram";
+			status = "okay";
+		};
+	};
+
+	aliases {
+		retainedmemtestdevice = &retainedmem0;
+	};
+};
+
+&cpuapp_sram {
+	/* Shrink SRAM size to avoid overlap with retained memory region:
+	 * 96 - 4 = 92KB = 0x17000
+	 */
+	reg = <0x20000000 0x17000>;
+	ranges = <0x0 0x20000000 0x17000>;
+};
diff --git a/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l10_cpuapp.conf
new file mode 100644
index 00000000000..c15ba3ed96d
--- /dev/null
+++ b/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l10_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_POWEROFF=y
diff --git a/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
new file mode 100644
index 00000000000..7005c29f307
--- /dev/null
+++ b/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
@@ -0,0 +1,25 @@
+/ {
+	cpuapp_sram@2002f000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x2002f000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RetainedMem";
+		status = "okay";
+
+		retainedmem0: retainedmem {
+			compatible = "zephyr,retained-ram";
+			status = "okay";
+		};
+	};
+
+	aliases {
+		retainedmemtestdevice = &retainedmem0;
+	};
+};
+
+&cpuapp_sram {
+	/* Shrink SRAM size to avoid overlap with retained memory region:
+	 * 192 - 4 = 188KB = 0x2f000
+	 */
+	reg = <0x20000000 0x2f000>;
+	ranges = <0x0 0x20000000 0x2f000>;
+};
diff --git a/tests/drivers/retained_mem/api/testcase.yaml b/tests/drivers/retained_mem/api/testcase.yaml
index 02f7c7c8b27..f6b6844a1b4 100644
--- a/tests/drivers/retained_mem/api/testcase.yaml
+++ b/tests/drivers/retained_mem/api/testcase.yaml
@@ -9,6 +9,8 @@ tests:
       - qemu_cortex_m3
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
+      - nrf54l15dk/nrf54l05/cpuapp
+      - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
     tags:
       - drivers

From 6e3dd5e0eb54dd019bb2fb954e442dd128a8a080 Mon Sep 17 00:00:00 2001
From: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
Date: Thu, 21 Nov 2024 11:51:28 +0100
Subject: [PATCH 0735/2913] [nrf fromlist] samples: boards: nordic: system_off:
 add console checking

Basic verification of output.

Upstream PR #: 81706

Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
(cherry picked from commit 12dceed1ff992fb4bb67ebd9cdf50ef17268a3ff)
---
 samples/boards/nordic/system_off/sample.yaml | 80 ++++++++++++++++++--
 1 file changed, 73 insertions(+), 7 deletions(-)

diff --git a/samples/boards/nordic/system_off/sample.yaml b/samples/boards/nordic/system_off/sample.yaml
index 32ce78c1c9e..18f629c4e54 100644
--- a/samples/boards/nordic/system_off/sample.yaml
+++ b/samples/boards/nordic/system_off/sample.yaml
@@ -4,18 +4,25 @@ common:
   tags: power
 tests:
   sample.boards.nrf.system_off:
-    build_only: true
     integration_platforms:
       - nrf52840dk/nrf52840
     platform_allow:
+      - nrf51dk/nrf51822
+      - nrf52840dk/nrf52840
+      - nrf52dk/nrf52832
+      - nrf5340dk/nrf5340/cpuapp
       - nrf54l15dk/nrf54l05/cpuapp
       - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
-      - nrf52840dk/nrf52840
-      - nrf52dk/nrf52832
-      - nrf51dk/nrf51822
+    harness: console
+    harness_config:
+      type: multi_line
+      ordered: true
+      regex:
+        - "system off demo"
+        - "Retained data not supported"
+        - "Entering system off; press sw0 to restart"
   sample.boards.nrf.system_off.nrf_retained:
-    build_only: true
     integration_platforms:
       - nrf52840dk/nrf52840
     platform_allow:
@@ -23,17 +30,76 @@ tests:
       - nrf52dk/nrf52832
     extra_configs:
       - CONFIG_APP_USE_NRF_RETENTION=y
+    harness: console
+    harness_config:
+      type: multi_line
+      ordered: true
+      regex:
+        - "system off demo"
+        - "Retained data: INVALID"
+        - "Boot count: 1"
+        - "Off count: 0"
+        - "Active Ticks:"
+        - "Entering system off; press sw0 to restart"
   sample.boards.nrf.system_off.retained_mem:
     extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay"
-    build_only: true
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
     extra_configs:
       - CONFIG_APP_USE_RETAINED_MEM=y
       - CONFIG_RETAINED_MEM=y
+    harness: console
+    harness_config:
+      type: multi_line
+      ordered: true
+      regex:
+        - "system off demo"
+        - "Retained data: INVALID"
+        - "Boot count: 1"
+        - "Off count: 0"
+        - "Active Ticks:"
+        - "Entering system off; press sw0 to restart"
   sample.boards.nrf.system_off.grtc_wakeup:
-    build_only: true
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
     extra_configs:
       - CONFIG_GRTC_WAKEUP_ENABLE=y
+    harness: console
+    harness_config:
+      type: multi_line
+      ordered: true
+      regex:
+        - "system off demo"
+        - "Retained data not supported"
+        - "Entering system off; wait 2 seconds to restart"
+        - "system off demo"
+        - "Retained data not supported"
+        - "Entering system off; wait 2 seconds to restart"
+        - "system off demo"
+        - "Retained data not supported"
+        - "Entering system off; wait 2 seconds to restart"
+  sample.boards.nrf.system_off.retained_mem.grtc_wakeup:
+    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay"
+    platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
+    extra_configs:
+      - CONFIG_APP_USE_RETAINED_MEM=y
+      - CONFIG_GRTC_WAKEUP_ENABLE=y
+      - CONFIG_RETAINED_MEM=y
+    harness: console
+    harness_config:
+      type: multi_line
+      ordered: true
+      regex:
+        - "system off demo"
+        - "Retained data: INVALID"
+        - "Boot count: 1"
+        - "Off count: 0"
+        - "Active Ticks:"
+        - "Entering system off; wait 2 seconds to restart"
+        - "system off demo"
+        - "Retained data: valid"
+        - "Boot count: 2"
+        - "Off count: 1"
+        - "Active Ticks:"
+        - "Entering system off; wait 2 seconds to restart"

From fdff0c586699b73ff56beee2878e85e2ec872183 Mon Sep 17 00:00:00 2001
From: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
Date: Thu, 28 Nov 2024 07:07:27 +0100
Subject: [PATCH 0736/2913] [nrf fromlist] tests: drivers: gpio:
 gpio_basic_api: restore support for nrf54l15 flpr

Missing after PDK->DK.

Upstream PR #: 82200

Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
(cherry picked from commit b2571927ed316e0ae110bffdc5f35311c80511aa)
---
 .../gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay    | 1 +
 .../boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay               | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
 create mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay

diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
new file mode 100644
index 00000000000..e26399cd4c4
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
@@ -0,0 +1 @@
+#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay
new file mode 100644
index 00000000000..e26399cd4c4
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay
@@ -0,0 +1 @@
+#include "nrf54l15dk_nrf54l15_cpuapp.overlay"

From 2b43663f36e220160b21f2416542f21302fd8140 Mon Sep 17 00:00:00 2001
From: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Date: Fri, 22 Nov 2024 17:09:59 +0100
Subject: [PATCH 0737/2913] [nrf fromtree] Bluetooth: Host: Log when connecting
 while scanning may give bad params

The API documentation already states that the controller may require
the scan interval and window used for scanning and connection
establishment to be equal to obtain the best performance.

This commit prints out a warning when this is not the case. The code
size is unchanged when `CONFIG_BT_SCAN_AND_INITIATE_IN_PARALLEL=n`.

This makes application developers aware that using the parameters
`BT_LE_SCAN_ACTIVE_CONTINUOUS` with `BT_CONN_LE_CREATE_CONN` may not
give the best performance.

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
(cherry picked from commit 56a22cbccb90a3a56825d07f23ac2d5359fa9289)
(cherry picked from commit 5f7ad5bf6604678b0d5b7ec792e8b3929b6ecb61)
---
 subsys/bluetooth/host/conn.c |  6 ++++++
 subsys/bluetooth/host/scan.c | 17 +++++++++++++++++
 subsys/bluetooth/host/scan.h | 10 ++++++++++
 3 files changed, 33 insertions(+)

diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 9797337000a..8a62c1fb3ba 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -3756,6 +3756,12 @@ int bt_conn_le_create(const bt_addr_le_t *peer, const struct bt_conn_le_create_p
 		return -ENOMEM;
 	}
 
+	if (BT_LE_STATES_SCAN_INIT(bt_dev.le.states) &&
+	    bt_le_explicit_scanner_running() &&
+	    !bt_le_explicit_scanner_uses_same_params(create_param)) {
+		LOG_WRN("Use same scan and connection create params to obtain best performance");
+	}
+
 	create_param_setup(create_param);
 
 #if defined(CONFIG_BT_SMP)
diff --git a/subsys/bluetooth/host/scan.c b/subsys/bluetooth/host/scan.c
index 0dbfa27bd08..05ad120fb38 100644
--- a/subsys/bluetooth/host/scan.c
+++ b/subsys/bluetooth/host/scan.c
@@ -2414,3 +2414,20 @@ bool bt_le_explicit_scanner_running(void)
 {
 	return atomic_test_bit(scan_state.scan_flags, BT_LE_SCAN_USER_EXPLICIT_SCAN);
 }
+
+bool bt_le_explicit_scanner_uses_same_params(const struct bt_conn_le_create_param *create_param)
+{
+	if (scan_state.explicit_scan_param.window != create_param->window ||
+	    scan_state.explicit_scan_param.interval != create_param->interval){
+		return false;
+	}
+
+	if (scan_state.explicit_scan_param.options & BT_LE_SCAN_OPT_CODED) {
+		if (scan_state.explicit_scan_param.window_coded != create_param->window_coded ||
+		    scan_state.explicit_scan_param.interval_coded != create_param->interval_coded){
+			return false;
+		}
+	}
+
+	return true;
+}
diff --git a/subsys/bluetooth/host/scan.h b/subsys/bluetooth/host/scan.h
index b30adfca3ba..85e1e4f828b 100644
--- a/subsys/bluetooth/host/scan.h
+++ b/subsys/bluetooth/host/scan.h
@@ -121,4 +121,14 @@ int bt_le_scan_user_remove(enum bt_le_scan_user flag);
  * Check if the explicit scanner was enabled.
  */
 bool bt_le_explicit_scanner_running(void);
+
+/**
+ * Check if an explicit scanner uses the same parameters
+ *
+ * @param create_param Parameters used for connection establishment.
+ *
+ * @return true If explicit scanner uses the same parameters
+ * @return false If explicit scanner uses different parameters
+ */
+bool bt_le_explicit_scanner_uses_same_params(const struct bt_conn_le_create_param *create_param);
 #endif /* defined SUBSYS_BLUETOOTH_HOST_SCAN_H_ */

From a3bd26244c94862f90149430c176c3ff5ff557bd Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Tue, 1 Oct 2024 15:24:02 +0300
Subject: [PATCH 0738/2913] [nrf fromtree] net: lwm2m: Remove hostname_verify
 flag from context

Use security mode (PSK or X509) to detect if we should
set the socket option to verify hostname.

PSK security mode cannot verify hostnames as this information
is coming in the certificate, so don't set the options.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 73a3438b8204a61211b5f78786799a8e6ba77afa)
(cherry picked from commit 7e33f19a2c8fd250c5d76e71896796f80f05f6f4)
---
 include/zephyr/net/lwm2m.h                    | 2 --
 subsys/net/lib/lwm2m/lwm2m_engine.c           | 2 +-
 subsys/net/lib/lwm2m/lwm2m_message_handling.c | 1 -
 tests/net/lib/lwm2m/lwm2m_engine/src/main.c   | 9 +++------
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/include/zephyr/net/lwm2m.h b/include/zephyr/net/lwm2m.h
index d69e508c8f3..8a2cbf557d0 100644
--- a/include/zephyr/net/lwm2m.h
+++ b/include/zephyr/net/lwm2m.h
@@ -245,8 +245,6 @@ struct lwm2m_ctx {
 	char *desthostname;
 	/** Destination hostname length */
 	uint16_t desthostnamelen;
-	/** Flag to indicate if hostname verification is enabled */
-	bool hostname_verify;
 
 	/** Custom load_credentials function.
 	 *  Client can set load_credentials function as a way of overriding
diff --git a/subsys/net/lib/lwm2m/lwm2m_engine.c b/subsys/net/lib/lwm2m/lwm2m_engine.c
index 03d978fb913..833b72217f1 100644
--- a/subsys/net/lib/lwm2m/lwm2m_engine.c
+++ b/subsys/net/lib/lwm2m/lwm2m_engine.c
@@ -1070,7 +1070,7 @@ int lwm2m_set_default_sockopt(struct lwm2m_ctx *ctx)
 			}
 		}
 
-		if (ctx->hostname_verify && (ctx->desthostname != NULL)) {
+		if (ctx->desthostname != NULL && lwm2m_security_mode(ctx) == LWM2M_SECURITY_CERT) {
 			/** store character at len position */
 			tmp = ctx->desthostname[ctx->desthostnamelen];
 
diff --git a/subsys/net/lib/lwm2m/lwm2m_message_handling.c b/subsys/net/lib/lwm2m/lwm2m_message_handling.c
index 1b136fd8fdc..95347719206 100644
--- a/subsys/net/lib/lwm2m/lwm2m_message_handling.c
+++ b/subsys/net/lib/lwm2m/lwm2m_message_handling.c
@@ -3324,7 +3324,6 @@ int lwm2m_parse_peerinfo(char *url, struct lwm2m_ctx *client_ctx, bool is_firmwa
 		/** copy url pointer to be used in socket */
 		client_ctx->desthostname = url + off;
 		client_ctx->desthostnamelen = len;
-		client_ctx->hostname_verify = true;
 #endif
 
 #else
diff --git a/tests/net/lib/lwm2m/lwm2m_engine/src/main.c b/tests/net/lib/lwm2m/lwm2m_engine/src/main.c
index d982f3aecae..fc1f8dea2de 100644
--- a/tests/net/lib/lwm2m/lwm2m_engine/src/main.c
+++ b/tests/net/lib/lwm2m/lwm2m_engine/src/main.c
@@ -105,7 +105,6 @@ ZTEST(lwm2m_engine, test_start_stop)
 	ctx.load_credentials = NULL;
 	ctx.desthostname = host_name;
 	ctx.desthostnamelen = strlen(host_name);
-	ctx.hostname_verify = true;
 	ctx.use_dtls = true;
 
 	ret = lwm2m_engine_start(&ctx);
@@ -436,7 +435,6 @@ ZTEST(lwm2m_engine, test_security)
 	ctx.load_credentials = NULL;
 	ctx.desthostname = host_name;
 	ctx.desthostnamelen = strlen(host_name);
-	ctx.hostname_verify = true;
 	ctx.use_dtls = false;
 
 	lwm2m_security_mode_fake.return_val = LWM2M_SECURITY_NOSEC;
@@ -452,9 +450,8 @@ ZTEST(lwm2m_engine, test_security)
 	lwm2m_security_mode_fake.return_val = LWM2M_SECURITY_PSK;
 	zassert_equal(lwm2m_engine_start(&ctx), 0);
 	zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[0], TLS_SEC_TAG_LIST);
-	zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[1], TLS_HOSTNAME);
-	zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[2], TLS_PEER_VERIFY);
-	zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[3], TLS_CIPHERSUITE_LIST);
+	zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[1], TLS_PEER_VERIFY);
+	zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[2], TLS_CIPHERSUITE_LIST);
 	zassert_true(tls_credential_delete_fake.call_count > 3);
 	zassert_true(tls_credential_add_fake.call_count == 2);
 	zassert_equal(tls_credential_add_fake.arg1_history[0], TLS_CREDENTIAL_PSK_ID);
@@ -464,7 +461,7 @@ ZTEST(lwm2m_engine, test_security)
 	RESET_FAKE(z_impl_zsock_setsockopt);
 	RESET_FAKE(tls_credential_add);
 	lwm2m_security_mode_fake.return_val = LWM2M_SECURITY_CERT;
-	ctx.hostname_verify = false;
+	ctx.desthostname = NULL;
 	zassert_equal(lwm2m_engine_start(&ctx), 0);
 	zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[0], TLS_SEC_TAG_LIST);
 	zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[1], TLS_PEER_VERIFY);

From 7655e94e15204875241a04f28b9a57d72df54d16 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Wed, 2 Oct 2024 17:22:57 +0300
Subject: [PATCH 0739/2913] [nrf fromtree] net: lwm2m: Add shell command for
 listing resources

Add shell command for listing multiple objects, resources
or resource instances.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 8068cb2567508d760e71f04042f0301fdd081403)
(cherry picked from commit fec16439e4b76e7e09a58817da3cf24cab25450f)
---
 doc/connectivity/networking/api/lwm2m.rst |   3 +
 subsys/net/lib/lwm2m/lwm2m_shell.c        | 123 +++++++++++++++++++++-
 2 files changed, 125 insertions(+), 1 deletion(-)

diff --git a/doc/connectivity/networking/api/lwm2m.rst b/doc/connectivity/networking/api/lwm2m.rst
index b0d1a04f0de..cc48086613f 100644
--- a/doc/connectivity/networking/api/lwm2m.rst
+++ b/doc/connectivity/networking/api/lwm2m.rst
@@ -789,6 +789,9 @@ required actions from the server side.
     resume  :LwM2M engine thread resume
     lock    :Lock the LwM2M registry
     unlock  :Unlock the LwM2M registry
+    obs     : List observations
+    ls      : ls [PATH]
+            List objects, instances, resources
 
 
 
diff --git a/subsys/net/lib/lwm2m/lwm2m_shell.c b/subsys/net/lib/lwm2m/lwm2m_shell.c
index 03e8cff7471..59749763263 100644
--- a/subsys/net/lib/lwm2m/lwm2m_shell.c
+++ b/subsys/net/lib/lwm2m/lwm2m_shell.c
@@ -56,7 +56,8 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #define LWM2M_HELP_OBSERV "List observations"
 #define LWM2M_HELP_CACHE "cache PATH NUM\nEnable data cache for resource\n" \
 	"PATH is LwM2M path\n" \
-	"NUM how many elements to cache\n" \
+	"NUM how many elements to cache\n"
+#define LWM2M_HELP_LS "ls [PATH]\nList objects, instances, resources\n"
 
 static void send_cb(enum lwm2m_send_status status)
 {
@@ -712,6 +713,125 @@ static int cmd_observations(const struct shell *sh, size_t argc, char **argv)
 	return 0;
 }
 
+static int print_object_instance(const struct shell *sh, struct lwm2m_engine_obj_inst *oi)
+{
+	struct lwm2m_engine_obj *obj;
+
+	if (!oi) {
+		return -ENOEXEC;
+	}
+
+	obj = oi->obj;
+
+	for (int i = 0; i < oi->resource_count; i++) {
+		struct lwm2m_engine_res *re = &oi->resources[i];
+
+		for (int j = 0; j < re->res_inst_count; j++) {
+			struct lwm2m_engine_res_inst *ri = &re->res_instances[j];
+
+			if (ri->data_ptr && ri->data_len > 0 &&
+			    ri->res_inst_id != RES_INSTANCE_NOT_CREATED) {
+				struct lwm2m_engine_obj_field *field =
+					lwm2m_get_engine_obj_field(obj, re->res_id);
+				char path[LWM2M_MAX_PATH_STR_SIZE];
+
+				if (re->multi_res_inst) {
+					snprintf(path, sizeof(path), "%hu/%hu/%hu/%hu", obj->obj_id,
+						 oi->obj_inst_id, re->res_id, ri->res_inst_id);
+				} else {
+					snprintf(path, sizeof(path), "%hu/%hu/%hu", obj->obj_id,
+						 oi->obj_inst_id, re->res_id);
+				}
+				switch (field->data_type) {
+				case LWM2M_RES_TYPE_STRING:
+					shell_print(sh, "%s : %s", path, (char *)ri->data_ptr);
+					break;
+				case LWM2M_RES_TYPE_U8:
+				case LWM2M_RES_TYPE_S8:
+				case LWM2M_RES_TYPE_BOOL:
+					shell_print(sh, "%s : %u", path, *(uint8_t *)ri->data_ptr);
+					break;
+				case LWM2M_RES_TYPE_U16:
+				case LWM2M_RES_TYPE_S16:
+					shell_print(sh, "%s : %u", path, *(uint16_t *)ri->data_ptr);
+					break;
+				case LWM2M_RES_TYPE_U32:
+				case LWM2M_RES_TYPE_S32:
+					shell_print(sh, "%s : %u", path, *(uint32_t *)ri->data_ptr);
+					break;
+				case LWM2M_RES_TYPE_S64:
+				case LWM2M_RES_TYPE_TIME:
+					shell_print(sh, "%s : %lld", path,
+						    *(int64_t *)ri->data_ptr);
+					break;
+				case LWM2M_RES_TYPE_FLOAT:
+					shell_print(sh, "%s : %lf", path, *(double *)ri->data_ptr);
+					break;
+				case LWM2M_RES_TYPE_OPAQUE:
+					shell_print(sh, "%s : OPAQUE(%hu/%hu)", path, ri->data_len,
+						    ri->max_data_len);
+					break;
+				}
+			}
+		}
+	}
+	return 0;
+}
+
+static int print_object(const struct shell *sh, struct lwm2m_engine_obj *obj)
+{
+	if (!obj) {
+		return -ENOEXEC;
+	}
+	struct lwm2m_engine_obj_inst *oi = next_engine_obj_inst(obj->obj_id, -1);
+
+	for (int i = 0; i < obj->instance_count; i++) {
+		print_object_instance(sh, oi);
+		oi = next_engine_obj_inst(obj->obj_id, oi->obj_inst_id);
+	}
+	return 0;
+}
+
+static int print_all_objs(const struct shell *sh)
+{
+	struct lwm2m_engine_obj *obj;
+
+	SYS_SLIST_FOR_EACH_CONTAINER(lwm2m_engine_obj_list(), obj, node) {
+		print_object(sh, obj);
+	}
+	return 0;
+}
+
+static int cmd_ls(const struct shell *sh, size_t argc, char **argv)
+{
+	struct lwm2m_obj_path path;
+	int ret;
+
+	if (argc < 2) {
+		return print_all_objs(sh);
+	}
+
+	ret = lwm2m_string_to_path(argv[1], &path, '/');
+	if (ret < 0) {
+		return -ENOEXEC;
+	}
+
+	if (path.level == LWM2M_PATH_LEVEL_NONE) {
+		return print_all_objs(sh);
+	} else if (path.level == LWM2M_PATH_LEVEL_OBJECT) {
+		struct lwm2m_engine_obj *obj = lwm2m_engine_get_obj(&path);
+
+		return print_object(sh, obj);
+	} else if (path.level == LWM2M_PATH_LEVEL_OBJECT_INST) {
+		struct lwm2m_engine_obj_inst *oi = lwm2m_engine_get_obj_inst(&path);
+
+		return print_object_instance(sh, oi);
+	} else if (path.level == LWM2M_PATH_LEVEL_RESOURCE) {
+		return cmd_read(sh, argc, argv);
+	}
+	return -ENOEXEC;
+}
+
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	sub_lwm2m,
 	SHELL_COND_CMD_ARG(CONFIG_LWM2M_VERSION_1_1, send, NULL,
@@ -730,6 +850,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 	SHELL_CMD_ARG(lock, NULL, LWM2M_HELP_LOCK, cmd_lock, 1, 0),
 	SHELL_CMD_ARG(unlock, NULL, LWM2M_HELP_UNLOCK, cmd_unlock, 1, 0),
 	SHELL_CMD_ARG(obs, NULL, LWM2M_HELP_OBSERV, cmd_observations, 1, 0),
+	SHELL_CMD_ARG(ls, NULL, LWM2M_HELP_LS, cmd_ls, 1, 1),
 	SHELL_SUBCMD_SET_END);
 SHELL_COND_CMD_ARG_REGISTER(CONFIG_LWM2M_SHELL, lwm2m, &sub_lwm2m,
 			    LWM2M_HELP_CMD, NULL, 1, 0);

From 3eb363876bddde0edce2e4c880276db8b81d065b Mon Sep 17 00:00:00 2001
From: Brandon Allen <brandon.allen@exacttechnology.com>
Date: Thu, 17 Oct 2024 12:35:09 -0400
Subject: [PATCH 0740/2913] [nrf fromtree] net: lib: lwm2m:
 lwm2m_rw_senml_cbor: only assign time on get_s64() success

Currently GCC complains that temp64 may be used uninitialized in this
 function. Adds a check to ensure time is valid before assignining
 and fixes GCC warning.

Signed-off-by: Brandon Allen <brandon.allen@exacttechnology.com>
(cherry picked from commit bb24c83d706bce0274c2d6cdc3bd472ca2906c9d)
(cherry picked from commit 0631f34d56431d48357416f0d4c30bbb2a702190)
---
 subsys/net/lib/lwm2m/lwm2m_rw_senml_cbor.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/subsys/net/lib/lwm2m/lwm2m_rw_senml_cbor.c b/subsys/net/lib/lwm2m/lwm2m_rw_senml_cbor.c
index c371840b113..2429c60864f 100644
--- a/subsys/net/lib/lwm2m/lwm2m_rw_senml_cbor.c
+++ b/subsys/net/lib/lwm2m/lwm2m_rw_senml_cbor.c
@@ -601,7 +601,9 @@ static int get_time(struct lwm2m_input_context *in, time_t *value)
 	int ret;
 
 	ret = get_s64(in, &temp64);
-	*value = (time_t)temp64;
+	if (ret == 0) {
+		*value = (time_t)temp64;
+	}
 
 	return ret;
 }

From 4ff5024dce9b48b9f871b743421ddf667288fd5f Mon Sep 17 00:00:00 2001
From: Jeroen Broersen <jbroersen@interact.nl>
Date: Fri, 25 Oct 2024 18:30:23 +0200
Subject: [PATCH 0741/2913] [nrf fromtree] net: lwm2m: Add
 TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 to cipher list

Add TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 to the list for use with x509
certificates. The LWM2M v1.1 specification says that a LWM2M client
which used X509 certificates must support this ciphersuite and
additional ciphersuites may be supported.

Signed-off-by: Jeroen Broersen <jbroersen@interact.nl>
(cherry picked from commit f889c1ababfbef49d215b04e75dc05a0a30bfa3e)
(cherry picked from commit 2d10b8cfd35cc958c565bd0ce1a664467ae71eec)
---
 subsys/net/lib/lwm2m/lwm2m_engine.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/subsys/net/lib/lwm2m/lwm2m_engine.c b/subsys/net/lib/lwm2m/lwm2m_engine.c
index 833b72217f1..bafa1be4517 100644
--- a/subsys/net/lib/lwm2m/lwm2m_engine.c
+++ b/subsys/net/lib/lwm2m/lwm2m_engine.c
@@ -1023,6 +1023,7 @@ static const int cipher_list_psk[] = {
 };
 
 static const int cipher_list_cert[] = {
+	MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8,
 	MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
 };
 

From e8add6b6b8b5dd48c4772c6e44a7d8e51236448f Mon Sep 17 00:00:00 2001
From: Pieter De Gendt <pieter.degendt@basalte.be>
Date: Wed, 13 Nov 2024 08:39:54 +0100
Subject: [PATCH 0742/2913] [nrf fromtree] tests: net: lib: lwm2m: interop: Fix
 strip-with-multi-characters (B005)

All strip functions remove any of the provided characters instead of a
prefix/suffix. This is likely a bug.

See https://docs.astral.sh/ruff/rules/strip-with-multi-characters/

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
(cherry picked from commit 175bfb4bc9e59371a8101af96c6ff853ad18dab6)
(cherry picked from commit 88a53afa4f303290368ab2c87c1ca87f223bbdbc)
---
 tests/net/lib/lwm2m/interop/pytest/leshan.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/net/lib/lwm2m/interop/pytest/leshan.py b/tests/net/lib/lwm2m/interop/pytest/leshan.py
index 024bc6775c0..916661a8a4e 100644
--- a/tests/net/lib/lwm2m/interop/pytest/leshan.py
+++ b/tests/net/lib/lwm2m/interop/pytest/leshan.py
@@ -455,7 +455,7 @@ def next_event(self, event: str):
                     for line in self._it:
                         if not line.startswith('data: '):
                             continue
-                        data = json.loads(line.lstrip('data: '))
+                        data = json.loads(line.removeprefix('data: '))
                         if event == 'SEND' or (event == 'NOTIFICATION' and data['kind'] == 'composite'):
                             return Leshan.parse_composite(data['val'])
                         if event == 'NOTIFICATION':

From 591e5ddddc764d28aef4750e50394a40cab16161 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Mon, 11 Nov 2024 14:35:30 +0200
Subject: [PATCH 0743/2913] [nrf fromtree] tests: coap_client: Improve socket
 stubs

* Use sys_rand_get() and seed the CoAP library, so our MIDs are
  random.
* Set socket events per socket, so we don't accidentally receive
  on wrong socket
* Reply with correct tokens

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit ca67f51170a53f32ff9c0769d085fcbc47b905da)
(cherry picked from commit 5b2299ceabc9c749b1ed68c1924947e0c08bd9d5)
---
 tests/net/lib/coap_client/prj.conf    |  1 +
 tests/net/lib/coap_client/src/main.c  | 91 +++++++++++++++++++--------
 tests/net/lib/coap_client/src/stubs.c | 20 +++---
 tests/net/lib/coap_client/src/stubs.h |  7 +--
 4 files changed, 77 insertions(+), 42 deletions(-)

diff --git a/tests/net/lib/coap_client/prj.conf b/tests/net/lib/coap_client/prj.conf
index c7265029a21..8405a56f800 100644
--- a/tests/net/lib/coap_client/prj.conf
+++ b/tests/net/lib/coap_client/prj.conf
@@ -1,3 +1,4 @@
 #Testing
 CONFIG_ZTEST=y
 CONFIG_ZTEST_STACK_SIZE=4096
+CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index f06a0ce646c..e066f86bae6 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -11,7 +11,7 @@
 
 #include "stubs.h"
 
-LOG_MODULE_REGISTER(coap_client_test);
+LOG_MODULE_REGISTER(coap_client_test, LOG_LEVEL_DBG);
 
 DEFINE_FFF_GLOBALS;
 #define FFF_FAKES_LIST(FAKE)
@@ -23,11 +23,14 @@ DEFINE_FFF_GLOBALS;
 	(CONFIG_COAP_INIT_ACK_TIMEOUT_MS + CONFIG_COAP_INIT_ACK_TIMEOUT_MS / 2)
 
 #define VALID_MESSAGE_ID BIT(31)
+#define TOKEN_OFFSET          4
 
 static int16_t last_response_code;
 static const char *test_path = "test";
 
 static uint32_t messages_needing_response[2];
+static uint8_t last_token[2][COAP_TOKEN_MAX_LEN];
+static const uint8_t empty_token[COAP_TOKEN_MAX_LEN] = {0};
 
 static struct coap_client client;
 
@@ -61,6 +64,27 @@ static void set_next_pending_message_id(uint16_t id)
 	}
 }
 
+static void store_token(uint8_t *buf)
+{
+	for (int i = 0; i < ARRAY_SIZE(last_token); i++) {
+		if (memcmp(last_token[i], empty_token, 8) == 0) {
+			memcpy(last_token[i], buf + TOKEN_OFFSET, COAP_TOKEN_MAX_LEN);
+			return;
+		}
+	}
+}
+
+static void restore_token(uint8_t *buf)
+{
+	for (int i = 0; i < ARRAY_SIZE(last_token); i++) {
+		if (memcmp(last_token[i], empty_token, 8) != 0) {
+			memcpy(buf + TOKEN_OFFSET, last_token[i], COAP_TOKEN_MAX_LEN);
+			memset(last_token[i], 0, COAP_TOKEN_MAX_LEN);
+			return;
+		}
+	}
+}
+
 static ssize_t z_impl_zsock_recvfrom_custom_fake(int sock, void *buf, size_t max_len, int flags,
 						 struct sockaddr *src_addr, socklen_t *addrlen)
 {
@@ -74,10 +98,11 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake(int sock, void *buf, size_t max
 
 	ack_data[2] = (uint8_t)(last_message_id >> 8);
 	ack_data[3] = (uint8_t)last_message_id;
+	restore_token(ack_data);
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
-	clear_socket_events(ZSOCK_POLLIN);
+	clear_socket_events(sock, ZSOCK_POLLIN);
 
 	return sizeof(ack_data);
 }
@@ -90,14 +115,14 @@ static ssize_t z_impl_zsock_sendto_custom_fake(int sock, void *buf, size_t len,
 
 	last_message_id |= ((uint8_t *)buf)[2] << 8;
 	last_message_id |= ((uint8_t *)buf)[3];
-
 	type = (((uint8_t *)buf)[0] & 0x30) >> 4;
+	store_token(buf);
 
 	set_next_pending_message_id(last_message_id);
 	LOG_INF("Latest message ID: %d", last_message_id);
 
 	if (type == 0) {
-		set_socket_events(ZSOCK_POLLIN);
+		set_socket_events(sock, ZSOCK_POLLIN);
 	}
 
 	return 1;
@@ -111,6 +136,7 @@ static ssize_t z_impl_zsock_sendto_custom_fake_no_reply(int sock, void *buf, siz
 
 	last_message_id |= ((uint8_t *)buf)[2] << 8;
 	last_message_id |= ((uint8_t *)buf)[3];
+	store_token(buf);
 
 	set_next_pending_message_id(last_message_id);
 	LOG_INF("Latest message ID: %d", last_message_id);
@@ -128,6 +154,7 @@ static ssize_t z_impl_zsock_sendto_custom_fake_echo(int sock, void *buf, size_t
 
 	last_message_id |= ((uint8_t *)buf)[2] << 8;
 	last_message_id |= ((uint8_t *)buf)[3];
+	store_token(buf);
 
 	set_next_pending_message_id(last_message_id);
 	LOG_INF("Latest message ID: %d", last_message_id);
@@ -144,7 +171,7 @@ static ssize_t z_impl_zsock_sendto_custom_fake_echo(int sock, void *buf, size_t
 
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake;
 
-	set_socket_events(ZSOCK_POLLIN);
+	set_socket_events(sock, ZSOCK_POLLIN);
 
 	return 1;
 }
@@ -160,6 +187,7 @@ static ssize_t z_impl_zsock_sendto_custom_fake_echo_next_req(int sock, void *buf
 
 	last_message_id |= ((uint8_t *)buf)[2] << 8;
 	last_message_id |= ((uint8_t *)buf)[3];
+	store_token(buf);
 
 	set_next_pending_message_id(last_message_id);
 	LOG_INF("Latest message ID: %d", last_message_id);
@@ -184,7 +212,7 @@ static ssize_t z_impl_zsock_sendto_custom_fake_echo_next_req(int sock, void *buf
 
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake;
 
-	set_socket_events(ZSOCK_POLLIN);
+	set_socket_events(sock, ZSOCK_POLLIN);
 
 	return 1;
 }
@@ -202,10 +230,11 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_response(int sock, void *buf, s
 
 	ack_data[2] = (uint8_t)(last_message_id >> 8);
 	ack_data[3] = (uint8_t)last_message_id;
+	restore_token(ack_data);
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
-	clear_socket_events(ZSOCK_POLLIN);
+	clear_socket_events(sock, ZSOCK_POLLIN);
 
 	return sizeof(ack_data);
 }
@@ -216,7 +245,7 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_empty_ack(int sock, void *buf,
 {
 	uint16_t last_message_id = 0;
 
-	static uint8_t ack_data[] = {0x68, 0x00, 0x00, 0x00, 0x00, 0x00,
+	static uint8_t ack_data[] = {0x60, 0x00, 0x00, 0x00, 0x00, 0x00,
 				     0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
 	last_message_id = get_next_pending_message_id();
@@ -247,7 +276,7 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_unmatching(int sock, void *buf,
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
-	clear_socket_events(ZSOCK_POLLIN);
+	clear_socket_events(sock, ZSOCK_POLLIN);
 
 	return sizeof(ack_data);
 }
@@ -267,13 +296,14 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_echo(int sock, void *buf, size_
 
 	ack_data[2] = (uint8_t)(last_message_id >> 8);
 	ack_data[3] = (uint8_t)last_message_id;
+	restore_token(ack_data);
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_response;
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_echo;
 
-	clear_socket_events(ZSOCK_POLLIN);
+	clear_socket_events(sock, ZSOCK_POLLIN);
 
 	return sizeof(ack_data);
 }
@@ -293,19 +323,23 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_echo_next_req(int sock, void *b
 
 	ack_data[2] = (uint8_t)(last_message_id >> 8);
 	ack_data[3] = (uint8_t)last_message_id;
+	restore_token(ack_data);
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_response;
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_echo_next_req;
 
-	clear_socket_events(ZSOCK_POLLIN);
+	clear_socket_events(sock, ZSOCK_POLLIN);
 
 	return sizeof(ack_data);
 }
 
+extern void net_coap_init(void);
+
 static void *suite_setup(void)
 {
+	net_coap_init();
 	coap_client_init(&client, NULL);
 
 	return NULL;
@@ -315,6 +349,8 @@ static void test_setup(void *data)
 {
 	int i;
 
+	k_mutex_lock(&client.lock, K_FOREVER);
+
 	/* Register resets */
 	DO_FOREACH_FAKE(RESET_FAKE);
 	/* reset common FFF internal structures */
@@ -322,13 +358,19 @@ static void test_setup(void *data)
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake;
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake;
-	clear_socket_events(ZSOCK_POLLIN | ZSOCK_POLLOUT | ZSOCK_POLLERR);
+	clear_socket_events(0, ZSOCK_POLLIN | ZSOCK_POLLOUT | ZSOCK_POLLERR);
+	clear_socket_events(1, ZSOCK_POLLIN | ZSOCK_POLLOUT | ZSOCK_POLLERR);
 
 	for (i = 0; i < ARRAY_SIZE(messages_needing_response); i++) {
 		messages_needing_response[i] = 0;
 	}
 
+	memset(&client.requests, 0, sizeof(client.requests));
+	memset(last_token, 0, sizeof(last_token));
+
 	last_response_code = 0;
+
+	k_mutex_unlock(&client.lock);
 }
 
 void coap_callback(int16_t code, size_t offset, const uint8_t *payload, size_t len, bool last_block,
@@ -396,7 +438,7 @@ ZTEST(coap_client, test_resend_request)
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	k_sleep(K_MSEC(MORE_THAN_ACK_TIMEOUT_MS));
-	set_socket_events(ZSOCK_POLLIN | ZSOCK_POLLOUT);
+	set_socket_events(client.fd, ZSOCK_POLLIN | ZSOCK_POLLOUT);
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
@@ -551,7 +593,7 @@ ZTEST(coap_client, test_no_response)
 	client_request.len = strlen(short_payload);
 
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
-	set_socket_events(ZSOCK_POLLOUT);
+	set_socket_events(client.fd, ZSOCK_POLLOUT);
 
 	k_sleep(K_MSEC(1));
 
@@ -628,7 +670,7 @@ ZTEST(coap_client, test_multiple_requests)
 	ret = coap_client_req(&client, 0, &address, &req2, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
-	set_socket_events(ZSOCK_POLLIN);
+	set_socket_events(client.fd, ZSOCK_POLLIN);
 	while (last_response_code == 0 && retry > 0) {
 		retry--;
 		k_sleep(K_MSEC(1));
@@ -636,7 +678,7 @@ ZTEST(coap_client, test_multiple_requests)
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
 	last_response_code = 0;
-	set_socket_events(ZSOCK_POLLIN);
+	set_socket_events(client.fd, ZSOCK_POLLIN);
 	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
@@ -665,7 +707,7 @@ ZTEST(coap_client, test_unmatching_tokens)
 	client_request.len = strlen(short_payload);
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_unmatching;
-	set_socket_events(ZSOCK_POLLIN | ZSOCK_POLLOUT);
+	set_socket_events(client.fd, ZSOCK_POLLIN | ZSOCK_POLLOUT);
 
 	k_sleep(K_MSEC(1));
 
@@ -681,9 +723,6 @@ ZTEST(coap_client, test_multiple_clients)
 {
 	int ret;
 	int retry = MORE_THAN_EXCHANGE_LIFETIME_MS;
-	static struct coap_client client2 = {
-		.fd = 2,
-	};
 	struct k_sem sem1, sem2;
 	struct sockaddr address = {0};
 	struct coap_client_request req1 = {
@@ -710,17 +749,17 @@ ZTEST(coap_client, test_multiple_clients)
 	k_sleep(K_MSEC(1));
 
 	LOG_INF("Sending requests");
-	ret = coap_client_req(&client, 1, &address, &req1, NULL);
+	ret = coap_client_req(&client, client.fd, &address, &req1, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
-	ret = coap_client_req(&client2, 2, &address, &req2, NULL);
+	ret = coap_client_req(&client2, client2.fd, &address, &req2, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
 	while (last_response_code == 0 && retry > 0) {
 		retry--;
 		k_sleep(K_MSEC(1));
 	}
-	set_socket_events(ZSOCK_POLLIN);
+	set_socket_events(client2.fd, ZSOCK_POLLIN);
 
 	k_sleep(K_SECONDS(1));
 
@@ -746,7 +785,7 @@ ZTEST(coap_client, test_poll_err)
 	};
 
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
-	set_socket_events(ZSOCK_POLLERR);
+	set_socket_events(client.fd, ZSOCK_POLLERR);
 
 	k_sleep(K_MSEC(1));
 
@@ -776,7 +815,7 @@ ZTEST(coap_client, test_poll_err_after_response)
 
 	zassert_ok(k_sem_init(&sem1, 0, 1));
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
-	set_socket_events(ZSOCK_POLLIN);
+	set_socket_events(client.fd, ZSOCK_POLLIN);
 
 	k_sleep(K_MSEC(1));
 
@@ -787,6 +826,6 @@ ZTEST(coap_client, test_poll_err_after_response)
 	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
-	set_socket_events(ZSOCK_POLLERR);
+	set_socket_events(client.fd, ZSOCK_POLLERR);
 	zassert_not_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 }
diff --git a/tests/net/lib/coap_client/src/stubs.c b/tests/net/lib/coap_client/src/stubs.c
index 63307e27fb7..f3451df054f 100644
--- a/tests/net/lib/coap_client/src/stubs.c
+++ b/tests/net/lib/coap_client/src/stubs.c
@@ -10,7 +10,6 @@
 LOG_MODULE_DECLARE(coap_client_test);
 
 DEFINE_FAKE_VALUE_FUNC(uint32_t, z_impl_sys_rand32_get);
-DEFINE_FAKE_VOID_FUNC(z_impl_sys_rand_get, void *, size_t);
 DEFINE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_recvfrom, int, void *, size_t, int, struct sockaddr *,
 		       socklen_t *);
 DEFINE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_sendto, int, void *, size_t, int,
@@ -22,21 +21,17 @@ struct zsock_pollfd {
 	short revents;
 };
 
-static short my_events;
+static short my_events[NUM_FD];
 
-void set_socket_events(short events)
+void set_socket_events(int fd, short events)
 {
-	my_events |= events;
+	__ASSERT_NO_MSG(fd < NUM_FD);
+	my_events[fd] |= events;
 }
 
-void clear_socket_events(short events)
+void clear_socket_events(int fd, short events)
 {
-	my_events &= ~events;
-}
-
-int z_impl_zsock_socket(int family, int type, int proto)
-{
-	return 0;
+	my_events[fd] &= ~events;
 }
 
 int z_impl_zsock_poll(struct zsock_pollfd *fds, int nfds, int poll_timeout)
@@ -44,7 +39,8 @@ int z_impl_zsock_poll(struct zsock_pollfd *fds, int nfds, int poll_timeout)
 	int events = 0;
 	k_sleep(K_MSEC(1));
 	for (int i = 0; i < nfds; i++) {
-		fds[i].revents = my_events & (fds[i].events | ZSOCK_POLLERR | ZSOCK_POLLHUP);
+		fds[i].revents =
+			my_events[fds[i].fd] & (fds[i].events | ZSOCK_POLLERR | ZSOCK_POLLHUP);
 		if (fds[i].revents) {
 			events++;
 		}
diff --git a/tests/net/lib/coap_client/src/stubs.h b/tests/net/lib/coap_client/src/stubs.h
index 9a9f929ce76..c3024536b54 100644
--- a/tests/net/lib/coap_client/src/stubs.h
+++ b/tests/net/lib/coap_client/src/stubs.h
@@ -36,12 +36,12 @@
 #define ZSOCK_POLLNVAL 0x20
 /** @} */
 
+#define NUM_FD 2
 
-void set_socket_events(short events);
-void clear_socket_events(short events);
+void set_socket_events(int fd, short events);
+void clear_socket_events(int fd, short events);
 
 DECLARE_FAKE_VALUE_FUNC(uint32_t, z_impl_sys_rand32_get);
-DECLARE_FAKE_VOID_FUNC(z_impl_sys_rand_get, void *, size_t);
 DECLARE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_recvfrom, int, void *, size_t, int, struct sockaddr *,
 			socklen_t *);
 DECLARE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_sendto, int, void*, size_t, int,
@@ -50,7 +50,6 @@ DECLARE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_sendto, int, void*, size_t, int,
 #define DO_FOREACH_FAKE(FUNC)                                                                      \
 	do {                                                                                       \
 		FUNC(z_impl_sys_rand32_get)                                                        \
-		FUNC(z_impl_sys_rand_get)                                                          \
 		FUNC(z_impl_zsock_recvfrom)                                                        \
 		FUNC(z_impl_zsock_sendto)                                                          \
 	} while (0)

From fea1c8c4bae244a03045a80072b684ab64517899 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Mon, 11 Nov 2024 14:36:46 +0200
Subject: [PATCH 0744/2913] [nrf fromtree] tests: coap_client: Add test for
 duplicate response

Add test where we receive same UDP packet twice.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 83bc1fcb46b6c32d324c9c4d0fa697b51dfb5a0e)
(cherry picked from commit 836ff9d3550bf4aacf3652ec359962bbe96b5ad2)
---
 tests/net/lib/coap_client/CMakeLists.txt |  2 +-
 tests/net/lib/coap_client/src/main.c     | 55 ++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/tests/net/lib/coap_client/CMakeLists.txt b/tests/net/lib/coap_client/CMakeLists.txt
index d7f0c0cce5e..07a4d8a9827 100644
--- a/tests/net/lib/coap_client/CMakeLists.txt
+++ b/tests/net/lib/coap_client/CMakeLists.txt
@@ -26,7 +26,7 @@ add_compile_definitions(CONFIG_COAP_CLIENT_MESSAGE_HEADER_SIZE=48)
 add_compile_definitions(CONFIG_COAP_CLIENT_STACK_SIZE=1024)
 add_compile_definitions(CONFIG_COAP_CLIENT_THREAD_PRIORITY=10)
 add_compile_definitions(CONFIG_COAP_LOG_LEVEL=4)
-add_compile_definitions(CONFIG_COAP_INIT_ACK_TIMEOUT_MS=10)
+add_compile_definitions(CONFIG_COAP_INIT_ACK_TIMEOUT_MS=100)
 add_compile_definitions(CONFIG_COAP_CLIENT_MAX_REQUESTS=2)
 add_compile_definitions(CONFIG_COAP_CLIENT_MAX_INSTANCES=2)
 add_compile_definitions(CONFIG_COAP_MAX_RETRANSMIT=4)
diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index e066f86bae6..d03160ca53f 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -335,6 +335,30 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_echo_next_req(int sock, void *b
 	return sizeof(ack_data);
 }
 
+static ssize_t z_impl_zsock_recvfrom_custom_fake_duplicate_response(int sock, void *buf,
+								    size_t max_len, int flags,
+								    struct sockaddr *src_addr,
+								    socklen_t *addrlen)
+{
+	uint8_t token[TOKEN_OFFSET + COAP_TOKEN_MAX_LEN];
+
+	uint16_t last_message_id = get_next_pending_message_id();
+
+	restore_token(token);
+
+	set_next_pending_message_id(last_message_id);
+	set_next_pending_message_id(last_message_id);
+	store_token(token);
+	store_token(token);
+
+	int ret = z_impl_zsock_recvfrom_custom_fake(sock, buf, max_len, flags, src_addr, addrlen);
+
+	set_socket_events(sock, ZSOCK_POLLIN);
+	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake;
+
+	return ret;
+}
+
 extern void net_coap_init(void);
 
 static void *suite_setup(void)
@@ -829,3 +853,34 @@ ZTEST(coap_client, test_poll_err_after_response)
 	set_socket_events(client.fd, ZSOCK_POLLERR);
 	zassert_not_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 }
+
+ZTEST(coap_client, test_duplicate_response)
+{
+	int ret = 0;
+	struct k_sem sem;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem,
+	};
+
+	zassert_ok(k_sem_init(&sem, 0, 2));
+	z_impl_zsock_recvfrom_fake.custom_fake =
+		z_impl_zsock_recvfrom_custom_fake_duplicate_response;
+
+	k_sleep(K_MSEC(1));
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+
+	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
+
+	zassert_equal(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)), -EAGAIN, "");
+}

From f106640953519a58a3ed808a7d4293d61e4ac67f Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Mon, 11 Nov 2024 16:42:52 +0200
Subject: [PATCH 0745/2913] [nrf fromtree] tests: coap_client: Add test when
 separate response is lost

Test a scenario where Ack is received but the actual response
is not coming.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 120aabbb8f3bdc97e6338b0590cd738d0795615b)
(cherry picked from commit 98c71f748429d3973271c7146ce6dd0422621334)
---
 tests/net/lib/coap_client/src/main.c | 47 +++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index d03160ca53f..1ed77cbfc62 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -21,7 +21,7 @@ DEFINE_FFF_GLOBALS;
 #define MORE_THAN_LONG_EXCHANGE_LIFETIME_MS 4 * LONG_ACK_TIMEOUT_MS
 #define MORE_THAN_ACK_TIMEOUT_MS                                                                   \
 	(CONFIG_COAP_INIT_ACK_TIMEOUT_MS + CONFIG_COAP_INIT_ACK_TIMEOUT_MS / 2)
-
+#define COAP_SEPARATE_TIMEOUT (6000 * 3) /* Needs a safety marging, tests run faster than -rt */
 #define VALID_MESSAGE_ID BIT(31)
 #define TOKEN_OFFSET          4
 
@@ -33,6 +33,9 @@ static uint8_t last_token[2][COAP_TOKEN_MAX_LEN];
 static const uint8_t empty_token[COAP_TOKEN_MAX_LEN] = {0};
 
 static struct coap_client client;
+static struct coap_client client2 = {
+	.fd = 1,
+};
 
 static char *short_payload = "testing";
 static char *long_payload = LOREM_IPSUM_SHORT;
@@ -260,6 +263,18 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_empty_ack(int sock, void *buf,
 	return sizeof(ack_data);
 }
 
+static ssize_t z_impl_zsock_recvfrom_custom_fake_only_ack(int sock, void *buf, size_t max_len,
+							  int flags, struct sockaddr *src_addr,
+							  socklen_t *addrlen)
+{
+	int ret;
+
+	ret = z_impl_zsock_recvfrom_custom_fake_empty_ack(sock, buf, max_len, flags, src_addr,
+							  addrlen);
+	clear_socket_events(sock, ZSOCK_POLLIN);
+	return ret;
+}
+
 static ssize_t z_impl_zsock_recvfrom_custom_fake_unmatching(int sock, void *buf, size_t max_len,
 							    int flags, struct sockaddr *src_addr,
 							    socklen_t *addrlen)
@@ -659,6 +674,36 @@ ZTEST(coap_client, test_separate_response)
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
 
+ZTEST(coap_client, test_separate_response_lost)
+{
+	int ret = 0;
+	struct k_sem sem;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem,
+	};
+
+	zassert_ok(k_sem_init(&sem, 0, 1));
+	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_only_ack;
+	set_socket_events(client.fd, ZSOCK_POLLOUT);
+
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+
+	zassert_ok(k_sem_take(&sem, K_MSEC(COAP_SEPARATE_TIMEOUT)));
+	zassert_equal(last_response_code, -ETIMEDOUT, "");
+}
+
 ZTEST(coap_client, test_multiple_requests)
 {
 	int ret = 0;

From 5d9879b01ee383528312e7388ee86bbad9c90091 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Tue, 12 Nov 2024 13:32:53 +0200
Subject: [PATCH 0746/2913] [nrf fromtree] tests: coap_client: Improve retry
 testcases

Add testcases for testing client's retry behaviour.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 5559a520c9b0c619a32f306666a1618caed7c238)
(cherry picked from commit f2a301426ad947127cbda5fdc02f04fd54a8ba8d)
---
 tests/net/lib/coap_client/src/main.c | 57 ++++++++++++++++++++++++----
 1 file changed, 50 insertions(+), 7 deletions(-)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 1ed77cbfc62..330ad689b97 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -220,6 +220,22 @@ static ssize_t z_impl_zsock_sendto_custom_fake_echo_next_req(int sock, void *buf
 	return 1;
 }
 
+static ssize_t z_impl_zsock_sendto_custom_fake_block(int sock, void *buf, size_t len, int flags,
+						     const struct sockaddr *dest_addr,
+						     socklen_t addrlen)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+static ssize_t z_impl_zsock_sendto_custom_fake_err(int sock, void *buf, size_t len, int flags,
+						   const struct sockaddr *dest_addr,
+						   socklen_t addrlen)
+{
+	errno = ENETDOWN;
+	return -1;
+}
+
 static ssize_t z_impl_zsock_recvfrom_custom_fake_response(int sock, void *buf, size_t max_len,
 							  int flags, struct sockaddr *src_addr,
 							  socklen_t *addrlen)
@@ -452,6 +468,30 @@ ZTEST(coap_client, test_get_request)
 	LOG_INF("Test done");
 }
 
+ZTEST(coap_client, test_request_block)
+{
+	int ret = 0;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+	};
+
+	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_block;
+
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_equal(ret, -EAGAIN, "");
+}
+
+
 ZTEST(coap_client, test_resend_request)
 {
 	int ret = 0;
@@ -462,14 +502,18 @@ ZTEST(coap_client, test_resend_request)
 		.path = test_path,
 		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
 		.cb = coap_callback,
-		.payload = NULL,
-		.len = 0
+		.payload = short_payload,
+		.len = strlen(short_payload),
 	};
 
-	client_request.payload = short_payload;
-	client_request.len = strlen(short_payload);
+	int (*sendto_fakes[])(int, void *, size_t, int, const struct sockaddr *, socklen_t) = {
+		z_impl_zsock_sendto_custom_fake_no_reply,
+		z_impl_zsock_sendto_custom_fake_block,
+		z_impl_zsock_sendto_custom_fake,
+	};
 
-	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
+	SET_CUSTOM_FAKE_SEQ(z_impl_zsock_sendto, sendto_fakes, ARRAY_SIZE(sendto_fakes));
+	set_socket_events(client.fd, ZSOCK_POLLOUT);
 
 	k_sleep(K_MSEC(1));
 
@@ -477,11 +521,10 @@ ZTEST(coap_client, test_resend_request)
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	k_sleep(K_MSEC(MORE_THAN_ACK_TIMEOUT_MS));
-	set_socket_events(client.fd, ZSOCK_POLLIN | ZSOCK_POLLOUT);
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
-	zassert_equal(z_impl_zsock_sendto_fake.call_count, 2);
+	zassert_equal(z_impl_zsock_sendto_fake.call_count, 3);
 	LOG_INF("Test done");
 }
 

From bcdf3575e1433dc2fc8ff7687fdf036bc7416b62 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Tue, 12 Nov 2024 13:38:11 +0200
Subject: [PATCH 0747/2913] [nrf fromtree] tests: coap_client: Add testcase for
 Ack failure

Add testcase where sending Ack to incomming Confirmable message fails.
This should be reported to application as now the server is unaware
that transmission have succeeded, so we cannot thread it as success.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit fc51fa491ff70574092fb9e5fd9c5d7e4caa2985)
(cherry picked from commit 492131302d387865789bd34c3bf9aefb99ac4c08)
---
 tests/net/lib/coap_client/src/main.c | 35 ++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 330ad689b97..7554ffcd7ab 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -747,6 +747,41 @@ ZTEST(coap_client, test_separate_response_lost)
 	zassert_equal(last_response_code, -ETIMEDOUT, "");
 }
 
+ZTEST(coap_client, test_separate_response_ack_fail)
+{
+	int ret = 0;
+	struct k_sem sem;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem,
+	};
+	zassert_ok(k_sem_init(&sem, 0, 1));
+
+	int (*sendto_fakes[])(int, void *, size_t, int, const struct sockaddr *, socklen_t) = {
+		z_impl_zsock_sendto_custom_fake,
+		z_impl_zsock_sendto_custom_fake_err,
+	};
+
+	SET_CUSTOM_FAKE_SEQ(z_impl_zsock_sendto, sendto_fakes, ARRAY_SIZE(sendto_fakes));
+	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_empty_ack;
+
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+
+	zassert_ok(k_sem_take(&sem, K_MSEC(COAP_SEPARATE_TIMEOUT)));
+	zassert_equal(last_response_code, -ENETDOWN, "");
+}
+
 ZTEST(coap_client, test_multiple_requests)
 {
 	int ret = 0;

From dd49fcfd88cb8614af27312849017b33cea5a5a6 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Tue, 12 Nov 2024 15:01:23 +0200
Subject: [PATCH 0748/2913] [nrf fromtree] tests: coap_client: Test for
 operating on socket while another fails

CoAP client should be able to push data through functioning socket
while another sockets is failing or reporting poll() errors.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 237b26c44a1be61cfb04305bbf6f92fe116ab729)
(cherry picked from commit 0bfec6c6683bdfd53d4739bf07f5e84c9801fc55)
---
 tests/net/lib/coap_client/src/main.c | 45 ++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 7554ffcd7ab..69e5b7dc9bd 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -395,7 +395,8 @@ extern void net_coap_init(void);
 static void *suite_setup(void)
 {
 	net_coap_init();
-	coap_client_init(&client, NULL);
+	zassert_ok(coap_client_init(&client, NULL));
+	zassert_ok(coap_client_init(&client2, NULL));
 
 	return NULL;
 }
@@ -891,8 +892,6 @@ ZTEST(coap_client, test_multiple_clients)
 	zassert_ok(k_sem_init(&sem1, 0, 1));
 	zassert_ok(k_sem_init(&sem2, 0, 1));
 
-	zassert_ok(coap_client_init(&client2, NULL));
-
 	k_sleep(K_MSEC(1));
 
 	LOG_INF("Sending requests");
@@ -977,6 +976,46 @@ ZTEST(coap_client, test_poll_err_after_response)
 	zassert_not_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 }
 
+ZTEST(coap_client, test_poll_err_on_another_sock)
+{
+	int ret = 0;
+	struct k_sem sem1, sem2;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem1
+	};
+	struct coap_client_request request2 = client_request;
+
+	request2.user_data = &sem2;
+
+	zassert_ok(k_sem_init(&sem1, 0, 1));
+	zassert_ok(k_sem_init(&sem2, 0, 1));
+
+	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
+	set_socket_events(client.fd, ZSOCK_POLLERR);
+
+	k_sleep(K_MSEC(1));
+
+	ret = coap_client_req(&client2, client2.fd, &address, &request2, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	ret = coap_client_req(&client, client.fd, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+
+	set_socket_events(client2.fd, ZSOCK_POLLIN);
+
+	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_equal(last_response_code, -EIO, "");
+	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "");
+}
+
 ZTEST(coap_client, test_duplicate_response)
 {
 	int ret = 0;

From 8eb504507ccf7f900edf5d5e5f0b46bbb18d591a Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Tue, 12 Nov 2024 16:07:54 +0200
Subject: [PATCH 0749/2913] [nrf fromtree] tests: coap_client: Add testcase for
 observation

Add test for ongoing observation and cancellation.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 05a6ba678efc6e4a49b70c84669d32006a98bbdc)
(cherry picked from commit 09d0ed2c46cd38e0efb746e129c65a6bb3ca644c)
---
 tests/net/lib/coap_client/src/main.c | 52 ++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 69e5b7dc9bd..6c4b624798c 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -390,6 +390,18 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_duplicate_response(int sock, vo
 	return ret;
 }
 
+static ssize_t z_impl_zsock_recvfrom_custom_fake_observe(int sock, void *buf, size_t max_len,
+							 int flags, struct sockaddr *src_addr,
+							 socklen_t *addrlen)
+{
+	int ret = z_impl_zsock_recvfrom_custom_fake_duplicate_response(sock, buf, max_len, flags,
+								       src_addr, addrlen);
+
+	set_next_pending_message_id(get_next_pending_message_id() + 1);
+	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_observe;
+	return ret;
+}
+
 extern void net_coap_init(void);
 
 static void *suite_setup(void)
@@ -1046,3 +1058,43 @@ ZTEST(coap_client, test_duplicate_response)
 
 	zassert_equal(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)), -EAGAIN, "");
 }
+
+ZTEST(coap_client, test_observe)
+{
+	struct k_sem sem;
+	struct sockaddr address = {0};
+	struct coap_client_option options = {
+		.code = COAP_OPTION_OBSERVE,
+		.value[0] = 0,
+		.len = 1,
+	};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.options = &options,
+		.num_options = 1,
+		.user_data = &sem,
+	};
+
+	zassert_ok(k_sem_init(&sem, 0, 1));
+	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_observe;
+
+	k_sleep(K_MSEC(1));
+
+	zassert_ok(coap_client_req(&client, 0, &address, &client_request, NULL));
+
+	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+
+	coap_client_cancel_requests(&client);
+	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_equal(last_response_code, -ECANCELED, "");
+
+	zassert_not_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+}

From 6523f8e85474d26c7a891cd674df0b5595405fcf Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Tue, 12 Nov 2024 16:18:46 +0200
Subject: [PATCH 0750/2913] [nrf fromtree] tests: coap_client: Add testcase for
 receiving RST

When server responds with CoAP RESET, we should inform the
client and stop the request.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 107dc9b96dd0627805a25f5ec91407bfb86bc00c)
(cherry picked from commit f529f9f104189d9ab20a5d87b35f23c72c368187)
---
 tests/net/lib/coap_client/src/main.c | 44 ++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 6c4b624798c..c44fd30fbdc 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -279,6 +279,25 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_empty_ack(int sock, void *buf,
 	return sizeof(ack_data);
 }
 
+static ssize_t z_impl_zsock_recvfrom_custom_fake_rst(int sock, void *buf, size_t max_len, int flags,
+						     struct sockaddr *src_addr, socklen_t *addrlen)
+{
+	uint16_t last_message_id = 0;
+
+	static uint8_t rst_data[] = {0x70, 0x00, 0x00, 0x00, 0x00, 0x00,
+				     0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+	last_message_id = get_next_pending_message_id();
+
+	rst_data[2] = (uint8_t)(last_message_id >> 8);
+	rst_data[3] = (uint8_t)last_message_id;
+
+	memcpy(buf, rst_data, sizeof(rst_data));
+	clear_socket_events(sock, ZSOCK_POLLIN);
+
+	return sizeof(rst_data);
+}
+
 static ssize_t z_impl_zsock_recvfrom_custom_fake_only_ack(int sock, void *buf, size_t max_len,
 							  int flags, struct sockaddr *src_addr,
 							  socklen_t *addrlen)
@@ -1098,3 +1117,28 @@ ZTEST(coap_client, test_observe)
 
 	zassert_not_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 }
+
+ZTEST(coap_client, test_request_rst)
+{
+	struct k_sem sem;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem,
+	};
+
+	zassert_ok(k_sem_init(&sem, 0, 1));
+	k_sleep(K_MSEC(1));
+	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_rst;
+
+	zassert_ok(coap_client_req(&client, 0, &address, &client_request, NULL));
+
+	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_equal(last_response_code, -ECONNRESET, "");
+}

From 32ebf5b57a57a364bee33c72024f356dbf25dd93 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Mon, 11 Nov 2024 14:19:49 +0200
Subject: [PATCH 0751/2913] [nrf fromtree] net: lib: coap_client: Don't clear
 internal structures on response

When response is received and handled, don't just clear the structure
but instead mark it as ongoing=false.
So if we later on receive a duplicate response for it, we can still
respond with Ack or Rst.

This is achieved by using release_internal_request() when we don't
expect any response for it and reset_internal_request() when we really
fill up a new request.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 41ee35ae8b52095cce830ac3381b5ffa3c4162b4)
(cherry picked from commit fe6f36773f7c75144aed58167e78a50ddbf9256e)
---
 subsys/net/lib/coap/coap_client.c | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index ebf99bade9f..43cb6416d9a 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -61,16 +61,24 @@ static int receive(int sock, void *buf, size_t max_len, int flags,
 	return err;
 }
 
+/** Reset all fields to zero.
+ * Use when a new request is filled in.
+ */
 static void reset_internal_request(struct coap_client_internal_request *request)
 {
-	request->offset = 0;
-	request->last_id = 0;
-	request->last_response_id = -1;
+	*request = (struct coap_client_internal_request){
+		.last_response_id = -1,
+	};
+}
+
+/** Release a request structure.
+ * Use when a request is no longer needed, but we might still receive
+ * responses for it, which must be handled.
+ */
+static void release_internal_request(struct coap_client_internal_request *request)
+{
 	request->request_ongoing = false;
-	request->is_observe = false;
 	request->pending.timeout = 0;
-	request->recv_blk_ctx = (struct coap_block_context){ 0 };
-	request->send_blk_ctx = (struct coap_block_context){ 0 };
 }
 
 static int coap_client_schedule_poll(struct coap_client *client, int sock,
@@ -417,6 +425,7 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
 
 		coap_pending_cycle(&internal_req->pending);
 		internal_req->is_observe = coap_request_is_observe(&internal_req->request);
+		LOG_DBG("Request is_observe %d", internal_req->is_observe);
 	}
 
 	ret = send_request(sock, internal_req->request.data, internal_req->request.offset, 0,
@@ -513,7 +522,7 @@ static void coap_client_resend_handler(struct coap_client *client)
 			ret = resend_request(client, &client->requests[i]);
 			if (ret < 0) {
 				report_callback_error(&client->requests[i], ret);
-				reset_internal_request(&client->requests[i]);
+				release_internal_request(&client->requests[i]);
 			}
 		}
 	}
@@ -745,7 +754,7 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 			return 0;
 		}
 		report_callback_error(internal_req, -ECONNRESET);
-		reset_internal_request(internal_req);
+		release_internal_request(internal_req);
 		return 0;
 	}
 
@@ -931,7 +940,7 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 	}
 fail:
 	if (ret < 0 || !internal_req->is_observe) {
-		reset_internal_request(internal_req);
+		release_internal_request(internal_req);
 	}
 	return ret;
 }
@@ -949,7 +958,7 @@ static void cancel_requests_with(struct coap_client *client, int error)
 			 * request was cancelled anyway.
 			 */
 			report_callback_error(&client->requests[i], error);
-			reset_internal_request(&client->requests[i]);
+			release_internal_request(&client->requests[i]);
 		}
 	}
 	k_mutex_unlock(&client->lock);

From 704a63de8f302b39d65e574cccc18552c72f02bf Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Mon, 11 Nov 2024 14:21:29 +0200
Subject: [PATCH 0752/2913] [nrf fromtree] net: lib: coap_client: Parse
 incoming MID only once

Incomming Message-ID is already parsed, use it as a parameter to
get_request_with_mid().

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 7b0cce4418403e046e710009c591fa21e6aaed3c)
(cherry picked from commit 557277c1631bec6857cb8ca9085c6f6229394441)
---
 subsys/net/lib/coap/coap_client.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 43cb6416d9a..1f6b93c2221 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -30,9 +30,8 @@ static void cancel_requests_with(struct coap_client *client, int error);
 static int recv_response(struct coap_client *client, struct coap_packet *response, bool *truncated);
 static int handle_response(struct coap_client *client, const struct coap_packet *response,
 			   bool response_truncated);
-static struct coap_client_internal_request *get_request_with_mid(
-	struct coap_client *client, const struct coap_packet *resp);
-
+static struct coap_client_internal_request *get_request_with_mid(struct coap_client *client,
+								 uint16_t mid);
 
 static int send_request(int sock, const void *buf, size_t len, int flags,
 			const struct sockaddr *dest_addr, socklen_t addrlen)
@@ -701,14 +700,12 @@ static struct coap_client_internal_request *get_request_with_token(
 	return NULL;
 }
 
-static struct coap_client_internal_request *get_request_with_mid(
-	struct coap_client *client, const struct coap_packet *resp)
+static struct coap_client_internal_request *get_request_with_mid(struct coap_client *client,
+								 uint16_t mid)
 {
-	uint16_t mid = coap_header_get_id(resp);
-
 	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
 		if (client->requests[i].request_ongoing) {
-			if (client->requests[i].last_id == mid) {
+			if (client->requests[i].last_id == (int)mid) {
 				return &client->requests[i];
 			}
 		}
@@ -717,7 +714,6 @@ static struct coap_client_internal_request *get_request_with_mid(
 	return NULL;
 }
 
-
 static bool find_echo_option(const struct coap_packet *response, struct coap_option *option)
 {
 	return coap_find_options(response, COAP_OPTION_ECHO, option, 1);
@@ -748,7 +744,7 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 	const uint8_t *payload = coap_packet_get_payload(response, &payload_len);
 
 	if (response_type == COAP_TYPE_RESET) {
-		internal_req = get_request_with_mid(client, response);
+		internal_req = get_request_with_mid(client, response_id);
 		if (!internal_req) {
 			LOG_WRN("No matching request for RESET");
 			return 0;
@@ -761,7 +757,7 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 	/* Separate response coming */
 	if (payload_len == 0 && response_type == COAP_TYPE_ACK &&
 	    response_code == COAP_CODE_EMPTY) {
-		internal_req = get_request_with_mid(client, response);
+		internal_req = get_request_with_mid(client, response_id);
 		if (!internal_req) {
 			LOG_WRN("No matching request for ACK");
 			return 0;

From db28a52a1fd35ddb18355cf72c5b04a48b3405b2 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Mon, 11 Nov 2024 17:14:50 +0200
Subject: [PATCH 0753/2913] [nrf fromtree] net: lib: coap_client: Don't match
 zero length tokens

If our internal structure is cleared, don't match tokens.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 934c74f26e8f2d25bfb7b4ac517db251b2197780)
(cherry picked from commit fbff8a9e8bdd06f4ae2453c294a5f52fb852a646)
---
 subsys/net/lib/coap/coap_client.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 1f6b93c2221..9518da30e74 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -687,6 +687,9 @@ static struct coap_client_internal_request *get_request_with_token(
 	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
 		if (client->requests[i].request_ongoing ||
 		    !exchange_lifetime_exceeded(&client->requests[i])) {
+			if (client->requests[i].request_tkl == 0) {
+				continue;
+			}
 			if (client->requests[i].request_tkl != response_tkl) {
 				continue;
 			}

From f5ee44efe85a92d6b96f5e86518b7045d585426f Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Mon, 11 Nov 2024 14:25:04 +0200
Subject: [PATCH 0754/2913] [nrf fromtree] net: lib: coap_client: Drop
 duplicate responses

When response is already handled, don't forward anymore responses
to the client application.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit a1368a7ff707af009575dac8799799b2319cad50)
(cherry picked from commit 134887ac938192d3f6af1f4fc71d296c49f2a126)
---
 subsys/net/lib/coap/coap_client.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 9518da30e74..57d7d4af4a3 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -844,6 +844,15 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 		}
 	}
 
+	if (!internal_req->request_ongoing) {
+		if (internal_req->is_observe) {
+			(void) send_rst(client, response);
+			return 0;
+		}
+		LOG_DBG("Drop request, already handled");
+		goto fail;
+	}
+
 	if (internal_req->pending.timeout != 0) {
 		coap_pending_clear(&internal_req->pending);
 	}

From d42710c56263391cb9605e16f5abbc95b997a99d Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Mon, 11 Nov 2024 16:44:41 +0200
Subject: [PATCH 0755/2913] [nrf fromtree] net: lib: coap_client: Return -errno
 from send_request()

Return the -errno when zsock_sendto() or zsock_recvfrom() fails, so
rest of the code can deal with return values, instead of separately
comparing errno and return value.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 48434a3c1b16c44a410b07a50905681af506ea76)
(cherry picked from commit bd97c511a455c30952f92a4e3c2cfaa2159dc1c3)
---
 subsys/net/lib/coap/coap_client.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 57d7d4af4a3..9766c698a83 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -36,12 +36,16 @@ static struct coap_client_internal_request *get_request_with_mid(struct coap_cli
 static int send_request(int sock, const void *buf, size_t len, int flags,
 			const struct sockaddr *dest_addr, socklen_t addrlen)
 {
+	int ret;
+
 	LOG_HEXDUMP_DBG(buf, len, "Send CoAP Request:");
 	if (addrlen == 0) {
-		return zsock_sendto(sock, buf, len, flags, NULL, 0);
+		ret = zsock_sendto(sock, buf, len, flags, NULL, 0);
 	} else {
-		return zsock_sendto(sock, buf, len, flags, dest_addr, addrlen);
+		ret = zsock_sendto(sock, buf, len, flags, dest_addr, addrlen);
 	}
+
+	return ret >= 0 ? ret : -errno;
 }
 
 static int receive(int sock, void *buf, size_t max_len, int flags,
@@ -57,7 +61,7 @@ static int receive(int sock, void *buf, size_t max_len, int flags,
 	if (err > 0) {
 		LOG_HEXDUMP_DBG(buf, err, "Receive CoAP Response:");
 	}
-	return err;
+	return err >= 0 ? err : -errno;
 }
 
 /** Reset all fields to zero.
@@ -493,13 +497,12 @@ static int resend_request(struct coap_client *client,
 					client->socklen);
 		if (ret > 0) {
 			ret = 0;
-		} else if (ret == -1 && errno == EAGAIN) {
+		} else if (ret == -EAGAIN) {
 			/* Restore the pending structure, retry later */
 			internal_req->pending = tmp;
 			/* Not a fatal socket error, will trigger a retry */
 			ret = 0;
 		} else {
-			ret = -errno;
 			LOG_ERR("Failed to resend request, %d", ret);
 		}
 	} else {

From b8fbc5f7b8a3ca88f7b35ee5d308ec72457c82b2 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Mon, 11 Nov 2024 16:46:33 +0200
Subject: [PATCH 0756/2913] [nrf fromtree] net: lib: coap_client: Drop
 duplicate MID only after responding with Ack

Even if we receive duplicate confirmable message, we should still
respond with the Ack. Just don't deliver the second callback.

This is achieved by moving the MID deduplication to after Ack handling.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit c0eb260c2c53b183aa4ce4a5d1d3ad20516a0b08)
(cherry picked from commit f52d4119c2bb0679c4a5bddc308ed2bfa9358b61)
---
 subsys/net/lib/coap/coap_client.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 9766c698a83..d2a07301581 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -781,14 +781,6 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 		return 0;
 	}
 
-	/* MID-based deduplication */
-	if (response_id == internal_req->last_response_id) {
-		LOG_WRN("Duplicate MID, dropping");
-		goto fail;
-	}
-
-	internal_req->last_response_id = response_id;
-
 	/* Received echo option */
 	if (find_echo_option(response, &client->echo_option)) {
 		 /* Resend request with echo option */
@@ -847,13 +839,21 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 		}
 	}
 
+	/* MID-based deduplication */
+	if (response_id == internal_req->last_response_id) {
+		LOG_WRN("Duplicate MID, dropping");
+		return 0;
+	}
+
+	internal_req->last_response_id = response_id;
+
 	if (!internal_req->request_ongoing) {
 		if (internal_req->is_observe) {
 			(void) send_rst(client, response);
 			return 0;
 		}
 		LOG_DBG("Drop request, already handled");
-		goto fail;
+		return 0;
 	}
 
 	if (internal_req->pending.timeout != 0) {

From f3267a33acbdc3c2063323ff45da093e7ad6e178 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Mon, 11 Nov 2024 16:48:42 +0200
Subject: [PATCH 0757/2913] [nrf fromtree] net: lib: coap_client: All error
 cases should be reported to callback

When the client fails when parsing the response and we stop proceeding,
we should report that to the application.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit f72d634826f5c45ee7ed54b4658c3391ae83fe54)
(cherry picked from commit 1d030fcb2bf35c0b75cafd580033a0efc9de6429)
---
 subsys/net/lib/coap/coap_client.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index d2a07301581..9aaf2b6b267 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -950,7 +950,10 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 		}
 	}
 fail:
-	if (ret < 0 || !internal_req->is_observe) {
+	if (ret < 0) {
+		report_callback_error(internal_req, ret);
+	}
+	if (!internal_req->is_observe) {
 		release_internal_request(internal_req);
 	}
 	return ret;

From 6a42194217e8061cec9507c801f029986efc4da9 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Tue, 12 Nov 2024 15:00:05 +0200
Subject: [PATCH 0758/2913] [nrf fromtree] net: lib: coap_client: Stop polling
 on unneeded sockets

poll() only for sockets that have traffic ongoing or have some lifetime
left.
On socket failures during a poll(), stop listening for the socket.
Application can recover by reconnecting the socket.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit f0c6efe7980002eb72e5ad009a8b822d2a43846d)
(cherry picked from commit bb3b73755891155b2394af15a16e5719da0cb554)
---
 subsys/net/lib/coap/coap_client.c | 56 ++++++++++++++++++++++++-------
 1 file changed, 43 insertions(+), 13 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 9aaf2b6b267..505a9932311 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -532,6 +532,17 @@ static void coap_client_resend_handler(struct coap_client *client)
 	k_mutex_unlock(&client->lock);
 }
 
+static struct coap_client *get_client(int sock)
+{
+	for (int i = 0; i < num_clients; i++) {
+		if (clients[i]->fd == sock) {
+			return clients[i];
+		}
+	}
+
+	return NULL;
+}
+
 static int handle_poll(void)
 {
 	int ret = 0;
@@ -541,10 +552,16 @@ static int handle_poll(void)
 
 	/* Use periodic timeouts */
 	for (int i = 0; i < num_clients; i++) {
-		fds[i].fd = clients[i]->fd;
-		fds[i].events = (has_ongoing_exchange(clients[i]) ? ZSOCK_POLLIN : 0) |
-				(has_timeout_expired(clients[i]) ? ZSOCK_POLLOUT : 0);
-		fds[i].revents = 0;
+		short events = (has_ongoing_exchange(clients[i]) ? ZSOCK_POLLIN : 0) |
+			       (has_timeout_expired(clients[i]) ? ZSOCK_POLLOUT : 0);
+
+		if (events == 0) {
+			/* Skip this socket */
+			continue;
+		}
+		fds[nfds].fd = clients[i]->fd;
+		fds[nfds].events = events;
+		fds[nfds].revents = 0;
 		nfds++;
 	}
 
@@ -559,42 +576,49 @@ static int handle_poll(void)
 	}
 
 	for (int i = 0; i < nfds; i++) {
+		struct coap_client *client = get_client(fds[i].fd);
+
+		if (!client) {
+			LOG_ERR("No client found for socket %d", fds[i].fd);
+			continue;
+		}
+
 		if (fds[i].revents & ZSOCK_POLLOUT) {
-			coap_client_resend_handler(clients[i]);
+			coap_client_resend_handler(client);
 		}
 		if (fds[i].revents & ZSOCK_POLLIN) {
 			struct coap_packet response;
 			bool response_truncated = false;
 
-			ret = recv_response(clients[i], &response, &response_truncated);
+			ret = recv_response(client, &response, &response_truncated);
 			if (ret < 0) {
 				if (ret == -EAGAIN) {
 					continue;
 				}
 				LOG_ERR("Error receiving response");
-				cancel_requests_with(clients[i], -EIO);
+				cancel_requests_with(client, -EIO);
 				continue;
 			}
 
-			k_mutex_lock(&clients[i]->lock, K_FOREVER);
-			ret = handle_response(clients[i], &response, response_truncated);
+			k_mutex_lock(&client->lock, K_FOREVER);
+			ret = handle_response(client, &response, response_truncated);
 			if (ret < 0) {
 				LOG_ERR("Error handling response");
 			}
 
-			k_mutex_unlock(&clients[i]->lock);
+			k_mutex_unlock(&client->lock);
 		}
 		if (fds[i].revents & ZSOCK_POLLERR) {
 			LOG_ERR("Error in poll for socket %d", fds[i].fd);
-			cancel_requests_with(clients[i], -EIO);
+			cancel_requests_with(client, -EIO);
 		}
 		if (fds[i].revents & ZSOCK_POLLHUP) {
 			LOG_ERR("Error in poll: POLLHUP for socket %d", fds[i].fd);
-			cancel_requests_with(clients[i], -EIO);
+			cancel_requests_with(client, -EIO);
 		}
 		if (fds[i].revents & ZSOCK_POLLNVAL) {
 			LOG_ERR("Error in poll: POLLNVAL - fd %d not open", fds[i].fd);
-			cancel_requests_with(clients[i], -EIO);
+			cancel_requests_with(client, -EIO);
 		}
 	}
 
@@ -974,6 +998,12 @@ static void cancel_requests_with(struct coap_client *client, int error)
 			report_callback_error(&client->requests[i], error);
 			release_internal_request(&client->requests[i]);
 		}
+		/* If our socket has failed, clear all requests, even completed ones,
+		 * so that our handle_poll() does not poll() anymore for this socket.
+		 */
+		if (error == -EIO) {
+			reset_internal_request(&client->requests[i]);
+		}
 	}
 	k_mutex_unlock(&client->lock);
 

From 2658ac423ca2cef0b6466c4ab28af678a7c78d30 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Wed, 13 Nov 2024 13:24:28 +0200
Subject: [PATCH 0759/2913] [nrf fromtree] net: lib: coap_client: Add API to
 cancel specific request

Add a new API to cancel just one, or mathing requests,
instead of cancelling all ongoing requests.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit b3f3bce23eaa854f0eb03e2c92e1c342b9a4ef4a)
(cherry picked from commit 322f1fcac62034b7962b664bf399c3e5de210f3d)
---
 include/zephyr/net/coap_client.h     |  15 ++++
 subsys/net/lib/coap/coap_client.c    |  35 +++++++++
 tests/net/lib/coap_client/src/main.c | 108 +++++++++++++++++++++++++++
 3 files changed, 158 insertions(+)

diff --git a/include/zephyr/net/coap_client.h b/include/zephyr/net/coap_client.h
index 1d68661da3b..bbeebb2d26c 100644
--- a/include/zephyr/net/coap_client.h
+++ b/include/zephyr/net/coap_client.h
@@ -158,6 +158,21 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
  */
 void coap_client_cancel_requests(struct coap_client *client);
 
+/**
+ * @brief Cancel matching requests.
+ *
+ * This function cancels all CoAP client request that matches the given request.
+ * The request is matched based on the method, path, callback and user_data, if provided.
+ * Any field set to NULL is considered a wildcard.
+ *
+ * (struct coap_client_request){0} cancels all requests.
+ * (struct coap_client_request){.method = COAP_METHOD_GET} cancels all GET requests.
+ *
+ * @param client Pointer to the CoAP client instance.
+ * @param req Pointer to the CoAP client request to be canceled.
+ */
+void coap_client_cancel_request(struct coap_client *client, struct coap_client_request *req);
+
 /**
  * @brief Initialise a Block2 option to be added to a request
  *
diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 505a9932311..468505f5eb5 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -1016,6 +1016,41 @@ void coap_client_cancel_requests(struct coap_client *client)
 	k_sleep(K_MSEC(COAP_PERIODIC_TIMEOUT));
 }
 
+static bool requests_match(struct coap_client_request *a, struct coap_client_request *b)
+{
+	/* enum coap_method does not have value for zero, so differentiate valid values */
+	if (a->method && b->method && a->method != b->method) {
+		return false;
+	}
+	if (a->path && b->path && strcmp(a->path, b->path) != 0) {
+		return false;
+	}
+	if (a->cb && b->cb && a->cb != b->cb) {
+		return false;
+	}
+	if (a->user_data && b->user_data && a->user_data != b->user_data) {
+		return false;
+	}
+	/* It is intentional that (struct coap_client_request){0} matches all */
+	return true;
+}
+
+void coap_client_cancel_request(struct coap_client *client, struct coap_client_request *req)
+{
+	k_mutex_lock(&client->lock, K_FOREVER);
+
+	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
+		if (client->requests[i].request_ongoing &&
+		    requests_match(&client->requests[i].coap_request, req)) {
+			LOG_DBG("Cancelling request %d", i);
+			report_callback_error(&client->requests[i], -ECANCELED);
+			release_internal_request(&client->requests[i]);
+		}
+	}
+
+	k_mutex_unlock(&client->lock);
+}
+
 void coap_client_recv(void *coap_cl, void *a, void *b)
 {
 	int ret;
diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index c44fd30fbdc..2f3fa28ebff 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -1142,3 +1142,111 @@ ZTEST(coap_client, test_request_rst)
 	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, -ECONNRESET, "");
 }
+
+ZTEST(coap_client, test_cancel)
+{
+	struct k_sem sem1, sem2;
+	struct sockaddr address = {0};
+	struct coap_client_request req1 = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem1
+	};
+	struct coap_client_request req2 = req1;
+
+	req2.user_data = &sem2;
+
+	k_sem_init(&sem1, 0, 1);
+	k_sem_init(&sem2, 0, 1);
+
+	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
+
+	k_sleep(K_MSEC(1));
+
+	zassert_ok(coap_client_req(&client, 0, &address, &req1, NULL));
+	zassert_ok(coap_client_req(&client, 0, &address, &req2, NULL));
+
+	k_sleep(K_SECONDS(1));
+
+	coap_client_cancel_request(&client, &req1);
+	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_not_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_equal(last_response_code, -ECANCELED, "");
+
+	set_socket_events(client.fd, ZSOCK_POLLIN); /* First response is the cancelled one */
+	zassert_not_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	set_socket_events(client.fd, ZSOCK_POLLIN);
+	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "");
+}
+
+ZTEST(coap_client, test_cancel_match)
+{
+	struct k_sem sem1, sem2;
+	struct sockaddr address = {0};
+	struct coap_client_request req1 = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem1
+	};
+	struct coap_client_request req2 = req1;
+
+	req2.user_data = &sem2;
+	req2.path = "another";
+
+	k_sem_init(&sem1, 0, 1);
+	k_sem_init(&sem2, 0, 1);
+
+	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
+
+	k_sleep(K_MSEC(1));
+
+	zassert_ok(coap_client_req(&client, 0, &address, &req1, NULL));
+	zassert_ok(coap_client_req(&client, 0, &address, &req2, NULL));
+
+	k_sleep(K_SECONDS(1));
+
+	/* match only one */
+	coap_client_cancel_request(&client, &(struct coap_client_request) {
+		.path = test_path
+	});
+	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_not_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_equal(last_response_code, -ECANCELED, "");
+
+	zassert_ok(coap_client_req(&client, 0, &address, &req1, NULL));
+
+	/* should not match */
+	coap_client_cancel_request(&client, &(struct coap_client_request) {
+		.path = test_path,
+		.user_data = &sem2,
+	});
+	zassert_not_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_not_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+
+	/* match both (all GET queries) */
+	coap_client_cancel_request(&client, &(struct coap_client_request) {
+		.method = COAP_METHOD_GET,
+	});
+	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+
+	zassert_ok(coap_client_req(&client, 0, &address, &req1, NULL));
+	zassert_ok(coap_client_req(&client, 0, &address, &req2, NULL));
+
+	/* match both (wildcard)*/
+	coap_client_cancel_request(&client, &(struct coap_client_request) {0});
+	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+
+}

From ef545e39341b3904845498fbafac88dd786f4bc1 Mon Sep 17 00:00:00 2001
From: Andi Gerl <andi.gerl@exacttechnology.com>
Date: Fri, 8 Nov 2024 15:23:28 -0500
Subject: [PATCH 0760/2913] [nrf fromtree] net: lwm2m: add set_socketoptions cb
 to pull context LwM2M context

The pull context LwM2M client's set_socketoptions callback is currently
unused and can't be set by a user. Add a public API to set the
pull context's client's set_socketoptions callback.

Signed-off-by: Andi Gerl <andi.gerl@exacttechnology.com>
(cherry picked from commit 9c2421444ba51c812eaa579e8f7a859e73b78bfa)
(cherry picked from commit 5682cb79e5e7aad2a1f00c444dda93899c68f754)
---
 include/zephyr/net/lwm2m.h                | 14 +++++++++++++-
 subsys/net/lib/lwm2m/lwm2m_pull_context.c |  6 +++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/include/zephyr/net/lwm2m.h b/include/zephyr/net/lwm2m.h
index 8a2cbf557d0..c080018e657 100644
--- a/include/zephyr/net/lwm2m.h
+++ b/include/zephyr/net/lwm2m.h
@@ -182,6 +182,7 @@ enum lwm2m_rd_client_event {
 typedef void (*lwm2m_ctx_event_cb_t)(struct lwm2m_ctx *ctx,
 				     enum lwm2m_rd_client_event event);
 
+typedef int (*lwm2m_set_sockopt_cb_t)(struct lwm2m_ctx *client_ctx);
 
 /**
  * @brief Different traffic states of the LwM2M socket.
@@ -258,7 +259,7 @@ struct lwm2m_ctx {
 	 * a callback that is called after a socket is created and before
 	 * connect.
 	 */
-	int (*set_socketoptions)(struct lwm2m_ctx *client_ctx);
+	lwm2m_set_sockopt_cb_t set_socketoptions;
 
 	/** Flag to indicate if context should use DTLS.
 	 *  Enabled via the use of coaps:// protocol prefix in connection
@@ -1621,6 +1622,17 @@ int lwm2m_security_mode(struct lwm2m_ctx *ctx);
  */
 int lwm2m_set_default_sockopt(struct lwm2m_ctx *ctx);
 
+/**
+ * @brief Set the @ref lwm2m_ctx::set_socketoptions callback for the pull context's client.
+ *
+ * This allows setting specific socket options on the socket that is used to pull
+ * firmware updates. The callback will be called after the pull context socket has been
+ * created and before it will connect.
+ *
+ * @param[in] set_sockopt_cb A callback function to set sockopts for the pull context client.
+ */
+void lwm2m_pull_context_set_sockopt_callback(lwm2m_set_sockopt_cb_t set_sockopt_cb);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/subsys/net/lib/lwm2m/lwm2m_pull_context.c b/subsys/net/lib/lwm2m/lwm2m_pull_context.c
index 356f19705f5..8081c3793ed 100644
--- a/subsys/net/lib/lwm2m/lwm2m_pull_context.c
+++ b/subsys/net/lib/lwm2m/lwm2m_pull_context.c
@@ -446,7 +446,6 @@ int lwm2m_pull_context_start_transfer(char *uri, struct requesting_object req, k
 	context.result_cb = req.result_cb;
 	context.write_cb = req.write_cb;
 
-	(void)memset(&context.firmware_ctx, 0, sizeof(struct lwm2m_ctx));
 	(void)memset(&context.block_ctx, 0, sizeof(struct coap_block_context));
 	context.firmware_ctx.sock_fd = -1;
 
@@ -454,3 +453,8 @@ int lwm2m_pull_context_start_transfer(char *uri, struct requesting_object req, k
 
 	return 0;
 }
+
+void lwm2m_pull_context_set_sockopt_callback(lwm2m_set_sockopt_cb_t set_sockopt_cb)
+{
+	context.firmware_ctx.set_socketoptions = set_sockopt_cb;
+}

From 1fb3da9ccad15e9bfcfa482016d030531e876a74 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Mon, 18 Nov 2024 15:28:38 +0200
Subject: [PATCH 0761/2913] [nrf fromtree] tests: coap_client: Proper slow-down

Use real-time scheduler with 100x speedup, so timeouts are
accurate enough, but still fast for tests to run.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 34a6d5a5dc834f26f06fb318b9c9a21c286a7227)
(cherry picked from commit 0054b8bae97de1e11284506d8aed7459e9aed1ef)
---
 tests/net/lib/coap_client/CMakeLists.txt         |  2 +-
 tests/net/lib/coap_client/boards/native_sim.conf |  1 +
 tests/net/lib/coap_client/src/main.c             | 15 ++++++++++++---
 tests/net/lib/coap_client/src/stubs.c            |  5 ++++-
 4 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 tests/net/lib/coap_client/boards/native_sim.conf

diff --git a/tests/net/lib/coap_client/CMakeLists.txt b/tests/net/lib/coap_client/CMakeLists.txt
index 07a4d8a9827..74d11c90fbf 100644
--- a/tests/net/lib/coap_client/CMakeLists.txt
+++ b/tests/net/lib/coap_client/CMakeLists.txt
@@ -26,7 +26,7 @@ add_compile_definitions(CONFIG_COAP_CLIENT_MESSAGE_HEADER_SIZE=48)
 add_compile_definitions(CONFIG_COAP_CLIENT_STACK_SIZE=1024)
 add_compile_definitions(CONFIG_COAP_CLIENT_THREAD_PRIORITY=10)
 add_compile_definitions(CONFIG_COAP_LOG_LEVEL=4)
-add_compile_definitions(CONFIG_COAP_INIT_ACK_TIMEOUT_MS=100)
+add_compile_definitions(CONFIG_COAP_INIT_ACK_TIMEOUT_MS=1000)
 add_compile_definitions(CONFIG_COAP_CLIENT_MAX_REQUESTS=2)
 add_compile_definitions(CONFIG_COAP_CLIENT_MAX_INSTANCES=2)
 add_compile_definitions(CONFIG_COAP_MAX_RETRANSMIT=4)
diff --git a/tests/net/lib/coap_client/boards/native_sim.conf b/tests/net/lib/coap_client/boards/native_sim.conf
new file mode 100644
index 00000000000..0843e94acbd
--- /dev/null
+++ b/tests/net/lib/coap_client/boards/native_sim.conf
@@ -0,0 +1 @@
+CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME=y
diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 2f3fa28ebff..72b84a60f5e 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -8,7 +8,9 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/misc/lorem_ipsum.h>
 #include <zephyr/ztest.h>
-
+#if defined(CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME)
+#include "timer_model.h"
+#endif
 #include "stubs.h"
 
 LOG_MODULE_REGISTER(coap_client_test, LOG_LEVEL_DBG);
@@ -16,12 +18,12 @@ LOG_MODULE_REGISTER(coap_client_test, LOG_LEVEL_DBG);
 DEFINE_FFF_GLOBALS;
 #define FFF_FAKES_LIST(FAKE)
 
-#define LONG_ACK_TIMEOUT_MS                 200
+#define LONG_ACK_TIMEOUT_MS                 (2 * CONFIG_COAP_INIT_ACK_TIMEOUT_MS)
 #define MORE_THAN_EXCHANGE_LIFETIME_MS      4 * CONFIG_COAP_INIT_ACK_TIMEOUT_MS
 #define MORE_THAN_LONG_EXCHANGE_LIFETIME_MS 4 * LONG_ACK_TIMEOUT_MS
 #define MORE_THAN_ACK_TIMEOUT_MS                                                                   \
 	(CONFIG_COAP_INIT_ACK_TIMEOUT_MS + CONFIG_COAP_INIT_ACK_TIMEOUT_MS / 2)
-#define COAP_SEPARATE_TIMEOUT (6000 * 3) /* Needs a safety marging, tests run faster than -rt */
+#define COAP_SEPARATE_TIMEOUT (6000 * 2) /* Needs a safety marging, tests run faster than -rt */
 #define VALID_MESSAGE_ID BIT(31)
 #define TOKEN_OFFSET          4
 
@@ -425,6 +427,13 @@ extern void net_coap_init(void);
 
 static void *suite_setup(void)
 {
+#if defined(CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME)
+	/* It is enough that some slow-down is happening on sleeps, it does not have to be
+	 * real time
+	 */
+	hwtimer_set_rt_ratio(100.0);
+	k_sleep(K_MSEC(1));
+#endif
 	net_coap_init();
 	zassert_ok(coap_client_init(&client, NULL));
 	zassert_ok(coap_client_init(&client2, NULL));
diff --git a/tests/net/lib/coap_client/src/stubs.c b/tests/net/lib/coap_client/src/stubs.c
index f3451df054f..b3dbfc6df75 100644
--- a/tests/net/lib/coap_client/src/stubs.c
+++ b/tests/net/lib/coap_client/src/stubs.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 #include <stubs.h>
 
-LOG_MODULE_DECLARE(coap_client_test);
+LOG_MODULE_DECLARE(coap_client_test, LOG_LEVEL_DBG);
 
 DEFINE_FAKE_VALUE_FUNC(uint32_t, z_impl_sys_rand32_get);
 DEFINE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_recvfrom, int, void *, size_t, int, struct sockaddr *,
@@ -45,6 +45,9 @@ int z_impl_zsock_poll(struct zsock_pollfd *fds, int nfds, int poll_timeout)
 			events++;
 		}
 	}
+	if (events == 0) {
+		k_sleep(K_MSEC(poll_timeout));
+	}
 
 	return events;
 }

From ca63cdbf413b06ed74377b20c98327c77fd71a31 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Mon, 18 Nov 2024 15:36:16 +0200
Subject: [PATCH 0762/2913] [nrf fromtree] tests: coap_client: Refactor tests

Refactor tests to be a bit shorter, so its easier to read
and copy-paste for a new testcase

All idioms like "ret = somecall(); zasser.." are replaced with just
"zassert_ok(some_call());"

Commonly used structures are global and initialized once.

To avoid cross-test side-effects, suite_after-function is added
to cleanup all requests.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit d64748cc5247645dbbc469d9f1ecf3f80dca561d)
(cherry picked from commit 142a2e720cec4eda8d75bf5f80729664f4c5ba37)
---
 tests/net/lib/coap_client/src/main.c | 594 ++++++---------------------
 1 file changed, 119 insertions(+), 475 deletions(-)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 72b84a60f5e..a620b1985e0 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -27,20 +27,48 @@ DEFINE_FFF_GLOBALS;
 #define VALID_MESSAGE_ID BIT(31)
 #define TOKEN_OFFSET          4
 
+void coap_callback(int16_t code, size_t offset, const uint8_t *payload, size_t len, bool last_block,
+		   void *user_data);
+
 static int16_t last_response_code;
-static const char *test_path = "test";
+static const char test_path[] = "test";
 
 static uint32_t messages_needing_response[2];
 static uint8_t last_token[2][COAP_TOKEN_MAX_LEN];
 static const uint8_t empty_token[COAP_TOKEN_MAX_LEN] = {0};
+K_SEM_DEFINE(sem1, 0, 1);
+K_SEM_DEFINE(sem2, 0, 1);
 
 static struct coap_client client;
 static struct coap_client client2 = {
 	.fd = 1,
 };
 
-static char *short_payload = "testing";
-static char *long_payload = LOREM_IPSUM_SHORT;
+static const char short_payload[] = "testing";
+static const char long_payload[] = LOREM_IPSUM_SHORT;
+static struct coap_client_request short_request = {
+	.method = COAP_METHOD_GET,
+	.confirmable = true,
+	.path = test_path,
+	.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+	.cb = coap_callback,
+	.payload = short_payload,
+	.len = sizeof(short_payload) - 1,
+	.user_data = &sem1,
+};
+static struct coap_client_request long_request = {
+	.method = COAP_METHOD_GET,
+	.confirmable = true,
+	.path = test_path,
+	.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+	.cb = coap_callback,
+	.payload = long_payload,
+	.len = sizeof(long_payload) - 1,
+	.user_data = &sem2,
+};
+static struct sockaddr dst_address;
+
+
 
 static uint16_t get_next_pending_message_id(void)
 {
@@ -423,6 +451,16 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_observe(int sock, void *buf, si
 	return ret;
 }
 
+void coap_callback(int16_t code, size_t offset, const uint8_t *payload, size_t len, bool last_block,
+		   void *user_data)
+{
+	LOG_INF("CoAP response callback, %d", code);
+	last_response_code = code;
+	if (user_data) {
+		k_sem_give((struct k_sem *) user_data);
+	}
+}
+
 extern void net_coap_init(void);
 
 static void *suite_setup(void)
@@ -463,90 +501,38 @@ static void test_setup(void *data)
 
 	memset(&client.requests, 0, sizeof(client.requests));
 	memset(last_token, 0, sizeof(last_token));
-
 	last_response_code = 0;
+	k_sem_reset(&sem1);
+	k_sem_reset(&sem2);
 
 	k_mutex_unlock(&client.lock);
 }
 
-void coap_callback(int16_t code, size_t offset, const uint8_t *payload, size_t len, bool last_block,
-		   void *user_data)
+static void test_after(void *data)
 {
-	LOG_INF("CoAP response callback, %d", code);
-	last_response_code = code;
-	if (user_data) {
-		k_sem_give((struct k_sem *) user_data);
-	}
+	coap_client_cancel_requests(&client);
+	coap_client_cancel_requests(&client2);
 }
 
-ZTEST_SUITE(coap_client, NULL, suite_setup, test_setup, NULL, NULL);
+ZTEST_SUITE(coap_client, NULL, suite_setup, test_setup, test_after, NULL);
 
 ZTEST(coap_client, test_get_request)
 {
-	int ret = 0;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = NULL,
-		.len = 0
-	};
-
-	client_request.payload = short_payload;
-	client_request.len = strlen(short_payload);
-
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, NULL));
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
-	LOG_INF("Test done");
 }
 
 ZTEST(coap_client, test_request_block)
 {
-	int ret = 0;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-	};
-
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_block;
 
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_equal(ret, -EAGAIN, "");
+	zassert_equal(coap_client_req(&client, 0, &dst_address, &short_request, NULL), -EAGAIN, "");
 }
 
-
 ZTEST(coap_client, test_resend_request)
 {
-	int ret = 0;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-	};
-
 	int (*sendto_fakes[])(int, void *, size_t, int, const struct sockaddr *, socklen_t) = {
 		z_impl_zsock_sendto_custom_fake_no_reply,
 		z_impl_zsock_sendto_custom_fake_block,
@@ -556,86 +542,43 @@ ZTEST(coap_client, test_resend_request)
 	SET_CUSTOM_FAKE_SEQ(z_impl_zsock_sendto, sendto_fakes, ARRAY_SIZE(sendto_fakes));
 	set_socket_events(client.fd, ZSOCK_POLLOUT);
 
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, NULL));
 	k_sleep(K_MSEC(MORE_THAN_ACK_TIMEOUT_MS));
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 	zassert_equal(z_impl_zsock_sendto_fake.call_count, 3);
-	LOG_INF("Test done");
 }
 
 ZTEST(coap_client, test_echo_option)
 {
-	int ret = 0;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = NULL,
-		.len = 0
-	};
-
-	client_request.payload = short_payload;
-	client_request.len = strlen(short_payload);
-
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_echo;
 
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, NULL));
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
-	LOG_INF("Test done");
 }
 
 ZTEST(coap_client, test_echo_option_next_req)
 {
-	int ret = 0;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = NULL,
-		.len = 0
-	};
-
-	client_request.payload = short_payload;
-	client_request.len = strlen(short_payload);
+	struct coap_client_request req = short_request;
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_echo_next_req;
 
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, NULL));
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
 	char *payload = "echo testing";
 
-	client_request.method = COAP_METHOD_POST;
-	client_request.payload = payload;
-	client_request.len = strlen(payload);
+	req.method = COAP_METHOD_POST;
+	req.payload = payload;
+	req.len = strlen(payload);
 
 	LOG_INF("Send next request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &req, NULL));
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
@@ -643,51 +586,15 @@ ZTEST(coap_client, test_echo_option_next_req)
 
 ZTEST(coap_client, test_get_no_path)
 {
-	int ret = 0;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = NULL,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = NULL,
-		.len = 0
-	};
+	struct coap_client_request req = short_request;
 
-	client_request.payload = short_payload;
-	client_request.len = strlen(short_payload);
-
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-
-	zassert_equal(ret, -EINVAL, "Get request without path");
+	req.path = NULL;
+	zassert_equal(coap_client_req(&client, 0, &dst_address, &req, NULL), -EINVAL, "");
 }
 
 ZTEST(coap_client, test_send_large_data)
 {
-	int ret = 0;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = NULL,
-		.len = 0
-	};
-
-	client_request.payload = long_payload;
-	client_request.len = strlen(long_payload);
-
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &long_request, NULL));
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
@@ -695,35 +602,16 @@ ZTEST(coap_client, test_send_large_data)
 
 ZTEST(coap_client, test_no_response)
 {
-	int ret = 0;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = NULL,
-		.len = 0
-	};
 	struct coap_transmission_parameters params = {
 		.ack_timeout = LONG_ACK_TIMEOUT_MS,
 		.coap_backoff_percent = 200,
 		.max_retransmission = 0
 	};
 
-	client_request.payload = short_payload;
-	client_request.len = strlen(short_payload);
-
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
 	set_socket_events(client.fd, ZSOCK_POLLOUT);
 
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, &params);
-
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, &params));
 
 	k_sleep(K_MSEC(MORE_THAN_LONG_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, -ETIMEDOUT, "Unexpected response");
@@ -731,28 +619,9 @@ ZTEST(coap_client, test_no_response)
 
 ZTEST(coap_client, test_separate_response)
 {
-	int ret = 0;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = NULL,
-		.len = 0
-	};
-
-	client_request.payload = short_payload;
-	client_request.len = strlen(short_payload);
-
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_empty_ack;
 
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, NULL));
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
@@ -760,50 +629,24 @@ ZTEST(coap_client, test_separate_response)
 
 ZTEST(coap_client, test_separate_response_lost)
 {
-	int ret = 0;
-	struct k_sem sem;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem,
-	};
+	struct coap_client_request req = short_request;
+
+	req.user_data = &sem1;
 
-	zassert_ok(k_sem_init(&sem, 0, 1));
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_only_ack;
 	set_socket_events(client.fd, ZSOCK_POLLOUT);
 
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &req, NULL));
 
-	zassert_ok(k_sem_take(&sem, K_MSEC(COAP_SEPARATE_TIMEOUT)));
+	zassert_ok(k_sem_take(&sem1, K_MSEC(COAP_SEPARATE_TIMEOUT)));
 	zassert_equal(last_response_code, -ETIMEDOUT, "");
 }
 
 ZTEST(coap_client, test_separate_response_ack_fail)
 {
-	int ret = 0;
-	struct k_sem sem;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem,
-	};
-	zassert_ok(k_sem_init(&sem, 0, 1));
+	struct coap_client_request req = short_request;
+
+	req.user_data = &sem1;
 
 	int (*sendto_fakes[])(int, void *, size_t, int, const struct sockaddr *, socklen_t) = {
 		z_impl_zsock_sendto_custom_fake,
@@ -813,95 +656,47 @@ ZTEST(coap_client, test_separate_response_ack_fail)
 	SET_CUSTOM_FAKE_SEQ(z_impl_zsock_sendto, sendto_fakes, ARRAY_SIZE(sendto_fakes));
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_empty_ack;
 
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &req, NULL));
 
-	zassert_ok(k_sem_take(&sem, K_MSEC(COAP_SEPARATE_TIMEOUT)));
+	zassert_ok(k_sem_take(&sem1, K_MSEC(COAP_SEPARATE_TIMEOUT)));
 	zassert_equal(last_response_code, -ENETDOWN, "");
 }
 
 ZTEST(coap_client, test_multiple_requests)
 {
-	int ret = 0;
-	int retry = MORE_THAN_EXCHANGE_LIFETIME_MS;
-	struct k_sem sem1, sem2;
-
-	struct sockaddr address = {0};
-	struct coap_client_request req1 = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem1
-	};
-	struct coap_client_request req2 = req1;
+	struct coap_client_request req1 = short_request;
+	struct coap_client_request req2 = short_request;
 
+	req1.user_data = &sem1;
 	req2.user_data = &sem2;
 
-	k_sem_init(&sem1, 0, 1);
-	k_sem_init(&sem2, 0, 1);
-
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
 
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &req1, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-
-	ret = coap_client_req(&client, 0, &address, &req2, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &req1, NULL));
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &req2, NULL));
 
 	set_socket_events(client.fd, ZSOCK_POLLIN);
-	while (last_response_code == 0 && retry > 0) {
-		retry--;
-		k_sleep(K_MSEC(1));
-	}
+	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
 	last_response_code = 0;
 	set_socket_events(client.fd, ZSOCK_POLLIN);
-	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
 
 ZTEST(coap_client, test_unmatching_tokens)
 {
-	int ret = 0;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = NULL,
-		.len = 0
-	};
 	struct coap_transmission_parameters params = {
 		.ack_timeout = LONG_ACK_TIMEOUT_MS,
 		.coap_backoff_percent = 200,
 		.max_retransmission = 0
 	};
 
-	client_request.payload = short_payload;
-	client_request.len = strlen(short_payload);
-
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_unmatching;
 	set_socket_events(client.fd, ZSOCK_POLLIN | ZSOCK_POLLOUT);
 
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, &params);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, &params));
 
 	k_sleep(K_MSEC(MORE_THAN_LONG_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, -ETIMEDOUT, "Unexpected response");
@@ -909,45 +704,14 @@ ZTEST(coap_client, test_unmatching_tokens)
 
 ZTEST(coap_client, test_multiple_clients)
 {
-	int ret;
-	int retry = MORE_THAN_EXCHANGE_LIFETIME_MS;
-	struct k_sem sem1, sem2;
-	struct sockaddr address = {0};
-	struct coap_client_request req1 = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem1
-	};
-	struct coap_client_request req2 = req1;
+	struct coap_client_request req1 = short_request;
+	struct coap_client_request req2 = long_request;
 
+	req1.user_data = &sem1;
 	req2.user_data = &sem2;
-	req2.payload = long_payload;
-	req2.len = strlen(long_payload);
-
-	zassert_ok(k_sem_init(&sem1, 0, 1));
-	zassert_ok(k_sem_init(&sem2, 0, 1));
-
-	k_sleep(K_MSEC(1));
 
-	LOG_INF("Sending requests");
-	ret = coap_client_req(&client, client.fd, &address, &req1, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-
-	ret = coap_client_req(&client2, client2.fd, &address, &req2, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-
-	while (last_response_code == 0 && retry > 0) {
-		retry--;
-		k_sleep(K_MSEC(1));
-	}
-	set_socket_events(client2.fd, ZSOCK_POLLIN);
-
-	k_sleep(K_SECONDS(1));
+	zassert_ok(coap_client_req(&client, client.fd, &dst_address, &req1, NULL));
+	zassert_ok(coap_client_req(&client2, client2.fd, &dst_address, &req2, NULL));
 
 	/* ensure we got both responses */
 	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
@@ -958,26 +722,10 @@ ZTEST(coap_client, test_multiple_clients)
 
 ZTEST(coap_client, test_poll_err)
 {
-	int ret = 0;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-	};
-
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
 	set_socket_events(client.fd, ZSOCK_POLLERR);
 
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, NULL));
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, -EIO, "Unexpected response");
@@ -985,29 +733,10 @@ ZTEST(coap_client, test_poll_err)
 
 ZTEST(coap_client, test_poll_err_after_response)
 {
-	int ret = 0;
-	struct k_sem sem1;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem1
-	};
-
-	zassert_ok(k_sem_init(&sem1, 0, 1));
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
 	set_socket_events(client.fd, ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, NULL));
 
 	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
@@ -1018,35 +747,17 @@ ZTEST(coap_client, test_poll_err_after_response)
 
 ZTEST(coap_client, test_poll_err_on_another_sock)
 {
-	int ret = 0;
-	struct k_sem sem1, sem2;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem1
-	};
-	struct coap_client_request request2 = client_request;
-
-	request2.user_data = &sem2;
+	struct coap_client_request req1 = short_request;
+	struct coap_client_request req2 = short_request;
 
-	zassert_ok(k_sem_init(&sem1, 0, 1));
-	zassert_ok(k_sem_init(&sem2, 0, 1));
+	req1.user_data = &sem1;
+	req2.user_data = &sem2;
 
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
 	set_socket_events(client.fd, ZSOCK_POLLERR);
 
-	k_sleep(K_MSEC(1));
-
-	ret = coap_client_req(&client2, client2.fd, &address, &request2, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-	ret = coap_client_req(&client, client.fd, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	zassert_ok(coap_client_req(&client2, client2.fd, &dst_address, &req2, NULL));
+	zassert_ok(coap_client_req(&client, client.fd, &dst_address, &req1, NULL));
 
 	set_socket_events(client2.fd, ZSOCK_POLLIN);
 
@@ -1058,45 +769,25 @@ ZTEST(coap_client, test_poll_err_on_another_sock)
 
 ZTEST(coap_client, test_duplicate_response)
 {
-	int ret = 0;
-	struct k_sem sem;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem,
-	};
-
-	zassert_ok(k_sem_init(&sem, 0, 2));
 	z_impl_zsock_recvfrom_fake.custom_fake =
 		z_impl_zsock_recvfrom_custom_fake_duplicate_response;
 
-	k_sleep(K_MSEC(1));
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, NULL));
 
-	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
-	zassert_equal(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)), -EAGAIN, "");
+	zassert_equal(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)), -EAGAIN, "");
 }
 
 ZTEST(coap_client, test_observe)
 {
-	struct k_sem sem;
-	struct sockaddr address = {0};
 	struct coap_client_option options = {
 		.code = COAP_OPTION_OBSERVE,
 		.value[0] = 0,
 		.len = 1,
 	};
-	struct coap_client_request client_request = {
+	struct coap_client_request req = {
 		.method = COAP_METHOD_GET,
 		.confirmable = true,
 		.path = test_path,
@@ -1106,79 +797,47 @@ ZTEST(coap_client, test_observe)
 		.len = strlen(short_payload),
 		.options = &options,
 		.num_options = 1,
-		.user_data = &sem,
+		.user_data = &sem1,
 	};
 
-	zassert_ok(k_sem_init(&sem, 0, 1));
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_observe;
 
-	k_sleep(K_MSEC(1));
 
-	zassert_ok(coap_client_req(&client, 0, &address, &client_request, NULL));
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &req, NULL));
 
-	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 
 	coap_client_cancel_requests(&client);
-	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, -ECANCELED, "");
 
-	zassert_not_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_not_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 }
 
 ZTEST(coap_client, test_request_rst)
 {
-	struct k_sem sem;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem,
-	};
-
-	zassert_ok(k_sem_init(&sem, 0, 1));
-	k_sleep(K_MSEC(1));
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_rst;
 
-	zassert_ok(coap_client_req(&client, 0, &address, &client_request, NULL));
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, NULL));
 
-	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, -ECONNRESET, "");
 }
 
 ZTEST(coap_client, test_cancel)
 {
-	struct k_sem sem1, sem2;
-	struct sockaddr address = {0};
-	struct coap_client_request req1 = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem1
-	};
-	struct coap_client_request req2 = req1;
+	struct coap_client_request req1 = short_request;
+	struct coap_client_request req2 = short_request;
 
+	req1.user_data = &sem1;
 	req2.user_data = &sem2;
 
-	k_sem_init(&sem1, 0, 1);
-	k_sem_init(&sem2, 0, 1);
-
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
 
-	k_sleep(K_MSEC(1));
-
-	zassert_ok(coap_client_req(&client, 0, &address, &req1, NULL));
-	zassert_ok(coap_client_req(&client, 0, &address, &req2, NULL));
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &req1, NULL));
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &req2, NULL));
 
 	k_sleep(K_SECONDS(1));
 
@@ -1196,32 +855,17 @@ ZTEST(coap_client, test_cancel)
 
 ZTEST(coap_client, test_cancel_match)
 {
-	struct k_sem sem1, sem2;
-	struct sockaddr address = {0};
-	struct coap_client_request req1 = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem1
-	};
-	struct coap_client_request req2 = req1;
+	struct coap_client_request req1 = short_request;
+	struct coap_client_request req2 = short_request;
 
+	req1.user_data = &sem1;
 	req2.user_data = &sem2;
 	req2.path = "another";
 
-	k_sem_init(&sem1, 0, 1);
-	k_sem_init(&sem2, 0, 1);
-
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
 
-	k_sleep(K_MSEC(1));
-
-	zassert_ok(coap_client_req(&client, 0, &address, &req1, NULL));
-	zassert_ok(coap_client_req(&client, 0, &address, &req2, NULL));
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &req1, NULL));
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &req2, NULL));
 
 	k_sleep(K_SECONDS(1));
 
@@ -1233,7 +877,7 @@ ZTEST(coap_client, test_cancel_match)
 	zassert_not_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, -ECANCELED, "");
 
-	zassert_ok(coap_client_req(&client, 0, &address, &req1, NULL));
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &req1, NULL));
 
 	/* should not match */
 	coap_client_cancel_request(&client, &(struct coap_client_request) {
@@ -1250,8 +894,8 @@ ZTEST(coap_client, test_cancel_match)
 	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 
-	zassert_ok(coap_client_req(&client, 0, &address, &req1, NULL));
-	zassert_ok(coap_client_req(&client, 0, &address, &req2, NULL));
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &req1, NULL));
+	zassert_ok(coap_client_req(&client, 0, &dst_address, &req2, NULL));
 
 	/* match both (wildcard)*/
 	coap_client_cancel_request(&client, &(struct coap_client_request) {0});

From 5cd6dd06f4fcdb295fa46fcb5a1ad76998895d76 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Mon, 18 Nov 2024 15:37:48 +0200
Subject: [PATCH 0763/2913] [nrf fromtree] tests: coap_client: Add test for
 non-confirmable request

Add test for sending multiple non-confirmable requests.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 23345d203e677cada602707635752f20e73e19a7)
(cherry picked from commit 7ce2b50ffbfd1672185add9bd260de6d3bef3f36)
---
 tests/net/lib/coap_client/src/main.c | 32 ++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index a620b1985e0..02d7693a7a0 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -903,3 +903,35 @@ ZTEST(coap_client, test_cancel_match)
 	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 
 }
+
+ZTEST(coap_client, test_non_confirmable)
+{
+	struct coap_client_request req = {
+		.method = COAP_METHOD_GET,
+		.confirmable = false,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem1
+	};
+
+	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
+	set_socket_events(client.fd, ZSOCK_POLLOUT);
+
+	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
+		zassert_ok(coap_client_req(&client, 0, &dst_address, &req, NULL));
+	}
+	zassert_equal(coap_client_req(&client, 0, &dst_address, &req, NULL), -EAGAIN, "");
+
+	k_sleep(K_MSEC(MORE_THAN_LONG_EXCHANGE_LIFETIME_MS));
+
+	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
+		zassert_ok(coap_client_req(&client, 0, &dst_address, &req, NULL));
+	}
+	zassert_equal(coap_client_req(&client, 0, &dst_address, &req, NULL), -EAGAIN, "");
+
+	/* No callbacks from non-confirmable */
+	zassert_not_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+}

From 6bfc61def481d410a67bd1f81907f29c19a7ecb7 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Mon, 18 Nov 2024 15:43:03 +0200
Subject: [PATCH 0764/2913] [nrf fromtree] net: lib: coap_client: Fix timeout
 for separate response

When waiting for response after receiving the empty Ack, client
actually used way too timeout.
CoAP timeout only holds the timeout value in ms. t0 is the starting time.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 6c169668e9230740a780c688704c023ec43ccc98)
(cherry picked from commit bbd0098f414281d5087d32276324a821a08ec633)
---
 subsys/net/lib/coap/coap_client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 468505f5eb5..30dcbb42005 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -793,7 +793,7 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 			return 0;
 		}
 		internal_req->pending.t0 = k_uptime_get();
-		internal_req->pending.timeout = internal_req->pending.t0 + COAP_SEPARATE_TIMEOUT;
+		internal_req->pending.timeout = COAP_SEPARATE_TIMEOUT;
 		internal_req->pending.retries = 0;
 		return 1;
 	}

From d3cba27aae225bfcb09afe8192d9a8e2b8f70bc8 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Mon, 18 Nov 2024 15:47:01 +0200
Subject: [PATCH 0765/2913] [nrf fromtree] net: lib: coap_client: Release
 non-confirmable requests

Non-confirmable CoAP requests need lifetime tracking as well
so we can free the structure after a timeout.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 2066cf6a3d17fc1a1733fab3e47fe8969145df6b)
(cherry picked from commit e102affcab1fb1dc4997ffa253d90512db82c1f1)
---
 subsys/net/lib/coap/coap_client.c | 53 ++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 30dcbb42005..a3c56281819 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -105,6 +105,10 @@ static bool exchange_lifetime_exceeded(struct coap_client_internal_request *inte
 		return true;
 	}
 
+	if (internal_req->pending.t0 == 0) {
+		return true;
+	}
+
 	time_since_t0 = k_uptime_get() - internal_req->pending.t0;
 	exchange_lifetime =
 		(internal_req->pending.params.ack_timeout * COAP_EXCHANGE_LIFETIME_FACTOR);
@@ -364,7 +368,7 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
 	/* Don't allow changing to a different socket if there is already request ongoing. */
 	if (client->fd != sock && has_ongoing_request(client)) {
 		ret = -EALREADY;
-		goto out;
+		goto release;
 	}
 
 	/* Don't allow changing to a different address if there is already request ongoing. */
@@ -373,7 +377,7 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
 			if (has_ongoing_request(client)) {
 				LOG_WRN("Can't change to a different socket, request ongoing.");
 				ret = -EALREADY;
-				goto out;
+				goto release;
 			}
 
 			memcpy(&client->address, addr, sizeof(*addr));
@@ -384,7 +388,7 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
 			if (has_ongoing_request(client)) {
 				LOG_WRN("Can't change to a different socket, request ongoing.");
 				ret = -EALREADY;
-				goto out;
+				goto release;
 			}
 
 			memset(&client->address, 0, sizeof(client->address));
@@ -397,7 +401,7 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
 	ret = coap_client_init_request(client, req, internal_req, false);
 	if (ret < 0) {
 		LOG_ERR("Failed to initialize coap request");
-		goto out;
+		goto release;
 	}
 
 	if (client->send_echo) {
@@ -405,7 +409,7 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
 						client->echo_option.value, client->echo_option.len);
 		if (ret < 0) {
 			LOG_ERR("Failed to append echo option");
-			goto out;
+			goto release;
 		}
 		client->send_echo = false;
 	}
@@ -413,28 +417,36 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
 	ret = coap_client_schedule_poll(client, sock, req, internal_req);
 	if (ret < 0) {
 		LOG_ERR("Failed to schedule polling");
-		goto out;
+		goto release;
 	}
 
-	/* only TYPE_CON messages need pending tracking */
-	if (coap_header_get_type(&internal_req->request) == COAP_TYPE_CON) {
-		ret = coap_pending_init(&internal_req->pending, &internal_req->request,
-					&client->address, params);
+	ret = coap_pending_init(&internal_req->pending, &internal_req->request,
+				&client->address, params);
 
-		if (ret < 0) {
-			LOG_ERR("Failed to initialize pending struct");
-			goto out;
-		}
+	if (ret < 0) {
+		LOG_ERR("Failed to initialize pending struct");
+		goto release;
+	}
 
-		coap_pending_cycle(&internal_req->pending);
-		internal_req->is_observe = coap_request_is_observe(&internal_req->request);
-		LOG_DBG("Request is_observe %d", internal_req->is_observe);
+	/* Non-Confirmable messages are not retried, but we still track the lifetime as
+	 * replies are acceptable.
+	 */
+	if (coap_header_get_type(&internal_req->request) == COAP_TYPE_NON_CON) {
+		internal_req->pending.retries = 0;
 	}
+	coap_pending_cycle(&internal_req->pending);
+	internal_req->is_observe = coap_request_is_observe(&internal_req->request);
+	LOG_DBG("Request is_observe %d", internal_req->is_observe);
 
 	ret = send_request(sock, internal_req->request.data, internal_req->request.offset, 0,
 			  &client->address, client->socklen);
 	if (ret < 0) {
-		LOG_ERR("Transmission failed: %d", errno);
+		ret = -errno;
+	}
+
+release:
+	if (ret < 0) {
+		LOG_ERR("Failed to send request: %d", ret);
 		reset_internal_request(internal_req);
 	} else {
 		/* Do not return the number of bytes sent */
@@ -521,6 +533,11 @@ static void coap_client_resend_handler(struct coap_client *client)
 
 	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
 		if (timeout_expired(&client->requests[i])) {
+			if (!client->requests[i].coap_request.confirmable) {
+				release_internal_request(&client->requests[i]);
+				continue;
+			}
+
 			ret = resend_request(client, &client->requests[i]);
 			if (ret < 0) {
 				report_callback_error(&client->requests[i], ret);

From d02544f75f3dc9b5e9cc25fc94bde307965a2a27 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Mon, 18 Nov 2024 15:53:21 +0200
Subject: [PATCH 0766/2913] [nrf fromtree] net: lib: coap_client: Const
 pointers in request

CoAP client does not modify any of the members, so
change all pointers to const.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit bc4f026ea946c5bf587edd91f043672fad617cdc)
(cherry picked from commit f995b7d0b896c582c0bacd5e5aed434208e125ea)
---
 include/zephyr/net/coap_client.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/zephyr/net/coap_client.h b/include/zephyr/net/coap_client.h
index bbeebb2d26c..ce09c56dd2e 100644
--- a/include/zephyr/net/coap_client.h
+++ b/include/zephyr/net/coap_client.h
@@ -53,16 +53,16 @@ typedef void (*coap_client_response_cb_t)(int16_t result_code,
  * @brief Representation of a CoAP client request.
  */
 struct coap_client_request {
-	enum coap_method method;            /**< Method of the request */
-	bool confirmable;	            /**< CoAP Confirmable/Non-confirmable message */
-	const char *path;	            /**< Path of the requested resource */
-	enum coap_content_format fmt;       /**< Content format to be used */
-	uint8_t *payload;	            /**< User allocated buffer for send request */
-	size_t len;		            /**< Length of the payload */
-	coap_client_response_cb_t cb;       /**< Callback when response received */
-	struct coap_client_option *options; /**< Extra options to be added to request */
-	uint8_t num_options;                /**< Number of extra options */
-	void *user_data;	            /**< User provided context */
+	enum coap_method method;                  /**< Method of the request */
+	bool confirmable;                         /**< CoAP Confirmable/Non-confirmable message */
+	const char *path;                         /**< Path of the requested resource */
+	enum coap_content_format fmt;             /**< Content format to be used */
+	const uint8_t *payload;                   /**< User allocated buffer for send request */
+	size_t len;                               /**< Length of the payload */
+	coap_client_response_cb_t cb;             /**< Callback when response received */
+	const struct coap_client_option *options; /**< Extra options to be added to request */
+	uint8_t num_options;                      /**< Number of extra options */
+	void *user_data;                          /**< User provided context */
 };
 
 /**

From 03f65b199ca7e105719f2fcb5b5e4c3389a0b8c2 Mon Sep 17 00:00:00 2001
From: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
Date: Thu, 28 Nov 2024 07:36:51 +0100
Subject: [PATCH 0767/2913] [nrf fromlist] modules: openthread: Add of Kconfigs
 to change child timeouts

Introduced few Kconfigs that allow to change default values
of MLE child timeout and child supervision timeouts.

Upstream PR #: 82209

Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
(cherry picked from commit 6e98d27ad62d03cda299a4e8222829c4485532f6)
---
 modules/openthread/Kconfig.thread             | 21 +++++++++++++
 .../platform/openthread-core-zephyr-config.h  | 31 +++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/modules/openthread/Kconfig.thread b/modules/openthread/Kconfig.thread
index 22f11d5c606..5a5a10d6712 100644
--- a/modules/openthread/Kconfig.thread
+++ b/modules/openthread/Kconfig.thread
@@ -210,3 +210,24 @@ config OPENTHREAD_STORE_FRAME_COUNTER_AHEAD
 	default 100000
 	help
 	  Openthread value ahead of the current frame counter for persistent storage.
+
+config OPENTHREAD_CHILD_SUPERVISION_CHECK_TIMEOUT
+	int "Openthread child supervision check timeout in seconds"
+	default 190
+	help
+	  The supervision check timeout interval in seconds used by a device in child state.
+	  Set to zero to disable the supervision check process on the child.
+
+config OPENTHREAD_CHILD_SUPERVISION_INTERVAL
+	int "Openthread child supervision interval in seconds"
+	default 129
+	help
+	  The supervision interval used by a parent device to send a supervision message
+	  to the child, if there is no transmission to the child within this interval.
+	  Set to zero to disable the supervision check process on the child.
+
+config OPENTHREAD_MLE_CHILD_TIMEOUT
+	int "Openthread MLE child timeout in seconds"
+	default 240
+	help
+	  The value of MLE child timeout in seconds.
diff --git a/modules/openthread/platform/openthread-core-zephyr-config.h b/modules/openthread/platform/openthread-core-zephyr-config.h
index 434d69783be..fac10d211c6 100644
--- a/modules/openthread/platform/openthread-core-zephyr-config.h
+++ b/modules/openthread/platform/openthread-core-zephyr-config.h
@@ -468,4 +468,35 @@
 #define OPENTHREAD_CONFIG_STORE_FRAME_COUNTER_AHEAD CONFIG_OPENTHREAD_STORE_FRAME_COUNTER_AHEAD
 #endif
 
+/**
+ * @def OPENTHREAD_CONFIG_CHILD_SUPERVISION_CHECK_TIMEOUT
+ *
+ * The value of the child supervision check timeout in seconds.
+ *
+ */
+#ifdef CONFIG_OPENTHREAD_CHILD_SUPERVISION_CHECK_TIMEOUT
+#define OPENTHREAD_CONFIG_CHILD_SUPERVISION_CHECK_TIMEOUT                                          \
+	CONFIG_OPENTHREAD_CHILD_SUPERVISION_CHECK_TIMEOUT
+#endif
+
+/**
+ * @def OPENTHREAD_CONFIG_CHILD_SUPERVISION_INTERVAL
+ *
+ * The value of the child supervision interval in seconds.
+ *
+ */
+#ifdef CONFIG_OPENTHREAD_CHILD_SUPERVISION_INTERVAL
+#define OPENTHREAD_CONFIG_CHILD_SUPERVISION_INTERVAL CONFIG_OPENTHREAD_CHILD_SUPERVISION_INTERVAL
+#endif
+
+/**
+ * @def OPENTHREAD_CONFIG_MLE_CHILD_TIMEOUT_DEFAULT
+ *
+ * The value of the MLE child timeout in seconds.
+ *
+ */
+#ifdef CONFIG_OPENTHREAD_MLE_CHILD_TIMEOUT
+#define OPENTHREAD_CONFIG_MLE_CHILD_TIMEOUT_DEFAULT CONFIG_OPENTHREAD_MLE_CHILD_TIMEOUT
+#endif
+
 #endif  /* OPENTHREAD_CORE_ZEPHYR_CONFIG_H_ */

From 8afab7ad6d39d5a51108b13736a74ea704fd7f27 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Fri, 15 Nov 2024 08:41:59 +0100
Subject: [PATCH 0768/2913] [nrf fromtree] modules: hal_nordic: nrfs: Enqueue
 requests when not connected

Allow `nrfs_backend_send` to push early requests into the message queue,
but defer sending them until a connection is established, at which point
the queue will be flushed. This benefits asynchronous code by making it
optional to call `nrfs_backend_wait_for_connection` before using the
nrfs service API, which is already non-blocking.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit c120f4fe562e39469179860e0acbfa697e50a3d7)
(cherry picked from commit 4efcb15b882b0b610bf937ce15f141b35c073328)
---
 .../nrfs/backends/nrfs_backend_ipc_service.c        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c b/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c
index 66077337422..129098e9b2d 100644
--- a/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c
+++ b/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c
@@ -95,6 +95,10 @@ static void ipc_sysctrl_ept_bound(void *priv)
 	LOG_DBG("Bound to sysctrl.");
 	k_event_post(&ipc_connected_event, IPC_INIT_DONE_EVENT);
 	atomic_set(&ipc_cpusys_channel_config.status, CONNECTED);
+
+	if (k_msgq_num_used_get(&ipc_transmit_msgq) > 0) {
+		k_work_submit(&backend_send_work);
+	}
 }
 
 static void ipc_sysctrl_ept_recv(const void *data, size_t size, void *priv)
@@ -172,11 +176,6 @@ nrfs_err_t nrfs_backend_send(void *message, size_t size)
 
 nrfs_err_t nrfs_backend_send_ex(void *message, size_t size, k_timeout_t timeout, bool high_prio)
 {
-	if (atomic_get(&ipc_cpusys_channel_config.status) != CONNECTED) {
-		LOG_WRN("Backend not yet connected to sysctrl");
-		return NRFS_ERR_INVALID_STATE;
-	}
-
 	if (size <= MAX_PACKET_DATA_SIZE) {
 		int err;
 		struct ipc_data_packet tx_data;
@@ -190,7 +189,9 @@ nrfs_err_t nrfs_backend_send_ex(void *message, size_t size, k_timeout_t timeout,
 			return NRFS_ERR_IPC;
 		}
 
-		err = k_work_submit(&backend_send_work);
+		if (nrfs_backend_connected()) {
+			err = k_work_submit(&backend_send_work);
+		}
 
 		return err >= 0 ? 0 : NRFS_ERR_IPC;
 	}

From 510f46f8e8b86d45088a607cc6cb48787f23c421 Mon Sep 17 00:00:00 2001
From: Grzegorz Chwierut <grzegorz.chwierut@nordicsemi.no>
Date: Fri, 15 Nov 2024 20:02:16 +0100
Subject: [PATCH 0769/2913] [nrf fromtree] twister: Allow sharing hardware
 platform between variants

Extended hardware map to share a single board between variants.
To run tests for different variants on the same board
without re-configuring the hardware map file for each variant,
one can use a `platform` atribute as a list of names.

Signed-off-by: Grzegorz Chwierut <grzegorz.chwierut@nordicsemi.no>
(cherry picked from commit e0bd7e7c8704412b41ad7dbd7395044ea26f12b4)
(cherry picked from commit 67225416c76067104cb5258287bdc9fbf8c09f52)
---
 doc/develop/test/twister.rst                  | 19 +++++++
 scripts/pylib/twister/twisterlib/handlers.py  | 36 ++++++++++----
 .../pylib/twister/twisterlib/hardwaremap.py   | 49 +++++++++++--------
 scripts/schemas/twister/hwmap-schema.yaml     |  2 +-
 scripts/tests/twister/test_handlers.py        |  1 +
 5 files changed, 75 insertions(+), 32 deletions(-)

diff --git a/doc/develop/test/twister.rst b/doc/develop/test/twister.rst
index a362c79861a..0cc391e5b89 100644
--- a/doc/develop/test/twister.rst
+++ b/doc/develop/test/twister.rst
@@ -1255,6 +1255,25 @@ using an external J-Link probe.  The ``probe_id`` keyword overrides the
       runner: jlink
       serial: null
 
+Using Single Board For Multiple Variants
+++++++++++++++++++++++++++++++++++++++++
+
+  The ``platform`` attribute can be a list of names or a string
+  with names separated by spaces. This allows to run tests for
+  different platform variants on the same physical board, without
+  re-configuring the hardware map file for each variant. For example:
+
+.. code-block:: yaml
+
+    - connected: true
+      id: '001234567890'
+      platform:
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf5340dk/nrf5340/cpuapp/ns
+      product: J-Link
+      runner: nrfjprog
+      serial: /dev/ttyACM1
+
 Quarantine
 ++++++++++
 
diff --git a/scripts/pylib/twister/twisterlib/handlers.py b/scripts/pylib/twister/twisterlib/handlers.py
index 0ebab95434b..14e45d2c811 100755
--- a/scripts/pylib/twister/twisterlib/handlers.py
+++ b/scripts/pylib/twister/twisterlib/handlers.py
@@ -21,6 +21,7 @@
 import threading
 import time
 
+from contextlib import contextmanager
 from pathlib import Path
 from queue import Queue, Empty
 from twisterlib.environment import ZEPHYR_BASE, strip_ansi_sequences
@@ -458,6 +459,17 @@ def monitor_serial(self, ser, halt_event, harness):
 
         log_out_fp.close()
 
+    @staticmethod
+    @contextmanager
+    def acquire_dut_locks(duts):
+        try:
+            for d in duts:
+                d.lock.acquire()
+            yield
+        finally:
+            for d in duts:
+                d.lock.release()
+
     def device_is_available(self, instance):
         device = instance.platform.name
         fixture = instance.testsuite.harness_config.get("fixture")
@@ -475,15 +487,16 @@ def device_is_available(self, instance):
 
         # Select an available DUT with less failures
         for d in sorted(duts_found, key=lambda _dut: _dut.failures):
-            d.lock.acquire()
-            avail = False
-            if d.available:
-                d.available = 0
-                d.counter_increment()
-                avail = True
-                logger.debug(f"Retain DUT:{d.platform}, Id:{d.id}, "
-                             f"counter:{d.counter}, failures:{d.failures}")
-            d.lock.release()
+            duts_shared_hw = [_d for _d in self.duts if _d.id == d.id]  # get all DUTs with the same id
+            with self.acquire_dut_locks(duts_shared_hw):
+                avail = False
+                if d.available:
+                    for _d in duts_shared_hw:
+                        _d.available = 0
+                    d.counter_increment()
+                    avail = True
+                    logger.debug(f"Retain DUT:{d.platform}, Id:{d.id}, "
+                                f"counter:{d.counter}, failures:{d.failures}")
             if avail:
                 return d
 
@@ -494,7 +507,10 @@ def make_dut_available(self, dut):
             dut.failures_increment()
         logger.debug(f"Release DUT:{dut.platform}, Id:{dut.id}, "
                      f"counter:{dut.counter}, failures:{dut.failures}")
-        dut.available = 1
+        duts_shared_hw = [_d for _d in self.duts if _d.id == dut.id]  # get all DUTs with the same id
+        with self.acquire_dut_locks(duts_shared_hw):
+            for _d in duts_shared_hw:
+                _d.available = 1
 
     @staticmethod
     def run_custom_script(script, timeout):
diff --git a/scripts/pylib/twister/twisterlib/hardwaremap.py b/scripts/pylib/twister/twisterlib/hardwaremap.py
index 6ca6dbcdb7d..fad8ace910a 100644
--- a/scripts/pylib/twister/twisterlib/hardwaremap.py
+++ b/scripts/pylib/twister/twisterlib/hardwaremap.py
@@ -259,7 +259,13 @@ def load(self, map_file):
             flash_before = dut.get('flash_before')
             if flash_before is None:
                 flash_before = self.options.flash_before and (not (flash_with_test or serial_pty))
-            platform  = dut.get('platform')
+            platform = dut.get('platform')
+            if isinstance(platform, str):
+                platforms = platform.split()
+            elif isinstance(platform, list):
+                platforms = platform
+            else:
+                raise ValueError(f"Invalid platform value: {platform}")
             id = dut.get('id')
             runner = dut.get('runner')
             runner_params = dut.get('runner_params')
@@ -268,28 +274,29 @@ def load(self, map_file):
             baud = dut.get('baud', None)
             product = dut.get('product')
             fixtures = dut.get('fixtures', [])
-            connected= dut.get('connected') and ((serial or serial_pty) is not None)
+            connected = dut.get('connected') and ((serial or serial_pty) is not None)
             if not connected:
                 continue
-            new_dut = DUT(platform=platform,
-                          product=product,
-                          runner=runner,
-                          runner_params=runner_params,
-                          id=id,
-                          serial_pty=serial_pty,
-                          serial=serial,
-                          serial_baud=baud,
-                          connected=connected,
-                          pre_script=pre_script,
-                          flash_before=flash_before,
-                          post_script=post_script,
-                          post_flash_script=post_flash_script,
-                          script_param=script_param,
-                          flash_timeout=flash_timeout,
-                          flash_with_test=flash_with_test)
-            new_dut.fixtures = fixtures
-            new_dut.counter = 0
-            self.duts.append(new_dut)
+            for plat in platforms:
+                new_dut = DUT(platform=plat,
+                              product=product,
+                              runner=runner,
+                              runner_params=runner_params,
+                              id=id,
+                              serial_pty=serial_pty,
+                              serial=serial,
+                              serial_baud=baud,
+                              connected=connected,
+                              pre_script=pre_script,
+                              flash_before=flash_before,
+                              post_script=post_script,
+                              post_flash_script=post_flash_script,
+                              script_param=script_param,
+                              flash_timeout=flash_timeout,
+                              flash_with_test=flash_with_test)
+                new_dut.fixtures = fixtures
+                new_dut.counter = 0
+                self.duts.append(new_dut)
 
     def scan(self, persistent=False):
         from serial.tools import list_ports
diff --git a/scripts/schemas/twister/hwmap-schema.yaml b/scripts/schemas/twister/hwmap-schema.yaml
index f45bd8f79c7..142d4a1969b 100644
--- a/scripts/schemas/twister/hwmap-schema.yaml
+++ b/scripts/schemas/twister/hwmap-schema.yaml
@@ -16,7 +16,7 @@ sequence:
         type: str
         required: false
       "platform":
-        type: str
+        type: any
         required: true
       "probe_id":
         type: str
diff --git a/scripts/tests/twister/test_handlers.py b/scripts/tests/twister/test_handlers.py
index 3475c65197e..8e539a04a46 100644
--- a/scripts/tests/twister/test_handlers.py
+++ b/scripts/tests/twister/test_handlers.py
@@ -1273,6 +1273,7 @@ def mock_serial(*args, **kwargs):
     dut = DUT()
     dut.available = 0
     dut.failures = 0
+    handler.duts = [dut]
 
     hardware_baud = 14400
     flash_timeout = 60

From 6736f1890277540d243bca442eac17f2b4b8fd7e Mon Sep 17 00:00:00 2001
From: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
Date: Tue, 8 Oct 2024 21:53:39 +0200
Subject: [PATCH 0770/2913] [nrf fromtree] twister: blackbox: coverage: fix
 matching pattern

Fix the expected pattern randomly matched to coverage.json contents
ordered differently at test_coverage_basedir().

Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
(cherry picked from commit 27456ed2b57f0114cc976d9d74b98c9762818ca3)
(cherry picked from commit 2149857528353f0784c2bff9ea7c450f67f4e402)
---
 scripts/tests/twister_blackbox/test_coverage.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/tests/twister_blackbox/test_coverage.py b/scripts/tests/twister_blackbox/test_coverage.py
index 0d5e035ecd2..56fe73845ce 100644
--- a/scripts/tests/twister_blackbox/test_coverage.py
+++ b/scripts/tests/twister_blackbox/test_coverage.py
@@ -46,7 +46,7 @@ class TestCoverage:
                 'coverage.log', 'coverage.json',
                 'coverage'
             ],
-            r'{"files": \[], "gcovr/format_version": ".*"}'
+            r'{"files": \[\], "gcovr/format_version": ".*"}'
         ),
     ]
     TESTDATA_4 = [
@@ -243,7 +243,7 @@ def test_coverage_basedir(self, capfd, test_path, test_platforms, out_path, file
                 with open(path, "r") as json_file:
                     json_content = json.load(json_file)
                     pattern = re.compile(expected_content)
-                    assert pattern.match(json.dumps(json_content))
+                    assert pattern.match(json.dumps(json_content, sort_keys=True))
         if os.path.exists(base_dir):
             os.rmdir(base_dir)
 

From fd45cf7ef1491416c7f0ebd064a2417ae30648a5 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Tue, 19 Nov 2024 08:05:30 -0500
Subject: [PATCH 0771/2913] [nrf fromtree] ci: do not pull babblesim in twister
 test workflow

No need to pull babblesim and nrf_hw_models when doing twister testing.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
(cherry picked from commit cfd5469dc14316e1f80940447b0689b108bc94d2)
(cherry picked from commit b4762701d5b8d1a2e6924a21cbbe64e8fdebb1eb)
---
 .github/workflows/twister_tests_blackbox.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/twister_tests_blackbox.yml b/.github/workflows/twister_tests_blackbox.yml
index 8845c7eddd4..b19bce0c535 100644
--- a/.github/workflows/twister_tests_blackbox.yml
+++ b/.github/workflows/twister_tests_blackbox.yml
@@ -44,7 +44,8 @@ jobs:
 
         west init -l . || true
         # we do not depend on any hals, tools or bootloader, save some time and space...
-        west config manifest.group-filter -- -hal,-tools,-bootloader
+        west config manifest.group-filter -- -hal,-tools,-bootloader,-babblesim
+        west config manifest.project-filter -- -nrf_hw_models
         west config --global update.narrow true
         west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /github/cache/zephyrproject)
         west forall -c 'git reset --hard HEAD'

From 86cf2419a2cac5934cfbf3f6bf9b2ab25a855867 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 12 Nov 2024 00:12:59 +0530
Subject: [PATCH 0772/2913] [nrf fromtree] modules: hostap: Add external crypto
 support

Add an option for platforms or forks to provide their own hostap
compatible crypto implementation. This may include proprietary or
platform specific stuff that may or may not be upstreamed to Zephyr.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit bbfb546e57766540c782fc116721c5dedbd6656a)
(cherry picked from commit 53f5e6dae760d95db2dcb5efac83b83023484043)
---
 modules/hostap/Kconfig | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index e22059f00f0..813a9b91ed6 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -166,6 +166,14 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT
 config WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
 	bool "No Crypto support for WiFi"
 
+config WIFI_NM_WPA_SUPPLICANT_CRYPTO_EXT
+	bool "External Crypto support for hostap"
+	help
+	  Use external crypto implementation for hostp, this is useful for
+	  platforms where the crypto implementation is provided by the platform
+	  and not by Zephyr. The external crypto implementation should provide
+	  the required APIs and any other dependencies required by hostap.
+
 endchoice
 
 config WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA

From 63f0523ffc098afa1d5a49a9619138aa4a2ddb1e Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 30 Oct 2024 01:38:47 +0530
Subject: [PATCH 0773/2913] [nrf fromtree] drivers: nrfwifi: Fix passing of RAW
 scan results flag

The CONFIG_ prefix should be removed when passing to OSAL code.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 4ae6520c3a28b33d598a5ede8d11ad82116a086a)
(cherry picked from commit 7eda046420896f24ccd5c8bedf2d7f8512c8cd35)
---
 drivers/wifi/nrfwifi/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index ad665916ceb..65dfe9579fd 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -301,6 +301,10 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_FEAT_KEEPALIVE
   -DNRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}
 )
 
+zephyr_compile_definitions_ifdef(CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS
+  -DWIFI_MGMT_RAW_SCAN_RESULTS=${CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS}
+)
+
 zephyr_compile_definitions(
   -DNRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
   -DNRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}

From 4e50858759d961fe3286e37775125415bcfe73a3 Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Wed, 23 Oct 2024 18:02:32 +0530
Subject: [PATCH 0774/2913] [nrf fromtree] drivers: wifi: Fix offloaded raw TX
 feature flags

Pass passive scan and offloaded raw tx feature flags to OSAL.

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit 62e06a50729a4890725716341743cb9e74df476f)
(cherry picked from commit a4ca4d708ebee7b2868196e667d83c45baa8cce4)
---
 drivers/wifi/nrfwifi/CMakeLists.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 65dfe9579fd..439263ec615 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -305,6 +305,14 @@ zephyr_compile_definitions_ifdef(CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS
   -DWIFI_MGMT_RAW_SCAN_RESULTS=${CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS}
 )
 
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
+  -DNRF_NRF70_OFFLOADED_RAW_TX
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_PASSIVE_SCAN_ONLY
+  -DNRF70_PASSIVE_SCAN_ONLY
+)
+
 zephyr_compile_definitions(
   -DNRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
   -DNRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}

From 434fbcf597c23647813abe70494de1e3b119e0c6 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 4 Nov 2024 23:22:52 +0530
Subject: [PATCH 0775/2913] [nrf fromtree] nrf_wifi: Fix the directory name

Following the naming convention add an underscore and update path in the
maintainers file too.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 139ce48c8b9a82941cc224d7582e6dd95203f759)
(cherry picked from commit 5c64e2586ef39614e776e7d9d7ec27bdad558474)
---
 MAINTAINERS.yml                                               | 2 +-
 drivers/wifi/CMakeLists.txt                                   | 2 +-
 drivers/wifi/Kconfig                                          | 2 +-
 drivers/wifi/{nrfwifi => nrf_wifi}/CMakeLists.txt             | 4 ++--
 drivers/wifi/{nrfwifi => nrf_wifi}/Kconfig.nrfwifi            | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/inc/coex.h                 | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/inc/coex_struct.h          | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/inc/fmac_main.h            | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/inc/net_if.h               | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/inc/wifi_mgmt.h            | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/inc/wifi_mgmt_scan.h       | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/inc/wpa_supp_if.h          | 0
 .../wifi/{nrfwifi => nrf_wifi}/off_raw_tx/inc/off_raw_tx.h    | 0
 .../{nrfwifi => nrf_wifi}/off_raw_tx/src/off_raw_tx_api.c     | 2 +-
 drivers/wifi/{nrfwifi => nrf_wifi}/src/coex.c                 | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/fmac_main.c            | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/fw_load.c              | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/net_if.c               | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/inc/ficr_prog.h   | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/inc/qspi_if.h     | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/inc/rpu_hw_if.h   | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/inc/spi_if.h      | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/inc/spi_nor.h     | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/src/device.c      | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/src/ficr_prog.c   | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/src/qspi_if.c     | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/src/rpu_hw_if.c   | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/src/spi_if.c      | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/shim.c                 | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/shim.h                 | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/timer.c                | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/timer.h                | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/wifi_mgmt.c            | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/wifi_mgmt_scan.c       | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/wifi_util.c            | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/wifi_util.h            | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/work.c                 | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/work.h                 | 0
 drivers/wifi/{nrfwifi => nrf_wifi}/src/wpa_supp_if.c          | 0
 .../wifi/{nrfwifi => nrf_wifi}/off_raw_tx/off_raw_tx_api.h    | 0
 40 files changed, 6 insertions(+), 6 deletions(-)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/CMakeLists.txt (99%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/Kconfig.nrfwifi (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/inc/coex.h (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/inc/coex_struct.h (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/inc/fmac_main.h (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/inc/net_if.h (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/inc/wifi_mgmt.h (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/inc/wifi_mgmt_scan.h (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/inc/wpa_supp_if.h (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/off_raw_tx/inc/off_raw_tx.h (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/off_raw_tx/src/off_raw_tx_api.c (99%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/coex.c (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/fmac_main.c (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/fw_load.c (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/net_if.c (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/inc/ficr_prog.h (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/inc/qspi_if.h (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/inc/rpu_hw_if.h (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/inc/spi_if.h (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/inc/spi_nor.h (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/src/device.c (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/src/ficr_prog.c (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/src/qspi_if.c (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/src/rpu_hw_if.c (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/qspi/src/spi_if.c (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/shim.c (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/shim.h (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/timer.c (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/timer.h (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/wifi_mgmt.c (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/wifi_mgmt_scan.c (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/wifi_util.c (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/wifi_util.h (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/work.c (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/work.h (100%)
 rename drivers/wifi/{nrfwifi => nrf_wifi}/src/wpa_supp_if.c (100%)
 rename include/zephyr/drivers/wifi/{nrfwifi => nrf_wifi}/off_raw_tx/off_raw_tx_api.h (100%)

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index a77bbf643c0..957302c5104 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -2185,7 +2185,7 @@ Release Notes:
   collaborators:
     - sachinthegreen
   files:
-    - drivers/wifi/nrfwifi/
+    - drivers/wifi/nrf_wifi/
     - dts/bindings/wifi/nordic,nrf70.yaml
     - dts/bindings/wifi/nordic,nrf70-qspi.yaml
     - dts/bindings/wifi/nordic,nrf70-spi.yaml
diff --git a/drivers/wifi/CMakeLists.txt b/drivers/wifi/CMakeLists.txt
index bd175b8e28f..c71e161d710 100644
--- a/drivers/wifi/CMakeLists.txt
+++ b/drivers/wifi/CMakeLists.txt
@@ -10,4 +10,4 @@ add_subdirectory_ifdef(CONFIG_WIFI_SIMPLELINK   simplelink)
 add_subdirectory_ifdef(CONFIG_WIFI_WINC1500     winc1500)
 add_subdirectory_ifdef(CONFIG_WIFI_NXP          nxp)
 add_subdirectory_ifdef(CONFIG_WIFI_AIROC        infineon)
-add_subdirectory_ifdef(CONFIG_WIFI_NRF70        nrfwifi)
+add_subdirectory_ifdef(CONFIG_WIFI_NRF70        nrf_wifi)
diff --git a/drivers/wifi/Kconfig b/drivers/wifi/Kconfig
index 7ad7b530c74..55b2a943ff2 100644
--- a/drivers/wifi/Kconfig
+++ b/drivers/wifi/Kconfig
@@ -42,6 +42,6 @@ source "drivers/wifi/esp_at/Kconfig.esp_at"
 source "drivers/wifi/esp32/Kconfig.esp32"
 source "drivers/wifi/nxp/Kconfig.nxp"
 source "drivers/wifi/infineon/Kconfig.airoc"
-source "drivers/wifi/nrfwifi/Kconfig.nrfwifi"
+source "drivers/wifi/nrf_wifi/Kconfig.nrfwifi"
 
 endif # WIFI
diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
similarity index 99%
rename from drivers/wifi/nrfwifi/CMakeLists.txt
rename to drivers/wifi/nrf_wifi/CMakeLists.txt
index 439263ec615..302234d6d62 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-zephyr_library_named(nrfwifi)
+zephyr_library_named(nrf_wifi)
 
 set(OS_AGNOSTIC_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/drivers/nrf_wifi)
 set(FW_BINS_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
@@ -192,7 +192,7 @@ elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
   zephyr_include_directories(${gen_inc_dir})
   set(gen_dir ${gen_inc_dir}/nrf70_fw_patch)
   generate_inc_file_for_target(
-    nrfwifi
+    nrf_wifi
     ${NRF70_PATCH}
     ${gen_dir}/nrf70.bin.inc
   )
diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
similarity index 100%
rename from drivers/wifi/nrfwifi/Kconfig.nrfwifi
rename to drivers/wifi/nrf_wifi/Kconfig.nrfwifi
diff --git a/drivers/wifi/nrfwifi/inc/coex.h b/drivers/wifi/nrf_wifi/inc/coex.h
similarity index 100%
rename from drivers/wifi/nrfwifi/inc/coex.h
rename to drivers/wifi/nrf_wifi/inc/coex.h
diff --git a/drivers/wifi/nrfwifi/inc/coex_struct.h b/drivers/wifi/nrf_wifi/inc/coex_struct.h
similarity index 100%
rename from drivers/wifi/nrfwifi/inc/coex_struct.h
rename to drivers/wifi/nrf_wifi/inc/coex_struct.h
diff --git a/drivers/wifi/nrfwifi/inc/fmac_main.h b/drivers/wifi/nrf_wifi/inc/fmac_main.h
similarity index 100%
rename from drivers/wifi/nrfwifi/inc/fmac_main.h
rename to drivers/wifi/nrf_wifi/inc/fmac_main.h
diff --git a/drivers/wifi/nrfwifi/inc/net_if.h b/drivers/wifi/nrf_wifi/inc/net_if.h
similarity index 100%
rename from drivers/wifi/nrfwifi/inc/net_if.h
rename to drivers/wifi/nrf_wifi/inc/net_if.h
diff --git a/drivers/wifi/nrfwifi/inc/wifi_mgmt.h b/drivers/wifi/nrf_wifi/inc/wifi_mgmt.h
similarity index 100%
rename from drivers/wifi/nrfwifi/inc/wifi_mgmt.h
rename to drivers/wifi/nrf_wifi/inc/wifi_mgmt.h
diff --git a/drivers/wifi/nrfwifi/inc/wifi_mgmt_scan.h b/drivers/wifi/nrf_wifi/inc/wifi_mgmt_scan.h
similarity index 100%
rename from drivers/wifi/nrfwifi/inc/wifi_mgmt_scan.h
rename to drivers/wifi/nrf_wifi/inc/wifi_mgmt_scan.h
diff --git a/drivers/wifi/nrfwifi/inc/wpa_supp_if.h b/drivers/wifi/nrf_wifi/inc/wpa_supp_if.h
similarity index 100%
rename from drivers/wifi/nrfwifi/inc/wpa_supp_if.h
rename to drivers/wifi/nrf_wifi/inc/wpa_supp_if.h
diff --git a/drivers/wifi/nrfwifi/off_raw_tx/inc/off_raw_tx.h b/drivers/wifi/nrf_wifi/off_raw_tx/inc/off_raw_tx.h
similarity index 100%
rename from drivers/wifi/nrfwifi/off_raw_tx/inc/off_raw_tx.h
rename to drivers/wifi/nrf_wifi/off_raw_tx/inc/off_raw_tx.h
diff --git a/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c b/drivers/wifi/nrf_wifi/off_raw_tx/src/off_raw_tx_api.c
similarity index 99%
rename from drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
rename to drivers/wifi/nrf_wifi/off_raw_tx/src/off_raw_tx_api.c
index 155c8a5cd5e..b714b902eeb 100644
--- a/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
+++ b/drivers/wifi/nrf_wifi/off_raw_tx/src/off_raw_tx_api.c
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h>
+#include <zephyr/drivers/wifi/nrf_wifi/off_raw_tx/off_raw_tx_api.h>
 #include <off_raw_tx.h>
 #include <fmac_api.h>
 
diff --git a/drivers/wifi/nrfwifi/src/coex.c b/drivers/wifi/nrf_wifi/src/coex.c
similarity index 100%
rename from drivers/wifi/nrfwifi/src/coex.c
rename to drivers/wifi/nrf_wifi/src/coex.c
diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrf_wifi/src/fmac_main.c
similarity index 100%
rename from drivers/wifi/nrfwifi/src/fmac_main.c
rename to drivers/wifi/nrf_wifi/src/fmac_main.c
diff --git a/drivers/wifi/nrfwifi/src/fw_load.c b/drivers/wifi/nrf_wifi/src/fw_load.c
similarity index 100%
rename from drivers/wifi/nrfwifi/src/fw_load.c
rename to drivers/wifi/nrf_wifi/src/fw_load.c
diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrf_wifi/src/net_if.c
similarity index 100%
rename from drivers/wifi/nrfwifi/src/net_if.c
rename to drivers/wifi/nrf_wifi/src/net_if.c
diff --git a/drivers/wifi/nrfwifi/src/qspi/inc/ficr_prog.h b/drivers/wifi/nrf_wifi/src/qspi/inc/ficr_prog.h
similarity index 100%
rename from drivers/wifi/nrfwifi/src/qspi/inc/ficr_prog.h
rename to drivers/wifi/nrf_wifi/src/qspi/inc/ficr_prog.h
diff --git a/drivers/wifi/nrfwifi/src/qspi/inc/qspi_if.h b/drivers/wifi/nrf_wifi/src/qspi/inc/qspi_if.h
similarity index 100%
rename from drivers/wifi/nrfwifi/src/qspi/inc/qspi_if.h
rename to drivers/wifi/nrf_wifi/src/qspi/inc/qspi_if.h
diff --git a/drivers/wifi/nrfwifi/src/qspi/inc/rpu_hw_if.h b/drivers/wifi/nrf_wifi/src/qspi/inc/rpu_hw_if.h
similarity index 100%
rename from drivers/wifi/nrfwifi/src/qspi/inc/rpu_hw_if.h
rename to drivers/wifi/nrf_wifi/src/qspi/inc/rpu_hw_if.h
diff --git a/drivers/wifi/nrfwifi/src/qspi/inc/spi_if.h b/drivers/wifi/nrf_wifi/src/qspi/inc/spi_if.h
similarity index 100%
rename from drivers/wifi/nrfwifi/src/qspi/inc/spi_if.h
rename to drivers/wifi/nrf_wifi/src/qspi/inc/spi_if.h
diff --git a/drivers/wifi/nrfwifi/src/qspi/inc/spi_nor.h b/drivers/wifi/nrf_wifi/src/qspi/inc/spi_nor.h
similarity index 100%
rename from drivers/wifi/nrfwifi/src/qspi/inc/spi_nor.h
rename to drivers/wifi/nrf_wifi/src/qspi/inc/spi_nor.h
diff --git a/drivers/wifi/nrfwifi/src/qspi/src/device.c b/drivers/wifi/nrf_wifi/src/qspi/src/device.c
similarity index 100%
rename from drivers/wifi/nrfwifi/src/qspi/src/device.c
rename to drivers/wifi/nrf_wifi/src/qspi/src/device.c
diff --git a/drivers/wifi/nrfwifi/src/qspi/src/ficr_prog.c b/drivers/wifi/nrf_wifi/src/qspi/src/ficr_prog.c
similarity index 100%
rename from drivers/wifi/nrfwifi/src/qspi/src/ficr_prog.c
rename to drivers/wifi/nrf_wifi/src/qspi/src/ficr_prog.c
diff --git a/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c b/drivers/wifi/nrf_wifi/src/qspi/src/qspi_if.c
similarity index 100%
rename from drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c
rename to drivers/wifi/nrf_wifi/src/qspi/src/qspi_if.c
diff --git a/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c b/drivers/wifi/nrf_wifi/src/qspi/src/rpu_hw_if.c
similarity index 100%
rename from drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c
rename to drivers/wifi/nrf_wifi/src/qspi/src/rpu_hw_if.c
diff --git a/drivers/wifi/nrfwifi/src/qspi/src/spi_if.c b/drivers/wifi/nrf_wifi/src/qspi/src/spi_if.c
similarity index 100%
rename from drivers/wifi/nrfwifi/src/qspi/src/spi_if.c
rename to drivers/wifi/nrf_wifi/src/qspi/src/spi_if.c
diff --git a/drivers/wifi/nrfwifi/src/shim.c b/drivers/wifi/nrf_wifi/src/shim.c
similarity index 100%
rename from drivers/wifi/nrfwifi/src/shim.c
rename to drivers/wifi/nrf_wifi/src/shim.c
diff --git a/drivers/wifi/nrfwifi/src/shim.h b/drivers/wifi/nrf_wifi/src/shim.h
similarity index 100%
rename from drivers/wifi/nrfwifi/src/shim.h
rename to drivers/wifi/nrf_wifi/src/shim.h
diff --git a/drivers/wifi/nrfwifi/src/timer.c b/drivers/wifi/nrf_wifi/src/timer.c
similarity index 100%
rename from drivers/wifi/nrfwifi/src/timer.c
rename to drivers/wifi/nrf_wifi/src/timer.c
diff --git a/drivers/wifi/nrfwifi/src/timer.h b/drivers/wifi/nrf_wifi/src/timer.h
similarity index 100%
rename from drivers/wifi/nrfwifi/src/timer.h
rename to drivers/wifi/nrf_wifi/src/timer.h
diff --git a/drivers/wifi/nrfwifi/src/wifi_mgmt.c b/drivers/wifi/nrf_wifi/src/wifi_mgmt.c
similarity index 100%
rename from drivers/wifi/nrfwifi/src/wifi_mgmt.c
rename to drivers/wifi/nrf_wifi/src/wifi_mgmt.c
diff --git a/drivers/wifi/nrfwifi/src/wifi_mgmt_scan.c b/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
similarity index 100%
rename from drivers/wifi/nrfwifi/src/wifi_mgmt_scan.c
rename to drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
diff --git a/drivers/wifi/nrfwifi/src/wifi_util.c b/drivers/wifi/nrf_wifi/src/wifi_util.c
similarity index 100%
rename from drivers/wifi/nrfwifi/src/wifi_util.c
rename to drivers/wifi/nrf_wifi/src/wifi_util.c
diff --git a/drivers/wifi/nrfwifi/src/wifi_util.h b/drivers/wifi/nrf_wifi/src/wifi_util.h
similarity index 100%
rename from drivers/wifi/nrfwifi/src/wifi_util.h
rename to drivers/wifi/nrf_wifi/src/wifi_util.h
diff --git a/drivers/wifi/nrfwifi/src/work.c b/drivers/wifi/nrf_wifi/src/work.c
similarity index 100%
rename from drivers/wifi/nrfwifi/src/work.c
rename to drivers/wifi/nrf_wifi/src/work.c
diff --git a/drivers/wifi/nrfwifi/src/work.h b/drivers/wifi/nrf_wifi/src/work.h
similarity index 100%
rename from drivers/wifi/nrfwifi/src/work.h
rename to drivers/wifi/nrf_wifi/src/work.h
diff --git a/drivers/wifi/nrfwifi/src/wpa_supp_if.c b/drivers/wifi/nrf_wifi/src/wpa_supp_if.c
similarity index 100%
rename from drivers/wifi/nrfwifi/src/wpa_supp_if.c
rename to drivers/wifi/nrf_wifi/src/wpa_supp_if.c
diff --git a/include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h b/include/zephyr/drivers/wifi/nrf_wifi/off_raw_tx/off_raw_tx_api.h
similarity index 100%
rename from include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h
rename to include/zephyr/drivers/wifi/nrf_wifi/off_raw_tx/off_raw_tx_api.h

From df63c3a811016e636741589bd192cdd0282c6039 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 4 Nov 2024 23:23:40 +0530
Subject: [PATCH 0776/2913] [nrf fromtree] drivers: nrf_wifi: Fix the path to
 OSAL code

The OSAL code now lives in it's own repo nrf_wifi.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit f7dc9f82d2790d2eea7cf67eb6da2c662138e528)
(cherry picked from commit a80abfad6ed911ad742ed804db6d7dfaaffd0d1f)
---
 drivers/wifi/nrf_wifi/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
index 302234d6d62..e1a76bf3d90 100644
--- a/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -6,8 +6,8 @@
 
 zephyr_library_named(nrf_wifi)
 
-set(OS_AGNOSTIC_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/drivers/nrf_wifi)
-set(FW_BINS_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
+set(OS_AGNOSTIC_BASE ${ZEPHYR_NRF_WIFI_MODULE_DIR})
+set(FW_BINS_BASE ${ZEPHYR_NRF_WIFI_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
 
 zephyr_include_directories(
   inc

From a8916358ec373721b1d24e8f9ea8cc5e4b831eec Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Fri, 8 Nov 2024 01:48:42 +0530
Subject: [PATCH 0777/2913] [nrf fromtree] modules: nrf_wifi: Add a new module
 for nRF70 Wi-Fi

This is a Zephyr shim for the nrf-wifi module.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 180df6675e895a1b4372e25e8f2d20162296e2cb)
(cherry picked from commit 6f2df1580eb647abace9ae68803f03f6fd48689c)
---
 MAINTAINERS.yml                 |  10 ++
 modules/nrf_wifi/CMakeLists.txt | 170 ++++++++++++++++++++++++++++++++
 modules/nrf_wifi/Kconfig        |   5 +
 west.yml                        |   3 +
 4 files changed, 188 insertions(+)
 create mode 100644 modules/nrf_wifi/CMakeLists.txt
 create mode 100644 modules/nrf_wifi/Kconfig

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index 957302c5104..fdc0a25a5f1 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -4980,6 +4980,16 @@ West:
   labels:
     - "area: native port"
 
+"West project: nrf_wifi":
+  status: maintained
+  maintainers:
+    - krish2718
+    - sachinthegreen
+  files:
+    - modules/nrf_wifi/
+  labels:
+    - "area: Wi-Fi"
+
 "West project: open-amp":
   status: odd fixes
   collaborators:
diff --git a/modules/nrf_wifi/CMakeLists.txt b/modules/nrf_wifi/CMakeLists.txt
new file mode 100644
index 00000000000..2d0e4c8a45e
--- /dev/null
+++ b/modules/nrf_wifi/CMakeLists.txt
@@ -0,0 +1,170 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if(NOT CONFIG_WIFI_NRF70)
+  return()
+endif()
+zephyr_interface_library_named(nrf-wifi-interface)
+zephyr_library()
+
+set(NRF_WIFI_DIR ${ZEPHYR_CURRENT_MODULE_DIR})
+
+# Translate the configuration to the OS agnostic code
+target_compile_definitions(
+  nrf-wifi-interface
+  INTERFACE
+  $<$<BOOL:${CONFIG_NRF_WIFI_LOW_POWER}>:NRF_WIFI_LOW_POWER>
+  $<$<BOOL:${CONFIG_NRF_WIFI_RPU_RECOVERY}>:NRF_WIFI_RPU_RECOVERY>
+  $<$<BOOL:${CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT}>:NRF_WIFI_AP_DEAD_DETECT_TIMEOUT=${CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT}>
+  $<$<BOOL:${CONFIG_NRF_WIFI_IFACE_MTU}>:NRF_WIFI_IFACE_MTU=${CONFIG_NRF_WIFI_IFACE_MTU}>
+  $<$<BOOL:${CONFIG_NRF70_STA_MODE}>:NRF70_STA_MODE>
+  $<$<BOOL:${CONFIG_NRF70_DATA_TX}>:NRF70_DATA_TX>
+  $<$<BOOL:${CONFIG_NRF70_RAW_DATA_TX}>:NRF70_RAW_DATA_TX>
+  $<$<BOOL:${CONFIG_NRF70_RAW_DATA_RX}>:NRF70_RAW_DATA_RX>
+  $<$<BOOL:${CONFIG_NRF70_PROMISC_DATA_RX}>:NRF70_PROMISC_DATA_RX>
+  $<$<BOOL:${CONFIG_NRF70_TX_DONE_WQ_ENABLED}>:NRF70_TX_DONE_WQ_ENABLED>
+  $<$<BOOL:${CONFIG_NRF70_RX_WQ_ENABLED}>:NRF70_RX_WQ_ENABLED>
+  $<$<BOOL:${CONFIG_NRF70_UTIL}>:NRF70_UTIL>
+  $<$<BOOL:${CONFIG_NRF70_RADIO_TEST}>:NRF70_RADIO_TEST>
+  $<$<BOOL:${CONFIG_NRF70_OFFLOADED_RAW_TX}>:NRF70_OFFLOADED_RAW_TX>
+  $<$<BOOL:${CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD}>:NRF70_TCP_IP_CHECKSUM_OFFLOAD>
+  $<$<BOOL:${CONFIG_NRF70_RPU_EXTEND_TWT_SP}>:NRF70_RPU_EXTEND_TWT_SP>
+  $<$<BOOL:${CONFIG_NRF70_SYSTEM_WITH_RAW_MODES}>:NRF70_SYSTEM_WITH_RAW_MODES>
+  $<$<BOOL:${CONFIG_NRF70_SCAN_ONLY}>:NRF70_SCAN_ONLY>
+  $<$<BOOL:${CONFIG_NRF70_SYSTEM_MODE}>:NRF70_SYSTEM_MODE>
+  $<$<BOOL:${CONFIG_NRF70_2_4G_ONLY}>:NRF70_2_4G_ONLY>
+  $<$<BOOL:${CONFIG_NRF70_LOG_VERBOSE}>:NRF70_LOG_VERBOSE>
+  $<$<BOOL:${CONFIG_NRF70_AP_MODE}>:NRF70_AP_MODE>
+  $<$<BOOL:${CONFIG_NRF_WIFI_MGMT_BUFF_OFFLOAD}>:NRF_WIFI_MGMT_BUFF_OFFLOAD>
+  $<$<BOOL:${CONFIG_NRF_WIFI_FEAT_KEEPALIVE}>:NRF_WIFI_FEAT_KEEPALIVE>
+  $<$<BOOL:${CONFIG_NRF_WIFI_FEAT_KEEPALIVE}>:NRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}>
+  NRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
+  NRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}
+  NRF70_RX_MAX_DATA_SIZE=${CONFIG_NRF70_RX_MAX_DATA_SIZE}
+  NRF70_MAX_TX_PENDING_QLEN=${CONFIG_NRF70_MAX_TX_PENDING_QLEN}
+  NRF70_RPU_PS_IDLE_TIMEOUT_MS=${CONFIG_NRF70_RPU_PS_IDLE_TIMEOUT_MS}
+  NRF70_REG_DOMAIN=${CONFIG_NRF70_REG_DOMAIN}
+  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS}
+  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT}
+  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE}
+  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS}
+  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT}
+  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE}
+  NRF70_PCB_LOSS_2G=${CONFIG_NRF70_PCB_LOSS_2G}
+  NRF70_PCB_LOSS_5G_BAND1=${CONFIG_NRF70_PCB_LOSS_5G_BAND1}
+  NRF70_PCB_LOSS_5G_BAND2=${CONFIG_NRF70_PCB_LOSS_5G_BAND2}
+  NRF70_PCB_LOSS_5G_BAND3=${CONFIG_NRF70_PCB_LOSS_5G_BAND3}
+  NRF70_ANT_GAIN_2G=${CONFIG_NRF70_ANT_GAIN_2G}
+  NRF70_ANT_GAIN_5G_BAND1=${CONFIG_NRF70_ANT_GAIN_5G_BAND1}
+  NRF70_ANT_GAIN_5G_BAND2=${CONFIG_NRF70_ANT_GAIN_5G_BAND2}
+  NRF70_ANT_GAIN_5G_BAND3=${CONFIG_NRF70_ANT_GAIN_5G_BAND3}
+  NRF_WIFI_PS_INT_PS=${CONFIG_NRF_WIFI_PS_INT_PS}
+  NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS=${CONFIG_NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS}
+)
+
+target_include_directories(
+  nrf-wifi-interface
+  INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}
+  ${NRF_WIFI_DIR}/utils/inc
+  ${NRF_WIFI_DIR}/os_if/inc
+  ${NRF_WIFI_DIR}/bus_if/bus/qspi/inc
+  ${NRF_WIFI_DIR}/bus_if/bal/inc
+  ${NRF_WIFI_DIR}/fw_if/umac_if/inc
+  ${NRF_WIFI_DIR}/fw_load/mips/fw/inc
+  ${NRF_WIFI_DIR}/hw_if/hal/inc
+  ${NRF_WIFI_DIR}/hw_if/hal/inc/fw
+  ${NRF_WIFI_DIR}/fw_if/umac_if/inc/fw
+)
+
+if(CONFIG_NRF70_RADIO_TEST)
+  target_include_directories(nrf-wifi-interface INTERFACE
+    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/radio_test
+  )
+elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
+  target_include_directories(nrf-wifi-interface INTERFACE
+    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/offload_raw_tx
+    off_raw_tx/inc
+  )
+else()
+  target_include_directories(nrf-wifi-interface INTERFACE
+    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/default
+  )
+endif()
+
+zephyr_library_sources(
+  ${NRF_WIFI_DIR}/os_if/src/osal.c
+  ${NRF_WIFI_DIR}/utils/src/list.c
+  ${NRF_WIFI_DIR}/utils/src/queue.c
+  ${NRF_WIFI_DIR}/utils/src/util.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_api.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_fw_patch_loader.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_interrupt.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_mem.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_reg.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hpqm.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/pal.c
+  ${NRF_WIFI_DIR}/bus_if/bal/src/bal.c
+  ${NRF_WIFI_DIR}/bus_if/bus/qspi/src/qspi.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/cmd.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/event.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_api_common.c
+)
+
+zephyr_library_sources_ifndef(CONFIG_NRF70_RADIO_TEST
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/rx.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_vif.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/default/fmac_api.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_RADIO_TEST
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/radio_test/fmac_api.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_DATA_TX
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/tx.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_promisc.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_AP_MODE
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_ap.c
+)
+
+# Without WPA supplicant we only support scan
+zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+)
+
+target_link_libraries(zephyr_interface INTERFACE nrf-wifi-interface)
diff --git a/modules/nrf_wifi/Kconfig b/modules/nrf_wifi/Kconfig
new file mode 100644
index 00000000000..9fe8172c68d
--- /dev/null
+++ b/modules/nrf_wifi/Kconfig
@@ -0,0 +1,5 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config ZEPHYR_NRF_WIFI_MODULE
+	bool
diff --git a/west.yml b/west.yml
index 976de15f4ee..248d015f6ae 100644
--- a/west.yml
+++ b/west.yml
@@ -302,6 +302,9 @@ manifest:
     - name: nrf_hw_models
       revision: 3cfca0192ff84da919e9bc7978bcc2239cd6a395
       path: modules/bsim_hw_models/nrf_hw_models
+    - name: nrf_wifi
+      revision: f9e2abdb70761003912b1b929a37b536f68a91da
+      path: modules/lib/nrf_wifi
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719
       path: modules/lib/open-amp

From 47f08f79f3bdc91f62244f0f187e701cd302befb Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Fri, 8 Nov 2024 01:49:49 +0530
Subject: [PATCH 0778/2913] [nrf fromtree] drivers: nrf_wifi: Remove OSAL code
 handling

This is now taken care by the Zephyr module shim.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 459f9727856e55fef66eb37796a273658467667f)
(cherry picked from commit 5cc7edfa867d1cf1ff41a4bcd1fb6bad42fe857f)
---
 drivers/wifi/nrf_wifi/CMakeLists.txt | 225 +--------------------------
 1 file changed, 1 insertion(+), 224 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
index e1a76bf3d90..4e3878dfcfd 100644
--- a/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -11,54 +11,20 @@ set(FW_BINS_BASE ${ZEPHYR_NRF_WIFI_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
 
 zephyr_include_directories(
   inc
-  ${OS_AGNOSTIC_BASE}/utils/inc
-  ${OS_AGNOSTIC_BASE}/os_if/inc
-  ${OS_AGNOSTIC_BASE}/bus_if/bus/qspi/inc
-  ${OS_AGNOSTIC_BASE}/bus_if/bal/inc
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc
-  ${OS_AGNOSTIC_BASE}/fw_load/mips/fw/inc
-  ${OS_AGNOSTIC_BASE}/hw_if/hal/inc
   src/qspi/inc
   # for net_sprint_ll_addr
   ${ZEPHYR_BASE}/subsys/net/ip
-  ${OS_AGNOSTIC_BASE}/hw_if/hal/inc/fw
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/fw
-)
-
-zephyr_include_directories_ifdef(CONFIG_NRF70_RADIO_TEST
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/radio_test
 )
 
 zephyr_include_directories_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/offload_raw_tx
   off_raw_tx/inc
 )
 
-if(NOT CONFIG_NRF70_RADIO_TEST AND NOT CONFIG_NRF70_OFFLOADED_RAW_TX)
-  zephyr_include_directories(${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/default)
-endif()
-
 zephyr_library_sources_ifdef(CONFIG_NRF70_SR_COEX
   src/coex.c
 )
 
 zephyr_library_sources(
-  ${OS_AGNOSTIC_BASE}/os_if/src/osal.c
-  ${OS_AGNOSTIC_BASE}/utils/src/list.c
-  ${OS_AGNOSTIC_BASE}/utils/src/queue.c
-  ${OS_AGNOSTIC_BASE}/utils/src/util.c
-  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_api.c
-  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_fw_patch_loader.c
-  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_interrupt.c
-  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_mem.c
-  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_reg.c
-  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/hpqm.c
-  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/pal.c
-  ${OS_AGNOSTIC_BASE}/bus_if/bal/src/bal.c
-  ${OS_AGNOSTIC_BASE}/bus_if/bus/qspi/src/qspi.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/cmd.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/event.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_api_common.c
   src/shim.c
   src/work.c
   src/timer.c
@@ -77,11 +43,7 @@ zephyr_library_sources_ifdef(CONFIG_NRF_WIFI_PATCHES_BUILTIN
 
 if(NOT CONFIG_NRF70_RADIO_TEST AND NOT CONFIG_NRF70_OFFLOADED_RAW_TX)
   zephyr_library_sources(
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/rx.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_vif.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
   src/net_if.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/default/fmac_api.c
 )
 endif()
 
@@ -93,44 +55,18 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_SYSTEM_MODE_COMMON
   src/wifi_mgmt.c
 )
 
-zephyr_library_sources_ifdef(CONFIG_NRF70_RADIO_TEST
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/radio_test/fmac_api.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
-)
-
 zephyr_library_sources_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/offload_raw_tx/fmac_api.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
   off_raw_tx/src/off_raw_tx_api.c
 )
 
-zephyr_library_sources_ifdef(CONFIG_NRF70_DATA_TX
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/tx.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_peer.c
-)
-
 zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
   src/wpa_supp_if.c
   src/wifi_mgmt.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_peer.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
 )
 
-zephyr_library_sources_ifdef(CONFIG_NRF70_AP_MODE
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_ap.c
-)
-
-
 # Without WPA supplicant we only support scan
 zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
-  src/wpa_supp_if.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_peer.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_promisc.c
-)
+  src/wpa_supp_if.c)
 
 zephyr_library_sources_ifdef(CONFIG_NRF70_ON_QSPI
   src/qspi/src/qspi_if.c
@@ -197,162 +133,3 @@ elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
     ${gen_dir}/nrf70.bin.inc
   )
 endif()
-
-
-
-# Translate the configuration to the OS agnostic code
-zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_LOW_POWER
-  -DNRF_WIFI_LOW_POWER
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_RPU_RECOVERY
-  -DNRF_WIFI_RPU_RECOVERY
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT
-  -DNRF_WIFI_AP_DEAD_DETECT_TIMEOUT=${CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT}
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_IFACE_MTU
-  -DNRF_WIFI_IFACE_MTU=${CONFIG_NRF_WIFI_IFACE_MTU}
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_STA_MODE
-  -DNRF70_STA_MODE
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_DATA_TX
-  -DNRF70_DATA_TX
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_RAW_DATA_TX
-  -DNRF70_RAW_DATA_TX
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_RAW_DATA_RX
-  -DNRF70_RAW_DATA_RX
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
-  -DNRF70_PROMISC_DATA_RX
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_TX_DONE_WQ_ENABLED
-  -DNRF70_TX_DONE_WQ_ENABLED
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_RX_WQ_ENABLED
-  -DNRF70_RX_WQ_ENABLED
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_UTIL
-  -DNRF70_UTIL
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_RADIO_TEST
-  -DNRF70_RADIO_TEST
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
-  -DNRF70_OFFLOADED_RAW_TX
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD
-  -DNRF70_TCP_IP_CHECKSUM_OFFLOAD
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_RPU_EXTEND_TWT_SP
-  -DNRF70_RPU_EXTEND_TWT_SP
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_SYSTEM_WITH_RAW_MODES
-  -DNRF70_SYSTEM_WITH_RAW_MODES
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_SCAN_ONLY
-  -DNRF70_SCAN_ONLY
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_SYSTEM_MODE
-  -DNRF70_SYSTEM_MODE
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_2_4G_ONLY
-  -DNRF70_2_4G_ONLY
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_LOG_VERBOSE
-  -DNRF70_LOG_VERBOSE
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_AP_MODE
-  -DNRF70_AP_MODE
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_MGMT_BUFF_OFFLOAD
-  -DNRF_WIFI_MGMT_BUFF_OFFLOAD
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_FEAT_KEEPALIVE
-  -DNRF_WIFI_FEAT_KEEPALIVE
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_FEAT_KEEPALIVE
-  -DNRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS
-  -DWIFI_MGMT_RAW_SCAN_RESULTS=${CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS}
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
-  -DNRF_NRF70_OFFLOADED_RAW_TX
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_PASSIVE_SCAN_ONLY
-  -DNRF70_PASSIVE_SCAN_ONLY
-)
-
-zephyr_compile_definitions(
-  -DNRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
-  -DNRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}
-  -DNRF70_RX_MAX_DATA_SIZE=${CONFIG_NRF70_RX_MAX_DATA_SIZE}
-  -DNRF70_MAX_TX_PENDING_QLEN=${CONFIG_NRF70_MAX_TX_PENDING_QLEN}
-  -DNRF70_RPU_PS_IDLE_TIMEOUT_MS=${CONFIG_NRF70_RPU_PS_IDLE_TIMEOUT_MS}
-  -DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS}
-  -DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS}
-  -DNRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE}
-  -DNRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT}
-  -DNRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE}
-  -DNRF70_PCB_LOSS_2G=${CONFIG_NRF70_PCB_LOSS_2G}
-  -DNRF70_PCB_LOSS_5G_BAND1=${CONFIG_NRF70_PCB_LOSS_5G_BAND1}
-  -DNRF70_PCB_LOSS_5G_BAND2=${CONFIG_NRF70_PCB_LOSS_5G_BAND2}
-  -DNRF70_PCB_LOSS_5G_BAND3=${CONFIG_NRF70_PCB_LOSS_5G_BAND3}
-  -DNRF70_ANT_GAIN_2G=${CONFIG_NRF70_ANT_GAIN_2G}
-  -DNRF70_ANT_GAIN_5G_BAND1=${CONFIG_NRF70_ANT_GAIN_5G_BAND1}
-  -DNRF70_ANT_GAIN_5G_BAND2=${CONFIG_NRF70_ANT_GAIN_5G_BAND2}
-  -DNRF70_ANT_GAIN_5G_BAND3=${CONFIG_NRF70_ANT_GAIN_5G_BAND3}
-  -DNRF_WIFI_PS_INT_PS=${CONFIG_NRF_WIFI_PS_INT_PS}
-  -DNRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS=${CONFIG_NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS}
-)

From 16a9e206e32f712185f77ada6be4dc0d2e0c52d1 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Fri, 8 Nov 2024 02:14:53 +0530
Subject: [PATCH 0779/2913] [nrf fromtree] nrf_wifi: Move shim files from
 driver to module

The shim files should be part of the Zephyr module directory within
Zephyr, as they are coupled with the module implementation which os OS
agnostic.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit da26d02d63a45dbe7825e44b686f125770dbf78d)
(cherry picked from commit c967e32d1a27c9d8f08e17906f82b02ba7d1df39)
---
 drivers/wifi/nrf_wifi/CMakeLists.txt                    | 3 ---
 modules/nrf_wifi/CMakeLists.txt                         | 6 ++++++
 {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/shim.c  | 0
 {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/shim.h  | 0
 {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/timer.c | 0
 {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/timer.h | 0
 {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/work.c  | 0
 {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/work.h  | 0
 8 files changed, 6 insertions(+), 3 deletions(-)
 rename {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/shim.c (100%)
 rename {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/shim.h (100%)
 rename {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/timer.c (100%)
 rename {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/timer.h (100%)
 rename {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/work.c (100%)
 rename {drivers/wifi/nrf_wifi/src => modules/nrf_wifi}/work.h (100%)

diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
index 4e3878dfcfd..443b54796cd 100644
--- a/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -25,9 +25,6 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_SR_COEX
 )
 
 zephyr_library_sources(
-  src/shim.c
-  src/work.c
-  src/timer.c
   src/qspi/src/device.c
   src/qspi/src/rpu_hw_if.c
   src/qspi/src/ficr_prog.c
diff --git a/modules/nrf_wifi/CMakeLists.txt b/modules/nrf_wifi/CMakeLists.txt
index 2d0e4c8a45e..ad04414b511 100644
--- a/modules/nrf_wifi/CMakeLists.txt
+++ b/modules/nrf_wifi/CMakeLists.txt
@@ -167,4 +167,10 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
   ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
 )
 
+zephyr_library_sources(
+  shim.c
+  timer.c
+  work.c
+)
+
 target_link_libraries(zephyr_interface INTERFACE nrf-wifi-interface)
diff --git a/drivers/wifi/nrf_wifi/src/shim.c b/modules/nrf_wifi/shim.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/shim.c
rename to modules/nrf_wifi/shim.c
diff --git a/drivers/wifi/nrf_wifi/src/shim.h b/modules/nrf_wifi/shim.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/shim.h
rename to modules/nrf_wifi/shim.h
diff --git a/drivers/wifi/nrf_wifi/src/timer.c b/modules/nrf_wifi/timer.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/timer.c
rename to modules/nrf_wifi/timer.c
diff --git a/drivers/wifi/nrf_wifi/src/timer.h b/modules/nrf_wifi/timer.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/timer.h
rename to modules/nrf_wifi/timer.h
diff --git a/drivers/wifi/nrf_wifi/src/work.c b/modules/nrf_wifi/work.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/work.c
rename to modules/nrf_wifi/work.c
diff --git a/drivers/wifi/nrf_wifi/src/work.h b/modules/nrf_wifi/work.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/work.h
rename to modules/nrf_wifi/work.h

From 047f8ea3000435b72e70b5e337955ef2a14f104d Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Sat, 9 Nov 2024 17:06:59 +0530
Subject: [PATCH 0780/2913] [nrf fromtree] drivers: wifi: Fix blobs handling

The blobs are now part of nrf_wifi module, and remove the manual check
and add verifying the blobs and their integrity using helper function.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit b8cab9e144aa5a8c1308db895446e573697d312a)
(cherry picked from commit f5f8a847d7dd9269f37d8c4bd8d2fb8525dfa34a)
---
 drivers/wifi/nrf_wifi/CMakeLists.txt | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
index 443b54796cd..e631e930e07 100644
--- a/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -96,6 +96,7 @@ if (CONFIG_NRF_WIFI_BUILD_ONLY_MODE)
   ------------------------------------------------------------------------
   ")
 elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
+  zephyr_blobs_verify(MODULE nrf_wifi REQUIRED)
   # RPU FW patch binaries based on the selected configuration
   if(CONFIG_NRF70_SYSTEM_MODE)
     set(NRF70_PATCH ${FW_BINS_BASE}/default/nrf70.bin)
@@ -112,15 +113,6 @@ elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
     message(FATAL_ERROR "Unsupported nRF70 patch configuration")
   endif()
 
-  if(NOT EXISTS ${NRF70_PATCH})
-    message(FATAL_ERROR "
-      ------------------------------------------------------------------------
-      Missing blobs for nRF70 device driver, please install by running:
-          $ west update
-          $ west blobs fetch hal_nordic
-      ------------------------------------------------------------------------")
-  endif()
-
   set(gen_inc_dir ${ZEPHYR_BINARY_DIR}/misc/generated)
   zephyr_include_directories(${gen_inc_dir})
   set(gen_dir ${gen_inc_dir}/nrf70_fw_patch)

From fb891ffcbec1fd9cd6ac90ae3af6d5b963772040 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Fri, 29 Nov 2024 17:24:59 +0530
Subject: [PATCH 0781/2913] [nrf fromlist] modules: nrf_wifi: Fix offloaded raw
 TX build

For the C sources the offloaded raw TX mode wasn't considered and else
case picks up system mode files causing build issues.

Upstream PR #: 82335

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit f7d81fec082a9bf09d8a6bcc037988c864a989b6)
---
 modules/nrf_wifi/CMakeLists.txt | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/modules/nrf_wifi/CMakeLists.txt b/modules/nrf_wifi/CMakeLists.txt
index ad04414b511..e5c85cda679 100644
--- a/modules/nrf_wifi/CMakeLists.txt
+++ b/modules/nrf_wifi/CMakeLists.txt
@@ -131,17 +131,24 @@ zephyr_library_sources(
   ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_api_common.c
 )
 
-zephyr_library_sources_ifndef(CONFIG_NRF70_RADIO_TEST
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/rx.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_vif.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/default/fmac_api.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_RADIO_TEST
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/radio_test/fmac_api.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-)
+if(CONFIG_NRF70_RADIO_TEST)
+  zephyr_library_sources(
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/radio_test/fmac_api.c
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+  )
+elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
+  zephyr_library_sources(
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/offload_raw_tx/fmac_api.c
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+  )
+else()
+  zephyr_library_sources(
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/rx.c
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_vif.c
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/default/fmac_api.c
+  )
+endif()
 
 zephyr_library_sources_ifdef(CONFIG_NRF70_DATA_TX
   ${NRF_WIFI_DIR}/fw_if/umac_if/src/tx.c

From eb34c6f110c5be3fc99cfd9cf906c61f5f016e9d Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Fri, 29 Nov 2024 17:25:22 +0530
Subject: [PATCH 0782/2913] [nrf fromlist] modules: nrf_wifi: Fix the directory
 variable

During cherry-pick the directory wasn't renamed.

Upstream PR #: 82335

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 514167edf564110d45ecca66e57e6ff4041d49ad)
---
 modules/nrf_wifi/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nrf_wifi/CMakeLists.txt b/modules/nrf_wifi/CMakeLists.txt
index e5c85cda679..41d48b50f7e 100644
--- a/modules/nrf_wifi/CMakeLists.txt
+++ b/modules/nrf_wifi/CMakeLists.txt
@@ -161,7 +161,7 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
 )
 
 zephyr_library_sources_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_promisc.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_promisc.c
 )
 
 zephyr_library_sources_ifdef(CONFIG_NRF70_AP_MODE

From 5d0d19babb8a1036dcb0e7dafe793f0efe9ad50b Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Sat, 30 Nov 2024 13:55:53 +0530
Subject: [PATCH 0783/2913] [nrf fromlist] modules: nrf_wifi: Fix raw scan
 results build

Fix the missing define to OSAL code.

Upstream PR #: 82335

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 2d0308ee04048f67fd03e13b0ab916ffefc37aaf)
---
 modules/nrf_wifi/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/nrf_wifi/CMakeLists.txt b/modules/nrf_wifi/CMakeLists.txt
index 41d48b50f7e..e3b96f0db7b 100644
--- a/modules/nrf_wifi/CMakeLists.txt
+++ b/modules/nrf_wifi/CMakeLists.txt
@@ -38,6 +38,7 @@ target_compile_definitions(
   $<$<BOOL:${CONFIG_NRF_WIFI_MGMT_BUFF_OFFLOAD}>:NRF_WIFI_MGMT_BUFF_OFFLOAD>
   $<$<BOOL:${CONFIG_NRF_WIFI_FEAT_KEEPALIVE}>:NRF_WIFI_FEAT_KEEPALIVE>
   $<$<BOOL:${CONFIG_NRF_WIFI_FEAT_KEEPALIVE}>:NRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}>
+  $<$<BOOL:${CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS}>:WIFI_MGMT_RAW_SCAN_RESULTS>
   NRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
   NRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}
   NRF70_RX_MAX_DATA_SIZE=${CONFIG_NRF70_RX_MAX_DATA_SIZE}

From 1eed7bf27b176aca6cfc666b18e015739419f596 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Fri, 29 Nov 2024 19:50:56 +0530
Subject: [PATCH 0784/2913] [nrf fromlist] tests: drivers: nrf_wifi: Add a
 build all test

This helps maintaining of various modes in nRF Wi-Fi driver.

Upstream PR #: 82335

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit bc80cbda202a69435c7333544c9c5359e4aef0fc)
---
 tests/drivers/wifi/nrf_wifi/CMakeLists.txt |  8 +++
 tests/drivers/wifi/nrf_wifi/prj.conf       | 84 ++++++++++++++++++++++
 tests/drivers/wifi/nrf_wifi/src/main.c     | 10 +++
 tests/drivers/wifi/nrf_wifi/testcase.yaml  | 46 ++++++++++++
 4 files changed, 148 insertions(+)
 create mode 100644 tests/drivers/wifi/nrf_wifi/CMakeLists.txt
 create mode 100644 tests/drivers/wifi/nrf_wifi/prj.conf
 create mode 100644 tests/drivers/wifi/nrf_wifi/src/main.c
 create mode 100644 tests/drivers/wifi/nrf_wifi/testcase.yaml

diff --git a/tests/drivers/wifi/nrf_wifi/CMakeLists.txt b/tests/drivers/wifi/nrf_wifi/CMakeLists.txt
new file mode 100644
index 00000000000..d9d097f0bc0
--- /dev/null
+++ b/tests/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(build_nrf70_wifi_driver_all)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/drivers/wifi/nrf_wifi/prj.conf b/tests/drivers/wifi/nrf_wifi/prj.conf
new file mode 100644
index 00000000000..04bda53a4a6
--- /dev/null
+++ b/tests/drivers/wifi/nrf_wifi/prj.conf
@@ -0,0 +1,84 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+CONFIG_WIFI=y
+CONFIG_WIFI_NRF70=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
+CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+
+CONFIG_TEST_RANDOM_GENERATOR=y
+# Networking
+CONFIG_NETWORKING=y
+CONFIG_NET_SOCKETS=y
+CONFIG_NET_LOG=y
+CONFIG_NET_IPV6=y
+CONFIG_NET_IPV4=y
+CONFIG_NET_UDP=y
+CONFIG_NET_TCP=y
+CONFIG_NET_DHCPV4=y
+CONFIG_DNS_RESOLVER=y
+
+CONFIG_NET_STATISTICS=y
+CONFIG_NET_STATISTICS_WIFI=y
+CONFIG_NET_STATISTICS_USER_API=y
+
+CONFIG_NET_PKT_RX_COUNT=8
+CONFIG_NET_PKT_TX_COUNT=8
+
+# Below section is the primary contributor to SRAM and is currently
+# tuned for performance, but this will be revisited in the future.
+CONFIG_NET_BUF_RX_COUNT=16
+CONFIG_NET_BUF_TX_COUNT=16
+CONFIG_NRF70_RX_NUM_BUFS=16
+CONFIG_NRF70_MAX_TX_AGGREGATION=4
+# nRF70 is main consumer: (16 + 8) * 1600 = ~40KB + ~40KB control path (experimental)
+CONFIG_HEAP_MEM_POOL_SIZE=100000
+CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y
+CONFIG_NET_TC_TX_COUNT=1
+
+CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=4
+CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=5
+CONFIG_NET_MAX_CONTEXTS=5
+CONFIG_NET_CONTEXT_SYNC_RECV=y
+
+CONFIG_INIT_STACKS=y
+
+# Memories
+CONFIG_MAIN_STACK_SIZE=5200
+CONFIG_SHELL_STACK_SIZE=5200
+
+CONFIG_NET_TX_STACK_SIZE=4096
+CONFIG_NET_RX_STACK_SIZE=4096
+
+# Debugging
+CONFIG_STACK_SENTINEL=y
+CONFIG_DEBUG_COREDUMP=y
+CONFIG_DEBUG_COREDUMP_BACKEND_LOGGING=y
+CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y
+CONFIG_SHELL_CMDS_RESIZE=n
+#CONFIG_DEBUG=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_INF=y
+
+# Kernel options
+CONFIG_ENTROPY_GENERATOR=y
+CONFIG_REBOOT=y
+
+# Logging
+CONFIG_LOG=y
+CONFIG_PRINTK=y
+CONFIG_SHELL=y
+CONFIG_SHELL_GETOPT=y
+CONFIG_DEVICE_SHELL=y
+CONFIG_POSIX_CLOCK=y
+CONFIG_DATE_SHELL=y
+CONFIG_NET_CONFIG_AUTO_INIT=n
+CONFIG_POSIX_API=y
+
+# printing of scan results puts pressure on queues in new locking
+# design in net_mgmt. So, use a higher timeout for a crowded
+# environment.
+CONFIG_NET_MGMT_EVENT_QUEUE_TIMEOUT=5000
+CONFIG_NET_SOCKETS_POLL_MAX=12
+CONFIG_NET_MGMT_EVENT_QUEUE_SIZE=16
diff --git a/tests/drivers/wifi/nrf_wifi/src/main.c b/tests/drivers/wifi/nrf_wifi/src/main.c
new file mode 100644
index 00000000000..a05ee591430
--- /dev/null
+++ b/tests/drivers/wifi/nrf_wifi/src/main.c
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+int main(void)
+{
+	return 0;
+}
diff --git a/tests/drivers/wifi/nrf_wifi/testcase.yaml b/tests/drivers/wifi/nrf_wifi/testcase.yaml
new file mode 100644
index 00000000000..f8dac0a1ea8
--- /dev/null
+++ b/tests/drivers/wifi/nrf_wifi/testcase.yaml
@@ -0,0 +1,46 @@
+common:
+  build_only: true
+  tags:
+    - drivers
+    - wifi
+    - net
+  platform_allow:
+    - nrf7002dk/nrf5340/cpuapp
+tests:
+  nrf70.build.radio_test:
+    extra_configs:
+      - CONFIG_NRF70_RADIO_TEST=y
+      - CONFIG_NETWORKING=n
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
+  nrf70.build.scan_only:
+    extra_configs:
+      - CONFIG_NRF70_SCAN_ONLY=y
+      - CONFIG_NETWORKING=y
+      - CONFIG_NET_DHCPV4=n
+      - CONFIG_NET_NATIVE=n
+      - CONFIG_NET_OFFLOAD=y
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
+  nrf70.build.raw_scan_results:
+    extra_configs:
+      - CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS=y
+      - CONFIG_NRF70_SCAN_ONLY=y
+      - CONFIG_NETWORKING=y
+      - CONFIG_NET_DHCPV4=n
+      - CONFIG_NET_NATIVE=n
+      - CONFIG_NET_OFFLOAD=y
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
+  nrf70.build.raw_tx:
+    extra_configs:
+      - CONFIG_NRF70_RAW_DATA_TX=y
+  nrf70.build.raw_rx:
+    extra_configs:
+      - CONFIG_NRF70_RAW_DATA_RX=y
+  nrf70.build.promiscuous:
+    extra_configs:
+      - CONFIG_NRF70_PROMISC_DATA_RX=y
+  nrf70.build.offloaded_raw_tx:
+    extra_configs:
+      - CONFIG_NRF70_OFFLOADED_RAW_TX=y
+      - CONFIG_NETWORKING=n
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
+      - CONFIG_NET_L2_WIFI_MGMT=n

From dc2aeea09a1fa5335649b3f7682ebc0a2789c924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Tue, 19 Nov 2024 15:20:51 +0100
Subject: [PATCH 0785/2913] [nrf fromtree] drivers: udc_nrf: Handle Suspend and
 Resume in thread
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Low Power mode can only be entered when there are no active DMA
transfers. Move the Suspend and Resume processing to thread to allow
waiting for the DMA available semaphore in USB Suspend handler.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 4dfae0b0d180e0684d064b297d80a78144dac55e)
(cherry picked from commit 52c6c7d15a9fee2faa5aa42ef295c5062b46862c)
---
 drivers/usb/udc/udc_nrf.c | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/drivers/usb/udc/udc_nrf.c b/drivers/usb/udc/udc_nrf.c
index bf04a274ad6..e7229174463 100644
--- a/drivers/usb/udc/udc_nrf.c
+++ b/drivers/usb/udc/udc_nrf.c
@@ -443,6 +443,22 @@ static void udc_nrf_thread(void *p1, void *p2, void *p3)
 		case UDC_NRF_EVT_HAL:
 			ep = evt.hal_evt.data.eptransfer.ep;
 			switch (evt.hal_evt.type) {
+			case NRF_USBD_COMMON_EVT_SUSPEND:
+				LOG_INF("SUSPEND state detected");
+				nrf_usbd_common_suspend();
+				udc_set_suspended(udc_nrf_dev, true);
+				udc_submit_event(udc_nrf_dev, UDC_EVT_SUSPEND, 0);
+				break;
+			case NRF_USBD_COMMON_EVT_RESUME:
+				LOG_INF("RESUMING from suspend");
+				udc_set_suspended(udc_nrf_dev, false);
+				udc_submit_event(udc_nrf_dev, UDC_EVT_RESUME, 0);
+				break;
+			case NRF_USBD_COMMON_EVT_WUREQ:
+				LOG_INF("Remote wakeup initiated");
+				udc_set_suspended(udc_nrf_dev, false);
+				udc_submit_event(udc_nrf_dev, UDC_EVT_RESUME, 0);
+				break;
 			case NRF_USBD_COMMON_EVT_EPTRANSFER:
 				start_xfer = true;
 				if (USB_EP_DIR_IS_IN(ep)) {
@@ -499,22 +515,6 @@ static void udc_sof_check_iso_out(const struct device *dev)
 static void usbd_event_handler(nrf_usbd_common_evt_t const *const hal_evt)
 {
 	switch (hal_evt->type) {
-	case NRF_USBD_COMMON_EVT_SUSPEND:
-		LOG_INF("SUSPEND state detected");
-		nrf_usbd_common_suspend();
-		udc_set_suspended(udc_nrf_dev, true);
-		udc_submit_event(udc_nrf_dev, UDC_EVT_SUSPEND, 0);
-		break;
-	case NRF_USBD_COMMON_EVT_RESUME:
-		LOG_INF("RESUMING from suspend");
-		udc_set_suspended(udc_nrf_dev, false);
-		udc_submit_event(udc_nrf_dev, UDC_EVT_RESUME, 0);
-		break;
-	case NRF_USBD_COMMON_EVT_WUREQ:
-		LOG_INF("Remote wakeup initiated");
-		udc_set_suspended(udc_nrf_dev, false);
-		udc_submit_event(udc_nrf_dev, UDC_EVT_RESUME, 0);
-		break;
 	case NRF_USBD_COMMON_EVT_RESET:
 		LOG_INF("Reset");
 		udc_submit_event(udc_nrf_dev, UDC_EVT_RESET, 0);
@@ -523,6 +523,9 @@ static void usbd_event_handler(nrf_usbd_common_evt_t const *const hal_evt)
 		udc_submit_event(udc_nrf_dev, UDC_EVT_SOF, 0);
 		udc_sof_check_iso_out(udc_nrf_dev);
 		break;
+	case NRF_USBD_COMMON_EVT_SUSPEND:
+	case NRF_USBD_COMMON_EVT_RESUME:
+	case NRF_USBD_COMMON_EVT_WUREQ:
 	case NRF_USBD_COMMON_EVT_EPTRANSFER:
 	case NRF_USBD_COMMON_EVT_SETUP: {
 		struct udc_nrf_evt evt = {

From 92381442c98094a24e09480bbb288b5c6d23d3b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Tue, 19 Nov 2024 12:03:55 +0100
Subject: [PATCH 0786/2913] [nrf fromtree] nrf_usbd_common: Do not trigger DMA
 in low power mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

DMA transfers do not execute when the USBD peripheral is in Low Power
mode. Make sure that there is no DMA active transfer when entering Low
Power mode and that new DMA transfers are not started when in Low Power
mode because the transfer won't ever finish.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit cb1e7d6b6b829cdb672bf03f28e1c524078f6ad3)
(cherry picked from commit fecf399e44d5f69b9f8b3ddb42de05aef688c828)
---
 drivers/usb/common/nrf_usbd_common/nrf_usbd_common.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/common/nrf_usbd_common/nrf_usbd_common.c b/drivers/usb/common/nrf_usbd_common/nrf_usbd_common.c
index fcd5cff5ef6..9e502483765 100644
--- a/drivers/usb/common/nrf_usbd_common/nrf_usbd_common.c
+++ b/drivers/usb/common/nrf_usbd_common/nrf_usbd_common.c
@@ -834,9 +834,10 @@ static void usbd_dmareq_process(void)
 {
 	if ((m_ep_dma_waiting & m_ep_ready) &&
 	    (k_sem_take(&dma_available, K_NO_WAIT) == 0)) {
+		const bool low_power = nrf_usbd_common_suspend_check();
 		uint32_t req;
 
-		while (0 != (req = m_ep_dma_waiting & m_ep_ready)) {
+		while (!low_power && 0 != (req = m_ep_dma_waiting & m_ep_ready)) {
 			uint8_t pos;
 
 			if (NRFX_USBD_CONFIG_DMASCHEDULER_ISO_BOOST &&
@@ -1310,7 +1311,11 @@ bool nrf_usbd_common_is_started(void)
 bool nrf_usbd_common_suspend(void)
 {
 	bool suspended = false;
-	unsigned int irq_lock_key = irq_lock();
+	unsigned int irq_lock_key;
+
+	/* DMA doesn't work in Low Power mode, ensure there is no active DMA */
+	k_sem_take(&dma_available, K_FOREVER);
+	irq_lock_key = irq_lock();
 
 	if (m_bus_suspend) {
 		if (!(NRF_USBD->EVENTCAUSE & USBD_EVENTCAUSE_RESUME_Msk)) {
@@ -1327,6 +1332,7 @@ bool nrf_usbd_common_suspend(void)
 	}
 
 	irq_unlock(irq_lock_key);
+	k_sem_give(&dma_available);
 
 	return suspended;
 }

From 6171f7d7706e98fe0a61cceb86133c1bbc125a44 Mon Sep 17 00:00:00 2001
From: Johann Fischer <johann.fischer@nordicsemi.no>
Date: Tue, 26 Nov 2024 12:58:00 +0100
Subject: [PATCH 0787/2913] [nrf fromtree] usb: device_next: fix null pointer
 dereference in Get Interface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Respond with a Request Error in default and addressed states.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit 1a5ab2c16e00ef9caa8c3f7938c0df676d905f16)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit d7e10885f56d3220887baefb17b37c0475afb655)
---
 subsys/usb/device_next/usbd_ch9.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/subsys/usb/device_next/usbd_ch9.c b/subsys/usb/device_next/usbd_ch9.c
index 6910c6df147..ed7cf14f68d 100644
--- a/subsys/usb/device_next/usbd_ch9.c
+++ b/subsys/usb/device_next/usbd_ch9.c
@@ -858,7 +858,13 @@ static int sreq_get_interface(struct usbd_context *const uds_ctx,
 		return 0;
 	}
 
+	/* Treat as error in default (not specified) and addressed states. */
 	cfg_nd = usbd_config_get_current(uds_ctx);
+	if (cfg_nd == NULL) {
+		errno = -EPERM;
+		return 0;
+	}
+
 	cfg_desc = cfg_nd->desc;
 
 	if (setup->wIndex > UINT8_MAX ||

From 4e1073cf91afc9a5c2d7f6199097e714e864c221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Wed, 27 Nov 2024 11:37:21 +0100
Subject: [PATCH 0788/2913] [nrf fromtree] drivers: udc_dwc2: Fix isochronous
 endpoint disable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The NAKSts bit may be set on isochronous OUT endpoints when incomplete
ISO OUT interrupt is raised. The code would then assume that endpoint is
already disabled and would not perform the endpoint disable procedure.
This in turn was essentially halting any transmission on the isochronous
endpoint, abruptly terminating the data stream.

Fix the issue by always following full endpoint disable procedure on
isochronous endpoints.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 8b212d80fdf8d6c5032ce538cab230cf819e7905)
(cherry picked from commit d06a411932ca1c3fcbdc6cf3d0dc090c9b314a15)
---
 drivers/usb/udc/udc_dwc2.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 7e716201d3c..2ecf230baaf 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -1387,11 +1387,12 @@ static void udc_dwc2_ep_disable(const struct device *dev,
 	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
 	mem_addr_t dxepctl_reg;
 	uint32_t dxepctl;
+	const bool is_iso = dwc2_ep_is_iso(cfg);
 
 	dxepctl_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
 	dxepctl = sys_read32(dxepctl_reg);
 
-	if (dxepctl & USB_DWC2_DEPCTL_NAKSTS) {
+	if (!is_iso && (dxepctl & USB_DWC2_DEPCTL_NAKSTS)) {
 		/* Endpoint already sends forced NAKs. STALL if necessary. */
 		if (stall) {
 			dxepctl |= USB_DWC2_DEPCTL_STALL;

From 527fbb4dddb4b1081b3bde3bf41576e4c4076b53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Wed, 27 Nov 2024 11:37:35 +0100
Subject: [PATCH 0789/2913] [nrf fromtree] drivers: udc_dwc2: Queue next packet
 on incomplete iso IN interrupt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When handling incomplete iso IN interrupt mark current transfer as
complete and program the endpoint with any subsequently queued packet.
Program the endpoint directly in interrupt handler because the data
must be programmed before SOF (by the time incomplete iso IN interrupt
is raised there is less than 20% * 125 us = 25 us before SOF).

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit edbb05368d3272f8ded2d0750bb24c595031e7b9)
(cherry picked from commit a5a1256e2d24fc246befe9578e1d0b621237b461)
---
 drivers/usb/udc/udc_dwc2.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 2ecf230baaf..da9faf22fa4 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -2572,7 +2572,11 @@ static void dwc2_handle_incompisoin(const struct device *dev)
 
 				buf = udc_buf_get(dev, cfg->addr);
 				if (buf) {
+					/* Data is no longer relevant */
 					udc_submit_ep_event(dev, buf, 0);
+
+					/* Try to queue next packet before SOF */
+					dwc2_handle_xfer_next(dev, cfg);
 				}
 			}
 		}

From 5d6f03e768de776edb68631800bd6b926c1cadbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Wed, 27 Nov 2024 11:48:01 +0100
Subject: [PATCH 0790/2913] [nrf fromtree] usb: device_next: uac2: Double
 buffering on IN data endpoints
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Application is expected to call usbd_uac2_send() on each enabled USB
Streaming Output Terminal (isochronous IN data endpoint) exactly once
every SOF. The class is bookkeeping queued transfers to make it easier
to determine component at fault when things go wrong. However, this
approach only works fine if the underlying USB device controller buffers
the data to be sent on next SOF and reports the transfer completion
immediately after data is buffered (e.g. nRF52 USBD).

While DWC2 otg also requires the SW to arm endpoint with data for the
next SOF, unlike nRF52 USBD the transfer is only considered complete
after either the IN token for isochronous endpoint is received or after
the Periodic Frame Interval elapses without IN token. This design
inevitably requires the application to be able to have at least two
buffers for isochronous IN endpoints.

Support dual buffering on IN data endpoints to facilitate sending
isochronous IN data on every SOF regardless of the underlying USB device
controller design.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit c19d34c5d33c0ffcfcca92ae4ec521a43521d3a7)
(cherry picked from commit 7e05c86e75d41a7c2690f92fe78d97189f6438d2)
---
 subsys/usb/device_next/class/usbd_uac2.c | 30 ++++++++++++++----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/subsys/usb/device_next/class/usbd_uac2.c b/subsys/usb/device_next/class/usbd_uac2.c
index 0e7144ec622..f3e1a707b33 100644
--- a/subsys/usb/device_next/class/usbd_uac2.c
+++ b/subsys/usb/device_next/class/usbd_uac2.c
@@ -20,14 +20,15 @@ LOG_MODULE_REGISTER(usbd_uac2, CONFIG_USBD_UAC2_LOG_LEVEL);
 
 #define DT_DRV_COMPAT zephyr_uac2
 
-#define COUNT_UAC2_AS_ENDPOINTS(node)						\
+#define COUNT_UAC2_AS_ENDPOINT_BUFFERS(node)					\
 	IF_ENABLED(DT_NODE_HAS_COMPAT(node, zephyr_uac2_audio_streaming), (	\
 		+ AS_HAS_ISOCHRONOUS_DATA_ENDPOINT(node) +			\
+		+ AS_IS_USB_ISO_IN(node) /* ISO IN double buffering */ +	\
 		AS_HAS_EXPLICIT_FEEDBACK_ENDPOINT(node)))
-#define COUNT_UAC2_ENDPOINTS(i)							\
+#define COUNT_UAC2_EP_BUFFERS(i)						\
 	+ DT_PROP(DT_DRV_INST(i), interrupt_endpoint)				\
-	DT_INST_FOREACH_CHILD(i, COUNT_UAC2_AS_ENDPOINTS)
-#define UAC2_NUM_ENDPOINTS DT_INST_FOREACH_STATUS_OKAY(COUNT_UAC2_ENDPOINTS)
+	DT_INST_FOREACH_CHILD(i, COUNT_UAC2_AS_ENDPOINT_BUFFERS)
+#define UAC2_NUM_EP_BUFFERS DT_INST_FOREACH_STATUS_OKAY(COUNT_UAC2_EP_BUFFERS)
 
 /* Net buf is used mostly with external data. The main reason behind external
  * data is avoiding unnecessary isochronous data copy operations.
@@ -40,7 +41,7 @@ LOG_MODULE_REGISTER(usbd_uac2, CONFIG_USBD_UAC2_LOG_LEVEL);
  * "wasted memory" here is likely to be smaller than the memory overhead for
  * more complex "only as much as needed" schemes (e.g. heap).
  */
-UDC_BUF_POOL_DEFINE(uac2_pool, UAC2_NUM_ENDPOINTS, 6,
+UDC_BUF_POOL_DEFINE(uac2_pool, UAC2_NUM_EP_BUFFERS, 6,
 		    sizeof(struct udc_buf_info), NULL);
 
 /* 5.2.2 Control Request Layout */
@@ -80,6 +81,7 @@ struct uac2_ctx {
 	 */
 	atomic_t as_active;
 	atomic_t as_queued;
+	atomic_t as_double;
 	uint32_t fb_queued;
 };
 
@@ -247,6 +249,7 @@ int usbd_uac2_send(const struct device *dev, uint8_t terminal,
 	struct uac2_ctx *ctx = dev->data;
 	struct net_buf *buf;
 	const struct usb_ep_descriptor *desc;
+	atomic_t *queued_bits = &ctx->as_queued;
 	uint8_t ep = 0;
 	int as_idx = terminal_to_as_interface(dev, terminal);
 	int ret;
@@ -267,9 +270,12 @@ int usbd_uac2_send(const struct device *dev, uint8_t terminal,
 		return 0;
 	}
 
-	if (atomic_test_and_set_bit(&ctx->as_queued, as_idx)) {
-		LOG_ERR("Previous send not finished yet on 0x%02x", ep);
-		return -EAGAIN;
+	if (atomic_test_and_set_bit(queued_bits, as_idx)) {
+		queued_bits = &ctx->as_double;
+		if (atomic_test_and_set_bit(queued_bits, as_idx)) {
+			LOG_DBG("Already double queued on 0x%02x", ep);
+			return -EAGAIN;
+		}
 	}
 
 	buf = uac2_buf_alloc(ep, data, size);
@@ -278,7 +284,7 @@ int usbd_uac2_send(const struct device *dev, uint8_t terminal,
 		 * enough, but if it does all we loose is just single packet.
 		 */
 		LOG_ERR("No netbuf for send");
-		atomic_clear_bit(&ctx->as_queued, as_idx);
+		atomic_clear_bit(queued_bits, as_idx);
 		ctx->ops->buf_release_cb(dev, terminal, data, ctx->user_data);
 		return -ENOMEM;
 	}
@@ -287,7 +293,7 @@ int usbd_uac2_send(const struct device *dev, uint8_t terminal,
 	if (ret) {
 		LOG_ERR("Failed to enqueue net_buf for 0x%02x", ep);
 		net_buf_unref(buf);
-		atomic_clear_bit(&ctx->as_queued, as_idx);
+		atomic_clear_bit(queued_bits, as_idx);
 		ctx->ops->buf_release_cb(dev, terminal, data, ctx->user_data);
 	}
 
@@ -761,8 +767,8 @@ static int uac2_request(struct usbd_class_data *const c_data, struct net_buf *bu
 
 	if (is_feedback) {
 		ctx->fb_queued &= ~BIT(as_idx);
-	} else {
-		atomic_clear_bit(&ctx->as_queued, as_idx);
+	} else if (!atomic_test_and_clear_bit(&ctx->as_queued, as_idx) || buf->frags) {
+		atomic_clear_bit(&ctx->as_double, as_idx);
 	}
 
 	if (USB_EP_DIR_IS_OUT(ep)) {

From b56a27fd9ec44736cfef822b7a0b8ddffebfaf1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Fri, 29 Nov 2024 13:44:03 +0100
Subject: [PATCH 0791/2913] [nrf fromtree] drivers: udc_dwc2: Workaround
 endpoint disable race condition
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Endpoint disable function is racing against bus traffic. If the bus
traffic leads to transfer completion immediately before the endpoint
disable is executed, then the transfer complete interrupt will remain
set when the endpoint is disabled. For OUT endpoints this leads to "No
buffer for ep" errors, while for IN endpoint this can lead to double
buffer pull which causes assertion failure.

The proper solution would be to change endpoint disable to not actually
wait for the individual events (and accept that the endpoint may not
need to be disabled because the transfer can just finish). For the time
being workaround the issue by clearing XferCompl bit on endpoint
disable.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit a26d3c2f2e4d7bceaf4d81f78266edef5a874318)
(cherry picked from commit 070d76ec2b3f800934508d6ad7225b8fd1561c94)
---
 drivers/usb/udc/udc_dwc2.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index da9faf22fa4..7f1256a10f0 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -1402,6 +1402,19 @@ static void udc_dwc2_ep_disable(const struct device *dev,
 		return;
 	}
 
+	/* FIXME: This function needs to be changed to not synchronously wait
+	 * for the events to happen because the actions here are racing against
+	 * the USB host packets. It is possible that the IN token or OUT DATA
+	 * gets sent shortly before this function disables the endpoint. If this
+	 * happens, the XferCompl would be set and driver will incorrectly think
+	 * that either:
+	 *   * never queued transfer finished, OR
+	 *   * transfer queued in incompisoin handler finished (before it really
+	 *     does and then it'll "double"-finish when it actually finishes)
+	 *
+	 * For the time being XferCompl is cleared as a workaround.
+	 */
+
 	if (USB_EP_DIR_IS_OUT(cfg->addr)) {
 		mem_addr_t dctl_reg, gintsts_reg, doepint_reg;
 		uint32_t dctl;
@@ -1440,7 +1453,7 @@ static void udc_dwc2_ep_disable(const struct device *dev,
 		}
 
 		/* Clear Endpoint Disabled interrupt */
-		sys_write32(USB_DWC2_DIEPINT_EPDISBLD, doepint_reg);
+		sys_write32(USB_DWC2_DOEPINT_EPDISBLD | USB_DWC2_DOEPINT_XFERCOMPL, doepint_reg);
 
 		dctl |= USB_DWC2_DCTL_CGOUTNAK;
 		sys_write32(dctl, dctl_reg);
@@ -1464,7 +1477,7 @@ static void udc_dwc2_ep_disable(const struct device *dev,
 		dwc2_wait_for_bit(dev, diepint_reg, USB_DWC2_DIEPINT_EPDISBLD);
 
 		/* Clear Endpoint Disabled interrupt */
-		sys_write32(USB_DWC2_DIEPINT_EPDISBLD, diepint_reg);
+		sys_write32(USB_DWC2_DIEPINT_EPDISBLD | USB_DWC2_DIEPINT_XFERCOMPL, diepint_reg);
 
 		/* TODO: Read DIEPTSIZn here? Programming Guide suggest it to
 		 * let application know how many bytes of interrupted transfer

From a0511567799961a7b4cc09f37baad2f97ada5c5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Thu, 28 Nov 2024 11:57:00 +0100
Subject: [PATCH 0792/2913] [nrf fromtree] drivers: udc_dwc2: Wait for USBHS
 clock start
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Accessing DWC2 otg core registers before the clock starts results in
complete system hang. Add a 1 us busy wait to make sure that software
won't access registers before the clock is started.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit df36b162bd2cca2c59eec08e00dbb86bef311eb6)
(cherry picked from commit 581e63819936a0e8ae6040a6cb23ec091f5b02d7)
---
 drivers/usb/udc/udc_dwc2_vendor_quirks.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/usb/udc/udc_dwc2_vendor_quirks.h b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
index d12d64ef848..f45404c2b84 100644
--- a/drivers/usb/udc/udc_dwc2_vendor_quirks.h
+++ b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
@@ -201,6 +201,9 @@ static inline int usbhs_enable_core(const struct device *dev)
 	wrapper->ENABLE = USBHS_ENABLE_PHY_Msk | USBHS_ENABLE_CORE_Msk;
 	wrapper->TASKS_START = 1UL;
 
+	/* Wait for clock to start to avoid hang on too early register read */
+	k_busy_wait(1);
+
 	/* Enable interrupts */
 	wrapper->INTENSET = 1UL;
 

From 899a506915c2a119686b13218159a8f0cb4a8a6f Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Wed, 18 Sep 2024 17:58:24 +0200
Subject: [PATCH 0793/2913] [nrf fromtree] soc: nordic: Add LRCCONF management

Due to the possibility of simultaneous accesess to LRCCONF registers,
additional management is required.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 9b252855fd075d39a41ba61dccea8f7a81ecb77e)
(cherry picked from commit b70ab60f1a9d8b3673b3e44c3601edacb54b116e)
---
 .../clock_control/clock_control_nrf2_common.c |  35 ----
 .../clock_control/clock_control_nrf2_common.h |  10 --
 .../clock_control/clock_control_nrf2_fll16m.c |   8 +-
 .../clock_control/clock_control_nrf2_hfxo.c   |   8 +-
 soc/nordic/common/CMakeLists.txt              |   3 +
 soc/nordic/common/soc_lrcconf.c               |  62 +++++++
 soc/nordic/common/soc_lrcconf.h               |  34 ++++
 soc/nordic/nrf54h/power.c                     | 151 ++++++++++++------
 soc/nordic/nrf54h/soc.c                       |  12 +-
 9 files changed, 213 insertions(+), 110 deletions(-)
 create mode 100644 soc/nordic/common/soc_lrcconf.c
 create mode 100644 soc/nordic/common/soc_lrcconf.h

diff --git a/drivers/clock_control/clock_control_nrf2_common.c b/drivers/clock_control/clock_control_nrf2_common.c
index 7f8f2cbcd42..f3b21a5dd1f 100644
--- a/drivers/clock_control/clock_control_nrf2_common.c
+++ b/drivers/clock_control/clock_control_nrf2_common.c
@@ -4,7 +4,6 @@
  */
 
 #include "clock_control_nrf2_common.h"
-#include <hal/nrf_lrcconf.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
@@ -25,9 +24,6 @@ LOG_MODULE_REGISTER(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
  */
 STRUCT_CLOCK_CONFIG(generic, ONOFF_CNT_MAX);
 
-static sys_slist_t poweron_main_list;
-static struct k_spinlock poweron_main_lock;
-
 static void update_config(struct clock_config_generic *cfg)
 {
 	atomic_val_t prev_flags = atomic_or(&cfg->flags, FLAG_UPDATE_NEEDED);
@@ -163,34 +159,3 @@ int api_nosys_on_off(const struct device *dev, clock_control_subsys_t sys)
 
 	return -ENOSYS;
 }
-
-void clock_request_lrcconf_poweron_main(struct clock_lrcconf_sink *sink)
-{
-	K_SPINLOCK(&poweron_main_lock) {
-		if (sys_slist_len(&poweron_main_list) == 0) {
-			LOG_DBG("%s forced on", "main domain");
-			NRF_LRCCONF010->POWERON &= ~LRCCONF_POWERON_MAIN_Msk;
-			NRF_LRCCONF010->POWERON |= LRCCONF_POWERON_MAIN_AlwaysOn;
-		}
-
-		sys_slist_find_and_remove(&poweron_main_list, &sink->node);
-		sys_slist_append(&poweron_main_list, &sink->node);
-	}
-}
-
-void clock_release_lrcconf_poweron_main(struct clock_lrcconf_sink *sink)
-{
-	K_SPINLOCK(&poweron_main_lock) {
-		if (!sys_slist_find_and_remove(&poweron_main_list, &sink->node)) {
-			K_SPINLOCK_BREAK;
-		}
-
-		if (sys_slist_len(&poweron_main_list) > 0) {
-			K_SPINLOCK_BREAK;
-		}
-
-		LOG_DBG("%s automatic", "main domain");
-		NRF_LRCCONF010->POWERON &= ~LRCCONF_POWERON_MAIN_Msk;
-		NRF_LRCCONF010->POWERON |= LRCCONF_POWERON_MAIN_Automatic;
-	}
-}
diff --git a/drivers/clock_control/clock_control_nrf2_common.h b/drivers/clock_control/clock_control_nrf2_common.h
index 67d303c132d..858698c38ea 100644
--- a/drivers/clock_control/clock_control_nrf2_common.h
+++ b/drivers/clock_control/clock_control_nrf2_common.h
@@ -75,14 +75,4 @@ void clock_config_update_end(void *clk_cfg, int status);
 
 int api_nosys_on_off(const struct device *dev, clock_control_subsys_t sys);
 
-struct clock_lrcconf_sink {
-	sys_snode_t node;
-};
-
-/**
- * @brief Request or release lrcconf main power domain
- */
-void clock_request_lrcconf_poweron_main(struct clock_lrcconf_sink *sink);
-void clock_release_lrcconf_poweron_main(struct clock_lrcconf_sink *sink);
-
 #endif /* ZEPHYR_DRIVERS_CLOCK_CONTROL_NRF2_COMMON_H_ */
diff --git a/drivers/clock_control/clock_control_nrf2_fll16m.c b/drivers/clock_control/clock_control_nrf2_fll16m.c
index 7462d822f44..613e433e527 100644
--- a/drivers/clock_control/clock_control_nrf2_fll16m.c
+++ b/drivers/clock_control/clock_control_nrf2_fll16m.c
@@ -8,7 +8,7 @@
 #include "clock_control_nrf2_common.h"
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
-#include <hal/nrf_lrcconf.h>
+#include <soc_lrcconf.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
@@ -64,7 +64,7 @@ static const struct clock_options {
 struct fll16m_dev_data {
 	STRUCT_CLOCK_CONFIG(fll16m, ARRAY_SIZE(clock_options)) clk_cfg;
 	struct onoff_client hfxo_cli;
-	struct clock_lrcconf_sink lrcconf_sink;
+	sys_snode_t fll16m_node;
 };
 
 struct fll16m_dev_config {
@@ -76,13 +76,13 @@ static void activate_fll16m_mode(struct fll16m_dev_data *dev_data, uint8_t mode)
 	/* TODO: change to nrf_lrcconf_* function when such is available. */
 
 	if (mode != FLL16M_MODE_DEFAULT) {
-		clock_request_lrcconf_poweron_main(&dev_data->lrcconf_sink);
+		soc_lrcconf_poweron_request(&dev_data->fll16m_node, NRF_LRCCONF_POWER_MAIN);
 	}
 
 	NRF_LRCCONF010->CLKCTRL[0].SRC = mode;
 
 	if (mode == FLL16M_MODE_DEFAULT) {
-		clock_release_lrcconf_poweron_main(&dev_data->lrcconf_sink);
+		soc_lrcconf_poweron_release(&dev_data->fll16m_node, NRF_LRCCONF_POWER_MAIN);
 	}
 
 	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_CLKSTART_0);
diff --git a/drivers/clock_control/clock_control_nrf2_hfxo.c b/drivers/clock_control/clock_control_nrf2_hfxo.c
index ca49d9015cc..977c0aaa0d6 100644
--- a/drivers/clock_control/clock_control_nrf2_hfxo.c
+++ b/drivers/clock_control/clock_control_nrf2_hfxo.c
@@ -11,7 +11,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
 
-#include <hal/nrf_lrcconf.h>
+#include <soc_lrcconf.h>
 
 BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
 	     "multiple instances not supported");
@@ -20,7 +20,7 @@ struct dev_data_hfxo {
 	struct onoff_manager mgr;
 	onoff_notify_fn notify;
 	struct k_timer timer;
-	struct clock_lrcconf_sink lrcconf_sink;
+	sys_snode_t hfxo_node;
 };
 
 struct dev_config_hfxo {
@@ -58,7 +58,7 @@ static void onoff_start_hfxo(struct onoff_manager *mgr, onoff_notify_fn notify)
 	dev_data->notify = notify;
 
 	nrf_lrcconf_event_clear(NRF_LRCCONF010, NRF_LRCCONF_EVENT_HFXOSTARTED);
-	clock_request_lrcconf_poweron_main(&dev_data->lrcconf_sink);
+	soc_lrcconf_poweron_request(&dev_data->hfxo_node, NRF_LRCCONF_POWER_MAIN);
 	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_REQHFXO);
 
 	/* Due to a hardware issue, the HFXOSTARTED event is currently
@@ -74,7 +74,7 @@ static void onoff_stop_hfxo(struct onoff_manager *mgr, onoff_notify_fn notify)
 		CONTAINER_OF(mgr, struct dev_data_hfxo, mgr);
 
 	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_STOPREQHFXO);
-	clock_release_lrcconf_poweron_main(&dev_data->lrcconf_sink);
+	soc_lrcconf_poweron_release(&dev_data->hfxo_node, NRF_LRCCONF_POWER_MAIN);
 	notify(mgr, 0);
 }
 
diff --git a/soc/nordic/common/CMakeLists.txt b/soc/nordic/common/CMakeLists.txt
index 1a4e17c20d1..4808319557c 100644
--- a/soc/nordic/common/CMakeLists.txt
+++ b/soc/nordic/common/CMakeLists.txt
@@ -12,6 +12,9 @@ if(CONFIG_ARM)
 endif()
 
 zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c)
+if(CONFIG_ARM)
+  zephyr_library_sources_ifdef(CONFIG_NRF_PLATFORM_HALTIUM soc_lrcconf.c)
+endif()
 
 if((CONFIG_SOC_SERIES_NRF54HX OR CONFIG_SOC_SERIES_NRF92X) AND CONFIG_CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS)
   zephyr_library_sources(nrf54hx_nrf92x_mpu_regions.c)
diff --git a/soc/nordic/common/soc_lrcconf.c b/soc/nordic/common/soc_lrcconf.c
new file mode 100644
index 00000000000..da6dbf10b3f
--- /dev/null
+++ b/soc/nordic/common/soc_lrcconf.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <soc_lrcconf.h>
+#include <zephyr/kernel.h>
+
+static struct k_spinlock lock;
+static sys_slist_t poweron_main_list;
+static sys_slist_t poweron_active_list;
+
+void soc_lrcconf_poweron_request(sys_snode_t *node, nrf_lrcconf_power_domain_mask_t domain)
+{
+	__ASSERT(is_power_of_two(domain), "Only one bit can be set for the domain parameter");
+
+	sys_slist_t *poweron_list;
+
+	if (domain == NRF_LRCCONF_POWER_MAIN) {
+		poweron_list = &poweron_main_list;
+	} else if (domain == NRF_LRCCONF_POWER_DOMAIN_0) {
+		poweron_list = &poweron_active_list;
+	} else {
+		return;
+	}
+
+	K_SPINLOCK(&lock) {
+		if (sys_slist_len(poweron_list) == 0) {
+			nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, domain, true);
+		}
+
+		sys_slist_find_and_remove(poweron_list, node);
+		sys_slist_append(poweron_list, node);
+	}
+}
+
+void soc_lrcconf_poweron_release(sys_snode_t *node, nrf_lrcconf_power_domain_mask_t domain)
+{
+	__ASSERT(is_power_of_two(domain), "Only one bit can be set for the domain parameter");
+
+	sys_slist_t *poweron_list;
+
+	if (domain == NRF_LRCCONF_POWER_MAIN) {
+		poweron_list = &poweron_main_list;
+	} else if (domain == NRF_LRCCONF_POWER_DOMAIN_0) {
+		poweron_list = &poweron_active_list;
+	} else {
+		return;
+	}
+
+	K_SPINLOCK(&lock) {
+		if (!sys_slist_find_and_remove(poweron_list, node)) {
+			K_SPINLOCK_BREAK;
+		}
+
+		if (sys_slist_len(poweron_list) > 0) {
+			K_SPINLOCK_BREAK;
+		}
+		nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, domain, false);
+	}
+}
diff --git a/soc/nordic/common/soc_lrcconf.h b/soc/nordic/common/soc_lrcconf.h
new file mode 100644
index 00000000000..5ce47112529
--- /dev/null
+++ b/soc/nordic/common/soc_lrcconf.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file nRF SoC specific helpers for lrcconf management
+ */
+
+#ifndef ZEPHYR_SOC_NORDIC_COMMON_LRCCONF_H_
+#define ZEPHYR_SOC_NORDIC_COMMON_LRCCONF_H_
+
+#include <hal/nrf_lrcconf.h>
+
+/**
+ * @brief Request lrcconf power domain
+ *
+ * @param node	 Pointer to the @ref sys_snode_t structure which is the ID of the
+ *		 requesting module.
+ * @param domain The mask that represents the power domain ID.
+ */
+void soc_lrcconf_poweron_request(sys_snode_t *node, nrf_lrcconf_power_domain_mask_t domain);
+
+/**
+ * @brief Release lrcconf power domain
+ *
+ * @param node	 Pointer to the @ref sys_snode_t structure which is the ID of the
+ *		 requesting module.
+ * @param domain The mask that represents the power domain ID.
+ */
+void soc_lrcconf_poweron_release(sys_snode_t *node, nrf_lrcconf_power_domain_mask_t domain);
+
+#endif /* ZEPHYR_SOC_NORDIC_COMMON_LRCCONF_H_ */
diff --git a/soc/nordic/nrf54h/power.c b/soc/nordic/nrf54h/power.c
index ad7ae18d9bb..07a49609151 100644
--- a/soc/nordic/nrf54h/power.c
+++ b/soc/nordic/nrf54h/power.c
@@ -9,20 +9,24 @@
 #include <zephyr/pm/policy.h>
 #include <zephyr/arch/common/pm_s2ram.h>
 #include <hal/nrf_resetinfo.h>
-#include <hal/nrf_lrcconf.h>
 #include <hal/nrf_memconf.h>
 #include <zephyr/cache.h>
 #include <power.h>
+#include <soc_lrcconf.h>
+#include "soc.h"
 #include "pm_s2ram.h"
 
-static void suspend_common(void)
-{
+extern sys_snode_t soc_node;
 
-	/* Flush, disable and power down DCACHE */
-	sys_cache_data_flush_all();
-	sys_cache_data_disable();
-	nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
-						RAMBLOCK_CONTROL_BIT_DCACHE, false);
+static void common_suspend(void)
+{
+	if (IS_ENABLED(CONFIG_DCACHE)) {
+		/* Flush, disable and power down DCACHE */
+		sys_cache_data_flush_all();
+		sys_cache_data_disable();
+		nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
+							RAMBLOCK_CONTROL_BIT_DCACHE, false);
+	}
 
 	if (IS_ENABLED(CONFIG_ICACHE)) {
 		/* Disable and power down ICACHE */
@@ -31,9 +35,26 @@ static void suspend_common(void)
 							RAMBLOCK_CONTROL_BIT_ICACHE, false);
 	}
 
-	/* Disable retention */
-	nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, false);
-	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, false);
+	soc_lrcconf_poweron_release(&soc_node, NRF_LRCCONF_POWER_DOMAIN_0);
+}
+
+static void common_resume(void)
+{
+	if (IS_ENABLED(CONFIG_ICACHE)) {
+		/* Power up and re-enable ICACHE */
+		nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
+							RAMBLOCK_CONTROL_BIT_ICACHE, true);
+		sys_cache_instr_enable();
+	}
+
+	if (IS_ENABLED(CONFIG_DCACHE)) {
+		/* Power up and re-enable DCACHE */
+		nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
+							RAMBLOCK_CONTROL_BIT_DCACHE, true);
+		sys_cache_data_enable();
+	}
+
+	soc_lrcconf_poweron_request(&soc_node, NRF_LRCCONF_POWER_DOMAIN_0);
 }
 
 void nrf_poweroff(void)
@@ -41,13 +62,12 @@ void nrf_poweroff(void)
 	nrf_resetinfo_resetreas_local_set(NRF_RESETINFO, 0);
 	nrf_resetinfo_restore_valid_set(NRF_RESETINFO, false);
 
+#if !defined(CONFIG_SOC_NRF54H20_CPURAD)
+	/* Disable retention */
 	nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_MAIN, false);
-
-	/* TODO: Move it around k_cpu_idle() implementation. */
-	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_MAIN, false);
-	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, false);
-
-	suspend_common();
+	nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, false);
+#endif
+	common_suspend();
 
 	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_SYSTEMOFFREADY);
 
@@ -59,30 +79,57 @@ void nrf_poweroff(void)
 	CODE_UNREACHABLE;
 }
 
-#if IS_ENABLED(CONFIG_PM_S2RAM)
-/* Resume domain after local suspend to RAM. */
-static void sys_resume(void)
+static void s2idle_enter(uint8_t substate_id)
 {
-	if (IS_ENABLED(CONFIG_ICACHE)) {
-		/* Power up and re-enable ICACHE */
-		nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
-							RAMBLOCK_CONTROL_BIT_ICACHE, true);
-		sys_cache_instr_enable();
+	switch (substate_id) {
+	case 0:
+		/* Substate for idle with cache powered on - not implemented yet. */
+		break;
+	case 1: /* Substate for idle with cache retained - not implemented yet. */
+		break;
+	case 2: /* Substate for idle with cache disabled. */
+#if !defined(CONFIG_SOC_NRF54H20_CPURAD)
+		soc_lrcconf_poweron_request(&soc_node, NRF_LRCCONF_POWER_MAIN);
+#endif
+		common_suspend();
+		break;
+	default: /* Unknown substate. */
+		return;
 	}
 
-	if (IS_ENABLED(CONFIG_DCACHE)) {
-		/* Power up and re-enable DCACHE */
-		nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
-							RAMBLOCK_CONTROL_BIT_DCACHE, true);
-		sys_cache_data_enable();
+	__set_BASEPRI(0);
+	__ISB();
+	__DSB();
+	__WFI();
+}
+
+static void s2idle_exit(uint8_t substate_id)
+{
+	switch (substate_id) {
+	case 0:
+		/* Substate for idle with cache powered on - not implemented yet. */
+		break;
+	case 1: /* Substate for idle with cache retained - not implemented yet. */
+		break;
+	case 2: /* Substate for idle with cache disabled. */
+		common_resume();
+#if !defined(CONFIG_SOC_NRF54H20_CPURAD)
+		soc_lrcconf_poweron_release(&soc_node, NRF_LRCCONF_POWER_MAIN);
+#endif
+	default: /* Unknown substate. */
+		return;
 	}
+}
 
+#if defined(CONFIG_PM_S2RAM)
+/* Resume domain after local suspend to RAM. */
+static void s2ram_exit(void)
+{
+	common_resume();
+#if !defined(CONFIG_SOC_NRF54H20_CPURAD)
 	/* Re-enable domain retention. */
 	nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, true);
-
-	/* TODO: Move it around k_cpu_idle() implementation. */
-	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_MAIN,
-				      !IS_ENABLED(CONFIG_SOC_NRF54H20_CPURAD));
+#endif
 }
 
 /* Function called during local domain suspend to RAM. */
@@ -94,10 +141,12 @@ static int sys_suspend_to_ram(void)
 	nrf_resetinfo_resetreas_local_set(NRF_RESETINFO,
 					  NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK);
 	nrf_resetinfo_restore_valid_set(NRF_RESETINFO, true);
-	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, false);
-	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_MAIN, false);
 
-	suspend_common();
+#if !defined(CONFIG_SOC_NRF54H20_CPURAD)
+	/* Disable retention */
+	nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, false);
+#endif
+	common_suspend();
 
 	__set_BASEPRI(0);
 	__ISB();
@@ -110,7 +159,7 @@ static int sys_suspend_to_ram(void)
 	return -EBUSY;
 }
 
-static void do_suspend_to_ram(void)
+static void s2ram_enter(void)
 {
 	/*
 	 * Save the CPU context (including the return address),set the SRAM
@@ -119,24 +168,26 @@ static void do_suspend_to_ram(void)
 	if (soc_s2ram_suspend(sys_suspend_to_ram)) {
 		return;
 	}
-
-	/*
-	 * On resuming or error we return exactly *HERE*
-	 */
-
-	sys_resume();
 }
-#endif /* IS_ENABLED(CONFIG_PM_S2RAM) */
+#endif /* defined(CONFIG_PM_S2RAM) */
 
 void pm_state_set(enum pm_state state, uint8_t substate_id)
 {
-	if (state != PM_STATE_SUSPEND_TO_RAM) {
-		k_cpu_idle();
-		return;
+	if (state == PM_STATE_SUSPEND_TO_IDLE) {
+		s2idle_enter(substate_id);
+		/* Resume here. */
+		s2idle_exit(substate_id);
+	}
+#if defined(CONFIG_PM_S2RAM)
+	else if (state == PM_STATE_SUSPEND_TO_RAM) {
+		s2ram_enter();
+		/* On resuming or error we return exactly *HERE* */
+		s2ram_exit();
 	}
-#if IS_ENABLED(CONFIG_PM_S2RAM)
-	do_suspend_to_ram();
 #endif
+	else {
+		k_cpu_idle();
+	}
 }
 
 void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
diff --git a/soc/nordic/nrf54h/soc.c b/soc/nordic/nrf54h/soc.c
index 4ffb17bef51..43c84e1b9a7 100644
--- a/soc/nordic/nrf54h/soc.c
+++ b/soc/nordic/nrf54h/soc.c
@@ -19,6 +19,7 @@
 #include <hal/nrf_spu.h>
 #include <hal/nrf_memconf.h>
 #include <soc/nrfx_coredep.h>
+#include <soc_lrcconf.h>
 #include <dmm.h>
 
 LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
@@ -29,6 +30,8 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 #define HSFLL_NODE DT_NODELABEL(cpurad_hsfll)
 #endif
 
+sys_snode_t soc_node;
+
 #define FICR_ADDR_GET(node_id, name)                                           \
 	DT_REG_ADDR(DT_PHANDLE_BY_NAME(node_id, nordic_ficrs, name)) +         \
 		DT_PHA_BY_NAME(node_id, nordic_ficrs, name, offset)
@@ -52,13 +55,9 @@ static void power_domain_init(void)
 	 *  WFI the power domain will be correctly retained.
 	 */
 
-	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0,
-				      !IS_ENABLED(CONFIG_SOC_NRF54H20_CPURAD));
-	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_MAIN,
-				      !IS_ENABLED(CONFIG_SOC_NRF54H20_CPURAD));
+	soc_lrcconf_poweron_request(&soc_node, NRF_LRCCONF_POWER_DOMAIN_0);
+	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_MAIN, false);
 
-	nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_MAIN, true);
-	nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, true);
 	nrf_memconf_ramblock_ret_enable_set(NRF_MEMCONF, 0, RAMBLOCK_RET_BIT_ICACHE, false);
 	nrf_memconf_ramblock_ret_enable_set(NRF_MEMCONF, 0, RAMBLOCK_RET_BIT_DCACHE, false);
 	nrf_memconf_ramblock_ret_enable_set(NRF_MEMCONF, 1, RAMBLOCK_RET_BIT_ICACHE, false);
@@ -122,7 +121,6 @@ bool z_arm_on_enter_cpu_idle(void)
 #ifdef CONFIG_LOG_FRONTEND_STMESP
 	log_frontend_stmesp_pre_sleep();
 #endif
-
 	return true;
 }
 #endif

From a83331b6b5dfa5aa1fb9a6606a36149c8cd7c3b4 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Wed, 2 Oct 2024 10:39:56 +0200
Subject: [PATCH 0794/2913] [nrf fromtree] dts: arm: nordic: Add power states
 for nRF54H20

Add `idle` and `s2ram` power states for nRF54H20 cpuapp and cpurad.
Also the substate `idle_cache_disable` added.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit e786c1f8492b07beb510b2a42fb1469871b5db1f)
(cherry picked from commit 126e66e6fb80dc63f8128ffa9761ecc4c0a18916)
---
 dts/common/nordic/nrf54h20.dtsi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 479bd4e3298..a9523f15465 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -31,7 +31,7 @@
 			device_type = "cpu";
 			clocks = <&cpuapp_hsfll>;
 			clock-frequency = <DT_FREQ_M(320)>;
-			cpu-power-states = <&idle &s2ram>;
+			cpu-power-states = <&idle_cache_disabled &s2ram>;
 		};
 
 		cpurad: cpu@3 {
@@ -40,6 +40,7 @@
 			device_type = "cpu";
 			clocks = <&cpurad_hsfll>;
 			clock-frequency = <DT_FREQ_M(256)>;
+			cpu-power-states = <&idle_cache_disabled>;
 		};
 
 		cpuppr: cpu@d {
@@ -128,12 +129,14 @@
 		};
 
 		power-states {
-			idle: idle {
+			// substate-id = <0>; is reserved for "idle", cache powered on
+			// substate-id = <1>; is reserved for "idle-cache-retained"
+			idle_cache_disabled: idle_cache_disabled {
 				compatible = "zephyr,power-state";
 				power-state-name = "suspend-to-idle";
+				substate-id = <2>;
 				min-residency-us = <100000>;
 			};
-
 			s2ram: s2ram {
 				compatible = "zephyr,power-state";
 				power-state-name = "suspend-to-ram";

From 3cda675d719de500459fd42b625a0062883a7456 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 12 Nov 2024 11:24:40 +0100
Subject: [PATCH 0795/2913] [nrf fromtree] soc: nordic: nrf54h: disable IRQ
 before PM config

IRQs must be disabled before starting any procedures to prepare
for low-power states.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit be1f40547fae11ae2ca879d900640c1666e706f5)
(cherry picked from commit 954830148e3d43b9f344532485bd2321f5c772ea)
---
 soc/nordic/nrf54h/pm_s2ram.c | 3 ---
 soc/nordic/nrf54h/power.c    | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/soc/nordic/nrf54h/pm_s2ram.c b/soc/nordic/nrf54h/pm_s2ram.c
index 88529c4bb75..20c28e42df5 100644
--- a/soc/nordic/nrf54h/pm_s2ram.c
+++ b/soc/nordic/nrf54h/pm_s2ram.c
@@ -111,18 +111,15 @@ int soc_s2ram_suspend(pm_s2ram_system_off_fn_t system_off)
 {
 	int ret;
 
-	__disable_irq();
 	nvic_suspend(&backup_data.nvic_context);
 	mpu_suspend(&backup_data.mpu_context);
 	ret = arch_pm_s2ram_suspend(system_off);
 	if (ret < 0) {
-		__enable_irq();
 		return ret;
 	}
 
 	mpu_resume(&backup_data.mpu_context);
 	nvic_resume(&backup_data.nvic_context);
-	__enable_irq();
 
 	return ret;
 }
diff --git a/soc/nordic/nrf54h/power.c b/soc/nordic/nrf54h/power.c
index 07a49609151..a3b39a4c5fe 100644
--- a/soc/nordic/nrf54h/power.c
+++ b/soc/nordic/nrf54h/power.c
@@ -174,15 +174,19 @@ static void s2ram_enter(void)
 void pm_state_set(enum pm_state state, uint8_t substate_id)
 {
 	if (state == PM_STATE_SUSPEND_TO_IDLE) {
+		__disable_irq();
 		s2idle_enter(substate_id);
 		/* Resume here. */
 		s2idle_exit(substate_id);
+		__enable_irq();
 	}
 #if defined(CONFIG_PM_S2RAM)
 	else if (state == PM_STATE_SUSPEND_TO_RAM) {
+		__disable_irq();
 		s2ram_enter();
 		/* On resuming or error we return exactly *HERE* */
 		s2ram_exit();
+		__enable_irq();
 	}
 #endif
 	else {

From aaa933a19955e697d9999583a5ba1bb3db884839 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Thu, 28 Nov 2024 16:24:51 +0100
Subject: [PATCH 0796/2913] [nrf fromlist] soc: nordic: nrf54l: remove
 configuration of DCDC regulator

Since nrfx 3.9 integration, configuration is executed
in MDK SystemInit().

Upstream PR #: 82268

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 8101d21cbcb7e7bd02a9c2d2c0e48460376e4e1a)
---
 soc/nordic/nrf54l/soc.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index 65f6cc183ce..56e48800ed4 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -154,11 +154,6 @@ static inline void power_and_clock_configuration(void)
 	}
 
 #if (DT_PROP(DT_NODELABEL(vregmain), regulator_initial_mode) == NRF5X_REG_MODE_DCDC)
-#if defined(__CORTEX_M) && !defined(NRF_TRUSTZONE_NONSECURE) && defined(__ARM_FEATURE_CMSE)
-	if (*(uint32_t volatile *)0x00FFC334 <= 0x180A1D00) {
-		*(uint32_t volatile *)0x50120640 = 0x1EA9E040;
-	}
-#endif
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);
 #endif
 

From 9042ad0f7fe6378b24f674e2af3a6fad24098d43 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Mon, 2 Dec 2024 12:36:26 +0100
Subject: [PATCH 0797/2913] [nrf fromlist] soc: nordic: nrf54l: add preliminary
 workaround for nRF54L anomaly 31

This workaround will be replaced with a variant
executed at SystemInit() level, once MDK implements it.

Upstream PR #: 82268

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 9bb619d4469372177e5dcaacd80ed3438697dc0c)
---
 soc/nordic/nrf54l/soc.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index 56e48800ed4..d96679b8e85 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -38,6 +38,7 @@
 #endif
 #include <soc/nrfx_coredep.h>
 
+#include <nrf_erratas.h>
 #include <system_nrf54l.h>
 
 LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
@@ -154,6 +155,13 @@ static inline void power_and_clock_configuration(void)
 	}
 
 #if (DT_PROP(DT_NODELABEL(vregmain), regulator_initial_mode) == NRF5X_REG_MODE_DCDC)
+#if NRF54L_ERRATA_31_ENABLE_WORKAROUND
+	/* Workaround for Errata 31 */
+	if (nrf54l_errata_31()) {
+		*((volatile uint32_t *)0x50120624ul) = 20 | 1<<5;
+		*((volatile uint32_t *)0x5012063Cul) &= ~(1<<19);
+	}
+#endif
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);
 #endif
 

From c2ce47682c8e2d1c32963fb1f1c8eddc34746cd3 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Mon, 2 Dec 2024 12:42:09 +0100
Subject: [PATCH 0798/2913] [nrf fromlist] modules: nordic: nrfx: workaround
 MDK erratas symbol for nRF54L05 & L10

MDK 8.68.1 uses nRF54L15_XXAA symbol for determining whether
given errata is applicable or not for nRF54L Series SoCs.
This causes all erratas to be disabled for nRF54L05 and nRF54L10.
To mitigate this DEVELOP_IN_NRF54L15 symbol needs to be defined,
and removed once new MDK is integrated.

Upstream PR #: 82268

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit e017356d29c118ec790ce770ad1e56a89ff1e304)
---
 modules/hal_nordic/nrfx/CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 08c9610e7fe..3863fa177ed 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -44,10 +44,12 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUPPR     NRF54H20_XXAA
                                                                 NRF_PPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR    NRF54H20_XXAA
                                                                 NRF_FLPR)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05            NRF54L05_XXAA)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05            NRF54L05_XXAA
+                                                                DEVELOP_IN_NRF54L15)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR    NRF_FLPR)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10            NRF54L10_XXAA)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10            NRF54L10_XXAA
+                                                                DEVELOP_IN_NRF54L15)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10_CPUFLPR    NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15            NRF54L15_XXAA)

From 559f627e1751ab2d299a1197bf04b102950cfc41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 20 Nov 2024 15:48:34 +0100
Subject: [PATCH 0799/2913] [nrf fromtree] dts: common: nordic: nrf54l20: Add
 missing nodes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add missing nodes: i2c23, i2c24, spi23, spi24, uart23, uart24.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit d87bafea305900693b34ae60ac524b45491b69d0)
(cherry picked from commit 7c7950a14cccb1fa833f0d199c9d89295b407cdd)
---
 dts/common/nordic/nrf54l20.dtsi | 78 +++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 8479c6111a8..67ccb152a5f 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -501,6 +501,84 @@
 				status = "disabled";
 			};
 
+			i2c23: i2c@ed000 {
+				compatible = "nordic,nrf-twim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xed000 0x1000>;
+				interrupts = <237 NRF_DEFAULT_IRQ_PRIORITY>;
+				easydma-maxcnt-bits = <16>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+
+			spi23: spi@ed000 {
+				/*
+				 * This spi node can be either SPIM or SPIS,
+				 * for the user to pick:
+				 * compatible = "nordic,nrf-spim" or
+				 *              "nordic,nrf-spis".
+				 */
+				compatible = "nordic,nrf-spim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xed000 0x1000>;
+				interrupts = <237 NRF_DEFAULT_IRQ_PRIORITY>;
+				max-frequency = <DT_FREQ_M(8)>;
+				easydma-maxcnt-bits = <16>;
+				rx-delay-supported;
+				rx-delay = <1>;
+				status = "disabled";
+			};
+
+			uart23: uart@ed000 {
+				compatible = "nordic,nrf-uarte";
+				reg = <0xed000 0x1000>;
+				interrupts = <237 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				endtx-stoptx-supported;
+				frame-timeout-supported;
+			};
+
+			i2c24: i2c@ee000 {
+				compatible = "nordic,nrf-twim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xee000 0x1000>;
+				interrupts = <238 NRF_DEFAULT_IRQ_PRIORITY>;
+				easydma-maxcnt-bits = <16>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+
+			spi24: spi@ee000 {
+				/*
+				 * This spi node can be either SPIM or SPIS,
+				 * for the user to pick:
+				 * compatible = "nordic,nrf-spim" or
+				 *              "nordic,nrf-spis".
+				 */
+				compatible = "nordic,nrf-spim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xee000 0x1000>;
+				interrupts = <238 NRF_DEFAULT_IRQ_PRIORITY>;
+				max-frequency = <DT_FREQ_M(8)>;
+				easydma-maxcnt-bits = <16>;
+				rx-delay-supported;
+				rx-delay = <1>;
+				status = "disabled";
+			};
+
+			uart24: uart@ee000 {
+				compatible = "nordic,nrf-uarte";
+				reg = <0xee000 0x1000>;
+				interrupts = <238 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				endtx-stoptx-supported;
+				frame-timeout-supported;
+			};
+
 			dppic30: dppic@102000 {
 				compatible = "nordic,nrf-dppic";
 				reg = <0x102000 0x808>;

From 591a05a7068eed5e3877810a7af22d62b94ae239 Mon Sep 17 00:00:00 2001
From: Karsten Koenig <karsten.koenig@nordicsemi.no>
Date: Wed, 30 Oct 2024 13:16:56 +0100
Subject: [PATCH 0800/2913] [nrf fromtree] dts: bindings: arm: nordic: tddconf:
 Add etrbuffer

Introduce etrbuffer in the tddconf bindings to support flexible
placement in the memory map.

Signed-off-by: Karsten Koenig <karsten.koenig@nordicsemi.no>
(cherry picked from commit a4fcd5e9e013a6b11721fb873c7610b03638b34b)
(cherry picked from commit 33448accdc0ed580a3b19b00141af9de6b22c58d)
---
 dts/bindings/arm/nordic,nrf-tddconf.yaml                    | 4 ++++
 snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay | 1 +
 snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay      | 1 +
 3 files changed, 6 insertions(+)

diff --git a/dts/bindings/arm/nordic,nrf-tddconf.yaml b/dts/bindings/arm/nordic,nrf-tddconf.yaml
index 46f9a0e7b2d..2273082c12f 100644
--- a/dts/bindings/arm/nordic,nrf-tddconf.yaml
+++ b/dts/bindings/arm/nordic,nrf-tddconf.yaml
@@ -38,3 +38,7 @@ properties:
       - 1
       - 2
       - 3
+
+  etrbuffer:
+    description: phandle to the memory region used for the ETR buffer
+    type: phandle
diff --git a/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay b/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay
index d620b83872f..fec54817364 100644
--- a/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay
+++ b/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay
@@ -12,4 +12,5 @@
 	etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE | NRF_TDDCONF_SOURCE_STMPPR |
 		NRF_TDDCONF_SOURCE_STMFLPR)>;
 	portconfig = <0>;
+	etrbuffer = <&etr_buffer>;
 };
diff --git a/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay b/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay
index d620b83872f..fec54817364 100644
--- a/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay
+++ b/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay
@@ -12,4 +12,5 @@
 	etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE | NRF_TDDCONF_SOURCE_STMPPR |
 		NRF_TDDCONF_SOURCE_STMFLPR)>;
 	portconfig = <0>;
+	etrbuffer = <&etr_buffer>;
 };

From 2deed84b44553ed814e10589b3366fd35c5ffcc1 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Tue, 3 Dec 2024 11:33:17 +0100
Subject: [PATCH 0801/2913] [nrf fromlist] soc: nordic: nrf54l: fix APPROTECT
 handling

APPROTECT symbols were already aligned to nRF54L15,
but did not take into account similar SoCs like nRF54L05 or L10.

Upstream PR #: 82478

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 1c085059f972180080708cef308c84ad1a49e6ec)
---
 soc/nordic/Kconfig | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/soc/nordic/Kconfig b/soc/nordic/Kconfig
index f76b1d19acc..7c7a07fba4b 100644
--- a/soc/nordic/Kconfig
+++ b/soc/nordic/Kconfig
@@ -98,9 +98,9 @@ config NFCT_PINS_AS_GPIOS
 
 choice NRF_APPROTECT_HANDLING
 	bool "APPROTECT handling"
-	depends on SOC_SERIES_NRF52X || SOC_SERIES_NRF53X || SOC_NRF54L15_CPUAPP || \
+	depends on SOC_SERIES_NRF52X || SOC_SERIES_NRF53X || SOC_NRF54L_CPUAPP_COMMON || \
 		   SOC_SERIES_NRF91X
-	default NRF_APPROTECT_DISABLE if SOC_NRF54L15_CPUAPP
+	default NRF_APPROTECT_DISABLE if SOC_NRF54L_CPUAPP_COMMON
 	default NRF_APPROTECT_USE_UICR
 	help
 	  Specifies how the SystemInit() function should handle the APPROTECT
@@ -108,7 +108,7 @@ choice NRF_APPROTECT_HANDLING
 
 config NRF_APPROTECT_DISABLE
 	bool "Disable"
-	depends on SOC_NRF54L15_CPUAPP
+	depends on SOC_NRF54L_CPUAPP_COMMON
 	help
 	  When this option is selected, the SystemInit() disables
 	  the APPROTECT mechanism.
@@ -140,8 +140,8 @@ endchoice
 
 choice NRF_SECURE_APPROTECT_HANDLING
 	bool "Secure APPROTECT handling"
-	depends on SOC_NRF5340_CPUAPP || SOC_NRF54L15_CPUAPP || SOC_SERIES_NRF91X
-	default NRF_SECURE_APPROTECT_DISABLE if SOC_NRF54L15_CPUAPP
+	depends on SOC_NRF5340_CPUAPP || SOC_NRF54L_CPUAPP_COMMON || SOC_SERIES_NRF91X
+	default NRF_SECURE_APPROTECT_DISABLE if SOC_NRF54L_CPUAPP_COMMON
 	default NRF_SECURE_APPROTECT_USE_UICR
 	help
 	  Specifies how the SystemInit() function should handle the secure
@@ -149,7 +149,7 @@ choice NRF_SECURE_APPROTECT_HANDLING
 
 config NRF_SECURE_APPROTECT_DISABLE
 	bool "Disable"
-	depends on SOC_NRF54L15_CPUAPP
+	depends on SOC_NRF54L_CPUAPP_COMMON
 	help
 	  When this option is selected, the SystemInit() disables
 	  the secure APPROTECT mechanism.

From c83539ce5018c7fa8c3cca6637c201bf76aa7548 Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Tue, 26 Nov 2024 15:14:09 +0530
Subject: [PATCH 0802/2913] [nrf fromlist] manifest: update nrf_wifi revision
 for recovery stats

Update nrf_wifi revision for watchdog recovery stats.

Upstream PR #: 81575

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit c2234a19d423d69346d92096f33fe55b7c26c9bd)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 248d015f6ae..11cd720a905 100644
--- a/west.yml
+++ b/west.yml
@@ -303,7 +303,7 @@ manifest:
       revision: 3cfca0192ff84da919e9bc7978bcc2239cd6a395
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: f9e2abdb70761003912b1b929a37b536f68a91da
+      revision: 71261e2b719b98500b7741c3398a74a5fb631596
       path: modules/lib/nrf_wifi
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719

From 1bb3a575bb4bf922114556065758b244a309b23f Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Tue, 19 Nov 2024 16:24:41 +0530
Subject: [PATCH 0803/2913] [nrf fromlist] drivers: wifi: Add RPU recovery info

Add RPU recovery information in wifi utils.
It helps to debug watchdog recovery.

Upstream PR #: 81575

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit 62ed74e2c61fd73b157cd20f81969919039d03ef)
---
 drivers/wifi/nrf_wifi/inc/fmac_main.h |  2 ++
 drivers/wifi/nrf_wifi/src/net_if.c    |  6 ++++
 drivers/wifi/nrf_wifi/src/wifi_util.c | 52 +++++++++++++++++++++++++++
 3 files changed, 60 insertions(+)

diff --git a/drivers/wifi/nrf_wifi/inc/fmac_main.h b/drivers/wifi/nrf_wifi/inc/fmac_main.h
index 57d4b8b9df5..de6780069b0 100644
--- a/drivers/wifi/nrf_wifi/inc/fmac_main.h
+++ b/drivers/wifi/nrf_wifi/inc/fmac_main.h
@@ -113,6 +113,8 @@ struct nrf_wifi_ctx_zep {
 	bool rpu_recovery_in_progress;
 	unsigned long last_rpu_recovery_time_ms;
 	unsigned int rpu_recovery_retries;
+	int rpu_recovery_success;
+	int rpu_recovery_failure;
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 };
 
diff --git a/drivers/wifi/nrf_wifi/src/net_if.c b/drivers/wifi/nrf_wifi/src/net_if.c
index 19b232b6fe3..5c7fb9759f7 100644
--- a/drivers/wifi/nrf_wifi/src/net_if.c
+++ b/drivers/wifi/nrf_wifi/src/net_if.c
@@ -74,6 +74,7 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 								nrf_wifi_rpu_recovery_work);
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
 	int ret;
+	bool recovery_fail = false;
 
 	if (!vif_ctx_zep) {
 		LOG_ERR("%s: vif_ctx_zep is NULL", __func__);
@@ -143,6 +144,8 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 	/* This indirectly does a cold-boot of RPU */
 	ret = net_if_down(vif_ctx_zep->zep_net_if_ctx);
 	if (ret) {
+		rpu_ctx_zep->rpu_recovery_failure++;
+		recovery_fail = true;
 		LOG_ERR("%s: net_if_down failed: %d", __func__, ret);
 		/* Continue with the recovery */
 	}
@@ -158,6 +161,9 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 	}
 	rpu_ctx_zep->rpu_recovery_in_progress = false;
 	rpu_ctx_zep->last_rpu_recovery_time_ms = k_uptime_get();
+	if (!recovery_fail) {
+		rpu_ctx_zep->rpu_recovery_success++;
+	}
 	k_mutex_unlock(&rpu_ctx_zep->rpu_lock);
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 	LOG_ERR("%s: RPU recovery done", __func__);
diff --git a/drivers/wifi/nrf_wifi/src/wifi_util.c b/drivers/wifi/nrf_wifi/src/wifi_util.c
index 528c41fa184..2d2ca2a2b5b 100644
--- a/drivers/wifi/nrf_wifi/src/wifi_util.c
+++ b/drivers/wifi/nrf_wifi/src/wifi_util.c
@@ -915,6 +915,52 @@ static int nrf_wifi_util_trigger_rpu_recovery(const struct shell *sh,
 	k_mutex_unlock(&ctx->rpu_lock);
 	return ret;
 }
+
+static int nrf_wifi_util_rpu_recovery_info(const struct shell *sh,
+					   size_t argc,
+					   const char *argv[])
+{
+	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
+	struct nrf_wifi_hal_dev_ctx *hal_dev_ctx = NULL;
+	unsigned long current_time_ms = nrf_wifi_osal_time_get_curr_ms();
+	int ret;
+
+	k_mutex_lock(&ctx->rpu_lock, K_FOREVER);
+	if (!ctx || !ctx->rpu_ctx) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "RPU context not initialized\n");
+		ret = -ENOEXEC;
+		goto unlock;
+	}
+
+	fmac_dev_ctx = ctx->rpu_ctx;
+	hal_dev_ctx = fmac_dev_ctx->hal_dev_ctx;
+
+	shell_fprintf(sh,
+		      SHELL_INFO,
+		      "wdt_irq_received: %d\n"
+		      "wdt_irq_ignored: %d\n"
+		      "last_wakeup_now_asserted_time_ms: %lu milliseconds\n"
+		      "last_wakeup_now_deasserted_time_ms: %lu milliseconds\n"
+		      "last_rpu_sleep_opp_time_ms: %lu milliseconds\n"
+		      "current time: %lu milliseconds\n"
+		      "rpu_recovery_success: %d\n"
+		      "rpu_recovery_failure: %d\n\n",
+		      hal_dev_ctx->wdt_irq_received,
+		      hal_dev_ctx->wdt_irq_ignored,
+		      hal_dev_ctx->last_wakeup_now_asserted_time_ms,
+		      hal_dev_ctx->last_wakeup_now_deasserted_time_ms,
+		      hal_dev_ctx->last_rpu_sleep_opp_time_ms,
+		      current_time_ms,
+		      ctx->rpu_recovery_success,
+		      ctx->rpu_recovery_failure);
+
+	ret = 0;
+unlock:
+	k_mutex_unlock(&ctx->rpu_lock);
+	return ret;
+}
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 
 SHELL_STATIC_SUBCMD_SET_CREATE(
@@ -1013,6 +1059,12 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      nrf_wifi_util_trigger_rpu_recovery,
 		      1,
 		      0),
+	SHELL_CMD_ARG(rpu_recovery_info,
+		      NULL,
+		      "Dump RPU recovery information",
+		      nrf_wifi_util_rpu_recovery_info,
+		      1,
+		      0),
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 	SHELL_SUBCMD_SET_END);
 

From 7b2b462f060805de771abc5f24a76db1e1ff6c0e Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Thu, 28 Nov 2024 15:38:03 +0530
Subject: [PATCH 0804/2913] [nrf fromtree] wifi: nrf_wifi: Remove duplicate
 Kconfig option

Remove NRF_WIFI_RPU_RECOVERY_PROPAGATION_DELAY_MS Kconfig
which was defined twice with different values.

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit 302683ef7f21284c3ea90b8a24723ff56d536823)
(cherry picked from commit 6baae0823c6953fd1c41e9249c83e3bf3a53fe09)
---
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index 4aabc46106a..f0d2c8ead71 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -682,15 +682,6 @@ config NET_MGMT_EVENT_QUEUE_SIZE
 	# Doing interface down and up even with delay puts a lot of events in the queue
 	default 16
 
-config NRF_WIFI_RPU_RECOVERY_PROPAGATION_DELAY_MS
-	int "RPU recovery propagation delay in milliseconds"
-	default 10
-	help
-	  Propagation delay in milliseconds to wait after the RPU is powered down
-	  before powering it up. This delay is required to ensure that the recovery
-	  is propagated to all the applications and stack, and has enough time to
-	  clean up the resources.
-
 config NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS
 	int "RPU recovery power save active timeout in milliseconds"
 	default 50000

From e4179620cd60100b3ba7bc1e9f3ca29c291af1fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Cab=C3=A9?= <benjamin@zephyrproject.org>
Date: Mon, 16 Sep 2024 16:28:19 +0200
Subject: [PATCH 0805/2913] [nrf fromtree] samples: doc: convert philosophers
 sample to code-sample directive
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adopt zephyr:code-sample directive to describe the Dining
Philosophers sample and update reference accordingly.

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
(cherry picked from commit a5b7349ab99b395d24d2e693ef3de6f0f7c79027)

Signed-off-by: Sean Madigan <sean.madigan@nordicsemi.no>
(cherry picked from commit c53ed0caf18489c28a0c05954f13e432de8b81c9)
---
 samples/boards/arc_secure_services/README.rst | 2 +-
 samples/philosophers/README.rst               | 7 ++++---
 samples/posix/philosophers/README.rst         | 5 ++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/samples/boards/arc_secure_services/README.rst b/samples/boards/arc_secure_services/README.rst
index 817af34e975..e63a9b9e910 100644
--- a/samples/boards/arc_secure_services/README.rst
+++ b/samples/boards/arc_secure_services/README.rst
@@ -68,7 +68,7 @@ Currently, in normal application, MPU is not accessible, so no user space and
 mpu-based stack checking. Please copy the specific dts file and def_config
 file to the specific board dir to build normal application.
 
-Here,take :ref:`dining-philosophers-sample` as an example for normal
+Here,take :zephyr:code-sample:`dining-philosophers` as an example for normal
 application.
 
 .. zephyr-app-commands::
diff --git a/samples/philosophers/README.rst b/samples/philosophers/README.rst
index d0701832cbe..8ff1ea33e9a 100644
--- a/samples/philosophers/README.rst
+++ b/samples/philosophers/README.rst
@@ -1,7 +1,8 @@
-.. _dining-philosophers-sample:
+.. zephyr:code-sample:: dining-philosophers
+  :name: Dining Philosophers
+  :relevant-api: semaphore_apis mutex_apis stack_apis thread_apis fifo_apis lifo_apis
 
-Dining Philosophers
-###################
+  Implement a solution to the Dining Philosophers problem using Zephyr kernel services.
 
 Overview
 ********
diff --git a/samples/posix/philosophers/README.rst b/samples/posix/philosophers/README.rst
index 604fb8858dd..6cd73ee637f 100644
--- a/samples/posix/philosophers/README.rst
+++ b/samples/posix/philosophers/README.rst
@@ -6,7 +6,7 @@
 Overview
 ********
 
-This sample implements Zephyr's :ref:`Dining Philosophers Sample <dining-philosophers-sample>` using the
+This sample implements Zephyr's :zephyr:code-sample:`dining-philosophers` sample using the
 :ref:`POSIX API <posix_support>`. The source code for this sample can be found under
 :file:`samples/posix/philosophers`.
 
@@ -52,5 +52,4 @@ Like the original philosophers sample, the POSIX variant also enables
 Additional Information
 **********************
 
-For additional information, please refer to the
-:ref:`Dining Philosophers Sample <dining-philosophers-sample>`.
+For additional information, please refer to the :zephyr:code-sample:`dining-philosophers` sample.

From a7aadfe0f1ac4494ac466359cd03439a7a0ed7c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Cab=C3=A9?= <benjamin@zephyrproject.org>
Date: Mon, 16 Sep 2024 10:51:28 +0200
Subject: [PATCH 0806/2913] [nrf fromtree] doc: extensions: move Zephyr domain
 extension to dedicated package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

move domain.py to domain/ to make it easier to keep things organized
and e.g. add dedicated css/js resources, etc.

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
(cherry picked from commit 3d7bb3010386a25fc8e0e980ecff4cada1f6f881)

Signed-off-by: Sean Madigan <sean.madigan@nordicsemi.no>
(cherry picked from commit a266e73f355f1821c0c914528fb5b5ec92e431e5)
---
 doc/_extensions/zephyr/{domain.py => domain/__init__.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename doc/_extensions/zephyr/{domain.py => domain/__init__.py} (100%)

diff --git a/doc/_extensions/zephyr/domain.py b/doc/_extensions/zephyr/domain/__init__.py
similarity index 100%
rename from doc/_extensions/zephyr/domain.py
rename to doc/_extensions/zephyr/domain/__init__.py

From 84eaf20175bdf24a95bbe08222de23400876ebc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Cab=C3=A9?= <benjamin@zephyrproject.org>
Date: Mon, 16 Sep 2024 10:53:07 +0200
Subject: [PATCH 0807/2913] [nrf fromtree] doc: extensions: samples: Introduce
 code sample categories
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit adds support for categorizing code samples in the
documentation.

It introduces two new directives:

- `zephyr:code-sample-category::` to create a category and associated
  brief description, that implicitly acts as a toctree too.

- `zephyr:code-sample-listing::` to allow dumping a list of samples
  corresponding to a category anywhere in the documentation.

Fixes #62453.

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
(cherry picked from commit 793c70d095adefd6c7b08f195e0ccb3ee7e7c9a0)

Signed-off-by: Sean Madigan <sean.madigan@nordicsemi.no>
(cherry picked from commit 62959058b09a7f2a7bd3938399786be549378493)
---
 doc/_extensions/zephyr/domain/__init__.py     | 462 +++++++++++++++++-
 .../static/css/codesample-livesearch.css      |  42 ++
 .../domain/static/js/codesample-livesearch.js | 115 +++++
 doc/_static/css/custom.css                    |   8 +
 doc/contribute/documentation/guidelines.rst   |  76 +++
 doc/requirements.txt                          |   3 +
 6 files changed, 685 insertions(+), 21 deletions(-)
 create mode 100644 doc/_extensions/zephyr/domain/static/css/codesample-livesearch.css
 create mode 100644 doc/_extensions/zephyr/domain/static/js/codesample-livesearch.js

diff --git a/doc/_extensions/zephyr/domain/__init__.py b/doc/_extensions/zephyr/domain/__init__.py
index e4c1ade9642..51eda4a29ce 100644
--- a/doc/_extensions/zephyr/domain/__init__.py
+++ b/doc/_extensions/zephyr/domain/__init__.py
@@ -12,31 +12,48 @@
 ----------
 
 - ``zephyr:code-sample::`` - Defines a code sample.
+- ``zephyr:code-sample-category::`` - Defines a category for grouping code samples.
+- ``zephyr:code-sample-listing::`` - Shows a listing of code samples found in a given category.
 
 Roles
 -----
 
 - ``:zephyr:code-sample:`` - References a code sample.
+- ``:zephyr:code-sample-category:`` - References a code sample category.
 
 """
+
+from os import path
+from pathlib import Path
 from typing import Any, Dict, Iterator, List, Tuple
 
 from docutils import nodes
-from docutils.nodes import Node
 from docutils.parsers.rst import Directive, directives
+from docutils.statemachine import StringList
+
 from sphinx import addnodes
+from sphinx.application import Sphinx
 from sphinx.domains import Domain, ObjType
+from sphinx.environment import BuildEnvironment
 from sphinx.roles import XRefRole
 from sphinx.transforms import SphinxTransform
 from sphinx.transforms.post_transforms import SphinxPostTransform
 from sphinx.util import logging
+from sphinx.util.docutils import SphinxDirective, switch_source_input
 from sphinx.util.nodes import NodeMatcher, make_refnode
+from sphinx.util.parsing import nested_parse_to_nodes
+
 from zephyr.doxybridge import DoxygenGroupDirective
 from zephyr.gh_utils import gh_link_get_url
 
+
 import json
 
-__version__ = "0.1.0"
+from anytree import Node, Resolver, ChildResolverError, PreOrderIter, search
+
+__version__ = "0.2.0"
+
+RESOURCES_DIR = Path(__file__).parent / "static"
 
 logger = logging.getLogger(__name__)
 
@@ -49,6 +66,14 @@ class RelatedCodeSamplesNode(nodes.Element):
     pass
 
 
+class CodeSampleCategoryNode(nodes.Element):
+    pass
+
+
+class CodeSampleListingNode(nodes.Element):
+    pass
+
+
 class ConvertCodeSampleNode(SphinxTransform):
     default_priority = 100
 
@@ -137,6 +162,188 @@ def convert_node(self, node):
             node.document += json_ld
 
 
+class ConvertCodeSampleCategoryNode(SphinxTransform):
+    default_priority = 100
+
+    def apply(self):
+        matcher = NodeMatcher(CodeSampleCategoryNode)
+        for node in self.document.traverse(matcher):
+            self.convert_node(node)
+
+    def convert_node(self, node):
+        # move all the siblings of the category node underneath the section it contains
+        parent = node.parent
+        siblings_to_move = []
+        if parent is not None:
+            index = parent.index(node)
+            siblings_to_move = parent.children[index + 1 :]
+
+            node.children[0].extend(siblings_to_move)
+            for sibling in siblings_to_move:
+                parent.remove(sibling)
+
+        # note document as needing toc patching
+        self.document["needs_toc_patch"] = True
+
+        # finally, replace the category node with the section it contains
+        node.replace_self(node.children[0])
+
+
+class CodeSampleCategoriesTocPatching(SphinxPostTransform):
+    default_priority = 5  # needs to run *before* ReferencesResolver
+
+    def output_sample_categories_list_items(self, tree, container: nodes.Node):
+        list_item = nodes.list_item()
+        compact_paragraph = addnodes.compact_paragraph()
+        # find docname for tree.category["id"]
+        docname = self.env.domaindata["zephyr"]["code-samples-categories"][tree.category["id"]][
+            "docname"
+        ]
+        reference = nodes.reference(
+            "",
+            "",
+            internal=True,
+            refuri=docname,
+            anchorname="",
+            *[nodes.Text(tree.category["name"])],
+            classes=["category-link"],
+        )
+        compact_paragraph += reference
+        list_item += compact_paragraph
+
+        sorted_children = sorted(tree.children, key=lambda x: x.category["name"])
+
+        # add bullet list for children (if there are any, i.e. there are subcategories or at least
+        # one code sample in the category)
+        if sorted_children or any(
+            code_sample.get("category") == tree.category["id"]
+            for code_sample in self.env.domaindata["zephyr"]["code-samples"].values()
+        ):
+            bullet_list = nodes.bullet_list()
+            for child in sorted_children:
+                self.output_sample_categories_list_items(child, bullet_list)
+
+            for code_sample in sorted(
+                [
+                    code_sample
+                    for code_sample in self.env.domaindata["zephyr"]["code-samples"].values()
+                    if code_sample.get("category") == tree.category["id"]
+                ],
+                key=lambda x: x["name"].casefold(),
+            ):
+                li = nodes.list_item()
+                sample_xref = nodes.reference(
+                    "",
+                    "",
+                    internal=True,
+                    refuri=code_sample["docname"],
+                    anchorname="",
+                    *[nodes.Text(code_sample["name"])],
+                    classes=["code-sample-link"],
+                )
+                sample_xref["reftitle"] = code_sample["description"].astext()
+                compact_paragraph = addnodes.compact_paragraph()
+                compact_paragraph += sample_xref
+                li += compact_paragraph
+                bullet_list += li
+
+            list_item += bullet_list
+
+        container += list_item
+
+    def run(self, **kwargs: Any) -> None:
+        if not self.document.get("needs_toc_patch"):
+            return
+
+        code_samples_categories_tree = self.env.domaindata["zephyr"]["code-samples-categories-tree"]
+
+        category = search.find(
+            code_samples_categories_tree,
+            lambda node: hasattr(node, "category") and node.category["docname"] == self.env.docname,
+        )
+
+        bullet_list = nodes.bullet_list()
+        self.output_sample_categories_list_items(category, bullet_list)
+
+        self.env.tocs[self.env.docname] = bullet_list
+
+
+class ProcessCodeSampleListingNode(SphinxPostTransform):
+    default_priority = 5  # needs to run *before* ReferencesResolver
+
+    def output_sample_categories_sections(self, tree, container: nodes.Node, show_titles=False):
+        if show_titles:
+            section = nodes.section(ids=[tree.category["id"]])
+
+            link = make_refnode(
+                self.env.app.builder,
+                self.env.docname,
+                tree.category["docname"],
+                targetid=None,
+                child=nodes.Text(tree.category["name"]),
+            )
+            title = nodes.title("", "", link)
+            section += title
+            container += section
+        else:
+            section = container
+
+        # list samples from this category
+        list = create_code_sample_list(
+            [
+                code_sample
+                for code_sample in self.env.domaindata["zephyr"]["code-samples"].values()
+                if code_sample.get("category") == tree.category["id"]
+            ]
+        )
+        section += list
+
+        sorted_children = sorted(tree.children, key=lambda x: x.name)
+        for child in sorted_children:
+            self.output_sample_categories_sections(child, section, show_titles=True)
+
+    def run(self, **kwargs: Any) -> None:
+        matcher = NodeMatcher(CodeSampleListingNode)
+
+        for node in self.document.traverse(matcher):
+            code_samples_categories = self.env.domaindata["zephyr"]["code-samples-categories"]
+            code_samples_categories_tree = self.env.domaindata["zephyr"][
+                "code-samples-categories-tree"
+            ]
+
+            container = nodes.container()
+            container["classes"].append("code-sample-listing")
+
+            if self.env.app.builder.format == "html" and node["live-search"]:
+                search_input = nodes.raw(
+                    "",
+                    """
+                    <div class="cs-search-bar">
+                      <input type="text" class="cs-search-input" placeholder="Filter code samples..." onkeyup="filterSamples(this)">
+                      <i class="fa fa-search"></i>
+                    </div>
+                    """,
+                    format="html",
+                )
+                container += search_input
+
+            for category in node["categories"]:
+                if category not in code_samples_categories:
+                    logger.error(
+                        f"Category {category} not found in code samples categories",
+                        location=(self.env.docname, node.line),
+                    )
+                    continue
+
+                category_node = search.find(
+                    code_samples_categories_tree,
+                    lambda node: hasattr(node, "category") and node.category["id"] == category,
+                )
+                self.output_sample_categories_sections(category_node, container)
+
+            node.replace_self(container)
+
+
 def create_code_sample_list(code_samples):
     """
     Creates a bullet list (`nodes.bullet_list`) of code samples from a list of code samples.
@@ -188,8 +395,8 @@ def run(self, **kwargs: Any) -> None:
                 admonition = nodes.admonition()
                 admonition += nodes.title(text="Related code samples")
                 admonition["classes"].append("related-code-samples")
-                admonition["classes"].append("dropdown") # used by sphinx-togglebutton extension
-                admonition["classes"].append("toggle-shown") # show the content by default
+                admonition["classes"].append("dropdown")  # used by sphinx-togglebutton extension
+                admonition["classes"].append("toggle-shown")  # show the content by default
 
                 sample_list = create_code_sample_list(code_samples)
                 admonition += sample_list
@@ -251,23 +458,118 @@ def run(self):
         return [code_sample_node]
 
 
+class CodeSampleCategoryDirective(SphinxDirective):
+    required_arguments = 1  # Category ID
+    optional_arguments = 0
+    option_spec = {
+        "name": directives.unchanged,
+        "show-listing": directives.flag,
+        "live-search": directives.flag,
+        "glob": directives.unchanged,
+    }
+    has_content = True  # Category description
+    final_argument_whitespace = True
+
+    def run(self):
+        env = self.state.document.settings.env
+        id = self.arguments[0]
+        name = self.options.get("name", id)
+
+        category_node = CodeSampleCategoryNode()
+        category_node["id"] = id
+        category_node["name"] = name
+        category_node["docname"] = env.docname
+
+        description_node = self.parse_content_to_nodes()
+        category_node["description"] = description_node
+
+        code_sample_category = {
+            "docname": env.docname,
+            "id": id,
+            "name": name,
+        }
+
+        # Add the category to the domain
+        domain = env.get_domain("zephyr")
+        domain.add_code_sample_category(code_sample_category)
+
+        # Fake a toctree directive to ensure the code-sample-category directive implicitly acts as
+        # a toctree and correctly mounts whatever relevant documents under it in the global toc
+        lines = [
+            name,
+            "#" * len(name),
+            "",
+            ".. toctree::",
+            "   :titlesonly:",
+            "   :glob:",
+            "   :hidden:",
+            "   :maxdepth: 1",
+            "",
+            f"   {self.options['glob']}" if "glob" in self.options else "   */*",
+            "",
+        ]
+        stringlist = StringList(lines, source=env.docname)
+
+        with switch_source_input(self.state, stringlist):
+            parsed_section = nested_parse_to_nodes(self.state, stringlist)[0]
+
+        category_node += parsed_section
+
+        parsed_section += description_node
+
+        if "show-listing" in self.options:
+            listing_node = CodeSampleListingNode()
+            listing_node["categories"] = [id]
+            listing_node["live-search"] = "live-search" in self.options
+            parsed_section += listing_node
+
+        return [category_node]
+
+
+class CodeSampleListingDirective(SphinxDirective):
+    has_content = False
+    required_arguments = 0
+    optional_arguments = 0
+    option_spec = {
+        "categories": directives.unchanged_required,
+        "live-search": directives.flag,
+    }
+
+    def run(self):
+        code_sample_listing_node = CodeSampleListingNode()
+        code_sample_listing_node["categories"] = self.options.get("categories").split()
+        code_sample_listing_node["live-search"] = "live-search" in self.options
+
+        return [code_sample_listing_node]
+
+
 class ZephyrDomain(Domain):
     """Zephyr domain"""
 
     name = "zephyr"
-    label = "Zephyr Project"
+    label = "Zephyr"
 
     roles = {
         "code-sample": XRefRole(innernodeclass=nodes.inline, warn_dangling=True),
+        "code-sample-category": XRefRole(innernodeclass=nodes.inline, warn_dangling=True),
     }
 
-    directives = {"code-sample": CodeSampleDirective}
+    directives = {
+        "code-sample": CodeSampleDirective,
+        "code-sample-listing": CodeSampleListingDirective,
+        "code-sample-category": CodeSampleCategoryDirective,
+    }
 
     object_types: Dict[str, ObjType] = {
-        "code-sample": ObjType("code-sample", "code-sample"),
+        "code-sample": ObjType("code sample", "code-sample"),
+        "code-sample-category": ObjType("code sample category", "code-sample-category"),
     }
 
-    initial_data: Dict[str, Any] = {"code-samples": {}}
+    initial_data: Dict[str, Any] = {
+        "code-samples": {},  # id -> code sample data
+        "code-samples-categories": {},  # id -> code sample category data
+        "code-samples-categories-tree": Node("samples"),
+    }
 
     def clear_doc(self, docname: str) -> None:
         self.data["code-samples"] = {
@@ -276,8 +578,30 @@ def clear_doc(self, docname: str) -> None:
             if sample_data["docname"] != docname
         }
 
+        self.data["code-samples-categories"] = {
+            category_id: category_data
+            for category_id, category_data in self.data["code-samples-categories"].items()
+            if category_data["docname"] != docname
+        }
+
+        # TODO clean up the anytree as well
+
     def merge_domaindata(self, docnames: List[str], otherdata: Dict) -> None:
         self.data["code-samples"].update(otherdata["code-samples"])
+        self.data["code-samples-categories"].update(otherdata["code-samples-categories"])
+
+        # merge category trees by adding all the categories found in the "other" tree that to
+        # self tree
+        other_tree = otherdata["code-samples-categories-tree"]
+        categories = [n for n in PreOrderIter(other_tree) if hasattr(n, "category")]
+        for category in categories:
+            category_path = f"/{'/'.join(n.name for n in category.path)}"
+            self.add_category_to_tree(
+                category_path,
+                category.category["id"],
+                category.category["name"],
+                category.category["docname"],
+            )
 
     def get_objects(self):
         for _, code_sample in self.data["code-samples"].items():
@@ -290,6 +614,16 @@ def get_objects(self):
                 1,
             )
 
+        for _, code_sample_category in self.data["code-samples-categories"].items():
+            yield (
+                code_sample_category["id"],
+                code_sample_category["name"],
+                "code-sample-category",
+                code_sample_category["docname"],
+                code_sample_category["id"],
+                1,
+            )
+
     # used by Sphinx Immaterial theme
     def get_object_synopses(self) -> Iterator[Tuple[Tuple[str, str], str]]:
         for _, code_sample in self.data["code-samples"].items():
@@ -300,23 +634,71 @@ def get_object_synopses(self) -> Iterator[Tuple[Tuple[str, str], str]]:
 
     def resolve_xref(self, env, fromdocname, builder, type, target, node, contnode):
         if type == "code-sample":
-            code_sample_info = self.data["code-samples"].get(target)
-            if code_sample_info:
-                if not node.get("refexplicit"):
-                    contnode = [nodes.Text(code_sample_info["name"])]
-
-                return make_refnode(
-                    builder,
-                    fromdocname,
-                    code_sample_info["docname"],
-                    code_sample_info["id"],
-                    contnode,
-                    code_sample_info["description"].astext(),
-                )
+            elem = self.data["code-samples"].get(target)
+        elif type == "code-sample-category":
+            elem = self.data["code-samples-categories"].get(target)
+        else:
+            return
+
+        if elem:
+            if not node.get("refexplicit"):
+                contnode = [nodes.Text(elem["name"])]
+
+            return make_refnode(
+                builder,
+                fromdocname,
+                elem["docname"],
+                elem["id"],
+                contnode,
+                elem["description"].astext() if type == "code-sample" else None,
+            )
 
     def add_code_sample(self, code_sample):
         self.data["code-samples"][code_sample["id"]] = code_sample
 
+    def add_code_sample_category(self, code_sample_category):
+        self.data["code-samples-categories"][code_sample_category["id"]] = code_sample_category
+        self.add_category_to_tree(
+            path.dirname(code_sample_category["docname"]),
+            code_sample_category["id"],
+            code_sample_category["name"],
+            code_sample_category["docname"],
+        )
+
+    def add_category_to_tree(
+        self, category_path: str, category_id: str, category_name: str, docname: str
+    ) -> Node:
+        resolver = Resolver("name")
+        tree = self.data["code-samples-categories-tree"]
+
+        if not category_path.startswith("/"):
+            category_path = "/" + category_path
+
+        # node either already exists (and we update it to make it a category node), or we need to
+        # create it
+        try:
+            node = resolver.get(tree, category_path)
+            if hasattr(node, "category") and node.category["id"] != category_id:
+                raise ValueError(
+                    f"Can't add code sample category {category_id} as category "
+                    f"{node.category['id']} is already defined in {node.category['docname']}. "
+                    "You may only have one category per path."
+                )
+        except ChildResolverError as e:
+            path_of_last_existing_node = f"/{'/'.join(n.name for n in e.node.path)}"
+            common_path = path.commonpath([path_of_last_existing_node, category_path])
+            remaining_path = path.relpath(category_path, common_path)
+
+            # Add missing nodes under the last existing node
+            for node_name in remaining_path.split("/"):
+                e.node = Node(node_name, parent=e.node)
+
+            node = e.node
+
+        node.category = {"id": category_id, "name": category_name, "docname": docname}
+
+        return tree
+
 
 class CustomDoxygenGroupDirective(DoxygenGroupDirective):
     """Monkey patch for Breathe's DoxygenGroupDirective."""
@@ -330,14 +712,52 @@ def run(self) -> List[Node]:
             return nodes
 
 
+def compute_sample_categories_hierarchy(app: Sphinx, env: BuildEnvironment) -> None:
+    domain = env.get_domain("zephyr")
+    code_samples = domain.data["code-samples"]
+
+    category_tree = env.domaindata["zephyr"]["code-samples-categories-tree"]
+    resolver = Resolver("name")
+    for code_sample in code_samples.values():
+        try:
+            # Try to get the node at the specified path
+            node = resolver.get(category_tree, "/" + path.dirname(code_sample["docname"]))
+        except ChildResolverError as e:
+            # starting with e.node and up, find the first node that has a category
+            node = e.node
+            while not hasattr(node, "category"):
+                node = node.parent
+            code_sample["category"] = node.category["id"]
+
+
+def install_codesample_livesearch(
+    app: Sphinx, pagename: str, templatename: str, context: dict[str, Any], event_arg: Any
+) -> None:
+    # TODO only add the CSS/JS if the page contains a code sample listing
+    # As these resources are really small, it's not a big deal to include them on every page for now
+    app.add_css_file("css/codesample-livesearch.css")
+    app.add_js_file("js/codesample-livesearch.js")
+
+
 def setup(app):
     app.add_config_value("zephyr_breathe_insert_related_samples", False, "env")
 
     app.add_domain(ZephyrDomain)
 
     app.add_transform(ConvertCodeSampleNode)
+    app.add_transform(ConvertCodeSampleCategoryNode)
+
+    app.add_post_transform(ProcessCodeSampleListingNode)
+    app.add_post_transform(CodeSampleCategoriesTocPatching)
     app.add_post_transform(ProcessRelatedCodeSamplesNode)
 
+    app.connect(
+        "builder-inited",
+        (lambda app: app.config.html_static_path.append(RESOURCES_DIR.as_posix())),
+    )
+    app.connect("html-page-context", install_codesample_livesearch)
+    app.connect("env-updated", compute_sample_categories_hierarchy)
+
     # monkey-patching of the DoxygenGroupDirective
     app.add_directive("doxygengroup", CustomDoxygenGroupDirective, override=True)
 
diff --git a/doc/_extensions/zephyr/domain/static/css/codesample-livesearch.css b/doc/_extensions/zephyr/domain/static/css/codesample-livesearch.css
new file mode 100644
index 00000000000..36c7818fd18
--- /dev/null
+++ b/doc/_extensions/zephyr/domain/static/css/codesample-livesearch.css
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2024, The Linux Foundation.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+.cs-search-bar {
+  position: relative;
+  display: inline-block;
+  width: 100%;
+  margin-bottom: 2rem;
+  margin-top: 1rem;
+}
+
+.cs-search-bar input {
+  background-color: var(--input-background-color);
+  color: var(--input-text-color);
+  width: 100%;
+  padding: 10px 40px 10px 20px;
+  border: 1px solid #ccc;
+  border-radius: 25px;
+  font-size: 16px;
+  outline: none;
+  box-shadow: none;
+}
+
+.cs-search-bar i {
+  position: absolute;
+  top: 50%;
+  right: 15px;
+  transform: translateY(-50%);
+  color: #ccc;
+  font-size: 18px;
+}
+
+.code-sample-listing mark {
+  background: inherit;
+  font-style: inherit;
+  font-weight: inherit;
+  color: inherit;
+  border-radius: 4px;
+  outline: 4px solid rgba(255, 255, 0, 0.3);
+  outline-offset: 2px;
+}
diff --git a/doc/_extensions/zephyr/domain/static/js/codesample-livesearch.js b/doc/_extensions/zephyr/domain/static/js/codesample-livesearch.js
new file mode 100644
index 00000000000..4a5268cc84c
--- /dev/null
+++ b/doc/_extensions/zephyr/domain/static/js/codesample-livesearch.js
@@ -0,0 +1,115 @@
+/**
+ * Copyright (c) 2024, The Linux Foundation.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+function filterSamples(input) {
+  const searchQuery = input.value.toLowerCase();
+  const container = input.closest(".code-sample-listing");
+
+  function removeHighlights(element) {
+    const marks = element.querySelectorAll("mark");
+    marks.forEach((mark) => {
+      const parent = mark.parentNode;
+      while (mark.firstChild) {
+        parent.insertBefore(mark.firstChild, mark);
+      }
+      parent.removeChild(mark);
+      parent.normalize(); // Merge adjacent text nodes
+    });
+  }
+
+  function highlightMatches(node, query) {
+    if (node.nodeType === Node.TEXT_NODE) {
+      const text = node.textContent;
+      const index = text.toLowerCase().indexOf(query);
+      if (index !== -1 && query.length > 0) {
+        const highlightedFragment = document.createDocumentFragment();
+
+        const before = document.createTextNode(text.substring(0, index));
+        const highlight = document.createElement("mark");
+        highlight.textContent = text.substring(index, index + query.length);
+        const after = document.createTextNode(text.substring(index + query.length));
+
+        highlightedFragment.appendChild(before);
+        highlightedFragment.appendChild(highlight);
+        highlightedFragment.appendChild(after);
+
+        node.parentNode.replaceChild(highlightedFragment, node);
+      }
+    } else if (node.nodeType === Node.ELEMENT_NODE) {
+      node.childNodes.forEach((child) => highlightMatches(child, query));
+    }
+  }
+
+  function processSection(section) {
+    let sectionVisible = false;
+    const lists = section.querySelectorAll(":scope > ul.code-sample-list");
+    const childSections = section.querySelectorAll(":scope > section");
+
+    // Process lists directly under this section
+    lists.forEach((list) => {
+      let listVisible = false;
+      const items = list.querySelectorAll("li");
+
+      items.forEach((item) => {
+        const nameElement = item.querySelector(".code-sample-name");
+        const descElement = item.querySelector(".code-sample-description");
+
+        removeHighlights(nameElement);
+        removeHighlights(descElement);
+
+        const sampleName = nameElement.textContent.toLowerCase();
+        const sampleDescription = descElement.textContent.toLowerCase();
+
+        if (
+          sampleName.includes(searchQuery) ||
+          sampleDescription.includes(searchQuery)
+        ) {
+          if (searchQuery) {
+            highlightMatches(nameElement, searchQuery);
+            highlightMatches(descElement, searchQuery);
+          }
+
+          item.style.display = "";
+          listVisible = true;
+          sectionVisible = true;
+        } else {
+          item.style.display = "none";
+        }
+      });
+
+      // Show or hide the list based on whether any items are visible
+      list.style.display = listVisible ? "" : "none";
+    });
+
+    // Recursively process child sections
+    childSections.forEach((childSection) => {
+      const childVisible = processSection(childSection);
+      if (childVisible) {
+        sectionVisible = true;
+      }
+    });
+
+    // Show or hide the section heading based on visibility
+    const heading = section.querySelector(
+      ":scope > h2, :scope > h3, :scope > h4, :scope > h5, :scope > h6"
+    );
+    if (sectionVisible) {
+      if (heading) heading.style.display = "";
+      section.style.display = "";
+    } else {
+      if (heading) heading.style.display = "none";
+      section.style.display = "none";
+    }
+
+    return sectionVisible;
+  }
+
+  // Start processing from the container
+  processSection(container);
+
+  // Ensure the input and its container are always visible
+  input.style.display = "";
+  container.style.display = "";
+}
diff --git a/doc/_static/css/custom.css b/doc/_static/css/custom.css
index f8cbab2073f..b302ba82026 100644
--- a/doc/_static/css/custom.css
+++ b/doc/_static/css/custom.css
@@ -1053,3 +1053,11 @@ dark-mode-toggle::part(toggleLabel){
     font-family: 'FontAwesome';
     padding-right: 0.5em;
 }
+
+li>a.code-sample-link.reference.internal {
+    font-weight: 100;
+}
+
+li>a.code-sample-link.reference.internal.current {
+    text-decoration: underline;
+}
\ No newline at end of file
diff --git a/doc/contribute/documentation/guidelines.rst b/doc/contribute/documentation/guidelines.rst
index a919443529c..dbf0f6b89ff 100644
--- a/doc/contribute/documentation/guidelines.rst
+++ b/doc/contribute/documentation/guidelines.rst
@@ -1104,3 +1104,79 @@ Code samples
    Will render as:
 
       Check out :zephyr:code-sample:`blinky code sample <blinky>` for more information.
+
+.. rst:directive:: .. zephyr:code-sample-category:: id
+
+   This directive is used to define a category for grouping code samples.
+
+   For example::
+
+      .. zephyr:code-sample-category:: gpio
+         :name: GPIO
+         :show-listing:
+
+         Samples related to the GPIO subsystem.
+
+   The contents of the directive is used as the description of the category. It can contain any
+   valid reStructuredText content.
+
+   .. rubric:: Options
+
+   .. rst:directive:option:: name
+      :type: text
+
+      Indicates the human-readable name of the category.
+
+   .. rst:directive:option:: show-listing
+      :type: flag
+
+      If set, a listing of code samples in the category will be shown. The listing is automatically
+      generated based on all code samples found in the subdirectories of the current document.
+
+   .. rst:directive:option:: glob
+      :type: text
+
+      A glob pattern to match the files to include in the listing. The default is `*/*` but it can
+      be overridden e.g. when samples may be found in directories not sitting directly under the
+      category directory.
+
+.. rst:role:: zephyr:code-sample-category
+
+   This role is used to reference a code sample category described using
+   :rst:dir:`zephyr:code-sample-category`.
+
+   For example::
+
+      Check out :zephyr:code-sample-category:`cloud` samples for more information.
+
+   Will render as:
+
+      Check out :zephyr:code-sample-category:`cloud` samples for more information.
+
+.. rst:directive:: .. zephyr:code-sample-listing::
+
+   This directive is used to show a listing of all code samples found in one or more categories.
+
+   For example::
+
+      .. zephyr:code-sample-listing::
+         :categories: cloud
+
+   Will render as:
+
+      .. zephyr:code-sample-listing::
+         :categories: cloud
+
+   .. rubric:: Options
+
+   .. rst:directive:option:: categories
+      :type: text
+
+      A space-separated list of category IDs for which to show the listing.
+
+   .. rst:directive:option:: live-search
+      :type: flag
+
+      A flag to include a search box right above the listing. The search box allows users to filter
+      the listing by code sample name/description, which can be useful for categories with a large
+      number of samples. This option is only available in the HTML builder.
diff --git a/doc/requirements.txt b/doc/requirements.txt
index aa77efa604f..b979eeedf8a 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -21,3 +21,6 @@ pyserial
 
 # Doxygen doxmlparser
 doxmlparser
+
+# Used by the Zephyr domain to organize code samples
+anytree

From b979e73fbf9c8eb07bc142beb3df45aa3574a41c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Cab=C3=A9?= <benjamin@zephyrproject.org>
Date: Mon, 16 Sep 2024 10:55:34 +0200
Subject: [PATCH 0808/2913] [nrf fromtree] doc: samples: Adopt
 code-sample-category across tree
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit uses the new .. zephyr:code-sample-category directive to
categorize code samples across the tree.
Updates existing legacy references to manually defined targets to now
use :zephyr:code-sample-category: role instead.

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
(cherry picked from commit 1db9b009a70e92cb75ef2e403f06a7a5bff022ef)

Signed-off-by: Sean Madigan <sean.madigan@nordicsemi.no>
(cherry picked from commit a4c6ee644edb6847e94515ad3292c9ccc00233fc)
---
 .../feather_m0_basic_proto/doc/index.rst      |  2 +-
 boards/adafruit/feather_m0_lora/doc/index.rst |  2 +-
 .../grand_central_m4_express/doc/index.rst    |  2 +-
 .../itsybitsy_m4_express/doc/index.rst        |  2 +-
 boards/adafruit/trinket_m0/doc/index.rst      |  2 +-
 boards/arduino/mkrzero/doc/index.rst          |  2 +-
 boards/arduino/nano_33_iot/doc/index.rst      |  2 +-
 boards/arduino/zero/doc/index.rst             |  2 +-
 .../esp32_devkitc_wroom/doc/index.rst         |  2 +-
 .../esp32_devkitc_wrover/doc/index.rst        |  2 +-
 .../espressif/esp32s3_devkitc/doc/index.rst   |  2 +-
 .../espressif/esp32s3_devkitm/doc/index.rst   |  2 +-
 boards/openisa/rv32m1_vega/doc/index.rst      |  2 +-
 boards/others/serpente/doc/index.rst          |  2 +-
 boards/seeed/seeeduino_xiao/doc/index.rst     |  2 +-
 boards/seeed/wio_terminal/doc/index.rst       |  2 +-
 boards/shields/npm1300_ek/doc/index.rst       |  2 +-
 boards/shields/npm6001_ek/doc/index.rst       |  2 +-
 boards/snps/hsdk/doc/index.rst                |  6 +--
 boards/snps/hsdk4xd/doc/index.rst             |  5 +--
 .../esp32s3_touch_lcd_1_28/doc/index.rst      |  2 +-
 doc/connectivity/bluetooth/bluetooth-arch.rst |  2 +-
 doc/connectivity/bluetooth/bluetooth-dev.rst  |  2 +-
 doc/connectivity/usb/device/usb_device.rst    |  2 +-
 doc/connectivity/usb/pd/ucds.rst              |  2 +-
 doc/develop/application/index.rst             |  4 +-
 doc/develop/beyond-GSG.rst                    |  2 +-
 doc/develop/getting_started/index.rst         |  2 +-
 doc/releases/release-notes-1.7.rst            |  2 +-
 doc/services/device_mgmt/ota.rst              |  8 ++--
 .../portability/posix/overview/index.rst      |  3 +-
 .../application_development.rst               | 13 ++----
 samples/arch/index.rst                        | 13 ++----
 samples/arch/mpu/index.rst                    | 14 +++----
 samples/arch/smp/index.rst                    | 13 ++----
 samples/basic/basic.rst                       | 13 ++----
 .../bap_broadcast_assistant/README.rst        |  2 +-
 .../bluetooth/bap_broadcast_sink/README.rst   |  2 +-
 .../bluetooth/bap_broadcast_source/README.rst |  2 +-
 .../bluetooth/bap_unicast_client/README.rst   |  2 +-
 .../bluetooth/bap_unicast_server/README.rst   |  2 +-
 samples/bluetooth/beacon/README.rst           |  2 +-
 samples/bluetooth/bluetooth.rst               | 14 +++----
 samples/bluetooth/broadcaster/README.rst      |  2 +-
 .../bluetooth/broadcaster_multiple/README.rst |  2 +-
 .../bthome_sensor_template/README.rst         |  2 +-
 samples/bluetooth/cap_acceptor/README.rst     |  2 +-
 samples/bluetooth/cap_initiator/README.rst    |  2 +-
 samples/bluetooth/central/README.rst          |  2 +-
 .../bluetooth/central_gatt_write/README.rst   |  2 +-
 samples/bluetooth/central_hr/README.rst       |  2 +-
 samples/bluetooth/central_ht/README.rst       |  2 +-
 .../bluetooth/central_multilink/README.rst    |  2 +-
 samples/bluetooth/central_otc/README.rst      |  2 +-
 samples/bluetooth/central_past/README.rst     |  2 +-
 samples/bluetooth/direct_adv/README.rst       |  2 +-
 samples/bluetooth/eddystone/README.rst        |  2 +-
 .../encrypted_advertising/README.rst          |  2 +-
 samples/bluetooth/extended_adv/README.rst     |  2 +-
 samples/bluetooth/handsfree/README.rst        |  2 +-
 samples/bluetooth/handsfree_ag/README.rst     |  2 +-
 samples/bluetooth/hap_ha/README.rst           |  2 +-
 samples/bluetooth/hci_ipc/README.rst          |  2 +-
 samples/bluetooth/hci_pwr_ctrl/README.rst     |  2 +-
 samples/bluetooth/hci_spi/README.rst          |  2 +-
 samples/bluetooth/hci_usb/README.rst          |  2 +-
 samples/bluetooth/hci_usb_h4/README.rst       |  2 +-
 samples/bluetooth/hci_vs_scan_req/README.rst  |  2 +-
 samples/bluetooth/ibeacon/README.rst          |  2 +-
 samples/bluetooth/iso_broadcast/README.rst    |  2 +-
 .../iso_broadcast_benchmark/README.rst        |  2 +-
 samples/bluetooth/iso_central/README.rst      |  2 +-
 .../iso_connected_benchmark/README.rst        |  2 +-
 samples/bluetooth/iso_peripheral/README.rst   |  2 +-
 samples/bluetooth/iso_receive/README.rst      |  2 +-
 samples/bluetooth/mesh/README.rst             |  2 +-
 samples/bluetooth/mesh_demo/README.rst        |  2 +-
 samples/bluetooth/mesh_provisioner/README.rst |  2 +-
 samples/bluetooth/mtu_update/README.rst       |  2 +-
 samples/bluetooth/observer/README.rst         |  2 +-
 .../pbp_public_broadcast_sink/README.rst      |  2 +-
 .../pbp_public_broadcast_source/README.rst    |  2 +-
 samples/bluetooth/periodic_adv/README.rst     |  2 +-
 .../bluetooth/periodic_adv_conn/README.rst    |  2 +-
 samples/bluetooth/periodic_adv_rsp/README.rst |  2 +-
 samples/bluetooth/periodic_sync/README.rst    |  2 +-
 .../bluetooth/periodic_sync_conn/README.rst   |  2 +-
 .../bluetooth/periodic_sync_rsp/README.rst    |  2 +-
 samples/bluetooth/peripheral/README.rst       |  2 +-
 .../peripheral_accept_list/README.rst         |  2 +-
 samples/bluetooth/peripheral_csc/README.rst   |  2 +-
 samples/bluetooth/peripheral_dis/README.rst   |  2 +-
 samples/bluetooth/peripheral_esp/README.rst   |  2 +-
 .../peripheral_gatt_write/README.rst          |  2 +-
 samples/bluetooth/peripheral_hids/README.rst  |  2 +-
 samples/bluetooth/peripheral_hr/README.rst    |  2 +-
 samples/bluetooth/peripheral_ht/README.rst    |  2 +-
 .../bluetooth/peripheral_identity/README.rst  |  2 +-
 samples/bluetooth/peripheral_nus/README.rst   |  2 +-
 samples/bluetooth/peripheral_ots/README.rst   |  2 +-
 samples/bluetooth/peripheral_past/README.rst  |  2 +-
 .../bluetooth/peripheral_sc_only/README.rst   |  2 +-
 samples/bluetooth/scan_adv/README.rst         |  2 +-
 samples/bluetooth/st_ble_sensor/README.rst    |  2 +-
 samples/bluetooth/tmap_bmr/README.rst         |  2 +-
 samples/bluetooth/tmap_bms/README.rst         |  2 +-
 samples/bluetooth/tmap_central/README.rst     |  2 +-
 samples/bluetooth/tmap_peripheral/README.rst  |  2 +-
 samples/boards/96boards/argonkey/index.rst    | 13 ++----
 samples/boards/96boards/index.rst             | 13 ++----
 samples/boards/arc_secure_services/README.rst |  2 +
 samples/boards/bbc/index.rst                  | 14 ++-----
 samples/boards/bbc/microbit/microbit.rst      | 13 ++----
 samples/boards/boards.rst                     | 14 ++-----
 samples/boards/enjoydigital/index.rst         | 14 +++----
 .../boards/enjoydigital/litex/i2s/README.rst  |  2 +
 samples/boards/espressif/index.rst            | 13 ++----
 samples/boards/google/index.rst               | 14 +++----
 samples/boards/intel/index.rst                | 14 +++----
 samples/boards/microchip/index.rst            | 13 ++----
 .../mec15xxevb_assy6853.rst                   | 13 ++----
 samples/boards/nordic/index.rst               | 14 +++----
 .../boards/nordic/mesh/onoff-app/README.rst   |  2 +-
 .../onoff_level_lighting_vnd_app/README.rst   |  2 +-
 samples/boards/nxp/index.rst                  | 14 +++----
 samples/boards/phytec/index.rst               | 13 ++----
 samples/boards/phytec/reel_board/index.rst    |  5 +++
 .../phytec/reel_board/mesh_badge/README.rst   |  2 +-
 samples/boards/quicklogic/index.rst           | 13 ++----
 samples/boards/st/bluetooth/index.rst         |  5 +++
 samples/boards/st/index.rst                   | 14 +++----
 samples/boards/st/power_mgmt/index.rst        |  5 +++
 samples/boards/ti/index.rst                   | 14 +++----
 samples/classic.rst                           | 15 -------
 samples/cpp/cpp.rst                           | 13 ++----
 samples/drivers/adc/index.rst                 |  5 +++
 samples/drivers/audio/index.rst               |  5 +++
 samples/drivers/can/index.rst                 |  5 +++
 samples/drivers/counter/index.rst             |  5 +++
 samples/drivers/drivers.rst                   | 17 +++-----
 samples/drivers/ethernet/index.rst            |  5 +++
 samples/drivers/fpga/index.rst                |  5 +++
 samples/drivers/haptics/README.rst            |  5 +++
 samples/drivers/i2c/README.rst                |  5 +++
 samples/drivers/i2s/README.rst                |  5 +++
 samples/drivers/ipm/README.rst                |  5 +++
 samples/drivers/led/index.rst                 |  5 +++
 samples/drivers/lora/index.rst                |  6 +++
 samples/drivers/misc/README.rst               |  5 +++
 samples/drivers/mspi/index.rst                |  5 +++
 samples/drivers/uart/README.rst               |  5 +++
 samples/drivers/video/video.rst               | 13 ++----
 samples/drivers/virtualization/index.rst      |  6 +++
 samples/drivers/w1/README.rst                 |  5 +++
 samples/fuel_gauge/fuel_gauge.rst             | 13 ++----
 samples/fuel_gauge/max17048/README.rst        |  6 +--
 samples/index.rst                             | 42 +++++++------------
 .../condition_variables/simple/README.rst     |  2 +
 samples/kernel/index.rst                      | 14 +++----
 samples/modules/cmsis_dsp/cmsis_dsp.rst       | 16 +++----
 samples/modules/compression/compression.rst   | 13 ++----
 samples/modules/index.rst                     | 14 ++-----
 samples/modules/lvgl/lvgl.rst                 | 16 ++-----
 samples/modules/tflite-micro/tflite-micro.rst | 16 ++-----
 samples/modules/thrift/thrift.rst             | 14 ++-----
 samples/net/cloud/README.rst                  |  5 +++
 samples/net/net.rst                           | 14 +++----
 samples/net/openthread/coprocessor/README.rst |  2 +
 samples/net/sockets/sockets.rst               |  5 +++
 samples/posix/posix.rst                       | 13 ++----
 samples/sensor/sensor.rst                     | 13 ++----
 samples/shields/npm1300_ek/doc/index.rst      |  6 +--
 samples/shields/npm6001_ek/doc/index.rst      |  6 +--
 samples/shields/shields.rst                   | 14 +++----
 samples/shields/x_nucleo_iks01a2/README.rst   |  5 +++
 samples/shields/x_nucleo_iks01a3/README.rst   |  5 +++
 samples/shields/x_nucleo_iks02a1/README.rst   |  5 +++
 samples/shields/x_nucleo_iks4a1/README.rst    |  5 +++
 samples/subsys/bindesc/bindesc.rst            | 13 ++----
 samples/subsys/canbus/canbus.rst              |  7 ++++
 samples/subsys/console/console.rst            | 13 ++----
 samples/subsys/debug/index.rst                | 13 ++----
 samples/subsys/display/display.rst            | 13 ++----
 samples/subsys/fs/fs.rst                      | 13 ++----
 samples/subsys/input/input.rst                | 13 ++----
 samples/subsys/ipc/ipc.rst                    | 14 +++----
 samples/subsys/llext/llext.rst                | 13 ++----
 samples/subsys/logging/logging.rst            | 13 ++----
 samples/subsys/lorawan/lorawan.rst            | 13 ++----
 samples/subsys/mgmt/mcumgr/smp_svr/README.rst |  2 +
 samples/subsys/mgmt/mgmt.rst                  | 13 ++----
 samples/subsys/modbus/modbus.rst              | 13 ++----
 samples/subsys/portability/portability.rst    | 16 +++----
 samples/subsys/profiling/profiling.rst        | 13 ++----
 samples/subsys/sensing/sensing.rst            | 13 ++----
 samples/subsys/shell/shell.rst                | 13 ++----
 samples/subsys/smf/smf.rst                    | 13 ++----
 samples/subsys/subsys.rst                     | 14 ++-----
 samples/subsys/testsuite/testsuite.rst        | 14 ++-----
 samples/subsys/usb/usb.rst                    | 14 +++----
 samples/subsys/usb_c/usbc.rst                 | 13 ++----
 samples/subsys/zbus/zbus.rst                  | 13 ++----
 samples/sysbuild/sysbuild.rst                 | 13 ++----
 samples/sysbuild/with_mcuboot/README.rst      |  6 +--
 samples/tfm_integration/tfm_integration.rst   | 16 +++----
 samples/userspace/hello_world_user/README.rst |  6 +--
 samples/userspace/index.rst                   | 13 ++----
 samples/userspace/prod_consumer/README.rst    |  8 ++--
 samples/userspace/shared_mem/README.rst       |  6 +--
 samples/userspace/syscall_perf/README.rst     |  5 ++-
 210 files changed, 573 insertions(+), 766 deletions(-)
 create mode 100644 samples/boards/phytec/reel_board/index.rst
 create mode 100644 samples/boards/st/bluetooth/index.rst
 create mode 100644 samples/boards/st/power_mgmt/index.rst
 delete mode 100644 samples/classic.rst
 create mode 100644 samples/drivers/adc/index.rst
 create mode 100644 samples/drivers/audio/index.rst
 create mode 100644 samples/drivers/can/index.rst
 create mode 100644 samples/drivers/counter/index.rst
 create mode 100644 samples/drivers/ethernet/index.rst
 create mode 100644 samples/drivers/fpga/index.rst
 create mode 100644 samples/drivers/haptics/README.rst
 create mode 100644 samples/drivers/i2c/README.rst
 create mode 100644 samples/drivers/i2s/README.rst
 create mode 100644 samples/drivers/ipm/README.rst
 create mode 100644 samples/drivers/led/index.rst
 create mode 100644 samples/drivers/lora/index.rst
 create mode 100644 samples/drivers/misc/README.rst
 create mode 100644 samples/drivers/mspi/index.rst
 create mode 100644 samples/drivers/uart/README.rst
 create mode 100644 samples/drivers/virtualization/index.rst
 create mode 100644 samples/drivers/w1/README.rst
 create mode 100644 samples/net/cloud/README.rst
 create mode 100644 samples/net/sockets/sockets.rst
 create mode 100644 samples/shields/x_nucleo_iks01a2/README.rst
 create mode 100644 samples/shields/x_nucleo_iks01a3/README.rst
 create mode 100644 samples/shields/x_nucleo_iks02a1/README.rst
 create mode 100644 samples/shields/x_nucleo_iks4a1/README.rst

diff --git a/boards/adafruit/feather_m0_basic_proto/doc/index.rst b/boards/adafruit/feather_m0_basic_proto/doc/index.rst
index 04206783b15..a01fe241d59 100644
--- a/boards/adafruit/feather_m0_basic_proto/doc/index.rst
+++ b/boards/adafruit/feather_m0_basic_proto/doc/index.rst
@@ -96,7 +96,7 @@ USB Device Port
 ===============
 
 The SAMD21 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :ref:`usb-samples` sample applications for
+with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual
 serial port that echos characters back to the host PC.
 
diff --git a/boards/adafruit/feather_m0_lora/doc/index.rst b/boards/adafruit/feather_m0_lora/doc/index.rst
index b75f73d6fdc..92d63b36ce3 100644
--- a/boards/adafruit/feather_m0_lora/doc/index.rst
+++ b/boards/adafruit/feather_m0_lora/doc/index.rst
@@ -99,7 +99,7 @@ USB Device Port
 ===============
 
 The SAMD21 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :ref:`usb-samples` sample applications for
+with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual
 serial port that echos characters back to the host PC.
 
diff --git a/boards/adafruit/grand_central_m4_express/doc/index.rst b/boards/adafruit/grand_central_m4_express/doc/index.rst
index e9cf733843a..0244fa73f87 100644
--- a/boards/adafruit/grand_central_m4_express/doc/index.rst
+++ b/boards/adafruit/grand_central_m4_express/doc/index.rst
@@ -98,7 +98,7 @@ USB Device Port
 ===============
 
 The SAMD51 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :ref:`usb-samples` sample applications for
+with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual
 serial port that echos characters back to the host PC.
 
diff --git a/boards/adafruit/itsybitsy_m4_express/doc/index.rst b/boards/adafruit/itsybitsy_m4_express/doc/index.rst
index ce3efb89b1f..2ab1f7a5853 100644
--- a/boards/adafruit/itsybitsy_m4_express/doc/index.rst
+++ b/boards/adafruit/itsybitsy_m4_express/doc/index.rst
@@ -106,7 +106,7 @@ USB Device Port
 ===============
 
 The SAMD51 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :ref:`usb-samples` sample applications for
+with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual
 serial port that echos characters back to the host PC.
 
diff --git a/boards/adafruit/trinket_m0/doc/index.rst b/boards/adafruit/trinket_m0/doc/index.rst
index e02b829d7a0..4714f9d1aff 100644
--- a/boards/adafruit/trinket_m0/doc/index.rst
+++ b/boards/adafruit/trinket_m0/doc/index.rst
@@ -98,7 +98,7 @@ USB Device Port
 ===============
 
 The SAMD21 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :ref:`usb-samples` sample applications for
+with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual
 serial port that echos characters back to the host PC.
 
diff --git a/boards/arduino/mkrzero/doc/index.rst b/boards/arduino/mkrzero/doc/index.rst
index 2ea120d9313..b6f92d96930 100644
--- a/boards/arduino/mkrzero/doc/index.rst
+++ b/boards/arduino/mkrzero/doc/index.rst
@@ -111,7 +111,7 @@ USB Device Port
 ===============
 
 The SAMD21 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :ref:`usb-samples` sample applications for
+with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual
 serial port that echos characters back to the host PC.
 
diff --git a/boards/arduino/nano_33_iot/doc/index.rst b/boards/arduino/nano_33_iot/doc/index.rst
index e6a51198b92..419c02a5cea 100644
--- a/boards/arduino/nano_33_iot/doc/index.rst
+++ b/boards/arduino/nano_33_iot/doc/index.rst
@@ -102,7 +102,7 @@ USB Device Port
 ===============
 
 The SAMD21 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :ref:`usb-samples` sample applications for
+with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual
 serial port that echos characters back to the host PC.
 
diff --git a/boards/arduino/zero/doc/index.rst b/boards/arduino/zero/doc/index.rst
index 3ec0a0fd82a..9e665aa75cd 100644
--- a/boards/arduino/zero/doc/index.rst
+++ b/boards/arduino/zero/doc/index.rst
@@ -98,7 +98,7 @@ USB Device Port
 ===============
 
 The SAMD21 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :ref:`usb-samples` sample applications for
+with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual
 serial port that echos characters back to the host PC.
 
diff --git a/boards/espressif/esp32_devkitc_wroom/doc/index.rst b/boards/espressif/esp32_devkitc_wroom/doc/index.rst
index 68955f9c17c..4107dbf6cfe 100644
--- a/boards/espressif/esp32_devkitc_wroom/doc/index.rst
+++ b/boards/espressif/esp32_devkitc_wroom/doc/index.rst
@@ -54,7 +54,7 @@ Asymmetric Multiprocessing (AMP)
 ********************************
 
 ESP32-DevKitC-WROOM allows 2 different applications to be executed in ESP32 SoC. Due to its dual-core architecture, each core can be enabled to execute customized tasks in stand-alone mode
-and/or exchanging data over OpenAMP framework. See :ref:`ipc_samples` folder as code reference.
+and/or exchanging data over OpenAMP framework. See :zephyr:code-sample-category:`ipc` folder as code reference.
 
 Supported Features
 ==================
diff --git a/boards/espressif/esp32_devkitc_wrover/doc/index.rst b/boards/espressif/esp32_devkitc_wrover/doc/index.rst
index 81c75c598ca..79bb94f6b1a 100644
--- a/boards/espressif/esp32_devkitc_wrover/doc/index.rst
+++ b/boards/espressif/esp32_devkitc_wrover/doc/index.rst
@@ -54,7 +54,7 @@ Asymmetric Multiprocessing (AMP)
 ********************************
 
 ESP32-DevKitC-WROVER allows 2 different applications to be executed in ESP32 SoC. Due to its dual-core architecture, each core can be enabled to execute customized tasks in stand-alone mode
-and/or exchanging data over OpenAMP framework. See :ref:`ipc_samples` folder as code reference.
+and/or exchanging data over OpenAMP framework. See :zephyr:code-sample-category:`ipc` folder as code reference.
 
 Supported Features
 ==================
diff --git a/boards/espressif/esp32s3_devkitc/doc/index.rst b/boards/espressif/esp32s3_devkitc/doc/index.rst
index 984a714d0f7..cd49316dacd 100644
--- a/boards/espressif/esp32s3_devkitc/doc/index.rst
+++ b/boards/espressif/esp32s3_devkitc/doc/index.rst
@@ -76,7 +76,7 @@ Asymmetric Multiprocessing (AMP)
 
 ESP32S3-DevKitC allows 2 different applications to be executed in ESP32-S3 SoC. Due to its dual-core
 architecture, each core can be enabled to execute customized tasks in stand-alone mode
-and/or exchanging data over OpenAMP framework. See :ref:`ipc_samples` folder as code reference.
+and/or exchanging data over OpenAMP framework. See :zephyr:code-sample-category:`ipc` folder as code reference.
 
 For more information, check the datasheet at `ESP32-S3 Datasheet`_ or the technical reference
 manual at `ESP32-S3 Technical Reference Manual`_.
diff --git a/boards/espressif/esp32s3_devkitm/doc/index.rst b/boards/espressif/esp32s3_devkitm/doc/index.rst
index b1e79766ed9..04a3997abba 100644
--- a/boards/espressif/esp32s3_devkitm/doc/index.rst
+++ b/boards/espressif/esp32s3_devkitm/doc/index.rst
@@ -76,7 +76,7 @@ Asymmetric Multiprocessing (AMP)
 
 ESP32S3-DevKitM allows 2 different applications to be executed in ESP32-S3 SoC. Due to its dual-core
 architecture, each core can be enabled to execute customized tasks in stand-alone mode
-and/or exchanging data over OpenAMP framework. See :ref:`ipc_samples` folder as code reference.
+and/or exchanging data over OpenAMP framework. See :zephyr:code-sample-category:`ipc` folder as code reference.
 
 For more information, check the datasheet at `ESP32-S3 Datasheet`_ or the technical reference
 manual at `ESP32-S3 Technical Reference Manual`_.
diff --git a/boards/openisa/rv32m1_vega/doc/index.rst b/boards/openisa/rv32m1_vega/doc/index.rst
index 92d9e999752..a8ff0b6c4b8 100644
--- a/boards/openisa/rv32m1_vega/doc/index.rst
+++ b/boards/openisa/rv32m1_vega/doc/index.rst
@@ -578,7 +578,7 @@ toolchain and OpenOCD::
    You need to make sure this happens every time you use this board.
 
 Now let's compile the :zephyr:code-sample:`hello_world` application. (You can try
-others as well; see :ref:`samples-and-demos` for more.)
+others as well; see :zephyr:code-sample-category:`samples` for more.)
 
 .. We can't use zephyr-app-commands to provide build instructions
    due to the below mentioned linker issue.
diff --git a/boards/others/serpente/doc/index.rst b/boards/others/serpente/doc/index.rst
index c624c5ad062..e7140707d74 100644
--- a/boards/others/serpente/doc/index.rst
+++ b/boards/others/serpente/doc/index.rst
@@ -74,7 +74,7 @@ USB Device Port
 ===============
 
 The SAMD21 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :ref:`usb-samples` sample applications for
+with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which prints "Hello World!"
 to the host PC.
 
diff --git a/boards/seeed/seeeduino_xiao/doc/index.rst b/boards/seeed/seeeduino_xiao/doc/index.rst
index 8f3614918f6..48003fdb63c 100644
--- a/boards/seeed/seeeduino_xiao/doc/index.rst
+++ b/boards/seeed/seeeduino_xiao/doc/index.rst
@@ -98,7 +98,7 @@ USB Device Port
 ===============
 
 The SAMD21 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :ref:`usb-samples` sample applications for
+with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual
 serial port that echos characters back to the host PC.
 
diff --git a/boards/seeed/wio_terminal/doc/index.rst b/boards/seeed/wio_terminal/doc/index.rst
index 73cef0f3c5b..f640f11b445 100644
--- a/boards/seeed/wio_terminal/doc/index.rst
+++ b/boards/seeed/wio_terminal/doc/index.rst
@@ -121,7 +121,7 @@ USB Device Port
 ===============
 
 The SAMD51 MCU has a USB device port that can be used to communicate with a
-host PC.  See the :ref:`usb-samples` sample applications for more, such as the
+host PC.  See the :zephyr:code-sample-category:`usb` sample applications for more, such as the
 :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual serial port that echos
 characters back to the host PC.
 
diff --git a/boards/shields/npm1300_ek/doc/index.rst b/boards/shields/npm1300_ek/doc/index.rst
index f46a8cf47a0..816c31a5fff 100644
--- a/boards/shields/npm1300_ek/doc/index.rst
+++ b/boards/shields/npm1300_ek/doc/index.rst
@@ -22,7 +22,7 @@ Usage
 *****
 
 The shield can be used in any application by setting ``--shield npm1300_ek``
-when invoking ``west build``. You can check :ref:`npm1300_ek_sample` for a
+when invoking ``west build``. You can check :zephyr:code-sample:`npm1300_ek` for a
 comprehensive sample.
 
 References
diff --git a/boards/shields/npm6001_ek/doc/index.rst b/boards/shields/npm6001_ek/doc/index.rst
index bc982d7f436..32305cd5a8c 100644
--- a/boards/shields/npm6001_ek/doc/index.rst
+++ b/boards/shields/npm6001_ek/doc/index.rst
@@ -28,7 +28,7 @@ Usage
 *****
 
 The shield can be used in any application by setting ``--shield npm6001_ek``
-when invoking ``west build``. You can check :ref:`npm6001_ek_sample` for a
+when invoking ``west build``. You can check :zephyr:code-sample:`npm6001_ek` for a
 comprehensive sample.
 
 References
diff --git a/boards/snps/hsdk/doc/index.rst b/boards/snps/hsdk/doc/index.rst
index a7165a27658..b79ecbca968 100644
--- a/boards/snps/hsdk/doc/index.rst
+++ b/boards/snps/hsdk/doc/index.rst
@@ -387,9 +387,9 @@ Set up Zephyr Software
 Building Sample Applications
 ==============================
 
-You can try many of the :ref:`sample applications and demos
-<samples-and-demos>`.  We'll use :zephyr:code-sample:`hello_world`, found in
-:zephyr_file:`samples/hello_world` as an example.
+You can try many of the :zephyr:code-sample-category:`sample applications and demos <samples>`.
+We'll use :zephyr:code-sample:`hello_world`, found in :zephyr_file:`samples/hello_world` as an
+example.
 
 Configuring
 -----------
diff --git a/boards/snps/hsdk4xd/doc/index.rst b/boards/snps/hsdk4xd/doc/index.rst
index a5cfd534c00..04b30bcaf9b 100644
--- a/boards/snps/hsdk4xd/doc/index.rst
+++ b/boards/snps/hsdk4xd/doc/index.rst
@@ -384,9 +384,8 @@ Set up Zephyr Software
 Building Sample Applications
 ==============================
 
-You can try many of the :ref:`sample applications and demos
-<samples-and-demos>`.  We'll use :zephyr:code-sample:`hello_world`, found in
-:zephyr_file:`samples/hello_world` as an example.
+You can try many of the :zephyr:code-sample-category:`sample applications and demos <samples>`.
+We'll use :zephyr:code-sample:`hello_world`, found in :zephyr_file:`samples/hello_world` as an example.
 
 Configuring
 -----------
diff --git a/boards/waveshare/esp32s3_touch_lcd_1_28/doc/index.rst b/boards/waveshare/esp32s3_touch_lcd_1_28/doc/index.rst
index 2d56d559b96..b80884a2e96 100644
--- a/boards/waveshare/esp32s3_touch_lcd_1_28/doc/index.rst
+++ b/boards/waveshare/esp32s3_touch_lcd_1_28/doc/index.rst
@@ -52,7 +52,7 @@ Asymmetric Multiprocessing (AMP)
 
 ESP32-S3 allows 2 different applications to be executed in ESP32-S3 SoC. Due to its dual-core
 architecture, each core can be enabled to execute customized tasks in stand-alone mode
-and/or exchanging data over OpenAMP framework. See :ref:`ipc_samples` folder as code reference.
+and/or exchanging data over OpenAMP framework. See :zephyr:code-sample-category:`ipc` folder as code reference.
 
 For more information, check the datasheet at `ESP32-S3 Datasheet`_ or the technical reference
 manual at `ESP32-S3 Technical Reference Manual`_.
diff --git a/doc/connectivity/bluetooth/bluetooth-arch.rst b/doc/connectivity/bluetooth/bluetooth-arch.rst
index c442412d2f4..04fcf365888 100644
--- a/doc/connectivity/bluetooth/bluetooth-arch.rst
+++ b/doc/connectivity/bluetooth/bluetooth-arch.rst
@@ -197,7 +197,7 @@ The stack is split up as follows in the source tree:
   have their own drivers.
 
 ``samples/bluetooth/``
-  :ref:`Sample Bluetooth code <bluetooth-samples>`. This is a good reference to
+  :zephyr:code-sample-category:`Sample Bluetooth code <bluetooth>`. This is a good reference to
   get started with Bluetooth application development.
 
 ``tests/bluetooth/``
diff --git a/doc/connectivity/bluetooth/bluetooth-dev.rst b/doc/connectivity/bluetooth/bluetooth-dev.rst
index 05a7a672922..afefaf45a7e 100644
--- a/doc/connectivity/bluetooth/bluetooth-dev.rst
+++ b/doc/connectivity/bluetooth/bluetooth-dev.rst
@@ -189,7 +189,7 @@ and scan response data.
 More Examples
 *************
 
-More :ref:`sample Bluetooth applications <bluetooth-samples>` are available in
+More :zephyr:code-sample-category:`sample Bluetooth applications <bluetooth>` are available in
 ``samples/bluetooth/``.
 
 .. _BabbleSim: https://babblesim.github.io/
diff --git a/doc/connectivity/usb/device/usb_device.rst b/doc/connectivity/usb/device/usb_device.rst
index fac90690727..30ee886ea8c 100644
--- a/doc/connectivity/usb/device/usb_device.rst
+++ b/doc/connectivity/usb/device/usb_device.rst
@@ -565,7 +565,7 @@ The USB Vendor ID for the Zephyr project is ``0x2FE3``.
 This USB Vendor ID must not be used when a vendor
 integrates Zephyr USB device support into its own product.
 
-Each USB :ref:`sample<usb-samples>` has its own unique Product ID.
+Each USB :zephyr:code-sample-category:`sample<usb>` has its own unique Product ID.
 The USB maintainer, if one is assigned, or otherwise the Zephyr Technical
 Steering Committee, may allocate other USB Product IDs based on well-motivated
 and documented requests.
diff --git a/doc/connectivity/usb/pd/ucds.rst b/doc/connectivity/usb/pd/ucds.rst
index 609e3dfed2d..39b6a6030d9 100644
--- a/doc/connectivity/usb/pd/ucds.rst
+++ b/doc/connectivity/usb/pd/ucds.rst
@@ -17,7 +17,7 @@ It provides the following functionalities:
 Currently the device stack supports implementation of Sink only and Source only
 devices. Dual Role Power (DRP) devices are not yet supported.
 
-:ref:`List<usbc-samples>` of samples for different purposes.
+:zephyr:code-sample-category:`List<usbc>` of samples for different purposes.
 
 Implementing a Sink Type-C and Power Delivery USB-C device
 **********************************************************
diff --git a/doc/develop/application/index.rst b/doc/develop/application/index.rst
index bcad2900b88..6bf3620adfd 100644
--- a/doc/develop/application/index.rst
+++ b/doc/develop/application/index.rst
@@ -303,7 +303,7 @@ Creating an Application by Hand
 
 You can follow these steps to create a basic application directory from
 scratch. However, using the `example-application`_ repository or one of
-Zephyr's :ref:`samples-and-demos` as a starting point is likely to be easier.
+Zephyr's :zephyr:code-sample-category:`samples` as a starting point is likely to be easier.
 
 #. Create an application directory.
 
@@ -643,7 +643,7 @@ assignment:
 
    CONFIG_CPP=y
 
-Looking at :ref:`existing samples <samples-and-demos>` is a good way to get
+Looking at :zephyr:code-sample-category:`existing samples <samples>` is a good way to get
 started.
 
 See :ref:`setting_configuration_values` for detailed documentation on setting
diff --git a/doc/develop/beyond-GSG.rst b/doc/develop/beyond-GSG.rst
index 42f1f6c5f38..ab0a1aba84f 100644
--- a/doc/develop/beyond-GSG.rst
+++ b/doc/develop/beyond-GSG.rst
@@ -213,7 +213,7 @@ format. Other binary formats, disassembly, and map files may be present
 depending on your board.
 
 The other sample applications in the :zephyr_file:`samples` folder are
-documented in :ref:`samples-and-demos`.
+documented in :zephyr:code-sample-category:`samples`.
 
 .. note:: If you want to reuse an
    existing build directory for another board or application, you need to
diff --git a/doc/develop/getting_started/index.rst b/doc/develop/getting_started/index.rst
index 34f21e427cd..3cb87da9ec6 100644
--- a/doc/develop/getting_started/index.rst
+++ b/doc/develop/getting_started/index.rst
@@ -478,7 +478,7 @@ Next Steps
 
 Here are some next steps for exploring Zephyr:
 
-* Try other :ref:`samples-and-demos`
+* Try other :zephyr:code-sample-category:`samples`
 * Learn about :ref:`application` and the :ref:`west <west>` tool
 * Find out about west's :ref:`flashing and debugging <west-build-flash-debug>`
   features, or more about :ref:`flashing_and_debugging` in general
diff --git a/doc/releases/release-notes-1.7.rst b/doc/releases/release-notes-1.7.rst
index 8f4bce1a77e..e13dfdfd582 100644
--- a/doc/releases/release-notes-1.7.rst
+++ b/doc/releases/release-notes-1.7.rst
@@ -147,7 +147,7 @@ Documentation
 * Site-wide glossary added.
 * Porting guides added.
 * Sample README files converted to documents included in the website.
-* Improved consistency of :ref:`boards` and :ref:`samples-and-demos`.
+* Improved consistency of :ref:`boards` and :zephyr:code-sample-category:`samples`.
 
 
 JIRA Related Items
diff --git a/doc/services/device_mgmt/ota.rst b/doc/services/device_mgmt/ota.rst
index a61e1c7f545..4548ce8b028 100644
--- a/doc/services/device_mgmt/ota.rst
+++ b/doc/services/device_mgmt/ota.rst
@@ -45,7 +45,7 @@ is downloaded and installed. MCUboot can be used to verify the signature before
 upgrading the firmware.
 
 There is a :zephyr:code-sample:`hawkbit-api` sample included in the
-Zephyr :ref:`mgmt-samples` section.
+Zephyr :zephyr:code-sample-category:`mgmt` section.
 
 UpdateHub
 =========
@@ -56,7 +56,7 @@ the binary is downloaded and installed. MCUboot can be used to verify the
 signature before upgrading the firmware.
 
 There is an :zephyr:code-sample:`updatehub-fota` sample included in the Zephyr
-:ref:`mgmt-samples` section.
+:zephyr:code-sample-category:`mgmt` section.
 
 SMP Server
 ==========
@@ -66,8 +66,8 @@ Bluetooth Low Energy (BLE) or UDP. :ref:`mcu_mgr` is used to send a signed
 firmware binary to the remote device where it is verified by MCUboot before the
 upgrade occurs.
 
-There is an :zephyr:code-sample:`smp-svr` sample included in the Zephyr :ref:`mgmt-samples`
-section.
+There is an :zephyr:code-sample:`smp-svr` sample included in the Zephyr
+:zephyr:code-sample-category:`mgmt` section.
 
 Lightweight M2M (LWM2M)
 =======================
diff --git a/doc/services/portability/posix/overview/index.rst b/doc/services/portability/posix/overview/index.rst
index 6c352cf2454..c0ab06b6e8a 100644
--- a/doc/services/portability/posix/overview/index.rst
+++ b/doc/services/portability/posix/overview/index.rst
@@ -113,7 +113,8 @@ leverages the ``nanosleep()`` and ``perror()`` POSIX functions.
         return 0;
     }
 
-For more examples of POSIX applications, please see the :ref:`POSIX sample applications<posix-samples>`.
+For more examples of POSIX applications, please see the
+:zephyr:code-sample-category:`POSIX sample applications<posix>`.
 
 .. _posix_config:
 
diff --git a/samples/application_development/application_development.rst b/samples/application_development/application_development.rst
index f467600d235..9a7d9b2975a 100644
--- a/samples/application_development/application_development.rst
+++ b/samples/application_development/application_development.rst
@@ -1,16 +1,11 @@
-.. _application-development-samples:
+.. zephyr:code-sample-category:: application_development
+   :name: Application Development
+   :show-listing:
 
-Application development samples
-###############################
+   These samples illustrate some useful application development patterns and techniques.
 
 For application development you should also consider looking at
 `example-application`_. Among others, you will find on it out of tree driver
 or board examples.
 
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
-
 .. _example-application: https://github.com/zephyrproject-rtos/example-application
diff --git a/samples/arch/index.rst b/samples/arch/index.rst
index a43bda20d80..fbc2871be9c 100644
--- a/samples/arch/index.rst
+++ b/samples/arch/index.rst
@@ -1,10 +1,5 @@
-.. _arch-samples:
+.. zephyr:code-sample-category:: arch
+   :name: Architecture-dependent Samples
+   :show-listing:
 
-Architecture Dependent Samples
-##############################
-
-.. toctree::
-   :maxdepth: 2
-   :glob:
-
-   */*
+   Samples that demonstrate some architecture-specific features.
diff --git a/samples/arch/mpu/index.rst b/samples/arch/mpu/index.rst
index 64016b946ad..b1161af69b6 100644
--- a/samples/arch/mpu/index.rst
+++ b/samples/arch/mpu/index.rst
@@ -1,10 +1,6 @@
-.. _mmu_mpu-samples:
+.. zephyr:code-sample-category:: mmu_mpu
+   :name: MMU/MPU
+   :show-listing:
 
-MMU/MPU Samples
-###############
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate the Memory Management Unit (MMU) and Memory Protection Unit (MPU)
+   features.
diff --git a/samples/arch/smp/index.rst b/samples/arch/smp/index.rst
index 64c4660aaed..fe1ed4490a2 100644
--- a/samples/arch/smp/index.rst
+++ b/samples/arch/smp/index.rst
@@ -1,10 +1,5 @@
-.. _smp-samples:
+.. zephyr:code-sample-category:: smp
+   :name: Symmetric Multiprocessing (SMP)
+   :show-listing:
 
-Various SMP Samples
-###################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate the use of :ref:`Symmetric Multiprocessing <smp_arch>`.
diff --git a/samples/basic/basic.rst b/samples/basic/basic.rst
index d40b04527ac..7985892834c 100644
--- a/samples/basic/basic.rst
+++ b/samples/basic/basic.rst
@@ -1,10 +1,5 @@
-.. _basic-sample:
+.. zephyr:code-sample-category:: basic
+   :name: Basic
+   :show-listing:
 
-Basic Samples
-#############
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   These samples demonstrate basic functionality of the Zephyr kernel.
diff --git a/samples/bluetooth/bap_broadcast_assistant/README.rst b/samples/bluetooth/bap_broadcast_assistant/README.rst
index 011631d6120..f8ba3fb582b 100644
--- a/samples/bluetooth/bap_broadcast_assistant/README.rst
+++ b/samples/bluetooth/bap_broadcast_assistant/README.rst
@@ -21,7 +21,7 @@ Source sample).
 This sample can be found under
 :zephyr_file:`samples/bluetooth/bap_broadcast_assistant` in the Zephyr tree.
 
-Check the :ref:`bluetooth samples section <bluetooth-samples>` for general information.
+Check the :zephyr:code-sample-category:`bluetooth` samples for general information.
 
 Requirements
 ************
diff --git a/samples/bluetooth/bap_broadcast_sink/README.rst b/samples/bluetooth/bap_broadcast_sink/README.rst
index efbb69e3810..52bb8208ef2 100644
--- a/samples/bluetooth/bap_broadcast_sink/README.rst
+++ b/samples/bluetooth/bap_broadcast_sink/README.rst
@@ -14,7 +14,7 @@ the first found and listens to it until the source is (potentially) stopped.
 This sample can be found under
 :zephyr_file:`samples/bluetooth/bap_broadcast_sink` in the Zephyr tree.
 
-Check the :ref:`bluetooth samples section <bluetooth-samples>` for general information.
+Check the :zephyr:code-sample-category:`bluetooth` samples for general information.
 
 Use :kconfig:option:`CONFIG_TARGET_BROADCAST_NAME` Kconfig to specify the name
 (:kconfig:option:`CONFIG_BT_DEVICE_NAME`) of a broadcast source to listen to. With default value
diff --git a/samples/bluetooth/bap_broadcast_source/README.rst b/samples/bluetooth/bap_broadcast_source/README.rst
index 1baf971623b..f0dadc990c1 100644
--- a/samples/bluetooth/bap_broadcast_source/README.rst
+++ b/samples/bluetooth/bap_broadcast_source/README.rst
@@ -17,7 +17,7 @@ The broadcast source will reset every 30 seconds to show the full API.
 This sample can be found under
 :zephyr_file:`samples/bluetooth/bap_broadcast_source` in the Zephyr tree.
 
-Check the :ref:`bluetooth samples section <bluetooth-samples>` for general information.
+Check the :zephyr:code-sample-category:`bluetooth` samples for general information.
 
 Requirements
 ************
diff --git a/samples/bluetooth/bap_unicast_client/README.rst b/samples/bluetooth/bap_unicast_client/README.rst
index b99826f5fa0..b70667582d3 100644
--- a/samples/bluetooth/bap_unicast_client/README.rst
+++ b/samples/bluetooth/bap_unicast_client/README.rst
@@ -13,7 +13,7 @@ connects to a LE Audio unicast server and establishes an audio stream.
 This sample can be found under
 :zephyr_file:`samples/bluetooth/bap_unicast_client` in the Zephyr tree.
 
-Check the :ref:`bluetooth samples section <bluetooth-samples>` for general information.
+Check the :zephyr:code-sample-category:`bluetooth` samples for general information.
 
 Requirements
 ************
diff --git a/samples/bluetooth/bap_unicast_server/README.rst b/samples/bluetooth/bap_unicast_server/README.rst
index b24c6385443..f0b2de5e971 100644
--- a/samples/bluetooth/bap_unicast_server/README.rst
+++ b/samples/bluetooth/bap_unicast_server/README.rst
@@ -13,7 +13,7 @@ Starts advertising and awaits connection from a LE Audio unicast client.
 This sample can be found under
 :zephyr_file:`samples/bluetooth/bap_unicast_server` in the Zephyr tree.
 
-Check the :ref:`bluetooth samples section <bluetooth-samples>` for general information.
+Check the :zephyr:code-sample-category:`bluetooth` samples for general information.
 
 Requirements
 ************
diff --git a/samples/bluetooth/beacon/README.rst b/samples/bluetooth/beacon/README.rst
index 06e8d7e765a..20270aa23c7 100644
--- a/samples/bluetooth/beacon/README.rst
+++ b/samples/bluetooth/beacon/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/beacon` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/bluetooth.rst b/samples/bluetooth/bluetooth.rst
index 1c3d4d18d81..0c3b7a21f2f 100644
--- a/samples/bluetooth/bluetooth.rst
+++ b/samples/bluetooth/bluetooth.rst
@@ -1,7 +1,7 @@
-.. _bluetooth-samples:
+.. zephyr:code-sample-category:: bluetooth
+   :name: Bluetooth
 
-Bluetooth samples
-#################
+   These samples demonstrate the use of Bluetooth in Zephyr.
 
 To build any of the Bluetooth samples, follow the same steps as building
 any other Zephyr application. Refer to :ref:`bluetooth-dev` for more information.
@@ -29,8 +29,6 @@ documentation and are prefixed with :literal:`hci_` in their folder names.
    connections will fail. You can force a re-paring and new key to be created
    by removing the device from the associated devices list on the host.
 
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+.. zephyr:code-sample-listing::
+   :categories: bluetooth
+   :live-search:
diff --git a/samples/bluetooth/broadcaster/README.rst b/samples/bluetooth/broadcaster/README.rst
index 72e395d347a..60b47956e21 100644
--- a/samples/bluetooth/broadcaster/README.rst
+++ b/samples/bluetooth/broadcaster/README.rst
@@ -25,4 +25,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/broadcaster` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/broadcaster_multiple/README.rst b/samples/bluetooth/broadcaster_multiple/README.rst
index 5170cf9dbff..c99595b12fc 100644
--- a/samples/bluetooth/broadcaster_multiple/README.rst
+++ b/samples/bluetooth/broadcaster_multiple/README.rst
@@ -34,4 +34,4 @@ To test this sample use the Observer sample with Extended Scanning enabled,
 found under
 :zephyr_file:`samples/bluetooth/observer` in the Zephyr tree.
 
-See :ref:`Bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`Bluetooth samples section <bluetooth>` for details.
diff --git a/samples/bluetooth/bthome_sensor_template/README.rst b/samples/bluetooth/bthome_sensor_template/README.rst
index 94f438bd0fa..809dc282e90 100644
--- a/samples/bluetooth/bthome_sensor_template/README.rst
+++ b/samples/bluetooth/bthome_sensor_template/README.rst
@@ -20,7 +20,7 @@ Building and Running
 
 This sample can be found under :zephyr_file:`samples/bluetooth/bthome_sensor_template` in the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
 
 When the sample is running, navigate to Devices & Services under settings in Home
 Assistant. There you will be asked to configure the BTHome sensor if everything
diff --git a/samples/bluetooth/cap_acceptor/README.rst b/samples/bluetooth/cap_acceptor/README.rst
index 0a9854616f1..60c70e69bb2 100644
--- a/samples/bluetooth/cap_acceptor/README.rst
+++ b/samples/bluetooth/cap_acceptor/README.rst
@@ -12,7 +12,7 @@ Starts by advertising for a CAP Initiator to connect and set up available stream
 
 This sample can be found under :zephyr_file:`samples/bluetooth/cap_acceptor` in the Zephyr tree.
 
-Check the :ref:`bluetooth samples section <bluetooth-samples>` for general information.
+Check the :zephyr:code-sample-category:`bluetooth` samples for general information.
 
 Requirements
 ************
diff --git a/samples/bluetooth/cap_initiator/README.rst b/samples/bluetooth/cap_initiator/README.rst
index b3c84ff9dec..36c1631f1bf 100644
--- a/samples/bluetooth/cap_initiator/README.rst
+++ b/samples/bluetooth/cap_initiator/README.rst
@@ -13,7 +13,7 @@ audio streams, sets up a broadcast audio stream, or both.
 
 This sample can be found under :zephyr_file:`samples/bluetooth/cap_initiator` in the Zephyr tree.
 
-Check the :ref:`bluetooth samples section <bluetooth-samples>` for general information.
+Check the :zephyr:code-sample-category:`bluetooth` samples for general information.
 
 Requirements
 ************
diff --git a/samples/bluetooth/central/README.rst b/samples/bluetooth/central/README.rst
index ceb9710bdd4..0a47dd07b5c 100644
--- a/samples/bluetooth/central/README.rst
+++ b/samples/bluetooth/central/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/central` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/central_gatt_write/README.rst b/samples/bluetooth/central_gatt_write/README.rst
index 37ac2da26d8..0190374b994 100644
--- a/samples/bluetooth/central_gatt_write/README.rst
+++ b/samples/bluetooth/central_gatt_write/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/central_gatt_write`
 in the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/central_hr/README.rst b/samples/bluetooth/central_hr/README.rst
index af3d1be3e12..8d3e1b88a3c 100644
--- a/samples/bluetooth/central_hr/README.rst
+++ b/samples/bluetooth/central_hr/README.rst
@@ -23,4 +23,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/central_hr` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/central_ht/README.rst b/samples/bluetooth/central_ht/README.rst
index 8c81e5aa80c..e0a58a7ea25 100644
--- a/samples/bluetooth/central_ht/README.rst
+++ b/samples/bluetooth/central_ht/README.rst
@@ -23,4 +23,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/central_ht` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/central_multilink/README.rst b/samples/bluetooth/central_multilink/README.rst
index dcabb8785fc..61d64d79806 100644
--- a/samples/bluetooth/central_multilink/README.rst
+++ b/samples/bluetooth/central_multilink/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/central_multilink`
 in the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/central_otc/README.rst b/samples/bluetooth/central_otc/README.rst
index 18b4443c949..67b75f21aa6 100644
--- a/samples/bluetooth/central_otc/README.rst
+++ b/samples/bluetooth/central_otc/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/central_otc` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/central_past/README.rst b/samples/bluetooth/central_past/README.rst
index a39b1a3370c..a6b15fbf5c6 100644
--- a/samples/bluetooth/central_past/README.rst
+++ b/samples/bluetooth/central_past/README.rst
@@ -29,4 +29,4 @@ Use the sample found under :zephyr_file:`samples/bluetooth/peripheral_past` in
 the Zephyr tree on another board that will advertise and await a periodic
 advertising sync transfer.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/direct_adv/README.rst b/samples/bluetooth/direct_adv/README.rst
index adc3a14ccab..65191c1636a 100644
--- a/samples/bluetooth/direct_adv/README.rst
+++ b/samples/bluetooth/direct_adv/README.rst
@@ -30,4 +30,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/direct_adv` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/eddystone/README.rst b/samples/bluetooth/eddystone/README.rst
index d39c4cfdebb..1e1a555a689 100644
--- a/samples/bluetooth/eddystone/README.rst
+++ b/samples/bluetooth/eddystone/README.rst
@@ -26,6 +26,6 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/eddystone` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
 
 .. _Eddystone Configuration Service: https://github.com/google/eddystone/tree/master/configuration-service
diff --git a/samples/bluetooth/encrypted_advertising/README.rst b/samples/bluetooth/encrypted_advertising/README.rst
index b62a479fcca..d55017f35ce 100644
--- a/samples/bluetooth/encrypted_advertising/README.rst
+++ b/samples/bluetooth/encrypted_advertising/README.rst
@@ -35,7 +35,7 @@ Building and Running
 This sample can be found under
 :zephyr_file:`samples/bluetooth/encrypted_advertising` in the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
 
 This sample uses two applications, so two devices need to be setup.
 Flash one device with the central application, and another device with the
diff --git a/samples/bluetooth/extended_adv/README.rst b/samples/bluetooth/extended_adv/README.rst
index b7901fd8e6b..f05fe6e2f64 100644
--- a/samples/bluetooth/extended_adv/README.rst
+++ b/samples/bluetooth/extended_adv/README.rst
@@ -34,7 +34,7 @@ Building and Running
 This sample can be found under
 :zephyr_file:`samples/bluetooth/extended_adv` in the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
 
 This sample uses two applications, so two devices need to be setup.
 Flash one device with the scanner application, and another device with the
diff --git a/samples/bluetooth/handsfree/README.rst b/samples/bluetooth/handsfree/README.rst
index 609139ef04a..2df63ba2ee1 100644
--- a/samples/bluetooth/handsfree/README.rst
+++ b/samples/bluetooth/handsfree/README.rst
@@ -21,4 +21,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/handsfree` in
 the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/handsfree_ag/README.rst b/samples/bluetooth/handsfree_ag/README.rst
index 21c190ab360..e28d80433b0 100644
--- a/samples/bluetooth/handsfree_ag/README.rst
+++ b/samples/bluetooth/handsfree_ag/README.rst
@@ -21,4 +21,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/handsfree_ag` in
 the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/hap_ha/README.rst b/samples/bluetooth/hap_ha/README.rst
index 945ceaa5ef5..9960c02d3de 100644
--- a/samples/bluetooth/hap_ha/README.rst
+++ b/samples/bluetooth/hap_ha/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under
 :zephyr_file:`samples/bluetooth/hap_ha` in the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/hci_ipc/README.rst b/samples/bluetooth/hci_ipc/README.rst
index be2634ba5c1..8f01d3f0619 100644
--- a/samples/bluetooth/hci_ipc/README.rst
+++ b/samples/bluetooth/hci_ipc/README.rst
@@ -37,4 +37,4 @@ You might need to adjust the Kconfig configuration of this sample to make it
 compatible with the peer application. For example, :kconfig:option:`CONFIG_BT_MAX_CONN`
 must be equal to the maximum number of connections supported by the peer application.
 
-Refer to :ref:`bluetooth-samples` for general information about Bluetooth samples.
+Refer to :zephyr:code-sample-category:`bluetooth` for general information about Bluetooth samples.
diff --git a/samples/bluetooth/hci_pwr_ctrl/README.rst b/samples/bluetooth/hci_pwr_ctrl/README.rst
index b902b07534e..00d89d06738 100644
--- a/samples/bluetooth/hci_pwr_ctrl/README.rst
+++ b/samples/bluetooth/hci_pwr_ctrl/README.rst
@@ -35,4 +35,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/hci_pwr_ctrl`
 in the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/hci_spi/README.rst b/samples/bluetooth/hci_spi/README.rst
index 70c6e465a86..1276889e6a5 100644
--- a/samples/bluetooth/hci_spi/README.rst
+++ b/samples/bluetooth/hci_spi/README.rst
@@ -36,6 +36,6 @@ application is compatible with the HCI SPI master driver provided by
 Zephyr's Bluetooth HCI driver core; see the help associated with the
 :kconfig:option:`CONFIG_BT_SPI` configuration option for more information.
 
-Refer to :ref:`bluetooth-samples` for general Bluetooth information, and
+Refer to :zephyr:code-sample-category:`bluetooth` for general Bluetooth information, and
 to :ref:`96b_carbon_nrf51_bluetooth` for instructions specific to the
 96Boards Carbon board.
diff --git a/samples/bluetooth/hci_usb/README.rst b/samples/bluetooth/hci_usb/README.rst
index 3d88357513a..c8ac294a72f 100644
--- a/samples/bluetooth/hci_usb/README.rst
+++ b/samples/bluetooth/hci_usb/README.rst
@@ -21,4 +21,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/hci_usb` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/hci_usb_h4/README.rst b/samples/bluetooth/hci_usb_h4/README.rst
index 8126c2adf9a..dbce1c85cb1 100644
--- a/samples/bluetooth/hci_usb_h4/README.rst
+++ b/samples/bluetooth/hci_usb_h4/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/hci_usb_h4` in
 the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/hci_vs_scan_req/README.rst b/samples/bluetooth/hci_vs_scan_req/README.rst
index 9c4d3281dc8..a1d3fbd1428 100644
--- a/samples/bluetooth/hci_vs_scan_req/README.rst
+++ b/samples/bluetooth/hci_vs_scan_req/README.rst
@@ -28,4 +28,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/hci_vs_scan_req`
 in the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/ibeacon/README.rst b/samples/bluetooth/ibeacon/README.rst
index 38ba89f8f70..9cc00f418f1 100644
--- a/samples/bluetooth/ibeacon/README.rst
+++ b/samples/bluetooth/ibeacon/README.rst
@@ -29,7 +29,7 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/ibeacon` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details on how
+See :zephyr:code-sample-category:`bluetooth` samples for details on how
 to run the sample inside QEMU.
 
 For other boards, build and flash the application as follows:
diff --git a/samples/bluetooth/iso_broadcast/README.rst b/samples/bluetooth/iso_broadcast/README.rst
index a27f302247f..79eae0e3a7d 100644
--- a/samples/bluetooth/iso_broadcast/README.rst
+++ b/samples/bluetooth/iso_broadcast/README.rst
@@ -29,4 +29,4 @@ Use the sample found under :zephyr_file:`samples/bluetooth/iso_receive` in the
 Zephyr tree that will scan, establish a periodic advertising synchronization,
 generate BIGInfo reports and synchronize to BIG events from this sample.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/iso_broadcast_benchmark/README.rst b/samples/bluetooth/iso_broadcast_benchmark/README.rst
index cd371c3e11f..bba796a6b46 100644
--- a/samples/bluetooth/iso_broadcast_benchmark/README.rst
+++ b/samples/bluetooth/iso_broadcast_benchmark/README.rst
@@ -33,7 +33,7 @@ Building and running
 This sample can be found under
 :zephyr_file:`samples/bluetooth/iso_broadcast_benchmark` in the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
 
 
 Testing
diff --git a/samples/bluetooth/iso_central/README.rst b/samples/bluetooth/iso_central/README.rst
index 1169425afd4..c3739340705 100644
--- a/samples/bluetooth/iso_central/README.rst
+++ b/samples/bluetooth/iso_central/README.rst
@@ -44,4 +44,4 @@ the Zephyr tree.
 
       ISO Channel 0x200048f8 connected
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for more details.
+See :zephyr:code-sample-category:`bluetooth` samples for more details.
diff --git a/samples/bluetooth/iso_connected_benchmark/README.rst b/samples/bluetooth/iso_connected_benchmark/README.rst
index c4c30f73263..bf489e94306 100644
--- a/samples/bluetooth/iso_connected_benchmark/README.rst
+++ b/samples/bluetooth/iso_connected_benchmark/README.rst
@@ -32,7 +32,7 @@ Building and running
 This sample can be found under
 :zephyr_file:`samples/bluetooth/iso_connected_benchmark` in the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
 
 
 Testing
diff --git a/samples/bluetooth/iso_peripheral/README.rst b/samples/bluetooth/iso_peripheral/README.rst
index f9f0d874add..4ad55953ebb 100644
--- a/samples/bluetooth/iso_peripheral/README.rst
+++ b/samples/bluetooth/iso_peripheral/README.rst
@@ -64,4 +64,4 @@ This sample can be found under :zephyr_file:`samples/bluetooth/iso_peripheral` i
       Incoming data channel 0x20000698 len 12
                000102...090a0b
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for more details.
+See :zephyr:code-sample-category:`bluetooth` samples for more details.
diff --git a/samples/bluetooth/iso_receive/README.rst b/samples/bluetooth/iso_receive/README.rst
index 85201981c7f..cbd33a20610 100644
--- a/samples/bluetooth/iso_receive/README.rst
+++ b/samples/bluetooth/iso_receive/README.rst
@@ -30,4 +30,4 @@ another board that will start periodic advertising, create BIG to which this
 sample will establish periodic advertising synchronization and synchronize to
 the Broadcast Isochronous Stream.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/mesh/README.rst b/samples/bluetooth/mesh/README.rst
index 99514c9e606..f566c071ad2 100644
--- a/samples/bluetooth/mesh/README.rst
+++ b/samples/bluetooth/mesh/README.rst
@@ -31,7 +31,7 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/mesh` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details on how
+See :zephyr:code-sample-category:`bluetooth` samples for details on how
 to run the sample inside QEMU.
 
 For other boards, build and flash the application as follows:
diff --git a/samples/bluetooth/mesh_demo/README.rst b/samples/bluetooth/mesh_demo/README.rst
index a46f39f49cd..070dd5a45a4 100644
--- a/samples/bluetooth/mesh_demo/README.rst
+++ b/samples/bluetooth/mesh_demo/README.rst
@@ -42,7 +42,7 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/mesh_demo` in
 the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details on how
+See :zephyr:code-sample-category:`bluetooth` samples for details on how
 to run the sample inside QEMU.
 
 For other boards, build and flash the application as follows:
diff --git a/samples/bluetooth/mesh_provisioner/README.rst b/samples/bluetooth/mesh_provisioner/README.rst
index b6f1364b280..10600ef89f3 100644
--- a/samples/bluetooth/mesh_provisioner/README.rst
+++ b/samples/bluetooth/mesh_provisioner/README.rst
@@ -40,7 +40,7 @@ Building and Running
 This sample can be found under
 :zephyr_file:`samples/bluetooth/mesh_provisioner` in the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details on
+See :zephyr:code-sample-category:`bluetooth` samples for details on
 how to run the sample inside QEMU.
 
 For other boards, build and flash the application as follows:
diff --git a/samples/bluetooth/mtu_update/README.rst b/samples/bluetooth/mtu_update/README.rst
index fb5069aa11f..92b445ce600 100644
--- a/samples/bluetooth/mtu_update/README.rst
+++ b/samples/bluetooth/mtu_update/README.rst
@@ -76,7 +76,7 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/mtu_update` in
 the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
 
 If the devices are close enough, the central should connect to the peripheral
 and send his MTU to the other device. If the MTU exchange succeeds, the central
diff --git a/samples/bluetooth/observer/README.rst b/samples/bluetooth/observer/README.rst
index 42001e36242..6ef62f3870e 100644
--- a/samples/bluetooth/observer/README.rst
+++ b/samples/bluetooth/observer/README.rst
@@ -27,4 +27,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/observer` in the
 Zephyr tree.
 
-See :ref:`Bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`Bluetooth samples section <bluetooth>` for details.
diff --git a/samples/bluetooth/pbp_public_broadcast_sink/README.rst b/samples/bluetooth/pbp_public_broadcast_sink/README.rst
index 72ec4fc3c8f..5a3ae3b2cc0 100644
--- a/samples/bluetooth/pbp_public_broadcast_sink/README.rst
+++ b/samples/bluetooth/pbp_public_broadcast_sink/README.rst
@@ -15,7 +15,7 @@ a High Quality Public Broadcast Audio Stream configuration.
 This sample can be found under
 :zephyr_file:`samples/bluetooth/pbp_public_broadcast_sink` in the Zephyr tree.
 
-Check the :ref:`bluetooth samples section <bluetooth-samples>` for general information.
+Check the :zephyr:code-sample-category:`bluetooth` samples for general information.
 
 Requirements
 ************
diff --git a/samples/bluetooth/pbp_public_broadcast_source/README.rst b/samples/bluetooth/pbp_public_broadcast_source/README.rst
index c12c2b762f4..e1c168cedaf 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/README.rst
+++ b/samples/bluetooth/pbp_public_broadcast_source/README.rst
@@ -15,7 +15,7 @@ every 15 seconds.
 This sample can be found under
 :zephyr_file:`samples/bluetooth/pbp_public_broadcast_source` in the Zephyr tree.
 
-Check the :ref:`bluetooth samples section <bluetooth-samples>` for general information.
+Check the :zephyr:code-sample-category:`bluetooth` samples for general information.
 
 Requirements
 ************
diff --git a/samples/bluetooth/periodic_adv/README.rst b/samples/bluetooth/periodic_adv/README.rst
index 4613abff7be..7f0f1f546a0 100644
--- a/samples/bluetooth/periodic_adv/README.rst
+++ b/samples/bluetooth/periodic_adv/README.rst
@@ -24,4 +24,4 @@ Use the sample found under :zephyr_file:`samples/bluetooth/periodic_sync` in the
 Zephyr tree that will scan and establish a periodic advertising synchronization
 to this sample.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/periodic_adv_conn/README.rst b/samples/bluetooth/periodic_adv_conn/README.rst
index 5b968f19c40..7ae2095c78b 100644
--- a/samples/bluetooth/periodic_adv_conn/README.rst
+++ b/samples/bluetooth/periodic_adv_conn/README.rst
@@ -30,4 +30,4 @@ the Zephyr tree.
 Use the sample found under :zephyr_file:`samples/bluetooth/periodic_sync_conn` in the
 Zephyr tree that will synchronize and respond to this sample.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/periodic_adv_rsp/README.rst b/samples/bluetooth/periodic_adv_rsp/README.rst
index f9e2e6ded00..82575f3d4dd 100644
--- a/samples/bluetooth/periodic_adv_rsp/README.rst
+++ b/samples/bluetooth/periodic_adv_rsp/README.rst
@@ -36,4 +36,4 @@ the Zephyr tree.
 Use the sample found under :zephyr_file:`samples/bluetooth/periodic_sync_rsp` in the
 Zephyr tree that will synchronize and respond to this sample.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/periodic_sync/README.rst b/samples/bluetooth/periodic_sync/README.rst
index 72fed008480..8dc424cf9c6 100644
--- a/samples/bluetooth/periodic_sync/README.rst
+++ b/samples/bluetooth/periodic_sync/README.rst
@@ -25,4 +25,4 @@ Use the sample found under :zephyr_file:`samples/bluetooth/periodic_adv` on
 another board that will start periodic advertising, to which this sample will
 establish periodic advertising synchronization.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/periodic_sync_conn/README.rst b/samples/bluetooth/periodic_sync_conn/README.rst
index 510b01454c0..1ec8aec3d25 100644
--- a/samples/bluetooth/periodic_sync_conn/README.rst
+++ b/samples/bluetooth/periodic_sync_conn/README.rst
@@ -30,4 +30,4 @@ Use the sample found under :zephyr_file:`samples/bluetooth/periodic_adv_conn` on
 another board that will start periodic advertising and connect to this sample
 once synced.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/periodic_sync_rsp/README.rst b/samples/bluetooth/periodic_sync_rsp/README.rst
index fceb640cca8..9c43ae9c4e4 100644
--- a/samples/bluetooth/periodic_sync_rsp/README.rst
+++ b/samples/bluetooth/periodic_sync_rsp/README.rst
@@ -38,4 +38,4 @@ Use the sample found under :zephyr_file:`samples/bluetooth/periodic_adv_rsp` on
 another board that will start periodic advertising, which will connect to this
 sample and transfer the synchronization info.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/peripheral/README.rst b/samples/bluetooth/peripheral/README.rst
index 33ec088d503..7ce65e8ebd7 100644
--- a/samples/bluetooth/peripheral/README.rst
+++ b/samples/bluetooth/peripheral/README.rst
@@ -23,4 +23,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/peripheral_accept_list/README.rst b/samples/bluetooth/peripheral_accept_list/README.rst
index a501dd382e5..4f405561466 100644
--- a/samples/bluetooth/peripheral_accept_list/README.rst
+++ b/samples/bluetooth/peripheral_accept_list/README.rst
@@ -31,4 +31,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_accept_list` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/peripheral_csc/README.rst b/samples/bluetooth/peripheral_csc/README.rst
index 2dcbd143345..aeaa7601db3 100644
--- a/samples/bluetooth/peripheral_csc/README.rst
+++ b/samples/bluetooth/peripheral_csc/README.rst
@@ -24,4 +24,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_csc` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/peripheral_dis/README.rst b/samples/bluetooth/peripheral_dis/README.rst
index 3d30490009e..44c9591e70b 100644
--- a/samples/bluetooth/peripheral_dis/README.rst
+++ b/samples/bluetooth/peripheral_dis/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_dis` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/peripheral_esp/README.rst b/samples/bluetooth/peripheral_esp/README.rst
index e6fdc565040..100d5b88e24 100644
--- a/samples/bluetooth/peripheral_esp/README.rst
+++ b/samples/bluetooth/peripheral_esp/README.rst
@@ -23,4 +23,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_esp` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/peripheral_gatt_write/README.rst b/samples/bluetooth/peripheral_gatt_write/README.rst
index 5d39f99f3dd..46c22e82690 100644
--- a/samples/bluetooth/peripheral_gatt_write/README.rst
+++ b/samples/bluetooth/peripheral_gatt_write/README.rst
@@ -23,4 +23,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_gatt_write`
 in the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/peripheral_hids/README.rst b/samples/bluetooth/peripheral_hids/README.rst
index 72be337fc88..53a9ec87ede 100644
--- a/samples/bluetooth/peripheral_hids/README.rst
+++ b/samples/bluetooth/peripheral_hids/README.rst
@@ -29,4 +29,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_hids` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/peripheral_hr/README.rst b/samples/bluetooth/peripheral_hr/README.rst
index c1caa3d90b8..b1e01beda02 100644
--- a/samples/bluetooth/peripheral_hr/README.rst
+++ b/samples/bluetooth/peripheral_hr/README.rst
@@ -24,4 +24,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_hr` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/peripheral_ht/README.rst b/samples/bluetooth/peripheral_ht/README.rst
index 498b3d38a01..b0bdb080b57 100644
--- a/samples/bluetooth/peripheral_ht/README.rst
+++ b/samples/bluetooth/peripheral_ht/README.rst
@@ -27,4 +27,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_ht` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/peripheral_identity/README.rst b/samples/bluetooth/peripheral_identity/README.rst
index bb56c48168f..cc67c426801 100644
--- a/samples/bluetooth/peripheral_identity/README.rst
+++ b/samples/bluetooth/peripheral_identity/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_identity`
 in the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/peripheral_nus/README.rst b/samples/bluetooth/peripheral_nus/README.rst
index bf5be7126b3..419464e87d5 100644
--- a/samples/bluetooth/peripheral_nus/README.rst
+++ b/samples/bluetooth/peripheral_nus/README.rst
@@ -24,4 +24,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_nus` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/peripheral_ots/README.rst b/samples/bluetooth/peripheral_ots/README.rst
index 1e26dfcf305..83176747188 100644
--- a/samples/bluetooth/peripheral_ots/README.rst
+++ b/samples/bluetooth/peripheral_ots/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_ots` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/peripheral_past/README.rst b/samples/bluetooth/peripheral_past/README.rst
index 22190ebb2c3..543771ce092 100644
--- a/samples/bluetooth/peripheral_past/README.rst
+++ b/samples/bluetooth/peripheral_past/README.rst
@@ -25,4 +25,4 @@ Use the sample found under :zephyr_file:`samples/bluetooth/central_past` on
 another board that will connect to this and transfer a periodic advertisement
 sync.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/peripheral_sc_only/README.rst b/samples/bluetooth/peripheral_sc_only/README.rst
index bbf73b748eb..ba48d3c6a0f 100644
--- a/samples/bluetooth/peripheral_sc_only/README.rst
+++ b/samples/bluetooth/peripheral_sc_only/README.rst
@@ -24,4 +24,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_sc_only`
 in the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/scan_adv/README.rst b/samples/bluetooth/scan_adv/README.rst
index 7fbfc54f4c8..d2c476e3fd2 100644
--- a/samples/bluetooth/scan_adv/README.rst
+++ b/samples/bluetooth/scan_adv/README.rst
@@ -25,4 +25,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/scan_adv` in the
 Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/st_ble_sensor/README.rst b/samples/bluetooth/st_ble_sensor/README.rst
index 88257ed7f05..b1cad9d78e8 100644
--- a/samples/bluetooth/st_ble_sensor/README.rst
+++ b/samples/bluetooth/st_ble_sensor/README.rst
@@ -29,7 +29,7 @@ To connect click on the device shown in the Device List.
 After connected, tap LED image on Android to test LED service.
 Push SW0 button on embedded device to test button service.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
 
 .. _ST Bluetooth LE Sensor Android app:
     https://play.google.com/store/apps/details?id=com.st.bluems
diff --git a/samples/bluetooth/tmap_bmr/README.rst b/samples/bluetooth/tmap_bmr/README.rst
index 356ab6f2abf..2f7f5df2bab 100644
--- a/samples/bluetooth/tmap_bmr/README.rst
+++ b/samples/bluetooth/tmap_bmr/README.rst
@@ -19,4 +19,4 @@ Building and Running
 ********************
 This sample can be found under :zephyr_file:`samples/bluetooth/tmap_bmr` in the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/tmap_bms/README.rst b/samples/bluetooth/tmap_bms/README.rst
index a5f19fdbf45..ac648ead315 100644
--- a/samples/bluetooth/tmap_bms/README.rst
+++ b/samples/bluetooth/tmap_bms/README.rst
@@ -20,4 +20,4 @@ Building and Running
 ********************
 This sample can be found under :zephyr_file:`samples/bluetooth/tmap_bms` in the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/tmap_central/README.rst b/samples/bluetooth/tmap_central/README.rst
index 8195b79ecce..9a89fb87ee5 100644
--- a/samples/bluetooth/tmap_central/README.rst
+++ b/samples/bluetooth/tmap_central/README.rst
@@ -20,4 +20,4 @@ Building and Running
 This sample can be found under
 :zephyr_file:`samples/bluetooth/tmap_central` in the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/tmap_peripheral/README.rst b/samples/bluetooth/tmap_peripheral/README.rst
index d0ebd02e548..b0888224537 100644
--- a/samples/bluetooth/tmap_peripheral/README.rst
+++ b/samples/bluetooth/tmap_peripheral/README.rst
@@ -20,4 +20,4 @@ Building and Running
 This sample can be found under
 :zephyr_file:`samples/bluetooth/tmap_peripheral` in the Zephyr tree.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/boards/96boards/argonkey/index.rst b/samples/boards/96boards/argonkey/index.rst
index 2713379253d..5720889c884 100644
--- a/samples/boards/96boards/argonkey/index.rst
+++ b/samples/boards/96boards/argonkey/index.rst
@@ -1,10 +1,5 @@
-.. _argonkey-samples:
+.. zephyr:code-sample-category:: 96b_argonkey
+   :name: 96Boards ArgonKey
+   :show-listing:
 
-Argonkey Samples
-################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   */*
+   Samples that demonstrate some board-specific features on 96Boards ArgonKey.
diff --git a/samples/boards/96boards/index.rst b/samples/boards/96boards/index.rst
index 0a024b7cf27..3cab6851eca 100644
--- a/samples/boards/96boards/index.rst
+++ b/samples/boards/96boards/index.rst
@@ -1,10 +1,5 @@
-.. _96boards_samples:
+.. zephyr:code-sample-category:: 96boards
+   :name: 96Boards
+   :show-listing:
 
-96Boards
-========
-
-.. toctree::
-   :titlesonly:
-   :glob:
-
-   */*
+   These samples showcase the use of 96Boards in Zephyr.
diff --git a/samples/boards/arc_secure_services/README.rst b/samples/boards/arc_secure_services/README.rst
index e63a9b9e910..a7744af7812 100644
--- a/samples/boards/arc_secure_services/README.rst
+++ b/samples/boards/arc_secure_services/README.rst
@@ -1,3 +1,5 @@
+:orphan:
+
 .. _arc_secure_service:
 
 ARC Secure Service
diff --git a/samples/boards/bbc/index.rst b/samples/boards/bbc/index.rst
index 73d1dc1adba..f6b69ecd3d7 100644
--- a/samples/boards/bbc/index.rst
+++ b/samples/boards/bbc/index.rst
@@ -1,11 +1,5 @@
-.. _bbc_samples:
+.. zephyr:code-sample-category:: bbc
+   :name: BBC
+   :show-listing:
 
-BBC
-===
-
-.. toctree::
-   :titlesonly:
-   :maxdepth: 1
-   :glob:
-
-   */*
+   These samples showcase the use of BBC boards in Zephyr.
diff --git a/samples/boards/bbc/microbit/microbit.rst b/samples/boards/bbc/microbit/microbit.rst
index 3a325452a49..907a63577b0 100644
--- a/samples/boards/bbc/microbit/microbit.rst
+++ b/samples/boards/bbc/microbit/microbit.rst
@@ -1,10 +1,5 @@
-.. _microbit-samples:
+.. zephyr:code-sample-category:: bbc_microbit
+   :name: BBC micro:bit
+   :show-listing:
 
-BBC micro:bit Samples
-#####################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate some board-specific features on BBC micro:bit.
diff --git a/samples/boards/boards.rst b/samples/boards/boards.rst
index c5433a6a9fe..424101b8625 100644
--- a/samples/boards/boards.rst
+++ b/samples/boards/boards.rst
@@ -1,11 +1,5 @@
-.. _board-specific-samples:
+.. zephyr:code-sample-category:: boards
+   :name: Boards
+   :show-listing:
 
-Board-specific samples
-######################
-
-.. toctree::
-   :titlesonly:
-   :maxdepth: 2
-   :glob:
-
-   */*
+   These samples demonstrate some board-specific features in Zephyr.
diff --git a/samples/boards/enjoydigital/index.rst b/samples/boards/enjoydigital/index.rst
index 9b75eca52e1..d0df43c338a 100644
--- a/samples/boards/enjoydigital/index.rst
+++ b/samples/boards/enjoydigital/index.rst
@@ -1,10 +1,6 @@
-.. _enjoydigital_samples:
+.. zephyr:code-sample-category:: enjoydigital
+   :name: EnjoyDigital
+   :show-listing:
+   :glob: **/*
 
-EnjoyDigital
-============
-
-.. toctree::
-   :titlesonly:
-   :glob:
-
-   **/*
+   These samples showcase the use of EnjoyDigital boards in Zephyr.
diff --git a/samples/boards/enjoydigital/litex/i2s/README.rst b/samples/boards/enjoydigital/litex/i2s/README.rst
index 3e0e35ba800..eb8a0cde6af 100644
--- a/samples/boards/enjoydigital/litex/i2s/README.rst
+++ b/samples/boards/enjoydigital/litex/i2s/README.rst
@@ -1,3 +1,5 @@
+:orphan:
+
 .. _i2s_litex_example:
 
 #####################
diff --git a/samples/boards/espressif/index.rst b/samples/boards/espressif/index.rst
index 525e8e831a9..56a8eaba580 100644
--- a/samples/boards/espressif/index.rst
+++ b/samples/boards/espressif/index.rst
@@ -1,10 +1,5 @@
-.. _espressif_samples:
+.. zephyr:code-sample-category:: espressif
+   :name: Espressif ESP32 boards
+   :show-listing:
 
-Espressif
-=========
-
-.. toctree::
-   :titlesonly:
-   :glob:
-
-   **/*
+   Samples that demonstrate the use of Espressif ESP32 boards in Zephyr.
diff --git a/samples/boards/google/index.rst b/samples/boards/google/index.rst
index ba16924e063..38765be0389 100644
--- a/samples/boards/google/index.rst
+++ b/samples/boards/google/index.rst
@@ -1,10 +1,6 @@
-.. _google_samples:
+.. zephyr:code-sample-category:: Google
+   :name: Google
+   :show-listing:
+   :glob: **/*
 
-Google
-======
-
-.. toctree::
-   :titlesonly:
-   :glob:
-
-   **/*
+   These samples showcase the use of Google boards in Zephyr.
diff --git a/samples/boards/intel/index.rst b/samples/boards/intel/index.rst
index 737134a5529..3f2ffe22145 100644
--- a/samples/boards/intel/index.rst
+++ b/samples/boards/intel/index.rst
@@ -1,10 +1,6 @@
-.. _intel_samples:
+.. zephyr:code-sample-category:: intel
+   :name: Intel
+   :show-listing:
+   :glob: **/*
 
-Intel
-=====
-
-.. toctree::
-   :titlesonly:
-   :glob:
-
-   **/*
+   These samples showcase the use of Intel boards in Zephyr.
diff --git a/samples/boards/microchip/index.rst b/samples/boards/microchip/index.rst
index 85e4926721e..cabaa322cca 100644
--- a/samples/boards/microchip/index.rst
+++ b/samples/boards/microchip/index.rst
@@ -1,10 +1,5 @@
-.. _microchip_samples:
+.. zephyr:code-sample-category:: microchip
+   :name: Microchip
+   :show-listing:
 
-Microchip
-=========
-
-.. toctree::
-   :titlesonly:
-   :glob:
-
-   **/*
+   These samples showcase the use of Microchip boards in Zephyr.
diff --git a/samples/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853.rst b/samples/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853.rst
index e4337f43181..6961892cc63 100644
--- a/samples/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853.rst
+++ b/samples/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853.rst
@@ -1,10 +1,5 @@
-.. _mec15xxevb_assy6853-samples:
+.. zephyr:code-sample-category:: mec15xxevb_assy6853
+   :name: MEC15xxEVB Reference Board
+   :show-listing:
 
-MEC15xxEVB Reference Board Samples
-##################################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   These samples showcase the use of MEC15xxEVB Reference Board in Zephyr.
diff --git a/samples/boards/nordic/index.rst b/samples/boards/nordic/index.rst
index 01d44950439..9559a68ea52 100644
--- a/samples/boards/nordic/index.rst
+++ b/samples/boards/nordic/index.rst
@@ -1,10 +1,6 @@
-.. _nordic_samples:
+.. zephyr:code-sample-category:: nordic
+   :name: Nordic Semiconductor
+   :show-listing:
+   :glob: **/*
 
-Nordic Semiconductor
-====================
-
-.. toctree::
-   :titlesonly:
-   :glob:
-
-   **/*
+   These samples showcase the use of Nordic Semiconductor boards in Zephyr.
diff --git a/samples/boards/nordic/mesh/onoff-app/README.rst b/samples/boards/nordic/mesh/onoff-app/README.rst
index 64051709a22..c09498b1103 100644
--- a/samples/boards/nordic/mesh/onoff-app/README.rst
+++ b/samples/boards/nordic/mesh/onoff-app/README.rst
@@ -97,4 +97,4 @@ Group addresses are not supported.
 This application was derived from the sample mesh skeleton at
 :zephyr_file:`samples/bluetooth/mesh`.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/README.rst b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/README.rst
index 1139581efe2..5392b9c5407 100644
--- a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/README.rst
+++ b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/README.rst
@@ -114,4 +114,4 @@ Group addresses are not supported.
 This application was derived from the sample mesh skeleton at
 :zephyr_file:`samples/bluetooth/mesh`.
 
-See :ref:`bluetooth samples section <bluetooth-samples>` for details.
+See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/boards/nxp/index.rst b/samples/boards/nxp/index.rst
index 318bc81e0bb..dba7cb6e829 100644
--- a/samples/boards/nxp/index.rst
+++ b/samples/boards/nxp/index.rst
@@ -1,10 +1,6 @@
-.. _nxp_samples:
+.. zephyr:code-sample-category:: nxp
+   :name: NXP
+   :show-listing:
+   :glob: **/*
 
-NXP
-===
-
-.. toctree::
-   :titlesonly:
-   :glob:
-
-   **/*
+   These samples showcase the use of NXP boards in Zephyr.
diff --git a/samples/boards/phytec/index.rst b/samples/boards/phytec/index.rst
index 81f1d5f2f38..3402c63f44e 100644
--- a/samples/boards/phytec/index.rst
+++ b/samples/boards/phytec/index.rst
@@ -1,10 +1,5 @@
-.. _phytec_samples:
+.. zephyr:code-sample-category:: phytec
+   :name: PHYTEC
+   :show-listing:
 
-PHYTEC
-======
-
-.. toctree::
-   :titlesonly:
-   :glob:
-
-   **/*
+   These samples showcase the use of PHYTEC boards in Zephyr.
diff --git a/samples/boards/phytec/reel_board/index.rst b/samples/boards/phytec/reel_board/index.rst
new file mode 100644
index 00000000000..f43c8677bb9
--- /dev/null
+++ b/samples/boards/phytec/reel_board/index.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: reelboard
+   :name: reel board
+   :show-listing:
+
+   Samples that demonstrate some board-specific features on reel board.
diff --git a/samples/boards/phytec/reel_board/mesh_badge/README.rst b/samples/boards/phytec/reel_board/mesh_badge/README.rst
index ef00511edd4..74d30f61081 100644
--- a/samples/boards/phytec/reel_board/mesh_badge/README.rst
+++ b/samples/boards/phytec/reel_board/mesh_badge/README.rst
@@ -7,7 +7,7 @@
 Overview
 ********
 
-This sample app for the reel board showcases Bluetooth Mesh
+This sample app for the reel board showcases Bluetooth Mesh.
 
 The app starts off as a regular Bluetooth GATT peripheral application.
 Install the "nRF Connect" app on your phone (available both for
diff --git a/samples/boards/quicklogic/index.rst b/samples/boards/quicklogic/index.rst
index 9de957464e2..bf8e563ee15 100644
--- a/samples/boards/quicklogic/index.rst
+++ b/samples/boards/quicklogic/index.rst
@@ -1,10 +1,5 @@
-.. _quicklogic_samples:
+.. zephyr:code-sample-category:: quicklogic
+   :name: QuickLogic
+   :show-listing:
 
-QuickLogic Corp.
-================
-
-.. toctree::
-   :titlesonly:
-   :glob:
-
-   **/*
+   These samples showcase the use of QuickLogic boards in Zephyr.
diff --git a/samples/boards/st/bluetooth/index.rst b/samples/boards/st/bluetooth/index.rst
new file mode 100644
index 00000000000..4e791b6a9bc
--- /dev/null
+++ b/samples/boards/st/bluetooth/index.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: stm32_bluetooth
+   :name: Bluetooth
+   :show-listing:
+
+   Samples that demonstrate the use of Bluetooth on STM32 boards.
diff --git a/samples/boards/st/index.rst b/samples/boards/st/index.rst
index 06ccf192ab6..2fbf890669d 100644
--- a/samples/boards/st/index.rst
+++ b/samples/boards/st/index.rst
@@ -1,10 +1,6 @@
-.. _st_samples:
+.. zephyr:code-sample-category:: st
+   :name: STMicroelectronics
+   :show-listing:
+   :glob: **/*
 
-STMicroelectronics
-==================
-
-.. toctree::
-   :titlesonly:
-   :glob:
-
-   **/*
+   Samples that demonstrate some board-specific features on STM32 boards.
diff --git a/samples/boards/st/power_mgmt/index.rst b/samples/boards/st/power_mgmt/index.rst
new file mode 100644
index 00000000000..3ab69379b60
--- /dev/null
+++ b/samples/boards/st/power_mgmt/index.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: stm32_pm
+   :name: Power Management
+   :show-listing:
+
+   Samples that demonstrate the use of power management features on STM32 boards.
diff --git a/samples/boards/ti/index.rst b/samples/boards/ti/index.rst
index ad970714f40..349b72f0801 100644
--- a/samples/boards/ti/index.rst
+++ b/samples/boards/ti/index.rst
@@ -1,10 +1,6 @@
-.. _ti_samples:
+.. zephyr:code-sample-category:: ti
+   :name: Texas Instruments
+   :show-listing:
+   :glob: **/*
 
-Texas Instruments
-=================
-
-.. toctree::
-   :titlesonly:
-   :glob:
-
-   **/*
+   These samples showcase the use of Texas Instruments boards in Zephyr.
diff --git a/samples/classic.rst b/samples/classic.rst
deleted file mode 100644
index 707d1a590eb..00000000000
--- a/samples/classic.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-.. _classic_samples:
-
-Classic Samples
-###############
-
-The following are samples that can be run on any of the supported
-platforms:
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   hello_world/*
-   synchronization/*
-   philosophers/*
diff --git a/samples/cpp/cpp.rst b/samples/cpp/cpp.rst
index aeecebadcca..4722683a9ee 100644
--- a/samples/cpp/cpp.rst
+++ b/samples/cpp/cpp.rst
@@ -1,10 +1,5 @@
-.. _cpp-samples:
+.. zephyr:code-sample-category:: cpp
+   :name: C++
+   :show-listing:
 
-C++ Samples
-###########
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   These samples demonstrate how to write Zephyr applications in C++.
diff --git a/samples/drivers/adc/index.rst b/samples/drivers/adc/index.rst
new file mode 100644
index 00000000000..c1e9a2abfa6
--- /dev/null
+++ b/samples/drivers/adc/index.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: adc
+   :name: ADC
+   :show-listing:
+
+   These samples demonstrate how to use the ADC driver API.
diff --git a/samples/drivers/audio/index.rst b/samples/drivers/audio/index.rst
new file mode 100644
index 00000000000..46e68b287df
--- /dev/null
+++ b/samples/drivers/audio/index.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: audio
+   :name: Audio
+   :show-listing:
+
+   These sample demonstrate how to use the :ref:`Audio driver <audio_reference>` API.
diff --git a/samples/drivers/can/index.rst b/samples/drivers/can/index.rst
new file mode 100644
index 00000000000..c085669fbbb
--- /dev/null
+++ b/samples/drivers/can/index.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: can
+   :name: Controller Area Network (CAN)
+   :show-listing:
+
+   These samples demonstrate how to use the :ref:`can` driver API.
diff --git a/samples/drivers/counter/index.rst b/samples/drivers/counter/index.rst
new file mode 100644
index 00000000000..ff5ebf8932d
--- /dev/null
+++ b/samples/drivers/counter/index.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: counter
+   :name: Counter
+   :show-listing:
+
+   These samples demonstrate how to use the :ref:`counter_api` driver API.
diff --git a/samples/drivers/drivers.rst b/samples/drivers/drivers.rst
index 84c5426094a..24b9578a6e9 100644
--- a/samples/drivers/drivers.rst
+++ b/samples/drivers/drivers.rst
@@ -1,13 +1,6 @@
-.. _driver-samples:
+.. zephyr:code-sample-category:: drivers
+   :name: Drivers
+   :show-listing:
+   :live-search:
 
-Driver Samples
-##############
-
-The following samples demonstrate how to use various drivers supported
-by Zephyr.
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   These samples demonstrate how to use various drivers supported by Zephyr.
diff --git a/samples/drivers/ethernet/index.rst b/samples/drivers/ethernet/index.rst
new file mode 100644
index 00000000000..8b46ca0f725
--- /dev/null
+++ b/samples/drivers/ethernet/index.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: ethernet
+   :name: Ethernet
+   :show-listing:
+
+   These samples demonstrate how to use the :ref:`Ethernet <ethernet_interface>` driver API.
diff --git a/samples/drivers/fpga/index.rst b/samples/drivers/fpga/index.rst
new file mode 100644
index 00000000000..395a953740b
--- /dev/null
+++ b/samples/drivers/fpga/index.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: fpga
+   :name: FPGA
+   :show-listing:
+
+   These samples demonstrate how to use the FPGA driver API.
diff --git a/samples/drivers/haptics/README.rst b/samples/drivers/haptics/README.rst
new file mode 100644
index 00000000000..d4e08884b80
--- /dev/null
+++ b/samples/drivers/haptics/README.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: haptics
+   :name: Haptics
+   :show-listing:
+
+   These samples demonstrate how to use the :ref:`haptics_api` driver API.
diff --git a/samples/drivers/i2c/README.rst b/samples/drivers/i2c/README.rst
new file mode 100644
index 00000000000..9e934001301
--- /dev/null
+++ b/samples/drivers/i2c/README.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: i2c
+   :name: Inter-Integrated Circuit (I2C) Bus
+   :show-listing:
+
+   These samples demonstrate how to use the :ref:`I2C <i2c_api>` driver API.
diff --git a/samples/drivers/i2s/README.rst b/samples/drivers/i2s/README.rst
new file mode 100644
index 00000000000..8243878f3a5
--- /dev/null
+++ b/samples/drivers/i2s/README.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: i2s
+   :name: I2S
+   :show-listing:
+
+   These samples demonstrate how to use the I2S driver API.
diff --git a/samples/drivers/ipm/README.rst b/samples/drivers/ipm/README.rst
new file mode 100644
index 00000000000..e3a1f40a6fb
--- /dev/null
+++ b/samples/drivers/ipm/README.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: ipm
+   :name: Inter-Processor Mailbox (IPM)
+   :show-listing:
+
+   These samples demonstrate how to use the :ref:`IPM <ipm_api>` driver API.
diff --git a/samples/drivers/led/index.rst b/samples/drivers/led/index.rst
new file mode 100644
index 00000000000..30dbf504131
--- /dev/null
+++ b/samples/drivers/led/index.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: led
+   :name: Light-Emitting Diode (LED)
+   :show-listing:
+
+   These samples demonstrate how to use the LED driver API.
diff --git a/samples/drivers/lora/index.rst b/samples/drivers/lora/index.rst
new file mode 100644
index 00000000000..8156d9d2638
--- /dev/null
+++ b/samples/drivers/lora/index.rst
@@ -0,0 +1,6 @@
+.. zephyr:code-sample-category:: lora
+   :name: LoRa
+   :show-listing:
+
+   These samples demonstrate how to use :ref:`LoRa <lora_api>` for long-range wireless
+   communication.
diff --git a/samples/drivers/misc/README.rst b/samples/drivers/misc/README.rst
new file mode 100644
index 00000000000..2c4101f51d1
--- /dev/null
+++ b/samples/drivers/misc/README.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: misc_drivers
+   :name: Miscellaneous
+   :show-listing:
+
+   These samples demonstrate how to use miscellaneous driver APIs.
diff --git a/samples/drivers/mspi/index.rst b/samples/drivers/mspi/index.rst
new file mode 100644
index 00000000000..3cd994ba127
--- /dev/null
+++ b/samples/drivers/mspi/index.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: mspi
+   :name: Multi-bit SPI Bus (MSPI)
+   :show-listing:
+
+   These samples demonstrate how to use the :ref:`MSPI <mspi_api>` driver API.
diff --git a/samples/drivers/uart/README.rst b/samples/drivers/uart/README.rst
new file mode 100644
index 00000000000..4501bd73a3d
--- /dev/null
+++ b/samples/drivers/uart/README.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: uart
+   :name: Universal Asynchronous Receiver-Transmitter (UART)
+   :show-listing:
+
+   These samples demonstrate how to use the :ref:`UART <uart_api>` driver API.
diff --git a/samples/drivers/video/video.rst b/samples/drivers/video/video.rst
index 326a337f05b..99a4b24449e 100644
--- a/samples/drivers/video/video.rst
+++ b/samples/drivers/video/video.rst
@@ -1,10 +1,5 @@
-.. _video-samples:
+.. zephyr:code-sample-category:: video
+   :name: Video
+   :show-listing:
 
-Video Samples
-#############
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   These samples demonstrate how to use the :ref:`video <video_api>` driver API.
diff --git a/samples/drivers/virtualization/index.rst b/samples/drivers/virtualization/index.rst
new file mode 100644
index 00000000000..0716ac7bd37
--- /dev/null
+++ b/samples/drivers/virtualization/index.rst
@@ -0,0 +1,6 @@
+.. zephyr:code-sample-category:: virtualization
+   :name: Virtualization
+   :show-listing:
+   :glob: **/*
+
+   These samples demonstrate some of the virtualization capabilities of Zephyr.
diff --git a/samples/drivers/w1/README.rst b/samples/drivers/w1/README.rst
new file mode 100644
index 00000000000..7025ee7e0b4
--- /dev/null
+++ b/samples/drivers/w1/README.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: w1
+   :name: 1-Wire
+   :show-listing:
+
+   These samples demonstrate how to use the :ref:`1-Wire <w1_api>` driver API.
diff --git a/samples/fuel_gauge/fuel_gauge.rst b/samples/fuel_gauge/fuel_gauge.rst
index 979180fb72b..01df07c8aaa 100644
--- a/samples/fuel_gauge/fuel_gauge.rst
+++ b/samples/fuel_gauge/fuel_gauge.rst
@@ -1,10 +1,5 @@
-.. _fuel_gauge-samples:
+.. zephyr:code-sample-category:: fuel_gauge
+   :name: Fuel Gauge
+   :show-listing:
 
-Fuel Gauge Samples
-##################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that show how to interact with :ref:`fuel_gauge_api`.
diff --git a/samples/fuel_gauge/max17048/README.rst b/samples/fuel_gauge/max17048/README.rst
index f2fd2618220..cdb08e1e4ec 100644
--- a/samples/fuel_gauge/max17048/README.rst
+++ b/samples/fuel_gauge/max17048/README.rst
@@ -1,7 +1,7 @@
-.. _MAX17048_sample:
+.. zephyr:code-sample:: max17048
+   :name: MAX17048 Li-Ion battery fuel gauge
 
-MAX17048 Li-Ion battery fuel gauge
-###################################
+   Read battery percentage and power status using MAX17048 fuel gauge.
 
 Overview
 ********
diff --git a/samples/index.rst b/samples/index.rst
index d8f28152c73..40151ea0915 100644
--- a/samples/index.rst
+++ b/samples/index.rst
@@ -1,35 +1,23 @@
-.. _samples-and-demos:
+.. zephyr:code-sample-category:: samples
+   :name: Samples and Demos
 
-Samples and Demos
-#################
+Zephyr offers a comprehensive collection of samples and demos that highlight the features of the
+kernel and its subsystems.
 
+These samples are crafted to be simple and easy to understand, serving as a starting point for your
+own projects.
+
+We welcome contributions of new samples to the project and you are encouraged to read more about
+the :ref:`definition_and_criteria` if you are interested in submitting your own sample.
+
+.. zephyr:code-sample-listing::
+   :categories: samples
+   :live-search:
 
 .. toctree::
    :titlesonly:
-   :maxdepth: 2
+   :maxdepth: 1
+   :hidden:
    :glob:
 
    sample_definition_and_criteria
-   classic
-   basic/*
-   userspace/*
-   sysbuild/*
-   subsys/subsys.rst
-   net/net.rst
-   bluetooth/bluetooth.rst
-   sensor/*
-   arch/*
-   boards/*
-   drivers/drivers.rst
-   application_development/*
-   shields/*
-   cpp/*
-   posix/*
-   kernel/*
-   tfm_integration/tfm_integration.rst
-   modules/*
-   fuel_gauge/*
-
-.. comment
-   To add a new sample document, please use the template available under
-   ``doc/templates/sample.tmpl``
diff --git a/samples/kernel/condition_variables/simple/README.rst b/samples/kernel/condition_variables/simple/README.rst
index 2977b72cc97..b3db950dd58 100644
--- a/samples/kernel/condition_variables/simple/README.rst
+++ b/samples/kernel/condition_variables/simple/README.rst
@@ -1,3 +1,5 @@
+:orphan:
+
 .. _samples_kernel_simple_condition_variables:
 
 Condition Variables
diff --git a/samples/kernel/index.rst b/samples/kernel/index.rst
index 13c31ecb31a..710a4bda95c 100644
--- a/samples/kernel/index.rst
+++ b/samples/kernel/index.rst
@@ -1,10 +1,6 @@
-.. _kernel-samples:
+.. zephyr:code-sample-category:: kernel
+   :name: Kernel and Scheduler
+   :show-listing:
+   :glob: **/*
 
-Various Kernel and Scheduler Samples
-####################################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   These samples demonstrate how to use various kernel and scheduler features.
diff --git a/samples/modules/cmsis_dsp/cmsis_dsp.rst b/samples/modules/cmsis_dsp/cmsis_dsp.rst
index dce6b8cad96..0506721f4e0 100644
--- a/samples/modules/cmsis_dsp/cmsis_dsp.rst
+++ b/samples/modules/cmsis_dsp/cmsis_dsp.rst
@@ -1,12 +1,6 @@
-CMSIS-DSP
-#########
+.. zephyr:code-sample-category:: cmsis_dsp
+   :name: CMSIS-DSP
+   :show-listing:
 
-These samples demonstrate how to use the CMSIS-DSP module to perform signal processing operations
-in Zephyr.
-
-.. toctree::
-   :titlesonly:
-   :glob:
-   :maxdepth: 1
-
-   */*
+   These samples demonstrate how to use the CMSIS-DSP module to perform signal processing operations
+   in Zephyr.
diff --git a/samples/modules/compression/compression.rst b/samples/modules/compression/compression.rst
index 9cc3cd3d3c3..095c326584e 100644
--- a/samples/modules/compression/compression.rst
+++ b/samples/modules/compression/compression.rst
@@ -1,10 +1,3 @@
-.. _compression-samples:
-
-Compression Samples
-###################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+.. zephyr:code-sample-category:: compression
+   :name: Compression
+   :show-listing:
diff --git a/samples/modules/index.rst b/samples/modules/index.rst
index c40b9fe7850..8c5c9b47aa3 100644
--- a/samples/modules/index.rst
+++ b/samples/modules/index.rst
@@ -1,11 +1,5 @@
-.. _module-samples:
+.. zephyr:code-sample-category:: modules
+   :name: External modules
+   :show-listing:
 
-External Module Samples
-#######################
-
-.. toctree::
-   :titlesonly:
-   :maxdepth: 2
-   :glob:
-
-   */*
+   These samples demonstrate the use of external modules in Zephyr.
diff --git a/samples/modules/lvgl/lvgl.rst b/samples/modules/lvgl/lvgl.rst
index 736ddd1a00b..fa2ca5459c7 100644
--- a/samples/modules/lvgl/lvgl.rst
+++ b/samples/modules/lvgl/lvgl.rst
@@ -1,13 +1,5 @@
-.. _lvgl_samples:
+.. zephyr:code-sample-category:: lvgl
+   :name: LVGL
+   :show-listing:
 
-LVGL
-####
-
-These samples demonstrate how to build graphical user interfaces using LVGL in Zephyr.
-
-.. toctree::
-   :titlesonly:
-   :glob:
-   :maxdepth: 1
-
-   **/*
+   These samples demonstrate how to build graphical user interfaces using LVGL in Zephyr.
diff --git a/samples/modules/tflite-micro/tflite-micro.rst b/samples/modules/tflite-micro/tflite-micro.rst
index 861618a645b..316791c7271 100644
--- a/samples/modules/tflite-micro/tflite-micro.rst
+++ b/samples/modules/tflite-micro/tflite-micro.rst
@@ -1,13 +1,5 @@
-.. _tflitemicro_samples:
+.. zephyr:code-sample-category:: tflite-micro
+   :name: TensorFlow Lite for Microcontrollers
+   :show-listing:
 
-TensorFlow Lite for Microcontrollers
-####################################
-
-These samples demonstrate how to use TensorFlow Lite for Microcontrollers in Zephyr.
-
-.. toctree::
-   :titlesonly:
-   :glob:
-   :maxdepth: 1
-
-   **/*
+   These samples demonstrate how to use TensorFlow Lite for Microcontrollers in Zephyr.
diff --git a/samples/modules/thrift/thrift.rst b/samples/modules/thrift/thrift.rst
index 3ea28f1831b..9d6f86734d3 100644
--- a/samples/modules/thrift/thrift.rst
+++ b/samples/modules/thrift/thrift.rst
@@ -1,11 +1,5 @@
-Apache Thrift
-=============
+.. zephyr:code-sample-category:: thrift
+   :name: Apache Thrift
+   :show-listing:
 
-These samples demonstrate how to use Apache Thrift in Zephyr.
-
-.. toctree::
-   :titlesonly:
-   :glob:
-   :maxdepth: 1
-
-   */*
+   These samples demonstrate how to use Apache Thrift in Zephyr.
diff --git a/samples/net/cloud/README.rst b/samples/net/cloud/README.rst
new file mode 100644
index 00000000000..8bc388d36f1
--- /dev/null
+++ b/samples/net/cloud/README.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: cloud
+   :name: IoT Cloud
+   :show-listing:
+
+   These samples demonstrate how to connect Zephyr devices to various IoT cloud services.
diff --git a/samples/net/net.rst b/samples/net/net.rst
index cbccd04fdf8..7359b8c171b 100644
--- a/samples/net/net.rst
+++ b/samples/net/net.rst
@@ -1,10 +1,6 @@
-.. _networking-samples:
+.. zephyr:code-sample-category:: net
+   :name: Networking
+   :show-listing:
+   :live-search:
 
-Networking Samples
-##################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   These samples demonstrate how to use the networking subsystem.
diff --git a/samples/net/openthread/coprocessor/README.rst b/samples/net/openthread/coprocessor/README.rst
index 5fbf49c8368..373fbdf8f59 100644
--- a/samples/net/openthread/coprocessor/README.rst
+++ b/samples/net/openthread/coprocessor/README.rst
@@ -1,3 +1,5 @@
+:orphan:
+
 .. zephyr:code-sample:: coprocessor
    :name: OpenThread co-processor
    :relevant-api: openthread
diff --git a/samples/net/sockets/sockets.rst b/samples/net/sockets/sockets.rst
new file mode 100644
index 00000000000..edeaab1ffcc
--- /dev/null
+++ b/samples/net/sockets/sockets.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: sockets
+   :name: Sockets API
+   :show-listing:
+
+   These samples demonstrate how to use the :ref:`bsd_sockets_interface` API.
diff --git a/samples/posix/posix.rst b/samples/posix/posix.rst
index f7d026eb2cd..2e975069b66 100644
--- a/samples/posix/posix.rst
+++ b/samples/posix/posix.rst
@@ -1,10 +1,5 @@
-.. _posix-samples:
+.. zephyr:code-sample-category:: posix
+   :name: POSIX API
+   :show-listing:
 
-POSIX API Samples
-#################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   These samples demonstrate how to use the :ref:`POSIX API <posix_support>` in Zephyr.
diff --git a/samples/sensor/sensor.rst b/samples/sensor/sensor.rst
index 567574977dc..dfc882c2fab 100644
--- a/samples/sensor/sensor.rst
+++ b/samples/sensor/sensor.rst
@@ -1,10 +1,5 @@
-.. _sensor-samples:
+.. zephyr:code-sample-category:: sensors
+   :name: Sensors
+   :show-listing:
 
-Sensor Samples
-##############
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   These samples demonstrate how to use various sensors supported by Zephyr.
diff --git a/samples/shields/npm1300_ek/doc/index.rst b/samples/shields/npm1300_ek/doc/index.rst
index 4761ba6f8a2..be2e8db34cf 100644
--- a/samples/shields/npm1300_ek/doc/index.rst
+++ b/samples/shields/npm1300_ek/doc/index.rst
@@ -1,7 +1,7 @@
-.. _npm1300_ek_sample:
+.. zephyr:code-sample:: npm1300_ek
+   :name: nPM1300 EK
 
-nPM1300 EK sample
-#################
+   Interact with the nPM1300 PMIC using the shell interface.
 
 Overview
 ********
diff --git a/samples/shields/npm6001_ek/doc/index.rst b/samples/shields/npm6001_ek/doc/index.rst
index 13e4f64ce29..394adb2c56b 100644
--- a/samples/shields/npm6001_ek/doc/index.rst
+++ b/samples/shields/npm6001_ek/doc/index.rst
@@ -1,7 +1,7 @@
-.. _npm6001_ek_sample:
+.. zephyr:code-sample:: npm6001_ek
+   :name: nPM6001 EK
 
-nPM6001 EK sample
-#################
+   Interact with the nPM6001 PMIC using the shell interface.
 
 Overview
 ********
diff --git a/samples/shields/shields.rst b/samples/shields/shields.rst
index 52f436fd93c..f1cea031eeb 100644
--- a/samples/shields/shields.rst
+++ b/samples/shields/shields.rst
@@ -1,10 +1,6 @@
-.. _shields-samples:
+.. zephyr:code-sample-category:: shields
+   :name: Shields
+   :show-listing:
+   :glob: **/*
 
-Shields Samples
-###############
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate the use of shields in Zephyr.
diff --git a/samples/shields/x_nucleo_iks01a2/README.rst b/samples/shields/x_nucleo_iks01a2/README.rst
new file mode 100644
index 00000000000..1a5c865570e
--- /dev/null
+++ b/samples/shields/x_nucleo_iks01a2/README.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: x_nucleo_iks01a2
+   :name: X-NUCLEO-IKS01A2 shield
+   :show-listing:
+
+   These samples showcase various features of the X-NUCLEO-IKS01A2 shield.
diff --git a/samples/shields/x_nucleo_iks01a3/README.rst b/samples/shields/x_nucleo_iks01a3/README.rst
new file mode 100644
index 00000000000..35f4cdd94e2
--- /dev/null
+++ b/samples/shields/x_nucleo_iks01a3/README.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: x_nucleo_iks01a3
+   :name: X-NUCLEO-IKS01A3 shield
+   :show-listing:
+
+   These samples showcase various features of the X-NUCLEO-IKS01A3 shield.
diff --git a/samples/shields/x_nucleo_iks02a1/README.rst b/samples/shields/x_nucleo_iks02a1/README.rst
new file mode 100644
index 00000000000..59aec43bcff
--- /dev/null
+++ b/samples/shields/x_nucleo_iks02a1/README.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: x_nucleo_iks02a1
+   :name: X-NUCLEO-IKS02A1 shield
+   :show-listing:
+
+   These samples showcase various features of the X-NUCLEO-IKS02A1 shield.
diff --git a/samples/shields/x_nucleo_iks4a1/README.rst b/samples/shields/x_nucleo_iks4a1/README.rst
new file mode 100644
index 00000000000..4e0861f42aa
--- /dev/null
+++ b/samples/shields/x_nucleo_iks4a1/README.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: x_nucleo_iks4a1
+   :name: X-NUCLEO-IKS4A1 shield
+   :show-listing:
+
+   These samples showcase various features of the X-NUCLEO-IKS4A1 shield.
diff --git a/samples/subsys/bindesc/bindesc.rst b/samples/subsys/bindesc/bindesc.rst
index 105d6f80dc8..5efd18abbe6 100644
--- a/samples/subsys/bindesc/bindesc.rst
+++ b/samples/subsys/bindesc/bindesc.rst
@@ -1,10 +1,5 @@
-.. _bindesc_samples:
+.. zephyr:code-sample-category:: bindesc
+   :name: Binary Descriptor
+   :show-listing:
 
-Binary Descriptor Samples
-#########################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate how to use :ref:`binary_descriptors`.
diff --git a/samples/subsys/canbus/canbus.rst b/samples/subsys/canbus/canbus.rst
index 8772cc5ff9a..cfc8c75756a 100644
--- a/samples/subsys/canbus/canbus.rst
+++ b/samples/subsys/canbus/canbus.rst
@@ -8,3 +8,10 @@ Controller Area Network (CAN) Bus Samples
    :glob:
 
    **/*
+
+
+.. zephyr:code-sample-category:: canbus
+   :name: Controller Area Network (CAN) Bus
+   :show-listing:
+
+   Samples that demonstrate the :ref:`Controller Area Network (CAN) bus <canbus>` features.
diff --git a/samples/subsys/console/console.rst b/samples/subsys/console/console.rst
index eb9a5127660..5ad7b1a6748 100644
--- a/samples/subsys/console/console.rst
+++ b/samples/subsys/console/console.rst
@@ -1,10 +1,5 @@
-.. _console-samples:
+.. zephyr:code-sample-category:: console
+   :name: Console
+   :show-listing:
 
-Console Samples
-###############
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate the :ref:`console` subsystem.
diff --git a/samples/subsys/debug/index.rst b/samples/subsys/debug/index.rst
index 3e28648b1f5..8c73a163e87 100644
--- a/samples/subsys/debug/index.rst
+++ b/samples/subsys/debug/index.rst
@@ -1,10 +1,5 @@
-.. _debug-samples:
+.. zephyr:code-sample-category:: debug
+   :name: Debug
+   :show-listing:
 
-Debug Samples
-#################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate advanced debugging features.
diff --git a/samples/subsys/display/display.rst b/samples/subsys/display/display.rst
index 955eeaaea5b..21dc6ebf5d7 100644
--- a/samples/subsys/display/display.rst
+++ b/samples/subsys/display/display.rst
@@ -1,10 +1,5 @@
-.. _display-samples:
+.. zephyr:code-sample-category:: display
+   :name: Display
+   :show-listing:
 
-Display Samples
-###############
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   These samples demonstrate how to use the display subsystem.
diff --git a/samples/subsys/fs/fs.rst b/samples/subsys/fs/fs.rst
index 0875b1ea0bd..0ba8ed68016 100644
--- a/samples/subsys/fs/fs.rst
+++ b/samples/subsys/fs/fs.rst
@@ -1,10 +1,5 @@
-.. _fs-samples:
+.. zephyr:code-sample-category:: fs
+   :name: File Systems
+   :show-listing:
 
-FS Samples
-##########
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate how to interact with :ref:`file_system_api`.
diff --git a/samples/subsys/input/input.rst b/samples/subsys/input/input.rst
index 19e01dc755c..0435d6beb4a 100644
--- a/samples/subsys/input/input.rst
+++ b/samples/subsys/input/input.rst
@@ -1,10 +1,5 @@
-.. _input-samples:
+.. zephyr:code-sample-category:: input
+   :name: Input
+   :show-listing:
 
-Input Samples
-#############
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate the :ref:`input` subsystem.
diff --git a/samples/subsys/ipc/ipc.rst b/samples/subsys/ipc/ipc.rst
index c75a201fd3e..8d536c4addd 100644
--- a/samples/subsys/ipc/ipc.rst
+++ b/samples/subsys/ipc/ipc.rst
@@ -1,10 +1,6 @@
-.. _ipc_samples:
+.. zephyr:code-sample-category:: ipc
+   :name: Inter-Processor Communication (IPC)
+   :show-listing:
+   :glob: **/*
 
-IPC Samples
-###########
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate :ref:`Inter-Processor Communication (IPC) <ipc_service>` features.
diff --git a/samples/subsys/llext/llext.rst b/samples/subsys/llext/llext.rst
index f9001e2847b..b0eee9d8772 100644
--- a/samples/subsys/llext/llext.rst
+++ b/samples/subsys/llext/llext.rst
@@ -1,10 +1,5 @@
-.. _llext-samples:
+.. zephyr:code-sample-category:: llext
+   :name: Linkable Loadable Extensions (LLEXT)
+   :show-listing:
 
-Linkable Loadable Extension Samples
-###################################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate the :ref:`llext` subsystem.
diff --git a/samples/subsys/logging/logging.rst b/samples/subsys/logging/logging.rst
index 6b43a116f28..49bbd040aa6 100644
--- a/samples/subsys/logging/logging.rst
+++ b/samples/subsys/logging/logging.rst
@@ -1,10 +1,5 @@
-.. _logging-samples:
+.. zephyr:code-sample-category:: logging
+   :name: Logging
+   :show-listing:
 
-Logging Sample
-################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate the :ref:`logging_api` subsystem.
diff --git a/samples/subsys/lorawan/lorawan.rst b/samples/subsys/lorawan/lorawan.rst
index ffe86ce523f..0f5aab0bbd0 100644
--- a/samples/subsys/lorawan/lorawan.rst
+++ b/samples/subsys/lorawan/lorawan.rst
@@ -1,10 +1,5 @@
-.. _lorawan-samples:
+.. zephyr:code-sample-category:: lorawan
+   :name: LoRaWAN
+   :show-listing:
 
-LoRaWAN Samples
-###############
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate the :ref:`LoRaWAN <lorawan_api>` subsystem.
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/README.rst b/samples/subsys/mgmt/mcumgr/smp_svr/README.rst
index a9ddfcbf4a1..8d8830903b9 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/README.rst
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/README.rst
@@ -1,3 +1,5 @@
+:orphan:
+
 .. zephyr:code-sample:: smp-svr
    :name: SMP server
 
diff --git a/samples/subsys/mgmt/mgmt.rst b/samples/subsys/mgmt/mgmt.rst
index a8fa8135aa7..a1112077e45 100644
--- a/samples/subsys/mgmt/mgmt.rst
+++ b/samples/subsys/mgmt/mgmt.rst
@@ -1,10 +1,5 @@
-.. _mgmt-samples:
+.. zephyr:code-sample-category:: mgmt
+   :name: Management
+   :show-listing:
 
-Management Samples
-##################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate various device management features.
diff --git a/samples/subsys/modbus/modbus.rst b/samples/subsys/modbus/modbus.rst
index 133dbd43be7..94719d7a231 100644
--- a/samples/subsys/modbus/modbus.rst
+++ b/samples/subsys/modbus/modbus.rst
@@ -1,10 +1,5 @@
-.. _modbus-samples:
+.. zephyr:code-sample-category:: modbus
+   :name: Modbus
+   :show-listing:
 
-Modbus Samples
-##############
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate the :ref:`modbus` subsystem.
diff --git a/samples/subsys/portability/portability.rst b/samples/subsys/portability/portability.rst
index 9034372320f..bf282e94547 100644
--- a/samples/subsys/portability/portability.rst
+++ b/samples/subsys/portability/portability.rst
@@ -1,12 +1,8 @@
-.. _portability-samples:
+.. zephyr:code-sample-category:: portability
+   :name: Portability
+   :show-listing:
+   :glob: **/*
 
-Portability Samples
-###################
+   Samples that demonstrate :ref:`OS abstraction and portability <osal>` features.
 
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
-
-See also :ref:`POSIX API Samples <posix-samples>`.
+   See also :zephyr:code-sample-category:`POSIX sample applications<posix>`.
diff --git a/samples/subsys/profiling/profiling.rst b/samples/subsys/profiling/profiling.rst
index a9765517a4b..777bb9ba07a 100644
--- a/samples/subsys/profiling/profiling.rst
+++ b/samples/subsys/profiling/profiling.rst
@@ -1,10 +1,5 @@
-.. _profiling-samples:
+.. zephyr:code-sample-category:: profiling
+   :name: Profiling
+   :show-listing:
 
-Profiling subsystem samples
-###########################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate the :ref:`profiling` subsystem.
diff --git a/samples/subsys/sensing/sensing.rst b/samples/subsys/sensing/sensing.rst
index 99fdf509c08..bfd39ed399e 100644
--- a/samples/subsys/sensing/sensing.rst
+++ b/samples/subsys/sensing/sensing.rst
@@ -1,10 +1,5 @@
-.. _sensing-subsystem-samples:
+.. zephyr:code-sample-category:: sensing
+   :name: Sensing
+   :show-listing:
 
-Sensing Subsystem Samples
-#########################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate the :ref:`sensing` subsystem.
diff --git a/samples/subsys/shell/shell.rst b/samples/subsys/shell/shell.rst
index 1cd81f59b0c..b783261a07a 100644
--- a/samples/subsys/shell/shell.rst
+++ b/samples/subsys/shell/shell.rst
@@ -1,10 +1,5 @@
-.. _shell-samples:
+.. zephyr:code-sample-category:: shell
+   :name: Shell
+   :show-listing:
 
-Shell System Samples
-####################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate the :ref:`shell_api` subsystem.
diff --git a/samples/subsys/smf/smf.rst b/samples/subsys/smf/smf.rst
index bc48258b99f..772771a6daf 100644
--- a/samples/subsys/smf/smf.rst
+++ b/samples/subsys/smf/smf.rst
@@ -1,10 +1,5 @@
-.. _smf-samples:
+.. zephyr:code-sample-category:: smf
+   :name: State Machine Framework
+   :show-listing:
 
-State Machine Framework Samples
-###############################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   These samples demonstrate how to use the :ref:`State Machine Framework <smf>` subsystem.
diff --git a/samples/subsys/subsys.rst b/samples/subsys/subsys.rst
index bf58c7dda63..4651375ada8 100644
--- a/samples/subsys/subsys.rst
+++ b/samples/subsys/subsys.rst
@@ -1,11 +1,5 @@
-.. _subsystem-samples:
+.. zephyr:code-sample-category:: subsys
+   :name: Subsystems
+   :show-listing:
 
-Various Subsystems Samples
-##########################
-
-.. toctree::
-   :titlesonly:
-   :maxdepth: 2
-   :glob:
-
-   */*
+   These samples demonstrate how to use various subsystems supported by Zephyr.
diff --git a/samples/subsys/testsuite/testsuite.rst b/samples/subsys/testsuite/testsuite.rst
index 7c84784e9a6..e3438ace124 100644
--- a/samples/subsys/testsuite/testsuite.rst
+++ b/samples/subsys/testsuite/testsuite.rst
@@ -1,10 +1,4 @@
-.. _testsuite-samples:
-
-Testsuite samples
-#################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/README
+.. zephyr:code-sample-category:: testsuite
+   :name: Test suites
+   :show-listing:
+   :glob: **/*
diff --git a/samples/subsys/usb/usb.rst b/samples/subsys/usb/usb.rst
index 5da80b0e219..a86c7cb3a1f 100644
--- a/samples/subsys/usb/usb.rst
+++ b/samples/subsys/usb/usb.rst
@@ -1,10 +1,6 @@
-.. _usb-samples:
+.. zephyr:code-sample-category:: usb
+   :name: USB device support
+   :show-listing:
+   :glob: **/*
 
-USB device support samples
-##########################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/README
+   Samples that demonstrate :ref:`usb_device_stack`.
diff --git a/samples/subsys/usb_c/usbc.rst b/samples/subsys/usb_c/usbc.rst
index da0db220b15..8ef11f95118 100644
--- a/samples/subsys/usb_c/usbc.rst
+++ b/samples/subsys/usb_c/usbc.rst
@@ -1,10 +1,5 @@
-.. _usbc-samples:
+.. zephyr:code-sample-category:: usbc
+   :name: USB-C device support
+   :show-listing:
 
-USB-C device support samples
-############################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate the :ref:`usbc_api`.
diff --git a/samples/subsys/zbus/zbus.rst b/samples/subsys/zbus/zbus.rst
index 052589eed94..41a0619193d 100644
--- a/samples/subsys/zbus/zbus.rst
+++ b/samples/subsys/zbus/zbus.rst
@@ -1,10 +1,5 @@
-.. _zbus_samples:
+.. zephyr:code-sample-category:: zbus
+   :name: zbus
+   :show-listing:
 
-zbus Samples
-############
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   These samples demonstrate how to use the :ref:`zbus <zbus>` subsystem.
diff --git a/samples/sysbuild/sysbuild.rst b/samples/sysbuild/sysbuild.rst
index c959e82a3a3..bd1c4be9dca 100644
--- a/samples/sysbuild/sysbuild.rst
+++ b/samples/sysbuild/sysbuild.rst
@@ -1,10 +1,5 @@
-.. _sysbuild-samples:
+.. zephyr:code-sample-category:: sysbuild
+   :name: Sysbuild
+   :show-listing:
 
-Sysbuild samples
-################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate how to use :ref:`sysbuild`.
diff --git a/samples/sysbuild/with_mcuboot/README.rst b/samples/sysbuild/with_mcuboot/README.rst
index 6ae3b81e6ec..cf8729ab0f8 100644
--- a/samples/sysbuild/with_mcuboot/README.rst
+++ b/samples/sysbuild/with_mcuboot/README.rst
@@ -1,7 +1,7 @@
-.. _with_mcuboot:
+.. zephyr:code-sample:: with_mcuboot
+   :name: MCUboot with sysbuild
 
-Sample with MCUboot
-###################
+   Build a Zephyr application + MCUboot using sysbuild.
 
 Overview
 ********
diff --git a/samples/tfm_integration/tfm_integration.rst b/samples/tfm_integration/tfm_integration.rst
index 02cd3e97855..a445c38cfb2 100644
--- a/samples/tfm_integration/tfm_integration.rst
+++ b/samples/tfm_integration/tfm_integration.rst
@@ -1,18 +1,12 @@
-.. _tfm_integration-samples:
+.. zephyr:code-sample-category:: tfm_integration
+   :name: TF-M Integration
+   :show-listing:
 
-TF-M Integration Samples
-########################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   */*
+   These TF-M integration examples can be used with a supported Armv8-M board, and demonstrate how
+   the TF-M APIs can be used with Zephyr.
 
 Overview
 ********
-These TF-M integration examples can be used with a supported Armv8-M board, and
-demonstrate how the TF-M APIs can be used with Zephyr.
 
 Trusted Firmware Platform Security Architecture (PSA) APIs are used for the
 secure processing environment (S), with Zephyr running in the non-secure
diff --git a/samples/userspace/hello_world_user/README.rst b/samples/userspace/hello_world_user/README.rst
index 4f6d83d692b..22ece4becea 100644
--- a/samples/userspace/hello_world_user/README.rst
+++ b/samples/userspace/hello_world_user/README.rst
@@ -1,7 +1,7 @@
-.. _hello_world_user:
+.. zephyr:code-sample:: helloworld_user
+   :name: Hello World
 
-Hello World
-###########
+   Print a simple "Hello World" from userspace.
 
 Overview
 ********
diff --git a/samples/userspace/index.rst b/samples/userspace/index.rst
index 6c455acb9f1..7d387d360d9 100644
--- a/samples/userspace/index.rst
+++ b/samples/userspace/index.rst
@@ -1,10 +1,5 @@
-.. _userspace-samples:
+.. zephyr:code-sample-category:: userspace
+   :name: Userspace
+   :show-listing:
 
-Userspace Samples
-#################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   **/*
+   Samples that demonstrate how to run code in :ref:`usermode_api`.
diff --git a/samples/userspace/prod_consumer/README.rst b/samples/userspace/prod_consumer/README.rst
index ad6f37e521e..cbe6b72295a 100644
--- a/samples/userspace/prod_consumer/README.rst
+++ b/samples/userspace/prod_consumer/README.rst
@@ -1,9 +1,7 @@
-.. _userspace_prod_consumer:
+.. zephyr:code-sample:: userspace_prod_consumer
+   :name: Producer/consumer
 
-Producer/consumer
-=================
-
-This is a sample application that exercises some user mode concepts.
+   Manipulate basic user mode concepts.
 
 Overview
 ********
diff --git a/samples/userspace/shared_mem/README.rst b/samples/userspace/shared_mem/README.rst
index 7c9db36f243..33cf81ee0be 100644
--- a/samples/userspace/shared_mem/README.rst
+++ b/samples/userspace/shared_mem/README.rst
@@ -1,7 +1,7 @@
-.. _userspace_protected_memory:
+.. zephyr:code-sample:: userspace_protected_memory
+   :name: Userspace Protected Memory
 
-Userspace Protected Memory
-##########################
+   Use memory partitioning to protect memory between threads.
 
 Overview
 ********
diff --git a/samples/userspace/syscall_perf/README.rst b/samples/userspace/syscall_perf/README.rst
index 2f5c1ed78ee..c0e677597a0 100644
--- a/samples/userspace/syscall_perf/README.rst
+++ b/samples/userspace/syscall_perf/README.rst
@@ -1,4 +1,7 @@
-.. _syscall_perf:
+.. zephyr:code-sample:: syscall_perf
+   :name: Syscall performance
+
+   Measure performance overhead of a system calls compared to direct function calls.
 
 Syscall performances
 ====================

From 9dfcaf1a848fba95c2d77b2d023da89e68a75d47 Mon Sep 17 00:00:00 2001
From: Lingao Meng <menglingao@xiaomi.com>
Date: Wed, 4 Dec 2024 09:09:51 +0100
Subject: [PATCH 0809/2913] [nrf fromtree] Bluetooth: Mesh: Fix proxy
 advertising set sending Mesh messages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When start to sending proxy advertising, will also process in
send_pending_adv, but the bt_mesh_adv_get_by_tag will directly return
buffer from bt_mesh_adv_queue or bt_mesh_relay_queue, which case
mesh messages sent on different sets, can cause peer replay attack.

Signed-off-by: Lingao Meng <menglingao@xiaomi.com>
(cherry picked from commit b54f49cb8c1c6155859100d9af2106be0bea7fc4)
Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 962f615f2ed5df712d0704de62d67720e6557bf0)
---
 subsys/bluetooth/mesh/adv.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/subsys/bluetooth/mesh/adv.c b/subsys/bluetooth/mesh/adv.c
index 7cc163ba8f8..2f406e52f9a 100644
--- a/subsys/bluetooth/mesh/adv.c
+++ b/subsys/bluetooth/mesh/adv.c
@@ -233,6 +233,11 @@ struct bt_mesh_adv *bt_mesh_adv_get_by_tag(enum bt_mesh_adv_tag_bit tags, k_time
 		return k_fifo_get(&bt_mesh_relay_queue, timeout);
 	}
 
+	if (IS_ENABLED(CONFIG_BT_MESH_ADV_EXT_GATT_SEPARATE) &&
+	    tags & BT_MESH_ADV_TAG_BIT_PROXY) {
+		return NULL;
+	}
+
 	return bt_mesh_adv_get(timeout);
 }
 

From 2a2d2fbf747eaa12f6bb5a59187841e675393d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5vard=20Reierstad?= <haavard.reierstad@nordicsemi.no>
Date: Wed, 4 Dec 2024 09:09:51 +0100
Subject: [PATCH 0810/2913] [nrf fromtree] Bluetooth: Mesh: Use net xmit params
 for bridge
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Makes sure that the Network Transmit state is used when using a Subnet
Bridge.

Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit b38773f14b90c63c2da0d980ef4c725aefb4a140)
Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit f263e7379d043d54b5f07fd62ff93e18ece901e9)
---
 subsys/bluetooth/mesh/net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/bluetooth/mesh/net.c b/subsys/bluetooth/mesh/net.c
index 25d0551a2ee..cf95884fd5a 100644
--- a/subsys/bluetooth/mesh/net.c
+++ b/subsys/bluetooth/mesh/net.c
@@ -705,7 +705,7 @@ static void bt_mesh_net_relay(struct net_buf_simple *sbuf, struct bt_mesh_net_rx
 	 * Anything else (like GATT to adv, or locally originated packets)
 	 * use the Network Transmit state.
 	 */
-	if (rx->net_if == BT_MESH_NET_IF_ADV && !rx->friend_cred) {
+	if (rx->net_if == BT_MESH_NET_IF_ADV && !rx->friend_cred && !bridge) {
 		transmit = bt_mesh_relay_retransmit_get();
 	} else {
 		transmit = bt_mesh_net_transmit_get();

From 453a680b5518f1dcf4747e2d0a45008147600871 Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Wed, 4 Dec 2024 09:09:51 +0100
Subject: [PATCH 0811/2913] [nrf fromtree] bluetooth: mesh: Use bt_get_name to
 get device name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

By default if CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME
or CONFIG_BT_MESH_PB_GATT_USE_DEVICE_NAME is enabled, the mesh stack
will add BT_DATA_NAME_COMPLETE AD Type along with the Mesh Proxy Service
or Mesh Provisioning Service advertisements accordingly.

When BT_LE_ADV_OPT_USE_NAME was present and
CONFIG_BT_DEVICE_NAME_DYNAMIC is enabled, the advertised name was
automatically updated by the host. This turned out to be a side-effect
rather than expected behavior and after #71700 this behavior waa
changed.

But customers use dynamic name feature.

This commit makes the mesh stack use bt_get_name to get the device name,
which returns runtime name if CONFIG_BT_DEVICE_NAME_DYNAMIC is enabled.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit ab346a1dd0298776af43a6d8b9f84ce7e28cb10f)
Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit f98c140bb0c4c9d0ad2e7dbb80b40ea86898ee93)
---
 subsys/bluetooth/mesh/pb_gatt_srv.c | 13 ++++++-------
 subsys/bluetooth/mesh/proxy.h       |  6 ++++++
 subsys/bluetooth/mesh/proxy_srv.c   | 29 +++++++++++++++++++++--------
 3 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/subsys/bluetooth/mesh/pb_gatt_srv.c b/subsys/bluetooth/mesh/pb_gatt_srv.c
index 85b60cbe0fd..6f257a16e82 100644
--- a/subsys/bluetooth/mesh/pb_gatt_srv.c
+++ b/subsys/bluetooth/mesh/pb_gatt_srv.c
@@ -243,13 +243,12 @@ static size_t gatt_prov_adv_create(struct bt_data prov_sd[2])
 	prov_sd_len += 1;
 
 dev_name:
-#if defined(CONFIG_BT_MESH_PB_GATT_USE_DEVICE_NAME)
-	prov_sd[prov_sd_len].type = BT_DATA_NAME_COMPLETE;
-	prov_sd[prov_sd_len].data_len = sizeof(CONFIG_BT_DEVICE_NAME) - 1;
-	prov_sd[prov_sd_len].data = CONFIG_BT_DEVICE_NAME;
-
-	prov_sd_len += 1;
-#endif
+	if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT_USE_DEVICE_NAME)) {
+		prov_sd[prov_sd_len].type = BT_DATA_NAME_COMPLETE;
+		prov_sd[prov_sd_len].data_len = BT_DEVICE_NAME_LEN;
+		prov_sd[prov_sd_len].data = BT_DEVICE_NAME;
+		prov_sd_len += 1;
+	}
 
 	return prov_sd_len;
 }
diff --git a/subsys/bluetooth/mesh/proxy.h b/subsys/bluetooth/mesh/proxy.h
index 34a119c3df6..c56e9dab0d1 100644
--- a/subsys/bluetooth/mesh/proxy.h
+++ b/subsys/bluetooth/mesh/proxy.h
@@ -18,6 +18,12 @@
 	.interval_min = BT_GAP_ADV_FAST_INT_MIN_2,                             \
 	.interval_max = BT_GAP_ADV_FAST_INT_MAX_2
 
+#define BT_DEVICE_NAME (IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC) ? \
+			(const uint8_t *)bt_get_name() : \
+			(const uint8_t *)CONFIG_BT_DEVICE_NAME)
+#define BT_DEVICE_NAME_LEN (IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC) ? strlen(bt_get_name()) : \
+			    (sizeof(CONFIG_BT_DEVICE_NAME) - 1))
+
 #define BT_MESH_ID_TYPE_NET	  0x00
 #define BT_MESH_ID_TYPE_NODE	  0x01
 #define BT_MESH_ID_TYPE_PRIV_NET  0x02
diff --git a/subsys/bluetooth/mesh/proxy_srv.c b/subsys/bluetooth/mesh/proxy_srv.c
index 32e865773b3..39bfac07792 100644
--- a/subsys/bluetooth/mesh/proxy_srv.c
+++ b/subsys/bluetooth/mesh/proxy_srv.c
@@ -483,12 +483,6 @@ static const struct bt_data net_id_ad[] = {
 	BT_DATA(BT_DATA_SVC_DATA16, proxy_svc_data, NET_ID_LEN),
 };
 
-static const struct bt_data sd[] = {
-#if defined(CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME)
-	BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1),
-#endif
-};
-
 static int randomize_bt_addr(void)
 {
 	/* TODO: There appears to be no way to force an RPA/NRPA refresh. */
@@ -510,6 +504,7 @@ static int enc_id_adv(struct bt_mesh_subnet *sub, uint8_t type,
 					 type == BT_MESH_ID_TYPE_PRIV_NODE),
 		ADV_FAST_INT,
 	};
+	struct bt_data sd[1];
 	int err;
 
 	err = bt_mesh_encrypt(&sub->keys[SUBNET_KEY_TX_IDX(sub)].identity, hash, hash);
@@ -529,9 +524,17 @@ static int enc_id_adv(struct bt_mesh_subnet *sub, uint8_t type,
 	proxy_svc_data[2] = type;
 	memcpy(&proxy_svc_data[3], &hash[8], 8);
 
+	if (IS_ENABLED(CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME)) {
+		sd[0].type = BT_DATA_NAME_COMPLETE;
+		sd[0].data_len = BT_DEVICE_NAME_LEN;
+		sd[0].data = BT_DEVICE_NAME;
+	}
+
 	err = bt_mesh_adv_gatt_start(
 		type == BT_MESH_ID_TYPE_PRIV_NET ? &slow_adv_param : &fast_adv_param,
-		duration, enc_id_ad, ARRAY_SIZE(enc_id_ad), sd, ARRAY_SIZE(sd));
+		duration, enc_id_ad, ARRAY_SIZE(enc_id_ad),
+		IS_ENABLED(CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME) ? sd : NULL,
+		IS_ENABLED(CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME) ? ARRAY_SIZE(sd) : 0);
 	if (err) {
 		LOG_WRN("Failed to advertise using type 0x%02x (err %d)", type, err);
 		return err;
@@ -607,6 +610,7 @@ static int net_id_adv(struct bt_mesh_subnet *sub, int32_t duration)
 		.options = ADV_OPT_PROXY(false),
 		ADV_SLOW_INT,
 	};
+	struct bt_data sd[1];
 	int err;
 
 	proxy_svc_data[2] = BT_MESH_ID_TYPE_NET;
@@ -615,8 +619,17 @@ static int net_id_adv(struct bt_mesh_subnet *sub, int32_t duration)
 
 	memcpy(proxy_svc_data + 3, sub->keys[SUBNET_KEY_TX_IDX(sub)].net_id, 8);
 
+	if (IS_ENABLED(CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME)) {
+		sd[0].type = BT_DATA_NAME_COMPLETE;
+		sd[0].data_len = BT_DEVICE_NAME_LEN;
+		sd[0].data = BT_DEVICE_NAME;
+	}
+
 	err = bt_mesh_adv_gatt_start(&slow_adv_param, duration, net_id_ad,
-				     ARRAY_SIZE(net_id_ad), sd, ARRAY_SIZE(sd));
+				     ARRAY_SIZE(net_id_ad),
+				     IS_ENABLED(CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME) ? sd : NULL,
+				     IS_ENABLED(CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME) ?
+					ARRAY_SIZE(sd) : 0);
 	if (err) {
 		LOG_WRN("Failed to advertise using Network ID (err %d)", err);
 		return err;

From eab2aea54f6a393e1e417e859511a4c16cc53901 Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Wed, 4 Dec 2024 09:09:51 +0100
Subject: [PATCH 0812/2913] [nrf fromtree] bluetooth: mesh: gatt: Move generic
 GATT related defines to gatt.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This moves GATT releated defines that are used by both Mesh Proxy
Service and Mesh Provisioning Service implementations to a common
header file.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit 684c94e4690c15e590707e9aeb9974d67b8fdd53)
Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 3ff85afdf670d1c935e6341b8b73b57a4b7a275f)
---
 subsys/bluetooth/mesh/gatt.h        | 19 +++++++++++++++++++
 subsys/bluetooth/mesh/pb_gatt_srv.c |  1 +
 subsys/bluetooth/mesh/proxy.h       | 14 --------------
 subsys/bluetooth/mesh/proxy_srv.c   |  1 +
 4 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 subsys/bluetooth/mesh/gatt.h

diff --git a/subsys/bluetooth/mesh/gatt.h b/subsys/bluetooth/mesh/gatt.h
new file mode 100644
index 00000000000..ee5edf9cadc
--- /dev/null
+++ b/subsys/bluetooth/mesh/gatt.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define ADV_SLOW_INT                                                           \
+	.interval_min = BT_GAP_ADV_SLOW_INT_MIN,                               \
+	.interval_max = BT_GAP_ADV_SLOW_INT_MAX
+
+#define ADV_FAST_INT                                                           \
+	.interval_min = BT_GAP_ADV_FAST_INT_MIN_2,                             \
+	.interval_max = BT_GAP_ADV_FAST_INT_MAX_2
+
+#define BT_DEVICE_NAME (IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC) ? \
+			(const uint8_t *)bt_get_name() : \
+			(const uint8_t *)CONFIG_BT_DEVICE_NAME)
+#define BT_DEVICE_NAME_LEN (IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC) ? strlen(bt_get_name()) : \
+			    (sizeof(CONFIG_BT_DEVICE_NAME) - 1))
diff --git a/subsys/bluetooth/mesh/pb_gatt_srv.c b/subsys/bluetooth/mesh/pb_gatt_srv.c
index 6f257a16e82..24211edea70 100644
--- a/subsys/bluetooth/mesh/pb_gatt_srv.c
+++ b/subsys/bluetooth/mesh/pb_gatt_srv.c
@@ -26,6 +26,7 @@
 #include "foundation.h"
 #include "access.h"
 #include "proxy.h"
+#include "gatt.h"
 #include "proxy_msg.h"
 #include "pb_gatt_srv.h"
 
diff --git a/subsys/bluetooth/mesh/proxy.h b/subsys/bluetooth/mesh/proxy.h
index c56e9dab0d1..102ff1834a7 100644
--- a/subsys/bluetooth/mesh/proxy.h
+++ b/subsys/bluetooth/mesh/proxy.h
@@ -10,20 +10,6 @@
 #define ADV_OPT_USE_IDENTITY 0
 #endif
 
-#define ADV_SLOW_INT                                                           \
-	.interval_min = BT_GAP_ADV_SLOW_INT_MIN,                               \
-	.interval_max = BT_GAP_ADV_SLOW_INT_MAX
-
-#define ADV_FAST_INT                                                           \
-	.interval_min = BT_GAP_ADV_FAST_INT_MIN_2,                             \
-	.interval_max = BT_GAP_ADV_FAST_INT_MAX_2
-
-#define BT_DEVICE_NAME (IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC) ? \
-			(const uint8_t *)bt_get_name() : \
-			(const uint8_t *)CONFIG_BT_DEVICE_NAME)
-#define BT_DEVICE_NAME_LEN (IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC) ? strlen(bt_get_name()) : \
-			    (sizeof(CONFIG_BT_DEVICE_NAME) - 1))
-
 #define BT_MESH_ID_TYPE_NET	  0x00
 #define BT_MESH_ID_TYPE_NODE	  0x01
 #define BT_MESH_ID_TYPE_PRIV_NET  0x02
diff --git a/subsys/bluetooth/mesh/proxy_srv.c b/subsys/bluetooth/mesh/proxy_srv.c
index 39bfac07792..63d7755df1a 100644
--- a/subsys/bluetooth/mesh/proxy_srv.c
+++ b/subsys/bluetooth/mesh/proxy_srv.c
@@ -28,6 +28,7 @@
 #include "foundation.h"
 #include "access.h"
 #include "proxy.h"
+#include "gatt.h"
 #include "proxy_msg.h"
 #include "crypto.h"
 

From 5b8badb6ebd38e833d9fb49c457763f20c600159 Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Wed, 4 Dec 2024 09:09:51 +0100
Subject: [PATCH 0813/2913] [nrf fromtree] bluetooth: mesh: proxy_msg: Fix
 extracting role from k_work
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix extracting role from k_work.
Hot fix for #78914

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit f5409bd3deba779263fb58bb06a0573e034795cf)
Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 52c7aa82212fb9280bd733145262c0d32d8d5b27)
---
 subsys/bluetooth/mesh/proxy_msg.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/subsys/bluetooth/mesh/proxy_msg.c b/subsys/bluetooth/mesh/proxy_msg.c
index 861935f58cc..edee3ad384c 100644
--- a/subsys/bluetooth/mesh/proxy_msg.c
+++ b/subsys/bluetooth/mesh/proxy_msg.c
@@ -252,11 +252,9 @@ int bt_mesh_proxy_relay_send(struct bt_conn *conn, struct bt_mesh_adv *adv)
 
 static void proxy_msg_send_pending(struct k_work *work)
 {
-	struct bt_mesh_proxy_role *role;
-	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
+	struct bt_mesh_proxy_role *role = CONTAINER_OF(work, struct bt_mesh_proxy_role, work);
 	struct bt_mesh_adv *adv;
 
-	role = CONTAINER_OF(dwork, struct bt_mesh_proxy_role, sar_timer);
 	if (!role->conn) {
 		return;
 	}

From 7310fc7d1da6d6da1b0e9467f6ea53851739700a Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Wed, 4 Dec 2024 09:09:51 +0100
Subject: [PATCH 0814/2913] [nrf fromtree] bluetooth: mesh: cfg_cli: Check buf
 len when pulling out data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit checks that config client doesn't pull out data outside of
the buffer.

Fixes #80012

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit e2a0fafe423ae616c52223cf254132d8f3159162)
Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit d8de6cece2bf8d48f2f81578355a30d197a31b5f)
---
 subsys/bluetooth/mesh/cfg_cli.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/subsys/bluetooth/mesh/cfg_cli.c b/subsys/bluetooth/mesh/cfg_cli.c
index aa762e9b906..225b60e84a8 100644
--- a/subsys/bluetooth/mesh/cfg_cli.c
+++ b/subsys/bluetooth/mesh/cfg_cli.c
@@ -2332,6 +2332,10 @@ struct bt_mesh_comp_p1_elem *bt_mesh_comp_p1_elem_pull(struct net_buf_simple *bu
 	elem->nsig = net_buf_simple_pull_u8(buf);
 	elem->nvnd = net_buf_simple_pull_u8(buf);
 	for (i = 0; i < elem->nsig + elem->nvnd; i++) {
+		if (buf->len < elem_size + 1) {
+			return NULL;
+		}
+
 		header = buf->data[elem_size];
 		cor_present = COR_PRESENT(header);
 		fmt = FMT(header);
@@ -2346,6 +2350,10 @@ struct bt_mesh_comp_p1_elem *bt_mesh_comp_p1_elem_pull(struct net_buf_simple *bu
 		elem_size += (1 + cor_present) + (fmt + 1) * ext_item_cnt;
 	}
 
+	if (buf->len < elem_size) {
+		return NULL;
+	}
+
 	net_buf_simple_init_with_data(elem->_buf,
 				      net_buf_simple_pull_mem(buf, elem_size),
 				      elem_size);
@@ -2372,9 +2380,17 @@ struct bt_mesh_comp_p1_model_item *bt_mesh_comp_p1_item_pull(
 	item->ext_item_cnt = EXT_ITEM_CNT(header);
 	item_size = item->ext_item_cnt * (item->format + 1);
 	if (item->cor_present) {
+		if (elem->_buf->len < 1) {
+			return NULL;
+		}
+
 		item->cor_id = net_buf_simple_pull_u8(elem->_buf);
 	}
 
+	if (elem->_buf->len < item_size) {
+		return NULL;
+	}
+
 	net_buf_simple_init_with_data(item->_buf,
 				      net_buf_simple_pull_mem(elem->_buf, item_size),
 				      item_size);

From 0e3169221939902e2c4ffcf44ff08b336c065784 Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Wed, 4 Dec 2024 09:09:51 +0100
Subject: [PATCH 0815/2913] [nrf fromtree] bluetooth: mesh: cfg_cli: Update
 logs when pulling out CDP0 and 1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commits puts in order log messages when unpacking CDP0 and CDP1 so
that it a bit more clear where the error happens.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit 1eeee010bd00be90acfc0693cfdf04970d45e006)
Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 7d31b726809400200992a0a8841299350b840e88)
---
 subsys/bluetooth/mesh/cfg_cli.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/subsys/bluetooth/mesh/cfg_cli.c b/subsys/bluetooth/mesh/cfg_cli.c
index 225b60e84a8..9c4301e0b09 100644
--- a/subsys/bluetooth/mesh/cfg_cli.c
+++ b/subsys/bluetooth/mesh/cfg_cli.c
@@ -2275,6 +2275,7 @@ struct bt_mesh_comp_p0_elem *bt_mesh_comp_p0_elem_pull(const struct bt_mesh_comp
 	size_t modlist_size;
 
 	if (page->_buf->len < 4) {
+		LOG_DBG("Buffer is too short");
 		return NULL;
 	}
 
@@ -2285,6 +2286,7 @@ struct bt_mesh_comp_p0_elem *bt_mesh_comp_p0_elem_pull(const struct bt_mesh_comp
 	modlist_size = elem->nsig * 2 + elem->nvnd * 4;
 
 	if (page->_buf->len < modlist_size) {
+		LOG_DBG("Buffer is shorter than number of claimed models");
 		return NULL;
 	}
 
@@ -2321,7 +2323,7 @@ struct bt_mesh_comp_p1_elem *bt_mesh_comp_p1_elem_pull(struct net_buf_simple *bu
 						       struct bt_mesh_comp_p1_elem *elem)
 {
 	if (buf->len < 4) {
-		LOG_DBG("No more elements to pull or missing data");
+		LOG_DBG("Buffer is too short");
 		return NULL;
 	}
 	size_t elem_size = 0;
@@ -2333,6 +2335,7 @@ struct bt_mesh_comp_p1_elem *bt_mesh_comp_p1_elem_pull(struct net_buf_simple *bu
 	elem->nvnd = net_buf_simple_pull_u8(buf);
 	for (i = 0; i < elem->nsig + elem->nvnd; i++) {
 		if (buf->len < elem_size + 1) {
+			LOG_DBG("Buffer is shorter than number of claimed models");
 			return NULL;
 		}
 
@@ -2351,6 +2354,7 @@ struct bt_mesh_comp_p1_elem *bt_mesh_comp_p1_elem_pull(struct net_buf_simple *bu
 	}
 
 	if (buf->len < elem_size) {
+		LOG_DBG("No more elements to pull or missing data");
 		return NULL;
 	}
 
@@ -2381,6 +2385,7 @@ struct bt_mesh_comp_p1_model_item *bt_mesh_comp_p1_item_pull(
 	item_size = item->ext_item_cnt * (item->format + 1);
 	if (item->cor_present) {
 		if (elem->_buf->len < 1) {
+			LOG_DBG("Coresponding_Present field is claimed but not present");
 			return NULL;
 		}
 
@@ -2388,6 +2393,7 @@ struct bt_mesh_comp_p1_model_item *bt_mesh_comp_p1_item_pull(
 	}
 
 	if (elem->_buf->len < item_size) {
+		LOG_DBG("No more elements to pull or missing data");
 		return NULL;
 	}
 

From 1441c775f6a0aa09a33ee8476040d3b329e66e75 Mon Sep 17 00:00:00 2001
From: Ludvig Jordet <ludvig.jordet@nordicsemi.no>
Date: Wed, 4 Dec 2024 09:09:51 +0100
Subject: [PATCH 0816/2913] [nrf fromtree] Bluetooth: Mesh: Fix cfg_cli KRP not
 working for key_net_idx != 0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Initializes the `net_idx` field of the ack context properly for KRP
functions in the Config Client.

This fixes a problem where `bt_mesh_cfg_cli_krp_get` and
`bt_mesh_cfg_cli_krp_set` would always fail the ack ctx comparison if
`key_net_idx` was != 0.

Signed-off-by: Ludvig Jordet <ludvig.jordet@nordicsemi.no>
(cherry picked from commit 88f62a1a5eb5cdf51a9d5a2d847712c9b33f3193)
Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 48cdbacbd7ee834f9d874be7c4c1c7dc372cedf4)
---
 subsys/bluetooth/mesh/cfg_cli.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/subsys/bluetooth/mesh/cfg_cli.c b/subsys/bluetooth/mesh/cfg_cli.c
index 9c4301e0b09..20e7ec065b4 100644
--- a/subsys/bluetooth/mesh/cfg_cli.c
+++ b/subsys/bluetooth/mesh/cfg_cli.c
@@ -1187,6 +1187,7 @@ int bt_mesh_cfg_cli_krp_get(uint16_t net_idx, uint16_t addr, uint16_t key_net_id
 	struct krp_param param = {
 		.status = status,
 		.phase = phase,
+		.net_idx = key_net_idx,
 	};
 	const struct bt_mesh_msg_rsp_ctx rsp = {
 		.ack = &cli->ack_ctx,
@@ -1209,6 +1210,7 @@ int bt_mesh_cfg_cli_krp_set(uint16_t net_idx, uint16_t addr, uint16_t key_net_id
 	struct krp_param param = {
 		.status = status,
 		.phase = phase,
+		.net_idx = key_net_idx,
 	};
 	const struct bt_mesh_msg_rsp_ctx rsp = {
 		.ack = &cli->ack_ctx,

From eb8409f6ae8fb556e8617fe72dc70a9ee71c9407 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 4 Dec 2024 02:25:59 +0530
Subject: [PATCH 0817/2913] [nrf noup] modules: hostap: Fix Enterpise mode with
 nRF security

The PEM Kconfig symbols is non-standard and isn't available for nRF
security, for now add a check to enable that only for MbedTLS builtin
which is not applicable for nRF security.

Fixes NCSDK-30762.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit c21cc96eb32aa8ea89144f02decfe51104fe401e)
---
 modules/hostap/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index 813a9b91ed6..237ed3ea5e3 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -183,7 +183,7 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA
 
 config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	bool "Enterprise Crypto support for WiFi"
-	select MBEDTLS_PEM_CERTIFICATE_FORMAT
+	select MBEDTLS_PEM_CERTIFICATE_FORMAT if MBEDTLS_BUILTIN
 	depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
 
 config EAP_TLS

From 1ed92e4ad5e3fbf9ba0a888048b80acb5e057aeb Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 26 Sep 2024 11:29:55 -0700
Subject: [PATCH 0818/2913] [nrf fromtree] picolibc: Update module to version
 1.8.8

Switch to released version with all of the Zephyr build fixes

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit d5b653961487ce516dc0eefca65d19dfc72a1497)
(cherry picked from commit 126440bfbbf9b03d948375ea3eab0a34297266e3)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 11cd720a905..4ca8aa06f6a 100644
--- a/west.yml
+++ b/west.yml
@@ -318,7 +318,7 @@ manifest:
         - debug
     - name: picolibc
       path: modules/lib/picolibc
-      revision: 06bde1fd7531b1f788f6e42b6f7b358c0fe4f814
+      revision: e15656f7682500fc8953e1a2008f7b1ae4f65ce8
     - name: segger
       revision: b011c45b585e097d95d9cf93edf4f2e01588d3cd
       path: modules/debug/segger

From 356327485e2bb7958d5f89c437f2147e66eaea5b Mon Sep 17 00:00:00 2001
From: Jonathon Penix <jpenix@quicinc.com>
Date: Tue, 27 Aug 2024 17:11:06 -0700
Subject: [PATCH 0819/2913] [nrf fromtree] cmake: linker: Use the same linker
 for cmake checks and final build

Currently, the linker that is used when performing various cmake checks
(check_c_compiler_flag, for example) may be different than the linker that
will be used during the actual build. This happens as we currently specify
'-fuse-ld' to force the appropriate linker a) after many such checks have
already happened and b) in a way which is not automatically propagated to
check_c_compiler_flag (and friends). As a result, the toolchain's default
linker will generally be used for such checks regardless of which linker
was selected in Zephyr.

This can lead to a number of surprises when building Zephyr, particularly
when building with clang. For example:

- If the linker is misconfigured, where the build will fail can vary
  depending on whether the linker is the toolchain's default. When the
  configured linker happens to be the toolchain's default, the build
  (helpfully) fails quickly on the checks for a basic working toochain.
  When the configured linker isn't the default, the build won't fail until
  the final link steps.
- The build can fail due to issues with a linker other than the one
  configured by the user in Zephyr. For example, LLVM toolchains without
  lld will generally fail to build Zephyr (the checks for a basic
  working toochain will fail) for targets where lld is the default in LLVM
  even if GNU ld is configured in Zephyr and would otherwise be used in the
  final build.
- Flags which are only added if check_c_compiler_flag (or similar) succeeds
  may be unexpectedly omitted during the final build if the flag is
  supported in the configured linker but is unsupported in the toolchain's
  default linker (as check_c_compiler_flag will test using the default
  one).

Note that this isn't limited to clang--even when we are building with
Zephyr's SDK and force ld.bfd, we seem to use the 'ld' variant during the
cmake checks (though this generally seems fairly harmless compared to
mixing ld/lld or other proprietary linkers).

To fix this, ensure the appropriate 'fuse-ld' is set early enough and in
such a way that the same linker will be used throughout the entire build.

Signed-off-by: Jonathon Penix <jpenix@quicinc.com>
Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 9fe6c5e3fb38d8b0b62b173eeaff48334ecfb060)
(cherry picked from commit d90a2c5ffc125e139d9474fa6281275aec41cd8a)
---
 cmake/linker/ld/target.cmake  | 15 ++++++++-------
 cmake/linker/lld/target.cmake |  4 ++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/cmake/linker/ld/target.cmake b/cmake/linker/ld/target.cmake
index ed29e88aa16..4382f156dcc 100644
--- a/cmake/linker/ld/target.cmake
+++ b/cmake/linker/ld/target.cmake
@@ -6,6 +6,14 @@ set(CMAKE_LINKER ${GNULD_LINKER})
 
 set_ifndef(LINKERFLAGPREFIX -Wl)
 
+if((${CMAKE_LINKER} STREQUAL "${CROSS_COMPILE}ld.bfd") OR
+   ${GNULD_LINKER_IS_BFD})
+  # ld.bfd was found so let's explicitly use that for linking, see #32237
+  list(APPEND TOOLCHAIN_LD_FLAGS -fuse-ld=bfd)
+  list(APPEND CMAKE_REQUIRED_FLAGS -fuse-ld=bfd)
+  string(REPLACE ";" " " CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
+endif()
+
 if(NOT "${ZEPHYR_TOOLCHAIN_VARIANT}" STREQUAL "host")
   if(CONFIG_CPP_EXCEPTIONS AND LIBGCC_DIR)
     # When building with C++ Exceptions, it is important that crtbegin and crtend
@@ -118,16 +126,9 @@ function(toolchain_ld_link_elf)
     ${ARGN}                                                   # input args to parse
   )
 
-  if((${CMAKE_LINKER} STREQUAL "${CROSS_COMPILE}ld.bfd") OR
-     ${GNULD_LINKER_IS_BFD})
-    # ld.bfd was found so let's explicitly use that for linking, see #32237
-    set(use_linker "-fuse-ld=bfd")
-  endif()
-
   target_link_libraries(
     ${TOOLCHAIN_LD_LINK_ELF_TARGET_ELF}
     ${TOOLCHAIN_LD_LINK_ELF_LIBRARIES_PRE_SCRIPT}
-    ${use_linker}
     ${TOPT}
     ${TOOLCHAIN_LD_LINK_ELF_LINKER_SCRIPT}
     ${TOOLCHAIN_LD_LINK_ELF_LIBRARIES_POST_SCRIPT}
diff --git a/cmake/linker/lld/target.cmake b/cmake/linker/lld/target.cmake
index a16529eeef7..9ce3313334f 100644
--- a/cmake/linker/lld/target.cmake
+++ b/cmake/linker/lld/target.cmake
@@ -6,6 +6,10 @@ set(CMAKE_LINKER ${LLVMLLD_LINKER})
 
 set_ifndef(LINKERFLAGPREFIX -Wl)
 
+list(APPEND TOOLCHAIN_LD_FLAGS -fuse-ld=lld)
+list(APPEND CMAKE_REQUIRED_FLAGS -fuse-ld=lld)
+string(REPLACE ";" " " CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
+
 # Run $LINKER_SCRIPT file through the C preprocessor, producing ${linker_script_gen}
 # NOTE: ${linker_script_gen} will be produced at build-time; not at configure-time
 macro(configure_linker_script linker_script_gen linker_pass_define)

From 20528f7dc207e15901c69c59ef3d838c9467223a Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Tue, 6 Aug 2024 10:13:31 +0200
Subject: [PATCH 0820/2913] [nrf fromtree] cmake: improve Zephyr link phase

Zephyr is a bare metal build where standard libs are disabled.

This means that c and runtime libraries must manually be linked in.

This has generally been handled by using CMake's link libraries handling
but the issue with that is both de-duplication but also library link
order.

Standard libraries must be linked at last location to ensure symbols
are always available, however this is not optimal with
target_link_libraries() because this would ultimately require every
library to know the c library to link with, which is not desired.

Therefore, setup standard C and runtime library linking in linker
CMake files for toolchains where this is required.

This commit expands the principle introduced with toolchain abstraction,
see PR#24851.

This means that a toolchain implementation may specify standard C,
runtime, C++, etc libraries, as well as their link order.
Because a property approach is used, then Zephyr modules, such as the
Picolibc module can adjust such properties.

An optional `zephyr_linker_finalize()` macro is called at the end of
Zephyr's CMakeList process and can be used by the toolchain
implementation to define the final linker invocation.

This aligns the linker handling flow to the principle introduced in
PR#24851 and improves the flexibility and robustness of Zephyr build
system.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 2e3873adde2386e0bc9acdbcdc8d389fdf4b9aee)
(cherry picked from commit a5c6e0af4fb48c38b7cf74e0e50657c74ac84d05)
---
 CMakeLists.txt                               |  2 +
 cmake/compiler/clang/target.cmake            |  4 +-
 cmake/compiler/gcc/target.cmake              |  3 +-
 cmake/linker/armlink/linker_flags.cmake      |  6 ---
 cmake/linker/armlink/linker_libraries.cmake  |  8 ++++
 cmake/linker/armlink/target.cmake            | 18 ++++++++
 cmake/linker/ld/linker_flags.cmake           |  4 --
 cmake/linker/ld/linker_libraries.cmake       | 38 ++++++++++++++++
 cmake/linker/ld/target.cmake                 | 46 ++++++++++++++------
 cmake/linker/linker_libraries_template.cmake | 16 +++++++
 cmake/linker/lld/linker_flags.cmake          |  4 +-
 cmake/linker/lld/linker_libraries.cmake      | 21 +++++++++
 cmake/linker/lld/target.cmake                | 22 +++++++++-
 cmake/linker/target_template.cmake           | 13 ++++++
 cmake/linker/xt-ld/target.cmake              | 22 +++++++++-
 cmake/modules/FindTargetTools.cmake          |  2 +
 cmake/modules/extensions.cmake               | 33 ++++++++++++++
 cmake/target_toolchain_flags.cmake           |  2 +
 cmake/toolchain/llvm/generic.cmake           |  2 +-
 lib/libc/newlib/CMakeLists.txt               | 28 ------------
 lib/libc/picolibc/CMakeLists.txt             |  2 +-
 21 files changed, 234 insertions(+), 62 deletions(-)
 delete mode 100644 cmake/linker/armlink/linker_flags.cmake
 create mode 100644 cmake/linker/armlink/linker_libraries.cmake
 create mode 100644 cmake/linker/ld/linker_libraries.cmake
 create mode 100644 cmake/linker/linker_libraries_template.cmake
 create mode 100644 cmake/linker/lld/linker_libraries.cmake
 create mode 100644 cmake/linker/target_template.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 952acccbba8..cbd6ac7bb1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2232,3 +2232,5 @@ add_subdirectory_ifdef(
   CONFIG_MAKEFILE_EXPORTS
   cmake/makefile_exports
   )
+
+toolchain_linker_finalize()
diff --git a/cmake/compiler/clang/target.cmake b/cmake/compiler/clang/target.cmake
index 30e5da399af..d2d41e8b23c 100644
--- a/cmake/compiler/clang/target.cmake
+++ b/cmake/compiler/clang/target.cmake
@@ -76,8 +76,8 @@ if(NOT "${ARCH}" STREQUAL "posix")
   get_filename_component(RTLIB_NAME_WITH_PREFIX ${RTLIB_FILE_NAME} NAME_WLE)
   string(REPLACE lib "" RTLIB_NAME ${RTLIB_NAME_WITH_PREFIX})
 
-  list(APPEND LIB_INCLUDE_DIR -L${RTLIB_DIR})
-  list(APPEND TOOLCHAIN_LIBS ${RTLIB_NAME})
+  set_property(TARGET linker PROPERTY lib_include_dir "-L${RTLIB_DIR}")
+  set_property(TARGET linker PROPERTY rt_library "-l${RTLIB_NAME}")
 
   list(APPEND CMAKE_REQUIRED_FLAGS -nostartfiles -nostdlib ${isystem_include_flags})
   string(REPLACE ";" " " CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
diff --git a/cmake/compiler/gcc/target.cmake b/cmake/compiler/gcc/target.cmake
index 5b1e5db1218..7e8ffc48173 100644
--- a/cmake/compiler/gcc/target.cmake
+++ b/cmake/compiler/gcc/target.cmake
@@ -109,8 +109,7 @@ get_filename_component(LIBGCC_DIR ${LIBGCC_FILE_NAME} DIRECTORY)
 
 assert_exists(LIBGCC_DIR)
 
-LIST(APPEND LIB_INCLUDE_DIR "-L\"${LIBGCC_DIR}\"")
-LIST(APPEND TOOLCHAIN_LIBS gcc)
+set_linker_property(PROPERTY lib_include_dir "-L\"${LIBGCC_DIR}\"")
 
 # For CMake to be able to test if a compiler flag is supported by the
 # toolchain we need to give CMake the necessary flags to compile and
diff --git a/cmake/linker/armlink/linker_flags.cmake b/cmake/linker/armlink/linker_flags.cmake
deleted file mode 100644
index b0f93a7b9e7..00000000000
--- a/cmake/linker/armlink/linker_flags.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-# The ARMClang linker, armlink, requires a dedicated linking signature in
-# order for Zephyr to control the map file.
-
-set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_LINKER> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES> <OBJECTS> -o <TARGET>")
-set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_LINKER> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES> <OBJECTS> -o <TARGET>")
-set(CMAKE_ASM_LINK_EXECUTABLE "<CMAKE_LINKER> <CMAKE_ASM_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES> <OBJECTS> -o <TARGET>")
diff --git a/cmake/linker/armlink/linker_libraries.cmake b/cmake/linker/armlink/linker_libraries.cmake
new file mode 100644
index 00000000000..8374e7c3cd2
--- /dev/null
+++ b/cmake/linker/armlink/linker_libraries.cmake
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Per default armclang (Arm Compiler 6) doesn't need explicit C library linking
+# so we only need to set link order linking in case a custom C library is linked
+# in, such as picolibc.
+set_property(TARGET linker APPEND PROPERTY link_order_library "c;rt")
diff --git a/cmake/linker/armlink/target.cmake b/cmake/linker/armlink/target.cmake
index 9aa32ad0e6f..b2e1e867f90 100644
--- a/cmake/linker/armlink/target.cmake
+++ b/cmake/linker/armlink/target.cmake
@@ -108,5 +108,23 @@ function(toolchain_ld_link_elf)
   )
 endfunction(toolchain_ld_link_elf)
 
+# This function will generate the correct CMAKE_C_LINK_EXECUTABLE / CMAKE_CXX_LINK_EXECUTABLE
+# rule to ensure that standard c and runtime libraries are correctly placed
+# and the end of link invocation and doesn't appear in the middle of the link
+# command invocation.
+macro(toolchain_linker_finalize)
+  set(zephyr_std_libs)
+  get_property(link_order TARGET linker PROPERTY link_order_library)
+  foreach(lib ${link_order})
+    get_property(link_flag TARGET linker PROPERTY ${lib}_library)
+    set(zephyr_std_libs "${zephyr_std_libs} ${link_flag}")
+  endforeach()
+
+  set(common_link "<LINK_FLAGS> <LINK_LIBRARIES> <OBJECTS> ${zephyr_std_libs} -o <TARGET>")
+  set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_LINKER> <CMAKE_C_LINK_FLAGS> ${common_link}")
+  set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_LINKER> <CMAKE_CXX_LINK_FLAGS> ${common_link}")
+  set(CMAKE_ASM_LINK_EXECUTABLE "<CMAKE_LINKER> <CMAKE_ASM_LINK_FLAGS> ${common_link}")
+endmacro()
+
 include(${ZEPHYR_BASE}/cmake/linker/ld/target_relocation.cmake)
 include(${ZEPHYR_BASE}/cmake/linker/ld/target_configure.cmake)
diff --git a/cmake/linker/ld/linker_flags.cmake b/cmake/linker/ld/linker_flags.cmake
index 49bba260d3a..5063ddb46fb 100644
--- a/cmake/linker/ld/linker_flags.cmake
+++ b/cmake/linker/ld/linker_flags.cmake
@@ -7,10 +7,6 @@ check_set_linker_property(TARGET linker PROPERTY base
                           ${LINKERFLAGPREFIX},--build-id=none
 )
 
-if(NOT CONFIG_MINIMAL_LIBCPP AND NOT CONFIG_NATIVE_LIBRARY AND NOT CONFIG_EXTERNAL_MODULE_LIBCPP)
-  set_property(TARGET linker PROPERTY cpp_base -lstdc++)
-endif()
-
 check_set_linker_property(TARGET linker PROPERTY baremetal
                           -nostdlib
                           -static
diff --git a/cmake/linker/ld/linker_libraries.cmake b/cmake/linker/ld/linker_libraries.cmake
new file mode 100644
index 00000000000..1305d682ab5
--- /dev/null
+++ b/cmake/linker/ld/linker_libraries.cmake
@@ -0,0 +1,38 @@
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Do not specify default link libraries when targeting host (native build).
+if(NOT CONFIG_NATIVE_BUILD)
+  set_linker_property(NO_CREATE PROPERTY c_library    "-lc")
+  set_linker_property(NO_CREATE PROPERTY rt_library   "-lgcc")
+  set_linker_property(NO_CREATE PROPERTY c++_library  "-lstdc++")
+  set_linker_property(NO_CREATE PROPERTY math_library "-lm")
+  # Keeping default include dir empty. The linker will then select libraries
+  # from its default search path. The toolchain may adjust the value to a
+  # specific location, for example gcc infrastructure will set the value based
+  # on output from --print-libgcc-file-name.
+  set_linker_property(NO_CREATE PROPERTY lib_include_dir "")
+endif()
+
+if(CONFIG_CPP
+   AND NOT CONFIG_MINIMAL_LIBCPP
+   AND NOT CONFIG_NATIVE_LIBRARY
+   # When new link principle is fully introduced, then the below condition can
+   # be removed, and instead the external module c++ should use:
+   # set_property(TARGET linker PROPERTY c++_library  "<external_c++_lib>")
+   AND NOT CONFIG_EXTERNAL_MODULE_LIBCPP
+)
+  set_property(TARGET linker PROPERTY link_order_library "c++")
+endif()
+
+
+if(CONFIG_NEWLIB_LIBC AND CMAKE_C_COMPILER_ID STREQUAL "GNU")
+  # We are using c;rt;c (expands to '-lc -lgcc -lc') in code below.
+  # This is needed because when linking with newlib on aarch64, then libgcc has a
+  # link dependency to libc (strchr), but libc also has dependencies to libgcc.
+  # Lib C depends on libgcc. e.g. libc.a(lib_a-fvwrite.o) references __aeabi_idiv
+  set_property(TARGET linker APPEND PROPERTY link_order_library "math;c;rt;c")
+else()
+  set_property(TARGET linker APPEND PROPERTY link_order_library "c;rt")
+endif()
diff --git a/cmake/linker/ld/target.cmake b/cmake/linker/ld/target.cmake
index 4382f156dcc..c941d8ee89e 100644
--- a/cmake/linker/ld/target.cmake
+++ b/cmake/linker/ld/target.cmake
@@ -14,18 +14,6 @@ if((${CMAKE_LINKER} STREQUAL "${CROSS_COMPILE}ld.bfd") OR
   string(REPLACE ";" " " CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
 endif()
 
-if(NOT "${ZEPHYR_TOOLCHAIN_VARIANT}" STREQUAL "host")
-  if(CONFIG_CPP_EXCEPTIONS AND LIBGCC_DIR)
-    # When building with C++ Exceptions, it is important that crtbegin and crtend
-    # are linked at specific locations.
-    # The location is so important that we cannot let this be controlled by normal
-    # link libraries, instead we must control the link command specifically as
-    # part of toolchain.
-    set(CMAKE_CXX_LINK_EXECUTABLE
-        "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> ${LIBGCC_DIR}/crtbegin.o <OBJECTS> -o <TARGET> <LINK_LIBRARIES> ${LIBGCC_DIR}/crtend.o")
-  endif()
-endif()
-
 # Run $LINKER_SCRIPT file through the C preprocessor, producing ${linker_script_gen}
 # NOTE: ${linker_script_gen} will be produced at build-time; not at configure-time
 macro(configure_linker_script linker_script_gen linker_pass_define)
@@ -139,14 +127,44 @@ function(toolchain_ld_link_elf)
     ${LINKERFLAGPREFIX},--no-whole-archive
     ${NO_WHOLE_ARCHIVE_LIBS}
     $<TARGET_OBJECTS:${OFFSETS_LIB}>
-    ${LIB_INCLUDE_DIR}
     -L${PROJECT_BINARY_DIR}
-    ${TOOLCHAIN_LIBS}
 
     ${TOOLCHAIN_LD_LINK_ELF_DEPENDENCIES}
   )
 endfunction(toolchain_ld_link_elf)
 
+# Function for finalizing link setup after Zephyr configuration has completed.
+#
+# This function will generate the correct CMAKE_C_LINK_EXECUTABLE / CMAKE_CXX_LINK_EXECUTABLE
+# rule to ensure that standard c and runtime libraries are correctly placed
+# and the end of link invocation and doesn't appear in the middle of the link
+# command invocation.
+macro(toolchain_linker_finalize)
+  get_property(zephyr_std_libs TARGET linker PROPERTY lib_include_dir)
+  get_property(link_order TARGET linker PROPERTY link_order_library)
+  foreach(lib ${link_order})
+    get_property(link_flag TARGET linker PROPERTY ${lib}_library)
+    list(APPEND zephyr_std_libs "${link_flag}")
+  endforeach()
+  string(REPLACE ";" " " zephyr_std_libs "${zephyr_std_libs}")
+
+  set(link_libraries "<LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> ${zephyr_std_libs}")
+  set(common_link "<LINK_FLAGS> ${link_libraries}")
+
+  set(CMAKE_ASM_LINK_EXECUTABLE "<CMAKE_ASM_COMPILER> <FLAGS> <CMAKE_ASM_LINK_FLAGS> ${common_link}")
+  set(CMAKE_C_LINK_EXECUTABLE   "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> ${common_link}")
+
+  set(cpp_link "${common_link}")
+  if(NOT "${ZEPHYR_TOOLCHAIN_VARIANT}" STREQUAL "host")
+    if(CONFIG_CPP_EXCEPTIONS AND LIBGCC_DIR)
+      # When building with C++ Exceptions, it is important that crtbegin and crtend
+      # are linked at specific locations.
+      set(cpp_link "<LINK_FLAGS> ${LIBGCC_DIR}/crtbegin.o ${link_libraries} ${LIBGCC_DIR}/crtend.o")
+    endif()
+  endif()
+  set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> ${cpp_link}")
+endmacro()
+
 # Load toolchain_ld-family macros
 include(${ZEPHYR_BASE}/cmake/linker/${LINKER}/target_relocation.cmake)
 include(${ZEPHYR_BASE}/cmake/linker/${LINKER}/target_configure.cmake)
diff --git a/cmake/linker/linker_libraries_template.cmake b/cmake/linker/linker_libraries_template.cmake
new file mode 100644
index 00000000000..481ee5c473e
--- /dev/null
+++ b/cmake/linker/linker_libraries_template.cmake
@@ -0,0 +1,16 @@
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Linker flags for fixed linking with standard libraries, such as the C and runtime libraries.
+# It is the responsibility of the linker infrastructure to use those properties to specify the
+# correct placement of those libraries for correct link order.
+# For example, GCC usually has the order: -lc -lgcc
+# It is also possible to define extra libraries of the form `<name>_library`, and then include
+# Fixed library search path can be defined in the `lib_include_dir` property if needed.
+# <name> in the link_order_property.
+# Usage example:
+# set_linker_property(PROPERTY lib_include_dir "-L/path/to/libs")
+# set_linker_property(PROPERTY c_library  "-lc")
+# set_linker_property(PROPERTY rt_library "-lgcc")
+# set_linker_property(PROPERTY link_order_library "c;rt")
diff --git a/cmake/linker/lld/linker_flags.cmake b/cmake/linker/lld/linker_flags.cmake
index f6e873ad631..f11139aa1e2 100644
--- a/cmake/linker/lld/linker_flags.cmake
+++ b/cmake/linker/lld/linker_flags.cmake
@@ -1,4 +1,6 @@
 # Copyright (c) 2022 Google LLC
+# Copyright (c) 2024 Nordic Semiconductor
+#
 # SPDX-License-Identifier: Apache-2.0
 
 # Since lld is a drop in replacement for ld, we can just use ld's flags as a base
@@ -6,7 +8,7 @@
 include(${ZEPHYR_BASE}/cmake/linker/ld/linker_flags.cmake OPTIONAL)
 
 if(NOT CONFIG_MINIMAL_LIBCPP AND NOT CONFIG_NATIVE_LIBRARY AND NOT CONFIG_EXTERNAL_MODULE_LIBCPP)
-  set_property(TARGET linker PROPERTY cpp_base -lc++ ${LINKERFLAGPREFIX},-z,norelro)
+  set_property(TARGET linker PROPERTY cpp_base ${LINKERFLAGPREFIX},-z,norelro)
 endif()
 
 # Force LLVM to use built-in lld linker
diff --git a/cmake/linker/lld/linker_libraries.cmake b/cmake/linker/lld/linker_libraries.cmake
new file mode 100644
index 00000000000..2347898ad64
--- /dev/null
+++ b/cmake/linker/lld/linker_libraries.cmake
@@ -0,0 +1,21 @@
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: Apache-2.0
+
+set_linker_property(NO_CREATE TARGET linker PROPERTY c_library "-lc")
+# Default per standard, will be populated by clang/target.cmake based on clang output.
+set_linker_property(NO_CREATE TARGET linker PROPERTY rt_library "")
+set_linker_property(TARGET linker PROPERTY c++_library "-lc++;-lc++abi")
+
+if(CONFIG_CPP
+   AND NOT CONFIG_MINIMAL_LIBCPP
+   AND NOT CONFIG_NATIVE_LIBRARY
+   # When new link principle is fully introduced, then the below condition can
+   # be removed, and instead the external module c++ should use:
+   # set_property(TARGET linker PROPERTY c++_library  "<external_c++_lib>")
+   AND NOT CONFIG_EXTERNAL_MODULE_LIBCPP
+)
+  set_property(TARGET linker PROPERTY link_order_library "c++")
+endif()
+
+set_property(TARGET linker APPEND PROPERTY link_order_library "c;rt")
diff --git a/cmake/linker/lld/target.cmake b/cmake/linker/lld/target.cmake
index 9ce3313334f..b6b96525e70 100644
--- a/cmake/linker/lld/target.cmake
+++ b/cmake/linker/lld/target.cmake
@@ -101,14 +101,32 @@ function(toolchain_ld_link_elf)
     ${LINKERFLAGPREFIX},--no-whole-archive
     ${NO_WHOLE_ARCHIVE_LIBS}
     $<TARGET_OBJECTS:${OFFSETS_LIB}>
-    ${LIB_INCLUDE_DIR}
     -L${PROJECT_BINARY_DIR}
-    ${TOOLCHAIN_LIBS}
 
     ${TOOLCHAIN_LD_LINK_ELF_DEPENDENCIES}
   )
 endfunction(toolchain_ld_link_elf)
 
+# Function for finalizing link setup after Zephyr configuration has completed.
+#
+# This function will generate the correct CMAKE_C_LINK_EXECUTABLE / CMAKE_CXX_LINK_EXECUTABLE
+# signature to ensure that standard c and runtime libraries are correctly placed
+# and the end of link invocation and doesn't appear in the middle of the link
+# command invocation.
+macro(toolchain_linker_finalize)
+  get_property(zephyr_std_libs TARGET linker PROPERTY lib_include_dir)
+  get_property(link_order TARGET linker PROPERTY link_order_library)
+  foreach(lib ${link_order})
+    get_property(link_flag TARGET linker PROPERTY ${lib}_library)
+    list(APPEND zephyr_std_libs "${link_flag}")
+  endforeach()
+  string(REPLACE ";" " " zephyr_std_libs "${zephyr_std_libs}")
+
+ set(common_link "<LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> ${zephyr_std_libs}")
+ set(CMAKE_ASM_LINK_EXECUTABLE "<CMAKE_ASM_COMPILER> <FLAGS> <CMAKE_ASM_LINK_FLAGS> ${common_link}")
+ set(CMAKE_C_LINK_EXECUTABLE   "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> ${common_link}")
+ set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> ${common_link}")
+endmacro()
 
 # Load toolchain_ld-family macros
 include(${ZEPHYR_BASE}/cmake/linker/ld/target_relocation.cmake)
diff --git a/cmake/linker/target_template.cmake b/cmake/linker/target_template.cmake
new file mode 100644
index 00000000000..efa27de6fb4
--- /dev/null
+++ b/cmake/linker/target_template.cmake
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024, Nordic Semiconductor ASA
+
+# Template file for optional Zephyr linker macros.
+#
+# This file will define optional linker macros for toolchains that are not
+# defining these macros themselves.
+
+if(NOT COMMAND toolchain_linker_finalize)
+  macro(toolchain_linker_finalize)
+  endmacro()
+endif()
diff --git a/cmake/linker/xt-ld/target.cmake b/cmake/linker/xt-ld/target.cmake
index 4f8e4fcfbdb..3546881cc71 100644
--- a/cmake/linker/xt-ld/target.cmake
+++ b/cmake/linker/xt-ld/target.cmake
@@ -129,7 +129,6 @@ function(toolchain_ld_link_elf)
     ${LINKERFLAGPREFIX},--no-whole-archive
     ${NO_WHOLE_ARCHIVE_LIBS}
     $<TARGET_OBJECTS:${OFFSETS_LIB}>
-    ${LIB_INCLUDE_DIR}
     -L${PROJECT_BINARY_DIR}
     ${TOOLCHAIN_LIBS}
 
@@ -137,6 +136,27 @@ function(toolchain_ld_link_elf)
   )
 endfunction(toolchain_ld_link_elf)
 
+# Function for finalizing link setup after Zephyr configuration has completed.
+#
+# This function will generate the correct CMAKE_C_LINK_EXECUTABLE / CMAKE_CXX_LINK_EXECUTABLE
+# rule to ensure that standard c and runtime libraries are correctly placed
+# and the end of link invocation and doesn't appear in the middle of the link
+# command invocation.
+macro(toolchain_linker_finalize)
+  get_property(zephyr_std_libs TARGET linker PROPERTY lib_include_dir)
+  get_property(link_order TARGET linker PROPERTY link_order_library)
+  foreach(lib ${link_order})
+    get_property(link_flag TARGET linker PROPERTY ${lib}_library)
+    list(APPEND zephyr_std_libs "${link_flag}")
+  endforeach()
+  string(REPLACE ";" " " zephyr_std_libs "${zephyr_std_libs}")
+
+ set(common_link "<LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> ${zephyr_std_libs}")
+ set(CMAKE_ASM_LINK_EXECUTABLE "<CMAKE_ASM_COMPILER> <FLAGS> <CMAKE_ASM_LINK_FLAGS> ${common_link}")
+ set(CMAKE_C_LINK_EXECUTABLE   "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> ${common_link}")
+ set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> ${common_link}")
+endmacro()
+
 # xt-ld is Xtensa's own version of binutils' ld.
 # So we can reuse most of the ld configurations.
 include(${ZEPHYR_BASE}/cmake/linker/ld/target_relocation.cmake)
diff --git a/cmake/modules/FindTargetTools.cmake b/cmake/modules/FindTargetTools.cmake
index a1fa4bf5c67..e35f577d697 100644
--- a/cmake/modules/FindTargetTools.cmake
+++ b/cmake/modules/FindTargetTools.cmake
@@ -105,5 +105,7 @@ include(${TOOLCHAIN_ROOT}/cmake/linker/${LINKER}/target.cmake OPTIONAL)
 include(${ZEPHYR_BASE}/cmake/bintools/bintools_template.cmake)
 include(${TOOLCHAIN_ROOT}/cmake/bintools/${BINTOOLS}/target.cmake OPTIONAL)
 
+include(${TOOLCHAIN_ROOT}/cmake/linker/target_template.cmake)
+
 set(TargetTools_FOUND TRUE)
 set(TARGETTOOLS_FOUND TRUE)
diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index 23c30789b73..4773b563865 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -2410,6 +2410,39 @@ function(toolchain_parse_make_rule input_file include_files)
   set(${include_files} ${result} PARENT_SCOPE)
 endfunction()
 
+# 'set_linker_property' is a function that sets the property for the linker
+# property target used for toolchain abstraction.
+#
+# This function is similar in nature to the CMake set_property function, but
+# with some additional extension flags for improved behavioral control.
+#
+# NO_CREATE: Flag to indicate that the property should only be set if not already
+#            defined with a value.
+# APPEND: Flag indicated that the property should be appended to the existing
+#         value list for the property.
+# TARGET: Name of target on which to add the property (commonly: linker)
+# PROPERTY: Name of property with the value(s) following immediately after
+#           property name
+function(set_linker_property)
+  set(options APPEND NO_CREATE)
+  set(single_args TARGET)
+  set(multi_args  PROPERTY)
+  cmake_parse_arguments(LINKER_PROPERTY "${options}" "${single_args}" "${multi_args}" ${ARGN})
+
+  if(LINKER_PROPERTY_APPEND)
+   set(APPEND "APPEND")
+  endif()
+
+  if(LINKER_PROPERTY_NO_CREATE)
+    list(GET LINKER_PROPERTY_PROPERTY 0 property_name)
+    get_target_property(var ${LINKER_PROPERTY_TARGET} ${property_name})
+    if(NOT "${var}" STREQUAL "var-NOTFOUND")
+      return()
+    endif()
+  endif()
+  set_property(TARGET ${LINKER_PROPERTY_TARGET} ${APPEND} PROPERTY ${LINKER_PROPERTY_PROPERTY})
+endfunction()
+
 # 'check_set_linker_property' is a function that check the provided linker
 # flag and only set the linker property if the check succeeds
 #
diff --git a/cmake/target_toolchain_flags.cmake b/cmake/target_toolchain_flags.cmake
index 1df7e5eddc6..716cc8f55e7 100644
--- a/cmake/target_toolchain_flags.cmake
+++ b/cmake/target_toolchain_flags.cmake
@@ -35,8 +35,10 @@ include(${CMAKE_CURRENT_LIST_DIR}/compiler/compiler_features.cmake)
 # a new toolchain.
 include(${CMAKE_CURRENT_LIST_DIR}/compiler/compiler_flags_template.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/linker/linker_flags_template.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/linker/linker_libraries_template.cmake)
 
 # Configure the toolchain flags based on what toolchain technology is used
 # (gcc, host-gcc etc.)
 include(${TOOLCHAIN_ROOT}/cmake/compiler/${COMPILER}/compiler_flags.cmake OPTIONAL)
 include(${TOOLCHAIN_ROOT}/cmake/linker/${LINKER}/linker_flags.cmake OPTIONAL)
+include(${TOOLCHAIN_ROOT}/cmake/linker/${LINKER}/linker_libraries.cmake OPTIONAL)
diff --git a/cmake/toolchain/llvm/generic.cmake b/cmake/toolchain/llvm/generic.cmake
index 0b138c2868c..45474b7df30 100644
--- a/cmake/toolchain/llvm/generic.cmake
+++ b/cmake/toolchain/llvm/generic.cmake
@@ -19,4 +19,4 @@ set(BINTOOLS llvm)
 
 set(TOOLCHAIN_HAS_NEWLIB OFF CACHE BOOL "True if toolchain supports newlib")
 
-message(STATUS "Found toolchain: host (clang/ld)")
+message(STATUS "Found toolchain: llvm (clang/ld)")
diff --git a/lib/libc/newlib/CMakeLists.txt b/lib/libc/newlib/CMakeLists.txt
index de39b8ce213..d3dc448ecca 100644
--- a/lib/libc/newlib/CMakeLists.txt
+++ b/lib/libc/newlib/CMakeLists.txt
@@ -34,40 +34,12 @@ zephyr_compile_definitions(_ANSI_SOURCE)
 zephyr_compile_definitions(__LINUX_ERRNO_EXTENSIONS__)
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
-  # We are using
-  # - ${CMAKE_C_LINKER_WRAPPER_FLAG}${CMAKE_LINK_LIBRARY_FLAG}c
-  # - ${CMAKE_C_LINKER_WRAPPER_FLAG}${CMAKE_LINK_LIBRARY_FLAG}gcc
-  # - c
-  # in code below.
-  # This is needed because when linking with newlib on aarch64, then libgcc has a
-  # link dependency to libc (strchr), but libc also has dependencies to libgcc.
-  #
-  # CMake is capable of handling circular link dependencies for CMake defined
-  # static libraries, which can be further controlled using LINK_INTERFACE_MULTIPLICITY.
-  # However, libc and libgcc are not regular CMake libraries, and is seen as linker
-  # flags by CMake, and thus symbol de-duplications will be performed.
-  # CMake link options cannot be used, as that will place those libs first on the
-  # linker invocation. -Wl,--start-group is problematic as the placement of -lc
-  # and -lgcc is not guaranteed in case later libraries are also using
-  # -lc / -libbgcc as interface linker flags.
-  #
-  # Thus, we resort to use `${CMAKE_C_LINKER_WRAPPER_FLAG}${CMAKE_LINK_LIBRARY_FLAG}`
-  # as this ensures the uniqueness and thus avoids symbol de-duplication which means
-  # libc will be followed by libgcc, which is finally followed by libc again.
-
-  list(JOIN CMAKE_C_LINKER_WRAPPER_FLAG "" linker_wrapper_string)
-
   zephyr_link_libraries(
-    m
-    "${linker_wrapper_string}${CMAKE_LINK_LIBRARY_FLAG}c"
     ${LIBC_LIBRARY_DIR_FLAG} # NB: Optional
     $<$<BOOL:${CONFIG_NEWLIB_LIBC_FLOAT_PRINTF}>:-u_printf_float>
     $<$<BOOL:${CONFIG_NEWLIB_LIBC_FLOAT_SCANF}>:-u_scanf_float>
-    # Lib C depends on libgcc. e.g. libc.a(lib_a-fvwrite.o) references __aeabi_idiv
-    "${linker_wrapper_string}${CMAKE_LINK_LIBRARY_FLAG}gcc"
     )
 endif()
-zephyr_link_libraries(c)
 
 if(CONFIG_NEWLIB_LIBC_NANO)
   zephyr_link_libraries(
diff --git a/lib/libc/picolibc/CMakeLists.txt b/lib/libc/picolibc/CMakeLists.txt
index 87fb0d9d8ec..fcb4f9f2b57 100644
--- a/lib/libc/picolibc/CMakeLists.txt
+++ b/lib/libc/picolibc/CMakeLists.txt
@@ -17,7 +17,7 @@ if(NOT CONFIG_PICOLIBC_USE_MODULE)
   # Zephyr build (via the __ZEPHYR__ macro) to expose the Zephyr C API
 
   zephyr_compile_options(--specs=picolibc.specs)
-  zephyr_libc_link_libraries(--specs=picolibc.specs c -lgcc)
+  zephyr_libc_link_libraries(--specs=picolibc.specs)
   if(CONFIG_PICOLIBC_IO_FLOAT)
     zephyr_compile_definitions(PICOLIBC_DOUBLE_PRINTF_SCANF)
     zephyr_link_libraries(-DPICOLIBC_DOUBLE_PRINTF_SCANF)

From c0f406063c7bc0fb76c69d2276914a9c96508d56 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Wed, 11 Sep 2024 08:51:47 +0200
Subject: [PATCH 0821/2913] [nrf fromtree] cmake: PROPERTY flag support on
 compile options and link libraries

Extend zephyr_link_libraries to allow an optional value together with
the `zephyr_link_libraries(PROPERTY <property> [<value>])`.

This allow setting linker property combined with a value when linking
Zephyr. The value will only be applied if the property is defined.

Extend zephyr_compile_options to support the same PROPERTY flag that
has been introduced for zephyr_link_libraries().
This remove the need for developers to write complex generator
expressions for compiler flags and thus minimizes mistakes.

The following syntax is now supported in addition to the existing
syntax: `zephyr_compile_options(PROPERTY <property> [<value>])`

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 718b726b3729d5a47ab79fda4d782b6f5ce197ad)
(cherry picked from commit f819df8f2f5564fea1c784dd8b09b7cdee6d1f19)
---
 cmake/modules/extensions.cmake | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index 4773b563865..1dc516460f4 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -109,16 +109,37 @@ endfunction()
 
 # https://cmake.org/cmake/help/latest/command/target_compile_options.html
 function(zephyr_compile_options)
-  target_compile_options(zephyr_interface INTERFACE ${ARGV})
+  if(ARGV0 STREQUAL "PROPERTY")
+    set(property $<TARGET_PROPERTY:compiler,${ARGV1}>)
+    set(property_defined $<BOOL:${property}>)
+    if(ARGC GREATER 3)
+      message(FATAL_ERROR "zephyr_compile_options(PROPERTY <prop> [<var>]) "
+                          "called with too many arguments."
+      )
+    elseif(ARGC EQUAL 3)
+      target_compile_options(zephyr_interface INTERFACE $<${property_defined}:${property}${ARGV2}>)
+    else()
+      target_compile_options(zephyr_interface INTERFACE ${property})
+    endif()
+  else()
+    target_compile_options(zephyr_interface INTERFACE ${ARGV})
+  endif()
 endfunction()
 
 # https://cmake.org/cmake/help/latest/command/target_link_libraries.html
 function(zephyr_link_libraries)
   if(ARGV0 STREQUAL "PROPERTY")
-    if(ARGC GREATER 2)
-      message(FATAL_ERROR "zephyr_link_libraries(PROPERTY <prop>) only allows a single property.")
+    set(property $<TARGET_PROPERTY:linker,${ARGV1}>)
+    set(property_defined $<BOOL:${property}>)
+    if(ARGC GREATER 3)
+      message(FATAL_ERROR "zephyr_link_options(PROPERTY <prop> [<val>]) "
+                          "called with too many arguments."
+      )
+    elseif(ARGC EQUAL 3)
+      target_link_libraries(zephyr_interface INTERFACE $<${property_defined}:${property}${ARGV2}>)
+    else()
+      target_link_libraries(zephyr_interface INTERFACE ${property})
     endif()
-    target_link_libraries(zephyr_interface INTERFACE $<TARGET_PROPERTY:linker,${ARGV1}>)
   else()
     target_link_libraries(zephyr_interface INTERFACE ${ARGV})
   endif()

From 72b9bb5efb3d7db478635db3caa41aaf180b3d84 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Wed, 11 Sep 2024 10:18:13 +0200
Subject: [PATCH 0822/2913] [nrf fromtree] cmake: make TARGET optional in
 set_linker_property()

The `check_set_linker_property()` and `set_linker_property()` takes a
target argument. Make the target argument optional and use the target
`linker` as default target.

The function name `set_linker_property()` already implies that we are
setting a property and the linker target.

Remove the need to specify `TARGET linker` when using the default linker
property target.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 102b3fc07836a137cf54bf39a626f3c332e72b71)
(cherry picked from commit 185ea8888f527ac73ff258a104fe797c40957918)
---
 cmake/modules/extensions.cmake | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index 1dc516460f4..921a457067d 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -2441,7 +2441,7 @@ endfunction()
 #            defined with a value.
 # APPEND: Flag indicated that the property should be appended to the existing
 #         value list for the property.
-# TARGET: Name of target on which to add the property (commonly: linker)
+# TARGET: Name of target on which to add the property (default: linker)
 # PROPERTY: Name of property with the value(s) following immediately after
 #           property name
 function(set_linker_property)
@@ -2454,6 +2454,10 @@ function(set_linker_property)
    set(APPEND "APPEND")
   endif()
 
+  if(NOT DEFINED LINKER_PROPERTY_TARGET)
+   set(LINKER_PROPERTY_TARGET "linker")
+  endif()
+
   if(LINKER_PROPERTY_NO_CREATE)
     list(GET LINKER_PROPERTY_PROPERTY 0 property_name)
     get_target_property(var ${LINKER_PROPERTY_TARGET} ${property_name})
@@ -2473,7 +2477,7 @@ endfunction()
 #
 # APPEND: Flag indicated that the property should be appended to the existing
 #         value list for the property.
-# TARGET: Name of target on which to add the property (commonly: linker)
+# TARGET: Name of target on which to add the property (default: linker)
 # PROPERTY: Name of property with the value(s) following immediately after
 #           property name
 function(check_set_linker_property)
@@ -2486,6 +2490,10 @@ function(check_set_linker_property)
    set(APPEND "APPEND")
   endif()
 
+  if(NOT DEFINED LINKER_PROPERTY_TARGET)
+   set(LINKER_PROPERTY_TARGET "linker")
+  endif()
+
   list(GET LINKER_PROPERTY_PROPERTY 0 property)
   list(REMOVE_AT LINKER_PROPERTY_PROPERTY 0)
 

From 3a488abdeabe67ad1e1ac426339d2ec74ed6c740 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Mon, 26 Aug 2024 14:57:15 +0200
Subject: [PATCH 0823/2913] [nrf fromtree] cmake: move specs compiler and
 linker flags to toolchain properties

Moving specs argument to compiler and linker properties so that the
compiler and linker in use can decide how the flags are mapped / handled
for the compiler and linker in use.

This avoids specifying `--specs=spec.picolibc` for clang which prints a
warning about an unused argument.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 9d835fe464aff259cd1924e411a1be9c3f3e5787)
(cherry picked from commit e14af53034cc8ea57995c5c093a1a824370414c2)
---
 cmake/compiler/clang/compiler_flags.cmake    | 2 ++
 cmake/compiler/compiler_flags_template.cmake | 4 ++++
 cmake/compiler/gcc/compiler_flags.cmake      | 2 ++
 cmake/linker/ld/gcc/linker_flags.cmake       | 2 ++
 cmake/linker/linker_flags_template.cmake     | 4 ++++
 lib/libc/picolibc/CMakeLists.txt             | 5 ++---
 6 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/cmake/compiler/clang/compiler_flags.cmake b/cmake/compiler/clang/compiler_flags.cmake
index acc9b629171..a64150eb58c 100644
--- a/cmake/compiler/clang/compiler_flags.cmake
+++ b/cmake/compiler/clang/compiler_flags.cmake
@@ -125,3 +125,5 @@ set_compiler_property(PROPERTY warning_error_coding_guideline
 )
 
 set_compiler_property(PROPERTY no_global_merge "-mno-global-merge")
+
+set_compiler_property(PROPERTY specs)
diff --git a/cmake/compiler/compiler_flags_template.cmake b/cmake/compiler/compiler_flags_template.cmake
index c72e9b70f5d..5a4386f49be 100644
--- a/cmake/compiler/compiler_flags_template.cmake
+++ b/cmake/compiler/compiler_flags_template.cmake
@@ -139,3 +139,7 @@ set_compiler_property(PROPERTY warning_shadow_variables)
 # Compiler flags to avoid recognizing built-in functions
 set_compiler_property(PROPERTY no_builtin)
 set_compiler_property(PROPERTY no_builtin_malloc)
+
+# Compiler flag for defining specs. Used only by gcc, other compilers may keep
+# this undefined.
+set_compiler_property(PROPERTY specs)
diff --git a/cmake/compiler/gcc/compiler_flags.cmake b/cmake/compiler/gcc/compiler_flags.cmake
index e982f75aa78..c346a750af4 100644
--- a/cmake/compiler/gcc/compiler_flags.cmake
+++ b/cmake/compiler/gcc/compiler_flags.cmake
@@ -241,3 +241,5 @@ set_compiler_property(PROPERTY warning_shadow_variables -Wshadow)
 
 set_compiler_property(PROPERTY no_builtin -fno-builtin)
 set_compiler_property(PROPERTY no_builtin_malloc -fno-builtin-malloc)
+
+set_compiler_property(PROPERTY specs -specs=)
diff --git a/cmake/linker/ld/gcc/linker_flags.cmake b/cmake/linker/ld/gcc/linker_flags.cmake
index 4cde7d96ff3..c442c9c8921 100644
--- a/cmake/linker/ld/gcc/linker_flags.cmake
+++ b/cmake/linker/ld/gcc/linker_flags.cmake
@@ -15,3 +15,5 @@ add_link_options(-gdwarf-4)
 
 # Extra warnings options for twister run
 set_property(TARGET linker PROPERTY warnings_as_errors -Wl,--fatal-warnings)
+
+set_linker_property(PROPERTY specs -specs=)
diff --git a/cmake/linker/linker_flags_template.cmake b/cmake/linker/linker_flags_template.cmake
index 870c597be24..8b0b948b028 100644
--- a/cmake/linker/linker_flags_template.cmake
+++ b/cmake/linker/linker_flags_template.cmake
@@ -49,3 +49,7 @@ set_property(TARGET linker PROPERTY no_relax)
 
 # Linker flag for enabling relaxation of address optimization for jump calls.
 set_property(TARGET linker PROPERTY relax)
+
+# Linker flag for defining specs. Defined only by gcc, when gcc is used as
+# front-end for ld.
+set_compiler_property(PROPERTY specs)
diff --git a/lib/libc/picolibc/CMakeLists.txt b/lib/libc/picolibc/CMakeLists.txt
index fcb4f9f2b57..14af66b7b7d 100644
--- a/lib/libc/picolibc/CMakeLists.txt
+++ b/lib/libc/picolibc/CMakeLists.txt
@@ -15,9 +15,8 @@ if(NOT CONFIG_PICOLIBC_USE_MODULE)
   # Use picolibc provided with the toolchain. This requires a new enough
   # toolchain so that the version of picolibc supports auto-detecting a
   # Zephyr build (via the __ZEPHYR__ macro) to expose the Zephyr C API
-
-  zephyr_compile_options(--specs=picolibc.specs)
-  zephyr_libc_link_libraries(--specs=picolibc.specs)
+  zephyr_compile_options(PROPERTY specs picolibc.specs)
+  zephyr_link_libraries(PROPERTY specs picolibc.specs)
   if(CONFIG_PICOLIBC_IO_FLOAT)
     zephyr_compile_definitions(PICOLIBC_DOUBLE_PRINTF_SCANF)
     zephyr_link_libraries(-DPICOLIBC_DOUBLE_PRINTF_SCANF)

From a11337328d384b76a4fc1c0a835ee67ebc7386c4 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Thu, 12 Sep 2024 09:18:41 +0200
Subject: [PATCH 0824/2913] [nrf fromtree] manifest: update picolibc to support
 the new c_library property

This commit updates picolibc module to remove the need for hard-coding
linking with `-lgcc`.

Instead it sets the c_library linker property and thereby allows the
Zephyr toolchain infrastructure to properly handle the linking of
C and runtime libraries.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit b2eeef4ac9505d8b1d4cfbc51374a96b74064778)
(cherry picked from commit e5f326182bed274a0be57fb9300f69b5e7f6dd67)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 4ca8aa06f6a..fadcb7d7daf 100644
--- a/west.yml
+++ b/west.yml
@@ -318,7 +318,7 @@ manifest:
         - debug
     - name: picolibc
       path: modules/lib/picolibc
-      revision: e15656f7682500fc8953e1a2008f7b1ae4f65ce8
+      revision: 27746bbc246841852912fc3bb5b45094cd8a505a
     - name: segger
       revision: b011c45b585e097d95d9cf93edf4f2e01588d3cd
       path: modules/debug/segger

From 43626570e47b95dfae01f41933a27755f12e9b52 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Wed, 11 Sep 2024 23:39:50 +0200
Subject: [PATCH 0825/2913] [nrf fromtree] cmake: detect LLVM picolibc and
 newlib support

Newlib or Picolibc libraries for LLVM may be compiled or installed from
pre-built sources independently of LLVM itself.

This means that always indicating that TOOLCHAIN_HAS_NEWLIB=OFF and
TOOLCHAIN_HAS_PICOLIBC=OFF are wrong. But it could be just as wrong to
always indicate suport for newlib or picolibc.

Some pre-built LLVM toolchains are provided with default picolibc
support, such as LLVM for Arm embedded, but can also be used with newlib
be installing newlib add-on package.

Unfortunately it's not possible to query LLVM regarding newlib or
picolibc support.

Developers have the option of `-DTOOLCHAIN_HAS_<NEWLIB|PICOLIBC>=ON`,
but this is not widely known and cumbersome to do for each build.

An indication of newlib or picolibc support is the presence of library
specific headers, so to improve current situation we check for library
specific headers, and if those are present we assume support for the
library.

This commit improves the current support for LLVM in Zephyr when
cross-compiling, especially for users of LLVM for Arm embedded.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 0274bcbee442441d3222747e536054cc911b6218)
(cherry picked from commit ce6eaf356692723a75c9de30a855282692f7c211)
---
 cmake/compiler/clang/target.cmake  | 36 ++++++++++++++++++++++++++++++
 cmake/toolchain/llvm/generic.cmake | 24 +++++++++++++++++++-
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/cmake/compiler/clang/target.cmake b/cmake/compiler/clang/target.cmake
index d2d41e8b23c..62c39b0ec6f 100644
--- a/cmake/compiler/clang/target.cmake
+++ b/cmake/compiler/clang/target.cmake
@@ -64,6 +64,42 @@ if(NOT "${ARCH}" STREQUAL "posix")
     endif()
   endif()
 
+  # LLVM will use a default sysroot for selection of the C library. The default
+  # C library sysroot was defined at built time of clang/LLVM.
+  #
+  # For example, LLVM for Arm comes pre-built with Picolibc, and thus no flags
+  # are required for selecting Picolibc.
+  #
+  # Other clang/LLVM distributions may come with other pre-built C libraries.
+  # clang/LLVM supports using an alternative C library, either by direct linking,
+  # or by specifying '--sysroot <path>'.
+  #
+  # LLVM for Arm provides a 'newlib.cfg' file for newlib C selection.
+  # Let us support this principle by looking for a dedicated 'newlib.cfg' or
+  # 'picolibc.cfg' and specify '--config <spec>.cfg' if such a file is found.
+  # If no cfg-file matching the chosen C implementation, then we assume that the
+  # chosen C implementation is identical to the default C library used be the
+  # toolchain.
+  if(CONFIG_NEWLIB_LIBC)
+    file(GLOB_RECURSE newlib_cfg ${LLVM_TOOLCHAIN_PATH}/newlib.cfg)
+    if(newlib_cfg)
+      list(GET newlib_cfg 0 newlib_cfg)
+      set_linker_property(PROPERTY c_library "--config=${newlib_cfg};-lc")
+      list(APPEND CMAKE_REQUIRED_FLAGS --config=${newlib_cfg})
+      list(APPEND TOOLCHAIN_C_FLAGS --config=${newlib_cfg})
+    endif()
+  endif()
+
+  if(CONFIG_PICOLIBC)
+    file(GLOB_RECURSE picolibc_cfg ${LLVM_TOOLCHAIN_PATH}/picolibc.cfg)
+    if(picolibc_cfg)
+      list(GET picolibc_cfg 0 picolibc_cfg)
+      set_linker_property(PROPERTY c_library "--config=${picolibc_cfg};-lc")
+      list(APPEND CMAKE_REQUIRED_FLAGS --config=${picolibc_cfg})
+      list(APPEND TOOLCHAIN_C_FLAGS --config=${picolibc_cfg})
+    endif()
+  endif()
+
   # This libgcc code is partially duplicated in compiler/*/target.cmake
   execute_process(
     COMMAND ${CMAKE_C_COMPILER} ${clang_target_flag} ${TOOLCHAIN_C_FLAGS}
diff --git a/cmake/toolchain/llvm/generic.cmake b/cmake/toolchain/llvm/generic.cmake
index 45474b7df30..f6d7878288d 100644
--- a/cmake/toolchain/llvm/generic.cmake
+++ b/cmake/toolchain/llvm/generic.cmake
@@ -17,6 +17,28 @@ set(LLVM_TOOLCHAIN_PATH ${CLANG_ROOT_DIR} CACHE PATH "clang install directory")
 set(COMPILER clang)
 set(BINTOOLS llvm)
 
-set(TOOLCHAIN_HAS_NEWLIB OFF CACHE BOOL "True if toolchain supports newlib")
+# LLVM is flexible, meaning that it can in principle always support newlib or picolibc.
+# This is not decided by LLVM itself, but depends on libraries distributed with  the installation.
+# Also newlib or picolibc may be created as add-ons. Thus always stating that LLVM does not have
+# newlib or picolibc would be wrong. Same with stating that LLVM has newlib or Picolibc.
+# The best assumption for TOOLCHAIN_HAS_<NEWLIB|PICOLIBC> is to check for the  presence of
+# '_newlib_version.h' / 'picolibc' and have the default value set accordingly.
+# This provides a best effort mechanism to allow developers to have the newlib C / Picolibc library
+# selection available in Kconfig.
+# Developers can manually indicate library support with '-DTOOLCHAIN_HAS_<NEWLIB|PICOLIBC>=<ON|OFF>'
+
+# Support for newlib is indicated by the presence of '_newlib_version.h' in the toolchain path.
+if(NOT LLVM_TOOLCHAIN_PATH STREQUAL "")
+  file(GLOB_RECURSE newlib_header ${LLVM_TOOLCHAIN_PATH}/_newlib_version.h)
+  if(newlib_header)
+    set(TOOLCHAIN_HAS_NEWLIB ON CACHE BOOL "True if toolchain supports newlib")
+  endif()
+
+  # Support for picolibc is indicated by the presence of 'picolibc.h' in the toolchain path.
+  file(GLOB_RECURSE picolibc_header ${LLVM_TOOLCHAIN_PATH}/picolibc.h)
+  if(picolibc_header)
+    set(TOOLCHAIN_HAS_PICOLIBC ON CACHE BOOL "True if toolchain supports picolibc")
+  endif()
+endif()
 
 message(STATUS "Found toolchain: llvm (clang/ld)")

From 7db55e638d59852114053e9f4aa52c67d921e49d Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Fri, 9 Aug 2024 16:43:20 +0200
Subject: [PATCH 0826/2913] [nrf fromtree] cmake: support build info in Zephyr

Store informations regarding the current Zephyr build.
The following informations are stored during CMake configure:
- Board information
- Application source directory
- Application configuration directory
- Toolchain information
- Devicetree files
- Kconfig config files
- Zephyr version

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 09faf537dd160ee64d4b159140f386452624f08b)
(cherry picked from commit a9ba90a1dfcfb779d80595203a1cbf7dfe4f2f2b)
---
 CMakeLists.txt                          | 7 +++++++
 cmake/modules/FindHostTools.cmake       | 3 +++
 cmake/modules/boards.cmake              | 4 ++++
 cmake/modules/configuration_files.cmake | 2 ++
 cmake/modules/dts.cmake                 | 6 ++++++
 cmake/modules/kconfig.cmake             | 3 +++
 share/sysbuild/CMakeLists.txt           | 7 +++++++
 7 files changed, 32 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbd6ac7bb1d..410aff11ab4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2234,3 +2234,10 @@ add_subdirectory_ifdef(
   )
 
 toolchain_linker_finalize()
+
+yaml_context(EXISTS NAME build_info result)
+if(result)
+  build_info(zephyr version VALUE ${PROJECT_VERSION_STR})
+  build_info(zephyr zephyr-base VALUE ${ZEPHYR_BASE})
+  yaml_save(NAME build_info)
+endif()
diff --git a/cmake/modules/FindHostTools.cmake b/cmake/modules/FindHostTools.cmake
index 8d3c9eccaaf..876a86934b1 100644
--- a/cmake/modules/FindHostTools.cmake
+++ b/cmake/modules/FindHostTools.cmake
@@ -114,3 +114,6 @@ set_ifndef(TOOLCHAIN_KCONFIG_DIR ${TOOLCHAIN_ROOT}/cmake/toolchain/${ZEPHYR_TOOL
 
 set(HostTools_FOUND TRUE)
 set(HOSTTOOLS_FOUND TRUE)
+build_info(toolchain name VALUE ${ZEPHYR_TOOLCHAIN_VARIANT})
+string(TOUPPER ${ZEPHYR_TOOLCHAIN_VARIANT} zephyr_toolchain_variant_upper)
+build_info(toolchain path VALUE "${${zephyr_toolchain_variant_upper}_TOOLCHAIN_PATH}")
diff --git a/cmake/modules/boards.cmake b/cmake/modules/boards.cmake
index d13e0a16f2d..2b78845482a 100644
--- a/cmake/modules/boards.cmake
+++ b/cmake/modules/boards.cmake
@@ -353,3 +353,7 @@ if(BOARD_EXTENSIONS)
     list(APPEND BOARD_EXTENSION_DIRS ${board_extension_dir})
   endforeach()
 endif()
+build_info(board name VALUE ${BOARD})
+string(REGEX REPLACE "^/" "" qualifiers "${BOARD_QUALIFIERS}")
+build_info(board qualifiers VALUE ${qualifiers})
+build_info(board revision VALUE ${BOARD_REVISION})
diff --git a/cmake/modules/configuration_files.cmake b/cmake/modules/configuration_files.cmake
index 84af8c5b635..ff7a172445c 100644
--- a/cmake/modules/configuration_files.cmake
+++ b/cmake/modules/configuration_files.cmake
@@ -99,3 +99,5 @@ zephyr_boilerplate_watch(DTC_OVERLAY_FILE)
 zephyr_get(EXTRA_CONF_FILE SYSBUILD LOCAL VAR EXTRA_CONF_FILE OVERLAY_CONFIG MERGE REVERSE)
 zephyr_get(EXTRA_DTC_OVERLAY_FILE SYSBUILD LOCAL MERGE REVERSE)
 zephyr_get(DTS_EXTRA_CPPFLAGS SYSBUILD LOCAL MERGE REVERSE)
+build_info(application source-dir VALUE ${APPLICATION_SOURCE_DIR})
+build_info(application configuration-dir VALUE ${APPLICATION_CONFIG_DIR})
diff --git a/cmake/modules/dts.cmake b/cmake/modules/dts.cmake
index 42e822c6c91..b029dd5be3e 100644
--- a/cmake/modules/dts.cmake
+++ b/cmake/modules/dts.cmake
@@ -182,6 +182,7 @@ set(dts_files
 if(DTC_OVERLAY_FILE)
   zephyr_list(TRANSFORM DTC_OVERLAY_FILE NORMALIZE_PATHS
               OUTPUT_VARIABLE DTC_OVERLAY_FILE_AS_LIST)
+  build_info(devicetree user-files VALUE ${DTC_OVERLAY_FILE_AS_LIST})
   list(APPEND
     dts_files
     ${DTC_OVERLAY_FILE_AS_LIST}
@@ -191,6 +192,7 @@ endif()
 if(EXTRA_DTC_OVERLAY_FILE)
   zephyr_list(TRANSFORM EXTRA_DTC_OVERLAY_FILE NORMALIZE_PATHS
               OUTPUT_VARIABLE EXTRA_DTC_OVERLAY_FILE_AS_LIST)
+  build_info(devicetree extra-user-files VALUE ${EXTRA_DTC_OVERLAY_FILE_AS_LIST})
   list(APPEND
     dts_files
     ${EXTRA_DTC_OVERLAY_FILE_AS_LIST}
@@ -396,3 +398,7 @@ elseif(stderr)
   message(WARNING "dtc raised one or more warnings:\n${stderr}")
 endif()
 endif(DTC)
+
+build_info(devicetree files VALUE ${dts_files})
+build_info(devicetree include-dirs VALUE ${DTS_ROOT_SYSTEM_INCLUDE_DIRS})
+build_info(devicetree bindings-dirs VALUE ${DTS_ROOT_BINDINGS})
diff --git a/cmake/modules/kconfig.cmake b/cmake/modules/kconfig.cmake
index 1e156bff470..43e73511768 100644
--- a/cmake/modules/kconfig.cmake
+++ b/cmake/modules/kconfig.cmake
@@ -98,11 +98,13 @@ set(PARSED_KCONFIG_SOURCES_TXT ${PROJECT_BINARY_DIR}/kconfig/sources.txt)
 if(CONF_FILE)
   string(CONFIGURE "${CONF_FILE}" CONF_FILE_EXPANDED)
   string(REPLACE " " ";" CONF_FILE_AS_LIST "${CONF_FILE_EXPANDED}")
+  build_info(kconfig user-files VALUE ${CONF_FILE_AS_LIST})
 endif()
 
 if(EXTRA_CONF_FILE)
   string(CONFIGURE "${EXTRA_CONF_FILE}" EXTRA_CONF_FILE_EXPANDED)
   string(REPLACE " " ";" EXTRA_CONF_FILE_AS_LIST "${EXTRA_CONF_FILE_EXPANDED}")
+  build_info(kconfig extra-user-files VALUE ${EXTRA_CONF_FILE_AS_LIST})
 endif()
 
 zephyr_file(CONF_FILES ${BOARD_EXTENSION_DIRS} KCONF board_extension_conf_files SUFFIX ${FILE_SUFFIX})
@@ -358,6 +360,7 @@ endif()
 if(CREATE_NEW_DOTCONFIG)
   set(input_configs_flags --handwritten-input-configs)
   set(input_configs ${merge_config_files} ${FORCED_CONF_FILE})
+  build_info(kconfig files VALUE ${input_configs})
 else()
   set(input_configs ${DOTCONFIG} ${FORCED_CONF_FILE})
 endif()
diff --git a/share/sysbuild/CMakeLists.txt b/share/sysbuild/CMakeLists.txt
index 8370490fb94..f2fbb4b2718 100644
--- a/share/sysbuild/CMakeLists.txt
+++ b/share/sysbuild/CMakeLists.txt
@@ -25,3 +25,10 @@ if(EXISTS ${APP_DIR}/sysbuild/CMakeLists.txt)
 else()
   add_subdirectory(template _sysbuild)
 endif()
+
+build_info(sysbuild VALUE true)
+build_info(application source-dir VALUE ${CMAKE_CURRENT_SOURCE_DIR})
+yaml_context(EXISTS NAME build_info result)
+if(result)
+  yaml_save(NAME build_info)
+endif()

From 79b1c3f52360807e469a9ed82c5cf06e882f79d1 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Thu, 22 Aug 2024 16:07:31 +0200
Subject: [PATCH 0827/2913] [nrf fromtree] cmake: nordic: save build
 information regarding SVD file used.

Save information regarding SVD file in use in vendor-specific section
of the build info file.

Information is stored under Nordic section.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 46a3e61bc7c04e2cd609f64804b34ff4d29628a0)
(cherry picked from commit 22c19204f7a6416758a6b5f9c5f91740dd3e113b)
---
 modules/hal_nordic/nrfx/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 3863fa177ed..1665c122c9f 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -242,3 +242,4 @@ mdk_svd_ifdef(CONFIG_SOC_NRF9160              nrf9160.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9230_ENGB_CPUAPP  nrf9230_engb_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9230_ENGB_CPUPPR  nrf9230_engb_ppr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9230_ENGB_CPURAD  nrf9230_engb_radiocore.svd)
+build_info(vendor-specific nordic svdfile VALUE ${SOC_SVD_FILE})

From 0108dd5fb9f4da8949501e5afd5b47153dc658a0 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Thu, 10 Oct 2024 11:59:53 +0200
Subject: [PATCH 0828/2913] [nrf fromtree] cmake: update build_info() calls to
 use PATH argument

Update build_info() calls to use `PATH` argument when values passed to
`build_info()` are user specified and thereby might use native path
separator, such as a single `\`.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 2c1eae216d568cfa018b9d6741c57afdc26acf15)
(cherry picked from commit 7c1c2f4d1dcffeb51039eb7db8b54199290d74b4)
---
 cmake/modules/FindHostTools.cmake |  2 +-
 cmake/modules/dts.cmake           | 10 +++++-----
 cmake/modules/kconfig.cmake       |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmake/modules/FindHostTools.cmake b/cmake/modules/FindHostTools.cmake
index 876a86934b1..1dfce4d3d4a 100644
--- a/cmake/modules/FindHostTools.cmake
+++ b/cmake/modules/FindHostTools.cmake
@@ -116,4 +116,4 @@ set(HostTools_FOUND TRUE)
 set(HOSTTOOLS_FOUND TRUE)
 build_info(toolchain name VALUE ${ZEPHYR_TOOLCHAIN_VARIANT})
 string(TOUPPER ${ZEPHYR_TOOLCHAIN_VARIANT} zephyr_toolchain_variant_upper)
-build_info(toolchain path VALUE "${${zephyr_toolchain_variant_upper}_TOOLCHAIN_PATH}")
+build_info(toolchain path PATH "${${zephyr_toolchain_variant_upper}_TOOLCHAIN_PATH}")
diff --git a/cmake/modules/dts.cmake b/cmake/modules/dts.cmake
index b029dd5be3e..eb7869548fe 100644
--- a/cmake/modules/dts.cmake
+++ b/cmake/modules/dts.cmake
@@ -182,7 +182,7 @@ set(dts_files
 if(DTC_OVERLAY_FILE)
   zephyr_list(TRANSFORM DTC_OVERLAY_FILE NORMALIZE_PATHS
               OUTPUT_VARIABLE DTC_OVERLAY_FILE_AS_LIST)
-  build_info(devicetree user-files VALUE ${DTC_OVERLAY_FILE_AS_LIST})
+  build_info(devicetree user-files PATH ${DTC_OVERLAY_FILE_AS_LIST})
   list(APPEND
     dts_files
     ${DTC_OVERLAY_FILE_AS_LIST}
@@ -192,7 +192,7 @@ endif()
 if(EXTRA_DTC_OVERLAY_FILE)
   zephyr_list(TRANSFORM EXTRA_DTC_OVERLAY_FILE NORMALIZE_PATHS
               OUTPUT_VARIABLE EXTRA_DTC_OVERLAY_FILE_AS_LIST)
-  build_info(devicetree extra-user-files VALUE ${EXTRA_DTC_OVERLAY_FILE_AS_LIST})
+  build_info(devicetree extra-user-files PATH ${EXTRA_DTC_OVERLAY_FILE_AS_LIST})
   list(APPEND
     dts_files
     ${EXTRA_DTC_OVERLAY_FILE_AS_LIST}
@@ -399,6 +399,6 @@ elseif(stderr)
 endif()
 endif(DTC)
 
-build_info(devicetree files VALUE ${dts_files})
-build_info(devicetree include-dirs VALUE ${DTS_ROOT_SYSTEM_INCLUDE_DIRS})
-build_info(devicetree bindings-dirs VALUE ${DTS_ROOT_BINDINGS})
+build_info(devicetree files PATH ${dts_files})
+build_info(devicetree include-dirs PATH ${DTS_ROOT_SYSTEM_INCLUDE_DIRS})
+build_info(devicetree bindings-dirs PATH ${DTS_ROOT_BINDINGS})
diff --git a/cmake/modules/kconfig.cmake b/cmake/modules/kconfig.cmake
index 43e73511768..97086cdf19d 100644
--- a/cmake/modules/kconfig.cmake
+++ b/cmake/modules/kconfig.cmake
@@ -98,13 +98,13 @@ set(PARSED_KCONFIG_SOURCES_TXT ${PROJECT_BINARY_DIR}/kconfig/sources.txt)
 if(CONF_FILE)
   string(CONFIGURE "${CONF_FILE}" CONF_FILE_EXPANDED)
   string(REPLACE " " ";" CONF_FILE_AS_LIST "${CONF_FILE_EXPANDED}")
-  build_info(kconfig user-files VALUE ${CONF_FILE_AS_LIST})
+  build_info(kconfig user-files PATH ${CONF_FILE_AS_LIST})
 endif()
 
 if(EXTRA_CONF_FILE)
   string(CONFIGURE "${EXTRA_CONF_FILE}" EXTRA_CONF_FILE_EXPANDED)
   string(REPLACE " " ";" EXTRA_CONF_FILE_AS_LIST "${EXTRA_CONF_FILE_EXPANDED}")
-  build_info(kconfig extra-user-files VALUE ${EXTRA_CONF_FILE_AS_LIST})
+  build_info(kconfig extra-user-files PATH ${EXTRA_CONF_FILE_AS_LIST})
 endif()
 
 zephyr_file(CONF_FILES ${BOARD_EXTENSION_DIRS} KCONF board_extension_conf_files SUFFIX ${FILE_SUFFIX})
@@ -360,7 +360,7 @@ endif()
 if(CREATE_NEW_DOTCONFIG)
   set(input_configs_flags --handwritten-input-configs)
   set(input_configs ${merge_config_files} ${FORCED_CONF_FILE})
-  build_info(kconfig files VALUE ${input_configs})
+  build_info(kconfig files PATH ${input_configs})
 else()
   set(input_configs ${DOTCONFIG} ${FORCED_CONF_FILE})
 endif()

From ad855faf4c639984d8b2dcf086679f0502b3c5fa Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Thu, 28 Nov 2024 09:07:00 +0100
Subject: [PATCH 0829/2913] [nrf fromtree] cmake: deprecate BUILD_NO_GAP_FILL
 and introduce type specific gap fill

Deprecate BUILD_NO_GAP_FILL as it gives a false impression that gap
filling can be disabled in binary files.
Binary files are always gap filled due to the fact they contain no
address information. Only option for binary files is to control the gap
fill pattern. When no gap fill is enabled in binary files, then a
default pattern is used by the tool, which usually is 0x00.

Generally the pattern 0x00 leads to unnecessary flash writes, as a
flash generally contains 0xFF after an erase.
Therefore provide a gap fill pattern Kconfig setting instead, with
default value of 0xFF.

For hex-files, intel hex and s19, then gap filling is generally not
needed but in order to still support cases where gap filling is required
then this commit introduces BUILD_OUTPUT_HEX_GAP_FILL and
BUILD_OUTPUT_S19_GAP_FILL. Both settings are disabled per default.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 2e8868c16e5ecfab8e823096892e02dac037c222)
(cherry picked from commit d62198cea483df5a6a86fd2b5e49b990c18ab699)
---
 CMakeLists.txt | 13 ++++++-------
 Kconfig.zephyr | 27 ++++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 410aff11ab4..64c0f1f8ef5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1617,10 +1617,9 @@ list(APPEND
 )
 list(APPEND post_build_byproducts ${KERNEL_MAP_NAME})
 
-if(NOT CONFIG_BUILD_NO_GAP_FILL)
-  # Use ';' as separator to get proper space in resulting command.
-  set(GAP_FILL "$<TARGET_PROPERTY:bintools,elfconvert_flag_gapfill>0xff")
-endif()
+# Use ';' as separator to get proper space in resulting command.
+set(gap_fill_prop "$<TARGET_PROPERTY:bintools,elfconvert_flag_gapfill>")
+set(gap_fill "$<$<BOOL:${gap_fill_prop}>:${gap_fill_prop}${CONFIG_BUILD_GAP_FILL_PATTERN}>")
 
 if(CONFIG_OUTPUT_PRINT_MEMORY_USAGE)
   target_link_libraries(${logical_target_for_zephyr_elf} $<TARGET_PROPERTY:linker,memusage>)
@@ -1681,7 +1680,7 @@ if(CONFIG_BUILD_OUTPUT_HEX OR BOARD_FLASH_RUNNER STREQUAL openocd)
       post_build_commands
       COMMAND $<TARGET_PROPERTY:bintools,elfconvert_command>
               $<TARGET_PROPERTY:bintools,elfconvert_flag>
-              ${GAP_FILL}
+              $<$<BOOL:${CONFIG_BUILD_OUTPUT_HEX_GAP_FILL}>:${gap_fill}>
               $<TARGET_PROPERTY:bintools,elfconvert_flag_outtarget>ihex
               ${remove_sections_argument_list}
               $<TARGET_PROPERTY:bintools,elfconvert_flag_infile>${KERNEL_ELF_NAME}
@@ -1703,7 +1702,7 @@ if(CONFIG_BUILD_OUTPUT_BIN)
       post_build_commands
       COMMAND $<TARGET_PROPERTY:bintools,elfconvert_command>
               $<TARGET_PROPERTY:bintools,elfconvert_flag>
-              ${GAP_FILL}
+              ${gap_fill}
               $<TARGET_PROPERTY:bintools,elfconvert_flag_outtarget>binary
               ${remove_sections_argument_list}
               $<TARGET_PROPERTY:bintools,elfconvert_flag_infile>${KERNEL_ELF_NAME}
@@ -1790,7 +1789,7 @@ if(CONFIG_BUILD_OUTPUT_S19)
       post_build_commands
       COMMAND $<TARGET_PROPERTY:bintools,elfconvert_command>
               $<TARGET_PROPERTY:bintools,elfconvert_flag>
-              ${GAP_FILL}
+              $<$<BOOL:${CONFIG_BUILD_OUTPUT_S19_GAP_FILL}>:${gap_fill}>
               $<TARGET_PROPERTY:bintools,elfconvert_flag_outtarget>srec
               $<TARGET_PROPERTY:bintools,elfconvert_flag_srec_len>1
               $<TARGET_PROPERTY:bintools,elfconvert_flag_infile>${KERNEL_ELF_NAME}
diff --git a/Kconfig.zephyr b/Kconfig.zephyr
index 68abf89b42f..510769d8aa7 100644
--- a/Kconfig.zephyr
+++ b/Kconfig.zephyr
@@ -706,8 +706,21 @@ config CLEANUP_INTERMEDIATE_FILES
 	  from the build process. Note this breaks incremental builds, west spdx
 	  (Software Bill of Material generation), and maybe others.
 
+config BUILD_GAP_FILL_PATTERN
+	hex "Gap fill pattern"
+	default 0xFF
+	help
+	  Pattern used for gap filling of output files.
+	  This value should be set to the value of a clean flash as this can
+	  significantly reduce flash write times.
+	  This setting only defines the gap fill pattern and doesn't enable gap
+	  filling.
+	  Note: binary files are always gap filled as they contain no address
+	  information.
+
 config BUILD_NO_GAP_FILL
-	bool "Don't fill gaps in generated hex/bin/s19 files."
+	bool "Don't fill gaps in generated hex/s19 files [DEPRECATED]."
+	select DEPRECATED
 
 config BUILD_OUTPUT_HEX
 	bool "Build a binary in HEX format"
@@ -715,6 +728,12 @@ config BUILD_OUTPUT_HEX
 	  Build an Intel HEX binary zephyr/zephyr.hex in the build directory.
 	  The name of this file can be customized with CONFIG_KERNEL_BIN_NAME.
 
+config BUILD_OUTPUT_HEX_GAP_FILL
+	bool "Fill gaps in hex files"
+	depends on !BUILD_NO_GAP_FILL
+	help
+	  Fill gaps in hex based files.
+
 config BUILD_OUTPUT_BIN
 	bool "Build a binary in BIN format"
 	default y
@@ -749,6 +768,12 @@ config BUILD_OUTPUT_S19
 	  Build an S19 binary zephyr/zephyr.s19 in the build directory.
 	  The name of this file can be customized with CONFIG_KERNEL_BIN_NAME.
 
+config BUILD_OUTPUT_S19_GAP_FILL
+	bool "Fill gaps in s19 files"
+	depends on !BUILD_NO_GAP_FILL
+	help
+	  Fill gaps in s19 based files.
+
 config BUILD_OUTPUT_UF2
 	bool "Build a binary in UF2 format"
 	depends on BUILD_OUTPUT_BIN

From 167370f5f21e4b8d42d6fc704f4c38db59d78b7a Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Thu, 28 Nov 2024 09:16:38 +0100
Subject: [PATCH 0830/2913] [nrf fromtree] cmake: clear llvm bintool gapfill
 property

The llvm-objcopy doesn't support a gap-fill argument, therefore clear
the property to remove the error:
> llvm-objcopy: error: unknown argument '--gap-fill'

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 71fd4d9c98c7fe0845b70693e8daea46c6646b80)
(cherry picked from commit b249f97bd802c97e135da87c8eb2017265c4211a)
---
 cmake/bintools/llvm/target_bintools.cmake | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/cmake/bintools/llvm/target_bintools.cmake b/cmake/bintools/llvm/target_bintools.cmake
index cd3d55342b5..f310d57bf2b 100644
--- a/cmake/bintools/llvm/target_bintools.cmake
+++ b/cmake/bintools/llvm/target_bintools.cmake
@@ -44,11 +44,8 @@ set_property(TARGET bintools PROPERTY elfconvert_flag_section_remove "--remove-s
 set_property(TARGET bintools PROPERTY elfconvert_flag_section_only "--only-section=")
 set_property(TARGET bintools PROPERTY elfconvert_flag_section_rename "--rename-section;")
 
-# Note, placing a ';' at the end results in the following param  to be a list,
-# and hence space separated.
-# Thus the command line argument becomes:
-# `--gap-file <value>` instead of `--gap-fill<value>` (The latter would result in an error)
-set_property(TARGET bintools PROPERTY elfconvert_flag_gapfill "--gap-fill;")
+# llvm-objcopy doesn't support gap fill argument.
+set_property(TARGET bintools PROPERTY elfconvert_flag_gapfill "")
 set_property(TARGET bintools PROPERTY elfconvert_flag_srec_len "--srec-len=")
 
 set_property(TARGET bintools PROPERTY elfconvert_flag_infile "")

From b062985ee272fcbba29d77f364361be518460533 Mon Sep 17 00:00:00 2001
From: "Bansidhar P.M" <bansidhar.mangalwedhekar@nordicsemi.no>
Date: Sun, 1 Dec 2024 16:08:00 +0530
Subject: [PATCH 0831/2913] [nrf fromlist] drivers: nrf_wifi: Restructure to
 carve out a new nrf70 bus lib

The nrf wifi drivers include code related to qspi/spi bus. This work
moves bus related files to a new nrf70 bus library which is now
independent of the core driver and facilitlates building applications
directly using the bus APIs, agnostic to enabling wifi configs.

Upstream PR #: 82372

Signed-off-by: Bansidhar P.M <bansidhar.mangalwedhekar@nordicsemi.no>
(cherry picked from commit b515453229bdf9ac1a88ea2076b8cc5212e55de2)
---
 drivers/wifi/nrf_wifi/CMakeLists.txt          |  17 +-
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi         |  14 +-
 .../wifi/nrf_wifi/src/qspi/inc/ficr_prog.h    |  23 --
 .../wifi/nrf_wifi/src/qspi/src/ficr_prog.c    | 379 ------------------
 .../drivers/wifi/nrf_wifi/bus}/qspi_if.h      |   0
 .../drivers/wifi/nrf_wifi/bus}/rpu_hw_if.h    |   0
 modules/nrf_wifi/CMakeLists.txt               | 186 +--------
 modules/nrf_wifi/Kconfig                      |   2 +
 modules/nrf_wifi/bus/CMakeLists.txt           |  27 ++
 modules/nrf_wifi/bus/Kconfig                  |  46 +++
 .../src => modules/nrf_wifi/bus}/device.c     |  26 +-
 .../src => modules/nrf_wifi/bus}/qspi_if.c    |   4 +-
 .../src => modules/nrf_wifi/bus}/rpu_hw_if.c  |  15 +-
 .../src => modules/nrf_wifi/bus}/spi_if.c     |   4 +-
 .../inc => modules/nrf_wifi/bus}/spi_if.h     |   0
 .../inc => modules/nrf_wifi/bus}/spi_nor.h    |   0
 modules/nrf_wifi/os/CMakeLists.txt            | 186 +++++++++
 modules/nrf_wifi/{ => os}/shim.c              |   4 +-
 modules/nrf_wifi/{ => os}/shim.h              |   0
 modules/nrf_wifi/{ => os}/timer.c             |   0
 modules/nrf_wifi/{ => os}/timer.h             |   0
 modules/nrf_wifi/{ => os}/work.c              |   0
 modules/nrf_wifi/{ => os}/work.h              |   0
 23 files changed, 298 insertions(+), 635 deletions(-)
 delete mode 100644 drivers/wifi/nrf_wifi/src/qspi/inc/ficr_prog.h
 delete mode 100644 drivers/wifi/nrf_wifi/src/qspi/src/ficr_prog.c
 rename {drivers/wifi/nrf_wifi/src/qspi/inc => include/zephyr/drivers/wifi/nrf_wifi/bus}/qspi_if.h (100%)
 rename {drivers/wifi/nrf_wifi/src/qspi/inc => include/zephyr/drivers/wifi/nrf_wifi/bus}/rpu_hw_if.h (100%)
 create mode 100644 modules/nrf_wifi/bus/CMakeLists.txt
 create mode 100644 modules/nrf_wifi/bus/Kconfig
 rename {drivers/wifi/nrf_wifi/src/qspi/src => modules/nrf_wifi/bus}/device.c (78%)
 rename {drivers/wifi/nrf_wifi/src/qspi/src => modules/nrf_wifi/bus}/qspi_if.c (99%)
 rename {drivers/wifi/nrf_wifi/src/qspi/src => modules/nrf_wifi/bus}/rpu_hw_if.c (96%)
 rename {drivers/wifi/nrf_wifi/src/qspi/src => modules/nrf_wifi/bus}/spi_if.c (98%)
 rename {drivers/wifi/nrf_wifi/src/qspi/inc => modules/nrf_wifi/bus}/spi_if.h (100%)
 rename {drivers/wifi/nrf_wifi/src/qspi/inc => modules/nrf_wifi/bus}/spi_nor.h (100%)
 create mode 100644 modules/nrf_wifi/os/CMakeLists.txt
 rename modules/nrf_wifi/{ => os}/shim.c (99%)
 rename modules/nrf_wifi/{ => os}/shim.h (100%)
 rename modules/nrf_wifi/{ => os}/timer.c (100%)
 rename modules/nrf_wifi/{ => os}/timer.h (100%)
 rename modules/nrf_wifi/{ => os}/work.c (100%)
 rename modules/nrf_wifi/{ => os}/work.h (100%)

diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
index e631e930e07..27d8ba8081c 100644
--- a/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -11,7 +11,6 @@ set(FW_BINS_BASE ${ZEPHYR_NRF_WIFI_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
 
 zephyr_include_directories(
   inc
-  src/qspi/inc
   # for net_sprint_ll_addr
   ${ZEPHYR_BASE}/subsys/net/ip
 )
@@ -24,12 +23,6 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_SR_COEX
   src/coex.c
 )
 
-zephyr_library_sources(
-  src/qspi/src/device.c
-  src/qspi/src/rpu_hw_if.c
-  src/qspi/src/ficr_prog.c
-)
-
 zephyr_library_sources_ifndef(CONFIG_NRF70_OFFLOADED_RAW_TX
   src/fmac_main.c
 )
@@ -65,14 +58,6 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
 zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
   src/wpa_supp_if.c)
 
-zephyr_library_sources_ifdef(CONFIG_NRF70_ON_QSPI
-  src/qspi/src/qspi_if.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_ON_SPI
-  src/qspi/src/spi_if.c
-)
-
 zephyr_library_sources_ifdef(CONFIG_NRF70_UTIL
   src/wifi_util.c
 )
@@ -88,6 +73,8 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF70_ON_QSPI
   -DNRF53_ERRATA_159_ENABLE_WORKAROUND=0
 )
 
+target_link_libraries(nrf_wifi PRIVATE nrf70-buslib)
+
 if (CONFIG_NRF_WIFI_BUILD_ONLY_MODE)
   message(WARNING "
   ------------------------------------------------------------------------
diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index f0d2c8ead71..45a22b7e7fa 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -11,6 +11,7 @@ menuconfig WIFI_NRF70
 	select NET_L2_ETHERNET_MGMT if NETWORKING && NET_L2_ETHERNET
 	select WIFI_USE_NATIVE_NETWORKING if NETWORKING
 	select EXPERIMENTAL if !SOC_SERIES_NRF53X && !SOC_SERIES_NRF91X
+	select NRF70_BUSLIB
 	default y
 	depends on \
 		DT_HAS_NORDIC_NRF7002_SPI_ENABLED || DT_HAS_NORDIC_NRF7002_QSPI_ENABLED || \
@@ -33,16 +34,9 @@ config WIFI_NRF7000
 	bool
 	default y if DT_HAS_NORDIC_NRF7000_SPI_ENABLED || DT_HAS_NORDIC_NRF7000_QSPI_ENABLED
 
-
-module = WIFI_NRF70_BUS
-module-dep = LOG
-module-str = Log level for Wi-Fi nRF70 bus layers
-module-help = Sets log level for Wi-Fi nRF70 bus layers
-source "subsys/net/Kconfig.template.log_config.net"
-
-config WIFI_NRF70_BUS_LOG_LEVEL
-	# Enable error by default
-	default 1
+config NRF70_QSPI_LOW_POWER
+	bool "low power mode in QSPI"
+	default y if NRF_WIFI_LOW_POWER
 
 choice NRF70_OPER_MODES
 	bool "nRF70 operating modes"
diff --git a/drivers/wifi/nrf_wifi/src/qspi/inc/ficr_prog.h b/drivers/wifi/nrf_wifi/src/qspi/inc/ficr_prog.h
deleted file mode 100644
index 35c4bda1fa3..00000000000
--- a/drivers/wifi/nrf_wifi/src/qspi/inc/ficr_prog.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @brief Header containing address/offets and functions for writing
- * the FICR fields of the OTP memory on nRF7002 device
- */
-
-#ifndef __OTP_PROG_H_
-#define __OTP_PROG_H_
-
-#include <stdio.h>
-#include <stdlib.h>
-
-int write_otp_memory(unsigned int otp_addr, unsigned int *write_val);
-int read_otp_memory(unsigned int otp_addr, unsigned int *read_val, int len);
-unsigned int check_protection(unsigned int *buff, unsigned int off1, unsigned int off2,
-					unsigned int off3, unsigned int off4);
-
-#endif /* __OTP_PROG_H_ */
diff --git a/drivers/wifi/nrf_wifi/src/qspi/src/ficr_prog.c b/drivers/wifi/nrf_wifi/src/qspi/src/ficr_prog.c
deleted file mode 100644
index 5558b35e837..00000000000
--- a/drivers/wifi/nrf_wifi/src/qspi/src/ficr_prog.c
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/* @file
- * @brief NRF Wi-Fi radio FICR programming functions
- */
-
-#include <zephyr/logging/log.h>
-#include <zephyr/kernel.h>
-#include "rpu_if.h"
-#include "rpu_hw_if.h"
-#include "ficr_prog.h"
-
-
-LOG_MODULE_DECLARE(otp_prog, CONFIG_WIFI_NRF70_BUS_LOG_LEVEL);
-
-static void write_word(unsigned int addr, unsigned int data)
-{
-	rpu_write(addr, &data, 4);
-}
-
-static void read_word(unsigned int addr, unsigned int *data)
-{
-	rpu_read(addr, data, 4);
-}
-
-unsigned int check_protection(unsigned int *buff, unsigned int off1, unsigned int off2,
-		    unsigned int off3, unsigned int off4)
-{
-	if ((buff[off1] == OTP_PROGRAMMED) &&
-		(buff[off2] == OTP_PROGRAMMED)  &&
-		(buff[off3] == OTP_PROGRAMMED) &&
-		(buff[off4] == OTP_PROGRAMMED))
-		return OTP_PROGRAMMED;
-	else if ((buff[off1] == OTP_FRESH_FROM_FAB) &&
-		(buff[off2] == OTP_FRESH_FROM_FAB) &&
-		(buff[off3] == OTP_FRESH_FROM_FAB) &&
-		(buff[off4] == OTP_FRESH_FROM_FAB))
-		return OTP_FRESH_FROM_FAB;
-	else if ((buff[off1] == OTP_ENABLE_PATTERN) &&
-		(buff[off2] == OTP_ENABLE_PATTERN) &&
-		(buff[off3] == OTP_ENABLE_PATTERN) &&
-		(buff[off4] == OTP_ENABLE_PATTERN))
-		return OTP_ENABLE_PATTERN;
-	else
-		return OTP_INVALID;
-}
-
-
-static void set_otp_timing_reg_40mhz(void)
-{
-	write_word(OTP_TIMING_REG1_ADDR, OTP_TIMING_REG1_VAL);
-	write_word(OTP_TIMING_REG2_ADDR, OTP_TIMING_REG2_VAL);
-}
-
-static int poll_otp_ready(void)
-{
-	int otp_mem_status = 0;
-	int poll = 0;
-
-	while (poll != 100) {
-		read_word(OTP_POLL_ADDR, &otp_mem_status);
-
-		if ((otp_mem_status & OTP_READY) == OTP_READY) {
-			return 0;
-		}
-		poll++;
-	}
-	LOG_ERR("OTP is not ready");
-	return -ENOEXEC;
-}
-
-
-static int req_otp_standby_mode(void)
-{
-	write_word(OTP_RWSBMODE_ADDR, 0x0);
-	return poll_otp_ready();
-}
-
-
-static int otp_wr_voltage_2V5(void)
-{
-	int err;
-
-	err = req_otp_standby_mode();
-
-	if (err) {
-		LOG_ERR("Failed Setting OTP voltage IOVDD to 2.5V");
-		return -ENOEXEC;
-	}
-	write_word(OTP_VOLTCTRL_ADDR, OTP_VOLTCTRL_2V5);
-	return 0;
-}
-
-static int poll_otp_read_valid(void)
-{
-	int otp_mem_status = 0;
-	int poll = 0;
-
-	while (poll < 100) {
-		read_word(OTP_POLL_ADDR, &otp_mem_status);
-
-		if ((otp_mem_status & OTP_READ_VALID) == OTP_READ_VALID) {
-			return 0;
-		}
-		poll++;
-	}
-	LOG_ERR("%s: OTP read failed", __func__);
-	return -ENOEXEC;
-}
-
-static int poll_otp_wrdone(void)
-{
-	int otp_mem_status = 0;
-	int poll = 0;
-
-	while (poll < 100) {
-		read_word(OTP_POLL_ADDR, &otp_mem_status);
-
-		if ((otp_mem_status & OTP_WR_DONE) == OTP_WR_DONE) {
-			return 0;
-		}
-		poll++;
-	}
-	LOG_ERR("%s: OTP write done failed", __func__);
-	return -ENOEXEC;
-}
-
-static int req_otp_read_mode(void)
-{
-	write_word(OTP_RWSBMODE_ADDR, OTP_READ_MODE);
-	return poll_otp_ready();
-}
-
-
-static int req_otp_byte_write_mode(void)
-{
-	write_word(OTP_RWSBMODE_ADDR, OTP_BYTE_WRITE_MODE);
-	return poll_otp_ready();
-}
-
-static unsigned int read_otp_location(unsigned int offset, unsigned int *read_val)
-{
-	int err;
-
-	write_word(OTP_RDENABLE_ADDR,  offset);
-	err = poll_otp_read_valid();
-	if (err) {
-		LOG_ERR("OTP read failed");
-		return err;
-	}
-	read_word(OTP_READREG_ADDR, read_val);
-
-	return 0;
-}
-
-static int  write_otp_location(unsigned int otp_location_offset, unsigned int otp_data)
-{
-	write_word(OTP_WRENABLE_ADDR,  otp_location_offset);
-	write_word(OTP_WRITEREG_ADDR,  otp_data);
-
-	return poll_otp_wrdone();
-}
-
-
-static int otp_rd_voltage_1V8(void)
-{
-	int err;
-
-	err = req_otp_standby_mode();
-	if (err) {
-		LOG_ERR("error in %s", __func__);
-		return err;
-	}
-	write_word(OTP_VOLTCTRL_ADDR, OTP_VOLTCTRL_1V8);
-
-	return 0;
-}
-
-static int update_mac_addr(unsigned int index, unsigned int *write_val)
-{
-	int ret = 0;
-
-	for (int i = 0; i < 2; i++) {
-		ret = write_otp_location(MAC0_ADDR + 2 * index + i, write_val[i]);
-		if (ret == -ENOEXEC) {
-			LOG_ERR("FICR: Failed to update MAC ADDR%d", index);
-			break;
-		}
-		LOG_INF("mac addr %d : Reg%d (0x%x) = 0x%04x",
-					index, (i+1), (MAC0_ADDR + i) << 2, write_val[i]);
-	}
-	return ret;
-}
-
-int write_otp_memory(unsigned int otp_addr, unsigned int *write_val)
-{
-	int err = 0;
-	int	mask_val;
-	int ret = 0;
-	int retrim_loc = 0;
-
-	err = poll_otp_ready();
-	if (err) {
-		LOG_ERR("err in otp ready poll");
-		return err;
-	}
-
-	set_otp_timing_reg_40mhz();
-
-	err = otp_wr_voltage_2V5();
-	if (err) {
-		LOG_ERR("error in write_voltage 2V5");
-		goto _exit_otp_write;
-	}
-
-	err = req_otp_byte_write_mode();
-	if (err) {
-		LOG_ERR("error in OTP byte write mode");
-		goto _exit_otp_write;
-	}
-
-	switch (otp_addr) {
-	case REGION_PROTECT:
-		write_otp_location(REGION_PROTECT, write_val[0]);
-		write_otp_location(REGION_PROTECT+1, write_val[0]);
-		write_otp_location(REGION_PROTECT+2, write_val[0]);
-		write_otp_location(REGION_PROTECT+3, write_val[0]);
-
-		LOG_INF("Written REGION_PROTECT0 (0x%x) : 0x%04x",
-						(REGION_PROTECT << 2), write_val[0]);
-		LOG_INF("Written REGION_PROTECT1 (0x%x) : 0x%04x",
-						(REGION_PROTECT+1) << 2, write_val[0]);
-		LOG_INF("Written REGION_PROTECT2 (0x%x) : 0x%04x",
-						(REGION_PROTECT+2) << 2, write_val[0]);
-		LOG_INF("Written REGION_PROTECT3 (0x%x) : 0x%04x",
-						(REGION_PROTECT+3) << 2, write_val[0]);
-		break;
-	case QSPI_KEY:
-		mask_val = QSPI_KEY_FLAG_MASK;
-		for (int i = 0; i < QSPI_KEY_LENGTH_BYTES / 4; i++) {
-			ret = write_otp_location(QSPI_KEY + i, write_val[i]);
-			if (ret == -ENOEXEC) {
-				LOG_ERR("FICR: Failed to write QSPI key offset-%d", QSPI_KEY + i);
-				goto _exit_otp_write;
-			}
-			LOG_INF("Written QSPI_KEY0 (0x%x) : 0x%04x",
-						(QSPI_KEY + i) << 2, write_val[i]);
-		}
-		write_otp_location(REGION_DEFAULTS, mask_val);
-		LOG_INF("Written REGION_DEFAULTS (0x%x) : 0x%04x",
-						(REGION_DEFAULTS) << 2, mask_val);
-		break;
-	case MAC0_ADDR:
-		mask_val = MAC0_ADDR_FLAG_MASK;
-		ret = update_mac_addr(0, write_val);
-		if (ret == -ENOEXEC) {
-			goto _exit_otp_write;
-		}
-
-		write_otp_location(REGION_DEFAULTS, mask_val);
-		LOG_INF("Written MAC address 0");
-		LOG_INF("Written REGION_DEFAULTS (0x%x) : 0x%04x",
-						(REGION_DEFAULTS) << 2, mask_val);
-		break;
-	case MAC1_ADDR:
-		mask_val = MAC1_ADDR_FLAG_MASK;
-		ret = update_mac_addr(1, write_val);
-		if (ret == -ENOEXEC) {
-			goto _exit_otp_write;
-		}
-		write_otp_location(REGION_DEFAULTS, mask_val);
-		LOG_INF("Written MAC address 1");
-		LOG_INF("Written REGION_DEFAULTS (0x%x) : 0x%04x",
-						(REGION_DEFAULTS) << 2, mask_val);
-		break;
-	case CALIB_XO:
-		mask_val = CALIB_XO_FLAG_MASK;
-		ret = write_otp_location(CALIB_XO, write_val[0]);
-
-		if (ret == -ENOEXEC) {
-			LOG_ERR("XO_Update Exception");
-			goto _exit_otp_write;
-		} else {
-			write_otp_location(REGION_DEFAULTS, mask_val);
-
-			LOG_INF("Written CALIB_XO (0x%x) to 0x%04x",
-						CALIB_XO << 2, write_val[0]);
-			LOG_INF("Written REGION_DEFAULTS (0x%x) : 0x%04x",
-						(REGION_DEFAULTS) << 2, mask_val);
-		}
-		break;
-	case PRODRETEST_PROGVERSION:
-		ret = write_otp_location(PRODRETEST_PROGVERSION, *write_val);
-
-		if (ret == -ENOEXEC) {
-			LOG_ERR("PRODRETEST.PROGVERSION_Update Exception");
-			goto _exit_otp_write;
-		} else {
-			LOG_INF("Written PRODRETEST.PROGVERSION 0x%04x", *write_val);
-		}
-		break;
-	case PRODRETEST_TRIM0:
-	case PRODRETEST_TRIM1:
-	case PRODRETEST_TRIM2:
-	case PRODRETEST_TRIM3:
-	case PRODRETEST_TRIM4:
-	case PRODRETEST_TRIM5:
-	case PRODRETEST_TRIM6:
-	case PRODRETEST_TRIM7:
-	case PRODRETEST_TRIM8:
-	case PRODRETEST_TRIM9:
-	case PRODRETEST_TRIM10:
-	case PRODRETEST_TRIM11:
-	case PRODRETEST_TRIM12:
-	case PRODRETEST_TRIM13:
-	case PRODRETEST_TRIM14:
-		retrim_loc = otp_addr - PRODRETEST_TRIM0;
-		ret = write_otp_location(otp_addr, *write_val);
-
-		if (ret == -ENOEXEC) {
-			LOG_ERR("PRODRETEST.TRIM_Update Exception");
-			goto _exit_otp_write;
-		} else {
-			LOG_INF("Written PRODRETEST.TRIM%d 0x%04x",
-						retrim_loc, *write_val);
-		}
-		break;
-	case REGION_DEFAULTS:
-		write_otp_location(REGION_DEFAULTS, write_val[0]);
-
-		LOG_INF("Written REGION_DEFAULTS (0x%x) to 0x%04x",
-						REGION_DEFAULTS << 2, write_val[0]);
-		break;
-	default:
-		LOG_ERR("unknown field received: %d", otp_addr);
-
-	}
-	return ret;
-
-_exit_otp_write:
-	err  = req_otp_standby_mode();
-	err |= otp_rd_voltage_1V8();
-	return err;
-}
-
-int read_otp_memory(unsigned int otp_addr, unsigned int *read_val, int len)
-{
-	int	err;
-
-	err = poll_otp_ready();
-	if (err) {
-		LOG_ERR("err in otp ready poll");
-		return -ENOEXEC;
-	}
-
-	set_otp_timing_reg_40mhz();
-
-	err = otp_rd_voltage_1V8();
-	if (err) {
-		LOG_ERR("error in read_voltage 1V8");
-		return -ENOEXEC;
-	}
-
-	err = req_otp_read_mode();
-	if (err) {
-		LOG_ERR("error in req_otp_read_mode()");
-		return -ENOEXEC;
-	}
-
-	for (int i = 0; i < len; i++) {
-		read_otp_location(otp_addr + i, &read_val[i]);
-	}
-
-	return req_otp_standby_mode();
-}
diff --git a/drivers/wifi/nrf_wifi/src/qspi/inc/qspi_if.h b/include/zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/qspi/inc/qspi_if.h
rename to include/zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h
diff --git a/drivers/wifi/nrf_wifi/src/qspi/inc/rpu_hw_if.h b/include/zephyr/drivers/wifi/nrf_wifi/bus/rpu_hw_if.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/qspi/inc/rpu_hw_if.h
rename to include/zephyr/drivers/wifi/nrf_wifi/bus/rpu_hw_if.h
diff --git a/modules/nrf_wifi/CMakeLists.txt b/modules/nrf_wifi/CMakeLists.txt
index e3b96f0db7b..982272fce6a 100644
--- a/modules/nrf_wifi/CMakeLists.txt
+++ b/modules/nrf_wifi/CMakeLists.txt
@@ -1,184 +1,6 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
+#
 # SPDX-License-Identifier: Apache-2.0
+#
 
-if(NOT CONFIG_WIFI_NRF70)
-  return()
-endif()
-zephyr_interface_library_named(nrf-wifi-interface)
-zephyr_library()
-
-set(NRF_WIFI_DIR ${ZEPHYR_CURRENT_MODULE_DIR})
-
-# Translate the configuration to the OS agnostic code
-target_compile_definitions(
-  nrf-wifi-interface
-  INTERFACE
-  $<$<BOOL:${CONFIG_NRF_WIFI_LOW_POWER}>:NRF_WIFI_LOW_POWER>
-  $<$<BOOL:${CONFIG_NRF_WIFI_RPU_RECOVERY}>:NRF_WIFI_RPU_RECOVERY>
-  $<$<BOOL:${CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT}>:NRF_WIFI_AP_DEAD_DETECT_TIMEOUT=${CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT}>
-  $<$<BOOL:${CONFIG_NRF_WIFI_IFACE_MTU}>:NRF_WIFI_IFACE_MTU=${CONFIG_NRF_WIFI_IFACE_MTU}>
-  $<$<BOOL:${CONFIG_NRF70_STA_MODE}>:NRF70_STA_MODE>
-  $<$<BOOL:${CONFIG_NRF70_DATA_TX}>:NRF70_DATA_TX>
-  $<$<BOOL:${CONFIG_NRF70_RAW_DATA_TX}>:NRF70_RAW_DATA_TX>
-  $<$<BOOL:${CONFIG_NRF70_RAW_DATA_RX}>:NRF70_RAW_DATA_RX>
-  $<$<BOOL:${CONFIG_NRF70_PROMISC_DATA_RX}>:NRF70_PROMISC_DATA_RX>
-  $<$<BOOL:${CONFIG_NRF70_TX_DONE_WQ_ENABLED}>:NRF70_TX_DONE_WQ_ENABLED>
-  $<$<BOOL:${CONFIG_NRF70_RX_WQ_ENABLED}>:NRF70_RX_WQ_ENABLED>
-  $<$<BOOL:${CONFIG_NRF70_UTIL}>:NRF70_UTIL>
-  $<$<BOOL:${CONFIG_NRF70_RADIO_TEST}>:NRF70_RADIO_TEST>
-  $<$<BOOL:${CONFIG_NRF70_OFFLOADED_RAW_TX}>:NRF70_OFFLOADED_RAW_TX>
-  $<$<BOOL:${CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD}>:NRF70_TCP_IP_CHECKSUM_OFFLOAD>
-  $<$<BOOL:${CONFIG_NRF70_RPU_EXTEND_TWT_SP}>:NRF70_RPU_EXTEND_TWT_SP>
-  $<$<BOOL:${CONFIG_NRF70_SYSTEM_WITH_RAW_MODES}>:NRF70_SYSTEM_WITH_RAW_MODES>
-  $<$<BOOL:${CONFIG_NRF70_SCAN_ONLY}>:NRF70_SCAN_ONLY>
-  $<$<BOOL:${CONFIG_NRF70_SYSTEM_MODE}>:NRF70_SYSTEM_MODE>
-  $<$<BOOL:${CONFIG_NRF70_2_4G_ONLY}>:NRF70_2_4G_ONLY>
-  $<$<BOOL:${CONFIG_NRF70_LOG_VERBOSE}>:NRF70_LOG_VERBOSE>
-  $<$<BOOL:${CONFIG_NRF70_AP_MODE}>:NRF70_AP_MODE>
-  $<$<BOOL:${CONFIG_NRF_WIFI_MGMT_BUFF_OFFLOAD}>:NRF_WIFI_MGMT_BUFF_OFFLOAD>
-  $<$<BOOL:${CONFIG_NRF_WIFI_FEAT_KEEPALIVE}>:NRF_WIFI_FEAT_KEEPALIVE>
-  $<$<BOOL:${CONFIG_NRF_WIFI_FEAT_KEEPALIVE}>:NRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}>
-  $<$<BOOL:${CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS}>:WIFI_MGMT_RAW_SCAN_RESULTS>
-  NRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
-  NRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}
-  NRF70_RX_MAX_DATA_SIZE=${CONFIG_NRF70_RX_MAX_DATA_SIZE}
-  NRF70_MAX_TX_PENDING_QLEN=${CONFIG_NRF70_MAX_TX_PENDING_QLEN}
-  NRF70_RPU_PS_IDLE_TIMEOUT_MS=${CONFIG_NRF70_RPU_PS_IDLE_TIMEOUT_MS}
-  NRF70_REG_DOMAIN=${CONFIG_NRF70_REG_DOMAIN}
-  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS}
-  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS}
-  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE}
-  NRF70_PCB_LOSS_2G=${CONFIG_NRF70_PCB_LOSS_2G}
-  NRF70_PCB_LOSS_5G_BAND1=${CONFIG_NRF70_PCB_LOSS_5G_BAND1}
-  NRF70_PCB_LOSS_5G_BAND2=${CONFIG_NRF70_PCB_LOSS_5G_BAND2}
-  NRF70_PCB_LOSS_5G_BAND3=${CONFIG_NRF70_PCB_LOSS_5G_BAND3}
-  NRF70_ANT_GAIN_2G=${CONFIG_NRF70_ANT_GAIN_2G}
-  NRF70_ANT_GAIN_5G_BAND1=${CONFIG_NRF70_ANT_GAIN_5G_BAND1}
-  NRF70_ANT_GAIN_5G_BAND2=${CONFIG_NRF70_ANT_GAIN_5G_BAND2}
-  NRF70_ANT_GAIN_5G_BAND3=${CONFIG_NRF70_ANT_GAIN_5G_BAND3}
-  NRF_WIFI_PS_INT_PS=${CONFIG_NRF_WIFI_PS_INT_PS}
-  NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS=${CONFIG_NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS}
-)
-
-target_include_directories(
-  nrf-wifi-interface
-  INTERFACE
-  ${CMAKE_CURRENT_LIST_DIR}
-  ${NRF_WIFI_DIR}/utils/inc
-  ${NRF_WIFI_DIR}/os_if/inc
-  ${NRF_WIFI_DIR}/bus_if/bus/qspi/inc
-  ${NRF_WIFI_DIR}/bus_if/bal/inc
-  ${NRF_WIFI_DIR}/fw_if/umac_if/inc
-  ${NRF_WIFI_DIR}/fw_load/mips/fw/inc
-  ${NRF_WIFI_DIR}/hw_if/hal/inc
-  ${NRF_WIFI_DIR}/hw_if/hal/inc/fw
-  ${NRF_WIFI_DIR}/fw_if/umac_if/inc/fw
-)
-
-if(CONFIG_NRF70_RADIO_TEST)
-  target_include_directories(nrf-wifi-interface INTERFACE
-    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/radio_test
-  )
-elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
-  target_include_directories(nrf-wifi-interface INTERFACE
-    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/offload_raw_tx
-    off_raw_tx/inc
-  )
-else()
-  target_include_directories(nrf-wifi-interface INTERFACE
-    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/default
-  )
-endif()
-
-zephyr_library_sources(
-  ${NRF_WIFI_DIR}/os_if/src/osal.c
-  ${NRF_WIFI_DIR}/utils/src/list.c
-  ${NRF_WIFI_DIR}/utils/src/queue.c
-  ${NRF_WIFI_DIR}/utils/src/util.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_api.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_fw_patch_loader.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_interrupt.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_mem.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_reg.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hpqm.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/pal.c
-  ${NRF_WIFI_DIR}/bus_if/bal/src/bal.c
-  ${NRF_WIFI_DIR}/bus_if/bus/qspi/src/qspi.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/cmd.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/event.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_api_common.c
-)
-
-if(CONFIG_NRF70_RADIO_TEST)
-  zephyr_library_sources(
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/radio_test/fmac_api.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-  )
-elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
-  zephyr_library_sources(
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/offload_raw_tx/fmac_api.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-  )
-else()
-  zephyr_library_sources(
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/rx.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_vif.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/default/fmac_api.c
-  )
-endif()
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_DATA_TX
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/tx.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_promisc.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_AP_MODE
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_ap.c
-)
-
-# Without WPA supplicant we only support scan
-zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-)
-
-zephyr_library_sources(
-  shim.c
-  timer.c
-  work.c
-)
-
-target_link_libraries(zephyr_interface INTERFACE nrf-wifi-interface)
+add_subdirectory_ifdef(CONFIG_WIFI_NRF70 os)
+add_subdirectory_ifdef(CONFIG_NRF70_BUSLIB bus)
diff --git a/modules/nrf_wifi/Kconfig b/modules/nrf_wifi/Kconfig
index 9fe8172c68d..655fce838e5 100644
--- a/modules/nrf_wifi/Kconfig
+++ b/modules/nrf_wifi/Kconfig
@@ -3,3 +3,5 @@
 
 config ZEPHYR_NRF_WIFI_MODULE
 	bool
+
+source "modules/nrf_wifi/bus/Kconfig"
diff --git a/modules/nrf_wifi/bus/CMakeLists.txt b/modules/nrf_wifi/bus/CMakeLists.txt
new file mode 100644
index 00000000000..f939ce3287c
--- /dev/null
+++ b/modules/nrf_wifi/bus/CMakeLists.txt
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# Check if ZEPHYR_BASE is set
+if(NOT DEFINED ENV{ZEPHYR_BASE})
+    message(FATAL_ERROR "ZEPHYR_BASE environment variable is not set. Please set it to the Zephyr base directory.")
+endif()
+
+if (CONFIG_NRF70_BUSLIB)
+  zephyr_library_named(nrf70-buslib)
+  zephyr_library_include_directories(
+    inc
+  )
+  zephyr_library_sources(
+    rpu_hw_if.c
+    device.c
+  )
+  zephyr_library_sources_ifdef(CONFIG_NRF70_ON_QSPI
+    qspi_if.c
+  )
+  zephyr_library_sources_ifdef(CONFIG_NRF70_ON_SPI
+    spi_if.c
+  )
+endif()
diff --git a/modules/nrf_wifi/bus/Kconfig b/modules/nrf_wifi/bus/Kconfig
new file mode 100644
index 00000000000..152904e86b7
--- /dev/null
+++ b/modules/nrf_wifi/bus/Kconfig
@@ -0,0 +1,46 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+DT_COMPAT_NORDIC_NRF7002_QSPI := nordic,nrf7002-qspi
+DT_COMPAT_NORDIC_NRF7002_SPI := nordic,nrf7002-spi
+DT_COMPAT_NORDIC_NRF7001_QSPI := nordic,nrf7001-qspi
+DT_COMPAT_NORDIC_NRF7001_SPI := nordic,nrf7001-spi
+DT_COMPAT_NORDIC_NRF7000_QSPI := nordic,nrf7000-qspi
+DT_COMPAT_NORDIC_NRF7000_SPI := nordic,nrf7000-spi
+
+menuconfig NRF70_BUSLIB
+	bool "NRF70 Bus Library"
+	help
+	  Enable the NRF70 Bus Library for the nRF7002 Wi-Fi shield.
+
+if NRF70_BUSLIB
+
+config NRF70_ON_QSPI
+	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF7002_QSPI)) ||\
+			 $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF7001_QSPI)) ||\
+			 $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF7000_QSPI))
+	select NRFX_QSPI
+
+config NRF70_ON_SPI
+	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF7002_SPI)) ||\
+			 $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF7001_SPI)) ||\
+			 $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF7000_SPI))
+	select SPI
+
+module = WIFI_NRF70_BUSLIB
+module-dep = LOG
+module-str = Log level for Wi-Fi nRF70 bus library
+source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"
+
+config WIFI_NRF70_BUSLIB_LOG_LEVEL
+	# Enable error by default
+	default 1
+
+config NRF70_LOG_VERBOSE
+	bool "Maintains the verbosity of information in logs"
+	default y
+
+endif # NRF70_BUSLIB
diff --git a/drivers/wifi/nrf_wifi/src/qspi/src/device.c b/modules/nrf_wifi/bus/device.c
similarity index 78%
rename from drivers/wifi/nrf_wifi/src/qspi/src/device.c
rename to modules/nrf_wifi/bus/device.c
index 4acbaf3861f..8cf0b77cd67 100644
--- a/drivers/wifi/nrf_wifi/src/qspi/src/device.c
+++ b/modules/nrf_wifi/bus/device.c
@@ -12,30 +12,26 @@
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "qspi_if.h"
 #include "spi_if.h"
 
 static struct qspi_config config;
 
 #if defined(CONFIG_NRF70_ON_QSPI)
-static struct qspi_dev qspi = {
-	.init = qspi_init,
-	.deinit = qspi_deinit,
-	.read = qspi_read,
-	.write = qspi_write,
-	.hl_read = qspi_hl_read
-};
+static struct qspi_dev qspi = {.init = qspi_init,
+			       .deinit = qspi_deinit,
+			       .read = qspi_read,
+			       .write = qspi_write,
+			       .hl_read = qspi_hl_read};
 #else
-static struct qspi_dev spim = {
-	.init = spim_init,
-	.deinit = spim_deinit,
-	.read = spim_read,
-	.write = spim_write,
-	.hl_read = spim_hl_read
-};
+static struct qspi_dev spim = {.init = spim_init,
+			       .deinit = spim_deinit,
+			       .read = spim_read,
+			       .write = spim_write,
+			       .hl_read = spim_hl_read};
 #endif
 
 struct qspi_config *qspi_defconfig(void)
diff --git a/drivers/wifi/nrf_wifi/src/qspi/src/qspi_if.c b/modules/nrf_wifi/bus/qspi_if.c
similarity index 99%
rename from drivers/wifi/nrf_wifi/src/qspi/src/qspi_if.c
rename to modules/nrf_wifi/bus/qspi_if.c
index 754fe149713..8c381ff60c5 100644
--- a/drivers/wifi/nrf_wifi/src/qspi/src/qspi_if.c
+++ b/modules/nrf_wifi/bus/qspi_if.c
@@ -15,6 +15,7 @@
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
 
 #include <soc.h>
 #include <nrf_erratas.h>
@@ -23,7 +24,6 @@
 #include <hal/nrf_gpio.h>
 
 #include "spi_nor.h"
-#include "qspi_if.h"
 
 /* The QSPI bus node which the NRF70 is on */
 #define QSPI_IF_BUS_NODE DT_NODELABEL(qspi)
@@ -152,7 +152,7 @@ static void qspi_device_uninit(const struct device *dev);
 
 #define WORD_SIZE 4
 
-LOG_MODULE_DECLARE(wifi_nrf_bus, CONFIG_WIFI_NRF70_BUS_LOG_LEVEL);
+LOG_MODULE_DECLARE(wifi_nrf_bus, CONFIG_WIFI_NRF70_BUSLIB_LOG_LEVEL);
 
 /**
  * @brief QSPI buffer structure
diff --git a/drivers/wifi/nrf_wifi/src/qspi/src/rpu_hw_if.c b/modules/nrf_wifi/bus/rpu_hw_if.c
similarity index 96%
rename from drivers/wifi/nrf_wifi/src/qspi/src/rpu_hw_if.c
rename to modules/nrf_wifi/bus/rpu_hw_if.c
index 6fac7412362..8b9393f6f2e 100644
--- a/drivers/wifi/nrf_wifi/src/qspi/src/rpu_hw_if.c
+++ b/modules/nrf_wifi/bus/rpu_hw_if.c
@@ -17,12 +17,12 @@
 #include <zephyr/devicetree.h>
 #include <zephyr/dt-bindings/gpio/nordic-nrf-gpio.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/drivers/wifi/nrf_wifi/bus/rpu_hw_if.h>
+#include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
 
-#include "rpu_hw_if.h"
-#include "qspi_if.h"
 #include "spi_if.h"
 
-LOG_MODULE_REGISTER(wifi_nrf_bus, CONFIG_WIFI_NRF70_BUS_LOG_LEVEL);
+LOG_MODULE_REGISTER(wifi_nrf_bus, CONFIG_WIFI_NRF70_BUSLIB_LOG_LEVEL);
 
 #define NRF7002_NODE DT_NODELABEL(nrf70)
 
@@ -44,7 +44,7 @@ uint32_t rpu_7002_memmap[][3] = {
 	{ 0x009000, 0x03FFFF, 2 },
 	{ 0x040000, 0x07FFFF, 1 },
 	{ 0x0C0000, 0x0F0FFF, 0 },
-	{ 0x080000, 0x092000, 1 },
+	{ 0x080000, 0x092000, 2 },
 	{ 0x100000, 0x134000, 1 },
 	{ 0x140000, 0x14C000, 1 },
 	{ 0x180000, 0x190000, 1 },
@@ -483,11 +483,16 @@ int rpu_enable(void)
 		goto rpu_pwroff;
 	}
 
+/* TODO: rpu_validate_comms() needs firmware download to be done
+ * successfully before it can be called. So, disable this for
+ * nrf70_buslib only usage.
+ */
+#ifdef CONFIG_WIFI_NRF70
 	ret = rpu_validate_comms();
 	if (ret) {
 		goto rpu_pwroff;
 	}
-
+#endif
 	return 0;
 rpu_pwroff:
 	rpu_pwroff();
diff --git a/drivers/wifi/nrf_wifi/src/qspi/src/spi_if.c b/modules/nrf_wifi/bus/spi_if.c
similarity index 98%
rename from drivers/wifi/nrf_wifi/src/qspi/src/spi_if.c
rename to modules/nrf_wifi/bus/spi_if.c
index 4bf9f464391..fba9f1f00bf 100644
--- a/drivers/wifi/nrf_wifi/src/qspi/src/spi_if.c
+++ b/modules/nrf_wifi/bus/spi_if.c
@@ -13,11 +13,11 @@
 
 #include <zephyr/drivers/spi.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
 
-#include "qspi_if.h"
 #include "spi_if.h"
 
-LOG_MODULE_DECLARE(wifi_nrf_bus, CONFIG_WIFI_NRF70_BUS_LOG_LEVEL);
+LOG_MODULE_DECLARE(wifi_nrf_bus, CONFIG_WIFI_NRF70_BUSLIB_LOG_LEVEL);
 
 #define NRF7002_NODE DT_NODELABEL(nrf70)
 
diff --git a/drivers/wifi/nrf_wifi/src/qspi/inc/spi_if.h b/modules/nrf_wifi/bus/spi_if.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/qspi/inc/spi_if.h
rename to modules/nrf_wifi/bus/spi_if.h
diff --git a/drivers/wifi/nrf_wifi/src/qspi/inc/spi_nor.h b/modules/nrf_wifi/bus/spi_nor.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/qspi/inc/spi_nor.h
rename to modules/nrf_wifi/bus/spi_nor.h
diff --git a/modules/nrf_wifi/os/CMakeLists.txt b/modules/nrf_wifi/os/CMakeLists.txt
new file mode 100644
index 00000000000..daef05f2098
--- /dev/null
+++ b/modules/nrf_wifi/os/CMakeLists.txt
@@ -0,0 +1,186 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if(NOT CONFIG_WIFI_NRF70)
+  return()
+endif()
+zephyr_interface_library_named(nrf-wifi-interface)
+zephyr_library()
+
+set(NRF_WIFI_DIR ${ZEPHYR_CURRENT_MODULE_DIR})
+
+# Translate the configuration to the OS agnostic code
+target_compile_definitions(
+  nrf-wifi-interface
+  INTERFACE
+  $<$<BOOL:${CONFIG_NRF_WIFI_LOW_POWER}>:NRF_WIFI_LOW_POWER>
+  $<$<BOOL:${CONFIG_NRF_WIFI_RPU_RECOVERY}>:NRF_WIFI_RPU_RECOVERY>
+  $<$<BOOL:${CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT}>:NRF_WIFI_AP_DEAD_DETECT_TIMEOUT=${CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT}>
+  $<$<BOOL:${CONFIG_NRF_WIFI_IFACE_MTU}>:NRF_WIFI_IFACE_MTU=${CONFIG_NRF_WIFI_IFACE_MTU}>
+  $<$<BOOL:${CONFIG_NRF70_STA_MODE}>:NRF70_STA_MODE>
+  $<$<BOOL:${CONFIG_NRF70_DATA_TX}>:NRF70_DATA_TX>
+  $<$<BOOL:${CONFIG_NRF70_RAW_DATA_TX}>:NRF70_RAW_DATA_TX>
+  $<$<BOOL:${CONFIG_NRF70_RAW_DATA_RX}>:NRF70_RAW_DATA_RX>
+  $<$<BOOL:${CONFIG_NRF70_PROMISC_DATA_RX}>:NRF70_PROMISC_DATA_RX>
+  $<$<BOOL:${CONFIG_NRF70_TX_DONE_WQ_ENABLED}>:NRF70_TX_DONE_WQ_ENABLED>
+  $<$<BOOL:${CONFIG_NRF70_RX_WQ_ENABLED}>:NRF70_RX_WQ_ENABLED>
+  $<$<BOOL:${CONFIG_NRF70_UTIL}>:NRF70_UTIL>
+  $<$<BOOL:${CONFIG_NRF70_RADIO_TEST}>:NRF70_RADIO_TEST>
+  $<$<BOOL:${CONFIG_NRF70_OFFLOADED_RAW_TX}>:NRF70_OFFLOADED_RAW_TX>
+  $<$<BOOL:${CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD}>:NRF70_TCP_IP_CHECKSUM_OFFLOAD>
+  $<$<BOOL:${CONFIG_NRF70_RPU_EXTEND_TWT_SP}>:NRF70_RPU_EXTEND_TWT_SP>
+  $<$<BOOL:${CONFIG_NRF70_SYSTEM_WITH_RAW_MODES}>:NRF70_SYSTEM_WITH_RAW_MODES>
+  $<$<BOOL:${CONFIG_NRF70_SCAN_ONLY}>:NRF70_SCAN_ONLY>
+  $<$<BOOL:${CONFIG_NRF70_SYSTEM_MODE}>:NRF70_SYSTEM_MODE>
+  $<$<BOOL:${CONFIG_NRF70_2_4G_ONLY}>:NRF70_2_4G_ONLY>
+  $<$<BOOL:${CONFIG_NRF70_LOG_VERBOSE}>:NRF70_LOG_VERBOSE>
+  $<$<BOOL:${CONFIG_NRF70_AP_MODE}>:NRF70_AP_MODE>
+  $<$<BOOL:${CONFIG_NRF_WIFI_MGMT_BUFF_OFFLOAD}>:NRF_WIFI_MGMT_BUFF_OFFLOAD>
+  $<$<BOOL:${CONFIG_NRF_WIFI_FEAT_KEEPALIVE}>:NRF_WIFI_FEAT_KEEPALIVE>
+  $<$<BOOL:${CONFIG_NRF_WIFI_FEAT_KEEPALIVE}>:NRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}>
+  $<$<BOOL:${CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS}>:WIFI_MGMT_RAW_SCAN_RESULTS>
+  NRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
+  NRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}
+  NRF70_RX_MAX_DATA_SIZE=${CONFIG_NRF70_RX_MAX_DATA_SIZE}
+  NRF70_MAX_TX_PENDING_QLEN=${CONFIG_NRF70_MAX_TX_PENDING_QLEN}
+  NRF70_RPU_PS_IDLE_TIMEOUT_MS=${CONFIG_NRF70_RPU_PS_IDLE_TIMEOUT_MS}
+  NRF70_REG_DOMAIN=${CONFIG_NRF70_REG_DOMAIN}
+  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS}
+  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT}
+  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE}
+  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS}
+  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT}
+  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE}
+  NRF70_PCB_LOSS_2G=${CONFIG_NRF70_PCB_LOSS_2G}
+  NRF70_PCB_LOSS_5G_BAND1=${CONFIG_NRF70_PCB_LOSS_5G_BAND1}
+  NRF70_PCB_LOSS_5G_BAND2=${CONFIG_NRF70_PCB_LOSS_5G_BAND2}
+  NRF70_PCB_LOSS_5G_BAND3=${CONFIG_NRF70_PCB_LOSS_5G_BAND3}
+  NRF70_ANT_GAIN_2G=${CONFIG_NRF70_ANT_GAIN_2G}
+  NRF70_ANT_GAIN_5G_BAND1=${CONFIG_NRF70_ANT_GAIN_5G_BAND1}
+  NRF70_ANT_GAIN_5G_BAND2=${CONFIG_NRF70_ANT_GAIN_5G_BAND2}
+  NRF70_ANT_GAIN_5G_BAND3=${CONFIG_NRF70_ANT_GAIN_5G_BAND3}
+  NRF_WIFI_PS_INT_PS=${CONFIG_NRF_WIFI_PS_INT_PS}
+  NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS=${CONFIG_NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS}
+)
+
+target_include_directories(
+  nrf-wifi-interface
+  INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../bus
+  ${NRF_WIFI_DIR}/utils/inc
+  ${NRF_WIFI_DIR}/os_if/inc
+  ${NRF_WIFI_DIR}/bus_if/bus/qspi/inc
+  ${NRF_WIFI_DIR}/bus_if/bal/inc
+  ${NRF_WIFI_DIR}/fw_if/umac_if/inc
+  ${NRF_WIFI_DIR}/fw_load/mips/fw/inc
+  ${NRF_WIFI_DIR}/hw_if/hal/inc
+  ${NRF_WIFI_DIR}/hw_if/hal/inc/fw
+  ${NRF_WIFI_DIR}/fw_if/umac_if/inc/fw
+)
+
+if(CONFIG_NRF70_RADIO_TEST)
+  target_include_directories(nrf-wifi-interface INTERFACE
+    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/radio_test
+  )
+elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
+  target_include_directories(nrf-wifi-interface INTERFACE
+    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/offload_raw_tx
+    off_raw_tx/inc
+  )
+else()
+  target_include_directories(nrf-wifi-interface INTERFACE
+    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/default
+  )
+endif()
+
+zephyr_library_sources(
+  ${NRF_WIFI_DIR}/os_if/src/osal.c
+  ${NRF_WIFI_DIR}/utils/src/list.c
+  ${NRF_WIFI_DIR}/utils/src/queue.c
+  ${NRF_WIFI_DIR}/utils/src/util.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_api.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_fw_patch_loader.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_interrupt.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_mem.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_reg.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hpqm.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/pal.c
+  ${NRF_WIFI_DIR}/bus_if/bal/src/bal.c
+  ${NRF_WIFI_DIR}/bus_if/bus/qspi/src/qspi.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/cmd.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/event.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_api_common.c
+)
+
+if(CONFIG_NRF70_RADIO_TEST)
+  zephyr_library_sources(
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/radio_test/fmac_api.c
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+  )
+elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
+  zephyr_library_sources(
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/offload_raw_tx/fmac_api.c
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+  )
+else()
+  zephyr_library_sources(
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/rx.c
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_vif.c
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/default/fmac_api.c
+  )
+endif()
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_DATA_TX
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/tx.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_promisc.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_AP_MODE
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_ap.c
+)
+
+# Without WPA supplicant we only support scan
+zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+)
+
+zephyr_library_sources(
+  shim.c
+  timer.c
+  work.c
+)
+
+target_link_libraries(zephyr_interface INTERFACE nrf-wifi-interface)
+target_link_libraries(nrf_wifi PRIVATE nrf70-buslib)
diff --git a/modules/nrf_wifi/shim.c b/modules/nrf_wifi/os/shim.c
similarity index 99%
rename from modules/nrf_wifi/shim.c
rename to modules/nrf_wifi/os/shim.c
index 93cafa905c2..ed6acf95846 100644
--- a/modules/nrf_wifi/shim.c
+++ b/modules/nrf_wifi/os/shim.c
@@ -18,13 +18,13 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/__assert.h>
+#include <zephyr/drivers/wifi/nrf_wifi/bus/rpu_hw_if.h>
+#include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
 
-#include "rpu_hw_if.h"
 #include "shim.h"
 #include "work.h"
 #include "timer.h"
 #include "osal_ops.h"
-#include "qspi_if.h"
 
 LOG_MODULE_REGISTER(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 
diff --git a/modules/nrf_wifi/shim.h b/modules/nrf_wifi/os/shim.h
similarity index 100%
rename from modules/nrf_wifi/shim.h
rename to modules/nrf_wifi/os/shim.h
diff --git a/modules/nrf_wifi/timer.c b/modules/nrf_wifi/os/timer.c
similarity index 100%
rename from modules/nrf_wifi/timer.c
rename to modules/nrf_wifi/os/timer.c
diff --git a/modules/nrf_wifi/timer.h b/modules/nrf_wifi/os/timer.h
similarity index 100%
rename from modules/nrf_wifi/timer.h
rename to modules/nrf_wifi/os/timer.h
diff --git a/modules/nrf_wifi/work.c b/modules/nrf_wifi/os/work.c
similarity index 100%
rename from modules/nrf_wifi/work.c
rename to modules/nrf_wifi/os/work.c
diff --git a/modules/nrf_wifi/work.h b/modules/nrf_wifi/os/work.h
similarity index 100%
rename from modules/nrf_wifi/work.h
rename to modules/nrf_wifi/os/work.h

From 70969ee3f1f4b36cfbab6c5a353dfb8996fa0c54 Mon Sep 17 00:00:00 2001
From: "Bansidhar P.M" <bansidhar.mangalwedhekar@nordicsemi.no>
Date: Sun, 1 Dec 2024 21:50:25 +0530
Subject: [PATCH 0832/2913] [nrf fromlist] tests: boards: nrf70: Add ztests for
 bus library

Add ztests for nrf70 bus lib to help validate functional integrity
of the QPSI/SPI interface to nRF70 device via appropriate reads/writes
from host processor to relevant memory blocks of nrf70 device.
Note that this will NOT serve as a memory test for nrf70 device,
rather just a functional verification of the wiring between the host
processor and the nrf70 device.

Upstream PR #: 82372

Signed-off-by: Bansidhar P.M <bansidhar.mangalwedhekar@nordicsemi.no>
(cherry picked from commit bf4df4a3ca98866b5878ee1b53bcd2d0037149c4)
---
 tests/boards/nrf/nrf70/bustest/CMakeLists.txt |  16 ++
 tests/boards/nrf/nrf70/bustest/Kconfig        |  15 ++
 tests/boards/nrf/nrf70/bustest/prj.conf       |  27 +++
 tests/boards/nrf/nrf70/bustest/src/main.c     | 198 ++++++++++++++++++
 tests/boards/nrf/nrf70/bustest/testcase.yaml  |  20 ++
 5 files changed, 276 insertions(+)
 create mode 100644 tests/boards/nrf/nrf70/bustest/CMakeLists.txt
 create mode 100644 tests/boards/nrf/nrf70/bustest/Kconfig
 create mode 100644 tests/boards/nrf/nrf70/bustest/prj.conf
 create mode 100644 tests/boards/nrf/nrf70/bustest/src/main.c
 create mode 100644 tests/boards/nrf/nrf70/bustest/testcase.yaml

diff --git a/tests/boards/nrf/nrf70/bustest/CMakeLists.txt b/tests/boards/nrf/nrf70/bustest/CMakeLists.txt
new file mode 100644
index 00000000000..741d622b119
--- /dev/null
+++ b/tests/boards/nrf/nrf70/bustest/CMakeLists.txt
@@ -0,0 +1,16 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(nrf70_bustest)
+
+target_sources(app PRIVATE
+  src/main.c
+)
+
+target_link_libraries(app PUBLIC nrf70-buslib)
diff --git a/tests/boards/nrf/nrf70/bustest/Kconfig b/tests/boards/nrf/nrf70/bustest/Kconfig
new file mode 100644
index 00000000000..d76ab2cda6c
--- /dev/null
+++ b/tests/boards/nrf/nrf70/bustest/Kconfig
@@ -0,0 +1,15 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+source "Kconfig.zephyr"
+
+menu "NRF70 Buslib test sample"
+
+config NRF70BUS_MEMTEST_LENGTH
+	int "Memory test length"
+	default 1024
+	help
+	  This option sets the default length for the memory test.
+endmenu
diff --git a/tests/boards/nrf/nrf70/bustest/prj.conf b/tests/boards/nrf/nrf70/bustest/prj.conf
new file mode 100644
index 00000000000..52107957801
--- /dev/null
+++ b/tests/boards/nrf/nrf70/bustest/prj.conf
@@ -0,0 +1,27 @@
+CONFIG_NRF70_BUSLIB=y
+CONFIG_ZTEST=y
+
+CONFIG_HEAP_MEM_POOL_SIZE=50000
+CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y
+
+# System settings
+CONFIG_ASSERT=y
+
+CONFIG_INIT_STACKS=y
+
+# Memories
+CONFIG_MAIN_STACK_SIZE=5200
+
+# Debugging
+CONFIG_STACK_SENTINEL=y
+CONFIG_DEBUG_COREDUMP=y
+CONFIG_DEBUG_COREDUMP_BACKEND_LOGGING=y
+CONFIG_SHELL_CMDS_RESIZE=n
+CONFIG_WIFI_NRF70_BUSLIB_LOG_LEVEL_DBG=y
+
+# Logging
+CONFIG_LOG=y
+CONFIG_PRINTK=y
+# If below config is enabled, printk logs are
+# buffered. For unbuffered messages, disable this.
+CONFIG_LOG_PRINTK=n
diff --git a/tests/boards/nrf/nrf70/bustest/src/main.c b/tests/boards/nrf/nrf70/bustest/src/main.c
new file mode 100644
index 00000000000..cf7cdfa4164
--- /dev/null
+++ b/tests/boards/nrf/nrf70/bustest/src/main.c
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @brief File containing ztests for nrf70 buslib library
+ */
+
+#include <zephyr/shell/shell.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/ztest.h>
+#include <zephyr/drivers/wifi/nrf_wifi/bus/rpu_hw_if.h>
+#include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
+
+LOG_MODULE_REGISTER(nrf70_bustest, CONFIG_WIFI_NRF70_BUSLIB_LOG_LEVEL);
+
+#define DATARAM_ADDR 0x0C0000
+static struct qspi_dev *dev;
+
+static int wifi_on(void *state)
+{
+	int ret;
+
+	ARG_UNUSED(state);
+
+	dev = qspi_dev();
+
+	ret = rpu_init();
+	if (ret) {
+		LOG_ERR("%s: RPU init failed with error %d", __func__, ret);
+		return -1;
+	}
+
+	ret = dev->init(qspi_defconfig());
+	if (ret) {
+		LOG_ERR("%s: QSPI device init failed", __func__);
+		return -1;
+	}
+
+	ret = rpu_enable();
+	if (ret) {
+		LOG_ERR("%s: RPU enable failed with error %d", __func__, ret);
+		return -1;
+	}
+	k_sleep(K_MSEC(10));
+	LOG_INF("Wi-Fi ON done");
+	return 0;
+}
+
+static void wifi_off(void *state)
+{
+	ARG_UNUSED(state);
+
+	int ret;
+
+	ret = rpu_disable();
+	if (ret) {
+		LOG_ERR("%s: RPU disable failed with error %d", __func__, ret);
+	}
+
+	ret = dev->deinit();
+	if (ret) {
+		LOG_ERR("%s: QSPI device de-init failed", __func__);
+	}
+	k_sleep(K_MSEC(10));
+	LOG_INF("Wi-Fi OFF done");
+}
+
+
+static int memtest(uint32_t addr, char *memblock_name)
+{
+	const uint32_t pattern = 0x12345678;
+	uint32_t offset = 1;
+	uint32_t *buff, *rxbuff;
+	int i;
+
+	int err_count;
+	int32_t rem_words = CONFIG_NRF70BUS_MEMTEST_LENGTH;
+	uint32_t test_chunk, chunk_no = 0;
+	int ret = -1;
+
+	buff = k_malloc(CONFIG_NRF70BUS_MEMTEST_LENGTH * 4);
+	if (buff == NULL) {
+		LOG_ERR("Failed to allocate memory for buff");
+		return -1;
+	}
+
+	rxbuff = k_malloc(CONFIG_NRF70BUS_MEMTEST_LENGTH * 4);
+	if (rxbuff == NULL) {
+		LOG_ERR("Failed to allocate memory for rxbuff");
+		k_free(buff);
+		return -1;
+	}
+
+	while (rem_words > 0) {
+		test_chunk = (rem_words < CONFIG_NRF70BUS_MEMTEST_LENGTH) ?
+					  rem_words : CONFIG_NRF70BUS_MEMTEST_LENGTH;
+
+		for (i = 0; i < test_chunk; i++) {
+			buff[i] = pattern +
+					  (i + chunk_no * CONFIG_NRF70BUS_MEMTEST_LENGTH) * offset;
+		}
+
+		addr = addr + chunk_no * CONFIG_NRF70BUS_MEMTEST_LENGTH;
+
+		if (rpu_write(addr, buff, test_chunk * 4) ||
+		    rpu_read(addr, rxbuff, test_chunk * 4)) {
+			goto err;
+		}
+
+		err_count = 0;
+		for (i = 0; i < test_chunk; i++) {
+			if (buff[i] != rxbuff[i]) {
+				err_count++;
+				LOG_ERR("%s: failed (%d), Expected 0x%x, Read 0x%x",
+						__func__, i, buff[i], rxbuff[i]);
+				if (err_count > 4)
+					goto err;
+			}
+		}
+		if (err_count) {
+			goto err;
+		}
+		rem_words -= CONFIG_NRF70BUS_MEMTEST_LENGTH;
+		chunk_no++;
+	}
+	ret = 0;
+err:
+	k_free(rxbuff);
+	k_free(buff);
+	return ret;
+}
+
+static int test_sysbus(void)
+{
+	int val, i;
+	/* List of some SYS bus addresses and default values to test bus read
+	 *  integrity
+	 */
+	const uint32_t addr[] = {0x714, 0x71c, 0x720,
+							0x728, 0x734, 0x738};
+	const uint32_t val_arr[] = {
+		0x000003f3, 0x0110f13f, 0x000003f3,
+		0x0003073f, 0x0003073f, 0x03013f8f};
+
+	for (i = 0; i < ARRAY_SIZE(addr); i++) {
+		rpu_read(addr[i], &val, 4);
+		if (val != val_arr[i]) {
+			LOG_ERR("%s: SYSBUS R/W failed (%d) : read = 0x%x, expected = 0x%x",
+						 __func__, i, val, val_arr[i]);
+			return -1;
+		}
+	}
+	return 0;
+}
+
+static int test_peripbus(void)
+{
+	uint32_t val;
+	int i;
+	/* Some Perip bus addresses that we can write/read to validate bus access*/
+	const uint32_t addr[] = {0x62820, 0x62830, 0x62840, 0x62850, 0x62860, 0x62870};
+
+	for (i = 0; i < ARRAY_SIZE(addr); i++) {
+		val = 0xA5A5A5A5; /* Test pattern */
+		rpu_write(addr[i], &val, 4);
+		val = 0;
+		rpu_read(addr[i], &val, 4);
+		/* Perip bus is 24-bit and hence LS 8 bits read are invalid, so discard them
+		 * in the check
+		 */
+		if (val >> 8 != 0xA5A5A5) {
+			LOG_ERR("%s: PERIP BUS R/W failed (%d): read = 0x%x",
+						__func__, i, val >> 8);
+			return -1;
+		}
+	}
+	return 0;
+}
+
+ZTEST_SUITE(bustest_suite, NULL, (void *)wifi_on, NULL, NULL, wifi_off);
+
+ZTEST(bustest_suite, test_sysbus)
+{
+	zassert_equal(0, test_sysbus(), "SYSBUS read validation failed!!!");
+}
+
+ZTEST(bustest_suite, test_peripbus)
+{
+	zassert_equal(0, test_peripbus(), "PERIP BUS read/write validation failed!!!");
+}
+
+ZTEST(bustest_suite, test_dataram)
+{
+	zassert_equal(0, memtest(DATARAM_ADDR, "DATA RAM"), "DATA RAM memtest failed!!!");
+}
diff --git a/tests/boards/nrf/nrf70/bustest/testcase.yaml b/tests/boards/nrf/nrf70/bustest/testcase.yaml
new file mode 100644
index 00000000000..29dc054b823
--- /dev/null
+++ b/tests/boards/nrf/nrf70/bustest/testcase.yaml
@@ -0,0 +1,20 @@
+tests:
+  nrf_wifi.bustest.nrf7002:
+    sysbuild: true
+    build_only: true
+    integration_platforms:
+      - nrf7002dk/nrf5340/cpuapp
+    platform_allow: nrf7002dk/nrf5340/cpuapp
+
+  nrf_wifi.bustest.nrf7002ek:
+    sysbuild: true
+    build_only: true
+    extra_args: SHIELD=nrf7002ek
+    integration_platforms:
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf52840dk/nrf52840
+      - nucleo_h723zg
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf52840dk/nrf52840
+      - nucleo_h723zg

From a198e078af5b96feacceb2e38bb9fd9118fee89f Mon Sep 17 00:00:00 2001
From: Timothy Keys <timothy.keys@nordicsemi.no>
Date: Wed, 4 Dec 2024 12:14:35 +0000
Subject: [PATCH 0833/2913] [nrf fromlist] Bluetooth: Host: Cancel pending
 deferred work on disconnect

This fixes an issue that occurred if deferred_work is queued by another
procedure before we run bt_conn_set_state(BT_CONN_DISCONNECTED).
bt_conn_set_state yields to the system work queue in bt_conn_tx_notify,
and then deferred_work runs and handles the disconnected callbacks.
bt_conn_set_state then enqueues another deferred_work which calls the
disconnected callbacks again and causes an assert. k_work_cancel_delayable
will clear queued deferred work when we call
bt_conn_set_state(BT_CONN_DISCONNECTED), guaranteeing that the disconnect
callbacks will only be called once.

Upstream PR #: 82543

Signed-off-by: Timothy Keys <timothy.keys@nordicsemi.no>
(cherry picked from commit 833b6d2da09ef1cb7f3b39df95726246e5d26eb2)
---
 subsys/bluetooth/host/conn.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 8a62c1fb3ba..a51b9a73787 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -1264,6 +1264,11 @@ void bt_conn_set_state(struct bt_conn *conn, bt_conn_state_t state)
 		 */
 		switch (old_state) {
 		case BT_CONN_DISCONNECT_COMPLETE:
+			/* Any previously scheduled deferred work now becomes invalid
+			 * so cancel it here, before we yield to tx thread.
+			 */
+			k_work_cancel_delayable(&conn->deferred_work);
+
 			bt_conn_tx_notify(conn, true);
 
 			bt_conn_reset_rx_state(conn);

From 826e8e92885324744c0bca6af35c159d33dd32e1 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Wed, 27 Nov 2024 15:48:57 +0100
Subject: [PATCH 0834/2913] [nrf fromlist] soc: nordic: add common symbol for
 RAM control helper presence

Common symbol is defined by SoCs that support RAM control helper.

Upstream PR #: 82262

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 2e974fbd6f152de8a5198ad81293950601a47627)
---
 drivers/retained_mem/Kconfig.nrf       | 2 +-
 modules/hal_nordic/nrfx/CMakeLists.txt | 2 +-
 soc/nordic/common/Kconfig              | 3 +++
 soc/nordic/nrf52/Kconfig               | 1 +
 soc/nordic/nrf54h/Kconfig              | 2 ++
 soc/nordic/nrf54l/Kconfig              | 1 +
 6 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/retained_mem/Kconfig.nrf b/drivers/retained_mem/Kconfig.nrf
index 348361e5f6f..70aef8b504f 100644
--- a/drivers/retained_mem/Kconfig.nrf
+++ b/drivers/retained_mem/Kconfig.nrf
@@ -13,6 +13,6 @@ config RETAINED_MEM_NRF_RAM_CTRL
 	bool "nRF RAM retention driver"
 	default y
 	depends on DT_HAS_ZEPHYR_RETAINED_RAM_ENABLED && RETAINED_MEM_ZEPHYR_RAM && POWEROFF
-	depends on SOC_FAMILY_NORDIC_NRF
+	depends on HAS_NORDIC_RAM_CTRL
 	help
 	  Enable driver for Nordic RAM retention.
diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 1665c122c9f..81428db0538 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -111,7 +111,7 @@ zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF92X  ${MDK_DIR}/system_nrf92.c
 
 zephyr_library_sources(nrfx_glue.c)
 zephyr_library_sources(${HELPERS_DIR}/nrfx_flag32_allocator.c)
-zephyr_library_sources_ifdef(CONFIG_RETAINED_MEM_NRF_RAM_CTRL ${HELPERS_DIR}/nrfx_ram_ctrl.c)
+zephyr_library_sources_ifdef(CONFIG_HAS_NORDIC_RAM_CTRL       ${HELPERS_DIR}/nrfx_ram_ctrl.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI                 ${HELPERS_DIR}/nrfx_gppi_dppi.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_PPI                  ${HELPERS_DIR}/nrfx_gppi_ppi.c)
 
diff --git a/soc/nordic/common/Kconfig b/soc/nordic/common/Kconfig
index ef32e7403c1..e7e24ca8cf2 100644
--- a/soc/nordic/common/Kconfig
+++ b/soc/nordic/common/Kconfig
@@ -4,6 +4,9 @@
 config HAS_NORDIC_DMM
 	bool
 
+config HAS_NORDIC_RAM_CTRL
+	bool "nRF RAM control helper support"
+
 config NRF_SYS_EVENT
 	bool "nRF system event support"
 	select NRFX_POWER if !NRF_PLATFORM_HALTIUM
diff --git a/soc/nordic/nrf52/Kconfig b/soc/nordic/nrf52/Kconfig
index adb57916627..edc2b70d667 100644
--- a/soc/nordic/nrf52/Kconfig
+++ b/soc/nordic/nrf52/Kconfig
@@ -11,6 +11,7 @@ config SOC_SERIES_NRF52X
 	imply XIP
 	select HAS_NRFX
 	select HAS_NORDIC_DRIVERS
+	select HAS_NORDIC_RAM_CTRL
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select HAS_SWO
 	select HAS_POWEROFF
diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
index 3e46ce83077..7698c26d9f2 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -21,6 +21,7 @@ config SOC_NRF54H20_CPUAPP_COMMON
 	select CPU_HAS_FPU
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
 	select HAS_NORDIC_DMM
+	select HAS_NORDIC_RAM_CTRL
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select NRFS_HAS_CLOCK_SERVICE
 	select NRFS_HAS_DVFS_SERVICE
@@ -52,6 +53,7 @@ config SOC_NRF54H20_CPURAD_COMMON
 	select NRFS_HAS_TEMP_SERVICE
 	select NRFS_HAS_VBUS_DETECTOR_SERVICE
 	select HAS_NORDIC_DMM
+	select HAS_NORDIC_RAM_CTRL
 	select HAS_PM
 	select HAS_POWEROFF
 
diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index c4cd8e6aa0f..ab5f1c745b9 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -20,6 +20,7 @@ config SOC_NRF54L_CPUAPP_COMMON
 	select CPU_HAS_FPU
 	select HAS_HW_NRF_RADIO_IEEE802154
 	select HAS_POWEROFF
+	select HAS_NORDIC_RAM_CTRL
 
 config SOC_NRF54L05_CPUAPP
 	select SOC_NRF54L_CPUAPP_COMMON

From ee2e2b8d3b24779ff5a9c482d1b3174be3d6d4d3 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Wed, 27 Nov 2024 15:54:20 +0100
Subject: [PATCH 0835/2913] [nrf fromlist] drivers: retained_mem: nrf: make
 ram_ctrl variant explicit

Updated retained_mem driver variant exposes vendor-specific API,
rather than executing implicitly during boot.

Upstream PR #: 82262

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 0819c8eeae8a3682721b9689bd3a090e898edbb7)
---
 .../retained_mem/retained_mem_nrf_ram_ctrl.c  |  5 ++-
 .../drivers/retained_mem/nrf_retained_mem.h   | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 include/zephyr/drivers/retained_mem/nrf_retained_mem.h

diff --git a/drivers/retained_mem/retained_mem_nrf_ram_ctrl.c b/drivers/retained_mem/retained_mem_nrf_ram_ctrl.c
index 8be3d5c35a3..08e777aa6fa 100644
--- a/drivers/retained_mem/retained_mem_nrf_ram_ctrl.c
+++ b/drivers/retained_mem/retained_mem_nrf_ram_ctrl.c
@@ -6,6 +6,7 @@
 
 #include <zephyr/devicetree.h>
 #include <zephyr/kernel.h>
+#include <zephyr/drivers/retained_mem/nrf_retained_mem.h>
 
 #include <helpers/nrfx_ram_ctrl.h>
 
@@ -22,7 +23,7 @@ static const struct ret_mem_region ret_mem_regions[] = {
 	DT_FOREACH_STATUS_OKAY(zephyr_retained_ram, _BUILD_MEM_REGION)
 };
 
-static int retained_mem_nrf_init(void)
+int z_nrf_retained_mem_retention_apply(void)
 {
 	const struct ret_mem_region *rmr;
 
@@ -33,5 +34,3 @@ static int retained_mem_nrf_init(void)
 
 	return 0;
 }
-
-SYS_INIT(retained_mem_nrf_init, PRE_KERNEL_1, 0);
diff --git a/include/zephyr/drivers/retained_mem/nrf_retained_mem.h b/include/zephyr/drivers/retained_mem/nrf_retained_mem.h
new file mode 100644
index 00000000000..376673c92d1
--- /dev/null
+++ b/include/zephyr/drivers/retained_mem/nrf_retained_mem.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_RETAINED_MEM_NRF_RETAINED_MEM_H
+#define ZEPHYR_INCLUDE_DRIVERS_RETAINED_MEM_NRF_RETAINED_MEM_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <zephyr/drivers/retained_mem.h>
+
+#if defined(CONFIG_RETAINED_MEM_NRF_RAM_CTRL) || defined(__DOXYGEN__)
+/** @brief Apply memory retention settings.
+ *
+ * Memory retention settings to apply are derived from devicetree configuration.
+ *
+ * @retval 0 if the retention settings were applied successfully.
+ * @retval -ENOTSUP if retention configuration is not present in devicetree.
+ */
+int z_nrf_retained_mem_retention_apply(void);
+#else
+static inline int z_nrf_retained_mem_retention_apply(void)
+{
+	return -ENOTSUP;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_RETAINED_MEM_NRF_RETAINED_MEM_H */

From 49e3fe1e493137cb9e1c895f8000fe638927d0c3 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Wed, 27 Nov 2024 15:56:32 +0100
Subject: [PATCH 0836/2913] [nrf fromlist] soc: nordic: poweroff: add retention
 management

RAM retention is disabled for all RAM blocks
before entering System OFF to achieve lowest power consumption.
RAM retention can still be enabled using retained_mem driver.

Upstream PR #: 82262

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit b0d7a3082ce2226e6ce3d3151c5c3a583606c290)
---
 soc/nordic/common/poweroff.c | 38 ++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/soc/nordic/common/poweroff.c b/soc/nordic/common/poweroff.c
index b3210da697d..99a2bcfb3d6 100644
--- a/soc/nordic/common/poweroff.c
+++ b/soc/nordic/common/poweroff.c
@@ -5,6 +5,7 @@
 
 #include <zephyr/sys/poweroff.h>
 #include <zephyr/toolchain.h>
+#include <zephyr/drivers/retained_mem/nrf_retained_mem.h>
 
 #if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_SERIES_NRF52X)
 #include <hal/nrf_power.h>
@@ -17,8 +18,45 @@
 #include <helpers/nrfx_reset_reason.h>
 #endif
 
+#if defined(CONFIG_HAS_NORDIC_RAM_CTRL)
+#include <helpers/nrfx_ram_ctrl.h>
+#endif
+
 void z_sys_poweroff(void)
 {
+#if defined(CONFIG_HAS_NORDIC_RAM_CTRL)
+	uint8_t *ram_start;
+	size_t ram_size;
+
+#if defined(NRF_MEMORY_RAM_BASE)
+	ram_start = (uint8_t *)NRF_MEMORY_RAM_BASE;
+#else
+	ram_start = (uint8_t *)NRF_MEMORY_RAM0_BASE;
+#endif
+
+	ram_size = 0;
+#if defined(NRF_MEMORY_RAM_SIZE)
+	ram_size += NRF_MEMORY_RAM_SIZE;
+#endif
+#if defined(NRF_MEMORY_RAM0_SIZE)
+	ram_size += NRF_MEMORY_RAM0_SIZE;
+#endif
+#if defined(NRF_MEMORY_RAM1_SIZE)
+	ram_size += NRF_MEMORY_RAM1_SIZE;
+#endif
+#if defined(NRF_MEMORY_RAM2_SIZE)
+	ram_size += NRF_MEMORY_RAM2_SIZE;
+#endif
+
+	/* Disable retention for all memory blocks */
+	nrfx_ram_ctrl_retention_enable_set(ram_start, ram_size, false);
+#endif
+
+#if defined(CONFIG_RETAINED_MEM_NRF_RAM_CTRL)
+	/* Restore retention for retained_mem driver regions defined in devicetree */
+	(void)z_nrf_retained_mem_retention_apply();
+#endif
+
 #if defined(CONFIG_SOC_SERIES_NRF54LX)
 	nrfx_reset_reason_clear(UINT32_MAX);
 #endif

From 0a2e205750dc7eff8767afa543b2fd23a1fbb332 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Thu, 28 Nov 2024 12:35:58 +0100
Subject: [PATCH 0837/2913] [nrf fromlist] samples: nordic: system_off: use
 retained_mem on all targets

Using bare-metal approach for retention configuration
is no longer compatible with sys_poweroff() implementation.

Upstream PR #: 82262

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 15ffa301b3294a769752ad0a1d382bce9803f265)
---
 .../boards/nordic/system_off/CMakeLists.txt   |   2 +-
 samples/boards/nordic/system_off/Kconfig      |  16 +-
 samples/boards/nordic/system_off/README.rst   |   8 +-
 .../boards/nrf52840dk_nrf52840.overlay        |  22 +++
 .../boards/nrf52dk_nrf52832.overlay           |  22 +++
 ...lay => nrf54l15dk_nrf54l05_cpuapp.overlay} |   0
 ...lay => nrf54l15dk_nrf54l10_cpuapp.overlay} |   0
 ...lay => nrf54l15dk_nrf54l15_cpuapp.overlay} |   0
 samples/boards/nordic/system_off/sample.yaml  |  27 +---
 samples/boards/nordic/system_off/src/main.c   |   4 +-
 .../boards/nordic/system_off/src/retained.c   | 152 ++----------------
 11 files changed, 72 insertions(+), 181 deletions(-)
 create mode 100644 samples/boards/nordic/system_off/boards/nrf52840dk_nrf52840.overlay
 create mode 100644 samples/boards/nordic/system_off/boards/nrf52dk_nrf52832.overlay
 rename samples/boards/nordic/system_off/boards/{nrf54l15dk_nrf54l05_cpuapp_retained_mem.overlay => nrf54l15dk_nrf54l05_cpuapp.overlay} (100%)
 rename samples/boards/nordic/system_off/boards/{nrf54l15dk_nrf54l10_cpuapp_retained_mem.overlay => nrf54l15dk_nrf54l10_cpuapp.overlay} (100%)
 rename samples/boards/nordic/system_off/boards/{nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay => nrf54l15dk_nrf54l15_cpuapp.overlay} (100%)

diff --git a/samples/boards/nordic/system_off/CMakeLists.txt b/samples/boards/nordic/system_off/CMakeLists.txt
index 1cff779506b..986fca97f34 100644
--- a/samples/boards/nordic/system_off/CMakeLists.txt
+++ b/samples/boards/nordic/system_off/CMakeLists.txt
@@ -5,6 +5,6 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(nrf_system_off)
 
 target_sources(app PRIVATE src/main.c)
-if (CONFIG_APP_USE_NRF_RETENTION OR CONFIG_APP_USE_RETAINED_MEM)
+if (CONFIG_APP_USE_RETAINED_MEM)
   target_sources(app PRIVATE src/retained.c)
 endif()
diff --git a/samples/boards/nordic/system_off/Kconfig b/samples/boards/nordic/system_off/Kconfig
index c5a0f492d90..798927205bd 100644
--- a/samples/boards/nordic/system_off/Kconfig
+++ b/samples/boards/nordic/system_off/Kconfig
@@ -3,23 +3,9 @@
 
 mainmenu "Nordic SYSTEM_OFF demo"
 
-choice
-	prompt "Use retention"
-	optional
-
-config APP_USE_NRF_RETENTION
-	bool "Use state retention in system off using nRF POWER"
-	depends on SOC_COMPATIBLE_NRF52X && CRC
-	help
-	  On some Nordic chips this application supports retaining
-	  memory while in system off using POWER peripheral.
-	  Select this to enable the feature.
-
 config APP_USE_RETAINED_MEM
 	bool "Use state retention in system off using retained_mem driver"
-	depends on RETAINED_MEM
-
-endchoice
+	select RETAINED_MEM
 
 config GRTC_WAKEUP_ENABLE
 	bool "Use GRTC to wake up device from system off"
diff --git a/samples/boards/nordic/system_off/README.rst b/samples/boards/nordic/system_off/README.rst
index 7c98a4e8336..5124d087b77 100644
--- a/samples/boards/nordic/system_off/README.rst
+++ b/samples/boards/nordic/system_off/README.rst
@@ -13,10 +13,10 @@ deep sleep on Nordic platforms.
 RAM Retention
 =============
 
-This sample can also can demonstrate RAM retention. By selecting
-``CONFIG_APP_USE_NRF_RETENTION=y`` or ``CONFIG_APP_USE_RETAINED_MEM=y``
-state related to number of boots, number of times system off was entered,
-and total uptime since initial power-on are retained in a checksummed data structure.
+This sample can also demonstrate RAM retention.
+By selecting ``CONFIG_APP_USE_RETAINED_MEM=y`` state related to number of boots,
+number of times system off was entered, and total uptime since initial power-on
+are retained in a checksummed data structure.
 RAM is configured to keep the containing section powered while in system-off mode.
 
 Requirements
diff --git a/samples/boards/nordic/system_off/boards/nrf52840dk_nrf52840.overlay b/samples/boards/nordic/system_off/boards/nrf52840dk_nrf52840.overlay
new file mode 100644
index 00000000000..c203d90a0a1
--- /dev/null
+++ b/samples/boards/nordic/system_off/boards/nrf52840dk_nrf52840.overlay
@@ -0,0 +1,22 @@
+/ {
+	sram0@2003f000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x2003f000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RetainedMem";
+		status = "okay";
+
+		retainedmem0: retainedmem {
+			compatible = "zephyr,retained-ram";
+			status = "okay";
+		};
+	};
+
+	aliases {
+		retainedmemdevice = &retainedmem0;
+	};
+};
+
+&sram0 {
+	/* Shrink SRAM size to avoid overlap with retained memory region */
+	reg = <0x20000000 DT_SIZE_K(252)>;
+};
diff --git a/samples/boards/nordic/system_off/boards/nrf52dk_nrf52832.overlay b/samples/boards/nordic/system_off/boards/nrf52dk_nrf52832.overlay
new file mode 100644
index 00000000000..13e2e99ddf2
--- /dev/null
+++ b/samples/boards/nordic/system_off/boards/nrf52dk_nrf52832.overlay
@@ -0,0 +1,22 @@
+/ {
+	sram0@20007000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x20007000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RetainedMem";
+		status = "okay";
+
+		retainedmem0: retainedmem {
+			compatible = "zephyr,retained-ram";
+			status = "okay";
+		};
+	};
+
+	aliases {
+		retainedmemdevice = &retainedmem0;
+	};
+};
+
+&sram0 {
+	/* Shrink SRAM size to avoid overlap with retained memory region */
+	reg = <0x20000000 DT_SIZE_K(28)>;
+};
diff --git a/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l05_cpuapp_retained_mem.overlay b/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
similarity index 100%
rename from samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l05_cpuapp_retained_mem.overlay
rename to samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
diff --git a/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l10_cpuapp_retained_mem.overlay b/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
similarity index 100%
rename from samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l10_cpuapp_retained_mem.overlay
rename to samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
diff --git a/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay b/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay
rename to samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/samples/boards/nordic/system_off/sample.yaml b/samples/boards/nordic/system_off/sample.yaml
index 18f629c4e54..fcc96f6c44d 100644
--- a/samples/boards/nordic/system_off/sample.yaml
+++ b/samples/boards/nordic/system_off/sample.yaml
@@ -22,32 +22,17 @@ tests:
         - "system off demo"
         - "Retained data not supported"
         - "Entering system off; press sw0 to restart"
-  sample.boards.nrf.system_off.nrf_retained:
+  sample.boards.nrf.system_off.retained_mem:
     integration_platforms:
       - nrf52840dk/nrf52840
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
-    extra_configs:
-      - CONFIG_APP_USE_NRF_RETENTION=y
-    harness: console
-    harness_config:
-      type: multi_line
-      ordered: true
-      regex:
-        - "system off demo"
-        - "Retained data: INVALID"
-        - "Boot count: 1"
-        - "Off count: 0"
-        - "Active Ticks:"
-        - "Entering system off; press sw0 to restart"
-  sample.boards.nrf.system_off.retained_mem:
-    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay"
-    platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l10/cpuapp
+      - nrf54l15dk/nrf54l05/cpuapp
     extra_configs:
       - CONFIG_APP_USE_RETAINED_MEM=y
-      - CONFIG_RETAINED_MEM=y
     harness: console
     harness_config:
       type: multi_line
@@ -62,6 +47,8 @@ tests:
   sample.boards.nrf.system_off.grtc_wakeup:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l10/cpuapp
+      - nrf54l15dk/nrf54l05/cpuapp
     extra_configs:
       - CONFIG_GRTC_WAKEUP_ENABLE=y
     harness: console
@@ -79,13 +66,13 @@ tests:
         - "Retained data not supported"
         - "Entering system off; wait 2 seconds to restart"
   sample.boards.nrf.system_off.retained_mem.grtc_wakeup:
-    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay"
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l10/cpuapp
+      - nrf54l15dk/nrf54l05/cpuapp
     extra_configs:
       - CONFIG_APP_USE_RETAINED_MEM=y
       - CONFIG_GRTC_WAKEUP_ENABLE=y
-      - CONFIG_RETAINED_MEM=y
     harness: console
     harness_config:
       type: multi_line
diff --git a/samples/boards/nordic/system_off/src/main.c b/samples/boards/nordic/system_off/src/main.c
index b40b1ea26da..40c4f2bb7a5 100644
--- a/samples/boards/nordic/system_off/src/main.c
+++ b/samples/boards/nordic/system_off/src/main.c
@@ -35,7 +35,7 @@ int main(void)
 
 	printf("\n%s system off demo\n", CONFIG_BOARD);
 
-	if (IS_ENABLED(CONFIG_APP_USE_NRF_RETENTION) || IS_ENABLED(CONFIG_APP_USE_RETAINED_MEM)) {
+	if (IS_ENABLED(CONFIG_APP_USE_RETAINED_MEM)) {
 		bool retained_ok = retained_validate();
 
 		/* Increment for this boot attempt and update. */
@@ -81,7 +81,7 @@ int main(void)
 		return 0;
 	}
 
-	if (IS_ENABLED(CONFIG_APP_USE_NRF_RETENTION) || IS_ENABLED(CONFIG_APP_USE_RETAINED_MEM)) {
+	if (IS_ENABLED(CONFIG_APP_USE_RETAINED_MEM)) {
 		/* Update the retained state */
 		retained.off_count += 1;
 		retained_update();
diff --git a/samples/boards/nordic/system_off/src/retained.c b/samples/boards/nordic/system_off/src/retained.c
index 66f6a353f04..316ec165d62 100644
--- a/samples/boards/nordic/system_off/src/retained.c
+++ b/samples/boards/nordic/system_off/src/retained.c
@@ -15,147 +15,24 @@
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/crc.h>
 
-#if CONFIG_APP_USE_NRF_RETENTION
-#include <hal/nrf_power.h>
-
-/* nRF52 RAM (really, RAM AHB slaves) are partitioned as:
- * * Up to 8 blocks of two 4 KiBy byte "small" sections
- * * A 9th block of with 32 KiBy "large" sections
- *
- * At time of writing the maximum number of large sections is 6, all
- * within the first large block.  Theoretically there could be more
- * sections in the 9th block, and possibly more blocks.
- */
-
-/* Inclusive address of RAM start */
-#define SRAM_BEGIN (uintptr_t)DT_REG_ADDR(DT_NODELABEL(sram0))
-
-/* Exclusive address of RAM end */
-#define SRAM_END (SRAM_BEGIN + (uintptr_t)DT_REG_SIZE(DT_NODELABEL(sram0)))
-
-/* Size of a controllable RAM section in the small blocks */
-#define SMALL_SECTION_SIZE 4096
-
-/* Number of controllable RAM sections in each of the lower blocks */
-#define SMALL_SECTIONS_PER_BLOCK 2
-
-/* Span of a small block */
-#define SMALL_BLOCK_SIZE (SMALL_SECTIONS_PER_BLOCK * SMALL_SECTION_SIZE)
-
-/* Number of small blocks */
-#define SMALL_BLOCK_COUNT 8
-
-/* Span of the SRAM area covered by small sections */
-#define SMALL_SECTION_SPAN (SMALL_BLOCK_COUNT * SMALL_BLOCK_SIZE)
-
-/* Inclusive address of the RAM range covered by large sections */
-#define LARGE_SECTION_BEGIN (SRAM_BEGIN + SMALL_SECTION_SPAN)
-
-/* Size of a controllable RAM section in large blocks */
-#define LARGE_SECTION_SIZE 32768
-
-#elif CONFIG_APP_USE_RETAINED_MEM
+#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(retainedmemdevice))
 const static struct device *retained_mem_device = DEVICE_DT_GET(DT_ALIAS(retainedmemdevice));
-#endif
-
-/* Set or clear RAM retention in SYSTEM_OFF for the provided object.
- *
- * @param ptr pointer to the start of the retainable object
- *
- * @param len length of the retainable object
- *
- * @param enable true to enable retention, false to clear retention
- */
-static int ram_range_retain(const void *ptr,
-			    size_t len,
-			    bool enable)
-{
-	int rc = 0;
-
-#if CONFIG_APP_USE_NRF_RETENTION
-	/* This only works for nRF52 with the POWER module.
-	 * The other  Nordic chips use a different low-level API,
-	 * which is not currently used by this variant.
-	 */
-	uintptr_t addr = (uintptr_t)ptr;
-	uintptr_t addr_end = addr + len;
-
-	/* Error if the provided range is empty or doesn't lie
-	 * entirely within the SRAM address space.
-	 */
-	if ((len == 0U)
-	    || (addr < SRAM_BEGIN)
-	    || (addr > (SRAM_END - len))) {
-		return -EINVAL;
-	}
-
-	/* Iterate over each section covered by the range, setting the
-	 * corresponding RAM OFF retention bit in the parent block.
-	 */
-	do {
-		uintptr_t block_base = SRAM_BEGIN;
-		uint32_t section_size = SMALL_SECTION_SIZE;
-		uint32_t sections_per_block = SMALL_SECTIONS_PER_BLOCK;
-		bool is_large = (addr >= LARGE_SECTION_BEGIN);
-		uint8_t block = 0;
-
-		if (is_large) {
-			block = 8;
-			block_base = LARGE_SECTION_BEGIN;
-			section_size = LARGE_SECTION_SIZE;
-
-			/* RAM[x] supports only 16 sections, each its own bit
-			 * for POWER (0..15) and RETENTION (16..31).  We don't
-			 * know directly how many sections are present, so
-			 * assume they all are; the true limit will be
-			 * determined by the SRAM size.
-			 */
-			sections_per_block = 16;
-		}
-
-		uint32_t section = (addr - block_base) / section_size;
-
-		if (section >= sections_per_block) {
-			block += section / sections_per_block;
-			section %= sections_per_block;
-		}
-
-		uint32_t section_mask =
-			(POWER_RAM_POWERSET_S0RETENTION_On
-					 << (section + POWER_RAM_POWERSET_S0RETENTION_Pos));
-
-		if (enable) {
-			nrf_power_rampower_mask_on(NRF_POWER, block, section_mask);
-		} else {
-			nrf_power_rampower_mask_off(NRF_POWER, block, section_mask);
-		}
-
-		/* Move to the first address in the next section. */
-		addr += section_size - (addr % section_size);
-	} while (addr < addr_end);
-#elif CONFIG_APP_USE_RETAINED_MEM
-	/* Retention setting cannot be controlled runtime with retained_mem API */
-	(void)enable;
-	rc = retained_mem_write(retained_mem_device, 0, ptr, len);
 #else
-	#error "Unsupported retention setting"
+#error "retained_mem region not defined"
 #endif
 
-	return rc;
-}
-
-/* Retained data must be defined in a no-init section to prevent the C
- * runtime initialization from zeroing it before anybody can see it.
- * It is not necesarry when retained_mem driver is utilized
- * as in this case retained data is stored in an area not initialized in runtime.
- */
-__noinit struct retained_data retained;
+struct retained_data retained;
 
 #define RETAINED_CRC_OFFSET offsetof(struct retained_data, crc)
 #define RETAINED_CHECKED_SIZE (RETAINED_CRC_OFFSET + sizeof(retained.crc))
 
 bool retained_validate(void)
 {
+	int rc;
+
+	rc = retained_mem_read(retained_mem_device, 0, (uint8_t *)&retained, sizeof(retained));
+	__ASSERT_NO_MSG(rc == 0);
+
 	/* The residue of a CRC is what you get from the CRC over the
 	 * message catenated with its CRC.  This is the post-final-xor
 	 * residue for CRC-32 (CRC-32/ISO-HDLC) which Zephyr calls
@@ -174,19 +51,13 @@ bool retained_validate(void)
 	/* Reset to accrue runtime from this session. */
 	retained.uptime_latest = 0;
 
-	/* Reconfigure to retain the state during system off, regardless of
-	 * whether validation succeeded.  Although these values can sometimes
-	 * be observed to be preserved across System OFF, the product
-	 * specification states they are not retained in that situation, and
-	 * that can also be observed.
-	 */
-	(void)ram_range_retain(&retained, RETAINED_CHECKED_SIZE, true);
-
 	return valid;
 }
 
 void retained_update(void)
 {
+	int rc;
+
 	uint64_t now = k_uptime_ticks();
 
 	retained.uptime_sum += (now - retained.uptime_latest);
@@ -196,4 +67,7 @@ void retained_update(void)
 				  RETAINED_CRC_OFFSET);
 
 	retained.crc = sys_cpu_to_le32(crc);
+
+	rc = retained_mem_write(retained_mem_device, 0, (uint8_t *)&retained, sizeof(retained));
+	__ASSERT_NO_MSG(rc == 0);
 }

From d5f626ec9394c199529963f6c6bff19dea7bcdd7 Mon Sep 17 00:00:00 2001
From: Karun Kumar Eagalapati <karun.kumar@nordicsemi.no>
Date: Mon, 18 Nov 2024 17:10:42 +0530
Subject: [PATCH 0838/2913] [nrf fromlist] manifest: Update nrf_wifi

Updated manifest to include separate security types for 802.1X
in display of scan results when APs have EAP and PMF enabled.
BSS display limit based on user-configured non-zero values
set via CMD_INIT, along with support for few other regulatory
domain updates in firmware.

Upstream PR #: 81514

Signed-off-by: Karun Kumar Eagalapati <karun.kumar@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index fadcb7d7daf..3e66f68d53c 100644
--- a/west.yml
+++ b/west.yml
@@ -303,7 +303,7 @@ manifest:
       revision: 3cfca0192ff84da919e9bc7978bcc2239cd6a395
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: 71261e2b719b98500b7741c3398a74a5fb631596
+      revision: f6b950a3b5c0187fe499b0e518426d5bf88b7e68
       path: modules/lib/nrf_wifi
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719

From 4092e6df311e18779fe1bb28ca29fff9e7931891 Mon Sep 17 00:00:00 2001
From: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
Date: Wed, 20 Nov 2024 15:14:15 +0530
Subject: [PATCH 0839/2913] [nrf fromlist] nrfwifi: Display EAP_TLS_SHA256
 security in scan results

EAP_TLS_SHA256 was being identified as EAP_TLS in display scan
results. Identify the security type in scan results sent by
RPU and display accordingly.

Upstream PR #: 81514

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c b/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
index e30f572aeb3..f85c71c4f5f 100644
--- a/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
+++ b/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
@@ -297,6 +297,8 @@ static inline enum wifi_security_type drv_to_wifi_mgmt(int drv_security_type)
 		return WIFI_SECURITY_TYPE_WAPI;
 	case NRF_WIFI_EAP:
 		return WIFI_SECURITY_TYPE_EAP;
+	case NRF_WIFI_EAP_TLS_SHA256:
+		return WIFI_SECURITY_TYPE_EAP_TLS_SHA256;
 	default:
 		return WIFI_SECURITY_TYPE_UNKNOWN;
 	}

From 160c2850d341c7f57559a84faaca618e58f6ec33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Wed, 4 Dec 2024 12:02:59 +0100
Subject: [PATCH 0840/2913] [nrf fromlist] tests: boards: nrf: i2c: add support
 for nRF54H20 cpuppr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

i2c_slave tests can now be run on nRF54H20 cpuppr target.

Upstream PR #: 82538

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuppr.conf    |  1 +
 .../boards/nrf54h20dk_nrf54h20_cpuppr.overlay | 62 +++++++++++++++++++
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 51 +++++++++++++++
 .../i2c_slave/sysbuild/vpr_launcher/prj.conf  |  1 +
 tests/boards/nrf/i2c/i2c_slave/testcase.yaml  |  2 +
 5 files changed, 117 insertions(+)
 create mode 100644 tests/boards/nrf/i2c/i2c_slave/boards/nrf54h20dk_nrf54h20_cpuppr.conf
 create mode 100644 tests/boards/nrf/i2c/i2c_slave/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
 create mode 100644 tests/boards/nrf/i2c/i2c_slave/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/boards/nrf/i2c/i2c_slave/sysbuild/vpr_launcher/prj.conf

diff --git a/tests/boards/nrf/i2c/i2c_slave/boards/nrf54h20dk_nrf54h20_cpuppr.conf b/tests/boards/nrf/i2c/i2c_slave/boards/nrf54h20dk_nrf54h20_cpuppr.conf
new file mode 100644
index 00000000000..157e0a11f72
--- /dev/null
+++ b/tests/boards/nrf/i2c/i2c_slave/boards/nrf54h20dk_nrf54h20_cpuppr.conf
@@ -0,0 +1 @@
+CONFIG_NRFX_TWIS131=y
diff --git a/tests/boards/nrf/i2c/i2c_slave/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/tests/boards/nrf/i2c/i2c_slave/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
new file mode 100644
index 00000000000..e9698b2b2bc
--- /dev/null
+++ b/tests/boards/nrf/i2c/i2c_slave/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
@@ -0,0 +1,62 @@
+/ {
+	aliases {
+		i2c-slave = &i2c131;
+	};
+};
+
+&pinctrl {
+	i2c130_default_alt: i2c130_default_alt {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 8)>,
+				<NRF_PSEL(TWIM_SCL, 1, 2)>;
+		};
+	};
+
+	i2c130_sleep_alt: i2c130_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 8)>,
+				<NRF_PSEL(TWIM_SCL, 1, 2)>;
+			low-power-enable;
+		};
+	};
+
+	i2c131_default_alt: i2c131_default_alt {
+		group1 {
+/* Temporary workaround as it is currently not possible
+ * to configure pins for TWIS with pinctrl.
+ */
+			psels = <NRF_PSEL(TWIM_SDA, 2, 9)>,
+				<NRF_PSEL(TWIM_SCL, 1, 3)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c131_sleep_alt: i2c131_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 9)>,
+				<NRF_PSEL(TWIM_SCL, 1, 3)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c130 {
+	compatible = "nordic,nrf-twim";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c130_default_alt>;
+	pinctrl-1 = <&i2c130_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	sensor: sensor@54 {
+		reg = <0x54>;
+	};
+};
+
+&i2c131 {
+	compatible = "nordic,nrf-twis";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c131_default_alt>;
+	pinctrl-1 = <&i2c131_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+};
diff --git a/tests/boards/nrf/i2c/i2c_slave/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/boards/nrf/i2c/i2c_slave/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..1d770095936
--- /dev/null
+++ b/tests/boards/nrf/i2c/i2c_slave/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,51 @@
+&pinctrl {
+	i2c130_default_alt: i2c130_default_alt {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 8)>,
+				<NRF_PSEL(TWIM_SCL, 1, 2)>;
+		};
+	};
+
+	i2c130_sleep_alt: i2c130_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 8)>,
+				<NRF_PSEL(TWIM_SCL, 1, 2)>;
+			low-power-enable;
+		};
+	};
+
+	i2c131_default_alt: i2c131_default_alt {
+		group1 {
+/* Temporary workaround as it is currently not possible
+ * to configure pins for TWIS with pinctrl.
+ */
+			psels = <NRF_PSEL(TWIM_SDA, 2, 9)>,
+				<NRF_PSEL(TWIM_SCL, 1, 3)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c131_sleep_alt: i2c131_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 9)>,
+				<NRF_PSEL(TWIM_SCL, 1, 3)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c130 {
+	status = "reserved";
+	pinctrl-0 = <&i2c130_default_alt>;
+	pinctrl-1 = <&i2c130_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	interrupt-parent = <&cpuppr_clic>;
+};
+
+&i2c131 {
+	status = "reserved";
+	pinctrl-0 = <&i2c131_default_alt>;
+	pinctrl-1 = <&i2c131_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	interrupt-parent = <&cpuppr_clic>;
+};
diff --git a/tests/boards/nrf/i2c/i2c_slave/sysbuild/vpr_launcher/prj.conf b/tests/boards/nrf/i2c/i2c_slave/sysbuild/vpr_launcher/prj.conf
new file mode 100644
index 00000000000..b2a4ba59104
--- /dev/null
+++ b/tests/boards/nrf/i2c/i2c_slave/sysbuild/vpr_launcher/prj.conf
@@ -0,0 +1 @@
+# nothing here
diff --git a/tests/boards/nrf/i2c/i2c_slave/testcase.yaml b/tests/boards/nrf/i2c/i2c_slave/testcase.yaml
index ad3b34058c7..6a63242ee25 100644
--- a/tests/boards/nrf/i2c/i2c_slave/testcase.yaml
+++ b/tests/boards/nrf/i2c/i2c_slave/testcase.yaml
@@ -10,8 +10,10 @@ tests:
       - nrf5340dk/nrf5340/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpuppr
     integration_platforms:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpuppr

From 5b1321eeea1dcd3e99f898b9ac3e5df9926b80dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 13 Nov 2024 12:30:35 +0100
Subject: [PATCH 0841/2913] [nrf fromtree] soc: nordic: common: Add mram
 latency manager
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add module for managing multiple requests for MRAM latency.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 980e0acbf1c9e9377a5c85d40b2749dc28db04a8)
---
 soc/nordic/common/CMakeLists.txt |   1 +
 soc/nordic/common/Kconfig        |  20 ++++
 soc/nordic/common/mram_latency.c | 175 +++++++++++++++++++++++++++++++
 soc/nordic/common/mram_latency.h |  91 ++++++++++++++++
 4 files changed, 287 insertions(+)
 create mode 100644 soc/nordic/common/mram_latency.c
 create mode 100644 soc/nordic/common/mram_latency.h

diff --git a/soc/nordic/common/CMakeLists.txt b/soc/nordic/common/CMakeLists.txt
index 4808319557c..8c00b768b90 100644
--- a/soc/nordic/common/CMakeLists.txt
+++ b/soc/nordic/common/CMakeLists.txt
@@ -34,3 +34,4 @@ if(CONFIG_TFM_PARTITION_PLATFORM)
 endif()
 
 zephyr_library_sources_ifdef(CONFIG_NRF_SYS_EVENT nrf_sys_event.c)
+zephyr_library_sources_ifdef(CONFIG_MRAM_LATENCY mram_latency.c)
diff --git a/soc/nordic/common/Kconfig b/soc/nordic/common/Kconfig
index e7e24ca8cf2..0170f266de3 100644
--- a/soc/nordic/common/Kconfig
+++ b/soc/nordic/common/Kconfig
@@ -11,4 +11,24 @@ config NRF_SYS_EVENT
 	bool "nRF system event support"
 	select NRFX_POWER if !NRF_PLATFORM_HALTIUM
 
+config MRAM_LATENCY
+	bool "MRAM latency manager"
+	depends on NRFS_HAS_MRAM_SERVICE
+	select ONOFF
+	select NRFS_MRAM_SERVICE_ENABLED
+
+if MRAM_LATENCY
+
+config MRAM_LATENCY_SYNC_TIMEOUT
+	int "Timeout in synchronous request"
+	default 1000
+	help
+	  Timeout is given in milliseconds.
+
+module = MRAM_LATENCY
+module-str = mram_latency
+source "subsys/logging/Kconfig.template.log_config"
+
+endif # MRAM_LATENCY
+
 rsource "vpr/Kconfig"
diff --git a/soc/nordic/common/mram_latency.c b/soc/nordic/common/mram_latency.c
new file mode 100644
index 00000000000..0bfc6d4bfe2
--- /dev/null
+++ b/soc/nordic/common/mram_latency.c
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mram_latency.h>
+#include <zephyr/kernel.h>
+#include <nrfs_mram.h>
+#include <nrfs_backend_ipc_service.h>
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(mram_latency, CONFIG_MRAM_LATENCY_LOG_LEVEL);
+
+enum mram_latency_state {
+	MRAM_LATENCY_OFF = 0,
+	MRAM_LATENCY_OFF_PENDING,
+	MRAM_LATENCY_ON,
+};
+
+static struct k_work work;
+static bool no_latency;
+static enum mram_latency_state state;
+
+static onoff_notify_fn onoff_notify;
+struct onoff_manager mram_latency_mgr;
+
+struct sync_latency_req {
+	struct onoff_client cli;
+	struct k_sem sem;
+	int res;
+};
+
+static void latency_change_req(bool latency_not_allowed)
+{
+	nrfs_err_t err;
+
+	if (latency_not_allowed) {
+		err = nrfs_mram_set_latency(MRAM_LATENCY_NOT_ALLOWED, NULL);
+		if (err != NRFS_SUCCESS) {
+			onoff_notify(&mram_latency_mgr, -EIO);
+		}
+	} else {
+		/* There is no event for that setting so we can notify onoff manager
+		 * immediately.
+		 */
+		err = nrfs_mram_set_latency(MRAM_LATENCY_ALLOWED, NULL);
+		onoff_notify(&mram_latency_mgr, err != NRFS_SUCCESS ? -EIO : 0);
+	}
+}
+
+static void latency_change(bool latency_not_allowed)
+{
+	LOG_DBG("Request: latency %s allowed", latency_not_allowed ? "not " : "");
+	if (state == MRAM_LATENCY_OFF) {
+		state = MRAM_LATENCY_OFF_PENDING;
+	} else if (k_is_in_isr()) {
+		/* nrfs cannot be called from interrupt context so defer to the work
+		 * queue context and execute from there.
+		 */
+		no_latency = latency_not_allowed;
+		k_work_submit(&work);
+	} else {
+		latency_change_req(latency_not_allowed);
+	}
+}
+
+static void no_latency_start(struct onoff_manager *mgr, onoff_notify_fn notify)
+{
+	onoff_notify = notify;
+	latency_change(true);
+}
+
+static void no_latency_stop(struct onoff_manager *mgr, onoff_notify_fn notify)
+{
+	latency_change(false);
+}
+
+static void evt_handler(nrfs_mram_latency_evt_t const *p_evt, void *context)
+{
+	int res = p_evt->type == NRFS_MRAM_LATENCY_REQ_APPLIED ? 0 : -EIO;
+
+	LOG_DBG("Latency not allowed - applied");
+	onoff_notify(&mram_latency_mgr, res);
+}
+
+static void work_handler(struct k_work *work)
+{
+	latency_change_req(no_latency);
+}
+
+int mram_no_latency_cancel_or_release(struct onoff_client *cli)
+{
+	return onoff_cancel_or_release(&mram_latency_mgr, cli);
+}
+
+int mram_no_latency_request(struct onoff_client *cli)
+{
+	return onoff_request(&mram_latency_mgr, cli);
+}
+
+static void sync_req_cb(struct onoff_manager *mgr, struct onoff_client *cli, uint32_t state,
+			int res)
+{
+	struct sync_latency_req *req = CONTAINER_OF(cli, struct sync_latency_req, cli);
+
+	req->res = res;
+	k_sem_give(&req->sem);
+}
+
+int mram_no_latency_sync_request(void)
+{
+	struct sync_latency_req req;
+	int rv;
+
+	if (k_is_in_isr() || (state != MRAM_LATENCY_ON)) {
+		return -ENOTSUP;
+	}
+
+	k_sem_init(&req.sem, 0, 1);
+	sys_notify_init_callback(&req.cli.notify, sync_req_cb);
+	rv = onoff_request(&mram_latency_mgr, &req.cli);
+	if (rv < 0) {
+		return rv;
+	}
+
+	rv = k_sem_take(&req.sem, K_MSEC(CONFIG_MRAM_LATENCY_SYNC_TIMEOUT));
+	if (rv < 0) {
+		return rv;
+	}
+
+	return req.res;
+}
+
+int mram_no_latency_sync_release(void)
+{
+	return onoff_release(&mram_latency_mgr) >= 0 ? 0 : -EIO;
+}
+
+/* First initialize onoff manager to be able to accept requests. */
+static int init_manager(void)
+{
+	static const struct onoff_transitions transitions =
+		ONOFF_TRANSITIONS_INITIALIZER(no_latency_start, no_latency_stop, NULL);
+
+	return onoff_manager_init(&mram_latency_mgr, &transitions);
+}
+
+/* When kernel and IPC is running initialize nrfs. Optionally, execute pending request. */
+static int init_nrfs(void)
+{
+	nrfs_err_t err;
+	int rv;
+
+	err = nrfs_backend_wait_for_connection(K_FOREVER);
+	if (err != NRFS_SUCCESS) {
+		return -EIO;
+	}
+
+	err = nrfs_mram_init(evt_handler);
+	if (err != NRFS_SUCCESS) {
+		return -EIO;
+	}
+
+	k_work_init(&work, work_handler);
+
+	if (state == MRAM_LATENCY_OFF_PENDING) {
+		latency_change(true);
+	}
+
+	state = MRAM_LATENCY_ON;
+
+	return rv;
+}
+
+SYS_INIT(init_manager, PRE_KERNEL_1, 0);
+SYS_INIT(init_nrfs, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY);
diff --git a/soc/nordic/common/mram_latency.h b/soc/nordic/common/mram_latency.h
new file mode 100644
index 00000000000..dc24566a905
--- /dev/null
+++ b/soc/nordic/common/mram_latency.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * nRF SoC specific public APIs for MRAM latency management
+ * @brief Experimental. It will be replaced by the PM latency policy API in the future.
+ */
+
+#ifndef SOC_NORDIC_COMMON_MRAM_LATENCY_H_
+#define SOC_NORDIC_COMMON_MRAM_LATENCY_H_
+
+#include <zephyr/sys/onoff.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @internal For test purposes only. */
+extern struct onoff_manager mram_latency_mgr;
+
+/** @brief Request MRAM operations without latency.
+ *
+ * The return value indicates the success or failure of an attempt to initiate
+ * an operation to request the MRAM low latency. If initiation of the
+ * operation succeeds, the result of the request operation is provided through
+ * the configured client notification method, possibly before this call returns.
+ *
+ * @param cli pointer to client state providing instructions on synchronous
+ *            expectations and how to notify the client when the request
+ *            completes. Behavior is undefined if client passes a pointer
+ *            object associated with an incomplete service operation.
+ *
+ * @retval non-negative the observed state of the on-off service associated
+ *                      with the MRAM latency service.
+ * @retval -EIO if MRAM latency service returned error.
+ * @retval -EINVAL if the parameters are invalid.
+ * @retval -EAGAIN if the reference count would overflow.
+ */
+int mram_no_latency_request(struct onoff_client *cli);
+
+/** @brief Request MRAM operations without latency.
+ *
+ * Request is synchronous and blocks until it is completed. It can be called only
+ * from the thread context and cannot be called in the pre kernel stage.
+ *
+ * @retval 0 on successful request.
+ * @retval -EIO if MRAM latency service returned error.
+ * @retval -EAGAIN if request was not completed on time.
+ */
+int mram_no_latency_sync_request(void);
+
+/**
+ * @brief Safely cancel a request for MRAM operations without latency.
+ *
+ * It may be that a client has issued a reservation request but needs to
+ * shut down before the request has completed. This function attempts to
+ * cancel the request and issues a release if cancellation fails because
+ * the request was completed. This synchronously ensures that ownership
+ * data reverts to the client so is available for a future request.
+ *
+ * @param cli a pointer to the same client state that was provided
+ *            when the operation to be cancelled was issued.
+ *
+ * @retval ONOFF_STATE_TO_ON if the cancellation occurred before the transition
+ *                           completed.
+ * @retval ONOFF_STATE_ON if the cancellation occurred after the transition
+ *                        completed.
+ * @retval -EINVAL if the parameters are invalid.
+ * @retval -EIO if MRAM latency service returned error.
+ * @retval negative other errors produced by onoff_release().
+ */
+int mram_no_latency_cancel_or_release(struct onoff_client *cli);
+
+/**
+ * @brief Release a request for MRAM operations without latency.
+ *
+ * It should match with a completed @ref mram_no_latency_sync_request call.
+ *
+ * @retval 0 on successful request.
+ * @retval -EIO if MRAM latency service returned error.
+ */
+int mram_no_latency_sync_release(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SOC_NORDIC_COMMON_MRAM_LATENCY_H_ */

From c9ce3be7b1f9df54ad479c6e5723542b3ab833b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 13 Nov 2024 13:07:06 +0100
Subject: [PATCH 0842/2913] [nrf fromtree] tests: boards: nrf: Add MRAM latency
 test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add test for MRAM latency.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 20e28d23c17803fe0aa7d18b169cd48f36f765b4)
---
 tests/boards/nrf/mram_latency/CMakeLists.txt |  10 +
 tests/boards/nrf/mram_latency/prj.conf       |   2 +
 tests/boards/nrf/mram_latency/src/main.c     | 189 +++++++++++++++++++
 tests/boards/nrf/mram_latency/testcase.yaml  |  12 ++
 4 files changed, 213 insertions(+)
 create mode 100644 tests/boards/nrf/mram_latency/CMakeLists.txt
 create mode 100644 tests/boards/nrf/mram_latency/prj.conf
 create mode 100644 tests/boards/nrf/mram_latency/src/main.c
 create mode 100644 tests/boards/nrf/mram_latency/testcase.yaml

diff --git a/tests/boards/nrf/mram_latency/CMakeLists.txt b/tests/boards/nrf/mram_latency/CMakeLists.txt
new file mode 100644
index 00000000000..4ac7b855575
--- /dev/null
+++ b/tests/boards/nrf/mram_latency/CMakeLists.txt
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(mram_latency)
+
+FILE(GLOB app_sources src/*.c)
+
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/boards/nrf/mram_latency/prj.conf b/tests/boards/nrf/mram_latency/prj.conf
new file mode 100644
index 00000000000..ed9ce9820c1
--- /dev/null
+++ b/tests/boards/nrf/mram_latency/prj.conf
@@ -0,0 +1,2 @@
+CONFIG_ZTEST=y
+CONFIG_MRAM_LATENCY=y
diff --git a/tests/boards/nrf/mram_latency/src/main.c b/tests/boards/nrf/mram_latency/src/main.c
new file mode 100644
index 00000000000..b7110dd7ae3
--- /dev/null
+++ b/tests/boards/nrf/mram_latency/src/main.c
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <errno.h>
+#include <string.h>
+#include <zephyr/cache.h>
+#include <zephyr/kernel.h>
+#include <zephyr/ztest.h>
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(test);
+
+#include <mram_latency.h>
+
+#define TIMEOUT_MS 10
+
+static volatile uint32_t current_state;
+static struct onoff_monitor monitor;
+static struct onoff_client early_client;
+static int early_rv;
+static int early_result;
+
+struct test_req {
+	struct onoff_client cli;
+	struct k_sem sem;
+	int res;
+	uint32_t state;
+};
+
+static void basic_cb(struct onoff_manager *mgr, struct onoff_client *cli, uint32_t state, int res)
+{
+	struct test_req *req = CONTAINER_OF(cli, struct test_req, cli);
+
+	req->res = res;
+	req->state = state;
+	k_sem_give(&req->sem);
+}
+
+static void monitor_cb(struct onoff_manager *mgr, struct onoff_monitor *mon, uint32_t state,
+		       int res)
+{
+	current_state = state;
+}
+
+ZTEST(mram_latency, test_basic_requests)
+{
+	struct test_req req1, req2;
+	uint32_t exp_state;
+	int rv;
+
+	k_sem_init(&req1.sem, 0, 1);
+	k_sem_init(&req2.sem, 0, 1);
+
+	sys_notify_init_callback(&req1.cli.notify, basic_cb);
+	exp_state = ONOFF_STATE_OFF;
+	/* Req: 0->1 trigger to on */
+	rv = mram_no_latency_request(&req1.cli);
+	zassert_equal(rv, exp_state, "Unexpected rv:%d (exp:%d)", rv, exp_state);
+
+	sys_notify_init_callback(&req2.cli.notify, basic_cb);
+	exp_state = ONOFF_STATE_TO_ON;
+	/* Req: 1->2 */
+	rv = mram_no_latency_request(&req2.cli);
+	zassert_equal(rv, exp_state, "Unexpected rv:%d (exp:%d)", rv, exp_state);
+
+	rv = k_sem_take(&req1.sem, K_MSEC(TIMEOUT_MS));
+	zassert_equal(rv, 0, "Unexpected rv:%d", rv);
+	zassert_equal(req1.res, 0, "Unexpected res:%d", req1.res);
+	zassert_equal(req1.state, ONOFF_STATE_ON, "Unexpected state:%08x", req1.state);
+
+	rv = k_sem_take(&req2.sem, K_MSEC(TIMEOUT_MS));
+	zassert_equal(rv, 0, "Unexpected rv:%d", rv);
+	zassert_equal(req2.res, 0, "Unexpected res:%d", req2.res);
+	zassert_equal(req2.state, ONOFF_STATE_ON);
+
+	exp_state = ONOFF_STATE_ON;
+	rv = mram_no_latency_cancel_or_release(&req2.cli);
+	/* Req: 2->1 */
+	zassert_equal(rv, exp_state, "Unexpected rv:%d (exp:%d)", rv, exp_state);
+
+	/* Req: 1->0 going to off triggered*/
+	rv = mram_no_latency_cancel_or_release(&req1.cli);
+	zassert_equal(rv, exp_state, "Unexpected rv:%d (exp:%d)", rv, exp_state);
+
+	sys_notify_init_callback(&req1.cli.notify, basic_cb);
+	exp_state = ONOFF_STATE_OFF;
+
+	/* Req: 0->1 triggered to on while in to off. */
+	rv = mram_no_latency_request(&req1.cli);
+	zassert_equal(rv, exp_state, "Unexpected rv:%d (exp:%d)", rv, exp_state);
+
+	/* Req: 1->0 releases which to off. */
+	exp_state = ONOFF_STATE_TO_ON;
+	rv = mram_no_latency_cancel_or_release(&req1.cli);
+	zassert_equal(rv, exp_state, "Unexpected rv:%d (exp:%d)", rv, exp_state);
+
+	k_msleep(10);
+}
+
+static void timeout(struct k_timer *timer)
+{
+	struct test_req *req = k_timer_user_data_get(timer);
+	uint32_t exp_state;
+	int rv;
+
+	sys_notify_init_callback(&req->cli.notify, basic_cb);
+	exp_state = ONOFF_STATE_OFF;
+	rv = mram_no_latency_request(&req->cli);
+	zassert_equal(rv, exp_state, "Unexpected rv:%d (exp:%d)", rv, exp_state);
+}
+
+ZTEST(mram_latency, test_req_from_irq)
+{
+	struct test_req req;
+	struct k_timer timer;
+	uint32_t exp_state;
+	int rv;
+
+	k_sem_init(&req.sem, 0, 1);
+	k_timer_init(&timer, timeout, NULL);
+	k_timer_user_data_set(&timer, &req);
+	/* Start k_timer and from that context request MRAM latency. */
+	k_timer_start(&timer, K_MSEC(1), K_NO_WAIT);
+
+	exp_state = ONOFF_STATE_ON;
+	rv = k_sem_take(&req.sem, K_MSEC(TIMEOUT_MS));
+	zassert_equal(rv, 0, "Unexpected rv:%d", rv);
+	zassert_equal(req.res, 0, "Unexpected res:%d", req.res);
+	zassert_equal(req.state, exp_state);
+
+	rv = mram_no_latency_cancel_or_release(&req.cli);
+	zassert_equal(rv, exp_state, "Unexpected rv:%d (exp:%d)", rv, exp_state);
+}
+
+ZTEST(mram_latency, test_sync_req)
+{
+	zassert_equal(current_state, ONOFF_STATE_OFF);
+	mram_no_latency_sync_request();
+	zassert_equal(current_state, ONOFF_STATE_ON);
+	mram_no_latency_sync_release();
+	zassert_equal(current_state, ONOFF_STATE_OFF);
+}
+
+ZTEST(mram_latency, test_early_req)
+{
+	zassert_true(early_rv >= 0);
+	zassert_true(early_result >= 0);
+}
+
+static void *setup(void)
+{
+	int rv;
+
+	monitor.callback = monitor_cb;
+	rv = onoff_monitor_register(&mram_latency_mgr, &monitor);
+	zassert_equal(rv, 0);
+
+	if (early_rv >= 0) {
+		sys_notify_fetch_result(&early_client.notify, &early_result);
+	}
+
+	mram_no_latency_cancel_or_release(&early_client);
+
+	return NULL;
+}
+
+static void before(void *arg)
+{
+	zassert_equal(current_state, ONOFF_STATE_OFF);
+}
+
+static void after(void *arg)
+{
+	zassert_equal(current_state, ONOFF_STATE_OFF);
+}
+
+static int early_mram_client(void)
+{
+	sys_notify_init_spinwait(&early_client.notify);
+	early_rv = mram_no_latency_request(&early_client);
+
+	return 0;
+}
+
+SYS_INIT(early_mram_client, PRE_KERNEL_2, 0);
+
+ZTEST_SUITE(mram_latency, NULL, setup, before, after, NULL);
diff --git a/tests/boards/nrf/mram_latency/testcase.yaml b/tests/boards/nrf/mram_latency/testcase.yaml
new file mode 100644
index 00000000000..691370a5618
--- /dev/null
+++ b/tests/boards/nrf/mram_latency/testcase.yaml
@@ -0,0 +1,12 @@
+common:
+  tags: drivers
+  harness: ztest
+
+tests:
+  boards.nrf.mram_latency:
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpurad
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpurad

From 98989345ea296be3a04e858abeda013841bf4cab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 28 Nov 2024 12:46:26 +0100
Subject: [PATCH 0843/2913] Revert "[nrf noup] soc: nordic: nrf54h20: Turn off
 MRAM suspend"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8027617116b66548dc6d115af8cca84282adc87e.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 soc/nordic/nrf54h/CMakeLists.txt |  2 --
 soc/nordic/nrf54h/Kconfig        |  6 ----
 soc/nordic/nrf54h/mram.c         | 59 --------------------------------
 3 files changed, 67 deletions(-)
 delete mode 100644 soc/nordic/nrf54h/mram.c

diff --git a/soc/nordic/nrf54h/CMakeLists.txt b/soc/nordic/nrf54h/CMakeLists.txt
index 10c59b04583..7edc4d43ea1 100644
--- a/soc/nordic/nrf54h/CMakeLists.txt
+++ b/soc/nordic/nrf54h/CMakeLists.txt
@@ -12,8 +12,6 @@ zephyr_library_sources_ifdef(CONFIG_PM_S2RAM pm_s2ram.c)
 
 zephyr_include_directories(.)
 
-zephyr_library_sources_ifdef(CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY mram.c)
-
 # Ensure that image size aligns with 16 bytes so that MRAMC finalizes all writes
 # for the image correctly
 zephyr_linker_sources(SECTIONS SORT_KEY zzz_place_align_at_end align.ld)
diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
index 7698c26d9f2..36979b554e0 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -67,9 +67,3 @@ config SOC_NRF54H20_CPUFLPR
 	depends on RISCV_CORE_NORDIC_VPR
 
 rsource "gpd/Kconfig"
-
-config SOC_NRF54H20_NO_MRAM_LATENCY
-	bool "Disallow MRAM latency"
-	imply NRFS
-	imply NRFS_MRAM_SERVICE_ENABLED
-	default y if SOC_NRF54H20_CPUAPP
diff --git a/soc/nordic/nrf54h/mram.c b/soc/nordic/nrf54h/mram.c
deleted file mode 100644
index 5549a2437df..00000000000
--- a/soc/nordic/nrf54h/mram.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/init.h>
-#include <zephyr/kernel.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/toolchain.h>
-
-#include <services/nrfs_mram.h>
-#include <nrfs_backend_ipc_service.h>
-
-LOG_MODULE_REGISTER(mram, CONFIG_SOC_LOG_LEVEL);
-
-static void mram_latency_handler(nrfs_mram_latency_evt_t const *p_evt, void *context)
-{
-	ARG_UNUSED(context);
-
-	switch (p_evt->type) {
-	case NRFS_MRAM_LATENCY_REQ_APPLIED:
-		LOG_DBG("MRAM latency not allowed setting applied");
-		break;
-	case NRFS_MRAM_LATENCY_REQ_REJECTED:
-		LOG_ERR("MRAM latency not allowed setting rejected");
-		k_panic();
-		break;
-	default:
-		LOG_WRN("Unexpected event: %d", p_evt->type);
-	}
-}
-
-/* Turn off mram automatic suspend as it causes delays in time depended code sections. */
-static int turn_off_suspend_mram(void)
-{
-	nrfs_err_t err;
-
-	/* Wait for ipc initialization */
-	nrfs_backend_wait_for_connection(K_FOREVER);
-
-	err = nrfs_mram_init(mram_latency_handler);
-	if (err != NRFS_SUCCESS) {
-		LOG_ERR("MRAM service init failed: %d", err);
-		return -EIO;
-	}
-
-	LOG_DBG("MRAM service initialized, disallow latency");
-
-	err = nrfs_mram_set_latency(MRAM_LATENCY_NOT_ALLOWED, NULL);
-	if (err != NRFS_SUCCESS) {
-		LOG_ERR("MRAM: set latency failed (%d)", err);
-		return -EIO;
-	}
-
-	return 0;
-}
-
-SYS_INIT(turn_off_suspend_mram, APPLICATION, 90);

From a7fe5f7c4aab18312bd7f61afef55647e38f3db6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 3 Dec 2024 07:59:53 +0100
Subject: [PATCH 0844/2913] [nrf fromlist] soc: nordic: common: mram_latency:
 Add option to auto request no latency
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add CONFIG_MRAM_LATENCY_AUTO_REQ. When option is enabled then module
requests no latency during the initialization. This option might be
useful for cases where we want to achieve maximum performance and
want to avoid controlling MRAM in the code.

Upstream PR #: 82465

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 soc/nordic/common/Kconfig        | 7 +++++++
 soc/nordic/common/mram_latency.c | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/soc/nordic/common/Kconfig b/soc/nordic/common/Kconfig
index 0170f266de3..db75ed28115 100644
--- a/soc/nordic/common/Kconfig
+++ b/soc/nordic/common/Kconfig
@@ -25,6 +25,13 @@ config MRAM_LATENCY_SYNC_TIMEOUT
 	help
 	  Timeout is given in milliseconds.
 
+config MRAM_LATENCY_AUTO_REQ
+	bool "Request MRAM without latency at start"
+	help
+	  When enabled then MRAM configuration without latency is requested
+	  during the initialization and is kept enabled until the mram_latency API user
+	  calls mram_no_latency_sync_release().
+
 module = MRAM_LATENCY
 module-str = mram_latency
 source "subsys/logging/Kconfig.template.log_config"
diff --git a/soc/nordic/common/mram_latency.c b/soc/nordic/common/mram_latency.c
index 0bfc6d4bfe2..cba1b498d6c 100644
--- a/soc/nordic/common/mram_latency.c
+++ b/soc/nordic/common/mram_latency.c
@@ -168,6 +168,10 @@ static int init_nrfs(void)
 
 	state = MRAM_LATENCY_ON;
 
+	if (IS_ENABLED(CONFIG_MRAM_LATENCY_AUTO_REQ)) {
+		mram_no_latency_sync_request();
+	}
+
 	return rv;
 }
 

From 314231f4404895840dcc2b8404d7789b5632b9a1 Mon Sep 17 00:00:00 2001
From: Andrzej Kuros <andrzej.kuros@nordicsemi.no>
Date: Wed, 16 Oct 2024 11:08:41 +0200
Subject: [PATCH 0845/2913] [nrf fromtree] drivers: ieee802154: add Kconfig
 IEEE802154_SELECTIVE_TXCHANNEL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Kconfig `IEEE802154_SELECTIVE_TXCHANNEL` is added along with
the new capability `IEEE802154_HW_SELECTIVE_TXCHANNEL`.
The new capability of the ieee802154 drivers allows to schedule
CSL transmissions as stated in IEEE 802.15.4-2020 chapter 6.12.2.7
CSL over multiple channels. The benefit of the new API is that
additional call to `ieee802154_radio_api::set_channel()` is not
required. The drivers will switch to the new channel as late as
possible for CSL transmissions thus will not interrupt any reception
that might be in progress until the very late moment when the
transmission actually starts.
This improves reception performance when CSL transmissions are used.

Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>
Signed-off-by: Andrzej Kuroś <andrzej.kuros@nordicsemi.no>
(cherry picked from commit 2fbba82591d43660d81efff67a131d198cec1ffd)
---
 drivers/ieee802154/Kconfig                    |  8 +++++
 include/zephyr/net/ieee802154_pkt.h           | 22 ++++++++++++
 include/zephyr/net/ieee802154_radio.h         | 36 ++++++++++++++++++-
 .../zephyr/net/ieee802154_radio_openthread.h  |  3 ++
 4 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/drivers/ieee802154/Kconfig b/drivers/ieee802154/Kconfig
index 916cc1a9ddb..a4e4e6d307d 100644
--- a/drivers/ieee802154/Kconfig
+++ b/drivers/ieee802154/Kconfig
@@ -92,6 +92,14 @@ config IEEE802154_CSL_DEBUG
 	help
 	  Enable support for CSL debugging by avoiding sleep state in favor of receive state.
 
+config IEEE802154_SELECTIVE_TXCHANNEL
+	bool "Support for selective TX channel setting"
+	help
+	  Enable support for selectively setting TX channel for every timed transmission request.
+	  The drivers MAY have the capability IEEE802154_HW_SELECTIVE_TXCHANNEL only if
+	  this Kconfig option is enabled. If the Kconfig option is disabled the drivers
+	  MUST NOT have the capability.
+
 module = IEEE802154_DRIVER
 module-str = IEEE 802.15.4 driver
 module-help = Sets log level for IEEE 802.15.4 Device Drivers.
diff --git a/include/zephyr/net/ieee802154_pkt.h b/include/zephyr/net/ieee802154_pkt.h
index 3270f994248..b51db139c60 100644
--- a/include/zephyr/net/ieee802154_pkt.h
+++ b/include/zephyr/net/ieee802154_pkt.h
@@ -59,6 +59,16 @@ struct net_pkt_cb_ieee802154 {
 			 */
 			uint8_t rssi;
 		};
+		struct {
+#if defined(CONFIG_IEEE802154_SELECTIVE_TXCHANNEL)
+			/* The channel used for timed transmissions.
+			 *
+			 * Please refer to `ieee802154_radio_api::tx` documentation for
+			 * details.
+			 */
+			uint8_t txchannel;
+#endif /* CONFIG_IEEE802154_SELECTIVE_TXCHANNEL */
+		};
 	};
 
 	/* Flags */
@@ -179,6 +189,18 @@ static inline void net_pkt_set_ieee802154_rssi_dbm(struct net_pkt *pkt, int16_t
 	CODE_UNREACHABLE;
 }
 
+#if defined(CONFIG_IEEE802154_SELECTIVE_TXCHANNEL)
+static inline uint8_t net_pkt_ieee802154_txchannel(struct net_pkt *pkt)
+{
+	return net_pkt_cb_ieee802154(pkt)->txchannel;
+}
+
+static inline void net_pkt_set_ieee802154_txchannel(struct net_pkt *pkt, uint8_t channel)
+{
+	net_pkt_cb_ieee802154(pkt)->txchannel = channel;
+}
+#endif /* CONFIG_IEEE802154_SELECTIVE_TXCHANNEL */
+
 static inline bool net_pkt_ieee802154_ack_fpb(struct net_pkt *pkt)
 {
 	return net_pkt_cb_ieee802154(pkt)->ack_fpb;
diff --git a/include/zephyr/net/ieee802154_radio.h b/include/zephyr/net/ieee802154_radio.h
index 10a1922f6fa..f9a557beba0 100644
--- a/include/zephyr/net/ieee802154_radio.h
+++ b/include/zephyr/net/ieee802154_radio.h
@@ -520,13 +520,26 @@ enum ieee802154_hw_caps {
 	/** RxOnWhenIdle handling supported */
 	IEEE802154_RX_ON_WHEN_IDLE = BIT(12),
 
+	/** Support for timed transmissions on selective channel.
+	 *
+	 *  This capability informs that transmissions with modes
+	 *  @ref IEEE802154_TX_MODE_TXTIME and @ref IEEE802154_TX_MODE_TXTIME_CCA support
+	 *  scheduling of timed transmissions on selective tx channel.
+	 *  The driver MAY have this capability only if the Kconfig option
+	 *  `CONFIG_IEEE802154_SELECTIVE_TXCHANNEL` is set, otherwise the driver MUST
+	 *  NOT have this capability.
+	 *
+	 *  Please refer to the `ieee802154_radio_api::tx` documentation for details.
+	 */
+	IEEE802154_HW_SELECTIVE_TXCHANNEL = BIT(13),
+
 	/* Note: Update also IEEE802154_HW_CAPS_BITS_COMMON_COUNT when changing
 	 * the ieee802154_hw_caps type.
 	 */
 };
 
 /** @brief Number of bits used by ieee802154_hw_caps type. */
-#define IEEE802154_HW_CAPS_BITS_COMMON_COUNT (13)
+#define IEEE802154_HW_CAPS_BITS_COMMON_COUNT (14)
 
 /** @brief This and higher values are specific to the protocol- or driver-specific extensions. */
 #define IEEE802154_HW_CAPS_BITS_PRIV_START IEEE802154_HW_CAPS_BITS_COMMON_COUNT
@@ -625,6 +638,8 @@ enum ieee802154_tx_mode {
 	 * Transmit packet in the future, at the specified time, no CCA.
 	 *
 	 * @note requires IEEE802154_HW_TXTIME capability.
+	 *
+	 * @note capability IEEE802154_HW_SELECTIVE_TXCHANNEL may apply.
 	 */
 	IEEE802154_TX_MODE_TXTIME,
 
@@ -635,6 +650,8 @@ enum ieee802154_tx_mode {
 	 *
 	 * @note Required for Thread 1.2 Coordinated Sampled Listening feature
 	 * (see Thread specification 1.2.0, ch. 3.2.6.3).
+	 *
+	 * @note capability IEEE802154_HW_SELECTIVE_TXCHANNEL may apply.
 	 */
 	IEEE802154_TX_MODE_TXTIME_CCA,
 
@@ -1657,6 +1674,23 @@ struct ieee802154_radio_api {
 	 * considerable idle waiting time. SHALL return `-ENETDOWN` unless the
 	 * interface is "UP".
 	 *
+	 * @note The transmission occurs on the radio channel set by the call to
+	 * `set_channel()`. However, if the `CONFIG_IEEE802154_SELECTIVE_TXCHANNEL`
+	 * is set and the driver has the capability `IEEE802154_HW_SELECTIVE_TXCHANNEL`
+	 * then the transmissions requested with `mode` IEEE802154_TX_MODE_TXTIME
+	 * or `IEEE802154_TX_MODE_TXTIME_CCA` SHALL use the radio channel
+	 * returned by `net_pkt_ieee802154_txchannel()` to transmit the packet
+	 * and receive an ACK on that channel if the frame requested it. After
+	 * the operation the driver should return to the channel set previously by
+	 * `set_channel()` call.
+	 * It is responsibility of an upper layer to set the required radio channel
+	 * for the packet by a call to `net_pkt_set_ieee802154_txchannel()`.
+	 * This feature allows CSL transmissions as stated in IEEE 802.15.4-2020
+	 * chapter 6.12.2.7 CSL over multiple channels. This feature allows to perform
+	 * a switch of the radio channel as late as possible before transmission without
+	 * interrupting possible reception that could occur if separate `set_channel()`
+	 * was called.
+	 *
 	 * @param dev pointer to IEEE 802.15.4 driver device
 	 * @param mode the transmission mode, some of which require specific
 	 * offloading capabilities.
diff --git a/include/zephyr/net/ieee802154_radio_openthread.h b/include/zephyr/net/ieee802154_radio_openthread.h
index e45bbc6b85b..3606c7a2b78 100644
--- a/include/zephyr/net/ieee802154_radio_openthread.h
+++ b/include/zephyr/net/ieee802154_radio_openthread.h
@@ -64,6 +64,9 @@ enum ieee802154_openthread_tx_mode {
 	 * section 11.3, table 11-2).
 	 *
 	 * Requires IEEE802154_OPENTHREAD_HW_MULTIPLE_CCA capability.
+	 *
+	 * @note Capability @ref IEEE802154_HW_SELECTIVE_TXCHANNEL applies as for
+	 *       @ref IEEE802154_TX_MODE_TXTIME_CCA.
 	 */
 	IEEE802154_OPENTHREAD_TX_MODE_TXTIME_MULTIPLE_CCA = IEEE802154_TX_MODE_PRIV_START
 };

From 3ac6a883c29e3f078b9ea3810d99b1a3ada9d2e0 Mon Sep 17 00:00:00 2001
From: Przemyslaw Bida <przemyslaw.bida@nordicsemi.no>
Date: Wed, 27 Nov 2024 14:00:25 +0100
Subject: [PATCH 0846/2913] [nrf fromtree] drivers: ieee802154: New API for
 modulated carrier wave transmission.

Added new API function to start modulated carrier wave transmission

Signed-off-by: Przemyslaw Bida <przemyslaw.bida@nordicsemi.no>
(cherry picked from commit e0f94f882309679c6e8133fdcf25fa8878748ecc)
---
 drivers/ieee802154/Kconfig                    |  5 ++++
 drivers/ieee802154/ieee802154_nrf5.c          | 24 +++++++++++++++---
 include/zephyr/net/ieee802154_radio.h         | 25 +++++++++++++++++++
 modules/hal_nordic/Kconfig                    |  2 +-
 modules/openthread/Kconfig.features           |  1 +
 modules/openthread/platform/diag.c            |  2 ++
 modules/openthread/platform/platform-zephyr.h |  2 ++
 modules/openthread/platform/radio.c           |  2 ++
 8 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/drivers/ieee802154/Kconfig b/drivers/ieee802154/Kconfig
index a4e4e6d307d..af405551f63 100644
--- a/drivers/ieee802154/Kconfig
+++ b/drivers/ieee802154/Kconfig
@@ -100,6 +100,11 @@ config IEEE802154_SELECTIVE_TXCHANNEL
 	  this Kconfig option is enabled. If the Kconfig option is disabled the drivers
 	  MUST NOT have the capability.
 
+config IEEE802154_CARRIER_FUNCTIONS
+	bool "Support for carrier functions"
+	help
+	  Enable support for functions such as modulated carrier and continuous carrier.
+
 module = IEEE802154_DRIVER
 module-str = IEEE 802.15.4 driver
 module-help = Sets log level for IEEE 802.15.4 Device Drivers.
diff --git a/drivers/ieee802154/ieee802154_nrf5.c b/drivers/ieee802154/ieee802154_nrf5.c
index 613c913868b..a74606edf44 100644
--- a/drivers/ieee802154/ieee802154_nrf5.c
+++ b/drivers/ieee802154/ieee802154_nrf5.c
@@ -720,7 +720,7 @@ static int nrf5_stop(const struct device *dev)
 	return 0;
 }
 
-#if defined(CONFIG_NRF_802154_CARRIER_FUNCTIONS)
+#if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 static int nrf5_continuous_carrier(const struct device *dev)
 {
 	ARG_UNUSED(dev);
@@ -737,6 +737,23 @@ static int nrf5_continuous_carrier(const struct device *dev)
 
 	return 0;
 }
+
+static int nrf_modulated_carrier(const struct device *dev, const uint8_t *data)
+{
+	ARG_UNUSED(dev);
+
+	nrf_802154_tx_power_set(nrf5_data.txpwr);
+
+	if (!nrf_802154_modulated_carrier(data)) {
+		LOG_ERR("Failed to enter modulated carrier state");
+		return -EIO;
+	}
+
+	LOG_DBG("Modulated carrier wave transmission started (channel: %d)",
+		nrf_802154_channel_get());
+
+	return 0;
+}
 #endif
 
 #if !defined(CONFIG_IEEE802154_NRF5_EXT_IRQ_MGMT)
@@ -1244,15 +1261,16 @@ static const struct ieee802154_radio_api nrf5_radio_api = {
 	.set_txpower = nrf5_set_txpower,
 	.start = nrf5_start,
 	.stop = nrf5_stop,
-#if defined(CONFIG_NRF_802154_CARRIER_FUNCTIONS)
+#if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 	.continuous_carrier = nrf5_continuous_carrier,
+	.modulated_carrier = nrf_modulated_carrier,
 #endif
 	.tx = nrf5_tx,
 	.ed_scan = nrf5_energy_scan_start,
 	.get_time = nrf5_get_time,
 	.get_sch_acc = nrf5_get_acc,
 	.configure = nrf5_configure,
-	.attr_get = nrf5_attr_get
+	.attr_get = nrf5_attr_get,
 };
 
 #if defined(CONFIG_NET_L2_IEEE802154)
diff --git a/include/zephyr/net/ieee802154_radio.h b/include/zephyr/net/ieee802154_radio.h
index f9a557beba0..e2ab96ffac4 100644
--- a/include/zephyr/net/ieee802154_radio.h
+++ b/include/zephyr/net/ieee802154_radio.h
@@ -1765,6 +1765,7 @@ struct ieee802154_radio_api {
 	 */
 	int (*stop)(const struct device *dev);
 
+#if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 	/**
 	 * @brief Start continuous carrier wave transmission.
 	 *
@@ -1786,6 +1787,30 @@ struct ieee802154_radio_api {
 	 */
 	int (*continuous_carrier)(const struct device *dev);
 
+	/**
+	 * @brief Start modulated carrier wave transmission.
+	 *
+	 * @details When the radio is emitting modulated carrier signals, it
+	 * blocks all transmissions on the selected channel.
+	 * This function is to be called only during radio
+	 * tests. Do not use it during normal device operation.
+	 *
+	 * @note Implementations MAY **sleep** and will usually NOT be
+	 * **isr-ok**. MAY be called in any interface state once the driver is
+	 * fully initialized ("ready").
+	 *
+	 * @param dev pointer to IEEE 802.15.4 driver device
+	 * @param data Pointer to a buffer to modulate the carrier with.
+	 * The first byte is the data length.
+	 *
+	 * @retval 0 modulated carrier wave transmission started
+	 * @retval -EALREADY The driver was already in "TESTING" state and
+	 * emitting a modulated carrier.
+	 * @retval -EIO not started
+	 */
+	int (*modulated_carrier)(const struct device *dev, const uint8_t *data);
+#endif /* CONFIG_IEEE802154_CARRIER_FUNCTIONS */
+
 	/**
 	 * @brief Set or update driver configuration.
 	 *
diff --git a/modules/hal_nordic/Kconfig b/modules/hal_nordic/Kconfig
index dd4e0a0859b..f29b77e120e 100644
--- a/modules/hal_nordic/Kconfig
+++ b/modules/hal_nordic/Kconfig
@@ -204,7 +204,7 @@ config NRF_802154_SECURITY_KEY_STORAGE_SIZE
 
 config NRF_802154_CARRIER_FUNCTIONS
 	bool "nRF 802.15.4 carrier functions"
-	default y if OPENTHREAD_DIAG
+	default y if (OPENTHREAD_DIAG || IEEE802154_CARRIER_FUNCTIONS)
 	help
 	  This option enables functions such as modulated carrier and continuous carrier.
 	  If this option is modified on a multicore SoC, its remote counterpart must be set to the exact same value.
diff --git a/modules/openthread/Kconfig.features b/modules/openthread/Kconfig.features
index ccdd3236d38..514b9b85745 100644
--- a/modules/openthread/Kconfig.features
+++ b/modules/openthread/Kconfig.features
@@ -136,6 +136,7 @@ config OPENTHREAD_DHCP6_SERVER
 
 config OPENTHREAD_DIAG
 	bool "Diagnostic functions support"
+	depends on IEEE802154_CARRIER_FUNCTIONS
 	help
 	  Enable OpenThread CLI diagnostic commands
 
diff --git a/modules/openthread/platform/diag.c b/modules/openthread/platform/diag.c
index a55368bb10f..b92e34209b8 100644
--- a/modules/openthread/platform/diag.c
+++ b/modules/openthread/platform/diag.c
@@ -86,6 +86,7 @@ void otPlatDiagRadioReceived(otInstance *aInstance,
 	ARG_UNUSED(aError);
 }
 
+#if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 otError otPlatDiagRadioTransmitCarrier(otInstance *aInstance, bool aEnable)
 {
 	if (!otPlatDiagModeGet()) {
@@ -94,6 +95,7 @@ otError otPlatDiagRadioTransmitCarrier(otInstance *aInstance, bool aEnable)
 
 	return platformRadioTransmitCarrier(aInstance, aEnable);
 }
+#endif /* CONFIG_IEEE802154_CARRIER_FUNCTIONS */
 
 void otPlatDiagAlarmCallback(otInstance *aInstance)
 {
diff --git a/modules/openthread/platform/platform-zephyr.h b/modules/openthread/platform/platform-zephyr.h
index 8e2d91bd5ef..94fd04d7057 100644
--- a/modules/openthread/platform/platform-zephyr.h
+++ b/modules/openthread/platform/platform-zephyr.h
@@ -70,10 +70,12 @@ void platformUartPanic(void);
  */
 uint16_t platformRadioChannelGet(otInstance *aInstance);
 
+#if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 /**
  * Start/stop continuous carrier wave transmission.
  */
 otError platformRadioTransmitCarrier(otInstance *aInstance, bool aEnable);
+#endif /* CONFIG_IEEE802154_CARRIER_FUNCTIONS */
 
 /**
  * This function initializes the random number service used by OpenThread.
diff --git a/modules/openthread/platform/radio.c b/modules/openthread/platform/radio.c
index 7e2943e734f..33fc7b42bbf 100644
--- a/modules/openthread/platform/radio.c
+++ b/modules/openthread/platform/radio.c
@@ -809,6 +809,7 @@ otError otPlatRadioReceiveAt(otInstance *aInstance, uint8_t aChannel,
 }
 #endif
 
+#if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 otError platformRadioTransmitCarrier(otInstance *aInstance, bool aEnable)
 {
 	if (radio_api->continuous_carrier == NULL) {
@@ -831,6 +832,7 @@ otError platformRadioTransmitCarrier(otInstance *aInstance, bool aEnable)
 
 	return OT_ERROR_NONE;
 }
+#endif /* CONFIG_IEEE802154_CARRIER_FUNCTIONS */
 
 otRadioState otPlatRadioGetState(otInstance *aInstance)
 {

From c9fea6236830ea4be58eca0154df23c0208f09b6 Mon Sep 17 00:00:00 2001
From: Przemyslaw Bida <przemyslaw.bida@nordicsemi.no>
Date: Thu, 28 Nov 2024 12:17:03 +0100
Subject: [PATCH 0847/2913] [nrf fromtree] net: openthread: Add `modcarrier`
 command to OT diag module.

Commit add `modcarrier` shell command for Openthread diagnostic mode.
Command can transmit modulated carrier out of device for test purposes.

Signed-off-by: Przemyslaw Bida <przemyslaw.bida@nordicsemi.no>
(cherry picked from commit 63e1bb41b103426a15b53e2dcaaf53655b3bafb8)
---
 drivers/ieee802154/Kconfig                    |  1 +
 modules/openthread/Kconfig.features           |  1 -
 modules/openthread/platform/diag.c            | 37 +++++++++++++++++++
 modules/openthread/platform/platform-zephyr.h |  9 ++++-
 modules/openthread/platform/radio.c           | 29 +++++++++++++++
 5 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/drivers/ieee802154/Kconfig b/drivers/ieee802154/Kconfig
index af405551f63..629b492a579 100644
--- a/drivers/ieee802154/Kconfig
+++ b/drivers/ieee802154/Kconfig
@@ -102,6 +102,7 @@ config IEEE802154_SELECTIVE_TXCHANNEL
 
 config IEEE802154_CARRIER_FUNCTIONS
 	bool "Support for carrier functions"
+	default y if OPENTHREAD_DIAG
 	help
 	  Enable support for functions such as modulated carrier and continuous carrier.
 
diff --git a/modules/openthread/Kconfig.features b/modules/openthread/Kconfig.features
index 514b9b85745..ccdd3236d38 100644
--- a/modules/openthread/Kconfig.features
+++ b/modules/openthread/Kconfig.features
@@ -136,7 +136,6 @@ config OPENTHREAD_DHCP6_SERVER
 
 config OPENTHREAD_DIAG
 	bool "Diagnostic functions support"
-	depends on IEEE802154_CARRIER_FUNCTIONS
 	help
 	  Enable OpenThread CLI diagnostic commands
 
diff --git a/modules/openthread/platform/diag.c b/modules/openthread/platform/diag.c
index b92e34209b8..23ea3b97986 100644
--- a/modules/openthread/platform/diag.c
+++ b/modules/openthread/platform/diag.c
@@ -7,9 +7,11 @@
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 
+#include <openthread/error.h>
 #include <openthread/platform/diag.h>
 
 #include "platform-zephyr.h"
+#include "zephyr/sys/util.h"
 
 /**
  * Diagnostics mode variables.
@@ -19,6 +21,8 @@ static bool sDiagMode;
 static void *sDiagCallbackContext;
 static otPlatDiagOutputCallback sDiagOutputCallback;
 
+static otError startModCarrier(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[]);
+
 static void diag_output(const char *aFormat, ...)
 {
 	va_list args;
@@ -47,6 +51,12 @@ otError otPlatDiagProcess(otInstance *aInstance, uint8_t aArgsLength, char *aArg
 	ARG_UNUSED(aInstance);
 	ARG_UNUSED(aArgsLength);
 
+#if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
+	if (strcmp(aArgs[0], "modcarrier") == 0) {
+		return startModCarrier(aInstance, aArgsLength - 1, aArgs + 1);
+	}
+#endif
+
 	/* Add more platform specific diagnostics features here. */
 	diag_output("diag feature '%s' is not supported\r\n", aArgs[0]);
 
@@ -276,3 +286,30 @@ otError otPlatDiagGpioGetMode(uint32_t aGpio, otGpioMode *aMode)
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(openthread_config) && \
 	* DT_NODE_HAS_PROP(DT_COMPAT_GET_ANY_STATUS_OKAY(openthread_config), diag_gpios)
 	*/
+
+#if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
+
+static otError startModCarrier(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[])
+{
+	ARG_UNUSED(aInstance);
+	ARG_UNUSED(aArgsLength);
+
+	bool enable = true;
+	uint8_t data[OT_RADIO_FRAME_MAX_SIZE + 1];
+
+	if (aArgsLength <= 0) {
+		return OT_ERROR_INVALID_ARGS;
+	}
+
+	if (strcmp(aArgs[0], "stop") == 0) {
+		enable = false;
+	} else {
+		if (hex2bin(aArgs[0], strlen(aArgs[0]), data, ARRAY_SIZE(data)) == 0) {
+			return OT_ERROR_INVALID_ARGS;
+		}
+	}
+
+	return platformRadioTransmitModulatedCarrier(aInstance, enable, data);
+}
+
+#endif
diff --git a/modules/openthread/platform/platform-zephyr.h b/modules/openthread/platform/platform-zephyr.h
index 94fd04d7057..ca25fedf2b1 100644
--- a/modules/openthread/platform/platform-zephyr.h
+++ b/modules/openthread/platform/platform-zephyr.h
@@ -77,13 +77,20 @@ uint16_t platformRadioChannelGet(otInstance *aInstance);
 otError platformRadioTransmitCarrier(otInstance *aInstance, bool aEnable);
 #endif /* CONFIG_IEEE802154_CARRIER_FUNCTIONS */
 
+#if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
+/**
+ * Start/stop modulated carrier wave transmission.
+ */
+otError platformRadioTransmitModulatedCarrier(otInstance *aInstance, bool aEnable,
+					      const uint8_t *aData);
+#endif
+
 /**
  * This function initializes the random number service used by OpenThread.
  *
  */
 void platformRandomInit(void);
 
-
 /**
  *  Initialize platform Shell driver.
  */
diff --git a/modules/openthread/platform/radio.c b/modules/openthread/platform/radio.c
index 33fc7b42bbf..73f6f4dc9cc 100644
--- a/modules/openthread/platform/radio.c
+++ b/modules/openthread/platform/radio.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include <openthread/error.h>
 #define LOG_MODULE_NAME net_otPlat_radio
 
 #include <zephyr/logging/log.h>
@@ -832,6 +833,34 @@ otError platformRadioTransmitCarrier(otInstance *aInstance, bool aEnable)
 
 	return OT_ERROR_NONE;
 }
+
+otError platformRadioTransmitModulatedCarrier(otInstance *aInstance, bool aEnable,
+					      const uint8_t *aData)
+{
+	if (radio_api->modulated_carrier == NULL) {
+		return OT_ERROR_NOT_IMPLEMENTED;
+	}
+
+	if (aEnable && sState == OT_RADIO_STATE_RECEIVE) {
+		if (aData == NULL) {
+			return OT_ERROR_INVALID_ARGS;
+		}
+
+		radio_api->set_txpower(radio_dev, get_transmit_power_for_channel(channel));
+
+		if (radio_api->modulated_carrier(radio_dev, aData) != 0) {
+			return OT_ERROR_FAILED;
+		}
+		sState = OT_RADIO_STATE_TRANSMIT;
+	} else if ((!aEnable) && sState == OT_RADIO_STATE_TRANSMIT) {
+		return otPlatRadioReceive(aInstance, channel);
+	} else {
+		return OT_ERROR_INVALID_STATE;
+	}
+
+	return OT_ERROR_NONE;
+}
+
 #endif /* CONFIG_IEEE802154_CARRIER_FUNCTIONS */
 
 otRadioState otPlatRadioGetState(otInstance *aInstance)

From 5503683318f643737870905d75dbc8de5d08343e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Tue, 19 Nov 2024 14:22:58 +0100
Subject: [PATCH 0848/2913] [nrf fromlist] dts: common: nordic: Add PDM to
 nrf54h20 dts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added pdm0 node to nrf54h20 devicetree with proper bindings.

Upstream PR #: 81588

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 dts/bindings/audio/nordic,nrf-pdm.yaml | 2 +-
 dts/common/nordic/nrf54h20.dtsi        | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/dts/bindings/audio/nordic,nrf-pdm.yaml b/dts/bindings/audio/nordic,nrf-pdm.yaml
index c18d9ceebe8..78b08567b7d 100644
--- a/dts/bindings/audio/nordic,nrf-pdm.yaml
+++ b/dts/bindings/audio/nordic,nrf-pdm.yaml
@@ -5,7 +5,7 @@ description: Nordic PDM (Pulse Density Modulation interface)
 
 compatible: "nordic,nrf-pdm"
 
-include: [base.yaml, pinctrl-device.yaml]
+include: ["base.yaml", "pinctrl-device.yaml", "memory-region.yaml", "nordic-clockpin.yaml"]
 
 properties:
   reg:
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index a9523f15465..4ef0a05a302 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -905,6 +905,15 @@
 				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
+			pdm0: pdm@993000 {
+				compatible = "nordic,nrf-pdm";
+				reg = <0x993000 0x1000>;
+				status = "disabled";
+				interrupts = <403 NRF_DEFAULT_IRQ_PRIORITY>;
+				nordic,clockpin-enable = <NRF_FUN_PDM_CLK>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
+			};
+
 			qdec130: qdec@994000 {
 				compatible = "nordic,nrf-qdec";
 				reg = <0x994000 0x1000>;

From a8ca36c91a813597f57d1f16a26292232827b74d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Tue, 19 Nov 2024 14:25:05 +0100
Subject: [PATCH 0849/2913] [nrf fromlist] drivers: audio: dmic_nrfx: Add DMM
 support to driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added support for DMM in PDM drivers in order to use it
with nRF54H20.

Upstream PR #: 81588

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 drivers/audio/dmic_nrfx_pdm.c | 70 ++++++++++++++++++++++++++++-------
 1 file changed, 56 insertions(+), 14 deletions(-)

diff --git a/drivers/audio/dmic_nrfx_pdm.c b/drivers/audio/dmic_nrfx_pdm.c
index 971fd902665..98183e23254 100644
--- a/drivers/audio/dmic_nrfx_pdm.c
+++ b/drivers/audio/dmic_nrfx_pdm.c
@@ -8,17 +8,25 @@
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
+#include <dmm.h>
 #include <nrfx_pdm.h>
 
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
 LOG_MODULE_REGISTER(dmic_nrfx_pdm, CONFIG_AUDIO_DMIC_LOG_LEVEL);
 
+#if CONFIG_SOC_SERIES_NRF54HX
+#define DMIC_NRFX_CLOCK_FREQ 8*1000*1000UL
+#else
+#define DMIC_NRFX_CLOCK_FREQ 32*1000*1000UL
+#endif
+
 struct dmic_nrfx_pdm_drv_data {
 	const nrfx_pdm_t *pdm;
 	struct onoff_manager *clk_mgr;
 	struct onoff_client clk_cli;
 	struct k_mem_slab *mem_slab;
+	void *mem_slab_buffer;
 	uint32_t block_size;
 	struct k_msgq rx_queue;
 	bool request_clock : 1;
@@ -36,17 +44,25 @@ struct dmic_nrfx_pdm_drv_cfg {
 		PCLK32M_HFXO,
 		ACLK
 	} clk_src;
+	void *mem_reg;
 };
 
-static void free_buffer(struct dmic_nrfx_pdm_drv_data *drv_data, void *buffer)
+static void free_buffer(struct dmic_nrfx_pdm_drv_data *drv_data)
+{
+	k_mem_slab_free(drv_data->mem_slab, drv_data->mem_slab_buffer);
+	LOG_DBG("Freed buffer %p", drv_data->mem_slab_buffer);
+}
+
+static void stop_pdm(struct dmic_nrfx_pdm_drv_data *drv_data)
 {
-	k_mem_slab_free(drv_data->mem_slab, buffer);
-	LOG_DBG("Freed buffer %p", buffer);
+	drv_data->stopping = true;
+	nrfx_pdm_stop(drv_data->pdm);
 }
 
 static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 {
 	struct dmic_nrfx_pdm_drv_data *drv_data = dev->data;
+	const struct dmic_nrfx_pdm_drv_cfg *drv_cfg = dev->config;
 	int ret;
 	bool stop = false;
 
@@ -54,11 +70,18 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 		void *buffer;
 		nrfx_err_t err;
 
-		ret = k_mem_slab_alloc(drv_data->mem_slab, &buffer, K_NO_WAIT);
+		ret = k_mem_slab_alloc(drv_data->mem_slab, &drv_data->mem_slab_buffer, K_NO_WAIT);
 		if (ret < 0) {
 			LOG_ERR("Failed to allocate buffer: %d", ret);
 			stop = true;
 		} else {
+			ret = dmm_buffer_in_prepare(drv_cfg->mem_reg, drv_data->mem_slab_buffer,
+						    drv_data->block_size, &buffer);
+			if (ret < 0) {
+				LOG_ERR("Failed to prepare buffer: %d", ret);
+				stop_pdm(drv_data);
+				return;
+			}
 			err = nrfx_pdm_buffer_set(drv_data->pdm, buffer, drv_data->block_size / 2);
 			if (err != NRFX_SUCCESS) {
 				LOG_ERR("Failed to set buffer: 0x%08x", err);
@@ -69,7 +92,14 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 
 	if (drv_data->stopping) {
 		if (evt->buffer_released) {
-			free_buffer(drv_data, evt->buffer_released);
+			ret = dmm_buffer_in_release(drv_cfg->mem_reg, drv_data->mem_slab_buffer,
+						    drv_data->block_size, evt->buffer_released);
+			if (ret < 0) {
+				LOG_ERR("Failed to release buffer: %d", ret);
+				stop_pdm(drv_data);
+				return;
+			}
+			free_buffer(drv_data);
 		}
 
 		if (drv_data->active) {
@@ -79,22 +109,26 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 			}
 		}
 	} else if (evt->buffer_released) {
+		ret = dmm_buffer_in_release(drv_cfg->mem_reg, drv_data->mem_slab_buffer,
+					    drv_data->block_size, evt->buffer_released);
+		if (ret < 0) {
+			LOG_ERR("Failed to release buffer: %d", ret);
+			stop_pdm(drv_data);
+			return;
+		}
 		ret = k_msgq_put(&drv_data->rx_queue,
-				 &evt->buffer_released,
+				 &drv_data->mem_slab_buffer,
 				 K_NO_WAIT);
 		if (ret < 0) {
 			LOG_ERR("No room in RX queue");
 			stop = true;
-
-			free_buffer(drv_data, evt->buffer_released);
+			free_buffer(drv_data);
 		} else {
 			LOG_DBG("Queued buffer %p", evt->buffer_released);
 		}
 	}
-
 	if (stop) {
-		drv_data->stopping = true;
-		nrfx_pdm_stop(drv_data->pdm);
+		stop_pdm(drv_data);
 	}
 }
 
@@ -168,7 +202,7 @@ static bool check_pdm_frequencies(const struct dmic_nrfx_pdm_drv_cfg *drv_cfg,
 		better_found = true;
 	}
 #else
-	if (IS_ENABLED(CONFIG_SOC_SERIES_NRF53X)) {
+	if (IS_ENABLED(CONFIG_SOC_SERIES_NRF53X) || IS_ENABLED(CONFIG_SOC_SERIES_NRF54HX)) {
 		const uint32_t src_freq =
 			(NRF_PDM_HAS_MCLKCONFIG && drv_cfg->clk_src == ACLK)
 			/* The DMIC_NRFX_PDM_DEVICE() macro contains build
@@ -180,9 +214,13 @@ static bool check_pdm_frequencies(const struct dmic_nrfx_pdm_drv_cfg *drv_cfg,
 			 * not defined (this expression will be eventually
 			 * optimized away then).
 			 */
+			/* TODO : PS does not provide correct formula for nRF54H20 PDM_CLK.
+			 * Assume that master clock source frequency is 8 MHz. Remove once
+			 * correct formula is found.
+			 */
 			? DT_PROP_OR(DT_NODELABEL(clock), hfclkaudio_frequency,
 				     0)
-			: 32*1000*1000UL;
+			: DMIC_NRFX_CLOCK_FREQ;
 		uint32_t req_freq = req_rate * ratio;
 		/* As specified in the nRF5340 PS:
 		 *
@@ -562,6 +600,7 @@ static int dmic_nrfx_pdm_read(const struct device *dev,
 	return ret;
 }
 
+#if CONFIG_CLOCK_CONTROL_NRF
 static void init_clock_manager(const struct device *dev)
 {
 	struct dmic_nrfx_pdm_drv_data *drv_data = dev->data;
@@ -581,6 +620,7 @@ static void init_clock_manager(const struct device *dev)
 	drv_data->clk_mgr = z_nrf_clock_control_get_onoff(subsys);
 	__ASSERT_NO_MSG(drv_data->clk_mgr != NULL);
 }
+#endif
 
 static const struct _dmic_ops dmic_ops = {
 	.configure = dmic_nrfx_pdm_configure,
@@ -609,7 +649,8 @@ static const struct _dmic_ops dmic_ops = {
 		k_msgq_init(&dmic_nrfx_pdm_data##idx.rx_queue,		     \
 			    (char *)rx_msgs##idx, sizeof(void *),	     \
 			    ARRAY_SIZE(rx_msgs##idx));			     \
-		init_clock_manager(dev);				     \
+		IF_ENABLED(CONFIG_CLOCK_CONTROL_NRF,			     \
+			   (init_clock_manager(dev);))			     \
 		return 0;						     \
 	}								     \
 	static void event_handler##idx(const nrfx_pdm_evt_t *evt)	     \
@@ -624,6 +665,7 @@ static const struct _dmic_ops dmic_ops = {
 		.nrfx_def_cfg.skip_psel_cfg = true,			     \
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(PDM(idx)),		     \
 		.clk_src = PDM_CLK_SRC(idx),				     \
+		.mem_reg = DMM_DEV_TO_REG(PDM(idx)),			     \
 	};								     \
 	BUILD_ASSERT(PDM_CLK_SRC(idx) != ACLK || NRF_PDM_HAS_MCLKCONFIG,     \
 		"Clock source ACLK is not available.");			     \

From 6d04ddbedbe373b5d2bae3ad7e78ab9329034c4f Mon Sep 17 00:00:00 2001
From: Juha Sunnari <juha.sunnari@nordicsemi.no>
Date: Mon, 11 Nov 2024 10:50:46 +0200
Subject: [PATCH 0850/2913] [nrf fromtree] logging: frontends: stmesp:
 alternate message output option

Add an alternate message output option in which messages are
ended with an additional zero data byte with marker and timestamp.
Can be used to maintain compatibility with certain decoders.

Signed-off-by: Juha Sunnari <juha.sunnari@nordicsemi.no>
(cherry picked from commit 51bc60e142aef8fe63256e2ad89d33d5326c5a8c)
---
 subsys/logging/frontends/Kconfig              |  8 +++++
 .../logging/frontends/log_frontend_stmesp.c   | 32 +++++++++++++++----
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/subsys/logging/frontends/Kconfig b/subsys/logging/frontends/Kconfig
index e35e252ba2b..ec045846806 100644
--- a/subsys/logging/frontends/Kconfig
+++ b/subsys/logging/frontends/Kconfig
@@ -73,6 +73,14 @@ config LOG_FRONTEND_STMESP_GUARANTEED_ACCESS
 	  When enabled, accessing STMESP registers will stall if write cannot be
 	  performed (e.g. ETR buffer is full).
 
+config LOG_FRONTEND_STMESP_MSG_END_TIMESTAMP
+	bool "Generate timestamp and marker at message end"
+	help
+	  Generate a zero data byte with timestamp and marker at message end,
+	  instead of generating a timestamp and marker at message start and
+	  a flag at end. This can be used to maintain compatibility with
+	  certain decoders.
+
 endif # LOG_FRONTEND_STMESP
 
 config LOG_FRONTEND_STMESP_DEMUX
diff --git a/subsys/logging/frontends/log_frontend_stmesp.c b/subsys/logging/frontends/log_frontend_stmesp.c
index 4042fac853c..89a2701d92d 100644
--- a/subsys/logging/frontends/log_frontend_stmesp.c
+++ b/subsys/logging/frontends/log_frontend_stmesp.c
@@ -314,7 +314,11 @@ static inline int16_t get_source_id(const void *source)
 
 static void packet_end(STMESP_Type *stm_esp)
 {
-	STM_FLAG(stm_esp);
+	if (IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_MSG_END_TIMESTAMP)) {
+		STM_D8(stm_esp, 0, true, true);
+	} else {
+		STM_FLAG(stm_esp);
+	}
 	atomic_set(&new_data, 1);
 }
 
@@ -365,7 +369,11 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
 			return;
 		}
 
-		STM_D32(stm_esp, hdr.raw, use_timestamp, true);
+		if (IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_MSG_END_TIMESTAMP)) {
+			STM_D32(stm_esp, hdr.raw, false, false);
+		} else {
+			STM_D32(stm_esp, hdr.raw, use_timestamp, true);
+		}
 		(void)cbprintf_package_convert(package, desc.package_len, package_cb, stm_esp,
 					       flags, strl, ARRAY_SIZE(strl));
 		write_data(sname, sname_len, stm_esp);
@@ -414,7 +422,11 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
 			return;
 		}
 
-		STM_D32(stm_esp, dict_desc.raw, true, true);
+		if (IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_MSG_END_TIMESTAMP)) {
+			STM_D32(stm_esp, dict_desc.raw, false, false);
+		} else {
+			STM_D32(stm_esp, dict_desc.raw, true, true);
+		}
 		(void)cbprintf_package_convert(package, desc.package_len, package_cb, stm_esp,
 					       flags, NULL, 0);
 		if (data) {
@@ -462,7 +474,11 @@ static inline void msg_start(STMESP_Type *stm_esp, uint32_t level, const void *s
 {
 	union stm_log_dict_hdr dict_desc = DICT_HDR_INITIALIZER(level, get_source_id(source), 0);
 
-	STM_D32(stm_esp, dict_desc.raw, true, true);
+	if (IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_MSG_END_TIMESTAMP)) {
+		STM_D32(stm_esp, dict_desc.raw, false, false);
+	} else {
+		STM_D32(stm_esp, dict_desc.raw, true, true);
+	}
 	STM_D32(stm_esp, package_hdr, false, false);
 	STM_D32(stm_esp, (uint32_t)fmt, false, false);
 }
@@ -611,8 +627,12 @@ int log_frontend_stmesp_etr_ready(void)
 	early_buf_read_mode();
 
 	while ((len = early_buf_get_data((void **)&buf)) > 0) {
-		/* Write first word with Marked and timestamp. */
-		STM_D32(stm_esp, *buf, true, true);
+		if (IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_MSG_END_TIMESTAMP)) {
+			STM_D32(stm_esp, *buf, false, false);
+		} else {
+			/* Write first word with Marked and timestamp. */
+			STM_D32(stm_esp, *buf, true, true);
+		}
 		buf++;
 		len -= sizeof(uint32_t);
 

From 711346aa377a65263784cd0d37efc9230e68229b Mon Sep 17 00:00:00 2001
From: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Date: Thu, 19 Sep 2024 13:02:57 +0200
Subject: [PATCH 0851/2913] [nrf noup] drivers: flash: Allow reading secure mem
 by nrf_rram.

fixup! [nrf noup] tree-wide: support NCS Partition Manager (PM) definitions

To read the secure memory we need to use soc_secure_mem_read
function instead of memcpy.

This commit allows to use the soc_secure_mem_read function
if the CONFIG_TRUSTED_EXECUTION_NONSECURE and PARTITION_MANAGER
is enabled.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
---
 drivers/flash/soc_flash_nrf_rram.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/flash/soc_flash_nrf_rram.c b/drivers/flash/soc_flash_nrf_rram.c
index 35a6c98862c..b697df505b3 100644
--- a/drivers/flash/soc_flash_nrf_rram.c
+++ b/drivers/flash/soc_flash_nrf_rram.c
@@ -54,6 +54,11 @@ LOG_MODULE_REGISTER(flash_nrf_rram, CONFIG_FLASH_LOG_LEVEL);
 #define WRITE_BLOCK_SIZE_FROM_DT DT_PROP(RRAM, write_block_size)
 #define ERASE_VALUE              0xFF
 
+#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER
+#include <soc_secure.h>
+#include <pm_config.h>
+#endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER */
+
 #ifdef CONFIG_MULTITHREADING
 static struct k_sem sem_lock;
 #define SYNC_INIT()   k_sem_init(&sem_lock, 1, 1)
@@ -279,6 +284,12 @@ static int nrf_rram_read(const struct device *dev, off_t addr, void *data, size_
 	}
 	addr += RRAM_START;
 
+#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER && PM_APP_ADDRESS
+	if (addr < PM_APP_ADDRESS) {
+		return soc_secure_mem_read(data, (void *)addr, len);
+	}
+#endif
+
 	memcpy(data, (void *)addr, len);
 
 	return 0;

From 32c4684c890207041cd42982e483d8cd749ad460 Mon Sep 17 00:00:00 2001
From: Fabian Blatz <fabianblatz@gmail.com>
Date: Thu, 19 Sep 2024 16:26:45 +0200
Subject: [PATCH 0852/2913] [nrf fromtree] west: commands: runners: canopen:
 add download-buffer-size option

Adds a --download-buffer-size option to the canopen runner to allow
specifying the buffer size of the SDO download.

Signed-off-by: Fabian Blatz <fabianblatz@gmail.com>
(cherry picked from commit 11c83c80fc86f7a82e0857c997422d97fecf976b)

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
---
 .../west_commands/runners/canopen_program.py  | 21 +++++++++++--------
 .../tests/test_canopen_program.py             |  9 ++++++--
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/scripts/west_commands/runners/canopen_program.py b/scripts/west_commands/runners/canopen_program.py
index c51f07891a2..2fb8ba42b01 100644
--- a/scripts/west_commands/runners/canopen_program.py
+++ b/scripts/west_commands/runners/canopen_program.py
@@ -24,10 +24,7 @@
 DEFAULT_PROGRAM_NUMBER = 1
 
 # Program download buffer size in bytes
-PROGRAM_DOWNLOAD_BUFFER_SIZE = 1024
-
-# Program download chunk size in bytes
-PROGRAM_DOWNLOAD_CHUNK_SIZE = PROGRAM_DOWNLOAD_BUFFER_SIZE // 2
+DEFAULT_PROGRAM_DOWNLOAD_BUFFER_SIZE = 1024
 
 # Default timeouts and retries
 DEFAULT_TIMEOUT = 10.0 # seconds
@@ -58,7 +55,7 @@ def __init__(self, cfg, dev_id, can_context=DEFAULT_CAN_CONTEXT,
                  program_number=DEFAULT_PROGRAM_NUMBER, confirm=True,
                  confirm_only=True, timeout=DEFAULT_TIMEOUT,
                  sdo_retries=DEFAULT_SDO_RETRIES, sdo_timeout=DEFAULT_SDO_TIMEOUT,
-                 block_transfer=False):
+                 download_buffer_size=DEFAULT_PROGRAM_DOWNLOAD_BUFFER_SIZE, block_transfer=False):
         if MISSING_REQUIREMENTS:
             raise RuntimeError('one or more Python dependencies were missing; '
                                "see the getting started guide for details on "
@@ -76,7 +73,9 @@ def __init__(self, cfg, dev_id, can_context=DEFAULT_CAN_CONTEXT,
                                                    program_number=program_number,
                                                    sdo_retries=sdo_retries,
                                                    sdo_timeout=sdo_timeout,
-                                                   block_transfer=block_transfer)
+                                                   download_buffer_size=download_buffer_size,
+                                                   block_transfer=block_transfer,
+                                                   )
 
     @classmethod
     def name(cls):
@@ -113,6 +112,8 @@ def do_add_parser(cls, parser):
         parser.add_argument('--sdo-timeout', type=float, default=DEFAULT_SDO_TIMEOUT,
                             help=f'''CANopen SDO response timeout in seconds
                             (default: {DEFAULT_SDO_TIMEOUT})''')
+        parser.add_argument('--download-buffer-size', type=int, default=DEFAULT_PROGRAM_DOWNLOAD_BUFFER_SIZE,
+                            help=f'Program download buffer size in bytes (default: {DEFAULT_PROGRAM_DOWNLOAD_BUFFER_SIZE})')
         parser.add_argument('--block-transfer', default=False, action='store_true',
                             help='Use SDO block transfers (experimental, default: no)')
 
@@ -128,6 +129,7 @@ def do_create(cls, cfg, args):
                                    timeout=args.timeout,
                                    sdo_retries=args.sdo_retries,
                                    sdo_timeout=args.sdo_timeout,
+                                   download_buffer_size=args.download_buffer_size,
                                    block_transfer=args.block_transfer)
 
     def do_run(self, command, **kwargs):
@@ -188,7 +190,7 @@ class CANopenProgramDownloader(object):
     def __init__(self, logger, node_id, can_context=DEFAULT_CAN_CONTEXT,
                  program_number=DEFAULT_PROGRAM_NUMBER,
                  sdo_retries=DEFAULT_SDO_RETRIES, sdo_timeout=DEFAULT_SDO_TIMEOUT,
-                 block_transfer=False):
+                 download_buffer_size=DEFAULT_PROGRAM_DOWNLOAD_BUFFER_SIZE, block_transfer=False):
         super(CANopenProgramDownloader, self).__init__()
         self.logger = logger
         self.node_id = node_id
@@ -201,6 +203,7 @@ def __init__(self, logger, node_id, can_context=DEFAULT_CAN_CONTEXT,
         self.ctrl_sdo = self.node.sdo[H1F51_PROGRAM_CTRL][self.program_number]
         self.swid_sdo = self.node.sdo[H1F56_PROGRAM_SWID][self.program_number]
         self.flash_sdo = self.node.sdo[H1F57_FLASH_STATUS][self.program_number]
+        self.download_buffer_size = download_buffer_size
 
         self.node.sdo.MAX_RETRIES = sdo_retries
         self.node.sdo.RESPONSE_TIMEOUT = sdo_timeout
@@ -276,12 +279,12 @@ def download(self, bin_file):
         try:
             size = os.path.getsize(bin_file)
             infile = open(bin_file, 'rb')
-            outfile = self.data_sdo.open('wb', buffering=PROGRAM_DOWNLOAD_BUFFER_SIZE,
+            outfile = self.data_sdo.open('wb', buffering=self.download_buffer_size,
                                          size=size, block_transfer=self.block_transfer)
 
             progress = Bar('%(percent)d%%', max=size, suffix='%(index)d/%(max)dB')
             while True:
-                chunk = infile.read(PROGRAM_DOWNLOAD_CHUNK_SIZE)
+                chunk = infile.read(self.download_buffer_size // 2)
                 if not chunk:
                     break
                 outfile.write(chunk)
diff --git a/scripts/west_commands/tests/test_canopen_program.py b/scripts/west_commands/tests/test_canopen_program.py
index 934b4ca919c..39aed2d34f4 100644
--- a/scripts/west_commands/tests/test_canopen_program.py
+++ b/scripts/west_commands/tests/test_canopen_program.py
@@ -22,7 +22,7 @@
 # Test cases
 #
 
-TEST_CASES = [(n, x, p, c, o, t, r, s, b)
+TEST_CASES = [(n, x, p, c, o, t, r, s, d, b)
               for n in range(1, 3)
               for x in (None, TEST_ALT_CONTEXT)
               for p in range(1, 3)
@@ -31,6 +31,7 @@
               for t in range(1, 3)
               for r in range(1, 3)
               for s in range(1, 3)
+              for d in [256, 1024]
               for b in range(False, True)]
 
 os_path_isfile = os.path.isfile
@@ -44,7 +45,7 @@ def os_path_isfile_patch(filename):
 @patch('runners.canopen_program.CANopenProgramDownloader')
 def test_canopen_program_create(cpd, test_case, runner_config):
     '''Test CANopen runner created from command line parameters.'''
-    node_id, context, program_number, confirm, confirm_only, timeout, sdo_retries, sdo_timeout, block_transfer = test_case
+    node_id, context, program_number, confirm, confirm_only, timeout, sdo_retries, sdo_timeout, download_buffer_size, block_transfer = test_case
 
     args = ['--node-id', str(node_id)]
     if context is not None:
@@ -61,6 +62,8 @@ def test_canopen_program_create(cpd, test_case, runner_config):
         args.extend(['--sdo-retries', str(sdo_retries)])
     if sdo_timeout:
         args.extend(['--sdo-timeout', str(sdo_timeout)])
+    if download_buffer_size:
+        args.extend(['--download-buffer-size', str(download_buffer_size)])
     if block_transfer:
         args.append('--block_transfer')
 
@@ -84,6 +87,7 @@ def test_canopen_program_create(cpd, test_case, runner_config):
                                      program_number=program_number,
                                      sdo_retries=sdo_retries,
                                      sdo_timeout=sdo_timeout,
+                                     download_buffer_size=download_buffer_size,
                                      block_transfer=block_transfer)
     else:
         assert cpd.call_args == call(node_id=node_id,
@@ -92,6 +96,7 @@ def test_canopen_program_create(cpd, test_case, runner_config):
                                      program_number=program_number,
                                      sdo_retries=sdo_retries,
                                      sdo_timeout=sdo_timeout,
+                                     download_buffer_size=download_buffer_size,
                                      block_transfer=block_transfer)
 
     mock.connect.assert_called_once()

From 9486638a04ff34eddaa8eb4a51fe2ea47ead378c Mon Sep 17 00:00:00 2001
From: Adam Dunkels <adam@dunkels.com>
Date: Wed, 11 Sep 2024 15:42:53 +0100
Subject: [PATCH 0853/2913] [nrf fromtree] runners: jlink: add support for
 J-Link tunnels

This adds support for J-Link tunnels, which run on top of an IP network
and therefore uses the -IP option. J-Link tunnels are identified by a
tunnel: prefix instead of a bare IP address. This change checks for the
presence of such a prefix, and choses the -IP transport option if the
tunnel prefix is found.

This has been tested with J-Link Remote Server v7.98g and the SEGGER
tunnel option.

Signed-off-by: Adam Dunkels <adam@dunkels.com>
(cherry picked from commit 221199e15b85a070b3d81709eee3d533c9f99967)

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
---
 scripts/west_commands/runners/jlink.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/west_commands/runners/jlink.py b/scripts/west_commands/runners/jlink.py
index af4a0fe8787..ce500490349 100644
--- a/scripts/west_commands/runners/jlink.py
+++ b/scripts/west_commands/runners/jlink.py
@@ -36,6 +36,9 @@ def is_ip(ip):
         return False
     return True
 
+def is_tunnel(tunnel):
+    return tunnel.startswith("tunnel:")
+
 class ToggleAction(argparse.Action):
 
     def __call__(self, parser, args, ignored, option):
@@ -247,7 +250,7 @@ def do_run(self, command, **kwargs):
 
         server_cmd = ([self.gdbserver] +
                       ['-select',
-                                           ('ip' if is_ip(self.dev_id) else 'usb') +
+                                           ('ip' if (is_ip(self.dev_id) or is_tunnel(self.dev_id)) else 'usb') +
                                            (f'={self.dev_id}' if self.dev_id else ''),
                        '-port', str(self.gdb_port),
                        '-if', self.iface,
@@ -404,7 +407,7 @@ def flash(self, **kwargs):
                 loader_details = "?" + self.loader
 
             cmd = ([self.commander] +
-                   (['-IP', f'{self.dev_id}'] if is_ip(self.dev_id) else (['-USB', f'{self.dev_id}'] if self.dev_id else [])) +
+                   (['-IP', f'{self.dev_id}'] if (is_ip(self.dev_id) or is_tunnel(self.dev_id)) else (['-USB', f'{self.dev_id}'] if self.dev_id else [])) +
                    (['-nogui', '1'] if self.supports_nogui else []) +
                    ['-if', self.iface,
                     '-speed', self.speed,

From c1f7804897e9074062b218a7831e3eef2e79fe20 Mon Sep 17 00:00:00 2001
From: Yves Vandervennet <yves.vandervennet@nxp.com>
Date: Mon, 28 Oct 2024 16:09:36 -0400
Subject: [PATCH 0854/2913] [nrf fromtree] west: linkserver: change the default
 port number for semihost

LinkServer manages port numbers for gdb and semihost as separate linear
sequences when invoked to debug multi-core applications, e.g the
gdb-server instance for cpu0 will have the default GDB port 3333 and the
next gdb-server instance will be assigned the port 3334. The latter will
conflict with the default port for semihost which is 3334.

This patch changes the default port for semihost to 8888.
Port numbers can be changed when invoking the linkserver runner.

Signed-off-by: Yves Vandervennet <yves.vandervennet@nxp.com>
(cherry picked from commit 7b29b66bd5ff3370409444b36865c9fea7450dfe)

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
---
 scripts/west_commands/runners/linkserver.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/west_commands/runners/linkserver.py b/scripts/west_commands/runners/linkserver.py
index 886e855bb43..60eaafce0ab 100644
--- a/scripts/west_commands/runners/linkserver.py
+++ b/scripts/west_commands/runners/linkserver.py
@@ -18,7 +18,7 @@
 
 DEFAULT_LINKSERVER_EXE = 'Linkserver.exe' if sys.platform == 'win32' else 'LinkServer'
 DEFAULT_LINKSERVER_GDB_PORT =  3333
-DEFAULT_LINKSERVER_SEMIHOST_PORT = 3334
+DEFAULT_LINKSERVER_SEMIHOST_PORT = 8888
 
 class LinkServerBinaryRunner(ZephyrBinaryRunner):
     '''Runner front-end for NXP Linkserver'''
@@ -95,6 +95,7 @@ def do_add_parser(cls, parser):
     @classmethod
     def do_create(cls, cfg, args):
 
+        print("RUNNER - gdb_port = " + str(args.gdb_port) + ", semih port = " + str(args.semihost_port))
         return LinkServerBinaryRunner(cfg, args.device, args.core,
                                  linkserver=args.linkserver,
                                  dt_flash=args.dt_flash,

From ffae05f11b565965d2e03f9765057fe01cd53cdb Mon Sep 17 00:00:00 2001
From: Pieter De Gendt <pieter.degendt@basalte.be>
Date: Wed, 20 Nov 2024 19:39:56 +0100
Subject: [PATCH 0855/2913] [nrf fromtree] scripts: west_commands: runners:
 Remove obsolete pylint ignores

These ignores were added with an older version of pylint and are
either removed or ignored by default.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
(cherry picked from commit aae018be873236a136264c8b65de1397c58cbeb5)

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
---
 scripts/west_commands/runners/intel_cyclonev.py | 1 -
 scripts/west_commands/runners/uf2.py            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/west_commands/runners/intel_cyclonev.py b/scripts/west_commands/runners/intel_cyclonev.py
index c14e20b967f..764ebd7420b 100644
--- a/scripts/west_commands/runners/intel_cyclonev.py
+++ b/scripts/west_commands/runners/intel_cyclonev.py
@@ -174,7 +174,6 @@ def print_gdbserver_message(self):
         self.logger.info('OpenOCD GDB server running on port '
                          f'{self.gdb_port}{thread_msg}')
 
-    # pylint: disable=R0201
     def to_num(self, number):
         dev_match = re.search(r"^\d*\+dev", number)
         dev_version = not dev_match is None
diff --git a/scripts/west_commands/runners/uf2.py b/scripts/west_commands/runners/uf2.py
index 87db248c7bf..0db4f0b9b44 100644
--- a/scripts/west_commands/runners/uf2.py
+++ b/scripts/west_commands/runners/uf2.py
@@ -10,7 +10,7 @@
 from runners.core import ZephyrBinaryRunner, RunnerCaps
 
 try:
-    import psutil  # pylint: disable=unused-import
+    import psutil
     MISSING_PSUTIL = False
 except ImportError:
     # This can happen when building the documentation for the

From 7f7b13201462069f704582acf12f3d36f1ab578a Mon Sep 17 00:00:00 2001
From: Pieter De Gendt <pieter.degendt@basalte.be>
Date: Wed, 20 Nov 2024 19:45:12 +0100
Subject: [PATCH 0856/2913] [nrf fromtree] scripts: west_commands: runners: Fix
 pylint unbound issues

Variables are possibly unbound, initialize to None.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
(cherry picked from commit 25be1501abb11eefa223575c7c148e51adaeccc9)

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
---
 scripts/west_commands/runners/intel_cyclonev.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/west_commands/runners/intel_cyclonev.py b/scripts/west_commands/runners/intel_cyclonev.py
index 764ebd7420b..490beca4da8 100644
--- a/scripts/west_commands/runners/intel_cyclonev.py
+++ b/scripts/west_commands/runners/intel_cyclonev.py
@@ -34,6 +34,10 @@ def __init__(self, cfg, pre_init=None, reset_halt_cmd=DEFAULT_OPENOCD_RESET_HALT
 
         support = path.join(cfg.board_dir, 'support')
 
+        gdb_commands = None
+        gdb_commands2 = None
+        gdb_commands_deb = None
+
         if not config:
             default = path.join(support, 'openocd.cfg')
             default2 = path.join(support, 'download_all.gdb')

From de56519cc8dc19e4cb0aada6a276ae53f05fa8d6 Mon Sep 17 00:00:00 2001
From: Pieter De Gendt <pieter.degendt@basalte.be>
Date: Wed, 20 Nov 2024 12:12:27 +0100
Subject: [PATCH 0857/2913] [nrf fromtree] scripts: west_commands: runners: Fix
 f-string-missing-placeholders (F541)

Constant strings should not be f-strings.

See https://docs.astral.sh/ruff/rules/f-string-missing-placeholders/

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
(cherry picked from commit 7f72dd3a0f338206a8112d7deca89f0f19be2461)

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
---
 scripts/west_commands/runners/linkserver.py | 2 +-
 scripts/west_commands/runners/nrfutil.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/west_commands/runners/linkserver.py b/scripts/west_commands/runners/linkserver.py
index 60eaafce0ab..8179adc1e60 100644
--- a/scripts/west_commands/runners/linkserver.py
+++ b/scripts/west_commands/runners/linkserver.py
@@ -90,7 +90,7 @@ def do_add_parser(cls, parser):
                             {DEFAULT_LINKSERVER_EXE}''')
         # user may need to override settings.
         parser.add_argument('--override', required=False, action='append',
-                            help=f'''configuration overrides as defined bylinkserver. Example: /device/memory/0/location=0xcafecafe''')
+                            help='''configuration overrides as defined bylinkserver. Example: /device/memory/0/location=0xcafecafe''')
 
     @classmethod
     def do_create(cls, cfg, args):
diff --git a/scripts/west_commands/runners/nrfutil.py b/scripts/west_commands/runners/nrfutil.py
index ec1328e4edc..584c5e78349 100644
--- a/scripts/west_commands/runners/nrfutil.py
+++ b/scripts/west_commands/runners/nrfutil.py
@@ -97,7 +97,7 @@ def _exec_batch(self):
                             indent=4) + '\n'
 
         hex_dir = Path(self.hex_).parent
-        json_file = os.fspath(hex_dir / f'generated_nrfutil_batch.json')
+        json_file = os.fspath(hex_dir / 'generated_nrfutil_batch.json')
 
         with open(json_file, "w") as f:
             f.write(batch)

From 195b1b67aec7a775080135733ebf824f3aa7fbc2 Mon Sep 17 00:00:00 2001
From: Pieter De Gendt <pieter.degendt@basalte.be>
Date: Wed, 20 Nov 2024 15:35:46 +0100
Subject: [PATCH 0858/2913] [nrf fromtree] scripts: west_commands: runners: Fix
 bare except (E722 & B904)

Catch explicit exceptions and pass them them to the ValueError

See
https://docs.astral.sh/ruff/rules/bare-except/
https://docs.astral.sh/ruff/rules/raise-without-from-inside-except/

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
(cherry picked from commit f7902bc817d7e3e7655602bc44f0dccc6e09d394)

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
---
 .../west_commands/runners/canopen_program.py  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/scripts/west_commands/runners/canopen_program.py b/scripts/west_commands/runners/canopen_program.py
index 2fb8ba42b01..667a5d3adbb 100644
--- a/scripts/west_commands/runners/canopen_program.py
+++ b/scripts/west_commands/runners/canopen_program.py
@@ -214,8 +214,8 @@ def connect(self):
         '''Connect to CAN network'''
         try:
             self.network.connect(context=self.can_context)
-        except:
-            raise ValueError('Unable to connect to CAN network')
+        except Exception as err:
+            raise ValueError('Unable to connect to CAN network') from err
 
     def disconnect(self):
         '''Disconnect from CAN network'''
@@ -226,15 +226,15 @@ def enter_pre_operational(self):
         self.logger.info("Entering pre-operational mode")
         try:
             self.node.nmt.state = 'PRE-OPERATIONAL'
-        except:
-            raise ValueError('Failed to enter pre-operational mode')
+        except Exception as err:
+            raise ValueError('Failed to enter pre-operational mode') from err
 
     def _ctrl_program(self, cmd):
         '''Write program control command to CANopen object dictionary (0x1f51)'''
         try:
             self.ctrl_sdo.raw = cmd
-        except:
-            raise ValueError('Unable to write control command 0x{:02x}'.format(cmd))
+        except Exception as err:
+            raise ValueError('Unable to write control command 0x{:02x}'.format(cmd)) from err
 
     def stop_program(self):
         '''Write stop control command to CANopen object dictionary (0x1f51)'''
@@ -260,8 +260,8 @@ def swid(self):
         '''Read software identification from CANopen object dictionary (0x1f56)'''
         try:
             swid = self.swid_sdo.raw
-        except:
-            raise ValueError('Failed to read software identification')
+        except Exception as err:
+            raise ValueError('Failed to read software identification') from err
         self.logger.info('Program software identification: 0x{:08x}'.format(swid))
         return swid
 
@@ -269,8 +269,8 @@ def flash_status(self):
         '''Read flash status identification'''
         try:
             status = self.flash_sdo.raw
-        except:
-            raise ValueError('Failed to read flash status identification')
+        except Exception as err:
+            raise ValueError('Failed to read flash status identification') from err
         return status
 
     def download(self, bin_file):
@@ -289,8 +289,8 @@ def download(self, bin_file):
                     break
                 outfile.write(chunk)
                 progress.next(n=len(chunk))
-        except:
-            raise ValueError('Failed to download program')
+        except Exception as err:
+            raise ValueError('Failed to download program') from err
         finally:
             progress.finish()
             infile.close()
@@ -301,8 +301,8 @@ def wait_for_bootup(self, timeout=DEFAULT_TIMEOUT):
         self.logger.info('Waiting for boot-up message...')
         try:
             self.node.nmt.wait_for_bootup(timeout=timeout)
-        except:
-            raise ValueError('Timeout waiting for boot-up message')
+        except Exception as err:
+            raise ValueError('Timeout waiting for boot-up message') from err
 
     def wait_for_flash_status_ok(self, timeout=DEFAULT_TIMEOUT):
         '''Wait for flash status ok'''

From 4300e6ab24b01078c735a376803a4ced38dfbc3c Mon Sep 17 00:00:00 2001
From: Pieter De Gendt <pieter.degendt@basalte.be>
Date: Wed, 20 Nov 2024 16:05:28 +0100
Subject: [PATCH 0859/2913] [nrf fromtree] scripts: west_commands: runners: Fix
 f-string (UP032)

Replace .format() calls with f-strings.

See https://docs.astral.sh/ruff/rules/f-string/

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
(cherry picked from commit 775db0e63a547ceabbf55d44f5f651901e1c36a7)

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
---
 scripts/west_commands/runners/__init__.py     |  2 +-
 .../west_commands/runners/blackmagicprobe.py  | 20 ++++++++-----------
 .../west_commands/runners/canopen_program.py  | 10 +++++-----
 scripts/west_commands/runners/core.py         |  5 ++---
 scripts/west_commands/runners/dfu.py          |  6 +++---
 scripts/west_commands/runners/esp32.py        |  3 +--
 .../west_commands/runners/intel_cyclonev.py   | 10 +++++-----
 scripts/west_commands/runners/jlink.py        |  7 +++----
 scripts/west_commands/runners/linkserver.py   |  5 ++---
 scripts/west_commands/runners/mdb.py          |  6 +++---
 scripts/west_commands/runners/native.py       |  5 ++---
 scripts/west_commands/runners/nios2.py        |  7 +++----
 scripts/west_commands/runners/nrf_common.py   |  9 ++++-----
 scripts/west_commands/runners/nsim.py         |  6 +++---
 scripts/west_commands/runners/pyocd.py        | 18 +++++++----------
 .../west_commands/runners/silabs_commander.py |  2 +-
 scripts/west_commands/runners/stm32flash.py   | 14 ++++++-------
 scripts/west_commands/runners/teensy.py       |  4 ++--
 18 files changed, 62 insertions(+), 77 deletions(-)

diff --git a/scripts/west_commands/runners/__init__.py b/scripts/west_commands/runners/__init__.py
index 6d5539905e3..3af86e74828 100644
--- a/scripts/west_commands/runners/__init__.py
+++ b/scripts/west_commands/runners/__init__.py
@@ -71,6 +71,6 @@ def get_runner_cls(runner):
     for cls in ZephyrBinaryRunner.get_runners():
         if cls.name() == runner:
             return cls
-    raise ValueError('unknown runner "{}"'.format(runner))
+    raise ValueError(f'unknown runner "{runner}"')
 
 __all__ = ['ZephyrBinaryRunner', 'get_runner_cls']
diff --git a/scripts/west_commands/runners/blackmagicprobe.py b/scripts/west_commands/runners/blackmagicprobe.py
index 1c2c8fa0d6a..0ffdd58a9b9 100644
--- a/scripts/west_commands/runners/blackmagicprobe.py
+++ b/scripts/west_commands/runners/blackmagicprobe.py
@@ -170,12 +170,11 @@ def bmp_flash(self, command, **kwargs):
 
         command = (self.gdb +
                    ['-ex', "set confirm off",
-                    '-ex', "target extended-remote {}".format(
-                        self.gdb_serial)] +
+                    '-ex', f"target extended-remote {self.gdb_serial}"] +
                     self.connect_rst_enable_arg +
                    ['-ex', "monitor swdp_scan",
                     '-ex', "attach 1",
-                    '-ex', "load {}".format(flash_file),
+                    '-ex', f"load {flash_file}",
                     '-ex', "kill",
                     '-ex', "quit",
                     '-silent'])
@@ -192,20 +191,18 @@ def bmp_attach(self, command, **kwargs):
         if self.elf_file is None:
             command = (self.gdb +
                        ['-ex', "set confirm off",
-                        '-ex', "target extended-remote {}".format(
-                            self.gdb_serial)] +
+                        '-ex', f"target extended-remote {self.gdb_serial}"] +
                         self.connect_rst_disable_arg +
                        ['-ex', "monitor swdp_scan",
                         '-ex', "attach 1"])
         else:
             command = (self.gdb +
                        ['-ex', "set confirm off",
-                        '-ex', "target extended-remote {}".format(
-                            self.gdb_serial)] +
+                        '-ex', f"target extended-remote {self.gdb_serial}"] +
                         self.connect_rst_disable_arg +
                        ['-ex', "monitor swdp_scan",
                         '-ex', "attach 1",
-                        '-ex', "file {}".format(self.elf_file)])
+                        '-ex', f"file {self.elf_file}"])
         self.check_call_ignore_sigint(command)
 
     def bmp_debug(self, command, **kwargs):
@@ -213,13 +210,12 @@ def bmp_debug(self, command, **kwargs):
             raise ValueError('Cannot debug; elf file is missing')
         command = (self.gdb +
                    ['-ex', "set confirm off",
-                    '-ex', "target extended-remote {}".format(
-                        self.gdb_serial)] +
+                    '-ex', f"target extended-remote {self.gdb_serial}"] +
                     self.connect_rst_enable_arg +
                    ['-ex', "monitor swdp_scan",
                     '-ex', "attach 1",
-                    '-ex', "file {}".format(self.elf_file),
-                    '-ex', "load {}".format(self.elf_file)])
+                    '-ex', f"file {self.elf_file}",
+                    '-ex', f"load {self.elf_file}"])
         self.check_call_ignore_sigint(command)
 
     def do_run(self, command, **kwargs):
diff --git a/scripts/west_commands/runners/canopen_program.py b/scripts/west_commands/runners/canopen_program.py
index 667a5d3adbb..5b4c055fa8b 100644
--- a/scripts/west_commands/runners/canopen_program.py
+++ b/scripts/west_commands/runners/canopen_program.py
@@ -151,8 +151,8 @@ def flash(self, **kwargs):
         if status == 0:
             self.downloader.swid()
         else:
-            self.logger.warning('Flash status 0x{:02x}, '
-                                'skipping software identification'.format(status))
+            self.logger.warning(f'Flash status 0x{status:02x}, '
+                                'skipping software identification')
 
         self.downloader.enter_pre_operational()
 
@@ -172,7 +172,7 @@ def flash(self, **kwargs):
         status = self.downloader.wait_for_flash_status_ok(self.timeout)
         if status != 0:
             raise ValueError('Program download failed: '
-                             'flash status 0x{:02x}'.format(status))
+                             f'flash status 0x{status:02x}')
 
         self.downloader.swid()
         self.downloader.start_program()
@@ -234,7 +234,7 @@ def _ctrl_program(self, cmd):
         try:
             self.ctrl_sdo.raw = cmd
         except Exception as err:
-            raise ValueError('Unable to write control command 0x{:02x}'.format(cmd)) from err
+            raise ValueError(f'Unable to write control command 0x{cmd:02x}') from err
 
     def stop_program(self):
         '''Write stop control command to CANopen object dictionary (0x1f51)'''
@@ -262,7 +262,7 @@ def swid(self):
             swid = self.swid_sdo.raw
         except Exception as err:
             raise ValueError('Failed to read software identification') from err
-        self.logger.info('Program software identification: 0x{:08x}'.format(swid))
+        self.logger.info(f'Program software identification: 0x{swid:08x}')
         return swid
 
     def flash_status(self):
diff --git a/scripts/west_commands/runners/core.py b/scripts/west_commands/runners/core.py
index d216dffcd18..6126cb6a398 100644
--- a/scripts/west_commands/runners/core.py
+++ b/scripts/west_commands/runners/core.py
@@ -482,7 +482,7 @@ def __init__(self, cfg: RunnerConfig):
         self.cfg = cfg
         '''RunnerConfig for this instance.'''
 
-        self.logger = logging.getLogger('runners.{}'.format(self.name()))
+        self.logger = logging.getLogger(f'runners.{self.name()}')
         '''logging.Logger for this instance.'''
 
     @staticmethod
@@ -701,8 +701,7 @@ def run(self, command: str, **kwargs):
         This is the main entry point to this runner.'''
         caps = self.capabilities()
         if command not in caps.commands:
-            raise ValueError('runner {} does not implement command {}'.format(
-                self.name(), command))
+            raise ValueError(f'runner {self.name()} does not implement command {command}')
         self.do_run(command, **kwargs)
 
     @abc.abstractmethod
diff --git a/scripts/west_commands/runners/dfu.py b/scripts/west_commands/runners/dfu.py
index 875780e4802..1a02ff4b839 100644
--- a/scripts/west_commands/runners/dfu.py
+++ b/scripts/west_commands/runners/dfu.py
@@ -25,11 +25,11 @@ def __init__(self, cfg, dev_id, alt, img, exe='dfu-util',
         self.dev_id = dev_id # Used only for error checking in do_run
         self.alt = alt
         self.img = img
-        self.cmd = [exe, '-d,{}'.format(dev_id)]
+        self.cmd = [exe, f'-d,{dev_id}']
         try:
-            self.list_pattern = ', alt={},'.format(int(self.alt))
+            self.list_pattern = f', alt={int(self.alt)},'
         except ValueError:
-            self.list_pattern = ', name="{}",'.format(self.alt)
+            self.list_pattern = f', name="{self.alt}",'
 
         if dfuse_config is None:
             self.dfuse = False
diff --git a/scripts/west_commands/runners/esp32.py b/scripts/west_commands/runners/esp32.py
index 8a0d5c8ae75..ce323ab256e 100644
--- a/scripts/west_commands/runners/esp32.py
+++ b/scripts/west_commands/runners/esp32.py
@@ -132,6 +132,5 @@ def do_run(self, command, **kwargs):
         else:
             cmd_flash.extend([self.app_address, self.app_bin])
 
-        self.logger.info("Flashing esp32 chip on {} ({}bps)".
-                         format(self.device, self.baud))
+        self.logger.info(f"Flashing esp32 chip on {self.device} ({self.baud}bps)")
         self.check_call(cmd_flash)
diff --git a/scripts/west_commands/runners/intel_cyclonev.py b/scripts/west_commands/runners/intel_cyclonev.py
index 490beca4da8..c1e08f6de9e 100644
--- a/scripts/west_commands/runners/intel_cyclonev.py
+++ b/scripts/west_commands/runners/intel_cyclonev.py
@@ -243,10 +243,10 @@ def do_flash_elf(self, **kwargs):
                       pre_init_cmd)
         temp_str = '--cd=' + os.environ.get('ZEPHYR_BASE') #Go to Zephyr base Dir
         gdb_cmd = (self.gdb_cmd + self.tui_arg +
-                   [temp_str,'-ex', 'target extended-remote localhost:{}'.format(self.gdb_port) , '-batch']) #Execute First Script in Zephyr Base Dir
+                   [temp_str,'-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch']) #Execute First Script in Zephyr Base Dir
 
         gdb_cmd2 = (self.gdb_cmd + self.tui_arg +
-                   ['-ex', 'target extended-remote localhost:{}'.format(self.gdb_port) , '-batch'])	#Execute Second Script in Build Dir
+                   ['-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch'])	#Execute Second Script in Build Dir
         echo = ['echo']
         if self.gdb_init is not None:
             for i in self.gdb_init:
@@ -298,16 +298,16 @@ def do_attach_debug(self, command, **kwargs):
                       pre_init_cmd)
 
         gdb_attach = (self.gdb_cmd + self.tui_arg +
-                   ['-ex', 'target extended-remote :{}'.format(self.gdb_port),
+                   ['-ex', f'target extended-remote :{self.gdb_port}',
                     self.elf_name, '-q'])
 
         temp_str = '--cd=' + os.environ.get('ZEPHYR_BASE') #Go to Zephyr base Dir
 
         gdb_cmd = (self.gdb_cmd + self.tui_arg +
-                   [temp_str,'-ex', 'target extended-remote localhost:{}'.format(self.gdb_port) , '-batch']) #Execute First Script in Zephyr Base Dir
+                   [temp_str,'-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch']) #Execute First Script in Zephyr Base Dir
 
         gdb_cmd2 = (self.gdb_cmd + self.tui_arg +
-                   ['-ex', 'target extended-remote :{}'.format(self.gdb_port) , '-batch'])	#Execute Second Script in Build Dir
+                   ['-ex', f'target extended-remote :{self.gdb_port}' , '-batch'])	#Execute Second Script in Build Dir
 
 
         if self.gdb_init is not None:
diff --git a/scripts/west_commands/runners/jlink.py b/scripts/west_commands/runners/jlink.py
index ce500490349..3d5727991e2 100644
--- a/scripts/west_commands/runners/jlink.py
+++ b/scripts/west_commands/runners/jlink.py
@@ -125,8 +125,7 @@ def do_add_parser(cls, parser):
                             help='custom gdb host, defaults to the empty string '
                             'and runs a gdb server')
         parser.add_argument('--gdb-port', default=DEFAULT_JLINK_GDB_PORT,
-                            help='pyocd gdb port, defaults to {}'.format(
-                                DEFAULT_JLINK_GDB_PORT))
+                            help=f'pyocd gdb port, defaults to {DEFAULT_JLINK_GDB_PORT}')
         parser.add_argument('--commander', default=DEFAULT_JLINK_EXE,
                             help=f'''J-Link Commander, default is
                             {DEFAULT_JLINK_EXE}''')
@@ -307,7 +306,7 @@ def do_run(self, command, **kwargs):
             client_cmd = (self.gdb_cmd +
                           self.tui_arg +
                           [elf_name] +
-                          ['-ex', 'target remote {}:{}'.format(self.gdb_host, self.gdb_port)])
+                          ['-ex', f'target remote {self.gdb_host}:{self.gdb_port}'])
             if command == 'debug':
                 client_cmd += ['-ex', 'monitor halt',
                                '-ex', 'monitor reset',
@@ -416,7 +415,7 @@ def flash(self, **kwargs):
                    (['-nogui', '1'] if self.supports_nogui else []) +
                    self.tool_opt)
 
-            self.logger.info('Flashing file: {}'.format(flash_file))
+            self.logger.info(f'Flashing file: {flash_file}')
             kwargs = {}
             if not self.logger.isEnabledFor(logging.DEBUG):
                 kwargs['stdout'] = subprocess.DEVNULL
diff --git a/scripts/west_commands/runners/linkserver.py b/scripts/west_commands/runners/linkserver.py
index 8179adc1e60..9ffcdf63605 100644
--- a/scripts/west_commands/runners/linkserver.py
+++ b/scripts/west_commands/runners/linkserver.py
@@ -78,8 +78,7 @@ def do_add_parser(cls, parser):
                             help='if given, GDB uses -tui')
 
         parser.add_argument('--gdb-port', default=DEFAULT_LINKSERVER_GDB_PORT,
-                            help='gdb port to open, defaults to {}'.format(
-                               DEFAULT_LINKSERVER_GDB_PORT))
+                            help=f'gdb port to open, defaults to {DEFAULT_LINKSERVER_GDB_PORT}')
 
         parser.add_argument('--semihost-port', default=DEFAULT_LINKSERVER_SEMIHOST_PORT,
                             help='semihost port to open, defaults to the empty string '
@@ -147,7 +146,7 @@ def do_run(self, command, **kwargs):
                 gdb_cmd = ([self.gdb_cmd] +
                            self.tui_arg +
                            [self.elf_name] +
-                           ['-ex', 'target remote {}:{}'.format(self.gdb_host, self.gdb_port)])
+                           ['-ex', f'target remote {self.gdb_host}:{self.gdb_port}'])
 
                 if command == 'debug':
                     gdb_cmd += [ '-ex', 'load', '-ex', 'monitor reset']
diff --git a/scripts/west_commands/runners/mdb.py b/scripts/west_commands/runners/mdb.py
index 6dbffa30dbd..bef14effbdd 100644
--- a/scripts/west_commands/runners/mdb.py
+++ b/scripts/west_commands/runners/mdb.py
@@ -68,7 +68,7 @@ def mdb_do_run(mdb_runner, command):
             if mdb_runner.dig_device: mdb_target += [mdb_runner.dig_device]
         else:
             # \todo: add support of other debuggers
-            raise ValueError('unsupported jtag adapter {}'.format(mdb_runner.jtag))
+            raise ValueError(f'unsupported jtag adapter {mdb_runner.jtag}')
 
     if command == 'flash':
         if is_flash_cmd_need_exit_immediately(mdb_runner):
@@ -85,7 +85,7 @@ def mdb_do_run(mdb_runner, command):
     elif 1 < mdb_runner.cores <= 12:
         mdb_multifiles = '-multifiles='
         for i in range(mdb_runner.cores):
-            mdb_sub_cmd = [commander] + ['-pset={}'.format(i + 1), '-psetname=core{}'.format(i)]
+            mdb_sub_cmd = [commander] + [f'-pset={i + 1}', f'-psetname=core{i}']
             # -prop=download=2 is used for SMP application debug, only the 1st core
             # will download the shared image.
             if i > 0: mdb_sub_cmd += ['-prop=download=2']
@@ -100,7 +100,7 @@ def mdb_do_run(mdb_runner, command):
 
         mdb_cmd = [commander] + [mdb_multifiles] + mdb_run
     else:
-        raise ValueError('unsupported cores {}'.format(mdb_runner.cores))
+        raise ValueError(f'unsupported cores {mdb_runner.cores}')
 
     mdb_runner.call(mdb_cmd, cwd=mdb_runner.build_dir)
 
diff --git a/scripts/west_commands/runners/native.py b/scripts/west_commands/runners/native.py
index 2cbcf60d3ab..c2cd414f012 100644
--- a/scripts/west_commands/runners/native.py
+++ b/scripts/west_commands/runners/native.py
@@ -43,8 +43,7 @@ def do_add_parser(cls, parser: argparse.ArgumentParser):
         parser.add_argument('--tui', default=False, action='store_true',
                             help='if given, GDB uses -tui')
         parser.add_argument('--gdb-port', default=DEFAULT_GDB_PORT,
-                            help='gdb port, defaults to {}'.format(
-                                DEFAULT_GDB_PORT))
+                            help=f'gdb port, defaults to {DEFAULT_GDB_PORT}')
 
     @classmethod
     def do_create(cls, cfg: RunnerConfig, args: argparse.Namespace) -> ZephyrBinaryRunner:
@@ -76,6 +75,6 @@ def do_debug(self, **kwargs):
         self.check_call(cmd)
 
     def do_debugserver(self, **kwargs):
-        cmd = (['gdbserver', ':{}'.format(self.gdb_port), self.cfg.exe_file])
+        cmd = (['gdbserver', f':{self.gdb_port}', self.cfg.exe_file])
 
         self.check_call(cmd)
diff --git a/scripts/west_commands/runners/nios2.py b/scripts/west_commands/runners/nios2.py
index aface007b31..4d84a775ec5 100644
--- a/scripts/west_commands/runners/nios2.py
+++ b/scripts/west_commands/runners/nios2.py
@@ -62,7 +62,7 @@ def flash(self, **kwargs):
             raise ValueError('Cannot flash; --cpu-sof not given.')
         self.ensure_output('hex')
 
-        self.logger.info('Flashing file: {}'.format(self.hex_name))
+        self.logger.info(f'Flashing file: {self.hex_name}')
         cmd = [self.quartus_py,
                '--sof', self.cpu_sof,
                '--kernel', self.hex_name]
@@ -70,8 +70,7 @@ def flash(self, **kwargs):
         self.check_call(cmd)
 
     def print_gdbserver_message(self, gdb_port):
-        self.logger.info('Nios II GDB server running on port {}'.
-                         format(gdb_port))
+        self.logger.info(f'Nios II GDB server running on port {gdb_port}')
 
     def debug_debugserver(self, command, **kwargs):
         # Per comments in the shell script, the NIOSII GDB server
@@ -100,7 +99,7 @@ def debug_debugserver(self, command, **kwargs):
             gdb_cmd = (self.gdb_cmd +
                        self.tui_arg +
                        [self.elf_name,
-                        '-ex', 'target remote :{}'.format(gdb_port)])
+                        '-ex', f'target remote :{gdb_port}'])
             self.require(gdb_cmd[0])
 
             self.print_gdbserver_message(gdb_port)
diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index 1f4942972df..37c0a0ab502 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -129,7 +129,7 @@ def get_board_snr(self, glob):
         elif len(snrs) == 1:
             board_snr = snrs[0]
             self.verify_snr(board_snr)
-            print("Using board {}".format(board_snr))
+            print(f"Using board {board_snr}")
             return board_snr
         elif not sys.stdin.isatty():
             raise RuntimeError(
@@ -142,10 +142,9 @@ def get_board_snr(self, glob):
         print('There are multiple boards connected{}.'.format(
                         f" matching '{glob}'" if glob != "*" else ""))
         for i, snr in enumerate(snrs, 1):
-            print('{}. {}'.format(i, snr))
+            print(f'{i}. {snr}')
 
-        p = 'Please select one with desired serial number (1-{}): '.format(
-                len(snrs))
+        p = f'Please select one with desired serial number (1-{len(snrs)}): '
         while True:
             try:
                 value = input(p)
@@ -251,7 +250,7 @@ def recover_target(self):
 
     def program_hex(self):
         # Get the command use to actually program self.hex_.
-        self.logger.info('Flashing file: {}'.format(self.hex_))
+        self.logger.info(f'Flashing file: {self.hex_}')
 
         # What type of erase/core arguments should we pass to the tool?
         core = None
diff --git a/scripts/west_commands/runners/nsim.py b/scripts/west_commands/runners/nsim.py
index 94bd09c3dac..5ed17839203 100644
--- a/scripts/west_commands/runners/nsim.py
+++ b/scripts/west_commands/runners/nsim.py
@@ -83,10 +83,10 @@ def do_debug(self, **kwargs):
         config = kwargs['nsim-cfg']
 
         server_cmd = (self.nsim_cmd + ['-gdb',
-                                       '-port={}'.format(self.gdb_port),
+                                       f'-port={self.gdb_port}',
                                        '-propsfile', config])
         gdb_cmd = (self.gdb_cmd +
-                   ['-ex', 'target remote :{}'.format(self.gdb_port),
+                   ['-ex', f'target remote :{self.gdb_port}',
                     '-ex', 'load', self.cfg.elf_file])
         self.require(gdb_cmd[0])
 
@@ -96,7 +96,7 @@ def debugserver(self, **kwargs):
         config = kwargs['nsim-cfg']
 
         cmd = (self.nsim_cmd +
-               ['-gdb', '-port={}'.format(self.gdb_port),
+               ['-gdb', f'-port={self.gdb_port}',
                 '-propsfile', config])
 
         self.check_call(cmd)
diff --git a/scripts/west_commands/runners/pyocd.py b/scripts/west_commands/runners/pyocd.py
index 40519c6f2c1..653276bd69b 100644
--- a/scripts/west_commands/runners/pyocd.py
+++ b/scripts/west_commands/runners/pyocd.py
@@ -100,11 +100,9 @@ def do_add_parser(cls, parser):
         parser.add_argument('--frequency',
                             help='SWD clock frequency in Hz')
         parser.add_argument('--gdb-port', default=DEFAULT_PYOCD_GDB_PORT,
-                            help='pyocd gdb port, defaults to {}'.format(
-                                DEFAULT_PYOCD_GDB_PORT))
+                            help=f'pyocd gdb port, defaults to {DEFAULT_PYOCD_GDB_PORT}')
         parser.add_argument('--telnet-port', default=DEFAULT_PYOCD_TELNET_PORT,
-                            help='pyocd telnet port, defaults to {}'.format(
-                                DEFAULT_PYOCD_TELNET_PORT))
+                            help=f'pyocd telnet port, defaults to {DEFAULT_PYOCD_TELNET_PORT}')
         parser.add_argument('--tui', default=False, action='store_true',
                             help='if given, GDB uses -tui')
         parser.add_argument('--board-id', dest='dev_id',
@@ -132,7 +130,7 @@ def do_create(cls, cfg, args):
         daparg = os.environ.get('PYOCD_DAPARG')
         if not ret.daparg_args and daparg:
             ret.logger.warning('PYOCD_DAPARG is deprecated; use --daparg')
-            ret.logger.debug('--daparg={} via PYOCD_DAPARG'.format(daparg))
+            ret.logger.debug(f'--daparg={daparg} via PYOCD_DAPARG')
             ret.daparg_args = ['-da', daparg]
 
         return ret
@@ -161,8 +159,7 @@ def flash(self, **kwargs):
             fname = self.elf_name
         else:
             raise ValueError(
-                'Cannot flash; no hex ({}), bin ({}) or elf ({}) files found. '.format(
-                    self.hex_name, self.bin_name, self.elf_name))
+                f'Cannot flash; no hex ({self.hex_name}), bin ({self.bin_name}) or elf ({self.elf_name}) files found. ')
 
         erase_method = 'chip' if self.erase else 'sector'
 
@@ -179,12 +176,11 @@ def flash(self, **kwargs):
                self.flash_extra +
                [fname])
 
-        self.logger.info('Flashing file: {}'.format(fname))
+        self.logger.info(f'Flashing file: {fname}')
         self.check_call(cmd)
 
     def log_gdbserver_message(self):
-        self.logger.info('pyOCD GDB server running on port {}'.
-                         format(self.gdb_port))
+        self.logger.info(f'pyOCD GDB server running on port {self.gdb_port}')
 
     def debug_debugserver(self, command, **kwargs):
         server_cmd = ([self.pyocd] +
@@ -207,7 +203,7 @@ def debug_debugserver(self, command, **kwargs):
             client_cmd = (self.gdb_cmd +
                           self.tui_args +
                           [self.elf_name] +
-                          ['-ex', 'target remote :{}'.format(self.gdb_port)])
+                          ['-ex', f'target remote :{self.gdb_port}'])
             if command == 'debug':
                 client_cmd += ['-ex', 'monitor halt',
                                '-ex', 'monitor reset',
diff --git a/scripts/west_commands/runners/silabs_commander.py b/scripts/west_commands/runners/silabs_commander.py
index b5c74631626..e9df0d83104 100644
--- a/scripts/west_commands/runners/silabs_commander.py
+++ b/scripts/west_commands/runners/silabs_commander.py
@@ -123,5 +123,5 @@ def do_run(self, command, **kwargs):
 
         args = [self.commander, 'flash'] + opts + self.tool_opt + flash_args
 
-        self.logger.info('Flashing file: {}'.format(flash_file))
+        self.logger.info(f'Flashing file: {flash_file}')
         self.check_call(args)
diff --git a/scripts/west_commands/runners/stm32flash.py b/scripts/west_commands/runners/stm32flash.py
index 5aa544d4b2a..027ab445f9b 100644
--- a/scripts/west_commands/runners/stm32flash.py
+++ b/scripts/west_commands/runners/stm32flash.py
@@ -98,19 +98,19 @@ def do_run(self, command, **kwargs):
 
         if action == 'info':
             # show device information and exit
-            msg_text = "get device info from {}".format(self.device)
+            msg_text = f"get device info from {self.device}"
 
         elif action == 'erase':
             # erase flash
             #size_aligned = (int(bin_size)  >> 12) + 1 << 12
             size_aligned = (int(bin_size) & 0xfffff000) + 4096
-            msg_text = "erase {} bit starting at {}".format(size_aligned, self.start_addr)
+            msg_text = f"erase {size_aligned} bit starting at {self.start_addr}"
             cmd_flash.extend([
             '-S', str(self.start_addr) + ":" + str(size_aligned), '-o'])
 
         elif action == 'start':
             # start execution
-            msg_text = "start code execution at {}".format(self.exec_addr)
+            msg_text = f"start code execution at {self.exec_addr}"
             if self.exec_addr:
                 if self.exec_addr == 0 or self.exec_addr.lower() == '0x0':
                     msg_text += " (flash start)"
@@ -121,7 +121,7 @@ def do_run(self, command, **kwargs):
 
         elif action == 'write':
             # flash binary file
-            msg_text = "write {} bytes starting at {}".format(bin_size, self.start_addr)
+            msg_text = f"write {bin_size} bytes starting at {self.start_addr}"
             cmd_flash.extend([
             '-S', str(self.start_addr) + ":" + str(bin_size),
             '-w', bin_name])
@@ -139,11 +139,11 @@ def do_run(self, command, **kwargs):
                 cmd_flash.extend(['-v'])
 
         else:
-            msg_text = "invalid action \'{}\' passed!".format(action)
-            self.logger.error('Invalid action \'{}\' passed!'.format(action))
+            msg_text = f"invalid action \'{action}\' passed!"
+            self.logger.error(f'Invalid action \'{action}\' passed!')
             return -1
 
         cmd_flash.extend([self.device])
         self.logger.info("Board: " + msg_text)
         self.check_call(cmd_flash)
-        self.logger.info('Board: finished \'{}\' .'.format(action))
+        self.logger.info(f'Board: finished \'{action}\' .')
diff --git a/scripts/west_commands/runners/teensy.py b/scripts/west_commands/runners/teensy.py
index a0854f619b2..e43ea3ced2c 100644
--- a/scripts/west_commands/runners/teensy.py
+++ b/scripts/west_commands/runners/teensy.py
@@ -47,13 +47,13 @@ def flash(self):
             fname = self.hex_name
         else:
             raise ValueError(
-                'Cannot flash; no hex ({}) file found. '.format(self.hex_name))
+                f'Cannot flash; no hex ({self.hex_name}) file found. ')
 
         cmd = ([self.teensy_loader] +
                self.mcu_args +
                [fname])
 
-        self.logger.info('Flashing file: {}'.format(fname))
+        self.logger.info(f'Flashing file: {fname}')
 
         try:
             self.check_output(cmd)

From 8a8c01aa5d4ac6f99ac228db4d6f3b216345cfe5 Mon Sep 17 00:00:00 2001
From: Pieter De Gendt <pieter.degendt@basalte.be>
Date: Wed, 20 Nov 2024 16:54:12 +0100
Subject: [PATCH 0860/2913] [nrf fromtree] scripts: west_commands: runners: Fix
 line-too-long (E501)

Wrap long lines to max 100 characters.

See https://docs.astral.sh/ruff/rules/line-too-long/

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
(cherry picked from commit 336c7dadac30ac41773aa86e01d43e05ccd036c2)

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
---
 scripts/west_commands/runners/bossac.py       |  4 +-
 .../west_commands/runners/canopen_program.py  |  6 +-
 scripts/west_commands/runners/core.py         | 21 ++++---
 scripts/west_commands/runners/ezflashcli.py   |  4 +-
 scripts/west_commands/runners/intel_adsp.py   |  3 +-
 .../west_commands/runners/intel_cyclonev.py   | 16 +++--
 scripts/west_commands/runners/jlink.py        | 58 +++++++++++--------
 scripts/west_commands/runners/linkserver.py   | 13 +++--
 scripts/west_commands/runners/mdb.py          | 11 ++--
 scripts/west_commands/runners/nrf_common.py   | 41 ++++++++++---
 scripts/west_commands/runners/openocd.py      |  3 +-
 scripts/west_commands/runners/pyocd.py        |  3 +-
 scripts/west_commands/runners/renode-robot.py |  3 +-
 scripts/west_commands/runners/renode.py       |  3 +-
 .../west_commands/runners/silabs_commander.py |  3 +-
 scripts/west_commands/runners/spi_burn.py     | 21 +++++--
 .../runners/stm32cubeprogrammer.py            |  5 +-
 17 files changed, 148 insertions(+), 70 deletions(-)

diff --git a/scripts/west_commands/runners/bossac.py b/scripts/west_commands/runners/bossac.py
index fcbd6fdf92b..ad456d9b49d 100644
--- a/scripts/west_commands/runners/bossac.py
+++ b/scripts/west_commands/runners/bossac.py
@@ -151,7 +151,9 @@ def get_image_offset(self, supports_offset):
 
     def is_gnu_coreutils_stty(self):
         try:
-            result = subprocess.run(['stty', '--version'], capture_output=True, text=True, check=True)
+            result = subprocess.run(
+                ['stty', '--version'], capture_output=True, text=True, check=True
+            )
             return 'coreutils' in result.stdout
         except subprocess.CalledProcessError:
             return False
diff --git a/scripts/west_commands/runners/canopen_program.py b/scripts/west_commands/runners/canopen_program.py
index 5b4c055fa8b..e55aec968da 100644
--- a/scripts/west_commands/runners/canopen_program.py
+++ b/scripts/west_commands/runners/canopen_program.py
@@ -112,8 +112,10 @@ def do_add_parser(cls, parser):
         parser.add_argument('--sdo-timeout', type=float, default=DEFAULT_SDO_TIMEOUT,
                             help=f'''CANopen SDO response timeout in seconds
                             (default: {DEFAULT_SDO_TIMEOUT})''')
-        parser.add_argument('--download-buffer-size', type=int, default=DEFAULT_PROGRAM_DOWNLOAD_BUFFER_SIZE,
-                            help=f'Program download buffer size in bytes (default: {DEFAULT_PROGRAM_DOWNLOAD_BUFFER_SIZE})')
+        parser.add_argument('--download-buffer-size', type=int,
+                            default=DEFAULT_PROGRAM_DOWNLOAD_BUFFER_SIZE,
+                            help=f'''Program download buffer size in bytes
+                            (default: {DEFAULT_PROGRAM_DOWNLOAD_BUFFER_SIZE})''')
         parser.add_argument('--block-transfer', default=False, action='store_true',
                             help='Use SDO block transfers (experimental, default: no)')
 
diff --git a/scripts/west_commands/runners/core.py b/scripts/west_commands/runners/core.py
index 6126cb6a398..81838f95fdc 100644
--- a/scripts/west_commands/runners/core.py
+++ b/scripts/west_commands/runners/core.py
@@ -577,16 +577,22 @@ def add_parser(cls, parser):
         else:
             parser.add_argument('--elf-file',
                                 metavar='FILE',
-                                action=(partial(depr_action, cls=cls, replacement='-f/--file') if caps.file else None),
-                                help='path to zephyr.elf' if not caps.file else 'Deprecated, use -f/--file instead.')
+                                action=(partial(depr_action, cls=cls,
+                                                replacement='-f/--file') if caps.file else None),
+                                help='path to zephyr.elf'
+                                if not caps.file else 'Deprecated, use -f/--file instead.')
             parser.add_argument('--hex-file',
                                 metavar='FILE',
-                                action=(partial(depr_action, cls=cls, replacement='-f/--file') if caps.file else None),
-                                help='path to zephyr.hex' if not caps.file else 'Deprecated, use -f/--file instead.')
+                                action=(partial(depr_action, cls=cls,
+                                                replacement='-f/--file') if caps.file else None),
+                                help='path to zephyr.hex'
+                                if not caps.file else 'Deprecated, use -f/--file instead.')
             parser.add_argument('--bin-file',
                                 metavar='FILE',
-                                action=(partial(depr_action, cls=cls, replacement='-f/--file') if caps.file else None),
-                                help='path to zephyr.bin' if not caps.file else 'Deprecated, use -f/--file instead.')
+                                action=(partial(depr_action, cls=cls,
+                                                replacement='-f/--file') if caps.file else None),
+                                help='path to zephyr.bin'
+                                if not caps.file else 'Deprecated, use -f/--file instead.')
 
         parser.add_argument('--erase', '--no-erase', nargs=0,
                             action=_ToggleAction,
@@ -612,7 +618,8 @@ def add_parser(cls, parser):
         if caps.rtt:
             parser.add_argument('--rtt-address', dest='rtt_address',
                                 type=lambda x: int(x, 0),
-                                help="address of RTT control block. If not supplied, it will be autodetected if possible")
+                                help="""address of RTT control block. If not supplied,
+                                it will be autodetected if possible""")
         else:
             parser.add_argument('--rtt-address', help=argparse.SUPPRESS)
 
diff --git a/scripts/west_commands/runners/ezflashcli.py b/scripts/west_commands/runners/ezflashcli.py
index ca3c226dbbf..39b68ab80e7 100644
--- a/scripts/west_commands/runners/ezflashcli.py
+++ b/scripts/west_commands/runners/ezflashcli.py
@@ -84,7 +84,9 @@ def program_bin(self):
             self.check_call([self.tool] + options + ["image_flash", self.bin_])
         else:
             load_offset = self.build_conf['CONFIG_FLASH_LOAD_OFFSET']
-            self.check_call([self.tool] + options + ["write_flash", f'0x{load_offset:x}', self.bin_])
+            self.check_call(
+                [self.tool] + options + ["write_flash", f'0x{load_offset:x}', self.bin_]
+            )
 
     def reset_device(self):
         self.logger.info("Resetting...")
diff --git a/scripts/west_commands/runners/intel_adsp.py b/scripts/west_commands/runners/intel_adsp.py
index 24552c8f61c..5690f49c594 100644
--- a/scripts/west_commands/runners/intel_adsp.py
+++ b/scripts/west_commands/runners/intel_adsp.py
@@ -60,7 +60,8 @@ def do_add_parser(cls, parser):
 
         for old_sign_param in [ '--rimage-tool', '--config-dir', '--default-key', '--key']:
             parser.add_argument(old_sign_param, action=SignParamError,
-                            help='do not use, "west sign" is now called from CMake, see "west sign -h"')
+                                help='''do not use, "west sign" is now called from CMake,
+                                see "west sign -h"''')
 
     @classmethod
     def tool_opt_help(cls) -> str:
diff --git a/scripts/west_commands/runners/intel_cyclonev.py b/scripts/west_commands/runners/intel_cyclonev.py
index c1e08f6de9e..e33c190202e 100644
--- a/scripts/west_commands/runners/intel_cyclonev.py
+++ b/scripts/west_commands/runners/intel_cyclonev.py
@@ -107,7 +107,8 @@ def do_add_parser(cls, parser):
                             help='''if given, override default config file;
                             may be given multiple times''')
         parser.add_argument('--serial', default="",
-                            help='if given, selects FTDI instance by its serial number, defaults to empty')
+                            help='''if given, selects FTDI instance by its serial number,
+                            defaults to empty''')
         parser.add_argument('--use-elf', default=False, action='store_true',
                             help='if given, Elf file will be used for loading instead of HEX image')
         # Options for flashing:
@@ -242,11 +243,12 @@ def do_flash_elf(self, **kwargs):
         server_cmd = (self.openocd_cmd + self.serial + self.cfg_cmd +        #added mevalver
                       pre_init_cmd)
         temp_str = '--cd=' + os.environ.get('ZEPHYR_BASE') #Go to Zephyr base Dir
+        # Execute First Script in Zephyr Base Dir
         gdb_cmd = (self.gdb_cmd + self.tui_arg +
-                   [temp_str,'-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch']) #Execute First Script in Zephyr Base Dir
-
+                   [temp_str,'-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch'])
+        # Execute Second Script in Build Dir
         gdb_cmd2 = (self.gdb_cmd + self.tui_arg +
-                   ['-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch'])	#Execute Second Script in Build Dir
+                   ['-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch'])
         echo = ['echo']
         if self.gdb_init is not None:
             for i in self.gdb_init:
@@ -303,11 +305,13 @@ def do_attach_debug(self, command, **kwargs):
 
         temp_str = '--cd=' + os.environ.get('ZEPHYR_BASE') #Go to Zephyr base Dir
 
+        # Execute First Script in Zephyr Base Dir
         gdb_cmd = (self.gdb_cmd + self.tui_arg +
-                   [temp_str,'-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch']) #Execute First Script in Zephyr Base Dir
+                   [temp_str,'-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch'])
 
+        # Execute Second Script in Build Dir
         gdb_cmd2 = (self.gdb_cmd + self.tui_arg +
-                   ['-ex', f'target extended-remote :{self.gdb_port}' , '-batch'])	#Execute Second Script in Build Dir
+                   ['-ex', f'target extended-remote :{self.gdb_port}' , '-batch'])
 
 
         if self.gdb_init is not None:
diff --git a/scripts/west_commands/runners/jlink.py b/scripts/west_commands/runners/jlink.py
index 3d5727991e2..535e2bec2b5 100644
--- a/scripts/west_commands/runners/jlink.py
+++ b/scripts/west_commands/runners/jlink.py
@@ -247,21 +247,25 @@ def do_run(self, command, **kwargs):
                                'RTOSPlugin_Zephyr')
         big_endian = self.build_conf.getboolean('CONFIG_BIG_ENDIAN')
 
-        server_cmd = ([self.gdbserver] +
-                      ['-select',
-                                           ('ip' if (is_ip(self.dev_id) or is_tunnel(self.dev_id)) else 'usb') +
-                                           (f'={self.dev_id}' if self.dev_id else ''),
-                       '-port', str(self.gdb_port),
-                       '-if', self.iface,
-                       '-speed', self.speed,
-                       '-device', self.device,
-                       '-silent',
-                       '-endian', 'big' if big_endian else 'little',
-                       '-singlerun'] +
-                      (['-nogui'] if self.supports_nogui else []) +
-                      (['-rtos', plugin_dir] if rtos else []) +
-                      ['-rtttelnetport', str(self.rtt_port)] +
-                      self.tool_opt)
+        server_cmd = (
+            [self.gdbserver]
+            + [
+                '-select',
+                ('ip' if (is_ip(self.dev_id) or is_tunnel(self.dev_id)) else 'usb')
+                + (f'={self.dev_id}' if self.dev_id else ''),
+            ]
+            + ['-port', str(self.gdb_port)]
+            + ['-if', self.iface]
+            + ['-speed', self.speed]
+            + ['-device', self.device]
+            + ['-silent']
+            + ['-endian' 'big' if big_endian else 'little']
+            + ['-singlerun']
+            + (['-nogui'] if self.supports_nogui else [])
+            + (['-rtos', plugin_dir] if rtos else [])
+            + ['-rtttelnetport', str(self.rtt_port)]
+            + self.tool_opt
+        )
 
         if command == 'flash':
             self.flash(**kwargs)
@@ -405,15 +409,21 @@ def flash(self, **kwargs):
             if self.supports_loader and self.loader:
                 loader_details = "?" + self.loader
 
-            cmd = ([self.commander] +
-                   (['-IP', f'{self.dev_id}'] if (is_ip(self.dev_id) or is_tunnel(self.dev_id)) else (['-USB', f'{self.dev_id}'] if self.dev_id else [])) +
-                   (['-nogui', '1'] if self.supports_nogui else []) +
-                   ['-if', self.iface,
-                    '-speed', self.speed,
-                    '-device', self.device + loader_details,
-                    '-CommanderScript', fname] +
-                   (['-nogui', '1'] if self.supports_nogui else []) +
-                   self.tool_opt)
+            cmd = (
+                [self.commander]
+                + (
+                    ['-IP', f'{self.dev_id}']
+                    if (is_ip(self.dev_id) or is_tunnel(self.dev_id))
+                    else (['-USB', f'{self.dev_id}'] if self.dev_id else [])
+                )
+                + (['-nogui', '1'] if self.supports_nogui else [])
+                + ['-if', self.iface]
+                + ['-speed', self.speed]
+                + ['-device', self.device + loader_details]
+                + ['-CommanderScript', fname]
+                + (['-nogui', '1'] if self.supports_nogui else [])
+                + self.tool_opt
+            )
 
             self.logger.info(f'Flashing file: {flash_file}')
             kwargs = {}
diff --git a/scripts/west_commands/runners/linkserver.py b/scripts/west_commands/runners/linkserver.py
index 9ffcdf63605..9d038157803 100644
--- a/scripts/west_commands/runners/linkserver.py
+++ b/scripts/west_commands/runners/linkserver.py
@@ -89,12 +89,13 @@ def do_add_parser(cls, parser):
                             {DEFAULT_LINKSERVER_EXE}''')
         # user may need to override settings.
         parser.add_argument('--override', required=False, action='append',
-                            help='''configuration overrides as defined bylinkserver. Example: /device/memory/0/location=0xcafecafe''')
+                            help='''configuration overrides as defined bylinkserver.
+                            Example: /device/memory/0/location=0xcafecafe''')
 
     @classmethod
     def do_create(cls, cfg, args):
 
-        print("RUNNER - gdb_port = " + str(args.gdb_port) + ", semih port = " + str(args.semihost_port))
+        print(f"RUNNER - gdb_port = {args.gdb_port}, semih port = {args.semihost_port}")
         return LinkServerBinaryRunner(cfg, args.device, args.core,
                                  linkserver=args.linkserver,
                                  dt_flash=args.dt_flash,
@@ -180,8 +181,12 @@ def _build_override_cli(self):
         return override_cli
 
     def flash(self, **kwargs):
-
-        linkserver_cmd = ([self.linkserver, "flash"] + ["--probe", str(self.probe)] + self.override_cli + [self.device])
+        linkserver_cmd = (
+            [self.linkserver, "flash"]
+            + ["--probe", str(self.probe)]
+            + self.override_cli
+            + [self.device]
+        )
         self.logger.debug(f'LinkServer cmd:  + {linkserver_cmd}')
 
         if self.erase:
diff --git a/scripts/west_commands/runners/mdb.py b/scripts/west_commands/runners/mdb.py
index bef14effbdd..412e457df2e 100644
--- a/scripts/west_commands/runners/mdb.py
+++ b/scripts/west_commands/runners/mdb.py
@@ -36,11 +36,14 @@ def is_flash_cmd_need_exit_immediately(mdb_runner):
 
 def smp_core_order(mdb_runner, id):
     if is_simulation_run(mdb_runner):
-        # for simulation targets we start cores in direct order (core 0 first, core 1 second, etc...)
-        # otherwise we face mismatch arcnum (code ID) with ARConnect ID and core ID in instruction traces
+        # for simulation targets we start cores in direct order
+        # (core 0 first, core 1 second, etc...)
+        # otherwise we face mismatch arcnum (code ID) with ARConnect ID
+        # and core ID in instruction traces
         return id
     else:
-        # for HW targets we want to start the primary core last, to avoid ARConnect initialization interfere
+        # for HW targets we want to start the primary core last,
+        # to avoid ARConnect initialization interfere
         # with secondary cores startup - so we reverse start order
         return mdb_runner.cores - 1 - id
 
@@ -91,7 +94,7 @@ def mdb_do_run(mdb_runner, command):
             if i > 0: mdb_sub_cmd += ['-prop=download=2']
             mdb_sub_cmd += mdb_basic_options + mdb_target + [mdb_runner.elf_name]
             mdb_runner.check_call(mdb_sub_cmd, cwd=mdb_runner.build_dir)
-            mdb_multifiles += ('core{}' if i == 0 else ',core{}').format(smp_core_order(mdb_runner, i))
+            mdb_multifiles += f'{"" if i == 0 else ","}core{smp_core_order(mdb_runner, i)}'
 
         # to enable multi-core aware mode for use with the MetaWare debugger,
         # need to set the NSIM_MULTICORE environment variable to a non-zero value
diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index 37c0a0ab502..cc04ebcbb90 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -278,8 +278,11 @@ def program_hex(self):
 
             # Manage SUIT artifacts.
             # This logic should be executed only once per build.
-            # Use sysbuild board qualifiers to select the context, with which the artifacts will be programmed.
-            if self.build_conf.get('CONFIG_BOARD_QUALIFIERS') == self.sysbuild_conf.get('SB_CONFIG_BOARD_QUALIFIERS'):
+            # Use sysbuild board qualifiers to select the context,
+            # with which the artifacts will be programmed.
+            if self.build_conf.get('CONFIG_BOARD_QUALIFIERS') == self.sysbuild_conf.get(
+                'SB_CONFIG_BOARD_QUALIFIERS'
+            ):
                 mpi_hex_dir = Path(os.path.join(self.cfg.build_dir, 'zephyr'))
 
                 # Handle Manifest Provisioning Information
@@ -287,17 +290,37 @@ def program_hex(self):
                     app_mpi_hex_file = os.fspath(
                         mpi_hex_dir / self.build_conf.get('CONFIG_SUIT_MPI_APP_AREA_PATH'))
                     rad_mpi_hex_file = os.fspath(
-                        mpi_hex_dir / self.build_conf.get('CONFIG_SUIT_MPI_RAD_AREA_PATH'))
-                    self.op_program(app_mpi_hex_file, 'ERASE_NONE', None, defer=True, core='NRFDL_DEVICE_CORE_APPLICATION')
-                    self.op_program(rad_mpi_hex_file, 'ERASE_NONE', None, defer=True, core='NRFDL_DEVICE_CORE_NETWORK')
+                        mpi_hex_dir / self.build_conf.get('CONFIG_SUIT_MPI_RAD_AREA_PATH')
+                    )
+                    self.op_program(
+                        app_mpi_hex_file,
+                        'ERASE_NONE',
+                        None,
+                        defer=True,
+                        core='NRFDL_DEVICE_CORE_APPLICATION',
+                    )
+                    self.op_program(
+                        rad_mpi_hex_file,
+                        'ERASE_NONE',
+                        None,
+                        defer=True,
+                        core='NRFDL_DEVICE_CORE_NETWORK',
+                    )
 
                 # Handle SUIT root manifest if application manifests are not used.
-                # If an application firmware is built, the root envelope is merged with other application manifests
-                # as well as the output HEX file.
+                # If an application firmware is built, the root envelope is merged
+                # with other application manifests as well as the output HEX file.
                 if not cpuapp and self.sysbuild_conf.get('SB_CONFIG_SUIT_ENVELOPE'):
                     app_root_envelope_hex_file = os.fspath(
-                        mpi_hex_dir / 'suit_installed_envelopes_application_merged.hex')
-                    self.op_program(app_root_envelope_hex_file, 'ERASE_NONE', None, defer=True, core='NRFDL_DEVICE_CORE_APPLICATION')
+                        mpi_hex_dir / 'suit_installed_envelopes_application_merged.hex'
+                    )
+                    self.op_program(
+                        app_root_envelope_hex_file,
+                        'ERASE_NONE',
+                        None,
+                        defer=True,
+                        core='NRFDL_DEVICE_CORE_APPLICATION',
+                    )
 
             if cpuapp:
                 core = 'NRFDL_DEVICE_CORE_APPLICATION'
diff --git a/scripts/west_commands/runners/openocd.py b/scripts/west_commands/runners/openocd.py
index 2569371ff9b..5789cf579a5 100644
--- a/scripts/west_commands/runners/openocd.py
+++ b/scripts/west_commands/runners/openocd.py
@@ -117,7 +117,8 @@ def do_add_parser(cls, parser):
                             help='''if given, override default config file;
                             may be given multiple times''')
         parser.add_argument('--serial', default="",
-                            help='if given, selects FTDI instance by its serial number, defaults to empty')
+                            help='''if given, selects FTDI instance by its serial number,
+                            defaults to empty''')
         parser.add_argument('--use-elf', default=False, action='store_true',
                             help='if given, Elf file will be used for loading instead of HEX image')
         # Options for flashing:
diff --git a/scripts/west_commands/runners/pyocd.py b/scripts/west_commands/runners/pyocd.py
index 653276bd69b..d3e3b4d8b8a 100644
--- a/scripts/west_commands/runners/pyocd.py
+++ b/scripts/west_commands/runners/pyocd.py
@@ -159,7 +159,8 @@ def flash(self, **kwargs):
             fname = self.elf_name
         else:
             raise ValueError(
-                f'Cannot flash; no hex ({self.hex_name}), bin ({self.bin_name}) or elf ({self.elf_name}) files found. ')
+                f'Cannot flash; no hex ({self.hex_name}), bin ({self.bin_name}) '
+                f'or elf ({self.elf_name}) files found. ')
 
         erase_method = 'chip' if self.erase else 'sector'
 
diff --git a/scripts/west_commands/runners/renode-robot.py b/scripts/west_commands/runners/renode-robot.py
index 68fe453b8ac..ff80a2289e7 100644
--- a/scripts/west_commands/runners/renode-robot.py
+++ b/scripts/west_commands/runners/renode-robot.py
@@ -59,5 +59,6 @@ def run_test(self, **kwargs):
                 for suite in self.testsuite:
                     cmd.append(suite)
             else:
-                self.logger.error("No Robot testsuite passed to renode-test! Use the `--testsuite` argument to provide one.")
+                self.logger.error("No Robot testsuite passed to renode-test! "
+                                  "Use the `--testsuite` argument to provide one.")
         subprocess.run(cmd, check=True)
diff --git a/scripts/west_commands/runners/renode.py b/scripts/west_commands/runners/renode.py
index 8937199420c..598912d8a19 100644
--- a/scripts/west_commands/runners/renode.py
+++ b/scripts/west_commands/runners/renode.py
@@ -30,7 +30,8 @@ def do_add_parser(cls, parser):
         parser.add_argument('--renode-arg',
                             metavar='ARG',
                             action='append',
-                            help='additional argument passed to Renode; `--help` will print all possible arguments')
+                            help='''additional argument passed to Renode;
+                            `--help` will print all possible arguments''')
         parser.add_argument('--renode-command',
                             metavar='COMMAND',
                             action='append',
diff --git a/scripts/west_commands/runners/silabs_commander.py b/scripts/west_commands/runners/silabs_commander.py
index e9df0d83104..5d0bdd96c1c 100644
--- a/scripts/west_commands/runners/silabs_commander.py
+++ b/scripts/west_commands/runners/silabs_commander.py
@@ -119,7 +119,8 @@ def do_run(self, command, **kwargs):
                 flash_file = self.bin_name
                 flash_args = ['--binary', '--address', f'0x{flash_addr:x}', flash_file]
             else:
-                raise ValueError(f'Cannot flash; no hex ({self.hex_name}) or bin ({self.bin_name}) files found.')
+                raise ValueError(f'Cannot flash; no hex ({self.hex_name}) or '
+                                 f'bin ({self.bin_name}) files found.')
 
         args = [self.commander, 'flash'] + opts + self.tool_opt + flash_args
 
diff --git a/scripts/west_commands/runners/spi_burn.py b/scripts/west_commands/runners/spi_burn.py
index 265d1cd29bc..07253710dbb 100644
--- a/scripts/west_commands/runners/spi_burn.py
+++ b/scripts/west_commands/runners/spi_burn.py
@@ -39,7 +39,8 @@ def do_add_parser(cls, parser):
                             help='ICEman connection establishing timeout in seconds')
         parser.add_argument('--telink-tools-path', help='path to Telink flash tools')
         parser.add_argument('--gdb-port', default='1111', help='Port to connect for gdb-client')
-        parser.add_argument('--gdb-ex', default='', nargs='?', help='Additional gdb commands to run')
+        parser.add_argument('--gdb-ex', default='', nargs='?',
+                            help='Additional gdb commands to run')
 
     @classmethod
     def do_create(cls, cfg, args):
@@ -48,18 +49,23 @@ def do_create(cls, cfg, args):
             spiburn = f'{args.telink_tools_path}/flash/bin/SPI_burn'
             iceman = f'{args.telink_tools_path}/ice/ICEman'
         else:
-            # If telink_tools_path arg is not specified then pass to tools shall be specified in PATH
+            # If telink_tools_path arg is not specified then
+            # pass to tools shall be specified in PATH
             spiburn = 'SPI_burn'
             iceman  = 'ICEman'
 
         # Get flash address offset
         if args.dt_flash == 'y':
             build_conf = BuildConfiguration(cfg.build_dir)
-            address = hex(cls.get_flash_address(args, build_conf) - build_conf['CONFIG_FLASH_BASE_ADDRESS'])
+            address = hex(
+                cls.get_flash_address(args, build_conf) - build_conf['CONFIG_FLASH_BASE_ADDRESS']
+            )
         else:
             address = args.addr
 
-        return SpiBurnBinaryRunner(cfg, address, spiburn, iceman, args.timeout, args.gdb_port, args.gdb_ex, args.erase)
+        return SpiBurnBinaryRunner(
+            cfg, address, spiburn, iceman, args.timeout, args.gdb_port, args.gdb_ex, args.erase
+        )
 
     def do_run(self, command, **kwargs):
 
@@ -127,7 +133,12 @@ def _debug(self):
             gdb_ex = re.split("(-ex) ", self.gdb_ex)[1::]
 
             # Compose gdb command
-            client_cmd = [self.cfg.gdb, self.cfg.elf_file, '-ex', f'target remote :{self.gdb_port}'] + gdb_ex
+            client_cmd = [
+                self.cfg.gdb,
+                self.cfg.elf_file,
+                '-ex',
+                f'target remote :{self.gdb_port}',
+            ] + gdb_ex
 
             # Run gdb
             self.run_client(client_cmd)
diff --git a/scripts/west_commands/runners/stm32cubeprogrammer.py b/scripts/west_commands/runners/stm32cubeprogrammer.py
index 43d9a19adfa..7519530d6f3 100644
--- a/scripts/west_commands/runners/stm32cubeprogrammer.py
+++ b/scripts/west_commands/runners/stm32cubeprogrammer.py
@@ -53,7 +53,10 @@ def __init__(
         self._erase = erase
 
         if extload:
-            p = STM32CubeProgrammerBinaryRunner._get_stm32cubeprogrammer_path().parent.resolve() / 'ExternalLoader'
+            p = (
+                STM32CubeProgrammerBinaryRunner._get_stm32cubeprogrammer_path().parent.resolve()
+                / 'ExternalLoader'
+            )
             self._extload = ['-el', str(p / extload)]
         else:
             self._extload = []

From 6e53c5702ecb1f3dddfdc051ff487550d6c24672 Mon Sep 17 00:00:00 2001
From: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
Date: Thu, 21 Nov 2024 13:55:23 +0100
Subject: [PATCH 0861/2913] [nrf fromtree] scripts: nrf_common: Move MPI to
 sysbuild Kconfig

Use sysbuild to build and configure SUIT Manifest Provisioning
Information.

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
(cherry picked from commit 866e690ddaab8c66b4e045fc8b2b80900094ce59)
---
 scripts/west_commands/runners/nrf_common.py | 51 +++++++++++----------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index cc04ebcbb90..67634132408 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -286,26 +286,28 @@ def program_hex(self):
                 mpi_hex_dir = Path(os.path.join(self.cfg.build_dir, 'zephyr'))
 
                 # Handle Manifest Provisioning Information
-                if self.build_conf.getboolean('CONFIG_SUIT_MPI_GENERATE'):
+                if self.sysbuild_conf.getboolean('SB_CONFIG_SUIT_MPI_GENERATE'):
                     app_mpi_hex_file = os.fspath(
-                        mpi_hex_dir / self.build_conf.get('CONFIG_SUIT_MPI_APP_AREA_PATH'))
+                        mpi_hex_dir / self.sysbuild_conf.get('SB_CONFIG_SUIT_MPI_APP_AREA_PATH'))
                     rad_mpi_hex_file = os.fspath(
-                        mpi_hex_dir / self.build_conf.get('CONFIG_SUIT_MPI_RAD_AREA_PATH')
-                    )
-                    self.op_program(
-                        app_mpi_hex_file,
-                        'ERASE_NONE',
-                        None,
-                        defer=True,
-                        core='NRFDL_DEVICE_CORE_APPLICATION',
-                    )
-                    self.op_program(
-                        rad_mpi_hex_file,
-                        'ERASE_NONE',
-                        None,
-                        defer=True,
-                        core='NRFDL_DEVICE_CORE_NETWORK',
+                        mpi_hex_dir / self.sysbuild_conf.get('SB_CONFIG_SUIT_MPI_RAD_AREA_PATH')
                     )
+                    if os.path.exists(app_mpi_hex_file):
+                        self.op_program(
+                            app_mpi_hex_file,
+                            'ERASE_NONE',
+                            None,
+                            defer=True,
+                            core='NRFDL_DEVICE_CORE_APPLICATION',
+                        )
+                    if os.path.exists(rad_mpi_hex_file):
+                        self.op_program(
+                            rad_mpi_hex_file,
+                            'ERASE_NONE',
+                            None,
+                            defer=True,
+                            core='NRFDL_DEVICE_CORE_NETWORK',
+                        )
 
                 # Handle SUIT root manifest if application manifests are not used.
                 # If an application firmware is built, the root envelope is merged
@@ -314,13 +316,14 @@ def program_hex(self):
                     app_root_envelope_hex_file = os.fspath(
                         mpi_hex_dir / 'suit_installed_envelopes_application_merged.hex'
                     )
-                    self.op_program(
-                        app_root_envelope_hex_file,
-                        'ERASE_NONE',
-                        None,
-                        defer=True,
-                        core='NRFDL_DEVICE_CORE_APPLICATION',
-                    )
+                    if os.path.exists(app_root_envelope_hex_file):
+                        self.op_program(
+                            app_root_envelope_hex_file,
+                            'ERASE_NONE',
+                            None,
+                            defer=True,
+                            core='NRFDL_DEVICE_CORE_APPLICATION',
+                        )
 
             if cpuapp:
                 core = 'NRFDL_DEVICE_CORE_APPLICATION'

From d99f13efc7fe216de96ab072b353ffdbe3f96ae1 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Mon, 11 Nov 2024 11:17:51 +0000
Subject: [PATCH 0862/2913] [nrf noup] dfu: boot: mcuboot: Fix selecting wrong
 active slot

fixup! [nrf noup] dfu/boot/mcuboot: fix confirmation in case of USE_PARTITION_MANAGER

Fixes this code to correctly check which slot is active, albeit
without firmware loader support

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
---
 subsys/dfu/boot/mcuboot.c | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/subsys/dfu/boot/mcuboot.c b/subsys/dfu/boot/mcuboot.c
index a6e05700ac7..4a66befaa91 100644
--- a/subsys/dfu/boot/mcuboot.c
+++ b/subsys/dfu/boot/mcuboot.c
@@ -37,6 +37,22 @@
 #if USE_PARTITION_MANAGER
 #include <pm_config.h>
 
+#if CONFIG_MCUBOOT_APPLICATION_IMAGE_NUMBER != -1
+/* Sysbuild */
+#ifdef CONFIG_MCUBOOT
+/* lib is part of MCUboot -> operate on the primary application slot */
+#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_PRIMARY_ID
+#else
+/* TODO: Add firmware loader support */
+/* lib is part of the app -> operate on active slot */
+#if defined(CONFIG_NCS_IS_VARIANT_IMAGE)
+#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_SECONDARY_ID
+#else
+#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_PRIMARY_ID
+#endif
+#endif /* CONFIG_MCUBOOT */
+#else
+/* Legacy child/parent */
 #if CONFIG_BUILD_WITH_TFM
 	#define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE + PM_TFM_SIZE)
 #else
@@ -44,20 +60,19 @@
 #endif
 
 #ifdef CONFIG_MCUBOOT
-	/* lib is part of MCUboot -> operate on the primart application slot */
-	#define ACTIVE_SLOT_ID		PM_MCUBOOT_PRIMARY_ID
+	/* lib is part of MCUboot -> operate on the primary application slot */
+	#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_PRIMARY_ID
 #else
 	/* lib is part of the App -> operate on active slot */
 #if (PM_ADDRESS - PM_ADDRESS_OFFSET) == PM_MCUBOOT_PRIMARY_ADDRESS
-	#define ACTIVE_SLOT_ID		PM_MCUBOOT_PRIMARY_ID
+	#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_PRIMARY_ID
 #elif (PM_ADDRESS - PM_ADDRESS_OFFSET) == PM_MCUBOOT_SECONDARY_ADDRESS
-	#define ACTIVE_SLOT_ID		PM_MCUBOOT_SECONDARY_ID
+	#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_SECONDARY_ID
 #else
 	#error Missing partition definitions.
 #endif
 #endif /* CONFIG_MCUBOOT */
-
-#define ACTIVE_SLOT_FLASH_AREA_ID ACTIVE_SLOT_ID
+#endif /* CONFIG_MCUBOOT_APPLICATION_IMAGE_NUMBER != -1 */
 #else
 /* Get active partition. zephyr,code-partition chosen node must be defined */
 #define ACTIVE_SLOT_FLASH_AREA_ID DT_FIXED_PARTITION_ID(DT_CHOSEN(zephyr_code_partition))

From 8798cb4caeedf0e78699cba48e4d3c7636d347a7 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Wed, 11 Dec 2024 17:44:54 +0100
Subject: [PATCH 0863/2913] [nrf fromlist] soc: nordic: poweroff: disable
 remaining RAM on emul l05/l10 targets

nRF54L05 and nRF54L10 devices that are emulated on nRF54L15
needs to have manually disabled remaining RAM blocks
that are outside of their RAM region definitions.

Upstream PR #: 82262

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
---
 soc/nordic/common/poweroff.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/soc/nordic/common/poweroff.c b/soc/nordic/common/poweroff.c
index 99a2bcfb3d6..8d95463e275 100644
--- a/soc/nordic/common/poweroff.c
+++ b/soc/nordic/common/poweroff.c
@@ -50,6 +50,15 @@ void z_sys_poweroff(void)
 
 	/* Disable retention for all memory blocks */
 	nrfx_ram_ctrl_retention_enable_set(ram_start, ram_size, false);
+#if defined(DEVELOP_IN_NRF54L15) && defined(NRF54L05_XXAA)
+	nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 0, 0x1F8, false);
+	nrf_memconf_ramblock_ret2_mask_enable_set(NRF_MEMCONF, 0, 0x1F8, false);
+#endif
+#if defined(DEVELOP_IN_NRF54L15) && defined(NRF54L10_XXAA)
+	nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 0, 0x1C0, false);
+	nrf_memconf_ramblock_ret2_mask_enable_set(NRF_MEMCONF, 0, 0x1C0, false);
+#endif
+
 #endif
 
 #if defined(CONFIG_RETAINED_MEM_NRF_RAM_CTRL)

From 382877e15f13507f40c73b385446987fc7ace57e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag=20Erik=20Gj=C3=B8rvad?= <dag.erik.gjorvad@nordicsemi.no>
Date: Thu, 12 Dec 2024 10:25:00 +0100
Subject: [PATCH 0864/2913] [nrf noup] soc: nordic: nrf54l Fix for wait lasting
 half expected time
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Noup as it patches code that does not exist in zephyr
arch_busy_wait and k_busy_wait waited half the expected time
due to SystemCoreClock being set back to the default value when ns
builds. Changed to rely on device tree as to avoid
hardcoded clock frequencies

Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no>
---
 soc/nordic/nrf54l/soc.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index d96679b8e85..70528c2fd88 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -48,6 +48,13 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 #define HFXO_NODE DT_NODELABEL(hfxo)
 #endif
 
+/* Building for cpuflpr with ns uses cpu_1 instead of cpu_0 */
+#if DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
+#define DEVICE_DT_CLOCK_FREQ DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
+#elif DT_PROP(DT_PATH(cpus, cpu_1), clock_frequency)
+#define DEVICE_DT_CLOCK_FREQ DT_PROP(DT_PATH(cpus, cpu_1), clock_frequency)
+#endif
+
 #if defined(NRF_APPLICATION)
 static inline void power_and_clock_configuration(void)
 {
@@ -176,16 +183,18 @@ int nordicsemi_nrf54l_init(void)
 	/* Update the SystemCoreClock global variable with current core clock
 	 * retrieved from hardware state.
 	 */
-#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(__NRF_TFM__)
-	/* Currently not supported for non-secure */
-	SystemCoreClockUpdate();
-#endif
 
 #ifdef __NRF_TFM__
 	/* TF-M enables the instruction cache from target_cfg.c, so we
 	 * don't need to enable it here.
 	 */
 #else
+
+	/* Update SystemCoreClock in Zephyr based on device tree to avoid SystemCoreClock
+	 * being overwritten with default value when initializing with TF-M
+	 */
+	SystemCoreClock = DEVICE_DT_CLOCK_FREQ;
+
 	/* Enable ICACHE */
 	sys_cache_instr_enable();
 #endif

From bd49978448e4b5a3da159d9aa728104a263a9de1 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Thu, 14 Nov 2024 17:55:50 +0530
Subject: [PATCH 0865/2913] [nrf fromtree] manifest: hal_nordic: Pull nRF Wi-Fi
 removal

Pulls PR that removed nRF Wi-Fi.

(cherry picked from commit e512151474ca964302de2e9f8d25ecf13e3bcb16)

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 we       | 0
 west.yml | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 we

diff --git a/we b/we
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/west.yml b/west.yml
index 3e66f68d53c..14f53cc6462 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 54bde38c6f6ffb3780b26ae728cf79426184384e
+      revision: ce87268bb5610b7e90acce3efa5c511e95aeeeae
       path: modules/hal/nordic
       groups:
         - hal

From ca451ac1623d5d3a4deb21128bbce94688bddb13 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 26 Nov 2024 13:49:03 +0530
Subject: [PATCH 0866/2913] [nrf fromtree] root: Remove temp file

Commit e512151474c("manifest: hal_nordic: Pull nRF Wi-Fi removal")
mistakenly added a temporary local file.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>

(cherry picked from commit 7658adf75877e0bb53c4ce92619a797f1a3172e0)
---
 we | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 we

diff --git a/we b/we
deleted file mode 100644
index e69de29bb2d..00000000000

From a01607b46b86643bd0bc2d09ae06f2232b3caf2c Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Thu, 21 Nov 2024 10:02:33 +0100
Subject: [PATCH 0867/2913] [nrf fromtree] manifest: hal_nordic: Update to
 latest

Including not removing a workaround in the UART driver for bsim targets

(cherry picked from commit 6c7b38f5fa1cb4d382a030762efbcfe587ea974d)

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 14f53cc6462..6e2e87c992d 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: ce87268bb5610b7e90acce3efa5c511e95aeeeae
+      revision: 5fbccc3fa8341d0cd5a128bc94f23ee03b763239
       path: modules/hal/nordic
       groups:
         - hal

From 404969907293917541c9205dc58d94a33199d1bd Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Wed, 4 Dec 2024 14:18:17 +0100
Subject: [PATCH 0868/2913] [nrf fromtree] manifest: Update the hal_nordic
 revision to get the latest suit blob

See https://github.com/zephyrproject-rtos/hal_nordic/pull/267 for
additional details.

(cherry picked from commit 96f2b2f4bb6556c279778614419475d886111004)

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 6e2e87c992d..7ff65298332 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 5fbccc3fa8341d0cd5a128bc94f23ee03b763239
+      revision: e0e48c4ec75595767a286389e2fcda72b21363b0
       path: modules/hal/nordic
       groups:
         - hal

From 1e48643065340f9b423e1b2c90b58dee9d4af4af Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Tue, 26 Nov 2024 16:33:45 +0100
Subject: [PATCH 0869/2913] [nrf fromlist] manifest: hal_nordic: update to
 include nrfs services

Update hal_nordic revision to include nrfs services:
- GDPWR
- GDFS

Upstream PR #: 81735

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 7ff65298332..6061b2c5a05 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: e0e48c4ec75595767a286389e2fcda72b21363b0
+      revision: fae15426c6b5a1f67362d508cf51b691ae5ab4b4
       path: modules/hal/nordic
       groups:
         - hal

From 9481ac59e9d60e1bbaf1dbe97f951f13c0cba69c Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Date: Thu, 28 Nov 2024 09:49:42 +0100
Subject: [PATCH 0870/2913] [nrf fromlist] soc: nordic: nrf54h: gpd: align GPD
 domain names

nRFs exposes now all power domains, following their actual name in the
specification. Add support for all of them in the GPD service. Note that
this is a breaking change: running this code requires a new SCFW as IDs
have changed in nRFs and so SCFW.

Upstream PR #: 81735

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
---
 .../zephyr/dt-bindings/power/nordic-nrf-gpd.h | 10 ++---
 soc/nordic/nrf54h/gpd/gpd.c                   | 42 +++++++++++++++++--
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/include/zephyr/dt-bindings/power/nordic-nrf-gpd.h b/include/zephyr/dt-bindings/power/nordic-nrf-gpd.h
index 7f6952f6f0b..e4a5b83a304 100644
--- a/include/zephyr/dt-bindings/power/nordic-nrf-gpd.h
+++ b/include/zephyr/dt-bindings/power/nordic-nrf-gpd.h
@@ -8,10 +8,10 @@
 #define ZEPHYR_INCLUDE_DT_BINDINGS_POWER_NORDIC_NRF_GLOBAL_PD
 
 /* numbers aligned to nrfs service identifiers */
-#define NRF_GPD_SLOW_MAIN 2U
-#define NRF_GPD_SLOW_ACTIVE 1U
-#define NRF_GPD_FAST_MAIN 3U
-#define NRF_GPD_FAST_ACTIVE1 0U
-#define NRF_GPD_FAST_ACTIVE0 4U
+#define NRF_GPD_FAST_ACTIVE0 0U
+#define NRF_GPD_FAST_ACTIVE1 1U
+#define NRF_GPD_FAST_MAIN 2U
+#define NRF_GPD_SLOW_ACTIVE 3U
+#define NRF_GPD_SLOW_MAIN 4U
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_POWER_NORDIC_NRF_GLOBAL_PD */
diff --git a/soc/nordic/nrf54h/gpd/gpd.c b/soc/nordic/nrf54h/gpd/gpd.c
index a4d1889e53f..3cee31b700e 100644
--- a/soc/nordic/nrf54h/gpd/gpd.c
+++ b/soc/nordic/nrf54h/gpd/gpd.c
@@ -20,9 +20,11 @@
 LOG_MODULE_REGISTER(gpd, CONFIG_SOC_LOG_LEVEL);
 
 /* enforce alignment between DT<->nrfs */
-BUILD_ASSERT(GDPWR_POWER_DOMAIN_ACTIVE_FAST == NRF_GPD_FAST_ACTIVE1);
-BUILD_ASSERT(GDPWR_POWER_DOMAIN_ACTIVE_SLOW == NRF_GPD_SLOW_ACTIVE);
-BUILD_ASSERT(GDPWR_POWER_DOMAIN_MAIN_SLOW == NRF_GPD_SLOW_MAIN);
+BUILD_ASSERT(GDPWR_GD_FAST_ACTIVE_0 == NRF_GPD_FAST_ACTIVE0);
+BUILD_ASSERT(GDPWR_GD_FAST_ACTIVE_1 == NRF_GPD_FAST_ACTIVE1);
+BUILD_ASSERT(GDPWR_GD_FAST_MAIN == NRF_GPD_FAST_MAIN);
+BUILD_ASSERT(GDPWR_GD_SLOW_ACTIVE == NRF_GPD_SLOW_ACTIVE);
+BUILD_ASSERT(GDPWR_GD_SLOW_MAIN == NRF_GPD_SLOW_MAIN);
 
 struct gpd_onoff_manager {
 	struct onoff_manager mgr;
@@ -44,11 +46,21 @@ static void stop(struct onoff_manager *mgr, onoff_notify_fn notify);
 #define GPD_SERVICE_REQ_ERR BIT(3)
 static atomic_t gpd_service_status = ATOMIC_INIT(0);
 
+static struct gpd_onoff_manager fast_active0 = {
+	.id = NRF_GPD_FAST_ACTIVE0,
+	.lock = Z_MUTEX_INITIALIZER(fast_active0.lock),
+	.sem = Z_SEM_INITIALIZER(fast_active0.sem, 0, 1),
+};
 static struct gpd_onoff_manager fast_active1 = {
 	.id = NRF_GPD_FAST_ACTIVE1,
 	.lock = Z_MUTEX_INITIALIZER(fast_active1.lock),
 	.sem = Z_SEM_INITIALIZER(fast_active1.sem, 0, 1),
 };
+static struct gpd_onoff_manager fast_main = {
+	.id = NRF_GPD_FAST_MAIN,
+	.lock = Z_MUTEX_INITIALIZER(fast_main.lock),
+	.sem = Z_SEM_INITIALIZER(fast_main.sem, 0, 1),
+};
 static struct gpd_onoff_manager slow_active = {
 	.id = NRF_GPD_SLOW_ACTIVE,
 	.lock = Z_MUTEX_INITIALIZER(slow_active.lock),
@@ -66,8 +78,12 @@ static const struct onoff_transitions transitions =
 static struct gpd_onoff_manager *get_mgr(uint8_t id)
 {
 	switch (id) {
+	case NRF_GPD_FAST_ACTIVE0:
+		return &fast_active0;
 	case NRF_GPD_FAST_ACTIVE1:
 		return &fast_active1;
+	case NRF_GPD_FAST_MAIN:
+		return &fast_main;
 	case NRF_GPD_SLOW_ACTIVE:
 		return &slow_active;
 	case NRF_GPD_SLOW_MAIN:
@@ -286,11 +302,21 @@ static int nrf_gpd_pre_init(void)
 {
 	int ret;
 
+	ret = onoff_manager_init(&fast_active0.mgr, &transitions);
+	if (ret < 0) {
+		return ret;
+	}
+
 	ret = onoff_manager_init(&fast_active1.mgr, &transitions);
 	if (ret < 0) {
 		return ret;
 	}
 
+	ret = onoff_manager_init(&fast_main.mgr, &transitions);
+	if (ret < 0) {
+		return ret;
+	}
+
 	ret = onoff_manager_init(&slow_active.mgr, &transitions);
 	if (ret < 0) {
 		return ret;
@@ -322,11 +348,21 @@ static int nrf_gpd_post_init(void)
 	}
 
 	/* submit GD requests now to align collected statuses */
+	ret = nrf_gpd_sync(&fast_active0);
+	if (ret < 0) {
+		goto err;
+	}
+
 	ret = nrf_gpd_sync(&fast_active1);
 	if (ret < 0) {
 		goto err;
 	}
 
+	ret = nrf_gpd_sync(&fast_main);
+	if (ret < 0) {
+		goto err;
+	}
+
 	ret = nrf_gpd_sync(&slow_active);
 	if (ret < 0) {
 		goto err;

From 5cc9300f980f51ab8a323a2b49ac9e99982039b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Pelikan?= <pawel.pelikan@nordicsemi.no>
Date: Mon, 18 Nov 2024 15:38:26 +0100
Subject: [PATCH 0871/2913] [nrf fromlist] modules: hal_nordic: nrfs: add GDFS
 Service
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adding the implementation for the GDFS service

Upstream PR #: 81735

Signed-off-by: Paweł Pelikan <pawel.pelikan@nordicsemi.no>
---
 modules/hal_nordic/nrfs/CMakeLists.txt | 1 +
 modules/hal_nordic/nrfs/Kconfig        | 8 ++++++++
 modules/hal_nordic/nrfs/nrfs_config.h  | 4 ++++
 soc/nordic/nrf54h/Kconfig              | 2 ++
 4 files changed, 15 insertions(+)

diff --git a/modules/hal_nordic/nrfs/CMakeLists.txt b/modules/hal_nordic/nrfs/CMakeLists.txt
index f470eea00e9..41dfb61f864 100644
--- a/modules/hal_nordic/nrfs/CMakeLists.txt
+++ b/modules/hal_nordic/nrfs/CMakeLists.txt
@@ -31,6 +31,7 @@ if(CONFIG_NRFS)
         zephyr_library_sources_ifdef(CONFIG_NRFS_RESET_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_reset.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 8c5b61bb11f..cf40a64f592 100644
--- a/modules/hal_nordic/nrfs/Kconfig
+++ b/modules/hal_nordic/nrfs/Kconfig
@@ -19,6 +19,9 @@ config NRFS_HAS_DIAG_SERVICE
 config NRFS_HAS_DVFS_SERVICE
 	bool
 
+config NRFS_HAS_GDFS_SERVICE
+	bool
+
 config NRFS_HAS_GDPWR_SERVICE
 	bool
 
@@ -117,6 +120,11 @@ config NRFS_GDPWR_SERVICE_ENABLED
 	depends on NRFS_HAS_GDPWR_SERVICE
 	default y
 
+config NRFS_GDFS_SERVICE_ENABLED
+	bool "Global domain frequency scaling service"
+	depends on NRFS_HAS_GDFS_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 a092adb7850..45e9e446b71 100644
--- a/modules/hal_nordic/nrfs/nrfs_config.h
+++ b/modules/hal_nordic/nrfs/nrfs_config.h
@@ -44,6 +44,10 @@
 #define NRFS_GDPWR_SERVICE_ENABLED
 #endif
 
+#ifdef CONFIG_NRFS_CLOCK_SERVICE_ENABLED
+#define NRFS_CLOCK_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 36979b554e0..d54ef99da8e 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -25,6 +25,7 @@ config SOC_NRF54H20_CPUAPP_COMMON
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select NRFS_HAS_CLOCK_SERVICE
 	select NRFS_HAS_DVFS_SERVICE
+	select NRFS_HAS_GDFS_SERVICE
 	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
@@ -48,6 +49,7 @@ config SOC_NRF54H20_CPURAD_COMMON
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select NRFS_HAS_CLOCK_SERVICE
+	select NRFS_HAS_GDFS_SERVICE
 	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
 	select NRFS_HAS_TEMP_SERVICE

From fc924f8d5ff23723c25efd967800e598d1f6c3ef Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Thu, 21 Nov 2024 13:38:40 +0100
Subject: [PATCH 0872/2913] [nrf fromlist] dts: nordic: specify device model of
 global hsfll clock

Add specific device model for global hsfll clock and update dts tree
to use specific model. The clock is not fixed, and configurable at
runtime to predefined frequencies specified by the platform.

Upstream PR #: 81735

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 .../clock/nordic,nrf-hsfll-global.yaml        | 44 +++++++++++++++++++
 dts/common/nordic/nrf54h20.dtsi               |  8 +++-
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 dts/bindings/clock/nordic,nrf-hsfll-global.yaml

diff --git a/dts/bindings/clock/nordic,nrf-hsfll-global.yaml b/dts/bindings/clock/nordic,nrf-hsfll-global.yaml
new file mode 100644
index 00000000000..d743cd76679
--- /dev/null
+++ b/dts/bindings/clock/nordic,nrf-hsfll-global.yaml
@@ -0,0 +1,44 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  Nordic Global HSFLL clock.
+
+  The lowest supported clock frequency is the default
+  clock frequency.
+
+  Example:
+
+    global_hsfll: global_hsfll {
+            compatible = "nordic,nrf-hsfll-global";
+            clocks = <&fll16>;
+            #clock-cells = <0>;
+            clock-frequency = <320000000>;
+            supported-clock-frequencies = <64000000
+                                           128000000
+                                           256000000
+                                           320000000>;
+    };
+
+compatible: "nordic,nrf-hsfll-global"
+
+include:
+  - "base.yaml"
+  - "clock-controller.yaml"
+
+properties:
+  clocks:
+    required: true
+
+  "#clock-cells":
+    const: 0
+
+  supported-clock-frequencies:
+    type: array
+    description: Supported clock frequencies in ascending order
+
+  clock-frequency:
+    type: int
+    description: |
+      Optional fixed frequency specified if used in fixed
+      frequency mode.
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 4ef0a05a302..8ca2357039f 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -180,10 +180,14 @@
 		};
 
 		hsfll120: hsfll120 {
-			compatible = "fixed-clock";
+			compatible = "nordic,nrf-hsfll-global";
 			clocks = <&fll16m>;
 			#clock-cells = <0>;
-			clock-frequency = <DT_FREQ_M(320)>;
+			clock-frequency = <320000000>;
+			supported-clock-frequencies = <64000000
+						       128000000
+						       256000000
+						       320000000>;
 		};
 
 		lfclk: lfclk {

From d5173debd5f599d4bc092d0ea54c3ff79784dcb5 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Mon, 2 Dec 2024 12:50:22 +0100
Subject: [PATCH 0873/2913] [nrf fromlist] dts: bindings: update nrf-hsfll to
 nrf-hsfll-local

The nrf-hsfll was previously the only supported HSFLL clock, hence it
was not namespaced fully. Since we added nrf-hsfll-global, we should
add the namespace to nrf-hsfll as well.

Updates drivers and devicetree uses of HSFLL as well.

Upstream PR #: 81735

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 drivers/clock_control/clock_control_nrf2_hsfll.c       |  2 +-
 ...rdic,nrf-hsfll.yaml => nordic,nrf-hsfll-local.yaml} | 10 +++++-----
 dts/common/nordic/nrf54h20.dtsi                        |  4 ++--
 dts/common/nordic/nrf9280.dtsi                         |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename dts/bindings/clock/{nordic,nrf-hsfll.yaml => nordic,nrf-hsfll-local.yaml} (83%)

diff --git a/drivers/clock_control/clock_control_nrf2_hsfll.c b/drivers/clock_control/clock_control_nrf2_hsfll.c
index 026edf9abbd..b0d0ff364b3 100644
--- a/drivers/clock_control/clock_control_nrf2_hsfll.c
+++ b/drivers/clock_control/clock_control_nrf2_hsfll.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define DT_DRV_COMPAT nordic_nrf_hsfll
+#define DT_DRV_COMPAT nordic_nrf_hsfll_local
 
 #include "clock_control_nrf2_common.h"
 #include <zephyr/devicetree.h>
diff --git a/dts/bindings/clock/nordic,nrf-hsfll.yaml b/dts/bindings/clock/nordic,nrf-hsfll-local.yaml
similarity index 83%
rename from dts/bindings/clock/nordic,nrf-hsfll.yaml
rename to dts/bindings/clock/nordic,nrf-hsfll-local.yaml
index f1077dbc4f0..01d0dd7aa3a 100644
--- a/dts/bindings/clock/nordic,nrf-hsfll.yaml
+++ b/dts/bindings/clock/nordic,nrf-hsfll-local.yaml
@@ -2,15 +2,15 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  Nordic nRF HSFLL
+  Nordic nRF local HSFLL
 
-  The HSFLL mixed-mode IP generates several clock frequencies in the range from
-  64 MHz to 400 MHz (in steps of 16 MHz).
+  The local HSFLL mixed-mode IP generates several clock frequencies in the range
+  from 64 MHz to 400 MHz (in steps of 16 MHz).
 
   Usage example:
 
     hsfll: clock@deadbeef {
-        compatible = "nordic,nrf-hsfll";
+        compatible = "nordic,nrf-hsfll-local";
         reg = <0xdeadbeef 0x1000>;
         clocks = <&fll16m>;
         clock-frequency = <DT_FREQ_M(320)>;
@@ -22,7 +22,7 @@ description: |
 
   Required FICR entries are for VSUP, COARSE and FINE trim values.
 
-compatible: "nordic,nrf-hsfll"
+compatible: "nordic,nrf-hsfll-local"
 
 include: [base.yaml, fixed-clock.yaml, nordic-nrf-ficr-client.yaml]
 
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 8ca2357039f..034813bc076 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -259,7 +259,7 @@
 			ranges = <0x0 0x52000000 0x1000000>;
 
 			cpuapp_hsfll: clock@d000 {
-				compatible = "nordic,nrf-hsfll";
+				compatible = "nordic,nrf-hsfll-local";
 				#clock-cells = <0>;
 				reg = <0xd000 0x1000>;
 				clocks = <&fll16m>;
@@ -313,7 +313,7 @@
 			ranges = <0x0 0x53000000 0x1000000>;
 
 			cpurad_hsfll: clock@d000 {
-				compatible = "nordic,nrf-hsfll";
+				compatible = "nordic,nrf-hsfll-local";
 				#clock-cells = <0>;
 				reg = <0xd000 0x1000>;
 				clocks = <&fll16m>;
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 4fd64cd10be..62b22b4fbc2 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -149,7 +149,7 @@
 			ranges = <0x0 0x52000000 0x1000000>;
 
 			cpuapp_hsfll: clock@d000 {
-				compatible = "nordic,nrf-hsfll";
+				compatible = "nordic,nrf-hsfll-local";
 				#clock-cells = <0>;
 				reg = <0xd000 0x1000>;
 				clocks = <&fll16m>;
@@ -201,7 +201,7 @@
 			ranges = <0x0 0x53000000 0x1000000>;
 
 			cpurad_hsfll: clock@d000 {
-				compatible = "nordic,nrf-hsfll";
+				compatible = "nordic,nrf-hsfll-local";
 				#clock-cells = <0>;
 				reg = <0xd000 0x1000>;
 				clocks = <&fll16m>;

From 5227b68d4df294dd6377c03fe416ecbd7aeb47ba Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Thu, 21 Nov 2024 13:53:47 +0100
Subject: [PATCH 0874/2913] [nrf fromlist] drivers: clock_control: nrf2: add
 support for global hfsll clock

Add device driver support for global hsfll clock.

Upstream PR #: 81735

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 drivers/clock_control/CMakeLists.txt          |   1 +
 drivers/clock_control/Kconfig.nrf             |  27 ++
 .../clock_control_nrf2_global_hsfll.c         | 302 ++++++++++++++++++
 .../clock_control/clock_control_nrf2_hsfll.c  |  14 -
 4 files changed, 330 insertions(+), 14 deletions(-)
 create mode 100644 drivers/clock_control/clock_control_nrf2_global_hsfll.c

diff --git a/drivers/clock_control/CMakeLists.txt b/drivers/clock_control/CMakeLists.txt
index ffc19a3b729..d3d1807d6cf 100644
--- a/drivers/clock_control/CMakeLists.txt
+++ b/drivers/clock_control/CMakeLists.txt
@@ -35,6 +35,7 @@ zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RENESAS_RA_CGC      clock_cont
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_AMBIQ               clock_control_ambiq.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_PWM                 clock_control_pwm.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RPI_PICO            clock_control_rpi_pico.c)
+zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL   clock_control_nrf2_global_hsfll.c)
 
 if(CONFIG_CLOCK_CONTROL_NRF2)
   zephyr_library_sources(clock_control_nrf2_common.c)
diff --git a/drivers/clock_control/Kconfig.nrf b/drivers/clock_control/Kconfig.nrf
index f7b0de3db09..3965bb06e25 100644
--- a/drivers/clock_control/Kconfig.nrf
+++ b/drivers/clock_control/Kconfig.nrf
@@ -193,4 +193,31 @@ config CLOCK_CONTROL_NRF2_NRFS_CLOCK_TIMEOUT_MS
 	int "Timeout waiting for nrfs clock service callback in milliseconds"
 	default 1000
 
+config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
+	bool "Clock control for global HSFLL"
+	depends on NRFS_GDFS_SERVICE_ENABLED
+	default y
+
+if CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
+
+config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_TIMEOUT_MS
+	int "Frequency request timeout in milliseconds"
+	default 10000
+
+config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_REQ_LOW_FREQ
+	bool "Request LOW frequency on init"
+	default y
+	help
+	  The GDFS service will default to HIGH frequency until it receives
+	  a lower frequency request. The NRF2 clock controller drivers
+	  expect the clock to be initialized to their lowest frequency, so
+	  we need to send a request on init to align GDFS with the NRF2
+	  clock controller driver.
+
+	  This initial request can be disabled to prevent a potentially
+	  unnecessary HIGH -> LOW -> HIGH cycle given some module will
+	  request a HIGH frequency on init anyway.
+
+endif # CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
+
 endif # CLOCK_CONTROL_NRF2
diff --git a/drivers/clock_control/clock_control_nrf2_global_hsfll.c b/drivers/clock_control/clock_control_nrf2_global_hsfll.c
new file mode 100644
index 00000000000..79005f427ae
--- /dev/null
+++ b/drivers/clock_control/clock_control_nrf2_global_hsfll.c
@@ -0,0 +1,302 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT nordic_nrf_hsfll_global
+
+#include "clock_control_nrf2_common.h"
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <nrfs_gdfs.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
+
+#define GLOBAL_HSFLL_CLOCK_FREQUENCIES \
+	DT_INST_PROP(0, supported_clock_frequencies)
+
+#define GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(idx) \
+	DT_INST_PROP_BY_IDX(0, supported_clock_frequencies, idx)
+
+#define GLOBAL_HSFLL_CLOCK_FREQUENCIES_SIZE \
+	DT_INST_PROP_LEN(0, supported_clock_frequencies)
+
+#define GLOBAL_HSFLL_FREQ_REQ_TIMEOUT \
+	K_MSEC(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_TIMEOUT_MS)
+
+#define GLOBAL_HSFLL_INIT_LOW_REQ \
+	CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_REQ_LOW_FREQ
+
+BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_SIZE == 4);
+BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(0) == 64000000);
+BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(1) == 128000000);
+BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(2) == 256000000);
+BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(3) == 320000000);
+BUILD_ASSERT(GDFS_FREQ_COUNT == 4);
+BUILD_ASSERT(GDFS_FREQ_HIGH == 0);
+BUILD_ASSERT(GDFS_FREQ_MEDHIGH == 1);
+BUILD_ASSERT(GDFS_FREQ_MEDLOW == 2);
+BUILD_ASSERT(GDFS_FREQ_LOW == 3);
+
+struct global_hsfll_dev_config {
+	uint32_t clock_frequencies[GLOBAL_HSFLL_CLOCK_FREQUENCIES_SIZE];
+};
+
+struct global_hsfll_dev_data {
+	STRUCT_CLOCK_CONFIG(global_hsfll, GLOBAL_HSFLL_CLOCK_FREQUENCIES_SIZE) clk_cfg;
+	const struct device *dev;
+	struct k_work evt_work;
+	nrfs_gdfs_evt_type_t evt;
+	struct k_work_delayable timeout_dwork;
+
+#if GLOBAL_HSFLL_INIT_LOW_REQ
+	struct k_sem evt_sem;
+#endif /* GLOBAL_HSFLL_INIT_LOW_REQ */
+};
+
+static uint32_t global_hsfll_get_max_clock_frequency(const struct device *dev)
+{
+	const struct global_hsfll_dev_config *dev_config = dev->config;
+
+	return dev_config->clock_frequencies[ARRAY_SIZE(dev_config->clock_frequencies) - 1];
+}
+
+static struct onoff_manager *global_hsfll_find_mgr(const struct device *dev,
+						   const struct nrf_clock_spec *spec)
+{
+	struct global_hsfll_dev_data *dev_data = dev->data;
+	const struct global_hsfll_dev_config *dev_config = dev->config;
+	uint32_t frequency;
+
+	if (!spec) {
+		return &dev_data->clk_cfg.onoff[0].mgr;
+	}
+
+	if (spec->accuracy || spec->precision) {
+		LOG_ERR("invalid specification of accuracy or precision");
+		return NULL;
+	}
+
+	frequency = spec->frequency == NRF_CLOCK_CONTROL_FREQUENCY_MAX
+		  ? global_hsfll_get_max_clock_frequency(dev)
+		  : spec->frequency;
+
+	for (uint8_t i = 0; i < ARRAY_SIZE(dev_config->clock_frequencies); i++) {
+		if (dev_config->clock_frequencies[i] < frequency) {
+			continue;
+		}
+
+		return &dev_data->clk_cfg.onoff[i].mgr;
+	}
+
+	LOG_ERR("invalid frequency");
+	return NULL;
+}
+
+static int api_request_global_hsfll(const struct device *dev,
+				    const struct nrf_clock_spec *spec,
+				    struct onoff_client *cli)
+{
+	struct onoff_manager *mgr = global_hsfll_find_mgr(dev, spec);
+
+	if (mgr) {
+		return onoff_request(mgr, cli);
+	}
+
+	return -EINVAL;
+}
+
+static int api_release_global_hsfll(const struct device *dev,
+				    const struct nrf_clock_spec *spec)
+{
+	struct onoff_manager *mgr = global_hsfll_find_mgr(dev, spec);
+
+	if (mgr) {
+		return onoff_release(mgr);
+	}
+
+	return -EINVAL;
+}
+
+static int api_cancel_or_release_global_hsfll(const struct device *dev,
+					      const struct nrf_clock_spec *spec,
+					      struct onoff_client *cli)
+{
+	struct onoff_manager *mgr = global_hsfll_find_mgr(dev, spec);
+
+	if (mgr) {
+		return onoff_cancel_or_release(mgr, cli);
+	}
+
+	return -EINVAL;
+}
+
+static struct nrf_clock_control_driver_api driver_api = {
+	.std_api = {
+		.on = api_nosys_on_off,
+		.off = api_nosys_on_off,
+	},
+	.request = api_request_global_hsfll,
+	.release = api_release_global_hsfll,
+	.cancel_or_release = api_cancel_or_release_global_hsfll,
+};
+
+static enum gdfs_frequency_setting global_hsfll_freq_idx_to_nrfs_freq(const struct device *dev,
+								      uint8_t freq_idx)
+{
+	const struct global_hsfll_dev_config *dev_config = dev->config;
+
+	return ARRAY_SIZE(dev_config->clock_frequencies) - 1 - freq_idx;
+}
+
+static const char *global_hsfll_gdfs_freq_to_str(enum gdfs_frequency_setting freq)
+{
+	switch (freq) {
+	case GDFS_FREQ_HIGH:
+		return "GDFS_FREQ_HIGH";
+	case GDFS_FREQ_MEDHIGH:
+		return "GDFS_FREQ_MEDHIGH";
+	case GDFS_FREQ_MEDLOW:
+		return "GDFS_FREQ_MEDLOW";
+	case GDFS_FREQ_LOW:
+		return "GDFS_FREQ_LOW";
+	default:
+		break;
+	}
+
+	return "UNKNOWN";
+}
+
+static void global_hsfll_work_handler(struct k_work *work)
+{
+	struct global_hsfll_dev_data *dev_data =
+		CONTAINER_OF(work, struct global_hsfll_dev_data, clk_cfg.work);
+	const struct device *dev = dev_data->dev;
+	uint8_t freq_idx;
+	enum gdfs_frequency_setting target_freq;
+	nrfs_err_t err;
+
+	freq_idx = clock_config_update_begin(work);
+	target_freq = global_hsfll_freq_idx_to_nrfs_freq(dev, freq_idx);
+
+	LOG_DBG("requesting %s", global_hsfll_gdfs_freq_to_str(target_freq));
+	err = nrfs_gdfs_request_freq(target_freq, dev_data);
+	if (err != NRFS_SUCCESS) {
+		clock_config_update_end(&dev_data->clk_cfg, -EIO);
+		return;
+	}
+
+	k_work_schedule(&dev_data->timeout_dwork, GLOBAL_HSFLL_FREQ_REQ_TIMEOUT);
+}
+
+static void global_hsfll_evt_handler(struct k_work *work)
+{
+	struct global_hsfll_dev_data *dev_data =
+		CONTAINER_OF(work, struct global_hsfll_dev_data, evt_work);
+	int rc;
+
+	k_work_cancel_delayable(&dev_data->timeout_dwork);
+	rc = dev_data->evt == NRFS_GDFS_EVT_FREQ_CONFIRMED ? 0 : -EIO;
+	clock_config_update_end(&dev_data->clk_cfg, rc);
+}
+
+#if GLOBAL_HSFLL_INIT_LOW_REQ
+static void global_hfsll_nrfs_gdfs_init_evt_handler(nrfs_gdfs_evt_t const *p_evt, void *context)
+{
+	struct global_hsfll_dev_data *dev_data = context;
+
+	dev_data->evt = p_evt->type;
+	k_sem_give(&dev_data->evt_sem);
+}
+#endif /* GLOBAL_HSFLL_INIT_LOW_REQ */
+
+static void global_hfsll_nrfs_gdfs_evt_handler(nrfs_gdfs_evt_t const *p_evt, void *context)
+{
+	struct global_hsfll_dev_data *dev_data = context;
+
+	if (k_work_is_pending(&dev_data->evt_work)) {
+		return;
+	}
+
+	dev_data->evt = p_evt->type;
+	k_work_submit(&dev_data->evt_work);
+}
+
+static void global_hsfll_timeout_handler(struct k_work *work)
+{
+	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
+	struct global_hsfll_dev_data *dev_data =
+		CONTAINER_OF(dwork, struct global_hsfll_dev_data, timeout_dwork);
+
+	clock_config_update_end(&dev_data->clk_cfg, -ETIMEDOUT);
+}
+
+static int global_hfsll_init(const struct device *dev)
+{
+	struct global_hsfll_dev_data *dev_data = dev->data;
+	nrfs_err_t err;
+	int rc;
+
+	k_work_init_delayable(&dev_data->timeout_dwork, global_hsfll_timeout_handler);
+	k_work_init(&dev_data->evt_work, global_hsfll_evt_handler);
+
+#if GLOBAL_HSFLL_INIT_LOW_REQ
+	k_sem_init(&dev_data->evt_sem, 0, 1);
+
+	err = nrfs_gdfs_init(global_hfsll_nrfs_gdfs_init_evt_handler);
+	if (err != NRFS_SUCCESS) {
+		return -EIO;
+	}
+
+	LOG_DBG("initial request %s", global_hsfll_gdfs_freq_to_str(GDFS_FREQ_LOW));
+	err = nrfs_gdfs_request_freq(GDFS_FREQ_LOW, dev_data);
+	if (err != NRFS_SUCCESS) {
+		return -EIO;
+	}
+
+	rc = k_sem_take(&dev_data->evt_sem, GLOBAL_HSFLL_FREQ_REQ_TIMEOUT);
+	if (rc) {
+		return -EIO;
+	}
+
+	if (dev_data->evt != NRFS_GDFS_EVT_FREQ_CONFIRMED) {
+		return -EIO;
+	}
+
+	nrfs_gdfs_uninit();
+#endif /* GLOBAL_HSFLL_INIT_LOW_REQ */
+
+	rc = clock_config_init(&dev_data->clk_cfg,
+			       ARRAY_SIZE(dev_data->clk_cfg.onoff),
+			       global_hsfll_work_handler);
+	if (rc < 0) {
+		return rc;
+	}
+
+	err = nrfs_gdfs_init(global_hfsll_nrfs_gdfs_evt_handler);
+	if (err != NRFS_SUCCESS) {
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static struct global_hsfll_dev_data driver_data = {
+	.dev = DEVICE_DT_INST_GET(0),
+};
+
+static const struct global_hsfll_dev_config driver_config = {
+	GLOBAL_HSFLL_CLOCK_FREQUENCIES
+};
+
+DEVICE_DT_INST_DEFINE(
+	0,
+	global_hfsll_init,
+	NULL,
+	&driver_data,
+	&driver_config,
+	POST_KERNEL,
+	CONFIG_CLOCK_CONTROL_INIT_PRIORITY,
+	&driver_api
+);
diff --git a/drivers/clock_control/clock_control_nrf2_hsfll.c b/drivers/clock_control/clock_control_nrf2_hsfll.c
index b0d0ff364b3..58ad4a51ff5 100644
--- a/drivers/clock_control/clock_control_nrf2_hsfll.c
+++ b/drivers/clock_control/clock_control_nrf2_hsfll.c
@@ -8,7 +8,6 @@
 #include "clock_control_nrf2_common.h"
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
-#include <hal/nrf_hsfll.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
@@ -183,18 +182,6 @@ static int api_cancel_or_release_hsfll(const struct device *dev,
 #endif
 }
 
-static int api_get_rate_hsfll(const struct device *dev,
-			      clock_control_subsys_t sys,
-			      uint32_t *rate)
-{
-	ARG_UNUSED(dev);
-	ARG_UNUSED(sys);
-
-	*rate = nrf_hsfll_clkctrl_mult_get(NRF_HSFLL) * MHZ(16);
-
-	return 0;
-}
-
 static int hsfll_init(const struct device *dev)
 {
 #ifdef CONFIG_NRFS_DVFS_LOCAL_DOMAIN
@@ -221,7 +208,6 @@ static struct nrf_clock_control_driver_api hsfll_drv_api = {
 	.std_api = {
 		.on = api_nosys_on_off,
 		.off = api_nosys_on_off,
-		.get_rate = api_get_rate_hsfll,
 	},
 	.request = api_request_hsfll,
 	.release = api_release_hsfll,

From 06ebfd2185c06281f2b3cf8e1529a631148c474f Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Thu, 21 Nov 2024 21:46:22 +0100
Subject: [PATCH 0875/2913] [nrf fromlist] samples: boards: nordic:
 clock_control: support global hsfll

Extend sample to support global hsfll clock control.

Upstream PR #: 81735

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 .../nordic/clock_control/configs/global_hsfll.conf   |  6 ++++++
 .../clock_control/configs/global_hsfll.overlay       | 11 +++++++++++
 samples/boards/nordic/clock_control/sample.yaml      | 12 ++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 samples/boards/nordic/clock_control/configs/global_hsfll.conf
 create mode 100644 samples/boards/nordic/clock_control/configs/global_hsfll.overlay

diff --git a/samples/boards/nordic/clock_control/configs/global_hsfll.conf b/samples/boards/nordic/clock_control/configs/global_hsfll.conf
new file mode 100644
index 00000000000..53eebac30be
--- /dev/null
+++ b/samples/boards/nordic/clock_control/configs/global_hsfll.conf
@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CLOCK_CONTROL=y
+
+CONFIG_SAMPLE_CLOCK_FREQUENCY_HZ=320000000
diff --git a/samples/boards/nordic/clock_control/configs/global_hsfll.overlay b/samples/boards/nordic/clock_control/configs/global_hsfll.overlay
new file mode 100644
index 00000000000..24585f5a5c6
--- /dev/null
+++ b/samples/boards/nordic/clock_control/configs/global_hsfll.overlay
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/{
+	aliases {
+		sample-clock = &hsfll120;
+	};
+};
diff --git a/samples/boards/nordic/clock_control/sample.yaml b/samples/boards/nordic/clock_control/sample.yaml
index dd2cfe86c41..820ad0de75f 100644
--- a/samples/boards/nordic/clock_control/sample.yaml
+++ b/samples/boards/nordic/clock_control/sample.yaml
@@ -29,3 +29,15 @@ tests:
     extra_args:
       - CONF_FILE="configs/cpuapp_hsfll.conf"
       - DTC_OVERLAY_FILE="configs/cpuapp_hsfll.overlay"
+  sample.boards.nrf.clock_control.global_hsfll:
+    filter: dt_nodelabel_enabled("hsfll120")
+    extra_args:
+      - CONF_FILE="configs/global_hsfll.conf"
+      - DTC_OVERLAY_FILE="configs/global_hsfll.overlay"
+  sample.boards.nrf.clock_control.global_hsfll.req_low_freq_n:
+    filter: dt_nodelabel_enabled("hsfll120")
+    extra_configs:
+      - CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_REQ_LOW_FREQ=n
+    extra_args:
+      - CONF_FILE="configs/global_hsfll.conf"
+      - DTC_OVERLAY_FILE="configs/global_hsfll.overlay"

From 0f2b574e26e65fcd5aaf0b0758595913c4514527 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Thu, 21 Nov 2024 21:54:21 +0100
Subject: [PATCH 0876/2913] [nrf fromlist] tests: drivers: clock_control: nrf:
 add global hsfll clock

Extend test suite to test global HSFLL clock.

Upstream PR #: 81735

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 .../nrf_clock_control/src/main.c              | 36 +++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/tests/drivers/clock_control/nrf_clock_control/src/main.c b/tests/drivers/clock_control/nrf_clock_control/src/main.c
index 60cb9549f3d..1f12969eb3d 100644
--- a/tests/drivers/clock_control/nrf_clock_control/src/main.c
+++ b/tests/drivers/clock_control/nrf_clock_control/src/main.c
@@ -104,6 +104,29 @@ static const struct test_clk_context cpurad_hsfll_test_clk_contexts[] = {
 };
 #endif
 
+const struct nrf_clock_spec test_clk_specs_global_hsfll[] = {
+	{
+		.frequency = MHZ(320),
+	},
+	{
+		.frequency = MHZ(256),
+	},
+	{
+		.frequency = MHZ(128),
+	},
+	{
+		.frequency = MHZ(64),
+	},
+};
+
+static const struct test_clk_context global_hsfll_test_clk_contexts[] = {
+	{
+		.clk_dev = DEVICE_DT_GET(DT_NODELABEL(hsfll120)),
+		.clk_specs = test_clk_specs_global_hsfll,
+		.clk_specs_size = ARRAY_SIZE(test_clk_specs_global_hsfll),
+	},
+};
+
 const struct nrf_clock_spec test_clk_specs_lfclk[] = {
 	{
 		.frequency = 32768,
@@ -151,8 +174,10 @@ static void test_request_release_clock_spec(const struct device *clk_dev,
 	zassert_ok(ret);
 	zassert_ok(res);
 	ret = clock_control_get_rate(clk_dev, NULL, &rate);
-	zassert_ok(ret);
-	zassert_equal(rate, clk_spec->frequency);
+	if (ret != -ENOSYS) {
+		zassert_ok(ret);
+		zassert_equal(rate, clk_spec->frequency);
+	}
 	k_msleep(1000);
 	ret = nrf_clock_control_release(clk_dev, clk_spec);
 	zassert_equal(ret, ONOFF_STATE_ON);
@@ -249,6 +274,13 @@ ZTEST(nrf2_clock_control, test_lfclk_control)
 	test_clock_control_request(lfclk_test_clk_contexts, ARRAY_SIZE(lfclk_test_clk_contexts));
 }
 
+ZTEST(nrf2_clock_control, test_global_hsfll_control)
+{
+	TC_PRINT("Global HSFLL test\n");
+	test_clock_control_request(global_hsfll_test_clk_contexts,
+				   ARRAY_SIZE(global_hsfll_test_clk_contexts));
+}
+
 ZTEST(nrf2_clock_control, test_safe_request_cancellation)
 {
 	int ret = 0;

From c3b324172acc815831f9d5b53edf8e090d64e86f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 15 Nov 2024 15:28:06 +0100
Subject: [PATCH 0877/2913] [nrf fromlist] modules: hal_nordic: nrfs: Optimize
 communication
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It is not needed to use always the system work queue to send a
message over IPC. In thread context IPC service can be called
directly. It speeds up the communication and allows to use nrfs
from the system work queue. Legacy approach could easily lead
to the deadlock if user would call nrfs from work queue and
pend on semaphore until response is received.

Upstream PR #: 81455

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c b/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c
index 129098e9b2d..bf5dec9fe16 100644
--- a/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c
+++ b/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c
@@ -176,7 +176,10 @@ nrfs_err_t nrfs_backend_send(void *message, size_t size)
 
 nrfs_err_t nrfs_backend_send_ex(void *message, size_t size, k_timeout_t timeout, bool high_prio)
 {
-	if (size <= MAX_PACKET_DATA_SIZE) {
+	if (!k_is_in_isr() && nrfs_backend_connected()) {
+		return ipc_service_send(&ipc_cpusys_channel_config.ipc_ept, message, size) ?
+			NRFS_SUCCESS : NRFS_ERR_IPC;
+	} else if (size <= MAX_PACKET_DATA_SIZE) {
 		int err;
 		struct ipc_data_packet tx_data;
 

From dd8e9c997754ae46d6eba1af14a9bdd383dcf09b Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Fri, 13 Dec 2024 12:53:09 +0100
Subject: [PATCH 0878/2913] Revert "[nrf fromlist] tests: drivers: spi: nordic:
 add device PM runtime"

This reverts commit 21246912543a9e8c13f635021ffea00f5d3de9da.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
---
 .../boards/nrf52840dk_nrf52840.overlay                      | 2 --
 .../boards/nrf54h20dk_nrf54h20_common.dtsi                  | 1 -
 .../boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay          | 1 -
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay               | 2 --
 tests/drivers/spi/spi_controller_peripheral/testcase.yaml   | 6 ------
 .../spi/spi_loopback/boards/nrf51dk_nrf51822.overlay        | 1 -
 .../spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay     | 1 -
 .../spi/spi_loopback/boards/nrf52dk_nrf52832.overlay        | 1 -
 .../spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay  | 1 -
 .../boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay          | 1 -
 .../spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay  | 1 -
 .../spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay       | 1 -
 tests/drivers/spi/spi_loopback/testcase.yaml                | 5 -----
 13 files changed, 24 deletions(-)

diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
index 91cd073041e..97802a7a637 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
@@ -50,11 +50,9 @@
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
-	zephyr,pm-device-runtime-auto;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(8)>;
 	};
 };
 
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi
index d431933ab5a..8661760a5e3 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi
@@ -60,7 +60,6 @@
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
-	zephyr,pm-device-runtime-auto;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
index 4441819249f..0523426db45 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
@@ -55,7 +55,6 @@
 	overrun-character = <0x00>;
 	memory-regions = <&dma_fast_region>;
 	cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
-	zephyr,pm-device-runtime-auto;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 0188a2c4e24..73a50a7c6fc 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -54,11 +54,9 @@
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
-	zephyr,pm-device-runtime-auto;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(16)>;
 	};
 };
 
diff --git a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
index 51a503e9231..675259a4dd0 100644
--- a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
+++ b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
@@ -57,9 +57,3 @@ tests:
       - nrf52840dk/nrf52840
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
-
-  drivers.spi.pm_runtime:
-    extra_configs:
-      - CONFIG_PM_DEVICE=y
-      - CONFIG_PM_DEVICE_RUNTIME=y
-    filter: CONFIG_SOC_FAMILY_NORDIC_NRF
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay b/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay
index 06a0d63816a..812f643f3e8 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay
@@ -7,7 +7,6 @@
 &spi1 {
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
-	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay
index 7de4d8d6322..7f511d0753d 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay
@@ -8,7 +8,6 @@
 	overrun-character = <0x00>;
 	rx-delay = <1>;
 	cs-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
-	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay b/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay
index 06a0d63816a..812f643f3e8 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay
@@ -7,7 +7,6 @@
 &spi1 {
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
-	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index 6743e1d0933..89e5fbad08a 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -30,7 +30,6 @@
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
 	memory-regions = <&cpuapp_dma_region>;
-	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
index 2857c48f6fb..d6c3c972afd 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
@@ -30,7 +30,6 @@
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
 	memory-regions = <&dma_fast_region>;
-	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 8dcf6fd190d..f2e84b72f9b 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -29,7 +29,6 @@
 	pinctrl-1 = <&spi00_sleep>;
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
-	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay b/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay
index bcd2472166a..a07ed5fbf5d 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay
@@ -7,7 +7,6 @@
 &spi3 {
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
-	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml
index c65ec904d37..5760aa0d879 100644
--- a/tests/drivers/spi/spi_loopback/testcase.yaml
+++ b/tests/drivers/spi/spi_loopback/testcase.yaml
@@ -204,8 +204,3 @@ tests:
   drivers.spi.max32_dma.loopback:
     extra_args: OVERLAY_CONFIG="overlay-max32-spi-dma.conf"
     filter: CONFIG_SOC_FAMILY_MAX32
-  drivers.spi.nrf_pm_runtime:
-    extra_configs:
-      - CONFIG_PM_DEVICE=y
-      - CONFIG_PM_DEVICE_RUNTIME=y
-    filter: CONFIG_SOC_FAMILY_NORDIC_NRF

From 10ab197c7d330c0ad89339ccbff8e2f3e69c7e32 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Fri, 13 Dec 2024 12:53:57 +0100
Subject: [PATCH 0879/2913] Revert "[nrf fromlist] drivers: spi: nrfx_spim: Add
 support for device runtime PM"

This reverts commit 22632c9c7cd4c56118e9f1f7495e67d814320ec0.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
---
 drivers/spi/spi_nrfx_spim.c | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c
index aacf863e3b4..b0eecc07625 100644
--- a/drivers/spi/spi_nrfx_spim.c
+++ b/drivers/spi/spi_nrfx_spim.c
@@ -8,7 +8,6 @@
 #include <zephyr/drivers/spi/rtio.h>
 #include <zephyr/cache.h>
 #include <zephyr/pm/device.h>
-#include <zephyr/pm/device_runtime.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
 #include <soc.h>
@@ -91,9 +90,6 @@ static inline void finalize_spi_transaction(const struct device *dev, bool deact
 	if (NRF_SPIM_IS_320MHZ_SPIM(reg) && !(dev_data->ctx.config->operation & SPI_HOLD_ON_CS)) {
 		nrfy_spim_disable(reg);
 	}
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_put(dev);
-	}
 }
 
 static inline uint32_t get_nrf_spim_frequency(uint32_t frequency)
@@ -464,9 +460,6 @@ static int transceive(const struct device *dev,
 	void *reg = dev_config->spim.p_reg;
 	int error;
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_get(dev);
-	}
 	spi_context_lock(&dev_data->ctx, asynchronous, cb, userdata, spi_cfg);
 
 	error = configure(dev, spi_cfg);
@@ -578,20 +571,21 @@ static const struct spi_driver_api spi_nrfx_driver_api = {
 	.release = spi_nrfx_release,
 };
 
+#ifdef CONFIG_PM_DEVICE
 static int spim_nrfx_pm_action(const struct device *dev,
 			       enum pm_device_action action)
 {
-	int ret = -ENOTSUP;
+	int ret = 0;
 	struct spi_nrfx_data *dev_data = dev->data;
 	const struct spi_nrfx_config *dev_config = dev->config;
 
 	switch (action) {
-	case PM_DEVICE_ACTION_TURN_ON:
-		ret = 0;
-		break;
 	case PM_DEVICE_ACTION_RESUME:
 		ret = pinctrl_apply_state(dev_config->pcfg,
 					  PINCTRL_STATE_DEFAULT);
+		if (ret < 0) {
+			return ret;
+		}
 		/* nrfx_spim_init() will be called at configuration before
 		 * the next transfer.
 		 */
@@ -614,14 +608,19 @@ static int spim_nrfx_pm_action(const struct device *dev,
 
 		ret = pinctrl_apply_state(dev_config->pcfg,
 					  PINCTRL_STATE_SLEEP);
+		if (ret < 0) {
+			return ret;
+		}
 		break;
 
 	default:
-		break;
+		ret = -ENOTSUP;
 	}
 
 	return ret;
 }
+#endif /* CONFIG_PM_DEVICE */
+
 
 static int spi_nrfx_init(const struct device *dev)
 {
@@ -656,12 +655,10 @@ static int spi_nrfx_init(const struct device *dev)
 	spi_context_unlock_unconditionally(&dev_data->ctx);
 
 #ifdef CONFIG_SOC_NRF52832_ALLOW_SPIM_DESPITE_PAN_58
-	err = anomaly_58_workaround_init(dev);
-	if (err < 0) {
-		return err;
-	}
+	return anomaly_58_workaround_init(dev);
+#else
+	return 0;
 #endif
-	return pm_device_driver_init(dev, spim_nrfx_pm_action);
 }
 /*
  * We use NODELABEL here because the nrfx API requires us to call

From ffb3d0d6b60c9ea2abf9663e7fb28eebe800b31c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 24 Jun 2024 10:55:11 +0200
Subject: [PATCH 0880/2913] [nrf fromtree] tests: drivers: spi:
 spi_controller_peripheral: Add nrf54h20dk cpuppr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rework existing nrf54h20dk overlays to allow adding of
nrf54h20dk//cpuppr target.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 949566f829631d1b1f4fdaa93acdd0d1ac1ce0a0)
---
 .../boards/nrf54h20dk_nrf54h20_cpuppr.overlay    |  6 ++++++
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay    | 16 ++++++++++++++++
 .../sysbuild/vpr_launcher/prj.conf               |  1 +
 .../spi/spi_controller_peripheral/testcase.yaml  |  5 +++--
 4 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
 create mode 100644 tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/prj.conf

diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
new file mode 100644
index 00000000000..83d3121c189
--- /dev/null
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
@@ -0,0 +1,6 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include "nrf54h20dk_nrf54h20_common.dtsi"
diff --git a/tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..4343187f21f
--- /dev/null
+++ b/tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include "../../../boards/nrf54h20dk_nrf54h20_common.dtsi"
+
+&spi130 {
+	status = "reserved";
+	interrupt-parent = <&cpuppr_clic>;
+};
+
+&dut_spis {
+	status = "reserved";
+	interrupt-parent = <&cpuppr_clic>;
+};
diff --git a/tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/prj.conf b/tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/prj.conf
new file mode 100644
index 00000000000..b2a4ba59104
--- /dev/null
+++ b/tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/prj.conf
@@ -0,0 +1 @@
+# nothing here
diff --git a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
index 675259a4dd0..e55a6a6a69d 100644
--- a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
+++ b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
@@ -5,8 +5,8 @@ common:
   harness_config:
     fixture: gpio_spi_loopback
   platform_allow: |
-    nrf52840dk/nrf52840 nrf54l15dk/nrf54l15/cpuapp
-    nrf54h20dk/nrf54h20/cpuapp nrf54h20dk/nrf54h20/cpurad
+    nrf52840dk/nrf52840 nrf54l15dk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp
+    nrf54h20dk/nrf54h20/cpurad nrf54h20dk/nrf54h20/cpuppr
 
 tests:
   drivers.spi.spi_mode0:
@@ -57,3 +57,4 @@ tests:
       - nrf52840dk/nrf52840
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
+      - nrf54h20dk/nrf54h20/cpuppr

From 8d80b676bb60aea17c55b2edf40f9f05ca8cbd84 Mon Sep 17 00:00:00 2001
From: Ayush Singh <ayush@beagleboard.org>
Date: Tue, 8 Oct 2024 20:42:35 +0530
Subject: [PATCH 0881/2913] [nrf fromtree] samples: net: sockets: echo_server:
 Add 802154-subg test

- Using beagleconnect freedom for testing subg overlay

Signed-off-by: Ayush Singh <ayush@beagleboard.org>
(cherry picked from commit 40d8926b20e5fa065bc3f694b5925ec0c1d86b59)
---
 samples/net/sockets/echo_server/sample.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/samples/net/sockets/echo_server/sample.yaml b/samples/net/sockets/echo_server/sample.yaml
index b1f2b6009e2..949b34e9cbb 100644
--- a/samples/net/sockets/echo_server/sample.yaml
+++ b/samples/net/sockets/echo_server/sample.yaml
@@ -142,3 +142,6 @@ tests:
       - native_sim/native/64
     extra_args:
       - OVERLAY_CONFIG="overlay-nsos.conf"
+  sample.net.sockets.echo_server.802154.subg:
+    extra_args: EXTRA_CONF_FILE="overlay-802154-subg.conf"
+    platform_allow: beagleconnect_freedom

From 0982e74dfd328ded59680e8a2263051e69e40ea7 Mon Sep 17 00:00:00 2001
From: Andrej Butok <andrey.butok@nxp.com>
Date: Mon, 7 Oct 2024 15:05:24 +0200
Subject: [PATCH 0882/2913] [nrf fromtree] yaml: use EXTRA_CONF_FILE in .yaml
 files

Use EXTRA_CONF_FILE in sample yaml files,
that replaced deprecated OVERLAY_CONFIG
since the Zephyr v3.4 release.

Signed-off-by: Andrej Butok <andrey.butok@nxp.com>
(cherry picked from commit e53eec08512e083e5e22e4874541e800a4e54e95)
---
 samples/drivers/jesd216/sample.yaml           |  2 +-
 samples/drivers/spi_flash_at45/sample.yaml    |  8 ++---
 .../modules/thrift/hello/client/sample.yaml   |  2 +-
 .../modules/thrift/hello/server/sample.yaml   |  2 +-
 .../net/cloud/tagoio_http_post/sample.yaml    |  4 +--
 samples/net/lwm2m_client/sample.yaml          |  4 +--
 .../net/openthread/coprocessor/sample.yaml    |  4 +--
 .../secure_mqtt_sensor_actuator/sample.yaml   |  4 +--
 .../net/sockets/big_http_download/sample.yaml |  2 +-
 .../net/sockets/dumb_http_server/sample.yaml  |  4 +--
 samples/net/sockets/echo_client/sample.yaml   | 28 +++++++--------
 samples/net/sockets/echo_server/sample.yaml   | 36 +++++++++----------
 samples/net/sockets/http_get/sample.yaml      |  4 +--
 samples/net/zperf/sample.yaml                 |  8 ++---
 samples/subsys/fs/fs_sample/sample.yaml       |  6 ++--
 samples/subsys/fs/littlefs/sample.yaml        | 14 ++++----
 samples/subsys/logging/logger/sample.yaml     |  2 +-
 samples/subsys/logging/syst/sample.yaml       | 10 +++---
 .../subsys/mgmt/mcumgr/smp_svr/sample.yaml    | 20 +++++------
 samples/subsys/mgmt/updatehub/sample.yaml     |  4 +--
 samples/subsys/modbus/rtu_server/sample.yaml  |  2 +-
 samples/subsys/shell/devmem_load/sample.yaml  |  2 +-
 samples/subsys/shell/shell_module/sample.yaml |  4 +--
 samples/subsys/usb/dfu/sample.yaml            |  2 +-
 .../mcuboot_recovery_retention/testcase.yaml  |  2 +-
 tests/crypto/secp256r1/testcase.yaml          |  6 ++--
 tests/drivers/adc/adc_api/testcase.yaml       |  6 ++--
 tests/drivers/bbram/testcase.yaml             |  4 +--
 tests/drivers/build_all/sensor/testcase.yaml  | 12 +++----
 tests/drivers/eeprom/api/testcase.yaml        |  2 +-
 tests/drivers/entropy/api/testcase.yaml       |  4 +--
 tests/drivers/flash/common/testcase.yaml      | 14 ++++----
 tests/drivers/retained_mem/api/testcase.yaml  |  2 +-
 tests/drivers/spi/spi_loopback/testcase.yaml  | 22 ++++++------
 .../drivers/uart/uart_basic_api/testcase.yaml |  2 +-
 .../watchdog/wdt_basic_api/testcase.yaml      |  2 +-
 tests/lib/gui/lvgl/testcase.yaml              |  2 +-
 tests/modules/thrift/ThriftTest/testcase.yaml |  2 +-
 tests/net/lib/tls_credentials/testcase.yaml   |  2 +-
 tests/subsys/dfu/img_util/testcase.yaml       |  2 +-
 .../logging/log_switch_format/testcase.yaml   |  6 ++--
 .../mgmt/mcumgr/all_options/testcase.yaml     |  2 +-
 .../fs_mgmt_hash_supported/testcase.yaml      |  6 ++--
 .../mgmt/mcumgr/handler_demo/testcase.yaml    |  2 +-
 tests/subsys/pm/power_mgmt/testcase.yaml      |  2 +-
 .../settings/functional/nvs/testcase.yaml     |  2 +-
 tests/subsys/storage/flash_map/testcase.yaml  |  6 ++--
 47 files changed, 145 insertions(+), 145 deletions(-)

diff --git a/samples/drivers/jesd216/sample.yaml b/samples/drivers/jesd216/sample.yaml
index c2742a68d46..afc3b200554 100644
--- a/samples/drivers/jesd216/sample.yaml
+++ b/samples/drivers/jesd216/sample.yaml
@@ -24,7 +24,7 @@ tests:
   sample.drivers.jesd216.nrf52840dk_spi:
     extra_args:
       - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_spi.overlay
-      - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_spi.conf
+      - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_spi.conf
     platform_allow: nrf52840dk/nrf52840
     integration_platforms:
       - nrf52840dk/nrf52840
diff --git a/samples/drivers/spi_flash_at45/sample.yaml b/samples/drivers/spi_flash_at45/sample.yaml
index 2195f6f7756..c362fa5a693 100644
--- a/samples/drivers/spi_flash_at45/sample.yaml
+++ b/samples/drivers/spi_flash_at45/sample.yaml
@@ -9,7 +9,7 @@ tests:
     filter: dt_compat_enabled("atmel,at45")
     build_only: true
   sample.drivers.spi.flash.at45.build.page_layout:
-    extra_args: OVERLAY_CONFIG="overlay-page_layout.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-page_layout.conf"
     tags:
       - spi
       - flash
@@ -17,7 +17,7 @@ tests:
     filter: dt_compat_enabled("atmel,at45")
     build_only: true
   sample.drivers.spi.flash.at45.build.pm:
-    extra_args: OVERLAY_CONFIG="overlay-pm.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-pm.conf"
     tags:
       - spi
       - flash
@@ -25,7 +25,7 @@ tests:
     filter: dt_compat_enabled("atmel,at45")
     build_only: true
   sample.drivers.spi.flash.at45.build.page_layout_pm:
-    extra_args: OVERLAY_CONFIG="overlay-page_layout.conf;overlay-pm.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-page_layout.conf;overlay-pm.conf"
     tags:
       - spi
       - flash
@@ -33,7 +33,7 @@ tests:
     filter: dt_compat_enabled("atmel,at45")
     build_only: true
   sample.drivers.spi.flash.at45:
-    extra_args: OVERLAY_CONFIG="overlay-page_layout.conf;overlay-pm.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-page_layout.conf;overlay-pm.conf"
     tags:
       - spi
       - flash
diff --git a/samples/modules/thrift/hello/client/sample.yaml b/samples/modules/thrift/hello/client/sample.yaml
index 6a1ef0caecd..319d49a506d 100644
--- a/samples/modules/thrift/hello/client/sample.yaml
+++ b/samples/modules/thrift/hello/client/sample.yaml
@@ -21,4 +21,4 @@ tests:
     extra_configs:
       - CONFIG_THRIFT_COMPACT_PROTOCOL=y
   sample.thrift.hello.client.tlsTransport:
-    extra_args: OVERLAY_CONFIG="../overlay-tls.conf"
+    extra_args: EXTRA_CONF_FILE="../overlay-tls.conf"
diff --git a/samples/modules/thrift/hello/server/sample.yaml b/samples/modules/thrift/hello/server/sample.yaml
index 02bfe323d01..eca296a8a1c 100644
--- a/samples/modules/thrift/hello/server/sample.yaml
+++ b/samples/modules/thrift/hello/server/sample.yaml
@@ -21,4 +21,4 @@ tests:
     extra_configs:
       - CONFIG_THRIFT_COMPACT_PROTOCOL=y
   sample.thrift.hello.server.tlsTransport:
-    extra_args: OVERLAY_CONFIG="../overlay-tls.conf"
+    extra_args: EXTRA_CONF_FILE="../overlay-tls.conf"
diff --git a/samples/net/cloud/tagoio_http_post/sample.yaml b/samples/net/cloud/tagoio_http_post/sample.yaml
index 08a67c0343a..6265708da27 100644
--- a/samples/net/cloud/tagoio_http_post/sample.yaml
+++ b/samples/net/cloud/tagoio_http_post/sample.yaml
@@ -18,12 +18,12 @@ tests:
     integration_platforms:
       - frdm_k64f
   sample.net.cloud.tagoio_http_post.wifi:
-    extra_args: OVERLAY_CONFIG="overlay-wifi.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-wifi.conf"
     platform_allow: disco_l475_iot1
   sample.net.cloud.tagoio_http_post.wifi.esp:
     extra_args:
       - SHIELD=esp_8266_arduino
-      - OVERLAY_CONFIG="overlay-wifi.conf"
+      - EXTRA_CONF_FILE="overlay-wifi.conf"
     platform_allow:
       - frdm_k64f
       - nucleo_f767zi
diff --git a/samples/net/lwm2m_client/sample.yaml b/samples/net/lwm2m_client/sample.yaml
index f70290d287e..5c8f0eb7f11 100644
--- a/samples/net/lwm2m_client/sample.yaml
+++ b/samples/net/lwm2m_client/sample.yaml
@@ -40,7 +40,7 @@ tests:
   sample.net.lwm2m_client.dtls:
     harness: net
     depends_on: netif
-    extra_args: OVERLAY_CONFIG=overlay-dtls.conf
+    extra_args: EXTRA_CONF_FILE=overlay-dtls.conf
     platform_allow:
       - qemu_x86
       - frdm_k64f
@@ -55,7 +55,7 @@ tests:
   sample.net.lwm2m_client.queue_mode:
     harness: net
     depends_on: netif
-    extra_args: OVERLAY_CONFIG=overlay-queue.conf
+    extra_args: EXTRA_CONF_FILE=overlay-queue.conf
     platform_allow:
       - qemu_x86
       - native_sim
diff --git a/samples/net/openthread/coprocessor/sample.yaml b/samples/net/openthread/coprocessor/sample.yaml
index aa917223de9..26487beb0f3 100644
--- a/samples/net/openthread/coprocessor/sample.yaml
+++ b/samples/net/openthread/coprocessor/sample.yaml
@@ -26,7 +26,7 @@ tests:
       - nrf52840dk/nrf52840
     tags: ci_build
     extra_args:
-      - OVERLAY_CONFIG=overlay-usb-nrf-br.conf
+      - EXTRA_CONF_FILE=overlay-usb-nrf-br.conf
       - DTC_OVERLAY_FILE="usb.overlay"
   sample.openthread.coprocessor.rcp:
     build_only: true
@@ -36,4 +36,4 @@ tests:
       - tlsr9518adk80d
     integration_platforms:
       - nrf52840dk/nrf52840
-    extra_args: OVERLAY_CONFIG=overlay-rcp.conf
+    extra_args: EXTRA_CONF_FILE=overlay-rcp.conf
diff --git a/samples/net/secure_mqtt_sensor_actuator/sample.yaml b/samples/net/secure_mqtt_sensor_actuator/sample.yaml
index 44b9a4d7d2a..f970f9a53d7 100644
--- a/samples/net/secure_mqtt_sensor_actuator/sample.yaml
+++ b/samples/net/secure_mqtt_sensor_actuator/sample.yaml
@@ -12,7 +12,7 @@ tests:
       - adi_eval_adin1110ebz
   sample.net.secure_mqtt_sensor_actuator.staticip:
     harness: net
-    extra_args: OVERLAY_CONFIG="overlay-static.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-static.conf"
     tags:
       - net
       - mqtt
@@ -22,7 +22,7 @@ tests:
       - native_sim
   sample.net.secure_mqtt_sensor_actuator.staticip_insecure:
     harness: net
-    extra_args: OVERLAY_CONFIG="overlay-static-insecure.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-static-insecure.conf"
     tags:
       - net
       - mqtt
diff --git a/samples/net/sockets/big_http_download/sample.yaml b/samples/net/sockets/big_http_download/sample.yaml
index d27f131836d..0851eeffec0 100644
--- a/samples/net/sockets/big_http_download/sample.yaml
+++ b/samples/net/sockets/big_http_download/sample.yaml
@@ -18,4 +18,4 @@ tests:
     extra_configs:
       - CONFIG_POSIX_API=y
   sample.net.sockets.big_http_download.ci:
-    extra_args: OVERLAY_CONFIG=overlay-ci.conf
+    extra_args: EXTRA_CONF_FILE=overlay-ci.conf
diff --git a/samples/net/sockets/dumb_http_server/sample.yaml b/samples/net/sockets/dumb_http_server/sample.yaml
index 53fe319293d..7e076a94eb1 100644
--- a/samples/net/sockets/dumb_http_server/sample.yaml
+++ b/samples/net/sockets/dumb_http_server/sample.yaml
@@ -17,7 +17,7 @@ tests:
   sample.net.sockets.dumb_http_server.netusb:
     depends_on: usb_device
     harness: net
-    extra_args: OVERLAY_CONFIG="overlay-netusb.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-netusb.conf"
     tags: usb
     # native_sim usb driver does not work with CONFIG_POSIX_API
     platform_exclude:
@@ -28,7 +28,7 @@ tests:
   sample.net.sockets.dumb_http_server.netusb_zeroconf:
     depends_on: usb_device
     harness: net
-    extra_args: OVERLAY_CONFIG="overlay-netusb.conf;overlay-zeroconf.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-netusb.conf;overlay-zeroconf.conf"
     tags: usb
     # native_sim usb driver does not work with CONFIG_POSIX_API
     platform_exclude:
diff --git a/samples/net/sockets/echo_client/sample.yaml b/samples/net/sockets/echo_client/sample.yaml
index 2f3d58fb81c..b10777df087 100644
--- a/samples/net/sockets/echo_client/sample.yaml
+++ b/samples/net/sockets/echo_client/sample.yaml
@@ -19,20 +19,20 @@ tests:
     integration_platforms:
       - qemu_x86
   sample.net.sockets.echo_client.802154:
-    extra_args: OVERLAY_CONFIG="overlay-qemu_802154.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-qemu_802154.conf"
     platform_allow: qemu_x86
   sample.net.sockets.echo_client.802154.rf2xx:
-    extra_args: OVERLAY_CONFIG="overlay-802154.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-802154.conf"
     platform_allow: samr21_xpro
   sample.net.sockets.echo_client.802154.rf2xx.xplained:
     extra_args:
       - SHIELD=atmel_rf2xx_xplained
-      - OVERLAY_CONFIG="overlay-802154.conf"
+      - EXTRA_CONF_FILE="overlay-802154.conf"
     platform_allow: sam4s_xplained
   sample.net.sockets.echo_client.802154.rf2xx.xpro:
     extra_args:
       - SHIELD=atmel_rf2xx_xpro
-      - OVERLAY_CONFIG="overlay-802154.conf"
+      - EXTRA_CONF_FILE="overlay-802154.conf"
     platform_allow:
       - sam4e_xpro
       - sam_v71_xult/samv71q21
@@ -41,7 +41,7 @@ tests:
   sample.net.sockets.echo_client.802154.rf2xx.legacy:
     extra_args:
       - SHIELD=atmel_rf2xx_legacy
-      - OVERLAY_CONFIG="overlay-802154.conf"
+      - EXTRA_CONF_FILE="overlay-802154.conf"
     platform_allow:
       - sam4e_xpro
       - sam_v71_xult/samv71q21
@@ -50,7 +50,7 @@ tests:
   sample.net.sockets.echo_client.802154.rf2xx.arduino:
     extra_args:
       - SHIELD=atmel_rf2xx_arduino
-      - OVERLAY_CONFIG="overlay-802154.conf"
+      - EXTRA_CONF_FILE="overlay-802154.conf"
     platform_allow:
       - sam_v71_xult/samv71q21
       - frdm_k64f
@@ -60,18 +60,18 @@ tests:
   sample.net.sockets.echo_client.802154.rf2xx.mikrobus:
     extra_args:
       - SHIELD=atmel_rf2xx_mikrobus
-      - OVERLAY_CONFIG="overlay-802154.conf"
+      - EXTRA_CONF_FILE="overlay-802154.conf"
     platform_allow: lpcxpresso55s69/lpc55s69/cpu0/ns
   sample.net.sockets.echo_client.mcr20a:
     extra_args:
       - SHIELD=frdm_cr20a
-      - OVERLAY_CONFIG=overlay-802154.conf
+      - EXTRA_CONF_FILE=overlay-802154.conf
     platform_allow: frdm_k64f
   sample.net.sockets.echo_client.nrf_802154:
-    extra_args: OVERLAY_CONFIG="overlay-802154.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-802154.conf"
     platform_allow: nrf52840dk/nrf52840
   sample.net.sockets.echo_client.nrf_openthread:
-    extra_args: OVERLAY_CONFIG="overlay-ot.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
     slow: true
     tags:
       - net
@@ -79,10 +79,10 @@ tests:
     platform_allow: nrf52840dk/nrf52840
     filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   sample.net.sockets.echo_client.b91_802154:
-    extra_args: OVERLAY_CONFIG="overlay-802154.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-802154.conf"
     platform_allow: tlsr9518adk80d
   sample.net.sockets.echo_client.b91_openthread:
-    extra_args: OVERLAY_CONFIG="overlay-ot.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
     slow: true
     tags:
       - net
@@ -90,7 +90,7 @@ tests:
     platform_allow: tlsr9518adk80d
     filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   sample.net.sockets.echo_client.kw41z_openthread:
-    extra_args: OVERLAY_CONFIG="overlay-ot.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
     slow: true
     tags:
       - net
@@ -100,7 +100,7 @@ tests:
   sample.net.sockets.echo_client.userspace:
     extra_args:
       - CONFIG_USERSPACE=y
-      - OVERLAY_CONFIG="overlay-e1000.conf"
+      - EXTRA_CONF_FILE="overlay-e1000.conf"
     platform_allow:
       - qemu_x86
       - qemu_x86_64
diff --git a/samples/net/sockets/echo_server/sample.yaml b/samples/net/sockets/echo_server/sample.yaml
index 949b34e9cbb..224221a4f8b 100644
--- a/samples/net/sockets/echo_server/sample.yaml
+++ b/samples/net/sockets/echo_server/sample.yaml
@@ -22,19 +22,19 @@ tests:
     integration_platforms:
       - qemu_x86
   sample.net.sockets.echo_server.802154:
-    extra_args: OVERLAY_CONFIG="overlay-qemu_802154.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-qemu_802154.conf"
     platform_allow: qemu_x86
     integration_platforms:
       - qemu_x86
   sample.net.sockets.echo_server.802154.rf2xx.xplained:
     extra_args:
       - SHIELD=atmel_rf2xx_xplained
-      - OVERLAY_CONFIG="overlay-802154.conf"
+      - EXTRA_CONF_FILE="overlay-802154.conf"
     platform_allow: sam4s_xplained
   sample.net.sockets.echo_server.802154.rf2xx.xpro:
     extra_args:
       - SHIELD=atmel_rf2xx_xpro
-      - OVERLAY_CONFIG="overlay-802154.conf"
+      - EXTRA_CONF_FILE="overlay-802154.conf"
     platform_allow:
       - sam4e_xpro
       - sam_v71_xult/samv71q21
@@ -43,7 +43,7 @@ tests:
   sample.net.sockets.echo_server.802154.rf2xx.legacy:
     extra_args:
       - SHIELD=atmel_rf2xx_legacy
-      - OVERLAY_CONFIG="overlay-802154.conf"
+      - EXTRA_CONF_FILE="overlay-802154.conf"
     platform_allow:
       - sam4e_xpro
       - sam_v71_xult/samv71q21
@@ -52,7 +52,7 @@ tests:
   sample.net.sockets.echo_server.802154.rf2xx.arduino:
     extra_args:
       - SHIELD=atmel_rf2xx_arduino
-      - OVERLAY_CONFIG="overlay-802154.conf"
+      - EXTRA_CONF_FILE="overlay-802154.conf"
     platform_allow:
       - sam_v71_xult/samv71q21
       - frdm_k64f
@@ -62,23 +62,23 @@ tests:
   sample.net.sockets.echo_server.802154.rf2xx.mikrobus:
     extra_args:
       - SHIELD=atmel_rf2xx_mikrobus
-      - OVERLAY_CONFIG="overlay-802154.conf"
+      - EXTRA_CONF_FILE="overlay-802154.conf"
     platform_allow: lpcxpresso55s69/lpc55s69/cpu0/ns
   sample.net.sockets.echo_server.mcr20a:
     extra_args:
       - SHIELD=frdm_cr20a
-      - OVERLAY_CONFIG=overlay-802154.conf
+      - EXTRA_CONF_FILE=overlay-802154.conf
     platform_allow: frdm_k64f
   sample.net.sockets.echo_server.nrf_802154:
-    extra_args: OVERLAY_CONFIG="overlay-802154.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-802154.conf"
     platform_allow: nrf52840dk/nrf52840
   sample.net.sockets.echo_server.b91_802154:
-    extra_args: OVERLAY_CONFIG="overlay-802154.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-802154.conf"
     platform_allow: tlsr9518adk80d
   sample.net.sockets.echo_server.usbnet:
     depends_on: usb_device
     harness: net
-    extra_args: OVERLAY_CONFIG="overlay-netusb.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-netusb.conf"
     tags:
       - net
       - usb
@@ -89,7 +89,7 @@ tests:
       - native_posix
       - native_posix/native/64
   sample.net.sockets.echo_server.nrf_openthread:
-    extra_args: OVERLAY_CONFIG="overlay-ot.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
     slow: true
     tags:
       - net
@@ -97,7 +97,7 @@ tests:
     platform_allow: nrf52840dk/nrf52840
     filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   sample.net.sockets.echo_server.b91_openthread:
-    extra_args: OVERLAY_CONFIG="overlay-ot.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
     slow: true
     tags:
       - net
@@ -105,7 +105,7 @@ tests:
     platform_allow: tlsr9518adk80d
     filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   sample.net.sockets.echo_server.kw41z_openthread:
-    extra_args: OVERLAY_CONFIG="overlay-ot.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
     slow: true
     tags:
       - net
@@ -113,23 +113,23 @@ tests:
     platform_allow: frdm_kw41z
     filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   sample.net.sockets.echo_server.e1000:
-    extra_args: OVERLAY_CONFIG="overlay-e1000.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-e1000.conf"
     tags: net
     platform_allow:
       - qemu_x86
       - qemu_x86_64
   sample.net.sockets.echo_server.stellaris:
-    extra_args: OVERLAY_CONFIG="overlay-qemu_cortex_m3_eth.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-qemu_cortex_m3_eth.conf"
     tags: net
     platform_allow: qemu_cortex_m3
   sample.net.sockets.echo_server.smsc911x:
-    extra_args: OVERLAY_CONFIG="overlay-smsc911x.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-smsc911x.conf"
     tags: net
     platform_allow: mps2/an385
   sample.net.sockets.echo_server.userspace:
     extra_args:
       - CONFIG_USERSPACE=y
-      - OVERLAY_CONFIG="overlay-e1000.conf"
+      - EXTRA_CONF_FILE="overlay-e1000.conf"
       - CONFIG_MAX_THREAD_BYTES=3
     platform_allow:
       - qemu_x86
@@ -141,7 +141,7 @@ tests:
       - native_sim
       - native_sim/native/64
     extra_args:
-      - OVERLAY_CONFIG="overlay-nsos.conf"
+      - EXTRA_CONF_FILE="overlay-nsos.conf"
   sample.net.sockets.echo_server.802154.subg:
     extra_args: EXTRA_CONF_FILE="overlay-802154-subg.conf"
     platform_allow: beagleconnect_freedom
diff --git a/samples/net/sockets/http_get/sample.yaml b/samples/net/sockets/http_get/sample.yaml
index 292058bfce9..8e94ffaf341 100644
--- a/samples/net/sockets/http_get/sample.yaml
+++ b/samples/net/sockets/http_get/sample.yaml
@@ -43,7 +43,7 @@ tests:
     platform_allow:
       - native_sim
       - native_sim/native/64
-    extra_args: OVERLAY_CONFIG="overlay-nsos.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-nsos.conf"
   sample.net.sockets.http_get.nsos.https:
     harness: console
     harness_config:
@@ -56,7 +56,7 @@ tests:
     platform_allow:
       - native_sim
       - native_sim/native/64
-    extra_args: OVERLAY_CONFIG="overlay-nsos.conf;overlay-tls.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-nsos.conf;overlay-tls.conf"
   sample.net.sockets.http_get.wifi.nrf70dk:
     extra_args:
       - SNIPPET=wifi-ipv4
diff --git a/samples/net/zperf/sample.yaml b/samples/net/zperf/sample.yaml
index 35260fd723a..3c5e30bb47b 100644
--- a/samples/net/zperf/sample.yaml
+++ b/samples/net/zperf/sample.yaml
@@ -34,7 +34,7 @@ tests:
     platform_allow: qemu_x86
   sample.net.zperf.netusb_ecm:
     harness: net
-    extra_args: OVERLAY_CONFIG="overlay-netusb.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-netusb.conf"
     tags:
       - usb
       - net
@@ -48,14 +48,14 @@ tests:
       - native_posix/native/64
   sample.net.zperf.device_next_ecm:
     harness: net
-    extra_args: OVERLAY_CONFIG="overlay-usbd_next_ecm.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-usbd_next_ecm.conf"
                 DTC_OVERLAY_FILE="usbd_next_ecm.overlay"
     platform_allow: nrf52840dk/nrf52840 frdm_k64f
     tags: usb net zperf
     depends_on: usb_device
   sample.net.zperf.netusb_eem:
     harness: net
-    extra_args: OVERLAY_CONFIG="overlay-netusb.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-netusb.conf"
     extra_configs:
       - CONFIG_USB_DEVICE_NETWORK_ECM=n
       - CONFIG_USB_DEVICE_NETWORK_EEM=y
@@ -72,7 +72,7 @@ tests:
       - native_posix/native/64
   sample.net.zperf.netusb_rndis:
     harness: net
-    extra_args: OVERLAY_CONFIG="overlay-netusb.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-netusb.conf"
     extra_configs:
       - CONFIG_USB_DEVICE_NETWORK_ECM=n
       - CONFIG_USB_DEVICE_NETWORK_RNDIS=y
diff --git a/samples/subsys/fs/fs_sample/sample.yaml b/samples/subsys/fs/fs_sample/sample.yaml
index b16976876be..91c0fe100b4 100644
--- a/samples/subsys/fs/fs_sample/sample.yaml
+++ b/samples/subsys/fs/fs_sample/sample.yaml
@@ -47,13 +47,13 @@ tests:
     build_only: true
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_ram_disk.conf
+      - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_ram_disk.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_ram_disk.overlay
   sample.filesystem.fat_fs.nrf52840dk_nrf52840_ram_disk_region:
     build_only: true
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_ram_disk.conf
+      - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_ram_disk.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_ram_disk_region.overlay
   sample.filesystem.fat_fs.nrf54l15dk:
     build_only: true
@@ -62,7 +62,7 @@ tests:
     build_only: true
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_qspi.conf
+      - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_qspi.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_qspi.overlay
   sample.filesystem.fat_fs.has_sdmmc_disk:
     build_only: true
diff --git a/samples/subsys/fs/littlefs/sample.yaml b/samples/subsys/fs/littlefs/sample.yaml
index 2160d38515e..ea62b0103ca 100644
--- a/samples/subsys/fs/littlefs/sample.yaml
+++ b/samples/subsys/fs/littlefs/sample.yaml
@@ -40,19 +40,19 @@ tests:
     build_only: true
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_spi.conf
+      - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_spi.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_spi.overlay
   sample.filesystem.littlefs.nrf52840dk_qspi:
     build_only: true
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_qspi.conf
+      - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_qspi.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_qspi.overlay
   sample.filesystem.littlefs.stm32h747i_disco_m7_blk:
     build_only: true
     platform_allow: stm32h747i_disco/stm32h747xx/m7
     extra_args:
-      - OVERLAY_CONFIG=boards/stm32_blk.conf
+      - EXTRA_CONF_FILE=boards/stm32_blk.conf
       - CONF_FILE=prj_blk.conf
     extra_configs:
       - CONFIG_SDMMC_STM32_HWFC=y
@@ -60,23 +60,23 @@ tests:
     build_only: true
     platform_allow: nucleo_h743zi
     extra_args:
-      - OVERLAY_CONFIG=boards/nucleo_h743zi_qspi.conf
+      - EXTRA_CONF_FILE=boards/nucleo_h743zi_qspi.conf
   sample.filesystem.littlefs.nucleo_h743zi_blk:
     build_only: true
     platform_allow: nucleo_h743zi
     extra_args:
-      - OVERLAY_CONFIG=boards/nucleo_h743zi_blk.conf
+      - EXTRA_CONF_FILE=boards/nucleo_h743zi_blk.conf
       - CONF_FILE=prj_blk.conf
   sample.filesystem.littlefs.stm32l562e_dk_ospi:
     build_only: true
     platform_allow: stm32l562e_dk
     extra_args:
-      - OVERLAY_CONFIG=boards/stm32l562e_dk_ospi.conf
+      - EXTRA_CONF_FILE=boards/stm32l562e_dk_ospi.conf
   sample.filesystem.littlefs.stm32f746g_disco_blk:
     build_only: true
     platform_allow: stm32f746g_disco
     extra_args:
-      - OVERLAY_CONFIG=boards/stm32_blk.conf
+      - EXTRA_CONF_FILE=boards/stm32_blk.conf
       - CONF_FILE=prj_blk.conf
     extra_configs:
       - CONFIG_SDMMC_STM32_HWFC=y
diff --git a/samples/subsys/logging/logger/sample.yaml b/samples/subsys/logging/logger/sample.yaml
index 9801f6177c2..38c94026394 100644
--- a/samples/subsys/logging/logger/sample.yaml
+++ b/samples/subsys/logging/logger/sample.yaml
@@ -42,7 +42,7 @@ tests:
     arch_exclude:
       - posix
     extra_args:
-      - OVERLAY_CONFIG="overlay-bt.conf"
+      - EXTRA_CONF_FILE="overlay-bt.conf"
       - DTC_OVERLAY_FILE="bt.overlay"
 
   sample.logger.usermode:
diff --git a/samples/subsys/logging/syst/sample.yaml b/samples/subsys/logging/syst/sample.yaml
index 8c4681c4fe8..828c4fa33bd 100644
--- a/samples/subsys/logging/syst/sample.yaml
+++ b/samples/subsys/logging/syst/sample.yaml
@@ -17,7 +17,7 @@ tests:
     integration_platforms:
       - mps2/an385
       - qemu_x86
-    extra_args: OVERLAY_CONFIG=overlay_deferred.conf
+    extra_args: EXTRA_CONF_FILE=overlay_deferred.conf
     harness: console
     harness_config:
       type: multi_line
@@ -35,7 +35,7 @@ tests:
       - CONFIG_REQUIRES_FULL_LIBC=y
   sample.logger.syst.immediate:
     toolchain_exclude: xcc
-    extra_args: OVERLAY_CONFIG=overlay_immediate.conf
+    extra_args: EXTRA_CONF_FILE=overlay_immediate.conf
     integration_platforms:
       - qemu_x86
       - sam_e70_xplained/same70q21
@@ -50,7 +50,7 @@ tests:
       - CONFIG_REQUIRES_FULL_LIBC=y
   sample.logger.syst.catalog.deferred:
     toolchain_exclude: xcc
-    extra_args: OVERLAY_CONFIG=overlay_deferred.conf
+    extra_args: EXTRA_CONF_FILE=overlay_deferred.conf
     integration_platforms:
       - qemu_x86
       - qemu_x86_64
@@ -79,7 +79,7 @@ tests:
     filter: CONFIG_FULL_LIBC_SUPPORTED
   sample.logger.syst.deferred_cpp:
     toolchain_exclude: xcc
-    extra_args: OVERLAY_CONFIG=overlay_deferred.conf
+    extra_args: EXTRA_CONF_FILE=overlay_deferred.conf
     integration_platforms:
       - qemu_x86
       - qemu_x86_64
@@ -108,7 +108,7 @@ tests:
     filter: CONFIG_FULL_LIBC_SUPPORTED
   sample.logger.syst.catalog.deferred_cpp:
     toolchain_exclude: xcc
-    extra_args: OVERLAY_CONFIG=overlay_deferred.conf
+    extra_args: EXTRA_CONF_FILE=overlay_deferred.conf
     integration_platforms:
       - qemu_x86
       - qemu_x86_64
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 33b37512615..ec4d3fb7b08 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -6,7 +6,7 @@ common:
   tags: bluetooth
 tests:
   sample.mcumgr.smp_svr.bt:
-    extra_args: OVERLAY_CONFIG="overlay-bt.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-bt.conf"
     platform_allow:
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
@@ -19,7 +19,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf54l15dk/nrf54l15/cpuapp
   sample.mcumgr.smp_svr.bt_static_svc:
-    extra_args: OVERLAY_CONFIG="overlay-bt.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-bt.conf"
     extra_configs:
       - CONFIG_MCUMGR_TRANSPORT_BT_DYNAMIC_SVC_REGISTRATION=n
     platform_allow:
@@ -29,13 +29,13 @@ tests:
     integration_platforms:
       - nrf52840dk/nrf52840
   sample.mcumgr.smp_svr.udp:
-    extra_args: OVERLAY_CONFIG="overlay-udp.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-udp.conf"
     platform_allow: frdm_k64f
     integration_platforms:
       - frdm_k64f
   sample.mcumgr.smp_svr.cdc:
     extra_args:
-      - OVERLAY_CONFIG="overlay-cdc.conf"
+      - EXTRA_CONF_FILE="overlay-cdc.conf"
       - DTC_OVERLAY_FILE="usb.overlay"
     platform_allow:
       - nrf52833dk/nrf52820
@@ -49,7 +49,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
   sample.mcumgr.smp_svr.serial:
-    extra_args: OVERLAY_CONFIG="overlay-serial.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-serial.conf"
     platform_allow:
       - nrf52840dk/nrf52840
       - pinnacle_100_dvk
@@ -60,7 +60,7 @@ tests:
   # transport. Transport does not affect flags so it does not really matter which is selected,
   # flags should affect any transport the same way.
   sample.mcumgr.smp_svr.mcuboot_flags.direct_xip_withrevert:
-    extra_args: OVERLAY_CONFIG="overlay-serial.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-serial.conf"
     extra_configs:
       - CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT=y
     platform_allow:
@@ -70,7 +70,7 @@ tests:
     integration_platforms:
       - nrf52840dk/nrf52840
   sample.mcumgr.smp_svr.serial-console:
-    extra_args: OVERLAY_CONFIG="overlay-serial-console.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-serial-console.conf"
     platform_allow:
       - nrf52840dk/nrf52840
       - pinnacle_100_dvk
@@ -78,7 +78,7 @@ tests:
     integration_platforms:
       - nrf52840dk/nrf52840
   sample.mcumgr.smp_svr.shell:
-    extra_args: OVERLAY_CONFIG="overlay-shell.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-shell.conf"
     platform_allow:
       - nrf52840dk/nrf52840
       - mimxrt1060_evk
@@ -90,7 +90,7 @@ tests:
       - mimxrt1060_evk
       - mimxrt1064_evk
   sample.mcumgr.smp_svr.shell_mgmt:
-    extra_args: OVERLAY_CONFIG="overlay-shell-mgmt.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-shell-mgmt.conf"
     platform_allow:
       - nrf52840dk/nrf52840
       - pinnacle_100_dvk
@@ -98,7 +98,7 @@ tests:
     integration_platforms:
       - nrf52840dk/nrf52840
   sample.mcumgr.smp_svr.fs:
-    extra_args: OVERLAY_CONFIG="overlay-fs.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-fs.conf"
     platform_allow:
       - nrf52840dk/nrf52840
       - pinnacle_100_dvk
diff --git a/samples/subsys/mgmt/updatehub/sample.yaml b/samples/subsys/mgmt/updatehub/sample.yaml
index de8192d957e..161cdb41327 100644
--- a/samples/subsys/mgmt/updatehub/sample.yaml
+++ b/samples/subsys/mgmt/updatehub/sample.yaml
@@ -20,7 +20,7 @@ tests:
       - CONFIG_UPDATEHUB_CE=y
       - CONFIG_UPDATEHUB_SERVER="updatehub.io"
   sample.net.updatehub.psa:
-    extra_args: OVERLAY_CONFIG="overlay-psa.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-psa.conf"
     extra_configs:
       - CONFIG_UPDATEHUB_PRODUCT_UID="e4d37cfe6ec48a2d069cc0bbb8b078677e9a0d8df3a027c4d8ea131130c4265f"
       - CONFIG_UPDATEHUB_POLL_INTERVAL=1
@@ -34,7 +34,7 @@ tests:
       - CONFIG_UPDATEHUB_SERVER="updatehub.io"
       - CONFIG_USERSPACE=y
   sample.net.updatehub.dtls:
-    extra_args: OVERLAY_CONFIG="overlay-dtls.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-dtls.conf"
     extra_configs:
       - CONFIG_UPDATEHUB_PRODUCT_UID="e4d37cfe6ec48a2d069cc0bbb8b078677e9a0d8df3a027c4d8ea131130c4265f"
       - CONFIG_UPDATEHUB_POLL_INTERVAL=1
diff --git a/samples/subsys/modbus/rtu_server/sample.yaml b/samples/subsys/modbus/rtu_server/sample.yaml
index 76f1eba7f44..f69d51f4eeb 100644
--- a/samples/subsys/modbus/rtu_server/sample.yaml
+++ b/samples/subsys/modbus/rtu_server/sample.yaml
@@ -31,6 +31,6 @@ tests:
             dt_enabled_alias_with_parent_compat("led1", "gpio-leds") and
             dt_enabled_alias_with_parent_compat("led2", "gpio-leds")
     extra_args:
-      - OVERLAY_CONFIG="overlay-cdc-acm.conf"
+      - EXTRA_CONF_FILE="overlay-cdc-acm.conf"
       - DTC_OVERLAY_FILE="cdc-acm.overlay"
     depends_on: usb_device
diff --git a/samples/subsys/shell/devmem_load/sample.yaml b/samples/subsys/shell/devmem_load/sample.yaml
index 2d59490a0eb..e4702ca5a96 100644
--- a/samples/subsys/shell/devmem_load/sample.yaml
+++ b/samples/subsys/shell/devmem_load/sample.yaml
@@ -10,7 +10,7 @@ tests:
   sample.devmem_load.polled:
     integration_platforms:
       - native_sim
-    extra_args: OVERLAY_CONFIG="prj_poll.conf"
+    extra_args: EXTRA_CONF_FILE="prj_poll.conf"
   sample.devmem_load.uart.interrupt:
     integration_platforms:
       - frdm_k64f
diff --git a/samples/subsys/shell/shell_module/sample.yaml b/samples/subsys/shell/shell_module/sample.yaml
index 62f9b30af0f..46c7fbb127f 100644
--- a/samples/subsys/shell/shell_module/sample.yaml
+++ b/samples/subsys/shell/shell_module/sample.yaml
@@ -22,7 +22,7 @@ tests:
     harness: keyboard
     min_ram: 40
     extra_args:
-      - OVERLAY_CONFIG="overlay-usb.conf"
+      - EXTRA_CONF_FILE="overlay-usb.conf"
       - DTC_OVERLAY_FILE="usb.overlay"
     integration_platforms:
       - native_sim
@@ -62,7 +62,7 @@ tests:
     arch_exclude:
       - posix
     extra_args:
-      - OVERLAY_CONFIG="overlay-bt.conf"
+      - EXTRA_CONF_FILE="overlay-bt.conf"
       - DTC_OVERLAY_FILE="bt.overlay"
   sample.shell.shell_module.login:
     filter: CONFIG_SERIAL and dt_chosen_enabled("zephyr,shell-uart")
diff --git a/samples/subsys/usb/dfu/sample.yaml b/samples/subsys/usb/dfu/sample.yaml
index 1700b087473..122a8f63c7f 100644
--- a/samples/subsys/usb/dfu/sample.yaml
+++ b/samples/subsys/usb/dfu/sample.yaml
@@ -32,4 +32,4 @@ tests:
     tags: usb
   sample.usb.dfu.permanent.download:
     tags: usb
-    extra_args: OVERLAY_CONFIG=overlay-permanent-download.conf
+    extra_args: EXTRA_CONF_FILE=overlay-permanent-download.conf
diff --git a/tests/boot/mcuboot_recovery_retention/testcase.yaml b/tests/boot/mcuboot_recovery_retention/testcase.yaml
index 8ec7fa47496..f8d872d7a9f 100644
--- a/tests/boot/mcuboot_recovery_retention/testcase.yaml
+++ b/tests/boot/mcuboot_recovery_retention/testcase.yaml
@@ -30,7 +30,7 @@ tests:
   bootloader.mcuboot.recovery.retention.mem:
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - OVERLAY_CONFIG="boards/nrf52840dk_nrf52840_mem.conf"
+      - EXTRA_CONF_FILE="boards/nrf52840dk_nrf52840_mem.conf"
       - DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_mem.overlay"
       - mcuboot_TARGET_OVERLAY_CONFIG="boards/nrf52840dk_nrf52840_mem.conf"
       - mcuboot_TARGET_DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_mem.overlay"
diff --git a/tests/crypto/secp256r1/testcase.yaml b/tests/crypto/secp256r1/testcase.yaml
index 70de8a787b2..0e21e0d86b5 100644
--- a/tests/crypto/secp256r1/testcase.yaml
+++ b/tests/crypto/secp256r1/testcase.yaml
@@ -10,8 +10,8 @@ common:
     - p256-m
 tests:
   crypto.secp256r1.mbedtls:
-    extra_args: OVERLAY_CONFIG=mbedtls.conf
+    extra_args: EXTRA_CONF_FILE=mbedtls.conf
   crypto.secp256r1.p256-m_raw:
-    extra_args: OVERLAY_CONFIG=p256-m_raw.conf
+    extra_args: EXTRA_CONF_FILE=p256-m_raw.conf
   crypto.secp256r1.tinycrypt:
-    extra_args: OVERLAY_CONFIG=tinycrypt.conf
+    extra_args: EXTRA_CONF_FILE=tinycrypt.conf
diff --git a/tests/drivers/adc/adc_api/testcase.yaml b/tests/drivers/adc/adc_api/testcase.yaml
index 96a24ba2259..8227a92bec8 100644
--- a/tests/drivers/adc/adc_api/testcase.yaml
+++ b/tests/drivers/adc/adc_api/testcase.yaml
@@ -14,7 +14,7 @@ tests:
       - b_u585i_iot02a
   drivers.adc.dma_st_stm32:
     extra_args:
-      - OVERLAY_CONFIG="overlay-dma-stm32.conf"
+      - EXTRA_CONF_FILE="overlay-dma-stm32.conf"
     depends_on:
       - adc
       - dma
@@ -41,7 +41,7 @@ tests:
       - stm32h573i_dk
   drivers.adc.dma_nxp_kinetis:
     extra_args:
-      - OVERLAY_CONFIG="overlay-dma-kinetis.conf"
+      - EXTRA_CONF_FILE="overlay-dma-kinetis.conf"
     depends_on:
       - adc
       - dma
@@ -53,7 +53,7 @@ tests:
       - frdm_k82f
   drivers.adc.dma_espressif:
     extra_args:
-      - OVERLAY_CONFIG="overlay-dma-esp32.conf"
+      - EXTRA_CONF_FILE="overlay-dma-esp32.conf"
     depends_on:
       - adc
       - dma
diff --git a/tests/drivers/bbram/testcase.yaml b/tests/drivers/bbram/testcase.yaml
index 88debe7ab31..f9ff3da2310 100644
--- a/tests/drivers/bbram/testcase.yaml
+++ b/tests/drivers/bbram/testcase.yaml
@@ -18,13 +18,13 @@ tests:
     integration_platforms:
       - npcx9m6f_evb
   drivers.bbram.stm32:
-    extra_args: OVERLAY_CONFIG="stm32.conf"
+    extra_args: EXTRA_CONF_FILE="stm32.conf"
     filter: dt_compat_enabled("st,stm32-bbram")
     integration_platforms:
       - nucleo_g071rb
       - stm32f746g_disco
   drivers.bbram.stm32_rtc:
-    extra_args: OVERLAY_CONFIG="stm32_rtc.conf"
+    extra_args: EXTRA_CONF_FILE="stm32_rtc.conf"
     filter: dt_compat_enabled("st,stm32-bbram")
     integration_platforms:
       - nucleo_g071rb
diff --git a/tests/drivers/build_all/sensor/testcase.yaml b/tests/drivers/build_all/sensor/testcase.yaml
index 7fc17df202b..a02e59e1195 100644
--- a/tests/drivers/build_all/sensor/testcase.yaml
+++ b/tests/drivers/build_all/sensor/testcase.yaml
@@ -10,18 +10,18 @@ common:
   build_only: true
 tests:
   sensors.build.sensorhub:
-    extra_args: OVERLAY_CONFIG=sensors_shub.conf;sensors_die_temp.conf
+    extra_args: EXTRA_CONF_FILE=sensors_shub.conf;sensors_die_temp.conf
   sensors.build.trigger.own:
-    extra_args: OVERLAY_CONFIG=sensors_trigger_own.conf;sensors_die_temp.conf
+    extra_args: EXTRA_CONF_FILE=sensors_trigger_own.conf;sensors_die_temp.conf
   sensors.build.trigger.global:
-    extra_args: OVERLAY_CONFIG=sensors_trigger_global.conf;sensors_die_temp.conf
+    extra_args: EXTRA_CONF_FILE=sensors_trigger_global.conf;sensors_die_temp.conf
   sensors.build.trigger.none:
-    extra_args: OVERLAY_CONFIG=sensors_trigger_none.conf;sensors_die_temp.conf
+    extra_args: EXTRA_CONF_FILE=sensors_trigger_none.conf;sensors_die_temp.conf
   sensors.build.no_default:
-    extra_args: OVERLAY_CONFIG=sensors_no_default.conf
+    extra_args: EXTRA_CONF_FILE=sensors_no_default.conf
   sensors.build:
     tags: sensors
-    extra_args: OVERLAY_CONFIG=sensors_die_temp.conf
+    extra_args: EXTRA_CONF_FILE=sensors_die_temp.conf
     extra_configs:
       - CONFIG_UART_INTERRUPT_DRIVEN=y
   sensors.build.pm:
diff --git a/tests/drivers/eeprom/api/testcase.yaml b/tests/drivers/eeprom/api/testcase.yaml
index 3f2032b6305..f91021b0e95 100644
--- a/tests/drivers/eeprom/api/testcase.yaml
+++ b/tests/drivers/eeprom/api/testcase.yaml
@@ -20,7 +20,7 @@ tests:
     # Tests overwrite EEPROM content, only run on select boards
     extra_args:
       - DTC_OVERLAY_FILE=at2x_emul.overlay
-      - OVERLAY_CONFIG=at2x_emul.conf
+      - EXTRA_CONF_FILE=at2x_emul.conf
     platform_allow:
       - native_posix
       - native_posix/native/64
diff --git a/tests/drivers/entropy/api/testcase.yaml b/tests/drivers/entropy/api/testcase.yaml
index f875cadab42..d0e7532aa47 100644
--- a/tests/drivers/entropy/api/testcase.yaml
+++ b/tests/drivers/entropy/api/testcase.yaml
@@ -10,7 +10,7 @@ tests:
       - nrf5340bsim/nrf5340/cpunet
     extra_args:
       - DTC_OVERLAY_FILE=./entropy_bt_hci.overlay
-      - OVERLAY_CONFIG=./entropy_bt_hci.conf
+      - EXTRA_CONF_FILE=./entropy_bt_hci.conf
     tags:
       - driver
       - entropy
@@ -19,7 +19,7 @@ tests:
     filter: CONFIG_BUILD_WITH_TFM
     extra_args:
       - DTC_OVERLAY_FILE=./entropy_psa_crypto.overlay
-      - OVERLAY_CONFIG=./entropy_psa_crypto.conf
+      - EXTRA_CONF_FILE=./entropy_psa_crypto.conf
     tags:
       - driver
       - entropy
diff --git a/tests/drivers/flash/common/testcase.yaml b/tests/drivers/flash/common/testcase.yaml
index 5c8e755dc4d..9ee460f6ed2 100644
--- a/tests/drivers/flash/common/testcase.yaml
+++ b/tests/drivers/flash/common/testcase.yaml
@@ -5,20 +5,20 @@ common:
 tests:
   drivers.flash.common.nrf_qspi_nor:
     platform_allow: nrf52840dk/nrf52840
-    extra_args: OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_qspi_nor.conf
+    extra_args: EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_qspi_nor.conf
     integration_platforms:
       - nrf52840dk/nrf52840
   drivers.flash.common.nrf_qspi_nor.size_in_bytes:
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_qspi_nor.conf
+      - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_qspi_nor.conf
       - DTC_OVERLAY_FILE=boards/nrf52840_size_in_bytes.overlay
     integration_platforms:
       - nrf52840dk/nrf52840
   drivers.flash.common.nrf_qspi_nor_4B_addr:
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_qspi_nor.conf
+      - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_qspi_nor.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_mx25l51245g.overlay
     harness_config:
       fixture: external_flash_mx25l51245g
@@ -26,7 +26,7 @@ tests:
       - nrf52840dk/nrf52840
   drivers.flash.common.soc_flash_nrf:
     platform_allow: nrf52840dk/nrf52840
-    extra_args: OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_soc.conf
+    extra_args: EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_soc.conf
     integration_platforms:
       - nrf52840dk/nrf52840
   drivers.flash.common.default:
@@ -73,7 +73,7 @@ tests:
   drivers.flash.common.mx25r_high_perf:
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - OVERLAY_CONFIG=boards/nrf52840dk_flash_spi.conf
+      - EXTRA_CONF_FILE=boards/nrf52840dk_flash_spi.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_mx25r_high_perf.overlay
     integration_platforms:
       - nrf52840dk/nrf52840
@@ -84,14 +84,14 @@ tests:
   drivers.flash.common.spi_nor:
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - OVERLAY_CONFIG=boards/nrf52840dk_flash_spi.conf
+      - EXTRA_CONF_FILE=boards/nrf52840dk_flash_spi.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_spi_nor.overlay
     harness_config:
       fixture: external_flash_mx25v1635f
   drivers.flash.common.spi_nor_wp_hold:
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - OVERLAY_CONFIG=boards/nrf52840dk_flash_spi.conf
+      - EXTRA_CONF_FILE=boards/nrf52840dk_flash_spi.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_spi_nor_wp_hold.overlay
     harness_config:
       fixture: external_flash_mx25v1635f
diff --git a/tests/drivers/retained_mem/api/testcase.yaml b/tests/drivers/retained_mem/api/testcase.yaml
index f6b6844a1b4..1f2e228ee01 100644
--- a/tests/drivers/retained_mem/api/testcase.yaml
+++ b/tests/drivers/retained_mem/api/testcase.yaml
@@ -19,7 +19,7 @@ tests:
     platform_allow: nrf52840dk/nrf52840
     extra_args:
       - DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_ram.overlay"
-      - OVERLAY_CONFIG="boards/nrf52840dk_nrf52840_ram.conf"
+      - EXTRA_CONF_FILE="boards/nrf52840dk_nrf52840_ram.conf"
     tags:
       - drivers
       - retained_mem
diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml
index 5760aa0d879..47d2ec28178 100644
--- a/tests/drivers/spi/spi_loopback/testcase.yaml
+++ b/tests/drivers/spi/spi_loopback/testcase.yaml
@@ -35,12 +35,12 @@ tests:
       - mimxrt1170_evk/mimxrt1176/cm7
   drivers.spi.mcux_dspi_dma.loopback:
     extra_args:
-      - OVERLAY_CONFIG="overlay-mcux-dspi-dma.conf"
+      - EXTRA_CONF_FILE="overlay-mcux-dspi-dma.conf"
       - DTC_OVERLAY_FILE="overlay-mcux-dspi-dma.overlay"
     platform_allow: frdm_k64f
   drivers.spi.sam_spi_dma.loopback:
     extra_args:
-      - OVERLAY_CONFIG="overlay-sam-spi-dma.conf"
+      - EXTRA_CONF_FILE="overlay-sam-spi-dma.conf"
       - DTC_OVERLAY_FILE="overlay-sam-spi-dma.overlay"
     platform_allow:
       - sam_e70_xplained/same70q21
@@ -50,7 +50,7 @@ tests:
       - sam_e70_xplained/same70q21
   drivers.spi.stm32_spi_16bits_frames.loopback:
     extra_args:
-      - OVERLAY_CONFIG="overlay-stm32-spi-16bits.conf"
+      - EXTRA_CONF_FILE="overlay-stm32-spi-16bits.conf"
       - DTC_OVERLAY_FILE="overlay-stm32-spi-16bits.overlay"
     filter: CONFIG_SOC_FAMILY_STM32
     platform_allow:
@@ -59,7 +59,7 @@ tests:
       - nucleo_h745zi_q/stm32h745xx/m4
       - nucleo_h745zi_q/stm32h745xx/m7
   drivers.spi.stm32_spi_dma.loopback:
-    extra_args: OVERLAY_CONFIG="overlay-stm32-spi-dma.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-stm32-spi-dma.conf"
     filter: CONFIG_SOC_FAMILY_STM32
     platform_allow:
       - b_u585i_iot02a
@@ -82,7 +82,7 @@ tests:
     # this test case is for when nocache memory region is defined in DT
     # using `zephyr,memory-attr = < DT_MEM_ARM_MPU_RAM_NOCACHE)>`
     extra_args:
-      - OVERLAY_CONFIG="overlay-stm32-spi-dma-dt-nocache-mem.conf"
+      - EXTRA_CONF_FILE="overlay-stm32-spi-dma-dt-nocache-mem.conf"
     filter: CONFIG_SOC_FAMILY_STM32 and CONFIG_CPU_HAS_DCACHE
     platform_allow:
       - nucleo_h743zi
@@ -91,7 +91,7 @@ tests:
       - nucleo_h745zi_q/stm32h745xx/m7
   drivers.spi.stm32_spi_16bits_frames_dma.loopback:
     extra_args:
-      - OVERLAY_CONFIG="overlay-stm32-spi-16bits-dma.conf"
+      - EXTRA_CONF_FILE="overlay-stm32-spi-16bits-dma.conf"
       - DTC_OVERLAY_FILE="overlay-stm32-spi-16bits.overlay"
     filter: CONFIG_SOC_FAMILY_STM32
     platform_allow:
@@ -101,7 +101,7 @@ tests:
       - nucleo_h745zi_q/stm32h745xx/m7
   drivers.spi.stm32_spi_16bits_frames_dma_dt_nocache_mem.loopback:
     extra_args:
-      - OVERLAY_CONFIG="overlay-stm32-spi-16bits-dma-dt-nocache-mem.conf"
+      - EXTRA_CONF_FILE="overlay-stm32-spi-16bits-dma-dt-nocache-mem.conf"
       - DTC_OVERLAY_FILE="overlay-stm32-spi-16bits.overlay"
     filter: CONFIG_SOC_FAMILY_STM32 and CONFIG_CPU_HAS_DCACHE
     platform_allow:
@@ -110,7 +110,7 @@ tests:
       - nucleo_h745zi_q/stm32h745xx/m4
       - nucleo_h745zi_q/stm32h745xx/m7
   drivers.spi.stm32_spi_interrupt.loopback:
-    extra_args: OVERLAY_CONFIG="overlay-stm32-spi-interrupt.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-stm32-spi-interrupt.conf"
     filter: CONFIG_SOC_FAMILY_STM32
     platform_allow:
       - b_u585i_iot02a
@@ -129,7 +129,7 @@ tests:
       - stm32f3_disco
       - stm32h573i_dk
   drivers.spi.gd32_spi_interrupt.loopback:
-    extra_args: OVERLAY_CONFIG="overlay-gd32-spi-interrupt.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-gd32-spi-interrupt.conf"
     platform_allow:
       - gd32f403z_eval
       - gd32f407v_start
@@ -142,7 +142,7 @@ tests:
       - longan_nano
       - longan_nano/gd32vf103/lite
   drivers.spi.gd32_spi_dma.loopback:
-    extra_args: OVERLAY_CONFIG="overlay-gd32-spi-dma.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-gd32-spi-dma.conf"
     platform_allow:
       - gd32f403z_eval
       - gd32f407v_start
@@ -202,5 +202,5 @@ tests:
       - frdm_ke17z
       - frdm_ke17z512
   drivers.spi.max32_dma.loopback:
-    extra_args: OVERLAY_CONFIG="overlay-max32-spi-dma.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-max32-spi-dma.conf"
     filter: CONFIG_SOC_FAMILY_MAX32
diff --git a/tests/drivers/uart/uart_basic_api/testcase.yaml b/tests/drivers/uart/uart_basic_api/testcase.yaml
index 8a6c9210ace..45bb49c04a5 100644
--- a/tests/drivers/uart/uart_basic_api/testcase.yaml
+++ b/tests/drivers/uart/uart_basic_api/testcase.yaml
@@ -39,7 +39,7 @@ tests:
       - mps2/an385
   drivers.uart.basic_api.cdc_acm:
     extra_args:
-      - OVERLAY_CONFIG="overlay-usb.conf"
+      - EXTRA_CONF_FILE="overlay-usb.conf"
       - DTC_OVERLAY_FILE="usb.overlay"
     tags:
       - drivers
diff --git a/tests/drivers/watchdog/wdt_basic_api/testcase.yaml b/tests/drivers/watchdog/wdt_basic_api/testcase.yaml
index 8736f0c20eb..ce0dd4fe287 100644
--- a/tests/drivers/watchdog/wdt_basic_api/testcase.yaml
+++ b/tests/drivers/watchdog/wdt_basic_api/testcase.yaml
@@ -80,7 +80,7 @@ tests:
   drivers.watchdog.counter_watchdog:
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - OVERLAY_CONFIG="boards/nrf52840dk_nrf52840_counter.conf"
+      - EXTRA_CONF_FILE="boards/nrf52840dk_nrf52840_counter.conf"
       - DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_counter.overlay"
   drivers.watchdog.gd32fwdgt:
     filter: dt_compat_enabled("gd,gd32-fwdgt")
diff --git a/tests/lib/gui/lvgl/testcase.yaml b/tests/lib/gui/lvgl/testcase.yaml
index db356ec5569..16533041fac 100644
--- a/tests/lib/gui/lvgl/testcase.yaml
+++ b/tests/lib/gui/lvgl/testcase.yaml
@@ -84,6 +84,6 @@ tests:
       - CONFIG_DUMMY_DISPLAY=n
     extra_args:
       - SHIELD=st_b_lcd40_dsi1_mb1166
-      - OVERLAY_CONFIG=prj_blk.conf
+      - EXTRA_CONF_FILE=prj_blk.conf
     tags:
       - shield
diff --git a/tests/modules/thrift/ThriftTest/testcase.yaml b/tests/modules/thrift/ThriftTest/testcase.yaml
index 9933f2e3a38..820714408cb 100644
--- a/tests/modules/thrift/ThriftTest/testcase.yaml
+++ b/tests/modules/thrift/ThriftTest/testcase.yaml
@@ -20,4 +20,4 @@ tests:
     extra_configs:
       - CONFIG_THRIFT_COMPACT_PROTOCOL=y
   thrift.ThriftTest.newlib.tlsTransport:
-    extra_args: OVERLAY_CONFIG="overlay-tls.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-tls.conf"
diff --git a/tests/net/lib/tls_credentials/testcase.yaml b/tests/net/lib/tls_credentials/testcase.yaml
index 2971f1b3b7c..1e812e2164b 100644
--- a/tests/net/lib/tls_credentials/testcase.yaml
+++ b/tests/net/lib/tls_credentials/testcase.yaml
@@ -6,7 +6,7 @@ tests:
     depends_on: netif
   net.tls_credentials.trusted_tfm:
     filter: CONFIG_BUILD_WITH_TFM
-    extra_args: OVERLAY_CONFIG=./prj_trusted_tfm.conf
+    extra_args: EXTRA_CONF_FILE=./prj_trusted_tfm.conf
     tags:
       - net
       - tls
diff --git a/tests/subsys/dfu/img_util/testcase.yaml b/tests/subsys/dfu/img_util/testcase.yaml
index 54b8de1320e..f0eabc4c4f1 100644
--- a/tests/subsys/dfu/img_util/testcase.yaml
+++ b/tests/subsys/dfu/img_util/testcase.yaml
@@ -11,5 +11,5 @@ tests:
   dfu.image_util:
     tags: dfu_image_util
   dfu.image_util.progressive:
-    extra_args: OVERLAY_CONFIG=progressively_overlay.conf
+    extra_args: EXTRA_CONF_FILE=progressively_overlay.conf
     tags: dfu_image_util
diff --git a/tests/subsys/logging/log_switch_format/testcase.yaml b/tests/subsys/logging/log_switch_format/testcase.yaml
index bc1f1e933b7..07540075917 100644
--- a/tests/subsys/logging/log_switch_format/testcase.yaml
+++ b/tests/subsys/logging/log_switch_format/testcase.yaml
@@ -15,7 +15,7 @@ tests:
     integration_platforms:
       - mps2/an385
       - qemu_x86
-    extra_args: OVERLAY_CONFIG=overlay_deferred.conf
+    extra_args: EXTRA_CONF_FILE=overlay_deferred.conf
     # "CONFIG_FULL_LIBC_SUPPORTED" filter was applied
     # because of following chain of dependencies:
     # LOG_MIPI_SYST_ENABLE=y --> CONFIG_MIPI_SYST_LIB --> \
@@ -26,7 +26,7 @@ tests:
     extra_configs:
       - CONFIG_REQUIRES_FULL_LIBC=y
   logging.format.switch.immediate:
-    extra_args: OVERLAY_CONFIG=overlay_immediate.conf
+    extra_args: EXTRA_CONF_FILE=overlay_immediate.conf
     integration_platforms:
       - mps2/an385
       - qemu_x86
@@ -34,7 +34,7 @@ tests:
     extra_configs:
       - CONFIG_REQUIRES_FULL_LIBC=y
   logging.format.switch.custom_output:
-    extra_args: OVERLAY_CONFIG=overlay_custom_output.conf
+    extra_args: EXTRA_CONF_FILE=overlay_custom_output.conf
     integration_platforms:
       - mps2/an385
       - qemu_x86
diff --git a/tests/subsys/mgmt/mcumgr/all_options/testcase.yaml b/tests/subsys/mgmt/mcumgr/all_options/testcase.yaml
index f21fad9510f..1708d7e7869 100644
--- a/tests/subsys/mgmt/mcumgr/all_options/testcase.yaml
+++ b/tests/subsys/mgmt/mcumgr/all_options/testcase.yaml
@@ -14,4 +14,4 @@ tests:
   mgmt.mcumgr.all.options: {}
   mgmt.mcumgr.all.options.other:
     extra_args:
-      - OVERLAY_CONFIG="other-options.conf"
+      - EXTRA_CONF_FILE="other-options.conf"
diff --git a/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml b/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml
index b7aeddd6c05..91ba348e02b 100644
--- a/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml
+++ b/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml
@@ -21,10 +21,10 @@ common:
 tests:
   mgmt.mcumgr.fs.mgmt.hash.supported.crc32:
     extra_args: >
-      OVERLAY_CONFIG="configuration/crc32.conf"
+      EXTRA_CONF_FILE="configuration/crc32.conf"
   mgmt.mcumgr.fs.mgmt.hash.supported.sha256:
     extra_args: >
-      OVERLAY_CONFIG="configuration/sha256.conf"
+      EXTRA_CONF_FILE="configuration/sha256.conf"
   mgmt.mcumgr.fs.mgmt.hash.supported.all:
     extra_args: >
-      OVERLAY_CONFIG="configuration/all.conf"
+      EXTRA_CONF_FILE="configuration/all.conf"
diff --git a/tests/subsys/mgmt/mcumgr/handler_demo/testcase.yaml b/tests/subsys/mgmt/mcumgr/handler_demo/testcase.yaml
index dbd18f8d1c5..a4dfe3bc0bd 100644
--- a/tests/subsys/mgmt/mcumgr/handler_demo/testcase.yaml
+++ b/tests/subsys/mgmt/mcumgr/handler_demo/testcase.yaml
@@ -18,7 +18,7 @@ tests:
     build_only: true
   mgmt.mcumgr.handler.demo.module:
     extra_args:
-      - OVERLAY_CONFIG="module.conf"
+      - EXTRA_CONF_FILE="module.conf"
     platform_allow:
       - nrf52840dk/nrf52840
     integration_platforms:
diff --git a/tests/subsys/pm/power_mgmt/testcase.yaml b/tests/subsys/pm/power_mgmt/testcase.yaml
index 8c4a1c92e3d..9f87ac0d666 100644
--- a/tests/subsys/pm/power_mgmt/testcase.yaml
+++ b/tests/subsys/pm/power_mgmt/testcase.yaml
@@ -5,4 +5,4 @@ tests:
   pm.system: {}
   pm.system.no.device.pm:
     extra_args:
-      - OVERLAY_CONFIG="no-device-pm.conf"
+      - EXTRA_CONF_FILE="no-device-pm.conf"
diff --git a/tests/subsys/settings/functional/nvs/testcase.yaml b/tests/subsys/settings/functional/nvs/testcase.yaml
index 8abb0039b19..d9f2f8d2f2f 100644
--- a/tests/subsys/settings/functional/nvs/testcase.yaml
+++ b/tests/subsys/settings/functional/nvs/testcase.yaml
@@ -20,7 +20,7 @@ tests:
       - settings
       - nvs
   settings.functional.nvs.dk:
-    extra_args: OVERLAY_CONFIG=mpu.conf
+    extra_args: EXTRA_CONF_FILE=mpu.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
diff --git a/tests/subsys/storage/flash_map/testcase.yaml b/tests/subsys/storage/flash_map/testcase.yaml
index 11c43dcac62..7d4f8ba074a 100644
--- a/tests/subsys/storage/flash_map/testcase.yaml
+++ b/tests/subsys/storage/flash_map/testcase.yaml
@@ -13,7 +13,7 @@ tests:
     integration_platforms:
       - native_sim
   storage.flash_map.mpu:
-    extra_args: OVERLAY_CONFIG=overlay-mpu.conf
+    extra_args: EXTRA_CONF_FILE=overlay-mpu.conf
     timeout: 120
     platform_allow:
       - nrf52840dk/nrf52840
@@ -25,7 +25,7 @@ tests:
       - nrf52840dk/nrf52840
     tags: flash_map
   storage.flash_map.mbedtls:
-    extra_args: OVERLAY_CONFIG=overlay-mbedtls.conf
+    extra_args: EXTRA_CONF_FILE=overlay-mbedtls.conf
     platform_allow:
       - nrf51dk/nrf51822
       - qemu_x86
@@ -38,7 +38,7 @@ tests:
     integration_platforms:
       - native_sim
   storage.flash_map.psa:
-    extra_args: OVERLAY_CONFIG=overlay-psa.conf
+    extra_args: EXTRA_CONF_FILE=overlay-psa.conf
     platform_allow:
       - nrf51dk/nrf51822
       - native_posix

From 0dc6122b095ee3dbf4a3848395fa70301461a1ff Mon Sep 17 00:00:00 2001
From: Tu Nguyen Van <tu.nguyenvan@nxp.com>
Date: Thu, 29 Aug 2024 19:02:07 +0700
Subject: [PATCH 0883/2913] [nrf fromtree] tests: drivers: spi: enable test
 spi_loopback

enable test spi_loopback for dspi feature on s32z27x
devices

Signed-off-by: Tu Nguyen Van <tu.nguyenvan@nxp.com>
(cherry picked from commit 55bcc4a57618515845b842961ea79520bee2067d)
---
 .../boards/s32z2xxdc2_s32z270_dspi.overlay    | 40 +++++++++++++++++++
 tests/drivers/spi/spi_loopback/testcase.yaml  |  6 +++
 2 files changed, 46 insertions(+)
 create mode 100644 tests/drivers/spi/spi_loopback/boards/s32z2xxdc2_s32z270_dspi.overlay

diff --git a/tests/drivers/spi/spi_loopback/boards/s32z2xxdc2_s32z270_dspi.overlay b/tests/drivers/spi/spi_loopback/boards/s32z2xxdc2_s32z270_dspi.overlay
new file mode 100644
index 00000000000..c6111cbd703
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/s32z2xxdc2_s32z270_dspi.overlay
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	dspi0_default: dspi0_default {
+		group1 {
+			pinmux = <LVDS_DSPI_10_SOUT>, <LVDS_DSPI_10_SCK>;
+			output-enable;
+			nxp,current-reference-control;
+			nxp,termination-resistor;
+		};
+		group2 {
+			pinmux = <LVDS_DSPI_10_SIN>;
+			input-enable;
+			nxp,current-reference-control;
+			nxp,termination-resistor;
+		};
+	};
+};
+
+&dspi0 {
+	pinctrl-0 = <&dspi0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	slow@0 {
+		compatible = "test-spi-loopback-slow";
+		reg = <0>;
+		spi-max-frequency = <500000>;
+	};
+
+	fast@0 {
+		compatible = "test-spi-loopback-fast";
+		reg = <0>;
+		spi-max-frequency = <16000000>;
+	};
+};
diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml
index 47d2ec28178..3087e65c640 100644
--- a/tests/drivers/spi/spi_loopback/testcase.yaml
+++ b/tests/drivers/spi/spi_loopback/testcase.yaml
@@ -204,3 +204,9 @@ tests:
   drivers.spi.max32_dma.loopback:
     extra_args: EXTRA_CONF_FILE="overlay-max32-spi-dma.conf"
     filter: CONFIG_SOC_FAMILY_MAX32
+  drivers.spi.s32z_dspi.loopback:
+    extra_args:
+      - DTC_OVERLAY_FILE=boards/s32z2xxdc2_s32z270_dspi.overlay
+    platform_allow:
+      - s32z2xxdc2/s32z270/rtu0
+      - s32z2xxdc2/s32z270/rtu1

From 8d50189aa84e6353ace4d41d2bd391087882c5cd Mon Sep 17 00:00:00 2001
From: Dimitrije Lilic <dimitrije.lilic@orioninc.com>
Date: Thu, 12 Sep 2024 15:55:17 +0200
Subject: [PATCH 0884/2913] [nrf fromtree] tests: drivers: spi: spi_loopback:
 Support RTIO tests for APARD32690

Add overlay for APARD32690 board and add a new test case to
test RTIO functionalities of SPI MAX32 driver.

Signed-off-by: Dimitrije Lilic <dimitrije.lilic@orioninc.com>
(cherry picked from commit 2507752d7f065f2b93a322bef5ccb8779bfcce4a)
---
 .../boards/apard32690_max32690_m4.overlay     | 19 +++++++++++++++++++
 .../spi_loopback/overlay-max32-spi-rtio.conf  |  7 +++++++
 tests/drivers/spi/spi_loopback/testcase.yaml  |  6 ++++++
 3 files changed, 32 insertions(+)
 create mode 100644 tests/drivers/spi/spi_loopback/boards/apard32690_max32690_m4.overlay
 create mode 100644 tests/drivers/spi/spi_loopback/overlay-max32-spi-rtio.conf

diff --git a/tests/drivers/spi/spi_loopback/boards/apard32690_max32690_m4.overlay b/tests/drivers/spi/spi_loopback/boards/apard32690_max32690_m4.overlay
new file mode 100644
index 00000000000..0a3dbc158db
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/apard32690_max32690_m4.overlay
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2024 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+arduino_spi: &spi1 {
+	status = "okay";
+	slow@0 {
+		compatible = "test-spi-loopback-slow";
+		reg = <0>;
+		spi-max-frequency = <128000>;
+	};
+	fast@0 {
+		compatible = "test-spi-loopback-fast";
+		reg = <0>;
+		spi-max-frequency = <500000>;
+	};
+};
diff --git a/tests/drivers/spi/spi_loopback/overlay-max32-spi-rtio.conf b/tests/drivers/spi/spi_loopback/overlay-max32-spi-rtio.conf
new file mode 100644
index 00000000000..dcf44166a3b
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/overlay-max32-spi-rtio.conf
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2024 Analog Devices, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+CONFIG_SPI_RTIO=y
+CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml
index 3087e65c640..5ed122bfd01 100644
--- a/tests/drivers/spi/spi_loopback/testcase.yaml
+++ b/tests/drivers/spi/spi_loopback/testcase.yaml
@@ -210,3 +210,9 @@ tests:
     platform_allow:
       - s32z2xxdc2/s32z270/rtu0
       - s32z2xxdc2/s32z270/rtu1
+  drivers.spi.max32_spi_rtio.loopback:
+    extra_args:
+      - OVERLAY_CONFIG="overlay-max32-spi-rtio.conf"
+    filter: CONFIG_SOC_FAMILY_MAX32
+    platform_allow:
+      - apard32690/max32690/m4

From 197bf739057fd7f3ae6abf042e23d1377817bb6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 21 Jun 2024 15:57:14 +0200
Subject: [PATCH 0885/2913] [nrf fromtree] tests: drivers: spi: spi_loopback:
 Add nrf54h20dk cpurad
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add overlay for nrf54h20dk cpurad.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 20c34ea092d029bcb14a159f9a944852bbf2127a)
---
 .../boards/nrf54h20dk_nrf54h20_common.dtsi    | 49 +++++++++++++++++++
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 34 +------------
 .../boards/nrf54h20dk_nrf54h20_cpurad.overlay | 11 +++++
 3 files changed, 61 insertions(+), 33 deletions(-)
 create mode 100644 tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_common.dtsi
 create mode 100644 tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpurad.overlay

diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_common.dtsi b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_common.dtsi
new file mode 100644
index 00000000000..0d31bf6e66e
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_common.dtsi
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	spi130_default: spi130_default {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 0, 0)>,
+				<NRF_PSEL(SPIM_MISO, 0, 6)>,
+				<NRF_PSEL(SPIM_MOSI, 0, 7)>;
+		};
+	};
+
+	spi130_sleep: spi130_sleep {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 0, 0)>,
+				<NRF_PSEL(SPIM_MISO, 0, 6)>,
+				<NRF_PSEL(SPIM_MOSI, 0, 7)>;
+			low-power-enable;
+		};
+	};
+};
+
+&spi130 {
+	pinctrl-0 = <&spi130_default>;
+	pinctrl-1 = <&spi130_sleep>;
+	pinctrl-names = "default", "sleep";
+	overrun-character = <0x00>;
+	slow@0 {
+		compatible = "test-spi-loopback-slow";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_K(500)>;
+	};
+	fast@0 {
+		compatible = "test-spi-loopback-fast";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(8)>;
+	};
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpiote130 {
+	status = "okay";
+};
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index 89e5fbad08a..e9338612aed 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -3,41 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
-&pinctrl {
-	spi130_default: spi130_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 0)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 7)>,
-				<NRF_PSEL(SPIM_MISO, 0, 6)>;
-		};
-	};
-
-	spi130_sleep: spi130_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 0)>,
-				<NRF_PSEL(SPIM_MISO, 0, 6)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 7)>;
-			low-power-enable;
-		};
-	};
-};
+#include "nrf54h20dk_nrf54h20_common.dtsi"
 
 &spi130 {
 	status = "okay";
-	pinctrl-0 = <&spi130_default>;
-	pinctrl-1 = <&spi130_sleep>;
-	pinctrl-names = "default", "sleep";
-	overrun-character = <0x00>;
 	memory-regions = <&cpuapp_dma_region>;
-	slow@0 {
-		compatible = "test-spi-loopback-slow";
-		reg = <0>;
-		spi-max-frequency = <DT_FREQ_K(500)>;
-	};
-	fast@0 {
-		compatible = "test-spi-loopback-fast";
-		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(8)>;
-	};
 };
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpurad.overlay
new file mode 100644
index 00000000000..b94da1560f6
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpurad.overlay
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include "nrf54h20dk_nrf54h20_common.dtsi"
+
+&spi130 {
+	status = "okay";
+	memory-regions = <&cpurad_dma_region>;
+};

From aa120ad0d75c589161378af3938c37ecfad34ee1 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 9 Jul 2024 10:02:46 +0200
Subject: [PATCH 0886/2913] [nrf fromlist] drivers: spi: nrfx_spim: Add support
 for device runtime PM

Enable the device runtime power management on the SPIM shim.

Upstream PR #: 75715

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
---
 drivers/spi/spi_nrfx_spim.c | 73 ++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c
index b0eecc07625..11ba2e584a1 100644
--- a/drivers/spi/spi_nrfx_spim.c
+++ b/drivers/spi/spi_nrfx_spim.c
@@ -8,6 +8,7 @@
 #include <zephyr/drivers/spi/rtio.h>
 #include <zephyr/cache.h>
 #include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
 #include <soc.h>
@@ -90,6 +91,8 @@ static inline void finalize_spi_transaction(const struct device *dev, bool deact
 	if (NRF_SPIM_IS_320MHZ_SPIM(reg) && !(dev_data->ctx.config->operation & SPI_HOLD_ON_CS)) {
 		nrfy_spim_disable(reg);
 	}
+
+	pm_device_runtime_put_async(dev, K_NO_WAIT);
 }
 
 static inline uint32_t get_nrf_spim_frequency(uint32_t frequency)
@@ -460,6 +463,7 @@ static int transceive(const struct device *dev,
 	void *reg = dev_config->spim.p_reg;
 	int error;
 
+	pm_device_runtime_get(dev);
 	spi_context_lock(&dev_data->ctx, asynchronous, cb, userdata, spi_cfg);
 
 	error = configure(dev, spi_cfg);
@@ -571,56 +575,49 @@ static const struct spi_driver_api spi_nrfx_driver_api = {
 	.release = spi_nrfx_release,
 };
 
-#ifdef CONFIG_PM_DEVICE
-static int spim_nrfx_pm_action(const struct device *dev,
-			       enum pm_device_action action)
+static void spim_resume(const struct device *dev)
 {
-	int ret = 0;
-	struct spi_nrfx_data *dev_data = dev->data;
 	const struct spi_nrfx_config *dev_config = dev->config;
 
-	switch (action) {
-	case PM_DEVICE_ACTION_RESUME:
-		ret = pinctrl_apply_state(dev_config->pcfg,
-					  PINCTRL_STATE_DEFAULT);
-		if (ret < 0) {
-			return ret;
-		}
-		/* nrfx_spim_init() will be called at configuration before
-		 * the next transfer.
-		 */
+	(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_DEFAULT);
+	/* nrfx_spim_init() will be called at configuration before
+	 * the next transfer.
+	 */
 
 #ifdef CONFIG_SOC_NRF54H20_GPD
-		nrf_gpd_retain_pins_set(dev_config->pcfg, false);
+	nrf_gpd_retain_pins_set(dev_config->pcfg, false);
 #endif
+}
 
-		break;
+static void spim_suspend(const struct device *dev)
+{
+	const struct spi_nrfx_config *dev_config = dev->config;
+	struct spi_nrfx_data *dev_data = dev->data;
 
-	case PM_DEVICE_ACTION_SUSPEND:
-		if (dev_data->initialized) {
-			nrfx_spim_uninit(&dev_config->spim);
-			dev_data->initialized = false;
-		}
+	if (dev_data->initialized) {
+		nrfx_spim_uninit(&dev_config->spim);
+		dev_data->initialized = false;
+	}
 
 #ifdef CONFIG_SOC_NRF54H20_GPD
-		nrf_gpd_retain_pins_set(dev_config->pcfg, true);
+	nrf_gpd_retain_pins_set(dev_config->pcfg, true);
 #endif
 
-		ret = pinctrl_apply_state(dev_config->pcfg,
-					  PINCTRL_STATE_SLEEP);
-		if (ret < 0) {
-			return ret;
-		}
-		break;
+	(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
+}
 
-	default:
-		ret = -ENOTSUP;
+static int spim_nrfx_pm_action(const struct device *dev, enum pm_device_action action)
+{
+	if (action == PM_DEVICE_ACTION_RESUME) {
+		spim_resume(dev);
+	} else if (IS_ENABLED(CONFIG_PM_DEVICE) && (action == PM_DEVICE_ACTION_SUSPEND)) {
+		spim_suspend(dev);
+	} else {
+		return -ENOTSUP;
 	}
 
-	return ret;
+	return 0;
 }
-#endif /* CONFIG_PM_DEVICE */
-
 
 static int spi_nrfx_init(const struct device *dev)
 {
@@ -655,10 +652,12 @@ static int spi_nrfx_init(const struct device *dev)
 	spi_context_unlock_unconditionally(&dev_data->ctx);
 
 #ifdef CONFIG_SOC_NRF52832_ALLOW_SPIM_DESPITE_PAN_58
-	return anomaly_58_workaround_init(dev);
-#else
-	return 0;
+	err = anomaly_58_workaround_init(dev);
+	if (err < 0) {
+		return err;
+	}
 #endif
+	return pm_device_driver_init(dev, spim_nrfx_pm_action);
 }
 /*
  * We use NODELABEL here because the nrfx API requires us to call

From 51d538f0a4a264aeedcd34d02e140c95a48c5625 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Fri, 12 Jul 2024 10:50:14 +0200
Subject: [PATCH 0887/2913] [nrf fromlist] tests: drivers: spi: nordic: add
 device PM runtime

Add configuration for testing SPI with device runtime PM enabled
for nRF platforms.

Upstream PR #: 75715

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
---
 .../boards/nrf52840dk_nrf52840.overlay                |  1 +
 .../boards/nrf54h20dk_nrf54h20_common.dtsi            |  1 +
 .../boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay    |  1 +
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay         |  2 ++
 .../spi/spi_controller_peripheral/testcase.yaml       |  6 ++++++
 .../spi/spi_loopback/boards/nrf51dk_nrf51822.overlay  |  1 +
 .../spi_loopback/boards/nrf52840dk_nrf52840.overlay   |  1 +
 .../spi/spi_loopback/boards/nrf52dk_nrf52832.overlay  |  1 +
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay         | 11 +++++++++++
 .../boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay    |  1 +
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay         |  1 +
 .../spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay |  1 +
 tests/drivers/spi/spi_loopback/testcase.yaml          |  5 +++++
 13 files changed, 33 insertions(+)

diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
index 97802a7a637..a1a0dc42a36 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
@@ -50,6 +50,7 @@
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi
index 8661760a5e3..d431933ab5a 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi
@@ -60,6 +60,7 @@
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
index 0523426db45..4441819249f 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
@@ -55,6 +55,7 @@
 	overrun-character = <0x00>;
 	memory-regions = <&dma_fast_region>;
 	cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 73a50a7c6fc..0188a2c4e24 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -54,9 +54,11 @@
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(16)>;
 	};
 };
 
diff --git a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
index e55a6a6a69d..41884efcdb5 100644
--- a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
+++ b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
@@ -58,3 +58,9 @@ tests:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
       - nrf54h20dk/nrf54h20/cpuppr
+
+  drivers.spi.pm_runtime:
+    extra_configs:
+      - CONFIG_PM_DEVICE=y
+      - CONFIG_PM_DEVICE_RUNTIME=y
+    filter: CONFIG_SOC_FAMILY_NORDIC_NRF
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay b/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay
index 812f643f3e8..06a0d63816a 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay
@@ -7,6 +7,7 @@
 &spi1 {
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay
index 7f511d0753d..7de4d8d6322 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay
@@ -8,6 +8,7 @@
 	overrun-character = <0x00>;
 	rx-delay = <1>;
 	cs-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay b/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay
index 812f643f3e8..06a0d63816a 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay
@@ -7,6 +7,7 @@
 &spi1 {
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index e9338612aed..1455ac160b8 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -8,4 +8,15 @@
 &spi130 {
 	status = "okay";
 	memory-regions = <&cpuapp_dma_region>;
+	zephyr,pm-device-runtime-auto;
+	slow@0 {
+		compatible = "test-spi-loopback-slow";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_K(500)>;
+	};
+	fast@0 {
+		compatible = "test-spi-loopback-fast";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(8)>;
+	};
 };
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
index d6c3c972afd..2857c48f6fb 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
@@ -30,6 +30,7 @@
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
 	memory-regions = <&dma_fast_region>;
+	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index f2e84b72f9b..8dcf6fd190d 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -29,6 +29,7 @@
 	pinctrl-1 = <&spi00_sleep>;
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
+	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay b/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay
index a07ed5fbf5d..bcd2472166a 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay
@@ -7,6 +7,7 @@
 &spi3 {
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml
index 5ed122bfd01..682446401cd 100644
--- a/tests/drivers/spi/spi_loopback/testcase.yaml
+++ b/tests/drivers/spi/spi_loopback/testcase.yaml
@@ -216,3 +216,8 @@ tests:
     filter: CONFIG_SOC_FAMILY_MAX32
     platform_allow:
       - apard32690/max32690/m4
+  drivers.spi.nrf_pm_runtime:
+    extra_configs:
+      - CONFIG_PM_DEVICE=y
+      - CONFIG_PM_DEVICE_RUNTIME=y
+    filter: CONFIG_SOC_FAMILY_NORDIC_NRF

From 376150db86795d604df215bcd28366dcce93bf28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 10 Dec 2024 12:53:51 +0100
Subject: [PATCH 0888/2913] [nrf fromlist] sys: util: Extend IS_EQ to support
 unsigned literals
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extend IS_EQ to include unsigned integer literals like 0U.

Upstream PR #: 82133

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 include/zephyr/sys/util_internal.h       |     2 +-
 include/zephyr/sys/util_internal_is_eq.h | 20485 ++++++++++++++++-----
 include/zephyr/sys/util_macro.h          |    14 +-
 3 files changed, 16402 insertions(+), 4099 deletions(-)

diff --git a/include/zephyr/sys/util_internal.h b/include/zephyr/sys/util_internal.h
index d3adca60640..1d4e0d2130f 100644
--- a/include/zephyr/sys/util_internal.h
+++ b/include/zephyr/sys/util_internal.h
@@ -50,7 +50,7 @@
 #define Z_IS_ENABLED3(ignore_this, val, ...) val
 
 /* Implementation of IS_EQ(). Returns 1 if _0 and _1 are the same integer from
- * 0 to 4095, 0 otherwise.
+ * 0 to 4096, 0 otherwise.
  */
 #define Z_IS_EQ(_0, _1) Z_HAS_COMMA(Z_CAT4(Z_IS_, _0, _EQ_, _1)())
 
diff --git a/include/zephyr/sys/util_internal_is_eq.h b/include/zephyr/sys/util_internal_is_eq.h
index 0734cf3506a..11657c6acf6 100644
--- a/include/zephyr/sys/util_internal_is_eq.h
+++ b/include/zephyr/sys/util_internal_is_eq.h
@@ -13,4102 +13,16393 @@
 #ifndef ZEPHYR_INCLUDE_SYS_UTIL_INTERNAL_IS_EQ_H_
 #define ZEPHYR_INCLUDE_SYS_UTIL_INTERNAL_IS_EQ_H_
 
-#define Z_IS_0_EQ_0(...) \,
-#define Z_IS_1_EQ_1(...) \,
-#define Z_IS_2_EQ_2(...) \,
-#define Z_IS_3_EQ_3(...) \,
-#define Z_IS_4_EQ_4(...) \,
-#define Z_IS_5_EQ_5(...) \,
-#define Z_IS_6_EQ_6(...) \,
-#define Z_IS_7_EQ_7(...) \,
-#define Z_IS_8_EQ_8(...) \,
-#define Z_IS_9_EQ_9(...) \,
-#define Z_IS_10_EQ_10(...) \,
-#define Z_IS_11_EQ_11(...) \,
-#define Z_IS_12_EQ_12(...) \,
-#define Z_IS_13_EQ_13(...) \,
-#define Z_IS_14_EQ_14(...) \,
-#define Z_IS_15_EQ_15(...) \,
-#define Z_IS_16_EQ_16(...) \,
-#define Z_IS_17_EQ_17(...) \,
-#define Z_IS_18_EQ_18(...) \,
-#define Z_IS_19_EQ_19(...) \,
-#define Z_IS_20_EQ_20(...) \,
-#define Z_IS_21_EQ_21(...) \,
-#define Z_IS_22_EQ_22(...) \,
-#define Z_IS_23_EQ_23(...) \,
-#define Z_IS_24_EQ_24(...) \,
-#define Z_IS_25_EQ_25(...) \,
-#define Z_IS_26_EQ_26(...) \,
-#define Z_IS_27_EQ_27(...) \,
-#define Z_IS_28_EQ_28(...) \,
-#define Z_IS_29_EQ_29(...) \,
-#define Z_IS_30_EQ_30(...) \,
-#define Z_IS_31_EQ_31(...) \,
-#define Z_IS_32_EQ_32(...) \,
-#define Z_IS_33_EQ_33(...) \,
-#define Z_IS_34_EQ_34(...) \,
-#define Z_IS_35_EQ_35(...) \,
-#define Z_IS_36_EQ_36(...) \,
-#define Z_IS_37_EQ_37(...) \,
-#define Z_IS_38_EQ_38(...) \,
-#define Z_IS_39_EQ_39(...) \,
-#define Z_IS_40_EQ_40(...) \,
-#define Z_IS_41_EQ_41(...) \,
-#define Z_IS_42_EQ_42(...) \,
-#define Z_IS_43_EQ_43(...) \,
-#define Z_IS_44_EQ_44(...) \,
-#define Z_IS_45_EQ_45(...) \,
-#define Z_IS_46_EQ_46(...) \,
-#define Z_IS_47_EQ_47(...) \,
-#define Z_IS_48_EQ_48(...) \,
-#define Z_IS_49_EQ_49(...) \,
-#define Z_IS_50_EQ_50(...) \,
-#define Z_IS_51_EQ_51(...) \,
-#define Z_IS_52_EQ_52(...) \,
-#define Z_IS_53_EQ_53(...) \,
-#define Z_IS_54_EQ_54(...) \,
-#define Z_IS_55_EQ_55(...) \,
-#define Z_IS_56_EQ_56(...) \,
-#define Z_IS_57_EQ_57(...) \,
-#define Z_IS_58_EQ_58(...) \,
-#define Z_IS_59_EQ_59(...) \,
-#define Z_IS_60_EQ_60(...) \,
-#define Z_IS_61_EQ_61(...) \,
-#define Z_IS_62_EQ_62(...) \,
-#define Z_IS_63_EQ_63(...) \,
-#define Z_IS_64_EQ_64(...) \,
-#define Z_IS_65_EQ_65(...) \,
-#define Z_IS_66_EQ_66(...) \,
-#define Z_IS_67_EQ_67(...) \,
-#define Z_IS_68_EQ_68(...) \,
-#define Z_IS_69_EQ_69(...) \,
-#define Z_IS_70_EQ_70(...) \,
-#define Z_IS_71_EQ_71(...) \,
-#define Z_IS_72_EQ_72(...) \,
-#define Z_IS_73_EQ_73(...) \,
-#define Z_IS_74_EQ_74(...) \,
-#define Z_IS_75_EQ_75(...) \,
-#define Z_IS_76_EQ_76(...) \,
-#define Z_IS_77_EQ_77(...) \,
-#define Z_IS_78_EQ_78(...) \,
-#define Z_IS_79_EQ_79(...) \,
-#define Z_IS_80_EQ_80(...) \,
-#define Z_IS_81_EQ_81(...) \,
-#define Z_IS_82_EQ_82(...) \,
-#define Z_IS_83_EQ_83(...) \,
-#define Z_IS_84_EQ_84(...) \,
-#define Z_IS_85_EQ_85(...) \,
-#define Z_IS_86_EQ_86(...) \,
-#define Z_IS_87_EQ_87(...) \,
-#define Z_IS_88_EQ_88(...) \,
-#define Z_IS_89_EQ_89(...) \,
-#define Z_IS_90_EQ_90(...) \,
-#define Z_IS_91_EQ_91(...) \,
-#define Z_IS_92_EQ_92(...) \,
-#define Z_IS_93_EQ_93(...) \,
-#define Z_IS_94_EQ_94(...) \,
-#define Z_IS_95_EQ_95(...) \,
-#define Z_IS_96_EQ_96(...) \,
-#define Z_IS_97_EQ_97(...) \,
-#define Z_IS_98_EQ_98(...) \,
-#define Z_IS_99_EQ_99(...) \,
-#define Z_IS_100_EQ_100(...) \,
-#define Z_IS_101_EQ_101(...) \,
-#define Z_IS_102_EQ_102(...) \,
-#define Z_IS_103_EQ_103(...) \,
-#define Z_IS_104_EQ_104(...) \,
-#define Z_IS_105_EQ_105(...) \,
-#define Z_IS_106_EQ_106(...) \,
-#define Z_IS_107_EQ_107(...) \,
-#define Z_IS_108_EQ_108(...) \,
-#define Z_IS_109_EQ_109(...) \,
-#define Z_IS_110_EQ_110(...) \,
-#define Z_IS_111_EQ_111(...) \,
-#define Z_IS_112_EQ_112(...) \,
-#define Z_IS_113_EQ_113(...) \,
-#define Z_IS_114_EQ_114(...) \,
-#define Z_IS_115_EQ_115(...) \,
-#define Z_IS_116_EQ_116(...) \,
-#define Z_IS_117_EQ_117(...) \,
-#define Z_IS_118_EQ_118(...) \,
-#define Z_IS_119_EQ_119(...) \,
-#define Z_IS_120_EQ_120(...) \,
-#define Z_IS_121_EQ_121(...) \,
-#define Z_IS_122_EQ_122(...) \,
-#define Z_IS_123_EQ_123(...) \,
-#define Z_IS_124_EQ_124(...) \,
-#define Z_IS_125_EQ_125(...) \,
-#define Z_IS_126_EQ_126(...) \,
-#define Z_IS_127_EQ_127(...) \,
-#define Z_IS_128_EQ_128(...) \,
-#define Z_IS_129_EQ_129(...) \,
-#define Z_IS_130_EQ_130(...) \,
-#define Z_IS_131_EQ_131(...) \,
-#define Z_IS_132_EQ_132(...) \,
-#define Z_IS_133_EQ_133(...) \,
-#define Z_IS_134_EQ_134(...) \,
-#define Z_IS_135_EQ_135(...) \,
-#define Z_IS_136_EQ_136(...) \,
-#define Z_IS_137_EQ_137(...) \,
-#define Z_IS_138_EQ_138(...) \,
-#define Z_IS_139_EQ_139(...) \,
-#define Z_IS_140_EQ_140(...) \,
-#define Z_IS_141_EQ_141(...) \,
-#define Z_IS_142_EQ_142(...) \,
-#define Z_IS_143_EQ_143(...) \,
-#define Z_IS_144_EQ_144(...) \,
-#define Z_IS_145_EQ_145(...) \,
-#define Z_IS_146_EQ_146(...) \,
-#define Z_IS_147_EQ_147(...) \,
-#define Z_IS_148_EQ_148(...) \,
-#define Z_IS_149_EQ_149(...) \,
-#define Z_IS_150_EQ_150(...) \,
-#define Z_IS_151_EQ_151(...) \,
-#define Z_IS_152_EQ_152(...) \,
-#define Z_IS_153_EQ_153(...) \,
-#define Z_IS_154_EQ_154(...) \,
-#define Z_IS_155_EQ_155(...) \,
-#define Z_IS_156_EQ_156(...) \,
-#define Z_IS_157_EQ_157(...) \,
-#define Z_IS_158_EQ_158(...) \,
-#define Z_IS_159_EQ_159(...) \,
-#define Z_IS_160_EQ_160(...) \,
-#define Z_IS_161_EQ_161(...) \,
-#define Z_IS_162_EQ_162(...) \,
-#define Z_IS_163_EQ_163(...) \,
-#define Z_IS_164_EQ_164(...) \,
-#define Z_IS_165_EQ_165(...) \,
-#define Z_IS_166_EQ_166(...) \,
-#define Z_IS_167_EQ_167(...) \,
-#define Z_IS_168_EQ_168(...) \,
-#define Z_IS_169_EQ_169(...) \,
-#define Z_IS_170_EQ_170(...) \,
-#define Z_IS_171_EQ_171(...) \,
-#define Z_IS_172_EQ_172(...) \,
-#define Z_IS_173_EQ_173(...) \,
-#define Z_IS_174_EQ_174(...) \,
-#define Z_IS_175_EQ_175(...) \,
-#define Z_IS_176_EQ_176(...) \,
-#define Z_IS_177_EQ_177(...) \,
-#define Z_IS_178_EQ_178(...) \,
-#define Z_IS_179_EQ_179(...) \,
-#define Z_IS_180_EQ_180(...) \,
-#define Z_IS_181_EQ_181(...) \,
-#define Z_IS_182_EQ_182(...) \,
-#define Z_IS_183_EQ_183(...) \,
-#define Z_IS_184_EQ_184(...) \,
-#define Z_IS_185_EQ_185(...) \,
-#define Z_IS_186_EQ_186(...) \,
-#define Z_IS_187_EQ_187(...) \,
-#define Z_IS_188_EQ_188(...) \,
-#define Z_IS_189_EQ_189(...) \,
-#define Z_IS_190_EQ_190(...) \,
-#define Z_IS_191_EQ_191(...) \,
-#define Z_IS_192_EQ_192(...) \,
-#define Z_IS_193_EQ_193(...) \,
-#define Z_IS_194_EQ_194(...) \,
-#define Z_IS_195_EQ_195(...) \,
-#define Z_IS_196_EQ_196(...) \,
-#define Z_IS_197_EQ_197(...) \,
-#define Z_IS_198_EQ_198(...) \,
-#define Z_IS_199_EQ_199(...) \,
-#define Z_IS_200_EQ_200(...) \,
-#define Z_IS_201_EQ_201(...) \,
-#define Z_IS_202_EQ_202(...) \,
-#define Z_IS_203_EQ_203(...) \,
-#define Z_IS_204_EQ_204(...) \,
-#define Z_IS_205_EQ_205(...) \,
-#define Z_IS_206_EQ_206(...) \,
-#define Z_IS_207_EQ_207(...) \,
-#define Z_IS_208_EQ_208(...) \,
-#define Z_IS_209_EQ_209(...) \,
-#define Z_IS_210_EQ_210(...) \,
-#define Z_IS_211_EQ_211(...) \,
-#define Z_IS_212_EQ_212(...) \,
-#define Z_IS_213_EQ_213(...) \,
-#define Z_IS_214_EQ_214(...) \,
-#define Z_IS_215_EQ_215(...) \,
-#define Z_IS_216_EQ_216(...) \,
-#define Z_IS_217_EQ_217(...) \,
-#define Z_IS_218_EQ_218(...) \,
-#define Z_IS_219_EQ_219(...) \,
-#define Z_IS_220_EQ_220(...) \,
-#define Z_IS_221_EQ_221(...) \,
-#define Z_IS_222_EQ_222(...) \,
-#define Z_IS_223_EQ_223(...) \,
-#define Z_IS_224_EQ_224(...) \,
-#define Z_IS_225_EQ_225(...) \,
-#define Z_IS_226_EQ_226(...) \,
-#define Z_IS_227_EQ_227(...) \,
-#define Z_IS_228_EQ_228(...) \,
-#define Z_IS_229_EQ_229(...) \,
-#define Z_IS_230_EQ_230(...) \,
-#define Z_IS_231_EQ_231(...) \,
-#define Z_IS_232_EQ_232(...) \,
-#define Z_IS_233_EQ_233(...) \,
-#define Z_IS_234_EQ_234(...) \,
-#define Z_IS_235_EQ_235(...) \,
-#define Z_IS_236_EQ_236(...) \,
-#define Z_IS_237_EQ_237(...) \,
-#define Z_IS_238_EQ_238(...) \,
-#define Z_IS_239_EQ_239(...) \,
-#define Z_IS_240_EQ_240(...) \,
-#define Z_IS_241_EQ_241(...) \,
-#define Z_IS_242_EQ_242(...) \,
-#define Z_IS_243_EQ_243(...) \,
-#define Z_IS_244_EQ_244(...) \,
-#define Z_IS_245_EQ_245(...) \,
-#define Z_IS_246_EQ_246(...) \,
-#define Z_IS_247_EQ_247(...) \,
-#define Z_IS_248_EQ_248(...) \,
-#define Z_IS_249_EQ_249(...) \,
-#define Z_IS_250_EQ_250(...) \,
-#define Z_IS_251_EQ_251(...) \,
-#define Z_IS_252_EQ_252(...) \,
-#define Z_IS_253_EQ_253(...) \,
-#define Z_IS_254_EQ_254(...) \,
-#define Z_IS_255_EQ_255(...) \,
-#define Z_IS_256_EQ_256(...) \,
-#define Z_IS_257_EQ_257(...) \,
-#define Z_IS_258_EQ_258(...) \,
-#define Z_IS_259_EQ_259(...) \,
-#define Z_IS_260_EQ_260(...) \,
-#define Z_IS_261_EQ_261(...) \,
-#define Z_IS_262_EQ_262(...) \,
-#define Z_IS_263_EQ_263(...) \,
-#define Z_IS_264_EQ_264(...) \,
-#define Z_IS_265_EQ_265(...) \,
-#define Z_IS_266_EQ_266(...) \,
-#define Z_IS_267_EQ_267(...) \,
-#define Z_IS_268_EQ_268(...) \,
-#define Z_IS_269_EQ_269(...) \,
-#define Z_IS_270_EQ_270(...) \,
-#define Z_IS_271_EQ_271(...) \,
-#define Z_IS_272_EQ_272(...) \,
-#define Z_IS_273_EQ_273(...) \,
-#define Z_IS_274_EQ_274(...) \,
-#define Z_IS_275_EQ_275(...) \,
-#define Z_IS_276_EQ_276(...) \,
-#define Z_IS_277_EQ_277(...) \,
-#define Z_IS_278_EQ_278(...) \,
-#define Z_IS_279_EQ_279(...) \,
-#define Z_IS_280_EQ_280(...) \,
-#define Z_IS_281_EQ_281(...) \,
-#define Z_IS_282_EQ_282(...) \,
-#define Z_IS_283_EQ_283(...) \,
-#define Z_IS_284_EQ_284(...) \,
-#define Z_IS_285_EQ_285(...) \,
-#define Z_IS_286_EQ_286(...) \,
-#define Z_IS_287_EQ_287(...) \,
-#define Z_IS_288_EQ_288(...) \,
-#define Z_IS_289_EQ_289(...) \,
-#define Z_IS_290_EQ_290(...) \,
-#define Z_IS_291_EQ_291(...) \,
-#define Z_IS_292_EQ_292(...) \,
-#define Z_IS_293_EQ_293(...) \,
-#define Z_IS_294_EQ_294(...) \,
-#define Z_IS_295_EQ_295(...) \,
-#define Z_IS_296_EQ_296(...) \,
-#define Z_IS_297_EQ_297(...) \,
-#define Z_IS_298_EQ_298(...) \,
-#define Z_IS_299_EQ_299(...) \,
-#define Z_IS_300_EQ_300(...) \,
-#define Z_IS_301_EQ_301(...) \,
-#define Z_IS_302_EQ_302(...) \,
-#define Z_IS_303_EQ_303(...) \,
-#define Z_IS_304_EQ_304(...) \,
-#define Z_IS_305_EQ_305(...) \,
-#define Z_IS_306_EQ_306(...) \,
-#define Z_IS_307_EQ_307(...) \,
-#define Z_IS_308_EQ_308(...) \,
-#define Z_IS_309_EQ_309(...) \,
-#define Z_IS_310_EQ_310(...) \,
-#define Z_IS_311_EQ_311(...) \,
-#define Z_IS_312_EQ_312(...) \,
-#define Z_IS_313_EQ_313(...) \,
-#define Z_IS_314_EQ_314(...) \,
-#define Z_IS_315_EQ_315(...) \,
-#define Z_IS_316_EQ_316(...) \,
-#define Z_IS_317_EQ_317(...) \,
-#define Z_IS_318_EQ_318(...) \,
-#define Z_IS_319_EQ_319(...) \,
-#define Z_IS_320_EQ_320(...) \,
-#define Z_IS_321_EQ_321(...) \,
-#define Z_IS_322_EQ_322(...) \,
-#define Z_IS_323_EQ_323(...) \,
-#define Z_IS_324_EQ_324(...) \,
-#define Z_IS_325_EQ_325(...) \,
-#define Z_IS_326_EQ_326(...) \,
-#define Z_IS_327_EQ_327(...) \,
-#define Z_IS_328_EQ_328(...) \,
-#define Z_IS_329_EQ_329(...) \,
-#define Z_IS_330_EQ_330(...) \,
-#define Z_IS_331_EQ_331(...) \,
-#define Z_IS_332_EQ_332(...) \,
-#define Z_IS_333_EQ_333(...) \,
-#define Z_IS_334_EQ_334(...) \,
-#define Z_IS_335_EQ_335(...) \,
-#define Z_IS_336_EQ_336(...) \,
-#define Z_IS_337_EQ_337(...) \,
-#define Z_IS_338_EQ_338(...) \,
-#define Z_IS_339_EQ_339(...) \,
-#define Z_IS_340_EQ_340(...) \,
-#define Z_IS_341_EQ_341(...) \,
-#define Z_IS_342_EQ_342(...) \,
-#define Z_IS_343_EQ_343(...) \,
-#define Z_IS_344_EQ_344(...) \,
-#define Z_IS_345_EQ_345(...) \,
-#define Z_IS_346_EQ_346(...) \,
-#define Z_IS_347_EQ_347(...) \,
-#define Z_IS_348_EQ_348(...) \,
-#define Z_IS_349_EQ_349(...) \,
-#define Z_IS_350_EQ_350(...) \,
-#define Z_IS_351_EQ_351(...) \,
-#define Z_IS_352_EQ_352(...) \,
-#define Z_IS_353_EQ_353(...) \,
-#define Z_IS_354_EQ_354(...) \,
-#define Z_IS_355_EQ_355(...) \,
-#define Z_IS_356_EQ_356(...) \,
-#define Z_IS_357_EQ_357(...) \,
-#define Z_IS_358_EQ_358(...) \,
-#define Z_IS_359_EQ_359(...) \,
-#define Z_IS_360_EQ_360(...) \,
-#define Z_IS_361_EQ_361(...) \,
-#define Z_IS_362_EQ_362(...) \,
-#define Z_IS_363_EQ_363(...) \,
-#define Z_IS_364_EQ_364(...) \,
-#define Z_IS_365_EQ_365(...) \,
-#define Z_IS_366_EQ_366(...) \,
-#define Z_IS_367_EQ_367(...) \,
-#define Z_IS_368_EQ_368(...) \,
-#define Z_IS_369_EQ_369(...) \,
-#define Z_IS_370_EQ_370(...) \,
-#define Z_IS_371_EQ_371(...) \,
-#define Z_IS_372_EQ_372(...) \,
-#define Z_IS_373_EQ_373(...) \,
-#define Z_IS_374_EQ_374(...) \,
-#define Z_IS_375_EQ_375(...) \,
-#define Z_IS_376_EQ_376(...) \,
-#define Z_IS_377_EQ_377(...) \,
-#define Z_IS_378_EQ_378(...) \,
-#define Z_IS_379_EQ_379(...) \,
-#define Z_IS_380_EQ_380(...) \,
-#define Z_IS_381_EQ_381(...) \,
-#define Z_IS_382_EQ_382(...) \,
-#define Z_IS_383_EQ_383(...) \,
-#define Z_IS_384_EQ_384(...) \,
-#define Z_IS_385_EQ_385(...) \,
-#define Z_IS_386_EQ_386(...) \,
-#define Z_IS_387_EQ_387(...) \,
-#define Z_IS_388_EQ_388(...) \,
-#define Z_IS_389_EQ_389(...) \,
-#define Z_IS_390_EQ_390(...) \,
-#define Z_IS_391_EQ_391(...) \,
-#define Z_IS_392_EQ_392(...) \,
-#define Z_IS_393_EQ_393(...) \,
-#define Z_IS_394_EQ_394(...) \,
-#define Z_IS_395_EQ_395(...) \,
-#define Z_IS_396_EQ_396(...) \,
-#define Z_IS_397_EQ_397(...) \,
-#define Z_IS_398_EQ_398(...) \,
-#define Z_IS_399_EQ_399(...) \,
-#define Z_IS_400_EQ_400(...) \,
-#define Z_IS_401_EQ_401(...) \,
-#define Z_IS_402_EQ_402(...) \,
-#define Z_IS_403_EQ_403(...) \,
-#define Z_IS_404_EQ_404(...) \,
-#define Z_IS_405_EQ_405(...) \,
-#define Z_IS_406_EQ_406(...) \,
-#define Z_IS_407_EQ_407(...) \,
-#define Z_IS_408_EQ_408(...) \,
-#define Z_IS_409_EQ_409(...) \,
-#define Z_IS_410_EQ_410(...) \,
-#define Z_IS_411_EQ_411(...) \,
-#define Z_IS_412_EQ_412(...) \,
-#define Z_IS_413_EQ_413(...) \,
-#define Z_IS_414_EQ_414(...) \,
-#define Z_IS_415_EQ_415(...) \,
-#define Z_IS_416_EQ_416(...) \,
-#define Z_IS_417_EQ_417(...) \,
-#define Z_IS_418_EQ_418(...) \,
-#define Z_IS_419_EQ_419(...) \,
-#define Z_IS_420_EQ_420(...) \,
-#define Z_IS_421_EQ_421(...) \,
-#define Z_IS_422_EQ_422(...) \,
-#define Z_IS_423_EQ_423(...) \,
-#define Z_IS_424_EQ_424(...) \,
-#define Z_IS_425_EQ_425(...) \,
-#define Z_IS_426_EQ_426(...) \,
-#define Z_IS_427_EQ_427(...) \,
-#define Z_IS_428_EQ_428(...) \,
-#define Z_IS_429_EQ_429(...) \,
-#define Z_IS_430_EQ_430(...) \,
-#define Z_IS_431_EQ_431(...) \,
-#define Z_IS_432_EQ_432(...) \,
-#define Z_IS_433_EQ_433(...) \,
-#define Z_IS_434_EQ_434(...) \,
-#define Z_IS_435_EQ_435(...) \,
-#define Z_IS_436_EQ_436(...) \,
-#define Z_IS_437_EQ_437(...) \,
-#define Z_IS_438_EQ_438(...) \,
-#define Z_IS_439_EQ_439(...) \,
-#define Z_IS_440_EQ_440(...) \,
-#define Z_IS_441_EQ_441(...) \,
-#define Z_IS_442_EQ_442(...) \,
-#define Z_IS_443_EQ_443(...) \,
-#define Z_IS_444_EQ_444(...) \,
-#define Z_IS_445_EQ_445(...) \,
-#define Z_IS_446_EQ_446(...) \,
-#define Z_IS_447_EQ_447(...) \,
-#define Z_IS_448_EQ_448(...) \,
-#define Z_IS_449_EQ_449(...) \,
-#define Z_IS_450_EQ_450(...) \,
-#define Z_IS_451_EQ_451(...) \,
-#define Z_IS_452_EQ_452(...) \,
-#define Z_IS_453_EQ_453(...) \,
-#define Z_IS_454_EQ_454(...) \,
-#define Z_IS_455_EQ_455(...) \,
-#define Z_IS_456_EQ_456(...) \,
-#define Z_IS_457_EQ_457(...) \,
-#define Z_IS_458_EQ_458(...) \,
-#define Z_IS_459_EQ_459(...) \,
-#define Z_IS_460_EQ_460(...) \,
-#define Z_IS_461_EQ_461(...) \,
-#define Z_IS_462_EQ_462(...) \,
-#define Z_IS_463_EQ_463(...) \,
-#define Z_IS_464_EQ_464(...) \,
-#define Z_IS_465_EQ_465(...) \,
-#define Z_IS_466_EQ_466(...) \,
-#define Z_IS_467_EQ_467(...) \,
-#define Z_IS_468_EQ_468(...) \,
-#define Z_IS_469_EQ_469(...) \,
-#define Z_IS_470_EQ_470(...) \,
-#define Z_IS_471_EQ_471(...) \,
-#define Z_IS_472_EQ_472(...) \,
-#define Z_IS_473_EQ_473(...) \,
-#define Z_IS_474_EQ_474(...) \,
-#define Z_IS_475_EQ_475(...) \,
-#define Z_IS_476_EQ_476(...) \,
-#define Z_IS_477_EQ_477(...) \,
-#define Z_IS_478_EQ_478(...) \,
-#define Z_IS_479_EQ_479(...) \,
-#define Z_IS_480_EQ_480(...) \,
-#define Z_IS_481_EQ_481(...) \,
-#define Z_IS_482_EQ_482(...) \,
-#define Z_IS_483_EQ_483(...) \,
-#define Z_IS_484_EQ_484(...) \,
-#define Z_IS_485_EQ_485(...) \,
-#define Z_IS_486_EQ_486(...) \,
-#define Z_IS_487_EQ_487(...) \,
-#define Z_IS_488_EQ_488(...) \,
-#define Z_IS_489_EQ_489(...) \,
-#define Z_IS_490_EQ_490(...) \,
-#define Z_IS_491_EQ_491(...) \,
-#define Z_IS_492_EQ_492(...) \,
-#define Z_IS_493_EQ_493(...) \,
-#define Z_IS_494_EQ_494(...) \,
-#define Z_IS_495_EQ_495(...) \,
-#define Z_IS_496_EQ_496(...) \,
-#define Z_IS_497_EQ_497(...) \,
-#define Z_IS_498_EQ_498(...) \,
-#define Z_IS_499_EQ_499(...) \,
-#define Z_IS_500_EQ_500(...) \,
-#define Z_IS_501_EQ_501(...) \,
-#define Z_IS_502_EQ_502(...) \,
-#define Z_IS_503_EQ_503(...) \,
-#define Z_IS_504_EQ_504(...) \,
-#define Z_IS_505_EQ_505(...) \,
-#define Z_IS_506_EQ_506(...) \,
-#define Z_IS_507_EQ_507(...) \,
-#define Z_IS_508_EQ_508(...) \,
-#define Z_IS_509_EQ_509(...) \,
-#define Z_IS_510_EQ_510(...) \,
-#define Z_IS_511_EQ_511(...) \,
-#define Z_IS_512_EQ_512(...) \,
-#define Z_IS_513_EQ_513(...) \,
-#define Z_IS_514_EQ_514(...) \,
-#define Z_IS_515_EQ_515(...) \,
-#define Z_IS_516_EQ_516(...) \,
-#define Z_IS_517_EQ_517(...) \,
-#define Z_IS_518_EQ_518(...) \,
-#define Z_IS_519_EQ_519(...) \,
-#define Z_IS_520_EQ_520(...) \,
-#define Z_IS_521_EQ_521(...) \,
-#define Z_IS_522_EQ_522(...) \,
-#define Z_IS_523_EQ_523(...) \,
-#define Z_IS_524_EQ_524(...) \,
-#define Z_IS_525_EQ_525(...) \,
-#define Z_IS_526_EQ_526(...) \,
-#define Z_IS_527_EQ_527(...) \,
-#define Z_IS_528_EQ_528(...) \,
-#define Z_IS_529_EQ_529(...) \,
-#define Z_IS_530_EQ_530(...) \,
-#define Z_IS_531_EQ_531(...) \,
-#define Z_IS_532_EQ_532(...) \,
-#define Z_IS_533_EQ_533(...) \,
-#define Z_IS_534_EQ_534(...) \,
-#define Z_IS_535_EQ_535(...) \,
-#define Z_IS_536_EQ_536(...) \,
-#define Z_IS_537_EQ_537(...) \,
-#define Z_IS_538_EQ_538(...) \,
-#define Z_IS_539_EQ_539(...) \,
-#define Z_IS_540_EQ_540(...) \,
-#define Z_IS_541_EQ_541(...) \,
-#define Z_IS_542_EQ_542(...) \,
-#define Z_IS_543_EQ_543(...) \,
-#define Z_IS_544_EQ_544(...) \,
-#define Z_IS_545_EQ_545(...) \,
-#define Z_IS_546_EQ_546(...) \,
-#define Z_IS_547_EQ_547(...) \,
-#define Z_IS_548_EQ_548(...) \,
-#define Z_IS_549_EQ_549(...) \,
-#define Z_IS_550_EQ_550(...) \,
-#define Z_IS_551_EQ_551(...) \,
-#define Z_IS_552_EQ_552(...) \,
-#define Z_IS_553_EQ_553(...) \,
-#define Z_IS_554_EQ_554(...) \,
-#define Z_IS_555_EQ_555(...) \,
-#define Z_IS_556_EQ_556(...) \,
-#define Z_IS_557_EQ_557(...) \,
-#define Z_IS_558_EQ_558(...) \,
-#define Z_IS_559_EQ_559(...) \,
-#define Z_IS_560_EQ_560(...) \,
-#define Z_IS_561_EQ_561(...) \,
-#define Z_IS_562_EQ_562(...) \,
-#define Z_IS_563_EQ_563(...) \,
-#define Z_IS_564_EQ_564(...) \,
-#define Z_IS_565_EQ_565(...) \,
-#define Z_IS_566_EQ_566(...) \,
-#define Z_IS_567_EQ_567(...) \,
-#define Z_IS_568_EQ_568(...) \,
-#define Z_IS_569_EQ_569(...) \,
-#define Z_IS_570_EQ_570(...) \,
-#define Z_IS_571_EQ_571(...) \,
-#define Z_IS_572_EQ_572(...) \,
-#define Z_IS_573_EQ_573(...) \,
-#define Z_IS_574_EQ_574(...) \,
-#define Z_IS_575_EQ_575(...) \,
-#define Z_IS_576_EQ_576(...) \,
-#define Z_IS_577_EQ_577(...) \,
-#define Z_IS_578_EQ_578(...) \,
-#define Z_IS_579_EQ_579(...) \,
-#define Z_IS_580_EQ_580(...) \,
-#define Z_IS_581_EQ_581(...) \,
-#define Z_IS_582_EQ_582(...) \,
-#define Z_IS_583_EQ_583(...) \,
-#define Z_IS_584_EQ_584(...) \,
-#define Z_IS_585_EQ_585(...) \,
-#define Z_IS_586_EQ_586(...) \,
-#define Z_IS_587_EQ_587(...) \,
-#define Z_IS_588_EQ_588(...) \,
-#define Z_IS_589_EQ_589(...) \,
-#define Z_IS_590_EQ_590(...) \,
-#define Z_IS_591_EQ_591(...) \,
-#define Z_IS_592_EQ_592(...) \,
-#define Z_IS_593_EQ_593(...) \,
-#define Z_IS_594_EQ_594(...) \,
-#define Z_IS_595_EQ_595(...) \,
-#define Z_IS_596_EQ_596(...) \,
-#define Z_IS_597_EQ_597(...) \,
-#define Z_IS_598_EQ_598(...) \,
-#define Z_IS_599_EQ_599(...) \,
-#define Z_IS_600_EQ_600(...) \,
-#define Z_IS_601_EQ_601(...) \,
-#define Z_IS_602_EQ_602(...) \,
-#define Z_IS_603_EQ_603(...) \,
-#define Z_IS_604_EQ_604(...) \,
-#define Z_IS_605_EQ_605(...) \,
-#define Z_IS_606_EQ_606(...) \,
-#define Z_IS_607_EQ_607(...) \,
-#define Z_IS_608_EQ_608(...) \,
-#define Z_IS_609_EQ_609(...) \,
-#define Z_IS_610_EQ_610(...) \,
-#define Z_IS_611_EQ_611(...) \,
-#define Z_IS_612_EQ_612(...) \,
-#define Z_IS_613_EQ_613(...) \,
-#define Z_IS_614_EQ_614(...) \,
-#define Z_IS_615_EQ_615(...) \,
-#define Z_IS_616_EQ_616(...) \,
-#define Z_IS_617_EQ_617(...) \,
-#define Z_IS_618_EQ_618(...) \,
-#define Z_IS_619_EQ_619(...) \,
-#define Z_IS_620_EQ_620(...) \,
-#define Z_IS_621_EQ_621(...) \,
-#define Z_IS_622_EQ_622(...) \,
-#define Z_IS_623_EQ_623(...) \,
-#define Z_IS_624_EQ_624(...) \,
-#define Z_IS_625_EQ_625(...) \,
-#define Z_IS_626_EQ_626(...) \,
-#define Z_IS_627_EQ_627(...) \,
-#define Z_IS_628_EQ_628(...) \,
-#define Z_IS_629_EQ_629(...) \,
-#define Z_IS_630_EQ_630(...) \,
-#define Z_IS_631_EQ_631(...) \,
-#define Z_IS_632_EQ_632(...) \,
-#define Z_IS_633_EQ_633(...) \,
-#define Z_IS_634_EQ_634(...) \,
-#define Z_IS_635_EQ_635(...) \,
-#define Z_IS_636_EQ_636(...) \,
-#define Z_IS_637_EQ_637(...) \,
-#define Z_IS_638_EQ_638(...) \,
-#define Z_IS_639_EQ_639(...) \,
-#define Z_IS_640_EQ_640(...) \,
-#define Z_IS_641_EQ_641(...) \,
-#define Z_IS_642_EQ_642(...) \,
-#define Z_IS_643_EQ_643(...) \,
-#define Z_IS_644_EQ_644(...) \,
-#define Z_IS_645_EQ_645(...) \,
-#define Z_IS_646_EQ_646(...) \,
-#define Z_IS_647_EQ_647(...) \,
-#define Z_IS_648_EQ_648(...) \,
-#define Z_IS_649_EQ_649(...) \,
-#define Z_IS_650_EQ_650(...) \,
-#define Z_IS_651_EQ_651(...) \,
-#define Z_IS_652_EQ_652(...) \,
-#define Z_IS_653_EQ_653(...) \,
-#define Z_IS_654_EQ_654(...) \,
-#define Z_IS_655_EQ_655(...) \,
-#define Z_IS_656_EQ_656(...) \,
-#define Z_IS_657_EQ_657(...) \,
-#define Z_IS_658_EQ_658(...) \,
-#define Z_IS_659_EQ_659(...) \,
-#define Z_IS_660_EQ_660(...) \,
-#define Z_IS_661_EQ_661(...) \,
-#define Z_IS_662_EQ_662(...) \,
-#define Z_IS_663_EQ_663(...) \,
-#define Z_IS_664_EQ_664(...) \,
-#define Z_IS_665_EQ_665(...) \,
-#define Z_IS_666_EQ_666(...) \,
-#define Z_IS_667_EQ_667(...) \,
-#define Z_IS_668_EQ_668(...) \,
-#define Z_IS_669_EQ_669(...) \,
-#define Z_IS_670_EQ_670(...) \,
-#define Z_IS_671_EQ_671(...) \,
-#define Z_IS_672_EQ_672(...) \,
-#define Z_IS_673_EQ_673(...) \,
-#define Z_IS_674_EQ_674(...) \,
-#define Z_IS_675_EQ_675(...) \,
-#define Z_IS_676_EQ_676(...) \,
-#define Z_IS_677_EQ_677(...) \,
-#define Z_IS_678_EQ_678(...) \,
-#define Z_IS_679_EQ_679(...) \,
-#define Z_IS_680_EQ_680(...) \,
-#define Z_IS_681_EQ_681(...) \,
-#define Z_IS_682_EQ_682(...) \,
-#define Z_IS_683_EQ_683(...) \,
-#define Z_IS_684_EQ_684(...) \,
-#define Z_IS_685_EQ_685(...) \,
-#define Z_IS_686_EQ_686(...) \,
-#define Z_IS_687_EQ_687(...) \,
-#define Z_IS_688_EQ_688(...) \,
-#define Z_IS_689_EQ_689(...) \,
-#define Z_IS_690_EQ_690(...) \,
-#define Z_IS_691_EQ_691(...) \,
-#define Z_IS_692_EQ_692(...) \,
-#define Z_IS_693_EQ_693(...) \,
-#define Z_IS_694_EQ_694(...) \,
-#define Z_IS_695_EQ_695(...) \,
-#define Z_IS_696_EQ_696(...) \,
-#define Z_IS_697_EQ_697(...) \,
-#define Z_IS_698_EQ_698(...) \,
-#define Z_IS_699_EQ_699(...) \,
-#define Z_IS_700_EQ_700(...) \,
-#define Z_IS_701_EQ_701(...) \,
-#define Z_IS_702_EQ_702(...) \,
-#define Z_IS_703_EQ_703(...) \,
-#define Z_IS_704_EQ_704(...) \,
-#define Z_IS_705_EQ_705(...) \,
-#define Z_IS_706_EQ_706(...) \,
-#define Z_IS_707_EQ_707(...) \,
-#define Z_IS_708_EQ_708(...) \,
-#define Z_IS_709_EQ_709(...) \,
-#define Z_IS_710_EQ_710(...) \,
-#define Z_IS_711_EQ_711(...) \,
-#define Z_IS_712_EQ_712(...) \,
-#define Z_IS_713_EQ_713(...) \,
-#define Z_IS_714_EQ_714(...) \,
-#define Z_IS_715_EQ_715(...) \,
-#define Z_IS_716_EQ_716(...) \,
-#define Z_IS_717_EQ_717(...) \,
-#define Z_IS_718_EQ_718(...) \,
-#define Z_IS_719_EQ_719(...) \,
-#define Z_IS_720_EQ_720(...) \,
-#define Z_IS_721_EQ_721(...) \,
-#define Z_IS_722_EQ_722(...) \,
-#define Z_IS_723_EQ_723(...) \,
-#define Z_IS_724_EQ_724(...) \,
-#define Z_IS_725_EQ_725(...) \,
-#define Z_IS_726_EQ_726(...) \,
-#define Z_IS_727_EQ_727(...) \,
-#define Z_IS_728_EQ_728(...) \,
-#define Z_IS_729_EQ_729(...) \,
-#define Z_IS_730_EQ_730(...) \,
-#define Z_IS_731_EQ_731(...) \,
-#define Z_IS_732_EQ_732(...) \,
-#define Z_IS_733_EQ_733(...) \,
-#define Z_IS_734_EQ_734(...) \,
-#define Z_IS_735_EQ_735(...) \,
-#define Z_IS_736_EQ_736(...) \,
-#define Z_IS_737_EQ_737(...) \,
-#define Z_IS_738_EQ_738(...) \,
-#define Z_IS_739_EQ_739(...) \,
-#define Z_IS_740_EQ_740(...) \,
-#define Z_IS_741_EQ_741(...) \,
-#define Z_IS_742_EQ_742(...) \,
-#define Z_IS_743_EQ_743(...) \,
-#define Z_IS_744_EQ_744(...) \,
-#define Z_IS_745_EQ_745(...) \,
-#define Z_IS_746_EQ_746(...) \,
-#define Z_IS_747_EQ_747(...) \,
-#define Z_IS_748_EQ_748(...) \,
-#define Z_IS_749_EQ_749(...) \,
-#define Z_IS_750_EQ_750(...) \,
-#define Z_IS_751_EQ_751(...) \,
-#define Z_IS_752_EQ_752(...) \,
-#define Z_IS_753_EQ_753(...) \,
-#define Z_IS_754_EQ_754(...) \,
-#define Z_IS_755_EQ_755(...) \,
-#define Z_IS_756_EQ_756(...) \,
-#define Z_IS_757_EQ_757(...) \,
-#define Z_IS_758_EQ_758(...) \,
-#define Z_IS_759_EQ_759(...) \,
-#define Z_IS_760_EQ_760(...) \,
-#define Z_IS_761_EQ_761(...) \,
-#define Z_IS_762_EQ_762(...) \,
-#define Z_IS_763_EQ_763(...) \,
-#define Z_IS_764_EQ_764(...) \,
-#define Z_IS_765_EQ_765(...) \,
-#define Z_IS_766_EQ_766(...) \,
-#define Z_IS_767_EQ_767(...) \,
-#define Z_IS_768_EQ_768(...) \,
-#define Z_IS_769_EQ_769(...) \,
-#define Z_IS_770_EQ_770(...) \,
-#define Z_IS_771_EQ_771(...) \,
-#define Z_IS_772_EQ_772(...) \,
-#define Z_IS_773_EQ_773(...) \,
-#define Z_IS_774_EQ_774(...) \,
-#define Z_IS_775_EQ_775(...) \,
-#define Z_IS_776_EQ_776(...) \,
-#define Z_IS_777_EQ_777(...) \,
-#define Z_IS_778_EQ_778(...) \,
-#define Z_IS_779_EQ_779(...) \,
-#define Z_IS_780_EQ_780(...) \,
-#define Z_IS_781_EQ_781(...) \,
-#define Z_IS_782_EQ_782(...) \,
-#define Z_IS_783_EQ_783(...) \,
-#define Z_IS_784_EQ_784(...) \,
-#define Z_IS_785_EQ_785(...) \,
-#define Z_IS_786_EQ_786(...) \,
-#define Z_IS_787_EQ_787(...) \,
-#define Z_IS_788_EQ_788(...) \,
-#define Z_IS_789_EQ_789(...) \,
-#define Z_IS_790_EQ_790(...) \,
-#define Z_IS_791_EQ_791(...) \,
-#define Z_IS_792_EQ_792(...) \,
-#define Z_IS_793_EQ_793(...) \,
-#define Z_IS_794_EQ_794(...) \,
-#define Z_IS_795_EQ_795(...) \,
-#define Z_IS_796_EQ_796(...) \,
-#define Z_IS_797_EQ_797(...) \,
-#define Z_IS_798_EQ_798(...) \,
-#define Z_IS_799_EQ_799(...) \,
-#define Z_IS_800_EQ_800(...) \,
-#define Z_IS_801_EQ_801(...) \,
-#define Z_IS_802_EQ_802(...) \,
-#define Z_IS_803_EQ_803(...) \,
-#define Z_IS_804_EQ_804(...) \,
-#define Z_IS_805_EQ_805(...) \,
-#define Z_IS_806_EQ_806(...) \,
-#define Z_IS_807_EQ_807(...) \,
-#define Z_IS_808_EQ_808(...) \,
-#define Z_IS_809_EQ_809(...) \,
-#define Z_IS_810_EQ_810(...) \,
-#define Z_IS_811_EQ_811(...) \,
-#define Z_IS_812_EQ_812(...) \,
-#define Z_IS_813_EQ_813(...) \,
-#define Z_IS_814_EQ_814(...) \,
-#define Z_IS_815_EQ_815(...) \,
-#define Z_IS_816_EQ_816(...) \,
-#define Z_IS_817_EQ_817(...) \,
-#define Z_IS_818_EQ_818(...) \,
-#define Z_IS_819_EQ_819(...) \,
-#define Z_IS_820_EQ_820(...) \,
-#define Z_IS_821_EQ_821(...) \,
-#define Z_IS_822_EQ_822(...) \,
-#define Z_IS_823_EQ_823(...) \,
-#define Z_IS_824_EQ_824(...) \,
-#define Z_IS_825_EQ_825(...) \,
-#define Z_IS_826_EQ_826(...) \,
-#define Z_IS_827_EQ_827(...) \,
-#define Z_IS_828_EQ_828(...) \,
-#define Z_IS_829_EQ_829(...) \,
-#define Z_IS_830_EQ_830(...) \,
-#define Z_IS_831_EQ_831(...) \,
-#define Z_IS_832_EQ_832(...) \,
-#define Z_IS_833_EQ_833(...) \,
-#define Z_IS_834_EQ_834(...) \,
-#define Z_IS_835_EQ_835(...) \,
-#define Z_IS_836_EQ_836(...) \,
-#define Z_IS_837_EQ_837(...) \,
-#define Z_IS_838_EQ_838(...) \,
-#define Z_IS_839_EQ_839(...) \,
-#define Z_IS_840_EQ_840(...) \,
-#define Z_IS_841_EQ_841(...) \,
-#define Z_IS_842_EQ_842(...) \,
-#define Z_IS_843_EQ_843(...) \,
-#define Z_IS_844_EQ_844(...) \,
-#define Z_IS_845_EQ_845(...) \,
-#define Z_IS_846_EQ_846(...) \,
-#define Z_IS_847_EQ_847(...) \,
-#define Z_IS_848_EQ_848(...) \,
-#define Z_IS_849_EQ_849(...) \,
-#define Z_IS_850_EQ_850(...) \,
-#define Z_IS_851_EQ_851(...) \,
-#define Z_IS_852_EQ_852(...) \,
-#define Z_IS_853_EQ_853(...) \,
-#define Z_IS_854_EQ_854(...) \,
-#define Z_IS_855_EQ_855(...) \,
-#define Z_IS_856_EQ_856(...) \,
-#define Z_IS_857_EQ_857(...) \,
-#define Z_IS_858_EQ_858(...) \,
-#define Z_IS_859_EQ_859(...) \,
-#define Z_IS_860_EQ_860(...) \,
-#define Z_IS_861_EQ_861(...) \,
-#define Z_IS_862_EQ_862(...) \,
-#define Z_IS_863_EQ_863(...) \,
-#define Z_IS_864_EQ_864(...) \,
-#define Z_IS_865_EQ_865(...) \,
-#define Z_IS_866_EQ_866(...) \,
-#define Z_IS_867_EQ_867(...) \,
-#define Z_IS_868_EQ_868(...) \,
-#define Z_IS_869_EQ_869(...) \,
-#define Z_IS_870_EQ_870(...) \,
-#define Z_IS_871_EQ_871(...) \,
-#define Z_IS_872_EQ_872(...) \,
-#define Z_IS_873_EQ_873(...) \,
-#define Z_IS_874_EQ_874(...) \,
-#define Z_IS_875_EQ_875(...) \,
-#define Z_IS_876_EQ_876(...) \,
-#define Z_IS_877_EQ_877(...) \,
-#define Z_IS_878_EQ_878(...) \,
-#define Z_IS_879_EQ_879(...) \,
-#define Z_IS_880_EQ_880(...) \,
-#define Z_IS_881_EQ_881(...) \,
-#define Z_IS_882_EQ_882(...) \,
-#define Z_IS_883_EQ_883(...) \,
-#define Z_IS_884_EQ_884(...) \,
-#define Z_IS_885_EQ_885(...) \,
-#define Z_IS_886_EQ_886(...) \,
-#define Z_IS_887_EQ_887(...) \,
-#define Z_IS_888_EQ_888(...) \,
-#define Z_IS_889_EQ_889(...) \,
-#define Z_IS_890_EQ_890(...) \,
-#define Z_IS_891_EQ_891(...) \,
-#define Z_IS_892_EQ_892(...) \,
-#define Z_IS_893_EQ_893(...) \,
-#define Z_IS_894_EQ_894(...) \,
-#define Z_IS_895_EQ_895(...) \,
-#define Z_IS_896_EQ_896(...) \,
-#define Z_IS_897_EQ_897(...) \,
-#define Z_IS_898_EQ_898(...) \,
-#define Z_IS_899_EQ_899(...) \,
-#define Z_IS_900_EQ_900(...) \,
-#define Z_IS_901_EQ_901(...) \,
-#define Z_IS_902_EQ_902(...) \,
-#define Z_IS_903_EQ_903(...) \,
-#define Z_IS_904_EQ_904(...) \,
-#define Z_IS_905_EQ_905(...) \,
-#define Z_IS_906_EQ_906(...) \,
-#define Z_IS_907_EQ_907(...) \,
-#define Z_IS_908_EQ_908(...) \,
-#define Z_IS_909_EQ_909(...) \,
-#define Z_IS_910_EQ_910(...) \,
-#define Z_IS_911_EQ_911(...) \,
-#define Z_IS_912_EQ_912(...) \,
-#define Z_IS_913_EQ_913(...) \,
-#define Z_IS_914_EQ_914(...) \,
-#define Z_IS_915_EQ_915(...) \,
-#define Z_IS_916_EQ_916(...) \,
-#define Z_IS_917_EQ_917(...) \,
-#define Z_IS_918_EQ_918(...) \,
-#define Z_IS_919_EQ_919(...) \,
-#define Z_IS_920_EQ_920(...) \,
-#define Z_IS_921_EQ_921(...) \,
-#define Z_IS_922_EQ_922(...) \,
-#define Z_IS_923_EQ_923(...) \,
-#define Z_IS_924_EQ_924(...) \,
-#define Z_IS_925_EQ_925(...) \,
-#define Z_IS_926_EQ_926(...) \,
-#define Z_IS_927_EQ_927(...) \,
-#define Z_IS_928_EQ_928(...) \,
-#define Z_IS_929_EQ_929(...) \,
-#define Z_IS_930_EQ_930(...) \,
-#define Z_IS_931_EQ_931(...) \,
-#define Z_IS_932_EQ_932(...) \,
-#define Z_IS_933_EQ_933(...) \,
-#define Z_IS_934_EQ_934(...) \,
-#define Z_IS_935_EQ_935(...) \,
-#define Z_IS_936_EQ_936(...) \,
-#define Z_IS_937_EQ_937(...) \,
-#define Z_IS_938_EQ_938(...) \,
-#define Z_IS_939_EQ_939(...) \,
-#define Z_IS_940_EQ_940(...) \,
-#define Z_IS_941_EQ_941(...) \,
-#define Z_IS_942_EQ_942(...) \,
-#define Z_IS_943_EQ_943(...) \,
-#define Z_IS_944_EQ_944(...) \,
-#define Z_IS_945_EQ_945(...) \,
-#define Z_IS_946_EQ_946(...) \,
-#define Z_IS_947_EQ_947(...) \,
-#define Z_IS_948_EQ_948(...) \,
-#define Z_IS_949_EQ_949(...) \,
-#define Z_IS_950_EQ_950(...) \,
-#define Z_IS_951_EQ_951(...) \,
-#define Z_IS_952_EQ_952(...) \,
-#define Z_IS_953_EQ_953(...) \,
-#define Z_IS_954_EQ_954(...) \,
-#define Z_IS_955_EQ_955(...) \,
-#define Z_IS_956_EQ_956(...) \,
-#define Z_IS_957_EQ_957(...) \,
-#define Z_IS_958_EQ_958(...) \,
-#define Z_IS_959_EQ_959(...) \,
-#define Z_IS_960_EQ_960(...) \,
-#define Z_IS_961_EQ_961(...) \,
-#define Z_IS_962_EQ_962(...) \,
-#define Z_IS_963_EQ_963(...) \,
-#define Z_IS_964_EQ_964(...) \,
-#define Z_IS_965_EQ_965(...) \,
-#define Z_IS_966_EQ_966(...) \,
-#define Z_IS_967_EQ_967(...) \,
-#define Z_IS_968_EQ_968(...) \,
-#define Z_IS_969_EQ_969(...) \,
-#define Z_IS_970_EQ_970(...) \,
-#define Z_IS_971_EQ_971(...) \,
-#define Z_IS_972_EQ_972(...) \,
-#define Z_IS_973_EQ_973(...) \,
-#define Z_IS_974_EQ_974(...) \,
-#define Z_IS_975_EQ_975(...) \,
-#define Z_IS_976_EQ_976(...) \,
-#define Z_IS_977_EQ_977(...) \,
-#define Z_IS_978_EQ_978(...) \,
-#define Z_IS_979_EQ_979(...) \,
-#define Z_IS_980_EQ_980(...) \,
-#define Z_IS_981_EQ_981(...) \,
-#define Z_IS_982_EQ_982(...) \,
-#define Z_IS_983_EQ_983(...) \,
-#define Z_IS_984_EQ_984(...) \,
-#define Z_IS_985_EQ_985(...) \,
-#define Z_IS_986_EQ_986(...) \,
-#define Z_IS_987_EQ_987(...) \,
-#define Z_IS_988_EQ_988(...) \,
-#define Z_IS_989_EQ_989(...) \,
-#define Z_IS_990_EQ_990(...) \,
-#define Z_IS_991_EQ_991(...) \,
-#define Z_IS_992_EQ_992(...) \,
-#define Z_IS_993_EQ_993(...) \,
-#define Z_IS_994_EQ_994(...) \,
-#define Z_IS_995_EQ_995(...) \,
-#define Z_IS_996_EQ_996(...) \,
-#define Z_IS_997_EQ_997(...) \,
-#define Z_IS_998_EQ_998(...) \,
-#define Z_IS_999_EQ_999(...) \,
-#define Z_IS_1000_EQ_1000(...) \,
-#define Z_IS_1001_EQ_1001(...) \,
-#define Z_IS_1002_EQ_1002(...) \,
-#define Z_IS_1003_EQ_1003(...) \,
-#define Z_IS_1004_EQ_1004(...) \,
-#define Z_IS_1005_EQ_1005(...) \,
-#define Z_IS_1006_EQ_1006(...) \,
-#define Z_IS_1007_EQ_1007(...) \,
-#define Z_IS_1008_EQ_1008(...) \,
-#define Z_IS_1009_EQ_1009(...) \,
-#define Z_IS_1010_EQ_1010(...) \,
-#define Z_IS_1011_EQ_1011(...) \,
-#define Z_IS_1012_EQ_1012(...) \,
-#define Z_IS_1013_EQ_1013(...) \,
-#define Z_IS_1014_EQ_1014(...) \,
-#define Z_IS_1015_EQ_1015(...) \,
-#define Z_IS_1016_EQ_1016(...) \,
-#define Z_IS_1017_EQ_1017(...) \,
-#define Z_IS_1018_EQ_1018(...) \,
-#define Z_IS_1019_EQ_1019(...) \,
-#define Z_IS_1020_EQ_1020(...) \,
-#define Z_IS_1021_EQ_1021(...) \,
-#define Z_IS_1022_EQ_1022(...) \,
-#define Z_IS_1023_EQ_1023(...) \,
-#define Z_IS_1024_EQ_1024(...) \,
-#define Z_IS_1025_EQ_1025(...) \,
-#define Z_IS_1026_EQ_1026(...) \,
-#define Z_IS_1027_EQ_1027(...) \,
-#define Z_IS_1028_EQ_1028(...) \,
-#define Z_IS_1029_EQ_1029(...) \,
-#define Z_IS_1030_EQ_1030(...) \,
-#define Z_IS_1031_EQ_1031(...) \,
-#define Z_IS_1032_EQ_1032(...) \,
-#define Z_IS_1033_EQ_1033(...) \,
-#define Z_IS_1034_EQ_1034(...) \,
-#define Z_IS_1035_EQ_1035(...) \,
-#define Z_IS_1036_EQ_1036(...) \,
-#define Z_IS_1037_EQ_1037(...) \,
-#define Z_IS_1038_EQ_1038(...) \,
-#define Z_IS_1039_EQ_1039(...) \,
-#define Z_IS_1040_EQ_1040(...) \,
-#define Z_IS_1041_EQ_1041(...) \,
-#define Z_IS_1042_EQ_1042(...) \,
-#define Z_IS_1043_EQ_1043(...) \,
-#define Z_IS_1044_EQ_1044(...) \,
-#define Z_IS_1045_EQ_1045(...) \,
-#define Z_IS_1046_EQ_1046(...) \,
-#define Z_IS_1047_EQ_1047(...) \,
-#define Z_IS_1048_EQ_1048(...) \,
-#define Z_IS_1049_EQ_1049(...) \,
-#define Z_IS_1050_EQ_1050(...) \,
-#define Z_IS_1051_EQ_1051(...) \,
-#define Z_IS_1052_EQ_1052(...) \,
-#define Z_IS_1053_EQ_1053(...) \,
-#define Z_IS_1054_EQ_1054(...) \,
-#define Z_IS_1055_EQ_1055(...) \,
-#define Z_IS_1056_EQ_1056(...) \,
-#define Z_IS_1057_EQ_1057(...) \,
-#define Z_IS_1058_EQ_1058(...) \,
-#define Z_IS_1059_EQ_1059(...) \,
-#define Z_IS_1060_EQ_1060(...) \,
-#define Z_IS_1061_EQ_1061(...) \,
-#define Z_IS_1062_EQ_1062(...) \,
-#define Z_IS_1063_EQ_1063(...) \,
-#define Z_IS_1064_EQ_1064(...) \,
-#define Z_IS_1065_EQ_1065(...) \,
-#define Z_IS_1066_EQ_1066(...) \,
-#define Z_IS_1067_EQ_1067(...) \,
-#define Z_IS_1068_EQ_1068(...) \,
-#define Z_IS_1069_EQ_1069(...) \,
-#define Z_IS_1070_EQ_1070(...) \,
-#define Z_IS_1071_EQ_1071(...) \,
-#define Z_IS_1072_EQ_1072(...) \,
-#define Z_IS_1073_EQ_1073(...) \,
-#define Z_IS_1074_EQ_1074(...) \,
-#define Z_IS_1075_EQ_1075(...) \,
-#define Z_IS_1076_EQ_1076(...) \,
-#define Z_IS_1077_EQ_1077(...) \,
-#define Z_IS_1078_EQ_1078(...) \,
-#define Z_IS_1079_EQ_1079(...) \,
-#define Z_IS_1080_EQ_1080(...) \,
-#define Z_IS_1081_EQ_1081(...) \,
-#define Z_IS_1082_EQ_1082(...) \,
-#define Z_IS_1083_EQ_1083(...) \,
-#define Z_IS_1084_EQ_1084(...) \,
-#define Z_IS_1085_EQ_1085(...) \,
-#define Z_IS_1086_EQ_1086(...) \,
-#define Z_IS_1087_EQ_1087(...) \,
-#define Z_IS_1088_EQ_1088(...) \,
-#define Z_IS_1089_EQ_1089(...) \,
-#define Z_IS_1090_EQ_1090(...) \,
-#define Z_IS_1091_EQ_1091(...) \,
-#define Z_IS_1092_EQ_1092(...) \,
-#define Z_IS_1093_EQ_1093(...) \,
-#define Z_IS_1094_EQ_1094(...) \,
-#define Z_IS_1095_EQ_1095(...) \,
-#define Z_IS_1096_EQ_1096(...) \,
-#define Z_IS_1097_EQ_1097(...) \,
-#define Z_IS_1098_EQ_1098(...) \,
-#define Z_IS_1099_EQ_1099(...) \,
-#define Z_IS_1100_EQ_1100(...) \,
-#define Z_IS_1101_EQ_1101(...) \,
-#define Z_IS_1102_EQ_1102(...) \,
-#define Z_IS_1103_EQ_1103(...) \,
-#define Z_IS_1104_EQ_1104(...) \,
-#define Z_IS_1105_EQ_1105(...) \,
-#define Z_IS_1106_EQ_1106(...) \,
-#define Z_IS_1107_EQ_1107(...) \,
-#define Z_IS_1108_EQ_1108(...) \,
-#define Z_IS_1109_EQ_1109(...) \,
-#define Z_IS_1110_EQ_1110(...) \,
-#define Z_IS_1111_EQ_1111(...) \,
-#define Z_IS_1112_EQ_1112(...) \,
-#define Z_IS_1113_EQ_1113(...) \,
-#define Z_IS_1114_EQ_1114(...) \,
-#define Z_IS_1115_EQ_1115(...) \,
-#define Z_IS_1116_EQ_1116(...) \,
-#define Z_IS_1117_EQ_1117(...) \,
-#define Z_IS_1118_EQ_1118(...) \,
-#define Z_IS_1119_EQ_1119(...) \,
-#define Z_IS_1120_EQ_1120(...) \,
-#define Z_IS_1121_EQ_1121(...) \,
-#define Z_IS_1122_EQ_1122(...) \,
-#define Z_IS_1123_EQ_1123(...) \,
-#define Z_IS_1124_EQ_1124(...) \,
-#define Z_IS_1125_EQ_1125(...) \,
-#define Z_IS_1126_EQ_1126(...) \,
-#define Z_IS_1127_EQ_1127(...) \,
-#define Z_IS_1128_EQ_1128(...) \,
-#define Z_IS_1129_EQ_1129(...) \,
-#define Z_IS_1130_EQ_1130(...) \,
-#define Z_IS_1131_EQ_1131(...) \,
-#define Z_IS_1132_EQ_1132(...) \,
-#define Z_IS_1133_EQ_1133(...) \,
-#define Z_IS_1134_EQ_1134(...) \,
-#define Z_IS_1135_EQ_1135(...) \,
-#define Z_IS_1136_EQ_1136(...) \,
-#define Z_IS_1137_EQ_1137(...) \,
-#define Z_IS_1138_EQ_1138(...) \,
-#define Z_IS_1139_EQ_1139(...) \,
-#define Z_IS_1140_EQ_1140(...) \,
-#define Z_IS_1141_EQ_1141(...) \,
-#define Z_IS_1142_EQ_1142(...) \,
-#define Z_IS_1143_EQ_1143(...) \,
-#define Z_IS_1144_EQ_1144(...) \,
-#define Z_IS_1145_EQ_1145(...) \,
-#define Z_IS_1146_EQ_1146(...) \,
-#define Z_IS_1147_EQ_1147(...) \,
-#define Z_IS_1148_EQ_1148(...) \,
-#define Z_IS_1149_EQ_1149(...) \,
-#define Z_IS_1150_EQ_1150(...) \,
-#define Z_IS_1151_EQ_1151(...) \,
-#define Z_IS_1152_EQ_1152(...) \,
-#define Z_IS_1153_EQ_1153(...) \,
-#define Z_IS_1154_EQ_1154(...) \,
-#define Z_IS_1155_EQ_1155(...) \,
-#define Z_IS_1156_EQ_1156(...) \,
-#define Z_IS_1157_EQ_1157(...) \,
-#define Z_IS_1158_EQ_1158(...) \,
-#define Z_IS_1159_EQ_1159(...) \,
-#define Z_IS_1160_EQ_1160(...) \,
-#define Z_IS_1161_EQ_1161(...) \,
-#define Z_IS_1162_EQ_1162(...) \,
-#define Z_IS_1163_EQ_1163(...) \,
-#define Z_IS_1164_EQ_1164(...) \,
-#define Z_IS_1165_EQ_1165(...) \,
-#define Z_IS_1166_EQ_1166(...) \,
-#define Z_IS_1167_EQ_1167(...) \,
-#define Z_IS_1168_EQ_1168(...) \,
-#define Z_IS_1169_EQ_1169(...) \,
-#define Z_IS_1170_EQ_1170(...) \,
-#define Z_IS_1171_EQ_1171(...) \,
-#define Z_IS_1172_EQ_1172(...) \,
-#define Z_IS_1173_EQ_1173(...) \,
-#define Z_IS_1174_EQ_1174(...) \,
-#define Z_IS_1175_EQ_1175(...) \,
-#define Z_IS_1176_EQ_1176(...) \,
-#define Z_IS_1177_EQ_1177(...) \,
-#define Z_IS_1178_EQ_1178(...) \,
-#define Z_IS_1179_EQ_1179(...) \,
-#define Z_IS_1180_EQ_1180(...) \,
-#define Z_IS_1181_EQ_1181(...) \,
-#define Z_IS_1182_EQ_1182(...) \,
-#define Z_IS_1183_EQ_1183(...) \,
-#define Z_IS_1184_EQ_1184(...) \,
-#define Z_IS_1185_EQ_1185(...) \,
-#define Z_IS_1186_EQ_1186(...) \,
-#define Z_IS_1187_EQ_1187(...) \,
-#define Z_IS_1188_EQ_1188(...) \,
-#define Z_IS_1189_EQ_1189(...) \,
-#define Z_IS_1190_EQ_1190(...) \,
-#define Z_IS_1191_EQ_1191(...) \,
-#define Z_IS_1192_EQ_1192(...) \,
-#define Z_IS_1193_EQ_1193(...) \,
-#define Z_IS_1194_EQ_1194(...) \,
-#define Z_IS_1195_EQ_1195(...) \,
-#define Z_IS_1196_EQ_1196(...) \,
-#define Z_IS_1197_EQ_1197(...) \,
-#define Z_IS_1198_EQ_1198(...) \,
-#define Z_IS_1199_EQ_1199(...) \,
-#define Z_IS_1200_EQ_1200(...) \,
-#define Z_IS_1201_EQ_1201(...) \,
-#define Z_IS_1202_EQ_1202(...) \,
-#define Z_IS_1203_EQ_1203(...) \,
-#define Z_IS_1204_EQ_1204(...) \,
-#define Z_IS_1205_EQ_1205(...) \,
-#define Z_IS_1206_EQ_1206(...) \,
-#define Z_IS_1207_EQ_1207(...) \,
-#define Z_IS_1208_EQ_1208(...) \,
-#define Z_IS_1209_EQ_1209(...) \,
-#define Z_IS_1210_EQ_1210(...) \,
-#define Z_IS_1211_EQ_1211(...) \,
-#define Z_IS_1212_EQ_1212(...) \,
-#define Z_IS_1213_EQ_1213(...) \,
-#define Z_IS_1214_EQ_1214(...) \,
-#define Z_IS_1215_EQ_1215(...) \,
-#define Z_IS_1216_EQ_1216(...) \,
-#define Z_IS_1217_EQ_1217(...) \,
-#define Z_IS_1218_EQ_1218(...) \,
-#define Z_IS_1219_EQ_1219(...) \,
-#define Z_IS_1220_EQ_1220(...) \,
-#define Z_IS_1221_EQ_1221(...) \,
-#define Z_IS_1222_EQ_1222(...) \,
-#define Z_IS_1223_EQ_1223(...) \,
-#define Z_IS_1224_EQ_1224(...) \,
-#define Z_IS_1225_EQ_1225(...) \,
-#define Z_IS_1226_EQ_1226(...) \,
-#define Z_IS_1227_EQ_1227(...) \,
-#define Z_IS_1228_EQ_1228(...) \,
-#define Z_IS_1229_EQ_1229(...) \,
-#define Z_IS_1230_EQ_1230(...) \,
-#define Z_IS_1231_EQ_1231(...) \,
-#define Z_IS_1232_EQ_1232(...) \,
-#define Z_IS_1233_EQ_1233(...) \,
-#define Z_IS_1234_EQ_1234(...) \,
-#define Z_IS_1235_EQ_1235(...) \,
-#define Z_IS_1236_EQ_1236(...) \,
-#define Z_IS_1237_EQ_1237(...) \,
-#define Z_IS_1238_EQ_1238(...) \,
-#define Z_IS_1239_EQ_1239(...) \,
-#define Z_IS_1240_EQ_1240(...) \,
-#define Z_IS_1241_EQ_1241(...) \,
-#define Z_IS_1242_EQ_1242(...) \,
-#define Z_IS_1243_EQ_1243(...) \,
-#define Z_IS_1244_EQ_1244(...) \,
-#define Z_IS_1245_EQ_1245(...) \,
-#define Z_IS_1246_EQ_1246(...) \,
-#define Z_IS_1247_EQ_1247(...) \,
-#define Z_IS_1248_EQ_1248(...) \,
-#define Z_IS_1249_EQ_1249(...) \,
-#define Z_IS_1250_EQ_1250(...) \,
-#define Z_IS_1251_EQ_1251(...) \,
-#define Z_IS_1252_EQ_1252(...) \,
-#define Z_IS_1253_EQ_1253(...) \,
-#define Z_IS_1254_EQ_1254(...) \,
-#define Z_IS_1255_EQ_1255(...) \,
-#define Z_IS_1256_EQ_1256(...) \,
-#define Z_IS_1257_EQ_1257(...) \,
-#define Z_IS_1258_EQ_1258(...) \,
-#define Z_IS_1259_EQ_1259(...) \,
-#define Z_IS_1260_EQ_1260(...) \,
-#define Z_IS_1261_EQ_1261(...) \,
-#define Z_IS_1262_EQ_1262(...) \,
-#define Z_IS_1263_EQ_1263(...) \,
-#define Z_IS_1264_EQ_1264(...) \,
-#define Z_IS_1265_EQ_1265(...) \,
-#define Z_IS_1266_EQ_1266(...) \,
-#define Z_IS_1267_EQ_1267(...) \,
-#define Z_IS_1268_EQ_1268(...) \,
-#define Z_IS_1269_EQ_1269(...) \,
-#define Z_IS_1270_EQ_1270(...) \,
-#define Z_IS_1271_EQ_1271(...) \,
-#define Z_IS_1272_EQ_1272(...) \,
-#define Z_IS_1273_EQ_1273(...) \,
-#define Z_IS_1274_EQ_1274(...) \,
-#define Z_IS_1275_EQ_1275(...) \,
-#define Z_IS_1276_EQ_1276(...) \,
-#define Z_IS_1277_EQ_1277(...) \,
-#define Z_IS_1278_EQ_1278(...) \,
-#define Z_IS_1279_EQ_1279(...) \,
-#define Z_IS_1280_EQ_1280(...) \,
-#define Z_IS_1281_EQ_1281(...) \,
-#define Z_IS_1282_EQ_1282(...) \,
-#define Z_IS_1283_EQ_1283(...) \,
-#define Z_IS_1284_EQ_1284(...) \,
-#define Z_IS_1285_EQ_1285(...) \,
-#define Z_IS_1286_EQ_1286(...) \,
-#define Z_IS_1287_EQ_1287(...) \,
-#define Z_IS_1288_EQ_1288(...) \,
-#define Z_IS_1289_EQ_1289(...) \,
-#define Z_IS_1290_EQ_1290(...) \,
-#define Z_IS_1291_EQ_1291(...) \,
-#define Z_IS_1292_EQ_1292(...) \,
-#define Z_IS_1293_EQ_1293(...) \,
-#define Z_IS_1294_EQ_1294(...) \,
-#define Z_IS_1295_EQ_1295(...) \,
-#define Z_IS_1296_EQ_1296(...) \,
-#define Z_IS_1297_EQ_1297(...) \,
-#define Z_IS_1298_EQ_1298(...) \,
-#define Z_IS_1299_EQ_1299(...) \,
-#define Z_IS_1300_EQ_1300(...) \,
-#define Z_IS_1301_EQ_1301(...) \,
-#define Z_IS_1302_EQ_1302(...) \,
-#define Z_IS_1303_EQ_1303(...) \,
-#define Z_IS_1304_EQ_1304(...) \,
-#define Z_IS_1305_EQ_1305(...) \,
-#define Z_IS_1306_EQ_1306(...) \,
-#define Z_IS_1307_EQ_1307(...) \,
-#define Z_IS_1308_EQ_1308(...) \,
-#define Z_IS_1309_EQ_1309(...) \,
-#define Z_IS_1310_EQ_1310(...) \,
-#define Z_IS_1311_EQ_1311(...) \,
-#define Z_IS_1312_EQ_1312(...) \,
-#define Z_IS_1313_EQ_1313(...) \,
-#define Z_IS_1314_EQ_1314(...) \,
-#define Z_IS_1315_EQ_1315(...) \,
-#define Z_IS_1316_EQ_1316(...) \,
-#define Z_IS_1317_EQ_1317(...) \,
-#define Z_IS_1318_EQ_1318(...) \,
-#define Z_IS_1319_EQ_1319(...) \,
-#define Z_IS_1320_EQ_1320(...) \,
-#define Z_IS_1321_EQ_1321(...) \,
-#define Z_IS_1322_EQ_1322(...) \,
-#define Z_IS_1323_EQ_1323(...) \,
-#define Z_IS_1324_EQ_1324(...) \,
-#define Z_IS_1325_EQ_1325(...) \,
-#define Z_IS_1326_EQ_1326(...) \,
-#define Z_IS_1327_EQ_1327(...) \,
-#define Z_IS_1328_EQ_1328(...) \,
-#define Z_IS_1329_EQ_1329(...) \,
-#define Z_IS_1330_EQ_1330(...) \,
-#define Z_IS_1331_EQ_1331(...) \,
-#define Z_IS_1332_EQ_1332(...) \,
-#define Z_IS_1333_EQ_1333(...) \,
-#define Z_IS_1334_EQ_1334(...) \,
-#define Z_IS_1335_EQ_1335(...) \,
-#define Z_IS_1336_EQ_1336(...) \,
-#define Z_IS_1337_EQ_1337(...) \,
-#define Z_IS_1338_EQ_1338(...) \,
-#define Z_IS_1339_EQ_1339(...) \,
-#define Z_IS_1340_EQ_1340(...) \,
-#define Z_IS_1341_EQ_1341(...) \,
-#define Z_IS_1342_EQ_1342(...) \,
-#define Z_IS_1343_EQ_1343(...) \,
-#define Z_IS_1344_EQ_1344(...) \,
-#define Z_IS_1345_EQ_1345(...) \,
-#define Z_IS_1346_EQ_1346(...) \,
-#define Z_IS_1347_EQ_1347(...) \,
-#define Z_IS_1348_EQ_1348(...) \,
-#define Z_IS_1349_EQ_1349(...) \,
-#define Z_IS_1350_EQ_1350(...) \,
-#define Z_IS_1351_EQ_1351(...) \,
-#define Z_IS_1352_EQ_1352(...) \,
-#define Z_IS_1353_EQ_1353(...) \,
-#define Z_IS_1354_EQ_1354(...) \,
-#define Z_IS_1355_EQ_1355(...) \,
-#define Z_IS_1356_EQ_1356(...) \,
-#define Z_IS_1357_EQ_1357(...) \,
-#define Z_IS_1358_EQ_1358(...) \,
-#define Z_IS_1359_EQ_1359(...) \,
-#define Z_IS_1360_EQ_1360(...) \,
-#define Z_IS_1361_EQ_1361(...) \,
-#define Z_IS_1362_EQ_1362(...) \,
-#define Z_IS_1363_EQ_1363(...) \,
-#define Z_IS_1364_EQ_1364(...) \,
-#define Z_IS_1365_EQ_1365(...) \,
-#define Z_IS_1366_EQ_1366(...) \,
-#define Z_IS_1367_EQ_1367(...) \,
-#define Z_IS_1368_EQ_1368(...) \,
-#define Z_IS_1369_EQ_1369(...) \,
-#define Z_IS_1370_EQ_1370(...) \,
-#define Z_IS_1371_EQ_1371(...) \,
-#define Z_IS_1372_EQ_1372(...) \,
-#define Z_IS_1373_EQ_1373(...) \,
-#define Z_IS_1374_EQ_1374(...) \,
-#define Z_IS_1375_EQ_1375(...) \,
-#define Z_IS_1376_EQ_1376(...) \,
-#define Z_IS_1377_EQ_1377(...) \,
-#define Z_IS_1378_EQ_1378(...) \,
-#define Z_IS_1379_EQ_1379(...) \,
-#define Z_IS_1380_EQ_1380(...) \,
-#define Z_IS_1381_EQ_1381(...) \,
-#define Z_IS_1382_EQ_1382(...) \,
-#define Z_IS_1383_EQ_1383(...) \,
-#define Z_IS_1384_EQ_1384(...) \,
-#define Z_IS_1385_EQ_1385(...) \,
-#define Z_IS_1386_EQ_1386(...) \,
-#define Z_IS_1387_EQ_1387(...) \,
-#define Z_IS_1388_EQ_1388(...) \,
-#define Z_IS_1389_EQ_1389(...) \,
-#define Z_IS_1390_EQ_1390(...) \,
-#define Z_IS_1391_EQ_1391(...) \,
-#define Z_IS_1392_EQ_1392(...) \,
-#define Z_IS_1393_EQ_1393(...) \,
-#define Z_IS_1394_EQ_1394(...) \,
-#define Z_IS_1395_EQ_1395(...) \,
-#define Z_IS_1396_EQ_1396(...) \,
-#define Z_IS_1397_EQ_1397(...) \,
-#define Z_IS_1398_EQ_1398(...) \,
-#define Z_IS_1399_EQ_1399(...) \,
-#define Z_IS_1400_EQ_1400(...) \,
-#define Z_IS_1401_EQ_1401(...) \,
-#define Z_IS_1402_EQ_1402(...) \,
-#define Z_IS_1403_EQ_1403(...) \,
-#define Z_IS_1404_EQ_1404(...) \,
-#define Z_IS_1405_EQ_1405(...) \,
-#define Z_IS_1406_EQ_1406(...) \,
-#define Z_IS_1407_EQ_1407(...) \,
-#define Z_IS_1408_EQ_1408(...) \,
-#define Z_IS_1409_EQ_1409(...) \,
-#define Z_IS_1410_EQ_1410(...) \,
-#define Z_IS_1411_EQ_1411(...) \,
-#define Z_IS_1412_EQ_1412(...) \,
-#define Z_IS_1413_EQ_1413(...) \,
-#define Z_IS_1414_EQ_1414(...) \,
-#define Z_IS_1415_EQ_1415(...) \,
-#define Z_IS_1416_EQ_1416(...) \,
-#define Z_IS_1417_EQ_1417(...) \,
-#define Z_IS_1418_EQ_1418(...) \,
-#define Z_IS_1419_EQ_1419(...) \,
-#define Z_IS_1420_EQ_1420(...) \,
-#define Z_IS_1421_EQ_1421(...) \,
-#define Z_IS_1422_EQ_1422(...) \,
-#define Z_IS_1423_EQ_1423(...) \,
-#define Z_IS_1424_EQ_1424(...) \,
-#define Z_IS_1425_EQ_1425(...) \,
-#define Z_IS_1426_EQ_1426(...) \,
-#define Z_IS_1427_EQ_1427(...) \,
-#define Z_IS_1428_EQ_1428(...) \,
-#define Z_IS_1429_EQ_1429(...) \,
-#define Z_IS_1430_EQ_1430(...) \,
-#define Z_IS_1431_EQ_1431(...) \,
-#define Z_IS_1432_EQ_1432(...) \,
-#define Z_IS_1433_EQ_1433(...) \,
-#define Z_IS_1434_EQ_1434(...) \,
-#define Z_IS_1435_EQ_1435(...) \,
-#define Z_IS_1436_EQ_1436(...) \,
-#define Z_IS_1437_EQ_1437(...) \,
-#define Z_IS_1438_EQ_1438(...) \,
-#define Z_IS_1439_EQ_1439(...) \,
-#define Z_IS_1440_EQ_1440(...) \,
-#define Z_IS_1441_EQ_1441(...) \,
-#define Z_IS_1442_EQ_1442(...) \,
-#define Z_IS_1443_EQ_1443(...) \,
-#define Z_IS_1444_EQ_1444(...) \,
-#define Z_IS_1445_EQ_1445(...) \,
-#define Z_IS_1446_EQ_1446(...) \,
-#define Z_IS_1447_EQ_1447(...) \,
-#define Z_IS_1448_EQ_1448(...) \,
-#define Z_IS_1449_EQ_1449(...) \,
-#define Z_IS_1450_EQ_1450(...) \,
-#define Z_IS_1451_EQ_1451(...) \,
-#define Z_IS_1452_EQ_1452(...) \,
-#define Z_IS_1453_EQ_1453(...) \,
-#define Z_IS_1454_EQ_1454(...) \,
-#define Z_IS_1455_EQ_1455(...) \,
-#define Z_IS_1456_EQ_1456(...) \,
-#define Z_IS_1457_EQ_1457(...) \,
-#define Z_IS_1458_EQ_1458(...) \,
-#define Z_IS_1459_EQ_1459(...) \,
-#define Z_IS_1460_EQ_1460(...) \,
-#define Z_IS_1461_EQ_1461(...) \,
-#define Z_IS_1462_EQ_1462(...) \,
-#define Z_IS_1463_EQ_1463(...) \,
-#define Z_IS_1464_EQ_1464(...) \,
-#define Z_IS_1465_EQ_1465(...) \,
-#define Z_IS_1466_EQ_1466(...) \,
-#define Z_IS_1467_EQ_1467(...) \,
-#define Z_IS_1468_EQ_1468(...) \,
-#define Z_IS_1469_EQ_1469(...) \,
-#define Z_IS_1470_EQ_1470(...) \,
-#define Z_IS_1471_EQ_1471(...) \,
-#define Z_IS_1472_EQ_1472(...) \,
-#define Z_IS_1473_EQ_1473(...) \,
-#define Z_IS_1474_EQ_1474(...) \,
-#define Z_IS_1475_EQ_1475(...) \,
-#define Z_IS_1476_EQ_1476(...) \,
-#define Z_IS_1477_EQ_1477(...) \,
-#define Z_IS_1478_EQ_1478(...) \,
-#define Z_IS_1479_EQ_1479(...) \,
-#define Z_IS_1480_EQ_1480(...) \,
-#define Z_IS_1481_EQ_1481(...) \,
-#define Z_IS_1482_EQ_1482(...) \,
-#define Z_IS_1483_EQ_1483(...) \,
-#define Z_IS_1484_EQ_1484(...) \,
-#define Z_IS_1485_EQ_1485(...) \,
-#define Z_IS_1486_EQ_1486(...) \,
-#define Z_IS_1487_EQ_1487(...) \,
-#define Z_IS_1488_EQ_1488(...) \,
-#define Z_IS_1489_EQ_1489(...) \,
-#define Z_IS_1490_EQ_1490(...) \,
-#define Z_IS_1491_EQ_1491(...) \,
-#define Z_IS_1492_EQ_1492(...) \,
-#define Z_IS_1493_EQ_1493(...) \,
-#define Z_IS_1494_EQ_1494(...) \,
-#define Z_IS_1495_EQ_1495(...) \,
-#define Z_IS_1496_EQ_1496(...) \,
-#define Z_IS_1497_EQ_1497(...) \,
-#define Z_IS_1498_EQ_1498(...) \,
-#define Z_IS_1499_EQ_1499(...) \,
-#define Z_IS_1500_EQ_1500(...) \,
-#define Z_IS_1501_EQ_1501(...) \,
-#define Z_IS_1502_EQ_1502(...) \,
-#define Z_IS_1503_EQ_1503(...) \,
-#define Z_IS_1504_EQ_1504(...) \,
-#define Z_IS_1505_EQ_1505(...) \,
-#define Z_IS_1506_EQ_1506(...) \,
-#define Z_IS_1507_EQ_1507(...) \,
-#define Z_IS_1508_EQ_1508(...) \,
-#define Z_IS_1509_EQ_1509(...) \,
-#define Z_IS_1510_EQ_1510(...) \,
-#define Z_IS_1511_EQ_1511(...) \,
-#define Z_IS_1512_EQ_1512(...) \,
-#define Z_IS_1513_EQ_1513(...) \,
-#define Z_IS_1514_EQ_1514(...) \,
-#define Z_IS_1515_EQ_1515(...) \,
-#define Z_IS_1516_EQ_1516(...) \,
-#define Z_IS_1517_EQ_1517(...) \,
-#define Z_IS_1518_EQ_1518(...) \,
-#define Z_IS_1519_EQ_1519(...) \,
-#define Z_IS_1520_EQ_1520(...) \,
-#define Z_IS_1521_EQ_1521(...) \,
-#define Z_IS_1522_EQ_1522(...) \,
-#define Z_IS_1523_EQ_1523(...) \,
-#define Z_IS_1524_EQ_1524(...) \,
-#define Z_IS_1525_EQ_1525(...) \,
-#define Z_IS_1526_EQ_1526(...) \,
-#define Z_IS_1527_EQ_1527(...) \,
-#define Z_IS_1528_EQ_1528(...) \,
-#define Z_IS_1529_EQ_1529(...) \,
-#define Z_IS_1530_EQ_1530(...) \,
-#define Z_IS_1531_EQ_1531(...) \,
-#define Z_IS_1532_EQ_1532(...) \,
-#define Z_IS_1533_EQ_1533(...) \,
-#define Z_IS_1534_EQ_1534(...) \,
-#define Z_IS_1535_EQ_1535(...) \,
-#define Z_IS_1536_EQ_1536(...) \,
-#define Z_IS_1537_EQ_1537(...) \,
-#define Z_IS_1538_EQ_1538(...) \,
-#define Z_IS_1539_EQ_1539(...) \,
-#define Z_IS_1540_EQ_1540(...) \,
-#define Z_IS_1541_EQ_1541(...) \,
-#define Z_IS_1542_EQ_1542(...) \,
-#define Z_IS_1543_EQ_1543(...) \,
-#define Z_IS_1544_EQ_1544(...) \,
-#define Z_IS_1545_EQ_1545(...) \,
-#define Z_IS_1546_EQ_1546(...) \,
-#define Z_IS_1547_EQ_1547(...) \,
-#define Z_IS_1548_EQ_1548(...) \,
-#define Z_IS_1549_EQ_1549(...) \,
-#define Z_IS_1550_EQ_1550(...) \,
-#define Z_IS_1551_EQ_1551(...) \,
-#define Z_IS_1552_EQ_1552(...) \,
-#define Z_IS_1553_EQ_1553(...) \,
-#define Z_IS_1554_EQ_1554(...) \,
-#define Z_IS_1555_EQ_1555(...) \,
-#define Z_IS_1556_EQ_1556(...) \,
-#define Z_IS_1557_EQ_1557(...) \,
-#define Z_IS_1558_EQ_1558(...) \,
-#define Z_IS_1559_EQ_1559(...) \,
-#define Z_IS_1560_EQ_1560(...) \,
-#define Z_IS_1561_EQ_1561(...) \,
-#define Z_IS_1562_EQ_1562(...) \,
-#define Z_IS_1563_EQ_1563(...) \,
-#define Z_IS_1564_EQ_1564(...) \,
-#define Z_IS_1565_EQ_1565(...) \,
-#define Z_IS_1566_EQ_1566(...) \,
-#define Z_IS_1567_EQ_1567(...) \,
-#define Z_IS_1568_EQ_1568(...) \,
-#define Z_IS_1569_EQ_1569(...) \,
-#define Z_IS_1570_EQ_1570(...) \,
-#define Z_IS_1571_EQ_1571(...) \,
-#define Z_IS_1572_EQ_1572(...) \,
-#define Z_IS_1573_EQ_1573(...) \,
-#define Z_IS_1574_EQ_1574(...) \,
-#define Z_IS_1575_EQ_1575(...) \,
-#define Z_IS_1576_EQ_1576(...) \,
-#define Z_IS_1577_EQ_1577(...) \,
-#define Z_IS_1578_EQ_1578(...) \,
-#define Z_IS_1579_EQ_1579(...) \,
-#define Z_IS_1580_EQ_1580(...) \,
-#define Z_IS_1581_EQ_1581(...) \,
-#define Z_IS_1582_EQ_1582(...) \,
-#define Z_IS_1583_EQ_1583(...) \,
-#define Z_IS_1584_EQ_1584(...) \,
-#define Z_IS_1585_EQ_1585(...) \,
-#define Z_IS_1586_EQ_1586(...) \,
-#define Z_IS_1587_EQ_1587(...) \,
-#define Z_IS_1588_EQ_1588(...) \,
-#define Z_IS_1589_EQ_1589(...) \,
-#define Z_IS_1590_EQ_1590(...) \,
-#define Z_IS_1591_EQ_1591(...) \,
-#define Z_IS_1592_EQ_1592(...) \,
-#define Z_IS_1593_EQ_1593(...) \,
-#define Z_IS_1594_EQ_1594(...) \,
-#define Z_IS_1595_EQ_1595(...) \,
-#define Z_IS_1596_EQ_1596(...) \,
-#define Z_IS_1597_EQ_1597(...) \,
-#define Z_IS_1598_EQ_1598(...) \,
-#define Z_IS_1599_EQ_1599(...) \,
-#define Z_IS_1600_EQ_1600(...) \,
-#define Z_IS_1601_EQ_1601(...) \,
-#define Z_IS_1602_EQ_1602(...) \,
-#define Z_IS_1603_EQ_1603(...) \,
-#define Z_IS_1604_EQ_1604(...) \,
-#define Z_IS_1605_EQ_1605(...) \,
-#define Z_IS_1606_EQ_1606(...) \,
-#define Z_IS_1607_EQ_1607(...) \,
-#define Z_IS_1608_EQ_1608(...) \,
-#define Z_IS_1609_EQ_1609(...) \,
-#define Z_IS_1610_EQ_1610(...) \,
-#define Z_IS_1611_EQ_1611(...) \,
-#define Z_IS_1612_EQ_1612(...) \,
-#define Z_IS_1613_EQ_1613(...) \,
-#define Z_IS_1614_EQ_1614(...) \,
-#define Z_IS_1615_EQ_1615(...) \,
-#define Z_IS_1616_EQ_1616(...) \,
-#define Z_IS_1617_EQ_1617(...) \,
-#define Z_IS_1618_EQ_1618(...) \,
-#define Z_IS_1619_EQ_1619(...) \,
-#define Z_IS_1620_EQ_1620(...) \,
-#define Z_IS_1621_EQ_1621(...) \,
-#define Z_IS_1622_EQ_1622(...) \,
-#define Z_IS_1623_EQ_1623(...) \,
-#define Z_IS_1624_EQ_1624(...) \,
-#define Z_IS_1625_EQ_1625(...) \,
-#define Z_IS_1626_EQ_1626(...) \,
-#define Z_IS_1627_EQ_1627(...) \,
-#define Z_IS_1628_EQ_1628(...) \,
-#define Z_IS_1629_EQ_1629(...) \,
-#define Z_IS_1630_EQ_1630(...) \,
-#define Z_IS_1631_EQ_1631(...) \,
-#define Z_IS_1632_EQ_1632(...) \,
-#define Z_IS_1633_EQ_1633(...) \,
-#define Z_IS_1634_EQ_1634(...) \,
-#define Z_IS_1635_EQ_1635(...) \,
-#define Z_IS_1636_EQ_1636(...) \,
-#define Z_IS_1637_EQ_1637(...) \,
-#define Z_IS_1638_EQ_1638(...) \,
-#define Z_IS_1639_EQ_1639(...) \,
-#define Z_IS_1640_EQ_1640(...) \,
-#define Z_IS_1641_EQ_1641(...) \,
-#define Z_IS_1642_EQ_1642(...) \,
-#define Z_IS_1643_EQ_1643(...) \,
-#define Z_IS_1644_EQ_1644(...) \,
-#define Z_IS_1645_EQ_1645(...) \,
-#define Z_IS_1646_EQ_1646(...) \,
-#define Z_IS_1647_EQ_1647(...) \,
-#define Z_IS_1648_EQ_1648(...) \,
-#define Z_IS_1649_EQ_1649(...) \,
-#define Z_IS_1650_EQ_1650(...) \,
-#define Z_IS_1651_EQ_1651(...) \,
-#define Z_IS_1652_EQ_1652(...) \,
-#define Z_IS_1653_EQ_1653(...) \,
-#define Z_IS_1654_EQ_1654(...) \,
-#define Z_IS_1655_EQ_1655(...) \,
-#define Z_IS_1656_EQ_1656(...) \,
-#define Z_IS_1657_EQ_1657(...) \,
-#define Z_IS_1658_EQ_1658(...) \,
-#define Z_IS_1659_EQ_1659(...) \,
-#define Z_IS_1660_EQ_1660(...) \,
-#define Z_IS_1661_EQ_1661(...) \,
-#define Z_IS_1662_EQ_1662(...) \,
-#define Z_IS_1663_EQ_1663(...) \,
-#define Z_IS_1664_EQ_1664(...) \,
-#define Z_IS_1665_EQ_1665(...) \,
-#define Z_IS_1666_EQ_1666(...) \,
-#define Z_IS_1667_EQ_1667(...) \,
-#define Z_IS_1668_EQ_1668(...) \,
-#define Z_IS_1669_EQ_1669(...) \,
-#define Z_IS_1670_EQ_1670(...) \,
-#define Z_IS_1671_EQ_1671(...) \,
-#define Z_IS_1672_EQ_1672(...) \,
-#define Z_IS_1673_EQ_1673(...) \,
-#define Z_IS_1674_EQ_1674(...) \,
-#define Z_IS_1675_EQ_1675(...) \,
-#define Z_IS_1676_EQ_1676(...) \,
-#define Z_IS_1677_EQ_1677(...) \,
-#define Z_IS_1678_EQ_1678(...) \,
-#define Z_IS_1679_EQ_1679(...) \,
-#define Z_IS_1680_EQ_1680(...) \,
-#define Z_IS_1681_EQ_1681(...) \,
-#define Z_IS_1682_EQ_1682(...) \,
-#define Z_IS_1683_EQ_1683(...) \,
-#define Z_IS_1684_EQ_1684(...) \,
-#define Z_IS_1685_EQ_1685(...) \,
-#define Z_IS_1686_EQ_1686(...) \,
-#define Z_IS_1687_EQ_1687(...) \,
-#define Z_IS_1688_EQ_1688(...) \,
-#define Z_IS_1689_EQ_1689(...) \,
-#define Z_IS_1690_EQ_1690(...) \,
-#define Z_IS_1691_EQ_1691(...) \,
-#define Z_IS_1692_EQ_1692(...) \,
-#define Z_IS_1693_EQ_1693(...) \,
-#define Z_IS_1694_EQ_1694(...) \,
-#define Z_IS_1695_EQ_1695(...) \,
-#define Z_IS_1696_EQ_1696(...) \,
-#define Z_IS_1697_EQ_1697(...) \,
-#define Z_IS_1698_EQ_1698(...) \,
-#define Z_IS_1699_EQ_1699(...) \,
-#define Z_IS_1700_EQ_1700(...) \,
-#define Z_IS_1701_EQ_1701(...) \,
-#define Z_IS_1702_EQ_1702(...) \,
-#define Z_IS_1703_EQ_1703(...) \,
-#define Z_IS_1704_EQ_1704(...) \,
-#define Z_IS_1705_EQ_1705(...) \,
-#define Z_IS_1706_EQ_1706(...) \,
-#define Z_IS_1707_EQ_1707(...) \,
-#define Z_IS_1708_EQ_1708(...) \,
-#define Z_IS_1709_EQ_1709(...) \,
-#define Z_IS_1710_EQ_1710(...) \,
-#define Z_IS_1711_EQ_1711(...) \,
-#define Z_IS_1712_EQ_1712(...) \,
-#define Z_IS_1713_EQ_1713(...) \,
-#define Z_IS_1714_EQ_1714(...) \,
-#define Z_IS_1715_EQ_1715(...) \,
-#define Z_IS_1716_EQ_1716(...) \,
-#define Z_IS_1717_EQ_1717(...) \,
-#define Z_IS_1718_EQ_1718(...) \,
-#define Z_IS_1719_EQ_1719(...) \,
-#define Z_IS_1720_EQ_1720(...) \,
-#define Z_IS_1721_EQ_1721(...) \,
-#define Z_IS_1722_EQ_1722(...) \,
-#define Z_IS_1723_EQ_1723(...) \,
-#define Z_IS_1724_EQ_1724(...) \,
-#define Z_IS_1725_EQ_1725(...) \,
-#define Z_IS_1726_EQ_1726(...) \,
-#define Z_IS_1727_EQ_1727(...) \,
-#define Z_IS_1728_EQ_1728(...) \,
-#define Z_IS_1729_EQ_1729(...) \,
-#define Z_IS_1730_EQ_1730(...) \,
-#define Z_IS_1731_EQ_1731(...) \,
-#define Z_IS_1732_EQ_1732(...) \,
-#define Z_IS_1733_EQ_1733(...) \,
-#define Z_IS_1734_EQ_1734(...) \,
-#define Z_IS_1735_EQ_1735(...) \,
-#define Z_IS_1736_EQ_1736(...) \,
-#define Z_IS_1737_EQ_1737(...) \,
-#define Z_IS_1738_EQ_1738(...) \,
-#define Z_IS_1739_EQ_1739(...) \,
-#define Z_IS_1740_EQ_1740(...) \,
-#define Z_IS_1741_EQ_1741(...) \,
-#define Z_IS_1742_EQ_1742(...) \,
-#define Z_IS_1743_EQ_1743(...) \,
-#define Z_IS_1744_EQ_1744(...) \,
-#define Z_IS_1745_EQ_1745(...) \,
-#define Z_IS_1746_EQ_1746(...) \,
-#define Z_IS_1747_EQ_1747(...) \,
-#define Z_IS_1748_EQ_1748(...) \,
-#define Z_IS_1749_EQ_1749(...) \,
-#define Z_IS_1750_EQ_1750(...) \,
-#define Z_IS_1751_EQ_1751(...) \,
-#define Z_IS_1752_EQ_1752(...) \,
-#define Z_IS_1753_EQ_1753(...) \,
-#define Z_IS_1754_EQ_1754(...) \,
-#define Z_IS_1755_EQ_1755(...) \,
-#define Z_IS_1756_EQ_1756(...) \,
-#define Z_IS_1757_EQ_1757(...) \,
-#define Z_IS_1758_EQ_1758(...) \,
-#define Z_IS_1759_EQ_1759(...) \,
-#define Z_IS_1760_EQ_1760(...) \,
-#define Z_IS_1761_EQ_1761(...) \,
-#define Z_IS_1762_EQ_1762(...) \,
-#define Z_IS_1763_EQ_1763(...) \,
-#define Z_IS_1764_EQ_1764(...) \,
-#define Z_IS_1765_EQ_1765(...) \,
-#define Z_IS_1766_EQ_1766(...) \,
-#define Z_IS_1767_EQ_1767(...) \,
-#define Z_IS_1768_EQ_1768(...) \,
-#define Z_IS_1769_EQ_1769(...) \,
-#define Z_IS_1770_EQ_1770(...) \,
-#define Z_IS_1771_EQ_1771(...) \,
-#define Z_IS_1772_EQ_1772(...) \,
-#define Z_IS_1773_EQ_1773(...) \,
-#define Z_IS_1774_EQ_1774(...) \,
-#define Z_IS_1775_EQ_1775(...) \,
-#define Z_IS_1776_EQ_1776(...) \,
-#define Z_IS_1777_EQ_1777(...) \,
-#define Z_IS_1778_EQ_1778(...) \,
-#define Z_IS_1779_EQ_1779(...) \,
-#define Z_IS_1780_EQ_1780(...) \,
-#define Z_IS_1781_EQ_1781(...) \,
-#define Z_IS_1782_EQ_1782(...) \,
-#define Z_IS_1783_EQ_1783(...) \,
-#define Z_IS_1784_EQ_1784(...) \,
-#define Z_IS_1785_EQ_1785(...) \,
-#define Z_IS_1786_EQ_1786(...) \,
-#define Z_IS_1787_EQ_1787(...) \,
-#define Z_IS_1788_EQ_1788(...) \,
-#define Z_IS_1789_EQ_1789(...) \,
-#define Z_IS_1790_EQ_1790(...) \,
-#define Z_IS_1791_EQ_1791(...) \,
-#define Z_IS_1792_EQ_1792(...) \,
-#define Z_IS_1793_EQ_1793(...) \,
-#define Z_IS_1794_EQ_1794(...) \,
-#define Z_IS_1795_EQ_1795(...) \,
-#define Z_IS_1796_EQ_1796(...) \,
-#define Z_IS_1797_EQ_1797(...) \,
-#define Z_IS_1798_EQ_1798(...) \,
-#define Z_IS_1799_EQ_1799(...) \,
-#define Z_IS_1800_EQ_1800(...) \,
-#define Z_IS_1801_EQ_1801(...) \,
-#define Z_IS_1802_EQ_1802(...) \,
-#define Z_IS_1803_EQ_1803(...) \,
-#define Z_IS_1804_EQ_1804(...) \,
-#define Z_IS_1805_EQ_1805(...) \,
-#define Z_IS_1806_EQ_1806(...) \,
-#define Z_IS_1807_EQ_1807(...) \,
-#define Z_IS_1808_EQ_1808(...) \,
-#define Z_IS_1809_EQ_1809(...) \,
-#define Z_IS_1810_EQ_1810(...) \,
-#define Z_IS_1811_EQ_1811(...) \,
-#define Z_IS_1812_EQ_1812(...) \,
-#define Z_IS_1813_EQ_1813(...) \,
-#define Z_IS_1814_EQ_1814(...) \,
-#define Z_IS_1815_EQ_1815(...) \,
-#define Z_IS_1816_EQ_1816(...) \,
-#define Z_IS_1817_EQ_1817(...) \,
-#define Z_IS_1818_EQ_1818(...) \,
-#define Z_IS_1819_EQ_1819(...) \,
-#define Z_IS_1820_EQ_1820(...) \,
-#define Z_IS_1821_EQ_1821(...) \,
-#define Z_IS_1822_EQ_1822(...) \,
-#define Z_IS_1823_EQ_1823(...) \,
-#define Z_IS_1824_EQ_1824(...) \,
-#define Z_IS_1825_EQ_1825(...) \,
-#define Z_IS_1826_EQ_1826(...) \,
-#define Z_IS_1827_EQ_1827(...) \,
-#define Z_IS_1828_EQ_1828(...) \,
-#define Z_IS_1829_EQ_1829(...) \,
-#define Z_IS_1830_EQ_1830(...) \,
-#define Z_IS_1831_EQ_1831(...) \,
-#define Z_IS_1832_EQ_1832(...) \,
-#define Z_IS_1833_EQ_1833(...) \,
-#define Z_IS_1834_EQ_1834(...) \,
-#define Z_IS_1835_EQ_1835(...) \,
-#define Z_IS_1836_EQ_1836(...) \,
-#define Z_IS_1837_EQ_1837(...) \,
-#define Z_IS_1838_EQ_1838(...) \,
-#define Z_IS_1839_EQ_1839(...) \,
-#define Z_IS_1840_EQ_1840(...) \,
-#define Z_IS_1841_EQ_1841(...) \,
-#define Z_IS_1842_EQ_1842(...) \,
-#define Z_IS_1843_EQ_1843(...) \,
-#define Z_IS_1844_EQ_1844(...) \,
-#define Z_IS_1845_EQ_1845(...) \,
-#define Z_IS_1846_EQ_1846(...) \,
-#define Z_IS_1847_EQ_1847(...) \,
-#define Z_IS_1848_EQ_1848(...) \,
-#define Z_IS_1849_EQ_1849(...) \,
-#define Z_IS_1850_EQ_1850(...) \,
-#define Z_IS_1851_EQ_1851(...) \,
-#define Z_IS_1852_EQ_1852(...) \,
-#define Z_IS_1853_EQ_1853(...) \,
-#define Z_IS_1854_EQ_1854(...) \,
-#define Z_IS_1855_EQ_1855(...) \,
-#define Z_IS_1856_EQ_1856(...) \,
-#define Z_IS_1857_EQ_1857(...) \,
-#define Z_IS_1858_EQ_1858(...) \,
-#define Z_IS_1859_EQ_1859(...) \,
-#define Z_IS_1860_EQ_1860(...) \,
-#define Z_IS_1861_EQ_1861(...) \,
-#define Z_IS_1862_EQ_1862(...) \,
-#define Z_IS_1863_EQ_1863(...) \,
-#define Z_IS_1864_EQ_1864(...) \,
-#define Z_IS_1865_EQ_1865(...) \,
-#define Z_IS_1866_EQ_1866(...) \,
-#define Z_IS_1867_EQ_1867(...) \,
-#define Z_IS_1868_EQ_1868(...) \,
-#define Z_IS_1869_EQ_1869(...) \,
-#define Z_IS_1870_EQ_1870(...) \,
-#define Z_IS_1871_EQ_1871(...) \,
-#define Z_IS_1872_EQ_1872(...) \,
-#define Z_IS_1873_EQ_1873(...) \,
-#define Z_IS_1874_EQ_1874(...) \,
-#define Z_IS_1875_EQ_1875(...) \,
-#define Z_IS_1876_EQ_1876(...) \,
-#define Z_IS_1877_EQ_1877(...) \,
-#define Z_IS_1878_EQ_1878(...) \,
-#define Z_IS_1879_EQ_1879(...) \,
-#define Z_IS_1880_EQ_1880(...) \,
-#define Z_IS_1881_EQ_1881(...) \,
-#define Z_IS_1882_EQ_1882(...) \,
-#define Z_IS_1883_EQ_1883(...) \,
-#define Z_IS_1884_EQ_1884(...) \,
-#define Z_IS_1885_EQ_1885(...) \,
-#define Z_IS_1886_EQ_1886(...) \,
-#define Z_IS_1887_EQ_1887(...) \,
-#define Z_IS_1888_EQ_1888(...) \,
-#define Z_IS_1889_EQ_1889(...) \,
-#define Z_IS_1890_EQ_1890(...) \,
-#define Z_IS_1891_EQ_1891(...) \,
-#define Z_IS_1892_EQ_1892(...) \,
-#define Z_IS_1893_EQ_1893(...) \,
-#define Z_IS_1894_EQ_1894(...) \,
-#define Z_IS_1895_EQ_1895(...) \,
-#define Z_IS_1896_EQ_1896(...) \,
-#define Z_IS_1897_EQ_1897(...) \,
-#define Z_IS_1898_EQ_1898(...) \,
-#define Z_IS_1899_EQ_1899(...) \,
-#define Z_IS_1900_EQ_1900(...) \,
-#define Z_IS_1901_EQ_1901(...) \,
-#define Z_IS_1902_EQ_1902(...) \,
-#define Z_IS_1903_EQ_1903(...) \,
-#define Z_IS_1904_EQ_1904(...) \,
-#define Z_IS_1905_EQ_1905(...) \,
-#define Z_IS_1906_EQ_1906(...) \,
-#define Z_IS_1907_EQ_1907(...) \,
-#define Z_IS_1908_EQ_1908(...) \,
-#define Z_IS_1909_EQ_1909(...) \,
-#define Z_IS_1910_EQ_1910(...) \,
-#define Z_IS_1911_EQ_1911(...) \,
-#define Z_IS_1912_EQ_1912(...) \,
-#define Z_IS_1913_EQ_1913(...) \,
-#define Z_IS_1914_EQ_1914(...) \,
-#define Z_IS_1915_EQ_1915(...) \,
-#define Z_IS_1916_EQ_1916(...) \,
-#define Z_IS_1917_EQ_1917(...) \,
-#define Z_IS_1918_EQ_1918(...) \,
-#define Z_IS_1919_EQ_1919(...) \,
-#define Z_IS_1920_EQ_1920(...) \,
-#define Z_IS_1921_EQ_1921(...) \,
-#define Z_IS_1922_EQ_1922(...) \,
-#define Z_IS_1923_EQ_1923(...) \,
-#define Z_IS_1924_EQ_1924(...) \,
-#define Z_IS_1925_EQ_1925(...) \,
-#define Z_IS_1926_EQ_1926(...) \,
-#define Z_IS_1927_EQ_1927(...) \,
-#define Z_IS_1928_EQ_1928(...) \,
-#define Z_IS_1929_EQ_1929(...) \,
-#define Z_IS_1930_EQ_1930(...) \,
-#define Z_IS_1931_EQ_1931(...) \,
-#define Z_IS_1932_EQ_1932(...) \,
-#define Z_IS_1933_EQ_1933(...) \,
-#define Z_IS_1934_EQ_1934(...) \,
-#define Z_IS_1935_EQ_1935(...) \,
-#define Z_IS_1936_EQ_1936(...) \,
-#define Z_IS_1937_EQ_1937(...) \,
-#define Z_IS_1938_EQ_1938(...) \,
-#define Z_IS_1939_EQ_1939(...) \,
-#define Z_IS_1940_EQ_1940(...) \,
-#define Z_IS_1941_EQ_1941(...) \,
-#define Z_IS_1942_EQ_1942(...) \,
-#define Z_IS_1943_EQ_1943(...) \,
-#define Z_IS_1944_EQ_1944(...) \,
-#define Z_IS_1945_EQ_1945(...) \,
-#define Z_IS_1946_EQ_1946(...) \,
-#define Z_IS_1947_EQ_1947(...) \,
-#define Z_IS_1948_EQ_1948(...) \,
-#define Z_IS_1949_EQ_1949(...) \,
-#define Z_IS_1950_EQ_1950(...) \,
-#define Z_IS_1951_EQ_1951(...) \,
-#define Z_IS_1952_EQ_1952(...) \,
-#define Z_IS_1953_EQ_1953(...) \,
-#define Z_IS_1954_EQ_1954(...) \,
-#define Z_IS_1955_EQ_1955(...) \,
-#define Z_IS_1956_EQ_1956(...) \,
-#define Z_IS_1957_EQ_1957(...) \,
-#define Z_IS_1958_EQ_1958(...) \,
-#define Z_IS_1959_EQ_1959(...) \,
-#define Z_IS_1960_EQ_1960(...) \,
-#define Z_IS_1961_EQ_1961(...) \,
-#define Z_IS_1962_EQ_1962(...) \,
-#define Z_IS_1963_EQ_1963(...) \,
-#define Z_IS_1964_EQ_1964(...) \,
-#define Z_IS_1965_EQ_1965(...) \,
-#define Z_IS_1966_EQ_1966(...) \,
-#define Z_IS_1967_EQ_1967(...) \,
-#define Z_IS_1968_EQ_1968(...) \,
-#define Z_IS_1969_EQ_1969(...) \,
-#define Z_IS_1970_EQ_1970(...) \,
-#define Z_IS_1971_EQ_1971(...) \,
-#define Z_IS_1972_EQ_1972(...) \,
-#define Z_IS_1973_EQ_1973(...) \,
-#define Z_IS_1974_EQ_1974(...) \,
-#define Z_IS_1975_EQ_1975(...) \,
-#define Z_IS_1976_EQ_1976(...) \,
-#define Z_IS_1977_EQ_1977(...) \,
-#define Z_IS_1978_EQ_1978(...) \,
-#define Z_IS_1979_EQ_1979(...) \,
-#define Z_IS_1980_EQ_1980(...) \,
-#define Z_IS_1981_EQ_1981(...) \,
-#define Z_IS_1982_EQ_1982(...) \,
-#define Z_IS_1983_EQ_1983(...) \,
-#define Z_IS_1984_EQ_1984(...) \,
-#define Z_IS_1985_EQ_1985(...) \,
-#define Z_IS_1986_EQ_1986(...) \,
-#define Z_IS_1987_EQ_1987(...) \,
-#define Z_IS_1988_EQ_1988(...) \,
-#define Z_IS_1989_EQ_1989(...) \,
-#define Z_IS_1990_EQ_1990(...) \,
-#define Z_IS_1991_EQ_1991(...) \,
-#define Z_IS_1992_EQ_1992(...) \,
-#define Z_IS_1993_EQ_1993(...) \,
-#define Z_IS_1994_EQ_1994(...) \,
-#define Z_IS_1995_EQ_1995(...) \,
-#define Z_IS_1996_EQ_1996(...) \,
-#define Z_IS_1997_EQ_1997(...) \,
-#define Z_IS_1998_EQ_1998(...) \,
-#define Z_IS_1999_EQ_1999(...) \,
-#define Z_IS_2000_EQ_2000(...) \,
-#define Z_IS_2001_EQ_2001(...) \,
-#define Z_IS_2002_EQ_2002(...) \,
-#define Z_IS_2003_EQ_2003(...) \,
-#define Z_IS_2004_EQ_2004(...) \,
-#define Z_IS_2005_EQ_2005(...) \,
-#define Z_IS_2006_EQ_2006(...) \,
-#define Z_IS_2007_EQ_2007(...) \,
-#define Z_IS_2008_EQ_2008(...) \,
-#define Z_IS_2009_EQ_2009(...) \,
-#define Z_IS_2010_EQ_2010(...) \,
-#define Z_IS_2011_EQ_2011(...) \,
-#define Z_IS_2012_EQ_2012(...) \,
-#define Z_IS_2013_EQ_2013(...) \,
-#define Z_IS_2014_EQ_2014(...) \,
-#define Z_IS_2015_EQ_2015(...) \,
-#define Z_IS_2016_EQ_2016(...) \,
-#define Z_IS_2017_EQ_2017(...) \,
-#define Z_IS_2018_EQ_2018(...) \,
-#define Z_IS_2019_EQ_2019(...) \,
-#define Z_IS_2020_EQ_2020(...) \,
-#define Z_IS_2021_EQ_2021(...) \,
-#define Z_IS_2022_EQ_2022(...) \,
-#define Z_IS_2023_EQ_2023(...) \,
-#define Z_IS_2024_EQ_2024(...) \,
-#define Z_IS_2025_EQ_2025(...) \,
-#define Z_IS_2026_EQ_2026(...) \,
-#define Z_IS_2027_EQ_2027(...) \,
-#define Z_IS_2028_EQ_2028(...) \,
-#define Z_IS_2029_EQ_2029(...) \,
-#define Z_IS_2030_EQ_2030(...) \,
-#define Z_IS_2031_EQ_2031(...) \,
-#define Z_IS_2032_EQ_2032(...) \,
-#define Z_IS_2033_EQ_2033(...) \,
-#define Z_IS_2034_EQ_2034(...) \,
-#define Z_IS_2035_EQ_2035(...) \,
-#define Z_IS_2036_EQ_2036(...) \,
-#define Z_IS_2037_EQ_2037(...) \,
-#define Z_IS_2038_EQ_2038(...) \,
-#define Z_IS_2039_EQ_2039(...) \,
-#define Z_IS_2040_EQ_2040(...) \,
-#define Z_IS_2041_EQ_2041(...) \,
-#define Z_IS_2042_EQ_2042(...) \,
-#define Z_IS_2043_EQ_2043(...) \,
-#define Z_IS_2044_EQ_2044(...) \,
-#define Z_IS_2045_EQ_2045(...) \,
-#define Z_IS_2046_EQ_2046(...) \,
-#define Z_IS_2047_EQ_2047(...) \,
-#define Z_IS_2048_EQ_2048(...) \,
-#define Z_IS_2049_EQ_2049(...) \,
-#define Z_IS_2050_EQ_2050(...) \,
-#define Z_IS_2051_EQ_2051(...) \,
-#define Z_IS_2052_EQ_2052(...) \,
-#define Z_IS_2053_EQ_2053(...) \,
-#define Z_IS_2054_EQ_2054(...) \,
-#define Z_IS_2055_EQ_2055(...) \,
-#define Z_IS_2056_EQ_2056(...) \,
-#define Z_IS_2057_EQ_2057(...) \,
-#define Z_IS_2058_EQ_2058(...) \,
-#define Z_IS_2059_EQ_2059(...) \,
-#define Z_IS_2060_EQ_2060(...) \,
-#define Z_IS_2061_EQ_2061(...) \,
-#define Z_IS_2062_EQ_2062(...) \,
-#define Z_IS_2063_EQ_2063(...) \,
-#define Z_IS_2064_EQ_2064(...) \,
-#define Z_IS_2065_EQ_2065(...) \,
-#define Z_IS_2066_EQ_2066(...) \,
-#define Z_IS_2067_EQ_2067(...) \,
-#define Z_IS_2068_EQ_2068(...) \,
-#define Z_IS_2069_EQ_2069(...) \,
-#define Z_IS_2070_EQ_2070(...) \,
-#define Z_IS_2071_EQ_2071(...) \,
-#define Z_IS_2072_EQ_2072(...) \,
-#define Z_IS_2073_EQ_2073(...) \,
-#define Z_IS_2074_EQ_2074(...) \,
-#define Z_IS_2075_EQ_2075(...) \,
-#define Z_IS_2076_EQ_2076(...) \,
-#define Z_IS_2077_EQ_2077(...) \,
-#define Z_IS_2078_EQ_2078(...) \,
-#define Z_IS_2079_EQ_2079(...) \,
-#define Z_IS_2080_EQ_2080(...) \,
-#define Z_IS_2081_EQ_2081(...) \,
-#define Z_IS_2082_EQ_2082(...) \,
-#define Z_IS_2083_EQ_2083(...) \,
-#define Z_IS_2084_EQ_2084(...) \,
-#define Z_IS_2085_EQ_2085(...) \,
-#define Z_IS_2086_EQ_2086(...) \,
-#define Z_IS_2087_EQ_2087(...) \,
-#define Z_IS_2088_EQ_2088(...) \,
-#define Z_IS_2089_EQ_2089(...) \,
-#define Z_IS_2090_EQ_2090(...) \,
-#define Z_IS_2091_EQ_2091(...) \,
-#define Z_IS_2092_EQ_2092(...) \,
-#define Z_IS_2093_EQ_2093(...) \,
-#define Z_IS_2094_EQ_2094(...) \,
-#define Z_IS_2095_EQ_2095(...) \,
-#define Z_IS_2096_EQ_2096(...) \,
-#define Z_IS_2097_EQ_2097(...) \,
-#define Z_IS_2098_EQ_2098(...) \,
-#define Z_IS_2099_EQ_2099(...) \,
-#define Z_IS_2100_EQ_2100(...) \,
-#define Z_IS_2101_EQ_2101(...) \,
-#define Z_IS_2102_EQ_2102(...) \,
-#define Z_IS_2103_EQ_2103(...) \,
-#define Z_IS_2104_EQ_2104(...) \,
-#define Z_IS_2105_EQ_2105(...) \,
-#define Z_IS_2106_EQ_2106(...) \,
-#define Z_IS_2107_EQ_2107(...) \,
-#define Z_IS_2108_EQ_2108(...) \,
-#define Z_IS_2109_EQ_2109(...) \,
-#define Z_IS_2110_EQ_2110(...) \,
-#define Z_IS_2111_EQ_2111(...) \,
-#define Z_IS_2112_EQ_2112(...) \,
-#define Z_IS_2113_EQ_2113(...) \,
-#define Z_IS_2114_EQ_2114(...) \,
-#define Z_IS_2115_EQ_2115(...) \,
-#define Z_IS_2116_EQ_2116(...) \,
-#define Z_IS_2117_EQ_2117(...) \,
-#define Z_IS_2118_EQ_2118(...) \,
-#define Z_IS_2119_EQ_2119(...) \,
-#define Z_IS_2120_EQ_2120(...) \,
-#define Z_IS_2121_EQ_2121(...) \,
-#define Z_IS_2122_EQ_2122(...) \,
-#define Z_IS_2123_EQ_2123(...) \,
-#define Z_IS_2124_EQ_2124(...) \,
-#define Z_IS_2125_EQ_2125(...) \,
-#define Z_IS_2126_EQ_2126(...) \,
-#define Z_IS_2127_EQ_2127(...) \,
-#define Z_IS_2128_EQ_2128(...) \,
-#define Z_IS_2129_EQ_2129(...) \,
-#define Z_IS_2130_EQ_2130(...) \,
-#define Z_IS_2131_EQ_2131(...) \,
-#define Z_IS_2132_EQ_2132(...) \,
-#define Z_IS_2133_EQ_2133(...) \,
-#define Z_IS_2134_EQ_2134(...) \,
-#define Z_IS_2135_EQ_2135(...) \,
-#define Z_IS_2136_EQ_2136(...) \,
-#define Z_IS_2137_EQ_2137(...) \,
-#define Z_IS_2138_EQ_2138(...) \,
-#define Z_IS_2139_EQ_2139(...) \,
-#define Z_IS_2140_EQ_2140(...) \,
-#define Z_IS_2141_EQ_2141(...) \,
-#define Z_IS_2142_EQ_2142(...) \,
-#define Z_IS_2143_EQ_2143(...) \,
-#define Z_IS_2144_EQ_2144(...) \,
-#define Z_IS_2145_EQ_2145(...) \,
-#define Z_IS_2146_EQ_2146(...) \,
-#define Z_IS_2147_EQ_2147(...) \,
-#define Z_IS_2148_EQ_2148(...) \,
-#define Z_IS_2149_EQ_2149(...) \,
-#define Z_IS_2150_EQ_2150(...) \,
-#define Z_IS_2151_EQ_2151(...) \,
-#define Z_IS_2152_EQ_2152(...) \,
-#define Z_IS_2153_EQ_2153(...) \,
-#define Z_IS_2154_EQ_2154(...) \,
-#define Z_IS_2155_EQ_2155(...) \,
-#define Z_IS_2156_EQ_2156(...) \,
-#define Z_IS_2157_EQ_2157(...) \,
-#define Z_IS_2158_EQ_2158(...) \,
-#define Z_IS_2159_EQ_2159(...) \,
-#define Z_IS_2160_EQ_2160(...) \,
-#define Z_IS_2161_EQ_2161(...) \,
-#define Z_IS_2162_EQ_2162(...) \,
-#define Z_IS_2163_EQ_2163(...) \,
-#define Z_IS_2164_EQ_2164(...) \,
-#define Z_IS_2165_EQ_2165(...) \,
-#define Z_IS_2166_EQ_2166(...) \,
-#define Z_IS_2167_EQ_2167(...) \,
-#define Z_IS_2168_EQ_2168(...) \,
-#define Z_IS_2169_EQ_2169(...) \,
-#define Z_IS_2170_EQ_2170(...) \,
-#define Z_IS_2171_EQ_2171(...) \,
-#define Z_IS_2172_EQ_2172(...) \,
-#define Z_IS_2173_EQ_2173(...) \,
-#define Z_IS_2174_EQ_2174(...) \,
-#define Z_IS_2175_EQ_2175(...) \,
-#define Z_IS_2176_EQ_2176(...) \,
-#define Z_IS_2177_EQ_2177(...) \,
-#define Z_IS_2178_EQ_2178(...) \,
-#define Z_IS_2179_EQ_2179(...) \,
-#define Z_IS_2180_EQ_2180(...) \,
-#define Z_IS_2181_EQ_2181(...) \,
-#define Z_IS_2182_EQ_2182(...) \,
-#define Z_IS_2183_EQ_2183(...) \,
-#define Z_IS_2184_EQ_2184(...) \,
-#define Z_IS_2185_EQ_2185(...) \,
-#define Z_IS_2186_EQ_2186(...) \,
-#define Z_IS_2187_EQ_2187(...) \,
-#define Z_IS_2188_EQ_2188(...) \,
-#define Z_IS_2189_EQ_2189(...) \,
-#define Z_IS_2190_EQ_2190(...) \,
-#define Z_IS_2191_EQ_2191(...) \,
-#define Z_IS_2192_EQ_2192(...) \,
-#define Z_IS_2193_EQ_2193(...) \,
-#define Z_IS_2194_EQ_2194(...) \,
-#define Z_IS_2195_EQ_2195(...) \,
-#define Z_IS_2196_EQ_2196(...) \,
-#define Z_IS_2197_EQ_2197(...) \,
-#define Z_IS_2198_EQ_2198(...) \,
-#define Z_IS_2199_EQ_2199(...) \,
-#define Z_IS_2200_EQ_2200(...) \,
-#define Z_IS_2201_EQ_2201(...) \,
-#define Z_IS_2202_EQ_2202(...) \,
-#define Z_IS_2203_EQ_2203(...) \,
-#define Z_IS_2204_EQ_2204(...) \,
-#define Z_IS_2205_EQ_2205(...) \,
-#define Z_IS_2206_EQ_2206(...) \,
-#define Z_IS_2207_EQ_2207(...) \,
-#define Z_IS_2208_EQ_2208(...) \,
-#define Z_IS_2209_EQ_2209(...) \,
-#define Z_IS_2210_EQ_2210(...) \,
-#define Z_IS_2211_EQ_2211(...) \,
-#define Z_IS_2212_EQ_2212(...) \,
-#define Z_IS_2213_EQ_2213(...) \,
-#define Z_IS_2214_EQ_2214(...) \,
-#define Z_IS_2215_EQ_2215(...) \,
-#define Z_IS_2216_EQ_2216(...) \,
-#define Z_IS_2217_EQ_2217(...) \,
-#define Z_IS_2218_EQ_2218(...) \,
-#define Z_IS_2219_EQ_2219(...) \,
-#define Z_IS_2220_EQ_2220(...) \,
-#define Z_IS_2221_EQ_2221(...) \,
-#define Z_IS_2222_EQ_2222(...) \,
-#define Z_IS_2223_EQ_2223(...) \,
-#define Z_IS_2224_EQ_2224(...) \,
-#define Z_IS_2225_EQ_2225(...) \,
-#define Z_IS_2226_EQ_2226(...) \,
-#define Z_IS_2227_EQ_2227(...) \,
-#define Z_IS_2228_EQ_2228(...) \,
-#define Z_IS_2229_EQ_2229(...) \,
-#define Z_IS_2230_EQ_2230(...) \,
-#define Z_IS_2231_EQ_2231(...) \,
-#define Z_IS_2232_EQ_2232(...) \,
-#define Z_IS_2233_EQ_2233(...) \,
-#define Z_IS_2234_EQ_2234(...) \,
-#define Z_IS_2235_EQ_2235(...) \,
-#define Z_IS_2236_EQ_2236(...) \,
-#define Z_IS_2237_EQ_2237(...) \,
-#define Z_IS_2238_EQ_2238(...) \,
-#define Z_IS_2239_EQ_2239(...) \,
-#define Z_IS_2240_EQ_2240(...) \,
-#define Z_IS_2241_EQ_2241(...) \,
-#define Z_IS_2242_EQ_2242(...) \,
-#define Z_IS_2243_EQ_2243(...) \,
-#define Z_IS_2244_EQ_2244(...) \,
-#define Z_IS_2245_EQ_2245(...) \,
-#define Z_IS_2246_EQ_2246(...) \,
-#define Z_IS_2247_EQ_2247(...) \,
-#define Z_IS_2248_EQ_2248(...) \,
-#define Z_IS_2249_EQ_2249(...) \,
-#define Z_IS_2250_EQ_2250(...) \,
-#define Z_IS_2251_EQ_2251(...) \,
-#define Z_IS_2252_EQ_2252(...) \,
-#define Z_IS_2253_EQ_2253(...) \,
-#define Z_IS_2254_EQ_2254(...) \,
-#define Z_IS_2255_EQ_2255(...) \,
-#define Z_IS_2256_EQ_2256(...) \,
-#define Z_IS_2257_EQ_2257(...) \,
-#define Z_IS_2258_EQ_2258(...) \,
-#define Z_IS_2259_EQ_2259(...) \,
-#define Z_IS_2260_EQ_2260(...) \,
-#define Z_IS_2261_EQ_2261(...) \,
-#define Z_IS_2262_EQ_2262(...) \,
-#define Z_IS_2263_EQ_2263(...) \,
-#define Z_IS_2264_EQ_2264(...) \,
-#define Z_IS_2265_EQ_2265(...) \,
-#define Z_IS_2266_EQ_2266(...) \,
-#define Z_IS_2267_EQ_2267(...) \,
-#define Z_IS_2268_EQ_2268(...) \,
-#define Z_IS_2269_EQ_2269(...) \,
-#define Z_IS_2270_EQ_2270(...) \,
-#define Z_IS_2271_EQ_2271(...) \,
-#define Z_IS_2272_EQ_2272(...) \,
-#define Z_IS_2273_EQ_2273(...) \,
-#define Z_IS_2274_EQ_2274(...) \,
-#define Z_IS_2275_EQ_2275(...) \,
-#define Z_IS_2276_EQ_2276(...) \,
-#define Z_IS_2277_EQ_2277(...) \,
-#define Z_IS_2278_EQ_2278(...) \,
-#define Z_IS_2279_EQ_2279(...) \,
-#define Z_IS_2280_EQ_2280(...) \,
-#define Z_IS_2281_EQ_2281(...) \,
-#define Z_IS_2282_EQ_2282(...) \,
-#define Z_IS_2283_EQ_2283(...) \,
-#define Z_IS_2284_EQ_2284(...) \,
-#define Z_IS_2285_EQ_2285(...) \,
-#define Z_IS_2286_EQ_2286(...) \,
-#define Z_IS_2287_EQ_2287(...) \,
-#define Z_IS_2288_EQ_2288(...) \,
-#define Z_IS_2289_EQ_2289(...) \,
-#define Z_IS_2290_EQ_2290(...) \,
-#define Z_IS_2291_EQ_2291(...) \,
-#define Z_IS_2292_EQ_2292(...) \,
-#define Z_IS_2293_EQ_2293(...) \,
-#define Z_IS_2294_EQ_2294(...) \,
-#define Z_IS_2295_EQ_2295(...) \,
-#define Z_IS_2296_EQ_2296(...) \,
-#define Z_IS_2297_EQ_2297(...) \,
-#define Z_IS_2298_EQ_2298(...) \,
-#define Z_IS_2299_EQ_2299(...) \,
-#define Z_IS_2300_EQ_2300(...) \,
-#define Z_IS_2301_EQ_2301(...) \,
-#define Z_IS_2302_EQ_2302(...) \,
-#define Z_IS_2303_EQ_2303(...) \,
-#define Z_IS_2304_EQ_2304(...) \,
-#define Z_IS_2305_EQ_2305(...) \,
-#define Z_IS_2306_EQ_2306(...) \,
-#define Z_IS_2307_EQ_2307(...) \,
-#define Z_IS_2308_EQ_2308(...) \,
-#define Z_IS_2309_EQ_2309(...) \,
-#define Z_IS_2310_EQ_2310(...) \,
-#define Z_IS_2311_EQ_2311(...) \,
-#define Z_IS_2312_EQ_2312(...) \,
-#define Z_IS_2313_EQ_2313(...) \,
-#define Z_IS_2314_EQ_2314(...) \,
-#define Z_IS_2315_EQ_2315(...) \,
-#define Z_IS_2316_EQ_2316(...) \,
-#define Z_IS_2317_EQ_2317(...) \,
-#define Z_IS_2318_EQ_2318(...) \,
-#define Z_IS_2319_EQ_2319(...) \,
-#define Z_IS_2320_EQ_2320(...) \,
-#define Z_IS_2321_EQ_2321(...) \,
-#define Z_IS_2322_EQ_2322(...) \,
-#define Z_IS_2323_EQ_2323(...) \,
-#define Z_IS_2324_EQ_2324(...) \,
-#define Z_IS_2325_EQ_2325(...) \,
-#define Z_IS_2326_EQ_2326(...) \,
-#define Z_IS_2327_EQ_2327(...) \,
-#define Z_IS_2328_EQ_2328(...) \,
-#define Z_IS_2329_EQ_2329(...) \,
-#define Z_IS_2330_EQ_2330(...) \,
-#define Z_IS_2331_EQ_2331(...) \,
-#define Z_IS_2332_EQ_2332(...) \,
-#define Z_IS_2333_EQ_2333(...) \,
-#define Z_IS_2334_EQ_2334(...) \,
-#define Z_IS_2335_EQ_2335(...) \,
-#define Z_IS_2336_EQ_2336(...) \,
-#define Z_IS_2337_EQ_2337(...) \,
-#define Z_IS_2338_EQ_2338(...) \,
-#define Z_IS_2339_EQ_2339(...) \,
-#define Z_IS_2340_EQ_2340(...) \,
-#define Z_IS_2341_EQ_2341(...) \,
-#define Z_IS_2342_EQ_2342(...) \,
-#define Z_IS_2343_EQ_2343(...) \,
-#define Z_IS_2344_EQ_2344(...) \,
-#define Z_IS_2345_EQ_2345(...) \,
-#define Z_IS_2346_EQ_2346(...) \,
-#define Z_IS_2347_EQ_2347(...) \,
-#define Z_IS_2348_EQ_2348(...) \,
-#define Z_IS_2349_EQ_2349(...) \,
-#define Z_IS_2350_EQ_2350(...) \,
-#define Z_IS_2351_EQ_2351(...) \,
-#define Z_IS_2352_EQ_2352(...) \,
-#define Z_IS_2353_EQ_2353(...) \,
-#define Z_IS_2354_EQ_2354(...) \,
-#define Z_IS_2355_EQ_2355(...) \,
-#define Z_IS_2356_EQ_2356(...) \,
-#define Z_IS_2357_EQ_2357(...) \,
-#define Z_IS_2358_EQ_2358(...) \,
-#define Z_IS_2359_EQ_2359(...) \,
-#define Z_IS_2360_EQ_2360(...) \,
-#define Z_IS_2361_EQ_2361(...) \,
-#define Z_IS_2362_EQ_2362(...) \,
-#define Z_IS_2363_EQ_2363(...) \,
-#define Z_IS_2364_EQ_2364(...) \,
-#define Z_IS_2365_EQ_2365(...) \,
-#define Z_IS_2366_EQ_2366(...) \,
-#define Z_IS_2367_EQ_2367(...) \,
-#define Z_IS_2368_EQ_2368(...) \,
-#define Z_IS_2369_EQ_2369(...) \,
-#define Z_IS_2370_EQ_2370(...) \,
-#define Z_IS_2371_EQ_2371(...) \,
-#define Z_IS_2372_EQ_2372(...) \,
-#define Z_IS_2373_EQ_2373(...) \,
-#define Z_IS_2374_EQ_2374(...) \,
-#define Z_IS_2375_EQ_2375(...) \,
-#define Z_IS_2376_EQ_2376(...) \,
-#define Z_IS_2377_EQ_2377(...) \,
-#define Z_IS_2378_EQ_2378(...) \,
-#define Z_IS_2379_EQ_2379(...) \,
-#define Z_IS_2380_EQ_2380(...) \,
-#define Z_IS_2381_EQ_2381(...) \,
-#define Z_IS_2382_EQ_2382(...) \,
-#define Z_IS_2383_EQ_2383(...) \,
-#define Z_IS_2384_EQ_2384(...) \,
-#define Z_IS_2385_EQ_2385(...) \,
-#define Z_IS_2386_EQ_2386(...) \,
-#define Z_IS_2387_EQ_2387(...) \,
-#define Z_IS_2388_EQ_2388(...) \,
-#define Z_IS_2389_EQ_2389(...) \,
-#define Z_IS_2390_EQ_2390(...) \,
-#define Z_IS_2391_EQ_2391(...) \,
-#define Z_IS_2392_EQ_2392(...) \,
-#define Z_IS_2393_EQ_2393(...) \,
-#define Z_IS_2394_EQ_2394(...) \,
-#define Z_IS_2395_EQ_2395(...) \,
-#define Z_IS_2396_EQ_2396(...) \,
-#define Z_IS_2397_EQ_2397(...) \,
-#define Z_IS_2398_EQ_2398(...) \,
-#define Z_IS_2399_EQ_2399(...) \,
-#define Z_IS_2400_EQ_2400(...) \,
-#define Z_IS_2401_EQ_2401(...) \,
-#define Z_IS_2402_EQ_2402(...) \,
-#define Z_IS_2403_EQ_2403(...) \,
-#define Z_IS_2404_EQ_2404(...) \,
-#define Z_IS_2405_EQ_2405(...) \,
-#define Z_IS_2406_EQ_2406(...) \,
-#define Z_IS_2407_EQ_2407(...) \,
-#define Z_IS_2408_EQ_2408(...) \,
-#define Z_IS_2409_EQ_2409(...) \,
-#define Z_IS_2410_EQ_2410(...) \,
-#define Z_IS_2411_EQ_2411(...) \,
-#define Z_IS_2412_EQ_2412(...) \,
-#define Z_IS_2413_EQ_2413(...) \,
-#define Z_IS_2414_EQ_2414(...) \,
-#define Z_IS_2415_EQ_2415(...) \,
-#define Z_IS_2416_EQ_2416(...) \,
-#define Z_IS_2417_EQ_2417(...) \,
-#define Z_IS_2418_EQ_2418(...) \,
-#define Z_IS_2419_EQ_2419(...) \,
-#define Z_IS_2420_EQ_2420(...) \,
-#define Z_IS_2421_EQ_2421(...) \,
-#define Z_IS_2422_EQ_2422(...) \,
-#define Z_IS_2423_EQ_2423(...) \,
-#define Z_IS_2424_EQ_2424(...) \,
-#define Z_IS_2425_EQ_2425(...) \,
-#define Z_IS_2426_EQ_2426(...) \,
-#define Z_IS_2427_EQ_2427(...) \,
-#define Z_IS_2428_EQ_2428(...) \,
-#define Z_IS_2429_EQ_2429(...) \,
-#define Z_IS_2430_EQ_2430(...) \,
-#define Z_IS_2431_EQ_2431(...) \,
-#define Z_IS_2432_EQ_2432(...) \,
-#define Z_IS_2433_EQ_2433(...) \,
-#define Z_IS_2434_EQ_2434(...) \,
-#define Z_IS_2435_EQ_2435(...) \,
-#define Z_IS_2436_EQ_2436(...) \,
-#define Z_IS_2437_EQ_2437(...) \,
-#define Z_IS_2438_EQ_2438(...) \,
-#define Z_IS_2439_EQ_2439(...) \,
-#define Z_IS_2440_EQ_2440(...) \,
-#define Z_IS_2441_EQ_2441(...) \,
-#define Z_IS_2442_EQ_2442(...) \,
-#define Z_IS_2443_EQ_2443(...) \,
-#define Z_IS_2444_EQ_2444(...) \,
-#define Z_IS_2445_EQ_2445(...) \,
-#define Z_IS_2446_EQ_2446(...) \,
-#define Z_IS_2447_EQ_2447(...) \,
-#define Z_IS_2448_EQ_2448(...) \,
-#define Z_IS_2449_EQ_2449(...) \,
-#define Z_IS_2450_EQ_2450(...) \,
-#define Z_IS_2451_EQ_2451(...) \,
-#define Z_IS_2452_EQ_2452(...) \,
-#define Z_IS_2453_EQ_2453(...) \,
-#define Z_IS_2454_EQ_2454(...) \,
-#define Z_IS_2455_EQ_2455(...) \,
-#define Z_IS_2456_EQ_2456(...) \,
-#define Z_IS_2457_EQ_2457(...) \,
-#define Z_IS_2458_EQ_2458(...) \,
-#define Z_IS_2459_EQ_2459(...) \,
-#define Z_IS_2460_EQ_2460(...) \,
-#define Z_IS_2461_EQ_2461(...) \,
-#define Z_IS_2462_EQ_2462(...) \,
-#define Z_IS_2463_EQ_2463(...) \,
-#define Z_IS_2464_EQ_2464(...) \,
-#define Z_IS_2465_EQ_2465(...) \,
-#define Z_IS_2466_EQ_2466(...) \,
-#define Z_IS_2467_EQ_2467(...) \,
-#define Z_IS_2468_EQ_2468(...) \,
-#define Z_IS_2469_EQ_2469(...) \,
-#define Z_IS_2470_EQ_2470(...) \,
-#define Z_IS_2471_EQ_2471(...) \,
-#define Z_IS_2472_EQ_2472(...) \,
-#define Z_IS_2473_EQ_2473(...) \,
-#define Z_IS_2474_EQ_2474(...) \,
-#define Z_IS_2475_EQ_2475(...) \,
-#define Z_IS_2476_EQ_2476(...) \,
-#define Z_IS_2477_EQ_2477(...) \,
-#define Z_IS_2478_EQ_2478(...) \,
-#define Z_IS_2479_EQ_2479(...) \,
-#define Z_IS_2480_EQ_2480(...) \,
-#define Z_IS_2481_EQ_2481(...) \,
-#define Z_IS_2482_EQ_2482(...) \,
-#define Z_IS_2483_EQ_2483(...) \,
-#define Z_IS_2484_EQ_2484(...) \,
-#define Z_IS_2485_EQ_2485(...) \,
-#define Z_IS_2486_EQ_2486(...) \,
-#define Z_IS_2487_EQ_2487(...) \,
-#define Z_IS_2488_EQ_2488(...) \,
-#define Z_IS_2489_EQ_2489(...) \,
-#define Z_IS_2490_EQ_2490(...) \,
-#define Z_IS_2491_EQ_2491(...) \,
-#define Z_IS_2492_EQ_2492(...) \,
-#define Z_IS_2493_EQ_2493(...) \,
-#define Z_IS_2494_EQ_2494(...) \,
-#define Z_IS_2495_EQ_2495(...) \,
-#define Z_IS_2496_EQ_2496(...) \,
-#define Z_IS_2497_EQ_2497(...) \,
-#define Z_IS_2498_EQ_2498(...) \,
-#define Z_IS_2499_EQ_2499(...) \,
-#define Z_IS_2500_EQ_2500(...) \,
-#define Z_IS_2501_EQ_2501(...) \,
-#define Z_IS_2502_EQ_2502(...) \,
-#define Z_IS_2503_EQ_2503(...) \,
-#define Z_IS_2504_EQ_2504(...) \,
-#define Z_IS_2505_EQ_2505(...) \,
-#define Z_IS_2506_EQ_2506(...) \,
-#define Z_IS_2507_EQ_2507(...) \,
-#define Z_IS_2508_EQ_2508(...) \,
-#define Z_IS_2509_EQ_2509(...) \,
-#define Z_IS_2510_EQ_2510(...) \,
-#define Z_IS_2511_EQ_2511(...) \,
-#define Z_IS_2512_EQ_2512(...) \,
-#define Z_IS_2513_EQ_2513(...) \,
-#define Z_IS_2514_EQ_2514(...) \,
-#define Z_IS_2515_EQ_2515(...) \,
-#define Z_IS_2516_EQ_2516(...) \,
-#define Z_IS_2517_EQ_2517(...) \,
-#define Z_IS_2518_EQ_2518(...) \,
-#define Z_IS_2519_EQ_2519(...) \,
-#define Z_IS_2520_EQ_2520(...) \,
-#define Z_IS_2521_EQ_2521(...) \,
-#define Z_IS_2522_EQ_2522(...) \,
-#define Z_IS_2523_EQ_2523(...) \,
-#define Z_IS_2524_EQ_2524(...) \,
-#define Z_IS_2525_EQ_2525(...) \,
-#define Z_IS_2526_EQ_2526(...) \,
-#define Z_IS_2527_EQ_2527(...) \,
-#define Z_IS_2528_EQ_2528(...) \,
-#define Z_IS_2529_EQ_2529(...) \,
-#define Z_IS_2530_EQ_2530(...) \,
-#define Z_IS_2531_EQ_2531(...) \,
-#define Z_IS_2532_EQ_2532(...) \,
-#define Z_IS_2533_EQ_2533(...) \,
-#define Z_IS_2534_EQ_2534(...) \,
-#define Z_IS_2535_EQ_2535(...) \,
-#define Z_IS_2536_EQ_2536(...) \,
-#define Z_IS_2537_EQ_2537(...) \,
-#define Z_IS_2538_EQ_2538(...) \,
-#define Z_IS_2539_EQ_2539(...) \,
-#define Z_IS_2540_EQ_2540(...) \,
-#define Z_IS_2541_EQ_2541(...) \,
-#define Z_IS_2542_EQ_2542(...) \,
-#define Z_IS_2543_EQ_2543(...) \,
-#define Z_IS_2544_EQ_2544(...) \,
-#define Z_IS_2545_EQ_2545(...) \,
-#define Z_IS_2546_EQ_2546(...) \,
-#define Z_IS_2547_EQ_2547(...) \,
-#define Z_IS_2548_EQ_2548(...) \,
-#define Z_IS_2549_EQ_2549(...) \,
-#define Z_IS_2550_EQ_2550(...) \,
-#define Z_IS_2551_EQ_2551(...) \,
-#define Z_IS_2552_EQ_2552(...) \,
-#define Z_IS_2553_EQ_2553(...) \,
-#define Z_IS_2554_EQ_2554(...) \,
-#define Z_IS_2555_EQ_2555(...) \,
-#define Z_IS_2556_EQ_2556(...) \,
-#define Z_IS_2557_EQ_2557(...) \,
-#define Z_IS_2558_EQ_2558(...) \,
-#define Z_IS_2559_EQ_2559(...) \,
-#define Z_IS_2560_EQ_2560(...) \,
-#define Z_IS_2561_EQ_2561(...) \,
-#define Z_IS_2562_EQ_2562(...) \,
-#define Z_IS_2563_EQ_2563(...) \,
-#define Z_IS_2564_EQ_2564(...) \,
-#define Z_IS_2565_EQ_2565(...) \,
-#define Z_IS_2566_EQ_2566(...) \,
-#define Z_IS_2567_EQ_2567(...) \,
-#define Z_IS_2568_EQ_2568(...) \,
-#define Z_IS_2569_EQ_2569(...) \,
-#define Z_IS_2570_EQ_2570(...) \,
-#define Z_IS_2571_EQ_2571(...) \,
-#define Z_IS_2572_EQ_2572(...) \,
-#define Z_IS_2573_EQ_2573(...) \,
-#define Z_IS_2574_EQ_2574(...) \,
-#define Z_IS_2575_EQ_2575(...) \,
-#define Z_IS_2576_EQ_2576(...) \,
-#define Z_IS_2577_EQ_2577(...) \,
-#define Z_IS_2578_EQ_2578(...) \,
-#define Z_IS_2579_EQ_2579(...) \,
-#define Z_IS_2580_EQ_2580(...) \,
-#define Z_IS_2581_EQ_2581(...) \,
-#define Z_IS_2582_EQ_2582(...) \,
-#define Z_IS_2583_EQ_2583(...) \,
-#define Z_IS_2584_EQ_2584(...) \,
-#define Z_IS_2585_EQ_2585(...) \,
-#define Z_IS_2586_EQ_2586(...) \,
-#define Z_IS_2587_EQ_2587(...) \,
-#define Z_IS_2588_EQ_2588(...) \,
-#define Z_IS_2589_EQ_2589(...) \,
-#define Z_IS_2590_EQ_2590(...) \,
-#define Z_IS_2591_EQ_2591(...) \,
-#define Z_IS_2592_EQ_2592(...) \,
-#define Z_IS_2593_EQ_2593(...) \,
-#define Z_IS_2594_EQ_2594(...) \,
-#define Z_IS_2595_EQ_2595(...) \,
-#define Z_IS_2596_EQ_2596(...) \,
-#define Z_IS_2597_EQ_2597(...) \,
-#define Z_IS_2598_EQ_2598(...) \,
-#define Z_IS_2599_EQ_2599(...) \,
-#define Z_IS_2600_EQ_2600(...) \,
-#define Z_IS_2601_EQ_2601(...) \,
-#define Z_IS_2602_EQ_2602(...) \,
-#define Z_IS_2603_EQ_2603(...) \,
-#define Z_IS_2604_EQ_2604(...) \,
-#define Z_IS_2605_EQ_2605(...) \,
-#define Z_IS_2606_EQ_2606(...) \,
-#define Z_IS_2607_EQ_2607(...) \,
-#define Z_IS_2608_EQ_2608(...) \,
-#define Z_IS_2609_EQ_2609(...) \,
-#define Z_IS_2610_EQ_2610(...) \,
-#define Z_IS_2611_EQ_2611(...) \,
-#define Z_IS_2612_EQ_2612(...) \,
-#define Z_IS_2613_EQ_2613(...) \,
-#define Z_IS_2614_EQ_2614(...) \,
-#define Z_IS_2615_EQ_2615(...) \,
-#define Z_IS_2616_EQ_2616(...) \,
-#define Z_IS_2617_EQ_2617(...) \,
-#define Z_IS_2618_EQ_2618(...) \,
-#define Z_IS_2619_EQ_2619(...) \,
-#define Z_IS_2620_EQ_2620(...) \,
-#define Z_IS_2621_EQ_2621(...) \,
-#define Z_IS_2622_EQ_2622(...) \,
-#define Z_IS_2623_EQ_2623(...) \,
-#define Z_IS_2624_EQ_2624(...) \,
-#define Z_IS_2625_EQ_2625(...) \,
-#define Z_IS_2626_EQ_2626(...) \,
-#define Z_IS_2627_EQ_2627(...) \,
-#define Z_IS_2628_EQ_2628(...) \,
-#define Z_IS_2629_EQ_2629(...) \,
-#define Z_IS_2630_EQ_2630(...) \,
-#define Z_IS_2631_EQ_2631(...) \,
-#define Z_IS_2632_EQ_2632(...) \,
-#define Z_IS_2633_EQ_2633(...) \,
-#define Z_IS_2634_EQ_2634(...) \,
-#define Z_IS_2635_EQ_2635(...) \,
-#define Z_IS_2636_EQ_2636(...) \,
-#define Z_IS_2637_EQ_2637(...) \,
-#define Z_IS_2638_EQ_2638(...) \,
-#define Z_IS_2639_EQ_2639(...) \,
-#define Z_IS_2640_EQ_2640(...) \,
-#define Z_IS_2641_EQ_2641(...) \,
-#define Z_IS_2642_EQ_2642(...) \,
-#define Z_IS_2643_EQ_2643(...) \,
-#define Z_IS_2644_EQ_2644(...) \,
-#define Z_IS_2645_EQ_2645(...) \,
-#define Z_IS_2646_EQ_2646(...) \,
-#define Z_IS_2647_EQ_2647(...) \,
-#define Z_IS_2648_EQ_2648(...) \,
-#define Z_IS_2649_EQ_2649(...) \,
-#define Z_IS_2650_EQ_2650(...) \,
-#define Z_IS_2651_EQ_2651(...) \,
-#define Z_IS_2652_EQ_2652(...) \,
-#define Z_IS_2653_EQ_2653(...) \,
-#define Z_IS_2654_EQ_2654(...) \,
-#define Z_IS_2655_EQ_2655(...) \,
-#define Z_IS_2656_EQ_2656(...) \,
-#define Z_IS_2657_EQ_2657(...) \,
-#define Z_IS_2658_EQ_2658(...) \,
-#define Z_IS_2659_EQ_2659(...) \,
-#define Z_IS_2660_EQ_2660(...) \,
-#define Z_IS_2661_EQ_2661(...) \,
-#define Z_IS_2662_EQ_2662(...) \,
-#define Z_IS_2663_EQ_2663(...) \,
-#define Z_IS_2664_EQ_2664(...) \,
-#define Z_IS_2665_EQ_2665(...) \,
-#define Z_IS_2666_EQ_2666(...) \,
-#define Z_IS_2667_EQ_2667(...) \,
-#define Z_IS_2668_EQ_2668(...) \,
-#define Z_IS_2669_EQ_2669(...) \,
-#define Z_IS_2670_EQ_2670(...) \,
-#define Z_IS_2671_EQ_2671(...) \,
-#define Z_IS_2672_EQ_2672(...) \,
-#define Z_IS_2673_EQ_2673(...) \,
-#define Z_IS_2674_EQ_2674(...) \,
-#define Z_IS_2675_EQ_2675(...) \,
-#define Z_IS_2676_EQ_2676(...) \,
-#define Z_IS_2677_EQ_2677(...) \,
-#define Z_IS_2678_EQ_2678(...) \,
-#define Z_IS_2679_EQ_2679(...) \,
-#define Z_IS_2680_EQ_2680(...) \,
-#define Z_IS_2681_EQ_2681(...) \,
-#define Z_IS_2682_EQ_2682(...) \,
-#define Z_IS_2683_EQ_2683(...) \,
-#define Z_IS_2684_EQ_2684(...) \,
-#define Z_IS_2685_EQ_2685(...) \,
-#define Z_IS_2686_EQ_2686(...) \,
-#define Z_IS_2687_EQ_2687(...) \,
-#define Z_IS_2688_EQ_2688(...) \,
-#define Z_IS_2689_EQ_2689(...) \,
-#define Z_IS_2690_EQ_2690(...) \,
-#define Z_IS_2691_EQ_2691(...) \,
-#define Z_IS_2692_EQ_2692(...) \,
-#define Z_IS_2693_EQ_2693(...) \,
-#define Z_IS_2694_EQ_2694(...) \,
-#define Z_IS_2695_EQ_2695(...) \,
-#define Z_IS_2696_EQ_2696(...) \,
-#define Z_IS_2697_EQ_2697(...) \,
-#define Z_IS_2698_EQ_2698(...) \,
-#define Z_IS_2699_EQ_2699(...) \,
-#define Z_IS_2700_EQ_2700(...) \,
-#define Z_IS_2701_EQ_2701(...) \,
-#define Z_IS_2702_EQ_2702(...) \,
-#define Z_IS_2703_EQ_2703(...) \,
-#define Z_IS_2704_EQ_2704(...) \,
-#define Z_IS_2705_EQ_2705(...) \,
-#define Z_IS_2706_EQ_2706(...) \,
-#define Z_IS_2707_EQ_2707(...) \,
-#define Z_IS_2708_EQ_2708(...) \,
-#define Z_IS_2709_EQ_2709(...) \,
-#define Z_IS_2710_EQ_2710(...) \,
-#define Z_IS_2711_EQ_2711(...) \,
-#define Z_IS_2712_EQ_2712(...) \,
-#define Z_IS_2713_EQ_2713(...) \,
-#define Z_IS_2714_EQ_2714(...) \,
-#define Z_IS_2715_EQ_2715(...) \,
-#define Z_IS_2716_EQ_2716(...) \,
-#define Z_IS_2717_EQ_2717(...) \,
-#define Z_IS_2718_EQ_2718(...) \,
-#define Z_IS_2719_EQ_2719(...) \,
-#define Z_IS_2720_EQ_2720(...) \,
-#define Z_IS_2721_EQ_2721(...) \,
-#define Z_IS_2722_EQ_2722(...) \,
-#define Z_IS_2723_EQ_2723(...) \,
-#define Z_IS_2724_EQ_2724(...) \,
-#define Z_IS_2725_EQ_2725(...) \,
-#define Z_IS_2726_EQ_2726(...) \,
-#define Z_IS_2727_EQ_2727(...) \,
-#define Z_IS_2728_EQ_2728(...) \,
-#define Z_IS_2729_EQ_2729(...) \,
-#define Z_IS_2730_EQ_2730(...) \,
-#define Z_IS_2731_EQ_2731(...) \,
-#define Z_IS_2732_EQ_2732(...) \,
-#define Z_IS_2733_EQ_2733(...) \,
-#define Z_IS_2734_EQ_2734(...) \,
-#define Z_IS_2735_EQ_2735(...) \,
-#define Z_IS_2736_EQ_2736(...) \,
-#define Z_IS_2737_EQ_2737(...) \,
-#define Z_IS_2738_EQ_2738(...) \,
-#define Z_IS_2739_EQ_2739(...) \,
-#define Z_IS_2740_EQ_2740(...) \,
-#define Z_IS_2741_EQ_2741(...) \,
-#define Z_IS_2742_EQ_2742(...) \,
-#define Z_IS_2743_EQ_2743(...) \,
-#define Z_IS_2744_EQ_2744(...) \,
-#define Z_IS_2745_EQ_2745(...) \,
-#define Z_IS_2746_EQ_2746(...) \,
-#define Z_IS_2747_EQ_2747(...) \,
-#define Z_IS_2748_EQ_2748(...) \,
-#define Z_IS_2749_EQ_2749(...) \,
-#define Z_IS_2750_EQ_2750(...) \,
-#define Z_IS_2751_EQ_2751(...) \,
-#define Z_IS_2752_EQ_2752(...) \,
-#define Z_IS_2753_EQ_2753(...) \,
-#define Z_IS_2754_EQ_2754(...) \,
-#define Z_IS_2755_EQ_2755(...) \,
-#define Z_IS_2756_EQ_2756(...) \,
-#define Z_IS_2757_EQ_2757(...) \,
-#define Z_IS_2758_EQ_2758(...) \,
-#define Z_IS_2759_EQ_2759(...) \,
-#define Z_IS_2760_EQ_2760(...) \,
-#define Z_IS_2761_EQ_2761(...) \,
-#define Z_IS_2762_EQ_2762(...) \,
-#define Z_IS_2763_EQ_2763(...) \,
-#define Z_IS_2764_EQ_2764(...) \,
-#define Z_IS_2765_EQ_2765(...) \,
-#define Z_IS_2766_EQ_2766(...) \,
-#define Z_IS_2767_EQ_2767(...) \,
-#define Z_IS_2768_EQ_2768(...) \,
-#define Z_IS_2769_EQ_2769(...) \,
-#define Z_IS_2770_EQ_2770(...) \,
-#define Z_IS_2771_EQ_2771(...) \,
-#define Z_IS_2772_EQ_2772(...) \,
-#define Z_IS_2773_EQ_2773(...) \,
-#define Z_IS_2774_EQ_2774(...) \,
-#define Z_IS_2775_EQ_2775(...) \,
-#define Z_IS_2776_EQ_2776(...) \,
-#define Z_IS_2777_EQ_2777(...) \,
-#define Z_IS_2778_EQ_2778(...) \,
-#define Z_IS_2779_EQ_2779(...) \,
-#define Z_IS_2780_EQ_2780(...) \,
-#define Z_IS_2781_EQ_2781(...) \,
-#define Z_IS_2782_EQ_2782(...) \,
-#define Z_IS_2783_EQ_2783(...) \,
-#define Z_IS_2784_EQ_2784(...) \,
-#define Z_IS_2785_EQ_2785(...) \,
-#define Z_IS_2786_EQ_2786(...) \,
-#define Z_IS_2787_EQ_2787(...) \,
-#define Z_IS_2788_EQ_2788(...) \,
-#define Z_IS_2789_EQ_2789(...) \,
-#define Z_IS_2790_EQ_2790(...) \,
-#define Z_IS_2791_EQ_2791(...) \,
-#define Z_IS_2792_EQ_2792(...) \,
-#define Z_IS_2793_EQ_2793(...) \,
-#define Z_IS_2794_EQ_2794(...) \,
-#define Z_IS_2795_EQ_2795(...) \,
-#define Z_IS_2796_EQ_2796(...) \,
-#define Z_IS_2797_EQ_2797(...) \,
-#define Z_IS_2798_EQ_2798(...) \,
-#define Z_IS_2799_EQ_2799(...) \,
-#define Z_IS_2800_EQ_2800(...) \,
-#define Z_IS_2801_EQ_2801(...) \,
-#define Z_IS_2802_EQ_2802(...) \,
-#define Z_IS_2803_EQ_2803(...) \,
-#define Z_IS_2804_EQ_2804(...) \,
-#define Z_IS_2805_EQ_2805(...) \,
-#define Z_IS_2806_EQ_2806(...) \,
-#define Z_IS_2807_EQ_2807(...) \,
-#define Z_IS_2808_EQ_2808(...) \,
-#define Z_IS_2809_EQ_2809(...) \,
-#define Z_IS_2810_EQ_2810(...) \,
-#define Z_IS_2811_EQ_2811(...) \,
-#define Z_IS_2812_EQ_2812(...) \,
-#define Z_IS_2813_EQ_2813(...) \,
-#define Z_IS_2814_EQ_2814(...) \,
-#define Z_IS_2815_EQ_2815(...) \,
-#define Z_IS_2816_EQ_2816(...) \,
-#define Z_IS_2817_EQ_2817(...) \,
-#define Z_IS_2818_EQ_2818(...) \,
-#define Z_IS_2819_EQ_2819(...) \,
-#define Z_IS_2820_EQ_2820(...) \,
-#define Z_IS_2821_EQ_2821(...) \,
-#define Z_IS_2822_EQ_2822(...) \,
-#define Z_IS_2823_EQ_2823(...) \,
-#define Z_IS_2824_EQ_2824(...) \,
-#define Z_IS_2825_EQ_2825(...) \,
-#define Z_IS_2826_EQ_2826(...) \,
-#define Z_IS_2827_EQ_2827(...) \,
-#define Z_IS_2828_EQ_2828(...) \,
-#define Z_IS_2829_EQ_2829(...) \,
-#define Z_IS_2830_EQ_2830(...) \,
-#define Z_IS_2831_EQ_2831(...) \,
-#define Z_IS_2832_EQ_2832(...) \,
-#define Z_IS_2833_EQ_2833(...) \,
-#define Z_IS_2834_EQ_2834(...) \,
-#define Z_IS_2835_EQ_2835(...) \,
-#define Z_IS_2836_EQ_2836(...) \,
-#define Z_IS_2837_EQ_2837(...) \,
-#define Z_IS_2838_EQ_2838(...) \,
-#define Z_IS_2839_EQ_2839(...) \,
-#define Z_IS_2840_EQ_2840(...) \,
-#define Z_IS_2841_EQ_2841(...) \,
-#define Z_IS_2842_EQ_2842(...) \,
-#define Z_IS_2843_EQ_2843(...) \,
-#define Z_IS_2844_EQ_2844(...) \,
-#define Z_IS_2845_EQ_2845(...) \,
-#define Z_IS_2846_EQ_2846(...) \,
-#define Z_IS_2847_EQ_2847(...) \,
-#define Z_IS_2848_EQ_2848(...) \,
-#define Z_IS_2849_EQ_2849(...) \,
-#define Z_IS_2850_EQ_2850(...) \,
-#define Z_IS_2851_EQ_2851(...) \,
-#define Z_IS_2852_EQ_2852(...) \,
-#define Z_IS_2853_EQ_2853(...) \,
-#define Z_IS_2854_EQ_2854(...) \,
-#define Z_IS_2855_EQ_2855(...) \,
-#define Z_IS_2856_EQ_2856(...) \,
-#define Z_IS_2857_EQ_2857(...) \,
-#define Z_IS_2858_EQ_2858(...) \,
-#define Z_IS_2859_EQ_2859(...) \,
-#define Z_IS_2860_EQ_2860(...) \,
-#define Z_IS_2861_EQ_2861(...) \,
-#define Z_IS_2862_EQ_2862(...) \,
-#define Z_IS_2863_EQ_2863(...) \,
-#define Z_IS_2864_EQ_2864(...) \,
-#define Z_IS_2865_EQ_2865(...) \,
-#define Z_IS_2866_EQ_2866(...) \,
-#define Z_IS_2867_EQ_2867(...) \,
-#define Z_IS_2868_EQ_2868(...) \,
-#define Z_IS_2869_EQ_2869(...) \,
-#define Z_IS_2870_EQ_2870(...) \,
-#define Z_IS_2871_EQ_2871(...) \,
-#define Z_IS_2872_EQ_2872(...) \,
-#define Z_IS_2873_EQ_2873(...) \,
-#define Z_IS_2874_EQ_2874(...) \,
-#define Z_IS_2875_EQ_2875(...) \,
-#define Z_IS_2876_EQ_2876(...) \,
-#define Z_IS_2877_EQ_2877(...) \,
-#define Z_IS_2878_EQ_2878(...) \,
-#define Z_IS_2879_EQ_2879(...) \,
-#define Z_IS_2880_EQ_2880(...) \,
-#define Z_IS_2881_EQ_2881(...) \,
-#define Z_IS_2882_EQ_2882(...) \,
-#define Z_IS_2883_EQ_2883(...) \,
-#define Z_IS_2884_EQ_2884(...) \,
-#define Z_IS_2885_EQ_2885(...) \,
-#define Z_IS_2886_EQ_2886(...) \,
-#define Z_IS_2887_EQ_2887(...) \,
-#define Z_IS_2888_EQ_2888(...) \,
-#define Z_IS_2889_EQ_2889(...) \,
-#define Z_IS_2890_EQ_2890(...) \,
-#define Z_IS_2891_EQ_2891(...) \,
-#define Z_IS_2892_EQ_2892(...) \,
-#define Z_IS_2893_EQ_2893(...) \,
-#define Z_IS_2894_EQ_2894(...) \,
-#define Z_IS_2895_EQ_2895(...) \,
-#define Z_IS_2896_EQ_2896(...) \,
-#define Z_IS_2897_EQ_2897(...) \,
-#define Z_IS_2898_EQ_2898(...) \,
-#define Z_IS_2899_EQ_2899(...) \,
-#define Z_IS_2900_EQ_2900(...) \,
-#define Z_IS_2901_EQ_2901(...) \,
-#define Z_IS_2902_EQ_2902(...) \,
-#define Z_IS_2903_EQ_2903(...) \,
-#define Z_IS_2904_EQ_2904(...) \,
-#define Z_IS_2905_EQ_2905(...) \,
-#define Z_IS_2906_EQ_2906(...) \,
-#define Z_IS_2907_EQ_2907(...) \,
-#define Z_IS_2908_EQ_2908(...) \,
-#define Z_IS_2909_EQ_2909(...) \,
-#define Z_IS_2910_EQ_2910(...) \,
-#define Z_IS_2911_EQ_2911(...) \,
-#define Z_IS_2912_EQ_2912(...) \,
-#define Z_IS_2913_EQ_2913(...) \,
-#define Z_IS_2914_EQ_2914(...) \,
-#define Z_IS_2915_EQ_2915(...) \,
-#define Z_IS_2916_EQ_2916(...) \,
-#define Z_IS_2917_EQ_2917(...) \,
-#define Z_IS_2918_EQ_2918(...) \,
-#define Z_IS_2919_EQ_2919(...) \,
-#define Z_IS_2920_EQ_2920(...) \,
-#define Z_IS_2921_EQ_2921(...) \,
-#define Z_IS_2922_EQ_2922(...) \,
-#define Z_IS_2923_EQ_2923(...) \,
-#define Z_IS_2924_EQ_2924(...) \,
-#define Z_IS_2925_EQ_2925(...) \,
-#define Z_IS_2926_EQ_2926(...) \,
-#define Z_IS_2927_EQ_2927(...) \,
-#define Z_IS_2928_EQ_2928(...) \,
-#define Z_IS_2929_EQ_2929(...) \,
-#define Z_IS_2930_EQ_2930(...) \,
-#define Z_IS_2931_EQ_2931(...) \,
-#define Z_IS_2932_EQ_2932(...) \,
-#define Z_IS_2933_EQ_2933(...) \,
-#define Z_IS_2934_EQ_2934(...) \,
-#define Z_IS_2935_EQ_2935(...) \,
-#define Z_IS_2936_EQ_2936(...) \,
-#define Z_IS_2937_EQ_2937(...) \,
-#define Z_IS_2938_EQ_2938(...) \,
-#define Z_IS_2939_EQ_2939(...) \,
-#define Z_IS_2940_EQ_2940(...) \,
-#define Z_IS_2941_EQ_2941(...) \,
-#define Z_IS_2942_EQ_2942(...) \,
-#define Z_IS_2943_EQ_2943(...) \,
-#define Z_IS_2944_EQ_2944(...) \,
-#define Z_IS_2945_EQ_2945(...) \,
-#define Z_IS_2946_EQ_2946(...) \,
-#define Z_IS_2947_EQ_2947(...) \,
-#define Z_IS_2948_EQ_2948(...) \,
-#define Z_IS_2949_EQ_2949(...) \,
-#define Z_IS_2950_EQ_2950(...) \,
-#define Z_IS_2951_EQ_2951(...) \,
-#define Z_IS_2952_EQ_2952(...) \,
-#define Z_IS_2953_EQ_2953(...) \,
-#define Z_IS_2954_EQ_2954(...) \,
-#define Z_IS_2955_EQ_2955(...) \,
-#define Z_IS_2956_EQ_2956(...) \,
-#define Z_IS_2957_EQ_2957(...) \,
-#define Z_IS_2958_EQ_2958(...) \,
-#define Z_IS_2959_EQ_2959(...) \,
-#define Z_IS_2960_EQ_2960(...) \,
-#define Z_IS_2961_EQ_2961(...) \,
-#define Z_IS_2962_EQ_2962(...) \,
-#define Z_IS_2963_EQ_2963(...) \,
-#define Z_IS_2964_EQ_2964(...) \,
-#define Z_IS_2965_EQ_2965(...) \,
-#define Z_IS_2966_EQ_2966(...) \,
-#define Z_IS_2967_EQ_2967(...) \,
-#define Z_IS_2968_EQ_2968(...) \,
-#define Z_IS_2969_EQ_2969(...) \,
-#define Z_IS_2970_EQ_2970(...) \,
-#define Z_IS_2971_EQ_2971(...) \,
-#define Z_IS_2972_EQ_2972(...) \,
-#define Z_IS_2973_EQ_2973(...) \,
-#define Z_IS_2974_EQ_2974(...) \,
-#define Z_IS_2975_EQ_2975(...) \,
-#define Z_IS_2976_EQ_2976(...) \,
-#define Z_IS_2977_EQ_2977(...) \,
-#define Z_IS_2978_EQ_2978(...) \,
-#define Z_IS_2979_EQ_2979(...) \,
-#define Z_IS_2980_EQ_2980(...) \,
-#define Z_IS_2981_EQ_2981(...) \,
-#define Z_IS_2982_EQ_2982(...) \,
-#define Z_IS_2983_EQ_2983(...) \,
-#define Z_IS_2984_EQ_2984(...) \,
-#define Z_IS_2985_EQ_2985(...) \,
-#define Z_IS_2986_EQ_2986(...) \,
-#define Z_IS_2987_EQ_2987(...) \,
-#define Z_IS_2988_EQ_2988(...) \,
-#define Z_IS_2989_EQ_2989(...) \,
-#define Z_IS_2990_EQ_2990(...) \,
-#define Z_IS_2991_EQ_2991(...) \,
-#define Z_IS_2992_EQ_2992(...) \,
-#define Z_IS_2993_EQ_2993(...) \,
-#define Z_IS_2994_EQ_2994(...) \,
-#define Z_IS_2995_EQ_2995(...) \,
-#define Z_IS_2996_EQ_2996(...) \,
-#define Z_IS_2997_EQ_2997(...) \,
-#define Z_IS_2998_EQ_2998(...) \,
-#define Z_IS_2999_EQ_2999(...) \,
-#define Z_IS_3000_EQ_3000(...) \,
-#define Z_IS_3001_EQ_3001(...) \,
-#define Z_IS_3002_EQ_3002(...) \,
-#define Z_IS_3003_EQ_3003(...) \,
-#define Z_IS_3004_EQ_3004(...) \,
-#define Z_IS_3005_EQ_3005(...) \,
-#define Z_IS_3006_EQ_3006(...) \,
-#define Z_IS_3007_EQ_3007(...) \,
-#define Z_IS_3008_EQ_3008(...) \,
-#define Z_IS_3009_EQ_3009(...) \,
-#define Z_IS_3010_EQ_3010(...) \,
-#define Z_IS_3011_EQ_3011(...) \,
-#define Z_IS_3012_EQ_3012(...) \,
-#define Z_IS_3013_EQ_3013(...) \,
-#define Z_IS_3014_EQ_3014(...) \,
-#define Z_IS_3015_EQ_3015(...) \,
-#define Z_IS_3016_EQ_3016(...) \,
-#define Z_IS_3017_EQ_3017(...) \,
-#define Z_IS_3018_EQ_3018(...) \,
-#define Z_IS_3019_EQ_3019(...) \,
-#define Z_IS_3020_EQ_3020(...) \,
-#define Z_IS_3021_EQ_3021(...) \,
-#define Z_IS_3022_EQ_3022(...) \,
-#define Z_IS_3023_EQ_3023(...) \,
-#define Z_IS_3024_EQ_3024(...) \,
-#define Z_IS_3025_EQ_3025(...) \,
-#define Z_IS_3026_EQ_3026(...) \,
-#define Z_IS_3027_EQ_3027(...) \,
-#define Z_IS_3028_EQ_3028(...) \,
-#define Z_IS_3029_EQ_3029(...) \,
-#define Z_IS_3030_EQ_3030(...) \,
-#define Z_IS_3031_EQ_3031(...) \,
-#define Z_IS_3032_EQ_3032(...) \,
-#define Z_IS_3033_EQ_3033(...) \,
-#define Z_IS_3034_EQ_3034(...) \,
-#define Z_IS_3035_EQ_3035(...) \,
-#define Z_IS_3036_EQ_3036(...) \,
-#define Z_IS_3037_EQ_3037(...) \,
-#define Z_IS_3038_EQ_3038(...) \,
-#define Z_IS_3039_EQ_3039(...) \,
-#define Z_IS_3040_EQ_3040(...) \,
-#define Z_IS_3041_EQ_3041(...) \,
-#define Z_IS_3042_EQ_3042(...) \,
-#define Z_IS_3043_EQ_3043(...) \,
-#define Z_IS_3044_EQ_3044(...) \,
-#define Z_IS_3045_EQ_3045(...) \,
-#define Z_IS_3046_EQ_3046(...) \,
-#define Z_IS_3047_EQ_3047(...) \,
-#define Z_IS_3048_EQ_3048(...) \,
-#define Z_IS_3049_EQ_3049(...) \,
-#define Z_IS_3050_EQ_3050(...) \,
-#define Z_IS_3051_EQ_3051(...) \,
-#define Z_IS_3052_EQ_3052(...) \,
-#define Z_IS_3053_EQ_3053(...) \,
-#define Z_IS_3054_EQ_3054(...) \,
-#define Z_IS_3055_EQ_3055(...) \,
-#define Z_IS_3056_EQ_3056(...) \,
-#define Z_IS_3057_EQ_3057(...) \,
-#define Z_IS_3058_EQ_3058(...) \,
-#define Z_IS_3059_EQ_3059(...) \,
-#define Z_IS_3060_EQ_3060(...) \,
-#define Z_IS_3061_EQ_3061(...) \,
-#define Z_IS_3062_EQ_3062(...) \,
-#define Z_IS_3063_EQ_3063(...) \,
-#define Z_IS_3064_EQ_3064(...) \,
-#define Z_IS_3065_EQ_3065(...) \,
-#define Z_IS_3066_EQ_3066(...) \,
-#define Z_IS_3067_EQ_3067(...) \,
-#define Z_IS_3068_EQ_3068(...) \,
-#define Z_IS_3069_EQ_3069(...) \,
-#define Z_IS_3070_EQ_3070(...) \,
-#define Z_IS_3071_EQ_3071(...) \,
-#define Z_IS_3072_EQ_3072(...) \,
-#define Z_IS_3073_EQ_3073(...) \,
-#define Z_IS_3074_EQ_3074(...) \,
-#define Z_IS_3075_EQ_3075(...) \,
-#define Z_IS_3076_EQ_3076(...) \,
-#define Z_IS_3077_EQ_3077(...) \,
-#define Z_IS_3078_EQ_3078(...) \,
-#define Z_IS_3079_EQ_3079(...) \,
-#define Z_IS_3080_EQ_3080(...) \,
-#define Z_IS_3081_EQ_3081(...) \,
-#define Z_IS_3082_EQ_3082(...) \,
-#define Z_IS_3083_EQ_3083(...) \,
-#define Z_IS_3084_EQ_3084(...) \,
-#define Z_IS_3085_EQ_3085(...) \,
-#define Z_IS_3086_EQ_3086(...) \,
-#define Z_IS_3087_EQ_3087(...) \,
-#define Z_IS_3088_EQ_3088(...) \,
-#define Z_IS_3089_EQ_3089(...) \,
-#define Z_IS_3090_EQ_3090(...) \,
-#define Z_IS_3091_EQ_3091(...) \,
-#define Z_IS_3092_EQ_3092(...) \,
-#define Z_IS_3093_EQ_3093(...) \,
-#define Z_IS_3094_EQ_3094(...) \,
-#define Z_IS_3095_EQ_3095(...) \,
-#define Z_IS_3096_EQ_3096(...) \,
-#define Z_IS_3097_EQ_3097(...) \,
-#define Z_IS_3098_EQ_3098(...) \,
-#define Z_IS_3099_EQ_3099(...) \,
-#define Z_IS_3100_EQ_3100(...) \,
-#define Z_IS_3101_EQ_3101(...) \,
-#define Z_IS_3102_EQ_3102(...) \,
-#define Z_IS_3103_EQ_3103(...) \,
-#define Z_IS_3104_EQ_3104(...) \,
-#define Z_IS_3105_EQ_3105(...) \,
-#define Z_IS_3106_EQ_3106(...) \,
-#define Z_IS_3107_EQ_3107(...) \,
-#define Z_IS_3108_EQ_3108(...) \,
-#define Z_IS_3109_EQ_3109(...) \,
-#define Z_IS_3110_EQ_3110(...) \,
-#define Z_IS_3111_EQ_3111(...) \,
-#define Z_IS_3112_EQ_3112(...) \,
-#define Z_IS_3113_EQ_3113(...) \,
-#define Z_IS_3114_EQ_3114(...) \,
-#define Z_IS_3115_EQ_3115(...) \,
-#define Z_IS_3116_EQ_3116(...) \,
-#define Z_IS_3117_EQ_3117(...) \,
-#define Z_IS_3118_EQ_3118(...) \,
-#define Z_IS_3119_EQ_3119(...) \,
-#define Z_IS_3120_EQ_3120(...) \,
-#define Z_IS_3121_EQ_3121(...) \,
-#define Z_IS_3122_EQ_3122(...) \,
-#define Z_IS_3123_EQ_3123(...) \,
-#define Z_IS_3124_EQ_3124(...) \,
-#define Z_IS_3125_EQ_3125(...) \,
-#define Z_IS_3126_EQ_3126(...) \,
-#define Z_IS_3127_EQ_3127(...) \,
-#define Z_IS_3128_EQ_3128(...) \,
-#define Z_IS_3129_EQ_3129(...) \,
-#define Z_IS_3130_EQ_3130(...) \,
-#define Z_IS_3131_EQ_3131(...) \,
-#define Z_IS_3132_EQ_3132(...) \,
-#define Z_IS_3133_EQ_3133(...) \,
-#define Z_IS_3134_EQ_3134(...) \,
-#define Z_IS_3135_EQ_3135(...) \,
-#define Z_IS_3136_EQ_3136(...) \,
-#define Z_IS_3137_EQ_3137(...) \,
-#define Z_IS_3138_EQ_3138(...) \,
-#define Z_IS_3139_EQ_3139(...) \,
-#define Z_IS_3140_EQ_3140(...) \,
-#define Z_IS_3141_EQ_3141(...) \,
-#define Z_IS_3142_EQ_3142(...) \,
-#define Z_IS_3143_EQ_3143(...) \,
-#define Z_IS_3144_EQ_3144(...) \,
-#define Z_IS_3145_EQ_3145(...) \,
-#define Z_IS_3146_EQ_3146(...) \,
-#define Z_IS_3147_EQ_3147(...) \,
-#define Z_IS_3148_EQ_3148(...) \,
-#define Z_IS_3149_EQ_3149(...) \,
-#define Z_IS_3150_EQ_3150(...) \,
-#define Z_IS_3151_EQ_3151(...) \,
-#define Z_IS_3152_EQ_3152(...) \,
-#define Z_IS_3153_EQ_3153(...) \,
-#define Z_IS_3154_EQ_3154(...) \,
-#define Z_IS_3155_EQ_3155(...) \,
-#define Z_IS_3156_EQ_3156(...) \,
-#define Z_IS_3157_EQ_3157(...) \,
-#define Z_IS_3158_EQ_3158(...) \,
-#define Z_IS_3159_EQ_3159(...) \,
-#define Z_IS_3160_EQ_3160(...) \,
-#define Z_IS_3161_EQ_3161(...) \,
-#define Z_IS_3162_EQ_3162(...) \,
-#define Z_IS_3163_EQ_3163(...) \,
-#define Z_IS_3164_EQ_3164(...) \,
-#define Z_IS_3165_EQ_3165(...) \,
-#define Z_IS_3166_EQ_3166(...) \,
-#define Z_IS_3167_EQ_3167(...) \,
-#define Z_IS_3168_EQ_3168(...) \,
-#define Z_IS_3169_EQ_3169(...) \,
-#define Z_IS_3170_EQ_3170(...) \,
-#define Z_IS_3171_EQ_3171(...) \,
-#define Z_IS_3172_EQ_3172(...) \,
-#define Z_IS_3173_EQ_3173(...) \,
-#define Z_IS_3174_EQ_3174(...) \,
-#define Z_IS_3175_EQ_3175(...) \,
-#define Z_IS_3176_EQ_3176(...) \,
-#define Z_IS_3177_EQ_3177(...) \,
-#define Z_IS_3178_EQ_3178(...) \,
-#define Z_IS_3179_EQ_3179(...) \,
-#define Z_IS_3180_EQ_3180(...) \,
-#define Z_IS_3181_EQ_3181(...) \,
-#define Z_IS_3182_EQ_3182(...) \,
-#define Z_IS_3183_EQ_3183(...) \,
-#define Z_IS_3184_EQ_3184(...) \,
-#define Z_IS_3185_EQ_3185(...) \,
-#define Z_IS_3186_EQ_3186(...) \,
-#define Z_IS_3187_EQ_3187(...) \,
-#define Z_IS_3188_EQ_3188(...) \,
-#define Z_IS_3189_EQ_3189(...) \,
-#define Z_IS_3190_EQ_3190(...) \,
-#define Z_IS_3191_EQ_3191(...) \,
-#define Z_IS_3192_EQ_3192(...) \,
-#define Z_IS_3193_EQ_3193(...) \,
-#define Z_IS_3194_EQ_3194(...) \,
-#define Z_IS_3195_EQ_3195(...) \,
-#define Z_IS_3196_EQ_3196(...) \,
-#define Z_IS_3197_EQ_3197(...) \,
-#define Z_IS_3198_EQ_3198(...) \,
-#define Z_IS_3199_EQ_3199(...) \,
-#define Z_IS_3200_EQ_3200(...) \,
-#define Z_IS_3201_EQ_3201(...) \,
-#define Z_IS_3202_EQ_3202(...) \,
-#define Z_IS_3203_EQ_3203(...) \,
-#define Z_IS_3204_EQ_3204(...) \,
-#define Z_IS_3205_EQ_3205(...) \,
-#define Z_IS_3206_EQ_3206(...) \,
-#define Z_IS_3207_EQ_3207(...) \,
-#define Z_IS_3208_EQ_3208(...) \,
-#define Z_IS_3209_EQ_3209(...) \,
-#define Z_IS_3210_EQ_3210(...) \,
-#define Z_IS_3211_EQ_3211(...) \,
-#define Z_IS_3212_EQ_3212(...) \,
-#define Z_IS_3213_EQ_3213(...) \,
-#define Z_IS_3214_EQ_3214(...) \,
-#define Z_IS_3215_EQ_3215(...) \,
-#define Z_IS_3216_EQ_3216(...) \,
-#define Z_IS_3217_EQ_3217(...) \,
-#define Z_IS_3218_EQ_3218(...) \,
-#define Z_IS_3219_EQ_3219(...) \,
-#define Z_IS_3220_EQ_3220(...) \,
-#define Z_IS_3221_EQ_3221(...) \,
-#define Z_IS_3222_EQ_3222(...) \,
-#define Z_IS_3223_EQ_3223(...) \,
-#define Z_IS_3224_EQ_3224(...) \,
-#define Z_IS_3225_EQ_3225(...) \,
-#define Z_IS_3226_EQ_3226(...) \,
-#define Z_IS_3227_EQ_3227(...) \,
-#define Z_IS_3228_EQ_3228(...) \,
-#define Z_IS_3229_EQ_3229(...) \,
-#define Z_IS_3230_EQ_3230(...) \,
-#define Z_IS_3231_EQ_3231(...) \,
-#define Z_IS_3232_EQ_3232(...) \,
-#define Z_IS_3233_EQ_3233(...) \,
-#define Z_IS_3234_EQ_3234(...) \,
-#define Z_IS_3235_EQ_3235(...) \,
-#define Z_IS_3236_EQ_3236(...) \,
-#define Z_IS_3237_EQ_3237(...) \,
-#define Z_IS_3238_EQ_3238(...) \,
-#define Z_IS_3239_EQ_3239(...) \,
-#define Z_IS_3240_EQ_3240(...) \,
-#define Z_IS_3241_EQ_3241(...) \,
-#define Z_IS_3242_EQ_3242(...) \,
-#define Z_IS_3243_EQ_3243(...) \,
-#define Z_IS_3244_EQ_3244(...) \,
-#define Z_IS_3245_EQ_3245(...) \,
-#define Z_IS_3246_EQ_3246(...) \,
-#define Z_IS_3247_EQ_3247(...) \,
-#define Z_IS_3248_EQ_3248(...) \,
-#define Z_IS_3249_EQ_3249(...) \,
-#define Z_IS_3250_EQ_3250(...) \,
-#define Z_IS_3251_EQ_3251(...) \,
-#define Z_IS_3252_EQ_3252(...) \,
-#define Z_IS_3253_EQ_3253(...) \,
-#define Z_IS_3254_EQ_3254(...) \,
-#define Z_IS_3255_EQ_3255(...) \,
-#define Z_IS_3256_EQ_3256(...) \,
-#define Z_IS_3257_EQ_3257(...) \,
-#define Z_IS_3258_EQ_3258(...) \,
-#define Z_IS_3259_EQ_3259(...) \,
-#define Z_IS_3260_EQ_3260(...) \,
-#define Z_IS_3261_EQ_3261(...) \,
-#define Z_IS_3262_EQ_3262(...) \,
-#define Z_IS_3263_EQ_3263(...) \,
-#define Z_IS_3264_EQ_3264(...) \,
-#define Z_IS_3265_EQ_3265(...) \,
-#define Z_IS_3266_EQ_3266(...) \,
-#define Z_IS_3267_EQ_3267(...) \,
-#define Z_IS_3268_EQ_3268(...) \,
-#define Z_IS_3269_EQ_3269(...) \,
-#define Z_IS_3270_EQ_3270(...) \,
-#define Z_IS_3271_EQ_3271(...) \,
-#define Z_IS_3272_EQ_3272(...) \,
-#define Z_IS_3273_EQ_3273(...) \,
-#define Z_IS_3274_EQ_3274(...) \,
-#define Z_IS_3275_EQ_3275(...) \,
-#define Z_IS_3276_EQ_3276(...) \,
-#define Z_IS_3277_EQ_3277(...) \,
-#define Z_IS_3278_EQ_3278(...) \,
-#define Z_IS_3279_EQ_3279(...) \,
-#define Z_IS_3280_EQ_3280(...) \,
-#define Z_IS_3281_EQ_3281(...) \,
-#define Z_IS_3282_EQ_3282(...) \,
-#define Z_IS_3283_EQ_3283(...) \,
-#define Z_IS_3284_EQ_3284(...) \,
-#define Z_IS_3285_EQ_3285(...) \,
-#define Z_IS_3286_EQ_3286(...) \,
-#define Z_IS_3287_EQ_3287(...) \,
-#define Z_IS_3288_EQ_3288(...) \,
-#define Z_IS_3289_EQ_3289(...) \,
-#define Z_IS_3290_EQ_3290(...) \,
-#define Z_IS_3291_EQ_3291(...) \,
-#define Z_IS_3292_EQ_3292(...) \,
-#define Z_IS_3293_EQ_3293(...) \,
-#define Z_IS_3294_EQ_3294(...) \,
-#define Z_IS_3295_EQ_3295(...) \,
-#define Z_IS_3296_EQ_3296(...) \,
-#define Z_IS_3297_EQ_3297(...) \,
-#define Z_IS_3298_EQ_3298(...) \,
-#define Z_IS_3299_EQ_3299(...) \,
-#define Z_IS_3300_EQ_3300(...) \,
-#define Z_IS_3301_EQ_3301(...) \,
-#define Z_IS_3302_EQ_3302(...) \,
-#define Z_IS_3303_EQ_3303(...) \,
-#define Z_IS_3304_EQ_3304(...) \,
-#define Z_IS_3305_EQ_3305(...) \,
-#define Z_IS_3306_EQ_3306(...) \,
-#define Z_IS_3307_EQ_3307(...) \,
-#define Z_IS_3308_EQ_3308(...) \,
-#define Z_IS_3309_EQ_3309(...) \,
-#define Z_IS_3310_EQ_3310(...) \,
-#define Z_IS_3311_EQ_3311(...) \,
-#define Z_IS_3312_EQ_3312(...) \,
-#define Z_IS_3313_EQ_3313(...) \,
-#define Z_IS_3314_EQ_3314(...) \,
-#define Z_IS_3315_EQ_3315(...) \,
-#define Z_IS_3316_EQ_3316(...) \,
-#define Z_IS_3317_EQ_3317(...) \,
-#define Z_IS_3318_EQ_3318(...) \,
-#define Z_IS_3319_EQ_3319(...) \,
-#define Z_IS_3320_EQ_3320(...) \,
-#define Z_IS_3321_EQ_3321(...) \,
-#define Z_IS_3322_EQ_3322(...) \,
-#define Z_IS_3323_EQ_3323(...) \,
-#define Z_IS_3324_EQ_3324(...) \,
-#define Z_IS_3325_EQ_3325(...) \,
-#define Z_IS_3326_EQ_3326(...) \,
-#define Z_IS_3327_EQ_3327(...) \,
-#define Z_IS_3328_EQ_3328(...) \,
-#define Z_IS_3329_EQ_3329(...) \,
-#define Z_IS_3330_EQ_3330(...) \,
-#define Z_IS_3331_EQ_3331(...) \,
-#define Z_IS_3332_EQ_3332(...) \,
-#define Z_IS_3333_EQ_3333(...) \,
-#define Z_IS_3334_EQ_3334(...) \,
-#define Z_IS_3335_EQ_3335(...) \,
-#define Z_IS_3336_EQ_3336(...) \,
-#define Z_IS_3337_EQ_3337(...) \,
-#define Z_IS_3338_EQ_3338(...) \,
-#define Z_IS_3339_EQ_3339(...) \,
-#define Z_IS_3340_EQ_3340(...) \,
-#define Z_IS_3341_EQ_3341(...) \,
-#define Z_IS_3342_EQ_3342(...) \,
-#define Z_IS_3343_EQ_3343(...) \,
-#define Z_IS_3344_EQ_3344(...) \,
-#define Z_IS_3345_EQ_3345(...) \,
-#define Z_IS_3346_EQ_3346(...) \,
-#define Z_IS_3347_EQ_3347(...) \,
-#define Z_IS_3348_EQ_3348(...) \,
-#define Z_IS_3349_EQ_3349(...) \,
-#define Z_IS_3350_EQ_3350(...) \,
-#define Z_IS_3351_EQ_3351(...) \,
-#define Z_IS_3352_EQ_3352(...) \,
-#define Z_IS_3353_EQ_3353(...) \,
-#define Z_IS_3354_EQ_3354(...) \,
-#define Z_IS_3355_EQ_3355(...) \,
-#define Z_IS_3356_EQ_3356(...) \,
-#define Z_IS_3357_EQ_3357(...) \,
-#define Z_IS_3358_EQ_3358(...) \,
-#define Z_IS_3359_EQ_3359(...) \,
-#define Z_IS_3360_EQ_3360(...) \,
-#define Z_IS_3361_EQ_3361(...) \,
-#define Z_IS_3362_EQ_3362(...) \,
-#define Z_IS_3363_EQ_3363(...) \,
-#define Z_IS_3364_EQ_3364(...) \,
-#define Z_IS_3365_EQ_3365(...) \,
-#define Z_IS_3366_EQ_3366(...) \,
-#define Z_IS_3367_EQ_3367(...) \,
-#define Z_IS_3368_EQ_3368(...) \,
-#define Z_IS_3369_EQ_3369(...) \,
-#define Z_IS_3370_EQ_3370(...) \,
-#define Z_IS_3371_EQ_3371(...) \,
-#define Z_IS_3372_EQ_3372(...) \,
-#define Z_IS_3373_EQ_3373(...) \,
-#define Z_IS_3374_EQ_3374(...) \,
-#define Z_IS_3375_EQ_3375(...) \,
-#define Z_IS_3376_EQ_3376(...) \,
-#define Z_IS_3377_EQ_3377(...) \,
-#define Z_IS_3378_EQ_3378(...) \,
-#define Z_IS_3379_EQ_3379(...) \,
-#define Z_IS_3380_EQ_3380(...) \,
-#define Z_IS_3381_EQ_3381(...) \,
-#define Z_IS_3382_EQ_3382(...) \,
-#define Z_IS_3383_EQ_3383(...) \,
-#define Z_IS_3384_EQ_3384(...) \,
-#define Z_IS_3385_EQ_3385(...) \,
-#define Z_IS_3386_EQ_3386(...) \,
-#define Z_IS_3387_EQ_3387(...) \,
-#define Z_IS_3388_EQ_3388(...) \,
-#define Z_IS_3389_EQ_3389(...) \,
-#define Z_IS_3390_EQ_3390(...) \,
-#define Z_IS_3391_EQ_3391(...) \,
-#define Z_IS_3392_EQ_3392(...) \,
-#define Z_IS_3393_EQ_3393(...) \,
-#define Z_IS_3394_EQ_3394(...) \,
-#define Z_IS_3395_EQ_3395(...) \,
-#define Z_IS_3396_EQ_3396(...) \,
-#define Z_IS_3397_EQ_3397(...) \,
-#define Z_IS_3398_EQ_3398(...) \,
-#define Z_IS_3399_EQ_3399(...) \,
-#define Z_IS_3400_EQ_3400(...) \,
-#define Z_IS_3401_EQ_3401(...) \,
-#define Z_IS_3402_EQ_3402(...) \,
-#define Z_IS_3403_EQ_3403(...) \,
-#define Z_IS_3404_EQ_3404(...) \,
-#define Z_IS_3405_EQ_3405(...) \,
-#define Z_IS_3406_EQ_3406(...) \,
-#define Z_IS_3407_EQ_3407(...) \,
-#define Z_IS_3408_EQ_3408(...) \,
-#define Z_IS_3409_EQ_3409(...) \,
-#define Z_IS_3410_EQ_3410(...) \,
-#define Z_IS_3411_EQ_3411(...) \,
-#define Z_IS_3412_EQ_3412(...) \,
-#define Z_IS_3413_EQ_3413(...) \,
-#define Z_IS_3414_EQ_3414(...) \,
-#define Z_IS_3415_EQ_3415(...) \,
-#define Z_IS_3416_EQ_3416(...) \,
-#define Z_IS_3417_EQ_3417(...) \,
-#define Z_IS_3418_EQ_3418(...) \,
-#define Z_IS_3419_EQ_3419(...) \,
-#define Z_IS_3420_EQ_3420(...) \,
-#define Z_IS_3421_EQ_3421(...) \,
-#define Z_IS_3422_EQ_3422(...) \,
-#define Z_IS_3423_EQ_3423(...) \,
-#define Z_IS_3424_EQ_3424(...) \,
-#define Z_IS_3425_EQ_3425(...) \,
-#define Z_IS_3426_EQ_3426(...) \,
-#define Z_IS_3427_EQ_3427(...) \,
-#define Z_IS_3428_EQ_3428(...) \,
-#define Z_IS_3429_EQ_3429(...) \,
-#define Z_IS_3430_EQ_3430(...) \,
-#define Z_IS_3431_EQ_3431(...) \,
-#define Z_IS_3432_EQ_3432(...) \,
-#define Z_IS_3433_EQ_3433(...) \,
-#define Z_IS_3434_EQ_3434(...) \,
-#define Z_IS_3435_EQ_3435(...) \,
-#define Z_IS_3436_EQ_3436(...) \,
-#define Z_IS_3437_EQ_3437(...) \,
-#define Z_IS_3438_EQ_3438(...) \,
-#define Z_IS_3439_EQ_3439(...) \,
-#define Z_IS_3440_EQ_3440(...) \,
-#define Z_IS_3441_EQ_3441(...) \,
-#define Z_IS_3442_EQ_3442(...) \,
-#define Z_IS_3443_EQ_3443(...) \,
-#define Z_IS_3444_EQ_3444(...) \,
-#define Z_IS_3445_EQ_3445(...) \,
-#define Z_IS_3446_EQ_3446(...) \,
-#define Z_IS_3447_EQ_3447(...) \,
-#define Z_IS_3448_EQ_3448(...) \,
-#define Z_IS_3449_EQ_3449(...) \,
-#define Z_IS_3450_EQ_3450(...) \,
-#define Z_IS_3451_EQ_3451(...) \,
-#define Z_IS_3452_EQ_3452(...) \,
-#define Z_IS_3453_EQ_3453(...) \,
-#define Z_IS_3454_EQ_3454(...) \,
-#define Z_IS_3455_EQ_3455(...) \,
-#define Z_IS_3456_EQ_3456(...) \,
-#define Z_IS_3457_EQ_3457(...) \,
-#define Z_IS_3458_EQ_3458(...) \,
-#define Z_IS_3459_EQ_3459(...) \,
-#define Z_IS_3460_EQ_3460(...) \,
-#define Z_IS_3461_EQ_3461(...) \,
-#define Z_IS_3462_EQ_3462(...) \,
-#define Z_IS_3463_EQ_3463(...) \,
-#define Z_IS_3464_EQ_3464(...) \,
-#define Z_IS_3465_EQ_3465(...) \,
-#define Z_IS_3466_EQ_3466(...) \,
-#define Z_IS_3467_EQ_3467(...) \,
-#define Z_IS_3468_EQ_3468(...) \,
-#define Z_IS_3469_EQ_3469(...) \,
-#define Z_IS_3470_EQ_3470(...) \,
-#define Z_IS_3471_EQ_3471(...) \,
-#define Z_IS_3472_EQ_3472(...) \,
-#define Z_IS_3473_EQ_3473(...) \,
-#define Z_IS_3474_EQ_3474(...) \,
-#define Z_IS_3475_EQ_3475(...) \,
-#define Z_IS_3476_EQ_3476(...) \,
-#define Z_IS_3477_EQ_3477(...) \,
-#define Z_IS_3478_EQ_3478(...) \,
-#define Z_IS_3479_EQ_3479(...) \,
-#define Z_IS_3480_EQ_3480(...) \,
-#define Z_IS_3481_EQ_3481(...) \,
-#define Z_IS_3482_EQ_3482(...) \,
-#define Z_IS_3483_EQ_3483(...) \,
-#define Z_IS_3484_EQ_3484(...) \,
-#define Z_IS_3485_EQ_3485(...) \,
-#define Z_IS_3486_EQ_3486(...) \,
-#define Z_IS_3487_EQ_3487(...) \,
-#define Z_IS_3488_EQ_3488(...) \,
-#define Z_IS_3489_EQ_3489(...) \,
-#define Z_IS_3490_EQ_3490(...) \,
-#define Z_IS_3491_EQ_3491(...) \,
-#define Z_IS_3492_EQ_3492(...) \,
-#define Z_IS_3493_EQ_3493(...) \,
-#define Z_IS_3494_EQ_3494(...) \,
-#define Z_IS_3495_EQ_3495(...) \,
-#define Z_IS_3496_EQ_3496(...) \,
-#define Z_IS_3497_EQ_3497(...) \,
-#define Z_IS_3498_EQ_3498(...) \,
-#define Z_IS_3499_EQ_3499(...) \,
-#define Z_IS_3500_EQ_3500(...) \,
-#define Z_IS_3501_EQ_3501(...) \,
-#define Z_IS_3502_EQ_3502(...) \,
-#define Z_IS_3503_EQ_3503(...) \,
-#define Z_IS_3504_EQ_3504(...) \,
-#define Z_IS_3505_EQ_3505(...) \,
-#define Z_IS_3506_EQ_3506(...) \,
-#define Z_IS_3507_EQ_3507(...) \,
-#define Z_IS_3508_EQ_3508(...) \,
-#define Z_IS_3509_EQ_3509(...) \,
-#define Z_IS_3510_EQ_3510(...) \,
-#define Z_IS_3511_EQ_3511(...) \,
-#define Z_IS_3512_EQ_3512(...) \,
-#define Z_IS_3513_EQ_3513(...) \,
-#define Z_IS_3514_EQ_3514(...) \,
-#define Z_IS_3515_EQ_3515(...) \,
-#define Z_IS_3516_EQ_3516(...) \,
-#define Z_IS_3517_EQ_3517(...) \,
-#define Z_IS_3518_EQ_3518(...) \,
-#define Z_IS_3519_EQ_3519(...) \,
-#define Z_IS_3520_EQ_3520(...) \,
-#define Z_IS_3521_EQ_3521(...) \,
-#define Z_IS_3522_EQ_3522(...) \,
-#define Z_IS_3523_EQ_3523(...) \,
-#define Z_IS_3524_EQ_3524(...) \,
-#define Z_IS_3525_EQ_3525(...) \,
-#define Z_IS_3526_EQ_3526(...) \,
-#define Z_IS_3527_EQ_3527(...) \,
-#define Z_IS_3528_EQ_3528(...) \,
-#define Z_IS_3529_EQ_3529(...) \,
-#define Z_IS_3530_EQ_3530(...) \,
-#define Z_IS_3531_EQ_3531(...) \,
-#define Z_IS_3532_EQ_3532(...) \,
-#define Z_IS_3533_EQ_3533(...) \,
-#define Z_IS_3534_EQ_3534(...) \,
-#define Z_IS_3535_EQ_3535(...) \,
-#define Z_IS_3536_EQ_3536(...) \,
-#define Z_IS_3537_EQ_3537(...) \,
-#define Z_IS_3538_EQ_3538(...) \,
-#define Z_IS_3539_EQ_3539(...) \,
-#define Z_IS_3540_EQ_3540(...) \,
-#define Z_IS_3541_EQ_3541(...) \,
-#define Z_IS_3542_EQ_3542(...) \,
-#define Z_IS_3543_EQ_3543(...) \,
-#define Z_IS_3544_EQ_3544(...) \,
-#define Z_IS_3545_EQ_3545(...) \,
-#define Z_IS_3546_EQ_3546(...) \,
-#define Z_IS_3547_EQ_3547(...) \,
-#define Z_IS_3548_EQ_3548(...) \,
-#define Z_IS_3549_EQ_3549(...) \,
-#define Z_IS_3550_EQ_3550(...) \,
-#define Z_IS_3551_EQ_3551(...) \,
-#define Z_IS_3552_EQ_3552(...) \,
-#define Z_IS_3553_EQ_3553(...) \,
-#define Z_IS_3554_EQ_3554(...) \,
-#define Z_IS_3555_EQ_3555(...) \,
-#define Z_IS_3556_EQ_3556(...) \,
-#define Z_IS_3557_EQ_3557(...) \,
-#define Z_IS_3558_EQ_3558(...) \,
-#define Z_IS_3559_EQ_3559(...) \,
-#define Z_IS_3560_EQ_3560(...) \,
-#define Z_IS_3561_EQ_3561(...) \,
-#define Z_IS_3562_EQ_3562(...) \,
-#define Z_IS_3563_EQ_3563(...) \,
-#define Z_IS_3564_EQ_3564(...) \,
-#define Z_IS_3565_EQ_3565(...) \,
-#define Z_IS_3566_EQ_3566(...) \,
-#define Z_IS_3567_EQ_3567(...) \,
-#define Z_IS_3568_EQ_3568(...) \,
-#define Z_IS_3569_EQ_3569(...) \,
-#define Z_IS_3570_EQ_3570(...) \,
-#define Z_IS_3571_EQ_3571(...) \,
-#define Z_IS_3572_EQ_3572(...) \,
-#define Z_IS_3573_EQ_3573(...) \,
-#define Z_IS_3574_EQ_3574(...) \,
-#define Z_IS_3575_EQ_3575(...) \,
-#define Z_IS_3576_EQ_3576(...) \,
-#define Z_IS_3577_EQ_3577(...) \,
-#define Z_IS_3578_EQ_3578(...) \,
-#define Z_IS_3579_EQ_3579(...) \,
-#define Z_IS_3580_EQ_3580(...) \,
-#define Z_IS_3581_EQ_3581(...) \,
-#define Z_IS_3582_EQ_3582(...) \,
-#define Z_IS_3583_EQ_3583(...) \,
-#define Z_IS_3584_EQ_3584(...) \,
-#define Z_IS_3585_EQ_3585(...) \,
-#define Z_IS_3586_EQ_3586(...) \,
-#define Z_IS_3587_EQ_3587(...) \,
-#define Z_IS_3588_EQ_3588(...) \,
-#define Z_IS_3589_EQ_3589(...) \,
-#define Z_IS_3590_EQ_3590(...) \,
-#define Z_IS_3591_EQ_3591(...) \,
-#define Z_IS_3592_EQ_3592(...) \,
-#define Z_IS_3593_EQ_3593(...) \,
-#define Z_IS_3594_EQ_3594(...) \,
-#define Z_IS_3595_EQ_3595(...) \,
-#define Z_IS_3596_EQ_3596(...) \,
-#define Z_IS_3597_EQ_3597(...) \,
-#define Z_IS_3598_EQ_3598(...) \,
-#define Z_IS_3599_EQ_3599(...) \,
-#define Z_IS_3600_EQ_3600(...) \,
-#define Z_IS_3601_EQ_3601(...) \,
-#define Z_IS_3602_EQ_3602(...) \,
-#define Z_IS_3603_EQ_3603(...) \,
-#define Z_IS_3604_EQ_3604(...) \,
-#define Z_IS_3605_EQ_3605(...) \,
-#define Z_IS_3606_EQ_3606(...) \,
-#define Z_IS_3607_EQ_3607(...) \,
-#define Z_IS_3608_EQ_3608(...) \,
-#define Z_IS_3609_EQ_3609(...) \,
-#define Z_IS_3610_EQ_3610(...) \,
-#define Z_IS_3611_EQ_3611(...) \,
-#define Z_IS_3612_EQ_3612(...) \,
-#define Z_IS_3613_EQ_3613(...) \,
-#define Z_IS_3614_EQ_3614(...) \,
-#define Z_IS_3615_EQ_3615(...) \,
-#define Z_IS_3616_EQ_3616(...) \,
-#define Z_IS_3617_EQ_3617(...) \,
-#define Z_IS_3618_EQ_3618(...) \,
-#define Z_IS_3619_EQ_3619(...) \,
-#define Z_IS_3620_EQ_3620(...) \,
-#define Z_IS_3621_EQ_3621(...) \,
-#define Z_IS_3622_EQ_3622(...) \,
-#define Z_IS_3623_EQ_3623(...) \,
-#define Z_IS_3624_EQ_3624(...) \,
-#define Z_IS_3625_EQ_3625(...) \,
-#define Z_IS_3626_EQ_3626(...) \,
-#define Z_IS_3627_EQ_3627(...) \,
-#define Z_IS_3628_EQ_3628(...) \,
-#define Z_IS_3629_EQ_3629(...) \,
-#define Z_IS_3630_EQ_3630(...) \,
-#define Z_IS_3631_EQ_3631(...) \,
-#define Z_IS_3632_EQ_3632(...) \,
-#define Z_IS_3633_EQ_3633(...) \,
-#define Z_IS_3634_EQ_3634(...) \,
-#define Z_IS_3635_EQ_3635(...) \,
-#define Z_IS_3636_EQ_3636(...) \,
-#define Z_IS_3637_EQ_3637(...) \,
-#define Z_IS_3638_EQ_3638(...) \,
-#define Z_IS_3639_EQ_3639(...) \,
-#define Z_IS_3640_EQ_3640(...) \,
-#define Z_IS_3641_EQ_3641(...) \,
-#define Z_IS_3642_EQ_3642(...) \,
-#define Z_IS_3643_EQ_3643(...) \,
-#define Z_IS_3644_EQ_3644(...) \,
-#define Z_IS_3645_EQ_3645(...) \,
-#define Z_IS_3646_EQ_3646(...) \,
-#define Z_IS_3647_EQ_3647(...) \,
-#define Z_IS_3648_EQ_3648(...) \,
-#define Z_IS_3649_EQ_3649(...) \,
-#define Z_IS_3650_EQ_3650(...) \,
-#define Z_IS_3651_EQ_3651(...) \,
-#define Z_IS_3652_EQ_3652(...) \,
-#define Z_IS_3653_EQ_3653(...) \,
-#define Z_IS_3654_EQ_3654(...) \,
-#define Z_IS_3655_EQ_3655(...) \,
-#define Z_IS_3656_EQ_3656(...) \,
-#define Z_IS_3657_EQ_3657(...) \,
-#define Z_IS_3658_EQ_3658(...) \,
-#define Z_IS_3659_EQ_3659(...) \,
-#define Z_IS_3660_EQ_3660(...) \,
-#define Z_IS_3661_EQ_3661(...) \,
-#define Z_IS_3662_EQ_3662(...) \,
-#define Z_IS_3663_EQ_3663(...) \,
-#define Z_IS_3664_EQ_3664(...) \,
-#define Z_IS_3665_EQ_3665(...) \,
-#define Z_IS_3666_EQ_3666(...) \,
-#define Z_IS_3667_EQ_3667(...) \,
-#define Z_IS_3668_EQ_3668(...) \,
-#define Z_IS_3669_EQ_3669(...) \,
-#define Z_IS_3670_EQ_3670(...) \,
-#define Z_IS_3671_EQ_3671(...) \,
-#define Z_IS_3672_EQ_3672(...) \,
-#define Z_IS_3673_EQ_3673(...) \,
-#define Z_IS_3674_EQ_3674(...) \,
-#define Z_IS_3675_EQ_3675(...) \,
-#define Z_IS_3676_EQ_3676(...) \,
-#define Z_IS_3677_EQ_3677(...) \,
-#define Z_IS_3678_EQ_3678(...) \,
-#define Z_IS_3679_EQ_3679(...) \,
-#define Z_IS_3680_EQ_3680(...) \,
-#define Z_IS_3681_EQ_3681(...) \,
-#define Z_IS_3682_EQ_3682(...) \,
-#define Z_IS_3683_EQ_3683(...) \,
-#define Z_IS_3684_EQ_3684(...) \,
-#define Z_IS_3685_EQ_3685(...) \,
-#define Z_IS_3686_EQ_3686(...) \,
-#define Z_IS_3687_EQ_3687(...) \,
-#define Z_IS_3688_EQ_3688(...) \,
-#define Z_IS_3689_EQ_3689(...) \,
-#define Z_IS_3690_EQ_3690(...) \,
-#define Z_IS_3691_EQ_3691(...) \,
-#define Z_IS_3692_EQ_3692(...) \,
-#define Z_IS_3693_EQ_3693(...) \,
-#define Z_IS_3694_EQ_3694(...) \,
-#define Z_IS_3695_EQ_3695(...) \,
-#define Z_IS_3696_EQ_3696(...) \,
-#define Z_IS_3697_EQ_3697(...) \,
-#define Z_IS_3698_EQ_3698(...) \,
-#define Z_IS_3699_EQ_3699(...) \,
-#define Z_IS_3700_EQ_3700(...) \,
-#define Z_IS_3701_EQ_3701(...) \,
-#define Z_IS_3702_EQ_3702(...) \,
-#define Z_IS_3703_EQ_3703(...) \,
-#define Z_IS_3704_EQ_3704(...) \,
-#define Z_IS_3705_EQ_3705(...) \,
-#define Z_IS_3706_EQ_3706(...) \,
-#define Z_IS_3707_EQ_3707(...) \,
-#define Z_IS_3708_EQ_3708(...) \,
-#define Z_IS_3709_EQ_3709(...) \,
-#define Z_IS_3710_EQ_3710(...) \,
-#define Z_IS_3711_EQ_3711(...) \,
-#define Z_IS_3712_EQ_3712(...) \,
-#define Z_IS_3713_EQ_3713(...) \,
-#define Z_IS_3714_EQ_3714(...) \,
-#define Z_IS_3715_EQ_3715(...) \,
-#define Z_IS_3716_EQ_3716(...) \,
-#define Z_IS_3717_EQ_3717(...) \,
-#define Z_IS_3718_EQ_3718(...) \,
-#define Z_IS_3719_EQ_3719(...) \,
-#define Z_IS_3720_EQ_3720(...) \,
-#define Z_IS_3721_EQ_3721(...) \,
-#define Z_IS_3722_EQ_3722(...) \,
-#define Z_IS_3723_EQ_3723(...) \,
-#define Z_IS_3724_EQ_3724(...) \,
-#define Z_IS_3725_EQ_3725(...) \,
-#define Z_IS_3726_EQ_3726(...) \,
-#define Z_IS_3727_EQ_3727(...) \,
-#define Z_IS_3728_EQ_3728(...) \,
-#define Z_IS_3729_EQ_3729(...) \,
-#define Z_IS_3730_EQ_3730(...) \,
-#define Z_IS_3731_EQ_3731(...) \,
-#define Z_IS_3732_EQ_3732(...) \,
-#define Z_IS_3733_EQ_3733(...) \,
-#define Z_IS_3734_EQ_3734(...) \,
-#define Z_IS_3735_EQ_3735(...) \,
-#define Z_IS_3736_EQ_3736(...) \,
-#define Z_IS_3737_EQ_3737(...) \,
-#define Z_IS_3738_EQ_3738(...) \,
-#define Z_IS_3739_EQ_3739(...) \,
-#define Z_IS_3740_EQ_3740(...) \,
-#define Z_IS_3741_EQ_3741(...) \,
-#define Z_IS_3742_EQ_3742(...) \,
-#define Z_IS_3743_EQ_3743(...) \,
-#define Z_IS_3744_EQ_3744(...) \,
-#define Z_IS_3745_EQ_3745(...) \,
-#define Z_IS_3746_EQ_3746(...) \,
-#define Z_IS_3747_EQ_3747(...) \,
-#define Z_IS_3748_EQ_3748(...) \,
-#define Z_IS_3749_EQ_3749(...) \,
-#define Z_IS_3750_EQ_3750(...) \,
-#define Z_IS_3751_EQ_3751(...) \,
-#define Z_IS_3752_EQ_3752(...) \,
-#define Z_IS_3753_EQ_3753(...) \,
-#define Z_IS_3754_EQ_3754(...) \,
-#define Z_IS_3755_EQ_3755(...) \,
-#define Z_IS_3756_EQ_3756(...) \,
-#define Z_IS_3757_EQ_3757(...) \,
-#define Z_IS_3758_EQ_3758(...) \,
-#define Z_IS_3759_EQ_3759(...) \,
-#define Z_IS_3760_EQ_3760(...) \,
-#define Z_IS_3761_EQ_3761(...) \,
-#define Z_IS_3762_EQ_3762(...) \,
-#define Z_IS_3763_EQ_3763(...) \,
-#define Z_IS_3764_EQ_3764(...) \,
-#define Z_IS_3765_EQ_3765(...) \,
-#define Z_IS_3766_EQ_3766(...) \,
-#define Z_IS_3767_EQ_3767(...) \,
-#define Z_IS_3768_EQ_3768(...) \,
-#define Z_IS_3769_EQ_3769(...) \,
-#define Z_IS_3770_EQ_3770(...) \,
-#define Z_IS_3771_EQ_3771(...) \,
-#define Z_IS_3772_EQ_3772(...) \,
-#define Z_IS_3773_EQ_3773(...) \,
-#define Z_IS_3774_EQ_3774(...) \,
-#define Z_IS_3775_EQ_3775(...) \,
-#define Z_IS_3776_EQ_3776(...) \,
-#define Z_IS_3777_EQ_3777(...) \,
-#define Z_IS_3778_EQ_3778(...) \,
-#define Z_IS_3779_EQ_3779(...) \,
-#define Z_IS_3780_EQ_3780(...) \,
-#define Z_IS_3781_EQ_3781(...) \,
-#define Z_IS_3782_EQ_3782(...) \,
-#define Z_IS_3783_EQ_3783(...) \,
-#define Z_IS_3784_EQ_3784(...) \,
-#define Z_IS_3785_EQ_3785(...) \,
-#define Z_IS_3786_EQ_3786(...) \,
-#define Z_IS_3787_EQ_3787(...) \,
-#define Z_IS_3788_EQ_3788(...) \,
-#define Z_IS_3789_EQ_3789(...) \,
-#define Z_IS_3790_EQ_3790(...) \,
-#define Z_IS_3791_EQ_3791(...) \,
-#define Z_IS_3792_EQ_3792(...) \,
-#define Z_IS_3793_EQ_3793(...) \,
-#define Z_IS_3794_EQ_3794(...) \,
-#define Z_IS_3795_EQ_3795(...) \,
-#define Z_IS_3796_EQ_3796(...) \,
-#define Z_IS_3797_EQ_3797(...) \,
-#define Z_IS_3798_EQ_3798(...) \,
-#define Z_IS_3799_EQ_3799(...) \,
-#define Z_IS_3800_EQ_3800(...) \,
-#define Z_IS_3801_EQ_3801(...) \,
-#define Z_IS_3802_EQ_3802(...) \,
-#define Z_IS_3803_EQ_3803(...) \,
-#define Z_IS_3804_EQ_3804(...) \,
-#define Z_IS_3805_EQ_3805(...) \,
-#define Z_IS_3806_EQ_3806(...) \,
-#define Z_IS_3807_EQ_3807(...) \,
-#define Z_IS_3808_EQ_3808(...) \,
-#define Z_IS_3809_EQ_3809(...) \,
-#define Z_IS_3810_EQ_3810(...) \,
-#define Z_IS_3811_EQ_3811(...) \,
-#define Z_IS_3812_EQ_3812(...) \,
-#define Z_IS_3813_EQ_3813(...) \,
-#define Z_IS_3814_EQ_3814(...) \,
-#define Z_IS_3815_EQ_3815(...) \,
-#define Z_IS_3816_EQ_3816(...) \,
-#define Z_IS_3817_EQ_3817(...) \,
-#define Z_IS_3818_EQ_3818(...) \,
-#define Z_IS_3819_EQ_3819(...) \,
-#define Z_IS_3820_EQ_3820(...) \,
-#define Z_IS_3821_EQ_3821(...) \,
-#define Z_IS_3822_EQ_3822(...) \,
-#define Z_IS_3823_EQ_3823(...) \,
-#define Z_IS_3824_EQ_3824(...) \,
-#define Z_IS_3825_EQ_3825(...) \,
-#define Z_IS_3826_EQ_3826(...) \,
-#define Z_IS_3827_EQ_3827(...) \,
-#define Z_IS_3828_EQ_3828(...) \,
-#define Z_IS_3829_EQ_3829(...) \,
-#define Z_IS_3830_EQ_3830(...) \,
-#define Z_IS_3831_EQ_3831(...) \,
-#define Z_IS_3832_EQ_3832(...) \,
-#define Z_IS_3833_EQ_3833(...) \,
-#define Z_IS_3834_EQ_3834(...) \,
-#define Z_IS_3835_EQ_3835(...) \,
-#define Z_IS_3836_EQ_3836(...) \,
-#define Z_IS_3837_EQ_3837(...) \,
-#define Z_IS_3838_EQ_3838(...) \,
-#define Z_IS_3839_EQ_3839(...) \,
-#define Z_IS_3840_EQ_3840(...) \,
-#define Z_IS_3841_EQ_3841(...) \,
-#define Z_IS_3842_EQ_3842(...) \,
-#define Z_IS_3843_EQ_3843(...) \,
-#define Z_IS_3844_EQ_3844(...) \,
-#define Z_IS_3845_EQ_3845(...) \,
-#define Z_IS_3846_EQ_3846(...) \,
-#define Z_IS_3847_EQ_3847(...) \,
-#define Z_IS_3848_EQ_3848(...) \,
-#define Z_IS_3849_EQ_3849(...) \,
-#define Z_IS_3850_EQ_3850(...) \,
-#define Z_IS_3851_EQ_3851(...) \,
-#define Z_IS_3852_EQ_3852(...) \,
-#define Z_IS_3853_EQ_3853(...) \,
-#define Z_IS_3854_EQ_3854(...) \,
-#define Z_IS_3855_EQ_3855(...) \,
-#define Z_IS_3856_EQ_3856(...) \,
-#define Z_IS_3857_EQ_3857(...) \,
-#define Z_IS_3858_EQ_3858(...) \,
-#define Z_IS_3859_EQ_3859(...) \,
-#define Z_IS_3860_EQ_3860(...) \,
-#define Z_IS_3861_EQ_3861(...) \,
-#define Z_IS_3862_EQ_3862(...) \,
-#define Z_IS_3863_EQ_3863(...) \,
-#define Z_IS_3864_EQ_3864(...) \,
-#define Z_IS_3865_EQ_3865(...) \,
-#define Z_IS_3866_EQ_3866(...) \,
-#define Z_IS_3867_EQ_3867(...) \,
-#define Z_IS_3868_EQ_3868(...) \,
-#define Z_IS_3869_EQ_3869(...) \,
-#define Z_IS_3870_EQ_3870(...) \,
-#define Z_IS_3871_EQ_3871(...) \,
-#define Z_IS_3872_EQ_3872(...) \,
-#define Z_IS_3873_EQ_3873(...) \,
-#define Z_IS_3874_EQ_3874(...) \,
-#define Z_IS_3875_EQ_3875(...) \,
-#define Z_IS_3876_EQ_3876(...) \,
-#define Z_IS_3877_EQ_3877(...) \,
-#define Z_IS_3878_EQ_3878(...) \,
-#define Z_IS_3879_EQ_3879(...) \,
-#define Z_IS_3880_EQ_3880(...) \,
-#define Z_IS_3881_EQ_3881(...) \,
-#define Z_IS_3882_EQ_3882(...) \,
-#define Z_IS_3883_EQ_3883(...) \,
-#define Z_IS_3884_EQ_3884(...) \,
-#define Z_IS_3885_EQ_3885(...) \,
-#define Z_IS_3886_EQ_3886(...) \,
-#define Z_IS_3887_EQ_3887(...) \,
-#define Z_IS_3888_EQ_3888(...) \,
-#define Z_IS_3889_EQ_3889(...) \,
-#define Z_IS_3890_EQ_3890(...) \,
-#define Z_IS_3891_EQ_3891(...) \,
-#define Z_IS_3892_EQ_3892(...) \,
-#define Z_IS_3893_EQ_3893(...) \,
-#define Z_IS_3894_EQ_3894(...) \,
-#define Z_IS_3895_EQ_3895(...) \,
-#define Z_IS_3896_EQ_3896(...) \,
-#define Z_IS_3897_EQ_3897(...) \,
-#define Z_IS_3898_EQ_3898(...) \,
-#define Z_IS_3899_EQ_3899(...) \,
-#define Z_IS_3900_EQ_3900(...) \,
-#define Z_IS_3901_EQ_3901(...) \,
-#define Z_IS_3902_EQ_3902(...) \,
-#define Z_IS_3903_EQ_3903(...) \,
-#define Z_IS_3904_EQ_3904(...) \,
-#define Z_IS_3905_EQ_3905(...) \,
-#define Z_IS_3906_EQ_3906(...) \,
-#define Z_IS_3907_EQ_3907(...) \,
-#define Z_IS_3908_EQ_3908(...) \,
-#define Z_IS_3909_EQ_3909(...) \,
-#define Z_IS_3910_EQ_3910(...) \,
-#define Z_IS_3911_EQ_3911(...) \,
-#define Z_IS_3912_EQ_3912(...) \,
-#define Z_IS_3913_EQ_3913(...) \,
-#define Z_IS_3914_EQ_3914(...) \,
-#define Z_IS_3915_EQ_3915(...) \,
-#define Z_IS_3916_EQ_3916(...) \,
-#define Z_IS_3917_EQ_3917(...) \,
-#define Z_IS_3918_EQ_3918(...) \,
-#define Z_IS_3919_EQ_3919(...) \,
-#define Z_IS_3920_EQ_3920(...) \,
-#define Z_IS_3921_EQ_3921(...) \,
-#define Z_IS_3922_EQ_3922(...) \,
-#define Z_IS_3923_EQ_3923(...) \,
-#define Z_IS_3924_EQ_3924(...) \,
-#define Z_IS_3925_EQ_3925(...) \,
-#define Z_IS_3926_EQ_3926(...) \,
-#define Z_IS_3927_EQ_3927(...) \,
-#define Z_IS_3928_EQ_3928(...) \,
-#define Z_IS_3929_EQ_3929(...) \,
-#define Z_IS_3930_EQ_3930(...) \,
-#define Z_IS_3931_EQ_3931(...) \,
-#define Z_IS_3932_EQ_3932(...) \,
-#define Z_IS_3933_EQ_3933(...) \,
-#define Z_IS_3934_EQ_3934(...) \,
-#define Z_IS_3935_EQ_3935(...) \,
-#define Z_IS_3936_EQ_3936(...) \,
-#define Z_IS_3937_EQ_3937(...) \,
-#define Z_IS_3938_EQ_3938(...) \,
-#define Z_IS_3939_EQ_3939(...) \,
-#define Z_IS_3940_EQ_3940(...) \,
-#define Z_IS_3941_EQ_3941(...) \,
-#define Z_IS_3942_EQ_3942(...) \,
-#define Z_IS_3943_EQ_3943(...) \,
-#define Z_IS_3944_EQ_3944(...) \,
-#define Z_IS_3945_EQ_3945(...) \,
-#define Z_IS_3946_EQ_3946(...) \,
-#define Z_IS_3947_EQ_3947(...) \,
-#define Z_IS_3948_EQ_3948(...) \,
-#define Z_IS_3949_EQ_3949(...) \,
-#define Z_IS_3950_EQ_3950(...) \,
-#define Z_IS_3951_EQ_3951(...) \,
-#define Z_IS_3952_EQ_3952(...) \,
-#define Z_IS_3953_EQ_3953(...) \,
-#define Z_IS_3954_EQ_3954(...) \,
-#define Z_IS_3955_EQ_3955(...) \,
-#define Z_IS_3956_EQ_3956(...) \,
-#define Z_IS_3957_EQ_3957(...) \,
-#define Z_IS_3958_EQ_3958(...) \,
-#define Z_IS_3959_EQ_3959(...) \,
-#define Z_IS_3960_EQ_3960(...) \,
-#define Z_IS_3961_EQ_3961(...) \,
-#define Z_IS_3962_EQ_3962(...) \,
-#define Z_IS_3963_EQ_3963(...) \,
-#define Z_IS_3964_EQ_3964(...) \,
-#define Z_IS_3965_EQ_3965(...) \,
-#define Z_IS_3966_EQ_3966(...) \,
-#define Z_IS_3967_EQ_3967(...) \,
-#define Z_IS_3968_EQ_3968(...) \,
-#define Z_IS_3969_EQ_3969(...) \,
-#define Z_IS_3970_EQ_3970(...) \,
-#define Z_IS_3971_EQ_3971(...) \,
-#define Z_IS_3972_EQ_3972(...) \,
-#define Z_IS_3973_EQ_3973(...) \,
-#define Z_IS_3974_EQ_3974(...) \,
-#define Z_IS_3975_EQ_3975(...) \,
-#define Z_IS_3976_EQ_3976(...) \,
-#define Z_IS_3977_EQ_3977(...) \,
-#define Z_IS_3978_EQ_3978(...) \,
-#define Z_IS_3979_EQ_3979(...) \,
-#define Z_IS_3980_EQ_3980(...) \,
-#define Z_IS_3981_EQ_3981(...) \,
-#define Z_IS_3982_EQ_3982(...) \,
-#define Z_IS_3983_EQ_3983(...) \,
-#define Z_IS_3984_EQ_3984(...) \,
-#define Z_IS_3985_EQ_3985(...) \,
-#define Z_IS_3986_EQ_3986(...) \,
-#define Z_IS_3987_EQ_3987(...) \,
-#define Z_IS_3988_EQ_3988(...) \,
-#define Z_IS_3989_EQ_3989(...) \,
-#define Z_IS_3990_EQ_3990(...) \,
-#define Z_IS_3991_EQ_3991(...) \,
-#define Z_IS_3992_EQ_3992(...) \,
-#define Z_IS_3993_EQ_3993(...) \,
-#define Z_IS_3994_EQ_3994(...) \,
-#define Z_IS_3995_EQ_3995(...) \,
-#define Z_IS_3996_EQ_3996(...) \,
-#define Z_IS_3997_EQ_3997(...) \,
-#define Z_IS_3998_EQ_3998(...) \,
-#define Z_IS_3999_EQ_3999(...) \,
-#define Z_IS_4000_EQ_4000(...) \,
-#define Z_IS_4001_EQ_4001(...) \,
-#define Z_IS_4002_EQ_4002(...) \,
-#define Z_IS_4003_EQ_4003(...) \,
-#define Z_IS_4004_EQ_4004(...) \,
-#define Z_IS_4005_EQ_4005(...) \,
-#define Z_IS_4006_EQ_4006(...) \,
-#define Z_IS_4007_EQ_4007(...) \,
-#define Z_IS_4008_EQ_4008(...) \,
-#define Z_IS_4009_EQ_4009(...) \,
-#define Z_IS_4010_EQ_4010(...) \,
-#define Z_IS_4011_EQ_4011(...) \,
-#define Z_IS_4012_EQ_4012(...) \,
-#define Z_IS_4013_EQ_4013(...) \,
-#define Z_IS_4014_EQ_4014(...) \,
-#define Z_IS_4015_EQ_4015(...) \,
-#define Z_IS_4016_EQ_4016(...) \,
-#define Z_IS_4017_EQ_4017(...) \,
-#define Z_IS_4018_EQ_4018(...) \,
-#define Z_IS_4019_EQ_4019(...) \,
-#define Z_IS_4020_EQ_4020(...) \,
-#define Z_IS_4021_EQ_4021(...) \,
-#define Z_IS_4022_EQ_4022(...) \,
-#define Z_IS_4023_EQ_4023(...) \,
-#define Z_IS_4024_EQ_4024(...) \,
-#define Z_IS_4025_EQ_4025(...) \,
-#define Z_IS_4026_EQ_4026(...) \,
-#define Z_IS_4027_EQ_4027(...) \,
-#define Z_IS_4028_EQ_4028(...) \,
-#define Z_IS_4029_EQ_4029(...) \,
-#define Z_IS_4030_EQ_4030(...) \,
-#define Z_IS_4031_EQ_4031(...) \,
-#define Z_IS_4032_EQ_4032(...) \,
-#define Z_IS_4033_EQ_4033(...) \,
-#define Z_IS_4034_EQ_4034(...) \,
-#define Z_IS_4035_EQ_4035(...) \,
-#define Z_IS_4036_EQ_4036(...) \,
-#define Z_IS_4037_EQ_4037(...) \,
-#define Z_IS_4038_EQ_4038(...) \,
-#define Z_IS_4039_EQ_4039(...) \,
-#define Z_IS_4040_EQ_4040(...) \,
-#define Z_IS_4041_EQ_4041(...) \,
-#define Z_IS_4042_EQ_4042(...) \,
-#define Z_IS_4043_EQ_4043(...) \,
-#define Z_IS_4044_EQ_4044(...) \,
-#define Z_IS_4045_EQ_4045(...) \,
-#define Z_IS_4046_EQ_4046(...) \,
-#define Z_IS_4047_EQ_4047(...) \,
-#define Z_IS_4048_EQ_4048(...) \,
-#define Z_IS_4049_EQ_4049(...) \,
-#define Z_IS_4050_EQ_4050(...) \,
-#define Z_IS_4051_EQ_4051(...) \,
-#define Z_IS_4052_EQ_4052(...) \,
-#define Z_IS_4053_EQ_4053(...) \,
-#define Z_IS_4054_EQ_4054(...) \,
-#define Z_IS_4055_EQ_4055(...) \,
-#define Z_IS_4056_EQ_4056(...) \,
-#define Z_IS_4057_EQ_4057(...) \,
-#define Z_IS_4058_EQ_4058(...) \,
-#define Z_IS_4059_EQ_4059(...) \,
-#define Z_IS_4060_EQ_4060(...) \,
-#define Z_IS_4061_EQ_4061(...) \,
-#define Z_IS_4062_EQ_4062(...) \,
-#define Z_IS_4063_EQ_4063(...) \,
-#define Z_IS_4064_EQ_4064(...) \,
-#define Z_IS_4065_EQ_4065(...) \,
-#define Z_IS_4066_EQ_4066(...) \,
-#define Z_IS_4067_EQ_4067(...) \,
-#define Z_IS_4068_EQ_4068(...) \,
-#define Z_IS_4069_EQ_4069(...) \,
-#define Z_IS_4070_EQ_4070(...) \,
-#define Z_IS_4071_EQ_4071(...) \,
-#define Z_IS_4072_EQ_4072(...) \,
-#define Z_IS_4073_EQ_4073(...) \,
-#define Z_IS_4074_EQ_4074(...) \,
-#define Z_IS_4075_EQ_4075(...) \,
-#define Z_IS_4076_EQ_4076(...) \,
-#define Z_IS_4077_EQ_4077(...) \,
-#define Z_IS_4078_EQ_4078(...) \,
-#define Z_IS_4079_EQ_4079(...) \,
-#define Z_IS_4080_EQ_4080(...) \,
-#define Z_IS_4081_EQ_4081(...) \,
-#define Z_IS_4082_EQ_4082(...) \,
-#define Z_IS_4083_EQ_4083(...) \,
-#define Z_IS_4084_EQ_4084(...) \,
-#define Z_IS_4085_EQ_4085(...) \,
-#define Z_IS_4086_EQ_4086(...) \,
-#define Z_IS_4087_EQ_4087(...) \,
-#define Z_IS_4088_EQ_4088(...) \,
-#define Z_IS_4089_EQ_4089(...) \,
-#define Z_IS_4090_EQ_4090(...) \,
-#define Z_IS_4091_EQ_4091(...) \,
-#define Z_IS_4092_EQ_4092(...) \,
-#define Z_IS_4093_EQ_4093(...) \,
-#define Z_IS_4094_EQ_4094(...) \,
-#define Z_IS_4095_EQ_4095(...) \,
-#define Z_IS_4096_EQ_4096(...) \,
+#define Z_IS_0_EQ_0(...)   \,
+#define Z_IS_0U_EQ_0(...)  \,
+#define Z_IS_0_EQ_0U(...)  \,
+#define Z_IS_0U_EQ_0U(...) \,
+#define Z_IS_1_EQ_1(...)   \,
+#define Z_IS_1U_EQ_1(...)  \,
+#define Z_IS_1_EQ_1U(...)  \,
+#define Z_IS_1U_EQ_1U(...) \,
+#define Z_IS_2_EQ_2(...)   \,
+#define Z_IS_2U_EQ_2(...)  \,
+#define Z_IS_2_EQ_2U(...)  \,
+#define Z_IS_2U_EQ_2U(...) \,
+#define Z_IS_3_EQ_3(...)   \,
+#define Z_IS_3U_EQ_3(...)  \,
+#define Z_IS_3_EQ_3U(...)  \,
+#define Z_IS_3U_EQ_3U(...) \,
+#define Z_IS_4_EQ_4(...)   \,
+#define Z_IS_4U_EQ_4(...)  \,
+#define Z_IS_4_EQ_4U(...)  \,
+#define Z_IS_4U_EQ_4U(...) \,
+#define Z_IS_5_EQ_5(...)   \,
+#define Z_IS_5U_EQ_5(...)  \,
+#define Z_IS_5_EQ_5U(...)  \,
+#define Z_IS_5U_EQ_5U(...) \,
+#define Z_IS_6_EQ_6(...)   \,
+#define Z_IS_6U_EQ_6(...)  \,
+#define Z_IS_6_EQ_6U(...)  \,
+#define Z_IS_6U_EQ_6U(...) \,
+#define Z_IS_7_EQ_7(...)   \,
+#define Z_IS_7U_EQ_7(...)  \,
+#define Z_IS_7_EQ_7U(...)  \,
+#define Z_IS_7U_EQ_7U(...) \,
+#define Z_IS_8_EQ_8(...)   \,
+#define Z_IS_8U_EQ_8(...)  \,
+#define Z_IS_8_EQ_8U(...)  \,
+#define Z_IS_8U_EQ_8U(...) \,
+#define Z_IS_9_EQ_9(...)   \,
+#define Z_IS_9U_EQ_9(...)  \,
+#define Z_IS_9_EQ_9U(...)  \,
+#define Z_IS_9U_EQ_9U(...) \,
+#define Z_IS_10_EQ_10(...)   \,
+#define Z_IS_10U_EQ_10(...)  \,
+#define Z_IS_10_EQ_10U(...)  \,
+#define Z_IS_10U_EQ_10U(...) \,
+#define Z_IS_11_EQ_11(...)   \,
+#define Z_IS_11U_EQ_11(...)  \,
+#define Z_IS_11_EQ_11U(...)  \,
+#define Z_IS_11U_EQ_11U(...) \,
+#define Z_IS_12_EQ_12(...)   \,
+#define Z_IS_12U_EQ_12(...)  \,
+#define Z_IS_12_EQ_12U(...)  \,
+#define Z_IS_12U_EQ_12U(...) \,
+#define Z_IS_13_EQ_13(...)   \,
+#define Z_IS_13U_EQ_13(...)  \,
+#define Z_IS_13_EQ_13U(...)  \,
+#define Z_IS_13U_EQ_13U(...) \,
+#define Z_IS_14_EQ_14(...)   \,
+#define Z_IS_14U_EQ_14(...)  \,
+#define Z_IS_14_EQ_14U(...)  \,
+#define Z_IS_14U_EQ_14U(...) \,
+#define Z_IS_15_EQ_15(...)   \,
+#define Z_IS_15U_EQ_15(...)  \,
+#define Z_IS_15_EQ_15U(...)  \,
+#define Z_IS_15U_EQ_15U(...) \,
+#define Z_IS_16_EQ_16(...)   \,
+#define Z_IS_16U_EQ_16(...)  \,
+#define Z_IS_16_EQ_16U(...)  \,
+#define Z_IS_16U_EQ_16U(...) \,
+#define Z_IS_17_EQ_17(...)   \,
+#define Z_IS_17U_EQ_17(...)  \,
+#define Z_IS_17_EQ_17U(...)  \,
+#define Z_IS_17U_EQ_17U(...) \,
+#define Z_IS_18_EQ_18(...)   \,
+#define Z_IS_18U_EQ_18(...)  \,
+#define Z_IS_18_EQ_18U(...)  \,
+#define Z_IS_18U_EQ_18U(...) \,
+#define Z_IS_19_EQ_19(...)   \,
+#define Z_IS_19U_EQ_19(...)  \,
+#define Z_IS_19_EQ_19U(...)  \,
+#define Z_IS_19U_EQ_19U(...) \,
+#define Z_IS_20_EQ_20(...)   \,
+#define Z_IS_20U_EQ_20(...)  \,
+#define Z_IS_20_EQ_20U(...)  \,
+#define Z_IS_20U_EQ_20U(...) \,
+#define Z_IS_21_EQ_21(...)   \,
+#define Z_IS_21U_EQ_21(...)  \,
+#define Z_IS_21_EQ_21U(...)  \,
+#define Z_IS_21U_EQ_21U(...) \,
+#define Z_IS_22_EQ_22(...)   \,
+#define Z_IS_22U_EQ_22(...)  \,
+#define Z_IS_22_EQ_22U(...)  \,
+#define Z_IS_22U_EQ_22U(...) \,
+#define Z_IS_23_EQ_23(...)   \,
+#define Z_IS_23U_EQ_23(...)  \,
+#define Z_IS_23_EQ_23U(...)  \,
+#define Z_IS_23U_EQ_23U(...) \,
+#define Z_IS_24_EQ_24(...)   \,
+#define Z_IS_24U_EQ_24(...)  \,
+#define Z_IS_24_EQ_24U(...)  \,
+#define Z_IS_24U_EQ_24U(...) \,
+#define Z_IS_25_EQ_25(...)   \,
+#define Z_IS_25U_EQ_25(...)  \,
+#define Z_IS_25_EQ_25U(...)  \,
+#define Z_IS_25U_EQ_25U(...) \,
+#define Z_IS_26_EQ_26(...)   \,
+#define Z_IS_26U_EQ_26(...)  \,
+#define Z_IS_26_EQ_26U(...)  \,
+#define Z_IS_26U_EQ_26U(...) \,
+#define Z_IS_27_EQ_27(...)   \,
+#define Z_IS_27U_EQ_27(...)  \,
+#define Z_IS_27_EQ_27U(...)  \,
+#define Z_IS_27U_EQ_27U(...) \,
+#define Z_IS_28_EQ_28(...)   \,
+#define Z_IS_28U_EQ_28(...)  \,
+#define Z_IS_28_EQ_28U(...)  \,
+#define Z_IS_28U_EQ_28U(...) \,
+#define Z_IS_29_EQ_29(...)   \,
+#define Z_IS_29U_EQ_29(...)  \,
+#define Z_IS_29_EQ_29U(...)  \,
+#define Z_IS_29U_EQ_29U(...) \,
+#define Z_IS_30_EQ_30(...)   \,
+#define Z_IS_30U_EQ_30(...)  \,
+#define Z_IS_30_EQ_30U(...)  \,
+#define Z_IS_30U_EQ_30U(...) \,
+#define Z_IS_31_EQ_31(...)   \,
+#define Z_IS_31U_EQ_31(...)  \,
+#define Z_IS_31_EQ_31U(...)  \,
+#define Z_IS_31U_EQ_31U(...) \,
+#define Z_IS_32_EQ_32(...)   \,
+#define Z_IS_32U_EQ_32(...)  \,
+#define Z_IS_32_EQ_32U(...)  \,
+#define Z_IS_32U_EQ_32U(...) \,
+#define Z_IS_33_EQ_33(...)   \,
+#define Z_IS_33U_EQ_33(...)  \,
+#define Z_IS_33_EQ_33U(...)  \,
+#define Z_IS_33U_EQ_33U(...) \,
+#define Z_IS_34_EQ_34(...)   \,
+#define Z_IS_34U_EQ_34(...)  \,
+#define Z_IS_34_EQ_34U(...)  \,
+#define Z_IS_34U_EQ_34U(...) \,
+#define Z_IS_35_EQ_35(...)   \,
+#define Z_IS_35U_EQ_35(...)  \,
+#define Z_IS_35_EQ_35U(...)  \,
+#define Z_IS_35U_EQ_35U(...) \,
+#define Z_IS_36_EQ_36(...)   \,
+#define Z_IS_36U_EQ_36(...)  \,
+#define Z_IS_36_EQ_36U(...)  \,
+#define Z_IS_36U_EQ_36U(...) \,
+#define Z_IS_37_EQ_37(...)   \,
+#define Z_IS_37U_EQ_37(...)  \,
+#define Z_IS_37_EQ_37U(...)  \,
+#define Z_IS_37U_EQ_37U(...) \,
+#define Z_IS_38_EQ_38(...)   \,
+#define Z_IS_38U_EQ_38(...)  \,
+#define Z_IS_38_EQ_38U(...)  \,
+#define Z_IS_38U_EQ_38U(...) \,
+#define Z_IS_39_EQ_39(...)   \,
+#define Z_IS_39U_EQ_39(...)  \,
+#define Z_IS_39_EQ_39U(...)  \,
+#define Z_IS_39U_EQ_39U(...) \,
+#define Z_IS_40_EQ_40(...)   \,
+#define Z_IS_40U_EQ_40(...)  \,
+#define Z_IS_40_EQ_40U(...)  \,
+#define Z_IS_40U_EQ_40U(...) \,
+#define Z_IS_41_EQ_41(...)   \,
+#define Z_IS_41U_EQ_41(...)  \,
+#define Z_IS_41_EQ_41U(...)  \,
+#define Z_IS_41U_EQ_41U(...) \,
+#define Z_IS_42_EQ_42(...)   \,
+#define Z_IS_42U_EQ_42(...)  \,
+#define Z_IS_42_EQ_42U(...)  \,
+#define Z_IS_42U_EQ_42U(...) \,
+#define Z_IS_43_EQ_43(...)   \,
+#define Z_IS_43U_EQ_43(...)  \,
+#define Z_IS_43_EQ_43U(...)  \,
+#define Z_IS_43U_EQ_43U(...) \,
+#define Z_IS_44_EQ_44(...)   \,
+#define Z_IS_44U_EQ_44(...)  \,
+#define Z_IS_44_EQ_44U(...)  \,
+#define Z_IS_44U_EQ_44U(...) \,
+#define Z_IS_45_EQ_45(...)   \,
+#define Z_IS_45U_EQ_45(...)  \,
+#define Z_IS_45_EQ_45U(...)  \,
+#define Z_IS_45U_EQ_45U(...) \,
+#define Z_IS_46_EQ_46(...)   \,
+#define Z_IS_46U_EQ_46(...)  \,
+#define Z_IS_46_EQ_46U(...)  \,
+#define Z_IS_46U_EQ_46U(...) \,
+#define Z_IS_47_EQ_47(...)   \,
+#define Z_IS_47U_EQ_47(...)  \,
+#define Z_IS_47_EQ_47U(...)  \,
+#define Z_IS_47U_EQ_47U(...) \,
+#define Z_IS_48_EQ_48(...)   \,
+#define Z_IS_48U_EQ_48(...)  \,
+#define Z_IS_48_EQ_48U(...)  \,
+#define Z_IS_48U_EQ_48U(...) \,
+#define Z_IS_49_EQ_49(...)   \,
+#define Z_IS_49U_EQ_49(...)  \,
+#define Z_IS_49_EQ_49U(...)  \,
+#define Z_IS_49U_EQ_49U(...) \,
+#define Z_IS_50_EQ_50(...)   \,
+#define Z_IS_50U_EQ_50(...)  \,
+#define Z_IS_50_EQ_50U(...)  \,
+#define Z_IS_50U_EQ_50U(...) \,
+#define Z_IS_51_EQ_51(...)   \,
+#define Z_IS_51U_EQ_51(...)  \,
+#define Z_IS_51_EQ_51U(...)  \,
+#define Z_IS_51U_EQ_51U(...) \,
+#define Z_IS_52_EQ_52(...)   \,
+#define Z_IS_52U_EQ_52(...)  \,
+#define Z_IS_52_EQ_52U(...)  \,
+#define Z_IS_52U_EQ_52U(...) \,
+#define Z_IS_53_EQ_53(...)   \,
+#define Z_IS_53U_EQ_53(...)  \,
+#define Z_IS_53_EQ_53U(...)  \,
+#define Z_IS_53U_EQ_53U(...) \,
+#define Z_IS_54_EQ_54(...)   \,
+#define Z_IS_54U_EQ_54(...)  \,
+#define Z_IS_54_EQ_54U(...)  \,
+#define Z_IS_54U_EQ_54U(...) \,
+#define Z_IS_55_EQ_55(...)   \,
+#define Z_IS_55U_EQ_55(...)  \,
+#define Z_IS_55_EQ_55U(...)  \,
+#define Z_IS_55U_EQ_55U(...) \,
+#define Z_IS_56_EQ_56(...)   \,
+#define Z_IS_56U_EQ_56(...)  \,
+#define Z_IS_56_EQ_56U(...)  \,
+#define Z_IS_56U_EQ_56U(...) \,
+#define Z_IS_57_EQ_57(...)   \,
+#define Z_IS_57U_EQ_57(...)  \,
+#define Z_IS_57_EQ_57U(...)  \,
+#define Z_IS_57U_EQ_57U(...) \,
+#define Z_IS_58_EQ_58(...)   \,
+#define Z_IS_58U_EQ_58(...)  \,
+#define Z_IS_58_EQ_58U(...)  \,
+#define Z_IS_58U_EQ_58U(...) \,
+#define Z_IS_59_EQ_59(...)   \,
+#define Z_IS_59U_EQ_59(...)  \,
+#define Z_IS_59_EQ_59U(...)  \,
+#define Z_IS_59U_EQ_59U(...) \,
+#define Z_IS_60_EQ_60(...)   \,
+#define Z_IS_60U_EQ_60(...)  \,
+#define Z_IS_60_EQ_60U(...)  \,
+#define Z_IS_60U_EQ_60U(...) \,
+#define Z_IS_61_EQ_61(...)   \,
+#define Z_IS_61U_EQ_61(...)  \,
+#define Z_IS_61_EQ_61U(...)  \,
+#define Z_IS_61U_EQ_61U(...) \,
+#define Z_IS_62_EQ_62(...)   \,
+#define Z_IS_62U_EQ_62(...)  \,
+#define Z_IS_62_EQ_62U(...)  \,
+#define Z_IS_62U_EQ_62U(...) \,
+#define Z_IS_63_EQ_63(...)   \,
+#define Z_IS_63U_EQ_63(...)  \,
+#define Z_IS_63_EQ_63U(...)  \,
+#define Z_IS_63U_EQ_63U(...) \,
+#define Z_IS_64_EQ_64(...)   \,
+#define Z_IS_64U_EQ_64(...)  \,
+#define Z_IS_64_EQ_64U(...)  \,
+#define Z_IS_64U_EQ_64U(...) \,
+#define Z_IS_65_EQ_65(...)   \,
+#define Z_IS_65U_EQ_65(...)  \,
+#define Z_IS_65_EQ_65U(...)  \,
+#define Z_IS_65U_EQ_65U(...) \,
+#define Z_IS_66_EQ_66(...)   \,
+#define Z_IS_66U_EQ_66(...)  \,
+#define Z_IS_66_EQ_66U(...)  \,
+#define Z_IS_66U_EQ_66U(...) \,
+#define Z_IS_67_EQ_67(...)   \,
+#define Z_IS_67U_EQ_67(...)  \,
+#define Z_IS_67_EQ_67U(...)  \,
+#define Z_IS_67U_EQ_67U(...) \,
+#define Z_IS_68_EQ_68(...)   \,
+#define Z_IS_68U_EQ_68(...)  \,
+#define Z_IS_68_EQ_68U(...)  \,
+#define Z_IS_68U_EQ_68U(...) \,
+#define Z_IS_69_EQ_69(...)   \,
+#define Z_IS_69U_EQ_69(...)  \,
+#define Z_IS_69_EQ_69U(...)  \,
+#define Z_IS_69U_EQ_69U(...) \,
+#define Z_IS_70_EQ_70(...)   \,
+#define Z_IS_70U_EQ_70(...)  \,
+#define Z_IS_70_EQ_70U(...)  \,
+#define Z_IS_70U_EQ_70U(...) \,
+#define Z_IS_71_EQ_71(...)   \,
+#define Z_IS_71U_EQ_71(...)  \,
+#define Z_IS_71_EQ_71U(...)  \,
+#define Z_IS_71U_EQ_71U(...) \,
+#define Z_IS_72_EQ_72(...)   \,
+#define Z_IS_72U_EQ_72(...)  \,
+#define Z_IS_72_EQ_72U(...)  \,
+#define Z_IS_72U_EQ_72U(...) \,
+#define Z_IS_73_EQ_73(...)   \,
+#define Z_IS_73U_EQ_73(...)  \,
+#define Z_IS_73_EQ_73U(...)  \,
+#define Z_IS_73U_EQ_73U(...) \,
+#define Z_IS_74_EQ_74(...)   \,
+#define Z_IS_74U_EQ_74(...)  \,
+#define Z_IS_74_EQ_74U(...)  \,
+#define Z_IS_74U_EQ_74U(...) \,
+#define Z_IS_75_EQ_75(...)   \,
+#define Z_IS_75U_EQ_75(...)  \,
+#define Z_IS_75_EQ_75U(...)  \,
+#define Z_IS_75U_EQ_75U(...) \,
+#define Z_IS_76_EQ_76(...)   \,
+#define Z_IS_76U_EQ_76(...)  \,
+#define Z_IS_76_EQ_76U(...)  \,
+#define Z_IS_76U_EQ_76U(...) \,
+#define Z_IS_77_EQ_77(...)   \,
+#define Z_IS_77U_EQ_77(...)  \,
+#define Z_IS_77_EQ_77U(...)  \,
+#define Z_IS_77U_EQ_77U(...) \,
+#define Z_IS_78_EQ_78(...)   \,
+#define Z_IS_78U_EQ_78(...)  \,
+#define Z_IS_78_EQ_78U(...)  \,
+#define Z_IS_78U_EQ_78U(...) \,
+#define Z_IS_79_EQ_79(...)   \,
+#define Z_IS_79U_EQ_79(...)  \,
+#define Z_IS_79_EQ_79U(...)  \,
+#define Z_IS_79U_EQ_79U(...) \,
+#define Z_IS_80_EQ_80(...)   \,
+#define Z_IS_80U_EQ_80(...)  \,
+#define Z_IS_80_EQ_80U(...)  \,
+#define Z_IS_80U_EQ_80U(...) \,
+#define Z_IS_81_EQ_81(...)   \,
+#define Z_IS_81U_EQ_81(...)  \,
+#define Z_IS_81_EQ_81U(...)  \,
+#define Z_IS_81U_EQ_81U(...) \,
+#define Z_IS_82_EQ_82(...)   \,
+#define Z_IS_82U_EQ_82(...)  \,
+#define Z_IS_82_EQ_82U(...)  \,
+#define Z_IS_82U_EQ_82U(...) \,
+#define Z_IS_83_EQ_83(...)   \,
+#define Z_IS_83U_EQ_83(...)  \,
+#define Z_IS_83_EQ_83U(...)  \,
+#define Z_IS_83U_EQ_83U(...) \,
+#define Z_IS_84_EQ_84(...)   \,
+#define Z_IS_84U_EQ_84(...)  \,
+#define Z_IS_84_EQ_84U(...)  \,
+#define Z_IS_84U_EQ_84U(...) \,
+#define Z_IS_85_EQ_85(...)   \,
+#define Z_IS_85U_EQ_85(...)  \,
+#define Z_IS_85_EQ_85U(...)  \,
+#define Z_IS_85U_EQ_85U(...) \,
+#define Z_IS_86_EQ_86(...)   \,
+#define Z_IS_86U_EQ_86(...)  \,
+#define Z_IS_86_EQ_86U(...)  \,
+#define Z_IS_86U_EQ_86U(...) \,
+#define Z_IS_87_EQ_87(...)   \,
+#define Z_IS_87U_EQ_87(...)  \,
+#define Z_IS_87_EQ_87U(...)  \,
+#define Z_IS_87U_EQ_87U(...) \,
+#define Z_IS_88_EQ_88(...)   \,
+#define Z_IS_88U_EQ_88(...)  \,
+#define Z_IS_88_EQ_88U(...)  \,
+#define Z_IS_88U_EQ_88U(...) \,
+#define Z_IS_89_EQ_89(...)   \,
+#define Z_IS_89U_EQ_89(...)  \,
+#define Z_IS_89_EQ_89U(...)  \,
+#define Z_IS_89U_EQ_89U(...) \,
+#define Z_IS_90_EQ_90(...)   \,
+#define Z_IS_90U_EQ_90(...)  \,
+#define Z_IS_90_EQ_90U(...)  \,
+#define Z_IS_90U_EQ_90U(...) \,
+#define Z_IS_91_EQ_91(...)   \,
+#define Z_IS_91U_EQ_91(...)  \,
+#define Z_IS_91_EQ_91U(...)  \,
+#define Z_IS_91U_EQ_91U(...) \,
+#define Z_IS_92_EQ_92(...)   \,
+#define Z_IS_92U_EQ_92(...)  \,
+#define Z_IS_92_EQ_92U(...)  \,
+#define Z_IS_92U_EQ_92U(...) \,
+#define Z_IS_93_EQ_93(...)   \,
+#define Z_IS_93U_EQ_93(...)  \,
+#define Z_IS_93_EQ_93U(...)  \,
+#define Z_IS_93U_EQ_93U(...) \,
+#define Z_IS_94_EQ_94(...)   \,
+#define Z_IS_94U_EQ_94(...)  \,
+#define Z_IS_94_EQ_94U(...)  \,
+#define Z_IS_94U_EQ_94U(...) \,
+#define Z_IS_95_EQ_95(...)   \,
+#define Z_IS_95U_EQ_95(...)  \,
+#define Z_IS_95_EQ_95U(...)  \,
+#define Z_IS_95U_EQ_95U(...) \,
+#define Z_IS_96_EQ_96(...)   \,
+#define Z_IS_96U_EQ_96(...)  \,
+#define Z_IS_96_EQ_96U(...)  \,
+#define Z_IS_96U_EQ_96U(...) \,
+#define Z_IS_97_EQ_97(...)   \,
+#define Z_IS_97U_EQ_97(...)  \,
+#define Z_IS_97_EQ_97U(...)  \,
+#define Z_IS_97U_EQ_97U(...) \,
+#define Z_IS_98_EQ_98(...)   \,
+#define Z_IS_98U_EQ_98(...)  \,
+#define Z_IS_98_EQ_98U(...)  \,
+#define Z_IS_98U_EQ_98U(...) \,
+#define Z_IS_99_EQ_99(...)   \,
+#define Z_IS_99U_EQ_99(...)  \,
+#define Z_IS_99_EQ_99U(...)  \,
+#define Z_IS_99U_EQ_99U(...) \,
+#define Z_IS_100_EQ_100(...)   \,
+#define Z_IS_100U_EQ_100(...)  \,
+#define Z_IS_100_EQ_100U(...)  \,
+#define Z_IS_100U_EQ_100U(...) \,
+#define Z_IS_101_EQ_101(...)   \,
+#define Z_IS_101U_EQ_101(...)  \,
+#define Z_IS_101_EQ_101U(...)  \,
+#define Z_IS_101U_EQ_101U(...) \,
+#define Z_IS_102_EQ_102(...)   \,
+#define Z_IS_102U_EQ_102(...)  \,
+#define Z_IS_102_EQ_102U(...)  \,
+#define Z_IS_102U_EQ_102U(...) \,
+#define Z_IS_103_EQ_103(...)   \,
+#define Z_IS_103U_EQ_103(...)  \,
+#define Z_IS_103_EQ_103U(...)  \,
+#define Z_IS_103U_EQ_103U(...) \,
+#define Z_IS_104_EQ_104(...)   \,
+#define Z_IS_104U_EQ_104(...)  \,
+#define Z_IS_104_EQ_104U(...)  \,
+#define Z_IS_104U_EQ_104U(...) \,
+#define Z_IS_105_EQ_105(...)   \,
+#define Z_IS_105U_EQ_105(...)  \,
+#define Z_IS_105_EQ_105U(...)  \,
+#define Z_IS_105U_EQ_105U(...) \,
+#define Z_IS_106_EQ_106(...)   \,
+#define Z_IS_106U_EQ_106(...)  \,
+#define Z_IS_106_EQ_106U(...)  \,
+#define Z_IS_106U_EQ_106U(...) \,
+#define Z_IS_107_EQ_107(...)   \,
+#define Z_IS_107U_EQ_107(...)  \,
+#define Z_IS_107_EQ_107U(...)  \,
+#define Z_IS_107U_EQ_107U(...) \,
+#define Z_IS_108_EQ_108(...)   \,
+#define Z_IS_108U_EQ_108(...)  \,
+#define Z_IS_108_EQ_108U(...)  \,
+#define Z_IS_108U_EQ_108U(...) \,
+#define Z_IS_109_EQ_109(...)   \,
+#define Z_IS_109U_EQ_109(...)  \,
+#define Z_IS_109_EQ_109U(...)  \,
+#define Z_IS_109U_EQ_109U(...) \,
+#define Z_IS_110_EQ_110(...)   \,
+#define Z_IS_110U_EQ_110(...)  \,
+#define Z_IS_110_EQ_110U(...)  \,
+#define Z_IS_110U_EQ_110U(...) \,
+#define Z_IS_111_EQ_111(...)   \,
+#define Z_IS_111U_EQ_111(...)  \,
+#define Z_IS_111_EQ_111U(...)  \,
+#define Z_IS_111U_EQ_111U(...) \,
+#define Z_IS_112_EQ_112(...)   \,
+#define Z_IS_112U_EQ_112(...)  \,
+#define Z_IS_112_EQ_112U(...)  \,
+#define Z_IS_112U_EQ_112U(...) \,
+#define Z_IS_113_EQ_113(...)   \,
+#define Z_IS_113U_EQ_113(...)  \,
+#define Z_IS_113_EQ_113U(...)  \,
+#define Z_IS_113U_EQ_113U(...) \,
+#define Z_IS_114_EQ_114(...)   \,
+#define Z_IS_114U_EQ_114(...)  \,
+#define Z_IS_114_EQ_114U(...)  \,
+#define Z_IS_114U_EQ_114U(...) \,
+#define Z_IS_115_EQ_115(...)   \,
+#define Z_IS_115U_EQ_115(...)  \,
+#define Z_IS_115_EQ_115U(...)  \,
+#define Z_IS_115U_EQ_115U(...) \,
+#define Z_IS_116_EQ_116(...)   \,
+#define Z_IS_116U_EQ_116(...)  \,
+#define Z_IS_116_EQ_116U(...)  \,
+#define Z_IS_116U_EQ_116U(...) \,
+#define Z_IS_117_EQ_117(...)   \,
+#define Z_IS_117U_EQ_117(...)  \,
+#define Z_IS_117_EQ_117U(...)  \,
+#define Z_IS_117U_EQ_117U(...) \,
+#define Z_IS_118_EQ_118(...)   \,
+#define Z_IS_118U_EQ_118(...)  \,
+#define Z_IS_118_EQ_118U(...)  \,
+#define Z_IS_118U_EQ_118U(...) \,
+#define Z_IS_119_EQ_119(...)   \,
+#define Z_IS_119U_EQ_119(...)  \,
+#define Z_IS_119_EQ_119U(...)  \,
+#define Z_IS_119U_EQ_119U(...) \,
+#define Z_IS_120_EQ_120(...)   \,
+#define Z_IS_120U_EQ_120(...)  \,
+#define Z_IS_120_EQ_120U(...)  \,
+#define Z_IS_120U_EQ_120U(...) \,
+#define Z_IS_121_EQ_121(...)   \,
+#define Z_IS_121U_EQ_121(...)  \,
+#define Z_IS_121_EQ_121U(...)  \,
+#define Z_IS_121U_EQ_121U(...) \,
+#define Z_IS_122_EQ_122(...)   \,
+#define Z_IS_122U_EQ_122(...)  \,
+#define Z_IS_122_EQ_122U(...)  \,
+#define Z_IS_122U_EQ_122U(...) \,
+#define Z_IS_123_EQ_123(...)   \,
+#define Z_IS_123U_EQ_123(...)  \,
+#define Z_IS_123_EQ_123U(...)  \,
+#define Z_IS_123U_EQ_123U(...) \,
+#define Z_IS_124_EQ_124(...)   \,
+#define Z_IS_124U_EQ_124(...)  \,
+#define Z_IS_124_EQ_124U(...)  \,
+#define Z_IS_124U_EQ_124U(...) \,
+#define Z_IS_125_EQ_125(...)   \,
+#define Z_IS_125U_EQ_125(...)  \,
+#define Z_IS_125_EQ_125U(...)  \,
+#define Z_IS_125U_EQ_125U(...) \,
+#define Z_IS_126_EQ_126(...)   \,
+#define Z_IS_126U_EQ_126(...)  \,
+#define Z_IS_126_EQ_126U(...)  \,
+#define Z_IS_126U_EQ_126U(...) \,
+#define Z_IS_127_EQ_127(...)   \,
+#define Z_IS_127U_EQ_127(...)  \,
+#define Z_IS_127_EQ_127U(...)  \,
+#define Z_IS_127U_EQ_127U(...) \,
+#define Z_IS_128_EQ_128(...)   \,
+#define Z_IS_128U_EQ_128(...)  \,
+#define Z_IS_128_EQ_128U(...)  \,
+#define Z_IS_128U_EQ_128U(...) \,
+#define Z_IS_129_EQ_129(...)   \,
+#define Z_IS_129U_EQ_129(...)  \,
+#define Z_IS_129_EQ_129U(...)  \,
+#define Z_IS_129U_EQ_129U(...) \,
+#define Z_IS_130_EQ_130(...)   \,
+#define Z_IS_130U_EQ_130(...)  \,
+#define Z_IS_130_EQ_130U(...)  \,
+#define Z_IS_130U_EQ_130U(...) \,
+#define Z_IS_131_EQ_131(...)   \,
+#define Z_IS_131U_EQ_131(...)  \,
+#define Z_IS_131_EQ_131U(...)  \,
+#define Z_IS_131U_EQ_131U(...) \,
+#define Z_IS_132_EQ_132(...)   \,
+#define Z_IS_132U_EQ_132(...)  \,
+#define Z_IS_132_EQ_132U(...)  \,
+#define Z_IS_132U_EQ_132U(...) \,
+#define Z_IS_133_EQ_133(...)   \,
+#define Z_IS_133U_EQ_133(...)  \,
+#define Z_IS_133_EQ_133U(...)  \,
+#define Z_IS_133U_EQ_133U(...) \,
+#define Z_IS_134_EQ_134(...)   \,
+#define Z_IS_134U_EQ_134(...)  \,
+#define Z_IS_134_EQ_134U(...)  \,
+#define Z_IS_134U_EQ_134U(...) \,
+#define Z_IS_135_EQ_135(...)   \,
+#define Z_IS_135U_EQ_135(...)  \,
+#define Z_IS_135_EQ_135U(...)  \,
+#define Z_IS_135U_EQ_135U(...) \,
+#define Z_IS_136_EQ_136(...)   \,
+#define Z_IS_136U_EQ_136(...)  \,
+#define Z_IS_136_EQ_136U(...)  \,
+#define Z_IS_136U_EQ_136U(...) \,
+#define Z_IS_137_EQ_137(...)   \,
+#define Z_IS_137U_EQ_137(...)  \,
+#define Z_IS_137_EQ_137U(...)  \,
+#define Z_IS_137U_EQ_137U(...) \,
+#define Z_IS_138_EQ_138(...)   \,
+#define Z_IS_138U_EQ_138(...)  \,
+#define Z_IS_138_EQ_138U(...)  \,
+#define Z_IS_138U_EQ_138U(...) \,
+#define Z_IS_139_EQ_139(...)   \,
+#define Z_IS_139U_EQ_139(...)  \,
+#define Z_IS_139_EQ_139U(...)  \,
+#define Z_IS_139U_EQ_139U(...) \,
+#define Z_IS_140_EQ_140(...)   \,
+#define Z_IS_140U_EQ_140(...)  \,
+#define Z_IS_140_EQ_140U(...)  \,
+#define Z_IS_140U_EQ_140U(...) \,
+#define Z_IS_141_EQ_141(...)   \,
+#define Z_IS_141U_EQ_141(...)  \,
+#define Z_IS_141_EQ_141U(...)  \,
+#define Z_IS_141U_EQ_141U(...) \,
+#define Z_IS_142_EQ_142(...)   \,
+#define Z_IS_142U_EQ_142(...)  \,
+#define Z_IS_142_EQ_142U(...)  \,
+#define Z_IS_142U_EQ_142U(...) \,
+#define Z_IS_143_EQ_143(...)   \,
+#define Z_IS_143U_EQ_143(...)  \,
+#define Z_IS_143_EQ_143U(...)  \,
+#define Z_IS_143U_EQ_143U(...) \,
+#define Z_IS_144_EQ_144(...)   \,
+#define Z_IS_144U_EQ_144(...)  \,
+#define Z_IS_144_EQ_144U(...)  \,
+#define Z_IS_144U_EQ_144U(...) \,
+#define Z_IS_145_EQ_145(...)   \,
+#define Z_IS_145U_EQ_145(...)  \,
+#define Z_IS_145_EQ_145U(...)  \,
+#define Z_IS_145U_EQ_145U(...) \,
+#define Z_IS_146_EQ_146(...)   \,
+#define Z_IS_146U_EQ_146(...)  \,
+#define Z_IS_146_EQ_146U(...)  \,
+#define Z_IS_146U_EQ_146U(...) \,
+#define Z_IS_147_EQ_147(...)   \,
+#define Z_IS_147U_EQ_147(...)  \,
+#define Z_IS_147_EQ_147U(...)  \,
+#define Z_IS_147U_EQ_147U(...) \,
+#define Z_IS_148_EQ_148(...)   \,
+#define Z_IS_148U_EQ_148(...)  \,
+#define Z_IS_148_EQ_148U(...)  \,
+#define Z_IS_148U_EQ_148U(...) \,
+#define Z_IS_149_EQ_149(...)   \,
+#define Z_IS_149U_EQ_149(...)  \,
+#define Z_IS_149_EQ_149U(...)  \,
+#define Z_IS_149U_EQ_149U(...) \,
+#define Z_IS_150_EQ_150(...)   \,
+#define Z_IS_150U_EQ_150(...)  \,
+#define Z_IS_150_EQ_150U(...)  \,
+#define Z_IS_150U_EQ_150U(...) \,
+#define Z_IS_151_EQ_151(...)   \,
+#define Z_IS_151U_EQ_151(...)  \,
+#define Z_IS_151_EQ_151U(...)  \,
+#define Z_IS_151U_EQ_151U(...) \,
+#define Z_IS_152_EQ_152(...)   \,
+#define Z_IS_152U_EQ_152(...)  \,
+#define Z_IS_152_EQ_152U(...)  \,
+#define Z_IS_152U_EQ_152U(...) \,
+#define Z_IS_153_EQ_153(...)   \,
+#define Z_IS_153U_EQ_153(...)  \,
+#define Z_IS_153_EQ_153U(...)  \,
+#define Z_IS_153U_EQ_153U(...) \,
+#define Z_IS_154_EQ_154(...)   \,
+#define Z_IS_154U_EQ_154(...)  \,
+#define Z_IS_154_EQ_154U(...)  \,
+#define Z_IS_154U_EQ_154U(...) \,
+#define Z_IS_155_EQ_155(...)   \,
+#define Z_IS_155U_EQ_155(...)  \,
+#define Z_IS_155_EQ_155U(...)  \,
+#define Z_IS_155U_EQ_155U(...) \,
+#define Z_IS_156_EQ_156(...)   \,
+#define Z_IS_156U_EQ_156(...)  \,
+#define Z_IS_156_EQ_156U(...)  \,
+#define Z_IS_156U_EQ_156U(...) \,
+#define Z_IS_157_EQ_157(...)   \,
+#define Z_IS_157U_EQ_157(...)  \,
+#define Z_IS_157_EQ_157U(...)  \,
+#define Z_IS_157U_EQ_157U(...) \,
+#define Z_IS_158_EQ_158(...)   \,
+#define Z_IS_158U_EQ_158(...)  \,
+#define Z_IS_158_EQ_158U(...)  \,
+#define Z_IS_158U_EQ_158U(...) \,
+#define Z_IS_159_EQ_159(...)   \,
+#define Z_IS_159U_EQ_159(...)  \,
+#define Z_IS_159_EQ_159U(...)  \,
+#define Z_IS_159U_EQ_159U(...) \,
+#define Z_IS_160_EQ_160(...)   \,
+#define Z_IS_160U_EQ_160(...)  \,
+#define Z_IS_160_EQ_160U(...)  \,
+#define Z_IS_160U_EQ_160U(...) \,
+#define Z_IS_161_EQ_161(...)   \,
+#define Z_IS_161U_EQ_161(...)  \,
+#define Z_IS_161_EQ_161U(...)  \,
+#define Z_IS_161U_EQ_161U(...) \,
+#define Z_IS_162_EQ_162(...)   \,
+#define Z_IS_162U_EQ_162(...)  \,
+#define Z_IS_162_EQ_162U(...)  \,
+#define Z_IS_162U_EQ_162U(...) \,
+#define Z_IS_163_EQ_163(...)   \,
+#define Z_IS_163U_EQ_163(...)  \,
+#define Z_IS_163_EQ_163U(...)  \,
+#define Z_IS_163U_EQ_163U(...) \,
+#define Z_IS_164_EQ_164(...)   \,
+#define Z_IS_164U_EQ_164(...)  \,
+#define Z_IS_164_EQ_164U(...)  \,
+#define Z_IS_164U_EQ_164U(...) \,
+#define Z_IS_165_EQ_165(...)   \,
+#define Z_IS_165U_EQ_165(...)  \,
+#define Z_IS_165_EQ_165U(...)  \,
+#define Z_IS_165U_EQ_165U(...) \,
+#define Z_IS_166_EQ_166(...)   \,
+#define Z_IS_166U_EQ_166(...)  \,
+#define Z_IS_166_EQ_166U(...)  \,
+#define Z_IS_166U_EQ_166U(...) \,
+#define Z_IS_167_EQ_167(...)   \,
+#define Z_IS_167U_EQ_167(...)  \,
+#define Z_IS_167_EQ_167U(...)  \,
+#define Z_IS_167U_EQ_167U(...) \,
+#define Z_IS_168_EQ_168(...)   \,
+#define Z_IS_168U_EQ_168(...)  \,
+#define Z_IS_168_EQ_168U(...)  \,
+#define Z_IS_168U_EQ_168U(...) \,
+#define Z_IS_169_EQ_169(...)   \,
+#define Z_IS_169U_EQ_169(...)  \,
+#define Z_IS_169_EQ_169U(...)  \,
+#define Z_IS_169U_EQ_169U(...) \,
+#define Z_IS_170_EQ_170(...)   \,
+#define Z_IS_170U_EQ_170(...)  \,
+#define Z_IS_170_EQ_170U(...)  \,
+#define Z_IS_170U_EQ_170U(...) \,
+#define Z_IS_171_EQ_171(...)   \,
+#define Z_IS_171U_EQ_171(...)  \,
+#define Z_IS_171_EQ_171U(...)  \,
+#define Z_IS_171U_EQ_171U(...) \,
+#define Z_IS_172_EQ_172(...)   \,
+#define Z_IS_172U_EQ_172(...)  \,
+#define Z_IS_172_EQ_172U(...)  \,
+#define Z_IS_172U_EQ_172U(...) \,
+#define Z_IS_173_EQ_173(...)   \,
+#define Z_IS_173U_EQ_173(...)  \,
+#define Z_IS_173_EQ_173U(...)  \,
+#define Z_IS_173U_EQ_173U(...) \,
+#define Z_IS_174_EQ_174(...)   \,
+#define Z_IS_174U_EQ_174(...)  \,
+#define Z_IS_174_EQ_174U(...)  \,
+#define Z_IS_174U_EQ_174U(...) \,
+#define Z_IS_175_EQ_175(...)   \,
+#define Z_IS_175U_EQ_175(...)  \,
+#define Z_IS_175_EQ_175U(...)  \,
+#define Z_IS_175U_EQ_175U(...) \,
+#define Z_IS_176_EQ_176(...)   \,
+#define Z_IS_176U_EQ_176(...)  \,
+#define Z_IS_176_EQ_176U(...)  \,
+#define Z_IS_176U_EQ_176U(...) \,
+#define Z_IS_177_EQ_177(...)   \,
+#define Z_IS_177U_EQ_177(...)  \,
+#define Z_IS_177_EQ_177U(...)  \,
+#define Z_IS_177U_EQ_177U(...) \,
+#define Z_IS_178_EQ_178(...)   \,
+#define Z_IS_178U_EQ_178(...)  \,
+#define Z_IS_178_EQ_178U(...)  \,
+#define Z_IS_178U_EQ_178U(...) \,
+#define Z_IS_179_EQ_179(...)   \,
+#define Z_IS_179U_EQ_179(...)  \,
+#define Z_IS_179_EQ_179U(...)  \,
+#define Z_IS_179U_EQ_179U(...) \,
+#define Z_IS_180_EQ_180(...)   \,
+#define Z_IS_180U_EQ_180(...)  \,
+#define Z_IS_180_EQ_180U(...)  \,
+#define Z_IS_180U_EQ_180U(...) \,
+#define Z_IS_181_EQ_181(...)   \,
+#define Z_IS_181U_EQ_181(...)  \,
+#define Z_IS_181_EQ_181U(...)  \,
+#define Z_IS_181U_EQ_181U(...) \,
+#define Z_IS_182_EQ_182(...)   \,
+#define Z_IS_182U_EQ_182(...)  \,
+#define Z_IS_182_EQ_182U(...)  \,
+#define Z_IS_182U_EQ_182U(...) \,
+#define Z_IS_183_EQ_183(...)   \,
+#define Z_IS_183U_EQ_183(...)  \,
+#define Z_IS_183_EQ_183U(...)  \,
+#define Z_IS_183U_EQ_183U(...) \,
+#define Z_IS_184_EQ_184(...)   \,
+#define Z_IS_184U_EQ_184(...)  \,
+#define Z_IS_184_EQ_184U(...)  \,
+#define Z_IS_184U_EQ_184U(...) \,
+#define Z_IS_185_EQ_185(...)   \,
+#define Z_IS_185U_EQ_185(...)  \,
+#define Z_IS_185_EQ_185U(...)  \,
+#define Z_IS_185U_EQ_185U(...) \,
+#define Z_IS_186_EQ_186(...)   \,
+#define Z_IS_186U_EQ_186(...)  \,
+#define Z_IS_186_EQ_186U(...)  \,
+#define Z_IS_186U_EQ_186U(...) \,
+#define Z_IS_187_EQ_187(...)   \,
+#define Z_IS_187U_EQ_187(...)  \,
+#define Z_IS_187_EQ_187U(...)  \,
+#define Z_IS_187U_EQ_187U(...) \,
+#define Z_IS_188_EQ_188(...)   \,
+#define Z_IS_188U_EQ_188(...)  \,
+#define Z_IS_188_EQ_188U(...)  \,
+#define Z_IS_188U_EQ_188U(...) \,
+#define Z_IS_189_EQ_189(...)   \,
+#define Z_IS_189U_EQ_189(...)  \,
+#define Z_IS_189_EQ_189U(...)  \,
+#define Z_IS_189U_EQ_189U(...) \,
+#define Z_IS_190_EQ_190(...)   \,
+#define Z_IS_190U_EQ_190(...)  \,
+#define Z_IS_190_EQ_190U(...)  \,
+#define Z_IS_190U_EQ_190U(...) \,
+#define Z_IS_191_EQ_191(...)   \,
+#define Z_IS_191U_EQ_191(...)  \,
+#define Z_IS_191_EQ_191U(...)  \,
+#define Z_IS_191U_EQ_191U(...) \,
+#define Z_IS_192_EQ_192(...)   \,
+#define Z_IS_192U_EQ_192(...)  \,
+#define Z_IS_192_EQ_192U(...)  \,
+#define Z_IS_192U_EQ_192U(...) \,
+#define Z_IS_193_EQ_193(...)   \,
+#define Z_IS_193U_EQ_193(...)  \,
+#define Z_IS_193_EQ_193U(...)  \,
+#define Z_IS_193U_EQ_193U(...) \,
+#define Z_IS_194_EQ_194(...)   \,
+#define Z_IS_194U_EQ_194(...)  \,
+#define Z_IS_194_EQ_194U(...)  \,
+#define Z_IS_194U_EQ_194U(...) \,
+#define Z_IS_195_EQ_195(...)   \,
+#define Z_IS_195U_EQ_195(...)  \,
+#define Z_IS_195_EQ_195U(...)  \,
+#define Z_IS_195U_EQ_195U(...) \,
+#define Z_IS_196_EQ_196(...)   \,
+#define Z_IS_196U_EQ_196(...)  \,
+#define Z_IS_196_EQ_196U(...)  \,
+#define Z_IS_196U_EQ_196U(...) \,
+#define Z_IS_197_EQ_197(...)   \,
+#define Z_IS_197U_EQ_197(...)  \,
+#define Z_IS_197_EQ_197U(...)  \,
+#define Z_IS_197U_EQ_197U(...) \,
+#define Z_IS_198_EQ_198(...)   \,
+#define Z_IS_198U_EQ_198(...)  \,
+#define Z_IS_198_EQ_198U(...)  \,
+#define Z_IS_198U_EQ_198U(...) \,
+#define Z_IS_199_EQ_199(...)   \,
+#define Z_IS_199U_EQ_199(...)  \,
+#define Z_IS_199_EQ_199U(...)  \,
+#define Z_IS_199U_EQ_199U(...) \,
+#define Z_IS_200_EQ_200(...)   \,
+#define Z_IS_200U_EQ_200(...)  \,
+#define Z_IS_200_EQ_200U(...)  \,
+#define Z_IS_200U_EQ_200U(...) \,
+#define Z_IS_201_EQ_201(...)   \,
+#define Z_IS_201U_EQ_201(...)  \,
+#define Z_IS_201_EQ_201U(...)  \,
+#define Z_IS_201U_EQ_201U(...) \,
+#define Z_IS_202_EQ_202(...)   \,
+#define Z_IS_202U_EQ_202(...)  \,
+#define Z_IS_202_EQ_202U(...)  \,
+#define Z_IS_202U_EQ_202U(...) \,
+#define Z_IS_203_EQ_203(...)   \,
+#define Z_IS_203U_EQ_203(...)  \,
+#define Z_IS_203_EQ_203U(...)  \,
+#define Z_IS_203U_EQ_203U(...) \,
+#define Z_IS_204_EQ_204(...)   \,
+#define Z_IS_204U_EQ_204(...)  \,
+#define Z_IS_204_EQ_204U(...)  \,
+#define Z_IS_204U_EQ_204U(...) \,
+#define Z_IS_205_EQ_205(...)   \,
+#define Z_IS_205U_EQ_205(...)  \,
+#define Z_IS_205_EQ_205U(...)  \,
+#define Z_IS_205U_EQ_205U(...) \,
+#define Z_IS_206_EQ_206(...)   \,
+#define Z_IS_206U_EQ_206(...)  \,
+#define Z_IS_206_EQ_206U(...)  \,
+#define Z_IS_206U_EQ_206U(...) \,
+#define Z_IS_207_EQ_207(...)   \,
+#define Z_IS_207U_EQ_207(...)  \,
+#define Z_IS_207_EQ_207U(...)  \,
+#define Z_IS_207U_EQ_207U(...) \,
+#define Z_IS_208_EQ_208(...)   \,
+#define Z_IS_208U_EQ_208(...)  \,
+#define Z_IS_208_EQ_208U(...)  \,
+#define Z_IS_208U_EQ_208U(...) \,
+#define Z_IS_209_EQ_209(...)   \,
+#define Z_IS_209U_EQ_209(...)  \,
+#define Z_IS_209_EQ_209U(...)  \,
+#define Z_IS_209U_EQ_209U(...) \,
+#define Z_IS_210_EQ_210(...)   \,
+#define Z_IS_210U_EQ_210(...)  \,
+#define Z_IS_210_EQ_210U(...)  \,
+#define Z_IS_210U_EQ_210U(...) \,
+#define Z_IS_211_EQ_211(...)   \,
+#define Z_IS_211U_EQ_211(...)  \,
+#define Z_IS_211_EQ_211U(...)  \,
+#define Z_IS_211U_EQ_211U(...) \,
+#define Z_IS_212_EQ_212(...)   \,
+#define Z_IS_212U_EQ_212(...)  \,
+#define Z_IS_212_EQ_212U(...)  \,
+#define Z_IS_212U_EQ_212U(...) \,
+#define Z_IS_213_EQ_213(...)   \,
+#define Z_IS_213U_EQ_213(...)  \,
+#define Z_IS_213_EQ_213U(...)  \,
+#define Z_IS_213U_EQ_213U(...) \,
+#define Z_IS_214_EQ_214(...)   \,
+#define Z_IS_214U_EQ_214(...)  \,
+#define Z_IS_214_EQ_214U(...)  \,
+#define Z_IS_214U_EQ_214U(...) \,
+#define Z_IS_215_EQ_215(...)   \,
+#define Z_IS_215U_EQ_215(...)  \,
+#define Z_IS_215_EQ_215U(...)  \,
+#define Z_IS_215U_EQ_215U(...) \,
+#define Z_IS_216_EQ_216(...)   \,
+#define Z_IS_216U_EQ_216(...)  \,
+#define Z_IS_216_EQ_216U(...)  \,
+#define Z_IS_216U_EQ_216U(...) \,
+#define Z_IS_217_EQ_217(...)   \,
+#define Z_IS_217U_EQ_217(...)  \,
+#define Z_IS_217_EQ_217U(...)  \,
+#define Z_IS_217U_EQ_217U(...) \,
+#define Z_IS_218_EQ_218(...)   \,
+#define Z_IS_218U_EQ_218(...)  \,
+#define Z_IS_218_EQ_218U(...)  \,
+#define Z_IS_218U_EQ_218U(...) \,
+#define Z_IS_219_EQ_219(...)   \,
+#define Z_IS_219U_EQ_219(...)  \,
+#define Z_IS_219_EQ_219U(...)  \,
+#define Z_IS_219U_EQ_219U(...) \,
+#define Z_IS_220_EQ_220(...)   \,
+#define Z_IS_220U_EQ_220(...)  \,
+#define Z_IS_220_EQ_220U(...)  \,
+#define Z_IS_220U_EQ_220U(...) \,
+#define Z_IS_221_EQ_221(...)   \,
+#define Z_IS_221U_EQ_221(...)  \,
+#define Z_IS_221_EQ_221U(...)  \,
+#define Z_IS_221U_EQ_221U(...) \,
+#define Z_IS_222_EQ_222(...)   \,
+#define Z_IS_222U_EQ_222(...)  \,
+#define Z_IS_222_EQ_222U(...)  \,
+#define Z_IS_222U_EQ_222U(...) \,
+#define Z_IS_223_EQ_223(...)   \,
+#define Z_IS_223U_EQ_223(...)  \,
+#define Z_IS_223_EQ_223U(...)  \,
+#define Z_IS_223U_EQ_223U(...) \,
+#define Z_IS_224_EQ_224(...)   \,
+#define Z_IS_224U_EQ_224(...)  \,
+#define Z_IS_224_EQ_224U(...)  \,
+#define Z_IS_224U_EQ_224U(...) \,
+#define Z_IS_225_EQ_225(...)   \,
+#define Z_IS_225U_EQ_225(...)  \,
+#define Z_IS_225_EQ_225U(...)  \,
+#define Z_IS_225U_EQ_225U(...) \,
+#define Z_IS_226_EQ_226(...)   \,
+#define Z_IS_226U_EQ_226(...)  \,
+#define Z_IS_226_EQ_226U(...)  \,
+#define Z_IS_226U_EQ_226U(...) \,
+#define Z_IS_227_EQ_227(...)   \,
+#define Z_IS_227U_EQ_227(...)  \,
+#define Z_IS_227_EQ_227U(...)  \,
+#define Z_IS_227U_EQ_227U(...) \,
+#define Z_IS_228_EQ_228(...)   \,
+#define Z_IS_228U_EQ_228(...)  \,
+#define Z_IS_228_EQ_228U(...)  \,
+#define Z_IS_228U_EQ_228U(...) \,
+#define Z_IS_229_EQ_229(...)   \,
+#define Z_IS_229U_EQ_229(...)  \,
+#define Z_IS_229_EQ_229U(...)  \,
+#define Z_IS_229U_EQ_229U(...) \,
+#define Z_IS_230_EQ_230(...)   \,
+#define Z_IS_230U_EQ_230(...)  \,
+#define Z_IS_230_EQ_230U(...)  \,
+#define Z_IS_230U_EQ_230U(...) \,
+#define Z_IS_231_EQ_231(...)   \,
+#define Z_IS_231U_EQ_231(...)  \,
+#define Z_IS_231_EQ_231U(...)  \,
+#define Z_IS_231U_EQ_231U(...) \,
+#define Z_IS_232_EQ_232(...)   \,
+#define Z_IS_232U_EQ_232(...)  \,
+#define Z_IS_232_EQ_232U(...)  \,
+#define Z_IS_232U_EQ_232U(...) \,
+#define Z_IS_233_EQ_233(...)   \,
+#define Z_IS_233U_EQ_233(...)  \,
+#define Z_IS_233_EQ_233U(...)  \,
+#define Z_IS_233U_EQ_233U(...) \,
+#define Z_IS_234_EQ_234(...)   \,
+#define Z_IS_234U_EQ_234(...)  \,
+#define Z_IS_234_EQ_234U(...)  \,
+#define Z_IS_234U_EQ_234U(...) \,
+#define Z_IS_235_EQ_235(...)   \,
+#define Z_IS_235U_EQ_235(...)  \,
+#define Z_IS_235_EQ_235U(...)  \,
+#define Z_IS_235U_EQ_235U(...) \,
+#define Z_IS_236_EQ_236(...)   \,
+#define Z_IS_236U_EQ_236(...)  \,
+#define Z_IS_236_EQ_236U(...)  \,
+#define Z_IS_236U_EQ_236U(...) \,
+#define Z_IS_237_EQ_237(...)   \,
+#define Z_IS_237U_EQ_237(...)  \,
+#define Z_IS_237_EQ_237U(...)  \,
+#define Z_IS_237U_EQ_237U(...) \,
+#define Z_IS_238_EQ_238(...)   \,
+#define Z_IS_238U_EQ_238(...)  \,
+#define Z_IS_238_EQ_238U(...)  \,
+#define Z_IS_238U_EQ_238U(...) \,
+#define Z_IS_239_EQ_239(...)   \,
+#define Z_IS_239U_EQ_239(...)  \,
+#define Z_IS_239_EQ_239U(...)  \,
+#define Z_IS_239U_EQ_239U(...) \,
+#define Z_IS_240_EQ_240(...)   \,
+#define Z_IS_240U_EQ_240(...)  \,
+#define Z_IS_240_EQ_240U(...)  \,
+#define Z_IS_240U_EQ_240U(...) \,
+#define Z_IS_241_EQ_241(...)   \,
+#define Z_IS_241U_EQ_241(...)  \,
+#define Z_IS_241_EQ_241U(...)  \,
+#define Z_IS_241U_EQ_241U(...) \,
+#define Z_IS_242_EQ_242(...)   \,
+#define Z_IS_242U_EQ_242(...)  \,
+#define Z_IS_242_EQ_242U(...)  \,
+#define Z_IS_242U_EQ_242U(...) \,
+#define Z_IS_243_EQ_243(...)   \,
+#define Z_IS_243U_EQ_243(...)  \,
+#define Z_IS_243_EQ_243U(...)  \,
+#define Z_IS_243U_EQ_243U(...) \,
+#define Z_IS_244_EQ_244(...)   \,
+#define Z_IS_244U_EQ_244(...)  \,
+#define Z_IS_244_EQ_244U(...)  \,
+#define Z_IS_244U_EQ_244U(...) \,
+#define Z_IS_245_EQ_245(...)   \,
+#define Z_IS_245U_EQ_245(...)  \,
+#define Z_IS_245_EQ_245U(...)  \,
+#define Z_IS_245U_EQ_245U(...) \,
+#define Z_IS_246_EQ_246(...)   \,
+#define Z_IS_246U_EQ_246(...)  \,
+#define Z_IS_246_EQ_246U(...)  \,
+#define Z_IS_246U_EQ_246U(...) \,
+#define Z_IS_247_EQ_247(...)   \,
+#define Z_IS_247U_EQ_247(...)  \,
+#define Z_IS_247_EQ_247U(...)  \,
+#define Z_IS_247U_EQ_247U(...) \,
+#define Z_IS_248_EQ_248(...)   \,
+#define Z_IS_248U_EQ_248(...)  \,
+#define Z_IS_248_EQ_248U(...)  \,
+#define Z_IS_248U_EQ_248U(...) \,
+#define Z_IS_249_EQ_249(...)   \,
+#define Z_IS_249U_EQ_249(...)  \,
+#define Z_IS_249_EQ_249U(...)  \,
+#define Z_IS_249U_EQ_249U(...) \,
+#define Z_IS_250_EQ_250(...)   \,
+#define Z_IS_250U_EQ_250(...)  \,
+#define Z_IS_250_EQ_250U(...)  \,
+#define Z_IS_250U_EQ_250U(...) \,
+#define Z_IS_251_EQ_251(...)   \,
+#define Z_IS_251U_EQ_251(...)  \,
+#define Z_IS_251_EQ_251U(...)  \,
+#define Z_IS_251U_EQ_251U(...) \,
+#define Z_IS_252_EQ_252(...)   \,
+#define Z_IS_252U_EQ_252(...)  \,
+#define Z_IS_252_EQ_252U(...)  \,
+#define Z_IS_252U_EQ_252U(...) \,
+#define Z_IS_253_EQ_253(...)   \,
+#define Z_IS_253U_EQ_253(...)  \,
+#define Z_IS_253_EQ_253U(...)  \,
+#define Z_IS_253U_EQ_253U(...) \,
+#define Z_IS_254_EQ_254(...)   \,
+#define Z_IS_254U_EQ_254(...)  \,
+#define Z_IS_254_EQ_254U(...)  \,
+#define Z_IS_254U_EQ_254U(...) \,
+#define Z_IS_255_EQ_255(...)   \,
+#define Z_IS_255U_EQ_255(...)  \,
+#define Z_IS_255_EQ_255U(...)  \,
+#define Z_IS_255U_EQ_255U(...) \,
+#define Z_IS_256_EQ_256(...)   \,
+#define Z_IS_256U_EQ_256(...)  \,
+#define Z_IS_256_EQ_256U(...)  \,
+#define Z_IS_256U_EQ_256U(...) \,
+#define Z_IS_257_EQ_257(...)   \,
+#define Z_IS_257U_EQ_257(...)  \,
+#define Z_IS_257_EQ_257U(...)  \,
+#define Z_IS_257U_EQ_257U(...) \,
+#define Z_IS_258_EQ_258(...)   \,
+#define Z_IS_258U_EQ_258(...)  \,
+#define Z_IS_258_EQ_258U(...)  \,
+#define Z_IS_258U_EQ_258U(...) \,
+#define Z_IS_259_EQ_259(...)   \,
+#define Z_IS_259U_EQ_259(...)  \,
+#define Z_IS_259_EQ_259U(...)  \,
+#define Z_IS_259U_EQ_259U(...) \,
+#define Z_IS_260_EQ_260(...)   \,
+#define Z_IS_260U_EQ_260(...)  \,
+#define Z_IS_260_EQ_260U(...)  \,
+#define Z_IS_260U_EQ_260U(...) \,
+#define Z_IS_261_EQ_261(...)   \,
+#define Z_IS_261U_EQ_261(...)  \,
+#define Z_IS_261_EQ_261U(...)  \,
+#define Z_IS_261U_EQ_261U(...) \,
+#define Z_IS_262_EQ_262(...)   \,
+#define Z_IS_262U_EQ_262(...)  \,
+#define Z_IS_262_EQ_262U(...)  \,
+#define Z_IS_262U_EQ_262U(...) \,
+#define Z_IS_263_EQ_263(...)   \,
+#define Z_IS_263U_EQ_263(...)  \,
+#define Z_IS_263_EQ_263U(...)  \,
+#define Z_IS_263U_EQ_263U(...) \,
+#define Z_IS_264_EQ_264(...)   \,
+#define Z_IS_264U_EQ_264(...)  \,
+#define Z_IS_264_EQ_264U(...)  \,
+#define Z_IS_264U_EQ_264U(...) \,
+#define Z_IS_265_EQ_265(...)   \,
+#define Z_IS_265U_EQ_265(...)  \,
+#define Z_IS_265_EQ_265U(...)  \,
+#define Z_IS_265U_EQ_265U(...) \,
+#define Z_IS_266_EQ_266(...)   \,
+#define Z_IS_266U_EQ_266(...)  \,
+#define Z_IS_266_EQ_266U(...)  \,
+#define Z_IS_266U_EQ_266U(...) \,
+#define Z_IS_267_EQ_267(...)   \,
+#define Z_IS_267U_EQ_267(...)  \,
+#define Z_IS_267_EQ_267U(...)  \,
+#define Z_IS_267U_EQ_267U(...) \,
+#define Z_IS_268_EQ_268(...)   \,
+#define Z_IS_268U_EQ_268(...)  \,
+#define Z_IS_268_EQ_268U(...)  \,
+#define Z_IS_268U_EQ_268U(...) \,
+#define Z_IS_269_EQ_269(...)   \,
+#define Z_IS_269U_EQ_269(...)  \,
+#define Z_IS_269_EQ_269U(...)  \,
+#define Z_IS_269U_EQ_269U(...) \,
+#define Z_IS_270_EQ_270(...)   \,
+#define Z_IS_270U_EQ_270(...)  \,
+#define Z_IS_270_EQ_270U(...)  \,
+#define Z_IS_270U_EQ_270U(...) \,
+#define Z_IS_271_EQ_271(...)   \,
+#define Z_IS_271U_EQ_271(...)  \,
+#define Z_IS_271_EQ_271U(...)  \,
+#define Z_IS_271U_EQ_271U(...) \,
+#define Z_IS_272_EQ_272(...)   \,
+#define Z_IS_272U_EQ_272(...)  \,
+#define Z_IS_272_EQ_272U(...)  \,
+#define Z_IS_272U_EQ_272U(...) \,
+#define Z_IS_273_EQ_273(...)   \,
+#define Z_IS_273U_EQ_273(...)  \,
+#define Z_IS_273_EQ_273U(...)  \,
+#define Z_IS_273U_EQ_273U(...) \,
+#define Z_IS_274_EQ_274(...)   \,
+#define Z_IS_274U_EQ_274(...)  \,
+#define Z_IS_274_EQ_274U(...)  \,
+#define Z_IS_274U_EQ_274U(...) \,
+#define Z_IS_275_EQ_275(...)   \,
+#define Z_IS_275U_EQ_275(...)  \,
+#define Z_IS_275_EQ_275U(...)  \,
+#define Z_IS_275U_EQ_275U(...) \,
+#define Z_IS_276_EQ_276(...)   \,
+#define Z_IS_276U_EQ_276(...)  \,
+#define Z_IS_276_EQ_276U(...)  \,
+#define Z_IS_276U_EQ_276U(...) \,
+#define Z_IS_277_EQ_277(...)   \,
+#define Z_IS_277U_EQ_277(...)  \,
+#define Z_IS_277_EQ_277U(...)  \,
+#define Z_IS_277U_EQ_277U(...) \,
+#define Z_IS_278_EQ_278(...)   \,
+#define Z_IS_278U_EQ_278(...)  \,
+#define Z_IS_278_EQ_278U(...)  \,
+#define Z_IS_278U_EQ_278U(...) \,
+#define Z_IS_279_EQ_279(...)   \,
+#define Z_IS_279U_EQ_279(...)  \,
+#define Z_IS_279_EQ_279U(...)  \,
+#define Z_IS_279U_EQ_279U(...) \,
+#define Z_IS_280_EQ_280(...)   \,
+#define Z_IS_280U_EQ_280(...)  \,
+#define Z_IS_280_EQ_280U(...)  \,
+#define Z_IS_280U_EQ_280U(...) \,
+#define Z_IS_281_EQ_281(...)   \,
+#define Z_IS_281U_EQ_281(...)  \,
+#define Z_IS_281_EQ_281U(...)  \,
+#define Z_IS_281U_EQ_281U(...) \,
+#define Z_IS_282_EQ_282(...)   \,
+#define Z_IS_282U_EQ_282(...)  \,
+#define Z_IS_282_EQ_282U(...)  \,
+#define Z_IS_282U_EQ_282U(...) \,
+#define Z_IS_283_EQ_283(...)   \,
+#define Z_IS_283U_EQ_283(...)  \,
+#define Z_IS_283_EQ_283U(...)  \,
+#define Z_IS_283U_EQ_283U(...) \,
+#define Z_IS_284_EQ_284(...)   \,
+#define Z_IS_284U_EQ_284(...)  \,
+#define Z_IS_284_EQ_284U(...)  \,
+#define Z_IS_284U_EQ_284U(...) \,
+#define Z_IS_285_EQ_285(...)   \,
+#define Z_IS_285U_EQ_285(...)  \,
+#define Z_IS_285_EQ_285U(...)  \,
+#define Z_IS_285U_EQ_285U(...) \,
+#define Z_IS_286_EQ_286(...)   \,
+#define Z_IS_286U_EQ_286(...)  \,
+#define Z_IS_286_EQ_286U(...)  \,
+#define Z_IS_286U_EQ_286U(...) \,
+#define Z_IS_287_EQ_287(...)   \,
+#define Z_IS_287U_EQ_287(...)  \,
+#define Z_IS_287_EQ_287U(...)  \,
+#define Z_IS_287U_EQ_287U(...) \,
+#define Z_IS_288_EQ_288(...)   \,
+#define Z_IS_288U_EQ_288(...)  \,
+#define Z_IS_288_EQ_288U(...)  \,
+#define Z_IS_288U_EQ_288U(...) \,
+#define Z_IS_289_EQ_289(...)   \,
+#define Z_IS_289U_EQ_289(...)  \,
+#define Z_IS_289_EQ_289U(...)  \,
+#define Z_IS_289U_EQ_289U(...) \,
+#define Z_IS_290_EQ_290(...)   \,
+#define Z_IS_290U_EQ_290(...)  \,
+#define Z_IS_290_EQ_290U(...)  \,
+#define Z_IS_290U_EQ_290U(...) \,
+#define Z_IS_291_EQ_291(...)   \,
+#define Z_IS_291U_EQ_291(...)  \,
+#define Z_IS_291_EQ_291U(...)  \,
+#define Z_IS_291U_EQ_291U(...) \,
+#define Z_IS_292_EQ_292(...)   \,
+#define Z_IS_292U_EQ_292(...)  \,
+#define Z_IS_292_EQ_292U(...)  \,
+#define Z_IS_292U_EQ_292U(...) \,
+#define Z_IS_293_EQ_293(...)   \,
+#define Z_IS_293U_EQ_293(...)  \,
+#define Z_IS_293_EQ_293U(...)  \,
+#define Z_IS_293U_EQ_293U(...) \,
+#define Z_IS_294_EQ_294(...)   \,
+#define Z_IS_294U_EQ_294(...)  \,
+#define Z_IS_294_EQ_294U(...)  \,
+#define Z_IS_294U_EQ_294U(...) \,
+#define Z_IS_295_EQ_295(...)   \,
+#define Z_IS_295U_EQ_295(...)  \,
+#define Z_IS_295_EQ_295U(...)  \,
+#define Z_IS_295U_EQ_295U(...) \,
+#define Z_IS_296_EQ_296(...)   \,
+#define Z_IS_296U_EQ_296(...)  \,
+#define Z_IS_296_EQ_296U(...)  \,
+#define Z_IS_296U_EQ_296U(...) \,
+#define Z_IS_297_EQ_297(...)   \,
+#define Z_IS_297U_EQ_297(...)  \,
+#define Z_IS_297_EQ_297U(...)  \,
+#define Z_IS_297U_EQ_297U(...) \,
+#define Z_IS_298_EQ_298(...)   \,
+#define Z_IS_298U_EQ_298(...)  \,
+#define Z_IS_298_EQ_298U(...)  \,
+#define Z_IS_298U_EQ_298U(...) \,
+#define Z_IS_299_EQ_299(...)   \,
+#define Z_IS_299U_EQ_299(...)  \,
+#define Z_IS_299_EQ_299U(...)  \,
+#define Z_IS_299U_EQ_299U(...) \,
+#define Z_IS_300_EQ_300(...)   \,
+#define Z_IS_300U_EQ_300(...)  \,
+#define Z_IS_300_EQ_300U(...)  \,
+#define Z_IS_300U_EQ_300U(...) \,
+#define Z_IS_301_EQ_301(...)   \,
+#define Z_IS_301U_EQ_301(...)  \,
+#define Z_IS_301_EQ_301U(...)  \,
+#define Z_IS_301U_EQ_301U(...) \,
+#define Z_IS_302_EQ_302(...)   \,
+#define Z_IS_302U_EQ_302(...)  \,
+#define Z_IS_302_EQ_302U(...)  \,
+#define Z_IS_302U_EQ_302U(...) \,
+#define Z_IS_303_EQ_303(...)   \,
+#define Z_IS_303U_EQ_303(...)  \,
+#define Z_IS_303_EQ_303U(...)  \,
+#define Z_IS_303U_EQ_303U(...) \,
+#define Z_IS_304_EQ_304(...)   \,
+#define Z_IS_304U_EQ_304(...)  \,
+#define Z_IS_304_EQ_304U(...)  \,
+#define Z_IS_304U_EQ_304U(...) \,
+#define Z_IS_305_EQ_305(...)   \,
+#define Z_IS_305U_EQ_305(...)  \,
+#define Z_IS_305_EQ_305U(...)  \,
+#define Z_IS_305U_EQ_305U(...) \,
+#define Z_IS_306_EQ_306(...)   \,
+#define Z_IS_306U_EQ_306(...)  \,
+#define Z_IS_306_EQ_306U(...)  \,
+#define Z_IS_306U_EQ_306U(...) \,
+#define Z_IS_307_EQ_307(...)   \,
+#define Z_IS_307U_EQ_307(...)  \,
+#define Z_IS_307_EQ_307U(...)  \,
+#define Z_IS_307U_EQ_307U(...) \,
+#define Z_IS_308_EQ_308(...)   \,
+#define Z_IS_308U_EQ_308(...)  \,
+#define Z_IS_308_EQ_308U(...)  \,
+#define Z_IS_308U_EQ_308U(...) \,
+#define Z_IS_309_EQ_309(...)   \,
+#define Z_IS_309U_EQ_309(...)  \,
+#define Z_IS_309_EQ_309U(...)  \,
+#define Z_IS_309U_EQ_309U(...) \,
+#define Z_IS_310_EQ_310(...)   \,
+#define Z_IS_310U_EQ_310(...)  \,
+#define Z_IS_310_EQ_310U(...)  \,
+#define Z_IS_310U_EQ_310U(...) \,
+#define Z_IS_311_EQ_311(...)   \,
+#define Z_IS_311U_EQ_311(...)  \,
+#define Z_IS_311_EQ_311U(...)  \,
+#define Z_IS_311U_EQ_311U(...) \,
+#define Z_IS_312_EQ_312(...)   \,
+#define Z_IS_312U_EQ_312(...)  \,
+#define Z_IS_312_EQ_312U(...)  \,
+#define Z_IS_312U_EQ_312U(...) \,
+#define Z_IS_313_EQ_313(...)   \,
+#define Z_IS_313U_EQ_313(...)  \,
+#define Z_IS_313_EQ_313U(...)  \,
+#define Z_IS_313U_EQ_313U(...) \,
+#define Z_IS_314_EQ_314(...)   \,
+#define Z_IS_314U_EQ_314(...)  \,
+#define Z_IS_314_EQ_314U(...)  \,
+#define Z_IS_314U_EQ_314U(...) \,
+#define Z_IS_315_EQ_315(...)   \,
+#define Z_IS_315U_EQ_315(...)  \,
+#define Z_IS_315_EQ_315U(...)  \,
+#define Z_IS_315U_EQ_315U(...) \,
+#define Z_IS_316_EQ_316(...)   \,
+#define Z_IS_316U_EQ_316(...)  \,
+#define Z_IS_316_EQ_316U(...)  \,
+#define Z_IS_316U_EQ_316U(...) \,
+#define Z_IS_317_EQ_317(...)   \,
+#define Z_IS_317U_EQ_317(...)  \,
+#define Z_IS_317_EQ_317U(...)  \,
+#define Z_IS_317U_EQ_317U(...) \,
+#define Z_IS_318_EQ_318(...)   \,
+#define Z_IS_318U_EQ_318(...)  \,
+#define Z_IS_318_EQ_318U(...)  \,
+#define Z_IS_318U_EQ_318U(...) \,
+#define Z_IS_319_EQ_319(...)   \,
+#define Z_IS_319U_EQ_319(...)  \,
+#define Z_IS_319_EQ_319U(...)  \,
+#define Z_IS_319U_EQ_319U(...) \,
+#define Z_IS_320_EQ_320(...)   \,
+#define Z_IS_320U_EQ_320(...)  \,
+#define Z_IS_320_EQ_320U(...)  \,
+#define Z_IS_320U_EQ_320U(...) \,
+#define Z_IS_321_EQ_321(...)   \,
+#define Z_IS_321U_EQ_321(...)  \,
+#define Z_IS_321_EQ_321U(...)  \,
+#define Z_IS_321U_EQ_321U(...) \,
+#define Z_IS_322_EQ_322(...)   \,
+#define Z_IS_322U_EQ_322(...)  \,
+#define Z_IS_322_EQ_322U(...)  \,
+#define Z_IS_322U_EQ_322U(...) \,
+#define Z_IS_323_EQ_323(...)   \,
+#define Z_IS_323U_EQ_323(...)  \,
+#define Z_IS_323_EQ_323U(...)  \,
+#define Z_IS_323U_EQ_323U(...) \,
+#define Z_IS_324_EQ_324(...)   \,
+#define Z_IS_324U_EQ_324(...)  \,
+#define Z_IS_324_EQ_324U(...)  \,
+#define Z_IS_324U_EQ_324U(...) \,
+#define Z_IS_325_EQ_325(...)   \,
+#define Z_IS_325U_EQ_325(...)  \,
+#define Z_IS_325_EQ_325U(...)  \,
+#define Z_IS_325U_EQ_325U(...) \,
+#define Z_IS_326_EQ_326(...)   \,
+#define Z_IS_326U_EQ_326(...)  \,
+#define Z_IS_326_EQ_326U(...)  \,
+#define Z_IS_326U_EQ_326U(...) \,
+#define Z_IS_327_EQ_327(...)   \,
+#define Z_IS_327U_EQ_327(...)  \,
+#define Z_IS_327_EQ_327U(...)  \,
+#define Z_IS_327U_EQ_327U(...) \,
+#define Z_IS_328_EQ_328(...)   \,
+#define Z_IS_328U_EQ_328(...)  \,
+#define Z_IS_328_EQ_328U(...)  \,
+#define Z_IS_328U_EQ_328U(...) \,
+#define Z_IS_329_EQ_329(...)   \,
+#define Z_IS_329U_EQ_329(...)  \,
+#define Z_IS_329_EQ_329U(...)  \,
+#define Z_IS_329U_EQ_329U(...) \,
+#define Z_IS_330_EQ_330(...)   \,
+#define Z_IS_330U_EQ_330(...)  \,
+#define Z_IS_330_EQ_330U(...)  \,
+#define Z_IS_330U_EQ_330U(...) \,
+#define Z_IS_331_EQ_331(...)   \,
+#define Z_IS_331U_EQ_331(...)  \,
+#define Z_IS_331_EQ_331U(...)  \,
+#define Z_IS_331U_EQ_331U(...) \,
+#define Z_IS_332_EQ_332(...)   \,
+#define Z_IS_332U_EQ_332(...)  \,
+#define Z_IS_332_EQ_332U(...)  \,
+#define Z_IS_332U_EQ_332U(...) \,
+#define Z_IS_333_EQ_333(...)   \,
+#define Z_IS_333U_EQ_333(...)  \,
+#define Z_IS_333_EQ_333U(...)  \,
+#define Z_IS_333U_EQ_333U(...) \,
+#define Z_IS_334_EQ_334(...)   \,
+#define Z_IS_334U_EQ_334(...)  \,
+#define Z_IS_334_EQ_334U(...)  \,
+#define Z_IS_334U_EQ_334U(...) \,
+#define Z_IS_335_EQ_335(...)   \,
+#define Z_IS_335U_EQ_335(...)  \,
+#define Z_IS_335_EQ_335U(...)  \,
+#define Z_IS_335U_EQ_335U(...) \,
+#define Z_IS_336_EQ_336(...)   \,
+#define Z_IS_336U_EQ_336(...)  \,
+#define Z_IS_336_EQ_336U(...)  \,
+#define Z_IS_336U_EQ_336U(...) \,
+#define Z_IS_337_EQ_337(...)   \,
+#define Z_IS_337U_EQ_337(...)  \,
+#define Z_IS_337_EQ_337U(...)  \,
+#define Z_IS_337U_EQ_337U(...) \,
+#define Z_IS_338_EQ_338(...)   \,
+#define Z_IS_338U_EQ_338(...)  \,
+#define Z_IS_338_EQ_338U(...)  \,
+#define Z_IS_338U_EQ_338U(...) \,
+#define Z_IS_339_EQ_339(...)   \,
+#define Z_IS_339U_EQ_339(...)  \,
+#define Z_IS_339_EQ_339U(...)  \,
+#define Z_IS_339U_EQ_339U(...) \,
+#define Z_IS_340_EQ_340(...)   \,
+#define Z_IS_340U_EQ_340(...)  \,
+#define Z_IS_340_EQ_340U(...)  \,
+#define Z_IS_340U_EQ_340U(...) \,
+#define Z_IS_341_EQ_341(...)   \,
+#define Z_IS_341U_EQ_341(...)  \,
+#define Z_IS_341_EQ_341U(...)  \,
+#define Z_IS_341U_EQ_341U(...) \,
+#define Z_IS_342_EQ_342(...)   \,
+#define Z_IS_342U_EQ_342(...)  \,
+#define Z_IS_342_EQ_342U(...)  \,
+#define Z_IS_342U_EQ_342U(...) \,
+#define Z_IS_343_EQ_343(...)   \,
+#define Z_IS_343U_EQ_343(...)  \,
+#define Z_IS_343_EQ_343U(...)  \,
+#define Z_IS_343U_EQ_343U(...) \,
+#define Z_IS_344_EQ_344(...)   \,
+#define Z_IS_344U_EQ_344(...)  \,
+#define Z_IS_344_EQ_344U(...)  \,
+#define Z_IS_344U_EQ_344U(...) \,
+#define Z_IS_345_EQ_345(...)   \,
+#define Z_IS_345U_EQ_345(...)  \,
+#define Z_IS_345_EQ_345U(...)  \,
+#define Z_IS_345U_EQ_345U(...) \,
+#define Z_IS_346_EQ_346(...)   \,
+#define Z_IS_346U_EQ_346(...)  \,
+#define Z_IS_346_EQ_346U(...)  \,
+#define Z_IS_346U_EQ_346U(...) \,
+#define Z_IS_347_EQ_347(...)   \,
+#define Z_IS_347U_EQ_347(...)  \,
+#define Z_IS_347_EQ_347U(...)  \,
+#define Z_IS_347U_EQ_347U(...) \,
+#define Z_IS_348_EQ_348(...)   \,
+#define Z_IS_348U_EQ_348(...)  \,
+#define Z_IS_348_EQ_348U(...)  \,
+#define Z_IS_348U_EQ_348U(...) \,
+#define Z_IS_349_EQ_349(...)   \,
+#define Z_IS_349U_EQ_349(...)  \,
+#define Z_IS_349_EQ_349U(...)  \,
+#define Z_IS_349U_EQ_349U(...) \,
+#define Z_IS_350_EQ_350(...)   \,
+#define Z_IS_350U_EQ_350(...)  \,
+#define Z_IS_350_EQ_350U(...)  \,
+#define Z_IS_350U_EQ_350U(...) \,
+#define Z_IS_351_EQ_351(...)   \,
+#define Z_IS_351U_EQ_351(...)  \,
+#define Z_IS_351_EQ_351U(...)  \,
+#define Z_IS_351U_EQ_351U(...) \,
+#define Z_IS_352_EQ_352(...)   \,
+#define Z_IS_352U_EQ_352(...)  \,
+#define Z_IS_352_EQ_352U(...)  \,
+#define Z_IS_352U_EQ_352U(...) \,
+#define Z_IS_353_EQ_353(...)   \,
+#define Z_IS_353U_EQ_353(...)  \,
+#define Z_IS_353_EQ_353U(...)  \,
+#define Z_IS_353U_EQ_353U(...) \,
+#define Z_IS_354_EQ_354(...)   \,
+#define Z_IS_354U_EQ_354(...)  \,
+#define Z_IS_354_EQ_354U(...)  \,
+#define Z_IS_354U_EQ_354U(...) \,
+#define Z_IS_355_EQ_355(...)   \,
+#define Z_IS_355U_EQ_355(...)  \,
+#define Z_IS_355_EQ_355U(...)  \,
+#define Z_IS_355U_EQ_355U(...) \,
+#define Z_IS_356_EQ_356(...)   \,
+#define Z_IS_356U_EQ_356(...)  \,
+#define Z_IS_356_EQ_356U(...)  \,
+#define Z_IS_356U_EQ_356U(...) \,
+#define Z_IS_357_EQ_357(...)   \,
+#define Z_IS_357U_EQ_357(...)  \,
+#define Z_IS_357_EQ_357U(...)  \,
+#define Z_IS_357U_EQ_357U(...) \,
+#define Z_IS_358_EQ_358(...)   \,
+#define Z_IS_358U_EQ_358(...)  \,
+#define Z_IS_358_EQ_358U(...)  \,
+#define Z_IS_358U_EQ_358U(...) \,
+#define Z_IS_359_EQ_359(...)   \,
+#define Z_IS_359U_EQ_359(...)  \,
+#define Z_IS_359_EQ_359U(...)  \,
+#define Z_IS_359U_EQ_359U(...) \,
+#define Z_IS_360_EQ_360(...)   \,
+#define Z_IS_360U_EQ_360(...)  \,
+#define Z_IS_360_EQ_360U(...)  \,
+#define Z_IS_360U_EQ_360U(...) \,
+#define Z_IS_361_EQ_361(...)   \,
+#define Z_IS_361U_EQ_361(...)  \,
+#define Z_IS_361_EQ_361U(...)  \,
+#define Z_IS_361U_EQ_361U(...) \,
+#define Z_IS_362_EQ_362(...)   \,
+#define Z_IS_362U_EQ_362(...)  \,
+#define Z_IS_362_EQ_362U(...)  \,
+#define Z_IS_362U_EQ_362U(...) \,
+#define Z_IS_363_EQ_363(...)   \,
+#define Z_IS_363U_EQ_363(...)  \,
+#define Z_IS_363_EQ_363U(...)  \,
+#define Z_IS_363U_EQ_363U(...) \,
+#define Z_IS_364_EQ_364(...)   \,
+#define Z_IS_364U_EQ_364(...)  \,
+#define Z_IS_364_EQ_364U(...)  \,
+#define Z_IS_364U_EQ_364U(...) \,
+#define Z_IS_365_EQ_365(...)   \,
+#define Z_IS_365U_EQ_365(...)  \,
+#define Z_IS_365_EQ_365U(...)  \,
+#define Z_IS_365U_EQ_365U(...) \,
+#define Z_IS_366_EQ_366(...)   \,
+#define Z_IS_366U_EQ_366(...)  \,
+#define Z_IS_366_EQ_366U(...)  \,
+#define Z_IS_366U_EQ_366U(...) \,
+#define Z_IS_367_EQ_367(...)   \,
+#define Z_IS_367U_EQ_367(...)  \,
+#define Z_IS_367_EQ_367U(...)  \,
+#define Z_IS_367U_EQ_367U(...) \,
+#define Z_IS_368_EQ_368(...)   \,
+#define Z_IS_368U_EQ_368(...)  \,
+#define Z_IS_368_EQ_368U(...)  \,
+#define Z_IS_368U_EQ_368U(...) \,
+#define Z_IS_369_EQ_369(...)   \,
+#define Z_IS_369U_EQ_369(...)  \,
+#define Z_IS_369_EQ_369U(...)  \,
+#define Z_IS_369U_EQ_369U(...) \,
+#define Z_IS_370_EQ_370(...)   \,
+#define Z_IS_370U_EQ_370(...)  \,
+#define Z_IS_370_EQ_370U(...)  \,
+#define Z_IS_370U_EQ_370U(...) \,
+#define Z_IS_371_EQ_371(...)   \,
+#define Z_IS_371U_EQ_371(...)  \,
+#define Z_IS_371_EQ_371U(...)  \,
+#define Z_IS_371U_EQ_371U(...) \,
+#define Z_IS_372_EQ_372(...)   \,
+#define Z_IS_372U_EQ_372(...)  \,
+#define Z_IS_372_EQ_372U(...)  \,
+#define Z_IS_372U_EQ_372U(...) \,
+#define Z_IS_373_EQ_373(...)   \,
+#define Z_IS_373U_EQ_373(...)  \,
+#define Z_IS_373_EQ_373U(...)  \,
+#define Z_IS_373U_EQ_373U(...) \,
+#define Z_IS_374_EQ_374(...)   \,
+#define Z_IS_374U_EQ_374(...)  \,
+#define Z_IS_374_EQ_374U(...)  \,
+#define Z_IS_374U_EQ_374U(...) \,
+#define Z_IS_375_EQ_375(...)   \,
+#define Z_IS_375U_EQ_375(...)  \,
+#define Z_IS_375_EQ_375U(...)  \,
+#define Z_IS_375U_EQ_375U(...) \,
+#define Z_IS_376_EQ_376(...)   \,
+#define Z_IS_376U_EQ_376(...)  \,
+#define Z_IS_376_EQ_376U(...)  \,
+#define Z_IS_376U_EQ_376U(...) \,
+#define Z_IS_377_EQ_377(...)   \,
+#define Z_IS_377U_EQ_377(...)  \,
+#define Z_IS_377_EQ_377U(...)  \,
+#define Z_IS_377U_EQ_377U(...) \,
+#define Z_IS_378_EQ_378(...)   \,
+#define Z_IS_378U_EQ_378(...)  \,
+#define Z_IS_378_EQ_378U(...)  \,
+#define Z_IS_378U_EQ_378U(...) \,
+#define Z_IS_379_EQ_379(...)   \,
+#define Z_IS_379U_EQ_379(...)  \,
+#define Z_IS_379_EQ_379U(...)  \,
+#define Z_IS_379U_EQ_379U(...) \,
+#define Z_IS_380_EQ_380(...)   \,
+#define Z_IS_380U_EQ_380(...)  \,
+#define Z_IS_380_EQ_380U(...)  \,
+#define Z_IS_380U_EQ_380U(...) \,
+#define Z_IS_381_EQ_381(...)   \,
+#define Z_IS_381U_EQ_381(...)  \,
+#define Z_IS_381_EQ_381U(...)  \,
+#define Z_IS_381U_EQ_381U(...) \,
+#define Z_IS_382_EQ_382(...)   \,
+#define Z_IS_382U_EQ_382(...)  \,
+#define Z_IS_382_EQ_382U(...)  \,
+#define Z_IS_382U_EQ_382U(...) \,
+#define Z_IS_383_EQ_383(...)   \,
+#define Z_IS_383U_EQ_383(...)  \,
+#define Z_IS_383_EQ_383U(...)  \,
+#define Z_IS_383U_EQ_383U(...) \,
+#define Z_IS_384_EQ_384(...)   \,
+#define Z_IS_384U_EQ_384(...)  \,
+#define Z_IS_384_EQ_384U(...)  \,
+#define Z_IS_384U_EQ_384U(...) \,
+#define Z_IS_385_EQ_385(...)   \,
+#define Z_IS_385U_EQ_385(...)  \,
+#define Z_IS_385_EQ_385U(...)  \,
+#define Z_IS_385U_EQ_385U(...) \,
+#define Z_IS_386_EQ_386(...)   \,
+#define Z_IS_386U_EQ_386(...)  \,
+#define Z_IS_386_EQ_386U(...)  \,
+#define Z_IS_386U_EQ_386U(...) \,
+#define Z_IS_387_EQ_387(...)   \,
+#define Z_IS_387U_EQ_387(...)  \,
+#define Z_IS_387_EQ_387U(...)  \,
+#define Z_IS_387U_EQ_387U(...) \,
+#define Z_IS_388_EQ_388(...)   \,
+#define Z_IS_388U_EQ_388(...)  \,
+#define Z_IS_388_EQ_388U(...)  \,
+#define Z_IS_388U_EQ_388U(...) \,
+#define Z_IS_389_EQ_389(...)   \,
+#define Z_IS_389U_EQ_389(...)  \,
+#define Z_IS_389_EQ_389U(...)  \,
+#define Z_IS_389U_EQ_389U(...) \,
+#define Z_IS_390_EQ_390(...)   \,
+#define Z_IS_390U_EQ_390(...)  \,
+#define Z_IS_390_EQ_390U(...)  \,
+#define Z_IS_390U_EQ_390U(...) \,
+#define Z_IS_391_EQ_391(...)   \,
+#define Z_IS_391U_EQ_391(...)  \,
+#define Z_IS_391_EQ_391U(...)  \,
+#define Z_IS_391U_EQ_391U(...) \,
+#define Z_IS_392_EQ_392(...)   \,
+#define Z_IS_392U_EQ_392(...)  \,
+#define Z_IS_392_EQ_392U(...)  \,
+#define Z_IS_392U_EQ_392U(...) \,
+#define Z_IS_393_EQ_393(...)   \,
+#define Z_IS_393U_EQ_393(...)  \,
+#define Z_IS_393_EQ_393U(...)  \,
+#define Z_IS_393U_EQ_393U(...) \,
+#define Z_IS_394_EQ_394(...)   \,
+#define Z_IS_394U_EQ_394(...)  \,
+#define Z_IS_394_EQ_394U(...)  \,
+#define Z_IS_394U_EQ_394U(...) \,
+#define Z_IS_395_EQ_395(...)   \,
+#define Z_IS_395U_EQ_395(...)  \,
+#define Z_IS_395_EQ_395U(...)  \,
+#define Z_IS_395U_EQ_395U(...) \,
+#define Z_IS_396_EQ_396(...)   \,
+#define Z_IS_396U_EQ_396(...)  \,
+#define Z_IS_396_EQ_396U(...)  \,
+#define Z_IS_396U_EQ_396U(...) \,
+#define Z_IS_397_EQ_397(...)   \,
+#define Z_IS_397U_EQ_397(...)  \,
+#define Z_IS_397_EQ_397U(...)  \,
+#define Z_IS_397U_EQ_397U(...) \,
+#define Z_IS_398_EQ_398(...)   \,
+#define Z_IS_398U_EQ_398(...)  \,
+#define Z_IS_398_EQ_398U(...)  \,
+#define Z_IS_398U_EQ_398U(...) \,
+#define Z_IS_399_EQ_399(...)   \,
+#define Z_IS_399U_EQ_399(...)  \,
+#define Z_IS_399_EQ_399U(...)  \,
+#define Z_IS_399U_EQ_399U(...) \,
+#define Z_IS_400_EQ_400(...)   \,
+#define Z_IS_400U_EQ_400(...)  \,
+#define Z_IS_400_EQ_400U(...)  \,
+#define Z_IS_400U_EQ_400U(...) \,
+#define Z_IS_401_EQ_401(...)   \,
+#define Z_IS_401U_EQ_401(...)  \,
+#define Z_IS_401_EQ_401U(...)  \,
+#define Z_IS_401U_EQ_401U(...) \,
+#define Z_IS_402_EQ_402(...)   \,
+#define Z_IS_402U_EQ_402(...)  \,
+#define Z_IS_402_EQ_402U(...)  \,
+#define Z_IS_402U_EQ_402U(...) \,
+#define Z_IS_403_EQ_403(...)   \,
+#define Z_IS_403U_EQ_403(...)  \,
+#define Z_IS_403_EQ_403U(...)  \,
+#define Z_IS_403U_EQ_403U(...) \,
+#define Z_IS_404_EQ_404(...)   \,
+#define Z_IS_404U_EQ_404(...)  \,
+#define Z_IS_404_EQ_404U(...)  \,
+#define Z_IS_404U_EQ_404U(...) \,
+#define Z_IS_405_EQ_405(...)   \,
+#define Z_IS_405U_EQ_405(...)  \,
+#define Z_IS_405_EQ_405U(...)  \,
+#define Z_IS_405U_EQ_405U(...) \,
+#define Z_IS_406_EQ_406(...)   \,
+#define Z_IS_406U_EQ_406(...)  \,
+#define Z_IS_406_EQ_406U(...)  \,
+#define Z_IS_406U_EQ_406U(...) \,
+#define Z_IS_407_EQ_407(...)   \,
+#define Z_IS_407U_EQ_407(...)  \,
+#define Z_IS_407_EQ_407U(...)  \,
+#define Z_IS_407U_EQ_407U(...) \,
+#define Z_IS_408_EQ_408(...)   \,
+#define Z_IS_408U_EQ_408(...)  \,
+#define Z_IS_408_EQ_408U(...)  \,
+#define Z_IS_408U_EQ_408U(...) \,
+#define Z_IS_409_EQ_409(...)   \,
+#define Z_IS_409U_EQ_409(...)  \,
+#define Z_IS_409_EQ_409U(...)  \,
+#define Z_IS_409U_EQ_409U(...) \,
+#define Z_IS_410_EQ_410(...)   \,
+#define Z_IS_410U_EQ_410(...)  \,
+#define Z_IS_410_EQ_410U(...)  \,
+#define Z_IS_410U_EQ_410U(...) \,
+#define Z_IS_411_EQ_411(...)   \,
+#define Z_IS_411U_EQ_411(...)  \,
+#define Z_IS_411_EQ_411U(...)  \,
+#define Z_IS_411U_EQ_411U(...) \,
+#define Z_IS_412_EQ_412(...)   \,
+#define Z_IS_412U_EQ_412(...)  \,
+#define Z_IS_412_EQ_412U(...)  \,
+#define Z_IS_412U_EQ_412U(...) \,
+#define Z_IS_413_EQ_413(...)   \,
+#define Z_IS_413U_EQ_413(...)  \,
+#define Z_IS_413_EQ_413U(...)  \,
+#define Z_IS_413U_EQ_413U(...) \,
+#define Z_IS_414_EQ_414(...)   \,
+#define Z_IS_414U_EQ_414(...)  \,
+#define Z_IS_414_EQ_414U(...)  \,
+#define Z_IS_414U_EQ_414U(...) \,
+#define Z_IS_415_EQ_415(...)   \,
+#define Z_IS_415U_EQ_415(...)  \,
+#define Z_IS_415_EQ_415U(...)  \,
+#define Z_IS_415U_EQ_415U(...) \,
+#define Z_IS_416_EQ_416(...)   \,
+#define Z_IS_416U_EQ_416(...)  \,
+#define Z_IS_416_EQ_416U(...)  \,
+#define Z_IS_416U_EQ_416U(...) \,
+#define Z_IS_417_EQ_417(...)   \,
+#define Z_IS_417U_EQ_417(...)  \,
+#define Z_IS_417_EQ_417U(...)  \,
+#define Z_IS_417U_EQ_417U(...) \,
+#define Z_IS_418_EQ_418(...)   \,
+#define Z_IS_418U_EQ_418(...)  \,
+#define Z_IS_418_EQ_418U(...)  \,
+#define Z_IS_418U_EQ_418U(...) \,
+#define Z_IS_419_EQ_419(...)   \,
+#define Z_IS_419U_EQ_419(...)  \,
+#define Z_IS_419_EQ_419U(...)  \,
+#define Z_IS_419U_EQ_419U(...) \,
+#define Z_IS_420_EQ_420(...)   \,
+#define Z_IS_420U_EQ_420(...)  \,
+#define Z_IS_420_EQ_420U(...)  \,
+#define Z_IS_420U_EQ_420U(...) \,
+#define Z_IS_421_EQ_421(...)   \,
+#define Z_IS_421U_EQ_421(...)  \,
+#define Z_IS_421_EQ_421U(...)  \,
+#define Z_IS_421U_EQ_421U(...) \,
+#define Z_IS_422_EQ_422(...)   \,
+#define Z_IS_422U_EQ_422(...)  \,
+#define Z_IS_422_EQ_422U(...)  \,
+#define Z_IS_422U_EQ_422U(...) \,
+#define Z_IS_423_EQ_423(...)   \,
+#define Z_IS_423U_EQ_423(...)  \,
+#define Z_IS_423_EQ_423U(...)  \,
+#define Z_IS_423U_EQ_423U(...) \,
+#define Z_IS_424_EQ_424(...)   \,
+#define Z_IS_424U_EQ_424(...)  \,
+#define Z_IS_424_EQ_424U(...)  \,
+#define Z_IS_424U_EQ_424U(...) \,
+#define Z_IS_425_EQ_425(...)   \,
+#define Z_IS_425U_EQ_425(...)  \,
+#define Z_IS_425_EQ_425U(...)  \,
+#define Z_IS_425U_EQ_425U(...) \,
+#define Z_IS_426_EQ_426(...)   \,
+#define Z_IS_426U_EQ_426(...)  \,
+#define Z_IS_426_EQ_426U(...)  \,
+#define Z_IS_426U_EQ_426U(...) \,
+#define Z_IS_427_EQ_427(...)   \,
+#define Z_IS_427U_EQ_427(...)  \,
+#define Z_IS_427_EQ_427U(...)  \,
+#define Z_IS_427U_EQ_427U(...) \,
+#define Z_IS_428_EQ_428(...)   \,
+#define Z_IS_428U_EQ_428(...)  \,
+#define Z_IS_428_EQ_428U(...)  \,
+#define Z_IS_428U_EQ_428U(...) \,
+#define Z_IS_429_EQ_429(...)   \,
+#define Z_IS_429U_EQ_429(...)  \,
+#define Z_IS_429_EQ_429U(...)  \,
+#define Z_IS_429U_EQ_429U(...) \,
+#define Z_IS_430_EQ_430(...)   \,
+#define Z_IS_430U_EQ_430(...)  \,
+#define Z_IS_430_EQ_430U(...)  \,
+#define Z_IS_430U_EQ_430U(...) \,
+#define Z_IS_431_EQ_431(...)   \,
+#define Z_IS_431U_EQ_431(...)  \,
+#define Z_IS_431_EQ_431U(...)  \,
+#define Z_IS_431U_EQ_431U(...) \,
+#define Z_IS_432_EQ_432(...)   \,
+#define Z_IS_432U_EQ_432(...)  \,
+#define Z_IS_432_EQ_432U(...)  \,
+#define Z_IS_432U_EQ_432U(...) \,
+#define Z_IS_433_EQ_433(...)   \,
+#define Z_IS_433U_EQ_433(...)  \,
+#define Z_IS_433_EQ_433U(...)  \,
+#define Z_IS_433U_EQ_433U(...) \,
+#define Z_IS_434_EQ_434(...)   \,
+#define Z_IS_434U_EQ_434(...)  \,
+#define Z_IS_434_EQ_434U(...)  \,
+#define Z_IS_434U_EQ_434U(...) \,
+#define Z_IS_435_EQ_435(...)   \,
+#define Z_IS_435U_EQ_435(...)  \,
+#define Z_IS_435_EQ_435U(...)  \,
+#define Z_IS_435U_EQ_435U(...) \,
+#define Z_IS_436_EQ_436(...)   \,
+#define Z_IS_436U_EQ_436(...)  \,
+#define Z_IS_436_EQ_436U(...)  \,
+#define Z_IS_436U_EQ_436U(...) \,
+#define Z_IS_437_EQ_437(...)   \,
+#define Z_IS_437U_EQ_437(...)  \,
+#define Z_IS_437_EQ_437U(...)  \,
+#define Z_IS_437U_EQ_437U(...) \,
+#define Z_IS_438_EQ_438(...)   \,
+#define Z_IS_438U_EQ_438(...)  \,
+#define Z_IS_438_EQ_438U(...)  \,
+#define Z_IS_438U_EQ_438U(...) \,
+#define Z_IS_439_EQ_439(...)   \,
+#define Z_IS_439U_EQ_439(...)  \,
+#define Z_IS_439_EQ_439U(...)  \,
+#define Z_IS_439U_EQ_439U(...) \,
+#define Z_IS_440_EQ_440(...)   \,
+#define Z_IS_440U_EQ_440(...)  \,
+#define Z_IS_440_EQ_440U(...)  \,
+#define Z_IS_440U_EQ_440U(...) \,
+#define Z_IS_441_EQ_441(...)   \,
+#define Z_IS_441U_EQ_441(...)  \,
+#define Z_IS_441_EQ_441U(...)  \,
+#define Z_IS_441U_EQ_441U(...) \,
+#define Z_IS_442_EQ_442(...)   \,
+#define Z_IS_442U_EQ_442(...)  \,
+#define Z_IS_442_EQ_442U(...)  \,
+#define Z_IS_442U_EQ_442U(...) \,
+#define Z_IS_443_EQ_443(...)   \,
+#define Z_IS_443U_EQ_443(...)  \,
+#define Z_IS_443_EQ_443U(...)  \,
+#define Z_IS_443U_EQ_443U(...) \,
+#define Z_IS_444_EQ_444(...)   \,
+#define Z_IS_444U_EQ_444(...)  \,
+#define Z_IS_444_EQ_444U(...)  \,
+#define Z_IS_444U_EQ_444U(...) \,
+#define Z_IS_445_EQ_445(...)   \,
+#define Z_IS_445U_EQ_445(...)  \,
+#define Z_IS_445_EQ_445U(...)  \,
+#define Z_IS_445U_EQ_445U(...) \,
+#define Z_IS_446_EQ_446(...)   \,
+#define Z_IS_446U_EQ_446(...)  \,
+#define Z_IS_446_EQ_446U(...)  \,
+#define Z_IS_446U_EQ_446U(...) \,
+#define Z_IS_447_EQ_447(...)   \,
+#define Z_IS_447U_EQ_447(...)  \,
+#define Z_IS_447_EQ_447U(...)  \,
+#define Z_IS_447U_EQ_447U(...) \,
+#define Z_IS_448_EQ_448(...)   \,
+#define Z_IS_448U_EQ_448(...)  \,
+#define Z_IS_448_EQ_448U(...)  \,
+#define Z_IS_448U_EQ_448U(...) \,
+#define Z_IS_449_EQ_449(...)   \,
+#define Z_IS_449U_EQ_449(...)  \,
+#define Z_IS_449_EQ_449U(...)  \,
+#define Z_IS_449U_EQ_449U(...) \,
+#define Z_IS_450_EQ_450(...)   \,
+#define Z_IS_450U_EQ_450(...)  \,
+#define Z_IS_450_EQ_450U(...)  \,
+#define Z_IS_450U_EQ_450U(...) \,
+#define Z_IS_451_EQ_451(...)   \,
+#define Z_IS_451U_EQ_451(...)  \,
+#define Z_IS_451_EQ_451U(...)  \,
+#define Z_IS_451U_EQ_451U(...) \,
+#define Z_IS_452_EQ_452(...)   \,
+#define Z_IS_452U_EQ_452(...)  \,
+#define Z_IS_452_EQ_452U(...)  \,
+#define Z_IS_452U_EQ_452U(...) \,
+#define Z_IS_453_EQ_453(...)   \,
+#define Z_IS_453U_EQ_453(...)  \,
+#define Z_IS_453_EQ_453U(...)  \,
+#define Z_IS_453U_EQ_453U(...) \,
+#define Z_IS_454_EQ_454(...)   \,
+#define Z_IS_454U_EQ_454(...)  \,
+#define Z_IS_454_EQ_454U(...)  \,
+#define Z_IS_454U_EQ_454U(...) \,
+#define Z_IS_455_EQ_455(...)   \,
+#define Z_IS_455U_EQ_455(...)  \,
+#define Z_IS_455_EQ_455U(...)  \,
+#define Z_IS_455U_EQ_455U(...) \,
+#define Z_IS_456_EQ_456(...)   \,
+#define Z_IS_456U_EQ_456(...)  \,
+#define Z_IS_456_EQ_456U(...)  \,
+#define Z_IS_456U_EQ_456U(...) \,
+#define Z_IS_457_EQ_457(...)   \,
+#define Z_IS_457U_EQ_457(...)  \,
+#define Z_IS_457_EQ_457U(...)  \,
+#define Z_IS_457U_EQ_457U(...) \,
+#define Z_IS_458_EQ_458(...)   \,
+#define Z_IS_458U_EQ_458(...)  \,
+#define Z_IS_458_EQ_458U(...)  \,
+#define Z_IS_458U_EQ_458U(...) \,
+#define Z_IS_459_EQ_459(...)   \,
+#define Z_IS_459U_EQ_459(...)  \,
+#define Z_IS_459_EQ_459U(...)  \,
+#define Z_IS_459U_EQ_459U(...) \,
+#define Z_IS_460_EQ_460(...)   \,
+#define Z_IS_460U_EQ_460(...)  \,
+#define Z_IS_460_EQ_460U(...)  \,
+#define Z_IS_460U_EQ_460U(...) \,
+#define Z_IS_461_EQ_461(...)   \,
+#define Z_IS_461U_EQ_461(...)  \,
+#define Z_IS_461_EQ_461U(...)  \,
+#define Z_IS_461U_EQ_461U(...) \,
+#define Z_IS_462_EQ_462(...)   \,
+#define Z_IS_462U_EQ_462(...)  \,
+#define Z_IS_462_EQ_462U(...)  \,
+#define Z_IS_462U_EQ_462U(...) \,
+#define Z_IS_463_EQ_463(...)   \,
+#define Z_IS_463U_EQ_463(...)  \,
+#define Z_IS_463_EQ_463U(...)  \,
+#define Z_IS_463U_EQ_463U(...) \,
+#define Z_IS_464_EQ_464(...)   \,
+#define Z_IS_464U_EQ_464(...)  \,
+#define Z_IS_464_EQ_464U(...)  \,
+#define Z_IS_464U_EQ_464U(...) \,
+#define Z_IS_465_EQ_465(...)   \,
+#define Z_IS_465U_EQ_465(...)  \,
+#define Z_IS_465_EQ_465U(...)  \,
+#define Z_IS_465U_EQ_465U(...) \,
+#define Z_IS_466_EQ_466(...)   \,
+#define Z_IS_466U_EQ_466(...)  \,
+#define Z_IS_466_EQ_466U(...)  \,
+#define Z_IS_466U_EQ_466U(...) \,
+#define Z_IS_467_EQ_467(...)   \,
+#define Z_IS_467U_EQ_467(...)  \,
+#define Z_IS_467_EQ_467U(...)  \,
+#define Z_IS_467U_EQ_467U(...) \,
+#define Z_IS_468_EQ_468(...)   \,
+#define Z_IS_468U_EQ_468(...)  \,
+#define Z_IS_468_EQ_468U(...)  \,
+#define Z_IS_468U_EQ_468U(...) \,
+#define Z_IS_469_EQ_469(...)   \,
+#define Z_IS_469U_EQ_469(...)  \,
+#define Z_IS_469_EQ_469U(...)  \,
+#define Z_IS_469U_EQ_469U(...) \,
+#define Z_IS_470_EQ_470(...)   \,
+#define Z_IS_470U_EQ_470(...)  \,
+#define Z_IS_470_EQ_470U(...)  \,
+#define Z_IS_470U_EQ_470U(...) \,
+#define Z_IS_471_EQ_471(...)   \,
+#define Z_IS_471U_EQ_471(...)  \,
+#define Z_IS_471_EQ_471U(...)  \,
+#define Z_IS_471U_EQ_471U(...) \,
+#define Z_IS_472_EQ_472(...)   \,
+#define Z_IS_472U_EQ_472(...)  \,
+#define Z_IS_472_EQ_472U(...)  \,
+#define Z_IS_472U_EQ_472U(...) \,
+#define Z_IS_473_EQ_473(...)   \,
+#define Z_IS_473U_EQ_473(...)  \,
+#define Z_IS_473_EQ_473U(...)  \,
+#define Z_IS_473U_EQ_473U(...) \,
+#define Z_IS_474_EQ_474(...)   \,
+#define Z_IS_474U_EQ_474(...)  \,
+#define Z_IS_474_EQ_474U(...)  \,
+#define Z_IS_474U_EQ_474U(...) \,
+#define Z_IS_475_EQ_475(...)   \,
+#define Z_IS_475U_EQ_475(...)  \,
+#define Z_IS_475_EQ_475U(...)  \,
+#define Z_IS_475U_EQ_475U(...) \,
+#define Z_IS_476_EQ_476(...)   \,
+#define Z_IS_476U_EQ_476(...)  \,
+#define Z_IS_476_EQ_476U(...)  \,
+#define Z_IS_476U_EQ_476U(...) \,
+#define Z_IS_477_EQ_477(...)   \,
+#define Z_IS_477U_EQ_477(...)  \,
+#define Z_IS_477_EQ_477U(...)  \,
+#define Z_IS_477U_EQ_477U(...) \,
+#define Z_IS_478_EQ_478(...)   \,
+#define Z_IS_478U_EQ_478(...)  \,
+#define Z_IS_478_EQ_478U(...)  \,
+#define Z_IS_478U_EQ_478U(...) \,
+#define Z_IS_479_EQ_479(...)   \,
+#define Z_IS_479U_EQ_479(...)  \,
+#define Z_IS_479_EQ_479U(...)  \,
+#define Z_IS_479U_EQ_479U(...) \,
+#define Z_IS_480_EQ_480(...)   \,
+#define Z_IS_480U_EQ_480(...)  \,
+#define Z_IS_480_EQ_480U(...)  \,
+#define Z_IS_480U_EQ_480U(...) \,
+#define Z_IS_481_EQ_481(...)   \,
+#define Z_IS_481U_EQ_481(...)  \,
+#define Z_IS_481_EQ_481U(...)  \,
+#define Z_IS_481U_EQ_481U(...) \,
+#define Z_IS_482_EQ_482(...)   \,
+#define Z_IS_482U_EQ_482(...)  \,
+#define Z_IS_482_EQ_482U(...)  \,
+#define Z_IS_482U_EQ_482U(...) \,
+#define Z_IS_483_EQ_483(...)   \,
+#define Z_IS_483U_EQ_483(...)  \,
+#define Z_IS_483_EQ_483U(...)  \,
+#define Z_IS_483U_EQ_483U(...) \,
+#define Z_IS_484_EQ_484(...)   \,
+#define Z_IS_484U_EQ_484(...)  \,
+#define Z_IS_484_EQ_484U(...)  \,
+#define Z_IS_484U_EQ_484U(...) \,
+#define Z_IS_485_EQ_485(...)   \,
+#define Z_IS_485U_EQ_485(...)  \,
+#define Z_IS_485_EQ_485U(...)  \,
+#define Z_IS_485U_EQ_485U(...) \,
+#define Z_IS_486_EQ_486(...)   \,
+#define Z_IS_486U_EQ_486(...)  \,
+#define Z_IS_486_EQ_486U(...)  \,
+#define Z_IS_486U_EQ_486U(...) \,
+#define Z_IS_487_EQ_487(...)   \,
+#define Z_IS_487U_EQ_487(...)  \,
+#define Z_IS_487_EQ_487U(...)  \,
+#define Z_IS_487U_EQ_487U(...) \,
+#define Z_IS_488_EQ_488(...)   \,
+#define Z_IS_488U_EQ_488(...)  \,
+#define Z_IS_488_EQ_488U(...)  \,
+#define Z_IS_488U_EQ_488U(...) \,
+#define Z_IS_489_EQ_489(...)   \,
+#define Z_IS_489U_EQ_489(...)  \,
+#define Z_IS_489_EQ_489U(...)  \,
+#define Z_IS_489U_EQ_489U(...) \,
+#define Z_IS_490_EQ_490(...)   \,
+#define Z_IS_490U_EQ_490(...)  \,
+#define Z_IS_490_EQ_490U(...)  \,
+#define Z_IS_490U_EQ_490U(...) \,
+#define Z_IS_491_EQ_491(...)   \,
+#define Z_IS_491U_EQ_491(...)  \,
+#define Z_IS_491_EQ_491U(...)  \,
+#define Z_IS_491U_EQ_491U(...) \,
+#define Z_IS_492_EQ_492(...)   \,
+#define Z_IS_492U_EQ_492(...)  \,
+#define Z_IS_492_EQ_492U(...)  \,
+#define Z_IS_492U_EQ_492U(...) \,
+#define Z_IS_493_EQ_493(...)   \,
+#define Z_IS_493U_EQ_493(...)  \,
+#define Z_IS_493_EQ_493U(...)  \,
+#define Z_IS_493U_EQ_493U(...) \,
+#define Z_IS_494_EQ_494(...)   \,
+#define Z_IS_494U_EQ_494(...)  \,
+#define Z_IS_494_EQ_494U(...)  \,
+#define Z_IS_494U_EQ_494U(...) \,
+#define Z_IS_495_EQ_495(...)   \,
+#define Z_IS_495U_EQ_495(...)  \,
+#define Z_IS_495_EQ_495U(...)  \,
+#define Z_IS_495U_EQ_495U(...) \,
+#define Z_IS_496_EQ_496(...)   \,
+#define Z_IS_496U_EQ_496(...)  \,
+#define Z_IS_496_EQ_496U(...)  \,
+#define Z_IS_496U_EQ_496U(...) \,
+#define Z_IS_497_EQ_497(...)   \,
+#define Z_IS_497U_EQ_497(...)  \,
+#define Z_IS_497_EQ_497U(...)  \,
+#define Z_IS_497U_EQ_497U(...) \,
+#define Z_IS_498_EQ_498(...)   \,
+#define Z_IS_498U_EQ_498(...)  \,
+#define Z_IS_498_EQ_498U(...)  \,
+#define Z_IS_498U_EQ_498U(...) \,
+#define Z_IS_499_EQ_499(...)   \,
+#define Z_IS_499U_EQ_499(...)  \,
+#define Z_IS_499_EQ_499U(...)  \,
+#define Z_IS_499U_EQ_499U(...) \,
+#define Z_IS_500_EQ_500(...)   \,
+#define Z_IS_500U_EQ_500(...)  \,
+#define Z_IS_500_EQ_500U(...)  \,
+#define Z_IS_500U_EQ_500U(...) \,
+#define Z_IS_501_EQ_501(...)   \,
+#define Z_IS_501U_EQ_501(...)  \,
+#define Z_IS_501_EQ_501U(...)  \,
+#define Z_IS_501U_EQ_501U(...) \,
+#define Z_IS_502_EQ_502(...)   \,
+#define Z_IS_502U_EQ_502(...)  \,
+#define Z_IS_502_EQ_502U(...)  \,
+#define Z_IS_502U_EQ_502U(...) \,
+#define Z_IS_503_EQ_503(...)   \,
+#define Z_IS_503U_EQ_503(...)  \,
+#define Z_IS_503_EQ_503U(...)  \,
+#define Z_IS_503U_EQ_503U(...) \,
+#define Z_IS_504_EQ_504(...)   \,
+#define Z_IS_504U_EQ_504(...)  \,
+#define Z_IS_504_EQ_504U(...)  \,
+#define Z_IS_504U_EQ_504U(...) \,
+#define Z_IS_505_EQ_505(...)   \,
+#define Z_IS_505U_EQ_505(...)  \,
+#define Z_IS_505_EQ_505U(...)  \,
+#define Z_IS_505U_EQ_505U(...) \,
+#define Z_IS_506_EQ_506(...)   \,
+#define Z_IS_506U_EQ_506(...)  \,
+#define Z_IS_506_EQ_506U(...)  \,
+#define Z_IS_506U_EQ_506U(...) \,
+#define Z_IS_507_EQ_507(...)   \,
+#define Z_IS_507U_EQ_507(...)  \,
+#define Z_IS_507_EQ_507U(...)  \,
+#define Z_IS_507U_EQ_507U(...) \,
+#define Z_IS_508_EQ_508(...)   \,
+#define Z_IS_508U_EQ_508(...)  \,
+#define Z_IS_508_EQ_508U(...)  \,
+#define Z_IS_508U_EQ_508U(...) \,
+#define Z_IS_509_EQ_509(...)   \,
+#define Z_IS_509U_EQ_509(...)  \,
+#define Z_IS_509_EQ_509U(...)  \,
+#define Z_IS_509U_EQ_509U(...) \,
+#define Z_IS_510_EQ_510(...)   \,
+#define Z_IS_510U_EQ_510(...)  \,
+#define Z_IS_510_EQ_510U(...)  \,
+#define Z_IS_510U_EQ_510U(...) \,
+#define Z_IS_511_EQ_511(...)   \,
+#define Z_IS_511U_EQ_511(...)  \,
+#define Z_IS_511_EQ_511U(...)  \,
+#define Z_IS_511U_EQ_511U(...) \,
+#define Z_IS_512_EQ_512(...)   \,
+#define Z_IS_512U_EQ_512(...)  \,
+#define Z_IS_512_EQ_512U(...)  \,
+#define Z_IS_512U_EQ_512U(...) \,
+#define Z_IS_513_EQ_513(...)   \,
+#define Z_IS_513U_EQ_513(...)  \,
+#define Z_IS_513_EQ_513U(...)  \,
+#define Z_IS_513U_EQ_513U(...) \,
+#define Z_IS_514_EQ_514(...)   \,
+#define Z_IS_514U_EQ_514(...)  \,
+#define Z_IS_514_EQ_514U(...)  \,
+#define Z_IS_514U_EQ_514U(...) \,
+#define Z_IS_515_EQ_515(...)   \,
+#define Z_IS_515U_EQ_515(...)  \,
+#define Z_IS_515_EQ_515U(...)  \,
+#define Z_IS_515U_EQ_515U(...) \,
+#define Z_IS_516_EQ_516(...)   \,
+#define Z_IS_516U_EQ_516(...)  \,
+#define Z_IS_516_EQ_516U(...)  \,
+#define Z_IS_516U_EQ_516U(...) \,
+#define Z_IS_517_EQ_517(...)   \,
+#define Z_IS_517U_EQ_517(...)  \,
+#define Z_IS_517_EQ_517U(...)  \,
+#define Z_IS_517U_EQ_517U(...) \,
+#define Z_IS_518_EQ_518(...)   \,
+#define Z_IS_518U_EQ_518(...)  \,
+#define Z_IS_518_EQ_518U(...)  \,
+#define Z_IS_518U_EQ_518U(...) \,
+#define Z_IS_519_EQ_519(...)   \,
+#define Z_IS_519U_EQ_519(...)  \,
+#define Z_IS_519_EQ_519U(...)  \,
+#define Z_IS_519U_EQ_519U(...) \,
+#define Z_IS_520_EQ_520(...)   \,
+#define Z_IS_520U_EQ_520(...)  \,
+#define Z_IS_520_EQ_520U(...)  \,
+#define Z_IS_520U_EQ_520U(...) \,
+#define Z_IS_521_EQ_521(...)   \,
+#define Z_IS_521U_EQ_521(...)  \,
+#define Z_IS_521_EQ_521U(...)  \,
+#define Z_IS_521U_EQ_521U(...) \,
+#define Z_IS_522_EQ_522(...)   \,
+#define Z_IS_522U_EQ_522(...)  \,
+#define Z_IS_522_EQ_522U(...)  \,
+#define Z_IS_522U_EQ_522U(...) \,
+#define Z_IS_523_EQ_523(...)   \,
+#define Z_IS_523U_EQ_523(...)  \,
+#define Z_IS_523_EQ_523U(...)  \,
+#define Z_IS_523U_EQ_523U(...) \,
+#define Z_IS_524_EQ_524(...)   \,
+#define Z_IS_524U_EQ_524(...)  \,
+#define Z_IS_524_EQ_524U(...)  \,
+#define Z_IS_524U_EQ_524U(...) \,
+#define Z_IS_525_EQ_525(...)   \,
+#define Z_IS_525U_EQ_525(...)  \,
+#define Z_IS_525_EQ_525U(...)  \,
+#define Z_IS_525U_EQ_525U(...) \,
+#define Z_IS_526_EQ_526(...)   \,
+#define Z_IS_526U_EQ_526(...)  \,
+#define Z_IS_526_EQ_526U(...)  \,
+#define Z_IS_526U_EQ_526U(...) \,
+#define Z_IS_527_EQ_527(...)   \,
+#define Z_IS_527U_EQ_527(...)  \,
+#define Z_IS_527_EQ_527U(...)  \,
+#define Z_IS_527U_EQ_527U(...) \,
+#define Z_IS_528_EQ_528(...)   \,
+#define Z_IS_528U_EQ_528(...)  \,
+#define Z_IS_528_EQ_528U(...)  \,
+#define Z_IS_528U_EQ_528U(...) \,
+#define Z_IS_529_EQ_529(...)   \,
+#define Z_IS_529U_EQ_529(...)  \,
+#define Z_IS_529_EQ_529U(...)  \,
+#define Z_IS_529U_EQ_529U(...) \,
+#define Z_IS_530_EQ_530(...)   \,
+#define Z_IS_530U_EQ_530(...)  \,
+#define Z_IS_530_EQ_530U(...)  \,
+#define Z_IS_530U_EQ_530U(...) \,
+#define Z_IS_531_EQ_531(...)   \,
+#define Z_IS_531U_EQ_531(...)  \,
+#define Z_IS_531_EQ_531U(...)  \,
+#define Z_IS_531U_EQ_531U(...) \,
+#define Z_IS_532_EQ_532(...)   \,
+#define Z_IS_532U_EQ_532(...)  \,
+#define Z_IS_532_EQ_532U(...)  \,
+#define Z_IS_532U_EQ_532U(...) \,
+#define Z_IS_533_EQ_533(...)   \,
+#define Z_IS_533U_EQ_533(...)  \,
+#define Z_IS_533_EQ_533U(...)  \,
+#define Z_IS_533U_EQ_533U(...) \,
+#define Z_IS_534_EQ_534(...)   \,
+#define Z_IS_534U_EQ_534(...)  \,
+#define Z_IS_534_EQ_534U(...)  \,
+#define Z_IS_534U_EQ_534U(...) \,
+#define Z_IS_535_EQ_535(...)   \,
+#define Z_IS_535U_EQ_535(...)  \,
+#define Z_IS_535_EQ_535U(...)  \,
+#define Z_IS_535U_EQ_535U(...) \,
+#define Z_IS_536_EQ_536(...)   \,
+#define Z_IS_536U_EQ_536(...)  \,
+#define Z_IS_536_EQ_536U(...)  \,
+#define Z_IS_536U_EQ_536U(...) \,
+#define Z_IS_537_EQ_537(...)   \,
+#define Z_IS_537U_EQ_537(...)  \,
+#define Z_IS_537_EQ_537U(...)  \,
+#define Z_IS_537U_EQ_537U(...) \,
+#define Z_IS_538_EQ_538(...)   \,
+#define Z_IS_538U_EQ_538(...)  \,
+#define Z_IS_538_EQ_538U(...)  \,
+#define Z_IS_538U_EQ_538U(...) \,
+#define Z_IS_539_EQ_539(...)   \,
+#define Z_IS_539U_EQ_539(...)  \,
+#define Z_IS_539_EQ_539U(...)  \,
+#define Z_IS_539U_EQ_539U(...) \,
+#define Z_IS_540_EQ_540(...)   \,
+#define Z_IS_540U_EQ_540(...)  \,
+#define Z_IS_540_EQ_540U(...)  \,
+#define Z_IS_540U_EQ_540U(...) \,
+#define Z_IS_541_EQ_541(...)   \,
+#define Z_IS_541U_EQ_541(...)  \,
+#define Z_IS_541_EQ_541U(...)  \,
+#define Z_IS_541U_EQ_541U(...) \,
+#define Z_IS_542_EQ_542(...)   \,
+#define Z_IS_542U_EQ_542(...)  \,
+#define Z_IS_542_EQ_542U(...)  \,
+#define Z_IS_542U_EQ_542U(...) \,
+#define Z_IS_543_EQ_543(...)   \,
+#define Z_IS_543U_EQ_543(...)  \,
+#define Z_IS_543_EQ_543U(...)  \,
+#define Z_IS_543U_EQ_543U(...) \,
+#define Z_IS_544_EQ_544(...)   \,
+#define Z_IS_544U_EQ_544(...)  \,
+#define Z_IS_544_EQ_544U(...)  \,
+#define Z_IS_544U_EQ_544U(...) \,
+#define Z_IS_545_EQ_545(...)   \,
+#define Z_IS_545U_EQ_545(...)  \,
+#define Z_IS_545_EQ_545U(...)  \,
+#define Z_IS_545U_EQ_545U(...) \,
+#define Z_IS_546_EQ_546(...)   \,
+#define Z_IS_546U_EQ_546(...)  \,
+#define Z_IS_546_EQ_546U(...)  \,
+#define Z_IS_546U_EQ_546U(...) \,
+#define Z_IS_547_EQ_547(...)   \,
+#define Z_IS_547U_EQ_547(...)  \,
+#define Z_IS_547_EQ_547U(...)  \,
+#define Z_IS_547U_EQ_547U(...) \,
+#define Z_IS_548_EQ_548(...)   \,
+#define Z_IS_548U_EQ_548(...)  \,
+#define Z_IS_548_EQ_548U(...)  \,
+#define Z_IS_548U_EQ_548U(...) \,
+#define Z_IS_549_EQ_549(...)   \,
+#define Z_IS_549U_EQ_549(...)  \,
+#define Z_IS_549_EQ_549U(...)  \,
+#define Z_IS_549U_EQ_549U(...) \,
+#define Z_IS_550_EQ_550(...)   \,
+#define Z_IS_550U_EQ_550(...)  \,
+#define Z_IS_550_EQ_550U(...)  \,
+#define Z_IS_550U_EQ_550U(...) \,
+#define Z_IS_551_EQ_551(...)   \,
+#define Z_IS_551U_EQ_551(...)  \,
+#define Z_IS_551_EQ_551U(...)  \,
+#define Z_IS_551U_EQ_551U(...) \,
+#define Z_IS_552_EQ_552(...)   \,
+#define Z_IS_552U_EQ_552(...)  \,
+#define Z_IS_552_EQ_552U(...)  \,
+#define Z_IS_552U_EQ_552U(...) \,
+#define Z_IS_553_EQ_553(...)   \,
+#define Z_IS_553U_EQ_553(...)  \,
+#define Z_IS_553_EQ_553U(...)  \,
+#define Z_IS_553U_EQ_553U(...) \,
+#define Z_IS_554_EQ_554(...)   \,
+#define Z_IS_554U_EQ_554(...)  \,
+#define Z_IS_554_EQ_554U(...)  \,
+#define Z_IS_554U_EQ_554U(...) \,
+#define Z_IS_555_EQ_555(...)   \,
+#define Z_IS_555U_EQ_555(...)  \,
+#define Z_IS_555_EQ_555U(...)  \,
+#define Z_IS_555U_EQ_555U(...) \,
+#define Z_IS_556_EQ_556(...)   \,
+#define Z_IS_556U_EQ_556(...)  \,
+#define Z_IS_556_EQ_556U(...)  \,
+#define Z_IS_556U_EQ_556U(...) \,
+#define Z_IS_557_EQ_557(...)   \,
+#define Z_IS_557U_EQ_557(...)  \,
+#define Z_IS_557_EQ_557U(...)  \,
+#define Z_IS_557U_EQ_557U(...) \,
+#define Z_IS_558_EQ_558(...)   \,
+#define Z_IS_558U_EQ_558(...)  \,
+#define Z_IS_558_EQ_558U(...)  \,
+#define Z_IS_558U_EQ_558U(...) \,
+#define Z_IS_559_EQ_559(...)   \,
+#define Z_IS_559U_EQ_559(...)  \,
+#define Z_IS_559_EQ_559U(...)  \,
+#define Z_IS_559U_EQ_559U(...) \,
+#define Z_IS_560_EQ_560(...)   \,
+#define Z_IS_560U_EQ_560(...)  \,
+#define Z_IS_560_EQ_560U(...)  \,
+#define Z_IS_560U_EQ_560U(...) \,
+#define Z_IS_561_EQ_561(...)   \,
+#define Z_IS_561U_EQ_561(...)  \,
+#define Z_IS_561_EQ_561U(...)  \,
+#define Z_IS_561U_EQ_561U(...) \,
+#define Z_IS_562_EQ_562(...)   \,
+#define Z_IS_562U_EQ_562(...)  \,
+#define Z_IS_562_EQ_562U(...)  \,
+#define Z_IS_562U_EQ_562U(...) \,
+#define Z_IS_563_EQ_563(...)   \,
+#define Z_IS_563U_EQ_563(...)  \,
+#define Z_IS_563_EQ_563U(...)  \,
+#define Z_IS_563U_EQ_563U(...) \,
+#define Z_IS_564_EQ_564(...)   \,
+#define Z_IS_564U_EQ_564(...)  \,
+#define Z_IS_564_EQ_564U(...)  \,
+#define Z_IS_564U_EQ_564U(...) \,
+#define Z_IS_565_EQ_565(...)   \,
+#define Z_IS_565U_EQ_565(...)  \,
+#define Z_IS_565_EQ_565U(...)  \,
+#define Z_IS_565U_EQ_565U(...) \,
+#define Z_IS_566_EQ_566(...)   \,
+#define Z_IS_566U_EQ_566(...)  \,
+#define Z_IS_566_EQ_566U(...)  \,
+#define Z_IS_566U_EQ_566U(...) \,
+#define Z_IS_567_EQ_567(...)   \,
+#define Z_IS_567U_EQ_567(...)  \,
+#define Z_IS_567_EQ_567U(...)  \,
+#define Z_IS_567U_EQ_567U(...) \,
+#define Z_IS_568_EQ_568(...)   \,
+#define Z_IS_568U_EQ_568(...)  \,
+#define Z_IS_568_EQ_568U(...)  \,
+#define Z_IS_568U_EQ_568U(...) \,
+#define Z_IS_569_EQ_569(...)   \,
+#define Z_IS_569U_EQ_569(...)  \,
+#define Z_IS_569_EQ_569U(...)  \,
+#define Z_IS_569U_EQ_569U(...) \,
+#define Z_IS_570_EQ_570(...)   \,
+#define Z_IS_570U_EQ_570(...)  \,
+#define Z_IS_570_EQ_570U(...)  \,
+#define Z_IS_570U_EQ_570U(...) \,
+#define Z_IS_571_EQ_571(...)   \,
+#define Z_IS_571U_EQ_571(...)  \,
+#define Z_IS_571_EQ_571U(...)  \,
+#define Z_IS_571U_EQ_571U(...) \,
+#define Z_IS_572_EQ_572(...)   \,
+#define Z_IS_572U_EQ_572(...)  \,
+#define Z_IS_572_EQ_572U(...)  \,
+#define Z_IS_572U_EQ_572U(...) \,
+#define Z_IS_573_EQ_573(...)   \,
+#define Z_IS_573U_EQ_573(...)  \,
+#define Z_IS_573_EQ_573U(...)  \,
+#define Z_IS_573U_EQ_573U(...) \,
+#define Z_IS_574_EQ_574(...)   \,
+#define Z_IS_574U_EQ_574(...)  \,
+#define Z_IS_574_EQ_574U(...)  \,
+#define Z_IS_574U_EQ_574U(...) \,
+#define Z_IS_575_EQ_575(...)   \,
+#define Z_IS_575U_EQ_575(...)  \,
+#define Z_IS_575_EQ_575U(...)  \,
+#define Z_IS_575U_EQ_575U(...) \,
+#define Z_IS_576_EQ_576(...)   \,
+#define Z_IS_576U_EQ_576(...)  \,
+#define Z_IS_576_EQ_576U(...)  \,
+#define Z_IS_576U_EQ_576U(...) \,
+#define Z_IS_577_EQ_577(...)   \,
+#define Z_IS_577U_EQ_577(...)  \,
+#define Z_IS_577_EQ_577U(...)  \,
+#define Z_IS_577U_EQ_577U(...) \,
+#define Z_IS_578_EQ_578(...)   \,
+#define Z_IS_578U_EQ_578(...)  \,
+#define Z_IS_578_EQ_578U(...)  \,
+#define Z_IS_578U_EQ_578U(...) \,
+#define Z_IS_579_EQ_579(...)   \,
+#define Z_IS_579U_EQ_579(...)  \,
+#define Z_IS_579_EQ_579U(...)  \,
+#define Z_IS_579U_EQ_579U(...) \,
+#define Z_IS_580_EQ_580(...)   \,
+#define Z_IS_580U_EQ_580(...)  \,
+#define Z_IS_580_EQ_580U(...)  \,
+#define Z_IS_580U_EQ_580U(...) \,
+#define Z_IS_581_EQ_581(...)   \,
+#define Z_IS_581U_EQ_581(...)  \,
+#define Z_IS_581_EQ_581U(...)  \,
+#define Z_IS_581U_EQ_581U(...) \,
+#define Z_IS_582_EQ_582(...)   \,
+#define Z_IS_582U_EQ_582(...)  \,
+#define Z_IS_582_EQ_582U(...)  \,
+#define Z_IS_582U_EQ_582U(...) \,
+#define Z_IS_583_EQ_583(...)   \,
+#define Z_IS_583U_EQ_583(...)  \,
+#define Z_IS_583_EQ_583U(...)  \,
+#define Z_IS_583U_EQ_583U(...) \,
+#define Z_IS_584_EQ_584(...)   \,
+#define Z_IS_584U_EQ_584(...)  \,
+#define Z_IS_584_EQ_584U(...)  \,
+#define Z_IS_584U_EQ_584U(...) \,
+#define Z_IS_585_EQ_585(...)   \,
+#define Z_IS_585U_EQ_585(...)  \,
+#define Z_IS_585_EQ_585U(...)  \,
+#define Z_IS_585U_EQ_585U(...) \,
+#define Z_IS_586_EQ_586(...)   \,
+#define Z_IS_586U_EQ_586(...)  \,
+#define Z_IS_586_EQ_586U(...)  \,
+#define Z_IS_586U_EQ_586U(...) \,
+#define Z_IS_587_EQ_587(...)   \,
+#define Z_IS_587U_EQ_587(...)  \,
+#define Z_IS_587_EQ_587U(...)  \,
+#define Z_IS_587U_EQ_587U(...) \,
+#define Z_IS_588_EQ_588(...)   \,
+#define Z_IS_588U_EQ_588(...)  \,
+#define Z_IS_588_EQ_588U(...)  \,
+#define Z_IS_588U_EQ_588U(...) \,
+#define Z_IS_589_EQ_589(...)   \,
+#define Z_IS_589U_EQ_589(...)  \,
+#define Z_IS_589_EQ_589U(...)  \,
+#define Z_IS_589U_EQ_589U(...) \,
+#define Z_IS_590_EQ_590(...)   \,
+#define Z_IS_590U_EQ_590(...)  \,
+#define Z_IS_590_EQ_590U(...)  \,
+#define Z_IS_590U_EQ_590U(...) \,
+#define Z_IS_591_EQ_591(...)   \,
+#define Z_IS_591U_EQ_591(...)  \,
+#define Z_IS_591_EQ_591U(...)  \,
+#define Z_IS_591U_EQ_591U(...) \,
+#define Z_IS_592_EQ_592(...)   \,
+#define Z_IS_592U_EQ_592(...)  \,
+#define Z_IS_592_EQ_592U(...)  \,
+#define Z_IS_592U_EQ_592U(...) \,
+#define Z_IS_593_EQ_593(...)   \,
+#define Z_IS_593U_EQ_593(...)  \,
+#define Z_IS_593_EQ_593U(...)  \,
+#define Z_IS_593U_EQ_593U(...) \,
+#define Z_IS_594_EQ_594(...)   \,
+#define Z_IS_594U_EQ_594(...)  \,
+#define Z_IS_594_EQ_594U(...)  \,
+#define Z_IS_594U_EQ_594U(...) \,
+#define Z_IS_595_EQ_595(...)   \,
+#define Z_IS_595U_EQ_595(...)  \,
+#define Z_IS_595_EQ_595U(...)  \,
+#define Z_IS_595U_EQ_595U(...) \,
+#define Z_IS_596_EQ_596(...)   \,
+#define Z_IS_596U_EQ_596(...)  \,
+#define Z_IS_596_EQ_596U(...)  \,
+#define Z_IS_596U_EQ_596U(...) \,
+#define Z_IS_597_EQ_597(...)   \,
+#define Z_IS_597U_EQ_597(...)  \,
+#define Z_IS_597_EQ_597U(...)  \,
+#define Z_IS_597U_EQ_597U(...) \,
+#define Z_IS_598_EQ_598(...)   \,
+#define Z_IS_598U_EQ_598(...)  \,
+#define Z_IS_598_EQ_598U(...)  \,
+#define Z_IS_598U_EQ_598U(...) \,
+#define Z_IS_599_EQ_599(...)   \,
+#define Z_IS_599U_EQ_599(...)  \,
+#define Z_IS_599_EQ_599U(...)  \,
+#define Z_IS_599U_EQ_599U(...) \,
+#define Z_IS_600_EQ_600(...)   \,
+#define Z_IS_600U_EQ_600(...)  \,
+#define Z_IS_600_EQ_600U(...)  \,
+#define Z_IS_600U_EQ_600U(...) \,
+#define Z_IS_601_EQ_601(...)   \,
+#define Z_IS_601U_EQ_601(...)  \,
+#define Z_IS_601_EQ_601U(...)  \,
+#define Z_IS_601U_EQ_601U(...) \,
+#define Z_IS_602_EQ_602(...)   \,
+#define Z_IS_602U_EQ_602(...)  \,
+#define Z_IS_602_EQ_602U(...)  \,
+#define Z_IS_602U_EQ_602U(...) \,
+#define Z_IS_603_EQ_603(...)   \,
+#define Z_IS_603U_EQ_603(...)  \,
+#define Z_IS_603_EQ_603U(...)  \,
+#define Z_IS_603U_EQ_603U(...) \,
+#define Z_IS_604_EQ_604(...)   \,
+#define Z_IS_604U_EQ_604(...)  \,
+#define Z_IS_604_EQ_604U(...)  \,
+#define Z_IS_604U_EQ_604U(...) \,
+#define Z_IS_605_EQ_605(...)   \,
+#define Z_IS_605U_EQ_605(...)  \,
+#define Z_IS_605_EQ_605U(...)  \,
+#define Z_IS_605U_EQ_605U(...) \,
+#define Z_IS_606_EQ_606(...)   \,
+#define Z_IS_606U_EQ_606(...)  \,
+#define Z_IS_606_EQ_606U(...)  \,
+#define Z_IS_606U_EQ_606U(...) \,
+#define Z_IS_607_EQ_607(...)   \,
+#define Z_IS_607U_EQ_607(...)  \,
+#define Z_IS_607_EQ_607U(...)  \,
+#define Z_IS_607U_EQ_607U(...) \,
+#define Z_IS_608_EQ_608(...)   \,
+#define Z_IS_608U_EQ_608(...)  \,
+#define Z_IS_608_EQ_608U(...)  \,
+#define Z_IS_608U_EQ_608U(...) \,
+#define Z_IS_609_EQ_609(...)   \,
+#define Z_IS_609U_EQ_609(...)  \,
+#define Z_IS_609_EQ_609U(...)  \,
+#define Z_IS_609U_EQ_609U(...) \,
+#define Z_IS_610_EQ_610(...)   \,
+#define Z_IS_610U_EQ_610(...)  \,
+#define Z_IS_610_EQ_610U(...)  \,
+#define Z_IS_610U_EQ_610U(...) \,
+#define Z_IS_611_EQ_611(...)   \,
+#define Z_IS_611U_EQ_611(...)  \,
+#define Z_IS_611_EQ_611U(...)  \,
+#define Z_IS_611U_EQ_611U(...) \,
+#define Z_IS_612_EQ_612(...)   \,
+#define Z_IS_612U_EQ_612(...)  \,
+#define Z_IS_612_EQ_612U(...)  \,
+#define Z_IS_612U_EQ_612U(...) \,
+#define Z_IS_613_EQ_613(...)   \,
+#define Z_IS_613U_EQ_613(...)  \,
+#define Z_IS_613_EQ_613U(...)  \,
+#define Z_IS_613U_EQ_613U(...) \,
+#define Z_IS_614_EQ_614(...)   \,
+#define Z_IS_614U_EQ_614(...)  \,
+#define Z_IS_614_EQ_614U(...)  \,
+#define Z_IS_614U_EQ_614U(...) \,
+#define Z_IS_615_EQ_615(...)   \,
+#define Z_IS_615U_EQ_615(...)  \,
+#define Z_IS_615_EQ_615U(...)  \,
+#define Z_IS_615U_EQ_615U(...) \,
+#define Z_IS_616_EQ_616(...)   \,
+#define Z_IS_616U_EQ_616(...)  \,
+#define Z_IS_616_EQ_616U(...)  \,
+#define Z_IS_616U_EQ_616U(...) \,
+#define Z_IS_617_EQ_617(...)   \,
+#define Z_IS_617U_EQ_617(...)  \,
+#define Z_IS_617_EQ_617U(...)  \,
+#define Z_IS_617U_EQ_617U(...) \,
+#define Z_IS_618_EQ_618(...)   \,
+#define Z_IS_618U_EQ_618(...)  \,
+#define Z_IS_618_EQ_618U(...)  \,
+#define Z_IS_618U_EQ_618U(...) \,
+#define Z_IS_619_EQ_619(...)   \,
+#define Z_IS_619U_EQ_619(...)  \,
+#define Z_IS_619_EQ_619U(...)  \,
+#define Z_IS_619U_EQ_619U(...) \,
+#define Z_IS_620_EQ_620(...)   \,
+#define Z_IS_620U_EQ_620(...)  \,
+#define Z_IS_620_EQ_620U(...)  \,
+#define Z_IS_620U_EQ_620U(...) \,
+#define Z_IS_621_EQ_621(...)   \,
+#define Z_IS_621U_EQ_621(...)  \,
+#define Z_IS_621_EQ_621U(...)  \,
+#define Z_IS_621U_EQ_621U(...) \,
+#define Z_IS_622_EQ_622(...)   \,
+#define Z_IS_622U_EQ_622(...)  \,
+#define Z_IS_622_EQ_622U(...)  \,
+#define Z_IS_622U_EQ_622U(...) \,
+#define Z_IS_623_EQ_623(...)   \,
+#define Z_IS_623U_EQ_623(...)  \,
+#define Z_IS_623_EQ_623U(...)  \,
+#define Z_IS_623U_EQ_623U(...) \,
+#define Z_IS_624_EQ_624(...)   \,
+#define Z_IS_624U_EQ_624(...)  \,
+#define Z_IS_624_EQ_624U(...)  \,
+#define Z_IS_624U_EQ_624U(...) \,
+#define Z_IS_625_EQ_625(...)   \,
+#define Z_IS_625U_EQ_625(...)  \,
+#define Z_IS_625_EQ_625U(...)  \,
+#define Z_IS_625U_EQ_625U(...) \,
+#define Z_IS_626_EQ_626(...)   \,
+#define Z_IS_626U_EQ_626(...)  \,
+#define Z_IS_626_EQ_626U(...)  \,
+#define Z_IS_626U_EQ_626U(...) \,
+#define Z_IS_627_EQ_627(...)   \,
+#define Z_IS_627U_EQ_627(...)  \,
+#define Z_IS_627_EQ_627U(...)  \,
+#define Z_IS_627U_EQ_627U(...) \,
+#define Z_IS_628_EQ_628(...)   \,
+#define Z_IS_628U_EQ_628(...)  \,
+#define Z_IS_628_EQ_628U(...)  \,
+#define Z_IS_628U_EQ_628U(...) \,
+#define Z_IS_629_EQ_629(...)   \,
+#define Z_IS_629U_EQ_629(...)  \,
+#define Z_IS_629_EQ_629U(...)  \,
+#define Z_IS_629U_EQ_629U(...) \,
+#define Z_IS_630_EQ_630(...)   \,
+#define Z_IS_630U_EQ_630(...)  \,
+#define Z_IS_630_EQ_630U(...)  \,
+#define Z_IS_630U_EQ_630U(...) \,
+#define Z_IS_631_EQ_631(...)   \,
+#define Z_IS_631U_EQ_631(...)  \,
+#define Z_IS_631_EQ_631U(...)  \,
+#define Z_IS_631U_EQ_631U(...) \,
+#define Z_IS_632_EQ_632(...)   \,
+#define Z_IS_632U_EQ_632(...)  \,
+#define Z_IS_632_EQ_632U(...)  \,
+#define Z_IS_632U_EQ_632U(...) \,
+#define Z_IS_633_EQ_633(...)   \,
+#define Z_IS_633U_EQ_633(...)  \,
+#define Z_IS_633_EQ_633U(...)  \,
+#define Z_IS_633U_EQ_633U(...) \,
+#define Z_IS_634_EQ_634(...)   \,
+#define Z_IS_634U_EQ_634(...)  \,
+#define Z_IS_634_EQ_634U(...)  \,
+#define Z_IS_634U_EQ_634U(...) \,
+#define Z_IS_635_EQ_635(...)   \,
+#define Z_IS_635U_EQ_635(...)  \,
+#define Z_IS_635_EQ_635U(...)  \,
+#define Z_IS_635U_EQ_635U(...) \,
+#define Z_IS_636_EQ_636(...)   \,
+#define Z_IS_636U_EQ_636(...)  \,
+#define Z_IS_636_EQ_636U(...)  \,
+#define Z_IS_636U_EQ_636U(...) \,
+#define Z_IS_637_EQ_637(...)   \,
+#define Z_IS_637U_EQ_637(...)  \,
+#define Z_IS_637_EQ_637U(...)  \,
+#define Z_IS_637U_EQ_637U(...) \,
+#define Z_IS_638_EQ_638(...)   \,
+#define Z_IS_638U_EQ_638(...)  \,
+#define Z_IS_638_EQ_638U(...)  \,
+#define Z_IS_638U_EQ_638U(...) \,
+#define Z_IS_639_EQ_639(...)   \,
+#define Z_IS_639U_EQ_639(...)  \,
+#define Z_IS_639_EQ_639U(...)  \,
+#define Z_IS_639U_EQ_639U(...) \,
+#define Z_IS_640_EQ_640(...)   \,
+#define Z_IS_640U_EQ_640(...)  \,
+#define Z_IS_640_EQ_640U(...)  \,
+#define Z_IS_640U_EQ_640U(...) \,
+#define Z_IS_641_EQ_641(...)   \,
+#define Z_IS_641U_EQ_641(...)  \,
+#define Z_IS_641_EQ_641U(...)  \,
+#define Z_IS_641U_EQ_641U(...) \,
+#define Z_IS_642_EQ_642(...)   \,
+#define Z_IS_642U_EQ_642(...)  \,
+#define Z_IS_642_EQ_642U(...)  \,
+#define Z_IS_642U_EQ_642U(...) \,
+#define Z_IS_643_EQ_643(...)   \,
+#define Z_IS_643U_EQ_643(...)  \,
+#define Z_IS_643_EQ_643U(...)  \,
+#define Z_IS_643U_EQ_643U(...) \,
+#define Z_IS_644_EQ_644(...)   \,
+#define Z_IS_644U_EQ_644(...)  \,
+#define Z_IS_644_EQ_644U(...)  \,
+#define Z_IS_644U_EQ_644U(...) \,
+#define Z_IS_645_EQ_645(...)   \,
+#define Z_IS_645U_EQ_645(...)  \,
+#define Z_IS_645_EQ_645U(...)  \,
+#define Z_IS_645U_EQ_645U(...) \,
+#define Z_IS_646_EQ_646(...)   \,
+#define Z_IS_646U_EQ_646(...)  \,
+#define Z_IS_646_EQ_646U(...)  \,
+#define Z_IS_646U_EQ_646U(...) \,
+#define Z_IS_647_EQ_647(...)   \,
+#define Z_IS_647U_EQ_647(...)  \,
+#define Z_IS_647_EQ_647U(...)  \,
+#define Z_IS_647U_EQ_647U(...) \,
+#define Z_IS_648_EQ_648(...)   \,
+#define Z_IS_648U_EQ_648(...)  \,
+#define Z_IS_648_EQ_648U(...)  \,
+#define Z_IS_648U_EQ_648U(...) \,
+#define Z_IS_649_EQ_649(...)   \,
+#define Z_IS_649U_EQ_649(...)  \,
+#define Z_IS_649_EQ_649U(...)  \,
+#define Z_IS_649U_EQ_649U(...) \,
+#define Z_IS_650_EQ_650(...)   \,
+#define Z_IS_650U_EQ_650(...)  \,
+#define Z_IS_650_EQ_650U(...)  \,
+#define Z_IS_650U_EQ_650U(...) \,
+#define Z_IS_651_EQ_651(...)   \,
+#define Z_IS_651U_EQ_651(...)  \,
+#define Z_IS_651_EQ_651U(...)  \,
+#define Z_IS_651U_EQ_651U(...) \,
+#define Z_IS_652_EQ_652(...)   \,
+#define Z_IS_652U_EQ_652(...)  \,
+#define Z_IS_652_EQ_652U(...)  \,
+#define Z_IS_652U_EQ_652U(...) \,
+#define Z_IS_653_EQ_653(...)   \,
+#define Z_IS_653U_EQ_653(...)  \,
+#define Z_IS_653_EQ_653U(...)  \,
+#define Z_IS_653U_EQ_653U(...) \,
+#define Z_IS_654_EQ_654(...)   \,
+#define Z_IS_654U_EQ_654(...)  \,
+#define Z_IS_654_EQ_654U(...)  \,
+#define Z_IS_654U_EQ_654U(...) \,
+#define Z_IS_655_EQ_655(...)   \,
+#define Z_IS_655U_EQ_655(...)  \,
+#define Z_IS_655_EQ_655U(...)  \,
+#define Z_IS_655U_EQ_655U(...) \,
+#define Z_IS_656_EQ_656(...)   \,
+#define Z_IS_656U_EQ_656(...)  \,
+#define Z_IS_656_EQ_656U(...)  \,
+#define Z_IS_656U_EQ_656U(...) \,
+#define Z_IS_657_EQ_657(...)   \,
+#define Z_IS_657U_EQ_657(...)  \,
+#define Z_IS_657_EQ_657U(...)  \,
+#define Z_IS_657U_EQ_657U(...) \,
+#define Z_IS_658_EQ_658(...)   \,
+#define Z_IS_658U_EQ_658(...)  \,
+#define Z_IS_658_EQ_658U(...)  \,
+#define Z_IS_658U_EQ_658U(...) \,
+#define Z_IS_659_EQ_659(...)   \,
+#define Z_IS_659U_EQ_659(...)  \,
+#define Z_IS_659_EQ_659U(...)  \,
+#define Z_IS_659U_EQ_659U(...) \,
+#define Z_IS_660_EQ_660(...)   \,
+#define Z_IS_660U_EQ_660(...)  \,
+#define Z_IS_660_EQ_660U(...)  \,
+#define Z_IS_660U_EQ_660U(...) \,
+#define Z_IS_661_EQ_661(...)   \,
+#define Z_IS_661U_EQ_661(...)  \,
+#define Z_IS_661_EQ_661U(...)  \,
+#define Z_IS_661U_EQ_661U(...) \,
+#define Z_IS_662_EQ_662(...)   \,
+#define Z_IS_662U_EQ_662(...)  \,
+#define Z_IS_662_EQ_662U(...)  \,
+#define Z_IS_662U_EQ_662U(...) \,
+#define Z_IS_663_EQ_663(...)   \,
+#define Z_IS_663U_EQ_663(...)  \,
+#define Z_IS_663_EQ_663U(...)  \,
+#define Z_IS_663U_EQ_663U(...) \,
+#define Z_IS_664_EQ_664(...)   \,
+#define Z_IS_664U_EQ_664(...)  \,
+#define Z_IS_664_EQ_664U(...)  \,
+#define Z_IS_664U_EQ_664U(...) \,
+#define Z_IS_665_EQ_665(...)   \,
+#define Z_IS_665U_EQ_665(...)  \,
+#define Z_IS_665_EQ_665U(...)  \,
+#define Z_IS_665U_EQ_665U(...) \,
+#define Z_IS_666_EQ_666(...)   \,
+#define Z_IS_666U_EQ_666(...)  \,
+#define Z_IS_666_EQ_666U(...)  \,
+#define Z_IS_666U_EQ_666U(...) \,
+#define Z_IS_667_EQ_667(...)   \,
+#define Z_IS_667U_EQ_667(...)  \,
+#define Z_IS_667_EQ_667U(...)  \,
+#define Z_IS_667U_EQ_667U(...) \,
+#define Z_IS_668_EQ_668(...)   \,
+#define Z_IS_668U_EQ_668(...)  \,
+#define Z_IS_668_EQ_668U(...)  \,
+#define Z_IS_668U_EQ_668U(...) \,
+#define Z_IS_669_EQ_669(...)   \,
+#define Z_IS_669U_EQ_669(...)  \,
+#define Z_IS_669_EQ_669U(...)  \,
+#define Z_IS_669U_EQ_669U(...) \,
+#define Z_IS_670_EQ_670(...)   \,
+#define Z_IS_670U_EQ_670(...)  \,
+#define Z_IS_670_EQ_670U(...)  \,
+#define Z_IS_670U_EQ_670U(...) \,
+#define Z_IS_671_EQ_671(...)   \,
+#define Z_IS_671U_EQ_671(...)  \,
+#define Z_IS_671_EQ_671U(...)  \,
+#define Z_IS_671U_EQ_671U(...) \,
+#define Z_IS_672_EQ_672(...)   \,
+#define Z_IS_672U_EQ_672(...)  \,
+#define Z_IS_672_EQ_672U(...)  \,
+#define Z_IS_672U_EQ_672U(...) \,
+#define Z_IS_673_EQ_673(...)   \,
+#define Z_IS_673U_EQ_673(...)  \,
+#define Z_IS_673_EQ_673U(...)  \,
+#define Z_IS_673U_EQ_673U(...) \,
+#define Z_IS_674_EQ_674(...)   \,
+#define Z_IS_674U_EQ_674(...)  \,
+#define Z_IS_674_EQ_674U(...)  \,
+#define Z_IS_674U_EQ_674U(...) \,
+#define Z_IS_675_EQ_675(...)   \,
+#define Z_IS_675U_EQ_675(...)  \,
+#define Z_IS_675_EQ_675U(...)  \,
+#define Z_IS_675U_EQ_675U(...) \,
+#define Z_IS_676_EQ_676(...)   \,
+#define Z_IS_676U_EQ_676(...)  \,
+#define Z_IS_676_EQ_676U(...)  \,
+#define Z_IS_676U_EQ_676U(...) \,
+#define Z_IS_677_EQ_677(...)   \,
+#define Z_IS_677U_EQ_677(...)  \,
+#define Z_IS_677_EQ_677U(...)  \,
+#define Z_IS_677U_EQ_677U(...) \,
+#define Z_IS_678_EQ_678(...)   \,
+#define Z_IS_678U_EQ_678(...)  \,
+#define Z_IS_678_EQ_678U(...)  \,
+#define Z_IS_678U_EQ_678U(...) \,
+#define Z_IS_679_EQ_679(...)   \,
+#define Z_IS_679U_EQ_679(...)  \,
+#define Z_IS_679_EQ_679U(...)  \,
+#define Z_IS_679U_EQ_679U(...) \,
+#define Z_IS_680_EQ_680(...)   \,
+#define Z_IS_680U_EQ_680(...)  \,
+#define Z_IS_680_EQ_680U(...)  \,
+#define Z_IS_680U_EQ_680U(...) \,
+#define Z_IS_681_EQ_681(...)   \,
+#define Z_IS_681U_EQ_681(...)  \,
+#define Z_IS_681_EQ_681U(...)  \,
+#define Z_IS_681U_EQ_681U(...) \,
+#define Z_IS_682_EQ_682(...)   \,
+#define Z_IS_682U_EQ_682(...)  \,
+#define Z_IS_682_EQ_682U(...)  \,
+#define Z_IS_682U_EQ_682U(...) \,
+#define Z_IS_683_EQ_683(...)   \,
+#define Z_IS_683U_EQ_683(...)  \,
+#define Z_IS_683_EQ_683U(...)  \,
+#define Z_IS_683U_EQ_683U(...) \,
+#define Z_IS_684_EQ_684(...)   \,
+#define Z_IS_684U_EQ_684(...)  \,
+#define Z_IS_684_EQ_684U(...)  \,
+#define Z_IS_684U_EQ_684U(...) \,
+#define Z_IS_685_EQ_685(...)   \,
+#define Z_IS_685U_EQ_685(...)  \,
+#define Z_IS_685_EQ_685U(...)  \,
+#define Z_IS_685U_EQ_685U(...) \,
+#define Z_IS_686_EQ_686(...)   \,
+#define Z_IS_686U_EQ_686(...)  \,
+#define Z_IS_686_EQ_686U(...)  \,
+#define Z_IS_686U_EQ_686U(...) \,
+#define Z_IS_687_EQ_687(...)   \,
+#define Z_IS_687U_EQ_687(...)  \,
+#define Z_IS_687_EQ_687U(...)  \,
+#define Z_IS_687U_EQ_687U(...) \,
+#define Z_IS_688_EQ_688(...)   \,
+#define Z_IS_688U_EQ_688(...)  \,
+#define Z_IS_688_EQ_688U(...)  \,
+#define Z_IS_688U_EQ_688U(...) \,
+#define Z_IS_689_EQ_689(...)   \,
+#define Z_IS_689U_EQ_689(...)  \,
+#define Z_IS_689_EQ_689U(...)  \,
+#define Z_IS_689U_EQ_689U(...) \,
+#define Z_IS_690_EQ_690(...)   \,
+#define Z_IS_690U_EQ_690(...)  \,
+#define Z_IS_690_EQ_690U(...)  \,
+#define Z_IS_690U_EQ_690U(...) \,
+#define Z_IS_691_EQ_691(...)   \,
+#define Z_IS_691U_EQ_691(...)  \,
+#define Z_IS_691_EQ_691U(...)  \,
+#define Z_IS_691U_EQ_691U(...) \,
+#define Z_IS_692_EQ_692(...)   \,
+#define Z_IS_692U_EQ_692(...)  \,
+#define Z_IS_692_EQ_692U(...)  \,
+#define Z_IS_692U_EQ_692U(...) \,
+#define Z_IS_693_EQ_693(...)   \,
+#define Z_IS_693U_EQ_693(...)  \,
+#define Z_IS_693_EQ_693U(...)  \,
+#define Z_IS_693U_EQ_693U(...) \,
+#define Z_IS_694_EQ_694(...)   \,
+#define Z_IS_694U_EQ_694(...)  \,
+#define Z_IS_694_EQ_694U(...)  \,
+#define Z_IS_694U_EQ_694U(...) \,
+#define Z_IS_695_EQ_695(...)   \,
+#define Z_IS_695U_EQ_695(...)  \,
+#define Z_IS_695_EQ_695U(...)  \,
+#define Z_IS_695U_EQ_695U(...) \,
+#define Z_IS_696_EQ_696(...)   \,
+#define Z_IS_696U_EQ_696(...)  \,
+#define Z_IS_696_EQ_696U(...)  \,
+#define Z_IS_696U_EQ_696U(...) \,
+#define Z_IS_697_EQ_697(...)   \,
+#define Z_IS_697U_EQ_697(...)  \,
+#define Z_IS_697_EQ_697U(...)  \,
+#define Z_IS_697U_EQ_697U(...) \,
+#define Z_IS_698_EQ_698(...)   \,
+#define Z_IS_698U_EQ_698(...)  \,
+#define Z_IS_698_EQ_698U(...)  \,
+#define Z_IS_698U_EQ_698U(...) \,
+#define Z_IS_699_EQ_699(...)   \,
+#define Z_IS_699U_EQ_699(...)  \,
+#define Z_IS_699_EQ_699U(...)  \,
+#define Z_IS_699U_EQ_699U(...) \,
+#define Z_IS_700_EQ_700(...)   \,
+#define Z_IS_700U_EQ_700(...)  \,
+#define Z_IS_700_EQ_700U(...)  \,
+#define Z_IS_700U_EQ_700U(...) \,
+#define Z_IS_701_EQ_701(...)   \,
+#define Z_IS_701U_EQ_701(...)  \,
+#define Z_IS_701_EQ_701U(...)  \,
+#define Z_IS_701U_EQ_701U(...) \,
+#define Z_IS_702_EQ_702(...)   \,
+#define Z_IS_702U_EQ_702(...)  \,
+#define Z_IS_702_EQ_702U(...)  \,
+#define Z_IS_702U_EQ_702U(...) \,
+#define Z_IS_703_EQ_703(...)   \,
+#define Z_IS_703U_EQ_703(...)  \,
+#define Z_IS_703_EQ_703U(...)  \,
+#define Z_IS_703U_EQ_703U(...) \,
+#define Z_IS_704_EQ_704(...)   \,
+#define Z_IS_704U_EQ_704(...)  \,
+#define Z_IS_704_EQ_704U(...)  \,
+#define Z_IS_704U_EQ_704U(...) \,
+#define Z_IS_705_EQ_705(...)   \,
+#define Z_IS_705U_EQ_705(...)  \,
+#define Z_IS_705_EQ_705U(...)  \,
+#define Z_IS_705U_EQ_705U(...) \,
+#define Z_IS_706_EQ_706(...)   \,
+#define Z_IS_706U_EQ_706(...)  \,
+#define Z_IS_706_EQ_706U(...)  \,
+#define Z_IS_706U_EQ_706U(...) \,
+#define Z_IS_707_EQ_707(...)   \,
+#define Z_IS_707U_EQ_707(...)  \,
+#define Z_IS_707_EQ_707U(...)  \,
+#define Z_IS_707U_EQ_707U(...) \,
+#define Z_IS_708_EQ_708(...)   \,
+#define Z_IS_708U_EQ_708(...)  \,
+#define Z_IS_708_EQ_708U(...)  \,
+#define Z_IS_708U_EQ_708U(...) \,
+#define Z_IS_709_EQ_709(...)   \,
+#define Z_IS_709U_EQ_709(...)  \,
+#define Z_IS_709_EQ_709U(...)  \,
+#define Z_IS_709U_EQ_709U(...) \,
+#define Z_IS_710_EQ_710(...)   \,
+#define Z_IS_710U_EQ_710(...)  \,
+#define Z_IS_710_EQ_710U(...)  \,
+#define Z_IS_710U_EQ_710U(...) \,
+#define Z_IS_711_EQ_711(...)   \,
+#define Z_IS_711U_EQ_711(...)  \,
+#define Z_IS_711_EQ_711U(...)  \,
+#define Z_IS_711U_EQ_711U(...) \,
+#define Z_IS_712_EQ_712(...)   \,
+#define Z_IS_712U_EQ_712(...)  \,
+#define Z_IS_712_EQ_712U(...)  \,
+#define Z_IS_712U_EQ_712U(...) \,
+#define Z_IS_713_EQ_713(...)   \,
+#define Z_IS_713U_EQ_713(...)  \,
+#define Z_IS_713_EQ_713U(...)  \,
+#define Z_IS_713U_EQ_713U(...) \,
+#define Z_IS_714_EQ_714(...)   \,
+#define Z_IS_714U_EQ_714(...)  \,
+#define Z_IS_714_EQ_714U(...)  \,
+#define Z_IS_714U_EQ_714U(...) \,
+#define Z_IS_715_EQ_715(...)   \,
+#define Z_IS_715U_EQ_715(...)  \,
+#define Z_IS_715_EQ_715U(...)  \,
+#define Z_IS_715U_EQ_715U(...) \,
+#define Z_IS_716_EQ_716(...)   \,
+#define Z_IS_716U_EQ_716(...)  \,
+#define Z_IS_716_EQ_716U(...)  \,
+#define Z_IS_716U_EQ_716U(...) \,
+#define Z_IS_717_EQ_717(...)   \,
+#define Z_IS_717U_EQ_717(...)  \,
+#define Z_IS_717_EQ_717U(...)  \,
+#define Z_IS_717U_EQ_717U(...) \,
+#define Z_IS_718_EQ_718(...)   \,
+#define Z_IS_718U_EQ_718(...)  \,
+#define Z_IS_718_EQ_718U(...)  \,
+#define Z_IS_718U_EQ_718U(...) \,
+#define Z_IS_719_EQ_719(...)   \,
+#define Z_IS_719U_EQ_719(...)  \,
+#define Z_IS_719_EQ_719U(...)  \,
+#define Z_IS_719U_EQ_719U(...) \,
+#define Z_IS_720_EQ_720(...)   \,
+#define Z_IS_720U_EQ_720(...)  \,
+#define Z_IS_720_EQ_720U(...)  \,
+#define Z_IS_720U_EQ_720U(...) \,
+#define Z_IS_721_EQ_721(...)   \,
+#define Z_IS_721U_EQ_721(...)  \,
+#define Z_IS_721_EQ_721U(...)  \,
+#define Z_IS_721U_EQ_721U(...) \,
+#define Z_IS_722_EQ_722(...)   \,
+#define Z_IS_722U_EQ_722(...)  \,
+#define Z_IS_722_EQ_722U(...)  \,
+#define Z_IS_722U_EQ_722U(...) \,
+#define Z_IS_723_EQ_723(...)   \,
+#define Z_IS_723U_EQ_723(...)  \,
+#define Z_IS_723_EQ_723U(...)  \,
+#define Z_IS_723U_EQ_723U(...) \,
+#define Z_IS_724_EQ_724(...)   \,
+#define Z_IS_724U_EQ_724(...)  \,
+#define Z_IS_724_EQ_724U(...)  \,
+#define Z_IS_724U_EQ_724U(...) \,
+#define Z_IS_725_EQ_725(...)   \,
+#define Z_IS_725U_EQ_725(...)  \,
+#define Z_IS_725_EQ_725U(...)  \,
+#define Z_IS_725U_EQ_725U(...) \,
+#define Z_IS_726_EQ_726(...)   \,
+#define Z_IS_726U_EQ_726(...)  \,
+#define Z_IS_726_EQ_726U(...)  \,
+#define Z_IS_726U_EQ_726U(...) \,
+#define Z_IS_727_EQ_727(...)   \,
+#define Z_IS_727U_EQ_727(...)  \,
+#define Z_IS_727_EQ_727U(...)  \,
+#define Z_IS_727U_EQ_727U(...) \,
+#define Z_IS_728_EQ_728(...)   \,
+#define Z_IS_728U_EQ_728(...)  \,
+#define Z_IS_728_EQ_728U(...)  \,
+#define Z_IS_728U_EQ_728U(...) \,
+#define Z_IS_729_EQ_729(...)   \,
+#define Z_IS_729U_EQ_729(...)  \,
+#define Z_IS_729_EQ_729U(...)  \,
+#define Z_IS_729U_EQ_729U(...) \,
+#define Z_IS_730_EQ_730(...)   \,
+#define Z_IS_730U_EQ_730(...)  \,
+#define Z_IS_730_EQ_730U(...)  \,
+#define Z_IS_730U_EQ_730U(...) \,
+#define Z_IS_731_EQ_731(...)   \,
+#define Z_IS_731U_EQ_731(...)  \,
+#define Z_IS_731_EQ_731U(...)  \,
+#define Z_IS_731U_EQ_731U(...) \,
+#define Z_IS_732_EQ_732(...)   \,
+#define Z_IS_732U_EQ_732(...)  \,
+#define Z_IS_732_EQ_732U(...)  \,
+#define Z_IS_732U_EQ_732U(...) \,
+#define Z_IS_733_EQ_733(...)   \,
+#define Z_IS_733U_EQ_733(...)  \,
+#define Z_IS_733_EQ_733U(...)  \,
+#define Z_IS_733U_EQ_733U(...) \,
+#define Z_IS_734_EQ_734(...)   \,
+#define Z_IS_734U_EQ_734(...)  \,
+#define Z_IS_734_EQ_734U(...)  \,
+#define Z_IS_734U_EQ_734U(...) \,
+#define Z_IS_735_EQ_735(...)   \,
+#define Z_IS_735U_EQ_735(...)  \,
+#define Z_IS_735_EQ_735U(...)  \,
+#define Z_IS_735U_EQ_735U(...) \,
+#define Z_IS_736_EQ_736(...)   \,
+#define Z_IS_736U_EQ_736(...)  \,
+#define Z_IS_736_EQ_736U(...)  \,
+#define Z_IS_736U_EQ_736U(...) \,
+#define Z_IS_737_EQ_737(...)   \,
+#define Z_IS_737U_EQ_737(...)  \,
+#define Z_IS_737_EQ_737U(...)  \,
+#define Z_IS_737U_EQ_737U(...) \,
+#define Z_IS_738_EQ_738(...)   \,
+#define Z_IS_738U_EQ_738(...)  \,
+#define Z_IS_738_EQ_738U(...)  \,
+#define Z_IS_738U_EQ_738U(...) \,
+#define Z_IS_739_EQ_739(...)   \,
+#define Z_IS_739U_EQ_739(...)  \,
+#define Z_IS_739_EQ_739U(...)  \,
+#define Z_IS_739U_EQ_739U(...) \,
+#define Z_IS_740_EQ_740(...)   \,
+#define Z_IS_740U_EQ_740(...)  \,
+#define Z_IS_740_EQ_740U(...)  \,
+#define Z_IS_740U_EQ_740U(...) \,
+#define Z_IS_741_EQ_741(...)   \,
+#define Z_IS_741U_EQ_741(...)  \,
+#define Z_IS_741_EQ_741U(...)  \,
+#define Z_IS_741U_EQ_741U(...) \,
+#define Z_IS_742_EQ_742(...)   \,
+#define Z_IS_742U_EQ_742(...)  \,
+#define Z_IS_742_EQ_742U(...)  \,
+#define Z_IS_742U_EQ_742U(...) \,
+#define Z_IS_743_EQ_743(...)   \,
+#define Z_IS_743U_EQ_743(...)  \,
+#define Z_IS_743_EQ_743U(...)  \,
+#define Z_IS_743U_EQ_743U(...) \,
+#define Z_IS_744_EQ_744(...)   \,
+#define Z_IS_744U_EQ_744(...)  \,
+#define Z_IS_744_EQ_744U(...)  \,
+#define Z_IS_744U_EQ_744U(...) \,
+#define Z_IS_745_EQ_745(...)   \,
+#define Z_IS_745U_EQ_745(...)  \,
+#define Z_IS_745_EQ_745U(...)  \,
+#define Z_IS_745U_EQ_745U(...) \,
+#define Z_IS_746_EQ_746(...)   \,
+#define Z_IS_746U_EQ_746(...)  \,
+#define Z_IS_746_EQ_746U(...)  \,
+#define Z_IS_746U_EQ_746U(...) \,
+#define Z_IS_747_EQ_747(...)   \,
+#define Z_IS_747U_EQ_747(...)  \,
+#define Z_IS_747_EQ_747U(...)  \,
+#define Z_IS_747U_EQ_747U(...) \,
+#define Z_IS_748_EQ_748(...)   \,
+#define Z_IS_748U_EQ_748(...)  \,
+#define Z_IS_748_EQ_748U(...)  \,
+#define Z_IS_748U_EQ_748U(...) \,
+#define Z_IS_749_EQ_749(...)   \,
+#define Z_IS_749U_EQ_749(...)  \,
+#define Z_IS_749_EQ_749U(...)  \,
+#define Z_IS_749U_EQ_749U(...) \,
+#define Z_IS_750_EQ_750(...)   \,
+#define Z_IS_750U_EQ_750(...)  \,
+#define Z_IS_750_EQ_750U(...)  \,
+#define Z_IS_750U_EQ_750U(...) \,
+#define Z_IS_751_EQ_751(...)   \,
+#define Z_IS_751U_EQ_751(...)  \,
+#define Z_IS_751_EQ_751U(...)  \,
+#define Z_IS_751U_EQ_751U(...) \,
+#define Z_IS_752_EQ_752(...)   \,
+#define Z_IS_752U_EQ_752(...)  \,
+#define Z_IS_752_EQ_752U(...)  \,
+#define Z_IS_752U_EQ_752U(...) \,
+#define Z_IS_753_EQ_753(...)   \,
+#define Z_IS_753U_EQ_753(...)  \,
+#define Z_IS_753_EQ_753U(...)  \,
+#define Z_IS_753U_EQ_753U(...) \,
+#define Z_IS_754_EQ_754(...)   \,
+#define Z_IS_754U_EQ_754(...)  \,
+#define Z_IS_754_EQ_754U(...)  \,
+#define Z_IS_754U_EQ_754U(...) \,
+#define Z_IS_755_EQ_755(...)   \,
+#define Z_IS_755U_EQ_755(...)  \,
+#define Z_IS_755_EQ_755U(...)  \,
+#define Z_IS_755U_EQ_755U(...) \,
+#define Z_IS_756_EQ_756(...)   \,
+#define Z_IS_756U_EQ_756(...)  \,
+#define Z_IS_756_EQ_756U(...)  \,
+#define Z_IS_756U_EQ_756U(...) \,
+#define Z_IS_757_EQ_757(...)   \,
+#define Z_IS_757U_EQ_757(...)  \,
+#define Z_IS_757_EQ_757U(...)  \,
+#define Z_IS_757U_EQ_757U(...) \,
+#define Z_IS_758_EQ_758(...)   \,
+#define Z_IS_758U_EQ_758(...)  \,
+#define Z_IS_758_EQ_758U(...)  \,
+#define Z_IS_758U_EQ_758U(...) \,
+#define Z_IS_759_EQ_759(...)   \,
+#define Z_IS_759U_EQ_759(...)  \,
+#define Z_IS_759_EQ_759U(...)  \,
+#define Z_IS_759U_EQ_759U(...) \,
+#define Z_IS_760_EQ_760(...)   \,
+#define Z_IS_760U_EQ_760(...)  \,
+#define Z_IS_760_EQ_760U(...)  \,
+#define Z_IS_760U_EQ_760U(...) \,
+#define Z_IS_761_EQ_761(...)   \,
+#define Z_IS_761U_EQ_761(...)  \,
+#define Z_IS_761_EQ_761U(...)  \,
+#define Z_IS_761U_EQ_761U(...) \,
+#define Z_IS_762_EQ_762(...)   \,
+#define Z_IS_762U_EQ_762(...)  \,
+#define Z_IS_762_EQ_762U(...)  \,
+#define Z_IS_762U_EQ_762U(...) \,
+#define Z_IS_763_EQ_763(...)   \,
+#define Z_IS_763U_EQ_763(...)  \,
+#define Z_IS_763_EQ_763U(...)  \,
+#define Z_IS_763U_EQ_763U(...) \,
+#define Z_IS_764_EQ_764(...)   \,
+#define Z_IS_764U_EQ_764(...)  \,
+#define Z_IS_764_EQ_764U(...)  \,
+#define Z_IS_764U_EQ_764U(...) \,
+#define Z_IS_765_EQ_765(...)   \,
+#define Z_IS_765U_EQ_765(...)  \,
+#define Z_IS_765_EQ_765U(...)  \,
+#define Z_IS_765U_EQ_765U(...) \,
+#define Z_IS_766_EQ_766(...)   \,
+#define Z_IS_766U_EQ_766(...)  \,
+#define Z_IS_766_EQ_766U(...)  \,
+#define Z_IS_766U_EQ_766U(...) \,
+#define Z_IS_767_EQ_767(...)   \,
+#define Z_IS_767U_EQ_767(...)  \,
+#define Z_IS_767_EQ_767U(...)  \,
+#define Z_IS_767U_EQ_767U(...) \,
+#define Z_IS_768_EQ_768(...)   \,
+#define Z_IS_768U_EQ_768(...)  \,
+#define Z_IS_768_EQ_768U(...)  \,
+#define Z_IS_768U_EQ_768U(...) \,
+#define Z_IS_769_EQ_769(...)   \,
+#define Z_IS_769U_EQ_769(...)  \,
+#define Z_IS_769_EQ_769U(...)  \,
+#define Z_IS_769U_EQ_769U(...) \,
+#define Z_IS_770_EQ_770(...)   \,
+#define Z_IS_770U_EQ_770(...)  \,
+#define Z_IS_770_EQ_770U(...)  \,
+#define Z_IS_770U_EQ_770U(...) \,
+#define Z_IS_771_EQ_771(...)   \,
+#define Z_IS_771U_EQ_771(...)  \,
+#define Z_IS_771_EQ_771U(...)  \,
+#define Z_IS_771U_EQ_771U(...) \,
+#define Z_IS_772_EQ_772(...)   \,
+#define Z_IS_772U_EQ_772(...)  \,
+#define Z_IS_772_EQ_772U(...)  \,
+#define Z_IS_772U_EQ_772U(...) \,
+#define Z_IS_773_EQ_773(...)   \,
+#define Z_IS_773U_EQ_773(...)  \,
+#define Z_IS_773_EQ_773U(...)  \,
+#define Z_IS_773U_EQ_773U(...) \,
+#define Z_IS_774_EQ_774(...)   \,
+#define Z_IS_774U_EQ_774(...)  \,
+#define Z_IS_774_EQ_774U(...)  \,
+#define Z_IS_774U_EQ_774U(...) \,
+#define Z_IS_775_EQ_775(...)   \,
+#define Z_IS_775U_EQ_775(...)  \,
+#define Z_IS_775_EQ_775U(...)  \,
+#define Z_IS_775U_EQ_775U(...) \,
+#define Z_IS_776_EQ_776(...)   \,
+#define Z_IS_776U_EQ_776(...)  \,
+#define Z_IS_776_EQ_776U(...)  \,
+#define Z_IS_776U_EQ_776U(...) \,
+#define Z_IS_777_EQ_777(...)   \,
+#define Z_IS_777U_EQ_777(...)  \,
+#define Z_IS_777_EQ_777U(...)  \,
+#define Z_IS_777U_EQ_777U(...) \,
+#define Z_IS_778_EQ_778(...)   \,
+#define Z_IS_778U_EQ_778(...)  \,
+#define Z_IS_778_EQ_778U(...)  \,
+#define Z_IS_778U_EQ_778U(...) \,
+#define Z_IS_779_EQ_779(...)   \,
+#define Z_IS_779U_EQ_779(...)  \,
+#define Z_IS_779_EQ_779U(...)  \,
+#define Z_IS_779U_EQ_779U(...) \,
+#define Z_IS_780_EQ_780(...)   \,
+#define Z_IS_780U_EQ_780(...)  \,
+#define Z_IS_780_EQ_780U(...)  \,
+#define Z_IS_780U_EQ_780U(...) \,
+#define Z_IS_781_EQ_781(...)   \,
+#define Z_IS_781U_EQ_781(...)  \,
+#define Z_IS_781_EQ_781U(...)  \,
+#define Z_IS_781U_EQ_781U(...) \,
+#define Z_IS_782_EQ_782(...)   \,
+#define Z_IS_782U_EQ_782(...)  \,
+#define Z_IS_782_EQ_782U(...)  \,
+#define Z_IS_782U_EQ_782U(...) \,
+#define Z_IS_783_EQ_783(...)   \,
+#define Z_IS_783U_EQ_783(...)  \,
+#define Z_IS_783_EQ_783U(...)  \,
+#define Z_IS_783U_EQ_783U(...) \,
+#define Z_IS_784_EQ_784(...)   \,
+#define Z_IS_784U_EQ_784(...)  \,
+#define Z_IS_784_EQ_784U(...)  \,
+#define Z_IS_784U_EQ_784U(...) \,
+#define Z_IS_785_EQ_785(...)   \,
+#define Z_IS_785U_EQ_785(...)  \,
+#define Z_IS_785_EQ_785U(...)  \,
+#define Z_IS_785U_EQ_785U(...) \,
+#define Z_IS_786_EQ_786(...)   \,
+#define Z_IS_786U_EQ_786(...)  \,
+#define Z_IS_786_EQ_786U(...)  \,
+#define Z_IS_786U_EQ_786U(...) \,
+#define Z_IS_787_EQ_787(...)   \,
+#define Z_IS_787U_EQ_787(...)  \,
+#define Z_IS_787_EQ_787U(...)  \,
+#define Z_IS_787U_EQ_787U(...) \,
+#define Z_IS_788_EQ_788(...)   \,
+#define Z_IS_788U_EQ_788(...)  \,
+#define Z_IS_788_EQ_788U(...)  \,
+#define Z_IS_788U_EQ_788U(...) \,
+#define Z_IS_789_EQ_789(...)   \,
+#define Z_IS_789U_EQ_789(...)  \,
+#define Z_IS_789_EQ_789U(...)  \,
+#define Z_IS_789U_EQ_789U(...) \,
+#define Z_IS_790_EQ_790(...)   \,
+#define Z_IS_790U_EQ_790(...)  \,
+#define Z_IS_790_EQ_790U(...)  \,
+#define Z_IS_790U_EQ_790U(...) \,
+#define Z_IS_791_EQ_791(...)   \,
+#define Z_IS_791U_EQ_791(...)  \,
+#define Z_IS_791_EQ_791U(...)  \,
+#define Z_IS_791U_EQ_791U(...) \,
+#define Z_IS_792_EQ_792(...)   \,
+#define Z_IS_792U_EQ_792(...)  \,
+#define Z_IS_792_EQ_792U(...)  \,
+#define Z_IS_792U_EQ_792U(...) \,
+#define Z_IS_793_EQ_793(...)   \,
+#define Z_IS_793U_EQ_793(...)  \,
+#define Z_IS_793_EQ_793U(...)  \,
+#define Z_IS_793U_EQ_793U(...) \,
+#define Z_IS_794_EQ_794(...)   \,
+#define Z_IS_794U_EQ_794(...)  \,
+#define Z_IS_794_EQ_794U(...)  \,
+#define Z_IS_794U_EQ_794U(...) \,
+#define Z_IS_795_EQ_795(...)   \,
+#define Z_IS_795U_EQ_795(...)  \,
+#define Z_IS_795_EQ_795U(...)  \,
+#define Z_IS_795U_EQ_795U(...) \,
+#define Z_IS_796_EQ_796(...)   \,
+#define Z_IS_796U_EQ_796(...)  \,
+#define Z_IS_796_EQ_796U(...)  \,
+#define Z_IS_796U_EQ_796U(...) \,
+#define Z_IS_797_EQ_797(...)   \,
+#define Z_IS_797U_EQ_797(...)  \,
+#define Z_IS_797_EQ_797U(...)  \,
+#define Z_IS_797U_EQ_797U(...) \,
+#define Z_IS_798_EQ_798(...)   \,
+#define Z_IS_798U_EQ_798(...)  \,
+#define Z_IS_798_EQ_798U(...)  \,
+#define Z_IS_798U_EQ_798U(...) \,
+#define Z_IS_799_EQ_799(...)   \,
+#define Z_IS_799U_EQ_799(...)  \,
+#define Z_IS_799_EQ_799U(...)  \,
+#define Z_IS_799U_EQ_799U(...) \,
+#define Z_IS_800_EQ_800(...)   \,
+#define Z_IS_800U_EQ_800(...)  \,
+#define Z_IS_800_EQ_800U(...)  \,
+#define Z_IS_800U_EQ_800U(...) \,
+#define Z_IS_801_EQ_801(...)   \,
+#define Z_IS_801U_EQ_801(...)  \,
+#define Z_IS_801_EQ_801U(...)  \,
+#define Z_IS_801U_EQ_801U(...) \,
+#define Z_IS_802_EQ_802(...)   \,
+#define Z_IS_802U_EQ_802(...)  \,
+#define Z_IS_802_EQ_802U(...)  \,
+#define Z_IS_802U_EQ_802U(...) \,
+#define Z_IS_803_EQ_803(...)   \,
+#define Z_IS_803U_EQ_803(...)  \,
+#define Z_IS_803_EQ_803U(...)  \,
+#define Z_IS_803U_EQ_803U(...) \,
+#define Z_IS_804_EQ_804(...)   \,
+#define Z_IS_804U_EQ_804(...)  \,
+#define Z_IS_804_EQ_804U(...)  \,
+#define Z_IS_804U_EQ_804U(...) \,
+#define Z_IS_805_EQ_805(...)   \,
+#define Z_IS_805U_EQ_805(...)  \,
+#define Z_IS_805_EQ_805U(...)  \,
+#define Z_IS_805U_EQ_805U(...) \,
+#define Z_IS_806_EQ_806(...)   \,
+#define Z_IS_806U_EQ_806(...)  \,
+#define Z_IS_806_EQ_806U(...)  \,
+#define Z_IS_806U_EQ_806U(...) \,
+#define Z_IS_807_EQ_807(...)   \,
+#define Z_IS_807U_EQ_807(...)  \,
+#define Z_IS_807_EQ_807U(...)  \,
+#define Z_IS_807U_EQ_807U(...) \,
+#define Z_IS_808_EQ_808(...)   \,
+#define Z_IS_808U_EQ_808(...)  \,
+#define Z_IS_808_EQ_808U(...)  \,
+#define Z_IS_808U_EQ_808U(...) \,
+#define Z_IS_809_EQ_809(...)   \,
+#define Z_IS_809U_EQ_809(...)  \,
+#define Z_IS_809_EQ_809U(...)  \,
+#define Z_IS_809U_EQ_809U(...) \,
+#define Z_IS_810_EQ_810(...)   \,
+#define Z_IS_810U_EQ_810(...)  \,
+#define Z_IS_810_EQ_810U(...)  \,
+#define Z_IS_810U_EQ_810U(...) \,
+#define Z_IS_811_EQ_811(...)   \,
+#define Z_IS_811U_EQ_811(...)  \,
+#define Z_IS_811_EQ_811U(...)  \,
+#define Z_IS_811U_EQ_811U(...) \,
+#define Z_IS_812_EQ_812(...)   \,
+#define Z_IS_812U_EQ_812(...)  \,
+#define Z_IS_812_EQ_812U(...)  \,
+#define Z_IS_812U_EQ_812U(...) \,
+#define Z_IS_813_EQ_813(...)   \,
+#define Z_IS_813U_EQ_813(...)  \,
+#define Z_IS_813_EQ_813U(...)  \,
+#define Z_IS_813U_EQ_813U(...) \,
+#define Z_IS_814_EQ_814(...)   \,
+#define Z_IS_814U_EQ_814(...)  \,
+#define Z_IS_814_EQ_814U(...)  \,
+#define Z_IS_814U_EQ_814U(...) \,
+#define Z_IS_815_EQ_815(...)   \,
+#define Z_IS_815U_EQ_815(...)  \,
+#define Z_IS_815_EQ_815U(...)  \,
+#define Z_IS_815U_EQ_815U(...) \,
+#define Z_IS_816_EQ_816(...)   \,
+#define Z_IS_816U_EQ_816(...)  \,
+#define Z_IS_816_EQ_816U(...)  \,
+#define Z_IS_816U_EQ_816U(...) \,
+#define Z_IS_817_EQ_817(...)   \,
+#define Z_IS_817U_EQ_817(...)  \,
+#define Z_IS_817_EQ_817U(...)  \,
+#define Z_IS_817U_EQ_817U(...) \,
+#define Z_IS_818_EQ_818(...)   \,
+#define Z_IS_818U_EQ_818(...)  \,
+#define Z_IS_818_EQ_818U(...)  \,
+#define Z_IS_818U_EQ_818U(...) \,
+#define Z_IS_819_EQ_819(...)   \,
+#define Z_IS_819U_EQ_819(...)  \,
+#define Z_IS_819_EQ_819U(...)  \,
+#define Z_IS_819U_EQ_819U(...) \,
+#define Z_IS_820_EQ_820(...)   \,
+#define Z_IS_820U_EQ_820(...)  \,
+#define Z_IS_820_EQ_820U(...)  \,
+#define Z_IS_820U_EQ_820U(...) \,
+#define Z_IS_821_EQ_821(...)   \,
+#define Z_IS_821U_EQ_821(...)  \,
+#define Z_IS_821_EQ_821U(...)  \,
+#define Z_IS_821U_EQ_821U(...) \,
+#define Z_IS_822_EQ_822(...)   \,
+#define Z_IS_822U_EQ_822(...)  \,
+#define Z_IS_822_EQ_822U(...)  \,
+#define Z_IS_822U_EQ_822U(...) \,
+#define Z_IS_823_EQ_823(...)   \,
+#define Z_IS_823U_EQ_823(...)  \,
+#define Z_IS_823_EQ_823U(...)  \,
+#define Z_IS_823U_EQ_823U(...) \,
+#define Z_IS_824_EQ_824(...)   \,
+#define Z_IS_824U_EQ_824(...)  \,
+#define Z_IS_824_EQ_824U(...)  \,
+#define Z_IS_824U_EQ_824U(...) \,
+#define Z_IS_825_EQ_825(...)   \,
+#define Z_IS_825U_EQ_825(...)  \,
+#define Z_IS_825_EQ_825U(...)  \,
+#define Z_IS_825U_EQ_825U(...) \,
+#define Z_IS_826_EQ_826(...)   \,
+#define Z_IS_826U_EQ_826(...)  \,
+#define Z_IS_826_EQ_826U(...)  \,
+#define Z_IS_826U_EQ_826U(...) \,
+#define Z_IS_827_EQ_827(...)   \,
+#define Z_IS_827U_EQ_827(...)  \,
+#define Z_IS_827_EQ_827U(...)  \,
+#define Z_IS_827U_EQ_827U(...) \,
+#define Z_IS_828_EQ_828(...)   \,
+#define Z_IS_828U_EQ_828(...)  \,
+#define Z_IS_828_EQ_828U(...)  \,
+#define Z_IS_828U_EQ_828U(...) \,
+#define Z_IS_829_EQ_829(...)   \,
+#define Z_IS_829U_EQ_829(...)  \,
+#define Z_IS_829_EQ_829U(...)  \,
+#define Z_IS_829U_EQ_829U(...) \,
+#define Z_IS_830_EQ_830(...)   \,
+#define Z_IS_830U_EQ_830(...)  \,
+#define Z_IS_830_EQ_830U(...)  \,
+#define Z_IS_830U_EQ_830U(...) \,
+#define Z_IS_831_EQ_831(...)   \,
+#define Z_IS_831U_EQ_831(...)  \,
+#define Z_IS_831_EQ_831U(...)  \,
+#define Z_IS_831U_EQ_831U(...) \,
+#define Z_IS_832_EQ_832(...)   \,
+#define Z_IS_832U_EQ_832(...)  \,
+#define Z_IS_832_EQ_832U(...)  \,
+#define Z_IS_832U_EQ_832U(...) \,
+#define Z_IS_833_EQ_833(...)   \,
+#define Z_IS_833U_EQ_833(...)  \,
+#define Z_IS_833_EQ_833U(...)  \,
+#define Z_IS_833U_EQ_833U(...) \,
+#define Z_IS_834_EQ_834(...)   \,
+#define Z_IS_834U_EQ_834(...)  \,
+#define Z_IS_834_EQ_834U(...)  \,
+#define Z_IS_834U_EQ_834U(...) \,
+#define Z_IS_835_EQ_835(...)   \,
+#define Z_IS_835U_EQ_835(...)  \,
+#define Z_IS_835_EQ_835U(...)  \,
+#define Z_IS_835U_EQ_835U(...) \,
+#define Z_IS_836_EQ_836(...)   \,
+#define Z_IS_836U_EQ_836(...)  \,
+#define Z_IS_836_EQ_836U(...)  \,
+#define Z_IS_836U_EQ_836U(...) \,
+#define Z_IS_837_EQ_837(...)   \,
+#define Z_IS_837U_EQ_837(...)  \,
+#define Z_IS_837_EQ_837U(...)  \,
+#define Z_IS_837U_EQ_837U(...) \,
+#define Z_IS_838_EQ_838(...)   \,
+#define Z_IS_838U_EQ_838(...)  \,
+#define Z_IS_838_EQ_838U(...)  \,
+#define Z_IS_838U_EQ_838U(...) \,
+#define Z_IS_839_EQ_839(...)   \,
+#define Z_IS_839U_EQ_839(...)  \,
+#define Z_IS_839_EQ_839U(...)  \,
+#define Z_IS_839U_EQ_839U(...) \,
+#define Z_IS_840_EQ_840(...)   \,
+#define Z_IS_840U_EQ_840(...)  \,
+#define Z_IS_840_EQ_840U(...)  \,
+#define Z_IS_840U_EQ_840U(...) \,
+#define Z_IS_841_EQ_841(...)   \,
+#define Z_IS_841U_EQ_841(...)  \,
+#define Z_IS_841_EQ_841U(...)  \,
+#define Z_IS_841U_EQ_841U(...) \,
+#define Z_IS_842_EQ_842(...)   \,
+#define Z_IS_842U_EQ_842(...)  \,
+#define Z_IS_842_EQ_842U(...)  \,
+#define Z_IS_842U_EQ_842U(...) \,
+#define Z_IS_843_EQ_843(...)   \,
+#define Z_IS_843U_EQ_843(...)  \,
+#define Z_IS_843_EQ_843U(...)  \,
+#define Z_IS_843U_EQ_843U(...) \,
+#define Z_IS_844_EQ_844(...)   \,
+#define Z_IS_844U_EQ_844(...)  \,
+#define Z_IS_844_EQ_844U(...)  \,
+#define Z_IS_844U_EQ_844U(...) \,
+#define Z_IS_845_EQ_845(...)   \,
+#define Z_IS_845U_EQ_845(...)  \,
+#define Z_IS_845_EQ_845U(...)  \,
+#define Z_IS_845U_EQ_845U(...) \,
+#define Z_IS_846_EQ_846(...)   \,
+#define Z_IS_846U_EQ_846(...)  \,
+#define Z_IS_846_EQ_846U(...)  \,
+#define Z_IS_846U_EQ_846U(...) \,
+#define Z_IS_847_EQ_847(...)   \,
+#define Z_IS_847U_EQ_847(...)  \,
+#define Z_IS_847_EQ_847U(...)  \,
+#define Z_IS_847U_EQ_847U(...) \,
+#define Z_IS_848_EQ_848(...)   \,
+#define Z_IS_848U_EQ_848(...)  \,
+#define Z_IS_848_EQ_848U(...)  \,
+#define Z_IS_848U_EQ_848U(...) \,
+#define Z_IS_849_EQ_849(...)   \,
+#define Z_IS_849U_EQ_849(...)  \,
+#define Z_IS_849_EQ_849U(...)  \,
+#define Z_IS_849U_EQ_849U(...) \,
+#define Z_IS_850_EQ_850(...)   \,
+#define Z_IS_850U_EQ_850(...)  \,
+#define Z_IS_850_EQ_850U(...)  \,
+#define Z_IS_850U_EQ_850U(...) \,
+#define Z_IS_851_EQ_851(...)   \,
+#define Z_IS_851U_EQ_851(...)  \,
+#define Z_IS_851_EQ_851U(...)  \,
+#define Z_IS_851U_EQ_851U(...) \,
+#define Z_IS_852_EQ_852(...)   \,
+#define Z_IS_852U_EQ_852(...)  \,
+#define Z_IS_852_EQ_852U(...)  \,
+#define Z_IS_852U_EQ_852U(...) \,
+#define Z_IS_853_EQ_853(...)   \,
+#define Z_IS_853U_EQ_853(...)  \,
+#define Z_IS_853_EQ_853U(...)  \,
+#define Z_IS_853U_EQ_853U(...) \,
+#define Z_IS_854_EQ_854(...)   \,
+#define Z_IS_854U_EQ_854(...)  \,
+#define Z_IS_854_EQ_854U(...)  \,
+#define Z_IS_854U_EQ_854U(...) \,
+#define Z_IS_855_EQ_855(...)   \,
+#define Z_IS_855U_EQ_855(...)  \,
+#define Z_IS_855_EQ_855U(...)  \,
+#define Z_IS_855U_EQ_855U(...) \,
+#define Z_IS_856_EQ_856(...)   \,
+#define Z_IS_856U_EQ_856(...)  \,
+#define Z_IS_856_EQ_856U(...)  \,
+#define Z_IS_856U_EQ_856U(...) \,
+#define Z_IS_857_EQ_857(...)   \,
+#define Z_IS_857U_EQ_857(...)  \,
+#define Z_IS_857_EQ_857U(...)  \,
+#define Z_IS_857U_EQ_857U(...) \,
+#define Z_IS_858_EQ_858(...)   \,
+#define Z_IS_858U_EQ_858(...)  \,
+#define Z_IS_858_EQ_858U(...)  \,
+#define Z_IS_858U_EQ_858U(...) \,
+#define Z_IS_859_EQ_859(...)   \,
+#define Z_IS_859U_EQ_859(...)  \,
+#define Z_IS_859_EQ_859U(...)  \,
+#define Z_IS_859U_EQ_859U(...) \,
+#define Z_IS_860_EQ_860(...)   \,
+#define Z_IS_860U_EQ_860(...)  \,
+#define Z_IS_860_EQ_860U(...)  \,
+#define Z_IS_860U_EQ_860U(...) \,
+#define Z_IS_861_EQ_861(...)   \,
+#define Z_IS_861U_EQ_861(...)  \,
+#define Z_IS_861_EQ_861U(...)  \,
+#define Z_IS_861U_EQ_861U(...) \,
+#define Z_IS_862_EQ_862(...)   \,
+#define Z_IS_862U_EQ_862(...)  \,
+#define Z_IS_862_EQ_862U(...)  \,
+#define Z_IS_862U_EQ_862U(...) \,
+#define Z_IS_863_EQ_863(...)   \,
+#define Z_IS_863U_EQ_863(...)  \,
+#define Z_IS_863_EQ_863U(...)  \,
+#define Z_IS_863U_EQ_863U(...) \,
+#define Z_IS_864_EQ_864(...)   \,
+#define Z_IS_864U_EQ_864(...)  \,
+#define Z_IS_864_EQ_864U(...)  \,
+#define Z_IS_864U_EQ_864U(...) \,
+#define Z_IS_865_EQ_865(...)   \,
+#define Z_IS_865U_EQ_865(...)  \,
+#define Z_IS_865_EQ_865U(...)  \,
+#define Z_IS_865U_EQ_865U(...) \,
+#define Z_IS_866_EQ_866(...)   \,
+#define Z_IS_866U_EQ_866(...)  \,
+#define Z_IS_866_EQ_866U(...)  \,
+#define Z_IS_866U_EQ_866U(...) \,
+#define Z_IS_867_EQ_867(...)   \,
+#define Z_IS_867U_EQ_867(...)  \,
+#define Z_IS_867_EQ_867U(...)  \,
+#define Z_IS_867U_EQ_867U(...) \,
+#define Z_IS_868_EQ_868(...)   \,
+#define Z_IS_868U_EQ_868(...)  \,
+#define Z_IS_868_EQ_868U(...)  \,
+#define Z_IS_868U_EQ_868U(...) \,
+#define Z_IS_869_EQ_869(...)   \,
+#define Z_IS_869U_EQ_869(...)  \,
+#define Z_IS_869_EQ_869U(...)  \,
+#define Z_IS_869U_EQ_869U(...) \,
+#define Z_IS_870_EQ_870(...)   \,
+#define Z_IS_870U_EQ_870(...)  \,
+#define Z_IS_870_EQ_870U(...)  \,
+#define Z_IS_870U_EQ_870U(...) \,
+#define Z_IS_871_EQ_871(...)   \,
+#define Z_IS_871U_EQ_871(...)  \,
+#define Z_IS_871_EQ_871U(...)  \,
+#define Z_IS_871U_EQ_871U(...) \,
+#define Z_IS_872_EQ_872(...)   \,
+#define Z_IS_872U_EQ_872(...)  \,
+#define Z_IS_872_EQ_872U(...)  \,
+#define Z_IS_872U_EQ_872U(...) \,
+#define Z_IS_873_EQ_873(...)   \,
+#define Z_IS_873U_EQ_873(...)  \,
+#define Z_IS_873_EQ_873U(...)  \,
+#define Z_IS_873U_EQ_873U(...) \,
+#define Z_IS_874_EQ_874(...)   \,
+#define Z_IS_874U_EQ_874(...)  \,
+#define Z_IS_874_EQ_874U(...)  \,
+#define Z_IS_874U_EQ_874U(...) \,
+#define Z_IS_875_EQ_875(...)   \,
+#define Z_IS_875U_EQ_875(...)  \,
+#define Z_IS_875_EQ_875U(...)  \,
+#define Z_IS_875U_EQ_875U(...) \,
+#define Z_IS_876_EQ_876(...)   \,
+#define Z_IS_876U_EQ_876(...)  \,
+#define Z_IS_876_EQ_876U(...)  \,
+#define Z_IS_876U_EQ_876U(...) \,
+#define Z_IS_877_EQ_877(...)   \,
+#define Z_IS_877U_EQ_877(...)  \,
+#define Z_IS_877_EQ_877U(...)  \,
+#define Z_IS_877U_EQ_877U(...) \,
+#define Z_IS_878_EQ_878(...)   \,
+#define Z_IS_878U_EQ_878(...)  \,
+#define Z_IS_878_EQ_878U(...)  \,
+#define Z_IS_878U_EQ_878U(...) \,
+#define Z_IS_879_EQ_879(...)   \,
+#define Z_IS_879U_EQ_879(...)  \,
+#define Z_IS_879_EQ_879U(...)  \,
+#define Z_IS_879U_EQ_879U(...) \,
+#define Z_IS_880_EQ_880(...)   \,
+#define Z_IS_880U_EQ_880(...)  \,
+#define Z_IS_880_EQ_880U(...)  \,
+#define Z_IS_880U_EQ_880U(...) \,
+#define Z_IS_881_EQ_881(...)   \,
+#define Z_IS_881U_EQ_881(...)  \,
+#define Z_IS_881_EQ_881U(...)  \,
+#define Z_IS_881U_EQ_881U(...) \,
+#define Z_IS_882_EQ_882(...)   \,
+#define Z_IS_882U_EQ_882(...)  \,
+#define Z_IS_882_EQ_882U(...)  \,
+#define Z_IS_882U_EQ_882U(...) \,
+#define Z_IS_883_EQ_883(...)   \,
+#define Z_IS_883U_EQ_883(...)  \,
+#define Z_IS_883_EQ_883U(...)  \,
+#define Z_IS_883U_EQ_883U(...) \,
+#define Z_IS_884_EQ_884(...)   \,
+#define Z_IS_884U_EQ_884(...)  \,
+#define Z_IS_884_EQ_884U(...)  \,
+#define Z_IS_884U_EQ_884U(...) \,
+#define Z_IS_885_EQ_885(...)   \,
+#define Z_IS_885U_EQ_885(...)  \,
+#define Z_IS_885_EQ_885U(...)  \,
+#define Z_IS_885U_EQ_885U(...) \,
+#define Z_IS_886_EQ_886(...)   \,
+#define Z_IS_886U_EQ_886(...)  \,
+#define Z_IS_886_EQ_886U(...)  \,
+#define Z_IS_886U_EQ_886U(...) \,
+#define Z_IS_887_EQ_887(...)   \,
+#define Z_IS_887U_EQ_887(...)  \,
+#define Z_IS_887_EQ_887U(...)  \,
+#define Z_IS_887U_EQ_887U(...) \,
+#define Z_IS_888_EQ_888(...)   \,
+#define Z_IS_888U_EQ_888(...)  \,
+#define Z_IS_888_EQ_888U(...)  \,
+#define Z_IS_888U_EQ_888U(...) \,
+#define Z_IS_889_EQ_889(...)   \,
+#define Z_IS_889U_EQ_889(...)  \,
+#define Z_IS_889_EQ_889U(...)  \,
+#define Z_IS_889U_EQ_889U(...) \,
+#define Z_IS_890_EQ_890(...)   \,
+#define Z_IS_890U_EQ_890(...)  \,
+#define Z_IS_890_EQ_890U(...)  \,
+#define Z_IS_890U_EQ_890U(...) \,
+#define Z_IS_891_EQ_891(...)   \,
+#define Z_IS_891U_EQ_891(...)  \,
+#define Z_IS_891_EQ_891U(...)  \,
+#define Z_IS_891U_EQ_891U(...) \,
+#define Z_IS_892_EQ_892(...)   \,
+#define Z_IS_892U_EQ_892(...)  \,
+#define Z_IS_892_EQ_892U(...)  \,
+#define Z_IS_892U_EQ_892U(...) \,
+#define Z_IS_893_EQ_893(...)   \,
+#define Z_IS_893U_EQ_893(...)  \,
+#define Z_IS_893_EQ_893U(...)  \,
+#define Z_IS_893U_EQ_893U(...) \,
+#define Z_IS_894_EQ_894(...)   \,
+#define Z_IS_894U_EQ_894(...)  \,
+#define Z_IS_894_EQ_894U(...)  \,
+#define Z_IS_894U_EQ_894U(...) \,
+#define Z_IS_895_EQ_895(...)   \,
+#define Z_IS_895U_EQ_895(...)  \,
+#define Z_IS_895_EQ_895U(...)  \,
+#define Z_IS_895U_EQ_895U(...) \,
+#define Z_IS_896_EQ_896(...)   \,
+#define Z_IS_896U_EQ_896(...)  \,
+#define Z_IS_896_EQ_896U(...)  \,
+#define Z_IS_896U_EQ_896U(...) \,
+#define Z_IS_897_EQ_897(...)   \,
+#define Z_IS_897U_EQ_897(...)  \,
+#define Z_IS_897_EQ_897U(...)  \,
+#define Z_IS_897U_EQ_897U(...) \,
+#define Z_IS_898_EQ_898(...)   \,
+#define Z_IS_898U_EQ_898(...)  \,
+#define Z_IS_898_EQ_898U(...)  \,
+#define Z_IS_898U_EQ_898U(...) \,
+#define Z_IS_899_EQ_899(...)   \,
+#define Z_IS_899U_EQ_899(...)  \,
+#define Z_IS_899_EQ_899U(...)  \,
+#define Z_IS_899U_EQ_899U(...) \,
+#define Z_IS_900_EQ_900(...)   \,
+#define Z_IS_900U_EQ_900(...)  \,
+#define Z_IS_900_EQ_900U(...)  \,
+#define Z_IS_900U_EQ_900U(...) \,
+#define Z_IS_901_EQ_901(...)   \,
+#define Z_IS_901U_EQ_901(...)  \,
+#define Z_IS_901_EQ_901U(...)  \,
+#define Z_IS_901U_EQ_901U(...) \,
+#define Z_IS_902_EQ_902(...)   \,
+#define Z_IS_902U_EQ_902(...)  \,
+#define Z_IS_902_EQ_902U(...)  \,
+#define Z_IS_902U_EQ_902U(...) \,
+#define Z_IS_903_EQ_903(...)   \,
+#define Z_IS_903U_EQ_903(...)  \,
+#define Z_IS_903_EQ_903U(...)  \,
+#define Z_IS_903U_EQ_903U(...) \,
+#define Z_IS_904_EQ_904(...)   \,
+#define Z_IS_904U_EQ_904(...)  \,
+#define Z_IS_904_EQ_904U(...)  \,
+#define Z_IS_904U_EQ_904U(...) \,
+#define Z_IS_905_EQ_905(...)   \,
+#define Z_IS_905U_EQ_905(...)  \,
+#define Z_IS_905_EQ_905U(...)  \,
+#define Z_IS_905U_EQ_905U(...) \,
+#define Z_IS_906_EQ_906(...)   \,
+#define Z_IS_906U_EQ_906(...)  \,
+#define Z_IS_906_EQ_906U(...)  \,
+#define Z_IS_906U_EQ_906U(...) \,
+#define Z_IS_907_EQ_907(...)   \,
+#define Z_IS_907U_EQ_907(...)  \,
+#define Z_IS_907_EQ_907U(...)  \,
+#define Z_IS_907U_EQ_907U(...) \,
+#define Z_IS_908_EQ_908(...)   \,
+#define Z_IS_908U_EQ_908(...)  \,
+#define Z_IS_908_EQ_908U(...)  \,
+#define Z_IS_908U_EQ_908U(...) \,
+#define Z_IS_909_EQ_909(...)   \,
+#define Z_IS_909U_EQ_909(...)  \,
+#define Z_IS_909_EQ_909U(...)  \,
+#define Z_IS_909U_EQ_909U(...) \,
+#define Z_IS_910_EQ_910(...)   \,
+#define Z_IS_910U_EQ_910(...)  \,
+#define Z_IS_910_EQ_910U(...)  \,
+#define Z_IS_910U_EQ_910U(...) \,
+#define Z_IS_911_EQ_911(...)   \,
+#define Z_IS_911U_EQ_911(...)  \,
+#define Z_IS_911_EQ_911U(...)  \,
+#define Z_IS_911U_EQ_911U(...) \,
+#define Z_IS_912_EQ_912(...)   \,
+#define Z_IS_912U_EQ_912(...)  \,
+#define Z_IS_912_EQ_912U(...)  \,
+#define Z_IS_912U_EQ_912U(...) \,
+#define Z_IS_913_EQ_913(...)   \,
+#define Z_IS_913U_EQ_913(...)  \,
+#define Z_IS_913_EQ_913U(...)  \,
+#define Z_IS_913U_EQ_913U(...) \,
+#define Z_IS_914_EQ_914(...)   \,
+#define Z_IS_914U_EQ_914(...)  \,
+#define Z_IS_914_EQ_914U(...)  \,
+#define Z_IS_914U_EQ_914U(...) \,
+#define Z_IS_915_EQ_915(...)   \,
+#define Z_IS_915U_EQ_915(...)  \,
+#define Z_IS_915_EQ_915U(...)  \,
+#define Z_IS_915U_EQ_915U(...) \,
+#define Z_IS_916_EQ_916(...)   \,
+#define Z_IS_916U_EQ_916(...)  \,
+#define Z_IS_916_EQ_916U(...)  \,
+#define Z_IS_916U_EQ_916U(...) \,
+#define Z_IS_917_EQ_917(...)   \,
+#define Z_IS_917U_EQ_917(...)  \,
+#define Z_IS_917_EQ_917U(...)  \,
+#define Z_IS_917U_EQ_917U(...) \,
+#define Z_IS_918_EQ_918(...)   \,
+#define Z_IS_918U_EQ_918(...)  \,
+#define Z_IS_918_EQ_918U(...)  \,
+#define Z_IS_918U_EQ_918U(...) \,
+#define Z_IS_919_EQ_919(...)   \,
+#define Z_IS_919U_EQ_919(...)  \,
+#define Z_IS_919_EQ_919U(...)  \,
+#define Z_IS_919U_EQ_919U(...) \,
+#define Z_IS_920_EQ_920(...)   \,
+#define Z_IS_920U_EQ_920(...)  \,
+#define Z_IS_920_EQ_920U(...)  \,
+#define Z_IS_920U_EQ_920U(...) \,
+#define Z_IS_921_EQ_921(...)   \,
+#define Z_IS_921U_EQ_921(...)  \,
+#define Z_IS_921_EQ_921U(...)  \,
+#define Z_IS_921U_EQ_921U(...) \,
+#define Z_IS_922_EQ_922(...)   \,
+#define Z_IS_922U_EQ_922(...)  \,
+#define Z_IS_922_EQ_922U(...)  \,
+#define Z_IS_922U_EQ_922U(...) \,
+#define Z_IS_923_EQ_923(...)   \,
+#define Z_IS_923U_EQ_923(...)  \,
+#define Z_IS_923_EQ_923U(...)  \,
+#define Z_IS_923U_EQ_923U(...) \,
+#define Z_IS_924_EQ_924(...)   \,
+#define Z_IS_924U_EQ_924(...)  \,
+#define Z_IS_924_EQ_924U(...)  \,
+#define Z_IS_924U_EQ_924U(...) \,
+#define Z_IS_925_EQ_925(...)   \,
+#define Z_IS_925U_EQ_925(...)  \,
+#define Z_IS_925_EQ_925U(...)  \,
+#define Z_IS_925U_EQ_925U(...) \,
+#define Z_IS_926_EQ_926(...)   \,
+#define Z_IS_926U_EQ_926(...)  \,
+#define Z_IS_926_EQ_926U(...)  \,
+#define Z_IS_926U_EQ_926U(...) \,
+#define Z_IS_927_EQ_927(...)   \,
+#define Z_IS_927U_EQ_927(...)  \,
+#define Z_IS_927_EQ_927U(...)  \,
+#define Z_IS_927U_EQ_927U(...) \,
+#define Z_IS_928_EQ_928(...)   \,
+#define Z_IS_928U_EQ_928(...)  \,
+#define Z_IS_928_EQ_928U(...)  \,
+#define Z_IS_928U_EQ_928U(...) \,
+#define Z_IS_929_EQ_929(...)   \,
+#define Z_IS_929U_EQ_929(...)  \,
+#define Z_IS_929_EQ_929U(...)  \,
+#define Z_IS_929U_EQ_929U(...) \,
+#define Z_IS_930_EQ_930(...)   \,
+#define Z_IS_930U_EQ_930(...)  \,
+#define Z_IS_930_EQ_930U(...)  \,
+#define Z_IS_930U_EQ_930U(...) \,
+#define Z_IS_931_EQ_931(...)   \,
+#define Z_IS_931U_EQ_931(...)  \,
+#define Z_IS_931_EQ_931U(...)  \,
+#define Z_IS_931U_EQ_931U(...) \,
+#define Z_IS_932_EQ_932(...)   \,
+#define Z_IS_932U_EQ_932(...)  \,
+#define Z_IS_932_EQ_932U(...)  \,
+#define Z_IS_932U_EQ_932U(...) \,
+#define Z_IS_933_EQ_933(...)   \,
+#define Z_IS_933U_EQ_933(...)  \,
+#define Z_IS_933_EQ_933U(...)  \,
+#define Z_IS_933U_EQ_933U(...) \,
+#define Z_IS_934_EQ_934(...)   \,
+#define Z_IS_934U_EQ_934(...)  \,
+#define Z_IS_934_EQ_934U(...)  \,
+#define Z_IS_934U_EQ_934U(...) \,
+#define Z_IS_935_EQ_935(...)   \,
+#define Z_IS_935U_EQ_935(...)  \,
+#define Z_IS_935_EQ_935U(...)  \,
+#define Z_IS_935U_EQ_935U(...) \,
+#define Z_IS_936_EQ_936(...)   \,
+#define Z_IS_936U_EQ_936(...)  \,
+#define Z_IS_936_EQ_936U(...)  \,
+#define Z_IS_936U_EQ_936U(...) \,
+#define Z_IS_937_EQ_937(...)   \,
+#define Z_IS_937U_EQ_937(...)  \,
+#define Z_IS_937_EQ_937U(...)  \,
+#define Z_IS_937U_EQ_937U(...) \,
+#define Z_IS_938_EQ_938(...)   \,
+#define Z_IS_938U_EQ_938(...)  \,
+#define Z_IS_938_EQ_938U(...)  \,
+#define Z_IS_938U_EQ_938U(...) \,
+#define Z_IS_939_EQ_939(...)   \,
+#define Z_IS_939U_EQ_939(...)  \,
+#define Z_IS_939_EQ_939U(...)  \,
+#define Z_IS_939U_EQ_939U(...) \,
+#define Z_IS_940_EQ_940(...)   \,
+#define Z_IS_940U_EQ_940(...)  \,
+#define Z_IS_940_EQ_940U(...)  \,
+#define Z_IS_940U_EQ_940U(...) \,
+#define Z_IS_941_EQ_941(...)   \,
+#define Z_IS_941U_EQ_941(...)  \,
+#define Z_IS_941_EQ_941U(...)  \,
+#define Z_IS_941U_EQ_941U(...) \,
+#define Z_IS_942_EQ_942(...)   \,
+#define Z_IS_942U_EQ_942(...)  \,
+#define Z_IS_942_EQ_942U(...)  \,
+#define Z_IS_942U_EQ_942U(...) \,
+#define Z_IS_943_EQ_943(...)   \,
+#define Z_IS_943U_EQ_943(...)  \,
+#define Z_IS_943_EQ_943U(...)  \,
+#define Z_IS_943U_EQ_943U(...) \,
+#define Z_IS_944_EQ_944(...)   \,
+#define Z_IS_944U_EQ_944(...)  \,
+#define Z_IS_944_EQ_944U(...)  \,
+#define Z_IS_944U_EQ_944U(...) \,
+#define Z_IS_945_EQ_945(...)   \,
+#define Z_IS_945U_EQ_945(...)  \,
+#define Z_IS_945_EQ_945U(...)  \,
+#define Z_IS_945U_EQ_945U(...) \,
+#define Z_IS_946_EQ_946(...)   \,
+#define Z_IS_946U_EQ_946(...)  \,
+#define Z_IS_946_EQ_946U(...)  \,
+#define Z_IS_946U_EQ_946U(...) \,
+#define Z_IS_947_EQ_947(...)   \,
+#define Z_IS_947U_EQ_947(...)  \,
+#define Z_IS_947_EQ_947U(...)  \,
+#define Z_IS_947U_EQ_947U(...) \,
+#define Z_IS_948_EQ_948(...)   \,
+#define Z_IS_948U_EQ_948(...)  \,
+#define Z_IS_948_EQ_948U(...)  \,
+#define Z_IS_948U_EQ_948U(...) \,
+#define Z_IS_949_EQ_949(...)   \,
+#define Z_IS_949U_EQ_949(...)  \,
+#define Z_IS_949_EQ_949U(...)  \,
+#define Z_IS_949U_EQ_949U(...) \,
+#define Z_IS_950_EQ_950(...)   \,
+#define Z_IS_950U_EQ_950(...)  \,
+#define Z_IS_950_EQ_950U(...)  \,
+#define Z_IS_950U_EQ_950U(...) \,
+#define Z_IS_951_EQ_951(...)   \,
+#define Z_IS_951U_EQ_951(...)  \,
+#define Z_IS_951_EQ_951U(...)  \,
+#define Z_IS_951U_EQ_951U(...) \,
+#define Z_IS_952_EQ_952(...)   \,
+#define Z_IS_952U_EQ_952(...)  \,
+#define Z_IS_952_EQ_952U(...)  \,
+#define Z_IS_952U_EQ_952U(...) \,
+#define Z_IS_953_EQ_953(...)   \,
+#define Z_IS_953U_EQ_953(...)  \,
+#define Z_IS_953_EQ_953U(...)  \,
+#define Z_IS_953U_EQ_953U(...) \,
+#define Z_IS_954_EQ_954(...)   \,
+#define Z_IS_954U_EQ_954(...)  \,
+#define Z_IS_954_EQ_954U(...)  \,
+#define Z_IS_954U_EQ_954U(...) \,
+#define Z_IS_955_EQ_955(...)   \,
+#define Z_IS_955U_EQ_955(...)  \,
+#define Z_IS_955_EQ_955U(...)  \,
+#define Z_IS_955U_EQ_955U(...) \,
+#define Z_IS_956_EQ_956(...)   \,
+#define Z_IS_956U_EQ_956(...)  \,
+#define Z_IS_956_EQ_956U(...)  \,
+#define Z_IS_956U_EQ_956U(...) \,
+#define Z_IS_957_EQ_957(...)   \,
+#define Z_IS_957U_EQ_957(...)  \,
+#define Z_IS_957_EQ_957U(...)  \,
+#define Z_IS_957U_EQ_957U(...) \,
+#define Z_IS_958_EQ_958(...)   \,
+#define Z_IS_958U_EQ_958(...)  \,
+#define Z_IS_958_EQ_958U(...)  \,
+#define Z_IS_958U_EQ_958U(...) \,
+#define Z_IS_959_EQ_959(...)   \,
+#define Z_IS_959U_EQ_959(...)  \,
+#define Z_IS_959_EQ_959U(...)  \,
+#define Z_IS_959U_EQ_959U(...) \,
+#define Z_IS_960_EQ_960(...)   \,
+#define Z_IS_960U_EQ_960(...)  \,
+#define Z_IS_960_EQ_960U(...)  \,
+#define Z_IS_960U_EQ_960U(...) \,
+#define Z_IS_961_EQ_961(...)   \,
+#define Z_IS_961U_EQ_961(...)  \,
+#define Z_IS_961_EQ_961U(...)  \,
+#define Z_IS_961U_EQ_961U(...) \,
+#define Z_IS_962_EQ_962(...)   \,
+#define Z_IS_962U_EQ_962(...)  \,
+#define Z_IS_962_EQ_962U(...)  \,
+#define Z_IS_962U_EQ_962U(...) \,
+#define Z_IS_963_EQ_963(...)   \,
+#define Z_IS_963U_EQ_963(...)  \,
+#define Z_IS_963_EQ_963U(...)  \,
+#define Z_IS_963U_EQ_963U(...) \,
+#define Z_IS_964_EQ_964(...)   \,
+#define Z_IS_964U_EQ_964(...)  \,
+#define Z_IS_964_EQ_964U(...)  \,
+#define Z_IS_964U_EQ_964U(...) \,
+#define Z_IS_965_EQ_965(...)   \,
+#define Z_IS_965U_EQ_965(...)  \,
+#define Z_IS_965_EQ_965U(...)  \,
+#define Z_IS_965U_EQ_965U(...) \,
+#define Z_IS_966_EQ_966(...)   \,
+#define Z_IS_966U_EQ_966(...)  \,
+#define Z_IS_966_EQ_966U(...)  \,
+#define Z_IS_966U_EQ_966U(...) \,
+#define Z_IS_967_EQ_967(...)   \,
+#define Z_IS_967U_EQ_967(...)  \,
+#define Z_IS_967_EQ_967U(...)  \,
+#define Z_IS_967U_EQ_967U(...) \,
+#define Z_IS_968_EQ_968(...)   \,
+#define Z_IS_968U_EQ_968(...)  \,
+#define Z_IS_968_EQ_968U(...)  \,
+#define Z_IS_968U_EQ_968U(...) \,
+#define Z_IS_969_EQ_969(...)   \,
+#define Z_IS_969U_EQ_969(...)  \,
+#define Z_IS_969_EQ_969U(...)  \,
+#define Z_IS_969U_EQ_969U(...) \,
+#define Z_IS_970_EQ_970(...)   \,
+#define Z_IS_970U_EQ_970(...)  \,
+#define Z_IS_970_EQ_970U(...)  \,
+#define Z_IS_970U_EQ_970U(...) \,
+#define Z_IS_971_EQ_971(...)   \,
+#define Z_IS_971U_EQ_971(...)  \,
+#define Z_IS_971_EQ_971U(...)  \,
+#define Z_IS_971U_EQ_971U(...) \,
+#define Z_IS_972_EQ_972(...)   \,
+#define Z_IS_972U_EQ_972(...)  \,
+#define Z_IS_972_EQ_972U(...)  \,
+#define Z_IS_972U_EQ_972U(...) \,
+#define Z_IS_973_EQ_973(...)   \,
+#define Z_IS_973U_EQ_973(...)  \,
+#define Z_IS_973_EQ_973U(...)  \,
+#define Z_IS_973U_EQ_973U(...) \,
+#define Z_IS_974_EQ_974(...)   \,
+#define Z_IS_974U_EQ_974(...)  \,
+#define Z_IS_974_EQ_974U(...)  \,
+#define Z_IS_974U_EQ_974U(...) \,
+#define Z_IS_975_EQ_975(...)   \,
+#define Z_IS_975U_EQ_975(...)  \,
+#define Z_IS_975_EQ_975U(...)  \,
+#define Z_IS_975U_EQ_975U(...) \,
+#define Z_IS_976_EQ_976(...)   \,
+#define Z_IS_976U_EQ_976(...)  \,
+#define Z_IS_976_EQ_976U(...)  \,
+#define Z_IS_976U_EQ_976U(...) \,
+#define Z_IS_977_EQ_977(...)   \,
+#define Z_IS_977U_EQ_977(...)  \,
+#define Z_IS_977_EQ_977U(...)  \,
+#define Z_IS_977U_EQ_977U(...) \,
+#define Z_IS_978_EQ_978(...)   \,
+#define Z_IS_978U_EQ_978(...)  \,
+#define Z_IS_978_EQ_978U(...)  \,
+#define Z_IS_978U_EQ_978U(...) \,
+#define Z_IS_979_EQ_979(...)   \,
+#define Z_IS_979U_EQ_979(...)  \,
+#define Z_IS_979_EQ_979U(...)  \,
+#define Z_IS_979U_EQ_979U(...) \,
+#define Z_IS_980_EQ_980(...)   \,
+#define Z_IS_980U_EQ_980(...)  \,
+#define Z_IS_980_EQ_980U(...)  \,
+#define Z_IS_980U_EQ_980U(...) \,
+#define Z_IS_981_EQ_981(...)   \,
+#define Z_IS_981U_EQ_981(...)  \,
+#define Z_IS_981_EQ_981U(...)  \,
+#define Z_IS_981U_EQ_981U(...) \,
+#define Z_IS_982_EQ_982(...)   \,
+#define Z_IS_982U_EQ_982(...)  \,
+#define Z_IS_982_EQ_982U(...)  \,
+#define Z_IS_982U_EQ_982U(...) \,
+#define Z_IS_983_EQ_983(...)   \,
+#define Z_IS_983U_EQ_983(...)  \,
+#define Z_IS_983_EQ_983U(...)  \,
+#define Z_IS_983U_EQ_983U(...) \,
+#define Z_IS_984_EQ_984(...)   \,
+#define Z_IS_984U_EQ_984(...)  \,
+#define Z_IS_984_EQ_984U(...)  \,
+#define Z_IS_984U_EQ_984U(...) \,
+#define Z_IS_985_EQ_985(...)   \,
+#define Z_IS_985U_EQ_985(...)  \,
+#define Z_IS_985_EQ_985U(...)  \,
+#define Z_IS_985U_EQ_985U(...) \,
+#define Z_IS_986_EQ_986(...)   \,
+#define Z_IS_986U_EQ_986(...)  \,
+#define Z_IS_986_EQ_986U(...)  \,
+#define Z_IS_986U_EQ_986U(...) \,
+#define Z_IS_987_EQ_987(...)   \,
+#define Z_IS_987U_EQ_987(...)  \,
+#define Z_IS_987_EQ_987U(...)  \,
+#define Z_IS_987U_EQ_987U(...) \,
+#define Z_IS_988_EQ_988(...)   \,
+#define Z_IS_988U_EQ_988(...)  \,
+#define Z_IS_988_EQ_988U(...)  \,
+#define Z_IS_988U_EQ_988U(...) \,
+#define Z_IS_989_EQ_989(...)   \,
+#define Z_IS_989U_EQ_989(...)  \,
+#define Z_IS_989_EQ_989U(...)  \,
+#define Z_IS_989U_EQ_989U(...) \,
+#define Z_IS_990_EQ_990(...)   \,
+#define Z_IS_990U_EQ_990(...)  \,
+#define Z_IS_990_EQ_990U(...)  \,
+#define Z_IS_990U_EQ_990U(...) \,
+#define Z_IS_991_EQ_991(...)   \,
+#define Z_IS_991U_EQ_991(...)  \,
+#define Z_IS_991_EQ_991U(...)  \,
+#define Z_IS_991U_EQ_991U(...) \,
+#define Z_IS_992_EQ_992(...)   \,
+#define Z_IS_992U_EQ_992(...)  \,
+#define Z_IS_992_EQ_992U(...)  \,
+#define Z_IS_992U_EQ_992U(...) \,
+#define Z_IS_993_EQ_993(...)   \,
+#define Z_IS_993U_EQ_993(...)  \,
+#define Z_IS_993_EQ_993U(...)  \,
+#define Z_IS_993U_EQ_993U(...) \,
+#define Z_IS_994_EQ_994(...)   \,
+#define Z_IS_994U_EQ_994(...)  \,
+#define Z_IS_994_EQ_994U(...)  \,
+#define Z_IS_994U_EQ_994U(...) \,
+#define Z_IS_995_EQ_995(...)   \,
+#define Z_IS_995U_EQ_995(...)  \,
+#define Z_IS_995_EQ_995U(...)  \,
+#define Z_IS_995U_EQ_995U(...) \,
+#define Z_IS_996_EQ_996(...)   \,
+#define Z_IS_996U_EQ_996(...)  \,
+#define Z_IS_996_EQ_996U(...)  \,
+#define Z_IS_996U_EQ_996U(...) \,
+#define Z_IS_997_EQ_997(...)   \,
+#define Z_IS_997U_EQ_997(...)  \,
+#define Z_IS_997_EQ_997U(...)  \,
+#define Z_IS_997U_EQ_997U(...) \,
+#define Z_IS_998_EQ_998(...)   \,
+#define Z_IS_998U_EQ_998(...)  \,
+#define Z_IS_998_EQ_998U(...)  \,
+#define Z_IS_998U_EQ_998U(...) \,
+#define Z_IS_999_EQ_999(...)   \,
+#define Z_IS_999U_EQ_999(...)  \,
+#define Z_IS_999_EQ_999U(...)  \,
+#define Z_IS_999U_EQ_999U(...) \,
+#define Z_IS_1000_EQ_1000(...)   \,
+#define Z_IS_1000U_EQ_1000(...)  \,
+#define Z_IS_1000_EQ_1000U(...)  \,
+#define Z_IS_1000U_EQ_1000U(...) \,
+#define Z_IS_1001_EQ_1001(...)   \,
+#define Z_IS_1001U_EQ_1001(...)  \,
+#define Z_IS_1001_EQ_1001U(...)  \,
+#define Z_IS_1001U_EQ_1001U(...) \,
+#define Z_IS_1002_EQ_1002(...)   \,
+#define Z_IS_1002U_EQ_1002(...)  \,
+#define Z_IS_1002_EQ_1002U(...)  \,
+#define Z_IS_1002U_EQ_1002U(...) \,
+#define Z_IS_1003_EQ_1003(...)   \,
+#define Z_IS_1003U_EQ_1003(...)  \,
+#define Z_IS_1003_EQ_1003U(...)  \,
+#define Z_IS_1003U_EQ_1003U(...) \,
+#define Z_IS_1004_EQ_1004(...)   \,
+#define Z_IS_1004U_EQ_1004(...)  \,
+#define Z_IS_1004_EQ_1004U(...)  \,
+#define Z_IS_1004U_EQ_1004U(...) \,
+#define Z_IS_1005_EQ_1005(...)   \,
+#define Z_IS_1005U_EQ_1005(...)  \,
+#define Z_IS_1005_EQ_1005U(...)  \,
+#define Z_IS_1005U_EQ_1005U(...) \,
+#define Z_IS_1006_EQ_1006(...)   \,
+#define Z_IS_1006U_EQ_1006(...)  \,
+#define Z_IS_1006_EQ_1006U(...)  \,
+#define Z_IS_1006U_EQ_1006U(...) \,
+#define Z_IS_1007_EQ_1007(...)   \,
+#define Z_IS_1007U_EQ_1007(...)  \,
+#define Z_IS_1007_EQ_1007U(...)  \,
+#define Z_IS_1007U_EQ_1007U(...) \,
+#define Z_IS_1008_EQ_1008(...)   \,
+#define Z_IS_1008U_EQ_1008(...)  \,
+#define Z_IS_1008_EQ_1008U(...)  \,
+#define Z_IS_1008U_EQ_1008U(...) \,
+#define Z_IS_1009_EQ_1009(...)   \,
+#define Z_IS_1009U_EQ_1009(...)  \,
+#define Z_IS_1009_EQ_1009U(...)  \,
+#define Z_IS_1009U_EQ_1009U(...) \,
+#define Z_IS_1010_EQ_1010(...)   \,
+#define Z_IS_1010U_EQ_1010(...)  \,
+#define Z_IS_1010_EQ_1010U(...)  \,
+#define Z_IS_1010U_EQ_1010U(...) \,
+#define Z_IS_1011_EQ_1011(...)   \,
+#define Z_IS_1011U_EQ_1011(...)  \,
+#define Z_IS_1011_EQ_1011U(...)  \,
+#define Z_IS_1011U_EQ_1011U(...) \,
+#define Z_IS_1012_EQ_1012(...)   \,
+#define Z_IS_1012U_EQ_1012(...)  \,
+#define Z_IS_1012_EQ_1012U(...)  \,
+#define Z_IS_1012U_EQ_1012U(...) \,
+#define Z_IS_1013_EQ_1013(...)   \,
+#define Z_IS_1013U_EQ_1013(...)  \,
+#define Z_IS_1013_EQ_1013U(...)  \,
+#define Z_IS_1013U_EQ_1013U(...) \,
+#define Z_IS_1014_EQ_1014(...)   \,
+#define Z_IS_1014U_EQ_1014(...)  \,
+#define Z_IS_1014_EQ_1014U(...)  \,
+#define Z_IS_1014U_EQ_1014U(...) \,
+#define Z_IS_1015_EQ_1015(...)   \,
+#define Z_IS_1015U_EQ_1015(...)  \,
+#define Z_IS_1015_EQ_1015U(...)  \,
+#define Z_IS_1015U_EQ_1015U(...) \,
+#define Z_IS_1016_EQ_1016(...)   \,
+#define Z_IS_1016U_EQ_1016(...)  \,
+#define Z_IS_1016_EQ_1016U(...)  \,
+#define Z_IS_1016U_EQ_1016U(...) \,
+#define Z_IS_1017_EQ_1017(...)   \,
+#define Z_IS_1017U_EQ_1017(...)  \,
+#define Z_IS_1017_EQ_1017U(...)  \,
+#define Z_IS_1017U_EQ_1017U(...) \,
+#define Z_IS_1018_EQ_1018(...)   \,
+#define Z_IS_1018U_EQ_1018(...)  \,
+#define Z_IS_1018_EQ_1018U(...)  \,
+#define Z_IS_1018U_EQ_1018U(...) \,
+#define Z_IS_1019_EQ_1019(...)   \,
+#define Z_IS_1019U_EQ_1019(...)  \,
+#define Z_IS_1019_EQ_1019U(...)  \,
+#define Z_IS_1019U_EQ_1019U(...) \,
+#define Z_IS_1020_EQ_1020(...)   \,
+#define Z_IS_1020U_EQ_1020(...)  \,
+#define Z_IS_1020_EQ_1020U(...)  \,
+#define Z_IS_1020U_EQ_1020U(...) \,
+#define Z_IS_1021_EQ_1021(...)   \,
+#define Z_IS_1021U_EQ_1021(...)  \,
+#define Z_IS_1021_EQ_1021U(...)  \,
+#define Z_IS_1021U_EQ_1021U(...) \,
+#define Z_IS_1022_EQ_1022(...)   \,
+#define Z_IS_1022U_EQ_1022(...)  \,
+#define Z_IS_1022_EQ_1022U(...)  \,
+#define Z_IS_1022U_EQ_1022U(...) \,
+#define Z_IS_1023_EQ_1023(...)   \,
+#define Z_IS_1023U_EQ_1023(...)  \,
+#define Z_IS_1023_EQ_1023U(...)  \,
+#define Z_IS_1023U_EQ_1023U(...) \,
+#define Z_IS_1024_EQ_1024(...)   \,
+#define Z_IS_1024U_EQ_1024(...)  \,
+#define Z_IS_1024_EQ_1024U(...)  \,
+#define Z_IS_1024U_EQ_1024U(...) \,
+#define Z_IS_1025_EQ_1025(...)   \,
+#define Z_IS_1025U_EQ_1025(...)  \,
+#define Z_IS_1025_EQ_1025U(...)  \,
+#define Z_IS_1025U_EQ_1025U(...) \,
+#define Z_IS_1026_EQ_1026(...)   \,
+#define Z_IS_1026U_EQ_1026(...)  \,
+#define Z_IS_1026_EQ_1026U(...)  \,
+#define Z_IS_1026U_EQ_1026U(...) \,
+#define Z_IS_1027_EQ_1027(...)   \,
+#define Z_IS_1027U_EQ_1027(...)  \,
+#define Z_IS_1027_EQ_1027U(...)  \,
+#define Z_IS_1027U_EQ_1027U(...) \,
+#define Z_IS_1028_EQ_1028(...)   \,
+#define Z_IS_1028U_EQ_1028(...)  \,
+#define Z_IS_1028_EQ_1028U(...)  \,
+#define Z_IS_1028U_EQ_1028U(...) \,
+#define Z_IS_1029_EQ_1029(...)   \,
+#define Z_IS_1029U_EQ_1029(...)  \,
+#define Z_IS_1029_EQ_1029U(...)  \,
+#define Z_IS_1029U_EQ_1029U(...) \,
+#define Z_IS_1030_EQ_1030(...)   \,
+#define Z_IS_1030U_EQ_1030(...)  \,
+#define Z_IS_1030_EQ_1030U(...)  \,
+#define Z_IS_1030U_EQ_1030U(...) \,
+#define Z_IS_1031_EQ_1031(...)   \,
+#define Z_IS_1031U_EQ_1031(...)  \,
+#define Z_IS_1031_EQ_1031U(...)  \,
+#define Z_IS_1031U_EQ_1031U(...) \,
+#define Z_IS_1032_EQ_1032(...)   \,
+#define Z_IS_1032U_EQ_1032(...)  \,
+#define Z_IS_1032_EQ_1032U(...)  \,
+#define Z_IS_1032U_EQ_1032U(...) \,
+#define Z_IS_1033_EQ_1033(...)   \,
+#define Z_IS_1033U_EQ_1033(...)  \,
+#define Z_IS_1033_EQ_1033U(...)  \,
+#define Z_IS_1033U_EQ_1033U(...) \,
+#define Z_IS_1034_EQ_1034(...)   \,
+#define Z_IS_1034U_EQ_1034(...)  \,
+#define Z_IS_1034_EQ_1034U(...)  \,
+#define Z_IS_1034U_EQ_1034U(...) \,
+#define Z_IS_1035_EQ_1035(...)   \,
+#define Z_IS_1035U_EQ_1035(...)  \,
+#define Z_IS_1035_EQ_1035U(...)  \,
+#define Z_IS_1035U_EQ_1035U(...) \,
+#define Z_IS_1036_EQ_1036(...)   \,
+#define Z_IS_1036U_EQ_1036(...)  \,
+#define Z_IS_1036_EQ_1036U(...)  \,
+#define Z_IS_1036U_EQ_1036U(...) \,
+#define Z_IS_1037_EQ_1037(...)   \,
+#define Z_IS_1037U_EQ_1037(...)  \,
+#define Z_IS_1037_EQ_1037U(...)  \,
+#define Z_IS_1037U_EQ_1037U(...) \,
+#define Z_IS_1038_EQ_1038(...)   \,
+#define Z_IS_1038U_EQ_1038(...)  \,
+#define Z_IS_1038_EQ_1038U(...)  \,
+#define Z_IS_1038U_EQ_1038U(...) \,
+#define Z_IS_1039_EQ_1039(...)   \,
+#define Z_IS_1039U_EQ_1039(...)  \,
+#define Z_IS_1039_EQ_1039U(...)  \,
+#define Z_IS_1039U_EQ_1039U(...) \,
+#define Z_IS_1040_EQ_1040(...)   \,
+#define Z_IS_1040U_EQ_1040(...)  \,
+#define Z_IS_1040_EQ_1040U(...)  \,
+#define Z_IS_1040U_EQ_1040U(...) \,
+#define Z_IS_1041_EQ_1041(...)   \,
+#define Z_IS_1041U_EQ_1041(...)  \,
+#define Z_IS_1041_EQ_1041U(...)  \,
+#define Z_IS_1041U_EQ_1041U(...) \,
+#define Z_IS_1042_EQ_1042(...)   \,
+#define Z_IS_1042U_EQ_1042(...)  \,
+#define Z_IS_1042_EQ_1042U(...)  \,
+#define Z_IS_1042U_EQ_1042U(...) \,
+#define Z_IS_1043_EQ_1043(...)   \,
+#define Z_IS_1043U_EQ_1043(...)  \,
+#define Z_IS_1043_EQ_1043U(...)  \,
+#define Z_IS_1043U_EQ_1043U(...) \,
+#define Z_IS_1044_EQ_1044(...)   \,
+#define Z_IS_1044U_EQ_1044(...)  \,
+#define Z_IS_1044_EQ_1044U(...)  \,
+#define Z_IS_1044U_EQ_1044U(...) \,
+#define Z_IS_1045_EQ_1045(...)   \,
+#define Z_IS_1045U_EQ_1045(...)  \,
+#define Z_IS_1045_EQ_1045U(...)  \,
+#define Z_IS_1045U_EQ_1045U(...) \,
+#define Z_IS_1046_EQ_1046(...)   \,
+#define Z_IS_1046U_EQ_1046(...)  \,
+#define Z_IS_1046_EQ_1046U(...)  \,
+#define Z_IS_1046U_EQ_1046U(...) \,
+#define Z_IS_1047_EQ_1047(...)   \,
+#define Z_IS_1047U_EQ_1047(...)  \,
+#define Z_IS_1047_EQ_1047U(...)  \,
+#define Z_IS_1047U_EQ_1047U(...) \,
+#define Z_IS_1048_EQ_1048(...)   \,
+#define Z_IS_1048U_EQ_1048(...)  \,
+#define Z_IS_1048_EQ_1048U(...)  \,
+#define Z_IS_1048U_EQ_1048U(...) \,
+#define Z_IS_1049_EQ_1049(...)   \,
+#define Z_IS_1049U_EQ_1049(...)  \,
+#define Z_IS_1049_EQ_1049U(...)  \,
+#define Z_IS_1049U_EQ_1049U(...) \,
+#define Z_IS_1050_EQ_1050(...)   \,
+#define Z_IS_1050U_EQ_1050(...)  \,
+#define Z_IS_1050_EQ_1050U(...)  \,
+#define Z_IS_1050U_EQ_1050U(...) \,
+#define Z_IS_1051_EQ_1051(...)   \,
+#define Z_IS_1051U_EQ_1051(...)  \,
+#define Z_IS_1051_EQ_1051U(...)  \,
+#define Z_IS_1051U_EQ_1051U(...) \,
+#define Z_IS_1052_EQ_1052(...)   \,
+#define Z_IS_1052U_EQ_1052(...)  \,
+#define Z_IS_1052_EQ_1052U(...)  \,
+#define Z_IS_1052U_EQ_1052U(...) \,
+#define Z_IS_1053_EQ_1053(...)   \,
+#define Z_IS_1053U_EQ_1053(...)  \,
+#define Z_IS_1053_EQ_1053U(...)  \,
+#define Z_IS_1053U_EQ_1053U(...) \,
+#define Z_IS_1054_EQ_1054(...)   \,
+#define Z_IS_1054U_EQ_1054(...)  \,
+#define Z_IS_1054_EQ_1054U(...)  \,
+#define Z_IS_1054U_EQ_1054U(...) \,
+#define Z_IS_1055_EQ_1055(...)   \,
+#define Z_IS_1055U_EQ_1055(...)  \,
+#define Z_IS_1055_EQ_1055U(...)  \,
+#define Z_IS_1055U_EQ_1055U(...) \,
+#define Z_IS_1056_EQ_1056(...)   \,
+#define Z_IS_1056U_EQ_1056(...)  \,
+#define Z_IS_1056_EQ_1056U(...)  \,
+#define Z_IS_1056U_EQ_1056U(...) \,
+#define Z_IS_1057_EQ_1057(...)   \,
+#define Z_IS_1057U_EQ_1057(...)  \,
+#define Z_IS_1057_EQ_1057U(...)  \,
+#define Z_IS_1057U_EQ_1057U(...) \,
+#define Z_IS_1058_EQ_1058(...)   \,
+#define Z_IS_1058U_EQ_1058(...)  \,
+#define Z_IS_1058_EQ_1058U(...)  \,
+#define Z_IS_1058U_EQ_1058U(...) \,
+#define Z_IS_1059_EQ_1059(...)   \,
+#define Z_IS_1059U_EQ_1059(...)  \,
+#define Z_IS_1059_EQ_1059U(...)  \,
+#define Z_IS_1059U_EQ_1059U(...) \,
+#define Z_IS_1060_EQ_1060(...)   \,
+#define Z_IS_1060U_EQ_1060(...)  \,
+#define Z_IS_1060_EQ_1060U(...)  \,
+#define Z_IS_1060U_EQ_1060U(...) \,
+#define Z_IS_1061_EQ_1061(...)   \,
+#define Z_IS_1061U_EQ_1061(...)  \,
+#define Z_IS_1061_EQ_1061U(...)  \,
+#define Z_IS_1061U_EQ_1061U(...) \,
+#define Z_IS_1062_EQ_1062(...)   \,
+#define Z_IS_1062U_EQ_1062(...)  \,
+#define Z_IS_1062_EQ_1062U(...)  \,
+#define Z_IS_1062U_EQ_1062U(...) \,
+#define Z_IS_1063_EQ_1063(...)   \,
+#define Z_IS_1063U_EQ_1063(...)  \,
+#define Z_IS_1063_EQ_1063U(...)  \,
+#define Z_IS_1063U_EQ_1063U(...) \,
+#define Z_IS_1064_EQ_1064(...)   \,
+#define Z_IS_1064U_EQ_1064(...)  \,
+#define Z_IS_1064_EQ_1064U(...)  \,
+#define Z_IS_1064U_EQ_1064U(...) \,
+#define Z_IS_1065_EQ_1065(...)   \,
+#define Z_IS_1065U_EQ_1065(...)  \,
+#define Z_IS_1065_EQ_1065U(...)  \,
+#define Z_IS_1065U_EQ_1065U(...) \,
+#define Z_IS_1066_EQ_1066(...)   \,
+#define Z_IS_1066U_EQ_1066(...)  \,
+#define Z_IS_1066_EQ_1066U(...)  \,
+#define Z_IS_1066U_EQ_1066U(...) \,
+#define Z_IS_1067_EQ_1067(...)   \,
+#define Z_IS_1067U_EQ_1067(...)  \,
+#define Z_IS_1067_EQ_1067U(...)  \,
+#define Z_IS_1067U_EQ_1067U(...) \,
+#define Z_IS_1068_EQ_1068(...)   \,
+#define Z_IS_1068U_EQ_1068(...)  \,
+#define Z_IS_1068_EQ_1068U(...)  \,
+#define Z_IS_1068U_EQ_1068U(...) \,
+#define Z_IS_1069_EQ_1069(...)   \,
+#define Z_IS_1069U_EQ_1069(...)  \,
+#define Z_IS_1069_EQ_1069U(...)  \,
+#define Z_IS_1069U_EQ_1069U(...) \,
+#define Z_IS_1070_EQ_1070(...)   \,
+#define Z_IS_1070U_EQ_1070(...)  \,
+#define Z_IS_1070_EQ_1070U(...)  \,
+#define Z_IS_1070U_EQ_1070U(...) \,
+#define Z_IS_1071_EQ_1071(...)   \,
+#define Z_IS_1071U_EQ_1071(...)  \,
+#define Z_IS_1071_EQ_1071U(...)  \,
+#define Z_IS_1071U_EQ_1071U(...) \,
+#define Z_IS_1072_EQ_1072(...)   \,
+#define Z_IS_1072U_EQ_1072(...)  \,
+#define Z_IS_1072_EQ_1072U(...)  \,
+#define Z_IS_1072U_EQ_1072U(...) \,
+#define Z_IS_1073_EQ_1073(...)   \,
+#define Z_IS_1073U_EQ_1073(...)  \,
+#define Z_IS_1073_EQ_1073U(...)  \,
+#define Z_IS_1073U_EQ_1073U(...) \,
+#define Z_IS_1074_EQ_1074(...)   \,
+#define Z_IS_1074U_EQ_1074(...)  \,
+#define Z_IS_1074_EQ_1074U(...)  \,
+#define Z_IS_1074U_EQ_1074U(...) \,
+#define Z_IS_1075_EQ_1075(...)   \,
+#define Z_IS_1075U_EQ_1075(...)  \,
+#define Z_IS_1075_EQ_1075U(...)  \,
+#define Z_IS_1075U_EQ_1075U(...) \,
+#define Z_IS_1076_EQ_1076(...)   \,
+#define Z_IS_1076U_EQ_1076(...)  \,
+#define Z_IS_1076_EQ_1076U(...)  \,
+#define Z_IS_1076U_EQ_1076U(...) \,
+#define Z_IS_1077_EQ_1077(...)   \,
+#define Z_IS_1077U_EQ_1077(...)  \,
+#define Z_IS_1077_EQ_1077U(...)  \,
+#define Z_IS_1077U_EQ_1077U(...) \,
+#define Z_IS_1078_EQ_1078(...)   \,
+#define Z_IS_1078U_EQ_1078(...)  \,
+#define Z_IS_1078_EQ_1078U(...)  \,
+#define Z_IS_1078U_EQ_1078U(...) \,
+#define Z_IS_1079_EQ_1079(...)   \,
+#define Z_IS_1079U_EQ_1079(...)  \,
+#define Z_IS_1079_EQ_1079U(...)  \,
+#define Z_IS_1079U_EQ_1079U(...) \,
+#define Z_IS_1080_EQ_1080(...)   \,
+#define Z_IS_1080U_EQ_1080(...)  \,
+#define Z_IS_1080_EQ_1080U(...)  \,
+#define Z_IS_1080U_EQ_1080U(...) \,
+#define Z_IS_1081_EQ_1081(...)   \,
+#define Z_IS_1081U_EQ_1081(...)  \,
+#define Z_IS_1081_EQ_1081U(...)  \,
+#define Z_IS_1081U_EQ_1081U(...) \,
+#define Z_IS_1082_EQ_1082(...)   \,
+#define Z_IS_1082U_EQ_1082(...)  \,
+#define Z_IS_1082_EQ_1082U(...)  \,
+#define Z_IS_1082U_EQ_1082U(...) \,
+#define Z_IS_1083_EQ_1083(...)   \,
+#define Z_IS_1083U_EQ_1083(...)  \,
+#define Z_IS_1083_EQ_1083U(...)  \,
+#define Z_IS_1083U_EQ_1083U(...) \,
+#define Z_IS_1084_EQ_1084(...)   \,
+#define Z_IS_1084U_EQ_1084(...)  \,
+#define Z_IS_1084_EQ_1084U(...)  \,
+#define Z_IS_1084U_EQ_1084U(...) \,
+#define Z_IS_1085_EQ_1085(...)   \,
+#define Z_IS_1085U_EQ_1085(...)  \,
+#define Z_IS_1085_EQ_1085U(...)  \,
+#define Z_IS_1085U_EQ_1085U(...) \,
+#define Z_IS_1086_EQ_1086(...)   \,
+#define Z_IS_1086U_EQ_1086(...)  \,
+#define Z_IS_1086_EQ_1086U(...)  \,
+#define Z_IS_1086U_EQ_1086U(...) \,
+#define Z_IS_1087_EQ_1087(...)   \,
+#define Z_IS_1087U_EQ_1087(...)  \,
+#define Z_IS_1087_EQ_1087U(...)  \,
+#define Z_IS_1087U_EQ_1087U(...) \,
+#define Z_IS_1088_EQ_1088(...)   \,
+#define Z_IS_1088U_EQ_1088(...)  \,
+#define Z_IS_1088_EQ_1088U(...)  \,
+#define Z_IS_1088U_EQ_1088U(...) \,
+#define Z_IS_1089_EQ_1089(...)   \,
+#define Z_IS_1089U_EQ_1089(...)  \,
+#define Z_IS_1089_EQ_1089U(...)  \,
+#define Z_IS_1089U_EQ_1089U(...) \,
+#define Z_IS_1090_EQ_1090(...)   \,
+#define Z_IS_1090U_EQ_1090(...)  \,
+#define Z_IS_1090_EQ_1090U(...)  \,
+#define Z_IS_1090U_EQ_1090U(...) \,
+#define Z_IS_1091_EQ_1091(...)   \,
+#define Z_IS_1091U_EQ_1091(...)  \,
+#define Z_IS_1091_EQ_1091U(...)  \,
+#define Z_IS_1091U_EQ_1091U(...) \,
+#define Z_IS_1092_EQ_1092(...)   \,
+#define Z_IS_1092U_EQ_1092(...)  \,
+#define Z_IS_1092_EQ_1092U(...)  \,
+#define Z_IS_1092U_EQ_1092U(...) \,
+#define Z_IS_1093_EQ_1093(...)   \,
+#define Z_IS_1093U_EQ_1093(...)  \,
+#define Z_IS_1093_EQ_1093U(...)  \,
+#define Z_IS_1093U_EQ_1093U(...) \,
+#define Z_IS_1094_EQ_1094(...)   \,
+#define Z_IS_1094U_EQ_1094(...)  \,
+#define Z_IS_1094_EQ_1094U(...)  \,
+#define Z_IS_1094U_EQ_1094U(...) \,
+#define Z_IS_1095_EQ_1095(...)   \,
+#define Z_IS_1095U_EQ_1095(...)  \,
+#define Z_IS_1095_EQ_1095U(...)  \,
+#define Z_IS_1095U_EQ_1095U(...) \,
+#define Z_IS_1096_EQ_1096(...)   \,
+#define Z_IS_1096U_EQ_1096(...)  \,
+#define Z_IS_1096_EQ_1096U(...)  \,
+#define Z_IS_1096U_EQ_1096U(...) \,
+#define Z_IS_1097_EQ_1097(...)   \,
+#define Z_IS_1097U_EQ_1097(...)  \,
+#define Z_IS_1097_EQ_1097U(...)  \,
+#define Z_IS_1097U_EQ_1097U(...) \,
+#define Z_IS_1098_EQ_1098(...)   \,
+#define Z_IS_1098U_EQ_1098(...)  \,
+#define Z_IS_1098_EQ_1098U(...)  \,
+#define Z_IS_1098U_EQ_1098U(...) \,
+#define Z_IS_1099_EQ_1099(...)   \,
+#define Z_IS_1099U_EQ_1099(...)  \,
+#define Z_IS_1099_EQ_1099U(...)  \,
+#define Z_IS_1099U_EQ_1099U(...) \,
+#define Z_IS_1100_EQ_1100(...)   \,
+#define Z_IS_1100U_EQ_1100(...)  \,
+#define Z_IS_1100_EQ_1100U(...)  \,
+#define Z_IS_1100U_EQ_1100U(...) \,
+#define Z_IS_1101_EQ_1101(...)   \,
+#define Z_IS_1101U_EQ_1101(...)  \,
+#define Z_IS_1101_EQ_1101U(...)  \,
+#define Z_IS_1101U_EQ_1101U(...) \,
+#define Z_IS_1102_EQ_1102(...)   \,
+#define Z_IS_1102U_EQ_1102(...)  \,
+#define Z_IS_1102_EQ_1102U(...)  \,
+#define Z_IS_1102U_EQ_1102U(...) \,
+#define Z_IS_1103_EQ_1103(...)   \,
+#define Z_IS_1103U_EQ_1103(...)  \,
+#define Z_IS_1103_EQ_1103U(...)  \,
+#define Z_IS_1103U_EQ_1103U(...) \,
+#define Z_IS_1104_EQ_1104(...)   \,
+#define Z_IS_1104U_EQ_1104(...)  \,
+#define Z_IS_1104_EQ_1104U(...)  \,
+#define Z_IS_1104U_EQ_1104U(...) \,
+#define Z_IS_1105_EQ_1105(...)   \,
+#define Z_IS_1105U_EQ_1105(...)  \,
+#define Z_IS_1105_EQ_1105U(...)  \,
+#define Z_IS_1105U_EQ_1105U(...) \,
+#define Z_IS_1106_EQ_1106(...)   \,
+#define Z_IS_1106U_EQ_1106(...)  \,
+#define Z_IS_1106_EQ_1106U(...)  \,
+#define Z_IS_1106U_EQ_1106U(...) \,
+#define Z_IS_1107_EQ_1107(...)   \,
+#define Z_IS_1107U_EQ_1107(...)  \,
+#define Z_IS_1107_EQ_1107U(...)  \,
+#define Z_IS_1107U_EQ_1107U(...) \,
+#define Z_IS_1108_EQ_1108(...)   \,
+#define Z_IS_1108U_EQ_1108(...)  \,
+#define Z_IS_1108_EQ_1108U(...)  \,
+#define Z_IS_1108U_EQ_1108U(...) \,
+#define Z_IS_1109_EQ_1109(...)   \,
+#define Z_IS_1109U_EQ_1109(...)  \,
+#define Z_IS_1109_EQ_1109U(...)  \,
+#define Z_IS_1109U_EQ_1109U(...) \,
+#define Z_IS_1110_EQ_1110(...)   \,
+#define Z_IS_1110U_EQ_1110(...)  \,
+#define Z_IS_1110_EQ_1110U(...)  \,
+#define Z_IS_1110U_EQ_1110U(...) \,
+#define Z_IS_1111_EQ_1111(...)   \,
+#define Z_IS_1111U_EQ_1111(...)  \,
+#define Z_IS_1111_EQ_1111U(...)  \,
+#define Z_IS_1111U_EQ_1111U(...) \,
+#define Z_IS_1112_EQ_1112(...)   \,
+#define Z_IS_1112U_EQ_1112(...)  \,
+#define Z_IS_1112_EQ_1112U(...)  \,
+#define Z_IS_1112U_EQ_1112U(...) \,
+#define Z_IS_1113_EQ_1113(...)   \,
+#define Z_IS_1113U_EQ_1113(...)  \,
+#define Z_IS_1113_EQ_1113U(...)  \,
+#define Z_IS_1113U_EQ_1113U(...) \,
+#define Z_IS_1114_EQ_1114(...)   \,
+#define Z_IS_1114U_EQ_1114(...)  \,
+#define Z_IS_1114_EQ_1114U(...)  \,
+#define Z_IS_1114U_EQ_1114U(...) \,
+#define Z_IS_1115_EQ_1115(...)   \,
+#define Z_IS_1115U_EQ_1115(...)  \,
+#define Z_IS_1115_EQ_1115U(...)  \,
+#define Z_IS_1115U_EQ_1115U(...) \,
+#define Z_IS_1116_EQ_1116(...)   \,
+#define Z_IS_1116U_EQ_1116(...)  \,
+#define Z_IS_1116_EQ_1116U(...)  \,
+#define Z_IS_1116U_EQ_1116U(...) \,
+#define Z_IS_1117_EQ_1117(...)   \,
+#define Z_IS_1117U_EQ_1117(...)  \,
+#define Z_IS_1117_EQ_1117U(...)  \,
+#define Z_IS_1117U_EQ_1117U(...) \,
+#define Z_IS_1118_EQ_1118(...)   \,
+#define Z_IS_1118U_EQ_1118(...)  \,
+#define Z_IS_1118_EQ_1118U(...)  \,
+#define Z_IS_1118U_EQ_1118U(...) \,
+#define Z_IS_1119_EQ_1119(...)   \,
+#define Z_IS_1119U_EQ_1119(...)  \,
+#define Z_IS_1119_EQ_1119U(...)  \,
+#define Z_IS_1119U_EQ_1119U(...) \,
+#define Z_IS_1120_EQ_1120(...)   \,
+#define Z_IS_1120U_EQ_1120(...)  \,
+#define Z_IS_1120_EQ_1120U(...)  \,
+#define Z_IS_1120U_EQ_1120U(...) \,
+#define Z_IS_1121_EQ_1121(...)   \,
+#define Z_IS_1121U_EQ_1121(...)  \,
+#define Z_IS_1121_EQ_1121U(...)  \,
+#define Z_IS_1121U_EQ_1121U(...) \,
+#define Z_IS_1122_EQ_1122(...)   \,
+#define Z_IS_1122U_EQ_1122(...)  \,
+#define Z_IS_1122_EQ_1122U(...)  \,
+#define Z_IS_1122U_EQ_1122U(...) \,
+#define Z_IS_1123_EQ_1123(...)   \,
+#define Z_IS_1123U_EQ_1123(...)  \,
+#define Z_IS_1123_EQ_1123U(...)  \,
+#define Z_IS_1123U_EQ_1123U(...) \,
+#define Z_IS_1124_EQ_1124(...)   \,
+#define Z_IS_1124U_EQ_1124(...)  \,
+#define Z_IS_1124_EQ_1124U(...)  \,
+#define Z_IS_1124U_EQ_1124U(...) \,
+#define Z_IS_1125_EQ_1125(...)   \,
+#define Z_IS_1125U_EQ_1125(...)  \,
+#define Z_IS_1125_EQ_1125U(...)  \,
+#define Z_IS_1125U_EQ_1125U(...) \,
+#define Z_IS_1126_EQ_1126(...)   \,
+#define Z_IS_1126U_EQ_1126(...)  \,
+#define Z_IS_1126_EQ_1126U(...)  \,
+#define Z_IS_1126U_EQ_1126U(...) \,
+#define Z_IS_1127_EQ_1127(...)   \,
+#define Z_IS_1127U_EQ_1127(...)  \,
+#define Z_IS_1127_EQ_1127U(...)  \,
+#define Z_IS_1127U_EQ_1127U(...) \,
+#define Z_IS_1128_EQ_1128(...)   \,
+#define Z_IS_1128U_EQ_1128(...)  \,
+#define Z_IS_1128_EQ_1128U(...)  \,
+#define Z_IS_1128U_EQ_1128U(...) \,
+#define Z_IS_1129_EQ_1129(...)   \,
+#define Z_IS_1129U_EQ_1129(...)  \,
+#define Z_IS_1129_EQ_1129U(...)  \,
+#define Z_IS_1129U_EQ_1129U(...) \,
+#define Z_IS_1130_EQ_1130(...)   \,
+#define Z_IS_1130U_EQ_1130(...)  \,
+#define Z_IS_1130_EQ_1130U(...)  \,
+#define Z_IS_1130U_EQ_1130U(...) \,
+#define Z_IS_1131_EQ_1131(...)   \,
+#define Z_IS_1131U_EQ_1131(...)  \,
+#define Z_IS_1131_EQ_1131U(...)  \,
+#define Z_IS_1131U_EQ_1131U(...) \,
+#define Z_IS_1132_EQ_1132(...)   \,
+#define Z_IS_1132U_EQ_1132(...)  \,
+#define Z_IS_1132_EQ_1132U(...)  \,
+#define Z_IS_1132U_EQ_1132U(...) \,
+#define Z_IS_1133_EQ_1133(...)   \,
+#define Z_IS_1133U_EQ_1133(...)  \,
+#define Z_IS_1133_EQ_1133U(...)  \,
+#define Z_IS_1133U_EQ_1133U(...) \,
+#define Z_IS_1134_EQ_1134(...)   \,
+#define Z_IS_1134U_EQ_1134(...)  \,
+#define Z_IS_1134_EQ_1134U(...)  \,
+#define Z_IS_1134U_EQ_1134U(...) \,
+#define Z_IS_1135_EQ_1135(...)   \,
+#define Z_IS_1135U_EQ_1135(...)  \,
+#define Z_IS_1135_EQ_1135U(...)  \,
+#define Z_IS_1135U_EQ_1135U(...) \,
+#define Z_IS_1136_EQ_1136(...)   \,
+#define Z_IS_1136U_EQ_1136(...)  \,
+#define Z_IS_1136_EQ_1136U(...)  \,
+#define Z_IS_1136U_EQ_1136U(...) \,
+#define Z_IS_1137_EQ_1137(...)   \,
+#define Z_IS_1137U_EQ_1137(...)  \,
+#define Z_IS_1137_EQ_1137U(...)  \,
+#define Z_IS_1137U_EQ_1137U(...) \,
+#define Z_IS_1138_EQ_1138(...)   \,
+#define Z_IS_1138U_EQ_1138(...)  \,
+#define Z_IS_1138_EQ_1138U(...)  \,
+#define Z_IS_1138U_EQ_1138U(...) \,
+#define Z_IS_1139_EQ_1139(...)   \,
+#define Z_IS_1139U_EQ_1139(...)  \,
+#define Z_IS_1139_EQ_1139U(...)  \,
+#define Z_IS_1139U_EQ_1139U(...) \,
+#define Z_IS_1140_EQ_1140(...)   \,
+#define Z_IS_1140U_EQ_1140(...)  \,
+#define Z_IS_1140_EQ_1140U(...)  \,
+#define Z_IS_1140U_EQ_1140U(...) \,
+#define Z_IS_1141_EQ_1141(...)   \,
+#define Z_IS_1141U_EQ_1141(...)  \,
+#define Z_IS_1141_EQ_1141U(...)  \,
+#define Z_IS_1141U_EQ_1141U(...) \,
+#define Z_IS_1142_EQ_1142(...)   \,
+#define Z_IS_1142U_EQ_1142(...)  \,
+#define Z_IS_1142_EQ_1142U(...)  \,
+#define Z_IS_1142U_EQ_1142U(...) \,
+#define Z_IS_1143_EQ_1143(...)   \,
+#define Z_IS_1143U_EQ_1143(...)  \,
+#define Z_IS_1143_EQ_1143U(...)  \,
+#define Z_IS_1143U_EQ_1143U(...) \,
+#define Z_IS_1144_EQ_1144(...)   \,
+#define Z_IS_1144U_EQ_1144(...)  \,
+#define Z_IS_1144_EQ_1144U(...)  \,
+#define Z_IS_1144U_EQ_1144U(...) \,
+#define Z_IS_1145_EQ_1145(...)   \,
+#define Z_IS_1145U_EQ_1145(...)  \,
+#define Z_IS_1145_EQ_1145U(...)  \,
+#define Z_IS_1145U_EQ_1145U(...) \,
+#define Z_IS_1146_EQ_1146(...)   \,
+#define Z_IS_1146U_EQ_1146(...)  \,
+#define Z_IS_1146_EQ_1146U(...)  \,
+#define Z_IS_1146U_EQ_1146U(...) \,
+#define Z_IS_1147_EQ_1147(...)   \,
+#define Z_IS_1147U_EQ_1147(...)  \,
+#define Z_IS_1147_EQ_1147U(...)  \,
+#define Z_IS_1147U_EQ_1147U(...) \,
+#define Z_IS_1148_EQ_1148(...)   \,
+#define Z_IS_1148U_EQ_1148(...)  \,
+#define Z_IS_1148_EQ_1148U(...)  \,
+#define Z_IS_1148U_EQ_1148U(...) \,
+#define Z_IS_1149_EQ_1149(...)   \,
+#define Z_IS_1149U_EQ_1149(...)  \,
+#define Z_IS_1149_EQ_1149U(...)  \,
+#define Z_IS_1149U_EQ_1149U(...) \,
+#define Z_IS_1150_EQ_1150(...)   \,
+#define Z_IS_1150U_EQ_1150(...)  \,
+#define Z_IS_1150_EQ_1150U(...)  \,
+#define Z_IS_1150U_EQ_1150U(...) \,
+#define Z_IS_1151_EQ_1151(...)   \,
+#define Z_IS_1151U_EQ_1151(...)  \,
+#define Z_IS_1151_EQ_1151U(...)  \,
+#define Z_IS_1151U_EQ_1151U(...) \,
+#define Z_IS_1152_EQ_1152(...)   \,
+#define Z_IS_1152U_EQ_1152(...)  \,
+#define Z_IS_1152_EQ_1152U(...)  \,
+#define Z_IS_1152U_EQ_1152U(...) \,
+#define Z_IS_1153_EQ_1153(...)   \,
+#define Z_IS_1153U_EQ_1153(...)  \,
+#define Z_IS_1153_EQ_1153U(...)  \,
+#define Z_IS_1153U_EQ_1153U(...) \,
+#define Z_IS_1154_EQ_1154(...)   \,
+#define Z_IS_1154U_EQ_1154(...)  \,
+#define Z_IS_1154_EQ_1154U(...)  \,
+#define Z_IS_1154U_EQ_1154U(...) \,
+#define Z_IS_1155_EQ_1155(...)   \,
+#define Z_IS_1155U_EQ_1155(...)  \,
+#define Z_IS_1155_EQ_1155U(...)  \,
+#define Z_IS_1155U_EQ_1155U(...) \,
+#define Z_IS_1156_EQ_1156(...)   \,
+#define Z_IS_1156U_EQ_1156(...)  \,
+#define Z_IS_1156_EQ_1156U(...)  \,
+#define Z_IS_1156U_EQ_1156U(...) \,
+#define Z_IS_1157_EQ_1157(...)   \,
+#define Z_IS_1157U_EQ_1157(...)  \,
+#define Z_IS_1157_EQ_1157U(...)  \,
+#define Z_IS_1157U_EQ_1157U(...) \,
+#define Z_IS_1158_EQ_1158(...)   \,
+#define Z_IS_1158U_EQ_1158(...)  \,
+#define Z_IS_1158_EQ_1158U(...)  \,
+#define Z_IS_1158U_EQ_1158U(...) \,
+#define Z_IS_1159_EQ_1159(...)   \,
+#define Z_IS_1159U_EQ_1159(...)  \,
+#define Z_IS_1159_EQ_1159U(...)  \,
+#define Z_IS_1159U_EQ_1159U(...) \,
+#define Z_IS_1160_EQ_1160(...)   \,
+#define Z_IS_1160U_EQ_1160(...)  \,
+#define Z_IS_1160_EQ_1160U(...)  \,
+#define Z_IS_1160U_EQ_1160U(...) \,
+#define Z_IS_1161_EQ_1161(...)   \,
+#define Z_IS_1161U_EQ_1161(...)  \,
+#define Z_IS_1161_EQ_1161U(...)  \,
+#define Z_IS_1161U_EQ_1161U(...) \,
+#define Z_IS_1162_EQ_1162(...)   \,
+#define Z_IS_1162U_EQ_1162(...)  \,
+#define Z_IS_1162_EQ_1162U(...)  \,
+#define Z_IS_1162U_EQ_1162U(...) \,
+#define Z_IS_1163_EQ_1163(...)   \,
+#define Z_IS_1163U_EQ_1163(...)  \,
+#define Z_IS_1163_EQ_1163U(...)  \,
+#define Z_IS_1163U_EQ_1163U(...) \,
+#define Z_IS_1164_EQ_1164(...)   \,
+#define Z_IS_1164U_EQ_1164(...)  \,
+#define Z_IS_1164_EQ_1164U(...)  \,
+#define Z_IS_1164U_EQ_1164U(...) \,
+#define Z_IS_1165_EQ_1165(...)   \,
+#define Z_IS_1165U_EQ_1165(...)  \,
+#define Z_IS_1165_EQ_1165U(...)  \,
+#define Z_IS_1165U_EQ_1165U(...) \,
+#define Z_IS_1166_EQ_1166(...)   \,
+#define Z_IS_1166U_EQ_1166(...)  \,
+#define Z_IS_1166_EQ_1166U(...)  \,
+#define Z_IS_1166U_EQ_1166U(...) \,
+#define Z_IS_1167_EQ_1167(...)   \,
+#define Z_IS_1167U_EQ_1167(...)  \,
+#define Z_IS_1167_EQ_1167U(...)  \,
+#define Z_IS_1167U_EQ_1167U(...) \,
+#define Z_IS_1168_EQ_1168(...)   \,
+#define Z_IS_1168U_EQ_1168(...)  \,
+#define Z_IS_1168_EQ_1168U(...)  \,
+#define Z_IS_1168U_EQ_1168U(...) \,
+#define Z_IS_1169_EQ_1169(...)   \,
+#define Z_IS_1169U_EQ_1169(...)  \,
+#define Z_IS_1169_EQ_1169U(...)  \,
+#define Z_IS_1169U_EQ_1169U(...) \,
+#define Z_IS_1170_EQ_1170(...)   \,
+#define Z_IS_1170U_EQ_1170(...)  \,
+#define Z_IS_1170_EQ_1170U(...)  \,
+#define Z_IS_1170U_EQ_1170U(...) \,
+#define Z_IS_1171_EQ_1171(...)   \,
+#define Z_IS_1171U_EQ_1171(...)  \,
+#define Z_IS_1171_EQ_1171U(...)  \,
+#define Z_IS_1171U_EQ_1171U(...) \,
+#define Z_IS_1172_EQ_1172(...)   \,
+#define Z_IS_1172U_EQ_1172(...)  \,
+#define Z_IS_1172_EQ_1172U(...)  \,
+#define Z_IS_1172U_EQ_1172U(...) \,
+#define Z_IS_1173_EQ_1173(...)   \,
+#define Z_IS_1173U_EQ_1173(...)  \,
+#define Z_IS_1173_EQ_1173U(...)  \,
+#define Z_IS_1173U_EQ_1173U(...) \,
+#define Z_IS_1174_EQ_1174(...)   \,
+#define Z_IS_1174U_EQ_1174(...)  \,
+#define Z_IS_1174_EQ_1174U(...)  \,
+#define Z_IS_1174U_EQ_1174U(...) \,
+#define Z_IS_1175_EQ_1175(...)   \,
+#define Z_IS_1175U_EQ_1175(...)  \,
+#define Z_IS_1175_EQ_1175U(...)  \,
+#define Z_IS_1175U_EQ_1175U(...) \,
+#define Z_IS_1176_EQ_1176(...)   \,
+#define Z_IS_1176U_EQ_1176(...)  \,
+#define Z_IS_1176_EQ_1176U(...)  \,
+#define Z_IS_1176U_EQ_1176U(...) \,
+#define Z_IS_1177_EQ_1177(...)   \,
+#define Z_IS_1177U_EQ_1177(...)  \,
+#define Z_IS_1177_EQ_1177U(...)  \,
+#define Z_IS_1177U_EQ_1177U(...) \,
+#define Z_IS_1178_EQ_1178(...)   \,
+#define Z_IS_1178U_EQ_1178(...)  \,
+#define Z_IS_1178_EQ_1178U(...)  \,
+#define Z_IS_1178U_EQ_1178U(...) \,
+#define Z_IS_1179_EQ_1179(...)   \,
+#define Z_IS_1179U_EQ_1179(...)  \,
+#define Z_IS_1179_EQ_1179U(...)  \,
+#define Z_IS_1179U_EQ_1179U(...) \,
+#define Z_IS_1180_EQ_1180(...)   \,
+#define Z_IS_1180U_EQ_1180(...)  \,
+#define Z_IS_1180_EQ_1180U(...)  \,
+#define Z_IS_1180U_EQ_1180U(...) \,
+#define Z_IS_1181_EQ_1181(...)   \,
+#define Z_IS_1181U_EQ_1181(...)  \,
+#define Z_IS_1181_EQ_1181U(...)  \,
+#define Z_IS_1181U_EQ_1181U(...) \,
+#define Z_IS_1182_EQ_1182(...)   \,
+#define Z_IS_1182U_EQ_1182(...)  \,
+#define Z_IS_1182_EQ_1182U(...)  \,
+#define Z_IS_1182U_EQ_1182U(...) \,
+#define Z_IS_1183_EQ_1183(...)   \,
+#define Z_IS_1183U_EQ_1183(...)  \,
+#define Z_IS_1183_EQ_1183U(...)  \,
+#define Z_IS_1183U_EQ_1183U(...) \,
+#define Z_IS_1184_EQ_1184(...)   \,
+#define Z_IS_1184U_EQ_1184(...)  \,
+#define Z_IS_1184_EQ_1184U(...)  \,
+#define Z_IS_1184U_EQ_1184U(...) \,
+#define Z_IS_1185_EQ_1185(...)   \,
+#define Z_IS_1185U_EQ_1185(...)  \,
+#define Z_IS_1185_EQ_1185U(...)  \,
+#define Z_IS_1185U_EQ_1185U(...) \,
+#define Z_IS_1186_EQ_1186(...)   \,
+#define Z_IS_1186U_EQ_1186(...)  \,
+#define Z_IS_1186_EQ_1186U(...)  \,
+#define Z_IS_1186U_EQ_1186U(...) \,
+#define Z_IS_1187_EQ_1187(...)   \,
+#define Z_IS_1187U_EQ_1187(...)  \,
+#define Z_IS_1187_EQ_1187U(...)  \,
+#define Z_IS_1187U_EQ_1187U(...) \,
+#define Z_IS_1188_EQ_1188(...)   \,
+#define Z_IS_1188U_EQ_1188(...)  \,
+#define Z_IS_1188_EQ_1188U(...)  \,
+#define Z_IS_1188U_EQ_1188U(...) \,
+#define Z_IS_1189_EQ_1189(...)   \,
+#define Z_IS_1189U_EQ_1189(...)  \,
+#define Z_IS_1189_EQ_1189U(...)  \,
+#define Z_IS_1189U_EQ_1189U(...) \,
+#define Z_IS_1190_EQ_1190(...)   \,
+#define Z_IS_1190U_EQ_1190(...)  \,
+#define Z_IS_1190_EQ_1190U(...)  \,
+#define Z_IS_1190U_EQ_1190U(...) \,
+#define Z_IS_1191_EQ_1191(...)   \,
+#define Z_IS_1191U_EQ_1191(...)  \,
+#define Z_IS_1191_EQ_1191U(...)  \,
+#define Z_IS_1191U_EQ_1191U(...) \,
+#define Z_IS_1192_EQ_1192(...)   \,
+#define Z_IS_1192U_EQ_1192(...)  \,
+#define Z_IS_1192_EQ_1192U(...)  \,
+#define Z_IS_1192U_EQ_1192U(...) \,
+#define Z_IS_1193_EQ_1193(...)   \,
+#define Z_IS_1193U_EQ_1193(...)  \,
+#define Z_IS_1193_EQ_1193U(...)  \,
+#define Z_IS_1193U_EQ_1193U(...) \,
+#define Z_IS_1194_EQ_1194(...)   \,
+#define Z_IS_1194U_EQ_1194(...)  \,
+#define Z_IS_1194_EQ_1194U(...)  \,
+#define Z_IS_1194U_EQ_1194U(...) \,
+#define Z_IS_1195_EQ_1195(...)   \,
+#define Z_IS_1195U_EQ_1195(...)  \,
+#define Z_IS_1195_EQ_1195U(...)  \,
+#define Z_IS_1195U_EQ_1195U(...) \,
+#define Z_IS_1196_EQ_1196(...)   \,
+#define Z_IS_1196U_EQ_1196(...)  \,
+#define Z_IS_1196_EQ_1196U(...)  \,
+#define Z_IS_1196U_EQ_1196U(...) \,
+#define Z_IS_1197_EQ_1197(...)   \,
+#define Z_IS_1197U_EQ_1197(...)  \,
+#define Z_IS_1197_EQ_1197U(...)  \,
+#define Z_IS_1197U_EQ_1197U(...) \,
+#define Z_IS_1198_EQ_1198(...)   \,
+#define Z_IS_1198U_EQ_1198(...)  \,
+#define Z_IS_1198_EQ_1198U(...)  \,
+#define Z_IS_1198U_EQ_1198U(...) \,
+#define Z_IS_1199_EQ_1199(...)   \,
+#define Z_IS_1199U_EQ_1199(...)  \,
+#define Z_IS_1199_EQ_1199U(...)  \,
+#define Z_IS_1199U_EQ_1199U(...) \,
+#define Z_IS_1200_EQ_1200(...)   \,
+#define Z_IS_1200U_EQ_1200(...)  \,
+#define Z_IS_1200_EQ_1200U(...)  \,
+#define Z_IS_1200U_EQ_1200U(...) \,
+#define Z_IS_1201_EQ_1201(...)   \,
+#define Z_IS_1201U_EQ_1201(...)  \,
+#define Z_IS_1201_EQ_1201U(...)  \,
+#define Z_IS_1201U_EQ_1201U(...) \,
+#define Z_IS_1202_EQ_1202(...)   \,
+#define Z_IS_1202U_EQ_1202(...)  \,
+#define Z_IS_1202_EQ_1202U(...)  \,
+#define Z_IS_1202U_EQ_1202U(...) \,
+#define Z_IS_1203_EQ_1203(...)   \,
+#define Z_IS_1203U_EQ_1203(...)  \,
+#define Z_IS_1203_EQ_1203U(...)  \,
+#define Z_IS_1203U_EQ_1203U(...) \,
+#define Z_IS_1204_EQ_1204(...)   \,
+#define Z_IS_1204U_EQ_1204(...)  \,
+#define Z_IS_1204_EQ_1204U(...)  \,
+#define Z_IS_1204U_EQ_1204U(...) \,
+#define Z_IS_1205_EQ_1205(...)   \,
+#define Z_IS_1205U_EQ_1205(...)  \,
+#define Z_IS_1205_EQ_1205U(...)  \,
+#define Z_IS_1205U_EQ_1205U(...) \,
+#define Z_IS_1206_EQ_1206(...)   \,
+#define Z_IS_1206U_EQ_1206(...)  \,
+#define Z_IS_1206_EQ_1206U(...)  \,
+#define Z_IS_1206U_EQ_1206U(...) \,
+#define Z_IS_1207_EQ_1207(...)   \,
+#define Z_IS_1207U_EQ_1207(...)  \,
+#define Z_IS_1207_EQ_1207U(...)  \,
+#define Z_IS_1207U_EQ_1207U(...) \,
+#define Z_IS_1208_EQ_1208(...)   \,
+#define Z_IS_1208U_EQ_1208(...)  \,
+#define Z_IS_1208_EQ_1208U(...)  \,
+#define Z_IS_1208U_EQ_1208U(...) \,
+#define Z_IS_1209_EQ_1209(...)   \,
+#define Z_IS_1209U_EQ_1209(...)  \,
+#define Z_IS_1209_EQ_1209U(...)  \,
+#define Z_IS_1209U_EQ_1209U(...) \,
+#define Z_IS_1210_EQ_1210(...)   \,
+#define Z_IS_1210U_EQ_1210(...)  \,
+#define Z_IS_1210_EQ_1210U(...)  \,
+#define Z_IS_1210U_EQ_1210U(...) \,
+#define Z_IS_1211_EQ_1211(...)   \,
+#define Z_IS_1211U_EQ_1211(...)  \,
+#define Z_IS_1211_EQ_1211U(...)  \,
+#define Z_IS_1211U_EQ_1211U(...) \,
+#define Z_IS_1212_EQ_1212(...)   \,
+#define Z_IS_1212U_EQ_1212(...)  \,
+#define Z_IS_1212_EQ_1212U(...)  \,
+#define Z_IS_1212U_EQ_1212U(...) \,
+#define Z_IS_1213_EQ_1213(...)   \,
+#define Z_IS_1213U_EQ_1213(...)  \,
+#define Z_IS_1213_EQ_1213U(...)  \,
+#define Z_IS_1213U_EQ_1213U(...) \,
+#define Z_IS_1214_EQ_1214(...)   \,
+#define Z_IS_1214U_EQ_1214(...)  \,
+#define Z_IS_1214_EQ_1214U(...)  \,
+#define Z_IS_1214U_EQ_1214U(...) \,
+#define Z_IS_1215_EQ_1215(...)   \,
+#define Z_IS_1215U_EQ_1215(...)  \,
+#define Z_IS_1215_EQ_1215U(...)  \,
+#define Z_IS_1215U_EQ_1215U(...) \,
+#define Z_IS_1216_EQ_1216(...)   \,
+#define Z_IS_1216U_EQ_1216(...)  \,
+#define Z_IS_1216_EQ_1216U(...)  \,
+#define Z_IS_1216U_EQ_1216U(...) \,
+#define Z_IS_1217_EQ_1217(...)   \,
+#define Z_IS_1217U_EQ_1217(...)  \,
+#define Z_IS_1217_EQ_1217U(...)  \,
+#define Z_IS_1217U_EQ_1217U(...) \,
+#define Z_IS_1218_EQ_1218(...)   \,
+#define Z_IS_1218U_EQ_1218(...)  \,
+#define Z_IS_1218_EQ_1218U(...)  \,
+#define Z_IS_1218U_EQ_1218U(...) \,
+#define Z_IS_1219_EQ_1219(...)   \,
+#define Z_IS_1219U_EQ_1219(...)  \,
+#define Z_IS_1219_EQ_1219U(...)  \,
+#define Z_IS_1219U_EQ_1219U(...) \,
+#define Z_IS_1220_EQ_1220(...)   \,
+#define Z_IS_1220U_EQ_1220(...)  \,
+#define Z_IS_1220_EQ_1220U(...)  \,
+#define Z_IS_1220U_EQ_1220U(...) \,
+#define Z_IS_1221_EQ_1221(...)   \,
+#define Z_IS_1221U_EQ_1221(...)  \,
+#define Z_IS_1221_EQ_1221U(...)  \,
+#define Z_IS_1221U_EQ_1221U(...) \,
+#define Z_IS_1222_EQ_1222(...)   \,
+#define Z_IS_1222U_EQ_1222(...)  \,
+#define Z_IS_1222_EQ_1222U(...)  \,
+#define Z_IS_1222U_EQ_1222U(...) \,
+#define Z_IS_1223_EQ_1223(...)   \,
+#define Z_IS_1223U_EQ_1223(...)  \,
+#define Z_IS_1223_EQ_1223U(...)  \,
+#define Z_IS_1223U_EQ_1223U(...) \,
+#define Z_IS_1224_EQ_1224(...)   \,
+#define Z_IS_1224U_EQ_1224(...)  \,
+#define Z_IS_1224_EQ_1224U(...)  \,
+#define Z_IS_1224U_EQ_1224U(...) \,
+#define Z_IS_1225_EQ_1225(...)   \,
+#define Z_IS_1225U_EQ_1225(...)  \,
+#define Z_IS_1225_EQ_1225U(...)  \,
+#define Z_IS_1225U_EQ_1225U(...) \,
+#define Z_IS_1226_EQ_1226(...)   \,
+#define Z_IS_1226U_EQ_1226(...)  \,
+#define Z_IS_1226_EQ_1226U(...)  \,
+#define Z_IS_1226U_EQ_1226U(...) \,
+#define Z_IS_1227_EQ_1227(...)   \,
+#define Z_IS_1227U_EQ_1227(...)  \,
+#define Z_IS_1227_EQ_1227U(...)  \,
+#define Z_IS_1227U_EQ_1227U(...) \,
+#define Z_IS_1228_EQ_1228(...)   \,
+#define Z_IS_1228U_EQ_1228(...)  \,
+#define Z_IS_1228_EQ_1228U(...)  \,
+#define Z_IS_1228U_EQ_1228U(...) \,
+#define Z_IS_1229_EQ_1229(...)   \,
+#define Z_IS_1229U_EQ_1229(...)  \,
+#define Z_IS_1229_EQ_1229U(...)  \,
+#define Z_IS_1229U_EQ_1229U(...) \,
+#define Z_IS_1230_EQ_1230(...)   \,
+#define Z_IS_1230U_EQ_1230(...)  \,
+#define Z_IS_1230_EQ_1230U(...)  \,
+#define Z_IS_1230U_EQ_1230U(...) \,
+#define Z_IS_1231_EQ_1231(...)   \,
+#define Z_IS_1231U_EQ_1231(...)  \,
+#define Z_IS_1231_EQ_1231U(...)  \,
+#define Z_IS_1231U_EQ_1231U(...) \,
+#define Z_IS_1232_EQ_1232(...)   \,
+#define Z_IS_1232U_EQ_1232(...)  \,
+#define Z_IS_1232_EQ_1232U(...)  \,
+#define Z_IS_1232U_EQ_1232U(...) \,
+#define Z_IS_1233_EQ_1233(...)   \,
+#define Z_IS_1233U_EQ_1233(...)  \,
+#define Z_IS_1233_EQ_1233U(...)  \,
+#define Z_IS_1233U_EQ_1233U(...) \,
+#define Z_IS_1234_EQ_1234(...)   \,
+#define Z_IS_1234U_EQ_1234(...)  \,
+#define Z_IS_1234_EQ_1234U(...)  \,
+#define Z_IS_1234U_EQ_1234U(...) \,
+#define Z_IS_1235_EQ_1235(...)   \,
+#define Z_IS_1235U_EQ_1235(...)  \,
+#define Z_IS_1235_EQ_1235U(...)  \,
+#define Z_IS_1235U_EQ_1235U(...) \,
+#define Z_IS_1236_EQ_1236(...)   \,
+#define Z_IS_1236U_EQ_1236(...)  \,
+#define Z_IS_1236_EQ_1236U(...)  \,
+#define Z_IS_1236U_EQ_1236U(...) \,
+#define Z_IS_1237_EQ_1237(...)   \,
+#define Z_IS_1237U_EQ_1237(...)  \,
+#define Z_IS_1237_EQ_1237U(...)  \,
+#define Z_IS_1237U_EQ_1237U(...) \,
+#define Z_IS_1238_EQ_1238(...)   \,
+#define Z_IS_1238U_EQ_1238(...)  \,
+#define Z_IS_1238_EQ_1238U(...)  \,
+#define Z_IS_1238U_EQ_1238U(...) \,
+#define Z_IS_1239_EQ_1239(...)   \,
+#define Z_IS_1239U_EQ_1239(...)  \,
+#define Z_IS_1239_EQ_1239U(...)  \,
+#define Z_IS_1239U_EQ_1239U(...) \,
+#define Z_IS_1240_EQ_1240(...)   \,
+#define Z_IS_1240U_EQ_1240(...)  \,
+#define Z_IS_1240_EQ_1240U(...)  \,
+#define Z_IS_1240U_EQ_1240U(...) \,
+#define Z_IS_1241_EQ_1241(...)   \,
+#define Z_IS_1241U_EQ_1241(...)  \,
+#define Z_IS_1241_EQ_1241U(...)  \,
+#define Z_IS_1241U_EQ_1241U(...) \,
+#define Z_IS_1242_EQ_1242(...)   \,
+#define Z_IS_1242U_EQ_1242(...)  \,
+#define Z_IS_1242_EQ_1242U(...)  \,
+#define Z_IS_1242U_EQ_1242U(...) \,
+#define Z_IS_1243_EQ_1243(...)   \,
+#define Z_IS_1243U_EQ_1243(...)  \,
+#define Z_IS_1243_EQ_1243U(...)  \,
+#define Z_IS_1243U_EQ_1243U(...) \,
+#define Z_IS_1244_EQ_1244(...)   \,
+#define Z_IS_1244U_EQ_1244(...)  \,
+#define Z_IS_1244_EQ_1244U(...)  \,
+#define Z_IS_1244U_EQ_1244U(...) \,
+#define Z_IS_1245_EQ_1245(...)   \,
+#define Z_IS_1245U_EQ_1245(...)  \,
+#define Z_IS_1245_EQ_1245U(...)  \,
+#define Z_IS_1245U_EQ_1245U(...) \,
+#define Z_IS_1246_EQ_1246(...)   \,
+#define Z_IS_1246U_EQ_1246(...)  \,
+#define Z_IS_1246_EQ_1246U(...)  \,
+#define Z_IS_1246U_EQ_1246U(...) \,
+#define Z_IS_1247_EQ_1247(...)   \,
+#define Z_IS_1247U_EQ_1247(...)  \,
+#define Z_IS_1247_EQ_1247U(...)  \,
+#define Z_IS_1247U_EQ_1247U(...) \,
+#define Z_IS_1248_EQ_1248(...)   \,
+#define Z_IS_1248U_EQ_1248(...)  \,
+#define Z_IS_1248_EQ_1248U(...)  \,
+#define Z_IS_1248U_EQ_1248U(...) \,
+#define Z_IS_1249_EQ_1249(...)   \,
+#define Z_IS_1249U_EQ_1249(...)  \,
+#define Z_IS_1249_EQ_1249U(...)  \,
+#define Z_IS_1249U_EQ_1249U(...) \,
+#define Z_IS_1250_EQ_1250(...)   \,
+#define Z_IS_1250U_EQ_1250(...)  \,
+#define Z_IS_1250_EQ_1250U(...)  \,
+#define Z_IS_1250U_EQ_1250U(...) \,
+#define Z_IS_1251_EQ_1251(...)   \,
+#define Z_IS_1251U_EQ_1251(...)  \,
+#define Z_IS_1251_EQ_1251U(...)  \,
+#define Z_IS_1251U_EQ_1251U(...) \,
+#define Z_IS_1252_EQ_1252(...)   \,
+#define Z_IS_1252U_EQ_1252(...)  \,
+#define Z_IS_1252_EQ_1252U(...)  \,
+#define Z_IS_1252U_EQ_1252U(...) \,
+#define Z_IS_1253_EQ_1253(...)   \,
+#define Z_IS_1253U_EQ_1253(...)  \,
+#define Z_IS_1253_EQ_1253U(...)  \,
+#define Z_IS_1253U_EQ_1253U(...) \,
+#define Z_IS_1254_EQ_1254(...)   \,
+#define Z_IS_1254U_EQ_1254(...)  \,
+#define Z_IS_1254_EQ_1254U(...)  \,
+#define Z_IS_1254U_EQ_1254U(...) \,
+#define Z_IS_1255_EQ_1255(...)   \,
+#define Z_IS_1255U_EQ_1255(...)  \,
+#define Z_IS_1255_EQ_1255U(...)  \,
+#define Z_IS_1255U_EQ_1255U(...) \,
+#define Z_IS_1256_EQ_1256(...)   \,
+#define Z_IS_1256U_EQ_1256(...)  \,
+#define Z_IS_1256_EQ_1256U(...)  \,
+#define Z_IS_1256U_EQ_1256U(...) \,
+#define Z_IS_1257_EQ_1257(...)   \,
+#define Z_IS_1257U_EQ_1257(...)  \,
+#define Z_IS_1257_EQ_1257U(...)  \,
+#define Z_IS_1257U_EQ_1257U(...) \,
+#define Z_IS_1258_EQ_1258(...)   \,
+#define Z_IS_1258U_EQ_1258(...)  \,
+#define Z_IS_1258_EQ_1258U(...)  \,
+#define Z_IS_1258U_EQ_1258U(...) \,
+#define Z_IS_1259_EQ_1259(...)   \,
+#define Z_IS_1259U_EQ_1259(...)  \,
+#define Z_IS_1259_EQ_1259U(...)  \,
+#define Z_IS_1259U_EQ_1259U(...) \,
+#define Z_IS_1260_EQ_1260(...)   \,
+#define Z_IS_1260U_EQ_1260(...)  \,
+#define Z_IS_1260_EQ_1260U(...)  \,
+#define Z_IS_1260U_EQ_1260U(...) \,
+#define Z_IS_1261_EQ_1261(...)   \,
+#define Z_IS_1261U_EQ_1261(...)  \,
+#define Z_IS_1261_EQ_1261U(...)  \,
+#define Z_IS_1261U_EQ_1261U(...) \,
+#define Z_IS_1262_EQ_1262(...)   \,
+#define Z_IS_1262U_EQ_1262(...)  \,
+#define Z_IS_1262_EQ_1262U(...)  \,
+#define Z_IS_1262U_EQ_1262U(...) \,
+#define Z_IS_1263_EQ_1263(...)   \,
+#define Z_IS_1263U_EQ_1263(...)  \,
+#define Z_IS_1263_EQ_1263U(...)  \,
+#define Z_IS_1263U_EQ_1263U(...) \,
+#define Z_IS_1264_EQ_1264(...)   \,
+#define Z_IS_1264U_EQ_1264(...)  \,
+#define Z_IS_1264_EQ_1264U(...)  \,
+#define Z_IS_1264U_EQ_1264U(...) \,
+#define Z_IS_1265_EQ_1265(...)   \,
+#define Z_IS_1265U_EQ_1265(...)  \,
+#define Z_IS_1265_EQ_1265U(...)  \,
+#define Z_IS_1265U_EQ_1265U(...) \,
+#define Z_IS_1266_EQ_1266(...)   \,
+#define Z_IS_1266U_EQ_1266(...)  \,
+#define Z_IS_1266_EQ_1266U(...)  \,
+#define Z_IS_1266U_EQ_1266U(...) \,
+#define Z_IS_1267_EQ_1267(...)   \,
+#define Z_IS_1267U_EQ_1267(...)  \,
+#define Z_IS_1267_EQ_1267U(...)  \,
+#define Z_IS_1267U_EQ_1267U(...) \,
+#define Z_IS_1268_EQ_1268(...)   \,
+#define Z_IS_1268U_EQ_1268(...)  \,
+#define Z_IS_1268_EQ_1268U(...)  \,
+#define Z_IS_1268U_EQ_1268U(...) \,
+#define Z_IS_1269_EQ_1269(...)   \,
+#define Z_IS_1269U_EQ_1269(...)  \,
+#define Z_IS_1269_EQ_1269U(...)  \,
+#define Z_IS_1269U_EQ_1269U(...) \,
+#define Z_IS_1270_EQ_1270(...)   \,
+#define Z_IS_1270U_EQ_1270(...)  \,
+#define Z_IS_1270_EQ_1270U(...)  \,
+#define Z_IS_1270U_EQ_1270U(...) \,
+#define Z_IS_1271_EQ_1271(...)   \,
+#define Z_IS_1271U_EQ_1271(...)  \,
+#define Z_IS_1271_EQ_1271U(...)  \,
+#define Z_IS_1271U_EQ_1271U(...) \,
+#define Z_IS_1272_EQ_1272(...)   \,
+#define Z_IS_1272U_EQ_1272(...)  \,
+#define Z_IS_1272_EQ_1272U(...)  \,
+#define Z_IS_1272U_EQ_1272U(...) \,
+#define Z_IS_1273_EQ_1273(...)   \,
+#define Z_IS_1273U_EQ_1273(...)  \,
+#define Z_IS_1273_EQ_1273U(...)  \,
+#define Z_IS_1273U_EQ_1273U(...) \,
+#define Z_IS_1274_EQ_1274(...)   \,
+#define Z_IS_1274U_EQ_1274(...)  \,
+#define Z_IS_1274_EQ_1274U(...)  \,
+#define Z_IS_1274U_EQ_1274U(...) \,
+#define Z_IS_1275_EQ_1275(...)   \,
+#define Z_IS_1275U_EQ_1275(...)  \,
+#define Z_IS_1275_EQ_1275U(...)  \,
+#define Z_IS_1275U_EQ_1275U(...) \,
+#define Z_IS_1276_EQ_1276(...)   \,
+#define Z_IS_1276U_EQ_1276(...)  \,
+#define Z_IS_1276_EQ_1276U(...)  \,
+#define Z_IS_1276U_EQ_1276U(...) \,
+#define Z_IS_1277_EQ_1277(...)   \,
+#define Z_IS_1277U_EQ_1277(...)  \,
+#define Z_IS_1277_EQ_1277U(...)  \,
+#define Z_IS_1277U_EQ_1277U(...) \,
+#define Z_IS_1278_EQ_1278(...)   \,
+#define Z_IS_1278U_EQ_1278(...)  \,
+#define Z_IS_1278_EQ_1278U(...)  \,
+#define Z_IS_1278U_EQ_1278U(...) \,
+#define Z_IS_1279_EQ_1279(...)   \,
+#define Z_IS_1279U_EQ_1279(...)  \,
+#define Z_IS_1279_EQ_1279U(...)  \,
+#define Z_IS_1279U_EQ_1279U(...) \,
+#define Z_IS_1280_EQ_1280(...)   \,
+#define Z_IS_1280U_EQ_1280(...)  \,
+#define Z_IS_1280_EQ_1280U(...)  \,
+#define Z_IS_1280U_EQ_1280U(...) \,
+#define Z_IS_1281_EQ_1281(...)   \,
+#define Z_IS_1281U_EQ_1281(...)  \,
+#define Z_IS_1281_EQ_1281U(...)  \,
+#define Z_IS_1281U_EQ_1281U(...) \,
+#define Z_IS_1282_EQ_1282(...)   \,
+#define Z_IS_1282U_EQ_1282(...)  \,
+#define Z_IS_1282_EQ_1282U(...)  \,
+#define Z_IS_1282U_EQ_1282U(...) \,
+#define Z_IS_1283_EQ_1283(...)   \,
+#define Z_IS_1283U_EQ_1283(...)  \,
+#define Z_IS_1283_EQ_1283U(...)  \,
+#define Z_IS_1283U_EQ_1283U(...) \,
+#define Z_IS_1284_EQ_1284(...)   \,
+#define Z_IS_1284U_EQ_1284(...)  \,
+#define Z_IS_1284_EQ_1284U(...)  \,
+#define Z_IS_1284U_EQ_1284U(...) \,
+#define Z_IS_1285_EQ_1285(...)   \,
+#define Z_IS_1285U_EQ_1285(...)  \,
+#define Z_IS_1285_EQ_1285U(...)  \,
+#define Z_IS_1285U_EQ_1285U(...) \,
+#define Z_IS_1286_EQ_1286(...)   \,
+#define Z_IS_1286U_EQ_1286(...)  \,
+#define Z_IS_1286_EQ_1286U(...)  \,
+#define Z_IS_1286U_EQ_1286U(...) \,
+#define Z_IS_1287_EQ_1287(...)   \,
+#define Z_IS_1287U_EQ_1287(...)  \,
+#define Z_IS_1287_EQ_1287U(...)  \,
+#define Z_IS_1287U_EQ_1287U(...) \,
+#define Z_IS_1288_EQ_1288(...)   \,
+#define Z_IS_1288U_EQ_1288(...)  \,
+#define Z_IS_1288_EQ_1288U(...)  \,
+#define Z_IS_1288U_EQ_1288U(...) \,
+#define Z_IS_1289_EQ_1289(...)   \,
+#define Z_IS_1289U_EQ_1289(...)  \,
+#define Z_IS_1289_EQ_1289U(...)  \,
+#define Z_IS_1289U_EQ_1289U(...) \,
+#define Z_IS_1290_EQ_1290(...)   \,
+#define Z_IS_1290U_EQ_1290(...)  \,
+#define Z_IS_1290_EQ_1290U(...)  \,
+#define Z_IS_1290U_EQ_1290U(...) \,
+#define Z_IS_1291_EQ_1291(...)   \,
+#define Z_IS_1291U_EQ_1291(...)  \,
+#define Z_IS_1291_EQ_1291U(...)  \,
+#define Z_IS_1291U_EQ_1291U(...) \,
+#define Z_IS_1292_EQ_1292(...)   \,
+#define Z_IS_1292U_EQ_1292(...)  \,
+#define Z_IS_1292_EQ_1292U(...)  \,
+#define Z_IS_1292U_EQ_1292U(...) \,
+#define Z_IS_1293_EQ_1293(...)   \,
+#define Z_IS_1293U_EQ_1293(...)  \,
+#define Z_IS_1293_EQ_1293U(...)  \,
+#define Z_IS_1293U_EQ_1293U(...) \,
+#define Z_IS_1294_EQ_1294(...)   \,
+#define Z_IS_1294U_EQ_1294(...)  \,
+#define Z_IS_1294_EQ_1294U(...)  \,
+#define Z_IS_1294U_EQ_1294U(...) \,
+#define Z_IS_1295_EQ_1295(...)   \,
+#define Z_IS_1295U_EQ_1295(...)  \,
+#define Z_IS_1295_EQ_1295U(...)  \,
+#define Z_IS_1295U_EQ_1295U(...) \,
+#define Z_IS_1296_EQ_1296(...)   \,
+#define Z_IS_1296U_EQ_1296(...)  \,
+#define Z_IS_1296_EQ_1296U(...)  \,
+#define Z_IS_1296U_EQ_1296U(...) \,
+#define Z_IS_1297_EQ_1297(...)   \,
+#define Z_IS_1297U_EQ_1297(...)  \,
+#define Z_IS_1297_EQ_1297U(...)  \,
+#define Z_IS_1297U_EQ_1297U(...) \,
+#define Z_IS_1298_EQ_1298(...)   \,
+#define Z_IS_1298U_EQ_1298(...)  \,
+#define Z_IS_1298_EQ_1298U(...)  \,
+#define Z_IS_1298U_EQ_1298U(...) \,
+#define Z_IS_1299_EQ_1299(...)   \,
+#define Z_IS_1299U_EQ_1299(...)  \,
+#define Z_IS_1299_EQ_1299U(...)  \,
+#define Z_IS_1299U_EQ_1299U(...) \,
+#define Z_IS_1300_EQ_1300(...)   \,
+#define Z_IS_1300U_EQ_1300(...)  \,
+#define Z_IS_1300_EQ_1300U(...)  \,
+#define Z_IS_1300U_EQ_1300U(...) \,
+#define Z_IS_1301_EQ_1301(...)   \,
+#define Z_IS_1301U_EQ_1301(...)  \,
+#define Z_IS_1301_EQ_1301U(...)  \,
+#define Z_IS_1301U_EQ_1301U(...) \,
+#define Z_IS_1302_EQ_1302(...)   \,
+#define Z_IS_1302U_EQ_1302(...)  \,
+#define Z_IS_1302_EQ_1302U(...)  \,
+#define Z_IS_1302U_EQ_1302U(...) \,
+#define Z_IS_1303_EQ_1303(...)   \,
+#define Z_IS_1303U_EQ_1303(...)  \,
+#define Z_IS_1303_EQ_1303U(...)  \,
+#define Z_IS_1303U_EQ_1303U(...) \,
+#define Z_IS_1304_EQ_1304(...)   \,
+#define Z_IS_1304U_EQ_1304(...)  \,
+#define Z_IS_1304_EQ_1304U(...)  \,
+#define Z_IS_1304U_EQ_1304U(...) \,
+#define Z_IS_1305_EQ_1305(...)   \,
+#define Z_IS_1305U_EQ_1305(...)  \,
+#define Z_IS_1305_EQ_1305U(...)  \,
+#define Z_IS_1305U_EQ_1305U(...) \,
+#define Z_IS_1306_EQ_1306(...)   \,
+#define Z_IS_1306U_EQ_1306(...)  \,
+#define Z_IS_1306_EQ_1306U(...)  \,
+#define Z_IS_1306U_EQ_1306U(...) \,
+#define Z_IS_1307_EQ_1307(...)   \,
+#define Z_IS_1307U_EQ_1307(...)  \,
+#define Z_IS_1307_EQ_1307U(...)  \,
+#define Z_IS_1307U_EQ_1307U(...) \,
+#define Z_IS_1308_EQ_1308(...)   \,
+#define Z_IS_1308U_EQ_1308(...)  \,
+#define Z_IS_1308_EQ_1308U(...)  \,
+#define Z_IS_1308U_EQ_1308U(...) \,
+#define Z_IS_1309_EQ_1309(...)   \,
+#define Z_IS_1309U_EQ_1309(...)  \,
+#define Z_IS_1309_EQ_1309U(...)  \,
+#define Z_IS_1309U_EQ_1309U(...) \,
+#define Z_IS_1310_EQ_1310(...)   \,
+#define Z_IS_1310U_EQ_1310(...)  \,
+#define Z_IS_1310_EQ_1310U(...)  \,
+#define Z_IS_1310U_EQ_1310U(...) \,
+#define Z_IS_1311_EQ_1311(...)   \,
+#define Z_IS_1311U_EQ_1311(...)  \,
+#define Z_IS_1311_EQ_1311U(...)  \,
+#define Z_IS_1311U_EQ_1311U(...) \,
+#define Z_IS_1312_EQ_1312(...)   \,
+#define Z_IS_1312U_EQ_1312(...)  \,
+#define Z_IS_1312_EQ_1312U(...)  \,
+#define Z_IS_1312U_EQ_1312U(...) \,
+#define Z_IS_1313_EQ_1313(...)   \,
+#define Z_IS_1313U_EQ_1313(...)  \,
+#define Z_IS_1313_EQ_1313U(...)  \,
+#define Z_IS_1313U_EQ_1313U(...) \,
+#define Z_IS_1314_EQ_1314(...)   \,
+#define Z_IS_1314U_EQ_1314(...)  \,
+#define Z_IS_1314_EQ_1314U(...)  \,
+#define Z_IS_1314U_EQ_1314U(...) \,
+#define Z_IS_1315_EQ_1315(...)   \,
+#define Z_IS_1315U_EQ_1315(...)  \,
+#define Z_IS_1315_EQ_1315U(...)  \,
+#define Z_IS_1315U_EQ_1315U(...) \,
+#define Z_IS_1316_EQ_1316(...)   \,
+#define Z_IS_1316U_EQ_1316(...)  \,
+#define Z_IS_1316_EQ_1316U(...)  \,
+#define Z_IS_1316U_EQ_1316U(...) \,
+#define Z_IS_1317_EQ_1317(...)   \,
+#define Z_IS_1317U_EQ_1317(...)  \,
+#define Z_IS_1317_EQ_1317U(...)  \,
+#define Z_IS_1317U_EQ_1317U(...) \,
+#define Z_IS_1318_EQ_1318(...)   \,
+#define Z_IS_1318U_EQ_1318(...)  \,
+#define Z_IS_1318_EQ_1318U(...)  \,
+#define Z_IS_1318U_EQ_1318U(...) \,
+#define Z_IS_1319_EQ_1319(...)   \,
+#define Z_IS_1319U_EQ_1319(...)  \,
+#define Z_IS_1319_EQ_1319U(...)  \,
+#define Z_IS_1319U_EQ_1319U(...) \,
+#define Z_IS_1320_EQ_1320(...)   \,
+#define Z_IS_1320U_EQ_1320(...)  \,
+#define Z_IS_1320_EQ_1320U(...)  \,
+#define Z_IS_1320U_EQ_1320U(...) \,
+#define Z_IS_1321_EQ_1321(...)   \,
+#define Z_IS_1321U_EQ_1321(...)  \,
+#define Z_IS_1321_EQ_1321U(...)  \,
+#define Z_IS_1321U_EQ_1321U(...) \,
+#define Z_IS_1322_EQ_1322(...)   \,
+#define Z_IS_1322U_EQ_1322(...)  \,
+#define Z_IS_1322_EQ_1322U(...)  \,
+#define Z_IS_1322U_EQ_1322U(...) \,
+#define Z_IS_1323_EQ_1323(...)   \,
+#define Z_IS_1323U_EQ_1323(...)  \,
+#define Z_IS_1323_EQ_1323U(...)  \,
+#define Z_IS_1323U_EQ_1323U(...) \,
+#define Z_IS_1324_EQ_1324(...)   \,
+#define Z_IS_1324U_EQ_1324(...)  \,
+#define Z_IS_1324_EQ_1324U(...)  \,
+#define Z_IS_1324U_EQ_1324U(...) \,
+#define Z_IS_1325_EQ_1325(...)   \,
+#define Z_IS_1325U_EQ_1325(...)  \,
+#define Z_IS_1325_EQ_1325U(...)  \,
+#define Z_IS_1325U_EQ_1325U(...) \,
+#define Z_IS_1326_EQ_1326(...)   \,
+#define Z_IS_1326U_EQ_1326(...)  \,
+#define Z_IS_1326_EQ_1326U(...)  \,
+#define Z_IS_1326U_EQ_1326U(...) \,
+#define Z_IS_1327_EQ_1327(...)   \,
+#define Z_IS_1327U_EQ_1327(...)  \,
+#define Z_IS_1327_EQ_1327U(...)  \,
+#define Z_IS_1327U_EQ_1327U(...) \,
+#define Z_IS_1328_EQ_1328(...)   \,
+#define Z_IS_1328U_EQ_1328(...)  \,
+#define Z_IS_1328_EQ_1328U(...)  \,
+#define Z_IS_1328U_EQ_1328U(...) \,
+#define Z_IS_1329_EQ_1329(...)   \,
+#define Z_IS_1329U_EQ_1329(...)  \,
+#define Z_IS_1329_EQ_1329U(...)  \,
+#define Z_IS_1329U_EQ_1329U(...) \,
+#define Z_IS_1330_EQ_1330(...)   \,
+#define Z_IS_1330U_EQ_1330(...)  \,
+#define Z_IS_1330_EQ_1330U(...)  \,
+#define Z_IS_1330U_EQ_1330U(...) \,
+#define Z_IS_1331_EQ_1331(...)   \,
+#define Z_IS_1331U_EQ_1331(...)  \,
+#define Z_IS_1331_EQ_1331U(...)  \,
+#define Z_IS_1331U_EQ_1331U(...) \,
+#define Z_IS_1332_EQ_1332(...)   \,
+#define Z_IS_1332U_EQ_1332(...)  \,
+#define Z_IS_1332_EQ_1332U(...)  \,
+#define Z_IS_1332U_EQ_1332U(...) \,
+#define Z_IS_1333_EQ_1333(...)   \,
+#define Z_IS_1333U_EQ_1333(...)  \,
+#define Z_IS_1333_EQ_1333U(...)  \,
+#define Z_IS_1333U_EQ_1333U(...) \,
+#define Z_IS_1334_EQ_1334(...)   \,
+#define Z_IS_1334U_EQ_1334(...)  \,
+#define Z_IS_1334_EQ_1334U(...)  \,
+#define Z_IS_1334U_EQ_1334U(...) \,
+#define Z_IS_1335_EQ_1335(...)   \,
+#define Z_IS_1335U_EQ_1335(...)  \,
+#define Z_IS_1335_EQ_1335U(...)  \,
+#define Z_IS_1335U_EQ_1335U(...) \,
+#define Z_IS_1336_EQ_1336(...)   \,
+#define Z_IS_1336U_EQ_1336(...)  \,
+#define Z_IS_1336_EQ_1336U(...)  \,
+#define Z_IS_1336U_EQ_1336U(...) \,
+#define Z_IS_1337_EQ_1337(...)   \,
+#define Z_IS_1337U_EQ_1337(...)  \,
+#define Z_IS_1337_EQ_1337U(...)  \,
+#define Z_IS_1337U_EQ_1337U(...) \,
+#define Z_IS_1338_EQ_1338(...)   \,
+#define Z_IS_1338U_EQ_1338(...)  \,
+#define Z_IS_1338_EQ_1338U(...)  \,
+#define Z_IS_1338U_EQ_1338U(...) \,
+#define Z_IS_1339_EQ_1339(...)   \,
+#define Z_IS_1339U_EQ_1339(...)  \,
+#define Z_IS_1339_EQ_1339U(...)  \,
+#define Z_IS_1339U_EQ_1339U(...) \,
+#define Z_IS_1340_EQ_1340(...)   \,
+#define Z_IS_1340U_EQ_1340(...)  \,
+#define Z_IS_1340_EQ_1340U(...)  \,
+#define Z_IS_1340U_EQ_1340U(...) \,
+#define Z_IS_1341_EQ_1341(...)   \,
+#define Z_IS_1341U_EQ_1341(...)  \,
+#define Z_IS_1341_EQ_1341U(...)  \,
+#define Z_IS_1341U_EQ_1341U(...) \,
+#define Z_IS_1342_EQ_1342(...)   \,
+#define Z_IS_1342U_EQ_1342(...)  \,
+#define Z_IS_1342_EQ_1342U(...)  \,
+#define Z_IS_1342U_EQ_1342U(...) \,
+#define Z_IS_1343_EQ_1343(...)   \,
+#define Z_IS_1343U_EQ_1343(...)  \,
+#define Z_IS_1343_EQ_1343U(...)  \,
+#define Z_IS_1343U_EQ_1343U(...) \,
+#define Z_IS_1344_EQ_1344(...)   \,
+#define Z_IS_1344U_EQ_1344(...)  \,
+#define Z_IS_1344_EQ_1344U(...)  \,
+#define Z_IS_1344U_EQ_1344U(...) \,
+#define Z_IS_1345_EQ_1345(...)   \,
+#define Z_IS_1345U_EQ_1345(...)  \,
+#define Z_IS_1345_EQ_1345U(...)  \,
+#define Z_IS_1345U_EQ_1345U(...) \,
+#define Z_IS_1346_EQ_1346(...)   \,
+#define Z_IS_1346U_EQ_1346(...)  \,
+#define Z_IS_1346_EQ_1346U(...)  \,
+#define Z_IS_1346U_EQ_1346U(...) \,
+#define Z_IS_1347_EQ_1347(...)   \,
+#define Z_IS_1347U_EQ_1347(...)  \,
+#define Z_IS_1347_EQ_1347U(...)  \,
+#define Z_IS_1347U_EQ_1347U(...) \,
+#define Z_IS_1348_EQ_1348(...)   \,
+#define Z_IS_1348U_EQ_1348(...)  \,
+#define Z_IS_1348_EQ_1348U(...)  \,
+#define Z_IS_1348U_EQ_1348U(...) \,
+#define Z_IS_1349_EQ_1349(...)   \,
+#define Z_IS_1349U_EQ_1349(...)  \,
+#define Z_IS_1349_EQ_1349U(...)  \,
+#define Z_IS_1349U_EQ_1349U(...) \,
+#define Z_IS_1350_EQ_1350(...)   \,
+#define Z_IS_1350U_EQ_1350(...)  \,
+#define Z_IS_1350_EQ_1350U(...)  \,
+#define Z_IS_1350U_EQ_1350U(...) \,
+#define Z_IS_1351_EQ_1351(...)   \,
+#define Z_IS_1351U_EQ_1351(...)  \,
+#define Z_IS_1351_EQ_1351U(...)  \,
+#define Z_IS_1351U_EQ_1351U(...) \,
+#define Z_IS_1352_EQ_1352(...)   \,
+#define Z_IS_1352U_EQ_1352(...)  \,
+#define Z_IS_1352_EQ_1352U(...)  \,
+#define Z_IS_1352U_EQ_1352U(...) \,
+#define Z_IS_1353_EQ_1353(...)   \,
+#define Z_IS_1353U_EQ_1353(...)  \,
+#define Z_IS_1353_EQ_1353U(...)  \,
+#define Z_IS_1353U_EQ_1353U(...) \,
+#define Z_IS_1354_EQ_1354(...)   \,
+#define Z_IS_1354U_EQ_1354(...)  \,
+#define Z_IS_1354_EQ_1354U(...)  \,
+#define Z_IS_1354U_EQ_1354U(...) \,
+#define Z_IS_1355_EQ_1355(...)   \,
+#define Z_IS_1355U_EQ_1355(...)  \,
+#define Z_IS_1355_EQ_1355U(...)  \,
+#define Z_IS_1355U_EQ_1355U(...) \,
+#define Z_IS_1356_EQ_1356(...)   \,
+#define Z_IS_1356U_EQ_1356(...)  \,
+#define Z_IS_1356_EQ_1356U(...)  \,
+#define Z_IS_1356U_EQ_1356U(...) \,
+#define Z_IS_1357_EQ_1357(...)   \,
+#define Z_IS_1357U_EQ_1357(...)  \,
+#define Z_IS_1357_EQ_1357U(...)  \,
+#define Z_IS_1357U_EQ_1357U(...) \,
+#define Z_IS_1358_EQ_1358(...)   \,
+#define Z_IS_1358U_EQ_1358(...)  \,
+#define Z_IS_1358_EQ_1358U(...)  \,
+#define Z_IS_1358U_EQ_1358U(...) \,
+#define Z_IS_1359_EQ_1359(...)   \,
+#define Z_IS_1359U_EQ_1359(...)  \,
+#define Z_IS_1359_EQ_1359U(...)  \,
+#define Z_IS_1359U_EQ_1359U(...) \,
+#define Z_IS_1360_EQ_1360(...)   \,
+#define Z_IS_1360U_EQ_1360(...)  \,
+#define Z_IS_1360_EQ_1360U(...)  \,
+#define Z_IS_1360U_EQ_1360U(...) \,
+#define Z_IS_1361_EQ_1361(...)   \,
+#define Z_IS_1361U_EQ_1361(...)  \,
+#define Z_IS_1361_EQ_1361U(...)  \,
+#define Z_IS_1361U_EQ_1361U(...) \,
+#define Z_IS_1362_EQ_1362(...)   \,
+#define Z_IS_1362U_EQ_1362(...)  \,
+#define Z_IS_1362_EQ_1362U(...)  \,
+#define Z_IS_1362U_EQ_1362U(...) \,
+#define Z_IS_1363_EQ_1363(...)   \,
+#define Z_IS_1363U_EQ_1363(...)  \,
+#define Z_IS_1363_EQ_1363U(...)  \,
+#define Z_IS_1363U_EQ_1363U(...) \,
+#define Z_IS_1364_EQ_1364(...)   \,
+#define Z_IS_1364U_EQ_1364(...)  \,
+#define Z_IS_1364_EQ_1364U(...)  \,
+#define Z_IS_1364U_EQ_1364U(...) \,
+#define Z_IS_1365_EQ_1365(...)   \,
+#define Z_IS_1365U_EQ_1365(...)  \,
+#define Z_IS_1365_EQ_1365U(...)  \,
+#define Z_IS_1365U_EQ_1365U(...) \,
+#define Z_IS_1366_EQ_1366(...)   \,
+#define Z_IS_1366U_EQ_1366(...)  \,
+#define Z_IS_1366_EQ_1366U(...)  \,
+#define Z_IS_1366U_EQ_1366U(...) \,
+#define Z_IS_1367_EQ_1367(...)   \,
+#define Z_IS_1367U_EQ_1367(...)  \,
+#define Z_IS_1367_EQ_1367U(...)  \,
+#define Z_IS_1367U_EQ_1367U(...) \,
+#define Z_IS_1368_EQ_1368(...)   \,
+#define Z_IS_1368U_EQ_1368(...)  \,
+#define Z_IS_1368_EQ_1368U(...)  \,
+#define Z_IS_1368U_EQ_1368U(...) \,
+#define Z_IS_1369_EQ_1369(...)   \,
+#define Z_IS_1369U_EQ_1369(...)  \,
+#define Z_IS_1369_EQ_1369U(...)  \,
+#define Z_IS_1369U_EQ_1369U(...) \,
+#define Z_IS_1370_EQ_1370(...)   \,
+#define Z_IS_1370U_EQ_1370(...)  \,
+#define Z_IS_1370_EQ_1370U(...)  \,
+#define Z_IS_1370U_EQ_1370U(...) \,
+#define Z_IS_1371_EQ_1371(...)   \,
+#define Z_IS_1371U_EQ_1371(...)  \,
+#define Z_IS_1371_EQ_1371U(...)  \,
+#define Z_IS_1371U_EQ_1371U(...) \,
+#define Z_IS_1372_EQ_1372(...)   \,
+#define Z_IS_1372U_EQ_1372(...)  \,
+#define Z_IS_1372_EQ_1372U(...)  \,
+#define Z_IS_1372U_EQ_1372U(...) \,
+#define Z_IS_1373_EQ_1373(...)   \,
+#define Z_IS_1373U_EQ_1373(...)  \,
+#define Z_IS_1373_EQ_1373U(...)  \,
+#define Z_IS_1373U_EQ_1373U(...) \,
+#define Z_IS_1374_EQ_1374(...)   \,
+#define Z_IS_1374U_EQ_1374(...)  \,
+#define Z_IS_1374_EQ_1374U(...)  \,
+#define Z_IS_1374U_EQ_1374U(...) \,
+#define Z_IS_1375_EQ_1375(...)   \,
+#define Z_IS_1375U_EQ_1375(...)  \,
+#define Z_IS_1375_EQ_1375U(...)  \,
+#define Z_IS_1375U_EQ_1375U(...) \,
+#define Z_IS_1376_EQ_1376(...)   \,
+#define Z_IS_1376U_EQ_1376(...)  \,
+#define Z_IS_1376_EQ_1376U(...)  \,
+#define Z_IS_1376U_EQ_1376U(...) \,
+#define Z_IS_1377_EQ_1377(...)   \,
+#define Z_IS_1377U_EQ_1377(...)  \,
+#define Z_IS_1377_EQ_1377U(...)  \,
+#define Z_IS_1377U_EQ_1377U(...) \,
+#define Z_IS_1378_EQ_1378(...)   \,
+#define Z_IS_1378U_EQ_1378(...)  \,
+#define Z_IS_1378_EQ_1378U(...)  \,
+#define Z_IS_1378U_EQ_1378U(...) \,
+#define Z_IS_1379_EQ_1379(...)   \,
+#define Z_IS_1379U_EQ_1379(...)  \,
+#define Z_IS_1379_EQ_1379U(...)  \,
+#define Z_IS_1379U_EQ_1379U(...) \,
+#define Z_IS_1380_EQ_1380(...)   \,
+#define Z_IS_1380U_EQ_1380(...)  \,
+#define Z_IS_1380_EQ_1380U(...)  \,
+#define Z_IS_1380U_EQ_1380U(...) \,
+#define Z_IS_1381_EQ_1381(...)   \,
+#define Z_IS_1381U_EQ_1381(...)  \,
+#define Z_IS_1381_EQ_1381U(...)  \,
+#define Z_IS_1381U_EQ_1381U(...) \,
+#define Z_IS_1382_EQ_1382(...)   \,
+#define Z_IS_1382U_EQ_1382(...)  \,
+#define Z_IS_1382_EQ_1382U(...)  \,
+#define Z_IS_1382U_EQ_1382U(...) \,
+#define Z_IS_1383_EQ_1383(...)   \,
+#define Z_IS_1383U_EQ_1383(...)  \,
+#define Z_IS_1383_EQ_1383U(...)  \,
+#define Z_IS_1383U_EQ_1383U(...) \,
+#define Z_IS_1384_EQ_1384(...)   \,
+#define Z_IS_1384U_EQ_1384(...)  \,
+#define Z_IS_1384_EQ_1384U(...)  \,
+#define Z_IS_1384U_EQ_1384U(...) \,
+#define Z_IS_1385_EQ_1385(...)   \,
+#define Z_IS_1385U_EQ_1385(...)  \,
+#define Z_IS_1385_EQ_1385U(...)  \,
+#define Z_IS_1385U_EQ_1385U(...) \,
+#define Z_IS_1386_EQ_1386(...)   \,
+#define Z_IS_1386U_EQ_1386(...)  \,
+#define Z_IS_1386_EQ_1386U(...)  \,
+#define Z_IS_1386U_EQ_1386U(...) \,
+#define Z_IS_1387_EQ_1387(...)   \,
+#define Z_IS_1387U_EQ_1387(...)  \,
+#define Z_IS_1387_EQ_1387U(...)  \,
+#define Z_IS_1387U_EQ_1387U(...) \,
+#define Z_IS_1388_EQ_1388(...)   \,
+#define Z_IS_1388U_EQ_1388(...)  \,
+#define Z_IS_1388_EQ_1388U(...)  \,
+#define Z_IS_1388U_EQ_1388U(...) \,
+#define Z_IS_1389_EQ_1389(...)   \,
+#define Z_IS_1389U_EQ_1389(...)  \,
+#define Z_IS_1389_EQ_1389U(...)  \,
+#define Z_IS_1389U_EQ_1389U(...) \,
+#define Z_IS_1390_EQ_1390(...)   \,
+#define Z_IS_1390U_EQ_1390(...)  \,
+#define Z_IS_1390_EQ_1390U(...)  \,
+#define Z_IS_1390U_EQ_1390U(...) \,
+#define Z_IS_1391_EQ_1391(...)   \,
+#define Z_IS_1391U_EQ_1391(...)  \,
+#define Z_IS_1391_EQ_1391U(...)  \,
+#define Z_IS_1391U_EQ_1391U(...) \,
+#define Z_IS_1392_EQ_1392(...)   \,
+#define Z_IS_1392U_EQ_1392(...)  \,
+#define Z_IS_1392_EQ_1392U(...)  \,
+#define Z_IS_1392U_EQ_1392U(...) \,
+#define Z_IS_1393_EQ_1393(...)   \,
+#define Z_IS_1393U_EQ_1393(...)  \,
+#define Z_IS_1393_EQ_1393U(...)  \,
+#define Z_IS_1393U_EQ_1393U(...) \,
+#define Z_IS_1394_EQ_1394(...)   \,
+#define Z_IS_1394U_EQ_1394(...)  \,
+#define Z_IS_1394_EQ_1394U(...)  \,
+#define Z_IS_1394U_EQ_1394U(...) \,
+#define Z_IS_1395_EQ_1395(...)   \,
+#define Z_IS_1395U_EQ_1395(...)  \,
+#define Z_IS_1395_EQ_1395U(...)  \,
+#define Z_IS_1395U_EQ_1395U(...) \,
+#define Z_IS_1396_EQ_1396(...)   \,
+#define Z_IS_1396U_EQ_1396(...)  \,
+#define Z_IS_1396_EQ_1396U(...)  \,
+#define Z_IS_1396U_EQ_1396U(...) \,
+#define Z_IS_1397_EQ_1397(...)   \,
+#define Z_IS_1397U_EQ_1397(...)  \,
+#define Z_IS_1397_EQ_1397U(...)  \,
+#define Z_IS_1397U_EQ_1397U(...) \,
+#define Z_IS_1398_EQ_1398(...)   \,
+#define Z_IS_1398U_EQ_1398(...)  \,
+#define Z_IS_1398_EQ_1398U(...)  \,
+#define Z_IS_1398U_EQ_1398U(...) \,
+#define Z_IS_1399_EQ_1399(...)   \,
+#define Z_IS_1399U_EQ_1399(...)  \,
+#define Z_IS_1399_EQ_1399U(...)  \,
+#define Z_IS_1399U_EQ_1399U(...) \,
+#define Z_IS_1400_EQ_1400(...)   \,
+#define Z_IS_1400U_EQ_1400(...)  \,
+#define Z_IS_1400_EQ_1400U(...)  \,
+#define Z_IS_1400U_EQ_1400U(...) \,
+#define Z_IS_1401_EQ_1401(...)   \,
+#define Z_IS_1401U_EQ_1401(...)  \,
+#define Z_IS_1401_EQ_1401U(...)  \,
+#define Z_IS_1401U_EQ_1401U(...) \,
+#define Z_IS_1402_EQ_1402(...)   \,
+#define Z_IS_1402U_EQ_1402(...)  \,
+#define Z_IS_1402_EQ_1402U(...)  \,
+#define Z_IS_1402U_EQ_1402U(...) \,
+#define Z_IS_1403_EQ_1403(...)   \,
+#define Z_IS_1403U_EQ_1403(...)  \,
+#define Z_IS_1403_EQ_1403U(...)  \,
+#define Z_IS_1403U_EQ_1403U(...) \,
+#define Z_IS_1404_EQ_1404(...)   \,
+#define Z_IS_1404U_EQ_1404(...)  \,
+#define Z_IS_1404_EQ_1404U(...)  \,
+#define Z_IS_1404U_EQ_1404U(...) \,
+#define Z_IS_1405_EQ_1405(...)   \,
+#define Z_IS_1405U_EQ_1405(...)  \,
+#define Z_IS_1405_EQ_1405U(...)  \,
+#define Z_IS_1405U_EQ_1405U(...) \,
+#define Z_IS_1406_EQ_1406(...)   \,
+#define Z_IS_1406U_EQ_1406(...)  \,
+#define Z_IS_1406_EQ_1406U(...)  \,
+#define Z_IS_1406U_EQ_1406U(...) \,
+#define Z_IS_1407_EQ_1407(...)   \,
+#define Z_IS_1407U_EQ_1407(...)  \,
+#define Z_IS_1407_EQ_1407U(...)  \,
+#define Z_IS_1407U_EQ_1407U(...) \,
+#define Z_IS_1408_EQ_1408(...)   \,
+#define Z_IS_1408U_EQ_1408(...)  \,
+#define Z_IS_1408_EQ_1408U(...)  \,
+#define Z_IS_1408U_EQ_1408U(...) \,
+#define Z_IS_1409_EQ_1409(...)   \,
+#define Z_IS_1409U_EQ_1409(...)  \,
+#define Z_IS_1409_EQ_1409U(...)  \,
+#define Z_IS_1409U_EQ_1409U(...) \,
+#define Z_IS_1410_EQ_1410(...)   \,
+#define Z_IS_1410U_EQ_1410(...)  \,
+#define Z_IS_1410_EQ_1410U(...)  \,
+#define Z_IS_1410U_EQ_1410U(...) \,
+#define Z_IS_1411_EQ_1411(...)   \,
+#define Z_IS_1411U_EQ_1411(...)  \,
+#define Z_IS_1411_EQ_1411U(...)  \,
+#define Z_IS_1411U_EQ_1411U(...) \,
+#define Z_IS_1412_EQ_1412(...)   \,
+#define Z_IS_1412U_EQ_1412(...)  \,
+#define Z_IS_1412_EQ_1412U(...)  \,
+#define Z_IS_1412U_EQ_1412U(...) \,
+#define Z_IS_1413_EQ_1413(...)   \,
+#define Z_IS_1413U_EQ_1413(...)  \,
+#define Z_IS_1413_EQ_1413U(...)  \,
+#define Z_IS_1413U_EQ_1413U(...) \,
+#define Z_IS_1414_EQ_1414(...)   \,
+#define Z_IS_1414U_EQ_1414(...)  \,
+#define Z_IS_1414_EQ_1414U(...)  \,
+#define Z_IS_1414U_EQ_1414U(...) \,
+#define Z_IS_1415_EQ_1415(...)   \,
+#define Z_IS_1415U_EQ_1415(...)  \,
+#define Z_IS_1415_EQ_1415U(...)  \,
+#define Z_IS_1415U_EQ_1415U(...) \,
+#define Z_IS_1416_EQ_1416(...)   \,
+#define Z_IS_1416U_EQ_1416(...)  \,
+#define Z_IS_1416_EQ_1416U(...)  \,
+#define Z_IS_1416U_EQ_1416U(...) \,
+#define Z_IS_1417_EQ_1417(...)   \,
+#define Z_IS_1417U_EQ_1417(...)  \,
+#define Z_IS_1417_EQ_1417U(...)  \,
+#define Z_IS_1417U_EQ_1417U(...) \,
+#define Z_IS_1418_EQ_1418(...)   \,
+#define Z_IS_1418U_EQ_1418(...)  \,
+#define Z_IS_1418_EQ_1418U(...)  \,
+#define Z_IS_1418U_EQ_1418U(...) \,
+#define Z_IS_1419_EQ_1419(...)   \,
+#define Z_IS_1419U_EQ_1419(...)  \,
+#define Z_IS_1419_EQ_1419U(...)  \,
+#define Z_IS_1419U_EQ_1419U(...) \,
+#define Z_IS_1420_EQ_1420(...)   \,
+#define Z_IS_1420U_EQ_1420(...)  \,
+#define Z_IS_1420_EQ_1420U(...)  \,
+#define Z_IS_1420U_EQ_1420U(...) \,
+#define Z_IS_1421_EQ_1421(...)   \,
+#define Z_IS_1421U_EQ_1421(...)  \,
+#define Z_IS_1421_EQ_1421U(...)  \,
+#define Z_IS_1421U_EQ_1421U(...) \,
+#define Z_IS_1422_EQ_1422(...)   \,
+#define Z_IS_1422U_EQ_1422(...)  \,
+#define Z_IS_1422_EQ_1422U(...)  \,
+#define Z_IS_1422U_EQ_1422U(...) \,
+#define Z_IS_1423_EQ_1423(...)   \,
+#define Z_IS_1423U_EQ_1423(...)  \,
+#define Z_IS_1423_EQ_1423U(...)  \,
+#define Z_IS_1423U_EQ_1423U(...) \,
+#define Z_IS_1424_EQ_1424(...)   \,
+#define Z_IS_1424U_EQ_1424(...)  \,
+#define Z_IS_1424_EQ_1424U(...)  \,
+#define Z_IS_1424U_EQ_1424U(...) \,
+#define Z_IS_1425_EQ_1425(...)   \,
+#define Z_IS_1425U_EQ_1425(...)  \,
+#define Z_IS_1425_EQ_1425U(...)  \,
+#define Z_IS_1425U_EQ_1425U(...) \,
+#define Z_IS_1426_EQ_1426(...)   \,
+#define Z_IS_1426U_EQ_1426(...)  \,
+#define Z_IS_1426_EQ_1426U(...)  \,
+#define Z_IS_1426U_EQ_1426U(...) \,
+#define Z_IS_1427_EQ_1427(...)   \,
+#define Z_IS_1427U_EQ_1427(...)  \,
+#define Z_IS_1427_EQ_1427U(...)  \,
+#define Z_IS_1427U_EQ_1427U(...) \,
+#define Z_IS_1428_EQ_1428(...)   \,
+#define Z_IS_1428U_EQ_1428(...)  \,
+#define Z_IS_1428_EQ_1428U(...)  \,
+#define Z_IS_1428U_EQ_1428U(...) \,
+#define Z_IS_1429_EQ_1429(...)   \,
+#define Z_IS_1429U_EQ_1429(...)  \,
+#define Z_IS_1429_EQ_1429U(...)  \,
+#define Z_IS_1429U_EQ_1429U(...) \,
+#define Z_IS_1430_EQ_1430(...)   \,
+#define Z_IS_1430U_EQ_1430(...)  \,
+#define Z_IS_1430_EQ_1430U(...)  \,
+#define Z_IS_1430U_EQ_1430U(...) \,
+#define Z_IS_1431_EQ_1431(...)   \,
+#define Z_IS_1431U_EQ_1431(...)  \,
+#define Z_IS_1431_EQ_1431U(...)  \,
+#define Z_IS_1431U_EQ_1431U(...) \,
+#define Z_IS_1432_EQ_1432(...)   \,
+#define Z_IS_1432U_EQ_1432(...)  \,
+#define Z_IS_1432_EQ_1432U(...)  \,
+#define Z_IS_1432U_EQ_1432U(...) \,
+#define Z_IS_1433_EQ_1433(...)   \,
+#define Z_IS_1433U_EQ_1433(...)  \,
+#define Z_IS_1433_EQ_1433U(...)  \,
+#define Z_IS_1433U_EQ_1433U(...) \,
+#define Z_IS_1434_EQ_1434(...)   \,
+#define Z_IS_1434U_EQ_1434(...)  \,
+#define Z_IS_1434_EQ_1434U(...)  \,
+#define Z_IS_1434U_EQ_1434U(...) \,
+#define Z_IS_1435_EQ_1435(...)   \,
+#define Z_IS_1435U_EQ_1435(...)  \,
+#define Z_IS_1435_EQ_1435U(...)  \,
+#define Z_IS_1435U_EQ_1435U(...) \,
+#define Z_IS_1436_EQ_1436(...)   \,
+#define Z_IS_1436U_EQ_1436(...)  \,
+#define Z_IS_1436_EQ_1436U(...)  \,
+#define Z_IS_1436U_EQ_1436U(...) \,
+#define Z_IS_1437_EQ_1437(...)   \,
+#define Z_IS_1437U_EQ_1437(...)  \,
+#define Z_IS_1437_EQ_1437U(...)  \,
+#define Z_IS_1437U_EQ_1437U(...) \,
+#define Z_IS_1438_EQ_1438(...)   \,
+#define Z_IS_1438U_EQ_1438(...)  \,
+#define Z_IS_1438_EQ_1438U(...)  \,
+#define Z_IS_1438U_EQ_1438U(...) \,
+#define Z_IS_1439_EQ_1439(...)   \,
+#define Z_IS_1439U_EQ_1439(...)  \,
+#define Z_IS_1439_EQ_1439U(...)  \,
+#define Z_IS_1439U_EQ_1439U(...) \,
+#define Z_IS_1440_EQ_1440(...)   \,
+#define Z_IS_1440U_EQ_1440(...)  \,
+#define Z_IS_1440_EQ_1440U(...)  \,
+#define Z_IS_1440U_EQ_1440U(...) \,
+#define Z_IS_1441_EQ_1441(...)   \,
+#define Z_IS_1441U_EQ_1441(...)  \,
+#define Z_IS_1441_EQ_1441U(...)  \,
+#define Z_IS_1441U_EQ_1441U(...) \,
+#define Z_IS_1442_EQ_1442(...)   \,
+#define Z_IS_1442U_EQ_1442(...)  \,
+#define Z_IS_1442_EQ_1442U(...)  \,
+#define Z_IS_1442U_EQ_1442U(...) \,
+#define Z_IS_1443_EQ_1443(...)   \,
+#define Z_IS_1443U_EQ_1443(...)  \,
+#define Z_IS_1443_EQ_1443U(...)  \,
+#define Z_IS_1443U_EQ_1443U(...) \,
+#define Z_IS_1444_EQ_1444(...)   \,
+#define Z_IS_1444U_EQ_1444(...)  \,
+#define Z_IS_1444_EQ_1444U(...)  \,
+#define Z_IS_1444U_EQ_1444U(...) \,
+#define Z_IS_1445_EQ_1445(...)   \,
+#define Z_IS_1445U_EQ_1445(...)  \,
+#define Z_IS_1445_EQ_1445U(...)  \,
+#define Z_IS_1445U_EQ_1445U(...) \,
+#define Z_IS_1446_EQ_1446(...)   \,
+#define Z_IS_1446U_EQ_1446(...)  \,
+#define Z_IS_1446_EQ_1446U(...)  \,
+#define Z_IS_1446U_EQ_1446U(...) \,
+#define Z_IS_1447_EQ_1447(...)   \,
+#define Z_IS_1447U_EQ_1447(...)  \,
+#define Z_IS_1447_EQ_1447U(...)  \,
+#define Z_IS_1447U_EQ_1447U(...) \,
+#define Z_IS_1448_EQ_1448(...)   \,
+#define Z_IS_1448U_EQ_1448(...)  \,
+#define Z_IS_1448_EQ_1448U(...)  \,
+#define Z_IS_1448U_EQ_1448U(...) \,
+#define Z_IS_1449_EQ_1449(...)   \,
+#define Z_IS_1449U_EQ_1449(...)  \,
+#define Z_IS_1449_EQ_1449U(...)  \,
+#define Z_IS_1449U_EQ_1449U(...) \,
+#define Z_IS_1450_EQ_1450(...)   \,
+#define Z_IS_1450U_EQ_1450(...)  \,
+#define Z_IS_1450_EQ_1450U(...)  \,
+#define Z_IS_1450U_EQ_1450U(...) \,
+#define Z_IS_1451_EQ_1451(...)   \,
+#define Z_IS_1451U_EQ_1451(...)  \,
+#define Z_IS_1451_EQ_1451U(...)  \,
+#define Z_IS_1451U_EQ_1451U(...) \,
+#define Z_IS_1452_EQ_1452(...)   \,
+#define Z_IS_1452U_EQ_1452(...)  \,
+#define Z_IS_1452_EQ_1452U(...)  \,
+#define Z_IS_1452U_EQ_1452U(...) \,
+#define Z_IS_1453_EQ_1453(...)   \,
+#define Z_IS_1453U_EQ_1453(...)  \,
+#define Z_IS_1453_EQ_1453U(...)  \,
+#define Z_IS_1453U_EQ_1453U(...) \,
+#define Z_IS_1454_EQ_1454(...)   \,
+#define Z_IS_1454U_EQ_1454(...)  \,
+#define Z_IS_1454_EQ_1454U(...)  \,
+#define Z_IS_1454U_EQ_1454U(...) \,
+#define Z_IS_1455_EQ_1455(...)   \,
+#define Z_IS_1455U_EQ_1455(...)  \,
+#define Z_IS_1455_EQ_1455U(...)  \,
+#define Z_IS_1455U_EQ_1455U(...) \,
+#define Z_IS_1456_EQ_1456(...)   \,
+#define Z_IS_1456U_EQ_1456(...)  \,
+#define Z_IS_1456_EQ_1456U(...)  \,
+#define Z_IS_1456U_EQ_1456U(...) \,
+#define Z_IS_1457_EQ_1457(...)   \,
+#define Z_IS_1457U_EQ_1457(...)  \,
+#define Z_IS_1457_EQ_1457U(...)  \,
+#define Z_IS_1457U_EQ_1457U(...) \,
+#define Z_IS_1458_EQ_1458(...)   \,
+#define Z_IS_1458U_EQ_1458(...)  \,
+#define Z_IS_1458_EQ_1458U(...)  \,
+#define Z_IS_1458U_EQ_1458U(...) \,
+#define Z_IS_1459_EQ_1459(...)   \,
+#define Z_IS_1459U_EQ_1459(...)  \,
+#define Z_IS_1459_EQ_1459U(...)  \,
+#define Z_IS_1459U_EQ_1459U(...) \,
+#define Z_IS_1460_EQ_1460(...)   \,
+#define Z_IS_1460U_EQ_1460(...)  \,
+#define Z_IS_1460_EQ_1460U(...)  \,
+#define Z_IS_1460U_EQ_1460U(...) \,
+#define Z_IS_1461_EQ_1461(...)   \,
+#define Z_IS_1461U_EQ_1461(...)  \,
+#define Z_IS_1461_EQ_1461U(...)  \,
+#define Z_IS_1461U_EQ_1461U(...) \,
+#define Z_IS_1462_EQ_1462(...)   \,
+#define Z_IS_1462U_EQ_1462(...)  \,
+#define Z_IS_1462_EQ_1462U(...)  \,
+#define Z_IS_1462U_EQ_1462U(...) \,
+#define Z_IS_1463_EQ_1463(...)   \,
+#define Z_IS_1463U_EQ_1463(...)  \,
+#define Z_IS_1463_EQ_1463U(...)  \,
+#define Z_IS_1463U_EQ_1463U(...) \,
+#define Z_IS_1464_EQ_1464(...)   \,
+#define Z_IS_1464U_EQ_1464(...)  \,
+#define Z_IS_1464_EQ_1464U(...)  \,
+#define Z_IS_1464U_EQ_1464U(...) \,
+#define Z_IS_1465_EQ_1465(...)   \,
+#define Z_IS_1465U_EQ_1465(...)  \,
+#define Z_IS_1465_EQ_1465U(...)  \,
+#define Z_IS_1465U_EQ_1465U(...) \,
+#define Z_IS_1466_EQ_1466(...)   \,
+#define Z_IS_1466U_EQ_1466(...)  \,
+#define Z_IS_1466_EQ_1466U(...)  \,
+#define Z_IS_1466U_EQ_1466U(...) \,
+#define Z_IS_1467_EQ_1467(...)   \,
+#define Z_IS_1467U_EQ_1467(...)  \,
+#define Z_IS_1467_EQ_1467U(...)  \,
+#define Z_IS_1467U_EQ_1467U(...) \,
+#define Z_IS_1468_EQ_1468(...)   \,
+#define Z_IS_1468U_EQ_1468(...)  \,
+#define Z_IS_1468_EQ_1468U(...)  \,
+#define Z_IS_1468U_EQ_1468U(...) \,
+#define Z_IS_1469_EQ_1469(...)   \,
+#define Z_IS_1469U_EQ_1469(...)  \,
+#define Z_IS_1469_EQ_1469U(...)  \,
+#define Z_IS_1469U_EQ_1469U(...) \,
+#define Z_IS_1470_EQ_1470(...)   \,
+#define Z_IS_1470U_EQ_1470(...)  \,
+#define Z_IS_1470_EQ_1470U(...)  \,
+#define Z_IS_1470U_EQ_1470U(...) \,
+#define Z_IS_1471_EQ_1471(...)   \,
+#define Z_IS_1471U_EQ_1471(...)  \,
+#define Z_IS_1471_EQ_1471U(...)  \,
+#define Z_IS_1471U_EQ_1471U(...) \,
+#define Z_IS_1472_EQ_1472(...)   \,
+#define Z_IS_1472U_EQ_1472(...)  \,
+#define Z_IS_1472_EQ_1472U(...)  \,
+#define Z_IS_1472U_EQ_1472U(...) \,
+#define Z_IS_1473_EQ_1473(...)   \,
+#define Z_IS_1473U_EQ_1473(...)  \,
+#define Z_IS_1473_EQ_1473U(...)  \,
+#define Z_IS_1473U_EQ_1473U(...) \,
+#define Z_IS_1474_EQ_1474(...)   \,
+#define Z_IS_1474U_EQ_1474(...)  \,
+#define Z_IS_1474_EQ_1474U(...)  \,
+#define Z_IS_1474U_EQ_1474U(...) \,
+#define Z_IS_1475_EQ_1475(...)   \,
+#define Z_IS_1475U_EQ_1475(...)  \,
+#define Z_IS_1475_EQ_1475U(...)  \,
+#define Z_IS_1475U_EQ_1475U(...) \,
+#define Z_IS_1476_EQ_1476(...)   \,
+#define Z_IS_1476U_EQ_1476(...)  \,
+#define Z_IS_1476_EQ_1476U(...)  \,
+#define Z_IS_1476U_EQ_1476U(...) \,
+#define Z_IS_1477_EQ_1477(...)   \,
+#define Z_IS_1477U_EQ_1477(...)  \,
+#define Z_IS_1477_EQ_1477U(...)  \,
+#define Z_IS_1477U_EQ_1477U(...) \,
+#define Z_IS_1478_EQ_1478(...)   \,
+#define Z_IS_1478U_EQ_1478(...)  \,
+#define Z_IS_1478_EQ_1478U(...)  \,
+#define Z_IS_1478U_EQ_1478U(...) \,
+#define Z_IS_1479_EQ_1479(...)   \,
+#define Z_IS_1479U_EQ_1479(...)  \,
+#define Z_IS_1479_EQ_1479U(...)  \,
+#define Z_IS_1479U_EQ_1479U(...) \,
+#define Z_IS_1480_EQ_1480(...)   \,
+#define Z_IS_1480U_EQ_1480(...)  \,
+#define Z_IS_1480_EQ_1480U(...)  \,
+#define Z_IS_1480U_EQ_1480U(...) \,
+#define Z_IS_1481_EQ_1481(...)   \,
+#define Z_IS_1481U_EQ_1481(...)  \,
+#define Z_IS_1481_EQ_1481U(...)  \,
+#define Z_IS_1481U_EQ_1481U(...) \,
+#define Z_IS_1482_EQ_1482(...)   \,
+#define Z_IS_1482U_EQ_1482(...)  \,
+#define Z_IS_1482_EQ_1482U(...)  \,
+#define Z_IS_1482U_EQ_1482U(...) \,
+#define Z_IS_1483_EQ_1483(...)   \,
+#define Z_IS_1483U_EQ_1483(...)  \,
+#define Z_IS_1483_EQ_1483U(...)  \,
+#define Z_IS_1483U_EQ_1483U(...) \,
+#define Z_IS_1484_EQ_1484(...)   \,
+#define Z_IS_1484U_EQ_1484(...)  \,
+#define Z_IS_1484_EQ_1484U(...)  \,
+#define Z_IS_1484U_EQ_1484U(...) \,
+#define Z_IS_1485_EQ_1485(...)   \,
+#define Z_IS_1485U_EQ_1485(...)  \,
+#define Z_IS_1485_EQ_1485U(...)  \,
+#define Z_IS_1485U_EQ_1485U(...) \,
+#define Z_IS_1486_EQ_1486(...)   \,
+#define Z_IS_1486U_EQ_1486(...)  \,
+#define Z_IS_1486_EQ_1486U(...)  \,
+#define Z_IS_1486U_EQ_1486U(...) \,
+#define Z_IS_1487_EQ_1487(...)   \,
+#define Z_IS_1487U_EQ_1487(...)  \,
+#define Z_IS_1487_EQ_1487U(...)  \,
+#define Z_IS_1487U_EQ_1487U(...) \,
+#define Z_IS_1488_EQ_1488(...)   \,
+#define Z_IS_1488U_EQ_1488(...)  \,
+#define Z_IS_1488_EQ_1488U(...)  \,
+#define Z_IS_1488U_EQ_1488U(...) \,
+#define Z_IS_1489_EQ_1489(...)   \,
+#define Z_IS_1489U_EQ_1489(...)  \,
+#define Z_IS_1489_EQ_1489U(...)  \,
+#define Z_IS_1489U_EQ_1489U(...) \,
+#define Z_IS_1490_EQ_1490(...)   \,
+#define Z_IS_1490U_EQ_1490(...)  \,
+#define Z_IS_1490_EQ_1490U(...)  \,
+#define Z_IS_1490U_EQ_1490U(...) \,
+#define Z_IS_1491_EQ_1491(...)   \,
+#define Z_IS_1491U_EQ_1491(...)  \,
+#define Z_IS_1491_EQ_1491U(...)  \,
+#define Z_IS_1491U_EQ_1491U(...) \,
+#define Z_IS_1492_EQ_1492(...)   \,
+#define Z_IS_1492U_EQ_1492(...)  \,
+#define Z_IS_1492_EQ_1492U(...)  \,
+#define Z_IS_1492U_EQ_1492U(...) \,
+#define Z_IS_1493_EQ_1493(...)   \,
+#define Z_IS_1493U_EQ_1493(...)  \,
+#define Z_IS_1493_EQ_1493U(...)  \,
+#define Z_IS_1493U_EQ_1493U(...) \,
+#define Z_IS_1494_EQ_1494(...)   \,
+#define Z_IS_1494U_EQ_1494(...)  \,
+#define Z_IS_1494_EQ_1494U(...)  \,
+#define Z_IS_1494U_EQ_1494U(...) \,
+#define Z_IS_1495_EQ_1495(...)   \,
+#define Z_IS_1495U_EQ_1495(...)  \,
+#define Z_IS_1495_EQ_1495U(...)  \,
+#define Z_IS_1495U_EQ_1495U(...) \,
+#define Z_IS_1496_EQ_1496(...)   \,
+#define Z_IS_1496U_EQ_1496(...)  \,
+#define Z_IS_1496_EQ_1496U(...)  \,
+#define Z_IS_1496U_EQ_1496U(...) \,
+#define Z_IS_1497_EQ_1497(...)   \,
+#define Z_IS_1497U_EQ_1497(...)  \,
+#define Z_IS_1497_EQ_1497U(...)  \,
+#define Z_IS_1497U_EQ_1497U(...) \,
+#define Z_IS_1498_EQ_1498(...)   \,
+#define Z_IS_1498U_EQ_1498(...)  \,
+#define Z_IS_1498_EQ_1498U(...)  \,
+#define Z_IS_1498U_EQ_1498U(...) \,
+#define Z_IS_1499_EQ_1499(...)   \,
+#define Z_IS_1499U_EQ_1499(...)  \,
+#define Z_IS_1499_EQ_1499U(...)  \,
+#define Z_IS_1499U_EQ_1499U(...) \,
+#define Z_IS_1500_EQ_1500(...)   \,
+#define Z_IS_1500U_EQ_1500(...)  \,
+#define Z_IS_1500_EQ_1500U(...)  \,
+#define Z_IS_1500U_EQ_1500U(...) \,
+#define Z_IS_1501_EQ_1501(...)   \,
+#define Z_IS_1501U_EQ_1501(...)  \,
+#define Z_IS_1501_EQ_1501U(...)  \,
+#define Z_IS_1501U_EQ_1501U(...) \,
+#define Z_IS_1502_EQ_1502(...)   \,
+#define Z_IS_1502U_EQ_1502(...)  \,
+#define Z_IS_1502_EQ_1502U(...)  \,
+#define Z_IS_1502U_EQ_1502U(...) \,
+#define Z_IS_1503_EQ_1503(...)   \,
+#define Z_IS_1503U_EQ_1503(...)  \,
+#define Z_IS_1503_EQ_1503U(...)  \,
+#define Z_IS_1503U_EQ_1503U(...) \,
+#define Z_IS_1504_EQ_1504(...)   \,
+#define Z_IS_1504U_EQ_1504(...)  \,
+#define Z_IS_1504_EQ_1504U(...)  \,
+#define Z_IS_1504U_EQ_1504U(...) \,
+#define Z_IS_1505_EQ_1505(...)   \,
+#define Z_IS_1505U_EQ_1505(...)  \,
+#define Z_IS_1505_EQ_1505U(...)  \,
+#define Z_IS_1505U_EQ_1505U(...) \,
+#define Z_IS_1506_EQ_1506(...)   \,
+#define Z_IS_1506U_EQ_1506(...)  \,
+#define Z_IS_1506_EQ_1506U(...)  \,
+#define Z_IS_1506U_EQ_1506U(...) \,
+#define Z_IS_1507_EQ_1507(...)   \,
+#define Z_IS_1507U_EQ_1507(...)  \,
+#define Z_IS_1507_EQ_1507U(...)  \,
+#define Z_IS_1507U_EQ_1507U(...) \,
+#define Z_IS_1508_EQ_1508(...)   \,
+#define Z_IS_1508U_EQ_1508(...)  \,
+#define Z_IS_1508_EQ_1508U(...)  \,
+#define Z_IS_1508U_EQ_1508U(...) \,
+#define Z_IS_1509_EQ_1509(...)   \,
+#define Z_IS_1509U_EQ_1509(...)  \,
+#define Z_IS_1509_EQ_1509U(...)  \,
+#define Z_IS_1509U_EQ_1509U(...) \,
+#define Z_IS_1510_EQ_1510(...)   \,
+#define Z_IS_1510U_EQ_1510(...)  \,
+#define Z_IS_1510_EQ_1510U(...)  \,
+#define Z_IS_1510U_EQ_1510U(...) \,
+#define Z_IS_1511_EQ_1511(...)   \,
+#define Z_IS_1511U_EQ_1511(...)  \,
+#define Z_IS_1511_EQ_1511U(...)  \,
+#define Z_IS_1511U_EQ_1511U(...) \,
+#define Z_IS_1512_EQ_1512(...)   \,
+#define Z_IS_1512U_EQ_1512(...)  \,
+#define Z_IS_1512_EQ_1512U(...)  \,
+#define Z_IS_1512U_EQ_1512U(...) \,
+#define Z_IS_1513_EQ_1513(...)   \,
+#define Z_IS_1513U_EQ_1513(...)  \,
+#define Z_IS_1513_EQ_1513U(...)  \,
+#define Z_IS_1513U_EQ_1513U(...) \,
+#define Z_IS_1514_EQ_1514(...)   \,
+#define Z_IS_1514U_EQ_1514(...)  \,
+#define Z_IS_1514_EQ_1514U(...)  \,
+#define Z_IS_1514U_EQ_1514U(...) \,
+#define Z_IS_1515_EQ_1515(...)   \,
+#define Z_IS_1515U_EQ_1515(...)  \,
+#define Z_IS_1515_EQ_1515U(...)  \,
+#define Z_IS_1515U_EQ_1515U(...) \,
+#define Z_IS_1516_EQ_1516(...)   \,
+#define Z_IS_1516U_EQ_1516(...)  \,
+#define Z_IS_1516_EQ_1516U(...)  \,
+#define Z_IS_1516U_EQ_1516U(...) \,
+#define Z_IS_1517_EQ_1517(...)   \,
+#define Z_IS_1517U_EQ_1517(...)  \,
+#define Z_IS_1517_EQ_1517U(...)  \,
+#define Z_IS_1517U_EQ_1517U(...) \,
+#define Z_IS_1518_EQ_1518(...)   \,
+#define Z_IS_1518U_EQ_1518(...)  \,
+#define Z_IS_1518_EQ_1518U(...)  \,
+#define Z_IS_1518U_EQ_1518U(...) \,
+#define Z_IS_1519_EQ_1519(...)   \,
+#define Z_IS_1519U_EQ_1519(...)  \,
+#define Z_IS_1519_EQ_1519U(...)  \,
+#define Z_IS_1519U_EQ_1519U(...) \,
+#define Z_IS_1520_EQ_1520(...)   \,
+#define Z_IS_1520U_EQ_1520(...)  \,
+#define Z_IS_1520_EQ_1520U(...)  \,
+#define Z_IS_1520U_EQ_1520U(...) \,
+#define Z_IS_1521_EQ_1521(...)   \,
+#define Z_IS_1521U_EQ_1521(...)  \,
+#define Z_IS_1521_EQ_1521U(...)  \,
+#define Z_IS_1521U_EQ_1521U(...) \,
+#define Z_IS_1522_EQ_1522(...)   \,
+#define Z_IS_1522U_EQ_1522(...)  \,
+#define Z_IS_1522_EQ_1522U(...)  \,
+#define Z_IS_1522U_EQ_1522U(...) \,
+#define Z_IS_1523_EQ_1523(...)   \,
+#define Z_IS_1523U_EQ_1523(...)  \,
+#define Z_IS_1523_EQ_1523U(...)  \,
+#define Z_IS_1523U_EQ_1523U(...) \,
+#define Z_IS_1524_EQ_1524(...)   \,
+#define Z_IS_1524U_EQ_1524(...)  \,
+#define Z_IS_1524_EQ_1524U(...)  \,
+#define Z_IS_1524U_EQ_1524U(...) \,
+#define Z_IS_1525_EQ_1525(...)   \,
+#define Z_IS_1525U_EQ_1525(...)  \,
+#define Z_IS_1525_EQ_1525U(...)  \,
+#define Z_IS_1525U_EQ_1525U(...) \,
+#define Z_IS_1526_EQ_1526(...)   \,
+#define Z_IS_1526U_EQ_1526(...)  \,
+#define Z_IS_1526_EQ_1526U(...)  \,
+#define Z_IS_1526U_EQ_1526U(...) \,
+#define Z_IS_1527_EQ_1527(...)   \,
+#define Z_IS_1527U_EQ_1527(...)  \,
+#define Z_IS_1527_EQ_1527U(...)  \,
+#define Z_IS_1527U_EQ_1527U(...) \,
+#define Z_IS_1528_EQ_1528(...)   \,
+#define Z_IS_1528U_EQ_1528(...)  \,
+#define Z_IS_1528_EQ_1528U(...)  \,
+#define Z_IS_1528U_EQ_1528U(...) \,
+#define Z_IS_1529_EQ_1529(...)   \,
+#define Z_IS_1529U_EQ_1529(...)  \,
+#define Z_IS_1529_EQ_1529U(...)  \,
+#define Z_IS_1529U_EQ_1529U(...) \,
+#define Z_IS_1530_EQ_1530(...)   \,
+#define Z_IS_1530U_EQ_1530(...)  \,
+#define Z_IS_1530_EQ_1530U(...)  \,
+#define Z_IS_1530U_EQ_1530U(...) \,
+#define Z_IS_1531_EQ_1531(...)   \,
+#define Z_IS_1531U_EQ_1531(...)  \,
+#define Z_IS_1531_EQ_1531U(...)  \,
+#define Z_IS_1531U_EQ_1531U(...) \,
+#define Z_IS_1532_EQ_1532(...)   \,
+#define Z_IS_1532U_EQ_1532(...)  \,
+#define Z_IS_1532_EQ_1532U(...)  \,
+#define Z_IS_1532U_EQ_1532U(...) \,
+#define Z_IS_1533_EQ_1533(...)   \,
+#define Z_IS_1533U_EQ_1533(...)  \,
+#define Z_IS_1533_EQ_1533U(...)  \,
+#define Z_IS_1533U_EQ_1533U(...) \,
+#define Z_IS_1534_EQ_1534(...)   \,
+#define Z_IS_1534U_EQ_1534(...)  \,
+#define Z_IS_1534_EQ_1534U(...)  \,
+#define Z_IS_1534U_EQ_1534U(...) \,
+#define Z_IS_1535_EQ_1535(...)   \,
+#define Z_IS_1535U_EQ_1535(...)  \,
+#define Z_IS_1535_EQ_1535U(...)  \,
+#define Z_IS_1535U_EQ_1535U(...) \,
+#define Z_IS_1536_EQ_1536(...)   \,
+#define Z_IS_1536U_EQ_1536(...)  \,
+#define Z_IS_1536_EQ_1536U(...)  \,
+#define Z_IS_1536U_EQ_1536U(...) \,
+#define Z_IS_1537_EQ_1537(...)   \,
+#define Z_IS_1537U_EQ_1537(...)  \,
+#define Z_IS_1537_EQ_1537U(...)  \,
+#define Z_IS_1537U_EQ_1537U(...) \,
+#define Z_IS_1538_EQ_1538(...)   \,
+#define Z_IS_1538U_EQ_1538(...)  \,
+#define Z_IS_1538_EQ_1538U(...)  \,
+#define Z_IS_1538U_EQ_1538U(...) \,
+#define Z_IS_1539_EQ_1539(...)   \,
+#define Z_IS_1539U_EQ_1539(...)  \,
+#define Z_IS_1539_EQ_1539U(...)  \,
+#define Z_IS_1539U_EQ_1539U(...) \,
+#define Z_IS_1540_EQ_1540(...)   \,
+#define Z_IS_1540U_EQ_1540(...)  \,
+#define Z_IS_1540_EQ_1540U(...)  \,
+#define Z_IS_1540U_EQ_1540U(...) \,
+#define Z_IS_1541_EQ_1541(...)   \,
+#define Z_IS_1541U_EQ_1541(...)  \,
+#define Z_IS_1541_EQ_1541U(...)  \,
+#define Z_IS_1541U_EQ_1541U(...) \,
+#define Z_IS_1542_EQ_1542(...)   \,
+#define Z_IS_1542U_EQ_1542(...)  \,
+#define Z_IS_1542_EQ_1542U(...)  \,
+#define Z_IS_1542U_EQ_1542U(...) \,
+#define Z_IS_1543_EQ_1543(...)   \,
+#define Z_IS_1543U_EQ_1543(...)  \,
+#define Z_IS_1543_EQ_1543U(...)  \,
+#define Z_IS_1543U_EQ_1543U(...) \,
+#define Z_IS_1544_EQ_1544(...)   \,
+#define Z_IS_1544U_EQ_1544(...)  \,
+#define Z_IS_1544_EQ_1544U(...)  \,
+#define Z_IS_1544U_EQ_1544U(...) \,
+#define Z_IS_1545_EQ_1545(...)   \,
+#define Z_IS_1545U_EQ_1545(...)  \,
+#define Z_IS_1545_EQ_1545U(...)  \,
+#define Z_IS_1545U_EQ_1545U(...) \,
+#define Z_IS_1546_EQ_1546(...)   \,
+#define Z_IS_1546U_EQ_1546(...)  \,
+#define Z_IS_1546_EQ_1546U(...)  \,
+#define Z_IS_1546U_EQ_1546U(...) \,
+#define Z_IS_1547_EQ_1547(...)   \,
+#define Z_IS_1547U_EQ_1547(...)  \,
+#define Z_IS_1547_EQ_1547U(...)  \,
+#define Z_IS_1547U_EQ_1547U(...) \,
+#define Z_IS_1548_EQ_1548(...)   \,
+#define Z_IS_1548U_EQ_1548(...)  \,
+#define Z_IS_1548_EQ_1548U(...)  \,
+#define Z_IS_1548U_EQ_1548U(...) \,
+#define Z_IS_1549_EQ_1549(...)   \,
+#define Z_IS_1549U_EQ_1549(...)  \,
+#define Z_IS_1549_EQ_1549U(...)  \,
+#define Z_IS_1549U_EQ_1549U(...) \,
+#define Z_IS_1550_EQ_1550(...)   \,
+#define Z_IS_1550U_EQ_1550(...)  \,
+#define Z_IS_1550_EQ_1550U(...)  \,
+#define Z_IS_1550U_EQ_1550U(...) \,
+#define Z_IS_1551_EQ_1551(...)   \,
+#define Z_IS_1551U_EQ_1551(...)  \,
+#define Z_IS_1551_EQ_1551U(...)  \,
+#define Z_IS_1551U_EQ_1551U(...) \,
+#define Z_IS_1552_EQ_1552(...)   \,
+#define Z_IS_1552U_EQ_1552(...)  \,
+#define Z_IS_1552_EQ_1552U(...)  \,
+#define Z_IS_1552U_EQ_1552U(...) \,
+#define Z_IS_1553_EQ_1553(...)   \,
+#define Z_IS_1553U_EQ_1553(...)  \,
+#define Z_IS_1553_EQ_1553U(...)  \,
+#define Z_IS_1553U_EQ_1553U(...) \,
+#define Z_IS_1554_EQ_1554(...)   \,
+#define Z_IS_1554U_EQ_1554(...)  \,
+#define Z_IS_1554_EQ_1554U(...)  \,
+#define Z_IS_1554U_EQ_1554U(...) \,
+#define Z_IS_1555_EQ_1555(...)   \,
+#define Z_IS_1555U_EQ_1555(...)  \,
+#define Z_IS_1555_EQ_1555U(...)  \,
+#define Z_IS_1555U_EQ_1555U(...) \,
+#define Z_IS_1556_EQ_1556(...)   \,
+#define Z_IS_1556U_EQ_1556(...)  \,
+#define Z_IS_1556_EQ_1556U(...)  \,
+#define Z_IS_1556U_EQ_1556U(...) \,
+#define Z_IS_1557_EQ_1557(...)   \,
+#define Z_IS_1557U_EQ_1557(...)  \,
+#define Z_IS_1557_EQ_1557U(...)  \,
+#define Z_IS_1557U_EQ_1557U(...) \,
+#define Z_IS_1558_EQ_1558(...)   \,
+#define Z_IS_1558U_EQ_1558(...)  \,
+#define Z_IS_1558_EQ_1558U(...)  \,
+#define Z_IS_1558U_EQ_1558U(...) \,
+#define Z_IS_1559_EQ_1559(...)   \,
+#define Z_IS_1559U_EQ_1559(...)  \,
+#define Z_IS_1559_EQ_1559U(...)  \,
+#define Z_IS_1559U_EQ_1559U(...) \,
+#define Z_IS_1560_EQ_1560(...)   \,
+#define Z_IS_1560U_EQ_1560(...)  \,
+#define Z_IS_1560_EQ_1560U(...)  \,
+#define Z_IS_1560U_EQ_1560U(...) \,
+#define Z_IS_1561_EQ_1561(...)   \,
+#define Z_IS_1561U_EQ_1561(...)  \,
+#define Z_IS_1561_EQ_1561U(...)  \,
+#define Z_IS_1561U_EQ_1561U(...) \,
+#define Z_IS_1562_EQ_1562(...)   \,
+#define Z_IS_1562U_EQ_1562(...)  \,
+#define Z_IS_1562_EQ_1562U(...)  \,
+#define Z_IS_1562U_EQ_1562U(...) \,
+#define Z_IS_1563_EQ_1563(...)   \,
+#define Z_IS_1563U_EQ_1563(...)  \,
+#define Z_IS_1563_EQ_1563U(...)  \,
+#define Z_IS_1563U_EQ_1563U(...) \,
+#define Z_IS_1564_EQ_1564(...)   \,
+#define Z_IS_1564U_EQ_1564(...)  \,
+#define Z_IS_1564_EQ_1564U(...)  \,
+#define Z_IS_1564U_EQ_1564U(...) \,
+#define Z_IS_1565_EQ_1565(...)   \,
+#define Z_IS_1565U_EQ_1565(...)  \,
+#define Z_IS_1565_EQ_1565U(...)  \,
+#define Z_IS_1565U_EQ_1565U(...) \,
+#define Z_IS_1566_EQ_1566(...)   \,
+#define Z_IS_1566U_EQ_1566(...)  \,
+#define Z_IS_1566_EQ_1566U(...)  \,
+#define Z_IS_1566U_EQ_1566U(...) \,
+#define Z_IS_1567_EQ_1567(...)   \,
+#define Z_IS_1567U_EQ_1567(...)  \,
+#define Z_IS_1567_EQ_1567U(...)  \,
+#define Z_IS_1567U_EQ_1567U(...) \,
+#define Z_IS_1568_EQ_1568(...)   \,
+#define Z_IS_1568U_EQ_1568(...)  \,
+#define Z_IS_1568_EQ_1568U(...)  \,
+#define Z_IS_1568U_EQ_1568U(...) \,
+#define Z_IS_1569_EQ_1569(...)   \,
+#define Z_IS_1569U_EQ_1569(...)  \,
+#define Z_IS_1569_EQ_1569U(...)  \,
+#define Z_IS_1569U_EQ_1569U(...) \,
+#define Z_IS_1570_EQ_1570(...)   \,
+#define Z_IS_1570U_EQ_1570(...)  \,
+#define Z_IS_1570_EQ_1570U(...)  \,
+#define Z_IS_1570U_EQ_1570U(...) \,
+#define Z_IS_1571_EQ_1571(...)   \,
+#define Z_IS_1571U_EQ_1571(...)  \,
+#define Z_IS_1571_EQ_1571U(...)  \,
+#define Z_IS_1571U_EQ_1571U(...) \,
+#define Z_IS_1572_EQ_1572(...)   \,
+#define Z_IS_1572U_EQ_1572(...)  \,
+#define Z_IS_1572_EQ_1572U(...)  \,
+#define Z_IS_1572U_EQ_1572U(...) \,
+#define Z_IS_1573_EQ_1573(...)   \,
+#define Z_IS_1573U_EQ_1573(...)  \,
+#define Z_IS_1573_EQ_1573U(...)  \,
+#define Z_IS_1573U_EQ_1573U(...) \,
+#define Z_IS_1574_EQ_1574(...)   \,
+#define Z_IS_1574U_EQ_1574(...)  \,
+#define Z_IS_1574_EQ_1574U(...)  \,
+#define Z_IS_1574U_EQ_1574U(...) \,
+#define Z_IS_1575_EQ_1575(...)   \,
+#define Z_IS_1575U_EQ_1575(...)  \,
+#define Z_IS_1575_EQ_1575U(...)  \,
+#define Z_IS_1575U_EQ_1575U(...) \,
+#define Z_IS_1576_EQ_1576(...)   \,
+#define Z_IS_1576U_EQ_1576(...)  \,
+#define Z_IS_1576_EQ_1576U(...)  \,
+#define Z_IS_1576U_EQ_1576U(...) \,
+#define Z_IS_1577_EQ_1577(...)   \,
+#define Z_IS_1577U_EQ_1577(...)  \,
+#define Z_IS_1577_EQ_1577U(...)  \,
+#define Z_IS_1577U_EQ_1577U(...) \,
+#define Z_IS_1578_EQ_1578(...)   \,
+#define Z_IS_1578U_EQ_1578(...)  \,
+#define Z_IS_1578_EQ_1578U(...)  \,
+#define Z_IS_1578U_EQ_1578U(...) \,
+#define Z_IS_1579_EQ_1579(...)   \,
+#define Z_IS_1579U_EQ_1579(...)  \,
+#define Z_IS_1579_EQ_1579U(...)  \,
+#define Z_IS_1579U_EQ_1579U(...) \,
+#define Z_IS_1580_EQ_1580(...)   \,
+#define Z_IS_1580U_EQ_1580(...)  \,
+#define Z_IS_1580_EQ_1580U(...)  \,
+#define Z_IS_1580U_EQ_1580U(...) \,
+#define Z_IS_1581_EQ_1581(...)   \,
+#define Z_IS_1581U_EQ_1581(...)  \,
+#define Z_IS_1581_EQ_1581U(...)  \,
+#define Z_IS_1581U_EQ_1581U(...) \,
+#define Z_IS_1582_EQ_1582(...)   \,
+#define Z_IS_1582U_EQ_1582(...)  \,
+#define Z_IS_1582_EQ_1582U(...)  \,
+#define Z_IS_1582U_EQ_1582U(...) \,
+#define Z_IS_1583_EQ_1583(...)   \,
+#define Z_IS_1583U_EQ_1583(...)  \,
+#define Z_IS_1583_EQ_1583U(...)  \,
+#define Z_IS_1583U_EQ_1583U(...) \,
+#define Z_IS_1584_EQ_1584(...)   \,
+#define Z_IS_1584U_EQ_1584(...)  \,
+#define Z_IS_1584_EQ_1584U(...)  \,
+#define Z_IS_1584U_EQ_1584U(...) \,
+#define Z_IS_1585_EQ_1585(...)   \,
+#define Z_IS_1585U_EQ_1585(...)  \,
+#define Z_IS_1585_EQ_1585U(...)  \,
+#define Z_IS_1585U_EQ_1585U(...) \,
+#define Z_IS_1586_EQ_1586(...)   \,
+#define Z_IS_1586U_EQ_1586(...)  \,
+#define Z_IS_1586_EQ_1586U(...)  \,
+#define Z_IS_1586U_EQ_1586U(...) \,
+#define Z_IS_1587_EQ_1587(...)   \,
+#define Z_IS_1587U_EQ_1587(...)  \,
+#define Z_IS_1587_EQ_1587U(...)  \,
+#define Z_IS_1587U_EQ_1587U(...) \,
+#define Z_IS_1588_EQ_1588(...)   \,
+#define Z_IS_1588U_EQ_1588(...)  \,
+#define Z_IS_1588_EQ_1588U(...)  \,
+#define Z_IS_1588U_EQ_1588U(...) \,
+#define Z_IS_1589_EQ_1589(...)   \,
+#define Z_IS_1589U_EQ_1589(...)  \,
+#define Z_IS_1589_EQ_1589U(...)  \,
+#define Z_IS_1589U_EQ_1589U(...) \,
+#define Z_IS_1590_EQ_1590(...)   \,
+#define Z_IS_1590U_EQ_1590(...)  \,
+#define Z_IS_1590_EQ_1590U(...)  \,
+#define Z_IS_1590U_EQ_1590U(...) \,
+#define Z_IS_1591_EQ_1591(...)   \,
+#define Z_IS_1591U_EQ_1591(...)  \,
+#define Z_IS_1591_EQ_1591U(...)  \,
+#define Z_IS_1591U_EQ_1591U(...) \,
+#define Z_IS_1592_EQ_1592(...)   \,
+#define Z_IS_1592U_EQ_1592(...)  \,
+#define Z_IS_1592_EQ_1592U(...)  \,
+#define Z_IS_1592U_EQ_1592U(...) \,
+#define Z_IS_1593_EQ_1593(...)   \,
+#define Z_IS_1593U_EQ_1593(...)  \,
+#define Z_IS_1593_EQ_1593U(...)  \,
+#define Z_IS_1593U_EQ_1593U(...) \,
+#define Z_IS_1594_EQ_1594(...)   \,
+#define Z_IS_1594U_EQ_1594(...)  \,
+#define Z_IS_1594_EQ_1594U(...)  \,
+#define Z_IS_1594U_EQ_1594U(...) \,
+#define Z_IS_1595_EQ_1595(...)   \,
+#define Z_IS_1595U_EQ_1595(...)  \,
+#define Z_IS_1595_EQ_1595U(...)  \,
+#define Z_IS_1595U_EQ_1595U(...) \,
+#define Z_IS_1596_EQ_1596(...)   \,
+#define Z_IS_1596U_EQ_1596(...)  \,
+#define Z_IS_1596_EQ_1596U(...)  \,
+#define Z_IS_1596U_EQ_1596U(...) \,
+#define Z_IS_1597_EQ_1597(...)   \,
+#define Z_IS_1597U_EQ_1597(...)  \,
+#define Z_IS_1597_EQ_1597U(...)  \,
+#define Z_IS_1597U_EQ_1597U(...) \,
+#define Z_IS_1598_EQ_1598(...)   \,
+#define Z_IS_1598U_EQ_1598(...)  \,
+#define Z_IS_1598_EQ_1598U(...)  \,
+#define Z_IS_1598U_EQ_1598U(...) \,
+#define Z_IS_1599_EQ_1599(...)   \,
+#define Z_IS_1599U_EQ_1599(...)  \,
+#define Z_IS_1599_EQ_1599U(...)  \,
+#define Z_IS_1599U_EQ_1599U(...) \,
+#define Z_IS_1600_EQ_1600(...)   \,
+#define Z_IS_1600U_EQ_1600(...)  \,
+#define Z_IS_1600_EQ_1600U(...)  \,
+#define Z_IS_1600U_EQ_1600U(...) \,
+#define Z_IS_1601_EQ_1601(...)   \,
+#define Z_IS_1601U_EQ_1601(...)  \,
+#define Z_IS_1601_EQ_1601U(...)  \,
+#define Z_IS_1601U_EQ_1601U(...) \,
+#define Z_IS_1602_EQ_1602(...)   \,
+#define Z_IS_1602U_EQ_1602(...)  \,
+#define Z_IS_1602_EQ_1602U(...)  \,
+#define Z_IS_1602U_EQ_1602U(...) \,
+#define Z_IS_1603_EQ_1603(...)   \,
+#define Z_IS_1603U_EQ_1603(...)  \,
+#define Z_IS_1603_EQ_1603U(...)  \,
+#define Z_IS_1603U_EQ_1603U(...) \,
+#define Z_IS_1604_EQ_1604(...)   \,
+#define Z_IS_1604U_EQ_1604(...)  \,
+#define Z_IS_1604_EQ_1604U(...)  \,
+#define Z_IS_1604U_EQ_1604U(...) \,
+#define Z_IS_1605_EQ_1605(...)   \,
+#define Z_IS_1605U_EQ_1605(...)  \,
+#define Z_IS_1605_EQ_1605U(...)  \,
+#define Z_IS_1605U_EQ_1605U(...) \,
+#define Z_IS_1606_EQ_1606(...)   \,
+#define Z_IS_1606U_EQ_1606(...)  \,
+#define Z_IS_1606_EQ_1606U(...)  \,
+#define Z_IS_1606U_EQ_1606U(...) \,
+#define Z_IS_1607_EQ_1607(...)   \,
+#define Z_IS_1607U_EQ_1607(...)  \,
+#define Z_IS_1607_EQ_1607U(...)  \,
+#define Z_IS_1607U_EQ_1607U(...) \,
+#define Z_IS_1608_EQ_1608(...)   \,
+#define Z_IS_1608U_EQ_1608(...)  \,
+#define Z_IS_1608_EQ_1608U(...)  \,
+#define Z_IS_1608U_EQ_1608U(...) \,
+#define Z_IS_1609_EQ_1609(...)   \,
+#define Z_IS_1609U_EQ_1609(...)  \,
+#define Z_IS_1609_EQ_1609U(...)  \,
+#define Z_IS_1609U_EQ_1609U(...) \,
+#define Z_IS_1610_EQ_1610(...)   \,
+#define Z_IS_1610U_EQ_1610(...)  \,
+#define Z_IS_1610_EQ_1610U(...)  \,
+#define Z_IS_1610U_EQ_1610U(...) \,
+#define Z_IS_1611_EQ_1611(...)   \,
+#define Z_IS_1611U_EQ_1611(...)  \,
+#define Z_IS_1611_EQ_1611U(...)  \,
+#define Z_IS_1611U_EQ_1611U(...) \,
+#define Z_IS_1612_EQ_1612(...)   \,
+#define Z_IS_1612U_EQ_1612(...)  \,
+#define Z_IS_1612_EQ_1612U(...)  \,
+#define Z_IS_1612U_EQ_1612U(...) \,
+#define Z_IS_1613_EQ_1613(...)   \,
+#define Z_IS_1613U_EQ_1613(...)  \,
+#define Z_IS_1613_EQ_1613U(...)  \,
+#define Z_IS_1613U_EQ_1613U(...) \,
+#define Z_IS_1614_EQ_1614(...)   \,
+#define Z_IS_1614U_EQ_1614(...)  \,
+#define Z_IS_1614_EQ_1614U(...)  \,
+#define Z_IS_1614U_EQ_1614U(...) \,
+#define Z_IS_1615_EQ_1615(...)   \,
+#define Z_IS_1615U_EQ_1615(...)  \,
+#define Z_IS_1615_EQ_1615U(...)  \,
+#define Z_IS_1615U_EQ_1615U(...) \,
+#define Z_IS_1616_EQ_1616(...)   \,
+#define Z_IS_1616U_EQ_1616(...)  \,
+#define Z_IS_1616_EQ_1616U(...)  \,
+#define Z_IS_1616U_EQ_1616U(...) \,
+#define Z_IS_1617_EQ_1617(...)   \,
+#define Z_IS_1617U_EQ_1617(...)  \,
+#define Z_IS_1617_EQ_1617U(...)  \,
+#define Z_IS_1617U_EQ_1617U(...) \,
+#define Z_IS_1618_EQ_1618(...)   \,
+#define Z_IS_1618U_EQ_1618(...)  \,
+#define Z_IS_1618_EQ_1618U(...)  \,
+#define Z_IS_1618U_EQ_1618U(...) \,
+#define Z_IS_1619_EQ_1619(...)   \,
+#define Z_IS_1619U_EQ_1619(...)  \,
+#define Z_IS_1619_EQ_1619U(...)  \,
+#define Z_IS_1619U_EQ_1619U(...) \,
+#define Z_IS_1620_EQ_1620(...)   \,
+#define Z_IS_1620U_EQ_1620(...)  \,
+#define Z_IS_1620_EQ_1620U(...)  \,
+#define Z_IS_1620U_EQ_1620U(...) \,
+#define Z_IS_1621_EQ_1621(...)   \,
+#define Z_IS_1621U_EQ_1621(...)  \,
+#define Z_IS_1621_EQ_1621U(...)  \,
+#define Z_IS_1621U_EQ_1621U(...) \,
+#define Z_IS_1622_EQ_1622(...)   \,
+#define Z_IS_1622U_EQ_1622(...)  \,
+#define Z_IS_1622_EQ_1622U(...)  \,
+#define Z_IS_1622U_EQ_1622U(...) \,
+#define Z_IS_1623_EQ_1623(...)   \,
+#define Z_IS_1623U_EQ_1623(...)  \,
+#define Z_IS_1623_EQ_1623U(...)  \,
+#define Z_IS_1623U_EQ_1623U(...) \,
+#define Z_IS_1624_EQ_1624(...)   \,
+#define Z_IS_1624U_EQ_1624(...)  \,
+#define Z_IS_1624_EQ_1624U(...)  \,
+#define Z_IS_1624U_EQ_1624U(...) \,
+#define Z_IS_1625_EQ_1625(...)   \,
+#define Z_IS_1625U_EQ_1625(...)  \,
+#define Z_IS_1625_EQ_1625U(...)  \,
+#define Z_IS_1625U_EQ_1625U(...) \,
+#define Z_IS_1626_EQ_1626(...)   \,
+#define Z_IS_1626U_EQ_1626(...)  \,
+#define Z_IS_1626_EQ_1626U(...)  \,
+#define Z_IS_1626U_EQ_1626U(...) \,
+#define Z_IS_1627_EQ_1627(...)   \,
+#define Z_IS_1627U_EQ_1627(...)  \,
+#define Z_IS_1627_EQ_1627U(...)  \,
+#define Z_IS_1627U_EQ_1627U(...) \,
+#define Z_IS_1628_EQ_1628(...)   \,
+#define Z_IS_1628U_EQ_1628(...)  \,
+#define Z_IS_1628_EQ_1628U(...)  \,
+#define Z_IS_1628U_EQ_1628U(...) \,
+#define Z_IS_1629_EQ_1629(...)   \,
+#define Z_IS_1629U_EQ_1629(...)  \,
+#define Z_IS_1629_EQ_1629U(...)  \,
+#define Z_IS_1629U_EQ_1629U(...) \,
+#define Z_IS_1630_EQ_1630(...)   \,
+#define Z_IS_1630U_EQ_1630(...)  \,
+#define Z_IS_1630_EQ_1630U(...)  \,
+#define Z_IS_1630U_EQ_1630U(...) \,
+#define Z_IS_1631_EQ_1631(...)   \,
+#define Z_IS_1631U_EQ_1631(...)  \,
+#define Z_IS_1631_EQ_1631U(...)  \,
+#define Z_IS_1631U_EQ_1631U(...) \,
+#define Z_IS_1632_EQ_1632(...)   \,
+#define Z_IS_1632U_EQ_1632(...)  \,
+#define Z_IS_1632_EQ_1632U(...)  \,
+#define Z_IS_1632U_EQ_1632U(...) \,
+#define Z_IS_1633_EQ_1633(...)   \,
+#define Z_IS_1633U_EQ_1633(...)  \,
+#define Z_IS_1633_EQ_1633U(...)  \,
+#define Z_IS_1633U_EQ_1633U(...) \,
+#define Z_IS_1634_EQ_1634(...)   \,
+#define Z_IS_1634U_EQ_1634(...)  \,
+#define Z_IS_1634_EQ_1634U(...)  \,
+#define Z_IS_1634U_EQ_1634U(...) \,
+#define Z_IS_1635_EQ_1635(...)   \,
+#define Z_IS_1635U_EQ_1635(...)  \,
+#define Z_IS_1635_EQ_1635U(...)  \,
+#define Z_IS_1635U_EQ_1635U(...) \,
+#define Z_IS_1636_EQ_1636(...)   \,
+#define Z_IS_1636U_EQ_1636(...)  \,
+#define Z_IS_1636_EQ_1636U(...)  \,
+#define Z_IS_1636U_EQ_1636U(...) \,
+#define Z_IS_1637_EQ_1637(...)   \,
+#define Z_IS_1637U_EQ_1637(...)  \,
+#define Z_IS_1637_EQ_1637U(...)  \,
+#define Z_IS_1637U_EQ_1637U(...) \,
+#define Z_IS_1638_EQ_1638(...)   \,
+#define Z_IS_1638U_EQ_1638(...)  \,
+#define Z_IS_1638_EQ_1638U(...)  \,
+#define Z_IS_1638U_EQ_1638U(...) \,
+#define Z_IS_1639_EQ_1639(...)   \,
+#define Z_IS_1639U_EQ_1639(...)  \,
+#define Z_IS_1639_EQ_1639U(...)  \,
+#define Z_IS_1639U_EQ_1639U(...) \,
+#define Z_IS_1640_EQ_1640(...)   \,
+#define Z_IS_1640U_EQ_1640(...)  \,
+#define Z_IS_1640_EQ_1640U(...)  \,
+#define Z_IS_1640U_EQ_1640U(...) \,
+#define Z_IS_1641_EQ_1641(...)   \,
+#define Z_IS_1641U_EQ_1641(...)  \,
+#define Z_IS_1641_EQ_1641U(...)  \,
+#define Z_IS_1641U_EQ_1641U(...) \,
+#define Z_IS_1642_EQ_1642(...)   \,
+#define Z_IS_1642U_EQ_1642(...)  \,
+#define Z_IS_1642_EQ_1642U(...)  \,
+#define Z_IS_1642U_EQ_1642U(...) \,
+#define Z_IS_1643_EQ_1643(...)   \,
+#define Z_IS_1643U_EQ_1643(...)  \,
+#define Z_IS_1643_EQ_1643U(...)  \,
+#define Z_IS_1643U_EQ_1643U(...) \,
+#define Z_IS_1644_EQ_1644(...)   \,
+#define Z_IS_1644U_EQ_1644(...)  \,
+#define Z_IS_1644_EQ_1644U(...)  \,
+#define Z_IS_1644U_EQ_1644U(...) \,
+#define Z_IS_1645_EQ_1645(...)   \,
+#define Z_IS_1645U_EQ_1645(...)  \,
+#define Z_IS_1645_EQ_1645U(...)  \,
+#define Z_IS_1645U_EQ_1645U(...) \,
+#define Z_IS_1646_EQ_1646(...)   \,
+#define Z_IS_1646U_EQ_1646(...)  \,
+#define Z_IS_1646_EQ_1646U(...)  \,
+#define Z_IS_1646U_EQ_1646U(...) \,
+#define Z_IS_1647_EQ_1647(...)   \,
+#define Z_IS_1647U_EQ_1647(...)  \,
+#define Z_IS_1647_EQ_1647U(...)  \,
+#define Z_IS_1647U_EQ_1647U(...) \,
+#define Z_IS_1648_EQ_1648(...)   \,
+#define Z_IS_1648U_EQ_1648(...)  \,
+#define Z_IS_1648_EQ_1648U(...)  \,
+#define Z_IS_1648U_EQ_1648U(...) \,
+#define Z_IS_1649_EQ_1649(...)   \,
+#define Z_IS_1649U_EQ_1649(...)  \,
+#define Z_IS_1649_EQ_1649U(...)  \,
+#define Z_IS_1649U_EQ_1649U(...) \,
+#define Z_IS_1650_EQ_1650(...)   \,
+#define Z_IS_1650U_EQ_1650(...)  \,
+#define Z_IS_1650_EQ_1650U(...)  \,
+#define Z_IS_1650U_EQ_1650U(...) \,
+#define Z_IS_1651_EQ_1651(...)   \,
+#define Z_IS_1651U_EQ_1651(...)  \,
+#define Z_IS_1651_EQ_1651U(...)  \,
+#define Z_IS_1651U_EQ_1651U(...) \,
+#define Z_IS_1652_EQ_1652(...)   \,
+#define Z_IS_1652U_EQ_1652(...)  \,
+#define Z_IS_1652_EQ_1652U(...)  \,
+#define Z_IS_1652U_EQ_1652U(...) \,
+#define Z_IS_1653_EQ_1653(...)   \,
+#define Z_IS_1653U_EQ_1653(...)  \,
+#define Z_IS_1653_EQ_1653U(...)  \,
+#define Z_IS_1653U_EQ_1653U(...) \,
+#define Z_IS_1654_EQ_1654(...)   \,
+#define Z_IS_1654U_EQ_1654(...)  \,
+#define Z_IS_1654_EQ_1654U(...)  \,
+#define Z_IS_1654U_EQ_1654U(...) \,
+#define Z_IS_1655_EQ_1655(...)   \,
+#define Z_IS_1655U_EQ_1655(...)  \,
+#define Z_IS_1655_EQ_1655U(...)  \,
+#define Z_IS_1655U_EQ_1655U(...) \,
+#define Z_IS_1656_EQ_1656(...)   \,
+#define Z_IS_1656U_EQ_1656(...)  \,
+#define Z_IS_1656_EQ_1656U(...)  \,
+#define Z_IS_1656U_EQ_1656U(...) \,
+#define Z_IS_1657_EQ_1657(...)   \,
+#define Z_IS_1657U_EQ_1657(...)  \,
+#define Z_IS_1657_EQ_1657U(...)  \,
+#define Z_IS_1657U_EQ_1657U(...) \,
+#define Z_IS_1658_EQ_1658(...)   \,
+#define Z_IS_1658U_EQ_1658(...)  \,
+#define Z_IS_1658_EQ_1658U(...)  \,
+#define Z_IS_1658U_EQ_1658U(...) \,
+#define Z_IS_1659_EQ_1659(...)   \,
+#define Z_IS_1659U_EQ_1659(...)  \,
+#define Z_IS_1659_EQ_1659U(...)  \,
+#define Z_IS_1659U_EQ_1659U(...) \,
+#define Z_IS_1660_EQ_1660(...)   \,
+#define Z_IS_1660U_EQ_1660(...)  \,
+#define Z_IS_1660_EQ_1660U(...)  \,
+#define Z_IS_1660U_EQ_1660U(...) \,
+#define Z_IS_1661_EQ_1661(...)   \,
+#define Z_IS_1661U_EQ_1661(...)  \,
+#define Z_IS_1661_EQ_1661U(...)  \,
+#define Z_IS_1661U_EQ_1661U(...) \,
+#define Z_IS_1662_EQ_1662(...)   \,
+#define Z_IS_1662U_EQ_1662(...)  \,
+#define Z_IS_1662_EQ_1662U(...)  \,
+#define Z_IS_1662U_EQ_1662U(...) \,
+#define Z_IS_1663_EQ_1663(...)   \,
+#define Z_IS_1663U_EQ_1663(...)  \,
+#define Z_IS_1663_EQ_1663U(...)  \,
+#define Z_IS_1663U_EQ_1663U(...) \,
+#define Z_IS_1664_EQ_1664(...)   \,
+#define Z_IS_1664U_EQ_1664(...)  \,
+#define Z_IS_1664_EQ_1664U(...)  \,
+#define Z_IS_1664U_EQ_1664U(...) \,
+#define Z_IS_1665_EQ_1665(...)   \,
+#define Z_IS_1665U_EQ_1665(...)  \,
+#define Z_IS_1665_EQ_1665U(...)  \,
+#define Z_IS_1665U_EQ_1665U(...) \,
+#define Z_IS_1666_EQ_1666(...)   \,
+#define Z_IS_1666U_EQ_1666(...)  \,
+#define Z_IS_1666_EQ_1666U(...)  \,
+#define Z_IS_1666U_EQ_1666U(...) \,
+#define Z_IS_1667_EQ_1667(...)   \,
+#define Z_IS_1667U_EQ_1667(...)  \,
+#define Z_IS_1667_EQ_1667U(...)  \,
+#define Z_IS_1667U_EQ_1667U(...) \,
+#define Z_IS_1668_EQ_1668(...)   \,
+#define Z_IS_1668U_EQ_1668(...)  \,
+#define Z_IS_1668_EQ_1668U(...)  \,
+#define Z_IS_1668U_EQ_1668U(...) \,
+#define Z_IS_1669_EQ_1669(...)   \,
+#define Z_IS_1669U_EQ_1669(...)  \,
+#define Z_IS_1669_EQ_1669U(...)  \,
+#define Z_IS_1669U_EQ_1669U(...) \,
+#define Z_IS_1670_EQ_1670(...)   \,
+#define Z_IS_1670U_EQ_1670(...)  \,
+#define Z_IS_1670_EQ_1670U(...)  \,
+#define Z_IS_1670U_EQ_1670U(...) \,
+#define Z_IS_1671_EQ_1671(...)   \,
+#define Z_IS_1671U_EQ_1671(...)  \,
+#define Z_IS_1671_EQ_1671U(...)  \,
+#define Z_IS_1671U_EQ_1671U(...) \,
+#define Z_IS_1672_EQ_1672(...)   \,
+#define Z_IS_1672U_EQ_1672(...)  \,
+#define Z_IS_1672_EQ_1672U(...)  \,
+#define Z_IS_1672U_EQ_1672U(...) \,
+#define Z_IS_1673_EQ_1673(...)   \,
+#define Z_IS_1673U_EQ_1673(...)  \,
+#define Z_IS_1673_EQ_1673U(...)  \,
+#define Z_IS_1673U_EQ_1673U(...) \,
+#define Z_IS_1674_EQ_1674(...)   \,
+#define Z_IS_1674U_EQ_1674(...)  \,
+#define Z_IS_1674_EQ_1674U(...)  \,
+#define Z_IS_1674U_EQ_1674U(...) \,
+#define Z_IS_1675_EQ_1675(...)   \,
+#define Z_IS_1675U_EQ_1675(...)  \,
+#define Z_IS_1675_EQ_1675U(...)  \,
+#define Z_IS_1675U_EQ_1675U(...) \,
+#define Z_IS_1676_EQ_1676(...)   \,
+#define Z_IS_1676U_EQ_1676(...)  \,
+#define Z_IS_1676_EQ_1676U(...)  \,
+#define Z_IS_1676U_EQ_1676U(...) \,
+#define Z_IS_1677_EQ_1677(...)   \,
+#define Z_IS_1677U_EQ_1677(...)  \,
+#define Z_IS_1677_EQ_1677U(...)  \,
+#define Z_IS_1677U_EQ_1677U(...) \,
+#define Z_IS_1678_EQ_1678(...)   \,
+#define Z_IS_1678U_EQ_1678(...)  \,
+#define Z_IS_1678_EQ_1678U(...)  \,
+#define Z_IS_1678U_EQ_1678U(...) \,
+#define Z_IS_1679_EQ_1679(...)   \,
+#define Z_IS_1679U_EQ_1679(...)  \,
+#define Z_IS_1679_EQ_1679U(...)  \,
+#define Z_IS_1679U_EQ_1679U(...) \,
+#define Z_IS_1680_EQ_1680(...)   \,
+#define Z_IS_1680U_EQ_1680(...)  \,
+#define Z_IS_1680_EQ_1680U(...)  \,
+#define Z_IS_1680U_EQ_1680U(...) \,
+#define Z_IS_1681_EQ_1681(...)   \,
+#define Z_IS_1681U_EQ_1681(...)  \,
+#define Z_IS_1681_EQ_1681U(...)  \,
+#define Z_IS_1681U_EQ_1681U(...) \,
+#define Z_IS_1682_EQ_1682(...)   \,
+#define Z_IS_1682U_EQ_1682(...)  \,
+#define Z_IS_1682_EQ_1682U(...)  \,
+#define Z_IS_1682U_EQ_1682U(...) \,
+#define Z_IS_1683_EQ_1683(...)   \,
+#define Z_IS_1683U_EQ_1683(...)  \,
+#define Z_IS_1683_EQ_1683U(...)  \,
+#define Z_IS_1683U_EQ_1683U(...) \,
+#define Z_IS_1684_EQ_1684(...)   \,
+#define Z_IS_1684U_EQ_1684(...)  \,
+#define Z_IS_1684_EQ_1684U(...)  \,
+#define Z_IS_1684U_EQ_1684U(...) \,
+#define Z_IS_1685_EQ_1685(...)   \,
+#define Z_IS_1685U_EQ_1685(...)  \,
+#define Z_IS_1685_EQ_1685U(...)  \,
+#define Z_IS_1685U_EQ_1685U(...) \,
+#define Z_IS_1686_EQ_1686(...)   \,
+#define Z_IS_1686U_EQ_1686(...)  \,
+#define Z_IS_1686_EQ_1686U(...)  \,
+#define Z_IS_1686U_EQ_1686U(...) \,
+#define Z_IS_1687_EQ_1687(...)   \,
+#define Z_IS_1687U_EQ_1687(...)  \,
+#define Z_IS_1687_EQ_1687U(...)  \,
+#define Z_IS_1687U_EQ_1687U(...) \,
+#define Z_IS_1688_EQ_1688(...)   \,
+#define Z_IS_1688U_EQ_1688(...)  \,
+#define Z_IS_1688_EQ_1688U(...)  \,
+#define Z_IS_1688U_EQ_1688U(...) \,
+#define Z_IS_1689_EQ_1689(...)   \,
+#define Z_IS_1689U_EQ_1689(...)  \,
+#define Z_IS_1689_EQ_1689U(...)  \,
+#define Z_IS_1689U_EQ_1689U(...) \,
+#define Z_IS_1690_EQ_1690(...)   \,
+#define Z_IS_1690U_EQ_1690(...)  \,
+#define Z_IS_1690_EQ_1690U(...)  \,
+#define Z_IS_1690U_EQ_1690U(...) \,
+#define Z_IS_1691_EQ_1691(...)   \,
+#define Z_IS_1691U_EQ_1691(...)  \,
+#define Z_IS_1691_EQ_1691U(...)  \,
+#define Z_IS_1691U_EQ_1691U(...) \,
+#define Z_IS_1692_EQ_1692(...)   \,
+#define Z_IS_1692U_EQ_1692(...)  \,
+#define Z_IS_1692_EQ_1692U(...)  \,
+#define Z_IS_1692U_EQ_1692U(...) \,
+#define Z_IS_1693_EQ_1693(...)   \,
+#define Z_IS_1693U_EQ_1693(...)  \,
+#define Z_IS_1693_EQ_1693U(...)  \,
+#define Z_IS_1693U_EQ_1693U(...) \,
+#define Z_IS_1694_EQ_1694(...)   \,
+#define Z_IS_1694U_EQ_1694(...)  \,
+#define Z_IS_1694_EQ_1694U(...)  \,
+#define Z_IS_1694U_EQ_1694U(...) \,
+#define Z_IS_1695_EQ_1695(...)   \,
+#define Z_IS_1695U_EQ_1695(...)  \,
+#define Z_IS_1695_EQ_1695U(...)  \,
+#define Z_IS_1695U_EQ_1695U(...) \,
+#define Z_IS_1696_EQ_1696(...)   \,
+#define Z_IS_1696U_EQ_1696(...)  \,
+#define Z_IS_1696_EQ_1696U(...)  \,
+#define Z_IS_1696U_EQ_1696U(...) \,
+#define Z_IS_1697_EQ_1697(...)   \,
+#define Z_IS_1697U_EQ_1697(...)  \,
+#define Z_IS_1697_EQ_1697U(...)  \,
+#define Z_IS_1697U_EQ_1697U(...) \,
+#define Z_IS_1698_EQ_1698(...)   \,
+#define Z_IS_1698U_EQ_1698(...)  \,
+#define Z_IS_1698_EQ_1698U(...)  \,
+#define Z_IS_1698U_EQ_1698U(...) \,
+#define Z_IS_1699_EQ_1699(...)   \,
+#define Z_IS_1699U_EQ_1699(...)  \,
+#define Z_IS_1699_EQ_1699U(...)  \,
+#define Z_IS_1699U_EQ_1699U(...) \,
+#define Z_IS_1700_EQ_1700(...)   \,
+#define Z_IS_1700U_EQ_1700(...)  \,
+#define Z_IS_1700_EQ_1700U(...)  \,
+#define Z_IS_1700U_EQ_1700U(...) \,
+#define Z_IS_1701_EQ_1701(...)   \,
+#define Z_IS_1701U_EQ_1701(...)  \,
+#define Z_IS_1701_EQ_1701U(...)  \,
+#define Z_IS_1701U_EQ_1701U(...) \,
+#define Z_IS_1702_EQ_1702(...)   \,
+#define Z_IS_1702U_EQ_1702(...)  \,
+#define Z_IS_1702_EQ_1702U(...)  \,
+#define Z_IS_1702U_EQ_1702U(...) \,
+#define Z_IS_1703_EQ_1703(...)   \,
+#define Z_IS_1703U_EQ_1703(...)  \,
+#define Z_IS_1703_EQ_1703U(...)  \,
+#define Z_IS_1703U_EQ_1703U(...) \,
+#define Z_IS_1704_EQ_1704(...)   \,
+#define Z_IS_1704U_EQ_1704(...)  \,
+#define Z_IS_1704_EQ_1704U(...)  \,
+#define Z_IS_1704U_EQ_1704U(...) \,
+#define Z_IS_1705_EQ_1705(...)   \,
+#define Z_IS_1705U_EQ_1705(...)  \,
+#define Z_IS_1705_EQ_1705U(...)  \,
+#define Z_IS_1705U_EQ_1705U(...) \,
+#define Z_IS_1706_EQ_1706(...)   \,
+#define Z_IS_1706U_EQ_1706(...)  \,
+#define Z_IS_1706_EQ_1706U(...)  \,
+#define Z_IS_1706U_EQ_1706U(...) \,
+#define Z_IS_1707_EQ_1707(...)   \,
+#define Z_IS_1707U_EQ_1707(...)  \,
+#define Z_IS_1707_EQ_1707U(...)  \,
+#define Z_IS_1707U_EQ_1707U(...) \,
+#define Z_IS_1708_EQ_1708(...)   \,
+#define Z_IS_1708U_EQ_1708(...)  \,
+#define Z_IS_1708_EQ_1708U(...)  \,
+#define Z_IS_1708U_EQ_1708U(...) \,
+#define Z_IS_1709_EQ_1709(...)   \,
+#define Z_IS_1709U_EQ_1709(...)  \,
+#define Z_IS_1709_EQ_1709U(...)  \,
+#define Z_IS_1709U_EQ_1709U(...) \,
+#define Z_IS_1710_EQ_1710(...)   \,
+#define Z_IS_1710U_EQ_1710(...)  \,
+#define Z_IS_1710_EQ_1710U(...)  \,
+#define Z_IS_1710U_EQ_1710U(...) \,
+#define Z_IS_1711_EQ_1711(...)   \,
+#define Z_IS_1711U_EQ_1711(...)  \,
+#define Z_IS_1711_EQ_1711U(...)  \,
+#define Z_IS_1711U_EQ_1711U(...) \,
+#define Z_IS_1712_EQ_1712(...)   \,
+#define Z_IS_1712U_EQ_1712(...)  \,
+#define Z_IS_1712_EQ_1712U(...)  \,
+#define Z_IS_1712U_EQ_1712U(...) \,
+#define Z_IS_1713_EQ_1713(...)   \,
+#define Z_IS_1713U_EQ_1713(...)  \,
+#define Z_IS_1713_EQ_1713U(...)  \,
+#define Z_IS_1713U_EQ_1713U(...) \,
+#define Z_IS_1714_EQ_1714(...)   \,
+#define Z_IS_1714U_EQ_1714(...)  \,
+#define Z_IS_1714_EQ_1714U(...)  \,
+#define Z_IS_1714U_EQ_1714U(...) \,
+#define Z_IS_1715_EQ_1715(...)   \,
+#define Z_IS_1715U_EQ_1715(...)  \,
+#define Z_IS_1715_EQ_1715U(...)  \,
+#define Z_IS_1715U_EQ_1715U(...) \,
+#define Z_IS_1716_EQ_1716(...)   \,
+#define Z_IS_1716U_EQ_1716(...)  \,
+#define Z_IS_1716_EQ_1716U(...)  \,
+#define Z_IS_1716U_EQ_1716U(...) \,
+#define Z_IS_1717_EQ_1717(...)   \,
+#define Z_IS_1717U_EQ_1717(...)  \,
+#define Z_IS_1717_EQ_1717U(...)  \,
+#define Z_IS_1717U_EQ_1717U(...) \,
+#define Z_IS_1718_EQ_1718(...)   \,
+#define Z_IS_1718U_EQ_1718(...)  \,
+#define Z_IS_1718_EQ_1718U(...)  \,
+#define Z_IS_1718U_EQ_1718U(...) \,
+#define Z_IS_1719_EQ_1719(...)   \,
+#define Z_IS_1719U_EQ_1719(...)  \,
+#define Z_IS_1719_EQ_1719U(...)  \,
+#define Z_IS_1719U_EQ_1719U(...) \,
+#define Z_IS_1720_EQ_1720(...)   \,
+#define Z_IS_1720U_EQ_1720(...)  \,
+#define Z_IS_1720_EQ_1720U(...)  \,
+#define Z_IS_1720U_EQ_1720U(...) \,
+#define Z_IS_1721_EQ_1721(...)   \,
+#define Z_IS_1721U_EQ_1721(...)  \,
+#define Z_IS_1721_EQ_1721U(...)  \,
+#define Z_IS_1721U_EQ_1721U(...) \,
+#define Z_IS_1722_EQ_1722(...)   \,
+#define Z_IS_1722U_EQ_1722(...)  \,
+#define Z_IS_1722_EQ_1722U(...)  \,
+#define Z_IS_1722U_EQ_1722U(...) \,
+#define Z_IS_1723_EQ_1723(...)   \,
+#define Z_IS_1723U_EQ_1723(...)  \,
+#define Z_IS_1723_EQ_1723U(...)  \,
+#define Z_IS_1723U_EQ_1723U(...) \,
+#define Z_IS_1724_EQ_1724(...)   \,
+#define Z_IS_1724U_EQ_1724(...)  \,
+#define Z_IS_1724_EQ_1724U(...)  \,
+#define Z_IS_1724U_EQ_1724U(...) \,
+#define Z_IS_1725_EQ_1725(...)   \,
+#define Z_IS_1725U_EQ_1725(...)  \,
+#define Z_IS_1725_EQ_1725U(...)  \,
+#define Z_IS_1725U_EQ_1725U(...) \,
+#define Z_IS_1726_EQ_1726(...)   \,
+#define Z_IS_1726U_EQ_1726(...)  \,
+#define Z_IS_1726_EQ_1726U(...)  \,
+#define Z_IS_1726U_EQ_1726U(...) \,
+#define Z_IS_1727_EQ_1727(...)   \,
+#define Z_IS_1727U_EQ_1727(...)  \,
+#define Z_IS_1727_EQ_1727U(...)  \,
+#define Z_IS_1727U_EQ_1727U(...) \,
+#define Z_IS_1728_EQ_1728(...)   \,
+#define Z_IS_1728U_EQ_1728(...)  \,
+#define Z_IS_1728_EQ_1728U(...)  \,
+#define Z_IS_1728U_EQ_1728U(...) \,
+#define Z_IS_1729_EQ_1729(...)   \,
+#define Z_IS_1729U_EQ_1729(...)  \,
+#define Z_IS_1729_EQ_1729U(...)  \,
+#define Z_IS_1729U_EQ_1729U(...) \,
+#define Z_IS_1730_EQ_1730(...)   \,
+#define Z_IS_1730U_EQ_1730(...)  \,
+#define Z_IS_1730_EQ_1730U(...)  \,
+#define Z_IS_1730U_EQ_1730U(...) \,
+#define Z_IS_1731_EQ_1731(...)   \,
+#define Z_IS_1731U_EQ_1731(...)  \,
+#define Z_IS_1731_EQ_1731U(...)  \,
+#define Z_IS_1731U_EQ_1731U(...) \,
+#define Z_IS_1732_EQ_1732(...)   \,
+#define Z_IS_1732U_EQ_1732(...)  \,
+#define Z_IS_1732_EQ_1732U(...)  \,
+#define Z_IS_1732U_EQ_1732U(...) \,
+#define Z_IS_1733_EQ_1733(...)   \,
+#define Z_IS_1733U_EQ_1733(...)  \,
+#define Z_IS_1733_EQ_1733U(...)  \,
+#define Z_IS_1733U_EQ_1733U(...) \,
+#define Z_IS_1734_EQ_1734(...)   \,
+#define Z_IS_1734U_EQ_1734(...)  \,
+#define Z_IS_1734_EQ_1734U(...)  \,
+#define Z_IS_1734U_EQ_1734U(...) \,
+#define Z_IS_1735_EQ_1735(...)   \,
+#define Z_IS_1735U_EQ_1735(...)  \,
+#define Z_IS_1735_EQ_1735U(...)  \,
+#define Z_IS_1735U_EQ_1735U(...) \,
+#define Z_IS_1736_EQ_1736(...)   \,
+#define Z_IS_1736U_EQ_1736(...)  \,
+#define Z_IS_1736_EQ_1736U(...)  \,
+#define Z_IS_1736U_EQ_1736U(...) \,
+#define Z_IS_1737_EQ_1737(...)   \,
+#define Z_IS_1737U_EQ_1737(...)  \,
+#define Z_IS_1737_EQ_1737U(...)  \,
+#define Z_IS_1737U_EQ_1737U(...) \,
+#define Z_IS_1738_EQ_1738(...)   \,
+#define Z_IS_1738U_EQ_1738(...)  \,
+#define Z_IS_1738_EQ_1738U(...)  \,
+#define Z_IS_1738U_EQ_1738U(...) \,
+#define Z_IS_1739_EQ_1739(...)   \,
+#define Z_IS_1739U_EQ_1739(...)  \,
+#define Z_IS_1739_EQ_1739U(...)  \,
+#define Z_IS_1739U_EQ_1739U(...) \,
+#define Z_IS_1740_EQ_1740(...)   \,
+#define Z_IS_1740U_EQ_1740(...)  \,
+#define Z_IS_1740_EQ_1740U(...)  \,
+#define Z_IS_1740U_EQ_1740U(...) \,
+#define Z_IS_1741_EQ_1741(...)   \,
+#define Z_IS_1741U_EQ_1741(...)  \,
+#define Z_IS_1741_EQ_1741U(...)  \,
+#define Z_IS_1741U_EQ_1741U(...) \,
+#define Z_IS_1742_EQ_1742(...)   \,
+#define Z_IS_1742U_EQ_1742(...)  \,
+#define Z_IS_1742_EQ_1742U(...)  \,
+#define Z_IS_1742U_EQ_1742U(...) \,
+#define Z_IS_1743_EQ_1743(...)   \,
+#define Z_IS_1743U_EQ_1743(...)  \,
+#define Z_IS_1743_EQ_1743U(...)  \,
+#define Z_IS_1743U_EQ_1743U(...) \,
+#define Z_IS_1744_EQ_1744(...)   \,
+#define Z_IS_1744U_EQ_1744(...)  \,
+#define Z_IS_1744_EQ_1744U(...)  \,
+#define Z_IS_1744U_EQ_1744U(...) \,
+#define Z_IS_1745_EQ_1745(...)   \,
+#define Z_IS_1745U_EQ_1745(...)  \,
+#define Z_IS_1745_EQ_1745U(...)  \,
+#define Z_IS_1745U_EQ_1745U(...) \,
+#define Z_IS_1746_EQ_1746(...)   \,
+#define Z_IS_1746U_EQ_1746(...)  \,
+#define Z_IS_1746_EQ_1746U(...)  \,
+#define Z_IS_1746U_EQ_1746U(...) \,
+#define Z_IS_1747_EQ_1747(...)   \,
+#define Z_IS_1747U_EQ_1747(...)  \,
+#define Z_IS_1747_EQ_1747U(...)  \,
+#define Z_IS_1747U_EQ_1747U(...) \,
+#define Z_IS_1748_EQ_1748(...)   \,
+#define Z_IS_1748U_EQ_1748(...)  \,
+#define Z_IS_1748_EQ_1748U(...)  \,
+#define Z_IS_1748U_EQ_1748U(...) \,
+#define Z_IS_1749_EQ_1749(...)   \,
+#define Z_IS_1749U_EQ_1749(...)  \,
+#define Z_IS_1749_EQ_1749U(...)  \,
+#define Z_IS_1749U_EQ_1749U(...) \,
+#define Z_IS_1750_EQ_1750(...)   \,
+#define Z_IS_1750U_EQ_1750(...)  \,
+#define Z_IS_1750_EQ_1750U(...)  \,
+#define Z_IS_1750U_EQ_1750U(...) \,
+#define Z_IS_1751_EQ_1751(...)   \,
+#define Z_IS_1751U_EQ_1751(...)  \,
+#define Z_IS_1751_EQ_1751U(...)  \,
+#define Z_IS_1751U_EQ_1751U(...) \,
+#define Z_IS_1752_EQ_1752(...)   \,
+#define Z_IS_1752U_EQ_1752(...)  \,
+#define Z_IS_1752_EQ_1752U(...)  \,
+#define Z_IS_1752U_EQ_1752U(...) \,
+#define Z_IS_1753_EQ_1753(...)   \,
+#define Z_IS_1753U_EQ_1753(...)  \,
+#define Z_IS_1753_EQ_1753U(...)  \,
+#define Z_IS_1753U_EQ_1753U(...) \,
+#define Z_IS_1754_EQ_1754(...)   \,
+#define Z_IS_1754U_EQ_1754(...)  \,
+#define Z_IS_1754_EQ_1754U(...)  \,
+#define Z_IS_1754U_EQ_1754U(...) \,
+#define Z_IS_1755_EQ_1755(...)   \,
+#define Z_IS_1755U_EQ_1755(...)  \,
+#define Z_IS_1755_EQ_1755U(...)  \,
+#define Z_IS_1755U_EQ_1755U(...) \,
+#define Z_IS_1756_EQ_1756(...)   \,
+#define Z_IS_1756U_EQ_1756(...)  \,
+#define Z_IS_1756_EQ_1756U(...)  \,
+#define Z_IS_1756U_EQ_1756U(...) \,
+#define Z_IS_1757_EQ_1757(...)   \,
+#define Z_IS_1757U_EQ_1757(...)  \,
+#define Z_IS_1757_EQ_1757U(...)  \,
+#define Z_IS_1757U_EQ_1757U(...) \,
+#define Z_IS_1758_EQ_1758(...)   \,
+#define Z_IS_1758U_EQ_1758(...)  \,
+#define Z_IS_1758_EQ_1758U(...)  \,
+#define Z_IS_1758U_EQ_1758U(...) \,
+#define Z_IS_1759_EQ_1759(...)   \,
+#define Z_IS_1759U_EQ_1759(...)  \,
+#define Z_IS_1759_EQ_1759U(...)  \,
+#define Z_IS_1759U_EQ_1759U(...) \,
+#define Z_IS_1760_EQ_1760(...)   \,
+#define Z_IS_1760U_EQ_1760(...)  \,
+#define Z_IS_1760_EQ_1760U(...)  \,
+#define Z_IS_1760U_EQ_1760U(...) \,
+#define Z_IS_1761_EQ_1761(...)   \,
+#define Z_IS_1761U_EQ_1761(...)  \,
+#define Z_IS_1761_EQ_1761U(...)  \,
+#define Z_IS_1761U_EQ_1761U(...) \,
+#define Z_IS_1762_EQ_1762(...)   \,
+#define Z_IS_1762U_EQ_1762(...)  \,
+#define Z_IS_1762_EQ_1762U(...)  \,
+#define Z_IS_1762U_EQ_1762U(...) \,
+#define Z_IS_1763_EQ_1763(...)   \,
+#define Z_IS_1763U_EQ_1763(...)  \,
+#define Z_IS_1763_EQ_1763U(...)  \,
+#define Z_IS_1763U_EQ_1763U(...) \,
+#define Z_IS_1764_EQ_1764(...)   \,
+#define Z_IS_1764U_EQ_1764(...)  \,
+#define Z_IS_1764_EQ_1764U(...)  \,
+#define Z_IS_1764U_EQ_1764U(...) \,
+#define Z_IS_1765_EQ_1765(...)   \,
+#define Z_IS_1765U_EQ_1765(...)  \,
+#define Z_IS_1765_EQ_1765U(...)  \,
+#define Z_IS_1765U_EQ_1765U(...) \,
+#define Z_IS_1766_EQ_1766(...)   \,
+#define Z_IS_1766U_EQ_1766(...)  \,
+#define Z_IS_1766_EQ_1766U(...)  \,
+#define Z_IS_1766U_EQ_1766U(...) \,
+#define Z_IS_1767_EQ_1767(...)   \,
+#define Z_IS_1767U_EQ_1767(...)  \,
+#define Z_IS_1767_EQ_1767U(...)  \,
+#define Z_IS_1767U_EQ_1767U(...) \,
+#define Z_IS_1768_EQ_1768(...)   \,
+#define Z_IS_1768U_EQ_1768(...)  \,
+#define Z_IS_1768_EQ_1768U(...)  \,
+#define Z_IS_1768U_EQ_1768U(...) \,
+#define Z_IS_1769_EQ_1769(...)   \,
+#define Z_IS_1769U_EQ_1769(...)  \,
+#define Z_IS_1769_EQ_1769U(...)  \,
+#define Z_IS_1769U_EQ_1769U(...) \,
+#define Z_IS_1770_EQ_1770(...)   \,
+#define Z_IS_1770U_EQ_1770(...)  \,
+#define Z_IS_1770_EQ_1770U(...)  \,
+#define Z_IS_1770U_EQ_1770U(...) \,
+#define Z_IS_1771_EQ_1771(...)   \,
+#define Z_IS_1771U_EQ_1771(...)  \,
+#define Z_IS_1771_EQ_1771U(...)  \,
+#define Z_IS_1771U_EQ_1771U(...) \,
+#define Z_IS_1772_EQ_1772(...)   \,
+#define Z_IS_1772U_EQ_1772(...)  \,
+#define Z_IS_1772_EQ_1772U(...)  \,
+#define Z_IS_1772U_EQ_1772U(...) \,
+#define Z_IS_1773_EQ_1773(...)   \,
+#define Z_IS_1773U_EQ_1773(...)  \,
+#define Z_IS_1773_EQ_1773U(...)  \,
+#define Z_IS_1773U_EQ_1773U(...) \,
+#define Z_IS_1774_EQ_1774(...)   \,
+#define Z_IS_1774U_EQ_1774(...)  \,
+#define Z_IS_1774_EQ_1774U(...)  \,
+#define Z_IS_1774U_EQ_1774U(...) \,
+#define Z_IS_1775_EQ_1775(...)   \,
+#define Z_IS_1775U_EQ_1775(...)  \,
+#define Z_IS_1775_EQ_1775U(...)  \,
+#define Z_IS_1775U_EQ_1775U(...) \,
+#define Z_IS_1776_EQ_1776(...)   \,
+#define Z_IS_1776U_EQ_1776(...)  \,
+#define Z_IS_1776_EQ_1776U(...)  \,
+#define Z_IS_1776U_EQ_1776U(...) \,
+#define Z_IS_1777_EQ_1777(...)   \,
+#define Z_IS_1777U_EQ_1777(...)  \,
+#define Z_IS_1777_EQ_1777U(...)  \,
+#define Z_IS_1777U_EQ_1777U(...) \,
+#define Z_IS_1778_EQ_1778(...)   \,
+#define Z_IS_1778U_EQ_1778(...)  \,
+#define Z_IS_1778_EQ_1778U(...)  \,
+#define Z_IS_1778U_EQ_1778U(...) \,
+#define Z_IS_1779_EQ_1779(...)   \,
+#define Z_IS_1779U_EQ_1779(...)  \,
+#define Z_IS_1779_EQ_1779U(...)  \,
+#define Z_IS_1779U_EQ_1779U(...) \,
+#define Z_IS_1780_EQ_1780(...)   \,
+#define Z_IS_1780U_EQ_1780(...)  \,
+#define Z_IS_1780_EQ_1780U(...)  \,
+#define Z_IS_1780U_EQ_1780U(...) \,
+#define Z_IS_1781_EQ_1781(...)   \,
+#define Z_IS_1781U_EQ_1781(...)  \,
+#define Z_IS_1781_EQ_1781U(...)  \,
+#define Z_IS_1781U_EQ_1781U(...) \,
+#define Z_IS_1782_EQ_1782(...)   \,
+#define Z_IS_1782U_EQ_1782(...)  \,
+#define Z_IS_1782_EQ_1782U(...)  \,
+#define Z_IS_1782U_EQ_1782U(...) \,
+#define Z_IS_1783_EQ_1783(...)   \,
+#define Z_IS_1783U_EQ_1783(...)  \,
+#define Z_IS_1783_EQ_1783U(...)  \,
+#define Z_IS_1783U_EQ_1783U(...) \,
+#define Z_IS_1784_EQ_1784(...)   \,
+#define Z_IS_1784U_EQ_1784(...)  \,
+#define Z_IS_1784_EQ_1784U(...)  \,
+#define Z_IS_1784U_EQ_1784U(...) \,
+#define Z_IS_1785_EQ_1785(...)   \,
+#define Z_IS_1785U_EQ_1785(...)  \,
+#define Z_IS_1785_EQ_1785U(...)  \,
+#define Z_IS_1785U_EQ_1785U(...) \,
+#define Z_IS_1786_EQ_1786(...)   \,
+#define Z_IS_1786U_EQ_1786(...)  \,
+#define Z_IS_1786_EQ_1786U(...)  \,
+#define Z_IS_1786U_EQ_1786U(...) \,
+#define Z_IS_1787_EQ_1787(...)   \,
+#define Z_IS_1787U_EQ_1787(...)  \,
+#define Z_IS_1787_EQ_1787U(...)  \,
+#define Z_IS_1787U_EQ_1787U(...) \,
+#define Z_IS_1788_EQ_1788(...)   \,
+#define Z_IS_1788U_EQ_1788(...)  \,
+#define Z_IS_1788_EQ_1788U(...)  \,
+#define Z_IS_1788U_EQ_1788U(...) \,
+#define Z_IS_1789_EQ_1789(...)   \,
+#define Z_IS_1789U_EQ_1789(...)  \,
+#define Z_IS_1789_EQ_1789U(...)  \,
+#define Z_IS_1789U_EQ_1789U(...) \,
+#define Z_IS_1790_EQ_1790(...)   \,
+#define Z_IS_1790U_EQ_1790(...)  \,
+#define Z_IS_1790_EQ_1790U(...)  \,
+#define Z_IS_1790U_EQ_1790U(...) \,
+#define Z_IS_1791_EQ_1791(...)   \,
+#define Z_IS_1791U_EQ_1791(...)  \,
+#define Z_IS_1791_EQ_1791U(...)  \,
+#define Z_IS_1791U_EQ_1791U(...) \,
+#define Z_IS_1792_EQ_1792(...)   \,
+#define Z_IS_1792U_EQ_1792(...)  \,
+#define Z_IS_1792_EQ_1792U(...)  \,
+#define Z_IS_1792U_EQ_1792U(...) \,
+#define Z_IS_1793_EQ_1793(...)   \,
+#define Z_IS_1793U_EQ_1793(...)  \,
+#define Z_IS_1793_EQ_1793U(...)  \,
+#define Z_IS_1793U_EQ_1793U(...) \,
+#define Z_IS_1794_EQ_1794(...)   \,
+#define Z_IS_1794U_EQ_1794(...)  \,
+#define Z_IS_1794_EQ_1794U(...)  \,
+#define Z_IS_1794U_EQ_1794U(...) \,
+#define Z_IS_1795_EQ_1795(...)   \,
+#define Z_IS_1795U_EQ_1795(...)  \,
+#define Z_IS_1795_EQ_1795U(...)  \,
+#define Z_IS_1795U_EQ_1795U(...) \,
+#define Z_IS_1796_EQ_1796(...)   \,
+#define Z_IS_1796U_EQ_1796(...)  \,
+#define Z_IS_1796_EQ_1796U(...)  \,
+#define Z_IS_1796U_EQ_1796U(...) \,
+#define Z_IS_1797_EQ_1797(...)   \,
+#define Z_IS_1797U_EQ_1797(...)  \,
+#define Z_IS_1797_EQ_1797U(...)  \,
+#define Z_IS_1797U_EQ_1797U(...) \,
+#define Z_IS_1798_EQ_1798(...)   \,
+#define Z_IS_1798U_EQ_1798(...)  \,
+#define Z_IS_1798_EQ_1798U(...)  \,
+#define Z_IS_1798U_EQ_1798U(...) \,
+#define Z_IS_1799_EQ_1799(...)   \,
+#define Z_IS_1799U_EQ_1799(...)  \,
+#define Z_IS_1799_EQ_1799U(...)  \,
+#define Z_IS_1799U_EQ_1799U(...) \,
+#define Z_IS_1800_EQ_1800(...)   \,
+#define Z_IS_1800U_EQ_1800(...)  \,
+#define Z_IS_1800_EQ_1800U(...)  \,
+#define Z_IS_1800U_EQ_1800U(...) \,
+#define Z_IS_1801_EQ_1801(...)   \,
+#define Z_IS_1801U_EQ_1801(...)  \,
+#define Z_IS_1801_EQ_1801U(...)  \,
+#define Z_IS_1801U_EQ_1801U(...) \,
+#define Z_IS_1802_EQ_1802(...)   \,
+#define Z_IS_1802U_EQ_1802(...)  \,
+#define Z_IS_1802_EQ_1802U(...)  \,
+#define Z_IS_1802U_EQ_1802U(...) \,
+#define Z_IS_1803_EQ_1803(...)   \,
+#define Z_IS_1803U_EQ_1803(...)  \,
+#define Z_IS_1803_EQ_1803U(...)  \,
+#define Z_IS_1803U_EQ_1803U(...) \,
+#define Z_IS_1804_EQ_1804(...)   \,
+#define Z_IS_1804U_EQ_1804(...)  \,
+#define Z_IS_1804_EQ_1804U(...)  \,
+#define Z_IS_1804U_EQ_1804U(...) \,
+#define Z_IS_1805_EQ_1805(...)   \,
+#define Z_IS_1805U_EQ_1805(...)  \,
+#define Z_IS_1805_EQ_1805U(...)  \,
+#define Z_IS_1805U_EQ_1805U(...) \,
+#define Z_IS_1806_EQ_1806(...)   \,
+#define Z_IS_1806U_EQ_1806(...)  \,
+#define Z_IS_1806_EQ_1806U(...)  \,
+#define Z_IS_1806U_EQ_1806U(...) \,
+#define Z_IS_1807_EQ_1807(...)   \,
+#define Z_IS_1807U_EQ_1807(...)  \,
+#define Z_IS_1807_EQ_1807U(...)  \,
+#define Z_IS_1807U_EQ_1807U(...) \,
+#define Z_IS_1808_EQ_1808(...)   \,
+#define Z_IS_1808U_EQ_1808(...)  \,
+#define Z_IS_1808_EQ_1808U(...)  \,
+#define Z_IS_1808U_EQ_1808U(...) \,
+#define Z_IS_1809_EQ_1809(...)   \,
+#define Z_IS_1809U_EQ_1809(...)  \,
+#define Z_IS_1809_EQ_1809U(...)  \,
+#define Z_IS_1809U_EQ_1809U(...) \,
+#define Z_IS_1810_EQ_1810(...)   \,
+#define Z_IS_1810U_EQ_1810(...)  \,
+#define Z_IS_1810_EQ_1810U(...)  \,
+#define Z_IS_1810U_EQ_1810U(...) \,
+#define Z_IS_1811_EQ_1811(...)   \,
+#define Z_IS_1811U_EQ_1811(...)  \,
+#define Z_IS_1811_EQ_1811U(...)  \,
+#define Z_IS_1811U_EQ_1811U(...) \,
+#define Z_IS_1812_EQ_1812(...)   \,
+#define Z_IS_1812U_EQ_1812(...)  \,
+#define Z_IS_1812_EQ_1812U(...)  \,
+#define Z_IS_1812U_EQ_1812U(...) \,
+#define Z_IS_1813_EQ_1813(...)   \,
+#define Z_IS_1813U_EQ_1813(...)  \,
+#define Z_IS_1813_EQ_1813U(...)  \,
+#define Z_IS_1813U_EQ_1813U(...) \,
+#define Z_IS_1814_EQ_1814(...)   \,
+#define Z_IS_1814U_EQ_1814(...)  \,
+#define Z_IS_1814_EQ_1814U(...)  \,
+#define Z_IS_1814U_EQ_1814U(...) \,
+#define Z_IS_1815_EQ_1815(...)   \,
+#define Z_IS_1815U_EQ_1815(...)  \,
+#define Z_IS_1815_EQ_1815U(...)  \,
+#define Z_IS_1815U_EQ_1815U(...) \,
+#define Z_IS_1816_EQ_1816(...)   \,
+#define Z_IS_1816U_EQ_1816(...)  \,
+#define Z_IS_1816_EQ_1816U(...)  \,
+#define Z_IS_1816U_EQ_1816U(...) \,
+#define Z_IS_1817_EQ_1817(...)   \,
+#define Z_IS_1817U_EQ_1817(...)  \,
+#define Z_IS_1817_EQ_1817U(...)  \,
+#define Z_IS_1817U_EQ_1817U(...) \,
+#define Z_IS_1818_EQ_1818(...)   \,
+#define Z_IS_1818U_EQ_1818(...)  \,
+#define Z_IS_1818_EQ_1818U(...)  \,
+#define Z_IS_1818U_EQ_1818U(...) \,
+#define Z_IS_1819_EQ_1819(...)   \,
+#define Z_IS_1819U_EQ_1819(...)  \,
+#define Z_IS_1819_EQ_1819U(...)  \,
+#define Z_IS_1819U_EQ_1819U(...) \,
+#define Z_IS_1820_EQ_1820(...)   \,
+#define Z_IS_1820U_EQ_1820(...)  \,
+#define Z_IS_1820_EQ_1820U(...)  \,
+#define Z_IS_1820U_EQ_1820U(...) \,
+#define Z_IS_1821_EQ_1821(...)   \,
+#define Z_IS_1821U_EQ_1821(...)  \,
+#define Z_IS_1821_EQ_1821U(...)  \,
+#define Z_IS_1821U_EQ_1821U(...) \,
+#define Z_IS_1822_EQ_1822(...)   \,
+#define Z_IS_1822U_EQ_1822(...)  \,
+#define Z_IS_1822_EQ_1822U(...)  \,
+#define Z_IS_1822U_EQ_1822U(...) \,
+#define Z_IS_1823_EQ_1823(...)   \,
+#define Z_IS_1823U_EQ_1823(...)  \,
+#define Z_IS_1823_EQ_1823U(...)  \,
+#define Z_IS_1823U_EQ_1823U(...) \,
+#define Z_IS_1824_EQ_1824(...)   \,
+#define Z_IS_1824U_EQ_1824(...)  \,
+#define Z_IS_1824_EQ_1824U(...)  \,
+#define Z_IS_1824U_EQ_1824U(...) \,
+#define Z_IS_1825_EQ_1825(...)   \,
+#define Z_IS_1825U_EQ_1825(...)  \,
+#define Z_IS_1825_EQ_1825U(...)  \,
+#define Z_IS_1825U_EQ_1825U(...) \,
+#define Z_IS_1826_EQ_1826(...)   \,
+#define Z_IS_1826U_EQ_1826(...)  \,
+#define Z_IS_1826_EQ_1826U(...)  \,
+#define Z_IS_1826U_EQ_1826U(...) \,
+#define Z_IS_1827_EQ_1827(...)   \,
+#define Z_IS_1827U_EQ_1827(...)  \,
+#define Z_IS_1827_EQ_1827U(...)  \,
+#define Z_IS_1827U_EQ_1827U(...) \,
+#define Z_IS_1828_EQ_1828(...)   \,
+#define Z_IS_1828U_EQ_1828(...)  \,
+#define Z_IS_1828_EQ_1828U(...)  \,
+#define Z_IS_1828U_EQ_1828U(...) \,
+#define Z_IS_1829_EQ_1829(...)   \,
+#define Z_IS_1829U_EQ_1829(...)  \,
+#define Z_IS_1829_EQ_1829U(...)  \,
+#define Z_IS_1829U_EQ_1829U(...) \,
+#define Z_IS_1830_EQ_1830(...)   \,
+#define Z_IS_1830U_EQ_1830(...)  \,
+#define Z_IS_1830_EQ_1830U(...)  \,
+#define Z_IS_1830U_EQ_1830U(...) \,
+#define Z_IS_1831_EQ_1831(...)   \,
+#define Z_IS_1831U_EQ_1831(...)  \,
+#define Z_IS_1831_EQ_1831U(...)  \,
+#define Z_IS_1831U_EQ_1831U(...) \,
+#define Z_IS_1832_EQ_1832(...)   \,
+#define Z_IS_1832U_EQ_1832(...)  \,
+#define Z_IS_1832_EQ_1832U(...)  \,
+#define Z_IS_1832U_EQ_1832U(...) \,
+#define Z_IS_1833_EQ_1833(...)   \,
+#define Z_IS_1833U_EQ_1833(...)  \,
+#define Z_IS_1833_EQ_1833U(...)  \,
+#define Z_IS_1833U_EQ_1833U(...) \,
+#define Z_IS_1834_EQ_1834(...)   \,
+#define Z_IS_1834U_EQ_1834(...)  \,
+#define Z_IS_1834_EQ_1834U(...)  \,
+#define Z_IS_1834U_EQ_1834U(...) \,
+#define Z_IS_1835_EQ_1835(...)   \,
+#define Z_IS_1835U_EQ_1835(...)  \,
+#define Z_IS_1835_EQ_1835U(...)  \,
+#define Z_IS_1835U_EQ_1835U(...) \,
+#define Z_IS_1836_EQ_1836(...)   \,
+#define Z_IS_1836U_EQ_1836(...)  \,
+#define Z_IS_1836_EQ_1836U(...)  \,
+#define Z_IS_1836U_EQ_1836U(...) \,
+#define Z_IS_1837_EQ_1837(...)   \,
+#define Z_IS_1837U_EQ_1837(...)  \,
+#define Z_IS_1837_EQ_1837U(...)  \,
+#define Z_IS_1837U_EQ_1837U(...) \,
+#define Z_IS_1838_EQ_1838(...)   \,
+#define Z_IS_1838U_EQ_1838(...)  \,
+#define Z_IS_1838_EQ_1838U(...)  \,
+#define Z_IS_1838U_EQ_1838U(...) \,
+#define Z_IS_1839_EQ_1839(...)   \,
+#define Z_IS_1839U_EQ_1839(...)  \,
+#define Z_IS_1839_EQ_1839U(...)  \,
+#define Z_IS_1839U_EQ_1839U(...) \,
+#define Z_IS_1840_EQ_1840(...)   \,
+#define Z_IS_1840U_EQ_1840(...)  \,
+#define Z_IS_1840_EQ_1840U(...)  \,
+#define Z_IS_1840U_EQ_1840U(...) \,
+#define Z_IS_1841_EQ_1841(...)   \,
+#define Z_IS_1841U_EQ_1841(...)  \,
+#define Z_IS_1841_EQ_1841U(...)  \,
+#define Z_IS_1841U_EQ_1841U(...) \,
+#define Z_IS_1842_EQ_1842(...)   \,
+#define Z_IS_1842U_EQ_1842(...)  \,
+#define Z_IS_1842_EQ_1842U(...)  \,
+#define Z_IS_1842U_EQ_1842U(...) \,
+#define Z_IS_1843_EQ_1843(...)   \,
+#define Z_IS_1843U_EQ_1843(...)  \,
+#define Z_IS_1843_EQ_1843U(...)  \,
+#define Z_IS_1843U_EQ_1843U(...) \,
+#define Z_IS_1844_EQ_1844(...)   \,
+#define Z_IS_1844U_EQ_1844(...)  \,
+#define Z_IS_1844_EQ_1844U(...)  \,
+#define Z_IS_1844U_EQ_1844U(...) \,
+#define Z_IS_1845_EQ_1845(...)   \,
+#define Z_IS_1845U_EQ_1845(...)  \,
+#define Z_IS_1845_EQ_1845U(...)  \,
+#define Z_IS_1845U_EQ_1845U(...) \,
+#define Z_IS_1846_EQ_1846(...)   \,
+#define Z_IS_1846U_EQ_1846(...)  \,
+#define Z_IS_1846_EQ_1846U(...)  \,
+#define Z_IS_1846U_EQ_1846U(...) \,
+#define Z_IS_1847_EQ_1847(...)   \,
+#define Z_IS_1847U_EQ_1847(...)  \,
+#define Z_IS_1847_EQ_1847U(...)  \,
+#define Z_IS_1847U_EQ_1847U(...) \,
+#define Z_IS_1848_EQ_1848(...)   \,
+#define Z_IS_1848U_EQ_1848(...)  \,
+#define Z_IS_1848_EQ_1848U(...)  \,
+#define Z_IS_1848U_EQ_1848U(...) \,
+#define Z_IS_1849_EQ_1849(...)   \,
+#define Z_IS_1849U_EQ_1849(...)  \,
+#define Z_IS_1849_EQ_1849U(...)  \,
+#define Z_IS_1849U_EQ_1849U(...) \,
+#define Z_IS_1850_EQ_1850(...)   \,
+#define Z_IS_1850U_EQ_1850(...)  \,
+#define Z_IS_1850_EQ_1850U(...)  \,
+#define Z_IS_1850U_EQ_1850U(...) \,
+#define Z_IS_1851_EQ_1851(...)   \,
+#define Z_IS_1851U_EQ_1851(...)  \,
+#define Z_IS_1851_EQ_1851U(...)  \,
+#define Z_IS_1851U_EQ_1851U(...) \,
+#define Z_IS_1852_EQ_1852(...)   \,
+#define Z_IS_1852U_EQ_1852(...)  \,
+#define Z_IS_1852_EQ_1852U(...)  \,
+#define Z_IS_1852U_EQ_1852U(...) \,
+#define Z_IS_1853_EQ_1853(...)   \,
+#define Z_IS_1853U_EQ_1853(...)  \,
+#define Z_IS_1853_EQ_1853U(...)  \,
+#define Z_IS_1853U_EQ_1853U(...) \,
+#define Z_IS_1854_EQ_1854(...)   \,
+#define Z_IS_1854U_EQ_1854(...)  \,
+#define Z_IS_1854_EQ_1854U(...)  \,
+#define Z_IS_1854U_EQ_1854U(...) \,
+#define Z_IS_1855_EQ_1855(...)   \,
+#define Z_IS_1855U_EQ_1855(...)  \,
+#define Z_IS_1855_EQ_1855U(...)  \,
+#define Z_IS_1855U_EQ_1855U(...) \,
+#define Z_IS_1856_EQ_1856(...)   \,
+#define Z_IS_1856U_EQ_1856(...)  \,
+#define Z_IS_1856_EQ_1856U(...)  \,
+#define Z_IS_1856U_EQ_1856U(...) \,
+#define Z_IS_1857_EQ_1857(...)   \,
+#define Z_IS_1857U_EQ_1857(...)  \,
+#define Z_IS_1857_EQ_1857U(...)  \,
+#define Z_IS_1857U_EQ_1857U(...) \,
+#define Z_IS_1858_EQ_1858(...)   \,
+#define Z_IS_1858U_EQ_1858(...)  \,
+#define Z_IS_1858_EQ_1858U(...)  \,
+#define Z_IS_1858U_EQ_1858U(...) \,
+#define Z_IS_1859_EQ_1859(...)   \,
+#define Z_IS_1859U_EQ_1859(...)  \,
+#define Z_IS_1859_EQ_1859U(...)  \,
+#define Z_IS_1859U_EQ_1859U(...) \,
+#define Z_IS_1860_EQ_1860(...)   \,
+#define Z_IS_1860U_EQ_1860(...)  \,
+#define Z_IS_1860_EQ_1860U(...)  \,
+#define Z_IS_1860U_EQ_1860U(...) \,
+#define Z_IS_1861_EQ_1861(...)   \,
+#define Z_IS_1861U_EQ_1861(...)  \,
+#define Z_IS_1861_EQ_1861U(...)  \,
+#define Z_IS_1861U_EQ_1861U(...) \,
+#define Z_IS_1862_EQ_1862(...)   \,
+#define Z_IS_1862U_EQ_1862(...)  \,
+#define Z_IS_1862_EQ_1862U(...)  \,
+#define Z_IS_1862U_EQ_1862U(...) \,
+#define Z_IS_1863_EQ_1863(...)   \,
+#define Z_IS_1863U_EQ_1863(...)  \,
+#define Z_IS_1863_EQ_1863U(...)  \,
+#define Z_IS_1863U_EQ_1863U(...) \,
+#define Z_IS_1864_EQ_1864(...)   \,
+#define Z_IS_1864U_EQ_1864(...)  \,
+#define Z_IS_1864_EQ_1864U(...)  \,
+#define Z_IS_1864U_EQ_1864U(...) \,
+#define Z_IS_1865_EQ_1865(...)   \,
+#define Z_IS_1865U_EQ_1865(...)  \,
+#define Z_IS_1865_EQ_1865U(...)  \,
+#define Z_IS_1865U_EQ_1865U(...) \,
+#define Z_IS_1866_EQ_1866(...)   \,
+#define Z_IS_1866U_EQ_1866(...)  \,
+#define Z_IS_1866_EQ_1866U(...)  \,
+#define Z_IS_1866U_EQ_1866U(...) \,
+#define Z_IS_1867_EQ_1867(...)   \,
+#define Z_IS_1867U_EQ_1867(...)  \,
+#define Z_IS_1867_EQ_1867U(...)  \,
+#define Z_IS_1867U_EQ_1867U(...) \,
+#define Z_IS_1868_EQ_1868(...)   \,
+#define Z_IS_1868U_EQ_1868(...)  \,
+#define Z_IS_1868_EQ_1868U(...)  \,
+#define Z_IS_1868U_EQ_1868U(...) \,
+#define Z_IS_1869_EQ_1869(...)   \,
+#define Z_IS_1869U_EQ_1869(...)  \,
+#define Z_IS_1869_EQ_1869U(...)  \,
+#define Z_IS_1869U_EQ_1869U(...) \,
+#define Z_IS_1870_EQ_1870(...)   \,
+#define Z_IS_1870U_EQ_1870(...)  \,
+#define Z_IS_1870_EQ_1870U(...)  \,
+#define Z_IS_1870U_EQ_1870U(...) \,
+#define Z_IS_1871_EQ_1871(...)   \,
+#define Z_IS_1871U_EQ_1871(...)  \,
+#define Z_IS_1871_EQ_1871U(...)  \,
+#define Z_IS_1871U_EQ_1871U(...) \,
+#define Z_IS_1872_EQ_1872(...)   \,
+#define Z_IS_1872U_EQ_1872(...)  \,
+#define Z_IS_1872_EQ_1872U(...)  \,
+#define Z_IS_1872U_EQ_1872U(...) \,
+#define Z_IS_1873_EQ_1873(...)   \,
+#define Z_IS_1873U_EQ_1873(...)  \,
+#define Z_IS_1873_EQ_1873U(...)  \,
+#define Z_IS_1873U_EQ_1873U(...) \,
+#define Z_IS_1874_EQ_1874(...)   \,
+#define Z_IS_1874U_EQ_1874(...)  \,
+#define Z_IS_1874_EQ_1874U(...)  \,
+#define Z_IS_1874U_EQ_1874U(...) \,
+#define Z_IS_1875_EQ_1875(...)   \,
+#define Z_IS_1875U_EQ_1875(...)  \,
+#define Z_IS_1875_EQ_1875U(...)  \,
+#define Z_IS_1875U_EQ_1875U(...) \,
+#define Z_IS_1876_EQ_1876(...)   \,
+#define Z_IS_1876U_EQ_1876(...)  \,
+#define Z_IS_1876_EQ_1876U(...)  \,
+#define Z_IS_1876U_EQ_1876U(...) \,
+#define Z_IS_1877_EQ_1877(...)   \,
+#define Z_IS_1877U_EQ_1877(...)  \,
+#define Z_IS_1877_EQ_1877U(...)  \,
+#define Z_IS_1877U_EQ_1877U(...) \,
+#define Z_IS_1878_EQ_1878(...)   \,
+#define Z_IS_1878U_EQ_1878(...)  \,
+#define Z_IS_1878_EQ_1878U(...)  \,
+#define Z_IS_1878U_EQ_1878U(...) \,
+#define Z_IS_1879_EQ_1879(...)   \,
+#define Z_IS_1879U_EQ_1879(...)  \,
+#define Z_IS_1879_EQ_1879U(...)  \,
+#define Z_IS_1879U_EQ_1879U(...) \,
+#define Z_IS_1880_EQ_1880(...)   \,
+#define Z_IS_1880U_EQ_1880(...)  \,
+#define Z_IS_1880_EQ_1880U(...)  \,
+#define Z_IS_1880U_EQ_1880U(...) \,
+#define Z_IS_1881_EQ_1881(...)   \,
+#define Z_IS_1881U_EQ_1881(...)  \,
+#define Z_IS_1881_EQ_1881U(...)  \,
+#define Z_IS_1881U_EQ_1881U(...) \,
+#define Z_IS_1882_EQ_1882(...)   \,
+#define Z_IS_1882U_EQ_1882(...)  \,
+#define Z_IS_1882_EQ_1882U(...)  \,
+#define Z_IS_1882U_EQ_1882U(...) \,
+#define Z_IS_1883_EQ_1883(...)   \,
+#define Z_IS_1883U_EQ_1883(...)  \,
+#define Z_IS_1883_EQ_1883U(...)  \,
+#define Z_IS_1883U_EQ_1883U(...) \,
+#define Z_IS_1884_EQ_1884(...)   \,
+#define Z_IS_1884U_EQ_1884(...)  \,
+#define Z_IS_1884_EQ_1884U(...)  \,
+#define Z_IS_1884U_EQ_1884U(...) \,
+#define Z_IS_1885_EQ_1885(...)   \,
+#define Z_IS_1885U_EQ_1885(...)  \,
+#define Z_IS_1885_EQ_1885U(...)  \,
+#define Z_IS_1885U_EQ_1885U(...) \,
+#define Z_IS_1886_EQ_1886(...)   \,
+#define Z_IS_1886U_EQ_1886(...)  \,
+#define Z_IS_1886_EQ_1886U(...)  \,
+#define Z_IS_1886U_EQ_1886U(...) \,
+#define Z_IS_1887_EQ_1887(...)   \,
+#define Z_IS_1887U_EQ_1887(...)  \,
+#define Z_IS_1887_EQ_1887U(...)  \,
+#define Z_IS_1887U_EQ_1887U(...) \,
+#define Z_IS_1888_EQ_1888(...)   \,
+#define Z_IS_1888U_EQ_1888(...)  \,
+#define Z_IS_1888_EQ_1888U(...)  \,
+#define Z_IS_1888U_EQ_1888U(...) \,
+#define Z_IS_1889_EQ_1889(...)   \,
+#define Z_IS_1889U_EQ_1889(...)  \,
+#define Z_IS_1889_EQ_1889U(...)  \,
+#define Z_IS_1889U_EQ_1889U(...) \,
+#define Z_IS_1890_EQ_1890(...)   \,
+#define Z_IS_1890U_EQ_1890(...)  \,
+#define Z_IS_1890_EQ_1890U(...)  \,
+#define Z_IS_1890U_EQ_1890U(...) \,
+#define Z_IS_1891_EQ_1891(...)   \,
+#define Z_IS_1891U_EQ_1891(...)  \,
+#define Z_IS_1891_EQ_1891U(...)  \,
+#define Z_IS_1891U_EQ_1891U(...) \,
+#define Z_IS_1892_EQ_1892(...)   \,
+#define Z_IS_1892U_EQ_1892(...)  \,
+#define Z_IS_1892_EQ_1892U(...)  \,
+#define Z_IS_1892U_EQ_1892U(...) \,
+#define Z_IS_1893_EQ_1893(...)   \,
+#define Z_IS_1893U_EQ_1893(...)  \,
+#define Z_IS_1893_EQ_1893U(...)  \,
+#define Z_IS_1893U_EQ_1893U(...) \,
+#define Z_IS_1894_EQ_1894(...)   \,
+#define Z_IS_1894U_EQ_1894(...)  \,
+#define Z_IS_1894_EQ_1894U(...)  \,
+#define Z_IS_1894U_EQ_1894U(...) \,
+#define Z_IS_1895_EQ_1895(...)   \,
+#define Z_IS_1895U_EQ_1895(...)  \,
+#define Z_IS_1895_EQ_1895U(...)  \,
+#define Z_IS_1895U_EQ_1895U(...) \,
+#define Z_IS_1896_EQ_1896(...)   \,
+#define Z_IS_1896U_EQ_1896(...)  \,
+#define Z_IS_1896_EQ_1896U(...)  \,
+#define Z_IS_1896U_EQ_1896U(...) \,
+#define Z_IS_1897_EQ_1897(...)   \,
+#define Z_IS_1897U_EQ_1897(...)  \,
+#define Z_IS_1897_EQ_1897U(...)  \,
+#define Z_IS_1897U_EQ_1897U(...) \,
+#define Z_IS_1898_EQ_1898(...)   \,
+#define Z_IS_1898U_EQ_1898(...)  \,
+#define Z_IS_1898_EQ_1898U(...)  \,
+#define Z_IS_1898U_EQ_1898U(...) \,
+#define Z_IS_1899_EQ_1899(...)   \,
+#define Z_IS_1899U_EQ_1899(...)  \,
+#define Z_IS_1899_EQ_1899U(...)  \,
+#define Z_IS_1899U_EQ_1899U(...) \,
+#define Z_IS_1900_EQ_1900(...)   \,
+#define Z_IS_1900U_EQ_1900(...)  \,
+#define Z_IS_1900_EQ_1900U(...)  \,
+#define Z_IS_1900U_EQ_1900U(...) \,
+#define Z_IS_1901_EQ_1901(...)   \,
+#define Z_IS_1901U_EQ_1901(...)  \,
+#define Z_IS_1901_EQ_1901U(...)  \,
+#define Z_IS_1901U_EQ_1901U(...) \,
+#define Z_IS_1902_EQ_1902(...)   \,
+#define Z_IS_1902U_EQ_1902(...)  \,
+#define Z_IS_1902_EQ_1902U(...)  \,
+#define Z_IS_1902U_EQ_1902U(...) \,
+#define Z_IS_1903_EQ_1903(...)   \,
+#define Z_IS_1903U_EQ_1903(...)  \,
+#define Z_IS_1903_EQ_1903U(...)  \,
+#define Z_IS_1903U_EQ_1903U(...) \,
+#define Z_IS_1904_EQ_1904(...)   \,
+#define Z_IS_1904U_EQ_1904(...)  \,
+#define Z_IS_1904_EQ_1904U(...)  \,
+#define Z_IS_1904U_EQ_1904U(...) \,
+#define Z_IS_1905_EQ_1905(...)   \,
+#define Z_IS_1905U_EQ_1905(...)  \,
+#define Z_IS_1905_EQ_1905U(...)  \,
+#define Z_IS_1905U_EQ_1905U(...) \,
+#define Z_IS_1906_EQ_1906(...)   \,
+#define Z_IS_1906U_EQ_1906(...)  \,
+#define Z_IS_1906_EQ_1906U(...)  \,
+#define Z_IS_1906U_EQ_1906U(...) \,
+#define Z_IS_1907_EQ_1907(...)   \,
+#define Z_IS_1907U_EQ_1907(...)  \,
+#define Z_IS_1907_EQ_1907U(...)  \,
+#define Z_IS_1907U_EQ_1907U(...) \,
+#define Z_IS_1908_EQ_1908(...)   \,
+#define Z_IS_1908U_EQ_1908(...)  \,
+#define Z_IS_1908_EQ_1908U(...)  \,
+#define Z_IS_1908U_EQ_1908U(...) \,
+#define Z_IS_1909_EQ_1909(...)   \,
+#define Z_IS_1909U_EQ_1909(...)  \,
+#define Z_IS_1909_EQ_1909U(...)  \,
+#define Z_IS_1909U_EQ_1909U(...) \,
+#define Z_IS_1910_EQ_1910(...)   \,
+#define Z_IS_1910U_EQ_1910(...)  \,
+#define Z_IS_1910_EQ_1910U(...)  \,
+#define Z_IS_1910U_EQ_1910U(...) \,
+#define Z_IS_1911_EQ_1911(...)   \,
+#define Z_IS_1911U_EQ_1911(...)  \,
+#define Z_IS_1911_EQ_1911U(...)  \,
+#define Z_IS_1911U_EQ_1911U(...) \,
+#define Z_IS_1912_EQ_1912(...)   \,
+#define Z_IS_1912U_EQ_1912(...)  \,
+#define Z_IS_1912_EQ_1912U(...)  \,
+#define Z_IS_1912U_EQ_1912U(...) \,
+#define Z_IS_1913_EQ_1913(...)   \,
+#define Z_IS_1913U_EQ_1913(...)  \,
+#define Z_IS_1913_EQ_1913U(...)  \,
+#define Z_IS_1913U_EQ_1913U(...) \,
+#define Z_IS_1914_EQ_1914(...)   \,
+#define Z_IS_1914U_EQ_1914(...)  \,
+#define Z_IS_1914_EQ_1914U(...)  \,
+#define Z_IS_1914U_EQ_1914U(...) \,
+#define Z_IS_1915_EQ_1915(...)   \,
+#define Z_IS_1915U_EQ_1915(...)  \,
+#define Z_IS_1915_EQ_1915U(...)  \,
+#define Z_IS_1915U_EQ_1915U(...) \,
+#define Z_IS_1916_EQ_1916(...)   \,
+#define Z_IS_1916U_EQ_1916(...)  \,
+#define Z_IS_1916_EQ_1916U(...)  \,
+#define Z_IS_1916U_EQ_1916U(...) \,
+#define Z_IS_1917_EQ_1917(...)   \,
+#define Z_IS_1917U_EQ_1917(...)  \,
+#define Z_IS_1917_EQ_1917U(...)  \,
+#define Z_IS_1917U_EQ_1917U(...) \,
+#define Z_IS_1918_EQ_1918(...)   \,
+#define Z_IS_1918U_EQ_1918(...)  \,
+#define Z_IS_1918_EQ_1918U(...)  \,
+#define Z_IS_1918U_EQ_1918U(...) \,
+#define Z_IS_1919_EQ_1919(...)   \,
+#define Z_IS_1919U_EQ_1919(...)  \,
+#define Z_IS_1919_EQ_1919U(...)  \,
+#define Z_IS_1919U_EQ_1919U(...) \,
+#define Z_IS_1920_EQ_1920(...)   \,
+#define Z_IS_1920U_EQ_1920(...)  \,
+#define Z_IS_1920_EQ_1920U(...)  \,
+#define Z_IS_1920U_EQ_1920U(...) \,
+#define Z_IS_1921_EQ_1921(...)   \,
+#define Z_IS_1921U_EQ_1921(...)  \,
+#define Z_IS_1921_EQ_1921U(...)  \,
+#define Z_IS_1921U_EQ_1921U(...) \,
+#define Z_IS_1922_EQ_1922(...)   \,
+#define Z_IS_1922U_EQ_1922(...)  \,
+#define Z_IS_1922_EQ_1922U(...)  \,
+#define Z_IS_1922U_EQ_1922U(...) \,
+#define Z_IS_1923_EQ_1923(...)   \,
+#define Z_IS_1923U_EQ_1923(...)  \,
+#define Z_IS_1923_EQ_1923U(...)  \,
+#define Z_IS_1923U_EQ_1923U(...) \,
+#define Z_IS_1924_EQ_1924(...)   \,
+#define Z_IS_1924U_EQ_1924(...)  \,
+#define Z_IS_1924_EQ_1924U(...)  \,
+#define Z_IS_1924U_EQ_1924U(...) \,
+#define Z_IS_1925_EQ_1925(...)   \,
+#define Z_IS_1925U_EQ_1925(...)  \,
+#define Z_IS_1925_EQ_1925U(...)  \,
+#define Z_IS_1925U_EQ_1925U(...) \,
+#define Z_IS_1926_EQ_1926(...)   \,
+#define Z_IS_1926U_EQ_1926(...)  \,
+#define Z_IS_1926_EQ_1926U(...)  \,
+#define Z_IS_1926U_EQ_1926U(...) \,
+#define Z_IS_1927_EQ_1927(...)   \,
+#define Z_IS_1927U_EQ_1927(...)  \,
+#define Z_IS_1927_EQ_1927U(...)  \,
+#define Z_IS_1927U_EQ_1927U(...) \,
+#define Z_IS_1928_EQ_1928(...)   \,
+#define Z_IS_1928U_EQ_1928(...)  \,
+#define Z_IS_1928_EQ_1928U(...)  \,
+#define Z_IS_1928U_EQ_1928U(...) \,
+#define Z_IS_1929_EQ_1929(...)   \,
+#define Z_IS_1929U_EQ_1929(...)  \,
+#define Z_IS_1929_EQ_1929U(...)  \,
+#define Z_IS_1929U_EQ_1929U(...) \,
+#define Z_IS_1930_EQ_1930(...)   \,
+#define Z_IS_1930U_EQ_1930(...)  \,
+#define Z_IS_1930_EQ_1930U(...)  \,
+#define Z_IS_1930U_EQ_1930U(...) \,
+#define Z_IS_1931_EQ_1931(...)   \,
+#define Z_IS_1931U_EQ_1931(...)  \,
+#define Z_IS_1931_EQ_1931U(...)  \,
+#define Z_IS_1931U_EQ_1931U(...) \,
+#define Z_IS_1932_EQ_1932(...)   \,
+#define Z_IS_1932U_EQ_1932(...)  \,
+#define Z_IS_1932_EQ_1932U(...)  \,
+#define Z_IS_1932U_EQ_1932U(...) \,
+#define Z_IS_1933_EQ_1933(...)   \,
+#define Z_IS_1933U_EQ_1933(...)  \,
+#define Z_IS_1933_EQ_1933U(...)  \,
+#define Z_IS_1933U_EQ_1933U(...) \,
+#define Z_IS_1934_EQ_1934(...)   \,
+#define Z_IS_1934U_EQ_1934(...)  \,
+#define Z_IS_1934_EQ_1934U(...)  \,
+#define Z_IS_1934U_EQ_1934U(...) \,
+#define Z_IS_1935_EQ_1935(...)   \,
+#define Z_IS_1935U_EQ_1935(...)  \,
+#define Z_IS_1935_EQ_1935U(...)  \,
+#define Z_IS_1935U_EQ_1935U(...) \,
+#define Z_IS_1936_EQ_1936(...)   \,
+#define Z_IS_1936U_EQ_1936(...)  \,
+#define Z_IS_1936_EQ_1936U(...)  \,
+#define Z_IS_1936U_EQ_1936U(...) \,
+#define Z_IS_1937_EQ_1937(...)   \,
+#define Z_IS_1937U_EQ_1937(...)  \,
+#define Z_IS_1937_EQ_1937U(...)  \,
+#define Z_IS_1937U_EQ_1937U(...) \,
+#define Z_IS_1938_EQ_1938(...)   \,
+#define Z_IS_1938U_EQ_1938(...)  \,
+#define Z_IS_1938_EQ_1938U(...)  \,
+#define Z_IS_1938U_EQ_1938U(...) \,
+#define Z_IS_1939_EQ_1939(...)   \,
+#define Z_IS_1939U_EQ_1939(...)  \,
+#define Z_IS_1939_EQ_1939U(...)  \,
+#define Z_IS_1939U_EQ_1939U(...) \,
+#define Z_IS_1940_EQ_1940(...)   \,
+#define Z_IS_1940U_EQ_1940(...)  \,
+#define Z_IS_1940_EQ_1940U(...)  \,
+#define Z_IS_1940U_EQ_1940U(...) \,
+#define Z_IS_1941_EQ_1941(...)   \,
+#define Z_IS_1941U_EQ_1941(...)  \,
+#define Z_IS_1941_EQ_1941U(...)  \,
+#define Z_IS_1941U_EQ_1941U(...) \,
+#define Z_IS_1942_EQ_1942(...)   \,
+#define Z_IS_1942U_EQ_1942(...)  \,
+#define Z_IS_1942_EQ_1942U(...)  \,
+#define Z_IS_1942U_EQ_1942U(...) \,
+#define Z_IS_1943_EQ_1943(...)   \,
+#define Z_IS_1943U_EQ_1943(...)  \,
+#define Z_IS_1943_EQ_1943U(...)  \,
+#define Z_IS_1943U_EQ_1943U(...) \,
+#define Z_IS_1944_EQ_1944(...)   \,
+#define Z_IS_1944U_EQ_1944(...)  \,
+#define Z_IS_1944_EQ_1944U(...)  \,
+#define Z_IS_1944U_EQ_1944U(...) \,
+#define Z_IS_1945_EQ_1945(...)   \,
+#define Z_IS_1945U_EQ_1945(...)  \,
+#define Z_IS_1945_EQ_1945U(...)  \,
+#define Z_IS_1945U_EQ_1945U(...) \,
+#define Z_IS_1946_EQ_1946(...)   \,
+#define Z_IS_1946U_EQ_1946(...)  \,
+#define Z_IS_1946_EQ_1946U(...)  \,
+#define Z_IS_1946U_EQ_1946U(...) \,
+#define Z_IS_1947_EQ_1947(...)   \,
+#define Z_IS_1947U_EQ_1947(...)  \,
+#define Z_IS_1947_EQ_1947U(...)  \,
+#define Z_IS_1947U_EQ_1947U(...) \,
+#define Z_IS_1948_EQ_1948(...)   \,
+#define Z_IS_1948U_EQ_1948(...)  \,
+#define Z_IS_1948_EQ_1948U(...)  \,
+#define Z_IS_1948U_EQ_1948U(...) \,
+#define Z_IS_1949_EQ_1949(...)   \,
+#define Z_IS_1949U_EQ_1949(...)  \,
+#define Z_IS_1949_EQ_1949U(...)  \,
+#define Z_IS_1949U_EQ_1949U(...) \,
+#define Z_IS_1950_EQ_1950(...)   \,
+#define Z_IS_1950U_EQ_1950(...)  \,
+#define Z_IS_1950_EQ_1950U(...)  \,
+#define Z_IS_1950U_EQ_1950U(...) \,
+#define Z_IS_1951_EQ_1951(...)   \,
+#define Z_IS_1951U_EQ_1951(...)  \,
+#define Z_IS_1951_EQ_1951U(...)  \,
+#define Z_IS_1951U_EQ_1951U(...) \,
+#define Z_IS_1952_EQ_1952(...)   \,
+#define Z_IS_1952U_EQ_1952(...)  \,
+#define Z_IS_1952_EQ_1952U(...)  \,
+#define Z_IS_1952U_EQ_1952U(...) \,
+#define Z_IS_1953_EQ_1953(...)   \,
+#define Z_IS_1953U_EQ_1953(...)  \,
+#define Z_IS_1953_EQ_1953U(...)  \,
+#define Z_IS_1953U_EQ_1953U(...) \,
+#define Z_IS_1954_EQ_1954(...)   \,
+#define Z_IS_1954U_EQ_1954(...)  \,
+#define Z_IS_1954_EQ_1954U(...)  \,
+#define Z_IS_1954U_EQ_1954U(...) \,
+#define Z_IS_1955_EQ_1955(...)   \,
+#define Z_IS_1955U_EQ_1955(...)  \,
+#define Z_IS_1955_EQ_1955U(...)  \,
+#define Z_IS_1955U_EQ_1955U(...) \,
+#define Z_IS_1956_EQ_1956(...)   \,
+#define Z_IS_1956U_EQ_1956(...)  \,
+#define Z_IS_1956_EQ_1956U(...)  \,
+#define Z_IS_1956U_EQ_1956U(...) \,
+#define Z_IS_1957_EQ_1957(...)   \,
+#define Z_IS_1957U_EQ_1957(...)  \,
+#define Z_IS_1957_EQ_1957U(...)  \,
+#define Z_IS_1957U_EQ_1957U(...) \,
+#define Z_IS_1958_EQ_1958(...)   \,
+#define Z_IS_1958U_EQ_1958(...)  \,
+#define Z_IS_1958_EQ_1958U(...)  \,
+#define Z_IS_1958U_EQ_1958U(...) \,
+#define Z_IS_1959_EQ_1959(...)   \,
+#define Z_IS_1959U_EQ_1959(...)  \,
+#define Z_IS_1959_EQ_1959U(...)  \,
+#define Z_IS_1959U_EQ_1959U(...) \,
+#define Z_IS_1960_EQ_1960(...)   \,
+#define Z_IS_1960U_EQ_1960(...)  \,
+#define Z_IS_1960_EQ_1960U(...)  \,
+#define Z_IS_1960U_EQ_1960U(...) \,
+#define Z_IS_1961_EQ_1961(...)   \,
+#define Z_IS_1961U_EQ_1961(...)  \,
+#define Z_IS_1961_EQ_1961U(...)  \,
+#define Z_IS_1961U_EQ_1961U(...) \,
+#define Z_IS_1962_EQ_1962(...)   \,
+#define Z_IS_1962U_EQ_1962(...)  \,
+#define Z_IS_1962_EQ_1962U(...)  \,
+#define Z_IS_1962U_EQ_1962U(...) \,
+#define Z_IS_1963_EQ_1963(...)   \,
+#define Z_IS_1963U_EQ_1963(...)  \,
+#define Z_IS_1963_EQ_1963U(...)  \,
+#define Z_IS_1963U_EQ_1963U(...) \,
+#define Z_IS_1964_EQ_1964(...)   \,
+#define Z_IS_1964U_EQ_1964(...)  \,
+#define Z_IS_1964_EQ_1964U(...)  \,
+#define Z_IS_1964U_EQ_1964U(...) \,
+#define Z_IS_1965_EQ_1965(...)   \,
+#define Z_IS_1965U_EQ_1965(...)  \,
+#define Z_IS_1965_EQ_1965U(...)  \,
+#define Z_IS_1965U_EQ_1965U(...) \,
+#define Z_IS_1966_EQ_1966(...)   \,
+#define Z_IS_1966U_EQ_1966(...)  \,
+#define Z_IS_1966_EQ_1966U(...)  \,
+#define Z_IS_1966U_EQ_1966U(...) \,
+#define Z_IS_1967_EQ_1967(...)   \,
+#define Z_IS_1967U_EQ_1967(...)  \,
+#define Z_IS_1967_EQ_1967U(...)  \,
+#define Z_IS_1967U_EQ_1967U(...) \,
+#define Z_IS_1968_EQ_1968(...)   \,
+#define Z_IS_1968U_EQ_1968(...)  \,
+#define Z_IS_1968_EQ_1968U(...)  \,
+#define Z_IS_1968U_EQ_1968U(...) \,
+#define Z_IS_1969_EQ_1969(...)   \,
+#define Z_IS_1969U_EQ_1969(...)  \,
+#define Z_IS_1969_EQ_1969U(...)  \,
+#define Z_IS_1969U_EQ_1969U(...) \,
+#define Z_IS_1970_EQ_1970(...)   \,
+#define Z_IS_1970U_EQ_1970(...)  \,
+#define Z_IS_1970_EQ_1970U(...)  \,
+#define Z_IS_1970U_EQ_1970U(...) \,
+#define Z_IS_1971_EQ_1971(...)   \,
+#define Z_IS_1971U_EQ_1971(...)  \,
+#define Z_IS_1971_EQ_1971U(...)  \,
+#define Z_IS_1971U_EQ_1971U(...) \,
+#define Z_IS_1972_EQ_1972(...)   \,
+#define Z_IS_1972U_EQ_1972(...)  \,
+#define Z_IS_1972_EQ_1972U(...)  \,
+#define Z_IS_1972U_EQ_1972U(...) \,
+#define Z_IS_1973_EQ_1973(...)   \,
+#define Z_IS_1973U_EQ_1973(...)  \,
+#define Z_IS_1973_EQ_1973U(...)  \,
+#define Z_IS_1973U_EQ_1973U(...) \,
+#define Z_IS_1974_EQ_1974(...)   \,
+#define Z_IS_1974U_EQ_1974(...)  \,
+#define Z_IS_1974_EQ_1974U(...)  \,
+#define Z_IS_1974U_EQ_1974U(...) \,
+#define Z_IS_1975_EQ_1975(...)   \,
+#define Z_IS_1975U_EQ_1975(...)  \,
+#define Z_IS_1975_EQ_1975U(...)  \,
+#define Z_IS_1975U_EQ_1975U(...) \,
+#define Z_IS_1976_EQ_1976(...)   \,
+#define Z_IS_1976U_EQ_1976(...)  \,
+#define Z_IS_1976_EQ_1976U(...)  \,
+#define Z_IS_1976U_EQ_1976U(...) \,
+#define Z_IS_1977_EQ_1977(...)   \,
+#define Z_IS_1977U_EQ_1977(...)  \,
+#define Z_IS_1977_EQ_1977U(...)  \,
+#define Z_IS_1977U_EQ_1977U(...) \,
+#define Z_IS_1978_EQ_1978(...)   \,
+#define Z_IS_1978U_EQ_1978(...)  \,
+#define Z_IS_1978_EQ_1978U(...)  \,
+#define Z_IS_1978U_EQ_1978U(...) \,
+#define Z_IS_1979_EQ_1979(...)   \,
+#define Z_IS_1979U_EQ_1979(...)  \,
+#define Z_IS_1979_EQ_1979U(...)  \,
+#define Z_IS_1979U_EQ_1979U(...) \,
+#define Z_IS_1980_EQ_1980(...)   \,
+#define Z_IS_1980U_EQ_1980(...)  \,
+#define Z_IS_1980_EQ_1980U(...)  \,
+#define Z_IS_1980U_EQ_1980U(...) \,
+#define Z_IS_1981_EQ_1981(...)   \,
+#define Z_IS_1981U_EQ_1981(...)  \,
+#define Z_IS_1981_EQ_1981U(...)  \,
+#define Z_IS_1981U_EQ_1981U(...) \,
+#define Z_IS_1982_EQ_1982(...)   \,
+#define Z_IS_1982U_EQ_1982(...)  \,
+#define Z_IS_1982_EQ_1982U(...)  \,
+#define Z_IS_1982U_EQ_1982U(...) \,
+#define Z_IS_1983_EQ_1983(...)   \,
+#define Z_IS_1983U_EQ_1983(...)  \,
+#define Z_IS_1983_EQ_1983U(...)  \,
+#define Z_IS_1983U_EQ_1983U(...) \,
+#define Z_IS_1984_EQ_1984(...)   \,
+#define Z_IS_1984U_EQ_1984(...)  \,
+#define Z_IS_1984_EQ_1984U(...)  \,
+#define Z_IS_1984U_EQ_1984U(...) \,
+#define Z_IS_1985_EQ_1985(...)   \,
+#define Z_IS_1985U_EQ_1985(...)  \,
+#define Z_IS_1985_EQ_1985U(...)  \,
+#define Z_IS_1985U_EQ_1985U(...) \,
+#define Z_IS_1986_EQ_1986(...)   \,
+#define Z_IS_1986U_EQ_1986(...)  \,
+#define Z_IS_1986_EQ_1986U(...)  \,
+#define Z_IS_1986U_EQ_1986U(...) \,
+#define Z_IS_1987_EQ_1987(...)   \,
+#define Z_IS_1987U_EQ_1987(...)  \,
+#define Z_IS_1987_EQ_1987U(...)  \,
+#define Z_IS_1987U_EQ_1987U(...) \,
+#define Z_IS_1988_EQ_1988(...)   \,
+#define Z_IS_1988U_EQ_1988(...)  \,
+#define Z_IS_1988_EQ_1988U(...)  \,
+#define Z_IS_1988U_EQ_1988U(...) \,
+#define Z_IS_1989_EQ_1989(...)   \,
+#define Z_IS_1989U_EQ_1989(...)  \,
+#define Z_IS_1989_EQ_1989U(...)  \,
+#define Z_IS_1989U_EQ_1989U(...) \,
+#define Z_IS_1990_EQ_1990(...)   \,
+#define Z_IS_1990U_EQ_1990(...)  \,
+#define Z_IS_1990_EQ_1990U(...)  \,
+#define Z_IS_1990U_EQ_1990U(...) \,
+#define Z_IS_1991_EQ_1991(...)   \,
+#define Z_IS_1991U_EQ_1991(...)  \,
+#define Z_IS_1991_EQ_1991U(...)  \,
+#define Z_IS_1991U_EQ_1991U(...) \,
+#define Z_IS_1992_EQ_1992(...)   \,
+#define Z_IS_1992U_EQ_1992(...)  \,
+#define Z_IS_1992_EQ_1992U(...)  \,
+#define Z_IS_1992U_EQ_1992U(...) \,
+#define Z_IS_1993_EQ_1993(...)   \,
+#define Z_IS_1993U_EQ_1993(...)  \,
+#define Z_IS_1993_EQ_1993U(...)  \,
+#define Z_IS_1993U_EQ_1993U(...) \,
+#define Z_IS_1994_EQ_1994(...)   \,
+#define Z_IS_1994U_EQ_1994(...)  \,
+#define Z_IS_1994_EQ_1994U(...)  \,
+#define Z_IS_1994U_EQ_1994U(...) \,
+#define Z_IS_1995_EQ_1995(...)   \,
+#define Z_IS_1995U_EQ_1995(...)  \,
+#define Z_IS_1995_EQ_1995U(...)  \,
+#define Z_IS_1995U_EQ_1995U(...) \,
+#define Z_IS_1996_EQ_1996(...)   \,
+#define Z_IS_1996U_EQ_1996(...)  \,
+#define Z_IS_1996_EQ_1996U(...)  \,
+#define Z_IS_1996U_EQ_1996U(...) \,
+#define Z_IS_1997_EQ_1997(...)   \,
+#define Z_IS_1997U_EQ_1997(...)  \,
+#define Z_IS_1997_EQ_1997U(...)  \,
+#define Z_IS_1997U_EQ_1997U(...) \,
+#define Z_IS_1998_EQ_1998(...)   \,
+#define Z_IS_1998U_EQ_1998(...)  \,
+#define Z_IS_1998_EQ_1998U(...)  \,
+#define Z_IS_1998U_EQ_1998U(...) \,
+#define Z_IS_1999_EQ_1999(...)   \,
+#define Z_IS_1999U_EQ_1999(...)  \,
+#define Z_IS_1999_EQ_1999U(...)  \,
+#define Z_IS_1999U_EQ_1999U(...) \,
+#define Z_IS_2000_EQ_2000(...)   \,
+#define Z_IS_2000U_EQ_2000(...)  \,
+#define Z_IS_2000_EQ_2000U(...)  \,
+#define Z_IS_2000U_EQ_2000U(...) \,
+#define Z_IS_2001_EQ_2001(...)   \,
+#define Z_IS_2001U_EQ_2001(...)  \,
+#define Z_IS_2001_EQ_2001U(...)  \,
+#define Z_IS_2001U_EQ_2001U(...) \,
+#define Z_IS_2002_EQ_2002(...)   \,
+#define Z_IS_2002U_EQ_2002(...)  \,
+#define Z_IS_2002_EQ_2002U(...)  \,
+#define Z_IS_2002U_EQ_2002U(...) \,
+#define Z_IS_2003_EQ_2003(...)   \,
+#define Z_IS_2003U_EQ_2003(...)  \,
+#define Z_IS_2003_EQ_2003U(...)  \,
+#define Z_IS_2003U_EQ_2003U(...) \,
+#define Z_IS_2004_EQ_2004(...)   \,
+#define Z_IS_2004U_EQ_2004(...)  \,
+#define Z_IS_2004_EQ_2004U(...)  \,
+#define Z_IS_2004U_EQ_2004U(...) \,
+#define Z_IS_2005_EQ_2005(...)   \,
+#define Z_IS_2005U_EQ_2005(...)  \,
+#define Z_IS_2005_EQ_2005U(...)  \,
+#define Z_IS_2005U_EQ_2005U(...) \,
+#define Z_IS_2006_EQ_2006(...)   \,
+#define Z_IS_2006U_EQ_2006(...)  \,
+#define Z_IS_2006_EQ_2006U(...)  \,
+#define Z_IS_2006U_EQ_2006U(...) \,
+#define Z_IS_2007_EQ_2007(...)   \,
+#define Z_IS_2007U_EQ_2007(...)  \,
+#define Z_IS_2007_EQ_2007U(...)  \,
+#define Z_IS_2007U_EQ_2007U(...) \,
+#define Z_IS_2008_EQ_2008(...)   \,
+#define Z_IS_2008U_EQ_2008(...)  \,
+#define Z_IS_2008_EQ_2008U(...)  \,
+#define Z_IS_2008U_EQ_2008U(...) \,
+#define Z_IS_2009_EQ_2009(...)   \,
+#define Z_IS_2009U_EQ_2009(...)  \,
+#define Z_IS_2009_EQ_2009U(...)  \,
+#define Z_IS_2009U_EQ_2009U(...) \,
+#define Z_IS_2010_EQ_2010(...)   \,
+#define Z_IS_2010U_EQ_2010(...)  \,
+#define Z_IS_2010_EQ_2010U(...)  \,
+#define Z_IS_2010U_EQ_2010U(...) \,
+#define Z_IS_2011_EQ_2011(...)   \,
+#define Z_IS_2011U_EQ_2011(...)  \,
+#define Z_IS_2011_EQ_2011U(...)  \,
+#define Z_IS_2011U_EQ_2011U(...) \,
+#define Z_IS_2012_EQ_2012(...)   \,
+#define Z_IS_2012U_EQ_2012(...)  \,
+#define Z_IS_2012_EQ_2012U(...)  \,
+#define Z_IS_2012U_EQ_2012U(...) \,
+#define Z_IS_2013_EQ_2013(...)   \,
+#define Z_IS_2013U_EQ_2013(...)  \,
+#define Z_IS_2013_EQ_2013U(...)  \,
+#define Z_IS_2013U_EQ_2013U(...) \,
+#define Z_IS_2014_EQ_2014(...)   \,
+#define Z_IS_2014U_EQ_2014(...)  \,
+#define Z_IS_2014_EQ_2014U(...)  \,
+#define Z_IS_2014U_EQ_2014U(...) \,
+#define Z_IS_2015_EQ_2015(...)   \,
+#define Z_IS_2015U_EQ_2015(...)  \,
+#define Z_IS_2015_EQ_2015U(...)  \,
+#define Z_IS_2015U_EQ_2015U(...) \,
+#define Z_IS_2016_EQ_2016(...)   \,
+#define Z_IS_2016U_EQ_2016(...)  \,
+#define Z_IS_2016_EQ_2016U(...)  \,
+#define Z_IS_2016U_EQ_2016U(...) \,
+#define Z_IS_2017_EQ_2017(...)   \,
+#define Z_IS_2017U_EQ_2017(...)  \,
+#define Z_IS_2017_EQ_2017U(...)  \,
+#define Z_IS_2017U_EQ_2017U(...) \,
+#define Z_IS_2018_EQ_2018(...)   \,
+#define Z_IS_2018U_EQ_2018(...)  \,
+#define Z_IS_2018_EQ_2018U(...)  \,
+#define Z_IS_2018U_EQ_2018U(...) \,
+#define Z_IS_2019_EQ_2019(...)   \,
+#define Z_IS_2019U_EQ_2019(...)  \,
+#define Z_IS_2019_EQ_2019U(...)  \,
+#define Z_IS_2019U_EQ_2019U(...) \,
+#define Z_IS_2020_EQ_2020(...)   \,
+#define Z_IS_2020U_EQ_2020(...)  \,
+#define Z_IS_2020_EQ_2020U(...)  \,
+#define Z_IS_2020U_EQ_2020U(...) \,
+#define Z_IS_2021_EQ_2021(...)   \,
+#define Z_IS_2021U_EQ_2021(...)  \,
+#define Z_IS_2021_EQ_2021U(...)  \,
+#define Z_IS_2021U_EQ_2021U(...) \,
+#define Z_IS_2022_EQ_2022(...)   \,
+#define Z_IS_2022U_EQ_2022(...)  \,
+#define Z_IS_2022_EQ_2022U(...)  \,
+#define Z_IS_2022U_EQ_2022U(...) \,
+#define Z_IS_2023_EQ_2023(...)   \,
+#define Z_IS_2023U_EQ_2023(...)  \,
+#define Z_IS_2023_EQ_2023U(...)  \,
+#define Z_IS_2023U_EQ_2023U(...) \,
+#define Z_IS_2024_EQ_2024(...)   \,
+#define Z_IS_2024U_EQ_2024(...)  \,
+#define Z_IS_2024_EQ_2024U(...)  \,
+#define Z_IS_2024U_EQ_2024U(...) \,
+#define Z_IS_2025_EQ_2025(...)   \,
+#define Z_IS_2025U_EQ_2025(...)  \,
+#define Z_IS_2025_EQ_2025U(...)  \,
+#define Z_IS_2025U_EQ_2025U(...) \,
+#define Z_IS_2026_EQ_2026(...)   \,
+#define Z_IS_2026U_EQ_2026(...)  \,
+#define Z_IS_2026_EQ_2026U(...)  \,
+#define Z_IS_2026U_EQ_2026U(...) \,
+#define Z_IS_2027_EQ_2027(...)   \,
+#define Z_IS_2027U_EQ_2027(...)  \,
+#define Z_IS_2027_EQ_2027U(...)  \,
+#define Z_IS_2027U_EQ_2027U(...) \,
+#define Z_IS_2028_EQ_2028(...)   \,
+#define Z_IS_2028U_EQ_2028(...)  \,
+#define Z_IS_2028_EQ_2028U(...)  \,
+#define Z_IS_2028U_EQ_2028U(...) \,
+#define Z_IS_2029_EQ_2029(...)   \,
+#define Z_IS_2029U_EQ_2029(...)  \,
+#define Z_IS_2029_EQ_2029U(...)  \,
+#define Z_IS_2029U_EQ_2029U(...) \,
+#define Z_IS_2030_EQ_2030(...)   \,
+#define Z_IS_2030U_EQ_2030(...)  \,
+#define Z_IS_2030_EQ_2030U(...)  \,
+#define Z_IS_2030U_EQ_2030U(...) \,
+#define Z_IS_2031_EQ_2031(...)   \,
+#define Z_IS_2031U_EQ_2031(...)  \,
+#define Z_IS_2031_EQ_2031U(...)  \,
+#define Z_IS_2031U_EQ_2031U(...) \,
+#define Z_IS_2032_EQ_2032(...)   \,
+#define Z_IS_2032U_EQ_2032(...)  \,
+#define Z_IS_2032_EQ_2032U(...)  \,
+#define Z_IS_2032U_EQ_2032U(...) \,
+#define Z_IS_2033_EQ_2033(...)   \,
+#define Z_IS_2033U_EQ_2033(...)  \,
+#define Z_IS_2033_EQ_2033U(...)  \,
+#define Z_IS_2033U_EQ_2033U(...) \,
+#define Z_IS_2034_EQ_2034(...)   \,
+#define Z_IS_2034U_EQ_2034(...)  \,
+#define Z_IS_2034_EQ_2034U(...)  \,
+#define Z_IS_2034U_EQ_2034U(...) \,
+#define Z_IS_2035_EQ_2035(...)   \,
+#define Z_IS_2035U_EQ_2035(...)  \,
+#define Z_IS_2035_EQ_2035U(...)  \,
+#define Z_IS_2035U_EQ_2035U(...) \,
+#define Z_IS_2036_EQ_2036(...)   \,
+#define Z_IS_2036U_EQ_2036(...)  \,
+#define Z_IS_2036_EQ_2036U(...)  \,
+#define Z_IS_2036U_EQ_2036U(...) \,
+#define Z_IS_2037_EQ_2037(...)   \,
+#define Z_IS_2037U_EQ_2037(...)  \,
+#define Z_IS_2037_EQ_2037U(...)  \,
+#define Z_IS_2037U_EQ_2037U(...) \,
+#define Z_IS_2038_EQ_2038(...)   \,
+#define Z_IS_2038U_EQ_2038(...)  \,
+#define Z_IS_2038_EQ_2038U(...)  \,
+#define Z_IS_2038U_EQ_2038U(...) \,
+#define Z_IS_2039_EQ_2039(...)   \,
+#define Z_IS_2039U_EQ_2039(...)  \,
+#define Z_IS_2039_EQ_2039U(...)  \,
+#define Z_IS_2039U_EQ_2039U(...) \,
+#define Z_IS_2040_EQ_2040(...)   \,
+#define Z_IS_2040U_EQ_2040(...)  \,
+#define Z_IS_2040_EQ_2040U(...)  \,
+#define Z_IS_2040U_EQ_2040U(...) \,
+#define Z_IS_2041_EQ_2041(...)   \,
+#define Z_IS_2041U_EQ_2041(...)  \,
+#define Z_IS_2041_EQ_2041U(...)  \,
+#define Z_IS_2041U_EQ_2041U(...) \,
+#define Z_IS_2042_EQ_2042(...)   \,
+#define Z_IS_2042U_EQ_2042(...)  \,
+#define Z_IS_2042_EQ_2042U(...)  \,
+#define Z_IS_2042U_EQ_2042U(...) \,
+#define Z_IS_2043_EQ_2043(...)   \,
+#define Z_IS_2043U_EQ_2043(...)  \,
+#define Z_IS_2043_EQ_2043U(...)  \,
+#define Z_IS_2043U_EQ_2043U(...) \,
+#define Z_IS_2044_EQ_2044(...)   \,
+#define Z_IS_2044U_EQ_2044(...)  \,
+#define Z_IS_2044_EQ_2044U(...)  \,
+#define Z_IS_2044U_EQ_2044U(...) \,
+#define Z_IS_2045_EQ_2045(...)   \,
+#define Z_IS_2045U_EQ_2045(...)  \,
+#define Z_IS_2045_EQ_2045U(...)  \,
+#define Z_IS_2045U_EQ_2045U(...) \,
+#define Z_IS_2046_EQ_2046(...)   \,
+#define Z_IS_2046U_EQ_2046(...)  \,
+#define Z_IS_2046_EQ_2046U(...)  \,
+#define Z_IS_2046U_EQ_2046U(...) \,
+#define Z_IS_2047_EQ_2047(...)   \,
+#define Z_IS_2047U_EQ_2047(...)  \,
+#define Z_IS_2047_EQ_2047U(...)  \,
+#define Z_IS_2047U_EQ_2047U(...) \,
+#define Z_IS_2048_EQ_2048(...)   \,
+#define Z_IS_2048U_EQ_2048(...)  \,
+#define Z_IS_2048_EQ_2048U(...)  \,
+#define Z_IS_2048U_EQ_2048U(...) \,
+#define Z_IS_2049_EQ_2049(...)   \,
+#define Z_IS_2049U_EQ_2049(...)  \,
+#define Z_IS_2049_EQ_2049U(...)  \,
+#define Z_IS_2049U_EQ_2049U(...) \,
+#define Z_IS_2050_EQ_2050(...)   \,
+#define Z_IS_2050U_EQ_2050(...)  \,
+#define Z_IS_2050_EQ_2050U(...)  \,
+#define Z_IS_2050U_EQ_2050U(...) \,
+#define Z_IS_2051_EQ_2051(...)   \,
+#define Z_IS_2051U_EQ_2051(...)  \,
+#define Z_IS_2051_EQ_2051U(...)  \,
+#define Z_IS_2051U_EQ_2051U(...) \,
+#define Z_IS_2052_EQ_2052(...)   \,
+#define Z_IS_2052U_EQ_2052(...)  \,
+#define Z_IS_2052_EQ_2052U(...)  \,
+#define Z_IS_2052U_EQ_2052U(...) \,
+#define Z_IS_2053_EQ_2053(...)   \,
+#define Z_IS_2053U_EQ_2053(...)  \,
+#define Z_IS_2053_EQ_2053U(...)  \,
+#define Z_IS_2053U_EQ_2053U(...) \,
+#define Z_IS_2054_EQ_2054(...)   \,
+#define Z_IS_2054U_EQ_2054(...)  \,
+#define Z_IS_2054_EQ_2054U(...)  \,
+#define Z_IS_2054U_EQ_2054U(...) \,
+#define Z_IS_2055_EQ_2055(...)   \,
+#define Z_IS_2055U_EQ_2055(...)  \,
+#define Z_IS_2055_EQ_2055U(...)  \,
+#define Z_IS_2055U_EQ_2055U(...) \,
+#define Z_IS_2056_EQ_2056(...)   \,
+#define Z_IS_2056U_EQ_2056(...)  \,
+#define Z_IS_2056_EQ_2056U(...)  \,
+#define Z_IS_2056U_EQ_2056U(...) \,
+#define Z_IS_2057_EQ_2057(...)   \,
+#define Z_IS_2057U_EQ_2057(...)  \,
+#define Z_IS_2057_EQ_2057U(...)  \,
+#define Z_IS_2057U_EQ_2057U(...) \,
+#define Z_IS_2058_EQ_2058(...)   \,
+#define Z_IS_2058U_EQ_2058(...)  \,
+#define Z_IS_2058_EQ_2058U(...)  \,
+#define Z_IS_2058U_EQ_2058U(...) \,
+#define Z_IS_2059_EQ_2059(...)   \,
+#define Z_IS_2059U_EQ_2059(...)  \,
+#define Z_IS_2059_EQ_2059U(...)  \,
+#define Z_IS_2059U_EQ_2059U(...) \,
+#define Z_IS_2060_EQ_2060(...)   \,
+#define Z_IS_2060U_EQ_2060(...)  \,
+#define Z_IS_2060_EQ_2060U(...)  \,
+#define Z_IS_2060U_EQ_2060U(...) \,
+#define Z_IS_2061_EQ_2061(...)   \,
+#define Z_IS_2061U_EQ_2061(...)  \,
+#define Z_IS_2061_EQ_2061U(...)  \,
+#define Z_IS_2061U_EQ_2061U(...) \,
+#define Z_IS_2062_EQ_2062(...)   \,
+#define Z_IS_2062U_EQ_2062(...)  \,
+#define Z_IS_2062_EQ_2062U(...)  \,
+#define Z_IS_2062U_EQ_2062U(...) \,
+#define Z_IS_2063_EQ_2063(...)   \,
+#define Z_IS_2063U_EQ_2063(...)  \,
+#define Z_IS_2063_EQ_2063U(...)  \,
+#define Z_IS_2063U_EQ_2063U(...) \,
+#define Z_IS_2064_EQ_2064(...)   \,
+#define Z_IS_2064U_EQ_2064(...)  \,
+#define Z_IS_2064_EQ_2064U(...)  \,
+#define Z_IS_2064U_EQ_2064U(...) \,
+#define Z_IS_2065_EQ_2065(...)   \,
+#define Z_IS_2065U_EQ_2065(...)  \,
+#define Z_IS_2065_EQ_2065U(...)  \,
+#define Z_IS_2065U_EQ_2065U(...) \,
+#define Z_IS_2066_EQ_2066(...)   \,
+#define Z_IS_2066U_EQ_2066(...)  \,
+#define Z_IS_2066_EQ_2066U(...)  \,
+#define Z_IS_2066U_EQ_2066U(...) \,
+#define Z_IS_2067_EQ_2067(...)   \,
+#define Z_IS_2067U_EQ_2067(...)  \,
+#define Z_IS_2067_EQ_2067U(...)  \,
+#define Z_IS_2067U_EQ_2067U(...) \,
+#define Z_IS_2068_EQ_2068(...)   \,
+#define Z_IS_2068U_EQ_2068(...)  \,
+#define Z_IS_2068_EQ_2068U(...)  \,
+#define Z_IS_2068U_EQ_2068U(...) \,
+#define Z_IS_2069_EQ_2069(...)   \,
+#define Z_IS_2069U_EQ_2069(...)  \,
+#define Z_IS_2069_EQ_2069U(...)  \,
+#define Z_IS_2069U_EQ_2069U(...) \,
+#define Z_IS_2070_EQ_2070(...)   \,
+#define Z_IS_2070U_EQ_2070(...)  \,
+#define Z_IS_2070_EQ_2070U(...)  \,
+#define Z_IS_2070U_EQ_2070U(...) \,
+#define Z_IS_2071_EQ_2071(...)   \,
+#define Z_IS_2071U_EQ_2071(...)  \,
+#define Z_IS_2071_EQ_2071U(...)  \,
+#define Z_IS_2071U_EQ_2071U(...) \,
+#define Z_IS_2072_EQ_2072(...)   \,
+#define Z_IS_2072U_EQ_2072(...)  \,
+#define Z_IS_2072_EQ_2072U(...)  \,
+#define Z_IS_2072U_EQ_2072U(...) \,
+#define Z_IS_2073_EQ_2073(...)   \,
+#define Z_IS_2073U_EQ_2073(...)  \,
+#define Z_IS_2073_EQ_2073U(...)  \,
+#define Z_IS_2073U_EQ_2073U(...) \,
+#define Z_IS_2074_EQ_2074(...)   \,
+#define Z_IS_2074U_EQ_2074(...)  \,
+#define Z_IS_2074_EQ_2074U(...)  \,
+#define Z_IS_2074U_EQ_2074U(...) \,
+#define Z_IS_2075_EQ_2075(...)   \,
+#define Z_IS_2075U_EQ_2075(...)  \,
+#define Z_IS_2075_EQ_2075U(...)  \,
+#define Z_IS_2075U_EQ_2075U(...) \,
+#define Z_IS_2076_EQ_2076(...)   \,
+#define Z_IS_2076U_EQ_2076(...)  \,
+#define Z_IS_2076_EQ_2076U(...)  \,
+#define Z_IS_2076U_EQ_2076U(...) \,
+#define Z_IS_2077_EQ_2077(...)   \,
+#define Z_IS_2077U_EQ_2077(...)  \,
+#define Z_IS_2077_EQ_2077U(...)  \,
+#define Z_IS_2077U_EQ_2077U(...) \,
+#define Z_IS_2078_EQ_2078(...)   \,
+#define Z_IS_2078U_EQ_2078(...)  \,
+#define Z_IS_2078_EQ_2078U(...)  \,
+#define Z_IS_2078U_EQ_2078U(...) \,
+#define Z_IS_2079_EQ_2079(...)   \,
+#define Z_IS_2079U_EQ_2079(...)  \,
+#define Z_IS_2079_EQ_2079U(...)  \,
+#define Z_IS_2079U_EQ_2079U(...) \,
+#define Z_IS_2080_EQ_2080(...)   \,
+#define Z_IS_2080U_EQ_2080(...)  \,
+#define Z_IS_2080_EQ_2080U(...)  \,
+#define Z_IS_2080U_EQ_2080U(...) \,
+#define Z_IS_2081_EQ_2081(...)   \,
+#define Z_IS_2081U_EQ_2081(...)  \,
+#define Z_IS_2081_EQ_2081U(...)  \,
+#define Z_IS_2081U_EQ_2081U(...) \,
+#define Z_IS_2082_EQ_2082(...)   \,
+#define Z_IS_2082U_EQ_2082(...)  \,
+#define Z_IS_2082_EQ_2082U(...)  \,
+#define Z_IS_2082U_EQ_2082U(...) \,
+#define Z_IS_2083_EQ_2083(...)   \,
+#define Z_IS_2083U_EQ_2083(...)  \,
+#define Z_IS_2083_EQ_2083U(...)  \,
+#define Z_IS_2083U_EQ_2083U(...) \,
+#define Z_IS_2084_EQ_2084(...)   \,
+#define Z_IS_2084U_EQ_2084(...)  \,
+#define Z_IS_2084_EQ_2084U(...)  \,
+#define Z_IS_2084U_EQ_2084U(...) \,
+#define Z_IS_2085_EQ_2085(...)   \,
+#define Z_IS_2085U_EQ_2085(...)  \,
+#define Z_IS_2085_EQ_2085U(...)  \,
+#define Z_IS_2085U_EQ_2085U(...) \,
+#define Z_IS_2086_EQ_2086(...)   \,
+#define Z_IS_2086U_EQ_2086(...)  \,
+#define Z_IS_2086_EQ_2086U(...)  \,
+#define Z_IS_2086U_EQ_2086U(...) \,
+#define Z_IS_2087_EQ_2087(...)   \,
+#define Z_IS_2087U_EQ_2087(...)  \,
+#define Z_IS_2087_EQ_2087U(...)  \,
+#define Z_IS_2087U_EQ_2087U(...) \,
+#define Z_IS_2088_EQ_2088(...)   \,
+#define Z_IS_2088U_EQ_2088(...)  \,
+#define Z_IS_2088_EQ_2088U(...)  \,
+#define Z_IS_2088U_EQ_2088U(...) \,
+#define Z_IS_2089_EQ_2089(...)   \,
+#define Z_IS_2089U_EQ_2089(...)  \,
+#define Z_IS_2089_EQ_2089U(...)  \,
+#define Z_IS_2089U_EQ_2089U(...) \,
+#define Z_IS_2090_EQ_2090(...)   \,
+#define Z_IS_2090U_EQ_2090(...)  \,
+#define Z_IS_2090_EQ_2090U(...)  \,
+#define Z_IS_2090U_EQ_2090U(...) \,
+#define Z_IS_2091_EQ_2091(...)   \,
+#define Z_IS_2091U_EQ_2091(...)  \,
+#define Z_IS_2091_EQ_2091U(...)  \,
+#define Z_IS_2091U_EQ_2091U(...) \,
+#define Z_IS_2092_EQ_2092(...)   \,
+#define Z_IS_2092U_EQ_2092(...)  \,
+#define Z_IS_2092_EQ_2092U(...)  \,
+#define Z_IS_2092U_EQ_2092U(...) \,
+#define Z_IS_2093_EQ_2093(...)   \,
+#define Z_IS_2093U_EQ_2093(...)  \,
+#define Z_IS_2093_EQ_2093U(...)  \,
+#define Z_IS_2093U_EQ_2093U(...) \,
+#define Z_IS_2094_EQ_2094(...)   \,
+#define Z_IS_2094U_EQ_2094(...)  \,
+#define Z_IS_2094_EQ_2094U(...)  \,
+#define Z_IS_2094U_EQ_2094U(...) \,
+#define Z_IS_2095_EQ_2095(...)   \,
+#define Z_IS_2095U_EQ_2095(...)  \,
+#define Z_IS_2095_EQ_2095U(...)  \,
+#define Z_IS_2095U_EQ_2095U(...) \,
+#define Z_IS_2096_EQ_2096(...)   \,
+#define Z_IS_2096U_EQ_2096(...)  \,
+#define Z_IS_2096_EQ_2096U(...)  \,
+#define Z_IS_2096U_EQ_2096U(...) \,
+#define Z_IS_2097_EQ_2097(...)   \,
+#define Z_IS_2097U_EQ_2097(...)  \,
+#define Z_IS_2097_EQ_2097U(...)  \,
+#define Z_IS_2097U_EQ_2097U(...) \,
+#define Z_IS_2098_EQ_2098(...)   \,
+#define Z_IS_2098U_EQ_2098(...)  \,
+#define Z_IS_2098_EQ_2098U(...)  \,
+#define Z_IS_2098U_EQ_2098U(...) \,
+#define Z_IS_2099_EQ_2099(...)   \,
+#define Z_IS_2099U_EQ_2099(...)  \,
+#define Z_IS_2099_EQ_2099U(...)  \,
+#define Z_IS_2099U_EQ_2099U(...) \,
+#define Z_IS_2100_EQ_2100(...)   \,
+#define Z_IS_2100U_EQ_2100(...)  \,
+#define Z_IS_2100_EQ_2100U(...)  \,
+#define Z_IS_2100U_EQ_2100U(...) \,
+#define Z_IS_2101_EQ_2101(...)   \,
+#define Z_IS_2101U_EQ_2101(...)  \,
+#define Z_IS_2101_EQ_2101U(...)  \,
+#define Z_IS_2101U_EQ_2101U(...) \,
+#define Z_IS_2102_EQ_2102(...)   \,
+#define Z_IS_2102U_EQ_2102(...)  \,
+#define Z_IS_2102_EQ_2102U(...)  \,
+#define Z_IS_2102U_EQ_2102U(...) \,
+#define Z_IS_2103_EQ_2103(...)   \,
+#define Z_IS_2103U_EQ_2103(...)  \,
+#define Z_IS_2103_EQ_2103U(...)  \,
+#define Z_IS_2103U_EQ_2103U(...) \,
+#define Z_IS_2104_EQ_2104(...)   \,
+#define Z_IS_2104U_EQ_2104(...)  \,
+#define Z_IS_2104_EQ_2104U(...)  \,
+#define Z_IS_2104U_EQ_2104U(...) \,
+#define Z_IS_2105_EQ_2105(...)   \,
+#define Z_IS_2105U_EQ_2105(...)  \,
+#define Z_IS_2105_EQ_2105U(...)  \,
+#define Z_IS_2105U_EQ_2105U(...) \,
+#define Z_IS_2106_EQ_2106(...)   \,
+#define Z_IS_2106U_EQ_2106(...)  \,
+#define Z_IS_2106_EQ_2106U(...)  \,
+#define Z_IS_2106U_EQ_2106U(...) \,
+#define Z_IS_2107_EQ_2107(...)   \,
+#define Z_IS_2107U_EQ_2107(...)  \,
+#define Z_IS_2107_EQ_2107U(...)  \,
+#define Z_IS_2107U_EQ_2107U(...) \,
+#define Z_IS_2108_EQ_2108(...)   \,
+#define Z_IS_2108U_EQ_2108(...)  \,
+#define Z_IS_2108_EQ_2108U(...)  \,
+#define Z_IS_2108U_EQ_2108U(...) \,
+#define Z_IS_2109_EQ_2109(...)   \,
+#define Z_IS_2109U_EQ_2109(...)  \,
+#define Z_IS_2109_EQ_2109U(...)  \,
+#define Z_IS_2109U_EQ_2109U(...) \,
+#define Z_IS_2110_EQ_2110(...)   \,
+#define Z_IS_2110U_EQ_2110(...)  \,
+#define Z_IS_2110_EQ_2110U(...)  \,
+#define Z_IS_2110U_EQ_2110U(...) \,
+#define Z_IS_2111_EQ_2111(...)   \,
+#define Z_IS_2111U_EQ_2111(...)  \,
+#define Z_IS_2111_EQ_2111U(...)  \,
+#define Z_IS_2111U_EQ_2111U(...) \,
+#define Z_IS_2112_EQ_2112(...)   \,
+#define Z_IS_2112U_EQ_2112(...)  \,
+#define Z_IS_2112_EQ_2112U(...)  \,
+#define Z_IS_2112U_EQ_2112U(...) \,
+#define Z_IS_2113_EQ_2113(...)   \,
+#define Z_IS_2113U_EQ_2113(...)  \,
+#define Z_IS_2113_EQ_2113U(...)  \,
+#define Z_IS_2113U_EQ_2113U(...) \,
+#define Z_IS_2114_EQ_2114(...)   \,
+#define Z_IS_2114U_EQ_2114(...)  \,
+#define Z_IS_2114_EQ_2114U(...)  \,
+#define Z_IS_2114U_EQ_2114U(...) \,
+#define Z_IS_2115_EQ_2115(...)   \,
+#define Z_IS_2115U_EQ_2115(...)  \,
+#define Z_IS_2115_EQ_2115U(...)  \,
+#define Z_IS_2115U_EQ_2115U(...) \,
+#define Z_IS_2116_EQ_2116(...)   \,
+#define Z_IS_2116U_EQ_2116(...)  \,
+#define Z_IS_2116_EQ_2116U(...)  \,
+#define Z_IS_2116U_EQ_2116U(...) \,
+#define Z_IS_2117_EQ_2117(...)   \,
+#define Z_IS_2117U_EQ_2117(...)  \,
+#define Z_IS_2117_EQ_2117U(...)  \,
+#define Z_IS_2117U_EQ_2117U(...) \,
+#define Z_IS_2118_EQ_2118(...)   \,
+#define Z_IS_2118U_EQ_2118(...)  \,
+#define Z_IS_2118_EQ_2118U(...)  \,
+#define Z_IS_2118U_EQ_2118U(...) \,
+#define Z_IS_2119_EQ_2119(...)   \,
+#define Z_IS_2119U_EQ_2119(...)  \,
+#define Z_IS_2119_EQ_2119U(...)  \,
+#define Z_IS_2119U_EQ_2119U(...) \,
+#define Z_IS_2120_EQ_2120(...)   \,
+#define Z_IS_2120U_EQ_2120(...)  \,
+#define Z_IS_2120_EQ_2120U(...)  \,
+#define Z_IS_2120U_EQ_2120U(...) \,
+#define Z_IS_2121_EQ_2121(...)   \,
+#define Z_IS_2121U_EQ_2121(...)  \,
+#define Z_IS_2121_EQ_2121U(...)  \,
+#define Z_IS_2121U_EQ_2121U(...) \,
+#define Z_IS_2122_EQ_2122(...)   \,
+#define Z_IS_2122U_EQ_2122(...)  \,
+#define Z_IS_2122_EQ_2122U(...)  \,
+#define Z_IS_2122U_EQ_2122U(...) \,
+#define Z_IS_2123_EQ_2123(...)   \,
+#define Z_IS_2123U_EQ_2123(...)  \,
+#define Z_IS_2123_EQ_2123U(...)  \,
+#define Z_IS_2123U_EQ_2123U(...) \,
+#define Z_IS_2124_EQ_2124(...)   \,
+#define Z_IS_2124U_EQ_2124(...)  \,
+#define Z_IS_2124_EQ_2124U(...)  \,
+#define Z_IS_2124U_EQ_2124U(...) \,
+#define Z_IS_2125_EQ_2125(...)   \,
+#define Z_IS_2125U_EQ_2125(...)  \,
+#define Z_IS_2125_EQ_2125U(...)  \,
+#define Z_IS_2125U_EQ_2125U(...) \,
+#define Z_IS_2126_EQ_2126(...)   \,
+#define Z_IS_2126U_EQ_2126(...)  \,
+#define Z_IS_2126_EQ_2126U(...)  \,
+#define Z_IS_2126U_EQ_2126U(...) \,
+#define Z_IS_2127_EQ_2127(...)   \,
+#define Z_IS_2127U_EQ_2127(...)  \,
+#define Z_IS_2127_EQ_2127U(...)  \,
+#define Z_IS_2127U_EQ_2127U(...) \,
+#define Z_IS_2128_EQ_2128(...)   \,
+#define Z_IS_2128U_EQ_2128(...)  \,
+#define Z_IS_2128_EQ_2128U(...)  \,
+#define Z_IS_2128U_EQ_2128U(...) \,
+#define Z_IS_2129_EQ_2129(...)   \,
+#define Z_IS_2129U_EQ_2129(...)  \,
+#define Z_IS_2129_EQ_2129U(...)  \,
+#define Z_IS_2129U_EQ_2129U(...) \,
+#define Z_IS_2130_EQ_2130(...)   \,
+#define Z_IS_2130U_EQ_2130(...)  \,
+#define Z_IS_2130_EQ_2130U(...)  \,
+#define Z_IS_2130U_EQ_2130U(...) \,
+#define Z_IS_2131_EQ_2131(...)   \,
+#define Z_IS_2131U_EQ_2131(...)  \,
+#define Z_IS_2131_EQ_2131U(...)  \,
+#define Z_IS_2131U_EQ_2131U(...) \,
+#define Z_IS_2132_EQ_2132(...)   \,
+#define Z_IS_2132U_EQ_2132(...)  \,
+#define Z_IS_2132_EQ_2132U(...)  \,
+#define Z_IS_2132U_EQ_2132U(...) \,
+#define Z_IS_2133_EQ_2133(...)   \,
+#define Z_IS_2133U_EQ_2133(...)  \,
+#define Z_IS_2133_EQ_2133U(...)  \,
+#define Z_IS_2133U_EQ_2133U(...) \,
+#define Z_IS_2134_EQ_2134(...)   \,
+#define Z_IS_2134U_EQ_2134(...)  \,
+#define Z_IS_2134_EQ_2134U(...)  \,
+#define Z_IS_2134U_EQ_2134U(...) \,
+#define Z_IS_2135_EQ_2135(...)   \,
+#define Z_IS_2135U_EQ_2135(...)  \,
+#define Z_IS_2135_EQ_2135U(...)  \,
+#define Z_IS_2135U_EQ_2135U(...) \,
+#define Z_IS_2136_EQ_2136(...)   \,
+#define Z_IS_2136U_EQ_2136(...)  \,
+#define Z_IS_2136_EQ_2136U(...)  \,
+#define Z_IS_2136U_EQ_2136U(...) \,
+#define Z_IS_2137_EQ_2137(...)   \,
+#define Z_IS_2137U_EQ_2137(...)  \,
+#define Z_IS_2137_EQ_2137U(...)  \,
+#define Z_IS_2137U_EQ_2137U(...) \,
+#define Z_IS_2138_EQ_2138(...)   \,
+#define Z_IS_2138U_EQ_2138(...)  \,
+#define Z_IS_2138_EQ_2138U(...)  \,
+#define Z_IS_2138U_EQ_2138U(...) \,
+#define Z_IS_2139_EQ_2139(...)   \,
+#define Z_IS_2139U_EQ_2139(...)  \,
+#define Z_IS_2139_EQ_2139U(...)  \,
+#define Z_IS_2139U_EQ_2139U(...) \,
+#define Z_IS_2140_EQ_2140(...)   \,
+#define Z_IS_2140U_EQ_2140(...)  \,
+#define Z_IS_2140_EQ_2140U(...)  \,
+#define Z_IS_2140U_EQ_2140U(...) \,
+#define Z_IS_2141_EQ_2141(...)   \,
+#define Z_IS_2141U_EQ_2141(...)  \,
+#define Z_IS_2141_EQ_2141U(...)  \,
+#define Z_IS_2141U_EQ_2141U(...) \,
+#define Z_IS_2142_EQ_2142(...)   \,
+#define Z_IS_2142U_EQ_2142(...)  \,
+#define Z_IS_2142_EQ_2142U(...)  \,
+#define Z_IS_2142U_EQ_2142U(...) \,
+#define Z_IS_2143_EQ_2143(...)   \,
+#define Z_IS_2143U_EQ_2143(...)  \,
+#define Z_IS_2143_EQ_2143U(...)  \,
+#define Z_IS_2143U_EQ_2143U(...) \,
+#define Z_IS_2144_EQ_2144(...)   \,
+#define Z_IS_2144U_EQ_2144(...)  \,
+#define Z_IS_2144_EQ_2144U(...)  \,
+#define Z_IS_2144U_EQ_2144U(...) \,
+#define Z_IS_2145_EQ_2145(...)   \,
+#define Z_IS_2145U_EQ_2145(...)  \,
+#define Z_IS_2145_EQ_2145U(...)  \,
+#define Z_IS_2145U_EQ_2145U(...) \,
+#define Z_IS_2146_EQ_2146(...)   \,
+#define Z_IS_2146U_EQ_2146(...)  \,
+#define Z_IS_2146_EQ_2146U(...)  \,
+#define Z_IS_2146U_EQ_2146U(...) \,
+#define Z_IS_2147_EQ_2147(...)   \,
+#define Z_IS_2147U_EQ_2147(...)  \,
+#define Z_IS_2147_EQ_2147U(...)  \,
+#define Z_IS_2147U_EQ_2147U(...) \,
+#define Z_IS_2148_EQ_2148(...)   \,
+#define Z_IS_2148U_EQ_2148(...)  \,
+#define Z_IS_2148_EQ_2148U(...)  \,
+#define Z_IS_2148U_EQ_2148U(...) \,
+#define Z_IS_2149_EQ_2149(...)   \,
+#define Z_IS_2149U_EQ_2149(...)  \,
+#define Z_IS_2149_EQ_2149U(...)  \,
+#define Z_IS_2149U_EQ_2149U(...) \,
+#define Z_IS_2150_EQ_2150(...)   \,
+#define Z_IS_2150U_EQ_2150(...)  \,
+#define Z_IS_2150_EQ_2150U(...)  \,
+#define Z_IS_2150U_EQ_2150U(...) \,
+#define Z_IS_2151_EQ_2151(...)   \,
+#define Z_IS_2151U_EQ_2151(...)  \,
+#define Z_IS_2151_EQ_2151U(...)  \,
+#define Z_IS_2151U_EQ_2151U(...) \,
+#define Z_IS_2152_EQ_2152(...)   \,
+#define Z_IS_2152U_EQ_2152(...)  \,
+#define Z_IS_2152_EQ_2152U(...)  \,
+#define Z_IS_2152U_EQ_2152U(...) \,
+#define Z_IS_2153_EQ_2153(...)   \,
+#define Z_IS_2153U_EQ_2153(...)  \,
+#define Z_IS_2153_EQ_2153U(...)  \,
+#define Z_IS_2153U_EQ_2153U(...) \,
+#define Z_IS_2154_EQ_2154(...)   \,
+#define Z_IS_2154U_EQ_2154(...)  \,
+#define Z_IS_2154_EQ_2154U(...)  \,
+#define Z_IS_2154U_EQ_2154U(...) \,
+#define Z_IS_2155_EQ_2155(...)   \,
+#define Z_IS_2155U_EQ_2155(...)  \,
+#define Z_IS_2155_EQ_2155U(...)  \,
+#define Z_IS_2155U_EQ_2155U(...) \,
+#define Z_IS_2156_EQ_2156(...)   \,
+#define Z_IS_2156U_EQ_2156(...)  \,
+#define Z_IS_2156_EQ_2156U(...)  \,
+#define Z_IS_2156U_EQ_2156U(...) \,
+#define Z_IS_2157_EQ_2157(...)   \,
+#define Z_IS_2157U_EQ_2157(...)  \,
+#define Z_IS_2157_EQ_2157U(...)  \,
+#define Z_IS_2157U_EQ_2157U(...) \,
+#define Z_IS_2158_EQ_2158(...)   \,
+#define Z_IS_2158U_EQ_2158(...)  \,
+#define Z_IS_2158_EQ_2158U(...)  \,
+#define Z_IS_2158U_EQ_2158U(...) \,
+#define Z_IS_2159_EQ_2159(...)   \,
+#define Z_IS_2159U_EQ_2159(...)  \,
+#define Z_IS_2159_EQ_2159U(...)  \,
+#define Z_IS_2159U_EQ_2159U(...) \,
+#define Z_IS_2160_EQ_2160(...)   \,
+#define Z_IS_2160U_EQ_2160(...)  \,
+#define Z_IS_2160_EQ_2160U(...)  \,
+#define Z_IS_2160U_EQ_2160U(...) \,
+#define Z_IS_2161_EQ_2161(...)   \,
+#define Z_IS_2161U_EQ_2161(...)  \,
+#define Z_IS_2161_EQ_2161U(...)  \,
+#define Z_IS_2161U_EQ_2161U(...) \,
+#define Z_IS_2162_EQ_2162(...)   \,
+#define Z_IS_2162U_EQ_2162(...)  \,
+#define Z_IS_2162_EQ_2162U(...)  \,
+#define Z_IS_2162U_EQ_2162U(...) \,
+#define Z_IS_2163_EQ_2163(...)   \,
+#define Z_IS_2163U_EQ_2163(...)  \,
+#define Z_IS_2163_EQ_2163U(...)  \,
+#define Z_IS_2163U_EQ_2163U(...) \,
+#define Z_IS_2164_EQ_2164(...)   \,
+#define Z_IS_2164U_EQ_2164(...)  \,
+#define Z_IS_2164_EQ_2164U(...)  \,
+#define Z_IS_2164U_EQ_2164U(...) \,
+#define Z_IS_2165_EQ_2165(...)   \,
+#define Z_IS_2165U_EQ_2165(...)  \,
+#define Z_IS_2165_EQ_2165U(...)  \,
+#define Z_IS_2165U_EQ_2165U(...) \,
+#define Z_IS_2166_EQ_2166(...)   \,
+#define Z_IS_2166U_EQ_2166(...)  \,
+#define Z_IS_2166_EQ_2166U(...)  \,
+#define Z_IS_2166U_EQ_2166U(...) \,
+#define Z_IS_2167_EQ_2167(...)   \,
+#define Z_IS_2167U_EQ_2167(...)  \,
+#define Z_IS_2167_EQ_2167U(...)  \,
+#define Z_IS_2167U_EQ_2167U(...) \,
+#define Z_IS_2168_EQ_2168(...)   \,
+#define Z_IS_2168U_EQ_2168(...)  \,
+#define Z_IS_2168_EQ_2168U(...)  \,
+#define Z_IS_2168U_EQ_2168U(...) \,
+#define Z_IS_2169_EQ_2169(...)   \,
+#define Z_IS_2169U_EQ_2169(...)  \,
+#define Z_IS_2169_EQ_2169U(...)  \,
+#define Z_IS_2169U_EQ_2169U(...) \,
+#define Z_IS_2170_EQ_2170(...)   \,
+#define Z_IS_2170U_EQ_2170(...)  \,
+#define Z_IS_2170_EQ_2170U(...)  \,
+#define Z_IS_2170U_EQ_2170U(...) \,
+#define Z_IS_2171_EQ_2171(...)   \,
+#define Z_IS_2171U_EQ_2171(...)  \,
+#define Z_IS_2171_EQ_2171U(...)  \,
+#define Z_IS_2171U_EQ_2171U(...) \,
+#define Z_IS_2172_EQ_2172(...)   \,
+#define Z_IS_2172U_EQ_2172(...)  \,
+#define Z_IS_2172_EQ_2172U(...)  \,
+#define Z_IS_2172U_EQ_2172U(...) \,
+#define Z_IS_2173_EQ_2173(...)   \,
+#define Z_IS_2173U_EQ_2173(...)  \,
+#define Z_IS_2173_EQ_2173U(...)  \,
+#define Z_IS_2173U_EQ_2173U(...) \,
+#define Z_IS_2174_EQ_2174(...)   \,
+#define Z_IS_2174U_EQ_2174(...)  \,
+#define Z_IS_2174_EQ_2174U(...)  \,
+#define Z_IS_2174U_EQ_2174U(...) \,
+#define Z_IS_2175_EQ_2175(...)   \,
+#define Z_IS_2175U_EQ_2175(...)  \,
+#define Z_IS_2175_EQ_2175U(...)  \,
+#define Z_IS_2175U_EQ_2175U(...) \,
+#define Z_IS_2176_EQ_2176(...)   \,
+#define Z_IS_2176U_EQ_2176(...)  \,
+#define Z_IS_2176_EQ_2176U(...)  \,
+#define Z_IS_2176U_EQ_2176U(...) \,
+#define Z_IS_2177_EQ_2177(...)   \,
+#define Z_IS_2177U_EQ_2177(...)  \,
+#define Z_IS_2177_EQ_2177U(...)  \,
+#define Z_IS_2177U_EQ_2177U(...) \,
+#define Z_IS_2178_EQ_2178(...)   \,
+#define Z_IS_2178U_EQ_2178(...)  \,
+#define Z_IS_2178_EQ_2178U(...)  \,
+#define Z_IS_2178U_EQ_2178U(...) \,
+#define Z_IS_2179_EQ_2179(...)   \,
+#define Z_IS_2179U_EQ_2179(...)  \,
+#define Z_IS_2179_EQ_2179U(...)  \,
+#define Z_IS_2179U_EQ_2179U(...) \,
+#define Z_IS_2180_EQ_2180(...)   \,
+#define Z_IS_2180U_EQ_2180(...)  \,
+#define Z_IS_2180_EQ_2180U(...)  \,
+#define Z_IS_2180U_EQ_2180U(...) \,
+#define Z_IS_2181_EQ_2181(...)   \,
+#define Z_IS_2181U_EQ_2181(...)  \,
+#define Z_IS_2181_EQ_2181U(...)  \,
+#define Z_IS_2181U_EQ_2181U(...) \,
+#define Z_IS_2182_EQ_2182(...)   \,
+#define Z_IS_2182U_EQ_2182(...)  \,
+#define Z_IS_2182_EQ_2182U(...)  \,
+#define Z_IS_2182U_EQ_2182U(...) \,
+#define Z_IS_2183_EQ_2183(...)   \,
+#define Z_IS_2183U_EQ_2183(...)  \,
+#define Z_IS_2183_EQ_2183U(...)  \,
+#define Z_IS_2183U_EQ_2183U(...) \,
+#define Z_IS_2184_EQ_2184(...)   \,
+#define Z_IS_2184U_EQ_2184(...)  \,
+#define Z_IS_2184_EQ_2184U(...)  \,
+#define Z_IS_2184U_EQ_2184U(...) \,
+#define Z_IS_2185_EQ_2185(...)   \,
+#define Z_IS_2185U_EQ_2185(...)  \,
+#define Z_IS_2185_EQ_2185U(...)  \,
+#define Z_IS_2185U_EQ_2185U(...) \,
+#define Z_IS_2186_EQ_2186(...)   \,
+#define Z_IS_2186U_EQ_2186(...)  \,
+#define Z_IS_2186_EQ_2186U(...)  \,
+#define Z_IS_2186U_EQ_2186U(...) \,
+#define Z_IS_2187_EQ_2187(...)   \,
+#define Z_IS_2187U_EQ_2187(...)  \,
+#define Z_IS_2187_EQ_2187U(...)  \,
+#define Z_IS_2187U_EQ_2187U(...) \,
+#define Z_IS_2188_EQ_2188(...)   \,
+#define Z_IS_2188U_EQ_2188(...)  \,
+#define Z_IS_2188_EQ_2188U(...)  \,
+#define Z_IS_2188U_EQ_2188U(...) \,
+#define Z_IS_2189_EQ_2189(...)   \,
+#define Z_IS_2189U_EQ_2189(...)  \,
+#define Z_IS_2189_EQ_2189U(...)  \,
+#define Z_IS_2189U_EQ_2189U(...) \,
+#define Z_IS_2190_EQ_2190(...)   \,
+#define Z_IS_2190U_EQ_2190(...)  \,
+#define Z_IS_2190_EQ_2190U(...)  \,
+#define Z_IS_2190U_EQ_2190U(...) \,
+#define Z_IS_2191_EQ_2191(...)   \,
+#define Z_IS_2191U_EQ_2191(...)  \,
+#define Z_IS_2191_EQ_2191U(...)  \,
+#define Z_IS_2191U_EQ_2191U(...) \,
+#define Z_IS_2192_EQ_2192(...)   \,
+#define Z_IS_2192U_EQ_2192(...)  \,
+#define Z_IS_2192_EQ_2192U(...)  \,
+#define Z_IS_2192U_EQ_2192U(...) \,
+#define Z_IS_2193_EQ_2193(...)   \,
+#define Z_IS_2193U_EQ_2193(...)  \,
+#define Z_IS_2193_EQ_2193U(...)  \,
+#define Z_IS_2193U_EQ_2193U(...) \,
+#define Z_IS_2194_EQ_2194(...)   \,
+#define Z_IS_2194U_EQ_2194(...)  \,
+#define Z_IS_2194_EQ_2194U(...)  \,
+#define Z_IS_2194U_EQ_2194U(...) \,
+#define Z_IS_2195_EQ_2195(...)   \,
+#define Z_IS_2195U_EQ_2195(...)  \,
+#define Z_IS_2195_EQ_2195U(...)  \,
+#define Z_IS_2195U_EQ_2195U(...) \,
+#define Z_IS_2196_EQ_2196(...)   \,
+#define Z_IS_2196U_EQ_2196(...)  \,
+#define Z_IS_2196_EQ_2196U(...)  \,
+#define Z_IS_2196U_EQ_2196U(...) \,
+#define Z_IS_2197_EQ_2197(...)   \,
+#define Z_IS_2197U_EQ_2197(...)  \,
+#define Z_IS_2197_EQ_2197U(...)  \,
+#define Z_IS_2197U_EQ_2197U(...) \,
+#define Z_IS_2198_EQ_2198(...)   \,
+#define Z_IS_2198U_EQ_2198(...)  \,
+#define Z_IS_2198_EQ_2198U(...)  \,
+#define Z_IS_2198U_EQ_2198U(...) \,
+#define Z_IS_2199_EQ_2199(...)   \,
+#define Z_IS_2199U_EQ_2199(...)  \,
+#define Z_IS_2199_EQ_2199U(...)  \,
+#define Z_IS_2199U_EQ_2199U(...) \,
+#define Z_IS_2200_EQ_2200(...)   \,
+#define Z_IS_2200U_EQ_2200(...)  \,
+#define Z_IS_2200_EQ_2200U(...)  \,
+#define Z_IS_2200U_EQ_2200U(...) \,
+#define Z_IS_2201_EQ_2201(...)   \,
+#define Z_IS_2201U_EQ_2201(...)  \,
+#define Z_IS_2201_EQ_2201U(...)  \,
+#define Z_IS_2201U_EQ_2201U(...) \,
+#define Z_IS_2202_EQ_2202(...)   \,
+#define Z_IS_2202U_EQ_2202(...)  \,
+#define Z_IS_2202_EQ_2202U(...)  \,
+#define Z_IS_2202U_EQ_2202U(...) \,
+#define Z_IS_2203_EQ_2203(...)   \,
+#define Z_IS_2203U_EQ_2203(...)  \,
+#define Z_IS_2203_EQ_2203U(...)  \,
+#define Z_IS_2203U_EQ_2203U(...) \,
+#define Z_IS_2204_EQ_2204(...)   \,
+#define Z_IS_2204U_EQ_2204(...)  \,
+#define Z_IS_2204_EQ_2204U(...)  \,
+#define Z_IS_2204U_EQ_2204U(...) \,
+#define Z_IS_2205_EQ_2205(...)   \,
+#define Z_IS_2205U_EQ_2205(...)  \,
+#define Z_IS_2205_EQ_2205U(...)  \,
+#define Z_IS_2205U_EQ_2205U(...) \,
+#define Z_IS_2206_EQ_2206(...)   \,
+#define Z_IS_2206U_EQ_2206(...)  \,
+#define Z_IS_2206_EQ_2206U(...)  \,
+#define Z_IS_2206U_EQ_2206U(...) \,
+#define Z_IS_2207_EQ_2207(...)   \,
+#define Z_IS_2207U_EQ_2207(...)  \,
+#define Z_IS_2207_EQ_2207U(...)  \,
+#define Z_IS_2207U_EQ_2207U(...) \,
+#define Z_IS_2208_EQ_2208(...)   \,
+#define Z_IS_2208U_EQ_2208(...)  \,
+#define Z_IS_2208_EQ_2208U(...)  \,
+#define Z_IS_2208U_EQ_2208U(...) \,
+#define Z_IS_2209_EQ_2209(...)   \,
+#define Z_IS_2209U_EQ_2209(...)  \,
+#define Z_IS_2209_EQ_2209U(...)  \,
+#define Z_IS_2209U_EQ_2209U(...) \,
+#define Z_IS_2210_EQ_2210(...)   \,
+#define Z_IS_2210U_EQ_2210(...)  \,
+#define Z_IS_2210_EQ_2210U(...)  \,
+#define Z_IS_2210U_EQ_2210U(...) \,
+#define Z_IS_2211_EQ_2211(...)   \,
+#define Z_IS_2211U_EQ_2211(...)  \,
+#define Z_IS_2211_EQ_2211U(...)  \,
+#define Z_IS_2211U_EQ_2211U(...) \,
+#define Z_IS_2212_EQ_2212(...)   \,
+#define Z_IS_2212U_EQ_2212(...)  \,
+#define Z_IS_2212_EQ_2212U(...)  \,
+#define Z_IS_2212U_EQ_2212U(...) \,
+#define Z_IS_2213_EQ_2213(...)   \,
+#define Z_IS_2213U_EQ_2213(...)  \,
+#define Z_IS_2213_EQ_2213U(...)  \,
+#define Z_IS_2213U_EQ_2213U(...) \,
+#define Z_IS_2214_EQ_2214(...)   \,
+#define Z_IS_2214U_EQ_2214(...)  \,
+#define Z_IS_2214_EQ_2214U(...)  \,
+#define Z_IS_2214U_EQ_2214U(...) \,
+#define Z_IS_2215_EQ_2215(...)   \,
+#define Z_IS_2215U_EQ_2215(...)  \,
+#define Z_IS_2215_EQ_2215U(...)  \,
+#define Z_IS_2215U_EQ_2215U(...) \,
+#define Z_IS_2216_EQ_2216(...)   \,
+#define Z_IS_2216U_EQ_2216(...)  \,
+#define Z_IS_2216_EQ_2216U(...)  \,
+#define Z_IS_2216U_EQ_2216U(...) \,
+#define Z_IS_2217_EQ_2217(...)   \,
+#define Z_IS_2217U_EQ_2217(...)  \,
+#define Z_IS_2217_EQ_2217U(...)  \,
+#define Z_IS_2217U_EQ_2217U(...) \,
+#define Z_IS_2218_EQ_2218(...)   \,
+#define Z_IS_2218U_EQ_2218(...)  \,
+#define Z_IS_2218_EQ_2218U(...)  \,
+#define Z_IS_2218U_EQ_2218U(...) \,
+#define Z_IS_2219_EQ_2219(...)   \,
+#define Z_IS_2219U_EQ_2219(...)  \,
+#define Z_IS_2219_EQ_2219U(...)  \,
+#define Z_IS_2219U_EQ_2219U(...) \,
+#define Z_IS_2220_EQ_2220(...)   \,
+#define Z_IS_2220U_EQ_2220(...)  \,
+#define Z_IS_2220_EQ_2220U(...)  \,
+#define Z_IS_2220U_EQ_2220U(...) \,
+#define Z_IS_2221_EQ_2221(...)   \,
+#define Z_IS_2221U_EQ_2221(...)  \,
+#define Z_IS_2221_EQ_2221U(...)  \,
+#define Z_IS_2221U_EQ_2221U(...) \,
+#define Z_IS_2222_EQ_2222(...)   \,
+#define Z_IS_2222U_EQ_2222(...)  \,
+#define Z_IS_2222_EQ_2222U(...)  \,
+#define Z_IS_2222U_EQ_2222U(...) \,
+#define Z_IS_2223_EQ_2223(...)   \,
+#define Z_IS_2223U_EQ_2223(...)  \,
+#define Z_IS_2223_EQ_2223U(...)  \,
+#define Z_IS_2223U_EQ_2223U(...) \,
+#define Z_IS_2224_EQ_2224(...)   \,
+#define Z_IS_2224U_EQ_2224(...)  \,
+#define Z_IS_2224_EQ_2224U(...)  \,
+#define Z_IS_2224U_EQ_2224U(...) \,
+#define Z_IS_2225_EQ_2225(...)   \,
+#define Z_IS_2225U_EQ_2225(...)  \,
+#define Z_IS_2225_EQ_2225U(...)  \,
+#define Z_IS_2225U_EQ_2225U(...) \,
+#define Z_IS_2226_EQ_2226(...)   \,
+#define Z_IS_2226U_EQ_2226(...)  \,
+#define Z_IS_2226_EQ_2226U(...)  \,
+#define Z_IS_2226U_EQ_2226U(...) \,
+#define Z_IS_2227_EQ_2227(...)   \,
+#define Z_IS_2227U_EQ_2227(...)  \,
+#define Z_IS_2227_EQ_2227U(...)  \,
+#define Z_IS_2227U_EQ_2227U(...) \,
+#define Z_IS_2228_EQ_2228(...)   \,
+#define Z_IS_2228U_EQ_2228(...)  \,
+#define Z_IS_2228_EQ_2228U(...)  \,
+#define Z_IS_2228U_EQ_2228U(...) \,
+#define Z_IS_2229_EQ_2229(...)   \,
+#define Z_IS_2229U_EQ_2229(...)  \,
+#define Z_IS_2229_EQ_2229U(...)  \,
+#define Z_IS_2229U_EQ_2229U(...) \,
+#define Z_IS_2230_EQ_2230(...)   \,
+#define Z_IS_2230U_EQ_2230(...)  \,
+#define Z_IS_2230_EQ_2230U(...)  \,
+#define Z_IS_2230U_EQ_2230U(...) \,
+#define Z_IS_2231_EQ_2231(...)   \,
+#define Z_IS_2231U_EQ_2231(...)  \,
+#define Z_IS_2231_EQ_2231U(...)  \,
+#define Z_IS_2231U_EQ_2231U(...) \,
+#define Z_IS_2232_EQ_2232(...)   \,
+#define Z_IS_2232U_EQ_2232(...)  \,
+#define Z_IS_2232_EQ_2232U(...)  \,
+#define Z_IS_2232U_EQ_2232U(...) \,
+#define Z_IS_2233_EQ_2233(...)   \,
+#define Z_IS_2233U_EQ_2233(...)  \,
+#define Z_IS_2233_EQ_2233U(...)  \,
+#define Z_IS_2233U_EQ_2233U(...) \,
+#define Z_IS_2234_EQ_2234(...)   \,
+#define Z_IS_2234U_EQ_2234(...)  \,
+#define Z_IS_2234_EQ_2234U(...)  \,
+#define Z_IS_2234U_EQ_2234U(...) \,
+#define Z_IS_2235_EQ_2235(...)   \,
+#define Z_IS_2235U_EQ_2235(...)  \,
+#define Z_IS_2235_EQ_2235U(...)  \,
+#define Z_IS_2235U_EQ_2235U(...) \,
+#define Z_IS_2236_EQ_2236(...)   \,
+#define Z_IS_2236U_EQ_2236(...)  \,
+#define Z_IS_2236_EQ_2236U(...)  \,
+#define Z_IS_2236U_EQ_2236U(...) \,
+#define Z_IS_2237_EQ_2237(...)   \,
+#define Z_IS_2237U_EQ_2237(...)  \,
+#define Z_IS_2237_EQ_2237U(...)  \,
+#define Z_IS_2237U_EQ_2237U(...) \,
+#define Z_IS_2238_EQ_2238(...)   \,
+#define Z_IS_2238U_EQ_2238(...)  \,
+#define Z_IS_2238_EQ_2238U(...)  \,
+#define Z_IS_2238U_EQ_2238U(...) \,
+#define Z_IS_2239_EQ_2239(...)   \,
+#define Z_IS_2239U_EQ_2239(...)  \,
+#define Z_IS_2239_EQ_2239U(...)  \,
+#define Z_IS_2239U_EQ_2239U(...) \,
+#define Z_IS_2240_EQ_2240(...)   \,
+#define Z_IS_2240U_EQ_2240(...)  \,
+#define Z_IS_2240_EQ_2240U(...)  \,
+#define Z_IS_2240U_EQ_2240U(...) \,
+#define Z_IS_2241_EQ_2241(...)   \,
+#define Z_IS_2241U_EQ_2241(...)  \,
+#define Z_IS_2241_EQ_2241U(...)  \,
+#define Z_IS_2241U_EQ_2241U(...) \,
+#define Z_IS_2242_EQ_2242(...)   \,
+#define Z_IS_2242U_EQ_2242(...)  \,
+#define Z_IS_2242_EQ_2242U(...)  \,
+#define Z_IS_2242U_EQ_2242U(...) \,
+#define Z_IS_2243_EQ_2243(...)   \,
+#define Z_IS_2243U_EQ_2243(...)  \,
+#define Z_IS_2243_EQ_2243U(...)  \,
+#define Z_IS_2243U_EQ_2243U(...) \,
+#define Z_IS_2244_EQ_2244(...)   \,
+#define Z_IS_2244U_EQ_2244(...)  \,
+#define Z_IS_2244_EQ_2244U(...)  \,
+#define Z_IS_2244U_EQ_2244U(...) \,
+#define Z_IS_2245_EQ_2245(...)   \,
+#define Z_IS_2245U_EQ_2245(...)  \,
+#define Z_IS_2245_EQ_2245U(...)  \,
+#define Z_IS_2245U_EQ_2245U(...) \,
+#define Z_IS_2246_EQ_2246(...)   \,
+#define Z_IS_2246U_EQ_2246(...)  \,
+#define Z_IS_2246_EQ_2246U(...)  \,
+#define Z_IS_2246U_EQ_2246U(...) \,
+#define Z_IS_2247_EQ_2247(...)   \,
+#define Z_IS_2247U_EQ_2247(...)  \,
+#define Z_IS_2247_EQ_2247U(...)  \,
+#define Z_IS_2247U_EQ_2247U(...) \,
+#define Z_IS_2248_EQ_2248(...)   \,
+#define Z_IS_2248U_EQ_2248(...)  \,
+#define Z_IS_2248_EQ_2248U(...)  \,
+#define Z_IS_2248U_EQ_2248U(...) \,
+#define Z_IS_2249_EQ_2249(...)   \,
+#define Z_IS_2249U_EQ_2249(...)  \,
+#define Z_IS_2249_EQ_2249U(...)  \,
+#define Z_IS_2249U_EQ_2249U(...) \,
+#define Z_IS_2250_EQ_2250(...)   \,
+#define Z_IS_2250U_EQ_2250(...)  \,
+#define Z_IS_2250_EQ_2250U(...)  \,
+#define Z_IS_2250U_EQ_2250U(...) \,
+#define Z_IS_2251_EQ_2251(...)   \,
+#define Z_IS_2251U_EQ_2251(...)  \,
+#define Z_IS_2251_EQ_2251U(...)  \,
+#define Z_IS_2251U_EQ_2251U(...) \,
+#define Z_IS_2252_EQ_2252(...)   \,
+#define Z_IS_2252U_EQ_2252(...)  \,
+#define Z_IS_2252_EQ_2252U(...)  \,
+#define Z_IS_2252U_EQ_2252U(...) \,
+#define Z_IS_2253_EQ_2253(...)   \,
+#define Z_IS_2253U_EQ_2253(...)  \,
+#define Z_IS_2253_EQ_2253U(...)  \,
+#define Z_IS_2253U_EQ_2253U(...) \,
+#define Z_IS_2254_EQ_2254(...)   \,
+#define Z_IS_2254U_EQ_2254(...)  \,
+#define Z_IS_2254_EQ_2254U(...)  \,
+#define Z_IS_2254U_EQ_2254U(...) \,
+#define Z_IS_2255_EQ_2255(...)   \,
+#define Z_IS_2255U_EQ_2255(...)  \,
+#define Z_IS_2255_EQ_2255U(...)  \,
+#define Z_IS_2255U_EQ_2255U(...) \,
+#define Z_IS_2256_EQ_2256(...)   \,
+#define Z_IS_2256U_EQ_2256(...)  \,
+#define Z_IS_2256_EQ_2256U(...)  \,
+#define Z_IS_2256U_EQ_2256U(...) \,
+#define Z_IS_2257_EQ_2257(...)   \,
+#define Z_IS_2257U_EQ_2257(...)  \,
+#define Z_IS_2257_EQ_2257U(...)  \,
+#define Z_IS_2257U_EQ_2257U(...) \,
+#define Z_IS_2258_EQ_2258(...)   \,
+#define Z_IS_2258U_EQ_2258(...)  \,
+#define Z_IS_2258_EQ_2258U(...)  \,
+#define Z_IS_2258U_EQ_2258U(...) \,
+#define Z_IS_2259_EQ_2259(...)   \,
+#define Z_IS_2259U_EQ_2259(...)  \,
+#define Z_IS_2259_EQ_2259U(...)  \,
+#define Z_IS_2259U_EQ_2259U(...) \,
+#define Z_IS_2260_EQ_2260(...)   \,
+#define Z_IS_2260U_EQ_2260(...)  \,
+#define Z_IS_2260_EQ_2260U(...)  \,
+#define Z_IS_2260U_EQ_2260U(...) \,
+#define Z_IS_2261_EQ_2261(...)   \,
+#define Z_IS_2261U_EQ_2261(...)  \,
+#define Z_IS_2261_EQ_2261U(...)  \,
+#define Z_IS_2261U_EQ_2261U(...) \,
+#define Z_IS_2262_EQ_2262(...)   \,
+#define Z_IS_2262U_EQ_2262(...)  \,
+#define Z_IS_2262_EQ_2262U(...)  \,
+#define Z_IS_2262U_EQ_2262U(...) \,
+#define Z_IS_2263_EQ_2263(...)   \,
+#define Z_IS_2263U_EQ_2263(...)  \,
+#define Z_IS_2263_EQ_2263U(...)  \,
+#define Z_IS_2263U_EQ_2263U(...) \,
+#define Z_IS_2264_EQ_2264(...)   \,
+#define Z_IS_2264U_EQ_2264(...)  \,
+#define Z_IS_2264_EQ_2264U(...)  \,
+#define Z_IS_2264U_EQ_2264U(...) \,
+#define Z_IS_2265_EQ_2265(...)   \,
+#define Z_IS_2265U_EQ_2265(...)  \,
+#define Z_IS_2265_EQ_2265U(...)  \,
+#define Z_IS_2265U_EQ_2265U(...) \,
+#define Z_IS_2266_EQ_2266(...)   \,
+#define Z_IS_2266U_EQ_2266(...)  \,
+#define Z_IS_2266_EQ_2266U(...)  \,
+#define Z_IS_2266U_EQ_2266U(...) \,
+#define Z_IS_2267_EQ_2267(...)   \,
+#define Z_IS_2267U_EQ_2267(...)  \,
+#define Z_IS_2267_EQ_2267U(...)  \,
+#define Z_IS_2267U_EQ_2267U(...) \,
+#define Z_IS_2268_EQ_2268(...)   \,
+#define Z_IS_2268U_EQ_2268(...)  \,
+#define Z_IS_2268_EQ_2268U(...)  \,
+#define Z_IS_2268U_EQ_2268U(...) \,
+#define Z_IS_2269_EQ_2269(...)   \,
+#define Z_IS_2269U_EQ_2269(...)  \,
+#define Z_IS_2269_EQ_2269U(...)  \,
+#define Z_IS_2269U_EQ_2269U(...) \,
+#define Z_IS_2270_EQ_2270(...)   \,
+#define Z_IS_2270U_EQ_2270(...)  \,
+#define Z_IS_2270_EQ_2270U(...)  \,
+#define Z_IS_2270U_EQ_2270U(...) \,
+#define Z_IS_2271_EQ_2271(...)   \,
+#define Z_IS_2271U_EQ_2271(...)  \,
+#define Z_IS_2271_EQ_2271U(...)  \,
+#define Z_IS_2271U_EQ_2271U(...) \,
+#define Z_IS_2272_EQ_2272(...)   \,
+#define Z_IS_2272U_EQ_2272(...)  \,
+#define Z_IS_2272_EQ_2272U(...)  \,
+#define Z_IS_2272U_EQ_2272U(...) \,
+#define Z_IS_2273_EQ_2273(...)   \,
+#define Z_IS_2273U_EQ_2273(...)  \,
+#define Z_IS_2273_EQ_2273U(...)  \,
+#define Z_IS_2273U_EQ_2273U(...) \,
+#define Z_IS_2274_EQ_2274(...)   \,
+#define Z_IS_2274U_EQ_2274(...)  \,
+#define Z_IS_2274_EQ_2274U(...)  \,
+#define Z_IS_2274U_EQ_2274U(...) \,
+#define Z_IS_2275_EQ_2275(...)   \,
+#define Z_IS_2275U_EQ_2275(...)  \,
+#define Z_IS_2275_EQ_2275U(...)  \,
+#define Z_IS_2275U_EQ_2275U(...) \,
+#define Z_IS_2276_EQ_2276(...)   \,
+#define Z_IS_2276U_EQ_2276(...)  \,
+#define Z_IS_2276_EQ_2276U(...)  \,
+#define Z_IS_2276U_EQ_2276U(...) \,
+#define Z_IS_2277_EQ_2277(...)   \,
+#define Z_IS_2277U_EQ_2277(...)  \,
+#define Z_IS_2277_EQ_2277U(...)  \,
+#define Z_IS_2277U_EQ_2277U(...) \,
+#define Z_IS_2278_EQ_2278(...)   \,
+#define Z_IS_2278U_EQ_2278(...)  \,
+#define Z_IS_2278_EQ_2278U(...)  \,
+#define Z_IS_2278U_EQ_2278U(...) \,
+#define Z_IS_2279_EQ_2279(...)   \,
+#define Z_IS_2279U_EQ_2279(...)  \,
+#define Z_IS_2279_EQ_2279U(...)  \,
+#define Z_IS_2279U_EQ_2279U(...) \,
+#define Z_IS_2280_EQ_2280(...)   \,
+#define Z_IS_2280U_EQ_2280(...)  \,
+#define Z_IS_2280_EQ_2280U(...)  \,
+#define Z_IS_2280U_EQ_2280U(...) \,
+#define Z_IS_2281_EQ_2281(...)   \,
+#define Z_IS_2281U_EQ_2281(...)  \,
+#define Z_IS_2281_EQ_2281U(...)  \,
+#define Z_IS_2281U_EQ_2281U(...) \,
+#define Z_IS_2282_EQ_2282(...)   \,
+#define Z_IS_2282U_EQ_2282(...)  \,
+#define Z_IS_2282_EQ_2282U(...)  \,
+#define Z_IS_2282U_EQ_2282U(...) \,
+#define Z_IS_2283_EQ_2283(...)   \,
+#define Z_IS_2283U_EQ_2283(...)  \,
+#define Z_IS_2283_EQ_2283U(...)  \,
+#define Z_IS_2283U_EQ_2283U(...) \,
+#define Z_IS_2284_EQ_2284(...)   \,
+#define Z_IS_2284U_EQ_2284(...)  \,
+#define Z_IS_2284_EQ_2284U(...)  \,
+#define Z_IS_2284U_EQ_2284U(...) \,
+#define Z_IS_2285_EQ_2285(...)   \,
+#define Z_IS_2285U_EQ_2285(...)  \,
+#define Z_IS_2285_EQ_2285U(...)  \,
+#define Z_IS_2285U_EQ_2285U(...) \,
+#define Z_IS_2286_EQ_2286(...)   \,
+#define Z_IS_2286U_EQ_2286(...)  \,
+#define Z_IS_2286_EQ_2286U(...)  \,
+#define Z_IS_2286U_EQ_2286U(...) \,
+#define Z_IS_2287_EQ_2287(...)   \,
+#define Z_IS_2287U_EQ_2287(...)  \,
+#define Z_IS_2287_EQ_2287U(...)  \,
+#define Z_IS_2287U_EQ_2287U(...) \,
+#define Z_IS_2288_EQ_2288(...)   \,
+#define Z_IS_2288U_EQ_2288(...)  \,
+#define Z_IS_2288_EQ_2288U(...)  \,
+#define Z_IS_2288U_EQ_2288U(...) \,
+#define Z_IS_2289_EQ_2289(...)   \,
+#define Z_IS_2289U_EQ_2289(...)  \,
+#define Z_IS_2289_EQ_2289U(...)  \,
+#define Z_IS_2289U_EQ_2289U(...) \,
+#define Z_IS_2290_EQ_2290(...)   \,
+#define Z_IS_2290U_EQ_2290(...)  \,
+#define Z_IS_2290_EQ_2290U(...)  \,
+#define Z_IS_2290U_EQ_2290U(...) \,
+#define Z_IS_2291_EQ_2291(...)   \,
+#define Z_IS_2291U_EQ_2291(...)  \,
+#define Z_IS_2291_EQ_2291U(...)  \,
+#define Z_IS_2291U_EQ_2291U(...) \,
+#define Z_IS_2292_EQ_2292(...)   \,
+#define Z_IS_2292U_EQ_2292(...)  \,
+#define Z_IS_2292_EQ_2292U(...)  \,
+#define Z_IS_2292U_EQ_2292U(...) \,
+#define Z_IS_2293_EQ_2293(...)   \,
+#define Z_IS_2293U_EQ_2293(...)  \,
+#define Z_IS_2293_EQ_2293U(...)  \,
+#define Z_IS_2293U_EQ_2293U(...) \,
+#define Z_IS_2294_EQ_2294(...)   \,
+#define Z_IS_2294U_EQ_2294(...)  \,
+#define Z_IS_2294_EQ_2294U(...)  \,
+#define Z_IS_2294U_EQ_2294U(...) \,
+#define Z_IS_2295_EQ_2295(...)   \,
+#define Z_IS_2295U_EQ_2295(...)  \,
+#define Z_IS_2295_EQ_2295U(...)  \,
+#define Z_IS_2295U_EQ_2295U(...) \,
+#define Z_IS_2296_EQ_2296(...)   \,
+#define Z_IS_2296U_EQ_2296(...)  \,
+#define Z_IS_2296_EQ_2296U(...)  \,
+#define Z_IS_2296U_EQ_2296U(...) \,
+#define Z_IS_2297_EQ_2297(...)   \,
+#define Z_IS_2297U_EQ_2297(...)  \,
+#define Z_IS_2297_EQ_2297U(...)  \,
+#define Z_IS_2297U_EQ_2297U(...) \,
+#define Z_IS_2298_EQ_2298(...)   \,
+#define Z_IS_2298U_EQ_2298(...)  \,
+#define Z_IS_2298_EQ_2298U(...)  \,
+#define Z_IS_2298U_EQ_2298U(...) \,
+#define Z_IS_2299_EQ_2299(...)   \,
+#define Z_IS_2299U_EQ_2299(...)  \,
+#define Z_IS_2299_EQ_2299U(...)  \,
+#define Z_IS_2299U_EQ_2299U(...) \,
+#define Z_IS_2300_EQ_2300(...)   \,
+#define Z_IS_2300U_EQ_2300(...)  \,
+#define Z_IS_2300_EQ_2300U(...)  \,
+#define Z_IS_2300U_EQ_2300U(...) \,
+#define Z_IS_2301_EQ_2301(...)   \,
+#define Z_IS_2301U_EQ_2301(...)  \,
+#define Z_IS_2301_EQ_2301U(...)  \,
+#define Z_IS_2301U_EQ_2301U(...) \,
+#define Z_IS_2302_EQ_2302(...)   \,
+#define Z_IS_2302U_EQ_2302(...)  \,
+#define Z_IS_2302_EQ_2302U(...)  \,
+#define Z_IS_2302U_EQ_2302U(...) \,
+#define Z_IS_2303_EQ_2303(...)   \,
+#define Z_IS_2303U_EQ_2303(...)  \,
+#define Z_IS_2303_EQ_2303U(...)  \,
+#define Z_IS_2303U_EQ_2303U(...) \,
+#define Z_IS_2304_EQ_2304(...)   \,
+#define Z_IS_2304U_EQ_2304(...)  \,
+#define Z_IS_2304_EQ_2304U(...)  \,
+#define Z_IS_2304U_EQ_2304U(...) \,
+#define Z_IS_2305_EQ_2305(...)   \,
+#define Z_IS_2305U_EQ_2305(...)  \,
+#define Z_IS_2305_EQ_2305U(...)  \,
+#define Z_IS_2305U_EQ_2305U(...) \,
+#define Z_IS_2306_EQ_2306(...)   \,
+#define Z_IS_2306U_EQ_2306(...)  \,
+#define Z_IS_2306_EQ_2306U(...)  \,
+#define Z_IS_2306U_EQ_2306U(...) \,
+#define Z_IS_2307_EQ_2307(...)   \,
+#define Z_IS_2307U_EQ_2307(...)  \,
+#define Z_IS_2307_EQ_2307U(...)  \,
+#define Z_IS_2307U_EQ_2307U(...) \,
+#define Z_IS_2308_EQ_2308(...)   \,
+#define Z_IS_2308U_EQ_2308(...)  \,
+#define Z_IS_2308_EQ_2308U(...)  \,
+#define Z_IS_2308U_EQ_2308U(...) \,
+#define Z_IS_2309_EQ_2309(...)   \,
+#define Z_IS_2309U_EQ_2309(...)  \,
+#define Z_IS_2309_EQ_2309U(...)  \,
+#define Z_IS_2309U_EQ_2309U(...) \,
+#define Z_IS_2310_EQ_2310(...)   \,
+#define Z_IS_2310U_EQ_2310(...)  \,
+#define Z_IS_2310_EQ_2310U(...)  \,
+#define Z_IS_2310U_EQ_2310U(...) \,
+#define Z_IS_2311_EQ_2311(...)   \,
+#define Z_IS_2311U_EQ_2311(...)  \,
+#define Z_IS_2311_EQ_2311U(...)  \,
+#define Z_IS_2311U_EQ_2311U(...) \,
+#define Z_IS_2312_EQ_2312(...)   \,
+#define Z_IS_2312U_EQ_2312(...)  \,
+#define Z_IS_2312_EQ_2312U(...)  \,
+#define Z_IS_2312U_EQ_2312U(...) \,
+#define Z_IS_2313_EQ_2313(...)   \,
+#define Z_IS_2313U_EQ_2313(...)  \,
+#define Z_IS_2313_EQ_2313U(...)  \,
+#define Z_IS_2313U_EQ_2313U(...) \,
+#define Z_IS_2314_EQ_2314(...)   \,
+#define Z_IS_2314U_EQ_2314(...)  \,
+#define Z_IS_2314_EQ_2314U(...)  \,
+#define Z_IS_2314U_EQ_2314U(...) \,
+#define Z_IS_2315_EQ_2315(...)   \,
+#define Z_IS_2315U_EQ_2315(...)  \,
+#define Z_IS_2315_EQ_2315U(...)  \,
+#define Z_IS_2315U_EQ_2315U(...) \,
+#define Z_IS_2316_EQ_2316(...)   \,
+#define Z_IS_2316U_EQ_2316(...)  \,
+#define Z_IS_2316_EQ_2316U(...)  \,
+#define Z_IS_2316U_EQ_2316U(...) \,
+#define Z_IS_2317_EQ_2317(...)   \,
+#define Z_IS_2317U_EQ_2317(...)  \,
+#define Z_IS_2317_EQ_2317U(...)  \,
+#define Z_IS_2317U_EQ_2317U(...) \,
+#define Z_IS_2318_EQ_2318(...)   \,
+#define Z_IS_2318U_EQ_2318(...)  \,
+#define Z_IS_2318_EQ_2318U(...)  \,
+#define Z_IS_2318U_EQ_2318U(...) \,
+#define Z_IS_2319_EQ_2319(...)   \,
+#define Z_IS_2319U_EQ_2319(...)  \,
+#define Z_IS_2319_EQ_2319U(...)  \,
+#define Z_IS_2319U_EQ_2319U(...) \,
+#define Z_IS_2320_EQ_2320(...)   \,
+#define Z_IS_2320U_EQ_2320(...)  \,
+#define Z_IS_2320_EQ_2320U(...)  \,
+#define Z_IS_2320U_EQ_2320U(...) \,
+#define Z_IS_2321_EQ_2321(...)   \,
+#define Z_IS_2321U_EQ_2321(...)  \,
+#define Z_IS_2321_EQ_2321U(...)  \,
+#define Z_IS_2321U_EQ_2321U(...) \,
+#define Z_IS_2322_EQ_2322(...)   \,
+#define Z_IS_2322U_EQ_2322(...)  \,
+#define Z_IS_2322_EQ_2322U(...)  \,
+#define Z_IS_2322U_EQ_2322U(...) \,
+#define Z_IS_2323_EQ_2323(...)   \,
+#define Z_IS_2323U_EQ_2323(...)  \,
+#define Z_IS_2323_EQ_2323U(...)  \,
+#define Z_IS_2323U_EQ_2323U(...) \,
+#define Z_IS_2324_EQ_2324(...)   \,
+#define Z_IS_2324U_EQ_2324(...)  \,
+#define Z_IS_2324_EQ_2324U(...)  \,
+#define Z_IS_2324U_EQ_2324U(...) \,
+#define Z_IS_2325_EQ_2325(...)   \,
+#define Z_IS_2325U_EQ_2325(...)  \,
+#define Z_IS_2325_EQ_2325U(...)  \,
+#define Z_IS_2325U_EQ_2325U(...) \,
+#define Z_IS_2326_EQ_2326(...)   \,
+#define Z_IS_2326U_EQ_2326(...)  \,
+#define Z_IS_2326_EQ_2326U(...)  \,
+#define Z_IS_2326U_EQ_2326U(...) \,
+#define Z_IS_2327_EQ_2327(...)   \,
+#define Z_IS_2327U_EQ_2327(...)  \,
+#define Z_IS_2327_EQ_2327U(...)  \,
+#define Z_IS_2327U_EQ_2327U(...) \,
+#define Z_IS_2328_EQ_2328(...)   \,
+#define Z_IS_2328U_EQ_2328(...)  \,
+#define Z_IS_2328_EQ_2328U(...)  \,
+#define Z_IS_2328U_EQ_2328U(...) \,
+#define Z_IS_2329_EQ_2329(...)   \,
+#define Z_IS_2329U_EQ_2329(...)  \,
+#define Z_IS_2329_EQ_2329U(...)  \,
+#define Z_IS_2329U_EQ_2329U(...) \,
+#define Z_IS_2330_EQ_2330(...)   \,
+#define Z_IS_2330U_EQ_2330(...)  \,
+#define Z_IS_2330_EQ_2330U(...)  \,
+#define Z_IS_2330U_EQ_2330U(...) \,
+#define Z_IS_2331_EQ_2331(...)   \,
+#define Z_IS_2331U_EQ_2331(...)  \,
+#define Z_IS_2331_EQ_2331U(...)  \,
+#define Z_IS_2331U_EQ_2331U(...) \,
+#define Z_IS_2332_EQ_2332(...)   \,
+#define Z_IS_2332U_EQ_2332(...)  \,
+#define Z_IS_2332_EQ_2332U(...)  \,
+#define Z_IS_2332U_EQ_2332U(...) \,
+#define Z_IS_2333_EQ_2333(...)   \,
+#define Z_IS_2333U_EQ_2333(...)  \,
+#define Z_IS_2333_EQ_2333U(...)  \,
+#define Z_IS_2333U_EQ_2333U(...) \,
+#define Z_IS_2334_EQ_2334(...)   \,
+#define Z_IS_2334U_EQ_2334(...)  \,
+#define Z_IS_2334_EQ_2334U(...)  \,
+#define Z_IS_2334U_EQ_2334U(...) \,
+#define Z_IS_2335_EQ_2335(...)   \,
+#define Z_IS_2335U_EQ_2335(...)  \,
+#define Z_IS_2335_EQ_2335U(...)  \,
+#define Z_IS_2335U_EQ_2335U(...) \,
+#define Z_IS_2336_EQ_2336(...)   \,
+#define Z_IS_2336U_EQ_2336(...)  \,
+#define Z_IS_2336_EQ_2336U(...)  \,
+#define Z_IS_2336U_EQ_2336U(...) \,
+#define Z_IS_2337_EQ_2337(...)   \,
+#define Z_IS_2337U_EQ_2337(...)  \,
+#define Z_IS_2337_EQ_2337U(...)  \,
+#define Z_IS_2337U_EQ_2337U(...) \,
+#define Z_IS_2338_EQ_2338(...)   \,
+#define Z_IS_2338U_EQ_2338(...)  \,
+#define Z_IS_2338_EQ_2338U(...)  \,
+#define Z_IS_2338U_EQ_2338U(...) \,
+#define Z_IS_2339_EQ_2339(...)   \,
+#define Z_IS_2339U_EQ_2339(...)  \,
+#define Z_IS_2339_EQ_2339U(...)  \,
+#define Z_IS_2339U_EQ_2339U(...) \,
+#define Z_IS_2340_EQ_2340(...)   \,
+#define Z_IS_2340U_EQ_2340(...)  \,
+#define Z_IS_2340_EQ_2340U(...)  \,
+#define Z_IS_2340U_EQ_2340U(...) \,
+#define Z_IS_2341_EQ_2341(...)   \,
+#define Z_IS_2341U_EQ_2341(...)  \,
+#define Z_IS_2341_EQ_2341U(...)  \,
+#define Z_IS_2341U_EQ_2341U(...) \,
+#define Z_IS_2342_EQ_2342(...)   \,
+#define Z_IS_2342U_EQ_2342(...)  \,
+#define Z_IS_2342_EQ_2342U(...)  \,
+#define Z_IS_2342U_EQ_2342U(...) \,
+#define Z_IS_2343_EQ_2343(...)   \,
+#define Z_IS_2343U_EQ_2343(...)  \,
+#define Z_IS_2343_EQ_2343U(...)  \,
+#define Z_IS_2343U_EQ_2343U(...) \,
+#define Z_IS_2344_EQ_2344(...)   \,
+#define Z_IS_2344U_EQ_2344(...)  \,
+#define Z_IS_2344_EQ_2344U(...)  \,
+#define Z_IS_2344U_EQ_2344U(...) \,
+#define Z_IS_2345_EQ_2345(...)   \,
+#define Z_IS_2345U_EQ_2345(...)  \,
+#define Z_IS_2345_EQ_2345U(...)  \,
+#define Z_IS_2345U_EQ_2345U(...) \,
+#define Z_IS_2346_EQ_2346(...)   \,
+#define Z_IS_2346U_EQ_2346(...)  \,
+#define Z_IS_2346_EQ_2346U(...)  \,
+#define Z_IS_2346U_EQ_2346U(...) \,
+#define Z_IS_2347_EQ_2347(...)   \,
+#define Z_IS_2347U_EQ_2347(...)  \,
+#define Z_IS_2347_EQ_2347U(...)  \,
+#define Z_IS_2347U_EQ_2347U(...) \,
+#define Z_IS_2348_EQ_2348(...)   \,
+#define Z_IS_2348U_EQ_2348(...)  \,
+#define Z_IS_2348_EQ_2348U(...)  \,
+#define Z_IS_2348U_EQ_2348U(...) \,
+#define Z_IS_2349_EQ_2349(...)   \,
+#define Z_IS_2349U_EQ_2349(...)  \,
+#define Z_IS_2349_EQ_2349U(...)  \,
+#define Z_IS_2349U_EQ_2349U(...) \,
+#define Z_IS_2350_EQ_2350(...)   \,
+#define Z_IS_2350U_EQ_2350(...)  \,
+#define Z_IS_2350_EQ_2350U(...)  \,
+#define Z_IS_2350U_EQ_2350U(...) \,
+#define Z_IS_2351_EQ_2351(...)   \,
+#define Z_IS_2351U_EQ_2351(...)  \,
+#define Z_IS_2351_EQ_2351U(...)  \,
+#define Z_IS_2351U_EQ_2351U(...) \,
+#define Z_IS_2352_EQ_2352(...)   \,
+#define Z_IS_2352U_EQ_2352(...)  \,
+#define Z_IS_2352_EQ_2352U(...)  \,
+#define Z_IS_2352U_EQ_2352U(...) \,
+#define Z_IS_2353_EQ_2353(...)   \,
+#define Z_IS_2353U_EQ_2353(...)  \,
+#define Z_IS_2353_EQ_2353U(...)  \,
+#define Z_IS_2353U_EQ_2353U(...) \,
+#define Z_IS_2354_EQ_2354(...)   \,
+#define Z_IS_2354U_EQ_2354(...)  \,
+#define Z_IS_2354_EQ_2354U(...)  \,
+#define Z_IS_2354U_EQ_2354U(...) \,
+#define Z_IS_2355_EQ_2355(...)   \,
+#define Z_IS_2355U_EQ_2355(...)  \,
+#define Z_IS_2355_EQ_2355U(...)  \,
+#define Z_IS_2355U_EQ_2355U(...) \,
+#define Z_IS_2356_EQ_2356(...)   \,
+#define Z_IS_2356U_EQ_2356(...)  \,
+#define Z_IS_2356_EQ_2356U(...)  \,
+#define Z_IS_2356U_EQ_2356U(...) \,
+#define Z_IS_2357_EQ_2357(...)   \,
+#define Z_IS_2357U_EQ_2357(...)  \,
+#define Z_IS_2357_EQ_2357U(...)  \,
+#define Z_IS_2357U_EQ_2357U(...) \,
+#define Z_IS_2358_EQ_2358(...)   \,
+#define Z_IS_2358U_EQ_2358(...)  \,
+#define Z_IS_2358_EQ_2358U(...)  \,
+#define Z_IS_2358U_EQ_2358U(...) \,
+#define Z_IS_2359_EQ_2359(...)   \,
+#define Z_IS_2359U_EQ_2359(...)  \,
+#define Z_IS_2359_EQ_2359U(...)  \,
+#define Z_IS_2359U_EQ_2359U(...) \,
+#define Z_IS_2360_EQ_2360(...)   \,
+#define Z_IS_2360U_EQ_2360(...)  \,
+#define Z_IS_2360_EQ_2360U(...)  \,
+#define Z_IS_2360U_EQ_2360U(...) \,
+#define Z_IS_2361_EQ_2361(...)   \,
+#define Z_IS_2361U_EQ_2361(...)  \,
+#define Z_IS_2361_EQ_2361U(...)  \,
+#define Z_IS_2361U_EQ_2361U(...) \,
+#define Z_IS_2362_EQ_2362(...)   \,
+#define Z_IS_2362U_EQ_2362(...)  \,
+#define Z_IS_2362_EQ_2362U(...)  \,
+#define Z_IS_2362U_EQ_2362U(...) \,
+#define Z_IS_2363_EQ_2363(...)   \,
+#define Z_IS_2363U_EQ_2363(...)  \,
+#define Z_IS_2363_EQ_2363U(...)  \,
+#define Z_IS_2363U_EQ_2363U(...) \,
+#define Z_IS_2364_EQ_2364(...)   \,
+#define Z_IS_2364U_EQ_2364(...)  \,
+#define Z_IS_2364_EQ_2364U(...)  \,
+#define Z_IS_2364U_EQ_2364U(...) \,
+#define Z_IS_2365_EQ_2365(...)   \,
+#define Z_IS_2365U_EQ_2365(...)  \,
+#define Z_IS_2365_EQ_2365U(...)  \,
+#define Z_IS_2365U_EQ_2365U(...) \,
+#define Z_IS_2366_EQ_2366(...)   \,
+#define Z_IS_2366U_EQ_2366(...)  \,
+#define Z_IS_2366_EQ_2366U(...)  \,
+#define Z_IS_2366U_EQ_2366U(...) \,
+#define Z_IS_2367_EQ_2367(...)   \,
+#define Z_IS_2367U_EQ_2367(...)  \,
+#define Z_IS_2367_EQ_2367U(...)  \,
+#define Z_IS_2367U_EQ_2367U(...) \,
+#define Z_IS_2368_EQ_2368(...)   \,
+#define Z_IS_2368U_EQ_2368(...)  \,
+#define Z_IS_2368_EQ_2368U(...)  \,
+#define Z_IS_2368U_EQ_2368U(...) \,
+#define Z_IS_2369_EQ_2369(...)   \,
+#define Z_IS_2369U_EQ_2369(...)  \,
+#define Z_IS_2369_EQ_2369U(...)  \,
+#define Z_IS_2369U_EQ_2369U(...) \,
+#define Z_IS_2370_EQ_2370(...)   \,
+#define Z_IS_2370U_EQ_2370(...)  \,
+#define Z_IS_2370_EQ_2370U(...)  \,
+#define Z_IS_2370U_EQ_2370U(...) \,
+#define Z_IS_2371_EQ_2371(...)   \,
+#define Z_IS_2371U_EQ_2371(...)  \,
+#define Z_IS_2371_EQ_2371U(...)  \,
+#define Z_IS_2371U_EQ_2371U(...) \,
+#define Z_IS_2372_EQ_2372(...)   \,
+#define Z_IS_2372U_EQ_2372(...)  \,
+#define Z_IS_2372_EQ_2372U(...)  \,
+#define Z_IS_2372U_EQ_2372U(...) \,
+#define Z_IS_2373_EQ_2373(...)   \,
+#define Z_IS_2373U_EQ_2373(...)  \,
+#define Z_IS_2373_EQ_2373U(...)  \,
+#define Z_IS_2373U_EQ_2373U(...) \,
+#define Z_IS_2374_EQ_2374(...)   \,
+#define Z_IS_2374U_EQ_2374(...)  \,
+#define Z_IS_2374_EQ_2374U(...)  \,
+#define Z_IS_2374U_EQ_2374U(...) \,
+#define Z_IS_2375_EQ_2375(...)   \,
+#define Z_IS_2375U_EQ_2375(...)  \,
+#define Z_IS_2375_EQ_2375U(...)  \,
+#define Z_IS_2375U_EQ_2375U(...) \,
+#define Z_IS_2376_EQ_2376(...)   \,
+#define Z_IS_2376U_EQ_2376(...)  \,
+#define Z_IS_2376_EQ_2376U(...)  \,
+#define Z_IS_2376U_EQ_2376U(...) \,
+#define Z_IS_2377_EQ_2377(...)   \,
+#define Z_IS_2377U_EQ_2377(...)  \,
+#define Z_IS_2377_EQ_2377U(...)  \,
+#define Z_IS_2377U_EQ_2377U(...) \,
+#define Z_IS_2378_EQ_2378(...)   \,
+#define Z_IS_2378U_EQ_2378(...)  \,
+#define Z_IS_2378_EQ_2378U(...)  \,
+#define Z_IS_2378U_EQ_2378U(...) \,
+#define Z_IS_2379_EQ_2379(...)   \,
+#define Z_IS_2379U_EQ_2379(...)  \,
+#define Z_IS_2379_EQ_2379U(...)  \,
+#define Z_IS_2379U_EQ_2379U(...) \,
+#define Z_IS_2380_EQ_2380(...)   \,
+#define Z_IS_2380U_EQ_2380(...)  \,
+#define Z_IS_2380_EQ_2380U(...)  \,
+#define Z_IS_2380U_EQ_2380U(...) \,
+#define Z_IS_2381_EQ_2381(...)   \,
+#define Z_IS_2381U_EQ_2381(...)  \,
+#define Z_IS_2381_EQ_2381U(...)  \,
+#define Z_IS_2381U_EQ_2381U(...) \,
+#define Z_IS_2382_EQ_2382(...)   \,
+#define Z_IS_2382U_EQ_2382(...)  \,
+#define Z_IS_2382_EQ_2382U(...)  \,
+#define Z_IS_2382U_EQ_2382U(...) \,
+#define Z_IS_2383_EQ_2383(...)   \,
+#define Z_IS_2383U_EQ_2383(...)  \,
+#define Z_IS_2383_EQ_2383U(...)  \,
+#define Z_IS_2383U_EQ_2383U(...) \,
+#define Z_IS_2384_EQ_2384(...)   \,
+#define Z_IS_2384U_EQ_2384(...)  \,
+#define Z_IS_2384_EQ_2384U(...)  \,
+#define Z_IS_2384U_EQ_2384U(...) \,
+#define Z_IS_2385_EQ_2385(...)   \,
+#define Z_IS_2385U_EQ_2385(...)  \,
+#define Z_IS_2385_EQ_2385U(...)  \,
+#define Z_IS_2385U_EQ_2385U(...) \,
+#define Z_IS_2386_EQ_2386(...)   \,
+#define Z_IS_2386U_EQ_2386(...)  \,
+#define Z_IS_2386_EQ_2386U(...)  \,
+#define Z_IS_2386U_EQ_2386U(...) \,
+#define Z_IS_2387_EQ_2387(...)   \,
+#define Z_IS_2387U_EQ_2387(...)  \,
+#define Z_IS_2387_EQ_2387U(...)  \,
+#define Z_IS_2387U_EQ_2387U(...) \,
+#define Z_IS_2388_EQ_2388(...)   \,
+#define Z_IS_2388U_EQ_2388(...)  \,
+#define Z_IS_2388_EQ_2388U(...)  \,
+#define Z_IS_2388U_EQ_2388U(...) \,
+#define Z_IS_2389_EQ_2389(...)   \,
+#define Z_IS_2389U_EQ_2389(...)  \,
+#define Z_IS_2389_EQ_2389U(...)  \,
+#define Z_IS_2389U_EQ_2389U(...) \,
+#define Z_IS_2390_EQ_2390(...)   \,
+#define Z_IS_2390U_EQ_2390(...)  \,
+#define Z_IS_2390_EQ_2390U(...)  \,
+#define Z_IS_2390U_EQ_2390U(...) \,
+#define Z_IS_2391_EQ_2391(...)   \,
+#define Z_IS_2391U_EQ_2391(...)  \,
+#define Z_IS_2391_EQ_2391U(...)  \,
+#define Z_IS_2391U_EQ_2391U(...) \,
+#define Z_IS_2392_EQ_2392(...)   \,
+#define Z_IS_2392U_EQ_2392(...)  \,
+#define Z_IS_2392_EQ_2392U(...)  \,
+#define Z_IS_2392U_EQ_2392U(...) \,
+#define Z_IS_2393_EQ_2393(...)   \,
+#define Z_IS_2393U_EQ_2393(...)  \,
+#define Z_IS_2393_EQ_2393U(...)  \,
+#define Z_IS_2393U_EQ_2393U(...) \,
+#define Z_IS_2394_EQ_2394(...)   \,
+#define Z_IS_2394U_EQ_2394(...)  \,
+#define Z_IS_2394_EQ_2394U(...)  \,
+#define Z_IS_2394U_EQ_2394U(...) \,
+#define Z_IS_2395_EQ_2395(...)   \,
+#define Z_IS_2395U_EQ_2395(...)  \,
+#define Z_IS_2395_EQ_2395U(...)  \,
+#define Z_IS_2395U_EQ_2395U(...) \,
+#define Z_IS_2396_EQ_2396(...)   \,
+#define Z_IS_2396U_EQ_2396(...)  \,
+#define Z_IS_2396_EQ_2396U(...)  \,
+#define Z_IS_2396U_EQ_2396U(...) \,
+#define Z_IS_2397_EQ_2397(...)   \,
+#define Z_IS_2397U_EQ_2397(...)  \,
+#define Z_IS_2397_EQ_2397U(...)  \,
+#define Z_IS_2397U_EQ_2397U(...) \,
+#define Z_IS_2398_EQ_2398(...)   \,
+#define Z_IS_2398U_EQ_2398(...)  \,
+#define Z_IS_2398_EQ_2398U(...)  \,
+#define Z_IS_2398U_EQ_2398U(...) \,
+#define Z_IS_2399_EQ_2399(...)   \,
+#define Z_IS_2399U_EQ_2399(...)  \,
+#define Z_IS_2399_EQ_2399U(...)  \,
+#define Z_IS_2399U_EQ_2399U(...) \,
+#define Z_IS_2400_EQ_2400(...)   \,
+#define Z_IS_2400U_EQ_2400(...)  \,
+#define Z_IS_2400_EQ_2400U(...)  \,
+#define Z_IS_2400U_EQ_2400U(...) \,
+#define Z_IS_2401_EQ_2401(...)   \,
+#define Z_IS_2401U_EQ_2401(...)  \,
+#define Z_IS_2401_EQ_2401U(...)  \,
+#define Z_IS_2401U_EQ_2401U(...) \,
+#define Z_IS_2402_EQ_2402(...)   \,
+#define Z_IS_2402U_EQ_2402(...)  \,
+#define Z_IS_2402_EQ_2402U(...)  \,
+#define Z_IS_2402U_EQ_2402U(...) \,
+#define Z_IS_2403_EQ_2403(...)   \,
+#define Z_IS_2403U_EQ_2403(...)  \,
+#define Z_IS_2403_EQ_2403U(...)  \,
+#define Z_IS_2403U_EQ_2403U(...) \,
+#define Z_IS_2404_EQ_2404(...)   \,
+#define Z_IS_2404U_EQ_2404(...)  \,
+#define Z_IS_2404_EQ_2404U(...)  \,
+#define Z_IS_2404U_EQ_2404U(...) \,
+#define Z_IS_2405_EQ_2405(...)   \,
+#define Z_IS_2405U_EQ_2405(...)  \,
+#define Z_IS_2405_EQ_2405U(...)  \,
+#define Z_IS_2405U_EQ_2405U(...) \,
+#define Z_IS_2406_EQ_2406(...)   \,
+#define Z_IS_2406U_EQ_2406(...)  \,
+#define Z_IS_2406_EQ_2406U(...)  \,
+#define Z_IS_2406U_EQ_2406U(...) \,
+#define Z_IS_2407_EQ_2407(...)   \,
+#define Z_IS_2407U_EQ_2407(...)  \,
+#define Z_IS_2407_EQ_2407U(...)  \,
+#define Z_IS_2407U_EQ_2407U(...) \,
+#define Z_IS_2408_EQ_2408(...)   \,
+#define Z_IS_2408U_EQ_2408(...)  \,
+#define Z_IS_2408_EQ_2408U(...)  \,
+#define Z_IS_2408U_EQ_2408U(...) \,
+#define Z_IS_2409_EQ_2409(...)   \,
+#define Z_IS_2409U_EQ_2409(...)  \,
+#define Z_IS_2409_EQ_2409U(...)  \,
+#define Z_IS_2409U_EQ_2409U(...) \,
+#define Z_IS_2410_EQ_2410(...)   \,
+#define Z_IS_2410U_EQ_2410(...)  \,
+#define Z_IS_2410_EQ_2410U(...)  \,
+#define Z_IS_2410U_EQ_2410U(...) \,
+#define Z_IS_2411_EQ_2411(...)   \,
+#define Z_IS_2411U_EQ_2411(...)  \,
+#define Z_IS_2411_EQ_2411U(...)  \,
+#define Z_IS_2411U_EQ_2411U(...) \,
+#define Z_IS_2412_EQ_2412(...)   \,
+#define Z_IS_2412U_EQ_2412(...)  \,
+#define Z_IS_2412_EQ_2412U(...)  \,
+#define Z_IS_2412U_EQ_2412U(...) \,
+#define Z_IS_2413_EQ_2413(...)   \,
+#define Z_IS_2413U_EQ_2413(...)  \,
+#define Z_IS_2413_EQ_2413U(...)  \,
+#define Z_IS_2413U_EQ_2413U(...) \,
+#define Z_IS_2414_EQ_2414(...)   \,
+#define Z_IS_2414U_EQ_2414(...)  \,
+#define Z_IS_2414_EQ_2414U(...)  \,
+#define Z_IS_2414U_EQ_2414U(...) \,
+#define Z_IS_2415_EQ_2415(...)   \,
+#define Z_IS_2415U_EQ_2415(...)  \,
+#define Z_IS_2415_EQ_2415U(...)  \,
+#define Z_IS_2415U_EQ_2415U(...) \,
+#define Z_IS_2416_EQ_2416(...)   \,
+#define Z_IS_2416U_EQ_2416(...)  \,
+#define Z_IS_2416_EQ_2416U(...)  \,
+#define Z_IS_2416U_EQ_2416U(...) \,
+#define Z_IS_2417_EQ_2417(...)   \,
+#define Z_IS_2417U_EQ_2417(...)  \,
+#define Z_IS_2417_EQ_2417U(...)  \,
+#define Z_IS_2417U_EQ_2417U(...) \,
+#define Z_IS_2418_EQ_2418(...)   \,
+#define Z_IS_2418U_EQ_2418(...)  \,
+#define Z_IS_2418_EQ_2418U(...)  \,
+#define Z_IS_2418U_EQ_2418U(...) \,
+#define Z_IS_2419_EQ_2419(...)   \,
+#define Z_IS_2419U_EQ_2419(...)  \,
+#define Z_IS_2419_EQ_2419U(...)  \,
+#define Z_IS_2419U_EQ_2419U(...) \,
+#define Z_IS_2420_EQ_2420(...)   \,
+#define Z_IS_2420U_EQ_2420(...)  \,
+#define Z_IS_2420_EQ_2420U(...)  \,
+#define Z_IS_2420U_EQ_2420U(...) \,
+#define Z_IS_2421_EQ_2421(...)   \,
+#define Z_IS_2421U_EQ_2421(...)  \,
+#define Z_IS_2421_EQ_2421U(...)  \,
+#define Z_IS_2421U_EQ_2421U(...) \,
+#define Z_IS_2422_EQ_2422(...)   \,
+#define Z_IS_2422U_EQ_2422(...)  \,
+#define Z_IS_2422_EQ_2422U(...)  \,
+#define Z_IS_2422U_EQ_2422U(...) \,
+#define Z_IS_2423_EQ_2423(...)   \,
+#define Z_IS_2423U_EQ_2423(...)  \,
+#define Z_IS_2423_EQ_2423U(...)  \,
+#define Z_IS_2423U_EQ_2423U(...) \,
+#define Z_IS_2424_EQ_2424(...)   \,
+#define Z_IS_2424U_EQ_2424(...)  \,
+#define Z_IS_2424_EQ_2424U(...)  \,
+#define Z_IS_2424U_EQ_2424U(...) \,
+#define Z_IS_2425_EQ_2425(...)   \,
+#define Z_IS_2425U_EQ_2425(...)  \,
+#define Z_IS_2425_EQ_2425U(...)  \,
+#define Z_IS_2425U_EQ_2425U(...) \,
+#define Z_IS_2426_EQ_2426(...)   \,
+#define Z_IS_2426U_EQ_2426(...)  \,
+#define Z_IS_2426_EQ_2426U(...)  \,
+#define Z_IS_2426U_EQ_2426U(...) \,
+#define Z_IS_2427_EQ_2427(...)   \,
+#define Z_IS_2427U_EQ_2427(...)  \,
+#define Z_IS_2427_EQ_2427U(...)  \,
+#define Z_IS_2427U_EQ_2427U(...) \,
+#define Z_IS_2428_EQ_2428(...)   \,
+#define Z_IS_2428U_EQ_2428(...)  \,
+#define Z_IS_2428_EQ_2428U(...)  \,
+#define Z_IS_2428U_EQ_2428U(...) \,
+#define Z_IS_2429_EQ_2429(...)   \,
+#define Z_IS_2429U_EQ_2429(...)  \,
+#define Z_IS_2429_EQ_2429U(...)  \,
+#define Z_IS_2429U_EQ_2429U(...) \,
+#define Z_IS_2430_EQ_2430(...)   \,
+#define Z_IS_2430U_EQ_2430(...)  \,
+#define Z_IS_2430_EQ_2430U(...)  \,
+#define Z_IS_2430U_EQ_2430U(...) \,
+#define Z_IS_2431_EQ_2431(...)   \,
+#define Z_IS_2431U_EQ_2431(...)  \,
+#define Z_IS_2431_EQ_2431U(...)  \,
+#define Z_IS_2431U_EQ_2431U(...) \,
+#define Z_IS_2432_EQ_2432(...)   \,
+#define Z_IS_2432U_EQ_2432(...)  \,
+#define Z_IS_2432_EQ_2432U(...)  \,
+#define Z_IS_2432U_EQ_2432U(...) \,
+#define Z_IS_2433_EQ_2433(...)   \,
+#define Z_IS_2433U_EQ_2433(...)  \,
+#define Z_IS_2433_EQ_2433U(...)  \,
+#define Z_IS_2433U_EQ_2433U(...) \,
+#define Z_IS_2434_EQ_2434(...)   \,
+#define Z_IS_2434U_EQ_2434(...)  \,
+#define Z_IS_2434_EQ_2434U(...)  \,
+#define Z_IS_2434U_EQ_2434U(...) \,
+#define Z_IS_2435_EQ_2435(...)   \,
+#define Z_IS_2435U_EQ_2435(...)  \,
+#define Z_IS_2435_EQ_2435U(...)  \,
+#define Z_IS_2435U_EQ_2435U(...) \,
+#define Z_IS_2436_EQ_2436(...)   \,
+#define Z_IS_2436U_EQ_2436(...)  \,
+#define Z_IS_2436_EQ_2436U(...)  \,
+#define Z_IS_2436U_EQ_2436U(...) \,
+#define Z_IS_2437_EQ_2437(...)   \,
+#define Z_IS_2437U_EQ_2437(...)  \,
+#define Z_IS_2437_EQ_2437U(...)  \,
+#define Z_IS_2437U_EQ_2437U(...) \,
+#define Z_IS_2438_EQ_2438(...)   \,
+#define Z_IS_2438U_EQ_2438(...)  \,
+#define Z_IS_2438_EQ_2438U(...)  \,
+#define Z_IS_2438U_EQ_2438U(...) \,
+#define Z_IS_2439_EQ_2439(...)   \,
+#define Z_IS_2439U_EQ_2439(...)  \,
+#define Z_IS_2439_EQ_2439U(...)  \,
+#define Z_IS_2439U_EQ_2439U(...) \,
+#define Z_IS_2440_EQ_2440(...)   \,
+#define Z_IS_2440U_EQ_2440(...)  \,
+#define Z_IS_2440_EQ_2440U(...)  \,
+#define Z_IS_2440U_EQ_2440U(...) \,
+#define Z_IS_2441_EQ_2441(...)   \,
+#define Z_IS_2441U_EQ_2441(...)  \,
+#define Z_IS_2441_EQ_2441U(...)  \,
+#define Z_IS_2441U_EQ_2441U(...) \,
+#define Z_IS_2442_EQ_2442(...)   \,
+#define Z_IS_2442U_EQ_2442(...)  \,
+#define Z_IS_2442_EQ_2442U(...)  \,
+#define Z_IS_2442U_EQ_2442U(...) \,
+#define Z_IS_2443_EQ_2443(...)   \,
+#define Z_IS_2443U_EQ_2443(...)  \,
+#define Z_IS_2443_EQ_2443U(...)  \,
+#define Z_IS_2443U_EQ_2443U(...) \,
+#define Z_IS_2444_EQ_2444(...)   \,
+#define Z_IS_2444U_EQ_2444(...)  \,
+#define Z_IS_2444_EQ_2444U(...)  \,
+#define Z_IS_2444U_EQ_2444U(...) \,
+#define Z_IS_2445_EQ_2445(...)   \,
+#define Z_IS_2445U_EQ_2445(...)  \,
+#define Z_IS_2445_EQ_2445U(...)  \,
+#define Z_IS_2445U_EQ_2445U(...) \,
+#define Z_IS_2446_EQ_2446(...)   \,
+#define Z_IS_2446U_EQ_2446(...)  \,
+#define Z_IS_2446_EQ_2446U(...)  \,
+#define Z_IS_2446U_EQ_2446U(...) \,
+#define Z_IS_2447_EQ_2447(...)   \,
+#define Z_IS_2447U_EQ_2447(...)  \,
+#define Z_IS_2447_EQ_2447U(...)  \,
+#define Z_IS_2447U_EQ_2447U(...) \,
+#define Z_IS_2448_EQ_2448(...)   \,
+#define Z_IS_2448U_EQ_2448(...)  \,
+#define Z_IS_2448_EQ_2448U(...)  \,
+#define Z_IS_2448U_EQ_2448U(...) \,
+#define Z_IS_2449_EQ_2449(...)   \,
+#define Z_IS_2449U_EQ_2449(...)  \,
+#define Z_IS_2449_EQ_2449U(...)  \,
+#define Z_IS_2449U_EQ_2449U(...) \,
+#define Z_IS_2450_EQ_2450(...)   \,
+#define Z_IS_2450U_EQ_2450(...)  \,
+#define Z_IS_2450_EQ_2450U(...)  \,
+#define Z_IS_2450U_EQ_2450U(...) \,
+#define Z_IS_2451_EQ_2451(...)   \,
+#define Z_IS_2451U_EQ_2451(...)  \,
+#define Z_IS_2451_EQ_2451U(...)  \,
+#define Z_IS_2451U_EQ_2451U(...) \,
+#define Z_IS_2452_EQ_2452(...)   \,
+#define Z_IS_2452U_EQ_2452(...)  \,
+#define Z_IS_2452_EQ_2452U(...)  \,
+#define Z_IS_2452U_EQ_2452U(...) \,
+#define Z_IS_2453_EQ_2453(...)   \,
+#define Z_IS_2453U_EQ_2453(...)  \,
+#define Z_IS_2453_EQ_2453U(...)  \,
+#define Z_IS_2453U_EQ_2453U(...) \,
+#define Z_IS_2454_EQ_2454(...)   \,
+#define Z_IS_2454U_EQ_2454(...)  \,
+#define Z_IS_2454_EQ_2454U(...)  \,
+#define Z_IS_2454U_EQ_2454U(...) \,
+#define Z_IS_2455_EQ_2455(...)   \,
+#define Z_IS_2455U_EQ_2455(...)  \,
+#define Z_IS_2455_EQ_2455U(...)  \,
+#define Z_IS_2455U_EQ_2455U(...) \,
+#define Z_IS_2456_EQ_2456(...)   \,
+#define Z_IS_2456U_EQ_2456(...)  \,
+#define Z_IS_2456_EQ_2456U(...)  \,
+#define Z_IS_2456U_EQ_2456U(...) \,
+#define Z_IS_2457_EQ_2457(...)   \,
+#define Z_IS_2457U_EQ_2457(...)  \,
+#define Z_IS_2457_EQ_2457U(...)  \,
+#define Z_IS_2457U_EQ_2457U(...) \,
+#define Z_IS_2458_EQ_2458(...)   \,
+#define Z_IS_2458U_EQ_2458(...)  \,
+#define Z_IS_2458_EQ_2458U(...)  \,
+#define Z_IS_2458U_EQ_2458U(...) \,
+#define Z_IS_2459_EQ_2459(...)   \,
+#define Z_IS_2459U_EQ_2459(...)  \,
+#define Z_IS_2459_EQ_2459U(...)  \,
+#define Z_IS_2459U_EQ_2459U(...) \,
+#define Z_IS_2460_EQ_2460(...)   \,
+#define Z_IS_2460U_EQ_2460(...)  \,
+#define Z_IS_2460_EQ_2460U(...)  \,
+#define Z_IS_2460U_EQ_2460U(...) \,
+#define Z_IS_2461_EQ_2461(...)   \,
+#define Z_IS_2461U_EQ_2461(...)  \,
+#define Z_IS_2461_EQ_2461U(...)  \,
+#define Z_IS_2461U_EQ_2461U(...) \,
+#define Z_IS_2462_EQ_2462(...)   \,
+#define Z_IS_2462U_EQ_2462(...)  \,
+#define Z_IS_2462_EQ_2462U(...)  \,
+#define Z_IS_2462U_EQ_2462U(...) \,
+#define Z_IS_2463_EQ_2463(...)   \,
+#define Z_IS_2463U_EQ_2463(...)  \,
+#define Z_IS_2463_EQ_2463U(...)  \,
+#define Z_IS_2463U_EQ_2463U(...) \,
+#define Z_IS_2464_EQ_2464(...)   \,
+#define Z_IS_2464U_EQ_2464(...)  \,
+#define Z_IS_2464_EQ_2464U(...)  \,
+#define Z_IS_2464U_EQ_2464U(...) \,
+#define Z_IS_2465_EQ_2465(...)   \,
+#define Z_IS_2465U_EQ_2465(...)  \,
+#define Z_IS_2465_EQ_2465U(...)  \,
+#define Z_IS_2465U_EQ_2465U(...) \,
+#define Z_IS_2466_EQ_2466(...)   \,
+#define Z_IS_2466U_EQ_2466(...)  \,
+#define Z_IS_2466_EQ_2466U(...)  \,
+#define Z_IS_2466U_EQ_2466U(...) \,
+#define Z_IS_2467_EQ_2467(...)   \,
+#define Z_IS_2467U_EQ_2467(...)  \,
+#define Z_IS_2467_EQ_2467U(...)  \,
+#define Z_IS_2467U_EQ_2467U(...) \,
+#define Z_IS_2468_EQ_2468(...)   \,
+#define Z_IS_2468U_EQ_2468(...)  \,
+#define Z_IS_2468_EQ_2468U(...)  \,
+#define Z_IS_2468U_EQ_2468U(...) \,
+#define Z_IS_2469_EQ_2469(...)   \,
+#define Z_IS_2469U_EQ_2469(...)  \,
+#define Z_IS_2469_EQ_2469U(...)  \,
+#define Z_IS_2469U_EQ_2469U(...) \,
+#define Z_IS_2470_EQ_2470(...)   \,
+#define Z_IS_2470U_EQ_2470(...)  \,
+#define Z_IS_2470_EQ_2470U(...)  \,
+#define Z_IS_2470U_EQ_2470U(...) \,
+#define Z_IS_2471_EQ_2471(...)   \,
+#define Z_IS_2471U_EQ_2471(...)  \,
+#define Z_IS_2471_EQ_2471U(...)  \,
+#define Z_IS_2471U_EQ_2471U(...) \,
+#define Z_IS_2472_EQ_2472(...)   \,
+#define Z_IS_2472U_EQ_2472(...)  \,
+#define Z_IS_2472_EQ_2472U(...)  \,
+#define Z_IS_2472U_EQ_2472U(...) \,
+#define Z_IS_2473_EQ_2473(...)   \,
+#define Z_IS_2473U_EQ_2473(...)  \,
+#define Z_IS_2473_EQ_2473U(...)  \,
+#define Z_IS_2473U_EQ_2473U(...) \,
+#define Z_IS_2474_EQ_2474(...)   \,
+#define Z_IS_2474U_EQ_2474(...)  \,
+#define Z_IS_2474_EQ_2474U(...)  \,
+#define Z_IS_2474U_EQ_2474U(...) \,
+#define Z_IS_2475_EQ_2475(...)   \,
+#define Z_IS_2475U_EQ_2475(...)  \,
+#define Z_IS_2475_EQ_2475U(...)  \,
+#define Z_IS_2475U_EQ_2475U(...) \,
+#define Z_IS_2476_EQ_2476(...)   \,
+#define Z_IS_2476U_EQ_2476(...)  \,
+#define Z_IS_2476_EQ_2476U(...)  \,
+#define Z_IS_2476U_EQ_2476U(...) \,
+#define Z_IS_2477_EQ_2477(...)   \,
+#define Z_IS_2477U_EQ_2477(...)  \,
+#define Z_IS_2477_EQ_2477U(...)  \,
+#define Z_IS_2477U_EQ_2477U(...) \,
+#define Z_IS_2478_EQ_2478(...)   \,
+#define Z_IS_2478U_EQ_2478(...)  \,
+#define Z_IS_2478_EQ_2478U(...)  \,
+#define Z_IS_2478U_EQ_2478U(...) \,
+#define Z_IS_2479_EQ_2479(...)   \,
+#define Z_IS_2479U_EQ_2479(...)  \,
+#define Z_IS_2479_EQ_2479U(...)  \,
+#define Z_IS_2479U_EQ_2479U(...) \,
+#define Z_IS_2480_EQ_2480(...)   \,
+#define Z_IS_2480U_EQ_2480(...)  \,
+#define Z_IS_2480_EQ_2480U(...)  \,
+#define Z_IS_2480U_EQ_2480U(...) \,
+#define Z_IS_2481_EQ_2481(...)   \,
+#define Z_IS_2481U_EQ_2481(...)  \,
+#define Z_IS_2481_EQ_2481U(...)  \,
+#define Z_IS_2481U_EQ_2481U(...) \,
+#define Z_IS_2482_EQ_2482(...)   \,
+#define Z_IS_2482U_EQ_2482(...)  \,
+#define Z_IS_2482_EQ_2482U(...)  \,
+#define Z_IS_2482U_EQ_2482U(...) \,
+#define Z_IS_2483_EQ_2483(...)   \,
+#define Z_IS_2483U_EQ_2483(...)  \,
+#define Z_IS_2483_EQ_2483U(...)  \,
+#define Z_IS_2483U_EQ_2483U(...) \,
+#define Z_IS_2484_EQ_2484(...)   \,
+#define Z_IS_2484U_EQ_2484(...)  \,
+#define Z_IS_2484_EQ_2484U(...)  \,
+#define Z_IS_2484U_EQ_2484U(...) \,
+#define Z_IS_2485_EQ_2485(...)   \,
+#define Z_IS_2485U_EQ_2485(...)  \,
+#define Z_IS_2485_EQ_2485U(...)  \,
+#define Z_IS_2485U_EQ_2485U(...) \,
+#define Z_IS_2486_EQ_2486(...)   \,
+#define Z_IS_2486U_EQ_2486(...)  \,
+#define Z_IS_2486_EQ_2486U(...)  \,
+#define Z_IS_2486U_EQ_2486U(...) \,
+#define Z_IS_2487_EQ_2487(...)   \,
+#define Z_IS_2487U_EQ_2487(...)  \,
+#define Z_IS_2487_EQ_2487U(...)  \,
+#define Z_IS_2487U_EQ_2487U(...) \,
+#define Z_IS_2488_EQ_2488(...)   \,
+#define Z_IS_2488U_EQ_2488(...)  \,
+#define Z_IS_2488_EQ_2488U(...)  \,
+#define Z_IS_2488U_EQ_2488U(...) \,
+#define Z_IS_2489_EQ_2489(...)   \,
+#define Z_IS_2489U_EQ_2489(...)  \,
+#define Z_IS_2489_EQ_2489U(...)  \,
+#define Z_IS_2489U_EQ_2489U(...) \,
+#define Z_IS_2490_EQ_2490(...)   \,
+#define Z_IS_2490U_EQ_2490(...)  \,
+#define Z_IS_2490_EQ_2490U(...)  \,
+#define Z_IS_2490U_EQ_2490U(...) \,
+#define Z_IS_2491_EQ_2491(...)   \,
+#define Z_IS_2491U_EQ_2491(...)  \,
+#define Z_IS_2491_EQ_2491U(...)  \,
+#define Z_IS_2491U_EQ_2491U(...) \,
+#define Z_IS_2492_EQ_2492(...)   \,
+#define Z_IS_2492U_EQ_2492(...)  \,
+#define Z_IS_2492_EQ_2492U(...)  \,
+#define Z_IS_2492U_EQ_2492U(...) \,
+#define Z_IS_2493_EQ_2493(...)   \,
+#define Z_IS_2493U_EQ_2493(...)  \,
+#define Z_IS_2493_EQ_2493U(...)  \,
+#define Z_IS_2493U_EQ_2493U(...) \,
+#define Z_IS_2494_EQ_2494(...)   \,
+#define Z_IS_2494U_EQ_2494(...)  \,
+#define Z_IS_2494_EQ_2494U(...)  \,
+#define Z_IS_2494U_EQ_2494U(...) \,
+#define Z_IS_2495_EQ_2495(...)   \,
+#define Z_IS_2495U_EQ_2495(...)  \,
+#define Z_IS_2495_EQ_2495U(...)  \,
+#define Z_IS_2495U_EQ_2495U(...) \,
+#define Z_IS_2496_EQ_2496(...)   \,
+#define Z_IS_2496U_EQ_2496(...)  \,
+#define Z_IS_2496_EQ_2496U(...)  \,
+#define Z_IS_2496U_EQ_2496U(...) \,
+#define Z_IS_2497_EQ_2497(...)   \,
+#define Z_IS_2497U_EQ_2497(...)  \,
+#define Z_IS_2497_EQ_2497U(...)  \,
+#define Z_IS_2497U_EQ_2497U(...) \,
+#define Z_IS_2498_EQ_2498(...)   \,
+#define Z_IS_2498U_EQ_2498(...)  \,
+#define Z_IS_2498_EQ_2498U(...)  \,
+#define Z_IS_2498U_EQ_2498U(...) \,
+#define Z_IS_2499_EQ_2499(...)   \,
+#define Z_IS_2499U_EQ_2499(...)  \,
+#define Z_IS_2499_EQ_2499U(...)  \,
+#define Z_IS_2499U_EQ_2499U(...) \,
+#define Z_IS_2500_EQ_2500(...)   \,
+#define Z_IS_2500U_EQ_2500(...)  \,
+#define Z_IS_2500_EQ_2500U(...)  \,
+#define Z_IS_2500U_EQ_2500U(...) \,
+#define Z_IS_2501_EQ_2501(...)   \,
+#define Z_IS_2501U_EQ_2501(...)  \,
+#define Z_IS_2501_EQ_2501U(...)  \,
+#define Z_IS_2501U_EQ_2501U(...) \,
+#define Z_IS_2502_EQ_2502(...)   \,
+#define Z_IS_2502U_EQ_2502(...)  \,
+#define Z_IS_2502_EQ_2502U(...)  \,
+#define Z_IS_2502U_EQ_2502U(...) \,
+#define Z_IS_2503_EQ_2503(...)   \,
+#define Z_IS_2503U_EQ_2503(...)  \,
+#define Z_IS_2503_EQ_2503U(...)  \,
+#define Z_IS_2503U_EQ_2503U(...) \,
+#define Z_IS_2504_EQ_2504(...)   \,
+#define Z_IS_2504U_EQ_2504(...)  \,
+#define Z_IS_2504_EQ_2504U(...)  \,
+#define Z_IS_2504U_EQ_2504U(...) \,
+#define Z_IS_2505_EQ_2505(...)   \,
+#define Z_IS_2505U_EQ_2505(...)  \,
+#define Z_IS_2505_EQ_2505U(...)  \,
+#define Z_IS_2505U_EQ_2505U(...) \,
+#define Z_IS_2506_EQ_2506(...)   \,
+#define Z_IS_2506U_EQ_2506(...)  \,
+#define Z_IS_2506_EQ_2506U(...)  \,
+#define Z_IS_2506U_EQ_2506U(...) \,
+#define Z_IS_2507_EQ_2507(...)   \,
+#define Z_IS_2507U_EQ_2507(...)  \,
+#define Z_IS_2507_EQ_2507U(...)  \,
+#define Z_IS_2507U_EQ_2507U(...) \,
+#define Z_IS_2508_EQ_2508(...)   \,
+#define Z_IS_2508U_EQ_2508(...)  \,
+#define Z_IS_2508_EQ_2508U(...)  \,
+#define Z_IS_2508U_EQ_2508U(...) \,
+#define Z_IS_2509_EQ_2509(...)   \,
+#define Z_IS_2509U_EQ_2509(...)  \,
+#define Z_IS_2509_EQ_2509U(...)  \,
+#define Z_IS_2509U_EQ_2509U(...) \,
+#define Z_IS_2510_EQ_2510(...)   \,
+#define Z_IS_2510U_EQ_2510(...)  \,
+#define Z_IS_2510_EQ_2510U(...)  \,
+#define Z_IS_2510U_EQ_2510U(...) \,
+#define Z_IS_2511_EQ_2511(...)   \,
+#define Z_IS_2511U_EQ_2511(...)  \,
+#define Z_IS_2511_EQ_2511U(...)  \,
+#define Z_IS_2511U_EQ_2511U(...) \,
+#define Z_IS_2512_EQ_2512(...)   \,
+#define Z_IS_2512U_EQ_2512(...)  \,
+#define Z_IS_2512_EQ_2512U(...)  \,
+#define Z_IS_2512U_EQ_2512U(...) \,
+#define Z_IS_2513_EQ_2513(...)   \,
+#define Z_IS_2513U_EQ_2513(...)  \,
+#define Z_IS_2513_EQ_2513U(...)  \,
+#define Z_IS_2513U_EQ_2513U(...) \,
+#define Z_IS_2514_EQ_2514(...)   \,
+#define Z_IS_2514U_EQ_2514(...)  \,
+#define Z_IS_2514_EQ_2514U(...)  \,
+#define Z_IS_2514U_EQ_2514U(...) \,
+#define Z_IS_2515_EQ_2515(...)   \,
+#define Z_IS_2515U_EQ_2515(...)  \,
+#define Z_IS_2515_EQ_2515U(...)  \,
+#define Z_IS_2515U_EQ_2515U(...) \,
+#define Z_IS_2516_EQ_2516(...)   \,
+#define Z_IS_2516U_EQ_2516(...)  \,
+#define Z_IS_2516_EQ_2516U(...)  \,
+#define Z_IS_2516U_EQ_2516U(...) \,
+#define Z_IS_2517_EQ_2517(...)   \,
+#define Z_IS_2517U_EQ_2517(...)  \,
+#define Z_IS_2517_EQ_2517U(...)  \,
+#define Z_IS_2517U_EQ_2517U(...) \,
+#define Z_IS_2518_EQ_2518(...)   \,
+#define Z_IS_2518U_EQ_2518(...)  \,
+#define Z_IS_2518_EQ_2518U(...)  \,
+#define Z_IS_2518U_EQ_2518U(...) \,
+#define Z_IS_2519_EQ_2519(...)   \,
+#define Z_IS_2519U_EQ_2519(...)  \,
+#define Z_IS_2519_EQ_2519U(...)  \,
+#define Z_IS_2519U_EQ_2519U(...) \,
+#define Z_IS_2520_EQ_2520(...)   \,
+#define Z_IS_2520U_EQ_2520(...)  \,
+#define Z_IS_2520_EQ_2520U(...)  \,
+#define Z_IS_2520U_EQ_2520U(...) \,
+#define Z_IS_2521_EQ_2521(...)   \,
+#define Z_IS_2521U_EQ_2521(...)  \,
+#define Z_IS_2521_EQ_2521U(...)  \,
+#define Z_IS_2521U_EQ_2521U(...) \,
+#define Z_IS_2522_EQ_2522(...)   \,
+#define Z_IS_2522U_EQ_2522(...)  \,
+#define Z_IS_2522_EQ_2522U(...)  \,
+#define Z_IS_2522U_EQ_2522U(...) \,
+#define Z_IS_2523_EQ_2523(...)   \,
+#define Z_IS_2523U_EQ_2523(...)  \,
+#define Z_IS_2523_EQ_2523U(...)  \,
+#define Z_IS_2523U_EQ_2523U(...) \,
+#define Z_IS_2524_EQ_2524(...)   \,
+#define Z_IS_2524U_EQ_2524(...)  \,
+#define Z_IS_2524_EQ_2524U(...)  \,
+#define Z_IS_2524U_EQ_2524U(...) \,
+#define Z_IS_2525_EQ_2525(...)   \,
+#define Z_IS_2525U_EQ_2525(...)  \,
+#define Z_IS_2525_EQ_2525U(...)  \,
+#define Z_IS_2525U_EQ_2525U(...) \,
+#define Z_IS_2526_EQ_2526(...)   \,
+#define Z_IS_2526U_EQ_2526(...)  \,
+#define Z_IS_2526_EQ_2526U(...)  \,
+#define Z_IS_2526U_EQ_2526U(...) \,
+#define Z_IS_2527_EQ_2527(...)   \,
+#define Z_IS_2527U_EQ_2527(...)  \,
+#define Z_IS_2527_EQ_2527U(...)  \,
+#define Z_IS_2527U_EQ_2527U(...) \,
+#define Z_IS_2528_EQ_2528(...)   \,
+#define Z_IS_2528U_EQ_2528(...)  \,
+#define Z_IS_2528_EQ_2528U(...)  \,
+#define Z_IS_2528U_EQ_2528U(...) \,
+#define Z_IS_2529_EQ_2529(...)   \,
+#define Z_IS_2529U_EQ_2529(...)  \,
+#define Z_IS_2529_EQ_2529U(...)  \,
+#define Z_IS_2529U_EQ_2529U(...) \,
+#define Z_IS_2530_EQ_2530(...)   \,
+#define Z_IS_2530U_EQ_2530(...)  \,
+#define Z_IS_2530_EQ_2530U(...)  \,
+#define Z_IS_2530U_EQ_2530U(...) \,
+#define Z_IS_2531_EQ_2531(...)   \,
+#define Z_IS_2531U_EQ_2531(...)  \,
+#define Z_IS_2531_EQ_2531U(...)  \,
+#define Z_IS_2531U_EQ_2531U(...) \,
+#define Z_IS_2532_EQ_2532(...)   \,
+#define Z_IS_2532U_EQ_2532(...)  \,
+#define Z_IS_2532_EQ_2532U(...)  \,
+#define Z_IS_2532U_EQ_2532U(...) \,
+#define Z_IS_2533_EQ_2533(...)   \,
+#define Z_IS_2533U_EQ_2533(...)  \,
+#define Z_IS_2533_EQ_2533U(...)  \,
+#define Z_IS_2533U_EQ_2533U(...) \,
+#define Z_IS_2534_EQ_2534(...)   \,
+#define Z_IS_2534U_EQ_2534(...)  \,
+#define Z_IS_2534_EQ_2534U(...)  \,
+#define Z_IS_2534U_EQ_2534U(...) \,
+#define Z_IS_2535_EQ_2535(...)   \,
+#define Z_IS_2535U_EQ_2535(...)  \,
+#define Z_IS_2535_EQ_2535U(...)  \,
+#define Z_IS_2535U_EQ_2535U(...) \,
+#define Z_IS_2536_EQ_2536(...)   \,
+#define Z_IS_2536U_EQ_2536(...)  \,
+#define Z_IS_2536_EQ_2536U(...)  \,
+#define Z_IS_2536U_EQ_2536U(...) \,
+#define Z_IS_2537_EQ_2537(...)   \,
+#define Z_IS_2537U_EQ_2537(...)  \,
+#define Z_IS_2537_EQ_2537U(...)  \,
+#define Z_IS_2537U_EQ_2537U(...) \,
+#define Z_IS_2538_EQ_2538(...)   \,
+#define Z_IS_2538U_EQ_2538(...)  \,
+#define Z_IS_2538_EQ_2538U(...)  \,
+#define Z_IS_2538U_EQ_2538U(...) \,
+#define Z_IS_2539_EQ_2539(...)   \,
+#define Z_IS_2539U_EQ_2539(...)  \,
+#define Z_IS_2539_EQ_2539U(...)  \,
+#define Z_IS_2539U_EQ_2539U(...) \,
+#define Z_IS_2540_EQ_2540(...)   \,
+#define Z_IS_2540U_EQ_2540(...)  \,
+#define Z_IS_2540_EQ_2540U(...)  \,
+#define Z_IS_2540U_EQ_2540U(...) \,
+#define Z_IS_2541_EQ_2541(...)   \,
+#define Z_IS_2541U_EQ_2541(...)  \,
+#define Z_IS_2541_EQ_2541U(...)  \,
+#define Z_IS_2541U_EQ_2541U(...) \,
+#define Z_IS_2542_EQ_2542(...)   \,
+#define Z_IS_2542U_EQ_2542(...)  \,
+#define Z_IS_2542_EQ_2542U(...)  \,
+#define Z_IS_2542U_EQ_2542U(...) \,
+#define Z_IS_2543_EQ_2543(...)   \,
+#define Z_IS_2543U_EQ_2543(...)  \,
+#define Z_IS_2543_EQ_2543U(...)  \,
+#define Z_IS_2543U_EQ_2543U(...) \,
+#define Z_IS_2544_EQ_2544(...)   \,
+#define Z_IS_2544U_EQ_2544(...)  \,
+#define Z_IS_2544_EQ_2544U(...)  \,
+#define Z_IS_2544U_EQ_2544U(...) \,
+#define Z_IS_2545_EQ_2545(...)   \,
+#define Z_IS_2545U_EQ_2545(...)  \,
+#define Z_IS_2545_EQ_2545U(...)  \,
+#define Z_IS_2545U_EQ_2545U(...) \,
+#define Z_IS_2546_EQ_2546(...)   \,
+#define Z_IS_2546U_EQ_2546(...)  \,
+#define Z_IS_2546_EQ_2546U(...)  \,
+#define Z_IS_2546U_EQ_2546U(...) \,
+#define Z_IS_2547_EQ_2547(...)   \,
+#define Z_IS_2547U_EQ_2547(...)  \,
+#define Z_IS_2547_EQ_2547U(...)  \,
+#define Z_IS_2547U_EQ_2547U(...) \,
+#define Z_IS_2548_EQ_2548(...)   \,
+#define Z_IS_2548U_EQ_2548(...)  \,
+#define Z_IS_2548_EQ_2548U(...)  \,
+#define Z_IS_2548U_EQ_2548U(...) \,
+#define Z_IS_2549_EQ_2549(...)   \,
+#define Z_IS_2549U_EQ_2549(...)  \,
+#define Z_IS_2549_EQ_2549U(...)  \,
+#define Z_IS_2549U_EQ_2549U(...) \,
+#define Z_IS_2550_EQ_2550(...)   \,
+#define Z_IS_2550U_EQ_2550(...)  \,
+#define Z_IS_2550_EQ_2550U(...)  \,
+#define Z_IS_2550U_EQ_2550U(...) \,
+#define Z_IS_2551_EQ_2551(...)   \,
+#define Z_IS_2551U_EQ_2551(...)  \,
+#define Z_IS_2551_EQ_2551U(...)  \,
+#define Z_IS_2551U_EQ_2551U(...) \,
+#define Z_IS_2552_EQ_2552(...)   \,
+#define Z_IS_2552U_EQ_2552(...)  \,
+#define Z_IS_2552_EQ_2552U(...)  \,
+#define Z_IS_2552U_EQ_2552U(...) \,
+#define Z_IS_2553_EQ_2553(...)   \,
+#define Z_IS_2553U_EQ_2553(...)  \,
+#define Z_IS_2553_EQ_2553U(...)  \,
+#define Z_IS_2553U_EQ_2553U(...) \,
+#define Z_IS_2554_EQ_2554(...)   \,
+#define Z_IS_2554U_EQ_2554(...)  \,
+#define Z_IS_2554_EQ_2554U(...)  \,
+#define Z_IS_2554U_EQ_2554U(...) \,
+#define Z_IS_2555_EQ_2555(...)   \,
+#define Z_IS_2555U_EQ_2555(...)  \,
+#define Z_IS_2555_EQ_2555U(...)  \,
+#define Z_IS_2555U_EQ_2555U(...) \,
+#define Z_IS_2556_EQ_2556(...)   \,
+#define Z_IS_2556U_EQ_2556(...)  \,
+#define Z_IS_2556_EQ_2556U(...)  \,
+#define Z_IS_2556U_EQ_2556U(...) \,
+#define Z_IS_2557_EQ_2557(...)   \,
+#define Z_IS_2557U_EQ_2557(...)  \,
+#define Z_IS_2557_EQ_2557U(...)  \,
+#define Z_IS_2557U_EQ_2557U(...) \,
+#define Z_IS_2558_EQ_2558(...)   \,
+#define Z_IS_2558U_EQ_2558(...)  \,
+#define Z_IS_2558_EQ_2558U(...)  \,
+#define Z_IS_2558U_EQ_2558U(...) \,
+#define Z_IS_2559_EQ_2559(...)   \,
+#define Z_IS_2559U_EQ_2559(...)  \,
+#define Z_IS_2559_EQ_2559U(...)  \,
+#define Z_IS_2559U_EQ_2559U(...) \,
+#define Z_IS_2560_EQ_2560(...)   \,
+#define Z_IS_2560U_EQ_2560(...)  \,
+#define Z_IS_2560_EQ_2560U(...)  \,
+#define Z_IS_2560U_EQ_2560U(...) \,
+#define Z_IS_2561_EQ_2561(...)   \,
+#define Z_IS_2561U_EQ_2561(...)  \,
+#define Z_IS_2561_EQ_2561U(...)  \,
+#define Z_IS_2561U_EQ_2561U(...) \,
+#define Z_IS_2562_EQ_2562(...)   \,
+#define Z_IS_2562U_EQ_2562(...)  \,
+#define Z_IS_2562_EQ_2562U(...)  \,
+#define Z_IS_2562U_EQ_2562U(...) \,
+#define Z_IS_2563_EQ_2563(...)   \,
+#define Z_IS_2563U_EQ_2563(...)  \,
+#define Z_IS_2563_EQ_2563U(...)  \,
+#define Z_IS_2563U_EQ_2563U(...) \,
+#define Z_IS_2564_EQ_2564(...)   \,
+#define Z_IS_2564U_EQ_2564(...)  \,
+#define Z_IS_2564_EQ_2564U(...)  \,
+#define Z_IS_2564U_EQ_2564U(...) \,
+#define Z_IS_2565_EQ_2565(...)   \,
+#define Z_IS_2565U_EQ_2565(...)  \,
+#define Z_IS_2565_EQ_2565U(...)  \,
+#define Z_IS_2565U_EQ_2565U(...) \,
+#define Z_IS_2566_EQ_2566(...)   \,
+#define Z_IS_2566U_EQ_2566(...)  \,
+#define Z_IS_2566_EQ_2566U(...)  \,
+#define Z_IS_2566U_EQ_2566U(...) \,
+#define Z_IS_2567_EQ_2567(...)   \,
+#define Z_IS_2567U_EQ_2567(...)  \,
+#define Z_IS_2567_EQ_2567U(...)  \,
+#define Z_IS_2567U_EQ_2567U(...) \,
+#define Z_IS_2568_EQ_2568(...)   \,
+#define Z_IS_2568U_EQ_2568(...)  \,
+#define Z_IS_2568_EQ_2568U(...)  \,
+#define Z_IS_2568U_EQ_2568U(...) \,
+#define Z_IS_2569_EQ_2569(...)   \,
+#define Z_IS_2569U_EQ_2569(...)  \,
+#define Z_IS_2569_EQ_2569U(...)  \,
+#define Z_IS_2569U_EQ_2569U(...) \,
+#define Z_IS_2570_EQ_2570(...)   \,
+#define Z_IS_2570U_EQ_2570(...)  \,
+#define Z_IS_2570_EQ_2570U(...)  \,
+#define Z_IS_2570U_EQ_2570U(...) \,
+#define Z_IS_2571_EQ_2571(...)   \,
+#define Z_IS_2571U_EQ_2571(...)  \,
+#define Z_IS_2571_EQ_2571U(...)  \,
+#define Z_IS_2571U_EQ_2571U(...) \,
+#define Z_IS_2572_EQ_2572(...)   \,
+#define Z_IS_2572U_EQ_2572(...)  \,
+#define Z_IS_2572_EQ_2572U(...)  \,
+#define Z_IS_2572U_EQ_2572U(...) \,
+#define Z_IS_2573_EQ_2573(...)   \,
+#define Z_IS_2573U_EQ_2573(...)  \,
+#define Z_IS_2573_EQ_2573U(...)  \,
+#define Z_IS_2573U_EQ_2573U(...) \,
+#define Z_IS_2574_EQ_2574(...)   \,
+#define Z_IS_2574U_EQ_2574(...)  \,
+#define Z_IS_2574_EQ_2574U(...)  \,
+#define Z_IS_2574U_EQ_2574U(...) \,
+#define Z_IS_2575_EQ_2575(...)   \,
+#define Z_IS_2575U_EQ_2575(...)  \,
+#define Z_IS_2575_EQ_2575U(...)  \,
+#define Z_IS_2575U_EQ_2575U(...) \,
+#define Z_IS_2576_EQ_2576(...)   \,
+#define Z_IS_2576U_EQ_2576(...)  \,
+#define Z_IS_2576_EQ_2576U(...)  \,
+#define Z_IS_2576U_EQ_2576U(...) \,
+#define Z_IS_2577_EQ_2577(...)   \,
+#define Z_IS_2577U_EQ_2577(...)  \,
+#define Z_IS_2577_EQ_2577U(...)  \,
+#define Z_IS_2577U_EQ_2577U(...) \,
+#define Z_IS_2578_EQ_2578(...)   \,
+#define Z_IS_2578U_EQ_2578(...)  \,
+#define Z_IS_2578_EQ_2578U(...)  \,
+#define Z_IS_2578U_EQ_2578U(...) \,
+#define Z_IS_2579_EQ_2579(...)   \,
+#define Z_IS_2579U_EQ_2579(...)  \,
+#define Z_IS_2579_EQ_2579U(...)  \,
+#define Z_IS_2579U_EQ_2579U(...) \,
+#define Z_IS_2580_EQ_2580(...)   \,
+#define Z_IS_2580U_EQ_2580(...)  \,
+#define Z_IS_2580_EQ_2580U(...)  \,
+#define Z_IS_2580U_EQ_2580U(...) \,
+#define Z_IS_2581_EQ_2581(...)   \,
+#define Z_IS_2581U_EQ_2581(...)  \,
+#define Z_IS_2581_EQ_2581U(...)  \,
+#define Z_IS_2581U_EQ_2581U(...) \,
+#define Z_IS_2582_EQ_2582(...)   \,
+#define Z_IS_2582U_EQ_2582(...)  \,
+#define Z_IS_2582_EQ_2582U(...)  \,
+#define Z_IS_2582U_EQ_2582U(...) \,
+#define Z_IS_2583_EQ_2583(...)   \,
+#define Z_IS_2583U_EQ_2583(...)  \,
+#define Z_IS_2583_EQ_2583U(...)  \,
+#define Z_IS_2583U_EQ_2583U(...) \,
+#define Z_IS_2584_EQ_2584(...)   \,
+#define Z_IS_2584U_EQ_2584(...)  \,
+#define Z_IS_2584_EQ_2584U(...)  \,
+#define Z_IS_2584U_EQ_2584U(...) \,
+#define Z_IS_2585_EQ_2585(...)   \,
+#define Z_IS_2585U_EQ_2585(...)  \,
+#define Z_IS_2585_EQ_2585U(...)  \,
+#define Z_IS_2585U_EQ_2585U(...) \,
+#define Z_IS_2586_EQ_2586(...)   \,
+#define Z_IS_2586U_EQ_2586(...)  \,
+#define Z_IS_2586_EQ_2586U(...)  \,
+#define Z_IS_2586U_EQ_2586U(...) \,
+#define Z_IS_2587_EQ_2587(...)   \,
+#define Z_IS_2587U_EQ_2587(...)  \,
+#define Z_IS_2587_EQ_2587U(...)  \,
+#define Z_IS_2587U_EQ_2587U(...) \,
+#define Z_IS_2588_EQ_2588(...)   \,
+#define Z_IS_2588U_EQ_2588(...)  \,
+#define Z_IS_2588_EQ_2588U(...)  \,
+#define Z_IS_2588U_EQ_2588U(...) \,
+#define Z_IS_2589_EQ_2589(...)   \,
+#define Z_IS_2589U_EQ_2589(...)  \,
+#define Z_IS_2589_EQ_2589U(...)  \,
+#define Z_IS_2589U_EQ_2589U(...) \,
+#define Z_IS_2590_EQ_2590(...)   \,
+#define Z_IS_2590U_EQ_2590(...)  \,
+#define Z_IS_2590_EQ_2590U(...)  \,
+#define Z_IS_2590U_EQ_2590U(...) \,
+#define Z_IS_2591_EQ_2591(...)   \,
+#define Z_IS_2591U_EQ_2591(...)  \,
+#define Z_IS_2591_EQ_2591U(...)  \,
+#define Z_IS_2591U_EQ_2591U(...) \,
+#define Z_IS_2592_EQ_2592(...)   \,
+#define Z_IS_2592U_EQ_2592(...)  \,
+#define Z_IS_2592_EQ_2592U(...)  \,
+#define Z_IS_2592U_EQ_2592U(...) \,
+#define Z_IS_2593_EQ_2593(...)   \,
+#define Z_IS_2593U_EQ_2593(...)  \,
+#define Z_IS_2593_EQ_2593U(...)  \,
+#define Z_IS_2593U_EQ_2593U(...) \,
+#define Z_IS_2594_EQ_2594(...)   \,
+#define Z_IS_2594U_EQ_2594(...)  \,
+#define Z_IS_2594_EQ_2594U(...)  \,
+#define Z_IS_2594U_EQ_2594U(...) \,
+#define Z_IS_2595_EQ_2595(...)   \,
+#define Z_IS_2595U_EQ_2595(...)  \,
+#define Z_IS_2595_EQ_2595U(...)  \,
+#define Z_IS_2595U_EQ_2595U(...) \,
+#define Z_IS_2596_EQ_2596(...)   \,
+#define Z_IS_2596U_EQ_2596(...)  \,
+#define Z_IS_2596_EQ_2596U(...)  \,
+#define Z_IS_2596U_EQ_2596U(...) \,
+#define Z_IS_2597_EQ_2597(...)   \,
+#define Z_IS_2597U_EQ_2597(...)  \,
+#define Z_IS_2597_EQ_2597U(...)  \,
+#define Z_IS_2597U_EQ_2597U(...) \,
+#define Z_IS_2598_EQ_2598(...)   \,
+#define Z_IS_2598U_EQ_2598(...)  \,
+#define Z_IS_2598_EQ_2598U(...)  \,
+#define Z_IS_2598U_EQ_2598U(...) \,
+#define Z_IS_2599_EQ_2599(...)   \,
+#define Z_IS_2599U_EQ_2599(...)  \,
+#define Z_IS_2599_EQ_2599U(...)  \,
+#define Z_IS_2599U_EQ_2599U(...) \,
+#define Z_IS_2600_EQ_2600(...)   \,
+#define Z_IS_2600U_EQ_2600(...)  \,
+#define Z_IS_2600_EQ_2600U(...)  \,
+#define Z_IS_2600U_EQ_2600U(...) \,
+#define Z_IS_2601_EQ_2601(...)   \,
+#define Z_IS_2601U_EQ_2601(...)  \,
+#define Z_IS_2601_EQ_2601U(...)  \,
+#define Z_IS_2601U_EQ_2601U(...) \,
+#define Z_IS_2602_EQ_2602(...)   \,
+#define Z_IS_2602U_EQ_2602(...)  \,
+#define Z_IS_2602_EQ_2602U(...)  \,
+#define Z_IS_2602U_EQ_2602U(...) \,
+#define Z_IS_2603_EQ_2603(...)   \,
+#define Z_IS_2603U_EQ_2603(...)  \,
+#define Z_IS_2603_EQ_2603U(...)  \,
+#define Z_IS_2603U_EQ_2603U(...) \,
+#define Z_IS_2604_EQ_2604(...)   \,
+#define Z_IS_2604U_EQ_2604(...)  \,
+#define Z_IS_2604_EQ_2604U(...)  \,
+#define Z_IS_2604U_EQ_2604U(...) \,
+#define Z_IS_2605_EQ_2605(...)   \,
+#define Z_IS_2605U_EQ_2605(...)  \,
+#define Z_IS_2605_EQ_2605U(...)  \,
+#define Z_IS_2605U_EQ_2605U(...) \,
+#define Z_IS_2606_EQ_2606(...)   \,
+#define Z_IS_2606U_EQ_2606(...)  \,
+#define Z_IS_2606_EQ_2606U(...)  \,
+#define Z_IS_2606U_EQ_2606U(...) \,
+#define Z_IS_2607_EQ_2607(...)   \,
+#define Z_IS_2607U_EQ_2607(...)  \,
+#define Z_IS_2607_EQ_2607U(...)  \,
+#define Z_IS_2607U_EQ_2607U(...) \,
+#define Z_IS_2608_EQ_2608(...)   \,
+#define Z_IS_2608U_EQ_2608(...)  \,
+#define Z_IS_2608_EQ_2608U(...)  \,
+#define Z_IS_2608U_EQ_2608U(...) \,
+#define Z_IS_2609_EQ_2609(...)   \,
+#define Z_IS_2609U_EQ_2609(...)  \,
+#define Z_IS_2609_EQ_2609U(...)  \,
+#define Z_IS_2609U_EQ_2609U(...) \,
+#define Z_IS_2610_EQ_2610(...)   \,
+#define Z_IS_2610U_EQ_2610(...)  \,
+#define Z_IS_2610_EQ_2610U(...)  \,
+#define Z_IS_2610U_EQ_2610U(...) \,
+#define Z_IS_2611_EQ_2611(...)   \,
+#define Z_IS_2611U_EQ_2611(...)  \,
+#define Z_IS_2611_EQ_2611U(...)  \,
+#define Z_IS_2611U_EQ_2611U(...) \,
+#define Z_IS_2612_EQ_2612(...)   \,
+#define Z_IS_2612U_EQ_2612(...)  \,
+#define Z_IS_2612_EQ_2612U(...)  \,
+#define Z_IS_2612U_EQ_2612U(...) \,
+#define Z_IS_2613_EQ_2613(...)   \,
+#define Z_IS_2613U_EQ_2613(...)  \,
+#define Z_IS_2613_EQ_2613U(...)  \,
+#define Z_IS_2613U_EQ_2613U(...) \,
+#define Z_IS_2614_EQ_2614(...)   \,
+#define Z_IS_2614U_EQ_2614(...)  \,
+#define Z_IS_2614_EQ_2614U(...)  \,
+#define Z_IS_2614U_EQ_2614U(...) \,
+#define Z_IS_2615_EQ_2615(...)   \,
+#define Z_IS_2615U_EQ_2615(...)  \,
+#define Z_IS_2615_EQ_2615U(...)  \,
+#define Z_IS_2615U_EQ_2615U(...) \,
+#define Z_IS_2616_EQ_2616(...)   \,
+#define Z_IS_2616U_EQ_2616(...)  \,
+#define Z_IS_2616_EQ_2616U(...)  \,
+#define Z_IS_2616U_EQ_2616U(...) \,
+#define Z_IS_2617_EQ_2617(...)   \,
+#define Z_IS_2617U_EQ_2617(...)  \,
+#define Z_IS_2617_EQ_2617U(...)  \,
+#define Z_IS_2617U_EQ_2617U(...) \,
+#define Z_IS_2618_EQ_2618(...)   \,
+#define Z_IS_2618U_EQ_2618(...)  \,
+#define Z_IS_2618_EQ_2618U(...)  \,
+#define Z_IS_2618U_EQ_2618U(...) \,
+#define Z_IS_2619_EQ_2619(...)   \,
+#define Z_IS_2619U_EQ_2619(...)  \,
+#define Z_IS_2619_EQ_2619U(...)  \,
+#define Z_IS_2619U_EQ_2619U(...) \,
+#define Z_IS_2620_EQ_2620(...)   \,
+#define Z_IS_2620U_EQ_2620(...)  \,
+#define Z_IS_2620_EQ_2620U(...)  \,
+#define Z_IS_2620U_EQ_2620U(...) \,
+#define Z_IS_2621_EQ_2621(...)   \,
+#define Z_IS_2621U_EQ_2621(...)  \,
+#define Z_IS_2621_EQ_2621U(...)  \,
+#define Z_IS_2621U_EQ_2621U(...) \,
+#define Z_IS_2622_EQ_2622(...)   \,
+#define Z_IS_2622U_EQ_2622(...)  \,
+#define Z_IS_2622_EQ_2622U(...)  \,
+#define Z_IS_2622U_EQ_2622U(...) \,
+#define Z_IS_2623_EQ_2623(...)   \,
+#define Z_IS_2623U_EQ_2623(...)  \,
+#define Z_IS_2623_EQ_2623U(...)  \,
+#define Z_IS_2623U_EQ_2623U(...) \,
+#define Z_IS_2624_EQ_2624(...)   \,
+#define Z_IS_2624U_EQ_2624(...)  \,
+#define Z_IS_2624_EQ_2624U(...)  \,
+#define Z_IS_2624U_EQ_2624U(...) \,
+#define Z_IS_2625_EQ_2625(...)   \,
+#define Z_IS_2625U_EQ_2625(...)  \,
+#define Z_IS_2625_EQ_2625U(...)  \,
+#define Z_IS_2625U_EQ_2625U(...) \,
+#define Z_IS_2626_EQ_2626(...)   \,
+#define Z_IS_2626U_EQ_2626(...)  \,
+#define Z_IS_2626_EQ_2626U(...)  \,
+#define Z_IS_2626U_EQ_2626U(...) \,
+#define Z_IS_2627_EQ_2627(...)   \,
+#define Z_IS_2627U_EQ_2627(...)  \,
+#define Z_IS_2627_EQ_2627U(...)  \,
+#define Z_IS_2627U_EQ_2627U(...) \,
+#define Z_IS_2628_EQ_2628(...)   \,
+#define Z_IS_2628U_EQ_2628(...)  \,
+#define Z_IS_2628_EQ_2628U(...)  \,
+#define Z_IS_2628U_EQ_2628U(...) \,
+#define Z_IS_2629_EQ_2629(...)   \,
+#define Z_IS_2629U_EQ_2629(...)  \,
+#define Z_IS_2629_EQ_2629U(...)  \,
+#define Z_IS_2629U_EQ_2629U(...) \,
+#define Z_IS_2630_EQ_2630(...)   \,
+#define Z_IS_2630U_EQ_2630(...)  \,
+#define Z_IS_2630_EQ_2630U(...)  \,
+#define Z_IS_2630U_EQ_2630U(...) \,
+#define Z_IS_2631_EQ_2631(...)   \,
+#define Z_IS_2631U_EQ_2631(...)  \,
+#define Z_IS_2631_EQ_2631U(...)  \,
+#define Z_IS_2631U_EQ_2631U(...) \,
+#define Z_IS_2632_EQ_2632(...)   \,
+#define Z_IS_2632U_EQ_2632(...)  \,
+#define Z_IS_2632_EQ_2632U(...)  \,
+#define Z_IS_2632U_EQ_2632U(...) \,
+#define Z_IS_2633_EQ_2633(...)   \,
+#define Z_IS_2633U_EQ_2633(...)  \,
+#define Z_IS_2633_EQ_2633U(...)  \,
+#define Z_IS_2633U_EQ_2633U(...) \,
+#define Z_IS_2634_EQ_2634(...)   \,
+#define Z_IS_2634U_EQ_2634(...)  \,
+#define Z_IS_2634_EQ_2634U(...)  \,
+#define Z_IS_2634U_EQ_2634U(...) \,
+#define Z_IS_2635_EQ_2635(...)   \,
+#define Z_IS_2635U_EQ_2635(...)  \,
+#define Z_IS_2635_EQ_2635U(...)  \,
+#define Z_IS_2635U_EQ_2635U(...) \,
+#define Z_IS_2636_EQ_2636(...)   \,
+#define Z_IS_2636U_EQ_2636(...)  \,
+#define Z_IS_2636_EQ_2636U(...)  \,
+#define Z_IS_2636U_EQ_2636U(...) \,
+#define Z_IS_2637_EQ_2637(...)   \,
+#define Z_IS_2637U_EQ_2637(...)  \,
+#define Z_IS_2637_EQ_2637U(...)  \,
+#define Z_IS_2637U_EQ_2637U(...) \,
+#define Z_IS_2638_EQ_2638(...)   \,
+#define Z_IS_2638U_EQ_2638(...)  \,
+#define Z_IS_2638_EQ_2638U(...)  \,
+#define Z_IS_2638U_EQ_2638U(...) \,
+#define Z_IS_2639_EQ_2639(...)   \,
+#define Z_IS_2639U_EQ_2639(...)  \,
+#define Z_IS_2639_EQ_2639U(...)  \,
+#define Z_IS_2639U_EQ_2639U(...) \,
+#define Z_IS_2640_EQ_2640(...)   \,
+#define Z_IS_2640U_EQ_2640(...)  \,
+#define Z_IS_2640_EQ_2640U(...)  \,
+#define Z_IS_2640U_EQ_2640U(...) \,
+#define Z_IS_2641_EQ_2641(...)   \,
+#define Z_IS_2641U_EQ_2641(...)  \,
+#define Z_IS_2641_EQ_2641U(...)  \,
+#define Z_IS_2641U_EQ_2641U(...) \,
+#define Z_IS_2642_EQ_2642(...)   \,
+#define Z_IS_2642U_EQ_2642(...)  \,
+#define Z_IS_2642_EQ_2642U(...)  \,
+#define Z_IS_2642U_EQ_2642U(...) \,
+#define Z_IS_2643_EQ_2643(...)   \,
+#define Z_IS_2643U_EQ_2643(...)  \,
+#define Z_IS_2643_EQ_2643U(...)  \,
+#define Z_IS_2643U_EQ_2643U(...) \,
+#define Z_IS_2644_EQ_2644(...)   \,
+#define Z_IS_2644U_EQ_2644(...)  \,
+#define Z_IS_2644_EQ_2644U(...)  \,
+#define Z_IS_2644U_EQ_2644U(...) \,
+#define Z_IS_2645_EQ_2645(...)   \,
+#define Z_IS_2645U_EQ_2645(...)  \,
+#define Z_IS_2645_EQ_2645U(...)  \,
+#define Z_IS_2645U_EQ_2645U(...) \,
+#define Z_IS_2646_EQ_2646(...)   \,
+#define Z_IS_2646U_EQ_2646(...)  \,
+#define Z_IS_2646_EQ_2646U(...)  \,
+#define Z_IS_2646U_EQ_2646U(...) \,
+#define Z_IS_2647_EQ_2647(...)   \,
+#define Z_IS_2647U_EQ_2647(...)  \,
+#define Z_IS_2647_EQ_2647U(...)  \,
+#define Z_IS_2647U_EQ_2647U(...) \,
+#define Z_IS_2648_EQ_2648(...)   \,
+#define Z_IS_2648U_EQ_2648(...)  \,
+#define Z_IS_2648_EQ_2648U(...)  \,
+#define Z_IS_2648U_EQ_2648U(...) \,
+#define Z_IS_2649_EQ_2649(...)   \,
+#define Z_IS_2649U_EQ_2649(...)  \,
+#define Z_IS_2649_EQ_2649U(...)  \,
+#define Z_IS_2649U_EQ_2649U(...) \,
+#define Z_IS_2650_EQ_2650(...)   \,
+#define Z_IS_2650U_EQ_2650(...)  \,
+#define Z_IS_2650_EQ_2650U(...)  \,
+#define Z_IS_2650U_EQ_2650U(...) \,
+#define Z_IS_2651_EQ_2651(...)   \,
+#define Z_IS_2651U_EQ_2651(...)  \,
+#define Z_IS_2651_EQ_2651U(...)  \,
+#define Z_IS_2651U_EQ_2651U(...) \,
+#define Z_IS_2652_EQ_2652(...)   \,
+#define Z_IS_2652U_EQ_2652(...)  \,
+#define Z_IS_2652_EQ_2652U(...)  \,
+#define Z_IS_2652U_EQ_2652U(...) \,
+#define Z_IS_2653_EQ_2653(...)   \,
+#define Z_IS_2653U_EQ_2653(...)  \,
+#define Z_IS_2653_EQ_2653U(...)  \,
+#define Z_IS_2653U_EQ_2653U(...) \,
+#define Z_IS_2654_EQ_2654(...)   \,
+#define Z_IS_2654U_EQ_2654(...)  \,
+#define Z_IS_2654_EQ_2654U(...)  \,
+#define Z_IS_2654U_EQ_2654U(...) \,
+#define Z_IS_2655_EQ_2655(...)   \,
+#define Z_IS_2655U_EQ_2655(...)  \,
+#define Z_IS_2655_EQ_2655U(...)  \,
+#define Z_IS_2655U_EQ_2655U(...) \,
+#define Z_IS_2656_EQ_2656(...)   \,
+#define Z_IS_2656U_EQ_2656(...)  \,
+#define Z_IS_2656_EQ_2656U(...)  \,
+#define Z_IS_2656U_EQ_2656U(...) \,
+#define Z_IS_2657_EQ_2657(...)   \,
+#define Z_IS_2657U_EQ_2657(...)  \,
+#define Z_IS_2657_EQ_2657U(...)  \,
+#define Z_IS_2657U_EQ_2657U(...) \,
+#define Z_IS_2658_EQ_2658(...)   \,
+#define Z_IS_2658U_EQ_2658(...)  \,
+#define Z_IS_2658_EQ_2658U(...)  \,
+#define Z_IS_2658U_EQ_2658U(...) \,
+#define Z_IS_2659_EQ_2659(...)   \,
+#define Z_IS_2659U_EQ_2659(...)  \,
+#define Z_IS_2659_EQ_2659U(...)  \,
+#define Z_IS_2659U_EQ_2659U(...) \,
+#define Z_IS_2660_EQ_2660(...)   \,
+#define Z_IS_2660U_EQ_2660(...)  \,
+#define Z_IS_2660_EQ_2660U(...)  \,
+#define Z_IS_2660U_EQ_2660U(...) \,
+#define Z_IS_2661_EQ_2661(...)   \,
+#define Z_IS_2661U_EQ_2661(...)  \,
+#define Z_IS_2661_EQ_2661U(...)  \,
+#define Z_IS_2661U_EQ_2661U(...) \,
+#define Z_IS_2662_EQ_2662(...)   \,
+#define Z_IS_2662U_EQ_2662(...)  \,
+#define Z_IS_2662_EQ_2662U(...)  \,
+#define Z_IS_2662U_EQ_2662U(...) \,
+#define Z_IS_2663_EQ_2663(...)   \,
+#define Z_IS_2663U_EQ_2663(...)  \,
+#define Z_IS_2663_EQ_2663U(...)  \,
+#define Z_IS_2663U_EQ_2663U(...) \,
+#define Z_IS_2664_EQ_2664(...)   \,
+#define Z_IS_2664U_EQ_2664(...)  \,
+#define Z_IS_2664_EQ_2664U(...)  \,
+#define Z_IS_2664U_EQ_2664U(...) \,
+#define Z_IS_2665_EQ_2665(...)   \,
+#define Z_IS_2665U_EQ_2665(...)  \,
+#define Z_IS_2665_EQ_2665U(...)  \,
+#define Z_IS_2665U_EQ_2665U(...) \,
+#define Z_IS_2666_EQ_2666(...)   \,
+#define Z_IS_2666U_EQ_2666(...)  \,
+#define Z_IS_2666_EQ_2666U(...)  \,
+#define Z_IS_2666U_EQ_2666U(...) \,
+#define Z_IS_2667_EQ_2667(...)   \,
+#define Z_IS_2667U_EQ_2667(...)  \,
+#define Z_IS_2667_EQ_2667U(...)  \,
+#define Z_IS_2667U_EQ_2667U(...) \,
+#define Z_IS_2668_EQ_2668(...)   \,
+#define Z_IS_2668U_EQ_2668(...)  \,
+#define Z_IS_2668_EQ_2668U(...)  \,
+#define Z_IS_2668U_EQ_2668U(...) \,
+#define Z_IS_2669_EQ_2669(...)   \,
+#define Z_IS_2669U_EQ_2669(...)  \,
+#define Z_IS_2669_EQ_2669U(...)  \,
+#define Z_IS_2669U_EQ_2669U(...) \,
+#define Z_IS_2670_EQ_2670(...)   \,
+#define Z_IS_2670U_EQ_2670(...)  \,
+#define Z_IS_2670_EQ_2670U(...)  \,
+#define Z_IS_2670U_EQ_2670U(...) \,
+#define Z_IS_2671_EQ_2671(...)   \,
+#define Z_IS_2671U_EQ_2671(...)  \,
+#define Z_IS_2671_EQ_2671U(...)  \,
+#define Z_IS_2671U_EQ_2671U(...) \,
+#define Z_IS_2672_EQ_2672(...)   \,
+#define Z_IS_2672U_EQ_2672(...)  \,
+#define Z_IS_2672_EQ_2672U(...)  \,
+#define Z_IS_2672U_EQ_2672U(...) \,
+#define Z_IS_2673_EQ_2673(...)   \,
+#define Z_IS_2673U_EQ_2673(...)  \,
+#define Z_IS_2673_EQ_2673U(...)  \,
+#define Z_IS_2673U_EQ_2673U(...) \,
+#define Z_IS_2674_EQ_2674(...)   \,
+#define Z_IS_2674U_EQ_2674(...)  \,
+#define Z_IS_2674_EQ_2674U(...)  \,
+#define Z_IS_2674U_EQ_2674U(...) \,
+#define Z_IS_2675_EQ_2675(...)   \,
+#define Z_IS_2675U_EQ_2675(...)  \,
+#define Z_IS_2675_EQ_2675U(...)  \,
+#define Z_IS_2675U_EQ_2675U(...) \,
+#define Z_IS_2676_EQ_2676(...)   \,
+#define Z_IS_2676U_EQ_2676(...)  \,
+#define Z_IS_2676_EQ_2676U(...)  \,
+#define Z_IS_2676U_EQ_2676U(...) \,
+#define Z_IS_2677_EQ_2677(...)   \,
+#define Z_IS_2677U_EQ_2677(...)  \,
+#define Z_IS_2677_EQ_2677U(...)  \,
+#define Z_IS_2677U_EQ_2677U(...) \,
+#define Z_IS_2678_EQ_2678(...)   \,
+#define Z_IS_2678U_EQ_2678(...)  \,
+#define Z_IS_2678_EQ_2678U(...)  \,
+#define Z_IS_2678U_EQ_2678U(...) \,
+#define Z_IS_2679_EQ_2679(...)   \,
+#define Z_IS_2679U_EQ_2679(...)  \,
+#define Z_IS_2679_EQ_2679U(...)  \,
+#define Z_IS_2679U_EQ_2679U(...) \,
+#define Z_IS_2680_EQ_2680(...)   \,
+#define Z_IS_2680U_EQ_2680(...)  \,
+#define Z_IS_2680_EQ_2680U(...)  \,
+#define Z_IS_2680U_EQ_2680U(...) \,
+#define Z_IS_2681_EQ_2681(...)   \,
+#define Z_IS_2681U_EQ_2681(...)  \,
+#define Z_IS_2681_EQ_2681U(...)  \,
+#define Z_IS_2681U_EQ_2681U(...) \,
+#define Z_IS_2682_EQ_2682(...)   \,
+#define Z_IS_2682U_EQ_2682(...)  \,
+#define Z_IS_2682_EQ_2682U(...)  \,
+#define Z_IS_2682U_EQ_2682U(...) \,
+#define Z_IS_2683_EQ_2683(...)   \,
+#define Z_IS_2683U_EQ_2683(...)  \,
+#define Z_IS_2683_EQ_2683U(...)  \,
+#define Z_IS_2683U_EQ_2683U(...) \,
+#define Z_IS_2684_EQ_2684(...)   \,
+#define Z_IS_2684U_EQ_2684(...)  \,
+#define Z_IS_2684_EQ_2684U(...)  \,
+#define Z_IS_2684U_EQ_2684U(...) \,
+#define Z_IS_2685_EQ_2685(...)   \,
+#define Z_IS_2685U_EQ_2685(...)  \,
+#define Z_IS_2685_EQ_2685U(...)  \,
+#define Z_IS_2685U_EQ_2685U(...) \,
+#define Z_IS_2686_EQ_2686(...)   \,
+#define Z_IS_2686U_EQ_2686(...)  \,
+#define Z_IS_2686_EQ_2686U(...)  \,
+#define Z_IS_2686U_EQ_2686U(...) \,
+#define Z_IS_2687_EQ_2687(...)   \,
+#define Z_IS_2687U_EQ_2687(...)  \,
+#define Z_IS_2687_EQ_2687U(...)  \,
+#define Z_IS_2687U_EQ_2687U(...) \,
+#define Z_IS_2688_EQ_2688(...)   \,
+#define Z_IS_2688U_EQ_2688(...)  \,
+#define Z_IS_2688_EQ_2688U(...)  \,
+#define Z_IS_2688U_EQ_2688U(...) \,
+#define Z_IS_2689_EQ_2689(...)   \,
+#define Z_IS_2689U_EQ_2689(...)  \,
+#define Z_IS_2689_EQ_2689U(...)  \,
+#define Z_IS_2689U_EQ_2689U(...) \,
+#define Z_IS_2690_EQ_2690(...)   \,
+#define Z_IS_2690U_EQ_2690(...)  \,
+#define Z_IS_2690_EQ_2690U(...)  \,
+#define Z_IS_2690U_EQ_2690U(...) \,
+#define Z_IS_2691_EQ_2691(...)   \,
+#define Z_IS_2691U_EQ_2691(...)  \,
+#define Z_IS_2691_EQ_2691U(...)  \,
+#define Z_IS_2691U_EQ_2691U(...) \,
+#define Z_IS_2692_EQ_2692(...)   \,
+#define Z_IS_2692U_EQ_2692(...)  \,
+#define Z_IS_2692_EQ_2692U(...)  \,
+#define Z_IS_2692U_EQ_2692U(...) \,
+#define Z_IS_2693_EQ_2693(...)   \,
+#define Z_IS_2693U_EQ_2693(...)  \,
+#define Z_IS_2693_EQ_2693U(...)  \,
+#define Z_IS_2693U_EQ_2693U(...) \,
+#define Z_IS_2694_EQ_2694(...)   \,
+#define Z_IS_2694U_EQ_2694(...)  \,
+#define Z_IS_2694_EQ_2694U(...)  \,
+#define Z_IS_2694U_EQ_2694U(...) \,
+#define Z_IS_2695_EQ_2695(...)   \,
+#define Z_IS_2695U_EQ_2695(...)  \,
+#define Z_IS_2695_EQ_2695U(...)  \,
+#define Z_IS_2695U_EQ_2695U(...) \,
+#define Z_IS_2696_EQ_2696(...)   \,
+#define Z_IS_2696U_EQ_2696(...)  \,
+#define Z_IS_2696_EQ_2696U(...)  \,
+#define Z_IS_2696U_EQ_2696U(...) \,
+#define Z_IS_2697_EQ_2697(...)   \,
+#define Z_IS_2697U_EQ_2697(...)  \,
+#define Z_IS_2697_EQ_2697U(...)  \,
+#define Z_IS_2697U_EQ_2697U(...) \,
+#define Z_IS_2698_EQ_2698(...)   \,
+#define Z_IS_2698U_EQ_2698(...)  \,
+#define Z_IS_2698_EQ_2698U(...)  \,
+#define Z_IS_2698U_EQ_2698U(...) \,
+#define Z_IS_2699_EQ_2699(...)   \,
+#define Z_IS_2699U_EQ_2699(...)  \,
+#define Z_IS_2699_EQ_2699U(...)  \,
+#define Z_IS_2699U_EQ_2699U(...) \,
+#define Z_IS_2700_EQ_2700(...)   \,
+#define Z_IS_2700U_EQ_2700(...)  \,
+#define Z_IS_2700_EQ_2700U(...)  \,
+#define Z_IS_2700U_EQ_2700U(...) \,
+#define Z_IS_2701_EQ_2701(...)   \,
+#define Z_IS_2701U_EQ_2701(...)  \,
+#define Z_IS_2701_EQ_2701U(...)  \,
+#define Z_IS_2701U_EQ_2701U(...) \,
+#define Z_IS_2702_EQ_2702(...)   \,
+#define Z_IS_2702U_EQ_2702(...)  \,
+#define Z_IS_2702_EQ_2702U(...)  \,
+#define Z_IS_2702U_EQ_2702U(...) \,
+#define Z_IS_2703_EQ_2703(...)   \,
+#define Z_IS_2703U_EQ_2703(...)  \,
+#define Z_IS_2703_EQ_2703U(...)  \,
+#define Z_IS_2703U_EQ_2703U(...) \,
+#define Z_IS_2704_EQ_2704(...)   \,
+#define Z_IS_2704U_EQ_2704(...)  \,
+#define Z_IS_2704_EQ_2704U(...)  \,
+#define Z_IS_2704U_EQ_2704U(...) \,
+#define Z_IS_2705_EQ_2705(...)   \,
+#define Z_IS_2705U_EQ_2705(...)  \,
+#define Z_IS_2705_EQ_2705U(...)  \,
+#define Z_IS_2705U_EQ_2705U(...) \,
+#define Z_IS_2706_EQ_2706(...)   \,
+#define Z_IS_2706U_EQ_2706(...)  \,
+#define Z_IS_2706_EQ_2706U(...)  \,
+#define Z_IS_2706U_EQ_2706U(...) \,
+#define Z_IS_2707_EQ_2707(...)   \,
+#define Z_IS_2707U_EQ_2707(...)  \,
+#define Z_IS_2707_EQ_2707U(...)  \,
+#define Z_IS_2707U_EQ_2707U(...) \,
+#define Z_IS_2708_EQ_2708(...)   \,
+#define Z_IS_2708U_EQ_2708(...)  \,
+#define Z_IS_2708_EQ_2708U(...)  \,
+#define Z_IS_2708U_EQ_2708U(...) \,
+#define Z_IS_2709_EQ_2709(...)   \,
+#define Z_IS_2709U_EQ_2709(...)  \,
+#define Z_IS_2709_EQ_2709U(...)  \,
+#define Z_IS_2709U_EQ_2709U(...) \,
+#define Z_IS_2710_EQ_2710(...)   \,
+#define Z_IS_2710U_EQ_2710(...)  \,
+#define Z_IS_2710_EQ_2710U(...)  \,
+#define Z_IS_2710U_EQ_2710U(...) \,
+#define Z_IS_2711_EQ_2711(...)   \,
+#define Z_IS_2711U_EQ_2711(...)  \,
+#define Z_IS_2711_EQ_2711U(...)  \,
+#define Z_IS_2711U_EQ_2711U(...) \,
+#define Z_IS_2712_EQ_2712(...)   \,
+#define Z_IS_2712U_EQ_2712(...)  \,
+#define Z_IS_2712_EQ_2712U(...)  \,
+#define Z_IS_2712U_EQ_2712U(...) \,
+#define Z_IS_2713_EQ_2713(...)   \,
+#define Z_IS_2713U_EQ_2713(...)  \,
+#define Z_IS_2713_EQ_2713U(...)  \,
+#define Z_IS_2713U_EQ_2713U(...) \,
+#define Z_IS_2714_EQ_2714(...)   \,
+#define Z_IS_2714U_EQ_2714(...)  \,
+#define Z_IS_2714_EQ_2714U(...)  \,
+#define Z_IS_2714U_EQ_2714U(...) \,
+#define Z_IS_2715_EQ_2715(...)   \,
+#define Z_IS_2715U_EQ_2715(...)  \,
+#define Z_IS_2715_EQ_2715U(...)  \,
+#define Z_IS_2715U_EQ_2715U(...) \,
+#define Z_IS_2716_EQ_2716(...)   \,
+#define Z_IS_2716U_EQ_2716(...)  \,
+#define Z_IS_2716_EQ_2716U(...)  \,
+#define Z_IS_2716U_EQ_2716U(...) \,
+#define Z_IS_2717_EQ_2717(...)   \,
+#define Z_IS_2717U_EQ_2717(...)  \,
+#define Z_IS_2717_EQ_2717U(...)  \,
+#define Z_IS_2717U_EQ_2717U(...) \,
+#define Z_IS_2718_EQ_2718(...)   \,
+#define Z_IS_2718U_EQ_2718(...)  \,
+#define Z_IS_2718_EQ_2718U(...)  \,
+#define Z_IS_2718U_EQ_2718U(...) \,
+#define Z_IS_2719_EQ_2719(...)   \,
+#define Z_IS_2719U_EQ_2719(...)  \,
+#define Z_IS_2719_EQ_2719U(...)  \,
+#define Z_IS_2719U_EQ_2719U(...) \,
+#define Z_IS_2720_EQ_2720(...)   \,
+#define Z_IS_2720U_EQ_2720(...)  \,
+#define Z_IS_2720_EQ_2720U(...)  \,
+#define Z_IS_2720U_EQ_2720U(...) \,
+#define Z_IS_2721_EQ_2721(...)   \,
+#define Z_IS_2721U_EQ_2721(...)  \,
+#define Z_IS_2721_EQ_2721U(...)  \,
+#define Z_IS_2721U_EQ_2721U(...) \,
+#define Z_IS_2722_EQ_2722(...)   \,
+#define Z_IS_2722U_EQ_2722(...)  \,
+#define Z_IS_2722_EQ_2722U(...)  \,
+#define Z_IS_2722U_EQ_2722U(...) \,
+#define Z_IS_2723_EQ_2723(...)   \,
+#define Z_IS_2723U_EQ_2723(...)  \,
+#define Z_IS_2723_EQ_2723U(...)  \,
+#define Z_IS_2723U_EQ_2723U(...) \,
+#define Z_IS_2724_EQ_2724(...)   \,
+#define Z_IS_2724U_EQ_2724(...)  \,
+#define Z_IS_2724_EQ_2724U(...)  \,
+#define Z_IS_2724U_EQ_2724U(...) \,
+#define Z_IS_2725_EQ_2725(...)   \,
+#define Z_IS_2725U_EQ_2725(...)  \,
+#define Z_IS_2725_EQ_2725U(...)  \,
+#define Z_IS_2725U_EQ_2725U(...) \,
+#define Z_IS_2726_EQ_2726(...)   \,
+#define Z_IS_2726U_EQ_2726(...)  \,
+#define Z_IS_2726_EQ_2726U(...)  \,
+#define Z_IS_2726U_EQ_2726U(...) \,
+#define Z_IS_2727_EQ_2727(...)   \,
+#define Z_IS_2727U_EQ_2727(...)  \,
+#define Z_IS_2727_EQ_2727U(...)  \,
+#define Z_IS_2727U_EQ_2727U(...) \,
+#define Z_IS_2728_EQ_2728(...)   \,
+#define Z_IS_2728U_EQ_2728(...)  \,
+#define Z_IS_2728_EQ_2728U(...)  \,
+#define Z_IS_2728U_EQ_2728U(...) \,
+#define Z_IS_2729_EQ_2729(...)   \,
+#define Z_IS_2729U_EQ_2729(...)  \,
+#define Z_IS_2729_EQ_2729U(...)  \,
+#define Z_IS_2729U_EQ_2729U(...) \,
+#define Z_IS_2730_EQ_2730(...)   \,
+#define Z_IS_2730U_EQ_2730(...)  \,
+#define Z_IS_2730_EQ_2730U(...)  \,
+#define Z_IS_2730U_EQ_2730U(...) \,
+#define Z_IS_2731_EQ_2731(...)   \,
+#define Z_IS_2731U_EQ_2731(...)  \,
+#define Z_IS_2731_EQ_2731U(...)  \,
+#define Z_IS_2731U_EQ_2731U(...) \,
+#define Z_IS_2732_EQ_2732(...)   \,
+#define Z_IS_2732U_EQ_2732(...)  \,
+#define Z_IS_2732_EQ_2732U(...)  \,
+#define Z_IS_2732U_EQ_2732U(...) \,
+#define Z_IS_2733_EQ_2733(...)   \,
+#define Z_IS_2733U_EQ_2733(...)  \,
+#define Z_IS_2733_EQ_2733U(...)  \,
+#define Z_IS_2733U_EQ_2733U(...) \,
+#define Z_IS_2734_EQ_2734(...)   \,
+#define Z_IS_2734U_EQ_2734(...)  \,
+#define Z_IS_2734_EQ_2734U(...)  \,
+#define Z_IS_2734U_EQ_2734U(...) \,
+#define Z_IS_2735_EQ_2735(...)   \,
+#define Z_IS_2735U_EQ_2735(...)  \,
+#define Z_IS_2735_EQ_2735U(...)  \,
+#define Z_IS_2735U_EQ_2735U(...) \,
+#define Z_IS_2736_EQ_2736(...)   \,
+#define Z_IS_2736U_EQ_2736(...)  \,
+#define Z_IS_2736_EQ_2736U(...)  \,
+#define Z_IS_2736U_EQ_2736U(...) \,
+#define Z_IS_2737_EQ_2737(...)   \,
+#define Z_IS_2737U_EQ_2737(...)  \,
+#define Z_IS_2737_EQ_2737U(...)  \,
+#define Z_IS_2737U_EQ_2737U(...) \,
+#define Z_IS_2738_EQ_2738(...)   \,
+#define Z_IS_2738U_EQ_2738(...)  \,
+#define Z_IS_2738_EQ_2738U(...)  \,
+#define Z_IS_2738U_EQ_2738U(...) \,
+#define Z_IS_2739_EQ_2739(...)   \,
+#define Z_IS_2739U_EQ_2739(...)  \,
+#define Z_IS_2739_EQ_2739U(...)  \,
+#define Z_IS_2739U_EQ_2739U(...) \,
+#define Z_IS_2740_EQ_2740(...)   \,
+#define Z_IS_2740U_EQ_2740(...)  \,
+#define Z_IS_2740_EQ_2740U(...)  \,
+#define Z_IS_2740U_EQ_2740U(...) \,
+#define Z_IS_2741_EQ_2741(...)   \,
+#define Z_IS_2741U_EQ_2741(...)  \,
+#define Z_IS_2741_EQ_2741U(...)  \,
+#define Z_IS_2741U_EQ_2741U(...) \,
+#define Z_IS_2742_EQ_2742(...)   \,
+#define Z_IS_2742U_EQ_2742(...)  \,
+#define Z_IS_2742_EQ_2742U(...)  \,
+#define Z_IS_2742U_EQ_2742U(...) \,
+#define Z_IS_2743_EQ_2743(...)   \,
+#define Z_IS_2743U_EQ_2743(...)  \,
+#define Z_IS_2743_EQ_2743U(...)  \,
+#define Z_IS_2743U_EQ_2743U(...) \,
+#define Z_IS_2744_EQ_2744(...)   \,
+#define Z_IS_2744U_EQ_2744(...)  \,
+#define Z_IS_2744_EQ_2744U(...)  \,
+#define Z_IS_2744U_EQ_2744U(...) \,
+#define Z_IS_2745_EQ_2745(...)   \,
+#define Z_IS_2745U_EQ_2745(...)  \,
+#define Z_IS_2745_EQ_2745U(...)  \,
+#define Z_IS_2745U_EQ_2745U(...) \,
+#define Z_IS_2746_EQ_2746(...)   \,
+#define Z_IS_2746U_EQ_2746(...)  \,
+#define Z_IS_2746_EQ_2746U(...)  \,
+#define Z_IS_2746U_EQ_2746U(...) \,
+#define Z_IS_2747_EQ_2747(...)   \,
+#define Z_IS_2747U_EQ_2747(...)  \,
+#define Z_IS_2747_EQ_2747U(...)  \,
+#define Z_IS_2747U_EQ_2747U(...) \,
+#define Z_IS_2748_EQ_2748(...)   \,
+#define Z_IS_2748U_EQ_2748(...)  \,
+#define Z_IS_2748_EQ_2748U(...)  \,
+#define Z_IS_2748U_EQ_2748U(...) \,
+#define Z_IS_2749_EQ_2749(...)   \,
+#define Z_IS_2749U_EQ_2749(...)  \,
+#define Z_IS_2749_EQ_2749U(...)  \,
+#define Z_IS_2749U_EQ_2749U(...) \,
+#define Z_IS_2750_EQ_2750(...)   \,
+#define Z_IS_2750U_EQ_2750(...)  \,
+#define Z_IS_2750_EQ_2750U(...)  \,
+#define Z_IS_2750U_EQ_2750U(...) \,
+#define Z_IS_2751_EQ_2751(...)   \,
+#define Z_IS_2751U_EQ_2751(...)  \,
+#define Z_IS_2751_EQ_2751U(...)  \,
+#define Z_IS_2751U_EQ_2751U(...) \,
+#define Z_IS_2752_EQ_2752(...)   \,
+#define Z_IS_2752U_EQ_2752(...)  \,
+#define Z_IS_2752_EQ_2752U(...)  \,
+#define Z_IS_2752U_EQ_2752U(...) \,
+#define Z_IS_2753_EQ_2753(...)   \,
+#define Z_IS_2753U_EQ_2753(...)  \,
+#define Z_IS_2753_EQ_2753U(...)  \,
+#define Z_IS_2753U_EQ_2753U(...) \,
+#define Z_IS_2754_EQ_2754(...)   \,
+#define Z_IS_2754U_EQ_2754(...)  \,
+#define Z_IS_2754_EQ_2754U(...)  \,
+#define Z_IS_2754U_EQ_2754U(...) \,
+#define Z_IS_2755_EQ_2755(...)   \,
+#define Z_IS_2755U_EQ_2755(...)  \,
+#define Z_IS_2755_EQ_2755U(...)  \,
+#define Z_IS_2755U_EQ_2755U(...) \,
+#define Z_IS_2756_EQ_2756(...)   \,
+#define Z_IS_2756U_EQ_2756(...)  \,
+#define Z_IS_2756_EQ_2756U(...)  \,
+#define Z_IS_2756U_EQ_2756U(...) \,
+#define Z_IS_2757_EQ_2757(...)   \,
+#define Z_IS_2757U_EQ_2757(...)  \,
+#define Z_IS_2757_EQ_2757U(...)  \,
+#define Z_IS_2757U_EQ_2757U(...) \,
+#define Z_IS_2758_EQ_2758(...)   \,
+#define Z_IS_2758U_EQ_2758(...)  \,
+#define Z_IS_2758_EQ_2758U(...)  \,
+#define Z_IS_2758U_EQ_2758U(...) \,
+#define Z_IS_2759_EQ_2759(...)   \,
+#define Z_IS_2759U_EQ_2759(...)  \,
+#define Z_IS_2759_EQ_2759U(...)  \,
+#define Z_IS_2759U_EQ_2759U(...) \,
+#define Z_IS_2760_EQ_2760(...)   \,
+#define Z_IS_2760U_EQ_2760(...)  \,
+#define Z_IS_2760_EQ_2760U(...)  \,
+#define Z_IS_2760U_EQ_2760U(...) \,
+#define Z_IS_2761_EQ_2761(...)   \,
+#define Z_IS_2761U_EQ_2761(...)  \,
+#define Z_IS_2761_EQ_2761U(...)  \,
+#define Z_IS_2761U_EQ_2761U(...) \,
+#define Z_IS_2762_EQ_2762(...)   \,
+#define Z_IS_2762U_EQ_2762(...)  \,
+#define Z_IS_2762_EQ_2762U(...)  \,
+#define Z_IS_2762U_EQ_2762U(...) \,
+#define Z_IS_2763_EQ_2763(...)   \,
+#define Z_IS_2763U_EQ_2763(...)  \,
+#define Z_IS_2763_EQ_2763U(...)  \,
+#define Z_IS_2763U_EQ_2763U(...) \,
+#define Z_IS_2764_EQ_2764(...)   \,
+#define Z_IS_2764U_EQ_2764(...)  \,
+#define Z_IS_2764_EQ_2764U(...)  \,
+#define Z_IS_2764U_EQ_2764U(...) \,
+#define Z_IS_2765_EQ_2765(...)   \,
+#define Z_IS_2765U_EQ_2765(...)  \,
+#define Z_IS_2765_EQ_2765U(...)  \,
+#define Z_IS_2765U_EQ_2765U(...) \,
+#define Z_IS_2766_EQ_2766(...)   \,
+#define Z_IS_2766U_EQ_2766(...)  \,
+#define Z_IS_2766_EQ_2766U(...)  \,
+#define Z_IS_2766U_EQ_2766U(...) \,
+#define Z_IS_2767_EQ_2767(...)   \,
+#define Z_IS_2767U_EQ_2767(...)  \,
+#define Z_IS_2767_EQ_2767U(...)  \,
+#define Z_IS_2767U_EQ_2767U(...) \,
+#define Z_IS_2768_EQ_2768(...)   \,
+#define Z_IS_2768U_EQ_2768(...)  \,
+#define Z_IS_2768_EQ_2768U(...)  \,
+#define Z_IS_2768U_EQ_2768U(...) \,
+#define Z_IS_2769_EQ_2769(...)   \,
+#define Z_IS_2769U_EQ_2769(...)  \,
+#define Z_IS_2769_EQ_2769U(...)  \,
+#define Z_IS_2769U_EQ_2769U(...) \,
+#define Z_IS_2770_EQ_2770(...)   \,
+#define Z_IS_2770U_EQ_2770(...)  \,
+#define Z_IS_2770_EQ_2770U(...)  \,
+#define Z_IS_2770U_EQ_2770U(...) \,
+#define Z_IS_2771_EQ_2771(...)   \,
+#define Z_IS_2771U_EQ_2771(...)  \,
+#define Z_IS_2771_EQ_2771U(...)  \,
+#define Z_IS_2771U_EQ_2771U(...) \,
+#define Z_IS_2772_EQ_2772(...)   \,
+#define Z_IS_2772U_EQ_2772(...)  \,
+#define Z_IS_2772_EQ_2772U(...)  \,
+#define Z_IS_2772U_EQ_2772U(...) \,
+#define Z_IS_2773_EQ_2773(...)   \,
+#define Z_IS_2773U_EQ_2773(...)  \,
+#define Z_IS_2773_EQ_2773U(...)  \,
+#define Z_IS_2773U_EQ_2773U(...) \,
+#define Z_IS_2774_EQ_2774(...)   \,
+#define Z_IS_2774U_EQ_2774(...)  \,
+#define Z_IS_2774_EQ_2774U(...)  \,
+#define Z_IS_2774U_EQ_2774U(...) \,
+#define Z_IS_2775_EQ_2775(...)   \,
+#define Z_IS_2775U_EQ_2775(...)  \,
+#define Z_IS_2775_EQ_2775U(...)  \,
+#define Z_IS_2775U_EQ_2775U(...) \,
+#define Z_IS_2776_EQ_2776(...)   \,
+#define Z_IS_2776U_EQ_2776(...)  \,
+#define Z_IS_2776_EQ_2776U(...)  \,
+#define Z_IS_2776U_EQ_2776U(...) \,
+#define Z_IS_2777_EQ_2777(...)   \,
+#define Z_IS_2777U_EQ_2777(...)  \,
+#define Z_IS_2777_EQ_2777U(...)  \,
+#define Z_IS_2777U_EQ_2777U(...) \,
+#define Z_IS_2778_EQ_2778(...)   \,
+#define Z_IS_2778U_EQ_2778(...)  \,
+#define Z_IS_2778_EQ_2778U(...)  \,
+#define Z_IS_2778U_EQ_2778U(...) \,
+#define Z_IS_2779_EQ_2779(...)   \,
+#define Z_IS_2779U_EQ_2779(...)  \,
+#define Z_IS_2779_EQ_2779U(...)  \,
+#define Z_IS_2779U_EQ_2779U(...) \,
+#define Z_IS_2780_EQ_2780(...)   \,
+#define Z_IS_2780U_EQ_2780(...)  \,
+#define Z_IS_2780_EQ_2780U(...)  \,
+#define Z_IS_2780U_EQ_2780U(...) \,
+#define Z_IS_2781_EQ_2781(...)   \,
+#define Z_IS_2781U_EQ_2781(...)  \,
+#define Z_IS_2781_EQ_2781U(...)  \,
+#define Z_IS_2781U_EQ_2781U(...) \,
+#define Z_IS_2782_EQ_2782(...)   \,
+#define Z_IS_2782U_EQ_2782(...)  \,
+#define Z_IS_2782_EQ_2782U(...)  \,
+#define Z_IS_2782U_EQ_2782U(...) \,
+#define Z_IS_2783_EQ_2783(...)   \,
+#define Z_IS_2783U_EQ_2783(...)  \,
+#define Z_IS_2783_EQ_2783U(...)  \,
+#define Z_IS_2783U_EQ_2783U(...) \,
+#define Z_IS_2784_EQ_2784(...)   \,
+#define Z_IS_2784U_EQ_2784(...)  \,
+#define Z_IS_2784_EQ_2784U(...)  \,
+#define Z_IS_2784U_EQ_2784U(...) \,
+#define Z_IS_2785_EQ_2785(...)   \,
+#define Z_IS_2785U_EQ_2785(...)  \,
+#define Z_IS_2785_EQ_2785U(...)  \,
+#define Z_IS_2785U_EQ_2785U(...) \,
+#define Z_IS_2786_EQ_2786(...)   \,
+#define Z_IS_2786U_EQ_2786(...)  \,
+#define Z_IS_2786_EQ_2786U(...)  \,
+#define Z_IS_2786U_EQ_2786U(...) \,
+#define Z_IS_2787_EQ_2787(...)   \,
+#define Z_IS_2787U_EQ_2787(...)  \,
+#define Z_IS_2787_EQ_2787U(...)  \,
+#define Z_IS_2787U_EQ_2787U(...) \,
+#define Z_IS_2788_EQ_2788(...)   \,
+#define Z_IS_2788U_EQ_2788(...)  \,
+#define Z_IS_2788_EQ_2788U(...)  \,
+#define Z_IS_2788U_EQ_2788U(...) \,
+#define Z_IS_2789_EQ_2789(...)   \,
+#define Z_IS_2789U_EQ_2789(...)  \,
+#define Z_IS_2789_EQ_2789U(...)  \,
+#define Z_IS_2789U_EQ_2789U(...) \,
+#define Z_IS_2790_EQ_2790(...)   \,
+#define Z_IS_2790U_EQ_2790(...)  \,
+#define Z_IS_2790_EQ_2790U(...)  \,
+#define Z_IS_2790U_EQ_2790U(...) \,
+#define Z_IS_2791_EQ_2791(...)   \,
+#define Z_IS_2791U_EQ_2791(...)  \,
+#define Z_IS_2791_EQ_2791U(...)  \,
+#define Z_IS_2791U_EQ_2791U(...) \,
+#define Z_IS_2792_EQ_2792(...)   \,
+#define Z_IS_2792U_EQ_2792(...)  \,
+#define Z_IS_2792_EQ_2792U(...)  \,
+#define Z_IS_2792U_EQ_2792U(...) \,
+#define Z_IS_2793_EQ_2793(...)   \,
+#define Z_IS_2793U_EQ_2793(...)  \,
+#define Z_IS_2793_EQ_2793U(...)  \,
+#define Z_IS_2793U_EQ_2793U(...) \,
+#define Z_IS_2794_EQ_2794(...)   \,
+#define Z_IS_2794U_EQ_2794(...)  \,
+#define Z_IS_2794_EQ_2794U(...)  \,
+#define Z_IS_2794U_EQ_2794U(...) \,
+#define Z_IS_2795_EQ_2795(...)   \,
+#define Z_IS_2795U_EQ_2795(...)  \,
+#define Z_IS_2795_EQ_2795U(...)  \,
+#define Z_IS_2795U_EQ_2795U(...) \,
+#define Z_IS_2796_EQ_2796(...)   \,
+#define Z_IS_2796U_EQ_2796(...)  \,
+#define Z_IS_2796_EQ_2796U(...)  \,
+#define Z_IS_2796U_EQ_2796U(...) \,
+#define Z_IS_2797_EQ_2797(...)   \,
+#define Z_IS_2797U_EQ_2797(...)  \,
+#define Z_IS_2797_EQ_2797U(...)  \,
+#define Z_IS_2797U_EQ_2797U(...) \,
+#define Z_IS_2798_EQ_2798(...)   \,
+#define Z_IS_2798U_EQ_2798(...)  \,
+#define Z_IS_2798_EQ_2798U(...)  \,
+#define Z_IS_2798U_EQ_2798U(...) \,
+#define Z_IS_2799_EQ_2799(...)   \,
+#define Z_IS_2799U_EQ_2799(...)  \,
+#define Z_IS_2799_EQ_2799U(...)  \,
+#define Z_IS_2799U_EQ_2799U(...) \,
+#define Z_IS_2800_EQ_2800(...)   \,
+#define Z_IS_2800U_EQ_2800(...)  \,
+#define Z_IS_2800_EQ_2800U(...)  \,
+#define Z_IS_2800U_EQ_2800U(...) \,
+#define Z_IS_2801_EQ_2801(...)   \,
+#define Z_IS_2801U_EQ_2801(...)  \,
+#define Z_IS_2801_EQ_2801U(...)  \,
+#define Z_IS_2801U_EQ_2801U(...) \,
+#define Z_IS_2802_EQ_2802(...)   \,
+#define Z_IS_2802U_EQ_2802(...)  \,
+#define Z_IS_2802_EQ_2802U(...)  \,
+#define Z_IS_2802U_EQ_2802U(...) \,
+#define Z_IS_2803_EQ_2803(...)   \,
+#define Z_IS_2803U_EQ_2803(...)  \,
+#define Z_IS_2803_EQ_2803U(...)  \,
+#define Z_IS_2803U_EQ_2803U(...) \,
+#define Z_IS_2804_EQ_2804(...)   \,
+#define Z_IS_2804U_EQ_2804(...)  \,
+#define Z_IS_2804_EQ_2804U(...)  \,
+#define Z_IS_2804U_EQ_2804U(...) \,
+#define Z_IS_2805_EQ_2805(...)   \,
+#define Z_IS_2805U_EQ_2805(...)  \,
+#define Z_IS_2805_EQ_2805U(...)  \,
+#define Z_IS_2805U_EQ_2805U(...) \,
+#define Z_IS_2806_EQ_2806(...)   \,
+#define Z_IS_2806U_EQ_2806(...)  \,
+#define Z_IS_2806_EQ_2806U(...)  \,
+#define Z_IS_2806U_EQ_2806U(...) \,
+#define Z_IS_2807_EQ_2807(...)   \,
+#define Z_IS_2807U_EQ_2807(...)  \,
+#define Z_IS_2807_EQ_2807U(...)  \,
+#define Z_IS_2807U_EQ_2807U(...) \,
+#define Z_IS_2808_EQ_2808(...)   \,
+#define Z_IS_2808U_EQ_2808(...)  \,
+#define Z_IS_2808_EQ_2808U(...)  \,
+#define Z_IS_2808U_EQ_2808U(...) \,
+#define Z_IS_2809_EQ_2809(...)   \,
+#define Z_IS_2809U_EQ_2809(...)  \,
+#define Z_IS_2809_EQ_2809U(...)  \,
+#define Z_IS_2809U_EQ_2809U(...) \,
+#define Z_IS_2810_EQ_2810(...)   \,
+#define Z_IS_2810U_EQ_2810(...)  \,
+#define Z_IS_2810_EQ_2810U(...)  \,
+#define Z_IS_2810U_EQ_2810U(...) \,
+#define Z_IS_2811_EQ_2811(...)   \,
+#define Z_IS_2811U_EQ_2811(...)  \,
+#define Z_IS_2811_EQ_2811U(...)  \,
+#define Z_IS_2811U_EQ_2811U(...) \,
+#define Z_IS_2812_EQ_2812(...)   \,
+#define Z_IS_2812U_EQ_2812(...)  \,
+#define Z_IS_2812_EQ_2812U(...)  \,
+#define Z_IS_2812U_EQ_2812U(...) \,
+#define Z_IS_2813_EQ_2813(...)   \,
+#define Z_IS_2813U_EQ_2813(...)  \,
+#define Z_IS_2813_EQ_2813U(...)  \,
+#define Z_IS_2813U_EQ_2813U(...) \,
+#define Z_IS_2814_EQ_2814(...)   \,
+#define Z_IS_2814U_EQ_2814(...)  \,
+#define Z_IS_2814_EQ_2814U(...)  \,
+#define Z_IS_2814U_EQ_2814U(...) \,
+#define Z_IS_2815_EQ_2815(...)   \,
+#define Z_IS_2815U_EQ_2815(...)  \,
+#define Z_IS_2815_EQ_2815U(...)  \,
+#define Z_IS_2815U_EQ_2815U(...) \,
+#define Z_IS_2816_EQ_2816(...)   \,
+#define Z_IS_2816U_EQ_2816(...)  \,
+#define Z_IS_2816_EQ_2816U(...)  \,
+#define Z_IS_2816U_EQ_2816U(...) \,
+#define Z_IS_2817_EQ_2817(...)   \,
+#define Z_IS_2817U_EQ_2817(...)  \,
+#define Z_IS_2817_EQ_2817U(...)  \,
+#define Z_IS_2817U_EQ_2817U(...) \,
+#define Z_IS_2818_EQ_2818(...)   \,
+#define Z_IS_2818U_EQ_2818(...)  \,
+#define Z_IS_2818_EQ_2818U(...)  \,
+#define Z_IS_2818U_EQ_2818U(...) \,
+#define Z_IS_2819_EQ_2819(...)   \,
+#define Z_IS_2819U_EQ_2819(...)  \,
+#define Z_IS_2819_EQ_2819U(...)  \,
+#define Z_IS_2819U_EQ_2819U(...) \,
+#define Z_IS_2820_EQ_2820(...)   \,
+#define Z_IS_2820U_EQ_2820(...)  \,
+#define Z_IS_2820_EQ_2820U(...)  \,
+#define Z_IS_2820U_EQ_2820U(...) \,
+#define Z_IS_2821_EQ_2821(...)   \,
+#define Z_IS_2821U_EQ_2821(...)  \,
+#define Z_IS_2821_EQ_2821U(...)  \,
+#define Z_IS_2821U_EQ_2821U(...) \,
+#define Z_IS_2822_EQ_2822(...)   \,
+#define Z_IS_2822U_EQ_2822(...)  \,
+#define Z_IS_2822_EQ_2822U(...)  \,
+#define Z_IS_2822U_EQ_2822U(...) \,
+#define Z_IS_2823_EQ_2823(...)   \,
+#define Z_IS_2823U_EQ_2823(...)  \,
+#define Z_IS_2823_EQ_2823U(...)  \,
+#define Z_IS_2823U_EQ_2823U(...) \,
+#define Z_IS_2824_EQ_2824(...)   \,
+#define Z_IS_2824U_EQ_2824(...)  \,
+#define Z_IS_2824_EQ_2824U(...)  \,
+#define Z_IS_2824U_EQ_2824U(...) \,
+#define Z_IS_2825_EQ_2825(...)   \,
+#define Z_IS_2825U_EQ_2825(...)  \,
+#define Z_IS_2825_EQ_2825U(...)  \,
+#define Z_IS_2825U_EQ_2825U(...) \,
+#define Z_IS_2826_EQ_2826(...)   \,
+#define Z_IS_2826U_EQ_2826(...)  \,
+#define Z_IS_2826_EQ_2826U(...)  \,
+#define Z_IS_2826U_EQ_2826U(...) \,
+#define Z_IS_2827_EQ_2827(...)   \,
+#define Z_IS_2827U_EQ_2827(...)  \,
+#define Z_IS_2827_EQ_2827U(...)  \,
+#define Z_IS_2827U_EQ_2827U(...) \,
+#define Z_IS_2828_EQ_2828(...)   \,
+#define Z_IS_2828U_EQ_2828(...)  \,
+#define Z_IS_2828_EQ_2828U(...)  \,
+#define Z_IS_2828U_EQ_2828U(...) \,
+#define Z_IS_2829_EQ_2829(...)   \,
+#define Z_IS_2829U_EQ_2829(...)  \,
+#define Z_IS_2829_EQ_2829U(...)  \,
+#define Z_IS_2829U_EQ_2829U(...) \,
+#define Z_IS_2830_EQ_2830(...)   \,
+#define Z_IS_2830U_EQ_2830(...)  \,
+#define Z_IS_2830_EQ_2830U(...)  \,
+#define Z_IS_2830U_EQ_2830U(...) \,
+#define Z_IS_2831_EQ_2831(...)   \,
+#define Z_IS_2831U_EQ_2831(...)  \,
+#define Z_IS_2831_EQ_2831U(...)  \,
+#define Z_IS_2831U_EQ_2831U(...) \,
+#define Z_IS_2832_EQ_2832(...)   \,
+#define Z_IS_2832U_EQ_2832(...)  \,
+#define Z_IS_2832_EQ_2832U(...)  \,
+#define Z_IS_2832U_EQ_2832U(...) \,
+#define Z_IS_2833_EQ_2833(...)   \,
+#define Z_IS_2833U_EQ_2833(...)  \,
+#define Z_IS_2833_EQ_2833U(...)  \,
+#define Z_IS_2833U_EQ_2833U(...) \,
+#define Z_IS_2834_EQ_2834(...)   \,
+#define Z_IS_2834U_EQ_2834(...)  \,
+#define Z_IS_2834_EQ_2834U(...)  \,
+#define Z_IS_2834U_EQ_2834U(...) \,
+#define Z_IS_2835_EQ_2835(...)   \,
+#define Z_IS_2835U_EQ_2835(...)  \,
+#define Z_IS_2835_EQ_2835U(...)  \,
+#define Z_IS_2835U_EQ_2835U(...) \,
+#define Z_IS_2836_EQ_2836(...)   \,
+#define Z_IS_2836U_EQ_2836(...)  \,
+#define Z_IS_2836_EQ_2836U(...)  \,
+#define Z_IS_2836U_EQ_2836U(...) \,
+#define Z_IS_2837_EQ_2837(...)   \,
+#define Z_IS_2837U_EQ_2837(...)  \,
+#define Z_IS_2837_EQ_2837U(...)  \,
+#define Z_IS_2837U_EQ_2837U(...) \,
+#define Z_IS_2838_EQ_2838(...)   \,
+#define Z_IS_2838U_EQ_2838(...)  \,
+#define Z_IS_2838_EQ_2838U(...)  \,
+#define Z_IS_2838U_EQ_2838U(...) \,
+#define Z_IS_2839_EQ_2839(...)   \,
+#define Z_IS_2839U_EQ_2839(...)  \,
+#define Z_IS_2839_EQ_2839U(...)  \,
+#define Z_IS_2839U_EQ_2839U(...) \,
+#define Z_IS_2840_EQ_2840(...)   \,
+#define Z_IS_2840U_EQ_2840(...)  \,
+#define Z_IS_2840_EQ_2840U(...)  \,
+#define Z_IS_2840U_EQ_2840U(...) \,
+#define Z_IS_2841_EQ_2841(...)   \,
+#define Z_IS_2841U_EQ_2841(...)  \,
+#define Z_IS_2841_EQ_2841U(...)  \,
+#define Z_IS_2841U_EQ_2841U(...) \,
+#define Z_IS_2842_EQ_2842(...)   \,
+#define Z_IS_2842U_EQ_2842(...)  \,
+#define Z_IS_2842_EQ_2842U(...)  \,
+#define Z_IS_2842U_EQ_2842U(...) \,
+#define Z_IS_2843_EQ_2843(...)   \,
+#define Z_IS_2843U_EQ_2843(...)  \,
+#define Z_IS_2843_EQ_2843U(...)  \,
+#define Z_IS_2843U_EQ_2843U(...) \,
+#define Z_IS_2844_EQ_2844(...)   \,
+#define Z_IS_2844U_EQ_2844(...)  \,
+#define Z_IS_2844_EQ_2844U(...)  \,
+#define Z_IS_2844U_EQ_2844U(...) \,
+#define Z_IS_2845_EQ_2845(...)   \,
+#define Z_IS_2845U_EQ_2845(...)  \,
+#define Z_IS_2845_EQ_2845U(...)  \,
+#define Z_IS_2845U_EQ_2845U(...) \,
+#define Z_IS_2846_EQ_2846(...)   \,
+#define Z_IS_2846U_EQ_2846(...)  \,
+#define Z_IS_2846_EQ_2846U(...)  \,
+#define Z_IS_2846U_EQ_2846U(...) \,
+#define Z_IS_2847_EQ_2847(...)   \,
+#define Z_IS_2847U_EQ_2847(...)  \,
+#define Z_IS_2847_EQ_2847U(...)  \,
+#define Z_IS_2847U_EQ_2847U(...) \,
+#define Z_IS_2848_EQ_2848(...)   \,
+#define Z_IS_2848U_EQ_2848(...)  \,
+#define Z_IS_2848_EQ_2848U(...)  \,
+#define Z_IS_2848U_EQ_2848U(...) \,
+#define Z_IS_2849_EQ_2849(...)   \,
+#define Z_IS_2849U_EQ_2849(...)  \,
+#define Z_IS_2849_EQ_2849U(...)  \,
+#define Z_IS_2849U_EQ_2849U(...) \,
+#define Z_IS_2850_EQ_2850(...)   \,
+#define Z_IS_2850U_EQ_2850(...)  \,
+#define Z_IS_2850_EQ_2850U(...)  \,
+#define Z_IS_2850U_EQ_2850U(...) \,
+#define Z_IS_2851_EQ_2851(...)   \,
+#define Z_IS_2851U_EQ_2851(...)  \,
+#define Z_IS_2851_EQ_2851U(...)  \,
+#define Z_IS_2851U_EQ_2851U(...) \,
+#define Z_IS_2852_EQ_2852(...)   \,
+#define Z_IS_2852U_EQ_2852(...)  \,
+#define Z_IS_2852_EQ_2852U(...)  \,
+#define Z_IS_2852U_EQ_2852U(...) \,
+#define Z_IS_2853_EQ_2853(...)   \,
+#define Z_IS_2853U_EQ_2853(...)  \,
+#define Z_IS_2853_EQ_2853U(...)  \,
+#define Z_IS_2853U_EQ_2853U(...) \,
+#define Z_IS_2854_EQ_2854(...)   \,
+#define Z_IS_2854U_EQ_2854(...)  \,
+#define Z_IS_2854_EQ_2854U(...)  \,
+#define Z_IS_2854U_EQ_2854U(...) \,
+#define Z_IS_2855_EQ_2855(...)   \,
+#define Z_IS_2855U_EQ_2855(...)  \,
+#define Z_IS_2855_EQ_2855U(...)  \,
+#define Z_IS_2855U_EQ_2855U(...) \,
+#define Z_IS_2856_EQ_2856(...)   \,
+#define Z_IS_2856U_EQ_2856(...)  \,
+#define Z_IS_2856_EQ_2856U(...)  \,
+#define Z_IS_2856U_EQ_2856U(...) \,
+#define Z_IS_2857_EQ_2857(...)   \,
+#define Z_IS_2857U_EQ_2857(...)  \,
+#define Z_IS_2857_EQ_2857U(...)  \,
+#define Z_IS_2857U_EQ_2857U(...) \,
+#define Z_IS_2858_EQ_2858(...)   \,
+#define Z_IS_2858U_EQ_2858(...)  \,
+#define Z_IS_2858_EQ_2858U(...)  \,
+#define Z_IS_2858U_EQ_2858U(...) \,
+#define Z_IS_2859_EQ_2859(...)   \,
+#define Z_IS_2859U_EQ_2859(...)  \,
+#define Z_IS_2859_EQ_2859U(...)  \,
+#define Z_IS_2859U_EQ_2859U(...) \,
+#define Z_IS_2860_EQ_2860(...)   \,
+#define Z_IS_2860U_EQ_2860(...)  \,
+#define Z_IS_2860_EQ_2860U(...)  \,
+#define Z_IS_2860U_EQ_2860U(...) \,
+#define Z_IS_2861_EQ_2861(...)   \,
+#define Z_IS_2861U_EQ_2861(...)  \,
+#define Z_IS_2861_EQ_2861U(...)  \,
+#define Z_IS_2861U_EQ_2861U(...) \,
+#define Z_IS_2862_EQ_2862(...)   \,
+#define Z_IS_2862U_EQ_2862(...)  \,
+#define Z_IS_2862_EQ_2862U(...)  \,
+#define Z_IS_2862U_EQ_2862U(...) \,
+#define Z_IS_2863_EQ_2863(...)   \,
+#define Z_IS_2863U_EQ_2863(...)  \,
+#define Z_IS_2863_EQ_2863U(...)  \,
+#define Z_IS_2863U_EQ_2863U(...) \,
+#define Z_IS_2864_EQ_2864(...)   \,
+#define Z_IS_2864U_EQ_2864(...)  \,
+#define Z_IS_2864_EQ_2864U(...)  \,
+#define Z_IS_2864U_EQ_2864U(...) \,
+#define Z_IS_2865_EQ_2865(...)   \,
+#define Z_IS_2865U_EQ_2865(...)  \,
+#define Z_IS_2865_EQ_2865U(...)  \,
+#define Z_IS_2865U_EQ_2865U(...) \,
+#define Z_IS_2866_EQ_2866(...)   \,
+#define Z_IS_2866U_EQ_2866(...)  \,
+#define Z_IS_2866_EQ_2866U(...)  \,
+#define Z_IS_2866U_EQ_2866U(...) \,
+#define Z_IS_2867_EQ_2867(...)   \,
+#define Z_IS_2867U_EQ_2867(...)  \,
+#define Z_IS_2867_EQ_2867U(...)  \,
+#define Z_IS_2867U_EQ_2867U(...) \,
+#define Z_IS_2868_EQ_2868(...)   \,
+#define Z_IS_2868U_EQ_2868(...)  \,
+#define Z_IS_2868_EQ_2868U(...)  \,
+#define Z_IS_2868U_EQ_2868U(...) \,
+#define Z_IS_2869_EQ_2869(...)   \,
+#define Z_IS_2869U_EQ_2869(...)  \,
+#define Z_IS_2869_EQ_2869U(...)  \,
+#define Z_IS_2869U_EQ_2869U(...) \,
+#define Z_IS_2870_EQ_2870(...)   \,
+#define Z_IS_2870U_EQ_2870(...)  \,
+#define Z_IS_2870_EQ_2870U(...)  \,
+#define Z_IS_2870U_EQ_2870U(...) \,
+#define Z_IS_2871_EQ_2871(...)   \,
+#define Z_IS_2871U_EQ_2871(...)  \,
+#define Z_IS_2871_EQ_2871U(...)  \,
+#define Z_IS_2871U_EQ_2871U(...) \,
+#define Z_IS_2872_EQ_2872(...)   \,
+#define Z_IS_2872U_EQ_2872(...)  \,
+#define Z_IS_2872_EQ_2872U(...)  \,
+#define Z_IS_2872U_EQ_2872U(...) \,
+#define Z_IS_2873_EQ_2873(...)   \,
+#define Z_IS_2873U_EQ_2873(...)  \,
+#define Z_IS_2873_EQ_2873U(...)  \,
+#define Z_IS_2873U_EQ_2873U(...) \,
+#define Z_IS_2874_EQ_2874(...)   \,
+#define Z_IS_2874U_EQ_2874(...)  \,
+#define Z_IS_2874_EQ_2874U(...)  \,
+#define Z_IS_2874U_EQ_2874U(...) \,
+#define Z_IS_2875_EQ_2875(...)   \,
+#define Z_IS_2875U_EQ_2875(...)  \,
+#define Z_IS_2875_EQ_2875U(...)  \,
+#define Z_IS_2875U_EQ_2875U(...) \,
+#define Z_IS_2876_EQ_2876(...)   \,
+#define Z_IS_2876U_EQ_2876(...)  \,
+#define Z_IS_2876_EQ_2876U(...)  \,
+#define Z_IS_2876U_EQ_2876U(...) \,
+#define Z_IS_2877_EQ_2877(...)   \,
+#define Z_IS_2877U_EQ_2877(...)  \,
+#define Z_IS_2877_EQ_2877U(...)  \,
+#define Z_IS_2877U_EQ_2877U(...) \,
+#define Z_IS_2878_EQ_2878(...)   \,
+#define Z_IS_2878U_EQ_2878(...)  \,
+#define Z_IS_2878_EQ_2878U(...)  \,
+#define Z_IS_2878U_EQ_2878U(...) \,
+#define Z_IS_2879_EQ_2879(...)   \,
+#define Z_IS_2879U_EQ_2879(...)  \,
+#define Z_IS_2879_EQ_2879U(...)  \,
+#define Z_IS_2879U_EQ_2879U(...) \,
+#define Z_IS_2880_EQ_2880(...)   \,
+#define Z_IS_2880U_EQ_2880(...)  \,
+#define Z_IS_2880_EQ_2880U(...)  \,
+#define Z_IS_2880U_EQ_2880U(...) \,
+#define Z_IS_2881_EQ_2881(...)   \,
+#define Z_IS_2881U_EQ_2881(...)  \,
+#define Z_IS_2881_EQ_2881U(...)  \,
+#define Z_IS_2881U_EQ_2881U(...) \,
+#define Z_IS_2882_EQ_2882(...)   \,
+#define Z_IS_2882U_EQ_2882(...)  \,
+#define Z_IS_2882_EQ_2882U(...)  \,
+#define Z_IS_2882U_EQ_2882U(...) \,
+#define Z_IS_2883_EQ_2883(...)   \,
+#define Z_IS_2883U_EQ_2883(...)  \,
+#define Z_IS_2883_EQ_2883U(...)  \,
+#define Z_IS_2883U_EQ_2883U(...) \,
+#define Z_IS_2884_EQ_2884(...)   \,
+#define Z_IS_2884U_EQ_2884(...)  \,
+#define Z_IS_2884_EQ_2884U(...)  \,
+#define Z_IS_2884U_EQ_2884U(...) \,
+#define Z_IS_2885_EQ_2885(...)   \,
+#define Z_IS_2885U_EQ_2885(...)  \,
+#define Z_IS_2885_EQ_2885U(...)  \,
+#define Z_IS_2885U_EQ_2885U(...) \,
+#define Z_IS_2886_EQ_2886(...)   \,
+#define Z_IS_2886U_EQ_2886(...)  \,
+#define Z_IS_2886_EQ_2886U(...)  \,
+#define Z_IS_2886U_EQ_2886U(...) \,
+#define Z_IS_2887_EQ_2887(...)   \,
+#define Z_IS_2887U_EQ_2887(...)  \,
+#define Z_IS_2887_EQ_2887U(...)  \,
+#define Z_IS_2887U_EQ_2887U(...) \,
+#define Z_IS_2888_EQ_2888(...)   \,
+#define Z_IS_2888U_EQ_2888(...)  \,
+#define Z_IS_2888_EQ_2888U(...)  \,
+#define Z_IS_2888U_EQ_2888U(...) \,
+#define Z_IS_2889_EQ_2889(...)   \,
+#define Z_IS_2889U_EQ_2889(...)  \,
+#define Z_IS_2889_EQ_2889U(...)  \,
+#define Z_IS_2889U_EQ_2889U(...) \,
+#define Z_IS_2890_EQ_2890(...)   \,
+#define Z_IS_2890U_EQ_2890(...)  \,
+#define Z_IS_2890_EQ_2890U(...)  \,
+#define Z_IS_2890U_EQ_2890U(...) \,
+#define Z_IS_2891_EQ_2891(...)   \,
+#define Z_IS_2891U_EQ_2891(...)  \,
+#define Z_IS_2891_EQ_2891U(...)  \,
+#define Z_IS_2891U_EQ_2891U(...) \,
+#define Z_IS_2892_EQ_2892(...)   \,
+#define Z_IS_2892U_EQ_2892(...)  \,
+#define Z_IS_2892_EQ_2892U(...)  \,
+#define Z_IS_2892U_EQ_2892U(...) \,
+#define Z_IS_2893_EQ_2893(...)   \,
+#define Z_IS_2893U_EQ_2893(...)  \,
+#define Z_IS_2893_EQ_2893U(...)  \,
+#define Z_IS_2893U_EQ_2893U(...) \,
+#define Z_IS_2894_EQ_2894(...)   \,
+#define Z_IS_2894U_EQ_2894(...)  \,
+#define Z_IS_2894_EQ_2894U(...)  \,
+#define Z_IS_2894U_EQ_2894U(...) \,
+#define Z_IS_2895_EQ_2895(...)   \,
+#define Z_IS_2895U_EQ_2895(...)  \,
+#define Z_IS_2895_EQ_2895U(...)  \,
+#define Z_IS_2895U_EQ_2895U(...) \,
+#define Z_IS_2896_EQ_2896(...)   \,
+#define Z_IS_2896U_EQ_2896(...)  \,
+#define Z_IS_2896_EQ_2896U(...)  \,
+#define Z_IS_2896U_EQ_2896U(...) \,
+#define Z_IS_2897_EQ_2897(...)   \,
+#define Z_IS_2897U_EQ_2897(...)  \,
+#define Z_IS_2897_EQ_2897U(...)  \,
+#define Z_IS_2897U_EQ_2897U(...) \,
+#define Z_IS_2898_EQ_2898(...)   \,
+#define Z_IS_2898U_EQ_2898(...)  \,
+#define Z_IS_2898_EQ_2898U(...)  \,
+#define Z_IS_2898U_EQ_2898U(...) \,
+#define Z_IS_2899_EQ_2899(...)   \,
+#define Z_IS_2899U_EQ_2899(...)  \,
+#define Z_IS_2899_EQ_2899U(...)  \,
+#define Z_IS_2899U_EQ_2899U(...) \,
+#define Z_IS_2900_EQ_2900(...)   \,
+#define Z_IS_2900U_EQ_2900(...)  \,
+#define Z_IS_2900_EQ_2900U(...)  \,
+#define Z_IS_2900U_EQ_2900U(...) \,
+#define Z_IS_2901_EQ_2901(...)   \,
+#define Z_IS_2901U_EQ_2901(...)  \,
+#define Z_IS_2901_EQ_2901U(...)  \,
+#define Z_IS_2901U_EQ_2901U(...) \,
+#define Z_IS_2902_EQ_2902(...)   \,
+#define Z_IS_2902U_EQ_2902(...)  \,
+#define Z_IS_2902_EQ_2902U(...)  \,
+#define Z_IS_2902U_EQ_2902U(...) \,
+#define Z_IS_2903_EQ_2903(...)   \,
+#define Z_IS_2903U_EQ_2903(...)  \,
+#define Z_IS_2903_EQ_2903U(...)  \,
+#define Z_IS_2903U_EQ_2903U(...) \,
+#define Z_IS_2904_EQ_2904(...)   \,
+#define Z_IS_2904U_EQ_2904(...)  \,
+#define Z_IS_2904_EQ_2904U(...)  \,
+#define Z_IS_2904U_EQ_2904U(...) \,
+#define Z_IS_2905_EQ_2905(...)   \,
+#define Z_IS_2905U_EQ_2905(...)  \,
+#define Z_IS_2905_EQ_2905U(...)  \,
+#define Z_IS_2905U_EQ_2905U(...) \,
+#define Z_IS_2906_EQ_2906(...)   \,
+#define Z_IS_2906U_EQ_2906(...)  \,
+#define Z_IS_2906_EQ_2906U(...)  \,
+#define Z_IS_2906U_EQ_2906U(...) \,
+#define Z_IS_2907_EQ_2907(...)   \,
+#define Z_IS_2907U_EQ_2907(...)  \,
+#define Z_IS_2907_EQ_2907U(...)  \,
+#define Z_IS_2907U_EQ_2907U(...) \,
+#define Z_IS_2908_EQ_2908(...)   \,
+#define Z_IS_2908U_EQ_2908(...)  \,
+#define Z_IS_2908_EQ_2908U(...)  \,
+#define Z_IS_2908U_EQ_2908U(...) \,
+#define Z_IS_2909_EQ_2909(...)   \,
+#define Z_IS_2909U_EQ_2909(...)  \,
+#define Z_IS_2909_EQ_2909U(...)  \,
+#define Z_IS_2909U_EQ_2909U(...) \,
+#define Z_IS_2910_EQ_2910(...)   \,
+#define Z_IS_2910U_EQ_2910(...)  \,
+#define Z_IS_2910_EQ_2910U(...)  \,
+#define Z_IS_2910U_EQ_2910U(...) \,
+#define Z_IS_2911_EQ_2911(...)   \,
+#define Z_IS_2911U_EQ_2911(...)  \,
+#define Z_IS_2911_EQ_2911U(...)  \,
+#define Z_IS_2911U_EQ_2911U(...) \,
+#define Z_IS_2912_EQ_2912(...)   \,
+#define Z_IS_2912U_EQ_2912(...)  \,
+#define Z_IS_2912_EQ_2912U(...)  \,
+#define Z_IS_2912U_EQ_2912U(...) \,
+#define Z_IS_2913_EQ_2913(...)   \,
+#define Z_IS_2913U_EQ_2913(...)  \,
+#define Z_IS_2913_EQ_2913U(...)  \,
+#define Z_IS_2913U_EQ_2913U(...) \,
+#define Z_IS_2914_EQ_2914(...)   \,
+#define Z_IS_2914U_EQ_2914(...)  \,
+#define Z_IS_2914_EQ_2914U(...)  \,
+#define Z_IS_2914U_EQ_2914U(...) \,
+#define Z_IS_2915_EQ_2915(...)   \,
+#define Z_IS_2915U_EQ_2915(...)  \,
+#define Z_IS_2915_EQ_2915U(...)  \,
+#define Z_IS_2915U_EQ_2915U(...) \,
+#define Z_IS_2916_EQ_2916(...)   \,
+#define Z_IS_2916U_EQ_2916(...)  \,
+#define Z_IS_2916_EQ_2916U(...)  \,
+#define Z_IS_2916U_EQ_2916U(...) \,
+#define Z_IS_2917_EQ_2917(...)   \,
+#define Z_IS_2917U_EQ_2917(...)  \,
+#define Z_IS_2917_EQ_2917U(...)  \,
+#define Z_IS_2917U_EQ_2917U(...) \,
+#define Z_IS_2918_EQ_2918(...)   \,
+#define Z_IS_2918U_EQ_2918(...)  \,
+#define Z_IS_2918_EQ_2918U(...)  \,
+#define Z_IS_2918U_EQ_2918U(...) \,
+#define Z_IS_2919_EQ_2919(...)   \,
+#define Z_IS_2919U_EQ_2919(...)  \,
+#define Z_IS_2919_EQ_2919U(...)  \,
+#define Z_IS_2919U_EQ_2919U(...) \,
+#define Z_IS_2920_EQ_2920(...)   \,
+#define Z_IS_2920U_EQ_2920(...)  \,
+#define Z_IS_2920_EQ_2920U(...)  \,
+#define Z_IS_2920U_EQ_2920U(...) \,
+#define Z_IS_2921_EQ_2921(...)   \,
+#define Z_IS_2921U_EQ_2921(...)  \,
+#define Z_IS_2921_EQ_2921U(...)  \,
+#define Z_IS_2921U_EQ_2921U(...) \,
+#define Z_IS_2922_EQ_2922(...)   \,
+#define Z_IS_2922U_EQ_2922(...)  \,
+#define Z_IS_2922_EQ_2922U(...)  \,
+#define Z_IS_2922U_EQ_2922U(...) \,
+#define Z_IS_2923_EQ_2923(...)   \,
+#define Z_IS_2923U_EQ_2923(...)  \,
+#define Z_IS_2923_EQ_2923U(...)  \,
+#define Z_IS_2923U_EQ_2923U(...) \,
+#define Z_IS_2924_EQ_2924(...)   \,
+#define Z_IS_2924U_EQ_2924(...)  \,
+#define Z_IS_2924_EQ_2924U(...)  \,
+#define Z_IS_2924U_EQ_2924U(...) \,
+#define Z_IS_2925_EQ_2925(...)   \,
+#define Z_IS_2925U_EQ_2925(...)  \,
+#define Z_IS_2925_EQ_2925U(...)  \,
+#define Z_IS_2925U_EQ_2925U(...) \,
+#define Z_IS_2926_EQ_2926(...)   \,
+#define Z_IS_2926U_EQ_2926(...)  \,
+#define Z_IS_2926_EQ_2926U(...)  \,
+#define Z_IS_2926U_EQ_2926U(...) \,
+#define Z_IS_2927_EQ_2927(...)   \,
+#define Z_IS_2927U_EQ_2927(...)  \,
+#define Z_IS_2927_EQ_2927U(...)  \,
+#define Z_IS_2927U_EQ_2927U(...) \,
+#define Z_IS_2928_EQ_2928(...)   \,
+#define Z_IS_2928U_EQ_2928(...)  \,
+#define Z_IS_2928_EQ_2928U(...)  \,
+#define Z_IS_2928U_EQ_2928U(...) \,
+#define Z_IS_2929_EQ_2929(...)   \,
+#define Z_IS_2929U_EQ_2929(...)  \,
+#define Z_IS_2929_EQ_2929U(...)  \,
+#define Z_IS_2929U_EQ_2929U(...) \,
+#define Z_IS_2930_EQ_2930(...)   \,
+#define Z_IS_2930U_EQ_2930(...)  \,
+#define Z_IS_2930_EQ_2930U(...)  \,
+#define Z_IS_2930U_EQ_2930U(...) \,
+#define Z_IS_2931_EQ_2931(...)   \,
+#define Z_IS_2931U_EQ_2931(...)  \,
+#define Z_IS_2931_EQ_2931U(...)  \,
+#define Z_IS_2931U_EQ_2931U(...) \,
+#define Z_IS_2932_EQ_2932(...)   \,
+#define Z_IS_2932U_EQ_2932(...)  \,
+#define Z_IS_2932_EQ_2932U(...)  \,
+#define Z_IS_2932U_EQ_2932U(...) \,
+#define Z_IS_2933_EQ_2933(...)   \,
+#define Z_IS_2933U_EQ_2933(...)  \,
+#define Z_IS_2933_EQ_2933U(...)  \,
+#define Z_IS_2933U_EQ_2933U(...) \,
+#define Z_IS_2934_EQ_2934(...)   \,
+#define Z_IS_2934U_EQ_2934(...)  \,
+#define Z_IS_2934_EQ_2934U(...)  \,
+#define Z_IS_2934U_EQ_2934U(...) \,
+#define Z_IS_2935_EQ_2935(...)   \,
+#define Z_IS_2935U_EQ_2935(...)  \,
+#define Z_IS_2935_EQ_2935U(...)  \,
+#define Z_IS_2935U_EQ_2935U(...) \,
+#define Z_IS_2936_EQ_2936(...)   \,
+#define Z_IS_2936U_EQ_2936(...)  \,
+#define Z_IS_2936_EQ_2936U(...)  \,
+#define Z_IS_2936U_EQ_2936U(...) \,
+#define Z_IS_2937_EQ_2937(...)   \,
+#define Z_IS_2937U_EQ_2937(...)  \,
+#define Z_IS_2937_EQ_2937U(...)  \,
+#define Z_IS_2937U_EQ_2937U(...) \,
+#define Z_IS_2938_EQ_2938(...)   \,
+#define Z_IS_2938U_EQ_2938(...)  \,
+#define Z_IS_2938_EQ_2938U(...)  \,
+#define Z_IS_2938U_EQ_2938U(...) \,
+#define Z_IS_2939_EQ_2939(...)   \,
+#define Z_IS_2939U_EQ_2939(...)  \,
+#define Z_IS_2939_EQ_2939U(...)  \,
+#define Z_IS_2939U_EQ_2939U(...) \,
+#define Z_IS_2940_EQ_2940(...)   \,
+#define Z_IS_2940U_EQ_2940(...)  \,
+#define Z_IS_2940_EQ_2940U(...)  \,
+#define Z_IS_2940U_EQ_2940U(...) \,
+#define Z_IS_2941_EQ_2941(...)   \,
+#define Z_IS_2941U_EQ_2941(...)  \,
+#define Z_IS_2941_EQ_2941U(...)  \,
+#define Z_IS_2941U_EQ_2941U(...) \,
+#define Z_IS_2942_EQ_2942(...)   \,
+#define Z_IS_2942U_EQ_2942(...)  \,
+#define Z_IS_2942_EQ_2942U(...)  \,
+#define Z_IS_2942U_EQ_2942U(...) \,
+#define Z_IS_2943_EQ_2943(...)   \,
+#define Z_IS_2943U_EQ_2943(...)  \,
+#define Z_IS_2943_EQ_2943U(...)  \,
+#define Z_IS_2943U_EQ_2943U(...) \,
+#define Z_IS_2944_EQ_2944(...)   \,
+#define Z_IS_2944U_EQ_2944(...)  \,
+#define Z_IS_2944_EQ_2944U(...)  \,
+#define Z_IS_2944U_EQ_2944U(...) \,
+#define Z_IS_2945_EQ_2945(...)   \,
+#define Z_IS_2945U_EQ_2945(...)  \,
+#define Z_IS_2945_EQ_2945U(...)  \,
+#define Z_IS_2945U_EQ_2945U(...) \,
+#define Z_IS_2946_EQ_2946(...)   \,
+#define Z_IS_2946U_EQ_2946(...)  \,
+#define Z_IS_2946_EQ_2946U(...)  \,
+#define Z_IS_2946U_EQ_2946U(...) \,
+#define Z_IS_2947_EQ_2947(...)   \,
+#define Z_IS_2947U_EQ_2947(...)  \,
+#define Z_IS_2947_EQ_2947U(...)  \,
+#define Z_IS_2947U_EQ_2947U(...) \,
+#define Z_IS_2948_EQ_2948(...)   \,
+#define Z_IS_2948U_EQ_2948(...)  \,
+#define Z_IS_2948_EQ_2948U(...)  \,
+#define Z_IS_2948U_EQ_2948U(...) \,
+#define Z_IS_2949_EQ_2949(...)   \,
+#define Z_IS_2949U_EQ_2949(...)  \,
+#define Z_IS_2949_EQ_2949U(...)  \,
+#define Z_IS_2949U_EQ_2949U(...) \,
+#define Z_IS_2950_EQ_2950(...)   \,
+#define Z_IS_2950U_EQ_2950(...)  \,
+#define Z_IS_2950_EQ_2950U(...)  \,
+#define Z_IS_2950U_EQ_2950U(...) \,
+#define Z_IS_2951_EQ_2951(...)   \,
+#define Z_IS_2951U_EQ_2951(...)  \,
+#define Z_IS_2951_EQ_2951U(...)  \,
+#define Z_IS_2951U_EQ_2951U(...) \,
+#define Z_IS_2952_EQ_2952(...)   \,
+#define Z_IS_2952U_EQ_2952(...)  \,
+#define Z_IS_2952_EQ_2952U(...)  \,
+#define Z_IS_2952U_EQ_2952U(...) \,
+#define Z_IS_2953_EQ_2953(...)   \,
+#define Z_IS_2953U_EQ_2953(...)  \,
+#define Z_IS_2953_EQ_2953U(...)  \,
+#define Z_IS_2953U_EQ_2953U(...) \,
+#define Z_IS_2954_EQ_2954(...)   \,
+#define Z_IS_2954U_EQ_2954(...)  \,
+#define Z_IS_2954_EQ_2954U(...)  \,
+#define Z_IS_2954U_EQ_2954U(...) \,
+#define Z_IS_2955_EQ_2955(...)   \,
+#define Z_IS_2955U_EQ_2955(...)  \,
+#define Z_IS_2955_EQ_2955U(...)  \,
+#define Z_IS_2955U_EQ_2955U(...) \,
+#define Z_IS_2956_EQ_2956(...)   \,
+#define Z_IS_2956U_EQ_2956(...)  \,
+#define Z_IS_2956_EQ_2956U(...)  \,
+#define Z_IS_2956U_EQ_2956U(...) \,
+#define Z_IS_2957_EQ_2957(...)   \,
+#define Z_IS_2957U_EQ_2957(...)  \,
+#define Z_IS_2957_EQ_2957U(...)  \,
+#define Z_IS_2957U_EQ_2957U(...) \,
+#define Z_IS_2958_EQ_2958(...)   \,
+#define Z_IS_2958U_EQ_2958(...)  \,
+#define Z_IS_2958_EQ_2958U(...)  \,
+#define Z_IS_2958U_EQ_2958U(...) \,
+#define Z_IS_2959_EQ_2959(...)   \,
+#define Z_IS_2959U_EQ_2959(...)  \,
+#define Z_IS_2959_EQ_2959U(...)  \,
+#define Z_IS_2959U_EQ_2959U(...) \,
+#define Z_IS_2960_EQ_2960(...)   \,
+#define Z_IS_2960U_EQ_2960(...)  \,
+#define Z_IS_2960_EQ_2960U(...)  \,
+#define Z_IS_2960U_EQ_2960U(...) \,
+#define Z_IS_2961_EQ_2961(...)   \,
+#define Z_IS_2961U_EQ_2961(...)  \,
+#define Z_IS_2961_EQ_2961U(...)  \,
+#define Z_IS_2961U_EQ_2961U(...) \,
+#define Z_IS_2962_EQ_2962(...)   \,
+#define Z_IS_2962U_EQ_2962(...)  \,
+#define Z_IS_2962_EQ_2962U(...)  \,
+#define Z_IS_2962U_EQ_2962U(...) \,
+#define Z_IS_2963_EQ_2963(...)   \,
+#define Z_IS_2963U_EQ_2963(...)  \,
+#define Z_IS_2963_EQ_2963U(...)  \,
+#define Z_IS_2963U_EQ_2963U(...) \,
+#define Z_IS_2964_EQ_2964(...)   \,
+#define Z_IS_2964U_EQ_2964(...)  \,
+#define Z_IS_2964_EQ_2964U(...)  \,
+#define Z_IS_2964U_EQ_2964U(...) \,
+#define Z_IS_2965_EQ_2965(...)   \,
+#define Z_IS_2965U_EQ_2965(...)  \,
+#define Z_IS_2965_EQ_2965U(...)  \,
+#define Z_IS_2965U_EQ_2965U(...) \,
+#define Z_IS_2966_EQ_2966(...)   \,
+#define Z_IS_2966U_EQ_2966(...)  \,
+#define Z_IS_2966_EQ_2966U(...)  \,
+#define Z_IS_2966U_EQ_2966U(...) \,
+#define Z_IS_2967_EQ_2967(...)   \,
+#define Z_IS_2967U_EQ_2967(...)  \,
+#define Z_IS_2967_EQ_2967U(...)  \,
+#define Z_IS_2967U_EQ_2967U(...) \,
+#define Z_IS_2968_EQ_2968(...)   \,
+#define Z_IS_2968U_EQ_2968(...)  \,
+#define Z_IS_2968_EQ_2968U(...)  \,
+#define Z_IS_2968U_EQ_2968U(...) \,
+#define Z_IS_2969_EQ_2969(...)   \,
+#define Z_IS_2969U_EQ_2969(...)  \,
+#define Z_IS_2969_EQ_2969U(...)  \,
+#define Z_IS_2969U_EQ_2969U(...) \,
+#define Z_IS_2970_EQ_2970(...)   \,
+#define Z_IS_2970U_EQ_2970(...)  \,
+#define Z_IS_2970_EQ_2970U(...)  \,
+#define Z_IS_2970U_EQ_2970U(...) \,
+#define Z_IS_2971_EQ_2971(...)   \,
+#define Z_IS_2971U_EQ_2971(...)  \,
+#define Z_IS_2971_EQ_2971U(...)  \,
+#define Z_IS_2971U_EQ_2971U(...) \,
+#define Z_IS_2972_EQ_2972(...)   \,
+#define Z_IS_2972U_EQ_2972(...)  \,
+#define Z_IS_2972_EQ_2972U(...)  \,
+#define Z_IS_2972U_EQ_2972U(...) \,
+#define Z_IS_2973_EQ_2973(...)   \,
+#define Z_IS_2973U_EQ_2973(...)  \,
+#define Z_IS_2973_EQ_2973U(...)  \,
+#define Z_IS_2973U_EQ_2973U(...) \,
+#define Z_IS_2974_EQ_2974(...)   \,
+#define Z_IS_2974U_EQ_2974(...)  \,
+#define Z_IS_2974_EQ_2974U(...)  \,
+#define Z_IS_2974U_EQ_2974U(...) \,
+#define Z_IS_2975_EQ_2975(...)   \,
+#define Z_IS_2975U_EQ_2975(...)  \,
+#define Z_IS_2975_EQ_2975U(...)  \,
+#define Z_IS_2975U_EQ_2975U(...) \,
+#define Z_IS_2976_EQ_2976(...)   \,
+#define Z_IS_2976U_EQ_2976(...)  \,
+#define Z_IS_2976_EQ_2976U(...)  \,
+#define Z_IS_2976U_EQ_2976U(...) \,
+#define Z_IS_2977_EQ_2977(...)   \,
+#define Z_IS_2977U_EQ_2977(...)  \,
+#define Z_IS_2977_EQ_2977U(...)  \,
+#define Z_IS_2977U_EQ_2977U(...) \,
+#define Z_IS_2978_EQ_2978(...)   \,
+#define Z_IS_2978U_EQ_2978(...)  \,
+#define Z_IS_2978_EQ_2978U(...)  \,
+#define Z_IS_2978U_EQ_2978U(...) \,
+#define Z_IS_2979_EQ_2979(...)   \,
+#define Z_IS_2979U_EQ_2979(...)  \,
+#define Z_IS_2979_EQ_2979U(...)  \,
+#define Z_IS_2979U_EQ_2979U(...) \,
+#define Z_IS_2980_EQ_2980(...)   \,
+#define Z_IS_2980U_EQ_2980(...)  \,
+#define Z_IS_2980_EQ_2980U(...)  \,
+#define Z_IS_2980U_EQ_2980U(...) \,
+#define Z_IS_2981_EQ_2981(...)   \,
+#define Z_IS_2981U_EQ_2981(...)  \,
+#define Z_IS_2981_EQ_2981U(...)  \,
+#define Z_IS_2981U_EQ_2981U(...) \,
+#define Z_IS_2982_EQ_2982(...)   \,
+#define Z_IS_2982U_EQ_2982(...)  \,
+#define Z_IS_2982_EQ_2982U(...)  \,
+#define Z_IS_2982U_EQ_2982U(...) \,
+#define Z_IS_2983_EQ_2983(...)   \,
+#define Z_IS_2983U_EQ_2983(...)  \,
+#define Z_IS_2983_EQ_2983U(...)  \,
+#define Z_IS_2983U_EQ_2983U(...) \,
+#define Z_IS_2984_EQ_2984(...)   \,
+#define Z_IS_2984U_EQ_2984(...)  \,
+#define Z_IS_2984_EQ_2984U(...)  \,
+#define Z_IS_2984U_EQ_2984U(...) \,
+#define Z_IS_2985_EQ_2985(...)   \,
+#define Z_IS_2985U_EQ_2985(...)  \,
+#define Z_IS_2985_EQ_2985U(...)  \,
+#define Z_IS_2985U_EQ_2985U(...) \,
+#define Z_IS_2986_EQ_2986(...)   \,
+#define Z_IS_2986U_EQ_2986(...)  \,
+#define Z_IS_2986_EQ_2986U(...)  \,
+#define Z_IS_2986U_EQ_2986U(...) \,
+#define Z_IS_2987_EQ_2987(...)   \,
+#define Z_IS_2987U_EQ_2987(...)  \,
+#define Z_IS_2987_EQ_2987U(...)  \,
+#define Z_IS_2987U_EQ_2987U(...) \,
+#define Z_IS_2988_EQ_2988(...)   \,
+#define Z_IS_2988U_EQ_2988(...)  \,
+#define Z_IS_2988_EQ_2988U(...)  \,
+#define Z_IS_2988U_EQ_2988U(...) \,
+#define Z_IS_2989_EQ_2989(...)   \,
+#define Z_IS_2989U_EQ_2989(...)  \,
+#define Z_IS_2989_EQ_2989U(...)  \,
+#define Z_IS_2989U_EQ_2989U(...) \,
+#define Z_IS_2990_EQ_2990(...)   \,
+#define Z_IS_2990U_EQ_2990(...)  \,
+#define Z_IS_2990_EQ_2990U(...)  \,
+#define Z_IS_2990U_EQ_2990U(...) \,
+#define Z_IS_2991_EQ_2991(...)   \,
+#define Z_IS_2991U_EQ_2991(...)  \,
+#define Z_IS_2991_EQ_2991U(...)  \,
+#define Z_IS_2991U_EQ_2991U(...) \,
+#define Z_IS_2992_EQ_2992(...)   \,
+#define Z_IS_2992U_EQ_2992(...)  \,
+#define Z_IS_2992_EQ_2992U(...)  \,
+#define Z_IS_2992U_EQ_2992U(...) \,
+#define Z_IS_2993_EQ_2993(...)   \,
+#define Z_IS_2993U_EQ_2993(...)  \,
+#define Z_IS_2993_EQ_2993U(...)  \,
+#define Z_IS_2993U_EQ_2993U(...) \,
+#define Z_IS_2994_EQ_2994(...)   \,
+#define Z_IS_2994U_EQ_2994(...)  \,
+#define Z_IS_2994_EQ_2994U(...)  \,
+#define Z_IS_2994U_EQ_2994U(...) \,
+#define Z_IS_2995_EQ_2995(...)   \,
+#define Z_IS_2995U_EQ_2995(...)  \,
+#define Z_IS_2995_EQ_2995U(...)  \,
+#define Z_IS_2995U_EQ_2995U(...) \,
+#define Z_IS_2996_EQ_2996(...)   \,
+#define Z_IS_2996U_EQ_2996(...)  \,
+#define Z_IS_2996_EQ_2996U(...)  \,
+#define Z_IS_2996U_EQ_2996U(...) \,
+#define Z_IS_2997_EQ_2997(...)   \,
+#define Z_IS_2997U_EQ_2997(...)  \,
+#define Z_IS_2997_EQ_2997U(...)  \,
+#define Z_IS_2997U_EQ_2997U(...) \,
+#define Z_IS_2998_EQ_2998(...)   \,
+#define Z_IS_2998U_EQ_2998(...)  \,
+#define Z_IS_2998_EQ_2998U(...)  \,
+#define Z_IS_2998U_EQ_2998U(...) \,
+#define Z_IS_2999_EQ_2999(...)   \,
+#define Z_IS_2999U_EQ_2999(...)  \,
+#define Z_IS_2999_EQ_2999U(...)  \,
+#define Z_IS_2999U_EQ_2999U(...) \,
+#define Z_IS_3000_EQ_3000(...)   \,
+#define Z_IS_3000U_EQ_3000(...)  \,
+#define Z_IS_3000_EQ_3000U(...)  \,
+#define Z_IS_3000U_EQ_3000U(...) \,
+#define Z_IS_3001_EQ_3001(...)   \,
+#define Z_IS_3001U_EQ_3001(...)  \,
+#define Z_IS_3001_EQ_3001U(...)  \,
+#define Z_IS_3001U_EQ_3001U(...) \,
+#define Z_IS_3002_EQ_3002(...)   \,
+#define Z_IS_3002U_EQ_3002(...)  \,
+#define Z_IS_3002_EQ_3002U(...)  \,
+#define Z_IS_3002U_EQ_3002U(...) \,
+#define Z_IS_3003_EQ_3003(...)   \,
+#define Z_IS_3003U_EQ_3003(...)  \,
+#define Z_IS_3003_EQ_3003U(...)  \,
+#define Z_IS_3003U_EQ_3003U(...) \,
+#define Z_IS_3004_EQ_3004(...)   \,
+#define Z_IS_3004U_EQ_3004(...)  \,
+#define Z_IS_3004_EQ_3004U(...)  \,
+#define Z_IS_3004U_EQ_3004U(...) \,
+#define Z_IS_3005_EQ_3005(...)   \,
+#define Z_IS_3005U_EQ_3005(...)  \,
+#define Z_IS_3005_EQ_3005U(...)  \,
+#define Z_IS_3005U_EQ_3005U(...) \,
+#define Z_IS_3006_EQ_3006(...)   \,
+#define Z_IS_3006U_EQ_3006(...)  \,
+#define Z_IS_3006_EQ_3006U(...)  \,
+#define Z_IS_3006U_EQ_3006U(...) \,
+#define Z_IS_3007_EQ_3007(...)   \,
+#define Z_IS_3007U_EQ_3007(...)  \,
+#define Z_IS_3007_EQ_3007U(...)  \,
+#define Z_IS_3007U_EQ_3007U(...) \,
+#define Z_IS_3008_EQ_3008(...)   \,
+#define Z_IS_3008U_EQ_3008(...)  \,
+#define Z_IS_3008_EQ_3008U(...)  \,
+#define Z_IS_3008U_EQ_3008U(...) \,
+#define Z_IS_3009_EQ_3009(...)   \,
+#define Z_IS_3009U_EQ_3009(...)  \,
+#define Z_IS_3009_EQ_3009U(...)  \,
+#define Z_IS_3009U_EQ_3009U(...) \,
+#define Z_IS_3010_EQ_3010(...)   \,
+#define Z_IS_3010U_EQ_3010(...)  \,
+#define Z_IS_3010_EQ_3010U(...)  \,
+#define Z_IS_3010U_EQ_3010U(...) \,
+#define Z_IS_3011_EQ_3011(...)   \,
+#define Z_IS_3011U_EQ_3011(...)  \,
+#define Z_IS_3011_EQ_3011U(...)  \,
+#define Z_IS_3011U_EQ_3011U(...) \,
+#define Z_IS_3012_EQ_3012(...)   \,
+#define Z_IS_3012U_EQ_3012(...)  \,
+#define Z_IS_3012_EQ_3012U(...)  \,
+#define Z_IS_3012U_EQ_3012U(...) \,
+#define Z_IS_3013_EQ_3013(...)   \,
+#define Z_IS_3013U_EQ_3013(...)  \,
+#define Z_IS_3013_EQ_3013U(...)  \,
+#define Z_IS_3013U_EQ_3013U(...) \,
+#define Z_IS_3014_EQ_3014(...)   \,
+#define Z_IS_3014U_EQ_3014(...)  \,
+#define Z_IS_3014_EQ_3014U(...)  \,
+#define Z_IS_3014U_EQ_3014U(...) \,
+#define Z_IS_3015_EQ_3015(...)   \,
+#define Z_IS_3015U_EQ_3015(...)  \,
+#define Z_IS_3015_EQ_3015U(...)  \,
+#define Z_IS_3015U_EQ_3015U(...) \,
+#define Z_IS_3016_EQ_3016(...)   \,
+#define Z_IS_3016U_EQ_3016(...)  \,
+#define Z_IS_3016_EQ_3016U(...)  \,
+#define Z_IS_3016U_EQ_3016U(...) \,
+#define Z_IS_3017_EQ_3017(...)   \,
+#define Z_IS_3017U_EQ_3017(...)  \,
+#define Z_IS_3017_EQ_3017U(...)  \,
+#define Z_IS_3017U_EQ_3017U(...) \,
+#define Z_IS_3018_EQ_3018(...)   \,
+#define Z_IS_3018U_EQ_3018(...)  \,
+#define Z_IS_3018_EQ_3018U(...)  \,
+#define Z_IS_3018U_EQ_3018U(...) \,
+#define Z_IS_3019_EQ_3019(...)   \,
+#define Z_IS_3019U_EQ_3019(...)  \,
+#define Z_IS_3019_EQ_3019U(...)  \,
+#define Z_IS_3019U_EQ_3019U(...) \,
+#define Z_IS_3020_EQ_3020(...)   \,
+#define Z_IS_3020U_EQ_3020(...)  \,
+#define Z_IS_3020_EQ_3020U(...)  \,
+#define Z_IS_3020U_EQ_3020U(...) \,
+#define Z_IS_3021_EQ_3021(...)   \,
+#define Z_IS_3021U_EQ_3021(...)  \,
+#define Z_IS_3021_EQ_3021U(...)  \,
+#define Z_IS_3021U_EQ_3021U(...) \,
+#define Z_IS_3022_EQ_3022(...)   \,
+#define Z_IS_3022U_EQ_3022(...)  \,
+#define Z_IS_3022_EQ_3022U(...)  \,
+#define Z_IS_3022U_EQ_3022U(...) \,
+#define Z_IS_3023_EQ_3023(...)   \,
+#define Z_IS_3023U_EQ_3023(...)  \,
+#define Z_IS_3023_EQ_3023U(...)  \,
+#define Z_IS_3023U_EQ_3023U(...) \,
+#define Z_IS_3024_EQ_3024(...)   \,
+#define Z_IS_3024U_EQ_3024(...)  \,
+#define Z_IS_3024_EQ_3024U(...)  \,
+#define Z_IS_3024U_EQ_3024U(...) \,
+#define Z_IS_3025_EQ_3025(...)   \,
+#define Z_IS_3025U_EQ_3025(...)  \,
+#define Z_IS_3025_EQ_3025U(...)  \,
+#define Z_IS_3025U_EQ_3025U(...) \,
+#define Z_IS_3026_EQ_3026(...)   \,
+#define Z_IS_3026U_EQ_3026(...)  \,
+#define Z_IS_3026_EQ_3026U(...)  \,
+#define Z_IS_3026U_EQ_3026U(...) \,
+#define Z_IS_3027_EQ_3027(...)   \,
+#define Z_IS_3027U_EQ_3027(...)  \,
+#define Z_IS_3027_EQ_3027U(...)  \,
+#define Z_IS_3027U_EQ_3027U(...) \,
+#define Z_IS_3028_EQ_3028(...)   \,
+#define Z_IS_3028U_EQ_3028(...)  \,
+#define Z_IS_3028_EQ_3028U(...)  \,
+#define Z_IS_3028U_EQ_3028U(...) \,
+#define Z_IS_3029_EQ_3029(...)   \,
+#define Z_IS_3029U_EQ_3029(...)  \,
+#define Z_IS_3029_EQ_3029U(...)  \,
+#define Z_IS_3029U_EQ_3029U(...) \,
+#define Z_IS_3030_EQ_3030(...)   \,
+#define Z_IS_3030U_EQ_3030(...)  \,
+#define Z_IS_3030_EQ_3030U(...)  \,
+#define Z_IS_3030U_EQ_3030U(...) \,
+#define Z_IS_3031_EQ_3031(...)   \,
+#define Z_IS_3031U_EQ_3031(...)  \,
+#define Z_IS_3031_EQ_3031U(...)  \,
+#define Z_IS_3031U_EQ_3031U(...) \,
+#define Z_IS_3032_EQ_3032(...)   \,
+#define Z_IS_3032U_EQ_3032(...)  \,
+#define Z_IS_3032_EQ_3032U(...)  \,
+#define Z_IS_3032U_EQ_3032U(...) \,
+#define Z_IS_3033_EQ_3033(...)   \,
+#define Z_IS_3033U_EQ_3033(...)  \,
+#define Z_IS_3033_EQ_3033U(...)  \,
+#define Z_IS_3033U_EQ_3033U(...) \,
+#define Z_IS_3034_EQ_3034(...)   \,
+#define Z_IS_3034U_EQ_3034(...)  \,
+#define Z_IS_3034_EQ_3034U(...)  \,
+#define Z_IS_3034U_EQ_3034U(...) \,
+#define Z_IS_3035_EQ_3035(...)   \,
+#define Z_IS_3035U_EQ_3035(...)  \,
+#define Z_IS_3035_EQ_3035U(...)  \,
+#define Z_IS_3035U_EQ_3035U(...) \,
+#define Z_IS_3036_EQ_3036(...)   \,
+#define Z_IS_3036U_EQ_3036(...)  \,
+#define Z_IS_3036_EQ_3036U(...)  \,
+#define Z_IS_3036U_EQ_3036U(...) \,
+#define Z_IS_3037_EQ_3037(...)   \,
+#define Z_IS_3037U_EQ_3037(...)  \,
+#define Z_IS_3037_EQ_3037U(...)  \,
+#define Z_IS_3037U_EQ_3037U(...) \,
+#define Z_IS_3038_EQ_3038(...)   \,
+#define Z_IS_3038U_EQ_3038(...)  \,
+#define Z_IS_3038_EQ_3038U(...)  \,
+#define Z_IS_3038U_EQ_3038U(...) \,
+#define Z_IS_3039_EQ_3039(...)   \,
+#define Z_IS_3039U_EQ_3039(...)  \,
+#define Z_IS_3039_EQ_3039U(...)  \,
+#define Z_IS_3039U_EQ_3039U(...) \,
+#define Z_IS_3040_EQ_3040(...)   \,
+#define Z_IS_3040U_EQ_3040(...)  \,
+#define Z_IS_3040_EQ_3040U(...)  \,
+#define Z_IS_3040U_EQ_3040U(...) \,
+#define Z_IS_3041_EQ_3041(...)   \,
+#define Z_IS_3041U_EQ_3041(...)  \,
+#define Z_IS_3041_EQ_3041U(...)  \,
+#define Z_IS_3041U_EQ_3041U(...) \,
+#define Z_IS_3042_EQ_3042(...)   \,
+#define Z_IS_3042U_EQ_3042(...)  \,
+#define Z_IS_3042_EQ_3042U(...)  \,
+#define Z_IS_3042U_EQ_3042U(...) \,
+#define Z_IS_3043_EQ_3043(...)   \,
+#define Z_IS_3043U_EQ_3043(...)  \,
+#define Z_IS_3043_EQ_3043U(...)  \,
+#define Z_IS_3043U_EQ_3043U(...) \,
+#define Z_IS_3044_EQ_3044(...)   \,
+#define Z_IS_3044U_EQ_3044(...)  \,
+#define Z_IS_3044_EQ_3044U(...)  \,
+#define Z_IS_3044U_EQ_3044U(...) \,
+#define Z_IS_3045_EQ_3045(...)   \,
+#define Z_IS_3045U_EQ_3045(...)  \,
+#define Z_IS_3045_EQ_3045U(...)  \,
+#define Z_IS_3045U_EQ_3045U(...) \,
+#define Z_IS_3046_EQ_3046(...)   \,
+#define Z_IS_3046U_EQ_3046(...)  \,
+#define Z_IS_3046_EQ_3046U(...)  \,
+#define Z_IS_3046U_EQ_3046U(...) \,
+#define Z_IS_3047_EQ_3047(...)   \,
+#define Z_IS_3047U_EQ_3047(...)  \,
+#define Z_IS_3047_EQ_3047U(...)  \,
+#define Z_IS_3047U_EQ_3047U(...) \,
+#define Z_IS_3048_EQ_3048(...)   \,
+#define Z_IS_3048U_EQ_3048(...)  \,
+#define Z_IS_3048_EQ_3048U(...)  \,
+#define Z_IS_3048U_EQ_3048U(...) \,
+#define Z_IS_3049_EQ_3049(...)   \,
+#define Z_IS_3049U_EQ_3049(...)  \,
+#define Z_IS_3049_EQ_3049U(...)  \,
+#define Z_IS_3049U_EQ_3049U(...) \,
+#define Z_IS_3050_EQ_3050(...)   \,
+#define Z_IS_3050U_EQ_3050(...)  \,
+#define Z_IS_3050_EQ_3050U(...)  \,
+#define Z_IS_3050U_EQ_3050U(...) \,
+#define Z_IS_3051_EQ_3051(...)   \,
+#define Z_IS_3051U_EQ_3051(...)  \,
+#define Z_IS_3051_EQ_3051U(...)  \,
+#define Z_IS_3051U_EQ_3051U(...) \,
+#define Z_IS_3052_EQ_3052(...)   \,
+#define Z_IS_3052U_EQ_3052(...)  \,
+#define Z_IS_3052_EQ_3052U(...)  \,
+#define Z_IS_3052U_EQ_3052U(...) \,
+#define Z_IS_3053_EQ_3053(...)   \,
+#define Z_IS_3053U_EQ_3053(...)  \,
+#define Z_IS_3053_EQ_3053U(...)  \,
+#define Z_IS_3053U_EQ_3053U(...) \,
+#define Z_IS_3054_EQ_3054(...)   \,
+#define Z_IS_3054U_EQ_3054(...)  \,
+#define Z_IS_3054_EQ_3054U(...)  \,
+#define Z_IS_3054U_EQ_3054U(...) \,
+#define Z_IS_3055_EQ_3055(...)   \,
+#define Z_IS_3055U_EQ_3055(...)  \,
+#define Z_IS_3055_EQ_3055U(...)  \,
+#define Z_IS_3055U_EQ_3055U(...) \,
+#define Z_IS_3056_EQ_3056(...)   \,
+#define Z_IS_3056U_EQ_3056(...)  \,
+#define Z_IS_3056_EQ_3056U(...)  \,
+#define Z_IS_3056U_EQ_3056U(...) \,
+#define Z_IS_3057_EQ_3057(...)   \,
+#define Z_IS_3057U_EQ_3057(...)  \,
+#define Z_IS_3057_EQ_3057U(...)  \,
+#define Z_IS_3057U_EQ_3057U(...) \,
+#define Z_IS_3058_EQ_3058(...)   \,
+#define Z_IS_3058U_EQ_3058(...)  \,
+#define Z_IS_3058_EQ_3058U(...)  \,
+#define Z_IS_3058U_EQ_3058U(...) \,
+#define Z_IS_3059_EQ_3059(...)   \,
+#define Z_IS_3059U_EQ_3059(...)  \,
+#define Z_IS_3059_EQ_3059U(...)  \,
+#define Z_IS_3059U_EQ_3059U(...) \,
+#define Z_IS_3060_EQ_3060(...)   \,
+#define Z_IS_3060U_EQ_3060(...)  \,
+#define Z_IS_3060_EQ_3060U(...)  \,
+#define Z_IS_3060U_EQ_3060U(...) \,
+#define Z_IS_3061_EQ_3061(...)   \,
+#define Z_IS_3061U_EQ_3061(...)  \,
+#define Z_IS_3061_EQ_3061U(...)  \,
+#define Z_IS_3061U_EQ_3061U(...) \,
+#define Z_IS_3062_EQ_3062(...)   \,
+#define Z_IS_3062U_EQ_3062(...)  \,
+#define Z_IS_3062_EQ_3062U(...)  \,
+#define Z_IS_3062U_EQ_3062U(...) \,
+#define Z_IS_3063_EQ_3063(...)   \,
+#define Z_IS_3063U_EQ_3063(...)  \,
+#define Z_IS_3063_EQ_3063U(...)  \,
+#define Z_IS_3063U_EQ_3063U(...) \,
+#define Z_IS_3064_EQ_3064(...)   \,
+#define Z_IS_3064U_EQ_3064(...)  \,
+#define Z_IS_3064_EQ_3064U(...)  \,
+#define Z_IS_3064U_EQ_3064U(...) \,
+#define Z_IS_3065_EQ_3065(...)   \,
+#define Z_IS_3065U_EQ_3065(...)  \,
+#define Z_IS_3065_EQ_3065U(...)  \,
+#define Z_IS_3065U_EQ_3065U(...) \,
+#define Z_IS_3066_EQ_3066(...)   \,
+#define Z_IS_3066U_EQ_3066(...)  \,
+#define Z_IS_3066_EQ_3066U(...)  \,
+#define Z_IS_3066U_EQ_3066U(...) \,
+#define Z_IS_3067_EQ_3067(...)   \,
+#define Z_IS_3067U_EQ_3067(...)  \,
+#define Z_IS_3067_EQ_3067U(...)  \,
+#define Z_IS_3067U_EQ_3067U(...) \,
+#define Z_IS_3068_EQ_3068(...)   \,
+#define Z_IS_3068U_EQ_3068(...)  \,
+#define Z_IS_3068_EQ_3068U(...)  \,
+#define Z_IS_3068U_EQ_3068U(...) \,
+#define Z_IS_3069_EQ_3069(...)   \,
+#define Z_IS_3069U_EQ_3069(...)  \,
+#define Z_IS_3069_EQ_3069U(...)  \,
+#define Z_IS_3069U_EQ_3069U(...) \,
+#define Z_IS_3070_EQ_3070(...)   \,
+#define Z_IS_3070U_EQ_3070(...)  \,
+#define Z_IS_3070_EQ_3070U(...)  \,
+#define Z_IS_3070U_EQ_3070U(...) \,
+#define Z_IS_3071_EQ_3071(...)   \,
+#define Z_IS_3071U_EQ_3071(...)  \,
+#define Z_IS_3071_EQ_3071U(...)  \,
+#define Z_IS_3071U_EQ_3071U(...) \,
+#define Z_IS_3072_EQ_3072(...)   \,
+#define Z_IS_3072U_EQ_3072(...)  \,
+#define Z_IS_3072_EQ_3072U(...)  \,
+#define Z_IS_3072U_EQ_3072U(...) \,
+#define Z_IS_3073_EQ_3073(...)   \,
+#define Z_IS_3073U_EQ_3073(...)  \,
+#define Z_IS_3073_EQ_3073U(...)  \,
+#define Z_IS_3073U_EQ_3073U(...) \,
+#define Z_IS_3074_EQ_3074(...)   \,
+#define Z_IS_3074U_EQ_3074(...)  \,
+#define Z_IS_3074_EQ_3074U(...)  \,
+#define Z_IS_3074U_EQ_3074U(...) \,
+#define Z_IS_3075_EQ_3075(...)   \,
+#define Z_IS_3075U_EQ_3075(...)  \,
+#define Z_IS_3075_EQ_3075U(...)  \,
+#define Z_IS_3075U_EQ_3075U(...) \,
+#define Z_IS_3076_EQ_3076(...)   \,
+#define Z_IS_3076U_EQ_3076(...)  \,
+#define Z_IS_3076_EQ_3076U(...)  \,
+#define Z_IS_3076U_EQ_3076U(...) \,
+#define Z_IS_3077_EQ_3077(...)   \,
+#define Z_IS_3077U_EQ_3077(...)  \,
+#define Z_IS_3077_EQ_3077U(...)  \,
+#define Z_IS_3077U_EQ_3077U(...) \,
+#define Z_IS_3078_EQ_3078(...)   \,
+#define Z_IS_3078U_EQ_3078(...)  \,
+#define Z_IS_3078_EQ_3078U(...)  \,
+#define Z_IS_3078U_EQ_3078U(...) \,
+#define Z_IS_3079_EQ_3079(...)   \,
+#define Z_IS_3079U_EQ_3079(...)  \,
+#define Z_IS_3079_EQ_3079U(...)  \,
+#define Z_IS_3079U_EQ_3079U(...) \,
+#define Z_IS_3080_EQ_3080(...)   \,
+#define Z_IS_3080U_EQ_3080(...)  \,
+#define Z_IS_3080_EQ_3080U(...)  \,
+#define Z_IS_3080U_EQ_3080U(...) \,
+#define Z_IS_3081_EQ_3081(...)   \,
+#define Z_IS_3081U_EQ_3081(...)  \,
+#define Z_IS_3081_EQ_3081U(...)  \,
+#define Z_IS_3081U_EQ_3081U(...) \,
+#define Z_IS_3082_EQ_3082(...)   \,
+#define Z_IS_3082U_EQ_3082(...)  \,
+#define Z_IS_3082_EQ_3082U(...)  \,
+#define Z_IS_3082U_EQ_3082U(...) \,
+#define Z_IS_3083_EQ_3083(...)   \,
+#define Z_IS_3083U_EQ_3083(...)  \,
+#define Z_IS_3083_EQ_3083U(...)  \,
+#define Z_IS_3083U_EQ_3083U(...) \,
+#define Z_IS_3084_EQ_3084(...)   \,
+#define Z_IS_3084U_EQ_3084(...)  \,
+#define Z_IS_3084_EQ_3084U(...)  \,
+#define Z_IS_3084U_EQ_3084U(...) \,
+#define Z_IS_3085_EQ_3085(...)   \,
+#define Z_IS_3085U_EQ_3085(...)  \,
+#define Z_IS_3085_EQ_3085U(...)  \,
+#define Z_IS_3085U_EQ_3085U(...) \,
+#define Z_IS_3086_EQ_3086(...)   \,
+#define Z_IS_3086U_EQ_3086(...)  \,
+#define Z_IS_3086_EQ_3086U(...)  \,
+#define Z_IS_3086U_EQ_3086U(...) \,
+#define Z_IS_3087_EQ_3087(...)   \,
+#define Z_IS_3087U_EQ_3087(...)  \,
+#define Z_IS_3087_EQ_3087U(...)  \,
+#define Z_IS_3087U_EQ_3087U(...) \,
+#define Z_IS_3088_EQ_3088(...)   \,
+#define Z_IS_3088U_EQ_3088(...)  \,
+#define Z_IS_3088_EQ_3088U(...)  \,
+#define Z_IS_3088U_EQ_3088U(...) \,
+#define Z_IS_3089_EQ_3089(...)   \,
+#define Z_IS_3089U_EQ_3089(...)  \,
+#define Z_IS_3089_EQ_3089U(...)  \,
+#define Z_IS_3089U_EQ_3089U(...) \,
+#define Z_IS_3090_EQ_3090(...)   \,
+#define Z_IS_3090U_EQ_3090(...)  \,
+#define Z_IS_3090_EQ_3090U(...)  \,
+#define Z_IS_3090U_EQ_3090U(...) \,
+#define Z_IS_3091_EQ_3091(...)   \,
+#define Z_IS_3091U_EQ_3091(...)  \,
+#define Z_IS_3091_EQ_3091U(...)  \,
+#define Z_IS_3091U_EQ_3091U(...) \,
+#define Z_IS_3092_EQ_3092(...)   \,
+#define Z_IS_3092U_EQ_3092(...)  \,
+#define Z_IS_3092_EQ_3092U(...)  \,
+#define Z_IS_3092U_EQ_3092U(...) \,
+#define Z_IS_3093_EQ_3093(...)   \,
+#define Z_IS_3093U_EQ_3093(...)  \,
+#define Z_IS_3093_EQ_3093U(...)  \,
+#define Z_IS_3093U_EQ_3093U(...) \,
+#define Z_IS_3094_EQ_3094(...)   \,
+#define Z_IS_3094U_EQ_3094(...)  \,
+#define Z_IS_3094_EQ_3094U(...)  \,
+#define Z_IS_3094U_EQ_3094U(...) \,
+#define Z_IS_3095_EQ_3095(...)   \,
+#define Z_IS_3095U_EQ_3095(...)  \,
+#define Z_IS_3095_EQ_3095U(...)  \,
+#define Z_IS_3095U_EQ_3095U(...) \,
+#define Z_IS_3096_EQ_3096(...)   \,
+#define Z_IS_3096U_EQ_3096(...)  \,
+#define Z_IS_3096_EQ_3096U(...)  \,
+#define Z_IS_3096U_EQ_3096U(...) \,
+#define Z_IS_3097_EQ_3097(...)   \,
+#define Z_IS_3097U_EQ_3097(...)  \,
+#define Z_IS_3097_EQ_3097U(...)  \,
+#define Z_IS_3097U_EQ_3097U(...) \,
+#define Z_IS_3098_EQ_3098(...)   \,
+#define Z_IS_3098U_EQ_3098(...)  \,
+#define Z_IS_3098_EQ_3098U(...)  \,
+#define Z_IS_3098U_EQ_3098U(...) \,
+#define Z_IS_3099_EQ_3099(...)   \,
+#define Z_IS_3099U_EQ_3099(...)  \,
+#define Z_IS_3099_EQ_3099U(...)  \,
+#define Z_IS_3099U_EQ_3099U(...) \,
+#define Z_IS_3100_EQ_3100(...)   \,
+#define Z_IS_3100U_EQ_3100(...)  \,
+#define Z_IS_3100_EQ_3100U(...)  \,
+#define Z_IS_3100U_EQ_3100U(...) \,
+#define Z_IS_3101_EQ_3101(...)   \,
+#define Z_IS_3101U_EQ_3101(...)  \,
+#define Z_IS_3101_EQ_3101U(...)  \,
+#define Z_IS_3101U_EQ_3101U(...) \,
+#define Z_IS_3102_EQ_3102(...)   \,
+#define Z_IS_3102U_EQ_3102(...)  \,
+#define Z_IS_3102_EQ_3102U(...)  \,
+#define Z_IS_3102U_EQ_3102U(...) \,
+#define Z_IS_3103_EQ_3103(...)   \,
+#define Z_IS_3103U_EQ_3103(...)  \,
+#define Z_IS_3103_EQ_3103U(...)  \,
+#define Z_IS_3103U_EQ_3103U(...) \,
+#define Z_IS_3104_EQ_3104(...)   \,
+#define Z_IS_3104U_EQ_3104(...)  \,
+#define Z_IS_3104_EQ_3104U(...)  \,
+#define Z_IS_3104U_EQ_3104U(...) \,
+#define Z_IS_3105_EQ_3105(...)   \,
+#define Z_IS_3105U_EQ_3105(...)  \,
+#define Z_IS_3105_EQ_3105U(...)  \,
+#define Z_IS_3105U_EQ_3105U(...) \,
+#define Z_IS_3106_EQ_3106(...)   \,
+#define Z_IS_3106U_EQ_3106(...)  \,
+#define Z_IS_3106_EQ_3106U(...)  \,
+#define Z_IS_3106U_EQ_3106U(...) \,
+#define Z_IS_3107_EQ_3107(...)   \,
+#define Z_IS_3107U_EQ_3107(...)  \,
+#define Z_IS_3107_EQ_3107U(...)  \,
+#define Z_IS_3107U_EQ_3107U(...) \,
+#define Z_IS_3108_EQ_3108(...)   \,
+#define Z_IS_3108U_EQ_3108(...)  \,
+#define Z_IS_3108_EQ_3108U(...)  \,
+#define Z_IS_3108U_EQ_3108U(...) \,
+#define Z_IS_3109_EQ_3109(...)   \,
+#define Z_IS_3109U_EQ_3109(...)  \,
+#define Z_IS_3109_EQ_3109U(...)  \,
+#define Z_IS_3109U_EQ_3109U(...) \,
+#define Z_IS_3110_EQ_3110(...)   \,
+#define Z_IS_3110U_EQ_3110(...)  \,
+#define Z_IS_3110_EQ_3110U(...)  \,
+#define Z_IS_3110U_EQ_3110U(...) \,
+#define Z_IS_3111_EQ_3111(...)   \,
+#define Z_IS_3111U_EQ_3111(...)  \,
+#define Z_IS_3111_EQ_3111U(...)  \,
+#define Z_IS_3111U_EQ_3111U(...) \,
+#define Z_IS_3112_EQ_3112(...)   \,
+#define Z_IS_3112U_EQ_3112(...)  \,
+#define Z_IS_3112_EQ_3112U(...)  \,
+#define Z_IS_3112U_EQ_3112U(...) \,
+#define Z_IS_3113_EQ_3113(...)   \,
+#define Z_IS_3113U_EQ_3113(...)  \,
+#define Z_IS_3113_EQ_3113U(...)  \,
+#define Z_IS_3113U_EQ_3113U(...) \,
+#define Z_IS_3114_EQ_3114(...)   \,
+#define Z_IS_3114U_EQ_3114(...)  \,
+#define Z_IS_3114_EQ_3114U(...)  \,
+#define Z_IS_3114U_EQ_3114U(...) \,
+#define Z_IS_3115_EQ_3115(...)   \,
+#define Z_IS_3115U_EQ_3115(...)  \,
+#define Z_IS_3115_EQ_3115U(...)  \,
+#define Z_IS_3115U_EQ_3115U(...) \,
+#define Z_IS_3116_EQ_3116(...)   \,
+#define Z_IS_3116U_EQ_3116(...)  \,
+#define Z_IS_3116_EQ_3116U(...)  \,
+#define Z_IS_3116U_EQ_3116U(...) \,
+#define Z_IS_3117_EQ_3117(...)   \,
+#define Z_IS_3117U_EQ_3117(...)  \,
+#define Z_IS_3117_EQ_3117U(...)  \,
+#define Z_IS_3117U_EQ_3117U(...) \,
+#define Z_IS_3118_EQ_3118(...)   \,
+#define Z_IS_3118U_EQ_3118(...)  \,
+#define Z_IS_3118_EQ_3118U(...)  \,
+#define Z_IS_3118U_EQ_3118U(...) \,
+#define Z_IS_3119_EQ_3119(...)   \,
+#define Z_IS_3119U_EQ_3119(...)  \,
+#define Z_IS_3119_EQ_3119U(...)  \,
+#define Z_IS_3119U_EQ_3119U(...) \,
+#define Z_IS_3120_EQ_3120(...)   \,
+#define Z_IS_3120U_EQ_3120(...)  \,
+#define Z_IS_3120_EQ_3120U(...)  \,
+#define Z_IS_3120U_EQ_3120U(...) \,
+#define Z_IS_3121_EQ_3121(...)   \,
+#define Z_IS_3121U_EQ_3121(...)  \,
+#define Z_IS_3121_EQ_3121U(...)  \,
+#define Z_IS_3121U_EQ_3121U(...) \,
+#define Z_IS_3122_EQ_3122(...)   \,
+#define Z_IS_3122U_EQ_3122(...)  \,
+#define Z_IS_3122_EQ_3122U(...)  \,
+#define Z_IS_3122U_EQ_3122U(...) \,
+#define Z_IS_3123_EQ_3123(...)   \,
+#define Z_IS_3123U_EQ_3123(...)  \,
+#define Z_IS_3123_EQ_3123U(...)  \,
+#define Z_IS_3123U_EQ_3123U(...) \,
+#define Z_IS_3124_EQ_3124(...)   \,
+#define Z_IS_3124U_EQ_3124(...)  \,
+#define Z_IS_3124_EQ_3124U(...)  \,
+#define Z_IS_3124U_EQ_3124U(...) \,
+#define Z_IS_3125_EQ_3125(...)   \,
+#define Z_IS_3125U_EQ_3125(...)  \,
+#define Z_IS_3125_EQ_3125U(...)  \,
+#define Z_IS_3125U_EQ_3125U(...) \,
+#define Z_IS_3126_EQ_3126(...)   \,
+#define Z_IS_3126U_EQ_3126(...)  \,
+#define Z_IS_3126_EQ_3126U(...)  \,
+#define Z_IS_3126U_EQ_3126U(...) \,
+#define Z_IS_3127_EQ_3127(...)   \,
+#define Z_IS_3127U_EQ_3127(...)  \,
+#define Z_IS_3127_EQ_3127U(...)  \,
+#define Z_IS_3127U_EQ_3127U(...) \,
+#define Z_IS_3128_EQ_3128(...)   \,
+#define Z_IS_3128U_EQ_3128(...)  \,
+#define Z_IS_3128_EQ_3128U(...)  \,
+#define Z_IS_3128U_EQ_3128U(...) \,
+#define Z_IS_3129_EQ_3129(...)   \,
+#define Z_IS_3129U_EQ_3129(...)  \,
+#define Z_IS_3129_EQ_3129U(...)  \,
+#define Z_IS_3129U_EQ_3129U(...) \,
+#define Z_IS_3130_EQ_3130(...)   \,
+#define Z_IS_3130U_EQ_3130(...)  \,
+#define Z_IS_3130_EQ_3130U(...)  \,
+#define Z_IS_3130U_EQ_3130U(...) \,
+#define Z_IS_3131_EQ_3131(...)   \,
+#define Z_IS_3131U_EQ_3131(...)  \,
+#define Z_IS_3131_EQ_3131U(...)  \,
+#define Z_IS_3131U_EQ_3131U(...) \,
+#define Z_IS_3132_EQ_3132(...)   \,
+#define Z_IS_3132U_EQ_3132(...)  \,
+#define Z_IS_3132_EQ_3132U(...)  \,
+#define Z_IS_3132U_EQ_3132U(...) \,
+#define Z_IS_3133_EQ_3133(...)   \,
+#define Z_IS_3133U_EQ_3133(...)  \,
+#define Z_IS_3133_EQ_3133U(...)  \,
+#define Z_IS_3133U_EQ_3133U(...) \,
+#define Z_IS_3134_EQ_3134(...)   \,
+#define Z_IS_3134U_EQ_3134(...)  \,
+#define Z_IS_3134_EQ_3134U(...)  \,
+#define Z_IS_3134U_EQ_3134U(...) \,
+#define Z_IS_3135_EQ_3135(...)   \,
+#define Z_IS_3135U_EQ_3135(...)  \,
+#define Z_IS_3135_EQ_3135U(...)  \,
+#define Z_IS_3135U_EQ_3135U(...) \,
+#define Z_IS_3136_EQ_3136(...)   \,
+#define Z_IS_3136U_EQ_3136(...)  \,
+#define Z_IS_3136_EQ_3136U(...)  \,
+#define Z_IS_3136U_EQ_3136U(...) \,
+#define Z_IS_3137_EQ_3137(...)   \,
+#define Z_IS_3137U_EQ_3137(...)  \,
+#define Z_IS_3137_EQ_3137U(...)  \,
+#define Z_IS_3137U_EQ_3137U(...) \,
+#define Z_IS_3138_EQ_3138(...)   \,
+#define Z_IS_3138U_EQ_3138(...)  \,
+#define Z_IS_3138_EQ_3138U(...)  \,
+#define Z_IS_3138U_EQ_3138U(...) \,
+#define Z_IS_3139_EQ_3139(...)   \,
+#define Z_IS_3139U_EQ_3139(...)  \,
+#define Z_IS_3139_EQ_3139U(...)  \,
+#define Z_IS_3139U_EQ_3139U(...) \,
+#define Z_IS_3140_EQ_3140(...)   \,
+#define Z_IS_3140U_EQ_3140(...)  \,
+#define Z_IS_3140_EQ_3140U(...)  \,
+#define Z_IS_3140U_EQ_3140U(...) \,
+#define Z_IS_3141_EQ_3141(...)   \,
+#define Z_IS_3141U_EQ_3141(...)  \,
+#define Z_IS_3141_EQ_3141U(...)  \,
+#define Z_IS_3141U_EQ_3141U(...) \,
+#define Z_IS_3142_EQ_3142(...)   \,
+#define Z_IS_3142U_EQ_3142(...)  \,
+#define Z_IS_3142_EQ_3142U(...)  \,
+#define Z_IS_3142U_EQ_3142U(...) \,
+#define Z_IS_3143_EQ_3143(...)   \,
+#define Z_IS_3143U_EQ_3143(...)  \,
+#define Z_IS_3143_EQ_3143U(...)  \,
+#define Z_IS_3143U_EQ_3143U(...) \,
+#define Z_IS_3144_EQ_3144(...)   \,
+#define Z_IS_3144U_EQ_3144(...)  \,
+#define Z_IS_3144_EQ_3144U(...)  \,
+#define Z_IS_3144U_EQ_3144U(...) \,
+#define Z_IS_3145_EQ_3145(...)   \,
+#define Z_IS_3145U_EQ_3145(...)  \,
+#define Z_IS_3145_EQ_3145U(...)  \,
+#define Z_IS_3145U_EQ_3145U(...) \,
+#define Z_IS_3146_EQ_3146(...)   \,
+#define Z_IS_3146U_EQ_3146(...)  \,
+#define Z_IS_3146_EQ_3146U(...)  \,
+#define Z_IS_3146U_EQ_3146U(...) \,
+#define Z_IS_3147_EQ_3147(...)   \,
+#define Z_IS_3147U_EQ_3147(...)  \,
+#define Z_IS_3147_EQ_3147U(...)  \,
+#define Z_IS_3147U_EQ_3147U(...) \,
+#define Z_IS_3148_EQ_3148(...)   \,
+#define Z_IS_3148U_EQ_3148(...)  \,
+#define Z_IS_3148_EQ_3148U(...)  \,
+#define Z_IS_3148U_EQ_3148U(...) \,
+#define Z_IS_3149_EQ_3149(...)   \,
+#define Z_IS_3149U_EQ_3149(...)  \,
+#define Z_IS_3149_EQ_3149U(...)  \,
+#define Z_IS_3149U_EQ_3149U(...) \,
+#define Z_IS_3150_EQ_3150(...)   \,
+#define Z_IS_3150U_EQ_3150(...)  \,
+#define Z_IS_3150_EQ_3150U(...)  \,
+#define Z_IS_3150U_EQ_3150U(...) \,
+#define Z_IS_3151_EQ_3151(...)   \,
+#define Z_IS_3151U_EQ_3151(...)  \,
+#define Z_IS_3151_EQ_3151U(...)  \,
+#define Z_IS_3151U_EQ_3151U(...) \,
+#define Z_IS_3152_EQ_3152(...)   \,
+#define Z_IS_3152U_EQ_3152(...)  \,
+#define Z_IS_3152_EQ_3152U(...)  \,
+#define Z_IS_3152U_EQ_3152U(...) \,
+#define Z_IS_3153_EQ_3153(...)   \,
+#define Z_IS_3153U_EQ_3153(...)  \,
+#define Z_IS_3153_EQ_3153U(...)  \,
+#define Z_IS_3153U_EQ_3153U(...) \,
+#define Z_IS_3154_EQ_3154(...)   \,
+#define Z_IS_3154U_EQ_3154(...)  \,
+#define Z_IS_3154_EQ_3154U(...)  \,
+#define Z_IS_3154U_EQ_3154U(...) \,
+#define Z_IS_3155_EQ_3155(...)   \,
+#define Z_IS_3155U_EQ_3155(...)  \,
+#define Z_IS_3155_EQ_3155U(...)  \,
+#define Z_IS_3155U_EQ_3155U(...) \,
+#define Z_IS_3156_EQ_3156(...)   \,
+#define Z_IS_3156U_EQ_3156(...)  \,
+#define Z_IS_3156_EQ_3156U(...)  \,
+#define Z_IS_3156U_EQ_3156U(...) \,
+#define Z_IS_3157_EQ_3157(...)   \,
+#define Z_IS_3157U_EQ_3157(...)  \,
+#define Z_IS_3157_EQ_3157U(...)  \,
+#define Z_IS_3157U_EQ_3157U(...) \,
+#define Z_IS_3158_EQ_3158(...)   \,
+#define Z_IS_3158U_EQ_3158(...)  \,
+#define Z_IS_3158_EQ_3158U(...)  \,
+#define Z_IS_3158U_EQ_3158U(...) \,
+#define Z_IS_3159_EQ_3159(...)   \,
+#define Z_IS_3159U_EQ_3159(...)  \,
+#define Z_IS_3159_EQ_3159U(...)  \,
+#define Z_IS_3159U_EQ_3159U(...) \,
+#define Z_IS_3160_EQ_3160(...)   \,
+#define Z_IS_3160U_EQ_3160(...)  \,
+#define Z_IS_3160_EQ_3160U(...)  \,
+#define Z_IS_3160U_EQ_3160U(...) \,
+#define Z_IS_3161_EQ_3161(...)   \,
+#define Z_IS_3161U_EQ_3161(...)  \,
+#define Z_IS_3161_EQ_3161U(...)  \,
+#define Z_IS_3161U_EQ_3161U(...) \,
+#define Z_IS_3162_EQ_3162(...)   \,
+#define Z_IS_3162U_EQ_3162(...)  \,
+#define Z_IS_3162_EQ_3162U(...)  \,
+#define Z_IS_3162U_EQ_3162U(...) \,
+#define Z_IS_3163_EQ_3163(...)   \,
+#define Z_IS_3163U_EQ_3163(...)  \,
+#define Z_IS_3163_EQ_3163U(...)  \,
+#define Z_IS_3163U_EQ_3163U(...) \,
+#define Z_IS_3164_EQ_3164(...)   \,
+#define Z_IS_3164U_EQ_3164(...)  \,
+#define Z_IS_3164_EQ_3164U(...)  \,
+#define Z_IS_3164U_EQ_3164U(...) \,
+#define Z_IS_3165_EQ_3165(...)   \,
+#define Z_IS_3165U_EQ_3165(...)  \,
+#define Z_IS_3165_EQ_3165U(...)  \,
+#define Z_IS_3165U_EQ_3165U(...) \,
+#define Z_IS_3166_EQ_3166(...)   \,
+#define Z_IS_3166U_EQ_3166(...)  \,
+#define Z_IS_3166_EQ_3166U(...)  \,
+#define Z_IS_3166U_EQ_3166U(...) \,
+#define Z_IS_3167_EQ_3167(...)   \,
+#define Z_IS_3167U_EQ_3167(...)  \,
+#define Z_IS_3167_EQ_3167U(...)  \,
+#define Z_IS_3167U_EQ_3167U(...) \,
+#define Z_IS_3168_EQ_3168(...)   \,
+#define Z_IS_3168U_EQ_3168(...)  \,
+#define Z_IS_3168_EQ_3168U(...)  \,
+#define Z_IS_3168U_EQ_3168U(...) \,
+#define Z_IS_3169_EQ_3169(...)   \,
+#define Z_IS_3169U_EQ_3169(...)  \,
+#define Z_IS_3169_EQ_3169U(...)  \,
+#define Z_IS_3169U_EQ_3169U(...) \,
+#define Z_IS_3170_EQ_3170(...)   \,
+#define Z_IS_3170U_EQ_3170(...)  \,
+#define Z_IS_3170_EQ_3170U(...)  \,
+#define Z_IS_3170U_EQ_3170U(...) \,
+#define Z_IS_3171_EQ_3171(...)   \,
+#define Z_IS_3171U_EQ_3171(...)  \,
+#define Z_IS_3171_EQ_3171U(...)  \,
+#define Z_IS_3171U_EQ_3171U(...) \,
+#define Z_IS_3172_EQ_3172(...)   \,
+#define Z_IS_3172U_EQ_3172(...)  \,
+#define Z_IS_3172_EQ_3172U(...)  \,
+#define Z_IS_3172U_EQ_3172U(...) \,
+#define Z_IS_3173_EQ_3173(...)   \,
+#define Z_IS_3173U_EQ_3173(...)  \,
+#define Z_IS_3173_EQ_3173U(...)  \,
+#define Z_IS_3173U_EQ_3173U(...) \,
+#define Z_IS_3174_EQ_3174(...)   \,
+#define Z_IS_3174U_EQ_3174(...)  \,
+#define Z_IS_3174_EQ_3174U(...)  \,
+#define Z_IS_3174U_EQ_3174U(...) \,
+#define Z_IS_3175_EQ_3175(...)   \,
+#define Z_IS_3175U_EQ_3175(...)  \,
+#define Z_IS_3175_EQ_3175U(...)  \,
+#define Z_IS_3175U_EQ_3175U(...) \,
+#define Z_IS_3176_EQ_3176(...)   \,
+#define Z_IS_3176U_EQ_3176(...)  \,
+#define Z_IS_3176_EQ_3176U(...)  \,
+#define Z_IS_3176U_EQ_3176U(...) \,
+#define Z_IS_3177_EQ_3177(...)   \,
+#define Z_IS_3177U_EQ_3177(...)  \,
+#define Z_IS_3177_EQ_3177U(...)  \,
+#define Z_IS_3177U_EQ_3177U(...) \,
+#define Z_IS_3178_EQ_3178(...)   \,
+#define Z_IS_3178U_EQ_3178(...)  \,
+#define Z_IS_3178_EQ_3178U(...)  \,
+#define Z_IS_3178U_EQ_3178U(...) \,
+#define Z_IS_3179_EQ_3179(...)   \,
+#define Z_IS_3179U_EQ_3179(...)  \,
+#define Z_IS_3179_EQ_3179U(...)  \,
+#define Z_IS_3179U_EQ_3179U(...) \,
+#define Z_IS_3180_EQ_3180(...)   \,
+#define Z_IS_3180U_EQ_3180(...)  \,
+#define Z_IS_3180_EQ_3180U(...)  \,
+#define Z_IS_3180U_EQ_3180U(...) \,
+#define Z_IS_3181_EQ_3181(...)   \,
+#define Z_IS_3181U_EQ_3181(...)  \,
+#define Z_IS_3181_EQ_3181U(...)  \,
+#define Z_IS_3181U_EQ_3181U(...) \,
+#define Z_IS_3182_EQ_3182(...)   \,
+#define Z_IS_3182U_EQ_3182(...)  \,
+#define Z_IS_3182_EQ_3182U(...)  \,
+#define Z_IS_3182U_EQ_3182U(...) \,
+#define Z_IS_3183_EQ_3183(...)   \,
+#define Z_IS_3183U_EQ_3183(...)  \,
+#define Z_IS_3183_EQ_3183U(...)  \,
+#define Z_IS_3183U_EQ_3183U(...) \,
+#define Z_IS_3184_EQ_3184(...)   \,
+#define Z_IS_3184U_EQ_3184(...)  \,
+#define Z_IS_3184_EQ_3184U(...)  \,
+#define Z_IS_3184U_EQ_3184U(...) \,
+#define Z_IS_3185_EQ_3185(...)   \,
+#define Z_IS_3185U_EQ_3185(...)  \,
+#define Z_IS_3185_EQ_3185U(...)  \,
+#define Z_IS_3185U_EQ_3185U(...) \,
+#define Z_IS_3186_EQ_3186(...)   \,
+#define Z_IS_3186U_EQ_3186(...)  \,
+#define Z_IS_3186_EQ_3186U(...)  \,
+#define Z_IS_3186U_EQ_3186U(...) \,
+#define Z_IS_3187_EQ_3187(...)   \,
+#define Z_IS_3187U_EQ_3187(...)  \,
+#define Z_IS_3187_EQ_3187U(...)  \,
+#define Z_IS_3187U_EQ_3187U(...) \,
+#define Z_IS_3188_EQ_3188(...)   \,
+#define Z_IS_3188U_EQ_3188(...)  \,
+#define Z_IS_3188_EQ_3188U(...)  \,
+#define Z_IS_3188U_EQ_3188U(...) \,
+#define Z_IS_3189_EQ_3189(...)   \,
+#define Z_IS_3189U_EQ_3189(...)  \,
+#define Z_IS_3189_EQ_3189U(...)  \,
+#define Z_IS_3189U_EQ_3189U(...) \,
+#define Z_IS_3190_EQ_3190(...)   \,
+#define Z_IS_3190U_EQ_3190(...)  \,
+#define Z_IS_3190_EQ_3190U(...)  \,
+#define Z_IS_3190U_EQ_3190U(...) \,
+#define Z_IS_3191_EQ_3191(...)   \,
+#define Z_IS_3191U_EQ_3191(...)  \,
+#define Z_IS_3191_EQ_3191U(...)  \,
+#define Z_IS_3191U_EQ_3191U(...) \,
+#define Z_IS_3192_EQ_3192(...)   \,
+#define Z_IS_3192U_EQ_3192(...)  \,
+#define Z_IS_3192_EQ_3192U(...)  \,
+#define Z_IS_3192U_EQ_3192U(...) \,
+#define Z_IS_3193_EQ_3193(...)   \,
+#define Z_IS_3193U_EQ_3193(...)  \,
+#define Z_IS_3193_EQ_3193U(...)  \,
+#define Z_IS_3193U_EQ_3193U(...) \,
+#define Z_IS_3194_EQ_3194(...)   \,
+#define Z_IS_3194U_EQ_3194(...)  \,
+#define Z_IS_3194_EQ_3194U(...)  \,
+#define Z_IS_3194U_EQ_3194U(...) \,
+#define Z_IS_3195_EQ_3195(...)   \,
+#define Z_IS_3195U_EQ_3195(...)  \,
+#define Z_IS_3195_EQ_3195U(...)  \,
+#define Z_IS_3195U_EQ_3195U(...) \,
+#define Z_IS_3196_EQ_3196(...)   \,
+#define Z_IS_3196U_EQ_3196(...)  \,
+#define Z_IS_3196_EQ_3196U(...)  \,
+#define Z_IS_3196U_EQ_3196U(...) \,
+#define Z_IS_3197_EQ_3197(...)   \,
+#define Z_IS_3197U_EQ_3197(...)  \,
+#define Z_IS_3197_EQ_3197U(...)  \,
+#define Z_IS_3197U_EQ_3197U(...) \,
+#define Z_IS_3198_EQ_3198(...)   \,
+#define Z_IS_3198U_EQ_3198(...)  \,
+#define Z_IS_3198_EQ_3198U(...)  \,
+#define Z_IS_3198U_EQ_3198U(...) \,
+#define Z_IS_3199_EQ_3199(...)   \,
+#define Z_IS_3199U_EQ_3199(...)  \,
+#define Z_IS_3199_EQ_3199U(...)  \,
+#define Z_IS_3199U_EQ_3199U(...) \,
+#define Z_IS_3200_EQ_3200(...)   \,
+#define Z_IS_3200U_EQ_3200(...)  \,
+#define Z_IS_3200_EQ_3200U(...)  \,
+#define Z_IS_3200U_EQ_3200U(...) \,
+#define Z_IS_3201_EQ_3201(...)   \,
+#define Z_IS_3201U_EQ_3201(...)  \,
+#define Z_IS_3201_EQ_3201U(...)  \,
+#define Z_IS_3201U_EQ_3201U(...) \,
+#define Z_IS_3202_EQ_3202(...)   \,
+#define Z_IS_3202U_EQ_3202(...)  \,
+#define Z_IS_3202_EQ_3202U(...)  \,
+#define Z_IS_3202U_EQ_3202U(...) \,
+#define Z_IS_3203_EQ_3203(...)   \,
+#define Z_IS_3203U_EQ_3203(...)  \,
+#define Z_IS_3203_EQ_3203U(...)  \,
+#define Z_IS_3203U_EQ_3203U(...) \,
+#define Z_IS_3204_EQ_3204(...)   \,
+#define Z_IS_3204U_EQ_3204(...)  \,
+#define Z_IS_3204_EQ_3204U(...)  \,
+#define Z_IS_3204U_EQ_3204U(...) \,
+#define Z_IS_3205_EQ_3205(...)   \,
+#define Z_IS_3205U_EQ_3205(...)  \,
+#define Z_IS_3205_EQ_3205U(...)  \,
+#define Z_IS_3205U_EQ_3205U(...) \,
+#define Z_IS_3206_EQ_3206(...)   \,
+#define Z_IS_3206U_EQ_3206(...)  \,
+#define Z_IS_3206_EQ_3206U(...)  \,
+#define Z_IS_3206U_EQ_3206U(...) \,
+#define Z_IS_3207_EQ_3207(...)   \,
+#define Z_IS_3207U_EQ_3207(...)  \,
+#define Z_IS_3207_EQ_3207U(...)  \,
+#define Z_IS_3207U_EQ_3207U(...) \,
+#define Z_IS_3208_EQ_3208(...)   \,
+#define Z_IS_3208U_EQ_3208(...)  \,
+#define Z_IS_3208_EQ_3208U(...)  \,
+#define Z_IS_3208U_EQ_3208U(...) \,
+#define Z_IS_3209_EQ_3209(...)   \,
+#define Z_IS_3209U_EQ_3209(...)  \,
+#define Z_IS_3209_EQ_3209U(...)  \,
+#define Z_IS_3209U_EQ_3209U(...) \,
+#define Z_IS_3210_EQ_3210(...)   \,
+#define Z_IS_3210U_EQ_3210(...)  \,
+#define Z_IS_3210_EQ_3210U(...)  \,
+#define Z_IS_3210U_EQ_3210U(...) \,
+#define Z_IS_3211_EQ_3211(...)   \,
+#define Z_IS_3211U_EQ_3211(...)  \,
+#define Z_IS_3211_EQ_3211U(...)  \,
+#define Z_IS_3211U_EQ_3211U(...) \,
+#define Z_IS_3212_EQ_3212(...)   \,
+#define Z_IS_3212U_EQ_3212(...)  \,
+#define Z_IS_3212_EQ_3212U(...)  \,
+#define Z_IS_3212U_EQ_3212U(...) \,
+#define Z_IS_3213_EQ_3213(...)   \,
+#define Z_IS_3213U_EQ_3213(...)  \,
+#define Z_IS_3213_EQ_3213U(...)  \,
+#define Z_IS_3213U_EQ_3213U(...) \,
+#define Z_IS_3214_EQ_3214(...)   \,
+#define Z_IS_3214U_EQ_3214(...)  \,
+#define Z_IS_3214_EQ_3214U(...)  \,
+#define Z_IS_3214U_EQ_3214U(...) \,
+#define Z_IS_3215_EQ_3215(...)   \,
+#define Z_IS_3215U_EQ_3215(...)  \,
+#define Z_IS_3215_EQ_3215U(...)  \,
+#define Z_IS_3215U_EQ_3215U(...) \,
+#define Z_IS_3216_EQ_3216(...)   \,
+#define Z_IS_3216U_EQ_3216(...)  \,
+#define Z_IS_3216_EQ_3216U(...)  \,
+#define Z_IS_3216U_EQ_3216U(...) \,
+#define Z_IS_3217_EQ_3217(...)   \,
+#define Z_IS_3217U_EQ_3217(...)  \,
+#define Z_IS_3217_EQ_3217U(...)  \,
+#define Z_IS_3217U_EQ_3217U(...) \,
+#define Z_IS_3218_EQ_3218(...)   \,
+#define Z_IS_3218U_EQ_3218(...)  \,
+#define Z_IS_3218_EQ_3218U(...)  \,
+#define Z_IS_3218U_EQ_3218U(...) \,
+#define Z_IS_3219_EQ_3219(...)   \,
+#define Z_IS_3219U_EQ_3219(...)  \,
+#define Z_IS_3219_EQ_3219U(...)  \,
+#define Z_IS_3219U_EQ_3219U(...) \,
+#define Z_IS_3220_EQ_3220(...)   \,
+#define Z_IS_3220U_EQ_3220(...)  \,
+#define Z_IS_3220_EQ_3220U(...)  \,
+#define Z_IS_3220U_EQ_3220U(...) \,
+#define Z_IS_3221_EQ_3221(...)   \,
+#define Z_IS_3221U_EQ_3221(...)  \,
+#define Z_IS_3221_EQ_3221U(...)  \,
+#define Z_IS_3221U_EQ_3221U(...) \,
+#define Z_IS_3222_EQ_3222(...)   \,
+#define Z_IS_3222U_EQ_3222(...)  \,
+#define Z_IS_3222_EQ_3222U(...)  \,
+#define Z_IS_3222U_EQ_3222U(...) \,
+#define Z_IS_3223_EQ_3223(...)   \,
+#define Z_IS_3223U_EQ_3223(...)  \,
+#define Z_IS_3223_EQ_3223U(...)  \,
+#define Z_IS_3223U_EQ_3223U(...) \,
+#define Z_IS_3224_EQ_3224(...)   \,
+#define Z_IS_3224U_EQ_3224(...)  \,
+#define Z_IS_3224_EQ_3224U(...)  \,
+#define Z_IS_3224U_EQ_3224U(...) \,
+#define Z_IS_3225_EQ_3225(...)   \,
+#define Z_IS_3225U_EQ_3225(...)  \,
+#define Z_IS_3225_EQ_3225U(...)  \,
+#define Z_IS_3225U_EQ_3225U(...) \,
+#define Z_IS_3226_EQ_3226(...)   \,
+#define Z_IS_3226U_EQ_3226(...)  \,
+#define Z_IS_3226_EQ_3226U(...)  \,
+#define Z_IS_3226U_EQ_3226U(...) \,
+#define Z_IS_3227_EQ_3227(...)   \,
+#define Z_IS_3227U_EQ_3227(...)  \,
+#define Z_IS_3227_EQ_3227U(...)  \,
+#define Z_IS_3227U_EQ_3227U(...) \,
+#define Z_IS_3228_EQ_3228(...)   \,
+#define Z_IS_3228U_EQ_3228(...)  \,
+#define Z_IS_3228_EQ_3228U(...)  \,
+#define Z_IS_3228U_EQ_3228U(...) \,
+#define Z_IS_3229_EQ_3229(...)   \,
+#define Z_IS_3229U_EQ_3229(...)  \,
+#define Z_IS_3229_EQ_3229U(...)  \,
+#define Z_IS_3229U_EQ_3229U(...) \,
+#define Z_IS_3230_EQ_3230(...)   \,
+#define Z_IS_3230U_EQ_3230(...)  \,
+#define Z_IS_3230_EQ_3230U(...)  \,
+#define Z_IS_3230U_EQ_3230U(...) \,
+#define Z_IS_3231_EQ_3231(...)   \,
+#define Z_IS_3231U_EQ_3231(...)  \,
+#define Z_IS_3231_EQ_3231U(...)  \,
+#define Z_IS_3231U_EQ_3231U(...) \,
+#define Z_IS_3232_EQ_3232(...)   \,
+#define Z_IS_3232U_EQ_3232(...)  \,
+#define Z_IS_3232_EQ_3232U(...)  \,
+#define Z_IS_3232U_EQ_3232U(...) \,
+#define Z_IS_3233_EQ_3233(...)   \,
+#define Z_IS_3233U_EQ_3233(...)  \,
+#define Z_IS_3233_EQ_3233U(...)  \,
+#define Z_IS_3233U_EQ_3233U(...) \,
+#define Z_IS_3234_EQ_3234(...)   \,
+#define Z_IS_3234U_EQ_3234(...)  \,
+#define Z_IS_3234_EQ_3234U(...)  \,
+#define Z_IS_3234U_EQ_3234U(...) \,
+#define Z_IS_3235_EQ_3235(...)   \,
+#define Z_IS_3235U_EQ_3235(...)  \,
+#define Z_IS_3235_EQ_3235U(...)  \,
+#define Z_IS_3235U_EQ_3235U(...) \,
+#define Z_IS_3236_EQ_3236(...)   \,
+#define Z_IS_3236U_EQ_3236(...)  \,
+#define Z_IS_3236_EQ_3236U(...)  \,
+#define Z_IS_3236U_EQ_3236U(...) \,
+#define Z_IS_3237_EQ_3237(...)   \,
+#define Z_IS_3237U_EQ_3237(...)  \,
+#define Z_IS_3237_EQ_3237U(...)  \,
+#define Z_IS_3237U_EQ_3237U(...) \,
+#define Z_IS_3238_EQ_3238(...)   \,
+#define Z_IS_3238U_EQ_3238(...)  \,
+#define Z_IS_3238_EQ_3238U(...)  \,
+#define Z_IS_3238U_EQ_3238U(...) \,
+#define Z_IS_3239_EQ_3239(...)   \,
+#define Z_IS_3239U_EQ_3239(...)  \,
+#define Z_IS_3239_EQ_3239U(...)  \,
+#define Z_IS_3239U_EQ_3239U(...) \,
+#define Z_IS_3240_EQ_3240(...)   \,
+#define Z_IS_3240U_EQ_3240(...)  \,
+#define Z_IS_3240_EQ_3240U(...)  \,
+#define Z_IS_3240U_EQ_3240U(...) \,
+#define Z_IS_3241_EQ_3241(...)   \,
+#define Z_IS_3241U_EQ_3241(...)  \,
+#define Z_IS_3241_EQ_3241U(...)  \,
+#define Z_IS_3241U_EQ_3241U(...) \,
+#define Z_IS_3242_EQ_3242(...)   \,
+#define Z_IS_3242U_EQ_3242(...)  \,
+#define Z_IS_3242_EQ_3242U(...)  \,
+#define Z_IS_3242U_EQ_3242U(...) \,
+#define Z_IS_3243_EQ_3243(...)   \,
+#define Z_IS_3243U_EQ_3243(...)  \,
+#define Z_IS_3243_EQ_3243U(...)  \,
+#define Z_IS_3243U_EQ_3243U(...) \,
+#define Z_IS_3244_EQ_3244(...)   \,
+#define Z_IS_3244U_EQ_3244(...)  \,
+#define Z_IS_3244_EQ_3244U(...)  \,
+#define Z_IS_3244U_EQ_3244U(...) \,
+#define Z_IS_3245_EQ_3245(...)   \,
+#define Z_IS_3245U_EQ_3245(...)  \,
+#define Z_IS_3245_EQ_3245U(...)  \,
+#define Z_IS_3245U_EQ_3245U(...) \,
+#define Z_IS_3246_EQ_3246(...)   \,
+#define Z_IS_3246U_EQ_3246(...)  \,
+#define Z_IS_3246_EQ_3246U(...)  \,
+#define Z_IS_3246U_EQ_3246U(...) \,
+#define Z_IS_3247_EQ_3247(...)   \,
+#define Z_IS_3247U_EQ_3247(...)  \,
+#define Z_IS_3247_EQ_3247U(...)  \,
+#define Z_IS_3247U_EQ_3247U(...) \,
+#define Z_IS_3248_EQ_3248(...)   \,
+#define Z_IS_3248U_EQ_3248(...)  \,
+#define Z_IS_3248_EQ_3248U(...)  \,
+#define Z_IS_3248U_EQ_3248U(...) \,
+#define Z_IS_3249_EQ_3249(...)   \,
+#define Z_IS_3249U_EQ_3249(...)  \,
+#define Z_IS_3249_EQ_3249U(...)  \,
+#define Z_IS_3249U_EQ_3249U(...) \,
+#define Z_IS_3250_EQ_3250(...)   \,
+#define Z_IS_3250U_EQ_3250(...)  \,
+#define Z_IS_3250_EQ_3250U(...)  \,
+#define Z_IS_3250U_EQ_3250U(...) \,
+#define Z_IS_3251_EQ_3251(...)   \,
+#define Z_IS_3251U_EQ_3251(...)  \,
+#define Z_IS_3251_EQ_3251U(...)  \,
+#define Z_IS_3251U_EQ_3251U(...) \,
+#define Z_IS_3252_EQ_3252(...)   \,
+#define Z_IS_3252U_EQ_3252(...)  \,
+#define Z_IS_3252_EQ_3252U(...)  \,
+#define Z_IS_3252U_EQ_3252U(...) \,
+#define Z_IS_3253_EQ_3253(...)   \,
+#define Z_IS_3253U_EQ_3253(...)  \,
+#define Z_IS_3253_EQ_3253U(...)  \,
+#define Z_IS_3253U_EQ_3253U(...) \,
+#define Z_IS_3254_EQ_3254(...)   \,
+#define Z_IS_3254U_EQ_3254(...)  \,
+#define Z_IS_3254_EQ_3254U(...)  \,
+#define Z_IS_3254U_EQ_3254U(...) \,
+#define Z_IS_3255_EQ_3255(...)   \,
+#define Z_IS_3255U_EQ_3255(...)  \,
+#define Z_IS_3255_EQ_3255U(...)  \,
+#define Z_IS_3255U_EQ_3255U(...) \,
+#define Z_IS_3256_EQ_3256(...)   \,
+#define Z_IS_3256U_EQ_3256(...)  \,
+#define Z_IS_3256_EQ_3256U(...)  \,
+#define Z_IS_3256U_EQ_3256U(...) \,
+#define Z_IS_3257_EQ_3257(...)   \,
+#define Z_IS_3257U_EQ_3257(...)  \,
+#define Z_IS_3257_EQ_3257U(...)  \,
+#define Z_IS_3257U_EQ_3257U(...) \,
+#define Z_IS_3258_EQ_3258(...)   \,
+#define Z_IS_3258U_EQ_3258(...)  \,
+#define Z_IS_3258_EQ_3258U(...)  \,
+#define Z_IS_3258U_EQ_3258U(...) \,
+#define Z_IS_3259_EQ_3259(...)   \,
+#define Z_IS_3259U_EQ_3259(...)  \,
+#define Z_IS_3259_EQ_3259U(...)  \,
+#define Z_IS_3259U_EQ_3259U(...) \,
+#define Z_IS_3260_EQ_3260(...)   \,
+#define Z_IS_3260U_EQ_3260(...)  \,
+#define Z_IS_3260_EQ_3260U(...)  \,
+#define Z_IS_3260U_EQ_3260U(...) \,
+#define Z_IS_3261_EQ_3261(...)   \,
+#define Z_IS_3261U_EQ_3261(...)  \,
+#define Z_IS_3261_EQ_3261U(...)  \,
+#define Z_IS_3261U_EQ_3261U(...) \,
+#define Z_IS_3262_EQ_3262(...)   \,
+#define Z_IS_3262U_EQ_3262(...)  \,
+#define Z_IS_3262_EQ_3262U(...)  \,
+#define Z_IS_3262U_EQ_3262U(...) \,
+#define Z_IS_3263_EQ_3263(...)   \,
+#define Z_IS_3263U_EQ_3263(...)  \,
+#define Z_IS_3263_EQ_3263U(...)  \,
+#define Z_IS_3263U_EQ_3263U(...) \,
+#define Z_IS_3264_EQ_3264(...)   \,
+#define Z_IS_3264U_EQ_3264(...)  \,
+#define Z_IS_3264_EQ_3264U(...)  \,
+#define Z_IS_3264U_EQ_3264U(...) \,
+#define Z_IS_3265_EQ_3265(...)   \,
+#define Z_IS_3265U_EQ_3265(...)  \,
+#define Z_IS_3265_EQ_3265U(...)  \,
+#define Z_IS_3265U_EQ_3265U(...) \,
+#define Z_IS_3266_EQ_3266(...)   \,
+#define Z_IS_3266U_EQ_3266(...)  \,
+#define Z_IS_3266_EQ_3266U(...)  \,
+#define Z_IS_3266U_EQ_3266U(...) \,
+#define Z_IS_3267_EQ_3267(...)   \,
+#define Z_IS_3267U_EQ_3267(...)  \,
+#define Z_IS_3267_EQ_3267U(...)  \,
+#define Z_IS_3267U_EQ_3267U(...) \,
+#define Z_IS_3268_EQ_3268(...)   \,
+#define Z_IS_3268U_EQ_3268(...)  \,
+#define Z_IS_3268_EQ_3268U(...)  \,
+#define Z_IS_3268U_EQ_3268U(...) \,
+#define Z_IS_3269_EQ_3269(...)   \,
+#define Z_IS_3269U_EQ_3269(...)  \,
+#define Z_IS_3269_EQ_3269U(...)  \,
+#define Z_IS_3269U_EQ_3269U(...) \,
+#define Z_IS_3270_EQ_3270(...)   \,
+#define Z_IS_3270U_EQ_3270(...)  \,
+#define Z_IS_3270_EQ_3270U(...)  \,
+#define Z_IS_3270U_EQ_3270U(...) \,
+#define Z_IS_3271_EQ_3271(...)   \,
+#define Z_IS_3271U_EQ_3271(...)  \,
+#define Z_IS_3271_EQ_3271U(...)  \,
+#define Z_IS_3271U_EQ_3271U(...) \,
+#define Z_IS_3272_EQ_3272(...)   \,
+#define Z_IS_3272U_EQ_3272(...)  \,
+#define Z_IS_3272_EQ_3272U(...)  \,
+#define Z_IS_3272U_EQ_3272U(...) \,
+#define Z_IS_3273_EQ_3273(...)   \,
+#define Z_IS_3273U_EQ_3273(...)  \,
+#define Z_IS_3273_EQ_3273U(...)  \,
+#define Z_IS_3273U_EQ_3273U(...) \,
+#define Z_IS_3274_EQ_3274(...)   \,
+#define Z_IS_3274U_EQ_3274(...)  \,
+#define Z_IS_3274_EQ_3274U(...)  \,
+#define Z_IS_3274U_EQ_3274U(...) \,
+#define Z_IS_3275_EQ_3275(...)   \,
+#define Z_IS_3275U_EQ_3275(...)  \,
+#define Z_IS_3275_EQ_3275U(...)  \,
+#define Z_IS_3275U_EQ_3275U(...) \,
+#define Z_IS_3276_EQ_3276(...)   \,
+#define Z_IS_3276U_EQ_3276(...)  \,
+#define Z_IS_3276_EQ_3276U(...)  \,
+#define Z_IS_3276U_EQ_3276U(...) \,
+#define Z_IS_3277_EQ_3277(...)   \,
+#define Z_IS_3277U_EQ_3277(...)  \,
+#define Z_IS_3277_EQ_3277U(...)  \,
+#define Z_IS_3277U_EQ_3277U(...) \,
+#define Z_IS_3278_EQ_3278(...)   \,
+#define Z_IS_3278U_EQ_3278(...)  \,
+#define Z_IS_3278_EQ_3278U(...)  \,
+#define Z_IS_3278U_EQ_3278U(...) \,
+#define Z_IS_3279_EQ_3279(...)   \,
+#define Z_IS_3279U_EQ_3279(...)  \,
+#define Z_IS_3279_EQ_3279U(...)  \,
+#define Z_IS_3279U_EQ_3279U(...) \,
+#define Z_IS_3280_EQ_3280(...)   \,
+#define Z_IS_3280U_EQ_3280(...)  \,
+#define Z_IS_3280_EQ_3280U(...)  \,
+#define Z_IS_3280U_EQ_3280U(...) \,
+#define Z_IS_3281_EQ_3281(...)   \,
+#define Z_IS_3281U_EQ_3281(...)  \,
+#define Z_IS_3281_EQ_3281U(...)  \,
+#define Z_IS_3281U_EQ_3281U(...) \,
+#define Z_IS_3282_EQ_3282(...)   \,
+#define Z_IS_3282U_EQ_3282(...)  \,
+#define Z_IS_3282_EQ_3282U(...)  \,
+#define Z_IS_3282U_EQ_3282U(...) \,
+#define Z_IS_3283_EQ_3283(...)   \,
+#define Z_IS_3283U_EQ_3283(...)  \,
+#define Z_IS_3283_EQ_3283U(...)  \,
+#define Z_IS_3283U_EQ_3283U(...) \,
+#define Z_IS_3284_EQ_3284(...)   \,
+#define Z_IS_3284U_EQ_3284(...)  \,
+#define Z_IS_3284_EQ_3284U(...)  \,
+#define Z_IS_3284U_EQ_3284U(...) \,
+#define Z_IS_3285_EQ_3285(...)   \,
+#define Z_IS_3285U_EQ_3285(...)  \,
+#define Z_IS_3285_EQ_3285U(...)  \,
+#define Z_IS_3285U_EQ_3285U(...) \,
+#define Z_IS_3286_EQ_3286(...)   \,
+#define Z_IS_3286U_EQ_3286(...)  \,
+#define Z_IS_3286_EQ_3286U(...)  \,
+#define Z_IS_3286U_EQ_3286U(...) \,
+#define Z_IS_3287_EQ_3287(...)   \,
+#define Z_IS_3287U_EQ_3287(...)  \,
+#define Z_IS_3287_EQ_3287U(...)  \,
+#define Z_IS_3287U_EQ_3287U(...) \,
+#define Z_IS_3288_EQ_3288(...)   \,
+#define Z_IS_3288U_EQ_3288(...)  \,
+#define Z_IS_3288_EQ_3288U(...)  \,
+#define Z_IS_3288U_EQ_3288U(...) \,
+#define Z_IS_3289_EQ_3289(...)   \,
+#define Z_IS_3289U_EQ_3289(...)  \,
+#define Z_IS_3289_EQ_3289U(...)  \,
+#define Z_IS_3289U_EQ_3289U(...) \,
+#define Z_IS_3290_EQ_3290(...)   \,
+#define Z_IS_3290U_EQ_3290(...)  \,
+#define Z_IS_3290_EQ_3290U(...)  \,
+#define Z_IS_3290U_EQ_3290U(...) \,
+#define Z_IS_3291_EQ_3291(...)   \,
+#define Z_IS_3291U_EQ_3291(...)  \,
+#define Z_IS_3291_EQ_3291U(...)  \,
+#define Z_IS_3291U_EQ_3291U(...) \,
+#define Z_IS_3292_EQ_3292(...)   \,
+#define Z_IS_3292U_EQ_3292(...)  \,
+#define Z_IS_3292_EQ_3292U(...)  \,
+#define Z_IS_3292U_EQ_3292U(...) \,
+#define Z_IS_3293_EQ_3293(...)   \,
+#define Z_IS_3293U_EQ_3293(...)  \,
+#define Z_IS_3293_EQ_3293U(...)  \,
+#define Z_IS_3293U_EQ_3293U(...) \,
+#define Z_IS_3294_EQ_3294(...)   \,
+#define Z_IS_3294U_EQ_3294(...)  \,
+#define Z_IS_3294_EQ_3294U(...)  \,
+#define Z_IS_3294U_EQ_3294U(...) \,
+#define Z_IS_3295_EQ_3295(...)   \,
+#define Z_IS_3295U_EQ_3295(...)  \,
+#define Z_IS_3295_EQ_3295U(...)  \,
+#define Z_IS_3295U_EQ_3295U(...) \,
+#define Z_IS_3296_EQ_3296(...)   \,
+#define Z_IS_3296U_EQ_3296(...)  \,
+#define Z_IS_3296_EQ_3296U(...)  \,
+#define Z_IS_3296U_EQ_3296U(...) \,
+#define Z_IS_3297_EQ_3297(...)   \,
+#define Z_IS_3297U_EQ_3297(...)  \,
+#define Z_IS_3297_EQ_3297U(...)  \,
+#define Z_IS_3297U_EQ_3297U(...) \,
+#define Z_IS_3298_EQ_3298(...)   \,
+#define Z_IS_3298U_EQ_3298(...)  \,
+#define Z_IS_3298_EQ_3298U(...)  \,
+#define Z_IS_3298U_EQ_3298U(...) \,
+#define Z_IS_3299_EQ_3299(...)   \,
+#define Z_IS_3299U_EQ_3299(...)  \,
+#define Z_IS_3299_EQ_3299U(...)  \,
+#define Z_IS_3299U_EQ_3299U(...) \,
+#define Z_IS_3300_EQ_3300(...)   \,
+#define Z_IS_3300U_EQ_3300(...)  \,
+#define Z_IS_3300_EQ_3300U(...)  \,
+#define Z_IS_3300U_EQ_3300U(...) \,
+#define Z_IS_3301_EQ_3301(...)   \,
+#define Z_IS_3301U_EQ_3301(...)  \,
+#define Z_IS_3301_EQ_3301U(...)  \,
+#define Z_IS_3301U_EQ_3301U(...) \,
+#define Z_IS_3302_EQ_3302(...)   \,
+#define Z_IS_3302U_EQ_3302(...)  \,
+#define Z_IS_3302_EQ_3302U(...)  \,
+#define Z_IS_3302U_EQ_3302U(...) \,
+#define Z_IS_3303_EQ_3303(...)   \,
+#define Z_IS_3303U_EQ_3303(...)  \,
+#define Z_IS_3303_EQ_3303U(...)  \,
+#define Z_IS_3303U_EQ_3303U(...) \,
+#define Z_IS_3304_EQ_3304(...)   \,
+#define Z_IS_3304U_EQ_3304(...)  \,
+#define Z_IS_3304_EQ_3304U(...)  \,
+#define Z_IS_3304U_EQ_3304U(...) \,
+#define Z_IS_3305_EQ_3305(...)   \,
+#define Z_IS_3305U_EQ_3305(...)  \,
+#define Z_IS_3305_EQ_3305U(...)  \,
+#define Z_IS_3305U_EQ_3305U(...) \,
+#define Z_IS_3306_EQ_3306(...)   \,
+#define Z_IS_3306U_EQ_3306(...)  \,
+#define Z_IS_3306_EQ_3306U(...)  \,
+#define Z_IS_3306U_EQ_3306U(...) \,
+#define Z_IS_3307_EQ_3307(...)   \,
+#define Z_IS_3307U_EQ_3307(...)  \,
+#define Z_IS_3307_EQ_3307U(...)  \,
+#define Z_IS_3307U_EQ_3307U(...) \,
+#define Z_IS_3308_EQ_3308(...)   \,
+#define Z_IS_3308U_EQ_3308(...)  \,
+#define Z_IS_3308_EQ_3308U(...)  \,
+#define Z_IS_3308U_EQ_3308U(...) \,
+#define Z_IS_3309_EQ_3309(...)   \,
+#define Z_IS_3309U_EQ_3309(...)  \,
+#define Z_IS_3309_EQ_3309U(...)  \,
+#define Z_IS_3309U_EQ_3309U(...) \,
+#define Z_IS_3310_EQ_3310(...)   \,
+#define Z_IS_3310U_EQ_3310(...)  \,
+#define Z_IS_3310_EQ_3310U(...)  \,
+#define Z_IS_3310U_EQ_3310U(...) \,
+#define Z_IS_3311_EQ_3311(...)   \,
+#define Z_IS_3311U_EQ_3311(...)  \,
+#define Z_IS_3311_EQ_3311U(...)  \,
+#define Z_IS_3311U_EQ_3311U(...) \,
+#define Z_IS_3312_EQ_3312(...)   \,
+#define Z_IS_3312U_EQ_3312(...)  \,
+#define Z_IS_3312_EQ_3312U(...)  \,
+#define Z_IS_3312U_EQ_3312U(...) \,
+#define Z_IS_3313_EQ_3313(...)   \,
+#define Z_IS_3313U_EQ_3313(...)  \,
+#define Z_IS_3313_EQ_3313U(...)  \,
+#define Z_IS_3313U_EQ_3313U(...) \,
+#define Z_IS_3314_EQ_3314(...)   \,
+#define Z_IS_3314U_EQ_3314(...)  \,
+#define Z_IS_3314_EQ_3314U(...)  \,
+#define Z_IS_3314U_EQ_3314U(...) \,
+#define Z_IS_3315_EQ_3315(...)   \,
+#define Z_IS_3315U_EQ_3315(...)  \,
+#define Z_IS_3315_EQ_3315U(...)  \,
+#define Z_IS_3315U_EQ_3315U(...) \,
+#define Z_IS_3316_EQ_3316(...)   \,
+#define Z_IS_3316U_EQ_3316(...)  \,
+#define Z_IS_3316_EQ_3316U(...)  \,
+#define Z_IS_3316U_EQ_3316U(...) \,
+#define Z_IS_3317_EQ_3317(...)   \,
+#define Z_IS_3317U_EQ_3317(...)  \,
+#define Z_IS_3317_EQ_3317U(...)  \,
+#define Z_IS_3317U_EQ_3317U(...) \,
+#define Z_IS_3318_EQ_3318(...)   \,
+#define Z_IS_3318U_EQ_3318(...)  \,
+#define Z_IS_3318_EQ_3318U(...)  \,
+#define Z_IS_3318U_EQ_3318U(...) \,
+#define Z_IS_3319_EQ_3319(...)   \,
+#define Z_IS_3319U_EQ_3319(...)  \,
+#define Z_IS_3319_EQ_3319U(...)  \,
+#define Z_IS_3319U_EQ_3319U(...) \,
+#define Z_IS_3320_EQ_3320(...)   \,
+#define Z_IS_3320U_EQ_3320(...)  \,
+#define Z_IS_3320_EQ_3320U(...)  \,
+#define Z_IS_3320U_EQ_3320U(...) \,
+#define Z_IS_3321_EQ_3321(...)   \,
+#define Z_IS_3321U_EQ_3321(...)  \,
+#define Z_IS_3321_EQ_3321U(...)  \,
+#define Z_IS_3321U_EQ_3321U(...) \,
+#define Z_IS_3322_EQ_3322(...)   \,
+#define Z_IS_3322U_EQ_3322(...)  \,
+#define Z_IS_3322_EQ_3322U(...)  \,
+#define Z_IS_3322U_EQ_3322U(...) \,
+#define Z_IS_3323_EQ_3323(...)   \,
+#define Z_IS_3323U_EQ_3323(...)  \,
+#define Z_IS_3323_EQ_3323U(...)  \,
+#define Z_IS_3323U_EQ_3323U(...) \,
+#define Z_IS_3324_EQ_3324(...)   \,
+#define Z_IS_3324U_EQ_3324(...)  \,
+#define Z_IS_3324_EQ_3324U(...)  \,
+#define Z_IS_3324U_EQ_3324U(...) \,
+#define Z_IS_3325_EQ_3325(...)   \,
+#define Z_IS_3325U_EQ_3325(...)  \,
+#define Z_IS_3325_EQ_3325U(...)  \,
+#define Z_IS_3325U_EQ_3325U(...) \,
+#define Z_IS_3326_EQ_3326(...)   \,
+#define Z_IS_3326U_EQ_3326(...)  \,
+#define Z_IS_3326_EQ_3326U(...)  \,
+#define Z_IS_3326U_EQ_3326U(...) \,
+#define Z_IS_3327_EQ_3327(...)   \,
+#define Z_IS_3327U_EQ_3327(...)  \,
+#define Z_IS_3327_EQ_3327U(...)  \,
+#define Z_IS_3327U_EQ_3327U(...) \,
+#define Z_IS_3328_EQ_3328(...)   \,
+#define Z_IS_3328U_EQ_3328(...)  \,
+#define Z_IS_3328_EQ_3328U(...)  \,
+#define Z_IS_3328U_EQ_3328U(...) \,
+#define Z_IS_3329_EQ_3329(...)   \,
+#define Z_IS_3329U_EQ_3329(...)  \,
+#define Z_IS_3329_EQ_3329U(...)  \,
+#define Z_IS_3329U_EQ_3329U(...) \,
+#define Z_IS_3330_EQ_3330(...)   \,
+#define Z_IS_3330U_EQ_3330(...)  \,
+#define Z_IS_3330_EQ_3330U(...)  \,
+#define Z_IS_3330U_EQ_3330U(...) \,
+#define Z_IS_3331_EQ_3331(...)   \,
+#define Z_IS_3331U_EQ_3331(...)  \,
+#define Z_IS_3331_EQ_3331U(...)  \,
+#define Z_IS_3331U_EQ_3331U(...) \,
+#define Z_IS_3332_EQ_3332(...)   \,
+#define Z_IS_3332U_EQ_3332(...)  \,
+#define Z_IS_3332_EQ_3332U(...)  \,
+#define Z_IS_3332U_EQ_3332U(...) \,
+#define Z_IS_3333_EQ_3333(...)   \,
+#define Z_IS_3333U_EQ_3333(...)  \,
+#define Z_IS_3333_EQ_3333U(...)  \,
+#define Z_IS_3333U_EQ_3333U(...) \,
+#define Z_IS_3334_EQ_3334(...)   \,
+#define Z_IS_3334U_EQ_3334(...)  \,
+#define Z_IS_3334_EQ_3334U(...)  \,
+#define Z_IS_3334U_EQ_3334U(...) \,
+#define Z_IS_3335_EQ_3335(...)   \,
+#define Z_IS_3335U_EQ_3335(...)  \,
+#define Z_IS_3335_EQ_3335U(...)  \,
+#define Z_IS_3335U_EQ_3335U(...) \,
+#define Z_IS_3336_EQ_3336(...)   \,
+#define Z_IS_3336U_EQ_3336(...)  \,
+#define Z_IS_3336_EQ_3336U(...)  \,
+#define Z_IS_3336U_EQ_3336U(...) \,
+#define Z_IS_3337_EQ_3337(...)   \,
+#define Z_IS_3337U_EQ_3337(...)  \,
+#define Z_IS_3337_EQ_3337U(...)  \,
+#define Z_IS_3337U_EQ_3337U(...) \,
+#define Z_IS_3338_EQ_3338(...)   \,
+#define Z_IS_3338U_EQ_3338(...)  \,
+#define Z_IS_3338_EQ_3338U(...)  \,
+#define Z_IS_3338U_EQ_3338U(...) \,
+#define Z_IS_3339_EQ_3339(...)   \,
+#define Z_IS_3339U_EQ_3339(...)  \,
+#define Z_IS_3339_EQ_3339U(...)  \,
+#define Z_IS_3339U_EQ_3339U(...) \,
+#define Z_IS_3340_EQ_3340(...)   \,
+#define Z_IS_3340U_EQ_3340(...)  \,
+#define Z_IS_3340_EQ_3340U(...)  \,
+#define Z_IS_3340U_EQ_3340U(...) \,
+#define Z_IS_3341_EQ_3341(...)   \,
+#define Z_IS_3341U_EQ_3341(...)  \,
+#define Z_IS_3341_EQ_3341U(...)  \,
+#define Z_IS_3341U_EQ_3341U(...) \,
+#define Z_IS_3342_EQ_3342(...)   \,
+#define Z_IS_3342U_EQ_3342(...)  \,
+#define Z_IS_3342_EQ_3342U(...)  \,
+#define Z_IS_3342U_EQ_3342U(...) \,
+#define Z_IS_3343_EQ_3343(...)   \,
+#define Z_IS_3343U_EQ_3343(...)  \,
+#define Z_IS_3343_EQ_3343U(...)  \,
+#define Z_IS_3343U_EQ_3343U(...) \,
+#define Z_IS_3344_EQ_3344(...)   \,
+#define Z_IS_3344U_EQ_3344(...)  \,
+#define Z_IS_3344_EQ_3344U(...)  \,
+#define Z_IS_3344U_EQ_3344U(...) \,
+#define Z_IS_3345_EQ_3345(...)   \,
+#define Z_IS_3345U_EQ_3345(...)  \,
+#define Z_IS_3345_EQ_3345U(...)  \,
+#define Z_IS_3345U_EQ_3345U(...) \,
+#define Z_IS_3346_EQ_3346(...)   \,
+#define Z_IS_3346U_EQ_3346(...)  \,
+#define Z_IS_3346_EQ_3346U(...)  \,
+#define Z_IS_3346U_EQ_3346U(...) \,
+#define Z_IS_3347_EQ_3347(...)   \,
+#define Z_IS_3347U_EQ_3347(...)  \,
+#define Z_IS_3347_EQ_3347U(...)  \,
+#define Z_IS_3347U_EQ_3347U(...) \,
+#define Z_IS_3348_EQ_3348(...)   \,
+#define Z_IS_3348U_EQ_3348(...)  \,
+#define Z_IS_3348_EQ_3348U(...)  \,
+#define Z_IS_3348U_EQ_3348U(...) \,
+#define Z_IS_3349_EQ_3349(...)   \,
+#define Z_IS_3349U_EQ_3349(...)  \,
+#define Z_IS_3349_EQ_3349U(...)  \,
+#define Z_IS_3349U_EQ_3349U(...) \,
+#define Z_IS_3350_EQ_3350(...)   \,
+#define Z_IS_3350U_EQ_3350(...)  \,
+#define Z_IS_3350_EQ_3350U(...)  \,
+#define Z_IS_3350U_EQ_3350U(...) \,
+#define Z_IS_3351_EQ_3351(...)   \,
+#define Z_IS_3351U_EQ_3351(...)  \,
+#define Z_IS_3351_EQ_3351U(...)  \,
+#define Z_IS_3351U_EQ_3351U(...) \,
+#define Z_IS_3352_EQ_3352(...)   \,
+#define Z_IS_3352U_EQ_3352(...)  \,
+#define Z_IS_3352_EQ_3352U(...)  \,
+#define Z_IS_3352U_EQ_3352U(...) \,
+#define Z_IS_3353_EQ_3353(...)   \,
+#define Z_IS_3353U_EQ_3353(...)  \,
+#define Z_IS_3353_EQ_3353U(...)  \,
+#define Z_IS_3353U_EQ_3353U(...) \,
+#define Z_IS_3354_EQ_3354(...)   \,
+#define Z_IS_3354U_EQ_3354(...)  \,
+#define Z_IS_3354_EQ_3354U(...)  \,
+#define Z_IS_3354U_EQ_3354U(...) \,
+#define Z_IS_3355_EQ_3355(...)   \,
+#define Z_IS_3355U_EQ_3355(...)  \,
+#define Z_IS_3355_EQ_3355U(...)  \,
+#define Z_IS_3355U_EQ_3355U(...) \,
+#define Z_IS_3356_EQ_3356(...)   \,
+#define Z_IS_3356U_EQ_3356(...)  \,
+#define Z_IS_3356_EQ_3356U(...)  \,
+#define Z_IS_3356U_EQ_3356U(...) \,
+#define Z_IS_3357_EQ_3357(...)   \,
+#define Z_IS_3357U_EQ_3357(...)  \,
+#define Z_IS_3357_EQ_3357U(...)  \,
+#define Z_IS_3357U_EQ_3357U(...) \,
+#define Z_IS_3358_EQ_3358(...)   \,
+#define Z_IS_3358U_EQ_3358(...)  \,
+#define Z_IS_3358_EQ_3358U(...)  \,
+#define Z_IS_3358U_EQ_3358U(...) \,
+#define Z_IS_3359_EQ_3359(...)   \,
+#define Z_IS_3359U_EQ_3359(...)  \,
+#define Z_IS_3359_EQ_3359U(...)  \,
+#define Z_IS_3359U_EQ_3359U(...) \,
+#define Z_IS_3360_EQ_3360(...)   \,
+#define Z_IS_3360U_EQ_3360(...)  \,
+#define Z_IS_3360_EQ_3360U(...)  \,
+#define Z_IS_3360U_EQ_3360U(...) \,
+#define Z_IS_3361_EQ_3361(...)   \,
+#define Z_IS_3361U_EQ_3361(...)  \,
+#define Z_IS_3361_EQ_3361U(...)  \,
+#define Z_IS_3361U_EQ_3361U(...) \,
+#define Z_IS_3362_EQ_3362(...)   \,
+#define Z_IS_3362U_EQ_3362(...)  \,
+#define Z_IS_3362_EQ_3362U(...)  \,
+#define Z_IS_3362U_EQ_3362U(...) \,
+#define Z_IS_3363_EQ_3363(...)   \,
+#define Z_IS_3363U_EQ_3363(...)  \,
+#define Z_IS_3363_EQ_3363U(...)  \,
+#define Z_IS_3363U_EQ_3363U(...) \,
+#define Z_IS_3364_EQ_3364(...)   \,
+#define Z_IS_3364U_EQ_3364(...)  \,
+#define Z_IS_3364_EQ_3364U(...)  \,
+#define Z_IS_3364U_EQ_3364U(...) \,
+#define Z_IS_3365_EQ_3365(...)   \,
+#define Z_IS_3365U_EQ_3365(...)  \,
+#define Z_IS_3365_EQ_3365U(...)  \,
+#define Z_IS_3365U_EQ_3365U(...) \,
+#define Z_IS_3366_EQ_3366(...)   \,
+#define Z_IS_3366U_EQ_3366(...)  \,
+#define Z_IS_3366_EQ_3366U(...)  \,
+#define Z_IS_3366U_EQ_3366U(...) \,
+#define Z_IS_3367_EQ_3367(...)   \,
+#define Z_IS_3367U_EQ_3367(...)  \,
+#define Z_IS_3367_EQ_3367U(...)  \,
+#define Z_IS_3367U_EQ_3367U(...) \,
+#define Z_IS_3368_EQ_3368(...)   \,
+#define Z_IS_3368U_EQ_3368(...)  \,
+#define Z_IS_3368_EQ_3368U(...)  \,
+#define Z_IS_3368U_EQ_3368U(...) \,
+#define Z_IS_3369_EQ_3369(...)   \,
+#define Z_IS_3369U_EQ_3369(...)  \,
+#define Z_IS_3369_EQ_3369U(...)  \,
+#define Z_IS_3369U_EQ_3369U(...) \,
+#define Z_IS_3370_EQ_3370(...)   \,
+#define Z_IS_3370U_EQ_3370(...)  \,
+#define Z_IS_3370_EQ_3370U(...)  \,
+#define Z_IS_3370U_EQ_3370U(...) \,
+#define Z_IS_3371_EQ_3371(...)   \,
+#define Z_IS_3371U_EQ_3371(...)  \,
+#define Z_IS_3371_EQ_3371U(...)  \,
+#define Z_IS_3371U_EQ_3371U(...) \,
+#define Z_IS_3372_EQ_3372(...)   \,
+#define Z_IS_3372U_EQ_3372(...)  \,
+#define Z_IS_3372_EQ_3372U(...)  \,
+#define Z_IS_3372U_EQ_3372U(...) \,
+#define Z_IS_3373_EQ_3373(...)   \,
+#define Z_IS_3373U_EQ_3373(...)  \,
+#define Z_IS_3373_EQ_3373U(...)  \,
+#define Z_IS_3373U_EQ_3373U(...) \,
+#define Z_IS_3374_EQ_3374(...)   \,
+#define Z_IS_3374U_EQ_3374(...)  \,
+#define Z_IS_3374_EQ_3374U(...)  \,
+#define Z_IS_3374U_EQ_3374U(...) \,
+#define Z_IS_3375_EQ_3375(...)   \,
+#define Z_IS_3375U_EQ_3375(...)  \,
+#define Z_IS_3375_EQ_3375U(...)  \,
+#define Z_IS_3375U_EQ_3375U(...) \,
+#define Z_IS_3376_EQ_3376(...)   \,
+#define Z_IS_3376U_EQ_3376(...)  \,
+#define Z_IS_3376_EQ_3376U(...)  \,
+#define Z_IS_3376U_EQ_3376U(...) \,
+#define Z_IS_3377_EQ_3377(...)   \,
+#define Z_IS_3377U_EQ_3377(...)  \,
+#define Z_IS_3377_EQ_3377U(...)  \,
+#define Z_IS_3377U_EQ_3377U(...) \,
+#define Z_IS_3378_EQ_3378(...)   \,
+#define Z_IS_3378U_EQ_3378(...)  \,
+#define Z_IS_3378_EQ_3378U(...)  \,
+#define Z_IS_3378U_EQ_3378U(...) \,
+#define Z_IS_3379_EQ_3379(...)   \,
+#define Z_IS_3379U_EQ_3379(...)  \,
+#define Z_IS_3379_EQ_3379U(...)  \,
+#define Z_IS_3379U_EQ_3379U(...) \,
+#define Z_IS_3380_EQ_3380(...)   \,
+#define Z_IS_3380U_EQ_3380(...)  \,
+#define Z_IS_3380_EQ_3380U(...)  \,
+#define Z_IS_3380U_EQ_3380U(...) \,
+#define Z_IS_3381_EQ_3381(...)   \,
+#define Z_IS_3381U_EQ_3381(...)  \,
+#define Z_IS_3381_EQ_3381U(...)  \,
+#define Z_IS_3381U_EQ_3381U(...) \,
+#define Z_IS_3382_EQ_3382(...)   \,
+#define Z_IS_3382U_EQ_3382(...)  \,
+#define Z_IS_3382_EQ_3382U(...)  \,
+#define Z_IS_3382U_EQ_3382U(...) \,
+#define Z_IS_3383_EQ_3383(...)   \,
+#define Z_IS_3383U_EQ_3383(...)  \,
+#define Z_IS_3383_EQ_3383U(...)  \,
+#define Z_IS_3383U_EQ_3383U(...) \,
+#define Z_IS_3384_EQ_3384(...)   \,
+#define Z_IS_3384U_EQ_3384(...)  \,
+#define Z_IS_3384_EQ_3384U(...)  \,
+#define Z_IS_3384U_EQ_3384U(...) \,
+#define Z_IS_3385_EQ_3385(...)   \,
+#define Z_IS_3385U_EQ_3385(...)  \,
+#define Z_IS_3385_EQ_3385U(...)  \,
+#define Z_IS_3385U_EQ_3385U(...) \,
+#define Z_IS_3386_EQ_3386(...)   \,
+#define Z_IS_3386U_EQ_3386(...)  \,
+#define Z_IS_3386_EQ_3386U(...)  \,
+#define Z_IS_3386U_EQ_3386U(...) \,
+#define Z_IS_3387_EQ_3387(...)   \,
+#define Z_IS_3387U_EQ_3387(...)  \,
+#define Z_IS_3387_EQ_3387U(...)  \,
+#define Z_IS_3387U_EQ_3387U(...) \,
+#define Z_IS_3388_EQ_3388(...)   \,
+#define Z_IS_3388U_EQ_3388(...)  \,
+#define Z_IS_3388_EQ_3388U(...)  \,
+#define Z_IS_3388U_EQ_3388U(...) \,
+#define Z_IS_3389_EQ_3389(...)   \,
+#define Z_IS_3389U_EQ_3389(...)  \,
+#define Z_IS_3389_EQ_3389U(...)  \,
+#define Z_IS_3389U_EQ_3389U(...) \,
+#define Z_IS_3390_EQ_3390(...)   \,
+#define Z_IS_3390U_EQ_3390(...)  \,
+#define Z_IS_3390_EQ_3390U(...)  \,
+#define Z_IS_3390U_EQ_3390U(...) \,
+#define Z_IS_3391_EQ_3391(...)   \,
+#define Z_IS_3391U_EQ_3391(...)  \,
+#define Z_IS_3391_EQ_3391U(...)  \,
+#define Z_IS_3391U_EQ_3391U(...) \,
+#define Z_IS_3392_EQ_3392(...)   \,
+#define Z_IS_3392U_EQ_3392(...)  \,
+#define Z_IS_3392_EQ_3392U(...)  \,
+#define Z_IS_3392U_EQ_3392U(...) \,
+#define Z_IS_3393_EQ_3393(...)   \,
+#define Z_IS_3393U_EQ_3393(...)  \,
+#define Z_IS_3393_EQ_3393U(...)  \,
+#define Z_IS_3393U_EQ_3393U(...) \,
+#define Z_IS_3394_EQ_3394(...)   \,
+#define Z_IS_3394U_EQ_3394(...)  \,
+#define Z_IS_3394_EQ_3394U(...)  \,
+#define Z_IS_3394U_EQ_3394U(...) \,
+#define Z_IS_3395_EQ_3395(...)   \,
+#define Z_IS_3395U_EQ_3395(...)  \,
+#define Z_IS_3395_EQ_3395U(...)  \,
+#define Z_IS_3395U_EQ_3395U(...) \,
+#define Z_IS_3396_EQ_3396(...)   \,
+#define Z_IS_3396U_EQ_3396(...)  \,
+#define Z_IS_3396_EQ_3396U(...)  \,
+#define Z_IS_3396U_EQ_3396U(...) \,
+#define Z_IS_3397_EQ_3397(...)   \,
+#define Z_IS_3397U_EQ_3397(...)  \,
+#define Z_IS_3397_EQ_3397U(...)  \,
+#define Z_IS_3397U_EQ_3397U(...) \,
+#define Z_IS_3398_EQ_3398(...)   \,
+#define Z_IS_3398U_EQ_3398(...)  \,
+#define Z_IS_3398_EQ_3398U(...)  \,
+#define Z_IS_3398U_EQ_3398U(...) \,
+#define Z_IS_3399_EQ_3399(...)   \,
+#define Z_IS_3399U_EQ_3399(...)  \,
+#define Z_IS_3399_EQ_3399U(...)  \,
+#define Z_IS_3399U_EQ_3399U(...) \,
+#define Z_IS_3400_EQ_3400(...)   \,
+#define Z_IS_3400U_EQ_3400(...)  \,
+#define Z_IS_3400_EQ_3400U(...)  \,
+#define Z_IS_3400U_EQ_3400U(...) \,
+#define Z_IS_3401_EQ_3401(...)   \,
+#define Z_IS_3401U_EQ_3401(...)  \,
+#define Z_IS_3401_EQ_3401U(...)  \,
+#define Z_IS_3401U_EQ_3401U(...) \,
+#define Z_IS_3402_EQ_3402(...)   \,
+#define Z_IS_3402U_EQ_3402(...)  \,
+#define Z_IS_3402_EQ_3402U(...)  \,
+#define Z_IS_3402U_EQ_3402U(...) \,
+#define Z_IS_3403_EQ_3403(...)   \,
+#define Z_IS_3403U_EQ_3403(...)  \,
+#define Z_IS_3403_EQ_3403U(...)  \,
+#define Z_IS_3403U_EQ_3403U(...) \,
+#define Z_IS_3404_EQ_3404(...)   \,
+#define Z_IS_3404U_EQ_3404(...)  \,
+#define Z_IS_3404_EQ_3404U(...)  \,
+#define Z_IS_3404U_EQ_3404U(...) \,
+#define Z_IS_3405_EQ_3405(...)   \,
+#define Z_IS_3405U_EQ_3405(...)  \,
+#define Z_IS_3405_EQ_3405U(...)  \,
+#define Z_IS_3405U_EQ_3405U(...) \,
+#define Z_IS_3406_EQ_3406(...)   \,
+#define Z_IS_3406U_EQ_3406(...)  \,
+#define Z_IS_3406_EQ_3406U(...)  \,
+#define Z_IS_3406U_EQ_3406U(...) \,
+#define Z_IS_3407_EQ_3407(...)   \,
+#define Z_IS_3407U_EQ_3407(...)  \,
+#define Z_IS_3407_EQ_3407U(...)  \,
+#define Z_IS_3407U_EQ_3407U(...) \,
+#define Z_IS_3408_EQ_3408(...)   \,
+#define Z_IS_3408U_EQ_3408(...)  \,
+#define Z_IS_3408_EQ_3408U(...)  \,
+#define Z_IS_3408U_EQ_3408U(...) \,
+#define Z_IS_3409_EQ_3409(...)   \,
+#define Z_IS_3409U_EQ_3409(...)  \,
+#define Z_IS_3409_EQ_3409U(...)  \,
+#define Z_IS_3409U_EQ_3409U(...) \,
+#define Z_IS_3410_EQ_3410(...)   \,
+#define Z_IS_3410U_EQ_3410(...)  \,
+#define Z_IS_3410_EQ_3410U(...)  \,
+#define Z_IS_3410U_EQ_3410U(...) \,
+#define Z_IS_3411_EQ_3411(...)   \,
+#define Z_IS_3411U_EQ_3411(...)  \,
+#define Z_IS_3411_EQ_3411U(...)  \,
+#define Z_IS_3411U_EQ_3411U(...) \,
+#define Z_IS_3412_EQ_3412(...)   \,
+#define Z_IS_3412U_EQ_3412(...)  \,
+#define Z_IS_3412_EQ_3412U(...)  \,
+#define Z_IS_3412U_EQ_3412U(...) \,
+#define Z_IS_3413_EQ_3413(...)   \,
+#define Z_IS_3413U_EQ_3413(...)  \,
+#define Z_IS_3413_EQ_3413U(...)  \,
+#define Z_IS_3413U_EQ_3413U(...) \,
+#define Z_IS_3414_EQ_3414(...)   \,
+#define Z_IS_3414U_EQ_3414(...)  \,
+#define Z_IS_3414_EQ_3414U(...)  \,
+#define Z_IS_3414U_EQ_3414U(...) \,
+#define Z_IS_3415_EQ_3415(...)   \,
+#define Z_IS_3415U_EQ_3415(...)  \,
+#define Z_IS_3415_EQ_3415U(...)  \,
+#define Z_IS_3415U_EQ_3415U(...) \,
+#define Z_IS_3416_EQ_3416(...)   \,
+#define Z_IS_3416U_EQ_3416(...)  \,
+#define Z_IS_3416_EQ_3416U(...)  \,
+#define Z_IS_3416U_EQ_3416U(...) \,
+#define Z_IS_3417_EQ_3417(...)   \,
+#define Z_IS_3417U_EQ_3417(...)  \,
+#define Z_IS_3417_EQ_3417U(...)  \,
+#define Z_IS_3417U_EQ_3417U(...) \,
+#define Z_IS_3418_EQ_3418(...)   \,
+#define Z_IS_3418U_EQ_3418(...)  \,
+#define Z_IS_3418_EQ_3418U(...)  \,
+#define Z_IS_3418U_EQ_3418U(...) \,
+#define Z_IS_3419_EQ_3419(...)   \,
+#define Z_IS_3419U_EQ_3419(...)  \,
+#define Z_IS_3419_EQ_3419U(...)  \,
+#define Z_IS_3419U_EQ_3419U(...) \,
+#define Z_IS_3420_EQ_3420(...)   \,
+#define Z_IS_3420U_EQ_3420(...)  \,
+#define Z_IS_3420_EQ_3420U(...)  \,
+#define Z_IS_3420U_EQ_3420U(...) \,
+#define Z_IS_3421_EQ_3421(...)   \,
+#define Z_IS_3421U_EQ_3421(...)  \,
+#define Z_IS_3421_EQ_3421U(...)  \,
+#define Z_IS_3421U_EQ_3421U(...) \,
+#define Z_IS_3422_EQ_3422(...)   \,
+#define Z_IS_3422U_EQ_3422(...)  \,
+#define Z_IS_3422_EQ_3422U(...)  \,
+#define Z_IS_3422U_EQ_3422U(...) \,
+#define Z_IS_3423_EQ_3423(...)   \,
+#define Z_IS_3423U_EQ_3423(...)  \,
+#define Z_IS_3423_EQ_3423U(...)  \,
+#define Z_IS_3423U_EQ_3423U(...) \,
+#define Z_IS_3424_EQ_3424(...)   \,
+#define Z_IS_3424U_EQ_3424(...)  \,
+#define Z_IS_3424_EQ_3424U(...)  \,
+#define Z_IS_3424U_EQ_3424U(...) \,
+#define Z_IS_3425_EQ_3425(...)   \,
+#define Z_IS_3425U_EQ_3425(...)  \,
+#define Z_IS_3425_EQ_3425U(...)  \,
+#define Z_IS_3425U_EQ_3425U(...) \,
+#define Z_IS_3426_EQ_3426(...)   \,
+#define Z_IS_3426U_EQ_3426(...)  \,
+#define Z_IS_3426_EQ_3426U(...)  \,
+#define Z_IS_3426U_EQ_3426U(...) \,
+#define Z_IS_3427_EQ_3427(...)   \,
+#define Z_IS_3427U_EQ_3427(...)  \,
+#define Z_IS_3427_EQ_3427U(...)  \,
+#define Z_IS_3427U_EQ_3427U(...) \,
+#define Z_IS_3428_EQ_3428(...)   \,
+#define Z_IS_3428U_EQ_3428(...)  \,
+#define Z_IS_3428_EQ_3428U(...)  \,
+#define Z_IS_3428U_EQ_3428U(...) \,
+#define Z_IS_3429_EQ_3429(...)   \,
+#define Z_IS_3429U_EQ_3429(...)  \,
+#define Z_IS_3429_EQ_3429U(...)  \,
+#define Z_IS_3429U_EQ_3429U(...) \,
+#define Z_IS_3430_EQ_3430(...)   \,
+#define Z_IS_3430U_EQ_3430(...)  \,
+#define Z_IS_3430_EQ_3430U(...)  \,
+#define Z_IS_3430U_EQ_3430U(...) \,
+#define Z_IS_3431_EQ_3431(...)   \,
+#define Z_IS_3431U_EQ_3431(...)  \,
+#define Z_IS_3431_EQ_3431U(...)  \,
+#define Z_IS_3431U_EQ_3431U(...) \,
+#define Z_IS_3432_EQ_3432(...)   \,
+#define Z_IS_3432U_EQ_3432(...)  \,
+#define Z_IS_3432_EQ_3432U(...)  \,
+#define Z_IS_3432U_EQ_3432U(...) \,
+#define Z_IS_3433_EQ_3433(...)   \,
+#define Z_IS_3433U_EQ_3433(...)  \,
+#define Z_IS_3433_EQ_3433U(...)  \,
+#define Z_IS_3433U_EQ_3433U(...) \,
+#define Z_IS_3434_EQ_3434(...)   \,
+#define Z_IS_3434U_EQ_3434(...)  \,
+#define Z_IS_3434_EQ_3434U(...)  \,
+#define Z_IS_3434U_EQ_3434U(...) \,
+#define Z_IS_3435_EQ_3435(...)   \,
+#define Z_IS_3435U_EQ_3435(...)  \,
+#define Z_IS_3435_EQ_3435U(...)  \,
+#define Z_IS_3435U_EQ_3435U(...) \,
+#define Z_IS_3436_EQ_3436(...)   \,
+#define Z_IS_3436U_EQ_3436(...)  \,
+#define Z_IS_3436_EQ_3436U(...)  \,
+#define Z_IS_3436U_EQ_3436U(...) \,
+#define Z_IS_3437_EQ_3437(...)   \,
+#define Z_IS_3437U_EQ_3437(...)  \,
+#define Z_IS_3437_EQ_3437U(...)  \,
+#define Z_IS_3437U_EQ_3437U(...) \,
+#define Z_IS_3438_EQ_3438(...)   \,
+#define Z_IS_3438U_EQ_3438(...)  \,
+#define Z_IS_3438_EQ_3438U(...)  \,
+#define Z_IS_3438U_EQ_3438U(...) \,
+#define Z_IS_3439_EQ_3439(...)   \,
+#define Z_IS_3439U_EQ_3439(...)  \,
+#define Z_IS_3439_EQ_3439U(...)  \,
+#define Z_IS_3439U_EQ_3439U(...) \,
+#define Z_IS_3440_EQ_3440(...)   \,
+#define Z_IS_3440U_EQ_3440(...)  \,
+#define Z_IS_3440_EQ_3440U(...)  \,
+#define Z_IS_3440U_EQ_3440U(...) \,
+#define Z_IS_3441_EQ_3441(...)   \,
+#define Z_IS_3441U_EQ_3441(...)  \,
+#define Z_IS_3441_EQ_3441U(...)  \,
+#define Z_IS_3441U_EQ_3441U(...) \,
+#define Z_IS_3442_EQ_3442(...)   \,
+#define Z_IS_3442U_EQ_3442(...)  \,
+#define Z_IS_3442_EQ_3442U(...)  \,
+#define Z_IS_3442U_EQ_3442U(...) \,
+#define Z_IS_3443_EQ_3443(...)   \,
+#define Z_IS_3443U_EQ_3443(...)  \,
+#define Z_IS_3443_EQ_3443U(...)  \,
+#define Z_IS_3443U_EQ_3443U(...) \,
+#define Z_IS_3444_EQ_3444(...)   \,
+#define Z_IS_3444U_EQ_3444(...)  \,
+#define Z_IS_3444_EQ_3444U(...)  \,
+#define Z_IS_3444U_EQ_3444U(...) \,
+#define Z_IS_3445_EQ_3445(...)   \,
+#define Z_IS_3445U_EQ_3445(...)  \,
+#define Z_IS_3445_EQ_3445U(...)  \,
+#define Z_IS_3445U_EQ_3445U(...) \,
+#define Z_IS_3446_EQ_3446(...)   \,
+#define Z_IS_3446U_EQ_3446(...)  \,
+#define Z_IS_3446_EQ_3446U(...)  \,
+#define Z_IS_3446U_EQ_3446U(...) \,
+#define Z_IS_3447_EQ_3447(...)   \,
+#define Z_IS_3447U_EQ_3447(...)  \,
+#define Z_IS_3447_EQ_3447U(...)  \,
+#define Z_IS_3447U_EQ_3447U(...) \,
+#define Z_IS_3448_EQ_3448(...)   \,
+#define Z_IS_3448U_EQ_3448(...)  \,
+#define Z_IS_3448_EQ_3448U(...)  \,
+#define Z_IS_3448U_EQ_3448U(...) \,
+#define Z_IS_3449_EQ_3449(...)   \,
+#define Z_IS_3449U_EQ_3449(...)  \,
+#define Z_IS_3449_EQ_3449U(...)  \,
+#define Z_IS_3449U_EQ_3449U(...) \,
+#define Z_IS_3450_EQ_3450(...)   \,
+#define Z_IS_3450U_EQ_3450(...)  \,
+#define Z_IS_3450_EQ_3450U(...)  \,
+#define Z_IS_3450U_EQ_3450U(...) \,
+#define Z_IS_3451_EQ_3451(...)   \,
+#define Z_IS_3451U_EQ_3451(...)  \,
+#define Z_IS_3451_EQ_3451U(...)  \,
+#define Z_IS_3451U_EQ_3451U(...) \,
+#define Z_IS_3452_EQ_3452(...)   \,
+#define Z_IS_3452U_EQ_3452(...)  \,
+#define Z_IS_3452_EQ_3452U(...)  \,
+#define Z_IS_3452U_EQ_3452U(...) \,
+#define Z_IS_3453_EQ_3453(...)   \,
+#define Z_IS_3453U_EQ_3453(...)  \,
+#define Z_IS_3453_EQ_3453U(...)  \,
+#define Z_IS_3453U_EQ_3453U(...) \,
+#define Z_IS_3454_EQ_3454(...)   \,
+#define Z_IS_3454U_EQ_3454(...)  \,
+#define Z_IS_3454_EQ_3454U(...)  \,
+#define Z_IS_3454U_EQ_3454U(...) \,
+#define Z_IS_3455_EQ_3455(...)   \,
+#define Z_IS_3455U_EQ_3455(...)  \,
+#define Z_IS_3455_EQ_3455U(...)  \,
+#define Z_IS_3455U_EQ_3455U(...) \,
+#define Z_IS_3456_EQ_3456(...)   \,
+#define Z_IS_3456U_EQ_3456(...)  \,
+#define Z_IS_3456_EQ_3456U(...)  \,
+#define Z_IS_3456U_EQ_3456U(...) \,
+#define Z_IS_3457_EQ_3457(...)   \,
+#define Z_IS_3457U_EQ_3457(...)  \,
+#define Z_IS_3457_EQ_3457U(...)  \,
+#define Z_IS_3457U_EQ_3457U(...) \,
+#define Z_IS_3458_EQ_3458(...)   \,
+#define Z_IS_3458U_EQ_3458(...)  \,
+#define Z_IS_3458_EQ_3458U(...)  \,
+#define Z_IS_3458U_EQ_3458U(...) \,
+#define Z_IS_3459_EQ_3459(...)   \,
+#define Z_IS_3459U_EQ_3459(...)  \,
+#define Z_IS_3459_EQ_3459U(...)  \,
+#define Z_IS_3459U_EQ_3459U(...) \,
+#define Z_IS_3460_EQ_3460(...)   \,
+#define Z_IS_3460U_EQ_3460(...)  \,
+#define Z_IS_3460_EQ_3460U(...)  \,
+#define Z_IS_3460U_EQ_3460U(...) \,
+#define Z_IS_3461_EQ_3461(...)   \,
+#define Z_IS_3461U_EQ_3461(...)  \,
+#define Z_IS_3461_EQ_3461U(...)  \,
+#define Z_IS_3461U_EQ_3461U(...) \,
+#define Z_IS_3462_EQ_3462(...)   \,
+#define Z_IS_3462U_EQ_3462(...)  \,
+#define Z_IS_3462_EQ_3462U(...)  \,
+#define Z_IS_3462U_EQ_3462U(...) \,
+#define Z_IS_3463_EQ_3463(...)   \,
+#define Z_IS_3463U_EQ_3463(...)  \,
+#define Z_IS_3463_EQ_3463U(...)  \,
+#define Z_IS_3463U_EQ_3463U(...) \,
+#define Z_IS_3464_EQ_3464(...)   \,
+#define Z_IS_3464U_EQ_3464(...)  \,
+#define Z_IS_3464_EQ_3464U(...)  \,
+#define Z_IS_3464U_EQ_3464U(...) \,
+#define Z_IS_3465_EQ_3465(...)   \,
+#define Z_IS_3465U_EQ_3465(...)  \,
+#define Z_IS_3465_EQ_3465U(...)  \,
+#define Z_IS_3465U_EQ_3465U(...) \,
+#define Z_IS_3466_EQ_3466(...)   \,
+#define Z_IS_3466U_EQ_3466(...)  \,
+#define Z_IS_3466_EQ_3466U(...)  \,
+#define Z_IS_3466U_EQ_3466U(...) \,
+#define Z_IS_3467_EQ_3467(...)   \,
+#define Z_IS_3467U_EQ_3467(...)  \,
+#define Z_IS_3467_EQ_3467U(...)  \,
+#define Z_IS_3467U_EQ_3467U(...) \,
+#define Z_IS_3468_EQ_3468(...)   \,
+#define Z_IS_3468U_EQ_3468(...)  \,
+#define Z_IS_3468_EQ_3468U(...)  \,
+#define Z_IS_3468U_EQ_3468U(...) \,
+#define Z_IS_3469_EQ_3469(...)   \,
+#define Z_IS_3469U_EQ_3469(...)  \,
+#define Z_IS_3469_EQ_3469U(...)  \,
+#define Z_IS_3469U_EQ_3469U(...) \,
+#define Z_IS_3470_EQ_3470(...)   \,
+#define Z_IS_3470U_EQ_3470(...)  \,
+#define Z_IS_3470_EQ_3470U(...)  \,
+#define Z_IS_3470U_EQ_3470U(...) \,
+#define Z_IS_3471_EQ_3471(...)   \,
+#define Z_IS_3471U_EQ_3471(...)  \,
+#define Z_IS_3471_EQ_3471U(...)  \,
+#define Z_IS_3471U_EQ_3471U(...) \,
+#define Z_IS_3472_EQ_3472(...)   \,
+#define Z_IS_3472U_EQ_3472(...)  \,
+#define Z_IS_3472_EQ_3472U(...)  \,
+#define Z_IS_3472U_EQ_3472U(...) \,
+#define Z_IS_3473_EQ_3473(...)   \,
+#define Z_IS_3473U_EQ_3473(...)  \,
+#define Z_IS_3473_EQ_3473U(...)  \,
+#define Z_IS_3473U_EQ_3473U(...) \,
+#define Z_IS_3474_EQ_3474(...)   \,
+#define Z_IS_3474U_EQ_3474(...)  \,
+#define Z_IS_3474_EQ_3474U(...)  \,
+#define Z_IS_3474U_EQ_3474U(...) \,
+#define Z_IS_3475_EQ_3475(...)   \,
+#define Z_IS_3475U_EQ_3475(...)  \,
+#define Z_IS_3475_EQ_3475U(...)  \,
+#define Z_IS_3475U_EQ_3475U(...) \,
+#define Z_IS_3476_EQ_3476(...)   \,
+#define Z_IS_3476U_EQ_3476(...)  \,
+#define Z_IS_3476_EQ_3476U(...)  \,
+#define Z_IS_3476U_EQ_3476U(...) \,
+#define Z_IS_3477_EQ_3477(...)   \,
+#define Z_IS_3477U_EQ_3477(...)  \,
+#define Z_IS_3477_EQ_3477U(...)  \,
+#define Z_IS_3477U_EQ_3477U(...) \,
+#define Z_IS_3478_EQ_3478(...)   \,
+#define Z_IS_3478U_EQ_3478(...)  \,
+#define Z_IS_3478_EQ_3478U(...)  \,
+#define Z_IS_3478U_EQ_3478U(...) \,
+#define Z_IS_3479_EQ_3479(...)   \,
+#define Z_IS_3479U_EQ_3479(...)  \,
+#define Z_IS_3479_EQ_3479U(...)  \,
+#define Z_IS_3479U_EQ_3479U(...) \,
+#define Z_IS_3480_EQ_3480(...)   \,
+#define Z_IS_3480U_EQ_3480(...)  \,
+#define Z_IS_3480_EQ_3480U(...)  \,
+#define Z_IS_3480U_EQ_3480U(...) \,
+#define Z_IS_3481_EQ_3481(...)   \,
+#define Z_IS_3481U_EQ_3481(...)  \,
+#define Z_IS_3481_EQ_3481U(...)  \,
+#define Z_IS_3481U_EQ_3481U(...) \,
+#define Z_IS_3482_EQ_3482(...)   \,
+#define Z_IS_3482U_EQ_3482(...)  \,
+#define Z_IS_3482_EQ_3482U(...)  \,
+#define Z_IS_3482U_EQ_3482U(...) \,
+#define Z_IS_3483_EQ_3483(...)   \,
+#define Z_IS_3483U_EQ_3483(...)  \,
+#define Z_IS_3483_EQ_3483U(...)  \,
+#define Z_IS_3483U_EQ_3483U(...) \,
+#define Z_IS_3484_EQ_3484(...)   \,
+#define Z_IS_3484U_EQ_3484(...)  \,
+#define Z_IS_3484_EQ_3484U(...)  \,
+#define Z_IS_3484U_EQ_3484U(...) \,
+#define Z_IS_3485_EQ_3485(...)   \,
+#define Z_IS_3485U_EQ_3485(...)  \,
+#define Z_IS_3485_EQ_3485U(...)  \,
+#define Z_IS_3485U_EQ_3485U(...) \,
+#define Z_IS_3486_EQ_3486(...)   \,
+#define Z_IS_3486U_EQ_3486(...)  \,
+#define Z_IS_3486_EQ_3486U(...)  \,
+#define Z_IS_3486U_EQ_3486U(...) \,
+#define Z_IS_3487_EQ_3487(...)   \,
+#define Z_IS_3487U_EQ_3487(...)  \,
+#define Z_IS_3487_EQ_3487U(...)  \,
+#define Z_IS_3487U_EQ_3487U(...) \,
+#define Z_IS_3488_EQ_3488(...)   \,
+#define Z_IS_3488U_EQ_3488(...)  \,
+#define Z_IS_3488_EQ_3488U(...)  \,
+#define Z_IS_3488U_EQ_3488U(...) \,
+#define Z_IS_3489_EQ_3489(...)   \,
+#define Z_IS_3489U_EQ_3489(...)  \,
+#define Z_IS_3489_EQ_3489U(...)  \,
+#define Z_IS_3489U_EQ_3489U(...) \,
+#define Z_IS_3490_EQ_3490(...)   \,
+#define Z_IS_3490U_EQ_3490(...)  \,
+#define Z_IS_3490_EQ_3490U(...)  \,
+#define Z_IS_3490U_EQ_3490U(...) \,
+#define Z_IS_3491_EQ_3491(...)   \,
+#define Z_IS_3491U_EQ_3491(...)  \,
+#define Z_IS_3491_EQ_3491U(...)  \,
+#define Z_IS_3491U_EQ_3491U(...) \,
+#define Z_IS_3492_EQ_3492(...)   \,
+#define Z_IS_3492U_EQ_3492(...)  \,
+#define Z_IS_3492_EQ_3492U(...)  \,
+#define Z_IS_3492U_EQ_3492U(...) \,
+#define Z_IS_3493_EQ_3493(...)   \,
+#define Z_IS_3493U_EQ_3493(...)  \,
+#define Z_IS_3493_EQ_3493U(...)  \,
+#define Z_IS_3493U_EQ_3493U(...) \,
+#define Z_IS_3494_EQ_3494(...)   \,
+#define Z_IS_3494U_EQ_3494(...)  \,
+#define Z_IS_3494_EQ_3494U(...)  \,
+#define Z_IS_3494U_EQ_3494U(...) \,
+#define Z_IS_3495_EQ_3495(...)   \,
+#define Z_IS_3495U_EQ_3495(...)  \,
+#define Z_IS_3495_EQ_3495U(...)  \,
+#define Z_IS_3495U_EQ_3495U(...) \,
+#define Z_IS_3496_EQ_3496(...)   \,
+#define Z_IS_3496U_EQ_3496(...)  \,
+#define Z_IS_3496_EQ_3496U(...)  \,
+#define Z_IS_3496U_EQ_3496U(...) \,
+#define Z_IS_3497_EQ_3497(...)   \,
+#define Z_IS_3497U_EQ_3497(...)  \,
+#define Z_IS_3497_EQ_3497U(...)  \,
+#define Z_IS_3497U_EQ_3497U(...) \,
+#define Z_IS_3498_EQ_3498(...)   \,
+#define Z_IS_3498U_EQ_3498(...)  \,
+#define Z_IS_3498_EQ_3498U(...)  \,
+#define Z_IS_3498U_EQ_3498U(...) \,
+#define Z_IS_3499_EQ_3499(...)   \,
+#define Z_IS_3499U_EQ_3499(...)  \,
+#define Z_IS_3499_EQ_3499U(...)  \,
+#define Z_IS_3499U_EQ_3499U(...) \,
+#define Z_IS_3500_EQ_3500(...)   \,
+#define Z_IS_3500U_EQ_3500(...)  \,
+#define Z_IS_3500_EQ_3500U(...)  \,
+#define Z_IS_3500U_EQ_3500U(...) \,
+#define Z_IS_3501_EQ_3501(...)   \,
+#define Z_IS_3501U_EQ_3501(...)  \,
+#define Z_IS_3501_EQ_3501U(...)  \,
+#define Z_IS_3501U_EQ_3501U(...) \,
+#define Z_IS_3502_EQ_3502(...)   \,
+#define Z_IS_3502U_EQ_3502(...)  \,
+#define Z_IS_3502_EQ_3502U(...)  \,
+#define Z_IS_3502U_EQ_3502U(...) \,
+#define Z_IS_3503_EQ_3503(...)   \,
+#define Z_IS_3503U_EQ_3503(...)  \,
+#define Z_IS_3503_EQ_3503U(...)  \,
+#define Z_IS_3503U_EQ_3503U(...) \,
+#define Z_IS_3504_EQ_3504(...)   \,
+#define Z_IS_3504U_EQ_3504(...)  \,
+#define Z_IS_3504_EQ_3504U(...)  \,
+#define Z_IS_3504U_EQ_3504U(...) \,
+#define Z_IS_3505_EQ_3505(...)   \,
+#define Z_IS_3505U_EQ_3505(...)  \,
+#define Z_IS_3505_EQ_3505U(...)  \,
+#define Z_IS_3505U_EQ_3505U(...) \,
+#define Z_IS_3506_EQ_3506(...)   \,
+#define Z_IS_3506U_EQ_3506(...)  \,
+#define Z_IS_3506_EQ_3506U(...)  \,
+#define Z_IS_3506U_EQ_3506U(...) \,
+#define Z_IS_3507_EQ_3507(...)   \,
+#define Z_IS_3507U_EQ_3507(...)  \,
+#define Z_IS_3507_EQ_3507U(...)  \,
+#define Z_IS_3507U_EQ_3507U(...) \,
+#define Z_IS_3508_EQ_3508(...)   \,
+#define Z_IS_3508U_EQ_3508(...)  \,
+#define Z_IS_3508_EQ_3508U(...)  \,
+#define Z_IS_3508U_EQ_3508U(...) \,
+#define Z_IS_3509_EQ_3509(...)   \,
+#define Z_IS_3509U_EQ_3509(...)  \,
+#define Z_IS_3509_EQ_3509U(...)  \,
+#define Z_IS_3509U_EQ_3509U(...) \,
+#define Z_IS_3510_EQ_3510(...)   \,
+#define Z_IS_3510U_EQ_3510(...)  \,
+#define Z_IS_3510_EQ_3510U(...)  \,
+#define Z_IS_3510U_EQ_3510U(...) \,
+#define Z_IS_3511_EQ_3511(...)   \,
+#define Z_IS_3511U_EQ_3511(...)  \,
+#define Z_IS_3511_EQ_3511U(...)  \,
+#define Z_IS_3511U_EQ_3511U(...) \,
+#define Z_IS_3512_EQ_3512(...)   \,
+#define Z_IS_3512U_EQ_3512(...)  \,
+#define Z_IS_3512_EQ_3512U(...)  \,
+#define Z_IS_3512U_EQ_3512U(...) \,
+#define Z_IS_3513_EQ_3513(...)   \,
+#define Z_IS_3513U_EQ_3513(...)  \,
+#define Z_IS_3513_EQ_3513U(...)  \,
+#define Z_IS_3513U_EQ_3513U(...) \,
+#define Z_IS_3514_EQ_3514(...)   \,
+#define Z_IS_3514U_EQ_3514(...)  \,
+#define Z_IS_3514_EQ_3514U(...)  \,
+#define Z_IS_3514U_EQ_3514U(...) \,
+#define Z_IS_3515_EQ_3515(...)   \,
+#define Z_IS_3515U_EQ_3515(...)  \,
+#define Z_IS_3515_EQ_3515U(...)  \,
+#define Z_IS_3515U_EQ_3515U(...) \,
+#define Z_IS_3516_EQ_3516(...)   \,
+#define Z_IS_3516U_EQ_3516(...)  \,
+#define Z_IS_3516_EQ_3516U(...)  \,
+#define Z_IS_3516U_EQ_3516U(...) \,
+#define Z_IS_3517_EQ_3517(...)   \,
+#define Z_IS_3517U_EQ_3517(...)  \,
+#define Z_IS_3517_EQ_3517U(...)  \,
+#define Z_IS_3517U_EQ_3517U(...) \,
+#define Z_IS_3518_EQ_3518(...)   \,
+#define Z_IS_3518U_EQ_3518(...)  \,
+#define Z_IS_3518_EQ_3518U(...)  \,
+#define Z_IS_3518U_EQ_3518U(...) \,
+#define Z_IS_3519_EQ_3519(...)   \,
+#define Z_IS_3519U_EQ_3519(...)  \,
+#define Z_IS_3519_EQ_3519U(...)  \,
+#define Z_IS_3519U_EQ_3519U(...) \,
+#define Z_IS_3520_EQ_3520(...)   \,
+#define Z_IS_3520U_EQ_3520(...)  \,
+#define Z_IS_3520_EQ_3520U(...)  \,
+#define Z_IS_3520U_EQ_3520U(...) \,
+#define Z_IS_3521_EQ_3521(...)   \,
+#define Z_IS_3521U_EQ_3521(...)  \,
+#define Z_IS_3521_EQ_3521U(...)  \,
+#define Z_IS_3521U_EQ_3521U(...) \,
+#define Z_IS_3522_EQ_3522(...)   \,
+#define Z_IS_3522U_EQ_3522(...)  \,
+#define Z_IS_3522_EQ_3522U(...)  \,
+#define Z_IS_3522U_EQ_3522U(...) \,
+#define Z_IS_3523_EQ_3523(...)   \,
+#define Z_IS_3523U_EQ_3523(...)  \,
+#define Z_IS_3523_EQ_3523U(...)  \,
+#define Z_IS_3523U_EQ_3523U(...) \,
+#define Z_IS_3524_EQ_3524(...)   \,
+#define Z_IS_3524U_EQ_3524(...)  \,
+#define Z_IS_3524_EQ_3524U(...)  \,
+#define Z_IS_3524U_EQ_3524U(...) \,
+#define Z_IS_3525_EQ_3525(...)   \,
+#define Z_IS_3525U_EQ_3525(...)  \,
+#define Z_IS_3525_EQ_3525U(...)  \,
+#define Z_IS_3525U_EQ_3525U(...) \,
+#define Z_IS_3526_EQ_3526(...)   \,
+#define Z_IS_3526U_EQ_3526(...)  \,
+#define Z_IS_3526_EQ_3526U(...)  \,
+#define Z_IS_3526U_EQ_3526U(...) \,
+#define Z_IS_3527_EQ_3527(...)   \,
+#define Z_IS_3527U_EQ_3527(...)  \,
+#define Z_IS_3527_EQ_3527U(...)  \,
+#define Z_IS_3527U_EQ_3527U(...) \,
+#define Z_IS_3528_EQ_3528(...)   \,
+#define Z_IS_3528U_EQ_3528(...)  \,
+#define Z_IS_3528_EQ_3528U(...)  \,
+#define Z_IS_3528U_EQ_3528U(...) \,
+#define Z_IS_3529_EQ_3529(...)   \,
+#define Z_IS_3529U_EQ_3529(...)  \,
+#define Z_IS_3529_EQ_3529U(...)  \,
+#define Z_IS_3529U_EQ_3529U(...) \,
+#define Z_IS_3530_EQ_3530(...)   \,
+#define Z_IS_3530U_EQ_3530(...)  \,
+#define Z_IS_3530_EQ_3530U(...)  \,
+#define Z_IS_3530U_EQ_3530U(...) \,
+#define Z_IS_3531_EQ_3531(...)   \,
+#define Z_IS_3531U_EQ_3531(...)  \,
+#define Z_IS_3531_EQ_3531U(...)  \,
+#define Z_IS_3531U_EQ_3531U(...) \,
+#define Z_IS_3532_EQ_3532(...)   \,
+#define Z_IS_3532U_EQ_3532(...)  \,
+#define Z_IS_3532_EQ_3532U(...)  \,
+#define Z_IS_3532U_EQ_3532U(...) \,
+#define Z_IS_3533_EQ_3533(...)   \,
+#define Z_IS_3533U_EQ_3533(...)  \,
+#define Z_IS_3533_EQ_3533U(...)  \,
+#define Z_IS_3533U_EQ_3533U(...) \,
+#define Z_IS_3534_EQ_3534(...)   \,
+#define Z_IS_3534U_EQ_3534(...)  \,
+#define Z_IS_3534_EQ_3534U(...)  \,
+#define Z_IS_3534U_EQ_3534U(...) \,
+#define Z_IS_3535_EQ_3535(...)   \,
+#define Z_IS_3535U_EQ_3535(...)  \,
+#define Z_IS_3535_EQ_3535U(...)  \,
+#define Z_IS_3535U_EQ_3535U(...) \,
+#define Z_IS_3536_EQ_3536(...)   \,
+#define Z_IS_3536U_EQ_3536(...)  \,
+#define Z_IS_3536_EQ_3536U(...)  \,
+#define Z_IS_3536U_EQ_3536U(...) \,
+#define Z_IS_3537_EQ_3537(...)   \,
+#define Z_IS_3537U_EQ_3537(...)  \,
+#define Z_IS_3537_EQ_3537U(...)  \,
+#define Z_IS_3537U_EQ_3537U(...) \,
+#define Z_IS_3538_EQ_3538(...)   \,
+#define Z_IS_3538U_EQ_3538(...)  \,
+#define Z_IS_3538_EQ_3538U(...)  \,
+#define Z_IS_3538U_EQ_3538U(...) \,
+#define Z_IS_3539_EQ_3539(...)   \,
+#define Z_IS_3539U_EQ_3539(...)  \,
+#define Z_IS_3539_EQ_3539U(...)  \,
+#define Z_IS_3539U_EQ_3539U(...) \,
+#define Z_IS_3540_EQ_3540(...)   \,
+#define Z_IS_3540U_EQ_3540(...)  \,
+#define Z_IS_3540_EQ_3540U(...)  \,
+#define Z_IS_3540U_EQ_3540U(...) \,
+#define Z_IS_3541_EQ_3541(...)   \,
+#define Z_IS_3541U_EQ_3541(...)  \,
+#define Z_IS_3541_EQ_3541U(...)  \,
+#define Z_IS_3541U_EQ_3541U(...) \,
+#define Z_IS_3542_EQ_3542(...)   \,
+#define Z_IS_3542U_EQ_3542(...)  \,
+#define Z_IS_3542_EQ_3542U(...)  \,
+#define Z_IS_3542U_EQ_3542U(...) \,
+#define Z_IS_3543_EQ_3543(...)   \,
+#define Z_IS_3543U_EQ_3543(...)  \,
+#define Z_IS_3543_EQ_3543U(...)  \,
+#define Z_IS_3543U_EQ_3543U(...) \,
+#define Z_IS_3544_EQ_3544(...)   \,
+#define Z_IS_3544U_EQ_3544(...)  \,
+#define Z_IS_3544_EQ_3544U(...)  \,
+#define Z_IS_3544U_EQ_3544U(...) \,
+#define Z_IS_3545_EQ_3545(...)   \,
+#define Z_IS_3545U_EQ_3545(...)  \,
+#define Z_IS_3545_EQ_3545U(...)  \,
+#define Z_IS_3545U_EQ_3545U(...) \,
+#define Z_IS_3546_EQ_3546(...)   \,
+#define Z_IS_3546U_EQ_3546(...)  \,
+#define Z_IS_3546_EQ_3546U(...)  \,
+#define Z_IS_3546U_EQ_3546U(...) \,
+#define Z_IS_3547_EQ_3547(...)   \,
+#define Z_IS_3547U_EQ_3547(...)  \,
+#define Z_IS_3547_EQ_3547U(...)  \,
+#define Z_IS_3547U_EQ_3547U(...) \,
+#define Z_IS_3548_EQ_3548(...)   \,
+#define Z_IS_3548U_EQ_3548(...)  \,
+#define Z_IS_3548_EQ_3548U(...)  \,
+#define Z_IS_3548U_EQ_3548U(...) \,
+#define Z_IS_3549_EQ_3549(...)   \,
+#define Z_IS_3549U_EQ_3549(...)  \,
+#define Z_IS_3549_EQ_3549U(...)  \,
+#define Z_IS_3549U_EQ_3549U(...) \,
+#define Z_IS_3550_EQ_3550(...)   \,
+#define Z_IS_3550U_EQ_3550(...)  \,
+#define Z_IS_3550_EQ_3550U(...)  \,
+#define Z_IS_3550U_EQ_3550U(...) \,
+#define Z_IS_3551_EQ_3551(...)   \,
+#define Z_IS_3551U_EQ_3551(...)  \,
+#define Z_IS_3551_EQ_3551U(...)  \,
+#define Z_IS_3551U_EQ_3551U(...) \,
+#define Z_IS_3552_EQ_3552(...)   \,
+#define Z_IS_3552U_EQ_3552(...)  \,
+#define Z_IS_3552_EQ_3552U(...)  \,
+#define Z_IS_3552U_EQ_3552U(...) \,
+#define Z_IS_3553_EQ_3553(...)   \,
+#define Z_IS_3553U_EQ_3553(...)  \,
+#define Z_IS_3553_EQ_3553U(...)  \,
+#define Z_IS_3553U_EQ_3553U(...) \,
+#define Z_IS_3554_EQ_3554(...)   \,
+#define Z_IS_3554U_EQ_3554(...)  \,
+#define Z_IS_3554_EQ_3554U(...)  \,
+#define Z_IS_3554U_EQ_3554U(...) \,
+#define Z_IS_3555_EQ_3555(...)   \,
+#define Z_IS_3555U_EQ_3555(...)  \,
+#define Z_IS_3555_EQ_3555U(...)  \,
+#define Z_IS_3555U_EQ_3555U(...) \,
+#define Z_IS_3556_EQ_3556(...)   \,
+#define Z_IS_3556U_EQ_3556(...)  \,
+#define Z_IS_3556_EQ_3556U(...)  \,
+#define Z_IS_3556U_EQ_3556U(...) \,
+#define Z_IS_3557_EQ_3557(...)   \,
+#define Z_IS_3557U_EQ_3557(...)  \,
+#define Z_IS_3557_EQ_3557U(...)  \,
+#define Z_IS_3557U_EQ_3557U(...) \,
+#define Z_IS_3558_EQ_3558(...)   \,
+#define Z_IS_3558U_EQ_3558(...)  \,
+#define Z_IS_3558_EQ_3558U(...)  \,
+#define Z_IS_3558U_EQ_3558U(...) \,
+#define Z_IS_3559_EQ_3559(...)   \,
+#define Z_IS_3559U_EQ_3559(...)  \,
+#define Z_IS_3559_EQ_3559U(...)  \,
+#define Z_IS_3559U_EQ_3559U(...) \,
+#define Z_IS_3560_EQ_3560(...)   \,
+#define Z_IS_3560U_EQ_3560(...)  \,
+#define Z_IS_3560_EQ_3560U(...)  \,
+#define Z_IS_3560U_EQ_3560U(...) \,
+#define Z_IS_3561_EQ_3561(...)   \,
+#define Z_IS_3561U_EQ_3561(...)  \,
+#define Z_IS_3561_EQ_3561U(...)  \,
+#define Z_IS_3561U_EQ_3561U(...) \,
+#define Z_IS_3562_EQ_3562(...)   \,
+#define Z_IS_3562U_EQ_3562(...)  \,
+#define Z_IS_3562_EQ_3562U(...)  \,
+#define Z_IS_3562U_EQ_3562U(...) \,
+#define Z_IS_3563_EQ_3563(...)   \,
+#define Z_IS_3563U_EQ_3563(...)  \,
+#define Z_IS_3563_EQ_3563U(...)  \,
+#define Z_IS_3563U_EQ_3563U(...) \,
+#define Z_IS_3564_EQ_3564(...)   \,
+#define Z_IS_3564U_EQ_3564(...)  \,
+#define Z_IS_3564_EQ_3564U(...)  \,
+#define Z_IS_3564U_EQ_3564U(...) \,
+#define Z_IS_3565_EQ_3565(...)   \,
+#define Z_IS_3565U_EQ_3565(...)  \,
+#define Z_IS_3565_EQ_3565U(...)  \,
+#define Z_IS_3565U_EQ_3565U(...) \,
+#define Z_IS_3566_EQ_3566(...)   \,
+#define Z_IS_3566U_EQ_3566(...)  \,
+#define Z_IS_3566_EQ_3566U(...)  \,
+#define Z_IS_3566U_EQ_3566U(...) \,
+#define Z_IS_3567_EQ_3567(...)   \,
+#define Z_IS_3567U_EQ_3567(...)  \,
+#define Z_IS_3567_EQ_3567U(...)  \,
+#define Z_IS_3567U_EQ_3567U(...) \,
+#define Z_IS_3568_EQ_3568(...)   \,
+#define Z_IS_3568U_EQ_3568(...)  \,
+#define Z_IS_3568_EQ_3568U(...)  \,
+#define Z_IS_3568U_EQ_3568U(...) \,
+#define Z_IS_3569_EQ_3569(...)   \,
+#define Z_IS_3569U_EQ_3569(...)  \,
+#define Z_IS_3569_EQ_3569U(...)  \,
+#define Z_IS_3569U_EQ_3569U(...) \,
+#define Z_IS_3570_EQ_3570(...)   \,
+#define Z_IS_3570U_EQ_3570(...)  \,
+#define Z_IS_3570_EQ_3570U(...)  \,
+#define Z_IS_3570U_EQ_3570U(...) \,
+#define Z_IS_3571_EQ_3571(...)   \,
+#define Z_IS_3571U_EQ_3571(...)  \,
+#define Z_IS_3571_EQ_3571U(...)  \,
+#define Z_IS_3571U_EQ_3571U(...) \,
+#define Z_IS_3572_EQ_3572(...)   \,
+#define Z_IS_3572U_EQ_3572(...)  \,
+#define Z_IS_3572_EQ_3572U(...)  \,
+#define Z_IS_3572U_EQ_3572U(...) \,
+#define Z_IS_3573_EQ_3573(...)   \,
+#define Z_IS_3573U_EQ_3573(...)  \,
+#define Z_IS_3573_EQ_3573U(...)  \,
+#define Z_IS_3573U_EQ_3573U(...) \,
+#define Z_IS_3574_EQ_3574(...)   \,
+#define Z_IS_3574U_EQ_3574(...)  \,
+#define Z_IS_3574_EQ_3574U(...)  \,
+#define Z_IS_3574U_EQ_3574U(...) \,
+#define Z_IS_3575_EQ_3575(...)   \,
+#define Z_IS_3575U_EQ_3575(...)  \,
+#define Z_IS_3575_EQ_3575U(...)  \,
+#define Z_IS_3575U_EQ_3575U(...) \,
+#define Z_IS_3576_EQ_3576(...)   \,
+#define Z_IS_3576U_EQ_3576(...)  \,
+#define Z_IS_3576_EQ_3576U(...)  \,
+#define Z_IS_3576U_EQ_3576U(...) \,
+#define Z_IS_3577_EQ_3577(...)   \,
+#define Z_IS_3577U_EQ_3577(...)  \,
+#define Z_IS_3577_EQ_3577U(...)  \,
+#define Z_IS_3577U_EQ_3577U(...) \,
+#define Z_IS_3578_EQ_3578(...)   \,
+#define Z_IS_3578U_EQ_3578(...)  \,
+#define Z_IS_3578_EQ_3578U(...)  \,
+#define Z_IS_3578U_EQ_3578U(...) \,
+#define Z_IS_3579_EQ_3579(...)   \,
+#define Z_IS_3579U_EQ_3579(...)  \,
+#define Z_IS_3579_EQ_3579U(...)  \,
+#define Z_IS_3579U_EQ_3579U(...) \,
+#define Z_IS_3580_EQ_3580(...)   \,
+#define Z_IS_3580U_EQ_3580(...)  \,
+#define Z_IS_3580_EQ_3580U(...)  \,
+#define Z_IS_3580U_EQ_3580U(...) \,
+#define Z_IS_3581_EQ_3581(...)   \,
+#define Z_IS_3581U_EQ_3581(...)  \,
+#define Z_IS_3581_EQ_3581U(...)  \,
+#define Z_IS_3581U_EQ_3581U(...) \,
+#define Z_IS_3582_EQ_3582(...)   \,
+#define Z_IS_3582U_EQ_3582(...)  \,
+#define Z_IS_3582_EQ_3582U(...)  \,
+#define Z_IS_3582U_EQ_3582U(...) \,
+#define Z_IS_3583_EQ_3583(...)   \,
+#define Z_IS_3583U_EQ_3583(...)  \,
+#define Z_IS_3583_EQ_3583U(...)  \,
+#define Z_IS_3583U_EQ_3583U(...) \,
+#define Z_IS_3584_EQ_3584(...)   \,
+#define Z_IS_3584U_EQ_3584(...)  \,
+#define Z_IS_3584_EQ_3584U(...)  \,
+#define Z_IS_3584U_EQ_3584U(...) \,
+#define Z_IS_3585_EQ_3585(...)   \,
+#define Z_IS_3585U_EQ_3585(...)  \,
+#define Z_IS_3585_EQ_3585U(...)  \,
+#define Z_IS_3585U_EQ_3585U(...) \,
+#define Z_IS_3586_EQ_3586(...)   \,
+#define Z_IS_3586U_EQ_3586(...)  \,
+#define Z_IS_3586_EQ_3586U(...)  \,
+#define Z_IS_3586U_EQ_3586U(...) \,
+#define Z_IS_3587_EQ_3587(...)   \,
+#define Z_IS_3587U_EQ_3587(...)  \,
+#define Z_IS_3587_EQ_3587U(...)  \,
+#define Z_IS_3587U_EQ_3587U(...) \,
+#define Z_IS_3588_EQ_3588(...)   \,
+#define Z_IS_3588U_EQ_3588(...)  \,
+#define Z_IS_3588_EQ_3588U(...)  \,
+#define Z_IS_3588U_EQ_3588U(...) \,
+#define Z_IS_3589_EQ_3589(...)   \,
+#define Z_IS_3589U_EQ_3589(...)  \,
+#define Z_IS_3589_EQ_3589U(...)  \,
+#define Z_IS_3589U_EQ_3589U(...) \,
+#define Z_IS_3590_EQ_3590(...)   \,
+#define Z_IS_3590U_EQ_3590(...)  \,
+#define Z_IS_3590_EQ_3590U(...)  \,
+#define Z_IS_3590U_EQ_3590U(...) \,
+#define Z_IS_3591_EQ_3591(...)   \,
+#define Z_IS_3591U_EQ_3591(...)  \,
+#define Z_IS_3591_EQ_3591U(...)  \,
+#define Z_IS_3591U_EQ_3591U(...) \,
+#define Z_IS_3592_EQ_3592(...)   \,
+#define Z_IS_3592U_EQ_3592(...)  \,
+#define Z_IS_3592_EQ_3592U(...)  \,
+#define Z_IS_3592U_EQ_3592U(...) \,
+#define Z_IS_3593_EQ_3593(...)   \,
+#define Z_IS_3593U_EQ_3593(...)  \,
+#define Z_IS_3593_EQ_3593U(...)  \,
+#define Z_IS_3593U_EQ_3593U(...) \,
+#define Z_IS_3594_EQ_3594(...)   \,
+#define Z_IS_3594U_EQ_3594(...)  \,
+#define Z_IS_3594_EQ_3594U(...)  \,
+#define Z_IS_3594U_EQ_3594U(...) \,
+#define Z_IS_3595_EQ_3595(...)   \,
+#define Z_IS_3595U_EQ_3595(...)  \,
+#define Z_IS_3595_EQ_3595U(...)  \,
+#define Z_IS_3595U_EQ_3595U(...) \,
+#define Z_IS_3596_EQ_3596(...)   \,
+#define Z_IS_3596U_EQ_3596(...)  \,
+#define Z_IS_3596_EQ_3596U(...)  \,
+#define Z_IS_3596U_EQ_3596U(...) \,
+#define Z_IS_3597_EQ_3597(...)   \,
+#define Z_IS_3597U_EQ_3597(...)  \,
+#define Z_IS_3597_EQ_3597U(...)  \,
+#define Z_IS_3597U_EQ_3597U(...) \,
+#define Z_IS_3598_EQ_3598(...)   \,
+#define Z_IS_3598U_EQ_3598(...)  \,
+#define Z_IS_3598_EQ_3598U(...)  \,
+#define Z_IS_3598U_EQ_3598U(...) \,
+#define Z_IS_3599_EQ_3599(...)   \,
+#define Z_IS_3599U_EQ_3599(...)  \,
+#define Z_IS_3599_EQ_3599U(...)  \,
+#define Z_IS_3599U_EQ_3599U(...) \,
+#define Z_IS_3600_EQ_3600(...)   \,
+#define Z_IS_3600U_EQ_3600(...)  \,
+#define Z_IS_3600_EQ_3600U(...)  \,
+#define Z_IS_3600U_EQ_3600U(...) \,
+#define Z_IS_3601_EQ_3601(...)   \,
+#define Z_IS_3601U_EQ_3601(...)  \,
+#define Z_IS_3601_EQ_3601U(...)  \,
+#define Z_IS_3601U_EQ_3601U(...) \,
+#define Z_IS_3602_EQ_3602(...)   \,
+#define Z_IS_3602U_EQ_3602(...)  \,
+#define Z_IS_3602_EQ_3602U(...)  \,
+#define Z_IS_3602U_EQ_3602U(...) \,
+#define Z_IS_3603_EQ_3603(...)   \,
+#define Z_IS_3603U_EQ_3603(...)  \,
+#define Z_IS_3603_EQ_3603U(...)  \,
+#define Z_IS_3603U_EQ_3603U(...) \,
+#define Z_IS_3604_EQ_3604(...)   \,
+#define Z_IS_3604U_EQ_3604(...)  \,
+#define Z_IS_3604_EQ_3604U(...)  \,
+#define Z_IS_3604U_EQ_3604U(...) \,
+#define Z_IS_3605_EQ_3605(...)   \,
+#define Z_IS_3605U_EQ_3605(...)  \,
+#define Z_IS_3605_EQ_3605U(...)  \,
+#define Z_IS_3605U_EQ_3605U(...) \,
+#define Z_IS_3606_EQ_3606(...)   \,
+#define Z_IS_3606U_EQ_3606(...)  \,
+#define Z_IS_3606_EQ_3606U(...)  \,
+#define Z_IS_3606U_EQ_3606U(...) \,
+#define Z_IS_3607_EQ_3607(...)   \,
+#define Z_IS_3607U_EQ_3607(...)  \,
+#define Z_IS_3607_EQ_3607U(...)  \,
+#define Z_IS_3607U_EQ_3607U(...) \,
+#define Z_IS_3608_EQ_3608(...)   \,
+#define Z_IS_3608U_EQ_3608(...)  \,
+#define Z_IS_3608_EQ_3608U(...)  \,
+#define Z_IS_3608U_EQ_3608U(...) \,
+#define Z_IS_3609_EQ_3609(...)   \,
+#define Z_IS_3609U_EQ_3609(...)  \,
+#define Z_IS_3609_EQ_3609U(...)  \,
+#define Z_IS_3609U_EQ_3609U(...) \,
+#define Z_IS_3610_EQ_3610(...)   \,
+#define Z_IS_3610U_EQ_3610(...)  \,
+#define Z_IS_3610_EQ_3610U(...)  \,
+#define Z_IS_3610U_EQ_3610U(...) \,
+#define Z_IS_3611_EQ_3611(...)   \,
+#define Z_IS_3611U_EQ_3611(...)  \,
+#define Z_IS_3611_EQ_3611U(...)  \,
+#define Z_IS_3611U_EQ_3611U(...) \,
+#define Z_IS_3612_EQ_3612(...)   \,
+#define Z_IS_3612U_EQ_3612(...)  \,
+#define Z_IS_3612_EQ_3612U(...)  \,
+#define Z_IS_3612U_EQ_3612U(...) \,
+#define Z_IS_3613_EQ_3613(...)   \,
+#define Z_IS_3613U_EQ_3613(...)  \,
+#define Z_IS_3613_EQ_3613U(...)  \,
+#define Z_IS_3613U_EQ_3613U(...) \,
+#define Z_IS_3614_EQ_3614(...)   \,
+#define Z_IS_3614U_EQ_3614(...)  \,
+#define Z_IS_3614_EQ_3614U(...)  \,
+#define Z_IS_3614U_EQ_3614U(...) \,
+#define Z_IS_3615_EQ_3615(...)   \,
+#define Z_IS_3615U_EQ_3615(...)  \,
+#define Z_IS_3615_EQ_3615U(...)  \,
+#define Z_IS_3615U_EQ_3615U(...) \,
+#define Z_IS_3616_EQ_3616(...)   \,
+#define Z_IS_3616U_EQ_3616(...)  \,
+#define Z_IS_3616_EQ_3616U(...)  \,
+#define Z_IS_3616U_EQ_3616U(...) \,
+#define Z_IS_3617_EQ_3617(...)   \,
+#define Z_IS_3617U_EQ_3617(...)  \,
+#define Z_IS_3617_EQ_3617U(...)  \,
+#define Z_IS_3617U_EQ_3617U(...) \,
+#define Z_IS_3618_EQ_3618(...)   \,
+#define Z_IS_3618U_EQ_3618(...)  \,
+#define Z_IS_3618_EQ_3618U(...)  \,
+#define Z_IS_3618U_EQ_3618U(...) \,
+#define Z_IS_3619_EQ_3619(...)   \,
+#define Z_IS_3619U_EQ_3619(...)  \,
+#define Z_IS_3619_EQ_3619U(...)  \,
+#define Z_IS_3619U_EQ_3619U(...) \,
+#define Z_IS_3620_EQ_3620(...)   \,
+#define Z_IS_3620U_EQ_3620(...)  \,
+#define Z_IS_3620_EQ_3620U(...)  \,
+#define Z_IS_3620U_EQ_3620U(...) \,
+#define Z_IS_3621_EQ_3621(...)   \,
+#define Z_IS_3621U_EQ_3621(...)  \,
+#define Z_IS_3621_EQ_3621U(...)  \,
+#define Z_IS_3621U_EQ_3621U(...) \,
+#define Z_IS_3622_EQ_3622(...)   \,
+#define Z_IS_3622U_EQ_3622(...)  \,
+#define Z_IS_3622_EQ_3622U(...)  \,
+#define Z_IS_3622U_EQ_3622U(...) \,
+#define Z_IS_3623_EQ_3623(...)   \,
+#define Z_IS_3623U_EQ_3623(...)  \,
+#define Z_IS_3623_EQ_3623U(...)  \,
+#define Z_IS_3623U_EQ_3623U(...) \,
+#define Z_IS_3624_EQ_3624(...)   \,
+#define Z_IS_3624U_EQ_3624(...)  \,
+#define Z_IS_3624_EQ_3624U(...)  \,
+#define Z_IS_3624U_EQ_3624U(...) \,
+#define Z_IS_3625_EQ_3625(...)   \,
+#define Z_IS_3625U_EQ_3625(...)  \,
+#define Z_IS_3625_EQ_3625U(...)  \,
+#define Z_IS_3625U_EQ_3625U(...) \,
+#define Z_IS_3626_EQ_3626(...)   \,
+#define Z_IS_3626U_EQ_3626(...)  \,
+#define Z_IS_3626_EQ_3626U(...)  \,
+#define Z_IS_3626U_EQ_3626U(...) \,
+#define Z_IS_3627_EQ_3627(...)   \,
+#define Z_IS_3627U_EQ_3627(...)  \,
+#define Z_IS_3627_EQ_3627U(...)  \,
+#define Z_IS_3627U_EQ_3627U(...) \,
+#define Z_IS_3628_EQ_3628(...)   \,
+#define Z_IS_3628U_EQ_3628(...)  \,
+#define Z_IS_3628_EQ_3628U(...)  \,
+#define Z_IS_3628U_EQ_3628U(...) \,
+#define Z_IS_3629_EQ_3629(...)   \,
+#define Z_IS_3629U_EQ_3629(...)  \,
+#define Z_IS_3629_EQ_3629U(...)  \,
+#define Z_IS_3629U_EQ_3629U(...) \,
+#define Z_IS_3630_EQ_3630(...)   \,
+#define Z_IS_3630U_EQ_3630(...)  \,
+#define Z_IS_3630_EQ_3630U(...)  \,
+#define Z_IS_3630U_EQ_3630U(...) \,
+#define Z_IS_3631_EQ_3631(...)   \,
+#define Z_IS_3631U_EQ_3631(...)  \,
+#define Z_IS_3631_EQ_3631U(...)  \,
+#define Z_IS_3631U_EQ_3631U(...) \,
+#define Z_IS_3632_EQ_3632(...)   \,
+#define Z_IS_3632U_EQ_3632(...)  \,
+#define Z_IS_3632_EQ_3632U(...)  \,
+#define Z_IS_3632U_EQ_3632U(...) \,
+#define Z_IS_3633_EQ_3633(...)   \,
+#define Z_IS_3633U_EQ_3633(...)  \,
+#define Z_IS_3633_EQ_3633U(...)  \,
+#define Z_IS_3633U_EQ_3633U(...) \,
+#define Z_IS_3634_EQ_3634(...)   \,
+#define Z_IS_3634U_EQ_3634(...)  \,
+#define Z_IS_3634_EQ_3634U(...)  \,
+#define Z_IS_3634U_EQ_3634U(...) \,
+#define Z_IS_3635_EQ_3635(...)   \,
+#define Z_IS_3635U_EQ_3635(...)  \,
+#define Z_IS_3635_EQ_3635U(...)  \,
+#define Z_IS_3635U_EQ_3635U(...) \,
+#define Z_IS_3636_EQ_3636(...)   \,
+#define Z_IS_3636U_EQ_3636(...)  \,
+#define Z_IS_3636_EQ_3636U(...)  \,
+#define Z_IS_3636U_EQ_3636U(...) \,
+#define Z_IS_3637_EQ_3637(...)   \,
+#define Z_IS_3637U_EQ_3637(...)  \,
+#define Z_IS_3637_EQ_3637U(...)  \,
+#define Z_IS_3637U_EQ_3637U(...) \,
+#define Z_IS_3638_EQ_3638(...)   \,
+#define Z_IS_3638U_EQ_3638(...)  \,
+#define Z_IS_3638_EQ_3638U(...)  \,
+#define Z_IS_3638U_EQ_3638U(...) \,
+#define Z_IS_3639_EQ_3639(...)   \,
+#define Z_IS_3639U_EQ_3639(...)  \,
+#define Z_IS_3639_EQ_3639U(...)  \,
+#define Z_IS_3639U_EQ_3639U(...) \,
+#define Z_IS_3640_EQ_3640(...)   \,
+#define Z_IS_3640U_EQ_3640(...)  \,
+#define Z_IS_3640_EQ_3640U(...)  \,
+#define Z_IS_3640U_EQ_3640U(...) \,
+#define Z_IS_3641_EQ_3641(...)   \,
+#define Z_IS_3641U_EQ_3641(...)  \,
+#define Z_IS_3641_EQ_3641U(...)  \,
+#define Z_IS_3641U_EQ_3641U(...) \,
+#define Z_IS_3642_EQ_3642(...)   \,
+#define Z_IS_3642U_EQ_3642(...)  \,
+#define Z_IS_3642_EQ_3642U(...)  \,
+#define Z_IS_3642U_EQ_3642U(...) \,
+#define Z_IS_3643_EQ_3643(...)   \,
+#define Z_IS_3643U_EQ_3643(...)  \,
+#define Z_IS_3643_EQ_3643U(...)  \,
+#define Z_IS_3643U_EQ_3643U(...) \,
+#define Z_IS_3644_EQ_3644(...)   \,
+#define Z_IS_3644U_EQ_3644(...)  \,
+#define Z_IS_3644_EQ_3644U(...)  \,
+#define Z_IS_3644U_EQ_3644U(...) \,
+#define Z_IS_3645_EQ_3645(...)   \,
+#define Z_IS_3645U_EQ_3645(...)  \,
+#define Z_IS_3645_EQ_3645U(...)  \,
+#define Z_IS_3645U_EQ_3645U(...) \,
+#define Z_IS_3646_EQ_3646(...)   \,
+#define Z_IS_3646U_EQ_3646(...)  \,
+#define Z_IS_3646_EQ_3646U(...)  \,
+#define Z_IS_3646U_EQ_3646U(...) \,
+#define Z_IS_3647_EQ_3647(...)   \,
+#define Z_IS_3647U_EQ_3647(...)  \,
+#define Z_IS_3647_EQ_3647U(...)  \,
+#define Z_IS_3647U_EQ_3647U(...) \,
+#define Z_IS_3648_EQ_3648(...)   \,
+#define Z_IS_3648U_EQ_3648(...)  \,
+#define Z_IS_3648_EQ_3648U(...)  \,
+#define Z_IS_3648U_EQ_3648U(...) \,
+#define Z_IS_3649_EQ_3649(...)   \,
+#define Z_IS_3649U_EQ_3649(...)  \,
+#define Z_IS_3649_EQ_3649U(...)  \,
+#define Z_IS_3649U_EQ_3649U(...) \,
+#define Z_IS_3650_EQ_3650(...)   \,
+#define Z_IS_3650U_EQ_3650(...)  \,
+#define Z_IS_3650_EQ_3650U(...)  \,
+#define Z_IS_3650U_EQ_3650U(...) \,
+#define Z_IS_3651_EQ_3651(...)   \,
+#define Z_IS_3651U_EQ_3651(...)  \,
+#define Z_IS_3651_EQ_3651U(...)  \,
+#define Z_IS_3651U_EQ_3651U(...) \,
+#define Z_IS_3652_EQ_3652(...)   \,
+#define Z_IS_3652U_EQ_3652(...)  \,
+#define Z_IS_3652_EQ_3652U(...)  \,
+#define Z_IS_3652U_EQ_3652U(...) \,
+#define Z_IS_3653_EQ_3653(...)   \,
+#define Z_IS_3653U_EQ_3653(...)  \,
+#define Z_IS_3653_EQ_3653U(...)  \,
+#define Z_IS_3653U_EQ_3653U(...) \,
+#define Z_IS_3654_EQ_3654(...)   \,
+#define Z_IS_3654U_EQ_3654(...)  \,
+#define Z_IS_3654_EQ_3654U(...)  \,
+#define Z_IS_3654U_EQ_3654U(...) \,
+#define Z_IS_3655_EQ_3655(...)   \,
+#define Z_IS_3655U_EQ_3655(...)  \,
+#define Z_IS_3655_EQ_3655U(...)  \,
+#define Z_IS_3655U_EQ_3655U(...) \,
+#define Z_IS_3656_EQ_3656(...)   \,
+#define Z_IS_3656U_EQ_3656(...)  \,
+#define Z_IS_3656_EQ_3656U(...)  \,
+#define Z_IS_3656U_EQ_3656U(...) \,
+#define Z_IS_3657_EQ_3657(...)   \,
+#define Z_IS_3657U_EQ_3657(...)  \,
+#define Z_IS_3657_EQ_3657U(...)  \,
+#define Z_IS_3657U_EQ_3657U(...) \,
+#define Z_IS_3658_EQ_3658(...)   \,
+#define Z_IS_3658U_EQ_3658(...)  \,
+#define Z_IS_3658_EQ_3658U(...)  \,
+#define Z_IS_3658U_EQ_3658U(...) \,
+#define Z_IS_3659_EQ_3659(...)   \,
+#define Z_IS_3659U_EQ_3659(...)  \,
+#define Z_IS_3659_EQ_3659U(...)  \,
+#define Z_IS_3659U_EQ_3659U(...) \,
+#define Z_IS_3660_EQ_3660(...)   \,
+#define Z_IS_3660U_EQ_3660(...)  \,
+#define Z_IS_3660_EQ_3660U(...)  \,
+#define Z_IS_3660U_EQ_3660U(...) \,
+#define Z_IS_3661_EQ_3661(...)   \,
+#define Z_IS_3661U_EQ_3661(...)  \,
+#define Z_IS_3661_EQ_3661U(...)  \,
+#define Z_IS_3661U_EQ_3661U(...) \,
+#define Z_IS_3662_EQ_3662(...)   \,
+#define Z_IS_3662U_EQ_3662(...)  \,
+#define Z_IS_3662_EQ_3662U(...)  \,
+#define Z_IS_3662U_EQ_3662U(...) \,
+#define Z_IS_3663_EQ_3663(...)   \,
+#define Z_IS_3663U_EQ_3663(...)  \,
+#define Z_IS_3663_EQ_3663U(...)  \,
+#define Z_IS_3663U_EQ_3663U(...) \,
+#define Z_IS_3664_EQ_3664(...)   \,
+#define Z_IS_3664U_EQ_3664(...)  \,
+#define Z_IS_3664_EQ_3664U(...)  \,
+#define Z_IS_3664U_EQ_3664U(...) \,
+#define Z_IS_3665_EQ_3665(...)   \,
+#define Z_IS_3665U_EQ_3665(...)  \,
+#define Z_IS_3665_EQ_3665U(...)  \,
+#define Z_IS_3665U_EQ_3665U(...) \,
+#define Z_IS_3666_EQ_3666(...)   \,
+#define Z_IS_3666U_EQ_3666(...)  \,
+#define Z_IS_3666_EQ_3666U(...)  \,
+#define Z_IS_3666U_EQ_3666U(...) \,
+#define Z_IS_3667_EQ_3667(...)   \,
+#define Z_IS_3667U_EQ_3667(...)  \,
+#define Z_IS_3667_EQ_3667U(...)  \,
+#define Z_IS_3667U_EQ_3667U(...) \,
+#define Z_IS_3668_EQ_3668(...)   \,
+#define Z_IS_3668U_EQ_3668(...)  \,
+#define Z_IS_3668_EQ_3668U(...)  \,
+#define Z_IS_3668U_EQ_3668U(...) \,
+#define Z_IS_3669_EQ_3669(...)   \,
+#define Z_IS_3669U_EQ_3669(...)  \,
+#define Z_IS_3669_EQ_3669U(...)  \,
+#define Z_IS_3669U_EQ_3669U(...) \,
+#define Z_IS_3670_EQ_3670(...)   \,
+#define Z_IS_3670U_EQ_3670(...)  \,
+#define Z_IS_3670_EQ_3670U(...)  \,
+#define Z_IS_3670U_EQ_3670U(...) \,
+#define Z_IS_3671_EQ_3671(...)   \,
+#define Z_IS_3671U_EQ_3671(...)  \,
+#define Z_IS_3671_EQ_3671U(...)  \,
+#define Z_IS_3671U_EQ_3671U(...) \,
+#define Z_IS_3672_EQ_3672(...)   \,
+#define Z_IS_3672U_EQ_3672(...)  \,
+#define Z_IS_3672_EQ_3672U(...)  \,
+#define Z_IS_3672U_EQ_3672U(...) \,
+#define Z_IS_3673_EQ_3673(...)   \,
+#define Z_IS_3673U_EQ_3673(...)  \,
+#define Z_IS_3673_EQ_3673U(...)  \,
+#define Z_IS_3673U_EQ_3673U(...) \,
+#define Z_IS_3674_EQ_3674(...)   \,
+#define Z_IS_3674U_EQ_3674(...)  \,
+#define Z_IS_3674_EQ_3674U(...)  \,
+#define Z_IS_3674U_EQ_3674U(...) \,
+#define Z_IS_3675_EQ_3675(...)   \,
+#define Z_IS_3675U_EQ_3675(...)  \,
+#define Z_IS_3675_EQ_3675U(...)  \,
+#define Z_IS_3675U_EQ_3675U(...) \,
+#define Z_IS_3676_EQ_3676(...)   \,
+#define Z_IS_3676U_EQ_3676(...)  \,
+#define Z_IS_3676_EQ_3676U(...)  \,
+#define Z_IS_3676U_EQ_3676U(...) \,
+#define Z_IS_3677_EQ_3677(...)   \,
+#define Z_IS_3677U_EQ_3677(...)  \,
+#define Z_IS_3677_EQ_3677U(...)  \,
+#define Z_IS_3677U_EQ_3677U(...) \,
+#define Z_IS_3678_EQ_3678(...)   \,
+#define Z_IS_3678U_EQ_3678(...)  \,
+#define Z_IS_3678_EQ_3678U(...)  \,
+#define Z_IS_3678U_EQ_3678U(...) \,
+#define Z_IS_3679_EQ_3679(...)   \,
+#define Z_IS_3679U_EQ_3679(...)  \,
+#define Z_IS_3679_EQ_3679U(...)  \,
+#define Z_IS_3679U_EQ_3679U(...) \,
+#define Z_IS_3680_EQ_3680(...)   \,
+#define Z_IS_3680U_EQ_3680(...)  \,
+#define Z_IS_3680_EQ_3680U(...)  \,
+#define Z_IS_3680U_EQ_3680U(...) \,
+#define Z_IS_3681_EQ_3681(...)   \,
+#define Z_IS_3681U_EQ_3681(...)  \,
+#define Z_IS_3681_EQ_3681U(...)  \,
+#define Z_IS_3681U_EQ_3681U(...) \,
+#define Z_IS_3682_EQ_3682(...)   \,
+#define Z_IS_3682U_EQ_3682(...)  \,
+#define Z_IS_3682_EQ_3682U(...)  \,
+#define Z_IS_3682U_EQ_3682U(...) \,
+#define Z_IS_3683_EQ_3683(...)   \,
+#define Z_IS_3683U_EQ_3683(...)  \,
+#define Z_IS_3683_EQ_3683U(...)  \,
+#define Z_IS_3683U_EQ_3683U(...) \,
+#define Z_IS_3684_EQ_3684(...)   \,
+#define Z_IS_3684U_EQ_3684(...)  \,
+#define Z_IS_3684_EQ_3684U(...)  \,
+#define Z_IS_3684U_EQ_3684U(...) \,
+#define Z_IS_3685_EQ_3685(...)   \,
+#define Z_IS_3685U_EQ_3685(...)  \,
+#define Z_IS_3685_EQ_3685U(...)  \,
+#define Z_IS_3685U_EQ_3685U(...) \,
+#define Z_IS_3686_EQ_3686(...)   \,
+#define Z_IS_3686U_EQ_3686(...)  \,
+#define Z_IS_3686_EQ_3686U(...)  \,
+#define Z_IS_3686U_EQ_3686U(...) \,
+#define Z_IS_3687_EQ_3687(...)   \,
+#define Z_IS_3687U_EQ_3687(...)  \,
+#define Z_IS_3687_EQ_3687U(...)  \,
+#define Z_IS_3687U_EQ_3687U(...) \,
+#define Z_IS_3688_EQ_3688(...)   \,
+#define Z_IS_3688U_EQ_3688(...)  \,
+#define Z_IS_3688_EQ_3688U(...)  \,
+#define Z_IS_3688U_EQ_3688U(...) \,
+#define Z_IS_3689_EQ_3689(...)   \,
+#define Z_IS_3689U_EQ_3689(...)  \,
+#define Z_IS_3689_EQ_3689U(...)  \,
+#define Z_IS_3689U_EQ_3689U(...) \,
+#define Z_IS_3690_EQ_3690(...)   \,
+#define Z_IS_3690U_EQ_3690(...)  \,
+#define Z_IS_3690_EQ_3690U(...)  \,
+#define Z_IS_3690U_EQ_3690U(...) \,
+#define Z_IS_3691_EQ_3691(...)   \,
+#define Z_IS_3691U_EQ_3691(...)  \,
+#define Z_IS_3691_EQ_3691U(...)  \,
+#define Z_IS_3691U_EQ_3691U(...) \,
+#define Z_IS_3692_EQ_3692(...)   \,
+#define Z_IS_3692U_EQ_3692(...)  \,
+#define Z_IS_3692_EQ_3692U(...)  \,
+#define Z_IS_3692U_EQ_3692U(...) \,
+#define Z_IS_3693_EQ_3693(...)   \,
+#define Z_IS_3693U_EQ_3693(...)  \,
+#define Z_IS_3693_EQ_3693U(...)  \,
+#define Z_IS_3693U_EQ_3693U(...) \,
+#define Z_IS_3694_EQ_3694(...)   \,
+#define Z_IS_3694U_EQ_3694(...)  \,
+#define Z_IS_3694_EQ_3694U(...)  \,
+#define Z_IS_3694U_EQ_3694U(...) \,
+#define Z_IS_3695_EQ_3695(...)   \,
+#define Z_IS_3695U_EQ_3695(...)  \,
+#define Z_IS_3695_EQ_3695U(...)  \,
+#define Z_IS_3695U_EQ_3695U(...) \,
+#define Z_IS_3696_EQ_3696(...)   \,
+#define Z_IS_3696U_EQ_3696(...)  \,
+#define Z_IS_3696_EQ_3696U(...)  \,
+#define Z_IS_3696U_EQ_3696U(...) \,
+#define Z_IS_3697_EQ_3697(...)   \,
+#define Z_IS_3697U_EQ_3697(...)  \,
+#define Z_IS_3697_EQ_3697U(...)  \,
+#define Z_IS_3697U_EQ_3697U(...) \,
+#define Z_IS_3698_EQ_3698(...)   \,
+#define Z_IS_3698U_EQ_3698(...)  \,
+#define Z_IS_3698_EQ_3698U(...)  \,
+#define Z_IS_3698U_EQ_3698U(...) \,
+#define Z_IS_3699_EQ_3699(...)   \,
+#define Z_IS_3699U_EQ_3699(...)  \,
+#define Z_IS_3699_EQ_3699U(...)  \,
+#define Z_IS_3699U_EQ_3699U(...) \,
+#define Z_IS_3700_EQ_3700(...)   \,
+#define Z_IS_3700U_EQ_3700(...)  \,
+#define Z_IS_3700_EQ_3700U(...)  \,
+#define Z_IS_3700U_EQ_3700U(...) \,
+#define Z_IS_3701_EQ_3701(...)   \,
+#define Z_IS_3701U_EQ_3701(...)  \,
+#define Z_IS_3701_EQ_3701U(...)  \,
+#define Z_IS_3701U_EQ_3701U(...) \,
+#define Z_IS_3702_EQ_3702(...)   \,
+#define Z_IS_3702U_EQ_3702(...)  \,
+#define Z_IS_3702_EQ_3702U(...)  \,
+#define Z_IS_3702U_EQ_3702U(...) \,
+#define Z_IS_3703_EQ_3703(...)   \,
+#define Z_IS_3703U_EQ_3703(...)  \,
+#define Z_IS_3703_EQ_3703U(...)  \,
+#define Z_IS_3703U_EQ_3703U(...) \,
+#define Z_IS_3704_EQ_3704(...)   \,
+#define Z_IS_3704U_EQ_3704(...)  \,
+#define Z_IS_3704_EQ_3704U(...)  \,
+#define Z_IS_3704U_EQ_3704U(...) \,
+#define Z_IS_3705_EQ_3705(...)   \,
+#define Z_IS_3705U_EQ_3705(...)  \,
+#define Z_IS_3705_EQ_3705U(...)  \,
+#define Z_IS_3705U_EQ_3705U(...) \,
+#define Z_IS_3706_EQ_3706(...)   \,
+#define Z_IS_3706U_EQ_3706(...)  \,
+#define Z_IS_3706_EQ_3706U(...)  \,
+#define Z_IS_3706U_EQ_3706U(...) \,
+#define Z_IS_3707_EQ_3707(...)   \,
+#define Z_IS_3707U_EQ_3707(...)  \,
+#define Z_IS_3707_EQ_3707U(...)  \,
+#define Z_IS_3707U_EQ_3707U(...) \,
+#define Z_IS_3708_EQ_3708(...)   \,
+#define Z_IS_3708U_EQ_3708(...)  \,
+#define Z_IS_3708_EQ_3708U(...)  \,
+#define Z_IS_3708U_EQ_3708U(...) \,
+#define Z_IS_3709_EQ_3709(...)   \,
+#define Z_IS_3709U_EQ_3709(...)  \,
+#define Z_IS_3709_EQ_3709U(...)  \,
+#define Z_IS_3709U_EQ_3709U(...) \,
+#define Z_IS_3710_EQ_3710(...)   \,
+#define Z_IS_3710U_EQ_3710(...)  \,
+#define Z_IS_3710_EQ_3710U(...)  \,
+#define Z_IS_3710U_EQ_3710U(...) \,
+#define Z_IS_3711_EQ_3711(...)   \,
+#define Z_IS_3711U_EQ_3711(...)  \,
+#define Z_IS_3711_EQ_3711U(...)  \,
+#define Z_IS_3711U_EQ_3711U(...) \,
+#define Z_IS_3712_EQ_3712(...)   \,
+#define Z_IS_3712U_EQ_3712(...)  \,
+#define Z_IS_3712_EQ_3712U(...)  \,
+#define Z_IS_3712U_EQ_3712U(...) \,
+#define Z_IS_3713_EQ_3713(...)   \,
+#define Z_IS_3713U_EQ_3713(...)  \,
+#define Z_IS_3713_EQ_3713U(...)  \,
+#define Z_IS_3713U_EQ_3713U(...) \,
+#define Z_IS_3714_EQ_3714(...)   \,
+#define Z_IS_3714U_EQ_3714(...)  \,
+#define Z_IS_3714_EQ_3714U(...)  \,
+#define Z_IS_3714U_EQ_3714U(...) \,
+#define Z_IS_3715_EQ_3715(...)   \,
+#define Z_IS_3715U_EQ_3715(...)  \,
+#define Z_IS_3715_EQ_3715U(...)  \,
+#define Z_IS_3715U_EQ_3715U(...) \,
+#define Z_IS_3716_EQ_3716(...)   \,
+#define Z_IS_3716U_EQ_3716(...)  \,
+#define Z_IS_3716_EQ_3716U(...)  \,
+#define Z_IS_3716U_EQ_3716U(...) \,
+#define Z_IS_3717_EQ_3717(...)   \,
+#define Z_IS_3717U_EQ_3717(...)  \,
+#define Z_IS_3717_EQ_3717U(...)  \,
+#define Z_IS_3717U_EQ_3717U(...) \,
+#define Z_IS_3718_EQ_3718(...)   \,
+#define Z_IS_3718U_EQ_3718(...)  \,
+#define Z_IS_3718_EQ_3718U(...)  \,
+#define Z_IS_3718U_EQ_3718U(...) \,
+#define Z_IS_3719_EQ_3719(...)   \,
+#define Z_IS_3719U_EQ_3719(...)  \,
+#define Z_IS_3719_EQ_3719U(...)  \,
+#define Z_IS_3719U_EQ_3719U(...) \,
+#define Z_IS_3720_EQ_3720(...)   \,
+#define Z_IS_3720U_EQ_3720(...)  \,
+#define Z_IS_3720_EQ_3720U(...)  \,
+#define Z_IS_3720U_EQ_3720U(...) \,
+#define Z_IS_3721_EQ_3721(...)   \,
+#define Z_IS_3721U_EQ_3721(...)  \,
+#define Z_IS_3721_EQ_3721U(...)  \,
+#define Z_IS_3721U_EQ_3721U(...) \,
+#define Z_IS_3722_EQ_3722(...)   \,
+#define Z_IS_3722U_EQ_3722(...)  \,
+#define Z_IS_3722_EQ_3722U(...)  \,
+#define Z_IS_3722U_EQ_3722U(...) \,
+#define Z_IS_3723_EQ_3723(...)   \,
+#define Z_IS_3723U_EQ_3723(...)  \,
+#define Z_IS_3723_EQ_3723U(...)  \,
+#define Z_IS_3723U_EQ_3723U(...) \,
+#define Z_IS_3724_EQ_3724(...)   \,
+#define Z_IS_3724U_EQ_3724(...)  \,
+#define Z_IS_3724_EQ_3724U(...)  \,
+#define Z_IS_3724U_EQ_3724U(...) \,
+#define Z_IS_3725_EQ_3725(...)   \,
+#define Z_IS_3725U_EQ_3725(...)  \,
+#define Z_IS_3725_EQ_3725U(...)  \,
+#define Z_IS_3725U_EQ_3725U(...) \,
+#define Z_IS_3726_EQ_3726(...)   \,
+#define Z_IS_3726U_EQ_3726(...)  \,
+#define Z_IS_3726_EQ_3726U(...)  \,
+#define Z_IS_3726U_EQ_3726U(...) \,
+#define Z_IS_3727_EQ_3727(...)   \,
+#define Z_IS_3727U_EQ_3727(...)  \,
+#define Z_IS_3727_EQ_3727U(...)  \,
+#define Z_IS_3727U_EQ_3727U(...) \,
+#define Z_IS_3728_EQ_3728(...)   \,
+#define Z_IS_3728U_EQ_3728(...)  \,
+#define Z_IS_3728_EQ_3728U(...)  \,
+#define Z_IS_3728U_EQ_3728U(...) \,
+#define Z_IS_3729_EQ_3729(...)   \,
+#define Z_IS_3729U_EQ_3729(...)  \,
+#define Z_IS_3729_EQ_3729U(...)  \,
+#define Z_IS_3729U_EQ_3729U(...) \,
+#define Z_IS_3730_EQ_3730(...)   \,
+#define Z_IS_3730U_EQ_3730(...)  \,
+#define Z_IS_3730_EQ_3730U(...)  \,
+#define Z_IS_3730U_EQ_3730U(...) \,
+#define Z_IS_3731_EQ_3731(...)   \,
+#define Z_IS_3731U_EQ_3731(...)  \,
+#define Z_IS_3731_EQ_3731U(...)  \,
+#define Z_IS_3731U_EQ_3731U(...) \,
+#define Z_IS_3732_EQ_3732(...)   \,
+#define Z_IS_3732U_EQ_3732(...)  \,
+#define Z_IS_3732_EQ_3732U(...)  \,
+#define Z_IS_3732U_EQ_3732U(...) \,
+#define Z_IS_3733_EQ_3733(...)   \,
+#define Z_IS_3733U_EQ_3733(...)  \,
+#define Z_IS_3733_EQ_3733U(...)  \,
+#define Z_IS_3733U_EQ_3733U(...) \,
+#define Z_IS_3734_EQ_3734(...)   \,
+#define Z_IS_3734U_EQ_3734(...)  \,
+#define Z_IS_3734_EQ_3734U(...)  \,
+#define Z_IS_3734U_EQ_3734U(...) \,
+#define Z_IS_3735_EQ_3735(...)   \,
+#define Z_IS_3735U_EQ_3735(...)  \,
+#define Z_IS_3735_EQ_3735U(...)  \,
+#define Z_IS_3735U_EQ_3735U(...) \,
+#define Z_IS_3736_EQ_3736(...)   \,
+#define Z_IS_3736U_EQ_3736(...)  \,
+#define Z_IS_3736_EQ_3736U(...)  \,
+#define Z_IS_3736U_EQ_3736U(...) \,
+#define Z_IS_3737_EQ_3737(...)   \,
+#define Z_IS_3737U_EQ_3737(...)  \,
+#define Z_IS_3737_EQ_3737U(...)  \,
+#define Z_IS_3737U_EQ_3737U(...) \,
+#define Z_IS_3738_EQ_3738(...)   \,
+#define Z_IS_3738U_EQ_3738(...)  \,
+#define Z_IS_3738_EQ_3738U(...)  \,
+#define Z_IS_3738U_EQ_3738U(...) \,
+#define Z_IS_3739_EQ_3739(...)   \,
+#define Z_IS_3739U_EQ_3739(...)  \,
+#define Z_IS_3739_EQ_3739U(...)  \,
+#define Z_IS_3739U_EQ_3739U(...) \,
+#define Z_IS_3740_EQ_3740(...)   \,
+#define Z_IS_3740U_EQ_3740(...)  \,
+#define Z_IS_3740_EQ_3740U(...)  \,
+#define Z_IS_3740U_EQ_3740U(...) \,
+#define Z_IS_3741_EQ_3741(...)   \,
+#define Z_IS_3741U_EQ_3741(...)  \,
+#define Z_IS_3741_EQ_3741U(...)  \,
+#define Z_IS_3741U_EQ_3741U(...) \,
+#define Z_IS_3742_EQ_3742(...)   \,
+#define Z_IS_3742U_EQ_3742(...)  \,
+#define Z_IS_3742_EQ_3742U(...)  \,
+#define Z_IS_3742U_EQ_3742U(...) \,
+#define Z_IS_3743_EQ_3743(...)   \,
+#define Z_IS_3743U_EQ_3743(...)  \,
+#define Z_IS_3743_EQ_3743U(...)  \,
+#define Z_IS_3743U_EQ_3743U(...) \,
+#define Z_IS_3744_EQ_3744(...)   \,
+#define Z_IS_3744U_EQ_3744(...)  \,
+#define Z_IS_3744_EQ_3744U(...)  \,
+#define Z_IS_3744U_EQ_3744U(...) \,
+#define Z_IS_3745_EQ_3745(...)   \,
+#define Z_IS_3745U_EQ_3745(...)  \,
+#define Z_IS_3745_EQ_3745U(...)  \,
+#define Z_IS_3745U_EQ_3745U(...) \,
+#define Z_IS_3746_EQ_3746(...)   \,
+#define Z_IS_3746U_EQ_3746(...)  \,
+#define Z_IS_3746_EQ_3746U(...)  \,
+#define Z_IS_3746U_EQ_3746U(...) \,
+#define Z_IS_3747_EQ_3747(...)   \,
+#define Z_IS_3747U_EQ_3747(...)  \,
+#define Z_IS_3747_EQ_3747U(...)  \,
+#define Z_IS_3747U_EQ_3747U(...) \,
+#define Z_IS_3748_EQ_3748(...)   \,
+#define Z_IS_3748U_EQ_3748(...)  \,
+#define Z_IS_3748_EQ_3748U(...)  \,
+#define Z_IS_3748U_EQ_3748U(...) \,
+#define Z_IS_3749_EQ_3749(...)   \,
+#define Z_IS_3749U_EQ_3749(...)  \,
+#define Z_IS_3749_EQ_3749U(...)  \,
+#define Z_IS_3749U_EQ_3749U(...) \,
+#define Z_IS_3750_EQ_3750(...)   \,
+#define Z_IS_3750U_EQ_3750(...)  \,
+#define Z_IS_3750_EQ_3750U(...)  \,
+#define Z_IS_3750U_EQ_3750U(...) \,
+#define Z_IS_3751_EQ_3751(...)   \,
+#define Z_IS_3751U_EQ_3751(...)  \,
+#define Z_IS_3751_EQ_3751U(...)  \,
+#define Z_IS_3751U_EQ_3751U(...) \,
+#define Z_IS_3752_EQ_3752(...)   \,
+#define Z_IS_3752U_EQ_3752(...)  \,
+#define Z_IS_3752_EQ_3752U(...)  \,
+#define Z_IS_3752U_EQ_3752U(...) \,
+#define Z_IS_3753_EQ_3753(...)   \,
+#define Z_IS_3753U_EQ_3753(...)  \,
+#define Z_IS_3753_EQ_3753U(...)  \,
+#define Z_IS_3753U_EQ_3753U(...) \,
+#define Z_IS_3754_EQ_3754(...)   \,
+#define Z_IS_3754U_EQ_3754(...)  \,
+#define Z_IS_3754_EQ_3754U(...)  \,
+#define Z_IS_3754U_EQ_3754U(...) \,
+#define Z_IS_3755_EQ_3755(...)   \,
+#define Z_IS_3755U_EQ_3755(...)  \,
+#define Z_IS_3755_EQ_3755U(...)  \,
+#define Z_IS_3755U_EQ_3755U(...) \,
+#define Z_IS_3756_EQ_3756(...)   \,
+#define Z_IS_3756U_EQ_3756(...)  \,
+#define Z_IS_3756_EQ_3756U(...)  \,
+#define Z_IS_3756U_EQ_3756U(...) \,
+#define Z_IS_3757_EQ_3757(...)   \,
+#define Z_IS_3757U_EQ_3757(...)  \,
+#define Z_IS_3757_EQ_3757U(...)  \,
+#define Z_IS_3757U_EQ_3757U(...) \,
+#define Z_IS_3758_EQ_3758(...)   \,
+#define Z_IS_3758U_EQ_3758(...)  \,
+#define Z_IS_3758_EQ_3758U(...)  \,
+#define Z_IS_3758U_EQ_3758U(...) \,
+#define Z_IS_3759_EQ_3759(...)   \,
+#define Z_IS_3759U_EQ_3759(...)  \,
+#define Z_IS_3759_EQ_3759U(...)  \,
+#define Z_IS_3759U_EQ_3759U(...) \,
+#define Z_IS_3760_EQ_3760(...)   \,
+#define Z_IS_3760U_EQ_3760(...)  \,
+#define Z_IS_3760_EQ_3760U(...)  \,
+#define Z_IS_3760U_EQ_3760U(...) \,
+#define Z_IS_3761_EQ_3761(...)   \,
+#define Z_IS_3761U_EQ_3761(...)  \,
+#define Z_IS_3761_EQ_3761U(...)  \,
+#define Z_IS_3761U_EQ_3761U(...) \,
+#define Z_IS_3762_EQ_3762(...)   \,
+#define Z_IS_3762U_EQ_3762(...)  \,
+#define Z_IS_3762_EQ_3762U(...)  \,
+#define Z_IS_3762U_EQ_3762U(...) \,
+#define Z_IS_3763_EQ_3763(...)   \,
+#define Z_IS_3763U_EQ_3763(...)  \,
+#define Z_IS_3763_EQ_3763U(...)  \,
+#define Z_IS_3763U_EQ_3763U(...) \,
+#define Z_IS_3764_EQ_3764(...)   \,
+#define Z_IS_3764U_EQ_3764(...)  \,
+#define Z_IS_3764_EQ_3764U(...)  \,
+#define Z_IS_3764U_EQ_3764U(...) \,
+#define Z_IS_3765_EQ_3765(...)   \,
+#define Z_IS_3765U_EQ_3765(...)  \,
+#define Z_IS_3765_EQ_3765U(...)  \,
+#define Z_IS_3765U_EQ_3765U(...) \,
+#define Z_IS_3766_EQ_3766(...)   \,
+#define Z_IS_3766U_EQ_3766(...)  \,
+#define Z_IS_3766_EQ_3766U(...)  \,
+#define Z_IS_3766U_EQ_3766U(...) \,
+#define Z_IS_3767_EQ_3767(...)   \,
+#define Z_IS_3767U_EQ_3767(...)  \,
+#define Z_IS_3767_EQ_3767U(...)  \,
+#define Z_IS_3767U_EQ_3767U(...) \,
+#define Z_IS_3768_EQ_3768(...)   \,
+#define Z_IS_3768U_EQ_3768(...)  \,
+#define Z_IS_3768_EQ_3768U(...)  \,
+#define Z_IS_3768U_EQ_3768U(...) \,
+#define Z_IS_3769_EQ_3769(...)   \,
+#define Z_IS_3769U_EQ_3769(...)  \,
+#define Z_IS_3769_EQ_3769U(...)  \,
+#define Z_IS_3769U_EQ_3769U(...) \,
+#define Z_IS_3770_EQ_3770(...)   \,
+#define Z_IS_3770U_EQ_3770(...)  \,
+#define Z_IS_3770_EQ_3770U(...)  \,
+#define Z_IS_3770U_EQ_3770U(...) \,
+#define Z_IS_3771_EQ_3771(...)   \,
+#define Z_IS_3771U_EQ_3771(...)  \,
+#define Z_IS_3771_EQ_3771U(...)  \,
+#define Z_IS_3771U_EQ_3771U(...) \,
+#define Z_IS_3772_EQ_3772(...)   \,
+#define Z_IS_3772U_EQ_3772(...)  \,
+#define Z_IS_3772_EQ_3772U(...)  \,
+#define Z_IS_3772U_EQ_3772U(...) \,
+#define Z_IS_3773_EQ_3773(...)   \,
+#define Z_IS_3773U_EQ_3773(...)  \,
+#define Z_IS_3773_EQ_3773U(...)  \,
+#define Z_IS_3773U_EQ_3773U(...) \,
+#define Z_IS_3774_EQ_3774(...)   \,
+#define Z_IS_3774U_EQ_3774(...)  \,
+#define Z_IS_3774_EQ_3774U(...)  \,
+#define Z_IS_3774U_EQ_3774U(...) \,
+#define Z_IS_3775_EQ_3775(...)   \,
+#define Z_IS_3775U_EQ_3775(...)  \,
+#define Z_IS_3775_EQ_3775U(...)  \,
+#define Z_IS_3775U_EQ_3775U(...) \,
+#define Z_IS_3776_EQ_3776(...)   \,
+#define Z_IS_3776U_EQ_3776(...)  \,
+#define Z_IS_3776_EQ_3776U(...)  \,
+#define Z_IS_3776U_EQ_3776U(...) \,
+#define Z_IS_3777_EQ_3777(...)   \,
+#define Z_IS_3777U_EQ_3777(...)  \,
+#define Z_IS_3777_EQ_3777U(...)  \,
+#define Z_IS_3777U_EQ_3777U(...) \,
+#define Z_IS_3778_EQ_3778(...)   \,
+#define Z_IS_3778U_EQ_3778(...)  \,
+#define Z_IS_3778_EQ_3778U(...)  \,
+#define Z_IS_3778U_EQ_3778U(...) \,
+#define Z_IS_3779_EQ_3779(...)   \,
+#define Z_IS_3779U_EQ_3779(...)  \,
+#define Z_IS_3779_EQ_3779U(...)  \,
+#define Z_IS_3779U_EQ_3779U(...) \,
+#define Z_IS_3780_EQ_3780(...)   \,
+#define Z_IS_3780U_EQ_3780(...)  \,
+#define Z_IS_3780_EQ_3780U(...)  \,
+#define Z_IS_3780U_EQ_3780U(...) \,
+#define Z_IS_3781_EQ_3781(...)   \,
+#define Z_IS_3781U_EQ_3781(...)  \,
+#define Z_IS_3781_EQ_3781U(...)  \,
+#define Z_IS_3781U_EQ_3781U(...) \,
+#define Z_IS_3782_EQ_3782(...)   \,
+#define Z_IS_3782U_EQ_3782(...)  \,
+#define Z_IS_3782_EQ_3782U(...)  \,
+#define Z_IS_3782U_EQ_3782U(...) \,
+#define Z_IS_3783_EQ_3783(...)   \,
+#define Z_IS_3783U_EQ_3783(...)  \,
+#define Z_IS_3783_EQ_3783U(...)  \,
+#define Z_IS_3783U_EQ_3783U(...) \,
+#define Z_IS_3784_EQ_3784(...)   \,
+#define Z_IS_3784U_EQ_3784(...)  \,
+#define Z_IS_3784_EQ_3784U(...)  \,
+#define Z_IS_3784U_EQ_3784U(...) \,
+#define Z_IS_3785_EQ_3785(...)   \,
+#define Z_IS_3785U_EQ_3785(...)  \,
+#define Z_IS_3785_EQ_3785U(...)  \,
+#define Z_IS_3785U_EQ_3785U(...) \,
+#define Z_IS_3786_EQ_3786(...)   \,
+#define Z_IS_3786U_EQ_3786(...)  \,
+#define Z_IS_3786_EQ_3786U(...)  \,
+#define Z_IS_3786U_EQ_3786U(...) \,
+#define Z_IS_3787_EQ_3787(...)   \,
+#define Z_IS_3787U_EQ_3787(...)  \,
+#define Z_IS_3787_EQ_3787U(...)  \,
+#define Z_IS_3787U_EQ_3787U(...) \,
+#define Z_IS_3788_EQ_3788(...)   \,
+#define Z_IS_3788U_EQ_3788(...)  \,
+#define Z_IS_3788_EQ_3788U(...)  \,
+#define Z_IS_3788U_EQ_3788U(...) \,
+#define Z_IS_3789_EQ_3789(...)   \,
+#define Z_IS_3789U_EQ_3789(...)  \,
+#define Z_IS_3789_EQ_3789U(...)  \,
+#define Z_IS_3789U_EQ_3789U(...) \,
+#define Z_IS_3790_EQ_3790(...)   \,
+#define Z_IS_3790U_EQ_3790(...)  \,
+#define Z_IS_3790_EQ_3790U(...)  \,
+#define Z_IS_3790U_EQ_3790U(...) \,
+#define Z_IS_3791_EQ_3791(...)   \,
+#define Z_IS_3791U_EQ_3791(...)  \,
+#define Z_IS_3791_EQ_3791U(...)  \,
+#define Z_IS_3791U_EQ_3791U(...) \,
+#define Z_IS_3792_EQ_3792(...)   \,
+#define Z_IS_3792U_EQ_3792(...)  \,
+#define Z_IS_3792_EQ_3792U(...)  \,
+#define Z_IS_3792U_EQ_3792U(...) \,
+#define Z_IS_3793_EQ_3793(...)   \,
+#define Z_IS_3793U_EQ_3793(...)  \,
+#define Z_IS_3793_EQ_3793U(...)  \,
+#define Z_IS_3793U_EQ_3793U(...) \,
+#define Z_IS_3794_EQ_3794(...)   \,
+#define Z_IS_3794U_EQ_3794(...)  \,
+#define Z_IS_3794_EQ_3794U(...)  \,
+#define Z_IS_3794U_EQ_3794U(...) \,
+#define Z_IS_3795_EQ_3795(...)   \,
+#define Z_IS_3795U_EQ_3795(...)  \,
+#define Z_IS_3795_EQ_3795U(...)  \,
+#define Z_IS_3795U_EQ_3795U(...) \,
+#define Z_IS_3796_EQ_3796(...)   \,
+#define Z_IS_3796U_EQ_3796(...)  \,
+#define Z_IS_3796_EQ_3796U(...)  \,
+#define Z_IS_3796U_EQ_3796U(...) \,
+#define Z_IS_3797_EQ_3797(...)   \,
+#define Z_IS_3797U_EQ_3797(...)  \,
+#define Z_IS_3797_EQ_3797U(...)  \,
+#define Z_IS_3797U_EQ_3797U(...) \,
+#define Z_IS_3798_EQ_3798(...)   \,
+#define Z_IS_3798U_EQ_3798(...)  \,
+#define Z_IS_3798_EQ_3798U(...)  \,
+#define Z_IS_3798U_EQ_3798U(...) \,
+#define Z_IS_3799_EQ_3799(...)   \,
+#define Z_IS_3799U_EQ_3799(...)  \,
+#define Z_IS_3799_EQ_3799U(...)  \,
+#define Z_IS_3799U_EQ_3799U(...) \,
+#define Z_IS_3800_EQ_3800(...)   \,
+#define Z_IS_3800U_EQ_3800(...)  \,
+#define Z_IS_3800_EQ_3800U(...)  \,
+#define Z_IS_3800U_EQ_3800U(...) \,
+#define Z_IS_3801_EQ_3801(...)   \,
+#define Z_IS_3801U_EQ_3801(...)  \,
+#define Z_IS_3801_EQ_3801U(...)  \,
+#define Z_IS_3801U_EQ_3801U(...) \,
+#define Z_IS_3802_EQ_3802(...)   \,
+#define Z_IS_3802U_EQ_3802(...)  \,
+#define Z_IS_3802_EQ_3802U(...)  \,
+#define Z_IS_3802U_EQ_3802U(...) \,
+#define Z_IS_3803_EQ_3803(...)   \,
+#define Z_IS_3803U_EQ_3803(...)  \,
+#define Z_IS_3803_EQ_3803U(...)  \,
+#define Z_IS_3803U_EQ_3803U(...) \,
+#define Z_IS_3804_EQ_3804(...)   \,
+#define Z_IS_3804U_EQ_3804(...)  \,
+#define Z_IS_3804_EQ_3804U(...)  \,
+#define Z_IS_3804U_EQ_3804U(...) \,
+#define Z_IS_3805_EQ_3805(...)   \,
+#define Z_IS_3805U_EQ_3805(...)  \,
+#define Z_IS_3805_EQ_3805U(...)  \,
+#define Z_IS_3805U_EQ_3805U(...) \,
+#define Z_IS_3806_EQ_3806(...)   \,
+#define Z_IS_3806U_EQ_3806(...)  \,
+#define Z_IS_3806_EQ_3806U(...)  \,
+#define Z_IS_3806U_EQ_3806U(...) \,
+#define Z_IS_3807_EQ_3807(...)   \,
+#define Z_IS_3807U_EQ_3807(...)  \,
+#define Z_IS_3807_EQ_3807U(...)  \,
+#define Z_IS_3807U_EQ_3807U(...) \,
+#define Z_IS_3808_EQ_3808(...)   \,
+#define Z_IS_3808U_EQ_3808(...)  \,
+#define Z_IS_3808_EQ_3808U(...)  \,
+#define Z_IS_3808U_EQ_3808U(...) \,
+#define Z_IS_3809_EQ_3809(...)   \,
+#define Z_IS_3809U_EQ_3809(...)  \,
+#define Z_IS_3809_EQ_3809U(...)  \,
+#define Z_IS_3809U_EQ_3809U(...) \,
+#define Z_IS_3810_EQ_3810(...)   \,
+#define Z_IS_3810U_EQ_3810(...)  \,
+#define Z_IS_3810_EQ_3810U(...)  \,
+#define Z_IS_3810U_EQ_3810U(...) \,
+#define Z_IS_3811_EQ_3811(...)   \,
+#define Z_IS_3811U_EQ_3811(...)  \,
+#define Z_IS_3811_EQ_3811U(...)  \,
+#define Z_IS_3811U_EQ_3811U(...) \,
+#define Z_IS_3812_EQ_3812(...)   \,
+#define Z_IS_3812U_EQ_3812(...)  \,
+#define Z_IS_3812_EQ_3812U(...)  \,
+#define Z_IS_3812U_EQ_3812U(...) \,
+#define Z_IS_3813_EQ_3813(...)   \,
+#define Z_IS_3813U_EQ_3813(...)  \,
+#define Z_IS_3813_EQ_3813U(...)  \,
+#define Z_IS_3813U_EQ_3813U(...) \,
+#define Z_IS_3814_EQ_3814(...)   \,
+#define Z_IS_3814U_EQ_3814(...)  \,
+#define Z_IS_3814_EQ_3814U(...)  \,
+#define Z_IS_3814U_EQ_3814U(...) \,
+#define Z_IS_3815_EQ_3815(...)   \,
+#define Z_IS_3815U_EQ_3815(...)  \,
+#define Z_IS_3815_EQ_3815U(...)  \,
+#define Z_IS_3815U_EQ_3815U(...) \,
+#define Z_IS_3816_EQ_3816(...)   \,
+#define Z_IS_3816U_EQ_3816(...)  \,
+#define Z_IS_3816_EQ_3816U(...)  \,
+#define Z_IS_3816U_EQ_3816U(...) \,
+#define Z_IS_3817_EQ_3817(...)   \,
+#define Z_IS_3817U_EQ_3817(...)  \,
+#define Z_IS_3817_EQ_3817U(...)  \,
+#define Z_IS_3817U_EQ_3817U(...) \,
+#define Z_IS_3818_EQ_3818(...)   \,
+#define Z_IS_3818U_EQ_3818(...)  \,
+#define Z_IS_3818_EQ_3818U(...)  \,
+#define Z_IS_3818U_EQ_3818U(...) \,
+#define Z_IS_3819_EQ_3819(...)   \,
+#define Z_IS_3819U_EQ_3819(...)  \,
+#define Z_IS_3819_EQ_3819U(...)  \,
+#define Z_IS_3819U_EQ_3819U(...) \,
+#define Z_IS_3820_EQ_3820(...)   \,
+#define Z_IS_3820U_EQ_3820(...)  \,
+#define Z_IS_3820_EQ_3820U(...)  \,
+#define Z_IS_3820U_EQ_3820U(...) \,
+#define Z_IS_3821_EQ_3821(...)   \,
+#define Z_IS_3821U_EQ_3821(...)  \,
+#define Z_IS_3821_EQ_3821U(...)  \,
+#define Z_IS_3821U_EQ_3821U(...) \,
+#define Z_IS_3822_EQ_3822(...)   \,
+#define Z_IS_3822U_EQ_3822(...)  \,
+#define Z_IS_3822_EQ_3822U(...)  \,
+#define Z_IS_3822U_EQ_3822U(...) \,
+#define Z_IS_3823_EQ_3823(...)   \,
+#define Z_IS_3823U_EQ_3823(...)  \,
+#define Z_IS_3823_EQ_3823U(...)  \,
+#define Z_IS_3823U_EQ_3823U(...) \,
+#define Z_IS_3824_EQ_3824(...)   \,
+#define Z_IS_3824U_EQ_3824(...)  \,
+#define Z_IS_3824_EQ_3824U(...)  \,
+#define Z_IS_3824U_EQ_3824U(...) \,
+#define Z_IS_3825_EQ_3825(...)   \,
+#define Z_IS_3825U_EQ_3825(...)  \,
+#define Z_IS_3825_EQ_3825U(...)  \,
+#define Z_IS_3825U_EQ_3825U(...) \,
+#define Z_IS_3826_EQ_3826(...)   \,
+#define Z_IS_3826U_EQ_3826(...)  \,
+#define Z_IS_3826_EQ_3826U(...)  \,
+#define Z_IS_3826U_EQ_3826U(...) \,
+#define Z_IS_3827_EQ_3827(...)   \,
+#define Z_IS_3827U_EQ_3827(...)  \,
+#define Z_IS_3827_EQ_3827U(...)  \,
+#define Z_IS_3827U_EQ_3827U(...) \,
+#define Z_IS_3828_EQ_3828(...)   \,
+#define Z_IS_3828U_EQ_3828(...)  \,
+#define Z_IS_3828_EQ_3828U(...)  \,
+#define Z_IS_3828U_EQ_3828U(...) \,
+#define Z_IS_3829_EQ_3829(...)   \,
+#define Z_IS_3829U_EQ_3829(...)  \,
+#define Z_IS_3829_EQ_3829U(...)  \,
+#define Z_IS_3829U_EQ_3829U(...) \,
+#define Z_IS_3830_EQ_3830(...)   \,
+#define Z_IS_3830U_EQ_3830(...)  \,
+#define Z_IS_3830_EQ_3830U(...)  \,
+#define Z_IS_3830U_EQ_3830U(...) \,
+#define Z_IS_3831_EQ_3831(...)   \,
+#define Z_IS_3831U_EQ_3831(...)  \,
+#define Z_IS_3831_EQ_3831U(...)  \,
+#define Z_IS_3831U_EQ_3831U(...) \,
+#define Z_IS_3832_EQ_3832(...)   \,
+#define Z_IS_3832U_EQ_3832(...)  \,
+#define Z_IS_3832_EQ_3832U(...)  \,
+#define Z_IS_3832U_EQ_3832U(...) \,
+#define Z_IS_3833_EQ_3833(...)   \,
+#define Z_IS_3833U_EQ_3833(...)  \,
+#define Z_IS_3833_EQ_3833U(...)  \,
+#define Z_IS_3833U_EQ_3833U(...) \,
+#define Z_IS_3834_EQ_3834(...)   \,
+#define Z_IS_3834U_EQ_3834(...)  \,
+#define Z_IS_3834_EQ_3834U(...)  \,
+#define Z_IS_3834U_EQ_3834U(...) \,
+#define Z_IS_3835_EQ_3835(...)   \,
+#define Z_IS_3835U_EQ_3835(...)  \,
+#define Z_IS_3835_EQ_3835U(...)  \,
+#define Z_IS_3835U_EQ_3835U(...) \,
+#define Z_IS_3836_EQ_3836(...)   \,
+#define Z_IS_3836U_EQ_3836(...)  \,
+#define Z_IS_3836_EQ_3836U(...)  \,
+#define Z_IS_3836U_EQ_3836U(...) \,
+#define Z_IS_3837_EQ_3837(...)   \,
+#define Z_IS_3837U_EQ_3837(...)  \,
+#define Z_IS_3837_EQ_3837U(...)  \,
+#define Z_IS_3837U_EQ_3837U(...) \,
+#define Z_IS_3838_EQ_3838(...)   \,
+#define Z_IS_3838U_EQ_3838(...)  \,
+#define Z_IS_3838_EQ_3838U(...)  \,
+#define Z_IS_3838U_EQ_3838U(...) \,
+#define Z_IS_3839_EQ_3839(...)   \,
+#define Z_IS_3839U_EQ_3839(...)  \,
+#define Z_IS_3839_EQ_3839U(...)  \,
+#define Z_IS_3839U_EQ_3839U(...) \,
+#define Z_IS_3840_EQ_3840(...)   \,
+#define Z_IS_3840U_EQ_3840(...)  \,
+#define Z_IS_3840_EQ_3840U(...)  \,
+#define Z_IS_3840U_EQ_3840U(...) \,
+#define Z_IS_3841_EQ_3841(...)   \,
+#define Z_IS_3841U_EQ_3841(...)  \,
+#define Z_IS_3841_EQ_3841U(...)  \,
+#define Z_IS_3841U_EQ_3841U(...) \,
+#define Z_IS_3842_EQ_3842(...)   \,
+#define Z_IS_3842U_EQ_3842(...)  \,
+#define Z_IS_3842_EQ_3842U(...)  \,
+#define Z_IS_3842U_EQ_3842U(...) \,
+#define Z_IS_3843_EQ_3843(...)   \,
+#define Z_IS_3843U_EQ_3843(...)  \,
+#define Z_IS_3843_EQ_3843U(...)  \,
+#define Z_IS_3843U_EQ_3843U(...) \,
+#define Z_IS_3844_EQ_3844(...)   \,
+#define Z_IS_3844U_EQ_3844(...)  \,
+#define Z_IS_3844_EQ_3844U(...)  \,
+#define Z_IS_3844U_EQ_3844U(...) \,
+#define Z_IS_3845_EQ_3845(...)   \,
+#define Z_IS_3845U_EQ_3845(...)  \,
+#define Z_IS_3845_EQ_3845U(...)  \,
+#define Z_IS_3845U_EQ_3845U(...) \,
+#define Z_IS_3846_EQ_3846(...)   \,
+#define Z_IS_3846U_EQ_3846(...)  \,
+#define Z_IS_3846_EQ_3846U(...)  \,
+#define Z_IS_3846U_EQ_3846U(...) \,
+#define Z_IS_3847_EQ_3847(...)   \,
+#define Z_IS_3847U_EQ_3847(...)  \,
+#define Z_IS_3847_EQ_3847U(...)  \,
+#define Z_IS_3847U_EQ_3847U(...) \,
+#define Z_IS_3848_EQ_3848(...)   \,
+#define Z_IS_3848U_EQ_3848(...)  \,
+#define Z_IS_3848_EQ_3848U(...)  \,
+#define Z_IS_3848U_EQ_3848U(...) \,
+#define Z_IS_3849_EQ_3849(...)   \,
+#define Z_IS_3849U_EQ_3849(...)  \,
+#define Z_IS_3849_EQ_3849U(...)  \,
+#define Z_IS_3849U_EQ_3849U(...) \,
+#define Z_IS_3850_EQ_3850(...)   \,
+#define Z_IS_3850U_EQ_3850(...)  \,
+#define Z_IS_3850_EQ_3850U(...)  \,
+#define Z_IS_3850U_EQ_3850U(...) \,
+#define Z_IS_3851_EQ_3851(...)   \,
+#define Z_IS_3851U_EQ_3851(...)  \,
+#define Z_IS_3851_EQ_3851U(...)  \,
+#define Z_IS_3851U_EQ_3851U(...) \,
+#define Z_IS_3852_EQ_3852(...)   \,
+#define Z_IS_3852U_EQ_3852(...)  \,
+#define Z_IS_3852_EQ_3852U(...)  \,
+#define Z_IS_3852U_EQ_3852U(...) \,
+#define Z_IS_3853_EQ_3853(...)   \,
+#define Z_IS_3853U_EQ_3853(...)  \,
+#define Z_IS_3853_EQ_3853U(...)  \,
+#define Z_IS_3853U_EQ_3853U(...) \,
+#define Z_IS_3854_EQ_3854(...)   \,
+#define Z_IS_3854U_EQ_3854(...)  \,
+#define Z_IS_3854_EQ_3854U(...)  \,
+#define Z_IS_3854U_EQ_3854U(...) \,
+#define Z_IS_3855_EQ_3855(...)   \,
+#define Z_IS_3855U_EQ_3855(...)  \,
+#define Z_IS_3855_EQ_3855U(...)  \,
+#define Z_IS_3855U_EQ_3855U(...) \,
+#define Z_IS_3856_EQ_3856(...)   \,
+#define Z_IS_3856U_EQ_3856(...)  \,
+#define Z_IS_3856_EQ_3856U(...)  \,
+#define Z_IS_3856U_EQ_3856U(...) \,
+#define Z_IS_3857_EQ_3857(...)   \,
+#define Z_IS_3857U_EQ_3857(...)  \,
+#define Z_IS_3857_EQ_3857U(...)  \,
+#define Z_IS_3857U_EQ_3857U(...) \,
+#define Z_IS_3858_EQ_3858(...)   \,
+#define Z_IS_3858U_EQ_3858(...)  \,
+#define Z_IS_3858_EQ_3858U(...)  \,
+#define Z_IS_3858U_EQ_3858U(...) \,
+#define Z_IS_3859_EQ_3859(...)   \,
+#define Z_IS_3859U_EQ_3859(...)  \,
+#define Z_IS_3859_EQ_3859U(...)  \,
+#define Z_IS_3859U_EQ_3859U(...) \,
+#define Z_IS_3860_EQ_3860(...)   \,
+#define Z_IS_3860U_EQ_3860(...)  \,
+#define Z_IS_3860_EQ_3860U(...)  \,
+#define Z_IS_3860U_EQ_3860U(...) \,
+#define Z_IS_3861_EQ_3861(...)   \,
+#define Z_IS_3861U_EQ_3861(...)  \,
+#define Z_IS_3861_EQ_3861U(...)  \,
+#define Z_IS_3861U_EQ_3861U(...) \,
+#define Z_IS_3862_EQ_3862(...)   \,
+#define Z_IS_3862U_EQ_3862(...)  \,
+#define Z_IS_3862_EQ_3862U(...)  \,
+#define Z_IS_3862U_EQ_3862U(...) \,
+#define Z_IS_3863_EQ_3863(...)   \,
+#define Z_IS_3863U_EQ_3863(...)  \,
+#define Z_IS_3863_EQ_3863U(...)  \,
+#define Z_IS_3863U_EQ_3863U(...) \,
+#define Z_IS_3864_EQ_3864(...)   \,
+#define Z_IS_3864U_EQ_3864(...)  \,
+#define Z_IS_3864_EQ_3864U(...)  \,
+#define Z_IS_3864U_EQ_3864U(...) \,
+#define Z_IS_3865_EQ_3865(...)   \,
+#define Z_IS_3865U_EQ_3865(...)  \,
+#define Z_IS_3865_EQ_3865U(...)  \,
+#define Z_IS_3865U_EQ_3865U(...) \,
+#define Z_IS_3866_EQ_3866(...)   \,
+#define Z_IS_3866U_EQ_3866(...)  \,
+#define Z_IS_3866_EQ_3866U(...)  \,
+#define Z_IS_3866U_EQ_3866U(...) \,
+#define Z_IS_3867_EQ_3867(...)   \,
+#define Z_IS_3867U_EQ_3867(...)  \,
+#define Z_IS_3867_EQ_3867U(...)  \,
+#define Z_IS_3867U_EQ_3867U(...) \,
+#define Z_IS_3868_EQ_3868(...)   \,
+#define Z_IS_3868U_EQ_3868(...)  \,
+#define Z_IS_3868_EQ_3868U(...)  \,
+#define Z_IS_3868U_EQ_3868U(...) \,
+#define Z_IS_3869_EQ_3869(...)   \,
+#define Z_IS_3869U_EQ_3869(...)  \,
+#define Z_IS_3869_EQ_3869U(...)  \,
+#define Z_IS_3869U_EQ_3869U(...) \,
+#define Z_IS_3870_EQ_3870(...)   \,
+#define Z_IS_3870U_EQ_3870(...)  \,
+#define Z_IS_3870_EQ_3870U(...)  \,
+#define Z_IS_3870U_EQ_3870U(...) \,
+#define Z_IS_3871_EQ_3871(...)   \,
+#define Z_IS_3871U_EQ_3871(...)  \,
+#define Z_IS_3871_EQ_3871U(...)  \,
+#define Z_IS_3871U_EQ_3871U(...) \,
+#define Z_IS_3872_EQ_3872(...)   \,
+#define Z_IS_3872U_EQ_3872(...)  \,
+#define Z_IS_3872_EQ_3872U(...)  \,
+#define Z_IS_3872U_EQ_3872U(...) \,
+#define Z_IS_3873_EQ_3873(...)   \,
+#define Z_IS_3873U_EQ_3873(...)  \,
+#define Z_IS_3873_EQ_3873U(...)  \,
+#define Z_IS_3873U_EQ_3873U(...) \,
+#define Z_IS_3874_EQ_3874(...)   \,
+#define Z_IS_3874U_EQ_3874(...)  \,
+#define Z_IS_3874_EQ_3874U(...)  \,
+#define Z_IS_3874U_EQ_3874U(...) \,
+#define Z_IS_3875_EQ_3875(...)   \,
+#define Z_IS_3875U_EQ_3875(...)  \,
+#define Z_IS_3875_EQ_3875U(...)  \,
+#define Z_IS_3875U_EQ_3875U(...) \,
+#define Z_IS_3876_EQ_3876(...)   \,
+#define Z_IS_3876U_EQ_3876(...)  \,
+#define Z_IS_3876_EQ_3876U(...)  \,
+#define Z_IS_3876U_EQ_3876U(...) \,
+#define Z_IS_3877_EQ_3877(...)   \,
+#define Z_IS_3877U_EQ_3877(...)  \,
+#define Z_IS_3877_EQ_3877U(...)  \,
+#define Z_IS_3877U_EQ_3877U(...) \,
+#define Z_IS_3878_EQ_3878(...)   \,
+#define Z_IS_3878U_EQ_3878(...)  \,
+#define Z_IS_3878_EQ_3878U(...)  \,
+#define Z_IS_3878U_EQ_3878U(...) \,
+#define Z_IS_3879_EQ_3879(...)   \,
+#define Z_IS_3879U_EQ_3879(...)  \,
+#define Z_IS_3879_EQ_3879U(...)  \,
+#define Z_IS_3879U_EQ_3879U(...) \,
+#define Z_IS_3880_EQ_3880(...)   \,
+#define Z_IS_3880U_EQ_3880(...)  \,
+#define Z_IS_3880_EQ_3880U(...)  \,
+#define Z_IS_3880U_EQ_3880U(...) \,
+#define Z_IS_3881_EQ_3881(...)   \,
+#define Z_IS_3881U_EQ_3881(...)  \,
+#define Z_IS_3881_EQ_3881U(...)  \,
+#define Z_IS_3881U_EQ_3881U(...) \,
+#define Z_IS_3882_EQ_3882(...)   \,
+#define Z_IS_3882U_EQ_3882(...)  \,
+#define Z_IS_3882_EQ_3882U(...)  \,
+#define Z_IS_3882U_EQ_3882U(...) \,
+#define Z_IS_3883_EQ_3883(...)   \,
+#define Z_IS_3883U_EQ_3883(...)  \,
+#define Z_IS_3883_EQ_3883U(...)  \,
+#define Z_IS_3883U_EQ_3883U(...) \,
+#define Z_IS_3884_EQ_3884(...)   \,
+#define Z_IS_3884U_EQ_3884(...)  \,
+#define Z_IS_3884_EQ_3884U(...)  \,
+#define Z_IS_3884U_EQ_3884U(...) \,
+#define Z_IS_3885_EQ_3885(...)   \,
+#define Z_IS_3885U_EQ_3885(...)  \,
+#define Z_IS_3885_EQ_3885U(...)  \,
+#define Z_IS_3885U_EQ_3885U(...) \,
+#define Z_IS_3886_EQ_3886(...)   \,
+#define Z_IS_3886U_EQ_3886(...)  \,
+#define Z_IS_3886_EQ_3886U(...)  \,
+#define Z_IS_3886U_EQ_3886U(...) \,
+#define Z_IS_3887_EQ_3887(...)   \,
+#define Z_IS_3887U_EQ_3887(...)  \,
+#define Z_IS_3887_EQ_3887U(...)  \,
+#define Z_IS_3887U_EQ_3887U(...) \,
+#define Z_IS_3888_EQ_3888(...)   \,
+#define Z_IS_3888U_EQ_3888(...)  \,
+#define Z_IS_3888_EQ_3888U(...)  \,
+#define Z_IS_3888U_EQ_3888U(...) \,
+#define Z_IS_3889_EQ_3889(...)   \,
+#define Z_IS_3889U_EQ_3889(...)  \,
+#define Z_IS_3889_EQ_3889U(...)  \,
+#define Z_IS_3889U_EQ_3889U(...) \,
+#define Z_IS_3890_EQ_3890(...)   \,
+#define Z_IS_3890U_EQ_3890(...)  \,
+#define Z_IS_3890_EQ_3890U(...)  \,
+#define Z_IS_3890U_EQ_3890U(...) \,
+#define Z_IS_3891_EQ_3891(...)   \,
+#define Z_IS_3891U_EQ_3891(...)  \,
+#define Z_IS_3891_EQ_3891U(...)  \,
+#define Z_IS_3891U_EQ_3891U(...) \,
+#define Z_IS_3892_EQ_3892(...)   \,
+#define Z_IS_3892U_EQ_3892(...)  \,
+#define Z_IS_3892_EQ_3892U(...)  \,
+#define Z_IS_3892U_EQ_3892U(...) \,
+#define Z_IS_3893_EQ_3893(...)   \,
+#define Z_IS_3893U_EQ_3893(...)  \,
+#define Z_IS_3893_EQ_3893U(...)  \,
+#define Z_IS_3893U_EQ_3893U(...) \,
+#define Z_IS_3894_EQ_3894(...)   \,
+#define Z_IS_3894U_EQ_3894(...)  \,
+#define Z_IS_3894_EQ_3894U(...)  \,
+#define Z_IS_3894U_EQ_3894U(...) \,
+#define Z_IS_3895_EQ_3895(...)   \,
+#define Z_IS_3895U_EQ_3895(...)  \,
+#define Z_IS_3895_EQ_3895U(...)  \,
+#define Z_IS_3895U_EQ_3895U(...) \,
+#define Z_IS_3896_EQ_3896(...)   \,
+#define Z_IS_3896U_EQ_3896(...)  \,
+#define Z_IS_3896_EQ_3896U(...)  \,
+#define Z_IS_3896U_EQ_3896U(...) \,
+#define Z_IS_3897_EQ_3897(...)   \,
+#define Z_IS_3897U_EQ_3897(...)  \,
+#define Z_IS_3897_EQ_3897U(...)  \,
+#define Z_IS_3897U_EQ_3897U(...) \,
+#define Z_IS_3898_EQ_3898(...)   \,
+#define Z_IS_3898U_EQ_3898(...)  \,
+#define Z_IS_3898_EQ_3898U(...)  \,
+#define Z_IS_3898U_EQ_3898U(...) \,
+#define Z_IS_3899_EQ_3899(...)   \,
+#define Z_IS_3899U_EQ_3899(...)  \,
+#define Z_IS_3899_EQ_3899U(...)  \,
+#define Z_IS_3899U_EQ_3899U(...) \,
+#define Z_IS_3900_EQ_3900(...)   \,
+#define Z_IS_3900U_EQ_3900(...)  \,
+#define Z_IS_3900_EQ_3900U(...)  \,
+#define Z_IS_3900U_EQ_3900U(...) \,
+#define Z_IS_3901_EQ_3901(...)   \,
+#define Z_IS_3901U_EQ_3901(...)  \,
+#define Z_IS_3901_EQ_3901U(...)  \,
+#define Z_IS_3901U_EQ_3901U(...) \,
+#define Z_IS_3902_EQ_3902(...)   \,
+#define Z_IS_3902U_EQ_3902(...)  \,
+#define Z_IS_3902_EQ_3902U(...)  \,
+#define Z_IS_3902U_EQ_3902U(...) \,
+#define Z_IS_3903_EQ_3903(...)   \,
+#define Z_IS_3903U_EQ_3903(...)  \,
+#define Z_IS_3903_EQ_3903U(...)  \,
+#define Z_IS_3903U_EQ_3903U(...) \,
+#define Z_IS_3904_EQ_3904(...)   \,
+#define Z_IS_3904U_EQ_3904(...)  \,
+#define Z_IS_3904_EQ_3904U(...)  \,
+#define Z_IS_3904U_EQ_3904U(...) \,
+#define Z_IS_3905_EQ_3905(...)   \,
+#define Z_IS_3905U_EQ_3905(...)  \,
+#define Z_IS_3905_EQ_3905U(...)  \,
+#define Z_IS_3905U_EQ_3905U(...) \,
+#define Z_IS_3906_EQ_3906(...)   \,
+#define Z_IS_3906U_EQ_3906(...)  \,
+#define Z_IS_3906_EQ_3906U(...)  \,
+#define Z_IS_3906U_EQ_3906U(...) \,
+#define Z_IS_3907_EQ_3907(...)   \,
+#define Z_IS_3907U_EQ_3907(...)  \,
+#define Z_IS_3907_EQ_3907U(...)  \,
+#define Z_IS_3907U_EQ_3907U(...) \,
+#define Z_IS_3908_EQ_3908(...)   \,
+#define Z_IS_3908U_EQ_3908(...)  \,
+#define Z_IS_3908_EQ_3908U(...)  \,
+#define Z_IS_3908U_EQ_3908U(...) \,
+#define Z_IS_3909_EQ_3909(...)   \,
+#define Z_IS_3909U_EQ_3909(...)  \,
+#define Z_IS_3909_EQ_3909U(...)  \,
+#define Z_IS_3909U_EQ_3909U(...) \,
+#define Z_IS_3910_EQ_3910(...)   \,
+#define Z_IS_3910U_EQ_3910(...)  \,
+#define Z_IS_3910_EQ_3910U(...)  \,
+#define Z_IS_3910U_EQ_3910U(...) \,
+#define Z_IS_3911_EQ_3911(...)   \,
+#define Z_IS_3911U_EQ_3911(...)  \,
+#define Z_IS_3911_EQ_3911U(...)  \,
+#define Z_IS_3911U_EQ_3911U(...) \,
+#define Z_IS_3912_EQ_3912(...)   \,
+#define Z_IS_3912U_EQ_3912(...)  \,
+#define Z_IS_3912_EQ_3912U(...)  \,
+#define Z_IS_3912U_EQ_3912U(...) \,
+#define Z_IS_3913_EQ_3913(...)   \,
+#define Z_IS_3913U_EQ_3913(...)  \,
+#define Z_IS_3913_EQ_3913U(...)  \,
+#define Z_IS_3913U_EQ_3913U(...) \,
+#define Z_IS_3914_EQ_3914(...)   \,
+#define Z_IS_3914U_EQ_3914(...)  \,
+#define Z_IS_3914_EQ_3914U(...)  \,
+#define Z_IS_3914U_EQ_3914U(...) \,
+#define Z_IS_3915_EQ_3915(...)   \,
+#define Z_IS_3915U_EQ_3915(...)  \,
+#define Z_IS_3915_EQ_3915U(...)  \,
+#define Z_IS_3915U_EQ_3915U(...) \,
+#define Z_IS_3916_EQ_3916(...)   \,
+#define Z_IS_3916U_EQ_3916(...)  \,
+#define Z_IS_3916_EQ_3916U(...)  \,
+#define Z_IS_3916U_EQ_3916U(...) \,
+#define Z_IS_3917_EQ_3917(...)   \,
+#define Z_IS_3917U_EQ_3917(...)  \,
+#define Z_IS_3917_EQ_3917U(...)  \,
+#define Z_IS_3917U_EQ_3917U(...) \,
+#define Z_IS_3918_EQ_3918(...)   \,
+#define Z_IS_3918U_EQ_3918(...)  \,
+#define Z_IS_3918_EQ_3918U(...)  \,
+#define Z_IS_3918U_EQ_3918U(...) \,
+#define Z_IS_3919_EQ_3919(...)   \,
+#define Z_IS_3919U_EQ_3919(...)  \,
+#define Z_IS_3919_EQ_3919U(...)  \,
+#define Z_IS_3919U_EQ_3919U(...) \,
+#define Z_IS_3920_EQ_3920(...)   \,
+#define Z_IS_3920U_EQ_3920(...)  \,
+#define Z_IS_3920_EQ_3920U(...)  \,
+#define Z_IS_3920U_EQ_3920U(...) \,
+#define Z_IS_3921_EQ_3921(...)   \,
+#define Z_IS_3921U_EQ_3921(...)  \,
+#define Z_IS_3921_EQ_3921U(...)  \,
+#define Z_IS_3921U_EQ_3921U(...) \,
+#define Z_IS_3922_EQ_3922(...)   \,
+#define Z_IS_3922U_EQ_3922(...)  \,
+#define Z_IS_3922_EQ_3922U(...)  \,
+#define Z_IS_3922U_EQ_3922U(...) \,
+#define Z_IS_3923_EQ_3923(...)   \,
+#define Z_IS_3923U_EQ_3923(...)  \,
+#define Z_IS_3923_EQ_3923U(...)  \,
+#define Z_IS_3923U_EQ_3923U(...) \,
+#define Z_IS_3924_EQ_3924(...)   \,
+#define Z_IS_3924U_EQ_3924(...)  \,
+#define Z_IS_3924_EQ_3924U(...)  \,
+#define Z_IS_3924U_EQ_3924U(...) \,
+#define Z_IS_3925_EQ_3925(...)   \,
+#define Z_IS_3925U_EQ_3925(...)  \,
+#define Z_IS_3925_EQ_3925U(...)  \,
+#define Z_IS_3925U_EQ_3925U(...) \,
+#define Z_IS_3926_EQ_3926(...)   \,
+#define Z_IS_3926U_EQ_3926(...)  \,
+#define Z_IS_3926_EQ_3926U(...)  \,
+#define Z_IS_3926U_EQ_3926U(...) \,
+#define Z_IS_3927_EQ_3927(...)   \,
+#define Z_IS_3927U_EQ_3927(...)  \,
+#define Z_IS_3927_EQ_3927U(...)  \,
+#define Z_IS_3927U_EQ_3927U(...) \,
+#define Z_IS_3928_EQ_3928(...)   \,
+#define Z_IS_3928U_EQ_3928(...)  \,
+#define Z_IS_3928_EQ_3928U(...)  \,
+#define Z_IS_3928U_EQ_3928U(...) \,
+#define Z_IS_3929_EQ_3929(...)   \,
+#define Z_IS_3929U_EQ_3929(...)  \,
+#define Z_IS_3929_EQ_3929U(...)  \,
+#define Z_IS_3929U_EQ_3929U(...) \,
+#define Z_IS_3930_EQ_3930(...)   \,
+#define Z_IS_3930U_EQ_3930(...)  \,
+#define Z_IS_3930_EQ_3930U(...)  \,
+#define Z_IS_3930U_EQ_3930U(...) \,
+#define Z_IS_3931_EQ_3931(...)   \,
+#define Z_IS_3931U_EQ_3931(...)  \,
+#define Z_IS_3931_EQ_3931U(...)  \,
+#define Z_IS_3931U_EQ_3931U(...) \,
+#define Z_IS_3932_EQ_3932(...)   \,
+#define Z_IS_3932U_EQ_3932(...)  \,
+#define Z_IS_3932_EQ_3932U(...)  \,
+#define Z_IS_3932U_EQ_3932U(...) \,
+#define Z_IS_3933_EQ_3933(...)   \,
+#define Z_IS_3933U_EQ_3933(...)  \,
+#define Z_IS_3933_EQ_3933U(...)  \,
+#define Z_IS_3933U_EQ_3933U(...) \,
+#define Z_IS_3934_EQ_3934(...)   \,
+#define Z_IS_3934U_EQ_3934(...)  \,
+#define Z_IS_3934_EQ_3934U(...)  \,
+#define Z_IS_3934U_EQ_3934U(...) \,
+#define Z_IS_3935_EQ_3935(...)   \,
+#define Z_IS_3935U_EQ_3935(...)  \,
+#define Z_IS_3935_EQ_3935U(...)  \,
+#define Z_IS_3935U_EQ_3935U(...) \,
+#define Z_IS_3936_EQ_3936(...)   \,
+#define Z_IS_3936U_EQ_3936(...)  \,
+#define Z_IS_3936_EQ_3936U(...)  \,
+#define Z_IS_3936U_EQ_3936U(...) \,
+#define Z_IS_3937_EQ_3937(...)   \,
+#define Z_IS_3937U_EQ_3937(...)  \,
+#define Z_IS_3937_EQ_3937U(...)  \,
+#define Z_IS_3937U_EQ_3937U(...) \,
+#define Z_IS_3938_EQ_3938(...)   \,
+#define Z_IS_3938U_EQ_3938(...)  \,
+#define Z_IS_3938_EQ_3938U(...)  \,
+#define Z_IS_3938U_EQ_3938U(...) \,
+#define Z_IS_3939_EQ_3939(...)   \,
+#define Z_IS_3939U_EQ_3939(...)  \,
+#define Z_IS_3939_EQ_3939U(...)  \,
+#define Z_IS_3939U_EQ_3939U(...) \,
+#define Z_IS_3940_EQ_3940(...)   \,
+#define Z_IS_3940U_EQ_3940(...)  \,
+#define Z_IS_3940_EQ_3940U(...)  \,
+#define Z_IS_3940U_EQ_3940U(...) \,
+#define Z_IS_3941_EQ_3941(...)   \,
+#define Z_IS_3941U_EQ_3941(...)  \,
+#define Z_IS_3941_EQ_3941U(...)  \,
+#define Z_IS_3941U_EQ_3941U(...) \,
+#define Z_IS_3942_EQ_3942(...)   \,
+#define Z_IS_3942U_EQ_3942(...)  \,
+#define Z_IS_3942_EQ_3942U(...)  \,
+#define Z_IS_3942U_EQ_3942U(...) \,
+#define Z_IS_3943_EQ_3943(...)   \,
+#define Z_IS_3943U_EQ_3943(...)  \,
+#define Z_IS_3943_EQ_3943U(...)  \,
+#define Z_IS_3943U_EQ_3943U(...) \,
+#define Z_IS_3944_EQ_3944(...)   \,
+#define Z_IS_3944U_EQ_3944(...)  \,
+#define Z_IS_3944_EQ_3944U(...)  \,
+#define Z_IS_3944U_EQ_3944U(...) \,
+#define Z_IS_3945_EQ_3945(...)   \,
+#define Z_IS_3945U_EQ_3945(...)  \,
+#define Z_IS_3945_EQ_3945U(...)  \,
+#define Z_IS_3945U_EQ_3945U(...) \,
+#define Z_IS_3946_EQ_3946(...)   \,
+#define Z_IS_3946U_EQ_3946(...)  \,
+#define Z_IS_3946_EQ_3946U(...)  \,
+#define Z_IS_3946U_EQ_3946U(...) \,
+#define Z_IS_3947_EQ_3947(...)   \,
+#define Z_IS_3947U_EQ_3947(...)  \,
+#define Z_IS_3947_EQ_3947U(...)  \,
+#define Z_IS_3947U_EQ_3947U(...) \,
+#define Z_IS_3948_EQ_3948(...)   \,
+#define Z_IS_3948U_EQ_3948(...)  \,
+#define Z_IS_3948_EQ_3948U(...)  \,
+#define Z_IS_3948U_EQ_3948U(...) \,
+#define Z_IS_3949_EQ_3949(...)   \,
+#define Z_IS_3949U_EQ_3949(...)  \,
+#define Z_IS_3949_EQ_3949U(...)  \,
+#define Z_IS_3949U_EQ_3949U(...) \,
+#define Z_IS_3950_EQ_3950(...)   \,
+#define Z_IS_3950U_EQ_3950(...)  \,
+#define Z_IS_3950_EQ_3950U(...)  \,
+#define Z_IS_3950U_EQ_3950U(...) \,
+#define Z_IS_3951_EQ_3951(...)   \,
+#define Z_IS_3951U_EQ_3951(...)  \,
+#define Z_IS_3951_EQ_3951U(...)  \,
+#define Z_IS_3951U_EQ_3951U(...) \,
+#define Z_IS_3952_EQ_3952(...)   \,
+#define Z_IS_3952U_EQ_3952(...)  \,
+#define Z_IS_3952_EQ_3952U(...)  \,
+#define Z_IS_3952U_EQ_3952U(...) \,
+#define Z_IS_3953_EQ_3953(...)   \,
+#define Z_IS_3953U_EQ_3953(...)  \,
+#define Z_IS_3953_EQ_3953U(...)  \,
+#define Z_IS_3953U_EQ_3953U(...) \,
+#define Z_IS_3954_EQ_3954(...)   \,
+#define Z_IS_3954U_EQ_3954(...)  \,
+#define Z_IS_3954_EQ_3954U(...)  \,
+#define Z_IS_3954U_EQ_3954U(...) \,
+#define Z_IS_3955_EQ_3955(...)   \,
+#define Z_IS_3955U_EQ_3955(...)  \,
+#define Z_IS_3955_EQ_3955U(...)  \,
+#define Z_IS_3955U_EQ_3955U(...) \,
+#define Z_IS_3956_EQ_3956(...)   \,
+#define Z_IS_3956U_EQ_3956(...)  \,
+#define Z_IS_3956_EQ_3956U(...)  \,
+#define Z_IS_3956U_EQ_3956U(...) \,
+#define Z_IS_3957_EQ_3957(...)   \,
+#define Z_IS_3957U_EQ_3957(...)  \,
+#define Z_IS_3957_EQ_3957U(...)  \,
+#define Z_IS_3957U_EQ_3957U(...) \,
+#define Z_IS_3958_EQ_3958(...)   \,
+#define Z_IS_3958U_EQ_3958(...)  \,
+#define Z_IS_3958_EQ_3958U(...)  \,
+#define Z_IS_3958U_EQ_3958U(...) \,
+#define Z_IS_3959_EQ_3959(...)   \,
+#define Z_IS_3959U_EQ_3959(...)  \,
+#define Z_IS_3959_EQ_3959U(...)  \,
+#define Z_IS_3959U_EQ_3959U(...) \,
+#define Z_IS_3960_EQ_3960(...)   \,
+#define Z_IS_3960U_EQ_3960(...)  \,
+#define Z_IS_3960_EQ_3960U(...)  \,
+#define Z_IS_3960U_EQ_3960U(...) \,
+#define Z_IS_3961_EQ_3961(...)   \,
+#define Z_IS_3961U_EQ_3961(...)  \,
+#define Z_IS_3961_EQ_3961U(...)  \,
+#define Z_IS_3961U_EQ_3961U(...) \,
+#define Z_IS_3962_EQ_3962(...)   \,
+#define Z_IS_3962U_EQ_3962(...)  \,
+#define Z_IS_3962_EQ_3962U(...)  \,
+#define Z_IS_3962U_EQ_3962U(...) \,
+#define Z_IS_3963_EQ_3963(...)   \,
+#define Z_IS_3963U_EQ_3963(...)  \,
+#define Z_IS_3963_EQ_3963U(...)  \,
+#define Z_IS_3963U_EQ_3963U(...) \,
+#define Z_IS_3964_EQ_3964(...)   \,
+#define Z_IS_3964U_EQ_3964(...)  \,
+#define Z_IS_3964_EQ_3964U(...)  \,
+#define Z_IS_3964U_EQ_3964U(...) \,
+#define Z_IS_3965_EQ_3965(...)   \,
+#define Z_IS_3965U_EQ_3965(...)  \,
+#define Z_IS_3965_EQ_3965U(...)  \,
+#define Z_IS_3965U_EQ_3965U(...) \,
+#define Z_IS_3966_EQ_3966(...)   \,
+#define Z_IS_3966U_EQ_3966(...)  \,
+#define Z_IS_3966_EQ_3966U(...)  \,
+#define Z_IS_3966U_EQ_3966U(...) \,
+#define Z_IS_3967_EQ_3967(...)   \,
+#define Z_IS_3967U_EQ_3967(...)  \,
+#define Z_IS_3967_EQ_3967U(...)  \,
+#define Z_IS_3967U_EQ_3967U(...) \,
+#define Z_IS_3968_EQ_3968(...)   \,
+#define Z_IS_3968U_EQ_3968(...)  \,
+#define Z_IS_3968_EQ_3968U(...)  \,
+#define Z_IS_3968U_EQ_3968U(...) \,
+#define Z_IS_3969_EQ_3969(...)   \,
+#define Z_IS_3969U_EQ_3969(...)  \,
+#define Z_IS_3969_EQ_3969U(...)  \,
+#define Z_IS_3969U_EQ_3969U(...) \,
+#define Z_IS_3970_EQ_3970(...)   \,
+#define Z_IS_3970U_EQ_3970(...)  \,
+#define Z_IS_3970_EQ_3970U(...)  \,
+#define Z_IS_3970U_EQ_3970U(...) \,
+#define Z_IS_3971_EQ_3971(...)   \,
+#define Z_IS_3971U_EQ_3971(...)  \,
+#define Z_IS_3971_EQ_3971U(...)  \,
+#define Z_IS_3971U_EQ_3971U(...) \,
+#define Z_IS_3972_EQ_3972(...)   \,
+#define Z_IS_3972U_EQ_3972(...)  \,
+#define Z_IS_3972_EQ_3972U(...)  \,
+#define Z_IS_3972U_EQ_3972U(...) \,
+#define Z_IS_3973_EQ_3973(...)   \,
+#define Z_IS_3973U_EQ_3973(...)  \,
+#define Z_IS_3973_EQ_3973U(...)  \,
+#define Z_IS_3973U_EQ_3973U(...) \,
+#define Z_IS_3974_EQ_3974(...)   \,
+#define Z_IS_3974U_EQ_3974(...)  \,
+#define Z_IS_3974_EQ_3974U(...)  \,
+#define Z_IS_3974U_EQ_3974U(...) \,
+#define Z_IS_3975_EQ_3975(...)   \,
+#define Z_IS_3975U_EQ_3975(...)  \,
+#define Z_IS_3975_EQ_3975U(...)  \,
+#define Z_IS_3975U_EQ_3975U(...) \,
+#define Z_IS_3976_EQ_3976(...)   \,
+#define Z_IS_3976U_EQ_3976(...)  \,
+#define Z_IS_3976_EQ_3976U(...)  \,
+#define Z_IS_3976U_EQ_3976U(...) \,
+#define Z_IS_3977_EQ_3977(...)   \,
+#define Z_IS_3977U_EQ_3977(...)  \,
+#define Z_IS_3977_EQ_3977U(...)  \,
+#define Z_IS_3977U_EQ_3977U(...) \,
+#define Z_IS_3978_EQ_3978(...)   \,
+#define Z_IS_3978U_EQ_3978(...)  \,
+#define Z_IS_3978_EQ_3978U(...)  \,
+#define Z_IS_3978U_EQ_3978U(...) \,
+#define Z_IS_3979_EQ_3979(...)   \,
+#define Z_IS_3979U_EQ_3979(...)  \,
+#define Z_IS_3979_EQ_3979U(...)  \,
+#define Z_IS_3979U_EQ_3979U(...) \,
+#define Z_IS_3980_EQ_3980(...)   \,
+#define Z_IS_3980U_EQ_3980(...)  \,
+#define Z_IS_3980_EQ_3980U(...)  \,
+#define Z_IS_3980U_EQ_3980U(...) \,
+#define Z_IS_3981_EQ_3981(...)   \,
+#define Z_IS_3981U_EQ_3981(...)  \,
+#define Z_IS_3981_EQ_3981U(...)  \,
+#define Z_IS_3981U_EQ_3981U(...) \,
+#define Z_IS_3982_EQ_3982(...)   \,
+#define Z_IS_3982U_EQ_3982(...)  \,
+#define Z_IS_3982_EQ_3982U(...)  \,
+#define Z_IS_3982U_EQ_3982U(...) \,
+#define Z_IS_3983_EQ_3983(...)   \,
+#define Z_IS_3983U_EQ_3983(...)  \,
+#define Z_IS_3983_EQ_3983U(...)  \,
+#define Z_IS_3983U_EQ_3983U(...) \,
+#define Z_IS_3984_EQ_3984(...)   \,
+#define Z_IS_3984U_EQ_3984(...)  \,
+#define Z_IS_3984_EQ_3984U(...)  \,
+#define Z_IS_3984U_EQ_3984U(...) \,
+#define Z_IS_3985_EQ_3985(...)   \,
+#define Z_IS_3985U_EQ_3985(...)  \,
+#define Z_IS_3985_EQ_3985U(...)  \,
+#define Z_IS_3985U_EQ_3985U(...) \,
+#define Z_IS_3986_EQ_3986(...)   \,
+#define Z_IS_3986U_EQ_3986(...)  \,
+#define Z_IS_3986_EQ_3986U(...)  \,
+#define Z_IS_3986U_EQ_3986U(...) \,
+#define Z_IS_3987_EQ_3987(...)   \,
+#define Z_IS_3987U_EQ_3987(...)  \,
+#define Z_IS_3987_EQ_3987U(...)  \,
+#define Z_IS_3987U_EQ_3987U(...) \,
+#define Z_IS_3988_EQ_3988(...)   \,
+#define Z_IS_3988U_EQ_3988(...)  \,
+#define Z_IS_3988_EQ_3988U(...)  \,
+#define Z_IS_3988U_EQ_3988U(...) \,
+#define Z_IS_3989_EQ_3989(...)   \,
+#define Z_IS_3989U_EQ_3989(...)  \,
+#define Z_IS_3989_EQ_3989U(...)  \,
+#define Z_IS_3989U_EQ_3989U(...) \,
+#define Z_IS_3990_EQ_3990(...)   \,
+#define Z_IS_3990U_EQ_3990(...)  \,
+#define Z_IS_3990_EQ_3990U(...)  \,
+#define Z_IS_3990U_EQ_3990U(...) \,
+#define Z_IS_3991_EQ_3991(...)   \,
+#define Z_IS_3991U_EQ_3991(...)  \,
+#define Z_IS_3991_EQ_3991U(...)  \,
+#define Z_IS_3991U_EQ_3991U(...) \,
+#define Z_IS_3992_EQ_3992(...)   \,
+#define Z_IS_3992U_EQ_3992(...)  \,
+#define Z_IS_3992_EQ_3992U(...)  \,
+#define Z_IS_3992U_EQ_3992U(...) \,
+#define Z_IS_3993_EQ_3993(...)   \,
+#define Z_IS_3993U_EQ_3993(...)  \,
+#define Z_IS_3993_EQ_3993U(...)  \,
+#define Z_IS_3993U_EQ_3993U(...) \,
+#define Z_IS_3994_EQ_3994(...)   \,
+#define Z_IS_3994U_EQ_3994(...)  \,
+#define Z_IS_3994_EQ_3994U(...)  \,
+#define Z_IS_3994U_EQ_3994U(...) \,
+#define Z_IS_3995_EQ_3995(...)   \,
+#define Z_IS_3995U_EQ_3995(...)  \,
+#define Z_IS_3995_EQ_3995U(...)  \,
+#define Z_IS_3995U_EQ_3995U(...) \,
+#define Z_IS_3996_EQ_3996(...)   \,
+#define Z_IS_3996U_EQ_3996(...)  \,
+#define Z_IS_3996_EQ_3996U(...)  \,
+#define Z_IS_3996U_EQ_3996U(...) \,
+#define Z_IS_3997_EQ_3997(...)   \,
+#define Z_IS_3997U_EQ_3997(...)  \,
+#define Z_IS_3997_EQ_3997U(...)  \,
+#define Z_IS_3997U_EQ_3997U(...) \,
+#define Z_IS_3998_EQ_3998(...)   \,
+#define Z_IS_3998U_EQ_3998(...)  \,
+#define Z_IS_3998_EQ_3998U(...)  \,
+#define Z_IS_3998U_EQ_3998U(...) \,
+#define Z_IS_3999_EQ_3999(...)   \,
+#define Z_IS_3999U_EQ_3999(...)  \,
+#define Z_IS_3999_EQ_3999U(...)  \,
+#define Z_IS_3999U_EQ_3999U(...) \,
+#define Z_IS_4000_EQ_4000(...)   \,
+#define Z_IS_4000U_EQ_4000(...)  \,
+#define Z_IS_4000_EQ_4000U(...)  \,
+#define Z_IS_4000U_EQ_4000U(...) \,
+#define Z_IS_4001_EQ_4001(...)   \,
+#define Z_IS_4001U_EQ_4001(...)  \,
+#define Z_IS_4001_EQ_4001U(...)  \,
+#define Z_IS_4001U_EQ_4001U(...) \,
+#define Z_IS_4002_EQ_4002(...)   \,
+#define Z_IS_4002U_EQ_4002(...)  \,
+#define Z_IS_4002_EQ_4002U(...)  \,
+#define Z_IS_4002U_EQ_4002U(...) \,
+#define Z_IS_4003_EQ_4003(...)   \,
+#define Z_IS_4003U_EQ_4003(...)  \,
+#define Z_IS_4003_EQ_4003U(...)  \,
+#define Z_IS_4003U_EQ_4003U(...) \,
+#define Z_IS_4004_EQ_4004(...)   \,
+#define Z_IS_4004U_EQ_4004(...)  \,
+#define Z_IS_4004_EQ_4004U(...)  \,
+#define Z_IS_4004U_EQ_4004U(...) \,
+#define Z_IS_4005_EQ_4005(...)   \,
+#define Z_IS_4005U_EQ_4005(...)  \,
+#define Z_IS_4005_EQ_4005U(...)  \,
+#define Z_IS_4005U_EQ_4005U(...) \,
+#define Z_IS_4006_EQ_4006(...)   \,
+#define Z_IS_4006U_EQ_4006(...)  \,
+#define Z_IS_4006_EQ_4006U(...)  \,
+#define Z_IS_4006U_EQ_4006U(...) \,
+#define Z_IS_4007_EQ_4007(...)   \,
+#define Z_IS_4007U_EQ_4007(...)  \,
+#define Z_IS_4007_EQ_4007U(...)  \,
+#define Z_IS_4007U_EQ_4007U(...) \,
+#define Z_IS_4008_EQ_4008(...)   \,
+#define Z_IS_4008U_EQ_4008(...)  \,
+#define Z_IS_4008_EQ_4008U(...)  \,
+#define Z_IS_4008U_EQ_4008U(...) \,
+#define Z_IS_4009_EQ_4009(...)   \,
+#define Z_IS_4009U_EQ_4009(...)  \,
+#define Z_IS_4009_EQ_4009U(...)  \,
+#define Z_IS_4009U_EQ_4009U(...) \,
+#define Z_IS_4010_EQ_4010(...)   \,
+#define Z_IS_4010U_EQ_4010(...)  \,
+#define Z_IS_4010_EQ_4010U(...)  \,
+#define Z_IS_4010U_EQ_4010U(...) \,
+#define Z_IS_4011_EQ_4011(...)   \,
+#define Z_IS_4011U_EQ_4011(...)  \,
+#define Z_IS_4011_EQ_4011U(...)  \,
+#define Z_IS_4011U_EQ_4011U(...) \,
+#define Z_IS_4012_EQ_4012(...)   \,
+#define Z_IS_4012U_EQ_4012(...)  \,
+#define Z_IS_4012_EQ_4012U(...)  \,
+#define Z_IS_4012U_EQ_4012U(...) \,
+#define Z_IS_4013_EQ_4013(...)   \,
+#define Z_IS_4013U_EQ_4013(...)  \,
+#define Z_IS_4013_EQ_4013U(...)  \,
+#define Z_IS_4013U_EQ_4013U(...) \,
+#define Z_IS_4014_EQ_4014(...)   \,
+#define Z_IS_4014U_EQ_4014(...)  \,
+#define Z_IS_4014_EQ_4014U(...)  \,
+#define Z_IS_4014U_EQ_4014U(...) \,
+#define Z_IS_4015_EQ_4015(...)   \,
+#define Z_IS_4015U_EQ_4015(...)  \,
+#define Z_IS_4015_EQ_4015U(...)  \,
+#define Z_IS_4015U_EQ_4015U(...) \,
+#define Z_IS_4016_EQ_4016(...)   \,
+#define Z_IS_4016U_EQ_4016(...)  \,
+#define Z_IS_4016_EQ_4016U(...)  \,
+#define Z_IS_4016U_EQ_4016U(...) \,
+#define Z_IS_4017_EQ_4017(...)   \,
+#define Z_IS_4017U_EQ_4017(...)  \,
+#define Z_IS_4017_EQ_4017U(...)  \,
+#define Z_IS_4017U_EQ_4017U(...) \,
+#define Z_IS_4018_EQ_4018(...)   \,
+#define Z_IS_4018U_EQ_4018(...)  \,
+#define Z_IS_4018_EQ_4018U(...)  \,
+#define Z_IS_4018U_EQ_4018U(...) \,
+#define Z_IS_4019_EQ_4019(...)   \,
+#define Z_IS_4019U_EQ_4019(...)  \,
+#define Z_IS_4019_EQ_4019U(...)  \,
+#define Z_IS_4019U_EQ_4019U(...) \,
+#define Z_IS_4020_EQ_4020(...)   \,
+#define Z_IS_4020U_EQ_4020(...)  \,
+#define Z_IS_4020_EQ_4020U(...)  \,
+#define Z_IS_4020U_EQ_4020U(...) \,
+#define Z_IS_4021_EQ_4021(...)   \,
+#define Z_IS_4021U_EQ_4021(...)  \,
+#define Z_IS_4021_EQ_4021U(...)  \,
+#define Z_IS_4021U_EQ_4021U(...) \,
+#define Z_IS_4022_EQ_4022(...)   \,
+#define Z_IS_4022U_EQ_4022(...)  \,
+#define Z_IS_4022_EQ_4022U(...)  \,
+#define Z_IS_4022U_EQ_4022U(...) \,
+#define Z_IS_4023_EQ_4023(...)   \,
+#define Z_IS_4023U_EQ_4023(...)  \,
+#define Z_IS_4023_EQ_4023U(...)  \,
+#define Z_IS_4023U_EQ_4023U(...) \,
+#define Z_IS_4024_EQ_4024(...)   \,
+#define Z_IS_4024U_EQ_4024(...)  \,
+#define Z_IS_4024_EQ_4024U(...)  \,
+#define Z_IS_4024U_EQ_4024U(...) \,
+#define Z_IS_4025_EQ_4025(...)   \,
+#define Z_IS_4025U_EQ_4025(...)  \,
+#define Z_IS_4025_EQ_4025U(...)  \,
+#define Z_IS_4025U_EQ_4025U(...) \,
+#define Z_IS_4026_EQ_4026(...)   \,
+#define Z_IS_4026U_EQ_4026(...)  \,
+#define Z_IS_4026_EQ_4026U(...)  \,
+#define Z_IS_4026U_EQ_4026U(...) \,
+#define Z_IS_4027_EQ_4027(...)   \,
+#define Z_IS_4027U_EQ_4027(...)  \,
+#define Z_IS_4027_EQ_4027U(...)  \,
+#define Z_IS_4027U_EQ_4027U(...) \,
+#define Z_IS_4028_EQ_4028(...)   \,
+#define Z_IS_4028U_EQ_4028(...)  \,
+#define Z_IS_4028_EQ_4028U(...)  \,
+#define Z_IS_4028U_EQ_4028U(...) \,
+#define Z_IS_4029_EQ_4029(...)   \,
+#define Z_IS_4029U_EQ_4029(...)  \,
+#define Z_IS_4029_EQ_4029U(...)  \,
+#define Z_IS_4029U_EQ_4029U(...) \,
+#define Z_IS_4030_EQ_4030(...)   \,
+#define Z_IS_4030U_EQ_4030(...)  \,
+#define Z_IS_4030_EQ_4030U(...)  \,
+#define Z_IS_4030U_EQ_4030U(...) \,
+#define Z_IS_4031_EQ_4031(...)   \,
+#define Z_IS_4031U_EQ_4031(...)  \,
+#define Z_IS_4031_EQ_4031U(...)  \,
+#define Z_IS_4031U_EQ_4031U(...) \,
+#define Z_IS_4032_EQ_4032(...)   \,
+#define Z_IS_4032U_EQ_4032(...)  \,
+#define Z_IS_4032_EQ_4032U(...)  \,
+#define Z_IS_4032U_EQ_4032U(...) \,
+#define Z_IS_4033_EQ_4033(...)   \,
+#define Z_IS_4033U_EQ_4033(...)  \,
+#define Z_IS_4033_EQ_4033U(...)  \,
+#define Z_IS_4033U_EQ_4033U(...) \,
+#define Z_IS_4034_EQ_4034(...)   \,
+#define Z_IS_4034U_EQ_4034(...)  \,
+#define Z_IS_4034_EQ_4034U(...)  \,
+#define Z_IS_4034U_EQ_4034U(...) \,
+#define Z_IS_4035_EQ_4035(...)   \,
+#define Z_IS_4035U_EQ_4035(...)  \,
+#define Z_IS_4035_EQ_4035U(...)  \,
+#define Z_IS_4035U_EQ_4035U(...) \,
+#define Z_IS_4036_EQ_4036(...)   \,
+#define Z_IS_4036U_EQ_4036(...)  \,
+#define Z_IS_4036_EQ_4036U(...)  \,
+#define Z_IS_4036U_EQ_4036U(...) \,
+#define Z_IS_4037_EQ_4037(...)   \,
+#define Z_IS_4037U_EQ_4037(...)  \,
+#define Z_IS_4037_EQ_4037U(...)  \,
+#define Z_IS_4037U_EQ_4037U(...) \,
+#define Z_IS_4038_EQ_4038(...)   \,
+#define Z_IS_4038U_EQ_4038(...)  \,
+#define Z_IS_4038_EQ_4038U(...)  \,
+#define Z_IS_4038U_EQ_4038U(...) \,
+#define Z_IS_4039_EQ_4039(...)   \,
+#define Z_IS_4039U_EQ_4039(...)  \,
+#define Z_IS_4039_EQ_4039U(...)  \,
+#define Z_IS_4039U_EQ_4039U(...) \,
+#define Z_IS_4040_EQ_4040(...)   \,
+#define Z_IS_4040U_EQ_4040(...)  \,
+#define Z_IS_4040_EQ_4040U(...)  \,
+#define Z_IS_4040U_EQ_4040U(...) \,
+#define Z_IS_4041_EQ_4041(...)   \,
+#define Z_IS_4041U_EQ_4041(...)  \,
+#define Z_IS_4041_EQ_4041U(...)  \,
+#define Z_IS_4041U_EQ_4041U(...) \,
+#define Z_IS_4042_EQ_4042(...)   \,
+#define Z_IS_4042U_EQ_4042(...)  \,
+#define Z_IS_4042_EQ_4042U(...)  \,
+#define Z_IS_4042U_EQ_4042U(...) \,
+#define Z_IS_4043_EQ_4043(...)   \,
+#define Z_IS_4043U_EQ_4043(...)  \,
+#define Z_IS_4043_EQ_4043U(...)  \,
+#define Z_IS_4043U_EQ_4043U(...) \,
+#define Z_IS_4044_EQ_4044(...)   \,
+#define Z_IS_4044U_EQ_4044(...)  \,
+#define Z_IS_4044_EQ_4044U(...)  \,
+#define Z_IS_4044U_EQ_4044U(...) \,
+#define Z_IS_4045_EQ_4045(...)   \,
+#define Z_IS_4045U_EQ_4045(...)  \,
+#define Z_IS_4045_EQ_4045U(...)  \,
+#define Z_IS_4045U_EQ_4045U(...) \,
+#define Z_IS_4046_EQ_4046(...)   \,
+#define Z_IS_4046U_EQ_4046(...)  \,
+#define Z_IS_4046_EQ_4046U(...)  \,
+#define Z_IS_4046U_EQ_4046U(...) \,
+#define Z_IS_4047_EQ_4047(...)   \,
+#define Z_IS_4047U_EQ_4047(...)  \,
+#define Z_IS_4047_EQ_4047U(...)  \,
+#define Z_IS_4047U_EQ_4047U(...) \,
+#define Z_IS_4048_EQ_4048(...)   \,
+#define Z_IS_4048U_EQ_4048(...)  \,
+#define Z_IS_4048_EQ_4048U(...)  \,
+#define Z_IS_4048U_EQ_4048U(...) \,
+#define Z_IS_4049_EQ_4049(...)   \,
+#define Z_IS_4049U_EQ_4049(...)  \,
+#define Z_IS_4049_EQ_4049U(...)  \,
+#define Z_IS_4049U_EQ_4049U(...) \,
+#define Z_IS_4050_EQ_4050(...)   \,
+#define Z_IS_4050U_EQ_4050(...)  \,
+#define Z_IS_4050_EQ_4050U(...)  \,
+#define Z_IS_4050U_EQ_4050U(...) \,
+#define Z_IS_4051_EQ_4051(...)   \,
+#define Z_IS_4051U_EQ_4051(...)  \,
+#define Z_IS_4051_EQ_4051U(...)  \,
+#define Z_IS_4051U_EQ_4051U(...) \,
+#define Z_IS_4052_EQ_4052(...)   \,
+#define Z_IS_4052U_EQ_4052(...)  \,
+#define Z_IS_4052_EQ_4052U(...)  \,
+#define Z_IS_4052U_EQ_4052U(...) \,
+#define Z_IS_4053_EQ_4053(...)   \,
+#define Z_IS_4053U_EQ_4053(...)  \,
+#define Z_IS_4053_EQ_4053U(...)  \,
+#define Z_IS_4053U_EQ_4053U(...) \,
+#define Z_IS_4054_EQ_4054(...)   \,
+#define Z_IS_4054U_EQ_4054(...)  \,
+#define Z_IS_4054_EQ_4054U(...)  \,
+#define Z_IS_4054U_EQ_4054U(...) \,
+#define Z_IS_4055_EQ_4055(...)   \,
+#define Z_IS_4055U_EQ_4055(...)  \,
+#define Z_IS_4055_EQ_4055U(...)  \,
+#define Z_IS_4055U_EQ_4055U(...) \,
+#define Z_IS_4056_EQ_4056(...)   \,
+#define Z_IS_4056U_EQ_4056(...)  \,
+#define Z_IS_4056_EQ_4056U(...)  \,
+#define Z_IS_4056U_EQ_4056U(...) \,
+#define Z_IS_4057_EQ_4057(...)   \,
+#define Z_IS_4057U_EQ_4057(...)  \,
+#define Z_IS_4057_EQ_4057U(...)  \,
+#define Z_IS_4057U_EQ_4057U(...) \,
+#define Z_IS_4058_EQ_4058(...)   \,
+#define Z_IS_4058U_EQ_4058(...)  \,
+#define Z_IS_4058_EQ_4058U(...)  \,
+#define Z_IS_4058U_EQ_4058U(...) \,
+#define Z_IS_4059_EQ_4059(...)   \,
+#define Z_IS_4059U_EQ_4059(...)  \,
+#define Z_IS_4059_EQ_4059U(...)  \,
+#define Z_IS_4059U_EQ_4059U(...) \,
+#define Z_IS_4060_EQ_4060(...)   \,
+#define Z_IS_4060U_EQ_4060(...)  \,
+#define Z_IS_4060_EQ_4060U(...)  \,
+#define Z_IS_4060U_EQ_4060U(...) \,
+#define Z_IS_4061_EQ_4061(...)   \,
+#define Z_IS_4061U_EQ_4061(...)  \,
+#define Z_IS_4061_EQ_4061U(...)  \,
+#define Z_IS_4061U_EQ_4061U(...) \,
+#define Z_IS_4062_EQ_4062(...)   \,
+#define Z_IS_4062U_EQ_4062(...)  \,
+#define Z_IS_4062_EQ_4062U(...)  \,
+#define Z_IS_4062U_EQ_4062U(...) \,
+#define Z_IS_4063_EQ_4063(...)   \,
+#define Z_IS_4063U_EQ_4063(...)  \,
+#define Z_IS_4063_EQ_4063U(...)  \,
+#define Z_IS_4063U_EQ_4063U(...) \,
+#define Z_IS_4064_EQ_4064(...)   \,
+#define Z_IS_4064U_EQ_4064(...)  \,
+#define Z_IS_4064_EQ_4064U(...)  \,
+#define Z_IS_4064U_EQ_4064U(...) \,
+#define Z_IS_4065_EQ_4065(...)   \,
+#define Z_IS_4065U_EQ_4065(...)  \,
+#define Z_IS_4065_EQ_4065U(...)  \,
+#define Z_IS_4065U_EQ_4065U(...) \,
+#define Z_IS_4066_EQ_4066(...)   \,
+#define Z_IS_4066U_EQ_4066(...)  \,
+#define Z_IS_4066_EQ_4066U(...)  \,
+#define Z_IS_4066U_EQ_4066U(...) \,
+#define Z_IS_4067_EQ_4067(...)   \,
+#define Z_IS_4067U_EQ_4067(...)  \,
+#define Z_IS_4067_EQ_4067U(...)  \,
+#define Z_IS_4067U_EQ_4067U(...) \,
+#define Z_IS_4068_EQ_4068(...)   \,
+#define Z_IS_4068U_EQ_4068(...)  \,
+#define Z_IS_4068_EQ_4068U(...)  \,
+#define Z_IS_4068U_EQ_4068U(...) \,
+#define Z_IS_4069_EQ_4069(...)   \,
+#define Z_IS_4069U_EQ_4069(...)  \,
+#define Z_IS_4069_EQ_4069U(...)  \,
+#define Z_IS_4069U_EQ_4069U(...) \,
+#define Z_IS_4070_EQ_4070(...)   \,
+#define Z_IS_4070U_EQ_4070(...)  \,
+#define Z_IS_4070_EQ_4070U(...)  \,
+#define Z_IS_4070U_EQ_4070U(...) \,
+#define Z_IS_4071_EQ_4071(...)   \,
+#define Z_IS_4071U_EQ_4071(...)  \,
+#define Z_IS_4071_EQ_4071U(...)  \,
+#define Z_IS_4071U_EQ_4071U(...) \,
+#define Z_IS_4072_EQ_4072(...)   \,
+#define Z_IS_4072U_EQ_4072(...)  \,
+#define Z_IS_4072_EQ_4072U(...)  \,
+#define Z_IS_4072U_EQ_4072U(...) \,
+#define Z_IS_4073_EQ_4073(...)   \,
+#define Z_IS_4073U_EQ_4073(...)  \,
+#define Z_IS_4073_EQ_4073U(...)  \,
+#define Z_IS_4073U_EQ_4073U(...) \,
+#define Z_IS_4074_EQ_4074(...)   \,
+#define Z_IS_4074U_EQ_4074(...)  \,
+#define Z_IS_4074_EQ_4074U(...)  \,
+#define Z_IS_4074U_EQ_4074U(...) \,
+#define Z_IS_4075_EQ_4075(...)   \,
+#define Z_IS_4075U_EQ_4075(...)  \,
+#define Z_IS_4075_EQ_4075U(...)  \,
+#define Z_IS_4075U_EQ_4075U(...) \,
+#define Z_IS_4076_EQ_4076(...)   \,
+#define Z_IS_4076U_EQ_4076(...)  \,
+#define Z_IS_4076_EQ_4076U(...)  \,
+#define Z_IS_4076U_EQ_4076U(...) \,
+#define Z_IS_4077_EQ_4077(...)   \,
+#define Z_IS_4077U_EQ_4077(...)  \,
+#define Z_IS_4077_EQ_4077U(...)  \,
+#define Z_IS_4077U_EQ_4077U(...) \,
+#define Z_IS_4078_EQ_4078(...)   \,
+#define Z_IS_4078U_EQ_4078(...)  \,
+#define Z_IS_4078_EQ_4078U(...)  \,
+#define Z_IS_4078U_EQ_4078U(...) \,
+#define Z_IS_4079_EQ_4079(...)   \,
+#define Z_IS_4079U_EQ_4079(...)  \,
+#define Z_IS_4079_EQ_4079U(...)  \,
+#define Z_IS_4079U_EQ_4079U(...) \,
+#define Z_IS_4080_EQ_4080(...)   \,
+#define Z_IS_4080U_EQ_4080(...)  \,
+#define Z_IS_4080_EQ_4080U(...)  \,
+#define Z_IS_4080U_EQ_4080U(...) \,
+#define Z_IS_4081_EQ_4081(...)   \,
+#define Z_IS_4081U_EQ_4081(...)  \,
+#define Z_IS_4081_EQ_4081U(...)  \,
+#define Z_IS_4081U_EQ_4081U(...) \,
+#define Z_IS_4082_EQ_4082(...)   \,
+#define Z_IS_4082U_EQ_4082(...)  \,
+#define Z_IS_4082_EQ_4082U(...)  \,
+#define Z_IS_4082U_EQ_4082U(...) \,
+#define Z_IS_4083_EQ_4083(...)   \,
+#define Z_IS_4083U_EQ_4083(...)  \,
+#define Z_IS_4083_EQ_4083U(...)  \,
+#define Z_IS_4083U_EQ_4083U(...) \,
+#define Z_IS_4084_EQ_4084(...)   \,
+#define Z_IS_4084U_EQ_4084(...)  \,
+#define Z_IS_4084_EQ_4084U(...)  \,
+#define Z_IS_4084U_EQ_4084U(...) \,
+#define Z_IS_4085_EQ_4085(...)   \,
+#define Z_IS_4085U_EQ_4085(...)  \,
+#define Z_IS_4085_EQ_4085U(...)  \,
+#define Z_IS_4085U_EQ_4085U(...) \,
+#define Z_IS_4086_EQ_4086(...)   \,
+#define Z_IS_4086U_EQ_4086(...)  \,
+#define Z_IS_4086_EQ_4086U(...)  \,
+#define Z_IS_4086U_EQ_4086U(...) \,
+#define Z_IS_4087_EQ_4087(...)   \,
+#define Z_IS_4087U_EQ_4087(...)  \,
+#define Z_IS_4087_EQ_4087U(...)  \,
+#define Z_IS_4087U_EQ_4087U(...) \,
+#define Z_IS_4088_EQ_4088(...)   \,
+#define Z_IS_4088U_EQ_4088(...)  \,
+#define Z_IS_4088_EQ_4088U(...)  \,
+#define Z_IS_4088U_EQ_4088U(...) \,
+#define Z_IS_4089_EQ_4089(...)   \,
+#define Z_IS_4089U_EQ_4089(...)  \,
+#define Z_IS_4089_EQ_4089U(...)  \,
+#define Z_IS_4089U_EQ_4089U(...) \,
+#define Z_IS_4090_EQ_4090(...)   \,
+#define Z_IS_4090U_EQ_4090(...)  \,
+#define Z_IS_4090_EQ_4090U(...)  \,
+#define Z_IS_4090U_EQ_4090U(...) \,
+#define Z_IS_4091_EQ_4091(...)   \,
+#define Z_IS_4091U_EQ_4091(...)  \,
+#define Z_IS_4091_EQ_4091U(...)  \,
+#define Z_IS_4091U_EQ_4091U(...) \,
+#define Z_IS_4092_EQ_4092(...)   \,
+#define Z_IS_4092U_EQ_4092(...)  \,
+#define Z_IS_4092_EQ_4092U(...)  \,
+#define Z_IS_4092U_EQ_4092U(...) \,
+#define Z_IS_4093_EQ_4093(...)   \,
+#define Z_IS_4093U_EQ_4093(...)  \,
+#define Z_IS_4093_EQ_4093U(...)  \,
+#define Z_IS_4093U_EQ_4093U(...) \,
+#define Z_IS_4094_EQ_4094(...)   \,
+#define Z_IS_4094U_EQ_4094(...)  \,
+#define Z_IS_4094_EQ_4094U(...)  \,
+#define Z_IS_4094U_EQ_4094U(...) \,
+#define Z_IS_4095_EQ_4095(...)   \,
+#define Z_IS_4095U_EQ_4095(...)  \,
+#define Z_IS_4095_EQ_4095U(...)  \,
+#define Z_IS_4095U_EQ_4095U(...) \,
+#define Z_IS_4096_EQ_4096(...)   \,
+#define Z_IS_4096U_EQ_4096(...)  \,
+#define Z_IS_4096_EQ_4096U(...)  \,
+#define Z_IS_4096U_EQ_4096U(...) \,
 
 #endif /* ZEPHYR_INCLUDE_SYS_UTIL_INTERNAL_IS_EQ_H_ */
diff --git a/include/zephyr/sys/util_macro.h b/include/zephyr/sys/util_macro.h
index 5b3864d2e3c..1460d745c94 100644
--- a/include/zephyr/sys/util_macro.h
+++ b/include/zephyr/sys/util_macro.h
@@ -280,7 +280,19 @@ extern "C" {
  * @brief Like <tt>a == b</tt>, but does evaluation and
  * short-circuiting at C preprocessor time.
  *
- * This however only works for integer literal from 0 to 4095.
+ * This however only works for integer literal from 0 to 4096 (literals with U suffix,
+ * e.g. 0U are also included).
+ *
+ * Examples:
+ *
+ *   IS_EQ(1, 1)   -> 1
+ *   IS_EQ(1U, 1U) -> 1
+ *   IS_EQ(1U, 1)  -> 1
+ *   IS_EQ(1, 1U)  -> 1
+ *   IS_EQ(1, 0)   -> 0
+ *
+ * @param a Integer literal (can be with U suffix)
+ * @param b Integer literal
  *
  */
 #define IS_EQ(a, b) Z_IS_EQ(a, b)

From 32ff571753743960aa0cdaa9a599f745bc8e8628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 11 Dec 2024 14:47:44 +0100
Subject: [PATCH 0889/2913] [nrf fromlist] devicetree: Add DT_PROP_LAST macro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add macro for getting the last element of an array type property.

Upstream PR #: 82133

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 include/zephyr/devicetree.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/include/zephyr/devicetree.h b/include/zephyr/devicetree.h
index eb894a1f9a9..3779cacc9e8 100644
--- a/include/zephyr/devicetree.h
+++ b/include/zephyr/devicetree.h
@@ -809,6 +809,17 @@
 #define DT_PROP_BY_IDX(node_id, prop, idx) \
 	DT_CAT5(node_id, _P_, prop, _IDX_, idx)
 
+/**
+ * @brief Get the last element of an array type property
+ *
+ * @param node_id node identifier
+ * @param prop lowercase-and-underscores property name
+ *
+ * @return a representation of the last element of the property
+ */
+#define DT_PROP_LAST(node_id, prop) \
+	DT_PROP_BY_IDX(node_id, prop, UTIL_DEC(DT_PROP_LEN(node_id, prop)))
+
 /**
  * @brief Like DT_PROP(), but with a fallback to @p default_value
  *

From 91c801c3cad1c52c1f21b477171a33dbf87e0668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 11 Dec 2024 12:55:57 +0100
Subject: [PATCH 0890/2913] [nrf fromlist] drivers: clock_control: nrf: Add
 helper macro for getting clock frequency
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add NRF_PERIPH_GET_FREQUENCY() that returns the frequency of clock
that is used for the node.

Upstream PR #: 82133

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 .../drivers/clock_control/nrf_clock_control.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/include/zephyr/drivers/clock_control/nrf_clock_control.h b/include/zephyr/drivers/clock_control/nrf_clock_control.h
index b7764b91a86..0fd3e0fb56d 100644
--- a/include/zephyr/drivers/clock_control/nrf_clock_control.h
+++ b/include/zephyr/drivers/clock_control/nrf_clock_control.h
@@ -294,6 +294,25 @@ int nrf_clock_control_cancel_or_release(const struct device *dev,
 
 #endif /* defined(CONFIG_CLOCK_CONTROL_NRF2) */
 
+/** @brief Get clock frequency that is used for the given node.
+ *
+ * Macro checks if node has clock property and if yes then if clock has clock_frequency property
+ * then it is returned. If it has supported_clock_frequency property with the list of supported
+ * frequencies then the last one is returned with assumption that they are ordered and the last
+ * one is the highest. If node does not have clock then 16 MHz is returned which is the default
+ * frequency.
+ *
+ * @param node Devicetree node.
+ *
+ * @return Frequency of the clock that is used for the node.
+ */
+#define NRF_PERIPH_GET_FREQUENCY(node) \
+	COND_CODE_1(DT_CLOCKS_HAS_IDX(node, 0),							\
+		(COND_CODE_1(DT_NODE_HAS_PROP(DT_CLOCKS_CTLR(node), clock_frequency),		\
+			     (DT_PROP(DT_CLOCKS_CTLR(node), clock_frequency)),			\
+			     (DT_PROP_LAST(DT_CLOCKS_CTLR(node), supported_clock_frequency)))),	\
+		(NRFX_MHZ_TO_HZ(16)))
+
 #ifdef __cplusplus
 }
 #endif

From a8bb7474bdf0f6bf7a0b2c3bdc9431761775fa82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 11 Dec 2024 09:51:59 +0100
Subject: [PATCH 0891/2913] [nrf fromlist] drivers: clock_control: nrf: Add API
 for synchronous request
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add API for synchronous request for clock attributes.

Upstream PR #: 82133

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 .../clock_control/clock_control_nrf2_common.c | 44 +++++++++++++++++++
 .../drivers/clock_control/nrf_clock_control.h | 17 +++++++
 2 files changed, 61 insertions(+)

diff --git a/drivers/clock_control/clock_control_nrf2_common.c b/drivers/clock_control/clock_control_nrf2_common.c
index f3b21a5dd1f..7bf8576880b 100644
--- a/drivers/clock_control/clock_control_nrf2_common.c
+++ b/drivers/clock_control/clock_control_nrf2_common.c
@@ -4,6 +4,7 @@
  */
 
 #include "clock_control_nrf2_common.h"
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
@@ -24,6 +25,13 @@ LOG_MODULE_REGISTER(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
  */
 STRUCT_CLOCK_CONFIG(generic, ONOFF_CNT_MAX);
 
+/* Structure used for synchronous clock request. */
+struct sync_req {
+	struct onoff_client cli;
+	struct k_sem sem;
+	int res;
+};
+
 static void update_config(struct clock_config_generic *cfg)
 {
 	atomic_val_t prev_flags = atomic_or(&cfg->flags, FLAG_UPDATE_NEEDED);
@@ -159,3 +167,39 @@ int api_nosys_on_off(const struct device *dev, clock_control_subsys_t sys)
 
 	return -ENOSYS;
 }
+
+static void sync_cb(struct onoff_manager *mgr, struct onoff_client *cli, uint32_t state, int res)
+{
+	struct sync_req *req = CONTAINER_OF(cli, struct sync_req, cli);
+
+	req->res = res;
+	k_sem_give(&req->sem);
+}
+
+int nrf_clock_control_request_sync(const struct device *dev,
+				   const struct nrf_clock_spec *spec,
+				   k_timeout_t timeout)
+{
+	struct sync_req req = {
+		.sem = Z_SEM_INITIALIZER(req.sem, 0, 1)
+	};
+	int err;
+
+	if (k_is_in_isr()) {
+		return -EWOULDBLOCK;
+	}
+
+	sys_notify_init_callback(&req.cli.notify, sync_cb);
+
+	err = nrf_clock_control_request(dev, spec, &req.cli);
+	if (err < 0) {
+		return err;
+	}
+
+	err = k_sem_take(&req.sem, timeout);
+	if (err < 0) {
+		return err;
+	}
+
+	return req.res;
+}
diff --git a/include/zephyr/drivers/clock_control/nrf_clock_control.h b/include/zephyr/drivers/clock_control/nrf_clock_control.h
index 0fd3e0fb56d..d08016d76b0 100644
--- a/include/zephyr/drivers/clock_control/nrf_clock_control.h
+++ b/include/zephyr/drivers/clock_control/nrf_clock_control.h
@@ -235,6 +235,23 @@ int nrf_clock_control_request(const struct device *dev,
 	return api->request(dev, spec, cli);
 }
 
+/**
+ * @brief Synchronously request a reservation to use a given clock with specified attributes.
+ *
+ * @see nrf_clock_control_request().
+ *
+ * @param dev pointer to the clock device structure.
+ * @param spec See nrf_clock_control_request().
+ * @param timeout Request timeout.
+ *
+ * @retval 0 if request is fulfilled.
+ * @retval -EWOULDBLOCK if request is called from the interrupt context.
+ * @retval negative See error codes returned by nrf_clock_control_request().
+ */
+int nrf_clock_control_request_sync(const struct device *dev,
+				   const struct nrf_clock_spec *spec,
+				   k_timeout_t timeout);
+
 /**
  * @brief Release a reserved use of a clock.
  *

From 99faf47f0f758f7921764fb2b11b44554910c7fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Thu, 12 Dec 2024 12:04:44 +0100
Subject: [PATCH 0892/2913] [nrf fromlist] drivers: pwm: nrfx: add global hsfll
 request for fast PWM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added clock control api for global hsfll used in fast PWM120 driver.

Upstream PR #: 82133

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 drivers/pwm/pwm_nrfx.c | 76 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 72 insertions(+), 4 deletions(-)

diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index 230a90d6cdf..e8cc18a73fc 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -13,6 +13,9 @@
 #include <zephyr/linker/devicetree_regions.h>
 #include <zephyr/cache.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
+#ifdef CONFIG_CLOCK_CONTROL
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#endif
 #ifdef CONFIG_SOC_NRF54H20_GPD
 #include <nrf/gpd.h>
 #endif
@@ -35,6 +38,26 @@ LOG_MODULE_REGISTER(pwm_nrfx, CONFIG_PWM_LOG_LEVEL);
 #define ANOMALY_109_EGU_IRQ_CONNECT(idx)
 #endif
 
+#define PWM(dev_idx) DT_NODELABEL(pwm##dev_idx)
+#define PWM_PROP(dev_idx, prop) DT_PROP(PWM(dev_idx), prop)
+#define PWM_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(PWM(idx), prop)
+
+#define PWM_NRFX_IS_FAST(unused, prefix, idx, _)					\
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(PWM(idx)),					\
+		(COND_CODE_1(PWM_HAS_PROP(idx, power_domains),				\
+		    (IS_EQ(DT_PHA(PWM(idx), power_domains, id), NRF_GPD_FAST_ACTIVE1)),	\
+		    (0))), (0))
+
+#if NRFX_FOREACH_PRESENT(PWM, PWM_NRFX_IS_FAST, (||), (0))
+#if CONFIG_CLOCK_CONTROL
+#define PWM_NRFX_USE_CLOCK_CONTROL 1
+#endif
+#define PWM_NRFX_INIT_PRIORITY 99
+#else
+#define PWM_NRFX_INIT_PRIORITY CONFIG_PWM_INIT_PRIORITY
+#endif
+
+
 #define PWM_NRFX_CH_POLARITY_MASK BIT(15)
 #define PWM_NRFX_CH_COMPARE_MASK  BIT_MASK(15)
 #define PWM_NRFX_CH_VALUE(compare_value, inverted) \
@@ -49,6 +72,10 @@ struct pwm_nrfx_config {
 #ifdef CONFIG_DCACHE
 	uint32_t mem_attr;
 #endif
+#ifdef PWM_NRFX_USE_CLOCK_CONTROL
+	const struct device *clk_dev;
+	struct nrf_clock_spec clk_spec;
+#endif
 };
 
 struct pwm_nrfx_data {
@@ -57,6 +84,9 @@ struct pwm_nrfx_data {
 	uint8_t  pwm_needed;
 	uint8_t  prescaler;
 	bool     stop_requested;
+#ifdef PWM_NRFX_USE_CLOCK_CONTROL
+	bool     clock_requested;
+#endif
 };
 /* Ensure the pwm_needed bit mask can accommodate all available channels. */
 #if (NRF_PWM_CHANNEL_COUNT > 8)
@@ -229,6 +259,18 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 		 * ensure it is stopped before starting the next playback.
 		 */
 		nrfx_pwm_stop(&config->pwm, false);
+#if PWM_NRFX_USE_CLOCK_CONTROL
+		if (data->clock_requested) {
+			int ret = nrf_clock_control_release(config->clk_dev, &config->clk_spec);
+
+			if (ret < 0) {
+				LOG_ERR("Global HSFLL release failed: %d", ret);
+				return ret;
+			}
+
+			data->clock_requested = false;
+		}
+#endif
 		data->stop_requested = true;
 	} else {
 		if (data->stop_requested) {
@@ -248,6 +290,18 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 		 * until another playback is requested (new values will be
 		 * loaded then) or the PWM peripheral is stopped.
 		 */
+#if PWM_NRFX_USE_CLOCK_CONTROL
+
+		int ret = nrf_clock_control_request_sync(config->clk_dev, &config->clk_spec,
+							 K_FOREVER);
+
+		if (ret < 0) {
+			LOG_ERR("Global HSFLL request failed: %d", ret);
+			return ret;
+		}
+
+		data->clock_requested = true;
+#endif
 		nrfx_pwm_simple_playback(&config->pwm, &config->seq, 1,
 					 NRFX_PWM_FLAG_NO_EVT_FINISHED);
 	}
@@ -306,6 +360,14 @@ static void pwm_suspend(const struct device *dev)
 	const struct pwm_nrfx_config *config = dev->config;
 
 	nrfx_pwm_stop(&config->pwm, false);
+#if PWM_NRFX_USE_CLOCK_CONTROL
+
+		int ret = nrf_clock_control_release(config->clk_dev, &config->clk_spec);
+
+		if (ret < 0) {
+			LOG_ERR("Global HSFLL release failed: %d", ret);
+		}
+#endif
 	while (!nrfx_pwm_stopped_check(&config->pwm)) {
 	}
 
@@ -351,9 +413,6 @@ static int pwm_nrfx_init(const struct device *dev)
 	return pm_device_driver_init(dev, pwm_nrfx_pm_action);
 }
 
-#define PWM(dev_idx) DT_NODELABEL(pwm##dev_idx)
-#define PWM_PROP(dev_idx, prop) DT_PROP(PWM(dev_idx), prop)
-#define PWM_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(PWM(idx), prop)
 #define PWM_MEM_REGION(idx)     DT_PHANDLE(PWM(idx), memory_regions)
 
 #define PWM_MEMORY_SECTION(idx)						      \
@@ -393,6 +452,15 @@ static int pwm_nrfx_init(const struct device *dev)
 			(16ul * 1000ul * 1000ul)),			      \
 		IF_ENABLED(CONFIG_DCACHE,				      \
 			(.mem_attr = PWM_GET_MEM_ATTR(idx),))		      \
+		IF_ENABLED(PWM_NRFX_USE_CLOCK_CONTROL,		      \
+			(.clk_dev = DEVICE_DT_GET(DT_CLOCKS_CTLR(PWM(idx))),  \
+			 .clk_spec = {					      \
+				.frequency =				      \
+					NRF_PERIPH_GET_FREQUENCY(PWM(idx)),   \
+				.accuracy = 0,				      \
+				.precision =				      \
+					NRF_CLOCK_CONTROL_PRECISION_DEFAULT,  \
+			 },))						      \
 	};								      \
 	static int pwm_nrfx_init##idx(const struct device *dev)		      \
 	{								      \
@@ -405,7 +473,7 @@ static int pwm_nrfx_init(const struct device *dev)
 			 pwm_nrfx_init##idx, PM_DEVICE_DT_GET(PWM(idx)),      \
 			 &pwm_nrfx_##idx##_data,			      \
 			 &pwm_nrfx_##idx##_config,			      \
-			 POST_KERNEL, CONFIG_PWM_INIT_PRIORITY,		      \
+			 POST_KERNEL, PWM_NRFX_INIT_PRIORITY,		      \
 			 &pwm_nrfx_drv_api_funcs)
 
 #define COND_PWM_NRFX_DEVICE(unused, prefix, i, _) \

From 5ec430448b9b37db678cc943c528fd4305bf1346 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Fri, 13 Dec 2024 14:43:56 +0100
Subject: [PATCH 0893/2913] Revert "[nrf fromlist] drivers: clock_control:
 nrf2: add support for global hfsll clock"

This reverts commit 5227b68d4df294dd6377c03fe416ecbd7aeb47ba.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 drivers/clock_control/CMakeLists.txt          |   1 -
 drivers/clock_control/Kconfig.nrf             |  27 --
 .../clock_control_nrf2_global_hsfll.c         | 302 ------------------
 .../clock_control/clock_control_nrf2_hsfll.c  |  14 +
 4 files changed, 14 insertions(+), 330 deletions(-)
 delete mode 100644 drivers/clock_control/clock_control_nrf2_global_hsfll.c

diff --git a/drivers/clock_control/CMakeLists.txt b/drivers/clock_control/CMakeLists.txt
index d3d1807d6cf..ffc19a3b729 100644
--- a/drivers/clock_control/CMakeLists.txt
+++ b/drivers/clock_control/CMakeLists.txt
@@ -35,7 +35,6 @@ zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RENESAS_RA_CGC      clock_cont
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_AMBIQ               clock_control_ambiq.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_PWM                 clock_control_pwm.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RPI_PICO            clock_control_rpi_pico.c)
-zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL   clock_control_nrf2_global_hsfll.c)
 
 if(CONFIG_CLOCK_CONTROL_NRF2)
   zephyr_library_sources(clock_control_nrf2_common.c)
diff --git a/drivers/clock_control/Kconfig.nrf b/drivers/clock_control/Kconfig.nrf
index 3965bb06e25..f7b0de3db09 100644
--- a/drivers/clock_control/Kconfig.nrf
+++ b/drivers/clock_control/Kconfig.nrf
@@ -193,31 +193,4 @@ config CLOCK_CONTROL_NRF2_NRFS_CLOCK_TIMEOUT_MS
 	int "Timeout waiting for nrfs clock service callback in milliseconds"
 	default 1000
 
-config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
-	bool "Clock control for global HSFLL"
-	depends on NRFS_GDFS_SERVICE_ENABLED
-	default y
-
-if CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
-
-config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_TIMEOUT_MS
-	int "Frequency request timeout in milliseconds"
-	default 10000
-
-config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_REQ_LOW_FREQ
-	bool "Request LOW frequency on init"
-	default y
-	help
-	  The GDFS service will default to HIGH frequency until it receives
-	  a lower frequency request. The NRF2 clock controller drivers
-	  expect the clock to be initialized to their lowest frequency, so
-	  we need to send a request on init to align GDFS with the NRF2
-	  clock controller driver.
-
-	  This initial request can be disabled to prevent a potentially
-	  unnecessary HIGH -> LOW -> HIGH cycle given some module will
-	  request a HIGH frequency on init anyway.
-
-endif # CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
-
 endif # CLOCK_CONTROL_NRF2
diff --git a/drivers/clock_control/clock_control_nrf2_global_hsfll.c b/drivers/clock_control/clock_control_nrf2_global_hsfll.c
deleted file mode 100644
index 79005f427ae..00000000000
--- a/drivers/clock_control/clock_control_nrf2_global_hsfll.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define DT_DRV_COMPAT nordic_nrf_hsfll_global
-
-#include "clock_control_nrf2_common.h"
-#include <zephyr/devicetree.h>
-#include <zephyr/drivers/clock_control/nrf_clock_control.h>
-#include <nrfs_gdfs.h>
-
-#include <zephyr/logging/log.h>
-LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
-
-#define GLOBAL_HSFLL_CLOCK_FREQUENCIES \
-	DT_INST_PROP(0, supported_clock_frequencies)
-
-#define GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(idx) \
-	DT_INST_PROP_BY_IDX(0, supported_clock_frequencies, idx)
-
-#define GLOBAL_HSFLL_CLOCK_FREQUENCIES_SIZE \
-	DT_INST_PROP_LEN(0, supported_clock_frequencies)
-
-#define GLOBAL_HSFLL_FREQ_REQ_TIMEOUT \
-	K_MSEC(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_TIMEOUT_MS)
-
-#define GLOBAL_HSFLL_INIT_LOW_REQ \
-	CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_REQ_LOW_FREQ
-
-BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_SIZE == 4);
-BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(0) == 64000000);
-BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(1) == 128000000);
-BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(2) == 256000000);
-BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(3) == 320000000);
-BUILD_ASSERT(GDFS_FREQ_COUNT == 4);
-BUILD_ASSERT(GDFS_FREQ_HIGH == 0);
-BUILD_ASSERT(GDFS_FREQ_MEDHIGH == 1);
-BUILD_ASSERT(GDFS_FREQ_MEDLOW == 2);
-BUILD_ASSERT(GDFS_FREQ_LOW == 3);
-
-struct global_hsfll_dev_config {
-	uint32_t clock_frequencies[GLOBAL_HSFLL_CLOCK_FREQUENCIES_SIZE];
-};
-
-struct global_hsfll_dev_data {
-	STRUCT_CLOCK_CONFIG(global_hsfll, GLOBAL_HSFLL_CLOCK_FREQUENCIES_SIZE) clk_cfg;
-	const struct device *dev;
-	struct k_work evt_work;
-	nrfs_gdfs_evt_type_t evt;
-	struct k_work_delayable timeout_dwork;
-
-#if GLOBAL_HSFLL_INIT_LOW_REQ
-	struct k_sem evt_sem;
-#endif /* GLOBAL_HSFLL_INIT_LOW_REQ */
-};
-
-static uint32_t global_hsfll_get_max_clock_frequency(const struct device *dev)
-{
-	const struct global_hsfll_dev_config *dev_config = dev->config;
-
-	return dev_config->clock_frequencies[ARRAY_SIZE(dev_config->clock_frequencies) - 1];
-}
-
-static struct onoff_manager *global_hsfll_find_mgr(const struct device *dev,
-						   const struct nrf_clock_spec *spec)
-{
-	struct global_hsfll_dev_data *dev_data = dev->data;
-	const struct global_hsfll_dev_config *dev_config = dev->config;
-	uint32_t frequency;
-
-	if (!spec) {
-		return &dev_data->clk_cfg.onoff[0].mgr;
-	}
-
-	if (spec->accuracy || spec->precision) {
-		LOG_ERR("invalid specification of accuracy or precision");
-		return NULL;
-	}
-
-	frequency = spec->frequency == NRF_CLOCK_CONTROL_FREQUENCY_MAX
-		  ? global_hsfll_get_max_clock_frequency(dev)
-		  : spec->frequency;
-
-	for (uint8_t i = 0; i < ARRAY_SIZE(dev_config->clock_frequencies); i++) {
-		if (dev_config->clock_frequencies[i] < frequency) {
-			continue;
-		}
-
-		return &dev_data->clk_cfg.onoff[i].mgr;
-	}
-
-	LOG_ERR("invalid frequency");
-	return NULL;
-}
-
-static int api_request_global_hsfll(const struct device *dev,
-				    const struct nrf_clock_spec *spec,
-				    struct onoff_client *cli)
-{
-	struct onoff_manager *mgr = global_hsfll_find_mgr(dev, spec);
-
-	if (mgr) {
-		return onoff_request(mgr, cli);
-	}
-
-	return -EINVAL;
-}
-
-static int api_release_global_hsfll(const struct device *dev,
-				    const struct nrf_clock_spec *spec)
-{
-	struct onoff_manager *mgr = global_hsfll_find_mgr(dev, spec);
-
-	if (mgr) {
-		return onoff_release(mgr);
-	}
-
-	return -EINVAL;
-}
-
-static int api_cancel_or_release_global_hsfll(const struct device *dev,
-					      const struct nrf_clock_spec *spec,
-					      struct onoff_client *cli)
-{
-	struct onoff_manager *mgr = global_hsfll_find_mgr(dev, spec);
-
-	if (mgr) {
-		return onoff_cancel_or_release(mgr, cli);
-	}
-
-	return -EINVAL;
-}
-
-static struct nrf_clock_control_driver_api driver_api = {
-	.std_api = {
-		.on = api_nosys_on_off,
-		.off = api_nosys_on_off,
-	},
-	.request = api_request_global_hsfll,
-	.release = api_release_global_hsfll,
-	.cancel_or_release = api_cancel_or_release_global_hsfll,
-};
-
-static enum gdfs_frequency_setting global_hsfll_freq_idx_to_nrfs_freq(const struct device *dev,
-								      uint8_t freq_idx)
-{
-	const struct global_hsfll_dev_config *dev_config = dev->config;
-
-	return ARRAY_SIZE(dev_config->clock_frequencies) - 1 - freq_idx;
-}
-
-static const char *global_hsfll_gdfs_freq_to_str(enum gdfs_frequency_setting freq)
-{
-	switch (freq) {
-	case GDFS_FREQ_HIGH:
-		return "GDFS_FREQ_HIGH";
-	case GDFS_FREQ_MEDHIGH:
-		return "GDFS_FREQ_MEDHIGH";
-	case GDFS_FREQ_MEDLOW:
-		return "GDFS_FREQ_MEDLOW";
-	case GDFS_FREQ_LOW:
-		return "GDFS_FREQ_LOW";
-	default:
-		break;
-	}
-
-	return "UNKNOWN";
-}
-
-static void global_hsfll_work_handler(struct k_work *work)
-{
-	struct global_hsfll_dev_data *dev_data =
-		CONTAINER_OF(work, struct global_hsfll_dev_data, clk_cfg.work);
-	const struct device *dev = dev_data->dev;
-	uint8_t freq_idx;
-	enum gdfs_frequency_setting target_freq;
-	nrfs_err_t err;
-
-	freq_idx = clock_config_update_begin(work);
-	target_freq = global_hsfll_freq_idx_to_nrfs_freq(dev, freq_idx);
-
-	LOG_DBG("requesting %s", global_hsfll_gdfs_freq_to_str(target_freq));
-	err = nrfs_gdfs_request_freq(target_freq, dev_data);
-	if (err != NRFS_SUCCESS) {
-		clock_config_update_end(&dev_data->clk_cfg, -EIO);
-		return;
-	}
-
-	k_work_schedule(&dev_data->timeout_dwork, GLOBAL_HSFLL_FREQ_REQ_TIMEOUT);
-}
-
-static void global_hsfll_evt_handler(struct k_work *work)
-{
-	struct global_hsfll_dev_data *dev_data =
-		CONTAINER_OF(work, struct global_hsfll_dev_data, evt_work);
-	int rc;
-
-	k_work_cancel_delayable(&dev_data->timeout_dwork);
-	rc = dev_data->evt == NRFS_GDFS_EVT_FREQ_CONFIRMED ? 0 : -EIO;
-	clock_config_update_end(&dev_data->clk_cfg, rc);
-}
-
-#if GLOBAL_HSFLL_INIT_LOW_REQ
-static void global_hfsll_nrfs_gdfs_init_evt_handler(nrfs_gdfs_evt_t const *p_evt, void *context)
-{
-	struct global_hsfll_dev_data *dev_data = context;
-
-	dev_data->evt = p_evt->type;
-	k_sem_give(&dev_data->evt_sem);
-}
-#endif /* GLOBAL_HSFLL_INIT_LOW_REQ */
-
-static void global_hfsll_nrfs_gdfs_evt_handler(nrfs_gdfs_evt_t const *p_evt, void *context)
-{
-	struct global_hsfll_dev_data *dev_data = context;
-
-	if (k_work_is_pending(&dev_data->evt_work)) {
-		return;
-	}
-
-	dev_data->evt = p_evt->type;
-	k_work_submit(&dev_data->evt_work);
-}
-
-static void global_hsfll_timeout_handler(struct k_work *work)
-{
-	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
-	struct global_hsfll_dev_data *dev_data =
-		CONTAINER_OF(dwork, struct global_hsfll_dev_data, timeout_dwork);
-
-	clock_config_update_end(&dev_data->clk_cfg, -ETIMEDOUT);
-}
-
-static int global_hfsll_init(const struct device *dev)
-{
-	struct global_hsfll_dev_data *dev_data = dev->data;
-	nrfs_err_t err;
-	int rc;
-
-	k_work_init_delayable(&dev_data->timeout_dwork, global_hsfll_timeout_handler);
-	k_work_init(&dev_data->evt_work, global_hsfll_evt_handler);
-
-#if GLOBAL_HSFLL_INIT_LOW_REQ
-	k_sem_init(&dev_data->evt_sem, 0, 1);
-
-	err = nrfs_gdfs_init(global_hfsll_nrfs_gdfs_init_evt_handler);
-	if (err != NRFS_SUCCESS) {
-		return -EIO;
-	}
-
-	LOG_DBG("initial request %s", global_hsfll_gdfs_freq_to_str(GDFS_FREQ_LOW));
-	err = nrfs_gdfs_request_freq(GDFS_FREQ_LOW, dev_data);
-	if (err != NRFS_SUCCESS) {
-		return -EIO;
-	}
-
-	rc = k_sem_take(&dev_data->evt_sem, GLOBAL_HSFLL_FREQ_REQ_TIMEOUT);
-	if (rc) {
-		return -EIO;
-	}
-
-	if (dev_data->evt != NRFS_GDFS_EVT_FREQ_CONFIRMED) {
-		return -EIO;
-	}
-
-	nrfs_gdfs_uninit();
-#endif /* GLOBAL_HSFLL_INIT_LOW_REQ */
-
-	rc = clock_config_init(&dev_data->clk_cfg,
-			       ARRAY_SIZE(dev_data->clk_cfg.onoff),
-			       global_hsfll_work_handler);
-	if (rc < 0) {
-		return rc;
-	}
-
-	err = nrfs_gdfs_init(global_hfsll_nrfs_gdfs_evt_handler);
-	if (err != NRFS_SUCCESS) {
-		return -EIO;
-	}
-
-	return 0;
-}
-
-static struct global_hsfll_dev_data driver_data = {
-	.dev = DEVICE_DT_INST_GET(0),
-};
-
-static const struct global_hsfll_dev_config driver_config = {
-	GLOBAL_HSFLL_CLOCK_FREQUENCIES
-};
-
-DEVICE_DT_INST_DEFINE(
-	0,
-	global_hfsll_init,
-	NULL,
-	&driver_data,
-	&driver_config,
-	POST_KERNEL,
-	CONFIG_CLOCK_CONTROL_INIT_PRIORITY,
-	&driver_api
-);
diff --git a/drivers/clock_control/clock_control_nrf2_hsfll.c b/drivers/clock_control/clock_control_nrf2_hsfll.c
index 58ad4a51ff5..b0d0ff364b3 100644
--- a/drivers/clock_control/clock_control_nrf2_hsfll.c
+++ b/drivers/clock_control/clock_control_nrf2_hsfll.c
@@ -8,6 +8,7 @@
 #include "clock_control_nrf2_common.h"
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <hal/nrf_hsfll.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
@@ -182,6 +183,18 @@ static int api_cancel_or_release_hsfll(const struct device *dev,
 #endif
 }
 
+static int api_get_rate_hsfll(const struct device *dev,
+			      clock_control_subsys_t sys,
+			      uint32_t *rate)
+{
+	ARG_UNUSED(dev);
+	ARG_UNUSED(sys);
+
+	*rate = nrf_hsfll_clkctrl_mult_get(NRF_HSFLL) * MHZ(16);
+
+	return 0;
+}
+
 static int hsfll_init(const struct device *dev)
 {
 #ifdef CONFIG_NRFS_DVFS_LOCAL_DOMAIN
@@ -208,6 +221,7 @@ static struct nrf_clock_control_driver_api hsfll_drv_api = {
 	.std_api = {
 		.on = api_nosys_on_off,
 		.off = api_nosys_on_off,
+		.get_rate = api_get_rate_hsfll,
 	},
 	.request = api_request_hsfll,
 	.release = api_release_hsfll,

From 84da3479e9c23e4617b2e2c31f60e2ac292ad9ed Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Fri, 13 Dec 2024 14:44:08 +0100
Subject: [PATCH 0894/2913] Revert "[nrf fromlist] modules: hal_nordic: nrfs:
 add GDFS Service"

This reverts commit 5cc9300f980f51ab8a323a2b49ac9e99982039b7.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 modules/hal_nordic/nrfs/CMakeLists.txt | 1 -
 modules/hal_nordic/nrfs/Kconfig        | 8 --------
 modules/hal_nordic/nrfs/nrfs_config.h  | 4 ----
 soc/nordic/nrf54h/Kconfig              | 2 --
 4 files changed, 15 deletions(-)

diff --git a/modules/hal_nordic/nrfs/CMakeLists.txt b/modules/hal_nordic/nrfs/CMakeLists.txt
index 41dfb61f864..f470eea00e9 100644
--- a/modules/hal_nordic/nrfs/CMakeLists.txt
+++ b/modules/hal_nordic/nrfs/CMakeLists.txt
@@ -31,7 +31,6 @@ if(CONFIG_NRFS)
         zephyr_library_sources_ifdef(CONFIG_NRFS_RESET_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_reset.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..8c5b61bb11f 100644
--- a/modules/hal_nordic/nrfs/Kconfig
+++ b/modules/hal_nordic/nrfs/Kconfig
@@ -19,9 +19,6 @@ config NRFS_HAS_DIAG_SERVICE
 config NRFS_HAS_DVFS_SERVICE
 	bool
 
-config NRFS_HAS_GDFS_SERVICE
-	bool
-
 config NRFS_HAS_GDPWR_SERVICE
 	bool
 
@@ -120,11 +117,6 @@ config NRFS_GDPWR_SERVICE_ENABLED
 	depends on NRFS_HAS_GDPWR_SERVICE
 	default y
 
-config NRFS_GDFS_SERVICE_ENABLED
-	bool "Global domain frequency scaling service"
-	depends on NRFS_HAS_GDFS_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 45e9e446b71..a092adb7850 100644
--- a/modules/hal_nordic/nrfs/nrfs_config.h
+++ b/modules/hal_nordic/nrfs/nrfs_config.h
@@ -44,10 +44,6 @@
 #define NRFS_GDPWR_SERVICE_ENABLED
 #endif
 
-#ifdef CONFIG_NRFS_CLOCK_SERVICE_ENABLED
-#define NRFS_CLOCK_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 d54ef99da8e..36979b554e0 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -25,7 +25,6 @@ config SOC_NRF54H20_CPUAPP_COMMON
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select NRFS_HAS_CLOCK_SERVICE
 	select NRFS_HAS_DVFS_SERVICE
-	select NRFS_HAS_GDFS_SERVICE
 	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
@@ -49,7 +48,6 @@ config SOC_NRF54H20_CPURAD_COMMON
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select NRFS_HAS_CLOCK_SERVICE
-	select NRFS_HAS_GDFS_SERVICE
 	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
 	select NRFS_HAS_TEMP_SERVICE

From c2c18233aaf6c5c3ce26bd7efdf79db8c9b174b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Pelikan?= <pawel.pelikan@nordicsemi.no>
Date: Mon, 18 Nov 2024 15:38:26 +0100
Subject: [PATCH 0895/2913] [nrf fromlist] modules: hal_nordic: nrfs: add GDFS
 Service
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adding the implementation for the GDFS service

Upstream PR #: 81735

Signed-off-by: Paweł Pelikan <pawel.pelikan@nordicsemi.no>
---
 modules/hal_nordic/nrfs/CMakeLists.txt | 1 +
 modules/hal_nordic/nrfs/Kconfig        | 8 ++++++++
 modules/hal_nordic/nrfs/nrfs_config.h  | 8 ++++++++
 soc/nordic/nrf54h/Kconfig              | 2 ++
 4 files changed, 19 insertions(+)

diff --git a/modules/hal_nordic/nrfs/CMakeLists.txt b/modules/hal_nordic/nrfs/CMakeLists.txt
index f470eea00e9..41dfb61f864 100644
--- a/modules/hal_nordic/nrfs/CMakeLists.txt
+++ b/modules/hal_nordic/nrfs/CMakeLists.txt
@@ -31,6 +31,7 @@ if(CONFIG_NRFS)
         zephyr_library_sources_ifdef(CONFIG_NRFS_RESET_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_reset.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 8c5b61bb11f..cf40a64f592 100644
--- a/modules/hal_nordic/nrfs/Kconfig
+++ b/modules/hal_nordic/nrfs/Kconfig
@@ -19,6 +19,9 @@ config NRFS_HAS_DIAG_SERVICE
 config NRFS_HAS_DVFS_SERVICE
 	bool
 
+config NRFS_HAS_GDFS_SERVICE
+	bool
+
 config NRFS_HAS_GDPWR_SERVICE
 	bool
 
@@ -117,6 +120,11 @@ config NRFS_GDPWR_SERVICE_ENABLED
 	depends on NRFS_HAS_GDPWR_SERVICE
 	default y
 
+config NRFS_GDFS_SERVICE_ENABLED
+	bool "Global domain frequency scaling service"
+	depends on NRFS_HAS_GDFS_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 a092adb7850..392c2019dfe 100644
--- a/modules/hal_nordic/nrfs/nrfs_config.h
+++ b/modules/hal_nordic/nrfs/nrfs_config.h
@@ -44,6 +44,14 @@
 #define NRFS_GDPWR_SERVICE_ENABLED
 #endif
 
+#ifdef CONFIG_NRFS_CLOCK_SERVICE_ENABLED
+#define NRFS_CLOCK_SERVICE_ENABLED
+#endif
+
+#ifdef CONFIG_NRFS_GDFS_SERVICE_ENABLED
+#define NRFS_GDFS_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 36979b554e0..d54ef99da8e 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -25,6 +25,7 @@ config SOC_NRF54H20_CPUAPP_COMMON
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select NRFS_HAS_CLOCK_SERVICE
 	select NRFS_HAS_DVFS_SERVICE
+	select NRFS_HAS_GDFS_SERVICE
 	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
@@ -48,6 +49,7 @@ config SOC_NRF54H20_CPURAD_COMMON
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select NRFS_HAS_CLOCK_SERVICE
+	select NRFS_HAS_GDFS_SERVICE
 	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
 	select NRFS_HAS_TEMP_SERVICE

From b6535f5caeff11a44b2daf808b2ddaddcf5ba4d3 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Thu, 21 Nov 2024 13:53:47 +0100
Subject: [PATCH 0896/2913] [nrf fromlist] drivers: clock_control: nrf2: add
 support for global hfsll clock

Add device driver support for global hsfll clock.

Upstream PR #: 81735

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 drivers/clock_control/CMakeLists.txt          |   1 +
 drivers/clock_control/Kconfig.nrf             |  33 ++
 .../clock_control_nrf2_global_hsfll.c         | 302 ++++++++++++++++++
 .../clock_control/clock_control_nrf2_hsfll.c  |  14 -
 4 files changed, 336 insertions(+), 14 deletions(-)
 create mode 100644 drivers/clock_control/clock_control_nrf2_global_hsfll.c

diff --git a/drivers/clock_control/CMakeLists.txt b/drivers/clock_control/CMakeLists.txt
index ffc19a3b729..d3d1807d6cf 100644
--- a/drivers/clock_control/CMakeLists.txt
+++ b/drivers/clock_control/CMakeLists.txt
@@ -35,6 +35,7 @@ zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RENESAS_RA_CGC      clock_cont
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_AMBIQ               clock_control_ambiq.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_PWM                 clock_control_pwm.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RPI_PICO            clock_control_rpi_pico.c)
+zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL   clock_control_nrf2_global_hsfll.c)
 
 if(CONFIG_CLOCK_CONTROL_NRF2)
   zephyr_library_sources(clock_control_nrf2_common.c)
diff --git a/drivers/clock_control/Kconfig.nrf b/drivers/clock_control/Kconfig.nrf
index f7b0de3db09..b5b066ac48e 100644
--- a/drivers/clock_control/Kconfig.nrf
+++ b/drivers/clock_control/Kconfig.nrf
@@ -193,4 +193,37 @@ config CLOCK_CONTROL_NRF2_NRFS_CLOCK_TIMEOUT_MS
 	int "Timeout waiting for nrfs clock service callback in milliseconds"
 	default 1000
 
+config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
+	bool "Clock control for global HSFLL"
+	depends on NRFS_GDFS_SERVICE_ENABLED
+	default y
+
+if CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
+
+config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_TIMEOUT_MS
+	int "Frequency request timeout in milliseconds"
+	default 10000
+
+config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_REQ_LOW_FREQ
+	bool "Request LOW frequency on init"
+	default y
+	help
+	  The GDFS service will default to HIGH frequency until it receives
+	  a lower frequency request. The NRF2 clock controller drivers
+	  expect the clock to be initialized to their lowest frequency, so
+	  we need to send a request on init to align GDFS with the NRF2
+	  clock controller driver.
+
+	  This initial request can be disabled to prevent a potentially
+	  unnecessary HIGH -> LOW -> HIGH cycle given some module will
+	  request a HIGH frequency on init anyway.
+
+config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_INIT_PRIORITY
+	int "Init priority of global HSFLL device driver"
+	default 52
+	help
+	  Must be higher than NRFS backend
+
+endif # CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
+
 endif # CLOCK_CONTROL_NRF2
diff --git a/drivers/clock_control/clock_control_nrf2_global_hsfll.c b/drivers/clock_control/clock_control_nrf2_global_hsfll.c
new file mode 100644
index 00000000000..e79957eea71
--- /dev/null
+++ b/drivers/clock_control/clock_control_nrf2_global_hsfll.c
@@ -0,0 +1,302 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT nordic_nrf_hsfll_global
+
+#include "clock_control_nrf2_common.h"
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <nrfs_gdfs.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
+
+#define GLOBAL_HSFLL_CLOCK_FREQUENCIES \
+	DT_INST_PROP(0, supported_clock_frequencies)
+
+#define GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(idx) \
+	DT_INST_PROP_BY_IDX(0, supported_clock_frequencies, idx)
+
+#define GLOBAL_HSFLL_CLOCK_FREQUENCIES_SIZE \
+	DT_INST_PROP_LEN(0, supported_clock_frequencies)
+
+#define GLOBAL_HSFLL_FREQ_REQ_TIMEOUT \
+	K_MSEC(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_TIMEOUT_MS)
+
+#define GLOBAL_HSFLL_INIT_LOW_REQ \
+	CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_REQ_LOW_FREQ
+
+BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_SIZE == 4);
+BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(0) == 64000000);
+BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(1) == 128000000);
+BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(2) == 256000000);
+BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(3) == 320000000);
+BUILD_ASSERT(GDFS_FREQ_COUNT == 4);
+BUILD_ASSERT(GDFS_FREQ_HIGH == 0);
+BUILD_ASSERT(GDFS_FREQ_MEDHIGH == 1);
+BUILD_ASSERT(GDFS_FREQ_MEDLOW == 2);
+BUILD_ASSERT(GDFS_FREQ_LOW == 3);
+
+struct global_hsfll_dev_config {
+	uint32_t clock_frequencies[GLOBAL_HSFLL_CLOCK_FREQUENCIES_SIZE];
+};
+
+struct global_hsfll_dev_data {
+	STRUCT_CLOCK_CONFIG(global_hsfll, GLOBAL_HSFLL_CLOCK_FREQUENCIES_SIZE) clk_cfg;
+	const struct device *dev;
+	struct k_work evt_work;
+	nrfs_gdfs_evt_type_t evt;
+	struct k_work_delayable timeout_dwork;
+
+#if GLOBAL_HSFLL_INIT_LOW_REQ
+	struct k_sem evt_sem;
+#endif /* GLOBAL_HSFLL_INIT_LOW_REQ */
+};
+
+static uint32_t global_hsfll_get_max_clock_frequency(const struct device *dev)
+{
+	const struct global_hsfll_dev_config *dev_config = dev->config;
+
+	return dev_config->clock_frequencies[ARRAY_SIZE(dev_config->clock_frequencies) - 1];
+}
+
+static struct onoff_manager *global_hsfll_find_mgr(const struct device *dev,
+						   const struct nrf_clock_spec *spec)
+{
+	struct global_hsfll_dev_data *dev_data = dev->data;
+	const struct global_hsfll_dev_config *dev_config = dev->config;
+	uint32_t frequency;
+
+	if (!spec) {
+		return &dev_data->clk_cfg.onoff[0].mgr;
+	}
+
+	if (spec->accuracy || spec->precision) {
+		LOG_ERR("invalid specification of accuracy or precision");
+		return NULL;
+	}
+
+	frequency = spec->frequency == NRF_CLOCK_CONTROL_FREQUENCY_MAX
+		  ? global_hsfll_get_max_clock_frequency(dev)
+		  : spec->frequency;
+
+	for (uint8_t i = 0; i < ARRAY_SIZE(dev_config->clock_frequencies); i++) {
+		if (dev_config->clock_frequencies[i] < frequency) {
+			continue;
+		}
+
+		return &dev_data->clk_cfg.onoff[i].mgr;
+	}
+
+	LOG_ERR("invalid frequency");
+	return NULL;
+}
+
+static int api_request_global_hsfll(const struct device *dev,
+				    const struct nrf_clock_spec *spec,
+				    struct onoff_client *cli)
+{
+	struct onoff_manager *mgr = global_hsfll_find_mgr(dev, spec);
+
+	if (mgr) {
+		return onoff_request(mgr, cli);
+	}
+
+	return -EINVAL;
+}
+
+static int api_release_global_hsfll(const struct device *dev,
+				    const struct nrf_clock_spec *spec)
+{
+	struct onoff_manager *mgr = global_hsfll_find_mgr(dev, spec);
+
+	if (mgr) {
+		return onoff_release(mgr);
+	}
+
+	return -EINVAL;
+}
+
+static int api_cancel_or_release_global_hsfll(const struct device *dev,
+					      const struct nrf_clock_spec *spec,
+					      struct onoff_client *cli)
+{
+	struct onoff_manager *mgr = global_hsfll_find_mgr(dev, spec);
+
+	if (mgr) {
+		return onoff_cancel_or_release(mgr, cli);
+	}
+
+	return -EINVAL;
+}
+
+static struct nrf_clock_control_driver_api driver_api = {
+	.std_api = {
+		.on = api_nosys_on_off,
+		.off = api_nosys_on_off,
+	},
+	.request = api_request_global_hsfll,
+	.release = api_release_global_hsfll,
+	.cancel_or_release = api_cancel_or_release_global_hsfll,
+};
+
+static enum gdfs_frequency_setting global_hsfll_freq_idx_to_nrfs_freq(const struct device *dev,
+								      uint8_t freq_idx)
+{
+	const struct global_hsfll_dev_config *dev_config = dev->config;
+
+	return ARRAY_SIZE(dev_config->clock_frequencies) - 1 - freq_idx;
+}
+
+static const char *global_hsfll_gdfs_freq_to_str(enum gdfs_frequency_setting freq)
+{
+	switch (freq) {
+	case GDFS_FREQ_HIGH:
+		return "GDFS_FREQ_HIGH";
+	case GDFS_FREQ_MEDHIGH:
+		return "GDFS_FREQ_MEDHIGH";
+	case GDFS_FREQ_MEDLOW:
+		return "GDFS_FREQ_MEDLOW";
+	case GDFS_FREQ_LOW:
+		return "GDFS_FREQ_LOW";
+	default:
+		break;
+	}
+
+	return "UNKNOWN";
+}
+
+static void global_hsfll_work_handler(struct k_work *work)
+{
+	struct global_hsfll_dev_data *dev_data =
+		CONTAINER_OF(work, struct global_hsfll_dev_data, clk_cfg.work);
+	const struct device *dev = dev_data->dev;
+	uint8_t freq_idx;
+	enum gdfs_frequency_setting target_freq;
+	nrfs_err_t err;
+
+	freq_idx = clock_config_update_begin(work);
+	target_freq = global_hsfll_freq_idx_to_nrfs_freq(dev, freq_idx);
+
+	LOG_DBG("requesting %s", global_hsfll_gdfs_freq_to_str(target_freq));
+	err = nrfs_gdfs_request_freq(target_freq, dev_data);
+	if (err != NRFS_SUCCESS) {
+		clock_config_update_end(&dev_data->clk_cfg, -EIO);
+		return;
+	}
+
+	k_work_schedule(&dev_data->timeout_dwork, GLOBAL_HSFLL_FREQ_REQ_TIMEOUT);
+}
+
+static void global_hsfll_evt_handler(struct k_work *work)
+{
+	struct global_hsfll_dev_data *dev_data =
+		CONTAINER_OF(work, struct global_hsfll_dev_data, evt_work);
+	int rc;
+
+	k_work_cancel_delayable(&dev_data->timeout_dwork);
+	rc = dev_data->evt == NRFS_GDFS_EVT_FREQ_CONFIRMED ? 0 : -EIO;
+	clock_config_update_end(&dev_data->clk_cfg, rc);
+}
+
+#if GLOBAL_HSFLL_INIT_LOW_REQ
+static void global_hfsll_nrfs_gdfs_init_evt_handler(nrfs_gdfs_evt_t const *p_evt, void *context)
+{
+	struct global_hsfll_dev_data *dev_data = context;
+
+	dev_data->evt = p_evt->type;
+	k_sem_give(&dev_data->evt_sem);
+}
+#endif /* GLOBAL_HSFLL_INIT_LOW_REQ */
+
+static void global_hfsll_nrfs_gdfs_evt_handler(nrfs_gdfs_evt_t const *p_evt, void *context)
+{
+	struct global_hsfll_dev_data *dev_data = context;
+
+	if (k_work_is_pending(&dev_data->evt_work)) {
+		return;
+	}
+
+	dev_data->evt = p_evt->type;
+	k_work_submit(&dev_data->evt_work);
+}
+
+static void global_hsfll_timeout_handler(struct k_work *work)
+{
+	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
+	struct global_hsfll_dev_data *dev_data =
+		CONTAINER_OF(dwork, struct global_hsfll_dev_data, timeout_dwork);
+
+	clock_config_update_end(&dev_data->clk_cfg, -ETIMEDOUT);
+}
+
+static int global_hfsll_init(const struct device *dev)
+{
+	struct global_hsfll_dev_data *dev_data = dev->data;
+	nrfs_err_t err;
+	int rc;
+
+	k_work_init_delayable(&dev_data->timeout_dwork, global_hsfll_timeout_handler);
+	k_work_init(&dev_data->evt_work, global_hsfll_evt_handler);
+
+#if GLOBAL_HSFLL_INIT_LOW_REQ
+	k_sem_init(&dev_data->evt_sem, 0, 1);
+
+	err = nrfs_gdfs_init(global_hfsll_nrfs_gdfs_init_evt_handler);
+	if (err != NRFS_SUCCESS) {
+		return -EIO;
+	}
+
+	LOG_DBG("initial request %s", global_hsfll_gdfs_freq_to_str(GDFS_FREQ_LOW));
+	err = nrfs_gdfs_request_freq(GDFS_FREQ_LOW, dev_data);
+	if (err != NRFS_SUCCESS) {
+		return -EIO;
+	}
+
+	rc = k_sem_take(&dev_data->evt_sem, GLOBAL_HSFLL_FREQ_REQ_TIMEOUT);
+	if (rc) {
+		return -EIO;
+	}
+
+	if (dev_data->evt != NRFS_GDFS_EVT_FREQ_CONFIRMED) {
+		return -EIO;
+	}
+
+	nrfs_gdfs_uninit();
+#endif /* GLOBAL_HSFLL_INIT_LOW_REQ */
+
+	rc = clock_config_init(&dev_data->clk_cfg,
+			       ARRAY_SIZE(dev_data->clk_cfg.onoff),
+			       global_hsfll_work_handler);
+	if (rc < 0) {
+		return rc;
+	}
+
+	err = nrfs_gdfs_init(global_hfsll_nrfs_gdfs_evt_handler);
+	if (err != NRFS_SUCCESS) {
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static struct global_hsfll_dev_data driver_data = {
+	.dev = DEVICE_DT_INST_GET(0),
+};
+
+static const struct global_hsfll_dev_config driver_config = {
+	GLOBAL_HSFLL_CLOCK_FREQUENCIES
+};
+
+DEVICE_DT_INST_DEFINE(
+	0,
+	global_hfsll_init,
+	NULL,
+	&driver_data,
+	&driver_config,
+	POST_KERNEL,
+	CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_INIT_PRIORITY,
+	&driver_api
+);
diff --git a/drivers/clock_control/clock_control_nrf2_hsfll.c b/drivers/clock_control/clock_control_nrf2_hsfll.c
index b0d0ff364b3..58ad4a51ff5 100644
--- a/drivers/clock_control/clock_control_nrf2_hsfll.c
+++ b/drivers/clock_control/clock_control_nrf2_hsfll.c
@@ -8,7 +8,6 @@
 #include "clock_control_nrf2_common.h"
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
-#include <hal/nrf_hsfll.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
@@ -183,18 +182,6 @@ static int api_cancel_or_release_hsfll(const struct device *dev,
 #endif
 }
 
-static int api_get_rate_hsfll(const struct device *dev,
-			      clock_control_subsys_t sys,
-			      uint32_t *rate)
-{
-	ARG_UNUSED(dev);
-	ARG_UNUSED(sys);
-
-	*rate = nrf_hsfll_clkctrl_mult_get(NRF_HSFLL) * MHZ(16);
-
-	return 0;
-}
-
 static int hsfll_init(const struct device *dev)
 {
 #ifdef CONFIG_NRFS_DVFS_LOCAL_DOMAIN
@@ -221,7 +208,6 @@ static struct nrf_clock_control_driver_api hsfll_drv_api = {
 	.std_api = {
 		.on = api_nosys_on_off,
 		.off = api_nosys_on_off,
-		.get_rate = api_get_rate_hsfll,
 	},
 	.request = api_request_hsfll,
 	.release = api_release_hsfll,

From b986f69b15107079ecf69d8d1cd99d485872dc67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 12 Dec 2024 14:37:55 +0100
Subject: [PATCH 0897/2913] [nrf fromlist] hal_nordic: nrfs: dvfs: Update
 SystemCoreClock on frequency change
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update SystemCoreClock to match current core frequency. This MDK
variable is used by nrfx_coredep_delay_us which performs busy
waiting and is used by k_busy_wait.

Upstream PR #: 82923

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 modules/hal_nordic/nrfs/dvfs/ld_dvfs_handler.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/hal_nordic/nrfs/dvfs/ld_dvfs_handler.c b/modules/hal_nordic/nrfs/dvfs/ld_dvfs_handler.c
index c28d9187a55..4a418585463 100644
--- a/modules/hal_nordic/nrfs/dvfs/ld_dvfs_handler.c
+++ b/modules/hal_nordic/nrfs/dvfs/ld_dvfs_handler.c
@@ -139,9 +139,19 @@ static void dvfs_service_handler_scaling_background_job(enum dvfs_frequency_sett
 	}
 }
 
+/* Update MDK variable which is used by nrfx_coredep_delay_us (k_busy_wait). */
+static void dvfs_service_update_core_clock(enum dvfs_frequency_setting oppoint_freq)
+{
+	extern uint32_t SystemCoreClock;
+
+	SystemCoreClock = oppoint_freq == DVFS_FREQ_HIGH ? 320000000 :
+			  oppoint_freq == DVFS_FREQ_MEDLOW ? 128000000 : 64000000;
+}
+
 /* Perform scaling finnish procedure. */
 static void dvfs_service_handler_scaling_finish(enum dvfs_frequency_setting oppoint_freq)
 {
+
 	LOG_DBG("Scaling finnish oppoint freq %d", oppoint_freq);
 	ld_dvfs_scaling_finish(dvfs_service_handler_is_downscaling(oppoint_freq));
 	if (!dvfs_service_handler_is_downscaling(oppoint_freq)) {
@@ -153,6 +163,7 @@ static void dvfs_service_handler_scaling_finish(enum dvfs_frequency_setting oppo
 	}
 	dvfs_service_handler_clear_state_bit(DVFS_SERV_HDL_FREQ_CHANGE_REQ_PENDING_BIT_POS);
 	current_freq_setting = oppoint_freq;
+	dvfs_service_update_core_clock(oppoint_freq);
 	LOG_DBG("Current LD freq setting: %d", current_freq_setting);
 	if (dvfs_frequency_change_applied_clb) {
 		dvfs_frequency_change_applied_clb(current_freq_setting);
@@ -216,6 +227,7 @@ static void nrfs_dvfs_evt_handler(nrfs_dvfs_evt_t const *p_evt, void *context)
 		dvfs_service_handler_clear_state_bit(DVFS_SERV_HDL_FREQ_CHANGE_REQ_PENDING_BIT_POS);
 		LOG_DBG("DVFS handler EVT_OPPOINT_REQ_CONFIRMED %d", (uint32_t)p_evt->freq);
 		if (dvfs_service_handler_get_requested_oppoint() == p_evt->freq) {
+			dvfs_service_update_core_clock(p_evt->freq);
 			if (dvfs_frequency_change_applied_clb) {
 				dvfs_frequency_change_applied_clb(p_evt->freq);
 			}

From 2430fb2bd37490b64c8dacb9b9b2a5268302190e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 11 Dec 2024 09:55:14 +0100
Subject: [PATCH 0898/2913] [nrf fromlist] dts: common: nordic: Add clock for
 timer12x
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add clock source for timer120 and timer121 nodes

Upstream PR #: 82103

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 dts/common/nordic/nrf54h20.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 034813bc076..5be5428b230 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -623,6 +623,7 @@
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				max-bit-width = <32>;
 				max-frequency = <DT_FREQ_M(320)>;
+				clocks = <&hsfll120>;
 				prescaler = <0>;
 			};
 
@@ -635,6 +636,7 @@
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				max-bit-width = <32>;
 				max-frequency = <DT_FREQ_M(320)>;
+				clocks = <&hsfll120>;
 				prescaler = <0>;
 			};
 

From 3303b0327ac37896721e7a1a408a1aad17743d55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 11 Dec 2024 10:47:24 +0100
Subject: [PATCH 0899/2913] [nrf fromlist] drivers: counter: nrfx_timer: Add
 request for global HFSLL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add requesting for global HFSLL when fast instance TIMER (e.g.
TIMER120 in nrf54h20) is used.

Upstream PR #: 82103

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 drivers/counter/Kconfig.nrfx         |  6 ++
 drivers/counter/counter_nrfx_timer.c | 86 ++++++++++++++++++++++++----
 2 files changed, 81 insertions(+), 11 deletions(-)

diff --git a/drivers/counter/Kconfig.nrfx b/drivers/counter/Kconfig.nrfx
index 321cf9de634..775406a5198 100644
--- a/drivers/counter/Kconfig.nrfx
+++ b/drivers/counter/Kconfig.nrfx
@@ -9,6 +9,12 @@ config COUNTER_NRF_RTC
 	def_bool y
 	depends on DT_HAS_NORDIC_NRF_RTC_ENABLED
 
+config COUNTER_NRFX_TIMER_USE_CLOCK_CONTROL
+	def_bool y
+	depends on $(dt_nodelabel_enabled,timer120) || \
+		 $(dt_nodelabel_enabled,timer121)
+	select CLOCK_CONTROL
+
 # Internal flag which detects if PPI wrap feature is enabled for any instance
 config COUNTER_RTC_WITH_PPI_WRAP
 	def_bool $(dt_nodelabel_bool_prop,rtc0,ppi-wrap) || \
diff --git a/drivers/counter/counter_nrfx_timer.c b/drivers/counter/counter_nrfx_timer.c
index 333a436c80e..ea8edb08b6f 100644
--- a/drivers/counter/counter_nrfx_timer.c
+++ b/drivers/counter/counter_nrfx_timer.c
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/drivers/counter.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/devicetree.h>
 #include <hal/nrf_timer.h>
 #include <zephyr/sys/atomic.h>
 
@@ -32,11 +34,32 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL);
 #define MAYBE_CONST_CONFIG const
 #endif
 
+#ifdef CONFIG_SOC_NRF54H20_GPD
+#include <nrf/gpd.h>
+
+#define NRF_CLOCKS_INSTANCE_IS_FAST(node)						\
+	COND_CODE_1(DT_NODE_HAS_PROP(node, power_domains),				\
+		    (IS_EQ(DT_PHA(node, power_domains, id), NRF_GPD_FAST_ACTIVE1)),	\
+		    (0))
+
+/* Macro must resolve to literal 0 or 1 */
+#define INSTANCE_IS_FAST(idx) NRF_CLOCKS_INSTANCE_IS_FAST(DT_DRV_INST(idx))
+
+#define INSTANCE_IS_FAST_OR(idx) INSTANCE_IS_FAST(idx) ||
+
+#if (DT_INST_FOREACH_STATUS_OKAY(INSTANCE_IS_FAST_OR) 0)
+#define COUNTER_ANY_FAST 1
+#endif
+#endif
+
 struct counter_nrfx_data {
 	counter_top_callback_t top_cb;
 	void *top_user_data;
 	uint32_t guard_period;
 	atomic_t cc_int_pending;
+#ifdef COUNTER_ANY_FAST
+	atomic_t active;
+#endif
 };
 
 struct counter_nrfx_ch_data {
@@ -48,6 +71,10 @@ struct counter_nrfx_config {
 	struct counter_config_info info;
 	struct counter_nrfx_ch_data *ch_data;
 	NRF_TIMER_Type *timer;
+#ifdef COUNTER_ANY_FAST
+	const struct device *clk_dev;
+	struct nrf_clock_spec clk_spec;
+#endif
 	LOG_INSTANCE_PTR_DECLARE(log);
 };
 
@@ -61,6 +88,18 @@ static int start(const struct device *dev)
 {
 	const struct counter_nrfx_config *config = dev->config;
 
+#ifdef COUNTER_ANY_FAST
+	struct counter_nrfx_data *data = dev->data;
+
+	if (config->clk_dev && atomic_cas(&data->active, 0, 1)) {
+		int err;
+
+		err = nrf_clock_control_request_sync(config->clk_dev, &config->clk_spec, K_FOREVER);
+		if (err < 0) {
+			return err;
+		}
+	}
+#endif
 	nrf_timer_task_trigger(config->timer, NRF_TIMER_TASK_START);
 
 	return 0;
@@ -71,6 +110,18 @@ static int stop(const struct device *dev)
 	const struct counter_nrfx_config *config = dev->config;
 
 	nrf_timer_task_trigger(config->timer, NRF_TIMER_TASK_STOP);
+#ifdef COUNTER_ANY_FAST
+	struct counter_nrfx_data *data = dev->data;
+
+	if (config->clk_dev && atomic_cas(&data->active, 1, 0)) {
+		int err;
+
+		err = nrf_clock_control_release(config->clk_dev, &config->clk_spec);
+		if (err < 0) {
+			return err;
+		}
+	}
+#endif
 
 	return 0;
 }
@@ -403,6 +454,20 @@ static const struct counter_driver_api counter_nrfx_driver_api = {
 	.set_guard_period = set_guard_period,
 };
 
+/* Get initialization level of an instance. Instances that requires clock control
+ * which is using nrfs (IPC) are initialized later.
+ */
+#define TIMER_INIT_LEVEL(idx) \
+	COND_CODE_1(INSTANCE_IS_FAST(idx), (POST_KERNEL), (PRE_KERNEL_1))
+
+/* Get initialization priority of an instance. Instances that requires clock control
+ * which is using nrfs (IPC) are initialized later.
+ */
+#define TIMER_INIT_PRIO(idx)								\
+	COND_CODE_1(INSTANCE_IS_FAST(idx),						\
+		    (UTIL_INC(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_INIT_PRIORITY)),	\
+		    (CONFIG_COUNTER_INIT_PRIORITY))
+
 /*
  * Device instantiation is done with node labels due to HAL API
  * requirements. In particular, TIMERx_MAX_SIZE values from HALs
@@ -419,14 +484,6 @@ static const struct counter_driver_api counter_nrfx_driver_api = {
 			    irq_handler, DEVICE_DT_INST_GET(idx), 0))		\
 	)
 
-#if !defined(CONFIG_SOC_SERIES_BSIM_NRFXX)
-#define CHECK_MAX_FREQ(idx)									\
-		BUILD_ASSERT(DT_INST_PROP(idx, max_frequency) ==				\
-			NRF_TIMER_BASE_FREQUENCY_GET((NRF_TIMER_Type *)DT_INST_REG_ADDR(idx)))
-#else
-#define CHECK_MAX_FREQ(idx)
-#endif
-
 #define COUNTER_NRFX_TIMER_DEVICE(idx)								\
 	BUILD_ASSERT(DT_INST_PROP(idx, prescaler) <=						\
 			TIMER_PRESCALER_PRESCALER_Msk,						\
@@ -456,22 +513,29 @@ static const struct counter_driver_api counter_nrfx_driver_api = {
 	static MAYBE_CONST_CONFIG struct counter_nrfx_config nrfx_counter_##idx##_config = {	\
 		.info = {									\
 			.max_top_value = (uint32_t)BIT64_MASK(DT_INST_PROP(idx, max_bit_width)),\
-			.freq = DT_INST_PROP(idx, max_frequency) /				\
+			.freq = NRF_PERIPH_GET_FREQUENCY(DT_DRV_INST(idx)) /			\
 				BIT(DT_INST_PROP(idx, prescaler)),				\
 			.flags = COUNTER_CONFIG_INFO_COUNT_UP,					\
 			.channels = CC_TO_ID(DT_INST_PROP(idx, cc_num)),			\
 		},										\
 		.ch_data = counter##idx##_ch_data,						\
 		.timer = (NRF_TIMER_Type *)DT_INST_REG_ADDR(idx),				\
+		IF_ENABLED(INSTANCE_IS_FAST(idx),						\
+			(.clk_dev = DEVICE_DT_GET(DT_CLOCKS_CTLR(DT_DRV_INST(idx))),		\
+			 .clk_spec = {								\
+				.frequency = NRF_PERIPH_GET_FREQUENCY(DT_DRV_INST(idx)),	\
+				.accuracy = 0,							\
+				.precision = NRF_CLOCK_CONTROL_PRECISION_DEFAULT,		\
+				},								\
+			 ))									\
 		LOG_INSTANCE_PTR_INIT(log, LOG_MODULE_NAME, idx)				\
 	};											\
-	CHECK_MAX_FREQ(idx);									\
 	DEVICE_DT_INST_DEFINE(idx,								\
 			    counter_##idx##_init,						\
 			    NULL,								\
 			    &counter_##idx##_data,						\
 			    &nrfx_counter_##idx##_config.info,					\
-			    PRE_KERNEL_1, CONFIG_COUNTER_INIT_PRIORITY,				\
+			    TIMER_INIT_LEVEL(idx), TIMER_INIT_PRIO(idx),			\
 			    &counter_nrfx_driver_api);
 
 DT_INST_FOREACH_STATUS_OKAY(COUNTER_NRFX_TIMER_DEVICE)

From 50d6d149ad977b5b659940139634859798c0f70d Mon Sep 17 00:00:00 2001
From: Jerzy Kasenberg <jerzy.kasenberg@codecoup.pl>
Date: Tue, 15 Oct 2024 12:40:04 +0200
Subject: [PATCH 0900/2913] [nrf fromtree] tests: drivers: spi: Fix nrf52840
 overlay

spi-max-frequency was missing in overlay

Now it's set to 8 MHz as per datasheet

Signed-off-by: Jerzy Kasenberg <jerzy.kasenberg@codecoup.pl>
(cherry picked from commit 1d4b1ade4358803e5320d79da1e6d72d8eace0a4)
---
 .../spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
index a1a0dc42a36..8ce5342be23 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
@@ -53,6 +53,7 @@
 	zephyr,pm-device-runtime-auto;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
+		spi-max-frequency = <DT_FREQ_M(8)>;
 		reg = <0>;
 	};
 };

From 18d1c74cc1c9f690c3b689ad7b6649624ec1ffd2 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 10 Dec 2024 14:06:31 +0100
Subject: [PATCH 0901/2913] [nrf fromlist] drivers: pinctrl: nrf: Add support
 for clock outputs

Add support for GRTC clock output pins.

Upstream PR #: 82788

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 drivers/pinctrl/pinctrl_nrf.c                 | 27 +++++++++++++++++++
 .../zephyr/dt-bindings/pinctrl/nrf-pinctrl.h  |  4 +++
 2 files changed, 31 insertions(+)

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 1e80de8fe67..d0354f600a9 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -94,6 +94,15 @@ static const nrf_gpio_pin_drive_t drive_modes[NRF_DRIVE_COUNT] = {
 #define NRF_PSEL_QSPI(reg, line) ((NRF_QSPI_Type *)reg)->PSEL.line
 #endif
 
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc) || defined(CONFIG_NRFX_GRTC)
+#if DT_NODE_HAS_PROP(DT_NODELABEL(grtc), clkout_fast_frequency)
+#define NRF_GRTC_CLKOUT_FAST 1
+#endif
+#if DT_NODE_HAS_PROP(DT_NODELABEL(grtc), clkout_32k_frequency)
+#define NRF_GRTC_CLKOUT_SLOW 1
+#endif
+#endif
+
 int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			   uintptr_t reg)
 {
@@ -336,6 +345,24 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
 			break;
 #endif /* defined(NRF_PSEL_QSPI) */
+#if defined(NRF_GRTC_CLKOUT_FAST)
+		case NRF_FUN_GRTC_CLKOUT_FAST:
+#if NRF_GPIO_HAS_SEL && defined(GPIO_PIN_CNF_CTRLSEL_GRTC)
+			nrf_gpio_pin_control_select(psel, NRF_GPIO_PIN_SEL_GRTC);
+#endif
+			dir = NRF_GPIO_PIN_DIR_OUTPUT;
+			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
+			break;
+#endif /* defined(NRF_GRTC_CLKOUT_FAST) */
+#if defined(NRF_GRTC_CLKOUT_SLOW)
+		case NRF_FUN_GRTC_CLKOUT_32K:
+#if NRF_GPIO_HAS_SEL && defined(GPIO_PIN_CNF_CTRLSEL_GRTC)
+			nrf_gpio_pin_control_select(psel, NRF_GPIO_PIN_SEL_GRTC);
+#endif
+			dir = NRF_GPIO_PIN_DIR_OUTPUT;
+			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
+			break;
+#endif /* defined(NRF_GRTC_CLKOUT_SLOW) */
 #if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_can)
 		/* Pin routing is controlled by secure domain, via UICR */
 		case NRF_FUN_CAN_TX:
diff --git a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
index 4611baef95c..a73f59c48b7 100644
--- a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
@@ -162,6 +162,10 @@
 #define NRF_FUN_CAN_TX 46U
 /** CAN RX */
 #define NRF_FUN_CAN_RX 47U
+/** GRTC fast clock output */
+#define NRF_FUN_GRTC_CLKOUT_FAST 55U
+/** GRTC slow clock output */
+#define NRF_FUN_GRTC_CLKOUT_32K  56U
 
 /** @} */
 

From a7b06baa1d4a61108b85d822e9bc122012864da8 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 10 Dec 2024 14:08:35 +0100
Subject: [PATCH 0902/2913] [nrf fromlist] dts: nordic: Add support for clock
 outputs

Add support for GRTC clock output pins.

Upstream PR #: 82788

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 .../nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts |  2 ++
 .../nrf54h20dk_nrf54h20-pinctrl.dtsi          | 15 ++++++++++++
 .../nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi   | 15 ++++++++++++
 dts/bindings/timer/nordic,nrf-grtc.yaml       | 24 ++++++++++++++++++-
 dts/common/nordic/nrf54h20.dtsi               |  7 ++----
 dts/common/nordic/nrf54l20.dtsi               |  8 +++++++
 dts/common/nordic/nrf54l_05_10_15.dtsi        |  8 +++++++
 7 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
index cd8b95be664..e6129833778 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -77,6 +77,8 @@
 	/* Channels 7-11 reserved for Zero Latency IRQs, 3-4 for FLPR */
 	child-owned-channels = <3 4 7 8 9 10 11>;
 	status = "okay";
+	/delete-property/ clocks;
+	/delete-property/ clock-names;
 };
 
 &cpuapp_rram {
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
index 79ac2c6b7ad..9b574a18ec5 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
@@ -98,4 +98,19 @@
 			low-power-enable;
 		};
 	};
+
+	/omit-if-no-ref/ grtc_default: grtc_default {
+		group1 {
+			psels = <NRF_PSEL(GRTC_CLKOUT_FAST, 1, 8)>,
+				<NRF_PSEL(GRTC_CLKOUT_32K, 0, 1)>;
+		};
+	};
+
+	/omit-if-no-ref/ grtc_sleep: grtc_sleep {
+		group1 {
+			psels = <NRF_PSEL(GRTC_CLKOUT_FAST, 1, 8)>,
+				<NRF_PSEL(GRTC_CLKOUT_32K, 0, 1)>;
+			low-power-enable;
+		};
+	};
 };
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi
index 0b6e2056a82..6b7457a2818 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi
@@ -77,4 +77,19 @@
 			low-power-enable;
 		};
 	};
+
+	/omit-if-no-ref/ grtc_default: grtc_default {
+		group1 {
+			psels = <NRF_PSEL(GRTC_CLKOUT_FAST, 1, 8)>,
+				<NRF_PSEL(GRTC_CLKOUT_32K, 0, 4)>;
+		};
+	};
+
+	/omit-if-no-ref/ grtc_sleep: grtc_sleep {
+		group1 {
+			psels = <NRF_PSEL(GRTC_CLKOUT_FAST, 1, 8)>,
+				<NRF_PSEL(GRTC_CLKOUT_32K, 0, 4)>;
+			low-power-enable;
+		};
+	};
 };
diff --git a/dts/bindings/timer/nordic,nrf-grtc.yaml b/dts/bindings/timer/nordic,nrf-grtc.yaml
index e78e57df97e..4b041d0adc1 100644
--- a/dts/bindings/timer/nordic,nrf-grtc.yaml
+++ b/dts/bindings/timer/nordic,nrf-grtc.yaml
@@ -4,18 +4,40 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description: Nordic GRTC (Global RTC)
+description: |
+  Nordic GRTC (Global RTC)
+
+      Example of using clock outputs:
+        &grtc {
+          pinctrl-0 = <&grtc_default>;
+          pinctrl-1 = <&grtc_sleep>;
+          pinctrl-names = "default", "sleep";
+          clkout-fast-frequency = <8000000>;
+          clkout-32k;
+          /* In case of nRF54H20 devices: */
+          nordic,clockpin-enable = <NRF_FUN_GRTC_CLKOUT_FAST>;
+        };
 
 compatible: "nordic,nrf-grtc"
 
 include:
   - "base.yaml"
   - "nordic,split-channels.yaml"
+  - "pinctrl-device.yaml"
+  - "nordic-clockpin.yaml"
 
 properties:
   reg:
     required: true
 
+  clkout-fast-frequency:
+    type: int
+    description: Fast output clock frequency.
+
+  clkout-32k:
+    type: boolean
+    description: 32768 Hz output clock frequency enable.
+
   interrupts:
     required: true
 
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 5be5428b230..790785ebaaa 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -941,11 +941,8 @@
 				reg = <0x99c000 0x1000>;
 				status = "disabled";
 				cc-num = <16>;
-				/* GRTC uses both LFCLK and FLL16M, but its accuracy and
-				 * precision are inherited from LFCLK. that's why this
-				 *  one is linked here.
-				 */
-				clocks = <&lfclk>;
+				clocks = <&lfclk>, <&fll16m>;
+				clock-names = "lfclock", "hfclock";
 				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 67ccb152a5f..d06c4814103 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -35,6 +35,12 @@
 	};
 
 	clocks {
+		pclk: pclk {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <DT_FREQ_M(16)>;
+		};
+
 		lfxo: lfxo {
 			compatible = "nordic,nrf-lfxo";
 			#clock-cells = <0>;
@@ -498,6 +504,8 @@
 				compatible = "nordic,nrf-grtc";
 				reg = <0xe2000 0x1000>;
 				cc-num = <12>;
+				clocks = <&lfxo>, <&pclk>;
+				clock-names = "lfclock", "hfclock";
 				status = "disabled";
 			};
 
diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi
index d997e01c488..eba41095e75 100644
--- a/dts/common/nordic/nrf54l_05_10_15.dtsi
+++ b/dts/common/nordic/nrf54l_05_10_15.dtsi
@@ -48,6 +48,12 @@
 	};
 
 	clocks {
+		pclk: pclk {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <DT_FREQ_M(16)>;
+		};
+
 		lfxo: lfxo {
 			compatible = "nordic,nrf-lfxo";
 			#clock-cells = <0>;
@@ -548,6 +554,8 @@
 				compatible = "nordic,nrf-grtc";
 				reg = <0xe2000 0x1000>;
 				cc-num = <12>;
+				clocks = <&lfxo>, <&pclk>;
+				clock-names = "lfclock", "hfclock";
 				status = "disabled";
 			};
 

From af6174f17710041d9d6efea8248fc2835aa55a7f Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 10 Dec 2024 14:10:52 +0100
Subject: [PATCH 0903/2913] [nrf fromlist] drivers: timer: nrf_grtc: Add
 support for clock outputs

Add support for GRTC clock output pins.

Upstream PR #: 82788

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 drivers/timer/nrf_grtc_timer.c | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/drivers/timer/nrf_grtc_timer.c b/drivers/timer/nrf_grtc_timer.c
index ee3f35e09d0..05779038142 100644
--- a/drivers/timer/nrf_grtc_timer.c
+++ b/drivers/timer/nrf_grtc_timer.c
@@ -10,12 +10,15 @@
 #if defined(CONFIG_CLOCK_CONTROL_NRF)
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #endif
+#include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/drivers/timer/nrf_grtc_timer.h>
 #include <nrfx_grtc.h>
 #include <zephyr/sys/math_extras.h>
 
 #define GRTC_NODE DT_NODELABEL(grtc)
+#define HFCLK_NODE DT_PHANDLE_BY_NAME(GRTC_NODE, clocks, hfclock)
+#define LFCLK_NODE DT_PHANDLE_BY_NAME(GRTC_NODE, clocks, lfclock)
 
 /* Ensure that GRTC properties in devicetree are defined correctly. */
 #if !DT_NODE_HAS_PROP(GRTC_NODE, owned_channels)
@@ -49,7 +52,7 @@
 
 #define MAX_CYCLES (MAX_TICKS * CYC_PER_TICK)
 
-#define LFCLK_FREQUENCY_HZ 32768
+#define LFCLK_FREQUENCY_HZ DT_PROP(LFCLK_NODE, clock_frequency)
 
 #if defined(CONFIG_TEST)
 const int32_t z_sys_timer_irq_for_test = DT_IRQN(GRTC_NODE);
@@ -518,7 +521,35 @@ static int sys_clock_driver_init(void)
 #if defined(CONFIG_NRF_GRTC_ALWAYS_ON)
 	nrfx_grtc_active_request_set(true);
 #endif
+
+#if DT_PROP(GRTC_NODE, clkout_32k)
+	nrfy_grtc_clkout_set(NRF_GRTC, NRF_GRTC_CLKOUT_32K, true);
+#endif
+
+#if DT_NODE_HAS_PROP(GRTC_NODE, clkout_fast_frequency)
+#if !DT_NODE_HAS_PROP(HFCLK_NODE, clock_frequency)
+#error "hfclock reference required when fast clock output is enabled."
+#endif
+
+#if DT_PROP(GRTC_NODE, clkout_fast_frequency) > (DT_PROP(HFCLK_NODE, clock_frequency) / 2)
+#error "Invalid frequency value for fast clock output."
+#endif
+	uint32_t base_frequency = DT_PROP(HFCLK_NODE, clock_frequency);
+	uint32_t requested_frequency = DT_PROP(GRTC_NODE, clkout_fast_frequency);
+	uint32_t grtc_div = base_frequency / (requested_frequency * 2);
+
+	nrfy_grtc_clkout_divider_set(NRF_GRTC, (uint8_t)grtc_div);
+	nrfy_grtc_clkout_set(NRF_GRTC, NRF_GRTC_CLKOUT_FAST, true);
+#endif
+
+#if DT_PROP(GRTC_NODE, clkout_32k) || DT_NODE_HAS_PROP(GRTC_NODE, clkout_fast_frequency)
+	PINCTRL_DT_DEFINE(GRTC_NODE);
+	const struct pinctrl_dev_config *pcfg = PINCTRL_DT_DEV_CONFIG_GET(GRTC_NODE);
+
+	return pinctrl_apply_state(pcfg, PINCTRL_STATE_DEFAULT);
+#else
 	return 0;
+#endif
 }
 
 void sys_clock_set_timeout(int32_t ticks, bool idle)

From 878e7231399249f3c5e83b57103e621243fad4aa Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 28 Nov 2024 14:03:03 +0100
Subject: [PATCH 0904/2913] [nrf fromlist] tests: arch: arm:
 arm_irq_vector_table: Fix for nRF54H20

Fix failing tests for nRF54H20 targets.

Upstream PR #: 82252

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 .../arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.conf     | 1 +
 .../arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpurad.conf     | 1 +
 .../arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf  | 1 +
 .../arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf  | 1 +
 .../arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.conf   | 1 +
 .../arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpurad.conf   | 1 +
 6 files changed, 6 insertions(+)
 create mode 100644 tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpurad.conf
 create mode 100644 tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf
 create mode 100644 tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpurad.conf

diff --git a/tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpurad.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpurad.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n

From 269aa0f7cbe1c293f1b6dedbb5275a90af3453c6 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Fri, 22 Nov 2024 13:50:45 +0100
Subject: [PATCH 0905/2913] [nrf fromlist] soc: nordic: nrf54h20: disallow
 using LR in s2ram marking function

This change ensures that LR will not be implicitly used when calling
`pm_s2ram_mark_check_and_clear`.

Upstream PR #: 81853

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 soc/nordic/nrf54h/pm_s2ram.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/soc/nordic/nrf54h/pm_s2ram.c b/soc/nordic/nrf54h/pm_s2ram.c
index 20c28e42df5..ea9e60973d1 100644
--- a/soc/nordic/nrf54h/pm_s2ram.c
+++ b/soc/nordic/nrf54h/pm_s2ram.c
@@ -132,6 +132,8 @@ void __attribute__((naked)) pm_s2ram_mark_set(void)
 
 bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
 {
+	register uint32_t link_reg __asm__("r14");
+
 	__asm__ volatile(
 		/* Set return value to 0 */
 		"mov	r0, #0\n"
@@ -159,13 +161,14 @@ bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
 		"mov	r0, #1\n"
 
 		"exit:\n"
-		"bx	lr\n"
+		"bx	%[link_reg]\n"
 		:
 		: [resetinfo_addr] "r"(NRF_RESETINFO),
 		  [resetreas_offs] "r"(offsetof(NRF_RESETINFO_Type, RESETREAS.LOCAL)),
 		  [resetreas_unretained_mask] "r"(NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK),
 		  [restorevalid_offs] "r"(offsetof(NRF_RESETINFO_Type, RESTOREVALID)),
-		  [restorevalid_present_mask] "r"(RESETINFO_RESTOREVALID_RESTOREVALID_Msk)
+		  [restorevalid_present_mask] "r"(RESETINFO_RESTOREVALID_RESTOREVALID_Msk),
+		  [link_reg] "r"(link_reg)
 
-		: "r0", "r1", "r3", "r4", "memory");
+		: "r0", "r1", "r3", "r4", "cc", "memory");
 }

From bb6cb96cfc9c3ff070902e06d1ceaa642015fe31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20Amundsen?= <haakon.amundsen@nordicsemi.no>
Date: Wed, 30 Oct 2024 10:29:22 +0100
Subject: [PATCH 0906/2913] [nrf fromtree] boards: nrf54h20: increase size of
 cpuapp and cpurad partitions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is possible due to the memory map changes introduced in
26603cefaf41298c417f2eee834ed40d9ab35d3a

Signed-off-by: Håkon Amundsen <haakon.amundsen@nordicsemi.no>
(cherry picked from commit 8a82b078a49f46b7504b13fc73dd32da262988a2)
---
 .../nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index 2b2473f92b5..80211205ca3 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -185,8 +185,8 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		cpurad_slot0_partition: partition@66000 {
-			reg = <0x66000 DT_SIZE_K(256)>;
+		cpurad_slot0_partition: partition@54000 {
+			reg = <0x54000 DT_SIZE_K(256)>;
 		};
 	};
 
@@ -197,8 +197,8 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		cpuapp_slot0_partition: partition@a6000 {
-			reg = <0xa6000 DT_SIZE_K(248)>;
+		cpuapp_slot0_partition: partition@94000 {
+			reg = <0x94000 DT_SIZE_K(320)>;
 		};
 
 		cpuppr_code_partition: partition@e4000 {
@@ -222,7 +222,7 @@
 		};
 
 		storage_partition: partition@1e3000 {
-			reg = < 0x1e3000 DT_SIZE_K(24) >;
+			reg = < 0x1e3000 DT_SIZE_K(40) >;
 		};
 	};
 };

From 622410f49f10b71ee47850f352a2401e4303f5a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karol=20Laso=C5=84czyk?= <karol.lasonczyk@nordicsemi.no>
Date: Fri, 22 Nov 2024 10:02:36 +0100
Subject: [PATCH 0907/2913] [nrf fromlist] drivers: hwinfo: Support for reset
 reasons in nRF54H20
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adding support for reset reasons in the nRF54H20 SoC.

Upstream PR #: 81751

Signed-off-by: Karol Lasończyk <karol.lasonczyk@nordicsemi.no>
---
 drivers/hwinfo/hwinfo_nrf.c | 40 +++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/drivers/hwinfo/hwinfo_nrf.c b/drivers/hwinfo/hwinfo_nrf.c
index d1fca5350a6..50e20906d98 100644
--- a/drivers/hwinfo/hwinfo_nrf.c
+++ b/drivers/hwinfo/hwinfo_nrf.c
@@ -8,7 +8,7 @@
 #include <zephyr/drivers/hwinfo.h>
 #include <string.h>
 #include <zephyr/sys/byteorder.h>
-#if !defined(CONFIG_SOC_SERIES_NRF54HX) && !defined(CONFIG_BOARD_QEMU_CORTEX_M0)
+#if !defined(CONFIG_BOARD_QEMU_CORTEX_M0)
 #include <helpers/nrfx_reset_reason.h>
 #endif
 
@@ -63,7 +63,7 @@ ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 	return length;
 }
 
-#if !defined(CONFIG_SOC_SERIES_NRF54HX) && !defined(CONFIG_BOARD_QEMU_CORTEX_M0)
+#if !defined(CONFIG_BOARD_QEMU_CORTEX_M0)
 int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 {
 	uint32_t flags = 0;
@@ -76,16 +76,37 @@ int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 	if (reason & NRFX_RESET_REASON_DOG_MASK) {
 		flags |= RESET_WATCHDOG;
 	}
-	if (reason & NRFX_RESET_REASON_LOCKUP_MASK) {
+
+#if defined(NRF_RESETINFO)
+	if (reason & NRFX_RESET_REASON_LOCAL_DOG0_MASK) {
+		flags |= RESET_WATCHDOG;
+	}
+#endif
+
+#if defined(NRF_RESETINFO)
+	if ((reason & NRFX_RESET_REASON_LOCKUP)
+		|| (reason & NRFX_RESET_REASON_LOCAL_LOCKUP_MASK))
+#else
+	if (reason & NRFX_RESET_REASON_LOCKUP_MASK)
+#endif
+	{
 		flags |= RESET_CPU_LOCKUP;
 	}
+
 	if (reason & NRFX_RESET_REASON_OFF_MASK) {
 		flags |= RESET_LOW_POWER_WAKE;
 	}
 	if (reason & NRFX_RESET_REASON_DIF_MASK) {
 		flags |= RESET_DEBUG;
 	}
-	if (reason & NRFX_RESET_REASON_SREQ_MASK) {
+
+#if defined(NRF_RESETINFO)
+	if ((reason & NRFX_RESET_REASON_SREQ)
+		|| (reason & NRFX_RESET_REASON_LOCAL_SREQ_MASK))
+#else
+	if (reason & NRFX_RESET_REASON_SREQ_MASK)
+#endif
+	{
 		flags |= RESET_SOFTWARE;
 	}
 
@@ -124,11 +145,18 @@ int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 		flags |= RESET_DEBUG;
 	}
 #endif
+
 #if !NRF_POWER_HAS_RESETREAS
-	if (reason & NRFX_RESET_REASON_DOG1_MASK) {
+#if defined(NRF_RESETINFO)
+	if (reason & NRFX_RESET_REASON_LOCAL_DOG1_MASK)
+#else
+	if (reason & NRFX_RESET_REASON_DOG1_MASK)
+#endif
+	{
 		flags |= RESET_WATCHDOG;
 	}
-#endif
+#endif /* !NRF_POWER_HAS_RESETREAS */
+
 #if NRFX_RESET_REASON_HAS_GRTC
 	if (reason & NRFX_RESET_REASON_GRTC_MASK) {
 		flags |= RESET_CLOCK;

From 990619cc6687458425c63b99d0dcd2047020ae7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Thu, 5 Dec 2024 11:18:43 +0100
Subject: [PATCH 0908/2913] [nrf fromtree] usb: device_next: Update IAD first
 interface on init
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

IAD must be before the interfaces it associates and therefore there is
no need for the class to be in charge of updating the bFirstInterface.
Update IAD in common initialization code and remove the updates from
classes.

This fixes UAC2 instances where the IAD bFirstInterface is not 0, e.g.
when HID was used together with UAC2.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 9006780db472470b4be12646e58446789341b427)
---
 subsys/usb/device_next/class/bt_hci.c       | 6 +-----
 subsys/usb/device_next/class/loopback.c     | 5 -----
 subsys/usb/device_next/class/usbd_cdc_acm.c | 1 -
 subsys/usb/device_next/class/usbd_cdc_ecm.c | 1 -
 subsys/usb/device_next/usbd_init.c          | 9 +++++++++
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/subsys/usb/device_next/class/bt_hci.c b/subsys/usb/device_next/class/bt_hci.c
index 52eddc4e25b..4487726b22a 100644
--- a/subsys/usb/device_next/class/bt_hci.c
+++ b/subsys/usb/device_next/class/bt_hci.c
@@ -459,11 +459,7 @@ static void *bt_hci_get_desc(struct usbd_class_data *const c_data,
 
 static int bt_hci_init(struct usbd_class_data *const c_data)
 {
-
-	struct bt_hci_data *data = usbd_class_get_private(c_data);
-	struct usbd_bt_hci_desc *desc = data->desc;
-
-	desc->iad.bFirstInterface = desc->if0.bInterfaceNumber;
+	ARG_UNUSED(c_data);
 
 	return 0;
 }
diff --git a/subsys/usb/device_next/class/loopback.c b/subsys/usb/device_next/class/loopback.c
index 2237cabcc79..b74a6b44b05 100644
--- a/subsys/usb/device_next/class/loopback.c
+++ b/subsys/usb/device_next/class/loopback.c
@@ -135,11 +135,6 @@ static void *lb_get_desc(struct usbd_class_data *const c_data,
 
 static int lb_init(struct usbd_class_data *c_data)
 {
-	struct lb_data *data = usbd_class_get_private(c_data);
-	struct loopback_desc *desc = data->desc;
-
-	desc->iad.bFirstInterface = desc->if0.bInterfaceNumber;
-
 	LOG_DBG("Init class instance %p", c_data);
 
 	return 0;
diff --git a/subsys/usb/device_next/class/usbd_cdc_acm.c b/subsys/usb/device_next/class/usbd_cdc_acm.c
index 80f4a858386..04f4c424f7d 100644
--- a/subsys/usb/device_next/class/usbd_cdc_acm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_acm.c
@@ -473,7 +473,6 @@ static int usbd_cdc_acm_init(struct usbd_class_data *const c_data)
 	struct cdc_acm_uart_data *data = dev->data;
 	struct usbd_cdc_acm_desc *desc = data->desc;
 
-	desc->iad.bFirstInterface = desc->if0.bInterfaceNumber;
 	desc->if0_union.bControlInterface = desc->if0.bInterfaceNumber;
 	desc->if0_union.bSubordinateInterface0 = desc->if1.bInterfaceNumber;
 
diff --git a/subsys/usb/device_next/class/usbd_cdc_ecm.c b/subsys/usb/device_next/class/usbd_cdc_ecm.c
index 3c3072182be..3b0c656da4e 100644
--- a/subsys/usb/device_next/class/usbd_cdc_ecm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_ecm.c
@@ -449,7 +449,6 @@ static int usbd_cdc_ecm_init(struct usbd_class_data *const c_data)
 	const uint8_t if_num = desc->if0.bInterfaceNumber;
 
 	/* Update relevant b*Interface fields */
-	desc->iad.bFirstInterface = if_num;
 	desc->if0_union.bControlInterface = if_num;
 	desc->if0_union.bSubordinateInterface0 = if_num + 1;
 	LOG_DBG("CDC ECM class initialized");
diff --git a/subsys/usb/device_next/usbd_init.c b/subsys/usb/device_next/usbd_init.c
index 551dc32164f..fc31c8a211a 100644
--- a/subsys/usb/device_next/usbd_init.c
+++ b/subsys/usb/device_next/usbd_init.c
@@ -115,6 +115,7 @@ static int init_configuration_inst(struct usbd_context *const uds_ctx,
 				   uint8_t *const nif)
 {
 	struct usb_desc_header **dhp;
+	struct usb_association_descriptor *iad = NULL;
 	struct usb_if_descriptor *ifd = NULL;
 	struct usb_ep_descriptor *ed;
 	uint32_t class_ep_bm = 0;
@@ -132,6 +133,14 @@ static int init_configuration_inst(struct usbd_context *const uds_ctx,
 	c_nd->ep_active = 0U;
 
 	while (*dhp != NULL && (*dhp)->bLength != 0) {
+		if ((*dhp)->bDescriptorType == USB_DESC_INTERFACE_ASSOC) {
+			iad = (struct usb_association_descriptor *)(*dhp);
+
+			/* IAD must be before interfaces it associates, so the
+			 * first interface will be the next interface assigned.
+			 */
+			iad->bFirstInterface = tmp_nif;
+		}
 
 		if ((*dhp)->bDescriptorType == USB_DESC_INTERFACE) {
 			ifd = (struct usb_if_descriptor *)(*dhp);

From 7bf11a1181d2d3f13b5f98a8c79e67e625fe25af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Thu, 5 Dec 2024 11:29:55 +0100
Subject: [PATCH 0909/2913] [nrf fromtree] usb: device_next: Fail enqueue on
 disabled endpoints
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Do not allow enqueuing buffers on endpoints that were not enabled. Doing
so can lead to division by zero later on because the max packet size can
be 0 in disabled endpoint configuration.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit d39d7e5c603e85d405fb05cdd6e6bf59e10ed605)
---
 drivers/usb/udc/udc_common.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/usb/udc/udc_common.c b/drivers/usb/udc/udc_common.c
index 86f5a7f854a..bef3f657382 100644
--- a/drivers/usb/udc/udc_common.c
+++ b/drivers/usb/udc/udc_common.c
@@ -592,6 +592,11 @@ int udc_ep_enqueue(const struct device *dev, struct net_buf *const buf)
 		goto ep_enqueue_error;
 	}
 
+	if (!cfg->stat.enabled) {
+		ret = -ENODEV;
+		goto ep_enqueue_error;
+	}
+
 	LOG_DBG("Queue ep 0x%02x %p len %u", cfg->addr, buf,
 		USB_EP_DIR_IS_IN(cfg->addr) ? buf->len : buf->size);
 

From e87d4a6f884125c94ddb5121ca3f9c5429d168f6 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Sat, 14 Dec 2024 15:34:04 +0100
Subject: [PATCH 0910/2913] Revert "[nrf fromlist] drivers: clock_control: nrf:
 Add API for synchronous request"

This reverts commit a8bb7474bdf0f6bf7a0b2c3bdc9431761775fa82.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 .../clock_control/clock_control_nrf2_common.c | 44 -------------------
 .../drivers/clock_control/nrf_clock_control.h | 17 -------
 2 files changed, 61 deletions(-)

diff --git a/drivers/clock_control/clock_control_nrf2_common.c b/drivers/clock_control/clock_control_nrf2_common.c
index 7bf8576880b..f3b21a5dd1f 100644
--- a/drivers/clock_control/clock_control_nrf2_common.c
+++ b/drivers/clock_control/clock_control_nrf2_common.c
@@ -4,7 +4,6 @@
  */
 
 #include "clock_control_nrf2_common.h"
-#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
@@ -25,13 +24,6 @@ LOG_MODULE_REGISTER(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
  */
 STRUCT_CLOCK_CONFIG(generic, ONOFF_CNT_MAX);
 
-/* Structure used for synchronous clock request. */
-struct sync_req {
-	struct onoff_client cli;
-	struct k_sem sem;
-	int res;
-};
-
 static void update_config(struct clock_config_generic *cfg)
 {
 	atomic_val_t prev_flags = atomic_or(&cfg->flags, FLAG_UPDATE_NEEDED);
@@ -167,39 +159,3 @@ int api_nosys_on_off(const struct device *dev, clock_control_subsys_t sys)
 
 	return -ENOSYS;
 }
-
-static void sync_cb(struct onoff_manager *mgr, struct onoff_client *cli, uint32_t state, int res)
-{
-	struct sync_req *req = CONTAINER_OF(cli, struct sync_req, cli);
-
-	req->res = res;
-	k_sem_give(&req->sem);
-}
-
-int nrf_clock_control_request_sync(const struct device *dev,
-				   const struct nrf_clock_spec *spec,
-				   k_timeout_t timeout)
-{
-	struct sync_req req = {
-		.sem = Z_SEM_INITIALIZER(req.sem, 0, 1)
-	};
-	int err;
-
-	if (k_is_in_isr()) {
-		return -EWOULDBLOCK;
-	}
-
-	sys_notify_init_callback(&req.cli.notify, sync_cb);
-
-	err = nrf_clock_control_request(dev, spec, &req.cli);
-	if (err < 0) {
-		return err;
-	}
-
-	err = k_sem_take(&req.sem, timeout);
-	if (err < 0) {
-		return err;
-	}
-
-	return req.res;
-}
diff --git a/include/zephyr/drivers/clock_control/nrf_clock_control.h b/include/zephyr/drivers/clock_control/nrf_clock_control.h
index d08016d76b0..0fd3e0fb56d 100644
--- a/include/zephyr/drivers/clock_control/nrf_clock_control.h
+++ b/include/zephyr/drivers/clock_control/nrf_clock_control.h
@@ -235,23 +235,6 @@ int nrf_clock_control_request(const struct device *dev,
 	return api->request(dev, spec, cli);
 }
 
-/**
- * @brief Synchronously request a reservation to use a given clock with specified attributes.
- *
- * @see nrf_clock_control_request().
- *
- * @param dev pointer to the clock device structure.
- * @param spec See nrf_clock_control_request().
- * @param timeout Request timeout.
- *
- * @retval 0 if request is fulfilled.
- * @retval -EWOULDBLOCK if request is called from the interrupt context.
- * @retval negative See error codes returned by nrf_clock_control_request().
- */
-int nrf_clock_control_request_sync(const struct device *dev,
-				   const struct nrf_clock_spec *spec,
-				   k_timeout_t timeout);
-
 /**
  * @brief Release a reserved use of a clock.
  *

From 4de7ed4e38b4584f45dd419f1214d7855c51c9af Mon Sep 17 00:00:00 2001
From: Piotr Pryga <piotr.pryga@nordicsemi.no>
Date: Sat, 12 Oct 2024 22:44:37 +0200
Subject: [PATCH 0911/2913] [nrf fromtree] driver: clock_control: Add to nrf
 clock control calib in progres API

It may be required to get information if NRF LF clock control calibration
is in progress. Some time sensitive operations could benefit from this
information.

The commit adds simple function that provides the information.
The function is nRF platform specific.

Signed-off-by: Piotr Pryga <piotr.pryga@nordicsemi.no>
(cherry picked from commit fefc285f54c0a583344df0f492d655512cdff170)
---
 drivers/clock_control/nrf_clock_calibration.c            | 5 +++++
 include/zephyr/drivers/clock_control/nrf_clock_control.h | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/drivers/clock_control/nrf_clock_calibration.c b/drivers/clock_control/nrf_clock_calibration.c
index bea799515e1..fc2ce4162aa 100644
--- a/drivers/clock_control/nrf_clock_calibration.c
+++ b/drivers/clock_control/nrf_clock_calibration.c
@@ -294,3 +294,8 @@ int z_nrf_clock_calibration_skips_count(void)
 
 	return total_skips_cnt;
 }
+
+bool z_nrf_clock_calibration_is_in_progress(void)
+{
+	return cal_process_in_progress ? true : false;
+}
diff --git a/include/zephyr/drivers/clock_control/nrf_clock_control.h b/include/zephyr/drivers/clock_control/nrf_clock_control.h
index 0fd3e0fb56d..5d013f1d820 100644
--- a/include/zephyr/drivers/clock_control/nrf_clock_control.h
+++ b/include/zephyr/drivers/clock_control/nrf_clock_control.h
@@ -117,6 +117,13 @@ int z_nrf_clock_calibration_count(void);
  */
 int z_nrf_clock_calibration_skips_count(void);
 
+
+/** @brief Returns information if LF clock calibration is in progress.
+ *
+ * @return True if calibration is in progress, false otherwise.
+ */
+bool z_nrf_clock_calibration_is_in_progress(void);
+
 /** @brief Get onoff service for given clock subsystem.
  *
  * @param sys Subsystem.

From d0ed809374638a39611009f35787ab33eec32deb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 11 Dec 2024 09:51:59 +0100
Subject: [PATCH 0912/2913] [nrf fromtree] drivers: clock_control: nrf: Add API
 for synchronous request
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add API for synchronous request for clock attributes.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit fe0e2dbc6044ffa74b27bfcba335980bc5a6ae64)
---
 .../clock_control/clock_control_nrf2_common.c | 44 +++++++++++++++++++
 .../drivers/clock_control/nrf_clock_control.h | 18 ++++++++
 2 files changed, 62 insertions(+)

diff --git a/drivers/clock_control/clock_control_nrf2_common.c b/drivers/clock_control/clock_control_nrf2_common.c
index f3b21a5dd1f..7bf8576880b 100644
--- a/drivers/clock_control/clock_control_nrf2_common.c
+++ b/drivers/clock_control/clock_control_nrf2_common.c
@@ -4,6 +4,7 @@
  */
 
 #include "clock_control_nrf2_common.h"
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
@@ -24,6 +25,13 @@ LOG_MODULE_REGISTER(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
  */
 STRUCT_CLOCK_CONFIG(generic, ONOFF_CNT_MAX);
 
+/* Structure used for synchronous clock request. */
+struct sync_req {
+	struct onoff_client cli;
+	struct k_sem sem;
+	int res;
+};
+
 static void update_config(struct clock_config_generic *cfg)
 {
 	atomic_val_t prev_flags = atomic_or(&cfg->flags, FLAG_UPDATE_NEEDED);
@@ -159,3 +167,39 @@ int api_nosys_on_off(const struct device *dev, clock_control_subsys_t sys)
 
 	return -ENOSYS;
 }
+
+static void sync_cb(struct onoff_manager *mgr, struct onoff_client *cli, uint32_t state, int res)
+{
+	struct sync_req *req = CONTAINER_OF(cli, struct sync_req, cli);
+
+	req->res = res;
+	k_sem_give(&req->sem);
+}
+
+int nrf_clock_control_request_sync(const struct device *dev,
+				   const struct nrf_clock_spec *spec,
+				   k_timeout_t timeout)
+{
+	struct sync_req req = {
+		.sem = Z_SEM_INITIALIZER(req.sem, 0, 1)
+	};
+	int err;
+
+	if (k_is_in_isr()) {
+		return -EWOULDBLOCK;
+	}
+
+	sys_notify_init_callback(&req.cli.notify, sync_cb);
+
+	err = nrf_clock_control_request(dev, spec, &req.cli);
+	if (err < 0) {
+		return err;
+	}
+
+	err = k_sem_take(&req.sem, timeout);
+	if (err < 0) {
+		return err;
+	}
+
+	return req.res;
+}
diff --git a/include/zephyr/drivers/clock_control/nrf_clock_control.h b/include/zephyr/drivers/clock_control/nrf_clock_control.h
index 5d013f1d820..7b660c104a7 100644
--- a/include/zephyr/drivers/clock_control/nrf_clock_control.h
+++ b/include/zephyr/drivers/clock_control/nrf_clock_control.h
@@ -242,6 +242,24 @@ int nrf_clock_control_request(const struct device *dev,
 	return api->request(dev, spec, cli);
 }
 
+/**
+ * @brief Synchronously request a reservation to use a given clock with specified attributes.
+ *
+ * Function can only be called from thread context as it blocks until request is completed.
+ * @see nrf_clock_control_request().
+ *
+ * @param dev pointer to the clock device structure.
+ * @param spec See nrf_clock_control_request().
+ * @param timeout Request timeout.
+ *
+ * @retval 0 if request is fulfilled.
+ * @retval -EWOULDBLOCK if request is called from the interrupt context.
+ * @retval negative See error codes returned by nrf_clock_control_request().
+ */
+int nrf_clock_control_request_sync(const struct device *dev,
+				   const struct nrf_clock_spec *spec,
+				   k_timeout_t timeout);
+
 /**
  * @brief Release a reserved use of a clock.
  *

From 8b5c722dbeebfd9b735e1bb9313fbc3940546041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 12 Nov 2024 12:37:18 +0100
Subject: [PATCH 0913/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Fix pin
 retention
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

b6d45423c60b Added support for pin retention but it was added
only to the case when device PM is used. There is another mode
in which UARTE is disabled when idle (low power mode) and in
that case pin retention must also be added.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 760bba6d24e272af09cacc0b5f4e1792d78e7e4f)
---
 drivers/serial/uart_nrfx_uarte.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 452307acaa8..6acb6e44fbd 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -590,6 +590,9 @@ static void uarte_periph_enable(const struct device *dev)
 
 	(void)data;
 	nrf_uarte_enable(uarte);
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	nrf_gpd_retain_pins_set(config->pcfg, false);
+#endif
 #if UARTE_BAUDRATE_RETENTION_WORKAROUND
 	nrf_uarte_baudrate_set(uarte,
 		COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,
@@ -702,6 +705,11 @@ static void uarte_disable_locked(const struct device *dev, uint32_t dis_mask)
 	}
 #endif
 
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	const struct uarte_nrfx_config *cfg = dev->config;
+
+	nrf_gpd_retain_pins_set(cfg->pcfg, true);
+#endif
 	nrf_uarte_disable(get_uarte_instance(dev));
 }
 
@@ -2103,9 +2111,6 @@ static void uarte_pm_resume(const struct device *dev)
 
 	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || !LOW_POWER_ENABLED(cfg)) {
 		uarte_periph_enable(dev);
-#ifdef CONFIG_SOC_NRF54H20_GPD
-		nrf_gpd_retain_pins_set(cfg->pcfg, false);
-#endif
 	}
 }
 

From 149a9710639288199d1e3657054d31b6a5488acf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 18 Nov 2024 09:33:30 +0100
Subject: [PATCH 0914/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Fix
 runtime PM for interrupt driven API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

TX part of interrupt driven API was not calling PM device runtime
API. Additionally, when txstopped occurred after poll out it was
not handled correctly.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 13ed9e4210aeed179e9f302bb7fdb7c93af00c0d)
---
 drivers/serial/uart_nrfx_uarte.c | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 6acb6e44fbd..91f3430e8b6 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -353,16 +353,16 @@ static void uarte_nrfx_isr_int(const void *arg)
 	if (txstopped && (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || LOW_POWER_ENABLED(config))) {
 		unsigned int key = irq_lock();
 
-		if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) &&
-		    (data->flags & UARTE_FLAG_POLL_OUT)) {
-			data->flags &= ~UARTE_FLAG_POLL_OUT;
-			pm_device_runtime_put(dev);
+		if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+			if (data->flags & UARTE_FLAG_POLL_OUT) {
+				data->flags &= ~UARTE_FLAG_POLL_OUT;
+				pm_device_runtime_put_async(dev, K_NO_WAIT);
+			}
 		} else {
 			nrf_uarte_disable(uarte);
 		}
-
 #ifdef UARTE_INTERRUPT_DRIVEN
-		if (!data->int_driven || data->int_driven->fifo_fill_lock == 0)
+		if (!data->int_driven)
 #endif
 		{
 			nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
@@ -378,16 +378,20 @@ static void uarte_nrfx_isr_int(const void *arg)
 
 	if (txstopped) {
 		data->int_driven->fifo_fill_lock = 0;
+		if (!data->int_driven->tx_irq_enabled) {
+
+			nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
+		}
+
 		if (data->int_driven->disable_tx_irq) {
-			nrf_uarte_int_disable(uarte,
-					      NRF_UARTE_INT_TXSTOPPED_MASK);
 			data->int_driven->disable_tx_irq = false;
+			if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+				pm_device_runtime_put_async(dev, K_NO_WAIT);
+			}
 			return;
 		}
-
 	}
 
-
 	if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ERROR)) {
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ERROR);
 	}
@@ -1900,6 +1904,11 @@ static void uarte_nrfx_irq_tx_enable(const struct device *dev)
 {
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	struct uarte_nrfx_data *data = dev->data;
+
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_get(dev);
+	}
+
 	unsigned int key = irq_lock();
 
 	data->int_driven->disable_tx_irq = false;

From b92b6ef914fbf363477c0631c1a3dad3a54f7b5e Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Thu, 21 Nov 2024 09:48:10 +0100
Subject: [PATCH 0915/2913] [nrf fromtree] drivers serial nrfx: Apply
 workaround also for bsim targets

Or more precisely, do not remove the workaround for them.
The current HW models are accurate enough in this area for the
workaround to work properly.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit fedda6d25cfdd376170ecaab5452dc535d0bae40)
---
 drivers/serial/uart_nrfx_uarte.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 91f3430e8b6..5c0f706aef9 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -30,9 +30,7 @@
 
 LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 
-#if !defined(CONFIG_ARCH_POSIX)
 #define RX_FLUSH_WORKAROUND 1
-#endif
 
 #define UARTE(idx)                DT_NODELABEL(uart##idx)
 #define UARTE_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(UARTE(idx), prop)

From d9438c99ddd40dc97407e1ad4bd5689a8e9280c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 18 Nov 2024 08:42:50 +0100
Subject: [PATCH 0916/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Add
 support for non ISR PM mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When fast UARTE instance is used (e.g. UARTE120 in nrf54h20), PM actions
are not ISR safe because they include communication over IPC so they can
only be called from the thread context. Extend driver to support both
PM modes. When non ISR mode is used then uart_rx_enable() and uart_tx()
will return error if they are called from ISR and resume operation
would need to be called because device is suspended. On completion,
driver is calling pm_device_runtime_put_async which can be called from
the ISR context.

Additionally, suspending in the TXSTOPPED and RXTO events has been
moved after user callback. It allows to support the case where
uart_rx_enable() or uart_tx() are called from that callback context.
Since suspending is called after returning from the callback it will
not trigger suspend action because API called in the callback context
will increment the usage counter (when pm_device_runtime_get() is
called).

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit c8d50e4ef1aa54102c1887485a514186260931b6)
---
 drivers/serial/uart_nrfx_uarte.c | 99 ++++++++++++++++++++++++++++----
 1 file changed, 88 insertions(+), 11 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 5c0f706aef9..ad68313358f 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -110,6 +110,19 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #define UARTE_ANY_LOW_POWER 1
 #endif
 
+BUILD_ASSERT(NRF_GPD_FAST_ACTIVE1 == 0);
+/* Macro must resolve to literal 0 or 1 */
+#define INSTANCE_IS_FAST(unused, prefix, idx, _)					\
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(UARTE(idx)),				\
+		(COND_CODE_1(UTIL_AND(IS_ENABLED(CONFIG_SOC_NRF54H20_GPD),		\
+			     DT_NODE_HAS_PROP(UARTE(idx), power_domains)),		\
+			    (COND_CODE_0(DT_PHA(UARTE(idx), power_domains, id), (1), (0))),\
+			    (0))), (0))
+
+#if UARTE_FOR_EACH_INSTANCE(INSTANCE_IS_FAST, (||), (0))
+#define UARTE_ANY_FAST 1
+#endif
+
 #ifdef UARTE_ANY_CACHE
 /* uart120 instance does not retain BAUDRATE register when ENABLE=0. When this instance
  * is used then baudrate must be set after enabling the peripheral and not before.
@@ -269,6 +282,21 @@ struct uarte_nrfx_data {
 	(IS_ENABLED(UARTE_ANY_LOW_POWER) && \
 	 !IS_ENABLED(CONFIG_PM_DEVICE) && \
 	 (_config->flags & UARTE_CFG_FLAG_LOW_POWER))
+
+/** @brief Check if device has PM that works in ISR safe mode.
+ *
+ * Only fast UARTE instance does not work in that mode so check PM configuration
+ * flags only if there is any fast instance present.
+ *
+ * @retval true if device PM is ISR safe.
+ * @retval false if device PM is not ISR safe.
+ */
+#define IS_PM_ISR_SAFE(dev) \
+	(!IS_ENABLED(UARTE_ANY_FAST) ||\
+	 COND_CODE_1(CONFIG_PM_DEVICE,\
+			((dev->pm_base->flags & BIT(PM_DEVICE_FLAG_ISR_SAFE))), \
+			(0)))
+
 /**
  * @brief Structure for UARTE configuration.
  */
@@ -873,6 +901,20 @@ static int uarte_nrfx_tx(const struct device *dev, const uint8_t *buf,
 	}
 
 	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		if (!IS_PM_ISR_SAFE(dev) && k_is_in_isr()) {
+			/* If instance does not support PM from ISR device shall
+			 * already be turned on.
+			 */
+			enum pm_device_state state;
+			int err;
+
+			err = pm_device_state_get(dev, &state);
+			(void)err;
+			__ASSERT_NO_MSG(err == 0);
+			if (state != PM_DEVICE_STATE_ACTIVE) {
+				return -ENOTSUP;
+			}
+		}
 		pm_device_runtime_get(dev);
 	}
 
@@ -941,6 +983,10 @@ static void notify_rx_disable(const struct device *dev)
 	};
 
 	user_callback(dev, (struct uart_event *)&evt);
+
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_put_async(dev, K_NO_WAIT);
+	}
 }
 
 #ifdef UARTE_HAS_FRAME_TIMEOUT
@@ -1015,6 +1061,24 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	async_rx->next_buf = NULL;
 	async_rx->next_buf_len = 0;
 
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		if (!IS_PM_ISR_SAFE(dev) && k_is_in_isr()) {
+			/* If instance does not support PM from ISR device shall
+			 * already be turned on.
+			 */
+			enum pm_device_state state;
+			int err;
+
+			err = pm_device_state_get(dev, &state);
+			(void)err;
+			__ASSERT_NO_MSG(err == 0);
+			if (state != PM_DEVICE_STATE_ACTIVE) {
+				return -ENOTSUP;
+			}
+		}
+		pm_device_runtime_get(dev);
+	}
+
 	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || LOW_POWER_ENABLED(cfg)) {
 		if (async_rx->flush_cnt) {
 			int cpy_len = MIN(len, async_rx->flush_cnt);
@@ -1068,9 +1132,7 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 
 	async_rx->enabled = true;
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_get(dev);
-	} else if (LOW_POWER_ENABLED(cfg)) {
+	if (LOW_POWER_ENABLED(cfg)) {
 		unsigned int key = irq_lock();
 
 		uarte_enable_locked(dev, UARTE_FLAG_LOW_POWER_RX);
@@ -1543,9 +1605,7 @@ static void rxto_isr(const struct device *dev)
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXDRDY);
 #endif
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_put(dev);
-	} else if (LOW_POWER_ENABLED(config)) {
+	if (LOW_POWER_ENABLED(config)) {
 		uint32_t key = irq_lock();
 
 		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_RX);
@@ -1570,7 +1630,7 @@ static void txstopped_isr(const struct device *dev)
 	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
 		nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
 		if (data->flags & UARTE_FLAG_POLL_OUT) {
-			pm_device_runtime_put(dev);
+			pm_device_runtime_put_async(dev, K_NO_WAIT);
 			data->flags &= ~UARTE_FLAG_POLL_OUT;
 		}
 	} else if (LOW_POWER_ENABLED(config)) {
@@ -1633,11 +1693,11 @@ static void txstopped_isr(const struct device *dev)
 	data->async->tx.buf = NULL;
 	data->async->tx.len = 0;
 
+	user_callback(dev, &evt);
+
 	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_put(dev);
+		pm_device_runtime_put_async(dev, K_NO_WAIT);
 	}
-
-	user_callback(dev, &evt);
 }
 
 static void rxdrdy_isr(const struct device *dev)
@@ -1824,6 +1884,22 @@ static void uarte_nrfx_poll_out(const struct device *dev, unsigned char c)
 	}
 
 	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		if (!IS_PM_ISR_SAFE(dev) && k_is_in_isr()) {
+			/* If instance does not support PM from ISR device shall
+			 * already be turned on.
+			 */
+			enum pm_device_state state;
+			int err;
+
+			err = pm_device_state_get(dev, &state);
+			(void)err;
+			__ASSERT_NO_MSG(err == 0);
+			if (state != PM_DEVICE_STATE_ACTIVE) {
+				irq_unlock(key);
+				return;
+			}
+		}
+
 		if (!(data->flags & UARTE_FLAG_POLL_OUT)) {
 			data->flags |= UARTE_FLAG_POLL_OUT;
 			pm_device_runtime_get(dev);
@@ -2417,7 +2493,8 @@ static int uarte_instance_init(const struct device *dev,
 	}								       \
 									       \
 	PM_DEVICE_DT_DEFINE(UARTE(idx), uarte_nrfx_pm_action,		       \
-			    PM_DEVICE_ISR_SAFE);			       \
+			    COND_CODE_1(INSTANCE_IS_FAST(_, /*empty*/, idx, _),\
+				    (0), (PM_DEVICE_ISR_SAFE)));	       \
 									       \
 	DEVICE_DT_DEFINE(UARTE(idx),					       \
 		      uarte_##idx##_init,				       \

From a61e1db872ea5a978e46a6bbb5fbb0136245824b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 26 Nov 2024 16:07:21 +0100
Subject: [PATCH 0917/2913] [nrf fromlist] drivers: serial: nrfx_uarte: Request
 hsfll clock for fast instance
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Request fast global domain to run at 320 MHz during fast UARTE
activity. As request is asynchronous it cannot be called from
an ISR. Due to complexity to handle that without device runtime
power management a requirement is added so that if fast UARTE
is used device runtime PM must be enabled. Clock is request
and released in PM resume and suspended actions which in case
of fast UARTE are only called from thread context.

Upstream PR #: 82103

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 drivers/serial/Kconfig.nrfx      |  5 ++
 drivers/serial/uart_nrfx_uarte.c | 84 ++++++++++++++++++++++++--------
 2 files changed, 69 insertions(+), 20 deletions(-)

diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx
index 650404fceec..f964de9ea5d 100644
--- a/drivers/serial/Kconfig.nrfx
+++ b/drivers/serial/Kconfig.nrfx
@@ -101,6 +101,11 @@ rsource "Kconfig.nrfx_uart_instance"
 endif
 
 if HAS_HW_NRF_UARTE120
+
+config UART_NRFX_UARTE_USE_CLOCK_CONTROL
+	def_bool y
+	select CLOCK_CONTROL
+
 nrfx_uart_num = 120
 rsource "Kconfig.nrfx_uart_instance"
 endif
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index ad68313358f..0e434ea492c 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -23,10 +23,7 @@
 #include <zephyr/linker/devicetree_regions.h>
 #include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
-
-#ifdef CONFIG_SOC_NRF54H20_GPD
-#include <nrf/gpd.h>
-#endif
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 
 LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 
@@ -110,18 +107,22 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #define UARTE_ANY_LOW_POWER 1
 #endif
 
-BUILD_ASSERT(NRF_GPD_FAST_ACTIVE1 == 0);
+#ifdef CONFIG_SOC_NRF54H20_GPD
+#include <nrf/gpd.h>
+
 /* Macro must resolve to literal 0 or 1 */
-#define INSTANCE_IS_FAST(unused, prefix, idx, _)					\
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(UARTE(idx)),				\
-		(COND_CODE_1(UTIL_AND(IS_ENABLED(CONFIG_SOC_NRF54H20_GPD),		\
-			     DT_NODE_HAS_PROP(UARTE(idx), power_domains)),		\
-			    (COND_CODE_0(DT_PHA(UARTE(idx), power_domains, id), (1), (0))),\
-			    (0))), (0))
+#define INSTANCE_IS_FAST(unused, prefix, idx, _)						\
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(UARTE(idx)),					\
+		    (COND_CODE_1(DT_NODE_HAS_PROP(UARTE(idx), power_domains),			\
+			(IS_EQ(DT_PHA(UARTE(idx), power_domains, id), NRF_GPD_FAST_ACTIVE1)),	\
+			(0))), (0))
 
 #if UARTE_FOR_EACH_INSTANCE(INSTANCE_IS_FAST, (||), (0))
+/* Fast instance requires special PM treatment so device runtime PM must be enabled. */
+BUILD_ASSERT(IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME));
 #define UARTE_ANY_FAST 1
 #endif
+#endif
 
 #ifdef UARTE_ANY_CACHE
 /* uart120 instance does not retain BAUDRATE register when ENABLE=0. When this instance
@@ -308,6 +309,10 @@ struct uarte_nrfx_config {
 #ifdef CONFIG_HAS_NORDIC_DMM
 	void *mem_reg;
 #endif
+#ifdef UARTE_ANY_FAST
+	const struct device *clk_dev;
+	struct nrf_clock_spec clk_spec;
+#endif
 #ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
 	/* None-zero in case of high speed instances. Baudrate is adjusted by that ratio. */
 	uint32_t clock_freq;
@@ -619,6 +624,16 @@ static void uarte_periph_enable(const struct device *dev)
 	struct uarte_nrfx_data *data = dev->data;
 
 	(void)data;
+#ifdef UARTE_ANY_FAST
+	if (config->clk_dev) {
+		int err;
+
+		err = nrf_clock_control_request_sync(config->clk_dev, &config->clk_spec, K_FOREVER);
+		(void)err;
+		__ASSERT_NO_MSG(err >= 0);
+	}
+#endif
+
 	nrf_uarte_enable(uarte);
 #ifdef CONFIG_SOC_NRF54H20_GPD
 	nrf_gpd_retain_pins_set(config->pcfg, false);
@@ -700,7 +715,6 @@ static void tx_start(const struct device *dev, const uint8_t *buf, size_t len)
 	if (LOW_POWER_ENABLED(config)) {
 		uarte_enable_locked(dev, UARTE_FLAG_LOW_POWER_TX);
 	}
-
 	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTTX);
 }
 
@@ -2204,6 +2218,16 @@ static void uarte_pm_suspend(const struct device *dev)
 	struct uarte_nrfx_data *data = dev->data;
 
 	(void)data;
+#ifdef UARTE_ANY_FAST
+	if (cfg->clk_dev) {
+		int err;
+
+		err = nrf_clock_control_release(cfg->clk_dev, &cfg->clk_spec);
+		(void)err;
+		__ASSERT_NO_MSG(err >= 0);
+	}
+#endif
+
 #ifdef UARTE_ANY_ASYNC
 	if (data->async) {
 		/* Entering inactive state requires device to be no
@@ -2387,11 +2411,11 @@ static int uarte_instance_init(const struct device *dev,
 #define UARTE_DISABLE_RX_INIT(node_id) \
 	.disable_rx = DT_PROP(node_id, disable_rx)
 
-#define UARTE_GET_FREQ(idx) DT_PROP(DT_CLOCKS_CTLR(UARTE(idx)), clock_frequency)
-
-#define UARTE_GET_BAUDRATE_DIV(idx)						\
-	COND_CODE_1(DT_CLOCKS_HAS_IDX(UARTE(idx), 0),				\
-		   ((UARTE_GET_FREQ(idx) / NRF_UARTE_BASE_FREQUENCY_16MHZ)), (1))
+/* Get frequency of the clock that driver the UARTE peripheral. Clock node can
+ * have fixed or variable frequency. For fast UARTE use highest supported frequency.
+ */
+#define UARTE_GET_BAUDRATE_DIV(idx) \
+	(NRF_PERIPH_GET_FREQUENCY(UARTE(idx)) / NRF_UARTE_BASE_FREQUENCY_16MHZ)
 
 /* When calculating baudrate we need to take into account that high speed instances
  * must have baudrate adjust to the ratio between UARTE clocking frequency and 16 MHz.
@@ -2399,6 +2423,19 @@ static int uarte_instance_init(const struct device *dev,
 #define UARTE_GET_BAUDRATE(idx) \
 	(NRF_BAUDRATE(UARTE_PROP(idx, current_speed)) / UARTE_GET_BAUDRATE_DIV(idx))
 
+/* Get initialization level of an instance. Instances that requires clock control
+ * which is using nrfs (IPC) are initialized later.
+ */
+#define UARTE_INIT_LEVEL(idx) \
+	COND_CODE_1(INSTANCE_IS_FAST(_, /*empty*/, idx, _), (POST_KERNEL), (PRE_KERNEL_1))
+
+/* Get initialization priority of an instance. Instances that requires clock control
+ * which is using nrfs (IPC) are initialized later.
+ */
+#define UARTE_INIT_PRIO(idx)								\
+	COND_CODE_1(INSTANCE_IS_FAST(_, /*empty*/, idx, _),				\
+		    (UTIL_INC(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_INIT_PRIORITY)),	\
+		    (CONFIG_SERIAL_INIT_PRIORITY))
 
 /* Macro for setting nRF specific configuration structures. */
 #define UARTE_NRF_CONFIG(idx) {							\
@@ -2454,7 +2491,7 @@ static int uarte_instance_init(const struct device *dev,
 	static const struct uarte_nrfx_config uarte_##idx##z_config = {	       \
 		COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,		       \
 		    (IF_ENABLED(DT_CLOCKS_HAS_IDX(UARTE(idx), 0),	       \
-			   (.clock_freq = UARTE_GET_FREQ(idx),))),	       \
+			   (.clock_freq = NRF_PERIPH_GET_FREQUENCY(UARTE(idx)),))), \
 		    (IF_ENABLED(UARTE_HAS_FRAME_TIMEOUT,		       \
 			(.baudrate = UARTE_PROP(idx, current_speed),))	       \
 		     .nrf_baudrate = UARTE_GET_BAUDRATE(idx),		       \
@@ -2481,6 +2518,13 @@ static int uarte_instance_init(const struct device *dev,
 		IF_ENABLED(CONFIG_UART_##idx##_NRF_HW_ASYNC,		       \
 			(.timer = NRFX_TIMER_INSTANCE(			       \
 				CONFIG_UART_##idx##_NRF_HW_ASYNC_TIMER),))     \
+		IF_ENABLED(INSTANCE_IS_FAST(_, /*empty*/, idx, _),	       \
+			(.clk_dev = DEVICE_DT_GET(DT_CLOCKS_CTLR(UARTE(idx))), \
+			 .clk_spec = {					       \
+				.frequency = NRF_PERIPH_GET_FREQUENCY(UARTE(idx)),\
+				.accuracy = 0,				       \
+				.precision = NRF_CLOCK_CONTROL_PRECISION_DEFAULT,\
+				},))					       \
 	};								       \
 	static int uarte_##idx##_init(const struct device *dev)		       \
 	{								       \
@@ -2501,8 +2545,8 @@ static int uarte_instance_init(const struct device *dev,
 		      PM_DEVICE_DT_GET(UARTE(idx)),			       \
 		      &uarte_##idx##_data,				       \
 		      &uarte_##idx##z_config,				       \
-		      PRE_KERNEL_1,					       \
-		      CONFIG_SERIAL_INIT_PRIORITY,			       \
+		      UARTE_INIT_LEVEL(idx),				       \
+		      UARTE_INIT_PRIO(idx),				       \
 		      &uart_nrfx_uarte_driver_api)
 
 #define UARTE_INT_DRIVEN(idx)						       \

From 6c6f3aa6769984b5d9ef79524e70c094decf28cc Mon Sep 17 00:00:00 2001
From: Hake Huang <hake.huang@oss.nxp.com>
Date: Wed, 2 Oct 2024 12:28:53 +0000
Subject: [PATCH 0918/2913] [nrf fromtree] tests: uart_async_api: update test
 for dma usage

1. ensure the two dma buffers all aligned with 32 bits
2. clean the rx_data_idx at test begin

Signed-off-by: Hake Huang <hake.huang@oss.nxp.com>
(cherry picked from commit 193bfabd3f0d82c751bbfb6a3e70c216d9e52fac)
---
 .../uart/uart_async_api/src/test_uart_async.c | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/tests/drivers/uart/uart_async_api/src/test_uart_async.c b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
index 2feb201d94c..0506ff0a01f 100644
--- a/tests/drivers/uart/uart_async_api/src/test_uart_async.c
+++ b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
@@ -324,10 +324,15 @@ ZTEST_USER(uart_async_multi_rx, test_multiple_rx_enable)
 }
 
 #if NOCACHE_MEM
-static __aligned(32) uint8_t chained_read_buf[2][8] __used __NOCACHE;
+/* To ensure 32-bit alignment of the buffer array,
+ * the two arrays are defined instead using an array of arrays
+ */
+static __aligned(32) uint8_t chained_read_buf_0[8] __used __NOCACHE;
+static __aligned(32) uint8_t chained_read_buf_1[8] __used __NOCACHE;
 static __aligned(32) uint8_t chained_cpy_buf[10] __used __NOCACHE;
 #else
-ZTEST_BMEM uint8_t chained_read_buf[2][8];
+ZTEST_BMEM uint8_t chained_read_buf_0[8];
+ZTEST_BMEM uint8_t chained_read_buf_1[8];
 ZTEST_BMEM uint8_t chained_cpy_buf[10];
 #endif /* NOCACHE_MEM */
 ZTEST_BMEM volatile uint8_t rx_data_idx;
@@ -335,6 +340,8 @@ ZTEST_BMEM uint8_t rx_buf_idx;
 
 ZTEST_BMEM uint8_t *read_ptr;
 
+static uint8_t *chained_read_buf[2] = {chained_read_buf_0, chained_read_buf_1};
+
 static void test_chained_read_callback(const struct device *dev,
 				struct uart_event *evt, void *user_data)
 {
@@ -352,9 +359,8 @@ static void test_chained_read_callback(const struct device *dev,
 		rx_data_idx += evt->data.rx.len;
 		break;
 	case UART_RX_BUF_REQUEST:
-		err = uart_rx_buf_rsp(dev,
-				      chained_read_buf[rx_buf_idx],
-				      sizeof(chained_read_buf[0]));
+		err = uart_rx_buf_rsp(dev, chained_read_buf[rx_buf_idx],
+				      sizeof(chained_read_buf_0));
 		zassert_equal(err, 0);
 		rx_buf_idx = !rx_buf_idx ? 1 : 0;
 		break;
@@ -387,11 +393,10 @@ ZTEST_USER(uart_async_chain_read, test_chained_read)
 	uint32_t rx_timeout_ms = 50;
 	int err;
 
-	err = uart_rx_enable(uart_dev,
-			     chained_read_buf[rx_buf_idx++],
-			     sizeof(chained_read_buf[0]),
+	err = uart_rx_enable(uart_dev, chained_read_buf[rx_buf_idx++], sizeof(chained_read_buf_0),
 			     rx_timeout_ms * USEC_PER_MSEC);
 	zassert_equal(err, 0);
+	rx_data_idx = 0;
 
 	for (int i = 0; i < iter; i++) {
 		zassert_not_equal(k_sem_take(&rx_disabled, K_MSEC(10)),
@@ -406,7 +411,7 @@ ZTEST_USER(uart_async_chain_read, test_chained_read)
 				"Unexpected amount of data received %d exp:%d",
 				rx_data_idx, sizeof(tx_buf));
 		zassert_equal(memcmp(tx_buf, chained_cpy_buf, sizeof(tx_buf)), 0,
-			      "Buffers not equal");
+			      "Buffers not equal exp %s, real %s", tx_buf, chained_cpy_buf);
 		rx_data_idx = 0;
 	}
 	uart_rx_disable(uart_dev);

From b6e9ee859194b98926dc687061f97983714887c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 18 Jul 2024 14:37:44 +0200
Subject: [PATCH 0919/2913] [nrf fromtree] tests: drivers: uart: async_api: Add
 missing static keyword
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Multiple variable in the test were missing static keyword.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit bc007fd53bd564ac893a0c759943595e258bdc61)
---
 .../uart/uart_async_api/src/test_uart_async.c | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/tests/drivers/uart/uart_async_api/src/test_uart_async.c b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
index 0506ff0a01f..3f56bbe1d80 100644
--- a/tests/drivers/uart/uart_async_api/src/test_uart_async.c
+++ b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
@@ -24,12 +24,12 @@ K_SEM_DEFINE(rx_buf_coherency, 0, 255);
 K_SEM_DEFINE(rx_buf_released, 0, 1);
 K_SEM_DEFINE(rx_disabled, 0, 1);
 
-ZTEST_BMEM volatile bool failed_in_isr;
+static ZTEST_BMEM volatile bool failed_in_isr;
 static ZTEST_BMEM const struct device *const uart_dev =
 	DEVICE_DT_GET(UART_NODE);
 
 static void read_abort_timeout(struct k_timer *timer);
-K_TIMER_DEFINE(read_abort_timer, read_abort_timeout, NULL);
+static K_TIMER_DEFINE(read_abort_timer, read_abort_timeout, NULL);
 
 
 static void init_test(void)
@@ -100,7 +100,7 @@ struct test_data {
 #if NOCACHE_MEM
 static struct test_data tdata __used __NOCACHE;
 #else
-ZTEST_BMEM struct test_data tdata;
+static ZTEST_BMEM struct test_data tdata;
 #endif /* NOCACHE_MEM */
 
 static void test_single_read_callback(const struct device *dev,
@@ -331,14 +331,14 @@ static __aligned(32) uint8_t chained_read_buf_0[8] __used __NOCACHE;
 static __aligned(32) uint8_t chained_read_buf_1[8] __used __NOCACHE;
 static __aligned(32) uint8_t chained_cpy_buf[10] __used __NOCACHE;
 #else
-ZTEST_BMEM uint8_t chained_read_buf_0[8];
-ZTEST_BMEM uint8_t chained_read_buf_1[8];
-ZTEST_BMEM uint8_t chained_cpy_buf[10];
+static ZTEST_BMEM uint8_t chained_read_buf_0[8];
+static ZTEST_BMEM uint8_t chained_read_buf_1[8];
+static ZTEST_BMEM uint8_t chained_cpy_buf[10];
 #endif /* NOCACHE_MEM */
-ZTEST_BMEM volatile uint8_t rx_data_idx;
-ZTEST_BMEM uint8_t rx_buf_idx;
+static ZTEST_BMEM volatile uint8_t rx_data_idx;
+static ZTEST_BMEM uint8_t rx_buf_idx;
 
-ZTEST_BMEM uint8_t *read_ptr;
+static ZTEST_BMEM uint8_t *read_ptr;
 
 static uint8_t *chained_read_buf[2] = {chained_read_buf_0, chained_read_buf_1};
 
@@ -422,9 +422,9 @@ ZTEST_USER(uart_async_chain_read, test_chained_read)
 #if NOCACHE_MEM
 static __aligned(32) uint8_t double_buffer[2][12] __used __NOCACHE;
 #else
-ZTEST_BMEM uint8_t double_buffer[2][12];
+static ZTEST_BMEM uint8_t double_buffer[2][12];
 #endif /* NOCACHE_MEM */
-ZTEST_DMEM uint8_t *next_buf = double_buffer[1];
+static ZTEST_DMEM uint8_t *next_buf = double_buffer[1];
 
 static void test_double_buffer_callback(const struct device *dev,
 				 struct uart_event *evt, void *user_data)
@@ -497,10 +497,10 @@ ZTEST_USER(uart_async_double_buf, test_double_buffer)
 static __aligned(32) uint8_t test_read_abort_rx_buf[2][100] __used __NOCACHE;
 static __aligned(32) uint8_t test_read_abort_read_buf[100] __used __NOCACHE;
 #else
-ZTEST_BMEM uint8_t test_read_abort_rx_buf[2][100];
-ZTEST_BMEM uint8_t test_read_abort_read_buf[100];
+static ZTEST_BMEM uint8_t test_read_abort_rx_buf[2][100];
+static ZTEST_BMEM uint8_t test_read_abort_read_buf[100];
 #endif /* NOCACHE_MEM */
-ZTEST_BMEM int test_read_abort_rx_cnt;
+static ZTEST_BMEM int test_read_abort_rx_cnt;
 
 static void test_read_abort_callback(const struct device *dev,
 			      struct uart_event *evt, void *user_data)
@@ -613,12 +613,12 @@ ZTEST_USER(uart_async_read_abort, test_read_abort)
 
 }
 
-ZTEST_BMEM volatile size_t sent;
-ZTEST_BMEM volatile size_t received;
+static ZTEST_BMEM volatile size_t sent;
+static ZTEST_BMEM volatile size_t received;
 #if NOCACHE_MEM
 static __aligned(32) uint8_t test_rx_buf[2][100] __used __NOCACHE;
 #else
-ZTEST_BMEM uint8_t test_rx_buf[2][100];
+static ZTEST_BMEM uint8_t test_rx_buf[2][100];
 #endif /* NOCACHE_MEM */
 
 static void test_write_abort_callback(const struct device *dev,
@@ -776,12 +776,12 @@ ZTEST_USER(uart_async_timeout, test_forever_timeout)
 
 
 #if NOCACHE_MEM
-const uint8_t chained_write_tx_bufs[2][10] = {"Message 1", "Message 2"};
+static const uint8_t chained_write_tx_bufs[2][10] = {"Message 1", "Message 2"};
 #else
-ZTEST_DMEM uint8_t chained_write_tx_bufs[2][10] = {"Message 1", "Message 2"};
+static ZTEST_DMEM uint8_t chained_write_tx_bufs[2][10] = {"Message 1", "Message 2"};
 #endif /* NOCACHE_MEM */
-ZTEST_DMEM bool chained_write_next_buf = true;
-ZTEST_BMEM volatile uint8_t tx_sent;
+static ZTEST_DMEM bool chained_write_next_buf = true;
+static ZTEST_BMEM volatile uint8_t tx_sent;
 
 static void test_chained_write_callback(const struct device *dev,
 				 struct uart_event *evt, void *user_data)
@@ -863,12 +863,12 @@ static __aligned(32) uint8_t long_rx_buf[RX_LONG_BUFFER] __used __NOCACHE;
 static __aligned(32) uint8_t long_rx_buf2[RX_LONG_BUFFER] __used __NOCACHE;
 static __aligned(32) uint8_t long_tx_buf[TX_LONG_BUFFER] __used __NOCACHE;
 #else
-ZTEST_BMEM uint8_t long_rx_buf[RX_LONG_BUFFER];
-ZTEST_BMEM uint8_t long_rx_buf2[RX_LONG_BUFFER];
-ZTEST_BMEM uint8_t long_tx_buf[TX_LONG_BUFFER];
+static ZTEST_BMEM uint8_t long_rx_buf[RX_LONG_BUFFER];
+static ZTEST_BMEM uint8_t long_rx_buf2[RX_LONG_BUFFER];
+static ZTEST_BMEM uint8_t long_tx_buf[TX_LONG_BUFFER];
 #endif /* NOCACHE_MEM */
-ZTEST_BMEM volatile uint8_t evt_num;
-ZTEST_BMEM size_t long_received[2];
+static ZTEST_BMEM volatile uint8_t evt_num;
+static ZTEST_BMEM size_t long_received[2];
 
 static void test_long_buffers_callback(const struct device *dev,
 				struct uart_event *evt, void *user_data)

From f309e3d4dd2f1ecfce0880d6378ebe890cd7a7c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 18 Jul 2024 14:28:51 +0200
Subject: [PATCH 0920/2913] [nrf fromtree] tests: drivers: uart: async_api:
 Rework for multi instance
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rework the test to be able to run on multiple instances.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit d2b69a4ec7184a08f8821e1c68eb456fc2a0927f)
---
 .../uart/uart_async_api/src/test_uart_async.c | 106 ++++++++++++------
 1 file changed, 73 insertions(+), 33 deletions(-)

diff --git a/tests/drivers/uart/uart_async_api/src/test_uart_async.c b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
index 3f56bbe1d80..139de516fd8 100644
--- a/tests/drivers/uart/uart_async_api/src/test_uart_async.c
+++ b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
@@ -25,39 +25,49 @@ K_SEM_DEFINE(rx_buf_released, 0, 1);
 K_SEM_DEFINE(rx_disabled, 0, 1);
 
 static ZTEST_BMEM volatile bool failed_in_isr;
-static ZTEST_BMEM const struct device *const uart_dev =
-	DEVICE_DT_GET(UART_NODE);
+
+struct dut_data {
+	const struct device *dev;
+	const char *name;
+};
+
+static ZTEST_DMEM struct dut_data duts[] = {
+	{
+		.dev = DEVICE_DT_GET(UART_NODE),
+		.name = DT_NODE_FULL_NAME(UART_NODE),
+	},
+	/* More instances can be added here. */
+};
+
+static ZTEST_BMEM const struct device *uart_dev;
+static ZTEST_BMEM const char *uart_name;
 
 static void read_abort_timeout(struct k_timer *timer);
 static K_TIMER_DEFINE(read_abort_timer, read_abort_timeout, NULL);
 
 
-static void init_test(void)
-{
-	__ASSERT_NO_MSG(device_is_ready(uart_dev));
-	uart_rx_disable(uart_dev);
-	uart_tx_abort(uart_dev);
-	k_sem_reset(&tx_done);
-	k_sem_reset(&tx_aborted);
-	k_sem_reset(&rx_rdy);
-	k_sem_reset(&rx_buf_released);
-	k_sem_reset(&rx_disabled);
-}
-
 #ifdef CONFIG_USERSPACE
 static void set_permissions(void)
 {
 	k_thread_access_grant(k_current_get(), &tx_done, &tx_aborted,
 			      &rx_rdy, &rx_buf_coherency, &rx_buf_released,
 			      &rx_disabled, uart_dev, &read_abort_timer);
+
+	for (size_t i = 0; i < ARRAY_SIZE(duts); i++) {
+		k_thread_access_grant(k_current_get(), duts[i].dev);
+	}
 }
 #endif
 
-static void uart_async_test_init(void)
+static void uart_async_test_init(int idx)
 {
 	static bool initialized;
 
+	uart_dev = duts[idx].dev;
+	uart_name = duts[idx].name;
+
 	__ASSERT_NO_MSG(device_is_ready(uart_dev));
+	TC_PRINT("UART instance:%s\n", uart_name);
 	uart_rx_disable(uart_dev);
 	uart_tx_abort(uart_dev);
 	k_sem_reset(&tx_done);
@@ -79,7 +89,6 @@ static void uart_async_test_init(void)
 #endif
 
 	if (!initialized) {
-		init_test();
 		initialized = true;
 #ifdef CONFIG_USERSPACE
 		set_permissions();
@@ -143,11 +152,13 @@ static void test_single_read_callback(const struct device *dev,
 	}
 }
 
-ZTEST_BMEM volatile uint32_t tx_aborted_count;
+static ZTEST_BMEM volatile uint32_t tx_aborted_count;
 
 static void *single_read_setup(void)
 {
-	uart_async_test_init();
+	static int idx;
+
+	uart_async_test_init(idx++);
 
 	memset(&tdata, 0, sizeof(tdata));
 	tdata.supply_second_buffer = true;
@@ -228,7 +239,9 @@ ZTEST_USER(uart_async_single_read, test_single_read)
 
 static void *multiple_rx_enable_setup(void)
 {
-	uart_async_test_init();
+	static int idx;
+
+	uart_async_test_init(idx++);
 
 	memset(&tdata, 0, sizeof(tdata));
 	/* Reuse the callback from the single_read test case, as this test case
@@ -375,7 +388,9 @@ static void test_chained_read_callback(const struct device *dev,
 
 static void *chained_read_setup(void)
 {
-	uart_async_test_init();
+	static int idx;
+
+	uart_async_test_init(idx++);
 
 	uart_callback_set(uart_dev, test_chained_read_callback, NULL);
 
@@ -455,7 +470,9 @@ static void test_double_buffer_callback(const struct device *dev,
 
 static void *double_buffer_setup(void)
 {
-	uart_async_test_init();
+	static int idx;
+
+	uart_async_test_init(idx++);
 
 	uart_callback_set(uart_dev, test_double_buffer_callback, NULL);
 
@@ -501,6 +518,7 @@ static ZTEST_BMEM uint8_t test_read_abort_rx_buf[2][100];
 static ZTEST_BMEM uint8_t test_read_abort_read_buf[100];
 #endif /* NOCACHE_MEM */
 static ZTEST_BMEM int test_read_abort_rx_cnt;
+static ZTEST_BMEM bool test_read_abort_rx_buf_req_once;
 
 static void test_read_abort_callback(const struct device *dev,
 			      struct uart_event *evt, void *user_data)
@@ -515,14 +533,12 @@ static void test_read_abort_callback(const struct device *dev,
 		break;
 	case UART_RX_BUF_REQUEST:
 	{
-		static bool once;
-
-		if (!once) {
+		if (!test_read_abort_rx_buf_req_once) {
 			k_sem_give(&rx_buf_coherency);
 			uart_rx_buf_rsp(dev,
 					test_read_abort_rx_buf[1],
 					sizeof(test_read_abort_rx_buf[1]));
-			once = true;
+			test_read_abort_rx_buf_req_once = true;
 		}
 		break;
 	}
@@ -558,8 +574,11 @@ static void read_abort_timeout(struct k_timer *timer)
 
 static void *read_abort_setup(void)
 {
-	uart_async_test_init();
+	static int idx;
 
+	uart_async_test_init(idx++);
+
+	test_read_abort_rx_buf_req_once = false;
 	failed_in_isr = false;
 	uart_callback_set(uart_dev, test_read_abort_callback, NULL);
 
@@ -654,7 +673,9 @@ static void test_write_abort_callback(const struct device *dev,
 
 static void *write_abort_setup(void)
 {
-	uart_async_test_init();
+	static int idx;
+
+	uart_async_test_init(idx++);
 
 	uart_callback_set(uart_dev, test_write_abort_callback, NULL);
 
@@ -727,7 +748,9 @@ static void test_forever_timeout_callback(const struct device *dev,
 
 static void *forever_timeout_setup(void)
 {
-	uart_async_test_init();
+	static int idx;
+
+	uart_async_test_init(idx++);
 
 	uart_callback_set(uart_dev, test_forever_timeout_callback, NULL);
 
@@ -816,8 +839,12 @@ static void test_chained_write_callback(const struct device *dev,
 
 static void *chained_write_setup(void)
 {
-	uart_async_test_init();
+	static int idx;
+
+	uart_async_test_init(idx++);
 
+	tx_sent = 0;
+	chained_write_next_buf = true;
 	uart_callback_set(uart_dev, test_chained_write_callback, NULL);
 
 	return NULL;
@@ -869,11 +896,11 @@ static ZTEST_BMEM uint8_t long_tx_buf[TX_LONG_BUFFER];
 #endif /* NOCACHE_MEM */
 static ZTEST_BMEM volatile uint8_t evt_num;
 static ZTEST_BMEM size_t long_received[2];
+static ZTEST_BMEM uint8_t *long_next_buffer;
 
 static void test_long_buffers_callback(const struct device *dev,
 				struct uart_event *evt, void *user_data)
 {
-	static uint8_t *next_buffer = long_rx_buf2;
 
 	switch (evt->type) {
 	case UART_TX_DONE:
@@ -895,8 +922,8 @@ static void test_long_buffers_callback(const struct device *dev,
 		k_sem_give(&rx_disabled);
 		break;
 	case UART_RX_BUF_REQUEST:
-		uart_rx_buf_rsp(dev, next_buffer, RX_LONG_BUFFER);
-		next_buffer = (next_buffer == long_rx_buf2) ? long_rx_buf : long_rx_buf2;
+		uart_rx_buf_rsp(dev, long_next_buffer, RX_LONG_BUFFER);
+		long_next_buffer = (long_next_buffer == long_rx_buf2) ? long_rx_buf : long_rx_buf2;
 		break;
 	default:
 		break;
@@ -905,8 +932,12 @@ static void test_long_buffers_callback(const struct device *dev,
 
 static void *long_buffers_setup(void)
 {
-	uart_async_test_init();
+	static int idx;
 
+	uart_async_test_init(idx++);
+
+	evt_num = 0;
+	long_next_buffer = long_rx_buf2;
 	uart_callback_set(uart_dev, test_long_buffers_callback, NULL);
 
 	return NULL;
@@ -988,3 +1019,12 @@ ZTEST_SUITE(uart_async_write_abort, NULL, write_abort_setup,
 
 ZTEST_SUITE(uart_async_timeout, NULL, forever_timeout_setup,
 		NULL, NULL, NULL);
+
+void test_main(void)
+{
+	/* Run all suites for each dut UART. Setup function for each suite is picking
+	 * next UART from the array.
+	 */
+	ztest_run_all(NULL, false, ARRAY_SIZE(duts), 1);
+	ztest_verify_all_test_suites_ran();
+}

From ca30e88a49a187e9658eb53ef3eff247060bcb3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 18 Jul 2024 14:20:33 +0200
Subject: [PATCH 0921/2913] [nrf fromtree] tests: drivers: uart: async_api: Add
 uart120 instance to nrf54h20dk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add second instance to be tested on nrf54h20dk. uart120 is a fast UARTE
which works on fixed pin locations. It is not available for cpuppr core.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit f235ddb2cf261eccd93633e4a91060f71008ec6b)
---
 .../boards/nrf54h20dk_nrf54h20_common.dtsi    | 31 +++++++++++++++++--
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  9 ++++++
 .../uart/uart_async_api/src/test_uart_async.c |  9 ++++--
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi
index 9aa338deaad..ae810c27966 100644
--- a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi
@@ -3,8 +3,11 @@
 &pinctrl {
 	uart137_default_alt: uart137_default_alt {
 		group1 {
-			psels = <NRF_PSEL(UART_TX, 0, 6)>,
-				<NRF_PSEL(UART_RX, 0, 7)>;
+			psels = <NRF_PSEL(UART_TX, 0, 6)>;
+		};
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 0, 7)>;
+			bias-pull-up;
 		};
 	};
 
@@ -15,6 +18,23 @@
 			low-power-enable;
 		};
 	};
+	uart120_default_alt: uart120_default_alt {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 7, 7)>;
+		};
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 7, 4)>;
+			bias-pull-up;
+		};
+	};
+
+	uart120_sleep_alt: uart120_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 7, 7)>,
+				<NRF_PSEL(UART_RX, 7, 4)>;
+			low-power-enable;
+		};
+	};
 };
 
 dut: &uart137 {
@@ -24,3 +44,10 @@ dut: &uart137 {
 	pinctrl-names = "default", "sleep";
 	current-speed = <115200>;
 };
+
+dut2: &uart120 {
+	pinctrl-0 = <&uart120_default_alt>;
+	pinctrl-1 = <&uart120_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	current-speed = <115200>;
+};
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index be5897fd051..79f5554a33b 100644
--- a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -5,3 +5,12 @@
 &dut {
 	memory-regions = <&cpuapp_dma_region>;
 };
+
+&dut2 {
+	status = "okay";
+	memory-regions = <&dma_fast_region>;
+};
+
+&dma_fast_region {
+	status = "okay";
+};
diff --git a/tests/drivers/uart/uart_async_api/src/test_uart_async.c b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
index 139de516fd8..c087878eee8 100644
--- a/tests/drivers/uart/uart_async_api/src/test_uart_async.c
+++ b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
@@ -31,12 +31,17 @@ struct dut_data {
 	const char *name;
 };
 
-static ZTEST_DMEM struct dut_data duts[] = {
+ZTEST_DMEM struct dut_data duts[] = {
 	{
 		.dev = DEVICE_DT_GET(UART_NODE),
 		.name = DT_NODE_FULL_NAME(UART_NODE),
 	},
-	/* More instances can be added here. */
+#if DT_NODE_EXISTS(DT_NODELABEL(dut2)) && DT_NODE_HAS_STATUS(DT_NODELABEL(dut2), okay)
+	{
+		.dev = DEVICE_DT_GET(DT_NODELABEL(dut2)),
+		.name = DT_NODE_FULL_NAME(DT_NODELABEL(dut2)),
+	},
+#endif
 };
 
 static ZTEST_BMEM const struct device *uart_dev;

From 69ab4849b9b8446da27f623f52d96e531d60d878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 26 Nov 2024 16:08:13 +0100
Subject: [PATCH 0922/2913] [nrf fromlist] tests: drivers: uart: async_api:
 nrf54h20dk: Enable device PM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enable device runtime PM for nrf54h20dk/nrf54h20/cpuapp where
fast UARTE (uart120) is tested.

Upstream PR #: 82103

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 .../uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi  | 2 ++
 .../uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf  | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf

diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi
index ae810c27966..9902d733d35 100644
--- a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi
@@ -43,6 +43,7 @@ dut: &uart137 {
 	pinctrl-1 = <&uart137_sleep_alt>;
 	pinctrl-names = "default", "sleep";
 	current-speed = <115200>;
+	zephyr,pm-device-runtime-auto;
 };
 
 dut2: &uart120 {
@@ -50,4 +51,5 @@ dut2: &uart120 {
 	pinctrl-1 = <&uart120_sleep_alt>;
 	pinctrl-names = "default", "sleep";
 	current-speed = <115200>;
+	zephyr,pm-device-runtime-auto;
 };
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..74cc8d7691e
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1,2 @@
+CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_RUNTIME=y

From 6b546841faf2431a182faf4233c85bf0681230fa Mon Sep 17 00:00:00 2001
From: TOKITA Hiroshi <tokita.hiroshi@gmail.com>
Date: Wed, 18 Sep 2024 06:26:11 +0900
Subject: [PATCH 0923/2913] [nrf fromtree] drivers: power_domain: gpio_monitor:
 Fix compilation error

The fix 25173f71cda630d4fb0c860d4e45e6f93c0995dd created
`struct pm_device_base` and moved `usage` to it.
This has been overlooked so that I fixed it.

Signed-off-by: TOKITA Hiroshi <tokita.hiroshi@gmail.com>
(cherry picked from commit a511f519b878795f66d93b0becc8595cb7549f9a)
---
 drivers/power_domain/power_domain_gpio_monitor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/power_domain/power_domain_gpio_monitor.c b/drivers/power_domain/power_domain_gpio_monitor.c
index 62dfd60855b..a0a5af8aa7f 100644
--- a/drivers/power_domain/power_domain_gpio_monitor.c
+++ b/drivers/power_domain/power_domain_gpio_monitor.c
@@ -39,7 +39,7 @@ static int pd_on_domain_visitor(const struct device *dev, void *context)
 		return 0;
 	}
 
-	dev->pm->usage = 0;
+	dev->pm->base.usage = 0;
 	(void)pm_device_action_run(dev, visitor_context->action);
 	return 0;
 }

From 47885d5a3f3a120f8f71cecc741c87ea49d8ded5 Mon Sep 17 00:00:00 2001
From: TOKITA Hiroshi <tokita.hiroshi@gmail.com>
Date: Thu, 26 Sep 2024 11:11:09 +0900
Subject: [PATCH 0924/2913] [nrf fromtree] drivers: power_domain: gpio_monitor:
 Add PM_DEVICE dependency

Since "power_domain,gpio_monitor" depends on PM_DEVICE,
specify it in Kconfig.

Signed-off-by: TOKITA Hiroshi <tokita.hiroshi@gmail.com>
(cherry picked from commit 663c7bc18106eb328ea0d1968ed25ea59f445d7e)
---
 drivers/power_domain/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/power_domain/Kconfig b/drivers/power_domain/Kconfig
index c1fe5d3bd9b..647d7036679 100644
--- a/drivers/power_domain/Kconfig
+++ b/drivers/power_domain/Kconfig
@@ -60,6 +60,7 @@ config POWER_DOMAIN_GPIO_MONITOR
 	default y
 	depends on DT_HAS_POWER_DOMAIN_GPIO_MONITOR_ENABLED
 	depends on GPIO
+	depends on PM_DEVICE
 	select DEVICE_DEPS
 
 if POWER_DOMAIN_GPIO_MONITOR

From 5542d6119831adb163917e884b58b9f681907c10 Mon Sep 17 00:00:00 2001
From: Jonathan Nilsen <jonathan.nilsen@nordicsemi.no>
Date: Sat, 14 Dec 2024 15:32:28 +0100
Subject: [PATCH 0925/2913] Revert "[nrf noup] scripts: west_commands: runners:
 nrf: workarounds for SDFW v8.0.0"

No longer needed with SDFW v9.0.0 and more recent nrfutil device versions.

This reverts commit f3e33c4fe7a4982b163df508ceca2dd476ebe3bd.

Signed-off-by: Jonathan Nilsen <jonathan.nilsen@nordicsemi.no>
---
 scripts/west_commands/runners/nrf_common.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index 67634132408..1479f254ac1 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -270,11 +270,6 @@ def program_hex(self):
             if self.erase:
                 self.exec_op('erase', core='NRFDL_DEVICE_CORE_APPLICATION')
                 self.exec_op('erase', core='NRFDL_DEVICE_CORE_NETWORK')
-                # A reset is needed if repartitioning the device memory
-                self.reset_target()
-            else:
-                # Ensure that firmware is not executing while erasing/programming
-                self.exec_op("reset", option="RESET_VIA_SECDOM")
 
             # Manage SUIT artifacts.
             # This logic should be executed only once per build.
@@ -326,8 +321,16 @@ def program_hex(self):
                         )
 
             if cpuapp:
+                if not self.erase and self.build_conf.getboolean('CONFIG_NRF_REGTOOL_GENERATE_UICR'):
+                    self.exec_op('erase', core='NRFDL_DEVICE_CORE_APPLICATION',
+                                 option={'chip_erase_mode': 'ERASE_UICR',
+                                         'qspi_erase_mode': 'ERASE_NONE'})
                 core = 'NRFDL_DEVICE_CORE_APPLICATION'
             elif cpurad:
+                if not self.erase and self.build_conf.getboolean('CONFIG_NRF_REGTOOL_GENERATE_UICR'):
+                    self.exec_op('erase', core='NRFDL_DEVICE_CORE_NETWORK',
+                                 option={'chip_erase_mode': 'ERASE_UICR',
+                                         'qspi_erase_mode': 'ERASE_NONE'})
                 core = 'NRFDL_DEVICE_CORE_NETWORK'
         else:
             if self.erase:

From 3fc2be977f17916a9b8fbf3ba5cb27a35fd1d457 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Sat, 14 Dec 2024 23:05:32 +0100
Subject: [PATCH 0926/2913] Revert "[nrf fromlist] drivers: clock_control: nrf:
 Add helper macro for getting clock frequency"

This reverts commit 91c801c3cad1c52c1f21b477171a33dbf87e0668.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 .../drivers/clock_control/nrf_clock_control.h | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/include/zephyr/drivers/clock_control/nrf_clock_control.h b/include/zephyr/drivers/clock_control/nrf_clock_control.h
index 7b660c104a7..2578feffd2b 100644
--- a/include/zephyr/drivers/clock_control/nrf_clock_control.h
+++ b/include/zephyr/drivers/clock_control/nrf_clock_control.h
@@ -319,25 +319,6 @@ int nrf_clock_control_cancel_or_release(const struct device *dev,
 
 #endif /* defined(CONFIG_CLOCK_CONTROL_NRF2) */
 
-/** @brief Get clock frequency that is used for the given node.
- *
- * Macro checks if node has clock property and if yes then if clock has clock_frequency property
- * then it is returned. If it has supported_clock_frequency property with the list of supported
- * frequencies then the last one is returned with assumption that they are ordered and the last
- * one is the highest. If node does not have clock then 16 MHz is returned which is the default
- * frequency.
- *
- * @param node Devicetree node.
- *
- * @return Frequency of the clock that is used for the node.
- */
-#define NRF_PERIPH_GET_FREQUENCY(node) \
-	COND_CODE_1(DT_CLOCKS_HAS_IDX(node, 0),							\
-		(COND_CODE_1(DT_NODE_HAS_PROP(DT_CLOCKS_CTLR(node), clock_frequency),		\
-			     (DT_PROP(DT_CLOCKS_CTLR(node), clock_frequency)),			\
-			     (DT_PROP_LAST(DT_CLOCKS_CTLR(node), supported_clock_frequency)))),	\
-		(NRFX_MHZ_TO_HZ(16)))
-
 #ifdef __cplusplus
 }
 #endif

From 36a1e64bc8414029324cb4e8a4828c13c170f3fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 11 Dec 2024 12:55:57 +0100
Subject: [PATCH 0927/2913] [nrf fromlist] drivers: clock_control: nrf: Add
 helper macro for getting clock frequency
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add NRF_PERIPH_GET_FREQUENCY() that returns the frequency of clock
that is used for the node.

Upstream PR #: 82133

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 .../drivers/clock_control/nrf_clock_control.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/include/zephyr/drivers/clock_control/nrf_clock_control.h b/include/zephyr/drivers/clock_control/nrf_clock_control.h
index 2578feffd2b..27ab518920f 100644
--- a/include/zephyr/drivers/clock_control/nrf_clock_control.h
+++ b/include/zephyr/drivers/clock_control/nrf_clock_control.h
@@ -319,6 +319,25 @@ int nrf_clock_control_cancel_or_release(const struct device *dev,
 
 #endif /* defined(CONFIG_CLOCK_CONTROL_NRF2) */
 
+/** @brief Get clock frequency that is used for the given node.
+ *
+ * Macro checks if node has clock property and if yes then if clock has clock_frequency property
+ * then it is returned. If it has supported_clock_frequency property with the list of supported
+ * frequencies then the last one is returned with assumption that they are ordered and the last
+ * one is the highest. If node does not have clock then 16 MHz is returned which is the default
+ * frequency.
+ *
+ * @param node Devicetree node.
+ *
+ * @return Frequency of the clock that is used for the node.
+ */
+#define NRF_PERIPH_GET_FREQUENCY(node) \
+	COND_CODE_1(DT_CLOCKS_HAS_IDX(node, 0),							\
+		(COND_CODE_1(DT_NODE_HAS_PROP(DT_CLOCKS_CTLR(node), clock_frequency),		\
+			     (DT_PROP(DT_CLOCKS_CTLR(node), clock_frequency)),			\
+			     (DT_PROP_LAST(DT_CLOCKS_CTLR(node), supported_clock_frequency)))),	\
+		(DT_PROP_OR(node, max_frequency, NRFX_MHZ_TO_HZ(16))))
+
 #ifdef __cplusplus
 }
 #endif

From 3ac589333c60c8291217d2a78c8d7af6090653ae Mon Sep 17 00:00:00 2001
From: Phi Bang Nguyen <phibang.nguyen@nxp.com>
Date: Tue, 15 Oct 2024 22:46:00 +0200
Subject: [PATCH 0928/2913] [nrf fromtree] runners: jlink: Fix NoneType object
 error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The commit 221199e15b85a070b3d81709eee3d533c9f99967 presents a bug that
makes west flash failed with error.

AttributeError: 'NoneType' object has no attribute 'startswith'

In function is_tunnel(), tunnel may contain None and has no attribute
"startswith". Fix it.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
Signed-off-by: Phi Bang Nguyen <phibang.nguyen@nxp.com>
(cherry picked from commit 829c03bcdca378fa2fa55484d16a190d379f754c)
---
 scripts/west_commands/runners/jlink.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/west_commands/runners/jlink.py b/scripts/west_commands/runners/jlink.py
index 535e2bec2b5..b3575d2377e 100644
--- a/scripts/west_commands/runners/jlink.py
+++ b/scripts/west_commands/runners/jlink.py
@@ -37,7 +37,7 @@ def is_ip(ip):
     return True
 
 def is_tunnel(tunnel):
-    return tunnel.startswith("tunnel:")
+    return tunnel.startswith("tunnel:") if tunnel else False
 
 class ToggleAction(argparse.Action):
 

From c87958cbdf1fd05ca7ca65827416116e170f6d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Sat, 14 Dec 2024 14:34:02 +0100
Subject: [PATCH 0929/2913] [nrf fromlist] drivers: clock_control_nrf2: Add
 missing cancelation of request
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a follow-up to commit fe0e2dbc6044ffa74b27bfcba335980bc5a6ae64.

If `nrf_clock_control_request_sync()` ends up with a timeout, before
returning it must cancel the request that was not fulfilled on time.
Otherwise, the request may actually finish succesfully a bit later,
but the caller will not be aware that the clock needs to be released
(since the call resulted in an error).

Upstream PR #: 82994

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/clock_control/clock_control_nrf2_common.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/clock_control/clock_control_nrf2_common.c b/drivers/clock_control/clock_control_nrf2_common.c
index 7bf8576880b..ba576ccbb6c 100644
--- a/drivers/clock_control/clock_control_nrf2_common.c
+++ b/drivers/clock_control/clock_control_nrf2_common.c
@@ -198,6 +198,7 @@ int nrf_clock_control_request_sync(const struct device *dev,
 
 	err = k_sem_take(&req.sem, timeout);
 	if (err < 0) {
+		nrf_clock_control_cancel_or_release(dev, spec, &req.cli);
 		return err;
 	}
 

From 1f1d72d9b69901519c9c8d75569aae293a32e6c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Sat, 14 Dec 2024 15:30:27 +0100
Subject: [PATCH 0930/2913] [nrf fromlist] dts: nrf54h20: Add clocks property
 in fast SPIM nodes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fast SPIM instances in nRF54H20 (SPIM120 and SPIM121) are driven by
the global HSFLL (HSFLL120). Add `clocks` property in these nodes
to reflect this.

Upstream PR #: 82994

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/common/nordic/nrf54h20.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 790785ebaaa..a6b32ffdf89 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -657,6 +657,7 @@
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				easydma-maxcnt-bits = <15>;
 				interrupts = <230 NRF_DEFAULT_IRQ_PRIORITY>;
+				clocks = <&hsfll120>;
 				max-frequency = <DT_FREQ_M(32)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -683,6 +684,7 @@
 				status = "disabled";
 				easydma-maxcnt-bits = <15>;
 				interrupts = <231 NRF_DEFAULT_IRQ_PRIORITY>;
+				clocks = <&hsfll120>;
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				max-frequency = <DT_FREQ_M(32)>;
 				#address-cells = <1>;

From 43b638fd345eb5958923053655c483fff5cdab1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Sat, 14 Dec 2024 15:35:55 +0100
Subject: [PATCH 0931/2913] [nrf fromlist] drivers: spi_nrfx_spim: Add clock
 requests for fast SPIM instances
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fast SPIM instances (SPIM120 and SPIM121) for correct operation require
the highest frequency from the global HSFLL. This commit adds needed
clock controller requests to the driver. When the runtime device power
management is enabled, the frequency is requested as long as the SPIM
is resumed, otherwise it is requested for the duration of transfers.

Upstream PR #: 82994

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/spi/spi_nrfx_spim.c | 101 ++++++++++++++++++++++++++++++++++--
 1 file changed, 98 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c
index 11ba2e584a1..47c682a6939 100644
--- a/drivers/spi/spi_nrfx_spim.c
+++ b/drivers/spi/spi_nrfx_spim.c
@@ -9,6 +9,7 @@
 #include <zephyr/cache.h>
 #include <zephyr/pm/device.h>
 #include <zephyr/pm/device_runtime.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
 #include <soc.h>
@@ -42,6 +43,16 @@ LOG_MODULE_REGISTER(spi_nrfx_spim, CONFIG_SPI_LOG_LEVEL);
 #define SPI_BUFFER_IN_RAM 1
 #endif
 
+#if defined(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL) && \
+	(defined(CONFIG_HAS_HW_NRF_SPIM120) || \
+	 defined(CONFIG_HAS_HW_NRF_SPIM121))
+#define SPIM_REQUESTS_CLOCK(idx) UTIL_OR(IS_EQ(idx, 120), \
+					 IS_EQ(idx, 121))
+#define USE_CLOCK_REQUESTS 1
+#else
+#define SPIM_REQUESTS_CLOCK(idx) 0
+#endif
+
 struct spi_nrfx_data {
 	struct spi_context ctx;
 	const struct device *dev;
@@ -57,6 +68,9 @@ struct spi_nrfx_data {
 	uint8_t ppi_ch;
 	uint8_t gpiote_ch;
 #endif
+#ifdef USE_CLOCK_REQUESTS
+	bool clock_requested;
+#endif
 };
 
 struct spi_nrfx_config {
@@ -74,10 +88,55 @@ struct spi_nrfx_config {
 #ifdef CONFIG_DCACHE
 	uint32_t mem_attr;
 #endif
+#ifdef USE_CLOCK_REQUESTS
+	const struct device *clk_dev;
+	struct nrf_clock_spec clk_spec;
+#endif
 };
 
 static void event_handler(const nrfx_spim_evt_t *p_event, void *p_context);
 
+static inline int request_clock(const struct device *dev)
+{
+#ifdef USE_CLOCK_REQUESTS
+	struct spi_nrfx_data *dev_data = dev->data;
+	const struct spi_nrfx_config *dev_config = dev->config;
+	int error;
+
+	if (!dev_config->clk_dev) {
+		return 0;
+	}
+
+	error = nrf_clock_control_request_sync(
+			dev_config->clk_dev, &dev_config->clk_spec,
+			K_MSEC(CONFIG_SPI_COMPLETION_TIMEOUT_TOLERANCE));
+	if (error < 0) {
+		LOG_ERR("Failed to request clock: %d", error);
+		return error;
+	}
+
+	dev_data->clock_requested = true;
+#endif
+
+	return 0;
+}
+
+static inline void release_clock(const struct device *dev)
+{
+#ifdef USE_CLOCK_REQUESTS
+	struct spi_nrfx_data *dev_data = dev->data;
+	const struct spi_nrfx_config *dev_config = dev->config;
+
+	if (!dev_data->clock_requested) {
+		return;
+	}
+
+	dev_data->clock_requested = false;
+
+	nrf_clock_control_release(dev_config->clk_dev, &dev_config->clk_spec);
+#endif
+}
+
 static inline void finalize_spi_transaction(const struct device *dev, bool deactivate_cs)
 {
 	struct spi_nrfx_data *dev_data = dev->data;
@@ -92,6 +151,10 @@ static inline void finalize_spi_transaction(const struct device *dev, bool deact
 		nrfy_spim_disable(reg);
 	}
 
+	if (!IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		release_clock(dev);
+	}
+
 	pm_device_runtime_put_async(dev, K_NO_WAIT);
 }
 
@@ -467,6 +530,11 @@ static int transceive(const struct device *dev,
 	spi_context_lock(&dev_data->ctx, asynchronous, cb, userdata, spi_cfg);
 
 	error = configure(dev, spi_cfg);
+
+	if (error == 0 && !IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		error = request_clock(dev);
+	}
+
 	if (error == 0) {
 		dev_data->busy = true;
 
@@ -518,6 +586,8 @@ static int transceive(const struct device *dev,
 		} else if (error) {
 			finalize_spi_transaction(dev, true);
 		}
+	} else {
+		pm_device_runtime_put(dev);
 	}
 
 	spi_context_release(&dev_data->ctx, error);
@@ -575,7 +645,7 @@ static const struct spi_driver_api spi_nrfx_driver_api = {
 	.release = spi_nrfx_release,
 };
 
-static void spim_resume(const struct device *dev)
+static int spim_resume(const struct device *dev)
 {
 	const struct spi_nrfx_config *dev_config = dev->config;
 
@@ -587,6 +657,8 @@ static void spim_resume(const struct device *dev)
 #ifdef CONFIG_SOC_NRF54H20_GPD
 	nrf_gpd_retain_pins_set(dev_config->pcfg, false);
 #endif
+
+	return IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) ? request_clock(dev) : 0;
 }
 
 static void spim_suspend(const struct device *dev)
@@ -599,6 +671,10 @@ static void spim_suspend(const struct device *dev)
 		dev_data->initialized = false;
 	}
 
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		release_clock(dev);
+	}
+
 #ifdef CONFIG_SOC_NRF54H20_GPD
 	nrf_gpd_retain_pins_set(dev_config->pcfg, true);
 #endif
@@ -609,7 +685,11 @@ static void spim_suspend(const struct device *dev)
 static int spim_nrfx_pm_action(const struct device *dev, enum pm_device_action action)
 {
 	if (action == PM_DEVICE_ACTION_RESUME) {
-		spim_resume(dev);
+		int error = spim_resume(dev);
+
+		if (error < 0) {
+			return error;
+		}
 	} else if (IS_ENABLED(CONFIG_PM_DEVICE) && (action == PM_DEVICE_ACTION_SUSPEND)) {
 		spim_suspend(dev);
 	} else {
@@ -685,6 +765,14 @@ static int spi_nrfx_init(const struct device *dev)
 			(0))),								 \
 		(0))
 
+#define SPIM_INIT_LEVEL(idx) \
+	COND_CODE_1(SPIM_REQUESTS_CLOCK(idx), (POST_KERNEL), (PRE_KERNEL_1))
+
+#define SPIM_INIT_PRIO(idx) \
+	COND_CODE_1(SPIM_REQUESTS_CLOCK(idx), \
+		(UTIL_INC(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_INIT_PRIORITY)), \
+		(CONFIG_SPI_INIT_PRIORITY))
+
 #define SPI_NRFX_SPIM_DEFINE(idx)					       \
 	NRF_DT_CHECK_NODE_HAS_PINCTRL_SLEEP(SPIM(idx));			       \
 	static void irq_connect##idx(void)				       \
@@ -735,6 +823,13 @@ static int spi_nrfx_init(const struct device *dev)
 		.wake_gpiote = WAKE_GPIOTE_INSTANCE(SPIM(idx)),		       \
 		IF_ENABLED(CONFIG_DCACHE,				       \
 			(.mem_attr = SPIM_GET_MEM_ATTR(idx),))		       \
+		IF_ENABLED(USE_CLOCK_REQUESTS,			       \
+			(.clk_dev = SPIM_REQUESTS_CLOCK(idx)		       \
+				  ? DEVICE_DT_GET(DT_CLOCKS_CTLR(SPIM(idx)))   \
+				  : NULL,				       \
+			 .clk_spec = {					       \
+				.frequency = NRF_CLOCK_CONTROL_FREQUENCY_MAX,  \
+			 },))						       \
 	};								       \
 	BUILD_ASSERT(!SPIM_HAS_PROP(idx, wake_gpios) ||			       \
 		     !(DT_GPIO_FLAGS(SPIM(idx), wake_gpios) & GPIO_ACTIVE_LOW),\
@@ -745,7 +840,7 @@ static int spi_nrfx_init(const struct device *dev)
 		      PM_DEVICE_DT_GET(SPIM(idx)),			       \
 		      &spi_##idx##_data,				       \
 		      &spi_##idx##z_config,				       \
-		      POST_KERNEL, CONFIG_SPI_INIT_PRIORITY,		       \
+		      SPIM_INIT_LEVEL(idx), SPIM_INIT_PRIO(idx),	       \
 		      &spi_nrfx_driver_api)
 
 #define SPIM_MEMORY_SECTION(idx)					       \

From 8834ca9820f9fe968f2d38de598cd3f691759473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Fri, 11 Oct 2024 12:45:09 +0200
Subject: [PATCH 0932/2913] [nrf fromtree] tests: boards: nrf: coresight_stm:
 Add performance test for STM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extend STM testing with verification whether STM benchmark
results are below predefined thresholds.
Set thresholds arbitrarily.

Add tests that allow code coverage calculation.

Upstream PR #: 79000

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 29208fe7c45c43997c5099718958f3535f33465b)
---
 .../boards/nordic/coresight_stm/src/main.c    |   2 +
 tests/boards/nrf/coresight_stm/CMakeLists.txt |  17 +
 .../boards/nrf/coresight_stm/Kconfig.sysbuild |  11 +
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  16 +
 tests/boards/nrf/coresight_stm/prj.conf       |   1 +
 .../nrf/coresight_stm/pytest/test_stm.py      | 347 ++++++++++++++++++
 .../nrf/coresight_stm/remote/CMakeLists.txt   |  12 +
 .../boards/nrf/coresight_stm/remote/prj.conf  |   6 +
 tests/boards/nrf/coresight_stm/sysbuild.cmake |  28 ++
 tests/boards/nrf/coresight_stm/testcase.yaml  |  85 +++++
 10 files changed, 525 insertions(+)
 create mode 100644 tests/boards/nrf/coresight_stm/CMakeLists.txt
 create mode 100644 tests/boards/nrf/coresight_stm/Kconfig.sysbuild
 create mode 100644 tests/boards/nrf/coresight_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/boards/nrf/coresight_stm/prj.conf
 create mode 100644 tests/boards/nrf/coresight_stm/pytest/test_stm.py
 create mode 100644 tests/boards/nrf/coresight_stm/remote/CMakeLists.txt
 create mode 100644 tests/boards/nrf/coresight_stm/remote/prj.conf
 create mode 100644 tests/boards/nrf/coresight_stm/sysbuild.cmake
 create mode 100644 tests/boards/nrf/coresight_stm/testcase.yaml

diff --git a/samples/boards/nordic/coresight_stm/src/main.c b/samples/boards/nordic/coresight_stm/src/main.c
index 221633d8638..b788d4fc15d 100644
--- a/samples/boards/nordic/coresight_stm/src/main.c
+++ b/samples/boards/nordic/coresight_stm/src/main.c
@@ -103,5 +103,7 @@ int main(void)
 	timing_report(t_tpd, rpt_tp, "tracepoint_d32");
 #endif
 
+	/* Needed in coverage run to separate STM logs from printk() */
+	k_msleep(400);
 	return 0;
 }
diff --git a/tests/boards/nrf/coresight_stm/CMakeLists.txt b/tests/boards/nrf/coresight_stm/CMakeLists.txt
new file mode 100644
index 00000000000..4450feefea0
--- /dev/null
+++ b/tests/boards/nrf/coresight_stm/CMakeLists.txt
@@ -0,0 +1,17 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+if(NOT (CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP))
+  message(FATAL_ERROR "${BOARD}${BOARD_QUALIFIERS} is not supported for this sample")
+endif()
+
+project(nrf_coresight_stm)
+
+target_sources(app PRIVATE $ENV{ZEPHYR_BASE}/samples/boards/nordic/coresight_stm/src/main.c)
diff --git a/tests/boards/nrf/coresight_stm/Kconfig.sysbuild b/tests/boards/nrf/coresight_stm/Kconfig.sysbuild
new file mode 100644
index 00000000000..3e4ddeaa515
--- /dev/null
+++ b/tests/boards/nrf/coresight_stm/Kconfig.sysbuild
@@ -0,0 +1,11 @@
+# Copyright 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+
+source "share/sysbuild/Kconfig"
+
+config APP_CPUPPR_RUN
+	bool "Use PPR"
+
+config APP_CPUFLPR_RUN
+	bool "Use FLPR"
diff --git a/tests/boards/nrf/coresight_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/boards/nrf/coresight_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..bf5ba18d204
--- /dev/null
+++ b/tests/boards/nrf/coresight_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&cpuppr_vpr {
+	status = "okay";
+};
+
+&cpuppr_ram3x_region {
+	status = "okay";
+};
+
+&cpuflpr_vpr {
+	status = "okay";
+};
diff --git a/tests/boards/nrf/coresight_stm/prj.conf b/tests/boards/nrf/coresight_stm/prj.conf
new file mode 100644
index 00000000000..1e935e973c7
--- /dev/null
+++ b/tests/boards/nrf/coresight_stm/prj.conf
@@ -0,0 +1 @@
+CONFIG_LOG=y
diff --git a/tests/boards/nrf/coresight_stm/pytest/test_stm.py b/tests/boards/nrf/coresight_stm/pytest/test_stm.py
new file mode 100644
index 00000000000..7131d8f38bb
--- /dev/null
+++ b/tests/boards/nrf/coresight_stm/pytest/test_stm.py
@@ -0,0 +1,347 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+import logging
+import re
+import subprocess
+from dataclasses import dataclass
+from pathlib import Path
+from time import sleep
+
+import psutil
+from twister_harness import DeviceAdapter
+
+logger = logging.getLogger(__name__)
+
+
+SB_CONFIG_APP_CPUPPR_RUN = None
+SB_CONFIG_APP_CPUFLPR_RUN = None
+
+# See definition of stm_m_id[] and stm_m_name[] in
+# https://github.com/zephyrproject-rtos/zephyr/blob/main/drivers/misc/coresight/nrf_etr.c
+STM_M_ID = {
+    "sec": 33,
+    "app": 34,
+    "rad": 35,
+    "mod": 36,
+    "sys": 44,
+    "flpr": 45,
+    "ppr": 46,
+    "hw": 128,
+}
+
+
+@dataclass
+class STMLimits:
+    log_0_arg: float | None
+    log_1_arg: float | None
+    log_2_arg: float | None
+    log_3_arg: float | None
+    log_str: float | None
+    tracepoint: float | None
+    tracepoint_d32: float | None
+    tolerance: float | None
+
+
+def _analyse_autoconf(filepath: str) -> None:
+    global SB_CONFIG_APP_CPUPPR_RUN
+    global SB_CONFIG_APP_CPUFLPR_RUN
+
+    SB_CONFIG_APP_CPUPPR_RUN = False
+    SB_CONFIG_APP_CPUFLPR_RUN = False
+
+    # Parse contents of {BUILD_DIR}/_sysbuild/autoconf.h
+    with open(f"{filepath}", errors="ignore") as autoconf:
+        for line in autoconf:
+            if "SB_CONFIG_APP_CPUPPR_RUN 1" in line:
+                SB_CONFIG_APP_CPUPPR_RUN = True
+                continue
+            if "SB_CONFIG_APP_CPUFLPR_RUN 1" in line:
+                SB_CONFIG_APP_CPUFLPR_RUN = True
+    logger.debug(f"{SB_CONFIG_APP_CPUPPR_RUN=}")
+    logger.debug(f"{SB_CONFIG_APP_CPUFLPR_RUN=}")
+
+
+def _check_benchmark_results(output: str, core: str, constraints: STMLimits) -> None:
+    """
+    Use regular expressions to parse 'output' string.
+    Search for benchmark results related to 'core' coprocessor.
+    Check that benchamrk results are lower than limits provided in 'constraints'.
+    """
+
+    cfg = {
+        "log message with 0 arguments": {
+            "regex": rf"{core}: Timing for log message with 0 arguments: (.+)us",
+            "expected": constraints.log_0_arg,
+        },
+        "log message with 1 argument": {
+            "regex": rf"{core}: Timing for log message with 1 argument: (.+)us",
+            "expected": constraints.log_1_arg,
+        },
+        "log message with 2 arguments": {
+            "regex": rf"{core}: Timing for log message with 2 arguments: (.+)us",
+            "expected": constraints.log_2_arg,
+        },
+        "log message with 3 arguments": {
+            "regex": rf"{core}: Timing for log message with 3 arguments: (.+)us",
+            "expected": constraints.log_3_arg,
+        },
+        "log message with string": {
+            "regex": rf"{core}: Timing for log_message with string: (.+)us",
+            "expected": constraints.log_str,
+        },
+        "tracepoint": {
+            "regex": rf"{core}: Timing for tracepoint: (.+)us",
+            "expected": constraints.tracepoint,
+        },
+        "tracepoint_d32": {
+            "regex": rf"{core}: Timing for tracepoint_d32: (.+)us",
+            "expected": constraints.tracepoint_d32,
+        },
+    }
+
+    for check in cfg:
+        observed_str = re.search(cfg[check]["regex"], output).group(1)
+        assert observed_str is not None, f"Timing for {check} NOT found"
+        # check value
+        observed = float(observed_str)
+        threshold = cfg[check]["expected"] * (1 + constraints.tolerance)
+        assert (
+            observed < threshold
+        ), f"{core}: Timing for {check} - {observed} us exceeds {threshold} us"
+
+
+# nrfutil starts children processes
+# when subprocess.terminate(nrfutil_process) is executed, only the parent terminates
+# this blocks serial port for other uses
+def _kill(proc):
+    try:
+        for child in psutil.Process(proc.pid).children(recursive=True):
+            child.kill()
+        proc.kill()
+    except Exception as e:
+        logger.exception(f'Could not kill nrfutil - {e}')
+
+
+def _nrfutil_dictionary_from_serial(
+    dut: DeviceAdapter,
+    decoded_file_name: str = "output.txt",
+    collect_time: float = 60.0,
+) -> None:
+    UART_PATH = dut.device_config.serial
+    UART_BAUDRATE = dut.device_config.baud
+    dut.close()
+
+    logger.debug(f"Using serial: {UART_PATH}")
+
+    if Path(f"{decoded_file_name}").exists():
+        logger.warning("Output file already exists!")
+
+    # prepare database config string
+    BUILD_DIR = str(dut.device_config.build_dir)
+    logger.debug(f"{BUILD_DIR=}")
+    config_str = f"{STM_M_ID['app']}:{BUILD_DIR}/coresight_stm/zephyr/log_dictionary.json"
+    config_str += f",{STM_M_ID['rad']}:{BUILD_DIR}/remote_rad/zephyr/log_dictionary.json"
+    if SB_CONFIG_APP_CPUPPR_RUN:
+        config_str += f",{STM_M_ID['ppr']}:{BUILD_DIR}/remote_ppr/zephyr/log_dictionary.json"
+    if SB_CONFIG_APP_CPUFLPR_RUN:
+        config_str += f",{STM_M_ID['flpr']}:{BUILD_DIR}/remote_flpr/zephyr/log_dictionary.json"
+    logger.debug(f"{config_str=}")
+
+    cmd = (
+        "nrfutil trace stm --database-config "
+        f"{config_str} "
+        f"--input-serialport {UART_PATH} --baudrate {UART_BAUDRATE} "
+        f"--output-ascii {decoded_file_name}"
+    )
+    try:
+        # run nrfutil trace in background non-blocking
+        logger.info(f"Executing:\n{cmd}")
+        proc = subprocess.Popen(cmd.split(), stdout=subprocess.DEVNULL)
+    except OSError as exc:
+        logger.error(f"Unable to start nrfutil trace:\n{cmd}\n{exc}")
+    try:
+        proc.wait(collect_time)
+    except subprocess.TimeoutExpired:
+        pass
+    finally:
+        _kill(proc)
+
+
+def test_STM_decoded(dut: DeviceAdapter):
+    """
+    Run sample.boards.nrf.coresight_stm from samples/boards/nrf/coresight_stm sample.
+    Both Application and Radio cores use STM for logging.
+    STM proxy (Application core) decodes logs from all domains.
+    After reset, coprocessors execute code in expected way and Application core
+    outputs STM traces on UART port.
+    """
+    BUILD_DIR = str(dut.device_config.build_dir)
+    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
+
+    app_constraints = STMLimits(
+        # all values in us
+        log_0_arg=1.8,
+        log_1_arg=2.1,
+        log_2_arg=2.0,
+        log_3_arg=2.1,
+        log_str=4.5,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,  # 50 %
+    )
+    rad_constraints = STMLimits(
+        # all values in us
+        log_0_arg=4.6,
+        log_1_arg=5.0,
+        log_2_arg=5.2,
+        log_3_arg=5.6,
+        log_str=6.3,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,
+    )
+    ppr_constraints = STMLimits(
+        # all values in us
+        log_0_arg=25.7,
+        log_1_arg=27.1,
+        log_2_arg=27.3,
+        log_3_arg=30.4,
+        log_str=65.7,
+        tracepoint=0.55,
+        tracepoint_d32=0.25,
+        tolerance=0.5,
+    )
+    flpr_constraints = STMLimits(
+        # all values in us
+        log_0_arg=1.3,
+        log_1_arg=1.6,
+        log_2_arg=1.6,
+        log_3_arg=1.7,
+        log_str=3.0,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,
+    )
+    # nrf54h20 prints immediately after it is flashed.
+    # Wait a bit to skipp logs from previous test.
+    sleep(6)
+
+    # Get output from serial port
+    output = "\n".join(dut.readlines())
+
+    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
+    _analyse_autoconf(autoconf_file)
+
+    # check results on Application core
+    _check_benchmark_results(output=output, core='app', constraints=app_constraints)
+
+    # check results on Radio core
+    _check_benchmark_results(output=output, core='rad', constraints=rad_constraints)
+
+    if SB_CONFIG_APP_CPUPPR_RUN:
+        # check results on PPR core
+        _check_benchmark_results(output=output, core='ppr', constraints=ppr_constraints)
+
+    if SB_CONFIG_APP_CPUFLPR_RUN:
+        # check results on FLPR core
+        _check_benchmark_results(output=output, core='flpr', constraints=flpr_constraints)
+
+
+def test_STM_dictionary_mode(dut: DeviceAdapter):
+    """
+    Run sample.boards.nrf.coresight_stm.dict from samples/boards/nrf/coresight_stm sample.
+    Both Application and Radio cores use STM for logging.
+    STM proxy (Application core) prints on serial port raw logs from all domains.
+    Nrfutil trace is used to decode STM logs.
+    After reset, coprocessors execute code in expected way and Application core
+    outputs STM traces on UART port.
+    """
+    BUILD_DIR = str(dut.device_config.build_dir)
+    test_filename = f"{BUILD_DIR}/coresight_stm_dictionary.txt"
+    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
+    COLLECT_TIMEOUT = 10.0
+
+    app_constraints = STMLimits(
+        # all values in us
+        log_0_arg=0.7,
+        log_1_arg=0.8,
+        log_2_arg=0.8,
+        log_3_arg=1.3,
+        log_str=3.2,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,  # 50 %
+    )
+    rad_constraints = STMLimits(
+        # all values in us
+        log_0_arg=0.8,
+        log_1_arg=0.9,
+        log_2_arg=1.0,
+        log_3_arg=1.5,
+        log_str=3.6,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,
+    )
+    ppr_constraints = STMLimits(
+        # all values in us
+        log_0_arg=7.5,
+        log_1_arg=8.5,
+        log_2_arg=8.6,
+        log_3_arg=17.4,
+        log_str=45.2,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,
+    )
+    flpr_constraints = STMLimits(
+        # all values in us
+        log_0_arg=0.3,
+        log_1_arg=0.4,
+        log_2_arg=0.5,
+        log_3_arg=0.8,
+        log_str=2.6,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,  # 50 %
+    )
+
+    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
+    # this information is needed to build nrfutil database-config
+    _analyse_autoconf(autoconf_file)
+
+    # use nrfutil trace to decode logs
+    _nrfutil_dictionary_from_serial(
+        dut=dut,
+        decoded_file_name=f"{test_filename}",
+        collect_time=COLLECT_TIMEOUT,
+    )
+
+    # read decoded logs
+    with open(f"{test_filename}", errors="ignore") as decoded_file:
+        decoded_file_content = decoded_file.read()
+
+    # if nothing in decoded_file, stop test
+    assert len(decoded_file_content) > 0, f"File {test_filename} is empty"
+
+    # check results on Application core
+    _check_benchmark_results(output=decoded_file_content, core='app', constraints=app_constraints)
+
+    # check results on Radio core
+    _check_benchmark_results(output=decoded_file_content, core='rad', constraints=rad_constraints)
+
+    if SB_CONFIG_APP_CPUPPR_RUN:
+        # check results on PPR core
+        _check_benchmark_results(
+            output=decoded_file_content, core='ppr', constraints=ppr_constraints
+        )
+
+    if SB_CONFIG_APP_CPUFLPR_RUN:
+        # check results on FLPR core
+        _check_benchmark_results(
+            output=decoded_file_content, core='flpr', constraints=flpr_constraints
+        )
diff --git a/tests/boards/nrf/coresight_stm/remote/CMakeLists.txt b/tests/boards/nrf/coresight_stm/remote/CMakeLists.txt
new file mode 100644
index 00000000000..a59a9afc77e
--- /dev/null
+++ b/tests/boards/nrf/coresight_stm/remote/CMakeLists.txt
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(nrf_coresight_stm)
+
+target_sources(app PRIVATE $ENV{ZEPHYR_BASE}/samples/boards/nordic/coresight_stm/src/main.c)
diff --git a/tests/boards/nrf/coresight_stm/remote/prj.conf b/tests/boards/nrf/coresight_stm/remote/prj.conf
new file mode 100644
index 00000000000..5bea9f4760e
--- /dev/null
+++ b/tests/boards/nrf/coresight_stm/remote/prj.conf
@@ -0,0 +1,6 @@
+CONFIG_LOG=y
+CONFIG_CONSOLE=n
+CONFIG_UART_CONSOLE=n
+CONFIG_SERIAL=n
+CONFIG_BOOT_BANNER=n
+CONFIG_PRINTK=n
diff --git a/tests/boards/nrf/coresight_stm/sysbuild.cmake b/tests/boards/nrf/coresight_stm/sysbuild.cmake
new file mode 100644
index 00000000000..89ccbcf1343
--- /dev/null
+++ b/tests/boards/nrf/coresight_stm/sysbuild.cmake
@@ -0,0 +1,28 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+set(REMOTE_APP remote)
+
+ExternalZephyrProject_Add(
+	APPLICATION ${REMOTE_APP}_rad
+	SOURCE_DIR  ${APP_DIR}/${REMOTE_APP}
+	BOARD ${SB_CONFIG_BOARD}/${SB_CONFIG_SOC}/cpurad
+)
+
+# There are sample configurations which do not use PPR.
+if(SB_CONFIG_APP_CPUPPR_RUN)
+	ExternalZephyrProject_Add(
+		APPLICATION ${REMOTE_APP}_ppr
+		SOURCE_DIR  ${APP_DIR}/${REMOTE_APP}
+		BOARD ${SB_CONFIG_BOARD}/${SB_CONFIG_SOC}/cpuppr
+	)
+endif()
+
+# There are sample configurations which do not use FLPR.
+if(SB_CONFIG_APP_CPUFLPR_RUN)
+	ExternalZephyrProject_Add(
+		APPLICATION ${REMOTE_APP}_flpr
+		SOURCE_DIR  ${APP_DIR}/${REMOTE_APP}
+		BOARD ${SB_CONFIG_BOARD}/${SB_CONFIG_SOC}/cpuflpr
+	)
+endif()
diff --git a/tests/boards/nrf/coresight_stm/testcase.yaml b/tests/boards/nrf/coresight_stm/testcase.yaml
new file mode 100644
index 00000000000..1b496c9b8c7
--- /dev/null
+++ b/tests/boards/nrf/coresight_stm/testcase.yaml
@@ -0,0 +1,85 @@
+sample:
+  name: Logging using Coresight STM on nrf54h20
+
+common:
+  tags: stm
+  sysbuild: true
+  platform_allow:
+    - nrf54h20dk/nrf54h20/cpuapp
+  integration_platforms:
+    - nrf54h20dk/nrf54h20/cpuapp
+
+tests:
+  boards.nrf.coresight_stm.dict:
+    filter: not CONFIG_COVERAGE
+    harness: pytest
+    harness_config:
+      pytest_dut_scope: session
+      pytest_root:
+        - "pytest/test_stm.py::test_STM_dictionary_mode"
+    required_snippets:
+      - nordic-log-stm-dict
+    extra_args:
+      - SB_CONFIG_APP_CPUPPR_RUN=y
+      - SB_CONFIG_APP_CPUFLPR_RUN=y
+
+  boards.nrf.coresight_stm:
+    filter: not CONFIG_COVERAGE
+    harness: pytest
+    harness_config:
+      pytest_dut_scope: session
+      pytest_root:
+        - "pytest/test_stm.py::test_STM_decoded"
+    required_snippets:
+      - nordic-log-stm
+    extra_args:
+      - SB_CONFIG_APP_CPUPPR_RUN=y
+      - SB_CONFIG_APP_CPUFLPR_RUN=y
+
+  boards.nrf.coresight_stm.dict.coverage:
+    filter: CONFIG_COVERAGE
+    harness: console
+    harness_config:
+      type: one_line
+      regex:
+        - "GCOV_COVERAGE_DUMP_END"
+    required_snippets:
+      - nordic-log-stm-dict
+    extra_args:
+      - SB_CONFIG_APP_CPUPPR_RUN=y
+      - SB_CONFIG_APP_CPUFLPR_RUN=n
+      - coresight_stm_CONFIG_LOG_PRINTK=n
+
+  boards.nrf.coresight_stm.coverage:
+    filter: CONFIG_COVERAGE
+    harness: console
+    harness_config:
+      type: multi_line
+      ordered: true
+      regex:
+        - "Timing for log message with 0 arguments:"
+        - "Timing for log message with 1 argument:"
+        - "Timing for log message with 2 arguments:"
+        - "Timing for log message with 3 arguments:"
+        - "Timing for log_message with string:"
+    required_snippets:
+      - nordic-log-stm
+    extra_args:
+      - SB_CONFIG_APP_CPUPPR_RUN=y
+      - SB_CONFIG_APP_CPUFLPR_RUN=n
+      - coresight_stm_CONFIG_LOG_PRINTK=n
+
+  boards.nrf.coresight_stm.local_uart.coverge:
+    filter: CONFIG_COVERAGE
+    harness: console
+    harness_config:
+      type: multi_line
+      ordered: true
+      regex:
+        - "Timing for log message with 0 arguments:"
+        - "Timing for log message with 1 argument:"
+        - "Timing for log message with 2 arguments:"
+        - "Timing for log message with 3 arguments:"
+        - "Timing for log_message with string:"
+    extra_args:
+      - CONFIG_LOG_MODE_IMMEDIATE=y

From 5f226edb3a3778ee9454b5db3ec4509a07bcaf5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Fri, 13 Dec 2024 09:18:17 +0100
Subject: [PATCH 0933/2913] Revert "[nrf noup] samples: bluetooth: update
 autoconf.h header path"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e94d330581af040f9e41e0590e6a4b999eccfaf4.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 samples/bluetooth/bap_unicast_client/src/stream_tx.c        | 2 +-
 samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c   | 2 +-
 samples/bluetooth/cap_acceptor/src/main.c                   | 2 +-
 samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c | 2 +-
 samples/bluetooth/cap_initiator/src/main.c                  | 2 +-
 soc/nordic/nrf54l/soc.c                                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/samples/bluetooth/bap_unicast_client/src/stream_tx.c b/samples/bluetooth/bap_unicast_client/src/stream_tx.c
index eba7273a0c6..06ea3a3c349 100644
--- a/samples/bluetooth/bap_unicast_client/src/stream_tx.c
+++ b/samples/bluetooth/bap_unicast_client/src/stream_tx.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/autoconf.h>
+#include <autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c b/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
index aad077a0aed..cbdb859eb8f 100644
--- a/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
+++ b/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
@@ -7,7 +7,7 @@
  *  SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/autoconf.h>
+#include <autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_acceptor/src/main.c b/samples/bluetooth/cap_acceptor/src/main.c
index df4600f09bb..6ca5f59282e 100644
--- a/samples/bluetooth/cap_acceptor/src/main.c
+++ b/samples/bluetooth/cap_acceptor/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/autoconf.h>
+#include <autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c b/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
index 60509beb258..39b7a68aef6 100644
--- a/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
+++ b/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/autoconf.h>
+#include <autoconf.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/samples/bluetooth/cap_initiator/src/main.c b/samples/bluetooth/cap_initiator/src/main.c
index 8eab76938bc..1b35ea7981f 100644
--- a/samples/bluetooth/cap_initiator/src/main.c
+++ b/samples/bluetooth/cap_initiator/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/autoconf.h>
+#include <autoconf.h>
 #include <stddef.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index 70528c2fd88..74a96c24f2e 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -13,7 +13,7 @@
  */
 
 #ifdef __NRF_TFM__
-#include <zephyr/autoconf.h>
+#include <autoconf.h>
 #endif
 
 #include <zephyr/devicetree.h>

From f7d57e0d224396f3ecda16a6fea176828bab249b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Fri, 13 Dec 2024 09:19:08 +0100
Subject: [PATCH 0934/2913] Revert "[nrf noup] soc: nordic: nrf54l Fix for wait
 lasting half expected time"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 382877e15f13507f40c73b385446987fc7ace57e.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 soc/nordic/nrf54l/soc.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index 74a96c24f2e..6905bd020f5 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -48,13 +48,6 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 #define HFXO_NODE DT_NODELABEL(hfxo)
 #endif
 
-/* Building for cpuflpr with ns uses cpu_1 instead of cpu_0 */
-#if DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
-#define DEVICE_DT_CLOCK_FREQ DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
-#elif DT_PROP(DT_PATH(cpus, cpu_1), clock_frequency)
-#define DEVICE_DT_CLOCK_FREQ DT_PROP(DT_PATH(cpus, cpu_1), clock_frequency)
-#endif
-
 #if defined(NRF_APPLICATION)
 static inline void power_and_clock_configuration(void)
 {
@@ -183,18 +176,16 @@ int nordicsemi_nrf54l_init(void)
 	/* Update the SystemCoreClock global variable with current core clock
 	 * retrieved from hardware state.
 	 */
+#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(__NRF_TFM__)
+	/* Currently not supported for non-secure */
+	SystemCoreClockUpdate();
+#endif
 
 #ifdef __NRF_TFM__
 	/* TF-M enables the instruction cache from target_cfg.c, so we
 	 * don't need to enable it here.
 	 */
 #else
-
-	/* Update SystemCoreClock in Zephyr based on device tree to avoid SystemCoreClock
-	 * being overwritten with default value when initializing with TF-M
-	 */
-	SystemCoreClock = DEVICE_DT_CLOCK_FREQ;
-
 	/* Enable ICACHE */
 	sys_cache_instr_enable();
 #endif

From 20fdf5e931cd60f1f9bbe445bc9214f43c7977a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Fri, 13 Dec 2024 09:19:13 +0100
Subject: [PATCH 0935/2913] Revert "[nrf noup] soc: nordic: nrf54l: Port Soc.c
 to be compatible with TFM"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ee23470a8947f4a98445b7543798e084fa8a6ff8.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 soc/nordic/nrf54l/soc.c | 65 ++++++++++-------------------------------
 1 file changed, 16 insertions(+), 49 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index 6905bd020f5..76749c1983a 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -12,21 +12,13 @@
  * for the Nordic Semiconductor nRF54L family processor.
  */
 
-#ifdef __NRF_TFM__
-#include <autoconf.h>
-#endif
-
 #include <zephyr/devicetree.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 #include <zephyr/kernel.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
-
-#ifndef __NRF_TFM__
 #include <zephyr/cache.h>
-#endif
-
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 #if defined(NRF_APPLICATION)
@@ -48,9 +40,17 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 #define HFXO_NODE DT_NODELABEL(hfxo)
 #endif
 
-#if defined(NRF_APPLICATION)
-static inline void power_and_clock_configuration(void)
+static int nordicsemi_nrf54l_init(void)
 {
+	/* Update the SystemCoreClock global variable with current core clock
+	 * retrieved from hardware state.
+	 */
+	SystemCoreClockUpdate();
+
+#if defined(NRF_APPLICATION)
+	/* Enable ICACHE */
+	sys_cache_instr_enable();
+
 #if DT_ENUM_HAS_VALUE(LFXO_NODE, load_capacitors, internal)
 	uint32_t xosc32ktrim = NRF_FICR->XOSC32KTRIM;
 
@@ -77,16 +77,16 @@ static inline void power_and_clock_configuration(void)
 	 * NOTE: The desired capacitance value is used in encoded from in INTCAP calculation formula
 	 *       That is different than in case of HFXO.
 	 */
-	uint32_t cap_val_encoded =
-		(((DT_PROP(LFXO_NODE, load_capacitance_femtofarad) - 4000UL) * 2UL) / 1000UL);
+	uint32_t cap_val_encoded = (((DT_PROP(LFXO_NODE, load_capacitance_femtofarad) - 4000UL)
+				     * 2UL) / 1000UL);
 
 	/* Calculation of INTCAP code before rounding. Min that calculations here are done on
 	 * values multiplied by 2^9, e.g. 0.765625 * 2^9 = 392.
 	 * offset_k should be divided by 2^6, but to add it to value shifted by 2^9 we have to
 	 * multiply it be 2^3.
 	 */
-	uint32_t mid_val =
-		(cap_val_encoded - 4UL) * (uint32_t)(slope_k + 392UL) + (offset_k << 3UL);
+	uint32_t mid_val = (cap_val_encoded - 4UL) * (uint32_t)(slope_k + 392UL)
+			   + (offset_k << 3UL);
 
 	/* Get integer part of the INTCAP code */
 	uint32_t lfxo_intcap = mid_val >> 9UL;
@@ -132,9 +132,8 @@ static inline void power_and_clock_configuration(void)
 	 */
 	uint32_t cap_val_femto_f = DT_PROP(HFXO_NODE, load_capacitance_femtofarad);
 
-	uint32_t mid_val_intcap = (((cap_val_femto_f - 5500UL) * (uint32_t)(slope_m + 791UL)) +
-				   (offset_m << 2UL) * 1000UL) >>
-				  8UL;
+	uint32_t mid_val_intcap = (((cap_val_femto_f - 5500UL) * (uint32_t)(slope_m + 791UL))
+		 + (offset_m << 2UL) * 1000UL) >> 8UL;
 
 	/* Convert the calculated value to piko Farads */
 	uint32_t hfxo_intcap = mid_val_intcap / 1000;
@@ -168,40 +167,8 @@ static inline void power_and_clock_configuration(void)
 #if defined(CONFIG_ELV_GRTC_LFXO_ALLOWED)
 	nrf_regulators_elv_mode_allow_set(NRF_REGULATORS, NRF_REGULATORS_ELV_ELVGRTCLFXO_MASK);
 #endif /* CONFIG_ELV_GRTC_LFXO_ALLOWED */
-}
 #endif /* NRF_APPLICATION */
 
-int nordicsemi_nrf54l_init(void)
-{
-	/* Update the SystemCoreClock global variable with current core clock
-	 * retrieved from hardware state.
-	 */
-#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(__NRF_TFM__)
-	/* Currently not supported for non-secure */
-	SystemCoreClockUpdate();
-#endif
-
-#ifdef __NRF_TFM__
-	/* TF-M enables the instruction cache from target_cfg.c, so we
-	 * don't need to enable it here.
-	 */
-#else
-	/* Enable ICACHE */
-	sys_cache_instr_enable();
-#endif
-
-	/* NRF_REGULATORS and NRF_OSCILLATORS are configured to be secure
-	 * as NRF_REGULATORS.POFCON is needed by the secure domain to
-	 * prevent glitches when the power supply is attacked.
-	 *
-	 * NRF_OSCILLATORS is also configured as secure because of a HW limitation
-	 * that requires them to be configured with the same security property.
-	 */
-#if (defined(NRF_APPLICATION) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)) ||                  \
-	defined(__NRF_TFM__)
-	power_and_clock_configuration();
-#endif
-
 	return 0;
 }
 

From 8594dc5cb1988a46a66924adbbd009468b7bdeae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Fri, 13 Dec 2024 09:19:51 +0100
Subject: [PATCH 0936/2913] Revert "[nrf noup] soc: nrf54l: Add custom section
 for KMU"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4279ea34588eb8a8339fbcb069a4e18039aac1d1.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 soc/nordic/nrf54l/CMakeLists.txt           |  9 ---------
 soc/nordic/nrf54l/kmu_push_area_section.ld | 19 -------------------
 2 files changed, 28 deletions(-)
 delete mode 100644 soc/nordic/nrf54l/kmu_push_area_section.ld

diff --git a/soc/nordic/nrf54l/CMakeLists.txt b/soc/nordic/nrf54l/CMakeLists.txt
index bf2eaa1d820..f1c18291fc6 100644
--- a/soc/nordic/nrf54l/CMakeLists.txt
+++ b/soc/nordic/nrf54l/CMakeLists.txt
@@ -10,12 +10,3 @@ zephyr_include_directories(.)
 if(CONFIG_ELV_GRTC_LFXO_ALLOWED)
   message(WARNING "WARNING! ELV mode feature is EXPERIMENTAL and may brick your device!")
 endif()
-
-# We need a buffer in memory in a static location which can be used by
-# the KMU peripheral. The KMU has a static destination address, we chose
-# this address to be 0x20000000, which is the first address in the SRAM.
-if(NOT CONFIG_BUILD_WITH_TFM AND CONFIG_PSA_NEED_CRACEN_KMU_DRIVER)
-# Exclamation mark is printable character with the lowest number in ASCII table.
-# We are sure that this file will be included first.
-zephyr_linker_sources(RAM_SECTIONS SORT_KEY ! kmu_push_area_section.ld)
-endif()
diff --git a/soc/nordic/nrf54l/kmu_push_area_section.ld b/soc/nordic/nrf54l/kmu_push_area_section.ld
deleted file mode 100644
index e8c8cd9f09a..00000000000
--- a/soc/nordic/nrf54l/kmu_push_area_section.ld
+++ /dev/null
@@ -1,19 +0,0 @@
-# This section must be loaded first of all the
-# custom sections because we want it to be placed
-# at the top address of RAM.
-SECTION_PROLOGUE(NRF_KMU_RESERVED_PUSH_SECTION,(NOLOAD) ,)
-{
-    __nrf_kmu_reserved_push_area = .;
-    *(.nrf_kmu_reserved_push_area)
-    __nrf_kmu_reserved_push_area_end = .;
-} GROUP_NOLOAD_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
-
-# It doesn't seem to be possible to enforce placing a section
-# at a specific address in memory using the Zephyr SECTION macros.
-# So this assert is necessary to avoid accidentatly moving this
-# section to a different address.
-ASSERT(__nrf_kmu_reserved_push_area == RAM_ADDR, "Error:  \
- The section NRF_KMU_RESERVED_PUSH_SECTION needs to be    \
- placed on the top RAM address but it is not, please edit \
- your linker scripts to make sure that it is placed on    \
- the to RAM address.")

From 850399a1880e651be96085acf68617ef210c93fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Wed, 4 Dec 2024 14:15:31 +0100
Subject: [PATCH 0937/2913] [nrf fromtree] soc: nordic: nrf54l: remove
 redundant ELV code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removed dead ELV code from nRF54L soc.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit 4c96cbb79ba1f7a3f50c37c9c34cebecf3f13fac)
---
 soc/nordic/nrf54l/CMakeLists.txt |  4 ----
 soc/nordic/nrf54l/Kconfig        | 14 --------------
 soc/nordic/nrf54l/soc.c          |  3 ---
 3 files changed, 21 deletions(-)

diff --git a/soc/nordic/nrf54l/CMakeLists.txt b/soc/nordic/nrf54l/CMakeLists.txt
index f1c18291fc6..cebbda571b6 100644
--- a/soc/nordic/nrf54l/CMakeLists.txt
+++ b/soc/nordic/nrf54l/CMakeLists.txt
@@ -6,7 +6,3 @@ zephyr_library_sources(
   ../validate_rram_partitions.c
   )
 zephyr_include_directories(.)
-
-if(CONFIG_ELV_GRTC_LFXO_ALLOWED)
-  message(WARNING "WARNING! ELV mode feature is EXPERIMENTAL and may brick your device!")
-endif()
diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index ab5f1c745b9..9a2306b6adc 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -82,18 +82,4 @@ config SOC_NRF_FORCE_CONSTLAT
 	  of base resources on while in sleep. The advantage of having a constant
 	  and predictable latency will be at the cost of having increased power consumption.
 
-if NRF_GRTC_TIMER
-
-config ELV_GRTC_LFXO_ALLOWED
-	bool
-	depends on POWEROFF
-	select EXPERIMENTAL
-	help
-	  This feature allows using ELV mode when GRTC operates with the LFXO as
-	  a low-frequency clock source. The LFXO is automatically activated when
-	  preparing to system-off.
-	  WARNING! This feature is EXPERIMENTAL and may brick your device!
-
-endif # NRF_GRTC_TIMER
-
 endif # SOC_SERIES_NRF54LX
diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index 76749c1983a..abb0f778ac3 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -164,9 +164,6 @@ static int nordicsemi_nrf54l_init(void)
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);
 #endif
 
-#if defined(CONFIG_ELV_GRTC_LFXO_ALLOWED)
-	nrf_regulators_elv_mode_allow_set(NRF_REGULATORS, NRF_REGULATORS_ELV_ELVGRTCLFXO_MASK);
-#endif /* CONFIG_ELV_GRTC_LFXO_ALLOWED */
 #endif /* NRF_APPLICATION */
 
 	return 0;

From fcecc1370438052dc8ad84a2903f7d47f8e642de Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Fri, 21 Jun 2024 13:25:22 +0200
Subject: [PATCH 0938/2913] [nrf noup] soc: nrf54l: Add custom section for KMU

Add a custom section in the linker which should always
be placed in the top of RAM. This will be used by the
KMU to push keys into it. Since when you provision a key
into the KMU you need to set specific a memory location
for the PUSH operation we need to keep this memory location
static across images/dfus.

This is a noup since the KMU is not supported upstream.

Ref: NCSDK-25121

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
(cherry picked from commit 9ce3906acd7ebb3d82ae699b24965d6eff2a47f1)
(cherry picked from commit 95d3bde051b31af162a12a2e194555bf82be566e)
---
 soc/nordic/nrf54l/CMakeLists.txt           |  9 +++++++++
 soc/nordic/nrf54l/kmu_push_area_section.ld | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 soc/nordic/nrf54l/kmu_push_area_section.ld

diff --git a/soc/nordic/nrf54l/CMakeLists.txt b/soc/nordic/nrf54l/CMakeLists.txt
index cebbda571b6..c8badc8d61d 100644
--- a/soc/nordic/nrf54l/CMakeLists.txt
+++ b/soc/nordic/nrf54l/CMakeLists.txt
@@ -6,3 +6,12 @@ zephyr_library_sources(
   ../validate_rram_partitions.c
   )
 zephyr_include_directories(.)
+
+# We need a buffer in memory in a static location which can be used by
+# the KMU peripheral. The KMU has a static destination address, we chose
+# this address to be 0x20000000, which is the first address in the SRAM.
+if(NOT CONFIG_BUILD_WITH_TFM AND CONFIG_PSA_NEED_CRACEN_KMU_DRIVER)
+# Exclamation mark is printable character with the lowest number in ASCII table.
+# We are sure that this file will be included first.
+zephyr_linker_sources(RAM_SECTIONS SORT_KEY ! kmu_push_area_section.ld)
+endif()
diff --git a/soc/nordic/nrf54l/kmu_push_area_section.ld b/soc/nordic/nrf54l/kmu_push_area_section.ld
new file mode 100644
index 00000000000..e8c8cd9f09a
--- /dev/null
+++ b/soc/nordic/nrf54l/kmu_push_area_section.ld
@@ -0,0 +1,19 @@
+# This section must be loaded first of all the
+# custom sections because we want it to be placed
+# at the top address of RAM.
+SECTION_PROLOGUE(NRF_KMU_RESERVED_PUSH_SECTION,(NOLOAD) ,)
+{
+    __nrf_kmu_reserved_push_area = .;
+    *(.nrf_kmu_reserved_push_area)
+    __nrf_kmu_reserved_push_area_end = .;
+} GROUP_NOLOAD_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
+
+# It doesn't seem to be possible to enforce placing a section
+# at a specific address in memory using the Zephyr SECTION macros.
+# So this assert is necessary to avoid accidentatly moving this
+# section to a different address.
+ASSERT(__nrf_kmu_reserved_push_area == RAM_ADDR, "Error:  \
+ The section NRF_KMU_RESERVED_PUSH_SECTION needs to be    \
+ placed on the top RAM address but it is not, please edit \
+ your linker scripts to make sure that it is placed on    \
+ the to RAM address.")

From e3e053f4b6b58c0dad2a8ad776d1762bb630c621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B8e?= <sebastian.boe@nordicsemi.no>
Date: Fri, 24 May 2024 15:34:47 +0200
Subject: [PATCH 0939/2913] [nrf noup] soc: nordic: nrf54l: Port Soc.c to be
 compatible with TFM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In this patch we do several things to be able to configure power and
clocks when NRF_OSCILLATORS and NRF_REGULATORS is secure.

We port soc.c to TF-M so that the TF-M image can do the same
configuration that would normally be done by the Zephyr image.

This is done by explicitly including autoconf.h for instance.

We also ifdef-out the configuration when nordicsemi_nrf54l_init is
invoked from a non-secure image, because the peripherals are secure.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
(cherry picked from commit 962fa00fcd23a4a758c3489fc40c1b2e94e07810)
(cherry picked from commit 028f0c4c054e79e0c1fae1f0f905112c4b12544c)
---
 soc/nordic/nrf54l/soc.c | 66 ++++++++++++++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 17 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index abb0f778ac3..26248018f6b 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -12,13 +12,21 @@
  * for the Nordic Semiconductor nRF54L family processor.
  */
 
+#ifdef __NRF_TFM__
+#include <autoconf.h>
+#endif
+
 #include <zephyr/devicetree.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 #include <zephyr/kernel.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
+
+#ifndef __NRF_TFM__
 #include <zephyr/cache.h>
+#endif
+
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 #if defined(NRF_APPLICATION)
@@ -40,17 +48,9 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 #define HFXO_NODE DT_NODELABEL(hfxo)
 #endif
 
-static int nordicsemi_nrf54l_init(void)
-{
-	/* Update the SystemCoreClock global variable with current core clock
-	 * retrieved from hardware state.
-	 */
-	SystemCoreClockUpdate();
-
 #if defined(NRF_APPLICATION)
-	/* Enable ICACHE */
-	sys_cache_instr_enable();
-
+static inline void power_and_clock_configuration(void)
+{
 #if DT_ENUM_HAS_VALUE(LFXO_NODE, load_capacitors, internal)
 	uint32_t xosc32ktrim = NRF_FICR->XOSC32KTRIM;
 
@@ -77,16 +77,16 @@ static int nordicsemi_nrf54l_init(void)
 	 * NOTE: The desired capacitance value is used in encoded from in INTCAP calculation formula
 	 *       That is different than in case of HFXO.
 	 */
-	uint32_t cap_val_encoded = (((DT_PROP(LFXO_NODE, load_capacitance_femtofarad) - 4000UL)
-				     * 2UL) / 1000UL);
+	uint32_t cap_val_encoded =
+		(((DT_PROP(LFXO_NODE, load_capacitance_femtofarad) - 4000UL) * 2UL) / 1000UL);
 
 	/* Calculation of INTCAP code before rounding. Min that calculations here are done on
 	 * values multiplied by 2^9, e.g. 0.765625 * 2^9 = 392.
 	 * offset_k should be divided by 2^6, but to add it to value shifted by 2^9 we have to
 	 * multiply it be 2^3.
 	 */
-	uint32_t mid_val = (cap_val_encoded - 4UL) * (uint32_t)(slope_k + 392UL)
-			   + (offset_k << 3UL);
+	uint32_t mid_val =
+		(cap_val_encoded - 4UL) * (uint32_t)(slope_k + 392UL) + (offset_k << 3UL);
 
 	/* Get integer part of the INTCAP code */
 	uint32_t lfxo_intcap = mid_val >> 9UL;
@@ -132,8 +132,9 @@ static int nordicsemi_nrf54l_init(void)
 	 */
 	uint32_t cap_val_femto_f = DT_PROP(HFXO_NODE, load_capacitance_femtofarad);
 
-	uint32_t mid_val_intcap = (((cap_val_femto_f - 5500UL) * (uint32_t)(slope_m + 791UL))
-		 + (offset_m << 2UL) * 1000UL) >> 8UL;
+	uint32_t mid_val_intcap = (((cap_val_femto_f - 5500UL) * (uint32_t)(slope_m + 791UL)) +
+				   (offset_m << 2UL) * 1000UL) >>
+				  8UL;
 
 	/* Convert the calculated value to piko Farads */
 	uint32_t hfxo_intcap = mid_val_intcap / 1000;
@@ -163,9 +164,40 @@ static int nordicsemi_nrf54l_init(void)
 #endif
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);
 #endif
-
+}
 #endif /* NRF_APPLICATION */
 
+int nordicsemi_nrf54l_init(void)
+{
+	/* Update the SystemCoreClock global variable with current core clock
+	 * retrieved from hardware state.
+	 */
+#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(__NRF_TFM__)
+	/* Currently not supported for non-secure */
+	SystemCoreClockUpdate();
+#endif
+
+#ifdef __NRF_TFM__
+	/* TF-M enables the instruction cache from target_cfg.c, so we
+	 * don't need to enable it here.
+	 */
+#else
+	/* Enable ICACHE */
+	sys_cache_instr_enable();
+#endif
+
+	/* NRF_REGULATORS and NRF_OSCILLATORS are configured to be secure
+	 * as NRF_REGULATORS.POFCON is needed by the secure domain to
+	 * prevent glitches when the power supply is attacked.
+	 *
+	 * NRF_OSCILLATORS is also configured as secure because of a HW limitation
+	 * that requires them to be configured with the same security property.
+	 */
+#if (defined(NRF_APPLICATION) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)) ||                  \
+	defined(__NRF_TFM__)
+	power_and_clock_configuration();
+#endif
+
 	return 0;
 }
 

From 665aba441dd7c933d60bbf17fdd8eba6b7ba8591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag=20Erik=20Gj=C3=B8rvad?= <dag.erik.gjorvad@nordicsemi.no>
Date: Thu, 12 Dec 2024 10:25:00 +0100
Subject: [PATCH 0940/2913] [nrf noup] soc: nordic: nrf54l Fix for wait lasting
 half expected time
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Noup as it patches code that does not exist in zephyr
arch_busy_wait and k_busy_wait waited half the expected time
due to SystemCoreClock being set back to the default value when ns
builds. Changed to rely on device tree as to avoid
hardcoded clock frequencies

Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no>
---
 soc/nordic/nrf54l/soc.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index 26248018f6b..d7f3005d1f4 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -48,6 +48,13 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 #define HFXO_NODE DT_NODELABEL(hfxo)
 #endif
 
+/* Building for cpuflpr with ns uses cpu_1 instead of cpu_0 */
+#if DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
+#define DEVICE_DT_CLOCK_FREQ DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
+#elif DT_PROP(DT_PATH(cpus, cpu_1), clock_frequency)
+#define DEVICE_DT_CLOCK_FREQ DT_PROP(DT_PATH(cpus, cpu_1), clock_frequency)
+#endif
+
 #if defined(NRF_APPLICATION)
 static inline void power_and_clock_configuration(void)
 {
@@ -172,16 +179,18 @@ int nordicsemi_nrf54l_init(void)
 	/* Update the SystemCoreClock global variable with current core clock
 	 * retrieved from hardware state.
 	 */
-#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(__NRF_TFM__)
-	/* Currently not supported for non-secure */
-	SystemCoreClockUpdate();
-#endif
 
 #ifdef __NRF_TFM__
 	/* TF-M enables the instruction cache from target_cfg.c, so we
 	 * don't need to enable it here.
 	 */
 #else
+
+	/* Update SystemCoreClock in Zephyr based on device tree to avoid SystemCoreClock
+	 * being overwritten with default value when initializing with TF-M
+	 */
+	SystemCoreClock = DEVICE_DT_CLOCK_FREQ;
+
 	/* Enable ICACHE */
 	sys_cache_instr_enable();
 #endif

From 923f09004041cd98a0338acf196415a3c43bebb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Thu, 5 Sep 2024 15:06:57 +0200
Subject: [PATCH 0941/2913] [nrf noup] samples: bluetooth: update autoconf.h
 header path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update path for autoconf.h which is now in zephyr/autoconf.h

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit b22c113e035ffef20c2dd9ad9ce4eebae992f6db)
(cherry picked from commit 02f8b45f35322b72378f9fe641057779a36476bd)
---
 samples/bluetooth/bap_unicast_client/src/stream_tx.c        | 2 +-
 samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c   | 2 +-
 samples/bluetooth/cap_acceptor/src/main.c                   | 2 +-
 samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c | 2 +-
 samples/bluetooth/cap_initiator/src/main.c                  | 2 +-
 soc/nordic/nrf54l/soc.c                                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/samples/bluetooth/bap_unicast_client/src/stream_tx.c b/samples/bluetooth/bap_unicast_client/src/stream_tx.c
index 06ea3a3c349..eba7273a0c6 100644
--- a/samples/bluetooth/bap_unicast_client/src/stream_tx.c
+++ b/samples/bluetooth/bap_unicast_client/src/stream_tx.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c b/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
index cbdb859eb8f..aad077a0aed 100644
--- a/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
+++ b/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
@@ -7,7 +7,7 @@
  *  SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_acceptor/src/main.c b/samples/bluetooth/cap_acceptor/src/main.c
index 6ca5f59282e..df4600f09bb 100644
--- a/samples/bluetooth/cap_acceptor/src/main.c
+++ b/samples/bluetooth/cap_acceptor/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c b/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
index 39b7a68aef6..60509beb258 100644
--- a/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
+++ b/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/samples/bluetooth/cap_initiator/src/main.c b/samples/bluetooth/cap_initiator/src/main.c
index 1b35ea7981f..8eab76938bc 100644
--- a/samples/bluetooth/cap_initiator/src/main.c
+++ b/samples/bluetooth/cap_initiator/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <stddef.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index d7f3005d1f4..eab3bf18a14 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -13,7 +13,7 @@
  */
 
 #ifdef __NRF_TFM__
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #endif
 
 #include <zephyr/devicetree.h>

From 10af4872132795c5df6eb66f76ce9a040136db28 Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Mon, 14 Oct 2024 21:47:04 +0200
Subject: [PATCH 0942/2913] [nrf fromtree] tests/flash/common: Increase ztest
 stack size

The commit sets CONFIG_ZTEST_STACK_SIZE to 4096.

Fixes #79801

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 3e8ea52e21f0e12164a2e0e0836c5619cbfc7290)
---
 tests/drivers/flash/common/prj.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/drivers/flash/common/prj.conf b/tests/drivers/flash/common/prj.conf
index 2496d765165..cb0a271262c 100644
--- a/tests/drivers/flash/common/prj.conf
+++ b/tests/drivers/flash/common/prj.conf
@@ -3,3 +3,4 @@ CONFIG_ZTEST=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_ZTEST_STACK_SIZE=4096

From 7fa061c31303a7eb220a8c0a76fa1c947af7b042 Mon Sep 17 00:00:00 2001
From: Reto Schneider <reto.schneider@husqvarnagroup.com>
Date: Thu, 3 Oct 2024 22:12:03 +0200
Subject: [PATCH 0943/2913] [nrf fromtree] drivers: flash: Sort CMake and
 Kconfig files alphabetically

By sorting the lines alphabetically, merge conflicts can be reduced.

Signed-off-by: Reto Schneider <reto.schneider@husqvarnagroup.com>
(cherry picked from commit 7fa5a222a0c2ba9aede19448d4561173436f052f)
---
 drivers/flash/CMakeLists.txt | 96 ++++++++++++++++++++----------------
 drivers/flash/Kconfig        | 87 ++++++++++----------------------
 2 files changed, 79 insertions(+), 104 deletions(-)

diff --git a/drivers/flash/CMakeLists.txt b/drivers/flash/CMakeLists.txt
index 64b9c149db3..97d9cd55059 100644
--- a/drivers/flash/CMakeLists.txt
+++ b/drivers/flash/CMakeLists.txt
@@ -16,10 +16,55 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/flash.h)
 
 zephyr_library()
 
+# zephyr-keep-sorted-start
+zephyr_library_sources_ifdef(CONFIG_FLASH_JESD216 jesd216.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_PAGE_LAYOUT flash_page_layout.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_SHELL flash_shell.c)
+zephyr_library_sources_ifdef(CONFIG_USERSPACE flash_handlers.c)
+# zephyr-keep-sorted-stop
+
+# zephyr-keep-sorted-start
+zephyr_library_sources_ifdef(CONFIG_FLASH_AMBIQ flash_ambiq.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_ANDES_QSPI flash_andes_qspi.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_CAD_QSPI_NOR flash_cadence_qspi_nor.c flash_cadence_qspi_nor_ll.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_CDNS_NAND flash_cadence_nand.c flash_cadence_nand_ll.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_INFINEON_CAT1 flash_ifx_cat1.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_HYPERFLASH flash_mcux_flexspi_hyperflash.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_MX25UM51345G flash_mcux_flexspi_mx25um51345g.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_NOR flash_mcux_flexspi_nor.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_ATXP032 flash_mspi_atxp032.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_EMUL_DEVICE flash_mspi_emul_device.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_NOR flash_npcx_fiu_nor.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_QSPI flash_npcx_fiu_qspi.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_RPI_PICO flash_rpi_pico.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_STM32_OSPI flash_stm32_ospi.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_STM32_QSPI flash_stm32_qspi.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_STM32_XSPI flash_stm32_xspi.c)
+zephyr_library_sources_ifdef(CONFIG_INFINEON_CAT1_QSPI_FLASH flash_ifx_cat1_qspi.c)
+zephyr_library_sources_ifdef(CONFIG_NORDIC_QSPI_NOR nrf_qspi_nor.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_CC13XX_CC26XX soc_flash_cc13xx_cc26xx.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_ESP32 flash_esp32.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_GECKO flash_gecko.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_ITE_IT8XXX2 flash_ite_it8xxx2.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_LPC soc_flash_lpc.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_MCUX soc_flash_mcux.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NIOS2_QSPI soc_flash_nios2_qspi.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF soc_flash_nrf.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF_MRAM soc_flash_nrf_mram.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF_RRAM soc_flash_nrf_rram.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NUMAKER soc_flash_numaker.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NUMAKER_RMC soc_flash_numaker_rmc.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_RV32M1 soc_flash_rv32m1.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SAM flash_sam.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SAM0 flash_sam0.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SI32 flash_si32.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SMARTBOND flash_smartbond.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_TELINK_B91 soc_flash_b91.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_XMC4XXX soc_flash_xmc4xxx.c)
+zephyr_library_sources_ifdef(CONFIG_SPI_FLASH_AT45 spi_flash_at45.c)
 zephyr_library_sources_ifdef(CONFIG_SPI_NOR spi_nor.c)
-zephyr_library_sources_ifdef(CONFIG_NORDIC_QSPI_NOR nrf_qspi_nor.c)
+# zephyr-keep-sorted-stop
+
 if(CONFIG_FLASH_SIMULATOR)
   zephyr_library_sources(flash_simulator.c)
   if(CONFIG_NATIVE_LIBRARY)
@@ -28,36 +73,7 @@ if(CONFIG_FLASH_SIMULATOR)
     zephyr_library_sources(flash_simulator_native.c)
   endif()
 endif()
-zephyr_library_sources_ifdef(CONFIG_SPI_FLASH_AT45 spi_flash_at45.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_ITE_IT8XXX2 flash_ite_it8xxx2.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF soc_flash_nrf.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_MCUX soc_flash_mcux.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_LPC soc_flash_lpc.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_PAGE_LAYOUT flash_page_layout.c)
-zephyr_library_sources_ifdef(CONFIG_USERSPACE flash_handlers.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SAM0 flash_sam0.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SAM flash_sam.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NIOS2_QSPI soc_flash_nios2_qspi.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_GECKO flash_gecko.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_RV32M1 soc_flash_rv32m1.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_QSPI flash_npcx_fiu_qspi.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_NOR flash_npcx_fiu_nor.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_STM32_QSPI flash_stm32_qspi.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_STM32_OSPI flash_stm32_ospi.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_STM32_XSPI flash_stm32_xspi.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_MX25UM51345G flash_mcux_flexspi_mx25um51345g.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_NOR flash_mcux_flexspi_nor.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_HYPERFLASH flash_mcux_flexspi_hyperflash.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_ESP32 flash_esp32.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SMARTBOND flash_smartbond.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_CAD_QSPI_NOR flash_cadence_qspi_nor.c flash_cadence_qspi_nor_ll.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_XMC4XXX soc_flash_xmc4xxx.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_RPI_PICO flash_rpi_pico.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_ANDES_QSPI flash_andes_qspi.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_AMBIQ flash_ambiq.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_CDNS_NAND flash_cadence_nand.c flash_cadence_nand_ll.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_EMUL_DEVICE flash_mspi_emul_device.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_ATXP032 flash_mspi_atxp032.c)
+
 zephyr_library_include_directories_ifdef(CONFIG_MSPI ${ZEPHYR_BASE}/drivers/mspi)
 if(CONFIG_FLASH_MCUX_FLEXSPI_XIP)
   dt_chosen(chosen_flash PROPERTY "zephyr,flash")
@@ -91,15 +107,17 @@ if(CONFIG_SOC_FLASH_STM32)
       zephyr_library_sources(flash_stm32.c)
       zephyr_library_sources_ifdef(CONFIG_FLASH_EX_OP_ENABLED flash_stm32_ex_op.c)
 
+# zephyr-keep-sorted-start
       zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32F1_FLASH_CONTROLLER_ENABLED flash_stm32f1x.c)
       zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32F2_FLASH_CONTROLLER_ENABLED flash_stm32f2x.c)
       zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32F4_FLASH_CONTROLLER_ENABLED flash_stm32f4x.c)
       zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32F7_FLASH_CONTROLLER_ENABLED flash_stm32f7x.c)
+      zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32G0_FLASH_CONTROLLER_ENABLED flash_stm32g0x.c)
+      zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32G4_FLASH_CONTROLLER_ENABLED flash_stm32g4x.c)
       zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32L4_FLASH_CONTROLLER_ENABLED flash_stm32l4x.c)
       zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32L5_FLASH_CONTROLLER_ENABLED flash_stm32l5x.c)
       zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32WB_FLASH_CONTROLLER_ENABLED flash_stm32wbx.c)
-      zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32G0_FLASH_CONTROLLER_ENABLED flash_stm32g0x.c)
-      zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32G4_FLASH_CONTROLLER_ENABLED flash_stm32g4x.c)
+# zephyr-keep-sorted-stop
     endif()
   endif()
 endif()
@@ -107,9 +125,11 @@ endif()
 if(CONFIG_SOC_FLASH_GD32)
   zephyr_library_sources(flash_gd32.c)
 
+# zephyr-keep-sorted-start
   zephyr_library_sources_ifdef(CONFIG_GD32_NV_FLASH_V1 flash_gd32_v1.c)
   zephyr_library_sources_ifdef(CONFIG_GD32_NV_FLASH_V2 flash_gd32_v2.c)
   zephyr_library_sources_ifdef(CONFIG_GD32_NV_FLASH_V3 flash_gd32_v3.c)
+# zephyr-keep-sorted-stop
 endif()
 
 zephyr_library_include_directories_ifdef(
@@ -133,16 +153,6 @@ zephyr_library_include_directories_ifdef(
   ${ZEPHYR_BASE}/drivers/memc
 )
 
-zephyr_library_sources_ifdef(CONFIG_FLASH_SHELL flash_shell.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_JESD216 jesd216.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_INFINEON_CAT1 flash_ifx_cat1.c)
-zephyr_library_sources_ifdef(CONFIG_INFINEON_CAT1_QSPI_FLASH flash_ifx_cat1_qspi.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NUMAKER soc_flash_numaker.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF_RRAM soc_flash_nrf_rram.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF_MRAM soc_flash_nrf_mram.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NUMAKER_RMC soc_flash_numaker_rmc.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SI32 flash_si32.c)
-
 if(CONFIG_RA_FLASH_HP)
   zephyr_library_sources(flash_hp_ra.c)
   zephyr_library_sources_ifdef(CONFIG_FLASH_EX_OP_ENABLED flash_hp_ra_ex_op.c)
diff --git a/drivers/flash/Kconfig b/drivers/flash/Kconfig
index 99f17d71f7a..4ab3e9da14f 100644
--- a/drivers/flash/Kconfig
+++ b/drivers/flash/Kconfig
@@ -163,81 +163,46 @@ config FLASH_INIT_PRIORITY
 	  priority is used unless the driver implementation has its own
 	  initialization priority
 
+# zephyr-keep-sorted-start
+source "drivers/flash/Kconfig.ambiq"
+source "drivers/flash/Kconfig.andes"
+source "drivers/flash/Kconfig.at45"
 source "drivers/flash/Kconfig.b91"
-
+source "drivers/flash/Kconfig.cadence_nand"
+source "drivers/flash/Kconfig.cadence_qspi_nor"
 source "drivers/flash/Kconfig.cc13xx_cc26xx"
-
-source "drivers/flash/Kconfig.at45"
-
 source "drivers/flash/Kconfig.esp32"
-
+source "drivers/flash/Kconfig.gd32"
+source "drivers/flash/Kconfig.gecko"
+source "drivers/flash/Kconfig.ifx_cat1"
 source "drivers/flash/Kconfig.it8xxx2"
-
-source "drivers/flash/Kconfig.nrf"
-
 source "drivers/flash/Kconfig.lpc"
-
 source "drivers/flash/Kconfig.mcux"
-
 source "drivers/flash/Kconfig.mspi"
-
 source "drivers/flash/Kconfig.nios2_qspi"
-
-source "drivers/flash/Kconfig.npcx_fiu"
-
-source "drivers/flash/Kconfig.gecko"
-
 source "drivers/flash/Kconfig.nor"
-
+source "drivers/flash/Kconfig.nordic_qspi_nor"
+source "drivers/flash/Kconfig.npcx_fiu"
+source "drivers/flash/Kconfig.nrf"
+source "drivers/flash/Kconfig.nrf_mram"
+source "drivers/flash/Kconfig.nrf_rram"
+source "drivers/flash/Kconfig.numaker"
+source "drivers/flash/Kconfig.numaker_rmc"
+source "drivers/flash/Kconfig.nxp_s32"
+source "drivers/flash/Kconfig.renesas_ra"
 source "drivers/flash/Kconfig.rpi_pico"
-
-source "drivers/flash/Kconfig.stm32"
-
-source "drivers/flash/Kconfig.stm32_qspi"
-
-source "drivers/flash/Kconfig.stm32_ospi"
-
-source "drivers/flash/Kconfig.stm32_xspi"
-
-source "drivers/flash/Kconfig.sam0"
-
+source "drivers/flash/Kconfig.rv32m1"
 source "drivers/flash/Kconfig.sam"
-
-source "drivers/flash/Kconfig.simulator"
-
+source "drivers/flash/Kconfig.sam0"
 source "drivers/flash/Kconfig.si32"
-
-source "drivers/flash/Kconfig.rv32m1"
-
-source "drivers/flash/Kconfig.nordic_qspi_nor"
-
+source "drivers/flash/Kconfig.simulator"
 source "drivers/flash/Kconfig.smartbond"
-
-source "drivers/flash/Kconfig.cadence_qspi_nor"
-
-source "drivers/flash/Kconfig.gd32"
-
+source "drivers/flash/Kconfig.stm32"
+source "drivers/flash/Kconfig.stm32_ospi"
+source "drivers/flash/Kconfig.stm32_qspi"
+source "drivers/flash/Kconfig.stm32_xspi"
 source "drivers/flash/Kconfig.xmc4xxx"
-
-source "drivers/flash/Kconfig.ifx_cat1"
-
-source "drivers/flash/Kconfig.cadence_nand"
-
-source "drivers/flash/Kconfig.numaker"
-
-source "drivers/flash/Kconfig.nxp_s32"
-
-source "drivers/flash/Kconfig.andes"
-
-source "drivers/flash/Kconfig.ambiq"
-
-source "drivers/flash/Kconfig.nrf_rram"
-
-source "drivers/flash/Kconfig.nrf_mram"
-
-source "drivers/flash/Kconfig.numaker_rmc"
-
-source "drivers/flash/Kconfig.renesas_ra"
+# zephyr-keep-sorted-stop
 
 module = FLASH
 module-str = flash

From e957c23be3ef3003e2002e15865c7f0785674952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 17 Oct 2024 14:22:45 +0200
Subject: [PATCH 0944/2913] [nrf fromlist] drivers: mspi: Add driver for
 DesignWare SSI based controllers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a generic driver for MSPI controllers based on the DesignWare
SSI core. With small vendor-specific adaptations covering integration
details, it should be possible to use the driver for various devices.

Upstream PR #: 80042

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/mspi/CMakeLists.txt                |    1 +
 drivers/mspi/Kconfig                       |    1 +
 drivers/mspi/Kconfig.dw                    |    9 +
 drivers/mspi/mspi_dw.c                     | 1355 ++++++++++++++++++++
 drivers/mspi/mspi_dw.h                     |  239 ++++
 drivers/mspi/mspi_dw_vendor_specific.h     |   87 ++
 dts/bindings/mspi/snps,designware-ssi.yaml |   45 +
 7 files changed, 1737 insertions(+)
 create mode 100644 drivers/mspi/Kconfig.dw
 create mode 100644 drivers/mspi/mspi_dw.c
 create mode 100644 drivers/mspi/mspi_dw.h
 create mode 100644 drivers/mspi/mspi_dw_vendor_specific.h
 create mode 100644 dts/bindings/mspi/snps,designware-ssi.yaml

diff --git a/drivers/mspi/CMakeLists.txt b/drivers/mspi/CMakeLists.txt
index f248cb0b533..78f704393f4 100644
--- a/drivers/mspi/CMakeLists.txt
+++ b/drivers/mspi/CMakeLists.txt
@@ -4,4 +4,5 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/mspi.h)
 
 zephyr_library()
 zephyr_library_sources_ifdef(CONFIG_MSPI_AMBIQ_AP3   mspi_ambiq_ap3.c)
+zephyr_library_sources_ifdef(CONFIG_MSPI_DW          mspi_dw.c)
 zephyr_library_sources_ifdef(CONFIG_MSPI_EMUL        mspi_emul.c)
diff --git a/drivers/mspi/Kconfig b/drivers/mspi/Kconfig
index 0adb2a34393..269d8d16f04 100644
--- a/drivers/mspi/Kconfig
+++ b/drivers/mspi/Kconfig
@@ -60,6 +60,7 @@ module-str = mspi
 source "subsys/logging/Kconfig.template.log_config"
 
 source "drivers/mspi/Kconfig.ambiq"
+source "drivers/mspi/Kconfig.dw"
 source "drivers/mspi/Kconfig.mspi_emul"
 
 endif # MSPI
diff --git a/drivers/mspi/Kconfig.dw b/drivers/mspi/Kconfig.dw
new file mode 100644
index 00000000000..1ab82da0e85
--- /dev/null
+++ b/drivers/mspi/Kconfig.dw
@@ -0,0 +1,9 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config MSPI_DW
+	bool "DesignWare SSI controller driver"
+	default y
+	depends on DT_HAS_SNPS_DESIGNWARE_SSI_ENABLED
+	select PINCTRL if $(dt_compat_any_has_prop,$(DT_COMPAT_SNPS_DESIGNWARE_SSI),pinctrl-0)
+	imply MSPI_XIP
diff --git a/drivers/mspi/mspi_dw.c b/drivers/mspi/mspi_dw.c
new file mode 100644
index 00000000000..886d24462a2
--- /dev/null
+++ b/drivers/mspi/mspi_dw.c
@@ -0,0 +1,1355 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT snps_designware_ssi
+
+#include <zephyr/drivers/mspi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+
+#include "mspi_dw.h"
+#include "mspi_dw_vendor_specific.h"
+
+LOG_MODULE_REGISTER(mspi_dw, CONFIG_MSPI_LOG_LEVEL);
+
+#define DUMMY_BYTE 0xAA
+
+#if defined(CONFIG_MSPI_XIP)
+struct xip_params {
+	uint32_t read_cmd;
+	uint32_t write_cmd;
+	uint16_t rx_dummy;
+	uint16_t tx_dummy;
+	uint8_t cmd_length;
+	uint8_t addr_length;
+	enum mspi_io_mode io_mode;
+};
+
+struct xip_ctrl {
+	uint32_t read;
+	uint32_t write;
+};
+#endif
+
+struct mspi_dw_data {
+	const struct mspi_dev_id *dev_id;
+	uint32_t packets_done;
+	uint8_t *buf_pos;
+	const uint8_t *buf_end;
+
+	uint32_t ctrlr0;
+	uint32_t spi_ctrlr0;
+	uint32_t baudr;
+
+#if defined(CONFIG_MSPI_XIP)
+	uint32_t xip_freq;
+	struct xip_params xip_params_stored;
+	struct xip_params xip_params_active;
+	uint16_t xip_enabled;
+	enum mspi_cpp_mode xip_cpp;
+#endif
+
+	uint16_t dummy_bytes;
+	uint8_t bytes_to_discard;
+	uint8_t bytes_per_frame_exp;
+	bool standard_spi;
+
+	struct k_sem finished;
+	struct k_sem ctx_lock;
+	struct k_sem cfg_lock;
+	struct mspi_xfer xfer;
+};
+
+struct mspi_dw_config {
+	DEVICE_MMIO_ROM;
+	void (*irq_config)(void);
+	uint32_t clock_frequency;
+#if defined(CONFIG_PINCTRL)
+	const struct pinctrl_dev_config *pcfg;
+#endif
+	const struct gpio_dt_spec *ce_gpios;
+	uint8_t ce_gpios_len;
+	uint8_t tx_fifo_depth_minus_1;
+	uint8_t tx_fifo_threshold;
+	uint8_t rx_fifo_threshold;
+	DECLARE_REG_ACCESS();
+};
+
+/* Register access helpers. */
+#define DEFINE_MM_REG_RD_WR(reg, off) \
+	DEFINE_MM_REG_RD(reg, off) \
+	DEFINE_MM_REG_WR(reg, off)
+
+DEFINE_MM_REG_WR(ctrlr0,	0x00)
+DEFINE_MM_REG_WR(ctrlr1,	0x04)
+DEFINE_MM_REG_WR(ssienr,	0x08)
+DEFINE_MM_REG_WR(ser,		0x10)
+DEFINE_MM_REG_WR(baudr,		0x14)
+DEFINE_MM_REG_RD_WR(txftlr,	0x18)
+DEFINE_MM_REG_RD_WR(rxftlr,	0x1c)
+DEFINE_MM_REG_RD(txflr,		0x20)
+DEFINE_MM_REG_RD(rxflr,		0x24)
+DEFINE_MM_REG_RD(sr,		0x28)
+DEFINE_MM_REG_WR(imr,		0x2c)
+DEFINE_MM_REG_RD(isr,		0x30)
+DEFINE_MM_REG_RD_WR(dr,		0x60)
+DEFINE_MM_REG_WR(spi_ctrlr0,	0xf4)
+
+#if defined(CONFIG_MSPI_XIP)
+DEFINE_MM_REG_WR(xip_incr_inst,		0x100)
+DEFINE_MM_REG_WR(xip_wrap_inst,		0x104)
+DEFINE_MM_REG_WR(xip_ctrl,		0x108)
+DEFINE_MM_REG_WR(xip_write_incr_inst,	0x140)
+DEFINE_MM_REG_WR(xip_write_wrap_inst,	0x144)
+DEFINE_MM_REG_WR(xip_write_ctrl,	0x148)
+#endif
+
+static void tx_data(const struct device *dev,
+		    const struct mspi_xfer_packet *packet)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_dw_config *dev_config = dev->config;
+	const uint8_t *buf_pos = dev_data->buf_pos;
+	const uint8_t *buf_end = dev_data->buf_end;
+	/* When the function is called, it is known that at least one item
+	 * can be written to the FIFO. The loop below writes to the FIFO
+	 * the number of items that is known to fit and then updates that
+	 * number basing on the actual FIFO level (because some data may get
+	 * sent while the FIFO is written; especially for high frequencies
+	 * this may often occur) and continues until the FIFO is filled up
+	 * or the buffer end is reached.
+	 */
+	uint32_t room = 1;
+	uint8_t bytes_per_frame_exp = dev_data->bytes_per_frame_exp;
+	uint8_t tx_fifo_depth = dev_config->tx_fifo_depth_minus_1 + 1;
+	uint32_t data;
+
+	do {
+		if (bytes_per_frame_exp == 2) {
+			data = sys_get_be32(buf_pos);
+			buf_pos += 4;
+		} else if (bytes_per_frame_exp == 1) {
+			data = sys_get_be16(buf_pos);
+			buf_pos += 2;
+		} else {
+			data = *buf_pos;
+			buf_pos += 1;
+		}
+		write_dr(dev, data);
+
+		if (buf_pos >= buf_end) {
+			write_txftlr(dev, 0);
+			break;
+		}
+
+		if (--room == 0) {
+			room = tx_fifo_depth
+			     - FIELD_GET(TXFLR_TXTFL_MASK, read_txflr(dev));
+		}
+	} while (room);
+
+	dev_data->buf_pos = (uint8_t *)buf_pos;
+}
+
+static bool make_rx_cycles(const struct device *dev)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_dw_config *dev_config = dev->config;
+	uint16_t dummy_bytes = dev_data->dummy_bytes;
+	/* See tx_data(). */
+	uint32_t room = 1;
+	uint8_t tx_fifo_depth = dev_config->tx_fifo_depth_minus_1 + 1;
+
+	do {
+		write_dr(dev, DUMMY_BYTE);
+
+		--dummy_bytes;
+		if (!dummy_bytes) {
+			dev_data->dummy_bytes = 0;
+			return true;
+		}
+
+		if (--room == 0) {
+			room = tx_fifo_depth
+			     - FIELD_GET(TXFLR_TXTFL_MASK, read_txflr(dev));
+		}
+	} while (room);
+
+	dev_data->dummy_bytes = dummy_bytes;
+	return false;
+}
+
+static void read_rx_fifo(const struct device *dev,
+			 const struct mspi_xfer_packet *packet)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_dw_config *dev_config = dev->config;
+	uint8_t bytes_to_discard = dev_data->bytes_to_discard;
+	uint8_t *buf_pos = dev_data->buf_pos;
+	const uint8_t *buf_end = &packet->data_buf[packet->num_bytes];
+	uint8_t bytes_per_frame_exp = dev_data->bytes_per_frame_exp;
+	/* See `room` in tx_data(). */
+	uint32_t in_fifo = 1;
+	uint32_t remaining_frames;
+
+	do {
+		uint32_t data = read_dr(dev);
+
+		if (bytes_to_discard) {
+			--bytes_to_discard;
+		} else {
+			if (bytes_per_frame_exp == 2) {
+				sys_put_be32(data, buf_pos);
+				buf_pos += 4;
+			} else if (bytes_per_frame_exp == 1) {
+				sys_put_be16(data, buf_pos);
+				buf_pos += 2;
+			} else {
+				*buf_pos = (uint8_t)data;
+				buf_pos += 1;
+			}
+
+			if (buf_pos >= buf_end) {
+				dev_data->bytes_to_discard = bytes_to_discard;
+				dev_data->buf_pos = buf_pos;
+				return;
+			}
+		}
+
+		if (--in_fifo == 0) {
+			in_fifo = FIELD_GET(RXFLR_RXTFL_MASK, read_rxflr(dev));
+		}
+	} while (in_fifo);
+
+	remaining_frames = (bytes_to_discard + buf_end - buf_pos)
+			   >> bytes_per_frame_exp;
+	if (remaining_frames - 1 < dev_config->rx_fifo_threshold) {
+		write_rxftlr(dev, remaining_frames - 1);
+	}
+
+	dev_data->bytes_to_discard = bytes_to_discard;
+	dev_data->buf_pos = buf_pos;
+}
+
+static void mspi_dw_isr(const struct device *dev)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_xfer_packet *packet =
+		&dev_data->xfer.packets[dev_data->packets_done];
+	uint32_t int_status = read_isr(dev);
+
+	if (int_status & ISR_RXFIS_BIT) {
+		read_rx_fifo(dev, packet);
+	}
+
+	if (dev_data->buf_pos >= dev_data->buf_end) {
+		write_imr(dev, 0);
+		/* It may happen that at this point the controller is still
+		 * shifting out the last frame (the last interrupt occurs when
+		 * the TX FIFO is empty). Wait if it signals that it is busy.
+		 */
+		while (read_sr(dev) & SR_BUSY_BIT) {
+		}
+
+		k_sem_give(&dev_data->finished);
+	} else {
+		if (int_status & ISR_TXEIS_BIT) {
+			if (dev_data->dummy_bytes) {
+				if (make_rx_cycles(dev)) {
+					write_imr(dev, IMR_RXFIM_BIT);
+				}
+			} else {
+				tx_data(dev, packet);
+			}
+		}
+	}
+
+	vendor_specific_irq_clear(dev);
+}
+
+static int api_config(const struct mspi_dt_spec *spec)
+{
+	ARG_UNUSED(spec);
+
+	return -ENOTSUP;
+}
+
+static bool apply_io_mode(struct mspi_dw_data *dev_data,
+			  enum mspi_io_mode io_mode)
+{
+	dev_data->ctrlr0 &= ~CTRLR0_SPI_FRF_MASK;
+	dev_data->spi_ctrlr0 &= ~SPI_CTRLR0_TRANS_TYPE_MASK;
+
+	/* Frame format used for transferring data. */
+
+	if (io_mode == MSPI_IO_MODE_SINGLE) {
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
+					       CTRLR0_SPI_FRF_STANDARD);
+		dev_data->standard_spi = true;
+		return true;
+	}
+
+	dev_data->standard_spi = false;
+
+	switch (io_mode) {
+	case MSPI_IO_MODE_DUAL:
+	case MSPI_IO_MODE_DUAL_1_1_2:
+	case MSPI_IO_MODE_DUAL_1_2_2:
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
+					       CTRLR0_SPI_FRF_DUAL);
+		break;
+	case MSPI_IO_MODE_QUAD:
+	case MSPI_IO_MODE_QUAD_1_1_4:
+	case MSPI_IO_MODE_QUAD_1_4_4:
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
+					       CTRLR0_SPI_FRF_QUAD);
+		break;
+	case MSPI_IO_MODE_OCTAL:
+	case MSPI_IO_MODE_OCTAL_1_1_8:
+	case MSPI_IO_MODE_OCTAL_1_8_8:
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
+					       CTRLR0_SPI_FRF_OCTAL);
+		break;
+	default:
+		LOG_ERR("IO mode %d not supported", io_mode);
+		return false;
+	}
+
+	/* Transfer format used for Address and Instruction: */
+
+	switch (io_mode) {
+	case MSPI_IO_MODE_DUAL_1_1_2:
+	case MSPI_IO_MODE_QUAD_1_1_4:
+	case MSPI_IO_MODE_OCTAL_1_1_8:
+		/* - both sent in Standard SPI mode */
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_TRANS_TYPE_MASK,
+						   SPI_CTRLR0_TRANS_TYPE_TT0);
+		break;
+	case MSPI_IO_MODE_DUAL_1_2_2:
+	case MSPI_IO_MODE_QUAD_1_4_4:
+	case MSPI_IO_MODE_OCTAL_1_8_8:
+		/* - Instruction sent in Standard SPI mode,
+		 *   Address sent the same way as data
+		 */
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_TRANS_TYPE_MASK,
+						   SPI_CTRLR0_TRANS_TYPE_TT1);
+		break;
+	default:
+		/* - both sent the same way as data. */
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_TRANS_TYPE_MASK,
+						   SPI_CTRLR0_TRANS_TYPE_TT2);
+		break;
+	}
+
+	return true;
+}
+
+static bool apply_cmd_length(struct mspi_dw_data *dev_data, uint32_t cmd_length)
+{
+	switch (cmd_length) {
+	case 0:
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_INST_L_MASK,
+						   SPI_CTRLR0_INST_L0);
+		break;
+	case 1:
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_INST_L_MASK,
+						   SPI_CTRLR0_INST_L8);
+		break;
+	case 2:
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_INST_L_MASK,
+						   SPI_CTRLR0_INST_L16);
+		break;
+	default:
+		LOG_ERR("Command length %d not supported", cmd_length);
+		return false;
+	}
+
+	return true;
+}
+
+static bool apply_addr_length(struct mspi_dw_data *dev_data,
+			      uint32_t addr_length)
+{
+	dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_ADDR_L_MASK,
+					   addr_length * 2);
+
+	return true;
+}
+
+#if defined(CONFIG_MSPI_XIP)
+static bool apply_xip_io_mode(const struct mspi_dw_data *dev_data,
+			      struct xip_ctrl *ctrl)
+{
+	enum mspi_io_mode io_mode = dev_data->xip_params_active.io_mode;
+
+	/* Frame format used for transferring data. */
+
+	if (io_mode == MSPI_IO_MODE_SINGLE) {
+		LOG_ERR("XIP not available in single line mode");
+		return false;
+	}
+
+	switch (io_mode) {
+	case MSPI_IO_MODE_DUAL:
+	case MSPI_IO_MODE_DUAL_1_1_2:
+	case MSPI_IO_MODE_DUAL_1_2_2:
+		ctrl->read |= FIELD_PREP(XIP_CTRL_FRF_MASK,
+					 XIP_CTRL_FRF_DUAL);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_FRF_MASK,
+					  XIP_WRITE_CTRL_FRF_DUAL);
+		break;
+	case MSPI_IO_MODE_QUAD:
+	case MSPI_IO_MODE_QUAD_1_1_4:
+	case MSPI_IO_MODE_QUAD_1_4_4:
+		ctrl->read |= FIELD_PREP(XIP_CTRL_FRF_MASK,
+					 XIP_CTRL_FRF_QUAD);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_FRF_MASK,
+					  XIP_WRITE_CTRL_FRF_QUAD);
+		break;
+	case MSPI_IO_MODE_OCTAL:
+	case MSPI_IO_MODE_OCTAL_1_1_8:
+	case MSPI_IO_MODE_OCTAL_1_8_8:
+		ctrl->read |= FIELD_PREP(XIP_CTRL_FRF_MASK,
+					 XIP_CTRL_FRF_OCTAL);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_FRF_MASK,
+					  XIP_WRITE_CTRL_FRF_OCTAL);
+		break;
+	default:
+		LOG_ERR("IO mode %d not supported", io_mode);
+		return false;
+	}
+
+	/* Transfer format used for Address and Instruction: */
+
+	switch (io_mode) {
+	case MSPI_IO_MODE_DUAL_1_1_2:
+	case MSPI_IO_MODE_QUAD_1_1_4:
+	case MSPI_IO_MODE_OCTAL_1_1_8:
+		/* - both sent in Standard SPI mode */
+		ctrl->read |= FIELD_PREP(XIP_CTRL_TRANS_TYPE_MASK,
+					 XIP_CTRL_TRANS_TYPE_TT0);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_TRANS_TYPE_MASK,
+					  XIP_WRITE_CTRL_TRANS_TYPE_TT0);
+		break;
+	case MSPI_IO_MODE_DUAL_1_2_2:
+	case MSPI_IO_MODE_QUAD_1_4_4:
+	case MSPI_IO_MODE_OCTAL_1_8_8:
+		/* - Instruction sent in Standard SPI mode,
+		 *   Address sent the same way as data
+		 */
+		ctrl->read |= FIELD_PREP(XIP_CTRL_TRANS_TYPE_MASK,
+					 XIP_CTRL_TRANS_TYPE_TT1);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_TRANS_TYPE_MASK,
+					  XIP_WRITE_CTRL_TRANS_TYPE_TT1);
+		break;
+	default:
+		/* - both sent the same way as data. */
+		ctrl->read |= FIELD_PREP(XIP_CTRL_TRANS_TYPE_MASK,
+					 XIP_CTRL_TRANS_TYPE_TT2);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_TRANS_TYPE_MASK,
+					  XIP_WRITE_CTRL_TRANS_TYPE_TT2);
+		break;
+	}
+
+	return true;
+}
+
+static bool apply_xip_cmd_length(const struct mspi_dw_data *dev_data,
+				 struct xip_ctrl *ctrl)
+{
+	uint8_t cmd_length = dev_data->xip_params_active.cmd_length;
+
+	switch (cmd_length) {
+	case 0:
+		ctrl->read |= FIELD_PREP(XIP_CTRL_INST_L_MASK,
+					 XIP_CTRL_INST_L0);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_INST_L_MASK,
+					  XIP_WRITE_CTRL_INST_L0);
+		break;
+	case 1:
+		ctrl->read |= XIP_CTRL_INST_EN_BIT
+			   |  FIELD_PREP(XIP_CTRL_INST_L_MASK,
+					 XIP_CTRL_INST_L8);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_INST_L_MASK,
+					  XIP_WRITE_CTRL_INST_L8);
+		break;
+	case 2:
+		ctrl->read |= XIP_CTRL_INST_EN_BIT
+			   |  FIELD_PREP(XIP_CTRL_INST_L_MASK,
+					 XIP_CTRL_INST_L16);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_INST_L_MASK,
+					  XIP_WRITE_CTRL_INST_L16);
+		break;
+	default:
+		LOG_ERR("Command length %d not supported", cmd_length);
+		return false;
+	}
+
+	return true;
+}
+
+static bool apply_xip_addr_length(const struct mspi_dw_data *dev_data,
+				  struct xip_ctrl *ctrl)
+{
+	uint8_t addr_length = dev_data->xip_params_active.addr_length;
+
+	ctrl->read |= FIELD_PREP(XIP_CTRL_ADDR_L_MASK, addr_length * 2);
+	ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_ADDR_L_MASK, addr_length * 2);
+
+	return true;
+}
+#endif /* defined(CONFIG_MSPI_XIP) */
+
+static int _api_dev_config(const struct device *dev,
+			   const enum mspi_dev_cfg_mask param_mask,
+			   const struct mspi_dev_cfg *cfg)
+{
+	const struct mspi_dw_config *dev_config = dev->config;
+	struct mspi_dw_data *dev_data = dev->data;
+
+	if (param_mask & MSPI_DEVICE_CONFIG_ENDIAN) {
+		if (cfg->endian != MSPI_XFER_BIG_ENDIAN) {
+			LOG_ERR("Only big endian transfers are supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_CE_POL) {
+		if (cfg->ce_polarity != MSPI_CE_ACTIVE_LOW) {
+			LOG_ERR("Only active low CE is supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_MEM_BOUND) {
+		if (cfg->mem_boundary) {
+			LOG_ERR("Auto CE break is not supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_BREAK_TIME) {
+		if (cfg->time_to_break) {
+			LOG_ERR("Auto CE break is not supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_IO_MODE) {
+#if defined(CONFIG_MSPI_XIP)
+		dev_data->xip_params_stored.io_mode = cfg->io_mode;
+#endif
+
+		if (!apply_io_mode(dev_data, cfg->io_mode)) {
+			return -EINVAL;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_CPP) {
+#if defined(CONFIG_MSPI_XIP)
+		/* Make sure the new setting is compatible with the one used
+		 * for XIP if it is enabled.
+		 */
+		if (!dev_data->xip_enabled) {
+			dev_data->xip_cpp = cfg->cpp;
+		} else if (dev_data->xip_cpp != cfg->cpp) {
+			LOG_ERR("Conflict with configuration used for XIP.");
+			return -EINVAL;
+		}
+#endif
+
+		dev_data->ctrlr0 &= ~(CTRLR0_SCPOL_BIT | CTRLR0_SCPH_BIT);
+
+		switch (cfg->cpp) {
+		default:
+		case MSPI_CPP_MODE_0:
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 0) |
+					    FIELD_PREP(CTRLR0_SCPH_BIT,  0);
+			break;
+		case MSPI_CPP_MODE_1:
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 0) |
+					    FIELD_PREP(CTRLR0_SCPH_BIT,  1);
+			break;
+		case MSPI_CPP_MODE_2:
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 1) |
+					    FIELD_PREP(CTRLR0_SCPH_BIT,  0);
+			break;
+		case MSPI_CPP_MODE_3:
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 1) |
+					    FIELD_PREP(CTRLR0_SCPH_BIT,  1);
+			break;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_FREQUENCY) {
+		if (cfg->freq > dev_config->clock_frequency / 2 ||
+		    cfg->freq < dev_config->clock_frequency / 65534) {
+			LOG_ERR("Invalid frequency: %u, MIN: %u, MAX: %u",
+				cfg->freq, dev_config->clock_frequency / 65534,
+				dev_config->clock_frequency / 2);
+			return -EINVAL;
+		}
+
+#if defined(CONFIG_MSPI_XIP)
+		/* Make sure the new setting is compatible with the one used
+		 * for XIP if it is enabled.
+		 */
+		if (!dev_data->xip_enabled) {
+			dev_data->xip_freq = cfg->freq;
+		} else if (dev_data->xip_freq != cfg->freq) {
+			LOG_ERR("Conflict with configuration used for XIP.");
+			return -EINVAL;
+		}
+#endif
+
+		dev_data->baudr = dev_config->clock_frequency / cfg->freq;
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_DATA_RATE) {
+		/* TODO: add support for DDR */
+		if (cfg->data_rate != MSPI_DATA_RATE_SINGLE) {
+			LOG_ERR("Only single data rate is supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_DQS) {
+		/* TODO: add support for DQS */
+		if (cfg->dqs_enable) {
+			LOG_ERR("DQS line is not supported.");
+			return -ENOTSUP;
+		}
+	}
+
+#if defined(CONFIG_MSPI_XIP)
+	if (param_mask & MSPI_DEVICE_CONFIG_READ_CMD) {
+		dev_data->xip_params_stored.read_cmd = cfg->read_cmd;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_WRITE_CMD) {
+		dev_data->xip_params_stored.write_cmd = cfg->write_cmd;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_RX_DUMMY) {
+		dev_data->xip_params_stored.rx_dummy = cfg->rx_dummy;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_TX_DUMMY) {
+		dev_data->xip_params_stored.tx_dummy = cfg->tx_dummy;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_CMD_LEN) {
+		dev_data->xip_params_stored.cmd_length = cfg->cmd_length;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_ADDR_LEN) {
+		dev_data->xip_params_stored.addr_length = cfg->addr_length;
+	}
+#endif
+
+	/* Always use Motorola SPI frame format. */
+	dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_FRF_MASK, CTRLR0_FRF_SPI);
+	/* Enable clock stretching. */
+	dev_data->spi_ctrlr0 |= SPI_CTRLR0_CLK_STRETCH_EN_BIT;
+
+	return 0;
+}
+
+static int api_dev_config(const struct device *dev,
+			  const struct mspi_dev_id *dev_id,
+			  const enum mspi_dev_cfg_mask param_mask,
+			  const struct mspi_dev_cfg *cfg)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc;
+
+	if (dev_id != dev_data->dev_id) {
+		rc = k_sem_take(&dev_data->cfg_lock,
+				K_MSEC(CONFIG_MSPI_COMPLETION_TIMEOUT_TOLERANCE));
+		if (rc < 0) {
+			LOG_ERR("Failed to switch controller to device");
+			return -EBUSY;
+		}
+
+		dev_data->dev_id = dev_id;
+
+		if (param_mask == MSPI_DEVICE_CONFIG_NONE) {
+			return 0;
+		}
+	}
+
+	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
+
+	rc = _api_dev_config(dev, param_mask, cfg);
+
+	k_sem_give(&dev_data->ctx_lock);
+
+	if (rc < 0) {
+		dev_data->dev_id = NULL;
+		k_sem_give(&dev_data->cfg_lock);
+	}
+
+	return rc;
+}
+
+static int api_get_channel_status(const struct device *dev, uint8_t ch)
+{
+	ARG_UNUSED(ch);
+
+	struct mspi_dw_data *dev_data = dev->data;
+
+	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
+
+	dev_data->dev_id = NULL;
+	k_sem_give(&dev_data->cfg_lock);
+
+	k_sem_give(&dev_data->ctx_lock);
+
+	return 0;
+}
+
+static void tx_control_field(const struct device *dev,
+			     uint32_t field, uint8_t len)
+{
+	uint8_t shift = 8 * len;
+
+	do {
+		shift -= 8;
+		write_dr(dev, field >> shift);
+	} while (shift);
+}
+
+static int start_next_packet(const struct device *dev, k_timeout_t timeout)
+{
+	const struct mspi_dw_config *dev_config = dev->config;
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_xfer_packet *packet =
+		&dev_data->xfer.packets[dev_data->packets_done];
+	bool xip_enabled = COND_CODE_1(CONFIG_MSPI_XIP,
+				       (dev_data->xip_enabled != 0),
+				       (false));
+	unsigned int key;
+	uint8_t tx_fifo_threshold;
+	uint32_t packet_frames;
+	uint32_t imr;
+	int rc = 0;
+
+	if (packet->num_bytes == 0 &&
+	    dev_data->xfer.cmd_length == 0 &&
+	    dev_data->xfer.addr_length == 0) {
+		return 0;
+	}
+
+	dev_data->dummy_bytes = 0;
+
+	dev_data->ctrlr0 &= ~CTRLR0_TMOD_MASK
+			 &  ~CTRLR0_DFS_MASK;
+
+	dev_data->spi_ctrlr0 &= ~SPI_CTRLR0_WAIT_CYCLES_MASK;
+
+	if (dev_data->standard_spi &&
+	    (dev_data->xfer.cmd_length != 0 ||
+	     dev_data->xfer.addr_length != 0)) {
+		dev_data->bytes_per_frame_exp = 0;
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 7);
+	} else {
+		if ((packet->num_bytes % 4) == 0) {
+			dev_data->bytes_per_frame_exp = 2;
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 31);
+		} else if ((packet->num_bytes % 2) == 0) {
+			dev_data->bytes_per_frame_exp = 1;
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 15);
+		} else {
+			dev_data->bytes_per_frame_exp = 0;
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 7);
+		}
+	}
+
+	packet_frames = packet->num_bytes >> dev_data->bytes_per_frame_exp;
+
+	if (packet_frames > UINT16_MAX + 1) {
+		LOG_ERR("Packet length (%u) exceeds supported maximum",
+			packet->num_bytes);
+		return -EINVAL;
+	}
+
+	if (packet->dir == MSPI_TX || packet->num_bytes == 0) {
+		imr = IMR_TXEIM_BIT;
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_TMOD_MASK,
+					       CTRLR0_TMOD_TX);
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_WAIT_CYCLES_MASK,
+						   dev_data->xfer.tx_dummy);
+
+		write_rxftlr(dev, 0);
+		tx_fifo_threshold = dev_config->tx_fifo_threshold;
+	} else {
+		uint32_t tmod;
+		uint8_t rx_fifo_threshold;
+
+		/* In Standard SPI Mode, the controller does not support
+		 * sending the command and address fields separately, they
+		 * need to be sent as data; hence, for RX packets with these
+		 * fields, the TX/RX transfer mode needs to be used and
+		 * consequently, dummy bytes need to be transmitted so that
+		 * clock cycles for the RX part are provided (the controller
+		 * does not do it automatically in the TX/RX mode).
+		 */
+		if (dev_data->standard_spi &&
+		    (dev_data->xfer.cmd_length != 0 ||
+		     dev_data->xfer.addr_length != 0)) {
+			uint32_t rx_total_bytes;
+
+			dev_data->bytes_to_discard = dev_data->xfer.cmd_length
+						   + dev_data->xfer.addr_length;
+			rx_total_bytes = dev_data->bytes_to_discard
+				       + packet->num_bytes;
+
+			dev_data->dummy_bytes = packet->num_bytes;
+
+			imr = IMR_TXEIM_BIT | IMR_RXFIM_BIT;
+			tmod = CTRLR0_TMOD_TX_RX;
+			tx_fifo_threshold = dev_config->tx_fifo_threshold;
+			/* For standard SPI, only 1-byte frames are used. */
+			rx_fifo_threshold = MIN(rx_total_bytes - 1,
+						dev_config->rx_fifo_threshold);
+		} else {
+			imr = IMR_RXFIM_BIT;
+			tmod = CTRLR0_TMOD_RX;
+			tx_fifo_threshold = 0;
+			rx_fifo_threshold = MIN(packet_frames - 1,
+						dev_config->rx_fifo_threshold);
+		}
+
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_TMOD_MASK, tmod);
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_WAIT_CYCLES_MASK,
+						   dev_data->xfer.rx_dummy);
+
+		write_rxftlr(dev, FIELD_PREP(RXFTLR_RFT_MASK,
+					     rx_fifo_threshold));
+	}
+
+	if (dev_data->dev_id->ce.port) {
+		rc = gpio_pin_set_dt(&dev_data->dev_id->ce, 1);
+		if (rc < 0) {
+			LOG_ERR("Failed to activate CE line (%d)", rc);
+			return rc;
+		}
+	}
+
+	if (xip_enabled) {
+		key = irq_lock();
+		write_ssienr(dev, 0);
+	}
+
+	/* These registers cannot be written when the controller is enabled,
+	 * that's why it is temporarily disabled above; with locked interrupts,
+	 * to prevent potential XIP transfers during that period.
+	 */
+	write_ctrlr0(dev, dev_data->ctrlr0);
+	write_ctrlr1(dev, packet_frames > 0
+		? FIELD_PREP(CTRLR1_NDF_MASK, packet_frames - 1)
+		: 0);
+	write_spi_ctrlr0(dev, dev_data->spi_ctrlr0);
+	write_baudr(dev, dev_data->baudr);
+	write_ser(dev, BIT(dev_data->dev_id->dev_idx));
+
+	if (xip_enabled) {
+		write_ssienr(dev, SSIENR_SSIC_EN_BIT);
+		irq_unlock(key);
+	}
+
+	dev_data->buf_pos = packet->data_buf;
+	dev_data->buf_end = &packet->data_buf[packet->num_bytes];
+
+	if ((imr & IMR_TXEIM_BIT) && dev_data->buf_pos < dev_data->buf_end) {
+		uint32_t start_level = tx_fifo_threshold;
+
+		if (dev_data->dummy_bytes) {
+			uint32_t tx_total = dev_data->bytes_to_discard
+					  + dev_data->dummy_bytes;
+
+			if (start_level > tx_total - 1) {
+				start_level = tx_total - 1;
+			}
+		}
+
+		write_txftlr(dev,
+			FIELD_PREP(TXFTLR_TXFTHR_MASK, start_level) |
+			FIELD_PREP(TXFTLR_TFT_MASK, tx_fifo_threshold));
+	} else {
+		write_txftlr(dev, 0);
+	}
+
+	/* Ensure that there will be no interrupt from the controller yet. */
+	write_imr(dev, 0);
+	/* Enable the controller. This must be done before DR is written. */
+	write_ssienr(dev, SSIENR_SSIC_EN_BIT);
+
+	if (dev_data->standard_spi) {
+		if (dev_data->xfer.cmd_length) {
+			tx_control_field(dev, packet->cmd,
+					 dev_data->xfer.cmd_length);
+		}
+
+		if (dev_data->xfer.addr_length) {
+			tx_control_field(dev, packet->address,
+					 dev_data->xfer.addr_length);
+		}
+	} else {
+		if (dev_data->xfer.cmd_length) {
+			write_dr(dev, packet->cmd);
+		}
+
+		if (dev_data->xfer.addr_length) {
+			write_dr(dev, packet->address);
+		}
+	}
+
+	if (dev_data->dummy_bytes) {
+		if (make_rx_cycles(dev)) {
+			imr = IMR_RXFIM_BIT;
+		}
+	} else if (packet->dir == MSPI_TX && packet->num_bytes) {
+		tx_data(dev, packet);
+	}
+
+	/* Enable interrupts now and wait until the packet is done. */
+	write_imr(dev, imr);
+
+	rc = k_sem_take(&dev_data->finished, timeout);
+	if (rc < 0) {
+		rc = -ETIMEDOUT;
+	}
+
+	/* Disable the controller. This will immediately halt the transfer
+	 * if it hasn't finished yet.
+	 */
+	if (xip_enabled) {
+		/* If XIP is enabled, the controller must be kept enabled,
+		 * so disable it only momentarily if there's a need to halt
+		 * a transfer that has timeout out.
+		 */
+		if (rc == -ETIMEDOUT) {
+			key = irq_lock();
+
+			write_ssienr(dev, 0);
+			write_ssienr(dev, SSIENR_SSIC_EN_BIT);
+
+			irq_unlock(key);
+		}
+	} else {
+		write_ssienr(dev, 0);
+	}
+
+	if (dev_data->dev_id->ce.port) {
+		int rc2;
+
+		/* Do not use `rc` to not overwrite potential timeout error. */
+		rc2 = gpio_pin_set_dt(&dev_data->dev_id->ce, 0);
+		if (rc2 < 0) {
+			LOG_ERR("Failed to deactivate CE line (%d)", rc2);
+			return rc2;
+		}
+	}
+
+	return rc;
+}
+
+static int _api_transceive(const struct device *dev,
+			   const struct mspi_xfer *req)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc;
+
+	dev_data->spi_ctrlr0 &= ~SPI_CTRLR0_WAIT_CYCLES_MASK
+			     &  ~SPI_CTRLR0_INST_L_MASK
+			     &  ~SPI_CTRLR0_ADDR_L_MASK;
+
+	if (!apply_cmd_length(dev_data, req->cmd_length) ||
+	    !apply_addr_length(dev_data, req->addr_length)) {
+		return -EINVAL;
+	}
+
+	if (dev_data->standard_spi &&
+	    (req->rx_dummy != 0 || req->tx_dummy != 0)) {
+		LOG_ERR("Dummy cycles unsupported in single line mode");
+		return -EINVAL;
+	} else if (req->rx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX ||
+		   req->tx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX) {
+		LOG_ERR("Unsupported RX (%u) or TX (%u) dummy cycles",
+			req->rx_dummy, req->tx_dummy);
+		return -EINVAL;
+	}
+
+	dev_data->xfer = *req;
+
+	for (dev_data->packets_done = 0;
+	     dev_data->packets_done < dev_data->xfer.num_packet;
+	     dev_data->packets_done++) {
+		rc = start_next_packet(dev, K_MSEC(dev_data->xfer.timeout));
+		if (rc < 0) {
+			return rc;
+		}
+	}
+
+	return 0;
+}
+
+static int api_transceive(const struct device *dev,
+			  const struct mspi_dev_id *dev_id,
+			  const struct mspi_xfer *req)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc, rc2;
+
+	if (dev_id != dev_data->dev_id) {
+		LOG_ERR("Controller is not configured for this device");
+		return -EINVAL;
+	}
+
+	/* TODO: add support for asynchronous transfers */
+	if (req->async) {
+		LOG_ERR("Asynchronous transfers are not supported");
+		return -ENOTSUP;
+	}
+
+	rc = pm_device_runtime_get(dev);
+	if (rc < 0) {
+		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+		return rc;
+	}
+
+	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
+
+	rc = _api_transceive(dev, req);
+
+	k_sem_give(&dev_data->ctx_lock);
+
+	rc2 = pm_device_runtime_put(dev);
+	if (rc2 < 0) {
+		LOG_ERR("pm_device_runtime_put() failed: %d", rc2);
+		rc = (rc < 0 ? rc : rc2);
+	}
+
+	return rc;
+}
+
+#if defined(CONFIG_MSPI_XIP)
+static int _api_xip_config(const struct device *dev,
+			   const struct mspi_dev_id *dev_id,
+			   const struct mspi_xip_cfg *cfg)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc;
+
+	if (!cfg->enable) {
+		rc = vendor_specific_xip_disable(dev, dev_id, cfg);
+		if (rc < 0) {
+			return rc;
+		}
+
+		dev_data->xip_enabled &= ~BIT(dev_id->dev_idx);
+
+		if (!dev_data->xip_enabled) {
+			write_ssienr(dev, 0);
+
+			/* Since XIP is disabled, it is okay for the controller
+			 * to be suspended.
+			 */
+			rc = pm_device_runtime_put(dev);
+			if (rc < 0) {
+				LOG_ERR("pm_device_runtime_put() failed: %d", rc);
+				return rc;
+			}
+		}
+
+		return 0;
+	}
+
+	if (!dev_data->xip_enabled) {
+		struct xip_params *params = &dev_data->xip_params_active;
+		struct xip_ctrl ctrl = {0};
+
+		*params = dev_data->xip_params_stored;
+
+		if (!apply_xip_io_mode(dev_data, &ctrl) ||
+		    !apply_xip_cmd_length(dev_data, &ctrl) ||
+		    !apply_xip_addr_length(dev_data, &ctrl)) {
+			return -EINVAL;
+		}
+
+		if (params->rx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX ||
+		    params->tx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX) {
+			LOG_ERR("Unsupported RX (%u) or TX (%u) dummy cycles",
+				params->rx_dummy, params->tx_dummy);
+			return -EINVAL;
+		}
+
+		/* Increase usage count additionally to prevent the controller
+		 * from being suspended as long as XIP is active.
+		 */
+		rc = pm_device_runtime_get(dev);
+		if (rc < 0) {
+			LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+			return rc;
+		}
+
+		ctrl.read |= FIELD_PREP(XIP_CTRL_WAIT_CYCLES_MASK,
+					params->rx_dummy);
+		ctrl.write |= FIELD_PREP(XIP_WRITE_CTRL_WAIT_CYCLES_MASK,
+					 params->tx_dummy);
+
+		/* Make sure the baud rate and serial clock phase/polarity
+		 * registers are configured properly. They may not be if
+		 * non-XIP transfers have not been performed yet.
+		 */
+		write_ctrlr0(dev, dev_data->ctrlr0);
+		write_baudr(dev, dev_data->baudr);
+
+		write_xip_incr_inst(dev, params->read_cmd);
+		write_xip_wrap_inst(dev, params->read_cmd);
+		write_xip_ctrl(dev, ctrl.read);
+		write_xip_write_incr_inst(dev, params->write_cmd);
+		write_xip_write_wrap_inst(dev, params->write_cmd);
+		write_xip_write_ctrl(dev, ctrl.write);
+	} else if (dev_data->xip_params_active.read_cmd !=
+		   dev_data->xip_params_stored.read_cmd ||
+		   dev_data->xip_params_active.write_cmd !=
+		   dev_data->xip_params_stored.write_cmd ||
+		   dev_data->xip_params_active.cmd_length !=
+		   dev_data->xip_params_stored.cmd_length ||
+		   dev_data->xip_params_active.addr_length !=
+		   dev_data->xip_params_stored.addr_length ||
+		   dev_data->xip_params_active.rx_dummy !=
+		   dev_data->xip_params_stored.rx_dummy ||
+		   dev_data->xip_params_active.tx_dummy !=
+		   dev_data->xip_params_stored.tx_dummy) {
+		LOG_ERR("Conflict with configuration already used for XIP.");
+		return -EINVAL;
+	}
+
+	rc = vendor_specific_xip_enable(dev, dev_id, cfg);
+	if (rc < 0) {
+		return rc;
+	}
+
+	write_ssienr(dev, SSIENR_SSIC_EN_BIT);
+
+	dev_data->xip_enabled |= BIT(dev_id->dev_idx);
+
+	return 0;
+}
+
+static int api_xip_config(const struct device *dev,
+			  const struct mspi_dev_id *dev_id,
+			  const struct mspi_xip_cfg *cfg)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc, rc2;
+
+	if (cfg->enable && dev_id != dev_data->dev_id) {
+		LOG_ERR("Controller is not configured for this device");
+		return -EINVAL;
+	}
+
+	rc = pm_device_runtime_get(dev);
+	if (rc < 0) {
+		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+		return rc;
+	}
+
+	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
+
+	rc = _api_xip_config(dev, dev_id, cfg);
+
+	k_sem_give(&dev_data->ctx_lock);
+
+	rc2 = pm_device_runtime_put(dev);
+	if (rc2 < 0) {
+		LOG_ERR("pm_device_runtime_put() failed: %d", rc2);
+		rc = (rc < 0 ? rc : rc2);
+	}
+
+	return rc;
+}
+#endif /* defined(CONFIG_MSPI_XIP) */
+
+static int dev_pm_action_cb(const struct device *dev,
+			    enum pm_device_action action)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+
+	if (action == PM_DEVICE_ACTION_RESUME) {
+#if defined(CONFIG_PINCTRL)
+		const struct mspi_dw_config *dev_config = dev->config;
+		int rc = pinctrl_apply_state(dev_config->pcfg,
+					     PINCTRL_STATE_DEFAULT);
+
+		if (rc < 0) {
+			LOG_ERR("Cannot apply default pins state (%d)", rc);
+			return rc;
+		}
+#endif
+		vendor_specific_resume(dev);
+
+		k_sem_give(&dev_data->ctx_lock);
+
+		return 0;
+	}
+
+	if (IS_ENABLED(CONFIG_PM_DEVICE) &&
+	    action == PM_DEVICE_ACTION_SUSPEND) {
+		bool xip_enabled = COND_CODE_1(CONFIG_MSPI_XIP,
+					       (dev_data->xip_enabled != 0),
+					       (false));
+
+#if defined(CONFIG_PINCTRL)
+		const struct mspi_dw_config *dev_config = dev->config;
+		int rc = pinctrl_apply_state(dev_config->pcfg,
+					     PINCTRL_STATE_SLEEP);
+
+		if (rc < 0) {
+			LOG_ERR("Cannot apply sleep pins state (%d)", rc);
+			return rc;
+		}
+#endif
+		if (xip_enabled ||
+		    k_sem_take(&dev_data->ctx_lock, K_NO_WAIT) != 0) {
+			LOG_ERR("Controller in use, cannot be suspended");
+			return -EBUSY;
+		}
+
+		vendor_specific_suspend(dev);
+
+		return 0;
+	}
+
+	return -ENOTSUP;
+}
+
+static int dev_init(const struct device *dev)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_dw_config *dev_config = dev->config;
+	const struct gpio_dt_spec *ce_gpio;
+	int rc;
+
+	DEVICE_MMIO_MAP(dev, K_MEM_CACHE_NONE);
+
+	vendor_specific_init(dev);
+
+	dev_config->irq_config();
+
+	k_sem_init(&dev_data->finished, 0, 1);
+	k_sem_init(&dev_data->cfg_lock, 1, 1);
+	/* This semaphore will be set to 1 after the device is resumed. */
+	k_sem_init(&dev_data->ctx_lock, 0, 1);
+
+	for (ce_gpio = dev_config->ce_gpios;
+	     ce_gpio < &dev_config->ce_gpios[dev_config->ce_gpios_len];
+	     ce_gpio++) {
+		if (!device_is_ready(ce_gpio->port)) {
+			LOG_ERR("CE GPIO port %s is not ready",
+				ce_gpio->port->name);
+			return -ENODEV;
+		}
+
+		rc = gpio_pin_configure_dt(ce_gpio, GPIO_OUTPUT_INACTIVE);
+		if (rc < 0) {
+			return rc;
+		}
+	}
+
+#if defined(CONFIG_PINCTRL)
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		rc = pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
+		if (rc < 0) {
+			LOG_ERR("Cannot apply sleep pins state (%d)", rc);
+			return rc;
+		}
+	}
+#endif
+
+	return pm_device_driver_init(dev, dev_pm_action_cb);
+}
+
+static const struct mspi_driver_api drv_api = {
+	.config             = api_config,
+	.dev_config         = api_dev_config,
+	.get_channel_status = api_get_channel_status,
+	.transceive         = api_transceive,
+#if defined(CONFIG_MSPI_XIP)
+	.xip_config         = api_xip_config,
+#endif
+};
+
+#define MSPI_DW_INST_IRQ(idx, inst)					\
+	IRQ_CONNECT(DT_INST_IRQ_BY_IDX(inst, idx, irq),			\
+		    DT_INST_IRQ_BY_IDX(inst, idx, priority),		\
+		    mspi_dw_isr, DEVICE_DT_INST_GET(inst), 0);		\
+	irq_enable(DT_INST_IRQ_BY_IDX(inst, idx, irq))
+
+#define MSPI_DW_MMIO_ROM_INIT(node_id)					\
+	COND_CODE_1(DT_REG_HAS_NAME(node_id, core),			\
+		(Z_DEVICE_MMIO_NAMED_ROM_INITIALIZER(core, node_id)),	\
+		(DEVICE_MMIO_ROM_INIT(node_id)))
+
+#define MSPI_DW_CLOCK_FREQUENCY(inst)					\
+	COND_CODE_1(DT_NODE_HAS_PROP(DT_INST_PHANDLE(inst, clocks),	\
+				     clock_frequency),			\
+		(DT_INST_PROP_BY_PHANDLE(inst, clocks,			\
+					 clock_frequency)),		\
+		(DT_INST_PROP(inst, clock_frequency)))
+
+#define MSPI_DW_DT_INST_PROP(inst, prop) .prop = DT_INST_PROP(inst, prop)
+
+#define FOREACH_CE_GPIOS_ELEM(inst)					\
+	DT_INST_FOREACH_PROP_ELEM_SEP(inst, ce_gpios,			\
+				      GPIO_DT_SPEC_GET_BY_IDX, (,))
+#define MSPI_DW_CE_GPIOS(inst)						\
+	.ce_gpios = (const struct gpio_dt_spec [])			\
+		{ FOREACH_CE_GPIOS_ELEM(inst) },			\
+	.ce_gpios_len = DT_INST_PROP_LEN(inst, ce_gpios)
+
+#define TX_FIFO_DEPTH(inst) DT_INST_PROP(inst, fifo_depth)
+#define RX_FIFO_DEPTH(inst) DT_INST_PROP_OR(inst, rx_fifo_depth,	\
+					    TX_FIFO_DEPTH(inst))
+#define MSPI_DW_FIFO_PROPS(inst)					\
+	.tx_fifo_depth_minus_1 = TX_FIFO_DEPTH(inst) - 1,		\
+	.tx_fifo_threshold =						\
+		DT_INST_PROP_OR(inst, tx_fifo_threshold,		\
+				7 * TX_FIFO_DEPTH(inst) / 8 - 1),	\
+	.rx_fifo_threshold =						\
+		DT_INST_PROP_OR(inst, rx_fifo_threshold,		\
+				1 * RX_FIFO_DEPTH(inst) / 8 - 1)
+
+#define MSPI_DW_INST(inst)						\
+	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);		\
+	IF_ENABLED(CONFIG_PINCTRL, (PINCTRL_DT_INST_DEFINE(inst);))	\
+	static void irq_config##inst(void)				\
+	{								\
+		LISTIFY(DT_INST_NUM_IRQS(inst),				\
+			MSPI_DW_INST_IRQ, (;), inst);			\
+	}								\
+	static struct mspi_dw_data dev##inst##_data;			\
+	static const struct mspi_dw_config dev##inst##_config = {	\
+		MSPI_DW_MMIO_ROM_INIT(DT_DRV_INST(inst)),		\
+		.irq_config = irq_config##inst,				\
+		.clock_frequency = MSPI_DW_CLOCK_FREQUENCY(inst),	\
+	IF_ENABLED(CONFIG_PINCTRL,					\
+		(.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),))	\
+	IF_ENABLED(DT_INST_NODE_HAS_PROP(inst, ce_gpios),		\
+		(MSPI_DW_CE_GPIOS(inst),))				\
+		MSPI_DW_FIFO_PROPS(inst),				\
+		DEFINE_REG_ACCESS(inst)					\
+	};								\
+	DEVICE_DT_INST_DEFINE(inst,					\
+		dev_init, PM_DEVICE_DT_INST_GET(inst),			\
+		&dev##inst##_data, &dev##inst##_config,			\
+		POST_KERNEL, CONFIG_MSPI_INIT_PRIORITY,			\
+		&drv_api);
+
+DT_INST_FOREACH_STATUS_OKAY(MSPI_DW_INST)
diff --git a/drivers/mspi/mspi_dw.h b/drivers/mspi/mspi_dw.h
new file mode 100644
index 00000000000..6f4a2c5a981
--- /dev/null
+++ b/drivers/mspi/mspi_dw.h
@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * This file is a part of mspi_dw.c extracted only for clarity.
+ * It is not supposed to be included by any file other than mspi_dw.c.
+ */
+
+/* CTRLR0 - Control Register 0 */
+#define CTRLR0_SPI_FRF_MASK	GENMASK(23, 22)
+#define CTRLR0_SPI_FRF_STANDARD	0UL
+#define CTRLR0_SPI_FRF_DUAL	1UL
+#define CTRLR0_SPI_FRF_QUAD	2UL
+#define CTRLR0_SPI_FRF_OCTAL	3UL
+#define CTRLR0_TMOD_MASK	GENMASK(11, 10)
+#define CTRLR0_TMOD_TX_RX	0UL
+#define CTRLR0_TMOD_TX		1UL
+#define CTRLR0_TMOD_RX		2UL
+#define CTRLR0_TMOD_EEPROM	3UL
+#define CTRLR0_SCPOL_BIT	BIT(9)
+#define CTRLR0_SCPH_BIT		BIT(8)
+#define CTRLR0_FRF_MASK		GENMASK(7, 6)
+#define CTRLR0_FRF_SPI		0UL
+#define CTRLR0_FRF_SSP		1UL
+#define CTRLR0_FRF_MICROWIRE	2UL
+#define CTRLR0_DFS_MASK		GENMASK(4, 0)
+
+/* CTRLR1- Control Register 1 */
+#define CTRLR1_NDF_MASK		GENMASK(15, 0)
+
+/* SSIENR - SSI Enable Register */
+#define SSIENR_SSIC_EN_BIT	BIT(0)
+
+/* TXFTLR - Transmit FIFO Threshold Level */
+#define TXFTLR_TXFTHR_MASK	GENMASK(23, 16)
+#define TXFTLR_TFT_MASK		GENMASK(7, 0)
+
+/* RXFTLR - Receive FIFO Threshold Level */
+#define RXFTLR_RFT_MASK		GENMASK(7, 0)
+
+/* TXFLR - Transmit FIFO Level Register */
+#define TXFLR_TXTFL_MASK	GENMASK(7, 0)
+
+/* RXFLR - Receive FIFO Level Register */
+#define RXFLR_RXTFL_MASK	GENMASK(7, 0)
+
+/* SR - Status Register */
+#define SR_BUSY_BIT	        BIT(0)
+
+/* IMR - Interrupt Mask Register */
+#define IMR_TXEIM_BIT		BIT(0)
+#define IMR_TXOIM_BIT		BIT(1)
+#define IMR_RXUIM_BIT		BIT(2)
+#define IMR_RXOIM_BIT		BIT(3)
+#define IMR_RXFIM_BIT		BIT(4)
+#define IMR_MSTIM_BIT		BIT(5)
+
+/* ISR - Interrupt Status Register */
+#define ISR_TXEIS_BIT		BIT(0)
+#define ISR_TXOIS_BIT		BIT(1)
+#define ISR_RXUIS_BIT		BIT(2)
+#define ISR_RXOIS_BIT		BIT(3)
+#define ISR_RXFIS_BIT		BIT(4)
+#define ISR_MSTIS_BIT		BIT(5)
+
+/* SPI_CTRLR0 - SPI Control Register */
+#define SPI_CTRLR0_CLK_STRETCH_EN_BIT		BIT(30)
+#define SPI_CTRLR0_XIP_PREFETCH_EN_BIT		BIT(29)
+#define SPI_CTRLR0_XIP_MBL_BIT			BIT(26)
+#define SPI_CTRLR0_SPI_RXDS_SIG_EN_BIT		BIT(25)
+#define SPI_CTRLR0_SPI_DM_EN_BIT		BIT(24)
+#define SPI_CTRLR0_RXDS_VL_EN_BIT		BIT(23)
+#define SPI_CTRLR0_SSIC_XIP_CONT_XFER_EN_BIT	BIT(21)
+#define SPI_CTRLR0_XIP_INST_EN_BIT		BIT(20)
+#define SPI_CTRLR0_XIP_DFS_HC_BIT		BIT(19)
+#define SPI_CTRLR0_SPI_RXDS_EN_BIT		BIT(18)
+#define SPI_CTRLR0_INST_DDR_EN_BIT		BIT(17)
+#define SPI_CTRLR0_SPI_DDR_EN_BIT		BIT(16)
+#define SPI_CTRLR0_WAIT_CYCLES_MASK		GENMASK(15, 11)
+#define SPI_CTRLR0_WAIT_CYCLES_MAX		BIT_MASK(5)
+#define SPI_CTRLR0_INST_L_MASK			GENMASK(9, 8)
+#define SPI_CTRLR0_INST_L0			0UL
+#define SPI_CTRLR0_INST_L4			1UL
+#define SPI_CTRLR0_INST_L8			2UL
+#define SPI_CTRLR0_INST_L16			3UL
+#define SPI_CTRLR0_XIP_MD_BIT_EN_BIT		BIT(7)
+#define SPI_CTRLR0_ADDR_L_MASK			GENMASK(5, 2)
+#define SPI_CTRLR0_TRANS_TYPE_MASK		GENMASK(1, 0)
+#define SPI_CTRLR0_TRANS_TYPE_TT0		0UL
+#define SPI_CTRLR0_TRANS_TYPE_TT1		1UL
+#define SPI_CTRLR0_TRANS_TYPE_TT2		2UL
+#define SPI_CTRLR0_TRANS_TYPE_TT3		3UL
+
+/* XIP_CTRL - XIP Control Register */
+#define XIP_CTRL_XIP_PREFETCH_EN_BIT	BIT(28)
+#define XIP_CTRL_XIP_MBL_MASK		GENMASK(27, 26)
+#define XIP_CTRL_XIP_MBL_2		0UL
+#define XIP_CTRL_XIP_MBL_4		1UL
+#define XIP_CTRL_XIP_MBL_8		2UL
+#define XIP_CTRL_XIP_MBL_16		3UL
+#define XIP_CTRL_RXDS_SIG_EN_BIT	BIT(25)
+#define XIP_CTRL_XIP_HYBERBUS_EN_BIT	BIT(24)
+#define XIP_CTRL_CONT_XFER_EN_BIT	BIT(23)
+#define XIP_CTRL_INST_EN_BIT		BIT(22)
+#define XIP_CTRL_RXDS_EN_BIT		BIT(21)
+#define XIP_CTRL_INST_DDR_EN_BIT	BIT(20)
+#define XIP_CTRL_DDR_EN_BIT		BIT(19)
+#define XIP_CTRL_DFS_HC_BIT		BIT(18)
+#define XIP_CTRL_WAIT_CYCLES_MASK	GENMASK(17, 13)
+#define XIP_CTRL_WAIT_CYCLES_MAX	BIT_MASK(5)
+#define XIP_CTRL_MD_BITS_EN_BIT		BIT(12)
+#define XIP_CTRL_INST_L_MASK		GENMASK(10, 9)
+#define XIP_CTRL_INST_L0		0UL
+#define XIP_CTRL_INST_L4		1UL
+#define XIP_CTRL_INST_L8		2UL
+#define XIP_CTRL_INST_L16		3UL
+#define XIP_CTRL_ADDR_L_MASK		GENMASK(7, 4)
+#define XIP_CTRL_TRANS_TYPE_MASK	GENMASK(3, 2)
+#define XIP_CTRL_TRANS_TYPE_TT0		0UL
+#define XIP_CTRL_TRANS_TYPE_TT1		1UL
+#define XIP_CTRL_TRANS_TYPE_TT2		2UL
+#define XIP_CTRL_FRF_MASK		GENMASK(1, 0)
+#define XIP_CTRL_FRF_DUAL		1UL
+#define XIP_CTRL_FRF_QUAD		2UL
+#define XIP_CTRL_FRF_OCTAL		3UL
+
+/* XIP_CTRL - XIP Control Register */
+#define XIP_CTRL_XIP_PREFETCH_EN_BIT	BIT(28)
+#define XIP_CTRL_XIP_MBL_MASK		GENMASK(27, 26)
+#define XIP_CTRL_XIP_MBL_2		0UL
+#define XIP_CTRL_XIP_MBL_4		1UL
+#define XIP_CTRL_XIP_MBL_8		2UL
+#define XIP_CTRL_XIP_MBL_16		3UL
+#define XIP_CTRL_XIP_HYBERBUS_EN_BIT	BIT(24)
+#define XIP_CTRL_CONT_XFER_EN_BIT	BIT(23)
+#define XIP_CTRL_INST_EN_BIT		BIT(22)
+#define XIP_CTRL_RXDS_EN_BIT		BIT(21)
+#define XIP_CTRL_INST_DDR_EN_BIT	BIT(20)
+#define XIP_CTRL_DDR_EN_BIT		BIT(19)
+#define XIP_CTRL_DFS_HC_BIT		BIT(18)
+
+/* XIP_WRITE_CTRL - XIP Write Control Register */
+#define XIP_WRITE_CTRL_WAIT_CYCLES_MASK	GENMASK(20, 16)
+#define XIP_WRITE_CTRL_WAIT_CYCLES_MAX	BIT_MASK(5)
+#define XIP_WRITE_CTRL_RXDS_SIG_EN_BIT	BIT(13)
+#define XIP_WRITE_CTRL_HYBERBUS_EN_BIT	BIT(12)
+#define XIP_WRITE_CTRL_INST_DDR_EN_BIT	BIT(11)
+#define XIP_WRITE_CTRL_SPI_DDR_EN_BIT	BIT(10)
+#define XIP_WRITE_CTRL_INST_L_MASK	GENMASK(9, 8)
+#define XIP_WRITE_CTRL_INST_L0		0UL
+#define XIP_WRITE_CTRL_INST_L4		1UL
+#define XIP_WRITE_CTRL_INST_L8		2UL
+#define XIP_WRITE_CTRL_INST_L16		3UL
+#define XIP_WRITE_CTRL_ADDR_L_MASK	GENMASK(7, 4)
+#define XIP_WRITE_CTRL_TRANS_TYPE_MASK	GENMASK(3, 2)
+#define XIP_WRITE_CTRL_TRANS_TYPE_TT0	0UL
+#define XIP_WRITE_CTRL_TRANS_TYPE_TT1	1UL
+#define XIP_WRITE_CTRL_TRANS_TYPE_TT2	2UL
+#define XIP_WRITE_CTRL_FRF_MASK		GENMASK(1, 0)
+#define XIP_WRITE_CTRL_FRF_DUAL		1UL
+#define XIP_WRITE_CTRL_FRF_QUAD		2UL
+#define XIP_WRITE_CTRL_FRF_OCTAL	3UL
+
+/* Register access helpers. */
+#define USES_AUX_REG(inst) + DT_INST_PROP(inst, aux_reg_enable)
+#define AUX_REG_INSTANCES (0 DT_INST_FOREACH_STATUS_OKAY(USES_AUX_REG))
+#define BASE_ADDR(dev) (mm_reg_t)DEVICE_MMIO_GET(dev)
+
+#if AUX_REG_INSTANCES != 0
+static uint32_t aux_reg_read(const struct device *dev, uint32_t off)
+{
+	return sys_in32(BASE_ADDR(dev) + off/4);
+}
+static void aux_reg_write(uint32_t data, const struct device *dev, uint32_t off)
+{
+	sys_out32(data, BASE_ADDR(dev) + off/4);
+}
+#endif
+
+#if AUX_REG_INSTANCES != DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT)
+static uint32_t reg_read(const struct device *dev, uint32_t off)
+{
+	return sys_read32(BASE_ADDR(dev) + off);
+}
+static void reg_write(uint32_t data, const struct device *dev, uint32_t off)
+{
+	sys_write32(data, BASE_ADDR(dev) + off);
+}
+#endif
+
+#if AUX_REG_INSTANCES == 0
+/* If no instance uses aux-reg access. */
+#define DECLARE_REG_ACCESS()
+#define DEFINE_REG_ACCESS(inst)
+#define DEFINE_MM_REG_RD(reg, off) \
+	static inline uint32_t read_##reg(const struct device *dev) \
+	{ return reg_read(dev, off); }
+#define DEFINE_MM_REG_WR(reg, off) \
+	static inline void write_##reg(const struct device *dev, uint32_t data) \
+	{ reg_write(data, dev, off); }
+
+#elif AUX_REG_INSTANCES == DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT)
+/* If all instances use aux-reg access. */
+#define DECLARE_REG_ACCESS()
+#define DEFINE_REG_ACCESS(inst)
+#define DEFINE_MM_REG_RD(reg, off) \
+	static inline uint32_t read_##reg(const struct device *dev) \
+	{ return aux_reg_read(dev, off); }
+#define DEFINE_MM_REG_WR(reg, off) \
+	static inline void write_##reg(const struct device *dev, uint32_t data) \
+	{ aux_reg_write(data, dev, off); }
+
+#else
+/* If register access varies by instance. */
+#define DECLARE_REG_ACCESS() \
+	uint32_t (*read)(const struct device *dev, uint32_t off); \
+	void (*write)(uint32_t data, const struct device *dev, uint32_t off)
+#define DEFINE_REG_ACCESS(inst) \
+	COND_CODE_1(DT_INST_PROP(inst, aux_reg_enable), \
+		(.read = aux_reg_read, \
+		.write = aux_reg_write,), \
+		(.read = reg_read, \
+		.write = reg_write,))
+#define DEFINE_MM_REG_RD(reg, off) \
+	static inline uint32_t read_##reg(const struct device *dev) \
+	{ \
+		const struct mspi_dw_config *dev_config = dev->config; \
+		return dev_config->read(dev, off); \
+	}
+#define DEFINE_MM_REG_WR(reg, off) \
+	static inline void write_##reg(const struct device *dev, uint32_t data) \
+	{ \
+		const struct mspi_dw_config *dev_config = dev->config; \
+		dev_config->write(data, dev, off); \
+	}
+#endif
diff --git a/drivers/mspi/mspi_dw_vendor_specific.h b/drivers/mspi/mspi_dw_vendor_specific.h
new file mode 100644
index 00000000000..7255f926fa8
--- /dev/null
+++ b/drivers/mspi/mspi_dw_vendor_specific.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * This file is a part of mspi_dw.c extracted only for clarity.
+ * It is not supposed to be included by any file other than mspi_dw.c.
+ */
+
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
+
+#include <nrf.h>
+
+static void vendor_specific_init(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	NRF_EXMIF->EVENTS_CORE = 0;
+	NRF_EXMIF->INTENSET = BIT(EXMIF_INTENSET_CORE_Pos);
+}
+
+static void vendor_specific_suspend(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	NRF_EXMIF->TASKS_STOP = 1;
+}
+
+static void vendor_specific_resume(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	NRF_EXMIF->TASKS_START = 1;
+}
+
+static void vendor_specific_irq_clear(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	NRF_EXMIF->EVENTS_CORE = 0;
+}
+
+#if defined(CONFIG_MSPI_XIP)
+static int vendor_specific_xip_enable(const struct device *dev,
+				      const struct mspi_dev_id *dev_id,
+				      const struct mspi_xip_cfg *cfg)
+{
+	ARG_UNUSED(dev);
+
+	if (dev_id->dev_idx == 0) {
+		NRF_EXMIF->EXTCONF1.OFFSET = cfg->address_offset;
+		NRF_EXMIF->EXTCONF1.SIZE = cfg->address_offset
+					 + cfg->size - 1;
+		NRF_EXMIF->EXTCONF1.ENABLE = 1;
+	} else if (dev_id->dev_idx == 1) {
+		NRF_EXMIF->EXTCONF2.OFFSET = cfg->address_offset;
+		NRF_EXMIF->EXTCONF2.SIZE = cfg->address_offset
+					 + cfg->size - 1;
+		NRF_EXMIF->EXTCONF2.ENABLE = 1;
+	} else {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int vendor_specific_xip_disable(const struct device *dev,
+				       const struct mspi_dev_id *dev_id,
+				       const struct mspi_xip_cfg *cfg)
+{
+	ARG_UNUSED(dev);
+
+	if (dev_id->dev_idx == 0) {
+		NRF_EXMIF->EXTCONF1.ENABLE = 0;
+	} else if (dev_id->dev_idx == 1) {
+		NRF_EXMIF->EXTCONF2.ENABLE = 0;
+	} else {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+#endif /* defined(CONFIG_MSPI_XIP) */
+
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) */
diff --git a/dts/bindings/mspi/snps,designware-ssi.yaml b/dts/bindings/mspi/snps,designware-ssi.yaml
new file mode 100644
index 00000000000..fb516cb7835
--- /dev/null
+++ b/dts/bindings/mspi/snps,designware-ssi.yaml
@@ -0,0 +1,45 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Synopsys DesignWare Synchronous Serial Interface (SSI) node
+
+compatible: "snps,designware-ssi"
+
+include: [mspi-controller.yaml, pinctrl-device.yaml]
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  aux-reg-enable:
+    type: boolean
+    description: |
+      Activates auxiliary register access that is needed on some platforms.
+
+  fifo-depth:
+    required: true
+    type: int
+    description: |
+      Number of items that can be stored in the TX FIFO. Range: 8-256.
+      If the RX FIFO depth is not specified separately in the rx-fifo-depth
+      property, this value specifies depth of both TX and RX FIFOs.
+
+  rx-fifo-depth:
+    type: int
+    description: |
+      Number of items that can be stored in the RX FIFO. Range: 8-256.
+
+  tx-fifo-threshold:
+    type: int
+    description: |
+      Number of entries in the TX FIFO above which the TX transfer is started.
+      Maximum value is the TX FIFO depth - 1.
+
+  rx-fifo-threshold:
+    type: int
+    description: |
+      Number of entries in the RX FIFO above which the controller gets an RX
+      interrupt. Maximum value is the RX FIFO depth - 1.

From c6ace4b9136efbd1c1d3fadbb70684a08e2e0d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 17 Oct 2024 14:23:17 +0200
Subject: [PATCH 0945/2913] [nrf fromlist] drivers: flash: Add generic NOR
 flash driver for MSPI devices
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a flash driver intended to handle various flash devices
connected over MSPI bus as long as they support JEDEC SFDP.
This is an initial commit providing only basic operations
in Octal I/O mode with some hard-coded values for Macronix
MX25Ux series chips.

Upstream PR #: 80042

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/flash/CMakeLists.txt         |   1 +
 drivers/flash/Kconfig.mspi           |  18 +
 drivers/flash/flash_mspi_nor.c       | 629 +++++++++++++++++++++++++++
 dts/bindings/mtd/jedec,mspi-nor.yaml |  13 +
 4 files changed, 661 insertions(+)
 create mode 100644 drivers/flash/flash_mspi_nor.c
 create mode 100644 dts/bindings/mtd/jedec,mspi-nor.yaml

diff --git a/drivers/flash/CMakeLists.txt b/drivers/flash/CMakeLists.txt
index 97d9cd55059..aa2f8de7f75 100644
--- a/drivers/flash/CMakeLists.txt
+++ b/drivers/flash/CMakeLists.txt
@@ -34,6 +34,7 @@ zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_MX25UM51345G flash_mcux_f
 zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_NOR flash_mcux_flexspi_nor.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_ATXP032 flash_mspi_atxp032.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_EMUL_DEVICE flash_mspi_emul_device.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_NOR flash_mspi_nor.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_NOR flash_npcx_fiu_nor.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_QSPI flash_npcx_fiu_qspi.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_RPI_PICO flash_rpi_pico.c)
diff --git a/drivers/flash/Kconfig.mspi b/drivers/flash/Kconfig.mspi
index 158fcefb528..f9e515b5f9a 100644
--- a/drivers/flash/Kconfig.mspi
+++ b/drivers/flash/Kconfig.mspi
@@ -28,4 +28,22 @@ config FLASH_MSPI_ATXP032
 	select FLASH_JESD216
 	select MSPI_AMBIQ_AP3 if SOC_SERIES_APOLLO3X
 
+menuconfig FLASH_MSPI_NOR
+	bool "Generic MSPI NOR Flash"
+	default y
+	depends on DT_HAS_JEDEC_MSPI_NOR_ENABLED
+	select FLASH_MSPI
+	select FLASH_HAS_EXPLICIT_ERASE
+	select FLASH_JESD216
+	select GPIO if $(dt_compat_any_has_prop,$(DT_COMPAT_JEDEC_MSPI_NOR),reset-gpios)
+
+config FLASH_MSPI_NOR_INIT_PRIORITY
+	int
+	depends on FLASH_MSPI_NOR
+	default 80
+	help
+	  Device driver initialization priority.
+	  Device is connected to MSPI bus, it has to
+	  be initialized after MSPI driver.
+
 endmenu
diff --git a/drivers/flash/flash_mspi_nor.c b/drivers/flash/flash_mspi_nor.c
new file mode 100644
index 00000000000..1b8bfa1852f
--- /dev/null
+++ b/drivers/flash/flash_mspi_nor.c
@@ -0,0 +1,629 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT jedec_mspi_nor
+
+#include <zephyr/drivers/flash.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/mspi.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
+
+#include "jesd216.h"
+#include "spi_nor.h"
+
+LOG_MODULE_REGISTER(flash_mspi_nor, CONFIG_FLASH_LOG_LEVEL);
+
+struct flash_mspi_nor_data {
+	struct k_sem acquired;
+	struct mspi_xfer_packet packet;
+	struct mspi_xfer xfer;
+};
+
+struct flash_mspi_nor_config {
+	const struct device *bus;
+	struct mspi_dev_id mspi_id;
+	struct mspi_dev_cfg mspi_cfg;
+#if defined(CONFIG_MSPI_XIP)
+	struct mspi_xip_cfg xip_cfg;
+#endif
+	struct gpio_dt_spec reset;
+	uint32_t flash_size;
+#if defined(CONFIG_FLASH_PAGE_LAYOUT)
+	struct flash_pages_layout layout;
+#endif
+	uint8_t jedec_id[SPI_NOR_MAX_ID_LEN];
+};
+
+static int acquire(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	int rc;
+
+	k_sem_take(&dev_data->acquired, K_FOREVER);
+
+	rc = pm_device_runtime_get(dev_config->bus);
+	if (rc < 0) {
+		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+		return rc;
+	}
+
+	/* This acquires the MSPI controller and configures it for the flash. */
+	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
+			     MSPI_DEVICE_CONFIG_ALL, &dev_config->mspi_cfg);
+	if (rc < 0) {
+		LOG_ERR("mspi_dev_config() failed: %d", rc);
+		return rc;
+	}
+
+	return 0;
+}
+
+static void release(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+
+	/* This releases the MSPI controller. */
+	(void)mspi_get_channel_status(dev_config->bus, 0);
+
+	(void)pm_device_runtime_put(dev_config->bus);
+
+	k_sem_give(&dev_data->acquired);
+}
+
+static inline uint32_t dev_flash_size(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+
+	return dev_config->flash_size;
+}
+
+static inline uint16_t dev_page_size(const struct device *dev)
+{
+	return SPI_NOR_PAGE_SIZE;
+}
+
+static int api_read(const struct device *dev, off_t addr, void *dest,
+		    size_t size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	const uint32_t flash_size = dev_flash_size(dev);
+	int rc;
+
+	if (size == 0) {
+		return 0;
+	}
+
+	if ((addr < 0) || ((addr + size) > flash_size)) {
+		return -EINVAL;
+	}
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	/* TODO: get rid of all these hard-coded values for MX25Ux chips */
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 20;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = SPI_NOR_OCMD_RD;
+	dev_data->packet.address   = addr;
+	dev_data->packet.data_buf  = dest;
+	dev_data->packet.num_bytes = size;
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+
+	release(dev);
+
+	if (rc < 0) {
+		LOG_ERR("SPI_NOR_OCMD_RD xfer failed: %d", rc);
+		return rc;
+	}
+
+	return 0;
+}
+
+static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	uint8_t status_reg;
+	int rc;
+
+	while (true) {
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.addr_length = 4;
+		dev_data->xfer.rx_dummy    = 4;
+		dev_data->packet.dir       = MSPI_RX;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_RDSR;
+		dev_data->packet.address   = 0;
+		dev_data->packet.data_buf  = &status_reg;
+		dev_data->packet.num_bytes = sizeof(status_reg);
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_RDSR xfer failed: %d", rc);
+			return rc;
+		}
+		if (!(status_reg & SPI_NOR_WIP_BIT)) {
+			break;
+		}
+
+		k_sleep(poll_period);
+	}
+
+	return 0;
+}
+
+static int api_write(const struct device *dev, off_t addr, const void *src,
+		     size_t size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	const uint32_t flash_size = dev_flash_size(dev);
+	const uint16_t page_size = dev_page_size(dev);
+	int rc;
+
+	if (size == 0) {
+		return 0;
+	}
+
+	if ((addr < 0) || ((addr + size) > flash_size)) {
+		return -EINVAL;
+	}
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	while (size > 0) {
+		/* Split write into parts, each within one page only. */
+		uint16_t page_offset = (uint16_t)(addr % page_size);
+		uint16_t page_left = page_size - page_offset;
+		uint16_t to_write = (uint16_t)MIN(size, page_left);
+
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.tx_dummy    = 0;
+		dev_data->packet.dir       = MSPI_TX;
+
+		dev_data->xfer.addr_length = 0;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
+		dev_data->packet.num_bytes = 0;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
+			break;
+		}
+
+		dev_data->xfer.addr_length = 4;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_PAGE_PRG;
+		dev_data->packet.address   = addr;
+		dev_data->packet.data_buf  = (uint8_t *)src;
+		dev_data->packet.num_bytes = to_write;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_PAGE_PRG xfer failed: %d", rc);
+			break;
+		}
+
+		addr += to_write;
+		src   = (const uint8_t *)src + to_write;
+		size -= to_write;
+
+		rc = wait_until_ready(dev, K_MSEC(1));
+		if (rc < 0) {
+			break;
+		}
+	}
+
+	release(dev);
+
+	return rc;
+}
+
+static int api_erase(const struct device *dev, off_t addr, size_t size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	const uint32_t flash_size = dev_flash_size(dev);
+	int rc = 0;
+
+	if ((addr < 0) || ((addr + size) > flash_size)) {
+		return -EINVAL;
+	}
+
+	if (!SPI_NOR_IS_SECTOR_ALIGNED(addr)) {
+		return -EINVAL;
+	}
+
+	if ((size % SPI_NOR_SECTOR_SIZE) != 0) {
+		return -EINVAL;
+	}
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	while (size > 0) {
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.tx_dummy    = 0;
+		dev_data->packet.dir       = MSPI_TX;
+		dev_data->packet.num_bytes = 0;
+
+		dev_data->xfer.addr_length = 0;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
+			break;
+		}
+
+		if (size == flash_size) {
+			/* Chip erase. */
+			dev_data->xfer.addr_length = 0;
+			dev_data->packet.cmd       = SPI_NOR_OCMD_CE;
+
+			size -= flash_size;
+		} else {
+			/* Sector erase. */
+			dev_data->xfer.addr_length = 4;
+			dev_data->packet.cmd       = SPI_NOR_OCMD_SE;
+			dev_data->packet.address   = addr;
+
+			addr += SPI_NOR_SECTOR_SIZE;
+			size -= SPI_NOR_SECTOR_SIZE;
+		}
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("Erase command 0x%02x xfer failed: %d",
+				dev_data->packet.cmd, rc);
+			break;
+		}
+
+		rc = wait_until_ready(dev, K_MSEC(1));
+		if (rc < 0) {
+			break;
+		}
+	}
+
+	release(dev);
+
+	return rc;
+}
+
+static const
+struct flash_parameters *api_get_parameters(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	static const struct flash_parameters parameters = {
+		.write_block_size = 1,
+		.erase_value = 0xff,
+	};
+
+	return &parameters;
+}
+
+static int read_jedec_id(const struct device *dev, uint8_t *id)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	int rc;
+
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 4;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_OCMD_READ_ID;
+	dev_data->packet.address   = 0;
+	dev_data->packet.data_buf  = id;
+	dev_data->packet.num_bytes = JESD216_READ_ID_LEN;
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		printk("mspi_transceive() failed: %d\n", rc);
+		return rc;
+	}
+
+	return rc;
+}
+
+#if defined(CONFIG_FLASH_PAGE_LAYOUT)
+static void api_page_layout(const struct device *dev,
+			     const struct flash_pages_layout **layout,
+			     size_t *layout_size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+
+	*layout = &dev_config->layout;
+	*layout_size = 1;
+}
+#endif /* CONFIG_FLASH_PAGE_LAYOUT */
+
+#if defined(CONFIG_FLASH_JESD216_API)
+static int api_sfdp_read(const struct device *dev, off_t addr, void *dest,
+			 size_t size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	int rc;
+
+	if (size == 0) {
+		return 0;
+	}
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 20;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_OCMD_READ_SFDP;
+	dev_data->packet.address   = addr;
+	dev_data->packet.data_buf  = dest;
+	dev_data->packet.num_bytes = size;
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		printk("JESD216_OCMD_READ_SFDP xfer failed: %d\n", rc);
+		return rc;
+	}
+
+	release(dev);
+
+	return rc;
+}
+
+static int api_read_jedec_id(const struct device *dev, uint8_t *id)
+{
+	int rc = 0;
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	rc = read_jedec_id(dev, id);
+
+	release(dev);
+
+	return rc;
+}
+#endif /* CONFIG_FLASH_JESD216_API  */
+
+static int dev_pm_action_cb(const struct device *dev,
+			    enum pm_device_action action)
+{
+	switch (action) {
+	case PM_DEVICE_ACTION_SUSPEND:
+		break;
+	case PM_DEVICE_ACTION_RESUME:
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+static int flash_chip_init(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	struct mspi_dev_cfg init_dev_cfg = dev_config->mspi_cfg;
+	uint8_t id[JESD216_READ_ID_LEN] = {0};
+	int rc;
+
+	init_dev_cfg.freq = MHZ(1);
+	init_dev_cfg.io_mode = MSPI_IO_MODE_SINGLE;
+
+	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
+			     MSPI_DEVICE_CONFIG_ALL, &init_dev_cfg);
+	if (rc < 0) {
+		LOG_ERR("Failed to set initial device config: %d", rc);
+		return rc;
+	}
+
+	dev_data->xfer.xfer_mode  = MSPI_PIO;
+	dev_data->xfer.packets    = &dev_data->packet;
+	dev_data->xfer.num_packet = 1;
+	dev_data->xfer.timeout    = 10;
+
+	dev_data->xfer.cmd_length  = 1;
+	dev_data->xfer.addr_length = 0;
+	dev_data->xfer.tx_dummy    = 0;
+	dev_data->xfer.rx_dummy    = 0;
+
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_CMD_READ_ID;
+	dev_data->packet.data_buf  = id;
+	dev_data->packet.num_bytes = sizeof(id);
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		LOG_ERR("Failed to read JEDEC ID in single line mode: %d", rc);
+		return rc;
+	}
+
+	/*
+	 * If the read ID does not match the one from DTS, assume the flash
+	 * is already in the Octa I/O mode, so switching it is not needed.
+	 */
+	if (memcmp(id, dev_config->jedec_id, sizeof(id)) == 0) {
+		static const uint8_t enable_sopi[] = { 0x01 };
+
+		dev_data->packet.dir       = MSPI_TX;
+		dev_data->packet.cmd       = SPI_NOR_CMD_WREN;
+		dev_data->packet.num_bytes = 0;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_CMD_WREN xfer failed: %d", rc);
+			return rc;
+		}
+
+		dev_data->xfer.addr_length = 4;
+		dev_data->packet.cmd       = SPI_NOR_CMD_WR_CFGREG2;
+		dev_data->packet.address   = 0;
+		dev_data->packet.data_buf  = (uint8_t *)&enable_sopi;
+		dev_data->packet.num_bytes = sizeof(enable_sopi);
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			printk("SPI_NOR_CMD_WR_CFGREG2 xfer failed: %d\n", rc);
+			return rc;
+		}
+	}
+
+	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
+			     MSPI_DEVICE_CONFIG_ALL, &dev_config->mspi_cfg);
+	if (rc < 0) {
+		LOG_ERR("Failed to set device config: %d", rc);
+		return rc;
+	}
+
+	rc = read_jedec_id(dev, id);
+	if (rc < 0) {
+		return rc;
+	}
+
+	if (memcmp(id, dev_config->jedec_id, sizeof(id)) != 0) {
+		LOG_ERR("JEDEC ID mismatch, read: %02x %02x %02x, "
+			"expected: %02x %02x %02x",
+			id[0], id[1], id[2],
+			dev_config->jedec_id[0],
+			dev_config->jedec_id[1],
+			dev_config->jedec_id[2]);
+		return -ENODEV;
+	}
+
+#if defined(CONFIG_MSPI_XIP)
+	/* Enable XIP access for this chip if specified so in DT. */
+	if (dev_config->xip_cfg.enable) {
+		rc = mspi_xip_config(dev_config->bus, &dev_config->mspi_id,
+				     &dev_config->xip_cfg);
+		if (rc < 0) {
+			return rc;
+		}
+	}
+#endif
+
+	return 0;
+}
+
+static int drv_init(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	int rc;
+
+	if (!device_is_ready(dev_config->bus)) {
+		LOG_ERR("Device %s is not ready", dev_config->bus->name);
+		return -ENODEV;
+	}
+
+	if (dev_config->reset.port) {
+		if (!gpio_is_ready_dt(&dev_config->reset)) {
+			LOG_ERR("Device %s is not ready",
+				dev_config->reset.port->name);
+			return -ENODEV;
+		}
+
+		if (gpio_pin_configure_dt(&dev_config->reset,
+					  GPIO_OUTPUT_ACTIVE) < 0 ||
+		    gpio_pin_set_dt(&dev_config->reset, 0) < 0) {
+			return -EIO;
+		}
+	}
+
+	rc = pm_device_runtime_get(dev_config->bus);
+	if (rc < 0) {
+		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+		return rc;
+	}
+
+	/* Acquire the MSPI controller. */
+	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
+			     MSPI_DEVICE_CONFIG_NONE, NULL);
+	if (rc == 0) {
+		rc = flash_chip_init(dev);
+
+		/* Release the MSPI controller. */
+		(void)mspi_get_channel_status(dev_config->bus, 0);
+	}
+
+	(void)pm_device_runtime_put(dev_config->bus);
+
+	if (rc < 0) {
+		return rc;
+	}
+
+	k_sem_init(&dev_data->acquired, 1, K_SEM_MAX_LIMIT);
+
+	return pm_device_driver_init(dev, dev_pm_action_cb);
+}
+
+static const struct flash_driver_api drv_api = {
+	.read = api_read,
+	.write = api_write,
+	.erase = api_erase,
+	.get_parameters = api_get_parameters,
+#if defined(CONFIG_FLASH_PAGE_LAYOUT)
+	.page_layout = api_page_layout,
+#endif
+#if defined(CONFIG_FLASH_JESD216_API)
+	.sfdp_read = api_sfdp_read,
+	.read_jedec_id = api_read_jedec_id,
+#endif
+};
+
+#define FLASH_SIZE_INST(inst) (DT_INST_PROP(inst, size) / 8)
+
+#define FLASH_MSPI_NOR_INST(inst)					\
+	BUILD_ASSERT(DT_INST_ENUM_IDX(inst, mspi_io_mode) ==		\
+		     MSPI_IO_MODE_OCTAL,				\
+		"Only Octal I/O mode is supported for now");		\
+	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);		\
+	static struct flash_mspi_nor_data dev##inst##_data;		\
+	static const struct flash_mspi_nor_config dev##inst##_config = {\
+		.bus = DEVICE_DT_GET(DT_INST_BUS(inst)),		\
+		.mspi_id = MSPI_DEVICE_ID_DT_INST(inst),		\
+		.mspi_cfg = MSPI_DEVICE_CONFIG_DT_INST(inst),		\
+	IF_ENABLED(CONFIG_MSPI_XIP,					\
+		(.xip_cfg = MSPI_XIP_CONFIG_DT_INST(inst),))		\
+		.reset = GPIO_DT_SPEC_INST_GET_OR(inst,			\
+						  reset_gpios, {0}),	\
+		.flash_size = FLASH_SIZE_INST(inst),			\
+	IF_ENABLED(CONFIG_FLASH_PAGE_LAYOUT,				\
+		(.layout = {						\
+			/* TODO: make this size configurable */		\
+			.pages_size = 65536,				\
+			.pages_count = FLASH_SIZE_INST(inst) / 65536,	\
+		},))							\
+		.jedec_id = DT_INST_PROP(inst, jedec_id),		\
+	};								\
+	DEVICE_DT_INST_DEFINE(inst,					\
+		drv_init, PM_DEVICE_DT_INST_GET(inst),			\
+		&dev##inst##_data, &dev##inst##_config,			\
+		POST_KERNEL, CONFIG_FLASH_MSPI_NOR_INIT_PRIORITY,	\
+		&drv_api);
+
+DT_INST_FOREACH_STATUS_OKAY(FLASH_MSPI_NOR_INST)
diff --git a/dts/bindings/mtd/jedec,mspi-nor.yaml b/dts/bindings/mtd/jedec,mspi-nor.yaml
new file mode 100644
index 00000000000..9da68b7dd49
--- /dev/null
+++ b/dts/bindings/mtd/jedec,mspi-nor.yaml
@@ -0,0 +1,13 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Generic NOR flash on MSPI bus
+
+compatible: "jedec,mspi-nor"
+
+include: [mspi-device.yaml, "jedec,spi-nor-common.yaml"]
+
+properties:
+  reset-gpios:
+    type: phandle-array
+    description: RESETn pin

From 3f12dd6eca901c1830c49d754e0dc8be147635d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 17 Oct 2024 14:17:54 +0200
Subject: [PATCH 0946/2913] [nrf noup] drivers: pinctrl_nrf: Add support for
 EXMIF pins
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a follow-up to commit 45d827a51a708e54437f5681dc6c4fb77bfb4f52.

Although routing for those pins is configured via UICR, pinctrl still
needs to be involved so that it is possible to set desired drive mode
for them etc.
Add also the missing RWDS pin.

Upstream PR #: 80042
Applied as a [nrf noup] due to a conflict.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/pinctrl/pinctrl_nrf.c                  | 18 ++++++++++++++++++
 .../zephyr/dt-bindings/pinctrl/nrf-pinctrl.h   |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index d0354f600a9..42c4f24559a 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -374,6 +374,24 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_can) */
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
+		/* Pin routing is controlled by secure domain, via UICR */
+		case NRF_FUN_EXMIF_CK:
+		case NRF_FUN_EXMIF_DQ0:
+		case NRF_FUN_EXMIF_DQ1:
+		case NRF_FUN_EXMIF_DQ2:
+		case NRF_FUN_EXMIF_DQ3:
+		case NRF_FUN_EXMIF_DQ4:
+		case NRF_FUN_EXMIF_DQ5:
+		case NRF_FUN_EXMIF_DQ6:
+		case NRF_FUN_EXMIF_DQ7:
+		case NRF_FUN_EXMIF_CS0:
+		case NRF_FUN_EXMIF_CS1:
+		case NRF_FUN_EXMIF_RWDS:
+			dir = NRF_GPIO_PIN_DIR_INPUT;
+			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
+			break;
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) */
 		default:
 			return -ENOTSUP;
 		}
diff --git a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
index a73f59c48b7..49c06f3668c 100644
--- a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
@@ -162,6 +162,8 @@
 #define NRF_FUN_CAN_TX 46U
 /** CAN RX */
 #define NRF_FUN_CAN_RX 47U
+/** EXMIF RWDS */
+#define NRF_FUN_EXMIF_RWDS 50U
 /** GRTC fast clock output */
 #define NRF_FUN_GRTC_CLKOUT_FAST 55U
 /** GRTC slow clock output */

From 0f83f86f8fe62c98d585fe6c6a2d65036d7e4d3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Mon, 9 Dec 2024 12:12:23 +0100
Subject: [PATCH 0947/2913] Revert "[nrf noup] drivers: spi: dw: turn on
 FAST_ACTIVE1 domain"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e606246f0fc3e9299cb5bdd3c1e34a091e5d85a1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/spi/spi_dw.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
index 5801c2744b4..b4f772b158b 100644
--- a/drivers/spi/spi_dw.c
+++ b/drivers/spi/spi_dw.c
@@ -45,10 +45,6 @@ LOG_MODULE_REGISTER(spi_dw);
 #include <nrfx.h>
 #endif
 
-#ifdef CONFIG_SOC_NRF54H20_GPD
-#include <nrf/gpd.h>
-#endif
-
 static inline bool spi_dw_is_slave(struct spi_dw_data *spi)
 {
 	return (IS_ENABLED(CONFIG_SPI_SLAVE) &&
@@ -564,13 +560,6 @@ int spi_dw_init(const struct device *dev)
 #ifdef CONFIG_HAS_NRFX
 	NRF_EXMIF->INTENSET = BIT(0);
 	NRF_EXMIF->TASKS_START = 1;
-
-#ifdef CONFIG_SOC_NRF54H20_GPD
-	err = nrf_gpd_request(NRF_GPD_FAST_ACTIVE1);
-	if (err < 0) {
-		return err;
-	}
-#endif
 #endif
 
 	info->config_func();

From 9a1161507c0fee4bb6834ccdc39cf23b993edea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Mon, 9 Dec 2024 11:58:06 +0100
Subject: [PATCH 0948/2913] Revert "[nrf noup] drivers: spi_dw: add custom
 EXMIF peripheral handling"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f68b2edaa2233cde29d955bc3d3b3dd75ff50334.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/spi/spi_dw.c            | 21 +--------------------
 dts/common/nordic/nrf54h20.dtsi |  2 +-
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
index b4f772b158b..649a13aca01 100644
--- a/drivers/spi/spi_dw.c
+++ b/drivers/spi/spi_dw.c
@@ -41,10 +41,6 @@ LOG_MODULE_REGISTER(spi_dw);
 #include <zephyr/drivers/pinctrl.h>
 #endif
 
-#ifdef CONFIG_HAS_NRFX
-#include <nrfx.h>
-#endif
-
 static inline bool spi_dw_is_slave(struct spi_dw_data *spi)
 {
 	return (IS_ENABLED(CONFIG_SPI_SLAVE) &&
@@ -262,7 +258,6 @@ static int spi_dw_configure(const struct device *dev,
 		/* Baud rate and Slave select, for master only */
 		write_baudr(dev, SPI_DW_CLK_DIVIDER(info->clock_frequency,
 						    config->frequency));
-		write_ser(dev, BIT(config->slave));
 	}
 
 	if (spi_dw_is_slave(spi)) {
@@ -505,10 +500,6 @@ void spi_dw_isr(const struct device *dev)
 	uint32_t int_status;
 	int error;
 
-#ifdef CONFIG_HAS_NRFX
-	NRF_EXMIF->EVENTS_CORE = 0;
-#endif
-
 	int_status = read_isr(dev);
 
 	LOG_DBG("SPI %p int_status 0x%x - (tx: %d, rx: %d)", dev, int_status,
@@ -557,11 +548,6 @@ int spi_dw_init(const struct device *dev)
 
 	DEVICE_MMIO_MAP(dev, K_MEM_CACHE_NONE);
 
-#ifdef CONFIG_HAS_NRFX
-	NRF_EXMIF->INTENSET = BIT(0);
-	NRF_EXMIF->TASKS_START = 1;
-#endif
-
 	info->config_func();
 
 	/* Masking interrupt and making sure controller is disabled */
@@ -580,11 +566,6 @@ int spi_dw_init(const struct device *dev)
 	return 0;
 }
 
-#define REG_ADDR(inst) \
-	COND_CODE_1(DT_NODE_HAS_COMPAT(DT_DRV_INST(inst), nordic_nrf_exmif), \
-		    (Z_DEVICE_MMIO_NAMED_ROM_INITIALIZER(core, DT_DRV_INST(inst))), \
-		    (DEVICE_MMIO_ROM_INIT(DT_DRV_INST(inst))))
-
 #define SPI_CFG_IRQS_SINGLE_ERR_LINE(inst)					\
 		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(inst, rx_avail, irq),		\
 			    DT_INST_IRQ_BY_NAME(inst, rx_avail, priority),	\
@@ -657,7 +638,7 @@ COND_CODE_1(IS_EQ(DT_NUM_IRQS(DT_DRV_INST(inst)), 1),              \
 		SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(inst), ctx)                     \
 	};                                                                                  \
 	static const struct spi_dw_config spi_dw_config_##inst = {                          \
-		REG_ADDR(inst),                                                             \
+		DEVICE_MMIO_ROM_INIT(DT_DRV_INST(inst)),                                    \
 		.clock_frequency = COND_CODE_1(                                             \
 			DT_NODE_HAS_PROP(DT_INST_PHANDLE(inst, clocks), clock_frequency),   \
 			(DT_INST_PROP_BY_PHANDLE(inst, clocks, clock_frequency)),           \
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index a6b32ffdf89..cdac7c3a6e2 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -510,7 +510,7 @@
 			};
 
 			exmif: spi@95000 {
-				compatible = "nordic,nrf-exmif", "snps,designware-spi";
+				compatible = "nordic,nrf-exmif";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x95000 0x500 0x95500 0xb00>;

From 7d684d9ae200986e3cb6428a79b7d1311e65483c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 17 Oct 2024 17:43:48 +0200
Subject: [PATCH 0949/2913] [nrf fromlist] dts: nordic: Change compatible
 property for EXMIF node
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a follow-up to commit cdf45cb234077522b5cef2da084869af43d42dc1.

Adjust the DTS node for the nRF EXMIF peripheral so that it is possible
to handle the peripheral with the generic MSPI driver for DW SSI based
controllers and use all its data lines in communication.
Also adjust the related board files accordingly.

Upstream PR #: 80042

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf54h20dk_nrf54h20-pinctrl.dtsi          | 27 ++++++++++++++++++-
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts | 19 +++++++++----
 .../nrf9280pdk_nrf9280-pinctrl.dtsi           | 27 ++++++++++++++++++-
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts  | 19 +++++++++----
 dts/bindings/spi/nordic,nrf-exmif.yaml        |  6 +----
 dts/common/nordic/nrf54h20.dtsi               |  5 ++--
 dts/common/nordic/nrf9280.dtsi                |  5 ++--
 7 files changed, 85 insertions(+), 23 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
index 9b574a18ec5..f62df87dfe2 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
@@ -73,12 +73,37 @@
 	/omit-if-no-ref/ exmif_default: exmif_default {
 		group1 {
 			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
 				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
 			nordic,drive-mode = <NRF_DRIVE_H0H1>;
 		};
 	};
 
+	/omit-if-no-ref/ exmif_sleep: exmif_sleep {
+		group1 {
+			low-power-enable;
+			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
+				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
+		};
+	};
+
 	/omit-if-no-ref/ can120_default: can120_default {
 		group1 {
 			psels = <NRF_PSEL(CAN_RX, 9, 4)>,
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 9c3556b27c4..be44d00f480 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -262,15 +262,15 @@ ipc0: &cpuapp_cpurad_ipc {
 };
 
 &exmif {
-	cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&exmif_default>;
-	pinctrl-names = "default";
+	pinctrl-1 = <&exmif_sleep>;
+	pinctrl-names = "default", "sleep";
 	status = "okay";
+
 	mx25uw63: mx25uw6345g@0 {
-		compatible = "jedec,spi-nor";
-		status = "disabled";
+		compatible = "jedec,mspi-nor";
+		status = "okay";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(48)>;
 		jedec-id = [c2 84 37];
 		sfdp-bfp = [
 			e5 20 8a ff  ff ff ff 03  00 ff 00 ff  00 ff 00 ff
@@ -283,6 +283,15 @@ ipc0: &cpuapp_cpurad_ipc {
 		has-dpd;
 		t-enter-dpd = <10000>;
 		t-exit-dpd = <30000>;
+		reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;
+
+		mspi-max-frequency = <DT_FREQ_M(50)>;
+		mspi-io-mode = "MSPI_IO_MODE_OCTAL";
+		mspi-data-rate = "MSPI_DATA_RATE_SINGLE";
+		mspi-hardware-ce-num = <1>;
+		mspi-cpp-mode = "MSPI_CPP_MODE_0";
+		mspi-endian = "MSPI_BIG_ENDIAN";
+		mspi-ce-polarity = "MSPI_CE_ACTIVE_LOW";
 	};
 };
 
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
index 48067a7052c..143fd45f33e 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
@@ -54,12 +54,37 @@
 	/omit-if-no-ref/ exmif_default: exmif_default {
 		group1 {
 			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
 				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
 			nordic,drive-mode = <NRF_DRIVE_H0H1>;
 		};
 	};
 
+	/omit-if-no-ref/ exmif_sleep: exmif_sleep {
+		group1 {
+			low-power-enable;
+			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
+				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
+		};
+	};
+
 	/omit-if-no-ref/ can120_default: can120_default {
 		group1 {
 			psels = <NRF_PSEL(CAN_RX, 9, 4)>,
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index 2ce9b912269..61bed44b905 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -253,15 +253,15 @@ ipc0: &cpuapp_cpurad_ipc {
 };
 
 &exmif {
-	cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&exmif_default>;
-	pinctrl-names = "default";
+	pinctrl-1 = <&exmif_sleep>;
+	pinctrl-names = "default", "sleep";
 	status = "okay";
+
 	mx25uw63: mx25uw6345g@0 {
-		compatible = "jedec,spi-nor";
-		status = "disabled";
+		compatible = "jedec,mspi-nor";
+		status = "okay";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(48)>;
 		jedec-id = [c2 84 37];
 		sfdp-bfp = [
 			e5 20 8a ff  ff ff ff 03  00 ff 00 ff  00 ff 00 ff
@@ -274,6 +274,15 @@ ipc0: &cpuapp_cpurad_ipc {
 		has-dpd;
 		t-enter-dpd = <10000>;
 		t-exit-dpd = <30000>;
+		reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;
+
+		mspi-max-frequency = <DT_FREQ_M(50)>;
+		mspi-io-mode = "MSPI_IO_MODE_OCTAL";
+		mspi-data-rate = "MSPI_DATA_RATE_SINGLE";
+		mspi-hardware-ce-num = <1>;
+		mspi-cpp-mode = "MSPI_CPP_MODE_0";
+		mspi-endian = "MSPI_BIG_ENDIAN";
+		mspi-ce-polarity = "MSPI_CE_ACTIVE_LOW";
 	};
 };
 
diff --git a/dts/bindings/spi/nordic,nrf-exmif.yaml b/dts/bindings/spi/nordic,nrf-exmif.yaml
index d2b8815046b..294254aa60e 100644
--- a/dts/bindings/spi/nordic,nrf-exmif.yaml
+++ b/dts/bindings/spi/nordic,nrf-exmif.yaml
@@ -5,8 +5,4 @@ description: Nordic External Memory Interface (EXMIF)
 
 compatible: "nordic,nrf-exmif"
 
-include: snps,designware-spi.yaml
-
-properties:
-  reg:
-    required: true
+include: snps,designware-ssi.yaml
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index cdac7c3a6e2..6ce4fda00fa 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -509,8 +509,8 @@
 				status = "disabled";
 			};
 
-			exmif: spi@95000 {
-				compatible = "nordic,nrf-exmif";
+			exmif: exmif@95000 {
+				compatible = "nordic,nrf-exmif", "snps,designware-ssi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x95000 0x500 0x95500 0xb00>;
@@ -519,7 +519,6 @@
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 				clock-frequency = <DT_FREQ_M(400)>;
 				fifo-depth = <32>;
-				max-xfer-size = <16>;
 				status = "disabled";
 			};
 
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 62b22b4fbc2..c9e1742e102 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -360,8 +360,8 @@
 				status = "disabled";
 			};
 
-			exmif: spi@95000 {
-				compatible = "nordic,nrf-exmif";
+			exmif: exmif@95000 {
+				compatible = "nordic,nrf-exmif", "snps,designware-ssi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x95000 0x500 0x95500 0xb00>;
@@ -369,7 +369,6 @@
 				interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>;
 				clock-frequency = <DT_FREQ_M(400)>;
 				fifo-depth = <32>;
-				max-xfer-size = <16>;
 				status = "disabled";
 			};
 

From a9e530c1e11a170e4d85e5008c4bd97f2013beb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 5 Dec 2024 09:35:27 +0100
Subject: [PATCH 0950/2913] [nrf fromlist] samples: drivers: jesd216: Remove
 unnecessary Kconfig option changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It is no longer needed to enable a specific flash driver in the sample
configuration. An appropriate driver (together with its dependencies,
like the SPI bus) for a given target will be enabled automatically
based on what is enabled in DTS.

Upstream PR #: 80042

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/drivers/jesd216/boards/bmd_345_eval.conf       |  8 --------
 samples/drivers/jesd216/boards/mr_canhubk3.conf        |  5 -----
 .../drivers/jesd216/boards/nrf52840dk_nrf52840.conf    | 10 ----------
 .../jesd216/boards/nrf52840dk_nrf52840_spi.conf        |  8 --------
 samples/drivers/jesd216/prj.conf                       |  5 -----
 samples/drivers/jesd216/sample.yaml                    |  1 -
 6 files changed, 37 deletions(-)
 delete mode 100644 samples/drivers/jesd216/boards/bmd_345_eval.conf
 delete mode 100644 samples/drivers/jesd216/boards/mr_canhubk3.conf
 delete mode 100644 samples/drivers/jesd216/boards/nrf52840dk_nrf52840.conf
 delete mode 100644 samples/drivers/jesd216/boards/nrf52840dk_nrf52840_spi.conf

diff --git a/samples/drivers/jesd216/boards/bmd_345_eval.conf b/samples/drivers/jesd216/boards/bmd_345_eval.conf
deleted file mode 100644
index 8c262a3483e..00000000000
--- a/samples/drivers/jesd216/boards/bmd_345_eval.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) 2021 Linumiz
-#
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_SPI=n
-CONFIG_SPI_NOR=n
-CONFIG_NORDIC_QSPI_NOR=y
diff --git a/samples/drivers/jesd216/boards/mr_canhubk3.conf b/samples/drivers/jesd216/boards/mr_canhubk3.conf
deleted file mode 100644
index b625f401a1c..00000000000
--- a/samples/drivers/jesd216/boards/mr_canhubk3.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2023 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-# Override defaults for SPI NOR flash driver
-CONFIG_SPI_NOR=n
diff --git a/samples/drivers/jesd216/boards/nrf52840dk_nrf52840.conf b/samples/drivers/jesd216/boards/nrf52840dk_nrf52840.conf
deleted file mode 100644
index 976830569e3..00000000000
--- a/samples/drivers/jesd216/boards/nrf52840dk_nrf52840.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (c) 2019 Peter Bigot Consulting, LLC
-# Copyright (c) 2019 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_SPI=n
-CONFIG_SPI_NOR=n
-#CONFIG_NORDIC_QSPI_NOR=y
diff --git a/samples/drivers/jesd216/boards/nrf52840dk_nrf52840_spi.conf b/samples/drivers/jesd216/boards/nrf52840dk_nrf52840_spi.conf
deleted file mode 100644
index 15982f1c92e..00000000000
--- a/samples/drivers/jesd216/boards/nrf52840dk_nrf52840_spi.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) 2022 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_SPI=y
-CONFIG_SPI_NOR=y
diff --git a/samples/drivers/jesd216/prj.conf b/samples/drivers/jesd216/prj.conf
index c5c747a3bb3..b1b51a1e12f 100644
--- a/samples/drivers/jesd216/prj.conf
+++ b/samples/drivers/jesd216/prj.conf
@@ -1,8 +1,3 @@
 CONFIG_STDOUT_CONSOLE=y
 CONFIG_FLASH=y
 CONFIG_FLASH_JESD216_API=y
-
-# Assume the standard SPI NOR flash driver.  If the device uses
-# another driver add an override configuration in boards/.
-CONFIG_SPI=y
-CONFIG_SPI_NOR=y
diff --git a/samples/drivers/jesd216/sample.yaml b/samples/drivers/jesd216/sample.yaml
index afc3b200554..732d9379604 100644
--- a/samples/drivers/jesd216/sample.yaml
+++ b/samples/drivers/jesd216/sample.yaml
@@ -24,7 +24,6 @@ tests:
   sample.drivers.jesd216.nrf52840dk_spi:
     extra_args:
       - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_spi.overlay
-      - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_spi.conf
     platform_allow: nrf52840dk/nrf52840
     integration_platforms:
       - nrf52840dk/nrf52840

From 20aa4392f5f94145c51b6bd0d8cf0afc0f017083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 5 Dec 2024 10:40:46 +0100
Subject: [PATCH 0951/2913] [nrf fromlist] samples: drivers: spi_flash: Remove
 unnecessary Kconfig option changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It is no longer needed to enable a specific flash driver in the sample
configuration. An appropriate driver (together with its dependecies,
like the SPI bus) for a given target will be enabled automatically
based on what is enabled in DTS.

Upstream PR #: 80042

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../spi_flash/boards/adafruit_feather_nrf52840_sense.conf | 7 -------
 .../drivers/spi_flash/boards/em_starterkit_emsk_em9d.conf | 7 -------
 samples/drivers/spi_flash/boards/emsdp_emsdp_em11d.conf   | 7 -------
 samples/drivers/spi_flash/boards/mec172xevb_assy6906.conf | 7 -------
 samples/drivers/spi_flash/boards/nrf52840_mdk.conf        | 8 --------
 samples/drivers/spi_flash/boards/nrf52840dk_nrf52840.conf | 8 --------
 .../spi_flash/boards/nrf5340dk_nrf5340_cpuapp.conf        | 8 --------
 samples/drivers/spi_flash/boards/stm32h735g_disco.conf    | 1 -
 samples/drivers/spi_flash/boards/stm32h7b3i_dk.conf       | 1 -
 samples/drivers/spi_flash/prj.conf                        | 1 -
 10 files changed, 55 deletions(-)
 delete mode 100644 samples/drivers/spi_flash/boards/adafruit_feather_nrf52840_sense.conf
 delete mode 100644 samples/drivers/spi_flash/boards/em_starterkit_emsk_em9d.conf
 delete mode 100644 samples/drivers/spi_flash/boards/emsdp_emsdp_em11d.conf
 delete mode 100644 samples/drivers/spi_flash/boards/mec172xevb_assy6906.conf
 delete mode 100644 samples/drivers/spi_flash/boards/nrf52840_mdk.conf
 delete mode 100644 samples/drivers/spi_flash/boards/nrf52840dk_nrf52840.conf
 delete mode 100644 samples/drivers/spi_flash/boards/nrf5340dk_nrf5340_cpuapp.conf
 delete mode 100644 samples/drivers/spi_flash/boards/stm32h735g_disco.conf
 delete mode 100644 samples/drivers/spi_flash/boards/stm32h7b3i_dk.conf

diff --git a/samples/drivers/spi_flash/boards/adafruit_feather_nrf52840_sense.conf b/samples/drivers/spi_flash/boards/adafruit_feather_nrf52840_sense.conf
deleted file mode 100644
index d9add33645a..00000000000
--- a/samples/drivers/spi_flash/boards/adafruit_feather_nrf52840_sense.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2020 Teslabs Engineering S.L.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_NORDIC_QSPI_NOR=y
diff --git a/samples/drivers/spi_flash/boards/em_starterkit_emsk_em9d.conf b/samples/drivers/spi_flash/boards/em_starterkit_emsk_em9d.conf
deleted file mode 100644
index 4e3bfcd17d5..00000000000
--- a/samples/drivers/spi_flash/boards/em_starterkit_emsk_em9d.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2023 Synopsys.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_SPI_NOR=y
diff --git a/samples/drivers/spi_flash/boards/emsdp_emsdp_em11d.conf b/samples/drivers/spi_flash/boards/emsdp_emsdp_em11d.conf
deleted file mode 100644
index 4e3bfcd17d5..00000000000
--- a/samples/drivers/spi_flash/boards/emsdp_emsdp_em11d.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2023 Synopsys.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_SPI_NOR=y
diff --git a/samples/drivers/spi_flash/boards/mec172xevb_assy6906.conf b/samples/drivers/spi_flash/boards/mec172xevb_assy6906.conf
deleted file mode 100644
index 38f06a0c0f8..00000000000
--- a/samples/drivers/spi_flash/boards/mec172xevb_assy6906.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2022 Microchip Technology Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_SPI_NOR=y
diff --git a/samples/drivers/spi_flash/boards/nrf52840_mdk.conf b/samples/drivers/spi_flash/boards/nrf52840_mdk.conf
deleted file mode 100644
index c17e6e08b39..00000000000
--- a/samples/drivers/spi_flash/boards/nrf52840_mdk.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) 2020 Stephane D'Alu
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_SPI=n
-CONFIG_NORDIC_QSPI_NOR=y
diff --git a/samples/drivers/spi_flash/boards/nrf52840dk_nrf52840.conf b/samples/drivers/spi_flash/boards/nrf52840dk_nrf52840.conf
deleted file mode 100644
index c483efdb826..00000000000
--- a/samples/drivers/spi_flash/boards/nrf52840dk_nrf52840.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) 2019 Peter Bigot Consulting, LLC
-# Copyright (c) 2019 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_NORDIC_QSPI_NOR=y
diff --git a/samples/drivers/spi_flash/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/drivers/spi_flash/boards/nrf5340dk_nrf5340_cpuapp.conf
deleted file mode 100644
index 10239a8fd1b..00000000000
--- a/samples/drivers/spi_flash/boards/nrf5340dk_nrf5340_cpuapp.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) 2020 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_SPI=n
-CONFIG_NORDIC_QSPI_NOR=y
diff --git a/samples/drivers/spi_flash/boards/stm32h735g_disco.conf b/samples/drivers/spi_flash/boards/stm32h735g_disco.conf
deleted file mode 100644
index d073f9492d8..00000000000
--- a/samples/drivers/spi_flash/boards/stm32h735g_disco.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI=n
diff --git a/samples/drivers/spi_flash/boards/stm32h7b3i_dk.conf b/samples/drivers/spi_flash/boards/stm32h7b3i_dk.conf
deleted file mode 100644
index d073f9492d8..00000000000
--- a/samples/drivers/spi_flash/boards/stm32h7b3i_dk.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI=n
diff --git a/samples/drivers/spi_flash/prj.conf b/samples/drivers/spi_flash/prj.conf
index c5beb21553a..d78e334e0fb 100644
--- a/samples/drivers/spi_flash/prj.conf
+++ b/samples/drivers/spi_flash/prj.conf
@@ -1,3 +1,2 @@
 CONFIG_STDOUT_CONSOLE=y
 CONFIG_FLASH=y
-CONFIG_SPI=y

From 51933f676c11a86fa1fd566acd242b0a54aa1c57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Fri, 18 Oct 2024 10:16:08 +0200
Subject: [PATCH 0952/2913] [nrf noup] samples|tests: drivers: flash: Add
 support for "jedec,mspi-nor" devices
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extend several flash samples and tests so that they can also be used
with "jedec,mspi-nor" devices.
Add configurations needed for the nrf54h20dk/nrf54h20/cpuapp target.

Upstream PR #: 80042
Applied as a [nrf noup] due to a conflict.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/drivers/jesd216/sample.yaml   | 2 +-
 samples/drivers/jesd216/src/main.c    | 4 +++-
 samples/drivers/spi_flash/sample.yaml | 6 ++++--
 samples/drivers/spi_flash/src/main.c  | 2 ++
 tests/drivers/flash/common/src/main.c | 2 ++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/samples/drivers/jesd216/sample.yaml b/samples/drivers/jesd216/sample.yaml
index 732d9379604..a7ff46ffd9e 100644
--- a/samples/drivers/jesd216/sample.yaml
+++ b/samples/drivers/jesd216/sample.yaml
@@ -19,7 +19,7 @@ tests:
       - hifive_unmatched
       - mimxrt1170_evk/mimxrt1176/cm7
       - mimxrt1170_evk/mimxrt1176/cm4
-    filter: dt_compat_enabled("jedec,spi-nor")
+    filter: dt_compat_enabled("jedec,spi-nor") or dt_compat_enabled("jedec,mspi-nor")
     depends_on: spi
   sample.drivers.jesd216.nrf52840dk_spi:
     extra_args:
diff --git a/samples/drivers/jesd216/src/main.c b/samples/drivers/jesd216/src/main.c
index 480649397b6..b8dad485997 100644
--- a/samples/drivers/jesd216/src/main.c
+++ b/samples/drivers/jesd216/src/main.c
@@ -14,6 +14,8 @@
 
 #if DT_HAS_COMPAT_STATUS_OKAY(jedec_spi_nor)
 #define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_spi_nor)
+#elif DT_HAS_COMPAT_STATUS_OKAY(jedec_mspi_nor)
+#define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_mspi_nor)
 #elif DT_HAS_COMPAT_STATUS_OKAY(nordic_qspi_nor)
 #define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(nordic_qspi_nor)
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_qspi_nor)
@@ -201,7 +203,7 @@ static void summarize_dw15(const struct jesd216_param_header *php,
 		printf("0-4-4 Mode methods: entry 0x%01x ; exit 0x%02x\n",
 		       dw15.entry_044, dw15.exit_044);
 	} else {
-		printf("0-4-4 Mode: not supported");
+		printf("0-4-4 Mode: not supported\n");
 	}
 	printf("4-4-4 Mode sequences: enable 0x%02x ; disable 0x%01x\n",
 	       dw15.enable_444, dw15.disable_444);
diff --git a/samples/drivers/spi_flash/sample.yaml b/samples/drivers/spi_flash/sample.yaml
index 377c5ccec6e..351e33997a0 100644
--- a/samples/drivers/spi_flash/sample.yaml
+++ b/samples/drivers/spi_flash/sample.yaml
@@ -7,8 +7,10 @@ tests:
       - flash
     filter: dt_compat_enabled("jedec,spi-nor") or dt_compat_enabled("st,stm32-qspi-nor")
       or dt_compat_enabled("st,stm32-ospi-nor") or dt_compat_enabled("st,stm32-xspi-nor")
-      or (dt_compat_enabled("nordic,qspi-nor") and CONFIG_NORDIC_QSPI_NOR)
-    platform_exclude: hifive_unmatched
+      or dt_compat_enabled("nordic,qspi-nor") or dt_compat_enabled("jedec,mspi-nor")
+    platform_exclude:
+      - hifive_unmatched/fu740/s7
+      - hifive_unmatched/fu740/u74
     harness: console
     harness_config:
       type: multi_line
diff --git a/samples/drivers/spi_flash/src/main.c b/samples/drivers/spi_flash/src/main.c
index b84359ae05b..52e8b6062b5 100644
--- a/samples/drivers/spi_flash/src/main.c
+++ b/samples/drivers/spi_flash/src/main.c
@@ -34,6 +34,8 @@
 
 #if DT_HAS_COMPAT_STATUS_OKAY(jedec_spi_nor)
 #define SPI_FLASH_COMPAT jedec_spi_nor
+#elif DT_HAS_COMPAT_STATUS_OKAY(jedec_mspi_nor)
+#define SPI_FLASH_COMPAT jedec_mspi_nor
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_qspi_nor)
 #define SPI_FLASH_COMPAT st_stm32_qspi_nor
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_ospi_nor)
diff --git a/tests/drivers/flash/common/src/main.c b/tests/drivers/flash/common/src/main.c
index 9ca767943d9..66a5eba0297 100644
--- a/tests/drivers/flash/common/src/main.c
+++ b/tests/drivers/flash/common/src/main.c
@@ -14,6 +14,8 @@
 #define TEST_AREA_DEV_NODE	DT_INST(0, nordic_qspi_nor)
 #elif defined(CONFIG_SPI_NOR)
 #define TEST_AREA_DEV_NODE	DT_INST(0, jedec_spi_nor)
+#elif defined(CONFIG_FLASH_MSPI_NOR)
+#define TEST_AREA_DEV_NODE	DT_INST(0, jedec_mspi_nor)
 #else
 #define TEST_AREA	storage_partition
 #endif

From 71cc8b6287a55a06bd0a8e8a921172a5eef6861d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Tue, 3 Dec 2024 17:51:51 +0100
Subject: [PATCH 0953/2913] [nrf fromlist] boards: nrf54h20dk: Add XIP region
 definition to memory map
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Access to this region must be requested through UICR by a local
domain that want to use the Execute In Place (XIP) feature of
the EXMIF peripheral.

Upstream PR #: 80042

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index 80211205ca3..f2937402554 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -174,6 +174,15 @@
 			zephyr,memory-region = "DMA_RAM3x_RAD";
 			zephyr,memory-attr = <( DT_MEM_DMA )>;
 		};
+
+		xip_region: memory@60000000 {
+			compatible = "nordic,owned-memory";
+			reg = <0x60000000 0x20000000>;
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x60000000 0x20000000>;
+		};
 	};
 };
 

From 9edbdaf1cc6b20e1a070b9ce20bde88a30f5c35c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Tue, 3 Dec 2024 18:02:10 +0100
Subject: [PATCH 0954/2913] [nrf fromlist] samples: code_relocation_nocopy: Add
 configuration for nRF54H20 DK
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add nRF54H20 DK specific entries to allow using the sample on this
board.

Upstream PR #: 80042

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.conf      |  1 +
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay   | 17 +++++++++++++++++
 .../code_relocation_nocopy/linker_arm_nocopy.ld |  7 +++++++
 3 files changed, 25 insertions(+)
 create mode 100644 samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..83035081389
--- /dev/null
+++ b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_FLASH=y
diff --git a/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..ab53f12725d
--- /dev/null
+++ b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,17 @@
+&cpuapp_ram0x_region {
+	nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWXS>;
+};
+
+&xip_region {
+	status = "okay";
+	nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RX>;
+};
+
+&mx25uw63 {
+	read-command = <0xEC13>;
+	command-length = "INSTR_2_BYTE";
+	address-length = "ADDR_4_BYTE";
+	rx-dummy = <20>;
+
+	xip-config = <1 0 0x20000000 0>;
+};
diff --git a/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld b/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
index a1467f8e264..0a11783cca2 100644
--- a/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
+++ b/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
@@ -47,6 +47,13 @@
 #define EXTFLASH_ADDR	DT_REG_ADDR(DT_INST(0, st_stm32_xspi_nor))
 #define EXTFLASH_SIZE	DT_REG_ADDR_BY_IDX(DT_INST(0, st_stm32_xspi_nor), 1)
 
+#elif defined(CONFIG_FLASH_MSPI_NOR) && defined(CONFIG_SOC_NRF54H20_CPUAPP)
+
+#define EXTFLASH_NODE	DT_INST(0, jedec_mspi_nor)
+#define EXTFLASH_ADDR	0x60000000
+#define EXTFLASH_SIZE	DT_PROP_OR(EXTFLASH_NODE, size_in_bytes, \
+				   DT_PROP(EXTFLASH_NODE, size) / 8)
+
 #else
 
 /*

From 7d364d07a827f7a7a8b829cfa9c5a628f5485473 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Tue, 10 Dec 2024 13:49:31 +0100
Subject: [PATCH 0955/2913] [nrf noup] cmake: use -DUSE_PARTITION_MANAGER=1 for
 lld linker script template

fixup! [nrf noup] tree-wide: support NCS Partition Manager (PM) definitions

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
---
 cmake/linker/lld/target.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmake/linker/lld/target.cmake b/cmake/linker/lld/target.cmake
index b6b96525e70..bdea4f1ec92 100644
--- a/cmake/linker/lld/target.cmake
+++ b/cmake/linker/lld/target.cmake
@@ -52,6 +52,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
     -imacros ${AUTOCONF_H}
     ${current_includes}
     ${template_script_defines}
+    -DUSE_PARTITION_MANAGER=$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>
     -E ${LINKER_SCRIPT}
     -P # Prevent generation of debug `#line' directives.
     -o ${linker_script_gen}

From 9dc8c822b227dd4ca14142952d8ba75c6f6447a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Tue, 17 Dec 2024 09:40:13 +0100
Subject: [PATCH 0956/2913] Revert "[nrf fromlist] dts: nordic: Change
 compatible property for EXMIF node"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7d684d9ae200986e3cb6428a79b7d1311e65483c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf54h20dk_nrf54h20-pinctrl.dtsi          | 27 +------------------
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts | 19 ++++---------
 .../nrf9280pdk_nrf9280-pinctrl.dtsi           | 27 +------------------
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts  | 19 ++++---------
 dts/bindings/spi/nordic,nrf-exmif.yaml        |  6 ++++-
 dts/common/nordic/nrf54h20.dtsi               |  5 ++--
 dts/common/nordic/nrf9280.dtsi                |  5 ++--
 7 files changed, 23 insertions(+), 85 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
index f62df87dfe2..9b574a18ec5 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
@@ -73,37 +73,12 @@
 	/omit-if-no-ref/ exmif_default: exmif_default {
 		group1 {
 			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
-				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
-				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
 				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
-				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
-				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
-				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
-				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
-				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
-				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
 			nordic,drive-mode = <NRF_DRIVE_H0H1>;
 		};
 	};
 
-	/omit-if-no-ref/ exmif_sleep: exmif_sleep {
-		group1 {
-			low-power-enable;
-			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
-				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
-				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
-				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
-				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
-				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
-				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
-				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
-				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
-				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
-		};
-	};
-
 	/omit-if-no-ref/ can120_default: can120_default {
 		group1 {
 			psels = <NRF_PSEL(CAN_RX, 9, 4)>,
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index be44d00f480..9c3556b27c4 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -262,15 +262,15 @@ ipc0: &cpuapp_cpurad_ipc {
 };
 
 &exmif {
+	cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&exmif_default>;
-	pinctrl-1 = <&exmif_sleep>;
-	pinctrl-names = "default", "sleep";
+	pinctrl-names = "default";
 	status = "okay";
-
 	mx25uw63: mx25uw6345g@0 {
-		compatible = "jedec,mspi-nor";
-		status = "okay";
+		compatible = "jedec,spi-nor";
+		status = "disabled";
 		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(48)>;
 		jedec-id = [c2 84 37];
 		sfdp-bfp = [
 			e5 20 8a ff  ff ff ff 03  00 ff 00 ff  00 ff 00 ff
@@ -283,15 +283,6 @@ ipc0: &cpuapp_cpurad_ipc {
 		has-dpd;
 		t-enter-dpd = <10000>;
 		t-exit-dpd = <30000>;
-		reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;
-
-		mspi-max-frequency = <DT_FREQ_M(50)>;
-		mspi-io-mode = "MSPI_IO_MODE_OCTAL";
-		mspi-data-rate = "MSPI_DATA_RATE_SINGLE";
-		mspi-hardware-ce-num = <1>;
-		mspi-cpp-mode = "MSPI_CPP_MODE_0";
-		mspi-endian = "MSPI_BIG_ENDIAN";
-		mspi-ce-polarity = "MSPI_CE_ACTIVE_LOW";
 	};
 };
 
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
index 143fd45f33e..48067a7052c 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
@@ -54,37 +54,12 @@
 	/omit-if-no-ref/ exmif_default: exmif_default {
 		group1 {
 			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
-				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
-				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
 				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
-				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
-				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
-				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
-				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
-				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
-				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
 			nordic,drive-mode = <NRF_DRIVE_H0H1>;
 		};
 	};
 
-	/omit-if-no-ref/ exmif_sleep: exmif_sleep {
-		group1 {
-			low-power-enable;
-			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
-				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
-				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
-				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
-				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
-				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
-				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
-				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
-				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
-				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
-		};
-	};
-
 	/omit-if-no-ref/ can120_default: can120_default {
 		group1 {
 			psels = <NRF_PSEL(CAN_RX, 9, 4)>,
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index 61bed44b905..2ce9b912269 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -253,15 +253,15 @@ ipc0: &cpuapp_cpurad_ipc {
 };
 
 &exmif {
+	cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&exmif_default>;
-	pinctrl-1 = <&exmif_sleep>;
-	pinctrl-names = "default", "sleep";
+	pinctrl-names = "default";
 	status = "okay";
-
 	mx25uw63: mx25uw6345g@0 {
-		compatible = "jedec,mspi-nor";
-		status = "okay";
+		compatible = "jedec,spi-nor";
+		status = "disabled";
 		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(48)>;
 		jedec-id = [c2 84 37];
 		sfdp-bfp = [
 			e5 20 8a ff  ff ff ff 03  00 ff 00 ff  00 ff 00 ff
@@ -274,15 +274,6 @@ ipc0: &cpuapp_cpurad_ipc {
 		has-dpd;
 		t-enter-dpd = <10000>;
 		t-exit-dpd = <30000>;
-		reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;
-
-		mspi-max-frequency = <DT_FREQ_M(50)>;
-		mspi-io-mode = "MSPI_IO_MODE_OCTAL";
-		mspi-data-rate = "MSPI_DATA_RATE_SINGLE";
-		mspi-hardware-ce-num = <1>;
-		mspi-cpp-mode = "MSPI_CPP_MODE_0";
-		mspi-endian = "MSPI_BIG_ENDIAN";
-		mspi-ce-polarity = "MSPI_CE_ACTIVE_LOW";
 	};
 };
 
diff --git a/dts/bindings/spi/nordic,nrf-exmif.yaml b/dts/bindings/spi/nordic,nrf-exmif.yaml
index 294254aa60e..d2b8815046b 100644
--- a/dts/bindings/spi/nordic,nrf-exmif.yaml
+++ b/dts/bindings/spi/nordic,nrf-exmif.yaml
@@ -5,4 +5,8 @@ description: Nordic External Memory Interface (EXMIF)
 
 compatible: "nordic,nrf-exmif"
 
-include: snps,designware-ssi.yaml
+include: snps,designware-spi.yaml
+
+properties:
+  reg:
+    required: true
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 6ce4fda00fa..cdac7c3a6e2 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -509,8 +509,8 @@
 				status = "disabled";
 			};
 
-			exmif: exmif@95000 {
-				compatible = "nordic,nrf-exmif", "snps,designware-ssi";
+			exmif: spi@95000 {
+				compatible = "nordic,nrf-exmif";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x95000 0x500 0x95500 0xb00>;
@@ -519,6 +519,7 @@
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 				clock-frequency = <DT_FREQ_M(400)>;
 				fifo-depth = <32>;
+				max-xfer-size = <16>;
 				status = "disabled";
 			};
 
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index c9e1742e102..62b22b4fbc2 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -360,8 +360,8 @@
 				status = "disabled";
 			};
 
-			exmif: exmif@95000 {
-				compatible = "nordic,nrf-exmif", "snps,designware-ssi";
+			exmif: spi@95000 {
+				compatible = "nordic,nrf-exmif";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x95000 0x500 0x95500 0xb00>;
@@ -369,6 +369,7 @@
 				interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>;
 				clock-frequency = <DT_FREQ_M(400)>;
 				fifo-depth = <32>;
+				max-xfer-size = <16>;
 				status = "disabled";
 			};
 

From 0b28040f26832f2732650f4c113a32608abd250f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 17 Oct 2024 17:43:48 +0200
Subject: [PATCH 0957/2913] [nrf fromlist] dts: nordic: Change compatible
 property for EXMIF node
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a follow-up to commit cdf45cb234077522b5cef2da084869af43d42dc1.

Adjust the DTS node for the nRF EXMIF peripheral so that it is possible
to handle the peripheral with the generic MSPI driver for DW SSI based
controllers and use all its data lines in communication.
Also adjust the related board files accordingly.

Upstream PR #: 80042

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf54h20dk_nrf54h20-pinctrl.dtsi          | 27 ++++++++++++++++++-
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts | 17 +++++++++---
 .../nrf9280pdk_nrf9280-pinctrl.dtsi           | 27 ++++++++++++++++++-
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts  | 17 +++++++++---
 .../{spi => mspi}/nordic,nrf-exmif.yaml       |  6 +----
 dts/common/nordic/nrf54h20.dtsi               |  5 ++--
 dts/common/nordic/nrf9280.dtsi                |  5 ++--
 7 files changed, 83 insertions(+), 21 deletions(-)
 rename dts/bindings/{spi => mspi}/nordic,nrf-exmif.yaml (70%)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
index 9b574a18ec5..f62df87dfe2 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
@@ -73,12 +73,37 @@
 	/omit-if-no-ref/ exmif_default: exmif_default {
 		group1 {
 			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
 				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
 			nordic,drive-mode = <NRF_DRIVE_H0H1>;
 		};
 	};
 
+	/omit-if-no-ref/ exmif_sleep: exmif_sleep {
+		group1 {
+			low-power-enable;
+			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
+				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
+		};
+	};
+
 	/omit-if-no-ref/ can120_default: can120_default {
 		group1 {
 			psels = <NRF_PSEL(CAN_RX, 9, 4)>,
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 9c3556b27c4..171732d81e6 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -262,15 +262,15 @@ ipc0: &cpuapp_cpurad_ipc {
 };
 
 &exmif {
-	cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&exmif_default>;
-	pinctrl-names = "default";
+	pinctrl-1 = <&exmif_sleep>;
+	pinctrl-names = "default", "sleep";
 	status = "okay";
+
 	mx25uw63: mx25uw6345g@0 {
-		compatible = "jedec,spi-nor";
+		compatible = "jedec,mspi-nor";
 		status = "disabled";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(48)>;
 		jedec-id = [c2 84 37];
 		sfdp-bfp = [
 			e5 20 8a ff  ff ff ff 03  00 ff 00 ff  00 ff 00 ff
@@ -283,6 +283,15 @@ ipc0: &cpuapp_cpurad_ipc {
 		has-dpd;
 		t-enter-dpd = <10000>;
 		t-exit-dpd = <30000>;
+		reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;
+
+		mspi-max-frequency = <DT_FREQ_M(50)>;
+		mspi-io-mode = "MSPI_IO_MODE_OCTAL";
+		mspi-data-rate = "MSPI_DATA_RATE_SINGLE";
+		mspi-hardware-ce-num = <1>;
+		mspi-cpp-mode = "MSPI_CPP_MODE_0";
+		mspi-endian = "MSPI_BIG_ENDIAN";
+		mspi-ce-polarity = "MSPI_CE_ACTIVE_LOW";
 	};
 };
 
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
index 48067a7052c..143fd45f33e 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
@@ -54,12 +54,37 @@
 	/omit-if-no-ref/ exmif_default: exmif_default {
 		group1 {
 			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
 				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
 			nordic,drive-mode = <NRF_DRIVE_H0H1>;
 		};
 	};
 
+	/omit-if-no-ref/ exmif_sleep: exmif_sleep {
+		group1 {
+			low-power-enable;
+			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
+				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
+		};
+	};
+
 	/omit-if-no-ref/ can120_default: can120_default {
 		group1 {
 			psels = <NRF_PSEL(CAN_RX, 9, 4)>,
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index 2ce9b912269..043f6f64f87 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -253,15 +253,15 @@ ipc0: &cpuapp_cpurad_ipc {
 };
 
 &exmif {
-	cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&exmif_default>;
-	pinctrl-names = "default";
+	pinctrl-1 = <&exmif_sleep>;
+	pinctrl-names = "default", "sleep";
 	status = "okay";
+
 	mx25uw63: mx25uw6345g@0 {
-		compatible = "jedec,spi-nor";
+		compatible = "jedec,mspi-nor";
 		status = "disabled";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(48)>;
 		jedec-id = [c2 84 37];
 		sfdp-bfp = [
 			e5 20 8a ff  ff ff ff 03  00 ff 00 ff  00 ff 00 ff
@@ -274,6 +274,15 @@ ipc0: &cpuapp_cpurad_ipc {
 		has-dpd;
 		t-enter-dpd = <10000>;
 		t-exit-dpd = <30000>;
+		reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;
+
+		mspi-max-frequency = <DT_FREQ_M(50)>;
+		mspi-io-mode = "MSPI_IO_MODE_OCTAL";
+		mspi-data-rate = "MSPI_DATA_RATE_SINGLE";
+		mspi-hardware-ce-num = <1>;
+		mspi-cpp-mode = "MSPI_CPP_MODE_0";
+		mspi-endian = "MSPI_BIG_ENDIAN";
+		mspi-ce-polarity = "MSPI_CE_ACTIVE_LOW";
 	};
 };
 
diff --git a/dts/bindings/spi/nordic,nrf-exmif.yaml b/dts/bindings/mspi/nordic,nrf-exmif.yaml
similarity index 70%
rename from dts/bindings/spi/nordic,nrf-exmif.yaml
rename to dts/bindings/mspi/nordic,nrf-exmif.yaml
index d2b8815046b..294254aa60e 100644
--- a/dts/bindings/spi/nordic,nrf-exmif.yaml
+++ b/dts/bindings/mspi/nordic,nrf-exmif.yaml
@@ -5,8 +5,4 @@ description: Nordic External Memory Interface (EXMIF)
 
 compatible: "nordic,nrf-exmif"
 
-include: snps,designware-spi.yaml
-
-properties:
-  reg:
-    required: true
+include: snps,designware-ssi.yaml
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index cdac7c3a6e2..6ce4fda00fa 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -509,8 +509,8 @@
 				status = "disabled";
 			};
 
-			exmif: spi@95000 {
-				compatible = "nordic,nrf-exmif";
+			exmif: exmif@95000 {
+				compatible = "nordic,nrf-exmif", "snps,designware-ssi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x95000 0x500 0x95500 0xb00>;
@@ -519,7 +519,6 @@
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 				clock-frequency = <DT_FREQ_M(400)>;
 				fifo-depth = <32>;
-				max-xfer-size = <16>;
 				status = "disabled";
 			};
 
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 62b22b4fbc2..c9e1742e102 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -360,8 +360,8 @@
 				status = "disabled";
 			};
 
-			exmif: spi@95000 {
-				compatible = "nordic,nrf-exmif";
+			exmif: exmif@95000 {
+				compatible = "nordic,nrf-exmif", "snps,designware-ssi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x95000 0x500 0x95500 0xb00>;
@@ -369,7 +369,6 @@
 				interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>;
 				clock-frequency = <DT_FREQ_M(400)>;
 				fifo-depth = <32>;
-				max-xfer-size = <16>;
 				status = "disabled";
 			};
 

From 63e6b26aa7483827c1224fcbead90143fef622d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Tue, 17 Dec 2024 09:47:21 +0100
Subject: [PATCH 0958/2913] Revert "[nrf noup] samples|tests: drivers: flash:
 Add support for "jedec,mspi-nor" devices"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 51933f676c11a86fa1fd566acd242b0a54aa1c57.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/drivers/jesd216/sample.yaml   | 2 +-
 samples/drivers/jesd216/src/main.c    | 4 +---
 samples/drivers/spi_flash/sample.yaml | 6 ++----
 samples/drivers/spi_flash/src/main.c  | 2 --
 tests/drivers/flash/common/src/main.c | 2 --
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/samples/drivers/jesd216/sample.yaml b/samples/drivers/jesd216/sample.yaml
index a7ff46ffd9e..732d9379604 100644
--- a/samples/drivers/jesd216/sample.yaml
+++ b/samples/drivers/jesd216/sample.yaml
@@ -19,7 +19,7 @@ tests:
       - hifive_unmatched
       - mimxrt1170_evk/mimxrt1176/cm7
       - mimxrt1170_evk/mimxrt1176/cm4
-    filter: dt_compat_enabled("jedec,spi-nor") or dt_compat_enabled("jedec,mspi-nor")
+    filter: dt_compat_enabled("jedec,spi-nor")
     depends_on: spi
   sample.drivers.jesd216.nrf52840dk_spi:
     extra_args:
diff --git a/samples/drivers/jesd216/src/main.c b/samples/drivers/jesd216/src/main.c
index b8dad485997..480649397b6 100644
--- a/samples/drivers/jesd216/src/main.c
+++ b/samples/drivers/jesd216/src/main.c
@@ -14,8 +14,6 @@
 
 #if DT_HAS_COMPAT_STATUS_OKAY(jedec_spi_nor)
 #define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_spi_nor)
-#elif DT_HAS_COMPAT_STATUS_OKAY(jedec_mspi_nor)
-#define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_mspi_nor)
 #elif DT_HAS_COMPAT_STATUS_OKAY(nordic_qspi_nor)
 #define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(nordic_qspi_nor)
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_qspi_nor)
@@ -203,7 +201,7 @@ static void summarize_dw15(const struct jesd216_param_header *php,
 		printf("0-4-4 Mode methods: entry 0x%01x ; exit 0x%02x\n",
 		       dw15.entry_044, dw15.exit_044);
 	} else {
-		printf("0-4-4 Mode: not supported\n");
+		printf("0-4-4 Mode: not supported");
 	}
 	printf("4-4-4 Mode sequences: enable 0x%02x ; disable 0x%01x\n",
 	       dw15.enable_444, dw15.disable_444);
diff --git a/samples/drivers/spi_flash/sample.yaml b/samples/drivers/spi_flash/sample.yaml
index 351e33997a0..377c5ccec6e 100644
--- a/samples/drivers/spi_flash/sample.yaml
+++ b/samples/drivers/spi_flash/sample.yaml
@@ -7,10 +7,8 @@ tests:
       - flash
     filter: dt_compat_enabled("jedec,spi-nor") or dt_compat_enabled("st,stm32-qspi-nor")
       or dt_compat_enabled("st,stm32-ospi-nor") or dt_compat_enabled("st,stm32-xspi-nor")
-      or dt_compat_enabled("nordic,qspi-nor") or dt_compat_enabled("jedec,mspi-nor")
-    platform_exclude:
-      - hifive_unmatched/fu740/s7
-      - hifive_unmatched/fu740/u74
+      or (dt_compat_enabled("nordic,qspi-nor") and CONFIG_NORDIC_QSPI_NOR)
+    platform_exclude: hifive_unmatched
     harness: console
     harness_config:
       type: multi_line
diff --git a/samples/drivers/spi_flash/src/main.c b/samples/drivers/spi_flash/src/main.c
index 52e8b6062b5..b84359ae05b 100644
--- a/samples/drivers/spi_flash/src/main.c
+++ b/samples/drivers/spi_flash/src/main.c
@@ -34,8 +34,6 @@
 
 #if DT_HAS_COMPAT_STATUS_OKAY(jedec_spi_nor)
 #define SPI_FLASH_COMPAT jedec_spi_nor
-#elif DT_HAS_COMPAT_STATUS_OKAY(jedec_mspi_nor)
-#define SPI_FLASH_COMPAT jedec_mspi_nor
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_qspi_nor)
 #define SPI_FLASH_COMPAT st_stm32_qspi_nor
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_ospi_nor)
diff --git a/tests/drivers/flash/common/src/main.c b/tests/drivers/flash/common/src/main.c
index 66a5eba0297..9ca767943d9 100644
--- a/tests/drivers/flash/common/src/main.c
+++ b/tests/drivers/flash/common/src/main.c
@@ -14,8 +14,6 @@
 #define TEST_AREA_DEV_NODE	DT_INST(0, nordic_qspi_nor)
 #elif defined(CONFIG_SPI_NOR)
 #define TEST_AREA_DEV_NODE	DT_INST(0, jedec_spi_nor)
-#elif defined(CONFIG_FLASH_MSPI_NOR)
-#define TEST_AREA_DEV_NODE	DT_INST(0, jedec_mspi_nor)
 #else
 #define TEST_AREA	storage_partition
 #endif

From ab8276b89fb1d4db34fc7c1214f08297d477fad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Fri, 18 Oct 2024 10:16:08 +0200
Subject: [PATCH 0959/2913] [nrf noup] samples|tests: drivers: flash: Add
 support for "jedec,mspi-nor" devices
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extend several flash samples and tests so that they can also be used
with "jedec,mspi-nor" devices.
Add configurations needed for the nrf54h20dk/nrf54h20/cpuapp target.

Upstream PR #: 80042
Applied as a [nrf noup] due to a conflict.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay    | 9 +++++++++
 samples/drivers/jesd216/sample.yaml                      | 2 +-
 samples/drivers/jesd216/src/main.c                       | 4 +++-
 .../spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay  | 9 +++++++++
 samples/drivers/spi_flash/sample.yaml                    | 2 +-
 samples/drivers/spi_flash/src/main.c                     | 2 ++
 .../common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay     | 9 +++++++++
 tests/drivers/flash/common/src/main.c                    | 2 ++
 8 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..b8f138ad2b2
--- /dev/null
+++ b/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&mx25uw63 {
+	status = "okay";
+};
diff --git a/samples/drivers/jesd216/sample.yaml b/samples/drivers/jesd216/sample.yaml
index 732d9379604..a7ff46ffd9e 100644
--- a/samples/drivers/jesd216/sample.yaml
+++ b/samples/drivers/jesd216/sample.yaml
@@ -19,7 +19,7 @@ tests:
       - hifive_unmatched
       - mimxrt1170_evk/mimxrt1176/cm7
       - mimxrt1170_evk/mimxrt1176/cm4
-    filter: dt_compat_enabled("jedec,spi-nor")
+    filter: dt_compat_enabled("jedec,spi-nor") or dt_compat_enabled("jedec,mspi-nor")
     depends_on: spi
   sample.drivers.jesd216.nrf52840dk_spi:
     extra_args:
diff --git a/samples/drivers/jesd216/src/main.c b/samples/drivers/jesd216/src/main.c
index 480649397b6..b8dad485997 100644
--- a/samples/drivers/jesd216/src/main.c
+++ b/samples/drivers/jesd216/src/main.c
@@ -14,6 +14,8 @@
 
 #if DT_HAS_COMPAT_STATUS_OKAY(jedec_spi_nor)
 #define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_spi_nor)
+#elif DT_HAS_COMPAT_STATUS_OKAY(jedec_mspi_nor)
+#define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_mspi_nor)
 #elif DT_HAS_COMPAT_STATUS_OKAY(nordic_qspi_nor)
 #define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(nordic_qspi_nor)
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_qspi_nor)
@@ -201,7 +203,7 @@ static void summarize_dw15(const struct jesd216_param_header *php,
 		printf("0-4-4 Mode methods: entry 0x%01x ; exit 0x%02x\n",
 		       dw15.entry_044, dw15.exit_044);
 	} else {
-		printf("0-4-4 Mode: not supported");
+		printf("0-4-4 Mode: not supported\n");
 	}
 	printf("4-4-4 Mode sequences: enable 0x%02x ; disable 0x%01x\n",
 	       dw15.enable_444, dw15.disable_444);
diff --git a/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..b8f138ad2b2
--- /dev/null
+++ b/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&mx25uw63 {
+	status = "okay";
+};
diff --git a/samples/drivers/spi_flash/sample.yaml b/samples/drivers/spi_flash/sample.yaml
index 377c5ccec6e..c0abb401323 100644
--- a/samples/drivers/spi_flash/sample.yaml
+++ b/samples/drivers/spi_flash/sample.yaml
@@ -7,7 +7,7 @@ tests:
       - flash
     filter: dt_compat_enabled("jedec,spi-nor") or dt_compat_enabled("st,stm32-qspi-nor")
       or dt_compat_enabled("st,stm32-ospi-nor") or dt_compat_enabled("st,stm32-xspi-nor")
-      or (dt_compat_enabled("nordic,qspi-nor") and CONFIG_NORDIC_QSPI_NOR)
+      or dt_compat_enabled("nordic,qspi-nor") or dt_compat_enabled("jedec,mspi-nor")
     platform_exclude: hifive_unmatched
     harness: console
     harness_config:
diff --git a/samples/drivers/spi_flash/src/main.c b/samples/drivers/spi_flash/src/main.c
index b84359ae05b..52e8b6062b5 100644
--- a/samples/drivers/spi_flash/src/main.c
+++ b/samples/drivers/spi_flash/src/main.c
@@ -34,6 +34,8 @@
 
 #if DT_HAS_COMPAT_STATUS_OKAY(jedec_spi_nor)
 #define SPI_FLASH_COMPAT jedec_spi_nor
+#elif DT_HAS_COMPAT_STATUS_OKAY(jedec_mspi_nor)
+#define SPI_FLASH_COMPAT jedec_mspi_nor
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_qspi_nor)
 #define SPI_FLASH_COMPAT st_stm32_qspi_nor
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_ospi_nor)
diff --git a/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..b8f138ad2b2
--- /dev/null
+++ b/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&mx25uw63 {
+	status = "okay";
+};
diff --git a/tests/drivers/flash/common/src/main.c b/tests/drivers/flash/common/src/main.c
index 9ca767943d9..66a5eba0297 100644
--- a/tests/drivers/flash/common/src/main.c
+++ b/tests/drivers/flash/common/src/main.c
@@ -14,6 +14,8 @@
 #define TEST_AREA_DEV_NODE	DT_INST(0, nordic_qspi_nor)
 #elif defined(CONFIG_SPI_NOR)
 #define TEST_AREA_DEV_NODE	DT_INST(0, jedec_spi_nor)
+#elif defined(CONFIG_FLASH_MSPI_NOR)
+#define TEST_AREA_DEV_NODE	DT_INST(0, jedec_mspi_nor)
 #else
 #define TEST_AREA	storage_partition
 #endif

From 352fb6b750c90973396bd706fd1433801ee35317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Tue, 17 Dec 2024 21:45:47 +0100
Subject: [PATCH 0960/2913] [nrf noup] drivers: spi_dw: Bring back custom EXMIF
 peripheral handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit brings back modifications from these reverted commits:
- f68b2edaa2233cde29d955bc3d3b3dd75ff50334
- e606246f0fc3e9299cb5bdd3c1e34a091e5d85a1
slightly adjusted so that the EXMIF peripheral is still by default
handled by the mspi_dw driver, and in cases where this driver cannot
be used because something still does not work correctly, one can
switch to the old solution based on the tweaked spi_dw driver.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/pinctrl/pinctrl_nrf.c              |  3 +-
 drivers/spi/spi_dw.c                       | 32 +++++++++++++++++++++-
 dts/bindings/spi/nordic,nrf-exmif-spi.yaml |  8 ++++++
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 dts/bindings/spi/nordic,nrf-exmif-spi.yaml

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 42c4f24559a..68ff6d8d7e4 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -374,7 +374,8 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_can) */
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) || \
+	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif_spi)
 		/* Pin routing is controlled by secure domain, via UICR */
 		case NRF_FUN_EXMIF_CK:
 		case NRF_FUN_EXMIF_DQ0:
diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
index 649a13aca01..7ee8204ad78 100644
--- a/drivers/spi/spi_dw.c
+++ b/drivers/spi/spi_dw.c
@@ -41,6 +41,14 @@ LOG_MODULE_REGISTER(spi_dw);
 #include <zephyr/drivers/pinctrl.h>
 #endif
 
+#ifdef CONFIG_HAS_NRFX
+#include <nrfx.h>
+#endif
+
+#ifdef CONFIG_SOC_NRF54H20_GPD
+#include <nrf/gpd.h>
+#endif
+
 static inline bool spi_dw_is_slave(struct spi_dw_data *spi)
 {
 	return (IS_ENABLED(CONFIG_SPI_SLAVE) &&
@@ -258,6 +266,7 @@ static int spi_dw_configure(const struct device *dev,
 		/* Baud rate and Slave select, for master only */
 		write_baudr(dev, SPI_DW_CLK_DIVIDER(info->clock_frequency,
 						    config->frequency));
+		write_ser(dev, BIT(config->slave));
 	}
 
 	if (spi_dw_is_slave(spi)) {
@@ -500,6 +509,10 @@ void spi_dw_isr(const struct device *dev)
 	uint32_t int_status;
 	int error;
 
+#ifdef CONFIG_HAS_NRFX
+	NRF_EXMIF->EVENTS_CORE = 0;
+#endif
+
 	int_status = read_isr(dev);
 
 	LOG_DBG("SPI %p int_status 0x%x - (tx: %d, rx: %d)", dev, int_status,
@@ -548,6 +561,18 @@ int spi_dw_init(const struct device *dev)
 
 	DEVICE_MMIO_MAP(dev, K_MEM_CACHE_NONE);
 
+#ifdef CONFIG_HAS_NRFX
+	NRF_EXMIF->INTENSET = BIT(0);
+	NRF_EXMIF->TASKS_START = 1;
+
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	err = nrf_gpd_request(NRF_GPD_FAST_ACTIVE1);
+	if (err < 0) {
+		return err;
+	}
+#endif
+#endif
+
 	info->config_func();
 
 	/* Masking interrupt and making sure controller is disabled */
@@ -566,6 +591,11 @@ int spi_dw_init(const struct device *dev)
 	return 0;
 }
 
+#define REG_ADDR(inst) \
+	COND_CODE_1(DT_NODE_HAS_COMPAT(DT_DRV_INST(inst), nordic_nrf_exmif_spi), \
+		    (Z_DEVICE_MMIO_NAMED_ROM_INITIALIZER(core, DT_DRV_INST(inst))), \
+		    (DEVICE_MMIO_ROM_INIT(DT_DRV_INST(inst))))
+
 #define SPI_CFG_IRQS_SINGLE_ERR_LINE(inst)					\
 		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(inst, rx_avail, irq),		\
 			    DT_INST_IRQ_BY_NAME(inst, rx_avail, priority),	\
@@ -638,7 +668,7 @@ COND_CODE_1(IS_EQ(DT_NUM_IRQS(DT_DRV_INST(inst)), 1),              \
 		SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(inst), ctx)                     \
 	};                                                                                  \
 	static const struct spi_dw_config spi_dw_config_##inst = {                          \
-		DEVICE_MMIO_ROM_INIT(DT_DRV_INST(inst)),                                    \
+		REG_ADDR(inst),                                                             \
 		.clock_frequency = COND_CODE_1(                                             \
 			DT_NODE_HAS_PROP(DT_INST_PHANDLE(inst, clocks), clock_frequency),   \
 			(DT_INST_PROP_BY_PHANDLE(inst, clocks, clock_frequency)),           \
diff --git a/dts/bindings/spi/nordic,nrf-exmif-spi.yaml b/dts/bindings/spi/nordic,nrf-exmif-spi.yaml
new file mode 100644
index 00000000000..d988b414687
--- /dev/null
+++ b/dts/bindings/spi/nordic,nrf-exmif-spi.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Nordic External Memory Interface (EXMIF) used in SPI mode only
+
+compatible: "nordic,nrf-exmif-spi"
+
+include: snps,designware-spi.yaml

From a901541b863a68d3fa4936f731fcc5484e7c0c43 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 4 Nov 2024 18:12:51 +0100
Subject: [PATCH 0961/2913] [nrf fromtree] boards nrfbsim: Enable GPIO & GPIOTE
 peripherals for nrf54l15bsim

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 4b890bc7b570da76dd99f2d6786969ee330eed88)
---
 .../nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts | 26 +++++++++++++++----
 .../nrf54l15bsim_nrf54l15_cpuapp.yaml         |  2 +-
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
index e6129833778..66c1b26a6e7 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -32,7 +32,6 @@
 			/delete-node/ vpr@4c000;
 			/delete-node/ mailbox@0;
 			/delete-node/ interrupt-controller@f0000000;
-			/delete-node/ gpio@50400;
 			/delete-node/ i2c@c6000;
 			/delete-node/ spi@c6000;
 			/delete-node/ uart@c6000;
@@ -47,8 +46,6 @@
 			/delete-node/ pwm@d4000;
 			/delete-node/ adc@d5000;
 			/delete-node/ nfct@d6000;
-			/delete-node/ gpio@d8200;
-			/delete-node/ gpiote@da000;
 			/delete-node/ i2s@dd000;
 			/delete-node/ qdec@e0000;
 			/delete-node/ qdec@e1000;
@@ -57,8 +54,6 @@
 			/delete-node/ uart@104000;
 			/delete-node/ watchdog@108000;
 			/delete-node/ watchdog@109000;
-			/delete-node/ gpio@10a000;
-			/delete-node/ gpiote@10c000;
 		};
 	};
 
@@ -93,6 +88,27 @@
 	};
 };
 
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpiote30 {
+	status = "okay";
+};
+
 &temp {
 	status = "okay";
 };
diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml
index cbdd257334f..6bbf4542660 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml
@@ -9,9 +9,9 @@ toolchain:
   - zephyr
 supported:
   - counter
+  - gpio
 testing:
   ignore_tags:
-    - gpio
     - modem
     - uart
     - bsim_skip_CI

From cc3c06ca569a229eca54de6525154fb5701fa2be Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 4 Nov 2024 18:13:54 +0100
Subject: [PATCH 0962/2913] [nrf fromtree] tests gpio_basic_api: Enable for
 nrf54l15bsim

Enable this test, and provide overlays, in the nrf54l15bsim

Note this test specs 2 GPIO pins to be shorted. This can be done
for the simulation target by calling zephyr.exe with the option
`-gpio_conf_file=shorts_config.txt`
Where  that file would contain this one line (for the provided overlay)
---- shorts_config.txt
short 1.1 1.2
----

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 1b1d3ca5d5bd8fab282c7574f937431c25f45fb9)
---
 .../boards/nrf54l15bsim_nrf54l15_cpuapp.conf               | 1 +
 .../boards/nrf54l15bsim_nrf54l15_cpuapp.overlay            | 7 +++++++
 tests/drivers/gpio/gpio_basic_api/testcase.yaml            | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.conf
 create mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.conf b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.conf
new file mode 100644
index 00000000000..b9d02cf11d5
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SKIP_PULL_TEST=y
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..2edc8260dc3
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf52_bsim.overlay"
diff --git a/tests/drivers/gpio/gpio_basic_api/testcase.yaml b/tests/drivers/gpio/gpio_basic_api/testcase.yaml
index df924719f30..eddca3d26dc 100644
--- a/tests/drivers/gpio/gpio_basic_api/testcase.yaml
+++ b/tests/drivers/gpio/gpio_basic_api/testcase.yaml
@@ -13,7 +13,7 @@ tests:
     filter: dt_compat_enabled("test-gpio-basic-api") and not dt_compat_enabled("arduino-header-r3")
 
   drivers.gpio.nrf_sense_edge:
-    platform_allow: nrf52840dk/nrf52840 nrf52_bsim
+    platform_allow: nrf52840dk/nrf52840 nrf52_bsim nrf54l15bsim/nrf54l15/cpuapp
     extra_args: "DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840.overlay;\
                  boards/nrf52840dk_nrf52840_sense_edge.overlay"
 

From 3d9f65693b4a90ba5f9cb21d4ad06d8c5f1b5ede Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 4 Nov 2024 18:14:42 +0100
Subject: [PATCH 0963/2913] [nrf fromtree] tests gpio_hogs: Enable for
 nrf54l15bsim

Enable this test, and provide overlays, in the nrf54l15bsim

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit fb5ee609a0f0082faa2ef012637f61825d58a857)
---
 .../nrf54l15bsim_nrf54l15_cpuapp.overlay      | 35 +++++++++++++++++++
 tests/drivers/gpio/gpio_hogs/testcase.yaml    |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 tests/drivers/gpio/gpio_hogs/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/gpio/gpio_hogs/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/gpio/gpio_hogs/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..6bf18e1faa1
--- /dev/null
+++ b/tests/drivers/gpio/gpio_hogs/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2023 Vestas Wind Systems A/S
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/ {
+	zephyr,user {
+		output-high-gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+		output-low-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
+		input-gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
+	};
+};
+
+&gpio0 {
+	hog1 {
+		gpio-hog;
+		gpios = <3 GPIO_ACTIVE_LOW>;
+		output-high;
+	};
+
+	hog2 {
+		gpio-hog;
+		gpios = <4 GPIO_ACTIVE_HIGH>;
+		output-low;
+	};
+
+	hog3 {
+		gpio-hog;
+		gpios = <1 GPIO_ACTIVE_LOW>;
+		input;
+	};
+};
diff --git a/tests/drivers/gpio/gpio_hogs/testcase.yaml b/tests/drivers/gpio/gpio_hogs/testcase.yaml
index 998d68d7c67..81b9a1d8d60 100644
--- a/tests/drivers/gpio/gpio_hogs/testcase.yaml
+++ b/tests/drivers/gpio/gpio_hogs/testcase.yaml
@@ -11,6 +11,7 @@ tests:
       - nrf52840dk/nrf52840
       - nucleo_g474re
       - nrf52_bsim
+      - nrf54l15bsim/nrf54l15/cpuapp
       - mr_canhubk3
       - s32z2xxdc2/s32z270/rtu0
       - s32z2xxdc2/s32z270/rtu1

From 7bbebcdcbb4a3a12708e12f7d35ea0d133479593 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 4 Nov 2024 18:21:08 +0100
Subject: [PATCH 0964/2913] [nrf fromtree] tests gpio_get_direction: Enable for
 nrf54l15bsim

Enable this test by providing an overlay for the nrf54l15bsim

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 990fc4c1305fa98712d8b71bd9a0b22207995c22)
---
 .../boards/nrf54l15bsim_nrf54l15_cpuapp.overlay            | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 tests/drivers/gpio/gpio_get_direction/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/gpio/gpio_get_direction/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/gpio/gpio_get_direction/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..2edc8260dc3
--- /dev/null
+++ b/tests/drivers/gpio/gpio_get_direction/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf52_bsim.overlay"

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 0965/2913] [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

From 204459158431ef8c5b1914b30ccd219e92a4ed3b Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Wed, 6 Nov 2024 16:50:23 +0100
Subject: [PATCH 0966/2913] [nrf fromtree] tests gpio_hogs: Enable for
 nrf5340bsim

Enable this test, and provide overlays, for the nrf5340bsim.
Both for the app and net core.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 8bd0a2525c4249819fc6519453bf5bed0a385d02)
---
 .../gpio_hogs/boards/nrf5340bsim_nrf5340_cpuapp.overlay    | 7 +++++++
 .../gpio_hogs/boards/nrf5340bsim_nrf5340_cpunet.overlay    | 7 +++++++
 tests/drivers/gpio/gpio_hogs/testcase.yaml                 | 2 ++
 3 files changed, 16 insertions(+)
 create mode 100644 tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpuapp.overlay
 create mode 100644 tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpunet.overlay

diff --git a/tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..e84f379d899
--- /dev/null
+++ b/tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpuapp.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2023 Vestas Wind Systems A/S
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf52_bsim.overlay"
diff --git a/tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpunet.overlay b/tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpunet.overlay
new file mode 100644
index 00000000000..e84f379d899
--- /dev/null
+++ b/tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpunet.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2023 Vestas Wind Systems A/S
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf52_bsim.overlay"
diff --git a/tests/drivers/gpio/gpio_hogs/testcase.yaml b/tests/drivers/gpio/gpio_hogs/testcase.yaml
index 81b9a1d8d60..fa3108e21e6 100644
--- a/tests/drivers/gpio/gpio_hogs/testcase.yaml
+++ b/tests/drivers/gpio/gpio_hogs/testcase.yaml
@@ -11,6 +11,8 @@ tests:
       - nrf52840dk/nrf52840
       - nucleo_g474re
       - nrf52_bsim
+      - nrf5340bsim/nrf5340/cpuapp
+      - nrf5340bsim/nrf5340/cpunet
       - nrf54l15bsim/nrf54l15/cpuapp
       - mr_canhubk3
       - s32z2xxdc2/s32z270/rtu0

From 446f0fe9dac1a5e00b6154dd8105de5fecd9ac22 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Wed, 6 Nov 2024 16:51:28 +0100
Subject: [PATCH 0967/2913] [nrf fromtree] tests gpio_basic_api: Enable for
 nrf5340bsim

Enable this test, and provide overlays, in the nrf5340bsim

Note this test specs 2 GPIO pins to be shorted. This can be done
for the simulation target by calling zephyr.exe with the option
`-gpio_conf_file=shorts_config.txt`
Where  that file would contain this one line (for the provided overlay),
for the cpunet:
---- shorts_config.txt
short 1.1 1.2
----
And this for the cpuapp:
---- shorts_config.txt
short 3.1 3.2
----

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 14c096ff3832efb2130653283e6ee3dbd2c24f41)
---
 .../gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.conf  | 1 +
 .../boards/nrf5340bsim_nrf5340_cpuapp.overlay              | 7 +++++++
 .../gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.conf  | 1 +
 .../boards/nrf5340bsim_nrf5340_cpunet.overlay              | 7 +++++++
 tests/drivers/gpio/gpio_basic_api/testcase.yaml            | 7 ++++++-
 5 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.conf
 create mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay
 create mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.conf
 create mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.overlay

diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.conf b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.conf
new file mode 100644
index 00000000000..b9d02cf11d5
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SKIP_PULL_TEST=y
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..2edc8260dc3
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf52_bsim.overlay"
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.conf b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.conf
new file mode 100644
index 00000000000..b9d02cf11d5
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.conf
@@ -0,0 +1 @@
+CONFIG_SKIP_PULL_TEST=y
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.overlay
new file mode 100644
index 00000000000..2edc8260dc3
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf52_bsim.overlay"
diff --git a/tests/drivers/gpio/gpio_basic_api/testcase.yaml b/tests/drivers/gpio/gpio_basic_api/testcase.yaml
index eddca3d26dc..3e7d1d1fcba 100644
--- a/tests/drivers/gpio/gpio_basic_api/testcase.yaml
+++ b/tests/drivers/gpio/gpio_basic_api/testcase.yaml
@@ -13,7 +13,12 @@ tests:
     filter: dt_compat_enabled("test-gpio-basic-api") and not dt_compat_enabled("arduino-header-r3")
 
   drivers.gpio.nrf_sense_edge:
-    platform_allow: nrf52840dk/nrf52840 nrf52_bsim nrf54l15bsim/nrf54l15/cpuapp
+    platform_allow:
+      - nrf52840dk/nrf52840
+      - nrf52_bsim
+      - nrf5340bsim/nrf5340/cpuapp
+      - nrf5340bsim/nrf5340/cpunet
+      - nrf54l15bsim/nrf54l15/cpuapp
     extra_args: "DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840.overlay;\
                  boards/nrf52840dk_nrf52840_sense_edge.overlay"
 

From 3d3783c0a805c7b6fc8c69f18e6e2b0cf711dfc5 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Wed, 6 Nov 2024 16:52:28 +0100
Subject: [PATCH 0968/2913] [nrf fromtree] tests gpio_get_direction: Enable for
 nrf5340bsim

Enable this test by providing an overlay for the nrf5340bsim
Both for the app and net core.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit da01758908ae4f7cfe455d453427fb3c4fee56c9)
---
 .../boards/nrf5340bsim_nrf5340_cpuapp.overlay              | 7 +++++++
 .../boards/nrf5340bsim_nrf5340_cpunet.overlay              | 7 +++++++
 2 files changed, 14 insertions(+)
 create mode 100644 tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpuapp.overlay
 create mode 100644 tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpunet.overlay

diff --git a/tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..2edc8260dc3
--- /dev/null
+++ b/tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpuapp.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf52_bsim.overlay"
diff --git a/tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpunet.overlay b/tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpunet.overlay
new file mode 100644
index 00000000000..2edc8260dc3
--- /dev/null
+++ b/tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpunet.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf52_bsim.overlay"

From 30138ab7433d743fd5c0934f34a9d17f5bb5905e Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Fri, 8 Nov 2024 17:15:00 +0100
Subject: [PATCH 0969/2913] [nrf fromtree] doc boards nrfbsim: Mention the GPIO
 & GPIOTE as supported

Include in the list of supported peripherals the GPIO
and GPIOT for both the nrf5340 and nrf54l15

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 3418305eb8aa60722e2f48c80af5e4dd238cd88d)
---
 boards/native/nrf_bsim/doc/nrf5340bsim.rst  | 1 +
 boards/native/nrf_bsim/doc/nrf54l15bsim.rst | 1 +
 2 files changed, 2 insertions(+)

diff --git a/boards/native/nrf_bsim/doc/nrf5340bsim.rst b/boards/native/nrf_bsim/doc/nrf5340bsim.rst
index 271e0db1bc1..8a257fa5bfe 100644
--- a/boards/native/nrf_bsim/doc/nrf5340bsim.rst
+++ b/boards/native/nrf_bsim/doc/nrf5340bsim.rst
@@ -34,6 +34,7 @@ These boards include models of some of the nRF5340 SOC peripherals:
 * DPPI (Distributed Programmable Peripheral Interconnect)
 * EGU (Event Generator Unit)
 * FICR (Factory Information Configuration Registers)
+* GPIO & GPIOTE
 * IPC (Interprocessor communication)
 * MUTEX (Mutual exclusive peripheral)
 * NVMC (Non-Volatile Memory Controller / Flash)
diff --git a/boards/native/nrf_bsim/doc/nrf54l15bsim.rst b/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
index 61ad06c4aa5..9df70aafdc7 100644
--- a/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
+++ b/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
@@ -42,6 +42,7 @@ This boards include models of some of the nRF54L15 SOC peripherals:
 * ECB (AES electronic codebook mode encryption)
 * EGU (Event Generator Unit)
 * FICR (Factory Information Configuration Registers)
+* GPIO & GPIOTE
 * GRTC (Global Real-time Counter)
 * PPIB (PPI Bridge)
 * RADIO

From 77cff4c4fbe399532ce1b674d6e80d50908d8d5b Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Thu, 7 Nov 2024 12:51:13 +0100
Subject: [PATCH 0970/2913] [nrf fromtree] boards nrfbsim: Enable UART(E)
 peripherals for nrf5340bsim

The HW models now support this peripheral for these targets.
Let's enable them.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit a7abf80064444d0ac729d66856832cab90505c7c)
---
 boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts  |  9 +++++++++
 boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml |  1 -
 boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts  | 10 ++++++++++
 boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml |  1 -
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
index f70d06aae75..0273ee4d776 100644
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
@@ -8,6 +8,7 @@
 
 #include <mem.h>
 #include <arm/nordic/nrf5340_cpuapp.dtsi>
+#include <../boards/nordic/nrf5340dk/nrf5340_cpuapp_common-pinctrl.dtsi>
 
 / {
 	model = "Nordic NRF5340 BSIM NRF5340 Application";
@@ -119,6 +120,14 @@
 	status = "okay";
 };
 
+&uart0 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-1 = <&uart0_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
 /* 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 8e0cdf59fb7..9d31586454a 100644
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml
@@ -10,7 +10,6 @@ toolchain:
 testing:
   ignore_tags:
     - 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 0b9d3a79d1a..0f098a7dd29 100644
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts
@@ -8,6 +8,7 @@
 
 #include <mem.h>
 #include <arm/nordic/nrf5340_cpunet.dtsi>
+#include <../boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet-pinctrl.dtsi>
 
 / {
 	model = "Nordic NRF5340 BSIM NRF5340 Network";
@@ -23,6 +24,7 @@
 	};
 
 	chosen {
+		zephyr,console = &uart0;
 		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,ieee802154 = &ieee802154;
@@ -79,6 +81,14 @@
 	status = "okay";
 };
 
+&uart0 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-1 = <&uart0_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
 /* 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 c774a3a5782..a0d6d2caa44 100644
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml
@@ -10,7 +10,6 @@ toolchain:
 testing:
   ignore_tags:
     - modem
-    - uart
     - bsim_skip_CI
 supported:
   - gpio

From 9b2c09e59f15913123106a3e41f930d21e64719a Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Thu, 7 Nov 2024 12:53:52 +0100
Subject: [PATCH 0971/2913] [nrf fromtree] tests uart_async_api: Enable in
 nrf5340bsim//cpuapp

Enable this test in the simulated nrf5340 by providing
an appropriate overlay.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit dd13fa0c472a86f2d74acbd70eadf57ee3da434c)
---
 .../uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.conf    | 2 ++
 .../uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay | 3 +++
 tests/drivers/uart/uart_async_api/testcase.yaml              | 5 ++++-
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.conf
 create mode 100644 tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay

diff --git a/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.conf b/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.conf
new file mode 100644
index 00000000000..e7a460fde6b
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.conf
@@ -0,0 +1,2 @@
+CONFIG_UART_1_NRF_HW_ASYNC_TIMER=1
+CONFIG_UART_NRFX_UARTE_ENHANCED_RX=y
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..bfd4f8676f1
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#include "nrf5340dk_nrf5340_cpuapp.overlay"
diff --git a/tests/drivers/uart/uart_async_api/testcase.yaml b/tests/drivers/uart/uart_async_api/testcase.yaml
index e7a970d4a58..1433691d2a7 100644
--- a/tests/drivers/uart/uart_async_api/testcase.yaml
+++ b/tests/drivers/uart/uart_async_api/testcase.yaml
@@ -26,7 +26,10 @@ tests:
     integration_platforms:
       - nucleo_h743zi
   drivers.uart.async_api.nrf_uarte_new:
-    platform_allow: nrf52840dk/nrf52840 nrf52_bsim
+    platform_allow:
+      - nrf52840dk/nrf52840
+      - nrf52_bsim
+      - nrf5340bsim/nrf5340/cpuapp
     filter: CONFIG_SERIAL_SUPPORT_ASYNC
     harness: ztest
     harness_config:

From 66d0223597aac9a7b41c50bbe61cbdc3dff49d8e Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Fri, 8 Nov 2024 17:35:39 +0100
Subject: [PATCH 0972/2913] [nrf fromtree] tests uart_mix_fifo_poll: Enable for
 nrf5340bsim

Enable this test in the simulated nrf5340 and provide
an appropriate overlay.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 51053cce11d57347a1fad14bc583385f18d3ad51)
---
 .../boards/nrf5340bsim_nrf5340_cpuapp.overlay                  | 3 +++
 tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml            | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 tests/drivers/uart/uart_mix_fifo_poll/boards/nrf5340bsim_nrf5340_cpuapp.overlay

diff --git a/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf5340bsim_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..bfd4f8676f1
--- /dev/null
+++ b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf5340bsim_nrf5340_cpuapp.overlay
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#include "nrf5340dk_nrf5340_cpuapp.overlay"
diff --git a/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml b/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
index 1b13bc57166..91470dc990b 100644
--- a/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
+++ b/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
@@ -8,6 +8,7 @@ common:
     - nrf52840dk/nrf52840
     - nrf9160dk/nrf9160
     - nrf5340dk/nrf5340/cpuapp
+    - nrf5340bsim/nrf5340/cpuapp
     - nrf54l15dk/nrf54l15/cpuapp
     - nrf54h20dk/nrf54h20/cpuapp
     - nrf54h20dk/nrf54h20/cpurad

From e279d8537ab6678093b6643583eb799f329fc258 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Thu, 7 Nov 2024 14:32:20 +0100
Subject: [PATCH 0973/2913] [nrf fromtree] tests uart_pm: Enable for
 nrf5340bsim

Enable this test in the simulated nrf5340 and provide
an appropriate overlay.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 5321941a5dfa1d5e38b5406dae8487ff5fa86bc4)
---
 .../uart/uart_pm/boards/nrf5340bsim_nrf5340_cpuapp.overlay     | 3 +++
 tests/drivers/uart/uart_pm/testcase.yaml                       | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 tests/drivers/uart/uart_pm/boards/nrf5340bsim_nrf5340_cpuapp.overlay

diff --git a/tests/drivers/uart/uart_pm/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/drivers/uart/uart_pm/boards/nrf5340bsim_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..c7277e73775
--- /dev/null
+++ b/tests/drivers/uart/uart_pm/boards/nrf5340bsim_nrf5340_cpuapp.overlay
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#include "nrf52840dk_nrf52840.overlay"
diff --git a/tests/drivers/uart/uart_pm/testcase.yaml b/tests/drivers/uart/uart_pm/testcase.yaml
index 9a7729c8236..f9a7a8f902c 100644
--- a/tests/drivers/uart/uart_pm/testcase.yaml
+++ b/tests/drivers/uart/uart_pm/testcase.yaml
@@ -8,6 +8,7 @@ common:
     - nrf54l15dk/nrf54l15/cpuapp
     - nrf54h20dk/nrf54h20/cpuapp
     - nrf52_bsim
+    - nrf5340bsim/nrf5340/cpuapp
   harness_config:
     fixture: gpio_loopback
   depends_on: gpio

From 0b60cd738acc99c491a405c739f7bdf9a99c01c1 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Fri, 8 Nov 2024 17:40:25 +0100
Subject: [PATCH 0974/2913] [nrf fromtree] doc boards nrfbsim: Mention the
 UARTE as supported for nrf5340

Include in the list of supported peripherals the UARTE for the
simulated nrf5340

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 7065b4628b25bf2c74caeb5d98e582215aa955dd)
---
 boards/native/nrf_bsim/doc/nrf5340bsim.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boards/native/nrf_bsim/doc/nrf5340bsim.rst b/boards/native/nrf_bsim/doc/nrf5340bsim.rst
index 8a257fa5bfe..d726c9d8e7b 100644
--- a/boards/native/nrf_bsim/doc/nrf5340bsim.rst
+++ b/boards/native/nrf_bsim/doc/nrf5340bsim.rst
@@ -43,6 +43,7 @@ These boards include models of some of the nRF5340 SOC peripherals:
 * RTC (Real Time Counter)
 * TEMP (Temperature sensor)
 * TIMER
+* UARTE (UART with Easy DMA)
 * UICR (User Information Configuration Registers)
 
 and will use the same drivers as the nrf5340dk targets for these.

From ce84896c2275e329bc316d8dcbf0b389814a1ad0 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 18 Nov 2024 13:30:16 +0100
Subject: [PATCH 0975/2913] [nrf fromtree] boards nrfbsim: Enable UART(E)
 peripherals for nrf54l15bsim

The HW models now support this peripheral for this target.
Let's enable it.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit ca46c7c816c0fd9e5b56b0f9f7cac067320b8540)
---
 .../nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts | 21 ++++++++++++++-----
 .../nrf54l15bsim_nrf54l15_cpuapp.yaml         |  1 -
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
index 66c1b26a6e7..5a77d6c2e98 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -8,6 +8,7 @@
 
 #include <mem.h>
 #include <arm/nordic/nrf54l15_cpuapp.dtsi>
+#include <../boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi>
 
 / {
 	model = "Nordic NRF54L15 BSIM NRF54L15 Application";
@@ -15,6 +16,7 @@
 
 	chosen {
 		zephyr,entropy = &rng;
+		zephyr,bt-c2h-uart = &uart20;
 		zephyr,flash-controller = &rram_controller;
 		zephyr,flash = &cpuapp_rram;
 	};
@@ -28,19 +30,15 @@
 		/delete-node/ memory@2002f000;
 		peripheral@50000000 {
 			/delete-node/ spi@4a000;
-			/delete-node/ uart@4a000;
 			/delete-node/ vpr@4c000;
 			/delete-node/ mailbox@0;
 			/delete-node/ interrupt-controller@f0000000;
 			/delete-node/ i2c@c6000;
 			/delete-node/ spi@c6000;
-			/delete-node/ uart@c6000;
 			/delete-node/ i2c@c7000;
 			/delete-node/ spi@c7000;
-			/delete-node/ uart@c7000;
 			/delete-node/ i2c@c8000;
 			/delete-node/ spi@c8000;
-			/delete-node/ uart@c8000;
 			/delete-node/ pwm@d2000;
 			/delete-node/ pwm@d3000;
 			/delete-node/ pwm@d4000;
@@ -51,7 +49,6 @@
 			/delete-node/ qdec@e1000;
 			/delete-node/ i2c@104000;
 			/delete-node/ spi@104000;
-			/delete-node/ uart@104000;
 			/delete-node/ watchdog@108000;
 			/delete-node/ watchdog@109000;
 		};
@@ -88,6 +85,20 @@
 	};
 };
 
+&uart20 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart20_default>;
+	pinctrl-1 = <&uart20_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&uart30 {
+	current-speed = <115200>;
+	pinctrl-0 = <&uart30_default>;
+	pinctrl-1 = <&uart30_sleep>;
+	pinctrl-names = "default", "sleep";
+};
 
 &gpio0 {
 	status = "okay";
diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml
index 6bbf4542660..e09184de96d 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml
@@ -13,5 +13,4 @@ supported:
 testing:
   ignore_tags:
     - modem
-    - uart
     - bsim_skip_CI

From db3b37dbed0221e6b849db3c4d9c5eb10ce802ab Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 18 Nov 2024 13:44:48 +0100
Subject: [PATCH 0976/2913] [nrf fromtree] doc boards nrfbsim: Mention the
 UARTE as supported for nrf54l15

Include in the list of supported peripherals the UARTE for the
simulated nrf54l15

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 890f13426e8715a593b39a5c3c3f5d02704f6c69)
---
 boards/native/nrf_bsim/doc/nrf54l15bsim.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boards/native/nrf_bsim/doc/nrf54l15bsim.rst b/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
index 9df70aafdc7..5d7d67f7d1a 100644
--- a/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
+++ b/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
@@ -50,6 +50,7 @@ This boards include models of some of the nRF54L15 SOC peripherals:
 * RTC (Real Time Counter)
 * TEMP (Temperature sensor)
 * TIMER
+* UARTE (UART with Easy DMA)
 * UICR (User Information Configuration Registers)
 
 and will use the same drivers as the nrf54l15dk targets for these.

From 57412f90a634c76d9f7b0f79501ee1275a3ae9ab Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 18 Nov 2024 15:56:03 +0100
Subject: [PATCH 0977/2913] [nrf fromtree] tests uart_async_api: Enable in
 nrf54l15bsim//cpuapp

Enable this test in the simulated nrf54l15 by providing
an appropriate overlay.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit dd2f4117e3a0e327e60d6d6a2c9146a9d1d886a3)
---
 .../uart_async_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay | 3 +++
 tests/drivers/uart/uart_async_api/testcase.yaml                | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..10b8825014f
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/uart/uart_async_api/testcase.yaml b/tests/drivers/uart/uart_async_api/testcase.yaml
index 1433691d2a7..3d7a7b3675a 100644
--- a/tests/drivers/uart/uart_async_api/testcase.yaml
+++ b/tests/drivers/uart/uart_async_api/testcase.yaml
@@ -30,6 +30,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf52_bsim
       - nrf5340bsim/nrf5340/cpuapp
+      - nrf54l15bsim/nrf54l15/cpuapp
     filter: CONFIG_SERIAL_SUPPORT_ASYNC
     harness: ztest
     harness_config:

From 8bd38a0d550f10b4cb45a74c5b131f689c23fe84 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 18 Nov 2024 17:16:43 +0100
Subject: [PATCH 0978/2913] [nrf fromtree] tests uart_mix_fifo_poll: Enable for
 nrf54l15bsim

Enable this test in the simulated nrf54l15 and provide
an appropriate overlay.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit eec736355c2245ce268696a8c5923e86e5f49774)
---
 .../boards/nrf54l15bsim_nrf54l15_cpuapp.overlay                | 3 +++
 tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml            | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..10b8825014f
--- /dev/null
+++ b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml b/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
index 91470dc990b..13f1d52d4d5 100644
--- a/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
+++ b/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
@@ -10,6 +10,7 @@ common:
     - nrf5340dk/nrf5340/cpuapp
     - nrf5340bsim/nrf5340/cpuapp
     - nrf54l15dk/nrf54l15/cpuapp
+    - nrf54l15bsim/nrf54l15/cpuapp
     - nrf54h20dk/nrf54h20/cpuapp
     - nrf54h20dk/nrf54h20/cpurad
     - nrf52_bsim

From b1b11f347c5df56dc831b84b72bd63159206e212 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 18 Nov 2024 17:25:38 +0100
Subject: [PATCH 0979/2913] [nrf fromtree] tests uart_pm: Enable for
 nrf54l15bsim

Enable this test in the simulated nrf5340 and provide
an appropriate overlay.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 9c386cab935f65c2e700e6a89bf6d2e5bb48fd2d)
---
 .../uart/uart_pm/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay   | 3 +++
 tests/drivers/uart/uart_pm/testcase.yaml                       | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 tests/drivers/uart/uart_pm/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/uart/uart_pm/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_pm/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..10b8825014f
--- /dev/null
+++ b/tests/drivers/uart/uart_pm/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/uart/uart_pm/testcase.yaml b/tests/drivers/uart/uart_pm/testcase.yaml
index f9a7a8f902c..29c336441c6 100644
--- a/tests/drivers/uart/uart_pm/testcase.yaml
+++ b/tests/drivers/uart/uart_pm/testcase.yaml
@@ -6,6 +6,7 @@ common:
   platform_allow:
     - nrf52840dk/nrf52840
     - nrf54l15dk/nrf54l15/cpuapp
+    - nrf54l15bsim/nrf54l15/cpuapp
     - nrf54h20dk/nrf54h20/cpuapp
     - nrf52_bsim
     - nrf5340bsim/nrf5340/cpuapp
@@ -29,6 +30,7 @@ tests:
     extra_args: DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840.overlay;nrf_rx_disable.overlay"
     platform_exclude:
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15bsim/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
 
   drivers.uart.pm.enhanced_poll:

From 745e2dc5975356cb74b894c923606c4cea2b9ee8 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 18 Nov 2024 17:28:03 +0100
Subject: [PATCH 0980/2913] [nrf fromtree] tests/bsim: Also runtime test the
 UART drivers for the nrf54l15

To increase coverage.

Note that we call twister separatedly for this target, due to the 54l15
overlays using UARTE20 which is indexed in simulation as "2", but as
the nrf52833 does not have 3 instances. So "-uart2_loopback" is not
a valid option for a 52833 executable.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 4558056f81fe7387e6c291e3321dc880f1858ee2)
---
 tests/bsim/ci.uart.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/bsim/ci.uart.sh b/tests/bsim/ci.uart.sh
index ab49280e130..da305e1fcef 100755
--- a/tests/bsim/ci.uart.sh
+++ b/tests/bsim/ci.uart.sh
@@ -12,9 +12,15 @@ cd ${ZEPHYR_BASE}
 set -uex
 
 echo "UART: Single device tests"
+echo " nRF52833 & 5340:"
 ${ZEPHYR_BASE}/scripts/twister -T tests/drivers/uart/ --force-color --inline-logs -v -M \
   -p nrf52_bsim --fixture gpio_loopback -- -uart0_loopback
 
+echo " nRF54L15:"
+${ZEPHYR_BASE}/scripts/twister -T tests/drivers/uart/ --force-color --inline-logs -v -M \
+  -p nrf54l15bsim/nrf54l15/cpuapp --fixture gpio_loopback \
+  -- -uart2_loopback
+
 echo "UART: Multi device tests"
 WORK_DIR=${ZEPHYR_BASE}/bsim_uart nice tests/bsim/drivers/uart/compile.sh
 RESULTS_FILE=${ZEPHYR_BASE}/bsim_out/bsim_results.uart.52.xml \

From cffd6a084abc111c6c4275fa0ed81a0d2dff525c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 27 Nov 2024 11:14:04 +0100
Subject: [PATCH 0981/2913] [nrf fromtree] dts: common: nordic: nrf54l: Add
 hfpll clock source
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add 128 MHz clock source and use it for uart00. Baudrate setting
must be adjusted based on uart clock source so without this
change there is wrong baudrate on uart00.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 923d313a04726f6475b19ef803eb8b5a080e91d7)
---
 boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts | 4 ++++
 dts/common/nordic/nrf54l20.dtsi                         | 7 +++++++
 dts/common/nordic/nrf54l_05_10_15.dtsi                  | 7 +++++++
 3 files changed, 18 insertions(+)

diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
index 5a77d6c2e98..7d0a2f96aa5 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -85,6 +85,10 @@
 	};
 };
 
+&uart00 {
+	/delete-property/ clocks;
+};
+
 &uart20 {
 	status = "okay";
 	current-speed = <115200>;
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index d06c4814103..7487915cdfd 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -52,6 +52,12 @@
 			#clock-cells = <0>;
 			clock-frequency = <DT_FREQ_M(32)>;
 		};
+
+		hfpll: hfpll {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <DT_FREQ_M(128)>;
+		};
 	};
 
 	soc {
@@ -123,6 +129,7 @@
 				compatible = "nordic,nrf-uarte";
 				reg = <0x4d000 0x1000>;
 				interrupts = <77 NRF_DEFAULT_IRQ_PRIORITY>;
+				clocks = <&hfpll>;
 				status = "disabled";
 				endtx-stoptx-supported;
 				frame-timeout-supported;
diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi
index eba41095e75..d1141643ef1 100644
--- a/dts/common/nordic/nrf54l_05_10_15.dtsi
+++ b/dts/common/nordic/nrf54l_05_10_15.dtsi
@@ -65,6 +65,12 @@
 			#clock-cells = <0>;
 			clock-frequency = <DT_FREQ_M(32)>;
 		};
+
+		hfpll: hfpll {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <DT_FREQ_M(128)>;
+		};
 	};
 
 	soc {
@@ -144,6 +150,7 @@
 				compatible = "nordic,nrf-uarte";
 				reg = <0x4a000 0x1000>;
 				interrupts = <74 NRF_DEFAULT_IRQ_PRIORITY>;
+				clocks = <&hfpll>;
 				status = "disabled";
 				endtx-stoptx-supported;
 				frame-timeout-supported;

From fbc2ac066fbcef15fb9c19d5396d9ffe03389841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 12 Dec 2024 15:39:27 +0100
Subject: [PATCH 0982/2913] [nrf fromlist] boards: native: nrf_bsim: nrf54l15:
 Bring back clocks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Do not delete clocks for the bsim target. Clocks are referenced
by peripherals and it can be used to get frequency that clocks
the peripheral.

Upstream PR #: 82901

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
index 7d0a2f96aa5..13bf2e338f8 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -22,7 +22,6 @@
 	};
 
 	/delete-node/ cpus;
-	/delete-node/ clocks;
 	/delete-node/ sw-pwm;
 
 	soc {

From f5efb381b8af563600f327c2273b117d0ef7f785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 12 Dec 2024 09:11:04 +0100
Subject: [PATCH 0983/2913] [nrf fromlist] dts: common: nordic: Add clock
 source to timers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add clock source to timers which indicates maximum frequency of
the timer instance.

Upstream PR #: 82901

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 dts/common/nordic/nrf54h20.dtsi        |  6 +++---
 dts/common/nordic/nrf54l20.dtsi        |  4 ++--
 dts/common/nordic/nrf54l_05_10_15.dtsi |  4 ++--
 dts/common/nordic/nrf9280.dtsi         | 17 ++++++++++++-----
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 6ce4fda00fa..f879e08fa52 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -374,7 +374,7 @@
 				status = "disabled";
 				cc-num = <8>;
 				interrupts = <40 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&fll16m>;
+				clocks = <&hfxo>;
 				max-bit-width = <32>;
 				max-frequency = <DT_FREQ_M(32)>;
 				prescaler = <0>;
@@ -386,7 +386,7 @@
 				status = "disabled";
 				cc-num = <8>;
 				interrupts = <41 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&fll16m>;
+				clocks = <&hfxo>;
 				max-bit-width = <32>;
 				max-frequency = <DT_FREQ_M(32)>;
 				prescaler = <0>;
@@ -398,7 +398,7 @@
 				status = "disabled";
 				cc-num = <8>;
 				interrupts = <42 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&fll16m>;
+				clocks = <&hfxo>;
 				max-bit-width = <32>;
 				max-frequency = <DT_FREQ_M(32)>;
 				prescaler = <0>;
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 7487915cdfd..a7f72bf5a30 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -152,7 +152,7 @@
 				cc-num = <6>;
 				max-bit-width = <32>;
 				interrupts = <85 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(128)>;
+				clocks = <&hfpll>;
 				prescaler = <0>;
 			};
 
@@ -181,7 +181,7 @@
 				cc-num = <8>;
 				max-bit-width = <32>;
 				interrupts = <133 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(32)>;
+				clocks = <&hfxo>;
 				prescaler = <0>;
 			};
 
diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi
index d1141643ef1..d4e0ee6df00 100644
--- a/dts/common/nordic/nrf54l_05_10_15.dtsi
+++ b/dts/common/nordic/nrf54l_05_10_15.dtsi
@@ -191,7 +191,7 @@
 				cc-num = <6>;
 				max-bit-width = <32>;
 				interrupts = <85 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(128)>;
+				clocks = <&hfpll>;
 				prescaler = <0>;
 			};
 
@@ -220,7 +220,7 @@
 				cc-num = <8>;
 				max-bit-width = <32>;
 				interrupts = <133 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(32)>;
+				clocks = <&hfxo>;
 				prescaler = <0>;
 			};
 
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index c9e1742e102..1222f3675ec 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -88,6 +88,13 @@
 			#clock-cells = <0>;
 			clock-frequency = <DT_FREQ_M(16)>;
 		};
+
+		hsfll120: hsfll120 {
+			compatible = "fixed-clock";
+			clocks = <&fll16m>;
+			#clock-cells = <0>;
+			clock-frequency = <DT_FREQ_M(320)>;
+		};
 	};
 
 	soc {
@@ -261,7 +268,7 @@
 				cc-num = <8>;
 				interrupts = <40 NRF_DEFAULT_IRQ_PRIORITY>;
 				max-bit-width = <32>;
-				max-frequency = <DT_FREQ_M(32)>;
+				clocks = <&hfxo>;
 				prescaler = <0>;
 			};
 
@@ -272,7 +279,7 @@
 				cc-num = <8>;
 				interrupts = <41 NRF_DEFAULT_IRQ_PRIORITY>;
 				max-bit-width = <32>;
-				max-frequency = <DT_FREQ_M(32)>;
+				clocks = <&hfxo>;
 				prescaler = <0>;
 			};
 
@@ -283,7 +290,7 @@
 				cc-num = <8>;
 				interrupts = <42 NRF_DEFAULT_IRQ_PRIORITY>;
 				max-bit-width = <32>;
-				max-frequency = <DT_FREQ_M(32)>;
+				clocks = <&hfxo>;
 				prescaler = <0>;
 			};
 
@@ -462,7 +469,7 @@
 				cc-num = <6>;
 				interrupts = <226 NRF_DEFAULT_IRQ_PRIORITY>;
 				max-bit-width = <32>;
-				max-frequency = <DT_FREQ_M(320)>;
+				clocks = <&hsfll120>;
 				prescaler = <0>;
 			};
 
@@ -473,7 +480,7 @@
 				cc-num = <6>;
 				interrupts = <227 NRF_DEFAULT_IRQ_PRIORITY>;
 				max-bit-width = <32>;
-				max-frequency = <DT_FREQ_M(320)>;
+				clocks = <&hsfll120>;
 				prescaler = <0>;
 			};
 

From 7c3bd68895d63ae72906cfd2722a482209a12272 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 16 Dec 2024 14:30:10 +0530
Subject: [PATCH 0984/2913] Revert "[nrf noup] hostap: Avoid double-definition
 of base64 APIs"

nrf-squash! [nrf noup] hostap: Avoid double-definition of base64 AP

This reverts commit 4bbe53c6a9d56513f96cf0d6bd8b776c24359cf7.

The file definitions have been modified to include "hostap" namespace,
so, this file is must for build.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 modules/hostap/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index 9a0fd21d2cb..e1bd8c6c232 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -106,6 +106,7 @@ zephyr_library_sources(
 	${HOSTAP_SRC_BASE}/drivers/driver_common.c
 	${HOSTAP_SRC_BASE}/drivers/drivers.c
 	${HOSTAP_SRC_BASE}/utils/crc32.c
+	${HOSTAP_SRC_BASE}/utils/base64.c
 	${HOSTAP_SRC_BASE}/utils/common.c
 	${HOSTAP_SRC_BASE}/utils/wpabuf.c
 	${HOSTAP_SRC_BASE}/utils/bitfield.c

From ecc4804d72b1eebf1ebf253f54e51fff364c8086 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 18 Dec 2024 20:45:54 +0530
Subject: [PATCH 0985/2913] [nrf fromlist] shields: nrf7002eb: Fix 54H app core
 boot

With recent SDSC bundles, 54H fails the app core boot in case of a
unsupported GPIO in the UICR.

As Wi-Fi SR co-existence on nRF54H20DK is not yet supported, remove this
GPIO for 54H. This will be fixed properly once co-existence is
revisited.

Upstream PR #: 83173

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay       | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 boards/shields/nrf7002eb/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/boards/shields/nrf7002eb/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/boards/shields/nrf7002eb/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..89e3d5c4c9a
--- /dev/null
+++ b/boards/shields/nrf7002eb/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Only GPIOs 1..11 are supported for PORT1 in nRF54H20DK board, for now
+ * remove this as Wi-Fi SR co-existence is not yet supported on this board.
+ * The external SR RF switch may not even be present on this board.
+ */
+&nrf70 {
+	/delete-property/ srrf-switch-gpios;
+};

From 98c346084770cacdbf421406b477ac4316184e32 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 18 Dec 2024 20:49:15 +0530
Subject: [PATCH 0986/2913] [nrf fromlist] drivers: nrf_wifi: Remove hardcoded
 prints

The GPIOs will vary depending on the platform.

Upstream PR #: 83173

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/src/coex.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/src/coex.c b/drivers/wifi/nrf_wifi/src/coex.c
index 7bb89a07e9e..947bf8511a2 100644
--- a/drivers/wifi/nrf_wifi/src/coex.c
+++ b/drivers/wifi/nrf_wifi/src/coex.c
@@ -247,10 +247,8 @@ int nrf_wifi_config_sr_switch(bool separate_antennas)
 
 	if (separate_antennas) {
 		gpio_pin_set_dt(&sr_rf_switch_spec, 0x0);
-		LOG_INF("GPIO P1.10 set to 0");
 	} else {
 		gpio_pin_set_dt(&sr_rf_switch_spec, 0x1);
-		LOG_INF("GPIO P1.10 set to 1");
 	}
 
 	return 0;

From da1f133c5df6a507941690478b94f0b60bf42bdb Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 18 Dec 2024 20:52:06 +0530
Subject: [PATCH 0987/2913] [nrf fromlist] drivers: nrf_wifi: Add help for SR
 RF switch

Helps in understanding this switch usage better.

Upstream PR #: 83173

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index 45a22b7e7fa..dea420370a6 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -201,6 +201,10 @@ config NRF70_SR_COEX
 
 config NRF70_SR_COEX_RF_SWITCH
 	bool "GPIO configuration to control SR side RF switch position"
+	help
+	  Select this option to enable GPIO configuration to control SR side RF switch position.
+	  If this GPIO is asserted (1), the SR side RF switch is connected to the Wi-Fi side (shared antenna).
+	  If this GPIO is de-asserted (0), the SR side RF switch is connected to the SR side (separate antenna).
 
 config NRF70_WORKQ_STACK_SIZE
 	int "Stack size for workqueue"

From 34af0b4c6d017538d1655f4949efb1ff38a05e9b Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 18 Dec 2024 22:03:42 +0530
Subject: [PATCH 0988/2913] [nrf fromlist] drivers: nrf_wifi: Add dependencies

Add the feature flag and required GPIO in DTS as dependencies to avoid
build failures.

Upstream PR #: 83173

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index dea420370a6..0bb9b21b314 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -201,6 +201,8 @@ config NRF70_SR_COEX
 
 config NRF70_SR_COEX_RF_SWITCH
 	bool "GPIO configuration to control SR side RF switch position"
+	depends on $(dt_node_has_prop,nrf70, srrf-switch-gpios)
+	depends on NRF70_SR_COEX
 	help
 	  Select this option to enable GPIO configuration to control SR side RF switch position.
 	  If this GPIO is asserted (1), the SR side RF switch is connected to the Wi-Fi side (shared antenna).

From 2d9da2a3ae2d39128f819fe35b4ab180c44b7341 Mon Sep 17 00:00:00 2001
From: Przemyslaw Bida <przemyslaw.bida@nordicsemi.no>
Date: Thu, 12 Dec 2024 09:25:12 +0100
Subject: [PATCH 0989/2913] [nrf fromtree] net: openthread: Adding `diag
 transmit` command.

Commit adds `diag transmit` used for transmission IEEE802154 packets
in specific amount and interval.

Signed-off-by: Przemyslaw Bida <przemyslaw.bida@nordicsemi.no>
(cherry picked from commit 1512ed2d3c6575ca3f1d0d62f8dab9966ae0b03d)
---
 modules/openthread/platform/diag.c | 181 +++++++++++++++++++++++++++--
 1 file changed, 169 insertions(+), 12 deletions(-)

diff --git a/modules/openthread/platform/diag.c b/modules/openthread/platform/diag.c
index 23ea3b97986..edf8ad09dd5 100644
--- a/modules/openthread/platform/diag.c
+++ b/modules/openthread/platform/diag.c
@@ -8,20 +8,44 @@
 #include <zephyr/drivers/gpio.h>
 
 #include <openthread/error.h>
+#include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/diag.h>
+#include <openthread/platform/radio.h>
 
 #include "platform-zephyr.h"
 #include "zephyr/sys/util.h"
 
+enum {
+	DIAG_TRANSMIT_MODE_IDLE,
+	DIAG_TRANSMIT_MODE_PACKETS,
+	DIAG_TRANSMIT_MODE_CARRIER,
+	DIAG_TRANSMIT_MODE_MODCARRIER
+
+} diag_trasmit_mode;
+
 /**
  * Diagnostics mode variables.
  *
  */
+
 static bool sDiagMode;
 static void *sDiagCallbackContext;
 static otPlatDiagOutputCallback sDiagOutputCallback;
+static uint8_t sTransmitMode = DIAG_TRANSMIT_MODE_IDLE;
+static uint8_t sChannel = 20;
+static uint32_t sTxPeriod = 1;
+static int32_t sTxCount;
+static int32_t sTxRequestedCount = 1;
 
 static otError startModCarrier(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[]);
+static otError processTransmit(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[]);
+
+static otError parse_long(char *aArgs, long *aValue)
+{
+	char *endptr;
+	*aValue = strtol(aArgs, &endptr, 0);
+	return (*endptr == '\0') ? OT_ERROR_NONE : OT_ERROR_PARSE;
+}
 
 static void diag_output(const char *aFormat, ...)
 {
@@ -48,15 +72,16 @@ void otPlatDiagSetOutputCallback(otInstance *aInstance,
 
 otError otPlatDiagProcess(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[])
 {
-	ARG_UNUSED(aInstance);
-	ARG_UNUSED(aArgsLength);
-
 #if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 	if (strcmp(aArgs[0], "modcarrier") == 0) {
 		return startModCarrier(aInstance, aArgsLength - 1, aArgs + 1);
 	}
 #endif
 
+	if (strcmp(aArgs[0], "transmit") == 0) {
+		return processTransmit(aInstance, aArgsLength - 1, aArgs + 1);
+	}
+
 	/* Add more platform specific diagnostics features here. */
 	diag_output("diag feature '%s' is not supported\r\n", aArgs[0]);
 
@@ -80,6 +105,7 @@ bool otPlatDiagModeGet(void)
 void otPlatDiagChannelSet(uint8_t aChannel)
 {
 	ARG_UNUSED(aChannel);
+	sChannel = aChannel;
 }
 
 void otPlatDiagTxPowerSet(int8_t aTxPower)
@@ -99,19 +125,21 @@ void otPlatDiagRadioReceived(otInstance *aInstance,
 #if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 otError otPlatDiagRadioTransmitCarrier(otInstance *aInstance, bool aEnable)
 {
-	if (!otPlatDiagModeGet()) {
+	if (!otPlatDiagModeGet() || (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE &&
+				     sTransmitMode != DIAG_TRANSMIT_MODE_CARRIER)) {
 		return OT_ERROR_INVALID_STATE;
 	}
 
+	if (aEnable) {
+		sTransmitMode = DIAG_TRANSMIT_MODE_CARRIER;
+	} else {
+		sTransmitMode = DIAG_TRANSMIT_MODE_IDLE;
+	}
+
 	return platformRadioTransmitCarrier(aInstance, aEnable);
 }
 #endif /* CONFIG_IEEE802154_CARRIER_FUNCTIONS */
 
-void otPlatDiagAlarmCallback(otInstance *aInstance)
-{
-	ARG_UNUSED(aInstance);
-}
-
 /*
  * To enable gpio diag commands, in Devicetree create `openthread` node in `/options/` path
  * with `compatible = "openthread,config"` property and `diag-gpios` property,
@@ -291,9 +319,6 @@ otError otPlatDiagGpioGetMode(uint32_t aGpio, otGpioMode *aMode)
 
 static otError startModCarrier(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[])
 {
-	ARG_UNUSED(aInstance);
-	ARG_UNUSED(aArgsLength);
-
 	bool enable = true;
 	uint8_t data[OT_RADIO_FRAME_MAX_SIZE + 1];
 
@@ -301,15 +326,147 @@ static otError startModCarrier(otInstance *aInstance, uint8_t aArgsLength, char
 		return OT_ERROR_INVALID_ARGS;
 	}
 
+	if (!otPlatDiagModeGet() || (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE &&
+				     sTransmitMode != DIAG_TRANSMIT_MODE_MODCARRIER)) {
+		return OT_ERROR_INVALID_STATE;
+	}
+
 	if (strcmp(aArgs[0], "stop") == 0) {
 		enable = false;
+		sTransmitMode = DIAG_TRANSMIT_MODE_IDLE;
 	} else {
 		if (hex2bin(aArgs[0], strlen(aArgs[0]), data, ARRAY_SIZE(data)) == 0) {
 			return OT_ERROR_INVALID_ARGS;
 		}
+		sTransmitMode = DIAG_TRANSMIT_MODE_MODCARRIER;
 	}
 
 	return platformRadioTransmitModulatedCarrier(aInstance, enable, data);
 }
 
 #endif
+
+void otPlatDiagAlarmCallback(otInstance *aInstance)
+{
+	uint32_t now;
+	otRadioFrame *txPacket;
+	const uint16_t diag_packet_len = 30;
+
+	if (sTransmitMode == DIAG_TRANSMIT_MODE_PACKETS) {
+		if ((sTxCount > 0) || (sTxCount == -1)) {
+			txPacket = otPlatRadioGetTransmitBuffer(aInstance);
+
+			txPacket->mInfo.mTxInfo.mTxDelayBaseTime = 0;
+			txPacket->mInfo.mTxInfo.mTxDelay = 0;
+			txPacket->mInfo.mTxInfo.mMaxCsmaBackoffs = 0;
+			txPacket->mInfo.mTxInfo.mMaxFrameRetries = 0;
+			txPacket->mInfo.mTxInfo.mRxChannelAfterTxDone = sChannel;
+			txPacket->mInfo.mTxInfo.mTxPower = OT_RADIO_POWER_INVALID;
+			txPacket->mInfo.mTxInfo.mIsHeaderUpdated = false;
+			txPacket->mInfo.mTxInfo.mIsARetx = false;
+			txPacket->mInfo.mTxInfo.mCsmaCaEnabled = false;
+			txPacket->mInfo.mTxInfo.mCslPresent = false;
+			txPacket->mInfo.mTxInfo.mIsSecurityProcessed = false;
+
+			txPacket->mLength = diag_packet_len;
+
+			for (uint8_t i = 0; i < diag_packet_len; i++) {
+				txPacket->mPsdu[i] = i;
+			}
+
+			otPlatRadioTransmit(aInstance, txPacket);
+
+			if (sTxCount != -1) {
+				sTxCount--;
+			}
+
+			now = otPlatAlarmMilliGetNow();
+			otPlatAlarmMilliStartAt(aInstance, now, sTxPeriod);
+		} else {
+			sTransmitMode = DIAG_TRANSMIT_MODE_IDLE;
+			otPlatAlarmMilliStop(aInstance);
+			otPlatLog(OT_LOG_LEVEL_DEBG, OT_LOG_REGION_PLATFORM, "Transmit done");
+		}
+	}
+}
+
+static otError processTransmit(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[])
+{
+	otError error = OT_ERROR_NONE;
+	long value;
+	uint32_t now;
+
+	if (!otPlatDiagModeGet()) {
+		return OT_ERROR_INVALID_STATE;
+	}
+
+	if (aArgsLength == 0) {
+		diag_output("transmit will send %" PRId32 " diagnostic messages with %" PRIu32
+			    " ms interval\r\n",
+			    sTxRequestedCount, sTxPeriod);
+
+	} else if (strcmp(aArgs[0], "stop") == 0) {
+		if (sTransmitMode == DIAG_TRANSMIT_MODE_IDLE) {
+			return OT_ERROR_INVALID_STATE;
+		}
+
+		otPlatAlarmMilliStop(aInstance);
+		diag_output("diagnostic message transmission is stopped\r\n");
+		sTransmitMode = DIAG_TRANSMIT_MODE_IDLE;
+		otPlatRadioReceive(aInstance, sChannel);
+
+	} else if (strcmp(aArgs[0], "start") == 0) {
+		if (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE) {
+			return OT_ERROR_INVALID_STATE;
+		}
+
+		otPlatAlarmMilliStop(aInstance);
+		sTransmitMode = DIAG_TRANSMIT_MODE_PACKETS;
+		sTxCount = sTxRequestedCount;
+		now = otPlatAlarmMilliGetNow();
+		otPlatAlarmMilliStartAt(aInstance, now, sTxPeriod);
+		diag_output("sending %" PRId32 " diagnostic messages with %" PRIu32
+			    " ms interval\r\n",
+			    sTxRequestedCount, sTxPeriod);
+	} else if (strcmp(aArgs[0], "interval") == 0) {
+
+		if (aArgsLength != 2) {
+			return OT_ERROR_INVALID_ARGS;
+		}
+
+		error = parse_long(aArgs[1], &value);
+		if (error != OT_ERROR_NONE) {
+			return error;
+		}
+
+		if (value <= 0) {
+			return OT_ERROR_INVALID_ARGS;
+		}
+		sTxPeriod = (uint32_t)(value);
+		diag_output("set diagnostic messages interval to %" PRIu32
+			    " ms\r\n", sTxPeriod);
+
+	} else if (strcmp(aArgs[0], "count") == 0) {
+
+		if (aArgsLength != 2) {
+			return OT_ERROR_INVALID_ARGS;
+		}
+
+		error = parse_long(aArgs[1], &value);
+		if (error != OT_ERROR_NONE) {
+			return error;
+		}
+
+		if ((value <= 0) && (value != -1)) {
+			return OT_ERROR_INVALID_ARGS;
+		}
+
+		sTxRequestedCount = (uint32_t)(value);
+		diag_output("set diagnostic messages count to %" PRId32 "\r\n",
+			    sTxRequestedCount);
+	} else {
+		return OT_ERROR_INVALID_ARGS;
+	}
+
+	return error;
+}

From bd64dc948be8d8f708691389f34e54bb1cade8b2 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Tue, 3 Dec 2024 12:38:04 +0100
Subject: [PATCH 0990/2913] [nrf fromtree] drivers: clock_control: nrf: add
 zero-latency-isr safe APIs

Add zero latency interrupt safe APIs to allow requesting and
releasing HFXO. These will be used from components running
in zero latency interrupt context, like the bluetooth stack.

Co-authored-by: Piotr Pryga <piotr.pryga@nordicsemi.no>

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Signed-off-by: Piotr Pryga <piotr.pryga@nordicsemi.no>
(cherry picked from commit 2aec438b437d79e59278bec26428bb58b3d41c3c)
Signed-off-by: Piotr Pryga <piotr.pryga@nordicsemi.no>
---
 .../drivers/clock_control/nrf_clock_control.h | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/include/zephyr/drivers/clock_control/nrf_clock_control.h b/include/zephyr/drivers/clock_control/nrf_clock_control.h
index 27ab518920f..8d9bcbe3441 100644
--- a/include/zephyr/drivers/clock_control/nrf_clock_control.h
+++ b/include/zephyr/drivers/clock_control/nrf_clock_control.h
@@ -317,6 +317,30 @@ int nrf_clock_control_cancel_or_release(const struct device *dev,
 	return api->cancel_or_release(dev, spec, cli);
 }
 
+/** @brief Request the HFXO from Zero Latency Interrupt context.
+ *
+ * Function is optimized for use in Zero Latency Interrupt context.
+ * It does not give notification when the HFXO is ready, so each
+ * user must put the request early enough to make sure the HFXO
+ * ramp-up has finished on time.
+ *
+ * This function uses reference counting so the caller must ensure
+ * that every nrf_clock_control_hfxo_request() call has a matching
+ * nrf_clock_control_hfxo_release() call.
+ */
+void nrf_clock_control_hfxo_request(void);
+
+/** @brief Release the HFXO from Zero Latency Interrupt context.
+ *
+ * Function is optimized for use in Zero Latency Interrupt context.
+ *
+ * Calls to this function must be coupled with prior calls
+ * to nrf_clock_control_hfxo_request(), because it uses basic
+ * reference counting to make sure the HFXO is released when
+ * there are no more pending requests.
+ */
+void nrf_clock_control_hfxo_release(void);
+
 #endif /* defined(CONFIG_CLOCK_CONTROL_NRF2) */
 
 /** @brief Get clock frequency that is used for the given node.

From 6e09b7a32fe2d54051edc88303ded9652b0ccd9b Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Tue, 3 Dec 2024 12:39:45 +0100
Subject: [PATCH 0991/2913] [nrf fromtree] drivers: clock_control: nrf: hfxo:
 impl zero-latency isr API

Implement the zero latency interrupt safe APIs to the HFXO clock
commonly used by the bluetooth stach from zero latency interrupt
context.

Co-authored-by: Piotr Pryga <piotr.pryga@nordicsemi.no>

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Signed-off-by: Piotr Pryga <piotr.pryga@nordicsemi.no>
(cherry picked from commit 73a45a70126df8145a00d2e3adb1dad60818dde0)
Signed-off-by: Piotr Pryga <piotr.pryga@nordicsemi.no>
---
 .../clock_control/clock_control_nrf2_hfxo.c   | 111 +++++++++++++++++-
 1 file changed, 105 insertions(+), 6 deletions(-)

diff --git a/drivers/clock_control/clock_control_nrf2_hfxo.c b/drivers/clock_control/clock_control_nrf2_hfxo.c
index 977c0aaa0d6..43998427f8b 100644
--- a/drivers/clock_control/clock_control_nrf2_hfxo.c
+++ b/drivers/clock_control/clock_control_nrf2_hfxo.c
@@ -21,6 +21,9 @@ struct dev_data_hfxo {
 	onoff_notify_fn notify;
 	struct k_timer timer;
 	sys_snode_t hfxo_node;
+#if defined(CONFIG_ZERO_LATENCY_IRQS)
+	uint16_t request_count;
+#endif /* CONFIG_ZERO_LATENCY_IRQS */
 };
 
 struct dev_config_hfxo {
@@ -29,6 +32,31 @@ struct dev_config_hfxo {
 	k_timeout_t start_up_time;
 };
 
+#if defined(CONFIG_ZERO_LATENCY_IRQS)
+static uint32_t full_irq_lock(void)
+{
+	uint32_t mcu_critical_state;
+
+	if (IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)) {
+		mcu_critical_state = __get_PRIMASK();
+		__disable_irq();
+	} else {
+		mcu_critical_state = irq_lock();
+	}
+
+	return mcu_critical_state;
+}
+
+static void full_irq_unlock(uint32_t mcu_critical_state)
+{
+	if (IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)) {
+		__set_PRIMASK(mcu_critical_state);
+	} else {
+		irq_unlock(mcu_critical_state);
+	}
+}
+#endif /* CONFIG_ZERO_LATENCY_IRQS */
+
 static void hfxo_start_up_timer_handler(struct k_timer *timer)
 {
 	struct dev_data_hfxo *dev_data =
@@ -48,6 +76,40 @@ static void hfxo_start_up_timer_handler(struct k_timer *timer)
 	}
 }
 
+static void start_hfxo(struct dev_data_hfxo *dev_data)
+{
+	nrf_lrcconf_event_clear(NRF_LRCCONF010, NRF_LRCCONF_EVENT_HFXOSTARTED);
+	soc_lrcconf_poweron_request(&dev_data->hfxo_node, NRF_LRCCONF_POWER_MAIN);
+	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_REQHFXO);
+}
+
+static void request_hfxo(struct dev_data_hfxo *dev_data)
+{
+#if defined(CONFIG_ZERO_LATENCY_IRQS)
+	unsigned int key;
+
+	key = full_irq_lock();
+	if (dev_data->request_count == 0) {
+		start_hfxo(dev_data);
+	}
+
+	dev_data->request_count++;
+	full_irq_unlock(key);
+#else
+	start_hfxo(dev_data);
+#endif /* CONFIG_ZERO_LATENCY_IRQS */
+}
+
+#if IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)
+void nrf_clock_control_hfxo_request(void)
+{
+	const struct device *dev = DEVICE_DT_INST_GET(0);
+	struct dev_data_hfxo *dev_data = dev->data;
+
+	request_hfxo(dev_data);
+}
+#endif /* CONFIG_ZERO_LATENCY_IRQS */
+
 static void onoff_start_hfxo(struct onoff_manager *mgr, onoff_notify_fn notify)
 {
 	struct dev_data_hfxo *dev_data =
@@ -56,10 +118,7 @@ static void onoff_start_hfxo(struct onoff_manager *mgr, onoff_notify_fn notify)
 	const struct dev_config_hfxo *dev_config = dev->config;
 
 	dev_data->notify = notify;
-
-	nrf_lrcconf_event_clear(NRF_LRCCONF010, NRF_LRCCONF_EVENT_HFXOSTARTED);
-	soc_lrcconf_poweron_request(&dev_data->hfxo_node, NRF_LRCCONF_POWER_MAIN);
-	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_REQHFXO);
+	request_hfxo(dev_data);
 
 	/* Due to a hardware issue, the HFXOSTARTED event is currently
 	 * unreliable. Hence the timer is used to simply wait the expected
@@ -68,13 +127,53 @@ static void onoff_start_hfxo(struct onoff_manager *mgr, onoff_notify_fn notify)
 	k_timer_start(&dev_data->timer, dev_config->start_up_time, K_NO_WAIT);
 }
 
+static void stop_hfxo(struct dev_data_hfxo *dev_data)
+{
+	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_STOPREQHFXO);
+	soc_lrcconf_poweron_release(&dev_data->hfxo_node, NRF_LRCCONF_POWER_MAIN);
+}
+
+static void release_hfxo(struct dev_data_hfxo *dev_data)
+{
+#if IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)
+	unsigned int key;
+
+	key = full_irq_lock();
+	if (dev_data->request_count < 1) {
+		full_irq_unlock(key);
+		/* Misuse of the API, release without request? */
+		__ASSERT_NO_MSG(false);
+		/* In case asserts are disabled early return due to no requests pending */
+		return;
+	}
+
+	dev_data->request_count--;
+	if (dev_data->request_count < 1) {
+		stop_hfxo(dev_data);
+	}
+
+	full_irq_unlock(key);
+#else
+	stop_hfxo(dev_data);
+#endif /* CONFIG_ZERO_LATENCY_IRQS */
+}
+
+#if IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)
+void nrf_clock_control_hfxo_release(void)
+{
+	const struct device *dev = DEVICE_DT_INST_GET(0);
+	struct dev_data_hfxo *dev_data = dev->data;
+
+	release_hfxo(dev_data);
+}
+#endif /* IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS) */
+
 static void onoff_stop_hfxo(struct onoff_manager *mgr, onoff_notify_fn notify)
 {
 	struct dev_data_hfxo *dev_data =
 		CONTAINER_OF(mgr, struct dev_data_hfxo, mgr);
 
-	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_STOPREQHFXO);
-	soc_lrcconf_poweron_release(&dev_data->hfxo_node, NRF_LRCCONF_POWER_MAIN);
+	release_hfxo(dev_data);
 	notify(mgr, 0);
 }
 

From 10a6bd02d6c41cc340e1cb8001cc43abbaf5cc0a Mon Sep 17 00:00:00 2001
From: Piotr Pryga <piotr.pryga@nordicsemi.no>
Date: Sat, 14 Dec 2024 19:15:37 +0100
Subject: [PATCH 0992/2913] [nrf fromtree] drivers: clock_control: nrf: hfxo:
 Remove redundad code

There were redundant code in full_irq_lock(), full_irq_unlock()
functions that supposed to be used when ZLI IRQs are disabled.
These functions are compiled in only when CONFIG_ZERO_LATENCY_IRQS
is set, hence the non-ZLI execution path was never included
in final binaries.

Signed-off-by: Piotr Pryga <piotr.pryga@nordicsemi.no>
(cherry picked from commit 233095c3f452c05683f0410140e737d89567d927)
Signed-off-by: Piotr Pryga <piotr.pryga@nordicsemi.no>
---
 drivers/clock_control/clock_control_nrf2_hfxo.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/drivers/clock_control/clock_control_nrf2_hfxo.c b/drivers/clock_control/clock_control_nrf2_hfxo.c
index 43998427f8b..eae419f18bb 100644
--- a/drivers/clock_control/clock_control_nrf2_hfxo.c
+++ b/drivers/clock_control/clock_control_nrf2_hfxo.c
@@ -37,23 +37,15 @@ static uint32_t full_irq_lock(void)
 {
 	uint32_t mcu_critical_state;
 
-	if (IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)) {
-		mcu_critical_state = __get_PRIMASK();
-		__disable_irq();
-	} else {
-		mcu_critical_state = irq_lock();
-	}
+	mcu_critical_state = __get_PRIMASK();
+	__disable_irq();
 
 	return mcu_critical_state;
 }
 
 static void full_irq_unlock(uint32_t mcu_critical_state)
 {
-	if (IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)) {
-		__set_PRIMASK(mcu_critical_state);
-	} else {
-		irq_unlock(mcu_critical_state);
-	}
+	__set_PRIMASK(mcu_critical_state);
 }
 #endif /* CONFIG_ZERO_LATENCY_IRQS */
 

From ba1d06f7241c1a899b43bdef7b731fa244646a2f Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Thu, 28 Nov 2024 13:08:11 +0100
Subject: [PATCH 0993/2913] [nrf fromtree] manifest: Update nRF hw models to
 latest

Update the HW models module to:
fbc6e614686b69dfa56f9694350b9488cf83d3f7

Including the following:
fbc6e61 HW models: Fix a few Wextra warnings
b164f15 nrfx replacements: Fix a few Wextra warnings
1f02d3b UART 54: Correct UART22 name
3172fdb UART(E): Add new pty backend
3015405 UARTE FIFO backend: Fix comment and typos
c29727a doc: UARTE is now implemented for 54L
64d9cdf 54 UARTE: Add support for Address bit and configurable data size
3745647 UART: FIFO backend ignore irrelevant CONFIG bits
3a20c98 54 UARTE: Add MATCH functionality
bceda1b Int controller: Provide logic similar to SEVONPEND bit
e66584f Makefile: Add variable to pass arbitrary build options

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 8bc8ded0b41f436139fe0b9419a099b0cb97aa04)
Signed-off-by: Ilhan Ates <ilhan.ates@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 6061b2c5a05..b99c5d1212d 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: 3cfca0192ff84da919e9bc7978bcc2239cd6a395
+      revision: fbc6e614686b69dfa56f9694350b9488cf83d3f7
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
       revision: f6b950a3b5c0187fe499b0e518426d5bf88b7e68

From 898c46a8c92394ca2e6141049558f0817f35eb8f Mon Sep 17 00:00:00 2001
From: Aleksander Wasaznik <aleksander.wasaznik@nordicsemi.no>
Date: Thu, 1 Aug 2024 14:25:51 +0200
Subject: [PATCH 0994/2913] [nrf fromtree] Bluetooth: Host: Fix
 `bt_l2cap_chan_ops.recv` `-EINPROGRESS`

Fix discrepancy in reference management between calls to
`bt_l2cap_chan_ops.recv` when the application returns `-EINPROGRESS`.

There are two call sites, `l2cap_chan_le_recv_sdu` and
`l2cap_chan_le_recv`, that were inconsistent.

`l2cap_chan_le_recv_sdu` moves the reference, and this patch updates
`l2cap_chan_le_recv` to do the same.

This behavior is also now documented.

This bug has existed since the introduction of this feature in
3151d265726fb528d31d8e1ee8b35004e901cfc4.

Signed-off-by: Aleksander Wasaznik <aleksander.wasaznik@nordicsemi.no>
(cherry picked from commit 200de7c00a0a1beb905ec8565a24fce1d498e13b)
---
 include/zephyr/bluetooth/l2cap.h |  5 +++++
 subsys/bluetooth/host/l2cap.c    | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/include/zephyr/bluetooth/l2cap.h b/include/zephyr/bluetooth/l2cap.h
index d3a49f9b3a9..d8812693614 100644
--- a/include/zephyr/bluetooth/l2cap.h
+++ b/include/zephyr/bluetooth/l2cap.h
@@ -350,6 +350,11 @@ struct bt_l2cap_chan_ops {
 	 *  @kconfig{CONFIG_BT_L2CAP_SEG_RECV} is enabled and seg_recv is
 	 *  supplied.
 	 *
+	 *  If the application returns @c -EINPROGRESS, the application takes
+	 *  ownership of the reference in @p buf. (I.e. This pointer value can
+	 *  simply be given to @ref bt_l2cap_chan_recv_complete without any
+	 *  calls @ref net_buf_ref or @ref net_buf_unref.)
+	 *
 	 *  @return 0 in case of success or negative value in case of error.
 	 *  @return -EINPROGRESS in case where user has to confirm once the data
 	 *                       has been processed by calling
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index ed185d12fd7..922586aa36b 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -17,6 +17,7 @@
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/math_extras.h>
 #include <zephyr/sys/util.h>
+#include <zephyr/net_buf.h>
 
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/bluetooth.h>
@@ -2572,6 +2573,7 @@ static void l2cap_chan_le_recv_seg_direct(struct bt_l2cap_le_chan *chan, struct
 static void l2cap_chan_le_recv(struct bt_l2cap_le_chan *chan,
 			       struct net_buf *buf)
 {
+	struct net_buf *owned_ref;
 	uint16_t sdu_len;
 	int err;
 
@@ -2645,7 +2647,13 @@ static void l2cap_chan_le_recv(struct bt_l2cap_le_chan *chan,
 		return;
 	}
 
-	err = chan->chan.ops->recv(&chan->chan, buf);
+	owned_ref = net_buf_ref(buf);
+	err = chan->chan.ops->recv(&chan->chan, owned_ref);
+	if (err != -EINPROGRESS) {
+		net_buf_unref(owned_ref);
+		owned_ref = NULL;
+	}
+
 	if (err < 0) {
 		if (err != -EINPROGRESS) {
 			LOG_ERR("err %d", err);

From 6e1590a88b4b2db647ce8eb02ae4c44a29582f3a Mon Sep 17 00:00:00 2001
From: Aleksander Wasaznik <aleksander.wasaznik@nordicsemi.no>
Date: Thu, 22 Aug 2024 10:14:02 +0200
Subject: [PATCH 0995/2913] [nrf fromtree] Bluetooth: Host: Upgrade log
 severity for L2CAP user error

For ease of development, we should log the event as an error.

Signed-off-by: Aleksander Wasaznik <aleksander.wasaznik@nordicsemi.no>
(cherry picked from commit 70ad45d4d915e21583fc1efecd916303c40f5a2a)
---
 subsys/bluetooth/host/l2cap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index 922586aa36b..9a871781326 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -3252,7 +3252,7 @@ static int bt_l2cap_dyn_chan_send(struct bt_l2cap_le_chan *le_chan, struct net_b
 		/* Call `net_buf_reserve(buf, BT_L2CAP_SDU_CHAN_SEND_RESERVE)`
 		 * when allocating buffers intended for bt_l2cap_chan_send().
 		 */
-		LOG_DBG("Not enough headroom in buf %p", buf);
+		LOG_ERR("Not enough headroom in buf %p", buf);
 		return -EINVAL;
 	}
 
@@ -3300,7 +3300,7 @@ int bt_l2cap_chan_send(struct bt_l2cap_chan *chan, struct net_buf *buf)
 	LOG_DBG("chan %p buf %p len %zu", chan, buf, buf->len);
 
 	if (buf->ref != 1) {
-		LOG_DBG("Expecting 1 ref, got %d", buf->ref);
+		LOG_WRN("Expecting 1 ref, got %d", buf->ref);
 		return -EINVAL;
 	}
 

From 9f0c4ec36c3acd86db7ef87983c8bdaf666151b5 Mon Sep 17 00:00:00 2001
From: Aleksander Wasaznik <aleksander.wasaznik@nordicsemi.no>
Date: Thu, 22 Aug 2024 10:17:39 +0200
Subject: [PATCH 0996/2913] [nrf fromtree] Bluetooth: Host: Add BT_TESTING
 trace event for ACL pool destroy

This is needed for a test to catch a double-free.

Signed-off-by: Aleksander Wasaznik <aleksander.wasaznik@nordicsemi.no>
(cherry picked from commit 5f89a6b8f1051ca30655c8a049935a497bb245d6)
---
 include/zephyr/bluetooth/testing.h | 27 +++++++++++++++++++++++++++
 subsys/bluetooth/host/hci_core.c   | 12 ++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 include/zephyr/bluetooth/testing.h

diff --git a/include/zephyr/bluetooth/testing.h b/include/zephyr/bluetooth/testing.h
new file mode 100644
index 00000000000..3ac48c7b36e
--- /dev/null
+++ b/include/zephyr/bluetooth/testing.h
@@ -0,0 +1,27 @@
+/* Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/** @brief Internal testing interfaces for Bluetooth
+ *  @file
+ *  @internal
+ *
+ *  The interfaces in this file are internal and not stable.
+ */
+
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_TESTING_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_TESTING_H_
+
+#include <zephyr/net_buf.h>
+
+/** @brief Hook for `acl_in_pool.destroy`
+ *
+ *  Weak-function interface. The user can simply define this
+ *  function, and it will automatically become the event
+ *  listener.
+ *
+ *  @kconfig_dep{CONFIG_BT_TESTING}
+ */
+void bt_testing_trace_event_acl_pool_destroy(struct net_buf *buf);
+
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_TESTING_H_ */
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index 2db727fb6eb..7bb93f5295e 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -14,6 +14,7 @@
 #include <zephyr/net_buf.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/sys/check.h>
+#include <zephyr/sys/util_macro.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/sys/slist.h>
 #include <zephyr/sys/byteorder.h>
@@ -28,6 +29,7 @@
 #include <zephyr/bluetooth/l2cap.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/hci_vs.h>
+#include <zephyr/bluetooth/testing.h>
 #if DT_HAS_CHOSEN(zephyr_bt_hci)
 #include <zephyr/drivers/bluetooth.h>
 #else
@@ -263,6 +265,12 @@ void bt_send_one_host_num_completed_packets(uint16_t handle)
 	BT_ASSERT_MSG(err == 0, "Unable to send Host NCP (err %d)", err);
 }
 
+#if defined(CONFIG_BT_TESTING)
+__weak void bt_testing_trace_event_acl_pool_destroy(struct net_buf *buf)
+{
+}
+#endif
+
 #if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
 void bt_hci_host_num_completed_packets(struct net_buf *buf)
 {
@@ -270,6 +278,10 @@ void bt_hci_host_num_completed_packets(struct net_buf *buf)
 	struct bt_conn *conn;
 	uint8_t index = acl(buf)->index;
 
+	if (IS_ENABLED(CONFIG_BT_TESTING)) {
+		bt_testing_trace_event_acl_pool_destroy(buf);
+	}
+
 	net_buf_destroy(buf);
 
 	if (acl(buf)->host_ncp_sent) {

From dcdfa006631e37acb6b3dcb9fe61c3303b1e58e7 Mon Sep 17 00:00:00 2001
From: Aleksander Wasaznik <aleksander.wasaznik@nordicsemi.no>
Date: Thu, 22 Aug 2024 10:19:08 +0200
Subject: [PATCH 0997/2913] [nrf fromtree] Bluetooth: testlib: Add
 `BT_TESTLIB_ADDR_LE_RANDOM_C0_00_00_00_00_`

This is shorthand for random static addresses. It's similar to
`bt_addr_le_from_str`, but is a macro that results in an object literal,
making it more versatile and less verbose.

This macro only gives access to the first 255 random static addresses,
but this ought to be enough addresses for testing.

Signed-off-by: Aleksander Wasaznik <aleksander.wasaznik@nordicsemi.no>
(cherry picked from commit abeca2470247db7da9c1aa3bd83b6e55d94c9407)
---
 .../common/testlib/include/testlib/addr.h     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 tests/bluetooth/common/testlib/include/testlib/addr.h

diff --git a/tests/bluetooth/common/testlib/include/testlib/addr.h b/tests/bluetooth/common/testlib/include/testlib/addr.h
new file mode 100644
index 00000000000..2f9e49488b7
--- /dev/null
+++ b/tests/bluetooth/common/testlib/include/testlib/addr.h
@@ -0,0 +1,20 @@
+/* Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_TESTS_BLUETOOTH_COMMON_TESTLIB_INCLUDE_TESTLIB_ADDR_H_
+#define ZEPHYR_TESTS_BLUETOOTH_COMMON_TESTLIB_INCLUDE_TESTLIB_ADDR_H_
+
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/byteorder.h>
+
+/** Bluetooth LE static random address */
+#define BT_TESTLIB_ADDR_LE_RANDOM_C0_00_00_00_00_(last)                                            \
+	((bt_addr_le_t){                                                                           \
+		.type = BT_ADDR_LE_RANDOM,                                                         \
+		.a = {{last, 0x00, 0x00, 0x00, 0x00, 0xc0}},                                       \
+	})
+
+#endif /* ZEPHYR_TESTS_BLUETOOTH_COMMON_TESTLIB_INCLUDE_TESTLIB_ADDR_H_ */

From c4181c9082a918a796c20679f9617d2182c035c1 Mon Sep 17 00:00:00 2001
From: Aleksander Wasaznik <aleksander.wasaznik@nordicsemi.no>
Date: Thu, 1 Aug 2024 14:25:51 +0200
Subject: [PATCH 0998/2913] [nrf fromtree] Bluetooth: Host: Test L2CAP
 -EINPROGRESS feature

The test implementation is based on a copy of the HFC multilink test.
The test verifies that the stack respects the reference counting of SDU
buffers when the L2CAP -EINPROGRESS feature is used.

Signed-off-by: Aleksander Wasaznik <aleksander.wasaznik@nordicsemi.no>
(cherry picked from commit 47325f8df5649cfdfff9d19504e79b5635e35a08)
---
 tests/bsim/bluetooth/host/l2cap/compile.sh    |   1 +
 .../host/l2cap/einprogress/CMakeLists.txt     |  24 ++++
 .../host/l2cap/einprogress/compile.sh         |  13 ++
 .../bluetooth/host/l2cap/einprogress/prj.conf |  25 ++++
 .../host/l2cap/einprogress/src/data.h         |  11 ++
 .../host/l2cap/einprogress/src/dut.c          | 124 ++++++++++++++++++
 .../host/l2cap/einprogress/src/main.c         |  47 +++++++
 .../host/l2cap/einprogress/src/tester.c       |  72 ++++++++++
 .../l2cap/einprogress/test_scripts/run.sh     |  26 ++++
 9 files changed, 343 insertions(+)
 create mode 100644 tests/bsim/bluetooth/host/l2cap/einprogress/CMakeLists.txt
 create mode 100755 tests/bsim/bluetooth/host/l2cap/einprogress/compile.sh
 create mode 100644 tests/bsim/bluetooth/host/l2cap/einprogress/prj.conf
 create mode 100644 tests/bsim/bluetooth/host/l2cap/einprogress/src/data.h
 create mode 100644 tests/bsim/bluetooth/host/l2cap/einprogress/src/dut.c
 create mode 100644 tests/bsim/bluetooth/host/l2cap/einprogress/src/main.c
 create mode 100644 tests/bsim/bluetooth/host/l2cap/einprogress/src/tester.c
 create mode 100755 tests/bsim/bluetooth/host/l2cap/einprogress/test_scripts/run.sh

diff --git a/tests/bsim/bluetooth/host/l2cap/compile.sh b/tests/bsim/bluetooth/host/l2cap/compile.sh
index 71d41a7f2e7..ddb7f5d14bc 100755
--- a/tests/bsim/bluetooth/host/l2cap/compile.sh
+++ b/tests/bsim/bluetooth/host/l2cap/compile.sh
@@ -19,6 +19,7 @@ app=tests/bsim/bluetooth/host/l2cap/stress conf_file=prj_nofrag.conf compile
 app=tests/bsim/bluetooth/host/l2cap/stress conf_file=prj_syswq.conf compile
 run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/l2cap/split/compile.sh
 run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/l2cap/reassembly/compile.sh
+run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/l2cap/einprogress/compile.sh
 run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/l2cap/ecred/compile.sh
 app=tests/bsim/bluetooth/host/l2cap/credits compile
 app=tests/bsim/bluetooth/host/l2cap/credits conf_file=prj_ecred.conf compile
diff --git a/tests/bsim/bluetooth/host/l2cap/einprogress/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/einprogress/CMakeLists.txt
new file mode 100644
index 00000000000..b6d0135f936
--- /dev/null
+++ b/tests/bsim/bluetooth/host/l2cap/einprogress/CMakeLists.txt
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+project(test_l2cap_einprogress)
+
+add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/common/testlib testlib)
+target_link_libraries(app PRIVATE testlib)
+
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
+zephyr_include_directories(
+  ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
+  ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
+)
+
+target_sources(app PRIVATE
+  src/main.c
+  src/dut.c
+  src/tester.c
+)
diff --git a/tests/bsim/bluetooth/host/l2cap/einprogress/compile.sh b/tests/bsim/bluetooth/host/l2cap/einprogress/compile.sh
new file mode 100755
index 00000000000..e717a4b2bbe
--- /dev/null
+++ b/tests/bsim/bluetooth/host/l2cap/einprogress/compile.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+# Copyright 2023 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+set -eu
+: "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}"
+
+INCR_BUILD=1
+
+source ${ZEPHYR_BASE}/tests/bsim/compile.source
+
+app="$(guess_test_relpath)" compile
+
+wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/l2cap/einprogress/prj.conf b/tests/bsim/bluetooth/host/l2cap/einprogress/prj.conf
new file mode 100644
index 00000000000..e2540cd6f6a
--- /dev/null
+++ b/tests/bsim/bluetooth/host/l2cap/einprogress/prj.conf
@@ -0,0 +1,25 @@
+CONFIG_LOG=y
+CONFIG_ASSERT=y
+CONFIG_THREAD_NAME=y
+CONFIG_LOG_THREAD_ID_PREFIX=y
+CONFIG_ARCH_POSIX_TRAP_ON_FATAL=y
+CONFIG_BT_TESTING=y
+
+CONFIG_BT_HCI_ACL_FLOW_CONTROL=y
+
+CONFIG_BT=y
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_PERIPHERAL=y
+
+# Dependency of testlib/adv and testlib/scan.
+CONFIG_BT_EXT_ADV=y
+
+# Dynamic channel depends on SMP
+CONFIG_BT_SMP=y
+CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
+
+# Disable auto-initiated procedures so they don't
+# mess with the test's execution.
+CONFIG_BT_AUTO_PHY_UPDATE=n
+CONFIG_BT_AUTO_DATA_LEN_UPDATE=n
+CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
diff --git a/tests/bsim/bluetooth/host/l2cap/einprogress/src/data.h b/tests/bsim/bluetooth/host/l2cap/einprogress/src/data.h
new file mode 100644
index 00000000000..4920d909d08
--- /dev/null
+++ b/tests/bsim/bluetooth/host/l2cap/einprogress/src/data.h
@@ -0,0 +1,11 @@
+/* Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_TESTS_BSIM_BLUETOOTH_HOST_L2CAP_EINPROGRESS_SRC_DATA_H_
+#define ZEPHYR_TESTS_BSIM_BLUETOOTH_HOST_L2CAP_EINPROGRESS_SRC_DATA_H_
+
+#define TEST_DATA_L2CAP_PSM 0x0080
+#define TEST_DATA_DUT_ADDR  BT_TESTLIB_ADDR_LE_RANDOM_C0_00_00_00_00_(0x01)
+
+#endif /* ZEPHYR_TESTS_BSIM_BLUETOOTH_HOST_L2CAP_EINPROGRESS_SRC_DATA_H_ */
diff --git a/tests/bsim/bluetooth/host/l2cap/einprogress/src/dut.c b/tests/bsim/bluetooth/host/l2cap/einprogress/src/dut.c
new file mode 100644
index 00000000000..2c026befd20
--- /dev/null
+++ b/tests/bsim/bluetooth/host/l2cap/einprogress/src/dut.c
@@ -0,0 +1,124 @@
+/* Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/testing.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util_macro.h>
+
+#include <testlib/addr.h>
+#include <testlib/adv.h>
+#include <testlib/conn.h>
+#include <testlib/scan.h>
+
+#include <babblekit/flags.h>
+#include <babblekit/testcase.h>
+
+#include "data.h"
+
+LOG_MODULE_REGISTER(dut, LOG_LEVEL_INF);
+
+/** Here we keep track of the reference count in the test
+ *  application. This allows us to notice if the stack has freed
+ *  references that were ours.
+ */
+static atomic_t acl_pool_refs_held[CONFIG_BT_BUF_ACL_RX_COUNT];
+
+BUILD_ASSERT(IS_ENABLED(CONFIG_BT_TESTING));
+BUILD_ASSERT(IS_ENABLED(CONFIG_BT_HCI_ACL_FLOW_CONTROL));
+void bt_testing_trace_event_acl_pool_destroy(struct net_buf *destroyed_buf)
+{
+	int buf_id = net_buf_id(destroyed_buf);
+
+	__ASSERT_NO_MSG(0 <= buf_id && buf_id < ARRAY_SIZE(acl_pool_refs_held));
+	TEST_ASSERT(acl_pool_refs_held[buf_id] == 0,
+		    "ACL buf was destroyed while tester still held a reference");
+}
+
+static void acl_pool_refs_held_add(struct net_buf *buf)
+{
+	int buf_id = net_buf_id(buf);
+
+	__ASSERT_NO_MSG(0 <= buf_id && buf_id < CONFIG_BT_BUF_ACL_RX_COUNT);
+	atomic_inc(&acl_pool_refs_held[buf_id]);
+}
+
+static void acl_pool_refs_held_remove(struct net_buf *buf)
+{
+	int buf_id = net_buf_id(buf);
+
+	__ASSERT_NO_MSG(0 <= buf_id && buf_id < ARRAY_SIZE(acl_pool_refs_held));
+	atomic_val_t old = atomic_dec(&acl_pool_refs_held[buf_id]);
+
+	__ASSERT(old != 0, "Tester error: releasing a reference that was not held");
+}
+
+struct k_fifo ack_todo;
+
+static int dut_chan_recv_cb(struct bt_l2cap_chan *chan, struct net_buf *buf)
+{
+	/* Move buf. Ownership is ours if we return -EINPROGRESS. */
+	acl_pool_refs_held_add(buf);
+	k_fifo_put(&ack_todo, buf);
+
+	return -EINPROGRESS;
+}
+
+static const struct bt_l2cap_chan_ops ops = {
+	.recv = dut_chan_recv_cb,
+};
+
+static struct bt_l2cap_le_chan le_chan = {
+	.chan.ops = &ops,
+};
+
+static int dut_server_accept_cb(struct bt_conn *conn, struct bt_l2cap_server *server,
+				struct bt_l2cap_chan **chan)
+{
+	*chan = &le_chan.chan;
+	return 0;
+}
+
+static struct bt_l2cap_server test_l2cap_server = {
+	.accept = dut_server_accept_cb,
+	.psm = TEST_DATA_L2CAP_PSM,
+};
+
+void entrypoint_dut(void)
+{
+	struct net_buf *ack_buf;
+	struct bt_conn *conn = NULL;
+	int err;
+
+	TEST_START("dut");
+
+	k_fifo_init(&ack_todo);
+
+	err = bt_id_create(&TEST_DATA_DUT_ADDR, NULL);
+	__ASSERT_NO_MSG(!err);
+
+	err = bt_enable(NULL);
+	__ASSERT_NO_MSG(!err);
+
+	err = bt_l2cap_server_register(&test_l2cap_server);
+	__ASSERT_NO_MSG(!err);
+
+	err = bt_testlib_adv_conn(&conn, BT_ID_DEFAULT, NULL);
+	__ASSERT_NO_MSG(!err);
+
+	ack_buf = k_fifo_get(&ack_todo, K_FOREVER);
+	__ASSERT_NO_MSG(ack_buf);
+
+	acl_pool_refs_held_remove(ack_buf);
+	err = bt_l2cap_chan_recv_complete(&le_chan.chan, ack_buf);
+	TEST_ASSERT(!err);
+
+	TEST_PASS_AND_EXIT("dut");
+}
diff --git a/tests/bsim/bluetooth/host/l2cap/einprogress/src/main.c b/tests/bsim/bluetooth/host/l2cap/einprogress/src/main.c
new file mode 100644
index 00000000000..d6611e8f8dd
--- /dev/null
+++ b/tests/bsim/bluetooth/host/l2cap/einprogress/src/main.c
@@ -0,0 +1,47 @@
+/* Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#include "bstests.h"
+#include "babblekit/testcase.h"
+
+extern void entrypoint_dut(void);
+extern void entrypoint_tester(void);
+extern enum bst_result_t bst_result;
+
+static void test_end_cb(void)
+{
+	if (bst_result != Passed) {
+		TEST_PRINT("Test has not passed.");
+	}
+}
+
+static const struct bst_test_instance entrypoints[] = {
+	{
+		.test_id = "l2cap/einprogress/dut",
+		.test_delete_f = test_end_cb,
+		.test_main_f = entrypoint_dut,
+	},
+	{
+		.test_id = "l2cap/einprogress/tester",
+		.test_delete_f = test_end_cb,
+		.test_main_f = entrypoint_tester,
+	},
+	BSTEST_END_MARKER,
+};
+
+static struct bst_test_list *install(struct bst_test_list *tests)
+{
+	return bst_add_tests(tests, entrypoints);
+};
+
+bst_test_install_t test_installers[] = {install, NULL};
+
+int main(void)
+{
+	bst_main();
+
+	return 0;
+}
diff --git a/tests/bsim/bluetooth/host/l2cap/einprogress/src/tester.c b/tests/bsim/bluetooth/host/l2cap/einprogress/src/tester.c
new file mode 100644
index 00000000000..2e2d000aa9c
--- /dev/null
+++ b/tests/bsim/bluetooth/host/l2cap/einprogress/src/tester.c
@@ -0,0 +1,72 @@
+/* Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util_macro.h>
+
+#include <testlib/addr.h>
+#include <testlib/adv.h>
+#include <testlib/conn.h>
+#include <testlib/scan.h>
+
+#include <babblekit/flags.h>
+#include <babblekit/testcase.h>
+
+#include "data.h"
+
+LOG_MODULE_REGISTER(tester, LOG_LEVEL_INF);
+
+static int tester_chan_recv_cb(struct bt_l2cap_chan *chan, struct net_buf *buf)
+{
+	__ASSERT(false, "Unexpected recv in tester");
+	return 0;
+};
+
+static struct bt_l2cap_le_chan le_chan = {
+	.chan.ops =
+		&(const struct bt_l2cap_chan_ops){
+			.recv = tester_chan_recv_cb,
+		},
+};
+
+NET_BUF_POOL_DEFINE(test_pool, 1, BT_L2CAP_SDU_BUF_SIZE(0), CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
+
+void entrypoint_tester(void)
+{
+	struct net_buf *sdu;
+	struct bt_conn *conn = NULL;
+	int err;
+
+	TEST_START("tester");
+
+	err = bt_enable(NULL);
+	__ASSERT_NO_MSG(!err);
+
+	err = bt_testlib_connect(&TEST_DATA_DUT_ADDR, &conn);
+	__ASSERT_NO_MSG(!err);
+
+	err = bt_l2cap_chan_connect(conn, &le_chan.chan, TEST_DATA_L2CAP_PSM);
+	__ASSERT_NO_MSG(!err);
+
+	/* Wait for async L2CAP connect */
+	while (!atomic_test_bit(le_chan.chan.status, BT_L2CAP_STATUS_OUT)) {
+		k_sleep(K_MSEC(100));
+	}
+
+	sdu = net_buf_alloc(&test_pool, K_NO_WAIT);
+	__ASSERT_NO_MSG(sdu);
+	net_buf_reserve(sdu, BT_L2CAP_SDU_CHAN_SEND_RESERVE);
+
+	err = bt_l2cap_chan_send(&le_chan.chan, sdu);
+	__ASSERT(!err, "err: %d", err);
+
+	TEST_PASS("tester");
+}
diff --git a/tests/bsim/bluetooth/host/l2cap/einprogress/test_scripts/run.sh b/tests/bsim/bluetooth/host/l2cap/einprogress/test_scripts/run.sh
new file mode 100755
index 00000000000..b86db52d9df
--- /dev/null
+++ b/tests/bsim/bluetooth/host/l2cap/einprogress/test_scripts/run.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# Copyright (c) 2024 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+set -eu
+
+source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
+
+test_name="$(guess_test_long_name)"
+simulation_id=${test_name}
+verbosity_level=2
+EXECUTE_TIMEOUT=120
+SIM_LEN_US=$((2 * 1000 * 1000))
+
+test_exe="${BSIM_OUT_PATH}/bin/bs_${BOARD_TS}_${test_name}_prj_conf"
+
+cd ${BSIM_OUT_PATH}/bin
+
+Execute "${test_exe}" -v=${verbosity_level} -s=${simulation_id} -d=0 \
+    -testid=l2cap/einprogress/dut
+Execute "${test_exe}" -v=${verbosity_level} -s=${simulation_id} -d=1 \
+    -testid=l2cap/einprogress/tester
+
+Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} -D=2 -sim_length=${SIM_LEN_US} $@
+
+wait_for_background_jobs

From 5af4cccb69d59bf53e41672c991457788b3afd75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Cab=C3=A9?= <benjamin@zephyrproject.org>
Date: Mon, 4 Nov 2024 18:27:33 +0100
Subject: [PATCH 0999/2913] [nrf fromtree] doc: releases: introduce release
 notes and migration guide docs for 4.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This introduces the release notes and migration guide for 4.1.0 earlier
than we typically do, so that people have a placeholder to start adding
content as they line up pull requests for 4.1.
The two documents are currently orphan and not visible from the main
documentation as this would confuse users of 4.0.

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
(cherry picked from commit d342f9e0c2858ed97aa640814c4a12f84b2bbe6b)
---
 doc/releases/migration-guide-4.1.rst | 112 +++++++++++
 doc/releases/release-notes-4.1.rst   | 288 +++++++++++++++++++++++++++
 2 files changed, 400 insertions(+)
 create mode 100644 doc/releases/migration-guide-4.1.rst
 create mode 100644 doc/releases/release-notes-4.1.rst

diff --git a/doc/releases/migration-guide-4.1.rst b/doc/releases/migration-guide-4.1.rst
new file mode 100644
index 00000000000..d35ab96073c
--- /dev/null
+++ b/doc/releases/migration-guide-4.1.rst
@@ -0,0 +1,112 @@
+:orphan:
+
+.. _migration_4.1:
+
+Migration guide to Zephyr v4.1.0 (Working Draft)
+################################################
+
+This document describes the changes required when migrating your application from Zephyr v4.0.0 to
+Zephyr v4.1.0.
+
+Any other changes (not directly related to migrating applications) can be found in
+the :ref:`release notes<zephyr_4.1>`.
+
+.. contents::
+    :local:
+    :depth: 2
+
+Build System
+************
+
+Kernel
+******
+
+Boards
+******
+
+Modules
+*******
+
+Mbed TLS
+========
+
+Trusted Firmware-M
+==================
+
+LVGL
+====
+
+Device Drivers and Devicetree
+*****************************
+
+Controller Area Network (CAN)
+=============================
+
+Display
+=======
+
+Enhanced Serial Peripheral Interface (eSPI)
+===========================================
+
+GNSS
+====
+
+Input
+=====
+
+Interrupt Controller
+====================
+
+LED Strip
+=========
+
+Sensors
+=======
+
+Serial
+======
+
+Regulator
+=========
+
+Bluetooth
+*********
+
+Bluetooth HCI
+=============
+
+Bluetooth Mesh
+==============
+
+Bluetooth Audio
+===============
+
+Bluetooth Classic
+=================
+
+Bluetooth Host
+==============
+
+Bluetooth Crypto
+================
+
+Networking
+**********
+
+Other Subsystems
+****************
+
+Flash map
+=========
+
+hawkBit
+=======
+
+MCUmgr
+======
+
+Modem
+=====
+
+Architectures
+*************
diff --git a/doc/releases/release-notes-4.1.rst b/doc/releases/release-notes-4.1.rst
new file mode 100644
index 00000000000..202fdb20489
--- /dev/null
+++ b/doc/releases/release-notes-4.1.rst
@@ -0,0 +1,288 @@
+:orphan:
+
+.. _zephyr_4.1:
+
+Zephyr 4.1.0 (Working Draft)
+############################
+
+We are pleased to announce the release of Zephyr version 4.1.0.
+
+Major enhancements with this release include:
+
+An overview of the changes required or recommended when migrating your application from Zephyr
+v4.0.0 to Zephyr v4.1.0 can be found in the separate :ref:`migration guide<migration_4.1>`.
+
+The following sections provide detailed lists of changes by component.
+
+Security Vulnerability Related
+******************************
+The following CVEs are addressed by this release:
+
+More detailed information can be found in:
+https://docs.zephyrproject.org/latest/security/vulnerabilities.html
+
+API Changes
+***********
+
+Removed APIs in this release
+============================
+
+Deprecated in this release
+==========================
+
+Architectures
+*************
+
+* ARC
+
+* ARM
+
+* ARM64
+
+* RISC-V
+
+* Xtensa
+
+Kernel
+******
+
+Bluetooth
+*********
+
+* Audio
+
+* Host
+
+* HCI Drivers
+
+Boards & SoC Support
+********************
+
+* Added support for these SoC series:
+
+* Made these changes in other SoC series:
+
+* Added support for these boards:
+
+* Made these board changes:
+
+* Added support for the following shields:
+
+Build system and Infrastructure
+*******************************
+
+Drivers and Sensors
+*******************
+
+* ADC
+
+* Battery
+
+* CAN
+
+* Charger
+
+* Clock control
+
+* Counter
+
+* DAC
+
+* Disk
+
+* Display
+
+* Ethernet
+
+* Flash
+
+* GNSS
+
+* GPIO
+
+* Hardware info
+
+* I2C
+
+* I2S
+
+* I3C
+
+* Input
+
+* LED
+
+* LED Strip
+
+* LoRa
+
+* Mailbox
+
+* MDIO
+
+* MFD
+
+* Modem
+
+* MIPI-DBI
+
+* MSPI
+
+* Pin control
+
+* PWM
+
+* Regulators
+
+* Reset
+
+* RTC
+
+* RTIO
+
+* SDHC
+
+* Sensors
+
+* Serial
+
+* SPI
+
+* USB
+
+* Video
+
+* Watchdog
+
+* Wi-Fi
+
+Networking
+**********
+
+* ARP:
+
+* CoAP:
+
+* Connection manager:
+
+* DHCPv4:
+
+* DHCPv6:
+
+* DNS/mDNS/LLMNR:
+
+* gPTP/PTP:
+
+* HTTP:
+
+* IPSP:
+
+* IPv4:
+
+* IPv6:
+
+* LwM2M:
+
+* Misc:
+
+* MQTT:
+
+* Network Interface:
+
+* OpenThread
+
+* PPP
+
+* Shell:
+
+* Sockets:
+
+* Syslog:
+
+* TCP:
+
+* Websocket:
+
+* Wi-Fi:
+
+* zperf:
+
+USB
+***
+
+Devicetree
+**********
+
+Kconfig
+*******
+
+Libraries / Subsystems
+**********************
+
+* Debug
+
+* Demand Paging
+
+* Formatted output
+
+* Management
+
+* Logging
+
+* Modem modules
+
+* Power management
+
+* Crypto
+
+* CMSIS-NN
+
+* FPGA
+
+* Random
+
+* SD
+
+* State Machine Framework
+
+* Storage
+
+* Task Watchdog
+
+* POSIX API
+
+* LoRa/LoRaWAN
+
+* ZBus
+
+HALs
+****
+
+* Nordic
+
+* STM32
+
+* ADI
+
+* Espressif
+
+MCUboot
+*******
+
+OSDP
+****
+
+Trusted Firmware-M
+******************
+
+LVGL
+****
+
+Tests and Samples
+*****************
+
+Issue Related Items
+*******************
+
+Known Issues
+============

From 657e1a385f7bcb7fabc8d1cf3be22cadd67fe46d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Battrel?= <theo.battrel@nordicsemi.no>
Date: Thu, 21 Nov 2024 15:04:30 +0100
Subject: [PATCH 1000/2913] [nrf fromtree] Bluetooth: Host: Deprecate
 `BT_BUF_ACL_RX_COUNT` symbol
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Because the number of ACL RX buffers must be at least the number of
maximum connections plus one, increasing `CONFIG_BT_MAX_CONN` could
inadvertently lead to a build failure if the number of ACL RX buffers is
not also increased. This dependency may not be obvious to users.

To address this issue, this commit deprecates the
`CONFIG_BT_BUF_RX_COUNT` Kconfig symbol and computes the value in
`buf.h` using the new `BT_BUF_RX_COUNT` define. Note that the default
value and the minimum range value have been changed to 0 to "disable"
the option.

Additionally, to allow users to increase the number of ACL RX buffers,
this commit introduces the new `CONFIG_BT_BUF_RX_COUNT_EXTRA` Kconfig
symbol. The value of this symbol will be added to the computed value of
`BT_BUF_RX_COUNT`.

The configurations of tests and samples have been updated to reflect
these changes.

Signed-off-by: Théo Battrel <theo.battrel@nordicsemi.no>
(cherry picked from commit 66ff97e69bd16133aa568ec34fef9196fc65ad80)
---
 doc/releases/migration-guide-4.1.rst          | 13 ++++++++
 doc/releases/release-notes-4.1.rst            |  3 ++
 include/zephyr/bluetooth/buf.h                | 30 ++++++++++++++++++-
 samples/bluetooth/central_hr/prj_minimal.conf |  1 -
 samples/bluetooth/central_multilink/prj.conf  |  1 -
 samples/bluetooth/hci_uart_async/prj.conf     |  1 -
 .../bluetooth/mesh/boards/bbc_microbit.conf   |  2 +-
 .../bluetooth/peripheral_hr/prj_minimal.conf  |  1 -
 .../bluetooth/peripheral_identity/prj.conf    |  1 -
 subsys/bluetooth/common/Kconfig               | 17 +++++++++--
 subsys/bluetooth/common/dummy.c               | 24 ---------------
 subsys/bluetooth/host/buf.c                   |  2 +-
 subsys/bluetooth/host/classic/rfcomm.c        |  2 +-
 subsys/bluetooth/host/hci_core.c              |  2 +-
 subsys/bluetooth/host/l2cap.c                 |  2 +-
 tests/bluetooth/tester/boards/frdm_rw612.conf |  1 -
 .../bluetooth/tester/boards/rd_rw612_bga.conf |  1 -
 .../host/l2cap/einprogress/src/dut.c          |  4 +--
 .../host/l2cap/reassembly/dut/prj.conf        |  2 +-
 .../bsim/bluetooth/host/l2cap/stress/prj.conf |  1 -
 .../host/l2cap/stress/prj_nofrag.conf         |  1 -
 .../host/l2cap/stress/prj_syswq.conf          |  1 -
 .../host/misc/conn_stress/central/prj.conf    |  1 -
 .../host/misc/hfc_multilink/dut/prj.conf      |  4 ---
 .../host/misc/hfc_multilink/dut/src/dut.c     |  2 +-
 tests/bsim/bluetooth/ll/multiple_id/prj.conf  |  1 -
 26 files changed, 68 insertions(+), 53 deletions(-)

diff --git a/doc/releases/migration-guide-4.1.rst b/doc/releases/migration-guide-4.1.rst
index d35ab96073c..c033dd9c81c 100644
--- a/doc/releases/migration-guide-4.1.rst
+++ b/doc/releases/migration-guide-4.1.rst
@@ -87,6 +87,19 @@ Bluetooth Classic
 Bluetooth Host
 ==============
 
+* :kconfig:option:`CONFIG_BT_BUF_ACL_RX_COUNT` has been deprecated. The number of ACL RX buffers is
+  now computed internally and is equal to :kconfig:option:`CONFIG_BT_MAX_CONN` + 1. If an application
+  needs more buffers, it can use the new :kconfig:option:`CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA` to add
+  additional ones.
+
+  e.g. if :kconfig:option:`CONFIG_BT_MAX_CONN` was ``3`` and
+  :kconfig:option:`CONFIG_BT_BUF_ACL_RX_COUNT` was ``7`` then
+  :kconfig:option:`CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA` should be set to ``7 - (3 + 1) = 3``.
+
+  .. warning::
+
+   The default value of :kconfig:option:`CONFIG_BT_BUF_ACL_RX_COUNT` has been set to 0.
+
 Bluetooth Crypto
 ================
 
diff --git a/doc/releases/release-notes-4.1.rst b/doc/releases/release-notes-4.1.rst
index 202fdb20489..fb44daad14a 100644
--- a/doc/releases/release-notes-4.1.rst
+++ b/doc/releases/release-notes-4.1.rst
@@ -53,6 +53,9 @@ Bluetooth
 
 * Host
 
+  * :kconfig:option:`CONFIG_BT_BUF_ACL_RX_COUNT` has been deprecated and
+    :kconfig:option:`CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA` has been added.
+
 * HCI Drivers
 
 Boards & SoC Support
diff --git a/include/zephyr/bluetooth/buf.h b/include/zephyr/bluetooth/buf.h
index fe480196f58..c5ad4ddf9a8 100644
--- a/include/zephyr/bluetooth/buf.h
+++ b/include/zephyr/bluetooth/buf.h
@@ -85,13 +85,41 @@ struct bt_buf_data {
 #define BT_BUF_ISO_RX_COUNT 0
 #endif /* CONFIG_BT_ISO */
 
+/* see Core Spec v6.0 vol.4 part E 7.4.5 */
+#define BT_BUF_ACL_RX_COUNT_MAX 65535
+
+#if defined(CONFIG_BT_CONN) && defined(CONFIG_BT_HCI_HOST)
+ /* The host needs more ACL buffers than maximum ACL links. This is because of
+  * the way we re-assemble ACL packets into L2CAP PDUs.
+  *
+  * We keep around the first buffer (that comes from the driver) to do
+  * re-assembly into, and if all links are re-assembling, there will be no buffer
+  * available for the HCI driver to allocate from.
+  *
+  * TODO: When CONFIG_BT_BUF_ACL_RX_COUNT is removed,
+  *       remove the MAX and only keep (CONFIG_BT_MAX_CONN + 1)
+  */
+#define BT_BUF_ACL_RX_COUNT                                                                        \
+	(MAX(CONFIG_BT_BUF_ACL_RX_COUNT, (CONFIG_BT_MAX_CONN + 1)) +                               \
+	 CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA)
+#else
+#define BT_BUF_ACL_RX_COUNT 0
+#endif /* CONFIG_BT_CONN && CONFIG_BT_HCI_HOST */
+
+#if defined(CONFIG_BT_BUF_ACL_RX_COUNT) && CONFIG_BT_BUF_ACL_RX_COUNT > 0
+#warning "CONFIG_BT_BUF_ACL_RX_COUNT is deprecated, see Zephyr 4.1 migration guide"
+#endif /* CONFIG_BT_BUF_ACL_RX_COUNT && CONFIG_BT_BUF_ACL_RX_COUNT > 0 */
+
+BUILD_ASSERT(BT_BUF_ACL_RX_COUNT <= BT_BUF_ACL_RX_COUNT_MAX,
+	     "Maximum number of ACL RX buffer is 65535, reduce CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA");
+
 /** Data size needed for HCI ACL, HCI ISO or Event RX buffers */
 #define BT_BUF_RX_SIZE (MAX(MAX(BT_BUF_ACL_RX_SIZE, BT_BUF_EVT_RX_SIZE), \
 			    BT_BUF_ISO_RX_SIZE))
 
 /** Buffer count needed for HCI ACL, HCI ISO or Event RX buffers */
 #define BT_BUF_RX_COUNT (MAX(MAX(CONFIG_BT_BUF_EVT_RX_COUNT, \
-				 CONFIG_BT_BUF_ACL_RX_COUNT), \
+				 BT_BUF_ACL_RX_COUNT), \
 			     BT_BUF_ISO_RX_COUNT))
 
 /** Data size needed for HCI Command buffers. */
diff --git a/samples/bluetooth/central_hr/prj_minimal.conf b/samples/bluetooth/central_hr/prj_minimal.conf
index 1dcf300b1ef..28dcf759bec 100644
--- a/samples/bluetooth/central_hr/prj_minimal.conf
+++ b/samples/bluetooth/central_hr/prj_minimal.conf
@@ -94,7 +94,6 @@ CONFIG_BT_CTLR_PHY_2M=n
 # Reduce Bluetooth buffers
 CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT=1
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=45
-CONFIG_BT_BUF_ACL_RX_COUNT=2
 CONFIG_BT_BUF_EVT_RX_COUNT=2
 
 CONFIG_BT_L2CAP_TX_BUF_COUNT=2
diff --git a/samples/bluetooth/central_multilink/prj.conf b/samples/bluetooth/central_multilink/prj.conf
index a450460243e..f0ca905b431 100644
--- a/samples/bluetooth/central_multilink/prj.conf
+++ b/samples/bluetooth/central_multilink/prj.conf
@@ -4,7 +4,6 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PRIVACY=y
 
 CONFIG_BT_MAX_CONN=62
-CONFIG_BT_BUF_ACL_RX_COUNT=63
 
 # CONFIG_BT_GATT_CLIENT=y
 
diff --git a/samples/bluetooth/hci_uart_async/prj.conf b/samples/bluetooth/hci_uart_async/prj.conf
index e4d17d492be..1de1a46535e 100644
--- a/samples/bluetooth/hci_uart_async/prj.conf
+++ b/samples/bluetooth/hci_uart_async/prj.conf
@@ -10,7 +10,6 @@ CONFIG_BT_HCI_RAW_H4_ENABLE=y
 
 # Controller configuration. Modify these for your application's needs.
 CONFIG_BT_MAX_CONN=16
-CONFIG_BT_BUF_ACL_RX_COUNT=17
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=255
diff --git a/samples/bluetooth/mesh/boards/bbc_microbit.conf b/samples/bluetooth/mesh/boards/bbc_microbit.conf
index 1655768864b..053053e7818 100644
--- a/samples/bluetooth/mesh/boards/bbc_microbit.conf
+++ b/samples/bluetooth/mesh/boards/bbc_microbit.conf
@@ -13,7 +13,7 @@ CONFIG_BT_PERIPHERAL=n
 CONFIG_BT_EXT_ADV=n
 CONFIG_BT_RX_STACK_SIZE=1100
 CONFIG_BT_BUF_EVT_RX_COUNT=3
-CONFIG_BT_BUF_ACL_RX_COUNT=3
+CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=1
 CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT=3
 
 CONFIG_BT_CTLR_ADV_EXT=n
diff --git a/samples/bluetooth/peripheral_hr/prj_minimal.conf b/samples/bluetooth/peripheral_hr/prj_minimal.conf
index 6446273584a..9986c85e8c3 100644
--- a/samples/bluetooth/peripheral_hr/prj_minimal.conf
+++ b/samples/bluetooth/peripheral_hr/prj_minimal.conf
@@ -100,7 +100,6 @@ CONFIG_BT_CTLR_PHY_2M=n
 # Reduce Bluetooth buffers
 CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT=1
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=45
-CONFIG_BT_BUF_ACL_RX_COUNT=2
 CONFIG_BT_BUF_EVT_RX_COUNT=2
 
 CONFIG_BT_L2CAP_TX_BUF_COUNT=2
diff --git a/samples/bluetooth/peripheral_identity/prj.conf b/samples/bluetooth/peripheral_identity/prj.conf
index 783c25f91e6..8bd97851e36 100644
--- a/samples/bluetooth/peripheral_identity/prj.conf
+++ b/samples/bluetooth/peripheral_identity/prj.conf
@@ -8,7 +8,6 @@ CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
 
 CONFIG_BT_MAX_CONN=62
 CONFIG_BT_ID_MAX=62
-CONFIG_BT_BUF_ACL_RX_COUNT=63
 
 # CONFIG_BT_SMP=y
 # CONFIG_BT_MAX_PAIRED=62
diff --git a/subsys/bluetooth/common/Kconfig b/subsys/bluetooth/common/Kconfig
index 8bec5ba90d5..9147612a70c 100644
--- a/subsys/bluetooth/common/Kconfig
+++ b/subsys/bluetooth/common/Kconfig
@@ -77,10 +77,21 @@ config BT_BUF_ACL_RX_SIZE
 	  In a Controller only build this will determine the maximum ACL size
 	  that the Controller will send to the Host.
 
+config BT_BUF_ACL_RX_COUNT_EXTRA
+	int "Number of extra incoming ACL data buffers"
+	default 0
+	range 0 65535
+	help
+	  Number of incoming extra ACL data buffers sent from the Controller to
+	  the Host.
+
+	  By default, the number of incoming ACL data buffers is equal to
+	  CONFIG_BT_MAX_CONN + 1.
+
 config BT_BUF_ACL_RX_COUNT
-	int "Number of incoming ACL data buffers"
-	default 6
-	range 2 256
+	int "[DEPRECATED] Number of incoming ACL data buffers"
+	default 0
+	range 0 256
 	help
 	  Number or incoming ACL data buffers sent from the Controller to the
 	  Host.
diff --git a/subsys/bluetooth/common/dummy.c b/subsys/bluetooth/common/dummy.c
index 4500f7edb71..53fe9764648 100644
--- a/subsys/bluetooth/common/dummy.c
+++ b/subsys/bluetooth/common/dummy.c
@@ -60,27 +60,3 @@ BUILD_ASSERT(!IS_ENABLED(CONFIG_LOG_MODE_IMMEDIATE), "Immediate logging "
 	     "on selected backend(s) not "
 	     "supported with the software Link Layer");
 #endif
-
-#if defined(CONFIG_BT_CONN) && defined(CONFIG_BT_HCI_HOST)
-/* The host needs more ACL buffers than maximum ACL links. This is because of
- * the way we re-assemble ACL packets into L2CAP PDUs.
- *
- * We keep around the first buffer (that comes from the driver) to do
- * re-assembly into, and if all links are re-assembling, there will be no buffer
- * available for the HCI driver to allocate from.
- *
- * Fixing it properly involves a re-design of the HCI driver interface.
- */
-#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
-BUILD_ASSERT(CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN);
-
-#else /* !CONFIG_BT_HCI_ACL_FLOW_CONTROL */
-
-/* BT_BUF_RX_COUNT is defined in include/zephyr/bluetooth/buf.h */
-BUILD_ASSERT(BT_BUF_RX_COUNT > CONFIG_BT_MAX_CONN,
-	     "BT_BUF_RX_COUNT needs to be greater than CONFIG_BT_MAX_CONN. "
-	     "In order to do that, increase CONFIG_BT_BUF_ACL_RX_COUNT.");
-
-#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
-
-#endif /* CONFIG_BT_CONN */
diff --git a/subsys/bluetooth/host/buf.c b/subsys/bluetooth/host/buf.c
index 2ce2477ff05..b7ed19303be 100644
--- a/subsys/bluetooth/host/buf.c
+++ b/subsys/bluetooth/host/buf.c
@@ -40,7 +40,7 @@ NET_BUF_POOL_FIXED_DEFINE(discardable_pool, CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT,
 			  sizeof(struct bt_buf_data), NULL);
 
 #if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
-NET_BUF_POOL_DEFINE(acl_in_pool, CONFIG_BT_BUF_ACL_RX_COUNT,
+NET_BUF_POOL_DEFINE(acl_in_pool, BT_BUF_ACL_RX_COUNT,
 		    BT_BUF_ACL_SIZE(CONFIG_BT_BUF_ACL_RX_SIZE),
 		    sizeof(struct acl_data), bt_hci_host_num_completed_packets);
 
diff --git a/subsys/bluetooth/host/classic/rfcomm.c b/subsys/bluetooth/host/classic/rfcomm.c
index f8742bff367..4d5bbeeb897 100644
--- a/subsys/bluetooth/host/classic/rfcomm.c
+++ b/subsys/bluetooth/host/classic/rfcomm.c
@@ -37,7 +37,7 @@ LOG_MODULE_REGISTER(bt_rfcomm);
 #define RFCOMM_MIN_MTU		BT_RFCOMM_SIG_MIN_MTU
 #define RFCOMM_DEFAULT_MTU	127
 
-#define RFCOMM_MAX_CREDITS		(CONFIG_BT_BUF_ACL_RX_COUNT - 1)
+#define RFCOMM_MAX_CREDITS		(BT_BUF_ACL_RX_COUNT - 1)
 #define RFCOMM_CREDITS_THRESHOLD	(RFCOMM_MAX_CREDITS / 2)
 #define RFCOMM_DEFAULT_CREDIT		RFCOMM_MAX_CREDITS
 
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index 7bb93f5295e..4a175eb2c74 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -1986,7 +1986,7 @@ static int set_flow_control(void)
 	hbs = net_buf_add(buf, sizeof(*hbs));
 	(void)memset(hbs, 0, sizeof(*hbs));
 	hbs->acl_mtu = sys_cpu_to_le16(CONFIG_BT_BUF_ACL_RX_SIZE);
-	hbs->acl_pkts = sys_cpu_to_le16(CONFIG_BT_BUF_ACL_RX_COUNT);
+	hbs->acl_pkts = sys_cpu_to_le16(BT_BUF_ACL_RX_COUNT);
 
 	err = bt_hci_cmd_send_sync(BT_HCI_OP_HOST_BUFFER_SIZE, buf, NULL);
 	if (err) {
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index 9a871781326..a8e4843ca3a 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -44,7 +44,7 @@ LOG_MODULE_REGISTER(bt_l2cap, CONFIG_BT_L2CAP_LOG_LEVEL);
 #define L2CAP_ECRED_MIN_MTU		64
 #define L2CAP_ECRED_MIN_MPS             64
 
-#define L2CAP_LE_MAX_CREDITS		(CONFIG_BT_BUF_ACL_RX_COUNT - 1)
+#define L2CAP_LE_MAX_CREDITS		(BT_BUF_ACL_RX_COUNT - 1)
 
 #define L2CAP_LE_CID_DYN_START	0x0040
 #define L2CAP_LE_CID_DYN_END	0x007f
diff --git a/tests/bluetooth/tester/boards/frdm_rw612.conf b/tests/bluetooth/tester/boards/frdm_rw612.conf
index 48958c6ac7c..ba1ae16dc7c 100644
--- a/tests/bluetooth/tester/boards/frdm_rw612.conf
+++ b/tests/bluetooth/tester/boards/frdm_rw612.conf
@@ -1,5 +1,4 @@
 CONFIG_BT_MAX_CONN=16
-CONFIG_BT_BUF_ACL_RX_COUNT=17
 
 # debug options
 # CONFIG_UART_CONSOLE=y
diff --git a/tests/bluetooth/tester/boards/rd_rw612_bga.conf b/tests/bluetooth/tester/boards/rd_rw612_bga.conf
index 48958c6ac7c..ba1ae16dc7c 100644
--- a/tests/bluetooth/tester/boards/rd_rw612_bga.conf
+++ b/tests/bluetooth/tester/boards/rd_rw612_bga.conf
@@ -1,5 +1,4 @@
 CONFIG_BT_MAX_CONN=16
-CONFIG_BT_BUF_ACL_RX_COUNT=17
 
 # debug options
 # CONFIG_UART_CONSOLE=y
diff --git a/tests/bsim/bluetooth/host/l2cap/einprogress/src/dut.c b/tests/bsim/bluetooth/host/l2cap/einprogress/src/dut.c
index 2c026befd20..b3da048b8ca 100644
--- a/tests/bsim/bluetooth/host/l2cap/einprogress/src/dut.c
+++ b/tests/bsim/bluetooth/host/l2cap/einprogress/src/dut.c
@@ -29,7 +29,7 @@ LOG_MODULE_REGISTER(dut, LOG_LEVEL_INF);
  *  application. This allows us to notice if the stack has freed
  *  references that were ours.
  */
-static atomic_t acl_pool_refs_held[CONFIG_BT_BUF_ACL_RX_COUNT];
+static atomic_t acl_pool_refs_held[BT_BUF_ACL_RX_COUNT];
 
 BUILD_ASSERT(IS_ENABLED(CONFIG_BT_TESTING));
 BUILD_ASSERT(IS_ENABLED(CONFIG_BT_HCI_ACL_FLOW_CONTROL));
@@ -46,7 +46,7 @@ static void acl_pool_refs_held_add(struct net_buf *buf)
 {
 	int buf_id = net_buf_id(buf);
 
-	__ASSERT_NO_MSG(0 <= buf_id && buf_id < CONFIG_BT_BUF_ACL_RX_COUNT);
+	__ASSERT_NO_MSG(0 <= buf_id && buf_id < BT_BUF_ACL_RX_COUNT);
 	atomic_inc(&acl_pool_refs_held[buf_id]);
 }
 
diff --git a/tests/bsim/bluetooth/host/l2cap/reassembly/dut/prj.conf b/tests/bsim/bluetooth/host/l2cap/reassembly/dut/prj.conf
index 4f6ee8187bf..d913264f700 100644
--- a/tests/bsim/bluetooth/host/l2cap/reassembly/dut/prj.conf
+++ b/tests/bsim/bluetooth/host/l2cap/reassembly/dut/prj.conf
@@ -28,5 +28,5 @@ CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
 # RX buffer pool, it is a good idea to constrain said buffer
 # pool.
 CONFIG_BT_MAX_CONN=1
-CONFIG_BT_BUF_ACL_RX_COUNT=6
+CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4
 CONFIG_BT_BUF_EVT_RX_COUNT=6
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/prj.conf b/tests/bsim/bluetooth/host/l2cap/stress/prj.conf
index 6f782ba157d..fecd8ba08d1 100644
--- a/tests/bsim/bluetooth/host/l2cap/stress/prj.conf
+++ b/tests/bsim/bluetooth/host/l2cap/stress/prj.conf
@@ -42,7 +42,6 @@ CONFIG_BT_CTLR_DATA_LENGTH_MAX=27
 CONFIG_BT_CTLR_RX_BUFFERS=10
 
 CONFIG_BT_MAX_CONN=10
-CONFIG_BT_BUF_ACL_RX_COUNT=11
 
 CONFIG_LOG=y
 CONFIG_ASSERT=y
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/prj_nofrag.conf b/tests/bsim/bluetooth/host/l2cap/stress/prj_nofrag.conf
index a4e71a58b64..ea9cda13529 100644
--- a/tests/bsim/bluetooth/host/l2cap/stress/prj_nofrag.conf
+++ b/tests/bsim/bluetooth/host/l2cap/stress/prj_nofrag.conf
@@ -34,7 +34,6 @@ CONFIG_BT_CTLR_DATA_LENGTH_MAX=81
 CONFIG_BT_CTLR_RX_BUFFERS=10
 
 CONFIG_BT_MAX_CONN=10
-CONFIG_BT_BUF_ACL_RX_COUNT=11
 
 CONFIG_LOG=y
 CONFIG_ASSERT=y
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/prj_syswq.conf b/tests/bsim/bluetooth/host/l2cap/stress/prj_syswq.conf
index 9c21c148cbf..3cddbe332cd 100644
--- a/tests/bsim/bluetooth/host/l2cap/stress/prj_syswq.conf
+++ b/tests/bsim/bluetooth/host/l2cap/stress/prj_syswq.conf
@@ -42,7 +42,6 @@ CONFIG_BT_CTLR_DATA_LENGTH_MAX=27
 CONFIG_BT_CTLR_RX_BUFFERS=10
 
 CONFIG_BT_MAX_CONN=10
-CONFIG_BT_BUF_ACL_RX_COUNT=11
 
 CONFIG_LOG=y
 CONFIG_ASSERT=y
diff --git a/tests/bsim/bluetooth/host/misc/conn_stress/central/prj.conf b/tests/bsim/bluetooth/host/misc/conn_stress/central/prj.conf
index 0238e1e38eb..ff7d61dfb05 100644
--- a/tests/bsim/bluetooth/host/misc/conn_stress/central/prj.conf
+++ b/tests/bsim/bluetooth/host/misc/conn_stress/central/prj.conf
@@ -2,7 +2,6 @@ CONFIG_BT=y
 CONFIG_LOG=y
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_MAX_CONN=12
-CONFIG_BT_BUF_ACL_RX_COUNT=13
 CONFIG_BT_MAX_PAIRED=12
 CONFIG_BT_SMP=y
 CONFIG_BT_PRIVACY=y
diff --git a/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/prj.conf b/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/prj.conf
index 114b8574b4e..daa5dd196ee 100644
--- a/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/prj.conf
+++ b/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/prj.conf
@@ -27,9 +27,5 @@ CONFIG_BT_AUTO_DATA_LEN_UPDATE=n
 CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
 
 CONFIG_BT_MAX_CONN=3
-CONFIG_BT_BUF_ACL_RX_COUNT=4
-
-# This test will fail when CONFIG_BT_MAX_CONN == CONFIG_BT_BUF_ACL_RX_COUNT
-# CONFIG_BT_BUF_ACL_RX_COUNT=3
 
 CONFIG_BT_HCI_ACL_FLOW_CONTROL=y
diff --git a/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/src/dut.c b/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/src/dut.c
index a8524a90b5e..410417563d1 100644
--- a/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/src/dut.c
+++ b/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/src/dut.c
@@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(dut, CONFIG_APP_LOG_LEVEL);
 #define NUM_TESTERS CONFIG_BT_MAX_CONN
 
 /* Build with the minimum possible amount of RX buffers */
-BUILD_ASSERT(CONFIG_BT_BUF_ACL_RX_COUNT == (CONFIG_BT_MAX_CONN + 1));
+BUILD_ASSERT(BT_BUF_ACL_RX_COUNT >= (CONFIG_BT_MAX_CONN + 1));
 
 struct tester {
 	size_t sdu_count;
diff --git a/tests/bsim/bluetooth/ll/multiple_id/prj.conf b/tests/bsim/bluetooth/ll/multiple_id/prj.conf
index 8cd08356b3a..173fc296c7c 100644
--- a/tests/bsim/bluetooth/ll/multiple_id/prj.conf
+++ b/tests/bsim/bluetooth/ll/multiple_id/prj.conf
@@ -12,7 +12,6 @@ CONFIG_BT_AUTO_DATA_LEN_UPDATE=y
 
 CONFIG_BT_MAX_CONN=250
 CONFIG_BT_ID_MAX=250
-CONFIG_BT_BUF_ACL_RX_COUNT=251
 
 # L2CAP, ATT and SMP usage cause data transmission deadlock due to shortage
 # of buffers when transactions crossover amongst the connections in the same

From e9cc271b438f2fbef9479dcfb3af965a556eb3ce Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Fri, 22 Nov 2024 08:57:33 +0100
Subject: [PATCH 1001/2913] [nrf fromtree] bluetooth: buf: Convert bt_buf_type
 enum to bitmask

This allows to combine several types in a single value.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit bd9a1cea84ca2dfc6198df6993196f17b2d139e8)
---
 include/zephyr/bluetooth/buf.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/zephyr/bluetooth/buf.h b/include/zephyr/bluetooth/buf.h
index c5ad4ddf9a8..8109950d70e 100644
--- a/include/zephyr/bluetooth/buf.h
+++ b/include/zephyr/bluetooth/buf.h
@@ -28,22 +28,22 @@
 extern "C" {
 #endif
 
-/** Possible types of buffers passed around the Bluetooth stack */
+/** Possible types of buffers passed around the Bluetooth stack in a form of bitmask. */
 enum bt_buf_type {
 	/** HCI command */
-	BT_BUF_CMD,
+	BT_BUF_CMD = BIT(0),
 	/** HCI event */
-	BT_BUF_EVT,
+	BT_BUF_EVT = BIT(1),
 	/** Outgoing ACL data */
-	BT_BUF_ACL_OUT,
+	BT_BUF_ACL_OUT = BIT(2),
 	/** Incoming ACL data */
-	BT_BUF_ACL_IN,
+	BT_BUF_ACL_IN = BIT(3),
 	/** Outgoing ISO data */
-	BT_BUF_ISO_OUT,
+	BT_BUF_ISO_OUT = BIT(4),
 	/** Incoming ISO data */
-	BT_BUF_ISO_IN,
+	BT_BUF_ISO_IN = BIT(5),
 	/** H:4 data */
-	BT_BUF_H4,
+	BT_BUF_H4 = BIT(6),
 };
 
 /** @brief This is a base type for bt_buf user data. */

From e2c77de94dc31afde4fdf80b614001b26d8988da Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Thu, 7 Nov 2024 09:50:37 +0100
Subject: [PATCH 1002/2913] [nrf fromtree] bluetooth: buf: Add a callback for
 freed buffer in rx pool

The Bluetooth data buffer API currently lacks a mechanism to notify when
a buffer is freed in the RX pool. This limitation forces HCI drivers to
adopt inefficient workarounds to manage buffer allocation.

HCI drivers face two suboptimal options:

- Blocking calls: Use bt_buf_get_rx with K_FOREVER, which blocks the
  execution context until a buffer becomes available.
- Polling: Repeatedly call bt_buf_get_rx with K_NO_WAIT, which increases
  CPU load and reduces efficiency.

This commit introduces a callback mechanism that is triggered each time
a buffer is freed in the RX pool. With this feature, HCI drivers can:

- Call bt_buf_get_rx with K_NO_WAIT.
- Wait for the callback notification if a NULL buffer is returned,
  avoiding unnecessary polling.

The new callback improves efficiency by enabling event-driven behavior
for buffer management, reducing CPU overhead while maintaining
responsiveness.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit c2488fdd3021bacb5c8f2cc4a6fe43cb2d0515d2)
---
 include/zephyr/bluetooth/buf.h       | 21 ++++++++
 subsys/bluetooth/host/buf.c          | 71 ++++++++++++++++++++++++----
 subsys/bluetooth/host/hci_raw.c      | 21 +++++++-
 subsys/bluetooth/host/iso.c          | 19 +++++++-
 subsys/bluetooth/host/iso_internal.h | 10 ++++
 5 files changed, 130 insertions(+), 12 deletions(-)

diff --git a/include/zephyr/bluetooth/buf.h b/include/zephyr/bluetooth/buf.h
index 8109950d70e..dd452342ef7 100644
--- a/include/zephyr/bluetooth/buf.h
+++ b/include/zephyr/bluetooth/buf.h
@@ -138,6 +138,27 @@ BUILD_ASSERT(BT_BUF_ACL_RX_COUNT <= BT_BUF_ACL_RX_COUNT_MAX,
  */
 struct net_buf *bt_buf_get_rx(enum bt_buf_type type, k_timeout_t timeout);
 
+/** A callback to notify about freed buffer in the incoming data pool.
+ *
+ * This callback is called when a buffer of a given type is freed and can be requested through the
+ * @ref bt_buf_get_rx function. However, this callback is called from the context of the buffer
+ * freeing operation and must not attempt to allocate a new buffer from the same pool.
+ *
+ * @warning When this callback is called, the scheduler is locked and the callee must not perform
+ * any action that makes the current thread unready. This callback must only be used for very
+ * short non-blocking operation (e.g. submitting a work item).
+ *
+ * @param type_mask A bit mask of buffer types that have been freed.
+ */
+typedef void (*bt_buf_rx_freed_cb_t)(enum bt_buf_type type_mask);
+
+/** Set the callback to notify about freed buffer in the incoming data pool.
+ *
+ * @param cb Callback to notify about freed buffer in the incoming data pool. If NULL, the callback
+ *           is disabled.
+ */
+void bt_buf_rx_freed_cb_set(bt_buf_rx_freed_cb_t cb);
+
 /** Allocate a buffer for outgoing data
  *
  *  This will set the buffer type so bt_buf_set_type() does not need to
diff --git a/subsys/bluetooth/host/buf.c b/subsys/bluetooth/host/buf.c
index b7ed19303be..75bd15834ae 100644
--- a/subsys/bluetooth/host/buf.c
+++ b/subsys/bluetooth/host/buf.c
@@ -25,6 +25,26 @@ LOG_MODULE_REGISTER(bt_buf, CONFIG_BT_LOG_LEVEL);
  */
 #define SYNC_EVT_SIZE (BT_BUF_RESERVE + BT_HCI_EVT_HDR_SIZE + 255)
 
+static bt_buf_rx_freed_cb_t buf_rx_freed_cb;
+
+static void buf_rx_freed_notify(enum bt_buf_type mask)
+{
+	k_sched_lock();
+
+	if (buf_rx_freed_cb) {
+		buf_rx_freed_cb(mask);
+	}
+
+	k_sched_unlock();
+}
+
+#if defined(CONFIG_BT_ISO_RX)
+static void iso_rx_freed_cb(void)
+{
+	buf_rx_freed_notify(BT_BUF_ISO_IN);
+}
+#endif
+
 /* Pool for RX HCI buffers that are always freed by `bt_recv`
  * before it returns.
  *
@@ -40,17 +60,37 @@ NET_BUF_POOL_FIXED_DEFINE(discardable_pool, CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT,
 			  sizeof(struct bt_buf_data), NULL);
 
 #if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
-NET_BUF_POOL_DEFINE(acl_in_pool, BT_BUF_ACL_RX_COUNT,
-		    BT_BUF_ACL_SIZE(CONFIG_BT_BUF_ACL_RX_SIZE),
-		    sizeof(struct acl_data), bt_hci_host_num_completed_packets);
+static void acl_in_pool_destroy(struct net_buf *buf)
+{
+	bt_hci_host_num_completed_packets(buf);
+	buf_rx_freed_notify(BT_BUF_ACL_IN);
+}
 
-NET_BUF_POOL_FIXED_DEFINE(evt_pool, CONFIG_BT_BUF_EVT_RX_COUNT,
-			  BT_BUF_EVT_RX_SIZE, sizeof(struct bt_buf_data),
-			  NULL);
+static void evt_pool_destroy(struct net_buf *buf)
+{
+	net_buf_destroy(buf);
+	buf_rx_freed_notify(BT_BUF_EVT);
+}
+
+NET_BUF_POOL_DEFINE(acl_in_pool, BT_BUF_ACL_RX_COUNT, BT_BUF_ACL_SIZE(CONFIG_BT_BUF_ACL_RX_SIZE),
+		    sizeof(struct acl_data), acl_in_pool_destroy);
+
+NET_BUF_POOL_FIXED_DEFINE(evt_pool, CONFIG_BT_BUF_EVT_RX_COUNT, BT_BUF_EVT_RX_SIZE,
+			  sizeof(struct bt_buf_data), evt_pool_destroy);
 #else
-NET_BUF_POOL_FIXED_DEFINE(hci_rx_pool, BT_BUF_RX_COUNT,
-			  BT_BUF_RX_SIZE, sizeof(struct acl_data),
-			  NULL);
+static void hci_rx_pool_destroy(struct net_buf *buf)
+{
+	net_buf_destroy(buf);
+
+	/* When ACL Flow Control is disabled, a single pool is used for events and acl data.
+	 * Therefore the callback will always notify about both types of buffers, BT_BUF_EVT and
+	 * BT_BUF_ACL_IN.
+	 */
+	buf_rx_freed_notify(BT_BUF_EVT | BT_BUF_ACL_IN);
+}
+
+NET_BUF_POOL_FIXED_DEFINE(hci_rx_pool, BT_BUF_RX_COUNT, BT_BUF_RX_SIZE, sizeof(struct acl_data),
+			  hci_rx_pool_destroy);
 #endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
 
 struct net_buf *bt_buf_get_rx(enum bt_buf_type type, k_timeout_t timeout)
@@ -82,6 +122,19 @@ struct net_buf *bt_buf_get_rx(enum bt_buf_type type, k_timeout_t timeout)
 	return buf;
 }
 
+void bt_buf_rx_freed_cb_set(bt_buf_rx_freed_cb_t cb)
+{
+	k_sched_lock();
+
+	buf_rx_freed_cb = cb;
+
+#if defined(CONFIG_BT_ISO_RX)
+	bt_iso_buf_rx_freed_cb_set(cb != NULL ? iso_rx_freed_cb : NULL);
+#endif
+
+	k_sched_unlock();
+}
+
 struct net_buf *bt_buf_get_evt(uint8_t evt, bool discardable,
 			       k_timeout_t timeout)
 {
diff --git a/subsys/bluetooth/host/hci_raw.c b/subsys/bluetooth/host/hci_raw.c
index 984c8607ee6..cf50f406d8f 100644
--- a/subsys/bluetooth/host/hci_raw.c
+++ b/subsys/bluetooth/host/hci_raw.c
@@ -39,8 +39,20 @@ static uint8_t raw_mode = BT_HCI_RAW_MODE_H4;
 static uint8_t raw_mode;
 #endif
 
-NET_BUF_POOL_FIXED_DEFINE(hci_rx_pool, BT_BUF_RX_COUNT,
-			  BT_BUF_RX_SIZE, sizeof(struct bt_buf_data), NULL);
+static bt_buf_rx_freed_cb_t buf_rx_freed_cb;
+
+static void hci_rx_buf_destroy(struct net_buf *buf)
+{
+	net_buf_destroy(buf);
+
+	if (buf_rx_freed_cb) {
+		/* bt_buf_get_rx is used for all types of RX buffers */
+		buf_rx_freed_cb(BT_BUF_EVT | BT_BUF_ACL_IN | BT_BUF_ISO_IN);
+	}
+}
+
+NET_BUF_POOL_FIXED_DEFINE(hci_rx_pool, BT_BUF_RX_COUNT, BT_BUF_RX_SIZE, sizeof(struct bt_buf_data),
+			  hci_rx_buf_destroy);
 NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, CONFIG_BT_BUF_CMD_TX_COUNT,
 			  BT_BUF_CMD_SIZE(CONFIG_BT_BUF_CMD_TX_SIZE),
 			  sizeof(struct bt_buf_data), NULL);
@@ -112,6 +124,11 @@ struct net_buf *bt_buf_get_rx(enum bt_buf_type type, k_timeout_t timeout)
 	return buf;
 }
 
+void bt_buf_rx_freed_cb_set(bt_buf_rx_freed_cb_t cb)
+{
+	buf_rx_freed_cb = cb;
+}
+
 struct net_buf *bt_buf_get_tx(enum bt_buf_type type, k_timeout_t timeout,
 			      const void *data, size_t size)
 {
diff --git a/subsys/bluetooth/host/iso.c b/subsys/bluetooth/host/iso.c
index 3cbb06011d3..26440c22a8a 100644
--- a/subsys/bluetooth/host/iso.c
+++ b/subsys/bluetooth/host/iso.c
@@ -51,8 +51,20 @@ LOG_MODULE_REGISTER(bt_iso, CONFIG_BT_ISO_LOG_LEVEL);
 #define iso_chan(_iso) ((_iso)->iso.chan);
 
 #if defined(CONFIG_BT_ISO_RX)
+static bt_iso_buf_rx_freed_cb_t buf_rx_freed_cb;
+
+static void iso_rx_buf_destroy(struct net_buf *buf)
+{
+	net_buf_destroy(buf);
+
+	if (buf_rx_freed_cb) {
+		buf_rx_freed_cb();
+	}
+}
+
 NET_BUF_POOL_FIXED_DEFINE(iso_rx_pool, CONFIG_BT_ISO_RX_BUF_COUNT,
-			  BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_RX_MTU), sizeof(struct iso_data), NULL);
+			  BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_RX_MTU), sizeof(struct iso_data),
+			  iso_rx_buf_destroy);
 
 static struct bt_iso_recv_info iso_info_data[CONFIG_BT_ISO_RX_BUF_COUNT];
 #define iso_info(buf) (&iso_info_data[net_buf_id(buf)])
@@ -581,6 +593,11 @@ struct net_buf *bt_iso_get_rx(k_timeout_t timeout)
 	return buf;
 }
 
+void bt_iso_buf_rx_freed_cb_set(bt_iso_buf_rx_freed_cb_t cb)
+{
+	buf_rx_freed_cb = cb;
+}
+
 void bt_iso_recv(struct bt_conn *iso, struct net_buf *buf, uint8_t flags)
 {
 	struct bt_hci_iso_sdu_hdr *hdr;
diff --git a/subsys/bluetooth/host/iso_internal.h b/subsys/bluetooth/host/iso_internal.h
index c997f81f517..765c336c9db 100644
--- a/subsys/bluetooth/host/iso_internal.h
+++ b/subsys/bluetooth/host/iso_internal.h
@@ -87,6 +87,16 @@ void hci_iso(struct net_buf *buf);
 /* Allocates RX buffer */
 struct net_buf *bt_iso_get_rx(k_timeout_t timeout);
 
+/** A callback used to notify about freed buffer in the iso rx pool. */
+typedef void (*bt_iso_buf_rx_freed_cb_t)(void);
+
+/** Set a callback to notify about freed buffer in the iso rx pool.
+ *
+ * @param cb Callback to notify about freed buffer in the iso rx pool. If NULL, the callback is
+ *           disabled.
+ */
+void bt_iso_buf_rx_freed_cb_set(bt_iso_buf_rx_freed_cb_t cb);
+
 /* Process CIS Established event */
 void hci_le_cis_established(struct net_buf *buf);
 

From 7f8d857bf1f57b07e832d52263beaa23c91fef24 Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Tue, 19 Nov 2024 10:11:26 +0100
Subject: [PATCH 1003/2913] [nrf fromtree] tests: bluetooth: buf: Test the
 freed buf callback

This commit adds a unit test that checks the freed buffer callback of
the bluetooth data buffer API.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit 0d0669167b1ac13e54acbbde5bec627773e427a6)
---
 tests/bluetooth/buf/CMakeLists.txt |  8 ++++
 tests/bluetooth/buf/prj.conf       | 10 +++++
 tests/bluetooth/buf/src/main.c     | 72 ++++++++++++++++++++++++++++++
 tests/bluetooth/buf/testcase.yaml  | 30 +++++++++++++
 4 files changed, 120 insertions(+)
 create mode 100644 tests/bluetooth/buf/CMakeLists.txt
 create mode 100644 tests/bluetooth/buf/prj.conf
 create mode 100644 tests/bluetooth/buf/src/main.c
 create mode 100644 tests/bluetooth/buf/testcase.yaml

diff --git a/tests/bluetooth/buf/CMakeLists.txt b/tests/bluetooth/buf/CMakeLists.txt
new file mode 100644
index 00000000000..3da24b0b551
--- /dev/null
+++ b/tests/bluetooth/buf/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(buf)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/tests/bluetooth/buf/prj.conf b/tests/bluetooth/buf/prj.conf
new file mode 100644
index 00000000000..697529ffb9d
--- /dev/null
+++ b/tests/bluetooth/buf/prj.conf
@@ -0,0 +1,10 @@
+CONFIG_TEST=y
+CONFIG_ZTEST=y
+
+CONFIG_BT=y
+CONFIG_BT_CTLR=n
+CONFIG_BT_H4=n
+
+# Needed to enable and test the iso rx pool
+CONFIG_BT_OBSERVER=y
+CONFIG_BT_ISO_SYNC_RECEIVER=y
diff --git a/tests/bluetooth/buf/src/main.c b/tests/bluetooth/buf/src/main.c
new file mode 100644
index 00000000000..36b57a0e3f9
--- /dev/null
+++ b/tests/bluetooth/buf/src/main.c
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#include <errno.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest.h>
+
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/drivers/bluetooth.h>
+#include <zephyr/sys/byteorder.h>
+
+static enum bt_buf_type freed_buf_type;
+static K_SEM_DEFINE(rx_sem, 0, 1);
+
+void bt_buf_rx_freed_cb(enum bt_buf_type type)
+{
+	freed_buf_type = type;
+	k_sem_give(&rx_sem);
+}
+
+ZTEST_SUITE(test_buf_data_api, NULL, NULL, NULL, NULL, NULL);
+
+ZTEST(test_buf_data_api, test_buf_freed_cb)
+{
+	struct net_buf *buf;
+	int err;
+
+	bt_buf_rx_freed_cb_set(bt_buf_rx_freed_cb);
+
+	/* Test that the callback is called for the BT_BUF_EVT type */
+	buf = bt_buf_get_rx(BT_BUF_EVT, K_NO_WAIT);
+	zassert_not_null(buf, "Failed to get event buffer");
+
+	net_buf_unref(buf);
+	/* The freed buf cb is called from net_buf_unref, therefore the semaphore should
+	 * already by given.
+	 */
+	err = k_sem_take(&rx_sem, K_NO_WAIT);
+	zassert_equal(err, 0, "Timeout while waiting for event buffer to be freed");
+	zassert_equal(BT_BUF_EVT, BT_BUF_EVT & freed_buf_type, "Event buffer wasn't freed");
+
+	/* Test that the callback is called for the BT_BUF_ACL_IN type */
+	buf = bt_buf_get_rx(BT_BUF_ACL_IN, K_NO_WAIT);
+	zassert_not_null(buf, "Failed to get ACL buffer");
+
+	net_buf_unref(buf);
+	/* The freed buf cb is called from net_buf_unref, therefore the semaphore should
+	 * already by given.
+	 */
+	err = k_sem_take(&rx_sem, K_NO_WAIT);
+	zassert_equal(err, 0, "Timeout while waiting for ACL buffer to be freed");
+	zassert_equal(BT_BUF_ACL_IN, BT_BUF_ACL_IN & freed_buf_type, "ACL buffer wasn't freed");
+
+	/* Test that the callback is called for the BT_BUF_ISO_IN type */
+	buf = bt_buf_get_rx(BT_BUF_ISO_IN, K_NO_WAIT);
+	zassert_not_null(buf, "Failed to get ISO buffer");
+
+	net_buf_unref(buf);
+	/* The freed buf cb is called from net_buf_unref, therefore the semaphore should
+	 * already by given.
+	 */
+	err = k_sem_take(&rx_sem, K_NO_WAIT);
+	zassert_equal(err, 0, "Timeout while waiting for ISO buffer to be freed");
+	zassert_equal(BT_BUF_ISO_IN, BT_BUF_ISO_IN & freed_buf_type, "ISO buffer wasn't freed");
+}
diff --git a/tests/bluetooth/buf/testcase.yaml b/tests/bluetooth/buf/testcase.yaml
new file mode 100644
index 00000000000..418d357d4fb
--- /dev/null
+++ b/tests/bluetooth/buf/testcase.yaml
@@ -0,0 +1,30 @@
+common:
+  tags:
+    - bluetooth
+    - host
+
+tests:
+  bluetooth.buf:
+    platform_allow:
+      - native_sim
+      - native_sim/native/64
+    integration_platforms:
+      - native_sim
+    extra_configs:
+      - CONFIG_BT_HCI_ACL_FLOW_CONTROL=y
+  bluetooth.buf.no_acl_flow_control:
+    platform_allow:
+      - native_sim
+      - native_sim/native/64
+    integration_platforms:
+      - native_sim
+    extra_configs:
+      - CONFIG_BT_HCI_ACL_FLOW_CONTROL=n
+  bluetooth.buf.hci_raw:
+    platform_allow:
+      - native_sim
+      - native_sim/native/64
+    integration_platforms:
+      - native_sim
+    extra_configs:
+      - CONFIG_BT_HCI_RAW=y

From ebcb537514335164911127aa2b3dffd330239307 Mon Sep 17 00:00:00 2001
From: Tuomas Parttimaa <tuomas.parttimaa@nordicsemi.no>
Date: Fri, 22 Nov 2024 14:10:30 +0200
Subject: [PATCH 1004/2913] [nrf fromtree] dts: nordic: Add SUIT storage
 partition for nRF9280 SiP

Add definition of the SUIT storage partition for the nRF9280 SiP.

Signed-off-by: Tuomas Parttimaa <tuomas.parttimaa@nordicsemi.no>
(cherry picked from commit 342c25924d916b562a7a847fc97f842b5ce7dd4f)
---
 dts/common/nordic/nrf9280.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 1222f3675ec..9e25f9837ba 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -74,6 +74,10 @@
 	reserved-memory {
 		#address-cells = <1>;
 		#size-cells = <1>;
+
+		suit_storage_partition: memory@e6b7000 {
+			reg = <0xe6b7000 DT_SIZE_K(40)>;
+		};
 	};
 
 	clocks {

From 9761d261943a916443cf6c748ee3daa2915e3546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Thu, 19 Dec 2024 15:08:33 +0100
Subject: [PATCH 1005/2913] [nrf fromtree] tests: drivers: gpio:
 gpio_basic_api: Enable test on nrf54l20pdk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add overlay required to run gpio_basic_api test on nrf54l20pdk.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 7c606c29c6393853cb59d30c3da0913eb169c794)
---
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay

diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 00000000000..8eb1b3c9f9f
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	resources {
+		compatible = "test-gpio-basic-api";
+		out-gpios = <&gpio1 10 0>;
+		in-gpios = <&gpio1 11 0>;
+	};
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};

From cebd9f27c8597ac5dc904beab3e6ea05928a6c14 Mon Sep 17 00:00:00 2001
From: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
Date: Wed, 27 Nov 2024 11:19:43 +0100
Subject: [PATCH 1006/2913] [nrf fromlist] tests: drivers: mspi: make MSPI API
 test more generic

Add ifdefs to make MSPI API test more generic.

Upstream PR #: 81870

Signed-off-by: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
---
 tests/drivers/mspi/api/src/main.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/drivers/mspi/api/src/main.c b/tests/drivers/mspi/api/src/main.c
index d6b632f29c1..a0bdc1c44f5 100644
--- a/tests/drivers/mspi/api/src/main.c
+++ b/tests/drivers/mspi/api/src/main.c
@@ -51,13 +51,17 @@ static struct mspi_dev_cfg device_cfg[] = {
 	DT_FOREACH_CHILD_STATUS_OKAY_SEP(MSPI_BUS_NODE, MSPI_DEVICE_CONFIG_DT, (,))
 };
 
+#if CONFIG_MSPI_XIP
 static struct mspi_xip_cfg xip_cfg[] = {
 	DT_FOREACH_CHILD_STATUS_OKAY_SEP(MSPI_BUS_NODE, MSPI_XIP_CONFIG_DT, (,))
 };
+#endif
 
+#if CONFIG_MSPI_SCRAMBLE
 static struct mspi_scramble_cfg scramble_cfg[] = {
 	DT_FOREACH_CHILD_STATUS_OKAY_SEP(MSPI_BUS_NODE, MSPI_SCRAMBLE_CONFIG_DT, (,))
 };
+#endif
 
 ZTEST(mspi_api, test_mspi_api)
 {
@@ -104,7 +108,11 @@ ZTEST(mspi_api, test_mspi_api)
 
 		ret = mspi_register_callback(mspi_bus, &dev_id[dev_idx],
 					     MSPI_BUS_XFER_COMPLETE, NULL, NULL);
-		zassert_equal(ret, 0, "mspi_register_callback failed.");
+		if (ret == -ENOTSUP) {
+			printf("mspi_register_callback not supported.\n");
+		} else {
+			zassert_equal(ret, 0, "mspi_register_callback failed.");
+		}
 
 		ret = mspi_get_channel_status(mspi_bus, 0);
 		zassert_equal(ret, 0, "mspi_get_channel_status failed.");

From 2540f7b5b204c54738e32f694bbddf43b35aae28 Mon Sep 17 00:00:00 2001
From: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
Date: Mon, 25 Nov 2024 14:14:40 +0100
Subject: [PATCH 1007/2913] [nrf noup] drivers: pinctrl: Add SDP MSPI pin
 configuration

Configure SDP MSPI pins to switch their control to VPR core

Signed-off-by: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
---
 drivers/pinctrl/pinctrl_nrf.c                 | 29 +++++++++++++++++++
 .../zephyr/dt-bindings/pinctrl/nrf-pinctrl.h  | 28 ++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 68ff6d8d7e4..48303bd59c9 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -103,6 +103,13 @@ static const nrf_gpio_pin_drive_t drive_modes[NRF_DRIVE_COUNT] = {
 #endif
 #endif
 
+#if defined(CONFIG_SOC_NRF54L15_CPUAPP)
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller) || defined(CONFIG_MSPI_NRFE)
+#define NRF_PSEL_SDP_MSPI(psel)                                                                    \
+	nrf_gpio_pin_control_select(psel, NRF_GPIO_PIN_SEL_VPR);
+#endif
+#endif
+
 int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			   uintptr_t reg)
 {
@@ -393,6 +400,28 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
 			break;
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) */
+#if defined(CONFIG_SOC_NRF54L15_CPUAPP)
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller)
+		case NRF_FUN_SDP_MSPI_CS0:
+		case NRF_FUN_SDP_MSPI_CS1:
+		case NRF_FUN_SDP_MSPI_CS2:
+		case NRF_FUN_SDP_MSPI_CS3:
+		case NRF_FUN_SDP_MSPI_CS4:
+		case NRF_FUN_SDP_MSPI_SCK:
+		case NRF_FUN_SDP_MSPI_DQ0:
+		case NRF_FUN_SDP_MSPI_DQ1:
+		case NRF_FUN_SDP_MSPI_DQ2:
+		case NRF_FUN_SDP_MSPI_DQ3:
+		case NRF_FUN_SDP_MSPI_DQ4:
+		case NRF_FUN_SDP_MSPI_DQ5:
+		case NRF_FUN_SDP_MSPI_DQ6:
+		case NRF_FUN_SDP_MSPI_DQ7:
+			NRF_PSEL_SDP_MSPI(psel);
+			dir = NRF_GPIO_PIN_DIR_OUTPUT;
+			input = NRF_GPIO_PIN_INPUT_CONNECT;
+			break;
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller) */
+#endif /* CONFIG_SOC_NRF54L15_CPUAPP */
 		default:
 			return -ENOTSUP;
 		}
diff --git a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
index 49c06f3668c..e637a46cb18 100644
--- a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
@@ -168,6 +168,34 @@
 #define NRF_FUN_GRTC_CLKOUT_FAST 55U
 /** GRTC slow clock output */
 #define NRF_FUN_GRTC_CLKOUT_32K  56U
+/** SDP_MSPI CK */
+#define NRF_FUN_SDP_MSPI_SCK 57U
+/** SDP_MSPI DQ0 */
+#define NRF_FUN_SDP_MSPI_DQ0 58U
+/** SDP_MSPI DQ1 */
+#define NRF_FUN_SDP_MSPI_DQ1 59U
+/** SDP_MSPI DQ2 */
+#define NRF_FUN_SDP_MSPI_DQ2 60U
+/** SDP_MSPI DQ3 */
+#define NRF_FUN_SDP_MSPI_DQ3 61U
+/** SDP_MSPI DQ4 */
+#define NRF_FUN_SDP_MSPI_DQ4 62U
+/** SDP_MSPI DQ5 */
+#define NRF_FUN_SDP_MSPI_DQ5 63U
+/** SDP_MSPI DQ6 */
+#define NRF_FUN_SDP_MSPI_DQ6 64U
+/** SDP_MSPI DQ7 */
+#define NRF_FUN_SDP_MSPI_DQ7 65U
+/** SDP_MSPI CS0 */
+#define NRF_FUN_SDP_MSPI_CS0 66U
+/** SDP_MSPI CS1 */
+#define NRF_FUN_SDP_MSPI_CS1 67U
+/** SDP_MSPI CS2 */
+#define NRF_FUN_SDP_MSPI_CS2 68U
+/** SDP_MSPI CS3 */
+#define NRF_FUN_SDP_MSPI_CS3 69U
+/** SDP_MSPI CS4 */
+#define NRF_FUN_SDP_MSPI_CS4 70U
 
 /** @} */
 

From abc79660847ec81cb4a0f004221508e78b70cf06 Mon Sep 17 00:00:00 2001
From: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
Date: Mon, 25 Nov 2024 14:18:50 +0100
Subject: [PATCH 1008/2913] [nrf noup] tests: drivers: mspi: api: Add nRF54L15
 overlay file

Add nRF54l15 overlay file to be able to run SDP MSPI API test.

Signed-off-by: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..3d5db366dc5
--- /dev/null
+++ b/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		mspi0 = &sdp_mspi;
+	};
+};
+
+&cpuflpr_vpr {
+	status = "okay";
+
+	sdp_mspi: sdp_mspi {
+		mspi_device: mspi_device@0 {
+			status = "okay";
+			compatible = "zephyr,mspi-emul-device";
+			reg = <0x0>;
+			mspi-max-frequency = <48000000>;
+		};
+	};
+};

From 1e841e3e45ad9abf7174d6638e1771a9cc2dd126 Mon Sep 17 00:00:00 2001
From: Jonathan Nilsen <jonathan.nilsen@nordicsemi.no>
Date: Fri, 13 Dec 2024 15:39:21 +0100
Subject: [PATCH 1009/2913] [nrf fromtree] boards: nordic: remove custom JLink
 reset scheme

Secure domain firmware v9.0.0 and onward no longer supports the
non-essential domain reset procedure which was used in the custom
JLink reset scheme for
nrf54h20dk/nrf54h20/cpuapp, nrf54h20dk/nrf54h20/cpurad,
nrf9280pdk/nrf9280/cpuapp and nrf9280pdk/nrf9280/cpurad.
All resets done through the ADAC interface now do a global reset
instead, which as of now "kills" the JLink session.

Remove the custom reset behavior as it will not work anymore moving
forward. This means that "monitor reset" in GDB can no longer be used
to debug the application from the start of execution. Using current
tooling, it is possible to debug from the start of execution by first
resetting the cores into a halted state, starting cores other than the
one you are debugging and then attaching GDB. For example:

> nrfutil device reset --reset-kind RESET_VIA_SECDOM
> nrfutil device go --core Network
> west attach

Signed-off-by: Jonathan Nilsen <jonathan.nilsen@nordicsemi.no>
(cherry picked from commit 18250bd3126b11ae61fc0c7df44e3455178a7d9e)
---
 .../support/nrf54h20_cpuapp.JLinkScript       | 252 +-----------------
 .../support/nrf54h20_cpurad.JLinkScript       | 252 +-----------------
 .../support/nrf9280_cpuapp.JLinkScript        | 252 +-----------------
 .../support/nrf9280_cpurad.JLinkScript        | 252 +-----------------
 4 files changed, 8 insertions(+), 1000 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/support/nrf54h20_cpuapp.JLinkScript b/boards/nordic/nrf54h20dk/support/nrf54h20_cpuapp.JLinkScript
index 28010addbf1..b1b96857399 100644
--- a/boards/nordic/nrf54h20dk/support/nrf54h20_cpuapp.JLinkScript
+++ b/boards/nordic/nrf54h20dk/support/nrf54h20_cpuapp.JLinkScript
@@ -1,260 +1,12 @@
-// Constants specific to the application core
 __constant U32 _CPUCONF_ADDR = 0x52011000;
-__constant U32 _PROCESSOR_ID = 2;
-__constant U32 _DOMAIN_ID = 2;
-__constant U32 _NUM_OTHER_PROCESSORS = 1;
-const U32 _OTHER_PROCESSOR_IDS[1] = {3};
-
-// Debug Halting Control and Status Register
-__constant U32 _DHCSR_ADDR = 0xE000EDF0;
-__constant U32 _DHCSR_DBGKEY = (0xA05F << 16);
-__constant U32 _DHCSR_C_DEBUGEN = (1 << 0);
-__constant U32 _DHCSR_C_HALT = (1 << 1);
-
-// Debug Exception and Monitor Control Register
-__constant U32 _DEMCR_ADDR = 0xE000EDFC;
-__constant U32 _DEMCR_VC_CORERESET = (1 << 0);
-__constant U32 _DEMCR_TRCENA = (1 << 24);
-
-// CPU wait enable register
 __constant U32 _CPUCONF_CPUWAIT_OFFSET = 0x50C;
 
-// CTRL-AP
-__constant U32 _CTRLAP_ID = 4;
-__constant U32 _CTRLAP_READY_BANK = 0;
-__constant U32 _CTRLAP_READY_OFFSET = 1;
-__constant U32 _CTRLAP_READY = 0;
-__constant U32 _CTRLAP_MAILBOX_BANK = 1;
-__constant U32 _CTRLAP_MAILBOX_TXDATA_OFFSET = 0;
-__constant U32 _CTRLAP_MAILBOX_TXSTATUS_OFFSET = 1;
-__constant U32 _CTRLAP_MAILBOX_RXDATA_OFFSET = 2;
-__constant U32 _CTRLAP_MAILBOX_RXSTATUS_OFFSET = 3;
-__constant U32 _CTRLAP_MAILBOX_NO_DATA_PENDING = 0;
-__constant U32 _CTRLAP_MAILBOX_DATA_PENDING = 1;
-__constant int _CTRLAP_TIMEOUT_MS = 500;
-
-// ADAC transaction buffers
-static U32 _adacTx[20];
-static U32 _adacRx[20];
-
-// Failed to send to the CTRL-AP MAILBOX
-__constant int _ERR_TX = -1;
-// Failed to receive from the CTRL-AP MAILBOX
-__constant int _ERR_RX = -2;
-// ADAC command returned an error
-__constant int _ERR_REPLY = -3;
-
-// Wait for an AP register read to return the expected value.
-int _WaitForDataStatus(U32 regOffset, int expectedStatus)
-{
-	int status;
-	int ret;
-	int start;
-	int elapsed;
-
-	status = 0;
-	start = JLINK_GetTime();
-	elapsed = 0;
-
-	do {
-		ret = JLINK_CORESIGHT_ReadDAP(regOffset, 1, &status);
-		elapsed = JLINK_GetTime() - start;
-	} while ((ret < 0 || status != expectedStatus) && (elapsed < _CTRLAP_TIMEOUT_MS));
-
-	if (ret < 0) {
-		return ret;
-	}
-
-	return status;
-}
-
-// Continuously read from the CTRL-AP MAILBOX until there is no more pending data.
-void _DrainMailbox(void)
-{
-	int ret;
-	int status;
-	int data;
-
-	ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
-	while (ret >= 0 && status == _CTRLAP_MAILBOX_DATA_PENDING) {
-		JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
-		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
-	}
-}
-
-// Perform an ADAC transaction by:
-// * writing the given sequence of words to MAILBOX.TXDATATA, waiting for MAILBOX.TXSTATUS
-//   readiness before each write.
-// * reading a sequence of words from MAILBOX.RXDATA, waiting for MAILBOX.RXSTATUS readiness before
-//   each read.
-//
-// The message to send is read from _adacTx and the reply is written to _adacRx.
-// Optionally checks if a single data word is returned and returns an error if it is non-zero.
-//
-// Assumes that the correct AP and AP bank for CTRL-AP MAILBOX has been selected in the DP.
-int _DoAdacTransaction(int checkReplyStatus)
-{
-	int numWords;
-	int ret;
-	int data;
-	int i;
-
-	i = 0;
-	numWords = 2 + (_adacTx[1] >> 2); // Length based on the length field of the message
-
-	while (i < numWords) {
-		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_TXSTATUS_OFFSET,
-					 _CTRLAP_MAILBOX_NO_DATA_PENDING);
-		if (ret != _CTRLAP_MAILBOX_NO_DATA_PENDING) {
-			JLINK_SYS_Report1("Timed out waiting for CTRL-AP TX readiness - result: ",
-					  ret);
-			return _ERR_TX;
-		}
-
-		ret = JLINK_CORESIGHT_WriteDAP(_CTRLAP_MAILBOX_TXDATA_OFFSET, 1, _adacTx[i]);
-		if (ret < 0) {
-			JLINK_SYS_Report1("Failed to write CTRL-AP TX data - result: ", ret);
-			return _ERR_TX;
-		}
-
-		i += 1;
-	}
-
-	i = 0;
-	numWords = 2; // Minimum message length
-
-	while (i < numWords) {
-		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_RXSTATUS_OFFSET,
-					 _CTRLAP_MAILBOX_DATA_PENDING);
-		if (ret != _CTRLAP_MAILBOX_DATA_PENDING) {
-			JLINK_SYS_Report1("Timed out waiting for CTRL-AP RX data - result: ", ret);
-			return _ERR_RX;
-		}
-
-		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
-		if (ret < 0) {
-			JLINK_SYS_Report1("Failed to read CTRL-AP RX data - result: ", ret);
-			return _ERR_RX;
-		}
-
-		if (i == 1) {
-			// Update total length based on the message length field
-			numWords = 2 + (data >> 2);
-		}
-
-		_adacRx[i] = data;
-		i += 1;
-	}
-
-	if (checkReplyStatus && _adacRx[1] == 4 && _adacRx[2] != 0) {
-		JLINK_SYS_Report1("ADAC command failed with status: ", _adacRx[2]);
-		return _ERR_REPLY;
-	}
-
-	return 0;
-}
-
-int ResetTarget(void)
+int SetupTarget(void)
 {
-	int err;
-	U32 adacMajorVersion;
-	U32 i;
-
-	// Select CTRL-AP bank 0, used for the READY register
-	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
-				 (_CTRLAP_ID << 24) | (_CTRLAP_READY_BANK << 4));
-
-	// Wait for the READY register to indicate that the AP can be used.
-	err = _WaitForDataStatus(_CTRLAP_READY_OFFSET, _CTRLAP_READY);
-	if (err < 0) {
-		JLINK_SYS_Report1("Timed out waiting for CTRL-AP readiness - result: ", err);
-		return -1;
-	}
-
-	// Select CTRL-AP bank 1, used for the MAILBOX registers for ADAC communication
-	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
-				 (_CTRLAP_ID << 24) | (_CTRLAP_MAILBOX_BANK << 4));
-
-	// Extract any pre-existing data from the mailbox in case there was previously
-	// an aborted transaction.
-	_DrainMailbox();
-
-	// Read the ADAC version
-	_adacTx[0] = 0xA3000000; // Command VERSION
-	_adacTx[1] = 0x00000004; // Data length 4 bytes
-	_adacTx[2] = 0x00000000; // Type 0 (ADAC version)
-	err = _DoAdacTransaction(0);
-	if (err < 0) {
-		return -1;
-	}
-
-	adacMajorVersion = (_adacRx[2] >> 24) & 0xff;
-	JLINK_SYS_Report1("ADAC major version: ", adacMajorVersion);
-
-	if (adacMajorVersion >= 2) {
-		// There is a very small chance that this command fails if the domain reset itself
-		// at the exact same time the command was issued. Therefore we retry a few times.
-		i = 0;
-		while (i < 3) {
-			// Reset non-essential domains
-			_adacTx[0] = 0xA30A0000; // Command RESET
-			_adacTx[1] = 0x00000004; // Data length 4 bytes
-			_adacTx[2] = 0x00000000; // (reserved)
-			err = _DoAdacTransaction(1);
-			if (err >= 0) {
-				break;
-			} else if (err != _ERR_REPLY) {
-				return -1;
-			}
-
-			i = i + 1;
-		}
-
-		// Start the core in halted mode
-		_adacTx[0] = 0xA3090000;                         // Command START
-		_adacTx[1] = 0x00000004;                         // Data length 4 bytes
-		_adacTx[2] = 0x01000000 | (_PROCESSOR_ID << 16); // Own processor, Flags HALT
-		err = _DoAdacTransaction(1);
-		if (err < 0) {
-			return -1;
-		}
-
-		// Start other cores normally (will fail silently if no firmware is present)
-		i = 0;
-		while (i < _NUM_OTHER_PROCESSORS) {
-			_adacTx[0] = 0xA3090000; // Command START
-			_adacTx[1] = 0x00000004; // Data length 4 bytes
-			_adacTx[2] = 0x00000000 |
-				     (_OTHER_PROCESSOR_IDS[i] << 16); // Other processor, No flags
-			err = _DoAdacTransaction(0);
-			if (err < 0 && err != _ERR_REPLY) {
-				return -1;
-			}
-
-			i = i + 1;
-		}
-	} else {
-		// Reset single domain via legacy implementation
-		_adacTx[0] = 0xA3030000;                      // Command RESET
-		_adacTx[1] = 0x00000004;                      // Data length 4 bytes
-		_adacTx[2] = 0x01000000 | (_DOMAIN_ID << 16); // Own domain, Mode HALT
-		err = _DoAdacTransaction(1);
-		if (err < 0) {
-			return -1;
-		}
-	}
-
-	// Halt the CPU
-	JLINK_MEM_WriteU32(_DHCSR_ADDR, (_DHCSR_DBGKEY | _DHCSR_C_HALT | _DHCSR_C_DEBUGEN));
-
-	// Set vector catch on reset (to halt the CPU immediately after reset)
-	JLINK_MEM_WriteU32(_DEMCR_ADDR, (_DEMCR_VC_CORERESET | _DEMCR_TRCENA));
+	JLINK_TARGET_Halt();
 
 	// Disable CPU wait
 	JLINK_MEM_WriteU32(_CPUCONF_ADDR + _CPUCONF_CPUWAIT_OFFSET, 0);
 
-	// Clear vector catch stuff
-	JLINK_MEM_WriteU32(_DEMCR_ADDR, _DEMCR_TRCENA);
-
 	return 0;
 }
diff --git a/boards/nordic/nrf54h20dk/support/nrf54h20_cpurad.JLinkScript b/boards/nordic/nrf54h20dk/support/nrf54h20_cpurad.JLinkScript
index 5c2065307ff..e1861ae8c97 100644
--- a/boards/nordic/nrf54h20dk/support/nrf54h20_cpurad.JLinkScript
+++ b/boards/nordic/nrf54h20dk/support/nrf54h20_cpurad.JLinkScript
@@ -1,159 +1,6 @@
-// Constants specific to the radio core
 __constant U32 _CPUCONF_ADDR = 0x53011000;
-__constant U32 _PROCESSOR_ID = 3;
-__constant U32 _DOMAIN_ID = 3;
-__constant U32 _NUM_OTHER_PROCESSORS = 1;
-const U32 _OTHER_PROCESSOR_IDS[1] = {2};
-
-// Debug Halting Control and Status Register
-__constant U32 _DHCSR_ADDR = 0xE000EDF0;
-__constant U32 _DHCSR_DBGKEY = (0xA05F << 16);
-__constant U32 _DHCSR_C_DEBUGEN = (1 << 0);
-__constant U32 _DHCSR_C_HALT = (1 << 1);
-
-// Debug Exception and Monitor Control Register
-__constant U32 _DEMCR_ADDR = 0xE000EDFC;
-__constant U32 _DEMCR_VC_CORERESET = (1 << 0);
-__constant U32 _DEMCR_TRCENA = (1 << 24);
-
-// CPU wait enable register
 __constant U32 _CPUCONF_CPUWAIT_OFFSET = 0x50C;
 
-// CTRL-AP
-__constant U32 _CTRLAP_ID = 4;
-__constant U32 _CTRLAP_READY_BANK = 0;
-__constant U32 _CTRLAP_READY_OFFSET = 1;
-__constant U32 _CTRLAP_READY = 0;
-__constant U32 _CTRLAP_MAILBOX_BANK = 1;
-__constant U32 _CTRLAP_MAILBOX_TXDATA_OFFSET = 0;
-__constant U32 _CTRLAP_MAILBOX_TXSTATUS_OFFSET = 1;
-__constant U32 _CTRLAP_MAILBOX_RXDATA_OFFSET = 2;
-__constant U32 _CTRLAP_MAILBOX_RXSTATUS_OFFSET = 3;
-__constant U32 _CTRLAP_MAILBOX_NO_DATA_PENDING = 0;
-__constant U32 _CTRLAP_MAILBOX_DATA_PENDING = 1;
-__constant int _CTRLAP_TIMEOUT_MS = 500;
-
-// ADAC transaction buffers
-static U32 _adacTx[20];
-static U32 _adacRx[20];
-
-// Failed to send to the CTRL-AP MAILBOX
-__constant int _ERR_TX = -1;
-// Failed to receive from the CTRL-AP MAILBOX
-__constant int _ERR_RX = -2;
-// ADAC command returned an error
-__constant int _ERR_REPLY = -3;
-
-// Wait for an AP register read to return the expected value.
-int _WaitForDataStatus(U32 regOffset, int expectedStatus)
-{
-	int status;
-	int ret;
-	int start;
-	int elapsed;
-
-	status = 0;
-	start = JLINK_GetTime();
-	elapsed = 0;
-
-	do {
-		ret = JLINK_CORESIGHT_ReadDAP(regOffset, 1, &status);
-		elapsed = JLINK_GetTime() - start;
-	} while ((ret < 0 || status != expectedStatus) && (elapsed < _CTRLAP_TIMEOUT_MS));
-
-	if (ret < 0) {
-		return ret;
-	}
-
-	return status;
-}
-
-// Continuously read from the CTRL-AP MAILBOX until there is no more pending data.
-void _DrainMailbox(void)
-{
-	int ret;
-	int status;
-	int data;
-
-	ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
-	while (ret >= 0 && status == _CTRLAP_MAILBOX_DATA_PENDING) {
-		JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
-		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
-	}
-}
-
-// Perform an ADAC transaction by:
-// * writing the given sequence of words to MAILBOX.TXDATATA, waiting for MAILBOX.TXSTATUS
-//   readiness before each write.
-// * reading a sequence of words from MAILBOX.RXDATA, waiting for MAILBOX.RXSTATUS readiness before
-//   each read.
-//
-// The message to send is read from _adacTx and the reply is written to _adacRx.
-// Optionally checks if a single data word is returned and returns an error if it is non-zero.
-//
-// Assumes that the correct AP and AP bank for CTRL-AP MAILBOX has been selected in the DP.
-int _DoAdacTransaction(int checkReplyStatus)
-{
-	int numWords;
-	int ret;
-	int data;
-	int i;
-
-	i = 0;
-	numWords = 2 + (_adacTx[1] >> 2); // Length based on the length field of the message
-
-	while (i < numWords) {
-		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_TXSTATUS_OFFSET,
-					 _CTRLAP_MAILBOX_NO_DATA_PENDING);
-		if (ret != _CTRLAP_MAILBOX_NO_DATA_PENDING) {
-			JLINK_SYS_Report1("Timed out waiting for CTRL-AP TX readiness - result: ",
-					  ret);
-			return _ERR_TX;
-		}
-
-		ret = JLINK_CORESIGHT_WriteDAP(_CTRLAP_MAILBOX_TXDATA_OFFSET, 1, _adacTx[i]);
-		if (ret < 0) {
-			JLINK_SYS_Report1("Failed to write CTRL-AP TX data - result: ", ret);
-			return _ERR_TX;
-		}
-
-		i += 1;
-	}
-
-	i = 0;
-	numWords = 2; // Minimum message length
-
-	while (i < numWords) {
-		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_RXSTATUS_OFFSET,
-					 _CTRLAP_MAILBOX_DATA_PENDING);
-		if (ret != _CTRLAP_MAILBOX_DATA_PENDING) {
-			JLINK_SYS_Report1("Timed out waiting for CTRL-AP RX data - result: ", ret);
-			return _ERR_RX;
-		}
-
-		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
-		if (ret < 0) {
-			JLINK_SYS_Report1("Failed to read CTRL-AP RX data - result: ", ret);
-			return _ERR_RX;
-		}
-
-		if (i == 1) {
-			// Update total length based on the message length field
-			numWords = 2 + (data >> 2);
-		}
-
-		_adacRx[i] = data;
-		i += 1;
-	}
-
-	if (checkReplyStatus && _adacRx[1] == 4 && _adacRx[2] != 0) {
-		JLINK_SYS_Report1("ADAC command failed with status: ", _adacRx[2]);
-		return _ERR_REPLY;
-	}
-
-	return 0;
-}
-
 int ConfigTargetSettings(void)
 {
 	JLINK_ExecCommand("CORESIGHT_AddAP = Index=1 Type=AHB-AP");
@@ -162,107 +9,12 @@ int ConfigTargetSettings(void)
 	return 0;
 }
 
-int ResetTarget(void)
+int SetupTarget(void)
 {
-	int err;
-	U32 adacMajorVersion;
-	U32 i;
-
-	// Select CTRL-AP bank 0, used for the READY register
-	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
-				 (_CTRLAP_ID << 24) | (_CTRLAP_READY_BANK << 4));
-
-	// Wait for the READY register to indicate that the AP can be used.
-	err = _WaitForDataStatus(_CTRLAP_READY_OFFSET, _CTRLAP_READY);
-	if (err < 0) {
-		JLINK_SYS_Report1("Timed out waiting for CTRL-AP readiness - result: ", err);
-		return -1;
-	}
-
-	// Select CTRL-AP bank 1, used for the MAILBOX registers for ADAC communication
-	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
-				 (_CTRLAP_ID << 24) | (_CTRLAP_MAILBOX_BANK << 4));
-
-	// Extract any pre-existing data from the mailbox in case there was previously
-	// an aborted transaction.
-	_DrainMailbox();
-
-	// Read the ADAC version
-	_adacTx[0] = 0xA3000000; // Command VERSION
-	_adacTx[1] = 0x00000004; // Data length 4 bytes
-	_adacTx[2] = 0x00000000; // Type 0 (ADAC version)
-	err = _DoAdacTransaction(0);
-	if (err < 0) {
-		return -1;
-	}
-
-	adacMajorVersion = (_adacRx[2] >> 24) & 0xff;
-	JLINK_SYS_Report1("ADAC major version: ", adacMajorVersion);
-
-	if (adacMajorVersion >= 2) {
-		// There is a very small chance that this command fails if the domain reset itself
-		// at the exact same time the command was issued. Therefore we retry a few times.
-		i = 0;
-		while (i < 3) {
-			// Reset non-essential domains
-			_adacTx[0] = 0xA30A0000; // Command RESET
-			_adacTx[1] = 0x00000004; // Data length 4 bytes
-			_adacTx[2] = 0x00000000; // (reserved)
-			err = _DoAdacTransaction(1);
-			if (err >= 0) {
-				break;
-			} else if (err != _ERR_REPLY) {
-				return -1;
-			}
-
-			i = i + 1;
-		}
-
-		// Start the core in halted mode
-		_adacTx[0] = 0xA3090000;                         // Command START
-		_adacTx[1] = 0x00000004;                         // Data length 4 bytes
-		_adacTx[2] = 0x01000000 | (_PROCESSOR_ID << 16); // Own processor, Flags HALT
-		err = _DoAdacTransaction(1);
-		if (err < 0) {
-			return -1;
-		}
-
-		// Start other cores normally (will fail silently if no firmware is present)
-		i = 0;
-		while (i < _NUM_OTHER_PROCESSORS) {
-			_adacTx[0] = 0xA3090000; // Command START
-			_adacTx[1] = 0x00000004; // Data length 4 bytes
-			_adacTx[2] = 0x00000000 |
-				     (_OTHER_PROCESSOR_IDS[i] << 16); // Other processor, No flags
-			err = _DoAdacTransaction(0);
-			if (err < 0 && err != _ERR_REPLY) {
-				return -1;
-			}
-
-			i = i + 1;
-		}
-	} else {
-		// Reset single domain via legacy implementation
-		_adacTx[0] = 0xA3030000;                      // Command RESET
-		_adacTx[1] = 0x00000004;                      // Data length 4 bytes
-		_adacTx[2] = 0x01000000 | (_DOMAIN_ID << 16); // Own domain, Mode HALT
-		err = _DoAdacTransaction(1);
-		if (err < 0) {
-			return -1;
-		}
-	}
-
-	// Halt the CPU
-	JLINK_MEM_WriteU32(_DHCSR_ADDR, (_DHCSR_DBGKEY | _DHCSR_C_HALT | _DHCSR_C_DEBUGEN));
-
-	// Set vector catch on reset (to halt the CPU immediately after reset)
-	JLINK_MEM_WriteU32(_DEMCR_ADDR, (_DEMCR_VC_CORERESET | _DEMCR_TRCENA));
+	JLINK_TARGET_Halt();
 
 	// Disable CPU wait
 	JLINK_MEM_WriteU32(_CPUCONF_ADDR + _CPUCONF_CPUWAIT_OFFSET, 0);
 
-	// Clear vector catch stuff
-	JLINK_MEM_WriteU32(_DEMCR_ADDR, _DEMCR_TRCENA);
-
 	return 0;
 }
diff --git a/boards/nordic/nrf9280pdk/support/nrf9280_cpuapp.JLinkScript b/boards/nordic/nrf9280pdk/support/nrf9280_cpuapp.JLinkScript
index 5791a7bed9b..b1b96857399 100644
--- a/boards/nordic/nrf9280pdk/support/nrf9280_cpuapp.JLinkScript
+++ b/boards/nordic/nrf9280pdk/support/nrf9280_cpuapp.JLinkScript
@@ -1,260 +1,12 @@
-// Constants specific to the application core
 __constant U32 _CPUCONF_ADDR = 0x52011000;
-__constant U32 _PROCESSOR_ID = 2;
-__constant U32 _DOMAIN_ID = 2;
-__constant U32 _NUM_OTHER_PROCESSORS = 2;
-const U32 _OTHER_PROCESSOR_IDS[2] = {4, 3};
-
-// Debug Halting Control and Status Register
-__constant U32 _DHCSR_ADDR = 0xE000EDF0;
-__constant U32 _DHCSR_DBGKEY = (0xA05F << 16);
-__constant U32 _DHCSR_C_DEBUGEN = (1 << 0);
-__constant U32 _DHCSR_C_HALT = (1 << 1);
-
-// Debug Exception and Monitor Control Register
-__constant U32 _DEMCR_ADDR = 0xE000EDFC;
-__constant U32 _DEMCR_VC_CORERESET = (1 << 0);
-__constant U32 _DEMCR_TRCENA = (1 << 24);
-
-// CPU wait enable register
 __constant U32 _CPUCONF_CPUWAIT_OFFSET = 0x50C;
 
-// CTRL-AP
-__constant U32 _CTRLAP_ID = 4;
-__constant U32 _CTRLAP_READY_BANK = 0;
-__constant U32 _CTRLAP_READY_OFFSET = 1;
-__constant U32 _CTRLAP_READY = 0;
-__constant U32 _CTRLAP_MAILBOX_BANK = 1;
-__constant U32 _CTRLAP_MAILBOX_TXDATA_OFFSET = 0;
-__constant U32 _CTRLAP_MAILBOX_TXSTATUS_OFFSET = 1;
-__constant U32 _CTRLAP_MAILBOX_RXDATA_OFFSET = 2;
-__constant U32 _CTRLAP_MAILBOX_RXSTATUS_OFFSET = 3;
-__constant U32 _CTRLAP_MAILBOX_NO_DATA_PENDING = 0;
-__constant U32 _CTRLAP_MAILBOX_DATA_PENDING = 1;
-__constant int _CTRLAP_TIMEOUT_MS = 500;
-
-// ADAC transaction buffers
-static U32 _adacTx[20];
-static U32 _adacRx[20];
-
-// Failed to send to the CTRL-AP MAILBOX
-__constant int _ERR_TX = -1;
-// Failed to receive from the CTRL-AP MAILBOX
-__constant int _ERR_RX = -2;
-// ADAC command returned an error
-__constant int _ERR_REPLY = -3;
-
-// Wait for an AP register read to return the expected value.
-int _WaitForDataStatus(U32 regOffset, int expectedStatus)
-{
-	int status;
-	int ret;
-	int start;
-	int elapsed;
-
-	status = 0;
-	start = JLINK_GetTime();
-	elapsed = 0;
-
-	do {
-		ret = JLINK_CORESIGHT_ReadDAP(regOffset, 1, &status);
-		elapsed = JLINK_GetTime() - start;
-	} while ((ret < 0 || status != expectedStatus) && (elapsed < _CTRLAP_TIMEOUT_MS));
-
-	if (ret < 0) {
-		return ret;
-	}
-
-	return status;
-}
-
-// Continuously read from the CTRL-AP MAILBOX until there is no more pending data.
-void _DrainMailbox(void)
-{
-	int ret;
-	int status;
-	int data;
-
-	ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
-	while (ret >= 0 && status == _CTRLAP_MAILBOX_DATA_PENDING) {
-		JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
-		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
-	}
-}
-
-// Perform an ADAC transaction by:
-// * writing the given sequence of words to MAILBOX.TXDATATA, waiting for MAILBOX.TXSTATUS
-//   readiness before each write.
-// * reading a sequence of words from MAILBOX.RXDATA, waiting for MAILBOX.RXSTATUS readiness before
-//   each read.
-//
-// The message to send is read from _adacTx and the reply is written to _adacRx.
-// Optionally checks if a single data word is returned and returns an error if it is non-zero.
-//
-// Assumes that the correct AP and AP bank for CTRL-AP MAILBOX has been selected in the DP.
-int _DoAdacTransaction(int checkReplyStatus)
-{
-	int numWords;
-	int ret;
-	int data;
-	int i;
-
-	i = 0;
-	numWords = 2 + (_adacTx[1] >> 2); // Length based on the length field of the message
-
-	while (i < numWords) {
-		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_TXSTATUS_OFFSET,
-					 _CTRLAP_MAILBOX_NO_DATA_PENDING);
-		if (ret != _CTRLAP_MAILBOX_NO_DATA_PENDING) {
-			JLINK_SYS_Report1("Timed out waiting for CTRL-AP TX readiness - result: ",
-					  ret);
-			return _ERR_TX;
-		}
-
-		ret = JLINK_CORESIGHT_WriteDAP(_CTRLAP_MAILBOX_TXDATA_OFFSET, 1, _adacTx[i]);
-		if (ret < 0) {
-			JLINK_SYS_Report1("Failed to write CTRL-AP TX data - result: ", ret);
-			return _ERR_TX;
-		}
-
-		i += 1;
-	}
-
-	i = 0;
-	numWords = 2; // Minimum message length
-
-	while (i < numWords) {
-		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_RXSTATUS_OFFSET,
-					 _CTRLAP_MAILBOX_DATA_PENDING);
-		if (ret != _CTRLAP_MAILBOX_DATA_PENDING) {
-			JLINK_SYS_Report1("Timed out waiting for CTRL-AP RX data - result: ", ret);
-			return _ERR_RX;
-		}
-
-		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
-		if (ret < 0) {
-			JLINK_SYS_Report1("Failed to read CTRL-AP RX data - result: ", ret);
-			return _ERR_RX;
-		}
-
-		if (i == 1) {
-			// Update total length based on the message length field
-			numWords = 2 + (data >> 2);
-		}
-
-		_adacRx[i] = data;
-		i += 1;
-	}
-
-	if (checkReplyStatus && _adacRx[1] == 4 && _adacRx[2] != 0) {
-		JLINK_SYS_Report1("ADAC command failed with status: ", _adacRx[2]);
-		return _ERR_REPLY;
-	}
-
-	return 0;
-}
-
-int ResetTarget(void)
+int SetupTarget(void)
 {
-	int err;
-	U32 adacMajorVersion;
-	U32 i;
-
-	// Select CTRL-AP bank 0, used for the READY register
-	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
-				 (_CTRLAP_ID << 24) | (_CTRLAP_READY_BANK << 4));
-
-	// Wait for the READY register to indicate that the AP can be used.
-	err = _WaitForDataStatus(_CTRLAP_READY_OFFSET, _CTRLAP_READY);
-	if (err < 0) {
-		JLINK_SYS_Report1("Timed out waiting for CTRL-AP readiness - result: ", err);
-		return -1;
-	}
-
-	// Select CTRL-AP bank 1, used for the MAILBOX registers for ADAC communication
-	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
-				 (_CTRLAP_ID << 24) | (_CTRLAP_MAILBOX_BANK << 4));
-
-	// Extract any pre-existing data from the mailbox in case there was previously
-	// an aborted transaction.
-	_DrainMailbox();
-
-	// Read the ADAC version
-	_adacTx[0] = 0xA3000000; // Command VERSION
-	_adacTx[1] = 0x00000004; // Data length 4 bytes
-	_adacTx[2] = 0x00000000; // Type 0 (ADAC version)
-	err = _DoAdacTransaction(0);
-	if (err < 0) {
-		return -1;
-	}
-
-	adacMajorVersion = (_adacRx[2] >> 24) & 0xff;
-	JLINK_SYS_Report1("ADAC major version: ", adacMajorVersion);
-
-	if (adacMajorVersion >= 2) {
-		// There is a very small chance that this command fails if the domain reset itself
-		// at the exact same time the command was issued. Therefore we retry a few times.
-		i = 0;
-		while (i < 3) {
-			// Reset non-essential domains
-			_adacTx[0] = 0xA30A0000; // Command RESET
-			_adacTx[1] = 0x00000004; // Data length 4 bytes
-			_adacTx[2] = 0x00000000; // (reserved)
-			err = _DoAdacTransaction(1);
-			if (err >= 0) {
-				break;
-			} else if (err != _ERR_REPLY) {
-				return -1;
-			}
-
-			i = i + 1;
-		}
-
-		// Start the core in halted mode
-		_adacTx[0] = 0xA3090000;                         // Command START
-		_adacTx[1] = 0x00000004;                         // Data length 4 bytes
-		_adacTx[2] = 0x01000000 | (_PROCESSOR_ID << 16); // Own processor, Flags HALT
-		err = _DoAdacTransaction(1);
-		if (err < 0) {
-			return -1;
-		}
-
-		// Start other cores normally (will fail silently if no firmware is present)
-		i = 0;
-		while (i < _NUM_OTHER_PROCESSORS) {
-			_adacTx[0] = 0xA3090000; // Command START
-			_adacTx[1] = 0x00000004; // Data length 4 bytes
-			_adacTx[2] = 0x00000000 |
-				     (_OTHER_PROCESSOR_IDS[i] << 16); // Other processor, No flags
-			err = _DoAdacTransaction(0);
-			if (err < 0 && err != _ERR_REPLY) {
-				return -1;
-			}
-
-			i = i + 1;
-		}
-	} else {
-		// Reset single domain via legacy implementation
-		_adacTx[0] = 0xA3030000;                      // Command RESET
-		_adacTx[1] = 0x00000004;                      // Data length 4 bytes
-		_adacTx[2] = 0x01000000 | (_DOMAIN_ID << 16); // Own domain, Mode HALT
-		err = _DoAdacTransaction(1);
-		if (err < 0) {
-			return -1;
-		}
-	}
-
-	// Halt the CPU
-	JLINK_MEM_WriteU32(_DHCSR_ADDR, (_DHCSR_DBGKEY | _DHCSR_C_HALT | _DHCSR_C_DEBUGEN));
-
-	// Set vector catch on reset (to halt the CPU immediately after reset)
-	JLINK_MEM_WriteU32(_DEMCR_ADDR, (_DEMCR_VC_CORERESET | _DEMCR_TRCENA));
+	JLINK_TARGET_Halt();
 
 	// Disable CPU wait
 	JLINK_MEM_WriteU32(_CPUCONF_ADDR + _CPUCONF_CPUWAIT_OFFSET, 0);
 
-	// Clear vector catch stuff
-	JLINK_MEM_WriteU32(_DEMCR_ADDR, _DEMCR_TRCENA);
-
 	return 0;
 }
diff --git a/boards/nordic/nrf9280pdk/support/nrf9280_cpurad.JLinkScript b/boards/nordic/nrf9280pdk/support/nrf9280_cpurad.JLinkScript
index 02b84dcc970..e1861ae8c97 100644
--- a/boards/nordic/nrf9280pdk/support/nrf9280_cpurad.JLinkScript
+++ b/boards/nordic/nrf9280pdk/support/nrf9280_cpurad.JLinkScript
@@ -1,159 +1,6 @@
-// Constants specific to the radio core
 __constant U32 _CPUCONF_ADDR = 0x53011000;
-__constant U32 _PROCESSOR_ID = 3;
-__constant U32 _DOMAIN_ID = 3;
-__constant U32 _NUM_OTHER_PROCESSORS = 2;
-const U32 _OTHER_PROCESSOR_IDS[2] = {4, 2};
-
-// Debug Halting Control and Status Register
-__constant U32 _DHCSR_ADDR = 0xE000EDF0;
-__constant U32 _DHCSR_DBGKEY = (0xA05F << 16);
-__constant U32 _DHCSR_C_DEBUGEN = (1 << 0);
-__constant U32 _DHCSR_C_HALT = (1 << 1);
-
-// Debug Exception and Monitor Control Register
-__constant U32 _DEMCR_ADDR = 0xE000EDFC;
-__constant U32 _DEMCR_VC_CORERESET = (1 << 0);
-__constant U32 _DEMCR_TRCENA = (1 << 24);
-
-// CPU wait enable register
 __constant U32 _CPUCONF_CPUWAIT_OFFSET = 0x50C;
 
-// CTRL-AP
-__constant U32 _CTRLAP_ID = 4;
-__constant U32 _CTRLAP_READY_BANK = 0;
-__constant U32 _CTRLAP_READY_OFFSET = 1;
-__constant U32 _CTRLAP_READY = 0;
-__constant U32 _CTRLAP_MAILBOX_BANK = 1;
-__constant U32 _CTRLAP_MAILBOX_TXDATA_OFFSET = 0;
-__constant U32 _CTRLAP_MAILBOX_TXSTATUS_OFFSET = 1;
-__constant U32 _CTRLAP_MAILBOX_RXDATA_OFFSET = 2;
-__constant U32 _CTRLAP_MAILBOX_RXSTATUS_OFFSET = 3;
-__constant U32 _CTRLAP_MAILBOX_NO_DATA_PENDING = 0;
-__constant U32 _CTRLAP_MAILBOX_DATA_PENDING = 1;
-__constant int _CTRLAP_TIMEOUT_MS = 500;
-
-// ADAC transaction buffers
-static U32 _adacTx[20];
-static U32 _adacRx[20];
-
-// Failed to send to the CTRL-AP MAILBOX
-__constant int _ERR_TX = -1;
-// Failed to receive from the CTRL-AP MAILBOX
-__constant int _ERR_RX = -2;
-// ADAC command returned an error
-__constant int _ERR_REPLY = -3;
-
-// Wait for an AP register read to return the expected value.
-int _WaitForDataStatus(U32 regOffset, int expectedStatus)
-{
-	int status;
-	int ret;
-	int start;
-	int elapsed;
-
-	status = 0;
-	start = JLINK_GetTime();
-	elapsed = 0;
-
-	do {
-		ret = JLINK_CORESIGHT_ReadDAP(regOffset, 1, &status);
-		elapsed = JLINK_GetTime() - start;
-	} while ((ret < 0 || status != expectedStatus) && (elapsed < _CTRLAP_TIMEOUT_MS));
-
-	if (ret < 0) {
-		return ret;
-	}
-
-	return status;
-}
-
-// Continuously read from the CTRL-AP MAILBOX until there is no more pending data.
-void _DrainMailbox(void)
-{
-	int ret;
-	int status;
-	int data;
-
-	ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
-	while (ret >= 0 && status == _CTRLAP_MAILBOX_DATA_PENDING) {
-		JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
-		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
-	}
-}
-
-// Perform an ADAC transaction by:
-// * writing the given sequence of words to MAILBOX.TXDATATA, waiting for MAILBOX.TXSTATUS
-//   readiness before each write.
-// * reading a sequence of words from MAILBOX.RXDATA, waiting for MAILBOX.RXSTATUS readiness before
-//   each read.
-//
-// The message to send is read from _adacTx and the reply is written to _adacRx.
-// Optionally checks if a single data word is returned and returns an error if it is non-zero.
-//
-// Assumes that the correct AP and AP bank for CTRL-AP MAILBOX has been selected in the DP.
-int _DoAdacTransaction(int checkReplyStatus)
-{
-	int numWords;
-	int ret;
-	int data;
-	int i;
-
-	i = 0;
-	numWords = 2 + (_adacTx[1] >> 2); // Length based on the length field of the message
-
-	while (i < numWords) {
-		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_TXSTATUS_OFFSET,
-					 _CTRLAP_MAILBOX_NO_DATA_PENDING);
-		if (ret != _CTRLAP_MAILBOX_NO_DATA_PENDING) {
-			JLINK_SYS_Report1("Timed out waiting for CTRL-AP TX readiness - result: ",
-					  ret);
-			return _ERR_TX;
-		}
-
-		ret = JLINK_CORESIGHT_WriteDAP(_CTRLAP_MAILBOX_TXDATA_OFFSET, 1, _adacTx[i]);
-		if (ret < 0) {
-			JLINK_SYS_Report1("Failed to write CTRL-AP TX data - result: ", ret);
-			return _ERR_TX;
-		}
-
-		i += 1;
-	}
-
-	i = 0;
-	numWords = 2; // Minimum message length
-
-	while (i < numWords) {
-		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_RXSTATUS_OFFSET,
-					 _CTRLAP_MAILBOX_DATA_PENDING);
-		if (ret != _CTRLAP_MAILBOX_DATA_PENDING) {
-			JLINK_SYS_Report1("Timed out waiting for CTRL-AP RX data - result: ", ret);
-			return _ERR_RX;
-		}
-
-		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
-		if (ret < 0) {
-			JLINK_SYS_Report1("Failed to read CTRL-AP RX data - result: ", ret);
-			return _ERR_RX;
-		}
-
-		if (i == 1) {
-			// Update total length based on the message length field
-			numWords = 2 + (data >> 2);
-		}
-
-		_adacRx[i] = data;
-		i += 1;
-	}
-
-	if (checkReplyStatus && _adacRx[1] == 4 && _adacRx[2] != 0) {
-		JLINK_SYS_Report1("ADAC command failed with status: ", _adacRx[2]);
-		return _ERR_REPLY;
-	}
-
-	return 0;
-}
-
 int ConfigTargetSettings(void)
 {
 	JLINK_ExecCommand("CORESIGHT_AddAP = Index=1 Type=AHB-AP");
@@ -162,107 +9,12 @@ int ConfigTargetSettings(void)
 	return 0;
 }
 
-int ResetTarget(void)
+int SetupTarget(void)
 {
-	int err;
-	U32 adacMajorVersion;
-	U32 i;
-
-	// Select CTRL-AP bank 0, used for the READY register
-	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
-				 (_CTRLAP_ID << 24) | (_CTRLAP_READY_BANK << 4));
-
-	// Wait for the READY register to indicate that the AP can be used.
-	err = _WaitForDataStatus(_CTRLAP_READY_OFFSET, _CTRLAP_READY);
-	if (err < 0) {
-		JLINK_SYS_Report1("Timed out waiting for CTRL-AP readiness - result: ", err);
-		return -1;
-	}
-
-	// Select CTRL-AP bank 1, used for the MAILBOX registers for ADAC communication
-	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
-				 (_CTRLAP_ID << 24) | (_CTRLAP_MAILBOX_BANK << 4));
-
-	// Extract any pre-existing data from the mailbox in case there was previously
-	// an aborted transaction.
-	_DrainMailbox();
-
-	// Read the ADAC version
-	_adacTx[0] = 0xA3000000; // Command VERSION
-	_adacTx[1] = 0x00000004; // Data length 4 bytes
-	_adacTx[2] = 0x00000000; // Type 0 (ADAC version)
-	err = _DoAdacTransaction(0);
-	if (err < 0) {
-		return -1;
-	}
-
-	adacMajorVersion = (_adacRx[2] >> 24) & 0xff;
-	JLINK_SYS_Report1("ADAC major version: ", adacMajorVersion);
-
-	if (adacMajorVersion >= 2) {
-		// There is a very small chance that this command fails if the domain reset itself
-		// at the exact same time the command was issued. Therefore we retry a few times.
-		i = 0;
-		while (i < 3) {
-			// Reset non-essential domains
-			_adacTx[0] = 0xA30A0000; // Command RESET
-			_adacTx[1] = 0x00000004; // Data length 4 bytes
-			_adacTx[2] = 0x00000000; // (reserved)
-			err = _DoAdacTransaction(1);
-			if (err >= 0) {
-				break;
-			} else if (err != _ERR_REPLY) {
-				return -1;
-			}
-
-			i = i + 1;
-		}
-
-		// Start the core in halted mode
-		_adacTx[0] = 0xA3090000;                         // Command START
-		_adacTx[1] = 0x00000004;                         // Data length 4 bytes
-		_adacTx[2] = 0x01000000 | (_PROCESSOR_ID << 16); // Own processor, Flags HALT
-		err = _DoAdacTransaction(1);
-		if (err < 0) {
-			return -1;
-		}
-
-		// Start other cores normally (will fail silently if no firmware is present)
-		i = 0;
-		while (i < _NUM_OTHER_PROCESSORS) {
-			_adacTx[0] = 0xA3090000; // Command START
-			_adacTx[1] = 0x00000004; // Data length 4 bytes
-			_adacTx[2] = 0x00000000 |
-				     (_OTHER_PROCESSOR_IDS[i] << 16); // Other processor, No flags
-			err = _DoAdacTransaction(0);
-			if (err < 0 && err != _ERR_REPLY) {
-				return -1;
-			}
-
-			i = i + 1;
-		}
-	} else {
-		// Reset single domain via legacy implementation
-		_adacTx[0] = 0xA3030000;                      // Command RESET
-		_adacTx[1] = 0x00000004;                      // Data length 4 bytes
-		_adacTx[2] = 0x01000000 | (_DOMAIN_ID << 16); // Own domain, Mode HALT
-		err = _DoAdacTransaction(1);
-		if (err < 0) {
-			return -1;
-		}
-	}
-
-	// Halt the CPU
-	JLINK_MEM_WriteU32(_DHCSR_ADDR, (_DHCSR_DBGKEY | _DHCSR_C_HALT | _DHCSR_C_DEBUGEN));
-
-	// Set vector catch on reset (to halt the CPU immediately after reset)
-	JLINK_MEM_WriteU32(_DEMCR_ADDR, (_DEMCR_VC_CORERESET | _DEMCR_TRCENA));
+	JLINK_TARGET_Halt();
 
 	// Disable CPU wait
 	JLINK_MEM_WriteU32(_CPUCONF_ADDR + _CPUCONF_CPUWAIT_OFFSET, 0);
 
-	// Clear vector catch stuff
-	JLINK_MEM_WriteU32(_DEMCR_ADDR, _DEMCR_TRCENA);
-
 	return 0;
 }

From 09b87e9262d6bc87206114dc14d1d10c585fbc0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 26 Jun 2024 15:44:09 +0200
Subject: [PATCH 1010/2913] [nrf fromtree] tests: drivers: uart: async_api: Add
 nrf54h20 cpuppr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add configuration for nrf54h20dk/nrf54h20/cpuppr.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 662f412a3591f1b7a41136ef910aa67a4fa5e5e5)
---
 .../boards/nrf54h20dk_nrf54h20_cpuppr.overlay             | 3 +++
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay             | 8 ++++++++
 .../uart/uart_async_api/sysbuild/vpr_launcher/prj.conf    | 1 +
 3 files changed, 12 insertions(+)
 create mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
 create mode 100644 tests/drivers/uart/uart_async_api/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/drivers/uart/uart_async_api/sysbuild/vpr_launcher/prj.conf

diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
new file mode 100644
index 00000000000..f65b4dd3b0b
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#include "nrf54h20dk_nrf54h20_common.dtsi"
diff --git a/tests/drivers/uart/uart_async_api/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/uart/uart_async_api/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..64c14d2c492
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#include "../../../boards/nrf54h20dk_nrf54h20_common.dtsi"
+
+&dut {
+	status = "reserved";
+	interrupt-parent = <&cpuppr_clic>;
+};
diff --git a/tests/drivers/uart/uart_async_api/sysbuild/vpr_launcher/prj.conf b/tests/drivers/uart/uart_async_api/sysbuild/vpr_launcher/prj.conf
new file mode 100644
index 00000000000..b2a4ba59104
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/sysbuild/vpr_launcher/prj.conf
@@ -0,0 +1 @@
+# nothing here

From 89fa63dffce774b26e8ca647dc91e2ebff0fbead Mon Sep 17 00:00:00 2001
From: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Date: Wed, 30 Oct 2024 16:09:34 +0200
Subject: [PATCH 1011/2913] [nrf fromtree] tests: portability: cmsis_rtos_v2:
 do not disable 64-bit timeouts

Some code that automatically gets embedded on some platforms relies
on having `CONFIG_TIMEOUT_64BIT` enabled.
Do not force disabling that Kconfig option in the test configuration,
as that will make the test fail to compile on those platforms.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
(cherry picked from commit 4b9c58806b12ffab72b46ecad78af0387e4a741a)
---
 tests/subsys/portability/cmsis_rtos_v2/prj.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/subsys/portability/cmsis_rtos_v2/prj.conf b/tests/subsys/portability/cmsis_rtos_v2/prj.conf
index 282d8c4ebcd..d8e93b74785 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/prj.conf
+++ b/tests/subsys/portability/cmsis_rtos_v2/prj.conf
@@ -13,7 +13,6 @@ CONFIG_SCHED_SCALABLE=y
 CONFIG_CMSIS_V2_MEM_SLAB_MAX_DYNAMIC_SIZE=128
 CONFIG_CMSIS_V2_THREAD_MAX_COUNT=23
 CONFIG_CMSIS_V2_THREAD_DYNAMIC_MAX_COUNT=10
-CONFIG_TIMEOUT_64BIT=n
 CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE=1024
 CONFIG_CMSIS_V2_THREAD_DYNAMIC_STACK_SIZE=1024
 CONFIG_MP_MAX_NUM_CPUS=1

From 68fdeb17ed73f7989423189a215bab5ff6ca670a Mon Sep 17 00:00:00 2001
From: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Date: Fri, 22 Nov 2024 10:50:42 +0100
Subject: [PATCH 1012/2913] [nrf fromtree] boards: nordic: Rearrange ram0x
 regions.

The ram0x partitions seem to be not compliant with nRF54H20
architecture and it causes that in the application dts overlay file
it is difficult to extend cpuapp_ram0x_region without modifying
whole layout.

It is better to place cpurad_ram0x_region at the beginning at
2f010000 address and then cpuapp_ram0x_region right after that.
Thanks to that, if the application needs to have more than 256 kB
of RAM, in the application dts overlay file, a user can increase
cpuapp_ram0x_region size up to 2f0be000.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
(cherry picked from commit a53cb7358717f21079197817976b938d37159c85)
---
 .../nrf54h20dk_nrf54h20-memory_map.dtsi       | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index f2937402554..8dc6ef757e9 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -7,44 +7,44 @@
 
 / {
 	reserved-memory {
-		cpuapp_ram0x_region: memory@2f010000 {
+		cpurad_ram0x_region: memory@2f010000 {
 			compatible = "nordic,owned-memory";
-			reg = <0x2f010000 DT_SIZE_K(260)>;
+			reg = <0x2f010000 DT_SIZE_K(4)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
+			nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RWS>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0x0 0x2f010000 0x41000>;
+			ranges = <0x0 0x2f010000 0x1000>;
 
-			cpusec_cpuapp_ipc_shm: memory@0 {
+			cpusec_cpurad_ipc_shm: memory@0 {
 				reg = <0x0 DT_SIZE_K(2)>;
 			};
 
-			cpuapp_cpusec_ipc_shm: memory@800 {
+			cpurad_cpusec_ipc_shm: memory@800 {
 				reg = <0x800 DT_SIZE_K(2)>;
 			};
-
-			cpuapp_data: memory@1000 {
-				reg = <0x1000 DT_SIZE_K(256)>;
-			};
 		};
 
-		cpurad_ram0x_region: memory@2f051000 {
+		cpuapp_ram0x_region: memory@2f011000 {
 			compatible = "nordic,owned-memory";
-			reg = <0x2f051000 DT_SIZE_K(4)>;
+			reg = <0x2f010000 DT_SIZE_K(260)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RWS>;
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0x0 0x2f051000 0x1000>;
+			ranges = <0x0 0x2f011000 0x41000>;
 
-			cpusec_cpurad_ipc_shm: memory@0 {
+			cpusec_cpuapp_ipc_shm: memory@0 {
 				reg = <0x0 DT_SIZE_K(2)>;
 			};
 
-			cpurad_cpusec_ipc_shm: memory@800 {
+			cpuapp_cpusec_ipc_shm: memory@800 {
 				reg = <0x800 DT_SIZE_K(2)>;
 			};
+
+			cpuapp_data: memory@1000 {
+				reg = <0x1000 DT_SIZE_K(256)>;
+			};
 		};
 
 		etr_buf_ram0x_region: memory@2f0be000 {

From be85a6490cdaa23cfb08e3c5d7abe48d868f5f8d Mon Sep 17 00:00:00 2001
From: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Date: Tue, 26 Nov 2024 12:19:46 +0100
Subject: [PATCH 1013/2913] [nrf fromtree] boards: nordic: Fix
 cpuapp_ram0x_region reg value.

There is a mistake and the cpuapp_ram0x_region "reg" value should
start from 0x2f011000.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
(cherry picked from commit 1e69738bf2841a0f1451237bbb8d7a76d297f7b4)
---
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index 8dc6ef757e9..165fa12ba80 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -27,7 +27,7 @@
 
 		cpuapp_ram0x_region: memory@2f011000 {
 			compatible = "nordic,owned-memory";
-			reg = <0x2f010000 DT_SIZE_K(260)>;
+			reg = <0x2f011000 DT_SIZE_K(260)>;
 			status = "disabled";
 			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
 			#address-cells = <1>;

From 248710e4825da1e6c7e0cbe31604e4e4a214d5b4 Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Thu, 5 Sep 2024 11:52:30 +0200
Subject: [PATCH 1014/2913] [nrf fromtree] boards: nordic: Enable IPC and
 bellboard on nRF54H20

Enable the cpusec IPC and the bellboard nodes for
the nrf54h20dk cpuapp and cpurad targets to enable
communication between domains.

Also enables the region cpurad_ram0x_region since
it is also required for the communication.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
(cherry picked from commit fdede6a3f1f584366f542875304db0a9b0a357bb)
---
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts | 5 +++++
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 171732d81e6..3a1c8abf0f5 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -150,11 +150,16 @@
 };
 
 &cpusec_cpuapp_ipc {
+	status = "okay";
 	mbox-names = "tx", "rx";
 	tx-region = <&cpuapp_cpusec_ipc_shm>;
 	rx-region = <&cpusec_cpuapp_ipc_shm>;
 };
 
+&cpusec_bellboard {
+	status = "okay";
+};
+
 ipc0: &cpuapp_cpurad_ipc {
 	status = "okay";
 	mbox-names = "rx", "tx";
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
index 049617e6dc6..8734ff9f745 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
@@ -43,6 +43,10 @@
 	status = "okay";
 };
 
+&cpurad_ram0x_region {
+	status = "okay";
+};
+
 &cpurad_bellboard {
 	status = "okay";
 	interrupts = <96 NRF_DEFAULT_IRQ_PRIORITY>;
@@ -60,11 +64,16 @@
 };
 
 &cpusec_cpurad_ipc {
+	status = "okay";
 	mbox-names = "tx", "rx";
 	tx-region = <&cpurad_cpusec_ipc_shm>;
 	rx-region = <&cpusec_cpurad_ipc_shm>;
 };
 
+&cpusec_bellboard {
+	status = "okay";
+};
+
 ipc0: &cpuapp_cpurad_ipc {
 	status = "okay";
 	mbox-names = "tx", "rx";

From e7245801bbc5419296a36b2c4e2e1a5b47e485e1 Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Thu, 21 Nov 2024 13:56:47 +0100
Subject: [PATCH 1015/2913] [nrf fromtree] boards: nordic: nrf54h20: Increase
 default MAX_THREAD_BYTES

The mechanism for communication between domains requires
extra threads. So change the default value MAX_THREAD_BYTES
to allow usage of more threads.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
(cherry picked from commit 8a190e82ba7e39871f1262f8aac6322caf6da72a)
---
 boards/nordic/nrf54h20dk/Kconfig.defconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/boards/nordic/nrf54h20dk/Kconfig.defconfig b/boards/nordic/nrf54h20dk/Kconfig.defconfig
index a2be74d3648..61b20723ab4 100644
--- a/boards/nordic/nrf54h20dk/Kconfig.defconfig
+++ b/boards/nordic/nrf54h20dk/Kconfig.defconfig
@@ -6,6 +6,9 @@ if BOARD_NRF54H20DK_NRF54H20_CPUAPP
 config BT_HCI_IPC
 	default y if BT
 
+config MAX_THREAD_BYTES
+	default 3 if USERSPACE
+
 endif # BOARD_NRF54H20DK_NRF54H20_CPUAPP
 
 if BOARD_NRF54H20DK_NRF54H20_CPURAD
@@ -13,6 +16,9 @@ if BOARD_NRF54H20DK_NRF54H20_CPURAD
 config BT_CTLR
 	default y if BT
 
+config MAX_THREAD_BYTES
+	default 3 if USERSPACE
+
 endif # BOARD_NRF54H20DK_NRF54H20_CPURAD
 
 if BOARD_NRF54H20DK_NRF54H20_CPUPPR

From be90907c2d724872de720ffdc665a4b24efde60f Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Mon, 11 Nov 2024 15:45:29 +0100
Subject: [PATCH 1016/2913] [nrf fromtree] tests: arm_thread_swap: Add overlay
 for nRF54H20

Disable the IPC communication between the domains
for the arm_thread_swap test since it is not needed
and it causes a flash oveflow for the no opmitization
test case.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
(cherry picked from commit 28bd478a0b709774534adbec8060097bd87cf28c)
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay            | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..f9615d1b35e
--- /dev/null
+++ b/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&cpusec_cpuapp_ipc {
+	status = "disabled";
+};
+
+&cpusec_bellboard {
+	status = "disabled";
+};

From 31f99478289e150018952b34d2889687ed94abbe Mon Sep 17 00:00:00 2001
From: Valerio Setti <vsetti@baylibre.com>
Date: Thu, 12 Dec 2024 12:49:42 +0100
Subject: [PATCH 1017/2913] [nrf fromtree] tests: tls_configurations: adjust
 Kconfig in overlay-ec

CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC is promptless so it cannot
be selected. Moreover it's also automatically enabled by
CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE in the same overlay file
so there would be no need to explicitly enable it.

As for the IMPORT, EXPORT, DERIVE they are needed for the TLS connection
to work properly. Previously it was working because at least IMPORT and
EXPORT are internally enabled by Mbed TLS at build time. So here we
are basically doing the same enablements with Kconfigs in clear.

Signed-off-by: Valerio Setti <vsetti@baylibre.com>
(cherry picked from commit ff8b970b33a2925d5bc0cae04db945d77803d683)
---
 tests/net/socket/tls_configurations/overlay-ec.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/net/socket/tls_configurations/overlay-ec.conf b/tests/net/socket/tls_configurations/overlay-ec.conf
index b53dc4bcb55..c109147eb8e 100644
--- a/tests/net/socket/tls_configurations/overlay-ec.conf
+++ b/tests/net/socket/tls_configurations/overlay-ec.conf
@@ -1,5 +1,7 @@
 CONFIG_PSA_WANT_ALG_ECDH=y
 CONFIG_PSA_WANT_ALG_ECDSA=y
-CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC=y
 CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE=y
+CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT=y
+CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT=y
+CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE=y
 CONFIG_PSA_WANT_ECC_SECP_R1_256=y

From 955e277828fb918bfb795bf4df7c9fd5fe12e1f1 Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Thu, 5 Sep 2024 10:41:36 +0200
Subject: [PATCH 1018/2913] [nrf noup] boards: nordic: Enable PSA RNG for
 nrf54h20

Noup since secdom is not available upstream and it is required
for PSA RNG.

This enables the PSA RNG as the default Zephyr entropy provider
for the nrf54h20dk cpuapp and cpurad targets.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 .../nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts  |  6 +++---
 .../nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts  | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 3a1c8abf0f5..920907f3c69 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -27,7 +27,7 @@
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,canbus = &can120;
-		zephyr,entropy = &prng;
+		zephyr,entropy = &psa_rng;
 	};
 
 	aliases {
@@ -109,8 +109,8 @@
 		};
 	};
 
-	prng: prng {
-		compatible = "nordic,entropy-prng";
+	psa_rng: psa-rng {
+		compatible = "zephyr,psa-crypto-rng";
 		status = "okay";
 	};
 };
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
index 8734ff9f745..f57b00fceda 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
@@ -27,16 +27,17 @@
 		zephyr,ieee802154 = &cpurad_ieee802154;
 		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
-		zephyr,entropy = &prng;
-	};
-	prng: prng {
-		compatible = "nordic,entropy-prng";
-		status = "okay";
+		zephyr,entropy = &psa_rng;
 	};
 	aliases {
 		ipc-to-cpusys = &cpurad_cpusys_ipc;
 		resetinfo = &cpurad_resetinfo;
 	};
+
+	psa_rng: psa-rng {
+		compatible = "zephyr,psa-crypto-rng";
+		status = "okay";
+	};
 };
 
 &cpuapp_cpurad_ram0x_region {

From 3e1567545f0ee163d6bca63e8eba866d9c285b1f Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Wed, 25 Sep 2024 14:32:43 +0200
Subject: [PATCH 1019/2913] [nrf noup] entropy: Add reqs for PSA RNG on
 nrf54h20

Noup since secdom is not available upstream and it is required
for PSA RNG.

This adds the Kconfig requirements for the PSA RNG service.

This affects the nrf54h20dk cpuapp and cpurad targets.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 drivers/entropy/Kconfig.psa_crypto | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/entropy/Kconfig.psa_crypto b/drivers/entropy/Kconfig.psa_crypto
index 18514a071d1..8a8cca6c56f 100644
--- a/drivers/entropy/Kconfig.psa_crypto
+++ b/drivers/entropy/Kconfig.psa_crypto
@@ -8,6 +8,7 @@ config ENTROPY_PSA_CRYPTO_RNG
 	depends on DT_HAS_ZEPHYR_PSA_CRYPTO_RNG_ENABLED
 	select ENTROPY_HAS_DRIVER
 	select PSA_WANT_GENERATE_RANDOM
+	select SSF_PSA_CRYPTO_SERVICE_ENABLED if (SOC_SERIES_NRF54HX && !RISCV_CORE_NORDIC_VPR)
 	default y
 	help
 	  Enable the PSA Crypto source Entropy driver.

From 8b779e600cf58fa471727238209b729fa113107e Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Thu, 26 Sep 2024 13:39:35 +0200
Subject: [PATCH 1020/2913] [nrf noup] soc: nordic: Disable DCACHE for nrf54h20

When the PSA crypto secure domain service
is enabled.

Noup since this service is not available
upstream.

This is temporary since we expect to add support for
data cache later.

This affects the nrf54h20dk cpuapp and cpurad targets.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 soc/nordic/nrf54h/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
index d54ef99da8e..dcbd980b64b 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -16,7 +16,7 @@ config SOC_NRF54H20_CPUAPP_COMMON
 	select CPU_CORTEX_M33
 	select CPU_HAS_ARM_MPU
 	select CPU_HAS_ARM_SAU
-	select CPU_HAS_DCACHE
+	select CPU_HAS_DCACHE if !SSF_PSA_CRYPTO_SERVICE_ENABLED
 	select CPU_HAS_ICACHE
 	select CPU_HAS_FPU
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
@@ -43,7 +43,7 @@ config SOC_NRF54H20_CPURAD_COMMON
 	select CPU_CORTEX_M33
 	select CPU_HAS_ARM_MPU
 	select CPU_HAS_ARM_SAU
-	select CPU_HAS_DCACHE
+	select CPU_HAS_DCACHE if !SSF_PSA_CRYPTO_SERVICE_ENABLED
 	select CPU_HAS_ICACHE
 	select CPU_HAS_FPU
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS

From 8e808e3fc23e96ae24c229f287262aafefe6cc4b Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Tue, 1 Oct 2024 13:17:13 +0200
Subject: [PATCH 1021/2913] [nrf noup] tests: Disable mbedtls legacy for 54H20

Disable the mbedtls legacy tests for the nRF54H20.
We now enable the PSA entropy driver for the nRF54H20
which is incompatible with the mbedtls legacy APIs.

Noup since we only enable the PSA entropy driver in
NCS and not upstream.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 tests/crypto/mbedtls/testcase.yaml     | 5 ++++-
 tests/crypto/mbedtls_psa/testcase.yaml | 3 ++-
 tests/crypto/secp256r1/testcase.yaml   | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/crypto/mbedtls/testcase.yaml b/tests/crypto/mbedtls/testcase.yaml
index 9b89364da93..8c4c49c2934 100644
--- a/tests/crypto/mbedtls/testcase.yaml
+++ b/tests/crypto/mbedtls/testcase.yaml
@@ -8,7 +8,10 @@ common:
   timeout: 400
 tests:
   crypto.mbedtls:
-    platform_exclude: m2gl025_miv
+    platform_exclude:
+      - m2gl025_miv
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpurad
     extra_configs:
       - CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0
       - arch:riscv64:CONFIG_ZTEST_STACK_SIZE=8192
diff --git a/tests/crypto/mbedtls_psa/testcase.yaml b/tests/crypto/mbedtls_psa/testcase.yaml
index 6b96e8ff5f6..55b2386b163 100644
--- a/tests/crypto/mbedtls_psa/testcase.yaml
+++ b/tests/crypto/mbedtls_psa/testcase.yaml
@@ -17,7 +17,8 @@
 #   latter case will allow to test
 #   CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG_ALLOW_NON_CSPRNG.
 common:
-  filter: not CONFIG_BUILD_WITH_TFM
+  filter: not CONFIG_BUILD_WITH_TFM and
+          not CONFIG_PSA_SSF_CRYPTO_CLIENT
   tags:
     - mbedtls
     - psa
diff --git a/tests/crypto/secp256r1/testcase.yaml b/tests/crypto/secp256r1/testcase.yaml
index 0e21e0d86b5..0063ccbbffd 100644
--- a/tests/crypto/secp256r1/testcase.yaml
+++ b/tests/crypto/secp256r1/testcase.yaml
@@ -3,7 +3,9 @@ common:
           CONFIG_CSPRNG_ENABLED and
           CONFIG_HARDWARE_DEVICE_CS_GENERATOR and
           not CONFIG_BUILD_WITH_TFM and
-          not (CONFIG_MBEDTLS and CONFIG_TINYCRYPT)
+          not (CONFIG_MBEDTLS and CONFIG_TINYCRYPT) and
+          not CONFIG_PSA_SSF_CRYPTO_CLIENT
+
   tags:
     - mbedtls
     - tinycrypt

From 47e589250c0f9128aa11f0c3d0a5f7e0d83fc2ba Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Tue, 7 Jan 2025 16:24:49 +0100
Subject: [PATCH 1022/2913] [nrf fromlist] tests: arm_irq_vector_table: Disable
 bellboard for nRF54/nRF92

This test uses the bellboard interrupts for the application
and the radio core builds on nRF54H20 and nRF9280.
Since it uses the bellboard interrupts it makes sense to ensure
that bellboard is disabled in device tree to avoid runtime issues.

This is preparation work, bellboard is planned to be enabled
by default later and this makes sure that the test will
continue to work.

Upstream PR #: 83657

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay       | 13 +++++++++++++
 .../boards/nrf54h20dk_nrf54h20_cpurad.overlay       | 13 +++++++++++++
 .../boards/nrf9280pdk_nrf9280_cpuapp.overlay        | 13 +++++++++++++
 .../boards/nrf9280pdk_nrf9280_cpurad.overlay        | 13 +++++++++++++
 4 files changed, 52 insertions(+)
 create mode 100644 tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.overlay
 create mode 100644 tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpuapp.overlay
 create mode 100644 tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpurad.overlay

diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..d1566b5aa63
--- /dev/null
+++ b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&cpusec_cpuapp_ipc {
+	status = "disabled";
+};
+
+&cpusec_bellboard{
+	status = "disabled";
+};
diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.overlay
new file mode 100644
index 00000000000..04c22168b6c
--- /dev/null
+++ b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&cpusec_cpurad_ipc {
+	status = "disabled";
+};
+
+&cpusec_bellboard{
+	status = "disabled";
+};
diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpuapp.overlay b/tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpuapp.overlay
new file mode 100644
index 00000000000..d1566b5aa63
--- /dev/null
+++ b/tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpuapp.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&cpusec_cpuapp_ipc {
+	status = "disabled";
+};
+
+&cpusec_bellboard{
+	status = "disabled";
+};
diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpurad.overlay b/tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpurad.overlay
new file mode 100644
index 00000000000..04c22168b6c
--- /dev/null
+++ b/tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpurad.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&cpusec_cpurad_ipc {
+	status = "disabled";
+};
+
+&cpusec_bellboard{
+	status = "disabled";
+};

From 06e58d0d38e304c38f78d9129afe4f3cf34ffce3 Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Mon, 13 Jan 2025 10:47:38 +0100
Subject: [PATCH 1023/2913] Revert "[nrf fromlist] tests: arm_irq_vector_table:
 Disable bellboard for nRF54/nRF92"

This reverts commit 47e589250c0f9128aa11f0c3d0a5f7e0d83fc2ba.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay       | 13 -------------
 .../boards/nrf54h20dk_nrf54h20_cpurad.overlay       | 13 -------------
 .../boards/nrf9280pdk_nrf9280_cpuapp.overlay        | 13 -------------
 .../boards/nrf9280pdk_nrf9280_cpurad.overlay        | 13 -------------
 4 files changed, 52 deletions(-)
 delete mode 100644 tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 delete mode 100644 tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.overlay
 delete mode 100644 tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpuapp.overlay
 delete mode 100644 tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpurad.overlay

diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index d1566b5aa63..00000000000
--- a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&cpusec_cpuapp_ipc {
-	status = "disabled";
-};
-
-&cpusec_bellboard{
-	status = "disabled";
-};
diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.overlay
deleted file mode 100644
index 04c22168b6c..00000000000
--- a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.overlay
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&cpusec_cpurad_ipc {
-	status = "disabled";
-};
-
-&cpusec_bellboard{
-	status = "disabled";
-};
diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpuapp.overlay b/tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpuapp.overlay
deleted file mode 100644
index d1566b5aa63..00000000000
--- a/tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpuapp.overlay
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&cpusec_cpuapp_ipc {
-	status = "disabled";
-};
-
-&cpusec_bellboard{
-	status = "disabled";
-};
diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpurad.overlay b/tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpurad.overlay
deleted file mode 100644
index 04c22168b6c..00000000000
--- a/tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpurad.overlay
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&cpusec_cpurad_ipc {
-	status = "disabled";
-};
-
-&cpusec_bellboard{
-	status = "disabled";
-};

From f0fa75cf01110c5b2501db32bcb5a2ee9ef1f68c Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Mon, 13 Jan 2025 10:48:06 +0100
Subject: [PATCH 1024/2913] Revert "[nrf noup] tests: Disable mbedtls legacy
 for 54H20"

This reverts commit 8e808e3fc23e96ae24c229f287262aafefe6cc4b.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 tests/crypto/mbedtls/testcase.yaml     | 5 +----
 tests/crypto/mbedtls_psa/testcase.yaml | 3 +--
 tests/crypto/secp256r1/testcase.yaml   | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/tests/crypto/mbedtls/testcase.yaml b/tests/crypto/mbedtls/testcase.yaml
index 8c4c49c2934..9b89364da93 100644
--- a/tests/crypto/mbedtls/testcase.yaml
+++ b/tests/crypto/mbedtls/testcase.yaml
@@ -8,10 +8,7 @@ common:
   timeout: 400
 tests:
   crypto.mbedtls:
-    platform_exclude:
-      - m2gl025_miv
-      - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54h20dk/nrf54h20/cpurad
+    platform_exclude: m2gl025_miv
     extra_configs:
       - CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0
       - arch:riscv64:CONFIG_ZTEST_STACK_SIZE=8192
diff --git a/tests/crypto/mbedtls_psa/testcase.yaml b/tests/crypto/mbedtls_psa/testcase.yaml
index 55b2386b163..6b96e8ff5f6 100644
--- a/tests/crypto/mbedtls_psa/testcase.yaml
+++ b/tests/crypto/mbedtls_psa/testcase.yaml
@@ -17,8 +17,7 @@
 #   latter case will allow to test
 #   CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG_ALLOW_NON_CSPRNG.
 common:
-  filter: not CONFIG_BUILD_WITH_TFM and
-          not CONFIG_PSA_SSF_CRYPTO_CLIENT
+  filter: not CONFIG_BUILD_WITH_TFM
   tags:
     - mbedtls
     - psa
diff --git a/tests/crypto/secp256r1/testcase.yaml b/tests/crypto/secp256r1/testcase.yaml
index 0063ccbbffd..0e21e0d86b5 100644
--- a/tests/crypto/secp256r1/testcase.yaml
+++ b/tests/crypto/secp256r1/testcase.yaml
@@ -3,9 +3,7 @@ common:
           CONFIG_CSPRNG_ENABLED and
           CONFIG_HARDWARE_DEVICE_CS_GENERATOR and
           not CONFIG_BUILD_WITH_TFM and
-          not (CONFIG_MBEDTLS and CONFIG_TINYCRYPT) and
-          not CONFIG_PSA_SSF_CRYPTO_CLIENT
-
+          not (CONFIG_MBEDTLS and CONFIG_TINYCRYPT)
   tags:
     - mbedtls
     - tinycrypt

From 50948e1b211cc46e8fcbcb5c0afceff751f622d5 Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Mon, 13 Jan 2025 10:48:08 +0100
Subject: [PATCH 1025/2913] Revert "[nrf noup] soc: nordic: Disable DCACHE for
 nrf54h20"

This reverts commit 8b779e600cf58fa471727238209b729fa113107e.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 soc/nordic/nrf54h/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
index dcbd980b64b..d54ef99da8e 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -16,7 +16,7 @@ config SOC_NRF54H20_CPUAPP_COMMON
 	select CPU_CORTEX_M33
 	select CPU_HAS_ARM_MPU
 	select CPU_HAS_ARM_SAU
-	select CPU_HAS_DCACHE if !SSF_PSA_CRYPTO_SERVICE_ENABLED
+	select CPU_HAS_DCACHE
 	select CPU_HAS_ICACHE
 	select CPU_HAS_FPU
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
@@ -43,7 +43,7 @@ config SOC_NRF54H20_CPURAD_COMMON
 	select CPU_CORTEX_M33
 	select CPU_HAS_ARM_MPU
 	select CPU_HAS_ARM_SAU
-	select CPU_HAS_DCACHE if !SSF_PSA_CRYPTO_SERVICE_ENABLED
+	select CPU_HAS_DCACHE
 	select CPU_HAS_ICACHE
 	select CPU_HAS_FPU
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS

From 5727c1c462a6dcf9e8caa1bd9a6182bce356d63e Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Mon, 13 Jan 2025 10:48:09 +0100
Subject: [PATCH 1026/2913] Revert "[nrf noup] entropy: Add reqs for PSA RNG on
 nrf54h20"

This reverts commit 3e1567545f0ee163d6bca63e8eba866d9c285b1f.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 drivers/entropy/Kconfig.psa_crypto | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/entropy/Kconfig.psa_crypto b/drivers/entropy/Kconfig.psa_crypto
index 8a8cca6c56f..18514a071d1 100644
--- a/drivers/entropy/Kconfig.psa_crypto
+++ b/drivers/entropy/Kconfig.psa_crypto
@@ -8,7 +8,6 @@ config ENTROPY_PSA_CRYPTO_RNG
 	depends on DT_HAS_ZEPHYR_PSA_CRYPTO_RNG_ENABLED
 	select ENTROPY_HAS_DRIVER
 	select PSA_WANT_GENERATE_RANDOM
-	select SSF_PSA_CRYPTO_SERVICE_ENABLED if (SOC_SERIES_NRF54HX && !RISCV_CORE_NORDIC_VPR)
 	default y
 	help
 	  Enable the PSA Crypto source Entropy driver.

From 192c05afbbd3ff056003aedcf9959f1c4f55e456 Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Mon, 13 Jan 2025 10:48:10 +0100
Subject: [PATCH 1027/2913] Revert "[nrf noup] boards: nordic: Enable PSA RNG
 for nrf54h20"

This reverts commit 955e277828fb918bfb795bf4df7c9fd5fe12e1f1.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 .../nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts  |  6 +++---
 .../nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts  | 11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 920907f3c69..3a1c8abf0f5 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -27,7 +27,7 @@
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,canbus = &can120;
-		zephyr,entropy = &psa_rng;
+		zephyr,entropy = &prng;
 	};
 
 	aliases {
@@ -109,8 +109,8 @@
 		};
 	};
 
-	psa_rng: psa-rng {
-		compatible = "zephyr,psa-crypto-rng";
+	prng: prng {
+		compatible = "nordic,entropy-prng";
 		status = "okay";
 	};
 };
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
index f57b00fceda..8734ff9f745 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
@@ -27,17 +27,16 @@
 		zephyr,ieee802154 = &cpurad_ieee802154;
 		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
-		zephyr,entropy = &psa_rng;
+		zephyr,entropy = &prng;
+	};
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
 	};
 	aliases {
 		ipc-to-cpusys = &cpurad_cpusys_ipc;
 		resetinfo = &cpurad_resetinfo;
 	};
-
-	psa_rng: psa-rng {
-		compatible = "zephyr,psa-crypto-rng";
-		status = "okay";
-	};
 };
 
 &cpuapp_cpurad_ram0x_region {

From e20a13d39e226226a8fad6b4a92bf741ceed3df8 Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Mon, 13 Jan 2025 10:48:11 +0100
Subject: [PATCH 1028/2913] Revert "[nrf fromtree] tests: tls_configurations:
 adjust Kconfig in overlay-ec"

This reverts commit 31f99478289e150018952b34d2889687ed94abbe.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 tests/net/socket/tls_configurations/overlay-ec.conf | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/net/socket/tls_configurations/overlay-ec.conf b/tests/net/socket/tls_configurations/overlay-ec.conf
index c109147eb8e..b53dc4bcb55 100644
--- a/tests/net/socket/tls_configurations/overlay-ec.conf
+++ b/tests/net/socket/tls_configurations/overlay-ec.conf
@@ -1,7 +1,5 @@
 CONFIG_PSA_WANT_ALG_ECDH=y
 CONFIG_PSA_WANT_ALG_ECDSA=y
+CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC=y
 CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE=y
-CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT=y
-CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT=y
-CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE=y
 CONFIG_PSA_WANT_ECC_SECP_R1_256=y

From cccae287a20ff3cd485a2cf094c6c7c10833a8f0 Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Mon, 13 Jan 2025 10:48:12 +0100
Subject: [PATCH 1029/2913] Revert "[nrf fromtree] tests: arm_thread_swap: Add
 overlay for nRF54H20"

This reverts commit be90907c2d724872de720ffdc665a4b24efde60f.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay            | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index f9615d1b35e..00000000000
--- a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-
-&cpusec_cpuapp_ipc {
-	status = "disabled";
-};
-
-&cpusec_bellboard {
-	status = "disabled";
-};

From dd83d99c0b37e6e13a72524b09e0fc6252f166b7 Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Mon, 13 Jan 2025 10:48:14 +0100
Subject: [PATCH 1030/2913] Revert "[nrf fromtree] boards: nordic: nrf54h20:
 Increase default MAX_THREAD_BYTES"

This reverts commit e7245801bbc5419296a36b2c4e2e1a5b47e485e1.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 boards/nordic/nrf54h20dk/Kconfig.defconfig | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/Kconfig.defconfig b/boards/nordic/nrf54h20dk/Kconfig.defconfig
index 61b20723ab4..a2be74d3648 100644
--- a/boards/nordic/nrf54h20dk/Kconfig.defconfig
+++ b/boards/nordic/nrf54h20dk/Kconfig.defconfig
@@ -6,9 +6,6 @@ if BOARD_NRF54H20DK_NRF54H20_CPUAPP
 config BT_HCI_IPC
 	default y if BT
 
-config MAX_THREAD_BYTES
-	default 3 if USERSPACE
-
 endif # BOARD_NRF54H20DK_NRF54H20_CPUAPP
 
 if BOARD_NRF54H20DK_NRF54H20_CPURAD
@@ -16,9 +13,6 @@ if BOARD_NRF54H20DK_NRF54H20_CPURAD
 config BT_CTLR
 	default y if BT
 
-config MAX_THREAD_BYTES
-	default 3 if USERSPACE
-
 endif # BOARD_NRF54H20DK_NRF54H20_CPURAD
 
 if BOARD_NRF54H20DK_NRF54H20_CPUPPR

From 68019e8f09b4d2319f661e5cac4a048b098524ac Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Mon, 13 Jan 2025 10:48:15 +0100
Subject: [PATCH 1031/2913] Revert "[nrf fromtree] boards: nordic: Enable IPC
 and bellboard on nRF54H20"

This reverts commit 248710e4825da1e6c7e0cbe31604e4e4a214d5b4.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts | 5 -----
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts | 9 ---------
 2 files changed, 14 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 3a1c8abf0f5..171732d81e6 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -150,16 +150,11 @@
 };
 
 &cpusec_cpuapp_ipc {
-	status = "okay";
 	mbox-names = "tx", "rx";
 	tx-region = <&cpuapp_cpusec_ipc_shm>;
 	rx-region = <&cpusec_cpuapp_ipc_shm>;
 };
 
-&cpusec_bellboard {
-	status = "okay";
-};
-
 ipc0: &cpuapp_cpurad_ipc {
 	status = "okay";
 	mbox-names = "rx", "tx";
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
index 8734ff9f745..049617e6dc6 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
@@ -43,10 +43,6 @@
 	status = "okay";
 };
 
-&cpurad_ram0x_region {
-	status = "okay";
-};
-
 &cpurad_bellboard {
 	status = "okay";
 	interrupts = <96 NRF_DEFAULT_IRQ_PRIORITY>;
@@ -64,16 +60,11 @@
 };
 
 &cpusec_cpurad_ipc {
-	status = "okay";
 	mbox-names = "tx", "rx";
 	tx-region = <&cpurad_cpusec_ipc_shm>;
 	rx-region = <&cpusec_cpurad_ipc_shm>;
 };
 
-&cpusec_bellboard {
-	status = "okay";
-};
-
 ipc0: &cpuapp_cpurad_ipc {
 	status = "okay";
 	mbox-names = "tx", "rx";

From 88bb00554e3a242edb71ab0cc80150206901efec Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Mon, 13 Jan 2025 10:48:16 +0100
Subject: [PATCH 1032/2913] Revert "[nrf fromtree] boards: nordic: Fix
 cpuapp_ram0x_region reg value."

This reverts commit be85a6490cdaa23cfb08e3c5d7abe48d868f5f8d.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index 165fa12ba80..8dc6ef757e9 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -27,7 +27,7 @@
 
 		cpuapp_ram0x_region: memory@2f011000 {
 			compatible = "nordic,owned-memory";
-			reg = <0x2f011000 DT_SIZE_K(260)>;
+			reg = <0x2f010000 DT_SIZE_K(260)>;
 			status = "disabled";
 			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
 			#address-cells = <1>;

From ed48684c29e81b7a0ea9af23d6f9eddb3a6d595a Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Mon, 13 Jan 2025 10:48:17 +0100
Subject: [PATCH 1033/2913] Revert "[nrf fromtree] boards: nordic: Rearrange
 ram0x regions."

This reverts commit 68fdeb17ed73f7989423189a215bab5ff6ca670a.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 .../nrf54h20dk_nrf54h20-memory_map.dtsi       | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index 8dc6ef757e9..f2937402554 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -7,44 +7,44 @@
 
 / {
 	reserved-memory {
-		cpurad_ram0x_region: memory@2f010000 {
+		cpuapp_ram0x_region: memory@2f010000 {
 			compatible = "nordic,owned-memory";
-			reg = <0x2f010000 DT_SIZE_K(4)>;
+			reg = <0x2f010000 DT_SIZE_K(260)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RWS>;
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0x0 0x2f010000 0x1000>;
+			ranges = <0x0 0x2f010000 0x41000>;
 
-			cpusec_cpurad_ipc_shm: memory@0 {
+			cpusec_cpuapp_ipc_shm: memory@0 {
 				reg = <0x0 DT_SIZE_K(2)>;
 			};
 
-			cpurad_cpusec_ipc_shm: memory@800 {
+			cpuapp_cpusec_ipc_shm: memory@800 {
 				reg = <0x800 DT_SIZE_K(2)>;
 			};
+
+			cpuapp_data: memory@1000 {
+				reg = <0x1000 DT_SIZE_K(256)>;
+			};
 		};
 
-		cpuapp_ram0x_region: memory@2f011000 {
+		cpurad_ram0x_region: memory@2f051000 {
 			compatible = "nordic,owned-memory";
-			reg = <0x2f010000 DT_SIZE_K(260)>;
+			reg = <0x2f051000 DT_SIZE_K(4)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
+			nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RWS>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0x0 0x2f011000 0x41000>;
+			ranges = <0x0 0x2f051000 0x1000>;
 
-			cpusec_cpuapp_ipc_shm: memory@0 {
+			cpusec_cpurad_ipc_shm: memory@0 {
 				reg = <0x0 DT_SIZE_K(2)>;
 			};
 
-			cpuapp_cpusec_ipc_shm: memory@800 {
+			cpurad_cpusec_ipc_shm: memory@800 {
 				reg = <0x800 DT_SIZE_K(2)>;
 			};
-
-			cpuapp_data: memory@1000 {
-				reg = <0x1000 DT_SIZE_K(256)>;
-			};
 		};
 
 		etr_buf_ram0x_region: memory@2f0be000 {

From 9176c8145176b2dbc390edbbec705451a94e2684 Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Mon, 13 Jan 2025 10:48:33 +0100
Subject: [PATCH 1034/2913] Revert "[nrf fromtree] tests: portability:
 cmsis_rtos_v2: do not disable 64-bit timeouts"

This reverts commit 89fa63dffce774b26e8ca647dc91e2ebff0fbead.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 tests/subsys/portability/cmsis_rtos_v2/prj.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/subsys/portability/cmsis_rtos_v2/prj.conf b/tests/subsys/portability/cmsis_rtos_v2/prj.conf
index d8e93b74785..282d8c4ebcd 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/prj.conf
+++ b/tests/subsys/portability/cmsis_rtos_v2/prj.conf
@@ -13,6 +13,7 @@ CONFIG_SCHED_SCALABLE=y
 CONFIG_CMSIS_V2_MEM_SLAB_MAX_DYNAMIC_SIZE=128
 CONFIG_CMSIS_V2_THREAD_MAX_COUNT=23
 CONFIG_CMSIS_V2_THREAD_DYNAMIC_MAX_COUNT=10
+CONFIG_TIMEOUT_64BIT=n
 CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE=1024
 CONFIG_CMSIS_V2_THREAD_DYNAMIC_STACK_SIZE=1024
 CONFIG_MP_MAX_NUM_CPUS=1

From 2c7f6efa7220ef2fbdd70e8597aedf1a07e86067 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Tue, 17 Dec 2024 14:49:35 +0100
Subject: [PATCH 1035/2913] [nrf fromlist] include: drivers: nrf_clock_control:
 make nrf_clock inclusion stricter

Some devices do not support nrf_clock HAL.

Upstream PR #: 83115

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
---
 include/zephyr/drivers/clock_control/nrf_clock_control.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/zephyr/drivers/clock_control/nrf_clock_control.h b/include/zephyr/drivers/clock_control/nrf_clock_control.h
index 8d9bcbe3441..f33ee5aa7c6 100644
--- a/include/zephyr/drivers/clock_control/nrf_clock_control.h
+++ b/include/zephyr/drivers/clock_control/nrf_clock_control.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_NRF_CLOCK_CONTROL_H_
 
 #include <zephyr/device.h>
-#ifdef NRF_CLOCK
+#if defined(NRF_CLOCK) && !defined(NRF_LFRC)
 #include <hal/nrf_clock.h>
 #endif
 #include <zephyr/sys/onoff.h>

From 2789f90da40af61d3e8cae281a0fcd378f56b141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Thu, 2 Jan 2025 12:20:51 +0100
Subject: [PATCH 1036/2913] Revert "[nrf fromlist] drivers: pwm: nrfx: add
 global hsfll request for fast PWM"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 99faf47f0f758f7921764fb2b11b44554910c7fa.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 drivers/pwm/pwm_nrfx.c | 76 +++---------------------------------------
 1 file changed, 4 insertions(+), 72 deletions(-)

diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index e8cc18a73fc..230a90d6cdf 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -13,9 +13,6 @@
 #include <zephyr/linker/devicetree_regions.h>
 #include <zephyr/cache.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
-#ifdef CONFIG_CLOCK_CONTROL
-#include <zephyr/drivers/clock_control/nrf_clock_control.h>
-#endif
 #ifdef CONFIG_SOC_NRF54H20_GPD
 #include <nrf/gpd.h>
 #endif
@@ -38,26 +35,6 @@ LOG_MODULE_REGISTER(pwm_nrfx, CONFIG_PWM_LOG_LEVEL);
 #define ANOMALY_109_EGU_IRQ_CONNECT(idx)
 #endif
 
-#define PWM(dev_idx) DT_NODELABEL(pwm##dev_idx)
-#define PWM_PROP(dev_idx, prop) DT_PROP(PWM(dev_idx), prop)
-#define PWM_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(PWM(idx), prop)
-
-#define PWM_NRFX_IS_FAST(unused, prefix, idx, _)					\
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(PWM(idx)),					\
-		(COND_CODE_1(PWM_HAS_PROP(idx, power_domains),				\
-		    (IS_EQ(DT_PHA(PWM(idx), power_domains, id), NRF_GPD_FAST_ACTIVE1)),	\
-		    (0))), (0))
-
-#if NRFX_FOREACH_PRESENT(PWM, PWM_NRFX_IS_FAST, (||), (0))
-#if CONFIG_CLOCK_CONTROL
-#define PWM_NRFX_USE_CLOCK_CONTROL 1
-#endif
-#define PWM_NRFX_INIT_PRIORITY 99
-#else
-#define PWM_NRFX_INIT_PRIORITY CONFIG_PWM_INIT_PRIORITY
-#endif
-
-
 #define PWM_NRFX_CH_POLARITY_MASK BIT(15)
 #define PWM_NRFX_CH_COMPARE_MASK  BIT_MASK(15)
 #define PWM_NRFX_CH_VALUE(compare_value, inverted) \
@@ -72,10 +49,6 @@ struct pwm_nrfx_config {
 #ifdef CONFIG_DCACHE
 	uint32_t mem_attr;
 #endif
-#ifdef PWM_NRFX_USE_CLOCK_CONTROL
-	const struct device *clk_dev;
-	struct nrf_clock_spec clk_spec;
-#endif
 };
 
 struct pwm_nrfx_data {
@@ -84,9 +57,6 @@ struct pwm_nrfx_data {
 	uint8_t  pwm_needed;
 	uint8_t  prescaler;
 	bool     stop_requested;
-#ifdef PWM_NRFX_USE_CLOCK_CONTROL
-	bool     clock_requested;
-#endif
 };
 /* Ensure the pwm_needed bit mask can accommodate all available channels. */
 #if (NRF_PWM_CHANNEL_COUNT > 8)
@@ -259,18 +229,6 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 		 * ensure it is stopped before starting the next playback.
 		 */
 		nrfx_pwm_stop(&config->pwm, false);
-#if PWM_NRFX_USE_CLOCK_CONTROL
-		if (data->clock_requested) {
-			int ret = nrf_clock_control_release(config->clk_dev, &config->clk_spec);
-
-			if (ret < 0) {
-				LOG_ERR("Global HSFLL release failed: %d", ret);
-				return ret;
-			}
-
-			data->clock_requested = false;
-		}
-#endif
 		data->stop_requested = true;
 	} else {
 		if (data->stop_requested) {
@@ -290,18 +248,6 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 		 * until another playback is requested (new values will be
 		 * loaded then) or the PWM peripheral is stopped.
 		 */
-#if PWM_NRFX_USE_CLOCK_CONTROL
-
-		int ret = nrf_clock_control_request_sync(config->clk_dev, &config->clk_spec,
-							 K_FOREVER);
-
-		if (ret < 0) {
-			LOG_ERR("Global HSFLL request failed: %d", ret);
-			return ret;
-		}
-
-		data->clock_requested = true;
-#endif
 		nrfx_pwm_simple_playback(&config->pwm, &config->seq, 1,
 					 NRFX_PWM_FLAG_NO_EVT_FINISHED);
 	}
@@ -360,14 +306,6 @@ static void pwm_suspend(const struct device *dev)
 	const struct pwm_nrfx_config *config = dev->config;
 
 	nrfx_pwm_stop(&config->pwm, false);
-#if PWM_NRFX_USE_CLOCK_CONTROL
-
-		int ret = nrf_clock_control_release(config->clk_dev, &config->clk_spec);
-
-		if (ret < 0) {
-			LOG_ERR("Global HSFLL release failed: %d", ret);
-		}
-#endif
 	while (!nrfx_pwm_stopped_check(&config->pwm)) {
 	}
 
@@ -413,6 +351,9 @@ static int pwm_nrfx_init(const struct device *dev)
 	return pm_device_driver_init(dev, pwm_nrfx_pm_action);
 }
 
+#define PWM(dev_idx) DT_NODELABEL(pwm##dev_idx)
+#define PWM_PROP(dev_idx, prop) DT_PROP(PWM(dev_idx), prop)
+#define PWM_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(PWM(idx), prop)
 #define PWM_MEM_REGION(idx)     DT_PHANDLE(PWM(idx), memory_regions)
 
 #define PWM_MEMORY_SECTION(idx)						      \
@@ -452,15 +393,6 @@ static int pwm_nrfx_init(const struct device *dev)
 			(16ul * 1000ul * 1000ul)),			      \
 		IF_ENABLED(CONFIG_DCACHE,				      \
 			(.mem_attr = PWM_GET_MEM_ATTR(idx),))		      \
-		IF_ENABLED(PWM_NRFX_USE_CLOCK_CONTROL,		      \
-			(.clk_dev = DEVICE_DT_GET(DT_CLOCKS_CTLR(PWM(idx))),  \
-			 .clk_spec = {					      \
-				.frequency =				      \
-					NRF_PERIPH_GET_FREQUENCY(PWM(idx)),   \
-				.accuracy = 0,				      \
-				.precision =				      \
-					NRF_CLOCK_CONTROL_PRECISION_DEFAULT,  \
-			 },))						      \
 	};								      \
 	static int pwm_nrfx_init##idx(const struct device *dev)		      \
 	{								      \
@@ -473,7 +405,7 @@ static int pwm_nrfx_init(const struct device *dev)
 			 pwm_nrfx_init##idx, PM_DEVICE_DT_GET(PWM(idx)),      \
 			 &pwm_nrfx_##idx##_data,			      \
 			 &pwm_nrfx_##idx##_config,			      \
-			 POST_KERNEL, PWM_NRFX_INIT_PRIORITY,		      \
+			 POST_KERNEL, CONFIG_PWM_INIT_PRIORITY,		      \
 			 &pwm_nrfx_drv_api_funcs)
 
 #define COND_PWM_NRFX_DEVICE(unused, prefix, i, _) \

From 3098bb289f1050f5984e9fefdb1d12ea450234a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Thu, 12 Dec 2024 12:04:44 +0100
Subject: [PATCH 1037/2913] [nrf fromlist] drivers: pwm: nrfx: add global hsfll
 request for fast PWM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added clock control api for global hsfll used in fast PWM120 driver.

Upstream PR #: 82133

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 drivers/pwm/pwm_nrfx.c | 93 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 85 insertions(+), 8 deletions(-)

diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index 230a90d6cdf..065784ed80f 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -13,6 +13,7 @@
 #include <zephyr/linker/devicetree_regions.h>
 #include <zephyr/cache.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #ifdef CONFIG_SOC_NRF54H20_GPD
 #include <nrf/gpd.h>
 #endif
@@ -35,6 +36,21 @@ LOG_MODULE_REGISTER(pwm_nrfx, CONFIG_PWM_LOG_LEVEL);
 #define ANOMALY_109_EGU_IRQ_CONNECT(idx)
 #endif
 
+#define PWM(dev_idx) DT_NODELABEL(pwm##dev_idx)
+#define PWM_PROP(dev_idx, prop) DT_PROP(PWM(dev_idx), prop)
+#define PWM_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(PWM(idx), prop)
+
+#define PWM_NRFX_IS_FAST(unused, prefix, idx, _)					\
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(PWM(idx)),					\
+		(COND_CODE_1(PWM_HAS_PROP(idx, power_domains),				\
+		    (IS_EQ(DT_PHA(PWM(idx), power_domains, id), NRF_GPD_FAST_ACTIVE1)),	\
+		    (0))), (0))
+
+#if (NRFX_FOREACH_PRESENT(PWM, PWM_NRFX_IS_FAST, (||), (0))) && \
+	CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
+#define PWM_NRFX_USE_CLOCK_CONTROL 1
+#endif
+
 #define PWM_NRFX_CH_POLARITY_MASK BIT(15)
 #define PWM_NRFX_CH_COMPARE_MASK  BIT_MASK(15)
 #define PWM_NRFX_CH_VALUE(compare_value, inverted) \
@@ -49,6 +65,10 @@ struct pwm_nrfx_config {
 #ifdef CONFIG_DCACHE
 	uint32_t mem_attr;
 #endif
+#ifdef PWM_NRFX_USE_CLOCK_CONTROL
+	const struct device *clk_dev;
+	struct nrf_clock_spec clk_spec;
+#endif
 };
 
 struct pwm_nrfx_data {
@@ -57,6 +77,9 @@ struct pwm_nrfx_data {
 	uint8_t  pwm_needed;
 	uint8_t  prescaler;
 	bool     stop_requested;
+#ifdef PWM_NRFX_USE_CLOCK_CONTROL
+	bool     clock_requested;
+#endif
 };
 /* Ensure the pwm_needed bit mask can accommodate all available channels. */
 #if (NRF_PWM_CHANNEL_COUNT > 8)
@@ -229,6 +252,18 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 		 * ensure it is stopped before starting the next playback.
 		 */
 		nrfx_pwm_stop(&config->pwm, false);
+#if PWM_NRFX_USE_CLOCK_CONTROL
+		if (data->clock_requested && config->clk_dev) {
+			int ret = nrf_clock_control_release(config->clk_dev, &config->clk_spec);
+
+			if (ret < 0) {
+				LOG_ERR("Global HSFLL release failed: %d", ret);
+				return ret;
+			}
+
+			data->clock_requested = false;
+		}
+#endif
 		data->stop_requested = true;
 	} else {
 		if (data->stop_requested) {
@@ -248,6 +283,20 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 		 * until another playback is requested (new values will be
 		 * loaded then) or the PWM peripheral is stopped.
 		 */
+#if PWM_NRFX_USE_CLOCK_CONTROL
+		if (!data->clock_requested && config->clk_dev) {
+			int ret = nrf_clock_control_request_sync(config->clk_dev,
+								 &config->clk_spec,
+								 K_FOREVER);
+
+			if (ret < 0) {
+				LOG_ERR("Global HSFLL request failed: %d", ret);
+				return ret;
+			}
+
+			data->clock_requested = true;
+		}
+#endif
 		nrfx_pwm_simple_playback(&config->pwm, &config->seq, 1,
 					 NRFX_PWM_FLAG_NO_EVT_FINISHED);
 	}
@@ -270,7 +319,7 @@ static const struct pwm_driver_api pwm_nrfx_drv_api_funcs = {
 	.get_cycles_per_sec = pwm_nrfx_get_cycles_per_sec,
 };
 
-static void pwm_resume(const struct device *dev)
+static int pwm_resume(const struct device *dev)
 {
 	const struct pwm_nrfx_config *config = dev->config;
 	uint8_t initially_inverted = 0;
@@ -299,13 +348,29 @@ static void pwm_resume(const struct device *dev)
 
 		seq_values_ptr_get(dev)[i] = PWM_NRFX_CH_VALUE(0, inverted);
 	}
+
+	return 0;
 }
 
-static void pwm_suspend(const struct device *dev)
+static int pwm_suspend(const struct device *dev)
 {
 	const struct pwm_nrfx_config *config = dev->config;
 
 	nrfx_pwm_stop(&config->pwm, false);
+#if PWM_NRFX_USE_CLOCK_CONTROL
+	struct pwm_nrfx_data *data = dev->data;
+
+	if (data->clock_requested) {
+		int ret = nrf_clock_control_release(config->clk_dev, &config->clk_spec);
+
+		if (ret < 0) {
+			LOG_ERR("Global HSFLL release failed: %d", ret);
+			return ret;
+		}
+
+		data->clock_requested = false;
+	}
+#endif
 	while (!nrfx_pwm_stopped_check(&config->pwm)) {
 	}
 
@@ -315,15 +380,17 @@ static void pwm_suspend(const struct device *dev)
 
 	memset(dev->data, 0, sizeof(struct pwm_nrfx_data));
 	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
+
+	return 0;
 }
 
 static int pwm_nrfx_pm_action(const struct device *dev,
 			      enum pm_device_action action)
 {
 	if (action == PM_DEVICE_ACTION_RESUME) {
-		pwm_resume(dev);
+		return pwm_resume(dev);
 	} else if (IS_ENABLED(CONFIG_PM_DEVICE) && (action == PM_DEVICE_ACTION_SUSPEND)) {
-		pwm_suspend(dev);
+		return pwm_suspend(dev);
 	} else {
 		return -ENOTSUP;
 	}
@@ -351,9 +418,6 @@ static int pwm_nrfx_init(const struct device *dev)
 	return pm_device_driver_init(dev, pwm_nrfx_pm_action);
 }
 
-#define PWM(dev_idx) DT_NODELABEL(pwm##dev_idx)
-#define PWM_PROP(dev_idx, prop) DT_PROP(PWM(dev_idx), prop)
-#define PWM_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(PWM(idx), prop)
 #define PWM_MEM_REGION(idx)     DT_PHANDLE(PWM(idx), memory_regions)
 
 #define PWM_MEMORY_SECTION(idx)						      \
@@ -366,6 +430,11 @@ static int pwm_nrfx_init(const struct device *dev)
 	COND_CODE_1(PWM_HAS_PROP(idx, memory_regions),			      \
 		(DT_PROP_OR(PWM_MEM_REGION(idx), zephyr_memory_attr, 0)), (0))
 
+#define PWM_INIT_PRIORITY(idx)								\
+	COND_CODE_1(PWM_NRFX_IS_FAST(_, /*empty*/, idx, _),				\
+		    (UTIL_INC(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_INIT_PRIORITY)),	\
+		    (CONFIG_PWM_INIT_PRIORITY))
+
 #define PWM_NRFX_DEVICE(idx)						      \
 	NRF_DT_CHECK_NODE_HAS_PINCTRL_SLEEP(PWM(idx));			      \
 	static struct pwm_nrfx_data pwm_nrfx_##idx##_data;		      \
@@ -393,6 +462,14 @@ static int pwm_nrfx_init(const struct device *dev)
 			(16ul * 1000ul * 1000ul)),			      \
 		IF_ENABLED(CONFIG_DCACHE,				      \
 			(.mem_attr = PWM_GET_MEM_ATTR(idx),))		      \
+		IF_ENABLED(PWM_NRFX_USE_CLOCK_CONTROL,			      \
+			(.clk_dev = PWM_NRFX_IS_FAST(_, /*empty*/, idx, _)    \
+				    ? DEVICE_DT_GET(DT_CLOCKS_CTLR(PWM(idx))) \
+				    : NULL,				      \
+			 .clk_spec = {					      \
+				.frequency =				      \
+					NRF_PERIPH_GET_FREQUENCY(PWM(idx)),   \
+			 },))						      \
 	};								      \
 	static int pwm_nrfx_init##idx(const struct device *dev)		      \
 	{								      \
@@ -405,7 +482,7 @@ static int pwm_nrfx_init(const struct device *dev)
 			 pwm_nrfx_init##idx, PM_DEVICE_DT_GET(PWM(idx)),      \
 			 &pwm_nrfx_##idx##_data,			      \
 			 &pwm_nrfx_##idx##_config,			      \
-			 POST_KERNEL, CONFIG_PWM_INIT_PRIORITY,		      \
+			 POST_KERNEL, PWM_INIT_PRIORITY(idx),		      \
 			 &pwm_nrfx_drv_api_funcs)
 
 #define COND_PWM_NRFX_DEVICE(unused, prefix, i, _) \

From fb23112160f8148d4729b3a262e6d532423db61c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fin=20Maa=C3=9F?= <f.maass@vogl-electronic.com>
Date: Wed, 27 Nov 2024 10:20:20 +0100
Subject: [PATCH 1038/2913] [nrf fromtree] dfu: boot: mcuboot: fix
 boot_is_img_confirmed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix image confirmed for Direct XIP.

Signed-off-by: Fin Maaß <f.maass@vogl-electronic.com>
(cherry picked from commit e3f935650b976f098d19ff304344e83103ad0491)
---
 subsys/dfu/boot/mcuboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/dfu/boot/mcuboot.c b/subsys/dfu/boot/mcuboot.c
index 4a66befaa91..6710a793e56 100644
--- a/subsys/dfu/boot/mcuboot.c
+++ b/subsys/dfu/boot/mcuboot.c
@@ -233,7 +233,7 @@ bool boot_is_img_confirmed(void)
 	const struct flash_area *fa;
 	int rc;
 
-	rc = flash_area_open(FLASH_AREA_IMAGE_PRIMARY, &fa);
+	rc = flash_area_open(ACTIVE_SLOT_FLASH_AREA_ID, &fa);
 	if (rc) {
 		return false;
 	}

From ffa5be0dbbfd941f2156fe6237bdc5bd58772836 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 17 Dec 2024 14:53:08 +0100
Subject: [PATCH 1039/2913] [nrf fromlist] tests: kernel: Fix for nRF54H20

Fix failing tests for nRF54H20 target.

Upstream PR #: 82252

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 tests/drivers/can/host/boards/nrf54h20dk_nrf54h20_cpuapp.conf    | 1 +
 .../dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpuapp.conf  | 1 +
 .../dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpurad.conf  | 1 +
 .../thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpuapp.conf  | 1 +
 .../thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpurad.conf  | 1 +
 5 files changed, 5 insertions(+)
 create mode 100644 tests/drivers/can/host/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpurad.conf
 create mode 100644 tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpurad.conf

diff --git a/tests/drivers/can/host/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/can/host/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/drivers/can/host/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpurad.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpurad.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n

From 16695a7cbb7466bebf2140c6981d055e415aac43 Mon Sep 17 00:00:00 2001
From: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
Date: Tue, 7 Jan 2025 14:45:35 +0100
Subject: [PATCH 1040/2913] [nrf fromtree] net: openthread: radio: Fix platform
 radio state machine

Fix platform radio state machine to be compliant with one shown in
OpenThread's `include/openthread/platform/radio.h`

Align twister tests to verify proper behavior of the
state machine.

Signed-off-by: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
(cherry picked from commit b46f72009a72b8ea7bcc141e1bd8b31eaf6303f7)
---
 modules/openthread/platform/radio.c  | 37 +++++++++++++++++-----------
 tests/subsys/openthread/radio_test.c | 12 ++++++++-
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/modules/openthread/platform/radio.c b/modules/openthread/platform/radio.c
index 73f6f4dc9cc..2ce7dd81d0d 100644
--- a/modules/openthread/platform/radio.c
+++ b/modules/openthread/platform/radio.c
@@ -742,19 +742,25 @@ bool otPlatRadioIsEnabled(otInstance *aInstance)
 
 otError otPlatRadioEnable(otInstance *aInstance)
 {
-	if (!otPlatRadioIsEnabled(aInstance)) {
-		sState = OT_RADIO_STATE_SLEEP;
+	ARG_UNUSED(aInstance);
+
+	if (sState != OT_RADIO_STATE_DISABLED && sState != OT_RADIO_STATE_SLEEP) {
+		return OT_ERROR_INVALID_STATE;
 	}
 
+	sState = OT_RADIO_STATE_SLEEP;
 	return OT_ERROR_NONE;
 }
 
 otError otPlatRadioDisable(otInstance *aInstance)
 {
-	if (otPlatRadioIsEnabled(aInstance)) {
-		sState = OT_RADIO_STATE_DISABLED;
+	ARG_UNUSED(aInstance);
+
+	if (sState != OT_RADIO_STATE_DISABLED && sState != OT_RADIO_STATE_SLEEP) {
+		return OT_ERROR_INVALID_STATE;
 	}
 
+	sState = OT_RADIO_STATE_DISABLED;
 	return OT_ERROR_NONE;
 }
 
@@ -762,23 +768,24 @@ otError otPlatRadioSleep(otInstance *aInstance)
 {
 	ARG_UNUSED(aInstance);
 
-	otError error = OT_ERROR_INVALID_STATE;
-
-	if (sState == OT_RADIO_STATE_SLEEP ||
-	    sState == OT_RADIO_STATE_RECEIVE ||
-	    sState == OT_RADIO_STATE_TRANSMIT) {
-		error = OT_ERROR_NONE;
-		radio_api->stop(radio_dev);
-		sState = OT_RADIO_STATE_SLEEP;
+	if (sState != OT_RADIO_STATE_SLEEP && sState != OT_RADIO_STATE_RECEIVE) {
+		return OT_ERROR_INVALID_STATE;
 	}
 
-	return error;
+	radio_api->stop(radio_dev);
+	sState = OT_RADIO_STATE_SLEEP;
+
+	return OT_ERROR_NONE;
 }
 
 otError otPlatRadioReceive(otInstance *aInstance, uint8_t aChannel)
 {
 	ARG_UNUSED(aInstance);
 
+	if (sState == OT_RADIO_STATE_DISABLED) {
+		return OT_ERROR_INVALID_STATE;
+	}
+
 	channel = aChannel;
 
 	radio_api->set_channel(radio_dev, aChannel);
@@ -883,7 +890,9 @@ otError otPlatRadioTransmit(otInstance *aInstance, otRadioFrame *aPacket)
 
 	radio_caps = radio_api->get_capabilities(radio_dev);
 
-	if ((sState == OT_RADIO_STATE_RECEIVE) || (radio_caps & IEEE802154_HW_SLEEP_TO_TX)) {
+	if (sState == OT_RADIO_STATE_RECEIVE ||
+	    (sState == OT_RADIO_STATE_SLEEP &&
+	     radio_caps & IEEE802154_HW_SLEEP_TO_TX)) {
 		if (run_tx_task(aInstance) == 0) {
 			error = OT_ERROR_NONE;
 		}
diff --git a/tests/subsys/openthread/radio_test.c b/tests/subsys/openthread/radio_test.c
index 8c7a9fcb79e..6e407cab9c6 100644
--- a/tests/subsys/openthread/radio_test.c
+++ b/tests/subsys/openthread/radio_test.c
@@ -625,6 +625,9 @@ ZTEST(openthread_radio, test_radio_state_test)
 
 	zassert_equal(otPlatRadioSetTransmitPower(ot, power), OT_ERROR_NONE,
 		      "Failed to set TX power.");
+
+	zassert_equal(otPlatRadioSleep(ot), OT_ERROR_NONE, "Failed to switch to sleep mode.");
+
 	zassert_equal(otPlatRadioDisable(ot), OT_ERROR_NONE, "Failed to disable radio.");
 
 	zassert_false(otPlatRadioIsEnabled(ot), "Radio reports as enabled.");
@@ -632,6 +635,9 @@ ZTEST(openthread_radio, test_radio_state_test)
 	zassert_equal(otPlatRadioSleep(ot), OT_ERROR_INVALID_STATE,
 		      "Changed to sleep regardless being disabled.");
 
+	zassert_equal(otPlatRadioReceive(ot, channel), OT_ERROR_INVALID_STATE,
+		      "Changed to receive regardless being disabled.");
+
 	zassert_equal(otPlatRadioEnable(ot), OT_ERROR_NONE, "Enabling radio failed.");
 
 	zassert_true(otPlatRadioIsEnabled(ot), "Radio reports disabled.");
@@ -644,6 +650,9 @@ ZTEST(openthread_radio, test_radio_state_test)
 	zassert_equal(otPlatRadioReceive(ot, channel), OT_ERROR_NONE, "Failed to receive.");
 	zassert_equal(platformRadioChannelGet(ot), channel, "Channel number not remembered.");
 
+	zassert_equal(otPlatRadioDisable(ot), OT_ERROR_INVALID_STATE,
+		      "Changed to disabled regardless being in receive state.");
+
 	zassert_true(otPlatRadioIsEnabled(ot), "Radio reports as disabled.");
 	zassert_equal(1, set_channel_mock_fake.call_count);
 	zassert_equal(channel, set_channel_mock_fake.arg1_val);
@@ -651,7 +660,7 @@ ZTEST(openthread_radio, test_radio_state_test)
 	zassert_equal(power, set_txpower_mock_fake.arg1_val);
 	zassert_equal(1, start_mock_fake.call_count);
 	zassert_equal_ptr(radio, start_mock_fake.arg0_val, NULL);
-	zassert_equal(1, stop_mock_fake.call_count);
+	zassert_equal(2, stop_mock_fake.call_count);
 	zassert_equal_ptr(radio, stop_mock_fake.arg0_val, NULL);
 }
 
@@ -814,6 +823,7 @@ ZTEST(openthread_radio, test_net_pkt_transmit)
 		      "Failed to set TX power.");
 
 	set_channel_mock_fake.return_val = 0;
+	zassert_equal(otPlatRadioEnable(ot), OT_ERROR_NONE, "Failed to enable.");
 	zassert_equal(otPlatRadioReceive(ot, channel), OT_ERROR_NONE, "Failed to receive.");
 	zassert_equal(1, set_channel_mock_fake.call_count);
 	zassert_equal(channel, set_channel_mock_fake.arg1_val);

From 3aabd42ffa9db5ebd0b1b7f7092b15de02cfb5e2 Mon Sep 17 00:00:00 2001
From: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
Date: Tue, 7 Jan 2025 14:46:13 +0100
Subject: [PATCH 1041/2913] [nrf fromtree] net: openthread: radio: Add setting
 channel in diag mode

Add possibility to set channel in diag mode by implementing
`platformRadioChannelSet` API.

Signed-off-by: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
(cherry picked from commit 712da726be9aaec7a1569b5e92dc4bdb7f756ac9)
---
 modules/openthread/platform/diag.c            |  2 +-
 modules/openthread/platform/platform-zephyr.h | 10 ++++++++++
 modules/openthread/platform/radio.c           |  7 +++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/modules/openthread/platform/diag.c b/modules/openthread/platform/diag.c
index edf8ad09dd5..23f82985812 100644
--- a/modules/openthread/platform/diag.c
+++ b/modules/openthread/platform/diag.c
@@ -104,8 +104,8 @@ bool otPlatDiagModeGet(void)
 
 void otPlatDiagChannelSet(uint8_t aChannel)
 {
-	ARG_UNUSED(aChannel);
 	sChannel = aChannel;
+	platformRadioChannelSet(aChannel);
 }
 
 void otPlatDiagTxPowerSet(int8_t aTxPower)
diff --git a/modules/openthread/platform/platform-zephyr.h b/modules/openthread/platform/platform-zephyr.h
index ca25fedf2b1..d6dd26adea0 100644
--- a/modules/openthread/platform/platform-zephyr.h
+++ b/modules/openthread/platform/platform-zephyr.h
@@ -70,6 +70,16 @@ void platformUartPanic(void);
  */
 uint16_t platformRadioChannelGet(otInstance *aInstance);
 
+#if defined(CONFIG_OPENTHREAD_DIAG)
+/**
+ * Set channel on radio driver.
+ *
+ * @param[in]  aChannel  The channel that the radio driver should use for operation.
+ *
+ */
+void platformRadioChannelSet(uint8_t aChannel);
+#endif /* CONFIG_OPENTHREAD_DIAG */
+
 #if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 /**
  * Start/stop continuous carrier wave transmission.
diff --git a/modules/openthread/platform/radio.c b/modules/openthread/platform/radio.c
index 2ce7dd81d0d..97c6e3a1d12 100644
--- a/modules/openthread/platform/radio.c
+++ b/modules/openthread/platform/radio.c
@@ -708,6 +708,13 @@ uint16_t platformRadioChannelGet(otInstance *aInstance)
 	return channel;
 }
 
+#if defined(CONFIG_OPENTHREAD_DIAG)
+void platformRadioChannelSet(uint8_t aChannel)
+{
+	channel = aChannel;
+}
+#endif
+
 void otPlatRadioSetPanId(otInstance *aInstance, uint16_t aPanId)
 {
 	ARG_UNUSED(aInstance);

From 52a1ceee359c93ecf0cfeee835b60e7b4c8c78a5 Mon Sep 17 00:00:00 2001
From: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
Date: Fri, 10 Jan 2025 08:47:20 +0100
Subject: [PATCH 1042/2913] [nrf fromtree] net: openthread: cleanup diag
 commands

After https://github.com/openthread/openthread/pull/11055,
platform is not required to check diagnostics mode while
processing commands.

Signed-off-by: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
(cherry picked from commit 74bbbdccf874afd4b9f2974e0e1a62378aee8719)
---
 modules/openthread/platform/diag.c | 16 ++++------------
 west.yml                           |  2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/modules/openthread/platform/diag.c b/modules/openthread/platform/diag.c
index 23f82985812..79f4e38984a 100644
--- a/modules/openthread/platform/diag.c
+++ b/modules/openthread/platform/diag.c
@@ -125,8 +125,8 @@ void otPlatDiagRadioReceived(otInstance *aInstance,
 #if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 otError otPlatDiagRadioTransmitCarrier(otInstance *aInstance, bool aEnable)
 {
-	if (!otPlatDiagModeGet() || (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE &&
-				     sTransmitMode != DIAG_TRANSMIT_MODE_CARRIER)) {
+	if (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE &&
+	    sTransmitMode != DIAG_TRANSMIT_MODE_CARRIER) {
 		return OT_ERROR_INVALID_STATE;
 	}
 
@@ -175,10 +175,6 @@ static otError gpio_get_spec(uint32_t gpio_idx, const struct gpio_dt_spec **spec
 
 	*spec = &gpio_spec[gpio_idx];
 
-	if (!otPlatDiagModeGet()) {
-		return OT_ERROR_INVALID_STATE;
-	}
-
 	if (!gpio_is_ready_dt(*spec)) {
 		return OT_ERROR_INVALID_ARGS;
 	}
@@ -326,8 +322,8 @@ static otError startModCarrier(otInstance *aInstance, uint8_t aArgsLength, char
 		return OT_ERROR_INVALID_ARGS;
 	}
 
-	if (!otPlatDiagModeGet() || (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE &&
-				     sTransmitMode != DIAG_TRANSMIT_MODE_MODCARRIER)) {
+	if (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE &&
+	    sTransmitMode != DIAG_TRANSMIT_MODE_MODCARRIER) {
 		return OT_ERROR_INVALID_STATE;
 	}
 
@@ -396,10 +392,6 @@ static otError processTransmit(otInstance *aInstance, uint8_t aArgsLength, char
 	long value;
 	uint32_t now;
 
-	if (!otPlatDiagModeGet()) {
-		return OT_ERROR_INVALID_STATE;
-	}
-
 	if (aArgsLength == 0) {
 		diag_output("transmit will send %" PRId32 " diagnostic messages with %" PRIu32
 			    " ms interval\r\n",
diff --git a/west.yml b/west.yml
index b99c5d1212d..6d1ad7df18c 100644
--- a/west.yml
+++ b/west.yml
@@ -309,7 +309,7 @@ manifest:
       revision: b735edbc739ad59156eb55bb8ce2583d74537719
       path: modules/lib/open-amp
     - name: openthread
-      revision: 2aeb8b833ba760ec29d5f340dd1ce7bcb61c5d56
+      revision: 3ae741f95e7dfb391dec35c48742862049eb62e8
       path: modules/lib/openthread
     - name: percepio
       path: modules/debug/percepio

From b41a53e5f408d98aa855ce3ffc5f65d14e5ec95c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Tue, 14 Jan 2025 13:56:19 +0100
Subject: [PATCH 1043/2913] [nrf fromtree] samples: boards: coresight_stm:
 pytest: Shorten long lines
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Simplify string building and reduce line length.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 9ca1b0ffe7f0bf61bc697b4cd2d6b1e713aafb62)
---
 samples/boards/nordic/coresight_stm/pytest/test_stm.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/boards/nordic/coresight_stm/pytest/test_stm.py b/samples/boards/nordic/coresight_stm/pytest/test_stm.py
index 2187805f15f..fb2203e809e 100644
--- a/samples/boards/nordic/coresight_stm/pytest/test_stm.py
+++ b/samples/boards/nordic/coresight_stm/pytest/test_stm.py
@@ -122,11 +122,11 @@ def _nrfutil_dictionary_from_serial(
     BUILD_DIR = str(dut.device_config.build_dir)
     logger.debug(f"{BUILD_DIR=}")
     config_str = f"{STM_M_ID['app']}:{BUILD_DIR}/coresight_stm/zephyr/log_dictionary.json"
-    config_str = config_str + f",{STM_M_ID['rad']}:{BUILD_DIR}/remote_rad/zephyr/log_dictionary.json"
+    config_str += f",{STM_M_ID['rad']}:{BUILD_DIR}/remote_rad/zephyr/log_dictionary.json"
     if SB_CONFIG_APP_CPUPPR_RUN:
-        config_str = config_str + f",{STM_M_ID['ppr']}:{BUILD_DIR}/remote_ppr/zephyr/log_dictionary.json"
+        config_str += f",{STM_M_ID['ppr']}:{BUILD_DIR}/remote_ppr/zephyr/log_dictionary.json"
     if SB_CONFIG_APP_CPUFLPR_RUN:
-        config_str = config_str + f",{STM_M_ID['flpr']}:{BUILD_DIR}/remote_flpr/zephyr/log_dictionary.json"
+        config_str += f",{STM_M_ID['flpr']}:{BUILD_DIR}/remote_flpr/zephyr/log_dictionary.json"
     logger.debug(f"{config_str=}")
 
     cmd = (

From 5f2a1de5f14a08689b5882e4b61d304b336add87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Mon, 13 Jan 2025 14:33:30 +0100
Subject: [PATCH 1044/2913] [nrf fromtree] samples: boards: nordic:
 coresight_stm: Fix nrfutil trace command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Latest version of nrfutil trace doesn't support setting
uart baudrate.
Remove --baudrate {baudrate_val} from command that executes nrfutil.

Also, combine pytest script for:
- samples.boards.nordic.coresight_stm,
- tests.boards.nrf.coresight_stm,
to minimize code duplication (fix compliance check R0801).

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 153f5b63820ad2ec96c31ae0f868323a2c585998)
---
 .../nordic/coresight_stm/pytest/test_stm.py   | 296 +++++++++++++--
 .../boards/nordic/coresight_stm/sample.yaml   |   4 +-
 .../nrf/coresight_stm/pytest/test_stm.py      | 347 ------------------
 tests/boards/nrf/coresight_stm/testcase.yaml  |   4 +-
 4 files changed, 273 insertions(+), 378 deletions(-)
 delete mode 100644 tests/boards/nrf/coresight_stm/pytest/test_stm.py

diff --git a/samples/boards/nordic/coresight_stm/pytest/test_stm.py b/samples/boards/nordic/coresight_stm/pytest/test_stm.py
index fb2203e809e..4af24fbfa3c 100644
--- a/samples/boards/nordic/coresight_stm/pytest/test_stm.py
+++ b/samples/boards/nordic/coresight_stm/pytest/test_stm.py
@@ -7,6 +7,7 @@
 import logging
 import re
 import subprocess
+from dataclasses import dataclass
 from pathlib import Path
 from time import sleep
 
@@ -18,7 +19,8 @@
 SB_CONFIG_APP_CPUPPR_RUN = None
 SB_CONFIG_APP_CPUFLPR_RUN = None
 
-# https://github.com/zephyrproject-rtos/zephyr/blob/main/drivers/misc/coresight/nrf_etr.c#L102
+# See definition of stm_m_id[] and stm_m_name[] in
+# https://github.com/zephyrproject-rtos/zephyr/blob/main/drivers/misc/coresight/nrf_etr.c
 STM_M_ID = {
     "sec": 33,
     "app": 34,
@@ -31,7 +33,19 @@
 }
 
 
-def _analyse_autoconf(filepath: str) -> None:
+@dataclass
+class STMLimits:
+    log_0_arg: float | None
+    log_1_arg: float | None
+    log_2_arg: float | None
+    log_3_arg: float | None
+    log_str: float | None
+    tracepoint: float | None
+    tracepoint_d32: float | None
+    tolerance: float | None
+
+
+def analyse_autoconf(filepath: str) -> None:
     global SB_CONFIG_APP_CPUPPR_RUN
     global SB_CONFIG_APP_CPUFLPR_RUN
 
@@ -50,7 +64,7 @@ def _analyse_autoconf(filepath: str) -> None:
     logger.debug(f"{SB_CONFIG_APP_CPUFLPR_RUN=}")
 
 
-def _check_benchmark_results(output: str, core: str) -> None:
+def check_console_output(output: str, core: str) -> None:
     """
     Use regular expressions to parse 'output' string.
     Search for benchmark results related to 'core' coprocessor.
@@ -92,6 +106,55 @@ def _check_benchmark_results(output: str, core: str) -> None:
     assert latency_tracepoint_d32_str is not None, "Timing for tracepoint_d32 NOT found"
 
 
+def check_benchmark_results(output: str, core: str, constraints: STMLimits) -> None:
+    """
+    Use regular expressions to parse 'output' string.
+    Search for benchmark results related to 'core' coprocessor.
+    Check that benchamrk results are lower than limits provided in 'constraints'.
+    """
+
+    cfg = {
+        "log message with 0 arguments": {
+            "regex": rf"{core}: Timing for log message with 0 arguments: (.+)us",
+            "expected": constraints.log_0_arg,
+        },
+        "log message with 1 argument": {
+            "regex": rf"{core}: Timing for log message with 1 argument: (.+)us",
+            "expected": constraints.log_1_arg,
+        },
+        "log message with 2 arguments": {
+            "regex": rf"{core}: Timing for log message with 2 arguments: (.+)us",
+            "expected": constraints.log_2_arg,
+        },
+        "log message with 3 arguments": {
+            "regex": rf"{core}: Timing for log message with 3 arguments: (.+)us",
+            "expected": constraints.log_3_arg,
+        },
+        "log message with string": {
+            "regex": rf"{core}: Timing for log_message with string: (.+)us",
+            "expected": constraints.log_str,
+        },
+        "tracepoint": {
+            "regex": rf"{core}: Timing for tracepoint: (.+)us",
+            "expected": constraints.tracepoint,
+        },
+        "tracepoint_d32": {
+            "regex": rf"{core}: Timing for tracepoint_d32: (.+)us",
+            "expected": constraints.tracepoint_d32,
+        },
+    }
+
+    for check in cfg:
+        observed_str = re.search(cfg[check]["regex"], output).group(1)
+        assert observed_str is not None, f"Timing for {check} NOT found"
+        # check value
+        observed = float(observed_str)
+        threshold = cfg[check]["expected"] * (1 + constraints.tolerance)
+        assert (
+            observed < threshold
+        ), f"{core}: Timing for {check} - {observed} us exceeds {threshold} us"
+
+
 # nrfutil starts children processes
 # when subprocess.terminate(nrfutil_process) is executed, only the parent terminates
 # this blocks serial port for other uses
@@ -104,19 +167,21 @@ def _kill(proc):
         logger.exception(f'Could not kill nrfutil - {e}')
 
 
-def _nrfutil_dictionary_from_serial(
+def nrfutil_dictionary_from_serial(
     dut: DeviceAdapter,
     decoded_file_name: str = "output.txt",
     collect_time: float = 60.0,
 ) -> None:
     UART_PATH = dut.device_config.serial
-    UART_BAUDRATE = dut.device_config.baud
     dut.close()
 
     logger.debug(f"Using serial: {UART_PATH}")
 
-    if Path(f"{decoded_file_name}").exists():
-        logger.warning("Output file already exists!")
+    try:
+        Path(f"{decoded_file_name}").unlink()
+        logger.info("Old output file was deleted")
+    except FileNotFoundError:
+        pass
 
     # prepare database config string
     BUILD_DIR = str(dut.device_config.build_dir)
@@ -132,7 +197,7 @@ def _nrfutil_dictionary_from_serial(
     cmd = (
         "nrfutil trace stm --database-config "
         f"{config_str} "
-        f"--input-serialport {UART_PATH} --baudrate {UART_BAUDRATE} "
+        f"--input-serialport {UART_PATH} "
         f"--output-ascii {decoded_file_name}"
     )
     try:
@@ -149,11 +214,11 @@ def _nrfutil_dictionary_from_serial(
         _kill(proc)
 
 
-def test_STM_decoded(dut: DeviceAdapter):
+def test_sample_STM_decoded(dut: DeviceAdapter):
     """
-    Run sample.boards.nrf.coresight_stm from samples/boards/nrf/coresight_stm sample.
-    Both Application and Radio cores use STM for logging.
-    STM proxy (Application core) decodes logs from all domains.
+    Run sample.boards.nrf.coresight_stm from samples/boards/nordic/coresight_stm sample.
+    Application, Radio, PPR and FLPR cores use STM for logging.
+    STM proxy (Application core) decodes logs from all cores.
     After reset, coprocessors execute code in expected way and Application core
     outputs STM traces on UART port.
     """
@@ -162,45 +227,126 @@ def test_STM_decoded(dut: DeviceAdapter):
 
     # nrf54h20 prints immediately after it is flashed.
     # Wait a bit to skipp logs from previous test.
-    sleep(4)
+    sleep(5)
 
     # Get output from serial port
     output = "\n".join(dut.readlines())
 
     # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
-    _analyse_autoconf(autoconf_file)
+    analyse_autoconf(autoconf_file)
 
     # check that LOGs from Application core are present
-    _check_benchmark_results(
+    check_console_output(
         output=output,
         core='app',
     )
 
     # check that LOGs from Radio core are present
-    _check_benchmark_results(
+    check_console_output(
         output=output,
         core='rad',
     )
 
     if SB_CONFIG_APP_CPUPPR_RUN:
         # check that LOGs from PPR core are present
-        _check_benchmark_results(
+        check_console_output(
             output=output,
             core='ppr',
         )
 
     if SB_CONFIG_APP_CPUFLPR_RUN:
         # check that LOGs from FLPR core are present
-        _check_benchmark_results(
+        check_console_output(
             output=output,
             core='flpr',
         )
 
 
-def test_STM_dictionary_mode(dut: DeviceAdapter):
+def test_STM_decoded(dut: DeviceAdapter):
+    """
+    Run boards.nrf.coresight_stm from tests/boards/nrf/coresight_stm test suite.
+    Application, Radio, PPR and FLPR cores use STM for logging.
+    STM proxy (Application core) decodes logs from all cores.
+    After reset, coprocessors execute code in expected way and Application core
+    outputs STM traces on UART port.
+    """
+    BUILD_DIR = str(dut.device_config.build_dir)
+    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
+
+    app_constraints = STMLimits(
+        # all values in us
+        log_0_arg=1.8,
+        log_1_arg=2.1,
+        log_2_arg=2.0,
+        log_3_arg=2.1,
+        log_str=4.5,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,  # 50 %
+    )
+    rad_constraints = STMLimits(
+        # all values in us
+        log_0_arg=4.6,
+        log_1_arg=5.0,
+        log_2_arg=5.2,
+        log_3_arg=5.6,
+        log_str=6.3,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,
+    )
+    ppr_constraints = STMLimits(
+        # all values in us
+        log_0_arg=25.7,
+        log_1_arg=27.1,
+        log_2_arg=27.3,
+        log_3_arg=30.4,
+        log_str=65.7,
+        tracepoint=0.55,
+        tracepoint_d32=0.25,
+        tolerance=0.5,
+    )
+    flpr_constraints = STMLimits(
+        # all values in us
+        log_0_arg=1.3,
+        log_1_arg=1.6,
+        log_2_arg=1.6,
+        log_3_arg=1.7,
+        log_str=3.0,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,
+    )
+
+    # nrf54h20 prints immediately after it is flashed.
+    # Wait a bit to skipp logs from previous test.
+    sleep(5)
+
+    # Get output from serial port
+    output = "\n".join(dut.readlines())
+
+    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
+    analyse_autoconf(autoconf_file)
+
+    # check results on Application core
+    check_benchmark_results(output=output, core='app', constraints=app_constraints)
+
+    # check results on Radio core
+    check_benchmark_results(output=output, core='rad', constraints=rad_constraints)
+
+    if SB_CONFIG_APP_CPUPPR_RUN:
+        # check results on PPR core
+        check_benchmark_results(output=output, core='ppr', constraints=ppr_constraints)
+
+    if SB_CONFIG_APP_CPUFLPR_RUN:
+        # check results on FLPR core
+        check_benchmark_results(output=output, core='flpr', constraints=flpr_constraints)
+
+
+def test_sample_STM_dictionary_mode(dut: DeviceAdapter):
     """
-    Run sample.boards.nrf.coresight_stm.dict from samples/boards/nrf/coresight_stm sample.
-    Both Application and Radio cores use STM for logging.
+    Run sample.boards.nrf.coresight_stm.dict from samples/boards/nordic/coresight_stm sample.
+    Application, Radio, PPR and FLPR cores use STM for logging.
     STM proxy (Application core) prints on serial port raw logs from all domains.
     Nrfutil trace is used to decode STM logs.
     After reset, coprocessors execute code in expected way and Application core
@@ -213,10 +359,10 @@ def test_STM_dictionary_mode(dut: DeviceAdapter):
 
     # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
     # this information is needed to build nrfutil database-config
-    _analyse_autoconf(autoconf_file)
+    analyse_autoconf(autoconf_file)
 
     # use nrfutil trace to decode logs
-    _nrfutil_dictionary_from_serial(
+    nrfutil_dictionary_from_serial(
         dut=dut,
         decoded_file_name=f"{test_filename}",
         collect_time=COLLECT_TIMEOUT,
@@ -232,27 +378,123 @@ def test_STM_dictionary_mode(dut: DeviceAdapter):
     ), f"File {test_filename} is empty"
 
     # check that LOGs from Application core are present
-    _check_benchmark_results(
+    check_console_output(
         output=decoded_file_content,
         core='app',
     )
 
     # check that LOGs from Radio core are present
-    _check_benchmark_results(
+    check_console_output(
         output=decoded_file_content,
         core='rad',
     )
 
     if SB_CONFIG_APP_CPUPPR_RUN:
         # check that LOGs from PPR core are present
-        _check_benchmark_results(
+        check_console_output(
             output=decoded_file_content,
             core='ppr',
         )
 
     if SB_CONFIG_APP_CPUFLPR_RUN:
         # check that LOGs from FLPR core are present
-        _check_benchmark_results(
+        check_console_output(
             output=decoded_file_content,
             core='flpr',
         )
+
+
+def test_STM_dictionary_mode(dut: DeviceAdapter):
+    """
+    Run boards.nrf.coresight_stm.dict from tests/boards/nrf/coresight_stm test suite.
+    Application, Radio, PPR and FLPR cores use STM for logging.
+    STM proxy (Application core) prints on serial port raw logs from all domains.
+    Nrfutil trace is used to decode STM logs.
+    After reset, coprocessors execute code in expected way and Application core
+    outputs STM traces on UART port.
+    """
+    BUILD_DIR = str(dut.device_config.build_dir)
+    test_filename = f"{BUILD_DIR}/coresight_stm_dictionary.txt"
+    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
+    COLLECT_TIMEOUT = 10.0
+
+    app_constraints = STMLimits(
+        # all values in us
+        log_0_arg=0.7,
+        log_1_arg=0.8,
+        log_2_arg=0.8,
+        log_3_arg=1.3,
+        log_str=3.2,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,  # 50 %
+    )
+    rad_constraints = STMLimits(
+        # all values in us
+        log_0_arg=0.8,
+        log_1_arg=0.9,
+        log_2_arg=1.0,
+        log_3_arg=1.5,
+        log_str=3.6,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,
+    )
+    ppr_constraints = STMLimits(
+        # all values in us
+        log_0_arg=7.5,
+        log_1_arg=8.5,
+        log_2_arg=8.6,
+        log_3_arg=17.4,
+        log_str=45.2,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,
+    )
+    flpr_constraints = STMLimits(
+        # all values in us
+        log_0_arg=0.3,
+        log_1_arg=0.4,
+        log_2_arg=0.5,
+        log_3_arg=0.8,
+        log_str=2.6,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,  # 50 %
+    )
+
+    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
+    # this information is needed to build nrfutil database-config
+    analyse_autoconf(autoconf_file)
+
+    # use nrfutil trace to decode logs
+    nrfutil_dictionary_from_serial(
+        dut=dut,
+        decoded_file_name=f"{test_filename}",
+        collect_time=COLLECT_TIMEOUT,
+    )
+
+    # read decoded logs
+    with open(f"{test_filename}", errors="ignore") as decoded_file:
+        decoded_file_content = decoded_file.read()
+
+    # if nothing in decoded_file, stop test
+    assert len(decoded_file_content) > 0, f"File {test_filename} is empty"
+
+    # check results on Application core
+    check_benchmark_results(output=decoded_file_content, core='app', constraints=app_constraints)
+
+    # check results on Radio core
+    check_benchmark_results(output=decoded_file_content, core='rad', constraints=rad_constraints)
+
+    if SB_CONFIG_APP_CPUPPR_RUN:
+        # check results on PPR core
+        check_benchmark_results(
+            output=decoded_file_content, core='ppr', constraints=ppr_constraints
+        )
+
+    if SB_CONFIG_APP_CPUFLPR_RUN:
+        # check results on FLPR core
+        check_benchmark_results(
+            output=decoded_file_content, core='flpr', constraints=flpr_constraints
+        )
diff --git a/samples/boards/nordic/coresight_stm/sample.yaml b/samples/boards/nordic/coresight_stm/sample.yaml
index 4251c5d6df8..bf9016baaba 100644
--- a/samples/boards/nordic/coresight_stm/sample.yaml
+++ b/samples/boards/nordic/coresight_stm/sample.yaml
@@ -15,7 +15,7 @@ tests:
     harness_config:
       pytest_dut_scope: session
       pytest_root:
-        - "pytest/test_stm.py::test_STM_dictionary_mode"
+        - "pytest/test_stm.py::test_sample_STM_dictionary_mode"
     required_snippets:
       - nordic-log-stm-dict
     extra_args:
@@ -27,7 +27,7 @@ tests:
     harness_config:
       pytest_dut_scope: session
       pytest_root:
-        - "pytest/test_stm.py::test_STM_decoded"
+        - "pytest/test_stm.py::test_sample_STM_decoded"
     required_snippets:
       - nordic-log-stm
     extra_args:
diff --git a/tests/boards/nrf/coresight_stm/pytest/test_stm.py b/tests/boards/nrf/coresight_stm/pytest/test_stm.py
deleted file mode 100644
index 7131d8f38bb..00000000000
--- a/tests/boards/nrf/coresight_stm/pytest/test_stm.py
+++ /dev/null
@@ -1,347 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-import logging
-import re
-import subprocess
-from dataclasses import dataclass
-from pathlib import Path
-from time import sleep
-
-import psutil
-from twister_harness import DeviceAdapter
-
-logger = logging.getLogger(__name__)
-
-
-SB_CONFIG_APP_CPUPPR_RUN = None
-SB_CONFIG_APP_CPUFLPR_RUN = None
-
-# See definition of stm_m_id[] and stm_m_name[] in
-# https://github.com/zephyrproject-rtos/zephyr/blob/main/drivers/misc/coresight/nrf_etr.c
-STM_M_ID = {
-    "sec": 33,
-    "app": 34,
-    "rad": 35,
-    "mod": 36,
-    "sys": 44,
-    "flpr": 45,
-    "ppr": 46,
-    "hw": 128,
-}
-
-
-@dataclass
-class STMLimits:
-    log_0_arg: float | None
-    log_1_arg: float | None
-    log_2_arg: float | None
-    log_3_arg: float | None
-    log_str: float | None
-    tracepoint: float | None
-    tracepoint_d32: float | None
-    tolerance: float | None
-
-
-def _analyse_autoconf(filepath: str) -> None:
-    global SB_CONFIG_APP_CPUPPR_RUN
-    global SB_CONFIG_APP_CPUFLPR_RUN
-
-    SB_CONFIG_APP_CPUPPR_RUN = False
-    SB_CONFIG_APP_CPUFLPR_RUN = False
-
-    # Parse contents of {BUILD_DIR}/_sysbuild/autoconf.h
-    with open(f"{filepath}", errors="ignore") as autoconf:
-        for line in autoconf:
-            if "SB_CONFIG_APP_CPUPPR_RUN 1" in line:
-                SB_CONFIG_APP_CPUPPR_RUN = True
-                continue
-            if "SB_CONFIG_APP_CPUFLPR_RUN 1" in line:
-                SB_CONFIG_APP_CPUFLPR_RUN = True
-    logger.debug(f"{SB_CONFIG_APP_CPUPPR_RUN=}")
-    logger.debug(f"{SB_CONFIG_APP_CPUFLPR_RUN=}")
-
-
-def _check_benchmark_results(output: str, core: str, constraints: STMLimits) -> None:
-    """
-    Use regular expressions to parse 'output' string.
-    Search for benchmark results related to 'core' coprocessor.
-    Check that benchamrk results are lower than limits provided in 'constraints'.
-    """
-
-    cfg = {
-        "log message with 0 arguments": {
-            "regex": rf"{core}: Timing for log message with 0 arguments: (.+)us",
-            "expected": constraints.log_0_arg,
-        },
-        "log message with 1 argument": {
-            "regex": rf"{core}: Timing for log message with 1 argument: (.+)us",
-            "expected": constraints.log_1_arg,
-        },
-        "log message with 2 arguments": {
-            "regex": rf"{core}: Timing for log message with 2 arguments: (.+)us",
-            "expected": constraints.log_2_arg,
-        },
-        "log message with 3 arguments": {
-            "regex": rf"{core}: Timing for log message with 3 arguments: (.+)us",
-            "expected": constraints.log_3_arg,
-        },
-        "log message with string": {
-            "regex": rf"{core}: Timing for log_message with string: (.+)us",
-            "expected": constraints.log_str,
-        },
-        "tracepoint": {
-            "regex": rf"{core}: Timing for tracepoint: (.+)us",
-            "expected": constraints.tracepoint,
-        },
-        "tracepoint_d32": {
-            "regex": rf"{core}: Timing for tracepoint_d32: (.+)us",
-            "expected": constraints.tracepoint_d32,
-        },
-    }
-
-    for check in cfg:
-        observed_str = re.search(cfg[check]["regex"], output).group(1)
-        assert observed_str is not None, f"Timing for {check} NOT found"
-        # check value
-        observed = float(observed_str)
-        threshold = cfg[check]["expected"] * (1 + constraints.tolerance)
-        assert (
-            observed < threshold
-        ), f"{core}: Timing for {check} - {observed} us exceeds {threshold} us"
-
-
-# nrfutil starts children processes
-# when subprocess.terminate(nrfutil_process) is executed, only the parent terminates
-# this blocks serial port for other uses
-def _kill(proc):
-    try:
-        for child in psutil.Process(proc.pid).children(recursive=True):
-            child.kill()
-        proc.kill()
-    except Exception as e:
-        logger.exception(f'Could not kill nrfutil - {e}')
-
-
-def _nrfutil_dictionary_from_serial(
-    dut: DeviceAdapter,
-    decoded_file_name: str = "output.txt",
-    collect_time: float = 60.0,
-) -> None:
-    UART_PATH = dut.device_config.serial
-    UART_BAUDRATE = dut.device_config.baud
-    dut.close()
-
-    logger.debug(f"Using serial: {UART_PATH}")
-
-    if Path(f"{decoded_file_name}").exists():
-        logger.warning("Output file already exists!")
-
-    # prepare database config string
-    BUILD_DIR = str(dut.device_config.build_dir)
-    logger.debug(f"{BUILD_DIR=}")
-    config_str = f"{STM_M_ID['app']}:{BUILD_DIR}/coresight_stm/zephyr/log_dictionary.json"
-    config_str += f",{STM_M_ID['rad']}:{BUILD_DIR}/remote_rad/zephyr/log_dictionary.json"
-    if SB_CONFIG_APP_CPUPPR_RUN:
-        config_str += f",{STM_M_ID['ppr']}:{BUILD_DIR}/remote_ppr/zephyr/log_dictionary.json"
-    if SB_CONFIG_APP_CPUFLPR_RUN:
-        config_str += f",{STM_M_ID['flpr']}:{BUILD_DIR}/remote_flpr/zephyr/log_dictionary.json"
-    logger.debug(f"{config_str=}")
-
-    cmd = (
-        "nrfutil trace stm --database-config "
-        f"{config_str} "
-        f"--input-serialport {UART_PATH} --baudrate {UART_BAUDRATE} "
-        f"--output-ascii {decoded_file_name}"
-    )
-    try:
-        # run nrfutil trace in background non-blocking
-        logger.info(f"Executing:\n{cmd}")
-        proc = subprocess.Popen(cmd.split(), stdout=subprocess.DEVNULL)
-    except OSError as exc:
-        logger.error(f"Unable to start nrfutil trace:\n{cmd}\n{exc}")
-    try:
-        proc.wait(collect_time)
-    except subprocess.TimeoutExpired:
-        pass
-    finally:
-        _kill(proc)
-
-
-def test_STM_decoded(dut: DeviceAdapter):
-    """
-    Run sample.boards.nrf.coresight_stm from samples/boards/nrf/coresight_stm sample.
-    Both Application and Radio cores use STM for logging.
-    STM proxy (Application core) decodes logs from all domains.
-    After reset, coprocessors execute code in expected way and Application core
-    outputs STM traces on UART port.
-    """
-    BUILD_DIR = str(dut.device_config.build_dir)
-    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
-
-    app_constraints = STMLimits(
-        # all values in us
-        log_0_arg=1.8,
-        log_1_arg=2.1,
-        log_2_arg=2.0,
-        log_3_arg=2.1,
-        log_str=4.5,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,  # 50 %
-    )
-    rad_constraints = STMLimits(
-        # all values in us
-        log_0_arg=4.6,
-        log_1_arg=5.0,
-        log_2_arg=5.2,
-        log_3_arg=5.6,
-        log_str=6.3,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,
-    )
-    ppr_constraints = STMLimits(
-        # all values in us
-        log_0_arg=25.7,
-        log_1_arg=27.1,
-        log_2_arg=27.3,
-        log_3_arg=30.4,
-        log_str=65.7,
-        tracepoint=0.55,
-        tracepoint_d32=0.25,
-        tolerance=0.5,
-    )
-    flpr_constraints = STMLimits(
-        # all values in us
-        log_0_arg=1.3,
-        log_1_arg=1.6,
-        log_2_arg=1.6,
-        log_3_arg=1.7,
-        log_str=3.0,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,
-    )
-    # nrf54h20 prints immediately after it is flashed.
-    # Wait a bit to skipp logs from previous test.
-    sleep(6)
-
-    # Get output from serial port
-    output = "\n".join(dut.readlines())
-
-    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
-    _analyse_autoconf(autoconf_file)
-
-    # check results on Application core
-    _check_benchmark_results(output=output, core='app', constraints=app_constraints)
-
-    # check results on Radio core
-    _check_benchmark_results(output=output, core='rad', constraints=rad_constraints)
-
-    if SB_CONFIG_APP_CPUPPR_RUN:
-        # check results on PPR core
-        _check_benchmark_results(output=output, core='ppr', constraints=ppr_constraints)
-
-    if SB_CONFIG_APP_CPUFLPR_RUN:
-        # check results on FLPR core
-        _check_benchmark_results(output=output, core='flpr', constraints=flpr_constraints)
-
-
-def test_STM_dictionary_mode(dut: DeviceAdapter):
-    """
-    Run sample.boards.nrf.coresight_stm.dict from samples/boards/nrf/coresight_stm sample.
-    Both Application and Radio cores use STM for logging.
-    STM proxy (Application core) prints on serial port raw logs from all domains.
-    Nrfutil trace is used to decode STM logs.
-    After reset, coprocessors execute code in expected way and Application core
-    outputs STM traces on UART port.
-    """
-    BUILD_DIR = str(dut.device_config.build_dir)
-    test_filename = f"{BUILD_DIR}/coresight_stm_dictionary.txt"
-    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
-    COLLECT_TIMEOUT = 10.0
-
-    app_constraints = STMLimits(
-        # all values in us
-        log_0_arg=0.7,
-        log_1_arg=0.8,
-        log_2_arg=0.8,
-        log_3_arg=1.3,
-        log_str=3.2,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,  # 50 %
-    )
-    rad_constraints = STMLimits(
-        # all values in us
-        log_0_arg=0.8,
-        log_1_arg=0.9,
-        log_2_arg=1.0,
-        log_3_arg=1.5,
-        log_str=3.6,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,
-    )
-    ppr_constraints = STMLimits(
-        # all values in us
-        log_0_arg=7.5,
-        log_1_arg=8.5,
-        log_2_arg=8.6,
-        log_3_arg=17.4,
-        log_str=45.2,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,
-    )
-    flpr_constraints = STMLimits(
-        # all values in us
-        log_0_arg=0.3,
-        log_1_arg=0.4,
-        log_2_arg=0.5,
-        log_3_arg=0.8,
-        log_str=2.6,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,  # 50 %
-    )
-
-    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
-    # this information is needed to build nrfutil database-config
-    _analyse_autoconf(autoconf_file)
-
-    # use nrfutil trace to decode logs
-    _nrfutil_dictionary_from_serial(
-        dut=dut,
-        decoded_file_name=f"{test_filename}",
-        collect_time=COLLECT_TIMEOUT,
-    )
-
-    # read decoded logs
-    with open(f"{test_filename}", errors="ignore") as decoded_file:
-        decoded_file_content = decoded_file.read()
-
-    # if nothing in decoded_file, stop test
-    assert len(decoded_file_content) > 0, f"File {test_filename} is empty"
-
-    # check results on Application core
-    _check_benchmark_results(output=decoded_file_content, core='app', constraints=app_constraints)
-
-    # check results on Radio core
-    _check_benchmark_results(output=decoded_file_content, core='rad', constraints=rad_constraints)
-
-    if SB_CONFIG_APP_CPUPPR_RUN:
-        # check results on PPR core
-        _check_benchmark_results(
-            output=decoded_file_content, core='ppr', constraints=ppr_constraints
-        )
-
-    if SB_CONFIG_APP_CPUFLPR_RUN:
-        # check results on FLPR core
-        _check_benchmark_results(
-            output=decoded_file_content, core='flpr', constraints=flpr_constraints
-        )
diff --git a/tests/boards/nrf/coresight_stm/testcase.yaml b/tests/boards/nrf/coresight_stm/testcase.yaml
index 1b496c9b8c7..308f231274c 100644
--- a/tests/boards/nrf/coresight_stm/testcase.yaml
+++ b/tests/boards/nrf/coresight_stm/testcase.yaml
@@ -16,7 +16,7 @@ tests:
     harness_config:
       pytest_dut_scope: session
       pytest_root:
-        - "pytest/test_stm.py::test_STM_dictionary_mode"
+        - "$ZEPHYR_BASE/samples/boards/nordic/coresight_stm/pytest/test_stm.py::test_STM_dictionary_mode"
     required_snippets:
       - nordic-log-stm-dict
     extra_args:
@@ -29,7 +29,7 @@ tests:
     harness_config:
       pytest_dut_scope: session
       pytest_root:
-        - "pytest/test_stm.py::test_STM_decoded"
+        - "$ZEPHYR_BASE/samples/boards/nordic/coresight_stm/pytest/test_stm.py::test_STM_decoded"
     required_snippets:
       - nordic-log-stm
     extra_args:

From dc3a32e13626c28c53fb79492f53850c87283227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Fri, 10 Jan 2025 08:12:44 +0100
Subject: [PATCH 1045/2913] [nrf fromtree] drivers: watchdog: nrfx: add
 synchronization after stop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In order to ensure that watchdog channels are freed in proper
driver state, synchronization in form of simple loop needs
to be added after stopping. In no irq variant, it is already done
on nrfx level. NRFY function can be replaced by NRFX one in
the future.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit b578ffa49a13f58288e44af5f44a11a3f44b3d00)
---
 drivers/watchdog/wdt_nrfx.c | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/drivers/watchdog/wdt_nrfx.c b/drivers/watchdog/wdt_nrfx.c
index 277d195f681..62f7104bafa 100644
--- a/drivers/watchdog/wdt_nrfx.c
+++ b/drivers/watchdog/wdt_nrfx.c
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/kernel.h>
 #include <zephyr/sys/math_extras.h>
 #include <nrfx_wdt.h>
 #include <zephyr/drivers/watchdog.h>
@@ -13,11 +14,18 @@
 #include <zephyr/irq.h>
 LOG_MODULE_REGISTER(wdt_nrfx);
 
+#if !CONFIG_WDT_NRFX_NO_IRQ && NRF_WDT_HAS_STOP
+#define WDT_NRFX_SYNC_STOP 1
+#endif
+
 struct wdt_nrfx_data {
 	wdt_callback_t m_callbacks[NRF_WDT_CHANNEL_NUMBER];
 	uint32_t m_timeout;
 	uint8_t m_allocated_channels;
 	bool enabled;
+#if defined(WDT_NRFX_SYNC_STOP)
+	struct k_sem sync_stop;
+#endif
 };
 
 struct wdt_nrfx_config {
@@ -73,6 +81,10 @@ static int wdt_nrf_disable(const struct device *dev)
 		return -EFAULT;
 	}
 
+#if defined(WDT_NRFX_SYNC_STOP)
+	k_sem_take(&data->sync_stop, K_FOREVER);
+#endif
+
 	nrfx_wdt_channels_free(&config->wdt);
 
 	for (channel_id = 0; channel_id < data->m_allocated_channels; channel_id++) {
@@ -170,11 +182,17 @@ static const struct wdt_driver_api wdt_nrfx_driver_api = {
 static void wdt_event_handler(const struct device *dev, nrf_wdt_event_t event_type,
 			      uint32_t requests, void *p_context)
 {
+	struct wdt_nrfx_data *data = dev->data;
+
+#if defined(WDT_NRFX_SYNC_STOP)
+	if (event_type == NRF_WDT_EVENT_STOPPED) {
+		k_sem_give(&data->sync_stop);
+	}
+#else
 	(void)event_type;
+#endif
 	(void)p_context;
 
-	struct wdt_nrfx_data *data = dev->data;
-
 	while (requests) {
 		uint8_t i = u32_count_trailing_zeros(requests);
 
@@ -217,7 +235,11 @@ static void wdt_event_handler(const struct device *dev, nrf_wdt_event_t event_ty
 		}							       \
 		return 0;						       \
 	}								       \
-	static struct wdt_nrfx_data wdt_##idx##_data;			       \
+	static struct wdt_nrfx_data wdt_##idx##_data =	{		       \
+		IF_ENABLED(WDT_NRFX_SYNC_STOP,				       \
+			(.sync_stop = Z_SEM_INITIALIZER(		       \
+				wdt_##idx##_data.sync_stop, 0, 1),))	       \
+	};								       \
 	static const struct wdt_nrfx_config wdt_##idx##z_config = {	       \
 		.wdt = NRFX_WDT_INSTANCE(idx),				       \
 	};								       \

From 9471a136b58bfa6853b4854308ca4429ba670934 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20St=C4=99pnicki?=
 <lukasz.stepnicki@nordicsemi.no>
Date: Thu, 16 Jan 2025 09:36:08 +0100
Subject: [PATCH 1046/2913] [nrf fromlist] arch: riscv: option to init custom
 hw stacked esf members.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When RISCV_SOC_HAS_ISR_STACKING is used, it may
be needed to initialize custom hw stacked esf members.
Some initial values may need to be aligned with
hw stacking mechanism to avoid any side effects.

Upstream PR #: 84076

Signed-off-by: Łukasz Stępnicki <lukasz.stepnicki@nordicsemi.no>
---
 arch/riscv/Kconfig                       | 5 +++++
 arch/riscv/core/thread.c                 | 4 ++++
 soc/nordic/common/vpr/soc_isr_stacking.h | 7 +++++++
 3 files changed, 16 insertions(+)

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 575c9871c13..8f524c23fc1 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -83,6 +83,11 @@ config RISCV_SOC_HAS_ISR_STACKING
 	    saved on the stack by the hardware, and the registers saved by the
 	    software macros. The structure must be called 'struct arch_esf'.
 
+	  - SOC_ISR_STACKING_ESR_INIT: macro guarded by !_ASMLANGUAGE.
+	    Some hardware stacked registers should be initialized on init
+	    stack with proper values. This prevents from incorrect behavior
+	    on entry context switch when initial stack is restored.
+
 config RISCV_SOC_HAS_CUSTOM_IRQ_HANDLING
 	bool
 	help
diff --git a/arch/riscv/core/thread.c b/arch/riscv/core/thread.c
index 59adbc42e46..2fecc68a077 100644
--- a/arch/riscv/core/thread.c
+++ b/arch/riscv/core/thread.c
@@ -106,6 +106,10 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 	stack_init->soc_context = soc_esf_init;
 #endif
 
+#ifdef CONFIG_RISCV_SOC_HAS_ISR_STACKING
+	SOC_ISR_STACKING_ESR_INIT;
+#endif
+
 	thread->callee_saved.sp = (unsigned long)stack_init;
 
 	/* where to go when returning from z_riscv_switch() */
diff --git a/soc/nordic/common/vpr/soc_isr_stacking.h b/soc/nordic/common/vpr/soc_isr_stacking.h
index 8d2f64ad729..55733733539 100644
--- a/soc/nordic/common/vpr/soc_isr_stacking.h
+++ b/soc/nordic/common/vpr/soc_isr_stacking.h
@@ -62,6 +62,13 @@
 
 #endif /* DT_PROP(VPR_CPU, nordic_bus_width) == 64 */
 
+/*
+ * VPR stacked mcause needs to have proper value on initial stack.
+ * Initial mret will restore this value.
+ */
+#define SOC_ISR_STACKING_ESR_INIT                                                                  \
+	stack_init->_mcause = 0;
+
 #else /* _ASMLANGUAGE */
 
 /*

From 0ea1f14056a54e88b689e0c9623700d53f469563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Wed, 18 Dec 2024 08:30:27 +0100
Subject: [PATCH 1047/2913] [nrf fromtree] tests: boards: nrf: hwinfo: Add test
 for reset cause on nrf54*
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add test that checks reset cause reported by HWINFO.

Check that hwinfo_get_supported_reset_cause() returns
expected value.

Check that hwinfo_get_reset_cause() correctly detects:
- RESET_PIN,
- RESET_SOFTWARE,
- RESET_WATCHDOG.

Check that reset cause can be cleared
with hwinfo_clear_reset_cause().

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 8f83267f9a88caaac582fa93dab498ebbb3390af)
---
 .../nrf/hwinfo/reset_cause/CMakeLists.txt     |   8 +
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  14 +
 .../boards/nrf54h20dk_nrf54h20_cpurad.overlay |  14 +
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |   9 +
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       |   9 +
 tests/boards/nrf/hwinfo/reset_cause/prj.conf  |   7 +
 .../boards/nrf/hwinfo/reset_cause/src/main.c  | 366 ++++++++++++++++++
 .../nrf/hwinfo/reset_cause/testcase.yaml      |  38 ++
 8 files changed, 465 insertions(+)
 create mode 100644 tests/boards/nrf/hwinfo/reset_cause/CMakeLists.txt
 create mode 100644 tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpurad.overlay
 create mode 100644 tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
 create mode 100644 tests/boards/nrf/hwinfo/reset_cause/prj.conf
 create mode 100644 tests/boards/nrf/hwinfo/reset_cause/src/main.c
 create mode 100644 tests/boards/nrf/hwinfo/reset_cause/testcase.yaml

diff --git a/tests/boards/nrf/hwinfo/reset_cause/CMakeLists.txt b/tests/boards/nrf/hwinfo/reset_cause/CMakeLists.txt
new file mode 100644
index 00000000000..f659d208cb9
--- /dev/null
+++ b/tests/boards/nrf/hwinfo/reset_cause/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(reset_reason)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..ead2840f6f4
--- /dev/null
+++ b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		watchdog0 = &wdt010;
+	};
+};
+
+&wdt010 {
+	status = "okay";
+};
diff --git a/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpurad.overlay
new file mode 100644
index 00000000000..ead2840f6f4
--- /dev/null
+++ b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpurad.overlay
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		watchdog0 = &wdt010;
+	};
+};
+
+&wdt010 {
+	status = "okay";
+};
diff --git a/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..8d3dce3b380
--- /dev/null
+++ b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 00000000000..dc1ea1a9ddc
--- /dev/null
+++ b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/boards/nrf/hwinfo/reset_cause/prj.conf b/tests/boards/nrf/hwinfo/reset_cause/prj.conf
new file mode 100644
index 00000000000..edd86844963
--- /dev/null
+++ b/tests/boards/nrf/hwinfo/reset_cause/prj.conf
@@ -0,0 +1,7 @@
+CONFIG_HWINFO=y
+
+CONFIG_WATCHDOG=y
+CONFIG_REBOOT=y
+
+CONFIG_LOG=y
+CONFIG_LOG_MODE_MINIMAL=y
diff --git a/tests/boards/nrf/hwinfo/reset_cause/src/main.c b/tests/boards/nrf/hwinfo/reset_cause/src/main.c
new file mode 100644
index 00000000000..1e07f679114
--- /dev/null
+++ b/tests/boards/nrf/hwinfo/reset_cause/src/main.c
@@ -0,0 +1,366 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/hwinfo.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/sys/reboot.h>
+#include <zephyr/cache.h>
+#include <errno.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(resetreason, LOG_LEVEL_INF);
+
+static const struct device *const my_wdt_device = DEVICE_DT_GET(DT_ALIAS(watchdog0));
+static struct wdt_timeout_cfg m_cfg_wdt0;
+static int my_wdt_channel;
+
+#define NOINIT_SECTION ".noinit.test_wdt"
+volatile uint32_t machine_state __attribute__((section(NOINIT_SECTION)));
+volatile uint32_t supported __attribute__((section(NOINIT_SECTION)));
+volatile uint32_t wdt_status __attribute__((section(NOINIT_SECTION)));
+volatile uint32_t reboot_status __attribute__((section(NOINIT_SECTION)));
+
+/* Value used to indicate that the watchdog has fired. */
+#define WDT_HAS_FIRED (0x12345678U)
+#define REBOOT_WAS_DONE (0x87654321U)
+
+/* Highest value in the switch statement in the main() */
+#define LAST_STATE (2)
+
+static void wdt_int_cb(const struct device *wdt_dev, int channel_id)
+{
+	ARG_UNUSED(wdt_dev);
+	ARG_UNUSED(channel_id);
+	wdt_status = WDT_HAS_FIRED;
+
+	/* Flush cache as reboot may invalidate all lines. */
+	sys_cache_data_flush_range((void *) &wdt_status, sizeof(wdt_status));
+}
+
+/* Print LOG delimiter. */
+static void print_bar(void)
+{
+	LOG_INF("===================================================================");
+}
+
+static void print_supported_reset_cause(void)
+{
+	int32_t ret;
+
+	/* Store supported reset causes in global variable placed at NOINIT_SECTION. */
+	ret = hwinfo_get_supported_reset_cause((uint32_t *) &supported);
+
+	/* Print which reset causes are supported. */
+	if (ret == 0) {
+		LOG_INF("Supported reset causes are:");
+		if (supported & RESET_PIN) {
+			LOG_INF(" 0: RESET_PIN is supported");
+		} else {
+			LOG_INF(" 0: no support for RESET_PIN");
+		}
+		if (supported & RESET_SOFTWARE) {
+			LOG_INF(" 1: RESET_SOFTWARE is supported");
+		} else {
+			LOG_INF(" 1: no support for RESET_SOFTWARE");
+		}
+		if (supported & RESET_BROWNOUT) {
+			LOG_INF(" 2: RESET_BROWNOUT is supported");
+		} else {
+			LOG_INF(" 2: no support for RESET_BROWNOUT");
+		}
+		if (supported & RESET_POR) {
+			LOG_INF(" 3: RESET_POR is supported");
+		} else {
+			LOG_INF(" 3: no support for RESET_POR");
+		}
+		if (supported & RESET_WATCHDOG) {
+			LOG_INF(" 4: RESET_WATCHDOG is supported");
+		} else {
+			LOG_INF(" 4: no support for RESET_WATCHDOG");
+		}
+		if (supported & RESET_DEBUG) {
+			LOG_INF(" 5: RESET_DEBUG is supported");
+		} else {
+			LOG_INF(" 5: no support for RESET_DEBUG");
+		}
+		if (supported & RESET_SECURITY) {
+			LOG_INF(" 6: RESET_SECURITY is supported");
+		} else {
+			LOG_INF(" 6: no support for RESET_SECURITY");
+		}
+		if (supported & RESET_LOW_POWER_WAKE) {
+			LOG_INF(" 7: RESET_LOW_POWER_WAKE is supported");
+		} else {
+			LOG_INF(" 7: no support for RESET_LOW_POWER_WAKE");
+		}
+		if (supported & RESET_CPU_LOCKUP) {
+			LOG_INF(" 8: RESET_CPU_LOCKUP is supported");
+		} else {
+			LOG_INF(" 8: no support for RESET_CPU_LOCKUP");
+		}
+		if (supported & RESET_PARITY) {
+			LOG_INF(" 9: RESET_PARITY is supported");
+		} else {
+			LOG_INF(" 9: no support for RESET_PARITY");
+		}
+		if (supported & RESET_PLL) {
+			LOG_INF("10: RESET_PLL is supported");
+		} else {
+			LOG_INF("10: no support for RESET_PLL");
+		}
+		if (supported & RESET_CLOCK) {
+			LOG_INF("11: RESET_CLOCK is supported");
+		} else {
+			LOG_INF("11: no support for RESET_CLOCK");
+		}
+		if (supported & RESET_HARDWARE) {
+			LOG_INF("12: RESET_HARDWARE is supported");
+		} else {
+			LOG_INF("12: no support for RESET_HARDWARE");
+		}
+		if (supported & RESET_USER) {
+			LOG_INF("13: RESET_USER is supported");
+		} else {
+			LOG_INF("13: no support for RESET_USER");
+		}
+		if (supported & RESET_TEMPERATURE) {
+			LOG_INF("14: RESET_TEMPERATURE is supported");
+		} else {
+			LOG_INF("14: no support for RESET_TEMPERATURE");
+		}
+	} else if (ret == -ENOSYS) {
+		LOG_INF("hwinfo_get_supported_reset_cause() is NOT supported");
+		supported = 0;
+	} else {
+		LOG_ERR("hwinfo_get_supported_reset_cause() failed (ret = %d)", ret);
+	}
+	sys_cache_data_flush_range((void *) &supported, sizeof(supported));
+	print_bar();
+}
+
+/* Print current value of reset cause. */
+static void print_current_reset_cause(uint32_t *cause)
+{
+	int32_t ret;
+
+	ret = hwinfo_get_reset_cause(cause);
+	if (ret == 0) {
+		LOG_INF("Current reset cause is:");
+		if (*cause & RESET_PIN) {
+			LOG_INF(" 0: reset due to RESET_PIN");
+		}
+		if (*cause & RESET_SOFTWARE) {
+			LOG_INF(" 1: reset due to RESET_SOFTWARE");
+		}
+		if (*cause & RESET_BROWNOUT) {
+			LOG_INF(" 2: reset due to RESET_BROWNOUT");
+		}
+		if (*cause & RESET_POR) {
+			LOG_INF(" 3: reset due to RESET_POR");
+		}
+		if (*cause & RESET_WATCHDOG) {
+			LOG_INF(" 4: reset due to RESET_WATCHDOG");
+		}
+		if (*cause & RESET_DEBUG) {
+			LOG_INF(" 5: reset due to RESET_DEBUG");
+		}
+		if (*cause & RESET_SECURITY) {
+			LOG_INF(" 6: reset due to RESET_SECURITY");
+		}
+		if (*cause & RESET_LOW_POWER_WAKE) {
+			LOG_INF(" 7: reset due to RESET_LOW_POWER_WAKE");
+		}
+		if (*cause & RESET_CPU_LOCKUP) {
+			LOG_INF(" 8: reset due to RESET_CPU_LOCKUP");
+		}
+		if (*cause & RESET_PARITY) {
+			LOG_INF(" 9: reset due to RESET_PARITY");
+		}
+		if (*cause & RESET_PLL) {
+			LOG_INF("10: reset due to RESET_PLL");
+		}
+		if (*cause & RESET_CLOCK) {
+			LOG_INF("11: reset due to RESET_CLOCK");
+		}
+		if (*cause & RESET_HARDWARE) {
+			LOG_INF("12: reset due to RESET_HARDWARE");
+		}
+		if (*cause & RESET_USER) {
+			LOG_INF("13: reset due to RESET_USER");
+		}
+		if (*cause & RESET_TEMPERATURE) {
+			LOG_INF("14: reset due to RESET_TEMPERATURE");
+		}
+	} else if (ret == -ENOSYS) {
+		LOG_INF("hwinfo_get_reset_cause() is NOT supported");
+		*cause = 0;
+	} else {
+		LOG_ERR("hwinfo_get_reset_cause() failed (ret = %d)", ret);
+	}
+	print_bar();
+}
+
+/* Clear reset cause. */
+static void test_clear_reset_cause(void)
+{
+	int32_t ret, temp;
+
+	ret = hwinfo_clear_reset_cause();
+	if (ret == 0) {
+		LOG_INF("hwinfo_clear_reset_cause() was executed");
+	} else if (ret == -ENOSYS) {
+		LOG_INF("hwinfo_get_reset_cause() is NOT supported");
+	} else {
+		LOG_ERR("hwinfo_get_reset_cause() failed (ret = %d)", ret);
+	}
+	print_bar();
+
+	/* Print current value of reset causes -> expected 0 */
+	print_current_reset_cause(&temp);
+	LOG_INF("TEST that all reset causes were cleared");
+	if (temp == 0) {
+		LOG_INF("PASS: reset causes were cleared");
+	} else {
+		LOG_ERR("FAIL: reset case = %u while expected is 0", temp);
+	}
+	print_bar();
+}
+
+void test_reset_software(uint32_t cause)
+{
+	/* Check that reset cause from sys_reboot is detected. */
+	if (supported & RESET_SOFTWARE) {
+		if (reboot_status != REBOOT_WAS_DONE) {
+			/* If software reset hasn't happen yet, do it. */
+			reboot_status = REBOOT_WAS_DONE;
+			LOG_INF("Test RESET_SOFTWARE - Rebooting");
+
+			/* Flush cache as reboot may invalidate all lines. */
+			sys_cache_data_flush_range((void *) &machine_state, sizeof(machine_state));
+			sys_cache_data_flush_range((void *) &reboot_status, sizeof(reboot_status));
+			sys_reboot(SYS_REBOOT_COLD);
+		} else {
+			/* Software reset was done */
+			LOG_INF("TEST that RESET_SOFTWARE was detected");
+			if (cause & RESET_SOFTWARE) {
+				LOG_INF("PASS: RESET_SOFTWARE detected");
+				print_bar();
+				/* Check RESET_SOFTWARE can be cleared */
+				test_clear_reset_cause();
+			} else {
+				LOG_ERR("FAIL: RESET_SOFTWARE not set");
+				print_bar();
+			}
+			/* Cleanup */
+			reboot_status = 0;
+			sys_cache_data_flush_range((void *) &reboot_status, sizeof(reboot_status));
+		}
+	}
+}
+
+void test_reset_watchdog(uint32_t cause)
+{
+	int32_t ret;
+
+	/* Check that reset cause from expired watchdog is detected. */
+	if (supported & RESET_WATCHDOG) {
+		if (wdt_status != WDT_HAS_FIRED) {
+			/* If watchdog hasn't fired yet, configure it do so. */
+			uint32_t watchdog_window = 2000U;
+
+			if (!device_is_ready(my_wdt_device)) {
+				LOG_ERR("WDT device %s is not ready", my_wdt_device->name);
+				return;
+			}
+
+			m_cfg_wdt0.callback = wdt_int_cb;
+			m_cfg_wdt0.flags = WDT_FLAG_RESET_SOC;
+			m_cfg_wdt0.window.max = watchdog_window;
+			m_cfg_wdt0.window.min = 0U;
+			my_wdt_channel = wdt_install_timeout(my_wdt_device, &m_cfg_wdt0);
+			if (my_wdt_channel < 0) {
+				LOG_ERR("wdt_install_timeout() returned %d", my_wdt_channel);
+				return;
+			}
+
+			ret = wdt_setup(my_wdt_device, WDT_OPT_PAUSE_HALTED_BY_DBG);
+			if (ret < 0) {
+				LOG_ERR("wdt_setup() returned %d", ret);
+				return;
+			}
+
+			/* Flush cache as reboot may invalidate all lines. */
+			sys_cache_data_flush_range((void *) &machine_state, sizeof(machine_state));
+			LOG_INF("Watchdog shall fire in ~%u miliseconds", watchdog_window);
+			print_bar();
+			k_sleep(K_FOREVER);
+		} else {
+			/* Watchdog has fired. */
+			LOG_INF("TEST that RESET_WATCHDOG was detected");
+			if (cause & RESET_WATCHDOG) {
+				LOG_INF("PASS: RESET_WATCHDOG detected");
+				print_bar();
+				/* Check RESET_WATCHDOG can be cleared */
+				test_clear_reset_cause();
+			} else {
+				LOG_ERR("FAIL: RESET_WATCHDOG not set");
+				print_bar();
+			}
+			/* Cleanup */
+			wdt_status = 0;
+			sys_cache_data_flush_range((void *) &wdt_status, sizeof(wdt_status));
+		}
+	}
+}
+
+int main(void)
+{
+	uint32_t cause;
+
+	LOG_INF("HW Info reset reason test on %s", CONFIG_BOARD_TARGET);
+	if (wdt_status == WDT_HAS_FIRED) {
+		LOG_INF("This boot is due to expected watchdog reset");
+	}
+	if (reboot_status == REBOOT_WAS_DONE) {
+		LOG_INF("This boot is due to expected software reset");
+	}
+	print_bar();
+
+	/* Test relies on REST_PIN to correctly start. */
+	print_current_reset_cause(&cause);
+	if (cause & RESET_PIN) {
+		LOG_INF("TEST that RESET_PIN was detected");
+		LOG_INF("PASS: RESET_PIN detected");
+		print_bar();
+		/* Check RESET_PIN can be cleared */
+		test_clear_reset_cause();
+		machine_state = 0;
+		reboot_status = 0;
+		wdt_status = 0;
+	}
+
+	while (machine_state <= LAST_STATE) {
+		LOG_DBG("machine_state = %u", machine_state);
+		LOG_DBG("reboot_status = %u", reboot_status);
+		LOG_DBG("wdt_status = %u", wdt_status);
+
+		switch (machine_state) {
+		case 0: /* Print (an store) which reset causes are supported. */
+			print_supported_reset_cause();
+			machine_state++;
+			break;
+		case 1: /* Test RESET_SOFTWARE. */
+			test_reset_software(cause);
+			machine_state++;
+		case 2: /* Test RESET_WATCHDOG. */
+			test_reset_watchdog(cause);
+			machine_state++;
+		}
+	}
+
+	LOG_INF("All tests done");
+	return 0;
+}
diff --git a/tests/boards/nrf/hwinfo/reset_cause/testcase.yaml b/tests/boards/nrf/hwinfo/reset_cause/testcase.yaml
new file mode 100644
index 00000000000..0ec999ee713
--- /dev/null
+++ b/tests/boards/nrf/hwinfo/reset_cause/testcase.yaml
@@ -0,0 +1,38 @@
+common:
+  tags:
+    - drivers
+    - hwinfo
+  harness: console
+
+tests:
+  drivers.hwinfo.reset_cause:
+    harness_config:
+      type: multi_line
+      ordered: true
+      regex:
+        - "HW Info reset reason test on"
+        - "PASS: RESET_PIN detected"
+        - "PASS: reset causes were cleared"
+        - "Supported reset causes are"
+        - "RESET_PIN is supported"
+        - "RESET_SOFTWARE is supported"
+        - "RESET_WATCHDOG is supported"
+        - "RESET_DEBUG is supported"
+        - "RESET_LOW_POWER_WAKE is supported"
+        - "RESET_CPU_LOCKUP is supported"
+        - "Rebooting"
+        - "HW Info reset reason test on"
+        - "PASS: RESET_SOFTWARE detected"
+        - "PASS: reset causes were cleared"
+        - "Watchdog shall fire"
+        - "HW Info reset reason test on"
+        - "PASS: RESET_WATCHDOG detected"
+        - "PASS: reset causes were cleared"
+        - "All tests done"
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpurad
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp

From 6fb3db094fbc43a2de1bdc702b40b5e4292bc23e Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Thu, 5 Dec 2024 10:22:38 +0000
Subject: [PATCH 1048/2913] Revert "[nrf noup] cmake: modules: kconfig: Add
 hide child/parent variable"

fixup! [nrf noup] cmake: modules: kconfig: Add hide child/parent variable

This reverts commit 2483870f79a3f4c4da2ff11f61d7a9d9d40afa2c.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
---
 cmake/modules/kconfig.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmake/modules/kconfig.cmake b/cmake/modules/kconfig.cmake
index 97086cdf19d..02bebbe0851 100644
--- a/cmake/modules/kconfig.cmake
+++ b/cmake/modules/kconfig.cmake
@@ -171,7 +171,6 @@ set(COMMON_KCONFIG_ENV_SETTINGS
   TOOLCHAIN_KCONFIG_DIR=${TOOLCHAIN_KCONFIG_DIR}
   TOOLCHAIN_HAS_NEWLIB=${_local_TOOLCHAIN_HAS_NEWLIB}
   TOOLCHAIN_HAS_PICOLIBC=${_local_TOOLCHAIN_HAS_PICOLIBC}
-  HIDE_CHILD_PARENT_CONFIG=${SYSBUILD}
   EDT_PICKLE=${EDT_PICKLE}
   # Export all Zephyr modules to Kconfig
   ${ZEPHYR_KCONFIG_MODULES_DIR}

From 255c07ef513611e16e150b49ca057ffb25dd6b15 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Wed, 11 Dec 2024 13:39:46 +0000
Subject: [PATCH 1049/2913] [nrf fromlist] boards: nordic: nrf5340dk/nrf9160dk:
 Use sysbuild for ns twister

Enables forcing use of sysbuild to build nrf5340dk/nrf9160dk
non-secure board targets when using twister

Upstream PR #: 82907

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
---
 boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml | 1 +
 boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml | 1 +
 boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml
index 4c366d2f363..cec7b107776 100644
--- a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml
+++ b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml
@@ -18,3 +18,4 @@ supported:
   - gpio
   - spi
 vendor: nordic
+sysbuild: true
diff --git a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml
index d610095afaf..86161bb4385 100644
--- a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml
+++ b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml
@@ -19,3 +19,4 @@ supported:
   - netif:modem
   - gpio
 vendor: nordic
+sysbuild: true
diff --git a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml
index 0faa84b38c9..52b8f85efb4 100644
--- a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml
+++ b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml
@@ -19,3 +19,4 @@ supported:
   - netif:modem
   - gpio
 vendor: nordic
+sysbuild: true

From b983259c675e7681ada2c2f66e1e12b2c95156e2 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Thu, 12 Dec 2024 07:58:06 +0000
Subject: [PATCH 1050/2913] [nrf noup] samples/tests: Add TF-M sysbuild config
 files

Fixes some issues with samples/tests by adding configuration
files to satisfy TF-M requirements

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
---
 samples/subsys/usb/dfu/sysbuild.conf     | 1 +
 tests/drivers/flash/common/sysbuild.conf | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 samples/subsys/usb/dfu/sysbuild.conf
 delete mode 100644 tests/drivers/flash/common/sysbuild.conf

diff --git a/samples/subsys/usb/dfu/sysbuild.conf b/samples/subsys/usb/dfu/sysbuild.conf
new file mode 100644
index 00000000000..47f00ff3cff
--- /dev/null
+++ b/samples/subsys/usb/dfu/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_BOOTLOADER_MCUBOOT=y
diff --git a/tests/drivers/flash/common/sysbuild.conf b/tests/drivers/flash/common/sysbuild.conf
deleted file mode 100644
index 6408669a847..00000000000
--- a/tests/drivers/flash/common/sysbuild.conf
+++ /dev/null
@@ -1 +0,0 @@
-SB_CONFIG_PARTITION_MANAGER=n

From 20a2ba291a8fd3ac3fd0f51c0491d7debbd11be4 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Thu, 12 Dec 2024 08:05:53 +0000
Subject: [PATCH 1051/2913] [nrf noup] cmake: linker: ld: target: Remove
 child/parent image flag

fixup! [nrf noup] tree-wide: support NCS Partition Manager (PM) definitions

Removes a condition in the partition manager enabled check which
was for child/parent images and keeps the sysbuild one only

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
---
 cmake/linker/ld/target.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/linker/ld/target.cmake b/cmake/linker/ld/target.cmake
index c941d8ee89e..d7ac5e41d89 100644
--- a/cmake/linker/ld/target.cmake
+++ b/cmake/linker/ld/target.cmake
@@ -76,7 +76,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
       ${current_includes}
       ${soc_linker_script_includes}
       ${template_script_defines}
-      -DUSE_PARTITION_MANAGER=$<OR:$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>,$<BOOL:${IMAGE_NAME}>,$<TARGET_EXISTS:partition_manager>>
+      -DUSE_PARTITION_MANAGER=$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>
       -E ${LINKER_SCRIPT}
       -P # Prevent generation of debug `#line' directives.
       -o ${linker_script_gen}

From 185906a698cfea6f656556c1a03572a3835913a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hubert=20Mi=C5=9B?= <hubert.mis@nordicsemi.no>
Date: Thu, 16 Jan 2025 17:23:27 +0100
Subject: [PATCH 1052/2913] [nrf fromlist] drv: nordic_vpr_launcher: manage
 data cache
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Write-back cache after copying VPR's code and data to the destination
memory. It allows VPRs to run from RAM regions cacheable by its host.

It allows to use FLPR in nRF54H20.

Upstream PR #: 84104

Signed-off-by: Hubert Miś <hubert.mis@nordicsemi.no>
---
 drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c b/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
index 2c2915a7984..5bd43f87fb9 100644
--- a/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
+++ b/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
@@ -7,6 +7,7 @@
 
 #include <string.h>
 
+#include <zephyr/cache.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
@@ -38,6 +39,11 @@ static int nordic_vpr_launcher_init(const struct device *dev)
 		LOG_DBG("Loading VPR (%p) from %p to %p (%zu bytes)", config->vpr,
 			(void *)config->src_addr, (void *)config->exec_addr, config->size);
 		memcpy((void *)config->exec_addr, (void *)config->src_addr, config->size);
+#if defined(CONFIG_DCACHE)
+		LOG_DBG("Writing back cache with loaded VPR (from %p %zu bytes)",
+			(void *)config->exec_addr, config->size);
+		sys_cache_data_flush_range((void *)config->exec_addr, config->size);
+#endif
 	}
 #endif
 

From 1b965ae13b7b41d2980e430a7890b562ea93c87b Mon Sep 17 00:00:00 2001
From: Karsten Koenig <karsten.koenig@nordicsemi.no>
Date: Tue, 14 Jan 2025 10:31:31 +0100
Subject: [PATCH 1053/2913] [nrf fromtree] dts: common: nordic: nrf54h20: Fix
 flpr bus-width

EngB+ uses 32bit bus-width stacking sequence for all VPR cores.

Signed-off-by: Karsten Koenig <karsten.koenig@nordicsemi.no>
(cherry picked from commit 620188224294aa19853aac7f9e9b545cb595d08d)
---
 dts/common/nordic/nrf54h20.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index f879e08fa52..e042df822ca 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -84,7 +84,7 @@
 			device_type = "cpu";
 			clock-frequency = <DT_FREQ_M(320)>;
 			riscv,isa = "rv32emc";
-			nordic,bus-width = <64>;
+			nordic,bus-width = <32>;
 
 			cpuflpr_vevif_rx: mailbox {
 				compatible = "nordic,nrf-vevif-task-rx";

From 76a46cb2baf310a06bbdb0b1d7d99394ec04a671 Mon Sep 17 00:00:00 2001
From: Dong Wang <dong.d.wang@intel.com>
Date: Thu, 2 Jan 2025 13:48:40 +0800
Subject: [PATCH 1054/2913] [nrf fromtree] kernel: timeout: ensure next timeout
 is set when aborting the first timeout

Ref: NCSDK-31290

This ensures that the system clock is correctly updated when the first
timeout is aborted, preventing unexpected early wake-up by the system clock
programmed previously.

Signed-off-by: Dong Wang <dong.d.wang@intel.com>
(cherry picked from commit dd5f11cb04b834584a6d851fe55a9673e25a5356)
---
 kernel/timeout.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kernel/timeout.c b/kernel/timeout.c
index f751c2f20a5..c18f2e41d06 100644
--- a/kernel/timeout.c
+++ b/kernel/timeout.c
@@ -147,8 +147,13 @@ int z_abort_timeout(struct _timeout *to)
 
 	K_SPINLOCK(&timeout_lock) {
 		if (sys_dnode_is_linked(&to->node)) {
+			bool is_first = (to == first());
+
 			remove_timeout(to);
 			ret = 0;
+			if (is_first) {
+				sys_clock_set_timeout(next_timeout(), false);
+			}
 		}
 	}
 

From 763e6a8ab82bd1a346a9b14a4b8fc7509c8441b6 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Mon, 30 Dec 2024 08:40:01 +0000
Subject: [PATCH 1055/2913] [nrf fromtree] mgmt: mcumgr: grp: os_mgmt: Add
 error code for invalid responses

Adds a new error code that can be used to signify that a query was
valid but the response was not valid

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 58710374264d02b976f69b42c643a1d6b32cc603)
---
 include/zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt.h | 3 +++
 subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c     | 1 +
 2 files changed, 4 insertions(+)

diff --git a/include/zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt.h b/include/zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt.h
index 9aef7721929..da4572e33da 100644
--- a/include/zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt.h
+++ b/include/zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt.h
@@ -47,6 +47,9 @@ enum os_mgmt_err_code_t {
 
 	/** RTC command failed */
 	OS_MGMT_ERR_RTC_COMMAND_FAILED,
+
+	/** Query was recognized but there is no valid value for the response. */
+	OS_MGMT_ERR_QUERY_RESPONSE_VALUE_NOT_VALID,
 };
 
 /* Bitmask values used by the os info command handler. Note that the width of this variable is
diff --git a/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c b/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
index 648f3842705..983cee510aa 100644
--- a/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
@@ -1046,6 +1046,7 @@ static int os_mgmt_translate_error_code(uint16_t err)
 
 	case OS_MGMT_ERR_QUERY_YIELDS_NO_ANSWER:
 	case OS_MGMT_ERR_RTC_NOT_SET:
+	case OS_MGMT_ERR_QUERY_RESPONSE_VALUE_NOT_VALID:
 		rc = MGMT_ERR_ENOENT;
 		break;
 

From 7458bd33b0a76392d719956a426eeb456527e48a Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 23 Dec 2024 12:58:04 +0100
Subject: [PATCH 1056/2913] [nrf fromtree] manifest: Update nRF hw models to
 latest

Update the HW models module to:
71bcaa88c97977647d387217dab99f7d6f026815

Including the following:
71bcaa8 hal/nrf_cracen_rng.c: Disable until released
69e9037 hal cracen_rng: Add replacements for proposed cracen_rng hal
71c2507 CRACEN RNG: Corrected one comment
dfbc93a 54 ECB: Corrected behaviour with premature end of input joblist
a46101f 54 AAR, ECB, CCM: Correct a few notes and ECB ERRORSTATUS
74aa2de 54L15: Correct IRQ 261 name
e12ab9c Add CRACEN RNG model
91066e7 docs: UART add PTY backend to shortlist of backends

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 86adcb66e738b78cf8f6363a263b24dba579b86c)
Signed-off-by: Herman Berget <herman.berget@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 6d1ad7df18c..adf6bf6ce60 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: fbc6e614686b69dfa56f9694350b9488cf83d3f7
+      revision: 71bcaa88c97977647d387217dab99f7d6f026815
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
       revision: f6b950a3b5c0187fe499b0e518426d5bf88b7e68

From 779a067c5b9486f78b8e50a79758ad4e94057ebe Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Tue, 14 Jan 2025 16:58:22 +0100
Subject: [PATCH 1057/2913] [nrf fromtree] manifest: Update nRF hw models to
 latest

Update the HW models module to:
1069743a7fc06362e8f8d7f57225b8c7940da9f0

Including the following:
1069743 Fix in cracen hal conditional compile condition
3bbd3bd Enable build of hal/nrf_cracen_*.c
506da1f hal cracen_cm: Add const to prototype
b02d927 BLECrypt_if: For new aes_ecb scramble data if no libCrypto
e41f101 RRAMC nrf hal: Add replacements for new incoming RRAM APIs
4e933cf UART: Do not warn on invalid/unconfigured framesize
716b20c hal cracen_cm: Add replacements for new cracen_cm hal
fc597a4 CRACEN: Add CryptoMaster & CM AES (ECB only)
129f16c CRACEN RNG HAL: Remove senseless static inline

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit a2d202f4400ac7903baf9e8c99e7f2943b0c48e7)
Signed-off-by: Herman Berget <herman.berget@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index adf6bf6ce60..80cf3532fdc 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: 71bcaa88c97977647d387217dab99f7d6f026815
+      revision: 1069743a7fc06362e8f8d7f57225b8c7940da9f0
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
       revision: f6b950a3b5c0187fe499b0e518426d5bf88b7e68

From f571ee74d72acad70d6b646a3553b7db19627d34 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Tue, 14 Jan 2025 17:03:52 +0100
Subject: [PATCH 1058/2913] [nrf fromtree] manifest: Update nRF hw models to
 enable cracen HAL

Update the HW models to the provisional branch zephyr_2025_01_14
which enables the use the not yet released CRACEN RNG & CM HAL

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit ec17cc0fa676478881e4efe00aae5c559fa43e55)
Signed-off-by: Herman Berget <herman.berget@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 80cf3532fdc..37bdb187006 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: 1069743a7fc06362e8f8d7f57225b8c7940da9f0
+      revision: f6d4d3f157eaad78c81c64621e3507ec752bdfde
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
       revision: f6b950a3b5c0187fe499b0e518426d5bf88b7e68

From 1f1ad79d8892c8dcde448962e52a2f8188a9dc30 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Wed, 22 Jan 2025 15:15:17 +0100
Subject: [PATCH 1059/2913] [nrf fromtree] manifest: Update nRF hw models to
 latest enabling cracen HAL

Update the HW models to the provisional branch zephyr_2025_01_22
which enables the use the not yet released CRACEN RNG & CM HAL
while enabling the latest nrf HAL 3.10

Including the following:
4aac556 Support latest nrf HAL 3.10 / MDK 8.69.1 for 54L15 builds
2e75940 UART: Correct UART names printed out to the users

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 492ad96ee5f2559d38dd91ed037acc203f258cdf)
Signed-off-by: Herman Berget <herman.berget@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 37bdb187006..619a2afa10e 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: f6d4d3f157eaad78c81c64621e3507ec752bdfde
+      revision: 68df9ed65dd9d93bb257bf8f295cb753ecf83cd8
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
       revision: f6b950a3b5c0187fe499b0e518426d5bf88b7e68

From b56f9fac0edadba8e75b49ab9605c4f79b0778ee Mon Sep 17 00:00:00 2001
From: Piotr Koziar <piotr.koziar@nordicsemi.no>
Date: Tue, 26 Nov 2024 12:29:00 +0100
Subject: [PATCH 1060/2913] [nrf fromtree] modules: hal_nordic: use
 CLOCK_CONTROL_NRF2 for HFCLK request/release

Makes 802.15.4 use the API under CONFIG_CLOCK_CONTROL_NRF2
in nrf_clock_control.h to request/release HFCLK.

Previous HFCLK requesting/releasing on nRF54H20 was more
of a workaround and could produce issues when
comes to sharing the resources.

Signed-off-by: Piotr Koziar <piotr.koziar@nordicsemi.no>
(cherry picked from commit b6ca9dbc713bffd80ad6a5d5b4cb4564fd192042)
---
 .../platform/nrf_802154_clock_zephyr.c        | 39 ++++---------------
 1 file changed, 8 insertions(+), 31 deletions(-)

diff --git a/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c b/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
index f9da7537dc1..c307401c657 100644
--- a/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
+++ b/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
@@ -11,12 +11,7 @@
 
 #include <compiler_abstraction.h>
 #include <zephyr/kernel.h>
-#if defined(CONFIG_CLOCK_CONTROL_NRF)
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
-#include <zephyr/drivers/clock_control.h>
-#elif !defined(NRF54H_SERIES)
-#error No implementation to start or stop HFCLK due to missing clock_control.
-#endif
 
 static bool hfclk_is_running;
 
@@ -35,7 +30,6 @@ bool nrf_802154_clock_hfclk_is_running(void)
 	return hfclk_is_running;
 }
 
-#if defined(CONFIG_CLOCK_CONTROL_NRF)
 
 static struct onoff_client hfclk_cli;
 
@@ -48,6 +42,7 @@ static void hfclk_on_callback(struct onoff_manager *mgr,
 	nrf_802154_clock_hfclk_ready();
 }
 
+#if defined(CONFIG_CLOCK_CONTROL_NRF)
 void nrf_802154_clock_hfclk_start(void)
 {
 	int ret;
@@ -75,40 +70,22 @@ void nrf_802154_clock_hfclk_stop(void)
 	hfclk_is_running = false;
 }
 
-#elif defined(NRF54H_SERIES)
-
-#define NRF_LRCCONF_RADIO_PD NRF_LRCCONF010
-/* HF clock time to ramp-up. */
-#define MAX_HFXO_RAMP_UP_TIME_US 550
-
-static void hfclk_started_timer_handler(struct k_timer *dummy)
-{
-	hfclk_is_running = true;
-	nrf_802154_clock_hfclk_ready();
-}
-
-K_TIMER_DEFINE(hfclk_started_timer, hfclk_started_timer_handler, NULL);
+#elif defined(CONFIG_CLOCK_CONTROL_NRF2)
 
 void nrf_802154_clock_hfclk_start(void)
 {
-	/* Use register directly, there is no support for that task in nrf_lrcconf_task_trigger.
-	 * This code might cause troubles if there are other HFXO users in this CPU.
-	 */
-	NRF_LRCCONF_RADIO_PD->EVENTS_HFXOSTARTED = 0x0;
-	NRF_LRCCONF_RADIO_PD->TASKS_REQHFXO = 0x1;
+	sys_notify_init_callback(&hfclk_cli.notify, hfclk_on_callback);
+	int ret = nrf_clock_control_request(DEVICE_DT_GET(DT_NODELABEL(hfxo)), NULL, &hfclk_cli);
 
-	k_timer_start(&hfclk_started_timer, K_USEC(MAX_HFXO_RAMP_UP_TIME_US), K_NO_WAIT);
+	__ASSERT_NO_MSG(ret >= 0);
 }
 
 void nrf_802154_clock_hfclk_stop(void)
 {
-	/* Use register directly, there is no support for that task in nrf_lrcconf_task_trigger.
-	 * This code might cause troubles if there are other HFXO users in this CPU.
-	 */
-	NRF_LRCCONF_RADIO_PD->TASKS_STOPREQHFXO = 0x1;
-	NRF_LRCCONF_RADIO_PD->EVENTS_HFXOSTARTED = 0x0;
+	int ret = nrf_clock_control_cancel_or_release(DEVICE_DT_GET(DT_NODELABEL(hfxo)),
+						      NULL, &hfclk_cli);
 
-	hfclk_is_running = false;
+	__ASSERT_NO_MSG(ret >= 0);
 }
 
 #endif

From 954583a58b959f33125c561ad1ea367ccc1830f7 Mon Sep 17 00:00:00 2001
From: Piotr Koziar <piotr.koziar@nordicsemi.no>
Date: Tue, 21 Jan 2025 22:00:30 +0100
Subject: [PATCH 1061/2913] [nrf fromtree] modules: hal_nordic: enable
 CLOCK_CONTROL if nrf-802154 RD

Selects CLOCK_CONTROL config whenever nRF 802.15.4 Radio Driver
is enabled.

The driver requires HFCLK api available under the config switch.

Signed-off-by: Piotr Koziar <piotr.koziar@nordicsemi.no>
(cherry picked from commit f6892a4b29db9aceff58d82bf2a4f820d0624472)
---
 modules/hal_nordic/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/hal_nordic/Kconfig b/modules/hal_nordic/Kconfig
index f29b77e120e..183d25d9a19 100644
--- a/modules/hal_nordic/Kconfig
+++ b/modules/hal_nordic/Kconfig
@@ -23,6 +23,7 @@ menuconfig NRF_802154_RADIO_DRIVER
 	depends on HAS_HW_NRF_RADIO_IEEE802154
 	select DYNAMIC_INTERRUPTS
 	select ENTROPY_GENERATOR
+	select CLOCK_CONTROL
 	depends on !$(dt_nodelabel_enabled,timer1)
 	help
 	  This option enables nRF IEEE 802.15.4 radio driver in Zephyr. Note,

From 1aa2f9d42791ff37061af43aa8fa97120f9fbeb7 Mon Sep 17 00:00:00 2001
From: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
Date: Wed, 22 Jan 2025 07:51:44 +0100
Subject: [PATCH 1062/2913] [nrf fromtree] net: Added configuring child
 timeouts on openthread start

Some time ago three Kconfigs dedicated for the child timeouts
configuration were added, but changing them does not apply when
using OpenThread libraries. Added setting these values using
openthread API on openthread start.

Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
(cherry picked from commit 2534dc14b9557094cb902e1814bf7bd50a2c39ac)
---
 subsys/net/l2/openthread/openthread.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/subsys/net/l2/openthread/openthread.c b/subsys/net/l2/openthread/openthread.c
index c70adc0714c..51549bd8de5 100644
--- a/subsys/net/l2/openthread/openthread.c
+++ b/subsys/net/l2/openthread/openthread.c
@@ -21,6 +21,7 @@ LOG_MODULE_REGISTER(net_l2_openthread, CONFIG_OPENTHREAD_L2_LOG_LEVEL);
 #include <zephyr/sys/__assert.h>
 #include <zephyr/version.h>
 
+#include <openthread/child_supervision.h>
 #include <openthread/cli.h>
 #include <openthread/ip6.h>
 #include <openthread/link.h>
@@ -442,6 +443,13 @@ int openthread_start(struct openthread_context *ot_context)
 		otLinkSetPollPeriod(ot_context->instance, OT_POLL_PERIOD);
 	}
 
+	/* Configure Child Supervision and MLE Child timeouts. */
+	otChildSupervisionSetInterval(ot_context->instance,
+				      CONFIG_OPENTHREAD_CHILD_SUPERVISION_INTERVAL);
+	otChildSupervisionSetCheckTimeout(ot_context->instance,
+					  CONFIG_OPENTHREAD_CHILD_SUPERVISION_CHECK_TIMEOUT);
+	otThreadSetChildTimeout(ot_context->instance, CONFIG_OPENTHREAD_MLE_CHILD_TIMEOUT);
+
 	if (otDatasetIsCommissioned(ot_instance)) {
 		/* OpenThread already has dataset stored - skip the
 		 * configuration.

From 2d1e173dfed02366566420ba923a0d293a65bf91 Mon Sep 17 00:00:00 2001
From: Grzegorz Chwierut <grzegorz.chwierut@nordicsemi.no>
Date: Tue, 28 Jan 2025 13:14:16 +0100
Subject: [PATCH 1063/2913] [nrf noup] boards: Update non-secure target for
 nrf54l15

nrf-squash! [nrf noup] boards: Add non-secure target for nrf54L15dk

Enables forcing use of sysbuild to build nrf54l15dk
non-secure board target when using twister

Signed-off-by: Grzegorz Chwierut <grzegorz.chwierut@nordicsemi.no>
---
 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml
index 56b8e9618c0..e58bf792b06 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml
@@ -9,6 +9,7 @@ toolchain:
   - gnuarmemb
   - xtools
   - zephyr
+sysbuild: true
 ram: 256
 flash: 1524
 supported:

From 471e0a9777c568c4680e83c8ea2dc9e17b4f384a Mon Sep 17 00:00:00 2001
From: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
Date: Fri, 24 Jan 2025 12:56:34 +0100
Subject: [PATCH 1064/2913] [nrf fromtree] openthread: fix logging
 configuration

Currently, `CONFIG_OPENTHREAD_LOG_LEVEL` is used to set log level
in OT and register log modules in Zephyr. OpenThread allows 5
levels, causing issues when `OPENTHREAD_LOG_LEVEL_DEBG` is
selected ad we are trying to register modules with unknown lvl.

This commit adds `CONFIG_OPENTHREAD_MODULE_LOG_LEVEL` which is
aligned for Zephyr's log levels.

Signed-off-by: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
(cherry picked from commit 341359568fdbaa217d8c1f71064e97af985a867f)
---
 modules/openthread/platform/alarm.c       |  2 +-
 modules/openthread/platform/ble.c         |  2 +-
 modules/openthread/platform/messagepool.c |  2 +-
 modules/openthread/platform/uart.c        |  2 +-
 subsys/net/l2/openthread/Kconfig          | 12 ++++++++++++
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/modules/openthread/platform/alarm.c b/modules/openthread/platform/alarm.c
index 3cbf1d033e3..827477d9712 100644
--- a/modules/openthread/platform/alarm.c
+++ b/modules/openthread/platform/alarm.c
@@ -5,7 +5,7 @@
  */
 
 #define LOG_MODULE_NAME net_openthread_alarm
-#define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
+#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
diff --git a/modules/openthread/platform/ble.c b/modules/openthread/platform/ble.c
index a2d6cd29af8..c831b402c56 100644
--- a/modules/openthread/platform/ble.c
+++ b/modules/openthread/platform/ble.c
@@ -30,7 +30,7 @@
 /* Zephyr Logging */
 
 #define LOG_MODULE_NAME net_openthread_tcat
-#define LOG_LEVEL       CONFIG_OPENTHREAD_LOG_LEVEL
+#define LOG_LEVEL       CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
 
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
diff --git a/modules/openthread/platform/messagepool.c b/modules/openthread/platform/messagepool.c
index cb9a64674c4..c085aeb9a58 100644
--- a/modules/openthread/platform/messagepool.c
+++ b/modules/openthread/platform/messagepool.c
@@ -10,7 +10,7 @@
 #include <openthread/platform/messagepool.h>
 
 #define LOG_MODULE_NAME net_otPlat_messagepool
-#define LOG_LEVEL       CONFIG_OPENTHREAD_LOG_LEVEL
+#define LOG_LEVEL       CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
 
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
diff --git a/modules/openthread/platform/uart.c b/modules/openthread/platform/uart.c
index ebf156ded15..31afdac6bac 100644
--- a/modules/openthread/platform/uart.c
+++ b/modules/openthread/platform/uart.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
+#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
 #define LOG_MODULE_NAME net_otPlat_uart
 
 #include <zephyr/logging/log.h>
diff --git a/subsys/net/l2/openthread/Kconfig b/subsys/net/l2/openthread/Kconfig
index 0f3c83ef763..9ff68a5f0c9 100644
--- a/subsys/net/l2/openthread/Kconfig
+++ b/subsys/net/l2/openthread/Kconfig
@@ -90,6 +90,18 @@ config OPENTHREAD_LOG_LEVEL
 	default 4 if OPENTHREAD_LOG_LEVEL_INFO
 	default 5 if OPENTHREAD_LOG_LEVEL_DEBG
 	default 0
+	help
+	  Log level for OpenThread stack.
+
+config OPENTHREAD_PLATFORM_LOG_LEVEL
+	int
+	default 1 if OPENTHREAD_LOG_LEVEL_CRIT
+	default 2 if OPENTHREAD_LOG_LEVEL_WARN
+	default 3 if OPENTHREAD_LOG_LEVEL_NOTE || OPENTHREAD_LOG_LEVEL_INFO
+	default 4 if OPENTHREAD_LOG_LEVEL_DEBG
+	default 0
+	help
+	  Log level for OpenThread Zephyr platform.
 
 menuconfig OPENTHREAD_L2_DEBUG
 	bool "OpenThread L2 log support"

From a2eaddb4bcbb177a68f1feb6b43170ce31ea995f Mon Sep 17 00:00:00 2001
From: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
Date: Mon, 27 Jan 2025 08:44:09 +0100
Subject: [PATCH 1065/2913] [nrf fromtree] net: openthread: fix
 `otPlatBleEnable`

If BLE has already been enabled, `bt_enable` returns immediately
and does not call passed callback function.
In this case, call `bt_conn_cb_register` to ensure that callbacks
are registered correctly.

Signed-off-by: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
(cherry picked from commit 1bd8e4459ae161588c5310600dca991bf8d4dbec)
---
 modules/openthread/platform/ble.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openthread/platform/ble.c b/modules/openthread/platform/ble.c
index c831b402c56..1ccb07c2ec3 100644
--- a/modules/openthread/platform/ble.c
+++ b/modules/openthread/platform/ble.c
@@ -476,7 +476,7 @@ otError otPlatBleEnable(otInstance *aInstance)
 		LOG_WRN("BLE enable failed with error code %d", err);
 		return OT_ERROR_FAILED;
 	} else if (err == -EALREADY) {
-		err = k_sem_take(&ot_plat_ble_init_semaphore, K_MSEC(500));
+		bt_conn_cb_register(&conn_callbacks);
 		return OT_ERROR_NONE;
 	}
 

From 7cbe361b02aaa1921916c7bc0c314103730dce6c Mon Sep 17 00:00:00 2001
From: Timothy Keys <timothy.keys@nordicsemi.no>
Date: Sun, 19 Jan 2025 15:42:31 +0000
Subject: [PATCH 1066/2913] [nrf fromtree] ipc: ipc_service: Null terminate
 RPMsg endpoint names

This fixes the compiler warning -Wstringop-truncation in
version 13 of gcc.

Signed-off-by: Timothy Keys <timothy.keys@nordicsemi.no>
(cherry picked from commit 614f55f8bec29ca67a774eb568441ac099827eaa)
---
 subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c b/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c
index a2c0883c054..10c094158b2 100644
--- a/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c
+++ b/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c
@@ -201,6 +201,7 @@ static void ns_bind_cb(struct rpmsg_device *rdev, const char *name, uint32_t des
 		 * call by the HOST core.
 		 */
 		strncpy(rpmsg_ept->name, name, sizeof(rpmsg_ept->name));
+		rpmsg_ept->name[RPMSG_NAME_SIZE - 1] = '\0';
 		rpmsg_ept->dest = dest;
 		k_mutex_unlock(&rpmsg_inst->mtx);
 	}
@@ -403,6 +404,7 @@ static struct ipc_rpmsg_ept *register_ept_on_host(struct ipc_rpmsg_instance *rpm
 		 * not registered the endpoint yet. Cache it.
 		 */
 		strncpy(rpmsg_ept->name, cfg->name, sizeof(rpmsg_ept->name));
+		rpmsg_ept->name[RPMSG_NAME_SIZE - 1] = '\0';
 		k_mutex_unlock(&rpmsg_inst->mtx);
 	}
 
@@ -426,6 +428,7 @@ static struct ipc_rpmsg_ept *register_ept_on_remote(struct ipc_rpmsg_instance *r
 	rpmsg_ept->ep.priv = rpmsg_ept;
 
 	strncpy(rpmsg_ept->name, cfg->name, sizeof(rpmsg_ept->name));
+	rpmsg_ept->name[RPMSG_NAME_SIZE - 1] = '\0';
 
 	err = ipc_rpmsg_register_ept(rpmsg_inst, RPMSG_REMOTE, rpmsg_ept);
 	if (err != 0) {

From f25809ce84196419555e004e1bcb4f87e4c7765b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Fri, 15 Nov 2024 12:26:11 +0100
Subject: [PATCH 1067/2913] [nrf fromlist] drivers: udc_dwc2: Set bit 17 if
 needed on Hibernation Exit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Programming Guide states that bit 17 on PCGCCTL writes should be set if
the controller was enumerated for High Speed operation. Add the missing
bit set to adhere to the Programming Guide.

Upstream PR #: 85039

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
---
 drivers/usb/common/usb_dwc2_hw.h | 32 ++++++++++++++++++++++++++++++++
 drivers/usb/udc/udc_dwc2.c       |  5 +++++
 2 files changed, 37 insertions(+)

diff --git a/drivers/usb/common/usb_dwc2_hw.h b/drivers/usb/common/usb_dwc2_hw.h
index fcb35489a04..d5e272c8752 100644
--- a/drivers/usb/common/usb_dwc2_hw.h
+++ b/drivers/usb/common/usb_dwc2_hw.h
@@ -997,6 +997,33 @@ USB_DWC2_SET_FIELD_DEFINE(doeptsizn_xfersize, DOEPTSIZN_XFERSIZE)
 
 /* Power and Clock Gating Control Register */
 #define USB_DWC2_PCGCCTL			0x0E00UL
+#define USB_DWC2_PCGCCTL_IF_DEV_MODE_POS	31UL
+#define USB_DWC2_PCGCCTL_IF_DEV_MODE		BIT(USB_DWC2_PCGCCTL_IF_DEV_MODE_POS)
+#define USB_DWC2_PCGCCTL_P2HD_PRT_SPD_POS	29UL
+#define USB_DWC2_PCGCCTL_P2HD_PRT_SPD_MASK	(0x3UL << USB_DWC2_PCGCCTL_P2HD_PRT_SPD_POS)
+#define USB_DWC2_PCGCCTL_P2HD_PRT_SPD_LS	2
+#define USB_DWC2_PCGCCTL_P2HD_PRT_SPD_FS	1
+#define USB_DWC2_PCGCCTL_P2HD_PRT_SPD_HS	0
+#define USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_POS	27UL
+#define USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_MASK	(0x3UL << USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_POS)
+#define USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_FS48	3
+#define USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_LS	2
+#define USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_FS	1
+#define USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_HS	0
+#define USB_DWC2_PCGCCTL_MAC_DEV_ADDR_POS	20UL
+#define USB_DWC2_PCGCCTL_MAC_DEV_ADDR_MASK	(0x7FUL << USB_DWC2_PCGCCTL_MAC_DEV_ADDR_POS)
+#define USB_DWC2_PCGCCTL_MAX_TERMSELECT_POS	19UL
+#define USB_DWC2_PCGCCTL_MAX_TERMSELECT		BIT(USB_DWC2_PCGCCTL_MAX_TERMSELECT_POS)
+#define USB_DWC2_PCGCCTL_MAC_XCVRSELECT_POS	17UL
+#define USB_DWC2_PCGCCTL_MAC_XCVRSELECT_MASK	(0x3UL << USB_DWC2_PCGCCTL_MAC_XCVRSELECT_POS)
+#define USB_DWC2_PCGCCTL_MAC_XCVRSELECT_LFS	3
+#define USB_DWC2_PCGCCTL_MAC_XCVRSELECT_LS	2
+#define USB_DWC2_PCGCCTL_MAC_XCVRSELECT_FS	1
+#define USB_DWC2_PCGCCTL_MAC_XCVRSELECT_HS	0
+#define USB_DWC2_PCGCCTL_SH2PL_PRT_CTL0_POS	16UL
+#define USB_DWC2_PCGCCTL_SH2PL_PRT_CTL0		BIT(USB_DWC2_PCGCCTL_SH2PL_PRT_CTL0_POS)
+#define USB_DWC2_PCGCCTL_PRT_CLK_SEL_POS	14UL
+#define USB_DWC2_PCGCCTL_PRT_CLK_SEL_MASK	(0x3UL << USB_DWC2_PCGCCTL_PRT_CLK_SEL_POS)
 #define USB_DWC2_PCGCCTL_RESTOREVALUE_POS	14UL
 #define USB_DWC2_PCGCCTL_RESTOREVALUE_MASK	(0x3FFFFUL << USB_DWC2_PCGCCTL_RESTOREVALUE_POS)
 #define USB_DWC2_PCGCCTL_ESSREGRESTORED_POS	13UL
@@ -1016,6 +1043,11 @@ USB_DWC2_SET_FIELD_DEFINE(doeptsizn_xfersize, DOEPTSIZN_XFERSIZE)
 #define USB_DWC2_PCGCCTL_STOPPCLK_POS		0UL
 #define USB_DWC2_PCGCCTL_STOPPCLK		BIT(USB_DWC2_PCGCCTL_STOPPCLK_POS)
 
+USB_DWC2_GET_FIELD_DEFINE(pcgcctl_p2hd_prt_spd, PCGCCTL_P2HD_PRT_SPD)
+USB_DWC2_GET_FIELD_DEFINE(pcgcctl_p2hd_dev_enum_spd, PCGCCTL_P2HD_DEV_ENUM_SPD)
+USB_DWC2_GET_FIELD_DEFINE(pcgcctl_mac_dev_addr, PCGCCTL_MAC_DEV_ADDR)
+USB_DWC2_GET_FIELD_DEFINE(pcgcctl_mac_xcvrselect, PCGCCTL_MAC_XCVRSELECT)
+USB_DWC2_GET_FIELD_DEFINE(pcgcctl_prt_clk_sel, PCGCCTL_PRT_CLK_SEL)
 USB_DWC2_GET_FIELD_DEFINE(pcgcctl_restorevalue, PCGCCTL_RESTOREVALUE)
 USB_DWC2_SET_FIELD_DEFINE(pcgcctl_restorevalue, PCGCCTL_RESTOREVALUE)
 
diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 7f1256a10f0..072fdbd2e13 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -915,6 +915,11 @@ static void dwc2_restore_essential_registers(const struct device *dev,
 	struct dwc2_reg_backup *backup = &priv->backup;
 	uint32_t pcgcctl = backup->pcgcctl & USB_DWC2_PCGCCTL_RESTOREVALUE_MASK;
 
+	if (usb_dwc2_get_pcgcctl_p2hd_dev_enum_spd(pcgcctl) ==
+	    USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_HS) {
+		pcgcctl |= BIT(17);
+	}
+
 	sys_write32(backup->glpmcfg, (mem_addr_t)&base->glpmcfg);
 	sys_write32(backup->gi2cctl, (mem_addr_t)&base->gi2cctl);
 	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);

From 693769a5c7354efce42af62b6c7f68f77c6678b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Fri, 15 Nov 2024 12:31:27 +0100
Subject: [PATCH 1068/2913] [nrf fromlist] drivers: udc_dwc2: Workaround
 hibernation exit glitch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

DWC2 otg versions earlier than 5.00a are subject to randomly occurring
glitch on Hibernation Exit by Host Initiated Resume, Hibernation Exit by
Device Inititated Resume and Hibernation Exit by Host Initiated Reset.
When the glitch happens the device address is not correctly restored.
If the address is not correctly restored then the tokens addressed to
the device will timeout leading to host resetting the bus.

Upstream PR #: 85039

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
---
 drivers/usb/common/usb_dwc2_hw.h |  3 +++
 drivers/usb/udc/udc_dwc2.c       | 30 ++++++++++++++++++++++--------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/drivers/usb/common/usb_dwc2_hw.h b/drivers/usb/common/usb_dwc2_hw.h
index d5e272c8752..fcd0d2a0060 100644
--- a/drivers/usb/common/usb_dwc2_hw.h
+++ b/drivers/usb/common/usb_dwc2_hw.h
@@ -338,6 +338,9 @@ USB_DWC2_SET_FIELD_DEFINE(gnptxfsiz_nptxfstaddr, GNPTXFSIZ_NPTXFSTADDR)
 #define USB_DWC2_GGPIO_STM32_PWRDWN_POS		16UL
 #define USB_DWC2_GGPIO_STM32_PWRDWN		BIT(USB_DWC2_GGPIO_STM32_PWRDWN_POS)
 
+/* GSNPSID register */
+#define USB_DWC2_GSNPSID_REV_5_00A		0x4F54500AUL
+
 /* GHWCFG1 register */
 #define USB_DWC2_GHWCFG1			0x0044UL
 #define USB_DWC2_GHWCFG1_EPDIR_POS(i)		(i * 2)
diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 072fdbd2e13..01c0f3040ce 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -121,6 +121,8 @@ struct udc_dwc2_data {
 	unsigned int dynfifosizing : 1;
 	unsigned int bufferdma : 1;
 	unsigned int syncrst : 1;
+	/* Defect workarounds */
+	unsigned int wa_essregrestored : 1;
 	/* Runtime state flags */
 	unsigned int hibernated : 1;
 	unsigned int enumdone : 1;
@@ -945,6 +947,21 @@ static void dwc2_restore_essential_registers(const struct device *dev,
 
 	pcgcctl |= USB_DWC2_PCGCCTL_ESSREGRESTORED;
 	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
+
+	/* Note: in Remote Wakeup case 15 ms max signaling time starts now */
+
+	/* Wait for Restore Done Interrupt */
+	dwc2_wait_for_bit(dev, (mem_addr_t)&base->gintsts, USB_DWC2_GINTSTS_RSTRDONEINT);
+
+	if (priv->wa_essregrestored) {
+		pcgcctl &= ~USB_DWC2_PCGCCTL_ESSREGRESTORED;
+		sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
+		k_busy_wait(1);
+	}
+
+	if (!bus_reset) {
+		sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
+	}
 }
 
 static void dwc2_restore_device_registers(const struct device *dev, bool rwup)
@@ -1081,14 +1098,6 @@ static void dwc2_exit_hibernation(const struct device *dev,
 
 	dwc2_restore_essential_registers(dev, rwup, bus_reset);
 
-	/* Note: in Remote Wakeup case 15 ms max signaling time starts now */
-
-	/* Wait for Restore Done Interrupt */
-	dwc2_wait_for_bit(dev, (mem_addr_t)&base->gintsts, USB_DWC2_GINTSTS_RSTRDONEINT);
-	if (!bus_reset) {
-		sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
-	}
-
 	/* Disable restore from PMU */
 	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_RESTORE);
 	k_busy_wait(1);
@@ -1757,6 +1766,7 @@ static int udc_dwc2_init_controller(const struct device *dev)
 	mem_addr_t gahbcfg_reg = (mem_addr_t)&base->gahbcfg;
 	mem_addr_t gusbcfg_reg = (mem_addr_t)&base->gusbcfg;
 	mem_addr_t dcfg_reg = (mem_addr_t)&base->dcfg;
+	uint32_t gsnpsid;
 	uint32_t dcfg;
 	uint32_t gusbcfg;
 	uint32_t gahbcfg;
@@ -1772,6 +1782,10 @@ static int udc_dwc2_init_controller(const struct device *dev)
 		return ret;
 	}
 
+	/* Enable RTL workarounds based on controller revision */
+	gsnpsid = sys_read32((mem_addr_t)&base->gsnpsid);
+	priv->wa_essregrestored = gsnpsid < USB_DWC2_GSNPSID_REV_5_00A;
+
 	priv->ghwcfg1 = sys_read32((mem_addr_t)&base->ghwcfg1);
 	ghwcfg2 = sys_read32((mem_addr_t)&base->ghwcfg2);
 	ghwcfg3 = sys_read32((mem_addr_t)&base->ghwcfg3);

From 1ca0ac931f3eadc09792b59cc81bf2bf4697149a Mon Sep 17 00:00:00 2001
From: Bartosz Miller <bartosz.miller@nordicsemi.no>
Date: Tue, 4 Feb 2025 14:18:18 +0100
Subject: [PATCH 1069/2913] [nrf fromtree] tests: susbys: Implement performance
 test for the NRFS

Add NRFS service handling performance test.

Signed-off-by: Bartosz Miller <bartosz.miller@nordicsemi.no>
(cherry picked from commit 9d20c5c382d9e92529b7232c84f6bd7355cb39d0)
---
 tests/subsys/nrfs/CMakeLists.txt        |  19 ++++
 tests/subsys/nrfs/Kconfig.sysbuild      |   9 ++
 tests/subsys/nrfs/README.txt            |   7 ++
 tests/subsys/nrfs/prj.conf              |  21 ++++
 tests/subsys/nrfs/remote/CMakeLists.txt |  12 ++
 tests/subsys/nrfs/remote/prj.conf       |  21 ++++
 tests/subsys/nrfs/src/main.c            | 141 ++++++++++++++++++++++++
 tests/subsys/nrfs/sysbuild.cmake        |  18 +++
 tests/subsys/nrfs/testcase.yaml         |  14 +++
 9 files changed, 262 insertions(+)
 create mode 100644 tests/subsys/nrfs/CMakeLists.txt
 create mode 100644 tests/subsys/nrfs/Kconfig.sysbuild
 create mode 100644 tests/subsys/nrfs/README.txt
 create mode 100644 tests/subsys/nrfs/prj.conf
 create mode 100644 tests/subsys/nrfs/remote/CMakeLists.txt
 create mode 100644 tests/subsys/nrfs/remote/prj.conf
 create mode 100644 tests/subsys/nrfs/src/main.c
 create mode 100644 tests/subsys/nrfs/sysbuild.cmake
 create mode 100644 tests/subsys/nrfs/testcase.yaml

diff --git a/tests/subsys/nrfs/CMakeLists.txt b/tests/subsys/nrfs/CMakeLists.txt
new file mode 100644
index 00000000000..af485e3dc2f
--- /dev/null
+++ b/tests/subsys/nrfs/CMakeLists.txt
@@ -0,0 +1,19 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+if(NOT SYSBUILD)
+	message(FATAL_ERROR
+		" This is a multi-image application that should be built using sysbuild.\n"
+		" Add --sysbuild argument to west build command to prepare all the images.")
+endif()
+
+project(nrfs)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/tests/subsys/nrfs/Kconfig.sysbuild b/tests/subsys/nrfs/Kconfig.sysbuild
new file mode 100644
index 00000000000..f281257725f
--- /dev/null
+++ b/tests/subsys/nrfs/Kconfig.sysbuild
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
+
+config REMOTE_BOARD
+	string
+	default "$(BOARD)/nrf54h20/cpurad" if SOC_NRF54H20_CPUAPP
+	default "$(BOARD)/nrf54h20/cpuapp" if SOC_NRF54H20_CPURAD
diff --git a/tests/subsys/nrfs/README.txt b/tests/subsys/nrfs/README.txt
new file mode 100644
index 00000000000..45888e61c3c
--- /dev/null
+++ b/tests/subsys/nrfs/README.txt
@@ -0,0 +1,7 @@
+The purpose of this test suite is to validate
+NRFS services request handling performance.
+
+These reaquest are propagated over IPC.
+
+MRAM latency serivice and Temperature service
+are used as benchmarks.
diff --git a/tests/subsys/nrfs/prj.conf b/tests/subsys/nrfs/prj.conf
new file mode 100644
index 00000000000..c1a01949d60
--- /dev/null
+++ b/tests/subsys/nrfs/prj.conf
@@ -0,0 +1,21 @@
+CONFIG_ZTEST=y
+CONFIG_TEST_USERSPACE=y
+
+CONFIG_HEAP_MEM_POOL_SIZE=2048
+CONFIG_ISR_STACK_SIZE=1024
+CONFIG_MAIN_STACK_SIZE=4096
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
+
+CONFIG_NRFS=y
+CONFIG_NRFS_MRAM_SERVICE_ENABLED=y
+CONFIG_NRFS_TEMP_SERVICE_ENABLED=y
+CONFIG_CLOCK_CONTROL=n
+
+CONFIG_ASSERT=y
+
+CONFIG_SERIAL=y
+CONFIG_PRINTK=y
+CONFIG_LOG=y
+CONFIG_LOG_MODE_IMMEDIATE=n
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/tests/subsys/nrfs/remote/CMakeLists.txt b/tests/subsys/nrfs/remote/CMakeLists.txt
new file mode 100644
index 00000000000..a0b3aab8b3d
--- /dev/null
+++ b/tests/subsys/nrfs/remote/CMakeLists.txt
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(remote)
+
+target_sources(app PRIVATE ../src/main.c)
diff --git a/tests/subsys/nrfs/remote/prj.conf b/tests/subsys/nrfs/remote/prj.conf
new file mode 100644
index 00000000000..c1a01949d60
--- /dev/null
+++ b/tests/subsys/nrfs/remote/prj.conf
@@ -0,0 +1,21 @@
+CONFIG_ZTEST=y
+CONFIG_TEST_USERSPACE=y
+
+CONFIG_HEAP_MEM_POOL_SIZE=2048
+CONFIG_ISR_STACK_SIZE=1024
+CONFIG_MAIN_STACK_SIZE=4096
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
+
+CONFIG_NRFS=y
+CONFIG_NRFS_MRAM_SERVICE_ENABLED=y
+CONFIG_NRFS_TEMP_SERVICE_ENABLED=y
+CONFIG_CLOCK_CONTROL=n
+
+CONFIG_ASSERT=y
+
+CONFIG_SERIAL=y
+CONFIG_PRINTK=y
+CONFIG_LOG=y
+CONFIG_LOG_MODE_IMMEDIATE=n
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/tests/subsys/nrfs/src/main.c b/tests/subsys/nrfs/src/main.c
new file mode 100644
index 00000000000..affc38720b3
--- /dev/null
+++ b/tests/subsys/nrfs/src/main.c
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/device.h>
+#include <internal/nrfs_backend.h>
+#include <nrfs_backend_ipc_service.h>
+#include <nrfs_mram.h>
+#include <nrfs_temp.h>
+#include <zephyr/ztest.h>
+
+#define IPC_BACKEND_CONNECTION_TIMEOUT_MS 5000
+#define NUM_OF_MRAM_REQUESTS              10000
+#define MRAM_REQUESTS_DEAD_TIME_MS        1
+#define NUM_OF_TEMP_REQUESTS              100
+#define TEMP_REQUESTS_DEAD_TIME_MS        100
+
+struct ipc_perf_result {
+	uint32_t sent_requests;
+	uint32_t handled_requests;
+	uint32_t failed_to_send;
+};
+
+static volatile uint32_t tst_perf_served_mram_requests;
+static volatile uint32_t tst_perf_served_temp_meas_requests;
+
+/*
+ * Callback function for counting handled TEMP service requests
+ */
+static void temp_handler_for_performance_test(nrfs_temp_evt_t const *p_evt, void *context)
+{
+	switch (p_evt->type) {
+	case NRFS_TEMP_EVT_MEASURE_DONE:
+		tst_perf_served_temp_meas_requests++;
+	default:
+		break;
+	}
+}
+
+/*
+ * Callback function for counting handled MRAM service requests
+ */
+static void mram_latency_handler_for_performance_test(nrfs_mram_latency_evt_t const *p_evt,
+						      void *context)
+{
+	switch (p_evt->type) {
+	case NRFS_MRAM_LATENCY_REQ_APPLIED:
+		tst_perf_served_mram_requests++;
+	default:
+		break;
+	}
+}
+
+/*
+ * Test NRFS MRAM latency service requests handling performance
+ */
+ZTEST(nrfs_stress_test, test_mram_nrfs_requests_performance)
+{
+	struct ipc_perf_result tst_ipc_perf_result;
+	uint32_t request_counter = 0;
+	volatile int32_t tst_ctx = 1;
+
+	TC_PRINT("START test_mram_nrfs_requests_performance\n");
+	zassert_equal(nrfs_mram_init(mram_latency_handler_for_performance_test), NRFS_SUCCESS,
+		      "Failed to initialise NRFS MRAM latency service");
+	memset(&tst_ipc_perf_result, 0, sizeof(tst_ipc_perf_result));
+	while (request_counter < NUM_OF_MRAM_REQUESTS) {
+		if (nrfs_mram_set_latency(true, (void *)tst_ctx) == NRFS_SUCCESS) {
+			tst_ipc_perf_result.sent_requests++;
+		} else {
+			tst_ipc_perf_result.failed_to_send++;
+		}
+		k_msleep(MRAM_REQUESTS_DEAD_TIME_MS);
+		tst_ctx++;
+		request_counter++;
+	}
+	/* wait for any remaining requests responses */
+	k_msleep(10 * MRAM_REQUESTS_DEAD_TIME_MS);
+	tst_ipc_perf_result.handled_requests = tst_perf_served_mram_requests;
+	TC_PRINT("STOP test_mram_nrfs_requests_performance\n");
+	TC_PRINT("SENT: %d, HANDLED: %d, FAILED TO SEND: %d\n", tst_ipc_perf_result.sent_requests,
+		 tst_ipc_perf_result.handled_requests, tst_ipc_perf_result.failed_to_send);
+	zassert_equal(tst_ipc_perf_result.sent_requests, tst_ipc_perf_result.handled_requests,
+		      "NRFS MRAM requests sent != served");
+}
+
+/*
+ * Test temperature service requests handling performance
+ */
+ZTEST(nrfs_stress_test, test_temperature_nrfs_requests_performance)
+{
+	struct ipc_perf_result tst_ipc_perf_result;
+	uint32_t request_counter = 0;
+	volatile int32_t tst_ctx = 1;
+
+	TC_PRINT("START test_temperature_nrfs_requests_performance\n");
+	zassert_equal(nrfs_temp_init(temp_handler_for_performance_test), NRFS_SUCCESS,
+		      "Failed to initialise NRFS temperature service");
+	memset((void *)&tst_ipc_perf_result, 0, sizeof(tst_ipc_perf_result));
+	while (request_counter < NUM_OF_TEMP_REQUESTS) {
+		if (nrfs_temp_measure_request((void *)tst_ctx) == NRFS_SUCCESS) {
+			tst_ipc_perf_result.sent_requests++;
+		} else {
+			tst_ipc_perf_result.failed_to_send++;
+		}
+		k_msleep(TEMP_REQUESTS_DEAD_TIME_MS);
+		tst_ctx++;
+		request_counter++;
+	}
+	/* wait for any remaining requests responses */
+	k_msleep(10 * TEMP_REQUESTS_DEAD_TIME_MS);
+	tst_ipc_perf_result.handled_requests = tst_perf_served_temp_meas_requests;
+	TC_PRINT("STOP test_temperature_nrfs_requests_performance\n");
+	TC_PRINT("SENT: %d, HANDLED: %d, FAILED TO SEND: %d\n", tst_ipc_perf_result.sent_requests,
+		 tst_ipc_perf_result.handled_requests, tst_ipc_perf_result.failed_to_send);
+	zassert_equal(tst_ipc_perf_result.sent_requests, tst_ipc_perf_result.handled_requests,
+		      "NRFS TEMP requests sent != served");
+}
+
+/*
+ * Test setup
+ */
+static void *test_setup(void)
+{
+	int ret;
+
+	tst_perf_served_mram_requests = 0;
+	tst_perf_served_temp_meas_requests = 0;
+
+	TC_PRINT("Hello World! %s\n", CONFIG_BOARD_TARGET);
+	TC_PRINT("Waiting for NRFS backend init\n");
+
+	/* Wait for IPC backend connection */
+	ret = nrfs_backend_wait_for_connection(K_MSEC(IPC_BACKEND_CONNECTION_TIMEOUT_MS));
+	zassert_equal(ret, 0, "Failed to establih NRFS backend connection. err: %d", ret);
+	return NULL;
+}
+
+ZTEST_SUITE(nrfs_stress_test, NULL, test_setup, NULL, NULL, NULL);
diff --git a/tests/subsys/nrfs/sysbuild.cmake b/tests/subsys/nrfs/sysbuild.cmake
new file mode 100644
index 00000000000..41e281ff18d
--- /dev/null
+++ b/tests/subsys/nrfs/sysbuild.cmake
@@ -0,0 +1,18 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if("${SB_CONFIG_REMOTE_BOARD}" STREQUAL "")
+  message(FATAL_ERROR "REMOTE_BOARD must be set to a valid board name")
+endif()
+
+# Add remote project
+ExternalZephyrProject_Add(
+    APPLICATION remote
+    SOURCE_DIR ${APP_DIR}/remote
+    BOARD ${SB_CONFIG_REMOTE_BOARD}
+    BOARD_REVISION ${BOARD_REVISION}
+  )
+
+# Add a dependency so that the remote image will be built and flashed first
+add_dependencies(nrfs remote)
+sysbuild_add_dependencies(FLASH nrfs remote)
diff --git a/tests/subsys/nrfs/testcase.yaml b/tests/subsys/nrfs/testcase.yaml
new file mode 100644
index 00000000000..527ff477cd0
--- /dev/null
+++ b/tests/subsys/nrfs/testcase.yaml
@@ -0,0 +1,14 @@
+common:
+  platform_allow:
+    - nrf54h20dk/nrf54h20/cpuapp
+    - nrf54h20dk/nrf54h20/cpurad
+  integration_platforms:
+    - nrf54h20dk/nrf54h20/cpuapp
+    - nrf54h20dk/nrf54h20/cpurad
+  tags:
+    - nrfs
+  harness: ztest
+  sysbuild: true
+
+tests:
+  subsys.nrfs.stress_test: {}

From 817a6d2a7e6e972e5b25c64f1d7c1fb827ca5f0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Mon, 13 Jan 2025 14:31:25 +0100
Subject: [PATCH 1070/2913] [nrf fromtree] drivers: udc_dwc2: Fix large control
 write transfers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The DOEPTSIZ0 XferSize field is 7 bits long, meaning that maximum single
transfer can be 127 bytes long. Configure the control write (OUT)
transfers considering the XferSize field size to support transfers with
data stage larger than 127 bytes.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 18be1d076807a0c7a8b8e3c877302611b8c4d7d7)
---
 drivers/usb/udc/udc_dwc2.c | 39 ++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 01c0f3040ce..2a1efb847dc 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -250,6 +250,28 @@ static uint32_t dwc2_get_iept_xfersize(const struct device *dev, const uint32_t
 	}
 }
 
+static uint32_t dwc2_get_oept_pktctn(const struct device *dev, const uint32_t idx)
+{
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+
+	if (idx == 0) {
+		return usb_dwc2_get_doeptsiz0_pktcnt(UINT32_MAX);
+	} else {
+		return priv->max_pktcnt;
+	}
+}
+
+static uint32_t dwc2_get_oept_xfersize(const struct device *dev, const uint32_t idx)
+{
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+
+	if (idx == 0) {
+		return usb_dwc2_get_doeptsiz0_xfersize(UINT32_MAX);
+	} else {
+		return priv->max_xfersize;
+	}
+}
+
 static void dwc2_flush_rx_fifo(const struct device *dev)
 {
 	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
@@ -582,18 +604,23 @@ static void dwc2_prep_rx(const struct device *dev, struct net_buf *buf,
 	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
 	mem_addr_t doeptsiz_reg = (mem_addr_t)&base->out_ep[ep_idx].doeptsiz;
 	mem_addr_t doepctl_reg = dwc2_get_dxepctl_reg(dev, ep_idx);
+	uint32_t max_xfersize, max_pktcnt;
+	const uint32_t addnl = USB_MPS_ADDITIONAL_TRANSACTIONS(cfg->mps);
 	uint32_t pktcnt;
 	uint32_t doeptsiz;
 	uint32_t doepctl;
 	uint32_t xfersize;
 
+	max_xfersize = dwc2_get_oept_xfersize(dev, ep_idx);
+	max_pktcnt = dwc2_get_oept_pktctn(dev, ep_idx);
+
 	/* Clear NAK and set endpoint enable */
 	doepctl = sys_read32(doepctl_reg);
 	doepctl |= USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_CNAK;
 
 	if (dwc2_ep_is_iso(cfg)) {
 		xfersize = USB_MPS_TO_TPL(cfg->mps);
-		pktcnt = 1 + USB_MPS_ADDITIONAL_TRANSACTIONS(cfg->mps);
+		pktcnt = 1 + addnl;
 
 		if (xfersize > net_buf_tailroom(buf)) {
 			LOG_ERR("ISO RX buffer too small");
@@ -610,14 +637,18 @@ static void dwc2_prep_rx(const struct device *dev, struct net_buf *buf,
 		xfersize = net_buf_tailroom(buf);
 
 		/* Do as many packets in a single transfer as possible */
-		if (xfersize > priv->max_xfersize) {
-			xfersize = ROUND_DOWN(priv->max_xfersize, USB_MPS_TO_TPL(cfg->mps));
+		if (xfersize > max_xfersize) {
+			xfersize = ROUND_DOWN(max_xfersize, USB_MPS_TO_TPL(cfg->mps));
 		}
 
 		pktcnt = DIV_ROUND_UP(xfersize, USB_MPS_EP_SIZE(cfg->mps));
 	}
 
-	pktcnt = DIV_ROUND_UP(xfersize, udc_mps_ep_size(cfg));
+	if (pktcnt > max_pktcnt) {
+		pktcnt = ROUND_DOWN(max_pktcnt, (1 + addnl));
+		xfersize = pktcnt * udc_mps_ep_size(cfg);
+	}
+
 	doeptsiz = usb_dwc2_set_doeptsizn_pktcnt(pktcnt) |
 		   usb_dwc2_set_doeptsizn_xfersize(xfersize);
 	if (cfg->addr == USB_CONTROL_EP_OUT) {

From 82c286d8128fce927ad19bb95cfb2f1a7a941f43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Tue, 14 Jan 2025 11:32:42 +0100
Subject: [PATCH 1071/2913] [nrf fromtree] drivers: udc_dwc2: Recover after
 STALLed OUT Data Stage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prepare buffer to receive SETUP data on OUT endpoint 0 after endpoint
halt. This solves the issue where the device would no longer process any
control transfers after the first failed transfer with too large OUT
Data Stage (when processing failed due to data stage buffer allocation
failure).

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 883b77fe3bb08c93ca302fb8ea3c11af2ebd00ff)
---
 drivers/usb/udc/udc_dwc2.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 2a1efb847dc..e117f1b172b 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -1591,6 +1591,9 @@ static int udc_dwc2_ep_set_halt(const struct device *dev,
 	LOG_DBG("Set halt ep 0x%02x", cfg->addr);
 	if (ep_idx != 0) {
 		cfg->stat.halted = true;
+	} else if (!udc_buf_peek(dev, USB_CONTROL_EP_OUT)) {
+		/* Data stage is STALLed, allow receiving next SETUP */
+		dwc2_ctrl_feed_dout(dev, 8);
 	}
 
 	return 0;

From 3d948a5c5b56a167bd58bd66a0b891ee48916c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Wed, 15 Jan 2025 14:44:56 +0100
Subject: [PATCH 1072/2913] [nrf fromtree] drivers: udc_dwc2: Fix multipart DMA
 OUT transfers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

DMA transfers are supposed to write to buffer tail. Use the proper
pointer to make multipart DMA transfers actually write the data to the
intended location.

The issue was observed on control write transfers where the OUT Data
Stage was at least 128 bytes (because endpoint 0 transfer width is
limited to 7 bits).

The issue is unlikely to happen on non-control transfers because the
transfer size width is at least 11 bits (at most 19 bits) and packet
size counter is at least 4 bits (at most: 10 bits) which means that
at least 2048 byte transfer spanning at least 15 packets (or at least
524288 byte spanning 1023 packets for 19 bits transfer size counter
and 10 bits packet counter) is required to necessitate multipart DMA.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 45ee2a0b0d105c390ee8298babe490ea348dc493)
---
 drivers/usb/udc/udc_dwc2.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index e117f1b172b..6d39ef54e3d 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -660,17 +660,19 @@ static void dwc2_prep_rx(const struct device *dev, struct net_buf *buf,
 	sys_write32(doeptsiz, doeptsiz_reg);
 
 	if (priv->bufferdma) {
-		if (!dwc2_dma_buffer_ok_to_use(dev, buf->data, xfersize, cfg->mps)) {
+		void *data = net_buf_tail(buf);
+
+		if (!dwc2_dma_buffer_ok_to_use(dev, data, xfersize, cfg->mps)) {
 			/* Cannot continue unless buffer is bounced. Device will
 			 * cease to function. Is fatal error appropriate here?
 			 */
 			return;
 		}
 
-		sys_write32((uint32_t)buf->data,
+		sys_write32((uint32_t)data,
 			    (mem_addr_t)&base->out_ep[ep_idx].doepdma);
 
-		sys_cache_data_invd_range(buf->data, xfersize);
+		sys_cache_data_invd_range(data, xfersize);
 	}
 
 	sys_write32(doepctl, doepctl_reg);
@@ -2514,7 +2516,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 	}
 
 	if (priv->bufferdma && bcnt) {
-		sys_cache_data_invd_range(buf->data, bcnt);
+		sys_cache_data_invd_range(net_buf_tail(buf), bcnt);
 		net_buf_add(buf, bcnt);
 	}
 

From a284c3984b869c552e8f0df014cd49593391aac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Tue, 4 Feb 2025 12:46:26 +0100
Subject: [PATCH 1073/2913] [nrf fromtree] drivers: udc_dwc2: Add helpers to
 check operating mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use helper functions to check whether device is operating in Buffer DMA
or Completer mode. This allows compile time optimizations to remove DMA
handling code when DMA is disabled via KConfig symbol UDC_DWC2_DMA.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit d4cc8de6448198a2ed6e66fc2c227b8d730ada78)
---
 drivers/usb/udc/udc_dwc2.c | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 6d39ef54e3d..61c16d1082b 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -203,6 +203,20 @@ static void dwc2_wait_for_bit(const struct device *dev,
 	}
 }
 
+static inline bool dwc2_in_completer_mode(const struct device *dev)
+{
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+
+	return !IS_ENABLED(CONFIG_UDC_DWC2_DMA) || !priv->bufferdma;
+}
+
+static inline bool dwc2_in_buffer_dma_mode(const struct device *dev)
+{
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+
+	return IS_ENABLED(CONFIG_UDC_DWC2_DMA) && priv->bufferdma;
+}
+
 /* Get DOEPCTLn or DIEPCTLn register address */
 static mem_addr_t dwc2_get_dxepctl_reg(const struct device *dev, const uint8_t ep)
 {
@@ -422,7 +436,7 @@ static int dwc2_tx_fifo_write(const struct device *dev,
 		len = buf->len;
 	}
 
-	if (!priv->bufferdma) {
+	if (dwc2_in_completer_mode(dev)) {
 		uint32_t spcavail = dwc2_ftx_avail(dev, ep_idx);
 		uint32_t spcperpkt = ROUND_UP(udc_mps_ep_size(cfg), 4);
 		uint32_t max_pkts, max_transfer;
@@ -487,7 +501,7 @@ static int dwc2_tx_fifo_write(const struct device *dev,
 		    usb_dwc2_set_dieptsizn_pktcnt(pktcnt) |
 		    usb_dwc2_set_dieptsizn_xfersize(len), dieptsiz_reg);
 
-	if (priv->bufferdma) {
+	if (dwc2_in_buffer_dma_mode(dev)) {
 		if (!dwc2_dma_buffer_ok_to_use(dev, buf->data, len, cfg->mps)) {
 			/* Cannot continue unless buffer is bounced. Device will
 			 * cease to function. Is fatal error appropriate here?
@@ -530,7 +544,7 @@ static int dwc2_tx_fifo_write(const struct device *dev,
 	/* Clear IN Endpoint NAK Effective interrupt in case it was set */
 	sys_write32(USB_DWC2_DIEPINT_INEPNAKEFF, diepint_reg);
 
-	if (!priv->bufferdma) {
+	if (dwc2_in_completer_mode(dev)) {
 		const uint8_t *src = buf->data;
 
 		while (pktcnt > 0) {
@@ -659,7 +673,7 @@ static void dwc2_prep_rx(const struct device *dev, struct net_buf *buf,
 	priv->rx_siz[ep_idx] = doeptsiz;
 	sys_write32(doeptsiz, doeptsiz_reg);
 
-	if (priv->bufferdma) {
+	if (dwc2_in_buffer_dma_mode(dev)) {
 		void *data = net_buf_tail(buf);
 
 		if (!dwc2_dma_buffer_ok_to_use(dev, data, xfersize, cfg->mps)) {
@@ -1211,7 +1225,7 @@ static int dwc2_set_dedicated_fifo(const struct device *dev,
 	tmp = *diepctl & ~USB_DWC2_DEPCTL_TXFNUM_MASK;
 
 	reqdep = DIV_ROUND_UP(udc_mps_ep_size(cfg), 4U);
-	if (priv->bufferdma) {
+	if (dwc2_in_buffer_dma_mode(dev)) {
 		/* In DMA mode, TxFIFO capable of holding 2 packets is enough */
 		reqdep *= MIN(2, (1 + addnl));
 	} else {
@@ -2292,7 +2306,7 @@ static void dwc2_on_bus_reset(const struct device *dev)
 	}
 
 	doepmsk = USB_DWC2_DOEPINT_SETUP | USB_DWC2_DOEPINT_XFERCOMPL;
-	if (priv->bufferdma) {
+	if (dwc2_in_buffer_dma_mode(dev)) {
 		doepmsk |= USB_DWC2_DOEPINT_STSPHSERCVD;
 	}
 
@@ -2300,7 +2314,7 @@ static void dwc2_on_bus_reset(const struct device *dev)
 	sys_set_bits((mem_addr_t)&base->diepmsk, USB_DWC2_DIEPINT_XFERCOMPL);
 
 	/* Software has to handle RxFLvl interrupt only in Completer mode */
-	if (!priv->bufferdma) {
+	if (dwc2_in_completer_mode(dev)) {
 		sys_set_bits((mem_addr_t)&base->gintmsk,
 			     USB_DWC2_GINTSTS_RXFLVL);
 	}
@@ -2506,7 +2520,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 		}
 
 		if (!valid) {
-			if (!priv->bufferdma) {
+			if (dwc2_in_completer_mode(dev)) {
 				/* RxFlvl added data to net buf, rollback */
 				net_buf_remove_mem(buf, bcnt);
 			}
@@ -2515,7 +2529,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 		}
 	}
 
-	if (priv->bufferdma && bcnt) {
+	if (dwc2_in_buffer_dma_mode(dev) && bcnt) {
 		sys_cache_data_invd_range(net_buf_tail(buf), bcnt);
 		net_buf_add(buf, bcnt);
 	}
@@ -2559,7 +2573,8 @@ static inline void dwc2_handle_oepint(const struct device *dev)
 		/* StupPktRcvd is not enabled for interrupt, but must be checked
 		 * when XferComp hits to determine if SETUP token was received.
 		 */
-		if (priv->bufferdma && (status & USB_DWC2_DOEPINT_XFERCOMPL) &&
+		if (dwc2_in_buffer_dma_mode(dev) &&
+		    (status & USB_DWC2_DOEPINT_XFERCOMPL) &&
 		    (doepint & USB_DWC2_DOEPINT_STUPPKTRCVD)) {
 			uint32_t addr;
 

From 5ee4d804cc4d5e4cd4656d40122b58dfde20b299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Tue, 4 Feb 2025 13:29:12 +0100
Subject: [PATCH 1074/2913] [nrf fromtree] drivers: udc_dwc2: Allocate multiple
 of bMaxPacketSize0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Control OUT buffers must be multiple of bMaxPacketSize0 in Buffer DMA
mode. While the transfer can be configured to smaller values, DMA will
write data past the buffer (and transfer size counter will underflow) if
the packet on the bus is larger or if there are multiple back-to-back
SETUP packets.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit a61afc8eb1131904c157496c278268e434b19d7e)
---
 drivers/usb/udc/udc_dwc2.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 61c16d1082b..930fdc15f15 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -666,8 +666,7 @@ static void dwc2_prep_rx(const struct device *dev, struct net_buf *buf,
 	doeptsiz = usb_dwc2_set_doeptsizn_pktcnt(pktcnt) |
 		   usb_dwc2_set_doeptsizn_xfersize(xfersize);
 	if (cfg->addr == USB_CONTROL_EP_OUT) {
-		/* Use 1 to allow 8 byte long buffers for SETUP data */
-		doeptsiz |= (1 << USB_DWC2_DOEPTSIZ0_SUPCNT_POS);
+		doeptsiz |= (3 << USB_DWC2_DOEPTSIZ0_SUPCNT_POS);
 	}
 
 	priv->rx_siz[ep_idx] = doeptsiz;
@@ -727,10 +726,17 @@ static void dwc2_handle_xfer_next(const struct device *dev,
 
 static int dwc2_ctrl_feed_dout(const struct device *dev, const size_t length)
 {
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
 	struct net_buf *buf;
+	size_t alloc_len = length;
+
+	if (dwc2_in_buffer_dma_mode(dev)) {
+		/* Control OUT buffers must be multiple of bMaxPacketSize0 */
+		alloc_len = ROUND_UP(length, 64);
+	}
 
-	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, length);
+	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, alloc_len);
 	if (buf == NULL) {
 		return -ENOMEM;
 	}

From a82f2fc83c091d9aa538b980e39922763bf5b234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Tue, 4 Feb 2025 13:40:24 +0100
Subject: [PATCH 1075/2913] [nrf fromtree] drivers: udc_dwc2: Stop OUT
 transfers on ZLP
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The transfer is finished after ZLP is transmitted. Do not re-enable the
endpoint waiting for more data.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit ea72b27f3dbeabd9f07254b077ba9a8baf3c0b73)
---
 drivers/usb/udc/udc_dwc2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 930fdc15f15..a4065b89354 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -2540,7 +2540,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 		net_buf_add(buf, bcnt);
 	}
 
-	if (!is_iso && (bcnt % udc_mps_ep_size(ep_cfg)) == 0 &&
+	if (!is_iso && bcnt && (bcnt % udc_mps_ep_size(ep_cfg)) == 0 &&
 	    net_buf_tailroom(buf)) {
 		dwc2_prep_rx(dev, buf, ep_cfg);
 	} else {

From d0bef36f9bda4c30f58382d57413f01d8d55ba2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Tue, 21 Jan 2025 14:08:31 +0100
Subject: [PATCH 1076/2913] [nrf fromtree] drivers: udc_dwc2: Rework control
 endpoint feeding
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In Completer mode SETUP data can always be received and therefore
endpoint 0 should only be enabled for OUT Data Stage and OUT Status
Stage.

In Buffer DMA mode, SETUP can only be received when endpoint is enabled
and therefore the software has to make sure that there is a buffer
available to receive SETUP data.

Rework the EP0 buffer feeding to adhere to DWC2 Programming Guide.
Synchronize the accesses with driver mutex to avoid interrupt related
race conditions.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 8348d9a2b712378998015f91176abe63adb2dfa7)
---
 drivers/usb/udc/udc_dwc2.c | 172 +++++++++++++++++++++++--------------
 1 file changed, 107 insertions(+), 65 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index a4065b89354..d1fc555d839 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -25,6 +25,8 @@ LOG_MODULE_REGISTER(udc_dwc2, CONFIG_UDC_DRIVER_LOG_LEVEL);
 #include "udc_dwc2_vendor_quirks.h"
 
 enum dwc2_drv_event_type {
+	/* USB connection speed determined after bus reset */
+	DWC2_DRV_EVT_ENUM_DONE,
 	/* Trigger next transfer, must not be used for control OUT */
 	DWC2_DRV_EVT_XFER,
 	/* Setup packet received */
@@ -383,6 +385,42 @@ static bool dwc2_ep_is_iso(struct udc_ep_config *const cfg)
 	return (cfg->attributes & USB_EP_TRANSFER_TYPE_MASK) == USB_EP_TYPE_ISO;
 }
 
+static int dwc2_ctrl_feed_dout(const struct device *dev, const size_t length)
+{
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
+	struct net_buf *buf;
+	size_t alloc_len = length;
+
+	if (dwc2_in_buffer_dma_mode(dev)) {
+		/* Control OUT buffers must be multiple of bMaxPacketSize0 */
+		alloc_len = ROUND_UP(length, 64);
+	}
+
+	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, alloc_len);
+	if (buf == NULL) {
+		return -ENOMEM;
+	}
+
+	udc_buf_put(ep_cfg, buf);
+	k_event_post(&priv->xfer_new, BIT(16));
+	k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
+
+	return 0;
+}
+
+static void dwc2_ensure_setup_ready(const struct device *dev)
+{
+	if (dwc2_in_completer_mode(dev)) {
+		/* In Completer mode EP0 can always receive SETUP data */
+		return;
+	}
+
+	if (!udc_buf_peek(dev, USB_CONTROL_EP_OUT)) {
+		dwc2_ctrl_feed_dout(dev, 8);
+	}
+}
+
 static bool dwc2_dma_buffer_ok_to_use(const struct device *dev, void *buf,
 				      uint32_t xfersize, uint16_t mps)
 {
@@ -708,6 +746,26 @@ static void dwc2_handle_xfer_next(const struct device *dev,
 	} else {
 		int err = dwc2_tx_fifo_write(dev, cfg, buf);
 
+		if (cfg->addr == USB_CONTROL_EP_IN) {
+			/* Feed a buffer for the next setup packet after arming
+			 * IN endpoint with the data. This is necessary both in
+			 * IN Data Stage (Control Read Transfer) and IN Status
+			 * Stage (Control Write Transfers and Control Transfers
+			 * without Data Stage).
+			 *
+			 * The buffer must be fed here in Buffer DMA mode to
+			 * allow receiving premature SETUP. This inevitably does
+			 * automatically arm the buffer for OUT Status Stage.
+			 *
+			 * The buffer MUST NOT be fed here in Completer mode to
+			 * avoid race condition where the next Control Write
+			 * Transfer Data Stage is received into the buffer.
+			 */
+			if (dwc2_in_buffer_dma_mode(dev)) {
+				dwc2_ctrl_feed_dout(dev, 8);
+			}
+		}
+
 		if (err) {
 			LOG_ERR("Failed to start write to TX FIFO, ep 0x%02x (err: %d)",
 				cfg->addr, err);
@@ -724,39 +782,35 @@ static void dwc2_handle_xfer_next(const struct device *dev,
 	udc_ep_set_busy(dev, cfg->addr, true);
 }
 
-static int dwc2_ctrl_feed_dout(const struct device *dev, const size_t length)
+static int dwc2_handle_evt_setup(const struct device *dev)
 {
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
 	struct net_buf *buf;
-	size_t alloc_len = length;
+	int err;
 
-	if (dwc2_in_buffer_dma_mode(dev)) {
-		/* Control OUT buffers must be multiple of bMaxPacketSize0 */
-		alloc_len = ROUND_UP(length, 64);
-	}
+	/* In Completer mode SETUP data is received without preparing endpoint 0
+	 * transfer beforehand. In Buffer DMA the SETUP can be copied to any EP0
+	 * OUT buffer. If there is any buffer queued, it is obsolete now.
+	 */
+	k_event_clear(&priv->xfer_finished, BIT(0) | BIT(16));
 
-	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, alloc_len);
-	if (buf == NULL) {
-		return -ENOMEM;
+	buf = udc_buf_get_all(dev, USB_CONTROL_EP_OUT);
+	if (buf) {
+		net_buf_unref(buf);
 	}
 
-	udc_buf_put(ep_cfg, buf);
-	dwc2_prep_rx(dev, buf, ep_cfg);
-	LOG_DBG("feed buf %p", buf);
-
-	return 0;
-}
+	buf = udc_buf_get_all(dev, USB_CONTROL_EP_IN);
+	if (buf) {
+		net_buf_unref(buf);
+	}
 
-static int dwc2_handle_evt_setup(const struct device *dev)
-{
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	struct net_buf *buf;
-	int err;
+	udc_ep_set_busy(dev, USB_CONTROL_EP_OUT, false);
+	udc_ep_set_busy(dev, USB_CONTROL_EP_IN, false);
 
-	buf = udc_buf_get(dev, USB_CONTROL_EP_OUT);
+	/* Allocate buffer and copy received SETUP for processing */
+	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, 8);
 	if (buf == NULL) {
-		LOG_ERR("No buffer queued for control ep");
+		LOG_ERR("No buffer available for control ep");
 		return -ENODATA;
 	}
 
@@ -773,30 +827,17 @@ static int dwc2_handle_evt_setup(const struct device *dev)
 		/*  Allocate and feed buffer for data OUT stage */
 		LOG_DBG("s:%p|feed for -out-", buf);
 
-		/* Allocate at least 8 bytes in case the host decides to send
-		 * SETUP DATA instead of OUT DATA packet.
-		 */
-		err = dwc2_ctrl_feed_dout(dev, MAX(udc_data_stage_length(buf), 8));
+		err = dwc2_ctrl_feed_dout(dev, udc_data_stage_length(buf));
 		if (err == -ENOMEM) {
 			err = udc_submit_ep_event(dev, buf, err);
 		}
 	} else if (udc_ctrl_stage_is_data_in(dev)) {
 		LOG_DBG("s:%p|feed for -in-status", buf);
 
-		err = dwc2_ctrl_feed_dout(dev, 8);
-		if (err == -ENOMEM) {
-			err = udc_submit_ep_event(dev, buf, err);
-		}
-
 		err = udc_ctrl_submit_s_in_status(dev);
 	} else {
 		LOG_DBG("s:%p|feed >setup", buf);
 
-		err = dwc2_ctrl_feed_dout(dev, 8);
-		if (err == -ENOMEM) {
-			err = udc_submit_ep_event(dev, buf, err);
-		}
-
 		err = udc_ctrl_submit_s_status(dev);
 	}
 
@@ -806,6 +847,7 @@ static int dwc2_handle_evt_setup(const struct device *dev)
 static inline int dwc2_handle_evt_dout(const struct device *dev,
 				       struct udc_ep_config *const cfg)
 {
+	struct udc_data *data = dev->data;
 	struct net_buf *buf;
 	int err = 0;
 
@@ -822,25 +864,14 @@ static inline int dwc2_handle_evt_dout(const struct device *dev,
 			/* s-in-status finished */
 			LOG_DBG("dout:%p| status, feed >s", buf);
 
-			/* Feed a buffer for the next setup packet */
-			err = dwc2_ctrl_feed_dout(dev, 8);
-			if (err == -ENOMEM) {
-				err = udc_submit_ep_event(dev, buf, err);
-			}
-
 			/* Status stage finished, notify upper layer */
 			udc_ctrl_submit_status(dev, buf);
-		} else {
-			/*
-			 * For all other cases we feed with a buffer
-			 * large enough for setup packet.
-			 */
-			LOG_DBG("dout:%p| data, feed >s", buf);
 
-			err = dwc2_ctrl_feed_dout(dev, 8);
-			if (err == -ENOMEM) {
-				err = udc_submit_ep_event(dev, buf, err);
+			if (dwc2_in_buffer_dma_mode(dev)) {
+				dwc2_ctrl_feed_dout(dev, 8);
 			}
+		} else {
+			LOG_DBG("dout:%p| data, feed >s", buf);
 		}
 
 		/* Update to next stage of control transfer */
@@ -849,6 +880,13 @@ static inline int dwc2_handle_evt_dout(const struct device *dev,
 		if (udc_ctrl_stage_is_status_in(dev)) {
 			err = udc_ctrl_submit_s_out_status(dev, buf);
 		}
+
+		if (data->stage == CTRL_PIPE_STAGE_ERROR) {
+			/* Allow receiving next SETUP. USB stack won't queue any
+			 * buffer because it has no clue about this transfer.
+			 */
+			dwc2_ensure_setup_ready(dev);
+		}
 	} else {
 		err = udc_submit_ep_event(dev, buf, 0);
 	}
@@ -892,10 +930,12 @@ static int dwc2_handle_evt_din(const struct device *dev,
 		udc_ctrl_update_stage(dev, buf);
 
 		if (udc_ctrl_stage_is_status_out(dev)) {
-			/*
-			 * IN transfer finished, release buffer,
-			 * control OUT buffer should be already fed.
-			 */
+			if (dwc2_in_completer_mode(dev)) {
+				/* Allow OUT status stage */
+				dwc2_ctrl_feed_dout(dev, 8);
+			}
+
+			/* IN transfer finished, release buffer. */
 			net_buf_unref(buf);
 		}
 
@@ -1322,13 +1362,7 @@ static int dwc2_ep_control_enable(const struct device *dev,
 	dxepctl0 |= USB_DWC2_DEPCTL_USBACTEP;
 
 	if (cfg->addr == USB_CONTROL_EP_OUT) {
-		int ret;
-
 		dwc2_flush_rx_fifo(dev);
-		ret = dwc2_ctrl_feed_dout(dev, 8);
-		if (ret) {
-			return ret;
-		}
 	} else {
 		dwc2_flush_tx_fifo(dev, 0);
 	}
@@ -1613,9 +1647,9 @@ static int udc_dwc2_ep_set_halt(const struct device *dev,
 	LOG_DBG("Set halt ep 0x%02x", cfg->addr);
 	if (ep_idx != 0) {
 		cfg->stat.halted = true;
-	} else if (!udc_buf_peek(dev, USB_CONTROL_EP_OUT)) {
-		/* Data stage is STALLed, allow receiving next SETUP */
-		dwc2_ctrl_feed_dout(dev, 8);
+	} else {
+		/* Data/Status stage is STALLed, allow receiving next SETUP */
+		dwc2_ensure_setup_ready(dev);
 	}
 
 	return 0;
@@ -2341,6 +2375,8 @@ static void dwc2_handle_enumdone(const struct device *dev)
 	dsts = sys_read32((mem_addr_t)&base->dsts);
 	priv->enumspd = usb_dwc2_get_dsts_enumspd(dsts);
 	priv->enumdone = 1;
+
+	k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_ENUM_DONE));
 }
 
 static inline int dwc2_read_fifo_setup(const struct device *dev, uint8_t ep,
@@ -3041,6 +3077,12 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 		config->irq_enable_func(dev);
 	}
 
+	if (evt & BIT(DWC2_DRV_EVT_ENUM_DONE)) {
+		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_ENUM_DONE));
+
+		dwc2_ensure_setup_ready(dev);
+	}
+
 	udc_unlock_internal(dev);
 }
 

From 10ab9b6c55c196abec008f3cd0c0d2560a70be1f Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Tue, 17 Dec 2024 16:18:13 +0100
Subject: [PATCH 1077/2913] [nrf fromtree] drivers/flash/Kconfig.nrf_rram:
 bufferd write by default

Enable buffered write for nRF54l RRAM flash driver by default.
CONFIG_NRF_RRAM_WRITE_BUFFER_SIZE=1 means that write will be buffered
by 16 B buffer (native RRAM write-bock-size).
This allows optimal life-endurance of RRAM memory.

For reference" DTS declares 16 write-block-size already.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
(cherry picked from commit 2cea407afb8c0b92c13afe267e88e1514c6fc03b)
---
 drivers/flash/Kconfig.nrf_rram | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/flash/Kconfig.nrf_rram b/drivers/flash/Kconfig.nrf_rram
index 8c45f8b36bb..1e433b66d1e 100644
--- a/drivers/flash/Kconfig.nrf_rram
+++ b/drivers/flash/Kconfig.nrf_rram
@@ -24,7 +24,7 @@ if SOC_FLASH_NRF_RRAM
 config NRF_RRAM_WRITE_BUFFER_SIZE
 	int "Internal write-buffer size"
 	default 32 if !SOC_FLASH_NRF_RADIO_SYNC_NONE
-	default 0
+	default 1
 	range 0 32
 	help
 	  Number of 128-bit words.

From 97b76ee6b71ad641fed21287454ee64821f065a2 Mon Sep 17 00:00:00 2001
From: Piotr Pryga <piotr.pryga@nordicsemi.no>
Date: Mon, 10 Feb 2025 18:43:22 +0100
Subject: [PATCH 1078/2913] [nrf fromtree] modules: hal_norfic: rise 802.15.4
 NET core init priority

Due to internal dependencies on other modules init priority
the 802.15.4 priority level must be increased. Former init
priority caused the module to be initialied before those
it depends on, so that lead to hard faults.

Signed-off-by: Piotr Pryga <piotr.pryga@nordicsemi.no>
(cherry picked from commit b5e7ac5edece82870703d6b792ec742b98550e61)
---
 modules/hal_nordic/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/Kconfig b/modules/hal_nordic/Kconfig
index 183d25d9a19..32ff1a6c74c 100644
--- a/modules/hal_nordic/Kconfig
+++ b/modules/hal_nordic/Kconfig
@@ -109,7 +109,7 @@ if NRF_802154_SER_RADIO
 
 config NRF_802154_SER_RADIO_INIT_PRIO
 	int "nRF52 IEEE 802.15.4 serialization initialization priority"
-	default 51
+	default 53
 	help
 	  Set the initialization priority number. Do not mess with it unless
 	  you know what you are doing.

From a5420c1ae1465c0dd5dbc1d4d5fce9f9d4ee086d Mon Sep 17 00:00:00 2001
From: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
Date: Wed, 18 Dec 2024 15:33:16 +0100
Subject: [PATCH 1079/2913] [nrf fromtree] tests: boards: nordic: add nrf comp
 tests.

Tests use nordic specific comparator api which enable it's
runtime reconfiguration.

As there were no tests prepared when introducing this api,
PR adds some to extend test coverage.

Signed-off-by: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
(cherry picked from commit dc7c396a0b5e9b5a8a30bd60b29bdba059670041)
---
 tests/boards/nrf/comp/CMakeLists.txt          |   8 +
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  36 +++
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |  40 +++
 tests/boards/nrf/comp/prj.conf                |   6 +
 tests/boards/nrf/comp/src/test.c              | 289 ++++++++++++++++++
 tests/boards/nrf/comp/testcase.yaml           |  14 +
 6 files changed, 393 insertions(+)
 create mode 100644 tests/boards/nrf/comp/CMakeLists.txt
 create mode 100644 tests/boards/nrf/comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/boards/nrf/comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/boards/nrf/comp/prj.conf
 create mode 100644 tests/boards/nrf/comp/src/test.c
 create mode 100644 tests/boards/nrf/comp/testcase.yaml

diff --git a/tests/boards/nrf/comp/CMakeLists.txt b/tests/boards/nrf/comp/CMakeLists.txt
new file mode 100644
index 00000000000..ee3c832e094
--- /dev/null
+++ b/tests/boards/nrf/comp/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(comp)
+
+target_sources(app PRIVATE src/test.c)
diff --git a/tests/boards/nrf/comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/boards/nrf/comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..cb8e9d408b8
--- /dev/null
+++ b/tests/boards/nrf/comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		test-comp = &comp;
+	};
+
+	zephyr,user {
+		first-gpios = <&gpio7 2 GPIO_ACTIVE_HIGH>;
+		second-gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&gpio7 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&comp {
+	status = "okay";
+	psel = "AIN5";
+	refsel = "AREF";
+	extrefsel= "AIN1";
+	sp-mode = "HIGH";
+	th-up = <36>;
+	th-down = <30>;
+	isource = "DISABLED";
+	enable-hyst;
+};
diff --git a/tests/boards/nrf/comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..4c9944b81c3
--- /dev/null
+++ b/tests/boards/nrf/comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		test-comp = &comp;
+	};
+
+	zephyr,user {
+		first-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+		second-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&led3 {
+	status = "disabled";
+};
+
+&button0 {
+	status = "disabled";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&comp {
+	status = "okay";
+	psel = "AIN4";
+	refsel = "AREF";
+	extrefsel= "AIN3";
+	sp-mode = "NORMAL";
+	th-up = <36>;
+	th-down = <30>;
+	isource = "DISABLED";
+	enable-hyst;
+};
diff --git a/tests/boards/nrf/comp/prj.conf b/tests/boards/nrf/comp/prj.conf
new file mode 100644
index 00000000000..36ee3da78e7
--- /dev/null
+++ b/tests/boards/nrf/comp/prj.conf
@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_GPIO=y
+CONFIG_COMPARATOR=y
+CONFIG_ZTEST=y
diff --git a/tests/boards/nrf/comp/src/test.c b/tests/boards/nrf/comp/src/test.c
new file mode 100644
index 00000000000..01493d06811
--- /dev/null
+++ b/tests/boards/nrf/comp/src/test.c
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/ztest.h>
+#include <zephyr/drivers/comparator/nrf_comp.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
+
+static const struct device *test_dev = DEVICE_DT_GET(DT_ALIAS(test_comp));
+static const struct gpio_dt_spec test_pin_1 = GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), first_gpios);
+static const struct gpio_dt_spec test_pin_2 = GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), second_gpios);
+
+
+struct comp_nrf_comp_se_config comp_se_config = {
+	.psel = COMP_NRF_COMP_PSEL_AIN5,
+	.sp_mode = COMP_NRF_COMP_SP_MODE_HIGH,
+	.isource = COMP_NRF_COMP_ISOURCE_DISABLED,
+	.refsel = COMP_NRF_COMP_REFSEL_AREF,
+	.extrefsel = COMP_NRF_COMP_EXTREFSEL_AIN1,
+	.th_up = 32,
+	.th_down = 32,
+};
+
+struct comp_nrf_comp_diff_config comp_diff_config = {
+	.psel = COMP_NRF_COMP_PSEL_AIN4,
+	.sp_mode = COMP_NRF_COMP_SP_MODE_LOW,
+	.isource = COMP_NRF_COMP_ISOURCE_DISABLED,
+	.extrefsel = COMP_NRF_COMP_EXTREFSEL_AIN5,
+	.enable_hyst = true,
+};
+
+atomic_t counter;
+
+static void test_callback(const struct device *dev, void *user_data)
+{
+	counter++;
+}
+
+/**
+ * @brief Configure comparator in single-ended mode with
+ * external voltage reference.
+ * Check if events were detected.
+ */
+
+ZTEST(comparator_runtime_configure, test_comp_config_se_aref)
+{
+	int rc;
+
+	rc = comp_nrf_comp_configure_se(test_dev, &comp_se_config);
+	zassert_equal(rc, 0, "Cannot configure comparator.");
+
+	rc = comparator_set_trigger_callback(test_dev, test_callback, NULL);
+	zassert_equal(rc, 0, "Cannot set callback for comparator.");
+
+	rc = comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_BOTH_EDGES);
+	zassert_equal(rc, 0, "Cannot set trigger for comparator.");
+
+	k_msleep(10);
+
+	atomic_clear(&counter);
+	gpio_pin_set_dt(&test_pin_2, 1);
+	k_msleep(10);
+	zassert_equal(atomic_get(&counter), 1, "COMP was not triggered for first threshold cross");
+	gpio_pin_set_dt(&test_pin_2, 0);
+	k_msleep(10);
+	zassert_equal(atomic_get(&counter), 2, "COMP was not triggered for second threshold cross");
+
+}
+
+/**
+ * @brief Configure comparator in single-ended mode with
+ * internal voltage reference.
+ * Check if events were detected.
+ */
+
+
+ZTEST(comparator_runtime_configure, test_comp_config_se_vdd)
+{
+	int rc;
+
+	struct comp_nrf_comp_se_config conf = comp_se_config;
+
+#ifdef COMP_REFSEL_REFSEL_AVDDAO1V8
+	conf.refsel = COMP_NRF_COMP_REFSEL_AVDDAO1V8;
+#else
+	conf.refsel = COMP_NRF_COMP_REFSEL_VDD;
+#endif
+	rc = comp_nrf_comp_configure_se(test_dev, &conf);
+	zassert_equal(rc, 0, "Cannot configure comparator.");
+
+	rc = comparator_set_trigger_callback(test_dev, test_callback, NULL);
+	zassert_equal(rc, 0, "Cannot set callback for comparator.");
+
+	rc = comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_BOTH_EDGES);
+	zassert_equal(rc, 0, "Cannot set trigger for comparator.");
+
+	k_msleep(10);
+
+	atomic_clear(&counter);
+	gpio_pin_set_dt(&test_pin_2, 1);
+	k_msleep(10);
+	zassert_equal(atomic_get(&counter), 1, "COMP was not triggered for first threshold cross");
+	gpio_pin_set_dt(&test_pin_2, 0);
+	k_msleep(10);
+	zassert_equal(atomic_get(&counter), 2, "COMP was not triggered for second threshold cross");
+
+}
+
+/**
+ * @brief Configure comparator in differential mode
+ * Check if events were detected.
+ */
+
+ZTEST(comparator_runtime_configure, test_comp_config_diff_both)
+{
+	int rc;
+
+	gpio_pin_set_dt(&test_pin_1, 1);
+	gpio_pin_set_dt(&test_pin_2, 0);
+	comparator_trigger_is_pending(test_dev);
+
+	atomic_clear(&counter);
+	struct comp_nrf_comp_diff_config config = comp_diff_config;
+
+	config.isource = COMP_NRF_COMP_ISOURCE_2UA5;
+	rc = comp_nrf_comp_configure_diff(test_dev, &config);
+	zassert_equal(rc, 0, "Cannot configure comparator.");
+
+	rc = comparator_set_trigger_callback(test_dev, test_callback, NULL);
+	zassert_equal(rc, 0, "Cannot set callback for comparator.");
+
+	rc = comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_BOTH_EDGES);
+	zassert_equal(rc, 0, "Cannot set trigger for comparator.");
+	k_msleep(10);
+
+	atomic_clear(&counter);
+	gpio_pin_set_dt(&test_pin_1, 0);
+	gpio_pin_set_dt(&test_pin_2, 1);
+	k_msleep(10);
+	zassert_equal(atomic_get(&counter), 1, "COMP was not triggered for first threshold cross");
+
+	gpio_pin_set_dt(&test_pin_2, 0);
+	gpio_pin_set_dt(&test_pin_1, 1);
+	k_msleep(10);
+
+	zassert_equal(atomic_get(&counter), 2, "COMP was not triggered for second threshold cross");
+}
+
+/**
+ * @brief Configure comparator in differential mode
+ * trigger both edges, event should be detected for falling one
+ */
+
+ZTEST(comparator_runtime_configure, test_comp_config_diff_falling)
+{
+	int rc;
+
+	gpio_pin_set_dt(&test_pin_1, 0);
+	gpio_pin_set_dt(&test_pin_2, 1);
+	comparator_trigger_is_pending(test_dev);
+
+	atomic_clear(&counter);
+	struct comp_nrf_comp_diff_config config = comp_diff_config;
+
+	config.isource = COMP_NRF_COMP_ISOURCE_5UA;
+	rc = comp_nrf_comp_configure_diff(test_dev, &config);
+
+	zassert_equal(rc,  0, "Cannot configure comparator.");
+
+	rc = comparator_set_trigger_callback(test_dev, test_callback, NULL);
+	zassert_equal(rc, 0, "Cannot set callback for comparator.");
+
+	rc = comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_FALLING_EDGE);
+	zassert_equal(rc, 0, "Cannot set trigger for comparator.");
+
+	atomic_clear(&counter);
+	gpio_pin_set_dt(&test_pin_1, 1);
+	gpio_pin_set_dt(&test_pin_2, 0);
+	k_msleep(10);
+
+	zassert_equal(counter, 0, "COMP was triggered for rising threshold cross");
+
+	gpio_pin_set_dt(&test_pin_1, 0);
+	gpio_pin_set_dt(&test_pin_2, 1);
+	k_msleep(10);
+
+	zassert_equal(atomic_get(&counter), 1, "COMP wasn't triggered for falling threshold cross");
+}
+
+/**
+ * @brief Configure comparator in differential mode
+ * trigger both edges, event should be detected for rising one
+ */
+
+ZTEST(comparator_runtime_configure, test_comp_config_diff_rising)
+{
+	int rc;
+
+	gpio_pin_set_dt(&test_pin_1, 1);
+	gpio_pin_set_dt(&test_pin_2, 0);
+	comparator_trigger_is_pending(test_dev);
+
+	atomic_clear(&counter);
+	struct comp_nrf_comp_diff_config config = comp_diff_config;
+
+	config.isource = COMP_NRF_COMP_ISOURCE_10UA;
+	rc = comp_nrf_comp_configure_diff(test_dev, &config);
+	zassert_equal(rc, 0, "Cannot configure comparator.");
+
+	rc = comparator_set_trigger_callback(test_dev, test_callback, NULL);
+	zassert_equal(rc, 0, "Cannot set callback for comparator.");
+
+	rc = comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_RISING_EDGE);
+	zassert_equal(rc, 0, "Cannot set trigger for comparator.");
+
+	atomic_clear(&counter);
+	gpio_pin_set_dt(&test_pin_1, 0);
+	gpio_pin_set_dt(&test_pin_2, 1);
+	k_msleep(10);
+
+	zassert_equal(atomic_get(&counter), 0, "COMP was triggered for falling threshold cross");
+
+	gpio_pin_set_dt(&test_pin_1, 1);
+	gpio_pin_set_dt(&test_pin_2, 0);
+	k_msleep(10);
+
+	zassert_equal(atomic_get(&counter), 1, "COMP was not triggered for rising threshold cross");
+}
+
+/**
+ * @brief Configure comparator in differential mode
+ * trigger both edges, event should not be detected.
+ */
+
+ZTEST(comparator_runtime_configure, test_comp_config_diff_none)
+{
+	int rc;
+
+	gpio_pin_set_dt(&test_pin_1, 1);
+	gpio_pin_set_dt(&test_pin_2, 0);
+	comparator_trigger_is_pending(test_dev);
+
+	atomic_clear(&counter);
+	struct comp_nrf_comp_diff_config config = comp_diff_config;
+
+	config.isource = COMP_NRF_COMP_ISOURCE_10UA;
+	rc = comp_nrf_comp_configure_diff(test_dev, &config);
+	zassert_equal(rc, 0, "Cannot configure comparator.");
+
+	rc = comparator_set_trigger_callback(test_dev, test_callback, NULL);
+	zassert_equal(rc, 0, "Cannot set callback for comparator.");
+
+	rc = comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_NONE);
+	zassert_equal(rc, 0, "Cannot set trigger for comparator.");
+
+	atomic_clear(&counter);
+	gpio_pin_set_dt(&test_pin_1, 0);
+	gpio_pin_set_dt(&test_pin_2, 1);
+	k_msleep(10);
+
+	zassert_equal(atomic_get(&counter), 0, "COMP was triggered for falling threshold cross");
+
+	gpio_pin_set_dt(&test_pin_1, 1);
+	gpio_pin_set_dt(&test_pin_2, 0);
+	k_msleep(10);
+
+	zassert_equal(atomic_get(&counter), 0, "COMP was not triggered for rising threshold cross");
+}
+
+static void *suite_setup(void)
+{
+	TC_PRINT("Test executed on %s\n", CONFIG_BOARD_TARGET);
+	TC_PRINT("===================================================================\n");
+
+	return NULL;
+}
+
+static void test_before(void *f)
+{
+	ARG_UNUSED(f);
+	gpio_pin_configure_dt(&test_pin_1, GPIO_OUTPUT_INACTIVE);
+	gpio_pin_configure_dt(&test_pin_2, GPIO_OUTPUT_INACTIVE);
+
+}
+
+ZTEST_SUITE(comparator_runtime_configure, NULL, suite_setup, test_before, NULL, NULL);
diff --git a/tests/boards/nrf/comp/testcase.yaml b/tests/boards/nrf/comp/testcase.yaml
new file mode 100644
index 00000000000..d5ac3d9c267
--- /dev/null
+++ b/tests/boards/nrf/comp/testcase.yaml
@@ -0,0 +1,14 @@
+# Copyright (c) 2024 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+common:
+  harness_config:
+    fixture: gpio_loopback
+  tags:
+    - drivers
+    - comparator
+tests:
+  drivers.comparator.nrf_comp:
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp

From b65083934c814001df6e67159bda2a1b14185099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Fri, 7 Feb 2025 14:03:12 +0100
Subject: [PATCH 1080/2913] [nrf fromtree] tests: subsys: logging: Test with
 CONFIG_LOG disabled
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Developer reports build error when he uses LOG_RAW in his code
and disables logging in prj.conf using CONFIG_LOG=n.

Add test case for above described scenario.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 5eff0c1cd7bfb40b930bacf3a200fd93f9668c85)
---
 .../logging/log_disabled/CMakeLists.txt       | 13 ++++++
 tests/subsys/logging/log_disabled/prj.conf    |  2 +
 tests/subsys/logging/log_disabled/src/main.c  | 43 +++++++++++++++++++
 .../subsys/logging/log_disabled/testcase.yaml | 16 +++++++
 4 files changed, 74 insertions(+)
 create mode 100644 tests/subsys/logging/log_disabled/CMakeLists.txt
 create mode 100644 tests/subsys/logging/log_disabled/prj.conf
 create mode 100644 tests/subsys/logging/log_disabled/src/main.c
 create mode 100644 tests/subsys/logging/log_disabled/testcase.yaml

diff --git a/tests/subsys/logging/log_disabled/CMakeLists.txt b/tests/subsys/logging/log_disabled/CMakeLists.txt
new file mode 100644
index 00000000000..b656ca6b4a2
--- /dev/null
+++ b/tests/subsys/logging/log_disabled/CMakeLists.txt
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+project(log_disable)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/tests/subsys/logging/log_disabled/prj.conf b/tests/subsys/logging/log_disabled/prj.conf
new file mode 100644
index 00000000000..9717b5ec67e
--- /dev/null
+++ b/tests/subsys/logging/log_disabled/prj.conf
@@ -0,0 +1,2 @@
+CONFIG_PRINTK=y
+CONFIG_LOG=n
diff --git a/tests/subsys/logging/log_disabled/src/main.c b/tests/subsys/logging/log_disabled/src/main.c
new file mode 100644
index 00000000000..100681de358
--- /dev/null
+++ b/tests/subsys/logging/log_disabled/src/main.c
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(app, LOG_LEVEL_DBG);
+
+int main(void)
+{
+	uint8_t data[] = {0, 1, 2, 3};
+	uint32_t dummy_1 = 1;
+	uint32_t dummy_2 = 2;
+	uint32_t dummy_3 = 3;
+	uint32_t dummy_4 = 4;
+	uint32_t dummy_5 = 5;
+	uint32_t dummy_6 = 6;
+	uint32_t dummy_7 = 7;
+
+	LOG_DBG("Debug log %u", dummy_1);
+	LOG_INF("Info log %u", dummy_2);
+	LOG_WRN("Warning log %u", dummy_3);
+	LOG_ERR("Error log %u", dummy_4);
+
+	for (int i = 0; i < 10; i++) {
+		LOG_WRN_ONCE("Warning on the first execution only %u", dummy_5);
+	}
+
+	LOG_PRINTK("Printk log %u\n", dummy_6);
+
+	LOG_RAW("Raw log %u\n", dummy_7);
+
+	LOG_HEXDUMP_DBG(data, sizeof(data), "Debug data");
+	LOG_HEXDUMP_INF(data, sizeof(data), "Info data");
+	LOG_HEXDUMP_WRN(data, sizeof(data), "Warning data");
+	LOG_HEXDUMP_ERR(data, sizeof(data), "Error data");
+
+	printk("All done.\n");
+	return 0;
+}
diff --git a/tests/subsys/logging/log_disabled/testcase.yaml b/tests/subsys/logging/log_disabled/testcase.yaml
new file mode 100644
index 00000000000..06a327988c9
--- /dev/null
+++ b/tests/subsys/logging/log_disabled/testcase.yaml
@@ -0,0 +1,16 @@
+common:
+  tags:
+    - logging
+  build_only: true
+  platform_allow:
+    - native_sim
+  integration_platforms:
+    - native_sim
+
+tests:
+  logging.log_disable:
+    harness: console
+    harness_config:
+      type: one_line
+      regex:
+        - "All done."

From 44f24c42ff41bdb103dee930b806cc44ef6b5ff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:06 +0100
Subject: [PATCH 1081/2913] Revert "[nrf fromtree] tests: subsys: logging: Test
 with CONFIG_LOG disabled"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b65083934c814001df6e67159bda2a1b14185099.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../logging/log_disabled/CMakeLists.txt       | 13 ------
 tests/subsys/logging/log_disabled/prj.conf    |  2 -
 tests/subsys/logging/log_disabled/src/main.c  | 43 -------------------
 .../subsys/logging/log_disabled/testcase.yaml | 16 -------
 4 files changed, 74 deletions(-)
 delete mode 100644 tests/subsys/logging/log_disabled/CMakeLists.txt
 delete mode 100644 tests/subsys/logging/log_disabled/prj.conf
 delete mode 100644 tests/subsys/logging/log_disabled/src/main.c
 delete mode 100644 tests/subsys/logging/log_disabled/testcase.yaml

diff --git a/tests/subsys/logging/log_disabled/CMakeLists.txt b/tests/subsys/logging/log_disabled/CMakeLists.txt
deleted file mode 100644
index b656ca6b4a2..00000000000
--- a/tests/subsys/logging/log_disabled/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2025 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-cmake_minimum_required(VERSION 3.20.0)
-
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-
-project(log_disable)
-
-target_sources(app PRIVATE src/main.c)
diff --git a/tests/subsys/logging/log_disabled/prj.conf b/tests/subsys/logging/log_disabled/prj.conf
deleted file mode 100644
index 9717b5ec67e..00000000000
--- a/tests/subsys/logging/log_disabled/prj.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_PRINTK=y
-CONFIG_LOG=n
diff --git a/tests/subsys/logging/log_disabled/src/main.c b/tests/subsys/logging/log_disabled/src/main.c
deleted file mode 100644
index 100681de358..00000000000
--- a/tests/subsys/logging/log_disabled/src/main.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2025 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/logging/log.h>
-
-LOG_MODULE_REGISTER(app, LOG_LEVEL_DBG);
-
-int main(void)
-{
-	uint8_t data[] = {0, 1, 2, 3};
-	uint32_t dummy_1 = 1;
-	uint32_t dummy_2 = 2;
-	uint32_t dummy_3 = 3;
-	uint32_t dummy_4 = 4;
-	uint32_t dummy_5 = 5;
-	uint32_t dummy_6 = 6;
-	uint32_t dummy_7 = 7;
-
-	LOG_DBG("Debug log %u", dummy_1);
-	LOG_INF("Info log %u", dummy_2);
-	LOG_WRN("Warning log %u", dummy_3);
-	LOG_ERR("Error log %u", dummy_4);
-
-	for (int i = 0; i < 10; i++) {
-		LOG_WRN_ONCE("Warning on the first execution only %u", dummy_5);
-	}
-
-	LOG_PRINTK("Printk log %u\n", dummy_6);
-
-	LOG_RAW("Raw log %u\n", dummy_7);
-
-	LOG_HEXDUMP_DBG(data, sizeof(data), "Debug data");
-	LOG_HEXDUMP_INF(data, sizeof(data), "Info data");
-	LOG_HEXDUMP_WRN(data, sizeof(data), "Warning data");
-	LOG_HEXDUMP_ERR(data, sizeof(data), "Error data");
-
-	printk("All done.\n");
-	return 0;
-}
diff --git a/tests/subsys/logging/log_disabled/testcase.yaml b/tests/subsys/logging/log_disabled/testcase.yaml
deleted file mode 100644
index 06a327988c9..00000000000
--- a/tests/subsys/logging/log_disabled/testcase.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-common:
-  tags:
-    - logging
-  build_only: true
-  platform_allow:
-    - native_sim
-  integration_platforms:
-    - native_sim
-
-tests:
-  logging.log_disable:
-    harness: console
-    harness_config:
-      type: one_line
-      regex:
-        - "All done."

From 074b50012456e8e83de90e30f65c3895fde5fc8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:06 +0100
Subject: [PATCH 1082/2913] Revert "[nrf fromtree] tests: boards: nordic: add
 nrf comp tests."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a5420c1ae1465c0dd5dbc1d4d5fce9f9d4ee086d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/boards/nrf/comp/CMakeLists.txt          |   8 -
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  36 ---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |  40 ---
 tests/boards/nrf/comp/prj.conf                |   6 -
 tests/boards/nrf/comp/src/test.c              | 289 ------------------
 tests/boards/nrf/comp/testcase.yaml           |  14 -
 6 files changed, 393 deletions(-)
 delete mode 100644 tests/boards/nrf/comp/CMakeLists.txt
 delete mode 100644 tests/boards/nrf/comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 delete mode 100644 tests/boards/nrf/comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 delete mode 100644 tests/boards/nrf/comp/prj.conf
 delete mode 100644 tests/boards/nrf/comp/src/test.c
 delete mode 100644 tests/boards/nrf/comp/testcase.yaml

diff --git a/tests/boards/nrf/comp/CMakeLists.txt b/tests/boards/nrf/comp/CMakeLists.txt
deleted file mode 100644
index ee3c832e094..00000000000
--- a/tests/boards/nrf/comp/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(comp)
-
-target_sources(app PRIVATE src/test.c)
diff --git a/tests/boards/nrf/comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/boards/nrf/comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index cb8e9d408b8..00000000000
--- a/tests/boards/nrf/comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2025 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	aliases {
-		test-comp = &comp;
-	};
-
-	zephyr,user {
-		first-gpios = <&gpio7 2 GPIO_ACTIVE_HIGH>;
-		second-gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>;
-	};
-};
-
-&gpio7 {
-	status = "okay";
-};
-
-&gpio1 {
-	status = "okay";
-};
-
-&comp {
-	status = "okay";
-	psel = "AIN5";
-	refsel = "AREF";
-	extrefsel= "AIN1";
-	sp-mode = "HIGH";
-	th-up = <36>;
-	th-down = <30>;
-	isource = "DISABLED";
-	enable-hyst;
-};
diff --git a/tests/boards/nrf/comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 4c9944b81c3..00000000000
--- a/tests/boards/nrf/comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2025 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	aliases {
-		test-comp = &comp;
-	};
-
-	zephyr,user {
-		first-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
-		second-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
-	};
-};
-
-&led3 {
-	status = "disabled";
-};
-
-&button0 {
-	status = "disabled";
-};
-
-&gpio1 {
-	status = "okay";
-};
-
-&comp {
-	status = "okay";
-	psel = "AIN4";
-	refsel = "AREF";
-	extrefsel= "AIN3";
-	sp-mode = "NORMAL";
-	th-up = <36>;
-	th-down = <30>;
-	isource = "DISABLED";
-	enable-hyst;
-};
diff --git a/tests/boards/nrf/comp/prj.conf b/tests/boards/nrf/comp/prj.conf
deleted file mode 100644
index 36ee3da78e7..00000000000
--- a/tests/boards/nrf/comp/prj.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_GPIO=y
-CONFIG_COMPARATOR=y
-CONFIG_ZTEST=y
diff --git a/tests/boards/nrf/comp/src/test.c b/tests/boards/nrf/comp/src/test.c
deleted file mode 100644
index 01493d06811..00000000000
--- a/tests/boards/nrf/comp/src/test.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/ztest.h>
-#include <zephyr/drivers/comparator/nrf_comp.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/kernel.h>
-
-static const struct device *test_dev = DEVICE_DT_GET(DT_ALIAS(test_comp));
-static const struct gpio_dt_spec test_pin_1 = GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), first_gpios);
-static const struct gpio_dt_spec test_pin_2 = GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), second_gpios);
-
-
-struct comp_nrf_comp_se_config comp_se_config = {
-	.psel = COMP_NRF_COMP_PSEL_AIN5,
-	.sp_mode = COMP_NRF_COMP_SP_MODE_HIGH,
-	.isource = COMP_NRF_COMP_ISOURCE_DISABLED,
-	.refsel = COMP_NRF_COMP_REFSEL_AREF,
-	.extrefsel = COMP_NRF_COMP_EXTREFSEL_AIN1,
-	.th_up = 32,
-	.th_down = 32,
-};
-
-struct comp_nrf_comp_diff_config comp_diff_config = {
-	.psel = COMP_NRF_COMP_PSEL_AIN4,
-	.sp_mode = COMP_NRF_COMP_SP_MODE_LOW,
-	.isource = COMP_NRF_COMP_ISOURCE_DISABLED,
-	.extrefsel = COMP_NRF_COMP_EXTREFSEL_AIN5,
-	.enable_hyst = true,
-};
-
-atomic_t counter;
-
-static void test_callback(const struct device *dev, void *user_data)
-{
-	counter++;
-}
-
-/**
- * @brief Configure comparator in single-ended mode with
- * external voltage reference.
- * Check if events were detected.
- */
-
-ZTEST(comparator_runtime_configure, test_comp_config_se_aref)
-{
-	int rc;
-
-	rc = comp_nrf_comp_configure_se(test_dev, &comp_se_config);
-	zassert_equal(rc, 0, "Cannot configure comparator.");
-
-	rc = comparator_set_trigger_callback(test_dev, test_callback, NULL);
-	zassert_equal(rc, 0, "Cannot set callback for comparator.");
-
-	rc = comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_BOTH_EDGES);
-	zassert_equal(rc, 0, "Cannot set trigger for comparator.");
-
-	k_msleep(10);
-
-	atomic_clear(&counter);
-	gpio_pin_set_dt(&test_pin_2, 1);
-	k_msleep(10);
-	zassert_equal(atomic_get(&counter), 1, "COMP was not triggered for first threshold cross");
-	gpio_pin_set_dt(&test_pin_2, 0);
-	k_msleep(10);
-	zassert_equal(atomic_get(&counter), 2, "COMP was not triggered for second threshold cross");
-
-}
-
-/**
- * @brief Configure comparator in single-ended mode with
- * internal voltage reference.
- * Check if events were detected.
- */
-
-
-ZTEST(comparator_runtime_configure, test_comp_config_se_vdd)
-{
-	int rc;
-
-	struct comp_nrf_comp_se_config conf = comp_se_config;
-
-#ifdef COMP_REFSEL_REFSEL_AVDDAO1V8
-	conf.refsel = COMP_NRF_COMP_REFSEL_AVDDAO1V8;
-#else
-	conf.refsel = COMP_NRF_COMP_REFSEL_VDD;
-#endif
-	rc = comp_nrf_comp_configure_se(test_dev, &conf);
-	zassert_equal(rc, 0, "Cannot configure comparator.");
-
-	rc = comparator_set_trigger_callback(test_dev, test_callback, NULL);
-	zassert_equal(rc, 0, "Cannot set callback for comparator.");
-
-	rc = comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_BOTH_EDGES);
-	zassert_equal(rc, 0, "Cannot set trigger for comparator.");
-
-	k_msleep(10);
-
-	atomic_clear(&counter);
-	gpio_pin_set_dt(&test_pin_2, 1);
-	k_msleep(10);
-	zassert_equal(atomic_get(&counter), 1, "COMP was not triggered for first threshold cross");
-	gpio_pin_set_dt(&test_pin_2, 0);
-	k_msleep(10);
-	zassert_equal(atomic_get(&counter), 2, "COMP was not triggered for second threshold cross");
-
-}
-
-/**
- * @brief Configure comparator in differential mode
- * Check if events were detected.
- */
-
-ZTEST(comparator_runtime_configure, test_comp_config_diff_both)
-{
-	int rc;
-
-	gpio_pin_set_dt(&test_pin_1, 1);
-	gpio_pin_set_dt(&test_pin_2, 0);
-	comparator_trigger_is_pending(test_dev);
-
-	atomic_clear(&counter);
-	struct comp_nrf_comp_diff_config config = comp_diff_config;
-
-	config.isource = COMP_NRF_COMP_ISOURCE_2UA5;
-	rc = comp_nrf_comp_configure_diff(test_dev, &config);
-	zassert_equal(rc, 0, "Cannot configure comparator.");
-
-	rc = comparator_set_trigger_callback(test_dev, test_callback, NULL);
-	zassert_equal(rc, 0, "Cannot set callback for comparator.");
-
-	rc = comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_BOTH_EDGES);
-	zassert_equal(rc, 0, "Cannot set trigger for comparator.");
-	k_msleep(10);
-
-	atomic_clear(&counter);
-	gpio_pin_set_dt(&test_pin_1, 0);
-	gpio_pin_set_dt(&test_pin_2, 1);
-	k_msleep(10);
-	zassert_equal(atomic_get(&counter), 1, "COMP was not triggered for first threshold cross");
-
-	gpio_pin_set_dt(&test_pin_2, 0);
-	gpio_pin_set_dt(&test_pin_1, 1);
-	k_msleep(10);
-
-	zassert_equal(atomic_get(&counter), 2, "COMP was not triggered for second threshold cross");
-}
-
-/**
- * @brief Configure comparator in differential mode
- * trigger both edges, event should be detected for falling one
- */
-
-ZTEST(comparator_runtime_configure, test_comp_config_diff_falling)
-{
-	int rc;
-
-	gpio_pin_set_dt(&test_pin_1, 0);
-	gpio_pin_set_dt(&test_pin_2, 1);
-	comparator_trigger_is_pending(test_dev);
-
-	atomic_clear(&counter);
-	struct comp_nrf_comp_diff_config config = comp_diff_config;
-
-	config.isource = COMP_NRF_COMP_ISOURCE_5UA;
-	rc = comp_nrf_comp_configure_diff(test_dev, &config);
-
-	zassert_equal(rc,  0, "Cannot configure comparator.");
-
-	rc = comparator_set_trigger_callback(test_dev, test_callback, NULL);
-	zassert_equal(rc, 0, "Cannot set callback for comparator.");
-
-	rc = comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_FALLING_EDGE);
-	zassert_equal(rc, 0, "Cannot set trigger for comparator.");
-
-	atomic_clear(&counter);
-	gpio_pin_set_dt(&test_pin_1, 1);
-	gpio_pin_set_dt(&test_pin_2, 0);
-	k_msleep(10);
-
-	zassert_equal(counter, 0, "COMP was triggered for rising threshold cross");
-
-	gpio_pin_set_dt(&test_pin_1, 0);
-	gpio_pin_set_dt(&test_pin_2, 1);
-	k_msleep(10);
-
-	zassert_equal(atomic_get(&counter), 1, "COMP wasn't triggered for falling threshold cross");
-}
-
-/**
- * @brief Configure comparator in differential mode
- * trigger both edges, event should be detected for rising one
- */
-
-ZTEST(comparator_runtime_configure, test_comp_config_diff_rising)
-{
-	int rc;
-
-	gpio_pin_set_dt(&test_pin_1, 1);
-	gpio_pin_set_dt(&test_pin_2, 0);
-	comparator_trigger_is_pending(test_dev);
-
-	atomic_clear(&counter);
-	struct comp_nrf_comp_diff_config config = comp_diff_config;
-
-	config.isource = COMP_NRF_COMP_ISOURCE_10UA;
-	rc = comp_nrf_comp_configure_diff(test_dev, &config);
-	zassert_equal(rc, 0, "Cannot configure comparator.");
-
-	rc = comparator_set_trigger_callback(test_dev, test_callback, NULL);
-	zassert_equal(rc, 0, "Cannot set callback for comparator.");
-
-	rc = comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_RISING_EDGE);
-	zassert_equal(rc, 0, "Cannot set trigger for comparator.");
-
-	atomic_clear(&counter);
-	gpio_pin_set_dt(&test_pin_1, 0);
-	gpio_pin_set_dt(&test_pin_2, 1);
-	k_msleep(10);
-
-	zassert_equal(atomic_get(&counter), 0, "COMP was triggered for falling threshold cross");
-
-	gpio_pin_set_dt(&test_pin_1, 1);
-	gpio_pin_set_dt(&test_pin_2, 0);
-	k_msleep(10);
-
-	zassert_equal(atomic_get(&counter), 1, "COMP was not triggered for rising threshold cross");
-}
-
-/**
- * @brief Configure comparator in differential mode
- * trigger both edges, event should not be detected.
- */
-
-ZTEST(comparator_runtime_configure, test_comp_config_diff_none)
-{
-	int rc;
-
-	gpio_pin_set_dt(&test_pin_1, 1);
-	gpio_pin_set_dt(&test_pin_2, 0);
-	comparator_trigger_is_pending(test_dev);
-
-	atomic_clear(&counter);
-	struct comp_nrf_comp_diff_config config = comp_diff_config;
-
-	config.isource = COMP_NRF_COMP_ISOURCE_10UA;
-	rc = comp_nrf_comp_configure_diff(test_dev, &config);
-	zassert_equal(rc, 0, "Cannot configure comparator.");
-
-	rc = comparator_set_trigger_callback(test_dev, test_callback, NULL);
-	zassert_equal(rc, 0, "Cannot set callback for comparator.");
-
-	rc = comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_NONE);
-	zassert_equal(rc, 0, "Cannot set trigger for comparator.");
-
-	atomic_clear(&counter);
-	gpio_pin_set_dt(&test_pin_1, 0);
-	gpio_pin_set_dt(&test_pin_2, 1);
-	k_msleep(10);
-
-	zassert_equal(atomic_get(&counter), 0, "COMP was triggered for falling threshold cross");
-
-	gpio_pin_set_dt(&test_pin_1, 1);
-	gpio_pin_set_dt(&test_pin_2, 0);
-	k_msleep(10);
-
-	zassert_equal(atomic_get(&counter), 0, "COMP was not triggered for rising threshold cross");
-}
-
-static void *suite_setup(void)
-{
-	TC_PRINT("Test executed on %s\n", CONFIG_BOARD_TARGET);
-	TC_PRINT("===================================================================\n");
-
-	return NULL;
-}
-
-static void test_before(void *f)
-{
-	ARG_UNUSED(f);
-	gpio_pin_configure_dt(&test_pin_1, GPIO_OUTPUT_INACTIVE);
-	gpio_pin_configure_dt(&test_pin_2, GPIO_OUTPUT_INACTIVE);
-
-}
-
-ZTEST_SUITE(comparator_runtime_configure, NULL, suite_setup, test_before, NULL, NULL);
diff --git a/tests/boards/nrf/comp/testcase.yaml b/tests/boards/nrf/comp/testcase.yaml
deleted file mode 100644
index d5ac3d9c267..00000000000
--- a/tests/boards/nrf/comp/testcase.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor
-# SPDX-License-Identifier: Apache-2.0
-
-common:
-  harness_config:
-    fixture: gpio_loopback
-  tags:
-    - drivers
-    - comparator
-tests:
-  drivers.comparator.nrf_comp:
-    platform_allow:
-      - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp

From 9d7c9b65fbbfbf9b5c3fb6ecf13d4fe970a57033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:06 +0100
Subject: [PATCH 1083/2913] Revert "[nrf fromtree] modules: hal_norfic: rise
 802.15.4 NET core init priority"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 97b76ee6b71ad641fed21287454ee64821f065a2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/Kconfig b/modules/hal_nordic/Kconfig
index 32ff1a6c74c..183d25d9a19 100644
--- a/modules/hal_nordic/Kconfig
+++ b/modules/hal_nordic/Kconfig
@@ -109,7 +109,7 @@ if NRF_802154_SER_RADIO
 
 config NRF_802154_SER_RADIO_INIT_PRIO
 	int "nRF52 IEEE 802.15.4 serialization initialization priority"
-	default 53
+	default 51
 	help
 	  Set the initialization priority number. Do not mess with it unless
 	  you know what you are doing.

From 5fff30f517550c68106fc82bda937f4e6c92e045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:06 +0100
Subject: [PATCH 1084/2913] Revert "[nrf fromtree]
 drivers/flash/Kconfig.nrf_rram: bufferd write by default"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 10ab9b6c55c196abec008f3cd0c0d2560a70be1f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/flash/Kconfig.nrf_rram | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/flash/Kconfig.nrf_rram b/drivers/flash/Kconfig.nrf_rram
index 1e433b66d1e..8c45f8b36bb 100644
--- a/drivers/flash/Kconfig.nrf_rram
+++ b/drivers/flash/Kconfig.nrf_rram
@@ -24,7 +24,7 @@ if SOC_FLASH_NRF_RRAM
 config NRF_RRAM_WRITE_BUFFER_SIZE
 	int "Internal write-buffer size"
 	default 32 if !SOC_FLASH_NRF_RADIO_SYNC_NONE
-	default 1
+	default 0
 	range 0 32
 	help
 	  Number of 128-bit words.

From 8ab6e5be6e8e18e9f1442c7e0c93ad4968dacb57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:06 +0100
Subject: [PATCH 1085/2913] Revert "[nrf fromtree] drivers: udc_dwc2: Rework
 control endpoint feeding"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d0bef36f9bda4c30f58382d57413f01d8d55ba2f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 172 ++++++++++++++-----------------------
 1 file changed, 65 insertions(+), 107 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index d1fc555d839..a4065b89354 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -25,8 +25,6 @@ LOG_MODULE_REGISTER(udc_dwc2, CONFIG_UDC_DRIVER_LOG_LEVEL);
 #include "udc_dwc2_vendor_quirks.h"
 
 enum dwc2_drv_event_type {
-	/* USB connection speed determined after bus reset */
-	DWC2_DRV_EVT_ENUM_DONE,
 	/* Trigger next transfer, must not be used for control OUT */
 	DWC2_DRV_EVT_XFER,
 	/* Setup packet received */
@@ -385,42 +383,6 @@ static bool dwc2_ep_is_iso(struct udc_ep_config *const cfg)
 	return (cfg->attributes & USB_EP_TRANSFER_TYPE_MASK) == USB_EP_TYPE_ISO;
 }
 
-static int dwc2_ctrl_feed_dout(const struct device *dev, const size_t length)
-{
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
-	struct net_buf *buf;
-	size_t alloc_len = length;
-
-	if (dwc2_in_buffer_dma_mode(dev)) {
-		/* Control OUT buffers must be multiple of bMaxPacketSize0 */
-		alloc_len = ROUND_UP(length, 64);
-	}
-
-	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, alloc_len);
-	if (buf == NULL) {
-		return -ENOMEM;
-	}
-
-	udc_buf_put(ep_cfg, buf);
-	k_event_post(&priv->xfer_new, BIT(16));
-	k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
-
-	return 0;
-}
-
-static void dwc2_ensure_setup_ready(const struct device *dev)
-{
-	if (dwc2_in_completer_mode(dev)) {
-		/* In Completer mode EP0 can always receive SETUP data */
-		return;
-	}
-
-	if (!udc_buf_peek(dev, USB_CONTROL_EP_OUT)) {
-		dwc2_ctrl_feed_dout(dev, 8);
-	}
-}
-
 static bool dwc2_dma_buffer_ok_to_use(const struct device *dev, void *buf,
 				      uint32_t xfersize, uint16_t mps)
 {
@@ -746,26 +708,6 @@ static void dwc2_handle_xfer_next(const struct device *dev,
 	} else {
 		int err = dwc2_tx_fifo_write(dev, cfg, buf);
 
-		if (cfg->addr == USB_CONTROL_EP_IN) {
-			/* Feed a buffer for the next setup packet after arming
-			 * IN endpoint with the data. This is necessary both in
-			 * IN Data Stage (Control Read Transfer) and IN Status
-			 * Stage (Control Write Transfers and Control Transfers
-			 * without Data Stage).
-			 *
-			 * The buffer must be fed here in Buffer DMA mode to
-			 * allow receiving premature SETUP. This inevitably does
-			 * automatically arm the buffer for OUT Status Stage.
-			 *
-			 * The buffer MUST NOT be fed here in Completer mode to
-			 * avoid race condition where the next Control Write
-			 * Transfer Data Stage is received into the buffer.
-			 */
-			if (dwc2_in_buffer_dma_mode(dev)) {
-				dwc2_ctrl_feed_dout(dev, 8);
-			}
-		}
-
 		if (err) {
 			LOG_ERR("Failed to start write to TX FIFO, ep 0x%02x (err: %d)",
 				cfg->addr, err);
@@ -782,35 +724,39 @@ static void dwc2_handle_xfer_next(const struct device *dev,
 	udc_ep_set_busy(dev, cfg->addr, true);
 }
 
-static int dwc2_handle_evt_setup(const struct device *dev)
+static int dwc2_ctrl_feed_dout(const struct device *dev, const size_t length)
 {
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
 	struct net_buf *buf;
-	int err;
-
-	/* In Completer mode SETUP data is received without preparing endpoint 0
-	 * transfer beforehand. In Buffer DMA the SETUP can be copied to any EP0
-	 * OUT buffer. If there is any buffer queued, it is obsolete now.
-	 */
-	k_event_clear(&priv->xfer_finished, BIT(0) | BIT(16));
+	size_t alloc_len = length;
 
-	buf = udc_buf_get_all(dev, USB_CONTROL_EP_OUT);
-	if (buf) {
-		net_buf_unref(buf);
+	if (dwc2_in_buffer_dma_mode(dev)) {
+		/* Control OUT buffers must be multiple of bMaxPacketSize0 */
+		alloc_len = ROUND_UP(length, 64);
 	}
 
-	buf = udc_buf_get_all(dev, USB_CONTROL_EP_IN);
-	if (buf) {
-		net_buf_unref(buf);
+	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, alloc_len);
+	if (buf == NULL) {
+		return -ENOMEM;
 	}
 
-	udc_ep_set_busy(dev, USB_CONTROL_EP_OUT, false);
-	udc_ep_set_busy(dev, USB_CONTROL_EP_IN, false);
+	udc_buf_put(ep_cfg, buf);
+	dwc2_prep_rx(dev, buf, ep_cfg);
+	LOG_DBG("feed buf %p", buf);
+
+	return 0;
+}
+
+static int dwc2_handle_evt_setup(const struct device *dev)
+{
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	struct net_buf *buf;
+	int err;
 
-	/* Allocate buffer and copy received SETUP for processing */
-	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, 8);
+	buf = udc_buf_get(dev, USB_CONTROL_EP_OUT);
 	if (buf == NULL) {
-		LOG_ERR("No buffer available for control ep");
+		LOG_ERR("No buffer queued for control ep");
 		return -ENODATA;
 	}
 
@@ -827,17 +773,30 @@ static int dwc2_handle_evt_setup(const struct device *dev)
 		/*  Allocate and feed buffer for data OUT stage */
 		LOG_DBG("s:%p|feed for -out-", buf);
 
-		err = dwc2_ctrl_feed_dout(dev, udc_data_stage_length(buf));
+		/* Allocate at least 8 bytes in case the host decides to send
+		 * SETUP DATA instead of OUT DATA packet.
+		 */
+		err = dwc2_ctrl_feed_dout(dev, MAX(udc_data_stage_length(buf), 8));
 		if (err == -ENOMEM) {
 			err = udc_submit_ep_event(dev, buf, err);
 		}
 	} else if (udc_ctrl_stage_is_data_in(dev)) {
 		LOG_DBG("s:%p|feed for -in-status", buf);
 
+		err = dwc2_ctrl_feed_dout(dev, 8);
+		if (err == -ENOMEM) {
+			err = udc_submit_ep_event(dev, buf, err);
+		}
+
 		err = udc_ctrl_submit_s_in_status(dev);
 	} else {
 		LOG_DBG("s:%p|feed >setup", buf);
 
+		err = dwc2_ctrl_feed_dout(dev, 8);
+		if (err == -ENOMEM) {
+			err = udc_submit_ep_event(dev, buf, err);
+		}
+
 		err = udc_ctrl_submit_s_status(dev);
 	}
 
@@ -847,7 +806,6 @@ static int dwc2_handle_evt_setup(const struct device *dev)
 static inline int dwc2_handle_evt_dout(const struct device *dev,
 				       struct udc_ep_config *const cfg)
 {
-	struct udc_data *data = dev->data;
 	struct net_buf *buf;
 	int err = 0;
 
@@ -864,14 +822,25 @@ static inline int dwc2_handle_evt_dout(const struct device *dev,
 			/* s-in-status finished */
 			LOG_DBG("dout:%p| status, feed >s", buf);
 
+			/* Feed a buffer for the next setup packet */
+			err = dwc2_ctrl_feed_dout(dev, 8);
+			if (err == -ENOMEM) {
+				err = udc_submit_ep_event(dev, buf, err);
+			}
+
 			/* Status stage finished, notify upper layer */
 			udc_ctrl_submit_status(dev, buf);
-
-			if (dwc2_in_buffer_dma_mode(dev)) {
-				dwc2_ctrl_feed_dout(dev, 8);
-			}
 		} else {
+			/*
+			 * For all other cases we feed with a buffer
+			 * large enough for setup packet.
+			 */
 			LOG_DBG("dout:%p| data, feed >s", buf);
+
+			err = dwc2_ctrl_feed_dout(dev, 8);
+			if (err == -ENOMEM) {
+				err = udc_submit_ep_event(dev, buf, err);
+			}
 		}
 
 		/* Update to next stage of control transfer */
@@ -880,13 +849,6 @@ static inline int dwc2_handle_evt_dout(const struct device *dev,
 		if (udc_ctrl_stage_is_status_in(dev)) {
 			err = udc_ctrl_submit_s_out_status(dev, buf);
 		}
-
-		if (data->stage == CTRL_PIPE_STAGE_ERROR) {
-			/* Allow receiving next SETUP. USB stack won't queue any
-			 * buffer because it has no clue about this transfer.
-			 */
-			dwc2_ensure_setup_ready(dev);
-		}
 	} else {
 		err = udc_submit_ep_event(dev, buf, 0);
 	}
@@ -930,12 +892,10 @@ static int dwc2_handle_evt_din(const struct device *dev,
 		udc_ctrl_update_stage(dev, buf);
 
 		if (udc_ctrl_stage_is_status_out(dev)) {
-			if (dwc2_in_completer_mode(dev)) {
-				/* Allow OUT status stage */
-				dwc2_ctrl_feed_dout(dev, 8);
-			}
-
-			/* IN transfer finished, release buffer. */
+			/*
+			 * IN transfer finished, release buffer,
+			 * control OUT buffer should be already fed.
+			 */
 			net_buf_unref(buf);
 		}
 
@@ -1362,7 +1322,13 @@ static int dwc2_ep_control_enable(const struct device *dev,
 	dxepctl0 |= USB_DWC2_DEPCTL_USBACTEP;
 
 	if (cfg->addr == USB_CONTROL_EP_OUT) {
+		int ret;
+
 		dwc2_flush_rx_fifo(dev);
+		ret = dwc2_ctrl_feed_dout(dev, 8);
+		if (ret) {
+			return ret;
+		}
 	} else {
 		dwc2_flush_tx_fifo(dev, 0);
 	}
@@ -1647,9 +1613,9 @@ static int udc_dwc2_ep_set_halt(const struct device *dev,
 	LOG_DBG("Set halt ep 0x%02x", cfg->addr);
 	if (ep_idx != 0) {
 		cfg->stat.halted = true;
-	} else {
-		/* Data/Status stage is STALLed, allow receiving next SETUP */
-		dwc2_ensure_setup_ready(dev);
+	} else if (!udc_buf_peek(dev, USB_CONTROL_EP_OUT)) {
+		/* Data stage is STALLed, allow receiving next SETUP */
+		dwc2_ctrl_feed_dout(dev, 8);
 	}
 
 	return 0;
@@ -2375,8 +2341,6 @@ static void dwc2_handle_enumdone(const struct device *dev)
 	dsts = sys_read32((mem_addr_t)&base->dsts);
 	priv->enumspd = usb_dwc2_get_dsts_enumspd(dsts);
 	priv->enumdone = 1;
-
-	k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_ENUM_DONE));
 }
 
 static inline int dwc2_read_fifo_setup(const struct device *dev, uint8_t ep,
@@ -3077,12 +3041,6 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 		config->irq_enable_func(dev);
 	}
 
-	if (evt & BIT(DWC2_DRV_EVT_ENUM_DONE)) {
-		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_ENUM_DONE));
-
-		dwc2_ensure_setup_ready(dev);
-	}
-
 	udc_unlock_internal(dev);
 }
 

From f89eab30a7b29f4e0ebeab8f73abfeec3d7e6dc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:06 +0100
Subject: [PATCH 1086/2913] Revert "[nrf fromtree] drivers: udc_dwc2: Stop OUT
 transfers on ZLP"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a82f2fc83c091d9aa538b980e39922763bf5b234.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index a4065b89354..930fdc15f15 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -2540,7 +2540,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 		net_buf_add(buf, bcnt);
 	}
 
-	if (!is_iso && bcnt && (bcnt % udc_mps_ep_size(ep_cfg)) == 0 &&
+	if (!is_iso && (bcnt % udc_mps_ep_size(ep_cfg)) == 0 &&
 	    net_buf_tailroom(buf)) {
 		dwc2_prep_rx(dev, buf, ep_cfg);
 	} else {

From 8e4994ee07c0fea2b6d3de3079889093452ff9d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:07 +0100
Subject: [PATCH 1087/2913] Revert "[nrf fromtree] drivers: udc_dwc2: Allocate
 multiple of bMaxPacketSize0"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5ee4d804cc4d5e4cd4656d40122b58dfde20b299.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 930fdc15f15..61c16d1082b 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -666,7 +666,8 @@ static void dwc2_prep_rx(const struct device *dev, struct net_buf *buf,
 	doeptsiz = usb_dwc2_set_doeptsizn_pktcnt(pktcnt) |
 		   usb_dwc2_set_doeptsizn_xfersize(xfersize);
 	if (cfg->addr == USB_CONTROL_EP_OUT) {
-		doeptsiz |= (3 << USB_DWC2_DOEPTSIZ0_SUPCNT_POS);
+		/* Use 1 to allow 8 byte long buffers for SETUP data */
+		doeptsiz |= (1 << USB_DWC2_DOEPTSIZ0_SUPCNT_POS);
 	}
 
 	priv->rx_siz[ep_idx] = doeptsiz;
@@ -726,17 +727,10 @@ static void dwc2_handle_xfer_next(const struct device *dev,
 
 static int dwc2_ctrl_feed_dout(const struct device *dev, const size_t length)
 {
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
 	struct net_buf *buf;
-	size_t alloc_len = length;
-
-	if (dwc2_in_buffer_dma_mode(dev)) {
-		/* Control OUT buffers must be multiple of bMaxPacketSize0 */
-		alloc_len = ROUND_UP(length, 64);
-	}
 
-	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, alloc_len);
+	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, length);
 	if (buf == NULL) {
 		return -ENOMEM;
 	}

From 35000e216d8b2529bd0c16b00109df679c39a8c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:07 +0100
Subject: [PATCH 1088/2913] Revert "[nrf fromtree] drivers: udc_dwc2: Add
 helpers to check operating mode"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a284c3984b869c552e8f0df014cd49593391aac0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 61c16d1082b..6d39ef54e3d 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -203,20 +203,6 @@ static void dwc2_wait_for_bit(const struct device *dev,
 	}
 }
 
-static inline bool dwc2_in_completer_mode(const struct device *dev)
-{
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-
-	return !IS_ENABLED(CONFIG_UDC_DWC2_DMA) || !priv->bufferdma;
-}
-
-static inline bool dwc2_in_buffer_dma_mode(const struct device *dev)
-{
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-
-	return IS_ENABLED(CONFIG_UDC_DWC2_DMA) && priv->bufferdma;
-}
-
 /* Get DOEPCTLn or DIEPCTLn register address */
 static mem_addr_t dwc2_get_dxepctl_reg(const struct device *dev, const uint8_t ep)
 {
@@ -436,7 +422,7 @@ static int dwc2_tx_fifo_write(const struct device *dev,
 		len = buf->len;
 	}
 
-	if (dwc2_in_completer_mode(dev)) {
+	if (!priv->bufferdma) {
 		uint32_t spcavail = dwc2_ftx_avail(dev, ep_idx);
 		uint32_t spcperpkt = ROUND_UP(udc_mps_ep_size(cfg), 4);
 		uint32_t max_pkts, max_transfer;
@@ -501,7 +487,7 @@ static int dwc2_tx_fifo_write(const struct device *dev,
 		    usb_dwc2_set_dieptsizn_pktcnt(pktcnt) |
 		    usb_dwc2_set_dieptsizn_xfersize(len), dieptsiz_reg);
 
-	if (dwc2_in_buffer_dma_mode(dev)) {
+	if (priv->bufferdma) {
 		if (!dwc2_dma_buffer_ok_to_use(dev, buf->data, len, cfg->mps)) {
 			/* Cannot continue unless buffer is bounced. Device will
 			 * cease to function. Is fatal error appropriate here?
@@ -544,7 +530,7 @@ static int dwc2_tx_fifo_write(const struct device *dev,
 	/* Clear IN Endpoint NAK Effective interrupt in case it was set */
 	sys_write32(USB_DWC2_DIEPINT_INEPNAKEFF, diepint_reg);
 
-	if (dwc2_in_completer_mode(dev)) {
+	if (!priv->bufferdma) {
 		const uint8_t *src = buf->data;
 
 		while (pktcnt > 0) {
@@ -673,7 +659,7 @@ static void dwc2_prep_rx(const struct device *dev, struct net_buf *buf,
 	priv->rx_siz[ep_idx] = doeptsiz;
 	sys_write32(doeptsiz, doeptsiz_reg);
 
-	if (dwc2_in_buffer_dma_mode(dev)) {
+	if (priv->bufferdma) {
 		void *data = net_buf_tail(buf);
 
 		if (!dwc2_dma_buffer_ok_to_use(dev, data, xfersize, cfg->mps)) {
@@ -1225,7 +1211,7 @@ static int dwc2_set_dedicated_fifo(const struct device *dev,
 	tmp = *diepctl & ~USB_DWC2_DEPCTL_TXFNUM_MASK;
 
 	reqdep = DIV_ROUND_UP(udc_mps_ep_size(cfg), 4U);
-	if (dwc2_in_buffer_dma_mode(dev)) {
+	if (priv->bufferdma) {
 		/* In DMA mode, TxFIFO capable of holding 2 packets is enough */
 		reqdep *= MIN(2, (1 + addnl));
 	} else {
@@ -2306,7 +2292,7 @@ static void dwc2_on_bus_reset(const struct device *dev)
 	}
 
 	doepmsk = USB_DWC2_DOEPINT_SETUP | USB_DWC2_DOEPINT_XFERCOMPL;
-	if (dwc2_in_buffer_dma_mode(dev)) {
+	if (priv->bufferdma) {
 		doepmsk |= USB_DWC2_DOEPINT_STSPHSERCVD;
 	}
 
@@ -2314,7 +2300,7 @@ static void dwc2_on_bus_reset(const struct device *dev)
 	sys_set_bits((mem_addr_t)&base->diepmsk, USB_DWC2_DIEPINT_XFERCOMPL);
 
 	/* Software has to handle RxFLvl interrupt only in Completer mode */
-	if (dwc2_in_completer_mode(dev)) {
+	if (!priv->bufferdma) {
 		sys_set_bits((mem_addr_t)&base->gintmsk,
 			     USB_DWC2_GINTSTS_RXFLVL);
 	}
@@ -2520,7 +2506,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 		}
 
 		if (!valid) {
-			if (dwc2_in_completer_mode(dev)) {
+			if (!priv->bufferdma) {
 				/* RxFlvl added data to net buf, rollback */
 				net_buf_remove_mem(buf, bcnt);
 			}
@@ -2529,7 +2515,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 		}
 	}
 
-	if (dwc2_in_buffer_dma_mode(dev) && bcnt) {
+	if (priv->bufferdma && bcnt) {
 		sys_cache_data_invd_range(net_buf_tail(buf), bcnt);
 		net_buf_add(buf, bcnt);
 	}
@@ -2573,8 +2559,7 @@ static inline void dwc2_handle_oepint(const struct device *dev)
 		/* StupPktRcvd is not enabled for interrupt, but must be checked
 		 * when XferComp hits to determine if SETUP token was received.
 		 */
-		if (dwc2_in_buffer_dma_mode(dev) &&
-		    (status & USB_DWC2_DOEPINT_XFERCOMPL) &&
+		if (priv->bufferdma && (status & USB_DWC2_DOEPINT_XFERCOMPL) &&
 		    (doepint & USB_DWC2_DOEPINT_STUPPKTRCVD)) {
 			uint32_t addr;
 

From b5b2be27251c614d718cb72ff51b206bc99b47ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:07 +0100
Subject: [PATCH 1089/2913] Revert "[nrf fromtree] drivers: udc_dwc2: Fix
 multipart DMA OUT transfers"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3d948a5c5b56a167bd58bd66a0b891ee48916c05.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 6d39ef54e3d..e117f1b172b 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -660,19 +660,17 @@ static void dwc2_prep_rx(const struct device *dev, struct net_buf *buf,
 	sys_write32(doeptsiz, doeptsiz_reg);
 
 	if (priv->bufferdma) {
-		void *data = net_buf_tail(buf);
-
-		if (!dwc2_dma_buffer_ok_to_use(dev, data, xfersize, cfg->mps)) {
+		if (!dwc2_dma_buffer_ok_to_use(dev, buf->data, xfersize, cfg->mps)) {
 			/* Cannot continue unless buffer is bounced. Device will
 			 * cease to function. Is fatal error appropriate here?
 			 */
 			return;
 		}
 
-		sys_write32((uint32_t)data,
+		sys_write32((uint32_t)buf->data,
 			    (mem_addr_t)&base->out_ep[ep_idx].doepdma);
 
-		sys_cache_data_invd_range(data, xfersize);
+		sys_cache_data_invd_range(buf->data, xfersize);
 	}
 
 	sys_write32(doepctl, doepctl_reg);
@@ -2516,7 +2514,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 	}
 
 	if (priv->bufferdma && bcnt) {
-		sys_cache_data_invd_range(net_buf_tail(buf), bcnt);
+		sys_cache_data_invd_range(buf->data, bcnt);
 		net_buf_add(buf, bcnt);
 	}
 

From 09c7b669a960ed9088e0aa3eca2b983e5a86ac8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:07 +0100
Subject: [PATCH 1090/2913] Revert "[nrf fromtree] drivers: udc_dwc2: Recover
 after STALLed OUT Data Stage"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 82c286d8128fce927ad19bb95cfb2f1a7a941f43.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index e117f1b172b..2a1efb847dc 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -1591,9 +1591,6 @@ static int udc_dwc2_ep_set_halt(const struct device *dev,
 	LOG_DBG("Set halt ep 0x%02x", cfg->addr);
 	if (ep_idx != 0) {
 		cfg->stat.halted = true;
-	} else if (!udc_buf_peek(dev, USB_CONTROL_EP_OUT)) {
-		/* Data stage is STALLed, allow receiving next SETUP */
-		dwc2_ctrl_feed_dout(dev, 8);
 	}
 
 	return 0;

From 86711aaa42c68b86ff299b071c04dedc27657b5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:07 +0100
Subject: [PATCH 1091/2913] Revert "[nrf fromtree] drivers: udc_dwc2: Fix large
 control write transfers"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 817a6d2a7e6e972e5b25c64f1d7c1fb827ca5f0e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 39 ++++----------------------------------
 1 file changed, 4 insertions(+), 35 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 2a1efb847dc..01c0f3040ce 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -250,28 +250,6 @@ static uint32_t dwc2_get_iept_xfersize(const struct device *dev, const uint32_t
 	}
 }
 
-static uint32_t dwc2_get_oept_pktctn(const struct device *dev, const uint32_t idx)
-{
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-
-	if (idx == 0) {
-		return usb_dwc2_get_doeptsiz0_pktcnt(UINT32_MAX);
-	} else {
-		return priv->max_pktcnt;
-	}
-}
-
-static uint32_t dwc2_get_oept_xfersize(const struct device *dev, const uint32_t idx)
-{
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-
-	if (idx == 0) {
-		return usb_dwc2_get_doeptsiz0_xfersize(UINT32_MAX);
-	} else {
-		return priv->max_xfersize;
-	}
-}
-
 static void dwc2_flush_rx_fifo(const struct device *dev)
 {
 	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
@@ -604,23 +582,18 @@ static void dwc2_prep_rx(const struct device *dev, struct net_buf *buf,
 	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
 	mem_addr_t doeptsiz_reg = (mem_addr_t)&base->out_ep[ep_idx].doeptsiz;
 	mem_addr_t doepctl_reg = dwc2_get_dxepctl_reg(dev, ep_idx);
-	uint32_t max_xfersize, max_pktcnt;
-	const uint32_t addnl = USB_MPS_ADDITIONAL_TRANSACTIONS(cfg->mps);
 	uint32_t pktcnt;
 	uint32_t doeptsiz;
 	uint32_t doepctl;
 	uint32_t xfersize;
 
-	max_xfersize = dwc2_get_oept_xfersize(dev, ep_idx);
-	max_pktcnt = dwc2_get_oept_pktctn(dev, ep_idx);
-
 	/* Clear NAK and set endpoint enable */
 	doepctl = sys_read32(doepctl_reg);
 	doepctl |= USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_CNAK;
 
 	if (dwc2_ep_is_iso(cfg)) {
 		xfersize = USB_MPS_TO_TPL(cfg->mps);
-		pktcnt = 1 + addnl;
+		pktcnt = 1 + USB_MPS_ADDITIONAL_TRANSACTIONS(cfg->mps);
 
 		if (xfersize > net_buf_tailroom(buf)) {
 			LOG_ERR("ISO RX buffer too small");
@@ -637,18 +610,14 @@ static void dwc2_prep_rx(const struct device *dev, struct net_buf *buf,
 		xfersize = net_buf_tailroom(buf);
 
 		/* Do as many packets in a single transfer as possible */
-		if (xfersize > max_xfersize) {
-			xfersize = ROUND_DOWN(max_xfersize, USB_MPS_TO_TPL(cfg->mps));
+		if (xfersize > priv->max_xfersize) {
+			xfersize = ROUND_DOWN(priv->max_xfersize, USB_MPS_TO_TPL(cfg->mps));
 		}
 
 		pktcnt = DIV_ROUND_UP(xfersize, USB_MPS_EP_SIZE(cfg->mps));
 	}
 
-	if (pktcnt > max_pktcnt) {
-		pktcnt = ROUND_DOWN(max_pktcnt, (1 + addnl));
-		xfersize = pktcnt * udc_mps_ep_size(cfg);
-	}
-
+	pktcnt = DIV_ROUND_UP(xfersize, udc_mps_ep_size(cfg));
 	doeptsiz = usb_dwc2_set_doeptsizn_pktcnt(pktcnt) |
 		   usb_dwc2_set_doeptsizn_xfersize(xfersize);
 	if (cfg->addr == USB_CONTROL_EP_OUT) {

From d7f214281bf5f8a7b38801ee399fcbb202643d67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:07 +0100
Subject: [PATCH 1092/2913] Revert "[nrf fromtree] tests: susbys: Implement
 performance test for the NRFS"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1ca0ac931f3eadc09792b59cc81bf2bf4697149a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/subsys/nrfs/CMakeLists.txt        |  19 ----
 tests/subsys/nrfs/Kconfig.sysbuild      |   9 --
 tests/subsys/nrfs/README.txt            |   7 --
 tests/subsys/nrfs/prj.conf              |  21 ----
 tests/subsys/nrfs/remote/CMakeLists.txt |  12 --
 tests/subsys/nrfs/remote/prj.conf       |  21 ----
 tests/subsys/nrfs/src/main.c            | 141 ------------------------
 tests/subsys/nrfs/sysbuild.cmake        |  18 ---
 tests/subsys/nrfs/testcase.yaml         |  14 ---
 9 files changed, 262 deletions(-)
 delete mode 100644 tests/subsys/nrfs/CMakeLists.txt
 delete mode 100644 tests/subsys/nrfs/Kconfig.sysbuild
 delete mode 100644 tests/subsys/nrfs/README.txt
 delete mode 100644 tests/subsys/nrfs/prj.conf
 delete mode 100644 tests/subsys/nrfs/remote/CMakeLists.txt
 delete mode 100644 tests/subsys/nrfs/remote/prj.conf
 delete mode 100644 tests/subsys/nrfs/src/main.c
 delete mode 100644 tests/subsys/nrfs/sysbuild.cmake
 delete mode 100644 tests/subsys/nrfs/testcase.yaml

diff --git a/tests/subsys/nrfs/CMakeLists.txt b/tests/subsys/nrfs/CMakeLists.txt
deleted file mode 100644
index af485e3dc2f..00000000000
--- a/tests/subsys/nrfs/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (c) 2025 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-cmake_minimum_required(VERSION 3.20.0)
-
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-
-if(NOT SYSBUILD)
-	message(FATAL_ERROR
-		" This is a multi-image application that should be built using sysbuild.\n"
-		" Add --sysbuild argument to west build command to prepare all the images.")
-endif()
-
-project(nrfs)
-
-target_sources(app PRIVATE src/main.c)
diff --git a/tests/subsys/nrfs/Kconfig.sysbuild b/tests/subsys/nrfs/Kconfig.sysbuild
deleted file mode 100644
index f281257725f..00000000000
--- a/tests/subsys/nrfs/Kconfig.sysbuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2025 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
-
-config REMOTE_BOARD
-	string
-	default "$(BOARD)/nrf54h20/cpurad" if SOC_NRF54H20_CPUAPP
-	default "$(BOARD)/nrf54h20/cpuapp" if SOC_NRF54H20_CPURAD
diff --git a/tests/subsys/nrfs/README.txt b/tests/subsys/nrfs/README.txt
deleted file mode 100644
index 45888e61c3c..00000000000
--- a/tests/subsys/nrfs/README.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-The purpose of this test suite is to validate
-NRFS services request handling performance.
-
-These reaquest are propagated over IPC.
-
-MRAM latency serivice and Temperature service
-are used as benchmarks.
diff --git a/tests/subsys/nrfs/prj.conf b/tests/subsys/nrfs/prj.conf
deleted file mode 100644
index c1a01949d60..00000000000
--- a/tests/subsys/nrfs/prj.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-CONFIG_ZTEST=y
-CONFIG_TEST_USERSPACE=y
-
-CONFIG_HEAP_MEM_POOL_SIZE=2048
-CONFIG_ISR_STACK_SIZE=1024
-CONFIG_MAIN_STACK_SIZE=4096
-CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
-
-CONFIG_NRFS=y
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=y
-CONFIG_NRFS_TEMP_SERVICE_ENABLED=y
-CONFIG_CLOCK_CONTROL=n
-
-CONFIG_ASSERT=y
-
-CONFIG_SERIAL=y
-CONFIG_PRINTK=y
-CONFIG_LOG=y
-CONFIG_LOG_MODE_IMMEDIATE=n
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
diff --git a/tests/subsys/nrfs/remote/CMakeLists.txt b/tests/subsys/nrfs/remote/CMakeLists.txt
deleted file mode 100644
index a0b3aab8b3d..00000000000
--- a/tests/subsys/nrfs/remote/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Copyright (c) 2025 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-cmake_minimum_required(VERSION 3.20.0)
-
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(remote)
-
-target_sources(app PRIVATE ../src/main.c)
diff --git a/tests/subsys/nrfs/remote/prj.conf b/tests/subsys/nrfs/remote/prj.conf
deleted file mode 100644
index c1a01949d60..00000000000
--- a/tests/subsys/nrfs/remote/prj.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-CONFIG_ZTEST=y
-CONFIG_TEST_USERSPACE=y
-
-CONFIG_HEAP_MEM_POOL_SIZE=2048
-CONFIG_ISR_STACK_SIZE=1024
-CONFIG_MAIN_STACK_SIZE=4096
-CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
-
-CONFIG_NRFS=y
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=y
-CONFIG_NRFS_TEMP_SERVICE_ENABLED=y
-CONFIG_CLOCK_CONTROL=n
-
-CONFIG_ASSERT=y
-
-CONFIG_SERIAL=y
-CONFIG_PRINTK=y
-CONFIG_LOG=y
-CONFIG_LOG_MODE_IMMEDIATE=n
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
diff --git a/tests/subsys/nrfs/src/main.c b/tests/subsys/nrfs/src/main.c
deleted file mode 100644
index affc38720b3..00000000000
--- a/tests/subsys/nrfs/src/main.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2025 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/device.h>
-#include <internal/nrfs_backend.h>
-#include <nrfs_backend_ipc_service.h>
-#include <nrfs_mram.h>
-#include <nrfs_temp.h>
-#include <zephyr/ztest.h>
-
-#define IPC_BACKEND_CONNECTION_TIMEOUT_MS 5000
-#define NUM_OF_MRAM_REQUESTS              10000
-#define MRAM_REQUESTS_DEAD_TIME_MS        1
-#define NUM_OF_TEMP_REQUESTS              100
-#define TEMP_REQUESTS_DEAD_TIME_MS        100
-
-struct ipc_perf_result {
-	uint32_t sent_requests;
-	uint32_t handled_requests;
-	uint32_t failed_to_send;
-};
-
-static volatile uint32_t tst_perf_served_mram_requests;
-static volatile uint32_t tst_perf_served_temp_meas_requests;
-
-/*
- * Callback function for counting handled TEMP service requests
- */
-static void temp_handler_for_performance_test(nrfs_temp_evt_t const *p_evt, void *context)
-{
-	switch (p_evt->type) {
-	case NRFS_TEMP_EVT_MEASURE_DONE:
-		tst_perf_served_temp_meas_requests++;
-	default:
-		break;
-	}
-}
-
-/*
- * Callback function for counting handled MRAM service requests
- */
-static void mram_latency_handler_for_performance_test(nrfs_mram_latency_evt_t const *p_evt,
-						      void *context)
-{
-	switch (p_evt->type) {
-	case NRFS_MRAM_LATENCY_REQ_APPLIED:
-		tst_perf_served_mram_requests++;
-	default:
-		break;
-	}
-}
-
-/*
- * Test NRFS MRAM latency service requests handling performance
- */
-ZTEST(nrfs_stress_test, test_mram_nrfs_requests_performance)
-{
-	struct ipc_perf_result tst_ipc_perf_result;
-	uint32_t request_counter = 0;
-	volatile int32_t tst_ctx = 1;
-
-	TC_PRINT("START test_mram_nrfs_requests_performance\n");
-	zassert_equal(nrfs_mram_init(mram_latency_handler_for_performance_test), NRFS_SUCCESS,
-		      "Failed to initialise NRFS MRAM latency service");
-	memset(&tst_ipc_perf_result, 0, sizeof(tst_ipc_perf_result));
-	while (request_counter < NUM_OF_MRAM_REQUESTS) {
-		if (nrfs_mram_set_latency(true, (void *)tst_ctx) == NRFS_SUCCESS) {
-			tst_ipc_perf_result.sent_requests++;
-		} else {
-			tst_ipc_perf_result.failed_to_send++;
-		}
-		k_msleep(MRAM_REQUESTS_DEAD_TIME_MS);
-		tst_ctx++;
-		request_counter++;
-	}
-	/* wait for any remaining requests responses */
-	k_msleep(10 * MRAM_REQUESTS_DEAD_TIME_MS);
-	tst_ipc_perf_result.handled_requests = tst_perf_served_mram_requests;
-	TC_PRINT("STOP test_mram_nrfs_requests_performance\n");
-	TC_PRINT("SENT: %d, HANDLED: %d, FAILED TO SEND: %d\n", tst_ipc_perf_result.sent_requests,
-		 tst_ipc_perf_result.handled_requests, tst_ipc_perf_result.failed_to_send);
-	zassert_equal(tst_ipc_perf_result.sent_requests, tst_ipc_perf_result.handled_requests,
-		      "NRFS MRAM requests sent != served");
-}
-
-/*
- * Test temperature service requests handling performance
- */
-ZTEST(nrfs_stress_test, test_temperature_nrfs_requests_performance)
-{
-	struct ipc_perf_result tst_ipc_perf_result;
-	uint32_t request_counter = 0;
-	volatile int32_t tst_ctx = 1;
-
-	TC_PRINT("START test_temperature_nrfs_requests_performance\n");
-	zassert_equal(nrfs_temp_init(temp_handler_for_performance_test), NRFS_SUCCESS,
-		      "Failed to initialise NRFS temperature service");
-	memset((void *)&tst_ipc_perf_result, 0, sizeof(tst_ipc_perf_result));
-	while (request_counter < NUM_OF_TEMP_REQUESTS) {
-		if (nrfs_temp_measure_request((void *)tst_ctx) == NRFS_SUCCESS) {
-			tst_ipc_perf_result.sent_requests++;
-		} else {
-			tst_ipc_perf_result.failed_to_send++;
-		}
-		k_msleep(TEMP_REQUESTS_DEAD_TIME_MS);
-		tst_ctx++;
-		request_counter++;
-	}
-	/* wait for any remaining requests responses */
-	k_msleep(10 * TEMP_REQUESTS_DEAD_TIME_MS);
-	tst_ipc_perf_result.handled_requests = tst_perf_served_temp_meas_requests;
-	TC_PRINT("STOP test_temperature_nrfs_requests_performance\n");
-	TC_PRINT("SENT: %d, HANDLED: %d, FAILED TO SEND: %d\n", tst_ipc_perf_result.sent_requests,
-		 tst_ipc_perf_result.handled_requests, tst_ipc_perf_result.failed_to_send);
-	zassert_equal(tst_ipc_perf_result.sent_requests, tst_ipc_perf_result.handled_requests,
-		      "NRFS TEMP requests sent != served");
-}
-
-/*
- * Test setup
- */
-static void *test_setup(void)
-{
-	int ret;
-
-	tst_perf_served_mram_requests = 0;
-	tst_perf_served_temp_meas_requests = 0;
-
-	TC_PRINT("Hello World! %s\n", CONFIG_BOARD_TARGET);
-	TC_PRINT("Waiting for NRFS backend init\n");
-
-	/* Wait for IPC backend connection */
-	ret = nrfs_backend_wait_for_connection(K_MSEC(IPC_BACKEND_CONNECTION_TIMEOUT_MS));
-	zassert_equal(ret, 0, "Failed to establih NRFS backend connection. err: %d", ret);
-	return NULL;
-}
-
-ZTEST_SUITE(nrfs_stress_test, NULL, test_setup, NULL, NULL, NULL);
diff --git a/tests/subsys/nrfs/sysbuild.cmake b/tests/subsys/nrfs/sysbuild.cmake
deleted file mode 100644
index 41e281ff18d..00000000000
--- a/tests/subsys/nrfs/sysbuild.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2025 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if("${SB_CONFIG_REMOTE_BOARD}" STREQUAL "")
-  message(FATAL_ERROR "REMOTE_BOARD must be set to a valid board name")
-endif()
-
-# Add remote project
-ExternalZephyrProject_Add(
-    APPLICATION remote
-    SOURCE_DIR ${APP_DIR}/remote
-    BOARD ${SB_CONFIG_REMOTE_BOARD}
-    BOARD_REVISION ${BOARD_REVISION}
-  )
-
-# Add a dependency so that the remote image will be built and flashed first
-add_dependencies(nrfs remote)
-sysbuild_add_dependencies(FLASH nrfs remote)
diff --git a/tests/subsys/nrfs/testcase.yaml b/tests/subsys/nrfs/testcase.yaml
deleted file mode 100644
index 527ff477cd0..00000000000
--- a/tests/subsys/nrfs/testcase.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-common:
-  platform_allow:
-    - nrf54h20dk/nrf54h20/cpuapp
-    - nrf54h20dk/nrf54h20/cpurad
-  integration_platforms:
-    - nrf54h20dk/nrf54h20/cpuapp
-    - nrf54h20dk/nrf54h20/cpurad
-  tags:
-    - nrfs
-  harness: ztest
-  sysbuild: true
-
-tests:
-  subsys.nrfs.stress_test: {}

From b32025ed83bbe433bb8834d2bef4d9979180dd12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:07 +0100
Subject: [PATCH 1093/2913] Revert "[nrf fromlist] drivers: udc_dwc2:
 Workaround hibernation exit glitch"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 693769a5c7354efce42af62b6c7f68f77c6678b7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/common/usb_dwc2_hw.h |  3 ---
 drivers/usb/udc/udc_dwc2.c       | 30 ++++++++----------------------
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/drivers/usb/common/usb_dwc2_hw.h b/drivers/usb/common/usb_dwc2_hw.h
index fcd0d2a0060..d5e272c8752 100644
--- a/drivers/usb/common/usb_dwc2_hw.h
+++ b/drivers/usb/common/usb_dwc2_hw.h
@@ -338,9 +338,6 @@ USB_DWC2_SET_FIELD_DEFINE(gnptxfsiz_nptxfstaddr, GNPTXFSIZ_NPTXFSTADDR)
 #define USB_DWC2_GGPIO_STM32_PWRDWN_POS		16UL
 #define USB_DWC2_GGPIO_STM32_PWRDWN		BIT(USB_DWC2_GGPIO_STM32_PWRDWN_POS)
 
-/* GSNPSID register */
-#define USB_DWC2_GSNPSID_REV_5_00A		0x4F54500AUL
-
 /* GHWCFG1 register */
 #define USB_DWC2_GHWCFG1			0x0044UL
 #define USB_DWC2_GHWCFG1_EPDIR_POS(i)		(i * 2)
diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 01c0f3040ce..072fdbd2e13 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -121,8 +121,6 @@ struct udc_dwc2_data {
 	unsigned int dynfifosizing : 1;
 	unsigned int bufferdma : 1;
 	unsigned int syncrst : 1;
-	/* Defect workarounds */
-	unsigned int wa_essregrestored : 1;
 	/* Runtime state flags */
 	unsigned int hibernated : 1;
 	unsigned int enumdone : 1;
@@ -947,21 +945,6 @@ static void dwc2_restore_essential_registers(const struct device *dev,
 
 	pcgcctl |= USB_DWC2_PCGCCTL_ESSREGRESTORED;
 	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
-
-	/* Note: in Remote Wakeup case 15 ms max signaling time starts now */
-
-	/* Wait for Restore Done Interrupt */
-	dwc2_wait_for_bit(dev, (mem_addr_t)&base->gintsts, USB_DWC2_GINTSTS_RSTRDONEINT);
-
-	if (priv->wa_essregrestored) {
-		pcgcctl &= ~USB_DWC2_PCGCCTL_ESSREGRESTORED;
-		sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
-		k_busy_wait(1);
-	}
-
-	if (!bus_reset) {
-		sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
-	}
 }
 
 static void dwc2_restore_device_registers(const struct device *dev, bool rwup)
@@ -1098,6 +1081,14 @@ static void dwc2_exit_hibernation(const struct device *dev,
 
 	dwc2_restore_essential_registers(dev, rwup, bus_reset);
 
+	/* Note: in Remote Wakeup case 15 ms max signaling time starts now */
+
+	/* Wait for Restore Done Interrupt */
+	dwc2_wait_for_bit(dev, (mem_addr_t)&base->gintsts, USB_DWC2_GINTSTS_RSTRDONEINT);
+	if (!bus_reset) {
+		sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
+	}
+
 	/* Disable restore from PMU */
 	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_RESTORE);
 	k_busy_wait(1);
@@ -1766,7 +1757,6 @@ static int udc_dwc2_init_controller(const struct device *dev)
 	mem_addr_t gahbcfg_reg = (mem_addr_t)&base->gahbcfg;
 	mem_addr_t gusbcfg_reg = (mem_addr_t)&base->gusbcfg;
 	mem_addr_t dcfg_reg = (mem_addr_t)&base->dcfg;
-	uint32_t gsnpsid;
 	uint32_t dcfg;
 	uint32_t gusbcfg;
 	uint32_t gahbcfg;
@@ -1782,10 +1772,6 @@ static int udc_dwc2_init_controller(const struct device *dev)
 		return ret;
 	}
 
-	/* Enable RTL workarounds based on controller revision */
-	gsnpsid = sys_read32((mem_addr_t)&base->gsnpsid);
-	priv->wa_essregrestored = gsnpsid < USB_DWC2_GSNPSID_REV_5_00A;
-
 	priv->ghwcfg1 = sys_read32((mem_addr_t)&base->ghwcfg1);
 	ghwcfg2 = sys_read32((mem_addr_t)&base->ghwcfg2);
 	ghwcfg3 = sys_read32((mem_addr_t)&base->ghwcfg3);

From 6d541bc6abb38eedcb3130b028e35d0e556eb9b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:07 +0100
Subject: [PATCH 1094/2913] Revert "[nrf fromlist] drivers: udc_dwc2: Set bit
 17 if needed on Hibernation Exit"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f25809ce84196419555e004e1bcb4f87e4c7765b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/common/usb_dwc2_hw.h | 32 --------------------------------
 drivers/usb/udc/udc_dwc2.c       |  5 -----
 2 files changed, 37 deletions(-)

diff --git a/drivers/usb/common/usb_dwc2_hw.h b/drivers/usb/common/usb_dwc2_hw.h
index d5e272c8752..fcb35489a04 100644
--- a/drivers/usb/common/usb_dwc2_hw.h
+++ b/drivers/usb/common/usb_dwc2_hw.h
@@ -997,33 +997,6 @@ USB_DWC2_SET_FIELD_DEFINE(doeptsizn_xfersize, DOEPTSIZN_XFERSIZE)
 
 /* Power and Clock Gating Control Register */
 #define USB_DWC2_PCGCCTL			0x0E00UL
-#define USB_DWC2_PCGCCTL_IF_DEV_MODE_POS	31UL
-#define USB_DWC2_PCGCCTL_IF_DEV_MODE		BIT(USB_DWC2_PCGCCTL_IF_DEV_MODE_POS)
-#define USB_DWC2_PCGCCTL_P2HD_PRT_SPD_POS	29UL
-#define USB_DWC2_PCGCCTL_P2HD_PRT_SPD_MASK	(0x3UL << USB_DWC2_PCGCCTL_P2HD_PRT_SPD_POS)
-#define USB_DWC2_PCGCCTL_P2HD_PRT_SPD_LS	2
-#define USB_DWC2_PCGCCTL_P2HD_PRT_SPD_FS	1
-#define USB_DWC2_PCGCCTL_P2HD_PRT_SPD_HS	0
-#define USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_POS	27UL
-#define USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_MASK	(0x3UL << USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_POS)
-#define USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_FS48	3
-#define USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_LS	2
-#define USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_FS	1
-#define USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_HS	0
-#define USB_DWC2_PCGCCTL_MAC_DEV_ADDR_POS	20UL
-#define USB_DWC2_PCGCCTL_MAC_DEV_ADDR_MASK	(0x7FUL << USB_DWC2_PCGCCTL_MAC_DEV_ADDR_POS)
-#define USB_DWC2_PCGCCTL_MAX_TERMSELECT_POS	19UL
-#define USB_DWC2_PCGCCTL_MAX_TERMSELECT		BIT(USB_DWC2_PCGCCTL_MAX_TERMSELECT_POS)
-#define USB_DWC2_PCGCCTL_MAC_XCVRSELECT_POS	17UL
-#define USB_DWC2_PCGCCTL_MAC_XCVRSELECT_MASK	(0x3UL << USB_DWC2_PCGCCTL_MAC_XCVRSELECT_POS)
-#define USB_DWC2_PCGCCTL_MAC_XCVRSELECT_LFS	3
-#define USB_DWC2_PCGCCTL_MAC_XCVRSELECT_LS	2
-#define USB_DWC2_PCGCCTL_MAC_XCVRSELECT_FS	1
-#define USB_DWC2_PCGCCTL_MAC_XCVRSELECT_HS	0
-#define USB_DWC2_PCGCCTL_SH2PL_PRT_CTL0_POS	16UL
-#define USB_DWC2_PCGCCTL_SH2PL_PRT_CTL0		BIT(USB_DWC2_PCGCCTL_SH2PL_PRT_CTL0_POS)
-#define USB_DWC2_PCGCCTL_PRT_CLK_SEL_POS	14UL
-#define USB_DWC2_PCGCCTL_PRT_CLK_SEL_MASK	(0x3UL << USB_DWC2_PCGCCTL_PRT_CLK_SEL_POS)
 #define USB_DWC2_PCGCCTL_RESTOREVALUE_POS	14UL
 #define USB_DWC2_PCGCCTL_RESTOREVALUE_MASK	(0x3FFFFUL << USB_DWC2_PCGCCTL_RESTOREVALUE_POS)
 #define USB_DWC2_PCGCCTL_ESSREGRESTORED_POS	13UL
@@ -1043,11 +1016,6 @@ USB_DWC2_SET_FIELD_DEFINE(doeptsizn_xfersize, DOEPTSIZN_XFERSIZE)
 #define USB_DWC2_PCGCCTL_STOPPCLK_POS		0UL
 #define USB_DWC2_PCGCCTL_STOPPCLK		BIT(USB_DWC2_PCGCCTL_STOPPCLK_POS)
 
-USB_DWC2_GET_FIELD_DEFINE(pcgcctl_p2hd_prt_spd, PCGCCTL_P2HD_PRT_SPD)
-USB_DWC2_GET_FIELD_DEFINE(pcgcctl_p2hd_dev_enum_spd, PCGCCTL_P2HD_DEV_ENUM_SPD)
-USB_DWC2_GET_FIELD_DEFINE(pcgcctl_mac_dev_addr, PCGCCTL_MAC_DEV_ADDR)
-USB_DWC2_GET_FIELD_DEFINE(pcgcctl_mac_xcvrselect, PCGCCTL_MAC_XCVRSELECT)
-USB_DWC2_GET_FIELD_DEFINE(pcgcctl_prt_clk_sel, PCGCCTL_PRT_CLK_SEL)
 USB_DWC2_GET_FIELD_DEFINE(pcgcctl_restorevalue, PCGCCTL_RESTOREVALUE)
 USB_DWC2_SET_FIELD_DEFINE(pcgcctl_restorevalue, PCGCCTL_RESTOREVALUE)
 
diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 072fdbd2e13..7f1256a10f0 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -915,11 +915,6 @@ static void dwc2_restore_essential_registers(const struct device *dev,
 	struct dwc2_reg_backup *backup = &priv->backup;
 	uint32_t pcgcctl = backup->pcgcctl & USB_DWC2_PCGCCTL_RESTOREVALUE_MASK;
 
-	if (usb_dwc2_get_pcgcctl_p2hd_dev_enum_spd(pcgcctl) ==
-	    USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_HS) {
-		pcgcctl |= BIT(17);
-	}
-
 	sys_write32(backup->glpmcfg, (mem_addr_t)&base->glpmcfg);
 	sys_write32(backup->gi2cctl, (mem_addr_t)&base->gi2cctl);
 	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);

From 6c9e2f8284246652dfbf49bbca0a7a85c572f613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:07 +0100
Subject: [PATCH 1095/2913] Revert "[nrf fromtree] ipc: ipc_service: Null
 terminate RPMsg endpoint names"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7cbe361b02aaa1921916c7bc0c314103730dce6c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c b/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c
index 10c094158b2..a2c0883c054 100644
--- a/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c
+++ b/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c
@@ -201,7 +201,6 @@ static void ns_bind_cb(struct rpmsg_device *rdev, const char *name, uint32_t des
 		 * call by the HOST core.
 		 */
 		strncpy(rpmsg_ept->name, name, sizeof(rpmsg_ept->name));
-		rpmsg_ept->name[RPMSG_NAME_SIZE - 1] = '\0';
 		rpmsg_ept->dest = dest;
 		k_mutex_unlock(&rpmsg_inst->mtx);
 	}
@@ -404,7 +403,6 @@ static struct ipc_rpmsg_ept *register_ept_on_host(struct ipc_rpmsg_instance *rpm
 		 * not registered the endpoint yet. Cache it.
 		 */
 		strncpy(rpmsg_ept->name, cfg->name, sizeof(rpmsg_ept->name));
-		rpmsg_ept->name[RPMSG_NAME_SIZE - 1] = '\0';
 		k_mutex_unlock(&rpmsg_inst->mtx);
 	}
 
@@ -428,7 +426,6 @@ static struct ipc_rpmsg_ept *register_ept_on_remote(struct ipc_rpmsg_instance *r
 	rpmsg_ept->ep.priv = rpmsg_ept;
 
 	strncpy(rpmsg_ept->name, cfg->name, sizeof(rpmsg_ept->name));
-	rpmsg_ept->name[RPMSG_NAME_SIZE - 1] = '\0';
 
 	err = ipc_rpmsg_register_ept(rpmsg_inst, RPMSG_REMOTE, rpmsg_ept);
 	if (err != 0) {

From dbeef55db4ad66c75acdb5feaf786f067a1c84ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:07 +0100
Subject: [PATCH 1096/2913] Revert "[nrf fromtree] net: openthread: fix
 `otPlatBleEnable`"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a2eaddb4bcbb177a68f1feb6b43170ce31ea995f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/openthread/platform/ble.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openthread/platform/ble.c b/modules/openthread/platform/ble.c
index 1ccb07c2ec3..c831b402c56 100644
--- a/modules/openthread/platform/ble.c
+++ b/modules/openthread/platform/ble.c
@@ -476,7 +476,7 @@ otError otPlatBleEnable(otInstance *aInstance)
 		LOG_WRN("BLE enable failed with error code %d", err);
 		return OT_ERROR_FAILED;
 	} else if (err == -EALREADY) {
-		bt_conn_cb_register(&conn_callbacks);
+		err = k_sem_take(&ot_plat_ble_init_semaphore, K_MSEC(500));
 		return OT_ERROR_NONE;
 	}
 

From 9a03c38b574076c9fdd3cccac365dcae141bfdf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:07 +0100
Subject: [PATCH 1097/2913] Revert "[nrf fromtree] openthread: fix logging
 configuration"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 471e0a9777c568c4680e83c8ea2dc9e17b4f384a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/openthread/platform/alarm.c       |  2 +-
 modules/openthread/platform/ble.c         |  2 +-
 modules/openthread/platform/messagepool.c |  2 +-
 modules/openthread/platform/uart.c        |  2 +-
 subsys/net/l2/openthread/Kconfig          | 12 ------------
 5 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/modules/openthread/platform/alarm.c b/modules/openthread/platform/alarm.c
index 827477d9712..3cbf1d033e3 100644
--- a/modules/openthread/platform/alarm.c
+++ b/modules/openthread/platform/alarm.c
@@ -5,7 +5,7 @@
  */
 
 #define LOG_MODULE_NAME net_openthread_alarm
-#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
+#define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
diff --git a/modules/openthread/platform/ble.c b/modules/openthread/platform/ble.c
index c831b402c56..a2d6cd29af8 100644
--- a/modules/openthread/platform/ble.c
+++ b/modules/openthread/platform/ble.c
@@ -30,7 +30,7 @@
 /* Zephyr Logging */
 
 #define LOG_MODULE_NAME net_openthread_tcat
-#define LOG_LEVEL       CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
+#define LOG_LEVEL       CONFIG_OPENTHREAD_LOG_LEVEL
 
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
diff --git a/modules/openthread/platform/messagepool.c b/modules/openthread/platform/messagepool.c
index c085aeb9a58..cb9a64674c4 100644
--- a/modules/openthread/platform/messagepool.c
+++ b/modules/openthread/platform/messagepool.c
@@ -10,7 +10,7 @@
 #include <openthread/platform/messagepool.h>
 
 #define LOG_MODULE_NAME net_otPlat_messagepool
-#define LOG_LEVEL       CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
+#define LOG_LEVEL       CONFIG_OPENTHREAD_LOG_LEVEL
 
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
diff --git a/modules/openthread/platform/uart.c b/modules/openthread/platform/uart.c
index 31afdac6bac..ebf156ded15 100644
--- a/modules/openthread/platform/uart.c
+++ b/modules/openthread/platform/uart.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
+#define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
 #define LOG_MODULE_NAME net_otPlat_uart
 
 #include <zephyr/logging/log.h>
diff --git a/subsys/net/l2/openthread/Kconfig b/subsys/net/l2/openthread/Kconfig
index 9ff68a5f0c9..0f3c83ef763 100644
--- a/subsys/net/l2/openthread/Kconfig
+++ b/subsys/net/l2/openthread/Kconfig
@@ -90,18 +90,6 @@ config OPENTHREAD_LOG_LEVEL
 	default 4 if OPENTHREAD_LOG_LEVEL_INFO
 	default 5 if OPENTHREAD_LOG_LEVEL_DEBG
 	default 0
-	help
-	  Log level for OpenThread stack.
-
-config OPENTHREAD_PLATFORM_LOG_LEVEL
-	int
-	default 1 if OPENTHREAD_LOG_LEVEL_CRIT
-	default 2 if OPENTHREAD_LOG_LEVEL_WARN
-	default 3 if OPENTHREAD_LOG_LEVEL_NOTE || OPENTHREAD_LOG_LEVEL_INFO
-	default 4 if OPENTHREAD_LOG_LEVEL_DEBG
-	default 0
-	help
-	  Log level for OpenThread Zephyr platform.
 
 menuconfig OPENTHREAD_L2_DEBUG
 	bool "OpenThread L2 log support"

From 3638ebf36d1c8dc96d48144782664304a53cf7d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:07 +0100
Subject: [PATCH 1098/2913] Revert "[nrf noup] boards: Update non-secure target
 for nrf54l15"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2d1e173dfed02366566420ba923a0d293a65bf91.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml
index e58bf792b06..56b8e9618c0 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml
@@ -9,7 +9,6 @@ toolchain:
   - gnuarmemb
   - xtools
   - zephyr
-sysbuild: true
 ram: 256
 flash: 1524
 supported:

From 7f6b492df83870d643b9d42a5454749a4579e340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:07 +0100
Subject: [PATCH 1099/2913] Revert "[nrf fromtree] net: Added configuring child
 timeouts on openthread start"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1aa2f9d42791ff37061af43aa8fa97120f9fbeb7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/l2/openthread/openthread.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/subsys/net/l2/openthread/openthread.c b/subsys/net/l2/openthread/openthread.c
index 51549bd8de5..c70adc0714c 100644
--- a/subsys/net/l2/openthread/openthread.c
+++ b/subsys/net/l2/openthread/openthread.c
@@ -21,7 +21,6 @@ LOG_MODULE_REGISTER(net_l2_openthread, CONFIG_OPENTHREAD_L2_LOG_LEVEL);
 #include <zephyr/sys/__assert.h>
 #include <zephyr/version.h>
 
-#include <openthread/child_supervision.h>
 #include <openthread/cli.h>
 #include <openthread/ip6.h>
 #include <openthread/link.h>
@@ -443,13 +442,6 @@ int openthread_start(struct openthread_context *ot_context)
 		otLinkSetPollPeriod(ot_context->instance, OT_POLL_PERIOD);
 	}
 
-	/* Configure Child Supervision and MLE Child timeouts. */
-	otChildSupervisionSetInterval(ot_context->instance,
-				      CONFIG_OPENTHREAD_CHILD_SUPERVISION_INTERVAL);
-	otChildSupervisionSetCheckTimeout(ot_context->instance,
-					  CONFIG_OPENTHREAD_CHILD_SUPERVISION_CHECK_TIMEOUT);
-	otThreadSetChildTimeout(ot_context->instance, CONFIG_OPENTHREAD_MLE_CHILD_TIMEOUT);
-
 	if (otDatasetIsCommissioned(ot_instance)) {
 		/* OpenThread already has dataset stored - skip the
 		 * configuration.

From 760d57996f2793c7c4a41f5e247e6436017dc54d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:07 +0100
Subject: [PATCH 1100/2913] Revert "[nrf fromtree] modules: hal_nordic: enable
 CLOCK_CONTROL if nrf-802154 RD"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 954583a58b959f33125c561ad1ea367ccc1830f7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/hal_nordic/Kconfig b/modules/hal_nordic/Kconfig
index 183d25d9a19..f29b77e120e 100644
--- a/modules/hal_nordic/Kconfig
+++ b/modules/hal_nordic/Kconfig
@@ -23,7 +23,6 @@ menuconfig NRF_802154_RADIO_DRIVER
 	depends on HAS_HW_NRF_RADIO_IEEE802154
 	select DYNAMIC_INTERRUPTS
 	select ENTROPY_GENERATOR
-	select CLOCK_CONTROL
 	depends on !$(dt_nodelabel_enabled,timer1)
 	help
 	  This option enables nRF IEEE 802.15.4 radio driver in Zephyr. Note,

From 459c621c23fd7d9e01659ac0f97181344caa1f7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:07 +0100
Subject: [PATCH 1101/2913] Revert "[nrf fromtree] modules: hal_nordic: use
 CLOCK_CONTROL_NRF2 for HFCLK request/release"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b56f9fac0edadba8e75b49ab9605c4f79b0778ee.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../platform/nrf_802154_clock_zephyr.c        | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c b/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
index c307401c657..f9da7537dc1 100644
--- a/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
+++ b/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
@@ -11,7 +11,12 @@
 
 #include <compiler_abstraction.h>
 #include <zephyr/kernel.h>
+#if defined(CONFIG_CLOCK_CONTROL_NRF)
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#elif !defined(NRF54H_SERIES)
+#error No implementation to start or stop HFCLK due to missing clock_control.
+#endif
 
 static bool hfclk_is_running;
 
@@ -30,6 +35,7 @@ bool nrf_802154_clock_hfclk_is_running(void)
 	return hfclk_is_running;
 }
 
+#if defined(CONFIG_CLOCK_CONTROL_NRF)
 
 static struct onoff_client hfclk_cli;
 
@@ -42,7 +48,6 @@ static void hfclk_on_callback(struct onoff_manager *mgr,
 	nrf_802154_clock_hfclk_ready();
 }
 
-#if defined(CONFIG_CLOCK_CONTROL_NRF)
 void nrf_802154_clock_hfclk_start(void)
 {
 	int ret;
@@ -70,22 +75,40 @@ void nrf_802154_clock_hfclk_stop(void)
 	hfclk_is_running = false;
 }
 
-#elif defined(CONFIG_CLOCK_CONTROL_NRF2)
+#elif defined(NRF54H_SERIES)
+
+#define NRF_LRCCONF_RADIO_PD NRF_LRCCONF010
+/* HF clock time to ramp-up. */
+#define MAX_HFXO_RAMP_UP_TIME_US 550
+
+static void hfclk_started_timer_handler(struct k_timer *dummy)
+{
+	hfclk_is_running = true;
+	nrf_802154_clock_hfclk_ready();
+}
+
+K_TIMER_DEFINE(hfclk_started_timer, hfclk_started_timer_handler, NULL);
 
 void nrf_802154_clock_hfclk_start(void)
 {
-	sys_notify_init_callback(&hfclk_cli.notify, hfclk_on_callback);
-	int ret = nrf_clock_control_request(DEVICE_DT_GET(DT_NODELABEL(hfxo)), NULL, &hfclk_cli);
+	/* Use register directly, there is no support for that task in nrf_lrcconf_task_trigger.
+	 * This code might cause troubles if there are other HFXO users in this CPU.
+	 */
+	NRF_LRCCONF_RADIO_PD->EVENTS_HFXOSTARTED = 0x0;
+	NRF_LRCCONF_RADIO_PD->TASKS_REQHFXO = 0x1;
 
-	__ASSERT_NO_MSG(ret >= 0);
+	k_timer_start(&hfclk_started_timer, K_USEC(MAX_HFXO_RAMP_UP_TIME_US), K_NO_WAIT);
 }
 
 void nrf_802154_clock_hfclk_stop(void)
 {
-	int ret = nrf_clock_control_cancel_or_release(DEVICE_DT_GET(DT_NODELABEL(hfxo)),
-						      NULL, &hfclk_cli);
+	/* Use register directly, there is no support for that task in nrf_lrcconf_task_trigger.
+	 * This code might cause troubles if there are other HFXO users in this CPU.
+	 */
+	NRF_LRCCONF_RADIO_PD->TASKS_STOPREQHFXO = 0x1;
+	NRF_LRCCONF_RADIO_PD->EVENTS_HFXOSTARTED = 0x0;
 
-	__ASSERT_NO_MSG(ret >= 0);
+	hfclk_is_running = false;
 }
 
 #endif

From d48dcdd83c7ac3b9ed531ce041bdfb0be2d041f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:08 +0100
Subject: [PATCH 1102/2913] Revert "[nrf fromtree] manifest: Update nRF hw
 models to latest enabling cracen HAL"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1f1ad79d8892c8dcde448962e52a2f8188a9dc30.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 619a2afa10e..37bdb187006 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: 68df9ed65dd9d93bb257bf8f295cb753ecf83cd8
+      revision: f6d4d3f157eaad78c81c64621e3507ec752bdfde
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
       revision: f6b950a3b5c0187fe499b0e518426d5bf88b7e68

From 85a219fe3bcc8c072d7b94f66dd461b30aa6a490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:08 +0100
Subject: [PATCH 1103/2913] Revert "[nrf fromtree] manifest: Update nRF hw
 models to enable cracen HAL"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f571ee74d72acad70d6b646a3553b7db19627d34.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 37bdb187006..80cf3532fdc 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: f6d4d3f157eaad78c81c64621e3507ec752bdfde
+      revision: 1069743a7fc06362e8f8d7f57225b8c7940da9f0
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
       revision: f6b950a3b5c0187fe499b0e518426d5bf88b7e68

From 27cf5adf4267914aa3234fe515e8bcab4b603295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:08 +0100
Subject: [PATCH 1104/2913] Revert "[nrf fromtree] manifest: Update nRF hw
 models to latest"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 779a067c5b9486f78b8e50a79758ad4e94057ebe.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 80cf3532fdc..adf6bf6ce60 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: 1069743a7fc06362e8f8d7f57225b8c7940da9f0
+      revision: 71bcaa88c97977647d387217dab99f7d6f026815
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
       revision: f6b950a3b5c0187fe499b0e518426d5bf88b7e68

From 7495e9a331bed68ad04b420a9dffcf469807a073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:08 +0100
Subject: [PATCH 1105/2913] Revert "[nrf fromtree] manifest: Update nRF hw
 models to latest"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7458bd33b0a76392d719956a426eeb456527e48a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index adf6bf6ce60..6d1ad7df18c 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: 71bcaa88c97977647d387217dab99f7d6f026815
+      revision: fbc6e614686b69dfa56f9694350b9488cf83d3f7
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
       revision: f6b950a3b5c0187fe499b0e518426d5bf88b7e68

From 433cb0f065c4b83e34fe934e226141c8a232fca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:08 +0100
Subject: [PATCH 1106/2913] Revert "[nrf fromtree] mgmt: mcumgr: grp: os_mgmt:
 Add error code for invalid responses"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 763e6a8ab82bd1a346a9b14a4b8fc7509c8441b6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt.h | 3 ---
 subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c     | 1 -
 2 files changed, 4 deletions(-)

diff --git a/include/zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt.h b/include/zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt.h
index da4572e33da..9aef7721929 100644
--- a/include/zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt.h
+++ b/include/zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt.h
@@ -47,9 +47,6 @@ enum os_mgmt_err_code_t {
 
 	/** RTC command failed */
 	OS_MGMT_ERR_RTC_COMMAND_FAILED,
-
-	/** Query was recognized but there is no valid value for the response. */
-	OS_MGMT_ERR_QUERY_RESPONSE_VALUE_NOT_VALID,
 };
 
 /* Bitmask values used by the os info command handler. Note that the width of this variable is
diff --git a/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c b/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
index 983cee510aa..648f3842705 100644
--- a/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
@@ -1046,7 +1046,6 @@ static int os_mgmt_translate_error_code(uint16_t err)
 
 	case OS_MGMT_ERR_QUERY_YIELDS_NO_ANSWER:
 	case OS_MGMT_ERR_RTC_NOT_SET:
-	case OS_MGMT_ERR_QUERY_RESPONSE_VALUE_NOT_VALID:
 		rc = MGMT_ERR_ENOENT;
 		break;
 

From 7d0cef2ba9d3ebe61e89c69d973a1e9f25d5e0e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:08 +0100
Subject: [PATCH 1107/2913] Revert "[nrf fromtree] kernel: timeout: ensure next
 timeout is set when aborting the first timeout"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 76a46cb2baf310a06bbdb0b1d7d99394ec04a671.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 kernel/timeout.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/kernel/timeout.c b/kernel/timeout.c
index c18f2e41d06..f751c2f20a5 100644
--- a/kernel/timeout.c
+++ b/kernel/timeout.c
@@ -147,13 +147,8 @@ int z_abort_timeout(struct _timeout *to)
 
 	K_SPINLOCK(&timeout_lock) {
 		if (sys_dnode_is_linked(&to->node)) {
-			bool is_first = (to == first());
-
 			remove_timeout(to);
 			ret = 0;
-			if (is_first) {
-				sys_clock_set_timeout(next_timeout(), false);
-			}
 		}
 	}
 

From bff171fb28a17cf914c631823afb53a0da4d39fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:08 +0100
Subject: [PATCH 1108/2913] Revert "[nrf fromtree] dts: common: nordic:
 nrf54h20: Fix flpr bus-width"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1b965ae13b7b41d2980e430a7890b562ea93c87b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/common/nordic/nrf54h20.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index e042df822ca..f879e08fa52 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -84,7 +84,7 @@
 			device_type = "cpu";
 			clock-frequency = <DT_FREQ_M(320)>;
 			riscv,isa = "rv32emc";
-			nordic,bus-width = <32>;
+			nordic,bus-width = <64>;
 
 			cpuflpr_vevif_rx: mailbox {
 				compatible = "nordic,nrf-vevif-task-rx";

From 109d4f4bd73b0c48bd81b1de7067fd5ec838f4e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:08 +0100
Subject: [PATCH 1109/2913] Revert "[nrf fromlist] drv: nordic_vpr_launcher:
 manage data cache"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 185906a698cfea6f656556c1a03572a3835913a6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c b/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
index 5bd43f87fb9..2c2915a7984 100644
--- a/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
+++ b/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
@@ -7,7 +7,6 @@
 
 #include <string.h>
 
-#include <zephyr/cache.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
@@ -39,11 +38,6 @@ static int nordic_vpr_launcher_init(const struct device *dev)
 		LOG_DBG("Loading VPR (%p) from %p to %p (%zu bytes)", config->vpr,
 			(void *)config->src_addr, (void *)config->exec_addr, config->size);
 		memcpy((void *)config->exec_addr, (void *)config->src_addr, config->size);
-#if defined(CONFIG_DCACHE)
-		LOG_DBG("Writing back cache with loaded VPR (from %p %zu bytes)",
-			(void *)config->exec_addr, config->size);
-		sys_cache_data_flush_range((void *)config->exec_addr, config->size);
-#endif
 	}
 #endif
 

From c3bb6acd83e1e95fab1a90501337d5ddc1a74f38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:08 +0100
Subject: [PATCH 1110/2913] Revert "[nrf noup] cmake: linker: ld: target:
 Remove child/parent image flag"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 20a2ba291a8fd3ac3fd0f51c0491d7debbd11be4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/linker/ld/target.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/linker/ld/target.cmake b/cmake/linker/ld/target.cmake
index d7ac5e41d89..c941d8ee89e 100644
--- a/cmake/linker/ld/target.cmake
+++ b/cmake/linker/ld/target.cmake
@@ -76,7 +76,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
       ${current_includes}
       ${soc_linker_script_includes}
       ${template_script_defines}
-      -DUSE_PARTITION_MANAGER=$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>
+      -DUSE_PARTITION_MANAGER=$<OR:$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>,$<BOOL:${IMAGE_NAME}>,$<TARGET_EXISTS:partition_manager>>
       -E ${LINKER_SCRIPT}
       -P # Prevent generation of debug `#line' directives.
       -o ${linker_script_gen}

From 6061069d4f0fc6b105b509ac68a70458b017e088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:08 +0100
Subject: [PATCH 1111/2913] Revert "[nrf noup] samples/tests: Add TF-M sysbuild
 config files"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b983259c675e7681ada2c2f66e1e12b2c95156e2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/subsys/usb/dfu/sysbuild.conf     | 1 -
 tests/drivers/flash/common/sysbuild.conf | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 samples/subsys/usb/dfu/sysbuild.conf
 create mode 100644 tests/drivers/flash/common/sysbuild.conf

diff --git a/samples/subsys/usb/dfu/sysbuild.conf b/samples/subsys/usb/dfu/sysbuild.conf
deleted file mode 100644
index 47f00ff3cff..00000000000
--- a/samples/subsys/usb/dfu/sysbuild.conf
+++ /dev/null
@@ -1 +0,0 @@
-SB_CONFIG_BOOTLOADER_MCUBOOT=y
diff --git a/tests/drivers/flash/common/sysbuild.conf b/tests/drivers/flash/common/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/tests/drivers/flash/common/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n

From ed4c06800334ba7d1c872b89f92dd58431dcfcf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:08 +0100
Subject: [PATCH 1112/2913] Revert "[nrf fromlist] boards: nordic:
 nrf5340dk/nrf9160dk: Use sysbuild for ns twister"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 255c07ef513611e16e150b49ca057ffb25dd6b15.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml | 1 -
 boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml | 1 -
 boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml  | 1 -
 3 files changed, 3 deletions(-)

diff --git a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml
index cec7b107776..4c366d2f363 100644
--- a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml
+++ b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml
@@ -18,4 +18,3 @@ supported:
   - gpio
   - spi
 vendor: nordic
-sysbuild: true
diff --git a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml
index 86161bb4385..d610095afaf 100644
--- a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml
+++ b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml
@@ -19,4 +19,3 @@ supported:
   - netif:modem
   - gpio
 vendor: nordic
-sysbuild: true
diff --git a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml
index 52b8f85efb4..0faa84b38c9 100644
--- a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml
+++ b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml
@@ -19,4 +19,3 @@ supported:
   - netif:modem
   - gpio
 vendor: nordic
-sysbuild: true

From 17df59295aa7f95655260065f9403872228a64c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:08 +0100
Subject: [PATCH 1113/2913] Revert "[nrf fromtree] tests: boards: nrf: hwinfo:
 Add test for reset cause on nrf54*"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0ea1f14056a54e88b689e0c9623700d53f469563.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf/hwinfo/reset_cause/CMakeLists.txt     |   8 -
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  14 -
 .../boards/nrf54h20dk_nrf54h20_cpurad.overlay |  14 -
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |   9 -
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       |   9 -
 tests/boards/nrf/hwinfo/reset_cause/prj.conf  |   7 -
 .../boards/nrf/hwinfo/reset_cause/src/main.c  | 366 ------------------
 .../nrf/hwinfo/reset_cause/testcase.yaml      |  38 --
 8 files changed, 465 deletions(-)
 delete mode 100644 tests/boards/nrf/hwinfo/reset_cause/CMakeLists.txt
 delete mode 100644 tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 delete mode 100644 tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpurad.overlay
 delete mode 100644 tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 delete mode 100644 tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
 delete mode 100644 tests/boards/nrf/hwinfo/reset_cause/prj.conf
 delete mode 100644 tests/boards/nrf/hwinfo/reset_cause/src/main.c
 delete mode 100644 tests/boards/nrf/hwinfo/reset_cause/testcase.yaml

diff --git a/tests/boards/nrf/hwinfo/reset_cause/CMakeLists.txt b/tests/boards/nrf/hwinfo/reset_cause/CMakeLists.txt
deleted file mode 100644
index f659d208cb9..00000000000
--- a/tests/boards/nrf/hwinfo/reset_cause/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(reset_reason)
-
-FILE(GLOB app_sources src/*.c)
-target_sources(app PRIVATE ${app_sources})
diff --git a/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index ead2840f6f4..00000000000
--- a/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	aliases {
-		watchdog0 = &wdt010;
-	};
-};
-
-&wdt010 {
-	status = "okay";
-};
diff --git a/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpurad.overlay
deleted file mode 100644
index ead2840f6f4..00000000000
--- a/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpurad.overlay
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	aliases {
-		watchdog0 = &wdt010;
-	};
-};
-
-&wdt010 {
-	status = "okay";
-};
diff --git a/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 8d3dce3b380..00000000000
--- a/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&wdt31 {
-	status = "okay";
-};
diff --git a/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
deleted file mode 100644
index dc1ea1a9ddc..00000000000
--- a/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2025 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&wdt31 {
-	status = "okay";
-};
diff --git a/tests/boards/nrf/hwinfo/reset_cause/prj.conf b/tests/boards/nrf/hwinfo/reset_cause/prj.conf
deleted file mode 100644
index edd86844963..00000000000
--- a/tests/boards/nrf/hwinfo/reset_cause/prj.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG_HWINFO=y
-
-CONFIG_WATCHDOG=y
-CONFIG_REBOOT=y
-
-CONFIG_LOG=y
-CONFIG_LOG_MODE_MINIMAL=y
diff --git a/tests/boards/nrf/hwinfo/reset_cause/src/main.c b/tests/boards/nrf/hwinfo/reset_cause/src/main.c
deleted file mode 100644
index 1e07f679114..00000000000
--- a/tests/boards/nrf/hwinfo/reset_cause/src/main.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/drivers/hwinfo.h>
-#include <zephyr/drivers/watchdog.h>
-#include <zephyr/sys/reboot.h>
-#include <zephyr/cache.h>
-#include <errno.h>
-
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(resetreason, LOG_LEVEL_INF);
-
-static const struct device *const my_wdt_device = DEVICE_DT_GET(DT_ALIAS(watchdog0));
-static struct wdt_timeout_cfg m_cfg_wdt0;
-static int my_wdt_channel;
-
-#define NOINIT_SECTION ".noinit.test_wdt"
-volatile uint32_t machine_state __attribute__((section(NOINIT_SECTION)));
-volatile uint32_t supported __attribute__((section(NOINIT_SECTION)));
-volatile uint32_t wdt_status __attribute__((section(NOINIT_SECTION)));
-volatile uint32_t reboot_status __attribute__((section(NOINIT_SECTION)));
-
-/* Value used to indicate that the watchdog has fired. */
-#define WDT_HAS_FIRED (0x12345678U)
-#define REBOOT_WAS_DONE (0x87654321U)
-
-/* Highest value in the switch statement in the main() */
-#define LAST_STATE (2)
-
-static void wdt_int_cb(const struct device *wdt_dev, int channel_id)
-{
-	ARG_UNUSED(wdt_dev);
-	ARG_UNUSED(channel_id);
-	wdt_status = WDT_HAS_FIRED;
-
-	/* Flush cache as reboot may invalidate all lines. */
-	sys_cache_data_flush_range((void *) &wdt_status, sizeof(wdt_status));
-}
-
-/* Print LOG delimiter. */
-static void print_bar(void)
-{
-	LOG_INF("===================================================================");
-}
-
-static void print_supported_reset_cause(void)
-{
-	int32_t ret;
-
-	/* Store supported reset causes in global variable placed at NOINIT_SECTION. */
-	ret = hwinfo_get_supported_reset_cause((uint32_t *) &supported);
-
-	/* Print which reset causes are supported. */
-	if (ret == 0) {
-		LOG_INF("Supported reset causes are:");
-		if (supported & RESET_PIN) {
-			LOG_INF(" 0: RESET_PIN is supported");
-		} else {
-			LOG_INF(" 0: no support for RESET_PIN");
-		}
-		if (supported & RESET_SOFTWARE) {
-			LOG_INF(" 1: RESET_SOFTWARE is supported");
-		} else {
-			LOG_INF(" 1: no support for RESET_SOFTWARE");
-		}
-		if (supported & RESET_BROWNOUT) {
-			LOG_INF(" 2: RESET_BROWNOUT is supported");
-		} else {
-			LOG_INF(" 2: no support for RESET_BROWNOUT");
-		}
-		if (supported & RESET_POR) {
-			LOG_INF(" 3: RESET_POR is supported");
-		} else {
-			LOG_INF(" 3: no support for RESET_POR");
-		}
-		if (supported & RESET_WATCHDOG) {
-			LOG_INF(" 4: RESET_WATCHDOG is supported");
-		} else {
-			LOG_INF(" 4: no support for RESET_WATCHDOG");
-		}
-		if (supported & RESET_DEBUG) {
-			LOG_INF(" 5: RESET_DEBUG is supported");
-		} else {
-			LOG_INF(" 5: no support for RESET_DEBUG");
-		}
-		if (supported & RESET_SECURITY) {
-			LOG_INF(" 6: RESET_SECURITY is supported");
-		} else {
-			LOG_INF(" 6: no support for RESET_SECURITY");
-		}
-		if (supported & RESET_LOW_POWER_WAKE) {
-			LOG_INF(" 7: RESET_LOW_POWER_WAKE is supported");
-		} else {
-			LOG_INF(" 7: no support for RESET_LOW_POWER_WAKE");
-		}
-		if (supported & RESET_CPU_LOCKUP) {
-			LOG_INF(" 8: RESET_CPU_LOCKUP is supported");
-		} else {
-			LOG_INF(" 8: no support for RESET_CPU_LOCKUP");
-		}
-		if (supported & RESET_PARITY) {
-			LOG_INF(" 9: RESET_PARITY is supported");
-		} else {
-			LOG_INF(" 9: no support for RESET_PARITY");
-		}
-		if (supported & RESET_PLL) {
-			LOG_INF("10: RESET_PLL is supported");
-		} else {
-			LOG_INF("10: no support for RESET_PLL");
-		}
-		if (supported & RESET_CLOCK) {
-			LOG_INF("11: RESET_CLOCK is supported");
-		} else {
-			LOG_INF("11: no support for RESET_CLOCK");
-		}
-		if (supported & RESET_HARDWARE) {
-			LOG_INF("12: RESET_HARDWARE is supported");
-		} else {
-			LOG_INF("12: no support for RESET_HARDWARE");
-		}
-		if (supported & RESET_USER) {
-			LOG_INF("13: RESET_USER is supported");
-		} else {
-			LOG_INF("13: no support for RESET_USER");
-		}
-		if (supported & RESET_TEMPERATURE) {
-			LOG_INF("14: RESET_TEMPERATURE is supported");
-		} else {
-			LOG_INF("14: no support for RESET_TEMPERATURE");
-		}
-	} else if (ret == -ENOSYS) {
-		LOG_INF("hwinfo_get_supported_reset_cause() is NOT supported");
-		supported = 0;
-	} else {
-		LOG_ERR("hwinfo_get_supported_reset_cause() failed (ret = %d)", ret);
-	}
-	sys_cache_data_flush_range((void *) &supported, sizeof(supported));
-	print_bar();
-}
-
-/* Print current value of reset cause. */
-static void print_current_reset_cause(uint32_t *cause)
-{
-	int32_t ret;
-
-	ret = hwinfo_get_reset_cause(cause);
-	if (ret == 0) {
-		LOG_INF("Current reset cause is:");
-		if (*cause & RESET_PIN) {
-			LOG_INF(" 0: reset due to RESET_PIN");
-		}
-		if (*cause & RESET_SOFTWARE) {
-			LOG_INF(" 1: reset due to RESET_SOFTWARE");
-		}
-		if (*cause & RESET_BROWNOUT) {
-			LOG_INF(" 2: reset due to RESET_BROWNOUT");
-		}
-		if (*cause & RESET_POR) {
-			LOG_INF(" 3: reset due to RESET_POR");
-		}
-		if (*cause & RESET_WATCHDOG) {
-			LOG_INF(" 4: reset due to RESET_WATCHDOG");
-		}
-		if (*cause & RESET_DEBUG) {
-			LOG_INF(" 5: reset due to RESET_DEBUG");
-		}
-		if (*cause & RESET_SECURITY) {
-			LOG_INF(" 6: reset due to RESET_SECURITY");
-		}
-		if (*cause & RESET_LOW_POWER_WAKE) {
-			LOG_INF(" 7: reset due to RESET_LOW_POWER_WAKE");
-		}
-		if (*cause & RESET_CPU_LOCKUP) {
-			LOG_INF(" 8: reset due to RESET_CPU_LOCKUP");
-		}
-		if (*cause & RESET_PARITY) {
-			LOG_INF(" 9: reset due to RESET_PARITY");
-		}
-		if (*cause & RESET_PLL) {
-			LOG_INF("10: reset due to RESET_PLL");
-		}
-		if (*cause & RESET_CLOCK) {
-			LOG_INF("11: reset due to RESET_CLOCK");
-		}
-		if (*cause & RESET_HARDWARE) {
-			LOG_INF("12: reset due to RESET_HARDWARE");
-		}
-		if (*cause & RESET_USER) {
-			LOG_INF("13: reset due to RESET_USER");
-		}
-		if (*cause & RESET_TEMPERATURE) {
-			LOG_INF("14: reset due to RESET_TEMPERATURE");
-		}
-	} else if (ret == -ENOSYS) {
-		LOG_INF("hwinfo_get_reset_cause() is NOT supported");
-		*cause = 0;
-	} else {
-		LOG_ERR("hwinfo_get_reset_cause() failed (ret = %d)", ret);
-	}
-	print_bar();
-}
-
-/* Clear reset cause. */
-static void test_clear_reset_cause(void)
-{
-	int32_t ret, temp;
-
-	ret = hwinfo_clear_reset_cause();
-	if (ret == 0) {
-		LOG_INF("hwinfo_clear_reset_cause() was executed");
-	} else if (ret == -ENOSYS) {
-		LOG_INF("hwinfo_get_reset_cause() is NOT supported");
-	} else {
-		LOG_ERR("hwinfo_get_reset_cause() failed (ret = %d)", ret);
-	}
-	print_bar();
-
-	/* Print current value of reset causes -> expected 0 */
-	print_current_reset_cause(&temp);
-	LOG_INF("TEST that all reset causes were cleared");
-	if (temp == 0) {
-		LOG_INF("PASS: reset causes were cleared");
-	} else {
-		LOG_ERR("FAIL: reset case = %u while expected is 0", temp);
-	}
-	print_bar();
-}
-
-void test_reset_software(uint32_t cause)
-{
-	/* Check that reset cause from sys_reboot is detected. */
-	if (supported & RESET_SOFTWARE) {
-		if (reboot_status != REBOOT_WAS_DONE) {
-			/* If software reset hasn't happen yet, do it. */
-			reboot_status = REBOOT_WAS_DONE;
-			LOG_INF("Test RESET_SOFTWARE - Rebooting");
-
-			/* Flush cache as reboot may invalidate all lines. */
-			sys_cache_data_flush_range((void *) &machine_state, sizeof(machine_state));
-			sys_cache_data_flush_range((void *) &reboot_status, sizeof(reboot_status));
-			sys_reboot(SYS_REBOOT_COLD);
-		} else {
-			/* Software reset was done */
-			LOG_INF("TEST that RESET_SOFTWARE was detected");
-			if (cause & RESET_SOFTWARE) {
-				LOG_INF("PASS: RESET_SOFTWARE detected");
-				print_bar();
-				/* Check RESET_SOFTWARE can be cleared */
-				test_clear_reset_cause();
-			} else {
-				LOG_ERR("FAIL: RESET_SOFTWARE not set");
-				print_bar();
-			}
-			/* Cleanup */
-			reboot_status = 0;
-			sys_cache_data_flush_range((void *) &reboot_status, sizeof(reboot_status));
-		}
-	}
-}
-
-void test_reset_watchdog(uint32_t cause)
-{
-	int32_t ret;
-
-	/* Check that reset cause from expired watchdog is detected. */
-	if (supported & RESET_WATCHDOG) {
-		if (wdt_status != WDT_HAS_FIRED) {
-			/* If watchdog hasn't fired yet, configure it do so. */
-			uint32_t watchdog_window = 2000U;
-
-			if (!device_is_ready(my_wdt_device)) {
-				LOG_ERR("WDT device %s is not ready", my_wdt_device->name);
-				return;
-			}
-
-			m_cfg_wdt0.callback = wdt_int_cb;
-			m_cfg_wdt0.flags = WDT_FLAG_RESET_SOC;
-			m_cfg_wdt0.window.max = watchdog_window;
-			m_cfg_wdt0.window.min = 0U;
-			my_wdt_channel = wdt_install_timeout(my_wdt_device, &m_cfg_wdt0);
-			if (my_wdt_channel < 0) {
-				LOG_ERR("wdt_install_timeout() returned %d", my_wdt_channel);
-				return;
-			}
-
-			ret = wdt_setup(my_wdt_device, WDT_OPT_PAUSE_HALTED_BY_DBG);
-			if (ret < 0) {
-				LOG_ERR("wdt_setup() returned %d", ret);
-				return;
-			}
-
-			/* Flush cache as reboot may invalidate all lines. */
-			sys_cache_data_flush_range((void *) &machine_state, sizeof(machine_state));
-			LOG_INF("Watchdog shall fire in ~%u miliseconds", watchdog_window);
-			print_bar();
-			k_sleep(K_FOREVER);
-		} else {
-			/* Watchdog has fired. */
-			LOG_INF("TEST that RESET_WATCHDOG was detected");
-			if (cause & RESET_WATCHDOG) {
-				LOG_INF("PASS: RESET_WATCHDOG detected");
-				print_bar();
-				/* Check RESET_WATCHDOG can be cleared */
-				test_clear_reset_cause();
-			} else {
-				LOG_ERR("FAIL: RESET_WATCHDOG not set");
-				print_bar();
-			}
-			/* Cleanup */
-			wdt_status = 0;
-			sys_cache_data_flush_range((void *) &wdt_status, sizeof(wdt_status));
-		}
-	}
-}
-
-int main(void)
-{
-	uint32_t cause;
-
-	LOG_INF("HW Info reset reason test on %s", CONFIG_BOARD_TARGET);
-	if (wdt_status == WDT_HAS_FIRED) {
-		LOG_INF("This boot is due to expected watchdog reset");
-	}
-	if (reboot_status == REBOOT_WAS_DONE) {
-		LOG_INF("This boot is due to expected software reset");
-	}
-	print_bar();
-
-	/* Test relies on REST_PIN to correctly start. */
-	print_current_reset_cause(&cause);
-	if (cause & RESET_PIN) {
-		LOG_INF("TEST that RESET_PIN was detected");
-		LOG_INF("PASS: RESET_PIN detected");
-		print_bar();
-		/* Check RESET_PIN can be cleared */
-		test_clear_reset_cause();
-		machine_state = 0;
-		reboot_status = 0;
-		wdt_status = 0;
-	}
-
-	while (machine_state <= LAST_STATE) {
-		LOG_DBG("machine_state = %u", machine_state);
-		LOG_DBG("reboot_status = %u", reboot_status);
-		LOG_DBG("wdt_status = %u", wdt_status);
-
-		switch (machine_state) {
-		case 0: /* Print (an store) which reset causes are supported. */
-			print_supported_reset_cause();
-			machine_state++;
-			break;
-		case 1: /* Test RESET_SOFTWARE. */
-			test_reset_software(cause);
-			machine_state++;
-		case 2: /* Test RESET_WATCHDOG. */
-			test_reset_watchdog(cause);
-			machine_state++;
-		}
-	}
-
-	LOG_INF("All tests done");
-	return 0;
-}
diff --git a/tests/boards/nrf/hwinfo/reset_cause/testcase.yaml b/tests/boards/nrf/hwinfo/reset_cause/testcase.yaml
deleted file mode 100644
index 0ec999ee713..00000000000
--- a/tests/boards/nrf/hwinfo/reset_cause/testcase.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-common:
-  tags:
-    - drivers
-    - hwinfo
-  harness: console
-
-tests:
-  drivers.hwinfo.reset_cause:
-    harness_config:
-      type: multi_line
-      ordered: true
-      regex:
-        - "HW Info reset reason test on"
-        - "PASS: RESET_PIN detected"
-        - "PASS: reset causes were cleared"
-        - "Supported reset causes are"
-        - "RESET_PIN is supported"
-        - "RESET_SOFTWARE is supported"
-        - "RESET_WATCHDOG is supported"
-        - "RESET_DEBUG is supported"
-        - "RESET_LOW_POWER_WAKE is supported"
-        - "RESET_CPU_LOCKUP is supported"
-        - "Rebooting"
-        - "HW Info reset reason test on"
-        - "PASS: RESET_SOFTWARE detected"
-        - "PASS: reset causes were cleared"
-        - "Watchdog shall fire"
-        - "HW Info reset reason test on"
-        - "PASS: RESET_WATCHDOG detected"
-        - "PASS: reset causes were cleared"
-        - "All tests done"
-    platform_allow:
-      - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54h20dk/nrf54h20/cpurad
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l20pdk/nrf54l20/cpuapp
-    integration_platforms:
-      - nrf54h20dk/nrf54h20/cpuapp

From 61fa0f92c28fb631dc824bdebe15480af27e35aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:08 +0100
Subject: [PATCH 1114/2913] Revert "[nrf fromlist] arch: riscv: option to init
 custom hw stacked esf members."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9471a136b58bfa6853b4854308ca4429ba670934.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 arch/riscv/Kconfig                       | 5 -----
 arch/riscv/core/thread.c                 | 4 ----
 soc/nordic/common/vpr/soc_isr_stacking.h | 7 -------
 3 files changed, 16 deletions(-)

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 8f524c23fc1..575c9871c13 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -83,11 +83,6 @@ config RISCV_SOC_HAS_ISR_STACKING
 	    saved on the stack by the hardware, and the registers saved by the
 	    software macros. The structure must be called 'struct arch_esf'.
 
-	  - SOC_ISR_STACKING_ESR_INIT: macro guarded by !_ASMLANGUAGE.
-	    Some hardware stacked registers should be initialized on init
-	    stack with proper values. This prevents from incorrect behavior
-	    on entry context switch when initial stack is restored.
-
 config RISCV_SOC_HAS_CUSTOM_IRQ_HANDLING
 	bool
 	help
diff --git a/arch/riscv/core/thread.c b/arch/riscv/core/thread.c
index 2fecc68a077..59adbc42e46 100644
--- a/arch/riscv/core/thread.c
+++ b/arch/riscv/core/thread.c
@@ -106,10 +106,6 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 	stack_init->soc_context = soc_esf_init;
 #endif
 
-#ifdef CONFIG_RISCV_SOC_HAS_ISR_STACKING
-	SOC_ISR_STACKING_ESR_INIT;
-#endif
-
 	thread->callee_saved.sp = (unsigned long)stack_init;
 
 	/* where to go when returning from z_riscv_switch() */
diff --git a/soc/nordic/common/vpr/soc_isr_stacking.h b/soc/nordic/common/vpr/soc_isr_stacking.h
index 55733733539..8d2f64ad729 100644
--- a/soc/nordic/common/vpr/soc_isr_stacking.h
+++ b/soc/nordic/common/vpr/soc_isr_stacking.h
@@ -62,13 +62,6 @@
 
 #endif /* DT_PROP(VPR_CPU, nordic_bus_width) == 64 */
 
-/*
- * VPR stacked mcause needs to have proper value on initial stack.
- * Initial mret will restore this value.
- */
-#define SOC_ISR_STACKING_ESR_INIT                                                                  \
-	stack_init->_mcause = 0;
-
 #else /* _ASMLANGUAGE */
 
 /*

From d7a47fc581f71c8e988a03250aa75bdc347f904c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:08 +0100
Subject: [PATCH 1115/2913] Revert "[nrf fromtree] drivers: watchdog: nrfx: add
 synchronization after stop"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit dc3a32e13626c28c53fb79492f53850c87283227.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/watchdog/wdt_nrfx.c | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/drivers/watchdog/wdt_nrfx.c b/drivers/watchdog/wdt_nrfx.c
index 62f7104bafa..277d195f681 100644
--- a/drivers/watchdog/wdt_nrfx.c
+++ b/drivers/watchdog/wdt_nrfx.c
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/kernel.h>
 #include <zephyr/sys/math_extras.h>
 #include <nrfx_wdt.h>
 #include <zephyr/drivers/watchdog.h>
@@ -14,18 +13,11 @@
 #include <zephyr/irq.h>
 LOG_MODULE_REGISTER(wdt_nrfx);
 
-#if !CONFIG_WDT_NRFX_NO_IRQ && NRF_WDT_HAS_STOP
-#define WDT_NRFX_SYNC_STOP 1
-#endif
-
 struct wdt_nrfx_data {
 	wdt_callback_t m_callbacks[NRF_WDT_CHANNEL_NUMBER];
 	uint32_t m_timeout;
 	uint8_t m_allocated_channels;
 	bool enabled;
-#if defined(WDT_NRFX_SYNC_STOP)
-	struct k_sem sync_stop;
-#endif
 };
 
 struct wdt_nrfx_config {
@@ -81,10 +73,6 @@ static int wdt_nrf_disable(const struct device *dev)
 		return -EFAULT;
 	}
 
-#if defined(WDT_NRFX_SYNC_STOP)
-	k_sem_take(&data->sync_stop, K_FOREVER);
-#endif
-
 	nrfx_wdt_channels_free(&config->wdt);
 
 	for (channel_id = 0; channel_id < data->m_allocated_channels; channel_id++) {
@@ -182,17 +170,11 @@ static const struct wdt_driver_api wdt_nrfx_driver_api = {
 static void wdt_event_handler(const struct device *dev, nrf_wdt_event_t event_type,
 			      uint32_t requests, void *p_context)
 {
-	struct wdt_nrfx_data *data = dev->data;
-
-#if defined(WDT_NRFX_SYNC_STOP)
-	if (event_type == NRF_WDT_EVENT_STOPPED) {
-		k_sem_give(&data->sync_stop);
-	}
-#else
 	(void)event_type;
-#endif
 	(void)p_context;
 
+	struct wdt_nrfx_data *data = dev->data;
+
 	while (requests) {
 		uint8_t i = u32_count_trailing_zeros(requests);
 
@@ -235,11 +217,7 @@ static void wdt_event_handler(const struct device *dev, nrf_wdt_event_t event_ty
 		}							       \
 		return 0;						       \
 	}								       \
-	static struct wdt_nrfx_data wdt_##idx##_data =	{		       \
-		IF_ENABLED(WDT_NRFX_SYNC_STOP,				       \
-			(.sync_stop = Z_SEM_INITIALIZER(		       \
-				wdt_##idx##_data.sync_stop, 0, 1),))	       \
-	};								       \
+	static struct wdt_nrfx_data wdt_##idx##_data;			       \
 	static const struct wdt_nrfx_config wdt_##idx##z_config = {	       \
 		.wdt = NRFX_WDT_INSTANCE(idx),				       \
 	};								       \

From b4a0b2de18c483167ed1cab72c2d498f1e960eea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:08 +0100
Subject: [PATCH 1116/2913] Revert "[nrf fromtree] samples: boards: nordic:
 coresight_stm: Fix nrfutil trace command"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5f2a1de5f14a08689b5882e4b61d304b336add87.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nordic/coresight_stm/pytest/test_stm.py   | 296 ++-------------
 .../boards/nordic/coresight_stm/sample.yaml   |   4 +-
 .../nrf/coresight_stm/pytest/test_stm.py      | 347 ++++++++++++++++++
 tests/boards/nrf/coresight_stm/testcase.yaml  |   4 +-
 4 files changed, 378 insertions(+), 273 deletions(-)
 create mode 100644 tests/boards/nrf/coresight_stm/pytest/test_stm.py

diff --git a/samples/boards/nordic/coresight_stm/pytest/test_stm.py b/samples/boards/nordic/coresight_stm/pytest/test_stm.py
index 4af24fbfa3c..fb2203e809e 100644
--- a/samples/boards/nordic/coresight_stm/pytest/test_stm.py
+++ b/samples/boards/nordic/coresight_stm/pytest/test_stm.py
@@ -7,7 +7,6 @@
 import logging
 import re
 import subprocess
-from dataclasses import dataclass
 from pathlib import Path
 from time import sleep
 
@@ -19,8 +18,7 @@
 SB_CONFIG_APP_CPUPPR_RUN = None
 SB_CONFIG_APP_CPUFLPR_RUN = None
 
-# See definition of stm_m_id[] and stm_m_name[] in
-# https://github.com/zephyrproject-rtos/zephyr/blob/main/drivers/misc/coresight/nrf_etr.c
+# https://github.com/zephyrproject-rtos/zephyr/blob/main/drivers/misc/coresight/nrf_etr.c#L102
 STM_M_ID = {
     "sec": 33,
     "app": 34,
@@ -33,19 +31,7 @@
 }
 
 
-@dataclass
-class STMLimits:
-    log_0_arg: float | None
-    log_1_arg: float | None
-    log_2_arg: float | None
-    log_3_arg: float | None
-    log_str: float | None
-    tracepoint: float | None
-    tracepoint_d32: float | None
-    tolerance: float | None
-
-
-def analyse_autoconf(filepath: str) -> None:
+def _analyse_autoconf(filepath: str) -> None:
     global SB_CONFIG_APP_CPUPPR_RUN
     global SB_CONFIG_APP_CPUFLPR_RUN
 
@@ -64,7 +50,7 @@ def analyse_autoconf(filepath: str) -> None:
     logger.debug(f"{SB_CONFIG_APP_CPUFLPR_RUN=}")
 
 
-def check_console_output(output: str, core: str) -> None:
+def _check_benchmark_results(output: str, core: str) -> None:
     """
     Use regular expressions to parse 'output' string.
     Search for benchmark results related to 'core' coprocessor.
@@ -106,55 +92,6 @@ def check_console_output(output: str, core: str) -> None:
     assert latency_tracepoint_d32_str is not None, "Timing for tracepoint_d32 NOT found"
 
 
-def check_benchmark_results(output: str, core: str, constraints: STMLimits) -> None:
-    """
-    Use regular expressions to parse 'output' string.
-    Search for benchmark results related to 'core' coprocessor.
-    Check that benchamrk results are lower than limits provided in 'constraints'.
-    """
-
-    cfg = {
-        "log message with 0 arguments": {
-            "regex": rf"{core}: Timing for log message with 0 arguments: (.+)us",
-            "expected": constraints.log_0_arg,
-        },
-        "log message with 1 argument": {
-            "regex": rf"{core}: Timing for log message with 1 argument: (.+)us",
-            "expected": constraints.log_1_arg,
-        },
-        "log message with 2 arguments": {
-            "regex": rf"{core}: Timing for log message with 2 arguments: (.+)us",
-            "expected": constraints.log_2_arg,
-        },
-        "log message with 3 arguments": {
-            "regex": rf"{core}: Timing for log message with 3 arguments: (.+)us",
-            "expected": constraints.log_3_arg,
-        },
-        "log message with string": {
-            "regex": rf"{core}: Timing for log_message with string: (.+)us",
-            "expected": constraints.log_str,
-        },
-        "tracepoint": {
-            "regex": rf"{core}: Timing for tracepoint: (.+)us",
-            "expected": constraints.tracepoint,
-        },
-        "tracepoint_d32": {
-            "regex": rf"{core}: Timing for tracepoint_d32: (.+)us",
-            "expected": constraints.tracepoint_d32,
-        },
-    }
-
-    for check in cfg:
-        observed_str = re.search(cfg[check]["regex"], output).group(1)
-        assert observed_str is not None, f"Timing for {check} NOT found"
-        # check value
-        observed = float(observed_str)
-        threshold = cfg[check]["expected"] * (1 + constraints.tolerance)
-        assert (
-            observed < threshold
-        ), f"{core}: Timing for {check} - {observed} us exceeds {threshold} us"
-
-
 # nrfutil starts children processes
 # when subprocess.terminate(nrfutil_process) is executed, only the parent terminates
 # this blocks serial port for other uses
@@ -167,21 +104,19 @@ def _kill(proc):
         logger.exception(f'Could not kill nrfutil - {e}')
 
 
-def nrfutil_dictionary_from_serial(
+def _nrfutil_dictionary_from_serial(
     dut: DeviceAdapter,
     decoded_file_name: str = "output.txt",
     collect_time: float = 60.0,
 ) -> None:
     UART_PATH = dut.device_config.serial
+    UART_BAUDRATE = dut.device_config.baud
     dut.close()
 
     logger.debug(f"Using serial: {UART_PATH}")
 
-    try:
-        Path(f"{decoded_file_name}").unlink()
-        logger.info("Old output file was deleted")
-    except FileNotFoundError:
-        pass
+    if Path(f"{decoded_file_name}").exists():
+        logger.warning("Output file already exists!")
 
     # prepare database config string
     BUILD_DIR = str(dut.device_config.build_dir)
@@ -197,7 +132,7 @@ def nrfutil_dictionary_from_serial(
     cmd = (
         "nrfutil trace stm --database-config "
         f"{config_str} "
-        f"--input-serialport {UART_PATH} "
+        f"--input-serialport {UART_PATH} --baudrate {UART_BAUDRATE} "
         f"--output-ascii {decoded_file_name}"
     )
     try:
@@ -214,11 +149,11 @@ def nrfutil_dictionary_from_serial(
         _kill(proc)
 
 
-def test_sample_STM_decoded(dut: DeviceAdapter):
+def test_STM_decoded(dut: DeviceAdapter):
     """
-    Run sample.boards.nrf.coresight_stm from samples/boards/nordic/coresight_stm sample.
-    Application, Radio, PPR and FLPR cores use STM for logging.
-    STM proxy (Application core) decodes logs from all cores.
+    Run sample.boards.nrf.coresight_stm from samples/boards/nrf/coresight_stm sample.
+    Both Application and Radio cores use STM for logging.
+    STM proxy (Application core) decodes logs from all domains.
     After reset, coprocessors execute code in expected way and Application core
     outputs STM traces on UART port.
     """
@@ -227,126 +162,45 @@ def test_sample_STM_decoded(dut: DeviceAdapter):
 
     # nrf54h20 prints immediately after it is flashed.
     # Wait a bit to skipp logs from previous test.
-    sleep(5)
+    sleep(4)
 
     # Get output from serial port
     output = "\n".join(dut.readlines())
 
     # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
-    analyse_autoconf(autoconf_file)
+    _analyse_autoconf(autoconf_file)
 
     # check that LOGs from Application core are present
-    check_console_output(
+    _check_benchmark_results(
         output=output,
         core='app',
     )
 
     # check that LOGs from Radio core are present
-    check_console_output(
+    _check_benchmark_results(
         output=output,
         core='rad',
     )
 
     if SB_CONFIG_APP_CPUPPR_RUN:
         # check that LOGs from PPR core are present
-        check_console_output(
+        _check_benchmark_results(
             output=output,
             core='ppr',
         )
 
     if SB_CONFIG_APP_CPUFLPR_RUN:
         # check that LOGs from FLPR core are present
-        check_console_output(
+        _check_benchmark_results(
             output=output,
             core='flpr',
         )
 
 
-def test_STM_decoded(dut: DeviceAdapter):
-    """
-    Run boards.nrf.coresight_stm from tests/boards/nrf/coresight_stm test suite.
-    Application, Radio, PPR and FLPR cores use STM for logging.
-    STM proxy (Application core) decodes logs from all cores.
-    After reset, coprocessors execute code in expected way and Application core
-    outputs STM traces on UART port.
-    """
-    BUILD_DIR = str(dut.device_config.build_dir)
-    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
-
-    app_constraints = STMLimits(
-        # all values in us
-        log_0_arg=1.8,
-        log_1_arg=2.1,
-        log_2_arg=2.0,
-        log_3_arg=2.1,
-        log_str=4.5,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,  # 50 %
-    )
-    rad_constraints = STMLimits(
-        # all values in us
-        log_0_arg=4.6,
-        log_1_arg=5.0,
-        log_2_arg=5.2,
-        log_3_arg=5.6,
-        log_str=6.3,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,
-    )
-    ppr_constraints = STMLimits(
-        # all values in us
-        log_0_arg=25.7,
-        log_1_arg=27.1,
-        log_2_arg=27.3,
-        log_3_arg=30.4,
-        log_str=65.7,
-        tracepoint=0.55,
-        tracepoint_d32=0.25,
-        tolerance=0.5,
-    )
-    flpr_constraints = STMLimits(
-        # all values in us
-        log_0_arg=1.3,
-        log_1_arg=1.6,
-        log_2_arg=1.6,
-        log_3_arg=1.7,
-        log_str=3.0,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,
-    )
-
-    # nrf54h20 prints immediately after it is flashed.
-    # Wait a bit to skipp logs from previous test.
-    sleep(5)
-
-    # Get output from serial port
-    output = "\n".join(dut.readlines())
-
-    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
-    analyse_autoconf(autoconf_file)
-
-    # check results on Application core
-    check_benchmark_results(output=output, core='app', constraints=app_constraints)
-
-    # check results on Radio core
-    check_benchmark_results(output=output, core='rad', constraints=rad_constraints)
-
-    if SB_CONFIG_APP_CPUPPR_RUN:
-        # check results on PPR core
-        check_benchmark_results(output=output, core='ppr', constraints=ppr_constraints)
-
-    if SB_CONFIG_APP_CPUFLPR_RUN:
-        # check results on FLPR core
-        check_benchmark_results(output=output, core='flpr', constraints=flpr_constraints)
-
-
-def test_sample_STM_dictionary_mode(dut: DeviceAdapter):
+def test_STM_dictionary_mode(dut: DeviceAdapter):
     """
-    Run sample.boards.nrf.coresight_stm.dict from samples/boards/nordic/coresight_stm sample.
-    Application, Radio, PPR and FLPR cores use STM for logging.
+    Run sample.boards.nrf.coresight_stm.dict from samples/boards/nrf/coresight_stm sample.
+    Both Application and Radio cores use STM for logging.
     STM proxy (Application core) prints on serial port raw logs from all domains.
     Nrfutil trace is used to decode STM logs.
     After reset, coprocessors execute code in expected way and Application core
@@ -359,10 +213,10 @@ def test_sample_STM_dictionary_mode(dut: DeviceAdapter):
 
     # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
     # this information is needed to build nrfutil database-config
-    analyse_autoconf(autoconf_file)
+    _analyse_autoconf(autoconf_file)
 
     # use nrfutil trace to decode logs
-    nrfutil_dictionary_from_serial(
+    _nrfutil_dictionary_from_serial(
         dut=dut,
         decoded_file_name=f"{test_filename}",
         collect_time=COLLECT_TIMEOUT,
@@ -378,123 +232,27 @@ def test_sample_STM_dictionary_mode(dut: DeviceAdapter):
     ), f"File {test_filename} is empty"
 
     # check that LOGs from Application core are present
-    check_console_output(
+    _check_benchmark_results(
         output=decoded_file_content,
         core='app',
     )
 
     # check that LOGs from Radio core are present
-    check_console_output(
+    _check_benchmark_results(
         output=decoded_file_content,
         core='rad',
     )
 
     if SB_CONFIG_APP_CPUPPR_RUN:
         # check that LOGs from PPR core are present
-        check_console_output(
+        _check_benchmark_results(
             output=decoded_file_content,
             core='ppr',
         )
 
     if SB_CONFIG_APP_CPUFLPR_RUN:
         # check that LOGs from FLPR core are present
-        check_console_output(
+        _check_benchmark_results(
             output=decoded_file_content,
             core='flpr',
         )
-
-
-def test_STM_dictionary_mode(dut: DeviceAdapter):
-    """
-    Run boards.nrf.coresight_stm.dict from tests/boards/nrf/coresight_stm test suite.
-    Application, Radio, PPR and FLPR cores use STM for logging.
-    STM proxy (Application core) prints on serial port raw logs from all domains.
-    Nrfutil trace is used to decode STM logs.
-    After reset, coprocessors execute code in expected way and Application core
-    outputs STM traces on UART port.
-    """
-    BUILD_DIR = str(dut.device_config.build_dir)
-    test_filename = f"{BUILD_DIR}/coresight_stm_dictionary.txt"
-    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
-    COLLECT_TIMEOUT = 10.0
-
-    app_constraints = STMLimits(
-        # all values in us
-        log_0_arg=0.7,
-        log_1_arg=0.8,
-        log_2_arg=0.8,
-        log_3_arg=1.3,
-        log_str=3.2,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,  # 50 %
-    )
-    rad_constraints = STMLimits(
-        # all values in us
-        log_0_arg=0.8,
-        log_1_arg=0.9,
-        log_2_arg=1.0,
-        log_3_arg=1.5,
-        log_str=3.6,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,
-    )
-    ppr_constraints = STMLimits(
-        # all values in us
-        log_0_arg=7.5,
-        log_1_arg=8.5,
-        log_2_arg=8.6,
-        log_3_arg=17.4,
-        log_str=45.2,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,
-    )
-    flpr_constraints = STMLimits(
-        # all values in us
-        log_0_arg=0.3,
-        log_1_arg=0.4,
-        log_2_arg=0.5,
-        log_3_arg=0.8,
-        log_str=2.6,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,  # 50 %
-    )
-
-    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
-    # this information is needed to build nrfutil database-config
-    analyse_autoconf(autoconf_file)
-
-    # use nrfutil trace to decode logs
-    nrfutil_dictionary_from_serial(
-        dut=dut,
-        decoded_file_name=f"{test_filename}",
-        collect_time=COLLECT_TIMEOUT,
-    )
-
-    # read decoded logs
-    with open(f"{test_filename}", errors="ignore") as decoded_file:
-        decoded_file_content = decoded_file.read()
-
-    # if nothing in decoded_file, stop test
-    assert len(decoded_file_content) > 0, f"File {test_filename} is empty"
-
-    # check results on Application core
-    check_benchmark_results(output=decoded_file_content, core='app', constraints=app_constraints)
-
-    # check results on Radio core
-    check_benchmark_results(output=decoded_file_content, core='rad', constraints=rad_constraints)
-
-    if SB_CONFIG_APP_CPUPPR_RUN:
-        # check results on PPR core
-        check_benchmark_results(
-            output=decoded_file_content, core='ppr', constraints=ppr_constraints
-        )
-
-    if SB_CONFIG_APP_CPUFLPR_RUN:
-        # check results on FLPR core
-        check_benchmark_results(
-            output=decoded_file_content, core='flpr', constraints=flpr_constraints
-        )
diff --git a/samples/boards/nordic/coresight_stm/sample.yaml b/samples/boards/nordic/coresight_stm/sample.yaml
index bf9016baaba..4251c5d6df8 100644
--- a/samples/boards/nordic/coresight_stm/sample.yaml
+++ b/samples/boards/nordic/coresight_stm/sample.yaml
@@ -15,7 +15,7 @@ tests:
     harness_config:
       pytest_dut_scope: session
       pytest_root:
-        - "pytest/test_stm.py::test_sample_STM_dictionary_mode"
+        - "pytest/test_stm.py::test_STM_dictionary_mode"
     required_snippets:
       - nordic-log-stm-dict
     extra_args:
@@ -27,7 +27,7 @@ tests:
     harness_config:
       pytest_dut_scope: session
       pytest_root:
-        - "pytest/test_stm.py::test_sample_STM_decoded"
+        - "pytest/test_stm.py::test_STM_decoded"
     required_snippets:
       - nordic-log-stm
     extra_args:
diff --git a/tests/boards/nrf/coresight_stm/pytest/test_stm.py b/tests/boards/nrf/coresight_stm/pytest/test_stm.py
new file mode 100644
index 00000000000..7131d8f38bb
--- /dev/null
+++ b/tests/boards/nrf/coresight_stm/pytest/test_stm.py
@@ -0,0 +1,347 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+import logging
+import re
+import subprocess
+from dataclasses import dataclass
+from pathlib import Path
+from time import sleep
+
+import psutil
+from twister_harness import DeviceAdapter
+
+logger = logging.getLogger(__name__)
+
+
+SB_CONFIG_APP_CPUPPR_RUN = None
+SB_CONFIG_APP_CPUFLPR_RUN = None
+
+# See definition of stm_m_id[] and stm_m_name[] in
+# https://github.com/zephyrproject-rtos/zephyr/blob/main/drivers/misc/coresight/nrf_etr.c
+STM_M_ID = {
+    "sec": 33,
+    "app": 34,
+    "rad": 35,
+    "mod": 36,
+    "sys": 44,
+    "flpr": 45,
+    "ppr": 46,
+    "hw": 128,
+}
+
+
+@dataclass
+class STMLimits:
+    log_0_arg: float | None
+    log_1_arg: float | None
+    log_2_arg: float | None
+    log_3_arg: float | None
+    log_str: float | None
+    tracepoint: float | None
+    tracepoint_d32: float | None
+    tolerance: float | None
+
+
+def _analyse_autoconf(filepath: str) -> None:
+    global SB_CONFIG_APP_CPUPPR_RUN
+    global SB_CONFIG_APP_CPUFLPR_RUN
+
+    SB_CONFIG_APP_CPUPPR_RUN = False
+    SB_CONFIG_APP_CPUFLPR_RUN = False
+
+    # Parse contents of {BUILD_DIR}/_sysbuild/autoconf.h
+    with open(f"{filepath}", errors="ignore") as autoconf:
+        for line in autoconf:
+            if "SB_CONFIG_APP_CPUPPR_RUN 1" in line:
+                SB_CONFIG_APP_CPUPPR_RUN = True
+                continue
+            if "SB_CONFIG_APP_CPUFLPR_RUN 1" in line:
+                SB_CONFIG_APP_CPUFLPR_RUN = True
+    logger.debug(f"{SB_CONFIG_APP_CPUPPR_RUN=}")
+    logger.debug(f"{SB_CONFIG_APP_CPUFLPR_RUN=}")
+
+
+def _check_benchmark_results(output: str, core: str, constraints: STMLimits) -> None:
+    """
+    Use regular expressions to parse 'output' string.
+    Search for benchmark results related to 'core' coprocessor.
+    Check that benchamrk results are lower than limits provided in 'constraints'.
+    """
+
+    cfg = {
+        "log message with 0 arguments": {
+            "regex": rf"{core}: Timing for log message with 0 arguments: (.+)us",
+            "expected": constraints.log_0_arg,
+        },
+        "log message with 1 argument": {
+            "regex": rf"{core}: Timing for log message with 1 argument: (.+)us",
+            "expected": constraints.log_1_arg,
+        },
+        "log message with 2 arguments": {
+            "regex": rf"{core}: Timing for log message with 2 arguments: (.+)us",
+            "expected": constraints.log_2_arg,
+        },
+        "log message with 3 arguments": {
+            "regex": rf"{core}: Timing for log message with 3 arguments: (.+)us",
+            "expected": constraints.log_3_arg,
+        },
+        "log message with string": {
+            "regex": rf"{core}: Timing for log_message with string: (.+)us",
+            "expected": constraints.log_str,
+        },
+        "tracepoint": {
+            "regex": rf"{core}: Timing for tracepoint: (.+)us",
+            "expected": constraints.tracepoint,
+        },
+        "tracepoint_d32": {
+            "regex": rf"{core}: Timing for tracepoint_d32: (.+)us",
+            "expected": constraints.tracepoint_d32,
+        },
+    }
+
+    for check in cfg:
+        observed_str = re.search(cfg[check]["regex"], output).group(1)
+        assert observed_str is not None, f"Timing for {check} NOT found"
+        # check value
+        observed = float(observed_str)
+        threshold = cfg[check]["expected"] * (1 + constraints.tolerance)
+        assert (
+            observed < threshold
+        ), f"{core}: Timing for {check} - {observed} us exceeds {threshold} us"
+
+
+# nrfutil starts children processes
+# when subprocess.terminate(nrfutil_process) is executed, only the parent terminates
+# this blocks serial port for other uses
+def _kill(proc):
+    try:
+        for child in psutil.Process(proc.pid).children(recursive=True):
+            child.kill()
+        proc.kill()
+    except Exception as e:
+        logger.exception(f'Could not kill nrfutil - {e}')
+
+
+def _nrfutil_dictionary_from_serial(
+    dut: DeviceAdapter,
+    decoded_file_name: str = "output.txt",
+    collect_time: float = 60.0,
+) -> None:
+    UART_PATH = dut.device_config.serial
+    UART_BAUDRATE = dut.device_config.baud
+    dut.close()
+
+    logger.debug(f"Using serial: {UART_PATH}")
+
+    if Path(f"{decoded_file_name}").exists():
+        logger.warning("Output file already exists!")
+
+    # prepare database config string
+    BUILD_DIR = str(dut.device_config.build_dir)
+    logger.debug(f"{BUILD_DIR=}")
+    config_str = f"{STM_M_ID['app']}:{BUILD_DIR}/coresight_stm/zephyr/log_dictionary.json"
+    config_str += f",{STM_M_ID['rad']}:{BUILD_DIR}/remote_rad/zephyr/log_dictionary.json"
+    if SB_CONFIG_APP_CPUPPR_RUN:
+        config_str += f",{STM_M_ID['ppr']}:{BUILD_DIR}/remote_ppr/zephyr/log_dictionary.json"
+    if SB_CONFIG_APP_CPUFLPR_RUN:
+        config_str += f",{STM_M_ID['flpr']}:{BUILD_DIR}/remote_flpr/zephyr/log_dictionary.json"
+    logger.debug(f"{config_str=}")
+
+    cmd = (
+        "nrfutil trace stm --database-config "
+        f"{config_str} "
+        f"--input-serialport {UART_PATH} --baudrate {UART_BAUDRATE} "
+        f"--output-ascii {decoded_file_name}"
+    )
+    try:
+        # run nrfutil trace in background non-blocking
+        logger.info(f"Executing:\n{cmd}")
+        proc = subprocess.Popen(cmd.split(), stdout=subprocess.DEVNULL)
+    except OSError as exc:
+        logger.error(f"Unable to start nrfutil trace:\n{cmd}\n{exc}")
+    try:
+        proc.wait(collect_time)
+    except subprocess.TimeoutExpired:
+        pass
+    finally:
+        _kill(proc)
+
+
+def test_STM_decoded(dut: DeviceAdapter):
+    """
+    Run sample.boards.nrf.coresight_stm from samples/boards/nrf/coresight_stm sample.
+    Both Application and Radio cores use STM for logging.
+    STM proxy (Application core) decodes logs from all domains.
+    After reset, coprocessors execute code in expected way and Application core
+    outputs STM traces on UART port.
+    """
+    BUILD_DIR = str(dut.device_config.build_dir)
+    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
+
+    app_constraints = STMLimits(
+        # all values in us
+        log_0_arg=1.8,
+        log_1_arg=2.1,
+        log_2_arg=2.0,
+        log_3_arg=2.1,
+        log_str=4.5,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,  # 50 %
+    )
+    rad_constraints = STMLimits(
+        # all values in us
+        log_0_arg=4.6,
+        log_1_arg=5.0,
+        log_2_arg=5.2,
+        log_3_arg=5.6,
+        log_str=6.3,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,
+    )
+    ppr_constraints = STMLimits(
+        # all values in us
+        log_0_arg=25.7,
+        log_1_arg=27.1,
+        log_2_arg=27.3,
+        log_3_arg=30.4,
+        log_str=65.7,
+        tracepoint=0.55,
+        tracepoint_d32=0.25,
+        tolerance=0.5,
+    )
+    flpr_constraints = STMLimits(
+        # all values in us
+        log_0_arg=1.3,
+        log_1_arg=1.6,
+        log_2_arg=1.6,
+        log_3_arg=1.7,
+        log_str=3.0,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,
+    )
+    # nrf54h20 prints immediately after it is flashed.
+    # Wait a bit to skipp logs from previous test.
+    sleep(6)
+
+    # Get output from serial port
+    output = "\n".join(dut.readlines())
+
+    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
+    _analyse_autoconf(autoconf_file)
+
+    # check results on Application core
+    _check_benchmark_results(output=output, core='app', constraints=app_constraints)
+
+    # check results on Radio core
+    _check_benchmark_results(output=output, core='rad', constraints=rad_constraints)
+
+    if SB_CONFIG_APP_CPUPPR_RUN:
+        # check results on PPR core
+        _check_benchmark_results(output=output, core='ppr', constraints=ppr_constraints)
+
+    if SB_CONFIG_APP_CPUFLPR_RUN:
+        # check results on FLPR core
+        _check_benchmark_results(output=output, core='flpr', constraints=flpr_constraints)
+
+
+def test_STM_dictionary_mode(dut: DeviceAdapter):
+    """
+    Run sample.boards.nrf.coresight_stm.dict from samples/boards/nrf/coresight_stm sample.
+    Both Application and Radio cores use STM for logging.
+    STM proxy (Application core) prints on serial port raw logs from all domains.
+    Nrfutil trace is used to decode STM logs.
+    After reset, coprocessors execute code in expected way and Application core
+    outputs STM traces on UART port.
+    """
+    BUILD_DIR = str(dut.device_config.build_dir)
+    test_filename = f"{BUILD_DIR}/coresight_stm_dictionary.txt"
+    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
+    COLLECT_TIMEOUT = 10.0
+
+    app_constraints = STMLimits(
+        # all values in us
+        log_0_arg=0.7,
+        log_1_arg=0.8,
+        log_2_arg=0.8,
+        log_3_arg=1.3,
+        log_str=3.2,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,  # 50 %
+    )
+    rad_constraints = STMLimits(
+        # all values in us
+        log_0_arg=0.8,
+        log_1_arg=0.9,
+        log_2_arg=1.0,
+        log_3_arg=1.5,
+        log_str=3.6,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,
+    )
+    ppr_constraints = STMLimits(
+        # all values in us
+        log_0_arg=7.5,
+        log_1_arg=8.5,
+        log_2_arg=8.6,
+        log_3_arg=17.4,
+        log_str=45.2,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,
+    )
+    flpr_constraints = STMLimits(
+        # all values in us
+        log_0_arg=0.3,
+        log_1_arg=0.4,
+        log_2_arg=0.5,
+        log_3_arg=0.8,
+        log_str=2.6,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,  # 50 %
+    )
+
+    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
+    # this information is needed to build nrfutil database-config
+    _analyse_autoconf(autoconf_file)
+
+    # use nrfutil trace to decode logs
+    _nrfutil_dictionary_from_serial(
+        dut=dut,
+        decoded_file_name=f"{test_filename}",
+        collect_time=COLLECT_TIMEOUT,
+    )
+
+    # read decoded logs
+    with open(f"{test_filename}", errors="ignore") as decoded_file:
+        decoded_file_content = decoded_file.read()
+
+    # if nothing in decoded_file, stop test
+    assert len(decoded_file_content) > 0, f"File {test_filename} is empty"
+
+    # check results on Application core
+    _check_benchmark_results(output=decoded_file_content, core='app', constraints=app_constraints)
+
+    # check results on Radio core
+    _check_benchmark_results(output=decoded_file_content, core='rad', constraints=rad_constraints)
+
+    if SB_CONFIG_APP_CPUPPR_RUN:
+        # check results on PPR core
+        _check_benchmark_results(
+            output=decoded_file_content, core='ppr', constraints=ppr_constraints
+        )
+
+    if SB_CONFIG_APP_CPUFLPR_RUN:
+        # check results on FLPR core
+        _check_benchmark_results(
+            output=decoded_file_content, core='flpr', constraints=flpr_constraints
+        )
diff --git a/tests/boards/nrf/coresight_stm/testcase.yaml b/tests/boards/nrf/coresight_stm/testcase.yaml
index 308f231274c..1b496c9b8c7 100644
--- a/tests/boards/nrf/coresight_stm/testcase.yaml
+++ b/tests/boards/nrf/coresight_stm/testcase.yaml
@@ -16,7 +16,7 @@ tests:
     harness_config:
       pytest_dut_scope: session
       pytest_root:
-        - "$ZEPHYR_BASE/samples/boards/nordic/coresight_stm/pytest/test_stm.py::test_STM_dictionary_mode"
+        - "pytest/test_stm.py::test_STM_dictionary_mode"
     required_snippets:
       - nordic-log-stm-dict
     extra_args:
@@ -29,7 +29,7 @@ tests:
     harness_config:
       pytest_dut_scope: session
       pytest_root:
-        - "$ZEPHYR_BASE/samples/boards/nordic/coresight_stm/pytest/test_stm.py::test_STM_decoded"
+        - "pytest/test_stm.py::test_STM_decoded"
     required_snippets:
       - nordic-log-stm
     extra_args:

From db661013e98ad54ec2cccbcca216681bf7c94e15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:08 +0100
Subject: [PATCH 1117/2913] Revert "[nrf fromtree] samples: boards:
 coresight_stm: pytest: Shorten long lines"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b41a53e5f408d98aa855ce3ffc5f65d14e5ec95c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/boards/nordic/coresight_stm/pytest/test_stm.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/boards/nordic/coresight_stm/pytest/test_stm.py b/samples/boards/nordic/coresight_stm/pytest/test_stm.py
index fb2203e809e..2187805f15f 100644
--- a/samples/boards/nordic/coresight_stm/pytest/test_stm.py
+++ b/samples/boards/nordic/coresight_stm/pytest/test_stm.py
@@ -122,11 +122,11 @@ def _nrfutil_dictionary_from_serial(
     BUILD_DIR = str(dut.device_config.build_dir)
     logger.debug(f"{BUILD_DIR=}")
     config_str = f"{STM_M_ID['app']}:{BUILD_DIR}/coresight_stm/zephyr/log_dictionary.json"
-    config_str += f",{STM_M_ID['rad']}:{BUILD_DIR}/remote_rad/zephyr/log_dictionary.json"
+    config_str = config_str + f",{STM_M_ID['rad']}:{BUILD_DIR}/remote_rad/zephyr/log_dictionary.json"
     if SB_CONFIG_APP_CPUPPR_RUN:
-        config_str += f",{STM_M_ID['ppr']}:{BUILD_DIR}/remote_ppr/zephyr/log_dictionary.json"
+        config_str = config_str + f",{STM_M_ID['ppr']}:{BUILD_DIR}/remote_ppr/zephyr/log_dictionary.json"
     if SB_CONFIG_APP_CPUFLPR_RUN:
-        config_str += f",{STM_M_ID['flpr']}:{BUILD_DIR}/remote_flpr/zephyr/log_dictionary.json"
+        config_str = config_str + f",{STM_M_ID['flpr']}:{BUILD_DIR}/remote_flpr/zephyr/log_dictionary.json"
     logger.debug(f"{config_str=}")
 
     cmd = (

From 507d2a451a8bfb711a6ac0b53bc6b9ee586d8b32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:08 +0100
Subject: [PATCH 1118/2913] Revert "[nrf fromtree] net: openthread: cleanup
 diag commands"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 52a1ceee359c93ecf0cfeee835b60e7b4c8c78a5.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/openthread/platform/diag.c | 16 ++++++++++++----
 west.yml                           |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/modules/openthread/platform/diag.c b/modules/openthread/platform/diag.c
index 79f4e38984a..23f82985812 100644
--- a/modules/openthread/platform/diag.c
+++ b/modules/openthread/platform/diag.c
@@ -125,8 +125,8 @@ void otPlatDiagRadioReceived(otInstance *aInstance,
 #if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 otError otPlatDiagRadioTransmitCarrier(otInstance *aInstance, bool aEnable)
 {
-	if (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE &&
-	    sTransmitMode != DIAG_TRANSMIT_MODE_CARRIER) {
+	if (!otPlatDiagModeGet() || (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE &&
+				     sTransmitMode != DIAG_TRANSMIT_MODE_CARRIER)) {
 		return OT_ERROR_INVALID_STATE;
 	}
 
@@ -175,6 +175,10 @@ static otError gpio_get_spec(uint32_t gpio_idx, const struct gpio_dt_spec **spec
 
 	*spec = &gpio_spec[gpio_idx];
 
+	if (!otPlatDiagModeGet()) {
+		return OT_ERROR_INVALID_STATE;
+	}
+
 	if (!gpio_is_ready_dt(*spec)) {
 		return OT_ERROR_INVALID_ARGS;
 	}
@@ -322,8 +326,8 @@ static otError startModCarrier(otInstance *aInstance, uint8_t aArgsLength, char
 		return OT_ERROR_INVALID_ARGS;
 	}
 
-	if (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE &&
-	    sTransmitMode != DIAG_TRANSMIT_MODE_MODCARRIER) {
+	if (!otPlatDiagModeGet() || (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE &&
+				     sTransmitMode != DIAG_TRANSMIT_MODE_MODCARRIER)) {
 		return OT_ERROR_INVALID_STATE;
 	}
 
@@ -392,6 +396,10 @@ static otError processTransmit(otInstance *aInstance, uint8_t aArgsLength, char
 	long value;
 	uint32_t now;
 
+	if (!otPlatDiagModeGet()) {
+		return OT_ERROR_INVALID_STATE;
+	}
+
 	if (aArgsLength == 0) {
 		diag_output("transmit will send %" PRId32 " diagnostic messages with %" PRIu32
 			    " ms interval\r\n",
diff --git a/west.yml b/west.yml
index 6d1ad7df18c..b99c5d1212d 100644
--- a/west.yml
+++ b/west.yml
@@ -309,7 +309,7 @@ manifest:
       revision: b735edbc739ad59156eb55bb8ce2583d74537719
       path: modules/lib/open-amp
     - name: openthread
-      revision: 3ae741f95e7dfb391dec35c48742862049eb62e8
+      revision: 2aeb8b833ba760ec29d5f340dd1ce7bcb61c5d56
       path: modules/lib/openthread
     - name: percepio
       path: modules/debug/percepio

From 7a2558e472d5bdfff84e8d4c17c4f69498e8c33f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:09 +0100
Subject: [PATCH 1119/2913] Revert "[nrf fromtree] net: openthread: radio: Add
 setting channel in diag mode"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3aabd42ffa9db5ebd0b1b7f7092b15de02cfb5e2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/openthread/platform/diag.c            |  2 +-
 modules/openthread/platform/platform-zephyr.h | 10 ----------
 modules/openthread/platform/radio.c           |  7 -------
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/modules/openthread/platform/diag.c b/modules/openthread/platform/diag.c
index 23f82985812..edf8ad09dd5 100644
--- a/modules/openthread/platform/diag.c
+++ b/modules/openthread/platform/diag.c
@@ -104,8 +104,8 @@ bool otPlatDiagModeGet(void)
 
 void otPlatDiagChannelSet(uint8_t aChannel)
 {
+	ARG_UNUSED(aChannel);
 	sChannel = aChannel;
-	platformRadioChannelSet(aChannel);
 }
 
 void otPlatDiagTxPowerSet(int8_t aTxPower)
diff --git a/modules/openthread/platform/platform-zephyr.h b/modules/openthread/platform/platform-zephyr.h
index d6dd26adea0..ca25fedf2b1 100644
--- a/modules/openthread/platform/platform-zephyr.h
+++ b/modules/openthread/platform/platform-zephyr.h
@@ -70,16 +70,6 @@ void platformUartPanic(void);
  */
 uint16_t platformRadioChannelGet(otInstance *aInstance);
 
-#if defined(CONFIG_OPENTHREAD_DIAG)
-/**
- * Set channel on radio driver.
- *
- * @param[in]  aChannel  The channel that the radio driver should use for operation.
- *
- */
-void platformRadioChannelSet(uint8_t aChannel);
-#endif /* CONFIG_OPENTHREAD_DIAG */
-
 #if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 /**
  * Start/stop continuous carrier wave transmission.
diff --git a/modules/openthread/platform/radio.c b/modules/openthread/platform/radio.c
index 97c6e3a1d12..2ce7dd81d0d 100644
--- a/modules/openthread/platform/radio.c
+++ b/modules/openthread/platform/radio.c
@@ -708,13 +708,6 @@ uint16_t platformRadioChannelGet(otInstance *aInstance)
 	return channel;
 }
 
-#if defined(CONFIG_OPENTHREAD_DIAG)
-void platformRadioChannelSet(uint8_t aChannel)
-{
-	channel = aChannel;
-}
-#endif
-
 void otPlatRadioSetPanId(otInstance *aInstance, uint16_t aPanId)
 {
 	ARG_UNUSED(aInstance);

From 546f48504fb618f57331b96bd98696fbd8f71fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:09 +0100
Subject: [PATCH 1120/2913] Revert "[nrf fromtree] net: openthread: radio: Fix
 platform radio state machine"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 16695a7cbb7466bebf2140c6981d055e415aac43.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/openthread/platform/radio.c  | 37 +++++++++++-----------------
 tests/subsys/openthread/radio_test.c | 12 +--------
 2 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/modules/openthread/platform/radio.c b/modules/openthread/platform/radio.c
index 2ce7dd81d0d..73f6f4dc9cc 100644
--- a/modules/openthread/platform/radio.c
+++ b/modules/openthread/platform/radio.c
@@ -742,25 +742,19 @@ bool otPlatRadioIsEnabled(otInstance *aInstance)
 
 otError otPlatRadioEnable(otInstance *aInstance)
 {
-	ARG_UNUSED(aInstance);
-
-	if (sState != OT_RADIO_STATE_DISABLED && sState != OT_RADIO_STATE_SLEEP) {
-		return OT_ERROR_INVALID_STATE;
+	if (!otPlatRadioIsEnabled(aInstance)) {
+		sState = OT_RADIO_STATE_SLEEP;
 	}
 
-	sState = OT_RADIO_STATE_SLEEP;
 	return OT_ERROR_NONE;
 }
 
 otError otPlatRadioDisable(otInstance *aInstance)
 {
-	ARG_UNUSED(aInstance);
-
-	if (sState != OT_RADIO_STATE_DISABLED && sState != OT_RADIO_STATE_SLEEP) {
-		return OT_ERROR_INVALID_STATE;
+	if (otPlatRadioIsEnabled(aInstance)) {
+		sState = OT_RADIO_STATE_DISABLED;
 	}
 
-	sState = OT_RADIO_STATE_DISABLED;
 	return OT_ERROR_NONE;
 }
 
@@ -768,24 +762,23 @@ otError otPlatRadioSleep(otInstance *aInstance)
 {
 	ARG_UNUSED(aInstance);
 
-	if (sState != OT_RADIO_STATE_SLEEP && sState != OT_RADIO_STATE_RECEIVE) {
-		return OT_ERROR_INVALID_STATE;
-	}
+	otError error = OT_ERROR_INVALID_STATE;
 
-	radio_api->stop(radio_dev);
-	sState = OT_RADIO_STATE_SLEEP;
+	if (sState == OT_RADIO_STATE_SLEEP ||
+	    sState == OT_RADIO_STATE_RECEIVE ||
+	    sState == OT_RADIO_STATE_TRANSMIT) {
+		error = OT_ERROR_NONE;
+		radio_api->stop(radio_dev);
+		sState = OT_RADIO_STATE_SLEEP;
+	}
 
-	return OT_ERROR_NONE;
+	return error;
 }
 
 otError otPlatRadioReceive(otInstance *aInstance, uint8_t aChannel)
 {
 	ARG_UNUSED(aInstance);
 
-	if (sState == OT_RADIO_STATE_DISABLED) {
-		return OT_ERROR_INVALID_STATE;
-	}
-
 	channel = aChannel;
 
 	radio_api->set_channel(radio_dev, aChannel);
@@ -890,9 +883,7 @@ otError otPlatRadioTransmit(otInstance *aInstance, otRadioFrame *aPacket)
 
 	radio_caps = radio_api->get_capabilities(radio_dev);
 
-	if (sState == OT_RADIO_STATE_RECEIVE ||
-	    (sState == OT_RADIO_STATE_SLEEP &&
-	     radio_caps & IEEE802154_HW_SLEEP_TO_TX)) {
+	if ((sState == OT_RADIO_STATE_RECEIVE) || (radio_caps & IEEE802154_HW_SLEEP_TO_TX)) {
 		if (run_tx_task(aInstance) == 0) {
 			error = OT_ERROR_NONE;
 		}
diff --git a/tests/subsys/openthread/radio_test.c b/tests/subsys/openthread/radio_test.c
index 6e407cab9c6..8c7a9fcb79e 100644
--- a/tests/subsys/openthread/radio_test.c
+++ b/tests/subsys/openthread/radio_test.c
@@ -625,9 +625,6 @@ ZTEST(openthread_radio, test_radio_state_test)
 
 	zassert_equal(otPlatRadioSetTransmitPower(ot, power), OT_ERROR_NONE,
 		      "Failed to set TX power.");
-
-	zassert_equal(otPlatRadioSleep(ot), OT_ERROR_NONE, "Failed to switch to sleep mode.");
-
 	zassert_equal(otPlatRadioDisable(ot), OT_ERROR_NONE, "Failed to disable radio.");
 
 	zassert_false(otPlatRadioIsEnabled(ot), "Radio reports as enabled.");
@@ -635,9 +632,6 @@ ZTEST(openthread_radio, test_radio_state_test)
 	zassert_equal(otPlatRadioSleep(ot), OT_ERROR_INVALID_STATE,
 		      "Changed to sleep regardless being disabled.");
 
-	zassert_equal(otPlatRadioReceive(ot, channel), OT_ERROR_INVALID_STATE,
-		      "Changed to receive regardless being disabled.");
-
 	zassert_equal(otPlatRadioEnable(ot), OT_ERROR_NONE, "Enabling radio failed.");
 
 	zassert_true(otPlatRadioIsEnabled(ot), "Radio reports disabled.");
@@ -650,9 +644,6 @@ ZTEST(openthread_radio, test_radio_state_test)
 	zassert_equal(otPlatRadioReceive(ot, channel), OT_ERROR_NONE, "Failed to receive.");
 	zassert_equal(platformRadioChannelGet(ot), channel, "Channel number not remembered.");
 
-	zassert_equal(otPlatRadioDisable(ot), OT_ERROR_INVALID_STATE,
-		      "Changed to disabled regardless being in receive state.");
-
 	zassert_true(otPlatRadioIsEnabled(ot), "Radio reports as disabled.");
 	zassert_equal(1, set_channel_mock_fake.call_count);
 	zassert_equal(channel, set_channel_mock_fake.arg1_val);
@@ -660,7 +651,7 @@ ZTEST(openthread_radio, test_radio_state_test)
 	zassert_equal(power, set_txpower_mock_fake.arg1_val);
 	zassert_equal(1, start_mock_fake.call_count);
 	zassert_equal_ptr(radio, start_mock_fake.arg0_val, NULL);
-	zassert_equal(2, stop_mock_fake.call_count);
+	zassert_equal(1, stop_mock_fake.call_count);
 	zassert_equal_ptr(radio, stop_mock_fake.arg0_val, NULL);
 }
 
@@ -823,7 +814,6 @@ ZTEST(openthread_radio, test_net_pkt_transmit)
 		      "Failed to set TX power.");
 
 	set_channel_mock_fake.return_val = 0;
-	zassert_equal(otPlatRadioEnable(ot), OT_ERROR_NONE, "Failed to enable.");
 	zassert_equal(otPlatRadioReceive(ot, channel), OT_ERROR_NONE, "Failed to receive.");
 	zassert_equal(1, set_channel_mock_fake.call_count);
 	zassert_equal(channel, set_channel_mock_fake.arg1_val);

From f20ccc920653f0f3623b8d2d6f0bafb815c45198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:09 +0100
Subject: [PATCH 1121/2913] Revert "[nrf fromlist] tests: kernel: Fix for
 nRF54H20"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ffa5be0dbbfd941f2156fe6237bdc5bd58772836.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/drivers/can/host/boards/nrf54h20dk_nrf54h20_cpuapp.conf    | 1 -
 .../dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpuapp.conf  | 1 -
 .../dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpurad.conf  | 1 -
 .../thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpuapp.conf  | 1 -
 .../thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpurad.conf  | 1 -
 5 files changed, 5 deletions(-)
 delete mode 100644 tests/drivers/can/host/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 delete mode 100644 tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 delete mode 100644 tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpurad.conf
 delete mode 100644 tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 delete mode 100644 tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpurad.conf

diff --git a/tests/drivers/can/host/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/can/host/boards/nrf54h20dk_nrf54h20_cpuapp.conf
deleted file mode 100644
index 0bcc82e646b..00000000000
--- a/tests/drivers/can/host/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpuapp.conf
deleted file mode 100644
index 0bcc82e646b..00000000000
--- a/tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpurad.conf
deleted file mode 100644
index 0bcc82e646b..00000000000
--- a/tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpurad.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpuapp.conf
deleted file mode 100644
index 0bcc82e646b..00000000000
--- a/tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpurad.conf
deleted file mode 100644
index 0bcc82e646b..00000000000
--- a/tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpurad.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_NRF54H20_GPD=n

From f4c7abb6e06d70f5987d3c5e2c45693f97aeeb63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:09 +0100
Subject: [PATCH 1122/2913] Revert "[nrf fromtree] dfu: boot: mcuboot: fix
 boot_is_img_confirmed"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fb23112160f8148d4729b3a262e6d532423db61c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/dfu/boot/mcuboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/dfu/boot/mcuboot.c b/subsys/dfu/boot/mcuboot.c
index 6710a793e56..4a66befaa91 100644
--- a/subsys/dfu/boot/mcuboot.c
+++ b/subsys/dfu/boot/mcuboot.c
@@ -233,7 +233,7 @@ bool boot_is_img_confirmed(void)
 	const struct flash_area *fa;
 	int rc;
 
-	rc = flash_area_open(ACTIVE_SLOT_FLASH_AREA_ID, &fa);
+	rc = flash_area_open(FLASH_AREA_IMAGE_PRIMARY, &fa);
 	if (rc) {
 		return false;
 	}

From ddbc76e140e6681c28f0f70e3849ce84396e53f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:09 +0100
Subject: [PATCH 1123/2913] Revert "[nrf fromlist] drivers: pwm: nrfx: add
 global hsfll request for fast PWM"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3098bb289f1050f5984e9fefdb1d12ea450234a4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/pwm/pwm_nrfx.c | 93 ++++--------------------------------------
 1 file changed, 8 insertions(+), 85 deletions(-)

diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index 065784ed80f..230a90d6cdf 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -13,7 +13,6 @@
 #include <zephyr/linker/devicetree_regions.h>
 #include <zephyr/cache.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
-#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #ifdef CONFIG_SOC_NRF54H20_GPD
 #include <nrf/gpd.h>
 #endif
@@ -36,21 +35,6 @@ LOG_MODULE_REGISTER(pwm_nrfx, CONFIG_PWM_LOG_LEVEL);
 #define ANOMALY_109_EGU_IRQ_CONNECT(idx)
 #endif
 
-#define PWM(dev_idx) DT_NODELABEL(pwm##dev_idx)
-#define PWM_PROP(dev_idx, prop) DT_PROP(PWM(dev_idx), prop)
-#define PWM_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(PWM(idx), prop)
-
-#define PWM_NRFX_IS_FAST(unused, prefix, idx, _)					\
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(PWM(idx)),					\
-		(COND_CODE_1(PWM_HAS_PROP(idx, power_domains),				\
-		    (IS_EQ(DT_PHA(PWM(idx), power_domains, id), NRF_GPD_FAST_ACTIVE1)),	\
-		    (0))), (0))
-
-#if (NRFX_FOREACH_PRESENT(PWM, PWM_NRFX_IS_FAST, (||), (0))) && \
-	CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
-#define PWM_NRFX_USE_CLOCK_CONTROL 1
-#endif
-
 #define PWM_NRFX_CH_POLARITY_MASK BIT(15)
 #define PWM_NRFX_CH_COMPARE_MASK  BIT_MASK(15)
 #define PWM_NRFX_CH_VALUE(compare_value, inverted) \
@@ -65,10 +49,6 @@ struct pwm_nrfx_config {
 #ifdef CONFIG_DCACHE
 	uint32_t mem_attr;
 #endif
-#ifdef PWM_NRFX_USE_CLOCK_CONTROL
-	const struct device *clk_dev;
-	struct nrf_clock_spec clk_spec;
-#endif
 };
 
 struct pwm_nrfx_data {
@@ -77,9 +57,6 @@ struct pwm_nrfx_data {
 	uint8_t  pwm_needed;
 	uint8_t  prescaler;
 	bool     stop_requested;
-#ifdef PWM_NRFX_USE_CLOCK_CONTROL
-	bool     clock_requested;
-#endif
 };
 /* Ensure the pwm_needed bit mask can accommodate all available channels. */
 #if (NRF_PWM_CHANNEL_COUNT > 8)
@@ -252,18 +229,6 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 		 * ensure it is stopped before starting the next playback.
 		 */
 		nrfx_pwm_stop(&config->pwm, false);
-#if PWM_NRFX_USE_CLOCK_CONTROL
-		if (data->clock_requested && config->clk_dev) {
-			int ret = nrf_clock_control_release(config->clk_dev, &config->clk_spec);
-
-			if (ret < 0) {
-				LOG_ERR("Global HSFLL release failed: %d", ret);
-				return ret;
-			}
-
-			data->clock_requested = false;
-		}
-#endif
 		data->stop_requested = true;
 	} else {
 		if (data->stop_requested) {
@@ -283,20 +248,6 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 		 * until another playback is requested (new values will be
 		 * loaded then) or the PWM peripheral is stopped.
 		 */
-#if PWM_NRFX_USE_CLOCK_CONTROL
-		if (!data->clock_requested && config->clk_dev) {
-			int ret = nrf_clock_control_request_sync(config->clk_dev,
-								 &config->clk_spec,
-								 K_FOREVER);
-
-			if (ret < 0) {
-				LOG_ERR("Global HSFLL request failed: %d", ret);
-				return ret;
-			}
-
-			data->clock_requested = true;
-		}
-#endif
 		nrfx_pwm_simple_playback(&config->pwm, &config->seq, 1,
 					 NRFX_PWM_FLAG_NO_EVT_FINISHED);
 	}
@@ -319,7 +270,7 @@ static const struct pwm_driver_api pwm_nrfx_drv_api_funcs = {
 	.get_cycles_per_sec = pwm_nrfx_get_cycles_per_sec,
 };
 
-static int pwm_resume(const struct device *dev)
+static void pwm_resume(const struct device *dev)
 {
 	const struct pwm_nrfx_config *config = dev->config;
 	uint8_t initially_inverted = 0;
@@ -348,29 +299,13 @@ static int pwm_resume(const struct device *dev)
 
 		seq_values_ptr_get(dev)[i] = PWM_NRFX_CH_VALUE(0, inverted);
 	}
-
-	return 0;
 }
 
-static int pwm_suspend(const struct device *dev)
+static void pwm_suspend(const struct device *dev)
 {
 	const struct pwm_nrfx_config *config = dev->config;
 
 	nrfx_pwm_stop(&config->pwm, false);
-#if PWM_NRFX_USE_CLOCK_CONTROL
-	struct pwm_nrfx_data *data = dev->data;
-
-	if (data->clock_requested) {
-		int ret = nrf_clock_control_release(config->clk_dev, &config->clk_spec);
-
-		if (ret < 0) {
-			LOG_ERR("Global HSFLL release failed: %d", ret);
-			return ret;
-		}
-
-		data->clock_requested = false;
-	}
-#endif
 	while (!nrfx_pwm_stopped_check(&config->pwm)) {
 	}
 
@@ -380,17 +315,15 @@ static int pwm_suspend(const struct device *dev)
 
 	memset(dev->data, 0, sizeof(struct pwm_nrfx_data));
 	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
-
-	return 0;
 }
 
 static int pwm_nrfx_pm_action(const struct device *dev,
 			      enum pm_device_action action)
 {
 	if (action == PM_DEVICE_ACTION_RESUME) {
-		return pwm_resume(dev);
+		pwm_resume(dev);
 	} else if (IS_ENABLED(CONFIG_PM_DEVICE) && (action == PM_DEVICE_ACTION_SUSPEND)) {
-		return pwm_suspend(dev);
+		pwm_suspend(dev);
 	} else {
 		return -ENOTSUP;
 	}
@@ -418,6 +351,9 @@ static int pwm_nrfx_init(const struct device *dev)
 	return pm_device_driver_init(dev, pwm_nrfx_pm_action);
 }
 
+#define PWM(dev_idx) DT_NODELABEL(pwm##dev_idx)
+#define PWM_PROP(dev_idx, prop) DT_PROP(PWM(dev_idx), prop)
+#define PWM_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(PWM(idx), prop)
 #define PWM_MEM_REGION(idx)     DT_PHANDLE(PWM(idx), memory_regions)
 
 #define PWM_MEMORY_SECTION(idx)						      \
@@ -430,11 +366,6 @@ static int pwm_nrfx_init(const struct device *dev)
 	COND_CODE_1(PWM_HAS_PROP(idx, memory_regions),			      \
 		(DT_PROP_OR(PWM_MEM_REGION(idx), zephyr_memory_attr, 0)), (0))
 
-#define PWM_INIT_PRIORITY(idx)								\
-	COND_CODE_1(PWM_NRFX_IS_FAST(_, /*empty*/, idx, _),				\
-		    (UTIL_INC(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_INIT_PRIORITY)),	\
-		    (CONFIG_PWM_INIT_PRIORITY))
-
 #define PWM_NRFX_DEVICE(idx)						      \
 	NRF_DT_CHECK_NODE_HAS_PINCTRL_SLEEP(PWM(idx));			      \
 	static struct pwm_nrfx_data pwm_nrfx_##idx##_data;		      \
@@ -462,14 +393,6 @@ static int pwm_nrfx_init(const struct device *dev)
 			(16ul * 1000ul * 1000ul)),			      \
 		IF_ENABLED(CONFIG_DCACHE,				      \
 			(.mem_attr = PWM_GET_MEM_ATTR(idx),))		      \
-		IF_ENABLED(PWM_NRFX_USE_CLOCK_CONTROL,			      \
-			(.clk_dev = PWM_NRFX_IS_FAST(_, /*empty*/, idx, _)    \
-				    ? DEVICE_DT_GET(DT_CLOCKS_CTLR(PWM(idx))) \
-				    : NULL,				      \
-			 .clk_spec = {					      \
-				.frequency =				      \
-					NRF_PERIPH_GET_FREQUENCY(PWM(idx)),   \
-			 },))						      \
 	};								      \
 	static int pwm_nrfx_init##idx(const struct device *dev)		      \
 	{								      \
@@ -482,7 +405,7 @@ static int pwm_nrfx_init(const struct device *dev)
 			 pwm_nrfx_init##idx, PM_DEVICE_DT_GET(PWM(idx)),      \
 			 &pwm_nrfx_##idx##_data,			      \
 			 &pwm_nrfx_##idx##_config,			      \
-			 POST_KERNEL, PWM_INIT_PRIORITY(idx),		      \
+			 POST_KERNEL, CONFIG_PWM_INIT_PRIORITY,		      \
 			 &pwm_nrfx_drv_api_funcs)
 
 #define COND_PWM_NRFX_DEVICE(unused, prefix, i, _) \

From 8c1d790f971f0b38c3c9cd1bb049216f05d6ccaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:09 +0100
Subject: [PATCH 1124/2913] Revert "[nrf fromlist] include: drivers:
 nrf_clock_control: make nrf_clock inclusion stricter"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2c7f6efa7220ef2fbdd70e8597aedf1a07e86067.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/drivers/clock_control/nrf_clock_control.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/zephyr/drivers/clock_control/nrf_clock_control.h b/include/zephyr/drivers/clock_control/nrf_clock_control.h
index f33ee5aa7c6..8d9bcbe3441 100644
--- a/include/zephyr/drivers/clock_control/nrf_clock_control.h
+++ b/include/zephyr/drivers/clock_control/nrf_clock_control.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_NRF_CLOCK_CONTROL_H_
 
 #include <zephyr/device.h>
-#if defined(NRF_CLOCK) && !defined(NRF_LFRC)
+#ifdef NRF_CLOCK
 #include <hal/nrf_clock.h>
 #endif
 #include <zephyr/sys/onoff.h>

From 0cfca29c2b7f2a93051e2c1bb07904d412c56510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:09 +0100
Subject: [PATCH 1125/2913] Revert "[nrf fromtree] tests: drivers: uart:
 async_api: Add nrf54h20 cpuppr"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 09b87e9262d6bc87206114dc14d1d10c585fbc0f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuppr.overlay             | 3 ---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay             | 8 --------
 .../uart/uart_async_api/sysbuild/vpr_launcher/prj.conf    | 1 -
 3 files changed, 12 deletions(-)
 delete mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
 delete mode 100644 tests/drivers/uart/uart_async_api/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 delete mode 100644 tests/drivers/uart/uart_async_api/sysbuild/vpr_launcher/prj.conf

diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
deleted file mode 100644
index f65b4dd3b0b..00000000000
--- a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-
-#include "nrf54h20dk_nrf54h20_common.dtsi"
diff --git a/tests/drivers/uart/uart_async_api/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/uart/uart_async_api/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index 64c14d2c492..00000000000
--- a/tests/drivers/uart/uart_async_api/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-
-#include "../../../boards/nrf54h20dk_nrf54h20_common.dtsi"
-
-&dut {
-	status = "reserved";
-	interrupt-parent = <&cpuppr_clic>;
-};
diff --git a/tests/drivers/uart/uart_async_api/sysbuild/vpr_launcher/prj.conf b/tests/drivers/uart/uart_async_api/sysbuild/vpr_launcher/prj.conf
deleted file mode 100644
index b2a4ba59104..00000000000
--- a/tests/drivers/uart/uart_async_api/sysbuild/vpr_launcher/prj.conf
+++ /dev/null
@@ -1 +0,0 @@
-# nothing here

From 8c9cbaf546cfcdea5da3eeaad56e1359540f3d0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:09 +0100
Subject: [PATCH 1126/2913] Revert "[nrf fromtree] boards: nordic: remove
 custom JLink reset scheme"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1e841e3e45ad9abf7174d6638e1771a9cc2dd126.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../support/nrf54h20_cpuapp.JLinkScript       | 252 +++++++++++++++++-
 .../support/nrf54h20_cpurad.JLinkScript       | 252 +++++++++++++++++-
 .../support/nrf9280_cpuapp.JLinkScript        | 252 +++++++++++++++++-
 .../support/nrf9280_cpurad.JLinkScript        | 252 +++++++++++++++++-
 4 files changed, 1000 insertions(+), 8 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/support/nrf54h20_cpuapp.JLinkScript b/boards/nordic/nrf54h20dk/support/nrf54h20_cpuapp.JLinkScript
index b1b96857399..28010addbf1 100644
--- a/boards/nordic/nrf54h20dk/support/nrf54h20_cpuapp.JLinkScript
+++ b/boards/nordic/nrf54h20dk/support/nrf54h20_cpuapp.JLinkScript
@@ -1,12 +1,260 @@
+// Constants specific to the application core
 __constant U32 _CPUCONF_ADDR = 0x52011000;
+__constant U32 _PROCESSOR_ID = 2;
+__constant U32 _DOMAIN_ID = 2;
+__constant U32 _NUM_OTHER_PROCESSORS = 1;
+const U32 _OTHER_PROCESSOR_IDS[1] = {3};
+
+// Debug Halting Control and Status Register
+__constant U32 _DHCSR_ADDR = 0xE000EDF0;
+__constant U32 _DHCSR_DBGKEY = (0xA05F << 16);
+__constant U32 _DHCSR_C_DEBUGEN = (1 << 0);
+__constant U32 _DHCSR_C_HALT = (1 << 1);
+
+// Debug Exception and Monitor Control Register
+__constant U32 _DEMCR_ADDR = 0xE000EDFC;
+__constant U32 _DEMCR_VC_CORERESET = (1 << 0);
+__constant U32 _DEMCR_TRCENA = (1 << 24);
+
+// CPU wait enable register
 __constant U32 _CPUCONF_CPUWAIT_OFFSET = 0x50C;
 
-int SetupTarget(void)
+// CTRL-AP
+__constant U32 _CTRLAP_ID = 4;
+__constant U32 _CTRLAP_READY_BANK = 0;
+__constant U32 _CTRLAP_READY_OFFSET = 1;
+__constant U32 _CTRLAP_READY = 0;
+__constant U32 _CTRLAP_MAILBOX_BANK = 1;
+__constant U32 _CTRLAP_MAILBOX_TXDATA_OFFSET = 0;
+__constant U32 _CTRLAP_MAILBOX_TXSTATUS_OFFSET = 1;
+__constant U32 _CTRLAP_MAILBOX_RXDATA_OFFSET = 2;
+__constant U32 _CTRLAP_MAILBOX_RXSTATUS_OFFSET = 3;
+__constant U32 _CTRLAP_MAILBOX_NO_DATA_PENDING = 0;
+__constant U32 _CTRLAP_MAILBOX_DATA_PENDING = 1;
+__constant int _CTRLAP_TIMEOUT_MS = 500;
+
+// ADAC transaction buffers
+static U32 _adacTx[20];
+static U32 _adacRx[20];
+
+// Failed to send to the CTRL-AP MAILBOX
+__constant int _ERR_TX = -1;
+// Failed to receive from the CTRL-AP MAILBOX
+__constant int _ERR_RX = -2;
+// ADAC command returned an error
+__constant int _ERR_REPLY = -3;
+
+// Wait for an AP register read to return the expected value.
+int _WaitForDataStatus(U32 regOffset, int expectedStatus)
+{
+	int status;
+	int ret;
+	int start;
+	int elapsed;
+
+	status = 0;
+	start = JLINK_GetTime();
+	elapsed = 0;
+
+	do {
+		ret = JLINK_CORESIGHT_ReadDAP(regOffset, 1, &status);
+		elapsed = JLINK_GetTime() - start;
+	} while ((ret < 0 || status != expectedStatus) && (elapsed < _CTRLAP_TIMEOUT_MS));
+
+	if (ret < 0) {
+		return ret;
+	}
+
+	return status;
+}
+
+// Continuously read from the CTRL-AP MAILBOX until there is no more pending data.
+void _DrainMailbox(void)
+{
+	int ret;
+	int status;
+	int data;
+
+	ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
+	while (ret >= 0 && status == _CTRLAP_MAILBOX_DATA_PENDING) {
+		JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
+		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
+	}
+}
+
+// Perform an ADAC transaction by:
+// * writing the given sequence of words to MAILBOX.TXDATATA, waiting for MAILBOX.TXSTATUS
+//   readiness before each write.
+// * reading a sequence of words from MAILBOX.RXDATA, waiting for MAILBOX.RXSTATUS readiness before
+//   each read.
+//
+// The message to send is read from _adacTx and the reply is written to _adacRx.
+// Optionally checks if a single data word is returned and returns an error if it is non-zero.
+//
+// Assumes that the correct AP and AP bank for CTRL-AP MAILBOX has been selected in the DP.
+int _DoAdacTransaction(int checkReplyStatus)
+{
+	int numWords;
+	int ret;
+	int data;
+	int i;
+
+	i = 0;
+	numWords = 2 + (_adacTx[1] >> 2); // Length based on the length field of the message
+
+	while (i < numWords) {
+		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_TXSTATUS_OFFSET,
+					 _CTRLAP_MAILBOX_NO_DATA_PENDING);
+		if (ret != _CTRLAP_MAILBOX_NO_DATA_PENDING) {
+			JLINK_SYS_Report1("Timed out waiting for CTRL-AP TX readiness - result: ",
+					  ret);
+			return _ERR_TX;
+		}
+
+		ret = JLINK_CORESIGHT_WriteDAP(_CTRLAP_MAILBOX_TXDATA_OFFSET, 1, _adacTx[i]);
+		if (ret < 0) {
+			JLINK_SYS_Report1("Failed to write CTRL-AP TX data - result: ", ret);
+			return _ERR_TX;
+		}
+
+		i += 1;
+	}
+
+	i = 0;
+	numWords = 2; // Minimum message length
+
+	while (i < numWords) {
+		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_RXSTATUS_OFFSET,
+					 _CTRLAP_MAILBOX_DATA_PENDING);
+		if (ret != _CTRLAP_MAILBOX_DATA_PENDING) {
+			JLINK_SYS_Report1("Timed out waiting for CTRL-AP RX data - result: ", ret);
+			return _ERR_RX;
+		}
+
+		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
+		if (ret < 0) {
+			JLINK_SYS_Report1("Failed to read CTRL-AP RX data - result: ", ret);
+			return _ERR_RX;
+		}
+
+		if (i == 1) {
+			// Update total length based on the message length field
+			numWords = 2 + (data >> 2);
+		}
+
+		_adacRx[i] = data;
+		i += 1;
+	}
+
+	if (checkReplyStatus && _adacRx[1] == 4 && _adacRx[2] != 0) {
+		JLINK_SYS_Report1("ADAC command failed with status: ", _adacRx[2]);
+		return _ERR_REPLY;
+	}
+
+	return 0;
+}
+
+int ResetTarget(void)
 {
-	JLINK_TARGET_Halt();
+	int err;
+	U32 adacMajorVersion;
+	U32 i;
+
+	// Select CTRL-AP bank 0, used for the READY register
+	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
+				 (_CTRLAP_ID << 24) | (_CTRLAP_READY_BANK << 4));
+
+	// Wait for the READY register to indicate that the AP can be used.
+	err = _WaitForDataStatus(_CTRLAP_READY_OFFSET, _CTRLAP_READY);
+	if (err < 0) {
+		JLINK_SYS_Report1("Timed out waiting for CTRL-AP readiness - result: ", err);
+		return -1;
+	}
+
+	// Select CTRL-AP bank 1, used for the MAILBOX registers for ADAC communication
+	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
+				 (_CTRLAP_ID << 24) | (_CTRLAP_MAILBOX_BANK << 4));
+
+	// Extract any pre-existing data from the mailbox in case there was previously
+	// an aborted transaction.
+	_DrainMailbox();
+
+	// Read the ADAC version
+	_adacTx[0] = 0xA3000000; // Command VERSION
+	_adacTx[1] = 0x00000004; // Data length 4 bytes
+	_adacTx[2] = 0x00000000; // Type 0 (ADAC version)
+	err = _DoAdacTransaction(0);
+	if (err < 0) {
+		return -1;
+	}
+
+	adacMajorVersion = (_adacRx[2] >> 24) & 0xff;
+	JLINK_SYS_Report1("ADAC major version: ", adacMajorVersion);
+
+	if (adacMajorVersion >= 2) {
+		// There is a very small chance that this command fails if the domain reset itself
+		// at the exact same time the command was issued. Therefore we retry a few times.
+		i = 0;
+		while (i < 3) {
+			// Reset non-essential domains
+			_adacTx[0] = 0xA30A0000; // Command RESET
+			_adacTx[1] = 0x00000004; // Data length 4 bytes
+			_adacTx[2] = 0x00000000; // (reserved)
+			err = _DoAdacTransaction(1);
+			if (err >= 0) {
+				break;
+			} else if (err != _ERR_REPLY) {
+				return -1;
+			}
+
+			i = i + 1;
+		}
+
+		// Start the core in halted mode
+		_adacTx[0] = 0xA3090000;                         // Command START
+		_adacTx[1] = 0x00000004;                         // Data length 4 bytes
+		_adacTx[2] = 0x01000000 | (_PROCESSOR_ID << 16); // Own processor, Flags HALT
+		err = _DoAdacTransaction(1);
+		if (err < 0) {
+			return -1;
+		}
+
+		// Start other cores normally (will fail silently if no firmware is present)
+		i = 0;
+		while (i < _NUM_OTHER_PROCESSORS) {
+			_adacTx[0] = 0xA3090000; // Command START
+			_adacTx[1] = 0x00000004; // Data length 4 bytes
+			_adacTx[2] = 0x00000000 |
+				     (_OTHER_PROCESSOR_IDS[i] << 16); // Other processor, No flags
+			err = _DoAdacTransaction(0);
+			if (err < 0 && err != _ERR_REPLY) {
+				return -1;
+			}
+
+			i = i + 1;
+		}
+	} else {
+		// Reset single domain via legacy implementation
+		_adacTx[0] = 0xA3030000;                      // Command RESET
+		_adacTx[1] = 0x00000004;                      // Data length 4 bytes
+		_adacTx[2] = 0x01000000 | (_DOMAIN_ID << 16); // Own domain, Mode HALT
+		err = _DoAdacTransaction(1);
+		if (err < 0) {
+			return -1;
+		}
+	}
+
+	// Halt the CPU
+	JLINK_MEM_WriteU32(_DHCSR_ADDR, (_DHCSR_DBGKEY | _DHCSR_C_HALT | _DHCSR_C_DEBUGEN));
+
+	// Set vector catch on reset (to halt the CPU immediately after reset)
+	JLINK_MEM_WriteU32(_DEMCR_ADDR, (_DEMCR_VC_CORERESET | _DEMCR_TRCENA));
 
 	// Disable CPU wait
 	JLINK_MEM_WriteU32(_CPUCONF_ADDR + _CPUCONF_CPUWAIT_OFFSET, 0);
 
+	// Clear vector catch stuff
+	JLINK_MEM_WriteU32(_DEMCR_ADDR, _DEMCR_TRCENA);
+
 	return 0;
 }
diff --git a/boards/nordic/nrf54h20dk/support/nrf54h20_cpurad.JLinkScript b/boards/nordic/nrf54h20dk/support/nrf54h20_cpurad.JLinkScript
index e1861ae8c97..5c2065307ff 100644
--- a/boards/nordic/nrf54h20dk/support/nrf54h20_cpurad.JLinkScript
+++ b/boards/nordic/nrf54h20dk/support/nrf54h20_cpurad.JLinkScript
@@ -1,6 +1,159 @@
+// Constants specific to the radio core
 __constant U32 _CPUCONF_ADDR = 0x53011000;
+__constant U32 _PROCESSOR_ID = 3;
+__constant U32 _DOMAIN_ID = 3;
+__constant U32 _NUM_OTHER_PROCESSORS = 1;
+const U32 _OTHER_PROCESSOR_IDS[1] = {2};
+
+// Debug Halting Control and Status Register
+__constant U32 _DHCSR_ADDR = 0xE000EDF0;
+__constant U32 _DHCSR_DBGKEY = (0xA05F << 16);
+__constant U32 _DHCSR_C_DEBUGEN = (1 << 0);
+__constant U32 _DHCSR_C_HALT = (1 << 1);
+
+// Debug Exception and Monitor Control Register
+__constant U32 _DEMCR_ADDR = 0xE000EDFC;
+__constant U32 _DEMCR_VC_CORERESET = (1 << 0);
+__constant U32 _DEMCR_TRCENA = (1 << 24);
+
+// CPU wait enable register
 __constant U32 _CPUCONF_CPUWAIT_OFFSET = 0x50C;
 
+// CTRL-AP
+__constant U32 _CTRLAP_ID = 4;
+__constant U32 _CTRLAP_READY_BANK = 0;
+__constant U32 _CTRLAP_READY_OFFSET = 1;
+__constant U32 _CTRLAP_READY = 0;
+__constant U32 _CTRLAP_MAILBOX_BANK = 1;
+__constant U32 _CTRLAP_MAILBOX_TXDATA_OFFSET = 0;
+__constant U32 _CTRLAP_MAILBOX_TXSTATUS_OFFSET = 1;
+__constant U32 _CTRLAP_MAILBOX_RXDATA_OFFSET = 2;
+__constant U32 _CTRLAP_MAILBOX_RXSTATUS_OFFSET = 3;
+__constant U32 _CTRLAP_MAILBOX_NO_DATA_PENDING = 0;
+__constant U32 _CTRLAP_MAILBOX_DATA_PENDING = 1;
+__constant int _CTRLAP_TIMEOUT_MS = 500;
+
+// ADAC transaction buffers
+static U32 _adacTx[20];
+static U32 _adacRx[20];
+
+// Failed to send to the CTRL-AP MAILBOX
+__constant int _ERR_TX = -1;
+// Failed to receive from the CTRL-AP MAILBOX
+__constant int _ERR_RX = -2;
+// ADAC command returned an error
+__constant int _ERR_REPLY = -3;
+
+// Wait for an AP register read to return the expected value.
+int _WaitForDataStatus(U32 regOffset, int expectedStatus)
+{
+	int status;
+	int ret;
+	int start;
+	int elapsed;
+
+	status = 0;
+	start = JLINK_GetTime();
+	elapsed = 0;
+
+	do {
+		ret = JLINK_CORESIGHT_ReadDAP(regOffset, 1, &status);
+		elapsed = JLINK_GetTime() - start;
+	} while ((ret < 0 || status != expectedStatus) && (elapsed < _CTRLAP_TIMEOUT_MS));
+
+	if (ret < 0) {
+		return ret;
+	}
+
+	return status;
+}
+
+// Continuously read from the CTRL-AP MAILBOX until there is no more pending data.
+void _DrainMailbox(void)
+{
+	int ret;
+	int status;
+	int data;
+
+	ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
+	while (ret >= 0 && status == _CTRLAP_MAILBOX_DATA_PENDING) {
+		JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
+		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
+	}
+}
+
+// Perform an ADAC transaction by:
+// * writing the given sequence of words to MAILBOX.TXDATATA, waiting for MAILBOX.TXSTATUS
+//   readiness before each write.
+// * reading a sequence of words from MAILBOX.RXDATA, waiting for MAILBOX.RXSTATUS readiness before
+//   each read.
+//
+// The message to send is read from _adacTx and the reply is written to _adacRx.
+// Optionally checks if a single data word is returned and returns an error if it is non-zero.
+//
+// Assumes that the correct AP and AP bank for CTRL-AP MAILBOX has been selected in the DP.
+int _DoAdacTransaction(int checkReplyStatus)
+{
+	int numWords;
+	int ret;
+	int data;
+	int i;
+
+	i = 0;
+	numWords = 2 + (_adacTx[1] >> 2); // Length based on the length field of the message
+
+	while (i < numWords) {
+		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_TXSTATUS_OFFSET,
+					 _CTRLAP_MAILBOX_NO_DATA_PENDING);
+		if (ret != _CTRLAP_MAILBOX_NO_DATA_PENDING) {
+			JLINK_SYS_Report1("Timed out waiting for CTRL-AP TX readiness - result: ",
+					  ret);
+			return _ERR_TX;
+		}
+
+		ret = JLINK_CORESIGHT_WriteDAP(_CTRLAP_MAILBOX_TXDATA_OFFSET, 1, _adacTx[i]);
+		if (ret < 0) {
+			JLINK_SYS_Report1("Failed to write CTRL-AP TX data - result: ", ret);
+			return _ERR_TX;
+		}
+
+		i += 1;
+	}
+
+	i = 0;
+	numWords = 2; // Minimum message length
+
+	while (i < numWords) {
+		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_RXSTATUS_OFFSET,
+					 _CTRLAP_MAILBOX_DATA_PENDING);
+		if (ret != _CTRLAP_MAILBOX_DATA_PENDING) {
+			JLINK_SYS_Report1("Timed out waiting for CTRL-AP RX data - result: ", ret);
+			return _ERR_RX;
+		}
+
+		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
+		if (ret < 0) {
+			JLINK_SYS_Report1("Failed to read CTRL-AP RX data - result: ", ret);
+			return _ERR_RX;
+		}
+
+		if (i == 1) {
+			// Update total length based on the message length field
+			numWords = 2 + (data >> 2);
+		}
+
+		_adacRx[i] = data;
+		i += 1;
+	}
+
+	if (checkReplyStatus && _adacRx[1] == 4 && _adacRx[2] != 0) {
+		JLINK_SYS_Report1("ADAC command failed with status: ", _adacRx[2]);
+		return _ERR_REPLY;
+	}
+
+	return 0;
+}
+
 int ConfigTargetSettings(void)
 {
 	JLINK_ExecCommand("CORESIGHT_AddAP = Index=1 Type=AHB-AP");
@@ -9,12 +162,107 @@ int ConfigTargetSettings(void)
 	return 0;
 }
 
-int SetupTarget(void)
+int ResetTarget(void)
 {
-	JLINK_TARGET_Halt();
+	int err;
+	U32 adacMajorVersion;
+	U32 i;
+
+	// Select CTRL-AP bank 0, used for the READY register
+	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
+				 (_CTRLAP_ID << 24) | (_CTRLAP_READY_BANK << 4));
+
+	// Wait for the READY register to indicate that the AP can be used.
+	err = _WaitForDataStatus(_CTRLAP_READY_OFFSET, _CTRLAP_READY);
+	if (err < 0) {
+		JLINK_SYS_Report1("Timed out waiting for CTRL-AP readiness - result: ", err);
+		return -1;
+	}
+
+	// Select CTRL-AP bank 1, used for the MAILBOX registers for ADAC communication
+	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
+				 (_CTRLAP_ID << 24) | (_CTRLAP_MAILBOX_BANK << 4));
+
+	// Extract any pre-existing data from the mailbox in case there was previously
+	// an aborted transaction.
+	_DrainMailbox();
+
+	// Read the ADAC version
+	_adacTx[0] = 0xA3000000; // Command VERSION
+	_adacTx[1] = 0x00000004; // Data length 4 bytes
+	_adacTx[2] = 0x00000000; // Type 0 (ADAC version)
+	err = _DoAdacTransaction(0);
+	if (err < 0) {
+		return -1;
+	}
+
+	adacMajorVersion = (_adacRx[2] >> 24) & 0xff;
+	JLINK_SYS_Report1("ADAC major version: ", adacMajorVersion);
+
+	if (adacMajorVersion >= 2) {
+		// There is a very small chance that this command fails if the domain reset itself
+		// at the exact same time the command was issued. Therefore we retry a few times.
+		i = 0;
+		while (i < 3) {
+			// Reset non-essential domains
+			_adacTx[0] = 0xA30A0000; // Command RESET
+			_adacTx[1] = 0x00000004; // Data length 4 bytes
+			_adacTx[2] = 0x00000000; // (reserved)
+			err = _DoAdacTransaction(1);
+			if (err >= 0) {
+				break;
+			} else if (err != _ERR_REPLY) {
+				return -1;
+			}
+
+			i = i + 1;
+		}
+
+		// Start the core in halted mode
+		_adacTx[0] = 0xA3090000;                         // Command START
+		_adacTx[1] = 0x00000004;                         // Data length 4 bytes
+		_adacTx[2] = 0x01000000 | (_PROCESSOR_ID << 16); // Own processor, Flags HALT
+		err = _DoAdacTransaction(1);
+		if (err < 0) {
+			return -1;
+		}
+
+		// Start other cores normally (will fail silently if no firmware is present)
+		i = 0;
+		while (i < _NUM_OTHER_PROCESSORS) {
+			_adacTx[0] = 0xA3090000; // Command START
+			_adacTx[1] = 0x00000004; // Data length 4 bytes
+			_adacTx[2] = 0x00000000 |
+				     (_OTHER_PROCESSOR_IDS[i] << 16); // Other processor, No flags
+			err = _DoAdacTransaction(0);
+			if (err < 0 && err != _ERR_REPLY) {
+				return -1;
+			}
+
+			i = i + 1;
+		}
+	} else {
+		// Reset single domain via legacy implementation
+		_adacTx[0] = 0xA3030000;                      // Command RESET
+		_adacTx[1] = 0x00000004;                      // Data length 4 bytes
+		_adacTx[2] = 0x01000000 | (_DOMAIN_ID << 16); // Own domain, Mode HALT
+		err = _DoAdacTransaction(1);
+		if (err < 0) {
+			return -1;
+		}
+	}
+
+	// Halt the CPU
+	JLINK_MEM_WriteU32(_DHCSR_ADDR, (_DHCSR_DBGKEY | _DHCSR_C_HALT | _DHCSR_C_DEBUGEN));
+
+	// Set vector catch on reset (to halt the CPU immediately after reset)
+	JLINK_MEM_WriteU32(_DEMCR_ADDR, (_DEMCR_VC_CORERESET | _DEMCR_TRCENA));
 
 	// Disable CPU wait
 	JLINK_MEM_WriteU32(_CPUCONF_ADDR + _CPUCONF_CPUWAIT_OFFSET, 0);
 
+	// Clear vector catch stuff
+	JLINK_MEM_WriteU32(_DEMCR_ADDR, _DEMCR_TRCENA);
+
 	return 0;
 }
diff --git a/boards/nordic/nrf9280pdk/support/nrf9280_cpuapp.JLinkScript b/boards/nordic/nrf9280pdk/support/nrf9280_cpuapp.JLinkScript
index b1b96857399..5791a7bed9b 100644
--- a/boards/nordic/nrf9280pdk/support/nrf9280_cpuapp.JLinkScript
+++ b/boards/nordic/nrf9280pdk/support/nrf9280_cpuapp.JLinkScript
@@ -1,12 +1,260 @@
+// Constants specific to the application core
 __constant U32 _CPUCONF_ADDR = 0x52011000;
+__constant U32 _PROCESSOR_ID = 2;
+__constant U32 _DOMAIN_ID = 2;
+__constant U32 _NUM_OTHER_PROCESSORS = 2;
+const U32 _OTHER_PROCESSOR_IDS[2] = {4, 3};
+
+// Debug Halting Control and Status Register
+__constant U32 _DHCSR_ADDR = 0xE000EDF0;
+__constant U32 _DHCSR_DBGKEY = (0xA05F << 16);
+__constant U32 _DHCSR_C_DEBUGEN = (1 << 0);
+__constant U32 _DHCSR_C_HALT = (1 << 1);
+
+// Debug Exception and Monitor Control Register
+__constant U32 _DEMCR_ADDR = 0xE000EDFC;
+__constant U32 _DEMCR_VC_CORERESET = (1 << 0);
+__constant U32 _DEMCR_TRCENA = (1 << 24);
+
+// CPU wait enable register
 __constant U32 _CPUCONF_CPUWAIT_OFFSET = 0x50C;
 
-int SetupTarget(void)
+// CTRL-AP
+__constant U32 _CTRLAP_ID = 4;
+__constant U32 _CTRLAP_READY_BANK = 0;
+__constant U32 _CTRLAP_READY_OFFSET = 1;
+__constant U32 _CTRLAP_READY = 0;
+__constant U32 _CTRLAP_MAILBOX_BANK = 1;
+__constant U32 _CTRLAP_MAILBOX_TXDATA_OFFSET = 0;
+__constant U32 _CTRLAP_MAILBOX_TXSTATUS_OFFSET = 1;
+__constant U32 _CTRLAP_MAILBOX_RXDATA_OFFSET = 2;
+__constant U32 _CTRLAP_MAILBOX_RXSTATUS_OFFSET = 3;
+__constant U32 _CTRLAP_MAILBOX_NO_DATA_PENDING = 0;
+__constant U32 _CTRLAP_MAILBOX_DATA_PENDING = 1;
+__constant int _CTRLAP_TIMEOUT_MS = 500;
+
+// ADAC transaction buffers
+static U32 _adacTx[20];
+static U32 _adacRx[20];
+
+// Failed to send to the CTRL-AP MAILBOX
+__constant int _ERR_TX = -1;
+// Failed to receive from the CTRL-AP MAILBOX
+__constant int _ERR_RX = -2;
+// ADAC command returned an error
+__constant int _ERR_REPLY = -3;
+
+// Wait for an AP register read to return the expected value.
+int _WaitForDataStatus(U32 regOffset, int expectedStatus)
+{
+	int status;
+	int ret;
+	int start;
+	int elapsed;
+
+	status = 0;
+	start = JLINK_GetTime();
+	elapsed = 0;
+
+	do {
+		ret = JLINK_CORESIGHT_ReadDAP(regOffset, 1, &status);
+		elapsed = JLINK_GetTime() - start;
+	} while ((ret < 0 || status != expectedStatus) && (elapsed < _CTRLAP_TIMEOUT_MS));
+
+	if (ret < 0) {
+		return ret;
+	}
+
+	return status;
+}
+
+// Continuously read from the CTRL-AP MAILBOX until there is no more pending data.
+void _DrainMailbox(void)
+{
+	int ret;
+	int status;
+	int data;
+
+	ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
+	while (ret >= 0 && status == _CTRLAP_MAILBOX_DATA_PENDING) {
+		JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
+		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
+	}
+}
+
+// Perform an ADAC transaction by:
+// * writing the given sequence of words to MAILBOX.TXDATATA, waiting for MAILBOX.TXSTATUS
+//   readiness before each write.
+// * reading a sequence of words from MAILBOX.RXDATA, waiting for MAILBOX.RXSTATUS readiness before
+//   each read.
+//
+// The message to send is read from _adacTx and the reply is written to _adacRx.
+// Optionally checks if a single data word is returned and returns an error if it is non-zero.
+//
+// Assumes that the correct AP and AP bank for CTRL-AP MAILBOX has been selected in the DP.
+int _DoAdacTransaction(int checkReplyStatus)
+{
+	int numWords;
+	int ret;
+	int data;
+	int i;
+
+	i = 0;
+	numWords = 2 + (_adacTx[1] >> 2); // Length based on the length field of the message
+
+	while (i < numWords) {
+		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_TXSTATUS_OFFSET,
+					 _CTRLAP_MAILBOX_NO_DATA_PENDING);
+		if (ret != _CTRLAP_MAILBOX_NO_DATA_PENDING) {
+			JLINK_SYS_Report1("Timed out waiting for CTRL-AP TX readiness - result: ",
+					  ret);
+			return _ERR_TX;
+		}
+
+		ret = JLINK_CORESIGHT_WriteDAP(_CTRLAP_MAILBOX_TXDATA_OFFSET, 1, _adacTx[i]);
+		if (ret < 0) {
+			JLINK_SYS_Report1("Failed to write CTRL-AP TX data - result: ", ret);
+			return _ERR_TX;
+		}
+
+		i += 1;
+	}
+
+	i = 0;
+	numWords = 2; // Minimum message length
+
+	while (i < numWords) {
+		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_RXSTATUS_OFFSET,
+					 _CTRLAP_MAILBOX_DATA_PENDING);
+		if (ret != _CTRLAP_MAILBOX_DATA_PENDING) {
+			JLINK_SYS_Report1("Timed out waiting for CTRL-AP RX data - result: ", ret);
+			return _ERR_RX;
+		}
+
+		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
+		if (ret < 0) {
+			JLINK_SYS_Report1("Failed to read CTRL-AP RX data - result: ", ret);
+			return _ERR_RX;
+		}
+
+		if (i == 1) {
+			// Update total length based on the message length field
+			numWords = 2 + (data >> 2);
+		}
+
+		_adacRx[i] = data;
+		i += 1;
+	}
+
+	if (checkReplyStatus && _adacRx[1] == 4 && _adacRx[2] != 0) {
+		JLINK_SYS_Report1("ADAC command failed with status: ", _adacRx[2]);
+		return _ERR_REPLY;
+	}
+
+	return 0;
+}
+
+int ResetTarget(void)
 {
-	JLINK_TARGET_Halt();
+	int err;
+	U32 adacMajorVersion;
+	U32 i;
+
+	// Select CTRL-AP bank 0, used for the READY register
+	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
+				 (_CTRLAP_ID << 24) | (_CTRLAP_READY_BANK << 4));
+
+	// Wait for the READY register to indicate that the AP can be used.
+	err = _WaitForDataStatus(_CTRLAP_READY_OFFSET, _CTRLAP_READY);
+	if (err < 0) {
+		JLINK_SYS_Report1("Timed out waiting for CTRL-AP readiness - result: ", err);
+		return -1;
+	}
+
+	// Select CTRL-AP bank 1, used for the MAILBOX registers for ADAC communication
+	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
+				 (_CTRLAP_ID << 24) | (_CTRLAP_MAILBOX_BANK << 4));
+
+	// Extract any pre-existing data from the mailbox in case there was previously
+	// an aborted transaction.
+	_DrainMailbox();
+
+	// Read the ADAC version
+	_adacTx[0] = 0xA3000000; // Command VERSION
+	_adacTx[1] = 0x00000004; // Data length 4 bytes
+	_adacTx[2] = 0x00000000; // Type 0 (ADAC version)
+	err = _DoAdacTransaction(0);
+	if (err < 0) {
+		return -1;
+	}
+
+	adacMajorVersion = (_adacRx[2] >> 24) & 0xff;
+	JLINK_SYS_Report1("ADAC major version: ", adacMajorVersion);
+
+	if (adacMajorVersion >= 2) {
+		// There is a very small chance that this command fails if the domain reset itself
+		// at the exact same time the command was issued. Therefore we retry a few times.
+		i = 0;
+		while (i < 3) {
+			// Reset non-essential domains
+			_adacTx[0] = 0xA30A0000; // Command RESET
+			_adacTx[1] = 0x00000004; // Data length 4 bytes
+			_adacTx[2] = 0x00000000; // (reserved)
+			err = _DoAdacTransaction(1);
+			if (err >= 0) {
+				break;
+			} else if (err != _ERR_REPLY) {
+				return -1;
+			}
+
+			i = i + 1;
+		}
+
+		// Start the core in halted mode
+		_adacTx[0] = 0xA3090000;                         // Command START
+		_adacTx[1] = 0x00000004;                         // Data length 4 bytes
+		_adacTx[2] = 0x01000000 | (_PROCESSOR_ID << 16); // Own processor, Flags HALT
+		err = _DoAdacTransaction(1);
+		if (err < 0) {
+			return -1;
+		}
+
+		// Start other cores normally (will fail silently if no firmware is present)
+		i = 0;
+		while (i < _NUM_OTHER_PROCESSORS) {
+			_adacTx[0] = 0xA3090000; // Command START
+			_adacTx[1] = 0x00000004; // Data length 4 bytes
+			_adacTx[2] = 0x00000000 |
+				     (_OTHER_PROCESSOR_IDS[i] << 16); // Other processor, No flags
+			err = _DoAdacTransaction(0);
+			if (err < 0 && err != _ERR_REPLY) {
+				return -1;
+			}
+
+			i = i + 1;
+		}
+	} else {
+		// Reset single domain via legacy implementation
+		_adacTx[0] = 0xA3030000;                      // Command RESET
+		_adacTx[1] = 0x00000004;                      // Data length 4 bytes
+		_adacTx[2] = 0x01000000 | (_DOMAIN_ID << 16); // Own domain, Mode HALT
+		err = _DoAdacTransaction(1);
+		if (err < 0) {
+			return -1;
+		}
+	}
+
+	// Halt the CPU
+	JLINK_MEM_WriteU32(_DHCSR_ADDR, (_DHCSR_DBGKEY | _DHCSR_C_HALT | _DHCSR_C_DEBUGEN));
+
+	// Set vector catch on reset (to halt the CPU immediately after reset)
+	JLINK_MEM_WriteU32(_DEMCR_ADDR, (_DEMCR_VC_CORERESET | _DEMCR_TRCENA));
 
 	// Disable CPU wait
 	JLINK_MEM_WriteU32(_CPUCONF_ADDR + _CPUCONF_CPUWAIT_OFFSET, 0);
 
+	// Clear vector catch stuff
+	JLINK_MEM_WriteU32(_DEMCR_ADDR, _DEMCR_TRCENA);
+
 	return 0;
 }
diff --git a/boards/nordic/nrf9280pdk/support/nrf9280_cpurad.JLinkScript b/boards/nordic/nrf9280pdk/support/nrf9280_cpurad.JLinkScript
index e1861ae8c97..02b84dcc970 100644
--- a/boards/nordic/nrf9280pdk/support/nrf9280_cpurad.JLinkScript
+++ b/boards/nordic/nrf9280pdk/support/nrf9280_cpurad.JLinkScript
@@ -1,6 +1,159 @@
+// Constants specific to the radio core
 __constant U32 _CPUCONF_ADDR = 0x53011000;
+__constant U32 _PROCESSOR_ID = 3;
+__constant U32 _DOMAIN_ID = 3;
+__constant U32 _NUM_OTHER_PROCESSORS = 2;
+const U32 _OTHER_PROCESSOR_IDS[2] = {4, 2};
+
+// Debug Halting Control and Status Register
+__constant U32 _DHCSR_ADDR = 0xE000EDF0;
+__constant U32 _DHCSR_DBGKEY = (0xA05F << 16);
+__constant U32 _DHCSR_C_DEBUGEN = (1 << 0);
+__constant U32 _DHCSR_C_HALT = (1 << 1);
+
+// Debug Exception and Monitor Control Register
+__constant U32 _DEMCR_ADDR = 0xE000EDFC;
+__constant U32 _DEMCR_VC_CORERESET = (1 << 0);
+__constant U32 _DEMCR_TRCENA = (1 << 24);
+
+// CPU wait enable register
 __constant U32 _CPUCONF_CPUWAIT_OFFSET = 0x50C;
 
+// CTRL-AP
+__constant U32 _CTRLAP_ID = 4;
+__constant U32 _CTRLAP_READY_BANK = 0;
+__constant U32 _CTRLAP_READY_OFFSET = 1;
+__constant U32 _CTRLAP_READY = 0;
+__constant U32 _CTRLAP_MAILBOX_BANK = 1;
+__constant U32 _CTRLAP_MAILBOX_TXDATA_OFFSET = 0;
+__constant U32 _CTRLAP_MAILBOX_TXSTATUS_OFFSET = 1;
+__constant U32 _CTRLAP_MAILBOX_RXDATA_OFFSET = 2;
+__constant U32 _CTRLAP_MAILBOX_RXSTATUS_OFFSET = 3;
+__constant U32 _CTRLAP_MAILBOX_NO_DATA_PENDING = 0;
+__constant U32 _CTRLAP_MAILBOX_DATA_PENDING = 1;
+__constant int _CTRLAP_TIMEOUT_MS = 500;
+
+// ADAC transaction buffers
+static U32 _adacTx[20];
+static U32 _adacRx[20];
+
+// Failed to send to the CTRL-AP MAILBOX
+__constant int _ERR_TX = -1;
+// Failed to receive from the CTRL-AP MAILBOX
+__constant int _ERR_RX = -2;
+// ADAC command returned an error
+__constant int _ERR_REPLY = -3;
+
+// Wait for an AP register read to return the expected value.
+int _WaitForDataStatus(U32 regOffset, int expectedStatus)
+{
+	int status;
+	int ret;
+	int start;
+	int elapsed;
+
+	status = 0;
+	start = JLINK_GetTime();
+	elapsed = 0;
+
+	do {
+		ret = JLINK_CORESIGHT_ReadDAP(regOffset, 1, &status);
+		elapsed = JLINK_GetTime() - start;
+	} while ((ret < 0 || status != expectedStatus) && (elapsed < _CTRLAP_TIMEOUT_MS));
+
+	if (ret < 0) {
+		return ret;
+	}
+
+	return status;
+}
+
+// Continuously read from the CTRL-AP MAILBOX until there is no more pending data.
+void _DrainMailbox(void)
+{
+	int ret;
+	int status;
+	int data;
+
+	ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
+	while (ret >= 0 && status == _CTRLAP_MAILBOX_DATA_PENDING) {
+		JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
+		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
+	}
+}
+
+// Perform an ADAC transaction by:
+// * writing the given sequence of words to MAILBOX.TXDATATA, waiting for MAILBOX.TXSTATUS
+//   readiness before each write.
+// * reading a sequence of words from MAILBOX.RXDATA, waiting for MAILBOX.RXSTATUS readiness before
+//   each read.
+//
+// The message to send is read from _adacTx and the reply is written to _adacRx.
+// Optionally checks if a single data word is returned and returns an error if it is non-zero.
+//
+// Assumes that the correct AP and AP bank for CTRL-AP MAILBOX has been selected in the DP.
+int _DoAdacTransaction(int checkReplyStatus)
+{
+	int numWords;
+	int ret;
+	int data;
+	int i;
+
+	i = 0;
+	numWords = 2 + (_adacTx[1] >> 2); // Length based on the length field of the message
+
+	while (i < numWords) {
+		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_TXSTATUS_OFFSET,
+					 _CTRLAP_MAILBOX_NO_DATA_PENDING);
+		if (ret != _CTRLAP_MAILBOX_NO_DATA_PENDING) {
+			JLINK_SYS_Report1("Timed out waiting for CTRL-AP TX readiness - result: ",
+					  ret);
+			return _ERR_TX;
+		}
+
+		ret = JLINK_CORESIGHT_WriteDAP(_CTRLAP_MAILBOX_TXDATA_OFFSET, 1, _adacTx[i]);
+		if (ret < 0) {
+			JLINK_SYS_Report1("Failed to write CTRL-AP TX data - result: ", ret);
+			return _ERR_TX;
+		}
+
+		i += 1;
+	}
+
+	i = 0;
+	numWords = 2; // Minimum message length
+
+	while (i < numWords) {
+		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_RXSTATUS_OFFSET,
+					 _CTRLAP_MAILBOX_DATA_PENDING);
+		if (ret != _CTRLAP_MAILBOX_DATA_PENDING) {
+			JLINK_SYS_Report1("Timed out waiting for CTRL-AP RX data - result: ", ret);
+			return _ERR_RX;
+		}
+
+		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
+		if (ret < 0) {
+			JLINK_SYS_Report1("Failed to read CTRL-AP RX data - result: ", ret);
+			return _ERR_RX;
+		}
+
+		if (i == 1) {
+			// Update total length based on the message length field
+			numWords = 2 + (data >> 2);
+		}
+
+		_adacRx[i] = data;
+		i += 1;
+	}
+
+	if (checkReplyStatus && _adacRx[1] == 4 && _adacRx[2] != 0) {
+		JLINK_SYS_Report1("ADAC command failed with status: ", _adacRx[2]);
+		return _ERR_REPLY;
+	}
+
+	return 0;
+}
+
 int ConfigTargetSettings(void)
 {
 	JLINK_ExecCommand("CORESIGHT_AddAP = Index=1 Type=AHB-AP");
@@ -9,12 +162,107 @@ int ConfigTargetSettings(void)
 	return 0;
 }
 
-int SetupTarget(void)
+int ResetTarget(void)
 {
-	JLINK_TARGET_Halt();
+	int err;
+	U32 adacMajorVersion;
+	U32 i;
+
+	// Select CTRL-AP bank 0, used for the READY register
+	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
+				 (_CTRLAP_ID << 24) | (_CTRLAP_READY_BANK << 4));
+
+	// Wait for the READY register to indicate that the AP can be used.
+	err = _WaitForDataStatus(_CTRLAP_READY_OFFSET, _CTRLAP_READY);
+	if (err < 0) {
+		JLINK_SYS_Report1("Timed out waiting for CTRL-AP readiness - result: ", err);
+		return -1;
+	}
+
+	// Select CTRL-AP bank 1, used for the MAILBOX registers for ADAC communication
+	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
+				 (_CTRLAP_ID << 24) | (_CTRLAP_MAILBOX_BANK << 4));
+
+	// Extract any pre-existing data from the mailbox in case there was previously
+	// an aborted transaction.
+	_DrainMailbox();
+
+	// Read the ADAC version
+	_adacTx[0] = 0xA3000000; // Command VERSION
+	_adacTx[1] = 0x00000004; // Data length 4 bytes
+	_adacTx[2] = 0x00000000; // Type 0 (ADAC version)
+	err = _DoAdacTransaction(0);
+	if (err < 0) {
+		return -1;
+	}
+
+	adacMajorVersion = (_adacRx[2] >> 24) & 0xff;
+	JLINK_SYS_Report1("ADAC major version: ", adacMajorVersion);
+
+	if (adacMajorVersion >= 2) {
+		// There is a very small chance that this command fails if the domain reset itself
+		// at the exact same time the command was issued. Therefore we retry a few times.
+		i = 0;
+		while (i < 3) {
+			// Reset non-essential domains
+			_adacTx[0] = 0xA30A0000; // Command RESET
+			_adacTx[1] = 0x00000004; // Data length 4 bytes
+			_adacTx[2] = 0x00000000; // (reserved)
+			err = _DoAdacTransaction(1);
+			if (err >= 0) {
+				break;
+			} else if (err != _ERR_REPLY) {
+				return -1;
+			}
+
+			i = i + 1;
+		}
+
+		// Start the core in halted mode
+		_adacTx[0] = 0xA3090000;                         // Command START
+		_adacTx[1] = 0x00000004;                         // Data length 4 bytes
+		_adacTx[2] = 0x01000000 | (_PROCESSOR_ID << 16); // Own processor, Flags HALT
+		err = _DoAdacTransaction(1);
+		if (err < 0) {
+			return -1;
+		}
+
+		// Start other cores normally (will fail silently if no firmware is present)
+		i = 0;
+		while (i < _NUM_OTHER_PROCESSORS) {
+			_adacTx[0] = 0xA3090000; // Command START
+			_adacTx[1] = 0x00000004; // Data length 4 bytes
+			_adacTx[2] = 0x00000000 |
+				     (_OTHER_PROCESSOR_IDS[i] << 16); // Other processor, No flags
+			err = _DoAdacTransaction(0);
+			if (err < 0 && err != _ERR_REPLY) {
+				return -1;
+			}
+
+			i = i + 1;
+		}
+	} else {
+		// Reset single domain via legacy implementation
+		_adacTx[0] = 0xA3030000;                      // Command RESET
+		_adacTx[1] = 0x00000004;                      // Data length 4 bytes
+		_adacTx[2] = 0x01000000 | (_DOMAIN_ID << 16); // Own domain, Mode HALT
+		err = _DoAdacTransaction(1);
+		if (err < 0) {
+			return -1;
+		}
+	}
+
+	// Halt the CPU
+	JLINK_MEM_WriteU32(_DHCSR_ADDR, (_DHCSR_DBGKEY | _DHCSR_C_HALT | _DHCSR_C_DEBUGEN));
+
+	// Set vector catch on reset (to halt the CPU immediately after reset)
+	JLINK_MEM_WriteU32(_DEMCR_ADDR, (_DEMCR_VC_CORERESET | _DEMCR_TRCENA));
 
 	// Disable CPU wait
 	JLINK_MEM_WriteU32(_CPUCONF_ADDR + _CPUCONF_CPUWAIT_OFFSET, 0);
 
+	// Clear vector catch stuff
+	JLINK_MEM_WriteU32(_DEMCR_ADDR, _DEMCR_TRCENA);
+
 	return 0;
 }

From 60c504f96f65c8d49ff0173741b54073d1aabae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:09 +0100
Subject: [PATCH 1127/2913] Revert "[nrf noup] tests: drivers: mspi: api: Add
 nRF54L15 overlay file"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit abc79660847ec81cb4a0f004221508e78b70cf06.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 24 -------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 3d5db366dc5..00000000000
--- a/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	aliases {
-		mspi0 = &sdp_mspi;
-	};
-};
-
-&cpuflpr_vpr {
-	status = "okay";
-
-	sdp_mspi: sdp_mspi {
-		mspi_device: mspi_device@0 {
-			status = "okay";
-			compatible = "zephyr,mspi-emul-device";
-			reg = <0x0>;
-			mspi-max-frequency = <48000000>;
-		};
-	};
-};

From d8420bdf478c00e8c8a420dff65add616ab5dee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:09 +0100
Subject: [PATCH 1128/2913] Revert "[nrf noup] drivers: pinctrl: Add SDP MSPI
 pin configuration"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2540f7b5b204c54738e32f694bbddf43b35aae28.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/pinctrl/pinctrl_nrf.c                 | 29 -------------------
 .../zephyr/dt-bindings/pinctrl/nrf-pinctrl.h  | 28 ------------------
 2 files changed, 57 deletions(-)

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 48303bd59c9..68ff6d8d7e4 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -103,13 +103,6 @@ static const nrf_gpio_pin_drive_t drive_modes[NRF_DRIVE_COUNT] = {
 #endif
 #endif
 
-#if defined(CONFIG_SOC_NRF54L15_CPUAPP)
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller) || defined(CONFIG_MSPI_NRFE)
-#define NRF_PSEL_SDP_MSPI(psel)                                                                    \
-	nrf_gpio_pin_control_select(psel, NRF_GPIO_PIN_SEL_VPR);
-#endif
-#endif
-
 int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			   uintptr_t reg)
 {
@@ -400,28 +393,6 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
 			break;
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) */
-#if defined(CONFIG_SOC_NRF54L15_CPUAPP)
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller)
-		case NRF_FUN_SDP_MSPI_CS0:
-		case NRF_FUN_SDP_MSPI_CS1:
-		case NRF_FUN_SDP_MSPI_CS2:
-		case NRF_FUN_SDP_MSPI_CS3:
-		case NRF_FUN_SDP_MSPI_CS4:
-		case NRF_FUN_SDP_MSPI_SCK:
-		case NRF_FUN_SDP_MSPI_DQ0:
-		case NRF_FUN_SDP_MSPI_DQ1:
-		case NRF_FUN_SDP_MSPI_DQ2:
-		case NRF_FUN_SDP_MSPI_DQ3:
-		case NRF_FUN_SDP_MSPI_DQ4:
-		case NRF_FUN_SDP_MSPI_DQ5:
-		case NRF_FUN_SDP_MSPI_DQ6:
-		case NRF_FUN_SDP_MSPI_DQ7:
-			NRF_PSEL_SDP_MSPI(psel);
-			dir = NRF_GPIO_PIN_DIR_OUTPUT;
-			input = NRF_GPIO_PIN_INPUT_CONNECT;
-			break;
-#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller) */
-#endif /* CONFIG_SOC_NRF54L15_CPUAPP */
 		default:
 			return -ENOTSUP;
 		}
diff --git a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
index e637a46cb18..49c06f3668c 100644
--- a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
@@ -168,34 +168,6 @@
 #define NRF_FUN_GRTC_CLKOUT_FAST 55U
 /** GRTC slow clock output */
 #define NRF_FUN_GRTC_CLKOUT_32K  56U
-/** SDP_MSPI CK */
-#define NRF_FUN_SDP_MSPI_SCK 57U
-/** SDP_MSPI DQ0 */
-#define NRF_FUN_SDP_MSPI_DQ0 58U
-/** SDP_MSPI DQ1 */
-#define NRF_FUN_SDP_MSPI_DQ1 59U
-/** SDP_MSPI DQ2 */
-#define NRF_FUN_SDP_MSPI_DQ2 60U
-/** SDP_MSPI DQ3 */
-#define NRF_FUN_SDP_MSPI_DQ3 61U
-/** SDP_MSPI DQ4 */
-#define NRF_FUN_SDP_MSPI_DQ4 62U
-/** SDP_MSPI DQ5 */
-#define NRF_FUN_SDP_MSPI_DQ5 63U
-/** SDP_MSPI DQ6 */
-#define NRF_FUN_SDP_MSPI_DQ6 64U
-/** SDP_MSPI DQ7 */
-#define NRF_FUN_SDP_MSPI_DQ7 65U
-/** SDP_MSPI CS0 */
-#define NRF_FUN_SDP_MSPI_CS0 66U
-/** SDP_MSPI CS1 */
-#define NRF_FUN_SDP_MSPI_CS1 67U
-/** SDP_MSPI CS2 */
-#define NRF_FUN_SDP_MSPI_CS2 68U
-/** SDP_MSPI CS3 */
-#define NRF_FUN_SDP_MSPI_CS3 69U
-/** SDP_MSPI CS4 */
-#define NRF_FUN_SDP_MSPI_CS4 70U
 
 /** @} */
 

From 4b3109fa547edb84d448917207081f31cd69dbfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:09 +0100
Subject: [PATCH 1129/2913] Revert "[nrf fromlist] tests: drivers: mspi: make
 MSPI API test more generic"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cebd9f27c8597ac5dc904beab3e6ea05928a6c14.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/drivers/mspi/api/src/main.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/tests/drivers/mspi/api/src/main.c b/tests/drivers/mspi/api/src/main.c
index a0bdc1c44f5..d6b632f29c1 100644
--- a/tests/drivers/mspi/api/src/main.c
+++ b/tests/drivers/mspi/api/src/main.c
@@ -51,17 +51,13 @@ static struct mspi_dev_cfg device_cfg[] = {
 	DT_FOREACH_CHILD_STATUS_OKAY_SEP(MSPI_BUS_NODE, MSPI_DEVICE_CONFIG_DT, (,))
 };
 
-#if CONFIG_MSPI_XIP
 static struct mspi_xip_cfg xip_cfg[] = {
 	DT_FOREACH_CHILD_STATUS_OKAY_SEP(MSPI_BUS_NODE, MSPI_XIP_CONFIG_DT, (,))
 };
-#endif
 
-#if CONFIG_MSPI_SCRAMBLE
 static struct mspi_scramble_cfg scramble_cfg[] = {
 	DT_FOREACH_CHILD_STATUS_OKAY_SEP(MSPI_BUS_NODE, MSPI_SCRAMBLE_CONFIG_DT, (,))
 };
-#endif
 
 ZTEST(mspi_api, test_mspi_api)
 {
@@ -108,11 +104,7 @@ ZTEST(mspi_api, test_mspi_api)
 
 		ret = mspi_register_callback(mspi_bus, &dev_id[dev_idx],
 					     MSPI_BUS_XFER_COMPLETE, NULL, NULL);
-		if (ret == -ENOTSUP) {
-			printf("mspi_register_callback not supported.\n");
-		} else {
-			zassert_equal(ret, 0, "mspi_register_callback failed.");
-		}
+		zassert_equal(ret, 0, "mspi_register_callback failed.");
 
 		ret = mspi_get_channel_status(mspi_bus, 0);
 		zassert_equal(ret, 0, "mspi_get_channel_status failed.");

From 810448f6381b394ca79f0f7a221c9f5073603787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:09 +0100
Subject: [PATCH 1130/2913] Revert "[nrf fromtree] tests: drivers: gpio:
 gpio_basic_api: Enable test on nrf54l20pdk"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9761d261943a916443cf6c748ee3daa2915e3546.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay

diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
deleted file mode 100644
index 8eb1b3c9f9f..00000000000
--- a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	resources {
-		compatible = "test-gpio-basic-api";
-		out-gpios = <&gpio1 10 0>;
-		in-gpios = <&gpio1 11 0>;
-	};
-};
-
-&gpiote20 {
-	status = "okay";
-};
-
-&gpio1 {
-	status = "okay";
-};

From d311896a9e758e82d06d563bde8413f2fd542a85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:09 +0100
Subject: [PATCH 1131/2913] Revert "[nrf fromtree] dts: nordic: Add SUIT
 storage partition for nRF9280 SiP"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ebcb537514335164911127aa2b3dffd330239307.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/common/nordic/nrf9280.dtsi | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 9e25f9837ba..1222f3675ec 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -74,10 +74,6 @@
 	reserved-memory {
 		#address-cells = <1>;
 		#size-cells = <1>;
-
-		suit_storage_partition: memory@e6b7000 {
-			reg = <0xe6b7000 DT_SIZE_K(40)>;
-		};
 	};
 
 	clocks {

From 2bc735a94b054e2eb6b8dceeac6dd240ed3832c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:09 +0100
Subject: [PATCH 1132/2913] Revert "[nrf fromtree] tests: bluetooth: buf: Test
 the freed buf callback"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7f8d857bf1f57b07e832d52263beaa23c91fef24.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/bluetooth/buf/CMakeLists.txt |  8 ----
 tests/bluetooth/buf/prj.conf       | 10 -----
 tests/bluetooth/buf/src/main.c     | 72 ------------------------------
 tests/bluetooth/buf/testcase.yaml  | 30 -------------
 4 files changed, 120 deletions(-)
 delete mode 100644 tests/bluetooth/buf/CMakeLists.txt
 delete mode 100644 tests/bluetooth/buf/prj.conf
 delete mode 100644 tests/bluetooth/buf/src/main.c
 delete mode 100644 tests/bluetooth/buf/testcase.yaml

diff --git a/tests/bluetooth/buf/CMakeLists.txt b/tests/bluetooth/buf/CMakeLists.txt
deleted file mode 100644
index 3da24b0b551..00000000000
--- a/tests/bluetooth/buf/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(buf)
-
-target_sources(app PRIVATE src/main.c)
diff --git a/tests/bluetooth/buf/prj.conf b/tests/bluetooth/buf/prj.conf
deleted file mode 100644
index 697529ffb9d..00000000000
--- a/tests/bluetooth/buf/prj.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG_TEST=y
-CONFIG_ZTEST=y
-
-CONFIG_BT=y
-CONFIG_BT_CTLR=n
-CONFIG_BT_H4=n
-
-# Needed to enable and test the iso rx pool
-CONFIG_BT_OBSERVER=y
-CONFIG_BT_ISO_SYNC_RECEIVER=y
diff --git a/tests/bluetooth/buf/src/main.c b/tests/bluetooth/buf/src/main.c
deleted file mode 100644
index 36b57a0e3f9..00000000000
--- a/tests/bluetooth/buf/src/main.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-
-#include <errno.h>
-#include <zephyr/tc_util.h>
-#include <zephyr/ztest.h>
-
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/buf.h>
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/drivers/bluetooth.h>
-#include <zephyr/sys/byteorder.h>
-
-static enum bt_buf_type freed_buf_type;
-static K_SEM_DEFINE(rx_sem, 0, 1);
-
-void bt_buf_rx_freed_cb(enum bt_buf_type type)
-{
-	freed_buf_type = type;
-	k_sem_give(&rx_sem);
-}
-
-ZTEST_SUITE(test_buf_data_api, NULL, NULL, NULL, NULL, NULL);
-
-ZTEST(test_buf_data_api, test_buf_freed_cb)
-{
-	struct net_buf *buf;
-	int err;
-
-	bt_buf_rx_freed_cb_set(bt_buf_rx_freed_cb);
-
-	/* Test that the callback is called for the BT_BUF_EVT type */
-	buf = bt_buf_get_rx(BT_BUF_EVT, K_NO_WAIT);
-	zassert_not_null(buf, "Failed to get event buffer");
-
-	net_buf_unref(buf);
-	/* The freed buf cb is called from net_buf_unref, therefore the semaphore should
-	 * already by given.
-	 */
-	err = k_sem_take(&rx_sem, K_NO_WAIT);
-	zassert_equal(err, 0, "Timeout while waiting for event buffer to be freed");
-	zassert_equal(BT_BUF_EVT, BT_BUF_EVT & freed_buf_type, "Event buffer wasn't freed");
-
-	/* Test that the callback is called for the BT_BUF_ACL_IN type */
-	buf = bt_buf_get_rx(BT_BUF_ACL_IN, K_NO_WAIT);
-	zassert_not_null(buf, "Failed to get ACL buffer");
-
-	net_buf_unref(buf);
-	/* The freed buf cb is called from net_buf_unref, therefore the semaphore should
-	 * already by given.
-	 */
-	err = k_sem_take(&rx_sem, K_NO_WAIT);
-	zassert_equal(err, 0, "Timeout while waiting for ACL buffer to be freed");
-	zassert_equal(BT_BUF_ACL_IN, BT_BUF_ACL_IN & freed_buf_type, "ACL buffer wasn't freed");
-
-	/* Test that the callback is called for the BT_BUF_ISO_IN type */
-	buf = bt_buf_get_rx(BT_BUF_ISO_IN, K_NO_WAIT);
-	zassert_not_null(buf, "Failed to get ISO buffer");
-
-	net_buf_unref(buf);
-	/* The freed buf cb is called from net_buf_unref, therefore the semaphore should
-	 * already by given.
-	 */
-	err = k_sem_take(&rx_sem, K_NO_WAIT);
-	zassert_equal(err, 0, "Timeout while waiting for ISO buffer to be freed");
-	zassert_equal(BT_BUF_ISO_IN, BT_BUF_ISO_IN & freed_buf_type, "ISO buffer wasn't freed");
-}
diff --git a/tests/bluetooth/buf/testcase.yaml b/tests/bluetooth/buf/testcase.yaml
deleted file mode 100644
index 418d357d4fb..00000000000
--- a/tests/bluetooth/buf/testcase.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-common:
-  tags:
-    - bluetooth
-    - host
-
-tests:
-  bluetooth.buf:
-    platform_allow:
-      - native_sim
-      - native_sim/native/64
-    integration_platforms:
-      - native_sim
-    extra_configs:
-      - CONFIG_BT_HCI_ACL_FLOW_CONTROL=y
-  bluetooth.buf.no_acl_flow_control:
-    platform_allow:
-      - native_sim
-      - native_sim/native/64
-    integration_platforms:
-      - native_sim
-    extra_configs:
-      - CONFIG_BT_HCI_ACL_FLOW_CONTROL=n
-  bluetooth.buf.hci_raw:
-    platform_allow:
-      - native_sim
-      - native_sim/native/64
-    integration_platforms:
-      - native_sim
-    extra_configs:
-      - CONFIG_BT_HCI_RAW=y

From 019cdca6eb0e15d5cd974a811b6308cfa4cc3bf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:09 +0100
Subject: [PATCH 1133/2913] Revert "[nrf fromtree] bluetooth: buf: Add a
 callback for freed buffer in rx pool"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e2c77de94dc31afde4fdf80b614001b26d8988da.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/buf.h       | 21 --------
 subsys/bluetooth/host/buf.c          | 71 ++++------------------------
 subsys/bluetooth/host/hci_raw.c      | 21 +-------
 subsys/bluetooth/host/iso.c          | 19 +-------
 subsys/bluetooth/host/iso_internal.h | 10 ----
 5 files changed, 12 insertions(+), 130 deletions(-)

diff --git a/include/zephyr/bluetooth/buf.h b/include/zephyr/bluetooth/buf.h
index dd452342ef7..8109950d70e 100644
--- a/include/zephyr/bluetooth/buf.h
+++ b/include/zephyr/bluetooth/buf.h
@@ -138,27 +138,6 @@ BUILD_ASSERT(BT_BUF_ACL_RX_COUNT <= BT_BUF_ACL_RX_COUNT_MAX,
  */
 struct net_buf *bt_buf_get_rx(enum bt_buf_type type, k_timeout_t timeout);
 
-/** A callback to notify about freed buffer in the incoming data pool.
- *
- * This callback is called when a buffer of a given type is freed and can be requested through the
- * @ref bt_buf_get_rx function. However, this callback is called from the context of the buffer
- * freeing operation and must not attempt to allocate a new buffer from the same pool.
- *
- * @warning When this callback is called, the scheduler is locked and the callee must not perform
- * any action that makes the current thread unready. This callback must only be used for very
- * short non-blocking operation (e.g. submitting a work item).
- *
- * @param type_mask A bit mask of buffer types that have been freed.
- */
-typedef void (*bt_buf_rx_freed_cb_t)(enum bt_buf_type type_mask);
-
-/** Set the callback to notify about freed buffer in the incoming data pool.
- *
- * @param cb Callback to notify about freed buffer in the incoming data pool. If NULL, the callback
- *           is disabled.
- */
-void bt_buf_rx_freed_cb_set(bt_buf_rx_freed_cb_t cb);
-
 /** Allocate a buffer for outgoing data
  *
  *  This will set the buffer type so bt_buf_set_type() does not need to
diff --git a/subsys/bluetooth/host/buf.c b/subsys/bluetooth/host/buf.c
index 75bd15834ae..b7ed19303be 100644
--- a/subsys/bluetooth/host/buf.c
+++ b/subsys/bluetooth/host/buf.c
@@ -25,26 +25,6 @@ LOG_MODULE_REGISTER(bt_buf, CONFIG_BT_LOG_LEVEL);
  */
 #define SYNC_EVT_SIZE (BT_BUF_RESERVE + BT_HCI_EVT_HDR_SIZE + 255)
 
-static bt_buf_rx_freed_cb_t buf_rx_freed_cb;
-
-static void buf_rx_freed_notify(enum bt_buf_type mask)
-{
-	k_sched_lock();
-
-	if (buf_rx_freed_cb) {
-		buf_rx_freed_cb(mask);
-	}
-
-	k_sched_unlock();
-}
-
-#if defined(CONFIG_BT_ISO_RX)
-static void iso_rx_freed_cb(void)
-{
-	buf_rx_freed_notify(BT_BUF_ISO_IN);
-}
-#endif
-
 /* Pool for RX HCI buffers that are always freed by `bt_recv`
  * before it returns.
  *
@@ -60,37 +40,17 @@ NET_BUF_POOL_FIXED_DEFINE(discardable_pool, CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT,
 			  sizeof(struct bt_buf_data), NULL);
 
 #if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
-static void acl_in_pool_destroy(struct net_buf *buf)
-{
-	bt_hci_host_num_completed_packets(buf);
-	buf_rx_freed_notify(BT_BUF_ACL_IN);
-}
+NET_BUF_POOL_DEFINE(acl_in_pool, BT_BUF_ACL_RX_COUNT,
+		    BT_BUF_ACL_SIZE(CONFIG_BT_BUF_ACL_RX_SIZE),
+		    sizeof(struct acl_data), bt_hci_host_num_completed_packets);
 
-static void evt_pool_destroy(struct net_buf *buf)
-{
-	net_buf_destroy(buf);
-	buf_rx_freed_notify(BT_BUF_EVT);
-}
-
-NET_BUF_POOL_DEFINE(acl_in_pool, BT_BUF_ACL_RX_COUNT, BT_BUF_ACL_SIZE(CONFIG_BT_BUF_ACL_RX_SIZE),
-		    sizeof(struct acl_data), acl_in_pool_destroy);
-
-NET_BUF_POOL_FIXED_DEFINE(evt_pool, CONFIG_BT_BUF_EVT_RX_COUNT, BT_BUF_EVT_RX_SIZE,
-			  sizeof(struct bt_buf_data), evt_pool_destroy);
+NET_BUF_POOL_FIXED_DEFINE(evt_pool, CONFIG_BT_BUF_EVT_RX_COUNT,
+			  BT_BUF_EVT_RX_SIZE, sizeof(struct bt_buf_data),
+			  NULL);
 #else
-static void hci_rx_pool_destroy(struct net_buf *buf)
-{
-	net_buf_destroy(buf);
-
-	/* When ACL Flow Control is disabled, a single pool is used for events and acl data.
-	 * Therefore the callback will always notify about both types of buffers, BT_BUF_EVT and
-	 * BT_BUF_ACL_IN.
-	 */
-	buf_rx_freed_notify(BT_BUF_EVT | BT_BUF_ACL_IN);
-}
-
-NET_BUF_POOL_FIXED_DEFINE(hci_rx_pool, BT_BUF_RX_COUNT, BT_BUF_RX_SIZE, sizeof(struct acl_data),
-			  hci_rx_pool_destroy);
+NET_BUF_POOL_FIXED_DEFINE(hci_rx_pool, BT_BUF_RX_COUNT,
+			  BT_BUF_RX_SIZE, sizeof(struct acl_data),
+			  NULL);
 #endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
 
 struct net_buf *bt_buf_get_rx(enum bt_buf_type type, k_timeout_t timeout)
@@ -122,19 +82,6 @@ struct net_buf *bt_buf_get_rx(enum bt_buf_type type, k_timeout_t timeout)
 	return buf;
 }
 
-void bt_buf_rx_freed_cb_set(bt_buf_rx_freed_cb_t cb)
-{
-	k_sched_lock();
-
-	buf_rx_freed_cb = cb;
-
-#if defined(CONFIG_BT_ISO_RX)
-	bt_iso_buf_rx_freed_cb_set(cb != NULL ? iso_rx_freed_cb : NULL);
-#endif
-
-	k_sched_unlock();
-}
-
 struct net_buf *bt_buf_get_evt(uint8_t evt, bool discardable,
 			       k_timeout_t timeout)
 {
diff --git a/subsys/bluetooth/host/hci_raw.c b/subsys/bluetooth/host/hci_raw.c
index cf50f406d8f..984c8607ee6 100644
--- a/subsys/bluetooth/host/hci_raw.c
+++ b/subsys/bluetooth/host/hci_raw.c
@@ -39,20 +39,8 @@ static uint8_t raw_mode = BT_HCI_RAW_MODE_H4;
 static uint8_t raw_mode;
 #endif
 
-static bt_buf_rx_freed_cb_t buf_rx_freed_cb;
-
-static void hci_rx_buf_destroy(struct net_buf *buf)
-{
-	net_buf_destroy(buf);
-
-	if (buf_rx_freed_cb) {
-		/* bt_buf_get_rx is used for all types of RX buffers */
-		buf_rx_freed_cb(BT_BUF_EVT | BT_BUF_ACL_IN | BT_BUF_ISO_IN);
-	}
-}
-
-NET_BUF_POOL_FIXED_DEFINE(hci_rx_pool, BT_BUF_RX_COUNT, BT_BUF_RX_SIZE, sizeof(struct bt_buf_data),
-			  hci_rx_buf_destroy);
+NET_BUF_POOL_FIXED_DEFINE(hci_rx_pool, BT_BUF_RX_COUNT,
+			  BT_BUF_RX_SIZE, sizeof(struct bt_buf_data), NULL);
 NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, CONFIG_BT_BUF_CMD_TX_COUNT,
 			  BT_BUF_CMD_SIZE(CONFIG_BT_BUF_CMD_TX_SIZE),
 			  sizeof(struct bt_buf_data), NULL);
@@ -124,11 +112,6 @@ struct net_buf *bt_buf_get_rx(enum bt_buf_type type, k_timeout_t timeout)
 	return buf;
 }
 
-void bt_buf_rx_freed_cb_set(bt_buf_rx_freed_cb_t cb)
-{
-	buf_rx_freed_cb = cb;
-}
-
 struct net_buf *bt_buf_get_tx(enum bt_buf_type type, k_timeout_t timeout,
 			      const void *data, size_t size)
 {
diff --git a/subsys/bluetooth/host/iso.c b/subsys/bluetooth/host/iso.c
index 26440c22a8a..3cbb06011d3 100644
--- a/subsys/bluetooth/host/iso.c
+++ b/subsys/bluetooth/host/iso.c
@@ -51,20 +51,8 @@ LOG_MODULE_REGISTER(bt_iso, CONFIG_BT_ISO_LOG_LEVEL);
 #define iso_chan(_iso) ((_iso)->iso.chan);
 
 #if defined(CONFIG_BT_ISO_RX)
-static bt_iso_buf_rx_freed_cb_t buf_rx_freed_cb;
-
-static void iso_rx_buf_destroy(struct net_buf *buf)
-{
-	net_buf_destroy(buf);
-
-	if (buf_rx_freed_cb) {
-		buf_rx_freed_cb();
-	}
-}
-
 NET_BUF_POOL_FIXED_DEFINE(iso_rx_pool, CONFIG_BT_ISO_RX_BUF_COUNT,
-			  BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_RX_MTU), sizeof(struct iso_data),
-			  iso_rx_buf_destroy);
+			  BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_RX_MTU), sizeof(struct iso_data), NULL);
 
 static struct bt_iso_recv_info iso_info_data[CONFIG_BT_ISO_RX_BUF_COUNT];
 #define iso_info(buf) (&iso_info_data[net_buf_id(buf)])
@@ -593,11 +581,6 @@ struct net_buf *bt_iso_get_rx(k_timeout_t timeout)
 	return buf;
 }
 
-void bt_iso_buf_rx_freed_cb_set(bt_iso_buf_rx_freed_cb_t cb)
-{
-	buf_rx_freed_cb = cb;
-}
-
 void bt_iso_recv(struct bt_conn *iso, struct net_buf *buf, uint8_t flags)
 {
 	struct bt_hci_iso_sdu_hdr *hdr;
diff --git a/subsys/bluetooth/host/iso_internal.h b/subsys/bluetooth/host/iso_internal.h
index 765c336c9db..c997f81f517 100644
--- a/subsys/bluetooth/host/iso_internal.h
+++ b/subsys/bluetooth/host/iso_internal.h
@@ -87,16 +87,6 @@ void hci_iso(struct net_buf *buf);
 /* Allocates RX buffer */
 struct net_buf *bt_iso_get_rx(k_timeout_t timeout);
 
-/** A callback used to notify about freed buffer in the iso rx pool. */
-typedef void (*bt_iso_buf_rx_freed_cb_t)(void);
-
-/** Set a callback to notify about freed buffer in the iso rx pool.
- *
- * @param cb Callback to notify about freed buffer in the iso rx pool. If NULL, the callback is
- *           disabled.
- */
-void bt_iso_buf_rx_freed_cb_set(bt_iso_buf_rx_freed_cb_t cb);
-
 /* Process CIS Established event */
 void hci_le_cis_established(struct net_buf *buf);
 

From 47c14bd5e4c7e9c462f1945cec7bc512028ca36f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:09 +0100
Subject: [PATCH 1134/2913] Revert "[nrf fromtree] bluetooth: buf: Convert
 bt_buf_type enum to bitmask"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e9cc271b438f2fbef9479dcfb3af965a556eb3ce.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/buf.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/zephyr/bluetooth/buf.h b/include/zephyr/bluetooth/buf.h
index 8109950d70e..c5ad4ddf9a8 100644
--- a/include/zephyr/bluetooth/buf.h
+++ b/include/zephyr/bluetooth/buf.h
@@ -28,22 +28,22 @@
 extern "C" {
 #endif
 
-/** Possible types of buffers passed around the Bluetooth stack in a form of bitmask. */
+/** Possible types of buffers passed around the Bluetooth stack */
 enum bt_buf_type {
 	/** HCI command */
-	BT_BUF_CMD = BIT(0),
+	BT_BUF_CMD,
 	/** HCI event */
-	BT_BUF_EVT = BIT(1),
+	BT_BUF_EVT,
 	/** Outgoing ACL data */
-	BT_BUF_ACL_OUT = BIT(2),
+	BT_BUF_ACL_OUT,
 	/** Incoming ACL data */
-	BT_BUF_ACL_IN = BIT(3),
+	BT_BUF_ACL_IN,
 	/** Outgoing ISO data */
-	BT_BUF_ISO_OUT = BIT(4),
+	BT_BUF_ISO_OUT,
 	/** Incoming ISO data */
-	BT_BUF_ISO_IN = BIT(5),
+	BT_BUF_ISO_IN,
 	/** H:4 data */
-	BT_BUF_H4 = BIT(6),
+	BT_BUF_H4,
 };
 
 /** @brief This is a base type for bt_buf user data. */

From 6d14934ff72f0209055d11cefcb656a980d60190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:10 +0100
Subject: [PATCH 1135/2913] Revert "[nrf fromtree] Bluetooth: Host: Deprecate
 `BT_BUF_ACL_RX_COUNT` symbol"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 657e1a385f7bcb7fabc8d1cf3be22cadd67fe46d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/releases/migration-guide-4.1.rst          | 13 --------
 doc/releases/release-notes-4.1.rst            |  3 --
 include/zephyr/bluetooth/buf.h                | 30 +------------------
 samples/bluetooth/central_hr/prj_minimal.conf |  1 +
 samples/bluetooth/central_multilink/prj.conf  |  1 +
 samples/bluetooth/hci_uart_async/prj.conf     |  1 +
 .../bluetooth/mesh/boards/bbc_microbit.conf   |  2 +-
 .../bluetooth/peripheral_hr/prj_minimal.conf  |  1 +
 .../bluetooth/peripheral_identity/prj.conf    |  1 +
 subsys/bluetooth/common/Kconfig               | 17 ++---------
 subsys/bluetooth/common/dummy.c               | 24 +++++++++++++++
 subsys/bluetooth/host/buf.c                   |  2 +-
 subsys/bluetooth/host/classic/rfcomm.c        |  2 +-
 subsys/bluetooth/host/hci_core.c              |  2 +-
 subsys/bluetooth/host/l2cap.c                 |  2 +-
 tests/bluetooth/tester/boards/frdm_rw612.conf |  1 +
 .../bluetooth/tester/boards/rd_rw612_bga.conf |  1 +
 .../host/l2cap/einprogress/src/dut.c          |  4 +--
 .../host/l2cap/reassembly/dut/prj.conf        |  2 +-
 .../bsim/bluetooth/host/l2cap/stress/prj.conf |  1 +
 .../host/l2cap/stress/prj_nofrag.conf         |  1 +
 .../host/l2cap/stress/prj_syswq.conf          |  1 +
 .../host/misc/conn_stress/central/prj.conf    |  1 +
 .../host/misc/hfc_multilink/dut/prj.conf      |  4 +++
 .../host/misc/hfc_multilink/dut/src/dut.c     |  2 +-
 tests/bsim/bluetooth/ll/multiple_id/prj.conf  |  1 +
 26 files changed, 53 insertions(+), 68 deletions(-)

diff --git a/doc/releases/migration-guide-4.1.rst b/doc/releases/migration-guide-4.1.rst
index c033dd9c81c..d35ab96073c 100644
--- a/doc/releases/migration-guide-4.1.rst
+++ b/doc/releases/migration-guide-4.1.rst
@@ -87,19 +87,6 @@ Bluetooth Classic
 Bluetooth Host
 ==============
 
-* :kconfig:option:`CONFIG_BT_BUF_ACL_RX_COUNT` has been deprecated. The number of ACL RX buffers is
-  now computed internally and is equal to :kconfig:option:`CONFIG_BT_MAX_CONN` + 1. If an application
-  needs more buffers, it can use the new :kconfig:option:`CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA` to add
-  additional ones.
-
-  e.g. if :kconfig:option:`CONFIG_BT_MAX_CONN` was ``3`` and
-  :kconfig:option:`CONFIG_BT_BUF_ACL_RX_COUNT` was ``7`` then
-  :kconfig:option:`CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA` should be set to ``7 - (3 + 1) = 3``.
-
-  .. warning::
-
-   The default value of :kconfig:option:`CONFIG_BT_BUF_ACL_RX_COUNT` has been set to 0.
-
 Bluetooth Crypto
 ================
 
diff --git a/doc/releases/release-notes-4.1.rst b/doc/releases/release-notes-4.1.rst
index fb44daad14a..202fdb20489 100644
--- a/doc/releases/release-notes-4.1.rst
+++ b/doc/releases/release-notes-4.1.rst
@@ -53,9 +53,6 @@ Bluetooth
 
 * Host
 
-  * :kconfig:option:`CONFIG_BT_BUF_ACL_RX_COUNT` has been deprecated and
-    :kconfig:option:`CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA` has been added.
-
 * HCI Drivers
 
 Boards & SoC Support
diff --git a/include/zephyr/bluetooth/buf.h b/include/zephyr/bluetooth/buf.h
index c5ad4ddf9a8..fe480196f58 100644
--- a/include/zephyr/bluetooth/buf.h
+++ b/include/zephyr/bluetooth/buf.h
@@ -85,41 +85,13 @@ struct bt_buf_data {
 #define BT_BUF_ISO_RX_COUNT 0
 #endif /* CONFIG_BT_ISO */
 
-/* see Core Spec v6.0 vol.4 part E 7.4.5 */
-#define BT_BUF_ACL_RX_COUNT_MAX 65535
-
-#if defined(CONFIG_BT_CONN) && defined(CONFIG_BT_HCI_HOST)
- /* The host needs more ACL buffers than maximum ACL links. This is because of
-  * the way we re-assemble ACL packets into L2CAP PDUs.
-  *
-  * We keep around the first buffer (that comes from the driver) to do
-  * re-assembly into, and if all links are re-assembling, there will be no buffer
-  * available for the HCI driver to allocate from.
-  *
-  * TODO: When CONFIG_BT_BUF_ACL_RX_COUNT is removed,
-  *       remove the MAX and only keep (CONFIG_BT_MAX_CONN + 1)
-  */
-#define BT_BUF_ACL_RX_COUNT                                                                        \
-	(MAX(CONFIG_BT_BUF_ACL_RX_COUNT, (CONFIG_BT_MAX_CONN + 1)) +                               \
-	 CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA)
-#else
-#define BT_BUF_ACL_RX_COUNT 0
-#endif /* CONFIG_BT_CONN && CONFIG_BT_HCI_HOST */
-
-#if defined(CONFIG_BT_BUF_ACL_RX_COUNT) && CONFIG_BT_BUF_ACL_RX_COUNT > 0
-#warning "CONFIG_BT_BUF_ACL_RX_COUNT is deprecated, see Zephyr 4.1 migration guide"
-#endif /* CONFIG_BT_BUF_ACL_RX_COUNT && CONFIG_BT_BUF_ACL_RX_COUNT > 0 */
-
-BUILD_ASSERT(BT_BUF_ACL_RX_COUNT <= BT_BUF_ACL_RX_COUNT_MAX,
-	     "Maximum number of ACL RX buffer is 65535, reduce CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA");
-
 /** Data size needed for HCI ACL, HCI ISO or Event RX buffers */
 #define BT_BUF_RX_SIZE (MAX(MAX(BT_BUF_ACL_RX_SIZE, BT_BUF_EVT_RX_SIZE), \
 			    BT_BUF_ISO_RX_SIZE))
 
 /** Buffer count needed for HCI ACL, HCI ISO or Event RX buffers */
 #define BT_BUF_RX_COUNT (MAX(MAX(CONFIG_BT_BUF_EVT_RX_COUNT, \
-				 BT_BUF_ACL_RX_COUNT), \
+				 CONFIG_BT_BUF_ACL_RX_COUNT), \
 			     BT_BUF_ISO_RX_COUNT))
 
 /** Data size needed for HCI Command buffers. */
diff --git a/samples/bluetooth/central_hr/prj_minimal.conf b/samples/bluetooth/central_hr/prj_minimal.conf
index 28dcf759bec..1dcf300b1ef 100644
--- a/samples/bluetooth/central_hr/prj_minimal.conf
+++ b/samples/bluetooth/central_hr/prj_minimal.conf
@@ -94,6 +94,7 @@ CONFIG_BT_CTLR_PHY_2M=n
 # Reduce Bluetooth buffers
 CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT=1
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=45
+CONFIG_BT_BUF_ACL_RX_COUNT=2
 CONFIG_BT_BUF_EVT_RX_COUNT=2
 
 CONFIG_BT_L2CAP_TX_BUF_COUNT=2
diff --git a/samples/bluetooth/central_multilink/prj.conf b/samples/bluetooth/central_multilink/prj.conf
index f0ca905b431..a450460243e 100644
--- a/samples/bluetooth/central_multilink/prj.conf
+++ b/samples/bluetooth/central_multilink/prj.conf
@@ -4,6 +4,7 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PRIVACY=y
 
 CONFIG_BT_MAX_CONN=62
+CONFIG_BT_BUF_ACL_RX_COUNT=63
 
 # CONFIG_BT_GATT_CLIENT=y
 
diff --git a/samples/bluetooth/hci_uart_async/prj.conf b/samples/bluetooth/hci_uart_async/prj.conf
index 1de1a46535e..e4d17d492be 100644
--- a/samples/bluetooth/hci_uart_async/prj.conf
+++ b/samples/bluetooth/hci_uart_async/prj.conf
@@ -10,6 +10,7 @@ CONFIG_BT_HCI_RAW_H4_ENABLE=y
 
 # Controller configuration. Modify these for your application's needs.
 CONFIG_BT_MAX_CONN=16
+CONFIG_BT_BUF_ACL_RX_COUNT=17
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=255
diff --git a/samples/bluetooth/mesh/boards/bbc_microbit.conf b/samples/bluetooth/mesh/boards/bbc_microbit.conf
index 053053e7818..1655768864b 100644
--- a/samples/bluetooth/mesh/boards/bbc_microbit.conf
+++ b/samples/bluetooth/mesh/boards/bbc_microbit.conf
@@ -13,7 +13,7 @@ CONFIG_BT_PERIPHERAL=n
 CONFIG_BT_EXT_ADV=n
 CONFIG_BT_RX_STACK_SIZE=1100
 CONFIG_BT_BUF_EVT_RX_COUNT=3
-CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=1
+CONFIG_BT_BUF_ACL_RX_COUNT=3
 CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT=3
 
 CONFIG_BT_CTLR_ADV_EXT=n
diff --git a/samples/bluetooth/peripheral_hr/prj_minimal.conf b/samples/bluetooth/peripheral_hr/prj_minimal.conf
index 9986c85e8c3..6446273584a 100644
--- a/samples/bluetooth/peripheral_hr/prj_minimal.conf
+++ b/samples/bluetooth/peripheral_hr/prj_minimal.conf
@@ -100,6 +100,7 @@ CONFIG_BT_CTLR_PHY_2M=n
 # Reduce Bluetooth buffers
 CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT=1
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=45
+CONFIG_BT_BUF_ACL_RX_COUNT=2
 CONFIG_BT_BUF_EVT_RX_COUNT=2
 
 CONFIG_BT_L2CAP_TX_BUF_COUNT=2
diff --git a/samples/bluetooth/peripheral_identity/prj.conf b/samples/bluetooth/peripheral_identity/prj.conf
index 8bd97851e36..783c25f91e6 100644
--- a/samples/bluetooth/peripheral_identity/prj.conf
+++ b/samples/bluetooth/peripheral_identity/prj.conf
@@ -8,6 +8,7 @@ CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
 
 CONFIG_BT_MAX_CONN=62
 CONFIG_BT_ID_MAX=62
+CONFIG_BT_BUF_ACL_RX_COUNT=63
 
 # CONFIG_BT_SMP=y
 # CONFIG_BT_MAX_PAIRED=62
diff --git a/subsys/bluetooth/common/Kconfig b/subsys/bluetooth/common/Kconfig
index 9147612a70c..8bec5ba90d5 100644
--- a/subsys/bluetooth/common/Kconfig
+++ b/subsys/bluetooth/common/Kconfig
@@ -77,21 +77,10 @@ config BT_BUF_ACL_RX_SIZE
 	  In a Controller only build this will determine the maximum ACL size
 	  that the Controller will send to the Host.
 
-config BT_BUF_ACL_RX_COUNT_EXTRA
-	int "Number of extra incoming ACL data buffers"
-	default 0
-	range 0 65535
-	help
-	  Number of incoming extra ACL data buffers sent from the Controller to
-	  the Host.
-
-	  By default, the number of incoming ACL data buffers is equal to
-	  CONFIG_BT_MAX_CONN + 1.
-
 config BT_BUF_ACL_RX_COUNT
-	int "[DEPRECATED] Number of incoming ACL data buffers"
-	default 0
-	range 0 256
+	int "Number of incoming ACL data buffers"
+	default 6
+	range 2 256
 	help
 	  Number or incoming ACL data buffers sent from the Controller to the
 	  Host.
diff --git a/subsys/bluetooth/common/dummy.c b/subsys/bluetooth/common/dummy.c
index 53fe9764648..4500f7edb71 100644
--- a/subsys/bluetooth/common/dummy.c
+++ b/subsys/bluetooth/common/dummy.c
@@ -60,3 +60,27 @@ BUILD_ASSERT(!IS_ENABLED(CONFIG_LOG_MODE_IMMEDIATE), "Immediate logging "
 	     "on selected backend(s) not "
 	     "supported with the software Link Layer");
 #endif
+
+#if defined(CONFIG_BT_CONN) && defined(CONFIG_BT_HCI_HOST)
+/* The host needs more ACL buffers than maximum ACL links. This is because of
+ * the way we re-assemble ACL packets into L2CAP PDUs.
+ *
+ * We keep around the first buffer (that comes from the driver) to do
+ * re-assembly into, and if all links are re-assembling, there will be no buffer
+ * available for the HCI driver to allocate from.
+ *
+ * Fixing it properly involves a re-design of the HCI driver interface.
+ */
+#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
+BUILD_ASSERT(CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN);
+
+#else /* !CONFIG_BT_HCI_ACL_FLOW_CONTROL */
+
+/* BT_BUF_RX_COUNT is defined in include/zephyr/bluetooth/buf.h */
+BUILD_ASSERT(BT_BUF_RX_COUNT > CONFIG_BT_MAX_CONN,
+	     "BT_BUF_RX_COUNT needs to be greater than CONFIG_BT_MAX_CONN. "
+	     "In order to do that, increase CONFIG_BT_BUF_ACL_RX_COUNT.");
+
+#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
+
+#endif /* CONFIG_BT_CONN */
diff --git a/subsys/bluetooth/host/buf.c b/subsys/bluetooth/host/buf.c
index b7ed19303be..2ce2477ff05 100644
--- a/subsys/bluetooth/host/buf.c
+++ b/subsys/bluetooth/host/buf.c
@@ -40,7 +40,7 @@ NET_BUF_POOL_FIXED_DEFINE(discardable_pool, CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT,
 			  sizeof(struct bt_buf_data), NULL);
 
 #if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
-NET_BUF_POOL_DEFINE(acl_in_pool, BT_BUF_ACL_RX_COUNT,
+NET_BUF_POOL_DEFINE(acl_in_pool, CONFIG_BT_BUF_ACL_RX_COUNT,
 		    BT_BUF_ACL_SIZE(CONFIG_BT_BUF_ACL_RX_SIZE),
 		    sizeof(struct acl_data), bt_hci_host_num_completed_packets);
 
diff --git a/subsys/bluetooth/host/classic/rfcomm.c b/subsys/bluetooth/host/classic/rfcomm.c
index 4d5bbeeb897..f8742bff367 100644
--- a/subsys/bluetooth/host/classic/rfcomm.c
+++ b/subsys/bluetooth/host/classic/rfcomm.c
@@ -37,7 +37,7 @@ LOG_MODULE_REGISTER(bt_rfcomm);
 #define RFCOMM_MIN_MTU		BT_RFCOMM_SIG_MIN_MTU
 #define RFCOMM_DEFAULT_MTU	127
 
-#define RFCOMM_MAX_CREDITS		(BT_BUF_ACL_RX_COUNT - 1)
+#define RFCOMM_MAX_CREDITS		(CONFIG_BT_BUF_ACL_RX_COUNT - 1)
 #define RFCOMM_CREDITS_THRESHOLD	(RFCOMM_MAX_CREDITS / 2)
 #define RFCOMM_DEFAULT_CREDIT		RFCOMM_MAX_CREDITS
 
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index 4a175eb2c74..7bb93f5295e 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -1986,7 +1986,7 @@ static int set_flow_control(void)
 	hbs = net_buf_add(buf, sizeof(*hbs));
 	(void)memset(hbs, 0, sizeof(*hbs));
 	hbs->acl_mtu = sys_cpu_to_le16(CONFIG_BT_BUF_ACL_RX_SIZE);
-	hbs->acl_pkts = sys_cpu_to_le16(BT_BUF_ACL_RX_COUNT);
+	hbs->acl_pkts = sys_cpu_to_le16(CONFIG_BT_BUF_ACL_RX_COUNT);
 
 	err = bt_hci_cmd_send_sync(BT_HCI_OP_HOST_BUFFER_SIZE, buf, NULL);
 	if (err) {
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index a8e4843ca3a..9a871781326 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -44,7 +44,7 @@ LOG_MODULE_REGISTER(bt_l2cap, CONFIG_BT_L2CAP_LOG_LEVEL);
 #define L2CAP_ECRED_MIN_MTU		64
 #define L2CAP_ECRED_MIN_MPS             64
 
-#define L2CAP_LE_MAX_CREDITS		(BT_BUF_ACL_RX_COUNT - 1)
+#define L2CAP_LE_MAX_CREDITS		(CONFIG_BT_BUF_ACL_RX_COUNT - 1)
 
 #define L2CAP_LE_CID_DYN_START	0x0040
 #define L2CAP_LE_CID_DYN_END	0x007f
diff --git a/tests/bluetooth/tester/boards/frdm_rw612.conf b/tests/bluetooth/tester/boards/frdm_rw612.conf
index ba1ae16dc7c..48958c6ac7c 100644
--- a/tests/bluetooth/tester/boards/frdm_rw612.conf
+++ b/tests/bluetooth/tester/boards/frdm_rw612.conf
@@ -1,4 +1,5 @@
 CONFIG_BT_MAX_CONN=16
+CONFIG_BT_BUF_ACL_RX_COUNT=17
 
 # debug options
 # CONFIG_UART_CONSOLE=y
diff --git a/tests/bluetooth/tester/boards/rd_rw612_bga.conf b/tests/bluetooth/tester/boards/rd_rw612_bga.conf
index ba1ae16dc7c..48958c6ac7c 100644
--- a/tests/bluetooth/tester/boards/rd_rw612_bga.conf
+++ b/tests/bluetooth/tester/boards/rd_rw612_bga.conf
@@ -1,4 +1,5 @@
 CONFIG_BT_MAX_CONN=16
+CONFIG_BT_BUF_ACL_RX_COUNT=17
 
 # debug options
 # CONFIG_UART_CONSOLE=y
diff --git a/tests/bsim/bluetooth/host/l2cap/einprogress/src/dut.c b/tests/bsim/bluetooth/host/l2cap/einprogress/src/dut.c
index b3da048b8ca..2c026befd20 100644
--- a/tests/bsim/bluetooth/host/l2cap/einprogress/src/dut.c
+++ b/tests/bsim/bluetooth/host/l2cap/einprogress/src/dut.c
@@ -29,7 +29,7 @@ LOG_MODULE_REGISTER(dut, LOG_LEVEL_INF);
  *  application. This allows us to notice if the stack has freed
  *  references that were ours.
  */
-static atomic_t acl_pool_refs_held[BT_BUF_ACL_RX_COUNT];
+static atomic_t acl_pool_refs_held[CONFIG_BT_BUF_ACL_RX_COUNT];
 
 BUILD_ASSERT(IS_ENABLED(CONFIG_BT_TESTING));
 BUILD_ASSERT(IS_ENABLED(CONFIG_BT_HCI_ACL_FLOW_CONTROL));
@@ -46,7 +46,7 @@ static void acl_pool_refs_held_add(struct net_buf *buf)
 {
 	int buf_id = net_buf_id(buf);
 
-	__ASSERT_NO_MSG(0 <= buf_id && buf_id < BT_BUF_ACL_RX_COUNT);
+	__ASSERT_NO_MSG(0 <= buf_id && buf_id < CONFIG_BT_BUF_ACL_RX_COUNT);
 	atomic_inc(&acl_pool_refs_held[buf_id]);
 }
 
diff --git a/tests/bsim/bluetooth/host/l2cap/reassembly/dut/prj.conf b/tests/bsim/bluetooth/host/l2cap/reassembly/dut/prj.conf
index d913264f700..4f6ee8187bf 100644
--- a/tests/bsim/bluetooth/host/l2cap/reassembly/dut/prj.conf
+++ b/tests/bsim/bluetooth/host/l2cap/reassembly/dut/prj.conf
@@ -28,5 +28,5 @@ CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
 # RX buffer pool, it is a good idea to constrain said buffer
 # pool.
 CONFIG_BT_MAX_CONN=1
-CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4
+CONFIG_BT_BUF_ACL_RX_COUNT=6
 CONFIG_BT_BUF_EVT_RX_COUNT=6
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/prj.conf b/tests/bsim/bluetooth/host/l2cap/stress/prj.conf
index fecd8ba08d1..6f782ba157d 100644
--- a/tests/bsim/bluetooth/host/l2cap/stress/prj.conf
+++ b/tests/bsim/bluetooth/host/l2cap/stress/prj.conf
@@ -42,6 +42,7 @@ CONFIG_BT_CTLR_DATA_LENGTH_MAX=27
 CONFIG_BT_CTLR_RX_BUFFERS=10
 
 CONFIG_BT_MAX_CONN=10
+CONFIG_BT_BUF_ACL_RX_COUNT=11
 
 CONFIG_LOG=y
 CONFIG_ASSERT=y
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/prj_nofrag.conf b/tests/bsim/bluetooth/host/l2cap/stress/prj_nofrag.conf
index ea9cda13529..a4e71a58b64 100644
--- a/tests/bsim/bluetooth/host/l2cap/stress/prj_nofrag.conf
+++ b/tests/bsim/bluetooth/host/l2cap/stress/prj_nofrag.conf
@@ -34,6 +34,7 @@ CONFIG_BT_CTLR_DATA_LENGTH_MAX=81
 CONFIG_BT_CTLR_RX_BUFFERS=10
 
 CONFIG_BT_MAX_CONN=10
+CONFIG_BT_BUF_ACL_RX_COUNT=11
 
 CONFIG_LOG=y
 CONFIG_ASSERT=y
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/prj_syswq.conf b/tests/bsim/bluetooth/host/l2cap/stress/prj_syswq.conf
index 3cddbe332cd..9c21c148cbf 100644
--- a/tests/bsim/bluetooth/host/l2cap/stress/prj_syswq.conf
+++ b/tests/bsim/bluetooth/host/l2cap/stress/prj_syswq.conf
@@ -42,6 +42,7 @@ CONFIG_BT_CTLR_DATA_LENGTH_MAX=27
 CONFIG_BT_CTLR_RX_BUFFERS=10
 
 CONFIG_BT_MAX_CONN=10
+CONFIG_BT_BUF_ACL_RX_COUNT=11
 
 CONFIG_LOG=y
 CONFIG_ASSERT=y
diff --git a/tests/bsim/bluetooth/host/misc/conn_stress/central/prj.conf b/tests/bsim/bluetooth/host/misc/conn_stress/central/prj.conf
index ff7d61dfb05..0238e1e38eb 100644
--- a/tests/bsim/bluetooth/host/misc/conn_stress/central/prj.conf
+++ b/tests/bsim/bluetooth/host/misc/conn_stress/central/prj.conf
@@ -2,6 +2,7 @@ CONFIG_BT=y
 CONFIG_LOG=y
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_MAX_CONN=12
+CONFIG_BT_BUF_ACL_RX_COUNT=13
 CONFIG_BT_MAX_PAIRED=12
 CONFIG_BT_SMP=y
 CONFIG_BT_PRIVACY=y
diff --git a/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/prj.conf b/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/prj.conf
index daa5dd196ee..114b8574b4e 100644
--- a/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/prj.conf
+++ b/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/prj.conf
@@ -27,5 +27,9 @@ CONFIG_BT_AUTO_DATA_LEN_UPDATE=n
 CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
 
 CONFIG_BT_MAX_CONN=3
+CONFIG_BT_BUF_ACL_RX_COUNT=4
+
+# This test will fail when CONFIG_BT_MAX_CONN == CONFIG_BT_BUF_ACL_RX_COUNT
+# CONFIG_BT_BUF_ACL_RX_COUNT=3
 
 CONFIG_BT_HCI_ACL_FLOW_CONTROL=y
diff --git a/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/src/dut.c b/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/src/dut.c
index 410417563d1..a8524a90b5e 100644
--- a/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/src/dut.c
+++ b/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/src/dut.c
@@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(dut, CONFIG_APP_LOG_LEVEL);
 #define NUM_TESTERS CONFIG_BT_MAX_CONN
 
 /* Build with the minimum possible amount of RX buffers */
-BUILD_ASSERT(BT_BUF_ACL_RX_COUNT >= (CONFIG_BT_MAX_CONN + 1));
+BUILD_ASSERT(CONFIG_BT_BUF_ACL_RX_COUNT == (CONFIG_BT_MAX_CONN + 1));
 
 struct tester {
 	size_t sdu_count;
diff --git a/tests/bsim/bluetooth/ll/multiple_id/prj.conf b/tests/bsim/bluetooth/ll/multiple_id/prj.conf
index 173fc296c7c..8cd08356b3a 100644
--- a/tests/bsim/bluetooth/ll/multiple_id/prj.conf
+++ b/tests/bsim/bluetooth/ll/multiple_id/prj.conf
@@ -12,6 +12,7 @@ CONFIG_BT_AUTO_DATA_LEN_UPDATE=y
 
 CONFIG_BT_MAX_CONN=250
 CONFIG_BT_ID_MAX=250
+CONFIG_BT_BUF_ACL_RX_COUNT=251
 
 # L2CAP, ATT and SMP usage cause data transmission deadlock due to shortage
 # of buffers when transactions crossover amongst the connections in the same

From c374c3f7a000962e5f142929e08c6b2d42c7fdd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:10 +0100
Subject: [PATCH 1136/2913] Revert "[nrf fromtree] doc: releases: introduce
 release notes and migration guide docs for 4.1"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5af4cccb69d59bf53e41672c991457788b3afd75.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/releases/migration-guide-4.1.rst | 112 -----------
 doc/releases/release-notes-4.1.rst   | 288 ---------------------------
 2 files changed, 400 deletions(-)
 delete mode 100644 doc/releases/migration-guide-4.1.rst
 delete mode 100644 doc/releases/release-notes-4.1.rst

diff --git a/doc/releases/migration-guide-4.1.rst b/doc/releases/migration-guide-4.1.rst
deleted file mode 100644
index d35ab96073c..00000000000
--- a/doc/releases/migration-guide-4.1.rst
+++ /dev/null
@@ -1,112 +0,0 @@
-:orphan:
-
-.. _migration_4.1:
-
-Migration guide to Zephyr v4.1.0 (Working Draft)
-################################################
-
-This document describes the changes required when migrating your application from Zephyr v4.0.0 to
-Zephyr v4.1.0.
-
-Any other changes (not directly related to migrating applications) can be found in
-the :ref:`release notes<zephyr_4.1>`.
-
-.. contents::
-    :local:
-    :depth: 2
-
-Build System
-************
-
-Kernel
-******
-
-Boards
-******
-
-Modules
-*******
-
-Mbed TLS
-========
-
-Trusted Firmware-M
-==================
-
-LVGL
-====
-
-Device Drivers and Devicetree
-*****************************
-
-Controller Area Network (CAN)
-=============================
-
-Display
-=======
-
-Enhanced Serial Peripheral Interface (eSPI)
-===========================================
-
-GNSS
-====
-
-Input
-=====
-
-Interrupt Controller
-====================
-
-LED Strip
-=========
-
-Sensors
-=======
-
-Serial
-======
-
-Regulator
-=========
-
-Bluetooth
-*********
-
-Bluetooth HCI
-=============
-
-Bluetooth Mesh
-==============
-
-Bluetooth Audio
-===============
-
-Bluetooth Classic
-=================
-
-Bluetooth Host
-==============
-
-Bluetooth Crypto
-================
-
-Networking
-**********
-
-Other Subsystems
-****************
-
-Flash map
-=========
-
-hawkBit
-=======
-
-MCUmgr
-======
-
-Modem
-=====
-
-Architectures
-*************
diff --git a/doc/releases/release-notes-4.1.rst b/doc/releases/release-notes-4.1.rst
deleted file mode 100644
index 202fdb20489..00000000000
--- a/doc/releases/release-notes-4.1.rst
+++ /dev/null
@@ -1,288 +0,0 @@
-:orphan:
-
-.. _zephyr_4.1:
-
-Zephyr 4.1.0 (Working Draft)
-############################
-
-We are pleased to announce the release of Zephyr version 4.1.0.
-
-Major enhancements with this release include:
-
-An overview of the changes required or recommended when migrating your application from Zephyr
-v4.0.0 to Zephyr v4.1.0 can be found in the separate :ref:`migration guide<migration_4.1>`.
-
-The following sections provide detailed lists of changes by component.
-
-Security Vulnerability Related
-******************************
-The following CVEs are addressed by this release:
-
-More detailed information can be found in:
-https://docs.zephyrproject.org/latest/security/vulnerabilities.html
-
-API Changes
-***********
-
-Removed APIs in this release
-============================
-
-Deprecated in this release
-==========================
-
-Architectures
-*************
-
-* ARC
-
-* ARM
-
-* ARM64
-
-* RISC-V
-
-* Xtensa
-
-Kernel
-******
-
-Bluetooth
-*********
-
-* Audio
-
-* Host
-
-* HCI Drivers
-
-Boards & SoC Support
-********************
-
-* Added support for these SoC series:
-
-* Made these changes in other SoC series:
-
-* Added support for these boards:
-
-* Made these board changes:
-
-* Added support for the following shields:
-
-Build system and Infrastructure
-*******************************
-
-Drivers and Sensors
-*******************
-
-* ADC
-
-* Battery
-
-* CAN
-
-* Charger
-
-* Clock control
-
-* Counter
-
-* DAC
-
-* Disk
-
-* Display
-
-* Ethernet
-
-* Flash
-
-* GNSS
-
-* GPIO
-
-* Hardware info
-
-* I2C
-
-* I2S
-
-* I3C
-
-* Input
-
-* LED
-
-* LED Strip
-
-* LoRa
-
-* Mailbox
-
-* MDIO
-
-* MFD
-
-* Modem
-
-* MIPI-DBI
-
-* MSPI
-
-* Pin control
-
-* PWM
-
-* Regulators
-
-* Reset
-
-* RTC
-
-* RTIO
-
-* SDHC
-
-* Sensors
-
-* Serial
-
-* SPI
-
-* USB
-
-* Video
-
-* Watchdog
-
-* Wi-Fi
-
-Networking
-**********
-
-* ARP:
-
-* CoAP:
-
-* Connection manager:
-
-* DHCPv4:
-
-* DHCPv6:
-
-* DNS/mDNS/LLMNR:
-
-* gPTP/PTP:
-
-* HTTP:
-
-* IPSP:
-
-* IPv4:
-
-* IPv6:
-
-* LwM2M:
-
-* Misc:
-
-* MQTT:
-
-* Network Interface:
-
-* OpenThread
-
-* PPP
-
-* Shell:
-
-* Sockets:
-
-* Syslog:
-
-* TCP:
-
-* Websocket:
-
-* Wi-Fi:
-
-* zperf:
-
-USB
-***
-
-Devicetree
-**********
-
-Kconfig
-*******
-
-Libraries / Subsystems
-**********************
-
-* Debug
-
-* Demand Paging
-
-* Formatted output
-
-* Management
-
-* Logging
-
-* Modem modules
-
-* Power management
-
-* Crypto
-
-* CMSIS-NN
-
-* FPGA
-
-* Random
-
-* SD
-
-* State Machine Framework
-
-* Storage
-
-* Task Watchdog
-
-* POSIX API
-
-* LoRa/LoRaWAN
-
-* ZBus
-
-HALs
-****
-
-* Nordic
-
-* STM32
-
-* ADI
-
-* Espressif
-
-MCUboot
-*******
-
-OSDP
-****
-
-Trusted Firmware-M
-******************
-
-LVGL
-****
-
-Tests and Samples
-*****************
-
-Issue Related Items
-*******************
-
-Known Issues
-============

From ca74da981d407a3d04c51c14da87a615963227a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:10 +0100
Subject: [PATCH 1137/2913] Revert "[nrf fromtree] Bluetooth: Host: Test L2CAP
 -EINPROGRESS feature"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c4181c9082a918a796c20679f9617d2182c035c1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/bsim/bluetooth/host/l2cap/compile.sh    |   1 -
 .../host/l2cap/einprogress/CMakeLists.txt     |  24 ----
 .../host/l2cap/einprogress/compile.sh         |  13 --
 .../bluetooth/host/l2cap/einprogress/prj.conf |  25 ----
 .../host/l2cap/einprogress/src/data.h         |  11 --
 .../host/l2cap/einprogress/src/dut.c          | 124 ------------------
 .../host/l2cap/einprogress/src/main.c         |  47 -------
 .../host/l2cap/einprogress/src/tester.c       |  72 ----------
 .../l2cap/einprogress/test_scripts/run.sh     |  26 ----
 9 files changed, 343 deletions(-)
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/einprogress/CMakeLists.txt
 delete mode 100755 tests/bsim/bluetooth/host/l2cap/einprogress/compile.sh
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/einprogress/prj.conf
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/einprogress/src/data.h
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/einprogress/src/dut.c
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/einprogress/src/main.c
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/einprogress/src/tester.c
 delete mode 100755 tests/bsim/bluetooth/host/l2cap/einprogress/test_scripts/run.sh

diff --git a/tests/bsim/bluetooth/host/l2cap/compile.sh b/tests/bsim/bluetooth/host/l2cap/compile.sh
index ddb7f5d14bc..71d41a7f2e7 100755
--- a/tests/bsim/bluetooth/host/l2cap/compile.sh
+++ b/tests/bsim/bluetooth/host/l2cap/compile.sh
@@ -19,7 +19,6 @@ app=tests/bsim/bluetooth/host/l2cap/stress conf_file=prj_nofrag.conf compile
 app=tests/bsim/bluetooth/host/l2cap/stress conf_file=prj_syswq.conf compile
 run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/l2cap/split/compile.sh
 run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/l2cap/reassembly/compile.sh
-run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/l2cap/einprogress/compile.sh
 run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/l2cap/ecred/compile.sh
 app=tests/bsim/bluetooth/host/l2cap/credits compile
 app=tests/bsim/bluetooth/host/l2cap/credits conf_file=prj_ecred.conf compile
diff --git a/tests/bsim/bluetooth/host/l2cap/einprogress/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/einprogress/CMakeLists.txt
deleted file mode 100644
index b6d0135f936..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/einprogress/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-
-project(test_l2cap_einprogress)
-
-add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/common/testlib testlib)
-target_link_libraries(app PRIVATE testlib)
-
-add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
-target_link_libraries(app PRIVATE babblekit)
-
-zephyr_include_directories(
-  ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
-  ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
-)
-
-target_sources(app PRIVATE
-  src/main.c
-  src/dut.c
-  src/tester.c
-)
diff --git a/tests/bsim/bluetooth/host/l2cap/einprogress/compile.sh b/tests/bsim/bluetooth/host/l2cap/einprogress/compile.sh
deleted file mode 100755
index e717a4b2bbe..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/einprogress/compile.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2023 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-set -eu
-: "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}"
-
-INCR_BUILD=1
-
-source ${ZEPHYR_BASE}/tests/bsim/compile.source
-
-app="$(guess_test_relpath)" compile
-
-wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/l2cap/einprogress/prj.conf b/tests/bsim/bluetooth/host/l2cap/einprogress/prj.conf
deleted file mode 100644
index e2540cd6f6a..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/einprogress/prj.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-CONFIG_LOG=y
-CONFIG_ASSERT=y
-CONFIG_THREAD_NAME=y
-CONFIG_LOG_THREAD_ID_PREFIX=y
-CONFIG_ARCH_POSIX_TRAP_ON_FATAL=y
-CONFIG_BT_TESTING=y
-
-CONFIG_BT_HCI_ACL_FLOW_CONTROL=y
-
-CONFIG_BT=y
-CONFIG_BT_CENTRAL=y
-CONFIG_BT_PERIPHERAL=y
-
-# Dependency of testlib/adv and testlib/scan.
-CONFIG_BT_EXT_ADV=y
-
-# Dynamic channel depends on SMP
-CONFIG_BT_SMP=y
-CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
-
-# Disable auto-initiated procedures so they don't
-# mess with the test's execution.
-CONFIG_BT_AUTO_PHY_UPDATE=n
-CONFIG_BT_AUTO_DATA_LEN_UPDATE=n
-CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
diff --git a/tests/bsim/bluetooth/host/l2cap/einprogress/src/data.h b/tests/bsim/bluetooth/host/l2cap/einprogress/src/data.h
deleted file mode 100644
index 4920d909d08..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/einprogress/src/data.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Copyright (c) 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_TESTS_BSIM_BLUETOOTH_HOST_L2CAP_EINPROGRESS_SRC_DATA_H_
-#define ZEPHYR_TESTS_BSIM_BLUETOOTH_HOST_L2CAP_EINPROGRESS_SRC_DATA_H_
-
-#define TEST_DATA_L2CAP_PSM 0x0080
-#define TEST_DATA_DUT_ADDR  BT_TESTLIB_ADDR_LE_RANDOM_C0_00_00_00_00_(0x01)
-
-#endif /* ZEPHYR_TESTS_BSIM_BLUETOOTH_HOST_L2CAP_EINPROGRESS_SRC_DATA_H_ */
diff --git a/tests/bsim/bluetooth/host/l2cap/einprogress/src/dut.c b/tests/bsim/bluetooth/host/l2cap/einprogress/src/dut.c
deleted file mode 100644
index 2c026befd20..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/einprogress/src/dut.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* Copyright (c) 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/l2cap.h>
-#include <zephyr/bluetooth/testing.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/net_buf.h>
-#include <zephyr/sys/__assert.h>
-#include <zephyr/sys/atomic.h>
-#include <zephyr/sys/util_macro.h>
-
-#include <testlib/addr.h>
-#include <testlib/adv.h>
-#include <testlib/conn.h>
-#include <testlib/scan.h>
-
-#include <babblekit/flags.h>
-#include <babblekit/testcase.h>
-
-#include "data.h"
-
-LOG_MODULE_REGISTER(dut, LOG_LEVEL_INF);
-
-/** Here we keep track of the reference count in the test
- *  application. This allows us to notice if the stack has freed
- *  references that were ours.
- */
-static atomic_t acl_pool_refs_held[CONFIG_BT_BUF_ACL_RX_COUNT];
-
-BUILD_ASSERT(IS_ENABLED(CONFIG_BT_TESTING));
-BUILD_ASSERT(IS_ENABLED(CONFIG_BT_HCI_ACL_FLOW_CONTROL));
-void bt_testing_trace_event_acl_pool_destroy(struct net_buf *destroyed_buf)
-{
-	int buf_id = net_buf_id(destroyed_buf);
-
-	__ASSERT_NO_MSG(0 <= buf_id && buf_id < ARRAY_SIZE(acl_pool_refs_held));
-	TEST_ASSERT(acl_pool_refs_held[buf_id] == 0,
-		    "ACL buf was destroyed while tester still held a reference");
-}
-
-static void acl_pool_refs_held_add(struct net_buf *buf)
-{
-	int buf_id = net_buf_id(buf);
-
-	__ASSERT_NO_MSG(0 <= buf_id && buf_id < CONFIG_BT_BUF_ACL_RX_COUNT);
-	atomic_inc(&acl_pool_refs_held[buf_id]);
-}
-
-static void acl_pool_refs_held_remove(struct net_buf *buf)
-{
-	int buf_id = net_buf_id(buf);
-
-	__ASSERT_NO_MSG(0 <= buf_id && buf_id < ARRAY_SIZE(acl_pool_refs_held));
-	atomic_val_t old = atomic_dec(&acl_pool_refs_held[buf_id]);
-
-	__ASSERT(old != 0, "Tester error: releasing a reference that was not held");
-}
-
-struct k_fifo ack_todo;
-
-static int dut_chan_recv_cb(struct bt_l2cap_chan *chan, struct net_buf *buf)
-{
-	/* Move buf. Ownership is ours if we return -EINPROGRESS. */
-	acl_pool_refs_held_add(buf);
-	k_fifo_put(&ack_todo, buf);
-
-	return -EINPROGRESS;
-}
-
-static const struct bt_l2cap_chan_ops ops = {
-	.recv = dut_chan_recv_cb,
-};
-
-static struct bt_l2cap_le_chan le_chan = {
-	.chan.ops = &ops,
-};
-
-static int dut_server_accept_cb(struct bt_conn *conn, struct bt_l2cap_server *server,
-				struct bt_l2cap_chan **chan)
-{
-	*chan = &le_chan.chan;
-	return 0;
-}
-
-static struct bt_l2cap_server test_l2cap_server = {
-	.accept = dut_server_accept_cb,
-	.psm = TEST_DATA_L2CAP_PSM,
-};
-
-void entrypoint_dut(void)
-{
-	struct net_buf *ack_buf;
-	struct bt_conn *conn = NULL;
-	int err;
-
-	TEST_START("dut");
-
-	k_fifo_init(&ack_todo);
-
-	err = bt_id_create(&TEST_DATA_DUT_ADDR, NULL);
-	__ASSERT_NO_MSG(!err);
-
-	err = bt_enable(NULL);
-	__ASSERT_NO_MSG(!err);
-
-	err = bt_l2cap_server_register(&test_l2cap_server);
-	__ASSERT_NO_MSG(!err);
-
-	err = bt_testlib_adv_conn(&conn, BT_ID_DEFAULT, NULL);
-	__ASSERT_NO_MSG(!err);
-
-	ack_buf = k_fifo_get(&ack_todo, K_FOREVER);
-	__ASSERT_NO_MSG(ack_buf);
-
-	acl_pool_refs_held_remove(ack_buf);
-	err = bt_l2cap_chan_recv_complete(&le_chan.chan, ack_buf);
-	TEST_ASSERT(!err);
-
-	TEST_PASS_AND_EXIT("dut");
-}
diff --git a/tests/bsim/bluetooth/host/l2cap/einprogress/src/main.c b/tests/bsim/bluetooth/host/l2cap/einprogress/src/main.c
deleted file mode 100644
index d6611e8f8dd..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/einprogress/src/main.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright (c) 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-
-#include "bstests.h"
-#include "babblekit/testcase.h"
-
-extern void entrypoint_dut(void);
-extern void entrypoint_tester(void);
-extern enum bst_result_t bst_result;
-
-static void test_end_cb(void)
-{
-	if (bst_result != Passed) {
-		TEST_PRINT("Test has not passed.");
-	}
-}
-
-static const struct bst_test_instance entrypoints[] = {
-	{
-		.test_id = "l2cap/einprogress/dut",
-		.test_delete_f = test_end_cb,
-		.test_main_f = entrypoint_dut,
-	},
-	{
-		.test_id = "l2cap/einprogress/tester",
-		.test_delete_f = test_end_cb,
-		.test_main_f = entrypoint_tester,
-	},
-	BSTEST_END_MARKER,
-};
-
-static struct bst_test_list *install(struct bst_test_list *tests)
-{
-	return bst_add_tests(tests, entrypoints);
-};
-
-bst_test_install_t test_installers[] = {install, NULL};
-
-int main(void)
-{
-	bst_main();
-
-	return 0;
-}
diff --git a/tests/bsim/bluetooth/host/l2cap/einprogress/src/tester.c b/tests/bsim/bluetooth/host/l2cap/einprogress/src/tester.c
deleted file mode 100644
index 2e2d000aa9c..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/einprogress/src/tester.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright (c) 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/l2cap.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/net_buf.h>
-#include <zephyr/sys/__assert.h>
-#include <zephyr/sys/atomic.h>
-#include <zephyr/sys/util_macro.h>
-
-#include <testlib/addr.h>
-#include <testlib/adv.h>
-#include <testlib/conn.h>
-#include <testlib/scan.h>
-
-#include <babblekit/flags.h>
-#include <babblekit/testcase.h>
-
-#include "data.h"
-
-LOG_MODULE_REGISTER(tester, LOG_LEVEL_INF);
-
-static int tester_chan_recv_cb(struct bt_l2cap_chan *chan, struct net_buf *buf)
-{
-	__ASSERT(false, "Unexpected recv in tester");
-	return 0;
-};
-
-static struct bt_l2cap_le_chan le_chan = {
-	.chan.ops =
-		&(const struct bt_l2cap_chan_ops){
-			.recv = tester_chan_recv_cb,
-		},
-};
-
-NET_BUF_POOL_DEFINE(test_pool, 1, BT_L2CAP_SDU_BUF_SIZE(0), CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
-
-void entrypoint_tester(void)
-{
-	struct net_buf *sdu;
-	struct bt_conn *conn = NULL;
-	int err;
-
-	TEST_START("tester");
-
-	err = bt_enable(NULL);
-	__ASSERT_NO_MSG(!err);
-
-	err = bt_testlib_connect(&TEST_DATA_DUT_ADDR, &conn);
-	__ASSERT_NO_MSG(!err);
-
-	err = bt_l2cap_chan_connect(conn, &le_chan.chan, TEST_DATA_L2CAP_PSM);
-	__ASSERT_NO_MSG(!err);
-
-	/* Wait for async L2CAP connect */
-	while (!atomic_test_bit(le_chan.chan.status, BT_L2CAP_STATUS_OUT)) {
-		k_sleep(K_MSEC(100));
-	}
-
-	sdu = net_buf_alloc(&test_pool, K_NO_WAIT);
-	__ASSERT_NO_MSG(sdu);
-	net_buf_reserve(sdu, BT_L2CAP_SDU_CHAN_SEND_RESERVE);
-
-	err = bt_l2cap_chan_send(&le_chan.chan, sdu);
-	__ASSERT(!err, "err: %d", err);
-
-	TEST_PASS("tester");
-}
diff --git a/tests/bsim/bluetooth/host/l2cap/einprogress/test_scripts/run.sh b/tests/bsim/bluetooth/host/l2cap/einprogress/test_scripts/run.sh
deleted file mode 100755
index b86db52d9df..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/einprogress/test_scripts/run.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) 2024 Nordic Semiconductor
-# SPDX-License-Identifier: Apache-2.0
-
-set -eu
-
-source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
-
-test_name="$(guess_test_long_name)"
-simulation_id=${test_name}
-verbosity_level=2
-EXECUTE_TIMEOUT=120
-SIM_LEN_US=$((2 * 1000 * 1000))
-
-test_exe="${BSIM_OUT_PATH}/bin/bs_${BOARD_TS}_${test_name}_prj_conf"
-
-cd ${BSIM_OUT_PATH}/bin
-
-Execute "${test_exe}" -v=${verbosity_level} -s=${simulation_id} -d=0 \
-    -testid=l2cap/einprogress/dut
-Execute "${test_exe}" -v=${verbosity_level} -s=${simulation_id} -d=1 \
-    -testid=l2cap/einprogress/tester
-
-Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} -D=2 -sim_length=${SIM_LEN_US} $@
-
-wait_for_background_jobs

From 1aacca89f5c1249e75dea62b59208e4ad461e26f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:10 +0100
Subject: [PATCH 1138/2913] Revert "[nrf fromtree] Bluetooth: testlib: Add
 `BT_TESTLIB_ADDR_LE_RANDOM_C0_00_00_00_00_`"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit dcdfa006631e37acb6b3dcb9fe61c3303b1e58e7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../common/testlib/include/testlib/addr.h     | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 tests/bluetooth/common/testlib/include/testlib/addr.h

diff --git a/tests/bluetooth/common/testlib/include/testlib/addr.h b/tests/bluetooth/common/testlib/include/testlib/addr.h
deleted file mode 100644
index 2f9e49488b7..00000000000
--- a/tests/bluetooth/common/testlib/include/testlib/addr.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright (c) 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_TESTS_BLUETOOTH_COMMON_TESTLIB_INCLUDE_TESTLIB_ADDR_H_
-#define ZEPHYR_TESTS_BLUETOOTH_COMMON_TESTLIB_INCLUDE_TESTLIB_ADDR_H_
-
-#include <stdint.h>
-
-#include <zephyr/bluetooth/addr.h>
-#include <zephyr/bluetooth/byteorder.h>
-
-/** Bluetooth LE static random address */
-#define BT_TESTLIB_ADDR_LE_RANDOM_C0_00_00_00_00_(last)                                            \
-	((bt_addr_le_t){                                                                           \
-		.type = BT_ADDR_LE_RANDOM,                                                         \
-		.a = {{last, 0x00, 0x00, 0x00, 0x00, 0xc0}},                                       \
-	})
-
-#endif /* ZEPHYR_TESTS_BLUETOOTH_COMMON_TESTLIB_INCLUDE_TESTLIB_ADDR_H_ */

From 1e0c86f74964b446a1317f66d02cca09ea57c51b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:10 +0100
Subject: [PATCH 1139/2913] Revert "[nrf fromtree] Bluetooth: Host: Add
 BT_TESTING trace event for ACL pool destroy"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9f0c4ec36c3acd86db7ef87983c8bdaf666151b5.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/testing.h | 27 ---------------------------
 subsys/bluetooth/host/hci_core.c   | 12 ------------
 2 files changed, 39 deletions(-)
 delete mode 100644 include/zephyr/bluetooth/testing.h

diff --git a/include/zephyr/bluetooth/testing.h b/include/zephyr/bluetooth/testing.h
deleted file mode 100644
index 3ac48c7b36e..00000000000
--- a/include/zephyr/bluetooth/testing.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (c) 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/** @brief Internal testing interfaces for Bluetooth
- *  @file
- *  @internal
- *
- *  The interfaces in this file are internal and not stable.
- */
-
-#ifndef ZEPHYR_INCLUDE_BLUETOOTH_TESTING_H_
-#define ZEPHYR_INCLUDE_BLUETOOTH_TESTING_H_
-
-#include <zephyr/net_buf.h>
-
-/** @brief Hook for `acl_in_pool.destroy`
- *
- *  Weak-function interface. The user can simply define this
- *  function, and it will automatically become the event
- *  listener.
- *
- *  @kconfig_dep{CONFIG_BT_TESTING}
- */
-void bt_testing_trace_event_acl_pool_destroy(struct net_buf *buf);
-
-#endif /* ZEPHYR_INCLUDE_BLUETOOTH_TESTING_H_ */
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index 7bb93f5295e..2db727fb6eb 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -14,7 +14,6 @@
 #include <zephyr/net_buf.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/sys/check.h>
-#include <zephyr/sys/util_macro.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/sys/slist.h>
 #include <zephyr/sys/byteorder.h>
@@ -29,7 +28,6 @@
 #include <zephyr/bluetooth/l2cap.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/hci_vs.h>
-#include <zephyr/bluetooth/testing.h>
 #if DT_HAS_CHOSEN(zephyr_bt_hci)
 #include <zephyr/drivers/bluetooth.h>
 #else
@@ -265,12 +263,6 @@ void bt_send_one_host_num_completed_packets(uint16_t handle)
 	BT_ASSERT_MSG(err == 0, "Unable to send Host NCP (err %d)", err);
 }
 
-#if defined(CONFIG_BT_TESTING)
-__weak void bt_testing_trace_event_acl_pool_destroy(struct net_buf *buf)
-{
-}
-#endif
-
 #if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
 void bt_hci_host_num_completed_packets(struct net_buf *buf)
 {
@@ -278,10 +270,6 @@ void bt_hci_host_num_completed_packets(struct net_buf *buf)
 	struct bt_conn *conn;
 	uint8_t index = acl(buf)->index;
 
-	if (IS_ENABLED(CONFIG_BT_TESTING)) {
-		bt_testing_trace_event_acl_pool_destroy(buf);
-	}
-
 	net_buf_destroy(buf);
 
 	if (acl(buf)->host_ncp_sent) {

From f71223cafe73c068ad84619805e4d6ce6999fb7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:10 +0100
Subject: [PATCH 1140/2913] Revert "[nrf fromtree] Bluetooth: Host: Upgrade log
 severity for L2CAP user error"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6e1590a88b4b2db647ce8eb02ae4c44a29582f3a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/host/l2cap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index 9a871781326..922586aa36b 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -3252,7 +3252,7 @@ static int bt_l2cap_dyn_chan_send(struct bt_l2cap_le_chan *le_chan, struct net_b
 		/* Call `net_buf_reserve(buf, BT_L2CAP_SDU_CHAN_SEND_RESERVE)`
 		 * when allocating buffers intended for bt_l2cap_chan_send().
 		 */
-		LOG_ERR("Not enough headroom in buf %p", buf);
+		LOG_DBG("Not enough headroom in buf %p", buf);
 		return -EINVAL;
 	}
 
@@ -3300,7 +3300,7 @@ int bt_l2cap_chan_send(struct bt_l2cap_chan *chan, struct net_buf *buf)
 	LOG_DBG("chan %p buf %p len %zu", chan, buf, buf->len);
 
 	if (buf->ref != 1) {
-		LOG_WRN("Expecting 1 ref, got %d", buf->ref);
+		LOG_DBG("Expecting 1 ref, got %d", buf->ref);
 		return -EINVAL;
 	}
 

From 8c6660fbeaca6fbe3b961259f3ad91792ed7f57e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:10 +0100
Subject: [PATCH 1141/2913] Revert "[nrf fromtree] Bluetooth: Host: Fix
 `bt_l2cap_chan_ops.recv` `-EINPROGRESS`"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 898c46a8c92394ca2e6141049558f0817f35eb8f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/l2cap.h |  5 -----
 subsys/bluetooth/host/l2cap.c    | 10 +---------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/include/zephyr/bluetooth/l2cap.h b/include/zephyr/bluetooth/l2cap.h
index d8812693614..d3a49f9b3a9 100644
--- a/include/zephyr/bluetooth/l2cap.h
+++ b/include/zephyr/bluetooth/l2cap.h
@@ -350,11 +350,6 @@ struct bt_l2cap_chan_ops {
 	 *  @kconfig{CONFIG_BT_L2CAP_SEG_RECV} is enabled and seg_recv is
 	 *  supplied.
 	 *
-	 *  If the application returns @c -EINPROGRESS, the application takes
-	 *  ownership of the reference in @p buf. (I.e. This pointer value can
-	 *  simply be given to @ref bt_l2cap_chan_recv_complete without any
-	 *  calls @ref net_buf_ref or @ref net_buf_unref.)
-	 *
 	 *  @return 0 in case of success or negative value in case of error.
 	 *  @return -EINPROGRESS in case where user has to confirm once the data
 	 *                       has been processed by calling
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index 922586aa36b..ed185d12fd7 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -17,7 +17,6 @@
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/math_extras.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/net_buf.h>
 
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/bluetooth.h>
@@ -2573,7 +2572,6 @@ static void l2cap_chan_le_recv_seg_direct(struct bt_l2cap_le_chan *chan, struct
 static void l2cap_chan_le_recv(struct bt_l2cap_le_chan *chan,
 			       struct net_buf *buf)
 {
-	struct net_buf *owned_ref;
 	uint16_t sdu_len;
 	int err;
 
@@ -2647,13 +2645,7 @@ static void l2cap_chan_le_recv(struct bt_l2cap_le_chan *chan,
 		return;
 	}
 
-	owned_ref = net_buf_ref(buf);
-	err = chan->chan.ops->recv(&chan->chan, owned_ref);
-	if (err != -EINPROGRESS) {
-		net_buf_unref(owned_ref);
-		owned_ref = NULL;
-	}
-
+	err = chan->chan.ops->recv(&chan->chan, buf);
 	if (err < 0) {
 		if (err != -EINPROGRESS) {
 			LOG_ERR("err %d", err);

From f8923c8be69b1e66f323c67708d8ed75b0d0a127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:10 +0100
Subject: [PATCH 1142/2913] Revert "[nrf fromtree] manifest: Update nRF hw
 models to latest"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ba1d06f7241c1a899b43bdef7b731fa244646a2f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index b99c5d1212d..6061b2c5a05 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: fbc6e614686b69dfa56f9694350b9488cf83d3f7
+      revision: 3cfca0192ff84da919e9bc7978bcc2239cd6a395
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
       revision: f6b950a3b5c0187fe499b0e518426d5bf88b7e68

From fef42cf4d95bce8a044a093e48bf371238d33662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:10 +0100
Subject: [PATCH 1143/2913] Revert "[nrf fromtree] drivers: clock_control: nrf:
 hfxo: Remove redundad code"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 10a6bd02d6c41cc340e1cb8001cc43abbaf5cc0a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/clock_control/clock_control_nrf2_hfxo.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/clock_control/clock_control_nrf2_hfxo.c b/drivers/clock_control/clock_control_nrf2_hfxo.c
index eae419f18bb..43998427f8b 100644
--- a/drivers/clock_control/clock_control_nrf2_hfxo.c
+++ b/drivers/clock_control/clock_control_nrf2_hfxo.c
@@ -37,15 +37,23 @@ static uint32_t full_irq_lock(void)
 {
 	uint32_t mcu_critical_state;
 
-	mcu_critical_state = __get_PRIMASK();
-	__disable_irq();
+	if (IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)) {
+		mcu_critical_state = __get_PRIMASK();
+		__disable_irq();
+	} else {
+		mcu_critical_state = irq_lock();
+	}
 
 	return mcu_critical_state;
 }
 
 static void full_irq_unlock(uint32_t mcu_critical_state)
 {
-	__set_PRIMASK(mcu_critical_state);
+	if (IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)) {
+		__set_PRIMASK(mcu_critical_state);
+	} else {
+		irq_unlock(mcu_critical_state);
+	}
 }
 #endif /* CONFIG_ZERO_LATENCY_IRQS */
 

From f64d9741b7d946d8d6c8bd6a16afa5a95c3ba76f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:10 +0100
Subject: [PATCH 1144/2913] Revert "[nrf fromtree] drivers: clock_control: nrf:
 hfxo: impl zero-latency isr API"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6e09b7a32fe2d54051edc88303ded9652b0ccd9b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../clock_control/clock_control_nrf2_hfxo.c   | 111 +-----------------
 1 file changed, 6 insertions(+), 105 deletions(-)

diff --git a/drivers/clock_control/clock_control_nrf2_hfxo.c b/drivers/clock_control/clock_control_nrf2_hfxo.c
index 43998427f8b..977c0aaa0d6 100644
--- a/drivers/clock_control/clock_control_nrf2_hfxo.c
+++ b/drivers/clock_control/clock_control_nrf2_hfxo.c
@@ -21,9 +21,6 @@ struct dev_data_hfxo {
 	onoff_notify_fn notify;
 	struct k_timer timer;
 	sys_snode_t hfxo_node;
-#if defined(CONFIG_ZERO_LATENCY_IRQS)
-	uint16_t request_count;
-#endif /* CONFIG_ZERO_LATENCY_IRQS */
 };
 
 struct dev_config_hfxo {
@@ -32,31 +29,6 @@ struct dev_config_hfxo {
 	k_timeout_t start_up_time;
 };
 
-#if defined(CONFIG_ZERO_LATENCY_IRQS)
-static uint32_t full_irq_lock(void)
-{
-	uint32_t mcu_critical_state;
-
-	if (IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)) {
-		mcu_critical_state = __get_PRIMASK();
-		__disable_irq();
-	} else {
-		mcu_critical_state = irq_lock();
-	}
-
-	return mcu_critical_state;
-}
-
-static void full_irq_unlock(uint32_t mcu_critical_state)
-{
-	if (IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)) {
-		__set_PRIMASK(mcu_critical_state);
-	} else {
-		irq_unlock(mcu_critical_state);
-	}
-}
-#endif /* CONFIG_ZERO_LATENCY_IRQS */
-
 static void hfxo_start_up_timer_handler(struct k_timer *timer)
 {
 	struct dev_data_hfxo *dev_data =
@@ -76,40 +48,6 @@ static void hfxo_start_up_timer_handler(struct k_timer *timer)
 	}
 }
 
-static void start_hfxo(struct dev_data_hfxo *dev_data)
-{
-	nrf_lrcconf_event_clear(NRF_LRCCONF010, NRF_LRCCONF_EVENT_HFXOSTARTED);
-	soc_lrcconf_poweron_request(&dev_data->hfxo_node, NRF_LRCCONF_POWER_MAIN);
-	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_REQHFXO);
-}
-
-static void request_hfxo(struct dev_data_hfxo *dev_data)
-{
-#if defined(CONFIG_ZERO_LATENCY_IRQS)
-	unsigned int key;
-
-	key = full_irq_lock();
-	if (dev_data->request_count == 0) {
-		start_hfxo(dev_data);
-	}
-
-	dev_data->request_count++;
-	full_irq_unlock(key);
-#else
-	start_hfxo(dev_data);
-#endif /* CONFIG_ZERO_LATENCY_IRQS */
-}
-
-#if IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)
-void nrf_clock_control_hfxo_request(void)
-{
-	const struct device *dev = DEVICE_DT_INST_GET(0);
-	struct dev_data_hfxo *dev_data = dev->data;
-
-	request_hfxo(dev_data);
-}
-#endif /* CONFIG_ZERO_LATENCY_IRQS */
-
 static void onoff_start_hfxo(struct onoff_manager *mgr, onoff_notify_fn notify)
 {
 	struct dev_data_hfxo *dev_data =
@@ -118,7 +56,10 @@ static void onoff_start_hfxo(struct onoff_manager *mgr, onoff_notify_fn notify)
 	const struct dev_config_hfxo *dev_config = dev->config;
 
 	dev_data->notify = notify;
-	request_hfxo(dev_data);
+
+	nrf_lrcconf_event_clear(NRF_LRCCONF010, NRF_LRCCONF_EVENT_HFXOSTARTED);
+	soc_lrcconf_poweron_request(&dev_data->hfxo_node, NRF_LRCCONF_POWER_MAIN);
+	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_REQHFXO);
 
 	/* Due to a hardware issue, the HFXOSTARTED event is currently
 	 * unreliable. Hence the timer is used to simply wait the expected
@@ -127,53 +68,13 @@ static void onoff_start_hfxo(struct onoff_manager *mgr, onoff_notify_fn notify)
 	k_timer_start(&dev_data->timer, dev_config->start_up_time, K_NO_WAIT);
 }
 
-static void stop_hfxo(struct dev_data_hfxo *dev_data)
-{
-	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_STOPREQHFXO);
-	soc_lrcconf_poweron_release(&dev_data->hfxo_node, NRF_LRCCONF_POWER_MAIN);
-}
-
-static void release_hfxo(struct dev_data_hfxo *dev_data)
-{
-#if IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)
-	unsigned int key;
-
-	key = full_irq_lock();
-	if (dev_data->request_count < 1) {
-		full_irq_unlock(key);
-		/* Misuse of the API, release without request? */
-		__ASSERT_NO_MSG(false);
-		/* In case asserts are disabled early return due to no requests pending */
-		return;
-	}
-
-	dev_data->request_count--;
-	if (dev_data->request_count < 1) {
-		stop_hfxo(dev_data);
-	}
-
-	full_irq_unlock(key);
-#else
-	stop_hfxo(dev_data);
-#endif /* CONFIG_ZERO_LATENCY_IRQS */
-}
-
-#if IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)
-void nrf_clock_control_hfxo_release(void)
-{
-	const struct device *dev = DEVICE_DT_INST_GET(0);
-	struct dev_data_hfxo *dev_data = dev->data;
-
-	release_hfxo(dev_data);
-}
-#endif /* IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS) */
-
 static void onoff_stop_hfxo(struct onoff_manager *mgr, onoff_notify_fn notify)
 {
 	struct dev_data_hfxo *dev_data =
 		CONTAINER_OF(mgr, struct dev_data_hfxo, mgr);
 
-	release_hfxo(dev_data);
+	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_STOPREQHFXO);
+	soc_lrcconf_poweron_release(&dev_data->hfxo_node, NRF_LRCCONF_POWER_MAIN);
 	notify(mgr, 0);
 }
 

From 3f10db70bb76ca033fe2ee9e228ff0564704b34e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:10 +0100
Subject: [PATCH 1145/2913] Revert "[nrf fromtree] drivers: clock_control: nrf:
 add zero-latency-isr safe APIs"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit bd64dc948be8d8f708691389f34e54bb1cade8b2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../drivers/clock_control/nrf_clock_control.h | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/include/zephyr/drivers/clock_control/nrf_clock_control.h b/include/zephyr/drivers/clock_control/nrf_clock_control.h
index 8d9bcbe3441..27ab518920f 100644
--- a/include/zephyr/drivers/clock_control/nrf_clock_control.h
+++ b/include/zephyr/drivers/clock_control/nrf_clock_control.h
@@ -317,30 +317,6 @@ int nrf_clock_control_cancel_or_release(const struct device *dev,
 	return api->cancel_or_release(dev, spec, cli);
 }
 
-/** @brief Request the HFXO from Zero Latency Interrupt context.
- *
- * Function is optimized for use in Zero Latency Interrupt context.
- * It does not give notification when the HFXO is ready, so each
- * user must put the request early enough to make sure the HFXO
- * ramp-up has finished on time.
- *
- * This function uses reference counting so the caller must ensure
- * that every nrf_clock_control_hfxo_request() call has a matching
- * nrf_clock_control_hfxo_release() call.
- */
-void nrf_clock_control_hfxo_request(void);
-
-/** @brief Release the HFXO from Zero Latency Interrupt context.
- *
- * Function is optimized for use in Zero Latency Interrupt context.
- *
- * Calls to this function must be coupled with prior calls
- * to nrf_clock_control_hfxo_request(), because it uses basic
- * reference counting to make sure the HFXO is released when
- * there are no more pending requests.
- */
-void nrf_clock_control_hfxo_release(void);
-
 #endif /* defined(CONFIG_CLOCK_CONTROL_NRF2) */
 
 /** @brief Get clock frequency that is used for the given node.

From 5e75f7ba84d8bb9a34847d0805b8603e7d7fe45f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:10 +0100
Subject: [PATCH 1146/2913] Revert "[nrf fromtree] net: openthread: Adding
 `diag transmit` command."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2d9da2a3ae2d39128f819fe35b4ab180c44b7341.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/openthread/platform/diag.c | 181 ++---------------------------
 1 file changed, 12 insertions(+), 169 deletions(-)

diff --git a/modules/openthread/platform/diag.c b/modules/openthread/platform/diag.c
index edf8ad09dd5..23ea3b97986 100644
--- a/modules/openthread/platform/diag.c
+++ b/modules/openthread/platform/diag.c
@@ -8,44 +8,20 @@
 #include <zephyr/drivers/gpio.h>
 
 #include <openthread/error.h>
-#include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/diag.h>
-#include <openthread/platform/radio.h>
 
 #include "platform-zephyr.h"
 #include "zephyr/sys/util.h"
 
-enum {
-	DIAG_TRANSMIT_MODE_IDLE,
-	DIAG_TRANSMIT_MODE_PACKETS,
-	DIAG_TRANSMIT_MODE_CARRIER,
-	DIAG_TRANSMIT_MODE_MODCARRIER
-
-} diag_trasmit_mode;
-
 /**
  * Diagnostics mode variables.
  *
  */
-
 static bool sDiagMode;
 static void *sDiagCallbackContext;
 static otPlatDiagOutputCallback sDiagOutputCallback;
-static uint8_t sTransmitMode = DIAG_TRANSMIT_MODE_IDLE;
-static uint8_t sChannel = 20;
-static uint32_t sTxPeriod = 1;
-static int32_t sTxCount;
-static int32_t sTxRequestedCount = 1;
 
 static otError startModCarrier(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[]);
-static otError processTransmit(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[]);
-
-static otError parse_long(char *aArgs, long *aValue)
-{
-	char *endptr;
-	*aValue = strtol(aArgs, &endptr, 0);
-	return (*endptr == '\0') ? OT_ERROR_NONE : OT_ERROR_PARSE;
-}
 
 static void diag_output(const char *aFormat, ...)
 {
@@ -72,16 +48,15 @@ void otPlatDiagSetOutputCallback(otInstance *aInstance,
 
 otError otPlatDiagProcess(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[])
 {
+	ARG_UNUSED(aInstance);
+	ARG_UNUSED(aArgsLength);
+
 #if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 	if (strcmp(aArgs[0], "modcarrier") == 0) {
 		return startModCarrier(aInstance, aArgsLength - 1, aArgs + 1);
 	}
 #endif
 
-	if (strcmp(aArgs[0], "transmit") == 0) {
-		return processTransmit(aInstance, aArgsLength - 1, aArgs + 1);
-	}
-
 	/* Add more platform specific diagnostics features here. */
 	diag_output("diag feature '%s' is not supported\r\n", aArgs[0]);
 
@@ -105,7 +80,6 @@ bool otPlatDiagModeGet(void)
 void otPlatDiagChannelSet(uint8_t aChannel)
 {
 	ARG_UNUSED(aChannel);
-	sChannel = aChannel;
 }
 
 void otPlatDiagTxPowerSet(int8_t aTxPower)
@@ -125,21 +99,19 @@ void otPlatDiagRadioReceived(otInstance *aInstance,
 #if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 otError otPlatDiagRadioTransmitCarrier(otInstance *aInstance, bool aEnable)
 {
-	if (!otPlatDiagModeGet() || (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE &&
-				     sTransmitMode != DIAG_TRANSMIT_MODE_CARRIER)) {
+	if (!otPlatDiagModeGet()) {
 		return OT_ERROR_INVALID_STATE;
 	}
 
-	if (aEnable) {
-		sTransmitMode = DIAG_TRANSMIT_MODE_CARRIER;
-	} else {
-		sTransmitMode = DIAG_TRANSMIT_MODE_IDLE;
-	}
-
 	return platformRadioTransmitCarrier(aInstance, aEnable);
 }
 #endif /* CONFIG_IEEE802154_CARRIER_FUNCTIONS */
 
+void otPlatDiagAlarmCallback(otInstance *aInstance)
+{
+	ARG_UNUSED(aInstance);
+}
+
 /*
  * To enable gpio diag commands, in Devicetree create `openthread` node in `/options/` path
  * with `compatible = "openthread,config"` property and `diag-gpios` property,
@@ -319,6 +291,9 @@ otError otPlatDiagGpioGetMode(uint32_t aGpio, otGpioMode *aMode)
 
 static otError startModCarrier(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[])
 {
+	ARG_UNUSED(aInstance);
+	ARG_UNUSED(aArgsLength);
+
 	bool enable = true;
 	uint8_t data[OT_RADIO_FRAME_MAX_SIZE + 1];
 
@@ -326,147 +301,15 @@ static otError startModCarrier(otInstance *aInstance, uint8_t aArgsLength, char
 		return OT_ERROR_INVALID_ARGS;
 	}
 
-	if (!otPlatDiagModeGet() || (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE &&
-				     sTransmitMode != DIAG_TRANSMIT_MODE_MODCARRIER)) {
-		return OT_ERROR_INVALID_STATE;
-	}
-
 	if (strcmp(aArgs[0], "stop") == 0) {
 		enable = false;
-		sTransmitMode = DIAG_TRANSMIT_MODE_IDLE;
 	} else {
 		if (hex2bin(aArgs[0], strlen(aArgs[0]), data, ARRAY_SIZE(data)) == 0) {
 			return OT_ERROR_INVALID_ARGS;
 		}
-		sTransmitMode = DIAG_TRANSMIT_MODE_MODCARRIER;
 	}
 
 	return platformRadioTransmitModulatedCarrier(aInstance, enable, data);
 }
 
 #endif
-
-void otPlatDiagAlarmCallback(otInstance *aInstance)
-{
-	uint32_t now;
-	otRadioFrame *txPacket;
-	const uint16_t diag_packet_len = 30;
-
-	if (sTransmitMode == DIAG_TRANSMIT_MODE_PACKETS) {
-		if ((sTxCount > 0) || (sTxCount == -1)) {
-			txPacket = otPlatRadioGetTransmitBuffer(aInstance);
-
-			txPacket->mInfo.mTxInfo.mTxDelayBaseTime = 0;
-			txPacket->mInfo.mTxInfo.mTxDelay = 0;
-			txPacket->mInfo.mTxInfo.mMaxCsmaBackoffs = 0;
-			txPacket->mInfo.mTxInfo.mMaxFrameRetries = 0;
-			txPacket->mInfo.mTxInfo.mRxChannelAfterTxDone = sChannel;
-			txPacket->mInfo.mTxInfo.mTxPower = OT_RADIO_POWER_INVALID;
-			txPacket->mInfo.mTxInfo.mIsHeaderUpdated = false;
-			txPacket->mInfo.mTxInfo.mIsARetx = false;
-			txPacket->mInfo.mTxInfo.mCsmaCaEnabled = false;
-			txPacket->mInfo.mTxInfo.mCslPresent = false;
-			txPacket->mInfo.mTxInfo.mIsSecurityProcessed = false;
-
-			txPacket->mLength = diag_packet_len;
-
-			for (uint8_t i = 0; i < diag_packet_len; i++) {
-				txPacket->mPsdu[i] = i;
-			}
-
-			otPlatRadioTransmit(aInstance, txPacket);
-
-			if (sTxCount != -1) {
-				sTxCount--;
-			}
-
-			now = otPlatAlarmMilliGetNow();
-			otPlatAlarmMilliStartAt(aInstance, now, sTxPeriod);
-		} else {
-			sTransmitMode = DIAG_TRANSMIT_MODE_IDLE;
-			otPlatAlarmMilliStop(aInstance);
-			otPlatLog(OT_LOG_LEVEL_DEBG, OT_LOG_REGION_PLATFORM, "Transmit done");
-		}
-	}
-}
-
-static otError processTransmit(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[])
-{
-	otError error = OT_ERROR_NONE;
-	long value;
-	uint32_t now;
-
-	if (!otPlatDiagModeGet()) {
-		return OT_ERROR_INVALID_STATE;
-	}
-
-	if (aArgsLength == 0) {
-		diag_output("transmit will send %" PRId32 " diagnostic messages with %" PRIu32
-			    " ms interval\r\n",
-			    sTxRequestedCount, sTxPeriod);
-
-	} else if (strcmp(aArgs[0], "stop") == 0) {
-		if (sTransmitMode == DIAG_TRANSMIT_MODE_IDLE) {
-			return OT_ERROR_INVALID_STATE;
-		}
-
-		otPlatAlarmMilliStop(aInstance);
-		diag_output("diagnostic message transmission is stopped\r\n");
-		sTransmitMode = DIAG_TRANSMIT_MODE_IDLE;
-		otPlatRadioReceive(aInstance, sChannel);
-
-	} else if (strcmp(aArgs[0], "start") == 0) {
-		if (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE) {
-			return OT_ERROR_INVALID_STATE;
-		}
-
-		otPlatAlarmMilliStop(aInstance);
-		sTransmitMode = DIAG_TRANSMIT_MODE_PACKETS;
-		sTxCount = sTxRequestedCount;
-		now = otPlatAlarmMilliGetNow();
-		otPlatAlarmMilliStartAt(aInstance, now, sTxPeriod);
-		diag_output("sending %" PRId32 " diagnostic messages with %" PRIu32
-			    " ms interval\r\n",
-			    sTxRequestedCount, sTxPeriod);
-	} else if (strcmp(aArgs[0], "interval") == 0) {
-
-		if (aArgsLength != 2) {
-			return OT_ERROR_INVALID_ARGS;
-		}
-
-		error = parse_long(aArgs[1], &value);
-		if (error != OT_ERROR_NONE) {
-			return error;
-		}
-
-		if (value <= 0) {
-			return OT_ERROR_INVALID_ARGS;
-		}
-		sTxPeriod = (uint32_t)(value);
-		diag_output("set diagnostic messages interval to %" PRIu32
-			    " ms\r\n", sTxPeriod);
-
-	} else if (strcmp(aArgs[0], "count") == 0) {
-
-		if (aArgsLength != 2) {
-			return OT_ERROR_INVALID_ARGS;
-		}
-
-		error = parse_long(aArgs[1], &value);
-		if (error != OT_ERROR_NONE) {
-			return error;
-		}
-
-		if ((value <= 0) && (value != -1)) {
-			return OT_ERROR_INVALID_ARGS;
-		}
-
-		sTxRequestedCount = (uint32_t)(value);
-		diag_output("set diagnostic messages count to %" PRId32 "\r\n",
-			    sTxRequestedCount);
-	} else {
-		return OT_ERROR_INVALID_ARGS;
-	}
-
-	return error;
-}

From db56f6c6e2ba7b79d2ca599e8ccf49b9c088565c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:10 +0100
Subject: [PATCH 1147/2913] Revert "[nrf fromlist] drivers: nrf_wifi: Add
 dependencies"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 34af0b4c6d017538d1655f4949efb1ff38a05e9b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index 0bb9b21b314..dea420370a6 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -201,8 +201,6 @@ config NRF70_SR_COEX
 
 config NRF70_SR_COEX_RF_SWITCH
 	bool "GPIO configuration to control SR side RF switch position"
-	depends on $(dt_node_has_prop,nrf70, srrf-switch-gpios)
-	depends on NRF70_SR_COEX
 	help
 	  Select this option to enable GPIO configuration to control SR side RF switch position.
 	  If this GPIO is asserted (1), the SR side RF switch is connected to the Wi-Fi side (shared antenna).

From fa76cbf5d0ff18c652504a72823f9626218e433f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:10 +0100
Subject: [PATCH 1148/2913] Revert "[nrf fromlist] drivers: nrf_wifi: Add help
 for SR RF switch"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit da1f133c5df6a507941690478b94f0b60bf42bdb.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index dea420370a6..45a22b7e7fa 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -201,10 +201,6 @@ config NRF70_SR_COEX
 
 config NRF70_SR_COEX_RF_SWITCH
 	bool "GPIO configuration to control SR side RF switch position"
-	help
-	  Select this option to enable GPIO configuration to control SR side RF switch position.
-	  If this GPIO is asserted (1), the SR side RF switch is connected to the Wi-Fi side (shared antenna).
-	  If this GPIO is de-asserted (0), the SR side RF switch is connected to the SR side (separate antenna).
 
 config NRF70_WORKQ_STACK_SIZE
 	int "Stack size for workqueue"

From ac5041264e985654b526f803680fa3c8127550f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:10 +0100
Subject: [PATCH 1149/2913] Revert "[nrf fromlist] drivers: nrf_wifi: Remove
 hardcoded prints"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 98c346084770cacdbf421406b477ac4316184e32.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/src/coex.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/wifi/nrf_wifi/src/coex.c b/drivers/wifi/nrf_wifi/src/coex.c
index 947bf8511a2..7bb89a07e9e 100644
--- a/drivers/wifi/nrf_wifi/src/coex.c
+++ b/drivers/wifi/nrf_wifi/src/coex.c
@@ -247,8 +247,10 @@ int nrf_wifi_config_sr_switch(bool separate_antennas)
 
 	if (separate_antennas) {
 		gpio_pin_set_dt(&sr_rf_switch_spec, 0x0);
+		LOG_INF("GPIO P1.10 set to 0");
 	} else {
 		gpio_pin_set_dt(&sr_rf_switch_spec, 0x1);
+		LOG_INF("GPIO P1.10 set to 1");
 	}
 
 	return 0;

From b39772ef6f8d865a703f73291c4f44f8370aec90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:10 +0100
Subject: [PATCH 1150/2913] Revert "[nrf fromlist] shields: nrf7002eb: Fix 54H
 app core boot"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ecc4804d72b1eebf1ebf253f54e51fff364c8086.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay       | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 boards/shields/nrf7002eb/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/boards/shields/nrf7002eb/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/boards/shields/nrf7002eb/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index 89e3d5c4c9a..00000000000
--- a/boards/shields/nrf7002eb/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/* Only GPIOs 1..11 are supported for PORT1 in nRF54H20DK board, for now
- * remove this as Wi-Fi SR co-existence is not yet supported on this board.
- * The external SR RF switch may not even be present on this board.
- */
-&nrf70 {
-	/delete-property/ srrf-switch-gpios;
-};

From 02fddfbd9fb698d72adcf2337f60137cfc883568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:11 +0100
Subject: [PATCH 1151/2913] Revert "[nrf fromlist] dts: common: nordic: Add
 clock source to timers"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f5efb381b8af563600f327c2273b117d0ef7f785.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/common/nordic/nrf54h20.dtsi        |  6 +++---
 dts/common/nordic/nrf54l20.dtsi        |  4 ++--
 dts/common/nordic/nrf54l_05_10_15.dtsi |  4 ++--
 dts/common/nordic/nrf9280.dtsi         | 17 +++++------------
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index f879e08fa52..6ce4fda00fa 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -374,7 +374,7 @@
 				status = "disabled";
 				cc-num = <8>;
 				interrupts = <40 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&hfxo>;
+				clocks = <&fll16m>;
 				max-bit-width = <32>;
 				max-frequency = <DT_FREQ_M(32)>;
 				prescaler = <0>;
@@ -386,7 +386,7 @@
 				status = "disabled";
 				cc-num = <8>;
 				interrupts = <41 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&hfxo>;
+				clocks = <&fll16m>;
 				max-bit-width = <32>;
 				max-frequency = <DT_FREQ_M(32)>;
 				prescaler = <0>;
@@ -398,7 +398,7 @@
 				status = "disabled";
 				cc-num = <8>;
 				interrupts = <42 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&hfxo>;
+				clocks = <&fll16m>;
 				max-bit-width = <32>;
 				max-frequency = <DT_FREQ_M(32)>;
 				prescaler = <0>;
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index a7f72bf5a30..7487915cdfd 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -152,7 +152,7 @@
 				cc-num = <6>;
 				max-bit-width = <32>;
 				interrupts = <85 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&hfpll>;
+				max-frequency = <DT_FREQ_M(128)>;
 				prescaler = <0>;
 			};
 
@@ -181,7 +181,7 @@
 				cc-num = <8>;
 				max-bit-width = <32>;
 				interrupts = <133 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&hfxo>;
+				max-frequency = <DT_FREQ_M(32)>;
 				prescaler = <0>;
 			};
 
diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi
index d4e0ee6df00..d1141643ef1 100644
--- a/dts/common/nordic/nrf54l_05_10_15.dtsi
+++ b/dts/common/nordic/nrf54l_05_10_15.dtsi
@@ -191,7 +191,7 @@
 				cc-num = <6>;
 				max-bit-width = <32>;
 				interrupts = <85 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&hfpll>;
+				max-frequency = <DT_FREQ_M(128)>;
 				prescaler = <0>;
 			};
 
@@ -220,7 +220,7 @@
 				cc-num = <8>;
 				max-bit-width = <32>;
 				interrupts = <133 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&hfxo>;
+				max-frequency = <DT_FREQ_M(32)>;
 				prescaler = <0>;
 			};
 
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 1222f3675ec..c9e1742e102 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -88,13 +88,6 @@
 			#clock-cells = <0>;
 			clock-frequency = <DT_FREQ_M(16)>;
 		};
-
-		hsfll120: hsfll120 {
-			compatible = "fixed-clock";
-			clocks = <&fll16m>;
-			#clock-cells = <0>;
-			clock-frequency = <DT_FREQ_M(320)>;
-		};
 	};
 
 	soc {
@@ -268,7 +261,7 @@
 				cc-num = <8>;
 				interrupts = <40 NRF_DEFAULT_IRQ_PRIORITY>;
 				max-bit-width = <32>;
-				clocks = <&hfxo>;
+				max-frequency = <DT_FREQ_M(32)>;
 				prescaler = <0>;
 			};
 
@@ -279,7 +272,7 @@
 				cc-num = <8>;
 				interrupts = <41 NRF_DEFAULT_IRQ_PRIORITY>;
 				max-bit-width = <32>;
-				clocks = <&hfxo>;
+				max-frequency = <DT_FREQ_M(32)>;
 				prescaler = <0>;
 			};
 
@@ -290,7 +283,7 @@
 				cc-num = <8>;
 				interrupts = <42 NRF_DEFAULT_IRQ_PRIORITY>;
 				max-bit-width = <32>;
-				clocks = <&hfxo>;
+				max-frequency = <DT_FREQ_M(32)>;
 				prescaler = <0>;
 			};
 
@@ -469,7 +462,7 @@
 				cc-num = <6>;
 				interrupts = <226 NRF_DEFAULT_IRQ_PRIORITY>;
 				max-bit-width = <32>;
-				clocks = <&hsfll120>;
+				max-frequency = <DT_FREQ_M(320)>;
 				prescaler = <0>;
 			};
 
@@ -480,7 +473,7 @@
 				cc-num = <6>;
 				interrupts = <227 NRF_DEFAULT_IRQ_PRIORITY>;
 				max-bit-width = <32>;
-				clocks = <&hsfll120>;
+				max-frequency = <DT_FREQ_M(320)>;
 				prescaler = <0>;
 			};
 

From 79d88f113531c1bb2768197b52b779d2ec1f277a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:11 +0100
Subject: [PATCH 1152/2913] Revert "[nrf fromlist] boards: native: nrf_bsim:
 nrf54l15: Bring back clocks"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fbc2ac066fbcef15fb9c19d5396d9ffe03389841.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
index 13bf2e338f8..7d0a2f96aa5 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -22,6 +22,7 @@
 	};
 
 	/delete-node/ cpus;
+	/delete-node/ clocks;
 	/delete-node/ sw-pwm;
 
 	soc {

From dbceb73ff0d08eb8d033551e20050e735f89dac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:11 +0100
Subject: [PATCH 1153/2913] Revert "[nrf fromtree] dts: common: nordic: nrf54l:
 Add hfpll clock source"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cffd6a084abc111c6c4275fa0ed81a0d2dff525c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts | 4 ----
 dts/common/nordic/nrf54l20.dtsi                         | 7 -------
 dts/common/nordic/nrf54l_05_10_15.dtsi                  | 7 -------
 3 files changed, 18 deletions(-)

diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
index 7d0a2f96aa5..5a77d6c2e98 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -85,10 +85,6 @@
 	};
 };
 
-&uart00 {
-	/delete-property/ clocks;
-};
-
 &uart20 {
 	status = "okay";
 	current-speed = <115200>;
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 7487915cdfd..d06c4814103 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -52,12 +52,6 @@
 			#clock-cells = <0>;
 			clock-frequency = <DT_FREQ_M(32)>;
 		};
-
-		hfpll: hfpll {
-			compatible = "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <DT_FREQ_M(128)>;
-		};
 	};
 
 	soc {
@@ -129,7 +123,6 @@
 				compatible = "nordic,nrf-uarte";
 				reg = <0x4d000 0x1000>;
 				interrupts = <77 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&hfpll>;
 				status = "disabled";
 				endtx-stoptx-supported;
 				frame-timeout-supported;
diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi
index d1141643ef1..eba41095e75 100644
--- a/dts/common/nordic/nrf54l_05_10_15.dtsi
+++ b/dts/common/nordic/nrf54l_05_10_15.dtsi
@@ -65,12 +65,6 @@
 			#clock-cells = <0>;
 			clock-frequency = <DT_FREQ_M(32)>;
 		};
-
-		hfpll: hfpll {
-			compatible = "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <DT_FREQ_M(128)>;
-		};
 	};
 
 	soc {
@@ -150,7 +144,6 @@
 				compatible = "nordic,nrf-uarte";
 				reg = <0x4a000 0x1000>;
 				interrupts = <74 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&hfpll>;
 				status = "disabled";
 				endtx-stoptx-supported;
 				frame-timeout-supported;

From 885791d8684dea4036f09012e0edef1681819386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:11 +0100
Subject: [PATCH 1154/2913] Revert "[nrf fromtree] tests/bsim: Also runtime
 test the UART drivers for the nrf54l15"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 745e2dc5975356cb74b894c923606c4cea2b9ee8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/bsim/ci.uart.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/bsim/ci.uart.sh b/tests/bsim/ci.uart.sh
index da305e1fcef..ab49280e130 100755
--- a/tests/bsim/ci.uart.sh
+++ b/tests/bsim/ci.uart.sh
@@ -12,15 +12,9 @@ cd ${ZEPHYR_BASE}
 set -uex
 
 echo "UART: Single device tests"
-echo " nRF52833 & 5340:"
 ${ZEPHYR_BASE}/scripts/twister -T tests/drivers/uart/ --force-color --inline-logs -v -M \
   -p nrf52_bsim --fixture gpio_loopback -- -uart0_loopback
 
-echo " nRF54L15:"
-${ZEPHYR_BASE}/scripts/twister -T tests/drivers/uart/ --force-color --inline-logs -v -M \
-  -p nrf54l15bsim/nrf54l15/cpuapp --fixture gpio_loopback \
-  -- -uart2_loopback
-
 echo "UART: Multi device tests"
 WORK_DIR=${ZEPHYR_BASE}/bsim_uart nice tests/bsim/drivers/uart/compile.sh
 RESULTS_FILE=${ZEPHYR_BASE}/bsim_out/bsim_results.uart.52.xml \

From f24b4495d1331746e6201143b6cfa575238f510a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:11 +0100
Subject: [PATCH 1155/2913] Revert "[nrf fromtree] tests uart_pm: Enable for
 nrf54l15bsim"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b1b11f347c5df56dc831b84b72bd63159206e212.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../uart/uart_pm/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay   | 3 ---
 tests/drivers/uart/uart_pm/testcase.yaml                       | 2 --
 2 files changed, 5 deletions(-)
 delete mode 100644 tests/drivers/uart/uart_pm/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/uart/uart_pm/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_pm/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 10b8825014f..00000000000
--- a/tests/drivers/uart/uart_pm/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-
-#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/uart/uart_pm/testcase.yaml b/tests/drivers/uart/uart_pm/testcase.yaml
index 29c336441c6..f9a7a8f902c 100644
--- a/tests/drivers/uart/uart_pm/testcase.yaml
+++ b/tests/drivers/uart/uart_pm/testcase.yaml
@@ -6,7 +6,6 @@ common:
   platform_allow:
     - nrf52840dk/nrf52840
     - nrf54l15dk/nrf54l15/cpuapp
-    - nrf54l15bsim/nrf54l15/cpuapp
     - nrf54h20dk/nrf54h20/cpuapp
     - nrf52_bsim
     - nrf5340bsim/nrf5340/cpuapp
@@ -30,7 +29,6 @@ tests:
     extra_args: DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840.overlay;nrf_rx_disable.overlay"
     platform_exclude:
       - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15bsim/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
 
   drivers.uart.pm.enhanced_poll:

From 269bb9ea2150424e20fcab61b59242c448f0d523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:11 +0100
Subject: [PATCH 1156/2913] Revert "[nrf fromtree] tests uart_mix_fifo_poll:
 Enable for nrf54l15bsim"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8bd38a0d550f10b4cb45a74c5b131f689c23fe84.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54l15bsim_nrf54l15_cpuapp.overlay                | 3 ---
 tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml            | 1 -
 2 files changed, 4 deletions(-)
 delete mode 100644 tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 10b8825014f..00000000000
--- a/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-
-#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml b/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
index 13f1d52d4d5..91470dc990b 100644
--- a/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
+++ b/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
@@ -10,7 +10,6 @@ common:
     - nrf5340dk/nrf5340/cpuapp
     - nrf5340bsim/nrf5340/cpuapp
     - nrf54l15dk/nrf54l15/cpuapp
-    - nrf54l15bsim/nrf54l15/cpuapp
     - nrf54h20dk/nrf54h20/cpuapp
     - nrf54h20dk/nrf54h20/cpurad
     - nrf52_bsim

From 1ca113dc761b4e757d8dffd9817a8c44b74083ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:11 +0100
Subject: [PATCH 1157/2913] Revert "[nrf fromtree] tests uart_async_api: Enable
 in nrf54l15bsim//cpuapp"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 57412f90a634c76d9f7b0f79501ee1275a3ae9ab.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../uart_async_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay | 3 ---
 tests/drivers/uart/uart_async_api/testcase.yaml                | 1 -
 2 files changed, 4 deletions(-)
 delete mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 10b8825014f..00000000000
--- a/tests/drivers/uart/uart_async_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-
-#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/uart/uart_async_api/testcase.yaml b/tests/drivers/uart/uart_async_api/testcase.yaml
index 3d7a7b3675a..1433691d2a7 100644
--- a/tests/drivers/uart/uart_async_api/testcase.yaml
+++ b/tests/drivers/uart/uart_async_api/testcase.yaml
@@ -30,7 +30,6 @@ tests:
       - nrf52840dk/nrf52840
       - nrf52_bsim
       - nrf5340bsim/nrf5340/cpuapp
-      - nrf54l15bsim/nrf54l15/cpuapp
     filter: CONFIG_SERIAL_SUPPORT_ASYNC
     harness: ztest
     harness_config:

From e082602ca019a0dc82590ce3f3925ec0fe45347f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:11 +0100
Subject: [PATCH 1158/2913] Revert "[nrf fromtree] doc boards nrfbsim: Mention
 the UARTE as supported for nrf54l15"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit db3b37dbed0221e6b849db3c4d9c5eb10ce802ab.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/native/nrf_bsim/doc/nrf54l15bsim.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/boards/native/nrf_bsim/doc/nrf54l15bsim.rst b/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
index 5d7d67f7d1a..9df70aafdc7 100644
--- a/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
+++ b/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
@@ -50,7 +50,6 @@ This boards include models of some of the nRF54L15 SOC peripherals:
 * RTC (Real Time Counter)
 * TEMP (Temperature sensor)
 * TIMER
-* UARTE (UART with Easy DMA)
 * UICR (User Information Configuration Registers)
 
 and will use the same drivers as the nrf54l15dk targets for these.

From d66c567f471f86ee58bdf49b26eca1688fc8e478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:11 +0100
Subject: [PATCH 1159/2913] Revert "[nrf fromtree] boards nrfbsim: Enable
 UART(E) peripherals for nrf54l15bsim"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ce84896c2275e329bc316d8dcbf0b389814a1ad0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts | 21 +++++--------------
 .../nrf54l15bsim_nrf54l15_cpuapp.yaml         |  1 +
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
index 5a77d6c2e98..66c1b26a6e7 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -8,7 +8,6 @@
 
 #include <mem.h>
 #include <arm/nordic/nrf54l15_cpuapp.dtsi>
-#include <../boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi>
 
 / {
 	model = "Nordic NRF54L15 BSIM NRF54L15 Application";
@@ -16,7 +15,6 @@
 
 	chosen {
 		zephyr,entropy = &rng;
-		zephyr,bt-c2h-uart = &uart20;
 		zephyr,flash-controller = &rram_controller;
 		zephyr,flash = &cpuapp_rram;
 	};
@@ -30,15 +28,19 @@
 		/delete-node/ memory@2002f000;
 		peripheral@50000000 {
 			/delete-node/ spi@4a000;
+			/delete-node/ uart@4a000;
 			/delete-node/ vpr@4c000;
 			/delete-node/ mailbox@0;
 			/delete-node/ interrupt-controller@f0000000;
 			/delete-node/ i2c@c6000;
 			/delete-node/ spi@c6000;
+			/delete-node/ uart@c6000;
 			/delete-node/ i2c@c7000;
 			/delete-node/ spi@c7000;
+			/delete-node/ uart@c7000;
 			/delete-node/ i2c@c8000;
 			/delete-node/ spi@c8000;
+			/delete-node/ uart@c8000;
 			/delete-node/ pwm@d2000;
 			/delete-node/ pwm@d3000;
 			/delete-node/ pwm@d4000;
@@ -49,6 +51,7 @@
 			/delete-node/ qdec@e1000;
 			/delete-node/ i2c@104000;
 			/delete-node/ spi@104000;
+			/delete-node/ uart@104000;
 			/delete-node/ watchdog@108000;
 			/delete-node/ watchdog@109000;
 		};
@@ -85,20 +88,6 @@
 	};
 };
 
-&uart20 {
-	status = "okay";
-	current-speed = <115200>;
-	pinctrl-0 = <&uart20_default>;
-	pinctrl-1 = <&uart20_sleep>;
-	pinctrl-names = "default", "sleep";
-};
-
-&uart30 {
-	current-speed = <115200>;
-	pinctrl-0 = <&uart30_default>;
-	pinctrl-1 = <&uart30_sleep>;
-	pinctrl-names = "default", "sleep";
-};
 
 &gpio0 {
 	status = "okay";
diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml
index e09184de96d..6bbf4542660 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml
@@ -13,4 +13,5 @@ supported:
 testing:
   ignore_tags:
     - modem
+    - uart
     - bsim_skip_CI

From e7750444d3ab91f2786a2d1496368879f5481646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:11 +0100
Subject: [PATCH 1160/2913] Revert "[nrf fromtree] doc boards nrfbsim: Mention
 the UARTE as supported for nrf5340"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0b60cd738acc99c491a405c739f7bdf9a99c01c1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/native/nrf_bsim/doc/nrf5340bsim.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/boards/native/nrf_bsim/doc/nrf5340bsim.rst b/boards/native/nrf_bsim/doc/nrf5340bsim.rst
index d726c9d8e7b..8a257fa5bfe 100644
--- a/boards/native/nrf_bsim/doc/nrf5340bsim.rst
+++ b/boards/native/nrf_bsim/doc/nrf5340bsim.rst
@@ -43,7 +43,6 @@ These boards include models of some of the nRF5340 SOC peripherals:
 * RTC (Real Time Counter)
 * TEMP (Temperature sensor)
 * TIMER
-* UARTE (UART with Easy DMA)
 * UICR (User Information Configuration Registers)
 
 and will use the same drivers as the nrf5340dk targets for these.

From 1dfa95b997eba0e50e5eab87a95380ad1b3726af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:11 +0100
Subject: [PATCH 1161/2913] Revert "[nrf fromtree] tests uart_pm: Enable for
 nrf5340bsim"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e279d8537ab6678093b6643583eb799f329fc258.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../uart/uart_pm/boards/nrf5340bsim_nrf5340_cpuapp.overlay     | 3 ---
 tests/drivers/uart/uart_pm/testcase.yaml                       | 1 -
 2 files changed, 4 deletions(-)
 delete mode 100644 tests/drivers/uart/uart_pm/boards/nrf5340bsim_nrf5340_cpuapp.overlay

diff --git a/tests/drivers/uart/uart_pm/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/drivers/uart/uart_pm/boards/nrf5340bsim_nrf5340_cpuapp.overlay
deleted file mode 100644
index c7277e73775..00000000000
--- a/tests/drivers/uart/uart_pm/boards/nrf5340bsim_nrf5340_cpuapp.overlay
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-
-#include "nrf52840dk_nrf52840.overlay"
diff --git a/tests/drivers/uart/uart_pm/testcase.yaml b/tests/drivers/uart/uart_pm/testcase.yaml
index f9a7a8f902c..9a7729c8236 100644
--- a/tests/drivers/uart/uart_pm/testcase.yaml
+++ b/tests/drivers/uart/uart_pm/testcase.yaml
@@ -8,7 +8,6 @@ common:
     - nrf54l15dk/nrf54l15/cpuapp
     - nrf54h20dk/nrf54h20/cpuapp
     - nrf52_bsim
-    - nrf5340bsim/nrf5340/cpuapp
   harness_config:
     fixture: gpio_loopback
   depends_on: gpio

From 9aff190605097e950cf9f60a616d624a8ed864c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:11 +0100
Subject: [PATCH 1162/2913] Revert "[nrf fromtree] tests uart_mix_fifo_poll:
 Enable for nrf5340bsim"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 66d0223597aac9a7b41c50bbe61cbdc3dff49d8e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf5340bsim_nrf5340_cpuapp.overlay                  | 3 ---
 tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml            | 1 -
 2 files changed, 4 deletions(-)
 delete mode 100644 tests/drivers/uart/uart_mix_fifo_poll/boards/nrf5340bsim_nrf5340_cpuapp.overlay

diff --git a/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf5340bsim_nrf5340_cpuapp.overlay
deleted file mode 100644
index bfd4f8676f1..00000000000
--- a/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf5340bsim_nrf5340_cpuapp.overlay
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-
-#include "nrf5340dk_nrf5340_cpuapp.overlay"
diff --git a/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml b/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
index 91470dc990b..1b13bc57166 100644
--- a/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
+++ b/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
@@ -8,7 +8,6 @@ common:
     - nrf52840dk/nrf52840
     - nrf9160dk/nrf9160
     - nrf5340dk/nrf5340/cpuapp
-    - nrf5340bsim/nrf5340/cpuapp
     - nrf54l15dk/nrf54l15/cpuapp
     - nrf54h20dk/nrf54h20/cpuapp
     - nrf54h20dk/nrf54h20/cpurad

From 423ed2851f5edea39fbe63526279eff48772e5c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:11 +0100
Subject: [PATCH 1163/2913] Revert "[nrf fromtree] tests uart_async_api: Enable
 in nrf5340bsim//cpuapp"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9b2c09e59f15913123106a3e41f930d21e64719a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.conf    | 2 --
 .../uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay | 3 ---
 tests/drivers/uart/uart_async_api/testcase.yaml              | 5 +----
 3 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.conf
 delete mode 100644 tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay

diff --git a/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.conf b/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.conf
deleted file mode 100644
index e7a460fde6b..00000000000
--- a/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_UART_1_NRF_HW_ASYNC_TIMER=1
-CONFIG_UART_NRFX_UARTE_ENHANCED_RX=y
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay
deleted file mode 100644
index bfd4f8676f1..00000000000
--- a/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-
-#include "nrf5340dk_nrf5340_cpuapp.overlay"
diff --git a/tests/drivers/uart/uart_async_api/testcase.yaml b/tests/drivers/uart/uart_async_api/testcase.yaml
index 1433691d2a7..e7a970d4a58 100644
--- a/tests/drivers/uart/uart_async_api/testcase.yaml
+++ b/tests/drivers/uart/uart_async_api/testcase.yaml
@@ -26,10 +26,7 @@ tests:
     integration_platforms:
       - nucleo_h743zi
   drivers.uart.async_api.nrf_uarte_new:
-    platform_allow:
-      - nrf52840dk/nrf52840
-      - nrf52_bsim
-      - nrf5340bsim/nrf5340/cpuapp
+    platform_allow: nrf52840dk/nrf52840 nrf52_bsim
     filter: CONFIG_SERIAL_SUPPORT_ASYNC
     harness: ztest
     harness_config:

From df05025170353d04b95b41ef36ea1dcb73916fcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:11 +0100
Subject: [PATCH 1164/2913] Revert "[nrf fromtree] boards nrfbsim: Enable
 UART(E) peripherals for nrf5340bsim"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 77cff4c4fbe399532ce1b674d6e80d50908d8d5b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts  |  9 ---------
 boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml |  1 +
 boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts  | 10 ----------
 boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml |  1 +
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
index 0273ee4d776..f70d06aae75 100644
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
@@ -8,7 +8,6 @@
 
 #include <mem.h>
 #include <arm/nordic/nrf5340_cpuapp.dtsi>
-#include <../boards/nordic/nrf5340dk/nrf5340_cpuapp_common-pinctrl.dtsi>
 
 / {
 	model = "Nordic NRF5340 BSIM NRF5340 Application";
@@ -120,14 +119,6 @@
 	status = "okay";
 };
 
-&uart0 {
-	status = "okay";
-	current-speed = <115200>;
-	pinctrl-0 = <&uart0_default>;
-	pinctrl-1 = <&uart0_sleep>;
-	pinctrl-names = "default", "sleep";
-};
-
 /* 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 9d31586454a..8e0cdf59fb7 100644
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml
@@ -10,6 +10,7 @@ toolchain:
 testing:
   ignore_tags:
     - 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 0f098a7dd29..0b9d3a79d1a 100644
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts
@@ -8,7 +8,6 @@
 
 #include <mem.h>
 #include <arm/nordic/nrf5340_cpunet.dtsi>
-#include <../boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet-pinctrl.dtsi>
 
 / {
 	model = "Nordic NRF5340 BSIM NRF5340 Network";
@@ -24,7 +23,6 @@
 	};
 
 	chosen {
-		zephyr,console = &uart0;
 		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,ieee802154 = &ieee802154;
@@ -81,14 +79,6 @@
 	status = "okay";
 };
 
-&uart0 {
-	status = "okay";
-	current-speed = <115200>;
-	pinctrl-0 = <&uart0_default>;
-	pinctrl-1 = <&uart0_sleep>;
-	pinctrl-names = "default", "sleep";
-};
-
 /* 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 a0d6d2caa44..c774a3a5782 100644
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml
@@ -10,6 +10,7 @@ toolchain:
 testing:
   ignore_tags:
     - modem
+    - uart
     - bsim_skip_CI
 supported:
   - gpio

From d179fed119a45a9e23805591cfe43afbd256d831 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:11 +0100
Subject: [PATCH 1165/2913] Revert "[nrf fromtree] doc boards nrfbsim: Mention
 the GPIO & GPIOTE as supported"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 30138ab7433d743fd5c0934f34a9d17f5bb5905e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/native/nrf_bsim/doc/nrf5340bsim.rst  | 1 -
 boards/native/nrf_bsim/doc/nrf54l15bsim.rst | 1 -
 2 files changed, 2 deletions(-)

diff --git a/boards/native/nrf_bsim/doc/nrf5340bsim.rst b/boards/native/nrf_bsim/doc/nrf5340bsim.rst
index 8a257fa5bfe..271e0db1bc1 100644
--- a/boards/native/nrf_bsim/doc/nrf5340bsim.rst
+++ b/boards/native/nrf_bsim/doc/nrf5340bsim.rst
@@ -34,7 +34,6 @@ These boards include models of some of the nRF5340 SOC peripherals:
 * DPPI (Distributed Programmable Peripheral Interconnect)
 * EGU (Event Generator Unit)
 * FICR (Factory Information Configuration Registers)
-* GPIO & GPIOTE
 * IPC (Interprocessor communication)
 * MUTEX (Mutual exclusive peripheral)
 * NVMC (Non-Volatile Memory Controller / Flash)
diff --git a/boards/native/nrf_bsim/doc/nrf54l15bsim.rst b/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
index 9df70aafdc7..61ad06c4aa5 100644
--- a/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
+++ b/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
@@ -42,7 +42,6 @@ This boards include models of some of the nRF54L15 SOC peripherals:
 * ECB (AES electronic codebook mode encryption)
 * EGU (Event Generator Unit)
 * FICR (Factory Information Configuration Registers)
-* GPIO & GPIOTE
 * GRTC (Global Real-time Counter)
 * PPIB (PPI Bridge)
 * RADIO

From e9f4bb86fe29094167518c293ddc04ef9d3ebc26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:11 +0100
Subject: [PATCH 1166/2913] Revert "[nrf fromtree] tests gpio_get_direction:
 Enable for nrf5340bsim"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3d3783c0a805c7b6fc8c69f18e6e2b0cf711dfc5.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf5340bsim_nrf5340_cpuapp.overlay              | 7 -------
 .../boards/nrf5340bsim_nrf5340_cpunet.overlay              | 7 -------
 2 files changed, 14 deletions(-)
 delete mode 100644 tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpuapp.overlay
 delete mode 100644 tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpunet.overlay

diff --git a/tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpuapp.overlay
deleted file mode 100644
index 2edc8260dc3..00000000000
--- a/tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpuapp.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf52_bsim.overlay"
diff --git a/tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpunet.overlay b/tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpunet.overlay
deleted file mode 100644
index 2edc8260dc3..00000000000
--- a/tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpunet.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf52_bsim.overlay"

From 4f2ecaec34077daa691e77285d0733eff7ec7f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:12 +0100
Subject: [PATCH 1167/2913] Revert "[nrf fromtree] tests gpio_basic_api: Enable
 for nrf5340bsim"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 446f0fe9dac1a5e00b6154dd8105de5fecd9ac22.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.conf  | 1 -
 .../boards/nrf5340bsim_nrf5340_cpuapp.overlay              | 7 -------
 .../gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.conf  | 1 -
 .../boards/nrf5340bsim_nrf5340_cpunet.overlay              | 7 -------
 tests/drivers/gpio/gpio_basic_api/testcase.yaml            | 7 +------
 5 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.conf
 delete mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay
 delete mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.conf
 delete mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.overlay

diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.conf b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.conf
deleted file mode 100644
index b9d02cf11d5..00000000000
--- a/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SKIP_PULL_TEST=y
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay
deleted file mode 100644
index 2edc8260dc3..00000000000
--- a/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf52_bsim.overlay"
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.conf b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.conf
deleted file mode 100644
index b9d02cf11d5..00000000000
--- a/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SKIP_PULL_TEST=y
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.overlay
deleted file mode 100644
index 2edc8260dc3..00000000000
--- a/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf52_bsim.overlay"
diff --git a/tests/drivers/gpio/gpio_basic_api/testcase.yaml b/tests/drivers/gpio/gpio_basic_api/testcase.yaml
index 3e7d1d1fcba..eddca3d26dc 100644
--- a/tests/drivers/gpio/gpio_basic_api/testcase.yaml
+++ b/tests/drivers/gpio/gpio_basic_api/testcase.yaml
@@ -13,12 +13,7 @@ tests:
     filter: dt_compat_enabled("test-gpio-basic-api") and not dt_compat_enabled("arduino-header-r3")
 
   drivers.gpio.nrf_sense_edge:
-    platform_allow:
-      - nrf52840dk/nrf52840
-      - nrf52_bsim
-      - nrf5340bsim/nrf5340/cpuapp
-      - nrf5340bsim/nrf5340/cpunet
-      - nrf54l15bsim/nrf54l15/cpuapp
+    platform_allow: nrf52840dk/nrf52840 nrf52_bsim nrf54l15bsim/nrf54l15/cpuapp
     extra_args: "DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840.overlay;\
                  boards/nrf52840dk_nrf52840_sense_edge.overlay"
 

From 304d60ddc7414cf776561ba03f89b1e7a8fe3e5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:12 +0100
Subject: [PATCH 1168/2913] Revert "[nrf fromtree] tests gpio_hogs: Enable for
 nrf5340bsim"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 204459158431ef8c5b1914b30ccd219e92a4ed3b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../gpio_hogs/boards/nrf5340bsim_nrf5340_cpuapp.overlay    | 7 -------
 .../gpio_hogs/boards/nrf5340bsim_nrf5340_cpunet.overlay    | 7 -------
 tests/drivers/gpio/gpio_hogs/testcase.yaml                 | 2 --
 3 files changed, 16 deletions(-)
 delete mode 100644 tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpuapp.overlay
 delete mode 100644 tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpunet.overlay

diff --git a/tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpuapp.overlay
deleted file mode 100644
index e84f379d899..00000000000
--- a/tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpuapp.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2023 Vestas Wind Systems A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf52_bsim.overlay"
diff --git a/tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpunet.overlay b/tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpunet.overlay
deleted file mode 100644
index e84f379d899..00000000000
--- a/tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpunet.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2023 Vestas Wind Systems A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf52_bsim.overlay"
diff --git a/tests/drivers/gpio/gpio_hogs/testcase.yaml b/tests/drivers/gpio/gpio_hogs/testcase.yaml
index fa3108e21e6..81b9a1d8d60 100644
--- a/tests/drivers/gpio/gpio_hogs/testcase.yaml
+++ b/tests/drivers/gpio/gpio_hogs/testcase.yaml
@@ -11,8 +11,6 @@ tests:
       - nrf52840dk/nrf52840
       - nucleo_g474re
       - nrf52_bsim
-      - nrf5340bsim/nrf5340/cpuapp
-      - nrf5340bsim/nrf5340/cpunet
       - nrf54l15bsim/nrf54l15/cpuapp
       - mr_canhubk3
       - s32z2xxdc2/s32z270/rtu0

From 776c5a0abdd8505c4dc0eb995d6463e979d39141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:12 +0100
Subject: [PATCH 1169/2913] Revert "[nrf fromtree] boards nrfbsim: Enable GPIO
 & GPIOTE peripherals for nrf5340bsim"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 52e6e31ebceb37d76e2e72faf645a2242f78bfec.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../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, 14 insertions(+), 29 deletions(-)

diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
index f70d06aae75..256b9bfb875 100644
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
@@ -35,6 +35,9 @@
 		/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 {
@@ -79,8 +82,11 @@
 			/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;
 	};
 
@@ -106,19 +112,6 @@
 	};
 };
 
-
-&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 8e0cdf59fb7..055bc9e578f 100644
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml
@@ -9,8 +9,7 @@ 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 0b9d3a79d1a..d7d6a2fe75d 100644
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts
@@ -17,9 +17,12 @@
 	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 {
@@ -33,11 +36,14 @@
 	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;
@@ -67,18 +73,6 @@
 	};
 };
 
-&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 c774a3a5782..f88fb9c6ca8 100644
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml
@@ -9,8 +9,7 @@ toolchain:
   - zephyr
 testing:
   ignore_tags:
+    - gpio
     - modem
     - uart
     - bsim_skip_CI
-supported:
-  - gpio

From d91f783dd81dcd25f32c7f999aee01dfe80645f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:12 +0100
Subject: [PATCH 1170/2913] Revert "[nrf fromtree] tests gpio_get_direction:
 Enable for nrf54l15bsim"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7bbebcdcbb4a3a12708e12f7d35ea0d133479593.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54l15bsim_nrf54l15_cpuapp.overlay            | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 tests/drivers/gpio/gpio_get_direction/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/gpio/gpio_get_direction/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/gpio/gpio_get_direction/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 2edc8260dc3..00000000000
--- a/tests/drivers/gpio/gpio_get_direction/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf52_bsim.overlay"

From b19370c35e8e2e193c52023f1285ed620c286e8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:12 +0100
Subject: [PATCH 1171/2913] Revert "[nrf fromtree] tests gpio_hogs: Enable for
 nrf54l15bsim"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3d9f65693b4a90ba5f9cb21d4ad06d8c5f1b5ede.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf54l15bsim_nrf54l15_cpuapp.overlay      | 35 -------------------
 tests/drivers/gpio/gpio_hogs/testcase.yaml    |  1 -
 2 files changed, 36 deletions(-)
 delete mode 100644 tests/drivers/gpio/gpio_hogs/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/gpio/gpio_hogs/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/gpio/gpio_hogs/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 6bf18e1faa1..00000000000
--- a/tests/drivers/gpio/gpio_hogs/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2023 Vestas Wind Systems A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/gpio/gpio.h>
-
-/ {
-	zephyr,user {
-		output-high-gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
-		output-low-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
-		input-gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
-	};
-};
-
-&gpio0 {
-	hog1 {
-		gpio-hog;
-		gpios = <3 GPIO_ACTIVE_LOW>;
-		output-high;
-	};
-
-	hog2 {
-		gpio-hog;
-		gpios = <4 GPIO_ACTIVE_HIGH>;
-		output-low;
-	};
-
-	hog3 {
-		gpio-hog;
-		gpios = <1 GPIO_ACTIVE_LOW>;
-		input;
-	};
-};
diff --git a/tests/drivers/gpio/gpio_hogs/testcase.yaml b/tests/drivers/gpio/gpio_hogs/testcase.yaml
index 81b9a1d8d60..998d68d7c67 100644
--- a/tests/drivers/gpio/gpio_hogs/testcase.yaml
+++ b/tests/drivers/gpio/gpio_hogs/testcase.yaml
@@ -11,7 +11,6 @@ tests:
       - nrf52840dk/nrf52840
       - nucleo_g474re
       - nrf52_bsim
-      - nrf54l15bsim/nrf54l15/cpuapp
       - mr_canhubk3
       - s32z2xxdc2/s32z270/rtu0
       - s32z2xxdc2/s32z270/rtu1

From 0701d9d9e8c95bb7b561bb0c1e4a6e621f74367b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:12 +0100
Subject: [PATCH 1172/2913] Revert "[nrf fromtree] tests gpio_basic_api: Enable
 for nrf54l15bsim"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cc3c06ca569a229eca54de6525154fb5701fa2be.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54l15bsim_nrf54l15_cpuapp.conf               | 1 -
 .../boards/nrf54l15bsim_nrf54l15_cpuapp.overlay            | 7 -------
 tests/drivers/gpio/gpio_basic_api/testcase.yaml            | 2 +-
 3 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.conf
 delete mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.conf b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.conf
deleted file mode 100644
index b9d02cf11d5..00000000000
--- a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SKIP_PULL_TEST=y
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 2edc8260dc3..00000000000
--- a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf52_bsim.overlay"
diff --git a/tests/drivers/gpio/gpio_basic_api/testcase.yaml b/tests/drivers/gpio/gpio_basic_api/testcase.yaml
index eddca3d26dc..df924719f30 100644
--- a/tests/drivers/gpio/gpio_basic_api/testcase.yaml
+++ b/tests/drivers/gpio/gpio_basic_api/testcase.yaml
@@ -13,7 +13,7 @@ tests:
     filter: dt_compat_enabled("test-gpio-basic-api") and not dt_compat_enabled("arduino-header-r3")
 
   drivers.gpio.nrf_sense_edge:
-    platform_allow: nrf52840dk/nrf52840 nrf52_bsim nrf54l15bsim/nrf54l15/cpuapp
+    platform_allow: nrf52840dk/nrf52840 nrf52_bsim
     extra_args: "DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840.overlay;\
                  boards/nrf52840dk_nrf52840_sense_edge.overlay"
 

From 1476348bc5fb09922408ef2ea291aece22528dc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:12 +0100
Subject: [PATCH 1173/2913] Revert "[nrf fromtree] boards nrfbsim: Enable GPIO
 & GPIOTE peripherals for nrf54l15bsim"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a901541b863a68d3fa4936f731fcc5484e7c0c43.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts | 26 ++++---------------
 .../nrf54l15bsim_nrf54l15_cpuapp.yaml         |  2 +-
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
index 66c1b26a6e7..e6129833778 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -32,6 +32,7 @@
 			/delete-node/ vpr@4c000;
 			/delete-node/ mailbox@0;
 			/delete-node/ interrupt-controller@f0000000;
+			/delete-node/ gpio@50400;
 			/delete-node/ i2c@c6000;
 			/delete-node/ spi@c6000;
 			/delete-node/ uart@c6000;
@@ -46,6 +47,8 @@
 			/delete-node/ pwm@d4000;
 			/delete-node/ adc@d5000;
 			/delete-node/ nfct@d6000;
+			/delete-node/ gpio@d8200;
+			/delete-node/ gpiote@da000;
 			/delete-node/ i2s@dd000;
 			/delete-node/ qdec@e0000;
 			/delete-node/ qdec@e1000;
@@ -54,6 +57,8 @@
 			/delete-node/ uart@104000;
 			/delete-node/ watchdog@108000;
 			/delete-node/ watchdog@109000;
+			/delete-node/ gpio@10a000;
+			/delete-node/ gpiote@10c000;
 		};
 	};
 
@@ -88,27 +93,6 @@
 	};
 };
 
-
-&gpio0 {
-	status = "okay";
-};
-
-&gpio1 {
-	status = "okay";
-};
-
-&gpio2 {
-	status = "okay";
-};
-
-&gpiote20 {
-	status = "okay";
-};
-
-&gpiote30 {
-	status = "okay";
-};
-
 &temp {
 	status = "okay";
 };
diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml
index 6bbf4542660..cbdd257334f 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml
@@ -9,9 +9,9 @@ toolchain:
   - zephyr
 supported:
   - counter
-  - gpio
 testing:
   ignore_tags:
+    - gpio
     - modem
     - uart
     - bsim_skip_CI

From 1d0cfb82c541ab7cba7a19a39ff8382c5fe9d115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:12 +0100
Subject: [PATCH 1174/2913] Revert "[nrf noup] drivers: spi_dw: Bring back
 custom EXMIF peripheral handling"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 352fb6b750c90973396bd706fd1433801ee35317.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/pinctrl/pinctrl_nrf.c              |  3 +-
 drivers/spi/spi_dw.c                       | 32 +---------------------
 dts/bindings/spi/nordic,nrf-exmif-spi.yaml |  8 ------
 3 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 dts/bindings/spi/nordic,nrf-exmif-spi.yaml

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 68ff6d8d7e4..42c4f24559a 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -374,8 +374,7 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_can) */
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) || \
-	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif_spi)
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
 		/* Pin routing is controlled by secure domain, via UICR */
 		case NRF_FUN_EXMIF_CK:
 		case NRF_FUN_EXMIF_DQ0:
diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
index 7ee8204ad78..649a13aca01 100644
--- a/drivers/spi/spi_dw.c
+++ b/drivers/spi/spi_dw.c
@@ -41,14 +41,6 @@ LOG_MODULE_REGISTER(spi_dw);
 #include <zephyr/drivers/pinctrl.h>
 #endif
 
-#ifdef CONFIG_HAS_NRFX
-#include <nrfx.h>
-#endif
-
-#ifdef CONFIG_SOC_NRF54H20_GPD
-#include <nrf/gpd.h>
-#endif
-
 static inline bool spi_dw_is_slave(struct spi_dw_data *spi)
 {
 	return (IS_ENABLED(CONFIG_SPI_SLAVE) &&
@@ -266,7 +258,6 @@ static int spi_dw_configure(const struct device *dev,
 		/* Baud rate and Slave select, for master only */
 		write_baudr(dev, SPI_DW_CLK_DIVIDER(info->clock_frequency,
 						    config->frequency));
-		write_ser(dev, BIT(config->slave));
 	}
 
 	if (spi_dw_is_slave(spi)) {
@@ -509,10 +500,6 @@ void spi_dw_isr(const struct device *dev)
 	uint32_t int_status;
 	int error;
 
-#ifdef CONFIG_HAS_NRFX
-	NRF_EXMIF->EVENTS_CORE = 0;
-#endif
-
 	int_status = read_isr(dev);
 
 	LOG_DBG("SPI %p int_status 0x%x - (tx: %d, rx: %d)", dev, int_status,
@@ -561,18 +548,6 @@ int spi_dw_init(const struct device *dev)
 
 	DEVICE_MMIO_MAP(dev, K_MEM_CACHE_NONE);
 
-#ifdef CONFIG_HAS_NRFX
-	NRF_EXMIF->INTENSET = BIT(0);
-	NRF_EXMIF->TASKS_START = 1;
-
-#ifdef CONFIG_SOC_NRF54H20_GPD
-	err = nrf_gpd_request(NRF_GPD_FAST_ACTIVE1);
-	if (err < 0) {
-		return err;
-	}
-#endif
-#endif
-
 	info->config_func();
 
 	/* Masking interrupt and making sure controller is disabled */
@@ -591,11 +566,6 @@ int spi_dw_init(const struct device *dev)
 	return 0;
 }
 
-#define REG_ADDR(inst) \
-	COND_CODE_1(DT_NODE_HAS_COMPAT(DT_DRV_INST(inst), nordic_nrf_exmif_spi), \
-		    (Z_DEVICE_MMIO_NAMED_ROM_INITIALIZER(core, DT_DRV_INST(inst))), \
-		    (DEVICE_MMIO_ROM_INIT(DT_DRV_INST(inst))))
-
 #define SPI_CFG_IRQS_SINGLE_ERR_LINE(inst)					\
 		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(inst, rx_avail, irq),		\
 			    DT_INST_IRQ_BY_NAME(inst, rx_avail, priority),	\
@@ -668,7 +638,7 @@ COND_CODE_1(IS_EQ(DT_NUM_IRQS(DT_DRV_INST(inst)), 1),              \
 		SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(inst), ctx)                     \
 	};                                                                                  \
 	static const struct spi_dw_config spi_dw_config_##inst = {                          \
-		REG_ADDR(inst),                                                             \
+		DEVICE_MMIO_ROM_INIT(DT_DRV_INST(inst)),                                    \
 		.clock_frequency = COND_CODE_1(                                             \
 			DT_NODE_HAS_PROP(DT_INST_PHANDLE(inst, clocks), clock_frequency),   \
 			(DT_INST_PROP_BY_PHANDLE(inst, clocks, clock_frequency)),           \
diff --git a/dts/bindings/spi/nordic,nrf-exmif-spi.yaml b/dts/bindings/spi/nordic,nrf-exmif-spi.yaml
deleted file mode 100644
index d988b414687..00000000000
--- a/dts/bindings/spi/nordic,nrf-exmif-spi.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: Nordic External Memory Interface (EXMIF) used in SPI mode only
-
-compatible: "nordic,nrf-exmif-spi"
-
-include: snps,designware-spi.yaml

From d47180089e530d3cfbece660bc8e0dc4dac86e4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:12 +0100
Subject: [PATCH 1175/2913] Revert "[nrf noup] samples|tests: drivers: flash:
 Add support for "jedec,mspi-nor" devices"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ab8276b89fb1d4db34fc7c1214f08297d477fad9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay    | 9 ---------
 samples/drivers/jesd216/sample.yaml                      | 2 +-
 samples/drivers/jesd216/src/main.c                       | 4 +---
 .../spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay  | 9 ---------
 samples/drivers/spi_flash/sample.yaml                    | 2 +-
 samples/drivers/spi_flash/src/main.c                     | 2 --
 .../common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay     | 9 ---------
 tests/drivers/flash/common/src/main.c                    | 2 --
 8 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 delete mode 100644 samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 delete mode 100644 tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index b8f138ad2b2..00000000000
--- a/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&mx25uw63 {
-	status = "okay";
-};
diff --git a/samples/drivers/jesd216/sample.yaml b/samples/drivers/jesd216/sample.yaml
index a7ff46ffd9e..732d9379604 100644
--- a/samples/drivers/jesd216/sample.yaml
+++ b/samples/drivers/jesd216/sample.yaml
@@ -19,7 +19,7 @@ tests:
       - hifive_unmatched
       - mimxrt1170_evk/mimxrt1176/cm7
       - mimxrt1170_evk/mimxrt1176/cm4
-    filter: dt_compat_enabled("jedec,spi-nor") or dt_compat_enabled("jedec,mspi-nor")
+    filter: dt_compat_enabled("jedec,spi-nor")
     depends_on: spi
   sample.drivers.jesd216.nrf52840dk_spi:
     extra_args:
diff --git a/samples/drivers/jesd216/src/main.c b/samples/drivers/jesd216/src/main.c
index b8dad485997..480649397b6 100644
--- a/samples/drivers/jesd216/src/main.c
+++ b/samples/drivers/jesd216/src/main.c
@@ -14,8 +14,6 @@
 
 #if DT_HAS_COMPAT_STATUS_OKAY(jedec_spi_nor)
 #define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_spi_nor)
-#elif DT_HAS_COMPAT_STATUS_OKAY(jedec_mspi_nor)
-#define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_mspi_nor)
 #elif DT_HAS_COMPAT_STATUS_OKAY(nordic_qspi_nor)
 #define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(nordic_qspi_nor)
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_qspi_nor)
@@ -203,7 +201,7 @@ static void summarize_dw15(const struct jesd216_param_header *php,
 		printf("0-4-4 Mode methods: entry 0x%01x ; exit 0x%02x\n",
 		       dw15.entry_044, dw15.exit_044);
 	} else {
-		printf("0-4-4 Mode: not supported\n");
+		printf("0-4-4 Mode: not supported");
 	}
 	printf("4-4-4 Mode sequences: enable 0x%02x ; disable 0x%01x\n",
 	       dw15.enable_444, dw15.disable_444);
diff --git a/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index b8f138ad2b2..00000000000
--- a/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&mx25uw63 {
-	status = "okay";
-};
diff --git a/samples/drivers/spi_flash/sample.yaml b/samples/drivers/spi_flash/sample.yaml
index c0abb401323..377c5ccec6e 100644
--- a/samples/drivers/spi_flash/sample.yaml
+++ b/samples/drivers/spi_flash/sample.yaml
@@ -7,7 +7,7 @@ tests:
       - flash
     filter: dt_compat_enabled("jedec,spi-nor") or dt_compat_enabled("st,stm32-qspi-nor")
       or dt_compat_enabled("st,stm32-ospi-nor") or dt_compat_enabled("st,stm32-xspi-nor")
-      or dt_compat_enabled("nordic,qspi-nor") or dt_compat_enabled("jedec,mspi-nor")
+      or (dt_compat_enabled("nordic,qspi-nor") and CONFIG_NORDIC_QSPI_NOR)
     platform_exclude: hifive_unmatched
     harness: console
     harness_config:
diff --git a/samples/drivers/spi_flash/src/main.c b/samples/drivers/spi_flash/src/main.c
index 52e8b6062b5..b84359ae05b 100644
--- a/samples/drivers/spi_flash/src/main.c
+++ b/samples/drivers/spi_flash/src/main.c
@@ -34,8 +34,6 @@
 
 #if DT_HAS_COMPAT_STATUS_OKAY(jedec_spi_nor)
 #define SPI_FLASH_COMPAT jedec_spi_nor
-#elif DT_HAS_COMPAT_STATUS_OKAY(jedec_mspi_nor)
-#define SPI_FLASH_COMPAT jedec_mspi_nor
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_qspi_nor)
 #define SPI_FLASH_COMPAT st_stm32_qspi_nor
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_ospi_nor)
diff --git a/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index b8f138ad2b2..00000000000
--- a/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&mx25uw63 {
-	status = "okay";
-};
diff --git a/tests/drivers/flash/common/src/main.c b/tests/drivers/flash/common/src/main.c
index 66a5eba0297..9ca767943d9 100644
--- a/tests/drivers/flash/common/src/main.c
+++ b/tests/drivers/flash/common/src/main.c
@@ -14,8 +14,6 @@
 #define TEST_AREA_DEV_NODE	DT_INST(0, nordic_qspi_nor)
 #elif defined(CONFIG_SPI_NOR)
 #define TEST_AREA_DEV_NODE	DT_INST(0, jedec_spi_nor)
-#elif defined(CONFIG_FLASH_MSPI_NOR)
-#define TEST_AREA_DEV_NODE	DT_INST(0, jedec_mspi_nor)
 #else
 #define TEST_AREA	storage_partition
 #endif

From e5d3d6c12773cc849fe4a27c8f34e99dc96e362e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:12 +0100
Subject: [PATCH 1176/2913] Revert "[nrf fromlist] dts: nordic: Change
 compatible property for EXMIF node"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0b28040f26832f2732650f4c113a32608abd250f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf54h20dk_nrf54h20-pinctrl.dtsi          | 27 +------------------
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts | 17 +++---------
 .../nrf9280pdk_nrf9280-pinctrl.dtsi           | 27 +------------------
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts  | 17 +++---------
 .../{mspi => spi}/nordic,nrf-exmif.yaml       |  6 ++++-
 dts/common/nordic/nrf54h20.dtsi               |  5 ++--
 dts/common/nordic/nrf9280.dtsi                |  5 ++--
 7 files changed, 21 insertions(+), 83 deletions(-)
 rename dts/bindings/{mspi => spi}/nordic,nrf-exmif.yaml (70%)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
index f62df87dfe2..9b574a18ec5 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
@@ -73,37 +73,12 @@
 	/omit-if-no-ref/ exmif_default: exmif_default {
 		group1 {
 			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
-				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
-				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
 				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
-				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
-				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
-				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
-				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
-				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
-				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
 			nordic,drive-mode = <NRF_DRIVE_H0H1>;
 		};
 	};
 
-	/omit-if-no-ref/ exmif_sleep: exmif_sleep {
-		group1 {
-			low-power-enable;
-			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
-				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
-				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
-				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
-				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
-				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
-				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
-				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
-				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
-				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
-		};
-	};
-
 	/omit-if-no-ref/ can120_default: can120_default {
 		group1 {
 			psels = <NRF_PSEL(CAN_RX, 9, 4)>,
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 171732d81e6..9c3556b27c4 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -262,15 +262,15 @@ ipc0: &cpuapp_cpurad_ipc {
 };
 
 &exmif {
+	cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&exmif_default>;
-	pinctrl-1 = <&exmif_sleep>;
-	pinctrl-names = "default", "sleep";
+	pinctrl-names = "default";
 	status = "okay";
-
 	mx25uw63: mx25uw6345g@0 {
-		compatible = "jedec,mspi-nor";
+		compatible = "jedec,spi-nor";
 		status = "disabled";
 		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(48)>;
 		jedec-id = [c2 84 37];
 		sfdp-bfp = [
 			e5 20 8a ff  ff ff ff 03  00 ff 00 ff  00 ff 00 ff
@@ -283,15 +283,6 @@ ipc0: &cpuapp_cpurad_ipc {
 		has-dpd;
 		t-enter-dpd = <10000>;
 		t-exit-dpd = <30000>;
-		reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;
-
-		mspi-max-frequency = <DT_FREQ_M(50)>;
-		mspi-io-mode = "MSPI_IO_MODE_OCTAL";
-		mspi-data-rate = "MSPI_DATA_RATE_SINGLE";
-		mspi-hardware-ce-num = <1>;
-		mspi-cpp-mode = "MSPI_CPP_MODE_0";
-		mspi-endian = "MSPI_BIG_ENDIAN";
-		mspi-ce-polarity = "MSPI_CE_ACTIVE_LOW";
 	};
 };
 
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
index 143fd45f33e..48067a7052c 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
@@ -54,37 +54,12 @@
 	/omit-if-no-ref/ exmif_default: exmif_default {
 		group1 {
 			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
-				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
-				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
 				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
-				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
-				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
-				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
-				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
-				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
-				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
 			nordic,drive-mode = <NRF_DRIVE_H0H1>;
 		};
 	};
 
-	/omit-if-no-ref/ exmif_sleep: exmif_sleep {
-		group1 {
-			low-power-enable;
-			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
-				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
-				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
-				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
-				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
-				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
-				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
-				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
-				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
-				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
-		};
-	};
-
 	/omit-if-no-ref/ can120_default: can120_default {
 		group1 {
 			psels = <NRF_PSEL(CAN_RX, 9, 4)>,
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index 043f6f64f87..2ce9b912269 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -253,15 +253,15 @@ ipc0: &cpuapp_cpurad_ipc {
 };
 
 &exmif {
+	cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&exmif_default>;
-	pinctrl-1 = <&exmif_sleep>;
-	pinctrl-names = "default", "sleep";
+	pinctrl-names = "default";
 	status = "okay";
-
 	mx25uw63: mx25uw6345g@0 {
-		compatible = "jedec,mspi-nor";
+		compatible = "jedec,spi-nor";
 		status = "disabled";
 		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(48)>;
 		jedec-id = [c2 84 37];
 		sfdp-bfp = [
 			e5 20 8a ff  ff ff ff 03  00 ff 00 ff  00 ff 00 ff
@@ -274,15 +274,6 @@ ipc0: &cpuapp_cpurad_ipc {
 		has-dpd;
 		t-enter-dpd = <10000>;
 		t-exit-dpd = <30000>;
-		reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;
-
-		mspi-max-frequency = <DT_FREQ_M(50)>;
-		mspi-io-mode = "MSPI_IO_MODE_OCTAL";
-		mspi-data-rate = "MSPI_DATA_RATE_SINGLE";
-		mspi-hardware-ce-num = <1>;
-		mspi-cpp-mode = "MSPI_CPP_MODE_0";
-		mspi-endian = "MSPI_BIG_ENDIAN";
-		mspi-ce-polarity = "MSPI_CE_ACTIVE_LOW";
 	};
 };
 
diff --git a/dts/bindings/mspi/nordic,nrf-exmif.yaml b/dts/bindings/spi/nordic,nrf-exmif.yaml
similarity index 70%
rename from dts/bindings/mspi/nordic,nrf-exmif.yaml
rename to dts/bindings/spi/nordic,nrf-exmif.yaml
index 294254aa60e..d2b8815046b 100644
--- a/dts/bindings/mspi/nordic,nrf-exmif.yaml
+++ b/dts/bindings/spi/nordic,nrf-exmif.yaml
@@ -5,4 +5,8 @@ description: Nordic External Memory Interface (EXMIF)
 
 compatible: "nordic,nrf-exmif"
 
-include: snps,designware-ssi.yaml
+include: snps,designware-spi.yaml
+
+properties:
+  reg:
+    required: true
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 6ce4fda00fa..cdac7c3a6e2 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -509,8 +509,8 @@
 				status = "disabled";
 			};
 
-			exmif: exmif@95000 {
-				compatible = "nordic,nrf-exmif", "snps,designware-ssi";
+			exmif: spi@95000 {
+				compatible = "nordic,nrf-exmif";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x95000 0x500 0x95500 0xb00>;
@@ -519,6 +519,7 @@
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 				clock-frequency = <DT_FREQ_M(400)>;
 				fifo-depth = <32>;
+				max-xfer-size = <16>;
 				status = "disabled";
 			};
 
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index c9e1742e102..62b22b4fbc2 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -360,8 +360,8 @@
 				status = "disabled";
 			};
 
-			exmif: exmif@95000 {
-				compatible = "nordic,nrf-exmif", "snps,designware-ssi";
+			exmif: spi@95000 {
+				compatible = "nordic,nrf-exmif";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x95000 0x500 0x95500 0xb00>;
@@ -369,6 +369,7 @@
 				interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>;
 				clock-frequency = <DT_FREQ_M(400)>;
 				fifo-depth = <32>;
+				max-xfer-size = <16>;
 				status = "disabled";
 			};
 

From 07a4941e3559c5fe65710591e41bcf91676fe63c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:12 +0100
Subject: [PATCH 1177/2913] Revert "[nrf noup] cmake: use
 -DUSE_PARTITION_MANAGER=1 for lld linker script template"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7d364d07a827f7a7a8b829cfa9c5a628f5485473.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/linker/lld/target.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmake/linker/lld/target.cmake b/cmake/linker/lld/target.cmake
index bdea4f1ec92..b6b96525e70 100644
--- a/cmake/linker/lld/target.cmake
+++ b/cmake/linker/lld/target.cmake
@@ -52,7 +52,6 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
     -imacros ${AUTOCONF_H}
     ${current_includes}
     ${template_script_defines}
-    -DUSE_PARTITION_MANAGER=$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>
     -E ${LINKER_SCRIPT}
     -P # Prevent generation of debug `#line' directives.
     -o ${linker_script_gen}

From c1954bfa788445e4ce8ea846f6f2b768f99a2c1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:12 +0100
Subject: [PATCH 1178/2913] Revert "[nrf fromlist] samples:
 code_relocation_nocopy: Add configuration for nRF54H20 DK"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9edbdaf1cc6b20e1a070b9ce20bde88a30f5c35c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.conf      |  1 -
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay   | 17 -----------------
 .../code_relocation_nocopy/linker_arm_nocopy.ld |  7 -------
 3 files changed, 25 deletions(-)
 delete mode 100644 samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 delete mode 100644 samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
deleted file mode 100644
index 83035081389..00000000000
--- a/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FLASH=y
diff --git a/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index ab53f12725d..00000000000
--- a/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,17 +0,0 @@
-&cpuapp_ram0x_region {
-	nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWXS>;
-};
-
-&xip_region {
-	status = "okay";
-	nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RX>;
-};
-
-&mx25uw63 {
-	read-command = <0xEC13>;
-	command-length = "INSTR_2_BYTE";
-	address-length = "ADDR_4_BYTE";
-	rx-dummy = <20>;
-
-	xip-config = <1 0 0x20000000 0>;
-};
diff --git a/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld b/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
index 0a11783cca2..a1467f8e264 100644
--- a/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
+++ b/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
@@ -47,13 +47,6 @@
 #define EXTFLASH_ADDR	DT_REG_ADDR(DT_INST(0, st_stm32_xspi_nor))
 #define EXTFLASH_SIZE	DT_REG_ADDR_BY_IDX(DT_INST(0, st_stm32_xspi_nor), 1)
 
-#elif defined(CONFIG_FLASH_MSPI_NOR) && defined(CONFIG_SOC_NRF54H20_CPUAPP)
-
-#define EXTFLASH_NODE	DT_INST(0, jedec_mspi_nor)
-#define EXTFLASH_ADDR	0x60000000
-#define EXTFLASH_SIZE	DT_PROP_OR(EXTFLASH_NODE, size_in_bytes, \
-				   DT_PROP(EXTFLASH_NODE, size) / 8)
-
 #else
 
 /*

From 4cefcdd936a2fb86a6f37e1b71c9806ac4a9b5ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:12 +0100
Subject: [PATCH 1179/2913] Revert "[nrf fromlist] boards: nrf54h20dk: Add XIP
 region definition to memory map"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 71cc8b6287a55a06bd0a8e8a921172a5eef6861d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi       | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index f2937402554..80211205ca3 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -174,15 +174,6 @@
 			zephyr,memory-region = "DMA_RAM3x_RAD";
 			zephyr,memory-attr = <( DT_MEM_DMA )>;
 		};
-
-		xip_region: memory@60000000 {
-			compatible = "nordic,owned-memory";
-			reg = <0x60000000 0x20000000>;
-			status = "disabled";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0x0 0x60000000 0x20000000>;
-		};
 	};
 };
 

From c50584d57226629481d7d729741fdc8028a953c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:12 +0100
Subject: [PATCH 1180/2913] Revert "[nrf fromlist] samples: drivers: spi_flash:
 Remove unnecessary Kconfig option changes"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 20aa4392f5f94145c51b6bd0d8cf0afc0f017083.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../spi_flash/boards/adafruit_feather_nrf52840_sense.conf | 7 +++++++
 .../drivers/spi_flash/boards/em_starterkit_emsk_em9d.conf | 7 +++++++
 samples/drivers/spi_flash/boards/emsdp_emsdp_em11d.conf   | 7 +++++++
 samples/drivers/spi_flash/boards/mec172xevb_assy6906.conf | 7 +++++++
 samples/drivers/spi_flash/boards/nrf52840_mdk.conf        | 8 ++++++++
 samples/drivers/spi_flash/boards/nrf52840dk_nrf52840.conf | 8 ++++++++
 .../spi_flash/boards/nrf5340dk_nrf5340_cpuapp.conf        | 8 ++++++++
 samples/drivers/spi_flash/boards/stm32h735g_disco.conf    | 1 +
 samples/drivers/spi_flash/boards/stm32h7b3i_dk.conf       | 1 +
 samples/drivers/spi_flash/prj.conf                        | 1 +
 10 files changed, 55 insertions(+)
 create mode 100644 samples/drivers/spi_flash/boards/adafruit_feather_nrf52840_sense.conf
 create mode 100644 samples/drivers/spi_flash/boards/em_starterkit_emsk_em9d.conf
 create mode 100644 samples/drivers/spi_flash/boards/emsdp_emsdp_em11d.conf
 create mode 100644 samples/drivers/spi_flash/boards/mec172xevb_assy6906.conf
 create mode 100644 samples/drivers/spi_flash/boards/nrf52840_mdk.conf
 create mode 100644 samples/drivers/spi_flash/boards/nrf52840dk_nrf52840.conf
 create mode 100644 samples/drivers/spi_flash/boards/nrf5340dk_nrf5340_cpuapp.conf
 create mode 100644 samples/drivers/spi_flash/boards/stm32h735g_disco.conf
 create mode 100644 samples/drivers/spi_flash/boards/stm32h7b3i_dk.conf

diff --git a/samples/drivers/spi_flash/boards/adafruit_feather_nrf52840_sense.conf b/samples/drivers/spi_flash/boards/adafruit_feather_nrf52840_sense.conf
new file mode 100644
index 00000000000..d9add33645a
--- /dev/null
+++ b/samples/drivers/spi_flash/boards/adafruit_feather_nrf52840_sense.conf
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2020 Teslabs Engineering S.L.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_NORDIC_QSPI_NOR=y
diff --git a/samples/drivers/spi_flash/boards/em_starterkit_emsk_em9d.conf b/samples/drivers/spi_flash/boards/em_starterkit_emsk_em9d.conf
new file mode 100644
index 00000000000..4e3bfcd17d5
--- /dev/null
+++ b/samples/drivers/spi_flash/boards/em_starterkit_emsk_em9d.conf
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2023 Synopsys.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_SPI_NOR=y
diff --git a/samples/drivers/spi_flash/boards/emsdp_emsdp_em11d.conf b/samples/drivers/spi_flash/boards/emsdp_emsdp_em11d.conf
new file mode 100644
index 00000000000..4e3bfcd17d5
--- /dev/null
+++ b/samples/drivers/spi_flash/boards/emsdp_emsdp_em11d.conf
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2023 Synopsys.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_SPI_NOR=y
diff --git a/samples/drivers/spi_flash/boards/mec172xevb_assy6906.conf b/samples/drivers/spi_flash/boards/mec172xevb_assy6906.conf
new file mode 100644
index 00000000000..38f06a0c0f8
--- /dev/null
+++ b/samples/drivers/spi_flash/boards/mec172xevb_assy6906.conf
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2022 Microchip Technology Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_SPI_NOR=y
diff --git a/samples/drivers/spi_flash/boards/nrf52840_mdk.conf b/samples/drivers/spi_flash/boards/nrf52840_mdk.conf
new file mode 100644
index 00000000000..c17e6e08b39
--- /dev/null
+++ b/samples/drivers/spi_flash/boards/nrf52840_mdk.conf
@@ -0,0 +1,8 @@
+#
+# Copyright (c) 2020 Stephane D'Alu
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_SPI=n
+CONFIG_NORDIC_QSPI_NOR=y
diff --git a/samples/drivers/spi_flash/boards/nrf52840dk_nrf52840.conf b/samples/drivers/spi_flash/boards/nrf52840dk_nrf52840.conf
new file mode 100644
index 00000000000..c483efdb826
--- /dev/null
+++ b/samples/drivers/spi_flash/boards/nrf52840dk_nrf52840.conf
@@ -0,0 +1,8 @@
+#
+# Copyright (c) 2019 Peter Bigot Consulting, LLC
+# Copyright (c) 2019 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_NORDIC_QSPI_NOR=y
diff --git a/samples/drivers/spi_flash/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/drivers/spi_flash/boards/nrf5340dk_nrf5340_cpuapp.conf
new file mode 100644
index 00000000000..10239a8fd1b
--- /dev/null
+++ b/samples/drivers/spi_flash/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -0,0 +1,8 @@
+#
+# Copyright (c) 2020 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_SPI=n
+CONFIG_NORDIC_QSPI_NOR=y
diff --git a/samples/drivers/spi_flash/boards/stm32h735g_disco.conf b/samples/drivers/spi_flash/boards/stm32h735g_disco.conf
new file mode 100644
index 00000000000..d073f9492d8
--- /dev/null
+++ b/samples/drivers/spi_flash/boards/stm32h735g_disco.conf
@@ -0,0 +1 @@
+CONFIG_SPI=n
diff --git a/samples/drivers/spi_flash/boards/stm32h7b3i_dk.conf b/samples/drivers/spi_flash/boards/stm32h7b3i_dk.conf
new file mode 100644
index 00000000000..d073f9492d8
--- /dev/null
+++ b/samples/drivers/spi_flash/boards/stm32h7b3i_dk.conf
@@ -0,0 +1 @@
+CONFIG_SPI=n
diff --git a/samples/drivers/spi_flash/prj.conf b/samples/drivers/spi_flash/prj.conf
index d78e334e0fb..c5beb21553a 100644
--- a/samples/drivers/spi_flash/prj.conf
+++ b/samples/drivers/spi_flash/prj.conf
@@ -1,2 +1,3 @@
 CONFIG_STDOUT_CONSOLE=y
 CONFIG_FLASH=y
+CONFIG_SPI=y

From 9d091992ac0ff96fb42ce4b030a2c75bc3232e5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:12 +0100
Subject: [PATCH 1181/2913] Revert "[nrf fromlist] samples: drivers: jesd216:
 Remove unnecessary Kconfig option changes"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a9e530c1e11a170e4d85e5008c4bd97f2013beb9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/drivers/jesd216/boards/bmd_345_eval.conf       |  8 ++++++++
 samples/drivers/jesd216/boards/mr_canhubk3.conf        |  5 +++++
 .../drivers/jesd216/boards/nrf52840dk_nrf52840.conf    | 10 ++++++++++
 .../jesd216/boards/nrf52840dk_nrf52840_spi.conf        |  8 ++++++++
 samples/drivers/jesd216/prj.conf                       |  5 +++++
 samples/drivers/jesd216/sample.yaml                    |  1 +
 6 files changed, 37 insertions(+)
 create mode 100644 samples/drivers/jesd216/boards/bmd_345_eval.conf
 create mode 100644 samples/drivers/jesd216/boards/mr_canhubk3.conf
 create mode 100644 samples/drivers/jesd216/boards/nrf52840dk_nrf52840.conf
 create mode 100644 samples/drivers/jesd216/boards/nrf52840dk_nrf52840_spi.conf

diff --git a/samples/drivers/jesd216/boards/bmd_345_eval.conf b/samples/drivers/jesd216/boards/bmd_345_eval.conf
new file mode 100644
index 00000000000..8c262a3483e
--- /dev/null
+++ b/samples/drivers/jesd216/boards/bmd_345_eval.conf
@@ -0,0 +1,8 @@
+#
+# Copyright (c) 2021 Linumiz
+#
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_SPI=n
+CONFIG_SPI_NOR=n
+CONFIG_NORDIC_QSPI_NOR=y
diff --git a/samples/drivers/jesd216/boards/mr_canhubk3.conf b/samples/drivers/jesd216/boards/mr_canhubk3.conf
new file mode 100644
index 00000000000..b625f401a1c
--- /dev/null
+++ b/samples/drivers/jesd216/boards/mr_canhubk3.conf
@@ -0,0 +1,5 @@
+# Copyright 2023 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+# Override defaults for SPI NOR flash driver
+CONFIG_SPI_NOR=n
diff --git a/samples/drivers/jesd216/boards/nrf52840dk_nrf52840.conf b/samples/drivers/jesd216/boards/nrf52840dk_nrf52840.conf
new file mode 100644
index 00000000000..976830569e3
--- /dev/null
+++ b/samples/drivers/jesd216/boards/nrf52840dk_nrf52840.conf
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2019 Peter Bigot Consulting, LLC
+# Copyright (c) 2019 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_SPI=n
+CONFIG_SPI_NOR=n
+#CONFIG_NORDIC_QSPI_NOR=y
diff --git a/samples/drivers/jesd216/boards/nrf52840dk_nrf52840_spi.conf b/samples/drivers/jesd216/boards/nrf52840dk_nrf52840_spi.conf
new file mode 100644
index 00000000000..15982f1c92e
--- /dev/null
+++ b/samples/drivers/jesd216/boards/nrf52840dk_nrf52840_spi.conf
@@ -0,0 +1,8 @@
+#
+# Copyright (c) 2022 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_SPI=y
+CONFIG_SPI_NOR=y
diff --git a/samples/drivers/jesd216/prj.conf b/samples/drivers/jesd216/prj.conf
index b1b51a1e12f..c5c747a3bb3 100644
--- a/samples/drivers/jesd216/prj.conf
+++ b/samples/drivers/jesd216/prj.conf
@@ -1,3 +1,8 @@
 CONFIG_STDOUT_CONSOLE=y
 CONFIG_FLASH=y
 CONFIG_FLASH_JESD216_API=y
+
+# Assume the standard SPI NOR flash driver.  If the device uses
+# another driver add an override configuration in boards/.
+CONFIG_SPI=y
+CONFIG_SPI_NOR=y
diff --git a/samples/drivers/jesd216/sample.yaml b/samples/drivers/jesd216/sample.yaml
index 732d9379604..afc3b200554 100644
--- a/samples/drivers/jesd216/sample.yaml
+++ b/samples/drivers/jesd216/sample.yaml
@@ -24,6 +24,7 @@ tests:
   sample.drivers.jesd216.nrf52840dk_spi:
     extra_args:
       - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_spi.overlay
+      - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_spi.conf
     platform_allow: nrf52840dk/nrf52840
     integration_platforms:
       - nrf52840dk/nrf52840

From 7a78e8c8d78c0022127e495cb06f01ef71fb3c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:12 +0100
Subject: [PATCH 1182/2913] Revert "[nrf noup] drivers: pinctrl_nrf: Add
 support for EXMIF pins"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3f12dd6eca901c1830c49d754e0dc8be147635d9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/pinctrl/pinctrl_nrf.c                  | 18 ------------------
 .../zephyr/dt-bindings/pinctrl/nrf-pinctrl.h   |  2 --
 2 files changed, 20 deletions(-)

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 42c4f24559a..d0354f600a9 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -374,24 +374,6 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_can) */
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
-		/* Pin routing is controlled by secure domain, via UICR */
-		case NRF_FUN_EXMIF_CK:
-		case NRF_FUN_EXMIF_DQ0:
-		case NRF_FUN_EXMIF_DQ1:
-		case NRF_FUN_EXMIF_DQ2:
-		case NRF_FUN_EXMIF_DQ3:
-		case NRF_FUN_EXMIF_DQ4:
-		case NRF_FUN_EXMIF_DQ5:
-		case NRF_FUN_EXMIF_DQ6:
-		case NRF_FUN_EXMIF_DQ7:
-		case NRF_FUN_EXMIF_CS0:
-		case NRF_FUN_EXMIF_CS1:
-		case NRF_FUN_EXMIF_RWDS:
-			dir = NRF_GPIO_PIN_DIR_INPUT;
-			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
-			break;
-#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) */
 		default:
 			return -ENOTSUP;
 		}
diff --git a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
index 49c06f3668c..a73f59c48b7 100644
--- a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
@@ -162,8 +162,6 @@
 #define NRF_FUN_CAN_TX 46U
 /** CAN RX */
 #define NRF_FUN_CAN_RX 47U
-/** EXMIF RWDS */
-#define NRF_FUN_EXMIF_RWDS 50U
 /** GRTC fast clock output */
 #define NRF_FUN_GRTC_CLKOUT_FAST 55U
 /** GRTC slow clock output */

From 7292cd1513d2d8a2e451886e0abb7b375b050f84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:13 +0100
Subject: [PATCH 1183/2913] Revert "[nrf fromlist] drivers: flash: Add generic
 NOR flash driver for MSPI devices"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c6ace4b9136efbd1c1d3fadbb70684a08e2e0d94.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/flash/CMakeLists.txt         |   1 -
 drivers/flash/Kconfig.mspi           |  18 -
 drivers/flash/flash_mspi_nor.c       | 629 ---------------------------
 dts/bindings/mtd/jedec,mspi-nor.yaml |  13 -
 4 files changed, 661 deletions(-)
 delete mode 100644 drivers/flash/flash_mspi_nor.c
 delete mode 100644 dts/bindings/mtd/jedec,mspi-nor.yaml

diff --git a/drivers/flash/CMakeLists.txt b/drivers/flash/CMakeLists.txt
index aa2f8de7f75..97d9cd55059 100644
--- a/drivers/flash/CMakeLists.txt
+++ b/drivers/flash/CMakeLists.txt
@@ -34,7 +34,6 @@ zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_MX25UM51345G flash_mcux_f
 zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_NOR flash_mcux_flexspi_nor.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_ATXP032 flash_mspi_atxp032.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_EMUL_DEVICE flash_mspi_emul_device.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_NOR flash_mspi_nor.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_NOR flash_npcx_fiu_nor.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_QSPI flash_npcx_fiu_qspi.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_RPI_PICO flash_rpi_pico.c)
diff --git a/drivers/flash/Kconfig.mspi b/drivers/flash/Kconfig.mspi
index f9e515b5f9a..158fcefb528 100644
--- a/drivers/flash/Kconfig.mspi
+++ b/drivers/flash/Kconfig.mspi
@@ -28,22 +28,4 @@ config FLASH_MSPI_ATXP032
 	select FLASH_JESD216
 	select MSPI_AMBIQ_AP3 if SOC_SERIES_APOLLO3X
 
-menuconfig FLASH_MSPI_NOR
-	bool "Generic MSPI NOR Flash"
-	default y
-	depends on DT_HAS_JEDEC_MSPI_NOR_ENABLED
-	select FLASH_MSPI
-	select FLASH_HAS_EXPLICIT_ERASE
-	select FLASH_JESD216
-	select GPIO if $(dt_compat_any_has_prop,$(DT_COMPAT_JEDEC_MSPI_NOR),reset-gpios)
-
-config FLASH_MSPI_NOR_INIT_PRIORITY
-	int
-	depends on FLASH_MSPI_NOR
-	default 80
-	help
-	  Device driver initialization priority.
-	  Device is connected to MSPI bus, it has to
-	  be initialized after MSPI driver.
-
 endmenu
diff --git a/drivers/flash/flash_mspi_nor.c b/drivers/flash/flash_mspi_nor.c
deleted file mode 100644
index 1b8bfa1852f..00000000000
--- a/drivers/flash/flash_mspi_nor.c
+++ /dev/null
@@ -1,629 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define DT_DRV_COMPAT jedec_mspi_nor
-
-#include <zephyr/drivers/flash.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/drivers/mspi.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/pm/device.h>
-#include <zephyr/pm/device_runtime.h>
-
-#include "jesd216.h"
-#include "spi_nor.h"
-
-LOG_MODULE_REGISTER(flash_mspi_nor, CONFIG_FLASH_LOG_LEVEL);
-
-struct flash_mspi_nor_data {
-	struct k_sem acquired;
-	struct mspi_xfer_packet packet;
-	struct mspi_xfer xfer;
-};
-
-struct flash_mspi_nor_config {
-	const struct device *bus;
-	struct mspi_dev_id mspi_id;
-	struct mspi_dev_cfg mspi_cfg;
-#if defined(CONFIG_MSPI_XIP)
-	struct mspi_xip_cfg xip_cfg;
-#endif
-	struct gpio_dt_spec reset;
-	uint32_t flash_size;
-#if defined(CONFIG_FLASH_PAGE_LAYOUT)
-	struct flash_pages_layout layout;
-#endif
-	uint8_t jedec_id[SPI_NOR_MAX_ID_LEN];
-};
-
-static int acquire(const struct device *dev)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	int rc;
-
-	k_sem_take(&dev_data->acquired, K_FOREVER);
-
-	rc = pm_device_runtime_get(dev_config->bus);
-	if (rc < 0) {
-		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
-		return rc;
-	}
-
-	/* This acquires the MSPI controller and configures it for the flash. */
-	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
-			     MSPI_DEVICE_CONFIG_ALL, &dev_config->mspi_cfg);
-	if (rc < 0) {
-		LOG_ERR("mspi_dev_config() failed: %d", rc);
-		return rc;
-	}
-
-	return 0;
-}
-
-static void release(const struct device *dev)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-
-	/* This releases the MSPI controller. */
-	(void)mspi_get_channel_status(dev_config->bus, 0);
-
-	(void)pm_device_runtime_put(dev_config->bus);
-
-	k_sem_give(&dev_data->acquired);
-}
-
-static inline uint32_t dev_flash_size(const struct device *dev)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-
-	return dev_config->flash_size;
-}
-
-static inline uint16_t dev_page_size(const struct device *dev)
-{
-	return SPI_NOR_PAGE_SIZE;
-}
-
-static int api_read(const struct device *dev, off_t addr, void *dest,
-		    size_t size)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	const uint32_t flash_size = dev_flash_size(dev);
-	int rc;
-
-	if (size == 0) {
-		return 0;
-	}
-
-	if ((addr < 0) || ((addr + size) > flash_size)) {
-		return -EINVAL;
-	}
-
-	rc = acquire(dev);
-	if (rc < 0) {
-		return rc;
-	}
-
-	/* TODO: get rid of all these hard-coded values for MX25Ux chips */
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 20;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = SPI_NOR_OCMD_RD;
-	dev_data->packet.address   = addr;
-	dev_data->packet.data_buf  = dest;
-	dev_data->packet.num_bytes = size;
-	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-			     &dev_data->xfer);
-
-	release(dev);
-
-	if (rc < 0) {
-		LOG_ERR("SPI_NOR_OCMD_RD xfer failed: %d", rc);
-		return rc;
-	}
-
-	return 0;
-}
-
-static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	uint8_t status_reg;
-	int rc;
-
-	while (true) {
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.addr_length = 4;
-		dev_data->xfer.rx_dummy    = 4;
-		dev_data->packet.dir       = MSPI_RX;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_RDSR;
-		dev_data->packet.address   = 0;
-		dev_data->packet.data_buf  = &status_reg;
-		dev_data->packet.num_bytes = sizeof(status_reg);
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_RDSR xfer failed: %d", rc);
-			return rc;
-		}
-		if (!(status_reg & SPI_NOR_WIP_BIT)) {
-			break;
-		}
-
-		k_sleep(poll_period);
-	}
-
-	return 0;
-}
-
-static int api_write(const struct device *dev, off_t addr, const void *src,
-		     size_t size)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	const uint32_t flash_size = dev_flash_size(dev);
-	const uint16_t page_size = dev_page_size(dev);
-	int rc;
-
-	if (size == 0) {
-		return 0;
-	}
-
-	if ((addr < 0) || ((addr + size) > flash_size)) {
-		return -EINVAL;
-	}
-
-	rc = acquire(dev);
-	if (rc < 0) {
-		return rc;
-	}
-
-	while (size > 0) {
-		/* Split write into parts, each within one page only. */
-		uint16_t page_offset = (uint16_t)(addr % page_size);
-		uint16_t page_left = page_size - page_offset;
-		uint16_t to_write = (uint16_t)MIN(size, page_left);
-
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.tx_dummy    = 0;
-		dev_data->packet.dir       = MSPI_TX;
-
-		dev_data->xfer.addr_length = 0;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
-		dev_data->packet.num_bytes = 0;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
-			break;
-		}
-
-		dev_data->xfer.addr_length = 4;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_PAGE_PRG;
-		dev_data->packet.address   = addr;
-		dev_data->packet.data_buf  = (uint8_t *)src;
-		dev_data->packet.num_bytes = to_write;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_PAGE_PRG xfer failed: %d", rc);
-			break;
-		}
-
-		addr += to_write;
-		src   = (const uint8_t *)src + to_write;
-		size -= to_write;
-
-		rc = wait_until_ready(dev, K_MSEC(1));
-		if (rc < 0) {
-			break;
-		}
-	}
-
-	release(dev);
-
-	return rc;
-}
-
-static int api_erase(const struct device *dev, off_t addr, size_t size)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	const uint32_t flash_size = dev_flash_size(dev);
-	int rc = 0;
-
-	if ((addr < 0) || ((addr + size) > flash_size)) {
-		return -EINVAL;
-	}
-
-	if (!SPI_NOR_IS_SECTOR_ALIGNED(addr)) {
-		return -EINVAL;
-	}
-
-	if ((size % SPI_NOR_SECTOR_SIZE) != 0) {
-		return -EINVAL;
-	}
-
-	rc = acquire(dev);
-	if (rc < 0) {
-		return rc;
-	}
-
-	while (size > 0) {
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.tx_dummy    = 0;
-		dev_data->packet.dir       = MSPI_TX;
-		dev_data->packet.num_bytes = 0;
-
-		dev_data->xfer.addr_length = 0;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
-			break;
-		}
-
-		if (size == flash_size) {
-			/* Chip erase. */
-			dev_data->xfer.addr_length = 0;
-			dev_data->packet.cmd       = SPI_NOR_OCMD_CE;
-
-			size -= flash_size;
-		} else {
-			/* Sector erase. */
-			dev_data->xfer.addr_length = 4;
-			dev_data->packet.cmd       = SPI_NOR_OCMD_SE;
-			dev_data->packet.address   = addr;
-
-			addr += SPI_NOR_SECTOR_SIZE;
-			size -= SPI_NOR_SECTOR_SIZE;
-		}
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("Erase command 0x%02x xfer failed: %d",
-				dev_data->packet.cmd, rc);
-			break;
-		}
-
-		rc = wait_until_ready(dev, K_MSEC(1));
-		if (rc < 0) {
-			break;
-		}
-	}
-
-	release(dev);
-
-	return rc;
-}
-
-static const
-struct flash_parameters *api_get_parameters(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	static const struct flash_parameters parameters = {
-		.write_block_size = 1,
-		.erase_value = 0xff,
-	};
-
-	return &parameters;
-}
-
-static int read_jedec_id(const struct device *dev, uint8_t *id)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	int rc;
-
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 4;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_OCMD_READ_ID;
-	dev_data->packet.address   = 0;
-	dev_data->packet.data_buf  = id;
-	dev_data->packet.num_bytes = JESD216_READ_ID_LEN;
-	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-			     &dev_data->xfer);
-	if (rc < 0) {
-		printk("mspi_transceive() failed: %d\n", rc);
-		return rc;
-	}
-
-	return rc;
-}
-
-#if defined(CONFIG_FLASH_PAGE_LAYOUT)
-static void api_page_layout(const struct device *dev,
-			     const struct flash_pages_layout **layout,
-			     size_t *layout_size)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-
-	*layout = &dev_config->layout;
-	*layout_size = 1;
-}
-#endif /* CONFIG_FLASH_PAGE_LAYOUT */
-
-#if defined(CONFIG_FLASH_JESD216_API)
-static int api_sfdp_read(const struct device *dev, off_t addr, void *dest,
-			 size_t size)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	int rc;
-
-	if (size == 0) {
-		return 0;
-	}
-
-	rc = acquire(dev);
-	if (rc < 0) {
-		return rc;
-	}
-
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 20;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_OCMD_READ_SFDP;
-	dev_data->packet.address   = addr;
-	dev_data->packet.data_buf  = dest;
-	dev_data->packet.num_bytes = size;
-	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-			     &dev_data->xfer);
-	if (rc < 0) {
-		printk("JESD216_OCMD_READ_SFDP xfer failed: %d\n", rc);
-		return rc;
-	}
-
-	release(dev);
-
-	return rc;
-}
-
-static int api_read_jedec_id(const struct device *dev, uint8_t *id)
-{
-	int rc = 0;
-
-	rc = acquire(dev);
-	if (rc < 0) {
-		return rc;
-	}
-
-	rc = read_jedec_id(dev, id);
-
-	release(dev);
-
-	return rc;
-}
-#endif /* CONFIG_FLASH_JESD216_API  */
-
-static int dev_pm_action_cb(const struct device *dev,
-			    enum pm_device_action action)
-{
-	switch (action) {
-	case PM_DEVICE_ACTION_SUSPEND:
-		break;
-	case PM_DEVICE_ACTION_RESUME:
-		break;
-	default:
-		return -ENOTSUP;
-	}
-
-	return 0;
-}
-
-static int flash_chip_init(const struct device *dev)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	struct mspi_dev_cfg init_dev_cfg = dev_config->mspi_cfg;
-	uint8_t id[JESD216_READ_ID_LEN] = {0};
-	int rc;
-
-	init_dev_cfg.freq = MHZ(1);
-	init_dev_cfg.io_mode = MSPI_IO_MODE_SINGLE;
-
-	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
-			     MSPI_DEVICE_CONFIG_ALL, &init_dev_cfg);
-	if (rc < 0) {
-		LOG_ERR("Failed to set initial device config: %d", rc);
-		return rc;
-	}
-
-	dev_data->xfer.xfer_mode  = MSPI_PIO;
-	dev_data->xfer.packets    = &dev_data->packet;
-	dev_data->xfer.num_packet = 1;
-	dev_data->xfer.timeout    = 10;
-
-	dev_data->xfer.cmd_length  = 1;
-	dev_data->xfer.addr_length = 0;
-	dev_data->xfer.tx_dummy    = 0;
-	dev_data->xfer.rx_dummy    = 0;
-
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_CMD_READ_ID;
-	dev_data->packet.data_buf  = id;
-	dev_data->packet.num_bytes = sizeof(id);
-	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-			     &dev_data->xfer);
-	if (rc < 0) {
-		LOG_ERR("Failed to read JEDEC ID in single line mode: %d", rc);
-		return rc;
-	}
-
-	/*
-	 * If the read ID does not match the one from DTS, assume the flash
-	 * is already in the Octa I/O mode, so switching it is not needed.
-	 */
-	if (memcmp(id, dev_config->jedec_id, sizeof(id)) == 0) {
-		static const uint8_t enable_sopi[] = { 0x01 };
-
-		dev_data->packet.dir       = MSPI_TX;
-		dev_data->packet.cmd       = SPI_NOR_CMD_WREN;
-		dev_data->packet.num_bytes = 0;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("SPI_NOR_CMD_WREN xfer failed: %d", rc);
-			return rc;
-		}
-
-		dev_data->xfer.addr_length = 4;
-		dev_data->packet.cmd       = SPI_NOR_CMD_WR_CFGREG2;
-		dev_data->packet.address   = 0;
-		dev_data->packet.data_buf  = (uint8_t *)&enable_sopi;
-		dev_data->packet.num_bytes = sizeof(enable_sopi);
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			printk("SPI_NOR_CMD_WR_CFGREG2 xfer failed: %d\n", rc);
-			return rc;
-		}
-	}
-
-	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
-			     MSPI_DEVICE_CONFIG_ALL, &dev_config->mspi_cfg);
-	if (rc < 0) {
-		LOG_ERR("Failed to set device config: %d", rc);
-		return rc;
-	}
-
-	rc = read_jedec_id(dev, id);
-	if (rc < 0) {
-		return rc;
-	}
-
-	if (memcmp(id, dev_config->jedec_id, sizeof(id)) != 0) {
-		LOG_ERR("JEDEC ID mismatch, read: %02x %02x %02x, "
-			"expected: %02x %02x %02x",
-			id[0], id[1], id[2],
-			dev_config->jedec_id[0],
-			dev_config->jedec_id[1],
-			dev_config->jedec_id[2]);
-		return -ENODEV;
-	}
-
-#if defined(CONFIG_MSPI_XIP)
-	/* Enable XIP access for this chip if specified so in DT. */
-	if (dev_config->xip_cfg.enable) {
-		rc = mspi_xip_config(dev_config->bus, &dev_config->mspi_id,
-				     &dev_config->xip_cfg);
-		if (rc < 0) {
-			return rc;
-		}
-	}
-#endif
-
-	return 0;
-}
-
-static int drv_init(const struct device *dev)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	int rc;
-
-	if (!device_is_ready(dev_config->bus)) {
-		LOG_ERR("Device %s is not ready", dev_config->bus->name);
-		return -ENODEV;
-	}
-
-	if (dev_config->reset.port) {
-		if (!gpio_is_ready_dt(&dev_config->reset)) {
-			LOG_ERR("Device %s is not ready",
-				dev_config->reset.port->name);
-			return -ENODEV;
-		}
-
-		if (gpio_pin_configure_dt(&dev_config->reset,
-					  GPIO_OUTPUT_ACTIVE) < 0 ||
-		    gpio_pin_set_dt(&dev_config->reset, 0) < 0) {
-			return -EIO;
-		}
-	}
-
-	rc = pm_device_runtime_get(dev_config->bus);
-	if (rc < 0) {
-		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
-		return rc;
-	}
-
-	/* Acquire the MSPI controller. */
-	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
-			     MSPI_DEVICE_CONFIG_NONE, NULL);
-	if (rc == 0) {
-		rc = flash_chip_init(dev);
-
-		/* Release the MSPI controller. */
-		(void)mspi_get_channel_status(dev_config->bus, 0);
-	}
-
-	(void)pm_device_runtime_put(dev_config->bus);
-
-	if (rc < 0) {
-		return rc;
-	}
-
-	k_sem_init(&dev_data->acquired, 1, K_SEM_MAX_LIMIT);
-
-	return pm_device_driver_init(dev, dev_pm_action_cb);
-}
-
-static const struct flash_driver_api drv_api = {
-	.read = api_read,
-	.write = api_write,
-	.erase = api_erase,
-	.get_parameters = api_get_parameters,
-#if defined(CONFIG_FLASH_PAGE_LAYOUT)
-	.page_layout = api_page_layout,
-#endif
-#if defined(CONFIG_FLASH_JESD216_API)
-	.sfdp_read = api_sfdp_read,
-	.read_jedec_id = api_read_jedec_id,
-#endif
-};
-
-#define FLASH_SIZE_INST(inst) (DT_INST_PROP(inst, size) / 8)
-
-#define FLASH_MSPI_NOR_INST(inst)					\
-	BUILD_ASSERT(DT_INST_ENUM_IDX(inst, mspi_io_mode) ==		\
-		     MSPI_IO_MODE_OCTAL,				\
-		"Only Octal I/O mode is supported for now");		\
-	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);		\
-	static struct flash_mspi_nor_data dev##inst##_data;		\
-	static const struct flash_mspi_nor_config dev##inst##_config = {\
-		.bus = DEVICE_DT_GET(DT_INST_BUS(inst)),		\
-		.mspi_id = MSPI_DEVICE_ID_DT_INST(inst),		\
-		.mspi_cfg = MSPI_DEVICE_CONFIG_DT_INST(inst),		\
-	IF_ENABLED(CONFIG_MSPI_XIP,					\
-		(.xip_cfg = MSPI_XIP_CONFIG_DT_INST(inst),))		\
-		.reset = GPIO_DT_SPEC_INST_GET_OR(inst,			\
-						  reset_gpios, {0}),	\
-		.flash_size = FLASH_SIZE_INST(inst),			\
-	IF_ENABLED(CONFIG_FLASH_PAGE_LAYOUT,				\
-		(.layout = {						\
-			/* TODO: make this size configurable */		\
-			.pages_size = 65536,				\
-			.pages_count = FLASH_SIZE_INST(inst) / 65536,	\
-		},))							\
-		.jedec_id = DT_INST_PROP(inst, jedec_id),		\
-	};								\
-	DEVICE_DT_INST_DEFINE(inst,					\
-		drv_init, PM_DEVICE_DT_INST_GET(inst),			\
-		&dev##inst##_data, &dev##inst##_config,			\
-		POST_KERNEL, CONFIG_FLASH_MSPI_NOR_INIT_PRIORITY,	\
-		&drv_api);
-
-DT_INST_FOREACH_STATUS_OKAY(FLASH_MSPI_NOR_INST)
diff --git a/dts/bindings/mtd/jedec,mspi-nor.yaml b/dts/bindings/mtd/jedec,mspi-nor.yaml
deleted file mode 100644
index 9da68b7dd49..00000000000
--- a/dts/bindings/mtd/jedec,mspi-nor.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: Generic NOR flash on MSPI bus
-
-compatible: "jedec,mspi-nor"
-
-include: [mspi-device.yaml, "jedec,spi-nor-common.yaml"]
-
-properties:
-  reset-gpios:
-    type: phandle-array
-    description: RESETn pin

From abf5100b552fc6cfe4c6aff532ed9a1b520318e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:13 +0100
Subject: [PATCH 1184/2913] Revert "[nrf fromlist] drivers: mspi: Add driver
 for DesignWare SSI based controllers"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e957c23be3ef3003e2002e15865c7f0785674952.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/mspi/CMakeLists.txt                |    1 -
 drivers/mspi/Kconfig                       |    1 -
 drivers/mspi/Kconfig.dw                    |    9 -
 drivers/mspi/mspi_dw.c                     | 1355 --------------------
 drivers/mspi/mspi_dw.h                     |  239 ----
 drivers/mspi/mspi_dw_vendor_specific.h     |   87 --
 dts/bindings/mspi/snps,designware-ssi.yaml |   45 -
 7 files changed, 1737 deletions(-)
 delete mode 100644 drivers/mspi/Kconfig.dw
 delete mode 100644 drivers/mspi/mspi_dw.c
 delete mode 100644 drivers/mspi/mspi_dw.h
 delete mode 100644 drivers/mspi/mspi_dw_vendor_specific.h
 delete mode 100644 dts/bindings/mspi/snps,designware-ssi.yaml

diff --git a/drivers/mspi/CMakeLists.txt b/drivers/mspi/CMakeLists.txt
index 78f704393f4..f248cb0b533 100644
--- a/drivers/mspi/CMakeLists.txt
+++ b/drivers/mspi/CMakeLists.txt
@@ -4,5 +4,4 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/mspi.h)
 
 zephyr_library()
 zephyr_library_sources_ifdef(CONFIG_MSPI_AMBIQ_AP3   mspi_ambiq_ap3.c)
-zephyr_library_sources_ifdef(CONFIG_MSPI_DW          mspi_dw.c)
 zephyr_library_sources_ifdef(CONFIG_MSPI_EMUL        mspi_emul.c)
diff --git a/drivers/mspi/Kconfig b/drivers/mspi/Kconfig
index 269d8d16f04..0adb2a34393 100644
--- a/drivers/mspi/Kconfig
+++ b/drivers/mspi/Kconfig
@@ -60,7 +60,6 @@ module-str = mspi
 source "subsys/logging/Kconfig.template.log_config"
 
 source "drivers/mspi/Kconfig.ambiq"
-source "drivers/mspi/Kconfig.dw"
 source "drivers/mspi/Kconfig.mspi_emul"
 
 endif # MSPI
diff --git a/drivers/mspi/Kconfig.dw b/drivers/mspi/Kconfig.dw
deleted file mode 100644
index 1ab82da0e85..00000000000
--- a/drivers/mspi/Kconfig.dw
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config MSPI_DW
-	bool "DesignWare SSI controller driver"
-	default y
-	depends on DT_HAS_SNPS_DESIGNWARE_SSI_ENABLED
-	select PINCTRL if $(dt_compat_any_has_prop,$(DT_COMPAT_SNPS_DESIGNWARE_SSI),pinctrl-0)
-	imply MSPI_XIP
diff --git a/drivers/mspi/mspi_dw.c b/drivers/mspi/mspi_dw.c
deleted file mode 100644
index 886d24462a2..00000000000
--- a/drivers/mspi/mspi_dw.c
+++ /dev/null
@@ -1,1355 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define DT_DRV_COMPAT snps_designware_ssi
-
-#include <zephyr/drivers/mspi.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/drivers/pinctrl.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/pm/device.h>
-#include <zephyr/pm/device_runtime.h>
-#include <zephyr/sys/byteorder.h>
-#include <zephyr/sys/util.h>
-
-#include "mspi_dw.h"
-#include "mspi_dw_vendor_specific.h"
-
-LOG_MODULE_REGISTER(mspi_dw, CONFIG_MSPI_LOG_LEVEL);
-
-#define DUMMY_BYTE 0xAA
-
-#if defined(CONFIG_MSPI_XIP)
-struct xip_params {
-	uint32_t read_cmd;
-	uint32_t write_cmd;
-	uint16_t rx_dummy;
-	uint16_t tx_dummy;
-	uint8_t cmd_length;
-	uint8_t addr_length;
-	enum mspi_io_mode io_mode;
-};
-
-struct xip_ctrl {
-	uint32_t read;
-	uint32_t write;
-};
-#endif
-
-struct mspi_dw_data {
-	const struct mspi_dev_id *dev_id;
-	uint32_t packets_done;
-	uint8_t *buf_pos;
-	const uint8_t *buf_end;
-
-	uint32_t ctrlr0;
-	uint32_t spi_ctrlr0;
-	uint32_t baudr;
-
-#if defined(CONFIG_MSPI_XIP)
-	uint32_t xip_freq;
-	struct xip_params xip_params_stored;
-	struct xip_params xip_params_active;
-	uint16_t xip_enabled;
-	enum mspi_cpp_mode xip_cpp;
-#endif
-
-	uint16_t dummy_bytes;
-	uint8_t bytes_to_discard;
-	uint8_t bytes_per_frame_exp;
-	bool standard_spi;
-
-	struct k_sem finished;
-	struct k_sem ctx_lock;
-	struct k_sem cfg_lock;
-	struct mspi_xfer xfer;
-};
-
-struct mspi_dw_config {
-	DEVICE_MMIO_ROM;
-	void (*irq_config)(void);
-	uint32_t clock_frequency;
-#if defined(CONFIG_PINCTRL)
-	const struct pinctrl_dev_config *pcfg;
-#endif
-	const struct gpio_dt_spec *ce_gpios;
-	uint8_t ce_gpios_len;
-	uint8_t tx_fifo_depth_minus_1;
-	uint8_t tx_fifo_threshold;
-	uint8_t rx_fifo_threshold;
-	DECLARE_REG_ACCESS();
-};
-
-/* Register access helpers. */
-#define DEFINE_MM_REG_RD_WR(reg, off) \
-	DEFINE_MM_REG_RD(reg, off) \
-	DEFINE_MM_REG_WR(reg, off)
-
-DEFINE_MM_REG_WR(ctrlr0,	0x00)
-DEFINE_MM_REG_WR(ctrlr1,	0x04)
-DEFINE_MM_REG_WR(ssienr,	0x08)
-DEFINE_MM_REG_WR(ser,		0x10)
-DEFINE_MM_REG_WR(baudr,		0x14)
-DEFINE_MM_REG_RD_WR(txftlr,	0x18)
-DEFINE_MM_REG_RD_WR(rxftlr,	0x1c)
-DEFINE_MM_REG_RD(txflr,		0x20)
-DEFINE_MM_REG_RD(rxflr,		0x24)
-DEFINE_MM_REG_RD(sr,		0x28)
-DEFINE_MM_REG_WR(imr,		0x2c)
-DEFINE_MM_REG_RD(isr,		0x30)
-DEFINE_MM_REG_RD_WR(dr,		0x60)
-DEFINE_MM_REG_WR(spi_ctrlr0,	0xf4)
-
-#if defined(CONFIG_MSPI_XIP)
-DEFINE_MM_REG_WR(xip_incr_inst,		0x100)
-DEFINE_MM_REG_WR(xip_wrap_inst,		0x104)
-DEFINE_MM_REG_WR(xip_ctrl,		0x108)
-DEFINE_MM_REG_WR(xip_write_incr_inst,	0x140)
-DEFINE_MM_REG_WR(xip_write_wrap_inst,	0x144)
-DEFINE_MM_REG_WR(xip_write_ctrl,	0x148)
-#endif
-
-static void tx_data(const struct device *dev,
-		    const struct mspi_xfer_packet *packet)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	const struct mspi_dw_config *dev_config = dev->config;
-	const uint8_t *buf_pos = dev_data->buf_pos;
-	const uint8_t *buf_end = dev_data->buf_end;
-	/* When the function is called, it is known that at least one item
-	 * can be written to the FIFO. The loop below writes to the FIFO
-	 * the number of items that is known to fit and then updates that
-	 * number basing on the actual FIFO level (because some data may get
-	 * sent while the FIFO is written; especially for high frequencies
-	 * this may often occur) and continues until the FIFO is filled up
-	 * or the buffer end is reached.
-	 */
-	uint32_t room = 1;
-	uint8_t bytes_per_frame_exp = dev_data->bytes_per_frame_exp;
-	uint8_t tx_fifo_depth = dev_config->tx_fifo_depth_minus_1 + 1;
-	uint32_t data;
-
-	do {
-		if (bytes_per_frame_exp == 2) {
-			data = sys_get_be32(buf_pos);
-			buf_pos += 4;
-		} else if (bytes_per_frame_exp == 1) {
-			data = sys_get_be16(buf_pos);
-			buf_pos += 2;
-		} else {
-			data = *buf_pos;
-			buf_pos += 1;
-		}
-		write_dr(dev, data);
-
-		if (buf_pos >= buf_end) {
-			write_txftlr(dev, 0);
-			break;
-		}
-
-		if (--room == 0) {
-			room = tx_fifo_depth
-			     - FIELD_GET(TXFLR_TXTFL_MASK, read_txflr(dev));
-		}
-	} while (room);
-
-	dev_data->buf_pos = (uint8_t *)buf_pos;
-}
-
-static bool make_rx_cycles(const struct device *dev)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	const struct mspi_dw_config *dev_config = dev->config;
-	uint16_t dummy_bytes = dev_data->dummy_bytes;
-	/* See tx_data(). */
-	uint32_t room = 1;
-	uint8_t tx_fifo_depth = dev_config->tx_fifo_depth_minus_1 + 1;
-
-	do {
-		write_dr(dev, DUMMY_BYTE);
-
-		--dummy_bytes;
-		if (!dummy_bytes) {
-			dev_data->dummy_bytes = 0;
-			return true;
-		}
-
-		if (--room == 0) {
-			room = tx_fifo_depth
-			     - FIELD_GET(TXFLR_TXTFL_MASK, read_txflr(dev));
-		}
-	} while (room);
-
-	dev_data->dummy_bytes = dummy_bytes;
-	return false;
-}
-
-static void read_rx_fifo(const struct device *dev,
-			 const struct mspi_xfer_packet *packet)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	const struct mspi_dw_config *dev_config = dev->config;
-	uint8_t bytes_to_discard = dev_data->bytes_to_discard;
-	uint8_t *buf_pos = dev_data->buf_pos;
-	const uint8_t *buf_end = &packet->data_buf[packet->num_bytes];
-	uint8_t bytes_per_frame_exp = dev_data->bytes_per_frame_exp;
-	/* See `room` in tx_data(). */
-	uint32_t in_fifo = 1;
-	uint32_t remaining_frames;
-
-	do {
-		uint32_t data = read_dr(dev);
-
-		if (bytes_to_discard) {
-			--bytes_to_discard;
-		} else {
-			if (bytes_per_frame_exp == 2) {
-				sys_put_be32(data, buf_pos);
-				buf_pos += 4;
-			} else if (bytes_per_frame_exp == 1) {
-				sys_put_be16(data, buf_pos);
-				buf_pos += 2;
-			} else {
-				*buf_pos = (uint8_t)data;
-				buf_pos += 1;
-			}
-
-			if (buf_pos >= buf_end) {
-				dev_data->bytes_to_discard = bytes_to_discard;
-				dev_data->buf_pos = buf_pos;
-				return;
-			}
-		}
-
-		if (--in_fifo == 0) {
-			in_fifo = FIELD_GET(RXFLR_RXTFL_MASK, read_rxflr(dev));
-		}
-	} while (in_fifo);
-
-	remaining_frames = (bytes_to_discard + buf_end - buf_pos)
-			   >> bytes_per_frame_exp;
-	if (remaining_frames - 1 < dev_config->rx_fifo_threshold) {
-		write_rxftlr(dev, remaining_frames - 1);
-	}
-
-	dev_data->bytes_to_discard = bytes_to_discard;
-	dev_data->buf_pos = buf_pos;
-}
-
-static void mspi_dw_isr(const struct device *dev)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	const struct mspi_xfer_packet *packet =
-		&dev_data->xfer.packets[dev_data->packets_done];
-	uint32_t int_status = read_isr(dev);
-
-	if (int_status & ISR_RXFIS_BIT) {
-		read_rx_fifo(dev, packet);
-	}
-
-	if (dev_data->buf_pos >= dev_data->buf_end) {
-		write_imr(dev, 0);
-		/* It may happen that at this point the controller is still
-		 * shifting out the last frame (the last interrupt occurs when
-		 * the TX FIFO is empty). Wait if it signals that it is busy.
-		 */
-		while (read_sr(dev) & SR_BUSY_BIT) {
-		}
-
-		k_sem_give(&dev_data->finished);
-	} else {
-		if (int_status & ISR_TXEIS_BIT) {
-			if (dev_data->dummy_bytes) {
-				if (make_rx_cycles(dev)) {
-					write_imr(dev, IMR_RXFIM_BIT);
-				}
-			} else {
-				tx_data(dev, packet);
-			}
-		}
-	}
-
-	vendor_specific_irq_clear(dev);
-}
-
-static int api_config(const struct mspi_dt_spec *spec)
-{
-	ARG_UNUSED(spec);
-
-	return -ENOTSUP;
-}
-
-static bool apply_io_mode(struct mspi_dw_data *dev_data,
-			  enum mspi_io_mode io_mode)
-{
-	dev_data->ctrlr0 &= ~CTRLR0_SPI_FRF_MASK;
-	dev_data->spi_ctrlr0 &= ~SPI_CTRLR0_TRANS_TYPE_MASK;
-
-	/* Frame format used for transferring data. */
-
-	if (io_mode == MSPI_IO_MODE_SINGLE) {
-		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
-					       CTRLR0_SPI_FRF_STANDARD);
-		dev_data->standard_spi = true;
-		return true;
-	}
-
-	dev_data->standard_spi = false;
-
-	switch (io_mode) {
-	case MSPI_IO_MODE_DUAL:
-	case MSPI_IO_MODE_DUAL_1_1_2:
-	case MSPI_IO_MODE_DUAL_1_2_2:
-		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
-					       CTRLR0_SPI_FRF_DUAL);
-		break;
-	case MSPI_IO_MODE_QUAD:
-	case MSPI_IO_MODE_QUAD_1_1_4:
-	case MSPI_IO_MODE_QUAD_1_4_4:
-		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
-					       CTRLR0_SPI_FRF_QUAD);
-		break;
-	case MSPI_IO_MODE_OCTAL:
-	case MSPI_IO_MODE_OCTAL_1_1_8:
-	case MSPI_IO_MODE_OCTAL_1_8_8:
-		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
-					       CTRLR0_SPI_FRF_OCTAL);
-		break;
-	default:
-		LOG_ERR("IO mode %d not supported", io_mode);
-		return false;
-	}
-
-	/* Transfer format used for Address and Instruction: */
-
-	switch (io_mode) {
-	case MSPI_IO_MODE_DUAL_1_1_2:
-	case MSPI_IO_MODE_QUAD_1_1_4:
-	case MSPI_IO_MODE_OCTAL_1_1_8:
-		/* - both sent in Standard SPI mode */
-		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_TRANS_TYPE_MASK,
-						   SPI_CTRLR0_TRANS_TYPE_TT0);
-		break;
-	case MSPI_IO_MODE_DUAL_1_2_2:
-	case MSPI_IO_MODE_QUAD_1_4_4:
-	case MSPI_IO_MODE_OCTAL_1_8_8:
-		/* - Instruction sent in Standard SPI mode,
-		 *   Address sent the same way as data
-		 */
-		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_TRANS_TYPE_MASK,
-						   SPI_CTRLR0_TRANS_TYPE_TT1);
-		break;
-	default:
-		/* - both sent the same way as data. */
-		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_TRANS_TYPE_MASK,
-						   SPI_CTRLR0_TRANS_TYPE_TT2);
-		break;
-	}
-
-	return true;
-}
-
-static bool apply_cmd_length(struct mspi_dw_data *dev_data, uint32_t cmd_length)
-{
-	switch (cmd_length) {
-	case 0:
-		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_INST_L_MASK,
-						   SPI_CTRLR0_INST_L0);
-		break;
-	case 1:
-		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_INST_L_MASK,
-						   SPI_CTRLR0_INST_L8);
-		break;
-	case 2:
-		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_INST_L_MASK,
-						   SPI_CTRLR0_INST_L16);
-		break;
-	default:
-		LOG_ERR("Command length %d not supported", cmd_length);
-		return false;
-	}
-
-	return true;
-}
-
-static bool apply_addr_length(struct mspi_dw_data *dev_data,
-			      uint32_t addr_length)
-{
-	dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_ADDR_L_MASK,
-					   addr_length * 2);
-
-	return true;
-}
-
-#if defined(CONFIG_MSPI_XIP)
-static bool apply_xip_io_mode(const struct mspi_dw_data *dev_data,
-			      struct xip_ctrl *ctrl)
-{
-	enum mspi_io_mode io_mode = dev_data->xip_params_active.io_mode;
-
-	/* Frame format used for transferring data. */
-
-	if (io_mode == MSPI_IO_MODE_SINGLE) {
-		LOG_ERR("XIP not available in single line mode");
-		return false;
-	}
-
-	switch (io_mode) {
-	case MSPI_IO_MODE_DUAL:
-	case MSPI_IO_MODE_DUAL_1_1_2:
-	case MSPI_IO_MODE_DUAL_1_2_2:
-		ctrl->read |= FIELD_PREP(XIP_CTRL_FRF_MASK,
-					 XIP_CTRL_FRF_DUAL);
-		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_FRF_MASK,
-					  XIP_WRITE_CTRL_FRF_DUAL);
-		break;
-	case MSPI_IO_MODE_QUAD:
-	case MSPI_IO_MODE_QUAD_1_1_4:
-	case MSPI_IO_MODE_QUAD_1_4_4:
-		ctrl->read |= FIELD_PREP(XIP_CTRL_FRF_MASK,
-					 XIP_CTRL_FRF_QUAD);
-		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_FRF_MASK,
-					  XIP_WRITE_CTRL_FRF_QUAD);
-		break;
-	case MSPI_IO_MODE_OCTAL:
-	case MSPI_IO_MODE_OCTAL_1_1_8:
-	case MSPI_IO_MODE_OCTAL_1_8_8:
-		ctrl->read |= FIELD_PREP(XIP_CTRL_FRF_MASK,
-					 XIP_CTRL_FRF_OCTAL);
-		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_FRF_MASK,
-					  XIP_WRITE_CTRL_FRF_OCTAL);
-		break;
-	default:
-		LOG_ERR("IO mode %d not supported", io_mode);
-		return false;
-	}
-
-	/* Transfer format used for Address and Instruction: */
-
-	switch (io_mode) {
-	case MSPI_IO_MODE_DUAL_1_1_2:
-	case MSPI_IO_MODE_QUAD_1_1_4:
-	case MSPI_IO_MODE_OCTAL_1_1_8:
-		/* - both sent in Standard SPI mode */
-		ctrl->read |= FIELD_PREP(XIP_CTRL_TRANS_TYPE_MASK,
-					 XIP_CTRL_TRANS_TYPE_TT0);
-		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_TRANS_TYPE_MASK,
-					  XIP_WRITE_CTRL_TRANS_TYPE_TT0);
-		break;
-	case MSPI_IO_MODE_DUAL_1_2_2:
-	case MSPI_IO_MODE_QUAD_1_4_4:
-	case MSPI_IO_MODE_OCTAL_1_8_8:
-		/* - Instruction sent in Standard SPI mode,
-		 *   Address sent the same way as data
-		 */
-		ctrl->read |= FIELD_PREP(XIP_CTRL_TRANS_TYPE_MASK,
-					 XIP_CTRL_TRANS_TYPE_TT1);
-		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_TRANS_TYPE_MASK,
-					  XIP_WRITE_CTRL_TRANS_TYPE_TT1);
-		break;
-	default:
-		/* - both sent the same way as data. */
-		ctrl->read |= FIELD_PREP(XIP_CTRL_TRANS_TYPE_MASK,
-					 XIP_CTRL_TRANS_TYPE_TT2);
-		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_TRANS_TYPE_MASK,
-					  XIP_WRITE_CTRL_TRANS_TYPE_TT2);
-		break;
-	}
-
-	return true;
-}
-
-static bool apply_xip_cmd_length(const struct mspi_dw_data *dev_data,
-				 struct xip_ctrl *ctrl)
-{
-	uint8_t cmd_length = dev_data->xip_params_active.cmd_length;
-
-	switch (cmd_length) {
-	case 0:
-		ctrl->read |= FIELD_PREP(XIP_CTRL_INST_L_MASK,
-					 XIP_CTRL_INST_L0);
-		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_INST_L_MASK,
-					  XIP_WRITE_CTRL_INST_L0);
-		break;
-	case 1:
-		ctrl->read |= XIP_CTRL_INST_EN_BIT
-			   |  FIELD_PREP(XIP_CTRL_INST_L_MASK,
-					 XIP_CTRL_INST_L8);
-		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_INST_L_MASK,
-					  XIP_WRITE_CTRL_INST_L8);
-		break;
-	case 2:
-		ctrl->read |= XIP_CTRL_INST_EN_BIT
-			   |  FIELD_PREP(XIP_CTRL_INST_L_MASK,
-					 XIP_CTRL_INST_L16);
-		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_INST_L_MASK,
-					  XIP_WRITE_CTRL_INST_L16);
-		break;
-	default:
-		LOG_ERR("Command length %d not supported", cmd_length);
-		return false;
-	}
-
-	return true;
-}
-
-static bool apply_xip_addr_length(const struct mspi_dw_data *dev_data,
-				  struct xip_ctrl *ctrl)
-{
-	uint8_t addr_length = dev_data->xip_params_active.addr_length;
-
-	ctrl->read |= FIELD_PREP(XIP_CTRL_ADDR_L_MASK, addr_length * 2);
-	ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_ADDR_L_MASK, addr_length * 2);
-
-	return true;
-}
-#endif /* defined(CONFIG_MSPI_XIP) */
-
-static int _api_dev_config(const struct device *dev,
-			   const enum mspi_dev_cfg_mask param_mask,
-			   const struct mspi_dev_cfg *cfg)
-{
-	const struct mspi_dw_config *dev_config = dev->config;
-	struct mspi_dw_data *dev_data = dev->data;
-
-	if (param_mask & MSPI_DEVICE_CONFIG_ENDIAN) {
-		if (cfg->endian != MSPI_XFER_BIG_ENDIAN) {
-			LOG_ERR("Only big endian transfers are supported.");
-			return -ENOTSUP;
-		}
-	}
-
-	if (param_mask & MSPI_DEVICE_CONFIG_CE_POL) {
-		if (cfg->ce_polarity != MSPI_CE_ACTIVE_LOW) {
-			LOG_ERR("Only active low CE is supported.");
-			return -ENOTSUP;
-		}
-	}
-
-	if (param_mask & MSPI_DEVICE_CONFIG_MEM_BOUND) {
-		if (cfg->mem_boundary) {
-			LOG_ERR("Auto CE break is not supported.");
-			return -ENOTSUP;
-		}
-	}
-
-	if (param_mask & MSPI_DEVICE_CONFIG_BREAK_TIME) {
-		if (cfg->time_to_break) {
-			LOG_ERR("Auto CE break is not supported.");
-			return -ENOTSUP;
-		}
-	}
-
-	if (param_mask & MSPI_DEVICE_CONFIG_IO_MODE) {
-#if defined(CONFIG_MSPI_XIP)
-		dev_data->xip_params_stored.io_mode = cfg->io_mode;
-#endif
-
-		if (!apply_io_mode(dev_data, cfg->io_mode)) {
-			return -EINVAL;
-		}
-	}
-
-	if (param_mask & MSPI_DEVICE_CONFIG_CPP) {
-#if defined(CONFIG_MSPI_XIP)
-		/* Make sure the new setting is compatible with the one used
-		 * for XIP if it is enabled.
-		 */
-		if (!dev_data->xip_enabled) {
-			dev_data->xip_cpp = cfg->cpp;
-		} else if (dev_data->xip_cpp != cfg->cpp) {
-			LOG_ERR("Conflict with configuration used for XIP.");
-			return -EINVAL;
-		}
-#endif
-
-		dev_data->ctrlr0 &= ~(CTRLR0_SCPOL_BIT | CTRLR0_SCPH_BIT);
-
-		switch (cfg->cpp) {
-		default:
-		case MSPI_CPP_MODE_0:
-			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 0) |
-					    FIELD_PREP(CTRLR0_SCPH_BIT,  0);
-			break;
-		case MSPI_CPP_MODE_1:
-			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 0) |
-					    FIELD_PREP(CTRLR0_SCPH_BIT,  1);
-			break;
-		case MSPI_CPP_MODE_2:
-			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 1) |
-					    FIELD_PREP(CTRLR0_SCPH_BIT,  0);
-			break;
-		case MSPI_CPP_MODE_3:
-			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 1) |
-					    FIELD_PREP(CTRLR0_SCPH_BIT,  1);
-			break;
-		}
-	}
-
-	if (param_mask & MSPI_DEVICE_CONFIG_FREQUENCY) {
-		if (cfg->freq > dev_config->clock_frequency / 2 ||
-		    cfg->freq < dev_config->clock_frequency / 65534) {
-			LOG_ERR("Invalid frequency: %u, MIN: %u, MAX: %u",
-				cfg->freq, dev_config->clock_frequency / 65534,
-				dev_config->clock_frequency / 2);
-			return -EINVAL;
-		}
-
-#if defined(CONFIG_MSPI_XIP)
-		/* Make sure the new setting is compatible with the one used
-		 * for XIP if it is enabled.
-		 */
-		if (!dev_data->xip_enabled) {
-			dev_data->xip_freq = cfg->freq;
-		} else if (dev_data->xip_freq != cfg->freq) {
-			LOG_ERR("Conflict with configuration used for XIP.");
-			return -EINVAL;
-		}
-#endif
-
-		dev_data->baudr = dev_config->clock_frequency / cfg->freq;
-	}
-
-	if (param_mask & MSPI_DEVICE_CONFIG_DATA_RATE) {
-		/* TODO: add support for DDR */
-		if (cfg->data_rate != MSPI_DATA_RATE_SINGLE) {
-			LOG_ERR("Only single data rate is supported.");
-			return -ENOTSUP;
-		}
-	}
-
-	if (param_mask & MSPI_DEVICE_CONFIG_DQS) {
-		/* TODO: add support for DQS */
-		if (cfg->dqs_enable) {
-			LOG_ERR("DQS line is not supported.");
-			return -ENOTSUP;
-		}
-	}
-
-#if defined(CONFIG_MSPI_XIP)
-	if (param_mask & MSPI_DEVICE_CONFIG_READ_CMD) {
-		dev_data->xip_params_stored.read_cmd = cfg->read_cmd;
-	}
-	if (param_mask & MSPI_DEVICE_CONFIG_WRITE_CMD) {
-		dev_data->xip_params_stored.write_cmd = cfg->write_cmd;
-	}
-	if (param_mask & MSPI_DEVICE_CONFIG_RX_DUMMY) {
-		dev_data->xip_params_stored.rx_dummy = cfg->rx_dummy;
-	}
-	if (param_mask & MSPI_DEVICE_CONFIG_TX_DUMMY) {
-		dev_data->xip_params_stored.tx_dummy = cfg->tx_dummy;
-	}
-	if (param_mask & MSPI_DEVICE_CONFIG_CMD_LEN) {
-		dev_data->xip_params_stored.cmd_length = cfg->cmd_length;
-	}
-	if (param_mask & MSPI_DEVICE_CONFIG_ADDR_LEN) {
-		dev_data->xip_params_stored.addr_length = cfg->addr_length;
-	}
-#endif
-
-	/* Always use Motorola SPI frame format. */
-	dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_FRF_MASK, CTRLR0_FRF_SPI);
-	/* Enable clock stretching. */
-	dev_data->spi_ctrlr0 |= SPI_CTRLR0_CLK_STRETCH_EN_BIT;
-
-	return 0;
-}
-
-static int api_dev_config(const struct device *dev,
-			  const struct mspi_dev_id *dev_id,
-			  const enum mspi_dev_cfg_mask param_mask,
-			  const struct mspi_dev_cfg *cfg)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	int rc;
-
-	if (dev_id != dev_data->dev_id) {
-		rc = k_sem_take(&dev_data->cfg_lock,
-				K_MSEC(CONFIG_MSPI_COMPLETION_TIMEOUT_TOLERANCE));
-		if (rc < 0) {
-			LOG_ERR("Failed to switch controller to device");
-			return -EBUSY;
-		}
-
-		dev_data->dev_id = dev_id;
-
-		if (param_mask == MSPI_DEVICE_CONFIG_NONE) {
-			return 0;
-		}
-	}
-
-	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
-
-	rc = _api_dev_config(dev, param_mask, cfg);
-
-	k_sem_give(&dev_data->ctx_lock);
-
-	if (rc < 0) {
-		dev_data->dev_id = NULL;
-		k_sem_give(&dev_data->cfg_lock);
-	}
-
-	return rc;
-}
-
-static int api_get_channel_status(const struct device *dev, uint8_t ch)
-{
-	ARG_UNUSED(ch);
-
-	struct mspi_dw_data *dev_data = dev->data;
-
-	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
-
-	dev_data->dev_id = NULL;
-	k_sem_give(&dev_data->cfg_lock);
-
-	k_sem_give(&dev_data->ctx_lock);
-
-	return 0;
-}
-
-static void tx_control_field(const struct device *dev,
-			     uint32_t field, uint8_t len)
-{
-	uint8_t shift = 8 * len;
-
-	do {
-		shift -= 8;
-		write_dr(dev, field >> shift);
-	} while (shift);
-}
-
-static int start_next_packet(const struct device *dev, k_timeout_t timeout)
-{
-	const struct mspi_dw_config *dev_config = dev->config;
-	struct mspi_dw_data *dev_data = dev->data;
-	const struct mspi_xfer_packet *packet =
-		&dev_data->xfer.packets[dev_data->packets_done];
-	bool xip_enabled = COND_CODE_1(CONFIG_MSPI_XIP,
-				       (dev_data->xip_enabled != 0),
-				       (false));
-	unsigned int key;
-	uint8_t tx_fifo_threshold;
-	uint32_t packet_frames;
-	uint32_t imr;
-	int rc = 0;
-
-	if (packet->num_bytes == 0 &&
-	    dev_data->xfer.cmd_length == 0 &&
-	    dev_data->xfer.addr_length == 0) {
-		return 0;
-	}
-
-	dev_data->dummy_bytes = 0;
-
-	dev_data->ctrlr0 &= ~CTRLR0_TMOD_MASK
-			 &  ~CTRLR0_DFS_MASK;
-
-	dev_data->spi_ctrlr0 &= ~SPI_CTRLR0_WAIT_CYCLES_MASK;
-
-	if (dev_data->standard_spi &&
-	    (dev_data->xfer.cmd_length != 0 ||
-	     dev_data->xfer.addr_length != 0)) {
-		dev_data->bytes_per_frame_exp = 0;
-		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 7);
-	} else {
-		if ((packet->num_bytes % 4) == 0) {
-			dev_data->bytes_per_frame_exp = 2;
-			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 31);
-		} else if ((packet->num_bytes % 2) == 0) {
-			dev_data->bytes_per_frame_exp = 1;
-			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 15);
-		} else {
-			dev_data->bytes_per_frame_exp = 0;
-			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 7);
-		}
-	}
-
-	packet_frames = packet->num_bytes >> dev_data->bytes_per_frame_exp;
-
-	if (packet_frames > UINT16_MAX + 1) {
-		LOG_ERR("Packet length (%u) exceeds supported maximum",
-			packet->num_bytes);
-		return -EINVAL;
-	}
-
-	if (packet->dir == MSPI_TX || packet->num_bytes == 0) {
-		imr = IMR_TXEIM_BIT;
-		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_TMOD_MASK,
-					       CTRLR0_TMOD_TX);
-		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_WAIT_CYCLES_MASK,
-						   dev_data->xfer.tx_dummy);
-
-		write_rxftlr(dev, 0);
-		tx_fifo_threshold = dev_config->tx_fifo_threshold;
-	} else {
-		uint32_t tmod;
-		uint8_t rx_fifo_threshold;
-
-		/* In Standard SPI Mode, the controller does not support
-		 * sending the command and address fields separately, they
-		 * need to be sent as data; hence, for RX packets with these
-		 * fields, the TX/RX transfer mode needs to be used and
-		 * consequently, dummy bytes need to be transmitted so that
-		 * clock cycles for the RX part are provided (the controller
-		 * does not do it automatically in the TX/RX mode).
-		 */
-		if (dev_data->standard_spi &&
-		    (dev_data->xfer.cmd_length != 0 ||
-		     dev_data->xfer.addr_length != 0)) {
-			uint32_t rx_total_bytes;
-
-			dev_data->bytes_to_discard = dev_data->xfer.cmd_length
-						   + dev_data->xfer.addr_length;
-			rx_total_bytes = dev_data->bytes_to_discard
-				       + packet->num_bytes;
-
-			dev_data->dummy_bytes = packet->num_bytes;
-
-			imr = IMR_TXEIM_BIT | IMR_RXFIM_BIT;
-			tmod = CTRLR0_TMOD_TX_RX;
-			tx_fifo_threshold = dev_config->tx_fifo_threshold;
-			/* For standard SPI, only 1-byte frames are used. */
-			rx_fifo_threshold = MIN(rx_total_bytes - 1,
-						dev_config->rx_fifo_threshold);
-		} else {
-			imr = IMR_RXFIM_BIT;
-			tmod = CTRLR0_TMOD_RX;
-			tx_fifo_threshold = 0;
-			rx_fifo_threshold = MIN(packet_frames - 1,
-						dev_config->rx_fifo_threshold);
-		}
-
-		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_TMOD_MASK, tmod);
-		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_WAIT_CYCLES_MASK,
-						   dev_data->xfer.rx_dummy);
-
-		write_rxftlr(dev, FIELD_PREP(RXFTLR_RFT_MASK,
-					     rx_fifo_threshold));
-	}
-
-	if (dev_data->dev_id->ce.port) {
-		rc = gpio_pin_set_dt(&dev_data->dev_id->ce, 1);
-		if (rc < 0) {
-			LOG_ERR("Failed to activate CE line (%d)", rc);
-			return rc;
-		}
-	}
-
-	if (xip_enabled) {
-		key = irq_lock();
-		write_ssienr(dev, 0);
-	}
-
-	/* These registers cannot be written when the controller is enabled,
-	 * that's why it is temporarily disabled above; with locked interrupts,
-	 * to prevent potential XIP transfers during that period.
-	 */
-	write_ctrlr0(dev, dev_data->ctrlr0);
-	write_ctrlr1(dev, packet_frames > 0
-		? FIELD_PREP(CTRLR1_NDF_MASK, packet_frames - 1)
-		: 0);
-	write_spi_ctrlr0(dev, dev_data->spi_ctrlr0);
-	write_baudr(dev, dev_data->baudr);
-	write_ser(dev, BIT(dev_data->dev_id->dev_idx));
-
-	if (xip_enabled) {
-		write_ssienr(dev, SSIENR_SSIC_EN_BIT);
-		irq_unlock(key);
-	}
-
-	dev_data->buf_pos = packet->data_buf;
-	dev_data->buf_end = &packet->data_buf[packet->num_bytes];
-
-	if ((imr & IMR_TXEIM_BIT) && dev_data->buf_pos < dev_data->buf_end) {
-		uint32_t start_level = tx_fifo_threshold;
-
-		if (dev_data->dummy_bytes) {
-			uint32_t tx_total = dev_data->bytes_to_discard
-					  + dev_data->dummy_bytes;
-
-			if (start_level > tx_total - 1) {
-				start_level = tx_total - 1;
-			}
-		}
-
-		write_txftlr(dev,
-			FIELD_PREP(TXFTLR_TXFTHR_MASK, start_level) |
-			FIELD_PREP(TXFTLR_TFT_MASK, tx_fifo_threshold));
-	} else {
-		write_txftlr(dev, 0);
-	}
-
-	/* Ensure that there will be no interrupt from the controller yet. */
-	write_imr(dev, 0);
-	/* Enable the controller. This must be done before DR is written. */
-	write_ssienr(dev, SSIENR_SSIC_EN_BIT);
-
-	if (dev_data->standard_spi) {
-		if (dev_data->xfer.cmd_length) {
-			tx_control_field(dev, packet->cmd,
-					 dev_data->xfer.cmd_length);
-		}
-
-		if (dev_data->xfer.addr_length) {
-			tx_control_field(dev, packet->address,
-					 dev_data->xfer.addr_length);
-		}
-	} else {
-		if (dev_data->xfer.cmd_length) {
-			write_dr(dev, packet->cmd);
-		}
-
-		if (dev_data->xfer.addr_length) {
-			write_dr(dev, packet->address);
-		}
-	}
-
-	if (dev_data->dummy_bytes) {
-		if (make_rx_cycles(dev)) {
-			imr = IMR_RXFIM_BIT;
-		}
-	} else if (packet->dir == MSPI_TX && packet->num_bytes) {
-		tx_data(dev, packet);
-	}
-
-	/* Enable interrupts now and wait until the packet is done. */
-	write_imr(dev, imr);
-
-	rc = k_sem_take(&dev_data->finished, timeout);
-	if (rc < 0) {
-		rc = -ETIMEDOUT;
-	}
-
-	/* Disable the controller. This will immediately halt the transfer
-	 * if it hasn't finished yet.
-	 */
-	if (xip_enabled) {
-		/* If XIP is enabled, the controller must be kept enabled,
-		 * so disable it only momentarily if there's a need to halt
-		 * a transfer that has timeout out.
-		 */
-		if (rc == -ETIMEDOUT) {
-			key = irq_lock();
-
-			write_ssienr(dev, 0);
-			write_ssienr(dev, SSIENR_SSIC_EN_BIT);
-
-			irq_unlock(key);
-		}
-	} else {
-		write_ssienr(dev, 0);
-	}
-
-	if (dev_data->dev_id->ce.port) {
-		int rc2;
-
-		/* Do not use `rc` to not overwrite potential timeout error. */
-		rc2 = gpio_pin_set_dt(&dev_data->dev_id->ce, 0);
-		if (rc2 < 0) {
-			LOG_ERR("Failed to deactivate CE line (%d)", rc2);
-			return rc2;
-		}
-	}
-
-	return rc;
-}
-
-static int _api_transceive(const struct device *dev,
-			   const struct mspi_xfer *req)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	int rc;
-
-	dev_data->spi_ctrlr0 &= ~SPI_CTRLR0_WAIT_CYCLES_MASK
-			     &  ~SPI_CTRLR0_INST_L_MASK
-			     &  ~SPI_CTRLR0_ADDR_L_MASK;
-
-	if (!apply_cmd_length(dev_data, req->cmd_length) ||
-	    !apply_addr_length(dev_data, req->addr_length)) {
-		return -EINVAL;
-	}
-
-	if (dev_data->standard_spi &&
-	    (req->rx_dummy != 0 || req->tx_dummy != 0)) {
-		LOG_ERR("Dummy cycles unsupported in single line mode");
-		return -EINVAL;
-	} else if (req->rx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX ||
-		   req->tx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX) {
-		LOG_ERR("Unsupported RX (%u) or TX (%u) dummy cycles",
-			req->rx_dummy, req->tx_dummy);
-		return -EINVAL;
-	}
-
-	dev_data->xfer = *req;
-
-	for (dev_data->packets_done = 0;
-	     dev_data->packets_done < dev_data->xfer.num_packet;
-	     dev_data->packets_done++) {
-		rc = start_next_packet(dev, K_MSEC(dev_data->xfer.timeout));
-		if (rc < 0) {
-			return rc;
-		}
-	}
-
-	return 0;
-}
-
-static int api_transceive(const struct device *dev,
-			  const struct mspi_dev_id *dev_id,
-			  const struct mspi_xfer *req)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	int rc, rc2;
-
-	if (dev_id != dev_data->dev_id) {
-		LOG_ERR("Controller is not configured for this device");
-		return -EINVAL;
-	}
-
-	/* TODO: add support for asynchronous transfers */
-	if (req->async) {
-		LOG_ERR("Asynchronous transfers are not supported");
-		return -ENOTSUP;
-	}
-
-	rc = pm_device_runtime_get(dev);
-	if (rc < 0) {
-		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
-		return rc;
-	}
-
-	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
-
-	rc = _api_transceive(dev, req);
-
-	k_sem_give(&dev_data->ctx_lock);
-
-	rc2 = pm_device_runtime_put(dev);
-	if (rc2 < 0) {
-		LOG_ERR("pm_device_runtime_put() failed: %d", rc2);
-		rc = (rc < 0 ? rc : rc2);
-	}
-
-	return rc;
-}
-
-#if defined(CONFIG_MSPI_XIP)
-static int _api_xip_config(const struct device *dev,
-			   const struct mspi_dev_id *dev_id,
-			   const struct mspi_xip_cfg *cfg)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	int rc;
-
-	if (!cfg->enable) {
-		rc = vendor_specific_xip_disable(dev, dev_id, cfg);
-		if (rc < 0) {
-			return rc;
-		}
-
-		dev_data->xip_enabled &= ~BIT(dev_id->dev_idx);
-
-		if (!dev_data->xip_enabled) {
-			write_ssienr(dev, 0);
-
-			/* Since XIP is disabled, it is okay for the controller
-			 * to be suspended.
-			 */
-			rc = pm_device_runtime_put(dev);
-			if (rc < 0) {
-				LOG_ERR("pm_device_runtime_put() failed: %d", rc);
-				return rc;
-			}
-		}
-
-		return 0;
-	}
-
-	if (!dev_data->xip_enabled) {
-		struct xip_params *params = &dev_data->xip_params_active;
-		struct xip_ctrl ctrl = {0};
-
-		*params = dev_data->xip_params_stored;
-
-		if (!apply_xip_io_mode(dev_data, &ctrl) ||
-		    !apply_xip_cmd_length(dev_data, &ctrl) ||
-		    !apply_xip_addr_length(dev_data, &ctrl)) {
-			return -EINVAL;
-		}
-
-		if (params->rx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX ||
-		    params->tx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX) {
-			LOG_ERR("Unsupported RX (%u) or TX (%u) dummy cycles",
-				params->rx_dummy, params->tx_dummy);
-			return -EINVAL;
-		}
-
-		/* Increase usage count additionally to prevent the controller
-		 * from being suspended as long as XIP is active.
-		 */
-		rc = pm_device_runtime_get(dev);
-		if (rc < 0) {
-			LOG_ERR("pm_device_runtime_get() failed: %d", rc);
-			return rc;
-		}
-
-		ctrl.read |= FIELD_PREP(XIP_CTRL_WAIT_CYCLES_MASK,
-					params->rx_dummy);
-		ctrl.write |= FIELD_PREP(XIP_WRITE_CTRL_WAIT_CYCLES_MASK,
-					 params->tx_dummy);
-
-		/* Make sure the baud rate and serial clock phase/polarity
-		 * registers are configured properly. They may not be if
-		 * non-XIP transfers have not been performed yet.
-		 */
-		write_ctrlr0(dev, dev_data->ctrlr0);
-		write_baudr(dev, dev_data->baudr);
-
-		write_xip_incr_inst(dev, params->read_cmd);
-		write_xip_wrap_inst(dev, params->read_cmd);
-		write_xip_ctrl(dev, ctrl.read);
-		write_xip_write_incr_inst(dev, params->write_cmd);
-		write_xip_write_wrap_inst(dev, params->write_cmd);
-		write_xip_write_ctrl(dev, ctrl.write);
-	} else if (dev_data->xip_params_active.read_cmd !=
-		   dev_data->xip_params_stored.read_cmd ||
-		   dev_data->xip_params_active.write_cmd !=
-		   dev_data->xip_params_stored.write_cmd ||
-		   dev_data->xip_params_active.cmd_length !=
-		   dev_data->xip_params_stored.cmd_length ||
-		   dev_data->xip_params_active.addr_length !=
-		   dev_data->xip_params_stored.addr_length ||
-		   dev_data->xip_params_active.rx_dummy !=
-		   dev_data->xip_params_stored.rx_dummy ||
-		   dev_data->xip_params_active.tx_dummy !=
-		   dev_data->xip_params_stored.tx_dummy) {
-		LOG_ERR("Conflict with configuration already used for XIP.");
-		return -EINVAL;
-	}
-
-	rc = vendor_specific_xip_enable(dev, dev_id, cfg);
-	if (rc < 0) {
-		return rc;
-	}
-
-	write_ssienr(dev, SSIENR_SSIC_EN_BIT);
-
-	dev_data->xip_enabled |= BIT(dev_id->dev_idx);
-
-	return 0;
-}
-
-static int api_xip_config(const struct device *dev,
-			  const struct mspi_dev_id *dev_id,
-			  const struct mspi_xip_cfg *cfg)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	int rc, rc2;
-
-	if (cfg->enable && dev_id != dev_data->dev_id) {
-		LOG_ERR("Controller is not configured for this device");
-		return -EINVAL;
-	}
-
-	rc = pm_device_runtime_get(dev);
-	if (rc < 0) {
-		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
-		return rc;
-	}
-
-	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
-
-	rc = _api_xip_config(dev, dev_id, cfg);
-
-	k_sem_give(&dev_data->ctx_lock);
-
-	rc2 = pm_device_runtime_put(dev);
-	if (rc2 < 0) {
-		LOG_ERR("pm_device_runtime_put() failed: %d", rc2);
-		rc = (rc < 0 ? rc : rc2);
-	}
-
-	return rc;
-}
-#endif /* defined(CONFIG_MSPI_XIP) */
-
-static int dev_pm_action_cb(const struct device *dev,
-			    enum pm_device_action action)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-
-	if (action == PM_DEVICE_ACTION_RESUME) {
-#if defined(CONFIG_PINCTRL)
-		const struct mspi_dw_config *dev_config = dev->config;
-		int rc = pinctrl_apply_state(dev_config->pcfg,
-					     PINCTRL_STATE_DEFAULT);
-
-		if (rc < 0) {
-			LOG_ERR("Cannot apply default pins state (%d)", rc);
-			return rc;
-		}
-#endif
-		vendor_specific_resume(dev);
-
-		k_sem_give(&dev_data->ctx_lock);
-
-		return 0;
-	}
-
-	if (IS_ENABLED(CONFIG_PM_DEVICE) &&
-	    action == PM_DEVICE_ACTION_SUSPEND) {
-		bool xip_enabled = COND_CODE_1(CONFIG_MSPI_XIP,
-					       (dev_data->xip_enabled != 0),
-					       (false));
-
-#if defined(CONFIG_PINCTRL)
-		const struct mspi_dw_config *dev_config = dev->config;
-		int rc = pinctrl_apply_state(dev_config->pcfg,
-					     PINCTRL_STATE_SLEEP);
-
-		if (rc < 0) {
-			LOG_ERR("Cannot apply sleep pins state (%d)", rc);
-			return rc;
-		}
-#endif
-		if (xip_enabled ||
-		    k_sem_take(&dev_data->ctx_lock, K_NO_WAIT) != 0) {
-			LOG_ERR("Controller in use, cannot be suspended");
-			return -EBUSY;
-		}
-
-		vendor_specific_suspend(dev);
-
-		return 0;
-	}
-
-	return -ENOTSUP;
-}
-
-static int dev_init(const struct device *dev)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	const struct mspi_dw_config *dev_config = dev->config;
-	const struct gpio_dt_spec *ce_gpio;
-	int rc;
-
-	DEVICE_MMIO_MAP(dev, K_MEM_CACHE_NONE);
-
-	vendor_specific_init(dev);
-
-	dev_config->irq_config();
-
-	k_sem_init(&dev_data->finished, 0, 1);
-	k_sem_init(&dev_data->cfg_lock, 1, 1);
-	/* This semaphore will be set to 1 after the device is resumed. */
-	k_sem_init(&dev_data->ctx_lock, 0, 1);
-
-	for (ce_gpio = dev_config->ce_gpios;
-	     ce_gpio < &dev_config->ce_gpios[dev_config->ce_gpios_len];
-	     ce_gpio++) {
-		if (!device_is_ready(ce_gpio->port)) {
-			LOG_ERR("CE GPIO port %s is not ready",
-				ce_gpio->port->name);
-			return -ENODEV;
-		}
-
-		rc = gpio_pin_configure_dt(ce_gpio, GPIO_OUTPUT_INACTIVE);
-		if (rc < 0) {
-			return rc;
-		}
-	}
-
-#if defined(CONFIG_PINCTRL)
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		rc = pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
-		if (rc < 0) {
-			LOG_ERR("Cannot apply sleep pins state (%d)", rc);
-			return rc;
-		}
-	}
-#endif
-
-	return pm_device_driver_init(dev, dev_pm_action_cb);
-}
-
-static const struct mspi_driver_api drv_api = {
-	.config             = api_config,
-	.dev_config         = api_dev_config,
-	.get_channel_status = api_get_channel_status,
-	.transceive         = api_transceive,
-#if defined(CONFIG_MSPI_XIP)
-	.xip_config         = api_xip_config,
-#endif
-};
-
-#define MSPI_DW_INST_IRQ(idx, inst)					\
-	IRQ_CONNECT(DT_INST_IRQ_BY_IDX(inst, idx, irq),			\
-		    DT_INST_IRQ_BY_IDX(inst, idx, priority),		\
-		    mspi_dw_isr, DEVICE_DT_INST_GET(inst), 0);		\
-	irq_enable(DT_INST_IRQ_BY_IDX(inst, idx, irq))
-
-#define MSPI_DW_MMIO_ROM_INIT(node_id)					\
-	COND_CODE_1(DT_REG_HAS_NAME(node_id, core),			\
-		(Z_DEVICE_MMIO_NAMED_ROM_INITIALIZER(core, node_id)),	\
-		(DEVICE_MMIO_ROM_INIT(node_id)))
-
-#define MSPI_DW_CLOCK_FREQUENCY(inst)					\
-	COND_CODE_1(DT_NODE_HAS_PROP(DT_INST_PHANDLE(inst, clocks),	\
-				     clock_frequency),			\
-		(DT_INST_PROP_BY_PHANDLE(inst, clocks,			\
-					 clock_frequency)),		\
-		(DT_INST_PROP(inst, clock_frequency)))
-
-#define MSPI_DW_DT_INST_PROP(inst, prop) .prop = DT_INST_PROP(inst, prop)
-
-#define FOREACH_CE_GPIOS_ELEM(inst)					\
-	DT_INST_FOREACH_PROP_ELEM_SEP(inst, ce_gpios,			\
-				      GPIO_DT_SPEC_GET_BY_IDX, (,))
-#define MSPI_DW_CE_GPIOS(inst)						\
-	.ce_gpios = (const struct gpio_dt_spec [])			\
-		{ FOREACH_CE_GPIOS_ELEM(inst) },			\
-	.ce_gpios_len = DT_INST_PROP_LEN(inst, ce_gpios)
-
-#define TX_FIFO_DEPTH(inst) DT_INST_PROP(inst, fifo_depth)
-#define RX_FIFO_DEPTH(inst) DT_INST_PROP_OR(inst, rx_fifo_depth,	\
-					    TX_FIFO_DEPTH(inst))
-#define MSPI_DW_FIFO_PROPS(inst)					\
-	.tx_fifo_depth_minus_1 = TX_FIFO_DEPTH(inst) - 1,		\
-	.tx_fifo_threshold =						\
-		DT_INST_PROP_OR(inst, tx_fifo_threshold,		\
-				7 * TX_FIFO_DEPTH(inst) / 8 - 1),	\
-	.rx_fifo_threshold =						\
-		DT_INST_PROP_OR(inst, rx_fifo_threshold,		\
-				1 * RX_FIFO_DEPTH(inst) / 8 - 1)
-
-#define MSPI_DW_INST(inst)						\
-	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);		\
-	IF_ENABLED(CONFIG_PINCTRL, (PINCTRL_DT_INST_DEFINE(inst);))	\
-	static void irq_config##inst(void)				\
-	{								\
-		LISTIFY(DT_INST_NUM_IRQS(inst),				\
-			MSPI_DW_INST_IRQ, (;), inst);			\
-	}								\
-	static struct mspi_dw_data dev##inst##_data;			\
-	static const struct mspi_dw_config dev##inst##_config = {	\
-		MSPI_DW_MMIO_ROM_INIT(DT_DRV_INST(inst)),		\
-		.irq_config = irq_config##inst,				\
-		.clock_frequency = MSPI_DW_CLOCK_FREQUENCY(inst),	\
-	IF_ENABLED(CONFIG_PINCTRL,					\
-		(.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),))	\
-	IF_ENABLED(DT_INST_NODE_HAS_PROP(inst, ce_gpios),		\
-		(MSPI_DW_CE_GPIOS(inst),))				\
-		MSPI_DW_FIFO_PROPS(inst),				\
-		DEFINE_REG_ACCESS(inst)					\
-	};								\
-	DEVICE_DT_INST_DEFINE(inst,					\
-		dev_init, PM_DEVICE_DT_INST_GET(inst),			\
-		&dev##inst##_data, &dev##inst##_config,			\
-		POST_KERNEL, CONFIG_MSPI_INIT_PRIORITY,			\
-		&drv_api);
-
-DT_INST_FOREACH_STATUS_OKAY(MSPI_DW_INST)
diff --git a/drivers/mspi/mspi_dw.h b/drivers/mspi/mspi_dw.h
deleted file mode 100644
index 6f4a2c5a981..00000000000
--- a/drivers/mspi/mspi_dw.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * This file is a part of mspi_dw.c extracted only for clarity.
- * It is not supposed to be included by any file other than mspi_dw.c.
- */
-
-/* CTRLR0 - Control Register 0 */
-#define CTRLR0_SPI_FRF_MASK	GENMASK(23, 22)
-#define CTRLR0_SPI_FRF_STANDARD	0UL
-#define CTRLR0_SPI_FRF_DUAL	1UL
-#define CTRLR0_SPI_FRF_QUAD	2UL
-#define CTRLR0_SPI_FRF_OCTAL	3UL
-#define CTRLR0_TMOD_MASK	GENMASK(11, 10)
-#define CTRLR0_TMOD_TX_RX	0UL
-#define CTRLR0_TMOD_TX		1UL
-#define CTRLR0_TMOD_RX		2UL
-#define CTRLR0_TMOD_EEPROM	3UL
-#define CTRLR0_SCPOL_BIT	BIT(9)
-#define CTRLR0_SCPH_BIT		BIT(8)
-#define CTRLR0_FRF_MASK		GENMASK(7, 6)
-#define CTRLR0_FRF_SPI		0UL
-#define CTRLR0_FRF_SSP		1UL
-#define CTRLR0_FRF_MICROWIRE	2UL
-#define CTRLR0_DFS_MASK		GENMASK(4, 0)
-
-/* CTRLR1- Control Register 1 */
-#define CTRLR1_NDF_MASK		GENMASK(15, 0)
-
-/* SSIENR - SSI Enable Register */
-#define SSIENR_SSIC_EN_BIT	BIT(0)
-
-/* TXFTLR - Transmit FIFO Threshold Level */
-#define TXFTLR_TXFTHR_MASK	GENMASK(23, 16)
-#define TXFTLR_TFT_MASK		GENMASK(7, 0)
-
-/* RXFTLR - Receive FIFO Threshold Level */
-#define RXFTLR_RFT_MASK		GENMASK(7, 0)
-
-/* TXFLR - Transmit FIFO Level Register */
-#define TXFLR_TXTFL_MASK	GENMASK(7, 0)
-
-/* RXFLR - Receive FIFO Level Register */
-#define RXFLR_RXTFL_MASK	GENMASK(7, 0)
-
-/* SR - Status Register */
-#define SR_BUSY_BIT	        BIT(0)
-
-/* IMR - Interrupt Mask Register */
-#define IMR_TXEIM_BIT		BIT(0)
-#define IMR_TXOIM_BIT		BIT(1)
-#define IMR_RXUIM_BIT		BIT(2)
-#define IMR_RXOIM_BIT		BIT(3)
-#define IMR_RXFIM_BIT		BIT(4)
-#define IMR_MSTIM_BIT		BIT(5)
-
-/* ISR - Interrupt Status Register */
-#define ISR_TXEIS_BIT		BIT(0)
-#define ISR_TXOIS_BIT		BIT(1)
-#define ISR_RXUIS_BIT		BIT(2)
-#define ISR_RXOIS_BIT		BIT(3)
-#define ISR_RXFIS_BIT		BIT(4)
-#define ISR_MSTIS_BIT		BIT(5)
-
-/* SPI_CTRLR0 - SPI Control Register */
-#define SPI_CTRLR0_CLK_STRETCH_EN_BIT		BIT(30)
-#define SPI_CTRLR0_XIP_PREFETCH_EN_BIT		BIT(29)
-#define SPI_CTRLR0_XIP_MBL_BIT			BIT(26)
-#define SPI_CTRLR0_SPI_RXDS_SIG_EN_BIT		BIT(25)
-#define SPI_CTRLR0_SPI_DM_EN_BIT		BIT(24)
-#define SPI_CTRLR0_RXDS_VL_EN_BIT		BIT(23)
-#define SPI_CTRLR0_SSIC_XIP_CONT_XFER_EN_BIT	BIT(21)
-#define SPI_CTRLR0_XIP_INST_EN_BIT		BIT(20)
-#define SPI_CTRLR0_XIP_DFS_HC_BIT		BIT(19)
-#define SPI_CTRLR0_SPI_RXDS_EN_BIT		BIT(18)
-#define SPI_CTRLR0_INST_DDR_EN_BIT		BIT(17)
-#define SPI_CTRLR0_SPI_DDR_EN_BIT		BIT(16)
-#define SPI_CTRLR0_WAIT_CYCLES_MASK		GENMASK(15, 11)
-#define SPI_CTRLR0_WAIT_CYCLES_MAX		BIT_MASK(5)
-#define SPI_CTRLR0_INST_L_MASK			GENMASK(9, 8)
-#define SPI_CTRLR0_INST_L0			0UL
-#define SPI_CTRLR0_INST_L4			1UL
-#define SPI_CTRLR0_INST_L8			2UL
-#define SPI_CTRLR0_INST_L16			3UL
-#define SPI_CTRLR0_XIP_MD_BIT_EN_BIT		BIT(7)
-#define SPI_CTRLR0_ADDR_L_MASK			GENMASK(5, 2)
-#define SPI_CTRLR0_TRANS_TYPE_MASK		GENMASK(1, 0)
-#define SPI_CTRLR0_TRANS_TYPE_TT0		0UL
-#define SPI_CTRLR0_TRANS_TYPE_TT1		1UL
-#define SPI_CTRLR0_TRANS_TYPE_TT2		2UL
-#define SPI_CTRLR0_TRANS_TYPE_TT3		3UL
-
-/* XIP_CTRL - XIP Control Register */
-#define XIP_CTRL_XIP_PREFETCH_EN_BIT	BIT(28)
-#define XIP_CTRL_XIP_MBL_MASK		GENMASK(27, 26)
-#define XIP_CTRL_XIP_MBL_2		0UL
-#define XIP_CTRL_XIP_MBL_4		1UL
-#define XIP_CTRL_XIP_MBL_8		2UL
-#define XIP_CTRL_XIP_MBL_16		3UL
-#define XIP_CTRL_RXDS_SIG_EN_BIT	BIT(25)
-#define XIP_CTRL_XIP_HYBERBUS_EN_BIT	BIT(24)
-#define XIP_CTRL_CONT_XFER_EN_BIT	BIT(23)
-#define XIP_CTRL_INST_EN_BIT		BIT(22)
-#define XIP_CTRL_RXDS_EN_BIT		BIT(21)
-#define XIP_CTRL_INST_DDR_EN_BIT	BIT(20)
-#define XIP_CTRL_DDR_EN_BIT		BIT(19)
-#define XIP_CTRL_DFS_HC_BIT		BIT(18)
-#define XIP_CTRL_WAIT_CYCLES_MASK	GENMASK(17, 13)
-#define XIP_CTRL_WAIT_CYCLES_MAX	BIT_MASK(5)
-#define XIP_CTRL_MD_BITS_EN_BIT		BIT(12)
-#define XIP_CTRL_INST_L_MASK		GENMASK(10, 9)
-#define XIP_CTRL_INST_L0		0UL
-#define XIP_CTRL_INST_L4		1UL
-#define XIP_CTRL_INST_L8		2UL
-#define XIP_CTRL_INST_L16		3UL
-#define XIP_CTRL_ADDR_L_MASK		GENMASK(7, 4)
-#define XIP_CTRL_TRANS_TYPE_MASK	GENMASK(3, 2)
-#define XIP_CTRL_TRANS_TYPE_TT0		0UL
-#define XIP_CTRL_TRANS_TYPE_TT1		1UL
-#define XIP_CTRL_TRANS_TYPE_TT2		2UL
-#define XIP_CTRL_FRF_MASK		GENMASK(1, 0)
-#define XIP_CTRL_FRF_DUAL		1UL
-#define XIP_CTRL_FRF_QUAD		2UL
-#define XIP_CTRL_FRF_OCTAL		3UL
-
-/* XIP_CTRL - XIP Control Register */
-#define XIP_CTRL_XIP_PREFETCH_EN_BIT	BIT(28)
-#define XIP_CTRL_XIP_MBL_MASK		GENMASK(27, 26)
-#define XIP_CTRL_XIP_MBL_2		0UL
-#define XIP_CTRL_XIP_MBL_4		1UL
-#define XIP_CTRL_XIP_MBL_8		2UL
-#define XIP_CTRL_XIP_MBL_16		3UL
-#define XIP_CTRL_XIP_HYBERBUS_EN_BIT	BIT(24)
-#define XIP_CTRL_CONT_XFER_EN_BIT	BIT(23)
-#define XIP_CTRL_INST_EN_BIT		BIT(22)
-#define XIP_CTRL_RXDS_EN_BIT		BIT(21)
-#define XIP_CTRL_INST_DDR_EN_BIT	BIT(20)
-#define XIP_CTRL_DDR_EN_BIT		BIT(19)
-#define XIP_CTRL_DFS_HC_BIT		BIT(18)
-
-/* XIP_WRITE_CTRL - XIP Write Control Register */
-#define XIP_WRITE_CTRL_WAIT_CYCLES_MASK	GENMASK(20, 16)
-#define XIP_WRITE_CTRL_WAIT_CYCLES_MAX	BIT_MASK(5)
-#define XIP_WRITE_CTRL_RXDS_SIG_EN_BIT	BIT(13)
-#define XIP_WRITE_CTRL_HYBERBUS_EN_BIT	BIT(12)
-#define XIP_WRITE_CTRL_INST_DDR_EN_BIT	BIT(11)
-#define XIP_WRITE_CTRL_SPI_DDR_EN_BIT	BIT(10)
-#define XIP_WRITE_CTRL_INST_L_MASK	GENMASK(9, 8)
-#define XIP_WRITE_CTRL_INST_L0		0UL
-#define XIP_WRITE_CTRL_INST_L4		1UL
-#define XIP_WRITE_CTRL_INST_L8		2UL
-#define XIP_WRITE_CTRL_INST_L16		3UL
-#define XIP_WRITE_CTRL_ADDR_L_MASK	GENMASK(7, 4)
-#define XIP_WRITE_CTRL_TRANS_TYPE_MASK	GENMASK(3, 2)
-#define XIP_WRITE_CTRL_TRANS_TYPE_TT0	0UL
-#define XIP_WRITE_CTRL_TRANS_TYPE_TT1	1UL
-#define XIP_WRITE_CTRL_TRANS_TYPE_TT2	2UL
-#define XIP_WRITE_CTRL_FRF_MASK		GENMASK(1, 0)
-#define XIP_WRITE_CTRL_FRF_DUAL		1UL
-#define XIP_WRITE_CTRL_FRF_QUAD		2UL
-#define XIP_WRITE_CTRL_FRF_OCTAL	3UL
-
-/* Register access helpers. */
-#define USES_AUX_REG(inst) + DT_INST_PROP(inst, aux_reg_enable)
-#define AUX_REG_INSTANCES (0 DT_INST_FOREACH_STATUS_OKAY(USES_AUX_REG))
-#define BASE_ADDR(dev) (mm_reg_t)DEVICE_MMIO_GET(dev)
-
-#if AUX_REG_INSTANCES != 0
-static uint32_t aux_reg_read(const struct device *dev, uint32_t off)
-{
-	return sys_in32(BASE_ADDR(dev) + off/4);
-}
-static void aux_reg_write(uint32_t data, const struct device *dev, uint32_t off)
-{
-	sys_out32(data, BASE_ADDR(dev) + off/4);
-}
-#endif
-
-#if AUX_REG_INSTANCES != DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT)
-static uint32_t reg_read(const struct device *dev, uint32_t off)
-{
-	return sys_read32(BASE_ADDR(dev) + off);
-}
-static void reg_write(uint32_t data, const struct device *dev, uint32_t off)
-{
-	sys_write32(data, BASE_ADDR(dev) + off);
-}
-#endif
-
-#if AUX_REG_INSTANCES == 0
-/* If no instance uses aux-reg access. */
-#define DECLARE_REG_ACCESS()
-#define DEFINE_REG_ACCESS(inst)
-#define DEFINE_MM_REG_RD(reg, off) \
-	static inline uint32_t read_##reg(const struct device *dev) \
-	{ return reg_read(dev, off); }
-#define DEFINE_MM_REG_WR(reg, off) \
-	static inline void write_##reg(const struct device *dev, uint32_t data) \
-	{ reg_write(data, dev, off); }
-
-#elif AUX_REG_INSTANCES == DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT)
-/* If all instances use aux-reg access. */
-#define DECLARE_REG_ACCESS()
-#define DEFINE_REG_ACCESS(inst)
-#define DEFINE_MM_REG_RD(reg, off) \
-	static inline uint32_t read_##reg(const struct device *dev) \
-	{ return aux_reg_read(dev, off); }
-#define DEFINE_MM_REG_WR(reg, off) \
-	static inline void write_##reg(const struct device *dev, uint32_t data) \
-	{ aux_reg_write(data, dev, off); }
-
-#else
-/* If register access varies by instance. */
-#define DECLARE_REG_ACCESS() \
-	uint32_t (*read)(const struct device *dev, uint32_t off); \
-	void (*write)(uint32_t data, const struct device *dev, uint32_t off)
-#define DEFINE_REG_ACCESS(inst) \
-	COND_CODE_1(DT_INST_PROP(inst, aux_reg_enable), \
-		(.read = aux_reg_read, \
-		.write = aux_reg_write,), \
-		(.read = reg_read, \
-		.write = reg_write,))
-#define DEFINE_MM_REG_RD(reg, off) \
-	static inline uint32_t read_##reg(const struct device *dev) \
-	{ \
-		const struct mspi_dw_config *dev_config = dev->config; \
-		return dev_config->read(dev, off); \
-	}
-#define DEFINE_MM_REG_WR(reg, off) \
-	static inline void write_##reg(const struct device *dev, uint32_t data) \
-	{ \
-		const struct mspi_dw_config *dev_config = dev->config; \
-		dev_config->write(data, dev, off); \
-	}
-#endif
diff --git a/drivers/mspi/mspi_dw_vendor_specific.h b/drivers/mspi/mspi_dw_vendor_specific.h
deleted file mode 100644
index 7255f926fa8..00000000000
--- a/drivers/mspi/mspi_dw_vendor_specific.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * This file is a part of mspi_dw.c extracted only for clarity.
- * It is not supposed to be included by any file other than mspi_dw.c.
- */
-
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
-
-#include <nrf.h>
-
-static void vendor_specific_init(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	NRF_EXMIF->EVENTS_CORE = 0;
-	NRF_EXMIF->INTENSET = BIT(EXMIF_INTENSET_CORE_Pos);
-}
-
-static void vendor_specific_suspend(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	NRF_EXMIF->TASKS_STOP = 1;
-}
-
-static void vendor_specific_resume(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	NRF_EXMIF->TASKS_START = 1;
-}
-
-static void vendor_specific_irq_clear(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	NRF_EXMIF->EVENTS_CORE = 0;
-}
-
-#if defined(CONFIG_MSPI_XIP)
-static int vendor_specific_xip_enable(const struct device *dev,
-				      const struct mspi_dev_id *dev_id,
-				      const struct mspi_xip_cfg *cfg)
-{
-	ARG_UNUSED(dev);
-
-	if (dev_id->dev_idx == 0) {
-		NRF_EXMIF->EXTCONF1.OFFSET = cfg->address_offset;
-		NRF_EXMIF->EXTCONF1.SIZE = cfg->address_offset
-					 + cfg->size - 1;
-		NRF_EXMIF->EXTCONF1.ENABLE = 1;
-	} else if (dev_id->dev_idx == 1) {
-		NRF_EXMIF->EXTCONF2.OFFSET = cfg->address_offset;
-		NRF_EXMIF->EXTCONF2.SIZE = cfg->address_offset
-					 + cfg->size - 1;
-		NRF_EXMIF->EXTCONF2.ENABLE = 1;
-	} else {
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-static int vendor_specific_xip_disable(const struct device *dev,
-				       const struct mspi_dev_id *dev_id,
-				       const struct mspi_xip_cfg *cfg)
-{
-	ARG_UNUSED(dev);
-
-	if (dev_id->dev_idx == 0) {
-		NRF_EXMIF->EXTCONF1.ENABLE = 0;
-	} else if (dev_id->dev_idx == 1) {
-		NRF_EXMIF->EXTCONF2.ENABLE = 0;
-	} else {
-		return -EINVAL;
-	}
-
-	return 0;
-}
-#endif /* defined(CONFIG_MSPI_XIP) */
-
-#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) */
diff --git a/dts/bindings/mspi/snps,designware-ssi.yaml b/dts/bindings/mspi/snps,designware-ssi.yaml
deleted file mode 100644
index fb516cb7835..00000000000
--- a/dts/bindings/mspi/snps,designware-ssi.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: Synopsys DesignWare Synchronous Serial Interface (SSI) node
-
-compatible: "snps,designware-ssi"
-
-include: [mspi-controller.yaml, pinctrl-device.yaml]
-
-properties:
-  reg:
-    required: true
-
-  interrupts:
-    required: true
-
-  aux-reg-enable:
-    type: boolean
-    description: |
-      Activates auxiliary register access that is needed on some platforms.
-
-  fifo-depth:
-    required: true
-    type: int
-    description: |
-      Number of items that can be stored in the TX FIFO. Range: 8-256.
-      If the RX FIFO depth is not specified separately in the rx-fifo-depth
-      property, this value specifies depth of both TX and RX FIFOs.
-
-  rx-fifo-depth:
-    type: int
-    description: |
-      Number of items that can be stored in the RX FIFO. Range: 8-256.
-
-  tx-fifo-threshold:
-    type: int
-    description: |
-      Number of entries in the TX FIFO above which the TX transfer is started.
-      Maximum value is the TX FIFO depth - 1.
-
-  rx-fifo-threshold:
-    type: int
-    description: |
-      Number of entries in the RX FIFO above which the controller gets an RX
-      interrupt. Maximum value is the RX FIFO depth - 1.

From e0ade2f8943a8e852386fad58f651625ab913c0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:13 +0100
Subject: [PATCH 1185/2913] Revert "[nrf fromtree] drivers: flash: Sort CMake
 and Kconfig files alphabetically"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7fa061c31303a7eb220a8c0a76fa1c947af7b042.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/flash/CMakeLists.txt | 96 ++++++++++++++++--------------------
 drivers/flash/Kconfig        | 87 ++++++++++++++++++++++----------
 2 files changed, 104 insertions(+), 79 deletions(-)

diff --git a/drivers/flash/CMakeLists.txt b/drivers/flash/CMakeLists.txt
index 97d9cd55059..64b9c149db3 100644
--- a/drivers/flash/CMakeLists.txt
+++ b/drivers/flash/CMakeLists.txt
@@ -16,55 +16,10 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/flash.h)
 
 zephyr_library()
 
-# zephyr-keep-sorted-start
-zephyr_library_sources_ifdef(CONFIG_FLASH_JESD216 jesd216.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_PAGE_LAYOUT flash_page_layout.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_SHELL flash_shell.c)
-zephyr_library_sources_ifdef(CONFIG_USERSPACE flash_handlers.c)
-# zephyr-keep-sorted-stop
-
-# zephyr-keep-sorted-start
-zephyr_library_sources_ifdef(CONFIG_FLASH_AMBIQ flash_ambiq.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_ANDES_QSPI flash_andes_qspi.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_CAD_QSPI_NOR flash_cadence_qspi_nor.c flash_cadence_qspi_nor_ll.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_CDNS_NAND flash_cadence_nand.c flash_cadence_nand_ll.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_INFINEON_CAT1 flash_ifx_cat1.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_HYPERFLASH flash_mcux_flexspi_hyperflash.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_MX25UM51345G flash_mcux_flexspi_mx25um51345g.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_NOR flash_mcux_flexspi_nor.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_ATXP032 flash_mspi_atxp032.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_EMUL_DEVICE flash_mspi_emul_device.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_NOR flash_npcx_fiu_nor.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_QSPI flash_npcx_fiu_qspi.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_RPI_PICO flash_rpi_pico.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_STM32_OSPI flash_stm32_ospi.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_STM32_QSPI flash_stm32_qspi.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_STM32_XSPI flash_stm32_xspi.c)
-zephyr_library_sources_ifdef(CONFIG_INFINEON_CAT1_QSPI_FLASH flash_ifx_cat1_qspi.c)
-zephyr_library_sources_ifdef(CONFIG_NORDIC_QSPI_NOR nrf_qspi_nor.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_CC13XX_CC26XX soc_flash_cc13xx_cc26xx.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_ESP32 flash_esp32.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_GECKO flash_gecko.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_ITE_IT8XXX2 flash_ite_it8xxx2.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_LPC soc_flash_lpc.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_MCUX soc_flash_mcux.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NIOS2_QSPI soc_flash_nios2_qspi.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF soc_flash_nrf.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF_MRAM soc_flash_nrf_mram.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF_RRAM soc_flash_nrf_rram.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NUMAKER soc_flash_numaker.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NUMAKER_RMC soc_flash_numaker_rmc.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_RV32M1 soc_flash_rv32m1.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SAM flash_sam.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SAM0 flash_sam0.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SI32 flash_si32.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SMARTBOND flash_smartbond.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_TELINK_B91 soc_flash_b91.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_XMC4XXX soc_flash_xmc4xxx.c)
-zephyr_library_sources_ifdef(CONFIG_SPI_FLASH_AT45 spi_flash_at45.c)
 zephyr_library_sources_ifdef(CONFIG_SPI_NOR spi_nor.c)
-# zephyr-keep-sorted-stop
-
+zephyr_library_sources_ifdef(CONFIG_NORDIC_QSPI_NOR nrf_qspi_nor.c)
 if(CONFIG_FLASH_SIMULATOR)
   zephyr_library_sources(flash_simulator.c)
   if(CONFIG_NATIVE_LIBRARY)
@@ -73,7 +28,36 @@ if(CONFIG_FLASH_SIMULATOR)
     zephyr_library_sources(flash_simulator_native.c)
   endif()
 endif()
-
+zephyr_library_sources_ifdef(CONFIG_SPI_FLASH_AT45 spi_flash_at45.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_ITE_IT8XXX2 flash_ite_it8xxx2.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF soc_flash_nrf.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_MCUX soc_flash_mcux.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_LPC soc_flash_lpc.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_PAGE_LAYOUT flash_page_layout.c)
+zephyr_library_sources_ifdef(CONFIG_USERSPACE flash_handlers.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SAM0 flash_sam0.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SAM flash_sam.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NIOS2_QSPI soc_flash_nios2_qspi.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_GECKO flash_gecko.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_RV32M1 soc_flash_rv32m1.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_QSPI flash_npcx_fiu_qspi.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_NOR flash_npcx_fiu_nor.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_STM32_QSPI flash_stm32_qspi.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_STM32_OSPI flash_stm32_ospi.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_STM32_XSPI flash_stm32_xspi.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_MX25UM51345G flash_mcux_flexspi_mx25um51345g.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_NOR flash_mcux_flexspi_nor.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_HYPERFLASH flash_mcux_flexspi_hyperflash.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_ESP32 flash_esp32.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SMARTBOND flash_smartbond.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_CAD_QSPI_NOR flash_cadence_qspi_nor.c flash_cadence_qspi_nor_ll.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_XMC4XXX soc_flash_xmc4xxx.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_RPI_PICO flash_rpi_pico.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_ANDES_QSPI flash_andes_qspi.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_AMBIQ flash_ambiq.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_CDNS_NAND flash_cadence_nand.c flash_cadence_nand_ll.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_EMUL_DEVICE flash_mspi_emul_device.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_ATXP032 flash_mspi_atxp032.c)
 zephyr_library_include_directories_ifdef(CONFIG_MSPI ${ZEPHYR_BASE}/drivers/mspi)
 if(CONFIG_FLASH_MCUX_FLEXSPI_XIP)
   dt_chosen(chosen_flash PROPERTY "zephyr,flash")
@@ -107,17 +91,15 @@ if(CONFIG_SOC_FLASH_STM32)
       zephyr_library_sources(flash_stm32.c)
       zephyr_library_sources_ifdef(CONFIG_FLASH_EX_OP_ENABLED flash_stm32_ex_op.c)
 
-# zephyr-keep-sorted-start
       zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32F1_FLASH_CONTROLLER_ENABLED flash_stm32f1x.c)
       zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32F2_FLASH_CONTROLLER_ENABLED flash_stm32f2x.c)
       zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32F4_FLASH_CONTROLLER_ENABLED flash_stm32f4x.c)
       zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32F7_FLASH_CONTROLLER_ENABLED flash_stm32f7x.c)
-      zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32G0_FLASH_CONTROLLER_ENABLED flash_stm32g0x.c)
-      zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32G4_FLASH_CONTROLLER_ENABLED flash_stm32g4x.c)
       zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32L4_FLASH_CONTROLLER_ENABLED flash_stm32l4x.c)
       zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32L5_FLASH_CONTROLLER_ENABLED flash_stm32l5x.c)
       zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32WB_FLASH_CONTROLLER_ENABLED flash_stm32wbx.c)
-# zephyr-keep-sorted-stop
+      zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32G0_FLASH_CONTROLLER_ENABLED flash_stm32g0x.c)
+      zephyr_library_sources_ifdef(CONFIG_DT_HAS_ST_STM32G4_FLASH_CONTROLLER_ENABLED flash_stm32g4x.c)
     endif()
   endif()
 endif()
@@ -125,11 +107,9 @@ endif()
 if(CONFIG_SOC_FLASH_GD32)
   zephyr_library_sources(flash_gd32.c)
 
-# zephyr-keep-sorted-start
   zephyr_library_sources_ifdef(CONFIG_GD32_NV_FLASH_V1 flash_gd32_v1.c)
   zephyr_library_sources_ifdef(CONFIG_GD32_NV_FLASH_V2 flash_gd32_v2.c)
   zephyr_library_sources_ifdef(CONFIG_GD32_NV_FLASH_V3 flash_gd32_v3.c)
-# zephyr-keep-sorted-stop
 endif()
 
 zephyr_library_include_directories_ifdef(
@@ -153,6 +133,16 @@ zephyr_library_include_directories_ifdef(
   ${ZEPHYR_BASE}/drivers/memc
 )
 
+zephyr_library_sources_ifdef(CONFIG_FLASH_SHELL flash_shell.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_JESD216 jesd216.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_INFINEON_CAT1 flash_ifx_cat1.c)
+zephyr_library_sources_ifdef(CONFIG_INFINEON_CAT1_QSPI_FLASH flash_ifx_cat1_qspi.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NUMAKER soc_flash_numaker.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF_RRAM soc_flash_nrf_rram.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF_MRAM soc_flash_nrf_mram.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NUMAKER_RMC soc_flash_numaker_rmc.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SI32 flash_si32.c)
+
 if(CONFIG_RA_FLASH_HP)
   zephyr_library_sources(flash_hp_ra.c)
   zephyr_library_sources_ifdef(CONFIG_FLASH_EX_OP_ENABLED flash_hp_ra_ex_op.c)
diff --git a/drivers/flash/Kconfig b/drivers/flash/Kconfig
index 4ab3e9da14f..99f17d71f7a 100644
--- a/drivers/flash/Kconfig
+++ b/drivers/flash/Kconfig
@@ -163,46 +163,81 @@ config FLASH_INIT_PRIORITY
 	  priority is used unless the driver implementation has its own
 	  initialization priority
 
-# zephyr-keep-sorted-start
-source "drivers/flash/Kconfig.ambiq"
-source "drivers/flash/Kconfig.andes"
-source "drivers/flash/Kconfig.at45"
 source "drivers/flash/Kconfig.b91"
-source "drivers/flash/Kconfig.cadence_nand"
-source "drivers/flash/Kconfig.cadence_qspi_nor"
+
 source "drivers/flash/Kconfig.cc13xx_cc26xx"
+
+source "drivers/flash/Kconfig.at45"
+
 source "drivers/flash/Kconfig.esp32"
-source "drivers/flash/Kconfig.gd32"
-source "drivers/flash/Kconfig.gecko"
-source "drivers/flash/Kconfig.ifx_cat1"
+
 source "drivers/flash/Kconfig.it8xxx2"
+
+source "drivers/flash/Kconfig.nrf"
+
 source "drivers/flash/Kconfig.lpc"
+
 source "drivers/flash/Kconfig.mcux"
+
 source "drivers/flash/Kconfig.mspi"
+
 source "drivers/flash/Kconfig.nios2_qspi"
-source "drivers/flash/Kconfig.nor"
-source "drivers/flash/Kconfig.nordic_qspi_nor"
+
 source "drivers/flash/Kconfig.npcx_fiu"
-source "drivers/flash/Kconfig.nrf"
-source "drivers/flash/Kconfig.nrf_mram"
-source "drivers/flash/Kconfig.nrf_rram"
-source "drivers/flash/Kconfig.numaker"
-source "drivers/flash/Kconfig.numaker_rmc"
-source "drivers/flash/Kconfig.nxp_s32"
-source "drivers/flash/Kconfig.renesas_ra"
+
+source "drivers/flash/Kconfig.gecko"
+
+source "drivers/flash/Kconfig.nor"
+
 source "drivers/flash/Kconfig.rpi_pico"
-source "drivers/flash/Kconfig.rv32m1"
-source "drivers/flash/Kconfig.sam"
-source "drivers/flash/Kconfig.sam0"
-source "drivers/flash/Kconfig.si32"
-source "drivers/flash/Kconfig.simulator"
-source "drivers/flash/Kconfig.smartbond"
+
 source "drivers/flash/Kconfig.stm32"
-source "drivers/flash/Kconfig.stm32_ospi"
+
 source "drivers/flash/Kconfig.stm32_qspi"
+
+source "drivers/flash/Kconfig.stm32_ospi"
+
 source "drivers/flash/Kconfig.stm32_xspi"
+
+source "drivers/flash/Kconfig.sam0"
+
+source "drivers/flash/Kconfig.sam"
+
+source "drivers/flash/Kconfig.simulator"
+
+source "drivers/flash/Kconfig.si32"
+
+source "drivers/flash/Kconfig.rv32m1"
+
+source "drivers/flash/Kconfig.nordic_qspi_nor"
+
+source "drivers/flash/Kconfig.smartbond"
+
+source "drivers/flash/Kconfig.cadence_qspi_nor"
+
+source "drivers/flash/Kconfig.gd32"
+
 source "drivers/flash/Kconfig.xmc4xxx"
-# zephyr-keep-sorted-stop
+
+source "drivers/flash/Kconfig.ifx_cat1"
+
+source "drivers/flash/Kconfig.cadence_nand"
+
+source "drivers/flash/Kconfig.numaker"
+
+source "drivers/flash/Kconfig.nxp_s32"
+
+source "drivers/flash/Kconfig.andes"
+
+source "drivers/flash/Kconfig.ambiq"
+
+source "drivers/flash/Kconfig.nrf_rram"
+
+source "drivers/flash/Kconfig.nrf_mram"
+
+source "drivers/flash/Kconfig.numaker_rmc"
+
+source "drivers/flash/Kconfig.renesas_ra"
 
 module = FLASH
 module-str = flash

From 4ac94d97d09e2824d2e426652ddf9593636fc988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:13 +0100
Subject: [PATCH 1186/2913] Revert "[nrf fromtree] tests/flash/common: Increase
 ztest stack size"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 10af4872132795c5df6eb66f76ce9a040136db28.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/drivers/flash/common/prj.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/drivers/flash/common/prj.conf b/tests/drivers/flash/common/prj.conf
index cb0a271262c..2496d765165 100644
--- a/tests/drivers/flash/common/prj.conf
+++ b/tests/drivers/flash/common/prj.conf
@@ -3,4 +3,3 @@ CONFIG_ZTEST=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_MAIN_STACK_SIZE=2048
-CONFIG_ZTEST_STACK_SIZE=4096

From bad81ad7f31f6d552d845bacc0c93f4629523e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:13 +0100
Subject: [PATCH 1187/2913] Revert "[nrf noup] samples: bluetooth: update
 autoconf.h header path"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 923f09004041cd98a0338acf196415a3c43bebb4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/bluetooth/bap_unicast_client/src/stream_tx.c        | 2 +-
 samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c   | 2 +-
 samples/bluetooth/cap_acceptor/src/main.c                   | 2 +-
 samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c | 2 +-
 samples/bluetooth/cap_initiator/src/main.c                  | 2 +-
 soc/nordic/nrf54l/soc.c                                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/samples/bluetooth/bap_unicast_client/src/stream_tx.c b/samples/bluetooth/bap_unicast_client/src/stream_tx.c
index eba7273a0c6..06ea3a3c349 100644
--- a/samples/bluetooth/bap_unicast_client/src/stream_tx.c
+++ b/samples/bluetooth/bap_unicast_client/src/stream_tx.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/autoconf.h>
+#include <autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c b/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
index aad077a0aed..cbdb859eb8f 100644
--- a/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
+++ b/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
@@ -7,7 +7,7 @@
  *  SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/autoconf.h>
+#include <autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_acceptor/src/main.c b/samples/bluetooth/cap_acceptor/src/main.c
index df4600f09bb..6ca5f59282e 100644
--- a/samples/bluetooth/cap_acceptor/src/main.c
+++ b/samples/bluetooth/cap_acceptor/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/autoconf.h>
+#include <autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c b/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
index 60509beb258..39b7a68aef6 100644
--- a/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
+++ b/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/autoconf.h>
+#include <autoconf.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/samples/bluetooth/cap_initiator/src/main.c b/samples/bluetooth/cap_initiator/src/main.c
index 8eab76938bc..1b35ea7981f 100644
--- a/samples/bluetooth/cap_initiator/src/main.c
+++ b/samples/bluetooth/cap_initiator/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/autoconf.h>
+#include <autoconf.h>
 #include <stddef.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index eab3bf18a14..d7f3005d1f4 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -13,7 +13,7 @@
  */
 
 #ifdef __NRF_TFM__
-#include <zephyr/autoconf.h>
+#include <autoconf.h>
 #endif
 
 #include <zephyr/devicetree.h>

From 6ceaec75a8a99869bb9e2ab79349a87161af05ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:13 +0100
Subject: [PATCH 1188/2913] Revert "[nrf noup] soc: nordic: nrf54l Fix for wait
 lasting half expected time"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 665aba441dd7c933d60bbf17fdd8eba6b7ba8591.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54l/soc.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index d7f3005d1f4..26248018f6b 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -48,13 +48,6 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 #define HFXO_NODE DT_NODELABEL(hfxo)
 #endif
 
-/* Building for cpuflpr with ns uses cpu_1 instead of cpu_0 */
-#if DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
-#define DEVICE_DT_CLOCK_FREQ DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
-#elif DT_PROP(DT_PATH(cpus, cpu_1), clock_frequency)
-#define DEVICE_DT_CLOCK_FREQ DT_PROP(DT_PATH(cpus, cpu_1), clock_frequency)
-#endif
-
 #if defined(NRF_APPLICATION)
 static inline void power_and_clock_configuration(void)
 {
@@ -179,18 +172,16 @@ int nordicsemi_nrf54l_init(void)
 	/* Update the SystemCoreClock global variable with current core clock
 	 * retrieved from hardware state.
 	 */
+#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(__NRF_TFM__)
+	/* Currently not supported for non-secure */
+	SystemCoreClockUpdate();
+#endif
 
 #ifdef __NRF_TFM__
 	/* TF-M enables the instruction cache from target_cfg.c, so we
 	 * don't need to enable it here.
 	 */
 #else
-
-	/* Update SystemCoreClock in Zephyr based on device tree to avoid SystemCoreClock
-	 * being overwritten with default value when initializing with TF-M
-	 */
-	SystemCoreClock = DEVICE_DT_CLOCK_FREQ;
-
 	/* Enable ICACHE */
 	sys_cache_instr_enable();
 #endif

From 58e15ebc63e7e78650f9ae89aee14b47f7de3162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:13 +0100
Subject: [PATCH 1189/2913] Revert "[nrf noup] soc: nordic: nrf54l: Port Soc.c
 to be compatible with TFM"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e3e053f4b6b58c0dad2a8ad776d1762bb630c621.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54l/soc.c | 66 +++++++++++------------------------------
 1 file changed, 17 insertions(+), 49 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index 26248018f6b..abb0f778ac3 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -12,21 +12,13 @@
  * for the Nordic Semiconductor nRF54L family processor.
  */
 
-#ifdef __NRF_TFM__
-#include <autoconf.h>
-#endif
-
 #include <zephyr/devicetree.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 #include <zephyr/kernel.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
-
-#ifndef __NRF_TFM__
 #include <zephyr/cache.h>
-#endif
-
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 #if defined(NRF_APPLICATION)
@@ -48,9 +40,17 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 #define HFXO_NODE DT_NODELABEL(hfxo)
 #endif
 
-#if defined(NRF_APPLICATION)
-static inline void power_and_clock_configuration(void)
+static int nordicsemi_nrf54l_init(void)
 {
+	/* Update the SystemCoreClock global variable with current core clock
+	 * retrieved from hardware state.
+	 */
+	SystemCoreClockUpdate();
+
+#if defined(NRF_APPLICATION)
+	/* Enable ICACHE */
+	sys_cache_instr_enable();
+
 #if DT_ENUM_HAS_VALUE(LFXO_NODE, load_capacitors, internal)
 	uint32_t xosc32ktrim = NRF_FICR->XOSC32KTRIM;
 
@@ -77,16 +77,16 @@ static inline void power_and_clock_configuration(void)
 	 * NOTE: The desired capacitance value is used in encoded from in INTCAP calculation formula
 	 *       That is different than in case of HFXO.
 	 */
-	uint32_t cap_val_encoded =
-		(((DT_PROP(LFXO_NODE, load_capacitance_femtofarad) - 4000UL) * 2UL) / 1000UL);
+	uint32_t cap_val_encoded = (((DT_PROP(LFXO_NODE, load_capacitance_femtofarad) - 4000UL)
+				     * 2UL) / 1000UL);
 
 	/* Calculation of INTCAP code before rounding. Min that calculations here are done on
 	 * values multiplied by 2^9, e.g. 0.765625 * 2^9 = 392.
 	 * offset_k should be divided by 2^6, but to add it to value shifted by 2^9 we have to
 	 * multiply it be 2^3.
 	 */
-	uint32_t mid_val =
-		(cap_val_encoded - 4UL) * (uint32_t)(slope_k + 392UL) + (offset_k << 3UL);
+	uint32_t mid_val = (cap_val_encoded - 4UL) * (uint32_t)(slope_k + 392UL)
+			   + (offset_k << 3UL);
 
 	/* Get integer part of the INTCAP code */
 	uint32_t lfxo_intcap = mid_val >> 9UL;
@@ -132,9 +132,8 @@ static inline void power_and_clock_configuration(void)
 	 */
 	uint32_t cap_val_femto_f = DT_PROP(HFXO_NODE, load_capacitance_femtofarad);
 
-	uint32_t mid_val_intcap = (((cap_val_femto_f - 5500UL) * (uint32_t)(slope_m + 791UL)) +
-				   (offset_m << 2UL) * 1000UL) >>
-				  8UL;
+	uint32_t mid_val_intcap = (((cap_val_femto_f - 5500UL) * (uint32_t)(slope_m + 791UL))
+		 + (offset_m << 2UL) * 1000UL) >> 8UL;
 
 	/* Convert the calculated value to piko Farads */
 	uint32_t hfxo_intcap = mid_val_intcap / 1000;
@@ -164,39 +163,8 @@ static inline void power_and_clock_configuration(void)
 #endif
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);
 #endif
-}
-#endif /* NRF_APPLICATION */
 
-int nordicsemi_nrf54l_init(void)
-{
-	/* Update the SystemCoreClock global variable with current core clock
-	 * retrieved from hardware state.
-	 */
-#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(__NRF_TFM__)
-	/* Currently not supported for non-secure */
-	SystemCoreClockUpdate();
-#endif
-
-#ifdef __NRF_TFM__
-	/* TF-M enables the instruction cache from target_cfg.c, so we
-	 * don't need to enable it here.
-	 */
-#else
-	/* Enable ICACHE */
-	sys_cache_instr_enable();
-#endif
-
-	/* NRF_REGULATORS and NRF_OSCILLATORS are configured to be secure
-	 * as NRF_REGULATORS.POFCON is needed by the secure domain to
-	 * prevent glitches when the power supply is attacked.
-	 *
-	 * NRF_OSCILLATORS is also configured as secure because of a HW limitation
-	 * that requires them to be configured with the same security property.
-	 */
-#if (defined(NRF_APPLICATION) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)) ||                  \
-	defined(__NRF_TFM__)
-	power_and_clock_configuration();
-#endif
+#endif /* NRF_APPLICATION */
 
 	return 0;
 }

From fd2363dabb5246ced299279123c9fc968867f58c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:13 +0100
Subject: [PATCH 1190/2913] Revert "[nrf noup] soc: nrf54l: Add custom section
 for KMU"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fcecc1370438052dc8ad84a2903f7d47f8e642de.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54l/CMakeLists.txt           |  9 ---------
 soc/nordic/nrf54l/kmu_push_area_section.ld | 19 -------------------
 2 files changed, 28 deletions(-)
 delete mode 100644 soc/nordic/nrf54l/kmu_push_area_section.ld

diff --git a/soc/nordic/nrf54l/CMakeLists.txt b/soc/nordic/nrf54l/CMakeLists.txt
index c8badc8d61d..cebbda571b6 100644
--- a/soc/nordic/nrf54l/CMakeLists.txt
+++ b/soc/nordic/nrf54l/CMakeLists.txt
@@ -6,12 +6,3 @@ zephyr_library_sources(
   ../validate_rram_partitions.c
   )
 zephyr_include_directories(.)
-
-# We need a buffer in memory in a static location which can be used by
-# the KMU peripheral. The KMU has a static destination address, we chose
-# this address to be 0x20000000, which is the first address in the SRAM.
-if(NOT CONFIG_BUILD_WITH_TFM AND CONFIG_PSA_NEED_CRACEN_KMU_DRIVER)
-# Exclamation mark is printable character with the lowest number in ASCII table.
-# We are sure that this file will be included first.
-zephyr_linker_sources(RAM_SECTIONS SORT_KEY ! kmu_push_area_section.ld)
-endif()
diff --git a/soc/nordic/nrf54l/kmu_push_area_section.ld b/soc/nordic/nrf54l/kmu_push_area_section.ld
deleted file mode 100644
index e8c8cd9f09a..00000000000
--- a/soc/nordic/nrf54l/kmu_push_area_section.ld
+++ /dev/null
@@ -1,19 +0,0 @@
-# This section must be loaded first of all the
-# custom sections because we want it to be placed
-# at the top address of RAM.
-SECTION_PROLOGUE(NRF_KMU_RESERVED_PUSH_SECTION,(NOLOAD) ,)
-{
-    __nrf_kmu_reserved_push_area = .;
-    *(.nrf_kmu_reserved_push_area)
-    __nrf_kmu_reserved_push_area_end = .;
-} GROUP_NOLOAD_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
-
-# It doesn't seem to be possible to enforce placing a section
-# at a specific address in memory using the Zephyr SECTION macros.
-# So this assert is necessary to avoid accidentatly moving this
-# section to a different address.
-ASSERT(__nrf_kmu_reserved_push_area == RAM_ADDR, "Error:  \
- The section NRF_KMU_RESERVED_PUSH_SECTION needs to be    \
- placed on the top RAM address but it is not, please edit \
- your linker scripts to make sure that it is placed on    \
- the to RAM address.")

From 9c4505b11b9862f4035aa8618246b706e9b0a25a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:13 +0100
Subject: [PATCH 1191/2913] Revert "[nrf fromtree] soc: nordic: nrf54l: remove
 redundant ELV code"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 850399a1880e651be96085acf68617ef210c93fc.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54l/CMakeLists.txt |  4 ++++
 soc/nordic/nrf54l/Kconfig        | 14 ++++++++++++++
 soc/nordic/nrf54l/soc.c          |  3 +++
 3 files changed, 21 insertions(+)

diff --git a/soc/nordic/nrf54l/CMakeLists.txt b/soc/nordic/nrf54l/CMakeLists.txt
index cebbda571b6..f1c18291fc6 100644
--- a/soc/nordic/nrf54l/CMakeLists.txt
+++ b/soc/nordic/nrf54l/CMakeLists.txt
@@ -6,3 +6,7 @@ zephyr_library_sources(
   ../validate_rram_partitions.c
   )
 zephyr_include_directories(.)
+
+if(CONFIG_ELV_GRTC_LFXO_ALLOWED)
+  message(WARNING "WARNING! ELV mode feature is EXPERIMENTAL and may brick your device!")
+endif()
diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index 9a2306b6adc..ab5f1c745b9 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -82,4 +82,18 @@ config SOC_NRF_FORCE_CONSTLAT
 	  of base resources on while in sleep. The advantage of having a constant
 	  and predictable latency will be at the cost of having increased power consumption.
 
+if NRF_GRTC_TIMER
+
+config ELV_GRTC_LFXO_ALLOWED
+	bool
+	depends on POWEROFF
+	select EXPERIMENTAL
+	help
+	  This feature allows using ELV mode when GRTC operates with the LFXO as
+	  a low-frequency clock source. The LFXO is automatically activated when
+	  preparing to system-off.
+	  WARNING! This feature is EXPERIMENTAL and may brick your device!
+
+endif # NRF_GRTC_TIMER
+
 endif # SOC_SERIES_NRF54LX
diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index abb0f778ac3..76749c1983a 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -164,6 +164,9 @@ static int nordicsemi_nrf54l_init(void)
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);
 #endif
 
+#if defined(CONFIG_ELV_GRTC_LFXO_ALLOWED)
+	nrf_regulators_elv_mode_allow_set(NRF_REGULATORS, NRF_REGULATORS_ELV_ELVGRTCLFXO_MASK);
+#endif /* CONFIG_ELV_GRTC_LFXO_ALLOWED */
 #endif /* NRF_APPLICATION */
 
 	return 0;

From 2392fc66345109581304973e062e75ed4f1dc2fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:13 +0100
Subject: [PATCH 1192/2913] Revert "[nrf fromtree] tests: boards: nrf:
 coresight_stm: Add performance test for STM"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8834ca9820f9fe968f2d38de598cd3f691759473.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nordic/coresight_stm/src/main.c    |   2 -
 tests/boards/nrf/coresight_stm/CMakeLists.txt |  17 -
 .../boards/nrf/coresight_stm/Kconfig.sysbuild |  11 -
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  16 -
 tests/boards/nrf/coresight_stm/prj.conf       |   1 -
 .../nrf/coresight_stm/pytest/test_stm.py      | 347 ------------------
 .../nrf/coresight_stm/remote/CMakeLists.txt   |  12 -
 .../boards/nrf/coresight_stm/remote/prj.conf  |   6 -
 tests/boards/nrf/coresight_stm/sysbuild.cmake |  28 --
 tests/boards/nrf/coresight_stm/testcase.yaml  |  85 -----
 10 files changed, 525 deletions(-)
 delete mode 100644 tests/boards/nrf/coresight_stm/CMakeLists.txt
 delete mode 100644 tests/boards/nrf/coresight_stm/Kconfig.sysbuild
 delete mode 100644 tests/boards/nrf/coresight_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 delete mode 100644 tests/boards/nrf/coresight_stm/prj.conf
 delete mode 100644 tests/boards/nrf/coresight_stm/pytest/test_stm.py
 delete mode 100644 tests/boards/nrf/coresight_stm/remote/CMakeLists.txt
 delete mode 100644 tests/boards/nrf/coresight_stm/remote/prj.conf
 delete mode 100644 tests/boards/nrf/coresight_stm/sysbuild.cmake
 delete mode 100644 tests/boards/nrf/coresight_stm/testcase.yaml

diff --git a/samples/boards/nordic/coresight_stm/src/main.c b/samples/boards/nordic/coresight_stm/src/main.c
index b788d4fc15d..221633d8638 100644
--- a/samples/boards/nordic/coresight_stm/src/main.c
+++ b/samples/boards/nordic/coresight_stm/src/main.c
@@ -103,7 +103,5 @@ int main(void)
 	timing_report(t_tpd, rpt_tp, "tracepoint_d32");
 #endif
 
-	/* Needed in coverage run to separate STM logs from printk() */
-	k_msleep(400);
 	return 0;
 }
diff --git a/tests/boards/nrf/coresight_stm/CMakeLists.txt b/tests/boards/nrf/coresight_stm/CMakeLists.txt
deleted file mode 100644
index 4450feefea0..00000000000
--- a/tests/boards/nrf/coresight_stm/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-cmake_minimum_required(VERSION 3.20.0)
-
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-
-if(NOT (CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP))
-  message(FATAL_ERROR "${BOARD}${BOARD_QUALIFIERS} is not supported for this sample")
-endif()
-
-project(nrf_coresight_stm)
-
-target_sources(app PRIVATE $ENV{ZEPHYR_BASE}/samples/boards/nordic/coresight_stm/src/main.c)
diff --git a/tests/boards/nrf/coresight_stm/Kconfig.sysbuild b/tests/boards/nrf/coresight_stm/Kconfig.sysbuild
deleted file mode 100644
index 3e4ddeaa515..00000000000
--- a/tests/boards/nrf/coresight_stm/Kconfig.sysbuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-
-source "share/sysbuild/Kconfig"
-
-config APP_CPUPPR_RUN
-	bool "Use PPR"
-
-config APP_CPUFLPR_RUN
-	bool "Use FLPR"
diff --git a/tests/boards/nrf/coresight_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/boards/nrf/coresight_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index bf5ba18d204..00000000000
--- a/tests/boards/nrf/coresight_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&cpuppr_vpr {
-	status = "okay";
-};
-
-&cpuppr_ram3x_region {
-	status = "okay";
-};
-
-&cpuflpr_vpr {
-	status = "okay";
-};
diff --git a/tests/boards/nrf/coresight_stm/prj.conf b/tests/boards/nrf/coresight_stm/prj.conf
deleted file mode 100644
index 1e935e973c7..00000000000
--- a/tests/boards/nrf/coresight_stm/prj.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LOG=y
diff --git a/tests/boards/nrf/coresight_stm/pytest/test_stm.py b/tests/boards/nrf/coresight_stm/pytest/test_stm.py
deleted file mode 100644
index 7131d8f38bb..00000000000
--- a/tests/boards/nrf/coresight_stm/pytest/test_stm.py
+++ /dev/null
@@ -1,347 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-import logging
-import re
-import subprocess
-from dataclasses import dataclass
-from pathlib import Path
-from time import sleep
-
-import psutil
-from twister_harness import DeviceAdapter
-
-logger = logging.getLogger(__name__)
-
-
-SB_CONFIG_APP_CPUPPR_RUN = None
-SB_CONFIG_APP_CPUFLPR_RUN = None
-
-# See definition of stm_m_id[] and stm_m_name[] in
-# https://github.com/zephyrproject-rtos/zephyr/blob/main/drivers/misc/coresight/nrf_etr.c
-STM_M_ID = {
-    "sec": 33,
-    "app": 34,
-    "rad": 35,
-    "mod": 36,
-    "sys": 44,
-    "flpr": 45,
-    "ppr": 46,
-    "hw": 128,
-}
-
-
-@dataclass
-class STMLimits:
-    log_0_arg: float | None
-    log_1_arg: float | None
-    log_2_arg: float | None
-    log_3_arg: float | None
-    log_str: float | None
-    tracepoint: float | None
-    tracepoint_d32: float | None
-    tolerance: float | None
-
-
-def _analyse_autoconf(filepath: str) -> None:
-    global SB_CONFIG_APP_CPUPPR_RUN
-    global SB_CONFIG_APP_CPUFLPR_RUN
-
-    SB_CONFIG_APP_CPUPPR_RUN = False
-    SB_CONFIG_APP_CPUFLPR_RUN = False
-
-    # Parse contents of {BUILD_DIR}/_sysbuild/autoconf.h
-    with open(f"{filepath}", errors="ignore") as autoconf:
-        for line in autoconf:
-            if "SB_CONFIG_APP_CPUPPR_RUN 1" in line:
-                SB_CONFIG_APP_CPUPPR_RUN = True
-                continue
-            if "SB_CONFIG_APP_CPUFLPR_RUN 1" in line:
-                SB_CONFIG_APP_CPUFLPR_RUN = True
-    logger.debug(f"{SB_CONFIG_APP_CPUPPR_RUN=}")
-    logger.debug(f"{SB_CONFIG_APP_CPUFLPR_RUN=}")
-
-
-def _check_benchmark_results(output: str, core: str, constraints: STMLimits) -> None:
-    """
-    Use regular expressions to parse 'output' string.
-    Search for benchmark results related to 'core' coprocessor.
-    Check that benchamrk results are lower than limits provided in 'constraints'.
-    """
-
-    cfg = {
-        "log message with 0 arguments": {
-            "regex": rf"{core}: Timing for log message with 0 arguments: (.+)us",
-            "expected": constraints.log_0_arg,
-        },
-        "log message with 1 argument": {
-            "regex": rf"{core}: Timing for log message with 1 argument: (.+)us",
-            "expected": constraints.log_1_arg,
-        },
-        "log message with 2 arguments": {
-            "regex": rf"{core}: Timing for log message with 2 arguments: (.+)us",
-            "expected": constraints.log_2_arg,
-        },
-        "log message with 3 arguments": {
-            "regex": rf"{core}: Timing for log message with 3 arguments: (.+)us",
-            "expected": constraints.log_3_arg,
-        },
-        "log message with string": {
-            "regex": rf"{core}: Timing for log_message with string: (.+)us",
-            "expected": constraints.log_str,
-        },
-        "tracepoint": {
-            "regex": rf"{core}: Timing for tracepoint: (.+)us",
-            "expected": constraints.tracepoint,
-        },
-        "tracepoint_d32": {
-            "regex": rf"{core}: Timing for tracepoint_d32: (.+)us",
-            "expected": constraints.tracepoint_d32,
-        },
-    }
-
-    for check in cfg:
-        observed_str = re.search(cfg[check]["regex"], output).group(1)
-        assert observed_str is not None, f"Timing for {check} NOT found"
-        # check value
-        observed = float(observed_str)
-        threshold = cfg[check]["expected"] * (1 + constraints.tolerance)
-        assert (
-            observed < threshold
-        ), f"{core}: Timing for {check} - {observed} us exceeds {threshold} us"
-
-
-# nrfutil starts children processes
-# when subprocess.terminate(nrfutil_process) is executed, only the parent terminates
-# this blocks serial port for other uses
-def _kill(proc):
-    try:
-        for child in psutil.Process(proc.pid).children(recursive=True):
-            child.kill()
-        proc.kill()
-    except Exception as e:
-        logger.exception(f'Could not kill nrfutil - {e}')
-
-
-def _nrfutil_dictionary_from_serial(
-    dut: DeviceAdapter,
-    decoded_file_name: str = "output.txt",
-    collect_time: float = 60.0,
-) -> None:
-    UART_PATH = dut.device_config.serial
-    UART_BAUDRATE = dut.device_config.baud
-    dut.close()
-
-    logger.debug(f"Using serial: {UART_PATH}")
-
-    if Path(f"{decoded_file_name}").exists():
-        logger.warning("Output file already exists!")
-
-    # prepare database config string
-    BUILD_DIR = str(dut.device_config.build_dir)
-    logger.debug(f"{BUILD_DIR=}")
-    config_str = f"{STM_M_ID['app']}:{BUILD_DIR}/coresight_stm/zephyr/log_dictionary.json"
-    config_str += f",{STM_M_ID['rad']}:{BUILD_DIR}/remote_rad/zephyr/log_dictionary.json"
-    if SB_CONFIG_APP_CPUPPR_RUN:
-        config_str += f",{STM_M_ID['ppr']}:{BUILD_DIR}/remote_ppr/zephyr/log_dictionary.json"
-    if SB_CONFIG_APP_CPUFLPR_RUN:
-        config_str += f",{STM_M_ID['flpr']}:{BUILD_DIR}/remote_flpr/zephyr/log_dictionary.json"
-    logger.debug(f"{config_str=}")
-
-    cmd = (
-        "nrfutil trace stm --database-config "
-        f"{config_str} "
-        f"--input-serialport {UART_PATH} --baudrate {UART_BAUDRATE} "
-        f"--output-ascii {decoded_file_name}"
-    )
-    try:
-        # run nrfutil trace in background non-blocking
-        logger.info(f"Executing:\n{cmd}")
-        proc = subprocess.Popen(cmd.split(), stdout=subprocess.DEVNULL)
-    except OSError as exc:
-        logger.error(f"Unable to start nrfutil trace:\n{cmd}\n{exc}")
-    try:
-        proc.wait(collect_time)
-    except subprocess.TimeoutExpired:
-        pass
-    finally:
-        _kill(proc)
-
-
-def test_STM_decoded(dut: DeviceAdapter):
-    """
-    Run sample.boards.nrf.coresight_stm from samples/boards/nrf/coresight_stm sample.
-    Both Application and Radio cores use STM for logging.
-    STM proxy (Application core) decodes logs from all domains.
-    After reset, coprocessors execute code in expected way and Application core
-    outputs STM traces on UART port.
-    """
-    BUILD_DIR = str(dut.device_config.build_dir)
-    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
-
-    app_constraints = STMLimits(
-        # all values in us
-        log_0_arg=1.8,
-        log_1_arg=2.1,
-        log_2_arg=2.0,
-        log_3_arg=2.1,
-        log_str=4.5,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,  # 50 %
-    )
-    rad_constraints = STMLimits(
-        # all values in us
-        log_0_arg=4.6,
-        log_1_arg=5.0,
-        log_2_arg=5.2,
-        log_3_arg=5.6,
-        log_str=6.3,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,
-    )
-    ppr_constraints = STMLimits(
-        # all values in us
-        log_0_arg=25.7,
-        log_1_arg=27.1,
-        log_2_arg=27.3,
-        log_3_arg=30.4,
-        log_str=65.7,
-        tracepoint=0.55,
-        tracepoint_d32=0.25,
-        tolerance=0.5,
-    )
-    flpr_constraints = STMLimits(
-        # all values in us
-        log_0_arg=1.3,
-        log_1_arg=1.6,
-        log_2_arg=1.6,
-        log_3_arg=1.7,
-        log_str=3.0,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,
-    )
-    # nrf54h20 prints immediately after it is flashed.
-    # Wait a bit to skipp logs from previous test.
-    sleep(6)
-
-    # Get output from serial port
-    output = "\n".join(dut.readlines())
-
-    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
-    _analyse_autoconf(autoconf_file)
-
-    # check results on Application core
-    _check_benchmark_results(output=output, core='app', constraints=app_constraints)
-
-    # check results on Radio core
-    _check_benchmark_results(output=output, core='rad', constraints=rad_constraints)
-
-    if SB_CONFIG_APP_CPUPPR_RUN:
-        # check results on PPR core
-        _check_benchmark_results(output=output, core='ppr', constraints=ppr_constraints)
-
-    if SB_CONFIG_APP_CPUFLPR_RUN:
-        # check results on FLPR core
-        _check_benchmark_results(output=output, core='flpr', constraints=flpr_constraints)
-
-
-def test_STM_dictionary_mode(dut: DeviceAdapter):
-    """
-    Run sample.boards.nrf.coresight_stm.dict from samples/boards/nrf/coresight_stm sample.
-    Both Application and Radio cores use STM for logging.
-    STM proxy (Application core) prints on serial port raw logs from all domains.
-    Nrfutil trace is used to decode STM logs.
-    After reset, coprocessors execute code in expected way and Application core
-    outputs STM traces on UART port.
-    """
-    BUILD_DIR = str(dut.device_config.build_dir)
-    test_filename = f"{BUILD_DIR}/coresight_stm_dictionary.txt"
-    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
-    COLLECT_TIMEOUT = 10.0
-
-    app_constraints = STMLimits(
-        # all values in us
-        log_0_arg=0.7,
-        log_1_arg=0.8,
-        log_2_arg=0.8,
-        log_3_arg=1.3,
-        log_str=3.2,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,  # 50 %
-    )
-    rad_constraints = STMLimits(
-        # all values in us
-        log_0_arg=0.8,
-        log_1_arg=0.9,
-        log_2_arg=1.0,
-        log_3_arg=1.5,
-        log_str=3.6,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,
-    )
-    ppr_constraints = STMLimits(
-        # all values in us
-        log_0_arg=7.5,
-        log_1_arg=8.5,
-        log_2_arg=8.6,
-        log_3_arg=17.4,
-        log_str=45.2,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,
-    )
-    flpr_constraints = STMLimits(
-        # all values in us
-        log_0_arg=0.3,
-        log_1_arg=0.4,
-        log_2_arg=0.5,
-        log_3_arg=0.8,
-        log_str=2.6,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,  # 50 %
-    )
-
-    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
-    # this information is needed to build nrfutil database-config
-    _analyse_autoconf(autoconf_file)
-
-    # use nrfutil trace to decode logs
-    _nrfutil_dictionary_from_serial(
-        dut=dut,
-        decoded_file_name=f"{test_filename}",
-        collect_time=COLLECT_TIMEOUT,
-    )
-
-    # read decoded logs
-    with open(f"{test_filename}", errors="ignore") as decoded_file:
-        decoded_file_content = decoded_file.read()
-
-    # if nothing in decoded_file, stop test
-    assert len(decoded_file_content) > 0, f"File {test_filename} is empty"
-
-    # check results on Application core
-    _check_benchmark_results(output=decoded_file_content, core='app', constraints=app_constraints)
-
-    # check results on Radio core
-    _check_benchmark_results(output=decoded_file_content, core='rad', constraints=rad_constraints)
-
-    if SB_CONFIG_APP_CPUPPR_RUN:
-        # check results on PPR core
-        _check_benchmark_results(
-            output=decoded_file_content, core='ppr', constraints=ppr_constraints
-        )
-
-    if SB_CONFIG_APP_CPUFLPR_RUN:
-        # check results on FLPR core
-        _check_benchmark_results(
-            output=decoded_file_content, core='flpr', constraints=flpr_constraints
-        )
diff --git a/tests/boards/nrf/coresight_stm/remote/CMakeLists.txt b/tests/boards/nrf/coresight_stm/remote/CMakeLists.txt
deleted file mode 100644
index a59a9afc77e..00000000000
--- a/tests/boards/nrf/coresight_stm/remote/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-cmake_minimum_required(VERSION 3.20.0)
-
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(nrf_coresight_stm)
-
-target_sources(app PRIVATE $ENV{ZEPHYR_BASE}/samples/boards/nordic/coresight_stm/src/main.c)
diff --git a/tests/boards/nrf/coresight_stm/remote/prj.conf b/tests/boards/nrf/coresight_stm/remote/prj.conf
deleted file mode 100644
index 5bea9f4760e..00000000000
--- a/tests/boards/nrf/coresight_stm/remote/prj.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG_LOG=y
-CONFIG_CONSOLE=n
-CONFIG_UART_CONSOLE=n
-CONFIG_SERIAL=n
-CONFIG_BOOT_BANNER=n
-CONFIG_PRINTK=n
diff --git a/tests/boards/nrf/coresight_stm/sysbuild.cmake b/tests/boards/nrf/coresight_stm/sysbuild.cmake
deleted file mode 100644
index 89ccbcf1343..00000000000
--- a/tests/boards/nrf/coresight_stm/sysbuild.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-set(REMOTE_APP remote)
-
-ExternalZephyrProject_Add(
-	APPLICATION ${REMOTE_APP}_rad
-	SOURCE_DIR  ${APP_DIR}/${REMOTE_APP}
-	BOARD ${SB_CONFIG_BOARD}/${SB_CONFIG_SOC}/cpurad
-)
-
-# There are sample configurations which do not use PPR.
-if(SB_CONFIG_APP_CPUPPR_RUN)
-	ExternalZephyrProject_Add(
-		APPLICATION ${REMOTE_APP}_ppr
-		SOURCE_DIR  ${APP_DIR}/${REMOTE_APP}
-		BOARD ${SB_CONFIG_BOARD}/${SB_CONFIG_SOC}/cpuppr
-	)
-endif()
-
-# There are sample configurations which do not use FLPR.
-if(SB_CONFIG_APP_CPUFLPR_RUN)
-	ExternalZephyrProject_Add(
-		APPLICATION ${REMOTE_APP}_flpr
-		SOURCE_DIR  ${APP_DIR}/${REMOTE_APP}
-		BOARD ${SB_CONFIG_BOARD}/${SB_CONFIG_SOC}/cpuflpr
-	)
-endif()
diff --git a/tests/boards/nrf/coresight_stm/testcase.yaml b/tests/boards/nrf/coresight_stm/testcase.yaml
deleted file mode 100644
index 1b496c9b8c7..00000000000
--- a/tests/boards/nrf/coresight_stm/testcase.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-sample:
-  name: Logging using Coresight STM on nrf54h20
-
-common:
-  tags: stm
-  sysbuild: true
-  platform_allow:
-    - nrf54h20dk/nrf54h20/cpuapp
-  integration_platforms:
-    - nrf54h20dk/nrf54h20/cpuapp
-
-tests:
-  boards.nrf.coresight_stm.dict:
-    filter: not CONFIG_COVERAGE
-    harness: pytest
-    harness_config:
-      pytest_dut_scope: session
-      pytest_root:
-        - "pytest/test_stm.py::test_STM_dictionary_mode"
-    required_snippets:
-      - nordic-log-stm-dict
-    extra_args:
-      - SB_CONFIG_APP_CPUPPR_RUN=y
-      - SB_CONFIG_APP_CPUFLPR_RUN=y
-
-  boards.nrf.coresight_stm:
-    filter: not CONFIG_COVERAGE
-    harness: pytest
-    harness_config:
-      pytest_dut_scope: session
-      pytest_root:
-        - "pytest/test_stm.py::test_STM_decoded"
-    required_snippets:
-      - nordic-log-stm
-    extra_args:
-      - SB_CONFIG_APP_CPUPPR_RUN=y
-      - SB_CONFIG_APP_CPUFLPR_RUN=y
-
-  boards.nrf.coresight_stm.dict.coverage:
-    filter: CONFIG_COVERAGE
-    harness: console
-    harness_config:
-      type: one_line
-      regex:
-        - "GCOV_COVERAGE_DUMP_END"
-    required_snippets:
-      - nordic-log-stm-dict
-    extra_args:
-      - SB_CONFIG_APP_CPUPPR_RUN=y
-      - SB_CONFIG_APP_CPUFLPR_RUN=n
-      - coresight_stm_CONFIG_LOG_PRINTK=n
-
-  boards.nrf.coresight_stm.coverage:
-    filter: CONFIG_COVERAGE
-    harness: console
-    harness_config:
-      type: multi_line
-      ordered: true
-      regex:
-        - "Timing for log message with 0 arguments:"
-        - "Timing for log message with 1 argument:"
-        - "Timing for log message with 2 arguments:"
-        - "Timing for log message with 3 arguments:"
-        - "Timing for log_message with string:"
-    required_snippets:
-      - nordic-log-stm
-    extra_args:
-      - SB_CONFIG_APP_CPUPPR_RUN=y
-      - SB_CONFIG_APP_CPUFLPR_RUN=n
-      - coresight_stm_CONFIG_LOG_PRINTK=n
-
-  boards.nrf.coresight_stm.local_uart.coverge:
-    filter: CONFIG_COVERAGE
-    harness: console
-    harness_config:
-      type: multi_line
-      ordered: true
-      regex:
-        - "Timing for log message with 0 arguments:"
-        - "Timing for log message with 1 argument:"
-        - "Timing for log message with 2 arguments:"
-        - "Timing for log message with 3 arguments:"
-        - "Timing for log_message with string:"
-    extra_args:
-      - CONFIG_LOG_MODE_IMMEDIATE=y

From 0f50ec73765576d24d3b65ba0587536a799bdc56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:13 +0100
Subject: [PATCH 1193/2913] Revert "[nrf fromlist] drivers: spi_nrfx_spim: Add
 clock requests for fast SPIM instances"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 43b638fd345eb5958923053655c483fff5cdab1f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/spi/spi_nrfx_spim.c | 101 ++----------------------------------
 1 file changed, 3 insertions(+), 98 deletions(-)

diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c
index 47c682a6939..11ba2e584a1 100644
--- a/drivers/spi/spi_nrfx_spim.c
+++ b/drivers/spi/spi_nrfx_spim.c
@@ -9,7 +9,6 @@
 #include <zephyr/cache.h>
 #include <zephyr/pm/device.h>
 #include <zephyr/pm/device_runtime.h>
-#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
 #include <soc.h>
@@ -43,16 +42,6 @@ LOG_MODULE_REGISTER(spi_nrfx_spim, CONFIG_SPI_LOG_LEVEL);
 #define SPI_BUFFER_IN_RAM 1
 #endif
 
-#if defined(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL) && \
-	(defined(CONFIG_HAS_HW_NRF_SPIM120) || \
-	 defined(CONFIG_HAS_HW_NRF_SPIM121))
-#define SPIM_REQUESTS_CLOCK(idx) UTIL_OR(IS_EQ(idx, 120), \
-					 IS_EQ(idx, 121))
-#define USE_CLOCK_REQUESTS 1
-#else
-#define SPIM_REQUESTS_CLOCK(idx) 0
-#endif
-
 struct spi_nrfx_data {
 	struct spi_context ctx;
 	const struct device *dev;
@@ -68,9 +57,6 @@ struct spi_nrfx_data {
 	uint8_t ppi_ch;
 	uint8_t gpiote_ch;
 #endif
-#ifdef USE_CLOCK_REQUESTS
-	bool clock_requested;
-#endif
 };
 
 struct spi_nrfx_config {
@@ -88,55 +74,10 @@ struct spi_nrfx_config {
 #ifdef CONFIG_DCACHE
 	uint32_t mem_attr;
 #endif
-#ifdef USE_CLOCK_REQUESTS
-	const struct device *clk_dev;
-	struct nrf_clock_spec clk_spec;
-#endif
 };
 
 static void event_handler(const nrfx_spim_evt_t *p_event, void *p_context);
 
-static inline int request_clock(const struct device *dev)
-{
-#ifdef USE_CLOCK_REQUESTS
-	struct spi_nrfx_data *dev_data = dev->data;
-	const struct spi_nrfx_config *dev_config = dev->config;
-	int error;
-
-	if (!dev_config->clk_dev) {
-		return 0;
-	}
-
-	error = nrf_clock_control_request_sync(
-			dev_config->clk_dev, &dev_config->clk_spec,
-			K_MSEC(CONFIG_SPI_COMPLETION_TIMEOUT_TOLERANCE));
-	if (error < 0) {
-		LOG_ERR("Failed to request clock: %d", error);
-		return error;
-	}
-
-	dev_data->clock_requested = true;
-#endif
-
-	return 0;
-}
-
-static inline void release_clock(const struct device *dev)
-{
-#ifdef USE_CLOCK_REQUESTS
-	struct spi_nrfx_data *dev_data = dev->data;
-	const struct spi_nrfx_config *dev_config = dev->config;
-
-	if (!dev_data->clock_requested) {
-		return;
-	}
-
-	dev_data->clock_requested = false;
-
-	nrf_clock_control_release(dev_config->clk_dev, &dev_config->clk_spec);
-#endif
-}
-
 static inline void finalize_spi_transaction(const struct device *dev, bool deactivate_cs)
 {
 	struct spi_nrfx_data *dev_data = dev->data;
@@ -151,10 +92,6 @@ static inline void finalize_spi_transaction(const struct device *dev, bool deact
 		nrfy_spim_disable(reg);
 	}
 
-	if (!IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		release_clock(dev);
-	}
-
 	pm_device_runtime_put_async(dev, K_NO_WAIT);
 }
 
@@ -530,11 +467,6 @@ static int transceive(const struct device *dev,
 	spi_context_lock(&dev_data->ctx, asynchronous, cb, userdata, spi_cfg);
 
 	error = configure(dev, spi_cfg);
-
-	if (error == 0 && !IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		error = request_clock(dev);
-	}
-
 	if (error == 0) {
 		dev_data->busy = true;
 
@@ -586,8 +518,6 @@ static int transceive(const struct device *dev,
 		} else if (error) {
 			finalize_spi_transaction(dev, true);
 		}
-	} else {
-		pm_device_runtime_put(dev);
 	}
 
 	spi_context_release(&dev_data->ctx, error);
@@ -645,7 +575,7 @@ static const struct spi_driver_api spi_nrfx_driver_api = {
 	.release = spi_nrfx_release,
 };
 
-static int spim_resume(const struct device *dev)
+static void spim_resume(const struct device *dev)
 {
 	const struct spi_nrfx_config *dev_config = dev->config;
 
@@ -657,8 +587,6 @@ static int spim_resume(const struct device *dev)
 #ifdef CONFIG_SOC_NRF54H20_GPD
 	nrf_gpd_retain_pins_set(dev_config->pcfg, false);
 #endif
-
-	return IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) ? request_clock(dev) : 0;
 }
 
 static void spim_suspend(const struct device *dev)
@@ -671,10 +599,6 @@ static void spim_suspend(const struct device *dev)
 		dev_data->initialized = false;
 	}
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		release_clock(dev);
-	}
-
 #ifdef CONFIG_SOC_NRF54H20_GPD
 	nrf_gpd_retain_pins_set(dev_config->pcfg, true);
 #endif
@@ -685,11 +609,7 @@ static void spim_suspend(const struct device *dev)
 static int spim_nrfx_pm_action(const struct device *dev, enum pm_device_action action)
 {
 	if (action == PM_DEVICE_ACTION_RESUME) {
-		int error = spim_resume(dev);
-
-		if (error < 0) {
-			return error;
-		}
+		spim_resume(dev);
 	} else if (IS_ENABLED(CONFIG_PM_DEVICE) && (action == PM_DEVICE_ACTION_SUSPEND)) {
 		spim_suspend(dev);
 	} else {
@@ -765,14 +685,6 @@ static int spi_nrfx_init(const struct device *dev)
 			(0))),								 \
 		(0))
 
-#define SPIM_INIT_LEVEL(idx) \
-	COND_CODE_1(SPIM_REQUESTS_CLOCK(idx), (POST_KERNEL), (PRE_KERNEL_1))
-
-#define SPIM_INIT_PRIO(idx) \
-	COND_CODE_1(SPIM_REQUESTS_CLOCK(idx), \
-		(UTIL_INC(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_INIT_PRIORITY)), \
-		(CONFIG_SPI_INIT_PRIORITY))
-
 #define SPI_NRFX_SPIM_DEFINE(idx)					       \
 	NRF_DT_CHECK_NODE_HAS_PINCTRL_SLEEP(SPIM(idx));			       \
 	static void irq_connect##idx(void)				       \
@@ -823,13 +735,6 @@ static int spi_nrfx_init(const struct device *dev)
 		.wake_gpiote = WAKE_GPIOTE_INSTANCE(SPIM(idx)),		       \
 		IF_ENABLED(CONFIG_DCACHE,				       \
 			(.mem_attr = SPIM_GET_MEM_ATTR(idx),))		       \
-		IF_ENABLED(USE_CLOCK_REQUESTS,			       \
-			(.clk_dev = SPIM_REQUESTS_CLOCK(idx)		       \
-				  ? DEVICE_DT_GET(DT_CLOCKS_CTLR(SPIM(idx)))   \
-				  : NULL,				       \
-			 .clk_spec = {					       \
-				.frequency = NRF_CLOCK_CONTROL_FREQUENCY_MAX,  \
-			 },))						       \
 	};								       \
 	BUILD_ASSERT(!SPIM_HAS_PROP(idx, wake_gpios) ||			       \
 		     !(DT_GPIO_FLAGS(SPIM(idx), wake_gpios) & GPIO_ACTIVE_LOW),\
@@ -840,7 +745,7 @@ static int spi_nrfx_init(const struct device *dev)
 		      PM_DEVICE_DT_GET(SPIM(idx)),			       \
 		      &spi_##idx##_data,				       \
 		      &spi_##idx##z_config,				       \
-		      SPIM_INIT_LEVEL(idx), SPIM_INIT_PRIO(idx),	       \
+		      POST_KERNEL, CONFIG_SPI_INIT_PRIORITY,		       \
 		      &spi_nrfx_driver_api)
 
 #define SPIM_MEMORY_SECTION(idx)					       \

From d5ca003459a1953b0c65f899450be6fa9d4bf50d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:13 +0100
Subject: [PATCH 1194/2913] Revert "[nrf fromlist] dts: nrf54h20: Add clocks
 property in fast SPIM nodes"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1f1d72d9b69901519c9c8d75569aae293a32e6c3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/common/nordic/nrf54h20.dtsi | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index cdac7c3a6e2..02217f65bb6 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -657,7 +657,6 @@
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				easydma-maxcnt-bits = <15>;
 				interrupts = <230 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&hsfll120>;
 				max-frequency = <DT_FREQ_M(32)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -684,7 +683,6 @@
 				status = "disabled";
 				easydma-maxcnt-bits = <15>;
 				interrupts = <231 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&hsfll120>;
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				max-frequency = <DT_FREQ_M(32)>;
 				#address-cells = <1>;

From 084d2cfd6928388efeb814bfbca9fd0d8a2dda70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:13 +0100
Subject: [PATCH 1195/2913] Revert "[nrf fromlist] drivers: clock_control_nrf2:
 Add missing cancelation of request"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c87958cbdf1fd05ca7ca65827416116e170f6d79.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/clock_control/clock_control_nrf2_common.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/clock_control/clock_control_nrf2_common.c b/drivers/clock_control/clock_control_nrf2_common.c
index ba576ccbb6c..7bf8576880b 100644
--- a/drivers/clock_control/clock_control_nrf2_common.c
+++ b/drivers/clock_control/clock_control_nrf2_common.c
@@ -198,7 +198,6 @@ int nrf_clock_control_request_sync(const struct device *dev,
 
 	err = k_sem_take(&req.sem, timeout);
 	if (err < 0) {
-		nrf_clock_control_cancel_or_release(dev, spec, &req.cli);
 		return err;
 	}
 

From 68104c306c936fab0237c7fff7c09fd02602e87a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:13 +0100
Subject: [PATCH 1196/2913] Revert "[nrf fromtree] runners: jlink: Fix NoneType
 object error"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3ac589333c60c8291217d2a78c8d7af6090653ae.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/west_commands/runners/jlink.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/west_commands/runners/jlink.py b/scripts/west_commands/runners/jlink.py
index b3575d2377e..535e2bec2b5 100644
--- a/scripts/west_commands/runners/jlink.py
+++ b/scripts/west_commands/runners/jlink.py
@@ -37,7 +37,7 @@ def is_ip(ip):
     return True
 
 def is_tunnel(tunnel):
-    return tunnel.startswith("tunnel:") if tunnel else False
+    return tunnel.startswith("tunnel:")
 
 class ToggleAction(argparse.Action):
 

From 3b27b973f1e7a7aa593c83cb2926c589bc496ef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:13 +0100
Subject: [PATCH 1197/2913] Revert "[nrf fromlist] drivers: clock_control: nrf:
 Add helper macro for getting clock frequency"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 36a1e64bc8414029324cb4e8a4828c13c170f3fc.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../drivers/clock_control/nrf_clock_control.h | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/include/zephyr/drivers/clock_control/nrf_clock_control.h b/include/zephyr/drivers/clock_control/nrf_clock_control.h
index 27ab518920f..2578feffd2b 100644
--- a/include/zephyr/drivers/clock_control/nrf_clock_control.h
+++ b/include/zephyr/drivers/clock_control/nrf_clock_control.h
@@ -319,25 +319,6 @@ int nrf_clock_control_cancel_or_release(const struct device *dev,
 
 #endif /* defined(CONFIG_CLOCK_CONTROL_NRF2) */
 
-/** @brief Get clock frequency that is used for the given node.
- *
- * Macro checks if node has clock property and if yes then if clock has clock_frequency property
- * then it is returned. If it has supported_clock_frequency property with the list of supported
- * frequencies then the last one is returned with assumption that they are ordered and the last
- * one is the highest. If node does not have clock then 16 MHz is returned which is the default
- * frequency.
- *
- * @param node Devicetree node.
- *
- * @return Frequency of the clock that is used for the node.
- */
-#define NRF_PERIPH_GET_FREQUENCY(node) \
-	COND_CODE_1(DT_CLOCKS_HAS_IDX(node, 0),							\
-		(COND_CODE_1(DT_NODE_HAS_PROP(DT_CLOCKS_CTLR(node), clock_frequency),		\
-			     (DT_PROP(DT_CLOCKS_CTLR(node), clock_frequency)),			\
-			     (DT_PROP_LAST(DT_CLOCKS_CTLR(node), supported_clock_frequency)))),	\
-		(DT_PROP_OR(node, max_frequency, NRFX_MHZ_TO_HZ(16))))
-
 #ifdef __cplusplus
 }
 #endif

From 2ad05d424c4fe433298df6c237255b682b5f5bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:13 +0100
Subject: [PATCH 1198/2913] Revert "[nrf fromtree] drivers: power_domain:
 gpio_monitor: Add PM_DEVICE dependency"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 47885d5a3f3a120f8f71cecc741c87ea49d8ded5.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/power_domain/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/power_domain/Kconfig b/drivers/power_domain/Kconfig
index 647d7036679..c1fe5d3bd9b 100644
--- a/drivers/power_domain/Kconfig
+++ b/drivers/power_domain/Kconfig
@@ -60,7 +60,6 @@ config POWER_DOMAIN_GPIO_MONITOR
 	default y
 	depends on DT_HAS_POWER_DOMAIN_GPIO_MONITOR_ENABLED
 	depends on GPIO
-	depends on PM_DEVICE
 	select DEVICE_DEPS
 
 if POWER_DOMAIN_GPIO_MONITOR

From 7579c08b8430fcc04d394f1a067925332af45b53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:14 +0100
Subject: [PATCH 1199/2913] Revert "[nrf fromtree] drivers: power_domain:
 gpio_monitor: Fix compilation error"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6b546841faf2431a182faf4233c85bf0681230fa.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/power_domain/power_domain_gpio_monitor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/power_domain/power_domain_gpio_monitor.c b/drivers/power_domain/power_domain_gpio_monitor.c
index a0a5af8aa7f..62dfd60855b 100644
--- a/drivers/power_domain/power_domain_gpio_monitor.c
+++ b/drivers/power_domain/power_domain_gpio_monitor.c
@@ -39,7 +39,7 @@ static int pd_on_domain_visitor(const struct device *dev, void *context)
 		return 0;
 	}
 
-	dev->pm->base.usage = 0;
+	dev->pm->usage = 0;
 	(void)pm_device_action_run(dev, visitor_context->action);
 	return 0;
 }

From 0640a22b2192c9b310a823f8f3fc8122bd402ba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:14 +0100
Subject: [PATCH 1200/2913] Revert "[nrf fromlist] tests: drivers: uart:
 async_api: nrf54h20dk: Enable device PM"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 69ab4849b9b8446da27f623f52d96e531d60d878.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi  | 2 --
 .../uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf  | 2 --
 2 files changed, 4 deletions(-)
 delete mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf

diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi
index 9902d733d35..ae810c27966 100644
--- a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi
@@ -43,7 +43,6 @@ dut: &uart137 {
 	pinctrl-1 = <&uart137_sleep_alt>;
 	pinctrl-names = "default", "sleep";
 	current-speed = <115200>;
-	zephyr,pm-device-runtime-auto;
 };
 
 dut2: &uart120 {
@@ -51,5 +50,4 @@ dut2: &uart120 {
 	pinctrl-1 = <&uart120_sleep_alt>;
 	pinctrl-names = "default", "sleep";
 	current-speed = <115200>;
-	zephyr,pm-device-runtime-auto;
 };
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf
deleted file mode 100644
index 74cc8d7691e..00000000000
--- a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_PM_DEVICE=y
-CONFIG_PM_DEVICE_RUNTIME=y

From 0953e78896874c6983d9d0415eb86f428d92d268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:14 +0100
Subject: [PATCH 1201/2913] Revert "[nrf fromtree] tests: drivers: uart:
 async_api: Add uart120 instance to nrf54h20dk"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ca30e88a49a187e9658eb53ef3eff247060bcb3a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_common.dtsi    | 31 ++-----------------
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  9 ------
 .../uart/uart_async_api/src/test_uart_async.c |  9 ++----
 3 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi
index ae810c27966..9aa338deaad 100644
--- a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi
@@ -3,11 +3,8 @@
 &pinctrl {
 	uart137_default_alt: uart137_default_alt {
 		group1 {
-			psels = <NRF_PSEL(UART_TX, 0, 6)>;
-		};
-		group2 {
-			psels = <NRF_PSEL(UART_RX, 0, 7)>;
-			bias-pull-up;
+			psels = <NRF_PSEL(UART_TX, 0, 6)>,
+				<NRF_PSEL(UART_RX, 0, 7)>;
 		};
 	};
 
@@ -18,23 +15,6 @@
 			low-power-enable;
 		};
 	};
-	uart120_default_alt: uart120_default_alt {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 7, 7)>;
-		};
-		group2 {
-			psels = <NRF_PSEL(UART_RX, 7, 4)>;
-			bias-pull-up;
-		};
-	};
-
-	uart120_sleep_alt: uart120_sleep_alt {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 7, 7)>,
-				<NRF_PSEL(UART_RX, 7, 4)>;
-			low-power-enable;
-		};
-	};
 };
 
 dut: &uart137 {
@@ -44,10 +24,3 @@ dut: &uart137 {
 	pinctrl-names = "default", "sleep";
 	current-speed = <115200>;
 };
-
-dut2: &uart120 {
-	pinctrl-0 = <&uart120_default_alt>;
-	pinctrl-1 = <&uart120_sleep_alt>;
-	pinctrl-names = "default", "sleep";
-	current-speed = <115200>;
-};
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index 79f5554a33b..be5897fd051 100644
--- a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -5,12 +5,3 @@
 &dut {
 	memory-regions = <&cpuapp_dma_region>;
 };
-
-&dut2 {
-	status = "okay";
-	memory-regions = <&dma_fast_region>;
-};
-
-&dma_fast_region {
-	status = "okay";
-};
diff --git a/tests/drivers/uart/uart_async_api/src/test_uart_async.c b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
index c087878eee8..139de516fd8 100644
--- a/tests/drivers/uart/uart_async_api/src/test_uart_async.c
+++ b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
@@ -31,17 +31,12 @@ struct dut_data {
 	const char *name;
 };
 
-ZTEST_DMEM struct dut_data duts[] = {
+static ZTEST_DMEM struct dut_data duts[] = {
 	{
 		.dev = DEVICE_DT_GET(UART_NODE),
 		.name = DT_NODE_FULL_NAME(UART_NODE),
 	},
-#if DT_NODE_EXISTS(DT_NODELABEL(dut2)) && DT_NODE_HAS_STATUS(DT_NODELABEL(dut2), okay)
-	{
-		.dev = DEVICE_DT_GET(DT_NODELABEL(dut2)),
-		.name = DT_NODE_FULL_NAME(DT_NODELABEL(dut2)),
-	},
-#endif
+	/* More instances can be added here. */
 };
 
 static ZTEST_BMEM const struct device *uart_dev;

From 573e3d8f8fca67effae3220a4dc98d482423486b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:14 +0100
Subject: [PATCH 1202/2913] Revert "[nrf fromtree] tests: drivers: uart:
 async_api: Rework for multi instance"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f309e3d4dd2f1ecfce0880d6378ebe890cd7a7c5.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../uart/uart_async_api/src/test_uart_async.c | 106 ++++++------------
 1 file changed, 33 insertions(+), 73 deletions(-)

diff --git a/tests/drivers/uart/uart_async_api/src/test_uart_async.c b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
index 139de516fd8..3f56bbe1d80 100644
--- a/tests/drivers/uart/uart_async_api/src/test_uart_async.c
+++ b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
@@ -25,49 +25,39 @@ K_SEM_DEFINE(rx_buf_released, 0, 1);
 K_SEM_DEFINE(rx_disabled, 0, 1);
 
 static ZTEST_BMEM volatile bool failed_in_isr;
-
-struct dut_data {
-	const struct device *dev;
-	const char *name;
-};
-
-static ZTEST_DMEM struct dut_data duts[] = {
-	{
-		.dev = DEVICE_DT_GET(UART_NODE),
-		.name = DT_NODE_FULL_NAME(UART_NODE),
-	},
-	/* More instances can be added here. */
-};
-
-static ZTEST_BMEM const struct device *uart_dev;
-static ZTEST_BMEM const char *uart_name;
+static ZTEST_BMEM const struct device *const uart_dev =
+	DEVICE_DT_GET(UART_NODE);
 
 static void read_abort_timeout(struct k_timer *timer);
 static K_TIMER_DEFINE(read_abort_timer, read_abort_timeout, NULL);
 
 
+static void init_test(void)
+{
+	__ASSERT_NO_MSG(device_is_ready(uart_dev));
+	uart_rx_disable(uart_dev);
+	uart_tx_abort(uart_dev);
+	k_sem_reset(&tx_done);
+	k_sem_reset(&tx_aborted);
+	k_sem_reset(&rx_rdy);
+	k_sem_reset(&rx_buf_released);
+	k_sem_reset(&rx_disabled);
+}
+
 #ifdef CONFIG_USERSPACE
 static void set_permissions(void)
 {
 	k_thread_access_grant(k_current_get(), &tx_done, &tx_aborted,
 			      &rx_rdy, &rx_buf_coherency, &rx_buf_released,
 			      &rx_disabled, uart_dev, &read_abort_timer);
-
-	for (size_t i = 0; i < ARRAY_SIZE(duts); i++) {
-		k_thread_access_grant(k_current_get(), duts[i].dev);
-	}
 }
 #endif
 
-static void uart_async_test_init(int idx)
+static void uart_async_test_init(void)
 {
 	static bool initialized;
 
-	uart_dev = duts[idx].dev;
-	uart_name = duts[idx].name;
-
 	__ASSERT_NO_MSG(device_is_ready(uart_dev));
-	TC_PRINT("UART instance:%s\n", uart_name);
 	uart_rx_disable(uart_dev);
 	uart_tx_abort(uart_dev);
 	k_sem_reset(&tx_done);
@@ -89,6 +79,7 @@ static void uart_async_test_init(int idx)
 #endif
 
 	if (!initialized) {
+		init_test();
 		initialized = true;
 #ifdef CONFIG_USERSPACE
 		set_permissions();
@@ -152,13 +143,11 @@ static void test_single_read_callback(const struct device *dev,
 	}
 }
 
-static ZTEST_BMEM volatile uint32_t tx_aborted_count;
+ZTEST_BMEM volatile uint32_t tx_aborted_count;
 
 static void *single_read_setup(void)
 {
-	static int idx;
-
-	uart_async_test_init(idx++);
+	uart_async_test_init();
 
 	memset(&tdata, 0, sizeof(tdata));
 	tdata.supply_second_buffer = true;
@@ -239,9 +228,7 @@ ZTEST_USER(uart_async_single_read, test_single_read)
 
 static void *multiple_rx_enable_setup(void)
 {
-	static int idx;
-
-	uart_async_test_init(idx++);
+	uart_async_test_init();
 
 	memset(&tdata, 0, sizeof(tdata));
 	/* Reuse the callback from the single_read test case, as this test case
@@ -388,9 +375,7 @@ static void test_chained_read_callback(const struct device *dev,
 
 static void *chained_read_setup(void)
 {
-	static int idx;
-
-	uart_async_test_init(idx++);
+	uart_async_test_init();
 
 	uart_callback_set(uart_dev, test_chained_read_callback, NULL);
 
@@ -470,9 +455,7 @@ static void test_double_buffer_callback(const struct device *dev,
 
 static void *double_buffer_setup(void)
 {
-	static int idx;
-
-	uart_async_test_init(idx++);
+	uart_async_test_init();
 
 	uart_callback_set(uart_dev, test_double_buffer_callback, NULL);
 
@@ -518,7 +501,6 @@ static ZTEST_BMEM uint8_t test_read_abort_rx_buf[2][100];
 static ZTEST_BMEM uint8_t test_read_abort_read_buf[100];
 #endif /* NOCACHE_MEM */
 static ZTEST_BMEM int test_read_abort_rx_cnt;
-static ZTEST_BMEM bool test_read_abort_rx_buf_req_once;
 
 static void test_read_abort_callback(const struct device *dev,
 			      struct uart_event *evt, void *user_data)
@@ -533,12 +515,14 @@ static void test_read_abort_callback(const struct device *dev,
 		break;
 	case UART_RX_BUF_REQUEST:
 	{
-		if (!test_read_abort_rx_buf_req_once) {
+		static bool once;
+
+		if (!once) {
 			k_sem_give(&rx_buf_coherency);
 			uart_rx_buf_rsp(dev,
 					test_read_abort_rx_buf[1],
 					sizeof(test_read_abort_rx_buf[1]));
-			test_read_abort_rx_buf_req_once = true;
+			once = true;
 		}
 		break;
 	}
@@ -574,11 +558,8 @@ static void read_abort_timeout(struct k_timer *timer)
 
 static void *read_abort_setup(void)
 {
-	static int idx;
+	uart_async_test_init();
 
-	uart_async_test_init(idx++);
-
-	test_read_abort_rx_buf_req_once = false;
 	failed_in_isr = false;
 	uart_callback_set(uart_dev, test_read_abort_callback, NULL);
 
@@ -673,9 +654,7 @@ static void test_write_abort_callback(const struct device *dev,
 
 static void *write_abort_setup(void)
 {
-	static int idx;
-
-	uart_async_test_init(idx++);
+	uart_async_test_init();
 
 	uart_callback_set(uart_dev, test_write_abort_callback, NULL);
 
@@ -748,9 +727,7 @@ static void test_forever_timeout_callback(const struct device *dev,
 
 static void *forever_timeout_setup(void)
 {
-	static int idx;
-
-	uart_async_test_init(idx++);
+	uart_async_test_init();
 
 	uart_callback_set(uart_dev, test_forever_timeout_callback, NULL);
 
@@ -839,12 +816,8 @@ static void test_chained_write_callback(const struct device *dev,
 
 static void *chained_write_setup(void)
 {
-	static int idx;
-
-	uart_async_test_init(idx++);
+	uart_async_test_init();
 
-	tx_sent = 0;
-	chained_write_next_buf = true;
 	uart_callback_set(uart_dev, test_chained_write_callback, NULL);
 
 	return NULL;
@@ -896,11 +869,11 @@ static ZTEST_BMEM uint8_t long_tx_buf[TX_LONG_BUFFER];
 #endif /* NOCACHE_MEM */
 static ZTEST_BMEM volatile uint8_t evt_num;
 static ZTEST_BMEM size_t long_received[2];
-static ZTEST_BMEM uint8_t *long_next_buffer;
 
 static void test_long_buffers_callback(const struct device *dev,
 				struct uart_event *evt, void *user_data)
 {
+	static uint8_t *next_buffer = long_rx_buf2;
 
 	switch (evt->type) {
 	case UART_TX_DONE:
@@ -922,8 +895,8 @@ static void test_long_buffers_callback(const struct device *dev,
 		k_sem_give(&rx_disabled);
 		break;
 	case UART_RX_BUF_REQUEST:
-		uart_rx_buf_rsp(dev, long_next_buffer, RX_LONG_BUFFER);
-		long_next_buffer = (long_next_buffer == long_rx_buf2) ? long_rx_buf : long_rx_buf2;
+		uart_rx_buf_rsp(dev, next_buffer, RX_LONG_BUFFER);
+		next_buffer = (next_buffer == long_rx_buf2) ? long_rx_buf : long_rx_buf2;
 		break;
 	default:
 		break;
@@ -932,12 +905,8 @@ static void test_long_buffers_callback(const struct device *dev,
 
 static void *long_buffers_setup(void)
 {
-	static int idx;
+	uart_async_test_init();
 
-	uart_async_test_init(idx++);
-
-	evt_num = 0;
-	long_next_buffer = long_rx_buf2;
 	uart_callback_set(uart_dev, test_long_buffers_callback, NULL);
 
 	return NULL;
@@ -1019,12 +988,3 @@ ZTEST_SUITE(uart_async_write_abort, NULL, write_abort_setup,
 
 ZTEST_SUITE(uart_async_timeout, NULL, forever_timeout_setup,
 		NULL, NULL, NULL);
-
-void test_main(void)
-{
-	/* Run all suites for each dut UART. Setup function for each suite is picking
-	 * next UART from the array.
-	 */
-	ztest_run_all(NULL, false, ARRAY_SIZE(duts), 1);
-	ztest_verify_all_test_suites_ran();
-}

From ca83895495be3fd4cc70f5c83bfa9488521597b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:14 +0100
Subject: [PATCH 1203/2913] Revert "[nrf fromtree] tests: drivers: uart:
 async_api: Add missing static keyword"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b6e9ee859194b98926dc687061f97983714887c1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../uart/uart_async_api/src/test_uart_async.c | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/tests/drivers/uart/uart_async_api/src/test_uart_async.c b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
index 3f56bbe1d80..0506ff0a01f 100644
--- a/tests/drivers/uart/uart_async_api/src/test_uart_async.c
+++ b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
@@ -24,12 +24,12 @@ K_SEM_DEFINE(rx_buf_coherency, 0, 255);
 K_SEM_DEFINE(rx_buf_released, 0, 1);
 K_SEM_DEFINE(rx_disabled, 0, 1);
 
-static ZTEST_BMEM volatile bool failed_in_isr;
+ZTEST_BMEM volatile bool failed_in_isr;
 static ZTEST_BMEM const struct device *const uart_dev =
 	DEVICE_DT_GET(UART_NODE);
 
 static void read_abort_timeout(struct k_timer *timer);
-static K_TIMER_DEFINE(read_abort_timer, read_abort_timeout, NULL);
+K_TIMER_DEFINE(read_abort_timer, read_abort_timeout, NULL);
 
 
 static void init_test(void)
@@ -100,7 +100,7 @@ struct test_data {
 #if NOCACHE_MEM
 static struct test_data tdata __used __NOCACHE;
 #else
-static ZTEST_BMEM struct test_data tdata;
+ZTEST_BMEM struct test_data tdata;
 #endif /* NOCACHE_MEM */
 
 static void test_single_read_callback(const struct device *dev,
@@ -331,14 +331,14 @@ static __aligned(32) uint8_t chained_read_buf_0[8] __used __NOCACHE;
 static __aligned(32) uint8_t chained_read_buf_1[8] __used __NOCACHE;
 static __aligned(32) uint8_t chained_cpy_buf[10] __used __NOCACHE;
 #else
-static ZTEST_BMEM uint8_t chained_read_buf_0[8];
-static ZTEST_BMEM uint8_t chained_read_buf_1[8];
-static ZTEST_BMEM uint8_t chained_cpy_buf[10];
+ZTEST_BMEM uint8_t chained_read_buf_0[8];
+ZTEST_BMEM uint8_t chained_read_buf_1[8];
+ZTEST_BMEM uint8_t chained_cpy_buf[10];
 #endif /* NOCACHE_MEM */
-static ZTEST_BMEM volatile uint8_t rx_data_idx;
-static ZTEST_BMEM uint8_t rx_buf_idx;
+ZTEST_BMEM volatile uint8_t rx_data_idx;
+ZTEST_BMEM uint8_t rx_buf_idx;
 
-static ZTEST_BMEM uint8_t *read_ptr;
+ZTEST_BMEM uint8_t *read_ptr;
 
 static uint8_t *chained_read_buf[2] = {chained_read_buf_0, chained_read_buf_1};
 
@@ -422,9 +422,9 @@ ZTEST_USER(uart_async_chain_read, test_chained_read)
 #if NOCACHE_MEM
 static __aligned(32) uint8_t double_buffer[2][12] __used __NOCACHE;
 #else
-static ZTEST_BMEM uint8_t double_buffer[2][12];
+ZTEST_BMEM uint8_t double_buffer[2][12];
 #endif /* NOCACHE_MEM */
-static ZTEST_DMEM uint8_t *next_buf = double_buffer[1];
+ZTEST_DMEM uint8_t *next_buf = double_buffer[1];
 
 static void test_double_buffer_callback(const struct device *dev,
 				 struct uart_event *evt, void *user_data)
@@ -497,10 +497,10 @@ ZTEST_USER(uart_async_double_buf, test_double_buffer)
 static __aligned(32) uint8_t test_read_abort_rx_buf[2][100] __used __NOCACHE;
 static __aligned(32) uint8_t test_read_abort_read_buf[100] __used __NOCACHE;
 #else
-static ZTEST_BMEM uint8_t test_read_abort_rx_buf[2][100];
-static ZTEST_BMEM uint8_t test_read_abort_read_buf[100];
+ZTEST_BMEM uint8_t test_read_abort_rx_buf[2][100];
+ZTEST_BMEM uint8_t test_read_abort_read_buf[100];
 #endif /* NOCACHE_MEM */
-static ZTEST_BMEM int test_read_abort_rx_cnt;
+ZTEST_BMEM int test_read_abort_rx_cnt;
 
 static void test_read_abort_callback(const struct device *dev,
 			      struct uart_event *evt, void *user_data)
@@ -613,12 +613,12 @@ ZTEST_USER(uart_async_read_abort, test_read_abort)
 
 }
 
-static ZTEST_BMEM volatile size_t sent;
-static ZTEST_BMEM volatile size_t received;
+ZTEST_BMEM volatile size_t sent;
+ZTEST_BMEM volatile size_t received;
 #if NOCACHE_MEM
 static __aligned(32) uint8_t test_rx_buf[2][100] __used __NOCACHE;
 #else
-static ZTEST_BMEM uint8_t test_rx_buf[2][100];
+ZTEST_BMEM uint8_t test_rx_buf[2][100];
 #endif /* NOCACHE_MEM */
 
 static void test_write_abort_callback(const struct device *dev,
@@ -776,12 +776,12 @@ ZTEST_USER(uart_async_timeout, test_forever_timeout)
 
 
 #if NOCACHE_MEM
-static const uint8_t chained_write_tx_bufs[2][10] = {"Message 1", "Message 2"};
+const uint8_t chained_write_tx_bufs[2][10] = {"Message 1", "Message 2"};
 #else
-static ZTEST_DMEM uint8_t chained_write_tx_bufs[2][10] = {"Message 1", "Message 2"};
+ZTEST_DMEM uint8_t chained_write_tx_bufs[2][10] = {"Message 1", "Message 2"};
 #endif /* NOCACHE_MEM */
-static ZTEST_DMEM bool chained_write_next_buf = true;
-static ZTEST_BMEM volatile uint8_t tx_sent;
+ZTEST_DMEM bool chained_write_next_buf = true;
+ZTEST_BMEM volatile uint8_t tx_sent;
 
 static void test_chained_write_callback(const struct device *dev,
 				 struct uart_event *evt, void *user_data)
@@ -863,12 +863,12 @@ static __aligned(32) uint8_t long_rx_buf[RX_LONG_BUFFER] __used __NOCACHE;
 static __aligned(32) uint8_t long_rx_buf2[RX_LONG_BUFFER] __used __NOCACHE;
 static __aligned(32) uint8_t long_tx_buf[TX_LONG_BUFFER] __used __NOCACHE;
 #else
-static ZTEST_BMEM uint8_t long_rx_buf[RX_LONG_BUFFER];
-static ZTEST_BMEM uint8_t long_rx_buf2[RX_LONG_BUFFER];
-static ZTEST_BMEM uint8_t long_tx_buf[TX_LONG_BUFFER];
+ZTEST_BMEM uint8_t long_rx_buf[RX_LONG_BUFFER];
+ZTEST_BMEM uint8_t long_rx_buf2[RX_LONG_BUFFER];
+ZTEST_BMEM uint8_t long_tx_buf[TX_LONG_BUFFER];
 #endif /* NOCACHE_MEM */
-static ZTEST_BMEM volatile uint8_t evt_num;
-static ZTEST_BMEM size_t long_received[2];
+ZTEST_BMEM volatile uint8_t evt_num;
+ZTEST_BMEM size_t long_received[2];
 
 static void test_long_buffers_callback(const struct device *dev,
 				struct uart_event *evt, void *user_data)

From 6aefcdd76c925d2b997a8d866c7bcebcdb032449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:14 +0100
Subject: [PATCH 1204/2913] Revert "[nrf fromtree] tests: uart_async_api:
 update test for dma usage"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6c6f3aa6769984b5d9ef79524e70c094decf28cc.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../uart/uart_async_api/src/test_uart_async.c | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/tests/drivers/uart/uart_async_api/src/test_uart_async.c b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
index 0506ff0a01f..2feb201d94c 100644
--- a/tests/drivers/uart/uart_async_api/src/test_uart_async.c
+++ b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
@@ -324,15 +324,10 @@ ZTEST_USER(uart_async_multi_rx, test_multiple_rx_enable)
 }
 
 #if NOCACHE_MEM
-/* To ensure 32-bit alignment of the buffer array,
- * the two arrays are defined instead using an array of arrays
- */
-static __aligned(32) uint8_t chained_read_buf_0[8] __used __NOCACHE;
-static __aligned(32) uint8_t chained_read_buf_1[8] __used __NOCACHE;
+static __aligned(32) uint8_t chained_read_buf[2][8] __used __NOCACHE;
 static __aligned(32) uint8_t chained_cpy_buf[10] __used __NOCACHE;
 #else
-ZTEST_BMEM uint8_t chained_read_buf_0[8];
-ZTEST_BMEM uint8_t chained_read_buf_1[8];
+ZTEST_BMEM uint8_t chained_read_buf[2][8];
 ZTEST_BMEM uint8_t chained_cpy_buf[10];
 #endif /* NOCACHE_MEM */
 ZTEST_BMEM volatile uint8_t rx_data_idx;
@@ -340,8 +335,6 @@ ZTEST_BMEM uint8_t rx_buf_idx;
 
 ZTEST_BMEM uint8_t *read_ptr;
 
-static uint8_t *chained_read_buf[2] = {chained_read_buf_0, chained_read_buf_1};
-
 static void test_chained_read_callback(const struct device *dev,
 				struct uart_event *evt, void *user_data)
 {
@@ -359,8 +352,9 @@ static void test_chained_read_callback(const struct device *dev,
 		rx_data_idx += evt->data.rx.len;
 		break;
 	case UART_RX_BUF_REQUEST:
-		err = uart_rx_buf_rsp(dev, chained_read_buf[rx_buf_idx],
-				      sizeof(chained_read_buf_0));
+		err = uart_rx_buf_rsp(dev,
+				      chained_read_buf[rx_buf_idx],
+				      sizeof(chained_read_buf[0]));
 		zassert_equal(err, 0);
 		rx_buf_idx = !rx_buf_idx ? 1 : 0;
 		break;
@@ -393,10 +387,11 @@ ZTEST_USER(uart_async_chain_read, test_chained_read)
 	uint32_t rx_timeout_ms = 50;
 	int err;
 
-	err = uart_rx_enable(uart_dev, chained_read_buf[rx_buf_idx++], sizeof(chained_read_buf_0),
+	err = uart_rx_enable(uart_dev,
+			     chained_read_buf[rx_buf_idx++],
+			     sizeof(chained_read_buf[0]),
 			     rx_timeout_ms * USEC_PER_MSEC);
 	zassert_equal(err, 0);
-	rx_data_idx = 0;
 
 	for (int i = 0; i < iter; i++) {
 		zassert_not_equal(k_sem_take(&rx_disabled, K_MSEC(10)),
@@ -411,7 +406,7 @@ ZTEST_USER(uart_async_chain_read, test_chained_read)
 				"Unexpected amount of data received %d exp:%d",
 				rx_data_idx, sizeof(tx_buf));
 		zassert_equal(memcmp(tx_buf, chained_cpy_buf, sizeof(tx_buf)), 0,
-			      "Buffers not equal exp %s, real %s", tx_buf, chained_cpy_buf);
+			      "Buffers not equal");
 		rx_data_idx = 0;
 	}
 	uart_rx_disable(uart_dev);

From 7e61fccfef8816a4df0c3bb2f7a22b998c90ac47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:14 +0100
Subject: [PATCH 1205/2913] Revert "[nrf fromlist] drivers: serial: nrfx_uarte:
 Request hsfll clock for fast instance"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a61e1db872ea5a978e46a6bbb5fbb0136245824b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/Kconfig.nrfx      |  5 --
 drivers/serial/uart_nrfx_uarte.c | 84 ++++++++------------------------
 2 files changed, 20 insertions(+), 69 deletions(-)

diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx
index f964de9ea5d..650404fceec 100644
--- a/drivers/serial/Kconfig.nrfx
+++ b/drivers/serial/Kconfig.nrfx
@@ -101,11 +101,6 @@ rsource "Kconfig.nrfx_uart_instance"
 endif
 
 if HAS_HW_NRF_UARTE120
-
-config UART_NRFX_UARTE_USE_CLOCK_CONTROL
-	def_bool y
-	select CLOCK_CONTROL
-
 nrfx_uart_num = 120
 rsource "Kconfig.nrfx_uart_instance"
 endif
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 0e434ea492c..ad68313358f 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -23,7 +23,10 @@
 #include <zephyr/linker/devicetree_regions.h>
 #include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/drivers/clock_control/nrf_clock_control.h>
+
+#ifdef CONFIG_SOC_NRF54H20_GPD
+#include <nrf/gpd.h>
+#endif
 
 LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 
@@ -107,22 +110,18 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #define UARTE_ANY_LOW_POWER 1
 #endif
 
-#ifdef CONFIG_SOC_NRF54H20_GPD
-#include <nrf/gpd.h>
-
+BUILD_ASSERT(NRF_GPD_FAST_ACTIVE1 == 0);
 /* Macro must resolve to literal 0 or 1 */
-#define INSTANCE_IS_FAST(unused, prefix, idx, _)						\
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(UARTE(idx)),					\
-		    (COND_CODE_1(DT_NODE_HAS_PROP(UARTE(idx), power_domains),			\
-			(IS_EQ(DT_PHA(UARTE(idx), power_domains, id), NRF_GPD_FAST_ACTIVE1)),	\
-			(0))), (0))
+#define INSTANCE_IS_FAST(unused, prefix, idx, _)					\
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(UARTE(idx)),				\
+		(COND_CODE_1(UTIL_AND(IS_ENABLED(CONFIG_SOC_NRF54H20_GPD),		\
+			     DT_NODE_HAS_PROP(UARTE(idx), power_domains)),		\
+			    (COND_CODE_0(DT_PHA(UARTE(idx), power_domains, id), (1), (0))),\
+			    (0))), (0))
 
 #if UARTE_FOR_EACH_INSTANCE(INSTANCE_IS_FAST, (||), (0))
-/* Fast instance requires special PM treatment so device runtime PM must be enabled. */
-BUILD_ASSERT(IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME));
 #define UARTE_ANY_FAST 1
 #endif
-#endif
 
 #ifdef UARTE_ANY_CACHE
 /* uart120 instance does not retain BAUDRATE register when ENABLE=0. When this instance
@@ -309,10 +308,6 @@ struct uarte_nrfx_config {
 #ifdef CONFIG_HAS_NORDIC_DMM
 	void *mem_reg;
 #endif
-#ifdef UARTE_ANY_FAST
-	const struct device *clk_dev;
-	struct nrf_clock_spec clk_spec;
-#endif
 #ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
 	/* None-zero in case of high speed instances. Baudrate is adjusted by that ratio. */
 	uint32_t clock_freq;
@@ -624,16 +619,6 @@ static void uarte_periph_enable(const struct device *dev)
 	struct uarte_nrfx_data *data = dev->data;
 
 	(void)data;
-#ifdef UARTE_ANY_FAST
-	if (config->clk_dev) {
-		int err;
-
-		err = nrf_clock_control_request_sync(config->clk_dev, &config->clk_spec, K_FOREVER);
-		(void)err;
-		__ASSERT_NO_MSG(err >= 0);
-	}
-#endif
-
 	nrf_uarte_enable(uarte);
 #ifdef CONFIG_SOC_NRF54H20_GPD
 	nrf_gpd_retain_pins_set(config->pcfg, false);
@@ -715,6 +700,7 @@ static void tx_start(const struct device *dev, const uint8_t *buf, size_t len)
 	if (LOW_POWER_ENABLED(config)) {
 		uarte_enable_locked(dev, UARTE_FLAG_LOW_POWER_TX);
 	}
+
 	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTTX);
 }
 
@@ -2218,16 +2204,6 @@ static void uarte_pm_suspend(const struct device *dev)
 	struct uarte_nrfx_data *data = dev->data;
 
 	(void)data;
-#ifdef UARTE_ANY_FAST
-	if (cfg->clk_dev) {
-		int err;
-
-		err = nrf_clock_control_release(cfg->clk_dev, &cfg->clk_spec);
-		(void)err;
-		__ASSERT_NO_MSG(err >= 0);
-	}
-#endif
-
 #ifdef UARTE_ANY_ASYNC
 	if (data->async) {
 		/* Entering inactive state requires device to be no
@@ -2411,11 +2387,11 @@ static int uarte_instance_init(const struct device *dev,
 #define UARTE_DISABLE_RX_INIT(node_id) \
 	.disable_rx = DT_PROP(node_id, disable_rx)
 
-/* Get frequency of the clock that driver the UARTE peripheral. Clock node can
- * have fixed or variable frequency. For fast UARTE use highest supported frequency.
- */
-#define UARTE_GET_BAUDRATE_DIV(idx) \
-	(NRF_PERIPH_GET_FREQUENCY(UARTE(idx)) / NRF_UARTE_BASE_FREQUENCY_16MHZ)
+#define UARTE_GET_FREQ(idx) DT_PROP(DT_CLOCKS_CTLR(UARTE(idx)), clock_frequency)
+
+#define UARTE_GET_BAUDRATE_DIV(idx)						\
+	COND_CODE_1(DT_CLOCKS_HAS_IDX(UARTE(idx), 0),				\
+		   ((UARTE_GET_FREQ(idx) / NRF_UARTE_BASE_FREQUENCY_16MHZ)), (1))
 
 /* When calculating baudrate we need to take into account that high speed instances
  * must have baudrate adjust to the ratio between UARTE clocking frequency and 16 MHz.
@@ -2423,19 +2399,6 @@ static int uarte_instance_init(const struct device *dev,
 #define UARTE_GET_BAUDRATE(idx) \
 	(NRF_BAUDRATE(UARTE_PROP(idx, current_speed)) / UARTE_GET_BAUDRATE_DIV(idx))
 
-/* Get initialization level of an instance. Instances that requires clock control
- * which is using nrfs (IPC) are initialized later.
- */
-#define UARTE_INIT_LEVEL(idx) \
-	COND_CODE_1(INSTANCE_IS_FAST(_, /*empty*/, idx, _), (POST_KERNEL), (PRE_KERNEL_1))
-
-/* Get initialization priority of an instance. Instances that requires clock control
- * which is using nrfs (IPC) are initialized later.
- */
-#define UARTE_INIT_PRIO(idx)								\
-	COND_CODE_1(INSTANCE_IS_FAST(_, /*empty*/, idx, _),				\
-		    (UTIL_INC(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_INIT_PRIORITY)),	\
-		    (CONFIG_SERIAL_INIT_PRIORITY))
 
 /* Macro for setting nRF specific configuration structures. */
 #define UARTE_NRF_CONFIG(idx) {							\
@@ -2491,7 +2454,7 @@ static int uarte_instance_init(const struct device *dev,
 	static const struct uarte_nrfx_config uarte_##idx##z_config = {	       \
 		COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,		       \
 		    (IF_ENABLED(DT_CLOCKS_HAS_IDX(UARTE(idx), 0),	       \
-			   (.clock_freq = NRF_PERIPH_GET_FREQUENCY(UARTE(idx)),))), \
+			   (.clock_freq = UARTE_GET_FREQ(idx),))),	       \
 		    (IF_ENABLED(UARTE_HAS_FRAME_TIMEOUT,		       \
 			(.baudrate = UARTE_PROP(idx, current_speed),))	       \
 		     .nrf_baudrate = UARTE_GET_BAUDRATE(idx),		       \
@@ -2518,13 +2481,6 @@ static int uarte_instance_init(const struct device *dev,
 		IF_ENABLED(CONFIG_UART_##idx##_NRF_HW_ASYNC,		       \
 			(.timer = NRFX_TIMER_INSTANCE(			       \
 				CONFIG_UART_##idx##_NRF_HW_ASYNC_TIMER),))     \
-		IF_ENABLED(INSTANCE_IS_FAST(_, /*empty*/, idx, _),	       \
-			(.clk_dev = DEVICE_DT_GET(DT_CLOCKS_CTLR(UARTE(idx))), \
-			 .clk_spec = {					       \
-				.frequency = NRF_PERIPH_GET_FREQUENCY(UARTE(idx)),\
-				.accuracy = 0,				       \
-				.precision = NRF_CLOCK_CONTROL_PRECISION_DEFAULT,\
-				},))					       \
 	};								       \
 	static int uarte_##idx##_init(const struct device *dev)		       \
 	{								       \
@@ -2545,8 +2501,8 @@ static int uarte_instance_init(const struct device *dev,
 		      PM_DEVICE_DT_GET(UARTE(idx)),			       \
 		      &uarte_##idx##_data,				       \
 		      &uarte_##idx##z_config,				       \
-		      UARTE_INIT_LEVEL(idx),				       \
-		      UARTE_INIT_PRIO(idx),				       \
+		      PRE_KERNEL_1,					       \
+		      CONFIG_SERIAL_INIT_PRIORITY,			       \
 		      &uart_nrfx_uarte_driver_api)
 
 #define UARTE_INT_DRIVEN(idx)						       \

From 0dc311eb379e9510c2abae2c96b6fe04abba8657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:14 +0100
Subject: [PATCH 1206/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Add support for non ISR PM mode"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d9438c99ddd40dc97407e1ad4bd5689a8e9280c1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/uart_nrfx_uarte.c | 99 ++++----------------------------
 1 file changed, 11 insertions(+), 88 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index ad68313358f..5c0f706aef9 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -110,19 +110,6 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #define UARTE_ANY_LOW_POWER 1
 #endif
 
-BUILD_ASSERT(NRF_GPD_FAST_ACTIVE1 == 0);
-/* Macro must resolve to literal 0 or 1 */
-#define INSTANCE_IS_FAST(unused, prefix, idx, _)					\
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(UARTE(idx)),				\
-		(COND_CODE_1(UTIL_AND(IS_ENABLED(CONFIG_SOC_NRF54H20_GPD),		\
-			     DT_NODE_HAS_PROP(UARTE(idx), power_domains)),		\
-			    (COND_CODE_0(DT_PHA(UARTE(idx), power_domains, id), (1), (0))),\
-			    (0))), (0))
-
-#if UARTE_FOR_EACH_INSTANCE(INSTANCE_IS_FAST, (||), (0))
-#define UARTE_ANY_FAST 1
-#endif
-
 #ifdef UARTE_ANY_CACHE
 /* uart120 instance does not retain BAUDRATE register when ENABLE=0. When this instance
  * is used then baudrate must be set after enabling the peripheral and not before.
@@ -282,21 +269,6 @@ struct uarte_nrfx_data {
 	(IS_ENABLED(UARTE_ANY_LOW_POWER) && \
 	 !IS_ENABLED(CONFIG_PM_DEVICE) && \
 	 (_config->flags & UARTE_CFG_FLAG_LOW_POWER))
-
-/** @brief Check if device has PM that works in ISR safe mode.
- *
- * Only fast UARTE instance does not work in that mode so check PM configuration
- * flags only if there is any fast instance present.
- *
- * @retval true if device PM is ISR safe.
- * @retval false if device PM is not ISR safe.
- */
-#define IS_PM_ISR_SAFE(dev) \
-	(!IS_ENABLED(UARTE_ANY_FAST) ||\
-	 COND_CODE_1(CONFIG_PM_DEVICE,\
-			((dev->pm_base->flags & BIT(PM_DEVICE_FLAG_ISR_SAFE))), \
-			(0)))
-
 /**
  * @brief Structure for UARTE configuration.
  */
@@ -901,20 +873,6 @@ static int uarte_nrfx_tx(const struct device *dev, const uint8_t *buf,
 	}
 
 	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		if (!IS_PM_ISR_SAFE(dev) && k_is_in_isr()) {
-			/* If instance does not support PM from ISR device shall
-			 * already be turned on.
-			 */
-			enum pm_device_state state;
-			int err;
-
-			err = pm_device_state_get(dev, &state);
-			(void)err;
-			__ASSERT_NO_MSG(err == 0);
-			if (state != PM_DEVICE_STATE_ACTIVE) {
-				return -ENOTSUP;
-			}
-		}
 		pm_device_runtime_get(dev);
 	}
 
@@ -983,10 +941,6 @@ static void notify_rx_disable(const struct device *dev)
 	};
 
 	user_callback(dev, (struct uart_event *)&evt);
-
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_put_async(dev, K_NO_WAIT);
-	}
 }
 
 #ifdef UARTE_HAS_FRAME_TIMEOUT
@@ -1061,24 +1015,6 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	async_rx->next_buf = NULL;
 	async_rx->next_buf_len = 0;
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		if (!IS_PM_ISR_SAFE(dev) && k_is_in_isr()) {
-			/* If instance does not support PM from ISR device shall
-			 * already be turned on.
-			 */
-			enum pm_device_state state;
-			int err;
-
-			err = pm_device_state_get(dev, &state);
-			(void)err;
-			__ASSERT_NO_MSG(err == 0);
-			if (state != PM_DEVICE_STATE_ACTIVE) {
-				return -ENOTSUP;
-			}
-		}
-		pm_device_runtime_get(dev);
-	}
-
 	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || LOW_POWER_ENABLED(cfg)) {
 		if (async_rx->flush_cnt) {
 			int cpy_len = MIN(len, async_rx->flush_cnt);
@@ -1132,7 +1068,9 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 
 	async_rx->enabled = true;
 
-	if (LOW_POWER_ENABLED(cfg)) {
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_get(dev);
+	} else if (LOW_POWER_ENABLED(cfg)) {
 		unsigned int key = irq_lock();
 
 		uarte_enable_locked(dev, UARTE_FLAG_LOW_POWER_RX);
@@ -1605,7 +1543,9 @@ static void rxto_isr(const struct device *dev)
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXDRDY);
 #endif
 
-	if (LOW_POWER_ENABLED(config)) {
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		pm_device_runtime_put(dev);
+	} else if (LOW_POWER_ENABLED(config)) {
 		uint32_t key = irq_lock();
 
 		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_RX);
@@ -1630,7 +1570,7 @@ static void txstopped_isr(const struct device *dev)
 	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
 		nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
 		if (data->flags & UARTE_FLAG_POLL_OUT) {
-			pm_device_runtime_put_async(dev, K_NO_WAIT);
+			pm_device_runtime_put(dev);
 			data->flags &= ~UARTE_FLAG_POLL_OUT;
 		}
 	} else if (LOW_POWER_ENABLED(config)) {
@@ -1693,11 +1633,11 @@ static void txstopped_isr(const struct device *dev)
 	data->async->tx.buf = NULL;
 	data->async->tx.len = 0;
 
-	user_callback(dev, &evt);
-
 	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_put_async(dev, K_NO_WAIT);
+		pm_device_runtime_put(dev);
 	}
+
+	user_callback(dev, &evt);
 }
 
 static void rxdrdy_isr(const struct device *dev)
@@ -1884,22 +1824,6 @@ static void uarte_nrfx_poll_out(const struct device *dev, unsigned char c)
 	}
 
 	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		if (!IS_PM_ISR_SAFE(dev) && k_is_in_isr()) {
-			/* If instance does not support PM from ISR device shall
-			 * already be turned on.
-			 */
-			enum pm_device_state state;
-			int err;
-
-			err = pm_device_state_get(dev, &state);
-			(void)err;
-			__ASSERT_NO_MSG(err == 0);
-			if (state != PM_DEVICE_STATE_ACTIVE) {
-				irq_unlock(key);
-				return;
-			}
-		}
-
 		if (!(data->flags & UARTE_FLAG_POLL_OUT)) {
 			data->flags |= UARTE_FLAG_POLL_OUT;
 			pm_device_runtime_get(dev);
@@ -2493,8 +2417,7 @@ static int uarte_instance_init(const struct device *dev,
 	}								       \
 									       \
 	PM_DEVICE_DT_DEFINE(UARTE(idx), uarte_nrfx_pm_action,		       \
-			    COND_CODE_1(INSTANCE_IS_FAST(_, /*empty*/, idx, _),\
-				    (0), (PM_DEVICE_ISR_SAFE)));	       \
+			    PM_DEVICE_ISR_SAFE);			       \
 									       \
 	DEVICE_DT_DEFINE(UARTE(idx),					       \
 		      uarte_##idx##_init,				       \

From 81533c768bd9abd61dca6d5500c6ce08072ad801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:14 +0100
Subject: [PATCH 1207/2913] Revert "[nrf fromtree] drivers serial nrfx: Apply
 workaround also for bsim targets"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b92b6ef914fbf363477c0631c1a3dad3a54f7b5e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/uart_nrfx_uarte.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 5c0f706aef9..91f3430e8b6 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -30,7 +30,9 @@
 
 LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 
+#if !defined(CONFIG_ARCH_POSIX)
 #define RX_FLUSH_WORKAROUND 1
+#endif
 
 #define UARTE(idx)                DT_NODELABEL(uart##idx)
 #define UARTE_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(UARTE(idx), prop)

From ff5e876a0927c537caa6f15836ac9dc3d693ebd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:14 +0100
Subject: [PATCH 1208/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Fix runtime PM for interrupt driven API"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 149a9710639288199d1e3657054d31b6a5488acf.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/uart_nrfx_uarte.c | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 91f3430e8b6..6acb6e44fbd 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -353,16 +353,16 @@ static void uarte_nrfx_isr_int(const void *arg)
 	if (txstopped && (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || LOW_POWER_ENABLED(config))) {
 		unsigned int key = irq_lock();
 
-		if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-			if (data->flags & UARTE_FLAG_POLL_OUT) {
-				data->flags &= ~UARTE_FLAG_POLL_OUT;
-				pm_device_runtime_put_async(dev, K_NO_WAIT);
-			}
+		if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) &&
+		    (data->flags & UARTE_FLAG_POLL_OUT)) {
+			data->flags &= ~UARTE_FLAG_POLL_OUT;
+			pm_device_runtime_put(dev);
 		} else {
 			nrf_uarte_disable(uarte);
 		}
+
 #ifdef UARTE_INTERRUPT_DRIVEN
-		if (!data->int_driven)
+		if (!data->int_driven || data->int_driven->fifo_fill_lock == 0)
 #endif
 		{
 			nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
@@ -378,20 +378,16 @@ static void uarte_nrfx_isr_int(const void *arg)
 
 	if (txstopped) {
 		data->int_driven->fifo_fill_lock = 0;
-		if (!data->int_driven->tx_irq_enabled) {
-
-			nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
-		}
-
 		if (data->int_driven->disable_tx_irq) {
+			nrf_uarte_int_disable(uarte,
+					      NRF_UARTE_INT_TXSTOPPED_MASK);
 			data->int_driven->disable_tx_irq = false;
-			if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-				pm_device_runtime_put_async(dev, K_NO_WAIT);
-			}
 			return;
 		}
+
 	}
 
+
 	if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ERROR)) {
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ERROR);
 	}
@@ -1904,11 +1900,6 @@ static void uarte_nrfx_irq_tx_enable(const struct device *dev)
 {
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	struct uarte_nrfx_data *data = dev->data;
-
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_get(dev);
-	}
-
 	unsigned int key = irq_lock();
 
 	data->int_driven->disable_tx_irq = false;

From 6c85dcb4b3d866ee44d046b064102e5ae0466939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:14 +0100
Subject: [PATCH 1209/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Fix pin retention"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8b5c722dbeebfd9b735e1bb9313fbc3940546041.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/uart_nrfx_uarte.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 6acb6e44fbd..452307acaa8 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -590,9 +590,6 @@ static void uarte_periph_enable(const struct device *dev)
 
 	(void)data;
 	nrf_uarte_enable(uarte);
-#ifdef CONFIG_SOC_NRF54H20_GPD
-	nrf_gpd_retain_pins_set(config->pcfg, false);
-#endif
 #if UARTE_BAUDRATE_RETENTION_WORKAROUND
 	nrf_uarte_baudrate_set(uarte,
 		COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,
@@ -705,11 +702,6 @@ static void uarte_disable_locked(const struct device *dev, uint32_t dis_mask)
 	}
 #endif
 
-#ifdef CONFIG_SOC_NRF54H20_GPD
-	const struct uarte_nrfx_config *cfg = dev->config;
-
-	nrf_gpd_retain_pins_set(cfg->pcfg, true);
-#endif
 	nrf_uarte_disable(get_uarte_instance(dev));
 }
 
@@ -2111,6 +2103,9 @@ static void uarte_pm_resume(const struct device *dev)
 
 	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || !LOW_POWER_ENABLED(cfg)) {
 		uarte_periph_enable(dev);
+#ifdef CONFIG_SOC_NRF54H20_GPD
+		nrf_gpd_retain_pins_set(cfg->pcfg, false);
+#endif
 	}
 }
 

From 18ce4b60667b99bda0f1b6fe0a85305af505770e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:14 +0100
Subject: [PATCH 1210/2913] Revert "[nrf fromtree] drivers: clock_control: nrf:
 Add API for synchronous request"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d0ed809374638a39611009f35787ab33eec32deb.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../clock_control/clock_control_nrf2_common.c | 44 -------------------
 .../drivers/clock_control/nrf_clock_control.h | 18 --------
 2 files changed, 62 deletions(-)

diff --git a/drivers/clock_control/clock_control_nrf2_common.c b/drivers/clock_control/clock_control_nrf2_common.c
index 7bf8576880b..f3b21a5dd1f 100644
--- a/drivers/clock_control/clock_control_nrf2_common.c
+++ b/drivers/clock_control/clock_control_nrf2_common.c
@@ -4,7 +4,6 @@
  */
 
 #include "clock_control_nrf2_common.h"
-#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
@@ -25,13 +24,6 @@ LOG_MODULE_REGISTER(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
  */
 STRUCT_CLOCK_CONFIG(generic, ONOFF_CNT_MAX);
 
-/* Structure used for synchronous clock request. */
-struct sync_req {
-	struct onoff_client cli;
-	struct k_sem sem;
-	int res;
-};
-
 static void update_config(struct clock_config_generic *cfg)
 {
 	atomic_val_t prev_flags = atomic_or(&cfg->flags, FLAG_UPDATE_NEEDED);
@@ -167,39 +159,3 @@ int api_nosys_on_off(const struct device *dev, clock_control_subsys_t sys)
 
 	return -ENOSYS;
 }
-
-static void sync_cb(struct onoff_manager *mgr, struct onoff_client *cli, uint32_t state, int res)
-{
-	struct sync_req *req = CONTAINER_OF(cli, struct sync_req, cli);
-
-	req->res = res;
-	k_sem_give(&req->sem);
-}
-
-int nrf_clock_control_request_sync(const struct device *dev,
-				   const struct nrf_clock_spec *spec,
-				   k_timeout_t timeout)
-{
-	struct sync_req req = {
-		.sem = Z_SEM_INITIALIZER(req.sem, 0, 1)
-	};
-	int err;
-
-	if (k_is_in_isr()) {
-		return -EWOULDBLOCK;
-	}
-
-	sys_notify_init_callback(&req.cli.notify, sync_cb);
-
-	err = nrf_clock_control_request(dev, spec, &req.cli);
-	if (err < 0) {
-		return err;
-	}
-
-	err = k_sem_take(&req.sem, timeout);
-	if (err < 0) {
-		return err;
-	}
-
-	return req.res;
-}
diff --git a/include/zephyr/drivers/clock_control/nrf_clock_control.h b/include/zephyr/drivers/clock_control/nrf_clock_control.h
index 2578feffd2b..1db5b1242ee 100644
--- a/include/zephyr/drivers/clock_control/nrf_clock_control.h
+++ b/include/zephyr/drivers/clock_control/nrf_clock_control.h
@@ -242,24 +242,6 @@ int nrf_clock_control_request(const struct device *dev,
 	return api->request(dev, spec, cli);
 }
 
-/**
- * @brief Synchronously request a reservation to use a given clock with specified attributes.
- *
- * Function can only be called from thread context as it blocks until request is completed.
- * @see nrf_clock_control_request().
- *
- * @param dev pointer to the clock device structure.
- * @param spec See nrf_clock_control_request().
- * @param timeout Request timeout.
- *
- * @retval 0 if request is fulfilled.
- * @retval -EWOULDBLOCK if request is called from the interrupt context.
- * @retval negative See error codes returned by nrf_clock_control_request().
- */
-int nrf_clock_control_request_sync(const struct device *dev,
-				   const struct nrf_clock_spec *spec,
-				   k_timeout_t timeout);
-
 /**
  * @brief Release a reserved use of a clock.
  *

From 6cea5544bbc4ba52768b56e7cd144941f5b8ff44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:14 +0100
Subject: [PATCH 1211/2913] Revert "[nrf fromtree] driver: clock_control: Add
 to nrf clock control calib in progres API"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4de7ed4e38b4584f45dd419f1214d7855c51c9af.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/clock_control/nrf_clock_calibration.c            | 5 -----
 include/zephyr/drivers/clock_control/nrf_clock_control.h | 7 -------
 2 files changed, 12 deletions(-)

diff --git a/drivers/clock_control/nrf_clock_calibration.c b/drivers/clock_control/nrf_clock_calibration.c
index fc2ce4162aa..bea799515e1 100644
--- a/drivers/clock_control/nrf_clock_calibration.c
+++ b/drivers/clock_control/nrf_clock_calibration.c
@@ -294,8 +294,3 @@ int z_nrf_clock_calibration_skips_count(void)
 
 	return total_skips_cnt;
 }
-
-bool z_nrf_clock_calibration_is_in_progress(void)
-{
-	return cal_process_in_progress ? true : false;
-}
diff --git a/include/zephyr/drivers/clock_control/nrf_clock_control.h b/include/zephyr/drivers/clock_control/nrf_clock_control.h
index 1db5b1242ee..b7764b91a86 100644
--- a/include/zephyr/drivers/clock_control/nrf_clock_control.h
+++ b/include/zephyr/drivers/clock_control/nrf_clock_control.h
@@ -117,13 +117,6 @@ int z_nrf_clock_calibration_count(void);
  */
 int z_nrf_clock_calibration_skips_count(void);
 
-
-/** @brief Returns information if LF clock calibration is in progress.
- *
- * @return True if calibration is in progress, false otherwise.
- */
-bool z_nrf_clock_calibration_is_in_progress(void);
-
 /** @brief Get onoff service for given clock subsystem.
  *
  * @param sys Subsystem.

From 93128109623292fe301348784d029a4a2c2457cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:14 +0100
Subject: [PATCH 1212/2913] Revert "[nrf fromtree] usb: device_next: Fail
 enqueue on disabled endpoints"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7bf11a1181d2d3f13b5f98a8c79e67e625fe25af.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_common.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/usb/udc/udc_common.c b/drivers/usb/udc/udc_common.c
index bef3f657382..86f5a7f854a 100644
--- a/drivers/usb/udc/udc_common.c
+++ b/drivers/usb/udc/udc_common.c
@@ -592,11 +592,6 @@ int udc_ep_enqueue(const struct device *dev, struct net_buf *const buf)
 		goto ep_enqueue_error;
 	}
 
-	if (!cfg->stat.enabled) {
-		ret = -ENODEV;
-		goto ep_enqueue_error;
-	}
-
 	LOG_DBG("Queue ep 0x%02x %p len %u", cfg->addr, buf,
 		USB_EP_DIR_IS_IN(cfg->addr) ? buf->len : buf->size);
 

From 9f58138aa2f313a821a5e7a3b25a91cb5497e644 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:14 +0100
Subject: [PATCH 1213/2913] Revert "[nrf fromtree] usb: device_next: Update IAD
 first interface on init"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 990619cc6687458425c63b99d0dcd2047020ae7b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/usb/device_next/class/bt_hci.c       | 6 +++++-
 subsys/usb/device_next/class/loopback.c     | 5 +++++
 subsys/usb/device_next/class/usbd_cdc_acm.c | 1 +
 subsys/usb/device_next/class/usbd_cdc_ecm.c | 1 +
 subsys/usb/device_next/usbd_init.c          | 9 ---------
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/subsys/usb/device_next/class/bt_hci.c b/subsys/usb/device_next/class/bt_hci.c
index 4487726b22a..52eddc4e25b 100644
--- a/subsys/usb/device_next/class/bt_hci.c
+++ b/subsys/usb/device_next/class/bt_hci.c
@@ -459,7 +459,11 @@ static void *bt_hci_get_desc(struct usbd_class_data *const c_data,
 
 static int bt_hci_init(struct usbd_class_data *const c_data)
 {
-	ARG_UNUSED(c_data);
+
+	struct bt_hci_data *data = usbd_class_get_private(c_data);
+	struct usbd_bt_hci_desc *desc = data->desc;
+
+	desc->iad.bFirstInterface = desc->if0.bInterfaceNumber;
 
 	return 0;
 }
diff --git a/subsys/usb/device_next/class/loopback.c b/subsys/usb/device_next/class/loopback.c
index b74a6b44b05..2237cabcc79 100644
--- a/subsys/usb/device_next/class/loopback.c
+++ b/subsys/usb/device_next/class/loopback.c
@@ -135,6 +135,11 @@ static void *lb_get_desc(struct usbd_class_data *const c_data,
 
 static int lb_init(struct usbd_class_data *c_data)
 {
+	struct lb_data *data = usbd_class_get_private(c_data);
+	struct loopback_desc *desc = data->desc;
+
+	desc->iad.bFirstInterface = desc->if0.bInterfaceNumber;
+
 	LOG_DBG("Init class instance %p", c_data);
 
 	return 0;
diff --git a/subsys/usb/device_next/class/usbd_cdc_acm.c b/subsys/usb/device_next/class/usbd_cdc_acm.c
index 04f4c424f7d..80f4a858386 100644
--- a/subsys/usb/device_next/class/usbd_cdc_acm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_acm.c
@@ -473,6 +473,7 @@ static int usbd_cdc_acm_init(struct usbd_class_data *const c_data)
 	struct cdc_acm_uart_data *data = dev->data;
 	struct usbd_cdc_acm_desc *desc = data->desc;
 
+	desc->iad.bFirstInterface = desc->if0.bInterfaceNumber;
 	desc->if0_union.bControlInterface = desc->if0.bInterfaceNumber;
 	desc->if0_union.bSubordinateInterface0 = desc->if1.bInterfaceNumber;
 
diff --git a/subsys/usb/device_next/class/usbd_cdc_ecm.c b/subsys/usb/device_next/class/usbd_cdc_ecm.c
index 3b0c656da4e..3c3072182be 100644
--- a/subsys/usb/device_next/class/usbd_cdc_ecm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_ecm.c
@@ -449,6 +449,7 @@ static int usbd_cdc_ecm_init(struct usbd_class_data *const c_data)
 	const uint8_t if_num = desc->if0.bInterfaceNumber;
 
 	/* Update relevant b*Interface fields */
+	desc->iad.bFirstInterface = if_num;
 	desc->if0_union.bControlInterface = if_num;
 	desc->if0_union.bSubordinateInterface0 = if_num + 1;
 	LOG_DBG("CDC ECM class initialized");
diff --git a/subsys/usb/device_next/usbd_init.c b/subsys/usb/device_next/usbd_init.c
index fc31c8a211a..551dc32164f 100644
--- a/subsys/usb/device_next/usbd_init.c
+++ b/subsys/usb/device_next/usbd_init.c
@@ -115,7 +115,6 @@ static int init_configuration_inst(struct usbd_context *const uds_ctx,
 				   uint8_t *const nif)
 {
 	struct usb_desc_header **dhp;
-	struct usb_association_descriptor *iad = NULL;
 	struct usb_if_descriptor *ifd = NULL;
 	struct usb_ep_descriptor *ed;
 	uint32_t class_ep_bm = 0;
@@ -133,14 +132,6 @@ static int init_configuration_inst(struct usbd_context *const uds_ctx,
 	c_nd->ep_active = 0U;
 
 	while (*dhp != NULL && (*dhp)->bLength != 0) {
-		if ((*dhp)->bDescriptorType == USB_DESC_INTERFACE_ASSOC) {
-			iad = (struct usb_association_descriptor *)(*dhp);
-
-			/* IAD must be before interfaces it associates, so the
-			 * first interface will be the next interface assigned.
-			 */
-			iad->bFirstInterface = tmp_nif;
-		}
 
 		if ((*dhp)->bDescriptorType == USB_DESC_INTERFACE) {
 			ifd = (struct usb_if_descriptor *)(*dhp);

From 5d048f00593b79ce97d77e817e43b3a80711e9c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:14 +0100
Subject: [PATCH 1214/2913] Revert "[nrf fromlist] drivers: hwinfo: Support for
 reset reasons in nRF54H20"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 622410f49f10b71ee47850f352a2401e4303f5a3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/hwinfo/hwinfo_nrf.c | 40 ++++++-------------------------------
 1 file changed, 6 insertions(+), 34 deletions(-)

diff --git a/drivers/hwinfo/hwinfo_nrf.c b/drivers/hwinfo/hwinfo_nrf.c
index 50e20906d98..d1fca5350a6 100644
--- a/drivers/hwinfo/hwinfo_nrf.c
+++ b/drivers/hwinfo/hwinfo_nrf.c
@@ -8,7 +8,7 @@
 #include <zephyr/drivers/hwinfo.h>
 #include <string.h>
 #include <zephyr/sys/byteorder.h>
-#if !defined(CONFIG_BOARD_QEMU_CORTEX_M0)
+#if !defined(CONFIG_SOC_SERIES_NRF54HX) && !defined(CONFIG_BOARD_QEMU_CORTEX_M0)
 #include <helpers/nrfx_reset_reason.h>
 #endif
 
@@ -63,7 +63,7 @@ ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 	return length;
 }
 
-#if !defined(CONFIG_BOARD_QEMU_CORTEX_M0)
+#if !defined(CONFIG_SOC_SERIES_NRF54HX) && !defined(CONFIG_BOARD_QEMU_CORTEX_M0)
 int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 {
 	uint32_t flags = 0;
@@ -76,37 +76,16 @@ int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 	if (reason & NRFX_RESET_REASON_DOG_MASK) {
 		flags |= RESET_WATCHDOG;
 	}
-
-#if defined(NRF_RESETINFO)
-	if (reason & NRFX_RESET_REASON_LOCAL_DOG0_MASK) {
-		flags |= RESET_WATCHDOG;
-	}
-#endif
-
-#if defined(NRF_RESETINFO)
-	if ((reason & NRFX_RESET_REASON_LOCKUP)
-		|| (reason & NRFX_RESET_REASON_LOCAL_LOCKUP_MASK))
-#else
-	if (reason & NRFX_RESET_REASON_LOCKUP_MASK)
-#endif
-	{
+	if (reason & NRFX_RESET_REASON_LOCKUP_MASK) {
 		flags |= RESET_CPU_LOCKUP;
 	}
-
 	if (reason & NRFX_RESET_REASON_OFF_MASK) {
 		flags |= RESET_LOW_POWER_WAKE;
 	}
 	if (reason & NRFX_RESET_REASON_DIF_MASK) {
 		flags |= RESET_DEBUG;
 	}
-
-#if defined(NRF_RESETINFO)
-	if ((reason & NRFX_RESET_REASON_SREQ)
-		|| (reason & NRFX_RESET_REASON_LOCAL_SREQ_MASK))
-#else
-	if (reason & NRFX_RESET_REASON_SREQ_MASK)
-#endif
-	{
+	if (reason & NRFX_RESET_REASON_SREQ_MASK) {
 		flags |= RESET_SOFTWARE;
 	}
 
@@ -145,18 +124,11 @@ int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 		flags |= RESET_DEBUG;
 	}
 #endif
-
 #if !NRF_POWER_HAS_RESETREAS
-#if defined(NRF_RESETINFO)
-	if (reason & NRFX_RESET_REASON_LOCAL_DOG1_MASK)
-#else
-	if (reason & NRFX_RESET_REASON_DOG1_MASK)
-#endif
-	{
+	if (reason & NRFX_RESET_REASON_DOG1_MASK) {
 		flags |= RESET_WATCHDOG;
 	}
-#endif /* !NRF_POWER_HAS_RESETREAS */
-
+#endif
 #if NRFX_RESET_REASON_HAS_GRTC
 	if (reason & NRFX_RESET_REASON_GRTC_MASK) {
 		flags |= RESET_CLOCK;

From 367e3f543ab2f58387d89fd5d0f7bec615e5df1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:15 +0100
Subject: [PATCH 1215/2913] Revert "[nrf fromtree] boards: nrf54h20: increase
 size of cpuapp and cpurad partitions"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit bb6cb96cfc9c3ff070902e06d1ceaa642015fe31.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index 80211205ca3..2b2473f92b5 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -185,8 +185,8 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		cpurad_slot0_partition: partition@54000 {
-			reg = <0x54000 DT_SIZE_K(256)>;
+		cpurad_slot0_partition: partition@66000 {
+			reg = <0x66000 DT_SIZE_K(256)>;
 		};
 	};
 
@@ -197,8 +197,8 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		cpuapp_slot0_partition: partition@94000 {
-			reg = <0x94000 DT_SIZE_K(320)>;
+		cpuapp_slot0_partition: partition@a6000 {
+			reg = <0xa6000 DT_SIZE_K(248)>;
 		};
 
 		cpuppr_code_partition: partition@e4000 {
@@ -222,7 +222,7 @@
 		};
 
 		storage_partition: partition@1e3000 {
-			reg = < 0x1e3000 DT_SIZE_K(40) >;
+			reg = < 0x1e3000 DT_SIZE_K(24) >;
 		};
 	};
 };

From 4234c8db8486e090c5f963af6328fdec060b6631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:15 +0100
Subject: [PATCH 1216/2913] Revert "[nrf fromlist] soc: nordic: nrf54h20:
 disallow using LR in s2ram marking function"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 269aa0f7cbe1c293f1b6dedbb5275a90af3453c6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54h/pm_s2ram.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/soc/nordic/nrf54h/pm_s2ram.c b/soc/nordic/nrf54h/pm_s2ram.c
index ea9e60973d1..20c28e42df5 100644
--- a/soc/nordic/nrf54h/pm_s2ram.c
+++ b/soc/nordic/nrf54h/pm_s2ram.c
@@ -132,8 +132,6 @@ void __attribute__((naked)) pm_s2ram_mark_set(void)
 
 bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
 {
-	register uint32_t link_reg __asm__("r14");
-
 	__asm__ volatile(
 		/* Set return value to 0 */
 		"mov	r0, #0\n"
@@ -161,14 +159,13 @@ bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
 		"mov	r0, #1\n"
 
 		"exit:\n"
-		"bx	%[link_reg]\n"
+		"bx	lr\n"
 		:
 		: [resetinfo_addr] "r"(NRF_RESETINFO),
 		  [resetreas_offs] "r"(offsetof(NRF_RESETINFO_Type, RESETREAS.LOCAL)),
 		  [resetreas_unretained_mask] "r"(NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK),
 		  [restorevalid_offs] "r"(offsetof(NRF_RESETINFO_Type, RESTOREVALID)),
-		  [restorevalid_present_mask] "r"(RESETINFO_RESTOREVALID_RESTOREVALID_Msk),
-		  [link_reg] "r"(link_reg)
+		  [restorevalid_present_mask] "r"(RESETINFO_RESTOREVALID_RESTOREVALID_Msk)
 
-		: "r0", "r1", "r3", "r4", "cc", "memory");
+		: "r0", "r1", "r3", "r4", "memory");
 }

From 7ee9be1660748f505de5347d925e5c0e77d6c96e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:15 +0100
Subject: [PATCH 1217/2913] Revert "[nrf fromlist] tests: arch: arm:
 arm_irq_vector_table: Fix for nRF54H20"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 878e7231399249f3c5e83b57103e621243fad4aa.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.conf     | 1 -
 .../arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpurad.conf     | 1 -
 .../arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf  | 1 -
 .../arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf  | 1 -
 .../arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.conf   | 1 -
 .../arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpurad.conf   | 1 -
 6 files changed, 6 deletions(-)
 delete mode 100644 tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 delete mode 100644 tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpurad.conf
 delete mode 100644 tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 delete mode 100644 tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf
 delete mode 100644 tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 delete mode 100644 tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpurad.conf

diff --git a/tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.conf
deleted file mode 100644
index 0bcc82e646b..00000000000
--- a/tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpurad.conf
deleted file mode 100644
index 0bcc82e646b..00000000000
--- a/tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpurad.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf
deleted file mode 100644
index 0bcc82e646b..00000000000
--- a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf
deleted file mode 100644
index 0bcc82e646b..00000000000
--- a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.conf
deleted file mode 100644
index 0bcc82e646b..00000000000
--- a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpurad.conf
deleted file mode 100644
index 0bcc82e646b..00000000000
--- a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpurad.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_NRF54H20_GPD=n

From 526889dd1e4368368498c79000b8fbbf10a030ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:15 +0100
Subject: [PATCH 1218/2913] Revert "[nrf fromlist] drivers: timer: nrf_grtc:
 Add support for clock outputs"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit af6174f17710041d9d6efea8248fc2835aa55a7f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/timer/nrf_grtc_timer.c | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/drivers/timer/nrf_grtc_timer.c b/drivers/timer/nrf_grtc_timer.c
index 05779038142..ee3f35e09d0 100644
--- a/drivers/timer/nrf_grtc_timer.c
+++ b/drivers/timer/nrf_grtc_timer.c
@@ -10,15 +10,12 @@
 #if defined(CONFIG_CLOCK_CONTROL_NRF)
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #endif
-#include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/drivers/timer/nrf_grtc_timer.h>
 #include <nrfx_grtc.h>
 #include <zephyr/sys/math_extras.h>
 
 #define GRTC_NODE DT_NODELABEL(grtc)
-#define HFCLK_NODE DT_PHANDLE_BY_NAME(GRTC_NODE, clocks, hfclock)
-#define LFCLK_NODE DT_PHANDLE_BY_NAME(GRTC_NODE, clocks, lfclock)
 
 /* Ensure that GRTC properties in devicetree are defined correctly. */
 #if !DT_NODE_HAS_PROP(GRTC_NODE, owned_channels)
@@ -52,7 +49,7 @@
 
 #define MAX_CYCLES (MAX_TICKS * CYC_PER_TICK)
 
-#define LFCLK_FREQUENCY_HZ DT_PROP(LFCLK_NODE, clock_frequency)
+#define LFCLK_FREQUENCY_HZ 32768
 
 #if defined(CONFIG_TEST)
 const int32_t z_sys_timer_irq_for_test = DT_IRQN(GRTC_NODE);
@@ -521,35 +518,7 @@ static int sys_clock_driver_init(void)
 #if defined(CONFIG_NRF_GRTC_ALWAYS_ON)
 	nrfx_grtc_active_request_set(true);
 #endif
-
-#if DT_PROP(GRTC_NODE, clkout_32k)
-	nrfy_grtc_clkout_set(NRF_GRTC, NRF_GRTC_CLKOUT_32K, true);
-#endif
-
-#if DT_NODE_HAS_PROP(GRTC_NODE, clkout_fast_frequency)
-#if !DT_NODE_HAS_PROP(HFCLK_NODE, clock_frequency)
-#error "hfclock reference required when fast clock output is enabled."
-#endif
-
-#if DT_PROP(GRTC_NODE, clkout_fast_frequency) > (DT_PROP(HFCLK_NODE, clock_frequency) / 2)
-#error "Invalid frequency value for fast clock output."
-#endif
-	uint32_t base_frequency = DT_PROP(HFCLK_NODE, clock_frequency);
-	uint32_t requested_frequency = DT_PROP(GRTC_NODE, clkout_fast_frequency);
-	uint32_t grtc_div = base_frequency / (requested_frequency * 2);
-
-	nrfy_grtc_clkout_divider_set(NRF_GRTC, (uint8_t)grtc_div);
-	nrfy_grtc_clkout_set(NRF_GRTC, NRF_GRTC_CLKOUT_FAST, true);
-#endif
-
-#if DT_PROP(GRTC_NODE, clkout_32k) || DT_NODE_HAS_PROP(GRTC_NODE, clkout_fast_frequency)
-	PINCTRL_DT_DEFINE(GRTC_NODE);
-	const struct pinctrl_dev_config *pcfg = PINCTRL_DT_DEV_CONFIG_GET(GRTC_NODE);
-
-	return pinctrl_apply_state(pcfg, PINCTRL_STATE_DEFAULT);
-#else
 	return 0;
-#endif
 }
 
 void sys_clock_set_timeout(int32_t ticks, bool idle)

From 6d9e9a62e41a038b74e8cb3b27037684559ab2fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:15 +0100
Subject: [PATCH 1219/2913] Revert "[nrf fromlist] dts: nordic: Add support for
 clock outputs"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a7b06baa1d4a61108b85d822e9bc122012864da8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts |  2 --
 .../nrf54h20dk_nrf54h20-pinctrl.dtsi          | 15 ------------
 .../nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi   | 15 ------------
 dts/bindings/timer/nordic,nrf-grtc.yaml       | 24 +------------------
 dts/common/nordic/nrf54h20.dtsi               |  7 ++++--
 dts/common/nordic/nrf54l20.dtsi               |  8 -------
 dts/common/nordic/nrf54l_05_10_15.dtsi        |  8 -------
 7 files changed, 6 insertions(+), 73 deletions(-)

diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
index e6129833778..cd8b95be664 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -77,8 +77,6 @@
 	/* Channels 7-11 reserved for Zero Latency IRQs, 3-4 for FLPR */
 	child-owned-channels = <3 4 7 8 9 10 11>;
 	status = "okay";
-	/delete-property/ clocks;
-	/delete-property/ clock-names;
 };
 
 &cpuapp_rram {
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
index 9b574a18ec5..79ac2c6b7ad 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
@@ -98,19 +98,4 @@
 			low-power-enable;
 		};
 	};
-
-	/omit-if-no-ref/ grtc_default: grtc_default {
-		group1 {
-			psels = <NRF_PSEL(GRTC_CLKOUT_FAST, 1, 8)>,
-				<NRF_PSEL(GRTC_CLKOUT_32K, 0, 1)>;
-		};
-	};
-
-	/omit-if-no-ref/ grtc_sleep: grtc_sleep {
-		group1 {
-			psels = <NRF_PSEL(GRTC_CLKOUT_FAST, 1, 8)>,
-				<NRF_PSEL(GRTC_CLKOUT_32K, 0, 1)>;
-			low-power-enable;
-		};
-	};
 };
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi
index 6b7457a2818..0b6e2056a82 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi
@@ -77,19 +77,4 @@
 			low-power-enable;
 		};
 	};
-
-	/omit-if-no-ref/ grtc_default: grtc_default {
-		group1 {
-			psels = <NRF_PSEL(GRTC_CLKOUT_FAST, 1, 8)>,
-				<NRF_PSEL(GRTC_CLKOUT_32K, 0, 4)>;
-		};
-	};
-
-	/omit-if-no-ref/ grtc_sleep: grtc_sleep {
-		group1 {
-			psels = <NRF_PSEL(GRTC_CLKOUT_FAST, 1, 8)>,
-				<NRF_PSEL(GRTC_CLKOUT_32K, 0, 4)>;
-			low-power-enable;
-		};
-	};
 };
diff --git a/dts/bindings/timer/nordic,nrf-grtc.yaml b/dts/bindings/timer/nordic,nrf-grtc.yaml
index 4b041d0adc1..e78e57df97e 100644
--- a/dts/bindings/timer/nordic,nrf-grtc.yaml
+++ b/dts/bindings/timer/nordic,nrf-grtc.yaml
@@ -4,40 +4,18 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description: |
-  Nordic GRTC (Global RTC)
-
-      Example of using clock outputs:
-        &grtc {
-          pinctrl-0 = <&grtc_default>;
-          pinctrl-1 = <&grtc_sleep>;
-          pinctrl-names = "default", "sleep";
-          clkout-fast-frequency = <8000000>;
-          clkout-32k;
-          /* In case of nRF54H20 devices: */
-          nordic,clockpin-enable = <NRF_FUN_GRTC_CLKOUT_FAST>;
-        };
+description: Nordic GRTC (Global RTC)
 
 compatible: "nordic,nrf-grtc"
 
 include:
   - "base.yaml"
   - "nordic,split-channels.yaml"
-  - "pinctrl-device.yaml"
-  - "nordic-clockpin.yaml"
 
 properties:
   reg:
     required: true
 
-  clkout-fast-frequency:
-    type: int
-    description: Fast output clock frequency.
-
-  clkout-32k:
-    type: boolean
-    description: 32768 Hz output clock frequency enable.
-
   interrupts:
     required: true
 
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 02217f65bb6..382fc337eae 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -941,8 +941,11 @@
 				reg = <0x99c000 0x1000>;
 				status = "disabled";
 				cc-num = <16>;
-				clocks = <&lfclk>, <&fll16m>;
-				clock-names = "lfclock", "hfclock";
+				/* GRTC uses both LFCLK and FLL16M, but its accuracy and
+				 * precision are inherited from LFCLK. that's why this
+				 *  one is linked here.
+				 */
+				clocks = <&lfclk>;
 				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index d06c4814103..67ccb152a5f 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -35,12 +35,6 @@
 	};
 
 	clocks {
-		pclk: pclk {
-			compatible = "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <DT_FREQ_M(16)>;
-		};
-
 		lfxo: lfxo {
 			compatible = "nordic,nrf-lfxo";
 			#clock-cells = <0>;
@@ -504,8 +498,6 @@
 				compatible = "nordic,nrf-grtc";
 				reg = <0xe2000 0x1000>;
 				cc-num = <12>;
-				clocks = <&lfxo>, <&pclk>;
-				clock-names = "lfclock", "hfclock";
 				status = "disabled";
 			};
 
diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi
index eba41095e75..d997e01c488 100644
--- a/dts/common/nordic/nrf54l_05_10_15.dtsi
+++ b/dts/common/nordic/nrf54l_05_10_15.dtsi
@@ -48,12 +48,6 @@
 	};
 
 	clocks {
-		pclk: pclk {
-			compatible = "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <DT_FREQ_M(16)>;
-		};
-
 		lfxo: lfxo {
 			compatible = "nordic,nrf-lfxo";
 			#clock-cells = <0>;
@@ -554,8 +548,6 @@
 				compatible = "nordic,nrf-grtc";
 				reg = <0xe2000 0x1000>;
 				cc-num = <12>;
-				clocks = <&lfxo>, <&pclk>;
-				clock-names = "lfclock", "hfclock";
 				status = "disabled";
 			};
 

From 53b34849ade8086dd8b1b4a5a871c2d103f0c2f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:15 +0100
Subject: [PATCH 1220/2913] Revert "[nrf fromlist] drivers: pinctrl: nrf: Add
 support for clock outputs"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 18d1c74cc1c9f690c3b689ad7b6649624ec1ffd2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/pinctrl/pinctrl_nrf.c                 | 27 -------------------
 .../zephyr/dt-bindings/pinctrl/nrf-pinctrl.h  |  4 ---
 2 files changed, 31 deletions(-)

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index d0354f600a9..1e80de8fe67 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -94,15 +94,6 @@ static const nrf_gpio_pin_drive_t drive_modes[NRF_DRIVE_COUNT] = {
 #define NRF_PSEL_QSPI(reg, line) ((NRF_QSPI_Type *)reg)->PSEL.line
 #endif
 
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc) || defined(CONFIG_NRFX_GRTC)
-#if DT_NODE_HAS_PROP(DT_NODELABEL(grtc), clkout_fast_frequency)
-#define NRF_GRTC_CLKOUT_FAST 1
-#endif
-#if DT_NODE_HAS_PROP(DT_NODELABEL(grtc), clkout_32k_frequency)
-#define NRF_GRTC_CLKOUT_SLOW 1
-#endif
-#endif
-
 int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			   uintptr_t reg)
 {
@@ -345,24 +336,6 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
 			break;
 #endif /* defined(NRF_PSEL_QSPI) */
-#if defined(NRF_GRTC_CLKOUT_FAST)
-		case NRF_FUN_GRTC_CLKOUT_FAST:
-#if NRF_GPIO_HAS_SEL && defined(GPIO_PIN_CNF_CTRLSEL_GRTC)
-			nrf_gpio_pin_control_select(psel, NRF_GPIO_PIN_SEL_GRTC);
-#endif
-			dir = NRF_GPIO_PIN_DIR_OUTPUT;
-			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
-			break;
-#endif /* defined(NRF_GRTC_CLKOUT_FAST) */
-#if defined(NRF_GRTC_CLKOUT_SLOW)
-		case NRF_FUN_GRTC_CLKOUT_32K:
-#if NRF_GPIO_HAS_SEL && defined(GPIO_PIN_CNF_CTRLSEL_GRTC)
-			nrf_gpio_pin_control_select(psel, NRF_GPIO_PIN_SEL_GRTC);
-#endif
-			dir = NRF_GPIO_PIN_DIR_OUTPUT;
-			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
-			break;
-#endif /* defined(NRF_GRTC_CLKOUT_SLOW) */
 #if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_can)
 		/* Pin routing is controlled by secure domain, via UICR */
 		case NRF_FUN_CAN_TX:
diff --git a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
index a73f59c48b7..4611baef95c 100644
--- a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
@@ -162,10 +162,6 @@
 #define NRF_FUN_CAN_TX 46U
 /** CAN RX */
 #define NRF_FUN_CAN_RX 47U
-/** GRTC fast clock output */
-#define NRF_FUN_GRTC_CLKOUT_FAST 55U
-/** GRTC slow clock output */
-#define NRF_FUN_GRTC_CLKOUT_32K  56U
 
 /** @} */
 

From a8dafeb4f6f92ba2b4f1c636b0d1b14eaeebceb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:15 +0100
Subject: [PATCH 1221/2913] Revert "[nrf fromtree] tests: drivers: spi: Fix
 nrf52840 overlay"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 50d6d149ad977b5b659940139634859798c0f70d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
index 8ce5342be23..a1a0dc42a36 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
@@ -53,7 +53,6 @@
 	zephyr,pm-device-runtime-auto;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
-		spi-max-frequency = <DT_FREQ_M(8)>;
 		reg = <0>;
 	};
 };

From 6c583079a40b2dc3303c3a7e30c5827364e098e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:15 +0100
Subject: [PATCH 1222/2913] Revert "[nrf fromlist] drivers: counter:
 nrfx_timer: Add request for global HFSLL"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3303b0327ac37896721e7a1a408a1aad17743d55.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/counter/Kconfig.nrfx         |  6 --
 drivers/counter/counter_nrfx_timer.c | 86 ++++------------------------
 2 files changed, 11 insertions(+), 81 deletions(-)

diff --git a/drivers/counter/Kconfig.nrfx b/drivers/counter/Kconfig.nrfx
index 775406a5198..321cf9de634 100644
--- a/drivers/counter/Kconfig.nrfx
+++ b/drivers/counter/Kconfig.nrfx
@@ -9,12 +9,6 @@ config COUNTER_NRF_RTC
 	def_bool y
 	depends on DT_HAS_NORDIC_NRF_RTC_ENABLED
 
-config COUNTER_NRFX_TIMER_USE_CLOCK_CONTROL
-	def_bool y
-	depends on $(dt_nodelabel_enabled,timer120) || \
-		 $(dt_nodelabel_enabled,timer121)
-	select CLOCK_CONTROL
-
 # Internal flag which detects if PPI wrap feature is enabled for any instance
 config COUNTER_RTC_WITH_PPI_WRAP
 	def_bool $(dt_nodelabel_bool_prop,rtc0,ppi-wrap) || \
diff --git a/drivers/counter/counter_nrfx_timer.c b/drivers/counter/counter_nrfx_timer.c
index ea8edb08b6f..333a436c80e 100644
--- a/drivers/counter/counter_nrfx_timer.c
+++ b/drivers/counter/counter_nrfx_timer.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/drivers/counter.h>
-#include <zephyr/drivers/clock_control/nrf_clock_control.h>
-#include <zephyr/devicetree.h>
 #include <hal/nrf_timer.h>
 #include <zephyr/sys/atomic.h>
 
@@ -34,32 +32,11 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL);
 #define MAYBE_CONST_CONFIG const
 #endif
 
-#ifdef CONFIG_SOC_NRF54H20_GPD
-#include <nrf/gpd.h>
-
-#define NRF_CLOCKS_INSTANCE_IS_FAST(node)						\
-	COND_CODE_1(DT_NODE_HAS_PROP(node, power_domains),				\
-		    (IS_EQ(DT_PHA(node, power_domains, id), NRF_GPD_FAST_ACTIVE1)),	\
-		    (0))
-
-/* Macro must resolve to literal 0 or 1 */
-#define INSTANCE_IS_FAST(idx) NRF_CLOCKS_INSTANCE_IS_FAST(DT_DRV_INST(idx))
-
-#define INSTANCE_IS_FAST_OR(idx) INSTANCE_IS_FAST(idx) ||
-
-#if (DT_INST_FOREACH_STATUS_OKAY(INSTANCE_IS_FAST_OR) 0)
-#define COUNTER_ANY_FAST 1
-#endif
-#endif
-
 struct counter_nrfx_data {
 	counter_top_callback_t top_cb;
 	void *top_user_data;
 	uint32_t guard_period;
 	atomic_t cc_int_pending;
-#ifdef COUNTER_ANY_FAST
-	atomic_t active;
-#endif
 };
 
 struct counter_nrfx_ch_data {
@@ -71,10 +48,6 @@ struct counter_nrfx_config {
 	struct counter_config_info info;
 	struct counter_nrfx_ch_data *ch_data;
 	NRF_TIMER_Type *timer;
-#ifdef COUNTER_ANY_FAST
-	const struct device *clk_dev;
-	struct nrf_clock_spec clk_spec;
-#endif
 	LOG_INSTANCE_PTR_DECLARE(log);
 };
 
@@ -88,18 +61,6 @@ static int start(const struct device *dev)
 {
 	const struct counter_nrfx_config *config = dev->config;
 
-#ifdef COUNTER_ANY_FAST
-	struct counter_nrfx_data *data = dev->data;
-
-	if (config->clk_dev && atomic_cas(&data->active, 0, 1)) {
-		int err;
-
-		err = nrf_clock_control_request_sync(config->clk_dev, &config->clk_spec, K_FOREVER);
-		if (err < 0) {
-			return err;
-		}
-	}
-#endif
 	nrf_timer_task_trigger(config->timer, NRF_TIMER_TASK_START);
 
 	return 0;
@@ -110,18 +71,6 @@ static int stop(const struct device *dev)
 	const struct counter_nrfx_config *config = dev->config;
 
 	nrf_timer_task_trigger(config->timer, NRF_TIMER_TASK_STOP);
-#ifdef COUNTER_ANY_FAST
-	struct counter_nrfx_data *data = dev->data;
-
-	if (config->clk_dev && atomic_cas(&data->active, 1, 0)) {
-		int err;
-
-		err = nrf_clock_control_release(config->clk_dev, &config->clk_spec);
-		if (err < 0) {
-			return err;
-		}
-	}
-#endif
 
 	return 0;
 }
@@ -454,20 +403,6 @@ static const struct counter_driver_api counter_nrfx_driver_api = {
 	.set_guard_period = set_guard_period,
 };
 
-/* Get initialization level of an instance. Instances that requires clock control
- * which is using nrfs (IPC) are initialized later.
- */
-#define TIMER_INIT_LEVEL(idx) \
-	COND_CODE_1(INSTANCE_IS_FAST(idx), (POST_KERNEL), (PRE_KERNEL_1))
-
-/* Get initialization priority of an instance. Instances that requires clock control
- * which is using nrfs (IPC) are initialized later.
- */
-#define TIMER_INIT_PRIO(idx)								\
-	COND_CODE_1(INSTANCE_IS_FAST(idx),						\
-		    (UTIL_INC(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_INIT_PRIORITY)),	\
-		    (CONFIG_COUNTER_INIT_PRIORITY))
-
 /*
  * Device instantiation is done with node labels due to HAL API
  * requirements. In particular, TIMERx_MAX_SIZE values from HALs
@@ -484,6 +419,14 @@ static const struct counter_driver_api counter_nrfx_driver_api = {
 			    irq_handler, DEVICE_DT_INST_GET(idx), 0))		\
 	)
 
+#if !defined(CONFIG_SOC_SERIES_BSIM_NRFXX)
+#define CHECK_MAX_FREQ(idx)									\
+		BUILD_ASSERT(DT_INST_PROP(idx, max_frequency) ==				\
+			NRF_TIMER_BASE_FREQUENCY_GET((NRF_TIMER_Type *)DT_INST_REG_ADDR(idx)))
+#else
+#define CHECK_MAX_FREQ(idx)
+#endif
+
 #define COUNTER_NRFX_TIMER_DEVICE(idx)								\
 	BUILD_ASSERT(DT_INST_PROP(idx, prescaler) <=						\
 			TIMER_PRESCALER_PRESCALER_Msk,						\
@@ -513,29 +456,22 @@ static const struct counter_driver_api counter_nrfx_driver_api = {
 	static MAYBE_CONST_CONFIG struct counter_nrfx_config nrfx_counter_##idx##_config = {	\
 		.info = {									\
 			.max_top_value = (uint32_t)BIT64_MASK(DT_INST_PROP(idx, max_bit_width)),\
-			.freq = NRF_PERIPH_GET_FREQUENCY(DT_DRV_INST(idx)) /			\
+			.freq = DT_INST_PROP(idx, max_frequency) /				\
 				BIT(DT_INST_PROP(idx, prescaler)),				\
 			.flags = COUNTER_CONFIG_INFO_COUNT_UP,					\
 			.channels = CC_TO_ID(DT_INST_PROP(idx, cc_num)),			\
 		},										\
 		.ch_data = counter##idx##_ch_data,						\
 		.timer = (NRF_TIMER_Type *)DT_INST_REG_ADDR(idx),				\
-		IF_ENABLED(INSTANCE_IS_FAST(idx),						\
-			(.clk_dev = DEVICE_DT_GET(DT_CLOCKS_CTLR(DT_DRV_INST(idx))),		\
-			 .clk_spec = {								\
-				.frequency = NRF_PERIPH_GET_FREQUENCY(DT_DRV_INST(idx)),	\
-				.accuracy = 0,							\
-				.precision = NRF_CLOCK_CONTROL_PRECISION_DEFAULT,		\
-				},								\
-			 ))									\
 		LOG_INSTANCE_PTR_INIT(log, LOG_MODULE_NAME, idx)				\
 	};											\
+	CHECK_MAX_FREQ(idx);									\
 	DEVICE_DT_INST_DEFINE(idx,								\
 			    counter_##idx##_init,						\
 			    NULL,								\
 			    &counter_##idx##_data,						\
 			    &nrfx_counter_##idx##_config.info,					\
-			    TIMER_INIT_LEVEL(idx), TIMER_INIT_PRIO(idx),			\
+			    PRE_KERNEL_1, CONFIG_COUNTER_INIT_PRIORITY,				\
 			    &counter_nrfx_driver_api);
 
 DT_INST_FOREACH_STATUS_OKAY(COUNTER_NRFX_TIMER_DEVICE)

From 99c3dce86072b91855908822901d4c550163d183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:15 +0100
Subject: [PATCH 1223/2913] Revert "[nrf fromlist] dts: common: nordic: Add
 clock for timer12x"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2430fb2bd37490b64c8dacb9b9b2a5268302190e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/common/nordic/nrf54h20.dtsi | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 382fc337eae..bb57f4a20aa 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -623,7 +623,6 @@
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				max-bit-width = <32>;
 				max-frequency = <DT_FREQ_M(320)>;
-				clocks = <&hsfll120>;
 				prescaler = <0>;
 			};
 
@@ -636,7 +635,6 @@
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				max-bit-width = <32>;
 				max-frequency = <DT_FREQ_M(320)>;
-				clocks = <&hsfll120>;
 				prescaler = <0>;
 			};
 

From cf0526c932cc2bcca580c9e179bb94adcc85a039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:15 +0100
Subject: [PATCH 1224/2913] Revert "[nrf fromlist] hal_nordic: nrfs: dvfs:
 Update SystemCoreClock on frequency change"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b986f69b15107079ecf69d8d1cd99d485872dc67.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/nrfs/dvfs/ld_dvfs_handler.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/modules/hal_nordic/nrfs/dvfs/ld_dvfs_handler.c b/modules/hal_nordic/nrfs/dvfs/ld_dvfs_handler.c
index 4a418585463..c28d9187a55 100644
--- a/modules/hal_nordic/nrfs/dvfs/ld_dvfs_handler.c
+++ b/modules/hal_nordic/nrfs/dvfs/ld_dvfs_handler.c
@@ -139,19 +139,9 @@ static void dvfs_service_handler_scaling_background_job(enum dvfs_frequency_sett
 	}
 }
 
-/* Update MDK variable which is used by nrfx_coredep_delay_us (k_busy_wait). */
-static void dvfs_service_update_core_clock(enum dvfs_frequency_setting oppoint_freq)
-{
-	extern uint32_t SystemCoreClock;
-
-	SystemCoreClock = oppoint_freq == DVFS_FREQ_HIGH ? 320000000 :
-			  oppoint_freq == DVFS_FREQ_MEDLOW ? 128000000 : 64000000;
-}
-
 /* Perform scaling finnish procedure. */
 static void dvfs_service_handler_scaling_finish(enum dvfs_frequency_setting oppoint_freq)
 {
-
 	LOG_DBG("Scaling finnish oppoint freq %d", oppoint_freq);
 	ld_dvfs_scaling_finish(dvfs_service_handler_is_downscaling(oppoint_freq));
 	if (!dvfs_service_handler_is_downscaling(oppoint_freq)) {
@@ -163,7 +153,6 @@ static void dvfs_service_handler_scaling_finish(enum dvfs_frequency_setting oppo
 	}
 	dvfs_service_handler_clear_state_bit(DVFS_SERV_HDL_FREQ_CHANGE_REQ_PENDING_BIT_POS);
 	current_freq_setting = oppoint_freq;
-	dvfs_service_update_core_clock(oppoint_freq);
 	LOG_DBG("Current LD freq setting: %d", current_freq_setting);
 	if (dvfs_frequency_change_applied_clb) {
 		dvfs_frequency_change_applied_clb(current_freq_setting);
@@ -227,7 +216,6 @@ static void nrfs_dvfs_evt_handler(nrfs_dvfs_evt_t const *p_evt, void *context)
 		dvfs_service_handler_clear_state_bit(DVFS_SERV_HDL_FREQ_CHANGE_REQ_PENDING_BIT_POS);
 		LOG_DBG("DVFS handler EVT_OPPOINT_REQ_CONFIRMED %d", (uint32_t)p_evt->freq);
 		if (dvfs_service_handler_get_requested_oppoint() == p_evt->freq) {
-			dvfs_service_update_core_clock(p_evt->freq);
 			if (dvfs_frequency_change_applied_clb) {
 				dvfs_frequency_change_applied_clb(p_evt->freq);
 			}

From f790da4f314e9a9862ff49b4f0b5d07c1eec956f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:15 +0100
Subject: [PATCH 1225/2913] Revert "[nrf fromlist] drivers: clock_control:
 nrf2: add support for global hfsll clock"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b6535f5caeff11a44b2daf808b2ddaddcf5ba4d3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/clock_control/CMakeLists.txt          |   1 -
 drivers/clock_control/Kconfig.nrf             |  33 --
 .../clock_control_nrf2_global_hsfll.c         | 302 ------------------
 .../clock_control/clock_control_nrf2_hsfll.c  |  14 +
 4 files changed, 14 insertions(+), 336 deletions(-)
 delete mode 100644 drivers/clock_control/clock_control_nrf2_global_hsfll.c

diff --git a/drivers/clock_control/CMakeLists.txt b/drivers/clock_control/CMakeLists.txt
index d3d1807d6cf..ffc19a3b729 100644
--- a/drivers/clock_control/CMakeLists.txt
+++ b/drivers/clock_control/CMakeLists.txt
@@ -35,7 +35,6 @@ zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RENESAS_RA_CGC      clock_cont
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_AMBIQ               clock_control_ambiq.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_PWM                 clock_control_pwm.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RPI_PICO            clock_control_rpi_pico.c)
-zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL   clock_control_nrf2_global_hsfll.c)
 
 if(CONFIG_CLOCK_CONTROL_NRF2)
   zephyr_library_sources(clock_control_nrf2_common.c)
diff --git a/drivers/clock_control/Kconfig.nrf b/drivers/clock_control/Kconfig.nrf
index b5b066ac48e..f7b0de3db09 100644
--- a/drivers/clock_control/Kconfig.nrf
+++ b/drivers/clock_control/Kconfig.nrf
@@ -193,37 +193,4 @@ config CLOCK_CONTROL_NRF2_NRFS_CLOCK_TIMEOUT_MS
 	int "Timeout waiting for nrfs clock service callback in milliseconds"
 	default 1000
 
-config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
-	bool "Clock control for global HSFLL"
-	depends on NRFS_GDFS_SERVICE_ENABLED
-	default y
-
-if CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
-
-config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_TIMEOUT_MS
-	int "Frequency request timeout in milliseconds"
-	default 10000
-
-config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_REQ_LOW_FREQ
-	bool "Request LOW frequency on init"
-	default y
-	help
-	  The GDFS service will default to HIGH frequency until it receives
-	  a lower frequency request. The NRF2 clock controller drivers
-	  expect the clock to be initialized to their lowest frequency, so
-	  we need to send a request on init to align GDFS with the NRF2
-	  clock controller driver.
-
-	  This initial request can be disabled to prevent a potentially
-	  unnecessary HIGH -> LOW -> HIGH cycle given some module will
-	  request a HIGH frequency on init anyway.
-
-config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_INIT_PRIORITY
-	int "Init priority of global HSFLL device driver"
-	default 52
-	help
-	  Must be higher than NRFS backend
-
-endif # CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
-
 endif # CLOCK_CONTROL_NRF2
diff --git a/drivers/clock_control/clock_control_nrf2_global_hsfll.c b/drivers/clock_control/clock_control_nrf2_global_hsfll.c
deleted file mode 100644
index e79957eea71..00000000000
--- a/drivers/clock_control/clock_control_nrf2_global_hsfll.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define DT_DRV_COMPAT nordic_nrf_hsfll_global
-
-#include "clock_control_nrf2_common.h"
-#include <zephyr/devicetree.h>
-#include <zephyr/drivers/clock_control/nrf_clock_control.h>
-#include <nrfs_gdfs.h>
-
-#include <zephyr/logging/log.h>
-LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
-
-#define GLOBAL_HSFLL_CLOCK_FREQUENCIES \
-	DT_INST_PROP(0, supported_clock_frequencies)
-
-#define GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(idx) \
-	DT_INST_PROP_BY_IDX(0, supported_clock_frequencies, idx)
-
-#define GLOBAL_HSFLL_CLOCK_FREQUENCIES_SIZE \
-	DT_INST_PROP_LEN(0, supported_clock_frequencies)
-
-#define GLOBAL_HSFLL_FREQ_REQ_TIMEOUT \
-	K_MSEC(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_TIMEOUT_MS)
-
-#define GLOBAL_HSFLL_INIT_LOW_REQ \
-	CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_REQ_LOW_FREQ
-
-BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_SIZE == 4);
-BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(0) == 64000000);
-BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(1) == 128000000);
-BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(2) == 256000000);
-BUILD_ASSERT(GLOBAL_HSFLL_CLOCK_FREQUENCIES_IDX(3) == 320000000);
-BUILD_ASSERT(GDFS_FREQ_COUNT == 4);
-BUILD_ASSERT(GDFS_FREQ_HIGH == 0);
-BUILD_ASSERT(GDFS_FREQ_MEDHIGH == 1);
-BUILD_ASSERT(GDFS_FREQ_MEDLOW == 2);
-BUILD_ASSERT(GDFS_FREQ_LOW == 3);
-
-struct global_hsfll_dev_config {
-	uint32_t clock_frequencies[GLOBAL_HSFLL_CLOCK_FREQUENCIES_SIZE];
-};
-
-struct global_hsfll_dev_data {
-	STRUCT_CLOCK_CONFIG(global_hsfll, GLOBAL_HSFLL_CLOCK_FREQUENCIES_SIZE) clk_cfg;
-	const struct device *dev;
-	struct k_work evt_work;
-	nrfs_gdfs_evt_type_t evt;
-	struct k_work_delayable timeout_dwork;
-
-#if GLOBAL_HSFLL_INIT_LOW_REQ
-	struct k_sem evt_sem;
-#endif /* GLOBAL_HSFLL_INIT_LOW_REQ */
-};
-
-static uint32_t global_hsfll_get_max_clock_frequency(const struct device *dev)
-{
-	const struct global_hsfll_dev_config *dev_config = dev->config;
-
-	return dev_config->clock_frequencies[ARRAY_SIZE(dev_config->clock_frequencies) - 1];
-}
-
-static struct onoff_manager *global_hsfll_find_mgr(const struct device *dev,
-						   const struct nrf_clock_spec *spec)
-{
-	struct global_hsfll_dev_data *dev_data = dev->data;
-	const struct global_hsfll_dev_config *dev_config = dev->config;
-	uint32_t frequency;
-
-	if (!spec) {
-		return &dev_data->clk_cfg.onoff[0].mgr;
-	}
-
-	if (spec->accuracy || spec->precision) {
-		LOG_ERR("invalid specification of accuracy or precision");
-		return NULL;
-	}
-
-	frequency = spec->frequency == NRF_CLOCK_CONTROL_FREQUENCY_MAX
-		  ? global_hsfll_get_max_clock_frequency(dev)
-		  : spec->frequency;
-
-	for (uint8_t i = 0; i < ARRAY_SIZE(dev_config->clock_frequencies); i++) {
-		if (dev_config->clock_frequencies[i] < frequency) {
-			continue;
-		}
-
-		return &dev_data->clk_cfg.onoff[i].mgr;
-	}
-
-	LOG_ERR("invalid frequency");
-	return NULL;
-}
-
-static int api_request_global_hsfll(const struct device *dev,
-				    const struct nrf_clock_spec *spec,
-				    struct onoff_client *cli)
-{
-	struct onoff_manager *mgr = global_hsfll_find_mgr(dev, spec);
-
-	if (mgr) {
-		return onoff_request(mgr, cli);
-	}
-
-	return -EINVAL;
-}
-
-static int api_release_global_hsfll(const struct device *dev,
-				    const struct nrf_clock_spec *spec)
-{
-	struct onoff_manager *mgr = global_hsfll_find_mgr(dev, spec);
-
-	if (mgr) {
-		return onoff_release(mgr);
-	}
-
-	return -EINVAL;
-}
-
-static int api_cancel_or_release_global_hsfll(const struct device *dev,
-					      const struct nrf_clock_spec *spec,
-					      struct onoff_client *cli)
-{
-	struct onoff_manager *mgr = global_hsfll_find_mgr(dev, spec);
-
-	if (mgr) {
-		return onoff_cancel_or_release(mgr, cli);
-	}
-
-	return -EINVAL;
-}
-
-static struct nrf_clock_control_driver_api driver_api = {
-	.std_api = {
-		.on = api_nosys_on_off,
-		.off = api_nosys_on_off,
-	},
-	.request = api_request_global_hsfll,
-	.release = api_release_global_hsfll,
-	.cancel_or_release = api_cancel_or_release_global_hsfll,
-};
-
-static enum gdfs_frequency_setting global_hsfll_freq_idx_to_nrfs_freq(const struct device *dev,
-								      uint8_t freq_idx)
-{
-	const struct global_hsfll_dev_config *dev_config = dev->config;
-
-	return ARRAY_SIZE(dev_config->clock_frequencies) - 1 - freq_idx;
-}
-
-static const char *global_hsfll_gdfs_freq_to_str(enum gdfs_frequency_setting freq)
-{
-	switch (freq) {
-	case GDFS_FREQ_HIGH:
-		return "GDFS_FREQ_HIGH";
-	case GDFS_FREQ_MEDHIGH:
-		return "GDFS_FREQ_MEDHIGH";
-	case GDFS_FREQ_MEDLOW:
-		return "GDFS_FREQ_MEDLOW";
-	case GDFS_FREQ_LOW:
-		return "GDFS_FREQ_LOW";
-	default:
-		break;
-	}
-
-	return "UNKNOWN";
-}
-
-static void global_hsfll_work_handler(struct k_work *work)
-{
-	struct global_hsfll_dev_data *dev_data =
-		CONTAINER_OF(work, struct global_hsfll_dev_data, clk_cfg.work);
-	const struct device *dev = dev_data->dev;
-	uint8_t freq_idx;
-	enum gdfs_frequency_setting target_freq;
-	nrfs_err_t err;
-
-	freq_idx = clock_config_update_begin(work);
-	target_freq = global_hsfll_freq_idx_to_nrfs_freq(dev, freq_idx);
-
-	LOG_DBG("requesting %s", global_hsfll_gdfs_freq_to_str(target_freq));
-	err = nrfs_gdfs_request_freq(target_freq, dev_data);
-	if (err != NRFS_SUCCESS) {
-		clock_config_update_end(&dev_data->clk_cfg, -EIO);
-		return;
-	}
-
-	k_work_schedule(&dev_data->timeout_dwork, GLOBAL_HSFLL_FREQ_REQ_TIMEOUT);
-}
-
-static void global_hsfll_evt_handler(struct k_work *work)
-{
-	struct global_hsfll_dev_data *dev_data =
-		CONTAINER_OF(work, struct global_hsfll_dev_data, evt_work);
-	int rc;
-
-	k_work_cancel_delayable(&dev_data->timeout_dwork);
-	rc = dev_data->evt == NRFS_GDFS_EVT_FREQ_CONFIRMED ? 0 : -EIO;
-	clock_config_update_end(&dev_data->clk_cfg, rc);
-}
-
-#if GLOBAL_HSFLL_INIT_LOW_REQ
-static void global_hfsll_nrfs_gdfs_init_evt_handler(nrfs_gdfs_evt_t const *p_evt, void *context)
-{
-	struct global_hsfll_dev_data *dev_data = context;
-
-	dev_data->evt = p_evt->type;
-	k_sem_give(&dev_data->evt_sem);
-}
-#endif /* GLOBAL_HSFLL_INIT_LOW_REQ */
-
-static void global_hfsll_nrfs_gdfs_evt_handler(nrfs_gdfs_evt_t const *p_evt, void *context)
-{
-	struct global_hsfll_dev_data *dev_data = context;
-
-	if (k_work_is_pending(&dev_data->evt_work)) {
-		return;
-	}
-
-	dev_data->evt = p_evt->type;
-	k_work_submit(&dev_data->evt_work);
-}
-
-static void global_hsfll_timeout_handler(struct k_work *work)
-{
-	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
-	struct global_hsfll_dev_data *dev_data =
-		CONTAINER_OF(dwork, struct global_hsfll_dev_data, timeout_dwork);
-
-	clock_config_update_end(&dev_data->clk_cfg, -ETIMEDOUT);
-}
-
-static int global_hfsll_init(const struct device *dev)
-{
-	struct global_hsfll_dev_data *dev_data = dev->data;
-	nrfs_err_t err;
-	int rc;
-
-	k_work_init_delayable(&dev_data->timeout_dwork, global_hsfll_timeout_handler);
-	k_work_init(&dev_data->evt_work, global_hsfll_evt_handler);
-
-#if GLOBAL_HSFLL_INIT_LOW_REQ
-	k_sem_init(&dev_data->evt_sem, 0, 1);
-
-	err = nrfs_gdfs_init(global_hfsll_nrfs_gdfs_init_evt_handler);
-	if (err != NRFS_SUCCESS) {
-		return -EIO;
-	}
-
-	LOG_DBG("initial request %s", global_hsfll_gdfs_freq_to_str(GDFS_FREQ_LOW));
-	err = nrfs_gdfs_request_freq(GDFS_FREQ_LOW, dev_data);
-	if (err != NRFS_SUCCESS) {
-		return -EIO;
-	}
-
-	rc = k_sem_take(&dev_data->evt_sem, GLOBAL_HSFLL_FREQ_REQ_TIMEOUT);
-	if (rc) {
-		return -EIO;
-	}
-
-	if (dev_data->evt != NRFS_GDFS_EVT_FREQ_CONFIRMED) {
-		return -EIO;
-	}
-
-	nrfs_gdfs_uninit();
-#endif /* GLOBAL_HSFLL_INIT_LOW_REQ */
-
-	rc = clock_config_init(&dev_data->clk_cfg,
-			       ARRAY_SIZE(dev_data->clk_cfg.onoff),
-			       global_hsfll_work_handler);
-	if (rc < 0) {
-		return rc;
-	}
-
-	err = nrfs_gdfs_init(global_hfsll_nrfs_gdfs_evt_handler);
-	if (err != NRFS_SUCCESS) {
-		return -EIO;
-	}
-
-	return 0;
-}
-
-static struct global_hsfll_dev_data driver_data = {
-	.dev = DEVICE_DT_INST_GET(0),
-};
-
-static const struct global_hsfll_dev_config driver_config = {
-	GLOBAL_HSFLL_CLOCK_FREQUENCIES
-};
-
-DEVICE_DT_INST_DEFINE(
-	0,
-	global_hfsll_init,
-	NULL,
-	&driver_data,
-	&driver_config,
-	POST_KERNEL,
-	CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_INIT_PRIORITY,
-	&driver_api
-);
diff --git a/drivers/clock_control/clock_control_nrf2_hsfll.c b/drivers/clock_control/clock_control_nrf2_hsfll.c
index 58ad4a51ff5..b0d0ff364b3 100644
--- a/drivers/clock_control/clock_control_nrf2_hsfll.c
+++ b/drivers/clock_control/clock_control_nrf2_hsfll.c
@@ -8,6 +8,7 @@
 #include "clock_control_nrf2_common.h"
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <hal/nrf_hsfll.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
@@ -182,6 +183,18 @@ static int api_cancel_or_release_hsfll(const struct device *dev,
 #endif
 }
 
+static int api_get_rate_hsfll(const struct device *dev,
+			      clock_control_subsys_t sys,
+			      uint32_t *rate)
+{
+	ARG_UNUSED(dev);
+	ARG_UNUSED(sys);
+
+	*rate = nrf_hsfll_clkctrl_mult_get(NRF_HSFLL) * MHZ(16);
+
+	return 0;
+}
+
 static int hsfll_init(const struct device *dev)
 {
 #ifdef CONFIG_NRFS_DVFS_LOCAL_DOMAIN
@@ -208,6 +221,7 @@ static struct nrf_clock_control_driver_api hsfll_drv_api = {
 	.std_api = {
 		.on = api_nosys_on_off,
 		.off = api_nosys_on_off,
+		.get_rate = api_get_rate_hsfll,
 	},
 	.request = api_request_hsfll,
 	.release = api_release_hsfll,

From d80bd9d3a096414efe60ca4709bb1a2f4c6ed354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:15 +0100
Subject: [PATCH 1226/2913] Revert "[nrf fromlist] modules: hal_nordic: nrfs:
 add GDFS Service"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c2c18233aaf6c5c3ce26bd7efdf79db8c9b174b3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/nrfs/CMakeLists.txt | 1 -
 modules/hal_nordic/nrfs/Kconfig        | 8 --------
 modules/hal_nordic/nrfs/nrfs_config.h  | 8 --------
 soc/nordic/nrf54h/Kconfig              | 2 --
 4 files changed, 19 deletions(-)

diff --git a/modules/hal_nordic/nrfs/CMakeLists.txt b/modules/hal_nordic/nrfs/CMakeLists.txt
index 41dfb61f864..f470eea00e9 100644
--- a/modules/hal_nordic/nrfs/CMakeLists.txt
+++ b/modules/hal_nordic/nrfs/CMakeLists.txt
@@ -31,7 +31,6 @@ if(CONFIG_NRFS)
         zephyr_library_sources_ifdef(CONFIG_NRFS_RESET_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_reset.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..8c5b61bb11f 100644
--- a/modules/hal_nordic/nrfs/Kconfig
+++ b/modules/hal_nordic/nrfs/Kconfig
@@ -19,9 +19,6 @@ config NRFS_HAS_DIAG_SERVICE
 config NRFS_HAS_DVFS_SERVICE
 	bool
 
-config NRFS_HAS_GDFS_SERVICE
-	bool
-
 config NRFS_HAS_GDPWR_SERVICE
 	bool
 
@@ -120,11 +117,6 @@ config NRFS_GDPWR_SERVICE_ENABLED
 	depends on NRFS_HAS_GDPWR_SERVICE
 	default y
 
-config NRFS_GDFS_SERVICE_ENABLED
-	bool "Global domain frequency scaling service"
-	depends on NRFS_HAS_GDFS_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..a092adb7850 100644
--- a/modules/hal_nordic/nrfs/nrfs_config.h
+++ b/modules/hal_nordic/nrfs/nrfs_config.h
@@ -44,14 +44,6 @@
 #define NRFS_GDPWR_SERVICE_ENABLED
 #endif
 
-#ifdef CONFIG_NRFS_CLOCK_SERVICE_ENABLED
-#define NRFS_CLOCK_SERVICE_ENABLED
-#endif
-
-#ifdef CONFIG_NRFS_GDFS_SERVICE_ENABLED
-#define NRFS_GDFS_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 d54ef99da8e..36979b554e0 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -25,7 +25,6 @@ config SOC_NRF54H20_CPUAPP_COMMON
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select NRFS_HAS_CLOCK_SERVICE
 	select NRFS_HAS_DVFS_SERVICE
-	select NRFS_HAS_GDFS_SERVICE
 	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
@@ -49,7 +48,6 @@ config SOC_NRF54H20_CPURAD_COMMON
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select NRFS_HAS_CLOCK_SERVICE
-	select NRFS_HAS_GDFS_SERVICE
 	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
 	select NRFS_HAS_TEMP_SERVICE

From 8f737cd019c5fe2cd9db9d30ff7f79ba812a28c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:15 +0100
Subject: [PATCH 1227/2913] Revert "[nrf fromlist] devicetree: Add DT_PROP_LAST
 macro"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 32ff571753743960aa0cdaa9a599f745bc8e8628.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/devicetree.h | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/include/zephyr/devicetree.h b/include/zephyr/devicetree.h
index 3779cacc9e8..eb894a1f9a9 100644
--- a/include/zephyr/devicetree.h
+++ b/include/zephyr/devicetree.h
@@ -809,17 +809,6 @@
 #define DT_PROP_BY_IDX(node_id, prop, idx) \
 	DT_CAT5(node_id, _P_, prop, _IDX_, idx)
 
-/**
- * @brief Get the last element of an array type property
- *
- * @param node_id node identifier
- * @param prop lowercase-and-underscores property name
- *
- * @return a representation of the last element of the property
- */
-#define DT_PROP_LAST(node_id, prop) \
-	DT_PROP_BY_IDX(node_id, prop, UTIL_DEC(DT_PROP_LEN(node_id, prop)))
-
 /**
  * @brief Like DT_PROP(), but with a fallback to @p default_value
  *

From 876835cc407826585f68b863e254717fa6058ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:15 +0100
Subject: [PATCH 1228/2913] Revert "[nrf fromlist] sys: util: Extend IS_EQ to
 support unsigned literals"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 376150db86795d604df215bcd28366dcce93bf28.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/sys/util_internal.h       |     2 +-
 include/zephyr/sys/util_internal_is_eq.h | 20485 +++++----------------
 include/zephyr/sys/util_macro.h          |    14 +-
 3 files changed, 4099 insertions(+), 16402 deletions(-)

diff --git a/include/zephyr/sys/util_internal.h b/include/zephyr/sys/util_internal.h
index 1d4e0d2130f..d3adca60640 100644
--- a/include/zephyr/sys/util_internal.h
+++ b/include/zephyr/sys/util_internal.h
@@ -50,7 +50,7 @@
 #define Z_IS_ENABLED3(ignore_this, val, ...) val
 
 /* Implementation of IS_EQ(). Returns 1 if _0 and _1 are the same integer from
- * 0 to 4096, 0 otherwise.
+ * 0 to 4095, 0 otherwise.
  */
 #define Z_IS_EQ(_0, _1) Z_HAS_COMMA(Z_CAT4(Z_IS_, _0, _EQ_, _1)())
 
diff --git a/include/zephyr/sys/util_internal_is_eq.h b/include/zephyr/sys/util_internal_is_eq.h
index 11657c6acf6..0734cf3506a 100644
--- a/include/zephyr/sys/util_internal_is_eq.h
+++ b/include/zephyr/sys/util_internal_is_eq.h
@@ -13,16393 +13,4102 @@
 #ifndef ZEPHYR_INCLUDE_SYS_UTIL_INTERNAL_IS_EQ_H_
 #define ZEPHYR_INCLUDE_SYS_UTIL_INTERNAL_IS_EQ_H_
 
-#define Z_IS_0_EQ_0(...)   \,
-#define Z_IS_0U_EQ_0(...)  \,
-#define Z_IS_0_EQ_0U(...)  \,
-#define Z_IS_0U_EQ_0U(...) \,
-#define Z_IS_1_EQ_1(...)   \,
-#define Z_IS_1U_EQ_1(...)  \,
-#define Z_IS_1_EQ_1U(...)  \,
-#define Z_IS_1U_EQ_1U(...) \,
-#define Z_IS_2_EQ_2(...)   \,
-#define Z_IS_2U_EQ_2(...)  \,
-#define Z_IS_2_EQ_2U(...)  \,
-#define Z_IS_2U_EQ_2U(...) \,
-#define Z_IS_3_EQ_3(...)   \,
-#define Z_IS_3U_EQ_3(...)  \,
-#define Z_IS_3_EQ_3U(...)  \,
-#define Z_IS_3U_EQ_3U(...) \,
-#define Z_IS_4_EQ_4(...)   \,
-#define Z_IS_4U_EQ_4(...)  \,
-#define Z_IS_4_EQ_4U(...)  \,
-#define Z_IS_4U_EQ_4U(...) \,
-#define Z_IS_5_EQ_5(...)   \,
-#define Z_IS_5U_EQ_5(...)  \,
-#define Z_IS_5_EQ_5U(...)  \,
-#define Z_IS_5U_EQ_5U(...) \,
-#define Z_IS_6_EQ_6(...)   \,
-#define Z_IS_6U_EQ_6(...)  \,
-#define Z_IS_6_EQ_6U(...)  \,
-#define Z_IS_6U_EQ_6U(...) \,
-#define Z_IS_7_EQ_7(...)   \,
-#define Z_IS_7U_EQ_7(...)  \,
-#define Z_IS_7_EQ_7U(...)  \,
-#define Z_IS_7U_EQ_7U(...) \,
-#define Z_IS_8_EQ_8(...)   \,
-#define Z_IS_8U_EQ_8(...)  \,
-#define Z_IS_8_EQ_8U(...)  \,
-#define Z_IS_8U_EQ_8U(...) \,
-#define Z_IS_9_EQ_9(...)   \,
-#define Z_IS_9U_EQ_9(...)  \,
-#define Z_IS_9_EQ_9U(...)  \,
-#define Z_IS_9U_EQ_9U(...) \,
-#define Z_IS_10_EQ_10(...)   \,
-#define Z_IS_10U_EQ_10(...)  \,
-#define Z_IS_10_EQ_10U(...)  \,
-#define Z_IS_10U_EQ_10U(...) \,
-#define Z_IS_11_EQ_11(...)   \,
-#define Z_IS_11U_EQ_11(...)  \,
-#define Z_IS_11_EQ_11U(...)  \,
-#define Z_IS_11U_EQ_11U(...) \,
-#define Z_IS_12_EQ_12(...)   \,
-#define Z_IS_12U_EQ_12(...)  \,
-#define Z_IS_12_EQ_12U(...)  \,
-#define Z_IS_12U_EQ_12U(...) \,
-#define Z_IS_13_EQ_13(...)   \,
-#define Z_IS_13U_EQ_13(...)  \,
-#define Z_IS_13_EQ_13U(...)  \,
-#define Z_IS_13U_EQ_13U(...) \,
-#define Z_IS_14_EQ_14(...)   \,
-#define Z_IS_14U_EQ_14(...)  \,
-#define Z_IS_14_EQ_14U(...)  \,
-#define Z_IS_14U_EQ_14U(...) \,
-#define Z_IS_15_EQ_15(...)   \,
-#define Z_IS_15U_EQ_15(...)  \,
-#define Z_IS_15_EQ_15U(...)  \,
-#define Z_IS_15U_EQ_15U(...) \,
-#define Z_IS_16_EQ_16(...)   \,
-#define Z_IS_16U_EQ_16(...)  \,
-#define Z_IS_16_EQ_16U(...)  \,
-#define Z_IS_16U_EQ_16U(...) \,
-#define Z_IS_17_EQ_17(...)   \,
-#define Z_IS_17U_EQ_17(...)  \,
-#define Z_IS_17_EQ_17U(...)  \,
-#define Z_IS_17U_EQ_17U(...) \,
-#define Z_IS_18_EQ_18(...)   \,
-#define Z_IS_18U_EQ_18(...)  \,
-#define Z_IS_18_EQ_18U(...)  \,
-#define Z_IS_18U_EQ_18U(...) \,
-#define Z_IS_19_EQ_19(...)   \,
-#define Z_IS_19U_EQ_19(...)  \,
-#define Z_IS_19_EQ_19U(...)  \,
-#define Z_IS_19U_EQ_19U(...) \,
-#define Z_IS_20_EQ_20(...)   \,
-#define Z_IS_20U_EQ_20(...)  \,
-#define Z_IS_20_EQ_20U(...)  \,
-#define Z_IS_20U_EQ_20U(...) \,
-#define Z_IS_21_EQ_21(...)   \,
-#define Z_IS_21U_EQ_21(...)  \,
-#define Z_IS_21_EQ_21U(...)  \,
-#define Z_IS_21U_EQ_21U(...) \,
-#define Z_IS_22_EQ_22(...)   \,
-#define Z_IS_22U_EQ_22(...)  \,
-#define Z_IS_22_EQ_22U(...)  \,
-#define Z_IS_22U_EQ_22U(...) \,
-#define Z_IS_23_EQ_23(...)   \,
-#define Z_IS_23U_EQ_23(...)  \,
-#define Z_IS_23_EQ_23U(...)  \,
-#define Z_IS_23U_EQ_23U(...) \,
-#define Z_IS_24_EQ_24(...)   \,
-#define Z_IS_24U_EQ_24(...)  \,
-#define Z_IS_24_EQ_24U(...)  \,
-#define Z_IS_24U_EQ_24U(...) \,
-#define Z_IS_25_EQ_25(...)   \,
-#define Z_IS_25U_EQ_25(...)  \,
-#define Z_IS_25_EQ_25U(...)  \,
-#define Z_IS_25U_EQ_25U(...) \,
-#define Z_IS_26_EQ_26(...)   \,
-#define Z_IS_26U_EQ_26(...)  \,
-#define Z_IS_26_EQ_26U(...)  \,
-#define Z_IS_26U_EQ_26U(...) \,
-#define Z_IS_27_EQ_27(...)   \,
-#define Z_IS_27U_EQ_27(...)  \,
-#define Z_IS_27_EQ_27U(...)  \,
-#define Z_IS_27U_EQ_27U(...) \,
-#define Z_IS_28_EQ_28(...)   \,
-#define Z_IS_28U_EQ_28(...)  \,
-#define Z_IS_28_EQ_28U(...)  \,
-#define Z_IS_28U_EQ_28U(...) \,
-#define Z_IS_29_EQ_29(...)   \,
-#define Z_IS_29U_EQ_29(...)  \,
-#define Z_IS_29_EQ_29U(...)  \,
-#define Z_IS_29U_EQ_29U(...) \,
-#define Z_IS_30_EQ_30(...)   \,
-#define Z_IS_30U_EQ_30(...)  \,
-#define Z_IS_30_EQ_30U(...)  \,
-#define Z_IS_30U_EQ_30U(...) \,
-#define Z_IS_31_EQ_31(...)   \,
-#define Z_IS_31U_EQ_31(...)  \,
-#define Z_IS_31_EQ_31U(...)  \,
-#define Z_IS_31U_EQ_31U(...) \,
-#define Z_IS_32_EQ_32(...)   \,
-#define Z_IS_32U_EQ_32(...)  \,
-#define Z_IS_32_EQ_32U(...)  \,
-#define Z_IS_32U_EQ_32U(...) \,
-#define Z_IS_33_EQ_33(...)   \,
-#define Z_IS_33U_EQ_33(...)  \,
-#define Z_IS_33_EQ_33U(...)  \,
-#define Z_IS_33U_EQ_33U(...) \,
-#define Z_IS_34_EQ_34(...)   \,
-#define Z_IS_34U_EQ_34(...)  \,
-#define Z_IS_34_EQ_34U(...)  \,
-#define Z_IS_34U_EQ_34U(...) \,
-#define Z_IS_35_EQ_35(...)   \,
-#define Z_IS_35U_EQ_35(...)  \,
-#define Z_IS_35_EQ_35U(...)  \,
-#define Z_IS_35U_EQ_35U(...) \,
-#define Z_IS_36_EQ_36(...)   \,
-#define Z_IS_36U_EQ_36(...)  \,
-#define Z_IS_36_EQ_36U(...)  \,
-#define Z_IS_36U_EQ_36U(...) \,
-#define Z_IS_37_EQ_37(...)   \,
-#define Z_IS_37U_EQ_37(...)  \,
-#define Z_IS_37_EQ_37U(...)  \,
-#define Z_IS_37U_EQ_37U(...) \,
-#define Z_IS_38_EQ_38(...)   \,
-#define Z_IS_38U_EQ_38(...)  \,
-#define Z_IS_38_EQ_38U(...)  \,
-#define Z_IS_38U_EQ_38U(...) \,
-#define Z_IS_39_EQ_39(...)   \,
-#define Z_IS_39U_EQ_39(...)  \,
-#define Z_IS_39_EQ_39U(...)  \,
-#define Z_IS_39U_EQ_39U(...) \,
-#define Z_IS_40_EQ_40(...)   \,
-#define Z_IS_40U_EQ_40(...)  \,
-#define Z_IS_40_EQ_40U(...)  \,
-#define Z_IS_40U_EQ_40U(...) \,
-#define Z_IS_41_EQ_41(...)   \,
-#define Z_IS_41U_EQ_41(...)  \,
-#define Z_IS_41_EQ_41U(...)  \,
-#define Z_IS_41U_EQ_41U(...) \,
-#define Z_IS_42_EQ_42(...)   \,
-#define Z_IS_42U_EQ_42(...)  \,
-#define Z_IS_42_EQ_42U(...)  \,
-#define Z_IS_42U_EQ_42U(...) \,
-#define Z_IS_43_EQ_43(...)   \,
-#define Z_IS_43U_EQ_43(...)  \,
-#define Z_IS_43_EQ_43U(...)  \,
-#define Z_IS_43U_EQ_43U(...) \,
-#define Z_IS_44_EQ_44(...)   \,
-#define Z_IS_44U_EQ_44(...)  \,
-#define Z_IS_44_EQ_44U(...)  \,
-#define Z_IS_44U_EQ_44U(...) \,
-#define Z_IS_45_EQ_45(...)   \,
-#define Z_IS_45U_EQ_45(...)  \,
-#define Z_IS_45_EQ_45U(...)  \,
-#define Z_IS_45U_EQ_45U(...) \,
-#define Z_IS_46_EQ_46(...)   \,
-#define Z_IS_46U_EQ_46(...)  \,
-#define Z_IS_46_EQ_46U(...)  \,
-#define Z_IS_46U_EQ_46U(...) \,
-#define Z_IS_47_EQ_47(...)   \,
-#define Z_IS_47U_EQ_47(...)  \,
-#define Z_IS_47_EQ_47U(...)  \,
-#define Z_IS_47U_EQ_47U(...) \,
-#define Z_IS_48_EQ_48(...)   \,
-#define Z_IS_48U_EQ_48(...)  \,
-#define Z_IS_48_EQ_48U(...)  \,
-#define Z_IS_48U_EQ_48U(...) \,
-#define Z_IS_49_EQ_49(...)   \,
-#define Z_IS_49U_EQ_49(...)  \,
-#define Z_IS_49_EQ_49U(...)  \,
-#define Z_IS_49U_EQ_49U(...) \,
-#define Z_IS_50_EQ_50(...)   \,
-#define Z_IS_50U_EQ_50(...)  \,
-#define Z_IS_50_EQ_50U(...)  \,
-#define Z_IS_50U_EQ_50U(...) \,
-#define Z_IS_51_EQ_51(...)   \,
-#define Z_IS_51U_EQ_51(...)  \,
-#define Z_IS_51_EQ_51U(...)  \,
-#define Z_IS_51U_EQ_51U(...) \,
-#define Z_IS_52_EQ_52(...)   \,
-#define Z_IS_52U_EQ_52(...)  \,
-#define Z_IS_52_EQ_52U(...)  \,
-#define Z_IS_52U_EQ_52U(...) \,
-#define Z_IS_53_EQ_53(...)   \,
-#define Z_IS_53U_EQ_53(...)  \,
-#define Z_IS_53_EQ_53U(...)  \,
-#define Z_IS_53U_EQ_53U(...) \,
-#define Z_IS_54_EQ_54(...)   \,
-#define Z_IS_54U_EQ_54(...)  \,
-#define Z_IS_54_EQ_54U(...)  \,
-#define Z_IS_54U_EQ_54U(...) \,
-#define Z_IS_55_EQ_55(...)   \,
-#define Z_IS_55U_EQ_55(...)  \,
-#define Z_IS_55_EQ_55U(...)  \,
-#define Z_IS_55U_EQ_55U(...) \,
-#define Z_IS_56_EQ_56(...)   \,
-#define Z_IS_56U_EQ_56(...)  \,
-#define Z_IS_56_EQ_56U(...)  \,
-#define Z_IS_56U_EQ_56U(...) \,
-#define Z_IS_57_EQ_57(...)   \,
-#define Z_IS_57U_EQ_57(...)  \,
-#define Z_IS_57_EQ_57U(...)  \,
-#define Z_IS_57U_EQ_57U(...) \,
-#define Z_IS_58_EQ_58(...)   \,
-#define Z_IS_58U_EQ_58(...)  \,
-#define Z_IS_58_EQ_58U(...)  \,
-#define Z_IS_58U_EQ_58U(...) \,
-#define Z_IS_59_EQ_59(...)   \,
-#define Z_IS_59U_EQ_59(...)  \,
-#define Z_IS_59_EQ_59U(...)  \,
-#define Z_IS_59U_EQ_59U(...) \,
-#define Z_IS_60_EQ_60(...)   \,
-#define Z_IS_60U_EQ_60(...)  \,
-#define Z_IS_60_EQ_60U(...)  \,
-#define Z_IS_60U_EQ_60U(...) \,
-#define Z_IS_61_EQ_61(...)   \,
-#define Z_IS_61U_EQ_61(...)  \,
-#define Z_IS_61_EQ_61U(...)  \,
-#define Z_IS_61U_EQ_61U(...) \,
-#define Z_IS_62_EQ_62(...)   \,
-#define Z_IS_62U_EQ_62(...)  \,
-#define Z_IS_62_EQ_62U(...)  \,
-#define Z_IS_62U_EQ_62U(...) \,
-#define Z_IS_63_EQ_63(...)   \,
-#define Z_IS_63U_EQ_63(...)  \,
-#define Z_IS_63_EQ_63U(...)  \,
-#define Z_IS_63U_EQ_63U(...) \,
-#define Z_IS_64_EQ_64(...)   \,
-#define Z_IS_64U_EQ_64(...)  \,
-#define Z_IS_64_EQ_64U(...)  \,
-#define Z_IS_64U_EQ_64U(...) \,
-#define Z_IS_65_EQ_65(...)   \,
-#define Z_IS_65U_EQ_65(...)  \,
-#define Z_IS_65_EQ_65U(...)  \,
-#define Z_IS_65U_EQ_65U(...) \,
-#define Z_IS_66_EQ_66(...)   \,
-#define Z_IS_66U_EQ_66(...)  \,
-#define Z_IS_66_EQ_66U(...)  \,
-#define Z_IS_66U_EQ_66U(...) \,
-#define Z_IS_67_EQ_67(...)   \,
-#define Z_IS_67U_EQ_67(...)  \,
-#define Z_IS_67_EQ_67U(...)  \,
-#define Z_IS_67U_EQ_67U(...) \,
-#define Z_IS_68_EQ_68(...)   \,
-#define Z_IS_68U_EQ_68(...)  \,
-#define Z_IS_68_EQ_68U(...)  \,
-#define Z_IS_68U_EQ_68U(...) \,
-#define Z_IS_69_EQ_69(...)   \,
-#define Z_IS_69U_EQ_69(...)  \,
-#define Z_IS_69_EQ_69U(...)  \,
-#define Z_IS_69U_EQ_69U(...) \,
-#define Z_IS_70_EQ_70(...)   \,
-#define Z_IS_70U_EQ_70(...)  \,
-#define Z_IS_70_EQ_70U(...)  \,
-#define Z_IS_70U_EQ_70U(...) \,
-#define Z_IS_71_EQ_71(...)   \,
-#define Z_IS_71U_EQ_71(...)  \,
-#define Z_IS_71_EQ_71U(...)  \,
-#define Z_IS_71U_EQ_71U(...) \,
-#define Z_IS_72_EQ_72(...)   \,
-#define Z_IS_72U_EQ_72(...)  \,
-#define Z_IS_72_EQ_72U(...)  \,
-#define Z_IS_72U_EQ_72U(...) \,
-#define Z_IS_73_EQ_73(...)   \,
-#define Z_IS_73U_EQ_73(...)  \,
-#define Z_IS_73_EQ_73U(...)  \,
-#define Z_IS_73U_EQ_73U(...) \,
-#define Z_IS_74_EQ_74(...)   \,
-#define Z_IS_74U_EQ_74(...)  \,
-#define Z_IS_74_EQ_74U(...)  \,
-#define Z_IS_74U_EQ_74U(...) \,
-#define Z_IS_75_EQ_75(...)   \,
-#define Z_IS_75U_EQ_75(...)  \,
-#define Z_IS_75_EQ_75U(...)  \,
-#define Z_IS_75U_EQ_75U(...) \,
-#define Z_IS_76_EQ_76(...)   \,
-#define Z_IS_76U_EQ_76(...)  \,
-#define Z_IS_76_EQ_76U(...)  \,
-#define Z_IS_76U_EQ_76U(...) \,
-#define Z_IS_77_EQ_77(...)   \,
-#define Z_IS_77U_EQ_77(...)  \,
-#define Z_IS_77_EQ_77U(...)  \,
-#define Z_IS_77U_EQ_77U(...) \,
-#define Z_IS_78_EQ_78(...)   \,
-#define Z_IS_78U_EQ_78(...)  \,
-#define Z_IS_78_EQ_78U(...)  \,
-#define Z_IS_78U_EQ_78U(...) \,
-#define Z_IS_79_EQ_79(...)   \,
-#define Z_IS_79U_EQ_79(...)  \,
-#define Z_IS_79_EQ_79U(...)  \,
-#define Z_IS_79U_EQ_79U(...) \,
-#define Z_IS_80_EQ_80(...)   \,
-#define Z_IS_80U_EQ_80(...)  \,
-#define Z_IS_80_EQ_80U(...)  \,
-#define Z_IS_80U_EQ_80U(...) \,
-#define Z_IS_81_EQ_81(...)   \,
-#define Z_IS_81U_EQ_81(...)  \,
-#define Z_IS_81_EQ_81U(...)  \,
-#define Z_IS_81U_EQ_81U(...) \,
-#define Z_IS_82_EQ_82(...)   \,
-#define Z_IS_82U_EQ_82(...)  \,
-#define Z_IS_82_EQ_82U(...)  \,
-#define Z_IS_82U_EQ_82U(...) \,
-#define Z_IS_83_EQ_83(...)   \,
-#define Z_IS_83U_EQ_83(...)  \,
-#define Z_IS_83_EQ_83U(...)  \,
-#define Z_IS_83U_EQ_83U(...) \,
-#define Z_IS_84_EQ_84(...)   \,
-#define Z_IS_84U_EQ_84(...)  \,
-#define Z_IS_84_EQ_84U(...)  \,
-#define Z_IS_84U_EQ_84U(...) \,
-#define Z_IS_85_EQ_85(...)   \,
-#define Z_IS_85U_EQ_85(...)  \,
-#define Z_IS_85_EQ_85U(...)  \,
-#define Z_IS_85U_EQ_85U(...) \,
-#define Z_IS_86_EQ_86(...)   \,
-#define Z_IS_86U_EQ_86(...)  \,
-#define Z_IS_86_EQ_86U(...)  \,
-#define Z_IS_86U_EQ_86U(...) \,
-#define Z_IS_87_EQ_87(...)   \,
-#define Z_IS_87U_EQ_87(...)  \,
-#define Z_IS_87_EQ_87U(...)  \,
-#define Z_IS_87U_EQ_87U(...) \,
-#define Z_IS_88_EQ_88(...)   \,
-#define Z_IS_88U_EQ_88(...)  \,
-#define Z_IS_88_EQ_88U(...)  \,
-#define Z_IS_88U_EQ_88U(...) \,
-#define Z_IS_89_EQ_89(...)   \,
-#define Z_IS_89U_EQ_89(...)  \,
-#define Z_IS_89_EQ_89U(...)  \,
-#define Z_IS_89U_EQ_89U(...) \,
-#define Z_IS_90_EQ_90(...)   \,
-#define Z_IS_90U_EQ_90(...)  \,
-#define Z_IS_90_EQ_90U(...)  \,
-#define Z_IS_90U_EQ_90U(...) \,
-#define Z_IS_91_EQ_91(...)   \,
-#define Z_IS_91U_EQ_91(...)  \,
-#define Z_IS_91_EQ_91U(...)  \,
-#define Z_IS_91U_EQ_91U(...) \,
-#define Z_IS_92_EQ_92(...)   \,
-#define Z_IS_92U_EQ_92(...)  \,
-#define Z_IS_92_EQ_92U(...)  \,
-#define Z_IS_92U_EQ_92U(...) \,
-#define Z_IS_93_EQ_93(...)   \,
-#define Z_IS_93U_EQ_93(...)  \,
-#define Z_IS_93_EQ_93U(...)  \,
-#define Z_IS_93U_EQ_93U(...) \,
-#define Z_IS_94_EQ_94(...)   \,
-#define Z_IS_94U_EQ_94(...)  \,
-#define Z_IS_94_EQ_94U(...)  \,
-#define Z_IS_94U_EQ_94U(...) \,
-#define Z_IS_95_EQ_95(...)   \,
-#define Z_IS_95U_EQ_95(...)  \,
-#define Z_IS_95_EQ_95U(...)  \,
-#define Z_IS_95U_EQ_95U(...) \,
-#define Z_IS_96_EQ_96(...)   \,
-#define Z_IS_96U_EQ_96(...)  \,
-#define Z_IS_96_EQ_96U(...)  \,
-#define Z_IS_96U_EQ_96U(...) \,
-#define Z_IS_97_EQ_97(...)   \,
-#define Z_IS_97U_EQ_97(...)  \,
-#define Z_IS_97_EQ_97U(...)  \,
-#define Z_IS_97U_EQ_97U(...) \,
-#define Z_IS_98_EQ_98(...)   \,
-#define Z_IS_98U_EQ_98(...)  \,
-#define Z_IS_98_EQ_98U(...)  \,
-#define Z_IS_98U_EQ_98U(...) \,
-#define Z_IS_99_EQ_99(...)   \,
-#define Z_IS_99U_EQ_99(...)  \,
-#define Z_IS_99_EQ_99U(...)  \,
-#define Z_IS_99U_EQ_99U(...) \,
-#define Z_IS_100_EQ_100(...)   \,
-#define Z_IS_100U_EQ_100(...)  \,
-#define Z_IS_100_EQ_100U(...)  \,
-#define Z_IS_100U_EQ_100U(...) \,
-#define Z_IS_101_EQ_101(...)   \,
-#define Z_IS_101U_EQ_101(...)  \,
-#define Z_IS_101_EQ_101U(...)  \,
-#define Z_IS_101U_EQ_101U(...) \,
-#define Z_IS_102_EQ_102(...)   \,
-#define Z_IS_102U_EQ_102(...)  \,
-#define Z_IS_102_EQ_102U(...)  \,
-#define Z_IS_102U_EQ_102U(...) \,
-#define Z_IS_103_EQ_103(...)   \,
-#define Z_IS_103U_EQ_103(...)  \,
-#define Z_IS_103_EQ_103U(...)  \,
-#define Z_IS_103U_EQ_103U(...) \,
-#define Z_IS_104_EQ_104(...)   \,
-#define Z_IS_104U_EQ_104(...)  \,
-#define Z_IS_104_EQ_104U(...)  \,
-#define Z_IS_104U_EQ_104U(...) \,
-#define Z_IS_105_EQ_105(...)   \,
-#define Z_IS_105U_EQ_105(...)  \,
-#define Z_IS_105_EQ_105U(...)  \,
-#define Z_IS_105U_EQ_105U(...) \,
-#define Z_IS_106_EQ_106(...)   \,
-#define Z_IS_106U_EQ_106(...)  \,
-#define Z_IS_106_EQ_106U(...)  \,
-#define Z_IS_106U_EQ_106U(...) \,
-#define Z_IS_107_EQ_107(...)   \,
-#define Z_IS_107U_EQ_107(...)  \,
-#define Z_IS_107_EQ_107U(...)  \,
-#define Z_IS_107U_EQ_107U(...) \,
-#define Z_IS_108_EQ_108(...)   \,
-#define Z_IS_108U_EQ_108(...)  \,
-#define Z_IS_108_EQ_108U(...)  \,
-#define Z_IS_108U_EQ_108U(...) \,
-#define Z_IS_109_EQ_109(...)   \,
-#define Z_IS_109U_EQ_109(...)  \,
-#define Z_IS_109_EQ_109U(...)  \,
-#define Z_IS_109U_EQ_109U(...) \,
-#define Z_IS_110_EQ_110(...)   \,
-#define Z_IS_110U_EQ_110(...)  \,
-#define Z_IS_110_EQ_110U(...)  \,
-#define Z_IS_110U_EQ_110U(...) \,
-#define Z_IS_111_EQ_111(...)   \,
-#define Z_IS_111U_EQ_111(...)  \,
-#define Z_IS_111_EQ_111U(...)  \,
-#define Z_IS_111U_EQ_111U(...) \,
-#define Z_IS_112_EQ_112(...)   \,
-#define Z_IS_112U_EQ_112(...)  \,
-#define Z_IS_112_EQ_112U(...)  \,
-#define Z_IS_112U_EQ_112U(...) \,
-#define Z_IS_113_EQ_113(...)   \,
-#define Z_IS_113U_EQ_113(...)  \,
-#define Z_IS_113_EQ_113U(...)  \,
-#define Z_IS_113U_EQ_113U(...) \,
-#define Z_IS_114_EQ_114(...)   \,
-#define Z_IS_114U_EQ_114(...)  \,
-#define Z_IS_114_EQ_114U(...)  \,
-#define Z_IS_114U_EQ_114U(...) \,
-#define Z_IS_115_EQ_115(...)   \,
-#define Z_IS_115U_EQ_115(...)  \,
-#define Z_IS_115_EQ_115U(...)  \,
-#define Z_IS_115U_EQ_115U(...) \,
-#define Z_IS_116_EQ_116(...)   \,
-#define Z_IS_116U_EQ_116(...)  \,
-#define Z_IS_116_EQ_116U(...)  \,
-#define Z_IS_116U_EQ_116U(...) \,
-#define Z_IS_117_EQ_117(...)   \,
-#define Z_IS_117U_EQ_117(...)  \,
-#define Z_IS_117_EQ_117U(...)  \,
-#define Z_IS_117U_EQ_117U(...) \,
-#define Z_IS_118_EQ_118(...)   \,
-#define Z_IS_118U_EQ_118(...)  \,
-#define Z_IS_118_EQ_118U(...)  \,
-#define Z_IS_118U_EQ_118U(...) \,
-#define Z_IS_119_EQ_119(...)   \,
-#define Z_IS_119U_EQ_119(...)  \,
-#define Z_IS_119_EQ_119U(...)  \,
-#define Z_IS_119U_EQ_119U(...) \,
-#define Z_IS_120_EQ_120(...)   \,
-#define Z_IS_120U_EQ_120(...)  \,
-#define Z_IS_120_EQ_120U(...)  \,
-#define Z_IS_120U_EQ_120U(...) \,
-#define Z_IS_121_EQ_121(...)   \,
-#define Z_IS_121U_EQ_121(...)  \,
-#define Z_IS_121_EQ_121U(...)  \,
-#define Z_IS_121U_EQ_121U(...) \,
-#define Z_IS_122_EQ_122(...)   \,
-#define Z_IS_122U_EQ_122(...)  \,
-#define Z_IS_122_EQ_122U(...)  \,
-#define Z_IS_122U_EQ_122U(...) \,
-#define Z_IS_123_EQ_123(...)   \,
-#define Z_IS_123U_EQ_123(...)  \,
-#define Z_IS_123_EQ_123U(...)  \,
-#define Z_IS_123U_EQ_123U(...) \,
-#define Z_IS_124_EQ_124(...)   \,
-#define Z_IS_124U_EQ_124(...)  \,
-#define Z_IS_124_EQ_124U(...)  \,
-#define Z_IS_124U_EQ_124U(...) \,
-#define Z_IS_125_EQ_125(...)   \,
-#define Z_IS_125U_EQ_125(...)  \,
-#define Z_IS_125_EQ_125U(...)  \,
-#define Z_IS_125U_EQ_125U(...) \,
-#define Z_IS_126_EQ_126(...)   \,
-#define Z_IS_126U_EQ_126(...)  \,
-#define Z_IS_126_EQ_126U(...)  \,
-#define Z_IS_126U_EQ_126U(...) \,
-#define Z_IS_127_EQ_127(...)   \,
-#define Z_IS_127U_EQ_127(...)  \,
-#define Z_IS_127_EQ_127U(...)  \,
-#define Z_IS_127U_EQ_127U(...) \,
-#define Z_IS_128_EQ_128(...)   \,
-#define Z_IS_128U_EQ_128(...)  \,
-#define Z_IS_128_EQ_128U(...)  \,
-#define Z_IS_128U_EQ_128U(...) \,
-#define Z_IS_129_EQ_129(...)   \,
-#define Z_IS_129U_EQ_129(...)  \,
-#define Z_IS_129_EQ_129U(...)  \,
-#define Z_IS_129U_EQ_129U(...) \,
-#define Z_IS_130_EQ_130(...)   \,
-#define Z_IS_130U_EQ_130(...)  \,
-#define Z_IS_130_EQ_130U(...)  \,
-#define Z_IS_130U_EQ_130U(...) \,
-#define Z_IS_131_EQ_131(...)   \,
-#define Z_IS_131U_EQ_131(...)  \,
-#define Z_IS_131_EQ_131U(...)  \,
-#define Z_IS_131U_EQ_131U(...) \,
-#define Z_IS_132_EQ_132(...)   \,
-#define Z_IS_132U_EQ_132(...)  \,
-#define Z_IS_132_EQ_132U(...)  \,
-#define Z_IS_132U_EQ_132U(...) \,
-#define Z_IS_133_EQ_133(...)   \,
-#define Z_IS_133U_EQ_133(...)  \,
-#define Z_IS_133_EQ_133U(...)  \,
-#define Z_IS_133U_EQ_133U(...) \,
-#define Z_IS_134_EQ_134(...)   \,
-#define Z_IS_134U_EQ_134(...)  \,
-#define Z_IS_134_EQ_134U(...)  \,
-#define Z_IS_134U_EQ_134U(...) \,
-#define Z_IS_135_EQ_135(...)   \,
-#define Z_IS_135U_EQ_135(...)  \,
-#define Z_IS_135_EQ_135U(...)  \,
-#define Z_IS_135U_EQ_135U(...) \,
-#define Z_IS_136_EQ_136(...)   \,
-#define Z_IS_136U_EQ_136(...)  \,
-#define Z_IS_136_EQ_136U(...)  \,
-#define Z_IS_136U_EQ_136U(...) \,
-#define Z_IS_137_EQ_137(...)   \,
-#define Z_IS_137U_EQ_137(...)  \,
-#define Z_IS_137_EQ_137U(...)  \,
-#define Z_IS_137U_EQ_137U(...) \,
-#define Z_IS_138_EQ_138(...)   \,
-#define Z_IS_138U_EQ_138(...)  \,
-#define Z_IS_138_EQ_138U(...)  \,
-#define Z_IS_138U_EQ_138U(...) \,
-#define Z_IS_139_EQ_139(...)   \,
-#define Z_IS_139U_EQ_139(...)  \,
-#define Z_IS_139_EQ_139U(...)  \,
-#define Z_IS_139U_EQ_139U(...) \,
-#define Z_IS_140_EQ_140(...)   \,
-#define Z_IS_140U_EQ_140(...)  \,
-#define Z_IS_140_EQ_140U(...)  \,
-#define Z_IS_140U_EQ_140U(...) \,
-#define Z_IS_141_EQ_141(...)   \,
-#define Z_IS_141U_EQ_141(...)  \,
-#define Z_IS_141_EQ_141U(...)  \,
-#define Z_IS_141U_EQ_141U(...) \,
-#define Z_IS_142_EQ_142(...)   \,
-#define Z_IS_142U_EQ_142(...)  \,
-#define Z_IS_142_EQ_142U(...)  \,
-#define Z_IS_142U_EQ_142U(...) \,
-#define Z_IS_143_EQ_143(...)   \,
-#define Z_IS_143U_EQ_143(...)  \,
-#define Z_IS_143_EQ_143U(...)  \,
-#define Z_IS_143U_EQ_143U(...) \,
-#define Z_IS_144_EQ_144(...)   \,
-#define Z_IS_144U_EQ_144(...)  \,
-#define Z_IS_144_EQ_144U(...)  \,
-#define Z_IS_144U_EQ_144U(...) \,
-#define Z_IS_145_EQ_145(...)   \,
-#define Z_IS_145U_EQ_145(...)  \,
-#define Z_IS_145_EQ_145U(...)  \,
-#define Z_IS_145U_EQ_145U(...) \,
-#define Z_IS_146_EQ_146(...)   \,
-#define Z_IS_146U_EQ_146(...)  \,
-#define Z_IS_146_EQ_146U(...)  \,
-#define Z_IS_146U_EQ_146U(...) \,
-#define Z_IS_147_EQ_147(...)   \,
-#define Z_IS_147U_EQ_147(...)  \,
-#define Z_IS_147_EQ_147U(...)  \,
-#define Z_IS_147U_EQ_147U(...) \,
-#define Z_IS_148_EQ_148(...)   \,
-#define Z_IS_148U_EQ_148(...)  \,
-#define Z_IS_148_EQ_148U(...)  \,
-#define Z_IS_148U_EQ_148U(...) \,
-#define Z_IS_149_EQ_149(...)   \,
-#define Z_IS_149U_EQ_149(...)  \,
-#define Z_IS_149_EQ_149U(...)  \,
-#define Z_IS_149U_EQ_149U(...) \,
-#define Z_IS_150_EQ_150(...)   \,
-#define Z_IS_150U_EQ_150(...)  \,
-#define Z_IS_150_EQ_150U(...)  \,
-#define Z_IS_150U_EQ_150U(...) \,
-#define Z_IS_151_EQ_151(...)   \,
-#define Z_IS_151U_EQ_151(...)  \,
-#define Z_IS_151_EQ_151U(...)  \,
-#define Z_IS_151U_EQ_151U(...) \,
-#define Z_IS_152_EQ_152(...)   \,
-#define Z_IS_152U_EQ_152(...)  \,
-#define Z_IS_152_EQ_152U(...)  \,
-#define Z_IS_152U_EQ_152U(...) \,
-#define Z_IS_153_EQ_153(...)   \,
-#define Z_IS_153U_EQ_153(...)  \,
-#define Z_IS_153_EQ_153U(...)  \,
-#define Z_IS_153U_EQ_153U(...) \,
-#define Z_IS_154_EQ_154(...)   \,
-#define Z_IS_154U_EQ_154(...)  \,
-#define Z_IS_154_EQ_154U(...)  \,
-#define Z_IS_154U_EQ_154U(...) \,
-#define Z_IS_155_EQ_155(...)   \,
-#define Z_IS_155U_EQ_155(...)  \,
-#define Z_IS_155_EQ_155U(...)  \,
-#define Z_IS_155U_EQ_155U(...) \,
-#define Z_IS_156_EQ_156(...)   \,
-#define Z_IS_156U_EQ_156(...)  \,
-#define Z_IS_156_EQ_156U(...)  \,
-#define Z_IS_156U_EQ_156U(...) \,
-#define Z_IS_157_EQ_157(...)   \,
-#define Z_IS_157U_EQ_157(...)  \,
-#define Z_IS_157_EQ_157U(...)  \,
-#define Z_IS_157U_EQ_157U(...) \,
-#define Z_IS_158_EQ_158(...)   \,
-#define Z_IS_158U_EQ_158(...)  \,
-#define Z_IS_158_EQ_158U(...)  \,
-#define Z_IS_158U_EQ_158U(...) \,
-#define Z_IS_159_EQ_159(...)   \,
-#define Z_IS_159U_EQ_159(...)  \,
-#define Z_IS_159_EQ_159U(...)  \,
-#define Z_IS_159U_EQ_159U(...) \,
-#define Z_IS_160_EQ_160(...)   \,
-#define Z_IS_160U_EQ_160(...)  \,
-#define Z_IS_160_EQ_160U(...)  \,
-#define Z_IS_160U_EQ_160U(...) \,
-#define Z_IS_161_EQ_161(...)   \,
-#define Z_IS_161U_EQ_161(...)  \,
-#define Z_IS_161_EQ_161U(...)  \,
-#define Z_IS_161U_EQ_161U(...) \,
-#define Z_IS_162_EQ_162(...)   \,
-#define Z_IS_162U_EQ_162(...)  \,
-#define Z_IS_162_EQ_162U(...)  \,
-#define Z_IS_162U_EQ_162U(...) \,
-#define Z_IS_163_EQ_163(...)   \,
-#define Z_IS_163U_EQ_163(...)  \,
-#define Z_IS_163_EQ_163U(...)  \,
-#define Z_IS_163U_EQ_163U(...) \,
-#define Z_IS_164_EQ_164(...)   \,
-#define Z_IS_164U_EQ_164(...)  \,
-#define Z_IS_164_EQ_164U(...)  \,
-#define Z_IS_164U_EQ_164U(...) \,
-#define Z_IS_165_EQ_165(...)   \,
-#define Z_IS_165U_EQ_165(...)  \,
-#define Z_IS_165_EQ_165U(...)  \,
-#define Z_IS_165U_EQ_165U(...) \,
-#define Z_IS_166_EQ_166(...)   \,
-#define Z_IS_166U_EQ_166(...)  \,
-#define Z_IS_166_EQ_166U(...)  \,
-#define Z_IS_166U_EQ_166U(...) \,
-#define Z_IS_167_EQ_167(...)   \,
-#define Z_IS_167U_EQ_167(...)  \,
-#define Z_IS_167_EQ_167U(...)  \,
-#define Z_IS_167U_EQ_167U(...) \,
-#define Z_IS_168_EQ_168(...)   \,
-#define Z_IS_168U_EQ_168(...)  \,
-#define Z_IS_168_EQ_168U(...)  \,
-#define Z_IS_168U_EQ_168U(...) \,
-#define Z_IS_169_EQ_169(...)   \,
-#define Z_IS_169U_EQ_169(...)  \,
-#define Z_IS_169_EQ_169U(...)  \,
-#define Z_IS_169U_EQ_169U(...) \,
-#define Z_IS_170_EQ_170(...)   \,
-#define Z_IS_170U_EQ_170(...)  \,
-#define Z_IS_170_EQ_170U(...)  \,
-#define Z_IS_170U_EQ_170U(...) \,
-#define Z_IS_171_EQ_171(...)   \,
-#define Z_IS_171U_EQ_171(...)  \,
-#define Z_IS_171_EQ_171U(...)  \,
-#define Z_IS_171U_EQ_171U(...) \,
-#define Z_IS_172_EQ_172(...)   \,
-#define Z_IS_172U_EQ_172(...)  \,
-#define Z_IS_172_EQ_172U(...)  \,
-#define Z_IS_172U_EQ_172U(...) \,
-#define Z_IS_173_EQ_173(...)   \,
-#define Z_IS_173U_EQ_173(...)  \,
-#define Z_IS_173_EQ_173U(...)  \,
-#define Z_IS_173U_EQ_173U(...) \,
-#define Z_IS_174_EQ_174(...)   \,
-#define Z_IS_174U_EQ_174(...)  \,
-#define Z_IS_174_EQ_174U(...)  \,
-#define Z_IS_174U_EQ_174U(...) \,
-#define Z_IS_175_EQ_175(...)   \,
-#define Z_IS_175U_EQ_175(...)  \,
-#define Z_IS_175_EQ_175U(...)  \,
-#define Z_IS_175U_EQ_175U(...) \,
-#define Z_IS_176_EQ_176(...)   \,
-#define Z_IS_176U_EQ_176(...)  \,
-#define Z_IS_176_EQ_176U(...)  \,
-#define Z_IS_176U_EQ_176U(...) \,
-#define Z_IS_177_EQ_177(...)   \,
-#define Z_IS_177U_EQ_177(...)  \,
-#define Z_IS_177_EQ_177U(...)  \,
-#define Z_IS_177U_EQ_177U(...) \,
-#define Z_IS_178_EQ_178(...)   \,
-#define Z_IS_178U_EQ_178(...)  \,
-#define Z_IS_178_EQ_178U(...)  \,
-#define Z_IS_178U_EQ_178U(...) \,
-#define Z_IS_179_EQ_179(...)   \,
-#define Z_IS_179U_EQ_179(...)  \,
-#define Z_IS_179_EQ_179U(...)  \,
-#define Z_IS_179U_EQ_179U(...) \,
-#define Z_IS_180_EQ_180(...)   \,
-#define Z_IS_180U_EQ_180(...)  \,
-#define Z_IS_180_EQ_180U(...)  \,
-#define Z_IS_180U_EQ_180U(...) \,
-#define Z_IS_181_EQ_181(...)   \,
-#define Z_IS_181U_EQ_181(...)  \,
-#define Z_IS_181_EQ_181U(...)  \,
-#define Z_IS_181U_EQ_181U(...) \,
-#define Z_IS_182_EQ_182(...)   \,
-#define Z_IS_182U_EQ_182(...)  \,
-#define Z_IS_182_EQ_182U(...)  \,
-#define Z_IS_182U_EQ_182U(...) \,
-#define Z_IS_183_EQ_183(...)   \,
-#define Z_IS_183U_EQ_183(...)  \,
-#define Z_IS_183_EQ_183U(...)  \,
-#define Z_IS_183U_EQ_183U(...) \,
-#define Z_IS_184_EQ_184(...)   \,
-#define Z_IS_184U_EQ_184(...)  \,
-#define Z_IS_184_EQ_184U(...)  \,
-#define Z_IS_184U_EQ_184U(...) \,
-#define Z_IS_185_EQ_185(...)   \,
-#define Z_IS_185U_EQ_185(...)  \,
-#define Z_IS_185_EQ_185U(...)  \,
-#define Z_IS_185U_EQ_185U(...) \,
-#define Z_IS_186_EQ_186(...)   \,
-#define Z_IS_186U_EQ_186(...)  \,
-#define Z_IS_186_EQ_186U(...)  \,
-#define Z_IS_186U_EQ_186U(...) \,
-#define Z_IS_187_EQ_187(...)   \,
-#define Z_IS_187U_EQ_187(...)  \,
-#define Z_IS_187_EQ_187U(...)  \,
-#define Z_IS_187U_EQ_187U(...) \,
-#define Z_IS_188_EQ_188(...)   \,
-#define Z_IS_188U_EQ_188(...)  \,
-#define Z_IS_188_EQ_188U(...)  \,
-#define Z_IS_188U_EQ_188U(...) \,
-#define Z_IS_189_EQ_189(...)   \,
-#define Z_IS_189U_EQ_189(...)  \,
-#define Z_IS_189_EQ_189U(...)  \,
-#define Z_IS_189U_EQ_189U(...) \,
-#define Z_IS_190_EQ_190(...)   \,
-#define Z_IS_190U_EQ_190(...)  \,
-#define Z_IS_190_EQ_190U(...)  \,
-#define Z_IS_190U_EQ_190U(...) \,
-#define Z_IS_191_EQ_191(...)   \,
-#define Z_IS_191U_EQ_191(...)  \,
-#define Z_IS_191_EQ_191U(...)  \,
-#define Z_IS_191U_EQ_191U(...) \,
-#define Z_IS_192_EQ_192(...)   \,
-#define Z_IS_192U_EQ_192(...)  \,
-#define Z_IS_192_EQ_192U(...)  \,
-#define Z_IS_192U_EQ_192U(...) \,
-#define Z_IS_193_EQ_193(...)   \,
-#define Z_IS_193U_EQ_193(...)  \,
-#define Z_IS_193_EQ_193U(...)  \,
-#define Z_IS_193U_EQ_193U(...) \,
-#define Z_IS_194_EQ_194(...)   \,
-#define Z_IS_194U_EQ_194(...)  \,
-#define Z_IS_194_EQ_194U(...)  \,
-#define Z_IS_194U_EQ_194U(...) \,
-#define Z_IS_195_EQ_195(...)   \,
-#define Z_IS_195U_EQ_195(...)  \,
-#define Z_IS_195_EQ_195U(...)  \,
-#define Z_IS_195U_EQ_195U(...) \,
-#define Z_IS_196_EQ_196(...)   \,
-#define Z_IS_196U_EQ_196(...)  \,
-#define Z_IS_196_EQ_196U(...)  \,
-#define Z_IS_196U_EQ_196U(...) \,
-#define Z_IS_197_EQ_197(...)   \,
-#define Z_IS_197U_EQ_197(...)  \,
-#define Z_IS_197_EQ_197U(...)  \,
-#define Z_IS_197U_EQ_197U(...) \,
-#define Z_IS_198_EQ_198(...)   \,
-#define Z_IS_198U_EQ_198(...)  \,
-#define Z_IS_198_EQ_198U(...)  \,
-#define Z_IS_198U_EQ_198U(...) \,
-#define Z_IS_199_EQ_199(...)   \,
-#define Z_IS_199U_EQ_199(...)  \,
-#define Z_IS_199_EQ_199U(...)  \,
-#define Z_IS_199U_EQ_199U(...) \,
-#define Z_IS_200_EQ_200(...)   \,
-#define Z_IS_200U_EQ_200(...)  \,
-#define Z_IS_200_EQ_200U(...)  \,
-#define Z_IS_200U_EQ_200U(...) \,
-#define Z_IS_201_EQ_201(...)   \,
-#define Z_IS_201U_EQ_201(...)  \,
-#define Z_IS_201_EQ_201U(...)  \,
-#define Z_IS_201U_EQ_201U(...) \,
-#define Z_IS_202_EQ_202(...)   \,
-#define Z_IS_202U_EQ_202(...)  \,
-#define Z_IS_202_EQ_202U(...)  \,
-#define Z_IS_202U_EQ_202U(...) \,
-#define Z_IS_203_EQ_203(...)   \,
-#define Z_IS_203U_EQ_203(...)  \,
-#define Z_IS_203_EQ_203U(...)  \,
-#define Z_IS_203U_EQ_203U(...) \,
-#define Z_IS_204_EQ_204(...)   \,
-#define Z_IS_204U_EQ_204(...)  \,
-#define Z_IS_204_EQ_204U(...)  \,
-#define Z_IS_204U_EQ_204U(...) \,
-#define Z_IS_205_EQ_205(...)   \,
-#define Z_IS_205U_EQ_205(...)  \,
-#define Z_IS_205_EQ_205U(...)  \,
-#define Z_IS_205U_EQ_205U(...) \,
-#define Z_IS_206_EQ_206(...)   \,
-#define Z_IS_206U_EQ_206(...)  \,
-#define Z_IS_206_EQ_206U(...)  \,
-#define Z_IS_206U_EQ_206U(...) \,
-#define Z_IS_207_EQ_207(...)   \,
-#define Z_IS_207U_EQ_207(...)  \,
-#define Z_IS_207_EQ_207U(...)  \,
-#define Z_IS_207U_EQ_207U(...) \,
-#define Z_IS_208_EQ_208(...)   \,
-#define Z_IS_208U_EQ_208(...)  \,
-#define Z_IS_208_EQ_208U(...)  \,
-#define Z_IS_208U_EQ_208U(...) \,
-#define Z_IS_209_EQ_209(...)   \,
-#define Z_IS_209U_EQ_209(...)  \,
-#define Z_IS_209_EQ_209U(...)  \,
-#define Z_IS_209U_EQ_209U(...) \,
-#define Z_IS_210_EQ_210(...)   \,
-#define Z_IS_210U_EQ_210(...)  \,
-#define Z_IS_210_EQ_210U(...)  \,
-#define Z_IS_210U_EQ_210U(...) \,
-#define Z_IS_211_EQ_211(...)   \,
-#define Z_IS_211U_EQ_211(...)  \,
-#define Z_IS_211_EQ_211U(...)  \,
-#define Z_IS_211U_EQ_211U(...) \,
-#define Z_IS_212_EQ_212(...)   \,
-#define Z_IS_212U_EQ_212(...)  \,
-#define Z_IS_212_EQ_212U(...)  \,
-#define Z_IS_212U_EQ_212U(...) \,
-#define Z_IS_213_EQ_213(...)   \,
-#define Z_IS_213U_EQ_213(...)  \,
-#define Z_IS_213_EQ_213U(...)  \,
-#define Z_IS_213U_EQ_213U(...) \,
-#define Z_IS_214_EQ_214(...)   \,
-#define Z_IS_214U_EQ_214(...)  \,
-#define Z_IS_214_EQ_214U(...)  \,
-#define Z_IS_214U_EQ_214U(...) \,
-#define Z_IS_215_EQ_215(...)   \,
-#define Z_IS_215U_EQ_215(...)  \,
-#define Z_IS_215_EQ_215U(...)  \,
-#define Z_IS_215U_EQ_215U(...) \,
-#define Z_IS_216_EQ_216(...)   \,
-#define Z_IS_216U_EQ_216(...)  \,
-#define Z_IS_216_EQ_216U(...)  \,
-#define Z_IS_216U_EQ_216U(...) \,
-#define Z_IS_217_EQ_217(...)   \,
-#define Z_IS_217U_EQ_217(...)  \,
-#define Z_IS_217_EQ_217U(...)  \,
-#define Z_IS_217U_EQ_217U(...) \,
-#define Z_IS_218_EQ_218(...)   \,
-#define Z_IS_218U_EQ_218(...)  \,
-#define Z_IS_218_EQ_218U(...)  \,
-#define Z_IS_218U_EQ_218U(...) \,
-#define Z_IS_219_EQ_219(...)   \,
-#define Z_IS_219U_EQ_219(...)  \,
-#define Z_IS_219_EQ_219U(...)  \,
-#define Z_IS_219U_EQ_219U(...) \,
-#define Z_IS_220_EQ_220(...)   \,
-#define Z_IS_220U_EQ_220(...)  \,
-#define Z_IS_220_EQ_220U(...)  \,
-#define Z_IS_220U_EQ_220U(...) \,
-#define Z_IS_221_EQ_221(...)   \,
-#define Z_IS_221U_EQ_221(...)  \,
-#define Z_IS_221_EQ_221U(...)  \,
-#define Z_IS_221U_EQ_221U(...) \,
-#define Z_IS_222_EQ_222(...)   \,
-#define Z_IS_222U_EQ_222(...)  \,
-#define Z_IS_222_EQ_222U(...)  \,
-#define Z_IS_222U_EQ_222U(...) \,
-#define Z_IS_223_EQ_223(...)   \,
-#define Z_IS_223U_EQ_223(...)  \,
-#define Z_IS_223_EQ_223U(...)  \,
-#define Z_IS_223U_EQ_223U(...) \,
-#define Z_IS_224_EQ_224(...)   \,
-#define Z_IS_224U_EQ_224(...)  \,
-#define Z_IS_224_EQ_224U(...)  \,
-#define Z_IS_224U_EQ_224U(...) \,
-#define Z_IS_225_EQ_225(...)   \,
-#define Z_IS_225U_EQ_225(...)  \,
-#define Z_IS_225_EQ_225U(...)  \,
-#define Z_IS_225U_EQ_225U(...) \,
-#define Z_IS_226_EQ_226(...)   \,
-#define Z_IS_226U_EQ_226(...)  \,
-#define Z_IS_226_EQ_226U(...)  \,
-#define Z_IS_226U_EQ_226U(...) \,
-#define Z_IS_227_EQ_227(...)   \,
-#define Z_IS_227U_EQ_227(...)  \,
-#define Z_IS_227_EQ_227U(...)  \,
-#define Z_IS_227U_EQ_227U(...) \,
-#define Z_IS_228_EQ_228(...)   \,
-#define Z_IS_228U_EQ_228(...)  \,
-#define Z_IS_228_EQ_228U(...)  \,
-#define Z_IS_228U_EQ_228U(...) \,
-#define Z_IS_229_EQ_229(...)   \,
-#define Z_IS_229U_EQ_229(...)  \,
-#define Z_IS_229_EQ_229U(...)  \,
-#define Z_IS_229U_EQ_229U(...) \,
-#define Z_IS_230_EQ_230(...)   \,
-#define Z_IS_230U_EQ_230(...)  \,
-#define Z_IS_230_EQ_230U(...)  \,
-#define Z_IS_230U_EQ_230U(...) \,
-#define Z_IS_231_EQ_231(...)   \,
-#define Z_IS_231U_EQ_231(...)  \,
-#define Z_IS_231_EQ_231U(...)  \,
-#define Z_IS_231U_EQ_231U(...) \,
-#define Z_IS_232_EQ_232(...)   \,
-#define Z_IS_232U_EQ_232(...)  \,
-#define Z_IS_232_EQ_232U(...)  \,
-#define Z_IS_232U_EQ_232U(...) \,
-#define Z_IS_233_EQ_233(...)   \,
-#define Z_IS_233U_EQ_233(...)  \,
-#define Z_IS_233_EQ_233U(...)  \,
-#define Z_IS_233U_EQ_233U(...) \,
-#define Z_IS_234_EQ_234(...)   \,
-#define Z_IS_234U_EQ_234(...)  \,
-#define Z_IS_234_EQ_234U(...)  \,
-#define Z_IS_234U_EQ_234U(...) \,
-#define Z_IS_235_EQ_235(...)   \,
-#define Z_IS_235U_EQ_235(...)  \,
-#define Z_IS_235_EQ_235U(...)  \,
-#define Z_IS_235U_EQ_235U(...) \,
-#define Z_IS_236_EQ_236(...)   \,
-#define Z_IS_236U_EQ_236(...)  \,
-#define Z_IS_236_EQ_236U(...)  \,
-#define Z_IS_236U_EQ_236U(...) \,
-#define Z_IS_237_EQ_237(...)   \,
-#define Z_IS_237U_EQ_237(...)  \,
-#define Z_IS_237_EQ_237U(...)  \,
-#define Z_IS_237U_EQ_237U(...) \,
-#define Z_IS_238_EQ_238(...)   \,
-#define Z_IS_238U_EQ_238(...)  \,
-#define Z_IS_238_EQ_238U(...)  \,
-#define Z_IS_238U_EQ_238U(...) \,
-#define Z_IS_239_EQ_239(...)   \,
-#define Z_IS_239U_EQ_239(...)  \,
-#define Z_IS_239_EQ_239U(...)  \,
-#define Z_IS_239U_EQ_239U(...) \,
-#define Z_IS_240_EQ_240(...)   \,
-#define Z_IS_240U_EQ_240(...)  \,
-#define Z_IS_240_EQ_240U(...)  \,
-#define Z_IS_240U_EQ_240U(...) \,
-#define Z_IS_241_EQ_241(...)   \,
-#define Z_IS_241U_EQ_241(...)  \,
-#define Z_IS_241_EQ_241U(...)  \,
-#define Z_IS_241U_EQ_241U(...) \,
-#define Z_IS_242_EQ_242(...)   \,
-#define Z_IS_242U_EQ_242(...)  \,
-#define Z_IS_242_EQ_242U(...)  \,
-#define Z_IS_242U_EQ_242U(...) \,
-#define Z_IS_243_EQ_243(...)   \,
-#define Z_IS_243U_EQ_243(...)  \,
-#define Z_IS_243_EQ_243U(...)  \,
-#define Z_IS_243U_EQ_243U(...) \,
-#define Z_IS_244_EQ_244(...)   \,
-#define Z_IS_244U_EQ_244(...)  \,
-#define Z_IS_244_EQ_244U(...)  \,
-#define Z_IS_244U_EQ_244U(...) \,
-#define Z_IS_245_EQ_245(...)   \,
-#define Z_IS_245U_EQ_245(...)  \,
-#define Z_IS_245_EQ_245U(...)  \,
-#define Z_IS_245U_EQ_245U(...) \,
-#define Z_IS_246_EQ_246(...)   \,
-#define Z_IS_246U_EQ_246(...)  \,
-#define Z_IS_246_EQ_246U(...)  \,
-#define Z_IS_246U_EQ_246U(...) \,
-#define Z_IS_247_EQ_247(...)   \,
-#define Z_IS_247U_EQ_247(...)  \,
-#define Z_IS_247_EQ_247U(...)  \,
-#define Z_IS_247U_EQ_247U(...) \,
-#define Z_IS_248_EQ_248(...)   \,
-#define Z_IS_248U_EQ_248(...)  \,
-#define Z_IS_248_EQ_248U(...)  \,
-#define Z_IS_248U_EQ_248U(...) \,
-#define Z_IS_249_EQ_249(...)   \,
-#define Z_IS_249U_EQ_249(...)  \,
-#define Z_IS_249_EQ_249U(...)  \,
-#define Z_IS_249U_EQ_249U(...) \,
-#define Z_IS_250_EQ_250(...)   \,
-#define Z_IS_250U_EQ_250(...)  \,
-#define Z_IS_250_EQ_250U(...)  \,
-#define Z_IS_250U_EQ_250U(...) \,
-#define Z_IS_251_EQ_251(...)   \,
-#define Z_IS_251U_EQ_251(...)  \,
-#define Z_IS_251_EQ_251U(...)  \,
-#define Z_IS_251U_EQ_251U(...) \,
-#define Z_IS_252_EQ_252(...)   \,
-#define Z_IS_252U_EQ_252(...)  \,
-#define Z_IS_252_EQ_252U(...)  \,
-#define Z_IS_252U_EQ_252U(...) \,
-#define Z_IS_253_EQ_253(...)   \,
-#define Z_IS_253U_EQ_253(...)  \,
-#define Z_IS_253_EQ_253U(...)  \,
-#define Z_IS_253U_EQ_253U(...) \,
-#define Z_IS_254_EQ_254(...)   \,
-#define Z_IS_254U_EQ_254(...)  \,
-#define Z_IS_254_EQ_254U(...)  \,
-#define Z_IS_254U_EQ_254U(...) \,
-#define Z_IS_255_EQ_255(...)   \,
-#define Z_IS_255U_EQ_255(...)  \,
-#define Z_IS_255_EQ_255U(...)  \,
-#define Z_IS_255U_EQ_255U(...) \,
-#define Z_IS_256_EQ_256(...)   \,
-#define Z_IS_256U_EQ_256(...)  \,
-#define Z_IS_256_EQ_256U(...)  \,
-#define Z_IS_256U_EQ_256U(...) \,
-#define Z_IS_257_EQ_257(...)   \,
-#define Z_IS_257U_EQ_257(...)  \,
-#define Z_IS_257_EQ_257U(...)  \,
-#define Z_IS_257U_EQ_257U(...) \,
-#define Z_IS_258_EQ_258(...)   \,
-#define Z_IS_258U_EQ_258(...)  \,
-#define Z_IS_258_EQ_258U(...)  \,
-#define Z_IS_258U_EQ_258U(...) \,
-#define Z_IS_259_EQ_259(...)   \,
-#define Z_IS_259U_EQ_259(...)  \,
-#define Z_IS_259_EQ_259U(...)  \,
-#define Z_IS_259U_EQ_259U(...) \,
-#define Z_IS_260_EQ_260(...)   \,
-#define Z_IS_260U_EQ_260(...)  \,
-#define Z_IS_260_EQ_260U(...)  \,
-#define Z_IS_260U_EQ_260U(...) \,
-#define Z_IS_261_EQ_261(...)   \,
-#define Z_IS_261U_EQ_261(...)  \,
-#define Z_IS_261_EQ_261U(...)  \,
-#define Z_IS_261U_EQ_261U(...) \,
-#define Z_IS_262_EQ_262(...)   \,
-#define Z_IS_262U_EQ_262(...)  \,
-#define Z_IS_262_EQ_262U(...)  \,
-#define Z_IS_262U_EQ_262U(...) \,
-#define Z_IS_263_EQ_263(...)   \,
-#define Z_IS_263U_EQ_263(...)  \,
-#define Z_IS_263_EQ_263U(...)  \,
-#define Z_IS_263U_EQ_263U(...) \,
-#define Z_IS_264_EQ_264(...)   \,
-#define Z_IS_264U_EQ_264(...)  \,
-#define Z_IS_264_EQ_264U(...)  \,
-#define Z_IS_264U_EQ_264U(...) \,
-#define Z_IS_265_EQ_265(...)   \,
-#define Z_IS_265U_EQ_265(...)  \,
-#define Z_IS_265_EQ_265U(...)  \,
-#define Z_IS_265U_EQ_265U(...) \,
-#define Z_IS_266_EQ_266(...)   \,
-#define Z_IS_266U_EQ_266(...)  \,
-#define Z_IS_266_EQ_266U(...)  \,
-#define Z_IS_266U_EQ_266U(...) \,
-#define Z_IS_267_EQ_267(...)   \,
-#define Z_IS_267U_EQ_267(...)  \,
-#define Z_IS_267_EQ_267U(...)  \,
-#define Z_IS_267U_EQ_267U(...) \,
-#define Z_IS_268_EQ_268(...)   \,
-#define Z_IS_268U_EQ_268(...)  \,
-#define Z_IS_268_EQ_268U(...)  \,
-#define Z_IS_268U_EQ_268U(...) \,
-#define Z_IS_269_EQ_269(...)   \,
-#define Z_IS_269U_EQ_269(...)  \,
-#define Z_IS_269_EQ_269U(...)  \,
-#define Z_IS_269U_EQ_269U(...) \,
-#define Z_IS_270_EQ_270(...)   \,
-#define Z_IS_270U_EQ_270(...)  \,
-#define Z_IS_270_EQ_270U(...)  \,
-#define Z_IS_270U_EQ_270U(...) \,
-#define Z_IS_271_EQ_271(...)   \,
-#define Z_IS_271U_EQ_271(...)  \,
-#define Z_IS_271_EQ_271U(...)  \,
-#define Z_IS_271U_EQ_271U(...) \,
-#define Z_IS_272_EQ_272(...)   \,
-#define Z_IS_272U_EQ_272(...)  \,
-#define Z_IS_272_EQ_272U(...)  \,
-#define Z_IS_272U_EQ_272U(...) \,
-#define Z_IS_273_EQ_273(...)   \,
-#define Z_IS_273U_EQ_273(...)  \,
-#define Z_IS_273_EQ_273U(...)  \,
-#define Z_IS_273U_EQ_273U(...) \,
-#define Z_IS_274_EQ_274(...)   \,
-#define Z_IS_274U_EQ_274(...)  \,
-#define Z_IS_274_EQ_274U(...)  \,
-#define Z_IS_274U_EQ_274U(...) \,
-#define Z_IS_275_EQ_275(...)   \,
-#define Z_IS_275U_EQ_275(...)  \,
-#define Z_IS_275_EQ_275U(...)  \,
-#define Z_IS_275U_EQ_275U(...) \,
-#define Z_IS_276_EQ_276(...)   \,
-#define Z_IS_276U_EQ_276(...)  \,
-#define Z_IS_276_EQ_276U(...)  \,
-#define Z_IS_276U_EQ_276U(...) \,
-#define Z_IS_277_EQ_277(...)   \,
-#define Z_IS_277U_EQ_277(...)  \,
-#define Z_IS_277_EQ_277U(...)  \,
-#define Z_IS_277U_EQ_277U(...) \,
-#define Z_IS_278_EQ_278(...)   \,
-#define Z_IS_278U_EQ_278(...)  \,
-#define Z_IS_278_EQ_278U(...)  \,
-#define Z_IS_278U_EQ_278U(...) \,
-#define Z_IS_279_EQ_279(...)   \,
-#define Z_IS_279U_EQ_279(...)  \,
-#define Z_IS_279_EQ_279U(...)  \,
-#define Z_IS_279U_EQ_279U(...) \,
-#define Z_IS_280_EQ_280(...)   \,
-#define Z_IS_280U_EQ_280(...)  \,
-#define Z_IS_280_EQ_280U(...)  \,
-#define Z_IS_280U_EQ_280U(...) \,
-#define Z_IS_281_EQ_281(...)   \,
-#define Z_IS_281U_EQ_281(...)  \,
-#define Z_IS_281_EQ_281U(...)  \,
-#define Z_IS_281U_EQ_281U(...) \,
-#define Z_IS_282_EQ_282(...)   \,
-#define Z_IS_282U_EQ_282(...)  \,
-#define Z_IS_282_EQ_282U(...)  \,
-#define Z_IS_282U_EQ_282U(...) \,
-#define Z_IS_283_EQ_283(...)   \,
-#define Z_IS_283U_EQ_283(...)  \,
-#define Z_IS_283_EQ_283U(...)  \,
-#define Z_IS_283U_EQ_283U(...) \,
-#define Z_IS_284_EQ_284(...)   \,
-#define Z_IS_284U_EQ_284(...)  \,
-#define Z_IS_284_EQ_284U(...)  \,
-#define Z_IS_284U_EQ_284U(...) \,
-#define Z_IS_285_EQ_285(...)   \,
-#define Z_IS_285U_EQ_285(...)  \,
-#define Z_IS_285_EQ_285U(...)  \,
-#define Z_IS_285U_EQ_285U(...) \,
-#define Z_IS_286_EQ_286(...)   \,
-#define Z_IS_286U_EQ_286(...)  \,
-#define Z_IS_286_EQ_286U(...)  \,
-#define Z_IS_286U_EQ_286U(...) \,
-#define Z_IS_287_EQ_287(...)   \,
-#define Z_IS_287U_EQ_287(...)  \,
-#define Z_IS_287_EQ_287U(...)  \,
-#define Z_IS_287U_EQ_287U(...) \,
-#define Z_IS_288_EQ_288(...)   \,
-#define Z_IS_288U_EQ_288(...)  \,
-#define Z_IS_288_EQ_288U(...)  \,
-#define Z_IS_288U_EQ_288U(...) \,
-#define Z_IS_289_EQ_289(...)   \,
-#define Z_IS_289U_EQ_289(...)  \,
-#define Z_IS_289_EQ_289U(...)  \,
-#define Z_IS_289U_EQ_289U(...) \,
-#define Z_IS_290_EQ_290(...)   \,
-#define Z_IS_290U_EQ_290(...)  \,
-#define Z_IS_290_EQ_290U(...)  \,
-#define Z_IS_290U_EQ_290U(...) \,
-#define Z_IS_291_EQ_291(...)   \,
-#define Z_IS_291U_EQ_291(...)  \,
-#define Z_IS_291_EQ_291U(...)  \,
-#define Z_IS_291U_EQ_291U(...) \,
-#define Z_IS_292_EQ_292(...)   \,
-#define Z_IS_292U_EQ_292(...)  \,
-#define Z_IS_292_EQ_292U(...)  \,
-#define Z_IS_292U_EQ_292U(...) \,
-#define Z_IS_293_EQ_293(...)   \,
-#define Z_IS_293U_EQ_293(...)  \,
-#define Z_IS_293_EQ_293U(...)  \,
-#define Z_IS_293U_EQ_293U(...) \,
-#define Z_IS_294_EQ_294(...)   \,
-#define Z_IS_294U_EQ_294(...)  \,
-#define Z_IS_294_EQ_294U(...)  \,
-#define Z_IS_294U_EQ_294U(...) \,
-#define Z_IS_295_EQ_295(...)   \,
-#define Z_IS_295U_EQ_295(...)  \,
-#define Z_IS_295_EQ_295U(...)  \,
-#define Z_IS_295U_EQ_295U(...) \,
-#define Z_IS_296_EQ_296(...)   \,
-#define Z_IS_296U_EQ_296(...)  \,
-#define Z_IS_296_EQ_296U(...)  \,
-#define Z_IS_296U_EQ_296U(...) \,
-#define Z_IS_297_EQ_297(...)   \,
-#define Z_IS_297U_EQ_297(...)  \,
-#define Z_IS_297_EQ_297U(...)  \,
-#define Z_IS_297U_EQ_297U(...) \,
-#define Z_IS_298_EQ_298(...)   \,
-#define Z_IS_298U_EQ_298(...)  \,
-#define Z_IS_298_EQ_298U(...)  \,
-#define Z_IS_298U_EQ_298U(...) \,
-#define Z_IS_299_EQ_299(...)   \,
-#define Z_IS_299U_EQ_299(...)  \,
-#define Z_IS_299_EQ_299U(...)  \,
-#define Z_IS_299U_EQ_299U(...) \,
-#define Z_IS_300_EQ_300(...)   \,
-#define Z_IS_300U_EQ_300(...)  \,
-#define Z_IS_300_EQ_300U(...)  \,
-#define Z_IS_300U_EQ_300U(...) \,
-#define Z_IS_301_EQ_301(...)   \,
-#define Z_IS_301U_EQ_301(...)  \,
-#define Z_IS_301_EQ_301U(...)  \,
-#define Z_IS_301U_EQ_301U(...) \,
-#define Z_IS_302_EQ_302(...)   \,
-#define Z_IS_302U_EQ_302(...)  \,
-#define Z_IS_302_EQ_302U(...)  \,
-#define Z_IS_302U_EQ_302U(...) \,
-#define Z_IS_303_EQ_303(...)   \,
-#define Z_IS_303U_EQ_303(...)  \,
-#define Z_IS_303_EQ_303U(...)  \,
-#define Z_IS_303U_EQ_303U(...) \,
-#define Z_IS_304_EQ_304(...)   \,
-#define Z_IS_304U_EQ_304(...)  \,
-#define Z_IS_304_EQ_304U(...)  \,
-#define Z_IS_304U_EQ_304U(...) \,
-#define Z_IS_305_EQ_305(...)   \,
-#define Z_IS_305U_EQ_305(...)  \,
-#define Z_IS_305_EQ_305U(...)  \,
-#define Z_IS_305U_EQ_305U(...) \,
-#define Z_IS_306_EQ_306(...)   \,
-#define Z_IS_306U_EQ_306(...)  \,
-#define Z_IS_306_EQ_306U(...)  \,
-#define Z_IS_306U_EQ_306U(...) \,
-#define Z_IS_307_EQ_307(...)   \,
-#define Z_IS_307U_EQ_307(...)  \,
-#define Z_IS_307_EQ_307U(...)  \,
-#define Z_IS_307U_EQ_307U(...) \,
-#define Z_IS_308_EQ_308(...)   \,
-#define Z_IS_308U_EQ_308(...)  \,
-#define Z_IS_308_EQ_308U(...)  \,
-#define Z_IS_308U_EQ_308U(...) \,
-#define Z_IS_309_EQ_309(...)   \,
-#define Z_IS_309U_EQ_309(...)  \,
-#define Z_IS_309_EQ_309U(...)  \,
-#define Z_IS_309U_EQ_309U(...) \,
-#define Z_IS_310_EQ_310(...)   \,
-#define Z_IS_310U_EQ_310(...)  \,
-#define Z_IS_310_EQ_310U(...)  \,
-#define Z_IS_310U_EQ_310U(...) \,
-#define Z_IS_311_EQ_311(...)   \,
-#define Z_IS_311U_EQ_311(...)  \,
-#define Z_IS_311_EQ_311U(...)  \,
-#define Z_IS_311U_EQ_311U(...) \,
-#define Z_IS_312_EQ_312(...)   \,
-#define Z_IS_312U_EQ_312(...)  \,
-#define Z_IS_312_EQ_312U(...)  \,
-#define Z_IS_312U_EQ_312U(...) \,
-#define Z_IS_313_EQ_313(...)   \,
-#define Z_IS_313U_EQ_313(...)  \,
-#define Z_IS_313_EQ_313U(...)  \,
-#define Z_IS_313U_EQ_313U(...) \,
-#define Z_IS_314_EQ_314(...)   \,
-#define Z_IS_314U_EQ_314(...)  \,
-#define Z_IS_314_EQ_314U(...)  \,
-#define Z_IS_314U_EQ_314U(...) \,
-#define Z_IS_315_EQ_315(...)   \,
-#define Z_IS_315U_EQ_315(...)  \,
-#define Z_IS_315_EQ_315U(...)  \,
-#define Z_IS_315U_EQ_315U(...) \,
-#define Z_IS_316_EQ_316(...)   \,
-#define Z_IS_316U_EQ_316(...)  \,
-#define Z_IS_316_EQ_316U(...)  \,
-#define Z_IS_316U_EQ_316U(...) \,
-#define Z_IS_317_EQ_317(...)   \,
-#define Z_IS_317U_EQ_317(...)  \,
-#define Z_IS_317_EQ_317U(...)  \,
-#define Z_IS_317U_EQ_317U(...) \,
-#define Z_IS_318_EQ_318(...)   \,
-#define Z_IS_318U_EQ_318(...)  \,
-#define Z_IS_318_EQ_318U(...)  \,
-#define Z_IS_318U_EQ_318U(...) \,
-#define Z_IS_319_EQ_319(...)   \,
-#define Z_IS_319U_EQ_319(...)  \,
-#define Z_IS_319_EQ_319U(...)  \,
-#define Z_IS_319U_EQ_319U(...) \,
-#define Z_IS_320_EQ_320(...)   \,
-#define Z_IS_320U_EQ_320(...)  \,
-#define Z_IS_320_EQ_320U(...)  \,
-#define Z_IS_320U_EQ_320U(...) \,
-#define Z_IS_321_EQ_321(...)   \,
-#define Z_IS_321U_EQ_321(...)  \,
-#define Z_IS_321_EQ_321U(...)  \,
-#define Z_IS_321U_EQ_321U(...) \,
-#define Z_IS_322_EQ_322(...)   \,
-#define Z_IS_322U_EQ_322(...)  \,
-#define Z_IS_322_EQ_322U(...)  \,
-#define Z_IS_322U_EQ_322U(...) \,
-#define Z_IS_323_EQ_323(...)   \,
-#define Z_IS_323U_EQ_323(...)  \,
-#define Z_IS_323_EQ_323U(...)  \,
-#define Z_IS_323U_EQ_323U(...) \,
-#define Z_IS_324_EQ_324(...)   \,
-#define Z_IS_324U_EQ_324(...)  \,
-#define Z_IS_324_EQ_324U(...)  \,
-#define Z_IS_324U_EQ_324U(...) \,
-#define Z_IS_325_EQ_325(...)   \,
-#define Z_IS_325U_EQ_325(...)  \,
-#define Z_IS_325_EQ_325U(...)  \,
-#define Z_IS_325U_EQ_325U(...) \,
-#define Z_IS_326_EQ_326(...)   \,
-#define Z_IS_326U_EQ_326(...)  \,
-#define Z_IS_326_EQ_326U(...)  \,
-#define Z_IS_326U_EQ_326U(...) \,
-#define Z_IS_327_EQ_327(...)   \,
-#define Z_IS_327U_EQ_327(...)  \,
-#define Z_IS_327_EQ_327U(...)  \,
-#define Z_IS_327U_EQ_327U(...) \,
-#define Z_IS_328_EQ_328(...)   \,
-#define Z_IS_328U_EQ_328(...)  \,
-#define Z_IS_328_EQ_328U(...)  \,
-#define Z_IS_328U_EQ_328U(...) \,
-#define Z_IS_329_EQ_329(...)   \,
-#define Z_IS_329U_EQ_329(...)  \,
-#define Z_IS_329_EQ_329U(...)  \,
-#define Z_IS_329U_EQ_329U(...) \,
-#define Z_IS_330_EQ_330(...)   \,
-#define Z_IS_330U_EQ_330(...)  \,
-#define Z_IS_330_EQ_330U(...)  \,
-#define Z_IS_330U_EQ_330U(...) \,
-#define Z_IS_331_EQ_331(...)   \,
-#define Z_IS_331U_EQ_331(...)  \,
-#define Z_IS_331_EQ_331U(...)  \,
-#define Z_IS_331U_EQ_331U(...) \,
-#define Z_IS_332_EQ_332(...)   \,
-#define Z_IS_332U_EQ_332(...)  \,
-#define Z_IS_332_EQ_332U(...)  \,
-#define Z_IS_332U_EQ_332U(...) \,
-#define Z_IS_333_EQ_333(...)   \,
-#define Z_IS_333U_EQ_333(...)  \,
-#define Z_IS_333_EQ_333U(...)  \,
-#define Z_IS_333U_EQ_333U(...) \,
-#define Z_IS_334_EQ_334(...)   \,
-#define Z_IS_334U_EQ_334(...)  \,
-#define Z_IS_334_EQ_334U(...)  \,
-#define Z_IS_334U_EQ_334U(...) \,
-#define Z_IS_335_EQ_335(...)   \,
-#define Z_IS_335U_EQ_335(...)  \,
-#define Z_IS_335_EQ_335U(...)  \,
-#define Z_IS_335U_EQ_335U(...) \,
-#define Z_IS_336_EQ_336(...)   \,
-#define Z_IS_336U_EQ_336(...)  \,
-#define Z_IS_336_EQ_336U(...)  \,
-#define Z_IS_336U_EQ_336U(...) \,
-#define Z_IS_337_EQ_337(...)   \,
-#define Z_IS_337U_EQ_337(...)  \,
-#define Z_IS_337_EQ_337U(...)  \,
-#define Z_IS_337U_EQ_337U(...) \,
-#define Z_IS_338_EQ_338(...)   \,
-#define Z_IS_338U_EQ_338(...)  \,
-#define Z_IS_338_EQ_338U(...)  \,
-#define Z_IS_338U_EQ_338U(...) \,
-#define Z_IS_339_EQ_339(...)   \,
-#define Z_IS_339U_EQ_339(...)  \,
-#define Z_IS_339_EQ_339U(...)  \,
-#define Z_IS_339U_EQ_339U(...) \,
-#define Z_IS_340_EQ_340(...)   \,
-#define Z_IS_340U_EQ_340(...)  \,
-#define Z_IS_340_EQ_340U(...)  \,
-#define Z_IS_340U_EQ_340U(...) \,
-#define Z_IS_341_EQ_341(...)   \,
-#define Z_IS_341U_EQ_341(...)  \,
-#define Z_IS_341_EQ_341U(...)  \,
-#define Z_IS_341U_EQ_341U(...) \,
-#define Z_IS_342_EQ_342(...)   \,
-#define Z_IS_342U_EQ_342(...)  \,
-#define Z_IS_342_EQ_342U(...)  \,
-#define Z_IS_342U_EQ_342U(...) \,
-#define Z_IS_343_EQ_343(...)   \,
-#define Z_IS_343U_EQ_343(...)  \,
-#define Z_IS_343_EQ_343U(...)  \,
-#define Z_IS_343U_EQ_343U(...) \,
-#define Z_IS_344_EQ_344(...)   \,
-#define Z_IS_344U_EQ_344(...)  \,
-#define Z_IS_344_EQ_344U(...)  \,
-#define Z_IS_344U_EQ_344U(...) \,
-#define Z_IS_345_EQ_345(...)   \,
-#define Z_IS_345U_EQ_345(...)  \,
-#define Z_IS_345_EQ_345U(...)  \,
-#define Z_IS_345U_EQ_345U(...) \,
-#define Z_IS_346_EQ_346(...)   \,
-#define Z_IS_346U_EQ_346(...)  \,
-#define Z_IS_346_EQ_346U(...)  \,
-#define Z_IS_346U_EQ_346U(...) \,
-#define Z_IS_347_EQ_347(...)   \,
-#define Z_IS_347U_EQ_347(...)  \,
-#define Z_IS_347_EQ_347U(...)  \,
-#define Z_IS_347U_EQ_347U(...) \,
-#define Z_IS_348_EQ_348(...)   \,
-#define Z_IS_348U_EQ_348(...)  \,
-#define Z_IS_348_EQ_348U(...)  \,
-#define Z_IS_348U_EQ_348U(...) \,
-#define Z_IS_349_EQ_349(...)   \,
-#define Z_IS_349U_EQ_349(...)  \,
-#define Z_IS_349_EQ_349U(...)  \,
-#define Z_IS_349U_EQ_349U(...) \,
-#define Z_IS_350_EQ_350(...)   \,
-#define Z_IS_350U_EQ_350(...)  \,
-#define Z_IS_350_EQ_350U(...)  \,
-#define Z_IS_350U_EQ_350U(...) \,
-#define Z_IS_351_EQ_351(...)   \,
-#define Z_IS_351U_EQ_351(...)  \,
-#define Z_IS_351_EQ_351U(...)  \,
-#define Z_IS_351U_EQ_351U(...) \,
-#define Z_IS_352_EQ_352(...)   \,
-#define Z_IS_352U_EQ_352(...)  \,
-#define Z_IS_352_EQ_352U(...)  \,
-#define Z_IS_352U_EQ_352U(...) \,
-#define Z_IS_353_EQ_353(...)   \,
-#define Z_IS_353U_EQ_353(...)  \,
-#define Z_IS_353_EQ_353U(...)  \,
-#define Z_IS_353U_EQ_353U(...) \,
-#define Z_IS_354_EQ_354(...)   \,
-#define Z_IS_354U_EQ_354(...)  \,
-#define Z_IS_354_EQ_354U(...)  \,
-#define Z_IS_354U_EQ_354U(...) \,
-#define Z_IS_355_EQ_355(...)   \,
-#define Z_IS_355U_EQ_355(...)  \,
-#define Z_IS_355_EQ_355U(...)  \,
-#define Z_IS_355U_EQ_355U(...) \,
-#define Z_IS_356_EQ_356(...)   \,
-#define Z_IS_356U_EQ_356(...)  \,
-#define Z_IS_356_EQ_356U(...)  \,
-#define Z_IS_356U_EQ_356U(...) \,
-#define Z_IS_357_EQ_357(...)   \,
-#define Z_IS_357U_EQ_357(...)  \,
-#define Z_IS_357_EQ_357U(...)  \,
-#define Z_IS_357U_EQ_357U(...) \,
-#define Z_IS_358_EQ_358(...)   \,
-#define Z_IS_358U_EQ_358(...)  \,
-#define Z_IS_358_EQ_358U(...)  \,
-#define Z_IS_358U_EQ_358U(...) \,
-#define Z_IS_359_EQ_359(...)   \,
-#define Z_IS_359U_EQ_359(...)  \,
-#define Z_IS_359_EQ_359U(...)  \,
-#define Z_IS_359U_EQ_359U(...) \,
-#define Z_IS_360_EQ_360(...)   \,
-#define Z_IS_360U_EQ_360(...)  \,
-#define Z_IS_360_EQ_360U(...)  \,
-#define Z_IS_360U_EQ_360U(...) \,
-#define Z_IS_361_EQ_361(...)   \,
-#define Z_IS_361U_EQ_361(...)  \,
-#define Z_IS_361_EQ_361U(...)  \,
-#define Z_IS_361U_EQ_361U(...) \,
-#define Z_IS_362_EQ_362(...)   \,
-#define Z_IS_362U_EQ_362(...)  \,
-#define Z_IS_362_EQ_362U(...)  \,
-#define Z_IS_362U_EQ_362U(...) \,
-#define Z_IS_363_EQ_363(...)   \,
-#define Z_IS_363U_EQ_363(...)  \,
-#define Z_IS_363_EQ_363U(...)  \,
-#define Z_IS_363U_EQ_363U(...) \,
-#define Z_IS_364_EQ_364(...)   \,
-#define Z_IS_364U_EQ_364(...)  \,
-#define Z_IS_364_EQ_364U(...)  \,
-#define Z_IS_364U_EQ_364U(...) \,
-#define Z_IS_365_EQ_365(...)   \,
-#define Z_IS_365U_EQ_365(...)  \,
-#define Z_IS_365_EQ_365U(...)  \,
-#define Z_IS_365U_EQ_365U(...) \,
-#define Z_IS_366_EQ_366(...)   \,
-#define Z_IS_366U_EQ_366(...)  \,
-#define Z_IS_366_EQ_366U(...)  \,
-#define Z_IS_366U_EQ_366U(...) \,
-#define Z_IS_367_EQ_367(...)   \,
-#define Z_IS_367U_EQ_367(...)  \,
-#define Z_IS_367_EQ_367U(...)  \,
-#define Z_IS_367U_EQ_367U(...) \,
-#define Z_IS_368_EQ_368(...)   \,
-#define Z_IS_368U_EQ_368(...)  \,
-#define Z_IS_368_EQ_368U(...)  \,
-#define Z_IS_368U_EQ_368U(...) \,
-#define Z_IS_369_EQ_369(...)   \,
-#define Z_IS_369U_EQ_369(...)  \,
-#define Z_IS_369_EQ_369U(...)  \,
-#define Z_IS_369U_EQ_369U(...) \,
-#define Z_IS_370_EQ_370(...)   \,
-#define Z_IS_370U_EQ_370(...)  \,
-#define Z_IS_370_EQ_370U(...)  \,
-#define Z_IS_370U_EQ_370U(...) \,
-#define Z_IS_371_EQ_371(...)   \,
-#define Z_IS_371U_EQ_371(...)  \,
-#define Z_IS_371_EQ_371U(...)  \,
-#define Z_IS_371U_EQ_371U(...) \,
-#define Z_IS_372_EQ_372(...)   \,
-#define Z_IS_372U_EQ_372(...)  \,
-#define Z_IS_372_EQ_372U(...)  \,
-#define Z_IS_372U_EQ_372U(...) \,
-#define Z_IS_373_EQ_373(...)   \,
-#define Z_IS_373U_EQ_373(...)  \,
-#define Z_IS_373_EQ_373U(...)  \,
-#define Z_IS_373U_EQ_373U(...) \,
-#define Z_IS_374_EQ_374(...)   \,
-#define Z_IS_374U_EQ_374(...)  \,
-#define Z_IS_374_EQ_374U(...)  \,
-#define Z_IS_374U_EQ_374U(...) \,
-#define Z_IS_375_EQ_375(...)   \,
-#define Z_IS_375U_EQ_375(...)  \,
-#define Z_IS_375_EQ_375U(...)  \,
-#define Z_IS_375U_EQ_375U(...) \,
-#define Z_IS_376_EQ_376(...)   \,
-#define Z_IS_376U_EQ_376(...)  \,
-#define Z_IS_376_EQ_376U(...)  \,
-#define Z_IS_376U_EQ_376U(...) \,
-#define Z_IS_377_EQ_377(...)   \,
-#define Z_IS_377U_EQ_377(...)  \,
-#define Z_IS_377_EQ_377U(...)  \,
-#define Z_IS_377U_EQ_377U(...) \,
-#define Z_IS_378_EQ_378(...)   \,
-#define Z_IS_378U_EQ_378(...)  \,
-#define Z_IS_378_EQ_378U(...)  \,
-#define Z_IS_378U_EQ_378U(...) \,
-#define Z_IS_379_EQ_379(...)   \,
-#define Z_IS_379U_EQ_379(...)  \,
-#define Z_IS_379_EQ_379U(...)  \,
-#define Z_IS_379U_EQ_379U(...) \,
-#define Z_IS_380_EQ_380(...)   \,
-#define Z_IS_380U_EQ_380(...)  \,
-#define Z_IS_380_EQ_380U(...)  \,
-#define Z_IS_380U_EQ_380U(...) \,
-#define Z_IS_381_EQ_381(...)   \,
-#define Z_IS_381U_EQ_381(...)  \,
-#define Z_IS_381_EQ_381U(...)  \,
-#define Z_IS_381U_EQ_381U(...) \,
-#define Z_IS_382_EQ_382(...)   \,
-#define Z_IS_382U_EQ_382(...)  \,
-#define Z_IS_382_EQ_382U(...)  \,
-#define Z_IS_382U_EQ_382U(...) \,
-#define Z_IS_383_EQ_383(...)   \,
-#define Z_IS_383U_EQ_383(...)  \,
-#define Z_IS_383_EQ_383U(...)  \,
-#define Z_IS_383U_EQ_383U(...) \,
-#define Z_IS_384_EQ_384(...)   \,
-#define Z_IS_384U_EQ_384(...)  \,
-#define Z_IS_384_EQ_384U(...)  \,
-#define Z_IS_384U_EQ_384U(...) \,
-#define Z_IS_385_EQ_385(...)   \,
-#define Z_IS_385U_EQ_385(...)  \,
-#define Z_IS_385_EQ_385U(...)  \,
-#define Z_IS_385U_EQ_385U(...) \,
-#define Z_IS_386_EQ_386(...)   \,
-#define Z_IS_386U_EQ_386(...)  \,
-#define Z_IS_386_EQ_386U(...)  \,
-#define Z_IS_386U_EQ_386U(...) \,
-#define Z_IS_387_EQ_387(...)   \,
-#define Z_IS_387U_EQ_387(...)  \,
-#define Z_IS_387_EQ_387U(...)  \,
-#define Z_IS_387U_EQ_387U(...) \,
-#define Z_IS_388_EQ_388(...)   \,
-#define Z_IS_388U_EQ_388(...)  \,
-#define Z_IS_388_EQ_388U(...)  \,
-#define Z_IS_388U_EQ_388U(...) \,
-#define Z_IS_389_EQ_389(...)   \,
-#define Z_IS_389U_EQ_389(...)  \,
-#define Z_IS_389_EQ_389U(...)  \,
-#define Z_IS_389U_EQ_389U(...) \,
-#define Z_IS_390_EQ_390(...)   \,
-#define Z_IS_390U_EQ_390(...)  \,
-#define Z_IS_390_EQ_390U(...)  \,
-#define Z_IS_390U_EQ_390U(...) \,
-#define Z_IS_391_EQ_391(...)   \,
-#define Z_IS_391U_EQ_391(...)  \,
-#define Z_IS_391_EQ_391U(...)  \,
-#define Z_IS_391U_EQ_391U(...) \,
-#define Z_IS_392_EQ_392(...)   \,
-#define Z_IS_392U_EQ_392(...)  \,
-#define Z_IS_392_EQ_392U(...)  \,
-#define Z_IS_392U_EQ_392U(...) \,
-#define Z_IS_393_EQ_393(...)   \,
-#define Z_IS_393U_EQ_393(...)  \,
-#define Z_IS_393_EQ_393U(...)  \,
-#define Z_IS_393U_EQ_393U(...) \,
-#define Z_IS_394_EQ_394(...)   \,
-#define Z_IS_394U_EQ_394(...)  \,
-#define Z_IS_394_EQ_394U(...)  \,
-#define Z_IS_394U_EQ_394U(...) \,
-#define Z_IS_395_EQ_395(...)   \,
-#define Z_IS_395U_EQ_395(...)  \,
-#define Z_IS_395_EQ_395U(...)  \,
-#define Z_IS_395U_EQ_395U(...) \,
-#define Z_IS_396_EQ_396(...)   \,
-#define Z_IS_396U_EQ_396(...)  \,
-#define Z_IS_396_EQ_396U(...)  \,
-#define Z_IS_396U_EQ_396U(...) \,
-#define Z_IS_397_EQ_397(...)   \,
-#define Z_IS_397U_EQ_397(...)  \,
-#define Z_IS_397_EQ_397U(...)  \,
-#define Z_IS_397U_EQ_397U(...) \,
-#define Z_IS_398_EQ_398(...)   \,
-#define Z_IS_398U_EQ_398(...)  \,
-#define Z_IS_398_EQ_398U(...)  \,
-#define Z_IS_398U_EQ_398U(...) \,
-#define Z_IS_399_EQ_399(...)   \,
-#define Z_IS_399U_EQ_399(...)  \,
-#define Z_IS_399_EQ_399U(...)  \,
-#define Z_IS_399U_EQ_399U(...) \,
-#define Z_IS_400_EQ_400(...)   \,
-#define Z_IS_400U_EQ_400(...)  \,
-#define Z_IS_400_EQ_400U(...)  \,
-#define Z_IS_400U_EQ_400U(...) \,
-#define Z_IS_401_EQ_401(...)   \,
-#define Z_IS_401U_EQ_401(...)  \,
-#define Z_IS_401_EQ_401U(...)  \,
-#define Z_IS_401U_EQ_401U(...) \,
-#define Z_IS_402_EQ_402(...)   \,
-#define Z_IS_402U_EQ_402(...)  \,
-#define Z_IS_402_EQ_402U(...)  \,
-#define Z_IS_402U_EQ_402U(...) \,
-#define Z_IS_403_EQ_403(...)   \,
-#define Z_IS_403U_EQ_403(...)  \,
-#define Z_IS_403_EQ_403U(...)  \,
-#define Z_IS_403U_EQ_403U(...) \,
-#define Z_IS_404_EQ_404(...)   \,
-#define Z_IS_404U_EQ_404(...)  \,
-#define Z_IS_404_EQ_404U(...)  \,
-#define Z_IS_404U_EQ_404U(...) \,
-#define Z_IS_405_EQ_405(...)   \,
-#define Z_IS_405U_EQ_405(...)  \,
-#define Z_IS_405_EQ_405U(...)  \,
-#define Z_IS_405U_EQ_405U(...) \,
-#define Z_IS_406_EQ_406(...)   \,
-#define Z_IS_406U_EQ_406(...)  \,
-#define Z_IS_406_EQ_406U(...)  \,
-#define Z_IS_406U_EQ_406U(...) \,
-#define Z_IS_407_EQ_407(...)   \,
-#define Z_IS_407U_EQ_407(...)  \,
-#define Z_IS_407_EQ_407U(...)  \,
-#define Z_IS_407U_EQ_407U(...) \,
-#define Z_IS_408_EQ_408(...)   \,
-#define Z_IS_408U_EQ_408(...)  \,
-#define Z_IS_408_EQ_408U(...)  \,
-#define Z_IS_408U_EQ_408U(...) \,
-#define Z_IS_409_EQ_409(...)   \,
-#define Z_IS_409U_EQ_409(...)  \,
-#define Z_IS_409_EQ_409U(...)  \,
-#define Z_IS_409U_EQ_409U(...) \,
-#define Z_IS_410_EQ_410(...)   \,
-#define Z_IS_410U_EQ_410(...)  \,
-#define Z_IS_410_EQ_410U(...)  \,
-#define Z_IS_410U_EQ_410U(...) \,
-#define Z_IS_411_EQ_411(...)   \,
-#define Z_IS_411U_EQ_411(...)  \,
-#define Z_IS_411_EQ_411U(...)  \,
-#define Z_IS_411U_EQ_411U(...) \,
-#define Z_IS_412_EQ_412(...)   \,
-#define Z_IS_412U_EQ_412(...)  \,
-#define Z_IS_412_EQ_412U(...)  \,
-#define Z_IS_412U_EQ_412U(...) \,
-#define Z_IS_413_EQ_413(...)   \,
-#define Z_IS_413U_EQ_413(...)  \,
-#define Z_IS_413_EQ_413U(...)  \,
-#define Z_IS_413U_EQ_413U(...) \,
-#define Z_IS_414_EQ_414(...)   \,
-#define Z_IS_414U_EQ_414(...)  \,
-#define Z_IS_414_EQ_414U(...)  \,
-#define Z_IS_414U_EQ_414U(...) \,
-#define Z_IS_415_EQ_415(...)   \,
-#define Z_IS_415U_EQ_415(...)  \,
-#define Z_IS_415_EQ_415U(...)  \,
-#define Z_IS_415U_EQ_415U(...) \,
-#define Z_IS_416_EQ_416(...)   \,
-#define Z_IS_416U_EQ_416(...)  \,
-#define Z_IS_416_EQ_416U(...)  \,
-#define Z_IS_416U_EQ_416U(...) \,
-#define Z_IS_417_EQ_417(...)   \,
-#define Z_IS_417U_EQ_417(...)  \,
-#define Z_IS_417_EQ_417U(...)  \,
-#define Z_IS_417U_EQ_417U(...) \,
-#define Z_IS_418_EQ_418(...)   \,
-#define Z_IS_418U_EQ_418(...)  \,
-#define Z_IS_418_EQ_418U(...)  \,
-#define Z_IS_418U_EQ_418U(...) \,
-#define Z_IS_419_EQ_419(...)   \,
-#define Z_IS_419U_EQ_419(...)  \,
-#define Z_IS_419_EQ_419U(...)  \,
-#define Z_IS_419U_EQ_419U(...) \,
-#define Z_IS_420_EQ_420(...)   \,
-#define Z_IS_420U_EQ_420(...)  \,
-#define Z_IS_420_EQ_420U(...)  \,
-#define Z_IS_420U_EQ_420U(...) \,
-#define Z_IS_421_EQ_421(...)   \,
-#define Z_IS_421U_EQ_421(...)  \,
-#define Z_IS_421_EQ_421U(...)  \,
-#define Z_IS_421U_EQ_421U(...) \,
-#define Z_IS_422_EQ_422(...)   \,
-#define Z_IS_422U_EQ_422(...)  \,
-#define Z_IS_422_EQ_422U(...)  \,
-#define Z_IS_422U_EQ_422U(...) \,
-#define Z_IS_423_EQ_423(...)   \,
-#define Z_IS_423U_EQ_423(...)  \,
-#define Z_IS_423_EQ_423U(...)  \,
-#define Z_IS_423U_EQ_423U(...) \,
-#define Z_IS_424_EQ_424(...)   \,
-#define Z_IS_424U_EQ_424(...)  \,
-#define Z_IS_424_EQ_424U(...)  \,
-#define Z_IS_424U_EQ_424U(...) \,
-#define Z_IS_425_EQ_425(...)   \,
-#define Z_IS_425U_EQ_425(...)  \,
-#define Z_IS_425_EQ_425U(...)  \,
-#define Z_IS_425U_EQ_425U(...) \,
-#define Z_IS_426_EQ_426(...)   \,
-#define Z_IS_426U_EQ_426(...)  \,
-#define Z_IS_426_EQ_426U(...)  \,
-#define Z_IS_426U_EQ_426U(...) \,
-#define Z_IS_427_EQ_427(...)   \,
-#define Z_IS_427U_EQ_427(...)  \,
-#define Z_IS_427_EQ_427U(...)  \,
-#define Z_IS_427U_EQ_427U(...) \,
-#define Z_IS_428_EQ_428(...)   \,
-#define Z_IS_428U_EQ_428(...)  \,
-#define Z_IS_428_EQ_428U(...)  \,
-#define Z_IS_428U_EQ_428U(...) \,
-#define Z_IS_429_EQ_429(...)   \,
-#define Z_IS_429U_EQ_429(...)  \,
-#define Z_IS_429_EQ_429U(...)  \,
-#define Z_IS_429U_EQ_429U(...) \,
-#define Z_IS_430_EQ_430(...)   \,
-#define Z_IS_430U_EQ_430(...)  \,
-#define Z_IS_430_EQ_430U(...)  \,
-#define Z_IS_430U_EQ_430U(...) \,
-#define Z_IS_431_EQ_431(...)   \,
-#define Z_IS_431U_EQ_431(...)  \,
-#define Z_IS_431_EQ_431U(...)  \,
-#define Z_IS_431U_EQ_431U(...) \,
-#define Z_IS_432_EQ_432(...)   \,
-#define Z_IS_432U_EQ_432(...)  \,
-#define Z_IS_432_EQ_432U(...)  \,
-#define Z_IS_432U_EQ_432U(...) \,
-#define Z_IS_433_EQ_433(...)   \,
-#define Z_IS_433U_EQ_433(...)  \,
-#define Z_IS_433_EQ_433U(...)  \,
-#define Z_IS_433U_EQ_433U(...) \,
-#define Z_IS_434_EQ_434(...)   \,
-#define Z_IS_434U_EQ_434(...)  \,
-#define Z_IS_434_EQ_434U(...)  \,
-#define Z_IS_434U_EQ_434U(...) \,
-#define Z_IS_435_EQ_435(...)   \,
-#define Z_IS_435U_EQ_435(...)  \,
-#define Z_IS_435_EQ_435U(...)  \,
-#define Z_IS_435U_EQ_435U(...) \,
-#define Z_IS_436_EQ_436(...)   \,
-#define Z_IS_436U_EQ_436(...)  \,
-#define Z_IS_436_EQ_436U(...)  \,
-#define Z_IS_436U_EQ_436U(...) \,
-#define Z_IS_437_EQ_437(...)   \,
-#define Z_IS_437U_EQ_437(...)  \,
-#define Z_IS_437_EQ_437U(...)  \,
-#define Z_IS_437U_EQ_437U(...) \,
-#define Z_IS_438_EQ_438(...)   \,
-#define Z_IS_438U_EQ_438(...)  \,
-#define Z_IS_438_EQ_438U(...)  \,
-#define Z_IS_438U_EQ_438U(...) \,
-#define Z_IS_439_EQ_439(...)   \,
-#define Z_IS_439U_EQ_439(...)  \,
-#define Z_IS_439_EQ_439U(...)  \,
-#define Z_IS_439U_EQ_439U(...) \,
-#define Z_IS_440_EQ_440(...)   \,
-#define Z_IS_440U_EQ_440(...)  \,
-#define Z_IS_440_EQ_440U(...)  \,
-#define Z_IS_440U_EQ_440U(...) \,
-#define Z_IS_441_EQ_441(...)   \,
-#define Z_IS_441U_EQ_441(...)  \,
-#define Z_IS_441_EQ_441U(...)  \,
-#define Z_IS_441U_EQ_441U(...) \,
-#define Z_IS_442_EQ_442(...)   \,
-#define Z_IS_442U_EQ_442(...)  \,
-#define Z_IS_442_EQ_442U(...)  \,
-#define Z_IS_442U_EQ_442U(...) \,
-#define Z_IS_443_EQ_443(...)   \,
-#define Z_IS_443U_EQ_443(...)  \,
-#define Z_IS_443_EQ_443U(...)  \,
-#define Z_IS_443U_EQ_443U(...) \,
-#define Z_IS_444_EQ_444(...)   \,
-#define Z_IS_444U_EQ_444(...)  \,
-#define Z_IS_444_EQ_444U(...)  \,
-#define Z_IS_444U_EQ_444U(...) \,
-#define Z_IS_445_EQ_445(...)   \,
-#define Z_IS_445U_EQ_445(...)  \,
-#define Z_IS_445_EQ_445U(...)  \,
-#define Z_IS_445U_EQ_445U(...) \,
-#define Z_IS_446_EQ_446(...)   \,
-#define Z_IS_446U_EQ_446(...)  \,
-#define Z_IS_446_EQ_446U(...)  \,
-#define Z_IS_446U_EQ_446U(...) \,
-#define Z_IS_447_EQ_447(...)   \,
-#define Z_IS_447U_EQ_447(...)  \,
-#define Z_IS_447_EQ_447U(...)  \,
-#define Z_IS_447U_EQ_447U(...) \,
-#define Z_IS_448_EQ_448(...)   \,
-#define Z_IS_448U_EQ_448(...)  \,
-#define Z_IS_448_EQ_448U(...)  \,
-#define Z_IS_448U_EQ_448U(...) \,
-#define Z_IS_449_EQ_449(...)   \,
-#define Z_IS_449U_EQ_449(...)  \,
-#define Z_IS_449_EQ_449U(...)  \,
-#define Z_IS_449U_EQ_449U(...) \,
-#define Z_IS_450_EQ_450(...)   \,
-#define Z_IS_450U_EQ_450(...)  \,
-#define Z_IS_450_EQ_450U(...)  \,
-#define Z_IS_450U_EQ_450U(...) \,
-#define Z_IS_451_EQ_451(...)   \,
-#define Z_IS_451U_EQ_451(...)  \,
-#define Z_IS_451_EQ_451U(...)  \,
-#define Z_IS_451U_EQ_451U(...) \,
-#define Z_IS_452_EQ_452(...)   \,
-#define Z_IS_452U_EQ_452(...)  \,
-#define Z_IS_452_EQ_452U(...)  \,
-#define Z_IS_452U_EQ_452U(...) \,
-#define Z_IS_453_EQ_453(...)   \,
-#define Z_IS_453U_EQ_453(...)  \,
-#define Z_IS_453_EQ_453U(...)  \,
-#define Z_IS_453U_EQ_453U(...) \,
-#define Z_IS_454_EQ_454(...)   \,
-#define Z_IS_454U_EQ_454(...)  \,
-#define Z_IS_454_EQ_454U(...)  \,
-#define Z_IS_454U_EQ_454U(...) \,
-#define Z_IS_455_EQ_455(...)   \,
-#define Z_IS_455U_EQ_455(...)  \,
-#define Z_IS_455_EQ_455U(...)  \,
-#define Z_IS_455U_EQ_455U(...) \,
-#define Z_IS_456_EQ_456(...)   \,
-#define Z_IS_456U_EQ_456(...)  \,
-#define Z_IS_456_EQ_456U(...)  \,
-#define Z_IS_456U_EQ_456U(...) \,
-#define Z_IS_457_EQ_457(...)   \,
-#define Z_IS_457U_EQ_457(...)  \,
-#define Z_IS_457_EQ_457U(...)  \,
-#define Z_IS_457U_EQ_457U(...) \,
-#define Z_IS_458_EQ_458(...)   \,
-#define Z_IS_458U_EQ_458(...)  \,
-#define Z_IS_458_EQ_458U(...)  \,
-#define Z_IS_458U_EQ_458U(...) \,
-#define Z_IS_459_EQ_459(...)   \,
-#define Z_IS_459U_EQ_459(...)  \,
-#define Z_IS_459_EQ_459U(...)  \,
-#define Z_IS_459U_EQ_459U(...) \,
-#define Z_IS_460_EQ_460(...)   \,
-#define Z_IS_460U_EQ_460(...)  \,
-#define Z_IS_460_EQ_460U(...)  \,
-#define Z_IS_460U_EQ_460U(...) \,
-#define Z_IS_461_EQ_461(...)   \,
-#define Z_IS_461U_EQ_461(...)  \,
-#define Z_IS_461_EQ_461U(...)  \,
-#define Z_IS_461U_EQ_461U(...) \,
-#define Z_IS_462_EQ_462(...)   \,
-#define Z_IS_462U_EQ_462(...)  \,
-#define Z_IS_462_EQ_462U(...)  \,
-#define Z_IS_462U_EQ_462U(...) \,
-#define Z_IS_463_EQ_463(...)   \,
-#define Z_IS_463U_EQ_463(...)  \,
-#define Z_IS_463_EQ_463U(...)  \,
-#define Z_IS_463U_EQ_463U(...) \,
-#define Z_IS_464_EQ_464(...)   \,
-#define Z_IS_464U_EQ_464(...)  \,
-#define Z_IS_464_EQ_464U(...)  \,
-#define Z_IS_464U_EQ_464U(...) \,
-#define Z_IS_465_EQ_465(...)   \,
-#define Z_IS_465U_EQ_465(...)  \,
-#define Z_IS_465_EQ_465U(...)  \,
-#define Z_IS_465U_EQ_465U(...) \,
-#define Z_IS_466_EQ_466(...)   \,
-#define Z_IS_466U_EQ_466(...)  \,
-#define Z_IS_466_EQ_466U(...)  \,
-#define Z_IS_466U_EQ_466U(...) \,
-#define Z_IS_467_EQ_467(...)   \,
-#define Z_IS_467U_EQ_467(...)  \,
-#define Z_IS_467_EQ_467U(...)  \,
-#define Z_IS_467U_EQ_467U(...) \,
-#define Z_IS_468_EQ_468(...)   \,
-#define Z_IS_468U_EQ_468(...)  \,
-#define Z_IS_468_EQ_468U(...)  \,
-#define Z_IS_468U_EQ_468U(...) \,
-#define Z_IS_469_EQ_469(...)   \,
-#define Z_IS_469U_EQ_469(...)  \,
-#define Z_IS_469_EQ_469U(...)  \,
-#define Z_IS_469U_EQ_469U(...) \,
-#define Z_IS_470_EQ_470(...)   \,
-#define Z_IS_470U_EQ_470(...)  \,
-#define Z_IS_470_EQ_470U(...)  \,
-#define Z_IS_470U_EQ_470U(...) \,
-#define Z_IS_471_EQ_471(...)   \,
-#define Z_IS_471U_EQ_471(...)  \,
-#define Z_IS_471_EQ_471U(...)  \,
-#define Z_IS_471U_EQ_471U(...) \,
-#define Z_IS_472_EQ_472(...)   \,
-#define Z_IS_472U_EQ_472(...)  \,
-#define Z_IS_472_EQ_472U(...)  \,
-#define Z_IS_472U_EQ_472U(...) \,
-#define Z_IS_473_EQ_473(...)   \,
-#define Z_IS_473U_EQ_473(...)  \,
-#define Z_IS_473_EQ_473U(...)  \,
-#define Z_IS_473U_EQ_473U(...) \,
-#define Z_IS_474_EQ_474(...)   \,
-#define Z_IS_474U_EQ_474(...)  \,
-#define Z_IS_474_EQ_474U(...)  \,
-#define Z_IS_474U_EQ_474U(...) \,
-#define Z_IS_475_EQ_475(...)   \,
-#define Z_IS_475U_EQ_475(...)  \,
-#define Z_IS_475_EQ_475U(...)  \,
-#define Z_IS_475U_EQ_475U(...) \,
-#define Z_IS_476_EQ_476(...)   \,
-#define Z_IS_476U_EQ_476(...)  \,
-#define Z_IS_476_EQ_476U(...)  \,
-#define Z_IS_476U_EQ_476U(...) \,
-#define Z_IS_477_EQ_477(...)   \,
-#define Z_IS_477U_EQ_477(...)  \,
-#define Z_IS_477_EQ_477U(...)  \,
-#define Z_IS_477U_EQ_477U(...) \,
-#define Z_IS_478_EQ_478(...)   \,
-#define Z_IS_478U_EQ_478(...)  \,
-#define Z_IS_478_EQ_478U(...)  \,
-#define Z_IS_478U_EQ_478U(...) \,
-#define Z_IS_479_EQ_479(...)   \,
-#define Z_IS_479U_EQ_479(...)  \,
-#define Z_IS_479_EQ_479U(...)  \,
-#define Z_IS_479U_EQ_479U(...) \,
-#define Z_IS_480_EQ_480(...)   \,
-#define Z_IS_480U_EQ_480(...)  \,
-#define Z_IS_480_EQ_480U(...)  \,
-#define Z_IS_480U_EQ_480U(...) \,
-#define Z_IS_481_EQ_481(...)   \,
-#define Z_IS_481U_EQ_481(...)  \,
-#define Z_IS_481_EQ_481U(...)  \,
-#define Z_IS_481U_EQ_481U(...) \,
-#define Z_IS_482_EQ_482(...)   \,
-#define Z_IS_482U_EQ_482(...)  \,
-#define Z_IS_482_EQ_482U(...)  \,
-#define Z_IS_482U_EQ_482U(...) \,
-#define Z_IS_483_EQ_483(...)   \,
-#define Z_IS_483U_EQ_483(...)  \,
-#define Z_IS_483_EQ_483U(...)  \,
-#define Z_IS_483U_EQ_483U(...) \,
-#define Z_IS_484_EQ_484(...)   \,
-#define Z_IS_484U_EQ_484(...)  \,
-#define Z_IS_484_EQ_484U(...)  \,
-#define Z_IS_484U_EQ_484U(...) \,
-#define Z_IS_485_EQ_485(...)   \,
-#define Z_IS_485U_EQ_485(...)  \,
-#define Z_IS_485_EQ_485U(...)  \,
-#define Z_IS_485U_EQ_485U(...) \,
-#define Z_IS_486_EQ_486(...)   \,
-#define Z_IS_486U_EQ_486(...)  \,
-#define Z_IS_486_EQ_486U(...)  \,
-#define Z_IS_486U_EQ_486U(...) \,
-#define Z_IS_487_EQ_487(...)   \,
-#define Z_IS_487U_EQ_487(...)  \,
-#define Z_IS_487_EQ_487U(...)  \,
-#define Z_IS_487U_EQ_487U(...) \,
-#define Z_IS_488_EQ_488(...)   \,
-#define Z_IS_488U_EQ_488(...)  \,
-#define Z_IS_488_EQ_488U(...)  \,
-#define Z_IS_488U_EQ_488U(...) \,
-#define Z_IS_489_EQ_489(...)   \,
-#define Z_IS_489U_EQ_489(...)  \,
-#define Z_IS_489_EQ_489U(...)  \,
-#define Z_IS_489U_EQ_489U(...) \,
-#define Z_IS_490_EQ_490(...)   \,
-#define Z_IS_490U_EQ_490(...)  \,
-#define Z_IS_490_EQ_490U(...)  \,
-#define Z_IS_490U_EQ_490U(...) \,
-#define Z_IS_491_EQ_491(...)   \,
-#define Z_IS_491U_EQ_491(...)  \,
-#define Z_IS_491_EQ_491U(...)  \,
-#define Z_IS_491U_EQ_491U(...) \,
-#define Z_IS_492_EQ_492(...)   \,
-#define Z_IS_492U_EQ_492(...)  \,
-#define Z_IS_492_EQ_492U(...)  \,
-#define Z_IS_492U_EQ_492U(...) \,
-#define Z_IS_493_EQ_493(...)   \,
-#define Z_IS_493U_EQ_493(...)  \,
-#define Z_IS_493_EQ_493U(...)  \,
-#define Z_IS_493U_EQ_493U(...) \,
-#define Z_IS_494_EQ_494(...)   \,
-#define Z_IS_494U_EQ_494(...)  \,
-#define Z_IS_494_EQ_494U(...)  \,
-#define Z_IS_494U_EQ_494U(...) \,
-#define Z_IS_495_EQ_495(...)   \,
-#define Z_IS_495U_EQ_495(...)  \,
-#define Z_IS_495_EQ_495U(...)  \,
-#define Z_IS_495U_EQ_495U(...) \,
-#define Z_IS_496_EQ_496(...)   \,
-#define Z_IS_496U_EQ_496(...)  \,
-#define Z_IS_496_EQ_496U(...)  \,
-#define Z_IS_496U_EQ_496U(...) \,
-#define Z_IS_497_EQ_497(...)   \,
-#define Z_IS_497U_EQ_497(...)  \,
-#define Z_IS_497_EQ_497U(...)  \,
-#define Z_IS_497U_EQ_497U(...) \,
-#define Z_IS_498_EQ_498(...)   \,
-#define Z_IS_498U_EQ_498(...)  \,
-#define Z_IS_498_EQ_498U(...)  \,
-#define Z_IS_498U_EQ_498U(...) \,
-#define Z_IS_499_EQ_499(...)   \,
-#define Z_IS_499U_EQ_499(...)  \,
-#define Z_IS_499_EQ_499U(...)  \,
-#define Z_IS_499U_EQ_499U(...) \,
-#define Z_IS_500_EQ_500(...)   \,
-#define Z_IS_500U_EQ_500(...)  \,
-#define Z_IS_500_EQ_500U(...)  \,
-#define Z_IS_500U_EQ_500U(...) \,
-#define Z_IS_501_EQ_501(...)   \,
-#define Z_IS_501U_EQ_501(...)  \,
-#define Z_IS_501_EQ_501U(...)  \,
-#define Z_IS_501U_EQ_501U(...) \,
-#define Z_IS_502_EQ_502(...)   \,
-#define Z_IS_502U_EQ_502(...)  \,
-#define Z_IS_502_EQ_502U(...)  \,
-#define Z_IS_502U_EQ_502U(...) \,
-#define Z_IS_503_EQ_503(...)   \,
-#define Z_IS_503U_EQ_503(...)  \,
-#define Z_IS_503_EQ_503U(...)  \,
-#define Z_IS_503U_EQ_503U(...) \,
-#define Z_IS_504_EQ_504(...)   \,
-#define Z_IS_504U_EQ_504(...)  \,
-#define Z_IS_504_EQ_504U(...)  \,
-#define Z_IS_504U_EQ_504U(...) \,
-#define Z_IS_505_EQ_505(...)   \,
-#define Z_IS_505U_EQ_505(...)  \,
-#define Z_IS_505_EQ_505U(...)  \,
-#define Z_IS_505U_EQ_505U(...) \,
-#define Z_IS_506_EQ_506(...)   \,
-#define Z_IS_506U_EQ_506(...)  \,
-#define Z_IS_506_EQ_506U(...)  \,
-#define Z_IS_506U_EQ_506U(...) \,
-#define Z_IS_507_EQ_507(...)   \,
-#define Z_IS_507U_EQ_507(...)  \,
-#define Z_IS_507_EQ_507U(...)  \,
-#define Z_IS_507U_EQ_507U(...) \,
-#define Z_IS_508_EQ_508(...)   \,
-#define Z_IS_508U_EQ_508(...)  \,
-#define Z_IS_508_EQ_508U(...)  \,
-#define Z_IS_508U_EQ_508U(...) \,
-#define Z_IS_509_EQ_509(...)   \,
-#define Z_IS_509U_EQ_509(...)  \,
-#define Z_IS_509_EQ_509U(...)  \,
-#define Z_IS_509U_EQ_509U(...) \,
-#define Z_IS_510_EQ_510(...)   \,
-#define Z_IS_510U_EQ_510(...)  \,
-#define Z_IS_510_EQ_510U(...)  \,
-#define Z_IS_510U_EQ_510U(...) \,
-#define Z_IS_511_EQ_511(...)   \,
-#define Z_IS_511U_EQ_511(...)  \,
-#define Z_IS_511_EQ_511U(...)  \,
-#define Z_IS_511U_EQ_511U(...) \,
-#define Z_IS_512_EQ_512(...)   \,
-#define Z_IS_512U_EQ_512(...)  \,
-#define Z_IS_512_EQ_512U(...)  \,
-#define Z_IS_512U_EQ_512U(...) \,
-#define Z_IS_513_EQ_513(...)   \,
-#define Z_IS_513U_EQ_513(...)  \,
-#define Z_IS_513_EQ_513U(...)  \,
-#define Z_IS_513U_EQ_513U(...) \,
-#define Z_IS_514_EQ_514(...)   \,
-#define Z_IS_514U_EQ_514(...)  \,
-#define Z_IS_514_EQ_514U(...)  \,
-#define Z_IS_514U_EQ_514U(...) \,
-#define Z_IS_515_EQ_515(...)   \,
-#define Z_IS_515U_EQ_515(...)  \,
-#define Z_IS_515_EQ_515U(...)  \,
-#define Z_IS_515U_EQ_515U(...) \,
-#define Z_IS_516_EQ_516(...)   \,
-#define Z_IS_516U_EQ_516(...)  \,
-#define Z_IS_516_EQ_516U(...)  \,
-#define Z_IS_516U_EQ_516U(...) \,
-#define Z_IS_517_EQ_517(...)   \,
-#define Z_IS_517U_EQ_517(...)  \,
-#define Z_IS_517_EQ_517U(...)  \,
-#define Z_IS_517U_EQ_517U(...) \,
-#define Z_IS_518_EQ_518(...)   \,
-#define Z_IS_518U_EQ_518(...)  \,
-#define Z_IS_518_EQ_518U(...)  \,
-#define Z_IS_518U_EQ_518U(...) \,
-#define Z_IS_519_EQ_519(...)   \,
-#define Z_IS_519U_EQ_519(...)  \,
-#define Z_IS_519_EQ_519U(...)  \,
-#define Z_IS_519U_EQ_519U(...) \,
-#define Z_IS_520_EQ_520(...)   \,
-#define Z_IS_520U_EQ_520(...)  \,
-#define Z_IS_520_EQ_520U(...)  \,
-#define Z_IS_520U_EQ_520U(...) \,
-#define Z_IS_521_EQ_521(...)   \,
-#define Z_IS_521U_EQ_521(...)  \,
-#define Z_IS_521_EQ_521U(...)  \,
-#define Z_IS_521U_EQ_521U(...) \,
-#define Z_IS_522_EQ_522(...)   \,
-#define Z_IS_522U_EQ_522(...)  \,
-#define Z_IS_522_EQ_522U(...)  \,
-#define Z_IS_522U_EQ_522U(...) \,
-#define Z_IS_523_EQ_523(...)   \,
-#define Z_IS_523U_EQ_523(...)  \,
-#define Z_IS_523_EQ_523U(...)  \,
-#define Z_IS_523U_EQ_523U(...) \,
-#define Z_IS_524_EQ_524(...)   \,
-#define Z_IS_524U_EQ_524(...)  \,
-#define Z_IS_524_EQ_524U(...)  \,
-#define Z_IS_524U_EQ_524U(...) \,
-#define Z_IS_525_EQ_525(...)   \,
-#define Z_IS_525U_EQ_525(...)  \,
-#define Z_IS_525_EQ_525U(...)  \,
-#define Z_IS_525U_EQ_525U(...) \,
-#define Z_IS_526_EQ_526(...)   \,
-#define Z_IS_526U_EQ_526(...)  \,
-#define Z_IS_526_EQ_526U(...)  \,
-#define Z_IS_526U_EQ_526U(...) \,
-#define Z_IS_527_EQ_527(...)   \,
-#define Z_IS_527U_EQ_527(...)  \,
-#define Z_IS_527_EQ_527U(...)  \,
-#define Z_IS_527U_EQ_527U(...) \,
-#define Z_IS_528_EQ_528(...)   \,
-#define Z_IS_528U_EQ_528(...)  \,
-#define Z_IS_528_EQ_528U(...)  \,
-#define Z_IS_528U_EQ_528U(...) \,
-#define Z_IS_529_EQ_529(...)   \,
-#define Z_IS_529U_EQ_529(...)  \,
-#define Z_IS_529_EQ_529U(...)  \,
-#define Z_IS_529U_EQ_529U(...) \,
-#define Z_IS_530_EQ_530(...)   \,
-#define Z_IS_530U_EQ_530(...)  \,
-#define Z_IS_530_EQ_530U(...)  \,
-#define Z_IS_530U_EQ_530U(...) \,
-#define Z_IS_531_EQ_531(...)   \,
-#define Z_IS_531U_EQ_531(...)  \,
-#define Z_IS_531_EQ_531U(...)  \,
-#define Z_IS_531U_EQ_531U(...) \,
-#define Z_IS_532_EQ_532(...)   \,
-#define Z_IS_532U_EQ_532(...)  \,
-#define Z_IS_532_EQ_532U(...)  \,
-#define Z_IS_532U_EQ_532U(...) \,
-#define Z_IS_533_EQ_533(...)   \,
-#define Z_IS_533U_EQ_533(...)  \,
-#define Z_IS_533_EQ_533U(...)  \,
-#define Z_IS_533U_EQ_533U(...) \,
-#define Z_IS_534_EQ_534(...)   \,
-#define Z_IS_534U_EQ_534(...)  \,
-#define Z_IS_534_EQ_534U(...)  \,
-#define Z_IS_534U_EQ_534U(...) \,
-#define Z_IS_535_EQ_535(...)   \,
-#define Z_IS_535U_EQ_535(...)  \,
-#define Z_IS_535_EQ_535U(...)  \,
-#define Z_IS_535U_EQ_535U(...) \,
-#define Z_IS_536_EQ_536(...)   \,
-#define Z_IS_536U_EQ_536(...)  \,
-#define Z_IS_536_EQ_536U(...)  \,
-#define Z_IS_536U_EQ_536U(...) \,
-#define Z_IS_537_EQ_537(...)   \,
-#define Z_IS_537U_EQ_537(...)  \,
-#define Z_IS_537_EQ_537U(...)  \,
-#define Z_IS_537U_EQ_537U(...) \,
-#define Z_IS_538_EQ_538(...)   \,
-#define Z_IS_538U_EQ_538(...)  \,
-#define Z_IS_538_EQ_538U(...)  \,
-#define Z_IS_538U_EQ_538U(...) \,
-#define Z_IS_539_EQ_539(...)   \,
-#define Z_IS_539U_EQ_539(...)  \,
-#define Z_IS_539_EQ_539U(...)  \,
-#define Z_IS_539U_EQ_539U(...) \,
-#define Z_IS_540_EQ_540(...)   \,
-#define Z_IS_540U_EQ_540(...)  \,
-#define Z_IS_540_EQ_540U(...)  \,
-#define Z_IS_540U_EQ_540U(...) \,
-#define Z_IS_541_EQ_541(...)   \,
-#define Z_IS_541U_EQ_541(...)  \,
-#define Z_IS_541_EQ_541U(...)  \,
-#define Z_IS_541U_EQ_541U(...) \,
-#define Z_IS_542_EQ_542(...)   \,
-#define Z_IS_542U_EQ_542(...)  \,
-#define Z_IS_542_EQ_542U(...)  \,
-#define Z_IS_542U_EQ_542U(...) \,
-#define Z_IS_543_EQ_543(...)   \,
-#define Z_IS_543U_EQ_543(...)  \,
-#define Z_IS_543_EQ_543U(...)  \,
-#define Z_IS_543U_EQ_543U(...) \,
-#define Z_IS_544_EQ_544(...)   \,
-#define Z_IS_544U_EQ_544(...)  \,
-#define Z_IS_544_EQ_544U(...)  \,
-#define Z_IS_544U_EQ_544U(...) \,
-#define Z_IS_545_EQ_545(...)   \,
-#define Z_IS_545U_EQ_545(...)  \,
-#define Z_IS_545_EQ_545U(...)  \,
-#define Z_IS_545U_EQ_545U(...) \,
-#define Z_IS_546_EQ_546(...)   \,
-#define Z_IS_546U_EQ_546(...)  \,
-#define Z_IS_546_EQ_546U(...)  \,
-#define Z_IS_546U_EQ_546U(...) \,
-#define Z_IS_547_EQ_547(...)   \,
-#define Z_IS_547U_EQ_547(...)  \,
-#define Z_IS_547_EQ_547U(...)  \,
-#define Z_IS_547U_EQ_547U(...) \,
-#define Z_IS_548_EQ_548(...)   \,
-#define Z_IS_548U_EQ_548(...)  \,
-#define Z_IS_548_EQ_548U(...)  \,
-#define Z_IS_548U_EQ_548U(...) \,
-#define Z_IS_549_EQ_549(...)   \,
-#define Z_IS_549U_EQ_549(...)  \,
-#define Z_IS_549_EQ_549U(...)  \,
-#define Z_IS_549U_EQ_549U(...) \,
-#define Z_IS_550_EQ_550(...)   \,
-#define Z_IS_550U_EQ_550(...)  \,
-#define Z_IS_550_EQ_550U(...)  \,
-#define Z_IS_550U_EQ_550U(...) \,
-#define Z_IS_551_EQ_551(...)   \,
-#define Z_IS_551U_EQ_551(...)  \,
-#define Z_IS_551_EQ_551U(...)  \,
-#define Z_IS_551U_EQ_551U(...) \,
-#define Z_IS_552_EQ_552(...)   \,
-#define Z_IS_552U_EQ_552(...)  \,
-#define Z_IS_552_EQ_552U(...)  \,
-#define Z_IS_552U_EQ_552U(...) \,
-#define Z_IS_553_EQ_553(...)   \,
-#define Z_IS_553U_EQ_553(...)  \,
-#define Z_IS_553_EQ_553U(...)  \,
-#define Z_IS_553U_EQ_553U(...) \,
-#define Z_IS_554_EQ_554(...)   \,
-#define Z_IS_554U_EQ_554(...)  \,
-#define Z_IS_554_EQ_554U(...)  \,
-#define Z_IS_554U_EQ_554U(...) \,
-#define Z_IS_555_EQ_555(...)   \,
-#define Z_IS_555U_EQ_555(...)  \,
-#define Z_IS_555_EQ_555U(...)  \,
-#define Z_IS_555U_EQ_555U(...) \,
-#define Z_IS_556_EQ_556(...)   \,
-#define Z_IS_556U_EQ_556(...)  \,
-#define Z_IS_556_EQ_556U(...)  \,
-#define Z_IS_556U_EQ_556U(...) \,
-#define Z_IS_557_EQ_557(...)   \,
-#define Z_IS_557U_EQ_557(...)  \,
-#define Z_IS_557_EQ_557U(...)  \,
-#define Z_IS_557U_EQ_557U(...) \,
-#define Z_IS_558_EQ_558(...)   \,
-#define Z_IS_558U_EQ_558(...)  \,
-#define Z_IS_558_EQ_558U(...)  \,
-#define Z_IS_558U_EQ_558U(...) \,
-#define Z_IS_559_EQ_559(...)   \,
-#define Z_IS_559U_EQ_559(...)  \,
-#define Z_IS_559_EQ_559U(...)  \,
-#define Z_IS_559U_EQ_559U(...) \,
-#define Z_IS_560_EQ_560(...)   \,
-#define Z_IS_560U_EQ_560(...)  \,
-#define Z_IS_560_EQ_560U(...)  \,
-#define Z_IS_560U_EQ_560U(...) \,
-#define Z_IS_561_EQ_561(...)   \,
-#define Z_IS_561U_EQ_561(...)  \,
-#define Z_IS_561_EQ_561U(...)  \,
-#define Z_IS_561U_EQ_561U(...) \,
-#define Z_IS_562_EQ_562(...)   \,
-#define Z_IS_562U_EQ_562(...)  \,
-#define Z_IS_562_EQ_562U(...)  \,
-#define Z_IS_562U_EQ_562U(...) \,
-#define Z_IS_563_EQ_563(...)   \,
-#define Z_IS_563U_EQ_563(...)  \,
-#define Z_IS_563_EQ_563U(...)  \,
-#define Z_IS_563U_EQ_563U(...) \,
-#define Z_IS_564_EQ_564(...)   \,
-#define Z_IS_564U_EQ_564(...)  \,
-#define Z_IS_564_EQ_564U(...)  \,
-#define Z_IS_564U_EQ_564U(...) \,
-#define Z_IS_565_EQ_565(...)   \,
-#define Z_IS_565U_EQ_565(...)  \,
-#define Z_IS_565_EQ_565U(...)  \,
-#define Z_IS_565U_EQ_565U(...) \,
-#define Z_IS_566_EQ_566(...)   \,
-#define Z_IS_566U_EQ_566(...)  \,
-#define Z_IS_566_EQ_566U(...)  \,
-#define Z_IS_566U_EQ_566U(...) \,
-#define Z_IS_567_EQ_567(...)   \,
-#define Z_IS_567U_EQ_567(...)  \,
-#define Z_IS_567_EQ_567U(...)  \,
-#define Z_IS_567U_EQ_567U(...) \,
-#define Z_IS_568_EQ_568(...)   \,
-#define Z_IS_568U_EQ_568(...)  \,
-#define Z_IS_568_EQ_568U(...)  \,
-#define Z_IS_568U_EQ_568U(...) \,
-#define Z_IS_569_EQ_569(...)   \,
-#define Z_IS_569U_EQ_569(...)  \,
-#define Z_IS_569_EQ_569U(...)  \,
-#define Z_IS_569U_EQ_569U(...) \,
-#define Z_IS_570_EQ_570(...)   \,
-#define Z_IS_570U_EQ_570(...)  \,
-#define Z_IS_570_EQ_570U(...)  \,
-#define Z_IS_570U_EQ_570U(...) \,
-#define Z_IS_571_EQ_571(...)   \,
-#define Z_IS_571U_EQ_571(...)  \,
-#define Z_IS_571_EQ_571U(...)  \,
-#define Z_IS_571U_EQ_571U(...) \,
-#define Z_IS_572_EQ_572(...)   \,
-#define Z_IS_572U_EQ_572(...)  \,
-#define Z_IS_572_EQ_572U(...)  \,
-#define Z_IS_572U_EQ_572U(...) \,
-#define Z_IS_573_EQ_573(...)   \,
-#define Z_IS_573U_EQ_573(...)  \,
-#define Z_IS_573_EQ_573U(...)  \,
-#define Z_IS_573U_EQ_573U(...) \,
-#define Z_IS_574_EQ_574(...)   \,
-#define Z_IS_574U_EQ_574(...)  \,
-#define Z_IS_574_EQ_574U(...)  \,
-#define Z_IS_574U_EQ_574U(...) \,
-#define Z_IS_575_EQ_575(...)   \,
-#define Z_IS_575U_EQ_575(...)  \,
-#define Z_IS_575_EQ_575U(...)  \,
-#define Z_IS_575U_EQ_575U(...) \,
-#define Z_IS_576_EQ_576(...)   \,
-#define Z_IS_576U_EQ_576(...)  \,
-#define Z_IS_576_EQ_576U(...)  \,
-#define Z_IS_576U_EQ_576U(...) \,
-#define Z_IS_577_EQ_577(...)   \,
-#define Z_IS_577U_EQ_577(...)  \,
-#define Z_IS_577_EQ_577U(...)  \,
-#define Z_IS_577U_EQ_577U(...) \,
-#define Z_IS_578_EQ_578(...)   \,
-#define Z_IS_578U_EQ_578(...)  \,
-#define Z_IS_578_EQ_578U(...)  \,
-#define Z_IS_578U_EQ_578U(...) \,
-#define Z_IS_579_EQ_579(...)   \,
-#define Z_IS_579U_EQ_579(...)  \,
-#define Z_IS_579_EQ_579U(...)  \,
-#define Z_IS_579U_EQ_579U(...) \,
-#define Z_IS_580_EQ_580(...)   \,
-#define Z_IS_580U_EQ_580(...)  \,
-#define Z_IS_580_EQ_580U(...)  \,
-#define Z_IS_580U_EQ_580U(...) \,
-#define Z_IS_581_EQ_581(...)   \,
-#define Z_IS_581U_EQ_581(...)  \,
-#define Z_IS_581_EQ_581U(...)  \,
-#define Z_IS_581U_EQ_581U(...) \,
-#define Z_IS_582_EQ_582(...)   \,
-#define Z_IS_582U_EQ_582(...)  \,
-#define Z_IS_582_EQ_582U(...)  \,
-#define Z_IS_582U_EQ_582U(...) \,
-#define Z_IS_583_EQ_583(...)   \,
-#define Z_IS_583U_EQ_583(...)  \,
-#define Z_IS_583_EQ_583U(...)  \,
-#define Z_IS_583U_EQ_583U(...) \,
-#define Z_IS_584_EQ_584(...)   \,
-#define Z_IS_584U_EQ_584(...)  \,
-#define Z_IS_584_EQ_584U(...)  \,
-#define Z_IS_584U_EQ_584U(...) \,
-#define Z_IS_585_EQ_585(...)   \,
-#define Z_IS_585U_EQ_585(...)  \,
-#define Z_IS_585_EQ_585U(...)  \,
-#define Z_IS_585U_EQ_585U(...) \,
-#define Z_IS_586_EQ_586(...)   \,
-#define Z_IS_586U_EQ_586(...)  \,
-#define Z_IS_586_EQ_586U(...)  \,
-#define Z_IS_586U_EQ_586U(...) \,
-#define Z_IS_587_EQ_587(...)   \,
-#define Z_IS_587U_EQ_587(...)  \,
-#define Z_IS_587_EQ_587U(...)  \,
-#define Z_IS_587U_EQ_587U(...) \,
-#define Z_IS_588_EQ_588(...)   \,
-#define Z_IS_588U_EQ_588(...)  \,
-#define Z_IS_588_EQ_588U(...)  \,
-#define Z_IS_588U_EQ_588U(...) \,
-#define Z_IS_589_EQ_589(...)   \,
-#define Z_IS_589U_EQ_589(...)  \,
-#define Z_IS_589_EQ_589U(...)  \,
-#define Z_IS_589U_EQ_589U(...) \,
-#define Z_IS_590_EQ_590(...)   \,
-#define Z_IS_590U_EQ_590(...)  \,
-#define Z_IS_590_EQ_590U(...)  \,
-#define Z_IS_590U_EQ_590U(...) \,
-#define Z_IS_591_EQ_591(...)   \,
-#define Z_IS_591U_EQ_591(...)  \,
-#define Z_IS_591_EQ_591U(...)  \,
-#define Z_IS_591U_EQ_591U(...) \,
-#define Z_IS_592_EQ_592(...)   \,
-#define Z_IS_592U_EQ_592(...)  \,
-#define Z_IS_592_EQ_592U(...)  \,
-#define Z_IS_592U_EQ_592U(...) \,
-#define Z_IS_593_EQ_593(...)   \,
-#define Z_IS_593U_EQ_593(...)  \,
-#define Z_IS_593_EQ_593U(...)  \,
-#define Z_IS_593U_EQ_593U(...) \,
-#define Z_IS_594_EQ_594(...)   \,
-#define Z_IS_594U_EQ_594(...)  \,
-#define Z_IS_594_EQ_594U(...)  \,
-#define Z_IS_594U_EQ_594U(...) \,
-#define Z_IS_595_EQ_595(...)   \,
-#define Z_IS_595U_EQ_595(...)  \,
-#define Z_IS_595_EQ_595U(...)  \,
-#define Z_IS_595U_EQ_595U(...) \,
-#define Z_IS_596_EQ_596(...)   \,
-#define Z_IS_596U_EQ_596(...)  \,
-#define Z_IS_596_EQ_596U(...)  \,
-#define Z_IS_596U_EQ_596U(...) \,
-#define Z_IS_597_EQ_597(...)   \,
-#define Z_IS_597U_EQ_597(...)  \,
-#define Z_IS_597_EQ_597U(...)  \,
-#define Z_IS_597U_EQ_597U(...) \,
-#define Z_IS_598_EQ_598(...)   \,
-#define Z_IS_598U_EQ_598(...)  \,
-#define Z_IS_598_EQ_598U(...)  \,
-#define Z_IS_598U_EQ_598U(...) \,
-#define Z_IS_599_EQ_599(...)   \,
-#define Z_IS_599U_EQ_599(...)  \,
-#define Z_IS_599_EQ_599U(...)  \,
-#define Z_IS_599U_EQ_599U(...) \,
-#define Z_IS_600_EQ_600(...)   \,
-#define Z_IS_600U_EQ_600(...)  \,
-#define Z_IS_600_EQ_600U(...)  \,
-#define Z_IS_600U_EQ_600U(...) \,
-#define Z_IS_601_EQ_601(...)   \,
-#define Z_IS_601U_EQ_601(...)  \,
-#define Z_IS_601_EQ_601U(...)  \,
-#define Z_IS_601U_EQ_601U(...) \,
-#define Z_IS_602_EQ_602(...)   \,
-#define Z_IS_602U_EQ_602(...)  \,
-#define Z_IS_602_EQ_602U(...)  \,
-#define Z_IS_602U_EQ_602U(...) \,
-#define Z_IS_603_EQ_603(...)   \,
-#define Z_IS_603U_EQ_603(...)  \,
-#define Z_IS_603_EQ_603U(...)  \,
-#define Z_IS_603U_EQ_603U(...) \,
-#define Z_IS_604_EQ_604(...)   \,
-#define Z_IS_604U_EQ_604(...)  \,
-#define Z_IS_604_EQ_604U(...)  \,
-#define Z_IS_604U_EQ_604U(...) \,
-#define Z_IS_605_EQ_605(...)   \,
-#define Z_IS_605U_EQ_605(...)  \,
-#define Z_IS_605_EQ_605U(...)  \,
-#define Z_IS_605U_EQ_605U(...) \,
-#define Z_IS_606_EQ_606(...)   \,
-#define Z_IS_606U_EQ_606(...)  \,
-#define Z_IS_606_EQ_606U(...)  \,
-#define Z_IS_606U_EQ_606U(...) \,
-#define Z_IS_607_EQ_607(...)   \,
-#define Z_IS_607U_EQ_607(...)  \,
-#define Z_IS_607_EQ_607U(...)  \,
-#define Z_IS_607U_EQ_607U(...) \,
-#define Z_IS_608_EQ_608(...)   \,
-#define Z_IS_608U_EQ_608(...)  \,
-#define Z_IS_608_EQ_608U(...)  \,
-#define Z_IS_608U_EQ_608U(...) \,
-#define Z_IS_609_EQ_609(...)   \,
-#define Z_IS_609U_EQ_609(...)  \,
-#define Z_IS_609_EQ_609U(...)  \,
-#define Z_IS_609U_EQ_609U(...) \,
-#define Z_IS_610_EQ_610(...)   \,
-#define Z_IS_610U_EQ_610(...)  \,
-#define Z_IS_610_EQ_610U(...)  \,
-#define Z_IS_610U_EQ_610U(...) \,
-#define Z_IS_611_EQ_611(...)   \,
-#define Z_IS_611U_EQ_611(...)  \,
-#define Z_IS_611_EQ_611U(...)  \,
-#define Z_IS_611U_EQ_611U(...) \,
-#define Z_IS_612_EQ_612(...)   \,
-#define Z_IS_612U_EQ_612(...)  \,
-#define Z_IS_612_EQ_612U(...)  \,
-#define Z_IS_612U_EQ_612U(...) \,
-#define Z_IS_613_EQ_613(...)   \,
-#define Z_IS_613U_EQ_613(...)  \,
-#define Z_IS_613_EQ_613U(...)  \,
-#define Z_IS_613U_EQ_613U(...) \,
-#define Z_IS_614_EQ_614(...)   \,
-#define Z_IS_614U_EQ_614(...)  \,
-#define Z_IS_614_EQ_614U(...)  \,
-#define Z_IS_614U_EQ_614U(...) \,
-#define Z_IS_615_EQ_615(...)   \,
-#define Z_IS_615U_EQ_615(...)  \,
-#define Z_IS_615_EQ_615U(...)  \,
-#define Z_IS_615U_EQ_615U(...) \,
-#define Z_IS_616_EQ_616(...)   \,
-#define Z_IS_616U_EQ_616(...)  \,
-#define Z_IS_616_EQ_616U(...)  \,
-#define Z_IS_616U_EQ_616U(...) \,
-#define Z_IS_617_EQ_617(...)   \,
-#define Z_IS_617U_EQ_617(...)  \,
-#define Z_IS_617_EQ_617U(...)  \,
-#define Z_IS_617U_EQ_617U(...) \,
-#define Z_IS_618_EQ_618(...)   \,
-#define Z_IS_618U_EQ_618(...)  \,
-#define Z_IS_618_EQ_618U(...)  \,
-#define Z_IS_618U_EQ_618U(...) \,
-#define Z_IS_619_EQ_619(...)   \,
-#define Z_IS_619U_EQ_619(...)  \,
-#define Z_IS_619_EQ_619U(...)  \,
-#define Z_IS_619U_EQ_619U(...) \,
-#define Z_IS_620_EQ_620(...)   \,
-#define Z_IS_620U_EQ_620(...)  \,
-#define Z_IS_620_EQ_620U(...)  \,
-#define Z_IS_620U_EQ_620U(...) \,
-#define Z_IS_621_EQ_621(...)   \,
-#define Z_IS_621U_EQ_621(...)  \,
-#define Z_IS_621_EQ_621U(...)  \,
-#define Z_IS_621U_EQ_621U(...) \,
-#define Z_IS_622_EQ_622(...)   \,
-#define Z_IS_622U_EQ_622(...)  \,
-#define Z_IS_622_EQ_622U(...)  \,
-#define Z_IS_622U_EQ_622U(...) \,
-#define Z_IS_623_EQ_623(...)   \,
-#define Z_IS_623U_EQ_623(...)  \,
-#define Z_IS_623_EQ_623U(...)  \,
-#define Z_IS_623U_EQ_623U(...) \,
-#define Z_IS_624_EQ_624(...)   \,
-#define Z_IS_624U_EQ_624(...)  \,
-#define Z_IS_624_EQ_624U(...)  \,
-#define Z_IS_624U_EQ_624U(...) \,
-#define Z_IS_625_EQ_625(...)   \,
-#define Z_IS_625U_EQ_625(...)  \,
-#define Z_IS_625_EQ_625U(...)  \,
-#define Z_IS_625U_EQ_625U(...) \,
-#define Z_IS_626_EQ_626(...)   \,
-#define Z_IS_626U_EQ_626(...)  \,
-#define Z_IS_626_EQ_626U(...)  \,
-#define Z_IS_626U_EQ_626U(...) \,
-#define Z_IS_627_EQ_627(...)   \,
-#define Z_IS_627U_EQ_627(...)  \,
-#define Z_IS_627_EQ_627U(...)  \,
-#define Z_IS_627U_EQ_627U(...) \,
-#define Z_IS_628_EQ_628(...)   \,
-#define Z_IS_628U_EQ_628(...)  \,
-#define Z_IS_628_EQ_628U(...)  \,
-#define Z_IS_628U_EQ_628U(...) \,
-#define Z_IS_629_EQ_629(...)   \,
-#define Z_IS_629U_EQ_629(...)  \,
-#define Z_IS_629_EQ_629U(...)  \,
-#define Z_IS_629U_EQ_629U(...) \,
-#define Z_IS_630_EQ_630(...)   \,
-#define Z_IS_630U_EQ_630(...)  \,
-#define Z_IS_630_EQ_630U(...)  \,
-#define Z_IS_630U_EQ_630U(...) \,
-#define Z_IS_631_EQ_631(...)   \,
-#define Z_IS_631U_EQ_631(...)  \,
-#define Z_IS_631_EQ_631U(...)  \,
-#define Z_IS_631U_EQ_631U(...) \,
-#define Z_IS_632_EQ_632(...)   \,
-#define Z_IS_632U_EQ_632(...)  \,
-#define Z_IS_632_EQ_632U(...)  \,
-#define Z_IS_632U_EQ_632U(...) \,
-#define Z_IS_633_EQ_633(...)   \,
-#define Z_IS_633U_EQ_633(...)  \,
-#define Z_IS_633_EQ_633U(...)  \,
-#define Z_IS_633U_EQ_633U(...) \,
-#define Z_IS_634_EQ_634(...)   \,
-#define Z_IS_634U_EQ_634(...)  \,
-#define Z_IS_634_EQ_634U(...)  \,
-#define Z_IS_634U_EQ_634U(...) \,
-#define Z_IS_635_EQ_635(...)   \,
-#define Z_IS_635U_EQ_635(...)  \,
-#define Z_IS_635_EQ_635U(...)  \,
-#define Z_IS_635U_EQ_635U(...) \,
-#define Z_IS_636_EQ_636(...)   \,
-#define Z_IS_636U_EQ_636(...)  \,
-#define Z_IS_636_EQ_636U(...)  \,
-#define Z_IS_636U_EQ_636U(...) \,
-#define Z_IS_637_EQ_637(...)   \,
-#define Z_IS_637U_EQ_637(...)  \,
-#define Z_IS_637_EQ_637U(...)  \,
-#define Z_IS_637U_EQ_637U(...) \,
-#define Z_IS_638_EQ_638(...)   \,
-#define Z_IS_638U_EQ_638(...)  \,
-#define Z_IS_638_EQ_638U(...)  \,
-#define Z_IS_638U_EQ_638U(...) \,
-#define Z_IS_639_EQ_639(...)   \,
-#define Z_IS_639U_EQ_639(...)  \,
-#define Z_IS_639_EQ_639U(...)  \,
-#define Z_IS_639U_EQ_639U(...) \,
-#define Z_IS_640_EQ_640(...)   \,
-#define Z_IS_640U_EQ_640(...)  \,
-#define Z_IS_640_EQ_640U(...)  \,
-#define Z_IS_640U_EQ_640U(...) \,
-#define Z_IS_641_EQ_641(...)   \,
-#define Z_IS_641U_EQ_641(...)  \,
-#define Z_IS_641_EQ_641U(...)  \,
-#define Z_IS_641U_EQ_641U(...) \,
-#define Z_IS_642_EQ_642(...)   \,
-#define Z_IS_642U_EQ_642(...)  \,
-#define Z_IS_642_EQ_642U(...)  \,
-#define Z_IS_642U_EQ_642U(...) \,
-#define Z_IS_643_EQ_643(...)   \,
-#define Z_IS_643U_EQ_643(...)  \,
-#define Z_IS_643_EQ_643U(...)  \,
-#define Z_IS_643U_EQ_643U(...) \,
-#define Z_IS_644_EQ_644(...)   \,
-#define Z_IS_644U_EQ_644(...)  \,
-#define Z_IS_644_EQ_644U(...)  \,
-#define Z_IS_644U_EQ_644U(...) \,
-#define Z_IS_645_EQ_645(...)   \,
-#define Z_IS_645U_EQ_645(...)  \,
-#define Z_IS_645_EQ_645U(...)  \,
-#define Z_IS_645U_EQ_645U(...) \,
-#define Z_IS_646_EQ_646(...)   \,
-#define Z_IS_646U_EQ_646(...)  \,
-#define Z_IS_646_EQ_646U(...)  \,
-#define Z_IS_646U_EQ_646U(...) \,
-#define Z_IS_647_EQ_647(...)   \,
-#define Z_IS_647U_EQ_647(...)  \,
-#define Z_IS_647_EQ_647U(...)  \,
-#define Z_IS_647U_EQ_647U(...) \,
-#define Z_IS_648_EQ_648(...)   \,
-#define Z_IS_648U_EQ_648(...)  \,
-#define Z_IS_648_EQ_648U(...)  \,
-#define Z_IS_648U_EQ_648U(...) \,
-#define Z_IS_649_EQ_649(...)   \,
-#define Z_IS_649U_EQ_649(...)  \,
-#define Z_IS_649_EQ_649U(...)  \,
-#define Z_IS_649U_EQ_649U(...) \,
-#define Z_IS_650_EQ_650(...)   \,
-#define Z_IS_650U_EQ_650(...)  \,
-#define Z_IS_650_EQ_650U(...)  \,
-#define Z_IS_650U_EQ_650U(...) \,
-#define Z_IS_651_EQ_651(...)   \,
-#define Z_IS_651U_EQ_651(...)  \,
-#define Z_IS_651_EQ_651U(...)  \,
-#define Z_IS_651U_EQ_651U(...) \,
-#define Z_IS_652_EQ_652(...)   \,
-#define Z_IS_652U_EQ_652(...)  \,
-#define Z_IS_652_EQ_652U(...)  \,
-#define Z_IS_652U_EQ_652U(...) \,
-#define Z_IS_653_EQ_653(...)   \,
-#define Z_IS_653U_EQ_653(...)  \,
-#define Z_IS_653_EQ_653U(...)  \,
-#define Z_IS_653U_EQ_653U(...) \,
-#define Z_IS_654_EQ_654(...)   \,
-#define Z_IS_654U_EQ_654(...)  \,
-#define Z_IS_654_EQ_654U(...)  \,
-#define Z_IS_654U_EQ_654U(...) \,
-#define Z_IS_655_EQ_655(...)   \,
-#define Z_IS_655U_EQ_655(...)  \,
-#define Z_IS_655_EQ_655U(...)  \,
-#define Z_IS_655U_EQ_655U(...) \,
-#define Z_IS_656_EQ_656(...)   \,
-#define Z_IS_656U_EQ_656(...)  \,
-#define Z_IS_656_EQ_656U(...)  \,
-#define Z_IS_656U_EQ_656U(...) \,
-#define Z_IS_657_EQ_657(...)   \,
-#define Z_IS_657U_EQ_657(...)  \,
-#define Z_IS_657_EQ_657U(...)  \,
-#define Z_IS_657U_EQ_657U(...) \,
-#define Z_IS_658_EQ_658(...)   \,
-#define Z_IS_658U_EQ_658(...)  \,
-#define Z_IS_658_EQ_658U(...)  \,
-#define Z_IS_658U_EQ_658U(...) \,
-#define Z_IS_659_EQ_659(...)   \,
-#define Z_IS_659U_EQ_659(...)  \,
-#define Z_IS_659_EQ_659U(...)  \,
-#define Z_IS_659U_EQ_659U(...) \,
-#define Z_IS_660_EQ_660(...)   \,
-#define Z_IS_660U_EQ_660(...)  \,
-#define Z_IS_660_EQ_660U(...)  \,
-#define Z_IS_660U_EQ_660U(...) \,
-#define Z_IS_661_EQ_661(...)   \,
-#define Z_IS_661U_EQ_661(...)  \,
-#define Z_IS_661_EQ_661U(...)  \,
-#define Z_IS_661U_EQ_661U(...) \,
-#define Z_IS_662_EQ_662(...)   \,
-#define Z_IS_662U_EQ_662(...)  \,
-#define Z_IS_662_EQ_662U(...)  \,
-#define Z_IS_662U_EQ_662U(...) \,
-#define Z_IS_663_EQ_663(...)   \,
-#define Z_IS_663U_EQ_663(...)  \,
-#define Z_IS_663_EQ_663U(...)  \,
-#define Z_IS_663U_EQ_663U(...) \,
-#define Z_IS_664_EQ_664(...)   \,
-#define Z_IS_664U_EQ_664(...)  \,
-#define Z_IS_664_EQ_664U(...)  \,
-#define Z_IS_664U_EQ_664U(...) \,
-#define Z_IS_665_EQ_665(...)   \,
-#define Z_IS_665U_EQ_665(...)  \,
-#define Z_IS_665_EQ_665U(...)  \,
-#define Z_IS_665U_EQ_665U(...) \,
-#define Z_IS_666_EQ_666(...)   \,
-#define Z_IS_666U_EQ_666(...)  \,
-#define Z_IS_666_EQ_666U(...)  \,
-#define Z_IS_666U_EQ_666U(...) \,
-#define Z_IS_667_EQ_667(...)   \,
-#define Z_IS_667U_EQ_667(...)  \,
-#define Z_IS_667_EQ_667U(...)  \,
-#define Z_IS_667U_EQ_667U(...) \,
-#define Z_IS_668_EQ_668(...)   \,
-#define Z_IS_668U_EQ_668(...)  \,
-#define Z_IS_668_EQ_668U(...)  \,
-#define Z_IS_668U_EQ_668U(...) \,
-#define Z_IS_669_EQ_669(...)   \,
-#define Z_IS_669U_EQ_669(...)  \,
-#define Z_IS_669_EQ_669U(...)  \,
-#define Z_IS_669U_EQ_669U(...) \,
-#define Z_IS_670_EQ_670(...)   \,
-#define Z_IS_670U_EQ_670(...)  \,
-#define Z_IS_670_EQ_670U(...)  \,
-#define Z_IS_670U_EQ_670U(...) \,
-#define Z_IS_671_EQ_671(...)   \,
-#define Z_IS_671U_EQ_671(...)  \,
-#define Z_IS_671_EQ_671U(...)  \,
-#define Z_IS_671U_EQ_671U(...) \,
-#define Z_IS_672_EQ_672(...)   \,
-#define Z_IS_672U_EQ_672(...)  \,
-#define Z_IS_672_EQ_672U(...)  \,
-#define Z_IS_672U_EQ_672U(...) \,
-#define Z_IS_673_EQ_673(...)   \,
-#define Z_IS_673U_EQ_673(...)  \,
-#define Z_IS_673_EQ_673U(...)  \,
-#define Z_IS_673U_EQ_673U(...) \,
-#define Z_IS_674_EQ_674(...)   \,
-#define Z_IS_674U_EQ_674(...)  \,
-#define Z_IS_674_EQ_674U(...)  \,
-#define Z_IS_674U_EQ_674U(...) \,
-#define Z_IS_675_EQ_675(...)   \,
-#define Z_IS_675U_EQ_675(...)  \,
-#define Z_IS_675_EQ_675U(...)  \,
-#define Z_IS_675U_EQ_675U(...) \,
-#define Z_IS_676_EQ_676(...)   \,
-#define Z_IS_676U_EQ_676(...)  \,
-#define Z_IS_676_EQ_676U(...)  \,
-#define Z_IS_676U_EQ_676U(...) \,
-#define Z_IS_677_EQ_677(...)   \,
-#define Z_IS_677U_EQ_677(...)  \,
-#define Z_IS_677_EQ_677U(...)  \,
-#define Z_IS_677U_EQ_677U(...) \,
-#define Z_IS_678_EQ_678(...)   \,
-#define Z_IS_678U_EQ_678(...)  \,
-#define Z_IS_678_EQ_678U(...)  \,
-#define Z_IS_678U_EQ_678U(...) \,
-#define Z_IS_679_EQ_679(...)   \,
-#define Z_IS_679U_EQ_679(...)  \,
-#define Z_IS_679_EQ_679U(...)  \,
-#define Z_IS_679U_EQ_679U(...) \,
-#define Z_IS_680_EQ_680(...)   \,
-#define Z_IS_680U_EQ_680(...)  \,
-#define Z_IS_680_EQ_680U(...)  \,
-#define Z_IS_680U_EQ_680U(...) \,
-#define Z_IS_681_EQ_681(...)   \,
-#define Z_IS_681U_EQ_681(...)  \,
-#define Z_IS_681_EQ_681U(...)  \,
-#define Z_IS_681U_EQ_681U(...) \,
-#define Z_IS_682_EQ_682(...)   \,
-#define Z_IS_682U_EQ_682(...)  \,
-#define Z_IS_682_EQ_682U(...)  \,
-#define Z_IS_682U_EQ_682U(...) \,
-#define Z_IS_683_EQ_683(...)   \,
-#define Z_IS_683U_EQ_683(...)  \,
-#define Z_IS_683_EQ_683U(...)  \,
-#define Z_IS_683U_EQ_683U(...) \,
-#define Z_IS_684_EQ_684(...)   \,
-#define Z_IS_684U_EQ_684(...)  \,
-#define Z_IS_684_EQ_684U(...)  \,
-#define Z_IS_684U_EQ_684U(...) \,
-#define Z_IS_685_EQ_685(...)   \,
-#define Z_IS_685U_EQ_685(...)  \,
-#define Z_IS_685_EQ_685U(...)  \,
-#define Z_IS_685U_EQ_685U(...) \,
-#define Z_IS_686_EQ_686(...)   \,
-#define Z_IS_686U_EQ_686(...)  \,
-#define Z_IS_686_EQ_686U(...)  \,
-#define Z_IS_686U_EQ_686U(...) \,
-#define Z_IS_687_EQ_687(...)   \,
-#define Z_IS_687U_EQ_687(...)  \,
-#define Z_IS_687_EQ_687U(...)  \,
-#define Z_IS_687U_EQ_687U(...) \,
-#define Z_IS_688_EQ_688(...)   \,
-#define Z_IS_688U_EQ_688(...)  \,
-#define Z_IS_688_EQ_688U(...)  \,
-#define Z_IS_688U_EQ_688U(...) \,
-#define Z_IS_689_EQ_689(...)   \,
-#define Z_IS_689U_EQ_689(...)  \,
-#define Z_IS_689_EQ_689U(...)  \,
-#define Z_IS_689U_EQ_689U(...) \,
-#define Z_IS_690_EQ_690(...)   \,
-#define Z_IS_690U_EQ_690(...)  \,
-#define Z_IS_690_EQ_690U(...)  \,
-#define Z_IS_690U_EQ_690U(...) \,
-#define Z_IS_691_EQ_691(...)   \,
-#define Z_IS_691U_EQ_691(...)  \,
-#define Z_IS_691_EQ_691U(...)  \,
-#define Z_IS_691U_EQ_691U(...) \,
-#define Z_IS_692_EQ_692(...)   \,
-#define Z_IS_692U_EQ_692(...)  \,
-#define Z_IS_692_EQ_692U(...)  \,
-#define Z_IS_692U_EQ_692U(...) \,
-#define Z_IS_693_EQ_693(...)   \,
-#define Z_IS_693U_EQ_693(...)  \,
-#define Z_IS_693_EQ_693U(...)  \,
-#define Z_IS_693U_EQ_693U(...) \,
-#define Z_IS_694_EQ_694(...)   \,
-#define Z_IS_694U_EQ_694(...)  \,
-#define Z_IS_694_EQ_694U(...)  \,
-#define Z_IS_694U_EQ_694U(...) \,
-#define Z_IS_695_EQ_695(...)   \,
-#define Z_IS_695U_EQ_695(...)  \,
-#define Z_IS_695_EQ_695U(...)  \,
-#define Z_IS_695U_EQ_695U(...) \,
-#define Z_IS_696_EQ_696(...)   \,
-#define Z_IS_696U_EQ_696(...)  \,
-#define Z_IS_696_EQ_696U(...)  \,
-#define Z_IS_696U_EQ_696U(...) \,
-#define Z_IS_697_EQ_697(...)   \,
-#define Z_IS_697U_EQ_697(...)  \,
-#define Z_IS_697_EQ_697U(...)  \,
-#define Z_IS_697U_EQ_697U(...) \,
-#define Z_IS_698_EQ_698(...)   \,
-#define Z_IS_698U_EQ_698(...)  \,
-#define Z_IS_698_EQ_698U(...)  \,
-#define Z_IS_698U_EQ_698U(...) \,
-#define Z_IS_699_EQ_699(...)   \,
-#define Z_IS_699U_EQ_699(...)  \,
-#define Z_IS_699_EQ_699U(...)  \,
-#define Z_IS_699U_EQ_699U(...) \,
-#define Z_IS_700_EQ_700(...)   \,
-#define Z_IS_700U_EQ_700(...)  \,
-#define Z_IS_700_EQ_700U(...)  \,
-#define Z_IS_700U_EQ_700U(...) \,
-#define Z_IS_701_EQ_701(...)   \,
-#define Z_IS_701U_EQ_701(...)  \,
-#define Z_IS_701_EQ_701U(...)  \,
-#define Z_IS_701U_EQ_701U(...) \,
-#define Z_IS_702_EQ_702(...)   \,
-#define Z_IS_702U_EQ_702(...)  \,
-#define Z_IS_702_EQ_702U(...)  \,
-#define Z_IS_702U_EQ_702U(...) \,
-#define Z_IS_703_EQ_703(...)   \,
-#define Z_IS_703U_EQ_703(...)  \,
-#define Z_IS_703_EQ_703U(...)  \,
-#define Z_IS_703U_EQ_703U(...) \,
-#define Z_IS_704_EQ_704(...)   \,
-#define Z_IS_704U_EQ_704(...)  \,
-#define Z_IS_704_EQ_704U(...)  \,
-#define Z_IS_704U_EQ_704U(...) \,
-#define Z_IS_705_EQ_705(...)   \,
-#define Z_IS_705U_EQ_705(...)  \,
-#define Z_IS_705_EQ_705U(...)  \,
-#define Z_IS_705U_EQ_705U(...) \,
-#define Z_IS_706_EQ_706(...)   \,
-#define Z_IS_706U_EQ_706(...)  \,
-#define Z_IS_706_EQ_706U(...)  \,
-#define Z_IS_706U_EQ_706U(...) \,
-#define Z_IS_707_EQ_707(...)   \,
-#define Z_IS_707U_EQ_707(...)  \,
-#define Z_IS_707_EQ_707U(...)  \,
-#define Z_IS_707U_EQ_707U(...) \,
-#define Z_IS_708_EQ_708(...)   \,
-#define Z_IS_708U_EQ_708(...)  \,
-#define Z_IS_708_EQ_708U(...)  \,
-#define Z_IS_708U_EQ_708U(...) \,
-#define Z_IS_709_EQ_709(...)   \,
-#define Z_IS_709U_EQ_709(...)  \,
-#define Z_IS_709_EQ_709U(...)  \,
-#define Z_IS_709U_EQ_709U(...) \,
-#define Z_IS_710_EQ_710(...)   \,
-#define Z_IS_710U_EQ_710(...)  \,
-#define Z_IS_710_EQ_710U(...)  \,
-#define Z_IS_710U_EQ_710U(...) \,
-#define Z_IS_711_EQ_711(...)   \,
-#define Z_IS_711U_EQ_711(...)  \,
-#define Z_IS_711_EQ_711U(...)  \,
-#define Z_IS_711U_EQ_711U(...) \,
-#define Z_IS_712_EQ_712(...)   \,
-#define Z_IS_712U_EQ_712(...)  \,
-#define Z_IS_712_EQ_712U(...)  \,
-#define Z_IS_712U_EQ_712U(...) \,
-#define Z_IS_713_EQ_713(...)   \,
-#define Z_IS_713U_EQ_713(...)  \,
-#define Z_IS_713_EQ_713U(...)  \,
-#define Z_IS_713U_EQ_713U(...) \,
-#define Z_IS_714_EQ_714(...)   \,
-#define Z_IS_714U_EQ_714(...)  \,
-#define Z_IS_714_EQ_714U(...)  \,
-#define Z_IS_714U_EQ_714U(...) \,
-#define Z_IS_715_EQ_715(...)   \,
-#define Z_IS_715U_EQ_715(...)  \,
-#define Z_IS_715_EQ_715U(...)  \,
-#define Z_IS_715U_EQ_715U(...) \,
-#define Z_IS_716_EQ_716(...)   \,
-#define Z_IS_716U_EQ_716(...)  \,
-#define Z_IS_716_EQ_716U(...)  \,
-#define Z_IS_716U_EQ_716U(...) \,
-#define Z_IS_717_EQ_717(...)   \,
-#define Z_IS_717U_EQ_717(...)  \,
-#define Z_IS_717_EQ_717U(...)  \,
-#define Z_IS_717U_EQ_717U(...) \,
-#define Z_IS_718_EQ_718(...)   \,
-#define Z_IS_718U_EQ_718(...)  \,
-#define Z_IS_718_EQ_718U(...)  \,
-#define Z_IS_718U_EQ_718U(...) \,
-#define Z_IS_719_EQ_719(...)   \,
-#define Z_IS_719U_EQ_719(...)  \,
-#define Z_IS_719_EQ_719U(...)  \,
-#define Z_IS_719U_EQ_719U(...) \,
-#define Z_IS_720_EQ_720(...)   \,
-#define Z_IS_720U_EQ_720(...)  \,
-#define Z_IS_720_EQ_720U(...)  \,
-#define Z_IS_720U_EQ_720U(...) \,
-#define Z_IS_721_EQ_721(...)   \,
-#define Z_IS_721U_EQ_721(...)  \,
-#define Z_IS_721_EQ_721U(...)  \,
-#define Z_IS_721U_EQ_721U(...) \,
-#define Z_IS_722_EQ_722(...)   \,
-#define Z_IS_722U_EQ_722(...)  \,
-#define Z_IS_722_EQ_722U(...)  \,
-#define Z_IS_722U_EQ_722U(...) \,
-#define Z_IS_723_EQ_723(...)   \,
-#define Z_IS_723U_EQ_723(...)  \,
-#define Z_IS_723_EQ_723U(...)  \,
-#define Z_IS_723U_EQ_723U(...) \,
-#define Z_IS_724_EQ_724(...)   \,
-#define Z_IS_724U_EQ_724(...)  \,
-#define Z_IS_724_EQ_724U(...)  \,
-#define Z_IS_724U_EQ_724U(...) \,
-#define Z_IS_725_EQ_725(...)   \,
-#define Z_IS_725U_EQ_725(...)  \,
-#define Z_IS_725_EQ_725U(...)  \,
-#define Z_IS_725U_EQ_725U(...) \,
-#define Z_IS_726_EQ_726(...)   \,
-#define Z_IS_726U_EQ_726(...)  \,
-#define Z_IS_726_EQ_726U(...)  \,
-#define Z_IS_726U_EQ_726U(...) \,
-#define Z_IS_727_EQ_727(...)   \,
-#define Z_IS_727U_EQ_727(...)  \,
-#define Z_IS_727_EQ_727U(...)  \,
-#define Z_IS_727U_EQ_727U(...) \,
-#define Z_IS_728_EQ_728(...)   \,
-#define Z_IS_728U_EQ_728(...)  \,
-#define Z_IS_728_EQ_728U(...)  \,
-#define Z_IS_728U_EQ_728U(...) \,
-#define Z_IS_729_EQ_729(...)   \,
-#define Z_IS_729U_EQ_729(...)  \,
-#define Z_IS_729_EQ_729U(...)  \,
-#define Z_IS_729U_EQ_729U(...) \,
-#define Z_IS_730_EQ_730(...)   \,
-#define Z_IS_730U_EQ_730(...)  \,
-#define Z_IS_730_EQ_730U(...)  \,
-#define Z_IS_730U_EQ_730U(...) \,
-#define Z_IS_731_EQ_731(...)   \,
-#define Z_IS_731U_EQ_731(...)  \,
-#define Z_IS_731_EQ_731U(...)  \,
-#define Z_IS_731U_EQ_731U(...) \,
-#define Z_IS_732_EQ_732(...)   \,
-#define Z_IS_732U_EQ_732(...)  \,
-#define Z_IS_732_EQ_732U(...)  \,
-#define Z_IS_732U_EQ_732U(...) \,
-#define Z_IS_733_EQ_733(...)   \,
-#define Z_IS_733U_EQ_733(...)  \,
-#define Z_IS_733_EQ_733U(...)  \,
-#define Z_IS_733U_EQ_733U(...) \,
-#define Z_IS_734_EQ_734(...)   \,
-#define Z_IS_734U_EQ_734(...)  \,
-#define Z_IS_734_EQ_734U(...)  \,
-#define Z_IS_734U_EQ_734U(...) \,
-#define Z_IS_735_EQ_735(...)   \,
-#define Z_IS_735U_EQ_735(...)  \,
-#define Z_IS_735_EQ_735U(...)  \,
-#define Z_IS_735U_EQ_735U(...) \,
-#define Z_IS_736_EQ_736(...)   \,
-#define Z_IS_736U_EQ_736(...)  \,
-#define Z_IS_736_EQ_736U(...)  \,
-#define Z_IS_736U_EQ_736U(...) \,
-#define Z_IS_737_EQ_737(...)   \,
-#define Z_IS_737U_EQ_737(...)  \,
-#define Z_IS_737_EQ_737U(...)  \,
-#define Z_IS_737U_EQ_737U(...) \,
-#define Z_IS_738_EQ_738(...)   \,
-#define Z_IS_738U_EQ_738(...)  \,
-#define Z_IS_738_EQ_738U(...)  \,
-#define Z_IS_738U_EQ_738U(...) \,
-#define Z_IS_739_EQ_739(...)   \,
-#define Z_IS_739U_EQ_739(...)  \,
-#define Z_IS_739_EQ_739U(...)  \,
-#define Z_IS_739U_EQ_739U(...) \,
-#define Z_IS_740_EQ_740(...)   \,
-#define Z_IS_740U_EQ_740(...)  \,
-#define Z_IS_740_EQ_740U(...)  \,
-#define Z_IS_740U_EQ_740U(...) \,
-#define Z_IS_741_EQ_741(...)   \,
-#define Z_IS_741U_EQ_741(...)  \,
-#define Z_IS_741_EQ_741U(...)  \,
-#define Z_IS_741U_EQ_741U(...) \,
-#define Z_IS_742_EQ_742(...)   \,
-#define Z_IS_742U_EQ_742(...)  \,
-#define Z_IS_742_EQ_742U(...)  \,
-#define Z_IS_742U_EQ_742U(...) \,
-#define Z_IS_743_EQ_743(...)   \,
-#define Z_IS_743U_EQ_743(...)  \,
-#define Z_IS_743_EQ_743U(...)  \,
-#define Z_IS_743U_EQ_743U(...) \,
-#define Z_IS_744_EQ_744(...)   \,
-#define Z_IS_744U_EQ_744(...)  \,
-#define Z_IS_744_EQ_744U(...)  \,
-#define Z_IS_744U_EQ_744U(...) \,
-#define Z_IS_745_EQ_745(...)   \,
-#define Z_IS_745U_EQ_745(...)  \,
-#define Z_IS_745_EQ_745U(...)  \,
-#define Z_IS_745U_EQ_745U(...) \,
-#define Z_IS_746_EQ_746(...)   \,
-#define Z_IS_746U_EQ_746(...)  \,
-#define Z_IS_746_EQ_746U(...)  \,
-#define Z_IS_746U_EQ_746U(...) \,
-#define Z_IS_747_EQ_747(...)   \,
-#define Z_IS_747U_EQ_747(...)  \,
-#define Z_IS_747_EQ_747U(...)  \,
-#define Z_IS_747U_EQ_747U(...) \,
-#define Z_IS_748_EQ_748(...)   \,
-#define Z_IS_748U_EQ_748(...)  \,
-#define Z_IS_748_EQ_748U(...)  \,
-#define Z_IS_748U_EQ_748U(...) \,
-#define Z_IS_749_EQ_749(...)   \,
-#define Z_IS_749U_EQ_749(...)  \,
-#define Z_IS_749_EQ_749U(...)  \,
-#define Z_IS_749U_EQ_749U(...) \,
-#define Z_IS_750_EQ_750(...)   \,
-#define Z_IS_750U_EQ_750(...)  \,
-#define Z_IS_750_EQ_750U(...)  \,
-#define Z_IS_750U_EQ_750U(...) \,
-#define Z_IS_751_EQ_751(...)   \,
-#define Z_IS_751U_EQ_751(...)  \,
-#define Z_IS_751_EQ_751U(...)  \,
-#define Z_IS_751U_EQ_751U(...) \,
-#define Z_IS_752_EQ_752(...)   \,
-#define Z_IS_752U_EQ_752(...)  \,
-#define Z_IS_752_EQ_752U(...)  \,
-#define Z_IS_752U_EQ_752U(...) \,
-#define Z_IS_753_EQ_753(...)   \,
-#define Z_IS_753U_EQ_753(...)  \,
-#define Z_IS_753_EQ_753U(...)  \,
-#define Z_IS_753U_EQ_753U(...) \,
-#define Z_IS_754_EQ_754(...)   \,
-#define Z_IS_754U_EQ_754(...)  \,
-#define Z_IS_754_EQ_754U(...)  \,
-#define Z_IS_754U_EQ_754U(...) \,
-#define Z_IS_755_EQ_755(...)   \,
-#define Z_IS_755U_EQ_755(...)  \,
-#define Z_IS_755_EQ_755U(...)  \,
-#define Z_IS_755U_EQ_755U(...) \,
-#define Z_IS_756_EQ_756(...)   \,
-#define Z_IS_756U_EQ_756(...)  \,
-#define Z_IS_756_EQ_756U(...)  \,
-#define Z_IS_756U_EQ_756U(...) \,
-#define Z_IS_757_EQ_757(...)   \,
-#define Z_IS_757U_EQ_757(...)  \,
-#define Z_IS_757_EQ_757U(...)  \,
-#define Z_IS_757U_EQ_757U(...) \,
-#define Z_IS_758_EQ_758(...)   \,
-#define Z_IS_758U_EQ_758(...)  \,
-#define Z_IS_758_EQ_758U(...)  \,
-#define Z_IS_758U_EQ_758U(...) \,
-#define Z_IS_759_EQ_759(...)   \,
-#define Z_IS_759U_EQ_759(...)  \,
-#define Z_IS_759_EQ_759U(...)  \,
-#define Z_IS_759U_EQ_759U(...) \,
-#define Z_IS_760_EQ_760(...)   \,
-#define Z_IS_760U_EQ_760(...)  \,
-#define Z_IS_760_EQ_760U(...)  \,
-#define Z_IS_760U_EQ_760U(...) \,
-#define Z_IS_761_EQ_761(...)   \,
-#define Z_IS_761U_EQ_761(...)  \,
-#define Z_IS_761_EQ_761U(...)  \,
-#define Z_IS_761U_EQ_761U(...) \,
-#define Z_IS_762_EQ_762(...)   \,
-#define Z_IS_762U_EQ_762(...)  \,
-#define Z_IS_762_EQ_762U(...)  \,
-#define Z_IS_762U_EQ_762U(...) \,
-#define Z_IS_763_EQ_763(...)   \,
-#define Z_IS_763U_EQ_763(...)  \,
-#define Z_IS_763_EQ_763U(...)  \,
-#define Z_IS_763U_EQ_763U(...) \,
-#define Z_IS_764_EQ_764(...)   \,
-#define Z_IS_764U_EQ_764(...)  \,
-#define Z_IS_764_EQ_764U(...)  \,
-#define Z_IS_764U_EQ_764U(...) \,
-#define Z_IS_765_EQ_765(...)   \,
-#define Z_IS_765U_EQ_765(...)  \,
-#define Z_IS_765_EQ_765U(...)  \,
-#define Z_IS_765U_EQ_765U(...) \,
-#define Z_IS_766_EQ_766(...)   \,
-#define Z_IS_766U_EQ_766(...)  \,
-#define Z_IS_766_EQ_766U(...)  \,
-#define Z_IS_766U_EQ_766U(...) \,
-#define Z_IS_767_EQ_767(...)   \,
-#define Z_IS_767U_EQ_767(...)  \,
-#define Z_IS_767_EQ_767U(...)  \,
-#define Z_IS_767U_EQ_767U(...) \,
-#define Z_IS_768_EQ_768(...)   \,
-#define Z_IS_768U_EQ_768(...)  \,
-#define Z_IS_768_EQ_768U(...)  \,
-#define Z_IS_768U_EQ_768U(...) \,
-#define Z_IS_769_EQ_769(...)   \,
-#define Z_IS_769U_EQ_769(...)  \,
-#define Z_IS_769_EQ_769U(...)  \,
-#define Z_IS_769U_EQ_769U(...) \,
-#define Z_IS_770_EQ_770(...)   \,
-#define Z_IS_770U_EQ_770(...)  \,
-#define Z_IS_770_EQ_770U(...)  \,
-#define Z_IS_770U_EQ_770U(...) \,
-#define Z_IS_771_EQ_771(...)   \,
-#define Z_IS_771U_EQ_771(...)  \,
-#define Z_IS_771_EQ_771U(...)  \,
-#define Z_IS_771U_EQ_771U(...) \,
-#define Z_IS_772_EQ_772(...)   \,
-#define Z_IS_772U_EQ_772(...)  \,
-#define Z_IS_772_EQ_772U(...)  \,
-#define Z_IS_772U_EQ_772U(...) \,
-#define Z_IS_773_EQ_773(...)   \,
-#define Z_IS_773U_EQ_773(...)  \,
-#define Z_IS_773_EQ_773U(...)  \,
-#define Z_IS_773U_EQ_773U(...) \,
-#define Z_IS_774_EQ_774(...)   \,
-#define Z_IS_774U_EQ_774(...)  \,
-#define Z_IS_774_EQ_774U(...)  \,
-#define Z_IS_774U_EQ_774U(...) \,
-#define Z_IS_775_EQ_775(...)   \,
-#define Z_IS_775U_EQ_775(...)  \,
-#define Z_IS_775_EQ_775U(...)  \,
-#define Z_IS_775U_EQ_775U(...) \,
-#define Z_IS_776_EQ_776(...)   \,
-#define Z_IS_776U_EQ_776(...)  \,
-#define Z_IS_776_EQ_776U(...)  \,
-#define Z_IS_776U_EQ_776U(...) \,
-#define Z_IS_777_EQ_777(...)   \,
-#define Z_IS_777U_EQ_777(...)  \,
-#define Z_IS_777_EQ_777U(...)  \,
-#define Z_IS_777U_EQ_777U(...) \,
-#define Z_IS_778_EQ_778(...)   \,
-#define Z_IS_778U_EQ_778(...)  \,
-#define Z_IS_778_EQ_778U(...)  \,
-#define Z_IS_778U_EQ_778U(...) \,
-#define Z_IS_779_EQ_779(...)   \,
-#define Z_IS_779U_EQ_779(...)  \,
-#define Z_IS_779_EQ_779U(...)  \,
-#define Z_IS_779U_EQ_779U(...) \,
-#define Z_IS_780_EQ_780(...)   \,
-#define Z_IS_780U_EQ_780(...)  \,
-#define Z_IS_780_EQ_780U(...)  \,
-#define Z_IS_780U_EQ_780U(...) \,
-#define Z_IS_781_EQ_781(...)   \,
-#define Z_IS_781U_EQ_781(...)  \,
-#define Z_IS_781_EQ_781U(...)  \,
-#define Z_IS_781U_EQ_781U(...) \,
-#define Z_IS_782_EQ_782(...)   \,
-#define Z_IS_782U_EQ_782(...)  \,
-#define Z_IS_782_EQ_782U(...)  \,
-#define Z_IS_782U_EQ_782U(...) \,
-#define Z_IS_783_EQ_783(...)   \,
-#define Z_IS_783U_EQ_783(...)  \,
-#define Z_IS_783_EQ_783U(...)  \,
-#define Z_IS_783U_EQ_783U(...) \,
-#define Z_IS_784_EQ_784(...)   \,
-#define Z_IS_784U_EQ_784(...)  \,
-#define Z_IS_784_EQ_784U(...)  \,
-#define Z_IS_784U_EQ_784U(...) \,
-#define Z_IS_785_EQ_785(...)   \,
-#define Z_IS_785U_EQ_785(...)  \,
-#define Z_IS_785_EQ_785U(...)  \,
-#define Z_IS_785U_EQ_785U(...) \,
-#define Z_IS_786_EQ_786(...)   \,
-#define Z_IS_786U_EQ_786(...)  \,
-#define Z_IS_786_EQ_786U(...)  \,
-#define Z_IS_786U_EQ_786U(...) \,
-#define Z_IS_787_EQ_787(...)   \,
-#define Z_IS_787U_EQ_787(...)  \,
-#define Z_IS_787_EQ_787U(...)  \,
-#define Z_IS_787U_EQ_787U(...) \,
-#define Z_IS_788_EQ_788(...)   \,
-#define Z_IS_788U_EQ_788(...)  \,
-#define Z_IS_788_EQ_788U(...)  \,
-#define Z_IS_788U_EQ_788U(...) \,
-#define Z_IS_789_EQ_789(...)   \,
-#define Z_IS_789U_EQ_789(...)  \,
-#define Z_IS_789_EQ_789U(...)  \,
-#define Z_IS_789U_EQ_789U(...) \,
-#define Z_IS_790_EQ_790(...)   \,
-#define Z_IS_790U_EQ_790(...)  \,
-#define Z_IS_790_EQ_790U(...)  \,
-#define Z_IS_790U_EQ_790U(...) \,
-#define Z_IS_791_EQ_791(...)   \,
-#define Z_IS_791U_EQ_791(...)  \,
-#define Z_IS_791_EQ_791U(...)  \,
-#define Z_IS_791U_EQ_791U(...) \,
-#define Z_IS_792_EQ_792(...)   \,
-#define Z_IS_792U_EQ_792(...)  \,
-#define Z_IS_792_EQ_792U(...)  \,
-#define Z_IS_792U_EQ_792U(...) \,
-#define Z_IS_793_EQ_793(...)   \,
-#define Z_IS_793U_EQ_793(...)  \,
-#define Z_IS_793_EQ_793U(...)  \,
-#define Z_IS_793U_EQ_793U(...) \,
-#define Z_IS_794_EQ_794(...)   \,
-#define Z_IS_794U_EQ_794(...)  \,
-#define Z_IS_794_EQ_794U(...)  \,
-#define Z_IS_794U_EQ_794U(...) \,
-#define Z_IS_795_EQ_795(...)   \,
-#define Z_IS_795U_EQ_795(...)  \,
-#define Z_IS_795_EQ_795U(...)  \,
-#define Z_IS_795U_EQ_795U(...) \,
-#define Z_IS_796_EQ_796(...)   \,
-#define Z_IS_796U_EQ_796(...)  \,
-#define Z_IS_796_EQ_796U(...)  \,
-#define Z_IS_796U_EQ_796U(...) \,
-#define Z_IS_797_EQ_797(...)   \,
-#define Z_IS_797U_EQ_797(...)  \,
-#define Z_IS_797_EQ_797U(...)  \,
-#define Z_IS_797U_EQ_797U(...) \,
-#define Z_IS_798_EQ_798(...)   \,
-#define Z_IS_798U_EQ_798(...)  \,
-#define Z_IS_798_EQ_798U(...)  \,
-#define Z_IS_798U_EQ_798U(...) \,
-#define Z_IS_799_EQ_799(...)   \,
-#define Z_IS_799U_EQ_799(...)  \,
-#define Z_IS_799_EQ_799U(...)  \,
-#define Z_IS_799U_EQ_799U(...) \,
-#define Z_IS_800_EQ_800(...)   \,
-#define Z_IS_800U_EQ_800(...)  \,
-#define Z_IS_800_EQ_800U(...)  \,
-#define Z_IS_800U_EQ_800U(...) \,
-#define Z_IS_801_EQ_801(...)   \,
-#define Z_IS_801U_EQ_801(...)  \,
-#define Z_IS_801_EQ_801U(...)  \,
-#define Z_IS_801U_EQ_801U(...) \,
-#define Z_IS_802_EQ_802(...)   \,
-#define Z_IS_802U_EQ_802(...)  \,
-#define Z_IS_802_EQ_802U(...)  \,
-#define Z_IS_802U_EQ_802U(...) \,
-#define Z_IS_803_EQ_803(...)   \,
-#define Z_IS_803U_EQ_803(...)  \,
-#define Z_IS_803_EQ_803U(...)  \,
-#define Z_IS_803U_EQ_803U(...) \,
-#define Z_IS_804_EQ_804(...)   \,
-#define Z_IS_804U_EQ_804(...)  \,
-#define Z_IS_804_EQ_804U(...)  \,
-#define Z_IS_804U_EQ_804U(...) \,
-#define Z_IS_805_EQ_805(...)   \,
-#define Z_IS_805U_EQ_805(...)  \,
-#define Z_IS_805_EQ_805U(...)  \,
-#define Z_IS_805U_EQ_805U(...) \,
-#define Z_IS_806_EQ_806(...)   \,
-#define Z_IS_806U_EQ_806(...)  \,
-#define Z_IS_806_EQ_806U(...)  \,
-#define Z_IS_806U_EQ_806U(...) \,
-#define Z_IS_807_EQ_807(...)   \,
-#define Z_IS_807U_EQ_807(...)  \,
-#define Z_IS_807_EQ_807U(...)  \,
-#define Z_IS_807U_EQ_807U(...) \,
-#define Z_IS_808_EQ_808(...)   \,
-#define Z_IS_808U_EQ_808(...)  \,
-#define Z_IS_808_EQ_808U(...)  \,
-#define Z_IS_808U_EQ_808U(...) \,
-#define Z_IS_809_EQ_809(...)   \,
-#define Z_IS_809U_EQ_809(...)  \,
-#define Z_IS_809_EQ_809U(...)  \,
-#define Z_IS_809U_EQ_809U(...) \,
-#define Z_IS_810_EQ_810(...)   \,
-#define Z_IS_810U_EQ_810(...)  \,
-#define Z_IS_810_EQ_810U(...)  \,
-#define Z_IS_810U_EQ_810U(...) \,
-#define Z_IS_811_EQ_811(...)   \,
-#define Z_IS_811U_EQ_811(...)  \,
-#define Z_IS_811_EQ_811U(...)  \,
-#define Z_IS_811U_EQ_811U(...) \,
-#define Z_IS_812_EQ_812(...)   \,
-#define Z_IS_812U_EQ_812(...)  \,
-#define Z_IS_812_EQ_812U(...)  \,
-#define Z_IS_812U_EQ_812U(...) \,
-#define Z_IS_813_EQ_813(...)   \,
-#define Z_IS_813U_EQ_813(...)  \,
-#define Z_IS_813_EQ_813U(...)  \,
-#define Z_IS_813U_EQ_813U(...) \,
-#define Z_IS_814_EQ_814(...)   \,
-#define Z_IS_814U_EQ_814(...)  \,
-#define Z_IS_814_EQ_814U(...)  \,
-#define Z_IS_814U_EQ_814U(...) \,
-#define Z_IS_815_EQ_815(...)   \,
-#define Z_IS_815U_EQ_815(...)  \,
-#define Z_IS_815_EQ_815U(...)  \,
-#define Z_IS_815U_EQ_815U(...) \,
-#define Z_IS_816_EQ_816(...)   \,
-#define Z_IS_816U_EQ_816(...)  \,
-#define Z_IS_816_EQ_816U(...)  \,
-#define Z_IS_816U_EQ_816U(...) \,
-#define Z_IS_817_EQ_817(...)   \,
-#define Z_IS_817U_EQ_817(...)  \,
-#define Z_IS_817_EQ_817U(...)  \,
-#define Z_IS_817U_EQ_817U(...) \,
-#define Z_IS_818_EQ_818(...)   \,
-#define Z_IS_818U_EQ_818(...)  \,
-#define Z_IS_818_EQ_818U(...)  \,
-#define Z_IS_818U_EQ_818U(...) \,
-#define Z_IS_819_EQ_819(...)   \,
-#define Z_IS_819U_EQ_819(...)  \,
-#define Z_IS_819_EQ_819U(...)  \,
-#define Z_IS_819U_EQ_819U(...) \,
-#define Z_IS_820_EQ_820(...)   \,
-#define Z_IS_820U_EQ_820(...)  \,
-#define Z_IS_820_EQ_820U(...)  \,
-#define Z_IS_820U_EQ_820U(...) \,
-#define Z_IS_821_EQ_821(...)   \,
-#define Z_IS_821U_EQ_821(...)  \,
-#define Z_IS_821_EQ_821U(...)  \,
-#define Z_IS_821U_EQ_821U(...) \,
-#define Z_IS_822_EQ_822(...)   \,
-#define Z_IS_822U_EQ_822(...)  \,
-#define Z_IS_822_EQ_822U(...)  \,
-#define Z_IS_822U_EQ_822U(...) \,
-#define Z_IS_823_EQ_823(...)   \,
-#define Z_IS_823U_EQ_823(...)  \,
-#define Z_IS_823_EQ_823U(...)  \,
-#define Z_IS_823U_EQ_823U(...) \,
-#define Z_IS_824_EQ_824(...)   \,
-#define Z_IS_824U_EQ_824(...)  \,
-#define Z_IS_824_EQ_824U(...)  \,
-#define Z_IS_824U_EQ_824U(...) \,
-#define Z_IS_825_EQ_825(...)   \,
-#define Z_IS_825U_EQ_825(...)  \,
-#define Z_IS_825_EQ_825U(...)  \,
-#define Z_IS_825U_EQ_825U(...) \,
-#define Z_IS_826_EQ_826(...)   \,
-#define Z_IS_826U_EQ_826(...)  \,
-#define Z_IS_826_EQ_826U(...)  \,
-#define Z_IS_826U_EQ_826U(...) \,
-#define Z_IS_827_EQ_827(...)   \,
-#define Z_IS_827U_EQ_827(...)  \,
-#define Z_IS_827_EQ_827U(...)  \,
-#define Z_IS_827U_EQ_827U(...) \,
-#define Z_IS_828_EQ_828(...)   \,
-#define Z_IS_828U_EQ_828(...)  \,
-#define Z_IS_828_EQ_828U(...)  \,
-#define Z_IS_828U_EQ_828U(...) \,
-#define Z_IS_829_EQ_829(...)   \,
-#define Z_IS_829U_EQ_829(...)  \,
-#define Z_IS_829_EQ_829U(...)  \,
-#define Z_IS_829U_EQ_829U(...) \,
-#define Z_IS_830_EQ_830(...)   \,
-#define Z_IS_830U_EQ_830(...)  \,
-#define Z_IS_830_EQ_830U(...)  \,
-#define Z_IS_830U_EQ_830U(...) \,
-#define Z_IS_831_EQ_831(...)   \,
-#define Z_IS_831U_EQ_831(...)  \,
-#define Z_IS_831_EQ_831U(...)  \,
-#define Z_IS_831U_EQ_831U(...) \,
-#define Z_IS_832_EQ_832(...)   \,
-#define Z_IS_832U_EQ_832(...)  \,
-#define Z_IS_832_EQ_832U(...)  \,
-#define Z_IS_832U_EQ_832U(...) \,
-#define Z_IS_833_EQ_833(...)   \,
-#define Z_IS_833U_EQ_833(...)  \,
-#define Z_IS_833_EQ_833U(...)  \,
-#define Z_IS_833U_EQ_833U(...) \,
-#define Z_IS_834_EQ_834(...)   \,
-#define Z_IS_834U_EQ_834(...)  \,
-#define Z_IS_834_EQ_834U(...)  \,
-#define Z_IS_834U_EQ_834U(...) \,
-#define Z_IS_835_EQ_835(...)   \,
-#define Z_IS_835U_EQ_835(...)  \,
-#define Z_IS_835_EQ_835U(...)  \,
-#define Z_IS_835U_EQ_835U(...) \,
-#define Z_IS_836_EQ_836(...)   \,
-#define Z_IS_836U_EQ_836(...)  \,
-#define Z_IS_836_EQ_836U(...)  \,
-#define Z_IS_836U_EQ_836U(...) \,
-#define Z_IS_837_EQ_837(...)   \,
-#define Z_IS_837U_EQ_837(...)  \,
-#define Z_IS_837_EQ_837U(...)  \,
-#define Z_IS_837U_EQ_837U(...) \,
-#define Z_IS_838_EQ_838(...)   \,
-#define Z_IS_838U_EQ_838(...)  \,
-#define Z_IS_838_EQ_838U(...)  \,
-#define Z_IS_838U_EQ_838U(...) \,
-#define Z_IS_839_EQ_839(...)   \,
-#define Z_IS_839U_EQ_839(...)  \,
-#define Z_IS_839_EQ_839U(...)  \,
-#define Z_IS_839U_EQ_839U(...) \,
-#define Z_IS_840_EQ_840(...)   \,
-#define Z_IS_840U_EQ_840(...)  \,
-#define Z_IS_840_EQ_840U(...)  \,
-#define Z_IS_840U_EQ_840U(...) \,
-#define Z_IS_841_EQ_841(...)   \,
-#define Z_IS_841U_EQ_841(...)  \,
-#define Z_IS_841_EQ_841U(...)  \,
-#define Z_IS_841U_EQ_841U(...) \,
-#define Z_IS_842_EQ_842(...)   \,
-#define Z_IS_842U_EQ_842(...)  \,
-#define Z_IS_842_EQ_842U(...)  \,
-#define Z_IS_842U_EQ_842U(...) \,
-#define Z_IS_843_EQ_843(...)   \,
-#define Z_IS_843U_EQ_843(...)  \,
-#define Z_IS_843_EQ_843U(...)  \,
-#define Z_IS_843U_EQ_843U(...) \,
-#define Z_IS_844_EQ_844(...)   \,
-#define Z_IS_844U_EQ_844(...)  \,
-#define Z_IS_844_EQ_844U(...)  \,
-#define Z_IS_844U_EQ_844U(...) \,
-#define Z_IS_845_EQ_845(...)   \,
-#define Z_IS_845U_EQ_845(...)  \,
-#define Z_IS_845_EQ_845U(...)  \,
-#define Z_IS_845U_EQ_845U(...) \,
-#define Z_IS_846_EQ_846(...)   \,
-#define Z_IS_846U_EQ_846(...)  \,
-#define Z_IS_846_EQ_846U(...)  \,
-#define Z_IS_846U_EQ_846U(...) \,
-#define Z_IS_847_EQ_847(...)   \,
-#define Z_IS_847U_EQ_847(...)  \,
-#define Z_IS_847_EQ_847U(...)  \,
-#define Z_IS_847U_EQ_847U(...) \,
-#define Z_IS_848_EQ_848(...)   \,
-#define Z_IS_848U_EQ_848(...)  \,
-#define Z_IS_848_EQ_848U(...)  \,
-#define Z_IS_848U_EQ_848U(...) \,
-#define Z_IS_849_EQ_849(...)   \,
-#define Z_IS_849U_EQ_849(...)  \,
-#define Z_IS_849_EQ_849U(...)  \,
-#define Z_IS_849U_EQ_849U(...) \,
-#define Z_IS_850_EQ_850(...)   \,
-#define Z_IS_850U_EQ_850(...)  \,
-#define Z_IS_850_EQ_850U(...)  \,
-#define Z_IS_850U_EQ_850U(...) \,
-#define Z_IS_851_EQ_851(...)   \,
-#define Z_IS_851U_EQ_851(...)  \,
-#define Z_IS_851_EQ_851U(...)  \,
-#define Z_IS_851U_EQ_851U(...) \,
-#define Z_IS_852_EQ_852(...)   \,
-#define Z_IS_852U_EQ_852(...)  \,
-#define Z_IS_852_EQ_852U(...)  \,
-#define Z_IS_852U_EQ_852U(...) \,
-#define Z_IS_853_EQ_853(...)   \,
-#define Z_IS_853U_EQ_853(...)  \,
-#define Z_IS_853_EQ_853U(...)  \,
-#define Z_IS_853U_EQ_853U(...) \,
-#define Z_IS_854_EQ_854(...)   \,
-#define Z_IS_854U_EQ_854(...)  \,
-#define Z_IS_854_EQ_854U(...)  \,
-#define Z_IS_854U_EQ_854U(...) \,
-#define Z_IS_855_EQ_855(...)   \,
-#define Z_IS_855U_EQ_855(...)  \,
-#define Z_IS_855_EQ_855U(...)  \,
-#define Z_IS_855U_EQ_855U(...) \,
-#define Z_IS_856_EQ_856(...)   \,
-#define Z_IS_856U_EQ_856(...)  \,
-#define Z_IS_856_EQ_856U(...)  \,
-#define Z_IS_856U_EQ_856U(...) \,
-#define Z_IS_857_EQ_857(...)   \,
-#define Z_IS_857U_EQ_857(...)  \,
-#define Z_IS_857_EQ_857U(...)  \,
-#define Z_IS_857U_EQ_857U(...) \,
-#define Z_IS_858_EQ_858(...)   \,
-#define Z_IS_858U_EQ_858(...)  \,
-#define Z_IS_858_EQ_858U(...)  \,
-#define Z_IS_858U_EQ_858U(...) \,
-#define Z_IS_859_EQ_859(...)   \,
-#define Z_IS_859U_EQ_859(...)  \,
-#define Z_IS_859_EQ_859U(...)  \,
-#define Z_IS_859U_EQ_859U(...) \,
-#define Z_IS_860_EQ_860(...)   \,
-#define Z_IS_860U_EQ_860(...)  \,
-#define Z_IS_860_EQ_860U(...)  \,
-#define Z_IS_860U_EQ_860U(...) \,
-#define Z_IS_861_EQ_861(...)   \,
-#define Z_IS_861U_EQ_861(...)  \,
-#define Z_IS_861_EQ_861U(...)  \,
-#define Z_IS_861U_EQ_861U(...) \,
-#define Z_IS_862_EQ_862(...)   \,
-#define Z_IS_862U_EQ_862(...)  \,
-#define Z_IS_862_EQ_862U(...)  \,
-#define Z_IS_862U_EQ_862U(...) \,
-#define Z_IS_863_EQ_863(...)   \,
-#define Z_IS_863U_EQ_863(...)  \,
-#define Z_IS_863_EQ_863U(...)  \,
-#define Z_IS_863U_EQ_863U(...) \,
-#define Z_IS_864_EQ_864(...)   \,
-#define Z_IS_864U_EQ_864(...)  \,
-#define Z_IS_864_EQ_864U(...)  \,
-#define Z_IS_864U_EQ_864U(...) \,
-#define Z_IS_865_EQ_865(...)   \,
-#define Z_IS_865U_EQ_865(...)  \,
-#define Z_IS_865_EQ_865U(...)  \,
-#define Z_IS_865U_EQ_865U(...) \,
-#define Z_IS_866_EQ_866(...)   \,
-#define Z_IS_866U_EQ_866(...)  \,
-#define Z_IS_866_EQ_866U(...)  \,
-#define Z_IS_866U_EQ_866U(...) \,
-#define Z_IS_867_EQ_867(...)   \,
-#define Z_IS_867U_EQ_867(...)  \,
-#define Z_IS_867_EQ_867U(...)  \,
-#define Z_IS_867U_EQ_867U(...) \,
-#define Z_IS_868_EQ_868(...)   \,
-#define Z_IS_868U_EQ_868(...)  \,
-#define Z_IS_868_EQ_868U(...)  \,
-#define Z_IS_868U_EQ_868U(...) \,
-#define Z_IS_869_EQ_869(...)   \,
-#define Z_IS_869U_EQ_869(...)  \,
-#define Z_IS_869_EQ_869U(...)  \,
-#define Z_IS_869U_EQ_869U(...) \,
-#define Z_IS_870_EQ_870(...)   \,
-#define Z_IS_870U_EQ_870(...)  \,
-#define Z_IS_870_EQ_870U(...)  \,
-#define Z_IS_870U_EQ_870U(...) \,
-#define Z_IS_871_EQ_871(...)   \,
-#define Z_IS_871U_EQ_871(...)  \,
-#define Z_IS_871_EQ_871U(...)  \,
-#define Z_IS_871U_EQ_871U(...) \,
-#define Z_IS_872_EQ_872(...)   \,
-#define Z_IS_872U_EQ_872(...)  \,
-#define Z_IS_872_EQ_872U(...)  \,
-#define Z_IS_872U_EQ_872U(...) \,
-#define Z_IS_873_EQ_873(...)   \,
-#define Z_IS_873U_EQ_873(...)  \,
-#define Z_IS_873_EQ_873U(...)  \,
-#define Z_IS_873U_EQ_873U(...) \,
-#define Z_IS_874_EQ_874(...)   \,
-#define Z_IS_874U_EQ_874(...)  \,
-#define Z_IS_874_EQ_874U(...)  \,
-#define Z_IS_874U_EQ_874U(...) \,
-#define Z_IS_875_EQ_875(...)   \,
-#define Z_IS_875U_EQ_875(...)  \,
-#define Z_IS_875_EQ_875U(...)  \,
-#define Z_IS_875U_EQ_875U(...) \,
-#define Z_IS_876_EQ_876(...)   \,
-#define Z_IS_876U_EQ_876(...)  \,
-#define Z_IS_876_EQ_876U(...)  \,
-#define Z_IS_876U_EQ_876U(...) \,
-#define Z_IS_877_EQ_877(...)   \,
-#define Z_IS_877U_EQ_877(...)  \,
-#define Z_IS_877_EQ_877U(...)  \,
-#define Z_IS_877U_EQ_877U(...) \,
-#define Z_IS_878_EQ_878(...)   \,
-#define Z_IS_878U_EQ_878(...)  \,
-#define Z_IS_878_EQ_878U(...)  \,
-#define Z_IS_878U_EQ_878U(...) \,
-#define Z_IS_879_EQ_879(...)   \,
-#define Z_IS_879U_EQ_879(...)  \,
-#define Z_IS_879_EQ_879U(...)  \,
-#define Z_IS_879U_EQ_879U(...) \,
-#define Z_IS_880_EQ_880(...)   \,
-#define Z_IS_880U_EQ_880(...)  \,
-#define Z_IS_880_EQ_880U(...)  \,
-#define Z_IS_880U_EQ_880U(...) \,
-#define Z_IS_881_EQ_881(...)   \,
-#define Z_IS_881U_EQ_881(...)  \,
-#define Z_IS_881_EQ_881U(...)  \,
-#define Z_IS_881U_EQ_881U(...) \,
-#define Z_IS_882_EQ_882(...)   \,
-#define Z_IS_882U_EQ_882(...)  \,
-#define Z_IS_882_EQ_882U(...)  \,
-#define Z_IS_882U_EQ_882U(...) \,
-#define Z_IS_883_EQ_883(...)   \,
-#define Z_IS_883U_EQ_883(...)  \,
-#define Z_IS_883_EQ_883U(...)  \,
-#define Z_IS_883U_EQ_883U(...) \,
-#define Z_IS_884_EQ_884(...)   \,
-#define Z_IS_884U_EQ_884(...)  \,
-#define Z_IS_884_EQ_884U(...)  \,
-#define Z_IS_884U_EQ_884U(...) \,
-#define Z_IS_885_EQ_885(...)   \,
-#define Z_IS_885U_EQ_885(...)  \,
-#define Z_IS_885_EQ_885U(...)  \,
-#define Z_IS_885U_EQ_885U(...) \,
-#define Z_IS_886_EQ_886(...)   \,
-#define Z_IS_886U_EQ_886(...)  \,
-#define Z_IS_886_EQ_886U(...)  \,
-#define Z_IS_886U_EQ_886U(...) \,
-#define Z_IS_887_EQ_887(...)   \,
-#define Z_IS_887U_EQ_887(...)  \,
-#define Z_IS_887_EQ_887U(...)  \,
-#define Z_IS_887U_EQ_887U(...) \,
-#define Z_IS_888_EQ_888(...)   \,
-#define Z_IS_888U_EQ_888(...)  \,
-#define Z_IS_888_EQ_888U(...)  \,
-#define Z_IS_888U_EQ_888U(...) \,
-#define Z_IS_889_EQ_889(...)   \,
-#define Z_IS_889U_EQ_889(...)  \,
-#define Z_IS_889_EQ_889U(...)  \,
-#define Z_IS_889U_EQ_889U(...) \,
-#define Z_IS_890_EQ_890(...)   \,
-#define Z_IS_890U_EQ_890(...)  \,
-#define Z_IS_890_EQ_890U(...)  \,
-#define Z_IS_890U_EQ_890U(...) \,
-#define Z_IS_891_EQ_891(...)   \,
-#define Z_IS_891U_EQ_891(...)  \,
-#define Z_IS_891_EQ_891U(...)  \,
-#define Z_IS_891U_EQ_891U(...) \,
-#define Z_IS_892_EQ_892(...)   \,
-#define Z_IS_892U_EQ_892(...)  \,
-#define Z_IS_892_EQ_892U(...)  \,
-#define Z_IS_892U_EQ_892U(...) \,
-#define Z_IS_893_EQ_893(...)   \,
-#define Z_IS_893U_EQ_893(...)  \,
-#define Z_IS_893_EQ_893U(...)  \,
-#define Z_IS_893U_EQ_893U(...) \,
-#define Z_IS_894_EQ_894(...)   \,
-#define Z_IS_894U_EQ_894(...)  \,
-#define Z_IS_894_EQ_894U(...)  \,
-#define Z_IS_894U_EQ_894U(...) \,
-#define Z_IS_895_EQ_895(...)   \,
-#define Z_IS_895U_EQ_895(...)  \,
-#define Z_IS_895_EQ_895U(...)  \,
-#define Z_IS_895U_EQ_895U(...) \,
-#define Z_IS_896_EQ_896(...)   \,
-#define Z_IS_896U_EQ_896(...)  \,
-#define Z_IS_896_EQ_896U(...)  \,
-#define Z_IS_896U_EQ_896U(...) \,
-#define Z_IS_897_EQ_897(...)   \,
-#define Z_IS_897U_EQ_897(...)  \,
-#define Z_IS_897_EQ_897U(...)  \,
-#define Z_IS_897U_EQ_897U(...) \,
-#define Z_IS_898_EQ_898(...)   \,
-#define Z_IS_898U_EQ_898(...)  \,
-#define Z_IS_898_EQ_898U(...)  \,
-#define Z_IS_898U_EQ_898U(...) \,
-#define Z_IS_899_EQ_899(...)   \,
-#define Z_IS_899U_EQ_899(...)  \,
-#define Z_IS_899_EQ_899U(...)  \,
-#define Z_IS_899U_EQ_899U(...) \,
-#define Z_IS_900_EQ_900(...)   \,
-#define Z_IS_900U_EQ_900(...)  \,
-#define Z_IS_900_EQ_900U(...)  \,
-#define Z_IS_900U_EQ_900U(...) \,
-#define Z_IS_901_EQ_901(...)   \,
-#define Z_IS_901U_EQ_901(...)  \,
-#define Z_IS_901_EQ_901U(...)  \,
-#define Z_IS_901U_EQ_901U(...) \,
-#define Z_IS_902_EQ_902(...)   \,
-#define Z_IS_902U_EQ_902(...)  \,
-#define Z_IS_902_EQ_902U(...)  \,
-#define Z_IS_902U_EQ_902U(...) \,
-#define Z_IS_903_EQ_903(...)   \,
-#define Z_IS_903U_EQ_903(...)  \,
-#define Z_IS_903_EQ_903U(...)  \,
-#define Z_IS_903U_EQ_903U(...) \,
-#define Z_IS_904_EQ_904(...)   \,
-#define Z_IS_904U_EQ_904(...)  \,
-#define Z_IS_904_EQ_904U(...)  \,
-#define Z_IS_904U_EQ_904U(...) \,
-#define Z_IS_905_EQ_905(...)   \,
-#define Z_IS_905U_EQ_905(...)  \,
-#define Z_IS_905_EQ_905U(...)  \,
-#define Z_IS_905U_EQ_905U(...) \,
-#define Z_IS_906_EQ_906(...)   \,
-#define Z_IS_906U_EQ_906(...)  \,
-#define Z_IS_906_EQ_906U(...)  \,
-#define Z_IS_906U_EQ_906U(...) \,
-#define Z_IS_907_EQ_907(...)   \,
-#define Z_IS_907U_EQ_907(...)  \,
-#define Z_IS_907_EQ_907U(...)  \,
-#define Z_IS_907U_EQ_907U(...) \,
-#define Z_IS_908_EQ_908(...)   \,
-#define Z_IS_908U_EQ_908(...)  \,
-#define Z_IS_908_EQ_908U(...)  \,
-#define Z_IS_908U_EQ_908U(...) \,
-#define Z_IS_909_EQ_909(...)   \,
-#define Z_IS_909U_EQ_909(...)  \,
-#define Z_IS_909_EQ_909U(...)  \,
-#define Z_IS_909U_EQ_909U(...) \,
-#define Z_IS_910_EQ_910(...)   \,
-#define Z_IS_910U_EQ_910(...)  \,
-#define Z_IS_910_EQ_910U(...)  \,
-#define Z_IS_910U_EQ_910U(...) \,
-#define Z_IS_911_EQ_911(...)   \,
-#define Z_IS_911U_EQ_911(...)  \,
-#define Z_IS_911_EQ_911U(...)  \,
-#define Z_IS_911U_EQ_911U(...) \,
-#define Z_IS_912_EQ_912(...)   \,
-#define Z_IS_912U_EQ_912(...)  \,
-#define Z_IS_912_EQ_912U(...)  \,
-#define Z_IS_912U_EQ_912U(...) \,
-#define Z_IS_913_EQ_913(...)   \,
-#define Z_IS_913U_EQ_913(...)  \,
-#define Z_IS_913_EQ_913U(...)  \,
-#define Z_IS_913U_EQ_913U(...) \,
-#define Z_IS_914_EQ_914(...)   \,
-#define Z_IS_914U_EQ_914(...)  \,
-#define Z_IS_914_EQ_914U(...)  \,
-#define Z_IS_914U_EQ_914U(...) \,
-#define Z_IS_915_EQ_915(...)   \,
-#define Z_IS_915U_EQ_915(...)  \,
-#define Z_IS_915_EQ_915U(...)  \,
-#define Z_IS_915U_EQ_915U(...) \,
-#define Z_IS_916_EQ_916(...)   \,
-#define Z_IS_916U_EQ_916(...)  \,
-#define Z_IS_916_EQ_916U(...)  \,
-#define Z_IS_916U_EQ_916U(...) \,
-#define Z_IS_917_EQ_917(...)   \,
-#define Z_IS_917U_EQ_917(...)  \,
-#define Z_IS_917_EQ_917U(...)  \,
-#define Z_IS_917U_EQ_917U(...) \,
-#define Z_IS_918_EQ_918(...)   \,
-#define Z_IS_918U_EQ_918(...)  \,
-#define Z_IS_918_EQ_918U(...)  \,
-#define Z_IS_918U_EQ_918U(...) \,
-#define Z_IS_919_EQ_919(...)   \,
-#define Z_IS_919U_EQ_919(...)  \,
-#define Z_IS_919_EQ_919U(...)  \,
-#define Z_IS_919U_EQ_919U(...) \,
-#define Z_IS_920_EQ_920(...)   \,
-#define Z_IS_920U_EQ_920(...)  \,
-#define Z_IS_920_EQ_920U(...)  \,
-#define Z_IS_920U_EQ_920U(...) \,
-#define Z_IS_921_EQ_921(...)   \,
-#define Z_IS_921U_EQ_921(...)  \,
-#define Z_IS_921_EQ_921U(...)  \,
-#define Z_IS_921U_EQ_921U(...) \,
-#define Z_IS_922_EQ_922(...)   \,
-#define Z_IS_922U_EQ_922(...)  \,
-#define Z_IS_922_EQ_922U(...)  \,
-#define Z_IS_922U_EQ_922U(...) \,
-#define Z_IS_923_EQ_923(...)   \,
-#define Z_IS_923U_EQ_923(...)  \,
-#define Z_IS_923_EQ_923U(...)  \,
-#define Z_IS_923U_EQ_923U(...) \,
-#define Z_IS_924_EQ_924(...)   \,
-#define Z_IS_924U_EQ_924(...)  \,
-#define Z_IS_924_EQ_924U(...)  \,
-#define Z_IS_924U_EQ_924U(...) \,
-#define Z_IS_925_EQ_925(...)   \,
-#define Z_IS_925U_EQ_925(...)  \,
-#define Z_IS_925_EQ_925U(...)  \,
-#define Z_IS_925U_EQ_925U(...) \,
-#define Z_IS_926_EQ_926(...)   \,
-#define Z_IS_926U_EQ_926(...)  \,
-#define Z_IS_926_EQ_926U(...)  \,
-#define Z_IS_926U_EQ_926U(...) \,
-#define Z_IS_927_EQ_927(...)   \,
-#define Z_IS_927U_EQ_927(...)  \,
-#define Z_IS_927_EQ_927U(...)  \,
-#define Z_IS_927U_EQ_927U(...) \,
-#define Z_IS_928_EQ_928(...)   \,
-#define Z_IS_928U_EQ_928(...)  \,
-#define Z_IS_928_EQ_928U(...)  \,
-#define Z_IS_928U_EQ_928U(...) \,
-#define Z_IS_929_EQ_929(...)   \,
-#define Z_IS_929U_EQ_929(...)  \,
-#define Z_IS_929_EQ_929U(...)  \,
-#define Z_IS_929U_EQ_929U(...) \,
-#define Z_IS_930_EQ_930(...)   \,
-#define Z_IS_930U_EQ_930(...)  \,
-#define Z_IS_930_EQ_930U(...)  \,
-#define Z_IS_930U_EQ_930U(...) \,
-#define Z_IS_931_EQ_931(...)   \,
-#define Z_IS_931U_EQ_931(...)  \,
-#define Z_IS_931_EQ_931U(...)  \,
-#define Z_IS_931U_EQ_931U(...) \,
-#define Z_IS_932_EQ_932(...)   \,
-#define Z_IS_932U_EQ_932(...)  \,
-#define Z_IS_932_EQ_932U(...)  \,
-#define Z_IS_932U_EQ_932U(...) \,
-#define Z_IS_933_EQ_933(...)   \,
-#define Z_IS_933U_EQ_933(...)  \,
-#define Z_IS_933_EQ_933U(...)  \,
-#define Z_IS_933U_EQ_933U(...) \,
-#define Z_IS_934_EQ_934(...)   \,
-#define Z_IS_934U_EQ_934(...)  \,
-#define Z_IS_934_EQ_934U(...)  \,
-#define Z_IS_934U_EQ_934U(...) \,
-#define Z_IS_935_EQ_935(...)   \,
-#define Z_IS_935U_EQ_935(...)  \,
-#define Z_IS_935_EQ_935U(...)  \,
-#define Z_IS_935U_EQ_935U(...) \,
-#define Z_IS_936_EQ_936(...)   \,
-#define Z_IS_936U_EQ_936(...)  \,
-#define Z_IS_936_EQ_936U(...)  \,
-#define Z_IS_936U_EQ_936U(...) \,
-#define Z_IS_937_EQ_937(...)   \,
-#define Z_IS_937U_EQ_937(...)  \,
-#define Z_IS_937_EQ_937U(...)  \,
-#define Z_IS_937U_EQ_937U(...) \,
-#define Z_IS_938_EQ_938(...)   \,
-#define Z_IS_938U_EQ_938(...)  \,
-#define Z_IS_938_EQ_938U(...)  \,
-#define Z_IS_938U_EQ_938U(...) \,
-#define Z_IS_939_EQ_939(...)   \,
-#define Z_IS_939U_EQ_939(...)  \,
-#define Z_IS_939_EQ_939U(...)  \,
-#define Z_IS_939U_EQ_939U(...) \,
-#define Z_IS_940_EQ_940(...)   \,
-#define Z_IS_940U_EQ_940(...)  \,
-#define Z_IS_940_EQ_940U(...)  \,
-#define Z_IS_940U_EQ_940U(...) \,
-#define Z_IS_941_EQ_941(...)   \,
-#define Z_IS_941U_EQ_941(...)  \,
-#define Z_IS_941_EQ_941U(...)  \,
-#define Z_IS_941U_EQ_941U(...) \,
-#define Z_IS_942_EQ_942(...)   \,
-#define Z_IS_942U_EQ_942(...)  \,
-#define Z_IS_942_EQ_942U(...)  \,
-#define Z_IS_942U_EQ_942U(...) \,
-#define Z_IS_943_EQ_943(...)   \,
-#define Z_IS_943U_EQ_943(...)  \,
-#define Z_IS_943_EQ_943U(...)  \,
-#define Z_IS_943U_EQ_943U(...) \,
-#define Z_IS_944_EQ_944(...)   \,
-#define Z_IS_944U_EQ_944(...)  \,
-#define Z_IS_944_EQ_944U(...)  \,
-#define Z_IS_944U_EQ_944U(...) \,
-#define Z_IS_945_EQ_945(...)   \,
-#define Z_IS_945U_EQ_945(...)  \,
-#define Z_IS_945_EQ_945U(...)  \,
-#define Z_IS_945U_EQ_945U(...) \,
-#define Z_IS_946_EQ_946(...)   \,
-#define Z_IS_946U_EQ_946(...)  \,
-#define Z_IS_946_EQ_946U(...)  \,
-#define Z_IS_946U_EQ_946U(...) \,
-#define Z_IS_947_EQ_947(...)   \,
-#define Z_IS_947U_EQ_947(...)  \,
-#define Z_IS_947_EQ_947U(...)  \,
-#define Z_IS_947U_EQ_947U(...) \,
-#define Z_IS_948_EQ_948(...)   \,
-#define Z_IS_948U_EQ_948(...)  \,
-#define Z_IS_948_EQ_948U(...)  \,
-#define Z_IS_948U_EQ_948U(...) \,
-#define Z_IS_949_EQ_949(...)   \,
-#define Z_IS_949U_EQ_949(...)  \,
-#define Z_IS_949_EQ_949U(...)  \,
-#define Z_IS_949U_EQ_949U(...) \,
-#define Z_IS_950_EQ_950(...)   \,
-#define Z_IS_950U_EQ_950(...)  \,
-#define Z_IS_950_EQ_950U(...)  \,
-#define Z_IS_950U_EQ_950U(...) \,
-#define Z_IS_951_EQ_951(...)   \,
-#define Z_IS_951U_EQ_951(...)  \,
-#define Z_IS_951_EQ_951U(...)  \,
-#define Z_IS_951U_EQ_951U(...) \,
-#define Z_IS_952_EQ_952(...)   \,
-#define Z_IS_952U_EQ_952(...)  \,
-#define Z_IS_952_EQ_952U(...)  \,
-#define Z_IS_952U_EQ_952U(...) \,
-#define Z_IS_953_EQ_953(...)   \,
-#define Z_IS_953U_EQ_953(...)  \,
-#define Z_IS_953_EQ_953U(...)  \,
-#define Z_IS_953U_EQ_953U(...) \,
-#define Z_IS_954_EQ_954(...)   \,
-#define Z_IS_954U_EQ_954(...)  \,
-#define Z_IS_954_EQ_954U(...)  \,
-#define Z_IS_954U_EQ_954U(...) \,
-#define Z_IS_955_EQ_955(...)   \,
-#define Z_IS_955U_EQ_955(...)  \,
-#define Z_IS_955_EQ_955U(...)  \,
-#define Z_IS_955U_EQ_955U(...) \,
-#define Z_IS_956_EQ_956(...)   \,
-#define Z_IS_956U_EQ_956(...)  \,
-#define Z_IS_956_EQ_956U(...)  \,
-#define Z_IS_956U_EQ_956U(...) \,
-#define Z_IS_957_EQ_957(...)   \,
-#define Z_IS_957U_EQ_957(...)  \,
-#define Z_IS_957_EQ_957U(...)  \,
-#define Z_IS_957U_EQ_957U(...) \,
-#define Z_IS_958_EQ_958(...)   \,
-#define Z_IS_958U_EQ_958(...)  \,
-#define Z_IS_958_EQ_958U(...)  \,
-#define Z_IS_958U_EQ_958U(...) \,
-#define Z_IS_959_EQ_959(...)   \,
-#define Z_IS_959U_EQ_959(...)  \,
-#define Z_IS_959_EQ_959U(...)  \,
-#define Z_IS_959U_EQ_959U(...) \,
-#define Z_IS_960_EQ_960(...)   \,
-#define Z_IS_960U_EQ_960(...)  \,
-#define Z_IS_960_EQ_960U(...)  \,
-#define Z_IS_960U_EQ_960U(...) \,
-#define Z_IS_961_EQ_961(...)   \,
-#define Z_IS_961U_EQ_961(...)  \,
-#define Z_IS_961_EQ_961U(...)  \,
-#define Z_IS_961U_EQ_961U(...) \,
-#define Z_IS_962_EQ_962(...)   \,
-#define Z_IS_962U_EQ_962(...)  \,
-#define Z_IS_962_EQ_962U(...)  \,
-#define Z_IS_962U_EQ_962U(...) \,
-#define Z_IS_963_EQ_963(...)   \,
-#define Z_IS_963U_EQ_963(...)  \,
-#define Z_IS_963_EQ_963U(...)  \,
-#define Z_IS_963U_EQ_963U(...) \,
-#define Z_IS_964_EQ_964(...)   \,
-#define Z_IS_964U_EQ_964(...)  \,
-#define Z_IS_964_EQ_964U(...)  \,
-#define Z_IS_964U_EQ_964U(...) \,
-#define Z_IS_965_EQ_965(...)   \,
-#define Z_IS_965U_EQ_965(...)  \,
-#define Z_IS_965_EQ_965U(...)  \,
-#define Z_IS_965U_EQ_965U(...) \,
-#define Z_IS_966_EQ_966(...)   \,
-#define Z_IS_966U_EQ_966(...)  \,
-#define Z_IS_966_EQ_966U(...)  \,
-#define Z_IS_966U_EQ_966U(...) \,
-#define Z_IS_967_EQ_967(...)   \,
-#define Z_IS_967U_EQ_967(...)  \,
-#define Z_IS_967_EQ_967U(...)  \,
-#define Z_IS_967U_EQ_967U(...) \,
-#define Z_IS_968_EQ_968(...)   \,
-#define Z_IS_968U_EQ_968(...)  \,
-#define Z_IS_968_EQ_968U(...)  \,
-#define Z_IS_968U_EQ_968U(...) \,
-#define Z_IS_969_EQ_969(...)   \,
-#define Z_IS_969U_EQ_969(...)  \,
-#define Z_IS_969_EQ_969U(...)  \,
-#define Z_IS_969U_EQ_969U(...) \,
-#define Z_IS_970_EQ_970(...)   \,
-#define Z_IS_970U_EQ_970(...)  \,
-#define Z_IS_970_EQ_970U(...)  \,
-#define Z_IS_970U_EQ_970U(...) \,
-#define Z_IS_971_EQ_971(...)   \,
-#define Z_IS_971U_EQ_971(...)  \,
-#define Z_IS_971_EQ_971U(...)  \,
-#define Z_IS_971U_EQ_971U(...) \,
-#define Z_IS_972_EQ_972(...)   \,
-#define Z_IS_972U_EQ_972(...)  \,
-#define Z_IS_972_EQ_972U(...)  \,
-#define Z_IS_972U_EQ_972U(...) \,
-#define Z_IS_973_EQ_973(...)   \,
-#define Z_IS_973U_EQ_973(...)  \,
-#define Z_IS_973_EQ_973U(...)  \,
-#define Z_IS_973U_EQ_973U(...) \,
-#define Z_IS_974_EQ_974(...)   \,
-#define Z_IS_974U_EQ_974(...)  \,
-#define Z_IS_974_EQ_974U(...)  \,
-#define Z_IS_974U_EQ_974U(...) \,
-#define Z_IS_975_EQ_975(...)   \,
-#define Z_IS_975U_EQ_975(...)  \,
-#define Z_IS_975_EQ_975U(...)  \,
-#define Z_IS_975U_EQ_975U(...) \,
-#define Z_IS_976_EQ_976(...)   \,
-#define Z_IS_976U_EQ_976(...)  \,
-#define Z_IS_976_EQ_976U(...)  \,
-#define Z_IS_976U_EQ_976U(...) \,
-#define Z_IS_977_EQ_977(...)   \,
-#define Z_IS_977U_EQ_977(...)  \,
-#define Z_IS_977_EQ_977U(...)  \,
-#define Z_IS_977U_EQ_977U(...) \,
-#define Z_IS_978_EQ_978(...)   \,
-#define Z_IS_978U_EQ_978(...)  \,
-#define Z_IS_978_EQ_978U(...)  \,
-#define Z_IS_978U_EQ_978U(...) \,
-#define Z_IS_979_EQ_979(...)   \,
-#define Z_IS_979U_EQ_979(...)  \,
-#define Z_IS_979_EQ_979U(...)  \,
-#define Z_IS_979U_EQ_979U(...) \,
-#define Z_IS_980_EQ_980(...)   \,
-#define Z_IS_980U_EQ_980(...)  \,
-#define Z_IS_980_EQ_980U(...)  \,
-#define Z_IS_980U_EQ_980U(...) \,
-#define Z_IS_981_EQ_981(...)   \,
-#define Z_IS_981U_EQ_981(...)  \,
-#define Z_IS_981_EQ_981U(...)  \,
-#define Z_IS_981U_EQ_981U(...) \,
-#define Z_IS_982_EQ_982(...)   \,
-#define Z_IS_982U_EQ_982(...)  \,
-#define Z_IS_982_EQ_982U(...)  \,
-#define Z_IS_982U_EQ_982U(...) \,
-#define Z_IS_983_EQ_983(...)   \,
-#define Z_IS_983U_EQ_983(...)  \,
-#define Z_IS_983_EQ_983U(...)  \,
-#define Z_IS_983U_EQ_983U(...) \,
-#define Z_IS_984_EQ_984(...)   \,
-#define Z_IS_984U_EQ_984(...)  \,
-#define Z_IS_984_EQ_984U(...)  \,
-#define Z_IS_984U_EQ_984U(...) \,
-#define Z_IS_985_EQ_985(...)   \,
-#define Z_IS_985U_EQ_985(...)  \,
-#define Z_IS_985_EQ_985U(...)  \,
-#define Z_IS_985U_EQ_985U(...) \,
-#define Z_IS_986_EQ_986(...)   \,
-#define Z_IS_986U_EQ_986(...)  \,
-#define Z_IS_986_EQ_986U(...)  \,
-#define Z_IS_986U_EQ_986U(...) \,
-#define Z_IS_987_EQ_987(...)   \,
-#define Z_IS_987U_EQ_987(...)  \,
-#define Z_IS_987_EQ_987U(...)  \,
-#define Z_IS_987U_EQ_987U(...) \,
-#define Z_IS_988_EQ_988(...)   \,
-#define Z_IS_988U_EQ_988(...)  \,
-#define Z_IS_988_EQ_988U(...)  \,
-#define Z_IS_988U_EQ_988U(...) \,
-#define Z_IS_989_EQ_989(...)   \,
-#define Z_IS_989U_EQ_989(...)  \,
-#define Z_IS_989_EQ_989U(...)  \,
-#define Z_IS_989U_EQ_989U(...) \,
-#define Z_IS_990_EQ_990(...)   \,
-#define Z_IS_990U_EQ_990(...)  \,
-#define Z_IS_990_EQ_990U(...)  \,
-#define Z_IS_990U_EQ_990U(...) \,
-#define Z_IS_991_EQ_991(...)   \,
-#define Z_IS_991U_EQ_991(...)  \,
-#define Z_IS_991_EQ_991U(...)  \,
-#define Z_IS_991U_EQ_991U(...) \,
-#define Z_IS_992_EQ_992(...)   \,
-#define Z_IS_992U_EQ_992(...)  \,
-#define Z_IS_992_EQ_992U(...)  \,
-#define Z_IS_992U_EQ_992U(...) \,
-#define Z_IS_993_EQ_993(...)   \,
-#define Z_IS_993U_EQ_993(...)  \,
-#define Z_IS_993_EQ_993U(...)  \,
-#define Z_IS_993U_EQ_993U(...) \,
-#define Z_IS_994_EQ_994(...)   \,
-#define Z_IS_994U_EQ_994(...)  \,
-#define Z_IS_994_EQ_994U(...)  \,
-#define Z_IS_994U_EQ_994U(...) \,
-#define Z_IS_995_EQ_995(...)   \,
-#define Z_IS_995U_EQ_995(...)  \,
-#define Z_IS_995_EQ_995U(...)  \,
-#define Z_IS_995U_EQ_995U(...) \,
-#define Z_IS_996_EQ_996(...)   \,
-#define Z_IS_996U_EQ_996(...)  \,
-#define Z_IS_996_EQ_996U(...)  \,
-#define Z_IS_996U_EQ_996U(...) \,
-#define Z_IS_997_EQ_997(...)   \,
-#define Z_IS_997U_EQ_997(...)  \,
-#define Z_IS_997_EQ_997U(...)  \,
-#define Z_IS_997U_EQ_997U(...) \,
-#define Z_IS_998_EQ_998(...)   \,
-#define Z_IS_998U_EQ_998(...)  \,
-#define Z_IS_998_EQ_998U(...)  \,
-#define Z_IS_998U_EQ_998U(...) \,
-#define Z_IS_999_EQ_999(...)   \,
-#define Z_IS_999U_EQ_999(...)  \,
-#define Z_IS_999_EQ_999U(...)  \,
-#define Z_IS_999U_EQ_999U(...) \,
-#define Z_IS_1000_EQ_1000(...)   \,
-#define Z_IS_1000U_EQ_1000(...)  \,
-#define Z_IS_1000_EQ_1000U(...)  \,
-#define Z_IS_1000U_EQ_1000U(...) \,
-#define Z_IS_1001_EQ_1001(...)   \,
-#define Z_IS_1001U_EQ_1001(...)  \,
-#define Z_IS_1001_EQ_1001U(...)  \,
-#define Z_IS_1001U_EQ_1001U(...) \,
-#define Z_IS_1002_EQ_1002(...)   \,
-#define Z_IS_1002U_EQ_1002(...)  \,
-#define Z_IS_1002_EQ_1002U(...)  \,
-#define Z_IS_1002U_EQ_1002U(...) \,
-#define Z_IS_1003_EQ_1003(...)   \,
-#define Z_IS_1003U_EQ_1003(...)  \,
-#define Z_IS_1003_EQ_1003U(...)  \,
-#define Z_IS_1003U_EQ_1003U(...) \,
-#define Z_IS_1004_EQ_1004(...)   \,
-#define Z_IS_1004U_EQ_1004(...)  \,
-#define Z_IS_1004_EQ_1004U(...)  \,
-#define Z_IS_1004U_EQ_1004U(...) \,
-#define Z_IS_1005_EQ_1005(...)   \,
-#define Z_IS_1005U_EQ_1005(...)  \,
-#define Z_IS_1005_EQ_1005U(...)  \,
-#define Z_IS_1005U_EQ_1005U(...) \,
-#define Z_IS_1006_EQ_1006(...)   \,
-#define Z_IS_1006U_EQ_1006(...)  \,
-#define Z_IS_1006_EQ_1006U(...)  \,
-#define Z_IS_1006U_EQ_1006U(...) \,
-#define Z_IS_1007_EQ_1007(...)   \,
-#define Z_IS_1007U_EQ_1007(...)  \,
-#define Z_IS_1007_EQ_1007U(...)  \,
-#define Z_IS_1007U_EQ_1007U(...) \,
-#define Z_IS_1008_EQ_1008(...)   \,
-#define Z_IS_1008U_EQ_1008(...)  \,
-#define Z_IS_1008_EQ_1008U(...)  \,
-#define Z_IS_1008U_EQ_1008U(...) \,
-#define Z_IS_1009_EQ_1009(...)   \,
-#define Z_IS_1009U_EQ_1009(...)  \,
-#define Z_IS_1009_EQ_1009U(...)  \,
-#define Z_IS_1009U_EQ_1009U(...) \,
-#define Z_IS_1010_EQ_1010(...)   \,
-#define Z_IS_1010U_EQ_1010(...)  \,
-#define Z_IS_1010_EQ_1010U(...)  \,
-#define Z_IS_1010U_EQ_1010U(...) \,
-#define Z_IS_1011_EQ_1011(...)   \,
-#define Z_IS_1011U_EQ_1011(...)  \,
-#define Z_IS_1011_EQ_1011U(...)  \,
-#define Z_IS_1011U_EQ_1011U(...) \,
-#define Z_IS_1012_EQ_1012(...)   \,
-#define Z_IS_1012U_EQ_1012(...)  \,
-#define Z_IS_1012_EQ_1012U(...)  \,
-#define Z_IS_1012U_EQ_1012U(...) \,
-#define Z_IS_1013_EQ_1013(...)   \,
-#define Z_IS_1013U_EQ_1013(...)  \,
-#define Z_IS_1013_EQ_1013U(...)  \,
-#define Z_IS_1013U_EQ_1013U(...) \,
-#define Z_IS_1014_EQ_1014(...)   \,
-#define Z_IS_1014U_EQ_1014(...)  \,
-#define Z_IS_1014_EQ_1014U(...)  \,
-#define Z_IS_1014U_EQ_1014U(...) \,
-#define Z_IS_1015_EQ_1015(...)   \,
-#define Z_IS_1015U_EQ_1015(...)  \,
-#define Z_IS_1015_EQ_1015U(...)  \,
-#define Z_IS_1015U_EQ_1015U(...) \,
-#define Z_IS_1016_EQ_1016(...)   \,
-#define Z_IS_1016U_EQ_1016(...)  \,
-#define Z_IS_1016_EQ_1016U(...)  \,
-#define Z_IS_1016U_EQ_1016U(...) \,
-#define Z_IS_1017_EQ_1017(...)   \,
-#define Z_IS_1017U_EQ_1017(...)  \,
-#define Z_IS_1017_EQ_1017U(...)  \,
-#define Z_IS_1017U_EQ_1017U(...) \,
-#define Z_IS_1018_EQ_1018(...)   \,
-#define Z_IS_1018U_EQ_1018(...)  \,
-#define Z_IS_1018_EQ_1018U(...)  \,
-#define Z_IS_1018U_EQ_1018U(...) \,
-#define Z_IS_1019_EQ_1019(...)   \,
-#define Z_IS_1019U_EQ_1019(...)  \,
-#define Z_IS_1019_EQ_1019U(...)  \,
-#define Z_IS_1019U_EQ_1019U(...) \,
-#define Z_IS_1020_EQ_1020(...)   \,
-#define Z_IS_1020U_EQ_1020(...)  \,
-#define Z_IS_1020_EQ_1020U(...)  \,
-#define Z_IS_1020U_EQ_1020U(...) \,
-#define Z_IS_1021_EQ_1021(...)   \,
-#define Z_IS_1021U_EQ_1021(...)  \,
-#define Z_IS_1021_EQ_1021U(...)  \,
-#define Z_IS_1021U_EQ_1021U(...) \,
-#define Z_IS_1022_EQ_1022(...)   \,
-#define Z_IS_1022U_EQ_1022(...)  \,
-#define Z_IS_1022_EQ_1022U(...)  \,
-#define Z_IS_1022U_EQ_1022U(...) \,
-#define Z_IS_1023_EQ_1023(...)   \,
-#define Z_IS_1023U_EQ_1023(...)  \,
-#define Z_IS_1023_EQ_1023U(...)  \,
-#define Z_IS_1023U_EQ_1023U(...) \,
-#define Z_IS_1024_EQ_1024(...)   \,
-#define Z_IS_1024U_EQ_1024(...)  \,
-#define Z_IS_1024_EQ_1024U(...)  \,
-#define Z_IS_1024U_EQ_1024U(...) \,
-#define Z_IS_1025_EQ_1025(...)   \,
-#define Z_IS_1025U_EQ_1025(...)  \,
-#define Z_IS_1025_EQ_1025U(...)  \,
-#define Z_IS_1025U_EQ_1025U(...) \,
-#define Z_IS_1026_EQ_1026(...)   \,
-#define Z_IS_1026U_EQ_1026(...)  \,
-#define Z_IS_1026_EQ_1026U(...)  \,
-#define Z_IS_1026U_EQ_1026U(...) \,
-#define Z_IS_1027_EQ_1027(...)   \,
-#define Z_IS_1027U_EQ_1027(...)  \,
-#define Z_IS_1027_EQ_1027U(...)  \,
-#define Z_IS_1027U_EQ_1027U(...) \,
-#define Z_IS_1028_EQ_1028(...)   \,
-#define Z_IS_1028U_EQ_1028(...)  \,
-#define Z_IS_1028_EQ_1028U(...)  \,
-#define Z_IS_1028U_EQ_1028U(...) \,
-#define Z_IS_1029_EQ_1029(...)   \,
-#define Z_IS_1029U_EQ_1029(...)  \,
-#define Z_IS_1029_EQ_1029U(...)  \,
-#define Z_IS_1029U_EQ_1029U(...) \,
-#define Z_IS_1030_EQ_1030(...)   \,
-#define Z_IS_1030U_EQ_1030(...)  \,
-#define Z_IS_1030_EQ_1030U(...)  \,
-#define Z_IS_1030U_EQ_1030U(...) \,
-#define Z_IS_1031_EQ_1031(...)   \,
-#define Z_IS_1031U_EQ_1031(...)  \,
-#define Z_IS_1031_EQ_1031U(...)  \,
-#define Z_IS_1031U_EQ_1031U(...) \,
-#define Z_IS_1032_EQ_1032(...)   \,
-#define Z_IS_1032U_EQ_1032(...)  \,
-#define Z_IS_1032_EQ_1032U(...)  \,
-#define Z_IS_1032U_EQ_1032U(...) \,
-#define Z_IS_1033_EQ_1033(...)   \,
-#define Z_IS_1033U_EQ_1033(...)  \,
-#define Z_IS_1033_EQ_1033U(...)  \,
-#define Z_IS_1033U_EQ_1033U(...) \,
-#define Z_IS_1034_EQ_1034(...)   \,
-#define Z_IS_1034U_EQ_1034(...)  \,
-#define Z_IS_1034_EQ_1034U(...)  \,
-#define Z_IS_1034U_EQ_1034U(...) \,
-#define Z_IS_1035_EQ_1035(...)   \,
-#define Z_IS_1035U_EQ_1035(...)  \,
-#define Z_IS_1035_EQ_1035U(...)  \,
-#define Z_IS_1035U_EQ_1035U(...) \,
-#define Z_IS_1036_EQ_1036(...)   \,
-#define Z_IS_1036U_EQ_1036(...)  \,
-#define Z_IS_1036_EQ_1036U(...)  \,
-#define Z_IS_1036U_EQ_1036U(...) \,
-#define Z_IS_1037_EQ_1037(...)   \,
-#define Z_IS_1037U_EQ_1037(...)  \,
-#define Z_IS_1037_EQ_1037U(...)  \,
-#define Z_IS_1037U_EQ_1037U(...) \,
-#define Z_IS_1038_EQ_1038(...)   \,
-#define Z_IS_1038U_EQ_1038(...)  \,
-#define Z_IS_1038_EQ_1038U(...)  \,
-#define Z_IS_1038U_EQ_1038U(...) \,
-#define Z_IS_1039_EQ_1039(...)   \,
-#define Z_IS_1039U_EQ_1039(...)  \,
-#define Z_IS_1039_EQ_1039U(...)  \,
-#define Z_IS_1039U_EQ_1039U(...) \,
-#define Z_IS_1040_EQ_1040(...)   \,
-#define Z_IS_1040U_EQ_1040(...)  \,
-#define Z_IS_1040_EQ_1040U(...)  \,
-#define Z_IS_1040U_EQ_1040U(...) \,
-#define Z_IS_1041_EQ_1041(...)   \,
-#define Z_IS_1041U_EQ_1041(...)  \,
-#define Z_IS_1041_EQ_1041U(...)  \,
-#define Z_IS_1041U_EQ_1041U(...) \,
-#define Z_IS_1042_EQ_1042(...)   \,
-#define Z_IS_1042U_EQ_1042(...)  \,
-#define Z_IS_1042_EQ_1042U(...)  \,
-#define Z_IS_1042U_EQ_1042U(...) \,
-#define Z_IS_1043_EQ_1043(...)   \,
-#define Z_IS_1043U_EQ_1043(...)  \,
-#define Z_IS_1043_EQ_1043U(...)  \,
-#define Z_IS_1043U_EQ_1043U(...) \,
-#define Z_IS_1044_EQ_1044(...)   \,
-#define Z_IS_1044U_EQ_1044(...)  \,
-#define Z_IS_1044_EQ_1044U(...)  \,
-#define Z_IS_1044U_EQ_1044U(...) \,
-#define Z_IS_1045_EQ_1045(...)   \,
-#define Z_IS_1045U_EQ_1045(...)  \,
-#define Z_IS_1045_EQ_1045U(...)  \,
-#define Z_IS_1045U_EQ_1045U(...) \,
-#define Z_IS_1046_EQ_1046(...)   \,
-#define Z_IS_1046U_EQ_1046(...)  \,
-#define Z_IS_1046_EQ_1046U(...)  \,
-#define Z_IS_1046U_EQ_1046U(...) \,
-#define Z_IS_1047_EQ_1047(...)   \,
-#define Z_IS_1047U_EQ_1047(...)  \,
-#define Z_IS_1047_EQ_1047U(...)  \,
-#define Z_IS_1047U_EQ_1047U(...) \,
-#define Z_IS_1048_EQ_1048(...)   \,
-#define Z_IS_1048U_EQ_1048(...)  \,
-#define Z_IS_1048_EQ_1048U(...)  \,
-#define Z_IS_1048U_EQ_1048U(...) \,
-#define Z_IS_1049_EQ_1049(...)   \,
-#define Z_IS_1049U_EQ_1049(...)  \,
-#define Z_IS_1049_EQ_1049U(...)  \,
-#define Z_IS_1049U_EQ_1049U(...) \,
-#define Z_IS_1050_EQ_1050(...)   \,
-#define Z_IS_1050U_EQ_1050(...)  \,
-#define Z_IS_1050_EQ_1050U(...)  \,
-#define Z_IS_1050U_EQ_1050U(...) \,
-#define Z_IS_1051_EQ_1051(...)   \,
-#define Z_IS_1051U_EQ_1051(...)  \,
-#define Z_IS_1051_EQ_1051U(...)  \,
-#define Z_IS_1051U_EQ_1051U(...) \,
-#define Z_IS_1052_EQ_1052(...)   \,
-#define Z_IS_1052U_EQ_1052(...)  \,
-#define Z_IS_1052_EQ_1052U(...)  \,
-#define Z_IS_1052U_EQ_1052U(...) \,
-#define Z_IS_1053_EQ_1053(...)   \,
-#define Z_IS_1053U_EQ_1053(...)  \,
-#define Z_IS_1053_EQ_1053U(...)  \,
-#define Z_IS_1053U_EQ_1053U(...) \,
-#define Z_IS_1054_EQ_1054(...)   \,
-#define Z_IS_1054U_EQ_1054(...)  \,
-#define Z_IS_1054_EQ_1054U(...)  \,
-#define Z_IS_1054U_EQ_1054U(...) \,
-#define Z_IS_1055_EQ_1055(...)   \,
-#define Z_IS_1055U_EQ_1055(...)  \,
-#define Z_IS_1055_EQ_1055U(...)  \,
-#define Z_IS_1055U_EQ_1055U(...) \,
-#define Z_IS_1056_EQ_1056(...)   \,
-#define Z_IS_1056U_EQ_1056(...)  \,
-#define Z_IS_1056_EQ_1056U(...)  \,
-#define Z_IS_1056U_EQ_1056U(...) \,
-#define Z_IS_1057_EQ_1057(...)   \,
-#define Z_IS_1057U_EQ_1057(...)  \,
-#define Z_IS_1057_EQ_1057U(...)  \,
-#define Z_IS_1057U_EQ_1057U(...) \,
-#define Z_IS_1058_EQ_1058(...)   \,
-#define Z_IS_1058U_EQ_1058(...)  \,
-#define Z_IS_1058_EQ_1058U(...)  \,
-#define Z_IS_1058U_EQ_1058U(...) \,
-#define Z_IS_1059_EQ_1059(...)   \,
-#define Z_IS_1059U_EQ_1059(...)  \,
-#define Z_IS_1059_EQ_1059U(...)  \,
-#define Z_IS_1059U_EQ_1059U(...) \,
-#define Z_IS_1060_EQ_1060(...)   \,
-#define Z_IS_1060U_EQ_1060(...)  \,
-#define Z_IS_1060_EQ_1060U(...)  \,
-#define Z_IS_1060U_EQ_1060U(...) \,
-#define Z_IS_1061_EQ_1061(...)   \,
-#define Z_IS_1061U_EQ_1061(...)  \,
-#define Z_IS_1061_EQ_1061U(...)  \,
-#define Z_IS_1061U_EQ_1061U(...) \,
-#define Z_IS_1062_EQ_1062(...)   \,
-#define Z_IS_1062U_EQ_1062(...)  \,
-#define Z_IS_1062_EQ_1062U(...)  \,
-#define Z_IS_1062U_EQ_1062U(...) \,
-#define Z_IS_1063_EQ_1063(...)   \,
-#define Z_IS_1063U_EQ_1063(...)  \,
-#define Z_IS_1063_EQ_1063U(...)  \,
-#define Z_IS_1063U_EQ_1063U(...) \,
-#define Z_IS_1064_EQ_1064(...)   \,
-#define Z_IS_1064U_EQ_1064(...)  \,
-#define Z_IS_1064_EQ_1064U(...)  \,
-#define Z_IS_1064U_EQ_1064U(...) \,
-#define Z_IS_1065_EQ_1065(...)   \,
-#define Z_IS_1065U_EQ_1065(...)  \,
-#define Z_IS_1065_EQ_1065U(...)  \,
-#define Z_IS_1065U_EQ_1065U(...) \,
-#define Z_IS_1066_EQ_1066(...)   \,
-#define Z_IS_1066U_EQ_1066(...)  \,
-#define Z_IS_1066_EQ_1066U(...)  \,
-#define Z_IS_1066U_EQ_1066U(...) \,
-#define Z_IS_1067_EQ_1067(...)   \,
-#define Z_IS_1067U_EQ_1067(...)  \,
-#define Z_IS_1067_EQ_1067U(...)  \,
-#define Z_IS_1067U_EQ_1067U(...) \,
-#define Z_IS_1068_EQ_1068(...)   \,
-#define Z_IS_1068U_EQ_1068(...)  \,
-#define Z_IS_1068_EQ_1068U(...)  \,
-#define Z_IS_1068U_EQ_1068U(...) \,
-#define Z_IS_1069_EQ_1069(...)   \,
-#define Z_IS_1069U_EQ_1069(...)  \,
-#define Z_IS_1069_EQ_1069U(...)  \,
-#define Z_IS_1069U_EQ_1069U(...) \,
-#define Z_IS_1070_EQ_1070(...)   \,
-#define Z_IS_1070U_EQ_1070(...)  \,
-#define Z_IS_1070_EQ_1070U(...)  \,
-#define Z_IS_1070U_EQ_1070U(...) \,
-#define Z_IS_1071_EQ_1071(...)   \,
-#define Z_IS_1071U_EQ_1071(...)  \,
-#define Z_IS_1071_EQ_1071U(...)  \,
-#define Z_IS_1071U_EQ_1071U(...) \,
-#define Z_IS_1072_EQ_1072(...)   \,
-#define Z_IS_1072U_EQ_1072(...)  \,
-#define Z_IS_1072_EQ_1072U(...)  \,
-#define Z_IS_1072U_EQ_1072U(...) \,
-#define Z_IS_1073_EQ_1073(...)   \,
-#define Z_IS_1073U_EQ_1073(...)  \,
-#define Z_IS_1073_EQ_1073U(...)  \,
-#define Z_IS_1073U_EQ_1073U(...) \,
-#define Z_IS_1074_EQ_1074(...)   \,
-#define Z_IS_1074U_EQ_1074(...)  \,
-#define Z_IS_1074_EQ_1074U(...)  \,
-#define Z_IS_1074U_EQ_1074U(...) \,
-#define Z_IS_1075_EQ_1075(...)   \,
-#define Z_IS_1075U_EQ_1075(...)  \,
-#define Z_IS_1075_EQ_1075U(...)  \,
-#define Z_IS_1075U_EQ_1075U(...) \,
-#define Z_IS_1076_EQ_1076(...)   \,
-#define Z_IS_1076U_EQ_1076(...)  \,
-#define Z_IS_1076_EQ_1076U(...)  \,
-#define Z_IS_1076U_EQ_1076U(...) \,
-#define Z_IS_1077_EQ_1077(...)   \,
-#define Z_IS_1077U_EQ_1077(...)  \,
-#define Z_IS_1077_EQ_1077U(...)  \,
-#define Z_IS_1077U_EQ_1077U(...) \,
-#define Z_IS_1078_EQ_1078(...)   \,
-#define Z_IS_1078U_EQ_1078(...)  \,
-#define Z_IS_1078_EQ_1078U(...)  \,
-#define Z_IS_1078U_EQ_1078U(...) \,
-#define Z_IS_1079_EQ_1079(...)   \,
-#define Z_IS_1079U_EQ_1079(...)  \,
-#define Z_IS_1079_EQ_1079U(...)  \,
-#define Z_IS_1079U_EQ_1079U(...) \,
-#define Z_IS_1080_EQ_1080(...)   \,
-#define Z_IS_1080U_EQ_1080(...)  \,
-#define Z_IS_1080_EQ_1080U(...)  \,
-#define Z_IS_1080U_EQ_1080U(...) \,
-#define Z_IS_1081_EQ_1081(...)   \,
-#define Z_IS_1081U_EQ_1081(...)  \,
-#define Z_IS_1081_EQ_1081U(...)  \,
-#define Z_IS_1081U_EQ_1081U(...) \,
-#define Z_IS_1082_EQ_1082(...)   \,
-#define Z_IS_1082U_EQ_1082(...)  \,
-#define Z_IS_1082_EQ_1082U(...)  \,
-#define Z_IS_1082U_EQ_1082U(...) \,
-#define Z_IS_1083_EQ_1083(...)   \,
-#define Z_IS_1083U_EQ_1083(...)  \,
-#define Z_IS_1083_EQ_1083U(...)  \,
-#define Z_IS_1083U_EQ_1083U(...) \,
-#define Z_IS_1084_EQ_1084(...)   \,
-#define Z_IS_1084U_EQ_1084(...)  \,
-#define Z_IS_1084_EQ_1084U(...)  \,
-#define Z_IS_1084U_EQ_1084U(...) \,
-#define Z_IS_1085_EQ_1085(...)   \,
-#define Z_IS_1085U_EQ_1085(...)  \,
-#define Z_IS_1085_EQ_1085U(...)  \,
-#define Z_IS_1085U_EQ_1085U(...) \,
-#define Z_IS_1086_EQ_1086(...)   \,
-#define Z_IS_1086U_EQ_1086(...)  \,
-#define Z_IS_1086_EQ_1086U(...)  \,
-#define Z_IS_1086U_EQ_1086U(...) \,
-#define Z_IS_1087_EQ_1087(...)   \,
-#define Z_IS_1087U_EQ_1087(...)  \,
-#define Z_IS_1087_EQ_1087U(...)  \,
-#define Z_IS_1087U_EQ_1087U(...) \,
-#define Z_IS_1088_EQ_1088(...)   \,
-#define Z_IS_1088U_EQ_1088(...)  \,
-#define Z_IS_1088_EQ_1088U(...)  \,
-#define Z_IS_1088U_EQ_1088U(...) \,
-#define Z_IS_1089_EQ_1089(...)   \,
-#define Z_IS_1089U_EQ_1089(...)  \,
-#define Z_IS_1089_EQ_1089U(...)  \,
-#define Z_IS_1089U_EQ_1089U(...) \,
-#define Z_IS_1090_EQ_1090(...)   \,
-#define Z_IS_1090U_EQ_1090(...)  \,
-#define Z_IS_1090_EQ_1090U(...)  \,
-#define Z_IS_1090U_EQ_1090U(...) \,
-#define Z_IS_1091_EQ_1091(...)   \,
-#define Z_IS_1091U_EQ_1091(...)  \,
-#define Z_IS_1091_EQ_1091U(...)  \,
-#define Z_IS_1091U_EQ_1091U(...) \,
-#define Z_IS_1092_EQ_1092(...)   \,
-#define Z_IS_1092U_EQ_1092(...)  \,
-#define Z_IS_1092_EQ_1092U(...)  \,
-#define Z_IS_1092U_EQ_1092U(...) \,
-#define Z_IS_1093_EQ_1093(...)   \,
-#define Z_IS_1093U_EQ_1093(...)  \,
-#define Z_IS_1093_EQ_1093U(...)  \,
-#define Z_IS_1093U_EQ_1093U(...) \,
-#define Z_IS_1094_EQ_1094(...)   \,
-#define Z_IS_1094U_EQ_1094(...)  \,
-#define Z_IS_1094_EQ_1094U(...)  \,
-#define Z_IS_1094U_EQ_1094U(...) \,
-#define Z_IS_1095_EQ_1095(...)   \,
-#define Z_IS_1095U_EQ_1095(...)  \,
-#define Z_IS_1095_EQ_1095U(...)  \,
-#define Z_IS_1095U_EQ_1095U(...) \,
-#define Z_IS_1096_EQ_1096(...)   \,
-#define Z_IS_1096U_EQ_1096(...)  \,
-#define Z_IS_1096_EQ_1096U(...)  \,
-#define Z_IS_1096U_EQ_1096U(...) \,
-#define Z_IS_1097_EQ_1097(...)   \,
-#define Z_IS_1097U_EQ_1097(...)  \,
-#define Z_IS_1097_EQ_1097U(...)  \,
-#define Z_IS_1097U_EQ_1097U(...) \,
-#define Z_IS_1098_EQ_1098(...)   \,
-#define Z_IS_1098U_EQ_1098(...)  \,
-#define Z_IS_1098_EQ_1098U(...)  \,
-#define Z_IS_1098U_EQ_1098U(...) \,
-#define Z_IS_1099_EQ_1099(...)   \,
-#define Z_IS_1099U_EQ_1099(...)  \,
-#define Z_IS_1099_EQ_1099U(...)  \,
-#define Z_IS_1099U_EQ_1099U(...) \,
-#define Z_IS_1100_EQ_1100(...)   \,
-#define Z_IS_1100U_EQ_1100(...)  \,
-#define Z_IS_1100_EQ_1100U(...)  \,
-#define Z_IS_1100U_EQ_1100U(...) \,
-#define Z_IS_1101_EQ_1101(...)   \,
-#define Z_IS_1101U_EQ_1101(...)  \,
-#define Z_IS_1101_EQ_1101U(...)  \,
-#define Z_IS_1101U_EQ_1101U(...) \,
-#define Z_IS_1102_EQ_1102(...)   \,
-#define Z_IS_1102U_EQ_1102(...)  \,
-#define Z_IS_1102_EQ_1102U(...)  \,
-#define Z_IS_1102U_EQ_1102U(...) \,
-#define Z_IS_1103_EQ_1103(...)   \,
-#define Z_IS_1103U_EQ_1103(...)  \,
-#define Z_IS_1103_EQ_1103U(...)  \,
-#define Z_IS_1103U_EQ_1103U(...) \,
-#define Z_IS_1104_EQ_1104(...)   \,
-#define Z_IS_1104U_EQ_1104(...)  \,
-#define Z_IS_1104_EQ_1104U(...)  \,
-#define Z_IS_1104U_EQ_1104U(...) \,
-#define Z_IS_1105_EQ_1105(...)   \,
-#define Z_IS_1105U_EQ_1105(...)  \,
-#define Z_IS_1105_EQ_1105U(...)  \,
-#define Z_IS_1105U_EQ_1105U(...) \,
-#define Z_IS_1106_EQ_1106(...)   \,
-#define Z_IS_1106U_EQ_1106(...)  \,
-#define Z_IS_1106_EQ_1106U(...)  \,
-#define Z_IS_1106U_EQ_1106U(...) \,
-#define Z_IS_1107_EQ_1107(...)   \,
-#define Z_IS_1107U_EQ_1107(...)  \,
-#define Z_IS_1107_EQ_1107U(...)  \,
-#define Z_IS_1107U_EQ_1107U(...) \,
-#define Z_IS_1108_EQ_1108(...)   \,
-#define Z_IS_1108U_EQ_1108(...)  \,
-#define Z_IS_1108_EQ_1108U(...)  \,
-#define Z_IS_1108U_EQ_1108U(...) \,
-#define Z_IS_1109_EQ_1109(...)   \,
-#define Z_IS_1109U_EQ_1109(...)  \,
-#define Z_IS_1109_EQ_1109U(...)  \,
-#define Z_IS_1109U_EQ_1109U(...) \,
-#define Z_IS_1110_EQ_1110(...)   \,
-#define Z_IS_1110U_EQ_1110(...)  \,
-#define Z_IS_1110_EQ_1110U(...)  \,
-#define Z_IS_1110U_EQ_1110U(...) \,
-#define Z_IS_1111_EQ_1111(...)   \,
-#define Z_IS_1111U_EQ_1111(...)  \,
-#define Z_IS_1111_EQ_1111U(...)  \,
-#define Z_IS_1111U_EQ_1111U(...) \,
-#define Z_IS_1112_EQ_1112(...)   \,
-#define Z_IS_1112U_EQ_1112(...)  \,
-#define Z_IS_1112_EQ_1112U(...)  \,
-#define Z_IS_1112U_EQ_1112U(...) \,
-#define Z_IS_1113_EQ_1113(...)   \,
-#define Z_IS_1113U_EQ_1113(...)  \,
-#define Z_IS_1113_EQ_1113U(...)  \,
-#define Z_IS_1113U_EQ_1113U(...) \,
-#define Z_IS_1114_EQ_1114(...)   \,
-#define Z_IS_1114U_EQ_1114(...)  \,
-#define Z_IS_1114_EQ_1114U(...)  \,
-#define Z_IS_1114U_EQ_1114U(...) \,
-#define Z_IS_1115_EQ_1115(...)   \,
-#define Z_IS_1115U_EQ_1115(...)  \,
-#define Z_IS_1115_EQ_1115U(...)  \,
-#define Z_IS_1115U_EQ_1115U(...) \,
-#define Z_IS_1116_EQ_1116(...)   \,
-#define Z_IS_1116U_EQ_1116(...)  \,
-#define Z_IS_1116_EQ_1116U(...)  \,
-#define Z_IS_1116U_EQ_1116U(...) \,
-#define Z_IS_1117_EQ_1117(...)   \,
-#define Z_IS_1117U_EQ_1117(...)  \,
-#define Z_IS_1117_EQ_1117U(...)  \,
-#define Z_IS_1117U_EQ_1117U(...) \,
-#define Z_IS_1118_EQ_1118(...)   \,
-#define Z_IS_1118U_EQ_1118(...)  \,
-#define Z_IS_1118_EQ_1118U(...)  \,
-#define Z_IS_1118U_EQ_1118U(...) \,
-#define Z_IS_1119_EQ_1119(...)   \,
-#define Z_IS_1119U_EQ_1119(...)  \,
-#define Z_IS_1119_EQ_1119U(...)  \,
-#define Z_IS_1119U_EQ_1119U(...) \,
-#define Z_IS_1120_EQ_1120(...)   \,
-#define Z_IS_1120U_EQ_1120(...)  \,
-#define Z_IS_1120_EQ_1120U(...)  \,
-#define Z_IS_1120U_EQ_1120U(...) \,
-#define Z_IS_1121_EQ_1121(...)   \,
-#define Z_IS_1121U_EQ_1121(...)  \,
-#define Z_IS_1121_EQ_1121U(...)  \,
-#define Z_IS_1121U_EQ_1121U(...) \,
-#define Z_IS_1122_EQ_1122(...)   \,
-#define Z_IS_1122U_EQ_1122(...)  \,
-#define Z_IS_1122_EQ_1122U(...)  \,
-#define Z_IS_1122U_EQ_1122U(...) \,
-#define Z_IS_1123_EQ_1123(...)   \,
-#define Z_IS_1123U_EQ_1123(...)  \,
-#define Z_IS_1123_EQ_1123U(...)  \,
-#define Z_IS_1123U_EQ_1123U(...) \,
-#define Z_IS_1124_EQ_1124(...)   \,
-#define Z_IS_1124U_EQ_1124(...)  \,
-#define Z_IS_1124_EQ_1124U(...)  \,
-#define Z_IS_1124U_EQ_1124U(...) \,
-#define Z_IS_1125_EQ_1125(...)   \,
-#define Z_IS_1125U_EQ_1125(...)  \,
-#define Z_IS_1125_EQ_1125U(...)  \,
-#define Z_IS_1125U_EQ_1125U(...) \,
-#define Z_IS_1126_EQ_1126(...)   \,
-#define Z_IS_1126U_EQ_1126(...)  \,
-#define Z_IS_1126_EQ_1126U(...)  \,
-#define Z_IS_1126U_EQ_1126U(...) \,
-#define Z_IS_1127_EQ_1127(...)   \,
-#define Z_IS_1127U_EQ_1127(...)  \,
-#define Z_IS_1127_EQ_1127U(...)  \,
-#define Z_IS_1127U_EQ_1127U(...) \,
-#define Z_IS_1128_EQ_1128(...)   \,
-#define Z_IS_1128U_EQ_1128(...)  \,
-#define Z_IS_1128_EQ_1128U(...)  \,
-#define Z_IS_1128U_EQ_1128U(...) \,
-#define Z_IS_1129_EQ_1129(...)   \,
-#define Z_IS_1129U_EQ_1129(...)  \,
-#define Z_IS_1129_EQ_1129U(...)  \,
-#define Z_IS_1129U_EQ_1129U(...) \,
-#define Z_IS_1130_EQ_1130(...)   \,
-#define Z_IS_1130U_EQ_1130(...)  \,
-#define Z_IS_1130_EQ_1130U(...)  \,
-#define Z_IS_1130U_EQ_1130U(...) \,
-#define Z_IS_1131_EQ_1131(...)   \,
-#define Z_IS_1131U_EQ_1131(...)  \,
-#define Z_IS_1131_EQ_1131U(...)  \,
-#define Z_IS_1131U_EQ_1131U(...) \,
-#define Z_IS_1132_EQ_1132(...)   \,
-#define Z_IS_1132U_EQ_1132(...)  \,
-#define Z_IS_1132_EQ_1132U(...)  \,
-#define Z_IS_1132U_EQ_1132U(...) \,
-#define Z_IS_1133_EQ_1133(...)   \,
-#define Z_IS_1133U_EQ_1133(...)  \,
-#define Z_IS_1133_EQ_1133U(...)  \,
-#define Z_IS_1133U_EQ_1133U(...) \,
-#define Z_IS_1134_EQ_1134(...)   \,
-#define Z_IS_1134U_EQ_1134(...)  \,
-#define Z_IS_1134_EQ_1134U(...)  \,
-#define Z_IS_1134U_EQ_1134U(...) \,
-#define Z_IS_1135_EQ_1135(...)   \,
-#define Z_IS_1135U_EQ_1135(...)  \,
-#define Z_IS_1135_EQ_1135U(...)  \,
-#define Z_IS_1135U_EQ_1135U(...) \,
-#define Z_IS_1136_EQ_1136(...)   \,
-#define Z_IS_1136U_EQ_1136(...)  \,
-#define Z_IS_1136_EQ_1136U(...)  \,
-#define Z_IS_1136U_EQ_1136U(...) \,
-#define Z_IS_1137_EQ_1137(...)   \,
-#define Z_IS_1137U_EQ_1137(...)  \,
-#define Z_IS_1137_EQ_1137U(...)  \,
-#define Z_IS_1137U_EQ_1137U(...) \,
-#define Z_IS_1138_EQ_1138(...)   \,
-#define Z_IS_1138U_EQ_1138(...)  \,
-#define Z_IS_1138_EQ_1138U(...)  \,
-#define Z_IS_1138U_EQ_1138U(...) \,
-#define Z_IS_1139_EQ_1139(...)   \,
-#define Z_IS_1139U_EQ_1139(...)  \,
-#define Z_IS_1139_EQ_1139U(...)  \,
-#define Z_IS_1139U_EQ_1139U(...) \,
-#define Z_IS_1140_EQ_1140(...)   \,
-#define Z_IS_1140U_EQ_1140(...)  \,
-#define Z_IS_1140_EQ_1140U(...)  \,
-#define Z_IS_1140U_EQ_1140U(...) \,
-#define Z_IS_1141_EQ_1141(...)   \,
-#define Z_IS_1141U_EQ_1141(...)  \,
-#define Z_IS_1141_EQ_1141U(...)  \,
-#define Z_IS_1141U_EQ_1141U(...) \,
-#define Z_IS_1142_EQ_1142(...)   \,
-#define Z_IS_1142U_EQ_1142(...)  \,
-#define Z_IS_1142_EQ_1142U(...)  \,
-#define Z_IS_1142U_EQ_1142U(...) \,
-#define Z_IS_1143_EQ_1143(...)   \,
-#define Z_IS_1143U_EQ_1143(...)  \,
-#define Z_IS_1143_EQ_1143U(...)  \,
-#define Z_IS_1143U_EQ_1143U(...) \,
-#define Z_IS_1144_EQ_1144(...)   \,
-#define Z_IS_1144U_EQ_1144(...)  \,
-#define Z_IS_1144_EQ_1144U(...)  \,
-#define Z_IS_1144U_EQ_1144U(...) \,
-#define Z_IS_1145_EQ_1145(...)   \,
-#define Z_IS_1145U_EQ_1145(...)  \,
-#define Z_IS_1145_EQ_1145U(...)  \,
-#define Z_IS_1145U_EQ_1145U(...) \,
-#define Z_IS_1146_EQ_1146(...)   \,
-#define Z_IS_1146U_EQ_1146(...)  \,
-#define Z_IS_1146_EQ_1146U(...)  \,
-#define Z_IS_1146U_EQ_1146U(...) \,
-#define Z_IS_1147_EQ_1147(...)   \,
-#define Z_IS_1147U_EQ_1147(...)  \,
-#define Z_IS_1147_EQ_1147U(...)  \,
-#define Z_IS_1147U_EQ_1147U(...) \,
-#define Z_IS_1148_EQ_1148(...)   \,
-#define Z_IS_1148U_EQ_1148(...)  \,
-#define Z_IS_1148_EQ_1148U(...)  \,
-#define Z_IS_1148U_EQ_1148U(...) \,
-#define Z_IS_1149_EQ_1149(...)   \,
-#define Z_IS_1149U_EQ_1149(...)  \,
-#define Z_IS_1149_EQ_1149U(...)  \,
-#define Z_IS_1149U_EQ_1149U(...) \,
-#define Z_IS_1150_EQ_1150(...)   \,
-#define Z_IS_1150U_EQ_1150(...)  \,
-#define Z_IS_1150_EQ_1150U(...)  \,
-#define Z_IS_1150U_EQ_1150U(...) \,
-#define Z_IS_1151_EQ_1151(...)   \,
-#define Z_IS_1151U_EQ_1151(...)  \,
-#define Z_IS_1151_EQ_1151U(...)  \,
-#define Z_IS_1151U_EQ_1151U(...) \,
-#define Z_IS_1152_EQ_1152(...)   \,
-#define Z_IS_1152U_EQ_1152(...)  \,
-#define Z_IS_1152_EQ_1152U(...)  \,
-#define Z_IS_1152U_EQ_1152U(...) \,
-#define Z_IS_1153_EQ_1153(...)   \,
-#define Z_IS_1153U_EQ_1153(...)  \,
-#define Z_IS_1153_EQ_1153U(...)  \,
-#define Z_IS_1153U_EQ_1153U(...) \,
-#define Z_IS_1154_EQ_1154(...)   \,
-#define Z_IS_1154U_EQ_1154(...)  \,
-#define Z_IS_1154_EQ_1154U(...)  \,
-#define Z_IS_1154U_EQ_1154U(...) \,
-#define Z_IS_1155_EQ_1155(...)   \,
-#define Z_IS_1155U_EQ_1155(...)  \,
-#define Z_IS_1155_EQ_1155U(...)  \,
-#define Z_IS_1155U_EQ_1155U(...) \,
-#define Z_IS_1156_EQ_1156(...)   \,
-#define Z_IS_1156U_EQ_1156(...)  \,
-#define Z_IS_1156_EQ_1156U(...)  \,
-#define Z_IS_1156U_EQ_1156U(...) \,
-#define Z_IS_1157_EQ_1157(...)   \,
-#define Z_IS_1157U_EQ_1157(...)  \,
-#define Z_IS_1157_EQ_1157U(...)  \,
-#define Z_IS_1157U_EQ_1157U(...) \,
-#define Z_IS_1158_EQ_1158(...)   \,
-#define Z_IS_1158U_EQ_1158(...)  \,
-#define Z_IS_1158_EQ_1158U(...)  \,
-#define Z_IS_1158U_EQ_1158U(...) \,
-#define Z_IS_1159_EQ_1159(...)   \,
-#define Z_IS_1159U_EQ_1159(...)  \,
-#define Z_IS_1159_EQ_1159U(...)  \,
-#define Z_IS_1159U_EQ_1159U(...) \,
-#define Z_IS_1160_EQ_1160(...)   \,
-#define Z_IS_1160U_EQ_1160(...)  \,
-#define Z_IS_1160_EQ_1160U(...)  \,
-#define Z_IS_1160U_EQ_1160U(...) \,
-#define Z_IS_1161_EQ_1161(...)   \,
-#define Z_IS_1161U_EQ_1161(...)  \,
-#define Z_IS_1161_EQ_1161U(...)  \,
-#define Z_IS_1161U_EQ_1161U(...) \,
-#define Z_IS_1162_EQ_1162(...)   \,
-#define Z_IS_1162U_EQ_1162(...)  \,
-#define Z_IS_1162_EQ_1162U(...)  \,
-#define Z_IS_1162U_EQ_1162U(...) \,
-#define Z_IS_1163_EQ_1163(...)   \,
-#define Z_IS_1163U_EQ_1163(...)  \,
-#define Z_IS_1163_EQ_1163U(...)  \,
-#define Z_IS_1163U_EQ_1163U(...) \,
-#define Z_IS_1164_EQ_1164(...)   \,
-#define Z_IS_1164U_EQ_1164(...)  \,
-#define Z_IS_1164_EQ_1164U(...)  \,
-#define Z_IS_1164U_EQ_1164U(...) \,
-#define Z_IS_1165_EQ_1165(...)   \,
-#define Z_IS_1165U_EQ_1165(...)  \,
-#define Z_IS_1165_EQ_1165U(...)  \,
-#define Z_IS_1165U_EQ_1165U(...) \,
-#define Z_IS_1166_EQ_1166(...)   \,
-#define Z_IS_1166U_EQ_1166(...)  \,
-#define Z_IS_1166_EQ_1166U(...)  \,
-#define Z_IS_1166U_EQ_1166U(...) \,
-#define Z_IS_1167_EQ_1167(...)   \,
-#define Z_IS_1167U_EQ_1167(...)  \,
-#define Z_IS_1167_EQ_1167U(...)  \,
-#define Z_IS_1167U_EQ_1167U(...) \,
-#define Z_IS_1168_EQ_1168(...)   \,
-#define Z_IS_1168U_EQ_1168(...)  \,
-#define Z_IS_1168_EQ_1168U(...)  \,
-#define Z_IS_1168U_EQ_1168U(...) \,
-#define Z_IS_1169_EQ_1169(...)   \,
-#define Z_IS_1169U_EQ_1169(...)  \,
-#define Z_IS_1169_EQ_1169U(...)  \,
-#define Z_IS_1169U_EQ_1169U(...) \,
-#define Z_IS_1170_EQ_1170(...)   \,
-#define Z_IS_1170U_EQ_1170(...)  \,
-#define Z_IS_1170_EQ_1170U(...)  \,
-#define Z_IS_1170U_EQ_1170U(...) \,
-#define Z_IS_1171_EQ_1171(...)   \,
-#define Z_IS_1171U_EQ_1171(...)  \,
-#define Z_IS_1171_EQ_1171U(...)  \,
-#define Z_IS_1171U_EQ_1171U(...) \,
-#define Z_IS_1172_EQ_1172(...)   \,
-#define Z_IS_1172U_EQ_1172(...)  \,
-#define Z_IS_1172_EQ_1172U(...)  \,
-#define Z_IS_1172U_EQ_1172U(...) \,
-#define Z_IS_1173_EQ_1173(...)   \,
-#define Z_IS_1173U_EQ_1173(...)  \,
-#define Z_IS_1173_EQ_1173U(...)  \,
-#define Z_IS_1173U_EQ_1173U(...) \,
-#define Z_IS_1174_EQ_1174(...)   \,
-#define Z_IS_1174U_EQ_1174(...)  \,
-#define Z_IS_1174_EQ_1174U(...)  \,
-#define Z_IS_1174U_EQ_1174U(...) \,
-#define Z_IS_1175_EQ_1175(...)   \,
-#define Z_IS_1175U_EQ_1175(...)  \,
-#define Z_IS_1175_EQ_1175U(...)  \,
-#define Z_IS_1175U_EQ_1175U(...) \,
-#define Z_IS_1176_EQ_1176(...)   \,
-#define Z_IS_1176U_EQ_1176(...)  \,
-#define Z_IS_1176_EQ_1176U(...)  \,
-#define Z_IS_1176U_EQ_1176U(...) \,
-#define Z_IS_1177_EQ_1177(...)   \,
-#define Z_IS_1177U_EQ_1177(...)  \,
-#define Z_IS_1177_EQ_1177U(...)  \,
-#define Z_IS_1177U_EQ_1177U(...) \,
-#define Z_IS_1178_EQ_1178(...)   \,
-#define Z_IS_1178U_EQ_1178(...)  \,
-#define Z_IS_1178_EQ_1178U(...)  \,
-#define Z_IS_1178U_EQ_1178U(...) \,
-#define Z_IS_1179_EQ_1179(...)   \,
-#define Z_IS_1179U_EQ_1179(...)  \,
-#define Z_IS_1179_EQ_1179U(...)  \,
-#define Z_IS_1179U_EQ_1179U(...) \,
-#define Z_IS_1180_EQ_1180(...)   \,
-#define Z_IS_1180U_EQ_1180(...)  \,
-#define Z_IS_1180_EQ_1180U(...)  \,
-#define Z_IS_1180U_EQ_1180U(...) \,
-#define Z_IS_1181_EQ_1181(...)   \,
-#define Z_IS_1181U_EQ_1181(...)  \,
-#define Z_IS_1181_EQ_1181U(...)  \,
-#define Z_IS_1181U_EQ_1181U(...) \,
-#define Z_IS_1182_EQ_1182(...)   \,
-#define Z_IS_1182U_EQ_1182(...)  \,
-#define Z_IS_1182_EQ_1182U(...)  \,
-#define Z_IS_1182U_EQ_1182U(...) \,
-#define Z_IS_1183_EQ_1183(...)   \,
-#define Z_IS_1183U_EQ_1183(...)  \,
-#define Z_IS_1183_EQ_1183U(...)  \,
-#define Z_IS_1183U_EQ_1183U(...) \,
-#define Z_IS_1184_EQ_1184(...)   \,
-#define Z_IS_1184U_EQ_1184(...)  \,
-#define Z_IS_1184_EQ_1184U(...)  \,
-#define Z_IS_1184U_EQ_1184U(...) \,
-#define Z_IS_1185_EQ_1185(...)   \,
-#define Z_IS_1185U_EQ_1185(...)  \,
-#define Z_IS_1185_EQ_1185U(...)  \,
-#define Z_IS_1185U_EQ_1185U(...) \,
-#define Z_IS_1186_EQ_1186(...)   \,
-#define Z_IS_1186U_EQ_1186(...)  \,
-#define Z_IS_1186_EQ_1186U(...)  \,
-#define Z_IS_1186U_EQ_1186U(...) \,
-#define Z_IS_1187_EQ_1187(...)   \,
-#define Z_IS_1187U_EQ_1187(...)  \,
-#define Z_IS_1187_EQ_1187U(...)  \,
-#define Z_IS_1187U_EQ_1187U(...) \,
-#define Z_IS_1188_EQ_1188(...)   \,
-#define Z_IS_1188U_EQ_1188(...)  \,
-#define Z_IS_1188_EQ_1188U(...)  \,
-#define Z_IS_1188U_EQ_1188U(...) \,
-#define Z_IS_1189_EQ_1189(...)   \,
-#define Z_IS_1189U_EQ_1189(...)  \,
-#define Z_IS_1189_EQ_1189U(...)  \,
-#define Z_IS_1189U_EQ_1189U(...) \,
-#define Z_IS_1190_EQ_1190(...)   \,
-#define Z_IS_1190U_EQ_1190(...)  \,
-#define Z_IS_1190_EQ_1190U(...)  \,
-#define Z_IS_1190U_EQ_1190U(...) \,
-#define Z_IS_1191_EQ_1191(...)   \,
-#define Z_IS_1191U_EQ_1191(...)  \,
-#define Z_IS_1191_EQ_1191U(...)  \,
-#define Z_IS_1191U_EQ_1191U(...) \,
-#define Z_IS_1192_EQ_1192(...)   \,
-#define Z_IS_1192U_EQ_1192(...)  \,
-#define Z_IS_1192_EQ_1192U(...)  \,
-#define Z_IS_1192U_EQ_1192U(...) \,
-#define Z_IS_1193_EQ_1193(...)   \,
-#define Z_IS_1193U_EQ_1193(...)  \,
-#define Z_IS_1193_EQ_1193U(...)  \,
-#define Z_IS_1193U_EQ_1193U(...) \,
-#define Z_IS_1194_EQ_1194(...)   \,
-#define Z_IS_1194U_EQ_1194(...)  \,
-#define Z_IS_1194_EQ_1194U(...)  \,
-#define Z_IS_1194U_EQ_1194U(...) \,
-#define Z_IS_1195_EQ_1195(...)   \,
-#define Z_IS_1195U_EQ_1195(...)  \,
-#define Z_IS_1195_EQ_1195U(...)  \,
-#define Z_IS_1195U_EQ_1195U(...) \,
-#define Z_IS_1196_EQ_1196(...)   \,
-#define Z_IS_1196U_EQ_1196(...)  \,
-#define Z_IS_1196_EQ_1196U(...)  \,
-#define Z_IS_1196U_EQ_1196U(...) \,
-#define Z_IS_1197_EQ_1197(...)   \,
-#define Z_IS_1197U_EQ_1197(...)  \,
-#define Z_IS_1197_EQ_1197U(...)  \,
-#define Z_IS_1197U_EQ_1197U(...) \,
-#define Z_IS_1198_EQ_1198(...)   \,
-#define Z_IS_1198U_EQ_1198(...)  \,
-#define Z_IS_1198_EQ_1198U(...)  \,
-#define Z_IS_1198U_EQ_1198U(...) \,
-#define Z_IS_1199_EQ_1199(...)   \,
-#define Z_IS_1199U_EQ_1199(...)  \,
-#define Z_IS_1199_EQ_1199U(...)  \,
-#define Z_IS_1199U_EQ_1199U(...) \,
-#define Z_IS_1200_EQ_1200(...)   \,
-#define Z_IS_1200U_EQ_1200(...)  \,
-#define Z_IS_1200_EQ_1200U(...)  \,
-#define Z_IS_1200U_EQ_1200U(...) \,
-#define Z_IS_1201_EQ_1201(...)   \,
-#define Z_IS_1201U_EQ_1201(...)  \,
-#define Z_IS_1201_EQ_1201U(...)  \,
-#define Z_IS_1201U_EQ_1201U(...) \,
-#define Z_IS_1202_EQ_1202(...)   \,
-#define Z_IS_1202U_EQ_1202(...)  \,
-#define Z_IS_1202_EQ_1202U(...)  \,
-#define Z_IS_1202U_EQ_1202U(...) \,
-#define Z_IS_1203_EQ_1203(...)   \,
-#define Z_IS_1203U_EQ_1203(...)  \,
-#define Z_IS_1203_EQ_1203U(...)  \,
-#define Z_IS_1203U_EQ_1203U(...) \,
-#define Z_IS_1204_EQ_1204(...)   \,
-#define Z_IS_1204U_EQ_1204(...)  \,
-#define Z_IS_1204_EQ_1204U(...)  \,
-#define Z_IS_1204U_EQ_1204U(...) \,
-#define Z_IS_1205_EQ_1205(...)   \,
-#define Z_IS_1205U_EQ_1205(...)  \,
-#define Z_IS_1205_EQ_1205U(...)  \,
-#define Z_IS_1205U_EQ_1205U(...) \,
-#define Z_IS_1206_EQ_1206(...)   \,
-#define Z_IS_1206U_EQ_1206(...)  \,
-#define Z_IS_1206_EQ_1206U(...)  \,
-#define Z_IS_1206U_EQ_1206U(...) \,
-#define Z_IS_1207_EQ_1207(...)   \,
-#define Z_IS_1207U_EQ_1207(...)  \,
-#define Z_IS_1207_EQ_1207U(...)  \,
-#define Z_IS_1207U_EQ_1207U(...) \,
-#define Z_IS_1208_EQ_1208(...)   \,
-#define Z_IS_1208U_EQ_1208(...)  \,
-#define Z_IS_1208_EQ_1208U(...)  \,
-#define Z_IS_1208U_EQ_1208U(...) \,
-#define Z_IS_1209_EQ_1209(...)   \,
-#define Z_IS_1209U_EQ_1209(...)  \,
-#define Z_IS_1209_EQ_1209U(...)  \,
-#define Z_IS_1209U_EQ_1209U(...) \,
-#define Z_IS_1210_EQ_1210(...)   \,
-#define Z_IS_1210U_EQ_1210(...)  \,
-#define Z_IS_1210_EQ_1210U(...)  \,
-#define Z_IS_1210U_EQ_1210U(...) \,
-#define Z_IS_1211_EQ_1211(...)   \,
-#define Z_IS_1211U_EQ_1211(...)  \,
-#define Z_IS_1211_EQ_1211U(...)  \,
-#define Z_IS_1211U_EQ_1211U(...) \,
-#define Z_IS_1212_EQ_1212(...)   \,
-#define Z_IS_1212U_EQ_1212(...)  \,
-#define Z_IS_1212_EQ_1212U(...)  \,
-#define Z_IS_1212U_EQ_1212U(...) \,
-#define Z_IS_1213_EQ_1213(...)   \,
-#define Z_IS_1213U_EQ_1213(...)  \,
-#define Z_IS_1213_EQ_1213U(...)  \,
-#define Z_IS_1213U_EQ_1213U(...) \,
-#define Z_IS_1214_EQ_1214(...)   \,
-#define Z_IS_1214U_EQ_1214(...)  \,
-#define Z_IS_1214_EQ_1214U(...)  \,
-#define Z_IS_1214U_EQ_1214U(...) \,
-#define Z_IS_1215_EQ_1215(...)   \,
-#define Z_IS_1215U_EQ_1215(...)  \,
-#define Z_IS_1215_EQ_1215U(...)  \,
-#define Z_IS_1215U_EQ_1215U(...) \,
-#define Z_IS_1216_EQ_1216(...)   \,
-#define Z_IS_1216U_EQ_1216(...)  \,
-#define Z_IS_1216_EQ_1216U(...)  \,
-#define Z_IS_1216U_EQ_1216U(...) \,
-#define Z_IS_1217_EQ_1217(...)   \,
-#define Z_IS_1217U_EQ_1217(...)  \,
-#define Z_IS_1217_EQ_1217U(...)  \,
-#define Z_IS_1217U_EQ_1217U(...) \,
-#define Z_IS_1218_EQ_1218(...)   \,
-#define Z_IS_1218U_EQ_1218(...)  \,
-#define Z_IS_1218_EQ_1218U(...)  \,
-#define Z_IS_1218U_EQ_1218U(...) \,
-#define Z_IS_1219_EQ_1219(...)   \,
-#define Z_IS_1219U_EQ_1219(...)  \,
-#define Z_IS_1219_EQ_1219U(...)  \,
-#define Z_IS_1219U_EQ_1219U(...) \,
-#define Z_IS_1220_EQ_1220(...)   \,
-#define Z_IS_1220U_EQ_1220(...)  \,
-#define Z_IS_1220_EQ_1220U(...)  \,
-#define Z_IS_1220U_EQ_1220U(...) \,
-#define Z_IS_1221_EQ_1221(...)   \,
-#define Z_IS_1221U_EQ_1221(...)  \,
-#define Z_IS_1221_EQ_1221U(...)  \,
-#define Z_IS_1221U_EQ_1221U(...) \,
-#define Z_IS_1222_EQ_1222(...)   \,
-#define Z_IS_1222U_EQ_1222(...)  \,
-#define Z_IS_1222_EQ_1222U(...)  \,
-#define Z_IS_1222U_EQ_1222U(...) \,
-#define Z_IS_1223_EQ_1223(...)   \,
-#define Z_IS_1223U_EQ_1223(...)  \,
-#define Z_IS_1223_EQ_1223U(...)  \,
-#define Z_IS_1223U_EQ_1223U(...) \,
-#define Z_IS_1224_EQ_1224(...)   \,
-#define Z_IS_1224U_EQ_1224(...)  \,
-#define Z_IS_1224_EQ_1224U(...)  \,
-#define Z_IS_1224U_EQ_1224U(...) \,
-#define Z_IS_1225_EQ_1225(...)   \,
-#define Z_IS_1225U_EQ_1225(...)  \,
-#define Z_IS_1225_EQ_1225U(...)  \,
-#define Z_IS_1225U_EQ_1225U(...) \,
-#define Z_IS_1226_EQ_1226(...)   \,
-#define Z_IS_1226U_EQ_1226(...)  \,
-#define Z_IS_1226_EQ_1226U(...)  \,
-#define Z_IS_1226U_EQ_1226U(...) \,
-#define Z_IS_1227_EQ_1227(...)   \,
-#define Z_IS_1227U_EQ_1227(...)  \,
-#define Z_IS_1227_EQ_1227U(...)  \,
-#define Z_IS_1227U_EQ_1227U(...) \,
-#define Z_IS_1228_EQ_1228(...)   \,
-#define Z_IS_1228U_EQ_1228(...)  \,
-#define Z_IS_1228_EQ_1228U(...)  \,
-#define Z_IS_1228U_EQ_1228U(...) \,
-#define Z_IS_1229_EQ_1229(...)   \,
-#define Z_IS_1229U_EQ_1229(...)  \,
-#define Z_IS_1229_EQ_1229U(...)  \,
-#define Z_IS_1229U_EQ_1229U(...) \,
-#define Z_IS_1230_EQ_1230(...)   \,
-#define Z_IS_1230U_EQ_1230(...)  \,
-#define Z_IS_1230_EQ_1230U(...)  \,
-#define Z_IS_1230U_EQ_1230U(...) \,
-#define Z_IS_1231_EQ_1231(...)   \,
-#define Z_IS_1231U_EQ_1231(...)  \,
-#define Z_IS_1231_EQ_1231U(...)  \,
-#define Z_IS_1231U_EQ_1231U(...) \,
-#define Z_IS_1232_EQ_1232(...)   \,
-#define Z_IS_1232U_EQ_1232(...)  \,
-#define Z_IS_1232_EQ_1232U(...)  \,
-#define Z_IS_1232U_EQ_1232U(...) \,
-#define Z_IS_1233_EQ_1233(...)   \,
-#define Z_IS_1233U_EQ_1233(...)  \,
-#define Z_IS_1233_EQ_1233U(...)  \,
-#define Z_IS_1233U_EQ_1233U(...) \,
-#define Z_IS_1234_EQ_1234(...)   \,
-#define Z_IS_1234U_EQ_1234(...)  \,
-#define Z_IS_1234_EQ_1234U(...)  \,
-#define Z_IS_1234U_EQ_1234U(...) \,
-#define Z_IS_1235_EQ_1235(...)   \,
-#define Z_IS_1235U_EQ_1235(...)  \,
-#define Z_IS_1235_EQ_1235U(...)  \,
-#define Z_IS_1235U_EQ_1235U(...) \,
-#define Z_IS_1236_EQ_1236(...)   \,
-#define Z_IS_1236U_EQ_1236(...)  \,
-#define Z_IS_1236_EQ_1236U(...)  \,
-#define Z_IS_1236U_EQ_1236U(...) \,
-#define Z_IS_1237_EQ_1237(...)   \,
-#define Z_IS_1237U_EQ_1237(...)  \,
-#define Z_IS_1237_EQ_1237U(...)  \,
-#define Z_IS_1237U_EQ_1237U(...) \,
-#define Z_IS_1238_EQ_1238(...)   \,
-#define Z_IS_1238U_EQ_1238(...)  \,
-#define Z_IS_1238_EQ_1238U(...)  \,
-#define Z_IS_1238U_EQ_1238U(...) \,
-#define Z_IS_1239_EQ_1239(...)   \,
-#define Z_IS_1239U_EQ_1239(...)  \,
-#define Z_IS_1239_EQ_1239U(...)  \,
-#define Z_IS_1239U_EQ_1239U(...) \,
-#define Z_IS_1240_EQ_1240(...)   \,
-#define Z_IS_1240U_EQ_1240(...)  \,
-#define Z_IS_1240_EQ_1240U(...)  \,
-#define Z_IS_1240U_EQ_1240U(...) \,
-#define Z_IS_1241_EQ_1241(...)   \,
-#define Z_IS_1241U_EQ_1241(...)  \,
-#define Z_IS_1241_EQ_1241U(...)  \,
-#define Z_IS_1241U_EQ_1241U(...) \,
-#define Z_IS_1242_EQ_1242(...)   \,
-#define Z_IS_1242U_EQ_1242(...)  \,
-#define Z_IS_1242_EQ_1242U(...)  \,
-#define Z_IS_1242U_EQ_1242U(...) \,
-#define Z_IS_1243_EQ_1243(...)   \,
-#define Z_IS_1243U_EQ_1243(...)  \,
-#define Z_IS_1243_EQ_1243U(...)  \,
-#define Z_IS_1243U_EQ_1243U(...) \,
-#define Z_IS_1244_EQ_1244(...)   \,
-#define Z_IS_1244U_EQ_1244(...)  \,
-#define Z_IS_1244_EQ_1244U(...)  \,
-#define Z_IS_1244U_EQ_1244U(...) \,
-#define Z_IS_1245_EQ_1245(...)   \,
-#define Z_IS_1245U_EQ_1245(...)  \,
-#define Z_IS_1245_EQ_1245U(...)  \,
-#define Z_IS_1245U_EQ_1245U(...) \,
-#define Z_IS_1246_EQ_1246(...)   \,
-#define Z_IS_1246U_EQ_1246(...)  \,
-#define Z_IS_1246_EQ_1246U(...)  \,
-#define Z_IS_1246U_EQ_1246U(...) \,
-#define Z_IS_1247_EQ_1247(...)   \,
-#define Z_IS_1247U_EQ_1247(...)  \,
-#define Z_IS_1247_EQ_1247U(...)  \,
-#define Z_IS_1247U_EQ_1247U(...) \,
-#define Z_IS_1248_EQ_1248(...)   \,
-#define Z_IS_1248U_EQ_1248(...)  \,
-#define Z_IS_1248_EQ_1248U(...)  \,
-#define Z_IS_1248U_EQ_1248U(...) \,
-#define Z_IS_1249_EQ_1249(...)   \,
-#define Z_IS_1249U_EQ_1249(...)  \,
-#define Z_IS_1249_EQ_1249U(...)  \,
-#define Z_IS_1249U_EQ_1249U(...) \,
-#define Z_IS_1250_EQ_1250(...)   \,
-#define Z_IS_1250U_EQ_1250(...)  \,
-#define Z_IS_1250_EQ_1250U(...)  \,
-#define Z_IS_1250U_EQ_1250U(...) \,
-#define Z_IS_1251_EQ_1251(...)   \,
-#define Z_IS_1251U_EQ_1251(...)  \,
-#define Z_IS_1251_EQ_1251U(...)  \,
-#define Z_IS_1251U_EQ_1251U(...) \,
-#define Z_IS_1252_EQ_1252(...)   \,
-#define Z_IS_1252U_EQ_1252(...)  \,
-#define Z_IS_1252_EQ_1252U(...)  \,
-#define Z_IS_1252U_EQ_1252U(...) \,
-#define Z_IS_1253_EQ_1253(...)   \,
-#define Z_IS_1253U_EQ_1253(...)  \,
-#define Z_IS_1253_EQ_1253U(...)  \,
-#define Z_IS_1253U_EQ_1253U(...) \,
-#define Z_IS_1254_EQ_1254(...)   \,
-#define Z_IS_1254U_EQ_1254(...)  \,
-#define Z_IS_1254_EQ_1254U(...)  \,
-#define Z_IS_1254U_EQ_1254U(...) \,
-#define Z_IS_1255_EQ_1255(...)   \,
-#define Z_IS_1255U_EQ_1255(...)  \,
-#define Z_IS_1255_EQ_1255U(...)  \,
-#define Z_IS_1255U_EQ_1255U(...) \,
-#define Z_IS_1256_EQ_1256(...)   \,
-#define Z_IS_1256U_EQ_1256(...)  \,
-#define Z_IS_1256_EQ_1256U(...)  \,
-#define Z_IS_1256U_EQ_1256U(...) \,
-#define Z_IS_1257_EQ_1257(...)   \,
-#define Z_IS_1257U_EQ_1257(...)  \,
-#define Z_IS_1257_EQ_1257U(...)  \,
-#define Z_IS_1257U_EQ_1257U(...) \,
-#define Z_IS_1258_EQ_1258(...)   \,
-#define Z_IS_1258U_EQ_1258(...)  \,
-#define Z_IS_1258_EQ_1258U(...)  \,
-#define Z_IS_1258U_EQ_1258U(...) \,
-#define Z_IS_1259_EQ_1259(...)   \,
-#define Z_IS_1259U_EQ_1259(...)  \,
-#define Z_IS_1259_EQ_1259U(...)  \,
-#define Z_IS_1259U_EQ_1259U(...) \,
-#define Z_IS_1260_EQ_1260(...)   \,
-#define Z_IS_1260U_EQ_1260(...)  \,
-#define Z_IS_1260_EQ_1260U(...)  \,
-#define Z_IS_1260U_EQ_1260U(...) \,
-#define Z_IS_1261_EQ_1261(...)   \,
-#define Z_IS_1261U_EQ_1261(...)  \,
-#define Z_IS_1261_EQ_1261U(...)  \,
-#define Z_IS_1261U_EQ_1261U(...) \,
-#define Z_IS_1262_EQ_1262(...)   \,
-#define Z_IS_1262U_EQ_1262(...)  \,
-#define Z_IS_1262_EQ_1262U(...)  \,
-#define Z_IS_1262U_EQ_1262U(...) \,
-#define Z_IS_1263_EQ_1263(...)   \,
-#define Z_IS_1263U_EQ_1263(...)  \,
-#define Z_IS_1263_EQ_1263U(...)  \,
-#define Z_IS_1263U_EQ_1263U(...) \,
-#define Z_IS_1264_EQ_1264(...)   \,
-#define Z_IS_1264U_EQ_1264(...)  \,
-#define Z_IS_1264_EQ_1264U(...)  \,
-#define Z_IS_1264U_EQ_1264U(...) \,
-#define Z_IS_1265_EQ_1265(...)   \,
-#define Z_IS_1265U_EQ_1265(...)  \,
-#define Z_IS_1265_EQ_1265U(...)  \,
-#define Z_IS_1265U_EQ_1265U(...) \,
-#define Z_IS_1266_EQ_1266(...)   \,
-#define Z_IS_1266U_EQ_1266(...)  \,
-#define Z_IS_1266_EQ_1266U(...)  \,
-#define Z_IS_1266U_EQ_1266U(...) \,
-#define Z_IS_1267_EQ_1267(...)   \,
-#define Z_IS_1267U_EQ_1267(...)  \,
-#define Z_IS_1267_EQ_1267U(...)  \,
-#define Z_IS_1267U_EQ_1267U(...) \,
-#define Z_IS_1268_EQ_1268(...)   \,
-#define Z_IS_1268U_EQ_1268(...)  \,
-#define Z_IS_1268_EQ_1268U(...)  \,
-#define Z_IS_1268U_EQ_1268U(...) \,
-#define Z_IS_1269_EQ_1269(...)   \,
-#define Z_IS_1269U_EQ_1269(...)  \,
-#define Z_IS_1269_EQ_1269U(...)  \,
-#define Z_IS_1269U_EQ_1269U(...) \,
-#define Z_IS_1270_EQ_1270(...)   \,
-#define Z_IS_1270U_EQ_1270(...)  \,
-#define Z_IS_1270_EQ_1270U(...)  \,
-#define Z_IS_1270U_EQ_1270U(...) \,
-#define Z_IS_1271_EQ_1271(...)   \,
-#define Z_IS_1271U_EQ_1271(...)  \,
-#define Z_IS_1271_EQ_1271U(...)  \,
-#define Z_IS_1271U_EQ_1271U(...) \,
-#define Z_IS_1272_EQ_1272(...)   \,
-#define Z_IS_1272U_EQ_1272(...)  \,
-#define Z_IS_1272_EQ_1272U(...)  \,
-#define Z_IS_1272U_EQ_1272U(...) \,
-#define Z_IS_1273_EQ_1273(...)   \,
-#define Z_IS_1273U_EQ_1273(...)  \,
-#define Z_IS_1273_EQ_1273U(...)  \,
-#define Z_IS_1273U_EQ_1273U(...) \,
-#define Z_IS_1274_EQ_1274(...)   \,
-#define Z_IS_1274U_EQ_1274(...)  \,
-#define Z_IS_1274_EQ_1274U(...)  \,
-#define Z_IS_1274U_EQ_1274U(...) \,
-#define Z_IS_1275_EQ_1275(...)   \,
-#define Z_IS_1275U_EQ_1275(...)  \,
-#define Z_IS_1275_EQ_1275U(...)  \,
-#define Z_IS_1275U_EQ_1275U(...) \,
-#define Z_IS_1276_EQ_1276(...)   \,
-#define Z_IS_1276U_EQ_1276(...)  \,
-#define Z_IS_1276_EQ_1276U(...)  \,
-#define Z_IS_1276U_EQ_1276U(...) \,
-#define Z_IS_1277_EQ_1277(...)   \,
-#define Z_IS_1277U_EQ_1277(...)  \,
-#define Z_IS_1277_EQ_1277U(...)  \,
-#define Z_IS_1277U_EQ_1277U(...) \,
-#define Z_IS_1278_EQ_1278(...)   \,
-#define Z_IS_1278U_EQ_1278(...)  \,
-#define Z_IS_1278_EQ_1278U(...)  \,
-#define Z_IS_1278U_EQ_1278U(...) \,
-#define Z_IS_1279_EQ_1279(...)   \,
-#define Z_IS_1279U_EQ_1279(...)  \,
-#define Z_IS_1279_EQ_1279U(...)  \,
-#define Z_IS_1279U_EQ_1279U(...) \,
-#define Z_IS_1280_EQ_1280(...)   \,
-#define Z_IS_1280U_EQ_1280(...)  \,
-#define Z_IS_1280_EQ_1280U(...)  \,
-#define Z_IS_1280U_EQ_1280U(...) \,
-#define Z_IS_1281_EQ_1281(...)   \,
-#define Z_IS_1281U_EQ_1281(...)  \,
-#define Z_IS_1281_EQ_1281U(...)  \,
-#define Z_IS_1281U_EQ_1281U(...) \,
-#define Z_IS_1282_EQ_1282(...)   \,
-#define Z_IS_1282U_EQ_1282(...)  \,
-#define Z_IS_1282_EQ_1282U(...)  \,
-#define Z_IS_1282U_EQ_1282U(...) \,
-#define Z_IS_1283_EQ_1283(...)   \,
-#define Z_IS_1283U_EQ_1283(...)  \,
-#define Z_IS_1283_EQ_1283U(...)  \,
-#define Z_IS_1283U_EQ_1283U(...) \,
-#define Z_IS_1284_EQ_1284(...)   \,
-#define Z_IS_1284U_EQ_1284(...)  \,
-#define Z_IS_1284_EQ_1284U(...)  \,
-#define Z_IS_1284U_EQ_1284U(...) \,
-#define Z_IS_1285_EQ_1285(...)   \,
-#define Z_IS_1285U_EQ_1285(...)  \,
-#define Z_IS_1285_EQ_1285U(...)  \,
-#define Z_IS_1285U_EQ_1285U(...) \,
-#define Z_IS_1286_EQ_1286(...)   \,
-#define Z_IS_1286U_EQ_1286(...)  \,
-#define Z_IS_1286_EQ_1286U(...)  \,
-#define Z_IS_1286U_EQ_1286U(...) \,
-#define Z_IS_1287_EQ_1287(...)   \,
-#define Z_IS_1287U_EQ_1287(...)  \,
-#define Z_IS_1287_EQ_1287U(...)  \,
-#define Z_IS_1287U_EQ_1287U(...) \,
-#define Z_IS_1288_EQ_1288(...)   \,
-#define Z_IS_1288U_EQ_1288(...)  \,
-#define Z_IS_1288_EQ_1288U(...)  \,
-#define Z_IS_1288U_EQ_1288U(...) \,
-#define Z_IS_1289_EQ_1289(...)   \,
-#define Z_IS_1289U_EQ_1289(...)  \,
-#define Z_IS_1289_EQ_1289U(...)  \,
-#define Z_IS_1289U_EQ_1289U(...) \,
-#define Z_IS_1290_EQ_1290(...)   \,
-#define Z_IS_1290U_EQ_1290(...)  \,
-#define Z_IS_1290_EQ_1290U(...)  \,
-#define Z_IS_1290U_EQ_1290U(...) \,
-#define Z_IS_1291_EQ_1291(...)   \,
-#define Z_IS_1291U_EQ_1291(...)  \,
-#define Z_IS_1291_EQ_1291U(...)  \,
-#define Z_IS_1291U_EQ_1291U(...) \,
-#define Z_IS_1292_EQ_1292(...)   \,
-#define Z_IS_1292U_EQ_1292(...)  \,
-#define Z_IS_1292_EQ_1292U(...)  \,
-#define Z_IS_1292U_EQ_1292U(...) \,
-#define Z_IS_1293_EQ_1293(...)   \,
-#define Z_IS_1293U_EQ_1293(...)  \,
-#define Z_IS_1293_EQ_1293U(...)  \,
-#define Z_IS_1293U_EQ_1293U(...) \,
-#define Z_IS_1294_EQ_1294(...)   \,
-#define Z_IS_1294U_EQ_1294(...)  \,
-#define Z_IS_1294_EQ_1294U(...)  \,
-#define Z_IS_1294U_EQ_1294U(...) \,
-#define Z_IS_1295_EQ_1295(...)   \,
-#define Z_IS_1295U_EQ_1295(...)  \,
-#define Z_IS_1295_EQ_1295U(...)  \,
-#define Z_IS_1295U_EQ_1295U(...) \,
-#define Z_IS_1296_EQ_1296(...)   \,
-#define Z_IS_1296U_EQ_1296(...)  \,
-#define Z_IS_1296_EQ_1296U(...)  \,
-#define Z_IS_1296U_EQ_1296U(...) \,
-#define Z_IS_1297_EQ_1297(...)   \,
-#define Z_IS_1297U_EQ_1297(...)  \,
-#define Z_IS_1297_EQ_1297U(...)  \,
-#define Z_IS_1297U_EQ_1297U(...) \,
-#define Z_IS_1298_EQ_1298(...)   \,
-#define Z_IS_1298U_EQ_1298(...)  \,
-#define Z_IS_1298_EQ_1298U(...)  \,
-#define Z_IS_1298U_EQ_1298U(...) \,
-#define Z_IS_1299_EQ_1299(...)   \,
-#define Z_IS_1299U_EQ_1299(...)  \,
-#define Z_IS_1299_EQ_1299U(...)  \,
-#define Z_IS_1299U_EQ_1299U(...) \,
-#define Z_IS_1300_EQ_1300(...)   \,
-#define Z_IS_1300U_EQ_1300(...)  \,
-#define Z_IS_1300_EQ_1300U(...)  \,
-#define Z_IS_1300U_EQ_1300U(...) \,
-#define Z_IS_1301_EQ_1301(...)   \,
-#define Z_IS_1301U_EQ_1301(...)  \,
-#define Z_IS_1301_EQ_1301U(...)  \,
-#define Z_IS_1301U_EQ_1301U(...) \,
-#define Z_IS_1302_EQ_1302(...)   \,
-#define Z_IS_1302U_EQ_1302(...)  \,
-#define Z_IS_1302_EQ_1302U(...)  \,
-#define Z_IS_1302U_EQ_1302U(...) \,
-#define Z_IS_1303_EQ_1303(...)   \,
-#define Z_IS_1303U_EQ_1303(...)  \,
-#define Z_IS_1303_EQ_1303U(...)  \,
-#define Z_IS_1303U_EQ_1303U(...) \,
-#define Z_IS_1304_EQ_1304(...)   \,
-#define Z_IS_1304U_EQ_1304(...)  \,
-#define Z_IS_1304_EQ_1304U(...)  \,
-#define Z_IS_1304U_EQ_1304U(...) \,
-#define Z_IS_1305_EQ_1305(...)   \,
-#define Z_IS_1305U_EQ_1305(...)  \,
-#define Z_IS_1305_EQ_1305U(...)  \,
-#define Z_IS_1305U_EQ_1305U(...) \,
-#define Z_IS_1306_EQ_1306(...)   \,
-#define Z_IS_1306U_EQ_1306(...)  \,
-#define Z_IS_1306_EQ_1306U(...)  \,
-#define Z_IS_1306U_EQ_1306U(...) \,
-#define Z_IS_1307_EQ_1307(...)   \,
-#define Z_IS_1307U_EQ_1307(...)  \,
-#define Z_IS_1307_EQ_1307U(...)  \,
-#define Z_IS_1307U_EQ_1307U(...) \,
-#define Z_IS_1308_EQ_1308(...)   \,
-#define Z_IS_1308U_EQ_1308(...)  \,
-#define Z_IS_1308_EQ_1308U(...)  \,
-#define Z_IS_1308U_EQ_1308U(...) \,
-#define Z_IS_1309_EQ_1309(...)   \,
-#define Z_IS_1309U_EQ_1309(...)  \,
-#define Z_IS_1309_EQ_1309U(...)  \,
-#define Z_IS_1309U_EQ_1309U(...) \,
-#define Z_IS_1310_EQ_1310(...)   \,
-#define Z_IS_1310U_EQ_1310(...)  \,
-#define Z_IS_1310_EQ_1310U(...)  \,
-#define Z_IS_1310U_EQ_1310U(...) \,
-#define Z_IS_1311_EQ_1311(...)   \,
-#define Z_IS_1311U_EQ_1311(...)  \,
-#define Z_IS_1311_EQ_1311U(...)  \,
-#define Z_IS_1311U_EQ_1311U(...) \,
-#define Z_IS_1312_EQ_1312(...)   \,
-#define Z_IS_1312U_EQ_1312(...)  \,
-#define Z_IS_1312_EQ_1312U(...)  \,
-#define Z_IS_1312U_EQ_1312U(...) \,
-#define Z_IS_1313_EQ_1313(...)   \,
-#define Z_IS_1313U_EQ_1313(...)  \,
-#define Z_IS_1313_EQ_1313U(...)  \,
-#define Z_IS_1313U_EQ_1313U(...) \,
-#define Z_IS_1314_EQ_1314(...)   \,
-#define Z_IS_1314U_EQ_1314(...)  \,
-#define Z_IS_1314_EQ_1314U(...)  \,
-#define Z_IS_1314U_EQ_1314U(...) \,
-#define Z_IS_1315_EQ_1315(...)   \,
-#define Z_IS_1315U_EQ_1315(...)  \,
-#define Z_IS_1315_EQ_1315U(...)  \,
-#define Z_IS_1315U_EQ_1315U(...) \,
-#define Z_IS_1316_EQ_1316(...)   \,
-#define Z_IS_1316U_EQ_1316(...)  \,
-#define Z_IS_1316_EQ_1316U(...)  \,
-#define Z_IS_1316U_EQ_1316U(...) \,
-#define Z_IS_1317_EQ_1317(...)   \,
-#define Z_IS_1317U_EQ_1317(...)  \,
-#define Z_IS_1317_EQ_1317U(...)  \,
-#define Z_IS_1317U_EQ_1317U(...) \,
-#define Z_IS_1318_EQ_1318(...)   \,
-#define Z_IS_1318U_EQ_1318(...)  \,
-#define Z_IS_1318_EQ_1318U(...)  \,
-#define Z_IS_1318U_EQ_1318U(...) \,
-#define Z_IS_1319_EQ_1319(...)   \,
-#define Z_IS_1319U_EQ_1319(...)  \,
-#define Z_IS_1319_EQ_1319U(...)  \,
-#define Z_IS_1319U_EQ_1319U(...) \,
-#define Z_IS_1320_EQ_1320(...)   \,
-#define Z_IS_1320U_EQ_1320(...)  \,
-#define Z_IS_1320_EQ_1320U(...)  \,
-#define Z_IS_1320U_EQ_1320U(...) \,
-#define Z_IS_1321_EQ_1321(...)   \,
-#define Z_IS_1321U_EQ_1321(...)  \,
-#define Z_IS_1321_EQ_1321U(...)  \,
-#define Z_IS_1321U_EQ_1321U(...) \,
-#define Z_IS_1322_EQ_1322(...)   \,
-#define Z_IS_1322U_EQ_1322(...)  \,
-#define Z_IS_1322_EQ_1322U(...)  \,
-#define Z_IS_1322U_EQ_1322U(...) \,
-#define Z_IS_1323_EQ_1323(...)   \,
-#define Z_IS_1323U_EQ_1323(...)  \,
-#define Z_IS_1323_EQ_1323U(...)  \,
-#define Z_IS_1323U_EQ_1323U(...) \,
-#define Z_IS_1324_EQ_1324(...)   \,
-#define Z_IS_1324U_EQ_1324(...)  \,
-#define Z_IS_1324_EQ_1324U(...)  \,
-#define Z_IS_1324U_EQ_1324U(...) \,
-#define Z_IS_1325_EQ_1325(...)   \,
-#define Z_IS_1325U_EQ_1325(...)  \,
-#define Z_IS_1325_EQ_1325U(...)  \,
-#define Z_IS_1325U_EQ_1325U(...) \,
-#define Z_IS_1326_EQ_1326(...)   \,
-#define Z_IS_1326U_EQ_1326(...)  \,
-#define Z_IS_1326_EQ_1326U(...)  \,
-#define Z_IS_1326U_EQ_1326U(...) \,
-#define Z_IS_1327_EQ_1327(...)   \,
-#define Z_IS_1327U_EQ_1327(...)  \,
-#define Z_IS_1327_EQ_1327U(...)  \,
-#define Z_IS_1327U_EQ_1327U(...) \,
-#define Z_IS_1328_EQ_1328(...)   \,
-#define Z_IS_1328U_EQ_1328(...)  \,
-#define Z_IS_1328_EQ_1328U(...)  \,
-#define Z_IS_1328U_EQ_1328U(...) \,
-#define Z_IS_1329_EQ_1329(...)   \,
-#define Z_IS_1329U_EQ_1329(...)  \,
-#define Z_IS_1329_EQ_1329U(...)  \,
-#define Z_IS_1329U_EQ_1329U(...) \,
-#define Z_IS_1330_EQ_1330(...)   \,
-#define Z_IS_1330U_EQ_1330(...)  \,
-#define Z_IS_1330_EQ_1330U(...)  \,
-#define Z_IS_1330U_EQ_1330U(...) \,
-#define Z_IS_1331_EQ_1331(...)   \,
-#define Z_IS_1331U_EQ_1331(...)  \,
-#define Z_IS_1331_EQ_1331U(...)  \,
-#define Z_IS_1331U_EQ_1331U(...) \,
-#define Z_IS_1332_EQ_1332(...)   \,
-#define Z_IS_1332U_EQ_1332(...)  \,
-#define Z_IS_1332_EQ_1332U(...)  \,
-#define Z_IS_1332U_EQ_1332U(...) \,
-#define Z_IS_1333_EQ_1333(...)   \,
-#define Z_IS_1333U_EQ_1333(...)  \,
-#define Z_IS_1333_EQ_1333U(...)  \,
-#define Z_IS_1333U_EQ_1333U(...) \,
-#define Z_IS_1334_EQ_1334(...)   \,
-#define Z_IS_1334U_EQ_1334(...)  \,
-#define Z_IS_1334_EQ_1334U(...)  \,
-#define Z_IS_1334U_EQ_1334U(...) \,
-#define Z_IS_1335_EQ_1335(...)   \,
-#define Z_IS_1335U_EQ_1335(...)  \,
-#define Z_IS_1335_EQ_1335U(...)  \,
-#define Z_IS_1335U_EQ_1335U(...) \,
-#define Z_IS_1336_EQ_1336(...)   \,
-#define Z_IS_1336U_EQ_1336(...)  \,
-#define Z_IS_1336_EQ_1336U(...)  \,
-#define Z_IS_1336U_EQ_1336U(...) \,
-#define Z_IS_1337_EQ_1337(...)   \,
-#define Z_IS_1337U_EQ_1337(...)  \,
-#define Z_IS_1337_EQ_1337U(...)  \,
-#define Z_IS_1337U_EQ_1337U(...) \,
-#define Z_IS_1338_EQ_1338(...)   \,
-#define Z_IS_1338U_EQ_1338(...)  \,
-#define Z_IS_1338_EQ_1338U(...)  \,
-#define Z_IS_1338U_EQ_1338U(...) \,
-#define Z_IS_1339_EQ_1339(...)   \,
-#define Z_IS_1339U_EQ_1339(...)  \,
-#define Z_IS_1339_EQ_1339U(...)  \,
-#define Z_IS_1339U_EQ_1339U(...) \,
-#define Z_IS_1340_EQ_1340(...)   \,
-#define Z_IS_1340U_EQ_1340(...)  \,
-#define Z_IS_1340_EQ_1340U(...)  \,
-#define Z_IS_1340U_EQ_1340U(...) \,
-#define Z_IS_1341_EQ_1341(...)   \,
-#define Z_IS_1341U_EQ_1341(...)  \,
-#define Z_IS_1341_EQ_1341U(...)  \,
-#define Z_IS_1341U_EQ_1341U(...) \,
-#define Z_IS_1342_EQ_1342(...)   \,
-#define Z_IS_1342U_EQ_1342(...)  \,
-#define Z_IS_1342_EQ_1342U(...)  \,
-#define Z_IS_1342U_EQ_1342U(...) \,
-#define Z_IS_1343_EQ_1343(...)   \,
-#define Z_IS_1343U_EQ_1343(...)  \,
-#define Z_IS_1343_EQ_1343U(...)  \,
-#define Z_IS_1343U_EQ_1343U(...) \,
-#define Z_IS_1344_EQ_1344(...)   \,
-#define Z_IS_1344U_EQ_1344(...)  \,
-#define Z_IS_1344_EQ_1344U(...)  \,
-#define Z_IS_1344U_EQ_1344U(...) \,
-#define Z_IS_1345_EQ_1345(...)   \,
-#define Z_IS_1345U_EQ_1345(...)  \,
-#define Z_IS_1345_EQ_1345U(...)  \,
-#define Z_IS_1345U_EQ_1345U(...) \,
-#define Z_IS_1346_EQ_1346(...)   \,
-#define Z_IS_1346U_EQ_1346(...)  \,
-#define Z_IS_1346_EQ_1346U(...)  \,
-#define Z_IS_1346U_EQ_1346U(...) \,
-#define Z_IS_1347_EQ_1347(...)   \,
-#define Z_IS_1347U_EQ_1347(...)  \,
-#define Z_IS_1347_EQ_1347U(...)  \,
-#define Z_IS_1347U_EQ_1347U(...) \,
-#define Z_IS_1348_EQ_1348(...)   \,
-#define Z_IS_1348U_EQ_1348(...)  \,
-#define Z_IS_1348_EQ_1348U(...)  \,
-#define Z_IS_1348U_EQ_1348U(...) \,
-#define Z_IS_1349_EQ_1349(...)   \,
-#define Z_IS_1349U_EQ_1349(...)  \,
-#define Z_IS_1349_EQ_1349U(...)  \,
-#define Z_IS_1349U_EQ_1349U(...) \,
-#define Z_IS_1350_EQ_1350(...)   \,
-#define Z_IS_1350U_EQ_1350(...)  \,
-#define Z_IS_1350_EQ_1350U(...)  \,
-#define Z_IS_1350U_EQ_1350U(...) \,
-#define Z_IS_1351_EQ_1351(...)   \,
-#define Z_IS_1351U_EQ_1351(...)  \,
-#define Z_IS_1351_EQ_1351U(...)  \,
-#define Z_IS_1351U_EQ_1351U(...) \,
-#define Z_IS_1352_EQ_1352(...)   \,
-#define Z_IS_1352U_EQ_1352(...)  \,
-#define Z_IS_1352_EQ_1352U(...)  \,
-#define Z_IS_1352U_EQ_1352U(...) \,
-#define Z_IS_1353_EQ_1353(...)   \,
-#define Z_IS_1353U_EQ_1353(...)  \,
-#define Z_IS_1353_EQ_1353U(...)  \,
-#define Z_IS_1353U_EQ_1353U(...) \,
-#define Z_IS_1354_EQ_1354(...)   \,
-#define Z_IS_1354U_EQ_1354(...)  \,
-#define Z_IS_1354_EQ_1354U(...)  \,
-#define Z_IS_1354U_EQ_1354U(...) \,
-#define Z_IS_1355_EQ_1355(...)   \,
-#define Z_IS_1355U_EQ_1355(...)  \,
-#define Z_IS_1355_EQ_1355U(...)  \,
-#define Z_IS_1355U_EQ_1355U(...) \,
-#define Z_IS_1356_EQ_1356(...)   \,
-#define Z_IS_1356U_EQ_1356(...)  \,
-#define Z_IS_1356_EQ_1356U(...)  \,
-#define Z_IS_1356U_EQ_1356U(...) \,
-#define Z_IS_1357_EQ_1357(...)   \,
-#define Z_IS_1357U_EQ_1357(...)  \,
-#define Z_IS_1357_EQ_1357U(...)  \,
-#define Z_IS_1357U_EQ_1357U(...) \,
-#define Z_IS_1358_EQ_1358(...)   \,
-#define Z_IS_1358U_EQ_1358(...)  \,
-#define Z_IS_1358_EQ_1358U(...)  \,
-#define Z_IS_1358U_EQ_1358U(...) \,
-#define Z_IS_1359_EQ_1359(...)   \,
-#define Z_IS_1359U_EQ_1359(...)  \,
-#define Z_IS_1359_EQ_1359U(...)  \,
-#define Z_IS_1359U_EQ_1359U(...) \,
-#define Z_IS_1360_EQ_1360(...)   \,
-#define Z_IS_1360U_EQ_1360(...)  \,
-#define Z_IS_1360_EQ_1360U(...)  \,
-#define Z_IS_1360U_EQ_1360U(...) \,
-#define Z_IS_1361_EQ_1361(...)   \,
-#define Z_IS_1361U_EQ_1361(...)  \,
-#define Z_IS_1361_EQ_1361U(...)  \,
-#define Z_IS_1361U_EQ_1361U(...) \,
-#define Z_IS_1362_EQ_1362(...)   \,
-#define Z_IS_1362U_EQ_1362(...)  \,
-#define Z_IS_1362_EQ_1362U(...)  \,
-#define Z_IS_1362U_EQ_1362U(...) \,
-#define Z_IS_1363_EQ_1363(...)   \,
-#define Z_IS_1363U_EQ_1363(...)  \,
-#define Z_IS_1363_EQ_1363U(...)  \,
-#define Z_IS_1363U_EQ_1363U(...) \,
-#define Z_IS_1364_EQ_1364(...)   \,
-#define Z_IS_1364U_EQ_1364(...)  \,
-#define Z_IS_1364_EQ_1364U(...)  \,
-#define Z_IS_1364U_EQ_1364U(...) \,
-#define Z_IS_1365_EQ_1365(...)   \,
-#define Z_IS_1365U_EQ_1365(...)  \,
-#define Z_IS_1365_EQ_1365U(...)  \,
-#define Z_IS_1365U_EQ_1365U(...) \,
-#define Z_IS_1366_EQ_1366(...)   \,
-#define Z_IS_1366U_EQ_1366(...)  \,
-#define Z_IS_1366_EQ_1366U(...)  \,
-#define Z_IS_1366U_EQ_1366U(...) \,
-#define Z_IS_1367_EQ_1367(...)   \,
-#define Z_IS_1367U_EQ_1367(...)  \,
-#define Z_IS_1367_EQ_1367U(...)  \,
-#define Z_IS_1367U_EQ_1367U(...) \,
-#define Z_IS_1368_EQ_1368(...)   \,
-#define Z_IS_1368U_EQ_1368(...)  \,
-#define Z_IS_1368_EQ_1368U(...)  \,
-#define Z_IS_1368U_EQ_1368U(...) \,
-#define Z_IS_1369_EQ_1369(...)   \,
-#define Z_IS_1369U_EQ_1369(...)  \,
-#define Z_IS_1369_EQ_1369U(...)  \,
-#define Z_IS_1369U_EQ_1369U(...) \,
-#define Z_IS_1370_EQ_1370(...)   \,
-#define Z_IS_1370U_EQ_1370(...)  \,
-#define Z_IS_1370_EQ_1370U(...)  \,
-#define Z_IS_1370U_EQ_1370U(...) \,
-#define Z_IS_1371_EQ_1371(...)   \,
-#define Z_IS_1371U_EQ_1371(...)  \,
-#define Z_IS_1371_EQ_1371U(...)  \,
-#define Z_IS_1371U_EQ_1371U(...) \,
-#define Z_IS_1372_EQ_1372(...)   \,
-#define Z_IS_1372U_EQ_1372(...)  \,
-#define Z_IS_1372_EQ_1372U(...)  \,
-#define Z_IS_1372U_EQ_1372U(...) \,
-#define Z_IS_1373_EQ_1373(...)   \,
-#define Z_IS_1373U_EQ_1373(...)  \,
-#define Z_IS_1373_EQ_1373U(...)  \,
-#define Z_IS_1373U_EQ_1373U(...) \,
-#define Z_IS_1374_EQ_1374(...)   \,
-#define Z_IS_1374U_EQ_1374(...)  \,
-#define Z_IS_1374_EQ_1374U(...)  \,
-#define Z_IS_1374U_EQ_1374U(...) \,
-#define Z_IS_1375_EQ_1375(...)   \,
-#define Z_IS_1375U_EQ_1375(...)  \,
-#define Z_IS_1375_EQ_1375U(...)  \,
-#define Z_IS_1375U_EQ_1375U(...) \,
-#define Z_IS_1376_EQ_1376(...)   \,
-#define Z_IS_1376U_EQ_1376(...)  \,
-#define Z_IS_1376_EQ_1376U(...)  \,
-#define Z_IS_1376U_EQ_1376U(...) \,
-#define Z_IS_1377_EQ_1377(...)   \,
-#define Z_IS_1377U_EQ_1377(...)  \,
-#define Z_IS_1377_EQ_1377U(...)  \,
-#define Z_IS_1377U_EQ_1377U(...) \,
-#define Z_IS_1378_EQ_1378(...)   \,
-#define Z_IS_1378U_EQ_1378(...)  \,
-#define Z_IS_1378_EQ_1378U(...)  \,
-#define Z_IS_1378U_EQ_1378U(...) \,
-#define Z_IS_1379_EQ_1379(...)   \,
-#define Z_IS_1379U_EQ_1379(...)  \,
-#define Z_IS_1379_EQ_1379U(...)  \,
-#define Z_IS_1379U_EQ_1379U(...) \,
-#define Z_IS_1380_EQ_1380(...)   \,
-#define Z_IS_1380U_EQ_1380(...)  \,
-#define Z_IS_1380_EQ_1380U(...)  \,
-#define Z_IS_1380U_EQ_1380U(...) \,
-#define Z_IS_1381_EQ_1381(...)   \,
-#define Z_IS_1381U_EQ_1381(...)  \,
-#define Z_IS_1381_EQ_1381U(...)  \,
-#define Z_IS_1381U_EQ_1381U(...) \,
-#define Z_IS_1382_EQ_1382(...)   \,
-#define Z_IS_1382U_EQ_1382(...)  \,
-#define Z_IS_1382_EQ_1382U(...)  \,
-#define Z_IS_1382U_EQ_1382U(...) \,
-#define Z_IS_1383_EQ_1383(...)   \,
-#define Z_IS_1383U_EQ_1383(...)  \,
-#define Z_IS_1383_EQ_1383U(...)  \,
-#define Z_IS_1383U_EQ_1383U(...) \,
-#define Z_IS_1384_EQ_1384(...)   \,
-#define Z_IS_1384U_EQ_1384(...)  \,
-#define Z_IS_1384_EQ_1384U(...)  \,
-#define Z_IS_1384U_EQ_1384U(...) \,
-#define Z_IS_1385_EQ_1385(...)   \,
-#define Z_IS_1385U_EQ_1385(...)  \,
-#define Z_IS_1385_EQ_1385U(...)  \,
-#define Z_IS_1385U_EQ_1385U(...) \,
-#define Z_IS_1386_EQ_1386(...)   \,
-#define Z_IS_1386U_EQ_1386(...)  \,
-#define Z_IS_1386_EQ_1386U(...)  \,
-#define Z_IS_1386U_EQ_1386U(...) \,
-#define Z_IS_1387_EQ_1387(...)   \,
-#define Z_IS_1387U_EQ_1387(...)  \,
-#define Z_IS_1387_EQ_1387U(...)  \,
-#define Z_IS_1387U_EQ_1387U(...) \,
-#define Z_IS_1388_EQ_1388(...)   \,
-#define Z_IS_1388U_EQ_1388(...)  \,
-#define Z_IS_1388_EQ_1388U(...)  \,
-#define Z_IS_1388U_EQ_1388U(...) \,
-#define Z_IS_1389_EQ_1389(...)   \,
-#define Z_IS_1389U_EQ_1389(...)  \,
-#define Z_IS_1389_EQ_1389U(...)  \,
-#define Z_IS_1389U_EQ_1389U(...) \,
-#define Z_IS_1390_EQ_1390(...)   \,
-#define Z_IS_1390U_EQ_1390(...)  \,
-#define Z_IS_1390_EQ_1390U(...)  \,
-#define Z_IS_1390U_EQ_1390U(...) \,
-#define Z_IS_1391_EQ_1391(...)   \,
-#define Z_IS_1391U_EQ_1391(...)  \,
-#define Z_IS_1391_EQ_1391U(...)  \,
-#define Z_IS_1391U_EQ_1391U(...) \,
-#define Z_IS_1392_EQ_1392(...)   \,
-#define Z_IS_1392U_EQ_1392(...)  \,
-#define Z_IS_1392_EQ_1392U(...)  \,
-#define Z_IS_1392U_EQ_1392U(...) \,
-#define Z_IS_1393_EQ_1393(...)   \,
-#define Z_IS_1393U_EQ_1393(...)  \,
-#define Z_IS_1393_EQ_1393U(...)  \,
-#define Z_IS_1393U_EQ_1393U(...) \,
-#define Z_IS_1394_EQ_1394(...)   \,
-#define Z_IS_1394U_EQ_1394(...)  \,
-#define Z_IS_1394_EQ_1394U(...)  \,
-#define Z_IS_1394U_EQ_1394U(...) \,
-#define Z_IS_1395_EQ_1395(...)   \,
-#define Z_IS_1395U_EQ_1395(...)  \,
-#define Z_IS_1395_EQ_1395U(...)  \,
-#define Z_IS_1395U_EQ_1395U(...) \,
-#define Z_IS_1396_EQ_1396(...)   \,
-#define Z_IS_1396U_EQ_1396(...)  \,
-#define Z_IS_1396_EQ_1396U(...)  \,
-#define Z_IS_1396U_EQ_1396U(...) \,
-#define Z_IS_1397_EQ_1397(...)   \,
-#define Z_IS_1397U_EQ_1397(...)  \,
-#define Z_IS_1397_EQ_1397U(...)  \,
-#define Z_IS_1397U_EQ_1397U(...) \,
-#define Z_IS_1398_EQ_1398(...)   \,
-#define Z_IS_1398U_EQ_1398(...)  \,
-#define Z_IS_1398_EQ_1398U(...)  \,
-#define Z_IS_1398U_EQ_1398U(...) \,
-#define Z_IS_1399_EQ_1399(...)   \,
-#define Z_IS_1399U_EQ_1399(...)  \,
-#define Z_IS_1399_EQ_1399U(...)  \,
-#define Z_IS_1399U_EQ_1399U(...) \,
-#define Z_IS_1400_EQ_1400(...)   \,
-#define Z_IS_1400U_EQ_1400(...)  \,
-#define Z_IS_1400_EQ_1400U(...)  \,
-#define Z_IS_1400U_EQ_1400U(...) \,
-#define Z_IS_1401_EQ_1401(...)   \,
-#define Z_IS_1401U_EQ_1401(...)  \,
-#define Z_IS_1401_EQ_1401U(...)  \,
-#define Z_IS_1401U_EQ_1401U(...) \,
-#define Z_IS_1402_EQ_1402(...)   \,
-#define Z_IS_1402U_EQ_1402(...)  \,
-#define Z_IS_1402_EQ_1402U(...)  \,
-#define Z_IS_1402U_EQ_1402U(...) \,
-#define Z_IS_1403_EQ_1403(...)   \,
-#define Z_IS_1403U_EQ_1403(...)  \,
-#define Z_IS_1403_EQ_1403U(...)  \,
-#define Z_IS_1403U_EQ_1403U(...) \,
-#define Z_IS_1404_EQ_1404(...)   \,
-#define Z_IS_1404U_EQ_1404(...)  \,
-#define Z_IS_1404_EQ_1404U(...)  \,
-#define Z_IS_1404U_EQ_1404U(...) \,
-#define Z_IS_1405_EQ_1405(...)   \,
-#define Z_IS_1405U_EQ_1405(...)  \,
-#define Z_IS_1405_EQ_1405U(...)  \,
-#define Z_IS_1405U_EQ_1405U(...) \,
-#define Z_IS_1406_EQ_1406(...)   \,
-#define Z_IS_1406U_EQ_1406(...)  \,
-#define Z_IS_1406_EQ_1406U(...)  \,
-#define Z_IS_1406U_EQ_1406U(...) \,
-#define Z_IS_1407_EQ_1407(...)   \,
-#define Z_IS_1407U_EQ_1407(...)  \,
-#define Z_IS_1407_EQ_1407U(...)  \,
-#define Z_IS_1407U_EQ_1407U(...) \,
-#define Z_IS_1408_EQ_1408(...)   \,
-#define Z_IS_1408U_EQ_1408(...)  \,
-#define Z_IS_1408_EQ_1408U(...)  \,
-#define Z_IS_1408U_EQ_1408U(...) \,
-#define Z_IS_1409_EQ_1409(...)   \,
-#define Z_IS_1409U_EQ_1409(...)  \,
-#define Z_IS_1409_EQ_1409U(...)  \,
-#define Z_IS_1409U_EQ_1409U(...) \,
-#define Z_IS_1410_EQ_1410(...)   \,
-#define Z_IS_1410U_EQ_1410(...)  \,
-#define Z_IS_1410_EQ_1410U(...)  \,
-#define Z_IS_1410U_EQ_1410U(...) \,
-#define Z_IS_1411_EQ_1411(...)   \,
-#define Z_IS_1411U_EQ_1411(...)  \,
-#define Z_IS_1411_EQ_1411U(...)  \,
-#define Z_IS_1411U_EQ_1411U(...) \,
-#define Z_IS_1412_EQ_1412(...)   \,
-#define Z_IS_1412U_EQ_1412(...)  \,
-#define Z_IS_1412_EQ_1412U(...)  \,
-#define Z_IS_1412U_EQ_1412U(...) \,
-#define Z_IS_1413_EQ_1413(...)   \,
-#define Z_IS_1413U_EQ_1413(...)  \,
-#define Z_IS_1413_EQ_1413U(...)  \,
-#define Z_IS_1413U_EQ_1413U(...) \,
-#define Z_IS_1414_EQ_1414(...)   \,
-#define Z_IS_1414U_EQ_1414(...)  \,
-#define Z_IS_1414_EQ_1414U(...)  \,
-#define Z_IS_1414U_EQ_1414U(...) \,
-#define Z_IS_1415_EQ_1415(...)   \,
-#define Z_IS_1415U_EQ_1415(...)  \,
-#define Z_IS_1415_EQ_1415U(...)  \,
-#define Z_IS_1415U_EQ_1415U(...) \,
-#define Z_IS_1416_EQ_1416(...)   \,
-#define Z_IS_1416U_EQ_1416(...)  \,
-#define Z_IS_1416_EQ_1416U(...)  \,
-#define Z_IS_1416U_EQ_1416U(...) \,
-#define Z_IS_1417_EQ_1417(...)   \,
-#define Z_IS_1417U_EQ_1417(...)  \,
-#define Z_IS_1417_EQ_1417U(...)  \,
-#define Z_IS_1417U_EQ_1417U(...) \,
-#define Z_IS_1418_EQ_1418(...)   \,
-#define Z_IS_1418U_EQ_1418(...)  \,
-#define Z_IS_1418_EQ_1418U(...)  \,
-#define Z_IS_1418U_EQ_1418U(...) \,
-#define Z_IS_1419_EQ_1419(...)   \,
-#define Z_IS_1419U_EQ_1419(...)  \,
-#define Z_IS_1419_EQ_1419U(...)  \,
-#define Z_IS_1419U_EQ_1419U(...) \,
-#define Z_IS_1420_EQ_1420(...)   \,
-#define Z_IS_1420U_EQ_1420(...)  \,
-#define Z_IS_1420_EQ_1420U(...)  \,
-#define Z_IS_1420U_EQ_1420U(...) \,
-#define Z_IS_1421_EQ_1421(...)   \,
-#define Z_IS_1421U_EQ_1421(...)  \,
-#define Z_IS_1421_EQ_1421U(...)  \,
-#define Z_IS_1421U_EQ_1421U(...) \,
-#define Z_IS_1422_EQ_1422(...)   \,
-#define Z_IS_1422U_EQ_1422(...)  \,
-#define Z_IS_1422_EQ_1422U(...)  \,
-#define Z_IS_1422U_EQ_1422U(...) \,
-#define Z_IS_1423_EQ_1423(...)   \,
-#define Z_IS_1423U_EQ_1423(...)  \,
-#define Z_IS_1423_EQ_1423U(...)  \,
-#define Z_IS_1423U_EQ_1423U(...) \,
-#define Z_IS_1424_EQ_1424(...)   \,
-#define Z_IS_1424U_EQ_1424(...)  \,
-#define Z_IS_1424_EQ_1424U(...)  \,
-#define Z_IS_1424U_EQ_1424U(...) \,
-#define Z_IS_1425_EQ_1425(...)   \,
-#define Z_IS_1425U_EQ_1425(...)  \,
-#define Z_IS_1425_EQ_1425U(...)  \,
-#define Z_IS_1425U_EQ_1425U(...) \,
-#define Z_IS_1426_EQ_1426(...)   \,
-#define Z_IS_1426U_EQ_1426(...)  \,
-#define Z_IS_1426_EQ_1426U(...)  \,
-#define Z_IS_1426U_EQ_1426U(...) \,
-#define Z_IS_1427_EQ_1427(...)   \,
-#define Z_IS_1427U_EQ_1427(...)  \,
-#define Z_IS_1427_EQ_1427U(...)  \,
-#define Z_IS_1427U_EQ_1427U(...) \,
-#define Z_IS_1428_EQ_1428(...)   \,
-#define Z_IS_1428U_EQ_1428(...)  \,
-#define Z_IS_1428_EQ_1428U(...)  \,
-#define Z_IS_1428U_EQ_1428U(...) \,
-#define Z_IS_1429_EQ_1429(...)   \,
-#define Z_IS_1429U_EQ_1429(...)  \,
-#define Z_IS_1429_EQ_1429U(...)  \,
-#define Z_IS_1429U_EQ_1429U(...) \,
-#define Z_IS_1430_EQ_1430(...)   \,
-#define Z_IS_1430U_EQ_1430(...)  \,
-#define Z_IS_1430_EQ_1430U(...)  \,
-#define Z_IS_1430U_EQ_1430U(...) \,
-#define Z_IS_1431_EQ_1431(...)   \,
-#define Z_IS_1431U_EQ_1431(...)  \,
-#define Z_IS_1431_EQ_1431U(...)  \,
-#define Z_IS_1431U_EQ_1431U(...) \,
-#define Z_IS_1432_EQ_1432(...)   \,
-#define Z_IS_1432U_EQ_1432(...)  \,
-#define Z_IS_1432_EQ_1432U(...)  \,
-#define Z_IS_1432U_EQ_1432U(...) \,
-#define Z_IS_1433_EQ_1433(...)   \,
-#define Z_IS_1433U_EQ_1433(...)  \,
-#define Z_IS_1433_EQ_1433U(...)  \,
-#define Z_IS_1433U_EQ_1433U(...) \,
-#define Z_IS_1434_EQ_1434(...)   \,
-#define Z_IS_1434U_EQ_1434(...)  \,
-#define Z_IS_1434_EQ_1434U(...)  \,
-#define Z_IS_1434U_EQ_1434U(...) \,
-#define Z_IS_1435_EQ_1435(...)   \,
-#define Z_IS_1435U_EQ_1435(...)  \,
-#define Z_IS_1435_EQ_1435U(...)  \,
-#define Z_IS_1435U_EQ_1435U(...) \,
-#define Z_IS_1436_EQ_1436(...)   \,
-#define Z_IS_1436U_EQ_1436(...)  \,
-#define Z_IS_1436_EQ_1436U(...)  \,
-#define Z_IS_1436U_EQ_1436U(...) \,
-#define Z_IS_1437_EQ_1437(...)   \,
-#define Z_IS_1437U_EQ_1437(...)  \,
-#define Z_IS_1437_EQ_1437U(...)  \,
-#define Z_IS_1437U_EQ_1437U(...) \,
-#define Z_IS_1438_EQ_1438(...)   \,
-#define Z_IS_1438U_EQ_1438(...)  \,
-#define Z_IS_1438_EQ_1438U(...)  \,
-#define Z_IS_1438U_EQ_1438U(...) \,
-#define Z_IS_1439_EQ_1439(...)   \,
-#define Z_IS_1439U_EQ_1439(...)  \,
-#define Z_IS_1439_EQ_1439U(...)  \,
-#define Z_IS_1439U_EQ_1439U(...) \,
-#define Z_IS_1440_EQ_1440(...)   \,
-#define Z_IS_1440U_EQ_1440(...)  \,
-#define Z_IS_1440_EQ_1440U(...)  \,
-#define Z_IS_1440U_EQ_1440U(...) \,
-#define Z_IS_1441_EQ_1441(...)   \,
-#define Z_IS_1441U_EQ_1441(...)  \,
-#define Z_IS_1441_EQ_1441U(...)  \,
-#define Z_IS_1441U_EQ_1441U(...) \,
-#define Z_IS_1442_EQ_1442(...)   \,
-#define Z_IS_1442U_EQ_1442(...)  \,
-#define Z_IS_1442_EQ_1442U(...)  \,
-#define Z_IS_1442U_EQ_1442U(...) \,
-#define Z_IS_1443_EQ_1443(...)   \,
-#define Z_IS_1443U_EQ_1443(...)  \,
-#define Z_IS_1443_EQ_1443U(...)  \,
-#define Z_IS_1443U_EQ_1443U(...) \,
-#define Z_IS_1444_EQ_1444(...)   \,
-#define Z_IS_1444U_EQ_1444(...)  \,
-#define Z_IS_1444_EQ_1444U(...)  \,
-#define Z_IS_1444U_EQ_1444U(...) \,
-#define Z_IS_1445_EQ_1445(...)   \,
-#define Z_IS_1445U_EQ_1445(...)  \,
-#define Z_IS_1445_EQ_1445U(...)  \,
-#define Z_IS_1445U_EQ_1445U(...) \,
-#define Z_IS_1446_EQ_1446(...)   \,
-#define Z_IS_1446U_EQ_1446(...)  \,
-#define Z_IS_1446_EQ_1446U(...)  \,
-#define Z_IS_1446U_EQ_1446U(...) \,
-#define Z_IS_1447_EQ_1447(...)   \,
-#define Z_IS_1447U_EQ_1447(...)  \,
-#define Z_IS_1447_EQ_1447U(...)  \,
-#define Z_IS_1447U_EQ_1447U(...) \,
-#define Z_IS_1448_EQ_1448(...)   \,
-#define Z_IS_1448U_EQ_1448(...)  \,
-#define Z_IS_1448_EQ_1448U(...)  \,
-#define Z_IS_1448U_EQ_1448U(...) \,
-#define Z_IS_1449_EQ_1449(...)   \,
-#define Z_IS_1449U_EQ_1449(...)  \,
-#define Z_IS_1449_EQ_1449U(...)  \,
-#define Z_IS_1449U_EQ_1449U(...) \,
-#define Z_IS_1450_EQ_1450(...)   \,
-#define Z_IS_1450U_EQ_1450(...)  \,
-#define Z_IS_1450_EQ_1450U(...)  \,
-#define Z_IS_1450U_EQ_1450U(...) \,
-#define Z_IS_1451_EQ_1451(...)   \,
-#define Z_IS_1451U_EQ_1451(...)  \,
-#define Z_IS_1451_EQ_1451U(...)  \,
-#define Z_IS_1451U_EQ_1451U(...) \,
-#define Z_IS_1452_EQ_1452(...)   \,
-#define Z_IS_1452U_EQ_1452(...)  \,
-#define Z_IS_1452_EQ_1452U(...)  \,
-#define Z_IS_1452U_EQ_1452U(...) \,
-#define Z_IS_1453_EQ_1453(...)   \,
-#define Z_IS_1453U_EQ_1453(...)  \,
-#define Z_IS_1453_EQ_1453U(...)  \,
-#define Z_IS_1453U_EQ_1453U(...) \,
-#define Z_IS_1454_EQ_1454(...)   \,
-#define Z_IS_1454U_EQ_1454(...)  \,
-#define Z_IS_1454_EQ_1454U(...)  \,
-#define Z_IS_1454U_EQ_1454U(...) \,
-#define Z_IS_1455_EQ_1455(...)   \,
-#define Z_IS_1455U_EQ_1455(...)  \,
-#define Z_IS_1455_EQ_1455U(...)  \,
-#define Z_IS_1455U_EQ_1455U(...) \,
-#define Z_IS_1456_EQ_1456(...)   \,
-#define Z_IS_1456U_EQ_1456(...)  \,
-#define Z_IS_1456_EQ_1456U(...)  \,
-#define Z_IS_1456U_EQ_1456U(...) \,
-#define Z_IS_1457_EQ_1457(...)   \,
-#define Z_IS_1457U_EQ_1457(...)  \,
-#define Z_IS_1457_EQ_1457U(...)  \,
-#define Z_IS_1457U_EQ_1457U(...) \,
-#define Z_IS_1458_EQ_1458(...)   \,
-#define Z_IS_1458U_EQ_1458(...)  \,
-#define Z_IS_1458_EQ_1458U(...)  \,
-#define Z_IS_1458U_EQ_1458U(...) \,
-#define Z_IS_1459_EQ_1459(...)   \,
-#define Z_IS_1459U_EQ_1459(...)  \,
-#define Z_IS_1459_EQ_1459U(...)  \,
-#define Z_IS_1459U_EQ_1459U(...) \,
-#define Z_IS_1460_EQ_1460(...)   \,
-#define Z_IS_1460U_EQ_1460(...)  \,
-#define Z_IS_1460_EQ_1460U(...)  \,
-#define Z_IS_1460U_EQ_1460U(...) \,
-#define Z_IS_1461_EQ_1461(...)   \,
-#define Z_IS_1461U_EQ_1461(...)  \,
-#define Z_IS_1461_EQ_1461U(...)  \,
-#define Z_IS_1461U_EQ_1461U(...) \,
-#define Z_IS_1462_EQ_1462(...)   \,
-#define Z_IS_1462U_EQ_1462(...)  \,
-#define Z_IS_1462_EQ_1462U(...)  \,
-#define Z_IS_1462U_EQ_1462U(...) \,
-#define Z_IS_1463_EQ_1463(...)   \,
-#define Z_IS_1463U_EQ_1463(...)  \,
-#define Z_IS_1463_EQ_1463U(...)  \,
-#define Z_IS_1463U_EQ_1463U(...) \,
-#define Z_IS_1464_EQ_1464(...)   \,
-#define Z_IS_1464U_EQ_1464(...)  \,
-#define Z_IS_1464_EQ_1464U(...)  \,
-#define Z_IS_1464U_EQ_1464U(...) \,
-#define Z_IS_1465_EQ_1465(...)   \,
-#define Z_IS_1465U_EQ_1465(...)  \,
-#define Z_IS_1465_EQ_1465U(...)  \,
-#define Z_IS_1465U_EQ_1465U(...) \,
-#define Z_IS_1466_EQ_1466(...)   \,
-#define Z_IS_1466U_EQ_1466(...)  \,
-#define Z_IS_1466_EQ_1466U(...)  \,
-#define Z_IS_1466U_EQ_1466U(...) \,
-#define Z_IS_1467_EQ_1467(...)   \,
-#define Z_IS_1467U_EQ_1467(...)  \,
-#define Z_IS_1467_EQ_1467U(...)  \,
-#define Z_IS_1467U_EQ_1467U(...) \,
-#define Z_IS_1468_EQ_1468(...)   \,
-#define Z_IS_1468U_EQ_1468(...)  \,
-#define Z_IS_1468_EQ_1468U(...)  \,
-#define Z_IS_1468U_EQ_1468U(...) \,
-#define Z_IS_1469_EQ_1469(...)   \,
-#define Z_IS_1469U_EQ_1469(...)  \,
-#define Z_IS_1469_EQ_1469U(...)  \,
-#define Z_IS_1469U_EQ_1469U(...) \,
-#define Z_IS_1470_EQ_1470(...)   \,
-#define Z_IS_1470U_EQ_1470(...)  \,
-#define Z_IS_1470_EQ_1470U(...)  \,
-#define Z_IS_1470U_EQ_1470U(...) \,
-#define Z_IS_1471_EQ_1471(...)   \,
-#define Z_IS_1471U_EQ_1471(...)  \,
-#define Z_IS_1471_EQ_1471U(...)  \,
-#define Z_IS_1471U_EQ_1471U(...) \,
-#define Z_IS_1472_EQ_1472(...)   \,
-#define Z_IS_1472U_EQ_1472(...)  \,
-#define Z_IS_1472_EQ_1472U(...)  \,
-#define Z_IS_1472U_EQ_1472U(...) \,
-#define Z_IS_1473_EQ_1473(...)   \,
-#define Z_IS_1473U_EQ_1473(...)  \,
-#define Z_IS_1473_EQ_1473U(...)  \,
-#define Z_IS_1473U_EQ_1473U(...) \,
-#define Z_IS_1474_EQ_1474(...)   \,
-#define Z_IS_1474U_EQ_1474(...)  \,
-#define Z_IS_1474_EQ_1474U(...)  \,
-#define Z_IS_1474U_EQ_1474U(...) \,
-#define Z_IS_1475_EQ_1475(...)   \,
-#define Z_IS_1475U_EQ_1475(...)  \,
-#define Z_IS_1475_EQ_1475U(...)  \,
-#define Z_IS_1475U_EQ_1475U(...) \,
-#define Z_IS_1476_EQ_1476(...)   \,
-#define Z_IS_1476U_EQ_1476(...)  \,
-#define Z_IS_1476_EQ_1476U(...)  \,
-#define Z_IS_1476U_EQ_1476U(...) \,
-#define Z_IS_1477_EQ_1477(...)   \,
-#define Z_IS_1477U_EQ_1477(...)  \,
-#define Z_IS_1477_EQ_1477U(...)  \,
-#define Z_IS_1477U_EQ_1477U(...) \,
-#define Z_IS_1478_EQ_1478(...)   \,
-#define Z_IS_1478U_EQ_1478(...)  \,
-#define Z_IS_1478_EQ_1478U(...)  \,
-#define Z_IS_1478U_EQ_1478U(...) \,
-#define Z_IS_1479_EQ_1479(...)   \,
-#define Z_IS_1479U_EQ_1479(...)  \,
-#define Z_IS_1479_EQ_1479U(...)  \,
-#define Z_IS_1479U_EQ_1479U(...) \,
-#define Z_IS_1480_EQ_1480(...)   \,
-#define Z_IS_1480U_EQ_1480(...)  \,
-#define Z_IS_1480_EQ_1480U(...)  \,
-#define Z_IS_1480U_EQ_1480U(...) \,
-#define Z_IS_1481_EQ_1481(...)   \,
-#define Z_IS_1481U_EQ_1481(...)  \,
-#define Z_IS_1481_EQ_1481U(...)  \,
-#define Z_IS_1481U_EQ_1481U(...) \,
-#define Z_IS_1482_EQ_1482(...)   \,
-#define Z_IS_1482U_EQ_1482(...)  \,
-#define Z_IS_1482_EQ_1482U(...)  \,
-#define Z_IS_1482U_EQ_1482U(...) \,
-#define Z_IS_1483_EQ_1483(...)   \,
-#define Z_IS_1483U_EQ_1483(...)  \,
-#define Z_IS_1483_EQ_1483U(...)  \,
-#define Z_IS_1483U_EQ_1483U(...) \,
-#define Z_IS_1484_EQ_1484(...)   \,
-#define Z_IS_1484U_EQ_1484(...)  \,
-#define Z_IS_1484_EQ_1484U(...)  \,
-#define Z_IS_1484U_EQ_1484U(...) \,
-#define Z_IS_1485_EQ_1485(...)   \,
-#define Z_IS_1485U_EQ_1485(...)  \,
-#define Z_IS_1485_EQ_1485U(...)  \,
-#define Z_IS_1485U_EQ_1485U(...) \,
-#define Z_IS_1486_EQ_1486(...)   \,
-#define Z_IS_1486U_EQ_1486(...)  \,
-#define Z_IS_1486_EQ_1486U(...)  \,
-#define Z_IS_1486U_EQ_1486U(...) \,
-#define Z_IS_1487_EQ_1487(...)   \,
-#define Z_IS_1487U_EQ_1487(...)  \,
-#define Z_IS_1487_EQ_1487U(...)  \,
-#define Z_IS_1487U_EQ_1487U(...) \,
-#define Z_IS_1488_EQ_1488(...)   \,
-#define Z_IS_1488U_EQ_1488(...)  \,
-#define Z_IS_1488_EQ_1488U(...)  \,
-#define Z_IS_1488U_EQ_1488U(...) \,
-#define Z_IS_1489_EQ_1489(...)   \,
-#define Z_IS_1489U_EQ_1489(...)  \,
-#define Z_IS_1489_EQ_1489U(...)  \,
-#define Z_IS_1489U_EQ_1489U(...) \,
-#define Z_IS_1490_EQ_1490(...)   \,
-#define Z_IS_1490U_EQ_1490(...)  \,
-#define Z_IS_1490_EQ_1490U(...)  \,
-#define Z_IS_1490U_EQ_1490U(...) \,
-#define Z_IS_1491_EQ_1491(...)   \,
-#define Z_IS_1491U_EQ_1491(...)  \,
-#define Z_IS_1491_EQ_1491U(...)  \,
-#define Z_IS_1491U_EQ_1491U(...) \,
-#define Z_IS_1492_EQ_1492(...)   \,
-#define Z_IS_1492U_EQ_1492(...)  \,
-#define Z_IS_1492_EQ_1492U(...)  \,
-#define Z_IS_1492U_EQ_1492U(...) \,
-#define Z_IS_1493_EQ_1493(...)   \,
-#define Z_IS_1493U_EQ_1493(...)  \,
-#define Z_IS_1493_EQ_1493U(...)  \,
-#define Z_IS_1493U_EQ_1493U(...) \,
-#define Z_IS_1494_EQ_1494(...)   \,
-#define Z_IS_1494U_EQ_1494(...)  \,
-#define Z_IS_1494_EQ_1494U(...)  \,
-#define Z_IS_1494U_EQ_1494U(...) \,
-#define Z_IS_1495_EQ_1495(...)   \,
-#define Z_IS_1495U_EQ_1495(...)  \,
-#define Z_IS_1495_EQ_1495U(...)  \,
-#define Z_IS_1495U_EQ_1495U(...) \,
-#define Z_IS_1496_EQ_1496(...)   \,
-#define Z_IS_1496U_EQ_1496(...)  \,
-#define Z_IS_1496_EQ_1496U(...)  \,
-#define Z_IS_1496U_EQ_1496U(...) \,
-#define Z_IS_1497_EQ_1497(...)   \,
-#define Z_IS_1497U_EQ_1497(...)  \,
-#define Z_IS_1497_EQ_1497U(...)  \,
-#define Z_IS_1497U_EQ_1497U(...) \,
-#define Z_IS_1498_EQ_1498(...)   \,
-#define Z_IS_1498U_EQ_1498(...)  \,
-#define Z_IS_1498_EQ_1498U(...)  \,
-#define Z_IS_1498U_EQ_1498U(...) \,
-#define Z_IS_1499_EQ_1499(...)   \,
-#define Z_IS_1499U_EQ_1499(...)  \,
-#define Z_IS_1499_EQ_1499U(...)  \,
-#define Z_IS_1499U_EQ_1499U(...) \,
-#define Z_IS_1500_EQ_1500(...)   \,
-#define Z_IS_1500U_EQ_1500(...)  \,
-#define Z_IS_1500_EQ_1500U(...)  \,
-#define Z_IS_1500U_EQ_1500U(...) \,
-#define Z_IS_1501_EQ_1501(...)   \,
-#define Z_IS_1501U_EQ_1501(...)  \,
-#define Z_IS_1501_EQ_1501U(...)  \,
-#define Z_IS_1501U_EQ_1501U(...) \,
-#define Z_IS_1502_EQ_1502(...)   \,
-#define Z_IS_1502U_EQ_1502(...)  \,
-#define Z_IS_1502_EQ_1502U(...)  \,
-#define Z_IS_1502U_EQ_1502U(...) \,
-#define Z_IS_1503_EQ_1503(...)   \,
-#define Z_IS_1503U_EQ_1503(...)  \,
-#define Z_IS_1503_EQ_1503U(...)  \,
-#define Z_IS_1503U_EQ_1503U(...) \,
-#define Z_IS_1504_EQ_1504(...)   \,
-#define Z_IS_1504U_EQ_1504(...)  \,
-#define Z_IS_1504_EQ_1504U(...)  \,
-#define Z_IS_1504U_EQ_1504U(...) \,
-#define Z_IS_1505_EQ_1505(...)   \,
-#define Z_IS_1505U_EQ_1505(...)  \,
-#define Z_IS_1505_EQ_1505U(...)  \,
-#define Z_IS_1505U_EQ_1505U(...) \,
-#define Z_IS_1506_EQ_1506(...)   \,
-#define Z_IS_1506U_EQ_1506(...)  \,
-#define Z_IS_1506_EQ_1506U(...)  \,
-#define Z_IS_1506U_EQ_1506U(...) \,
-#define Z_IS_1507_EQ_1507(...)   \,
-#define Z_IS_1507U_EQ_1507(...)  \,
-#define Z_IS_1507_EQ_1507U(...)  \,
-#define Z_IS_1507U_EQ_1507U(...) \,
-#define Z_IS_1508_EQ_1508(...)   \,
-#define Z_IS_1508U_EQ_1508(...)  \,
-#define Z_IS_1508_EQ_1508U(...)  \,
-#define Z_IS_1508U_EQ_1508U(...) \,
-#define Z_IS_1509_EQ_1509(...)   \,
-#define Z_IS_1509U_EQ_1509(...)  \,
-#define Z_IS_1509_EQ_1509U(...)  \,
-#define Z_IS_1509U_EQ_1509U(...) \,
-#define Z_IS_1510_EQ_1510(...)   \,
-#define Z_IS_1510U_EQ_1510(...)  \,
-#define Z_IS_1510_EQ_1510U(...)  \,
-#define Z_IS_1510U_EQ_1510U(...) \,
-#define Z_IS_1511_EQ_1511(...)   \,
-#define Z_IS_1511U_EQ_1511(...)  \,
-#define Z_IS_1511_EQ_1511U(...)  \,
-#define Z_IS_1511U_EQ_1511U(...) \,
-#define Z_IS_1512_EQ_1512(...)   \,
-#define Z_IS_1512U_EQ_1512(...)  \,
-#define Z_IS_1512_EQ_1512U(...)  \,
-#define Z_IS_1512U_EQ_1512U(...) \,
-#define Z_IS_1513_EQ_1513(...)   \,
-#define Z_IS_1513U_EQ_1513(...)  \,
-#define Z_IS_1513_EQ_1513U(...)  \,
-#define Z_IS_1513U_EQ_1513U(...) \,
-#define Z_IS_1514_EQ_1514(...)   \,
-#define Z_IS_1514U_EQ_1514(...)  \,
-#define Z_IS_1514_EQ_1514U(...)  \,
-#define Z_IS_1514U_EQ_1514U(...) \,
-#define Z_IS_1515_EQ_1515(...)   \,
-#define Z_IS_1515U_EQ_1515(...)  \,
-#define Z_IS_1515_EQ_1515U(...)  \,
-#define Z_IS_1515U_EQ_1515U(...) \,
-#define Z_IS_1516_EQ_1516(...)   \,
-#define Z_IS_1516U_EQ_1516(...)  \,
-#define Z_IS_1516_EQ_1516U(...)  \,
-#define Z_IS_1516U_EQ_1516U(...) \,
-#define Z_IS_1517_EQ_1517(...)   \,
-#define Z_IS_1517U_EQ_1517(...)  \,
-#define Z_IS_1517_EQ_1517U(...)  \,
-#define Z_IS_1517U_EQ_1517U(...) \,
-#define Z_IS_1518_EQ_1518(...)   \,
-#define Z_IS_1518U_EQ_1518(...)  \,
-#define Z_IS_1518_EQ_1518U(...)  \,
-#define Z_IS_1518U_EQ_1518U(...) \,
-#define Z_IS_1519_EQ_1519(...)   \,
-#define Z_IS_1519U_EQ_1519(...)  \,
-#define Z_IS_1519_EQ_1519U(...)  \,
-#define Z_IS_1519U_EQ_1519U(...) \,
-#define Z_IS_1520_EQ_1520(...)   \,
-#define Z_IS_1520U_EQ_1520(...)  \,
-#define Z_IS_1520_EQ_1520U(...)  \,
-#define Z_IS_1520U_EQ_1520U(...) \,
-#define Z_IS_1521_EQ_1521(...)   \,
-#define Z_IS_1521U_EQ_1521(...)  \,
-#define Z_IS_1521_EQ_1521U(...)  \,
-#define Z_IS_1521U_EQ_1521U(...) \,
-#define Z_IS_1522_EQ_1522(...)   \,
-#define Z_IS_1522U_EQ_1522(...)  \,
-#define Z_IS_1522_EQ_1522U(...)  \,
-#define Z_IS_1522U_EQ_1522U(...) \,
-#define Z_IS_1523_EQ_1523(...)   \,
-#define Z_IS_1523U_EQ_1523(...)  \,
-#define Z_IS_1523_EQ_1523U(...)  \,
-#define Z_IS_1523U_EQ_1523U(...) \,
-#define Z_IS_1524_EQ_1524(...)   \,
-#define Z_IS_1524U_EQ_1524(...)  \,
-#define Z_IS_1524_EQ_1524U(...)  \,
-#define Z_IS_1524U_EQ_1524U(...) \,
-#define Z_IS_1525_EQ_1525(...)   \,
-#define Z_IS_1525U_EQ_1525(...)  \,
-#define Z_IS_1525_EQ_1525U(...)  \,
-#define Z_IS_1525U_EQ_1525U(...) \,
-#define Z_IS_1526_EQ_1526(...)   \,
-#define Z_IS_1526U_EQ_1526(...)  \,
-#define Z_IS_1526_EQ_1526U(...)  \,
-#define Z_IS_1526U_EQ_1526U(...) \,
-#define Z_IS_1527_EQ_1527(...)   \,
-#define Z_IS_1527U_EQ_1527(...)  \,
-#define Z_IS_1527_EQ_1527U(...)  \,
-#define Z_IS_1527U_EQ_1527U(...) \,
-#define Z_IS_1528_EQ_1528(...)   \,
-#define Z_IS_1528U_EQ_1528(...)  \,
-#define Z_IS_1528_EQ_1528U(...)  \,
-#define Z_IS_1528U_EQ_1528U(...) \,
-#define Z_IS_1529_EQ_1529(...)   \,
-#define Z_IS_1529U_EQ_1529(...)  \,
-#define Z_IS_1529_EQ_1529U(...)  \,
-#define Z_IS_1529U_EQ_1529U(...) \,
-#define Z_IS_1530_EQ_1530(...)   \,
-#define Z_IS_1530U_EQ_1530(...)  \,
-#define Z_IS_1530_EQ_1530U(...)  \,
-#define Z_IS_1530U_EQ_1530U(...) \,
-#define Z_IS_1531_EQ_1531(...)   \,
-#define Z_IS_1531U_EQ_1531(...)  \,
-#define Z_IS_1531_EQ_1531U(...)  \,
-#define Z_IS_1531U_EQ_1531U(...) \,
-#define Z_IS_1532_EQ_1532(...)   \,
-#define Z_IS_1532U_EQ_1532(...)  \,
-#define Z_IS_1532_EQ_1532U(...)  \,
-#define Z_IS_1532U_EQ_1532U(...) \,
-#define Z_IS_1533_EQ_1533(...)   \,
-#define Z_IS_1533U_EQ_1533(...)  \,
-#define Z_IS_1533_EQ_1533U(...)  \,
-#define Z_IS_1533U_EQ_1533U(...) \,
-#define Z_IS_1534_EQ_1534(...)   \,
-#define Z_IS_1534U_EQ_1534(...)  \,
-#define Z_IS_1534_EQ_1534U(...)  \,
-#define Z_IS_1534U_EQ_1534U(...) \,
-#define Z_IS_1535_EQ_1535(...)   \,
-#define Z_IS_1535U_EQ_1535(...)  \,
-#define Z_IS_1535_EQ_1535U(...)  \,
-#define Z_IS_1535U_EQ_1535U(...) \,
-#define Z_IS_1536_EQ_1536(...)   \,
-#define Z_IS_1536U_EQ_1536(...)  \,
-#define Z_IS_1536_EQ_1536U(...)  \,
-#define Z_IS_1536U_EQ_1536U(...) \,
-#define Z_IS_1537_EQ_1537(...)   \,
-#define Z_IS_1537U_EQ_1537(...)  \,
-#define Z_IS_1537_EQ_1537U(...)  \,
-#define Z_IS_1537U_EQ_1537U(...) \,
-#define Z_IS_1538_EQ_1538(...)   \,
-#define Z_IS_1538U_EQ_1538(...)  \,
-#define Z_IS_1538_EQ_1538U(...)  \,
-#define Z_IS_1538U_EQ_1538U(...) \,
-#define Z_IS_1539_EQ_1539(...)   \,
-#define Z_IS_1539U_EQ_1539(...)  \,
-#define Z_IS_1539_EQ_1539U(...)  \,
-#define Z_IS_1539U_EQ_1539U(...) \,
-#define Z_IS_1540_EQ_1540(...)   \,
-#define Z_IS_1540U_EQ_1540(...)  \,
-#define Z_IS_1540_EQ_1540U(...)  \,
-#define Z_IS_1540U_EQ_1540U(...) \,
-#define Z_IS_1541_EQ_1541(...)   \,
-#define Z_IS_1541U_EQ_1541(...)  \,
-#define Z_IS_1541_EQ_1541U(...)  \,
-#define Z_IS_1541U_EQ_1541U(...) \,
-#define Z_IS_1542_EQ_1542(...)   \,
-#define Z_IS_1542U_EQ_1542(...)  \,
-#define Z_IS_1542_EQ_1542U(...)  \,
-#define Z_IS_1542U_EQ_1542U(...) \,
-#define Z_IS_1543_EQ_1543(...)   \,
-#define Z_IS_1543U_EQ_1543(...)  \,
-#define Z_IS_1543_EQ_1543U(...)  \,
-#define Z_IS_1543U_EQ_1543U(...) \,
-#define Z_IS_1544_EQ_1544(...)   \,
-#define Z_IS_1544U_EQ_1544(...)  \,
-#define Z_IS_1544_EQ_1544U(...)  \,
-#define Z_IS_1544U_EQ_1544U(...) \,
-#define Z_IS_1545_EQ_1545(...)   \,
-#define Z_IS_1545U_EQ_1545(...)  \,
-#define Z_IS_1545_EQ_1545U(...)  \,
-#define Z_IS_1545U_EQ_1545U(...) \,
-#define Z_IS_1546_EQ_1546(...)   \,
-#define Z_IS_1546U_EQ_1546(...)  \,
-#define Z_IS_1546_EQ_1546U(...)  \,
-#define Z_IS_1546U_EQ_1546U(...) \,
-#define Z_IS_1547_EQ_1547(...)   \,
-#define Z_IS_1547U_EQ_1547(...)  \,
-#define Z_IS_1547_EQ_1547U(...)  \,
-#define Z_IS_1547U_EQ_1547U(...) \,
-#define Z_IS_1548_EQ_1548(...)   \,
-#define Z_IS_1548U_EQ_1548(...)  \,
-#define Z_IS_1548_EQ_1548U(...)  \,
-#define Z_IS_1548U_EQ_1548U(...) \,
-#define Z_IS_1549_EQ_1549(...)   \,
-#define Z_IS_1549U_EQ_1549(...)  \,
-#define Z_IS_1549_EQ_1549U(...)  \,
-#define Z_IS_1549U_EQ_1549U(...) \,
-#define Z_IS_1550_EQ_1550(...)   \,
-#define Z_IS_1550U_EQ_1550(...)  \,
-#define Z_IS_1550_EQ_1550U(...)  \,
-#define Z_IS_1550U_EQ_1550U(...) \,
-#define Z_IS_1551_EQ_1551(...)   \,
-#define Z_IS_1551U_EQ_1551(...)  \,
-#define Z_IS_1551_EQ_1551U(...)  \,
-#define Z_IS_1551U_EQ_1551U(...) \,
-#define Z_IS_1552_EQ_1552(...)   \,
-#define Z_IS_1552U_EQ_1552(...)  \,
-#define Z_IS_1552_EQ_1552U(...)  \,
-#define Z_IS_1552U_EQ_1552U(...) \,
-#define Z_IS_1553_EQ_1553(...)   \,
-#define Z_IS_1553U_EQ_1553(...)  \,
-#define Z_IS_1553_EQ_1553U(...)  \,
-#define Z_IS_1553U_EQ_1553U(...) \,
-#define Z_IS_1554_EQ_1554(...)   \,
-#define Z_IS_1554U_EQ_1554(...)  \,
-#define Z_IS_1554_EQ_1554U(...)  \,
-#define Z_IS_1554U_EQ_1554U(...) \,
-#define Z_IS_1555_EQ_1555(...)   \,
-#define Z_IS_1555U_EQ_1555(...)  \,
-#define Z_IS_1555_EQ_1555U(...)  \,
-#define Z_IS_1555U_EQ_1555U(...) \,
-#define Z_IS_1556_EQ_1556(...)   \,
-#define Z_IS_1556U_EQ_1556(...)  \,
-#define Z_IS_1556_EQ_1556U(...)  \,
-#define Z_IS_1556U_EQ_1556U(...) \,
-#define Z_IS_1557_EQ_1557(...)   \,
-#define Z_IS_1557U_EQ_1557(...)  \,
-#define Z_IS_1557_EQ_1557U(...)  \,
-#define Z_IS_1557U_EQ_1557U(...) \,
-#define Z_IS_1558_EQ_1558(...)   \,
-#define Z_IS_1558U_EQ_1558(...)  \,
-#define Z_IS_1558_EQ_1558U(...)  \,
-#define Z_IS_1558U_EQ_1558U(...) \,
-#define Z_IS_1559_EQ_1559(...)   \,
-#define Z_IS_1559U_EQ_1559(...)  \,
-#define Z_IS_1559_EQ_1559U(...)  \,
-#define Z_IS_1559U_EQ_1559U(...) \,
-#define Z_IS_1560_EQ_1560(...)   \,
-#define Z_IS_1560U_EQ_1560(...)  \,
-#define Z_IS_1560_EQ_1560U(...)  \,
-#define Z_IS_1560U_EQ_1560U(...) \,
-#define Z_IS_1561_EQ_1561(...)   \,
-#define Z_IS_1561U_EQ_1561(...)  \,
-#define Z_IS_1561_EQ_1561U(...)  \,
-#define Z_IS_1561U_EQ_1561U(...) \,
-#define Z_IS_1562_EQ_1562(...)   \,
-#define Z_IS_1562U_EQ_1562(...)  \,
-#define Z_IS_1562_EQ_1562U(...)  \,
-#define Z_IS_1562U_EQ_1562U(...) \,
-#define Z_IS_1563_EQ_1563(...)   \,
-#define Z_IS_1563U_EQ_1563(...)  \,
-#define Z_IS_1563_EQ_1563U(...)  \,
-#define Z_IS_1563U_EQ_1563U(...) \,
-#define Z_IS_1564_EQ_1564(...)   \,
-#define Z_IS_1564U_EQ_1564(...)  \,
-#define Z_IS_1564_EQ_1564U(...)  \,
-#define Z_IS_1564U_EQ_1564U(...) \,
-#define Z_IS_1565_EQ_1565(...)   \,
-#define Z_IS_1565U_EQ_1565(...)  \,
-#define Z_IS_1565_EQ_1565U(...)  \,
-#define Z_IS_1565U_EQ_1565U(...) \,
-#define Z_IS_1566_EQ_1566(...)   \,
-#define Z_IS_1566U_EQ_1566(...)  \,
-#define Z_IS_1566_EQ_1566U(...)  \,
-#define Z_IS_1566U_EQ_1566U(...) \,
-#define Z_IS_1567_EQ_1567(...)   \,
-#define Z_IS_1567U_EQ_1567(...)  \,
-#define Z_IS_1567_EQ_1567U(...)  \,
-#define Z_IS_1567U_EQ_1567U(...) \,
-#define Z_IS_1568_EQ_1568(...)   \,
-#define Z_IS_1568U_EQ_1568(...)  \,
-#define Z_IS_1568_EQ_1568U(...)  \,
-#define Z_IS_1568U_EQ_1568U(...) \,
-#define Z_IS_1569_EQ_1569(...)   \,
-#define Z_IS_1569U_EQ_1569(...)  \,
-#define Z_IS_1569_EQ_1569U(...)  \,
-#define Z_IS_1569U_EQ_1569U(...) \,
-#define Z_IS_1570_EQ_1570(...)   \,
-#define Z_IS_1570U_EQ_1570(...)  \,
-#define Z_IS_1570_EQ_1570U(...)  \,
-#define Z_IS_1570U_EQ_1570U(...) \,
-#define Z_IS_1571_EQ_1571(...)   \,
-#define Z_IS_1571U_EQ_1571(...)  \,
-#define Z_IS_1571_EQ_1571U(...)  \,
-#define Z_IS_1571U_EQ_1571U(...) \,
-#define Z_IS_1572_EQ_1572(...)   \,
-#define Z_IS_1572U_EQ_1572(...)  \,
-#define Z_IS_1572_EQ_1572U(...)  \,
-#define Z_IS_1572U_EQ_1572U(...) \,
-#define Z_IS_1573_EQ_1573(...)   \,
-#define Z_IS_1573U_EQ_1573(...)  \,
-#define Z_IS_1573_EQ_1573U(...)  \,
-#define Z_IS_1573U_EQ_1573U(...) \,
-#define Z_IS_1574_EQ_1574(...)   \,
-#define Z_IS_1574U_EQ_1574(...)  \,
-#define Z_IS_1574_EQ_1574U(...)  \,
-#define Z_IS_1574U_EQ_1574U(...) \,
-#define Z_IS_1575_EQ_1575(...)   \,
-#define Z_IS_1575U_EQ_1575(...)  \,
-#define Z_IS_1575_EQ_1575U(...)  \,
-#define Z_IS_1575U_EQ_1575U(...) \,
-#define Z_IS_1576_EQ_1576(...)   \,
-#define Z_IS_1576U_EQ_1576(...)  \,
-#define Z_IS_1576_EQ_1576U(...)  \,
-#define Z_IS_1576U_EQ_1576U(...) \,
-#define Z_IS_1577_EQ_1577(...)   \,
-#define Z_IS_1577U_EQ_1577(...)  \,
-#define Z_IS_1577_EQ_1577U(...)  \,
-#define Z_IS_1577U_EQ_1577U(...) \,
-#define Z_IS_1578_EQ_1578(...)   \,
-#define Z_IS_1578U_EQ_1578(...)  \,
-#define Z_IS_1578_EQ_1578U(...)  \,
-#define Z_IS_1578U_EQ_1578U(...) \,
-#define Z_IS_1579_EQ_1579(...)   \,
-#define Z_IS_1579U_EQ_1579(...)  \,
-#define Z_IS_1579_EQ_1579U(...)  \,
-#define Z_IS_1579U_EQ_1579U(...) \,
-#define Z_IS_1580_EQ_1580(...)   \,
-#define Z_IS_1580U_EQ_1580(...)  \,
-#define Z_IS_1580_EQ_1580U(...)  \,
-#define Z_IS_1580U_EQ_1580U(...) \,
-#define Z_IS_1581_EQ_1581(...)   \,
-#define Z_IS_1581U_EQ_1581(...)  \,
-#define Z_IS_1581_EQ_1581U(...)  \,
-#define Z_IS_1581U_EQ_1581U(...) \,
-#define Z_IS_1582_EQ_1582(...)   \,
-#define Z_IS_1582U_EQ_1582(...)  \,
-#define Z_IS_1582_EQ_1582U(...)  \,
-#define Z_IS_1582U_EQ_1582U(...) \,
-#define Z_IS_1583_EQ_1583(...)   \,
-#define Z_IS_1583U_EQ_1583(...)  \,
-#define Z_IS_1583_EQ_1583U(...)  \,
-#define Z_IS_1583U_EQ_1583U(...) \,
-#define Z_IS_1584_EQ_1584(...)   \,
-#define Z_IS_1584U_EQ_1584(...)  \,
-#define Z_IS_1584_EQ_1584U(...)  \,
-#define Z_IS_1584U_EQ_1584U(...) \,
-#define Z_IS_1585_EQ_1585(...)   \,
-#define Z_IS_1585U_EQ_1585(...)  \,
-#define Z_IS_1585_EQ_1585U(...)  \,
-#define Z_IS_1585U_EQ_1585U(...) \,
-#define Z_IS_1586_EQ_1586(...)   \,
-#define Z_IS_1586U_EQ_1586(...)  \,
-#define Z_IS_1586_EQ_1586U(...)  \,
-#define Z_IS_1586U_EQ_1586U(...) \,
-#define Z_IS_1587_EQ_1587(...)   \,
-#define Z_IS_1587U_EQ_1587(...)  \,
-#define Z_IS_1587_EQ_1587U(...)  \,
-#define Z_IS_1587U_EQ_1587U(...) \,
-#define Z_IS_1588_EQ_1588(...)   \,
-#define Z_IS_1588U_EQ_1588(...)  \,
-#define Z_IS_1588_EQ_1588U(...)  \,
-#define Z_IS_1588U_EQ_1588U(...) \,
-#define Z_IS_1589_EQ_1589(...)   \,
-#define Z_IS_1589U_EQ_1589(...)  \,
-#define Z_IS_1589_EQ_1589U(...)  \,
-#define Z_IS_1589U_EQ_1589U(...) \,
-#define Z_IS_1590_EQ_1590(...)   \,
-#define Z_IS_1590U_EQ_1590(...)  \,
-#define Z_IS_1590_EQ_1590U(...)  \,
-#define Z_IS_1590U_EQ_1590U(...) \,
-#define Z_IS_1591_EQ_1591(...)   \,
-#define Z_IS_1591U_EQ_1591(...)  \,
-#define Z_IS_1591_EQ_1591U(...)  \,
-#define Z_IS_1591U_EQ_1591U(...) \,
-#define Z_IS_1592_EQ_1592(...)   \,
-#define Z_IS_1592U_EQ_1592(...)  \,
-#define Z_IS_1592_EQ_1592U(...)  \,
-#define Z_IS_1592U_EQ_1592U(...) \,
-#define Z_IS_1593_EQ_1593(...)   \,
-#define Z_IS_1593U_EQ_1593(...)  \,
-#define Z_IS_1593_EQ_1593U(...)  \,
-#define Z_IS_1593U_EQ_1593U(...) \,
-#define Z_IS_1594_EQ_1594(...)   \,
-#define Z_IS_1594U_EQ_1594(...)  \,
-#define Z_IS_1594_EQ_1594U(...)  \,
-#define Z_IS_1594U_EQ_1594U(...) \,
-#define Z_IS_1595_EQ_1595(...)   \,
-#define Z_IS_1595U_EQ_1595(...)  \,
-#define Z_IS_1595_EQ_1595U(...)  \,
-#define Z_IS_1595U_EQ_1595U(...) \,
-#define Z_IS_1596_EQ_1596(...)   \,
-#define Z_IS_1596U_EQ_1596(...)  \,
-#define Z_IS_1596_EQ_1596U(...)  \,
-#define Z_IS_1596U_EQ_1596U(...) \,
-#define Z_IS_1597_EQ_1597(...)   \,
-#define Z_IS_1597U_EQ_1597(...)  \,
-#define Z_IS_1597_EQ_1597U(...)  \,
-#define Z_IS_1597U_EQ_1597U(...) \,
-#define Z_IS_1598_EQ_1598(...)   \,
-#define Z_IS_1598U_EQ_1598(...)  \,
-#define Z_IS_1598_EQ_1598U(...)  \,
-#define Z_IS_1598U_EQ_1598U(...) \,
-#define Z_IS_1599_EQ_1599(...)   \,
-#define Z_IS_1599U_EQ_1599(...)  \,
-#define Z_IS_1599_EQ_1599U(...)  \,
-#define Z_IS_1599U_EQ_1599U(...) \,
-#define Z_IS_1600_EQ_1600(...)   \,
-#define Z_IS_1600U_EQ_1600(...)  \,
-#define Z_IS_1600_EQ_1600U(...)  \,
-#define Z_IS_1600U_EQ_1600U(...) \,
-#define Z_IS_1601_EQ_1601(...)   \,
-#define Z_IS_1601U_EQ_1601(...)  \,
-#define Z_IS_1601_EQ_1601U(...)  \,
-#define Z_IS_1601U_EQ_1601U(...) \,
-#define Z_IS_1602_EQ_1602(...)   \,
-#define Z_IS_1602U_EQ_1602(...)  \,
-#define Z_IS_1602_EQ_1602U(...)  \,
-#define Z_IS_1602U_EQ_1602U(...) \,
-#define Z_IS_1603_EQ_1603(...)   \,
-#define Z_IS_1603U_EQ_1603(...)  \,
-#define Z_IS_1603_EQ_1603U(...)  \,
-#define Z_IS_1603U_EQ_1603U(...) \,
-#define Z_IS_1604_EQ_1604(...)   \,
-#define Z_IS_1604U_EQ_1604(...)  \,
-#define Z_IS_1604_EQ_1604U(...)  \,
-#define Z_IS_1604U_EQ_1604U(...) \,
-#define Z_IS_1605_EQ_1605(...)   \,
-#define Z_IS_1605U_EQ_1605(...)  \,
-#define Z_IS_1605_EQ_1605U(...)  \,
-#define Z_IS_1605U_EQ_1605U(...) \,
-#define Z_IS_1606_EQ_1606(...)   \,
-#define Z_IS_1606U_EQ_1606(...)  \,
-#define Z_IS_1606_EQ_1606U(...)  \,
-#define Z_IS_1606U_EQ_1606U(...) \,
-#define Z_IS_1607_EQ_1607(...)   \,
-#define Z_IS_1607U_EQ_1607(...)  \,
-#define Z_IS_1607_EQ_1607U(...)  \,
-#define Z_IS_1607U_EQ_1607U(...) \,
-#define Z_IS_1608_EQ_1608(...)   \,
-#define Z_IS_1608U_EQ_1608(...)  \,
-#define Z_IS_1608_EQ_1608U(...)  \,
-#define Z_IS_1608U_EQ_1608U(...) \,
-#define Z_IS_1609_EQ_1609(...)   \,
-#define Z_IS_1609U_EQ_1609(...)  \,
-#define Z_IS_1609_EQ_1609U(...)  \,
-#define Z_IS_1609U_EQ_1609U(...) \,
-#define Z_IS_1610_EQ_1610(...)   \,
-#define Z_IS_1610U_EQ_1610(...)  \,
-#define Z_IS_1610_EQ_1610U(...)  \,
-#define Z_IS_1610U_EQ_1610U(...) \,
-#define Z_IS_1611_EQ_1611(...)   \,
-#define Z_IS_1611U_EQ_1611(...)  \,
-#define Z_IS_1611_EQ_1611U(...)  \,
-#define Z_IS_1611U_EQ_1611U(...) \,
-#define Z_IS_1612_EQ_1612(...)   \,
-#define Z_IS_1612U_EQ_1612(...)  \,
-#define Z_IS_1612_EQ_1612U(...)  \,
-#define Z_IS_1612U_EQ_1612U(...) \,
-#define Z_IS_1613_EQ_1613(...)   \,
-#define Z_IS_1613U_EQ_1613(...)  \,
-#define Z_IS_1613_EQ_1613U(...)  \,
-#define Z_IS_1613U_EQ_1613U(...) \,
-#define Z_IS_1614_EQ_1614(...)   \,
-#define Z_IS_1614U_EQ_1614(...)  \,
-#define Z_IS_1614_EQ_1614U(...)  \,
-#define Z_IS_1614U_EQ_1614U(...) \,
-#define Z_IS_1615_EQ_1615(...)   \,
-#define Z_IS_1615U_EQ_1615(...)  \,
-#define Z_IS_1615_EQ_1615U(...)  \,
-#define Z_IS_1615U_EQ_1615U(...) \,
-#define Z_IS_1616_EQ_1616(...)   \,
-#define Z_IS_1616U_EQ_1616(...)  \,
-#define Z_IS_1616_EQ_1616U(...)  \,
-#define Z_IS_1616U_EQ_1616U(...) \,
-#define Z_IS_1617_EQ_1617(...)   \,
-#define Z_IS_1617U_EQ_1617(...)  \,
-#define Z_IS_1617_EQ_1617U(...)  \,
-#define Z_IS_1617U_EQ_1617U(...) \,
-#define Z_IS_1618_EQ_1618(...)   \,
-#define Z_IS_1618U_EQ_1618(...)  \,
-#define Z_IS_1618_EQ_1618U(...)  \,
-#define Z_IS_1618U_EQ_1618U(...) \,
-#define Z_IS_1619_EQ_1619(...)   \,
-#define Z_IS_1619U_EQ_1619(...)  \,
-#define Z_IS_1619_EQ_1619U(...)  \,
-#define Z_IS_1619U_EQ_1619U(...) \,
-#define Z_IS_1620_EQ_1620(...)   \,
-#define Z_IS_1620U_EQ_1620(...)  \,
-#define Z_IS_1620_EQ_1620U(...)  \,
-#define Z_IS_1620U_EQ_1620U(...) \,
-#define Z_IS_1621_EQ_1621(...)   \,
-#define Z_IS_1621U_EQ_1621(...)  \,
-#define Z_IS_1621_EQ_1621U(...)  \,
-#define Z_IS_1621U_EQ_1621U(...) \,
-#define Z_IS_1622_EQ_1622(...)   \,
-#define Z_IS_1622U_EQ_1622(...)  \,
-#define Z_IS_1622_EQ_1622U(...)  \,
-#define Z_IS_1622U_EQ_1622U(...) \,
-#define Z_IS_1623_EQ_1623(...)   \,
-#define Z_IS_1623U_EQ_1623(...)  \,
-#define Z_IS_1623_EQ_1623U(...)  \,
-#define Z_IS_1623U_EQ_1623U(...) \,
-#define Z_IS_1624_EQ_1624(...)   \,
-#define Z_IS_1624U_EQ_1624(...)  \,
-#define Z_IS_1624_EQ_1624U(...)  \,
-#define Z_IS_1624U_EQ_1624U(...) \,
-#define Z_IS_1625_EQ_1625(...)   \,
-#define Z_IS_1625U_EQ_1625(...)  \,
-#define Z_IS_1625_EQ_1625U(...)  \,
-#define Z_IS_1625U_EQ_1625U(...) \,
-#define Z_IS_1626_EQ_1626(...)   \,
-#define Z_IS_1626U_EQ_1626(...)  \,
-#define Z_IS_1626_EQ_1626U(...)  \,
-#define Z_IS_1626U_EQ_1626U(...) \,
-#define Z_IS_1627_EQ_1627(...)   \,
-#define Z_IS_1627U_EQ_1627(...)  \,
-#define Z_IS_1627_EQ_1627U(...)  \,
-#define Z_IS_1627U_EQ_1627U(...) \,
-#define Z_IS_1628_EQ_1628(...)   \,
-#define Z_IS_1628U_EQ_1628(...)  \,
-#define Z_IS_1628_EQ_1628U(...)  \,
-#define Z_IS_1628U_EQ_1628U(...) \,
-#define Z_IS_1629_EQ_1629(...)   \,
-#define Z_IS_1629U_EQ_1629(...)  \,
-#define Z_IS_1629_EQ_1629U(...)  \,
-#define Z_IS_1629U_EQ_1629U(...) \,
-#define Z_IS_1630_EQ_1630(...)   \,
-#define Z_IS_1630U_EQ_1630(...)  \,
-#define Z_IS_1630_EQ_1630U(...)  \,
-#define Z_IS_1630U_EQ_1630U(...) \,
-#define Z_IS_1631_EQ_1631(...)   \,
-#define Z_IS_1631U_EQ_1631(...)  \,
-#define Z_IS_1631_EQ_1631U(...)  \,
-#define Z_IS_1631U_EQ_1631U(...) \,
-#define Z_IS_1632_EQ_1632(...)   \,
-#define Z_IS_1632U_EQ_1632(...)  \,
-#define Z_IS_1632_EQ_1632U(...)  \,
-#define Z_IS_1632U_EQ_1632U(...) \,
-#define Z_IS_1633_EQ_1633(...)   \,
-#define Z_IS_1633U_EQ_1633(...)  \,
-#define Z_IS_1633_EQ_1633U(...)  \,
-#define Z_IS_1633U_EQ_1633U(...) \,
-#define Z_IS_1634_EQ_1634(...)   \,
-#define Z_IS_1634U_EQ_1634(...)  \,
-#define Z_IS_1634_EQ_1634U(...)  \,
-#define Z_IS_1634U_EQ_1634U(...) \,
-#define Z_IS_1635_EQ_1635(...)   \,
-#define Z_IS_1635U_EQ_1635(...)  \,
-#define Z_IS_1635_EQ_1635U(...)  \,
-#define Z_IS_1635U_EQ_1635U(...) \,
-#define Z_IS_1636_EQ_1636(...)   \,
-#define Z_IS_1636U_EQ_1636(...)  \,
-#define Z_IS_1636_EQ_1636U(...)  \,
-#define Z_IS_1636U_EQ_1636U(...) \,
-#define Z_IS_1637_EQ_1637(...)   \,
-#define Z_IS_1637U_EQ_1637(...)  \,
-#define Z_IS_1637_EQ_1637U(...)  \,
-#define Z_IS_1637U_EQ_1637U(...) \,
-#define Z_IS_1638_EQ_1638(...)   \,
-#define Z_IS_1638U_EQ_1638(...)  \,
-#define Z_IS_1638_EQ_1638U(...)  \,
-#define Z_IS_1638U_EQ_1638U(...) \,
-#define Z_IS_1639_EQ_1639(...)   \,
-#define Z_IS_1639U_EQ_1639(...)  \,
-#define Z_IS_1639_EQ_1639U(...)  \,
-#define Z_IS_1639U_EQ_1639U(...) \,
-#define Z_IS_1640_EQ_1640(...)   \,
-#define Z_IS_1640U_EQ_1640(...)  \,
-#define Z_IS_1640_EQ_1640U(...)  \,
-#define Z_IS_1640U_EQ_1640U(...) \,
-#define Z_IS_1641_EQ_1641(...)   \,
-#define Z_IS_1641U_EQ_1641(...)  \,
-#define Z_IS_1641_EQ_1641U(...)  \,
-#define Z_IS_1641U_EQ_1641U(...) \,
-#define Z_IS_1642_EQ_1642(...)   \,
-#define Z_IS_1642U_EQ_1642(...)  \,
-#define Z_IS_1642_EQ_1642U(...)  \,
-#define Z_IS_1642U_EQ_1642U(...) \,
-#define Z_IS_1643_EQ_1643(...)   \,
-#define Z_IS_1643U_EQ_1643(...)  \,
-#define Z_IS_1643_EQ_1643U(...)  \,
-#define Z_IS_1643U_EQ_1643U(...) \,
-#define Z_IS_1644_EQ_1644(...)   \,
-#define Z_IS_1644U_EQ_1644(...)  \,
-#define Z_IS_1644_EQ_1644U(...)  \,
-#define Z_IS_1644U_EQ_1644U(...) \,
-#define Z_IS_1645_EQ_1645(...)   \,
-#define Z_IS_1645U_EQ_1645(...)  \,
-#define Z_IS_1645_EQ_1645U(...)  \,
-#define Z_IS_1645U_EQ_1645U(...) \,
-#define Z_IS_1646_EQ_1646(...)   \,
-#define Z_IS_1646U_EQ_1646(...)  \,
-#define Z_IS_1646_EQ_1646U(...)  \,
-#define Z_IS_1646U_EQ_1646U(...) \,
-#define Z_IS_1647_EQ_1647(...)   \,
-#define Z_IS_1647U_EQ_1647(...)  \,
-#define Z_IS_1647_EQ_1647U(...)  \,
-#define Z_IS_1647U_EQ_1647U(...) \,
-#define Z_IS_1648_EQ_1648(...)   \,
-#define Z_IS_1648U_EQ_1648(...)  \,
-#define Z_IS_1648_EQ_1648U(...)  \,
-#define Z_IS_1648U_EQ_1648U(...) \,
-#define Z_IS_1649_EQ_1649(...)   \,
-#define Z_IS_1649U_EQ_1649(...)  \,
-#define Z_IS_1649_EQ_1649U(...)  \,
-#define Z_IS_1649U_EQ_1649U(...) \,
-#define Z_IS_1650_EQ_1650(...)   \,
-#define Z_IS_1650U_EQ_1650(...)  \,
-#define Z_IS_1650_EQ_1650U(...)  \,
-#define Z_IS_1650U_EQ_1650U(...) \,
-#define Z_IS_1651_EQ_1651(...)   \,
-#define Z_IS_1651U_EQ_1651(...)  \,
-#define Z_IS_1651_EQ_1651U(...)  \,
-#define Z_IS_1651U_EQ_1651U(...) \,
-#define Z_IS_1652_EQ_1652(...)   \,
-#define Z_IS_1652U_EQ_1652(...)  \,
-#define Z_IS_1652_EQ_1652U(...)  \,
-#define Z_IS_1652U_EQ_1652U(...) \,
-#define Z_IS_1653_EQ_1653(...)   \,
-#define Z_IS_1653U_EQ_1653(...)  \,
-#define Z_IS_1653_EQ_1653U(...)  \,
-#define Z_IS_1653U_EQ_1653U(...) \,
-#define Z_IS_1654_EQ_1654(...)   \,
-#define Z_IS_1654U_EQ_1654(...)  \,
-#define Z_IS_1654_EQ_1654U(...)  \,
-#define Z_IS_1654U_EQ_1654U(...) \,
-#define Z_IS_1655_EQ_1655(...)   \,
-#define Z_IS_1655U_EQ_1655(...)  \,
-#define Z_IS_1655_EQ_1655U(...)  \,
-#define Z_IS_1655U_EQ_1655U(...) \,
-#define Z_IS_1656_EQ_1656(...)   \,
-#define Z_IS_1656U_EQ_1656(...)  \,
-#define Z_IS_1656_EQ_1656U(...)  \,
-#define Z_IS_1656U_EQ_1656U(...) \,
-#define Z_IS_1657_EQ_1657(...)   \,
-#define Z_IS_1657U_EQ_1657(...)  \,
-#define Z_IS_1657_EQ_1657U(...)  \,
-#define Z_IS_1657U_EQ_1657U(...) \,
-#define Z_IS_1658_EQ_1658(...)   \,
-#define Z_IS_1658U_EQ_1658(...)  \,
-#define Z_IS_1658_EQ_1658U(...)  \,
-#define Z_IS_1658U_EQ_1658U(...) \,
-#define Z_IS_1659_EQ_1659(...)   \,
-#define Z_IS_1659U_EQ_1659(...)  \,
-#define Z_IS_1659_EQ_1659U(...)  \,
-#define Z_IS_1659U_EQ_1659U(...) \,
-#define Z_IS_1660_EQ_1660(...)   \,
-#define Z_IS_1660U_EQ_1660(...)  \,
-#define Z_IS_1660_EQ_1660U(...)  \,
-#define Z_IS_1660U_EQ_1660U(...) \,
-#define Z_IS_1661_EQ_1661(...)   \,
-#define Z_IS_1661U_EQ_1661(...)  \,
-#define Z_IS_1661_EQ_1661U(...)  \,
-#define Z_IS_1661U_EQ_1661U(...) \,
-#define Z_IS_1662_EQ_1662(...)   \,
-#define Z_IS_1662U_EQ_1662(...)  \,
-#define Z_IS_1662_EQ_1662U(...)  \,
-#define Z_IS_1662U_EQ_1662U(...) \,
-#define Z_IS_1663_EQ_1663(...)   \,
-#define Z_IS_1663U_EQ_1663(...)  \,
-#define Z_IS_1663_EQ_1663U(...)  \,
-#define Z_IS_1663U_EQ_1663U(...) \,
-#define Z_IS_1664_EQ_1664(...)   \,
-#define Z_IS_1664U_EQ_1664(...)  \,
-#define Z_IS_1664_EQ_1664U(...)  \,
-#define Z_IS_1664U_EQ_1664U(...) \,
-#define Z_IS_1665_EQ_1665(...)   \,
-#define Z_IS_1665U_EQ_1665(...)  \,
-#define Z_IS_1665_EQ_1665U(...)  \,
-#define Z_IS_1665U_EQ_1665U(...) \,
-#define Z_IS_1666_EQ_1666(...)   \,
-#define Z_IS_1666U_EQ_1666(...)  \,
-#define Z_IS_1666_EQ_1666U(...)  \,
-#define Z_IS_1666U_EQ_1666U(...) \,
-#define Z_IS_1667_EQ_1667(...)   \,
-#define Z_IS_1667U_EQ_1667(...)  \,
-#define Z_IS_1667_EQ_1667U(...)  \,
-#define Z_IS_1667U_EQ_1667U(...) \,
-#define Z_IS_1668_EQ_1668(...)   \,
-#define Z_IS_1668U_EQ_1668(...)  \,
-#define Z_IS_1668_EQ_1668U(...)  \,
-#define Z_IS_1668U_EQ_1668U(...) \,
-#define Z_IS_1669_EQ_1669(...)   \,
-#define Z_IS_1669U_EQ_1669(...)  \,
-#define Z_IS_1669_EQ_1669U(...)  \,
-#define Z_IS_1669U_EQ_1669U(...) \,
-#define Z_IS_1670_EQ_1670(...)   \,
-#define Z_IS_1670U_EQ_1670(...)  \,
-#define Z_IS_1670_EQ_1670U(...)  \,
-#define Z_IS_1670U_EQ_1670U(...) \,
-#define Z_IS_1671_EQ_1671(...)   \,
-#define Z_IS_1671U_EQ_1671(...)  \,
-#define Z_IS_1671_EQ_1671U(...)  \,
-#define Z_IS_1671U_EQ_1671U(...) \,
-#define Z_IS_1672_EQ_1672(...)   \,
-#define Z_IS_1672U_EQ_1672(...)  \,
-#define Z_IS_1672_EQ_1672U(...)  \,
-#define Z_IS_1672U_EQ_1672U(...) \,
-#define Z_IS_1673_EQ_1673(...)   \,
-#define Z_IS_1673U_EQ_1673(...)  \,
-#define Z_IS_1673_EQ_1673U(...)  \,
-#define Z_IS_1673U_EQ_1673U(...) \,
-#define Z_IS_1674_EQ_1674(...)   \,
-#define Z_IS_1674U_EQ_1674(...)  \,
-#define Z_IS_1674_EQ_1674U(...)  \,
-#define Z_IS_1674U_EQ_1674U(...) \,
-#define Z_IS_1675_EQ_1675(...)   \,
-#define Z_IS_1675U_EQ_1675(...)  \,
-#define Z_IS_1675_EQ_1675U(...)  \,
-#define Z_IS_1675U_EQ_1675U(...) \,
-#define Z_IS_1676_EQ_1676(...)   \,
-#define Z_IS_1676U_EQ_1676(...)  \,
-#define Z_IS_1676_EQ_1676U(...)  \,
-#define Z_IS_1676U_EQ_1676U(...) \,
-#define Z_IS_1677_EQ_1677(...)   \,
-#define Z_IS_1677U_EQ_1677(...)  \,
-#define Z_IS_1677_EQ_1677U(...)  \,
-#define Z_IS_1677U_EQ_1677U(...) \,
-#define Z_IS_1678_EQ_1678(...)   \,
-#define Z_IS_1678U_EQ_1678(...)  \,
-#define Z_IS_1678_EQ_1678U(...)  \,
-#define Z_IS_1678U_EQ_1678U(...) \,
-#define Z_IS_1679_EQ_1679(...)   \,
-#define Z_IS_1679U_EQ_1679(...)  \,
-#define Z_IS_1679_EQ_1679U(...)  \,
-#define Z_IS_1679U_EQ_1679U(...) \,
-#define Z_IS_1680_EQ_1680(...)   \,
-#define Z_IS_1680U_EQ_1680(...)  \,
-#define Z_IS_1680_EQ_1680U(...)  \,
-#define Z_IS_1680U_EQ_1680U(...) \,
-#define Z_IS_1681_EQ_1681(...)   \,
-#define Z_IS_1681U_EQ_1681(...)  \,
-#define Z_IS_1681_EQ_1681U(...)  \,
-#define Z_IS_1681U_EQ_1681U(...) \,
-#define Z_IS_1682_EQ_1682(...)   \,
-#define Z_IS_1682U_EQ_1682(...)  \,
-#define Z_IS_1682_EQ_1682U(...)  \,
-#define Z_IS_1682U_EQ_1682U(...) \,
-#define Z_IS_1683_EQ_1683(...)   \,
-#define Z_IS_1683U_EQ_1683(...)  \,
-#define Z_IS_1683_EQ_1683U(...)  \,
-#define Z_IS_1683U_EQ_1683U(...) \,
-#define Z_IS_1684_EQ_1684(...)   \,
-#define Z_IS_1684U_EQ_1684(...)  \,
-#define Z_IS_1684_EQ_1684U(...)  \,
-#define Z_IS_1684U_EQ_1684U(...) \,
-#define Z_IS_1685_EQ_1685(...)   \,
-#define Z_IS_1685U_EQ_1685(...)  \,
-#define Z_IS_1685_EQ_1685U(...)  \,
-#define Z_IS_1685U_EQ_1685U(...) \,
-#define Z_IS_1686_EQ_1686(...)   \,
-#define Z_IS_1686U_EQ_1686(...)  \,
-#define Z_IS_1686_EQ_1686U(...)  \,
-#define Z_IS_1686U_EQ_1686U(...) \,
-#define Z_IS_1687_EQ_1687(...)   \,
-#define Z_IS_1687U_EQ_1687(...)  \,
-#define Z_IS_1687_EQ_1687U(...)  \,
-#define Z_IS_1687U_EQ_1687U(...) \,
-#define Z_IS_1688_EQ_1688(...)   \,
-#define Z_IS_1688U_EQ_1688(...)  \,
-#define Z_IS_1688_EQ_1688U(...)  \,
-#define Z_IS_1688U_EQ_1688U(...) \,
-#define Z_IS_1689_EQ_1689(...)   \,
-#define Z_IS_1689U_EQ_1689(...)  \,
-#define Z_IS_1689_EQ_1689U(...)  \,
-#define Z_IS_1689U_EQ_1689U(...) \,
-#define Z_IS_1690_EQ_1690(...)   \,
-#define Z_IS_1690U_EQ_1690(...)  \,
-#define Z_IS_1690_EQ_1690U(...)  \,
-#define Z_IS_1690U_EQ_1690U(...) \,
-#define Z_IS_1691_EQ_1691(...)   \,
-#define Z_IS_1691U_EQ_1691(...)  \,
-#define Z_IS_1691_EQ_1691U(...)  \,
-#define Z_IS_1691U_EQ_1691U(...) \,
-#define Z_IS_1692_EQ_1692(...)   \,
-#define Z_IS_1692U_EQ_1692(...)  \,
-#define Z_IS_1692_EQ_1692U(...)  \,
-#define Z_IS_1692U_EQ_1692U(...) \,
-#define Z_IS_1693_EQ_1693(...)   \,
-#define Z_IS_1693U_EQ_1693(...)  \,
-#define Z_IS_1693_EQ_1693U(...)  \,
-#define Z_IS_1693U_EQ_1693U(...) \,
-#define Z_IS_1694_EQ_1694(...)   \,
-#define Z_IS_1694U_EQ_1694(...)  \,
-#define Z_IS_1694_EQ_1694U(...)  \,
-#define Z_IS_1694U_EQ_1694U(...) \,
-#define Z_IS_1695_EQ_1695(...)   \,
-#define Z_IS_1695U_EQ_1695(...)  \,
-#define Z_IS_1695_EQ_1695U(...)  \,
-#define Z_IS_1695U_EQ_1695U(...) \,
-#define Z_IS_1696_EQ_1696(...)   \,
-#define Z_IS_1696U_EQ_1696(...)  \,
-#define Z_IS_1696_EQ_1696U(...)  \,
-#define Z_IS_1696U_EQ_1696U(...) \,
-#define Z_IS_1697_EQ_1697(...)   \,
-#define Z_IS_1697U_EQ_1697(...)  \,
-#define Z_IS_1697_EQ_1697U(...)  \,
-#define Z_IS_1697U_EQ_1697U(...) \,
-#define Z_IS_1698_EQ_1698(...)   \,
-#define Z_IS_1698U_EQ_1698(...)  \,
-#define Z_IS_1698_EQ_1698U(...)  \,
-#define Z_IS_1698U_EQ_1698U(...) \,
-#define Z_IS_1699_EQ_1699(...)   \,
-#define Z_IS_1699U_EQ_1699(...)  \,
-#define Z_IS_1699_EQ_1699U(...)  \,
-#define Z_IS_1699U_EQ_1699U(...) \,
-#define Z_IS_1700_EQ_1700(...)   \,
-#define Z_IS_1700U_EQ_1700(...)  \,
-#define Z_IS_1700_EQ_1700U(...)  \,
-#define Z_IS_1700U_EQ_1700U(...) \,
-#define Z_IS_1701_EQ_1701(...)   \,
-#define Z_IS_1701U_EQ_1701(...)  \,
-#define Z_IS_1701_EQ_1701U(...)  \,
-#define Z_IS_1701U_EQ_1701U(...) \,
-#define Z_IS_1702_EQ_1702(...)   \,
-#define Z_IS_1702U_EQ_1702(...)  \,
-#define Z_IS_1702_EQ_1702U(...)  \,
-#define Z_IS_1702U_EQ_1702U(...) \,
-#define Z_IS_1703_EQ_1703(...)   \,
-#define Z_IS_1703U_EQ_1703(...)  \,
-#define Z_IS_1703_EQ_1703U(...)  \,
-#define Z_IS_1703U_EQ_1703U(...) \,
-#define Z_IS_1704_EQ_1704(...)   \,
-#define Z_IS_1704U_EQ_1704(...)  \,
-#define Z_IS_1704_EQ_1704U(...)  \,
-#define Z_IS_1704U_EQ_1704U(...) \,
-#define Z_IS_1705_EQ_1705(...)   \,
-#define Z_IS_1705U_EQ_1705(...)  \,
-#define Z_IS_1705_EQ_1705U(...)  \,
-#define Z_IS_1705U_EQ_1705U(...) \,
-#define Z_IS_1706_EQ_1706(...)   \,
-#define Z_IS_1706U_EQ_1706(...)  \,
-#define Z_IS_1706_EQ_1706U(...)  \,
-#define Z_IS_1706U_EQ_1706U(...) \,
-#define Z_IS_1707_EQ_1707(...)   \,
-#define Z_IS_1707U_EQ_1707(...)  \,
-#define Z_IS_1707_EQ_1707U(...)  \,
-#define Z_IS_1707U_EQ_1707U(...) \,
-#define Z_IS_1708_EQ_1708(...)   \,
-#define Z_IS_1708U_EQ_1708(...)  \,
-#define Z_IS_1708_EQ_1708U(...)  \,
-#define Z_IS_1708U_EQ_1708U(...) \,
-#define Z_IS_1709_EQ_1709(...)   \,
-#define Z_IS_1709U_EQ_1709(...)  \,
-#define Z_IS_1709_EQ_1709U(...)  \,
-#define Z_IS_1709U_EQ_1709U(...) \,
-#define Z_IS_1710_EQ_1710(...)   \,
-#define Z_IS_1710U_EQ_1710(...)  \,
-#define Z_IS_1710_EQ_1710U(...)  \,
-#define Z_IS_1710U_EQ_1710U(...) \,
-#define Z_IS_1711_EQ_1711(...)   \,
-#define Z_IS_1711U_EQ_1711(...)  \,
-#define Z_IS_1711_EQ_1711U(...)  \,
-#define Z_IS_1711U_EQ_1711U(...) \,
-#define Z_IS_1712_EQ_1712(...)   \,
-#define Z_IS_1712U_EQ_1712(...)  \,
-#define Z_IS_1712_EQ_1712U(...)  \,
-#define Z_IS_1712U_EQ_1712U(...) \,
-#define Z_IS_1713_EQ_1713(...)   \,
-#define Z_IS_1713U_EQ_1713(...)  \,
-#define Z_IS_1713_EQ_1713U(...)  \,
-#define Z_IS_1713U_EQ_1713U(...) \,
-#define Z_IS_1714_EQ_1714(...)   \,
-#define Z_IS_1714U_EQ_1714(...)  \,
-#define Z_IS_1714_EQ_1714U(...)  \,
-#define Z_IS_1714U_EQ_1714U(...) \,
-#define Z_IS_1715_EQ_1715(...)   \,
-#define Z_IS_1715U_EQ_1715(...)  \,
-#define Z_IS_1715_EQ_1715U(...)  \,
-#define Z_IS_1715U_EQ_1715U(...) \,
-#define Z_IS_1716_EQ_1716(...)   \,
-#define Z_IS_1716U_EQ_1716(...)  \,
-#define Z_IS_1716_EQ_1716U(...)  \,
-#define Z_IS_1716U_EQ_1716U(...) \,
-#define Z_IS_1717_EQ_1717(...)   \,
-#define Z_IS_1717U_EQ_1717(...)  \,
-#define Z_IS_1717_EQ_1717U(...)  \,
-#define Z_IS_1717U_EQ_1717U(...) \,
-#define Z_IS_1718_EQ_1718(...)   \,
-#define Z_IS_1718U_EQ_1718(...)  \,
-#define Z_IS_1718_EQ_1718U(...)  \,
-#define Z_IS_1718U_EQ_1718U(...) \,
-#define Z_IS_1719_EQ_1719(...)   \,
-#define Z_IS_1719U_EQ_1719(...)  \,
-#define Z_IS_1719_EQ_1719U(...)  \,
-#define Z_IS_1719U_EQ_1719U(...) \,
-#define Z_IS_1720_EQ_1720(...)   \,
-#define Z_IS_1720U_EQ_1720(...)  \,
-#define Z_IS_1720_EQ_1720U(...)  \,
-#define Z_IS_1720U_EQ_1720U(...) \,
-#define Z_IS_1721_EQ_1721(...)   \,
-#define Z_IS_1721U_EQ_1721(...)  \,
-#define Z_IS_1721_EQ_1721U(...)  \,
-#define Z_IS_1721U_EQ_1721U(...) \,
-#define Z_IS_1722_EQ_1722(...)   \,
-#define Z_IS_1722U_EQ_1722(...)  \,
-#define Z_IS_1722_EQ_1722U(...)  \,
-#define Z_IS_1722U_EQ_1722U(...) \,
-#define Z_IS_1723_EQ_1723(...)   \,
-#define Z_IS_1723U_EQ_1723(...)  \,
-#define Z_IS_1723_EQ_1723U(...)  \,
-#define Z_IS_1723U_EQ_1723U(...) \,
-#define Z_IS_1724_EQ_1724(...)   \,
-#define Z_IS_1724U_EQ_1724(...)  \,
-#define Z_IS_1724_EQ_1724U(...)  \,
-#define Z_IS_1724U_EQ_1724U(...) \,
-#define Z_IS_1725_EQ_1725(...)   \,
-#define Z_IS_1725U_EQ_1725(...)  \,
-#define Z_IS_1725_EQ_1725U(...)  \,
-#define Z_IS_1725U_EQ_1725U(...) \,
-#define Z_IS_1726_EQ_1726(...)   \,
-#define Z_IS_1726U_EQ_1726(...)  \,
-#define Z_IS_1726_EQ_1726U(...)  \,
-#define Z_IS_1726U_EQ_1726U(...) \,
-#define Z_IS_1727_EQ_1727(...)   \,
-#define Z_IS_1727U_EQ_1727(...)  \,
-#define Z_IS_1727_EQ_1727U(...)  \,
-#define Z_IS_1727U_EQ_1727U(...) \,
-#define Z_IS_1728_EQ_1728(...)   \,
-#define Z_IS_1728U_EQ_1728(...)  \,
-#define Z_IS_1728_EQ_1728U(...)  \,
-#define Z_IS_1728U_EQ_1728U(...) \,
-#define Z_IS_1729_EQ_1729(...)   \,
-#define Z_IS_1729U_EQ_1729(...)  \,
-#define Z_IS_1729_EQ_1729U(...)  \,
-#define Z_IS_1729U_EQ_1729U(...) \,
-#define Z_IS_1730_EQ_1730(...)   \,
-#define Z_IS_1730U_EQ_1730(...)  \,
-#define Z_IS_1730_EQ_1730U(...)  \,
-#define Z_IS_1730U_EQ_1730U(...) \,
-#define Z_IS_1731_EQ_1731(...)   \,
-#define Z_IS_1731U_EQ_1731(...)  \,
-#define Z_IS_1731_EQ_1731U(...)  \,
-#define Z_IS_1731U_EQ_1731U(...) \,
-#define Z_IS_1732_EQ_1732(...)   \,
-#define Z_IS_1732U_EQ_1732(...)  \,
-#define Z_IS_1732_EQ_1732U(...)  \,
-#define Z_IS_1732U_EQ_1732U(...) \,
-#define Z_IS_1733_EQ_1733(...)   \,
-#define Z_IS_1733U_EQ_1733(...)  \,
-#define Z_IS_1733_EQ_1733U(...)  \,
-#define Z_IS_1733U_EQ_1733U(...) \,
-#define Z_IS_1734_EQ_1734(...)   \,
-#define Z_IS_1734U_EQ_1734(...)  \,
-#define Z_IS_1734_EQ_1734U(...)  \,
-#define Z_IS_1734U_EQ_1734U(...) \,
-#define Z_IS_1735_EQ_1735(...)   \,
-#define Z_IS_1735U_EQ_1735(...)  \,
-#define Z_IS_1735_EQ_1735U(...)  \,
-#define Z_IS_1735U_EQ_1735U(...) \,
-#define Z_IS_1736_EQ_1736(...)   \,
-#define Z_IS_1736U_EQ_1736(...)  \,
-#define Z_IS_1736_EQ_1736U(...)  \,
-#define Z_IS_1736U_EQ_1736U(...) \,
-#define Z_IS_1737_EQ_1737(...)   \,
-#define Z_IS_1737U_EQ_1737(...)  \,
-#define Z_IS_1737_EQ_1737U(...)  \,
-#define Z_IS_1737U_EQ_1737U(...) \,
-#define Z_IS_1738_EQ_1738(...)   \,
-#define Z_IS_1738U_EQ_1738(...)  \,
-#define Z_IS_1738_EQ_1738U(...)  \,
-#define Z_IS_1738U_EQ_1738U(...) \,
-#define Z_IS_1739_EQ_1739(...)   \,
-#define Z_IS_1739U_EQ_1739(...)  \,
-#define Z_IS_1739_EQ_1739U(...)  \,
-#define Z_IS_1739U_EQ_1739U(...) \,
-#define Z_IS_1740_EQ_1740(...)   \,
-#define Z_IS_1740U_EQ_1740(...)  \,
-#define Z_IS_1740_EQ_1740U(...)  \,
-#define Z_IS_1740U_EQ_1740U(...) \,
-#define Z_IS_1741_EQ_1741(...)   \,
-#define Z_IS_1741U_EQ_1741(...)  \,
-#define Z_IS_1741_EQ_1741U(...)  \,
-#define Z_IS_1741U_EQ_1741U(...) \,
-#define Z_IS_1742_EQ_1742(...)   \,
-#define Z_IS_1742U_EQ_1742(...)  \,
-#define Z_IS_1742_EQ_1742U(...)  \,
-#define Z_IS_1742U_EQ_1742U(...) \,
-#define Z_IS_1743_EQ_1743(...)   \,
-#define Z_IS_1743U_EQ_1743(...)  \,
-#define Z_IS_1743_EQ_1743U(...)  \,
-#define Z_IS_1743U_EQ_1743U(...) \,
-#define Z_IS_1744_EQ_1744(...)   \,
-#define Z_IS_1744U_EQ_1744(...)  \,
-#define Z_IS_1744_EQ_1744U(...)  \,
-#define Z_IS_1744U_EQ_1744U(...) \,
-#define Z_IS_1745_EQ_1745(...)   \,
-#define Z_IS_1745U_EQ_1745(...)  \,
-#define Z_IS_1745_EQ_1745U(...)  \,
-#define Z_IS_1745U_EQ_1745U(...) \,
-#define Z_IS_1746_EQ_1746(...)   \,
-#define Z_IS_1746U_EQ_1746(...)  \,
-#define Z_IS_1746_EQ_1746U(...)  \,
-#define Z_IS_1746U_EQ_1746U(...) \,
-#define Z_IS_1747_EQ_1747(...)   \,
-#define Z_IS_1747U_EQ_1747(...)  \,
-#define Z_IS_1747_EQ_1747U(...)  \,
-#define Z_IS_1747U_EQ_1747U(...) \,
-#define Z_IS_1748_EQ_1748(...)   \,
-#define Z_IS_1748U_EQ_1748(...)  \,
-#define Z_IS_1748_EQ_1748U(...)  \,
-#define Z_IS_1748U_EQ_1748U(...) \,
-#define Z_IS_1749_EQ_1749(...)   \,
-#define Z_IS_1749U_EQ_1749(...)  \,
-#define Z_IS_1749_EQ_1749U(...)  \,
-#define Z_IS_1749U_EQ_1749U(...) \,
-#define Z_IS_1750_EQ_1750(...)   \,
-#define Z_IS_1750U_EQ_1750(...)  \,
-#define Z_IS_1750_EQ_1750U(...)  \,
-#define Z_IS_1750U_EQ_1750U(...) \,
-#define Z_IS_1751_EQ_1751(...)   \,
-#define Z_IS_1751U_EQ_1751(...)  \,
-#define Z_IS_1751_EQ_1751U(...)  \,
-#define Z_IS_1751U_EQ_1751U(...) \,
-#define Z_IS_1752_EQ_1752(...)   \,
-#define Z_IS_1752U_EQ_1752(...)  \,
-#define Z_IS_1752_EQ_1752U(...)  \,
-#define Z_IS_1752U_EQ_1752U(...) \,
-#define Z_IS_1753_EQ_1753(...)   \,
-#define Z_IS_1753U_EQ_1753(...)  \,
-#define Z_IS_1753_EQ_1753U(...)  \,
-#define Z_IS_1753U_EQ_1753U(...) \,
-#define Z_IS_1754_EQ_1754(...)   \,
-#define Z_IS_1754U_EQ_1754(...)  \,
-#define Z_IS_1754_EQ_1754U(...)  \,
-#define Z_IS_1754U_EQ_1754U(...) \,
-#define Z_IS_1755_EQ_1755(...)   \,
-#define Z_IS_1755U_EQ_1755(...)  \,
-#define Z_IS_1755_EQ_1755U(...)  \,
-#define Z_IS_1755U_EQ_1755U(...) \,
-#define Z_IS_1756_EQ_1756(...)   \,
-#define Z_IS_1756U_EQ_1756(...)  \,
-#define Z_IS_1756_EQ_1756U(...)  \,
-#define Z_IS_1756U_EQ_1756U(...) \,
-#define Z_IS_1757_EQ_1757(...)   \,
-#define Z_IS_1757U_EQ_1757(...)  \,
-#define Z_IS_1757_EQ_1757U(...)  \,
-#define Z_IS_1757U_EQ_1757U(...) \,
-#define Z_IS_1758_EQ_1758(...)   \,
-#define Z_IS_1758U_EQ_1758(...)  \,
-#define Z_IS_1758_EQ_1758U(...)  \,
-#define Z_IS_1758U_EQ_1758U(...) \,
-#define Z_IS_1759_EQ_1759(...)   \,
-#define Z_IS_1759U_EQ_1759(...)  \,
-#define Z_IS_1759_EQ_1759U(...)  \,
-#define Z_IS_1759U_EQ_1759U(...) \,
-#define Z_IS_1760_EQ_1760(...)   \,
-#define Z_IS_1760U_EQ_1760(...)  \,
-#define Z_IS_1760_EQ_1760U(...)  \,
-#define Z_IS_1760U_EQ_1760U(...) \,
-#define Z_IS_1761_EQ_1761(...)   \,
-#define Z_IS_1761U_EQ_1761(...)  \,
-#define Z_IS_1761_EQ_1761U(...)  \,
-#define Z_IS_1761U_EQ_1761U(...) \,
-#define Z_IS_1762_EQ_1762(...)   \,
-#define Z_IS_1762U_EQ_1762(...)  \,
-#define Z_IS_1762_EQ_1762U(...)  \,
-#define Z_IS_1762U_EQ_1762U(...) \,
-#define Z_IS_1763_EQ_1763(...)   \,
-#define Z_IS_1763U_EQ_1763(...)  \,
-#define Z_IS_1763_EQ_1763U(...)  \,
-#define Z_IS_1763U_EQ_1763U(...) \,
-#define Z_IS_1764_EQ_1764(...)   \,
-#define Z_IS_1764U_EQ_1764(...)  \,
-#define Z_IS_1764_EQ_1764U(...)  \,
-#define Z_IS_1764U_EQ_1764U(...) \,
-#define Z_IS_1765_EQ_1765(...)   \,
-#define Z_IS_1765U_EQ_1765(...)  \,
-#define Z_IS_1765_EQ_1765U(...)  \,
-#define Z_IS_1765U_EQ_1765U(...) \,
-#define Z_IS_1766_EQ_1766(...)   \,
-#define Z_IS_1766U_EQ_1766(...)  \,
-#define Z_IS_1766_EQ_1766U(...)  \,
-#define Z_IS_1766U_EQ_1766U(...) \,
-#define Z_IS_1767_EQ_1767(...)   \,
-#define Z_IS_1767U_EQ_1767(...)  \,
-#define Z_IS_1767_EQ_1767U(...)  \,
-#define Z_IS_1767U_EQ_1767U(...) \,
-#define Z_IS_1768_EQ_1768(...)   \,
-#define Z_IS_1768U_EQ_1768(...)  \,
-#define Z_IS_1768_EQ_1768U(...)  \,
-#define Z_IS_1768U_EQ_1768U(...) \,
-#define Z_IS_1769_EQ_1769(...)   \,
-#define Z_IS_1769U_EQ_1769(...)  \,
-#define Z_IS_1769_EQ_1769U(...)  \,
-#define Z_IS_1769U_EQ_1769U(...) \,
-#define Z_IS_1770_EQ_1770(...)   \,
-#define Z_IS_1770U_EQ_1770(...)  \,
-#define Z_IS_1770_EQ_1770U(...)  \,
-#define Z_IS_1770U_EQ_1770U(...) \,
-#define Z_IS_1771_EQ_1771(...)   \,
-#define Z_IS_1771U_EQ_1771(...)  \,
-#define Z_IS_1771_EQ_1771U(...)  \,
-#define Z_IS_1771U_EQ_1771U(...) \,
-#define Z_IS_1772_EQ_1772(...)   \,
-#define Z_IS_1772U_EQ_1772(...)  \,
-#define Z_IS_1772_EQ_1772U(...)  \,
-#define Z_IS_1772U_EQ_1772U(...) \,
-#define Z_IS_1773_EQ_1773(...)   \,
-#define Z_IS_1773U_EQ_1773(...)  \,
-#define Z_IS_1773_EQ_1773U(...)  \,
-#define Z_IS_1773U_EQ_1773U(...) \,
-#define Z_IS_1774_EQ_1774(...)   \,
-#define Z_IS_1774U_EQ_1774(...)  \,
-#define Z_IS_1774_EQ_1774U(...)  \,
-#define Z_IS_1774U_EQ_1774U(...) \,
-#define Z_IS_1775_EQ_1775(...)   \,
-#define Z_IS_1775U_EQ_1775(...)  \,
-#define Z_IS_1775_EQ_1775U(...)  \,
-#define Z_IS_1775U_EQ_1775U(...) \,
-#define Z_IS_1776_EQ_1776(...)   \,
-#define Z_IS_1776U_EQ_1776(...)  \,
-#define Z_IS_1776_EQ_1776U(...)  \,
-#define Z_IS_1776U_EQ_1776U(...) \,
-#define Z_IS_1777_EQ_1777(...)   \,
-#define Z_IS_1777U_EQ_1777(...)  \,
-#define Z_IS_1777_EQ_1777U(...)  \,
-#define Z_IS_1777U_EQ_1777U(...) \,
-#define Z_IS_1778_EQ_1778(...)   \,
-#define Z_IS_1778U_EQ_1778(...)  \,
-#define Z_IS_1778_EQ_1778U(...)  \,
-#define Z_IS_1778U_EQ_1778U(...) \,
-#define Z_IS_1779_EQ_1779(...)   \,
-#define Z_IS_1779U_EQ_1779(...)  \,
-#define Z_IS_1779_EQ_1779U(...)  \,
-#define Z_IS_1779U_EQ_1779U(...) \,
-#define Z_IS_1780_EQ_1780(...)   \,
-#define Z_IS_1780U_EQ_1780(...)  \,
-#define Z_IS_1780_EQ_1780U(...)  \,
-#define Z_IS_1780U_EQ_1780U(...) \,
-#define Z_IS_1781_EQ_1781(...)   \,
-#define Z_IS_1781U_EQ_1781(...)  \,
-#define Z_IS_1781_EQ_1781U(...)  \,
-#define Z_IS_1781U_EQ_1781U(...) \,
-#define Z_IS_1782_EQ_1782(...)   \,
-#define Z_IS_1782U_EQ_1782(...)  \,
-#define Z_IS_1782_EQ_1782U(...)  \,
-#define Z_IS_1782U_EQ_1782U(...) \,
-#define Z_IS_1783_EQ_1783(...)   \,
-#define Z_IS_1783U_EQ_1783(...)  \,
-#define Z_IS_1783_EQ_1783U(...)  \,
-#define Z_IS_1783U_EQ_1783U(...) \,
-#define Z_IS_1784_EQ_1784(...)   \,
-#define Z_IS_1784U_EQ_1784(...)  \,
-#define Z_IS_1784_EQ_1784U(...)  \,
-#define Z_IS_1784U_EQ_1784U(...) \,
-#define Z_IS_1785_EQ_1785(...)   \,
-#define Z_IS_1785U_EQ_1785(...)  \,
-#define Z_IS_1785_EQ_1785U(...)  \,
-#define Z_IS_1785U_EQ_1785U(...) \,
-#define Z_IS_1786_EQ_1786(...)   \,
-#define Z_IS_1786U_EQ_1786(...)  \,
-#define Z_IS_1786_EQ_1786U(...)  \,
-#define Z_IS_1786U_EQ_1786U(...) \,
-#define Z_IS_1787_EQ_1787(...)   \,
-#define Z_IS_1787U_EQ_1787(...)  \,
-#define Z_IS_1787_EQ_1787U(...)  \,
-#define Z_IS_1787U_EQ_1787U(...) \,
-#define Z_IS_1788_EQ_1788(...)   \,
-#define Z_IS_1788U_EQ_1788(...)  \,
-#define Z_IS_1788_EQ_1788U(...)  \,
-#define Z_IS_1788U_EQ_1788U(...) \,
-#define Z_IS_1789_EQ_1789(...)   \,
-#define Z_IS_1789U_EQ_1789(...)  \,
-#define Z_IS_1789_EQ_1789U(...)  \,
-#define Z_IS_1789U_EQ_1789U(...) \,
-#define Z_IS_1790_EQ_1790(...)   \,
-#define Z_IS_1790U_EQ_1790(...)  \,
-#define Z_IS_1790_EQ_1790U(...)  \,
-#define Z_IS_1790U_EQ_1790U(...) \,
-#define Z_IS_1791_EQ_1791(...)   \,
-#define Z_IS_1791U_EQ_1791(...)  \,
-#define Z_IS_1791_EQ_1791U(...)  \,
-#define Z_IS_1791U_EQ_1791U(...) \,
-#define Z_IS_1792_EQ_1792(...)   \,
-#define Z_IS_1792U_EQ_1792(...)  \,
-#define Z_IS_1792_EQ_1792U(...)  \,
-#define Z_IS_1792U_EQ_1792U(...) \,
-#define Z_IS_1793_EQ_1793(...)   \,
-#define Z_IS_1793U_EQ_1793(...)  \,
-#define Z_IS_1793_EQ_1793U(...)  \,
-#define Z_IS_1793U_EQ_1793U(...) \,
-#define Z_IS_1794_EQ_1794(...)   \,
-#define Z_IS_1794U_EQ_1794(...)  \,
-#define Z_IS_1794_EQ_1794U(...)  \,
-#define Z_IS_1794U_EQ_1794U(...) \,
-#define Z_IS_1795_EQ_1795(...)   \,
-#define Z_IS_1795U_EQ_1795(...)  \,
-#define Z_IS_1795_EQ_1795U(...)  \,
-#define Z_IS_1795U_EQ_1795U(...) \,
-#define Z_IS_1796_EQ_1796(...)   \,
-#define Z_IS_1796U_EQ_1796(...)  \,
-#define Z_IS_1796_EQ_1796U(...)  \,
-#define Z_IS_1796U_EQ_1796U(...) \,
-#define Z_IS_1797_EQ_1797(...)   \,
-#define Z_IS_1797U_EQ_1797(...)  \,
-#define Z_IS_1797_EQ_1797U(...)  \,
-#define Z_IS_1797U_EQ_1797U(...) \,
-#define Z_IS_1798_EQ_1798(...)   \,
-#define Z_IS_1798U_EQ_1798(...)  \,
-#define Z_IS_1798_EQ_1798U(...)  \,
-#define Z_IS_1798U_EQ_1798U(...) \,
-#define Z_IS_1799_EQ_1799(...)   \,
-#define Z_IS_1799U_EQ_1799(...)  \,
-#define Z_IS_1799_EQ_1799U(...)  \,
-#define Z_IS_1799U_EQ_1799U(...) \,
-#define Z_IS_1800_EQ_1800(...)   \,
-#define Z_IS_1800U_EQ_1800(...)  \,
-#define Z_IS_1800_EQ_1800U(...)  \,
-#define Z_IS_1800U_EQ_1800U(...) \,
-#define Z_IS_1801_EQ_1801(...)   \,
-#define Z_IS_1801U_EQ_1801(...)  \,
-#define Z_IS_1801_EQ_1801U(...)  \,
-#define Z_IS_1801U_EQ_1801U(...) \,
-#define Z_IS_1802_EQ_1802(...)   \,
-#define Z_IS_1802U_EQ_1802(...)  \,
-#define Z_IS_1802_EQ_1802U(...)  \,
-#define Z_IS_1802U_EQ_1802U(...) \,
-#define Z_IS_1803_EQ_1803(...)   \,
-#define Z_IS_1803U_EQ_1803(...)  \,
-#define Z_IS_1803_EQ_1803U(...)  \,
-#define Z_IS_1803U_EQ_1803U(...) \,
-#define Z_IS_1804_EQ_1804(...)   \,
-#define Z_IS_1804U_EQ_1804(...)  \,
-#define Z_IS_1804_EQ_1804U(...)  \,
-#define Z_IS_1804U_EQ_1804U(...) \,
-#define Z_IS_1805_EQ_1805(...)   \,
-#define Z_IS_1805U_EQ_1805(...)  \,
-#define Z_IS_1805_EQ_1805U(...)  \,
-#define Z_IS_1805U_EQ_1805U(...) \,
-#define Z_IS_1806_EQ_1806(...)   \,
-#define Z_IS_1806U_EQ_1806(...)  \,
-#define Z_IS_1806_EQ_1806U(...)  \,
-#define Z_IS_1806U_EQ_1806U(...) \,
-#define Z_IS_1807_EQ_1807(...)   \,
-#define Z_IS_1807U_EQ_1807(...)  \,
-#define Z_IS_1807_EQ_1807U(...)  \,
-#define Z_IS_1807U_EQ_1807U(...) \,
-#define Z_IS_1808_EQ_1808(...)   \,
-#define Z_IS_1808U_EQ_1808(...)  \,
-#define Z_IS_1808_EQ_1808U(...)  \,
-#define Z_IS_1808U_EQ_1808U(...) \,
-#define Z_IS_1809_EQ_1809(...)   \,
-#define Z_IS_1809U_EQ_1809(...)  \,
-#define Z_IS_1809_EQ_1809U(...)  \,
-#define Z_IS_1809U_EQ_1809U(...) \,
-#define Z_IS_1810_EQ_1810(...)   \,
-#define Z_IS_1810U_EQ_1810(...)  \,
-#define Z_IS_1810_EQ_1810U(...)  \,
-#define Z_IS_1810U_EQ_1810U(...) \,
-#define Z_IS_1811_EQ_1811(...)   \,
-#define Z_IS_1811U_EQ_1811(...)  \,
-#define Z_IS_1811_EQ_1811U(...)  \,
-#define Z_IS_1811U_EQ_1811U(...) \,
-#define Z_IS_1812_EQ_1812(...)   \,
-#define Z_IS_1812U_EQ_1812(...)  \,
-#define Z_IS_1812_EQ_1812U(...)  \,
-#define Z_IS_1812U_EQ_1812U(...) \,
-#define Z_IS_1813_EQ_1813(...)   \,
-#define Z_IS_1813U_EQ_1813(...)  \,
-#define Z_IS_1813_EQ_1813U(...)  \,
-#define Z_IS_1813U_EQ_1813U(...) \,
-#define Z_IS_1814_EQ_1814(...)   \,
-#define Z_IS_1814U_EQ_1814(...)  \,
-#define Z_IS_1814_EQ_1814U(...)  \,
-#define Z_IS_1814U_EQ_1814U(...) \,
-#define Z_IS_1815_EQ_1815(...)   \,
-#define Z_IS_1815U_EQ_1815(...)  \,
-#define Z_IS_1815_EQ_1815U(...)  \,
-#define Z_IS_1815U_EQ_1815U(...) \,
-#define Z_IS_1816_EQ_1816(...)   \,
-#define Z_IS_1816U_EQ_1816(...)  \,
-#define Z_IS_1816_EQ_1816U(...)  \,
-#define Z_IS_1816U_EQ_1816U(...) \,
-#define Z_IS_1817_EQ_1817(...)   \,
-#define Z_IS_1817U_EQ_1817(...)  \,
-#define Z_IS_1817_EQ_1817U(...)  \,
-#define Z_IS_1817U_EQ_1817U(...) \,
-#define Z_IS_1818_EQ_1818(...)   \,
-#define Z_IS_1818U_EQ_1818(...)  \,
-#define Z_IS_1818_EQ_1818U(...)  \,
-#define Z_IS_1818U_EQ_1818U(...) \,
-#define Z_IS_1819_EQ_1819(...)   \,
-#define Z_IS_1819U_EQ_1819(...)  \,
-#define Z_IS_1819_EQ_1819U(...)  \,
-#define Z_IS_1819U_EQ_1819U(...) \,
-#define Z_IS_1820_EQ_1820(...)   \,
-#define Z_IS_1820U_EQ_1820(...)  \,
-#define Z_IS_1820_EQ_1820U(...)  \,
-#define Z_IS_1820U_EQ_1820U(...) \,
-#define Z_IS_1821_EQ_1821(...)   \,
-#define Z_IS_1821U_EQ_1821(...)  \,
-#define Z_IS_1821_EQ_1821U(...)  \,
-#define Z_IS_1821U_EQ_1821U(...) \,
-#define Z_IS_1822_EQ_1822(...)   \,
-#define Z_IS_1822U_EQ_1822(...)  \,
-#define Z_IS_1822_EQ_1822U(...)  \,
-#define Z_IS_1822U_EQ_1822U(...) \,
-#define Z_IS_1823_EQ_1823(...)   \,
-#define Z_IS_1823U_EQ_1823(...)  \,
-#define Z_IS_1823_EQ_1823U(...)  \,
-#define Z_IS_1823U_EQ_1823U(...) \,
-#define Z_IS_1824_EQ_1824(...)   \,
-#define Z_IS_1824U_EQ_1824(...)  \,
-#define Z_IS_1824_EQ_1824U(...)  \,
-#define Z_IS_1824U_EQ_1824U(...) \,
-#define Z_IS_1825_EQ_1825(...)   \,
-#define Z_IS_1825U_EQ_1825(...)  \,
-#define Z_IS_1825_EQ_1825U(...)  \,
-#define Z_IS_1825U_EQ_1825U(...) \,
-#define Z_IS_1826_EQ_1826(...)   \,
-#define Z_IS_1826U_EQ_1826(...)  \,
-#define Z_IS_1826_EQ_1826U(...)  \,
-#define Z_IS_1826U_EQ_1826U(...) \,
-#define Z_IS_1827_EQ_1827(...)   \,
-#define Z_IS_1827U_EQ_1827(...)  \,
-#define Z_IS_1827_EQ_1827U(...)  \,
-#define Z_IS_1827U_EQ_1827U(...) \,
-#define Z_IS_1828_EQ_1828(...)   \,
-#define Z_IS_1828U_EQ_1828(...)  \,
-#define Z_IS_1828_EQ_1828U(...)  \,
-#define Z_IS_1828U_EQ_1828U(...) \,
-#define Z_IS_1829_EQ_1829(...)   \,
-#define Z_IS_1829U_EQ_1829(...)  \,
-#define Z_IS_1829_EQ_1829U(...)  \,
-#define Z_IS_1829U_EQ_1829U(...) \,
-#define Z_IS_1830_EQ_1830(...)   \,
-#define Z_IS_1830U_EQ_1830(...)  \,
-#define Z_IS_1830_EQ_1830U(...)  \,
-#define Z_IS_1830U_EQ_1830U(...) \,
-#define Z_IS_1831_EQ_1831(...)   \,
-#define Z_IS_1831U_EQ_1831(...)  \,
-#define Z_IS_1831_EQ_1831U(...)  \,
-#define Z_IS_1831U_EQ_1831U(...) \,
-#define Z_IS_1832_EQ_1832(...)   \,
-#define Z_IS_1832U_EQ_1832(...)  \,
-#define Z_IS_1832_EQ_1832U(...)  \,
-#define Z_IS_1832U_EQ_1832U(...) \,
-#define Z_IS_1833_EQ_1833(...)   \,
-#define Z_IS_1833U_EQ_1833(...)  \,
-#define Z_IS_1833_EQ_1833U(...)  \,
-#define Z_IS_1833U_EQ_1833U(...) \,
-#define Z_IS_1834_EQ_1834(...)   \,
-#define Z_IS_1834U_EQ_1834(...)  \,
-#define Z_IS_1834_EQ_1834U(...)  \,
-#define Z_IS_1834U_EQ_1834U(...) \,
-#define Z_IS_1835_EQ_1835(...)   \,
-#define Z_IS_1835U_EQ_1835(...)  \,
-#define Z_IS_1835_EQ_1835U(...)  \,
-#define Z_IS_1835U_EQ_1835U(...) \,
-#define Z_IS_1836_EQ_1836(...)   \,
-#define Z_IS_1836U_EQ_1836(...)  \,
-#define Z_IS_1836_EQ_1836U(...)  \,
-#define Z_IS_1836U_EQ_1836U(...) \,
-#define Z_IS_1837_EQ_1837(...)   \,
-#define Z_IS_1837U_EQ_1837(...)  \,
-#define Z_IS_1837_EQ_1837U(...)  \,
-#define Z_IS_1837U_EQ_1837U(...) \,
-#define Z_IS_1838_EQ_1838(...)   \,
-#define Z_IS_1838U_EQ_1838(...)  \,
-#define Z_IS_1838_EQ_1838U(...)  \,
-#define Z_IS_1838U_EQ_1838U(...) \,
-#define Z_IS_1839_EQ_1839(...)   \,
-#define Z_IS_1839U_EQ_1839(...)  \,
-#define Z_IS_1839_EQ_1839U(...)  \,
-#define Z_IS_1839U_EQ_1839U(...) \,
-#define Z_IS_1840_EQ_1840(...)   \,
-#define Z_IS_1840U_EQ_1840(...)  \,
-#define Z_IS_1840_EQ_1840U(...)  \,
-#define Z_IS_1840U_EQ_1840U(...) \,
-#define Z_IS_1841_EQ_1841(...)   \,
-#define Z_IS_1841U_EQ_1841(...)  \,
-#define Z_IS_1841_EQ_1841U(...)  \,
-#define Z_IS_1841U_EQ_1841U(...) \,
-#define Z_IS_1842_EQ_1842(...)   \,
-#define Z_IS_1842U_EQ_1842(...)  \,
-#define Z_IS_1842_EQ_1842U(...)  \,
-#define Z_IS_1842U_EQ_1842U(...) \,
-#define Z_IS_1843_EQ_1843(...)   \,
-#define Z_IS_1843U_EQ_1843(...)  \,
-#define Z_IS_1843_EQ_1843U(...)  \,
-#define Z_IS_1843U_EQ_1843U(...) \,
-#define Z_IS_1844_EQ_1844(...)   \,
-#define Z_IS_1844U_EQ_1844(...)  \,
-#define Z_IS_1844_EQ_1844U(...)  \,
-#define Z_IS_1844U_EQ_1844U(...) \,
-#define Z_IS_1845_EQ_1845(...)   \,
-#define Z_IS_1845U_EQ_1845(...)  \,
-#define Z_IS_1845_EQ_1845U(...)  \,
-#define Z_IS_1845U_EQ_1845U(...) \,
-#define Z_IS_1846_EQ_1846(...)   \,
-#define Z_IS_1846U_EQ_1846(...)  \,
-#define Z_IS_1846_EQ_1846U(...)  \,
-#define Z_IS_1846U_EQ_1846U(...) \,
-#define Z_IS_1847_EQ_1847(...)   \,
-#define Z_IS_1847U_EQ_1847(...)  \,
-#define Z_IS_1847_EQ_1847U(...)  \,
-#define Z_IS_1847U_EQ_1847U(...) \,
-#define Z_IS_1848_EQ_1848(...)   \,
-#define Z_IS_1848U_EQ_1848(...)  \,
-#define Z_IS_1848_EQ_1848U(...)  \,
-#define Z_IS_1848U_EQ_1848U(...) \,
-#define Z_IS_1849_EQ_1849(...)   \,
-#define Z_IS_1849U_EQ_1849(...)  \,
-#define Z_IS_1849_EQ_1849U(...)  \,
-#define Z_IS_1849U_EQ_1849U(...) \,
-#define Z_IS_1850_EQ_1850(...)   \,
-#define Z_IS_1850U_EQ_1850(...)  \,
-#define Z_IS_1850_EQ_1850U(...)  \,
-#define Z_IS_1850U_EQ_1850U(...) \,
-#define Z_IS_1851_EQ_1851(...)   \,
-#define Z_IS_1851U_EQ_1851(...)  \,
-#define Z_IS_1851_EQ_1851U(...)  \,
-#define Z_IS_1851U_EQ_1851U(...) \,
-#define Z_IS_1852_EQ_1852(...)   \,
-#define Z_IS_1852U_EQ_1852(...)  \,
-#define Z_IS_1852_EQ_1852U(...)  \,
-#define Z_IS_1852U_EQ_1852U(...) \,
-#define Z_IS_1853_EQ_1853(...)   \,
-#define Z_IS_1853U_EQ_1853(...)  \,
-#define Z_IS_1853_EQ_1853U(...)  \,
-#define Z_IS_1853U_EQ_1853U(...) \,
-#define Z_IS_1854_EQ_1854(...)   \,
-#define Z_IS_1854U_EQ_1854(...)  \,
-#define Z_IS_1854_EQ_1854U(...)  \,
-#define Z_IS_1854U_EQ_1854U(...) \,
-#define Z_IS_1855_EQ_1855(...)   \,
-#define Z_IS_1855U_EQ_1855(...)  \,
-#define Z_IS_1855_EQ_1855U(...)  \,
-#define Z_IS_1855U_EQ_1855U(...) \,
-#define Z_IS_1856_EQ_1856(...)   \,
-#define Z_IS_1856U_EQ_1856(...)  \,
-#define Z_IS_1856_EQ_1856U(...)  \,
-#define Z_IS_1856U_EQ_1856U(...) \,
-#define Z_IS_1857_EQ_1857(...)   \,
-#define Z_IS_1857U_EQ_1857(...)  \,
-#define Z_IS_1857_EQ_1857U(...)  \,
-#define Z_IS_1857U_EQ_1857U(...) \,
-#define Z_IS_1858_EQ_1858(...)   \,
-#define Z_IS_1858U_EQ_1858(...)  \,
-#define Z_IS_1858_EQ_1858U(...)  \,
-#define Z_IS_1858U_EQ_1858U(...) \,
-#define Z_IS_1859_EQ_1859(...)   \,
-#define Z_IS_1859U_EQ_1859(...)  \,
-#define Z_IS_1859_EQ_1859U(...)  \,
-#define Z_IS_1859U_EQ_1859U(...) \,
-#define Z_IS_1860_EQ_1860(...)   \,
-#define Z_IS_1860U_EQ_1860(...)  \,
-#define Z_IS_1860_EQ_1860U(...)  \,
-#define Z_IS_1860U_EQ_1860U(...) \,
-#define Z_IS_1861_EQ_1861(...)   \,
-#define Z_IS_1861U_EQ_1861(...)  \,
-#define Z_IS_1861_EQ_1861U(...)  \,
-#define Z_IS_1861U_EQ_1861U(...) \,
-#define Z_IS_1862_EQ_1862(...)   \,
-#define Z_IS_1862U_EQ_1862(...)  \,
-#define Z_IS_1862_EQ_1862U(...)  \,
-#define Z_IS_1862U_EQ_1862U(...) \,
-#define Z_IS_1863_EQ_1863(...)   \,
-#define Z_IS_1863U_EQ_1863(...)  \,
-#define Z_IS_1863_EQ_1863U(...)  \,
-#define Z_IS_1863U_EQ_1863U(...) \,
-#define Z_IS_1864_EQ_1864(...)   \,
-#define Z_IS_1864U_EQ_1864(...)  \,
-#define Z_IS_1864_EQ_1864U(...)  \,
-#define Z_IS_1864U_EQ_1864U(...) \,
-#define Z_IS_1865_EQ_1865(...)   \,
-#define Z_IS_1865U_EQ_1865(...)  \,
-#define Z_IS_1865_EQ_1865U(...)  \,
-#define Z_IS_1865U_EQ_1865U(...) \,
-#define Z_IS_1866_EQ_1866(...)   \,
-#define Z_IS_1866U_EQ_1866(...)  \,
-#define Z_IS_1866_EQ_1866U(...)  \,
-#define Z_IS_1866U_EQ_1866U(...) \,
-#define Z_IS_1867_EQ_1867(...)   \,
-#define Z_IS_1867U_EQ_1867(...)  \,
-#define Z_IS_1867_EQ_1867U(...)  \,
-#define Z_IS_1867U_EQ_1867U(...) \,
-#define Z_IS_1868_EQ_1868(...)   \,
-#define Z_IS_1868U_EQ_1868(...)  \,
-#define Z_IS_1868_EQ_1868U(...)  \,
-#define Z_IS_1868U_EQ_1868U(...) \,
-#define Z_IS_1869_EQ_1869(...)   \,
-#define Z_IS_1869U_EQ_1869(...)  \,
-#define Z_IS_1869_EQ_1869U(...)  \,
-#define Z_IS_1869U_EQ_1869U(...) \,
-#define Z_IS_1870_EQ_1870(...)   \,
-#define Z_IS_1870U_EQ_1870(...)  \,
-#define Z_IS_1870_EQ_1870U(...)  \,
-#define Z_IS_1870U_EQ_1870U(...) \,
-#define Z_IS_1871_EQ_1871(...)   \,
-#define Z_IS_1871U_EQ_1871(...)  \,
-#define Z_IS_1871_EQ_1871U(...)  \,
-#define Z_IS_1871U_EQ_1871U(...) \,
-#define Z_IS_1872_EQ_1872(...)   \,
-#define Z_IS_1872U_EQ_1872(...)  \,
-#define Z_IS_1872_EQ_1872U(...)  \,
-#define Z_IS_1872U_EQ_1872U(...) \,
-#define Z_IS_1873_EQ_1873(...)   \,
-#define Z_IS_1873U_EQ_1873(...)  \,
-#define Z_IS_1873_EQ_1873U(...)  \,
-#define Z_IS_1873U_EQ_1873U(...) \,
-#define Z_IS_1874_EQ_1874(...)   \,
-#define Z_IS_1874U_EQ_1874(...)  \,
-#define Z_IS_1874_EQ_1874U(...)  \,
-#define Z_IS_1874U_EQ_1874U(...) \,
-#define Z_IS_1875_EQ_1875(...)   \,
-#define Z_IS_1875U_EQ_1875(...)  \,
-#define Z_IS_1875_EQ_1875U(...)  \,
-#define Z_IS_1875U_EQ_1875U(...) \,
-#define Z_IS_1876_EQ_1876(...)   \,
-#define Z_IS_1876U_EQ_1876(...)  \,
-#define Z_IS_1876_EQ_1876U(...)  \,
-#define Z_IS_1876U_EQ_1876U(...) \,
-#define Z_IS_1877_EQ_1877(...)   \,
-#define Z_IS_1877U_EQ_1877(...)  \,
-#define Z_IS_1877_EQ_1877U(...)  \,
-#define Z_IS_1877U_EQ_1877U(...) \,
-#define Z_IS_1878_EQ_1878(...)   \,
-#define Z_IS_1878U_EQ_1878(...)  \,
-#define Z_IS_1878_EQ_1878U(...)  \,
-#define Z_IS_1878U_EQ_1878U(...) \,
-#define Z_IS_1879_EQ_1879(...)   \,
-#define Z_IS_1879U_EQ_1879(...)  \,
-#define Z_IS_1879_EQ_1879U(...)  \,
-#define Z_IS_1879U_EQ_1879U(...) \,
-#define Z_IS_1880_EQ_1880(...)   \,
-#define Z_IS_1880U_EQ_1880(...)  \,
-#define Z_IS_1880_EQ_1880U(...)  \,
-#define Z_IS_1880U_EQ_1880U(...) \,
-#define Z_IS_1881_EQ_1881(...)   \,
-#define Z_IS_1881U_EQ_1881(...)  \,
-#define Z_IS_1881_EQ_1881U(...)  \,
-#define Z_IS_1881U_EQ_1881U(...) \,
-#define Z_IS_1882_EQ_1882(...)   \,
-#define Z_IS_1882U_EQ_1882(...)  \,
-#define Z_IS_1882_EQ_1882U(...)  \,
-#define Z_IS_1882U_EQ_1882U(...) \,
-#define Z_IS_1883_EQ_1883(...)   \,
-#define Z_IS_1883U_EQ_1883(...)  \,
-#define Z_IS_1883_EQ_1883U(...)  \,
-#define Z_IS_1883U_EQ_1883U(...) \,
-#define Z_IS_1884_EQ_1884(...)   \,
-#define Z_IS_1884U_EQ_1884(...)  \,
-#define Z_IS_1884_EQ_1884U(...)  \,
-#define Z_IS_1884U_EQ_1884U(...) \,
-#define Z_IS_1885_EQ_1885(...)   \,
-#define Z_IS_1885U_EQ_1885(...)  \,
-#define Z_IS_1885_EQ_1885U(...)  \,
-#define Z_IS_1885U_EQ_1885U(...) \,
-#define Z_IS_1886_EQ_1886(...)   \,
-#define Z_IS_1886U_EQ_1886(...)  \,
-#define Z_IS_1886_EQ_1886U(...)  \,
-#define Z_IS_1886U_EQ_1886U(...) \,
-#define Z_IS_1887_EQ_1887(...)   \,
-#define Z_IS_1887U_EQ_1887(...)  \,
-#define Z_IS_1887_EQ_1887U(...)  \,
-#define Z_IS_1887U_EQ_1887U(...) \,
-#define Z_IS_1888_EQ_1888(...)   \,
-#define Z_IS_1888U_EQ_1888(...)  \,
-#define Z_IS_1888_EQ_1888U(...)  \,
-#define Z_IS_1888U_EQ_1888U(...) \,
-#define Z_IS_1889_EQ_1889(...)   \,
-#define Z_IS_1889U_EQ_1889(...)  \,
-#define Z_IS_1889_EQ_1889U(...)  \,
-#define Z_IS_1889U_EQ_1889U(...) \,
-#define Z_IS_1890_EQ_1890(...)   \,
-#define Z_IS_1890U_EQ_1890(...)  \,
-#define Z_IS_1890_EQ_1890U(...)  \,
-#define Z_IS_1890U_EQ_1890U(...) \,
-#define Z_IS_1891_EQ_1891(...)   \,
-#define Z_IS_1891U_EQ_1891(...)  \,
-#define Z_IS_1891_EQ_1891U(...)  \,
-#define Z_IS_1891U_EQ_1891U(...) \,
-#define Z_IS_1892_EQ_1892(...)   \,
-#define Z_IS_1892U_EQ_1892(...)  \,
-#define Z_IS_1892_EQ_1892U(...)  \,
-#define Z_IS_1892U_EQ_1892U(...) \,
-#define Z_IS_1893_EQ_1893(...)   \,
-#define Z_IS_1893U_EQ_1893(...)  \,
-#define Z_IS_1893_EQ_1893U(...)  \,
-#define Z_IS_1893U_EQ_1893U(...) \,
-#define Z_IS_1894_EQ_1894(...)   \,
-#define Z_IS_1894U_EQ_1894(...)  \,
-#define Z_IS_1894_EQ_1894U(...)  \,
-#define Z_IS_1894U_EQ_1894U(...) \,
-#define Z_IS_1895_EQ_1895(...)   \,
-#define Z_IS_1895U_EQ_1895(...)  \,
-#define Z_IS_1895_EQ_1895U(...)  \,
-#define Z_IS_1895U_EQ_1895U(...) \,
-#define Z_IS_1896_EQ_1896(...)   \,
-#define Z_IS_1896U_EQ_1896(...)  \,
-#define Z_IS_1896_EQ_1896U(...)  \,
-#define Z_IS_1896U_EQ_1896U(...) \,
-#define Z_IS_1897_EQ_1897(...)   \,
-#define Z_IS_1897U_EQ_1897(...)  \,
-#define Z_IS_1897_EQ_1897U(...)  \,
-#define Z_IS_1897U_EQ_1897U(...) \,
-#define Z_IS_1898_EQ_1898(...)   \,
-#define Z_IS_1898U_EQ_1898(...)  \,
-#define Z_IS_1898_EQ_1898U(...)  \,
-#define Z_IS_1898U_EQ_1898U(...) \,
-#define Z_IS_1899_EQ_1899(...)   \,
-#define Z_IS_1899U_EQ_1899(...)  \,
-#define Z_IS_1899_EQ_1899U(...)  \,
-#define Z_IS_1899U_EQ_1899U(...) \,
-#define Z_IS_1900_EQ_1900(...)   \,
-#define Z_IS_1900U_EQ_1900(...)  \,
-#define Z_IS_1900_EQ_1900U(...)  \,
-#define Z_IS_1900U_EQ_1900U(...) \,
-#define Z_IS_1901_EQ_1901(...)   \,
-#define Z_IS_1901U_EQ_1901(...)  \,
-#define Z_IS_1901_EQ_1901U(...)  \,
-#define Z_IS_1901U_EQ_1901U(...) \,
-#define Z_IS_1902_EQ_1902(...)   \,
-#define Z_IS_1902U_EQ_1902(...)  \,
-#define Z_IS_1902_EQ_1902U(...)  \,
-#define Z_IS_1902U_EQ_1902U(...) \,
-#define Z_IS_1903_EQ_1903(...)   \,
-#define Z_IS_1903U_EQ_1903(...)  \,
-#define Z_IS_1903_EQ_1903U(...)  \,
-#define Z_IS_1903U_EQ_1903U(...) \,
-#define Z_IS_1904_EQ_1904(...)   \,
-#define Z_IS_1904U_EQ_1904(...)  \,
-#define Z_IS_1904_EQ_1904U(...)  \,
-#define Z_IS_1904U_EQ_1904U(...) \,
-#define Z_IS_1905_EQ_1905(...)   \,
-#define Z_IS_1905U_EQ_1905(...)  \,
-#define Z_IS_1905_EQ_1905U(...)  \,
-#define Z_IS_1905U_EQ_1905U(...) \,
-#define Z_IS_1906_EQ_1906(...)   \,
-#define Z_IS_1906U_EQ_1906(...)  \,
-#define Z_IS_1906_EQ_1906U(...)  \,
-#define Z_IS_1906U_EQ_1906U(...) \,
-#define Z_IS_1907_EQ_1907(...)   \,
-#define Z_IS_1907U_EQ_1907(...)  \,
-#define Z_IS_1907_EQ_1907U(...)  \,
-#define Z_IS_1907U_EQ_1907U(...) \,
-#define Z_IS_1908_EQ_1908(...)   \,
-#define Z_IS_1908U_EQ_1908(...)  \,
-#define Z_IS_1908_EQ_1908U(...)  \,
-#define Z_IS_1908U_EQ_1908U(...) \,
-#define Z_IS_1909_EQ_1909(...)   \,
-#define Z_IS_1909U_EQ_1909(...)  \,
-#define Z_IS_1909_EQ_1909U(...)  \,
-#define Z_IS_1909U_EQ_1909U(...) \,
-#define Z_IS_1910_EQ_1910(...)   \,
-#define Z_IS_1910U_EQ_1910(...)  \,
-#define Z_IS_1910_EQ_1910U(...)  \,
-#define Z_IS_1910U_EQ_1910U(...) \,
-#define Z_IS_1911_EQ_1911(...)   \,
-#define Z_IS_1911U_EQ_1911(...)  \,
-#define Z_IS_1911_EQ_1911U(...)  \,
-#define Z_IS_1911U_EQ_1911U(...) \,
-#define Z_IS_1912_EQ_1912(...)   \,
-#define Z_IS_1912U_EQ_1912(...)  \,
-#define Z_IS_1912_EQ_1912U(...)  \,
-#define Z_IS_1912U_EQ_1912U(...) \,
-#define Z_IS_1913_EQ_1913(...)   \,
-#define Z_IS_1913U_EQ_1913(...)  \,
-#define Z_IS_1913_EQ_1913U(...)  \,
-#define Z_IS_1913U_EQ_1913U(...) \,
-#define Z_IS_1914_EQ_1914(...)   \,
-#define Z_IS_1914U_EQ_1914(...)  \,
-#define Z_IS_1914_EQ_1914U(...)  \,
-#define Z_IS_1914U_EQ_1914U(...) \,
-#define Z_IS_1915_EQ_1915(...)   \,
-#define Z_IS_1915U_EQ_1915(...)  \,
-#define Z_IS_1915_EQ_1915U(...)  \,
-#define Z_IS_1915U_EQ_1915U(...) \,
-#define Z_IS_1916_EQ_1916(...)   \,
-#define Z_IS_1916U_EQ_1916(...)  \,
-#define Z_IS_1916_EQ_1916U(...)  \,
-#define Z_IS_1916U_EQ_1916U(...) \,
-#define Z_IS_1917_EQ_1917(...)   \,
-#define Z_IS_1917U_EQ_1917(...)  \,
-#define Z_IS_1917_EQ_1917U(...)  \,
-#define Z_IS_1917U_EQ_1917U(...) \,
-#define Z_IS_1918_EQ_1918(...)   \,
-#define Z_IS_1918U_EQ_1918(...)  \,
-#define Z_IS_1918_EQ_1918U(...)  \,
-#define Z_IS_1918U_EQ_1918U(...) \,
-#define Z_IS_1919_EQ_1919(...)   \,
-#define Z_IS_1919U_EQ_1919(...)  \,
-#define Z_IS_1919_EQ_1919U(...)  \,
-#define Z_IS_1919U_EQ_1919U(...) \,
-#define Z_IS_1920_EQ_1920(...)   \,
-#define Z_IS_1920U_EQ_1920(...)  \,
-#define Z_IS_1920_EQ_1920U(...)  \,
-#define Z_IS_1920U_EQ_1920U(...) \,
-#define Z_IS_1921_EQ_1921(...)   \,
-#define Z_IS_1921U_EQ_1921(...)  \,
-#define Z_IS_1921_EQ_1921U(...)  \,
-#define Z_IS_1921U_EQ_1921U(...) \,
-#define Z_IS_1922_EQ_1922(...)   \,
-#define Z_IS_1922U_EQ_1922(...)  \,
-#define Z_IS_1922_EQ_1922U(...)  \,
-#define Z_IS_1922U_EQ_1922U(...) \,
-#define Z_IS_1923_EQ_1923(...)   \,
-#define Z_IS_1923U_EQ_1923(...)  \,
-#define Z_IS_1923_EQ_1923U(...)  \,
-#define Z_IS_1923U_EQ_1923U(...) \,
-#define Z_IS_1924_EQ_1924(...)   \,
-#define Z_IS_1924U_EQ_1924(...)  \,
-#define Z_IS_1924_EQ_1924U(...)  \,
-#define Z_IS_1924U_EQ_1924U(...) \,
-#define Z_IS_1925_EQ_1925(...)   \,
-#define Z_IS_1925U_EQ_1925(...)  \,
-#define Z_IS_1925_EQ_1925U(...)  \,
-#define Z_IS_1925U_EQ_1925U(...) \,
-#define Z_IS_1926_EQ_1926(...)   \,
-#define Z_IS_1926U_EQ_1926(...)  \,
-#define Z_IS_1926_EQ_1926U(...)  \,
-#define Z_IS_1926U_EQ_1926U(...) \,
-#define Z_IS_1927_EQ_1927(...)   \,
-#define Z_IS_1927U_EQ_1927(...)  \,
-#define Z_IS_1927_EQ_1927U(...)  \,
-#define Z_IS_1927U_EQ_1927U(...) \,
-#define Z_IS_1928_EQ_1928(...)   \,
-#define Z_IS_1928U_EQ_1928(...)  \,
-#define Z_IS_1928_EQ_1928U(...)  \,
-#define Z_IS_1928U_EQ_1928U(...) \,
-#define Z_IS_1929_EQ_1929(...)   \,
-#define Z_IS_1929U_EQ_1929(...)  \,
-#define Z_IS_1929_EQ_1929U(...)  \,
-#define Z_IS_1929U_EQ_1929U(...) \,
-#define Z_IS_1930_EQ_1930(...)   \,
-#define Z_IS_1930U_EQ_1930(...)  \,
-#define Z_IS_1930_EQ_1930U(...)  \,
-#define Z_IS_1930U_EQ_1930U(...) \,
-#define Z_IS_1931_EQ_1931(...)   \,
-#define Z_IS_1931U_EQ_1931(...)  \,
-#define Z_IS_1931_EQ_1931U(...)  \,
-#define Z_IS_1931U_EQ_1931U(...) \,
-#define Z_IS_1932_EQ_1932(...)   \,
-#define Z_IS_1932U_EQ_1932(...)  \,
-#define Z_IS_1932_EQ_1932U(...)  \,
-#define Z_IS_1932U_EQ_1932U(...) \,
-#define Z_IS_1933_EQ_1933(...)   \,
-#define Z_IS_1933U_EQ_1933(...)  \,
-#define Z_IS_1933_EQ_1933U(...)  \,
-#define Z_IS_1933U_EQ_1933U(...) \,
-#define Z_IS_1934_EQ_1934(...)   \,
-#define Z_IS_1934U_EQ_1934(...)  \,
-#define Z_IS_1934_EQ_1934U(...)  \,
-#define Z_IS_1934U_EQ_1934U(...) \,
-#define Z_IS_1935_EQ_1935(...)   \,
-#define Z_IS_1935U_EQ_1935(...)  \,
-#define Z_IS_1935_EQ_1935U(...)  \,
-#define Z_IS_1935U_EQ_1935U(...) \,
-#define Z_IS_1936_EQ_1936(...)   \,
-#define Z_IS_1936U_EQ_1936(...)  \,
-#define Z_IS_1936_EQ_1936U(...)  \,
-#define Z_IS_1936U_EQ_1936U(...) \,
-#define Z_IS_1937_EQ_1937(...)   \,
-#define Z_IS_1937U_EQ_1937(...)  \,
-#define Z_IS_1937_EQ_1937U(...)  \,
-#define Z_IS_1937U_EQ_1937U(...) \,
-#define Z_IS_1938_EQ_1938(...)   \,
-#define Z_IS_1938U_EQ_1938(...)  \,
-#define Z_IS_1938_EQ_1938U(...)  \,
-#define Z_IS_1938U_EQ_1938U(...) \,
-#define Z_IS_1939_EQ_1939(...)   \,
-#define Z_IS_1939U_EQ_1939(...)  \,
-#define Z_IS_1939_EQ_1939U(...)  \,
-#define Z_IS_1939U_EQ_1939U(...) \,
-#define Z_IS_1940_EQ_1940(...)   \,
-#define Z_IS_1940U_EQ_1940(...)  \,
-#define Z_IS_1940_EQ_1940U(...)  \,
-#define Z_IS_1940U_EQ_1940U(...) \,
-#define Z_IS_1941_EQ_1941(...)   \,
-#define Z_IS_1941U_EQ_1941(...)  \,
-#define Z_IS_1941_EQ_1941U(...)  \,
-#define Z_IS_1941U_EQ_1941U(...) \,
-#define Z_IS_1942_EQ_1942(...)   \,
-#define Z_IS_1942U_EQ_1942(...)  \,
-#define Z_IS_1942_EQ_1942U(...)  \,
-#define Z_IS_1942U_EQ_1942U(...) \,
-#define Z_IS_1943_EQ_1943(...)   \,
-#define Z_IS_1943U_EQ_1943(...)  \,
-#define Z_IS_1943_EQ_1943U(...)  \,
-#define Z_IS_1943U_EQ_1943U(...) \,
-#define Z_IS_1944_EQ_1944(...)   \,
-#define Z_IS_1944U_EQ_1944(...)  \,
-#define Z_IS_1944_EQ_1944U(...)  \,
-#define Z_IS_1944U_EQ_1944U(...) \,
-#define Z_IS_1945_EQ_1945(...)   \,
-#define Z_IS_1945U_EQ_1945(...)  \,
-#define Z_IS_1945_EQ_1945U(...)  \,
-#define Z_IS_1945U_EQ_1945U(...) \,
-#define Z_IS_1946_EQ_1946(...)   \,
-#define Z_IS_1946U_EQ_1946(...)  \,
-#define Z_IS_1946_EQ_1946U(...)  \,
-#define Z_IS_1946U_EQ_1946U(...) \,
-#define Z_IS_1947_EQ_1947(...)   \,
-#define Z_IS_1947U_EQ_1947(...)  \,
-#define Z_IS_1947_EQ_1947U(...)  \,
-#define Z_IS_1947U_EQ_1947U(...) \,
-#define Z_IS_1948_EQ_1948(...)   \,
-#define Z_IS_1948U_EQ_1948(...)  \,
-#define Z_IS_1948_EQ_1948U(...)  \,
-#define Z_IS_1948U_EQ_1948U(...) \,
-#define Z_IS_1949_EQ_1949(...)   \,
-#define Z_IS_1949U_EQ_1949(...)  \,
-#define Z_IS_1949_EQ_1949U(...)  \,
-#define Z_IS_1949U_EQ_1949U(...) \,
-#define Z_IS_1950_EQ_1950(...)   \,
-#define Z_IS_1950U_EQ_1950(...)  \,
-#define Z_IS_1950_EQ_1950U(...)  \,
-#define Z_IS_1950U_EQ_1950U(...) \,
-#define Z_IS_1951_EQ_1951(...)   \,
-#define Z_IS_1951U_EQ_1951(...)  \,
-#define Z_IS_1951_EQ_1951U(...)  \,
-#define Z_IS_1951U_EQ_1951U(...) \,
-#define Z_IS_1952_EQ_1952(...)   \,
-#define Z_IS_1952U_EQ_1952(...)  \,
-#define Z_IS_1952_EQ_1952U(...)  \,
-#define Z_IS_1952U_EQ_1952U(...) \,
-#define Z_IS_1953_EQ_1953(...)   \,
-#define Z_IS_1953U_EQ_1953(...)  \,
-#define Z_IS_1953_EQ_1953U(...)  \,
-#define Z_IS_1953U_EQ_1953U(...) \,
-#define Z_IS_1954_EQ_1954(...)   \,
-#define Z_IS_1954U_EQ_1954(...)  \,
-#define Z_IS_1954_EQ_1954U(...)  \,
-#define Z_IS_1954U_EQ_1954U(...) \,
-#define Z_IS_1955_EQ_1955(...)   \,
-#define Z_IS_1955U_EQ_1955(...)  \,
-#define Z_IS_1955_EQ_1955U(...)  \,
-#define Z_IS_1955U_EQ_1955U(...) \,
-#define Z_IS_1956_EQ_1956(...)   \,
-#define Z_IS_1956U_EQ_1956(...)  \,
-#define Z_IS_1956_EQ_1956U(...)  \,
-#define Z_IS_1956U_EQ_1956U(...) \,
-#define Z_IS_1957_EQ_1957(...)   \,
-#define Z_IS_1957U_EQ_1957(...)  \,
-#define Z_IS_1957_EQ_1957U(...)  \,
-#define Z_IS_1957U_EQ_1957U(...) \,
-#define Z_IS_1958_EQ_1958(...)   \,
-#define Z_IS_1958U_EQ_1958(...)  \,
-#define Z_IS_1958_EQ_1958U(...)  \,
-#define Z_IS_1958U_EQ_1958U(...) \,
-#define Z_IS_1959_EQ_1959(...)   \,
-#define Z_IS_1959U_EQ_1959(...)  \,
-#define Z_IS_1959_EQ_1959U(...)  \,
-#define Z_IS_1959U_EQ_1959U(...) \,
-#define Z_IS_1960_EQ_1960(...)   \,
-#define Z_IS_1960U_EQ_1960(...)  \,
-#define Z_IS_1960_EQ_1960U(...)  \,
-#define Z_IS_1960U_EQ_1960U(...) \,
-#define Z_IS_1961_EQ_1961(...)   \,
-#define Z_IS_1961U_EQ_1961(...)  \,
-#define Z_IS_1961_EQ_1961U(...)  \,
-#define Z_IS_1961U_EQ_1961U(...) \,
-#define Z_IS_1962_EQ_1962(...)   \,
-#define Z_IS_1962U_EQ_1962(...)  \,
-#define Z_IS_1962_EQ_1962U(...)  \,
-#define Z_IS_1962U_EQ_1962U(...) \,
-#define Z_IS_1963_EQ_1963(...)   \,
-#define Z_IS_1963U_EQ_1963(...)  \,
-#define Z_IS_1963_EQ_1963U(...)  \,
-#define Z_IS_1963U_EQ_1963U(...) \,
-#define Z_IS_1964_EQ_1964(...)   \,
-#define Z_IS_1964U_EQ_1964(...)  \,
-#define Z_IS_1964_EQ_1964U(...)  \,
-#define Z_IS_1964U_EQ_1964U(...) \,
-#define Z_IS_1965_EQ_1965(...)   \,
-#define Z_IS_1965U_EQ_1965(...)  \,
-#define Z_IS_1965_EQ_1965U(...)  \,
-#define Z_IS_1965U_EQ_1965U(...) \,
-#define Z_IS_1966_EQ_1966(...)   \,
-#define Z_IS_1966U_EQ_1966(...)  \,
-#define Z_IS_1966_EQ_1966U(...)  \,
-#define Z_IS_1966U_EQ_1966U(...) \,
-#define Z_IS_1967_EQ_1967(...)   \,
-#define Z_IS_1967U_EQ_1967(...)  \,
-#define Z_IS_1967_EQ_1967U(...)  \,
-#define Z_IS_1967U_EQ_1967U(...) \,
-#define Z_IS_1968_EQ_1968(...)   \,
-#define Z_IS_1968U_EQ_1968(...)  \,
-#define Z_IS_1968_EQ_1968U(...)  \,
-#define Z_IS_1968U_EQ_1968U(...) \,
-#define Z_IS_1969_EQ_1969(...)   \,
-#define Z_IS_1969U_EQ_1969(...)  \,
-#define Z_IS_1969_EQ_1969U(...)  \,
-#define Z_IS_1969U_EQ_1969U(...) \,
-#define Z_IS_1970_EQ_1970(...)   \,
-#define Z_IS_1970U_EQ_1970(...)  \,
-#define Z_IS_1970_EQ_1970U(...)  \,
-#define Z_IS_1970U_EQ_1970U(...) \,
-#define Z_IS_1971_EQ_1971(...)   \,
-#define Z_IS_1971U_EQ_1971(...)  \,
-#define Z_IS_1971_EQ_1971U(...)  \,
-#define Z_IS_1971U_EQ_1971U(...) \,
-#define Z_IS_1972_EQ_1972(...)   \,
-#define Z_IS_1972U_EQ_1972(...)  \,
-#define Z_IS_1972_EQ_1972U(...)  \,
-#define Z_IS_1972U_EQ_1972U(...) \,
-#define Z_IS_1973_EQ_1973(...)   \,
-#define Z_IS_1973U_EQ_1973(...)  \,
-#define Z_IS_1973_EQ_1973U(...)  \,
-#define Z_IS_1973U_EQ_1973U(...) \,
-#define Z_IS_1974_EQ_1974(...)   \,
-#define Z_IS_1974U_EQ_1974(...)  \,
-#define Z_IS_1974_EQ_1974U(...)  \,
-#define Z_IS_1974U_EQ_1974U(...) \,
-#define Z_IS_1975_EQ_1975(...)   \,
-#define Z_IS_1975U_EQ_1975(...)  \,
-#define Z_IS_1975_EQ_1975U(...)  \,
-#define Z_IS_1975U_EQ_1975U(...) \,
-#define Z_IS_1976_EQ_1976(...)   \,
-#define Z_IS_1976U_EQ_1976(...)  \,
-#define Z_IS_1976_EQ_1976U(...)  \,
-#define Z_IS_1976U_EQ_1976U(...) \,
-#define Z_IS_1977_EQ_1977(...)   \,
-#define Z_IS_1977U_EQ_1977(...)  \,
-#define Z_IS_1977_EQ_1977U(...)  \,
-#define Z_IS_1977U_EQ_1977U(...) \,
-#define Z_IS_1978_EQ_1978(...)   \,
-#define Z_IS_1978U_EQ_1978(...)  \,
-#define Z_IS_1978_EQ_1978U(...)  \,
-#define Z_IS_1978U_EQ_1978U(...) \,
-#define Z_IS_1979_EQ_1979(...)   \,
-#define Z_IS_1979U_EQ_1979(...)  \,
-#define Z_IS_1979_EQ_1979U(...)  \,
-#define Z_IS_1979U_EQ_1979U(...) \,
-#define Z_IS_1980_EQ_1980(...)   \,
-#define Z_IS_1980U_EQ_1980(...)  \,
-#define Z_IS_1980_EQ_1980U(...)  \,
-#define Z_IS_1980U_EQ_1980U(...) \,
-#define Z_IS_1981_EQ_1981(...)   \,
-#define Z_IS_1981U_EQ_1981(...)  \,
-#define Z_IS_1981_EQ_1981U(...)  \,
-#define Z_IS_1981U_EQ_1981U(...) \,
-#define Z_IS_1982_EQ_1982(...)   \,
-#define Z_IS_1982U_EQ_1982(...)  \,
-#define Z_IS_1982_EQ_1982U(...)  \,
-#define Z_IS_1982U_EQ_1982U(...) \,
-#define Z_IS_1983_EQ_1983(...)   \,
-#define Z_IS_1983U_EQ_1983(...)  \,
-#define Z_IS_1983_EQ_1983U(...)  \,
-#define Z_IS_1983U_EQ_1983U(...) \,
-#define Z_IS_1984_EQ_1984(...)   \,
-#define Z_IS_1984U_EQ_1984(...)  \,
-#define Z_IS_1984_EQ_1984U(...)  \,
-#define Z_IS_1984U_EQ_1984U(...) \,
-#define Z_IS_1985_EQ_1985(...)   \,
-#define Z_IS_1985U_EQ_1985(...)  \,
-#define Z_IS_1985_EQ_1985U(...)  \,
-#define Z_IS_1985U_EQ_1985U(...) \,
-#define Z_IS_1986_EQ_1986(...)   \,
-#define Z_IS_1986U_EQ_1986(...)  \,
-#define Z_IS_1986_EQ_1986U(...)  \,
-#define Z_IS_1986U_EQ_1986U(...) \,
-#define Z_IS_1987_EQ_1987(...)   \,
-#define Z_IS_1987U_EQ_1987(...)  \,
-#define Z_IS_1987_EQ_1987U(...)  \,
-#define Z_IS_1987U_EQ_1987U(...) \,
-#define Z_IS_1988_EQ_1988(...)   \,
-#define Z_IS_1988U_EQ_1988(...)  \,
-#define Z_IS_1988_EQ_1988U(...)  \,
-#define Z_IS_1988U_EQ_1988U(...) \,
-#define Z_IS_1989_EQ_1989(...)   \,
-#define Z_IS_1989U_EQ_1989(...)  \,
-#define Z_IS_1989_EQ_1989U(...)  \,
-#define Z_IS_1989U_EQ_1989U(...) \,
-#define Z_IS_1990_EQ_1990(...)   \,
-#define Z_IS_1990U_EQ_1990(...)  \,
-#define Z_IS_1990_EQ_1990U(...)  \,
-#define Z_IS_1990U_EQ_1990U(...) \,
-#define Z_IS_1991_EQ_1991(...)   \,
-#define Z_IS_1991U_EQ_1991(...)  \,
-#define Z_IS_1991_EQ_1991U(...)  \,
-#define Z_IS_1991U_EQ_1991U(...) \,
-#define Z_IS_1992_EQ_1992(...)   \,
-#define Z_IS_1992U_EQ_1992(...)  \,
-#define Z_IS_1992_EQ_1992U(...)  \,
-#define Z_IS_1992U_EQ_1992U(...) \,
-#define Z_IS_1993_EQ_1993(...)   \,
-#define Z_IS_1993U_EQ_1993(...)  \,
-#define Z_IS_1993_EQ_1993U(...)  \,
-#define Z_IS_1993U_EQ_1993U(...) \,
-#define Z_IS_1994_EQ_1994(...)   \,
-#define Z_IS_1994U_EQ_1994(...)  \,
-#define Z_IS_1994_EQ_1994U(...)  \,
-#define Z_IS_1994U_EQ_1994U(...) \,
-#define Z_IS_1995_EQ_1995(...)   \,
-#define Z_IS_1995U_EQ_1995(...)  \,
-#define Z_IS_1995_EQ_1995U(...)  \,
-#define Z_IS_1995U_EQ_1995U(...) \,
-#define Z_IS_1996_EQ_1996(...)   \,
-#define Z_IS_1996U_EQ_1996(...)  \,
-#define Z_IS_1996_EQ_1996U(...)  \,
-#define Z_IS_1996U_EQ_1996U(...) \,
-#define Z_IS_1997_EQ_1997(...)   \,
-#define Z_IS_1997U_EQ_1997(...)  \,
-#define Z_IS_1997_EQ_1997U(...)  \,
-#define Z_IS_1997U_EQ_1997U(...) \,
-#define Z_IS_1998_EQ_1998(...)   \,
-#define Z_IS_1998U_EQ_1998(...)  \,
-#define Z_IS_1998_EQ_1998U(...)  \,
-#define Z_IS_1998U_EQ_1998U(...) \,
-#define Z_IS_1999_EQ_1999(...)   \,
-#define Z_IS_1999U_EQ_1999(...)  \,
-#define Z_IS_1999_EQ_1999U(...)  \,
-#define Z_IS_1999U_EQ_1999U(...) \,
-#define Z_IS_2000_EQ_2000(...)   \,
-#define Z_IS_2000U_EQ_2000(...)  \,
-#define Z_IS_2000_EQ_2000U(...)  \,
-#define Z_IS_2000U_EQ_2000U(...) \,
-#define Z_IS_2001_EQ_2001(...)   \,
-#define Z_IS_2001U_EQ_2001(...)  \,
-#define Z_IS_2001_EQ_2001U(...)  \,
-#define Z_IS_2001U_EQ_2001U(...) \,
-#define Z_IS_2002_EQ_2002(...)   \,
-#define Z_IS_2002U_EQ_2002(...)  \,
-#define Z_IS_2002_EQ_2002U(...)  \,
-#define Z_IS_2002U_EQ_2002U(...) \,
-#define Z_IS_2003_EQ_2003(...)   \,
-#define Z_IS_2003U_EQ_2003(...)  \,
-#define Z_IS_2003_EQ_2003U(...)  \,
-#define Z_IS_2003U_EQ_2003U(...) \,
-#define Z_IS_2004_EQ_2004(...)   \,
-#define Z_IS_2004U_EQ_2004(...)  \,
-#define Z_IS_2004_EQ_2004U(...)  \,
-#define Z_IS_2004U_EQ_2004U(...) \,
-#define Z_IS_2005_EQ_2005(...)   \,
-#define Z_IS_2005U_EQ_2005(...)  \,
-#define Z_IS_2005_EQ_2005U(...)  \,
-#define Z_IS_2005U_EQ_2005U(...) \,
-#define Z_IS_2006_EQ_2006(...)   \,
-#define Z_IS_2006U_EQ_2006(...)  \,
-#define Z_IS_2006_EQ_2006U(...)  \,
-#define Z_IS_2006U_EQ_2006U(...) \,
-#define Z_IS_2007_EQ_2007(...)   \,
-#define Z_IS_2007U_EQ_2007(...)  \,
-#define Z_IS_2007_EQ_2007U(...)  \,
-#define Z_IS_2007U_EQ_2007U(...) \,
-#define Z_IS_2008_EQ_2008(...)   \,
-#define Z_IS_2008U_EQ_2008(...)  \,
-#define Z_IS_2008_EQ_2008U(...)  \,
-#define Z_IS_2008U_EQ_2008U(...) \,
-#define Z_IS_2009_EQ_2009(...)   \,
-#define Z_IS_2009U_EQ_2009(...)  \,
-#define Z_IS_2009_EQ_2009U(...)  \,
-#define Z_IS_2009U_EQ_2009U(...) \,
-#define Z_IS_2010_EQ_2010(...)   \,
-#define Z_IS_2010U_EQ_2010(...)  \,
-#define Z_IS_2010_EQ_2010U(...)  \,
-#define Z_IS_2010U_EQ_2010U(...) \,
-#define Z_IS_2011_EQ_2011(...)   \,
-#define Z_IS_2011U_EQ_2011(...)  \,
-#define Z_IS_2011_EQ_2011U(...)  \,
-#define Z_IS_2011U_EQ_2011U(...) \,
-#define Z_IS_2012_EQ_2012(...)   \,
-#define Z_IS_2012U_EQ_2012(...)  \,
-#define Z_IS_2012_EQ_2012U(...)  \,
-#define Z_IS_2012U_EQ_2012U(...) \,
-#define Z_IS_2013_EQ_2013(...)   \,
-#define Z_IS_2013U_EQ_2013(...)  \,
-#define Z_IS_2013_EQ_2013U(...)  \,
-#define Z_IS_2013U_EQ_2013U(...) \,
-#define Z_IS_2014_EQ_2014(...)   \,
-#define Z_IS_2014U_EQ_2014(...)  \,
-#define Z_IS_2014_EQ_2014U(...)  \,
-#define Z_IS_2014U_EQ_2014U(...) \,
-#define Z_IS_2015_EQ_2015(...)   \,
-#define Z_IS_2015U_EQ_2015(...)  \,
-#define Z_IS_2015_EQ_2015U(...)  \,
-#define Z_IS_2015U_EQ_2015U(...) \,
-#define Z_IS_2016_EQ_2016(...)   \,
-#define Z_IS_2016U_EQ_2016(...)  \,
-#define Z_IS_2016_EQ_2016U(...)  \,
-#define Z_IS_2016U_EQ_2016U(...) \,
-#define Z_IS_2017_EQ_2017(...)   \,
-#define Z_IS_2017U_EQ_2017(...)  \,
-#define Z_IS_2017_EQ_2017U(...)  \,
-#define Z_IS_2017U_EQ_2017U(...) \,
-#define Z_IS_2018_EQ_2018(...)   \,
-#define Z_IS_2018U_EQ_2018(...)  \,
-#define Z_IS_2018_EQ_2018U(...)  \,
-#define Z_IS_2018U_EQ_2018U(...) \,
-#define Z_IS_2019_EQ_2019(...)   \,
-#define Z_IS_2019U_EQ_2019(...)  \,
-#define Z_IS_2019_EQ_2019U(...)  \,
-#define Z_IS_2019U_EQ_2019U(...) \,
-#define Z_IS_2020_EQ_2020(...)   \,
-#define Z_IS_2020U_EQ_2020(...)  \,
-#define Z_IS_2020_EQ_2020U(...)  \,
-#define Z_IS_2020U_EQ_2020U(...) \,
-#define Z_IS_2021_EQ_2021(...)   \,
-#define Z_IS_2021U_EQ_2021(...)  \,
-#define Z_IS_2021_EQ_2021U(...)  \,
-#define Z_IS_2021U_EQ_2021U(...) \,
-#define Z_IS_2022_EQ_2022(...)   \,
-#define Z_IS_2022U_EQ_2022(...)  \,
-#define Z_IS_2022_EQ_2022U(...)  \,
-#define Z_IS_2022U_EQ_2022U(...) \,
-#define Z_IS_2023_EQ_2023(...)   \,
-#define Z_IS_2023U_EQ_2023(...)  \,
-#define Z_IS_2023_EQ_2023U(...)  \,
-#define Z_IS_2023U_EQ_2023U(...) \,
-#define Z_IS_2024_EQ_2024(...)   \,
-#define Z_IS_2024U_EQ_2024(...)  \,
-#define Z_IS_2024_EQ_2024U(...)  \,
-#define Z_IS_2024U_EQ_2024U(...) \,
-#define Z_IS_2025_EQ_2025(...)   \,
-#define Z_IS_2025U_EQ_2025(...)  \,
-#define Z_IS_2025_EQ_2025U(...)  \,
-#define Z_IS_2025U_EQ_2025U(...) \,
-#define Z_IS_2026_EQ_2026(...)   \,
-#define Z_IS_2026U_EQ_2026(...)  \,
-#define Z_IS_2026_EQ_2026U(...)  \,
-#define Z_IS_2026U_EQ_2026U(...) \,
-#define Z_IS_2027_EQ_2027(...)   \,
-#define Z_IS_2027U_EQ_2027(...)  \,
-#define Z_IS_2027_EQ_2027U(...)  \,
-#define Z_IS_2027U_EQ_2027U(...) \,
-#define Z_IS_2028_EQ_2028(...)   \,
-#define Z_IS_2028U_EQ_2028(...)  \,
-#define Z_IS_2028_EQ_2028U(...)  \,
-#define Z_IS_2028U_EQ_2028U(...) \,
-#define Z_IS_2029_EQ_2029(...)   \,
-#define Z_IS_2029U_EQ_2029(...)  \,
-#define Z_IS_2029_EQ_2029U(...)  \,
-#define Z_IS_2029U_EQ_2029U(...) \,
-#define Z_IS_2030_EQ_2030(...)   \,
-#define Z_IS_2030U_EQ_2030(...)  \,
-#define Z_IS_2030_EQ_2030U(...)  \,
-#define Z_IS_2030U_EQ_2030U(...) \,
-#define Z_IS_2031_EQ_2031(...)   \,
-#define Z_IS_2031U_EQ_2031(...)  \,
-#define Z_IS_2031_EQ_2031U(...)  \,
-#define Z_IS_2031U_EQ_2031U(...) \,
-#define Z_IS_2032_EQ_2032(...)   \,
-#define Z_IS_2032U_EQ_2032(...)  \,
-#define Z_IS_2032_EQ_2032U(...)  \,
-#define Z_IS_2032U_EQ_2032U(...) \,
-#define Z_IS_2033_EQ_2033(...)   \,
-#define Z_IS_2033U_EQ_2033(...)  \,
-#define Z_IS_2033_EQ_2033U(...)  \,
-#define Z_IS_2033U_EQ_2033U(...) \,
-#define Z_IS_2034_EQ_2034(...)   \,
-#define Z_IS_2034U_EQ_2034(...)  \,
-#define Z_IS_2034_EQ_2034U(...)  \,
-#define Z_IS_2034U_EQ_2034U(...) \,
-#define Z_IS_2035_EQ_2035(...)   \,
-#define Z_IS_2035U_EQ_2035(...)  \,
-#define Z_IS_2035_EQ_2035U(...)  \,
-#define Z_IS_2035U_EQ_2035U(...) \,
-#define Z_IS_2036_EQ_2036(...)   \,
-#define Z_IS_2036U_EQ_2036(...)  \,
-#define Z_IS_2036_EQ_2036U(...)  \,
-#define Z_IS_2036U_EQ_2036U(...) \,
-#define Z_IS_2037_EQ_2037(...)   \,
-#define Z_IS_2037U_EQ_2037(...)  \,
-#define Z_IS_2037_EQ_2037U(...)  \,
-#define Z_IS_2037U_EQ_2037U(...) \,
-#define Z_IS_2038_EQ_2038(...)   \,
-#define Z_IS_2038U_EQ_2038(...)  \,
-#define Z_IS_2038_EQ_2038U(...)  \,
-#define Z_IS_2038U_EQ_2038U(...) \,
-#define Z_IS_2039_EQ_2039(...)   \,
-#define Z_IS_2039U_EQ_2039(...)  \,
-#define Z_IS_2039_EQ_2039U(...)  \,
-#define Z_IS_2039U_EQ_2039U(...) \,
-#define Z_IS_2040_EQ_2040(...)   \,
-#define Z_IS_2040U_EQ_2040(...)  \,
-#define Z_IS_2040_EQ_2040U(...)  \,
-#define Z_IS_2040U_EQ_2040U(...) \,
-#define Z_IS_2041_EQ_2041(...)   \,
-#define Z_IS_2041U_EQ_2041(...)  \,
-#define Z_IS_2041_EQ_2041U(...)  \,
-#define Z_IS_2041U_EQ_2041U(...) \,
-#define Z_IS_2042_EQ_2042(...)   \,
-#define Z_IS_2042U_EQ_2042(...)  \,
-#define Z_IS_2042_EQ_2042U(...)  \,
-#define Z_IS_2042U_EQ_2042U(...) \,
-#define Z_IS_2043_EQ_2043(...)   \,
-#define Z_IS_2043U_EQ_2043(...)  \,
-#define Z_IS_2043_EQ_2043U(...)  \,
-#define Z_IS_2043U_EQ_2043U(...) \,
-#define Z_IS_2044_EQ_2044(...)   \,
-#define Z_IS_2044U_EQ_2044(...)  \,
-#define Z_IS_2044_EQ_2044U(...)  \,
-#define Z_IS_2044U_EQ_2044U(...) \,
-#define Z_IS_2045_EQ_2045(...)   \,
-#define Z_IS_2045U_EQ_2045(...)  \,
-#define Z_IS_2045_EQ_2045U(...)  \,
-#define Z_IS_2045U_EQ_2045U(...) \,
-#define Z_IS_2046_EQ_2046(...)   \,
-#define Z_IS_2046U_EQ_2046(...)  \,
-#define Z_IS_2046_EQ_2046U(...)  \,
-#define Z_IS_2046U_EQ_2046U(...) \,
-#define Z_IS_2047_EQ_2047(...)   \,
-#define Z_IS_2047U_EQ_2047(...)  \,
-#define Z_IS_2047_EQ_2047U(...)  \,
-#define Z_IS_2047U_EQ_2047U(...) \,
-#define Z_IS_2048_EQ_2048(...)   \,
-#define Z_IS_2048U_EQ_2048(...)  \,
-#define Z_IS_2048_EQ_2048U(...)  \,
-#define Z_IS_2048U_EQ_2048U(...) \,
-#define Z_IS_2049_EQ_2049(...)   \,
-#define Z_IS_2049U_EQ_2049(...)  \,
-#define Z_IS_2049_EQ_2049U(...)  \,
-#define Z_IS_2049U_EQ_2049U(...) \,
-#define Z_IS_2050_EQ_2050(...)   \,
-#define Z_IS_2050U_EQ_2050(...)  \,
-#define Z_IS_2050_EQ_2050U(...)  \,
-#define Z_IS_2050U_EQ_2050U(...) \,
-#define Z_IS_2051_EQ_2051(...)   \,
-#define Z_IS_2051U_EQ_2051(...)  \,
-#define Z_IS_2051_EQ_2051U(...)  \,
-#define Z_IS_2051U_EQ_2051U(...) \,
-#define Z_IS_2052_EQ_2052(...)   \,
-#define Z_IS_2052U_EQ_2052(...)  \,
-#define Z_IS_2052_EQ_2052U(...)  \,
-#define Z_IS_2052U_EQ_2052U(...) \,
-#define Z_IS_2053_EQ_2053(...)   \,
-#define Z_IS_2053U_EQ_2053(...)  \,
-#define Z_IS_2053_EQ_2053U(...)  \,
-#define Z_IS_2053U_EQ_2053U(...) \,
-#define Z_IS_2054_EQ_2054(...)   \,
-#define Z_IS_2054U_EQ_2054(...)  \,
-#define Z_IS_2054_EQ_2054U(...)  \,
-#define Z_IS_2054U_EQ_2054U(...) \,
-#define Z_IS_2055_EQ_2055(...)   \,
-#define Z_IS_2055U_EQ_2055(...)  \,
-#define Z_IS_2055_EQ_2055U(...)  \,
-#define Z_IS_2055U_EQ_2055U(...) \,
-#define Z_IS_2056_EQ_2056(...)   \,
-#define Z_IS_2056U_EQ_2056(...)  \,
-#define Z_IS_2056_EQ_2056U(...)  \,
-#define Z_IS_2056U_EQ_2056U(...) \,
-#define Z_IS_2057_EQ_2057(...)   \,
-#define Z_IS_2057U_EQ_2057(...)  \,
-#define Z_IS_2057_EQ_2057U(...)  \,
-#define Z_IS_2057U_EQ_2057U(...) \,
-#define Z_IS_2058_EQ_2058(...)   \,
-#define Z_IS_2058U_EQ_2058(...)  \,
-#define Z_IS_2058_EQ_2058U(...)  \,
-#define Z_IS_2058U_EQ_2058U(...) \,
-#define Z_IS_2059_EQ_2059(...)   \,
-#define Z_IS_2059U_EQ_2059(...)  \,
-#define Z_IS_2059_EQ_2059U(...)  \,
-#define Z_IS_2059U_EQ_2059U(...) \,
-#define Z_IS_2060_EQ_2060(...)   \,
-#define Z_IS_2060U_EQ_2060(...)  \,
-#define Z_IS_2060_EQ_2060U(...)  \,
-#define Z_IS_2060U_EQ_2060U(...) \,
-#define Z_IS_2061_EQ_2061(...)   \,
-#define Z_IS_2061U_EQ_2061(...)  \,
-#define Z_IS_2061_EQ_2061U(...)  \,
-#define Z_IS_2061U_EQ_2061U(...) \,
-#define Z_IS_2062_EQ_2062(...)   \,
-#define Z_IS_2062U_EQ_2062(...)  \,
-#define Z_IS_2062_EQ_2062U(...)  \,
-#define Z_IS_2062U_EQ_2062U(...) \,
-#define Z_IS_2063_EQ_2063(...)   \,
-#define Z_IS_2063U_EQ_2063(...)  \,
-#define Z_IS_2063_EQ_2063U(...)  \,
-#define Z_IS_2063U_EQ_2063U(...) \,
-#define Z_IS_2064_EQ_2064(...)   \,
-#define Z_IS_2064U_EQ_2064(...)  \,
-#define Z_IS_2064_EQ_2064U(...)  \,
-#define Z_IS_2064U_EQ_2064U(...) \,
-#define Z_IS_2065_EQ_2065(...)   \,
-#define Z_IS_2065U_EQ_2065(...)  \,
-#define Z_IS_2065_EQ_2065U(...)  \,
-#define Z_IS_2065U_EQ_2065U(...) \,
-#define Z_IS_2066_EQ_2066(...)   \,
-#define Z_IS_2066U_EQ_2066(...)  \,
-#define Z_IS_2066_EQ_2066U(...)  \,
-#define Z_IS_2066U_EQ_2066U(...) \,
-#define Z_IS_2067_EQ_2067(...)   \,
-#define Z_IS_2067U_EQ_2067(...)  \,
-#define Z_IS_2067_EQ_2067U(...)  \,
-#define Z_IS_2067U_EQ_2067U(...) \,
-#define Z_IS_2068_EQ_2068(...)   \,
-#define Z_IS_2068U_EQ_2068(...)  \,
-#define Z_IS_2068_EQ_2068U(...)  \,
-#define Z_IS_2068U_EQ_2068U(...) \,
-#define Z_IS_2069_EQ_2069(...)   \,
-#define Z_IS_2069U_EQ_2069(...)  \,
-#define Z_IS_2069_EQ_2069U(...)  \,
-#define Z_IS_2069U_EQ_2069U(...) \,
-#define Z_IS_2070_EQ_2070(...)   \,
-#define Z_IS_2070U_EQ_2070(...)  \,
-#define Z_IS_2070_EQ_2070U(...)  \,
-#define Z_IS_2070U_EQ_2070U(...) \,
-#define Z_IS_2071_EQ_2071(...)   \,
-#define Z_IS_2071U_EQ_2071(...)  \,
-#define Z_IS_2071_EQ_2071U(...)  \,
-#define Z_IS_2071U_EQ_2071U(...) \,
-#define Z_IS_2072_EQ_2072(...)   \,
-#define Z_IS_2072U_EQ_2072(...)  \,
-#define Z_IS_2072_EQ_2072U(...)  \,
-#define Z_IS_2072U_EQ_2072U(...) \,
-#define Z_IS_2073_EQ_2073(...)   \,
-#define Z_IS_2073U_EQ_2073(...)  \,
-#define Z_IS_2073_EQ_2073U(...)  \,
-#define Z_IS_2073U_EQ_2073U(...) \,
-#define Z_IS_2074_EQ_2074(...)   \,
-#define Z_IS_2074U_EQ_2074(...)  \,
-#define Z_IS_2074_EQ_2074U(...)  \,
-#define Z_IS_2074U_EQ_2074U(...) \,
-#define Z_IS_2075_EQ_2075(...)   \,
-#define Z_IS_2075U_EQ_2075(...)  \,
-#define Z_IS_2075_EQ_2075U(...)  \,
-#define Z_IS_2075U_EQ_2075U(...) \,
-#define Z_IS_2076_EQ_2076(...)   \,
-#define Z_IS_2076U_EQ_2076(...)  \,
-#define Z_IS_2076_EQ_2076U(...)  \,
-#define Z_IS_2076U_EQ_2076U(...) \,
-#define Z_IS_2077_EQ_2077(...)   \,
-#define Z_IS_2077U_EQ_2077(...)  \,
-#define Z_IS_2077_EQ_2077U(...)  \,
-#define Z_IS_2077U_EQ_2077U(...) \,
-#define Z_IS_2078_EQ_2078(...)   \,
-#define Z_IS_2078U_EQ_2078(...)  \,
-#define Z_IS_2078_EQ_2078U(...)  \,
-#define Z_IS_2078U_EQ_2078U(...) \,
-#define Z_IS_2079_EQ_2079(...)   \,
-#define Z_IS_2079U_EQ_2079(...)  \,
-#define Z_IS_2079_EQ_2079U(...)  \,
-#define Z_IS_2079U_EQ_2079U(...) \,
-#define Z_IS_2080_EQ_2080(...)   \,
-#define Z_IS_2080U_EQ_2080(...)  \,
-#define Z_IS_2080_EQ_2080U(...)  \,
-#define Z_IS_2080U_EQ_2080U(...) \,
-#define Z_IS_2081_EQ_2081(...)   \,
-#define Z_IS_2081U_EQ_2081(...)  \,
-#define Z_IS_2081_EQ_2081U(...)  \,
-#define Z_IS_2081U_EQ_2081U(...) \,
-#define Z_IS_2082_EQ_2082(...)   \,
-#define Z_IS_2082U_EQ_2082(...)  \,
-#define Z_IS_2082_EQ_2082U(...)  \,
-#define Z_IS_2082U_EQ_2082U(...) \,
-#define Z_IS_2083_EQ_2083(...)   \,
-#define Z_IS_2083U_EQ_2083(...)  \,
-#define Z_IS_2083_EQ_2083U(...)  \,
-#define Z_IS_2083U_EQ_2083U(...) \,
-#define Z_IS_2084_EQ_2084(...)   \,
-#define Z_IS_2084U_EQ_2084(...)  \,
-#define Z_IS_2084_EQ_2084U(...)  \,
-#define Z_IS_2084U_EQ_2084U(...) \,
-#define Z_IS_2085_EQ_2085(...)   \,
-#define Z_IS_2085U_EQ_2085(...)  \,
-#define Z_IS_2085_EQ_2085U(...)  \,
-#define Z_IS_2085U_EQ_2085U(...) \,
-#define Z_IS_2086_EQ_2086(...)   \,
-#define Z_IS_2086U_EQ_2086(...)  \,
-#define Z_IS_2086_EQ_2086U(...)  \,
-#define Z_IS_2086U_EQ_2086U(...) \,
-#define Z_IS_2087_EQ_2087(...)   \,
-#define Z_IS_2087U_EQ_2087(...)  \,
-#define Z_IS_2087_EQ_2087U(...)  \,
-#define Z_IS_2087U_EQ_2087U(...) \,
-#define Z_IS_2088_EQ_2088(...)   \,
-#define Z_IS_2088U_EQ_2088(...)  \,
-#define Z_IS_2088_EQ_2088U(...)  \,
-#define Z_IS_2088U_EQ_2088U(...) \,
-#define Z_IS_2089_EQ_2089(...)   \,
-#define Z_IS_2089U_EQ_2089(...)  \,
-#define Z_IS_2089_EQ_2089U(...)  \,
-#define Z_IS_2089U_EQ_2089U(...) \,
-#define Z_IS_2090_EQ_2090(...)   \,
-#define Z_IS_2090U_EQ_2090(...)  \,
-#define Z_IS_2090_EQ_2090U(...)  \,
-#define Z_IS_2090U_EQ_2090U(...) \,
-#define Z_IS_2091_EQ_2091(...)   \,
-#define Z_IS_2091U_EQ_2091(...)  \,
-#define Z_IS_2091_EQ_2091U(...)  \,
-#define Z_IS_2091U_EQ_2091U(...) \,
-#define Z_IS_2092_EQ_2092(...)   \,
-#define Z_IS_2092U_EQ_2092(...)  \,
-#define Z_IS_2092_EQ_2092U(...)  \,
-#define Z_IS_2092U_EQ_2092U(...) \,
-#define Z_IS_2093_EQ_2093(...)   \,
-#define Z_IS_2093U_EQ_2093(...)  \,
-#define Z_IS_2093_EQ_2093U(...)  \,
-#define Z_IS_2093U_EQ_2093U(...) \,
-#define Z_IS_2094_EQ_2094(...)   \,
-#define Z_IS_2094U_EQ_2094(...)  \,
-#define Z_IS_2094_EQ_2094U(...)  \,
-#define Z_IS_2094U_EQ_2094U(...) \,
-#define Z_IS_2095_EQ_2095(...)   \,
-#define Z_IS_2095U_EQ_2095(...)  \,
-#define Z_IS_2095_EQ_2095U(...)  \,
-#define Z_IS_2095U_EQ_2095U(...) \,
-#define Z_IS_2096_EQ_2096(...)   \,
-#define Z_IS_2096U_EQ_2096(...)  \,
-#define Z_IS_2096_EQ_2096U(...)  \,
-#define Z_IS_2096U_EQ_2096U(...) \,
-#define Z_IS_2097_EQ_2097(...)   \,
-#define Z_IS_2097U_EQ_2097(...)  \,
-#define Z_IS_2097_EQ_2097U(...)  \,
-#define Z_IS_2097U_EQ_2097U(...) \,
-#define Z_IS_2098_EQ_2098(...)   \,
-#define Z_IS_2098U_EQ_2098(...)  \,
-#define Z_IS_2098_EQ_2098U(...)  \,
-#define Z_IS_2098U_EQ_2098U(...) \,
-#define Z_IS_2099_EQ_2099(...)   \,
-#define Z_IS_2099U_EQ_2099(...)  \,
-#define Z_IS_2099_EQ_2099U(...)  \,
-#define Z_IS_2099U_EQ_2099U(...) \,
-#define Z_IS_2100_EQ_2100(...)   \,
-#define Z_IS_2100U_EQ_2100(...)  \,
-#define Z_IS_2100_EQ_2100U(...)  \,
-#define Z_IS_2100U_EQ_2100U(...) \,
-#define Z_IS_2101_EQ_2101(...)   \,
-#define Z_IS_2101U_EQ_2101(...)  \,
-#define Z_IS_2101_EQ_2101U(...)  \,
-#define Z_IS_2101U_EQ_2101U(...) \,
-#define Z_IS_2102_EQ_2102(...)   \,
-#define Z_IS_2102U_EQ_2102(...)  \,
-#define Z_IS_2102_EQ_2102U(...)  \,
-#define Z_IS_2102U_EQ_2102U(...) \,
-#define Z_IS_2103_EQ_2103(...)   \,
-#define Z_IS_2103U_EQ_2103(...)  \,
-#define Z_IS_2103_EQ_2103U(...)  \,
-#define Z_IS_2103U_EQ_2103U(...) \,
-#define Z_IS_2104_EQ_2104(...)   \,
-#define Z_IS_2104U_EQ_2104(...)  \,
-#define Z_IS_2104_EQ_2104U(...)  \,
-#define Z_IS_2104U_EQ_2104U(...) \,
-#define Z_IS_2105_EQ_2105(...)   \,
-#define Z_IS_2105U_EQ_2105(...)  \,
-#define Z_IS_2105_EQ_2105U(...)  \,
-#define Z_IS_2105U_EQ_2105U(...) \,
-#define Z_IS_2106_EQ_2106(...)   \,
-#define Z_IS_2106U_EQ_2106(...)  \,
-#define Z_IS_2106_EQ_2106U(...)  \,
-#define Z_IS_2106U_EQ_2106U(...) \,
-#define Z_IS_2107_EQ_2107(...)   \,
-#define Z_IS_2107U_EQ_2107(...)  \,
-#define Z_IS_2107_EQ_2107U(...)  \,
-#define Z_IS_2107U_EQ_2107U(...) \,
-#define Z_IS_2108_EQ_2108(...)   \,
-#define Z_IS_2108U_EQ_2108(...)  \,
-#define Z_IS_2108_EQ_2108U(...)  \,
-#define Z_IS_2108U_EQ_2108U(...) \,
-#define Z_IS_2109_EQ_2109(...)   \,
-#define Z_IS_2109U_EQ_2109(...)  \,
-#define Z_IS_2109_EQ_2109U(...)  \,
-#define Z_IS_2109U_EQ_2109U(...) \,
-#define Z_IS_2110_EQ_2110(...)   \,
-#define Z_IS_2110U_EQ_2110(...)  \,
-#define Z_IS_2110_EQ_2110U(...)  \,
-#define Z_IS_2110U_EQ_2110U(...) \,
-#define Z_IS_2111_EQ_2111(...)   \,
-#define Z_IS_2111U_EQ_2111(...)  \,
-#define Z_IS_2111_EQ_2111U(...)  \,
-#define Z_IS_2111U_EQ_2111U(...) \,
-#define Z_IS_2112_EQ_2112(...)   \,
-#define Z_IS_2112U_EQ_2112(...)  \,
-#define Z_IS_2112_EQ_2112U(...)  \,
-#define Z_IS_2112U_EQ_2112U(...) \,
-#define Z_IS_2113_EQ_2113(...)   \,
-#define Z_IS_2113U_EQ_2113(...)  \,
-#define Z_IS_2113_EQ_2113U(...)  \,
-#define Z_IS_2113U_EQ_2113U(...) \,
-#define Z_IS_2114_EQ_2114(...)   \,
-#define Z_IS_2114U_EQ_2114(...)  \,
-#define Z_IS_2114_EQ_2114U(...)  \,
-#define Z_IS_2114U_EQ_2114U(...) \,
-#define Z_IS_2115_EQ_2115(...)   \,
-#define Z_IS_2115U_EQ_2115(...)  \,
-#define Z_IS_2115_EQ_2115U(...)  \,
-#define Z_IS_2115U_EQ_2115U(...) \,
-#define Z_IS_2116_EQ_2116(...)   \,
-#define Z_IS_2116U_EQ_2116(...)  \,
-#define Z_IS_2116_EQ_2116U(...)  \,
-#define Z_IS_2116U_EQ_2116U(...) \,
-#define Z_IS_2117_EQ_2117(...)   \,
-#define Z_IS_2117U_EQ_2117(...)  \,
-#define Z_IS_2117_EQ_2117U(...)  \,
-#define Z_IS_2117U_EQ_2117U(...) \,
-#define Z_IS_2118_EQ_2118(...)   \,
-#define Z_IS_2118U_EQ_2118(...)  \,
-#define Z_IS_2118_EQ_2118U(...)  \,
-#define Z_IS_2118U_EQ_2118U(...) \,
-#define Z_IS_2119_EQ_2119(...)   \,
-#define Z_IS_2119U_EQ_2119(...)  \,
-#define Z_IS_2119_EQ_2119U(...)  \,
-#define Z_IS_2119U_EQ_2119U(...) \,
-#define Z_IS_2120_EQ_2120(...)   \,
-#define Z_IS_2120U_EQ_2120(...)  \,
-#define Z_IS_2120_EQ_2120U(...)  \,
-#define Z_IS_2120U_EQ_2120U(...) \,
-#define Z_IS_2121_EQ_2121(...)   \,
-#define Z_IS_2121U_EQ_2121(...)  \,
-#define Z_IS_2121_EQ_2121U(...)  \,
-#define Z_IS_2121U_EQ_2121U(...) \,
-#define Z_IS_2122_EQ_2122(...)   \,
-#define Z_IS_2122U_EQ_2122(...)  \,
-#define Z_IS_2122_EQ_2122U(...)  \,
-#define Z_IS_2122U_EQ_2122U(...) \,
-#define Z_IS_2123_EQ_2123(...)   \,
-#define Z_IS_2123U_EQ_2123(...)  \,
-#define Z_IS_2123_EQ_2123U(...)  \,
-#define Z_IS_2123U_EQ_2123U(...) \,
-#define Z_IS_2124_EQ_2124(...)   \,
-#define Z_IS_2124U_EQ_2124(...)  \,
-#define Z_IS_2124_EQ_2124U(...)  \,
-#define Z_IS_2124U_EQ_2124U(...) \,
-#define Z_IS_2125_EQ_2125(...)   \,
-#define Z_IS_2125U_EQ_2125(...)  \,
-#define Z_IS_2125_EQ_2125U(...)  \,
-#define Z_IS_2125U_EQ_2125U(...) \,
-#define Z_IS_2126_EQ_2126(...)   \,
-#define Z_IS_2126U_EQ_2126(...)  \,
-#define Z_IS_2126_EQ_2126U(...)  \,
-#define Z_IS_2126U_EQ_2126U(...) \,
-#define Z_IS_2127_EQ_2127(...)   \,
-#define Z_IS_2127U_EQ_2127(...)  \,
-#define Z_IS_2127_EQ_2127U(...)  \,
-#define Z_IS_2127U_EQ_2127U(...) \,
-#define Z_IS_2128_EQ_2128(...)   \,
-#define Z_IS_2128U_EQ_2128(...)  \,
-#define Z_IS_2128_EQ_2128U(...)  \,
-#define Z_IS_2128U_EQ_2128U(...) \,
-#define Z_IS_2129_EQ_2129(...)   \,
-#define Z_IS_2129U_EQ_2129(...)  \,
-#define Z_IS_2129_EQ_2129U(...)  \,
-#define Z_IS_2129U_EQ_2129U(...) \,
-#define Z_IS_2130_EQ_2130(...)   \,
-#define Z_IS_2130U_EQ_2130(...)  \,
-#define Z_IS_2130_EQ_2130U(...)  \,
-#define Z_IS_2130U_EQ_2130U(...) \,
-#define Z_IS_2131_EQ_2131(...)   \,
-#define Z_IS_2131U_EQ_2131(...)  \,
-#define Z_IS_2131_EQ_2131U(...)  \,
-#define Z_IS_2131U_EQ_2131U(...) \,
-#define Z_IS_2132_EQ_2132(...)   \,
-#define Z_IS_2132U_EQ_2132(...)  \,
-#define Z_IS_2132_EQ_2132U(...)  \,
-#define Z_IS_2132U_EQ_2132U(...) \,
-#define Z_IS_2133_EQ_2133(...)   \,
-#define Z_IS_2133U_EQ_2133(...)  \,
-#define Z_IS_2133_EQ_2133U(...)  \,
-#define Z_IS_2133U_EQ_2133U(...) \,
-#define Z_IS_2134_EQ_2134(...)   \,
-#define Z_IS_2134U_EQ_2134(...)  \,
-#define Z_IS_2134_EQ_2134U(...)  \,
-#define Z_IS_2134U_EQ_2134U(...) \,
-#define Z_IS_2135_EQ_2135(...)   \,
-#define Z_IS_2135U_EQ_2135(...)  \,
-#define Z_IS_2135_EQ_2135U(...)  \,
-#define Z_IS_2135U_EQ_2135U(...) \,
-#define Z_IS_2136_EQ_2136(...)   \,
-#define Z_IS_2136U_EQ_2136(...)  \,
-#define Z_IS_2136_EQ_2136U(...)  \,
-#define Z_IS_2136U_EQ_2136U(...) \,
-#define Z_IS_2137_EQ_2137(...)   \,
-#define Z_IS_2137U_EQ_2137(...)  \,
-#define Z_IS_2137_EQ_2137U(...)  \,
-#define Z_IS_2137U_EQ_2137U(...) \,
-#define Z_IS_2138_EQ_2138(...)   \,
-#define Z_IS_2138U_EQ_2138(...)  \,
-#define Z_IS_2138_EQ_2138U(...)  \,
-#define Z_IS_2138U_EQ_2138U(...) \,
-#define Z_IS_2139_EQ_2139(...)   \,
-#define Z_IS_2139U_EQ_2139(...)  \,
-#define Z_IS_2139_EQ_2139U(...)  \,
-#define Z_IS_2139U_EQ_2139U(...) \,
-#define Z_IS_2140_EQ_2140(...)   \,
-#define Z_IS_2140U_EQ_2140(...)  \,
-#define Z_IS_2140_EQ_2140U(...)  \,
-#define Z_IS_2140U_EQ_2140U(...) \,
-#define Z_IS_2141_EQ_2141(...)   \,
-#define Z_IS_2141U_EQ_2141(...)  \,
-#define Z_IS_2141_EQ_2141U(...)  \,
-#define Z_IS_2141U_EQ_2141U(...) \,
-#define Z_IS_2142_EQ_2142(...)   \,
-#define Z_IS_2142U_EQ_2142(...)  \,
-#define Z_IS_2142_EQ_2142U(...)  \,
-#define Z_IS_2142U_EQ_2142U(...) \,
-#define Z_IS_2143_EQ_2143(...)   \,
-#define Z_IS_2143U_EQ_2143(...)  \,
-#define Z_IS_2143_EQ_2143U(...)  \,
-#define Z_IS_2143U_EQ_2143U(...) \,
-#define Z_IS_2144_EQ_2144(...)   \,
-#define Z_IS_2144U_EQ_2144(...)  \,
-#define Z_IS_2144_EQ_2144U(...)  \,
-#define Z_IS_2144U_EQ_2144U(...) \,
-#define Z_IS_2145_EQ_2145(...)   \,
-#define Z_IS_2145U_EQ_2145(...)  \,
-#define Z_IS_2145_EQ_2145U(...)  \,
-#define Z_IS_2145U_EQ_2145U(...) \,
-#define Z_IS_2146_EQ_2146(...)   \,
-#define Z_IS_2146U_EQ_2146(...)  \,
-#define Z_IS_2146_EQ_2146U(...)  \,
-#define Z_IS_2146U_EQ_2146U(...) \,
-#define Z_IS_2147_EQ_2147(...)   \,
-#define Z_IS_2147U_EQ_2147(...)  \,
-#define Z_IS_2147_EQ_2147U(...)  \,
-#define Z_IS_2147U_EQ_2147U(...) \,
-#define Z_IS_2148_EQ_2148(...)   \,
-#define Z_IS_2148U_EQ_2148(...)  \,
-#define Z_IS_2148_EQ_2148U(...)  \,
-#define Z_IS_2148U_EQ_2148U(...) \,
-#define Z_IS_2149_EQ_2149(...)   \,
-#define Z_IS_2149U_EQ_2149(...)  \,
-#define Z_IS_2149_EQ_2149U(...)  \,
-#define Z_IS_2149U_EQ_2149U(...) \,
-#define Z_IS_2150_EQ_2150(...)   \,
-#define Z_IS_2150U_EQ_2150(...)  \,
-#define Z_IS_2150_EQ_2150U(...)  \,
-#define Z_IS_2150U_EQ_2150U(...) \,
-#define Z_IS_2151_EQ_2151(...)   \,
-#define Z_IS_2151U_EQ_2151(...)  \,
-#define Z_IS_2151_EQ_2151U(...)  \,
-#define Z_IS_2151U_EQ_2151U(...) \,
-#define Z_IS_2152_EQ_2152(...)   \,
-#define Z_IS_2152U_EQ_2152(...)  \,
-#define Z_IS_2152_EQ_2152U(...)  \,
-#define Z_IS_2152U_EQ_2152U(...) \,
-#define Z_IS_2153_EQ_2153(...)   \,
-#define Z_IS_2153U_EQ_2153(...)  \,
-#define Z_IS_2153_EQ_2153U(...)  \,
-#define Z_IS_2153U_EQ_2153U(...) \,
-#define Z_IS_2154_EQ_2154(...)   \,
-#define Z_IS_2154U_EQ_2154(...)  \,
-#define Z_IS_2154_EQ_2154U(...)  \,
-#define Z_IS_2154U_EQ_2154U(...) \,
-#define Z_IS_2155_EQ_2155(...)   \,
-#define Z_IS_2155U_EQ_2155(...)  \,
-#define Z_IS_2155_EQ_2155U(...)  \,
-#define Z_IS_2155U_EQ_2155U(...) \,
-#define Z_IS_2156_EQ_2156(...)   \,
-#define Z_IS_2156U_EQ_2156(...)  \,
-#define Z_IS_2156_EQ_2156U(...)  \,
-#define Z_IS_2156U_EQ_2156U(...) \,
-#define Z_IS_2157_EQ_2157(...)   \,
-#define Z_IS_2157U_EQ_2157(...)  \,
-#define Z_IS_2157_EQ_2157U(...)  \,
-#define Z_IS_2157U_EQ_2157U(...) \,
-#define Z_IS_2158_EQ_2158(...)   \,
-#define Z_IS_2158U_EQ_2158(...)  \,
-#define Z_IS_2158_EQ_2158U(...)  \,
-#define Z_IS_2158U_EQ_2158U(...) \,
-#define Z_IS_2159_EQ_2159(...)   \,
-#define Z_IS_2159U_EQ_2159(...)  \,
-#define Z_IS_2159_EQ_2159U(...)  \,
-#define Z_IS_2159U_EQ_2159U(...) \,
-#define Z_IS_2160_EQ_2160(...)   \,
-#define Z_IS_2160U_EQ_2160(...)  \,
-#define Z_IS_2160_EQ_2160U(...)  \,
-#define Z_IS_2160U_EQ_2160U(...) \,
-#define Z_IS_2161_EQ_2161(...)   \,
-#define Z_IS_2161U_EQ_2161(...)  \,
-#define Z_IS_2161_EQ_2161U(...)  \,
-#define Z_IS_2161U_EQ_2161U(...) \,
-#define Z_IS_2162_EQ_2162(...)   \,
-#define Z_IS_2162U_EQ_2162(...)  \,
-#define Z_IS_2162_EQ_2162U(...)  \,
-#define Z_IS_2162U_EQ_2162U(...) \,
-#define Z_IS_2163_EQ_2163(...)   \,
-#define Z_IS_2163U_EQ_2163(...)  \,
-#define Z_IS_2163_EQ_2163U(...)  \,
-#define Z_IS_2163U_EQ_2163U(...) \,
-#define Z_IS_2164_EQ_2164(...)   \,
-#define Z_IS_2164U_EQ_2164(...)  \,
-#define Z_IS_2164_EQ_2164U(...)  \,
-#define Z_IS_2164U_EQ_2164U(...) \,
-#define Z_IS_2165_EQ_2165(...)   \,
-#define Z_IS_2165U_EQ_2165(...)  \,
-#define Z_IS_2165_EQ_2165U(...)  \,
-#define Z_IS_2165U_EQ_2165U(...) \,
-#define Z_IS_2166_EQ_2166(...)   \,
-#define Z_IS_2166U_EQ_2166(...)  \,
-#define Z_IS_2166_EQ_2166U(...)  \,
-#define Z_IS_2166U_EQ_2166U(...) \,
-#define Z_IS_2167_EQ_2167(...)   \,
-#define Z_IS_2167U_EQ_2167(...)  \,
-#define Z_IS_2167_EQ_2167U(...)  \,
-#define Z_IS_2167U_EQ_2167U(...) \,
-#define Z_IS_2168_EQ_2168(...)   \,
-#define Z_IS_2168U_EQ_2168(...)  \,
-#define Z_IS_2168_EQ_2168U(...)  \,
-#define Z_IS_2168U_EQ_2168U(...) \,
-#define Z_IS_2169_EQ_2169(...)   \,
-#define Z_IS_2169U_EQ_2169(...)  \,
-#define Z_IS_2169_EQ_2169U(...)  \,
-#define Z_IS_2169U_EQ_2169U(...) \,
-#define Z_IS_2170_EQ_2170(...)   \,
-#define Z_IS_2170U_EQ_2170(...)  \,
-#define Z_IS_2170_EQ_2170U(...)  \,
-#define Z_IS_2170U_EQ_2170U(...) \,
-#define Z_IS_2171_EQ_2171(...)   \,
-#define Z_IS_2171U_EQ_2171(...)  \,
-#define Z_IS_2171_EQ_2171U(...)  \,
-#define Z_IS_2171U_EQ_2171U(...) \,
-#define Z_IS_2172_EQ_2172(...)   \,
-#define Z_IS_2172U_EQ_2172(...)  \,
-#define Z_IS_2172_EQ_2172U(...)  \,
-#define Z_IS_2172U_EQ_2172U(...) \,
-#define Z_IS_2173_EQ_2173(...)   \,
-#define Z_IS_2173U_EQ_2173(...)  \,
-#define Z_IS_2173_EQ_2173U(...)  \,
-#define Z_IS_2173U_EQ_2173U(...) \,
-#define Z_IS_2174_EQ_2174(...)   \,
-#define Z_IS_2174U_EQ_2174(...)  \,
-#define Z_IS_2174_EQ_2174U(...)  \,
-#define Z_IS_2174U_EQ_2174U(...) \,
-#define Z_IS_2175_EQ_2175(...)   \,
-#define Z_IS_2175U_EQ_2175(...)  \,
-#define Z_IS_2175_EQ_2175U(...)  \,
-#define Z_IS_2175U_EQ_2175U(...) \,
-#define Z_IS_2176_EQ_2176(...)   \,
-#define Z_IS_2176U_EQ_2176(...)  \,
-#define Z_IS_2176_EQ_2176U(...)  \,
-#define Z_IS_2176U_EQ_2176U(...) \,
-#define Z_IS_2177_EQ_2177(...)   \,
-#define Z_IS_2177U_EQ_2177(...)  \,
-#define Z_IS_2177_EQ_2177U(...)  \,
-#define Z_IS_2177U_EQ_2177U(...) \,
-#define Z_IS_2178_EQ_2178(...)   \,
-#define Z_IS_2178U_EQ_2178(...)  \,
-#define Z_IS_2178_EQ_2178U(...)  \,
-#define Z_IS_2178U_EQ_2178U(...) \,
-#define Z_IS_2179_EQ_2179(...)   \,
-#define Z_IS_2179U_EQ_2179(...)  \,
-#define Z_IS_2179_EQ_2179U(...)  \,
-#define Z_IS_2179U_EQ_2179U(...) \,
-#define Z_IS_2180_EQ_2180(...)   \,
-#define Z_IS_2180U_EQ_2180(...)  \,
-#define Z_IS_2180_EQ_2180U(...)  \,
-#define Z_IS_2180U_EQ_2180U(...) \,
-#define Z_IS_2181_EQ_2181(...)   \,
-#define Z_IS_2181U_EQ_2181(...)  \,
-#define Z_IS_2181_EQ_2181U(...)  \,
-#define Z_IS_2181U_EQ_2181U(...) \,
-#define Z_IS_2182_EQ_2182(...)   \,
-#define Z_IS_2182U_EQ_2182(...)  \,
-#define Z_IS_2182_EQ_2182U(...)  \,
-#define Z_IS_2182U_EQ_2182U(...) \,
-#define Z_IS_2183_EQ_2183(...)   \,
-#define Z_IS_2183U_EQ_2183(...)  \,
-#define Z_IS_2183_EQ_2183U(...)  \,
-#define Z_IS_2183U_EQ_2183U(...) \,
-#define Z_IS_2184_EQ_2184(...)   \,
-#define Z_IS_2184U_EQ_2184(...)  \,
-#define Z_IS_2184_EQ_2184U(...)  \,
-#define Z_IS_2184U_EQ_2184U(...) \,
-#define Z_IS_2185_EQ_2185(...)   \,
-#define Z_IS_2185U_EQ_2185(...)  \,
-#define Z_IS_2185_EQ_2185U(...)  \,
-#define Z_IS_2185U_EQ_2185U(...) \,
-#define Z_IS_2186_EQ_2186(...)   \,
-#define Z_IS_2186U_EQ_2186(...)  \,
-#define Z_IS_2186_EQ_2186U(...)  \,
-#define Z_IS_2186U_EQ_2186U(...) \,
-#define Z_IS_2187_EQ_2187(...)   \,
-#define Z_IS_2187U_EQ_2187(...)  \,
-#define Z_IS_2187_EQ_2187U(...)  \,
-#define Z_IS_2187U_EQ_2187U(...) \,
-#define Z_IS_2188_EQ_2188(...)   \,
-#define Z_IS_2188U_EQ_2188(...)  \,
-#define Z_IS_2188_EQ_2188U(...)  \,
-#define Z_IS_2188U_EQ_2188U(...) \,
-#define Z_IS_2189_EQ_2189(...)   \,
-#define Z_IS_2189U_EQ_2189(...)  \,
-#define Z_IS_2189_EQ_2189U(...)  \,
-#define Z_IS_2189U_EQ_2189U(...) \,
-#define Z_IS_2190_EQ_2190(...)   \,
-#define Z_IS_2190U_EQ_2190(...)  \,
-#define Z_IS_2190_EQ_2190U(...)  \,
-#define Z_IS_2190U_EQ_2190U(...) \,
-#define Z_IS_2191_EQ_2191(...)   \,
-#define Z_IS_2191U_EQ_2191(...)  \,
-#define Z_IS_2191_EQ_2191U(...)  \,
-#define Z_IS_2191U_EQ_2191U(...) \,
-#define Z_IS_2192_EQ_2192(...)   \,
-#define Z_IS_2192U_EQ_2192(...)  \,
-#define Z_IS_2192_EQ_2192U(...)  \,
-#define Z_IS_2192U_EQ_2192U(...) \,
-#define Z_IS_2193_EQ_2193(...)   \,
-#define Z_IS_2193U_EQ_2193(...)  \,
-#define Z_IS_2193_EQ_2193U(...)  \,
-#define Z_IS_2193U_EQ_2193U(...) \,
-#define Z_IS_2194_EQ_2194(...)   \,
-#define Z_IS_2194U_EQ_2194(...)  \,
-#define Z_IS_2194_EQ_2194U(...)  \,
-#define Z_IS_2194U_EQ_2194U(...) \,
-#define Z_IS_2195_EQ_2195(...)   \,
-#define Z_IS_2195U_EQ_2195(...)  \,
-#define Z_IS_2195_EQ_2195U(...)  \,
-#define Z_IS_2195U_EQ_2195U(...) \,
-#define Z_IS_2196_EQ_2196(...)   \,
-#define Z_IS_2196U_EQ_2196(...)  \,
-#define Z_IS_2196_EQ_2196U(...)  \,
-#define Z_IS_2196U_EQ_2196U(...) \,
-#define Z_IS_2197_EQ_2197(...)   \,
-#define Z_IS_2197U_EQ_2197(...)  \,
-#define Z_IS_2197_EQ_2197U(...)  \,
-#define Z_IS_2197U_EQ_2197U(...) \,
-#define Z_IS_2198_EQ_2198(...)   \,
-#define Z_IS_2198U_EQ_2198(...)  \,
-#define Z_IS_2198_EQ_2198U(...)  \,
-#define Z_IS_2198U_EQ_2198U(...) \,
-#define Z_IS_2199_EQ_2199(...)   \,
-#define Z_IS_2199U_EQ_2199(...)  \,
-#define Z_IS_2199_EQ_2199U(...)  \,
-#define Z_IS_2199U_EQ_2199U(...) \,
-#define Z_IS_2200_EQ_2200(...)   \,
-#define Z_IS_2200U_EQ_2200(...)  \,
-#define Z_IS_2200_EQ_2200U(...)  \,
-#define Z_IS_2200U_EQ_2200U(...) \,
-#define Z_IS_2201_EQ_2201(...)   \,
-#define Z_IS_2201U_EQ_2201(...)  \,
-#define Z_IS_2201_EQ_2201U(...)  \,
-#define Z_IS_2201U_EQ_2201U(...) \,
-#define Z_IS_2202_EQ_2202(...)   \,
-#define Z_IS_2202U_EQ_2202(...)  \,
-#define Z_IS_2202_EQ_2202U(...)  \,
-#define Z_IS_2202U_EQ_2202U(...) \,
-#define Z_IS_2203_EQ_2203(...)   \,
-#define Z_IS_2203U_EQ_2203(...)  \,
-#define Z_IS_2203_EQ_2203U(...)  \,
-#define Z_IS_2203U_EQ_2203U(...) \,
-#define Z_IS_2204_EQ_2204(...)   \,
-#define Z_IS_2204U_EQ_2204(...)  \,
-#define Z_IS_2204_EQ_2204U(...)  \,
-#define Z_IS_2204U_EQ_2204U(...) \,
-#define Z_IS_2205_EQ_2205(...)   \,
-#define Z_IS_2205U_EQ_2205(...)  \,
-#define Z_IS_2205_EQ_2205U(...)  \,
-#define Z_IS_2205U_EQ_2205U(...) \,
-#define Z_IS_2206_EQ_2206(...)   \,
-#define Z_IS_2206U_EQ_2206(...)  \,
-#define Z_IS_2206_EQ_2206U(...)  \,
-#define Z_IS_2206U_EQ_2206U(...) \,
-#define Z_IS_2207_EQ_2207(...)   \,
-#define Z_IS_2207U_EQ_2207(...)  \,
-#define Z_IS_2207_EQ_2207U(...)  \,
-#define Z_IS_2207U_EQ_2207U(...) \,
-#define Z_IS_2208_EQ_2208(...)   \,
-#define Z_IS_2208U_EQ_2208(...)  \,
-#define Z_IS_2208_EQ_2208U(...)  \,
-#define Z_IS_2208U_EQ_2208U(...) \,
-#define Z_IS_2209_EQ_2209(...)   \,
-#define Z_IS_2209U_EQ_2209(...)  \,
-#define Z_IS_2209_EQ_2209U(...)  \,
-#define Z_IS_2209U_EQ_2209U(...) \,
-#define Z_IS_2210_EQ_2210(...)   \,
-#define Z_IS_2210U_EQ_2210(...)  \,
-#define Z_IS_2210_EQ_2210U(...)  \,
-#define Z_IS_2210U_EQ_2210U(...) \,
-#define Z_IS_2211_EQ_2211(...)   \,
-#define Z_IS_2211U_EQ_2211(...)  \,
-#define Z_IS_2211_EQ_2211U(...)  \,
-#define Z_IS_2211U_EQ_2211U(...) \,
-#define Z_IS_2212_EQ_2212(...)   \,
-#define Z_IS_2212U_EQ_2212(...)  \,
-#define Z_IS_2212_EQ_2212U(...)  \,
-#define Z_IS_2212U_EQ_2212U(...) \,
-#define Z_IS_2213_EQ_2213(...)   \,
-#define Z_IS_2213U_EQ_2213(...)  \,
-#define Z_IS_2213_EQ_2213U(...)  \,
-#define Z_IS_2213U_EQ_2213U(...) \,
-#define Z_IS_2214_EQ_2214(...)   \,
-#define Z_IS_2214U_EQ_2214(...)  \,
-#define Z_IS_2214_EQ_2214U(...)  \,
-#define Z_IS_2214U_EQ_2214U(...) \,
-#define Z_IS_2215_EQ_2215(...)   \,
-#define Z_IS_2215U_EQ_2215(...)  \,
-#define Z_IS_2215_EQ_2215U(...)  \,
-#define Z_IS_2215U_EQ_2215U(...) \,
-#define Z_IS_2216_EQ_2216(...)   \,
-#define Z_IS_2216U_EQ_2216(...)  \,
-#define Z_IS_2216_EQ_2216U(...)  \,
-#define Z_IS_2216U_EQ_2216U(...) \,
-#define Z_IS_2217_EQ_2217(...)   \,
-#define Z_IS_2217U_EQ_2217(...)  \,
-#define Z_IS_2217_EQ_2217U(...)  \,
-#define Z_IS_2217U_EQ_2217U(...) \,
-#define Z_IS_2218_EQ_2218(...)   \,
-#define Z_IS_2218U_EQ_2218(...)  \,
-#define Z_IS_2218_EQ_2218U(...)  \,
-#define Z_IS_2218U_EQ_2218U(...) \,
-#define Z_IS_2219_EQ_2219(...)   \,
-#define Z_IS_2219U_EQ_2219(...)  \,
-#define Z_IS_2219_EQ_2219U(...)  \,
-#define Z_IS_2219U_EQ_2219U(...) \,
-#define Z_IS_2220_EQ_2220(...)   \,
-#define Z_IS_2220U_EQ_2220(...)  \,
-#define Z_IS_2220_EQ_2220U(...)  \,
-#define Z_IS_2220U_EQ_2220U(...) \,
-#define Z_IS_2221_EQ_2221(...)   \,
-#define Z_IS_2221U_EQ_2221(...)  \,
-#define Z_IS_2221_EQ_2221U(...)  \,
-#define Z_IS_2221U_EQ_2221U(...) \,
-#define Z_IS_2222_EQ_2222(...)   \,
-#define Z_IS_2222U_EQ_2222(...)  \,
-#define Z_IS_2222_EQ_2222U(...)  \,
-#define Z_IS_2222U_EQ_2222U(...) \,
-#define Z_IS_2223_EQ_2223(...)   \,
-#define Z_IS_2223U_EQ_2223(...)  \,
-#define Z_IS_2223_EQ_2223U(...)  \,
-#define Z_IS_2223U_EQ_2223U(...) \,
-#define Z_IS_2224_EQ_2224(...)   \,
-#define Z_IS_2224U_EQ_2224(...)  \,
-#define Z_IS_2224_EQ_2224U(...)  \,
-#define Z_IS_2224U_EQ_2224U(...) \,
-#define Z_IS_2225_EQ_2225(...)   \,
-#define Z_IS_2225U_EQ_2225(...)  \,
-#define Z_IS_2225_EQ_2225U(...)  \,
-#define Z_IS_2225U_EQ_2225U(...) \,
-#define Z_IS_2226_EQ_2226(...)   \,
-#define Z_IS_2226U_EQ_2226(...)  \,
-#define Z_IS_2226_EQ_2226U(...)  \,
-#define Z_IS_2226U_EQ_2226U(...) \,
-#define Z_IS_2227_EQ_2227(...)   \,
-#define Z_IS_2227U_EQ_2227(...)  \,
-#define Z_IS_2227_EQ_2227U(...)  \,
-#define Z_IS_2227U_EQ_2227U(...) \,
-#define Z_IS_2228_EQ_2228(...)   \,
-#define Z_IS_2228U_EQ_2228(...)  \,
-#define Z_IS_2228_EQ_2228U(...)  \,
-#define Z_IS_2228U_EQ_2228U(...) \,
-#define Z_IS_2229_EQ_2229(...)   \,
-#define Z_IS_2229U_EQ_2229(...)  \,
-#define Z_IS_2229_EQ_2229U(...)  \,
-#define Z_IS_2229U_EQ_2229U(...) \,
-#define Z_IS_2230_EQ_2230(...)   \,
-#define Z_IS_2230U_EQ_2230(...)  \,
-#define Z_IS_2230_EQ_2230U(...)  \,
-#define Z_IS_2230U_EQ_2230U(...) \,
-#define Z_IS_2231_EQ_2231(...)   \,
-#define Z_IS_2231U_EQ_2231(...)  \,
-#define Z_IS_2231_EQ_2231U(...)  \,
-#define Z_IS_2231U_EQ_2231U(...) \,
-#define Z_IS_2232_EQ_2232(...)   \,
-#define Z_IS_2232U_EQ_2232(...)  \,
-#define Z_IS_2232_EQ_2232U(...)  \,
-#define Z_IS_2232U_EQ_2232U(...) \,
-#define Z_IS_2233_EQ_2233(...)   \,
-#define Z_IS_2233U_EQ_2233(...)  \,
-#define Z_IS_2233_EQ_2233U(...)  \,
-#define Z_IS_2233U_EQ_2233U(...) \,
-#define Z_IS_2234_EQ_2234(...)   \,
-#define Z_IS_2234U_EQ_2234(...)  \,
-#define Z_IS_2234_EQ_2234U(...)  \,
-#define Z_IS_2234U_EQ_2234U(...) \,
-#define Z_IS_2235_EQ_2235(...)   \,
-#define Z_IS_2235U_EQ_2235(...)  \,
-#define Z_IS_2235_EQ_2235U(...)  \,
-#define Z_IS_2235U_EQ_2235U(...) \,
-#define Z_IS_2236_EQ_2236(...)   \,
-#define Z_IS_2236U_EQ_2236(...)  \,
-#define Z_IS_2236_EQ_2236U(...)  \,
-#define Z_IS_2236U_EQ_2236U(...) \,
-#define Z_IS_2237_EQ_2237(...)   \,
-#define Z_IS_2237U_EQ_2237(...)  \,
-#define Z_IS_2237_EQ_2237U(...)  \,
-#define Z_IS_2237U_EQ_2237U(...) \,
-#define Z_IS_2238_EQ_2238(...)   \,
-#define Z_IS_2238U_EQ_2238(...)  \,
-#define Z_IS_2238_EQ_2238U(...)  \,
-#define Z_IS_2238U_EQ_2238U(...) \,
-#define Z_IS_2239_EQ_2239(...)   \,
-#define Z_IS_2239U_EQ_2239(...)  \,
-#define Z_IS_2239_EQ_2239U(...)  \,
-#define Z_IS_2239U_EQ_2239U(...) \,
-#define Z_IS_2240_EQ_2240(...)   \,
-#define Z_IS_2240U_EQ_2240(...)  \,
-#define Z_IS_2240_EQ_2240U(...)  \,
-#define Z_IS_2240U_EQ_2240U(...) \,
-#define Z_IS_2241_EQ_2241(...)   \,
-#define Z_IS_2241U_EQ_2241(...)  \,
-#define Z_IS_2241_EQ_2241U(...)  \,
-#define Z_IS_2241U_EQ_2241U(...) \,
-#define Z_IS_2242_EQ_2242(...)   \,
-#define Z_IS_2242U_EQ_2242(...)  \,
-#define Z_IS_2242_EQ_2242U(...)  \,
-#define Z_IS_2242U_EQ_2242U(...) \,
-#define Z_IS_2243_EQ_2243(...)   \,
-#define Z_IS_2243U_EQ_2243(...)  \,
-#define Z_IS_2243_EQ_2243U(...)  \,
-#define Z_IS_2243U_EQ_2243U(...) \,
-#define Z_IS_2244_EQ_2244(...)   \,
-#define Z_IS_2244U_EQ_2244(...)  \,
-#define Z_IS_2244_EQ_2244U(...)  \,
-#define Z_IS_2244U_EQ_2244U(...) \,
-#define Z_IS_2245_EQ_2245(...)   \,
-#define Z_IS_2245U_EQ_2245(...)  \,
-#define Z_IS_2245_EQ_2245U(...)  \,
-#define Z_IS_2245U_EQ_2245U(...) \,
-#define Z_IS_2246_EQ_2246(...)   \,
-#define Z_IS_2246U_EQ_2246(...)  \,
-#define Z_IS_2246_EQ_2246U(...)  \,
-#define Z_IS_2246U_EQ_2246U(...) \,
-#define Z_IS_2247_EQ_2247(...)   \,
-#define Z_IS_2247U_EQ_2247(...)  \,
-#define Z_IS_2247_EQ_2247U(...)  \,
-#define Z_IS_2247U_EQ_2247U(...) \,
-#define Z_IS_2248_EQ_2248(...)   \,
-#define Z_IS_2248U_EQ_2248(...)  \,
-#define Z_IS_2248_EQ_2248U(...)  \,
-#define Z_IS_2248U_EQ_2248U(...) \,
-#define Z_IS_2249_EQ_2249(...)   \,
-#define Z_IS_2249U_EQ_2249(...)  \,
-#define Z_IS_2249_EQ_2249U(...)  \,
-#define Z_IS_2249U_EQ_2249U(...) \,
-#define Z_IS_2250_EQ_2250(...)   \,
-#define Z_IS_2250U_EQ_2250(...)  \,
-#define Z_IS_2250_EQ_2250U(...)  \,
-#define Z_IS_2250U_EQ_2250U(...) \,
-#define Z_IS_2251_EQ_2251(...)   \,
-#define Z_IS_2251U_EQ_2251(...)  \,
-#define Z_IS_2251_EQ_2251U(...)  \,
-#define Z_IS_2251U_EQ_2251U(...) \,
-#define Z_IS_2252_EQ_2252(...)   \,
-#define Z_IS_2252U_EQ_2252(...)  \,
-#define Z_IS_2252_EQ_2252U(...)  \,
-#define Z_IS_2252U_EQ_2252U(...) \,
-#define Z_IS_2253_EQ_2253(...)   \,
-#define Z_IS_2253U_EQ_2253(...)  \,
-#define Z_IS_2253_EQ_2253U(...)  \,
-#define Z_IS_2253U_EQ_2253U(...) \,
-#define Z_IS_2254_EQ_2254(...)   \,
-#define Z_IS_2254U_EQ_2254(...)  \,
-#define Z_IS_2254_EQ_2254U(...)  \,
-#define Z_IS_2254U_EQ_2254U(...) \,
-#define Z_IS_2255_EQ_2255(...)   \,
-#define Z_IS_2255U_EQ_2255(...)  \,
-#define Z_IS_2255_EQ_2255U(...)  \,
-#define Z_IS_2255U_EQ_2255U(...) \,
-#define Z_IS_2256_EQ_2256(...)   \,
-#define Z_IS_2256U_EQ_2256(...)  \,
-#define Z_IS_2256_EQ_2256U(...)  \,
-#define Z_IS_2256U_EQ_2256U(...) \,
-#define Z_IS_2257_EQ_2257(...)   \,
-#define Z_IS_2257U_EQ_2257(...)  \,
-#define Z_IS_2257_EQ_2257U(...)  \,
-#define Z_IS_2257U_EQ_2257U(...) \,
-#define Z_IS_2258_EQ_2258(...)   \,
-#define Z_IS_2258U_EQ_2258(...)  \,
-#define Z_IS_2258_EQ_2258U(...)  \,
-#define Z_IS_2258U_EQ_2258U(...) \,
-#define Z_IS_2259_EQ_2259(...)   \,
-#define Z_IS_2259U_EQ_2259(...)  \,
-#define Z_IS_2259_EQ_2259U(...)  \,
-#define Z_IS_2259U_EQ_2259U(...) \,
-#define Z_IS_2260_EQ_2260(...)   \,
-#define Z_IS_2260U_EQ_2260(...)  \,
-#define Z_IS_2260_EQ_2260U(...)  \,
-#define Z_IS_2260U_EQ_2260U(...) \,
-#define Z_IS_2261_EQ_2261(...)   \,
-#define Z_IS_2261U_EQ_2261(...)  \,
-#define Z_IS_2261_EQ_2261U(...)  \,
-#define Z_IS_2261U_EQ_2261U(...) \,
-#define Z_IS_2262_EQ_2262(...)   \,
-#define Z_IS_2262U_EQ_2262(...)  \,
-#define Z_IS_2262_EQ_2262U(...)  \,
-#define Z_IS_2262U_EQ_2262U(...) \,
-#define Z_IS_2263_EQ_2263(...)   \,
-#define Z_IS_2263U_EQ_2263(...)  \,
-#define Z_IS_2263_EQ_2263U(...)  \,
-#define Z_IS_2263U_EQ_2263U(...) \,
-#define Z_IS_2264_EQ_2264(...)   \,
-#define Z_IS_2264U_EQ_2264(...)  \,
-#define Z_IS_2264_EQ_2264U(...)  \,
-#define Z_IS_2264U_EQ_2264U(...) \,
-#define Z_IS_2265_EQ_2265(...)   \,
-#define Z_IS_2265U_EQ_2265(...)  \,
-#define Z_IS_2265_EQ_2265U(...)  \,
-#define Z_IS_2265U_EQ_2265U(...) \,
-#define Z_IS_2266_EQ_2266(...)   \,
-#define Z_IS_2266U_EQ_2266(...)  \,
-#define Z_IS_2266_EQ_2266U(...)  \,
-#define Z_IS_2266U_EQ_2266U(...) \,
-#define Z_IS_2267_EQ_2267(...)   \,
-#define Z_IS_2267U_EQ_2267(...)  \,
-#define Z_IS_2267_EQ_2267U(...)  \,
-#define Z_IS_2267U_EQ_2267U(...) \,
-#define Z_IS_2268_EQ_2268(...)   \,
-#define Z_IS_2268U_EQ_2268(...)  \,
-#define Z_IS_2268_EQ_2268U(...)  \,
-#define Z_IS_2268U_EQ_2268U(...) \,
-#define Z_IS_2269_EQ_2269(...)   \,
-#define Z_IS_2269U_EQ_2269(...)  \,
-#define Z_IS_2269_EQ_2269U(...)  \,
-#define Z_IS_2269U_EQ_2269U(...) \,
-#define Z_IS_2270_EQ_2270(...)   \,
-#define Z_IS_2270U_EQ_2270(...)  \,
-#define Z_IS_2270_EQ_2270U(...)  \,
-#define Z_IS_2270U_EQ_2270U(...) \,
-#define Z_IS_2271_EQ_2271(...)   \,
-#define Z_IS_2271U_EQ_2271(...)  \,
-#define Z_IS_2271_EQ_2271U(...)  \,
-#define Z_IS_2271U_EQ_2271U(...) \,
-#define Z_IS_2272_EQ_2272(...)   \,
-#define Z_IS_2272U_EQ_2272(...)  \,
-#define Z_IS_2272_EQ_2272U(...)  \,
-#define Z_IS_2272U_EQ_2272U(...) \,
-#define Z_IS_2273_EQ_2273(...)   \,
-#define Z_IS_2273U_EQ_2273(...)  \,
-#define Z_IS_2273_EQ_2273U(...)  \,
-#define Z_IS_2273U_EQ_2273U(...) \,
-#define Z_IS_2274_EQ_2274(...)   \,
-#define Z_IS_2274U_EQ_2274(...)  \,
-#define Z_IS_2274_EQ_2274U(...)  \,
-#define Z_IS_2274U_EQ_2274U(...) \,
-#define Z_IS_2275_EQ_2275(...)   \,
-#define Z_IS_2275U_EQ_2275(...)  \,
-#define Z_IS_2275_EQ_2275U(...)  \,
-#define Z_IS_2275U_EQ_2275U(...) \,
-#define Z_IS_2276_EQ_2276(...)   \,
-#define Z_IS_2276U_EQ_2276(...)  \,
-#define Z_IS_2276_EQ_2276U(...)  \,
-#define Z_IS_2276U_EQ_2276U(...) \,
-#define Z_IS_2277_EQ_2277(...)   \,
-#define Z_IS_2277U_EQ_2277(...)  \,
-#define Z_IS_2277_EQ_2277U(...)  \,
-#define Z_IS_2277U_EQ_2277U(...) \,
-#define Z_IS_2278_EQ_2278(...)   \,
-#define Z_IS_2278U_EQ_2278(...)  \,
-#define Z_IS_2278_EQ_2278U(...)  \,
-#define Z_IS_2278U_EQ_2278U(...) \,
-#define Z_IS_2279_EQ_2279(...)   \,
-#define Z_IS_2279U_EQ_2279(...)  \,
-#define Z_IS_2279_EQ_2279U(...)  \,
-#define Z_IS_2279U_EQ_2279U(...) \,
-#define Z_IS_2280_EQ_2280(...)   \,
-#define Z_IS_2280U_EQ_2280(...)  \,
-#define Z_IS_2280_EQ_2280U(...)  \,
-#define Z_IS_2280U_EQ_2280U(...) \,
-#define Z_IS_2281_EQ_2281(...)   \,
-#define Z_IS_2281U_EQ_2281(...)  \,
-#define Z_IS_2281_EQ_2281U(...)  \,
-#define Z_IS_2281U_EQ_2281U(...) \,
-#define Z_IS_2282_EQ_2282(...)   \,
-#define Z_IS_2282U_EQ_2282(...)  \,
-#define Z_IS_2282_EQ_2282U(...)  \,
-#define Z_IS_2282U_EQ_2282U(...) \,
-#define Z_IS_2283_EQ_2283(...)   \,
-#define Z_IS_2283U_EQ_2283(...)  \,
-#define Z_IS_2283_EQ_2283U(...)  \,
-#define Z_IS_2283U_EQ_2283U(...) \,
-#define Z_IS_2284_EQ_2284(...)   \,
-#define Z_IS_2284U_EQ_2284(...)  \,
-#define Z_IS_2284_EQ_2284U(...)  \,
-#define Z_IS_2284U_EQ_2284U(...) \,
-#define Z_IS_2285_EQ_2285(...)   \,
-#define Z_IS_2285U_EQ_2285(...)  \,
-#define Z_IS_2285_EQ_2285U(...)  \,
-#define Z_IS_2285U_EQ_2285U(...) \,
-#define Z_IS_2286_EQ_2286(...)   \,
-#define Z_IS_2286U_EQ_2286(...)  \,
-#define Z_IS_2286_EQ_2286U(...)  \,
-#define Z_IS_2286U_EQ_2286U(...) \,
-#define Z_IS_2287_EQ_2287(...)   \,
-#define Z_IS_2287U_EQ_2287(...)  \,
-#define Z_IS_2287_EQ_2287U(...)  \,
-#define Z_IS_2287U_EQ_2287U(...) \,
-#define Z_IS_2288_EQ_2288(...)   \,
-#define Z_IS_2288U_EQ_2288(...)  \,
-#define Z_IS_2288_EQ_2288U(...)  \,
-#define Z_IS_2288U_EQ_2288U(...) \,
-#define Z_IS_2289_EQ_2289(...)   \,
-#define Z_IS_2289U_EQ_2289(...)  \,
-#define Z_IS_2289_EQ_2289U(...)  \,
-#define Z_IS_2289U_EQ_2289U(...) \,
-#define Z_IS_2290_EQ_2290(...)   \,
-#define Z_IS_2290U_EQ_2290(...)  \,
-#define Z_IS_2290_EQ_2290U(...)  \,
-#define Z_IS_2290U_EQ_2290U(...) \,
-#define Z_IS_2291_EQ_2291(...)   \,
-#define Z_IS_2291U_EQ_2291(...)  \,
-#define Z_IS_2291_EQ_2291U(...)  \,
-#define Z_IS_2291U_EQ_2291U(...) \,
-#define Z_IS_2292_EQ_2292(...)   \,
-#define Z_IS_2292U_EQ_2292(...)  \,
-#define Z_IS_2292_EQ_2292U(...)  \,
-#define Z_IS_2292U_EQ_2292U(...) \,
-#define Z_IS_2293_EQ_2293(...)   \,
-#define Z_IS_2293U_EQ_2293(...)  \,
-#define Z_IS_2293_EQ_2293U(...)  \,
-#define Z_IS_2293U_EQ_2293U(...) \,
-#define Z_IS_2294_EQ_2294(...)   \,
-#define Z_IS_2294U_EQ_2294(...)  \,
-#define Z_IS_2294_EQ_2294U(...)  \,
-#define Z_IS_2294U_EQ_2294U(...) \,
-#define Z_IS_2295_EQ_2295(...)   \,
-#define Z_IS_2295U_EQ_2295(...)  \,
-#define Z_IS_2295_EQ_2295U(...)  \,
-#define Z_IS_2295U_EQ_2295U(...) \,
-#define Z_IS_2296_EQ_2296(...)   \,
-#define Z_IS_2296U_EQ_2296(...)  \,
-#define Z_IS_2296_EQ_2296U(...)  \,
-#define Z_IS_2296U_EQ_2296U(...) \,
-#define Z_IS_2297_EQ_2297(...)   \,
-#define Z_IS_2297U_EQ_2297(...)  \,
-#define Z_IS_2297_EQ_2297U(...)  \,
-#define Z_IS_2297U_EQ_2297U(...) \,
-#define Z_IS_2298_EQ_2298(...)   \,
-#define Z_IS_2298U_EQ_2298(...)  \,
-#define Z_IS_2298_EQ_2298U(...)  \,
-#define Z_IS_2298U_EQ_2298U(...) \,
-#define Z_IS_2299_EQ_2299(...)   \,
-#define Z_IS_2299U_EQ_2299(...)  \,
-#define Z_IS_2299_EQ_2299U(...)  \,
-#define Z_IS_2299U_EQ_2299U(...) \,
-#define Z_IS_2300_EQ_2300(...)   \,
-#define Z_IS_2300U_EQ_2300(...)  \,
-#define Z_IS_2300_EQ_2300U(...)  \,
-#define Z_IS_2300U_EQ_2300U(...) \,
-#define Z_IS_2301_EQ_2301(...)   \,
-#define Z_IS_2301U_EQ_2301(...)  \,
-#define Z_IS_2301_EQ_2301U(...)  \,
-#define Z_IS_2301U_EQ_2301U(...) \,
-#define Z_IS_2302_EQ_2302(...)   \,
-#define Z_IS_2302U_EQ_2302(...)  \,
-#define Z_IS_2302_EQ_2302U(...)  \,
-#define Z_IS_2302U_EQ_2302U(...) \,
-#define Z_IS_2303_EQ_2303(...)   \,
-#define Z_IS_2303U_EQ_2303(...)  \,
-#define Z_IS_2303_EQ_2303U(...)  \,
-#define Z_IS_2303U_EQ_2303U(...) \,
-#define Z_IS_2304_EQ_2304(...)   \,
-#define Z_IS_2304U_EQ_2304(...)  \,
-#define Z_IS_2304_EQ_2304U(...)  \,
-#define Z_IS_2304U_EQ_2304U(...) \,
-#define Z_IS_2305_EQ_2305(...)   \,
-#define Z_IS_2305U_EQ_2305(...)  \,
-#define Z_IS_2305_EQ_2305U(...)  \,
-#define Z_IS_2305U_EQ_2305U(...) \,
-#define Z_IS_2306_EQ_2306(...)   \,
-#define Z_IS_2306U_EQ_2306(...)  \,
-#define Z_IS_2306_EQ_2306U(...)  \,
-#define Z_IS_2306U_EQ_2306U(...) \,
-#define Z_IS_2307_EQ_2307(...)   \,
-#define Z_IS_2307U_EQ_2307(...)  \,
-#define Z_IS_2307_EQ_2307U(...)  \,
-#define Z_IS_2307U_EQ_2307U(...) \,
-#define Z_IS_2308_EQ_2308(...)   \,
-#define Z_IS_2308U_EQ_2308(...)  \,
-#define Z_IS_2308_EQ_2308U(...)  \,
-#define Z_IS_2308U_EQ_2308U(...) \,
-#define Z_IS_2309_EQ_2309(...)   \,
-#define Z_IS_2309U_EQ_2309(...)  \,
-#define Z_IS_2309_EQ_2309U(...)  \,
-#define Z_IS_2309U_EQ_2309U(...) \,
-#define Z_IS_2310_EQ_2310(...)   \,
-#define Z_IS_2310U_EQ_2310(...)  \,
-#define Z_IS_2310_EQ_2310U(...)  \,
-#define Z_IS_2310U_EQ_2310U(...) \,
-#define Z_IS_2311_EQ_2311(...)   \,
-#define Z_IS_2311U_EQ_2311(...)  \,
-#define Z_IS_2311_EQ_2311U(...)  \,
-#define Z_IS_2311U_EQ_2311U(...) \,
-#define Z_IS_2312_EQ_2312(...)   \,
-#define Z_IS_2312U_EQ_2312(...)  \,
-#define Z_IS_2312_EQ_2312U(...)  \,
-#define Z_IS_2312U_EQ_2312U(...) \,
-#define Z_IS_2313_EQ_2313(...)   \,
-#define Z_IS_2313U_EQ_2313(...)  \,
-#define Z_IS_2313_EQ_2313U(...)  \,
-#define Z_IS_2313U_EQ_2313U(...) \,
-#define Z_IS_2314_EQ_2314(...)   \,
-#define Z_IS_2314U_EQ_2314(...)  \,
-#define Z_IS_2314_EQ_2314U(...)  \,
-#define Z_IS_2314U_EQ_2314U(...) \,
-#define Z_IS_2315_EQ_2315(...)   \,
-#define Z_IS_2315U_EQ_2315(...)  \,
-#define Z_IS_2315_EQ_2315U(...)  \,
-#define Z_IS_2315U_EQ_2315U(...) \,
-#define Z_IS_2316_EQ_2316(...)   \,
-#define Z_IS_2316U_EQ_2316(...)  \,
-#define Z_IS_2316_EQ_2316U(...)  \,
-#define Z_IS_2316U_EQ_2316U(...) \,
-#define Z_IS_2317_EQ_2317(...)   \,
-#define Z_IS_2317U_EQ_2317(...)  \,
-#define Z_IS_2317_EQ_2317U(...)  \,
-#define Z_IS_2317U_EQ_2317U(...) \,
-#define Z_IS_2318_EQ_2318(...)   \,
-#define Z_IS_2318U_EQ_2318(...)  \,
-#define Z_IS_2318_EQ_2318U(...)  \,
-#define Z_IS_2318U_EQ_2318U(...) \,
-#define Z_IS_2319_EQ_2319(...)   \,
-#define Z_IS_2319U_EQ_2319(...)  \,
-#define Z_IS_2319_EQ_2319U(...)  \,
-#define Z_IS_2319U_EQ_2319U(...) \,
-#define Z_IS_2320_EQ_2320(...)   \,
-#define Z_IS_2320U_EQ_2320(...)  \,
-#define Z_IS_2320_EQ_2320U(...)  \,
-#define Z_IS_2320U_EQ_2320U(...) \,
-#define Z_IS_2321_EQ_2321(...)   \,
-#define Z_IS_2321U_EQ_2321(...)  \,
-#define Z_IS_2321_EQ_2321U(...)  \,
-#define Z_IS_2321U_EQ_2321U(...) \,
-#define Z_IS_2322_EQ_2322(...)   \,
-#define Z_IS_2322U_EQ_2322(...)  \,
-#define Z_IS_2322_EQ_2322U(...)  \,
-#define Z_IS_2322U_EQ_2322U(...) \,
-#define Z_IS_2323_EQ_2323(...)   \,
-#define Z_IS_2323U_EQ_2323(...)  \,
-#define Z_IS_2323_EQ_2323U(...)  \,
-#define Z_IS_2323U_EQ_2323U(...) \,
-#define Z_IS_2324_EQ_2324(...)   \,
-#define Z_IS_2324U_EQ_2324(...)  \,
-#define Z_IS_2324_EQ_2324U(...)  \,
-#define Z_IS_2324U_EQ_2324U(...) \,
-#define Z_IS_2325_EQ_2325(...)   \,
-#define Z_IS_2325U_EQ_2325(...)  \,
-#define Z_IS_2325_EQ_2325U(...)  \,
-#define Z_IS_2325U_EQ_2325U(...) \,
-#define Z_IS_2326_EQ_2326(...)   \,
-#define Z_IS_2326U_EQ_2326(...)  \,
-#define Z_IS_2326_EQ_2326U(...)  \,
-#define Z_IS_2326U_EQ_2326U(...) \,
-#define Z_IS_2327_EQ_2327(...)   \,
-#define Z_IS_2327U_EQ_2327(...)  \,
-#define Z_IS_2327_EQ_2327U(...)  \,
-#define Z_IS_2327U_EQ_2327U(...) \,
-#define Z_IS_2328_EQ_2328(...)   \,
-#define Z_IS_2328U_EQ_2328(...)  \,
-#define Z_IS_2328_EQ_2328U(...)  \,
-#define Z_IS_2328U_EQ_2328U(...) \,
-#define Z_IS_2329_EQ_2329(...)   \,
-#define Z_IS_2329U_EQ_2329(...)  \,
-#define Z_IS_2329_EQ_2329U(...)  \,
-#define Z_IS_2329U_EQ_2329U(...) \,
-#define Z_IS_2330_EQ_2330(...)   \,
-#define Z_IS_2330U_EQ_2330(...)  \,
-#define Z_IS_2330_EQ_2330U(...)  \,
-#define Z_IS_2330U_EQ_2330U(...) \,
-#define Z_IS_2331_EQ_2331(...)   \,
-#define Z_IS_2331U_EQ_2331(...)  \,
-#define Z_IS_2331_EQ_2331U(...)  \,
-#define Z_IS_2331U_EQ_2331U(...) \,
-#define Z_IS_2332_EQ_2332(...)   \,
-#define Z_IS_2332U_EQ_2332(...)  \,
-#define Z_IS_2332_EQ_2332U(...)  \,
-#define Z_IS_2332U_EQ_2332U(...) \,
-#define Z_IS_2333_EQ_2333(...)   \,
-#define Z_IS_2333U_EQ_2333(...)  \,
-#define Z_IS_2333_EQ_2333U(...)  \,
-#define Z_IS_2333U_EQ_2333U(...) \,
-#define Z_IS_2334_EQ_2334(...)   \,
-#define Z_IS_2334U_EQ_2334(...)  \,
-#define Z_IS_2334_EQ_2334U(...)  \,
-#define Z_IS_2334U_EQ_2334U(...) \,
-#define Z_IS_2335_EQ_2335(...)   \,
-#define Z_IS_2335U_EQ_2335(...)  \,
-#define Z_IS_2335_EQ_2335U(...)  \,
-#define Z_IS_2335U_EQ_2335U(...) \,
-#define Z_IS_2336_EQ_2336(...)   \,
-#define Z_IS_2336U_EQ_2336(...)  \,
-#define Z_IS_2336_EQ_2336U(...)  \,
-#define Z_IS_2336U_EQ_2336U(...) \,
-#define Z_IS_2337_EQ_2337(...)   \,
-#define Z_IS_2337U_EQ_2337(...)  \,
-#define Z_IS_2337_EQ_2337U(...)  \,
-#define Z_IS_2337U_EQ_2337U(...) \,
-#define Z_IS_2338_EQ_2338(...)   \,
-#define Z_IS_2338U_EQ_2338(...)  \,
-#define Z_IS_2338_EQ_2338U(...)  \,
-#define Z_IS_2338U_EQ_2338U(...) \,
-#define Z_IS_2339_EQ_2339(...)   \,
-#define Z_IS_2339U_EQ_2339(...)  \,
-#define Z_IS_2339_EQ_2339U(...)  \,
-#define Z_IS_2339U_EQ_2339U(...) \,
-#define Z_IS_2340_EQ_2340(...)   \,
-#define Z_IS_2340U_EQ_2340(...)  \,
-#define Z_IS_2340_EQ_2340U(...)  \,
-#define Z_IS_2340U_EQ_2340U(...) \,
-#define Z_IS_2341_EQ_2341(...)   \,
-#define Z_IS_2341U_EQ_2341(...)  \,
-#define Z_IS_2341_EQ_2341U(...)  \,
-#define Z_IS_2341U_EQ_2341U(...) \,
-#define Z_IS_2342_EQ_2342(...)   \,
-#define Z_IS_2342U_EQ_2342(...)  \,
-#define Z_IS_2342_EQ_2342U(...)  \,
-#define Z_IS_2342U_EQ_2342U(...) \,
-#define Z_IS_2343_EQ_2343(...)   \,
-#define Z_IS_2343U_EQ_2343(...)  \,
-#define Z_IS_2343_EQ_2343U(...)  \,
-#define Z_IS_2343U_EQ_2343U(...) \,
-#define Z_IS_2344_EQ_2344(...)   \,
-#define Z_IS_2344U_EQ_2344(...)  \,
-#define Z_IS_2344_EQ_2344U(...)  \,
-#define Z_IS_2344U_EQ_2344U(...) \,
-#define Z_IS_2345_EQ_2345(...)   \,
-#define Z_IS_2345U_EQ_2345(...)  \,
-#define Z_IS_2345_EQ_2345U(...)  \,
-#define Z_IS_2345U_EQ_2345U(...) \,
-#define Z_IS_2346_EQ_2346(...)   \,
-#define Z_IS_2346U_EQ_2346(...)  \,
-#define Z_IS_2346_EQ_2346U(...)  \,
-#define Z_IS_2346U_EQ_2346U(...) \,
-#define Z_IS_2347_EQ_2347(...)   \,
-#define Z_IS_2347U_EQ_2347(...)  \,
-#define Z_IS_2347_EQ_2347U(...)  \,
-#define Z_IS_2347U_EQ_2347U(...) \,
-#define Z_IS_2348_EQ_2348(...)   \,
-#define Z_IS_2348U_EQ_2348(...)  \,
-#define Z_IS_2348_EQ_2348U(...)  \,
-#define Z_IS_2348U_EQ_2348U(...) \,
-#define Z_IS_2349_EQ_2349(...)   \,
-#define Z_IS_2349U_EQ_2349(...)  \,
-#define Z_IS_2349_EQ_2349U(...)  \,
-#define Z_IS_2349U_EQ_2349U(...) \,
-#define Z_IS_2350_EQ_2350(...)   \,
-#define Z_IS_2350U_EQ_2350(...)  \,
-#define Z_IS_2350_EQ_2350U(...)  \,
-#define Z_IS_2350U_EQ_2350U(...) \,
-#define Z_IS_2351_EQ_2351(...)   \,
-#define Z_IS_2351U_EQ_2351(...)  \,
-#define Z_IS_2351_EQ_2351U(...)  \,
-#define Z_IS_2351U_EQ_2351U(...) \,
-#define Z_IS_2352_EQ_2352(...)   \,
-#define Z_IS_2352U_EQ_2352(...)  \,
-#define Z_IS_2352_EQ_2352U(...)  \,
-#define Z_IS_2352U_EQ_2352U(...) \,
-#define Z_IS_2353_EQ_2353(...)   \,
-#define Z_IS_2353U_EQ_2353(...)  \,
-#define Z_IS_2353_EQ_2353U(...)  \,
-#define Z_IS_2353U_EQ_2353U(...) \,
-#define Z_IS_2354_EQ_2354(...)   \,
-#define Z_IS_2354U_EQ_2354(...)  \,
-#define Z_IS_2354_EQ_2354U(...)  \,
-#define Z_IS_2354U_EQ_2354U(...) \,
-#define Z_IS_2355_EQ_2355(...)   \,
-#define Z_IS_2355U_EQ_2355(...)  \,
-#define Z_IS_2355_EQ_2355U(...)  \,
-#define Z_IS_2355U_EQ_2355U(...) \,
-#define Z_IS_2356_EQ_2356(...)   \,
-#define Z_IS_2356U_EQ_2356(...)  \,
-#define Z_IS_2356_EQ_2356U(...)  \,
-#define Z_IS_2356U_EQ_2356U(...) \,
-#define Z_IS_2357_EQ_2357(...)   \,
-#define Z_IS_2357U_EQ_2357(...)  \,
-#define Z_IS_2357_EQ_2357U(...)  \,
-#define Z_IS_2357U_EQ_2357U(...) \,
-#define Z_IS_2358_EQ_2358(...)   \,
-#define Z_IS_2358U_EQ_2358(...)  \,
-#define Z_IS_2358_EQ_2358U(...)  \,
-#define Z_IS_2358U_EQ_2358U(...) \,
-#define Z_IS_2359_EQ_2359(...)   \,
-#define Z_IS_2359U_EQ_2359(...)  \,
-#define Z_IS_2359_EQ_2359U(...)  \,
-#define Z_IS_2359U_EQ_2359U(...) \,
-#define Z_IS_2360_EQ_2360(...)   \,
-#define Z_IS_2360U_EQ_2360(...)  \,
-#define Z_IS_2360_EQ_2360U(...)  \,
-#define Z_IS_2360U_EQ_2360U(...) \,
-#define Z_IS_2361_EQ_2361(...)   \,
-#define Z_IS_2361U_EQ_2361(...)  \,
-#define Z_IS_2361_EQ_2361U(...)  \,
-#define Z_IS_2361U_EQ_2361U(...) \,
-#define Z_IS_2362_EQ_2362(...)   \,
-#define Z_IS_2362U_EQ_2362(...)  \,
-#define Z_IS_2362_EQ_2362U(...)  \,
-#define Z_IS_2362U_EQ_2362U(...) \,
-#define Z_IS_2363_EQ_2363(...)   \,
-#define Z_IS_2363U_EQ_2363(...)  \,
-#define Z_IS_2363_EQ_2363U(...)  \,
-#define Z_IS_2363U_EQ_2363U(...) \,
-#define Z_IS_2364_EQ_2364(...)   \,
-#define Z_IS_2364U_EQ_2364(...)  \,
-#define Z_IS_2364_EQ_2364U(...)  \,
-#define Z_IS_2364U_EQ_2364U(...) \,
-#define Z_IS_2365_EQ_2365(...)   \,
-#define Z_IS_2365U_EQ_2365(...)  \,
-#define Z_IS_2365_EQ_2365U(...)  \,
-#define Z_IS_2365U_EQ_2365U(...) \,
-#define Z_IS_2366_EQ_2366(...)   \,
-#define Z_IS_2366U_EQ_2366(...)  \,
-#define Z_IS_2366_EQ_2366U(...)  \,
-#define Z_IS_2366U_EQ_2366U(...) \,
-#define Z_IS_2367_EQ_2367(...)   \,
-#define Z_IS_2367U_EQ_2367(...)  \,
-#define Z_IS_2367_EQ_2367U(...)  \,
-#define Z_IS_2367U_EQ_2367U(...) \,
-#define Z_IS_2368_EQ_2368(...)   \,
-#define Z_IS_2368U_EQ_2368(...)  \,
-#define Z_IS_2368_EQ_2368U(...)  \,
-#define Z_IS_2368U_EQ_2368U(...) \,
-#define Z_IS_2369_EQ_2369(...)   \,
-#define Z_IS_2369U_EQ_2369(...)  \,
-#define Z_IS_2369_EQ_2369U(...)  \,
-#define Z_IS_2369U_EQ_2369U(...) \,
-#define Z_IS_2370_EQ_2370(...)   \,
-#define Z_IS_2370U_EQ_2370(...)  \,
-#define Z_IS_2370_EQ_2370U(...)  \,
-#define Z_IS_2370U_EQ_2370U(...) \,
-#define Z_IS_2371_EQ_2371(...)   \,
-#define Z_IS_2371U_EQ_2371(...)  \,
-#define Z_IS_2371_EQ_2371U(...)  \,
-#define Z_IS_2371U_EQ_2371U(...) \,
-#define Z_IS_2372_EQ_2372(...)   \,
-#define Z_IS_2372U_EQ_2372(...)  \,
-#define Z_IS_2372_EQ_2372U(...)  \,
-#define Z_IS_2372U_EQ_2372U(...) \,
-#define Z_IS_2373_EQ_2373(...)   \,
-#define Z_IS_2373U_EQ_2373(...)  \,
-#define Z_IS_2373_EQ_2373U(...)  \,
-#define Z_IS_2373U_EQ_2373U(...) \,
-#define Z_IS_2374_EQ_2374(...)   \,
-#define Z_IS_2374U_EQ_2374(...)  \,
-#define Z_IS_2374_EQ_2374U(...)  \,
-#define Z_IS_2374U_EQ_2374U(...) \,
-#define Z_IS_2375_EQ_2375(...)   \,
-#define Z_IS_2375U_EQ_2375(...)  \,
-#define Z_IS_2375_EQ_2375U(...)  \,
-#define Z_IS_2375U_EQ_2375U(...) \,
-#define Z_IS_2376_EQ_2376(...)   \,
-#define Z_IS_2376U_EQ_2376(...)  \,
-#define Z_IS_2376_EQ_2376U(...)  \,
-#define Z_IS_2376U_EQ_2376U(...) \,
-#define Z_IS_2377_EQ_2377(...)   \,
-#define Z_IS_2377U_EQ_2377(...)  \,
-#define Z_IS_2377_EQ_2377U(...)  \,
-#define Z_IS_2377U_EQ_2377U(...) \,
-#define Z_IS_2378_EQ_2378(...)   \,
-#define Z_IS_2378U_EQ_2378(...)  \,
-#define Z_IS_2378_EQ_2378U(...)  \,
-#define Z_IS_2378U_EQ_2378U(...) \,
-#define Z_IS_2379_EQ_2379(...)   \,
-#define Z_IS_2379U_EQ_2379(...)  \,
-#define Z_IS_2379_EQ_2379U(...)  \,
-#define Z_IS_2379U_EQ_2379U(...) \,
-#define Z_IS_2380_EQ_2380(...)   \,
-#define Z_IS_2380U_EQ_2380(...)  \,
-#define Z_IS_2380_EQ_2380U(...)  \,
-#define Z_IS_2380U_EQ_2380U(...) \,
-#define Z_IS_2381_EQ_2381(...)   \,
-#define Z_IS_2381U_EQ_2381(...)  \,
-#define Z_IS_2381_EQ_2381U(...)  \,
-#define Z_IS_2381U_EQ_2381U(...) \,
-#define Z_IS_2382_EQ_2382(...)   \,
-#define Z_IS_2382U_EQ_2382(...)  \,
-#define Z_IS_2382_EQ_2382U(...)  \,
-#define Z_IS_2382U_EQ_2382U(...) \,
-#define Z_IS_2383_EQ_2383(...)   \,
-#define Z_IS_2383U_EQ_2383(...)  \,
-#define Z_IS_2383_EQ_2383U(...)  \,
-#define Z_IS_2383U_EQ_2383U(...) \,
-#define Z_IS_2384_EQ_2384(...)   \,
-#define Z_IS_2384U_EQ_2384(...)  \,
-#define Z_IS_2384_EQ_2384U(...)  \,
-#define Z_IS_2384U_EQ_2384U(...) \,
-#define Z_IS_2385_EQ_2385(...)   \,
-#define Z_IS_2385U_EQ_2385(...)  \,
-#define Z_IS_2385_EQ_2385U(...)  \,
-#define Z_IS_2385U_EQ_2385U(...) \,
-#define Z_IS_2386_EQ_2386(...)   \,
-#define Z_IS_2386U_EQ_2386(...)  \,
-#define Z_IS_2386_EQ_2386U(...)  \,
-#define Z_IS_2386U_EQ_2386U(...) \,
-#define Z_IS_2387_EQ_2387(...)   \,
-#define Z_IS_2387U_EQ_2387(...)  \,
-#define Z_IS_2387_EQ_2387U(...)  \,
-#define Z_IS_2387U_EQ_2387U(...) \,
-#define Z_IS_2388_EQ_2388(...)   \,
-#define Z_IS_2388U_EQ_2388(...)  \,
-#define Z_IS_2388_EQ_2388U(...)  \,
-#define Z_IS_2388U_EQ_2388U(...) \,
-#define Z_IS_2389_EQ_2389(...)   \,
-#define Z_IS_2389U_EQ_2389(...)  \,
-#define Z_IS_2389_EQ_2389U(...)  \,
-#define Z_IS_2389U_EQ_2389U(...) \,
-#define Z_IS_2390_EQ_2390(...)   \,
-#define Z_IS_2390U_EQ_2390(...)  \,
-#define Z_IS_2390_EQ_2390U(...)  \,
-#define Z_IS_2390U_EQ_2390U(...) \,
-#define Z_IS_2391_EQ_2391(...)   \,
-#define Z_IS_2391U_EQ_2391(...)  \,
-#define Z_IS_2391_EQ_2391U(...)  \,
-#define Z_IS_2391U_EQ_2391U(...) \,
-#define Z_IS_2392_EQ_2392(...)   \,
-#define Z_IS_2392U_EQ_2392(...)  \,
-#define Z_IS_2392_EQ_2392U(...)  \,
-#define Z_IS_2392U_EQ_2392U(...) \,
-#define Z_IS_2393_EQ_2393(...)   \,
-#define Z_IS_2393U_EQ_2393(...)  \,
-#define Z_IS_2393_EQ_2393U(...)  \,
-#define Z_IS_2393U_EQ_2393U(...) \,
-#define Z_IS_2394_EQ_2394(...)   \,
-#define Z_IS_2394U_EQ_2394(...)  \,
-#define Z_IS_2394_EQ_2394U(...)  \,
-#define Z_IS_2394U_EQ_2394U(...) \,
-#define Z_IS_2395_EQ_2395(...)   \,
-#define Z_IS_2395U_EQ_2395(...)  \,
-#define Z_IS_2395_EQ_2395U(...)  \,
-#define Z_IS_2395U_EQ_2395U(...) \,
-#define Z_IS_2396_EQ_2396(...)   \,
-#define Z_IS_2396U_EQ_2396(...)  \,
-#define Z_IS_2396_EQ_2396U(...)  \,
-#define Z_IS_2396U_EQ_2396U(...) \,
-#define Z_IS_2397_EQ_2397(...)   \,
-#define Z_IS_2397U_EQ_2397(...)  \,
-#define Z_IS_2397_EQ_2397U(...)  \,
-#define Z_IS_2397U_EQ_2397U(...) \,
-#define Z_IS_2398_EQ_2398(...)   \,
-#define Z_IS_2398U_EQ_2398(...)  \,
-#define Z_IS_2398_EQ_2398U(...)  \,
-#define Z_IS_2398U_EQ_2398U(...) \,
-#define Z_IS_2399_EQ_2399(...)   \,
-#define Z_IS_2399U_EQ_2399(...)  \,
-#define Z_IS_2399_EQ_2399U(...)  \,
-#define Z_IS_2399U_EQ_2399U(...) \,
-#define Z_IS_2400_EQ_2400(...)   \,
-#define Z_IS_2400U_EQ_2400(...)  \,
-#define Z_IS_2400_EQ_2400U(...)  \,
-#define Z_IS_2400U_EQ_2400U(...) \,
-#define Z_IS_2401_EQ_2401(...)   \,
-#define Z_IS_2401U_EQ_2401(...)  \,
-#define Z_IS_2401_EQ_2401U(...)  \,
-#define Z_IS_2401U_EQ_2401U(...) \,
-#define Z_IS_2402_EQ_2402(...)   \,
-#define Z_IS_2402U_EQ_2402(...)  \,
-#define Z_IS_2402_EQ_2402U(...)  \,
-#define Z_IS_2402U_EQ_2402U(...) \,
-#define Z_IS_2403_EQ_2403(...)   \,
-#define Z_IS_2403U_EQ_2403(...)  \,
-#define Z_IS_2403_EQ_2403U(...)  \,
-#define Z_IS_2403U_EQ_2403U(...) \,
-#define Z_IS_2404_EQ_2404(...)   \,
-#define Z_IS_2404U_EQ_2404(...)  \,
-#define Z_IS_2404_EQ_2404U(...)  \,
-#define Z_IS_2404U_EQ_2404U(...) \,
-#define Z_IS_2405_EQ_2405(...)   \,
-#define Z_IS_2405U_EQ_2405(...)  \,
-#define Z_IS_2405_EQ_2405U(...)  \,
-#define Z_IS_2405U_EQ_2405U(...) \,
-#define Z_IS_2406_EQ_2406(...)   \,
-#define Z_IS_2406U_EQ_2406(...)  \,
-#define Z_IS_2406_EQ_2406U(...)  \,
-#define Z_IS_2406U_EQ_2406U(...) \,
-#define Z_IS_2407_EQ_2407(...)   \,
-#define Z_IS_2407U_EQ_2407(...)  \,
-#define Z_IS_2407_EQ_2407U(...)  \,
-#define Z_IS_2407U_EQ_2407U(...) \,
-#define Z_IS_2408_EQ_2408(...)   \,
-#define Z_IS_2408U_EQ_2408(...)  \,
-#define Z_IS_2408_EQ_2408U(...)  \,
-#define Z_IS_2408U_EQ_2408U(...) \,
-#define Z_IS_2409_EQ_2409(...)   \,
-#define Z_IS_2409U_EQ_2409(...)  \,
-#define Z_IS_2409_EQ_2409U(...)  \,
-#define Z_IS_2409U_EQ_2409U(...) \,
-#define Z_IS_2410_EQ_2410(...)   \,
-#define Z_IS_2410U_EQ_2410(...)  \,
-#define Z_IS_2410_EQ_2410U(...)  \,
-#define Z_IS_2410U_EQ_2410U(...) \,
-#define Z_IS_2411_EQ_2411(...)   \,
-#define Z_IS_2411U_EQ_2411(...)  \,
-#define Z_IS_2411_EQ_2411U(...)  \,
-#define Z_IS_2411U_EQ_2411U(...) \,
-#define Z_IS_2412_EQ_2412(...)   \,
-#define Z_IS_2412U_EQ_2412(...)  \,
-#define Z_IS_2412_EQ_2412U(...)  \,
-#define Z_IS_2412U_EQ_2412U(...) \,
-#define Z_IS_2413_EQ_2413(...)   \,
-#define Z_IS_2413U_EQ_2413(...)  \,
-#define Z_IS_2413_EQ_2413U(...)  \,
-#define Z_IS_2413U_EQ_2413U(...) \,
-#define Z_IS_2414_EQ_2414(...)   \,
-#define Z_IS_2414U_EQ_2414(...)  \,
-#define Z_IS_2414_EQ_2414U(...)  \,
-#define Z_IS_2414U_EQ_2414U(...) \,
-#define Z_IS_2415_EQ_2415(...)   \,
-#define Z_IS_2415U_EQ_2415(...)  \,
-#define Z_IS_2415_EQ_2415U(...)  \,
-#define Z_IS_2415U_EQ_2415U(...) \,
-#define Z_IS_2416_EQ_2416(...)   \,
-#define Z_IS_2416U_EQ_2416(...)  \,
-#define Z_IS_2416_EQ_2416U(...)  \,
-#define Z_IS_2416U_EQ_2416U(...) \,
-#define Z_IS_2417_EQ_2417(...)   \,
-#define Z_IS_2417U_EQ_2417(...)  \,
-#define Z_IS_2417_EQ_2417U(...)  \,
-#define Z_IS_2417U_EQ_2417U(...) \,
-#define Z_IS_2418_EQ_2418(...)   \,
-#define Z_IS_2418U_EQ_2418(...)  \,
-#define Z_IS_2418_EQ_2418U(...)  \,
-#define Z_IS_2418U_EQ_2418U(...) \,
-#define Z_IS_2419_EQ_2419(...)   \,
-#define Z_IS_2419U_EQ_2419(...)  \,
-#define Z_IS_2419_EQ_2419U(...)  \,
-#define Z_IS_2419U_EQ_2419U(...) \,
-#define Z_IS_2420_EQ_2420(...)   \,
-#define Z_IS_2420U_EQ_2420(...)  \,
-#define Z_IS_2420_EQ_2420U(...)  \,
-#define Z_IS_2420U_EQ_2420U(...) \,
-#define Z_IS_2421_EQ_2421(...)   \,
-#define Z_IS_2421U_EQ_2421(...)  \,
-#define Z_IS_2421_EQ_2421U(...)  \,
-#define Z_IS_2421U_EQ_2421U(...) \,
-#define Z_IS_2422_EQ_2422(...)   \,
-#define Z_IS_2422U_EQ_2422(...)  \,
-#define Z_IS_2422_EQ_2422U(...)  \,
-#define Z_IS_2422U_EQ_2422U(...) \,
-#define Z_IS_2423_EQ_2423(...)   \,
-#define Z_IS_2423U_EQ_2423(...)  \,
-#define Z_IS_2423_EQ_2423U(...)  \,
-#define Z_IS_2423U_EQ_2423U(...) \,
-#define Z_IS_2424_EQ_2424(...)   \,
-#define Z_IS_2424U_EQ_2424(...)  \,
-#define Z_IS_2424_EQ_2424U(...)  \,
-#define Z_IS_2424U_EQ_2424U(...) \,
-#define Z_IS_2425_EQ_2425(...)   \,
-#define Z_IS_2425U_EQ_2425(...)  \,
-#define Z_IS_2425_EQ_2425U(...)  \,
-#define Z_IS_2425U_EQ_2425U(...) \,
-#define Z_IS_2426_EQ_2426(...)   \,
-#define Z_IS_2426U_EQ_2426(...)  \,
-#define Z_IS_2426_EQ_2426U(...)  \,
-#define Z_IS_2426U_EQ_2426U(...) \,
-#define Z_IS_2427_EQ_2427(...)   \,
-#define Z_IS_2427U_EQ_2427(...)  \,
-#define Z_IS_2427_EQ_2427U(...)  \,
-#define Z_IS_2427U_EQ_2427U(...) \,
-#define Z_IS_2428_EQ_2428(...)   \,
-#define Z_IS_2428U_EQ_2428(...)  \,
-#define Z_IS_2428_EQ_2428U(...)  \,
-#define Z_IS_2428U_EQ_2428U(...) \,
-#define Z_IS_2429_EQ_2429(...)   \,
-#define Z_IS_2429U_EQ_2429(...)  \,
-#define Z_IS_2429_EQ_2429U(...)  \,
-#define Z_IS_2429U_EQ_2429U(...) \,
-#define Z_IS_2430_EQ_2430(...)   \,
-#define Z_IS_2430U_EQ_2430(...)  \,
-#define Z_IS_2430_EQ_2430U(...)  \,
-#define Z_IS_2430U_EQ_2430U(...) \,
-#define Z_IS_2431_EQ_2431(...)   \,
-#define Z_IS_2431U_EQ_2431(...)  \,
-#define Z_IS_2431_EQ_2431U(...)  \,
-#define Z_IS_2431U_EQ_2431U(...) \,
-#define Z_IS_2432_EQ_2432(...)   \,
-#define Z_IS_2432U_EQ_2432(...)  \,
-#define Z_IS_2432_EQ_2432U(...)  \,
-#define Z_IS_2432U_EQ_2432U(...) \,
-#define Z_IS_2433_EQ_2433(...)   \,
-#define Z_IS_2433U_EQ_2433(...)  \,
-#define Z_IS_2433_EQ_2433U(...)  \,
-#define Z_IS_2433U_EQ_2433U(...) \,
-#define Z_IS_2434_EQ_2434(...)   \,
-#define Z_IS_2434U_EQ_2434(...)  \,
-#define Z_IS_2434_EQ_2434U(...)  \,
-#define Z_IS_2434U_EQ_2434U(...) \,
-#define Z_IS_2435_EQ_2435(...)   \,
-#define Z_IS_2435U_EQ_2435(...)  \,
-#define Z_IS_2435_EQ_2435U(...)  \,
-#define Z_IS_2435U_EQ_2435U(...) \,
-#define Z_IS_2436_EQ_2436(...)   \,
-#define Z_IS_2436U_EQ_2436(...)  \,
-#define Z_IS_2436_EQ_2436U(...)  \,
-#define Z_IS_2436U_EQ_2436U(...) \,
-#define Z_IS_2437_EQ_2437(...)   \,
-#define Z_IS_2437U_EQ_2437(...)  \,
-#define Z_IS_2437_EQ_2437U(...)  \,
-#define Z_IS_2437U_EQ_2437U(...) \,
-#define Z_IS_2438_EQ_2438(...)   \,
-#define Z_IS_2438U_EQ_2438(...)  \,
-#define Z_IS_2438_EQ_2438U(...)  \,
-#define Z_IS_2438U_EQ_2438U(...) \,
-#define Z_IS_2439_EQ_2439(...)   \,
-#define Z_IS_2439U_EQ_2439(...)  \,
-#define Z_IS_2439_EQ_2439U(...)  \,
-#define Z_IS_2439U_EQ_2439U(...) \,
-#define Z_IS_2440_EQ_2440(...)   \,
-#define Z_IS_2440U_EQ_2440(...)  \,
-#define Z_IS_2440_EQ_2440U(...)  \,
-#define Z_IS_2440U_EQ_2440U(...) \,
-#define Z_IS_2441_EQ_2441(...)   \,
-#define Z_IS_2441U_EQ_2441(...)  \,
-#define Z_IS_2441_EQ_2441U(...)  \,
-#define Z_IS_2441U_EQ_2441U(...) \,
-#define Z_IS_2442_EQ_2442(...)   \,
-#define Z_IS_2442U_EQ_2442(...)  \,
-#define Z_IS_2442_EQ_2442U(...)  \,
-#define Z_IS_2442U_EQ_2442U(...) \,
-#define Z_IS_2443_EQ_2443(...)   \,
-#define Z_IS_2443U_EQ_2443(...)  \,
-#define Z_IS_2443_EQ_2443U(...)  \,
-#define Z_IS_2443U_EQ_2443U(...) \,
-#define Z_IS_2444_EQ_2444(...)   \,
-#define Z_IS_2444U_EQ_2444(...)  \,
-#define Z_IS_2444_EQ_2444U(...)  \,
-#define Z_IS_2444U_EQ_2444U(...) \,
-#define Z_IS_2445_EQ_2445(...)   \,
-#define Z_IS_2445U_EQ_2445(...)  \,
-#define Z_IS_2445_EQ_2445U(...)  \,
-#define Z_IS_2445U_EQ_2445U(...) \,
-#define Z_IS_2446_EQ_2446(...)   \,
-#define Z_IS_2446U_EQ_2446(...)  \,
-#define Z_IS_2446_EQ_2446U(...)  \,
-#define Z_IS_2446U_EQ_2446U(...) \,
-#define Z_IS_2447_EQ_2447(...)   \,
-#define Z_IS_2447U_EQ_2447(...)  \,
-#define Z_IS_2447_EQ_2447U(...)  \,
-#define Z_IS_2447U_EQ_2447U(...) \,
-#define Z_IS_2448_EQ_2448(...)   \,
-#define Z_IS_2448U_EQ_2448(...)  \,
-#define Z_IS_2448_EQ_2448U(...)  \,
-#define Z_IS_2448U_EQ_2448U(...) \,
-#define Z_IS_2449_EQ_2449(...)   \,
-#define Z_IS_2449U_EQ_2449(...)  \,
-#define Z_IS_2449_EQ_2449U(...)  \,
-#define Z_IS_2449U_EQ_2449U(...) \,
-#define Z_IS_2450_EQ_2450(...)   \,
-#define Z_IS_2450U_EQ_2450(...)  \,
-#define Z_IS_2450_EQ_2450U(...)  \,
-#define Z_IS_2450U_EQ_2450U(...) \,
-#define Z_IS_2451_EQ_2451(...)   \,
-#define Z_IS_2451U_EQ_2451(...)  \,
-#define Z_IS_2451_EQ_2451U(...)  \,
-#define Z_IS_2451U_EQ_2451U(...) \,
-#define Z_IS_2452_EQ_2452(...)   \,
-#define Z_IS_2452U_EQ_2452(...)  \,
-#define Z_IS_2452_EQ_2452U(...)  \,
-#define Z_IS_2452U_EQ_2452U(...) \,
-#define Z_IS_2453_EQ_2453(...)   \,
-#define Z_IS_2453U_EQ_2453(...)  \,
-#define Z_IS_2453_EQ_2453U(...)  \,
-#define Z_IS_2453U_EQ_2453U(...) \,
-#define Z_IS_2454_EQ_2454(...)   \,
-#define Z_IS_2454U_EQ_2454(...)  \,
-#define Z_IS_2454_EQ_2454U(...)  \,
-#define Z_IS_2454U_EQ_2454U(...) \,
-#define Z_IS_2455_EQ_2455(...)   \,
-#define Z_IS_2455U_EQ_2455(...)  \,
-#define Z_IS_2455_EQ_2455U(...)  \,
-#define Z_IS_2455U_EQ_2455U(...) \,
-#define Z_IS_2456_EQ_2456(...)   \,
-#define Z_IS_2456U_EQ_2456(...)  \,
-#define Z_IS_2456_EQ_2456U(...)  \,
-#define Z_IS_2456U_EQ_2456U(...) \,
-#define Z_IS_2457_EQ_2457(...)   \,
-#define Z_IS_2457U_EQ_2457(...)  \,
-#define Z_IS_2457_EQ_2457U(...)  \,
-#define Z_IS_2457U_EQ_2457U(...) \,
-#define Z_IS_2458_EQ_2458(...)   \,
-#define Z_IS_2458U_EQ_2458(...)  \,
-#define Z_IS_2458_EQ_2458U(...)  \,
-#define Z_IS_2458U_EQ_2458U(...) \,
-#define Z_IS_2459_EQ_2459(...)   \,
-#define Z_IS_2459U_EQ_2459(...)  \,
-#define Z_IS_2459_EQ_2459U(...)  \,
-#define Z_IS_2459U_EQ_2459U(...) \,
-#define Z_IS_2460_EQ_2460(...)   \,
-#define Z_IS_2460U_EQ_2460(...)  \,
-#define Z_IS_2460_EQ_2460U(...)  \,
-#define Z_IS_2460U_EQ_2460U(...) \,
-#define Z_IS_2461_EQ_2461(...)   \,
-#define Z_IS_2461U_EQ_2461(...)  \,
-#define Z_IS_2461_EQ_2461U(...)  \,
-#define Z_IS_2461U_EQ_2461U(...) \,
-#define Z_IS_2462_EQ_2462(...)   \,
-#define Z_IS_2462U_EQ_2462(...)  \,
-#define Z_IS_2462_EQ_2462U(...)  \,
-#define Z_IS_2462U_EQ_2462U(...) \,
-#define Z_IS_2463_EQ_2463(...)   \,
-#define Z_IS_2463U_EQ_2463(...)  \,
-#define Z_IS_2463_EQ_2463U(...)  \,
-#define Z_IS_2463U_EQ_2463U(...) \,
-#define Z_IS_2464_EQ_2464(...)   \,
-#define Z_IS_2464U_EQ_2464(...)  \,
-#define Z_IS_2464_EQ_2464U(...)  \,
-#define Z_IS_2464U_EQ_2464U(...) \,
-#define Z_IS_2465_EQ_2465(...)   \,
-#define Z_IS_2465U_EQ_2465(...)  \,
-#define Z_IS_2465_EQ_2465U(...)  \,
-#define Z_IS_2465U_EQ_2465U(...) \,
-#define Z_IS_2466_EQ_2466(...)   \,
-#define Z_IS_2466U_EQ_2466(...)  \,
-#define Z_IS_2466_EQ_2466U(...)  \,
-#define Z_IS_2466U_EQ_2466U(...) \,
-#define Z_IS_2467_EQ_2467(...)   \,
-#define Z_IS_2467U_EQ_2467(...)  \,
-#define Z_IS_2467_EQ_2467U(...)  \,
-#define Z_IS_2467U_EQ_2467U(...) \,
-#define Z_IS_2468_EQ_2468(...)   \,
-#define Z_IS_2468U_EQ_2468(...)  \,
-#define Z_IS_2468_EQ_2468U(...)  \,
-#define Z_IS_2468U_EQ_2468U(...) \,
-#define Z_IS_2469_EQ_2469(...)   \,
-#define Z_IS_2469U_EQ_2469(...)  \,
-#define Z_IS_2469_EQ_2469U(...)  \,
-#define Z_IS_2469U_EQ_2469U(...) \,
-#define Z_IS_2470_EQ_2470(...)   \,
-#define Z_IS_2470U_EQ_2470(...)  \,
-#define Z_IS_2470_EQ_2470U(...)  \,
-#define Z_IS_2470U_EQ_2470U(...) \,
-#define Z_IS_2471_EQ_2471(...)   \,
-#define Z_IS_2471U_EQ_2471(...)  \,
-#define Z_IS_2471_EQ_2471U(...)  \,
-#define Z_IS_2471U_EQ_2471U(...) \,
-#define Z_IS_2472_EQ_2472(...)   \,
-#define Z_IS_2472U_EQ_2472(...)  \,
-#define Z_IS_2472_EQ_2472U(...)  \,
-#define Z_IS_2472U_EQ_2472U(...) \,
-#define Z_IS_2473_EQ_2473(...)   \,
-#define Z_IS_2473U_EQ_2473(...)  \,
-#define Z_IS_2473_EQ_2473U(...)  \,
-#define Z_IS_2473U_EQ_2473U(...) \,
-#define Z_IS_2474_EQ_2474(...)   \,
-#define Z_IS_2474U_EQ_2474(...)  \,
-#define Z_IS_2474_EQ_2474U(...)  \,
-#define Z_IS_2474U_EQ_2474U(...) \,
-#define Z_IS_2475_EQ_2475(...)   \,
-#define Z_IS_2475U_EQ_2475(...)  \,
-#define Z_IS_2475_EQ_2475U(...)  \,
-#define Z_IS_2475U_EQ_2475U(...) \,
-#define Z_IS_2476_EQ_2476(...)   \,
-#define Z_IS_2476U_EQ_2476(...)  \,
-#define Z_IS_2476_EQ_2476U(...)  \,
-#define Z_IS_2476U_EQ_2476U(...) \,
-#define Z_IS_2477_EQ_2477(...)   \,
-#define Z_IS_2477U_EQ_2477(...)  \,
-#define Z_IS_2477_EQ_2477U(...)  \,
-#define Z_IS_2477U_EQ_2477U(...) \,
-#define Z_IS_2478_EQ_2478(...)   \,
-#define Z_IS_2478U_EQ_2478(...)  \,
-#define Z_IS_2478_EQ_2478U(...)  \,
-#define Z_IS_2478U_EQ_2478U(...) \,
-#define Z_IS_2479_EQ_2479(...)   \,
-#define Z_IS_2479U_EQ_2479(...)  \,
-#define Z_IS_2479_EQ_2479U(...)  \,
-#define Z_IS_2479U_EQ_2479U(...) \,
-#define Z_IS_2480_EQ_2480(...)   \,
-#define Z_IS_2480U_EQ_2480(...)  \,
-#define Z_IS_2480_EQ_2480U(...)  \,
-#define Z_IS_2480U_EQ_2480U(...) \,
-#define Z_IS_2481_EQ_2481(...)   \,
-#define Z_IS_2481U_EQ_2481(...)  \,
-#define Z_IS_2481_EQ_2481U(...)  \,
-#define Z_IS_2481U_EQ_2481U(...) \,
-#define Z_IS_2482_EQ_2482(...)   \,
-#define Z_IS_2482U_EQ_2482(...)  \,
-#define Z_IS_2482_EQ_2482U(...)  \,
-#define Z_IS_2482U_EQ_2482U(...) \,
-#define Z_IS_2483_EQ_2483(...)   \,
-#define Z_IS_2483U_EQ_2483(...)  \,
-#define Z_IS_2483_EQ_2483U(...)  \,
-#define Z_IS_2483U_EQ_2483U(...) \,
-#define Z_IS_2484_EQ_2484(...)   \,
-#define Z_IS_2484U_EQ_2484(...)  \,
-#define Z_IS_2484_EQ_2484U(...)  \,
-#define Z_IS_2484U_EQ_2484U(...) \,
-#define Z_IS_2485_EQ_2485(...)   \,
-#define Z_IS_2485U_EQ_2485(...)  \,
-#define Z_IS_2485_EQ_2485U(...)  \,
-#define Z_IS_2485U_EQ_2485U(...) \,
-#define Z_IS_2486_EQ_2486(...)   \,
-#define Z_IS_2486U_EQ_2486(...)  \,
-#define Z_IS_2486_EQ_2486U(...)  \,
-#define Z_IS_2486U_EQ_2486U(...) \,
-#define Z_IS_2487_EQ_2487(...)   \,
-#define Z_IS_2487U_EQ_2487(...)  \,
-#define Z_IS_2487_EQ_2487U(...)  \,
-#define Z_IS_2487U_EQ_2487U(...) \,
-#define Z_IS_2488_EQ_2488(...)   \,
-#define Z_IS_2488U_EQ_2488(...)  \,
-#define Z_IS_2488_EQ_2488U(...)  \,
-#define Z_IS_2488U_EQ_2488U(...) \,
-#define Z_IS_2489_EQ_2489(...)   \,
-#define Z_IS_2489U_EQ_2489(...)  \,
-#define Z_IS_2489_EQ_2489U(...)  \,
-#define Z_IS_2489U_EQ_2489U(...) \,
-#define Z_IS_2490_EQ_2490(...)   \,
-#define Z_IS_2490U_EQ_2490(...)  \,
-#define Z_IS_2490_EQ_2490U(...)  \,
-#define Z_IS_2490U_EQ_2490U(...) \,
-#define Z_IS_2491_EQ_2491(...)   \,
-#define Z_IS_2491U_EQ_2491(...)  \,
-#define Z_IS_2491_EQ_2491U(...)  \,
-#define Z_IS_2491U_EQ_2491U(...) \,
-#define Z_IS_2492_EQ_2492(...)   \,
-#define Z_IS_2492U_EQ_2492(...)  \,
-#define Z_IS_2492_EQ_2492U(...)  \,
-#define Z_IS_2492U_EQ_2492U(...) \,
-#define Z_IS_2493_EQ_2493(...)   \,
-#define Z_IS_2493U_EQ_2493(...)  \,
-#define Z_IS_2493_EQ_2493U(...)  \,
-#define Z_IS_2493U_EQ_2493U(...) \,
-#define Z_IS_2494_EQ_2494(...)   \,
-#define Z_IS_2494U_EQ_2494(...)  \,
-#define Z_IS_2494_EQ_2494U(...)  \,
-#define Z_IS_2494U_EQ_2494U(...) \,
-#define Z_IS_2495_EQ_2495(...)   \,
-#define Z_IS_2495U_EQ_2495(...)  \,
-#define Z_IS_2495_EQ_2495U(...)  \,
-#define Z_IS_2495U_EQ_2495U(...) \,
-#define Z_IS_2496_EQ_2496(...)   \,
-#define Z_IS_2496U_EQ_2496(...)  \,
-#define Z_IS_2496_EQ_2496U(...)  \,
-#define Z_IS_2496U_EQ_2496U(...) \,
-#define Z_IS_2497_EQ_2497(...)   \,
-#define Z_IS_2497U_EQ_2497(...)  \,
-#define Z_IS_2497_EQ_2497U(...)  \,
-#define Z_IS_2497U_EQ_2497U(...) \,
-#define Z_IS_2498_EQ_2498(...)   \,
-#define Z_IS_2498U_EQ_2498(...)  \,
-#define Z_IS_2498_EQ_2498U(...)  \,
-#define Z_IS_2498U_EQ_2498U(...) \,
-#define Z_IS_2499_EQ_2499(...)   \,
-#define Z_IS_2499U_EQ_2499(...)  \,
-#define Z_IS_2499_EQ_2499U(...)  \,
-#define Z_IS_2499U_EQ_2499U(...) \,
-#define Z_IS_2500_EQ_2500(...)   \,
-#define Z_IS_2500U_EQ_2500(...)  \,
-#define Z_IS_2500_EQ_2500U(...)  \,
-#define Z_IS_2500U_EQ_2500U(...) \,
-#define Z_IS_2501_EQ_2501(...)   \,
-#define Z_IS_2501U_EQ_2501(...)  \,
-#define Z_IS_2501_EQ_2501U(...)  \,
-#define Z_IS_2501U_EQ_2501U(...) \,
-#define Z_IS_2502_EQ_2502(...)   \,
-#define Z_IS_2502U_EQ_2502(...)  \,
-#define Z_IS_2502_EQ_2502U(...)  \,
-#define Z_IS_2502U_EQ_2502U(...) \,
-#define Z_IS_2503_EQ_2503(...)   \,
-#define Z_IS_2503U_EQ_2503(...)  \,
-#define Z_IS_2503_EQ_2503U(...)  \,
-#define Z_IS_2503U_EQ_2503U(...) \,
-#define Z_IS_2504_EQ_2504(...)   \,
-#define Z_IS_2504U_EQ_2504(...)  \,
-#define Z_IS_2504_EQ_2504U(...)  \,
-#define Z_IS_2504U_EQ_2504U(...) \,
-#define Z_IS_2505_EQ_2505(...)   \,
-#define Z_IS_2505U_EQ_2505(...)  \,
-#define Z_IS_2505_EQ_2505U(...)  \,
-#define Z_IS_2505U_EQ_2505U(...) \,
-#define Z_IS_2506_EQ_2506(...)   \,
-#define Z_IS_2506U_EQ_2506(...)  \,
-#define Z_IS_2506_EQ_2506U(...)  \,
-#define Z_IS_2506U_EQ_2506U(...) \,
-#define Z_IS_2507_EQ_2507(...)   \,
-#define Z_IS_2507U_EQ_2507(...)  \,
-#define Z_IS_2507_EQ_2507U(...)  \,
-#define Z_IS_2507U_EQ_2507U(...) \,
-#define Z_IS_2508_EQ_2508(...)   \,
-#define Z_IS_2508U_EQ_2508(...)  \,
-#define Z_IS_2508_EQ_2508U(...)  \,
-#define Z_IS_2508U_EQ_2508U(...) \,
-#define Z_IS_2509_EQ_2509(...)   \,
-#define Z_IS_2509U_EQ_2509(...)  \,
-#define Z_IS_2509_EQ_2509U(...)  \,
-#define Z_IS_2509U_EQ_2509U(...) \,
-#define Z_IS_2510_EQ_2510(...)   \,
-#define Z_IS_2510U_EQ_2510(...)  \,
-#define Z_IS_2510_EQ_2510U(...)  \,
-#define Z_IS_2510U_EQ_2510U(...) \,
-#define Z_IS_2511_EQ_2511(...)   \,
-#define Z_IS_2511U_EQ_2511(...)  \,
-#define Z_IS_2511_EQ_2511U(...)  \,
-#define Z_IS_2511U_EQ_2511U(...) \,
-#define Z_IS_2512_EQ_2512(...)   \,
-#define Z_IS_2512U_EQ_2512(...)  \,
-#define Z_IS_2512_EQ_2512U(...)  \,
-#define Z_IS_2512U_EQ_2512U(...) \,
-#define Z_IS_2513_EQ_2513(...)   \,
-#define Z_IS_2513U_EQ_2513(...)  \,
-#define Z_IS_2513_EQ_2513U(...)  \,
-#define Z_IS_2513U_EQ_2513U(...) \,
-#define Z_IS_2514_EQ_2514(...)   \,
-#define Z_IS_2514U_EQ_2514(...)  \,
-#define Z_IS_2514_EQ_2514U(...)  \,
-#define Z_IS_2514U_EQ_2514U(...) \,
-#define Z_IS_2515_EQ_2515(...)   \,
-#define Z_IS_2515U_EQ_2515(...)  \,
-#define Z_IS_2515_EQ_2515U(...)  \,
-#define Z_IS_2515U_EQ_2515U(...) \,
-#define Z_IS_2516_EQ_2516(...)   \,
-#define Z_IS_2516U_EQ_2516(...)  \,
-#define Z_IS_2516_EQ_2516U(...)  \,
-#define Z_IS_2516U_EQ_2516U(...) \,
-#define Z_IS_2517_EQ_2517(...)   \,
-#define Z_IS_2517U_EQ_2517(...)  \,
-#define Z_IS_2517_EQ_2517U(...)  \,
-#define Z_IS_2517U_EQ_2517U(...) \,
-#define Z_IS_2518_EQ_2518(...)   \,
-#define Z_IS_2518U_EQ_2518(...)  \,
-#define Z_IS_2518_EQ_2518U(...)  \,
-#define Z_IS_2518U_EQ_2518U(...) \,
-#define Z_IS_2519_EQ_2519(...)   \,
-#define Z_IS_2519U_EQ_2519(...)  \,
-#define Z_IS_2519_EQ_2519U(...)  \,
-#define Z_IS_2519U_EQ_2519U(...) \,
-#define Z_IS_2520_EQ_2520(...)   \,
-#define Z_IS_2520U_EQ_2520(...)  \,
-#define Z_IS_2520_EQ_2520U(...)  \,
-#define Z_IS_2520U_EQ_2520U(...) \,
-#define Z_IS_2521_EQ_2521(...)   \,
-#define Z_IS_2521U_EQ_2521(...)  \,
-#define Z_IS_2521_EQ_2521U(...)  \,
-#define Z_IS_2521U_EQ_2521U(...) \,
-#define Z_IS_2522_EQ_2522(...)   \,
-#define Z_IS_2522U_EQ_2522(...)  \,
-#define Z_IS_2522_EQ_2522U(...)  \,
-#define Z_IS_2522U_EQ_2522U(...) \,
-#define Z_IS_2523_EQ_2523(...)   \,
-#define Z_IS_2523U_EQ_2523(...)  \,
-#define Z_IS_2523_EQ_2523U(...)  \,
-#define Z_IS_2523U_EQ_2523U(...) \,
-#define Z_IS_2524_EQ_2524(...)   \,
-#define Z_IS_2524U_EQ_2524(...)  \,
-#define Z_IS_2524_EQ_2524U(...)  \,
-#define Z_IS_2524U_EQ_2524U(...) \,
-#define Z_IS_2525_EQ_2525(...)   \,
-#define Z_IS_2525U_EQ_2525(...)  \,
-#define Z_IS_2525_EQ_2525U(...)  \,
-#define Z_IS_2525U_EQ_2525U(...) \,
-#define Z_IS_2526_EQ_2526(...)   \,
-#define Z_IS_2526U_EQ_2526(...)  \,
-#define Z_IS_2526_EQ_2526U(...)  \,
-#define Z_IS_2526U_EQ_2526U(...) \,
-#define Z_IS_2527_EQ_2527(...)   \,
-#define Z_IS_2527U_EQ_2527(...)  \,
-#define Z_IS_2527_EQ_2527U(...)  \,
-#define Z_IS_2527U_EQ_2527U(...) \,
-#define Z_IS_2528_EQ_2528(...)   \,
-#define Z_IS_2528U_EQ_2528(...)  \,
-#define Z_IS_2528_EQ_2528U(...)  \,
-#define Z_IS_2528U_EQ_2528U(...) \,
-#define Z_IS_2529_EQ_2529(...)   \,
-#define Z_IS_2529U_EQ_2529(...)  \,
-#define Z_IS_2529_EQ_2529U(...)  \,
-#define Z_IS_2529U_EQ_2529U(...) \,
-#define Z_IS_2530_EQ_2530(...)   \,
-#define Z_IS_2530U_EQ_2530(...)  \,
-#define Z_IS_2530_EQ_2530U(...)  \,
-#define Z_IS_2530U_EQ_2530U(...) \,
-#define Z_IS_2531_EQ_2531(...)   \,
-#define Z_IS_2531U_EQ_2531(...)  \,
-#define Z_IS_2531_EQ_2531U(...)  \,
-#define Z_IS_2531U_EQ_2531U(...) \,
-#define Z_IS_2532_EQ_2532(...)   \,
-#define Z_IS_2532U_EQ_2532(...)  \,
-#define Z_IS_2532_EQ_2532U(...)  \,
-#define Z_IS_2532U_EQ_2532U(...) \,
-#define Z_IS_2533_EQ_2533(...)   \,
-#define Z_IS_2533U_EQ_2533(...)  \,
-#define Z_IS_2533_EQ_2533U(...)  \,
-#define Z_IS_2533U_EQ_2533U(...) \,
-#define Z_IS_2534_EQ_2534(...)   \,
-#define Z_IS_2534U_EQ_2534(...)  \,
-#define Z_IS_2534_EQ_2534U(...)  \,
-#define Z_IS_2534U_EQ_2534U(...) \,
-#define Z_IS_2535_EQ_2535(...)   \,
-#define Z_IS_2535U_EQ_2535(...)  \,
-#define Z_IS_2535_EQ_2535U(...)  \,
-#define Z_IS_2535U_EQ_2535U(...) \,
-#define Z_IS_2536_EQ_2536(...)   \,
-#define Z_IS_2536U_EQ_2536(...)  \,
-#define Z_IS_2536_EQ_2536U(...)  \,
-#define Z_IS_2536U_EQ_2536U(...) \,
-#define Z_IS_2537_EQ_2537(...)   \,
-#define Z_IS_2537U_EQ_2537(...)  \,
-#define Z_IS_2537_EQ_2537U(...)  \,
-#define Z_IS_2537U_EQ_2537U(...) \,
-#define Z_IS_2538_EQ_2538(...)   \,
-#define Z_IS_2538U_EQ_2538(...)  \,
-#define Z_IS_2538_EQ_2538U(...)  \,
-#define Z_IS_2538U_EQ_2538U(...) \,
-#define Z_IS_2539_EQ_2539(...)   \,
-#define Z_IS_2539U_EQ_2539(...)  \,
-#define Z_IS_2539_EQ_2539U(...)  \,
-#define Z_IS_2539U_EQ_2539U(...) \,
-#define Z_IS_2540_EQ_2540(...)   \,
-#define Z_IS_2540U_EQ_2540(...)  \,
-#define Z_IS_2540_EQ_2540U(...)  \,
-#define Z_IS_2540U_EQ_2540U(...) \,
-#define Z_IS_2541_EQ_2541(...)   \,
-#define Z_IS_2541U_EQ_2541(...)  \,
-#define Z_IS_2541_EQ_2541U(...)  \,
-#define Z_IS_2541U_EQ_2541U(...) \,
-#define Z_IS_2542_EQ_2542(...)   \,
-#define Z_IS_2542U_EQ_2542(...)  \,
-#define Z_IS_2542_EQ_2542U(...)  \,
-#define Z_IS_2542U_EQ_2542U(...) \,
-#define Z_IS_2543_EQ_2543(...)   \,
-#define Z_IS_2543U_EQ_2543(...)  \,
-#define Z_IS_2543_EQ_2543U(...)  \,
-#define Z_IS_2543U_EQ_2543U(...) \,
-#define Z_IS_2544_EQ_2544(...)   \,
-#define Z_IS_2544U_EQ_2544(...)  \,
-#define Z_IS_2544_EQ_2544U(...)  \,
-#define Z_IS_2544U_EQ_2544U(...) \,
-#define Z_IS_2545_EQ_2545(...)   \,
-#define Z_IS_2545U_EQ_2545(...)  \,
-#define Z_IS_2545_EQ_2545U(...)  \,
-#define Z_IS_2545U_EQ_2545U(...) \,
-#define Z_IS_2546_EQ_2546(...)   \,
-#define Z_IS_2546U_EQ_2546(...)  \,
-#define Z_IS_2546_EQ_2546U(...)  \,
-#define Z_IS_2546U_EQ_2546U(...) \,
-#define Z_IS_2547_EQ_2547(...)   \,
-#define Z_IS_2547U_EQ_2547(...)  \,
-#define Z_IS_2547_EQ_2547U(...)  \,
-#define Z_IS_2547U_EQ_2547U(...) \,
-#define Z_IS_2548_EQ_2548(...)   \,
-#define Z_IS_2548U_EQ_2548(...)  \,
-#define Z_IS_2548_EQ_2548U(...)  \,
-#define Z_IS_2548U_EQ_2548U(...) \,
-#define Z_IS_2549_EQ_2549(...)   \,
-#define Z_IS_2549U_EQ_2549(...)  \,
-#define Z_IS_2549_EQ_2549U(...)  \,
-#define Z_IS_2549U_EQ_2549U(...) \,
-#define Z_IS_2550_EQ_2550(...)   \,
-#define Z_IS_2550U_EQ_2550(...)  \,
-#define Z_IS_2550_EQ_2550U(...)  \,
-#define Z_IS_2550U_EQ_2550U(...) \,
-#define Z_IS_2551_EQ_2551(...)   \,
-#define Z_IS_2551U_EQ_2551(...)  \,
-#define Z_IS_2551_EQ_2551U(...)  \,
-#define Z_IS_2551U_EQ_2551U(...) \,
-#define Z_IS_2552_EQ_2552(...)   \,
-#define Z_IS_2552U_EQ_2552(...)  \,
-#define Z_IS_2552_EQ_2552U(...)  \,
-#define Z_IS_2552U_EQ_2552U(...) \,
-#define Z_IS_2553_EQ_2553(...)   \,
-#define Z_IS_2553U_EQ_2553(...)  \,
-#define Z_IS_2553_EQ_2553U(...)  \,
-#define Z_IS_2553U_EQ_2553U(...) \,
-#define Z_IS_2554_EQ_2554(...)   \,
-#define Z_IS_2554U_EQ_2554(...)  \,
-#define Z_IS_2554_EQ_2554U(...)  \,
-#define Z_IS_2554U_EQ_2554U(...) \,
-#define Z_IS_2555_EQ_2555(...)   \,
-#define Z_IS_2555U_EQ_2555(...)  \,
-#define Z_IS_2555_EQ_2555U(...)  \,
-#define Z_IS_2555U_EQ_2555U(...) \,
-#define Z_IS_2556_EQ_2556(...)   \,
-#define Z_IS_2556U_EQ_2556(...)  \,
-#define Z_IS_2556_EQ_2556U(...)  \,
-#define Z_IS_2556U_EQ_2556U(...) \,
-#define Z_IS_2557_EQ_2557(...)   \,
-#define Z_IS_2557U_EQ_2557(...)  \,
-#define Z_IS_2557_EQ_2557U(...)  \,
-#define Z_IS_2557U_EQ_2557U(...) \,
-#define Z_IS_2558_EQ_2558(...)   \,
-#define Z_IS_2558U_EQ_2558(...)  \,
-#define Z_IS_2558_EQ_2558U(...)  \,
-#define Z_IS_2558U_EQ_2558U(...) \,
-#define Z_IS_2559_EQ_2559(...)   \,
-#define Z_IS_2559U_EQ_2559(...)  \,
-#define Z_IS_2559_EQ_2559U(...)  \,
-#define Z_IS_2559U_EQ_2559U(...) \,
-#define Z_IS_2560_EQ_2560(...)   \,
-#define Z_IS_2560U_EQ_2560(...)  \,
-#define Z_IS_2560_EQ_2560U(...)  \,
-#define Z_IS_2560U_EQ_2560U(...) \,
-#define Z_IS_2561_EQ_2561(...)   \,
-#define Z_IS_2561U_EQ_2561(...)  \,
-#define Z_IS_2561_EQ_2561U(...)  \,
-#define Z_IS_2561U_EQ_2561U(...) \,
-#define Z_IS_2562_EQ_2562(...)   \,
-#define Z_IS_2562U_EQ_2562(...)  \,
-#define Z_IS_2562_EQ_2562U(...)  \,
-#define Z_IS_2562U_EQ_2562U(...) \,
-#define Z_IS_2563_EQ_2563(...)   \,
-#define Z_IS_2563U_EQ_2563(...)  \,
-#define Z_IS_2563_EQ_2563U(...)  \,
-#define Z_IS_2563U_EQ_2563U(...) \,
-#define Z_IS_2564_EQ_2564(...)   \,
-#define Z_IS_2564U_EQ_2564(...)  \,
-#define Z_IS_2564_EQ_2564U(...)  \,
-#define Z_IS_2564U_EQ_2564U(...) \,
-#define Z_IS_2565_EQ_2565(...)   \,
-#define Z_IS_2565U_EQ_2565(...)  \,
-#define Z_IS_2565_EQ_2565U(...)  \,
-#define Z_IS_2565U_EQ_2565U(...) \,
-#define Z_IS_2566_EQ_2566(...)   \,
-#define Z_IS_2566U_EQ_2566(...)  \,
-#define Z_IS_2566_EQ_2566U(...)  \,
-#define Z_IS_2566U_EQ_2566U(...) \,
-#define Z_IS_2567_EQ_2567(...)   \,
-#define Z_IS_2567U_EQ_2567(...)  \,
-#define Z_IS_2567_EQ_2567U(...)  \,
-#define Z_IS_2567U_EQ_2567U(...) \,
-#define Z_IS_2568_EQ_2568(...)   \,
-#define Z_IS_2568U_EQ_2568(...)  \,
-#define Z_IS_2568_EQ_2568U(...)  \,
-#define Z_IS_2568U_EQ_2568U(...) \,
-#define Z_IS_2569_EQ_2569(...)   \,
-#define Z_IS_2569U_EQ_2569(...)  \,
-#define Z_IS_2569_EQ_2569U(...)  \,
-#define Z_IS_2569U_EQ_2569U(...) \,
-#define Z_IS_2570_EQ_2570(...)   \,
-#define Z_IS_2570U_EQ_2570(...)  \,
-#define Z_IS_2570_EQ_2570U(...)  \,
-#define Z_IS_2570U_EQ_2570U(...) \,
-#define Z_IS_2571_EQ_2571(...)   \,
-#define Z_IS_2571U_EQ_2571(...)  \,
-#define Z_IS_2571_EQ_2571U(...)  \,
-#define Z_IS_2571U_EQ_2571U(...) \,
-#define Z_IS_2572_EQ_2572(...)   \,
-#define Z_IS_2572U_EQ_2572(...)  \,
-#define Z_IS_2572_EQ_2572U(...)  \,
-#define Z_IS_2572U_EQ_2572U(...) \,
-#define Z_IS_2573_EQ_2573(...)   \,
-#define Z_IS_2573U_EQ_2573(...)  \,
-#define Z_IS_2573_EQ_2573U(...)  \,
-#define Z_IS_2573U_EQ_2573U(...) \,
-#define Z_IS_2574_EQ_2574(...)   \,
-#define Z_IS_2574U_EQ_2574(...)  \,
-#define Z_IS_2574_EQ_2574U(...)  \,
-#define Z_IS_2574U_EQ_2574U(...) \,
-#define Z_IS_2575_EQ_2575(...)   \,
-#define Z_IS_2575U_EQ_2575(...)  \,
-#define Z_IS_2575_EQ_2575U(...)  \,
-#define Z_IS_2575U_EQ_2575U(...) \,
-#define Z_IS_2576_EQ_2576(...)   \,
-#define Z_IS_2576U_EQ_2576(...)  \,
-#define Z_IS_2576_EQ_2576U(...)  \,
-#define Z_IS_2576U_EQ_2576U(...) \,
-#define Z_IS_2577_EQ_2577(...)   \,
-#define Z_IS_2577U_EQ_2577(...)  \,
-#define Z_IS_2577_EQ_2577U(...)  \,
-#define Z_IS_2577U_EQ_2577U(...) \,
-#define Z_IS_2578_EQ_2578(...)   \,
-#define Z_IS_2578U_EQ_2578(...)  \,
-#define Z_IS_2578_EQ_2578U(...)  \,
-#define Z_IS_2578U_EQ_2578U(...) \,
-#define Z_IS_2579_EQ_2579(...)   \,
-#define Z_IS_2579U_EQ_2579(...)  \,
-#define Z_IS_2579_EQ_2579U(...)  \,
-#define Z_IS_2579U_EQ_2579U(...) \,
-#define Z_IS_2580_EQ_2580(...)   \,
-#define Z_IS_2580U_EQ_2580(...)  \,
-#define Z_IS_2580_EQ_2580U(...)  \,
-#define Z_IS_2580U_EQ_2580U(...) \,
-#define Z_IS_2581_EQ_2581(...)   \,
-#define Z_IS_2581U_EQ_2581(...)  \,
-#define Z_IS_2581_EQ_2581U(...)  \,
-#define Z_IS_2581U_EQ_2581U(...) \,
-#define Z_IS_2582_EQ_2582(...)   \,
-#define Z_IS_2582U_EQ_2582(...)  \,
-#define Z_IS_2582_EQ_2582U(...)  \,
-#define Z_IS_2582U_EQ_2582U(...) \,
-#define Z_IS_2583_EQ_2583(...)   \,
-#define Z_IS_2583U_EQ_2583(...)  \,
-#define Z_IS_2583_EQ_2583U(...)  \,
-#define Z_IS_2583U_EQ_2583U(...) \,
-#define Z_IS_2584_EQ_2584(...)   \,
-#define Z_IS_2584U_EQ_2584(...)  \,
-#define Z_IS_2584_EQ_2584U(...)  \,
-#define Z_IS_2584U_EQ_2584U(...) \,
-#define Z_IS_2585_EQ_2585(...)   \,
-#define Z_IS_2585U_EQ_2585(...)  \,
-#define Z_IS_2585_EQ_2585U(...)  \,
-#define Z_IS_2585U_EQ_2585U(...) \,
-#define Z_IS_2586_EQ_2586(...)   \,
-#define Z_IS_2586U_EQ_2586(...)  \,
-#define Z_IS_2586_EQ_2586U(...)  \,
-#define Z_IS_2586U_EQ_2586U(...) \,
-#define Z_IS_2587_EQ_2587(...)   \,
-#define Z_IS_2587U_EQ_2587(...)  \,
-#define Z_IS_2587_EQ_2587U(...)  \,
-#define Z_IS_2587U_EQ_2587U(...) \,
-#define Z_IS_2588_EQ_2588(...)   \,
-#define Z_IS_2588U_EQ_2588(...)  \,
-#define Z_IS_2588_EQ_2588U(...)  \,
-#define Z_IS_2588U_EQ_2588U(...) \,
-#define Z_IS_2589_EQ_2589(...)   \,
-#define Z_IS_2589U_EQ_2589(...)  \,
-#define Z_IS_2589_EQ_2589U(...)  \,
-#define Z_IS_2589U_EQ_2589U(...) \,
-#define Z_IS_2590_EQ_2590(...)   \,
-#define Z_IS_2590U_EQ_2590(...)  \,
-#define Z_IS_2590_EQ_2590U(...)  \,
-#define Z_IS_2590U_EQ_2590U(...) \,
-#define Z_IS_2591_EQ_2591(...)   \,
-#define Z_IS_2591U_EQ_2591(...)  \,
-#define Z_IS_2591_EQ_2591U(...)  \,
-#define Z_IS_2591U_EQ_2591U(...) \,
-#define Z_IS_2592_EQ_2592(...)   \,
-#define Z_IS_2592U_EQ_2592(...)  \,
-#define Z_IS_2592_EQ_2592U(...)  \,
-#define Z_IS_2592U_EQ_2592U(...) \,
-#define Z_IS_2593_EQ_2593(...)   \,
-#define Z_IS_2593U_EQ_2593(...)  \,
-#define Z_IS_2593_EQ_2593U(...)  \,
-#define Z_IS_2593U_EQ_2593U(...) \,
-#define Z_IS_2594_EQ_2594(...)   \,
-#define Z_IS_2594U_EQ_2594(...)  \,
-#define Z_IS_2594_EQ_2594U(...)  \,
-#define Z_IS_2594U_EQ_2594U(...) \,
-#define Z_IS_2595_EQ_2595(...)   \,
-#define Z_IS_2595U_EQ_2595(...)  \,
-#define Z_IS_2595_EQ_2595U(...)  \,
-#define Z_IS_2595U_EQ_2595U(...) \,
-#define Z_IS_2596_EQ_2596(...)   \,
-#define Z_IS_2596U_EQ_2596(...)  \,
-#define Z_IS_2596_EQ_2596U(...)  \,
-#define Z_IS_2596U_EQ_2596U(...) \,
-#define Z_IS_2597_EQ_2597(...)   \,
-#define Z_IS_2597U_EQ_2597(...)  \,
-#define Z_IS_2597_EQ_2597U(...)  \,
-#define Z_IS_2597U_EQ_2597U(...) \,
-#define Z_IS_2598_EQ_2598(...)   \,
-#define Z_IS_2598U_EQ_2598(...)  \,
-#define Z_IS_2598_EQ_2598U(...)  \,
-#define Z_IS_2598U_EQ_2598U(...) \,
-#define Z_IS_2599_EQ_2599(...)   \,
-#define Z_IS_2599U_EQ_2599(...)  \,
-#define Z_IS_2599_EQ_2599U(...)  \,
-#define Z_IS_2599U_EQ_2599U(...) \,
-#define Z_IS_2600_EQ_2600(...)   \,
-#define Z_IS_2600U_EQ_2600(...)  \,
-#define Z_IS_2600_EQ_2600U(...)  \,
-#define Z_IS_2600U_EQ_2600U(...) \,
-#define Z_IS_2601_EQ_2601(...)   \,
-#define Z_IS_2601U_EQ_2601(...)  \,
-#define Z_IS_2601_EQ_2601U(...)  \,
-#define Z_IS_2601U_EQ_2601U(...) \,
-#define Z_IS_2602_EQ_2602(...)   \,
-#define Z_IS_2602U_EQ_2602(...)  \,
-#define Z_IS_2602_EQ_2602U(...)  \,
-#define Z_IS_2602U_EQ_2602U(...) \,
-#define Z_IS_2603_EQ_2603(...)   \,
-#define Z_IS_2603U_EQ_2603(...)  \,
-#define Z_IS_2603_EQ_2603U(...)  \,
-#define Z_IS_2603U_EQ_2603U(...) \,
-#define Z_IS_2604_EQ_2604(...)   \,
-#define Z_IS_2604U_EQ_2604(...)  \,
-#define Z_IS_2604_EQ_2604U(...)  \,
-#define Z_IS_2604U_EQ_2604U(...) \,
-#define Z_IS_2605_EQ_2605(...)   \,
-#define Z_IS_2605U_EQ_2605(...)  \,
-#define Z_IS_2605_EQ_2605U(...)  \,
-#define Z_IS_2605U_EQ_2605U(...) \,
-#define Z_IS_2606_EQ_2606(...)   \,
-#define Z_IS_2606U_EQ_2606(...)  \,
-#define Z_IS_2606_EQ_2606U(...)  \,
-#define Z_IS_2606U_EQ_2606U(...) \,
-#define Z_IS_2607_EQ_2607(...)   \,
-#define Z_IS_2607U_EQ_2607(...)  \,
-#define Z_IS_2607_EQ_2607U(...)  \,
-#define Z_IS_2607U_EQ_2607U(...) \,
-#define Z_IS_2608_EQ_2608(...)   \,
-#define Z_IS_2608U_EQ_2608(...)  \,
-#define Z_IS_2608_EQ_2608U(...)  \,
-#define Z_IS_2608U_EQ_2608U(...) \,
-#define Z_IS_2609_EQ_2609(...)   \,
-#define Z_IS_2609U_EQ_2609(...)  \,
-#define Z_IS_2609_EQ_2609U(...)  \,
-#define Z_IS_2609U_EQ_2609U(...) \,
-#define Z_IS_2610_EQ_2610(...)   \,
-#define Z_IS_2610U_EQ_2610(...)  \,
-#define Z_IS_2610_EQ_2610U(...)  \,
-#define Z_IS_2610U_EQ_2610U(...) \,
-#define Z_IS_2611_EQ_2611(...)   \,
-#define Z_IS_2611U_EQ_2611(...)  \,
-#define Z_IS_2611_EQ_2611U(...)  \,
-#define Z_IS_2611U_EQ_2611U(...) \,
-#define Z_IS_2612_EQ_2612(...)   \,
-#define Z_IS_2612U_EQ_2612(...)  \,
-#define Z_IS_2612_EQ_2612U(...)  \,
-#define Z_IS_2612U_EQ_2612U(...) \,
-#define Z_IS_2613_EQ_2613(...)   \,
-#define Z_IS_2613U_EQ_2613(...)  \,
-#define Z_IS_2613_EQ_2613U(...)  \,
-#define Z_IS_2613U_EQ_2613U(...) \,
-#define Z_IS_2614_EQ_2614(...)   \,
-#define Z_IS_2614U_EQ_2614(...)  \,
-#define Z_IS_2614_EQ_2614U(...)  \,
-#define Z_IS_2614U_EQ_2614U(...) \,
-#define Z_IS_2615_EQ_2615(...)   \,
-#define Z_IS_2615U_EQ_2615(...)  \,
-#define Z_IS_2615_EQ_2615U(...)  \,
-#define Z_IS_2615U_EQ_2615U(...) \,
-#define Z_IS_2616_EQ_2616(...)   \,
-#define Z_IS_2616U_EQ_2616(...)  \,
-#define Z_IS_2616_EQ_2616U(...)  \,
-#define Z_IS_2616U_EQ_2616U(...) \,
-#define Z_IS_2617_EQ_2617(...)   \,
-#define Z_IS_2617U_EQ_2617(...)  \,
-#define Z_IS_2617_EQ_2617U(...)  \,
-#define Z_IS_2617U_EQ_2617U(...) \,
-#define Z_IS_2618_EQ_2618(...)   \,
-#define Z_IS_2618U_EQ_2618(...)  \,
-#define Z_IS_2618_EQ_2618U(...)  \,
-#define Z_IS_2618U_EQ_2618U(...) \,
-#define Z_IS_2619_EQ_2619(...)   \,
-#define Z_IS_2619U_EQ_2619(...)  \,
-#define Z_IS_2619_EQ_2619U(...)  \,
-#define Z_IS_2619U_EQ_2619U(...) \,
-#define Z_IS_2620_EQ_2620(...)   \,
-#define Z_IS_2620U_EQ_2620(...)  \,
-#define Z_IS_2620_EQ_2620U(...)  \,
-#define Z_IS_2620U_EQ_2620U(...) \,
-#define Z_IS_2621_EQ_2621(...)   \,
-#define Z_IS_2621U_EQ_2621(...)  \,
-#define Z_IS_2621_EQ_2621U(...)  \,
-#define Z_IS_2621U_EQ_2621U(...) \,
-#define Z_IS_2622_EQ_2622(...)   \,
-#define Z_IS_2622U_EQ_2622(...)  \,
-#define Z_IS_2622_EQ_2622U(...)  \,
-#define Z_IS_2622U_EQ_2622U(...) \,
-#define Z_IS_2623_EQ_2623(...)   \,
-#define Z_IS_2623U_EQ_2623(...)  \,
-#define Z_IS_2623_EQ_2623U(...)  \,
-#define Z_IS_2623U_EQ_2623U(...) \,
-#define Z_IS_2624_EQ_2624(...)   \,
-#define Z_IS_2624U_EQ_2624(...)  \,
-#define Z_IS_2624_EQ_2624U(...)  \,
-#define Z_IS_2624U_EQ_2624U(...) \,
-#define Z_IS_2625_EQ_2625(...)   \,
-#define Z_IS_2625U_EQ_2625(...)  \,
-#define Z_IS_2625_EQ_2625U(...)  \,
-#define Z_IS_2625U_EQ_2625U(...) \,
-#define Z_IS_2626_EQ_2626(...)   \,
-#define Z_IS_2626U_EQ_2626(...)  \,
-#define Z_IS_2626_EQ_2626U(...)  \,
-#define Z_IS_2626U_EQ_2626U(...) \,
-#define Z_IS_2627_EQ_2627(...)   \,
-#define Z_IS_2627U_EQ_2627(...)  \,
-#define Z_IS_2627_EQ_2627U(...)  \,
-#define Z_IS_2627U_EQ_2627U(...) \,
-#define Z_IS_2628_EQ_2628(...)   \,
-#define Z_IS_2628U_EQ_2628(...)  \,
-#define Z_IS_2628_EQ_2628U(...)  \,
-#define Z_IS_2628U_EQ_2628U(...) \,
-#define Z_IS_2629_EQ_2629(...)   \,
-#define Z_IS_2629U_EQ_2629(...)  \,
-#define Z_IS_2629_EQ_2629U(...)  \,
-#define Z_IS_2629U_EQ_2629U(...) \,
-#define Z_IS_2630_EQ_2630(...)   \,
-#define Z_IS_2630U_EQ_2630(...)  \,
-#define Z_IS_2630_EQ_2630U(...)  \,
-#define Z_IS_2630U_EQ_2630U(...) \,
-#define Z_IS_2631_EQ_2631(...)   \,
-#define Z_IS_2631U_EQ_2631(...)  \,
-#define Z_IS_2631_EQ_2631U(...)  \,
-#define Z_IS_2631U_EQ_2631U(...) \,
-#define Z_IS_2632_EQ_2632(...)   \,
-#define Z_IS_2632U_EQ_2632(...)  \,
-#define Z_IS_2632_EQ_2632U(...)  \,
-#define Z_IS_2632U_EQ_2632U(...) \,
-#define Z_IS_2633_EQ_2633(...)   \,
-#define Z_IS_2633U_EQ_2633(...)  \,
-#define Z_IS_2633_EQ_2633U(...)  \,
-#define Z_IS_2633U_EQ_2633U(...) \,
-#define Z_IS_2634_EQ_2634(...)   \,
-#define Z_IS_2634U_EQ_2634(...)  \,
-#define Z_IS_2634_EQ_2634U(...)  \,
-#define Z_IS_2634U_EQ_2634U(...) \,
-#define Z_IS_2635_EQ_2635(...)   \,
-#define Z_IS_2635U_EQ_2635(...)  \,
-#define Z_IS_2635_EQ_2635U(...)  \,
-#define Z_IS_2635U_EQ_2635U(...) \,
-#define Z_IS_2636_EQ_2636(...)   \,
-#define Z_IS_2636U_EQ_2636(...)  \,
-#define Z_IS_2636_EQ_2636U(...)  \,
-#define Z_IS_2636U_EQ_2636U(...) \,
-#define Z_IS_2637_EQ_2637(...)   \,
-#define Z_IS_2637U_EQ_2637(...)  \,
-#define Z_IS_2637_EQ_2637U(...)  \,
-#define Z_IS_2637U_EQ_2637U(...) \,
-#define Z_IS_2638_EQ_2638(...)   \,
-#define Z_IS_2638U_EQ_2638(...)  \,
-#define Z_IS_2638_EQ_2638U(...)  \,
-#define Z_IS_2638U_EQ_2638U(...) \,
-#define Z_IS_2639_EQ_2639(...)   \,
-#define Z_IS_2639U_EQ_2639(...)  \,
-#define Z_IS_2639_EQ_2639U(...)  \,
-#define Z_IS_2639U_EQ_2639U(...) \,
-#define Z_IS_2640_EQ_2640(...)   \,
-#define Z_IS_2640U_EQ_2640(...)  \,
-#define Z_IS_2640_EQ_2640U(...)  \,
-#define Z_IS_2640U_EQ_2640U(...) \,
-#define Z_IS_2641_EQ_2641(...)   \,
-#define Z_IS_2641U_EQ_2641(...)  \,
-#define Z_IS_2641_EQ_2641U(...)  \,
-#define Z_IS_2641U_EQ_2641U(...) \,
-#define Z_IS_2642_EQ_2642(...)   \,
-#define Z_IS_2642U_EQ_2642(...)  \,
-#define Z_IS_2642_EQ_2642U(...)  \,
-#define Z_IS_2642U_EQ_2642U(...) \,
-#define Z_IS_2643_EQ_2643(...)   \,
-#define Z_IS_2643U_EQ_2643(...)  \,
-#define Z_IS_2643_EQ_2643U(...)  \,
-#define Z_IS_2643U_EQ_2643U(...) \,
-#define Z_IS_2644_EQ_2644(...)   \,
-#define Z_IS_2644U_EQ_2644(...)  \,
-#define Z_IS_2644_EQ_2644U(...)  \,
-#define Z_IS_2644U_EQ_2644U(...) \,
-#define Z_IS_2645_EQ_2645(...)   \,
-#define Z_IS_2645U_EQ_2645(...)  \,
-#define Z_IS_2645_EQ_2645U(...)  \,
-#define Z_IS_2645U_EQ_2645U(...) \,
-#define Z_IS_2646_EQ_2646(...)   \,
-#define Z_IS_2646U_EQ_2646(...)  \,
-#define Z_IS_2646_EQ_2646U(...)  \,
-#define Z_IS_2646U_EQ_2646U(...) \,
-#define Z_IS_2647_EQ_2647(...)   \,
-#define Z_IS_2647U_EQ_2647(...)  \,
-#define Z_IS_2647_EQ_2647U(...)  \,
-#define Z_IS_2647U_EQ_2647U(...) \,
-#define Z_IS_2648_EQ_2648(...)   \,
-#define Z_IS_2648U_EQ_2648(...)  \,
-#define Z_IS_2648_EQ_2648U(...)  \,
-#define Z_IS_2648U_EQ_2648U(...) \,
-#define Z_IS_2649_EQ_2649(...)   \,
-#define Z_IS_2649U_EQ_2649(...)  \,
-#define Z_IS_2649_EQ_2649U(...)  \,
-#define Z_IS_2649U_EQ_2649U(...) \,
-#define Z_IS_2650_EQ_2650(...)   \,
-#define Z_IS_2650U_EQ_2650(...)  \,
-#define Z_IS_2650_EQ_2650U(...)  \,
-#define Z_IS_2650U_EQ_2650U(...) \,
-#define Z_IS_2651_EQ_2651(...)   \,
-#define Z_IS_2651U_EQ_2651(...)  \,
-#define Z_IS_2651_EQ_2651U(...)  \,
-#define Z_IS_2651U_EQ_2651U(...) \,
-#define Z_IS_2652_EQ_2652(...)   \,
-#define Z_IS_2652U_EQ_2652(...)  \,
-#define Z_IS_2652_EQ_2652U(...)  \,
-#define Z_IS_2652U_EQ_2652U(...) \,
-#define Z_IS_2653_EQ_2653(...)   \,
-#define Z_IS_2653U_EQ_2653(...)  \,
-#define Z_IS_2653_EQ_2653U(...)  \,
-#define Z_IS_2653U_EQ_2653U(...) \,
-#define Z_IS_2654_EQ_2654(...)   \,
-#define Z_IS_2654U_EQ_2654(...)  \,
-#define Z_IS_2654_EQ_2654U(...)  \,
-#define Z_IS_2654U_EQ_2654U(...) \,
-#define Z_IS_2655_EQ_2655(...)   \,
-#define Z_IS_2655U_EQ_2655(...)  \,
-#define Z_IS_2655_EQ_2655U(...)  \,
-#define Z_IS_2655U_EQ_2655U(...) \,
-#define Z_IS_2656_EQ_2656(...)   \,
-#define Z_IS_2656U_EQ_2656(...)  \,
-#define Z_IS_2656_EQ_2656U(...)  \,
-#define Z_IS_2656U_EQ_2656U(...) \,
-#define Z_IS_2657_EQ_2657(...)   \,
-#define Z_IS_2657U_EQ_2657(...)  \,
-#define Z_IS_2657_EQ_2657U(...)  \,
-#define Z_IS_2657U_EQ_2657U(...) \,
-#define Z_IS_2658_EQ_2658(...)   \,
-#define Z_IS_2658U_EQ_2658(...)  \,
-#define Z_IS_2658_EQ_2658U(...)  \,
-#define Z_IS_2658U_EQ_2658U(...) \,
-#define Z_IS_2659_EQ_2659(...)   \,
-#define Z_IS_2659U_EQ_2659(...)  \,
-#define Z_IS_2659_EQ_2659U(...)  \,
-#define Z_IS_2659U_EQ_2659U(...) \,
-#define Z_IS_2660_EQ_2660(...)   \,
-#define Z_IS_2660U_EQ_2660(...)  \,
-#define Z_IS_2660_EQ_2660U(...)  \,
-#define Z_IS_2660U_EQ_2660U(...) \,
-#define Z_IS_2661_EQ_2661(...)   \,
-#define Z_IS_2661U_EQ_2661(...)  \,
-#define Z_IS_2661_EQ_2661U(...)  \,
-#define Z_IS_2661U_EQ_2661U(...) \,
-#define Z_IS_2662_EQ_2662(...)   \,
-#define Z_IS_2662U_EQ_2662(...)  \,
-#define Z_IS_2662_EQ_2662U(...)  \,
-#define Z_IS_2662U_EQ_2662U(...) \,
-#define Z_IS_2663_EQ_2663(...)   \,
-#define Z_IS_2663U_EQ_2663(...)  \,
-#define Z_IS_2663_EQ_2663U(...)  \,
-#define Z_IS_2663U_EQ_2663U(...) \,
-#define Z_IS_2664_EQ_2664(...)   \,
-#define Z_IS_2664U_EQ_2664(...)  \,
-#define Z_IS_2664_EQ_2664U(...)  \,
-#define Z_IS_2664U_EQ_2664U(...) \,
-#define Z_IS_2665_EQ_2665(...)   \,
-#define Z_IS_2665U_EQ_2665(...)  \,
-#define Z_IS_2665_EQ_2665U(...)  \,
-#define Z_IS_2665U_EQ_2665U(...) \,
-#define Z_IS_2666_EQ_2666(...)   \,
-#define Z_IS_2666U_EQ_2666(...)  \,
-#define Z_IS_2666_EQ_2666U(...)  \,
-#define Z_IS_2666U_EQ_2666U(...) \,
-#define Z_IS_2667_EQ_2667(...)   \,
-#define Z_IS_2667U_EQ_2667(...)  \,
-#define Z_IS_2667_EQ_2667U(...)  \,
-#define Z_IS_2667U_EQ_2667U(...) \,
-#define Z_IS_2668_EQ_2668(...)   \,
-#define Z_IS_2668U_EQ_2668(...)  \,
-#define Z_IS_2668_EQ_2668U(...)  \,
-#define Z_IS_2668U_EQ_2668U(...) \,
-#define Z_IS_2669_EQ_2669(...)   \,
-#define Z_IS_2669U_EQ_2669(...)  \,
-#define Z_IS_2669_EQ_2669U(...)  \,
-#define Z_IS_2669U_EQ_2669U(...) \,
-#define Z_IS_2670_EQ_2670(...)   \,
-#define Z_IS_2670U_EQ_2670(...)  \,
-#define Z_IS_2670_EQ_2670U(...)  \,
-#define Z_IS_2670U_EQ_2670U(...) \,
-#define Z_IS_2671_EQ_2671(...)   \,
-#define Z_IS_2671U_EQ_2671(...)  \,
-#define Z_IS_2671_EQ_2671U(...)  \,
-#define Z_IS_2671U_EQ_2671U(...) \,
-#define Z_IS_2672_EQ_2672(...)   \,
-#define Z_IS_2672U_EQ_2672(...)  \,
-#define Z_IS_2672_EQ_2672U(...)  \,
-#define Z_IS_2672U_EQ_2672U(...) \,
-#define Z_IS_2673_EQ_2673(...)   \,
-#define Z_IS_2673U_EQ_2673(...)  \,
-#define Z_IS_2673_EQ_2673U(...)  \,
-#define Z_IS_2673U_EQ_2673U(...) \,
-#define Z_IS_2674_EQ_2674(...)   \,
-#define Z_IS_2674U_EQ_2674(...)  \,
-#define Z_IS_2674_EQ_2674U(...)  \,
-#define Z_IS_2674U_EQ_2674U(...) \,
-#define Z_IS_2675_EQ_2675(...)   \,
-#define Z_IS_2675U_EQ_2675(...)  \,
-#define Z_IS_2675_EQ_2675U(...)  \,
-#define Z_IS_2675U_EQ_2675U(...) \,
-#define Z_IS_2676_EQ_2676(...)   \,
-#define Z_IS_2676U_EQ_2676(...)  \,
-#define Z_IS_2676_EQ_2676U(...)  \,
-#define Z_IS_2676U_EQ_2676U(...) \,
-#define Z_IS_2677_EQ_2677(...)   \,
-#define Z_IS_2677U_EQ_2677(...)  \,
-#define Z_IS_2677_EQ_2677U(...)  \,
-#define Z_IS_2677U_EQ_2677U(...) \,
-#define Z_IS_2678_EQ_2678(...)   \,
-#define Z_IS_2678U_EQ_2678(...)  \,
-#define Z_IS_2678_EQ_2678U(...)  \,
-#define Z_IS_2678U_EQ_2678U(...) \,
-#define Z_IS_2679_EQ_2679(...)   \,
-#define Z_IS_2679U_EQ_2679(...)  \,
-#define Z_IS_2679_EQ_2679U(...)  \,
-#define Z_IS_2679U_EQ_2679U(...) \,
-#define Z_IS_2680_EQ_2680(...)   \,
-#define Z_IS_2680U_EQ_2680(...)  \,
-#define Z_IS_2680_EQ_2680U(...)  \,
-#define Z_IS_2680U_EQ_2680U(...) \,
-#define Z_IS_2681_EQ_2681(...)   \,
-#define Z_IS_2681U_EQ_2681(...)  \,
-#define Z_IS_2681_EQ_2681U(...)  \,
-#define Z_IS_2681U_EQ_2681U(...) \,
-#define Z_IS_2682_EQ_2682(...)   \,
-#define Z_IS_2682U_EQ_2682(...)  \,
-#define Z_IS_2682_EQ_2682U(...)  \,
-#define Z_IS_2682U_EQ_2682U(...) \,
-#define Z_IS_2683_EQ_2683(...)   \,
-#define Z_IS_2683U_EQ_2683(...)  \,
-#define Z_IS_2683_EQ_2683U(...)  \,
-#define Z_IS_2683U_EQ_2683U(...) \,
-#define Z_IS_2684_EQ_2684(...)   \,
-#define Z_IS_2684U_EQ_2684(...)  \,
-#define Z_IS_2684_EQ_2684U(...)  \,
-#define Z_IS_2684U_EQ_2684U(...) \,
-#define Z_IS_2685_EQ_2685(...)   \,
-#define Z_IS_2685U_EQ_2685(...)  \,
-#define Z_IS_2685_EQ_2685U(...)  \,
-#define Z_IS_2685U_EQ_2685U(...) \,
-#define Z_IS_2686_EQ_2686(...)   \,
-#define Z_IS_2686U_EQ_2686(...)  \,
-#define Z_IS_2686_EQ_2686U(...)  \,
-#define Z_IS_2686U_EQ_2686U(...) \,
-#define Z_IS_2687_EQ_2687(...)   \,
-#define Z_IS_2687U_EQ_2687(...)  \,
-#define Z_IS_2687_EQ_2687U(...)  \,
-#define Z_IS_2687U_EQ_2687U(...) \,
-#define Z_IS_2688_EQ_2688(...)   \,
-#define Z_IS_2688U_EQ_2688(...)  \,
-#define Z_IS_2688_EQ_2688U(...)  \,
-#define Z_IS_2688U_EQ_2688U(...) \,
-#define Z_IS_2689_EQ_2689(...)   \,
-#define Z_IS_2689U_EQ_2689(...)  \,
-#define Z_IS_2689_EQ_2689U(...)  \,
-#define Z_IS_2689U_EQ_2689U(...) \,
-#define Z_IS_2690_EQ_2690(...)   \,
-#define Z_IS_2690U_EQ_2690(...)  \,
-#define Z_IS_2690_EQ_2690U(...)  \,
-#define Z_IS_2690U_EQ_2690U(...) \,
-#define Z_IS_2691_EQ_2691(...)   \,
-#define Z_IS_2691U_EQ_2691(...)  \,
-#define Z_IS_2691_EQ_2691U(...)  \,
-#define Z_IS_2691U_EQ_2691U(...) \,
-#define Z_IS_2692_EQ_2692(...)   \,
-#define Z_IS_2692U_EQ_2692(...)  \,
-#define Z_IS_2692_EQ_2692U(...)  \,
-#define Z_IS_2692U_EQ_2692U(...) \,
-#define Z_IS_2693_EQ_2693(...)   \,
-#define Z_IS_2693U_EQ_2693(...)  \,
-#define Z_IS_2693_EQ_2693U(...)  \,
-#define Z_IS_2693U_EQ_2693U(...) \,
-#define Z_IS_2694_EQ_2694(...)   \,
-#define Z_IS_2694U_EQ_2694(...)  \,
-#define Z_IS_2694_EQ_2694U(...)  \,
-#define Z_IS_2694U_EQ_2694U(...) \,
-#define Z_IS_2695_EQ_2695(...)   \,
-#define Z_IS_2695U_EQ_2695(...)  \,
-#define Z_IS_2695_EQ_2695U(...)  \,
-#define Z_IS_2695U_EQ_2695U(...) \,
-#define Z_IS_2696_EQ_2696(...)   \,
-#define Z_IS_2696U_EQ_2696(...)  \,
-#define Z_IS_2696_EQ_2696U(...)  \,
-#define Z_IS_2696U_EQ_2696U(...) \,
-#define Z_IS_2697_EQ_2697(...)   \,
-#define Z_IS_2697U_EQ_2697(...)  \,
-#define Z_IS_2697_EQ_2697U(...)  \,
-#define Z_IS_2697U_EQ_2697U(...) \,
-#define Z_IS_2698_EQ_2698(...)   \,
-#define Z_IS_2698U_EQ_2698(...)  \,
-#define Z_IS_2698_EQ_2698U(...)  \,
-#define Z_IS_2698U_EQ_2698U(...) \,
-#define Z_IS_2699_EQ_2699(...)   \,
-#define Z_IS_2699U_EQ_2699(...)  \,
-#define Z_IS_2699_EQ_2699U(...)  \,
-#define Z_IS_2699U_EQ_2699U(...) \,
-#define Z_IS_2700_EQ_2700(...)   \,
-#define Z_IS_2700U_EQ_2700(...)  \,
-#define Z_IS_2700_EQ_2700U(...)  \,
-#define Z_IS_2700U_EQ_2700U(...) \,
-#define Z_IS_2701_EQ_2701(...)   \,
-#define Z_IS_2701U_EQ_2701(...)  \,
-#define Z_IS_2701_EQ_2701U(...)  \,
-#define Z_IS_2701U_EQ_2701U(...) \,
-#define Z_IS_2702_EQ_2702(...)   \,
-#define Z_IS_2702U_EQ_2702(...)  \,
-#define Z_IS_2702_EQ_2702U(...)  \,
-#define Z_IS_2702U_EQ_2702U(...) \,
-#define Z_IS_2703_EQ_2703(...)   \,
-#define Z_IS_2703U_EQ_2703(...)  \,
-#define Z_IS_2703_EQ_2703U(...)  \,
-#define Z_IS_2703U_EQ_2703U(...) \,
-#define Z_IS_2704_EQ_2704(...)   \,
-#define Z_IS_2704U_EQ_2704(...)  \,
-#define Z_IS_2704_EQ_2704U(...)  \,
-#define Z_IS_2704U_EQ_2704U(...) \,
-#define Z_IS_2705_EQ_2705(...)   \,
-#define Z_IS_2705U_EQ_2705(...)  \,
-#define Z_IS_2705_EQ_2705U(...)  \,
-#define Z_IS_2705U_EQ_2705U(...) \,
-#define Z_IS_2706_EQ_2706(...)   \,
-#define Z_IS_2706U_EQ_2706(...)  \,
-#define Z_IS_2706_EQ_2706U(...)  \,
-#define Z_IS_2706U_EQ_2706U(...) \,
-#define Z_IS_2707_EQ_2707(...)   \,
-#define Z_IS_2707U_EQ_2707(...)  \,
-#define Z_IS_2707_EQ_2707U(...)  \,
-#define Z_IS_2707U_EQ_2707U(...) \,
-#define Z_IS_2708_EQ_2708(...)   \,
-#define Z_IS_2708U_EQ_2708(...)  \,
-#define Z_IS_2708_EQ_2708U(...)  \,
-#define Z_IS_2708U_EQ_2708U(...) \,
-#define Z_IS_2709_EQ_2709(...)   \,
-#define Z_IS_2709U_EQ_2709(...)  \,
-#define Z_IS_2709_EQ_2709U(...)  \,
-#define Z_IS_2709U_EQ_2709U(...) \,
-#define Z_IS_2710_EQ_2710(...)   \,
-#define Z_IS_2710U_EQ_2710(...)  \,
-#define Z_IS_2710_EQ_2710U(...)  \,
-#define Z_IS_2710U_EQ_2710U(...) \,
-#define Z_IS_2711_EQ_2711(...)   \,
-#define Z_IS_2711U_EQ_2711(...)  \,
-#define Z_IS_2711_EQ_2711U(...)  \,
-#define Z_IS_2711U_EQ_2711U(...) \,
-#define Z_IS_2712_EQ_2712(...)   \,
-#define Z_IS_2712U_EQ_2712(...)  \,
-#define Z_IS_2712_EQ_2712U(...)  \,
-#define Z_IS_2712U_EQ_2712U(...) \,
-#define Z_IS_2713_EQ_2713(...)   \,
-#define Z_IS_2713U_EQ_2713(...)  \,
-#define Z_IS_2713_EQ_2713U(...)  \,
-#define Z_IS_2713U_EQ_2713U(...) \,
-#define Z_IS_2714_EQ_2714(...)   \,
-#define Z_IS_2714U_EQ_2714(...)  \,
-#define Z_IS_2714_EQ_2714U(...)  \,
-#define Z_IS_2714U_EQ_2714U(...) \,
-#define Z_IS_2715_EQ_2715(...)   \,
-#define Z_IS_2715U_EQ_2715(...)  \,
-#define Z_IS_2715_EQ_2715U(...)  \,
-#define Z_IS_2715U_EQ_2715U(...) \,
-#define Z_IS_2716_EQ_2716(...)   \,
-#define Z_IS_2716U_EQ_2716(...)  \,
-#define Z_IS_2716_EQ_2716U(...)  \,
-#define Z_IS_2716U_EQ_2716U(...) \,
-#define Z_IS_2717_EQ_2717(...)   \,
-#define Z_IS_2717U_EQ_2717(...)  \,
-#define Z_IS_2717_EQ_2717U(...)  \,
-#define Z_IS_2717U_EQ_2717U(...) \,
-#define Z_IS_2718_EQ_2718(...)   \,
-#define Z_IS_2718U_EQ_2718(...)  \,
-#define Z_IS_2718_EQ_2718U(...)  \,
-#define Z_IS_2718U_EQ_2718U(...) \,
-#define Z_IS_2719_EQ_2719(...)   \,
-#define Z_IS_2719U_EQ_2719(...)  \,
-#define Z_IS_2719_EQ_2719U(...)  \,
-#define Z_IS_2719U_EQ_2719U(...) \,
-#define Z_IS_2720_EQ_2720(...)   \,
-#define Z_IS_2720U_EQ_2720(...)  \,
-#define Z_IS_2720_EQ_2720U(...)  \,
-#define Z_IS_2720U_EQ_2720U(...) \,
-#define Z_IS_2721_EQ_2721(...)   \,
-#define Z_IS_2721U_EQ_2721(...)  \,
-#define Z_IS_2721_EQ_2721U(...)  \,
-#define Z_IS_2721U_EQ_2721U(...) \,
-#define Z_IS_2722_EQ_2722(...)   \,
-#define Z_IS_2722U_EQ_2722(...)  \,
-#define Z_IS_2722_EQ_2722U(...)  \,
-#define Z_IS_2722U_EQ_2722U(...) \,
-#define Z_IS_2723_EQ_2723(...)   \,
-#define Z_IS_2723U_EQ_2723(...)  \,
-#define Z_IS_2723_EQ_2723U(...)  \,
-#define Z_IS_2723U_EQ_2723U(...) \,
-#define Z_IS_2724_EQ_2724(...)   \,
-#define Z_IS_2724U_EQ_2724(...)  \,
-#define Z_IS_2724_EQ_2724U(...)  \,
-#define Z_IS_2724U_EQ_2724U(...) \,
-#define Z_IS_2725_EQ_2725(...)   \,
-#define Z_IS_2725U_EQ_2725(...)  \,
-#define Z_IS_2725_EQ_2725U(...)  \,
-#define Z_IS_2725U_EQ_2725U(...) \,
-#define Z_IS_2726_EQ_2726(...)   \,
-#define Z_IS_2726U_EQ_2726(...)  \,
-#define Z_IS_2726_EQ_2726U(...)  \,
-#define Z_IS_2726U_EQ_2726U(...) \,
-#define Z_IS_2727_EQ_2727(...)   \,
-#define Z_IS_2727U_EQ_2727(...)  \,
-#define Z_IS_2727_EQ_2727U(...)  \,
-#define Z_IS_2727U_EQ_2727U(...) \,
-#define Z_IS_2728_EQ_2728(...)   \,
-#define Z_IS_2728U_EQ_2728(...)  \,
-#define Z_IS_2728_EQ_2728U(...)  \,
-#define Z_IS_2728U_EQ_2728U(...) \,
-#define Z_IS_2729_EQ_2729(...)   \,
-#define Z_IS_2729U_EQ_2729(...)  \,
-#define Z_IS_2729_EQ_2729U(...)  \,
-#define Z_IS_2729U_EQ_2729U(...) \,
-#define Z_IS_2730_EQ_2730(...)   \,
-#define Z_IS_2730U_EQ_2730(...)  \,
-#define Z_IS_2730_EQ_2730U(...)  \,
-#define Z_IS_2730U_EQ_2730U(...) \,
-#define Z_IS_2731_EQ_2731(...)   \,
-#define Z_IS_2731U_EQ_2731(...)  \,
-#define Z_IS_2731_EQ_2731U(...)  \,
-#define Z_IS_2731U_EQ_2731U(...) \,
-#define Z_IS_2732_EQ_2732(...)   \,
-#define Z_IS_2732U_EQ_2732(...)  \,
-#define Z_IS_2732_EQ_2732U(...)  \,
-#define Z_IS_2732U_EQ_2732U(...) \,
-#define Z_IS_2733_EQ_2733(...)   \,
-#define Z_IS_2733U_EQ_2733(...)  \,
-#define Z_IS_2733_EQ_2733U(...)  \,
-#define Z_IS_2733U_EQ_2733U(...) \,
-#define Z_IS_2734_EQ_2734(...)   \,
-#define Z_IS_2734U_EQ_2734(...)  \,
-#define Z_IS_2734_EQ_2734U(...)  \,
-#define Z_IS_2734U_EQ_2734U(...) \,
-#define Z_IS_2735_EQ_2735(...)   \,
-#define Z_IS_2735U_EQ_2735(...)  \,
-#define Z_IS_2735_EQ_2735U(...)  \,
-#define Z_IS_2735U_EQ_2735U(...) \,
-#define Z_IS_2736_EQ_2736(...)   \,
-#define Z_IS_2736U_EQ_2736(...)  \,
-#define Z_IS_2736_EQ_2736U(...)  \,
-#define Z_IS_2736U_EQ_2736U(...) \,
-#define Z_IS_2737_EQ_2737(...)   \,
-#define Z_IS_2737U_EQ_2737(...)  \,
-#define Z_IS_2737_EQ_2737U(...)  \,
-#define Z_IS_2737U_EQ_2737U(...) \,
-#define Z_IS_2738_EQ_2738(...)   \,
-#define Z_IS_2738U_EQ_2738(...)  \,
-#define Z_IS_2738_EQ_2738U(...)  \,
-#define Z_IS_2738U_EQ_2738U(...) \,
-#define Z_IS_2739_EQ_2739(...)   \,
-#define Z_IS_2739U_EQ_2739(...)  \,
-#define Z_IS_2739_EQ_2739U(...)  \,
-#define Z_IS_2739U_EQ_2739U(...) \,
-#define Z_IS_2740_EQ_2740(...)   \,
-#define Z_IS_2740U_EQ_2740(...)  \,
-#define Z_IS_2740_EQ_2740U(...)  \,
-#define Z_IS_2740U_EQ_2740U(...) \,
-#define Z_IS_2741_EQ_2741(...)   \,
-#define Z_IS_2741U_EQ_2741(...)  \,
-#define Z_IS_2741_EQ_2741U(...)  \,
-#define Z_IS_2741U_EQ_2741U(...) \,
-#define Z_IS_2742_EQ_2742(...)   \,
-#define Z_IS_2742U_EQ_2742(...)  \,
-#define Z_IS_2742_EQ_2742U(...)  \,
-#define Z_IS_2742U_EQ_2742U(...) \,
-#define Z_IS_2743_EQ_2743(...)   \,
-#define Z_IS_2743U_EQ_2743(...)  \,
-#define Z_IS_2743_EQ_2743U(...)  \,
-#define Z_IS_2743U_EQ_2743U(...) \,
-#define Z_IS_2744_EQ_2744(...)   \,
-#define Z_IS_2744U_EQ_2744(...)  \,
-#define Z_IS_2744_EQ_2744U(...)  \,
-#define Z_IS_2744U_EQ_2744U(...) \,
-#define Z_IS_2745_EQ_2745(...)   \,
-#define Z_IS_2745U_EQ_2745(...)  \,
-#define Z_IS_2745_EQ_2745U(...)  \,
-#define Z_IS_2745U_EQ_2745U(...) \,
-#define Z_IS_2746_EQ_2746(...)   \,
-#define Z_IS_2746U_EQ_2746(...)  \,
-#define Z_IS_2746_EQ_2746U(...)  \,
-#define Z_IS_2746U_EQ_2746U(...) \,
-#define Z_IS_2747_EQ_2747(...)   \,
-#define Z_IS_2747U_EQ_2747(...)  \,
-#define Z_IS_2747_EQ_2747U(...)  \,
-#define Z_IS_2747U_EQ_2747U(...) \,
-#define Z_IS_2748_EQ_2748(...)   \,
-#define Z_IS_2748U_EQ_2748(...)  \,
-#define Z_IS_2748_EQ_2748U(...)  \,
-#define Z_IS_2748U_EQ_2748U(...) \,
-#define Z_IS_2749_EQ_2749(...)   \,
-#define Z_IS_2749U_EQ_2749(...)  \,
-#define Z_IS_2749_EQ_2749U(...)  \,
-#define Z_IS_2749U_EQ_2749U(...) \,
-#define Z_IS_2750_EQ_2750(...)   \,
-#define Z_IS_2750U_EQ_2750(...)  \,
-#define Z_IS_2750_EQ_2750U(...)  \,
-#define Z_IS_2750U_EQ_2750U(...) \,
-#define Z_IS_2751_EQ_2751(...)   \,
-#define Z_IS_2751U_EQ_2751(...)  \,
-#define Z_IS_2751_EQ_2751U(...)  \,
-#define Z_IS_2751U_EQ_2751U(...) \,
-#define Z_IS_2752_EQ_2752(...)   \,
-#define Z_IS_2752U_EQ_2752(...)  \,
-#define Z_IS_2752_EQ_2752U(...)  \,
-#define Z_IS_2752U_EQ_2752U(...) \,
-#define Z_IS_2753_EQ_2753(...)   \,
-#define Z_IS_2753U_EQ_2753(...)  \,
-#define Z_IS_2753_EQ_2753U(...)  \,
-#define Z_IS_2753U_EQ_2753U(...) \,
-#define Z_IS_2754_EQ_2754(...)   \,
-#define Z_IS_2754U_EQ_2754(...)  \,
-#define Z_IS_2754_EQ_2754U(...)  \,
-#define Z_IS_2754U_EQ_2754U(...) \,
-#define Z_IS_2755_EQ_2755(...)   \,
-#define Z_IS_2755U_EQ_2755(...)  \,
-#define Z_IS_2755_EQ_2755U(...)  \,
-#define Z_IS_2755U_EQ_2755U(...) \,
-#define Z_IS_2756_EQ_2756(...)   \,
-#define Z_IS_2756U_EQ_2756(...)  \,
-#define Z_IS_2756_EQ_2756U(...)  \,
-#define Z_IS_2756U_EQ_2756U(...) \,
-#define Z_IS_2757_EQ_2757(...)   \,
-#define Z_IS_2757U_EQ_2757(...)  \,
-#define Z_IS_2757_EQ_2757U(...)  \,
-#define Z_IS_2757U_EQ_2757U(...) \,
-#define Z_IS_2758_EQ_2758(...)   \,
-#define Z_IS_2758U_EQ_2758(...)  \,
-#define Z_IS_2758_EQ_2758U(...)  \,
-#define Z_IS_2758U_EQ_2758U(...) \,
-#define Z_IS_2759_EQ_2759(...)   \,
-#define Z_IS_2759U_EQ_2759(...)  \,
-#define Z_IS_2759_EQ_2759U(...)  \,
-#define Z_IS_2759U_EQ_2759U(...) \,
-#define Z_IS_2760_EQ_2760(...)   \,
-#define Z_IS_2760U_EQ_2760(...)  \,
-#define Z_IS_2760_EQ_2760U(...)  \,
-#define Z_IS_2760U_EQ_2760U(...) \,
-#define Z_IS_2761_EQ_2761(...)   \,
-#define Z_IS_2761U_EQ_2761(...)  \,
-#define Z_IS_2761_EQ_2761U(...)  \,
-#define Z_IS_2761U_EQ_2761U(...) \,
-#define Z_IS_2762_EQ_2762(...)   \,
-#define Z_IS_2762U_EQ_2762(...)  \,
-#define Z_IS_2762_EQ_2762U(...)  \,
-#define Z_IS_2762U_EQ_2762U(...) \,
-#define Z_IS_2763_EQ_2763(...)   \,
-#define Z_IS_2763U_EQ_2763(...)  \,
-#define Z_IS_2763_EQ_2763U(...)  \,
-#define Z_IS_2763U_EQ_2763U(...) \,
-#define Z_IS_2764_EQ_2764(...)   \,
-#define Z_IS_2764U_EQ_2764(...)  \,
-#define Z_IS_2764_EQ_2764U(...)  \,
-#define Z_IS_2764U_EQ_2764U(...) \,
-#define Z_IS_2765_EQ_2765(...)   \,
-#define Z_IS_2765U_EQ_2765(...)  \,
-#define Z_IS_2765_EQ_2765U(...)  \,
-#define Z_IS_2765U_EQ_2765U(...) \,
-#define Z_IS_2766_EQ_2766(...)   \,
-#define Z_IS_2766U_EQ_2766(...)  \,
-#define Z_IS_2766_EQ_2766U(...)  \,
-#define Z_IS_2766U_EQ_2766U(...) \,
-#define Z_IS_2767_EQ_2767(...)   \,
-#define Z_IS_2767U_EQ_2767(...)  \,
-#define Z_IS_2767_EQ_2767U(...)  \,
-#define Z_IS_2767U_EQ_2767U(...) \,
-#define Z_IS_2768_EQ_2768(...)   \,
-#define Z_IS_2768U_EQ_2768(...)  \,
-#define Z_IS_2768_EQ_2768U(...)  \,
-#define Z_IS_2768U_EQ_2768U(...) \,
-#define Z_IS_2769_EQ_2769(...)   \,
-#define Z_IS_2769U_EQ_2769(...)  \,
-#define Z_IS_2769_EQ_2769U(...)  \,
-#define Z_IS_2769U_EQ_2769U(...) \,
-#define Z_IS_2770_EQ_2770(...)   \,
-#define Z_IS_2770U_EQ_2770(...)  \,
-#define Z_IS_2770_EQ_2770U(...)  \,
-#define Z_IS_2770U_EQ_2770U(...) \,
-#define Z_IS_2771_EQ_2771(...)   \,
-#define Z_IS_2771U_EQ_2771(...)  \,
-#define Z_IS_2771_EQ_2771U(...)  \,
-#define Z_IS_2771U_EQ_2771U(...) \,
-#define Z_IS_2772_EQ_2772(...)   \,
-#define Z_IS_2772U_EQ_2772(...)  \,
-#define Z_IS_2772_EQ_2772U(...)  \,
-#define Z_IS_2772U_EQ_2772U(...) \,
-#define Z_IS_2773_EQ_2773(...)   \,
-#define Z_IS_2773U_EQ_2773(...)  \,
-#define Z_IS_2773_EQ_2773U(...)  \,
-#define Z_IS_2773U_EQ_2773U(...) \,
-#define Z_IS_2774_EQ_2774(...)   \,
-#define Z_IS_2774U_EQ_2774(...)  \,
-#define Z_IS_2774_EQ_2774U(...)  \,
-#define Z_IS_2774U_EQ_2774U(...) \,
-#define Z_IS_2775_EQ_2775(...)   \,
-#define Z_IS_2775U_EQ_2775(...)  \,
-#define Z_IS_2775_EQ_2775U(...)  \,
-#define Z_IS_2775U_EQ_2775U(...) \,
-#define Z_IS_2776_EQ_2776(...)   \,
-#define Z_IS_2776U_EQ_2776(...)  \,
-#define Z_IS_2776_EQ_2776U(...)  \,
-#define Z_IS_2776U_EQ_2776U(...) \,
-#define Z_IS_2777_EQ_2777(...)   \,
-#define Z_IS_2777U_EQ_2777(...)  \,
-#define Z_IS_2777_EQ_2777U(...)  \,
-#define Z_IS_2777U_EQ_2777U(...) \,
-#define Z_IS_2778_EQ_2778(...)   \,
-#define Z_IS_2778U_EQ_2778(...)  \,
-#define Z_IS_2778_EQ_2778U(...)  \,
-#define Z_IS_2778U_EQ_2778U(...) \,
-#define Z_IS_2779_EQ_2779(...)   \,
-#define Z_IS_2779U_EQ_2779(...)  \,
-#define Z_IS_2779_EQ_2779U(...)  \,
-#define Z_IS_2779U_EQ_2779U(...) \,
-#define Z_IS_2780_EQ_2780(...)   \,
-#define Z_IS_2780U_EQ_2780(...)  \,
-#define Z_IS_2780_EQ_2780U(...)  \,
-#define Z_IS_2780U_EQ_2780U(...) \,
-#define Z_IS_2781_EQ_2781(...)   \,
-#define Z_IS_2781U_EQ_2781(...)  \,
-#define Z_IS_2781_EQ_2781U(...)  \,
-#define Z_IS_2781U_EQ_2781U(...) \,
-#define Z_IS_2782_EQ_2782(...)   \,
-#define Z_IS_2782U_EQ_2782(...)  \,
-#define Z_IS_2782_EQ_2782U(...)  \,
-#define Z_IS_2782U_EQ_2782U(...) \,
-#define Z_IS_2783_EQ_2783(...)   \,
-#define Z_IS_2783U_EQ_2783(...)  \,
-#define Z_IS_2783_EQ_2783U(...)  \,
-#define Z_IS_2783U_EQ_2783U(...) \,
-#define Z_IS_2784_EQ_2784(...)   \,
-#define Z_IS_2784U_EQ_2784(...)  \,
-#define Z_IS_2784_EQ_2784U(...)  \,
-#define Z_IS_2784U_EQ_2784U(...) \,
-#define Z_IS_2785_EQ_2785(...)   \,
-#define Z_IS_2785U_EQ_2785(...)  \,
-#define Z_IS_2785_EQ_2785U(...)  \,
-#define Z_IS_2785U_EQ_2785U(...) \,
-#define Z_IS_2786_EQ_2786(...)   \,
-#define Z_IS_2786U_EQ_2786(...)  \,
-#define Z_IS_2786_EQ_2786U(...)  \,
-#define Z_IS_2786U_EQ_2786U(...) \,
-#define Z_IS_2787_EQ_2787(...)   \,
-#define Z_IS_2787U_EQ_2787(...)  \,
-#define Z_IS_2787_EQ_2787U(...)  \,
-#define Z_IS_2787U_EQ_2787U(...) \,
-#define Z_IS_2788_EQ_2788(...)   \,
-#define Z_IS_2788U_EQ_2788(...)  \,
-#define Z_IS_2788_EQ_2788U(...)  \,
-#define Z_IS_2788U_EQ_2788U(...) \,
-#define Z_IS_2789_EQ_2789(...)   \,
-#define Z_IS_2789U_EQ_2789(...)  \,
-#define Z_IS_2789_EQ_2789U(...)  \,
-#define Z_IS_2789U_EQ_2789U(...) \,
-#define Z_IS_2790_EQ_2790(...)   \,
-#define Z_IS_2790U_EQ_2790(...)  \,
-#define Z_IS_2790_EQ_2790U(...)  \,
-#define Z_IS_2790U_EQ_2790U(...) \,
-#define Z_IS_2791_EQ_2791(...)   \,
-#define Z_IS_2791U_EQ_2791(...)  \,
-#define Z_IS_2791_EQ_2791U(...)  \,
-#define Z_IS_2791U_EQ_2791U(...) \,
-#define Z_IS_2792_EQ_2792(...)   \,
-#define Z_IS_2792U_EQ_2792(...)  \,
-#define Z_IS_2792_EQ_2792U(...)  \,
-#define Z_IS_2792U_EQ_2792U(...) \,
-#define Z_IS_2793_EQ_2793(...)   \,
-#define Z_IS_2793U_EQ_2793(...)  \,
-#define Z_IS_2793_EQ_2793U(...)  \,
-#define Z_IS_2793U_EQ_2793U(...) \,
-#define Z_IS_2794_EQ_2794(...)   \,
-#define Z_IS_2794U_EQ_2794(...)  \,
-#define Z_IS_2794_EQ_2794U(...)  \,
-#define Z_IS_2794U_EQ_2794U(...) \,
-#define Z_IS_2795_EQ_2795(...)   \,
-#define Z_IS_2795U_EQ_2795(...)  \,
-#define Z_IS_2795_EQ_2795U(...)  \,
-#define Z_IS_2795U_EQ_2795U(...) \,
-#define Z_IS_2796_EQ_2796(...)   \,
-#define Z_IS_2796U_EQ_2796(...)  \,
-#define Z_IS_2796_EQ_2796U(...)  \,
-#define Z_IS_2796U_EQ_2796U(...) \,
-#define Z_IS_2797_EQ_2797(...)   \,
-#define Z_IS_2797U_EQ_2797(...)  \,
-#define Z_IS_2797_EQ_2797U(...)  \,
-#define Z_IS_2797U_EQ_2797U(...) \,
-#define Z_IS_2798_EQ_2798(...)   \,
-#define Z_IS_2798U_EQ_2798(...)  \,
-#define Z_IS_2798_EQ_2798U(...)  \,
-#define Z_IS_2798U_EQ_2798U(...) \,
-#define Z_IS_2799_EQ_2799(...)   \,
-#define Z_IS_2799U_EQ_2799(...)  \,
-#define Z_IS_2799_EQ_2799U(...)  \,
-#define Z_IS_2799U_EQ_2799U(...) \,
-#define Z_IS_2800_EQ_2800(...)   \,
-#define Z_IS_2800U_EQ_2800(...)  \,
-#define Z_IS_2800_EQ_2800U(...)  \,
-#define Z_IS_2800U_EQ_2800U(...) \,
-#define Z_IS_2801_EQ_2801(...)   \,
-#define Z_IS_2801U_EQ_2801(...)  \,
-#define Z_IS_2801_EQ_2801U(...)  \,
-#define Z_IS_2801U_EQ_2801U(...) \,
-#define Z_IS_2802_EQ_2802(...)   \,
-#define Z_IS_2802U_EQ_2802(...)  \,
-#define Z_IS_2802_EQ_2802U(...)  \,
-#define Z_IS_2802U_EQ_2802U(...) \,
-#define Z_IS_2803_EQ_2803(...)   \,
-#define Z_IS_2803U_EQ_2803(...)  \,
-#define Z_IS_2803_EQ_2803U(...)  \,
-#define Z_IS_2803U_EQ_2803U(...) \,
-#define Z_IS_2804_EQ_2804(...)   \,
-#define Z_IS_2804U_EQ_2804(...)  \,
-#define Z_IS_2804_EQ_2804U(...)  \,
-#define Z_IS_2804U_EQ_2804U(...) \,
-#define Z_IS_2805_EQ_2805(...)   \,
-#define Z_IS_2805U_EQ_2805(...)  \,
-#define Z_IS_2805_EQ_2805U(...)  \,
-#define Z_IS_2805U_EQ_2805U(...) \,
-#define Z_IS_2806_EQ_2806(...)   \,
-#define Z_IS_2806U_EQ_2806(...)  \,
-#define Z_IS_2806_EQ_2806U(...)  \,
-#define Z_IS_2806U_EQ_2806U(...) \,
-#define Z_IS_2807_EQ_2807(...)   \,
-#define Z_IS_2807U_EQ_2807(...)  \,
-#define Z_IS_2807_EQ_2807U(...)  \,
-#define Z_IS_2807U_EQ_2807U(...) \,
-#define Z_IS_2808_EQ_2808(...)   \,
-#define Z_IS_2808U_EQ_2808(...)  \,
-#define Z_IS_2808_EQ_2808U(...)  \,
-#define Z_IS_2808U_EQ_2808U(...) \,
-#define Z_IS_2809_EQ_2809(...)   \,
-#define Z_IS_2809U_EQ_2809(...)  \,
-#define Z_IS_2809_EQ_2809U(...)  \,
-#define Z_IS_2809U_EQ_2809U(...) \,
-#define Z_IS_2810_EQ_2810(...)   \,
-#define Z_IS_2810U_EQ_2810(...)  \,
-#define Z_IS_2810_EQ_2810U(...)  \,
-#define Z_IS_2810U_EQ_2810U(...) \,
-#define Z_IS_2811_EQ_2811(...)   \,
-#define Z_IS_2811U_EQ_2811(...)  \,
-#define Z_IS_2811_EQ_2811U(...)  \,
-#define Z_IS_2811U_EQ_2811U(...) \,
-#define Z_IS_2812_EQ_2812(...)   \,
-#define Z_IS_2812U_EQ_2812(...)  \,
-#define Z_IS_2812_EQ_2812U(...)  \,
-#define Z_IS_2812U_EQ_2812U(...) \,
-#define Z_IS_2813_EQ_2813(...)   \,
-#define Z_IS_2813U_EQ_2813(...)  \,
-#define Z_IS_2813_EQ_2813U(...)  \,
-#define Z_IS_2813U_EQ_2813U(...) \,
-#define Z_IS_2814_EQ_2814(...)   \,
-#define Z_IS_2814U_EQ_2814(...)  \,
-#define Z_IS_2814_EQ_2814U(...)  \,
-#define Z_IS_2814U_EQ_2814U(...) \,
-#define Z_IS_2815_EQ_2815(...)   \,
-#define Z_IS_2815U_EQ_2815(...)  \,
-#define Z_IS_2815_EQ_2815U(...)  \,
-#define Z_IS_2815U_EQ_2815U(...) \,
-#define Z_IS_2816_EQ_2816(...)   \,
-#define Z_IS_2816U_EQ_2816(...)  \,
-#define Z_IS_2816_EQ_2816U(...)  \,
-#define Z_IS_2816U_EQ_2816U(...) \,
-#define Z_IS_2817_EQ_2817(...)   \,
-#define Z_IS_2817U_EQ_2817(...)  \,
-#define Z_IS_2817_EQ_2817U(...)  \,
-#define Z_IS_2817U_EQ_2817U(...) \,
-#define Z_IS_2818_EQ_2818(...)   \,
-#define Z_IS_2818U_EQ_2818(...)  \,
-#define Z_IS_2818_EQ_2818U(...)  \,
-#define Z_IS_2818U_EQ_2818U(...) \,
-#define Z_IS_2819_EQ_2819(...)   \,
-#define Z_IS_2819U_EQ_2819(...)  \,
-#define Z_IS_2819_EQ_2819U(...)  \,
-#define Z_IS_2819U_EQ_2819U(...) \,
-#define Z_IS_2820_EQ_2820(...)   \,
-#define Z_IS_2820U_EQ_2820(...)  \,
-#define Z_IS_2820_EQ_2820U(...)  \,
-#define Z_IS_2820U_EQ_2820U(...) \,
-#define Z_IS_2821_EQ_2821(...)   \,
-#define Z_IS_2821U_EQ_2821(...)  \,
-#define Z_IS_2821_EQ_2821U(...)  \,
-#define Z_IS_2821U_EQ_2821U(...) \,
-#define Z_IS_2822_EQ_2822(...)   \,
-#define Z_IS_2822U_EQ_2822(...)  \,
-#define Z_IS_2822_EQ_2822U(...)  \,
-#define Z_IS_2822U_EQ_2822U(...) \,
-#define Z_IS_2823_EQ_2823(...)   \,
-#define Z_IS_2823U_EQ_2823(...)  \,
-#define Z_IS_2823_EQ_2823U(...)  \,
-#define Z_IS_2823U_EQ_2823U(...) \,
-#define Z_IS_2824_EQ_2824(...)   \,
-#define Z_IS_2824U_EQ_2824(...)  \,
-#define Z_IS_2824_EQ_2824U(...)  \,
-#define Z_IS_2824U_EQ_2824U(...) \,
-#define Z_IS_2825_EQ_2825(...)   \,
-#define Z_IS_2825U_EQ_2825(...)  \,
-#define Z_IS_2825_EQ_2825U(...)  \,
-#define Z_IS_2825U_EQ_2825U(...) \,
-#define Z_IS_2826_EQ_2826(...)   \,
-#define Z_IS_2826U_EQ_2826(...)  \,
-#define Z_IS_2826_EQ_2826U(...)  \,
-#define Z_IS_2826U_EQ_2826U(...) \,
-#define Z_IS_2827_EQ_2827(...)   \,
-#define Z_IS_2827U_EQ_2827(...)  \,
-#define Z_IS_2827_EQ_2827U(...)  \,
-#define Z_IS_2827U_EQ_2827U(...) \,
-#define Z_IS_2828_EQ_2828(...)   \,
-#define Z_IS_2828U_EQ_2828(...)  \,
-#define Z_IS_2828_EQ_2828U(...)  \,
-#define Z_IS_2828U_EQ_2828U(...) \,
-#define Z_IS_2829_EQ_2829(...)   \,
-#define Z_IS_2829U_EQ_2829(...)  \,
-#define Z_IS_2829_EQ_2829U(...)  \,
-#define Z_IS_2829U_EQ_2829U(...) \,
-#define Z_IS_2830_EQ_2830(...)   \,
-#define Z_IS_2830U_EQ_2830(...)  \,
-#define Z_IS_2830_EQ_2830U(...)  \,
-#define Z_IS_2830U_EQ_2830U(...) \,
-#define Z_IS_2831_EQ_2831(...)   \,
-#define Z_IS_2831U_EQ_2831(...)  \,
-#define Z_IS_2831_EQ_2831U(...)  \,
-#define Z_IS_2831U_EQ_2831U(...) \,
-#define Z_IS_2832_EQ_2832(...)   \,
-#define Z_IS_2832U_EQ_2832(...)  \,
-#define Z_IS_2832_EQ_2832U(...)  \,
-#define Z_IS_2832U_EQ_2832U(...) \,
-#define Z_IS_2833_EQ_2833(...)   \,
-#define Z_IS_2833U_EQ_2833(...)  \,
-#define Z_IS_2833_EQ_2833U(...)  \,
-#define Z_IS_2833U_EQ_2833U(...) \,
-#define Z_IS_2834_EQ_2834(...)   \,
-#define Z_IS_2834U_EQ_2834(...)  \,
-#define Z_IS_2834_EQ_2834U(...)  \,
-#define Z_IS_2834U_EQ_2834U(...) \,
-#define Z_IS_2835_EQ_2835(...)   \,
-#define Z_IS_2835U_EQ_2835(...)  \,
-#define Z_IS_2835_EQ_2835U(...)  \,
-#define Z_IS_2835U_EQ_2835U(...) \,
-#define Z_IS_2836_EQ_2836(...)   \,
-#define Z_IS_2836U_EQ_2836(...)  \,
-#define Z_IS_2836_EQ_2836U(...)  \,
-#define Z_IS_2836U_EQ_2836U(...) \,
-#define Z_IS_2837_EQ_2837(...)   \,
-#define Z_IS_2837U_EQ_2837(...)  \,
-#define Z_IS_2837_EQ_2837U(...)  \,
-#define Z_IS_2837U_EQ_2837U(...) \,
-#define Z_IS_2838_EQ_2838(...)   \,
-#define Z_IS_2838U_EQ_2838(...)  \,
-#define Z_IS_2838_EQ_2838U(...)  \,
-#define Z_IS_2838U_EQ_2838U(...) \,
-#define Z_IS_2839_EQ_2839(...)   \,
-#define Z_IS_2839U_EQ_2839(...)  \,
-#define Z_IS_2839_EQ_2839U(...)  \,
-#define Z_IS_2839U_EQ_2839U(...) \,
-#define Z_IS_2840_EQ_2840(...)   \,
-#define Z_IS_2840U_EQ_2840(...)  \,
-#define Z_IS_2840_EQ_2840U(...)  \,
-#define Z_IS_2840U_EQ_2840U(...) \,
-#define Z_IS_2841_EQ_2841(...)   \,
-#define Z_IS_2841U_EQ_2841(...)  \,
-#define Z_IS_2841_EQ_2841U(...)  \,
-#define Z_IS_2841U_EQ_2841U(...) \,
-#define Z_IS_2842_EQ_2842(...)   \,
-#define Z_IS_2842U_EQ_2842(...)  \,
-#define Z_IS_2842_EQ_2842U(...)  \,
-#define Z_IS_2842U_EQ_2842U(...) \,
-#define Z_IS_2843_EQ_2843(...)   \,
-#define Z_IS_2843U_EQ_2843(...)  \,
-#define Z_IS_2843_EQ_2843U(...)  \,
-#define Z_IS_2843U_EQ_2843U(...) \,
-#define Z_IS_2844_EQ_2844(...)   \,
-#define Z_IS_2844U_EQ_2844(...)  \,
-#define Z_IS_2844_EQ_2844U(...)  \,
-#define Z_IS_2844U_EQ_2844U(...) \,
-#define Z_IS_2845_EQ_2845(...)   \,
-#define Z_IS_2845U_EQ_2845(...)  \,
-#define Z_IS_2845_EQ_2845U(...)  \,
-#define Z_IS_2845U_EQ_2845U(...) \,
-#define Z_IS_2846_EQ_2846(...)   \,
-#define Z_IS_2846U_EQ_2846(...)  \,
-#define Z_IS_2846_EQ_2846U(...)  \,
-#define Z_IS_2846U_EQ_2846U(...) \,
-#define Z_IS_2847_EQ_2847(...)   \,
-#define Z_IS_2847U_EQ_2847(...)  \,
-#define Z_IS_2847_EQ_2847U(...)  \,
-#define Z_IS_2847U_EQ_2847U(...) \,
-#define Z_IS_2848_EQ_2848(...)   \,
-#define Z_IS_2848U_EQ_2848(...)  \,
-#define Z_IS_2848_EQ_2848U(...)  \,
-#define Z_IS_2848U_EQ_2848U(...) \,
-#define Z_IS_2849_EQ_2849(...)   \,
-#define Z_IS_2849U_EQ_2849(...)  \,
-#define Z_IS_2849_EQ_2849U(...)  \,
-#define Z_IS_2849U_EQ_2849U(...) \,
-#define Z_IS_2850_EQ_2850(...)   \,
-#define Z_IS_2850U_EQ_2850(...)  \,
-#define Z_IS_2850_EQ_2850U(...)  \,
-#define Z_IS_2850U_EQ_2850U(...) \,
-#define Z_IS_2851_EQ_2851(...)   \,
-#define Z_IS_2851U_EQ_2851(...)  \,
-#define Z_IS_2851_EQ_2851U(...)  \,
-#define Z_IS_2851U_EQ_2851U(...) \,
-#define Z_IS_2852_EQ_2852(...)   \,
-#define Z_IS_2852U_EQ_2852(...)  \,
-#define Z_IS_2852_EQ_2852U(...)  \,
-#define Z_IS_2852U_EQ_2852U(...) \,
-#define Z_IS_2853_EQ_2853(...)   \,
-#define Z_IS_2853U_EQ_2853(...)  \,
-#define Z_IS_2853_EQ_2853U(...)  \,
-#define Z_IS_2853U_EQ_2853U(...) \,
-#define Z_IS_2854_EQ_2854(...)   \,
-#define Z_IS_2854U_EQ_2854(...)  \,
-#define Z_IS_2854_EQ_2854U(...)  \,
-#define Z_IS_2854U_EQ_2854U(...) \,
-#define Z_IS_2855_EQ_2855(...)   \,
-#define Z_IS_2855U_EQ_2855(...)  \,
-#define Z_IS_2855_EQ_2855U(...)  \,
-#define Z_IS_2855U_EQ_2855U(...) \,
-#define Z_IS_2856_EQ_2856(...)   \,
-#define Z_IS_2856U_EQ_2856(...)  \,
-#define Z_IS_2856_EQ_2856U(...)  \,
-#define Z_IS_2856U_EQ_2856U(...) \,
-#define Z_IS_2857_EQ_2857(...)   \,
-#define Z_IS_2857U_EQ_2857(...)  \,
-#define Z_IS_2857_EQ_2857U(...)  \,
-#define Z_IS_2857U_EQ_2857U(...) \,
-#define Z_IS_2858_EQ_2858(...)   \,
-#define Z_IS_2858U_EQ_2858(...)  \,
-#define Z_IS_2858_EQ_2858U(...)  \,
-#define Z_IS_2858U_EQ_2858U(...) \,
-#define Z_IS_2859_EQ_2859(...)   \,
-#define Z_IS_2859U_EQ_2859(...)  \,
-#define Z_IS_2859_EQ_2859U(...)  \,
-#define Z_IS_2859U_EQ_2859U(...) \,
-#define Z_IS_2860_EQ_2860(...)   \,
-#define Z_IS_2860U_EQ_2860(...)  \,
-#define Z_IS_2860_EQ_2860U(...)  \,
-#define Z_IS_2860U_EQ_2860U(...) \,
-#define Z_IS_2861_EQ_2861(...)   \,
-#define Z_IS_2861U_EQ_2861(...)  \,
-#define Z_IS_2861_EQ_2861U(...)  \,
-#define Z_IS_2861U_EQ_2861U(...) \,
-#define Z_IS_2862_EQ_2862(...)   \,
-#define Z_IS_2862U_EQ_2862(...)  \,
-#define Z_IS_2862_EQ_2862U(...)  \,
-#define Z_IS_2862U_EQ_2862U(...) \,
-#define Z_IS_2863_EQ_2863(...)   \,
-#define Z_IS_2863U_EQ_2863(...)  \,
-#define Z_IS_2863_EQ_2863U(...)  \,
-#define Z_IS_2863U_EQ_2863U(...) \,
-#define Z_IS_2864_EQ_2864(...)   \,
-#define Z_IS_2864U_EQ_2864(...)  \,
-#define Z_IS_2864_EQ_2864U(...)  \,
-#define Z_IS_2864U_EQ_2864U(...) \,
-#define Z_IS_2865_EQ_2865(...)   \,
-#define Z_IS_2865U_EQ_2865(...)  \,
-#define Z_IS_2865_EQ_2865U(...)  \,
-#define Z_IS_2865U_EQ_2865U(...) \,
-#define Z_IS_2866_EQ_2866(...)   \,
-#define Z_IS_2866U_EQ_2866(...)  \,
-#define Z_IS_2866_EQ_2866U(...)  \,
-#define Z_IS_2866U_EQ_2866U(...) \,
-#define Z_IS_2867_EQ_2867(...)   \,
-#define Z_IS_2867U_EQ_2867(...)  \,
-#define Z_IS_2867_EQ_2867U(...)  \,
-#define Z_IS_2867U_EQ_2867U(...) \,
-#define Z_IS_2868_EQ_2868(...)   \,
-#define Z_IS_2868U_EQ_2868(...)  \,
-#define Z_IS_2868_EQ_2868U(...)  \,
-#define Z_IS_2868U_EQ_2868U(...) \,
-#define Z_IS_2869_EQ_2869(...)   \,
-#define Z_IS_2869U_EQ_2869(...)  \,
-#define Z_IS_2869_EQ_2869U(...)  \,
-#define Z_IS_2869U_EQ_2869U(...) \,
-#define Z_IS_2870_EQ_2870(...)   \,
-#define Z_IS_2870U_EQ_2870(...)  \,
-#define Z_IS_2870_EQ_2870U(...)  \,
-#define Z_IS_2870U_EQ_2870U(...) \,
-#define Z_IS_2871_EQ_2871(...)   \,
-#define Z_IS_2871U_EQ_2871(...)  \,
-#define Z_IS_2871_EQ_2871U(...)  \,
-#define Z_IS_2871U_EQ_2871U(...) \,
-#define Z_IS_2872_EQ_2872(...)   \,
-#define Z_IS_2872U_EQ_2872(...)  \,
-#define Z_IS_2872_EQ_2872U(...)  \,
-#define Z_IS_2872U_EQ_2872U(...) \,
-#define Z_IS_2873_EQ_2873(...)   \,
-#define Z_IS_2873U_EQ_2873(...)  \,
-#define Z_IS_2873_EQ_2873U(...)  \,
-#define Z_IS_2873U_EQ_2873U(...) \,
-#define Z_IS_2874_EQ_2874(...)   \,
-#define Z_IS_2874U_EQ_2874(...)  \,
-#define Z_IS_2874_EQ_2874U(...)  \,
-#define Z_IS_2874U_EQ_2874U(...) \,
-#define Z_IS_2875_EQ_2875(...)   \,
-#define Z_IS_2875U_EQ_2875(...)  \,
-#define Z_IS_2875_EQ_2875U(...)  \,
-#define Z_IS_2875U_EQ_2875U(...) \,
-#define Z_IS_2876_EQ_2876(...)   \,
-#define Z_IS_2876U_EQ_2876(...)  \,
-#define Z_IS_2876_EQ_2876U(...)  \,
-#define Z_IS_2876U_EQ_2876U(...) \,
-#define Z_IS_2877_EQ_2877(...)   \,
-#define Z_IS_2877U_EQ_2877(...)  \,
-#define Z_IS_2877_EQ_2877U(...)  \,
-#define Z_IS_2877U_EQ_2877U(...) \,
-#define Z_IS_2878_EQ_2878(...)   \,
-#define Z_IS_2878U_EQ_2878(...)  \,
-#define Z_IS_2878_EQ_2878U(...)  \,
-#define Z_IS_2878U_EQ_2878U(...) \,
-#define Z_IS_2879_EQ_2879(...)   \,
-#define Z_IS_2879U_EQ_2879(...)  \,
-#define Z_IS_2879_EQ_2879U(...)  \,
-#define Z_IS_2879U_EQ_2879U(...) \,
-#define Z_IS_2880_EQ_2880(...)   \,
-#define Z_IS_2880U_EQ_2880(...)  \,
-#define Z_IS_2880_EQ_2880U(...)  \,
-#define Z_IS_2880U_EQ_2880U(...) \,
-#define Z_IS_2881_EQ_2881(...)   \,
-#define Z_IS_2881U_EQ_2881(...)  \,
-#define Z_IS_2881_EQ_2881U(...)  \,
-#define Z_IS_2881U_EQ_2881U(...) \,
-#define Z_IS_2882_EQ_2882(...)   \,
-#define Z_IS_2882U_EQ_2882(...)  \,
-#define Z_IS_2882_EQ_2882U(...)  \,
-#define Z_IS_2882U_EQ_2882U(...) \,
-#define Z_IS_2883_EQ_2883(...)   \,
-#define Z_IS_2883U_EQ_2883(...)  \,
-#define Z_IS_2883_EQ_2883U(...)  \,
-#define Z_IS_2883U_EQ_2883U(...) \,
-#define Z_IS_2884_EQ_2884(...)   \,
-#define Z_IS_2884U_EQ_2884(...)  \,
-#define Z_IS_2884_EQ_2884U(...)  \,
-#define Z_IS_2884U_EQ_2884U(...) \,
-#define Z_IS_2885_EQ_2885(...)   \,
-#define Z_IS_2885U_EQ_2885(...)  \,
-#define Z_IS_2885_EQ_2885U(...)  \,
-#define Z_IS_2885U_EQ_2885U(...) \,
-#define Z_IS_2886_EQ_2886(...)   \,
-#define Z_IS_2886U_EQ_2886(...)  \,
-#define Z_IS_2886_EQ_2886U(...)  \,
-#define Z_IS_2886U_EQ_2886U(...) \,
-#define Z_IS_2887_EQ_2887(...)   \,
-#define Z_IS_2887U_EQ_2887(...)  \,
-#define Z_IS_2887_EQ_2887U(...)  \,
-#define Z_IS_2887U_EQ_2887U(...) \,
-#define Z_IS_2888_EQ_2888(...)   \,
-#define Z_IS_2888U_EQ_2888(...)  \,
-#define Z_IS_2888_EQ_2888U(...)  \,
-#define Z_IS_2888U_EQ_2888U(...) \,
-#define Z_IS_2889_EQ_2889(...)   \,
-#define Z_IS_2889U_EQ_2889(...)  \,
-#define Z_IS_2889_EQ_2889U(...)  \,
-#define Z_IS_2889U_EQ_2889U(...) \,
-#define Z_IS_2890_EQ_2890(...)   \,
-#define Z_IS_2890U_EQ_2890(...)  \,
-#define Z_IS_2890_EQ_2890U(...)  \,
-#define Z_IS_2890U_EQ_2890U(...) \,
-#define Z_IS_2891_EQ_2891(...)   \,
-#define Z_IS_2891U_EQ_2891(...)  \,
-#define Z_IS_2891_EQ_2891U(...)  \,
-#define Z_IS_2891U_EQ_2891U(...) \,
-#define Z_IS_2892_EQ_2892(...)   \,
-#define Z_IS_2892U_EQ_2892(...)  \,
-#define Z_IS_2892_EQ_2892U(...)  \,
-#define Z_IS_2892U_EQ_2892U(...) \,
-#define Z_IS_2893_EQ_2893(...)   \,
-#define Z_IS_2893U_EQ_2893(...)  \,
-#define Z_IS_2893_EQ_2893U(...)  \,
-#define Z_IS_2893U_EQ_2893U(...) \,
-#define Z_IS_2894_EQ_2894(...)   \,
-#define Z_IS_2894U_EQ_2894(...)  \,
-#define Z_IS_2894_EQ_2894U(...)  \,
-#define Z_IS_2894U_EQ_2894U(...) \,
-#define Z_IS_2895_EQ_2895(...)   \,
-#define Z_IS_2895U_EQ_2895(...)  \,
-#define Z_IS_2895_EQ_2895U(...)  \,
-#define Z_IS_2895U_EQ_2895U(...) \,
-#define Z_IS_2896_EQ_2896(...)   \,
-#define Z_IS_2896U_EQ_2896(...)  \,
-#define Z_IS_2896_EQ_2896U(...)  \,
-#define Z_IS_2896U_EQ_2896U(...) \,
-#define Z_IS_2897_EQ_2897(...)   \,
-#define Z_IS_2897U_EQ_2897(...)  \,
-#define Z_IS_2897_EQ_2897U(...)  \,
-#define Z_IS_2897U_EQ_2897U(...) \,
-#define Z_IS_2898_EQ_2898(...)   \,
-#define Z_IS_2898U_EQ_2898(...)  \,
-#define Z_IS_2898_EQ_2898U(...)  \,
-#define Z_IS_2898U_EQ_2898U(...) \,
-#define Z_IS_2899_EQ_2899(...)   \,
-#define Z_IS_2899U_EQ_2899(...)  \,
-#define Z_IS_2899_EQ_2899U(...)  \,
-#define Z_IS_2899U_EQ_2899U(...) \,
-#define Z_IS_2900_EQ_2900(...)   \,
-#define Z_IS_2900U_EQ_2900(...)  \,
-#define Z_IS_2900_EQ_2900U(...)  \,
-#define Z_IS_2900U_EQ_2900U(...) \,
-#define Z_IS_2901_EQ_2901(...)   \,
-#define Z_IS_2901U_EQ_2901(...)  \,
-#define Z_IS_2901_EQ_2901U(...)  \,
-#define Z_IS_2901U_EQ_2901U(...) \,
-#define Z_IS_2902_EQ_2902(...)   \,
-#define Z_IS_2902U_EQ_2902(...)  \,
-#define Z_IS_2902_EQ_2902U(...)  \,
-#define Z_IS_2902U_EQ_2902U(...) \,
-#define Z_IS_2903_EQ_2903(...)   \,
-#define Z_IS_2903U_EQ_2903(...)  \,
-#define Z_IS_2903_EQ_2903U(...)  \,
-#define Z_IS_2903U_EQ_2903U(...) \,
-#define Z_IS_2904_EQ_2904(...)   \,
-#define Z_IS_2904U_EQ_2904(...)  \,
-#define Z_IS_2904_EQ_2904U(...)  \,
-#define Z_IS_2904U_EQ_2904U(...) \,
-#define Z_IS_2905_EQ_2905(...)   \,
-#define Z_IS_2905U_EQ_2905(...)  \,
-#define Z_IS_2905_EQ_2905U(...)  \,
-#define Z_IS_2905U_EQ_2905U(...) \,
-#define Z_IS_2906_EQ_2906(...)   \,
-#define Z_IS_2906U_EQ_2906(...)  \,
-#define Z_IS_2906_EQ_2906U(...)  \,
-#define Z_IS_2906U_EQ_2906U(...) \,
-#define Z_IS_2907_EQ_2907(...)   \,
-#define Z_IS_2907U_EQ_2907(...)  \,
-#define Z_IS_2907_EQ_2907U(...)  \,
-#define Z_IS_2907U_EQ_2907U(...) \,
-#define Z_IS_2908_EQ_2908(...)   \,
-#define Z_IS_2908U_EQ_2908(...)  \,
-#define Z_IS_2908_EQ_2908U(...)  \,
-#define Z_IS_2908U_EQ_2908U(...) \,
-#define Z_IS_2909_EQ_2909(...)   \,
-#define Z_IS_2909U_EQ_2909(...)  \,
-#define Z_IS_2909_EQ_2909U(...)  \,
-#define Z_IS_2909U_EQ_2909U(...) \,
-#define Z_IS_2910_EQ_2910(...)   \,
-#define Z_IS_2910U_EQ_2910(...)  \,
-#define Z_IS_2910_EQ_2910U(...)  \,
-#define Z_IS_2910U_EQ_2910U(...) \,
-#define Z_IS_2911_EQ_2911(...)   \,
-#define Z_IS_2911U_EQ_2911(...)  \,
-#define Z_IS_2911_EQ_2911U(...)  \,
-#define Z_IS_2911U_EQ_2911U(...) \,
-#define Z_IS_2912_EQ_2912(...)   \,
-#define Z_IS_2912U_EQ_2912(...)  \,
-#define Z_IS_2912_EQ_2912U(...)  \,
-#define Z_IS_2912U_EQ_2912U(...) \,
-#define Z_IS_2913_EQ_2913(...)   \,
-#define Z_IS_2913U_EQ_2913(...)  \,
-#define Z_IS_2913_EQ_2913U(...)  \,
-#define Z_IS_2913U_EQ_2913U(...) \,
-#define Z_IS_2914_EQ_2914(...)   \,
-#define Z_IS_2914U_EQ_2914(...)  \,
-#define Z_IS_2914_EQ_2914U(...)  \,
-#define Z_IS_2914U_EQ_2914U(...) \,
-#define Z_IS_2915_EQ_2915(...)   \,
-#define Z_IS_2915U_EQ_2915(...)  \,
-#define Z_IS_2915_EQ_2915U(...)  \,
-#define Z_IS_2915U_EQ_2915U(...) \,
-#define Z_IS_2916_EQ_2916(...)   \,
-#define Z_IS_2916U_EQ_2916(...)  \,
-#define Z_IS_2916_EQ_2916U(...)  \,
-#define Z_IS_2916U_EQ_2916U(...) \,
-#define Z_IS_2917_EQ_2917(...)   \,
-#define Z_IS_2917U_EQ_2917(...)  \,
-#define Z_IS_2917_EQ_2917U(...)  \,
-#define Z_IS_2917U_EQ_2917U(...) \,
-#define Z_IS_2918_EQ_2918(...)   \,
-#define Z_IS_2918U_EQ_2918(...)  \,
-#define Z_IS_2918_EQ_2918U(...)  \,
-#define Z_IS_2918U_EQ_2918U(...) \,
-#define Z_IS_2919_EQ_2919(...)   \,
-#define Z_IS_2919U_EQ_2919(...)  \,
-#define Z_IS_2919_EQ_2919U(...)  \,
-#define Z_IS_2919U_EQ_2919U(...) \,
-#define Z_IS_2920_EQ_2920(...)   \,
-#define Z_IS_2920U_EQ_2920(...)  \,
-#define Z_IS_2920_EQ_2920U(...)  \,
-#define Z_IS_2920U_EQ_2920U(...) \,
-#define Z_IS_2921_EQ_2921(...)   \,
-#define Z_IS_2921U_EQ_2921(...)  \,
-#define Z_IS_2921_EQ_2921U(...)  \,
-#define Z_IS_2921U_EQ_2921U(...) \,
-#define Z_IS_2922_EQ_2922(...)   \,
-#define Z_IS_2922U_EQ_2922(...)  \,
-#define Z_IS_2922_EQ_2922U(...)  \,
-#define Z_IS_2922U_EQ_2922U(...) \,
-#define Z_IS_2923_EQ_2923(...)   \,
-#define Z_IS_2923U_EQ_2923(...)  \,
-#define Z_IS_2923_EQ_2923U(...)  \,
-#define Z_IS_2923U_EQ_2923U(...) \,
-#define Z_IS_2924_EQ_2924(...)   \,
-#define Z_IS_2924U_EQ_2924(...)  \,
-#define Z_IS_2924_EQ_2924U(...)  \,
-#define Z_IS_2924U_EQ_2924U(...) \,
-#define Z_IS_2925_EQ_2925(...)   \,
-#define Z_IS_2925U_EQ_2925(...)  \,
-#define Z_IS_2925_EQ_2925U(...)  \,
-#define Z_IS_2925U_EQ_2925U(...) \,
-#define Z_IS_2926_EQ_2926(...)   \,
-#define Z_IS_2926U_EQ_2926(...)  \,
-#define Z_IS_2926_EQ_2926U(...)  \,
-#define Z_IS_2926U_EQ_2926U(...) \,
-#define Z_IS_2927_EQ_2927(...)   \,
-#define Z_IS_2927U_EQ_2927(...)  \,
-#define Z_IS_2927_EQ_2927U(...)  \,
-#define Z_IS_2927U_EQ_2927U(...) \,
-#define Z_IS_2928_EQ_2928(...)   \,
-#define Z_IS_2928U_EQ_2928(...)  \,
-#define Z_IS_2928_EQ_2928U(...)  \,
-#define Z_IS_2928U_EQ_2928U(...) \,
-#define Z_IS_2929_EQ_2929(...)   \,
-#define Z_IS_2929U_EQ_2929(...)  \,
-#define Z_IS_2929_EQ_2929U(...)  \,
-#define Z_IS_2929U_EQ_2929U(...) \,
-#define Z_IS_2930_EQ_2930(...)   \,
-#define Z_IS_2930U_EQ_2930(...)  \,
-#define Z_IS_2930_EQ_2930U(...)  \,
-#define Z_IS_2930U_EQ_2930U(...) \,
-#define Z_IS_2931_EQ_2931(...)   \,
-#define Z_IS_2931U_EQ_2931(...)  \,
-#define Z_IS_2931_EQ_2931U(...)  \,
-#define Z_IS_2931U_EQ_2931U(...) \,
-#define Z_IS_2932_EQ_2932(...)   \,
-#define Z_IS_2932U_EQ_2932(...)  \,
-#define Z_IS_2932_EQ_2932U(...)  \,
-#define Z_IS_2932U_EQ_2932U(...) \,
-#define Z_IS_2933_EQ_2933(...)   \,
-#define Z_IS_2933U_EQ_2933(...)  \,
-#define Z_IS_2933_EQ_2933U(...)  \,
-#define Z_IS_2933U_EQ_2933U(...) \,
-#define Z_IS_2934_EQ_2934(...)   \,
-#define Z_IS_2934U_EQ_2934(...)  \,
-#define Z_IS_2934_EQ_2934U(...)  \,
-#define Z_IS_2934U_EQ_2934U(...) \,
-#define Z_IS_2935_EQ_2935(...)   \,
-#define Z_IS_2935U_EQ_2935(...)  \,
-#define Z_IS_2935_EQ_2935U(...)  \,
-#define Z_IS_2935U_EQ_2935U(...) \,
-#define Z_IS_2936_EQ_2936(...)   \,
-#define Z_IS_2936U_EQ_2936(...)  \,
-#define Z_IS_2936_EQ_2936U(...)  \,
-#define Z_IS_2936U_EQ_2936U(...) \,
-#define Z_IS_2937_EQ_2937(...)   \,
-#define Z_IS_2937U_EQ_2937(...)  \,
-#define Z_IS_2937_EQ_2937U(...)  \,
-#define Z_IS_2937U_EQ_2937U(...) \,
-#define Z_IS_2938_EQ_2938(...)   \,
-#define Z_IS_2938U_EQ_2938(...)  \,
-#define Z_IS_2938_EQ_2938U(...)  \,
-#define Z_IS_2938U_EQ_2938U(...) \,
-#define Z_IS_2939_EQ_2939(...)   \,
-#define Z_IS_2939U_EQ_2939(...)  \,
-#define Z_IS_2939_EQ_2939U(...)  \,
-#define Z_IS_2939U_EQ_2939U(...) \,
-#define Z_IS_2940_EQ_2940(...)   \,
-#define Z_IS_2940U_EQ_2940(...)  \,
-#define Z_IS_2940_EQ_2940U(...)  \,
-#define Z_IS_2940U_EQ_2940U(...) \,
-#define Z_IS_2941_EQ_2941(...)   \,
-#define Z_IS_2941U_EQ_2941(...)  \,
-#define Z_IS_2941_EQ_2941U(...)  \,
-#define Z_IS_2941U_EQ_2941U(...) \,
-#define Z_IS_2942_EQ_2942(...)   \,
-#define Z_IS_2942U_EQ_2942(...)  \,
-#define Z_IS_2942_EQ_2942U(...)  \,
-#define Z_IS_2942U_EQ_2942U(...) \,
-#define Z_IS_2943_EQ_2943(...)   \,
-#define Z_IS_2943U_EQ_2943(...)  \,
-#define Z_IS_2943_EQ_2943U(...)  \,
-#define Z_IS_2943U_EQ_2943U(...) \,
-#define Z_IS_2944_EQ_2944(...)   \,
-#define Z_IS_2944U_EQ_2944(...)  \,
-#define Z_IS_2944_EQ_2944U(...)  \,
-#define Z_IS_2944U_EQ_2944U(...) \,
-#define Z_IS_2945_EQ_2945(...)   \,
-#define Z_IS_2945U_EQ_2945(...)  \,
-#define Z_IS_2945_EQ_2945U(...)  \,
-#define Z_IS_2945U_EQ_2945U(...) \,
-#define Z_IS_2946_EQ_2946(...)   \,
-#define Z_IS_2946U_EQ_2946(...)  \,
-#define Z_IS_2946_EQ_2946U(...)  \,
-#define Z_IS_2946U_EQ_2946U(...) \,
-#define Z_IS_2947_EQ_2947(...)   \,
-#define Z_IS_2947U_EQ_2947(...)  \,
-#define Z_IS_2947_EQ_2947U(...)  \,
-#define Z_IS_2947U_EQ_2947U(...) \,
-#define Z_IS_2948_EQ_2948(...)   \,
-#define Z_IS_2948U_EQ_2948(...)  \,
-#define Z_IS_2948_EQ_2948U(...)  \,
-#define Z_IS_2948U_EQ_2948U(...) \,
-#define Z_IS_2949_EQ_2949(...)   \,
-#define Z_IS_2949U_EQ_2949(...)  \,
-#define Z_IS_2949_EQ_2949U(...)  \,
-#define Z_IS_2949U_EQ_2949U(...) \,
-#define Z_IS_2950_EQ_2950(...)   \,
-#define Z_IS_2950U_EQ_2950(...)  \,
-#define Z_IS_2950_EQ_2950U(...)  \,
-#define Z_IS_2950U_EQ_2950U(...) \,
-#define Z_IS_2951_EQ_2951(...)   \,
-#define Z_IS_2951U_EQ_2951(...)  \,
-#define Z_IS_2951_EQ_2951U(...)  \,
-#define Z_IS_2951U_EQ_2951U(...) \,
-#define Z_IS_2952_EQ_2952(...)   \,
-#define Z_IS_2952U_EQ_2952(...)  \,
-#define Z_IS_2952_EQ_2952U(...)  \,
-#define Z_IS_2952U_EQ_2952U(...) \,
-#define Z_IS_2953_EQ_2953(...)   \,
-#define Z_IS_2953U_EQ_2953(...)  \,
-#define Z_IS_2953_EQ_2953U(...)  \,
-#define Z_IS_2953U_EQ_2953U(...) \,
-#define Z_IS_2954_EQ_2954(...)   \,
-#define Z_IS_2954U_EQ_2954(...)  \,
-#define Z_IS_2954_EQ_2954U(...)  \,
-#define Z_IS_2954U_EQ_2954U(...) \,
-#define Z_IS_2955_EQ_2955(...)   \,
-#define Z_IS_2955U_EQ_2955(...)  \,
-#define Z_IS_2955_EQ_2955U(...)  \,
-#define Z_IS_2955U_EQ_2955U(...) \,
-#define Z_IS_2956_EQ_2956(...)   \,
-#define Z_IS_2956U_EQ_2956(...)  \,
-#define Z_IS_2956_EQ_2956U(...)  \,
-#define Z_IS_2956U_EQ_2956U(...) \,
-#define Z_IS_2957_EQ_2957(...)   \,
-#define Z_IS_2957U_EQ_2957(...)  \,
-#define Z_IS_2957_EQ_2957U(...)  \,
-#define Z_IS_2957U_EQ_2957U(...) \,
-#define Z_IS_2958_EQ_2958(...)   \,
-#define Z_IS_2958U_EQ_2958(...)  \,
-#define Z_IS_2958_EQ_2958U(...)  \,
-#define Z_IS_2958U_EQ_2958U(...) \,
-#define Z_IS_2959_EQ_2959(...)   \,
-#define Z_IS_2959U_EQ_2959(...)  \,
-#define Z_IS_2959_EQ_2959U(...)  \,
-#define Z_IS_2959U_EQ_2959U(...) \,
-#define Z_IS_2960_EQ_2960(...)   \,
-#define Z_IS_2960U_EQ_2960(...)  \,
-#define Z_IS_2960_EQ_2960U(...)  \,
-#define Z_IS_2960U_EQ_2960U(...) \,
-#define Z_IS_2961_EQ_2961(...)   \,
-#define Z_IS_2961U_EQ_2961(...)  \,
-#define Z_IS_2961_EQ_2961U(...)  \,
-#define Z_IS_2961U_EQ_2961U(...) \,
-#define Z_IS_2962_EQ_2962(...)   \,
-#define Z_IS_2962U_EQ_2962(...)  \,
-#define Z_IS_2962_EQ_2962U(...)  \,
-#define Z_IS_2962U_EQ_2962U(...) \,
-#define Z_IS_2963_EQ_2963(...)   \,
-#define Z_IS_2963U_EQ_2963(...)  \,
-#define Z_IS_2963_EQ_2963U(...)  \,
-#define Z_IS_2963U_EQ_2963U(...) \,
-#define Z_IS_2964_EQ_2964(...)   \,
-#define Z_IS_2964U_EQ_2964(...)  \,
-#define Z_IS_2964_EQ_2964U(...)  \,
-#define Z_IS_2964U_EQ_2964U(...) \,
-#define Z_IS_2965_EQ_2965(...)   \,
-#define Z_IS_2965U_EQ_2965(...)  \,
-#define Z_IS_2965_EQ_2965U(...)  \,
-#define Z_IS_2965U_EQ_2965U(...) \,
-#define Z_IS_2966_EQ_2966(...)   \,
-#define Z_IS_2966U_EQ_2966(...)  \,
-#define Z_IS_2966_EQ_2966U(...)  \,
-#define Z_IS_2966U_EQ_2966U(...) \,
-#define Z_IS_2967_EQ_2967(...)   \,
-#define Z_IS_2967U_EQ_2967(...)  \,
-#define Z_IS_2967_EQ_2967U(...)  \,
-#define Z_IS_2967U_EQ_2967U(...) \,
-#define Z_IS_2968_EQ_2968(...)   \,
-#define Z_IS_2968U_EQ_2968(...)  \,
-#define Z_IS_2968_EQ_2968U(...)  \,
-#define Z_IS_2968U_EQ_2968U(...) \,
-#define Z_IS_2969_EQ_2969(...)   \,
-#define Z_IS_2969U_EQ_2969(...)  \,
-#define Z_IS_2969_EQ_2969U(...)  \,
-#define Z_IS_2969U_EQ_2969U(...) \,
-#define Z_IS_2970_EQ_2970(...)   \,
-#define Z_IS_2970U_EQ_2970(...)  \,
-#define Z_IS_2970_EQ_2970U(...)  \,
-#define Z_IS_2970U_EQ_2970U(...) \,
-#define Z_IS_2971_EQ_2971(...)   \,
-#define Z_IS_2971U_EQ_2971(...)  \,
-#define Z_IS_2971_EQ_2971U(...)  \,
-#define Z_IS_2971U_EQ_2971U(...) \,
-#define Z_IS_2972_EQ_2972(...)   \,
-#define Z_IS_2972U_EQ_2972(...)  \,
-#define Z_IS_2972_EQ_2972U(...)  \,
-#define Z_IS_2972U_EQ_2972U(...) \,
-#define Z_IS_2973_EQ_2973(...)   \,
-#define Z_IS_2973U_EQ_2973(...)  \,
-#define Z_IS_2973_EQ_2973U(...)  \,
-#define Z_IS_2973U_EQ_2973U(...) \,
-#define Z_IS_2974_EQ_2974(...)   \,
-#define Z_IS_2974U_EQ_2974(...)  \,
-#define Z_IS_2974_EQ_2974U(...)  \,
-#define Z_IS_2974U_EQ_2974U(...) \,
-#define Z_IS_2975_EQ_2975(...)   \,
-#define Z_IS_2975U_EQ_2975(...)  \,
-#define Z_IS_2975_EQ_2975U(...)  \,
-#define Z_IS_2975U_EQ_2975U(...) \,
-#define Z_IS_2976_EQ_2976(...)   \,
-#define Z_IS_2976U_EQ_2976(...)  \,
-#define Z_IS_2976_EQ_2976U(...)  \,
-#define Z_IS_2976U_EQ_2976U(...) \,
-#define Z_IS_2977_EQ_2977(...)   \,
-#define Z_IS_2977U_EQ_2977(...)  \,
-#define Z_IS_2977_EQ_2977U(...)  \,
-#define Z_IS_2977U_EQ_2977U(...) \,
-#define Z_IS_2978_EQ_2978(...)   \,
-#define Z_IS_2978U_EQ_2978(...)  \,
-#define Z_IS_2978_EQ_2978U(...)  \,
-#define Z_IS_2978U_EQ_2978U(...) \,
-#define Z_IS_2979_EQ_2979(...)   \,
-#define Z_IS_2979U_EQ_2979(...)  \,
-#define Z_IS_2979_EQ_2979U(...)  \,
-#define Z_IS_2979U_EQ_2979U(...) \,
-#define Z_IS_2980_EQ_2980(...)   \,
-#define Z_IS_2980U_EQ_2980(...)  \,
-#define Z_IS_2980_EQ_2980U(...)  \,
-#define Z_IS_2980U_EQ_2980U(...) \,
-#define Z_IS_2981_EQ_2981(...)   \,
-#define Z_IS_2981U_EQ_2981(...)  \,
-#define Z_IS_2981_EQ_2981U(...)  \,
-#define Z_IS_2981U_EQ_2981U(...) \,
-#define Z_IS_2982_EQ_2982(...)   \,
-#define Z_IS_2982U_EQ_2982(...)  \,
-#define Z_IS_2982_EQ_2982U(...)  \,
-#define Z_IS_2982U_EQ_2982U(...) \,
-#define Z_IS_2983_EQ_2983(...)   \,
-#define Z_IS_2983U_EQ_2983(...)  \,
-#define Z_IS_2983_EQ_2983U(...)  \,
-#define Z_IS_2983U_EQ_2983U(...) \,
-#define Z_IS_2984_EQ_2984(...)   \,
-#define Z_IS_2984U_EQ_2984(...)  \,
-#define Z_IS_2984_EQ_2984U(...)  \,
-#define Z_IS_2984U_EQ_2984U(...) \,
-#define Z_IS_2985_EQ_2985(...)   \,
-#define Z_IS_2985U_EQ_2985(...)  \,
-#define Z_IS_2985_EQ_2985U(...)  \,
-#define Z_IS_2985U_EQ_2985U(...) \,
-#define Z_IS_2986_EQ_2986(...)   \,
-#define Z_IS_2986U_EQ_2986(...)  \,
-#define Z_IS_2986_EQ_2986U(...)  \,
-#define Z_IS_2986U_EQ_2986U(...) \,
-#define Z_IS_2987_EQ_2987(...)   \,
-#define Z_IS_2987U_EQ_2987(...)  \,
-#define Z_IS_2987_EQ_2987U(...)  \,
-#define Z_IS_2987U_EQ_2987U(...) \,
-#define Z_IS_2988_EQ_2988(...)   \,
-#define Z_IS_2988U_EQ_2988(...)  \,
-#define Z_IS_2988_EQ_2988U(...)  \,
-#define Z_IS_2988U_EQ_2988U(...) \,
-#define Z_IS_2989_EQ_2989(...)   \,
-#define Z_IS_2989U_EQ_2989(...)  \,
-#define Z_IS_2989_EQ_2989U(...)  \,
-#define Z_IS_2989U_EQ_2989U(...) \,
-#define Z_IS_2990_EQ_2990(...)   \,
-#define Z_IS_2990U_EQ_2990(...)  \,
-#define Z_IS_2990_EQ_2990U(...)  \,
-#define Z_IS_2990U_EQ_2990U(...) \,
-#define Z_IS_2991_EQ_2991(...)   \,
-#define Z_IS_2991U_EQ_2991(...)  \,
-#define Z_IS_2991_EQ_2991U(...)  \,
-#define Z_IS_2991U_EQ_2991U(...) \,
-#define Z_IS_2992_EQ_2992(...)   \,
-#define Z_IS_2992U_EQ_2992(...)  \,
-#define Z_IS_2992_EQ_2992U(...)  \,
-#define Z_IS_2992U_EQ_2992U(...) \,
-#define Z_IS_2993_EQ_2993(...)   \,
-#define Z_IS_2993U_EQ_2993(...)  \,
-#define Z_IS_2993_EQ_2993U(...)  \,
-#define Z_IS_2993U_EQ_2993U(...) \,
-#define Z_IS_2994_EQ_2994(...)   \,
-#define Z_IS_2994U_EQ_2994(...)  \,
-#define Z_IS_2994_EQ_2994U(...)  \,
-#define Z_IS_2994U_EQ_2994U(...) \,
-#define Z_IS_2995_EQ_2995(...)   \,
-#define Z_IS_2995U_EQ_2995(...)  \,
-#define Z_IS_2995_EQ_2995U(...)  \,
-#define Z_IS_2995U_EQ_2995U(...) \,
-#define Z_IS_2996_EQ_2996(...)   \,
-#define Z_IS_2996U_EQ_2996(...)  \,
-#define Z_IS_2996_EQ_2996U(...)  \,
-#define Z_IS_2996U_EQ_2996U(...) \,
-#define Z_IS_2997_EQ_2997(...)   \,
-#define Z_IS_2997U_EQ_2997(...)  \,
-#define Z_IS_2997_EQ_2997U(...)  \,
-#define Z_IS_2997U_EQ_2997U(...) \,
-#define Z_IS_2998_EQ_2998(...)   \,
-#define Z_IS_2998U_EQ_2998(...)  \,
-#define Z_IS_2998_EQ_2998U(...)  \,
-#define Z_IS_2998U_EQ_2998U(...) \,
-#define Z_IS_2999_EQ_2999(...)   \,
-#define Z_IS_2999U_EQ_2999(...)  \,
-#define Z_IS_2999_EQ_2999U(...)  \,
-#define Z_IS_2999U_EQ_2999U(...) \,
-#define Z_IS_3000_EQ_3000(...)   \,
-#define Z_IS_3000U_EQ_3000(...)  \,
-#define Z_IS_3000_EQ_3000U(...)  \,
-#define Z_IS_3000U_EQ_3000U(...) \,
-#define Z_IS_3001_EQ_3001(...)   \,
-#define Z_IS_3001U_EQ_3001(...)  \,
-#define Z_IS_3001_EQ_3001U(...)  \,
-#define Z_IS_3001U_EQ_3001U(...) \,
-#define Z_IS_3002_EQ_3002(...)   \,
-#define Z_IS_3002U_EQ_3002(...)  \,
-#define Z_IS_3002_EQ_3002U(...)  \,
-#define Z_IS_3002U_EQ_3002U(...) \,
-#define Z_IS_3003_EQ_3003(...)   \,
-#define Z_IS_3003U_EQ_3003(...)  \,
-#define Z_IS_3003_EQ_3003U(...)  \,
-#define Z_IS_3003U_EQ_3003U(...) \,
-#define Z_IS_3004_EQ_3004(...)   \,
-#define Z_IS_3004U_EQ_3004(...)  \,
-#define Z_IS_3004_EQ_3004U(...)  \,
-#define Z_IS_3004U_EQ_3004U(...) \,
-#define Z_IS_3005_EQ_3005(...)   \,
-#define Z_IS_3005U_EQ_3005(...)  \,
-#define Z_IS_3005_EQ_3005U(...)  \,
-#define Z_IS_3005U_EQ_3005U(...) \,
-#define Z_IS_3006_EQ_3006(...)   \,
-#define Z_IS_3006U_EQ_3006(...)  \,
-#define Z_IS_3006_EQ_3006U(...)  \,
-#define Z_IS_3006U_EQ_3006U(...) \,
-#define Z_IS_3007_EQ_3007(...)   \,
-#define Z_IS_3007U_EQ_3007(...)  \,
-#define Z_IS_3007_EQ_3007U(...)  \,
-#define Z_IS_3007U_EQ_3007U(...) \,
-#define Z_IS_3008_EQ_3008(...)   \,
-#define Z_IS_3008U_EQ_3008(...)  \,
-#define Z_IS_3008_EQ_3008U(...)  \,
-#define Z_IS_3008U_EQ_3008U(...) \,
-#define Z_IS_3009_EQ_3009(...)   \,
-#define Z_IS_3009U_EQ_3009(...)  \,
-#define Z_IS_3009_EQ_3009U(...)  \,
-#define Z_IS_3009U_EQ_3009U(...) \,
-#define Z_IS_3010_EQ_3010(...)   \,
-#define Z_IS_3010U_EQ_3010(...)  \,
-#define Z_IS_3010_EQ_3010U(...)  \,
-#define Z_IS_3010U_EQ_3010U(...) \,
-#define Z_IS_3011_EQ_3011(...)   \,
-#define Z_IS_3011U_EQ_3011(...)  \,
-#define Z_IS_3011_EQ_3011U(...)  \,
-#define Z_IS_3011U_EQ_3011U(...) \,
-#define Z_IS_3012_EQ_3012(...)   \,
-#define Z_IS_3012U_EQ_3012(...)  \,
-#define Z_IS_3012_EQ_3012U(...)  \,
-#define Z_IS_3012U_EQ_3012U(...) \,
-#define Z_IS_3013_EQ_3013(...)   \,
-#define Z_IS_3013U_EQ_3013(...)  \,
-#define Z_IS_3013_EQ_3013U(...)  \,
-#define Z_IS_3013U_EQ_3013U(...) \,
-#define Z_IS_3014_EQ_3014(...)   \,
-#define Z_IS_3014U_EQ_3014(...)  \,
-#define Z_IS_3014_EQ_3014U(...)  \,
-#define Z_IS_3014U_EQ_3014U(...) \,
-#define Z_IS_3015_EQ_3015(...)   \,
-#define Z_IS_3015U_EQ_3015(...)  \,
-#define Z_IS_3015_EQ_3015U(...)  \,
-#define Z_IS_3015U_EQ_3015U(...) \,
-#define Z_IS_3016_EQ_3016(...)   \,
-#define Z_IS_3016U_EQ_3016(...)  \,
-#define Z_IS_3016_EQ_3016U(...)  \,
-#define Z_IS_3016U_EQ_3016U(...) \,
-#define Z_IS_3017_EQ_3017(...)   \,
-#define Z_IS_3017U_EQ_3017(...)  \,
-#define Z_IS_3017_EQ_3017U(...)  \,
-#define Z_IS_3017U_EQ_3017U(...) \,
-#define Z_IS_3018_EQ_3018(...)   \,
-#define Z_IS_3018U_EQ_3018(...)  \,
-#define Z_IS_3018_EQ_3018U(...)  \,
-#define Z_IS_3018U_EQ_3018U(...) \,
-#define Z_IS_3019_EQ_3019(...)   \,
-#define Z_IS_3019U_EQ_3019(...)  \,
-#define Z_IS_3019_EQ_3019U(...)  \,
-#define Z_IS_3019U_EQ_3019U(...) \,
-#define Z_IS_3020_EQ_3020(...)   \,
-#define Z_IS_3020U_EQ_3020(...)  \,
-#define Z_IS_3020_EQ_3020U(...)  \,
-#define Z_IS_3020U_EQ_3020U(...) \,
-#define Z_IS_3021_EQ_3021(...)   \,
-#define Z_IS_3021U_EQ_3021(...)  \,
-#define Z_IS_3021_EQ_3021U(...)  \,
-#define Z_IS_3021U_EQ_3021U(...) \,
-#define Z_IS_3022_EQ_3022(...)   \,
-#define Z_IS_3022U_EQ_3022(...)  \,
-#define Z_IS_3022_EQ_3022U(...)  \,
-#define Z_IS_3022U_EQ_3022U(...) \,
-#define Z_IS_3023_EQ_3023(...)   \,
-#define Z_IS_3023U_EQ_3023(...)  \,
-#define Z_IS_3023_EQ_3023U(...)  \,
-#define Z_IS_3023U_EQ_3023U(...) \,
-#define Z_IS_3024_EQ_3024(...)   \,
-#define Z_IS_3024U_EQ_3024(...)  \,
-#define Z_IS_3024_EQ_3024U(...)  \,
-#define Z_IS_3024U_EQ_3024U(...) \,
-#define Z_IS_3025_EQ_3025(...)   \,
-#define Z_IS_3025U_EQ_3025(...)  \,
-#define Z_IS_3025_EQ_3025U(...)  \,
-#define Z_IS_3025U_EQ_3025U(...) \,
-#define Z_IS_3026_EQ_3026(...)   \,
-#define Z_IS_3026U_EQ_3026(...)  \,
-#define Z_IS_3026_EQ_3026U(...)  \,
-#define Z_IS_3026U_EQ_3026U(...) \,
-#define Z_IS_3027_EQ_3027(...)   \,
-#define Z_IS_3027U_EQ_3027(...)  \,
-#define Z_IS_3027_EQ_3027U(...)  \,
-#define Z_IS_3027U_EQ_3027U(...) \,
-#define Z_IS_3028_EQ_3028(...)   \,
-#define Z_IS_3028U_EQ_3028(...)  \,
-#define Z_IS_3028_EQ_3028U(...)  \,
-#define Z_IS_3028U_EQ_3028U(...) \,
-#define Z_IS_3029_EQ_3029(...)   \,
-#define Z_IS_3029U_EQ_3029(...)  \,
-#define Z_IS_3029_EQ_3029U(...)  \,
-#define Z_IS_3029U_EQ_3029U(...) \,
-#define Z_IS_3030_EQ_3030(...)   \,
-#define Z_IS_3030U_EQ_3030(...)  \,
-#define Z_IS_3030_EQ_3030U(...)  \,
-#define Z_IS_3030U_EQ_3030U(...) \,
-#define Z_IS_3031_EQ_3031(...)   \,
-#define Z_IS_3031U_EQ_3031(...)  \,
-#define Z_IS_3031_EQ_3031U(...)  \,
-#define Z_IS_3031U_EQ_3031U(...) \,
-#define Z_IS_3032_EQ_3032(...)   \,
-#define Z_IS_3032U_EQ_3032(...)  \,
-#define Z_IS_3032_EQ_3032U(...)  \,
-#define Z_IS_3032U_EQ_3032U(...) \,
-#define Z_IS_3033_EQ_3033(...)   \,
-#define Z_IS_3033U_EQ_3033(...)  \,
-#define Z_IS_3033_EQ_3033U(...)  \,
-#define Z_IS_3033U_EQ_3033U(...) \,
-#define Z_IS_3034_EQ_3034(...)   \,
-#define Z_IS_3034U_EQ_3034(...)  \,
-#define Z_IS_3034_EQ_3034U(...)  \,
-#define Z_IS_3034U_EQ_3034U(...) \,
-#define Z_IS_3035_EQ_3035(...)   \,
-#define Z_IS_3035U_EQ_3035(...)  \,
-#define Z_IS_3035_EQ_3035U(...)  \,
-#define Z_IS_3035U_EQ_3035U(...) \,
-#define Z_IS_3036_EQ_3036(...)   \,
-#define Z_IS_3036U_EQ_3036(...)  \,
-#define Z_IS_3036_EQ_3036U(...)  \,
-#define Z_IS_3036U_EQ_3036U(...) \,
-#define Z_IS_3037_EQ_3037(...)   \,
-#define Z_IS_3037U_EQ_3037(...)  \,
-#define Z_IS_3037_EQ_3037U(...)  \,
-#define Z_IS_3037U_EQ_3037U(...) \,
-#define Z_IS_3038_EQ_3038(...)   \,
-#define Z_IS_3038U_EQ_3038(...)  \,
-#define Z_IS_3038_EQ_3038U(...)  \,
-#define Z_IS_3038U_EQ_3038U(...) \,
-#define Z_IS_3039_EQ_3039(...)   \,
-#define Z_IS_3039U_EQ_3039(...)  \,
-#define Z_IS_3039_EQ_3039U(...)  \,
-#define Z_IS_3039U_EQ_3039U(...) \,
-#define Z_IS_3040_EQ_3040(...)   \,
-#define Z_IS_3040U_EQ_3040(...)  \,
-#define Z_IS_3040_EQ_3040U(...)  \,
-#define Z_IS_3040U_EQ_3040U(...) \,
-#define Z_IS_3041_EQ_3041(...)   \,
-#define Z_IS_3041U_EQ_3041(...)  \,
-#define Z_IS_3041_EQ_3041U(...)  \,
-#define Z_IS_3041U_EQ_3041U(...) \,
-#define Z_IS_3042_EQ_3042(...)   \,
-#define Z_IS_3042U_EQ_3042(...)  \,
-#define Z_IS_3042_EQ_3042U(...)  \,
-#define Z_IS_3042U_EQ_3042U(...) \,
-#define Z_IS_3043_EQ_3043(...)   \,
-#define Z_IS_3043U_EQ_3043(...)  \,
-#define Z_IS_3043_EQ_3043U(...)  \,
-#define Z_IS_3043U_EQ_3043U(...) \,
-#define Z_IS_3044_EQ_3044(...)   \,
-#define Z_IS_3044U_EQ_3044(...)  \,
-#define Z_IS_3044_EQ_3044U(...)  \,
-#define Z_IS_3044U_EQ_3044U(...) \,
-#define Z_IS_3045_EQ_3045(...)   \,
-#define Z_IS_3045U_EQ_3045(...)  \,
-#define Z_IS_3045_EQ_3045U(...)  \,
-#define Z_IS_3045U_EQ_3045U(...) \,
-#define Z_IS_3046_EQ_3046(...)   \,
-#define Z_IS_3046U_EQ_3046(...)  \,
-#define Z_IS_3046_EQ_3046U(...)  \,
-#define Z_IS_3046U_EQ_3046U(...) \,
-#define Z_IS_3047_EQ_3047(...)   \,
-#define Z_IS_3047U_EQ_3047(...)  \,
-#define Z_IS_3047_EQ_3047U(...)  \,
-#define Z_IS_3047U_EQ_3047U(...) \,
-#define Z_IS_3048_EQ_3048(...)   \,
-#define Z_IS_3048U_EQ_3048(...)  \,
-#define Z_IS_3048_EQ_3048U(...)  \,
-#define Z_IS_3048U_EQ_3048U(...) \,
-#define Z_IS_3049_EQ_3049(...)   \,
-#define Z_IS_3049U_EQ_3049(...)  \,
-#define Z_IS_3049_EQ_3049U(...)  \,
-#define Z_IS_3049U_EQ_3049U(...) \,
-#define Z_IS_3050_EQ_3050(...)   \,
-#define Z_IS_3050U_EQ_3050(...)  \,
-#define Z_IS_3050_EQ_3050U(...)  \,
-#define Z_IS_3050U_EQ_3050U(...) \,
-#define Z_IS_3051_EQ_3051(...)   \,
-#define Z_IS_3051U_EQ_3051(...)  \,
-#define Z_IS_3051_EQ_3051U(...)  \,
-#define Z_IS_3051U_EQ_3051U(...) \,
-#define Z_IS_3052_EQ_3052(...)   \,
-#define Z_IS_3052U_EQ_3052(...)  \,
-#define Z_IS_3052_EQ_3052U(...)  \,
-#define Z_IS_3052U_EQ_3052U(...) \,
-#define Z_IS_3053_EQ_3053(...)   \,
-#define Z_IS_3053U_EQ_3053(...)  \,
-#define Z_IS_3053_EQ_3053U(...)  \,
-#define Z_IS_3053U_EQ_3053U(...) \,
-#define Z_IS_3054_EQ_3054(...)   \,
-#define Z_IS_3054U_EQ_3054(...)  \,
-#define Z_IS_3054_EQ_3054U(...)  \,
-#define Z_IS_3054U_EQ_3054U(...) \,
-#define Z_IS_3055_EQ_3055(...)   \,
-#define Z_IS_3055U_EQ_3055(...)  \,
-#define Z_IS_3055_EQ_3055U(...)  \,
-#define Z_IS_3055U_EQ_3055U(...) \,
-#define Z_IS_3056_EQ_3056(...)   \,
-#define Z_IS_3056U_EQ_3056(...)  \,
-#define Z_IS_3056_EQ_3056U(...)  \,
-#define Z_IS_3056U_EQ_3056U(...) \,
-#define Z_IS_3057_EQ_3057(...)   \,
-#define Z_IS_3057U_EQ_3057(...)  \,
-#define Z_IS_3057_EQ_3057U(...)  \,
-#define Z_IS_3057U_EQ_3057U(...) \,
-#define Z_IS_3058_EQ_3058(...)   \,
-#define Z_IS_3058U_EQ_3058(...)  \,
-#define Z_IS_3058_EQ_3058U(...)  \,
-#define Z_IS_3058U_EQ_3058U(...) \,
-#define Z_IS_3059_EQ_3059(...)   \,
-#define Z_IS_3059U_EQ_3059(...)  \,
-#define Z_IS_3059_EQ_3059U(...)  \,
-#define Z_IS_3059U_EQ_3059U(...) \,
-#define Z_IS_3060_EQ_3060(...)   \,
-#define Z_IS_3060U_EQ_3060(...)  \,
-#define Z_IS_3060_EQ_3060U(...)  \,
-#define Z_IS_3060U_EQ_3060U(...) \,
-#define Z_IS_3061_EQ_3061(...)   \,
-#define Z_IS_3061U_EQ_3061(...)  \,
-#define Z_IS_3061_EQ_3061U(...)  \,
-#define Z_IS_3061U_EQ_3061U(...) \,
-#define Z_IS_3062_EQ_3062(...)   \,
-#define Z_IS_3062U_EQ_3062(...)  \,
-#define Z_IS_3062_EQ_3062U(...)  \,
-#define Z_IS_3062U_EQ_3062U(...) \,
-#define Z_IS_3063_EQ_3063(...)   \,
-#define Z_IS_3063U_EQ_3063(...)  \,
-#define Z_IS_3063_EQ_3063U(...)  \,
-#define Z_IS_3063U_EQ_3063U(...) \,
-#define Z_IS_3064_EQ_3064(...)   \,
-#define Z_IS_3064U_EQ_3064(...)  \,
-#define Z_IS_3064_EQ_3064U(...)  \,
-#define Z_IS_3064U_EQ_3064U(...) \,
-#define Z_IS_3065_EQ_3065(...)   \,
-#define Z_IS_3065U_EQ_3065(...)  \,
-#define Z_IS_3065_EQ_3065U(...)  \,
-#define Z_IS_3065U_EQ_3065U(...) \,
-#define Z_IS_3066_EQ_3066(...)   \,
-#define Z_IS_3066U_EQ_3066(...)  \,
-#define Z_IS_3066_EQ_3066U(...)  \,
-#define Z_IS_3066U_EQ_3066U(...) \,
-#define Z_IS_3067_EQ_3067(...)   \,
-#define Z_IS_3067U_EQ_3067(...)  \,
-#define Z_IS_3067_EQ_3067U(...)  \,
-#define Z_IS_3067U_EQ_3067U(...) \,
-#define Z_IS_3068_EQ_3068(...)   \,
-#define Z_IS_3068U_EQ_3068(...)  \,
-#define Z_IS_3068_EQ_3068U(...)  \,
-#define Z_IS_3068U_EQ_3068U(...) \,
-#define Z_IS_3069_EQ_3069(...)   \,
-#define Z_IS_3069U_EQ_3069(...)  \,
-#define Z_IS_3069_EQ_3069U(...)  \,
-#define Z_IS_3069U_EQ_3069U(...) \,
-#define Z_IS_3070_EQ_3070(...)   \,
-#define Z_IS_3070U_EQ_3070(...)  \,
-#define Z_IS_3070_EQ_3070U(...)  \,
-#define Z_IS_3070U_EQ_3070U(...) \,
-#define Z_IS_3071_EQ_3071(...)   \,
-#define Z_IS_3071U_EQ_3071(...)  \,
-#define Z_IS_3071_EQ_3071U(...)  \,
-#define Z_IS_3071U_EQ_3071U(...) \,
-#define Z_IS_3072_EQ_3072(...)   \,
-#define Z_IS_3072U_EQ_3072(...)  \,
-#define Z_IS_3072_EQ_3072U(...)  \,
-#define Z_IS_3072U_EQ_3072U(...) \,
-#define Z_IS_3073_EQ_3073(...)   \,
-#define Z_IS_3073U_EQ_3073(...)  \,
-#define Z_IS_3073_EQ_3073U(...)  \,
-#define Z_IS_3073U_EQ_3073U(...) \,
-#define Z_IS_3074_EQ_3074(...)   \,
-#define Z_IS_3074U_EQ_3074(...)  \,
-#define Z_IS_3074_EQ_3074U(...)  \,
-#define Z_IS_3074U_EQ_3074U(...) \,
-#define Z_IS_3075_EQ_3075(...)   \,
-#define Z_IS_3075U_EQ_3075(...)  \,
-#define Z_IS_3075_EQ_3075U(...)  \,
-#define Z_IS_3075U_EQ_3075U(...) \,
-#define Z_IS_3076_EQ_3076(...)   \,
-#define Z_IS_3076U_EQ_3076(...)  \,
-#define Z_IS_3076_EQ_3076U(...)  \,
-#define Z_IS_3076U_EQ_3076U(...) \,
-#define Z_IS_3077_EQ_3077(...)   \,
-#define Z_IS_3077U_EQ_3077(...)  \,
-#define Z_IS_3077_EQ_3077U(...)  \,
-#define Z_IS_3077U_EQ_3077U(...) \,
-#define Z_IS_3078_EQ_3078(...)   \,
-#define Z_IS_3078U_EQ_3078(...)  \,
-#define Z_IS_3078_EQ_3078U(...)  \,
-#define Z_IS_3078U_EQ_3078U(...) \,
-#define Z_IS_3079_EQ_3079(...)   \,
-#define Z_IS_3079U_EQ_3079(...)  \,
-#define Z_IS_3079_EQ_3079U(...)  \,
-#define Z_IS_3079U_EQ_3079U(...) \,
-#define Z_IS_3080_EQ_3080(...)   \,
-#define Z_IS_3080U_EQ_3080(...)  \,
-#define Z_IS_3080_EQ_3080U(...)  \,
-#define Z_IS_3080U_EQ_3080U(...) \,
-#define Z_IS_3081_EQ_3081(...)   \,
-#define Z_IS_3081U_EQ_3081(...)  \,
-#define Z_IS_3081_EQ_3081U(...)  \,
-#define Z_IS_3081U_EQ_3081U(...) \,
-#define Z_IS_3082_EQ_3082(...)   \,
-#define Z_IS_3082U_EQ_3082(...)  \,
-#define Z_IS_3082_EQ_3082U(...)  \,
-#define Z_IS_3082U_EQ_3082U(...) \,
-#define Z_IS_3083_EQ_3083(...)   \,
-#define Z_IS_3083U_EQ_3083(...)  \,
-#define Z_IS_3083_EQ_3083U(...)  \,
-#define Z_IS_3083U_EQ_3083U(...) \,
-#define Z_IS_3084_EQ_3084(...)   \,
-#define Z_IS_3084U_EQ_3084(...)  \,
-#define Z_IS_3084_EQ_3084U(...)  \,
-#define Z_IS_3084U_EQ_3084U(...) \,
-#define Z_IS_3085_EQ_3085(...)   \,
-#define Z_IS_3085U_EQ_3085(...)  \,
-#define Z_IS_3085_EQ_3085U(...)  \,
-#define Z_IS_3085U_EQ_3085U(...) \,
-#define Z_IS_3086_EQ_3086(...)   \,
-#define Z_IS_3086U_EQ_3086(...)  \,
-#define Z_IS_3086_EQ_3086U(...)  \,
-#define Z_IS_3086U_EQ_3086U(...) \,
-#define Z_IS_3087_EQ_3087(...)   \,
-#define Z_IS_3087U_EQ_3087(...)  \,
-#define Z_IS_3087_EQ_3087U(...)  \,
-#define Z_IS_3087U_EQ_3087U(...) \,
-#define Z_IS_3088_EQ_3088(...)   \,
-#define Z_IS_3088U_EQ_3088(...)  \,
-#define Z_IS_3088_EQ_3088U(...)  \,
-#define Z_IS_3088U_EQ_3088U(...) \,
-#define Z_IS_3089_EQ_3089(...)   \,
-#define Z_IS_3089U_EQ_3089(...)  \,
-#define Z_IS_3089_EQ_3089U(...)  \,
-#define Z_IS_3089U_EQ_3089U(...) \,
-#define Z_IS_3090_EQ_3090(...)   \,
-#define Z_IS_3090U_EQ_3090(...)  \,
-#define Z_IS_3090_EQ_3090U(...)  \,
-#define Z_IS_3090U_EQ_3090U(...) \,
-#define Z_IS_3091_EQ_3091(...)   \,
-#define Z_IS_3091U_EQ_3091(...)  \,
-#define Z_IS_3091_EQ_3091U(...)  \,
-#define Z_IS_3091U_EQ_3091U(...) \,
-#define Z_IS_3092_EQ_3092(...)   \,
-#define Z_IS_3092U_EQ_3092(...)  \,
-#define Z_IS_3092_EQ_3092U(...)  \,
-#define Z_IS_3092U_EQ_3092U(...) \,
-#define Z_IS_3093_EQ_3093(...)   \,
-#define Z_IS_3093U_EQ_3093(...)  \,
-#define Z_IS_3093_EQ_3093U(...)  \,
-#define Z_IS_3093U_EQ_3093U(...) \,
-#define Z_IS_3094_EQ_3094(...)   \,
-#define Z_IS_3094U_EQ_3094(...)  \,
-#define Z_IS_3094_EQ_3094U(...)  \,
-#define Z_IS_3094U_EQ_3094U(...) \,
-#define Z_IS_3095_EQ_3095(...)   \,
-#define Z_IS_3095U_EQ_3095(...)  \,
-#define Z_IS_3095_EQ_3095U(...)  \,
-#define Z_IS_3095U_EQ_3095U(...) \,
-#define Z_IS_3096_EQ_3096(...)   \,
-#define Z_IS_3096U_EQ_3096(...)  \,
-#define Z_IS_3096_EQ_3096U(...)  \,
-#define Z_IS_3096U_EQ_3096U(...) \,
-#define Z_IS_3097_EQ_3097(...)   \,
-#define Z_IS_3097U_EQ_3097(...)  \,
-#define Z_IS_3097_EQ_3097U(...)  \,
-#define Z_IS_3097U_EQ_3097U(...) \,
-#define Z_IS_3098_EQ_3098(...)   \,
-#define Z_IS_3098U_EQ_3098(...)  \,
-#define Z_IS_3098_EQ_3098U(...)  \,
-#define Z_IS_3098U_EQ_3098U(...) \,
-#define Z_IS_3099_EQ_3099(...)   \,
-#define Z_IS_3099U_EQ_3099(...)  \,
-#define Z_IS_3099_EQ_3099U(...)  \,
-#define Z_IS_3099U_EQ_3099U(...) \,
-#define Z_IS_3100_EQ_3100(...)   \,
-#define Z_IS_3100U_EQ_3100(...)  \,
-#define Z_IS_3100_EQ_3100U(...)  \,
-#define Z_IS_3100U_EQ_3100U(...) \,
-#define Z_IS_3101_EQ_3101(...)   \,
-#define Z_IS_3101U_EQ_3101(...)  \,
-#define Z_IS_3101_EQ_3101U(...)  \,
-#define Z_IS_3101U_EQ_3101U(...) \,
-#define Z_IS_3102_EQ_3102(...)   \,
-#define Z_IS_3102U_EQ_3102(...)  \,
-#define Z_IS_3102_EQ_3102U(...)  \,
-#define Z_IS_3102U_EQ_3102U(...) \,
-#define Z_IS_3103_EQ_3103(...)   \,
-#define Z_IS_3103U_EQ_3103(...)  \,
-#define Z_IS_3103_EQ_3103U(...)  \,
-#define Z_IS_3103U_EQ_3103U(...) \,
-#define Z_IS_3104_EQ_3104(...)   \,
-#define Z_IS_3104U_EQ_3104(...)  \,
-#define Z_IS_3104_EQ_3104U(...)  \,
-#define Z_IS_3104U_EQ_3104U(...) \,
-#define Z_IS_3105_EQ_3105(...)   \,
-#define Z_IS_3105U_EQ_3105(...)  \,
-#define Z_IS_3105_EQ_3105U(...)  \,
-#define Z_IS_3105U_EQ_3105U(...) \,
-#define Z_IS_3106_EQ_3106(...)   \,
-#define Z_IS_3106U_EQ_3106(...)  \,
-#define Z_IS_3106_EQ_3106U(...)  \,
-#define Z_IS_3106U_EQ_3106U(...) \,
-#define Z_IS_3107_EQ_3107(...)   \,
-#define Z_IS_3107U_EQ_3107(...)  \,
-#define Z_IS_3107_EQ_3107U(...)  \,
-#define Z_IS_3107U_EQ_3107U(...) \,
-#define Z_IS_3108_EQ_3108(...)   \,
-#define Z_IS_3108U_EQ_3108(...)  \,
-#define Z_IS_3108_EQ_3108U(...)  \,
-#define Z_IS_3108U_EQ_3108U(...) \,
-#define Z_IS_3109_EQ_3109(...)   \,
-#define Z_IS_3109U_EQ_3109(...)  \,
-#define Z_IS_3109_EQ_3109U(...)  \,
-#define Z_IS_3109U_EQ_3109U(...) \,
-#define Z_IS_3110_EQ_3110(...)   \,
-#define Z_IS_3110U_EQ_3110(...)  \,
-#define Z_IS_3110_EQ_3110U(...)  \,
-#define Z_IS_3110U_EQ_3110U(...) \,
-#define Z_IS_3111_EQ_3111(...)   \,
-#define Z_IS_3111U_EQ_3111(...)  \,
-#define Z_IS_3111_EQ_3111U(...)  \,
-#define Z_IS_3111U_EQ_3111U(...) \,
-#define Z_IS_3112_EQ_3112(...)   \,
-#define Z_IS_3112U_EQ_3112(...)  \,
-#define Z_IS_3112_EQ_3112U(...)  \,
-#define Z_IS_3112U_EQ_3112U(...) \,
-#define Z_IS_3113_EQ_3113(...)   \,
-#define Z_IS_3113U_EQ_3113(...)  \,
-#define Z_IS_3113_EQ_3113U(...)  \,
-#define Z_IS_3113U_EQ_3113U(...) \,
-#define Z_IS_3114_EQ_3114(...)   \,
-#define Z_IS_3114U_EQ_3114(...)  \,
-#define Z_IS_3114_EQ_3114U(...)  \,
-#define Z_IS_3114U_EQ_3114U(...) \,
-#define Z_IS_3115_EQ_3115(...)   \,
-#define Z_IS_3115U_EQ_3115(...)  \,
-#define Z_IS_3115_EQ_3115U(...)  \,
-#define Z_IS_3115U_EQ_3115U(...) \,
-#define Z_IS_3116_EQ_3116(...)   \,
-#define Z_IS_3116U_EQ_3116(...)  \,
-#define Z_IS_3116_EQ_3116U(...)  \,
-#define Z_IS_3116U_EQ_3116U(...) \,
-#define Z_IS_3117_EQ_3117(...)   \,
-#define Z_IS_3117U_EQ_3117(...)  \,
-#define Z_IS_3117_EQ_3117U(...)  \,
-#define Z_IS_3117U_EQ_3117U(...) \,
-#define Z_IS_3118_EQ_3118(...)   \,
-#define Z_IS_3118U_EQ_3118(...)  \,
-#define Z_IS_3118_EQ_3118U(...)  \,
-#define Z_IS_3118U_EQ_3118U(...) \,
-#define Z_IS_3119_EQ_3119(...)   \,
-#define Z_IS_3119U_EQ_3119(...)  \,
-#define Z_IS_3119_EQ_3119U(...)  \,
-#define Z_IS_3119U_EQ_3119U(...) \,
-#define Z_IS_3120_EQ_3120(...)   \,
-#define Z_IS_3120U_EQ_3120(...)  \,
-#define Z_IS_3120_EQ_3120U(...)  \,
-#define Z_IS_3120U_EQ_3120U(...) \,
-#define Z_IS_3121_EQ_3121(...)   \,
-#define Z_IS_3121U_EQ_3121(...)  \,
-#define Z_IS_3121_EQ_3121U(...)  \,
-#define Z_IS_3121U_EQ_3121U(...) \,
-#define Z_IS_3122_EQ_3122(...)   \,
-#define Z_IS_3122U_EQ_3122(...)  \,
-#define Z_IS_3122_EQ_3122U(...)  \,
-#define Z_IS_3122U_EQ_3122U(...) \,
-#define Z_IS_3123_EQ_3123(...)   \,
-#define Z_IS_3123U_EQ_3123(...)  \,
-#define Z_IS_3123_EQ_3123U(...)  \,
-#define Z_IS_3123U_EQ_3123U(...) \,
-#define Z_IS_3124_EQ_3124(...)   \,
-#define Z_IS_3124U_EQ_3124(...)  \,
-#define Z_IS_3124_EQ_3124U(...)  \,
-#define Z_IS_3124U_EQ_3124U(...) \,
-#define Z_IS_3125_EQ_3125(...)   \,
-#define Z_IS_3125U_EQ_3125(...)  \,
-#define Z_IS_3125_EQ_3125U(...)  \,
-#define Z_IS_3125U_EQ_3125U(...) \,
-#define Z_IS_3126_EQ_3126(...)   \,
-#define Z_IS_3126U_EQ_3126(...)  \,
-#define Z_IS_3126_EQ_3126U(...)  \,
-#define Z_IS_3126U_EQ_3126U(...) \,
-#define Z_IS_3127_EQ_3127(...)   \,
-#define Z_IS_3127U_EQ_3127(...)  \,
-#define Z_IS_3127_EQ_3127U(...)  \,
-#define Z_IS_3127U_EQ_3127U(...) \,
-#define Z_IS_3128_EQ_3128(...)   \,
-#define Z_IS_3128U_EQ_3128(...)  \,
-#define Z_IS_3128_EQ_3128U(...)  \,
-#define Z_IS_3128U_EQ_3128U(...) \,
-#define Z_IS_3129_EQ_3129(...)   \,
-#define Z_IS_3129U_EQ_3129(...)  \,
-#define Z_IS_3129_EQ_3129U(...)  \,
-#define Z_IS_3129U_EQ_3129U(...) \,
-#define Z_IS_3130_EQ_3130(...)   \,
-#define Z_IS_3130U_EQ_3130(...)  \,
-#define Z_IS_3130_EQ_3130U(...)  \,
-#define Z_IS_3130U_EQ_3130U(...) \,
-#define Z_IS_3131_EQ_3131(...)   \,
-#define Z_IS_3131U_EQ_3131(...)  \,
-#define Z_IS_3131_EQ_3131U(...)  \,
-#define Z_IS_3131U_EQ_3131U(...) \,
-#define Z_IS_3132_EQ_3132(...)   \,
-#define Z_IS_3132U_EQ_3132(...)  \,
-#define Z_IS_3132_EQ_3132U(...)  \,
-#define Z_IS_3132U_EQ_3132U(...) \,
-#define Z_IS_3133_EQ_3133(...)   \,
-#define Z_IS_3133U_EQ_3133(...)  \,
-#define Z_IS_3133_EQ_3133U(...)  \,
-#define Z_IS_3133U_EQ_3133U(...) \,
-#define Z_IS_3134_EQ_3134(...)   \,
-#define Z_IS_3134U_EQ_3134(...)  \,
-#define Z_IS_3134_EQ_3134U(...)  \,
-#define Z_IS_3134U_EQ_3134U(...) \,
-#define Z_IS_3135_EQ_3135(...)   \,
-#define Z_IS_3135U_EQ_3135(...)  \,
-#define Z_IS_3135_EQ_3135U(...)  \,
-#define Z_IS_3135U_EQ_3135U(...) \,
-#define Z_IS_3136_EQ_3136(...)   \,
-#define Z_IS_3136U_EQ_3136(...)  \,
-#define Z_IS_3136_EQ_3136U(...)  \,
-#define Z_IS_3136U_EQ_3136U(...) \,
-#define Z_IS_3137_EQ_3137(...)   \,
-#define Z_IS_3137U_EQ_3137(...)  \,
-#define Z_IS_3137_EQ_3137U(...)  \,
-#define Z_IS_3137U_EQ_3137U(...) \,
-#define Z_IS_3138_EQ_3138(...)   \,
-#define Z_IS_3138U_EQ_3138(...)  \,
-#define Z_IS_3138_EQ_3138U(...)  \,
-#define Z_IS_3138U_EQ_3138U(...) \,
-#define Z_IS_3139_EQ_3139(...)   \,
-#define Z_IS_3139U_EQ_3139(...)  \,
-#define Z_IS_3139_EQ_3139U(...)  \,
-#define Z_IS_3139U_EQ_3139U(...) \,
-#define Z_IS_3140_EQ_3140(...)   \,
-#define Z_IS_3140U_EQ_3140(...)  \,
-#define Z_IS_3140_EQ_3140U(...)  \,
-#define Z_IS_3140U_EQ_3140U(...) \,
-#define Z_IS_3141_EQ_3141(...)   \,
-#define Z_IS_3141U_EQ_3141(...)  \,
-#define Z_IS_3141_EQ_3141U(...)  \,
-#define Z_IS_3141U_EQ_3141U(...) \,
-#define Z_IS_3142_EQ_3142(...)   \,
-#define Z_IS_3142U_EQ_3142(...)  \,
-#define Z_IS_3142_EQ_3142U(...)  \,
-#define Z_IS_3142U_EQ_3142U(...) \,
-#define Z_IS_3143_EQ_3143(...)   \,
-#define Z_IS_3143U_EQ_3143(...)  \,
-#define Z_IS_3143_EQ_3143U(...)  \,
-#define Z_IS_3143U_EQ_3143U(...) \,
-#define Z_IS_3144_EQ_3144(...)   \,
-#define Z_IS_3144U_EQ_3144(...)  \,
-#define Z_IS_3144_EQ_3144U(...)  \,
-#define Z_IS_3144U_EQ_3144U(...) \,
-#define Z_IS_3145_EQ_3145(...)   \,
-#define Z_IS_3145U_EQ_3145(...)  \,
-#define Z_IS_3145_EQ_3145U(...)  \,
-#define Z_IS_3145U_EQ_3145U(...) \,
-#define Z_IS_3146_EQ_3146(...)   \,
-#define Z_IS_3146U_EQ_3146(...)  \,
-#define Z_IS_3146_EQ_3146U(...)  \,
-#define Z_IS_3146U_EQ_3146U(...) \,
-#define Z_IS_3147_EQ_3147(...)   \,
-#define Z_IS_3147U_EQ_3147(...)  \,
-#define Z_IS_3147_EQ_3147U(...)  \,
-#define Z_IS_3147U_EQ_3147U(...) \,
-#define Z_IS_3148_EQ_3148(...)   \,
-#define Z_IS_3148U_EQ_3148(...)  \,
-#define Z_IS_3148_EQ_3148U(...)  \,
-#define Z_IS_3148U_EQ_3148U(...) \,
-#define Z_IS_3149_EQ_3149(...)   \,
-#define Z_IS_3149U_EQ_3149(...)  \,
-#define Z_IS_3149_EQ_3149U(...)  \,
-#define Z_IS_3149U_EQ_3149U(...) \,
-#define Z_IS_3150_EQ_3150(...)   \,
-#define Z_IS_3150U_EQ_3150(...)  \,
-#define Z_IS_3150_EQ_3150U(...)  \,
-#define Z_IS_3150U_EQ_3150U(...) \,
-#define Z_IS_3151_EQ_3151(...)   \,
-#define Z_IS_3151U_EQ_3151(...)  \,
-#define Z_IS_3151_EQ_3151U(...)  \,
-#define Z_IS_3151U_EQ_3151U(...) \,
-#define Z_IS_3152_EQ_3152(...)   \,
-#define Z_IS_3152U_EQ_3152(...)  \,
-#define Z_IS_3152_EQ_3152U(...)  \,
-#define Z_IS_3152U_EQ_3152U(...) \,
-#define Z_IS_3153_EQ_3153(...)   \,
-#define Z_IS_3153U_EQ_3153(...)  \,
-#define Z_IS_3153_EQ_3153U(...)  \,
-#define Z_IS_3153U_EQ_3153U(...) \,
-#define Z_IS_3154_EQ_3154(...)   \,
-#define Z_IS_3154U_EQ_3154(...)  \,
-#define Z_IS_3154_EQ_3154U(...)  \,
-#define Z_IS_3154U_EQ_3154U(...) \,
-#define Z_IS_3155_EQ_3155(...)   \,
-#define Z_IS_3155U_EQ_3155(...)  \,
-#define Z_IS_3155_EQ_3155U(...)  \,
-#define Z_IS_3155U_EQ_3155U(...) \,
-#define Z_IS_3156_EQ_3156(...)   \,
-#define Z_IS_3156U_EQ_3156(...)  \,
-#define Z_IS_3156_EQ_3156U(...)  \,
-#define Z_IS_3156U_EQ_3156U(...) \,
-#define Z_IS_3157_EQ_3157(...)   \,
-#define Z_IS_3157U_EQ_3157(...)  \,
-#define Z_IS_3157_EQ_3157U(...)  \,
-#define Z_IS_3157U_EQ_3157U(...) \,
-#define Z_IS_3158_EQ_3158(...)   \,
-#define Z_IS_3158U_EQ_3158(...)  \,
-#define Z_IS_3158_EQ_3158U(...)  \,
-#define Z_IS_3158U_EQ_3158U(...) \,
-#define Z_IS_3159_EQ_3159(...)   \,
-#define Z_IS_3159U_EQ_3159(...)  \,
-#define Z_IS_3159_EQ_3159U(...)  \,
-#define Z_IS_3159U_EQ_3159U(...) \,
-#define Z_IS_3160_EQ_3160(...)   \,
-#define Z_IS_3160U_EQ_3160(...)  \,
-#define Z_IS_3160_EQ_3160U(...)  \,
-#define Z_IS_3160U_EQ_3160U(...) \,
-#define Z_IS_3161_EQ_3161(...)   \,
-#define Z_IS_3161U_EQ_3161(...)  \,
-#define Z_IS_3161_EQ_3161U(...)  \,
-#define Z_IS_3161U_EQ_3161U(...) \,
-#define Z_IS_3162_EQ_3162(...)   \,
-#define Z_IS_3162U_EQ_3162(...)  \,
-#define Z_IS_3162_EQ_3162U(...)  \,
-#define Z_IS_3162U_EQ_3162U(...) \,
-#define Z_IS_3163_EQ_3163(...)   \,
-#define Z_IS_3163U_EQ_3163(...)  \,
-#define Z_IS_3163_EQ_3163U(...)  \,
-#define Z_IS_3163U_EQ_3163U(...) \,
-#define Z_IS_3164_EQ_3164(...)   \,
-#define Z_IS_3164U_EQ_3164(...)  \,
-#define Z_IS_3164_EQ_3164U(...)  \,
-#define Z_IS_3164U_EQ_3164U(...) \,
-#define Z_IS_3165_EQ_3165(...)   \,
-#define Z_IS_3165U_EQ_3165(...)  \,
-#define Z_IS_3165_EQ_3165U(...)  \,
-#define Z_IS_3165U_EQ_3165U(...) \,
-#define Z_IS_3166_EQ_3166(...)   \,
-#define Z_IS_3166U_EQ_3166(...)  \,
-#define Z_IS_3166_EQ_3166U(...)  \,
-#define Z_IS_3166U_EQ_3166U(...) \,
-#define Z_IS_3167_EQ_3167(...)   \,
-#define Z_IS_3167U_EQ_3167(...)  \,
-#define Z_IS_3167_EQ_3167U(...)  \,
-#define Z_IS_3167U_EQ_3167U(...) \,
-#define Z_IS_3168_EQ_3168(...)   \,
-#define Z_IS_3168U_EQ_3168(...)  \,
-#define Z_IS_3168_EQ_3168U(...)  \,
-#define Z_IS_3168U_EQ_3168U(...) \,
-#define Z_IS_3169_EQ_3169(...)   \,
-#define Z_IS_3169U_EQ_3169(...)  \,
-#define Z_IS_3169_EQ_3169U(...)  \,
-#define Z_IS_3169U_EQ_3169U(...) \,
-#define Z_IS_3170_EQ_3170(...)   \,
-#define Z_IS_3170U_EQ_3170(...)  \,
-#define Z_IS_3170_EQ_3170U(...)  \,
-#define Z_IS_3170U_EQ_3170U(...) \,
-#define Z_IS_3171_EQ_3171(...)   \,
-#define Z_IS_3171U_EQ_3171(...)  \,
-#define Z_IS_3171_EQ_3171U(...)  \,
-#define Z_IS_3171U_EQ_3171U(...) \,
-#define Z_IS_3172_EQ_3172(...)   \,
-#define Z_IS_3172U_EQ_3172(...)  \,
-#define Z_IS_3172_EQ_3172U(...)  \,
-#define Z_IS_3172U_EQ_3172U(...) \,
-#define Z_IS_3173_EQ_3173(...)   \,
-#define Z_IS_3173U_EQ_3173(...)  \,
-#define Z_IS_3173_EQ_3173U(...)  \,
-#define Z_IS_3173U_EQ_3173U(...) \,
-#define Z_IS_3174_EQ_3174(...)   \,
-#define Z_IS_3174U_EQ_3174(...)  \,
-#define Z_IS_3174_EQ_3174U(...)  \,
-#define Z_IS_3174U_EQ_3174U(...) \,
-#define Z_IS_3175_EQ_3175(...)   \,
-#define Z_IS_3175U_EQ_3175(...)  \,
-#define Z_IS_3175_EQ_3175U(...)  \,
-#define Z_IS_3175U_EQ_3175U(...) \,
-#define Z_IS_3176_EQ_3176(...)   \,
-#define Z_IS_3176U_EQ_3176(...)  \,
-#define Z_IS_3176_EQ_3176U(...)  \,
-#define Z_IS_3176U_EQ_3176U(...) \,
-#define Z_IS_3177_EQ_3177(...)   \,
-#define Z_IS_3177U_EQ_3177(...)  \,
-#define Z_IS_3177_EQ_3177U(...)  \,
-#define Z_IS_3177U_EQ_3177U(...) \,
-#define Z_IS_3178_EQ_3178(...)   \,
-#define Z_IS_3178U_EQ_3178(...)  \,
-#define Z_IS_3178_EQ_3178U(...)  \,
-#define Z_IS_3178U_EQ_3178U(...) \,
-#define Z_IS_3179_EQ_3179(...)   \,
-#define Z_IS_3179U_EQ_3179(...)  \,
-#define Z_IS_3179_EQ_3179U(...)  \,
-#define Z_IS_3179U_EQ_3179U(...) \,
-#define Z_IS_3180_EQ_3180(...)   \,
-#define Z_IS_3180U_EQ_3180(...)  \,
-#define Z_IS_3180_EQ_3180U(...)  \,
-#define Z_IS_3180U_EQ_3180U(...) \,
-#define Z_IS_3181_EQ_3181(...)   \,
-#define Z_IS_3181U_EQ_3181(...)  \,
-#define Z_IS_3181_EQ_3181U(...)  \,
-#define Z_IS_3181U_EQ_3181U(...) \,
-#define Z_IS_3182_EQ_3182(...)   \,
-#define Z_IS_3182U_EQ_3182(...)  \,
-#define Z_IS_3182_EQ_3182U(...)  \,
-#define Z_IS_3182U_EQ_3182U(...) \,
-#define Z_IS_3183_EQ_3183(...)   \,
-#define Z_IS_3183U_EQ_3183(...)  \,
-#define Z_IS_3183_EQ_3183U(...)  \,
-#define Z_IS_3183U_EQ_3183U(...) \,
-#define Z_IS_3184_EQ_3184(...)   \,
-#define Z_IS_3184U_EQ_3184(...)  \,
-#define Z_IS_3184_EQ_3184U(...)  \,
-#define Z_IS_3184U_EQ_3184U(...) \,
-#define Z_IS_3185_EQ_3185(...)   \,
-#define Z_IS_3185U_EQ_3185(...)  \,
-#define Z_IS_3185_EQ_3185U(...)  \,
-#define Z_IS_3185U_EQ_3185U(...) \,
-#define Z_IS_3186_EQ_3186(...)   \,
-#define Z_IS_3186U_EQ_3186(...)  \,
-#define Z_IS_3186_EQ_3186U(...)  \,
-#define Z_IS_3186U_EQ_3186U(...) \,
-#define Z_IS_3187_EQ_3187(...)   \,
-#define Z_IS_3187U_EQ_3187(...)  \,
-#define Z_IS_3187_EQ_3187U(...)  \,
-#define Z_IS_3187U_EQ_3187U(...) \,
-#define Z_IS_3188_EQ_3188(...)   \,
-#define Z_IS_3188U_EQ_3188(...)  \,
-#define Z_IS_3188_EQ_3188U(...)  \,
-#define Z_IS_3188U_EQ_3188U(...) \,
-#define Z_IS_3189_EQ_3189(...)   \,
-#define Z_IS_3189U_EQ_3189(...)  \,
-#define Z_IS_3189_EQ_3189U(...)  \,
-#define Z_IS_3189U_EQ_3189U(...) \,
-#define Z_IS_3190_EQ_3190(...)   \,
-#define Z_IS_3190U_EQ_3190(...)  \,
-#define Z_IS_3190_EQ_3190U(...)  \,
-#define Z_IS_3190U_EQ_3190U(...) \,
-#define Z_IS_3191_EQ_3191(...)   \,
-#define Z_IS_3191U_EQ_3191(...)  \,
-#define Z_IS_3191_EQ_3191U(...)  \,
-#define Z_IS_3191U_EQ_3191U(...) \,
-#define Z_IS_3192_EQ_3192(...)   \,
-#define Z_IS_3192U_EQ_3192(...)  \,
-#define Z_IS_3192_EQ_3192U(...)  \,
-#define Z_IS_3192U_EQ_3192U(...) \,
-#define Z_IS_3193_EQ_3193(...)   \,
-#define Z_IS_3193U_EQ_3193(...)  \,
-#define Z_IS_3193_EQ_3193U(...)  \,
-#define Z_IS_3193U_EQ_3193U(...) \,
-#define Z_IS_3194_EQ_3194(...)   \,
-#define Z_IS_3194U_EQ_3194(...)  \,
-#define Z_IS_3194_EQ_3194U(...)  \,
-#define Z_IS_3194U_EQ_3194U(...) \,
-#define Z_IS_3195_EQ_3195(...)   \,
-#define Z_IS_3195U_EQ_3195(...)  \,
-#define Z_IS_3195_EQ_3195U(...)  \,
-#define Z_IS_3195U_EQ_3195U(...) \,
-#define Z_IS_3196_EQ_3196(...)   \,
-#define Z_IS_3196U_EQ_3196(...)  \,
-#define Z_IS_3196_EQ_3196U(...)  \,
-#define Z_IS_3196U_EQ_3196U(...) \,
-#define Z_IS_3197_EQ_3197(...)   \,
-#define Z_IS_3197U_EQ_3197(...)  \,
-#define Z_IS_3197_EQ_3197U(...)  \,
-#define Z_IS_3197U_EQ_3197U(...) \,
-#define Z_IS_3198_EQ_3198(...)   \,
-#define Z_IS_3198U_EQ_3198(...)  \,
-#define Z_IS_3198_EQ_3198U(...)  \,
-#define Z_IS_3198U_EQ_3198U(...) \,
-#define Z_IS_3199_EQ_3199(...)   \,
-#define Z_IS_3199U_EQ_3199(...)  \,
-#define Z_IS_3199_EQ_3199U(...)  \,
-#define Z_IS_3199U_EQ_3199U(...) \,
-#define Z_IS_3200_EQ_3200(...)   \,
-#define Z_IS_3200U_EQ_3200(...)  \,
-#define Z_IS_3200_EQ_3200U(...)  \,
-#define Z_IS_3200U_EQ_3200U(...) \,
-#define Z_IS_3201_EQ_3201(...)   \,
-#define Z_IS_3201U_EQ_3201(...)  \,
-#define Z_IS_3201_EQ_3201U(...)  \,
-#define Z_IS_3201U_EQ_3201U(...) \,
-#define Z_IS_3202_EQ_3202(...)   \,
-#define Z_IS_3202U_EQ_3202(...)  \,
-#define Z_IS_3202_EQ_3202U(...)  \,
-#define Z_IS_3202U_EQ_3202U(...) \,
-#define Z_IS_3203_EQ_3203(...)   \,
-#define Z_IS_3203U_EQ_3203(...)  \,
-#define Z_IS_3203_EQ_3203U(...)  \,
-#define Z_IS_3203U_EQ_3203U(...) \,
-#define Z_IS_3204_EQ_3204(...)   \,
-#define Z_IS_3204U_EQ_3204(...)  \,
-#define Z_IS_3204_EQ_3204U(...)  \,
-#define Z_IS_3204U_EQ_3204U(...) \,
-#define Z_IS_3205_EQ_3205(...)   \,
-#define Z_IS_3205U_EQ_3205(...)  \,
-#define Z_IS_3205_EQ_3205U(...)  \,
-#define Z_IS_3205U_EQ_3205U(...) \,
-#define Z_IS_3206_EQ_3206(...)   \,
-#define Z_IS_3206U_EQ_3206(...)  \,
-#define Z_IS_3206_EQ_3206U(...)  \,
-#define Z_IS_3206U_EQ_3206U(...) \,
-#define Z_IS_3207_EQ_3207(...)   \,
-#define Z_IS_3207U_EQ_3207(...)  \,
-#define Z_IS_3207_EQ_3207U(...)  \,
-#define Z_IS_3207U_EQ_3207U(...) \,
-#define Z_IS_3208_EQ_3208(...)   \,
-#define Z_IS_3208U_EQ_3208(...)  \,
-#define Z_IS_3208_EQ_3208U(...)  \,
-#define Z_IS_3208U_EQ_3208U(...) \,
-#define Z_IS_3209_EQ_3209(...)   \,
-#define Z_IS_3209U_EQ_3209(...)  \,
-#define Z_IS_3209_EQ_3209U(...)  \,
-#define Z_IS_3209U_EQ_3209U(...) \,
-#define Z_IS_3210_EQ_3210(...)   \,
-#define Z_IS_3210U_EQ_3210(...)  \,
-#define Z_IS_3210_EQ_3210U(...)  \,
-#define Z_IS_3210U_EQ_3210U(...) \,
-#define Z_IS_3211_EQ_3211(...)   \,
-#define Z_IS_3211U_EQ_3211(...)  \,
-#define Z_IS_3211_EQ_3211U(...)  \,
-#define Z_IS_3211U_EQ_3211U(...) \,
-#define Z_IS_3212_EQ_3212(...)   \,
-#define Z_IS_3212U_EQ_3212(...)  \,
-#define Z_IS_3212_EQ_3212U(...)  \,
-#define Z_IS_3212U_EQ_3212U(...) \,
-#define Z_IS_3213_EQ_3213(...)   \,
-#define Z_IS_3213U_EQ_3213(...)  \,
-#define Z_IS_3213_EQ_3213U(...)  \,
-#define Z_IS_3213U_EQ_3213U(...) \,
-#define Z_IS_3214_EQ_3214(...)   \,
-#define Z_IS_3214U_EQ_3214(...)  \,
-#define Z_IS_3214_EQ_3214U(...)  \,
-#define Z_IS_3214U_EQ_3214U(...) \,
-#define Z_IS_3215_EQ_3215(...)   \,
-#define Z_IS_3215U_EQ_3215(...)  \,
-#define Z_IS_3215_EQ_3215U(...)  \,
-#define Z_IS_3215U_EQ_3215U(...) \,
-#define Z_IS_3216_EQ_3216(...)   \,
-#define Z_IS_3216U_EQ_3216(...)  \,
-#define Z_IS_3216_EQ_3216U(...)  \,
-#define Z_IS_3216U_EQ_3216U(...) \,
-#define Z_IS_3217_EQ_3217(...)   \,
-#define Z_IS_3217U_EQ_3217(...)  \,
-#define Z_IS_3217_EQ_3217U(...)  \,
-#define Z_IS_3217U_EQ_3217U(...) \,
-#define Z_IS_3218_EQ_3218(...)   \,
-#define Z_IS_3218U_EQ_3218(...)  \,
-#define Z_IS_3218_EQ_3218U(...)  \,
-#define Z_IS_3218U_EQ_3218U(...) \,
-#define Z_IS_3219_EQ_3219(...)   \,
-#define Z_IS_3219U_EQ_3219(...)  \,
-#define Z_IS_3219_EQ_3219U(...)  \,
-#define Z_IS_3219U_EQ_3219U(...) \,
-#define Z_IS_3220_EQ_3220(...)   \,
-#define Z_IS_3220U_EQ_3220(...)  \,
-#define Z_IS_3220_EQ_3220U(...)  \,
-#define Z_IS_3220U_EQ_3220U(...) \,
-#define Z_IS_3221_EQ_3221(...)   \,
-#define Z_IS_3221U_EQ_3221(...)  \,
-#define Z_IS_3221_EQ_3221U(...)  \,
-#define Z_IS_3221U_EQ_3221U(...) \,
-#define Z_IS_3222_EQ_3222(...)   \,
-#define Z_IS_3222U_EQ_3222(...)  \,
-#define Z_IS_3222_EQ_3222U(...)  \,
-#define Z_IS_3222U_EQ_3222U(...) \,
-#define Z_IS_3223_EQ_3223(...)   \,
-#define Z_IS_3223U_EQ_3223(...)  \,
-#define Z_IS_3223_EQ_3223U(...)  \,
-#define Z_IS_3223U_EQ_3223U(...) \,
-#define Z_IS_3224_EQ_3224(...)   \,
-#define Z_IS_3224U_EQ_3224(...)  \,
-#define Z_IS_3224_EQ_3224U(...)  \,
-#define Z_IS_3224U_EQ_3224U(...) \,
-#define Z_IS_3225_EQ_3225(...)   \,
-#define Z_IS_3225U_EQ_3225(...)  \,
-#define Z_IS_3225_EQ_3225U(...)  \,
-#define Z_IS_3225U_EQ_3225U(...) \,
-#define Z_IS_3226_EQ_3226(...)   \,
-#define Z_IS_3226U_EQ_3226(...)  \,
-#define Z_IS_3226_EQ_3226U(...)  \,
-#define Z_IS_3226U_EQ_3226U(...) \,
-#define Z_IS_3227_EQ_3227(...)   \,
-#define Z_IS_3227U_EQ_3227(...)  \,
-#define Z_IS_3227_EQ_3227U(...)  \,
-#define Z_IS_3227U_EQ_3227U(...) \,
-#define Z_IS_3228_EQ_3228(...)   \,
-#define Z_IS_3228U_EQ_3228(...)  \,
-#define Z_IS_3228_EQ_3228U(...)  \,
-#define Z_IS_3228U_EQ_3228U(...) \,
-#define Z_IS_3229_EQ_3229(...)   \,
-#define Z_IS_3229U_EQ_3229(...)  \,
-#define Z_IS_3229_EQ_3229U(...)  \,
-#define Z_IS_3229U_EQ_3229U(...) \,
-#define Z_IS_3230_EQ_3230(...)   \,
-#define Z_IS_3230U_EQ_3230(...)  \,
-#define Z_IS_3230_EQ_3230U(...)  \,
-#define Z_IS_3230U_EQ_3230U(...) \,
-#define Z_IS_3231_EQ_3231(...)   \,
-#define Z_IS_3231U_EQ_3231(...)  \,
-#define Z_IS_3231_EQ_3231U(...)  \,
-#define Z_IS_3231U_EQ_3231U(...) \,
-#define Z_IS_3232_EQ_3232(...)   \,
-#define Z_IS_3232U_EQ_3232(...)  \,
-#define Z_IS_3232_EQ_3232U(...)  \,
-#define Z_IS_3232U_EQ_3232U(...) \,
-#define Z_IS_3233_EQ_3233(...)   \,
-#define Z_IS_3233U_EQ_3233(...)  \,
-#define Z_IS_3233_EQ_3233U(...)  \,
-#define Z_IS_3233U_EQ_3233U(...) \,
-#define Z_IS_3234_EQ_3234(...)   \,
-#define Z_IS_3234U_EQ_3234(...)  \,
-#define Z_IS_3234_EQ_3234U(...)  \,
-#define Z_IS_3234U_EQ_3234U(...) \,
-#define Z_IS_3235_EQ_3235(...)   \,
-#define Z_IS_3235U_EQ_3235(...)  \,
-#define Z_IS_3235_EQ_3235U(...)  \,
-#define Z_IS_3235U_EQ_3235U(...) \,
-#define Z_IS_3236_EQ_3236(...)   \,
-#define Z_IS_3236U_EQ_3236(...)  \,
-#define Z_IS_3236_EQ_3236U(...)  \,
-#define Z_IS_3236U_EQ_3236U(...) \,
-#define Z_IS_3237_EQ_3237(...)   \,
-#define Z_IS_3237U_EQ_3237(...)  \,
-#define Z_IS_3237_EQ_3237U(...)  \,
-#define Z_IS_3237U_EQ_3237U(...) \,
-#define Z_IS_3238_EQ_3238(...)   \,
-#define Z_IS_3238U_EQ_3238(...)  \,
-#define Z_IS_3238_EQ_3238U(...)  \,
-#define Z_IS_3238U_EQ_3238U(...) \,
-#define Z_IS_3239_EQ_3239(...)   \,
-#define Z_IS_3239U_EQ_3239(...)  \,
-#define Z_IS_3239_EQ_3239U(...)  \,
-#define Z_IS_3239U_EQ_3239U(...) \,
-#define Z_IS_3240_EQ_3240(...)   \,
-#define Z_IS_3240U_EQ_3240(...)  \,
-#define Z_IS_3240_EQ_3240U(...)  \,
-#define Z_IS_3240U_EQ_3240U(...) \,
-#define Z_IS_3241_EQ_3241(...)   \,
-#define Z_IS_3241U_EQ_3241(...)  \,
-#define Z_IS_3241_EQ_3241U(...)  \,
-#define Z_IS_3241U_EQ_3241U(...) \,
-#define Z_IS_3242_EQ_3242(...)   \,
-#define Z_IS_3242U_EQ_3242(...)  \,
-#define Z_IS_3242_EQ_3242U(...)  \,
-#define Z_IS_3242U_EQ_3242U(...) \,
-#define Z_IS_3243_EQ_3243(...)   \,
-#define Z_IS_3243U_EQ_3243(...)  \,
-#define Z_IS_3243_EQ_3243U(...)  \,
-#define Z_IS_3243U_EQ_3243U(...) \,
-#define Z_IS_3244_EQ_3244(...)   \,
-#define Z_IS_3244U_EQ_3244(...)  \,
-#define Z_IS_3244_EQ_3244U(...)  \,
-#define Z_IS_3244U_EQ_3244U(...) \,
-#define Z_IS_3245_EQ_3245(...)   \,
-#define Z_IS_3245U_EQ_3245(...)  \,
-#define Z_IS_3245_EQ_3245U(...)  \,
-#define Z_IS_3245U_EQ_3245U(...) \,
-#define Z_IS_3246_EQ_3246(...)   \,
-#define Z_IS_3246U_EQ_3246(...)  \,
-#define Z_IS_3246_EQ_3246U(...)  \,
-#define Z_IS_3246U_EQ_3246U(...) \,
-#define Z_IS_3247_EQ_3247(...)   \,
-#define Z_IS_3247U_EQ_3247(...)  \,
-#define Z_IS_3247_EQ_3247U(...)  \,
-#define Z_IS_3247U_EQ_3247U(...) \,
-#define Z_IS_3248_EQ_3248(...)   \,
-#define Z_IS_3248U_EQ_3248(...)  \,
-#define Z_IS_3248_EQ_3248U(...)  \,
-#define Z_IS_3248U_EQ_3248U(...) \,
-#define Z_IS_3249_EQ_3249(...)   \,
-#define Z_IS_3249U_EQ_3249(...)  \,
-#define Z_IS_3249_EQ_3249U(...)  \,
-#define Z_IS_3249U_EQ_3249U(...) \,
-#define Z_IS_3250_EQ_3250(...)   \,
-#define Z_IS_3250U_EQ_3250(...)  \,
-#define Z_IS_3250_EQ_3250U(...)  \,
-#define Z_IS_3250U_EQ_3250U(...) \,
-#define Z_IS_3251_EQ_3251(...)   \,
-#define Z_IS_3251U_EQ_3251(...)  \,
-#define Z_IS_3251_EQ_3251U(...)  \,
-#define Z_IS_3251U_EQ_3251U(...) \,
-#define Z_IS_3252_EQ_3252(...)   \,
-#define Z_IS_3252U_EQ_3252(...)  \,
-#define Z_IS_3252_EQ_3252U(...)  \,
-#define Z_IS_3252U_EQ_3252U(...) \,
-#define Z_IS_3253_EQ_3253(...)   \,
-#define Z_IS_3253U_EQ_3253(...)  \,
-#define Z_IS_3253_EQ_3253U(...)  \,
-#define Z_IS_3253U_EQ_3253U(...) \,
-#define Z_IS_3254_EQ_3254(...)   \,
-#define Z_IS_3254U_EQ_3254(...)  \,
-#define Z_IS_3254_EQ_3254U(...)  \,
-#define Z_IS_3254U_EQ_3254U(...) \,
-#define Z_IS_3255_EQ_3255(...)   \,
-#define Z_IS_3255U_EQ_3255(...)  \,
-#define Z_IS_3255_EQ_3255U(...)  \,
-#define Z_IS_3255U_EQ_3255U(...) \,
-#define Z_IS_3256_EQ_3256(...)   \,
-#define Z_IS_3256U_EQ_3256(...)  \,
-#define Z_IS_3256_EQ_3256U(...)  \,
-#define Z_IS_3256U_EQ_3256U(...) \,
-#define Z_IS_3257_EQ_3257(...)   \,
-#define Z_IS_3257U_EQ_3257(...)  \,
-#define Z_IS_3257_EQ_3257U(...)  \,
-#define Z_IS_3257U_EQ_3257U(...) \,
-#define Z_IS_3258_EQ_3258(...)   \,
-#define Z_IS_3258U_EQ_3258(...)  \,
-#define Z_IS_3258_EQ_3258U(...)  \,
-#define Z_IS_3258U_EQ_3258U(...) \,
-#define Z_IS_3259_EQ_3259(...)   \,
-#define Z_IS_3259U_EQ_3259(...)  \,
-#define Z_IS_3259_EQ_3259U(...)  \,
-#define Z_IS_3259U_EQ_3259U(...) \,
-#define Z_IS_3260_EQ_3260(...)   \,
-#define Z_IS_3260U_EQ_3260(...)  \,
-#define Z_IS_3260_EQ_3260U(...)  \,
-#define Z_IS_3260U_EQ_3260U(...) \,
-#define Z_IS_3261_EQ_3261(...)   \,
-#define Z_IS_3261U_EQ_3261(...)  \,
-#define Z_IS_3261_EQ_3261U(...)  \,
-#define Z_IS_3261U_EQ_3261U(...) \,
-#define Z_IS_3262_EQ_3262(...)   \,
-#define Z_IS_3262U_EQ_3262(...)  \,
-#define Z_IS_3262_EQ_3262U(...)  \,
-#define Z_IS_3262U_EQ_3262U(...) \,
-#define Z_IS_3263_EQ_3263(...)   \,
-#define Z_IS_3263U_EQ_3263(...)  \,
-#define Z_IS_3263_EQ_3263U(...)  \,
-#define Z_IS_3263U_EQ_3263U(...) \,
-#define Z_IS_3264_EQ_3264(...)   \,
-#define Z_IS_3264U_EQ_3264(...)  \,
-#define Z_IS_3264_EQ_3264U(...)  \,
-#define Z_IS_3264U_EQ_3264U(...) \,
-#define Z_IS_3265_EQ_3265(...)   \,
-#define Z_IS_3265U_EQ_3265(...)  \,
-#define Z_IS_3265_EQ_3265U(...)  \,
-#define Z_IS_3265U_EQ_3265U(...) \,
-#define Z_IS_3266_EQ_3266(...)   \,
-#define Z_IS_3266U_EQ_3266(...)  \,
-#define Z_IS_3266_EQ_3266U(...)  \,
-#define Z_IS_3266U_EQ_3266U(...) \,
-#define Z_IS_3267_EQ_3267(...)   \,
-#define Z_IS_3267U_EQ_3267(...)  \,
-#define Z_IS_3267_EQ_3267U(...)  \,
-#define Z_IS_3267U_EQ_3267U(...) \,
-#define Z_IS_3268_EQ_3268(...)   \,
-#define Z_IS_3268U_EQ_3268(...)  \,
-#define Z_IS_3268_EQ_3268U(...)  \,
-#define Z_IS_3268U_EQ_3268U(...) \,
-#define Z_IS_3269_EQ_3269(...)   \,
-#define Z_IS_3269U_EQ_3269(...)  \,
-#define Z_IS_3269_EQ_3269U(...)  \,
-#define Z_IS_3269U_EQ_3269U(...) \,
-#define Z_IS_3270_EQ_3270(...)   \,
-#define Z_IS_3270U_EQ_3270(...)  \,
-#define Z_IS_3270_EQ_3270U(...)  \,
-#define Z_IS_3270U_EQ_3270U(...) \,
-#define Z_IS_3271_EQ_3271(...)   \,
-#define Z_IS_3271U_EQ_3271(...)  \,
-#define Z_IS_3271_EQ_3271U(...)  \,
-#define Z_IS_3271U_EQ_3271U(...) \,
-#define Z_IS_3272_EQ_3272(...)   \,
-#define Z_IS_3272U_EQ_3272(...)  \,
-#define Z_IS_3272_EQ_3272U(...)  \,
-#define Z_IS_3272U_EQ_3272U(...) \,
-#define Z_IS_3273_EQ_3273(...)   \,
-#define Z_IS_3273U_EQ_3273(...)  \,
-#define Z_IS_3273_EQ_3273U(...)  \,
-#define Z_IS_3273U_EQ_3273U(...) \,
-#define Z_IS_3274_EQ_3274(...)   \,
-#define Z_IS_3274U_EQ_3274(...)  \,
-#define Z_IS_3274_EQ_3274U(...)  \,
-#define Z_IS_3274U_EQ_3274U(...) \,
-#define Z_IS_3275_EQ_3275(...)   \,
-#define Z_IS_3275U_EQ_3275(...)  \,
-#define Z_IS_3275_EQ_3275U(...)  \,
-#define Z_IS_3275U_EQ_3275U(...) \,
-#define Z_IS_3276_EQ_3276(...)   \,
-#define Z_IS_3276U_EQ_3276(...)  \,
-#define Z_IS_3276_EQ_3276U(...)  \,
-#define Z_IS_3276U_EQ_3276U(...) \,
-#define Z_IS_3277_EQ_3277(...)   \,
-#define Z_IS_3277U_EQ_3277(...)  \,
-#define Z_IS_3277_EQ_3277U(...)  \,
-#define Z_IS_3277U_EQ_3277U(...) \,
-#define Z_IS_3278_EQ_3278(...)   \,
-#define Z_IS_3278U_EQ_3278(...)  \,
-#define Z_IS_3278_EQ_3278U(...)  \,
-#define Z_IS_3278U_EQ_3278U(...) \,
-#define Z_IS_3279_EQ_3279(...)   \,
-#define Z_IS_3279U_EQ_3279(...)  \,
-#define Z_IS_3279_EQ_3279U(...)  \,
-#define Z_IS_3279U_EQ_3279U(...) \,
-#define Z_IS_3280_EQ_3280(...)   \,
-#define Z_IS_3280U_EQ_3280(...)  \,
-#define Z_IS_3280_EQ_3280U(...)  \,
-#define Z_IS_3280U_EQ_3280U(...) \,
-#define Z_IS_3281_EQ_3281(...)   \,
-#define Z_IS_3281U_EQ_3281(...)  \,
-#define Z_IS_3281_EQ_3281U(...)  \,
-#define Z_IS_3281U_EQ_3281U(...) \,
-#define Z_IS_3282_EQ_3282(...)   \,
-#define Z_IS_3282U_EQ_3282(...)  \,
-#define Z_IS_3282_EQ_3282U(...)  \,
-#define Z_IS_3282U_EQ_3282U(...) \,
-#define Z_IS_3283_EQ_3283(...)   \,
-#define Z_IS_3283U_EQ_3283(...)  \,
-#define Z_IS_3283_EQ_3283U(...)  \,
-#define Z_IS_3283U_EQ_3283U(...) \,
-#define Z_IS_3284_EQ_3284(...)   \,
-#define Z_IS_3284U_EQ_3284(...)  \,
-#define Z_IS_3284_EQ_3284U(...)  \,
-#define Z_IS_3284U_EQ_3284U(...) \,
-#define Z_IS_3285_EQ_3285(...)   \,
-#define Z_IS_3285U_EQ_3285(...)  \,
-#define Z_IS_3285_EQ_3285U(...)  \,
-#define Z_IS_3285U_EQ_3285U(...) \,
-#define Z_IS_3286_EQ_3286(...)   \,
-#define Z_IS_3286U_EQ_3286(...)  \,
-#define Z_IS_3286_EQ_3286U(...)  \,
-#define Z_IS_3286U_EQ_3286U(...) \,
-#define Z_IS_3287_EQ_3287(...)   \,
-#define Z_IS_3287U_EQ_3287(...)  \,
-#define Z_IS_3287_EQ_3287U(...)  \,
-#define Z_IS_3287U_EQ_3287U(...) \,
-#define Z_IS_3288_EQ_3288(...)   \,
-#define Z_IS_3288U_EQ_3288(...)  \,
-#define Z_IS_3288_EQ_3288U(...)  \,
-#define Z_IS_3288U_EQ_3288U(...) \,
-#define Z_IS_3289_EQ_3289(...)   \,
-#define Z_IS_3289U_EQ_3289(...)  \,
-#define Z_IS_3289_EQ_3289U(...)  \,
-#define Z_IS_3289U_EQ_3289U(...) \,
-#define Z_IS_3290_EQ_3290(...)   \,
-#define Z_IS_3290U_EQ_3290(...)  \,
-#define Z_IS_3290_EQ_3290U(...)  \,
-#define Z_IS_3290U_EQ_3290U(...) \,
-#define Z_IS_3291_EQ_3291(...)   \,
-#define Z_IS_3291U_EQ_3291(...)  \,
-#define Z_IS_3291_EQ_3291U(...)  \,
-#define Z_IS_3291U_EQ_3291U(...) \,
-#define Z_IS_3292_EQ_3292(...)   \,
-#define Z_IS_3292U_EQ_3292(...)  \,
-#define Z_IS_3292_EQ_3292U(...)  \,
-#define Z_IS_3292U_EQ_3292U(...) \,
-#define Z_IS_3293_EQ_3293(...)   \,
-#define Z_IS_3293U_EQ_3293(...)  \,
-#define Z_IS_3293_EQ_3293U(...)  \,
-#define Z_IS_3293U_EQ_3293U(...) \,
-#define Z_IS_3294_EQ_3294(...)   \,
-#define Z_IS_3294U_EQ_3294(...)  \,
-#define Z_IS_3294_EQ_3294U(...)  \,
-#define Z_IS_3294U_EQ_3294U(...) \,
-#define Z_IS_3295_EQ_3295(...)   \,
-#define Z_IS_3295U_EQ_3295(...)  \,
-#define Z_IS_3295_EQ_3295U(...)  \,
-#define Z_IS_3295U_EQ_3295U(...) \,
-#define Z_IS_3296_EQ_3296(...)   \,
-#define Z_IS_3296U_EQ_3296(...)  \,
-#define Z_IS_3296_EQ_3296U(...)  \,
-#define Z_IS_3296U_EQ_3296U(...) \,
-#define Z_IS_3297_EQ_3297(...)   \,
-#define Z_IS_3297U_EQ_3297(...)  \,
-#define Z_IS_3297_EQ_3297U(...)  \,
-#define Z_IS_3297U_EQ_3297U(...) \,
-#define Z_IS_3298_EQ_3298(...)   \,
-#define Z_IS_3298U_EQ_3298(...)  \,
-#define Z_IS_3298_EQ_3298U(...)  \,
-#define Z_IS_3298U_EQ_3298U(...) \,
-#define Z_IS_3299_EQ_3299(...)   \,
-#define Z_IS_3299U_EQ_3299(...)  \,
-#define Z_IS_3299_EQ_3299U(...)  \,
-#define Z_IS_3299U_EQ_3299U(...) \,
-#define Z_IS_3300_EQ_3300(...)   \,
-#define Z_IS_3300U_EQ_3300(...)  \,
-#define Z_IS_3300_EQ_3300U(...)  \,
-#define Z_IS_3300U_EQ_3300U(...) \,
-#define Z_IS_3301_EQ_3301(...)   \,
-#define Z_IS_3301U_EQ_3301(...)  \,
-#define Z_IS_3301_EQ_3301U(...)  \,
-#define Z_IS_3301U_EQ_3301U(...) \,
-#define Z_IS_3302_EQ_3302(...)   \,
-#define Z_IS_3302U_EQ_3302(...)  \,
-#define Z_IS_3302_EQ_3302U(...)  \,
-#define Z_IS_3302U_EQ_3302U(...) \,
-#define Z_IS_3303_EQ_3303(...)   \,
-#define Z_IS_3303U_EQ_3303(...)  \,
-#define Z_IS_3303_EQ_3303U(...)  \,
-#define Z_IS_3303U_EQ_3303U(...) \,
-#define Z_IS_3304_EQ_3304(...)   \,
-#define Z_IS_3304U_EQ_3304(...)  \,
-#define Z_IS_3304_EQ_3304U(...)  \,
-#define Z_IS_3304U_EQ_3304U(...) \,
-#define Z_IS_3305_EQ_3305(...)   \,
-#define Z_IS_3305U_EQ_3305(...)  \,
-#define Z_IS_3305_EQ_3305U(...)  \,
-#define Z_IS_3305U_EQ_3305U(...) \,
-#define Z_IS_3306_EQ_3306(...)   \,
-#define Z_IS_3306U_EQ_3306(...)  \,
-#define Z_IS_3306_EQ_3306U(...)  \,
-#define Z_IS_3306U_EQ_3306U(...) \,
-#define Z_IS_3307_EQ_3307(...)   \,
-#define Z_IS_3307U_EQ_3307(...)  \,
-#define Z_IS_3307_EQ_3307U(...)  \,
-#define Z_IS_3307U_EQ_3307U(...) \,
-#define Z_IS_3308_EQ_3308(...)   \,
-#define Z_IS_3308U_EQ_3308(...)  \,
-#define Z_IS_3308_EQ_3308U(...)  \,
-#define Z_IS_3308U_EQ_3308U(...) \,
-#define Z_IS_3309_EQ_3309(...)   \,
-#define Z_IS_3309U_EQ_3309(...)  \,
-#define Z_IS_3309_EQ_3309U(...)  \,
-#define Z_IS_3309U_EQ_3309U(...) \,
-#define Z_IS_3310_EQ_3310(...)   \,
-#define Z_IS_3310U_EQ_3310(...)  \,
-#define Z_IS_3310_EQ_3310U(...)  \,
-#define Z_IS_3310U_EQ_3310U(...) \,
-#define Z_IS_3311_EQ_3311(...)   \,
-#define Z_IS_3311U_EQ_3311(...)  \,
-#define Z_IS_3311_EQ_3311U(...)  \,
-#define Z_IS_3311U_EQ_3311U(...) \,
-#define Z_IS_3312_EQ_3312(...)   \,
-#define Z_IS_3312U_EQ_3312(...)  \,
-#define Z_IS_3312_EQ_3312U(...)  \,
-#define Z_IS_3312U_EQ_3312U(...) \,
-#define Z_IS_3313_EQ_3313(...)   \,
-#define Z_IS_3313U_EQ_3313(...)  \,
-#define Z_IS_3313_EQ_3313U(...)  \,
-#define Z_IS_3313U_EQ_3313U(...) \,
-#define Z_IS_3314_EQ_3314(...)   \,
-#define Z_IS_3314U_EQ_3314(...)  \,
-#define Z_IS_3314_EQ_3314U(...)  \,
-#define Z_IS_3314U_EQ_3314U(...) \,
-#define Z_IS_3315_EQ_3315(...)   \,
-#define Z_IS_3315U_EQ_3315(...)  \,
-#define Z_IS_3315_EQ_3315U(...)  \,
-#define Z_IS_3315U_EQ_3315U(...) \,
-#define Z_IS_3316_EQ_3316(...)   \,
-#define Z_IS_3316U_EQ_3316(...)  \,
-#define Z_IS_3316_EQ_3316U(...)  \,
-#define Z_IS_3316U_EQ_3316U(...) \,
-#define Z_IS_3317_EQ_3317(...)   \,
-#define Z_IS_3317U_EQ_3317(...)  \,
-#define Z_IS_3317_EQ_3317U(...)  \,
-#define Z_IS_3317U_EQ_3317U(...) \,
-#define Z_IS_3318_EQ_3318(...)   \,
-#define Z_IS_3318U_EQ_3318(...)  \,
-#define Z_IS_3318_EQ_3318U(...)  \,
-#define Z_IS_3318U_EQ_3318U(...) \,
-#define Z_IS_3319_EQ_3319(...)   \,
-#define Z_IS_3319U_EQ_3319(...)  \,
-#define Z_IS_3319_EQ_3319U(...)  \,
-#define Z_IS_3319U_EQ_3319U(...) \,
-#define Z_IS_3320_EQ_3320(...)   \,
-#define Z_IS_3320U_EQ_3320(...)  \,
-#define Z_IS_3320_EQ_3320U(...)  \,
-#define Z_IS_3320U_EQ_3320U(...) \,
-#define Z_IS_3321_EQ_3321(...)   \,
-#define Z_IS_3321U_EQ_3321(...)  \,
-#define Z_IS_3321_EQ_3321U(...)  \,
-#define Z_IS_3321U_EQ_3321U(...) \,
-#define Z_IS_3322_EQ_3322(...)   \,
-#define Z_IS_3322U_EQ_3322(...)  \,
-#define Z_IS_3322_EQ_3322U(...)  \,
-#define Z_IS_3322U_EQ_3322U(...) \,
-#define Z_IS_3323_EQ_3323(...)   \,
-#define Z_IS_3323U_EQ_3323(...)  \,
-#define Z_IS_3323_EQ_3323U(...)  \,
-#define Z_IS_3323U_EQ_3323U(...) \,
-#define Z_IS_3324_EQ_3324(...)   \,
-#define Z_IS_3324U_EQ_3324(...)  \,
-#define Z_IS_3324_EQ_3324U(...)  \,
-#define Z_IS_3324U_EQ_3324U(...) \,
-#define Z_IS_3325_EQ_3325(...)   \,
-#define Z_IS_3325U_EQ_3325(...)  \,
-#define Z_IS_3325_EQ_3325U(...)  \,
-#define Z_IS_3325U_EQ_3325U(...) \,
-#define Z_IS_3326_EQ_3326(...)   \,
-#define Z_IS_3326U_EQ_3326(...)  \,
-#define Z_IS_3326_EQ_3326U(...)  \,
-#define Z_IS_3326U_EQ_3326U(...) \,
-#define Z_IS_3327_EQ_3327(...)   \,
-#define Z_IS_3327U_EQ_3327(...)  \,
-#define Z_IS_3327_EQ_3327U(...)  \,
-#define Z_IS_3327U_EQ_3327U(...) \,
-#define Z_IS_3328_EQ_3328(...)   \,
-#define Z_IS_3328U_EQ_3328(...)  \,
-#define Z_IS_3328_EQ_3328U(...)  \,
-#define Z_IS_3328U_EQ_3328U(...) \,
-#define Z_IS_3329_EQ_3329(...)   \,
-#define Z_IS_3329U_EQ_3329(...)  \,
-#define Z_IS_3329_EQ_3329U(...)  \,
-#define Z_IS_3329U_EQ_3329U(...) \,
-#define Z_IS_3330_EQ_3330(...)   \,
-#define Z_IS_3330U_EQ_3330(...)  \,
-#define Z_IS_3330_EQ_3330U(...)  \,
-#define Z_IS_3330U_EQ_3330U(...) \,
-#define Z_IS_3331_EQ_3331(...)   \,
-#define Z_IS_3331U_EQ_3331(...)  \,
-#define Z_IS_3331_EQ_3331U(...)  \,
-#define Z_IS_3331U_EQ_3331U(...) \,
-#define Z_IS_3332_EQ_3332(...)   \,
-#define Z_IS_3332U_EQ_3332(...)  \,
-#define Z_IS_3332_EQ_3332U(...)  \,
-#define Z_IS_3332U_EQ_3332U(...) \,
-#define Z_IS_3333_EQ_3333(...)   \,
-#define Z_IS_3333U_EQ_3333(...)  \,
-#define Z_IS_3333_EQ_3333U(...)  \,
-#define Z_IS_3333U_EQ_3333U(...) \,
-#define Z_IS_3334_EQ_3334(...)   \,
-#define Z_IS_3334U_EQ_3334(...)  \,
-#define Z_IS_3334_EQ_3334U(...)  \,
-#define Z_IS_3334U_EQ_3334U(...) \,
-#define Z_IS_3335_EQ_3335(...)   \,
-#define Z_IS_3335U_EQ_3335(...)  \,
-#define Z_IS_3335_EQ_3335U(...)  \,
-#define Z_IS_3335U_EQ_3335U(...) \,
-#define Z_IS_3336_EQ_3336(...)   \,
-#define Z_IS_3336U_EQ_3336(...)  \,
-#define Z_IS_3336_EQ_3336U(...)  \,
-#define Z_IS_3336U_EQ_3336U(...) \,
-#define Z_IS_3337_EQ_3337(...)   \,
-#define Z_IS_3337U_EQ_3337(...)  \,
-#define Z_IS_3337_EQ_3337U(...)  \,
-#define Z_IS_3337U_EQ_3337U(...) \,
-#define Z_IS_3338_EQ_3338(...)   \,
-#define Z_IS_3338U_EQ_3338(...)  \,
-#define Z_IS_3338_EQ_3338U(...)  \,
-#define Z_IS_3338U_EQ_3338U(...) \,
-#define Z_IS_3339_EQ_3339(...)   \,
-#define Z_IS_3339U_EQ_3339(...)  \,
-#define Z_IS_3339_EQ_3339U(...)  \,
-#define Z_IS_3339U_EQ_3339U(...) \,
-#define Z_IS_3340_EQ_3340(...)   \,
-#define Z_IS_3340U_EQ_3340(...)  \,
-#define Z_IS_3340_EQ_3340U(...)  \,
-#define Z_IS_3340U_EQ_3340U(...) \,
-#define Z_IS_3341_EQ_3341(...)   \,
-#define Z_IS_3341U_EQ_3341(...)  \,
-#define Z_IS_3341_EQ_3341U(...)  \,
-#define Z_IS_3341U_EQ_3341U(...) \,
-#define Z_IS_3342_EQ_3342(...)   \,
-#define Z_IS_3342U_EQ_3342(...)  \,
-#define Z_IS_3342_EQ_3342U(...)  \,
-#define Z_IS_3342U_EQ_3342U(...) \,
-#define Z_IS_3343_EQ_3343(...)   \,
-#define Z_IS_3343U_EQ_3343(...)  \,
-#define Z_IS_3343_EQ_3343U(...)  \,
-#define Z_IS_3343U_EQ_3343U(...) \,
-#define Z_IS_3344_EQ_3344(...)   \,
-#define Z_IS_3344U_EQ_3344(...)  \,
-#define Z_IS_3344_EQ_3344U(...)  \,
-#define Z_IS_3344U_EQ_3344U(...) \,
-#define Z_IS_3345_EQ_3345(...)   \,
-#define Z_IS_3345U_EQ_3345(...)  \,
-#define Z_IS_3345_EQ_3345U(...)  \,
-#define Z_IS_3345U_EQ_3345U(...) \,
-#define Z_IS_3346_EQ_3346(...)   \,
-#define Z_IS_3346U_EQ_3346(...)  \,
-#define Z_IS_3346_EQ_3346U(...)  \,
-#define Z_IS_3346U_EQ_3346U(...) \,
-#define Z_IS_3347_EQ_3347(...)   \,
-#define Z_IS_3347U_EQ_3347(...)  \,
-#define Z_IS_3347_EQ_3347U(...)  \,
-#define Z_IS_3347U_EQ_3347U(...) \,
-#define Z_IS_3348_EQ_3348(...)   \,
-#define Z_IS_3348U_EQ_3348(...)  \,
-#define Z_IS_3348_EQ_3348U(...)  \,
-#define Z_IS_3348U_EQ_3348U(...) \,
-#define Z_IS_3349_EQ_3349(...)   \,
-#define Z_IS_3349U_EQ_3349(...)  \,
-#define Z_IS_3349_EQ_3349U(...)  \,
-#define Z_IS_3349U_EQ_3349U(...) \,
-#define Z_IS_3350_EQ_3350(...)   \,
-#define Z_IS_3350U_EQ_3350(...)  \,
-#define Z_IS_3350_EQ_3350U(...)  \,
-#define Z_IS_3350U_EQ_3350U(...) \,
-#define Z_IS_3351_EQ_3351(...)   \,
-#define Z_IS_3351U_EQ_3351(...)  \,
-#define Z_IS_3351_EQ_3351U(...)  \,
-#define Z_IS_3351U_EQ_3351U(...) \,
-#define Z_IS_3352_EQ_3352(...)   \,
-#define Z_IS_3352U_EQ_3352(...)  \,
-#define Z_IS_3352_EQ_3352U(...)  \,
-#define Z_IS_3352U_EQ_3352U(...) \,
-#define Z_IS_3353_EQ_3353(...)   \,
-#define Z_IS_3353U_EQ_3353(...)  \,
-#define Z_IS_3353_EQ_3353U(...)  \,
-#define Z_IS_3353U_EQ_3353U(...) \,
-#define Z_IS_3354_EQ_3354(...)   \,
-#define Z_IS_3354U_EQ_3354(...)  \,
-#define Z_IS_3354_EQ_3354U(...)  \,
-#define Z_IS_3354U_EQ_3354U(...) \,
-#define Z_IS_3355_EQ_3355(...)   \,
-#define Z_IS_3355U_EQ_3355(...)  \,
-#define Z_IS_3355_EQ_3355U(...)  \,
-#define Z_IS_3355U_EQ_3355U(...) \,
-#define Z_IS_3356_EQ_3356(...)   \,
-#define Z_IS_3356U_EQ_3356(...)  \,
-#define Z_IS_3356_EQ_3356U(...)  \,
-#define Z_IS_3356U_EQ_3356U(...) \,
-#define Z_IS_3357_EQ_3357(...)   \,
-#define Z_IS_3357U_EQ_3357(...)  \,
-#define Z_IS_3357_EQ_3357U(...)  \,
-#define Z_IS_3357U_EQ_3357U(...) \,
-#define Z_IS_3358_EQ_3358(...)   \,
-#define Z_IS_3358U_EQ_3358(...)  \,
-#define Z_IS_3358_EQ_3358U(...)  \,
-#define Z_IS_3358U_EQ_3358U(...) \,
-#define Z_IS_3359_EQ_3359(...)   \,
-#define Z_IS_3359U_EQ_3359(...)  \,
-#define Z_IS_3359_EQ_3359U(...)  \,
-#define Z_IS_3359U_EQ_3359U(...) \,
-#define Z_IS_3360_EQ_3360(...)   \,
-#define Z_IS_3360U_EQ_3360(...)  \,
-#define Z_IS_3360_EQ_3360U(...)  \,
-#define Z_IS_3360U_EQ_3360U(...) \,
-#define Z_IS_3361_EQ_3361(...)   \,
-#define Z_IS_3361U_EQ_3361(...)  \,
-#define Z_IS_3361_EQ_3361U(...)  \,
-#define Z_IS_3361U_EQ_3361U(...) \,
-#define Z_IS_3362_EQ_3362(...)   \,
-#define Z_IS_3362U_EQ_3362(...)  \,
-#define Z_IS_3362_EQ_3362U(...)  \,
-#define Z_IS_3362U_EQ_3362U(...) \,
-#define Z_IS_3363_EQ_3363(...)   \,
-#define Z_IS_3363U_EQ_3363(...)  \,
-#define Z_IS_3363_EQ_3363U(...)  \,
-#define Z_IS_3363U_EQ_3363U(...) \,
-#define Z_IS_3364_EQ_3364(...)   \,
-#define Z_IS_3364U_EQ_3364(...)  \,
-#define Z_IS_3364_EQ_3364U(...)  \,
-#define Z_IS_3364U_EQ_3364U(...) \,
-#define Z_IS_3365_EQ_3365(...)   \,
-#define Z_IS_3365U_EQ_3365(...)  \,
-#define Z_IS_3365_EQ_3365U(...)  \,
-#define Z_IS_3365U_EQ_3365U(...) \,
-#define Z_IS_3366_EQ_3366(...)   \,
-#define Z_IS_3366U_EQ_3366(...)  \,
-#define Z_IS_3366_EQ_3366U(...)  \,
-#define Z_IS_3366U_EQ_3366U(...) \,
-#define Z_IS_3367_EQ_3367(...)   \,
-#define Z_IS_3367U_EQ_3367(...)  \,
-#define Z_IS_3367_EQ_3367U(...)  \,
-#define Z_IS_3367U_EQ_3367U(...) \,
-#define Z_IS_3368_EQ_3368(...)   \,
-#define Z_IS_3368U_EQ_3368(...)  \,
-#define Z_IS_3368_EQ_3368U(...)  \,
-#define Z_IS_3368U_EQ_3368U(...) \,
-#define Z_IS_3369_EQ_3369(...)   \,
-#define Z_IS_3369U_EQ_3369(...)  \,
-#define Z_IS_3369_EQ_3369U(...)  \,
-#define Z_IS_3369U_EQ_3369U(...) \,
-#define Z_IS_3370_EQ_3370(...)   \,
-#define Z_IS_3370U_EQ_3370(...)  \,
-#define Z_IS_3370_EQ_3370U(...)  \,
-#define Z_IS_3370U_EQ_3370U(...) \,
-#define Z_IS_3371_EQ_3371(...)   \,
-#define Z_IS_3371U_EQ_3371(...)  \,
-#define Z_IS_3371_EQ_3371U(...)  \,
-#define Z_IS_3371U_EQ_3371U(...) \,
-#define Z_IS_3372_EQ_3372(...)   \,
-#define Z_IS_3372U_EQ_3372(...)  \,
-#define Z_IS_3372_EQ_3372U(...)  \,
-#define Z_IS_3372U_EQ_3372U(...) \,
-#define Z_IS_3373_EQ_3373(...)   \,
-#define Z_IS_3373U_EQ_3373(...)  \,
-#define Z_IS_3373_EQ_3373U(...)  \,
-#define Z_IS_3373U_EQ_3373U(...) \,
-#define Z_IS_3374_EQ_3374(...)   \,
-#define Z_IS_3374U_EQ_3374(...)  \,
-#define Z_IS_3374_EQ_3374U(...)  \,
-#define Z_IS_3374U_EQ_3374U(...) \,
-#define Z_IS_3375_EQ_3375(...)   \,
-#define Z_IS_3375U_EQ_3375(...)  \,
-#define Z_IS_3375_EQ_3375U(...)  \,
-#define Z_IS_3375U_EQ_3375U(...) \,
-#define Z_IS_3376_EQ_3376(...)   \,
-#define Z_IS_3376U_EQ_3376(...)  \,
-#define Z_IS_3376_EQ_3376U(...)  \,
-#define Z_IS_3376U_EQ_3376U(...) \,
-#define Z_IS_3377_EQ_3377(...)   \,
-#define Z_IS_3377U_EQ_3377(...)  \,
-#define Z_IS_3377_EQ_3377U(...)  \,
-#define Z_IS_3377U_EQ_3377U(...) \,
-#define Z_IS_3378_EQ_3378(...)   \,
-#define Z_IS_3378U_EQ_3378(...)  \,
-#define Z_IS_3378_EQ_3378U(...)  \,
-#define Z_IS_3378U_EQ_3378U(...) \,
-#define Z_IS_3379_EQ_3379(...)   \,
-#define Z_IS_3379U_EQ_3379(...)  \,
-#define Z_IS_3379_EQ_3379U(...)  \,
-#define Z_IS_3379U_EQ_3379U(...) \,
-#define Z_IS_3380_EQ_3380(...)   \,
-#define Z_IS_3380U_EQ_3380(...)  \,
-#define Z_IS_3380_EQ_3380U(...)  \,
-#define Z_IS_3380U_EQ_3380U(...) \,
-#define Z_IS_3381_EQ_3381(...)   \,
-#define Z_IS_3381U_EQ_3381(...)  \,
-#define Z_IS_3381_EQ_3381U(...)  \,
-#define Z_IS_3381U_EQ_3381U(...) \,
-#define Z_IS_3382_EQ_3382(...)   \,
-#define Z_IS_3382U_EQ_3382(...)  \,
-#define Z_IS_3382_EQ_3382U(...)  \,
-#define Z_IS_3382U_EQ_3382U(...) \,
-#define Z_IS_3383_EQ_3383(...)   \,
-#define Z_IS_3383U_EQ_3383(...)  \,
-#define Z_IS_3383_EQ_3383U(...)  \,
-#define Z_IS_3383U_EQ_3383U(...) \,
-#define Z_IS_3384_EQ_3384(...)   \,
-#define Z_IS_3384U_EQ_3384(...)  \,
-#define Z_IS_3384_EQ_3384U(...)  \,
-#define Z_IS_3384U_EQ_3384U(...) \,
-#define Z_IS_3385_EQ_3385(...)   \,
-#define Z_IS_3385U_EQ_3385(...)  \,
-#define Z_IS_3385_EQ_3385U(...)  \,
-#define Z_IS_3385U_EQ_3385U(...) \,
-#define Z_IS_3386_EQ_3386(...)   \,
-#define Z_IS_3386U_EQ_3386(...)  \,
-#define Z_IS_3386_EQ_3386U(...)  \,
-#define Z_IS_3386U_EQ_3386U(...) \,
-#define Z_IS_3387_EQ_3387(...)   \,
-#define Z_IS_3387U_EQ_3387(...)  \,
-#define Z_IS_3387_EQ_3387U(...)  \,
-#define Z_IS_3387U_EQ_3387U(...) \,
-#define Z_IS_3388_EQ_3388(...)   \,
-#define Z_IS_3388U_EQ_3388(...)  \,
-#define Z_IS_3388_EQ_3388U(...)  \,
-#define Z_IS_3388U_EQ_3388U(...) \,
-#define Z_IS_3389_EQ_3389(...)   \,
-#define Z_IS_3389U_EQ_3389(...)  \,
-#define Z_IS_3389_EQ_3389U(...)  \,
-#define Z_IS_3389U_EQ_3389U(...) \,
-#define Z_IS_3390_EQ_3390(...)   \,
-#define Z_IS_3390U_EQ_3390(...)  \,
-#define Z_IS_3390_EQ_3390U(...)  \,
-#define Z_IS_3390U_EQ_3390U(...) \,
-#define Z_IS_3391_EQ_3391(...)   \,
-#define Z_IS_3391U_EQ_3391(...)  \,
-#define Z_IS_3391_EQ_3391U(...)  \,
-#define Z_IS_3391U_EQ_3391U(...) \,
-#define Z_IS_3392_EQ_3392(...)   \,
-#define Z_IS_3392U_EQ_3392(...)  \,
-#define Z_IS_3392_EQ_3392U(...)  \,
-#define Z_IS_3392U_EQ_3392U(...) \,
-#define Z_IS_3393_EQ_3393(...)   \,
-#define Z_IS_3393U_EQ_3393(...)  \,
-#define Z_IS_3393_EQ_3393U(...)  \,
-#define Z_IS_3393U_EQ_3393U(...) \,
-#define Z_IS_3394_EQ_3394(...)   \,
-#define Z_IS_3394U_EQ_3394(...)  \,
-#define Z_IS_3394_EQ_3394U(...)  \,
-#define Z_IS_3394U_EQ_3394U(...) \,
-#define Z_IS_3395_EQ_3395(...)   \,
-#define Z_IS_3395U_EQ_3395(...)  \,
-#define Z_IS_3395_EQ_3395U(...)  \,
-#define Z_IS_3395U_EQ_3395U(...) \,
-#define Z_IS_3396_EQ_3396(...)   \,
-#define Z_IS_3396U_EQ_3396(...)  \,
-#define Z_IS_3396_EQ_3396U(...)  \,
-#define Z_IS_3396U_EQ_3396U(...) \,
-#define Z_IS_3397_EQ_3397(...)   \,
-#define Z_IS_3397U_EQ_3397(...)  \,
-#define Z_IS_3397_EQ_3397U(...)  \,
-#define Z_IS_3397U_EQ_3397U(...) \,
-#define Z_IS_3398_EQ_3398(...)   \,
-#define Z_IS_3398U_EQ_3398(...)  \,
-#define Z_IS_3398_EQ_3398U(...)  \,
-#define Z_IS_3398U_EQ_3398U(...) \,
-#define Z_IS_3399_EQ_3399(...)   \,
-#define Z_IS_3399U_EQ_3399(...)  \,
-#define Z_IS_3399_EQ_3399U(...)  \,
-#define Z_IS_3399U_EQ_3399U(...) \,
-#define Z_IS_3400_EQ_3400(...)   \,
-#define Z_IS_3400U_EQ_3400(...)  \,
-#define Z_IS_3400_EQ_3400U(...)  \,
-#define Z_IS_3400U_EQ_3400U(...) \,
-#define Z_IS_3401_EQ_3401(...)   \,
-#define Z_IS_3401U_EQ_3401(...)  \,
-#define Z_IS_3401_EQ_3401U(...)  \,
-#define Z_IS_3401U_EQ_3401U(...) \,
-#define Z_IS_3402_EQ_3402(...)   \,
-#define Z_IS_3402U_EQ_3402(...)  \,
-#define Z_IS_3402_EQ_3402U(...)  \,
-#define Z_IS_3402U_EQ_3402U(...) \,
-#define Z_IS_3403_EQ_3403(...)   \,
-#define Z_IS_3403U_EQ_3403(...)  \,
-#define Z_IS_3403_EQ_3403U(...)  \,
-#define Z_IS_3403U_EQ_3403U(...) \,
-#define Z_IS_3404_EQ_3404(...)   \,
-#define Z_IS_3404U_EQ_3404(...)  \,
-#define Z_IS_3404_EQ_3404U(...)  \,
-#define Z_IS_3404U_EQ_3404U(...) \,
-#define Z_IS_3405_EQ_3405(...)   \,
-#define Z_IS_3405U_EQ_3405(...)  \,
-#define Z_IS_3405_EQ_3405U(...)  \,
-#define Z_IS_3405U_EQ_3405U(...) \,
-#define Z_IS_3406_EQ_3406(...)   \,
-#define Z_IS_3406U_EQ_3406(...)  \,
-#define Z_IS_3406_EQ_3406U(...)  \,
-#define Z_IS_3406U_EQ_3406U(...) \,
-#define Z_IS_3407_EQ_3407(...)   \,
-#define Z_IS_3407U_EQ_3407(...)  \,
-#define Z_IS_3407_EQ_3407U(...)  \,
-#define Z_IS_3407U_EQ_3407U(...) \,
-#define Z_IS_3408_EQ_3408(...)   \,
-#define Z_IS_3408U_EQ_3408(...)  \,
-#define Z_IS_3408_EQ_3408U(...)  \,
-#define Z_IS_3408U_EQ_3408U(...) \,
-#define Z_IS_3409_EQ_3409(...)   \,
-#define Z_IS_3409U_EQ_3409(...)  \,
-#define Z_IS_3409_EQ_3409U(...)  \,
-#define Z_IS_3409U_EQ_3409U(...) \,
-#define Z_IS_3410_EQ_3410(...)   \,
-#define Z_IS_3410U_EQ_3410(...)  \,
-#define Z_IS_3410_EQ_3410U(...)  \,
-#define Z_IS_3410U_EQ_3410U(...) \,
-#define Z_IS_3411_EQ_3411(...)   \,
-#define Z_IS_3411U_EQ_3411(...)  \,
-#define Z_IS_3411_EQ_3411U(...)  \,
-#define Z_IS_3411U_EQ_3411U(...) \,
-#define Z_IS_3412_EQ_3412(...)   \,
-#define Z_IS_3412U_EQ_3412(...)  \,
-#define Z_IS_3412_EQ_3412U(...)  \,
-#define Z_IS_3412U_EQ_3412U(...) \,
-#define Z_IS_3413_EQ_3413(...)   \,
-#define Z_IS_3413U_EQ_3413(...)  \,
-#define Z_IS_3413_EQ_3413U(...)  \,
-#define Z_IS_3413U_EQ_3413U(...) \,
-#define Z_IS_3414_EQ_3414(...)   \,
-#define Z_IS_3414U_EQ_3414(...)  \,
-#define Z_IS_3414_EQ_3414U(...)  \,
-#define Z_IS_3414U_EQ_3414U(...) \,
-#define Z_IS_3415_EQ_3415(...)   \,
-#define Z_IS_3415U_EQ_3415(...)  \,
-#define Z_IS_3415_EQ_3415U(...)  \,
-#define Z_IS_3415U_EQ_3415U(...) \,
-#define Z_IS_3416_EQ_3416(...)   \,
-#define Z_IS_3416U_EQ_3416(...)  \,
-#define Z_IS_3416_EQ_3416U(...)  \,
-#define Z_IS_3416U_EQ_3416U(...) \,
-#define Z_IS_3417_EQ_3417(...)   \,
-#define Z_IS_3417U_EQ_3417(...)  \,
-#define Z_IS_3417_EQ_3417U(...)  \,
-#define Z_IS_3417U_EQ_3417U(...) \,
-#define Z_IS_3418_EQ_3418(...)   \,
-#define Z_IS_3418U_EQ_3418(...)  \,
-#define Z_IS_3418_EQ_3418U(...)  \,
-#define Z_IS_3418U_EQ_3418U(...) \,
-#define Z_IS_3419_EQ_3419(...)   \,
-#define Z_IS_3419U_EQ_3419(...)  \,
-#define Z_IS_3419_EQ_3419U(...)  \,
-#define Z_IS_3419U_EQ_3419U(...) \,
-#define Z_IS_3420_EQ_3420(...)   \,
-#define Z_IS_3420U_EQ_3420(...)  \,
-#define Z_IS_3420_EQ_3420U(...)  \,
-#define Z_IS_3420U_EQ_3420U(...) \,
-#define Z_IS_3421_EQ_3421(...)   \,
-#define Z_IS_3421U_EQ_3421(...)  \,
-#define Z_IS_3421_EQ_3421U(...)  \,
-#define Z_IS_3421U_EQ_3421U(...) \,
-#define Z_IS_3422_EQ_3422(...)   \,
-#define Z_IS_3422U_EQ_3422(...)  \,
-#define Z_IS_3422_EQ_3422U(...)  \,
-#define Z_IS_3422U_EQ_3422U(...) \,
-#define Z_IS_3423_EQ_3423(...)   \,
-#define Z_IS_3423U_EQ_3423(...)  \,
-#define Z_IS_3423_EQ_3423U(...)  \,
-#define Z_IS_3423U_EQ_3423U(...) \,
-#define Z_IS_3424_EQ_3424(...)   \,
-#define Z_IS_3424U_EQ_3424(...)  \,
-#define Z_IS_3424_EQ_3424U(...)  \,
-#define Z_IS_3424U_EQ_3424U(...) \,
-#define Z_IS_3425_EQ_3425(...)   \,
-#define Z_IS_3425U_EQ_3425(...)  \,
-#define Z_IS_3425_EQ_3425U(...)  \,
-#define Z_IS_3425U_EQ_3425U(...) \,
-#define Z_IS_3426_EQ_3426(...)   \,
-#define Z_IS_3426U_EQ_3426(...)  \,
-#define Z_IS_3426_EQ_3426U(...)  \,
-#define Z_IS_3426U_EQ_3426U(...) \,
-#define Z_IS_3427_EQ_3427(...)   \,
-#define Z_IS_3427U_EQ_3427(...)  \,
-#define Z_IS_3427_EQ_3427U(...)  \,
-#define Z_IS_3427U_EQ_3427U(...) \,
-#define Z_IS_3428_EQ_3428(...)   \,
-#define Z_IS_3428U_EQ_3428(...)  \,
-#define Z_IS_3428_EQ_3428U(...)  \,
-#define Z_IS_3428U_EQ_3428U(...) \,
-#define Z_IS_3429_EQ_3429(...)   \,
-#define Z_IS_3429U_EQ_3429(...)  \,
-#define Z_IS_3429_EQ_3429U(...)  \,
-#define Z_IS_3429U_EQ_3429U(...) \,
-#define Z_IS_3430_EQ_3430(...)   \,
-#define Z_IS_3430U_EQ_3430(...)  \,
-#define Z_IS_3430_EQ_3430U(...)  \,
-#define Z_IS_3430U_EQ_3430U(...) \,
-#define Z_IS_3431_EQ_3431(...)   \,
-#define Z_IS_3431U_EQ_3431(...)  \,
-#define Z_IS_3431_EQ_3431U(...)  \,
-#define Z_IS_3431U_EQ_3431U(...) \,
-#define Z_IS_3432_EQ_3432(...)   \,
-#define Z_IS_3432U_EQ_3432(...)  \,
-#define Z_IS_3432_EQ_3432U(...)  \,
-#define Z_IS_3432U_EQ_3432U(...) \,
-#define Z_IS_3433_EQ_3433(...)   \,
-#define Z_IS_3433U_EQ_3433(...)  \,
-#define Z_IS_3433_EQ_3433U(...)  \,
-#define Z_IS_3433U_EQ_3433U(...) \,
-#define Z_IS_3434_EQ_3434(...)   \,
-#define Z_IS_3434U_EQ_3434(...)  \,
-#define Z_IS_3434_EQ_3434U(...)  \,
-#define Z_IS_3434U_EQ_3434U(...) \,
-#define Z_IS_3435_EQ_3435(...)   \,
-#define Z_IS_3435U_EQ_3435(...)  \,
-#define Z_IS_3435_EQ_3435U(...)  \,
-#define Z_IS_3435U_EQ_3435U(...) \,
-#define Z_IS_3436_EQ_3436(...)   \,
-#define Z_IS_3436U_EQ_3436(...)  \,
-#define Z_IS_3436_EQ_3436U(...)  \,
-#define Z_IS_3436U_EQ_3436U(...) \,
-#define Z_IS_3437_EQ_3437(...)   \,
-#define Z_IS_3437U_EQ_3437(...)  \,
-#define Z_IS_3437_EQ_3437U(...)  \,
-#define Z_IS_3437U_EQ_3437U(...) \,
-#define Z_IS_3438_EQ_3438(...)   \,
-#define Z_IS_3438U_EQ_3438(...)  \,
-#define Z_IS_3438_EQ_3438U(...)  \,
-#define Z_IS_3438U_EQ_3438U(...) \,
-#define Z_IS_3439_EQ_3439(...)   \,
-#define Z_IS_3439U_EQ_3439(...)  \,
-#define Z_IS_3439_EQ_3439U(...)  \,
-#define Z_IS_3439U_EQ_3439U(...) \,
-#define Z_IS_3440_EQ_3440(...)   \,
-#define Z_IS_3440U_EQ_3440(...)  \,
-#define Z_IS_3440_EQ_3440U(...)  \,
-#define Z_IS_3440U_EQ_3440U(...) \,
-#define Z_IS_3441_EQ_3441(...)   \,
-#define Z_IS_3441U_EQ_3441(...)  \,
-#define Z_IS_3441_EQ_3441U(...)  \,
-#define Z_IS_3441U_EQ_3441U(...) \,
-#define Z_IS_3442_EQ_3442(...)   \,
-#define Z_IS_3442U_EQ_3442(...)  \,
-#define Z_IS_3442_EQ_3442U(...)  \,
-#define Z_IS_3442U_EQ_3442U(...) \,
-#define Z_IS_3443_EQ_3443(...)   \,
-#define Z_IS_3443U_EQ_3443(...)  \,
-#define Z_IS_3443_EQ_3443U(...)  \,
-#define Z_IS_3443U_EQ_3443U(...) \,
-#define Z_IS_3444_EQ_3444(...)   \,
-#define Z_IS_3444U_EQ_3444(...)  \,
-#define Z_IS_3444_EQ_3444U(...)  \,
-#define Z_IS_3444U_EQ_3444U(...) \,
-#define Z_IS_3445_EQ_3445(...)   \,
-#define Z_IS_3445U_EQ_3445(...)  \,
-#define Z_IS_3445_EQ_3445U(...)  \,
-#define Z_IS_3445U_EQ_3445U(...) \,
-#define Z_IS_3446_EQ_3446(...)   \,
-#define Z_IS_3446U_EQ_3446(...)  \,
-#define Z_IS_3446_EQ_3446U(...)  \,
-#define Z_IS_3446U_EQ_3446U(...) \,
-#define Z_IS_3447_EQ_3447(...)   \,
-#define Z_IS_3447U_EQ_3447(...)  \,
-#define Z_IS_3447_EQ_3447U(...)  \,
-#define Z_IS_3447U_EQ_3447U(...) \,
-#define Z_IS_3448_EQ_3448(...)   \,
-#define Z_IS_3448U_EQ_3448(...)  \,
-#define Z_IS_3448_EQ_3448U(...)  \,
-#define Z_IS_3448U_EQ_3448U(...) \,
-#define Z_IS_3449_EQ_3449(...)   \,
-#define Z_IS_3449U_EQ_3449(...)  \,
-#define Z_IS_3449_EQ_3449U(...)  \,
-#define Z_IS_3449U_EQ_3449U(...) \,
-#define Z_IS_3450_EQ_3450(...)   \,
-#define Z_IS_3450U_EQ_3450(...)  \,
-#define Z_IS_3450_EQ_3450U(...)  \,
-#define Z_IS_3450U_EQ_3450U(...) \,
-#define Z_IS_3451_EQ_3451(...)   \,
-#define Z_IS_3451U_EQ_3451(...)  \,
-#define Z_IS_3451_EQ_3451U(...)  \,
-#define Z_IS_3451U_EQ_3451U(...) \,
-#define Z_IS_3452_EQ_3452(...)   \,
-#define Z_IS_3452U_EQ_3452(...)  \,
-#define Z_IS_3452_EQ_3452U(...)  \,
-#define Z_IS_3452U_EQ_3452U(...) \,
-#define Z_IS_3453_EQ_3453(...)   \,
-#define Z_IS_3453U_EQ_3453(...)  \,
-#define Z_IS_3453_EQ_3453U(...)  \,
-#define Z_IS_3453U_EQ_3453U(...) \,
-#define Z_IS_3454_EQ_3454(...)   \,
-#define Z_IS_3454U_EQ_3454(...)  \,
-#define Z_IS_3454_EQ_3454U(...)  \,
-#define Z_IS_3454U_EQ_3454U(...) \,
-#define Z_IS_3455_EQ_3455(...)   \,
-#define Z_IS_3455U_EQ_3455(...)  \,
-#define Z_IS_3455_EQ_3455U(...)  \,
-#define Z_IS_3455U_EQ_3455U(...) \,
-#define Z_IS_3456_EQ_3456(...)   \,
-#define Z_IS_3456U_EQ_3456(...)  \,
-#define Z_IS_3456_EQ_3456U(...)  \,
-#define Z_IS_3456U_EQ_3456U(...) \,
-#define Z_IS_3457_EQ_3457(...)   \,
-#define Z_IS_3457U_EQ_3457(...)  \,
-#define Z_IS_3457_EQ_3457U(...)  \,
-#define Z_IS_3457U_EQ_3457U(...) \,
-#define Z_IS_3458_EQ_3458(...)   \,
-#define Z_IS_3458U_EQ_3458(...)  \,
-#define Z_IS_3458_EQ_3458U(...)  \,
-#define Z_IS_3458U_EQ_3458U(...) \,
-#define Z_IS_3459_EQ_3459(...)   \,
-#define Z_IS_3459U_EQ_3459(...)  \,
-#define Z_IS_3459_EQ_3459U(...)  \,
-#define Z_IS_3459U_EQ_3459U(...) \,
-#define Z_IS_3460_EQ_3460(...)   \,
-#define Z_IS_3460U_EQ_3460(...)  \,
-#define Z_IS_3460_EQ_3460U(...)  \,
-#define Z_IS_3460U_EQ_3460U(...) \,
-#define Z_IS_3461_EQ_3461(...)   \,
-#define Z_IS_3461U_EQ_3461(...)  \,
-#define Z_IS_3461_EQ_3461U(...)  \,
-#define Z_IS_3461U_EQ_3461U(...) \,
-#define Z_IS_3462_EQ_3462(...)   \,
-#define Z_IS_3462U_EQ_3462(...)  \,
-#define Z_IS_3462_EQ_3462U(...)  \,
-#define Z_IS_3462U_EQ_3462U(...) \,
-#define Z_IS_3463_EQ_3463(...)   \,
-#define Z_IS_3463U_EQ_3463(...)  \,
-#define Z_IS_3463_EQ_3463U(...)  \,
-#define Z_IS_3463U_EQ_3463U(...) \,
-#define Z_IS_3464_EQ_3464(...)   \,
-#define Z_IS_3464U_EQ_3464(...)  \,
-#define Z_IS_3464_EQ_3464U(...)  \,
-#define Z_IS_3464U_EQ_3464U(...) \,
-#define Z_IS_3465_EQ_3465(...)   \,
-#define Z_IS_3465U_EQ_3465(...)  \,
-#define Z_IS_3465_EQ_3465U(...)  \,
-#define Z_IS_3465U_EQ_3465U(...) \,
-#define Z_IS_3466_EQ_3466(...)   \,
-#define Z_IS_3466U_EQ_3466(...)  \,
-#define Z_IS_3466_EQ_3466U(...)  \,
-#define Z_IS_3466U_EQ_3466U(...) \,
-#define Z_IS_3467_EQ_3467(...)   \,
-#define Z_IS_3467U_EQ_3467(...)  \,
-#define Z_IS_3467_EQ_3467U(...)  \,
-#define Z_IS_3467U_EQ_3467U(...) \,
-#define Z_IS_3468_EQ_3468(...)   \,
-#define Z_IS_3468U_EQ_3468(...)  \,
-#define Z_IS_3468_EQ_3468U(...)  \,
-#define Z_IS_3468U_EQ_3468U(...) \,
-#define Z_IS_3469_EQ_3469(...)   \,
-#define Z_IS_3469U_EQ_3469(...)  \,
-#define Z_IS_3469_EQ_3469U(...)  \,
-#define Z_IS_3469U_EQ_3469U(...) \,
-#define Z_IS_3470_EQ_3470(...)   \,
-#define Z_IS_3470U_EQ_3470(...)  \,
-#define Z_IS_3470_EQ_3470U(...)  \,
-#define Z_IS_3470U_EQ_3470U(...) \,
-#define Z_IS_3471_EQ_3471(...)   \,
-#define Z_IS_3471U_EQ_3471(...)  \,
-#define Z_IS_3471_EQ_3471U(...)  \,
-#define Z_IS_3471U_EQ_3471U(...) \,
-#define Z_IS_3472_EQ_3472(...)   \,
-#define Z_IS_3472U_EQ_3472(...)  \,
-#define Z_IS_3472_EQ_3472U(...)  \,
-#define Z_IS_3472U_EQ_3472U(...) \,
-#define Z_IS_3473_EQ_3473(...)   \,
-#define Z_IS_3473U_EQ_3473(...)  \,
-#define Z_IS_3473_EQ_3473U(...)  \,
-#define Z_IS_3473U_EQ_3473U(...) \,
-#define Z_IS_3474_EQ_3474(...)   \,
-#define Z_IS_3474U_EQ_3474(...)  \,
-#define Z_IS_3474_EQ_3474U(...)  \,
-#define Z_IS_3474U_EQ_3474U(...) \,
-#define Z_IS_3475_EQ_3475(...)   \,
-#define Z_IS_3475U_EQ_3475(...)  \,
-#define Z_IS_3475_EQ_3475U(...)  \,
-#define Z_IS_3475U_EQ_3475U(...) \,
-#define Z_IS_3476_EQ_3476(...)   \,
-#define Z_IS_3476U_EQ_3476(...)  \,
-#define Z_IS_3476_EQ_3476U(...)  \,
-#define Z_IS_3476U_EQ_3476U(...) \,
-#define Z_IS_3477_EQ_3477(...)   \,
-#define Z_IS_3477U_EQ_3477(...)  \,
-#define Z_IS_3477_EQ_3477U(...)  \,
-#define Z_IS_3477U_EQ_3477U(...) \,
-#define Z_IS_3478_EQ_3478(...)   \,
-#define Z_IS_3478U_EQ_3478(...)  \,
-#define Z_IS_3478_EQ_3478U(...)  \,
-#define Z_IS_3478U_EQ_3478U(...) \,
-#define Z_IS_3479_EQ_3479(...)   \,
-#define Z_IS_3479U_EQ_3479(...)  \,
-#define Z_IS_3479_EQ_3479U(...)  \,
-#define Z_IS_3479U_EQ_3479U(...) \,
-#define Z_IS_3480_EQ_3480(...)   \,
-#define Z_IS_3480U_EQ_3480(...)  \,
-#define Z_IS_3480_EQ_3480U(...)  \,
-#define Z_IS_3480U_EQ_3480U(...) \,
-#define Z_IS_3481_EQ_3481(...)   \,
-#define Z_IS_3481U_EQ_3481(...)  \,
-#define Z_IS_3481_EQ_3481U(...)  \,
-#define Z_IS_3481U_EQ_3481U(...) \,
-#define Z_IS_3482_EQ_3482(...)   \,
-#define Z_IS_3482U_EQ_3482(...)  \,
-#define Z_IS_3482_EQ_3482U(...)  \,
-#define Z_IS_3482U_EQ_3482U(...) \,
-#define Z_IS_3483_EQ_3483(...)   \,
-#define Z_IS_3483U_EQ_3483(...)  \,
-#define Z_IS_3483_EQ_3483U(...)  \,
-#define Z_IS_3483U_EQ_3483U(...) \,
-#define Z_IS_3484_EQ_3484(...)   \,
-#define Z_IS_3484U_EQ_3484(...)  \,
-#define Z_IS_3484_EQ_3484U(...)  \,
-#define Z_IS_3484U_EQ_3484U(...) \,
-#define Z_IS_3485_EQ_3485(...)   \,
-#define Z_IS_3485U_EQ_3485(...)  \,
-#define Z_IS_3485_EQ_3485U(...)  \,
-#define Z_IS_3485U_EQ_3485U(...) \,
-#define Z_IS_3486_EQ_3486(...)   \,
-#define Z_IS_3486U_EQ_3486(...)  \,
-#define Z_IS_3486_EQ_3486U(...)  \,
-#define Z_IS_3486U_EQ_3486U(...) \,
-#define Z_IS_3487_EQ_3487(...)   \,
-#define Z_IS_3487U_EQ_3487(...)  \,
-#define Z_IS_3487_EQ_3487U(...)  \,
-#define Z_IS_3487U_EQ_3487U(...) \,
-#define Z_IS_3488_EQ_3488(...)   \,
-#define Z_IS_3488U_EQ_3488(...)  \,
-#define Z_IS_3488_EQ_3488U(...)  \,
-#define Z_IS_3488U_EQ_3488U(...) \,
-#define Z_IS_3489_EQ_3489(...)   \,
-#define Z_IS_3489U_EQ_3489(...)  \,
-#define Z_IS_3489_EQ_3489U(...)  \,
-#define Z_IS_3489U_EQ_3489U(...) \,
-#define Z_IS_3490_EQ_3490(...)   \,
-#define Z_IS_3490U_EQ_3490(...)  \,
-#define Z_IS_3490_EQ_3490U(...)  \,
-#define Z_IS_3490U_EQ_3490U(...) \,
-#define Z_IS_3491_EQ_3491(...)   \,
-#define Z_IS_3491U_EQ_3491(...)  \,
-#define Z_IS_3491_EQ_3491U(...)  \,
-#define Z_IS_3491U_EQ_3491U(...) \,
-#define Z_IS_3492_EQ_3492(...)   \,
-#define Z_IS_3492U_EQ_3492(...)  \,
-#define Z_IS_3492_EQ_3492U(...)  \,
-#define Z_IS_3492U_EQ_3492U(...) \,
-#define Z_IS_3493_EQ_3493(...)   \,
-#define Z_IS_3493U_EQ_3493(...)  \,
-#define Z_IS_3493_EQ_3493U(...)  \,
-#define Z_IS_3493U_EQ_3493U(...) \,
-#define Z_IS_3494_EQ_3494(...)   \,
-#define Z_IS_3494U_EQ_3494(...)  \,
-#define Z_IS_3494_EQ_3494U(...)  \,
-#define Z_IS_3494U_EQ_3494U(...) \,
-#define Z_IS_3495_EQ_3495(...)   \,
-#define Z_IS_3495U_EQ_3495(...)  \,
-#define Z_IS_3495_EQ_3495U(...)  \,
-#define Z_IS_3495U_EQ_3495U(...) \,
-#define Z_IS_3496_EQ_3496(...)   \,
-#define Z_IS_3496U_EQ_3496(...)  \,
-#define Z_IS_3496_EQ_3496U(...)  \,
-#define Z_IS_3496U_EQ_3496U(...) \,
-#define Z_IS_3497_EQ_3497(...)   \,
-#define Z_IS_3497U_EQ_3497(...)  \,
-#define Z_IS_3497_EQ_3497U(...)  \,
-#define Z_IS_3497U_EQ_3497U(...) \,
-#define Z_IS_3498_EQ_3498(...)   \,
-#define Z_IS_3498U_EQ_3498(...)  \,
-#define Z_IS_3498_EQ_3498U(...)  \,
-#define Z_IS_3498U_EQ_3498U(...) \,
-#define Z_IS_3499_EQ_3499(...)   \,
-#define Z_IS_3499U_EQ_3499(...)  \,
-#define Z_IS_3499_EQ_3499U(...)  \,
-#define Z_IS_3499U_EQ_3499U(...) \,
-#define Z_IS_3500_EQ_3500(...)   \,
-#define Z_IS_3500U_EQ_3500(...)  \,
-#define Z_IS_3500_EQ_3500U(...)  \,
-#define Z_IS_3500U_EQ_3500U(...) \,
-#define Z_IS_3501_EQ_3501(...)   \,
-#define Z_IS_3501U_EQ_3501(...)  \,
-#define Z_IS_3501_EQ_3501U(...)  \,
-#define Z_IS_3501U_EQ_3501U(...) \,
-#define Z_IS_3502_EQ_3502(...)   \,
-#define Z_IS_3502U_EQ_3502(...)  \,
-#define Z_IS_3502_EQ_3502U(...)  \,
-#define Z_IS_3502U_EQ_3502U(...) \,
-#define Z_IS_3503_EQ_3503(...)   \,
-#define Z_IS_3503U_EQ_3503(...)  \,
-#define Z_IS_3503_EQ_3503U(...)  \,
-#define Z_IS_3503U_EQ_3503U(...) \,
-#define Z_IS_3504_EQ_3504(...)   \,
-#define Z_IS_3504U_EQ_3504(...)  \,
-#define Z_IS_3504_EQ_3504U(...)  \,
-#define Z_IS_3504U_EQ_3504U(...) \,
-#define Z_IS_3505_EQ_3505(...)   \,
-#define Z_IS_3505U_EQ_3505(...)  \,
-#define Z_IS_3505_EQ_3505U(...)  \,
-#define Z_IS_3505U_EQ_3505U(...) \,
-#define Z_IS_3506_EQ_3506(...)   \,
-#define Z_IS_3506U_EQ_3506(...)  \,
-#define Z_IS_3506_EQ_3506U(...)  \,
-#define Z_IS_3506U_EQ_3506U(...) \,
-#define Z_IS_3507_EQ_3507(...)   \,
-#define Z_IS_3507U_EQ_3507(...)  \,
-#define Z_IS_3507_EQ_3507U(...)  \,
-#define Z_IS_3507U_EQ_3507U(...) \,
-#define Z_IS_3508_EQ_3508(...)   \,
-#define Z_IS_3508U_EQ_3508(...)  \,
-#define Z_IS_3508_EQ_3508U(...)  \,
-#define Z_IS_3508U_EQ_3508U(...) \,
-#define Z_IS_3509_EQ_3509(...)   \,
-#define Z_IS_3509U_EQ_3509(...)  \,
-#define Z_IS_3509_EQ_3509U(...)  \,
-#define Z_IS_3509U_EQ_3509U(...) \,
-#define Z_IS_3510_EQ_3510(...)   \,
-#define Z_IS_3510U_EQ_3510(...)  \,
-#define Z_IS_3510_EQ_3510U(...)  \,
-#define Z_IS_3510U_EQ_3510U(...) \,
-#define Z_IS_3511_EQ_3511(...)   \,
-#define Z_IS_3511U_EQ_3511(...)  \,
-#define Z_IS_3511_EQ_3511U(...)  \,
-#define Z_IS_3511U_EQ_3511U(...) \,
-#define Z_IS_3512_EQ_3512(...)   \,
-#define Z_IS_3512U_EQ_3512(...)  \,
-#define Z_IS_3512_EQ_3512U(...)  \,
-#define Z_IS_3512U_EQ_3512U(...) \,
-#define Z_IS_3513_EQ_3513(...)   \,
-#define Z_IS_3513U_EQ_3513(...)  \,
-#define Z_IS_3513_EQ_3513U(...)  \,
-#define Z_IS_3513U_EQ_3513U(...) \,
-#define Z_IS_3514_EQ_3514(...)   \,
-#define Z_IS_3514U_EQ_3514(...)  \,
-#define Z_IS_3514_EQ_3514U(...)  \,
-#define Z_IS_3514U_EQ_3514U(...) \,
-#define Z_IS_3515_EQ_3515(...)   \,
-#define Z_IS_3515U_EQ_3515(...)  \,
-#define Z_IS_3515_EQ_3515U(...)  \,
-#define Z_IS_3515U_EQ_3515U(...) \,
-#define Z_IS_3516_EQ_3516(...)   \,
-#define Z_IS_3516U_EQ_3516(...)  \,
-#define Z_IS_3516_EQ_3516U(...)  \,
-#define Z_IS_3516U_EQ_3516U(...) \,
-#define Z_IS_3517_EQ_3517(...)   \,
-#define Z_IS_3517U_EQ_3517(...)  \,
-#define Z_IS_3517_EQ_3517U(...)  \,
-#define Z_IS_3517U_EQ_3517U(...) \,
-#define Z_IS_3518_EQ_3518(...)   \,
-#define Z_IS_3518U_EQ_3518(...)  \,
-#define Z_IS_3518_EQ_3518U(...)  \,
-#define Z_IS_3518U_EQ_3518U(...) \,
-#define Z_IS_3519_EQ_3519(...)   \,
-#define Z_IS_3519U_EQ_3519(...)  \,
-#define Z_IS_3519_EQ_3519U(...)  \,
-#define Z_IS_3519U_EQ_3519U(...) \,
-#define Z_IS_3520_EQ_3520(...)   \,
-#define Z_IS_3520U_EQ_3520(...)  \,
-#define Z_IS_3520_EQ_3520U(...)  \,
-#define Z_IS_3520U_EQ_3520U(...) \,
-#define Z_IS_3521_EQ_3521(...)   \,
-#define Z_IS_3521U_EQ_3521(...)  \,
-#define Z_IS_3521_EQ_3521U(...)  \,
-#define Z_IS_3521U_EQ_3521U(...) \,
-#define Z_IS_3522_EQ_3522(...)   \,
-#define Z_IS_3522U_EQ_3522(...)  \,
-#define Z_IS_3522_EQ_3522U(...)  \,
-#define Z_IS_3522U_EQ_3522U(...) \,
-#define Z_IS_3523_EQ_3523(...)   \,
-#define Z_IS_3523U_EQ_3523(...)  \,
-#define Z_IS_3523_EQ_3523U(...)  \,
-#define Z_IS_3523U_EQ_3523U(...) \,
-#define Z_IS_3524_EQ_3524(...)   \,
-#define Z_IS_3524U_EQ_3524(...)  \,
-#define Z_IS_3524_EQ_3524U(...)  \,
-#define Z_IS_3524U_EQ_3524U(...) \,
-#define Z_IS_3525_EQ_3525(...)   \,
-#define Z_IS_3525U_EQ_3525(...)  \,
-#define Z_IS_3525_EQ_3525U(...)  \,
-#define Z_IS_3525U_EQ_3525U(...) \,
-#define Z_IS_3526_EQ_3526(...)   \,
-#define Z_IS_3526U_EQ_3526(...)  \,
-#define Z_IS_3526_EQ_3526U(...)  \,
-#define Z_IS_3526U_EQ_3526U(...) \,
-#define Z_IS_3527_EQ_3527(...)   \,
-#define Z_IS_3527U_EQ_3527(...)  \,
-#define Z_IS_3527_EQ_3527U(...)  \,
-#define Z_IS_3527U_EQ_3527U(...) \,
-#define Z_IS_3528_EQ_3528(...)   \,
-#define Z_IS_3528U_EQ_3528(...)  \,
-#define Z_IS_3528_EQ_3528U(...)  \,
-#define Z_IS_3528U_EQ_3528U(...) \,
-#define Z_IS_3529_EQ_3529(...)   \,
-#define Z_IS_3529U_EQ_3529(...)  \,
-#define Z_IS_3529_EQ_3529U(...)  \,
-#define Z_IS_3529U_EQ_3529U(...) \,
-#define Z_IS_3530_EQ_3530(...)   \,
-#define Z_IS_3530U_EQ_3530(...)  \,
-#define Z_IS_3530_EQ_3530U(...)  \,
-#define Z_IS_3530U_EQ_3530U(...) \,
-#define Z_IS_3531_EQ_3531(...)   \,
-#define Z_IS_3531U_EQ_3531(...)  \,
-#define Z_IS_3531_EQ_3531U(...)  \,
-#define Z_IS_3531U_EQ_3531U(...) \,
-#define Z_IS_3532_EQ_3532(...)   \,
-#define Z_IS_3532U_EQ_3532(...)  \,
-#define Z_IS_3532_EQ_3532U(...)  \,
-#define Z_IS_3532U_EQ_3532U(...) \,
-#define Z_IS_3533_EQ_3533(...)   \,
-#define Z_IS_3533U_EQ_3533(...)  \,
-#define Z_IS_3533_EQ_3533U(...)  \,
-#define Z_IS_3533U_EQ_3533U(...) \,
-#define Z_IS_3534_EQ_3534(...)   \,
-#define Z_IS_3534U_EQ_3534(...)  \,
-#define Z_IS_3534_EQ_3534U(...)  \,
-#define Z_IS_3534U_EQ_3534U(...) \,
-#define Z_IS_3535_EQ_3535(...)   \,
-#define Z_IS_3535U_EQ_3535(...)  \,
-#define Z_IS_3535_EQ_3535U(...)  \,
-#define Z_IS_3535U_EQ_3535U(...) \,
-#define Z_IS_3536_EQ_3536(...)   \,
-#define Z_IS_3536U_EQ_3536(...)  \,
-#define Z_IS_3536_EQ_3536U(...)  \,
-#define Z_IS_3536U_EQ_3536U(...) \,
-#define Z_IS_3537_EQ_3537(...)   \,
-#define Z_IS_3537U_EQ_3537(...)  \,
-#define Z_IS_3537_EQ_3537U(...)  \,
-#define Z_IS_3537U_EQ_3537U(...) \,
-#define Z_IS_3538_EQ_3538(...)   \,
-#define Z_IS_3538U_EQ_3538(...)  \,
-#define Z_IS_3538_EQ_3538U(...)  \,
-#define Z_IS_3538U_EQ_3538U(...) \,
-#define Z_IS_3539_EQ_3539(...)   \,
-#define Z_IS_3539U_EQ_3539(...)  \,
-#define Z_IS_3539_EQ_3539U(...)  \,
-#define Z_IS_3539U_EQ_3539U(...) \,
-#define Z_IS_3540_EQ_3540(...)   \,
-#define Z_IS_3540U_EQ_3540(...)  \,
-#define Z_IS_3540_EQ_3540U(...)  \,
-#define Z_IS_3540U_EQ_3540U(...) \,
-#define Z_IS_3541_EQ_3541(...)   \,
-#define Z_IS_3541U_EQ_3541(...)  \,
-#define Z_IS_3541_EQ_3541U(...)  \,
-#define Z_IS_3541U_EQ_3541U(...) \,
-#define Z_IS_3542_EQ_3542(...)   \,
-#define Z_IS_3542U_EQ_3542(...)  \,
-#define Z_IS_3542_EQ_3542U(...)  \,
-#define Z_IS_3542U_EQ_3542U(...) \,
-#define Z_IS_3543_EQ_3543(...)   \,
-#define Z_IS_3543U_EQ_3543(...)  \,
-#define Z_IS_3543_EQ_3543U(...)  \,
-#define Z_IS_3543U_EQ_3543U(...) \,
-#define Z_IS_3544_EQ_3544(...)   \,
-#define Z_IS_3544U_EQ_3544(...)  \,
-#define Z_IS_3544_EQ_3544U(...)  \,
-#define Z_IS_3544U_EQ_3544U(...) \,
-#define Z_IS_3545_EQ_3545(...)   \,
-#define Z_IS_3545U_EQ_3545(...)  \,
-#define Z_IS_3545_EQ_3545U(...)  \,
-#define Z_IS_3545U_EQ_3545U(...) \,
-#define Z_IS_3546_EQ_3546(...)   \,
-#define Z_IS_3546U_EQ_3546(...)  \,
-#define Z_IS_3546_EQ_3546U(...)  \,
-#define Z_IS_3546U_EQ_3546U(...) \,
-#define Z_IS_3547_EQ_3547(...)   \,
-#define Z_IS_3547U_EQ_3547(...)  \,
-#define Z_IS_3547_EQ_3547U(...)  \,
-#define Z_IS_3547U_EQ_3547U(...) \,
-#define Z_IS_3548_EQ_3548(...)   \,
-#define Z_IS_3548U_EQ_3548(...)  \,
-#define Z_IS_3548_EQ_3548U(...)  \,
-#define Z_IS_3548U_EQ_3548U(...) \,
-#define Z_IS_3549_EQ_3549(...)   \,
-#define Z_IS_3549U_EQ_3549(...)  \,
-#define Z_IS_3549_EQ_3549U(...)  \,
-#define Z_IS_3549U_EQ_3549U(...) \,
-#define Z_IS_3550_EQ_3550(...)   \,
-#define Z_IS_3550U_EQ_3550(...)  \,
-#define Z_IS_3550_EQ_3550U(...)  \,
-#define Z_IS_3550U_EQ_3550U(...) \,
-#define Z_IS_3551_EQ_3551(...)   \,
-#define Z_IS_3551U_EQ_3551(...)  \,
-#define Z_IS_3551_EQ_3551U(...)  \,
-#define Z_IS_3551U_EQ_3551U(...) \,
-#define Z_IS_3552_EQ_3552(...)   \,
-#define Z_IS_3552U_EQ_3552(...)  \,
-#define Z_IS_3552_EQ_3552U(...)  \,
-#define Z_IS_3552U_EQ_3552U(...) \,
-#define Z_IS_3553_EQ_3553(...)   \,
-#define Z_IS_3553U_EQ_3553(...)  \,
-#define Z_IS_3553_EQ_3553U(...)  \,
-#define Z_IS_3553U_EQ_3553U(...) \,
-#define Z_IS_3554_EQ_3554(...)   \,
-#define Z_IS_3554U_EQ_3554(...)  \,
-#define Z_IS_3554_EQ_3554U(...)  \,
-#define Z_IS_3554U_EQ_3554U(...) \,
-#define Z_IS_3555_EQ_3555(...)   \,
-#define Z_IS_3555U_EQ_3555(...)  \,
-#define Z_IS_3555_EQ_3555U(...)  \,
-#define Z_IS_3555U_EQ_3555U(...) \,
-#define Z_IS_3556_EQ_3556(...)   \,
-#define Z_IS_3556U_EQ_3556(...)  \,
-#define Z_IS_3556_EQ_3556U(...)  \,
-#define Z_IS_3556U_EQ_3556U(...) \,
-#define Z_IS_3557_EQ_3557(...)   \,
-#define Z_IS_3557U_EQ_3557(...)  \,
-#define Z_IS_3557_EQ_3557U(...)  \,
-#define Z_IS_3557U_EQ_3557U(...) \,
-#define Z_IS_3558_EQ_3558(...)   \,
-#define Z_IS_3558U_EQ_3558(...)  \,
-#define Z_IS_3558_EQ_3558U(...)  \,
-#define Z_IS_3558U_EQ_3558U(...) \,
-#define Z_IS_3559_EQ_3559(...)   \,
-#define Z_IS_3559U_EQ_3559(...)  \,
-#define Z_IS_3559_EQ_3559U(...)  \,
-#define Z_IS_3559U_EQ_3559U(...) \,
-#define Z_IS_3560_EQ_3560(...)   \,
-#define Z_IS_3560U_EQ_3560(...)  \,
-#define Z_IS_3560_EQ_3560U(...)  \,
-#define Z_IS_3560U_EQ_3560U(...) \,
-#define Z_IS_3561_EQ_3561(...)   \,
-#define Z_IS_3561U_EQ_3561(...)  \,
-#define Z_IS_3561_EQ_3561U(...)  \,
-#define Z_IS_3561U_EQ_3561U(...) \,
-#define Z_IS_3562_EQ_3562(...)   \,
-#define Z_IS_3562U_EQ_3562(...)  \,
-#define Z_IS_3562_EQ_3562U(...)  \,
-#define Z_IS_3562U_EQ_3562U(...) \,
-#define Z_IS_3563_EQ_3563(...)   \,
-#define Z_IS_3563U_EQ_3563(...)  \,
-#define Z_IS_3563_EQ_3563U(...)  \,
-#define Z_IS_3563U_EQ_3563U(...) \,
-#define Z_IS_3564_EQ_3564(...)   \,
-#define Z_IS_3564U_EQ_3564(...)  \,
-#define Z_IS_3564_EQ_3564U(...)  \,
-#define Z_IS_3564U_EQ_3564U(...) \,
-#define Z_IS_3565_EQ_3565(...)   \,
-#define Z_IS_3565U_EQ_3565(...)  \,
-#define Z_IS_3565_EQ_3565U(...)  \,
-#define Z_IS_3565U_EQ_3565U(...) \,
-#define Z_IS_3566_EQ_3566(...)   \,
-#define Z_IS_3566U_EQ_3566(...)  \,
-#define Z_IS_3566_EQ_3566U(...)  \,
-#define Z_IS_3566U_EQ_3566U(...) \,
-#define Z_IS_3567_EQ_3567(...)   \,
-#define Z_IS_3567U_EQ_3567(...)  \,
-#define Z_IS_3567_EQ_3567U(...)  \,
-#define Z_IS_3567U_EQ_3567U(...) \,
-#define Z_IS_3568_EQ_3568(...)   \,
-#define Z_IS_3568U_EQ_3568(...)  \,
-#define Z_IS_3568_EQ_3568U(...)  \,
-#define Z_IS_3568U_EQ_3568U(...) \,
-#define Z_IS_3569_EQ_3569(...)   \,
-#define Z_IS_3569U_EQ_3569(...)  \,
-#define Z_IS_3569_EQ_3569U(...)  \,
-#define Z_IS_3569U_EQ_3569U(...) \,
-#define Z_IS_3570_EQ_3570(...)   \,
-#define Z_IS_3570U_EQ_3570(...)  \,
-#define Z_IS_3570_EQ_3570U(...)  \,
-#define Z_IS_3570U_EQ_3570U(...) \,
-#define Z_IS_3571_EQ_3571(...)   \,
-#define Z_IS_3571U_EQ_3571(...)  \,
-#define Z_IS_3571_EQ_3571U(...)  \,
-#define Z_IS_3571U_EQ_3571U(...) \,
-#define Z_IS_3572_EQ_3572(...)   \,
-#define Z_IS_3572U_EQ_3572(...)  \,
-#define Z_IS_3572_EQ_3572U(...)  \,
-#define Z_IS_3572U_EQ_3572U(...) \,
-#define Z_IS_3573_EQ_3573(...)   \,
-#define Z_IS_3573U_EQ_3573(...)  \,
-#define Z_IS_3573_EQ_3573U(...)  \,
-#define Z_IS_3573U_EQ_3573U(...) \,
-#define Z_IS_3574_EQ_3574(...)   \,
-#define Z_IS_3574U_EQ_3574(...)  \,
-#define Z_IS_3574_EQ_3574U(...)  \,
-#define Z_IS_3574U_EQ_3574U(...) \,
-#define Z_IS_3575_EQ_3575(...)   \,
-#define Z_IS_3575U_EQ_3575(...)  \,
-#define Z_IS_3575_EQ_3575U(...)  \,
-#define Z_IS_3575U_EQ_3575U(...) \,
-#define Z_IS_3576_EQ_3576(...)   \,
-#define Z_IS_3576U_EQ_3576(...)  \,
-#define Z_IS_3576_EQ_3576U(...)  \,
-#define Z_IS_3576U_EQ_3576U(...) \,
-#define Z_IS_3577_EQ_3577(...)   \,
-#define Z_IS_3577U_EQ_3577(...)  \,
-#define Z_IS_3577_EQ_3577U(...)  \,
-#define Z_IS_3577U_EQ_3577U(...) \,
-#define Z_IS_3578_EQ_3578(...)   \,
-#define Z_IS_3578U_EQ_3578(...)  \,
-#define Z_IS_3578_EQ_3578U(...)  \,
-#define Z_IS_3578U_EQ_3578U(...) \,
-#define Z_IS_3579_EQ_3579(...)   \,
-#define Z_IS_3579U_EQ_3579(...)  \,
-#define Z_IS_3579_EQ_3579U(...)  \,
-#define Z_IS_3579U_EQ_3579U(...) \,
-#define Z_IS_3580_EQ_3580(...)   \,
-#define Z_IS_3580U_EQ_3580(...)  \,
-#define Z_IS_3580_EQ_3580U(...)  \,
-#define Z_IS_3580U_EQ_3580U(...) \,
-#define Z_IS_3581_EQ_3581(...)   \,
-#define Z_IS_3581U_EQ_3581(...)  \,
-#define Z_IS_3581_EQ_3581U(...)  \,
-#define Z_IS_3581U_EQ_3581U(...) \,
-#define Z_IS_3582_EQ_3582(...)   \,
-#define Z_IS_3582U_EQ_3582(...)  \,
-#define Z_IS_3582_EQ_3582U(...)  \,
-#define Z_IS_3582U_EQ_3582U(...) \,
-#define Z_IS_3583_EQ_3583(...)   \,
-#define Z_IS_3583U_EQ_3583(...)  \,
-#define Z_IS_3583_EQ_3583U(...)  \,
-#define Z_IS_3583U_EQ_3583U(...) \,
-#define Z_IS_3584_EQ_3584(...)   \,
-#define Z_IS_3584U_EQ_3584(...)  \,
-#define Z_IS_3584_EQ_3584U(...)  \,
-#define Z_IS_3584U_EQ_3584U(...) \,
-#define Z_IS_3585_EQ_3585(...)   \,
-#define Z_IS_3585U_EQ_3585(...)  \,
-#define Z_IS_3585_EQ_3585U(...)  \,
-#define Z_IS_3585U_EQ_3585U(...) \,
-#define Z_IS_3586_EQ_3586(...)   \,
-#define Z_IS_3586U_EQ_3586(...)  \,
-#define Z_IS_3586_EQ_3586U(...)  \,
-#define Z_IS_3586U_EQ_3586U(...) \,
-#define Z_IS_3587_EQ_3587(...)   \,
-#define Z_IS_3587U_EQ_3587(...)  \,
-#define Z_IS_3587_EQ_3587U(...)  \,
-#define Z_IS_3587U_EQ_3587U(...) \,
-#define Z_IS_3588_EQ_3588(...)   \,
-#define Z_IS_3588U_EQ_3588(...)  \,
-#define Z_IS_3588_EQ_3588U(...)  \,
-#define Z_IS_3588U_EQ_3588U(...) \,
-#define Z_IS_3589_EQ_3589(...)   \,
-#define Z_IS_3589U_EQ_3589(...)  \,
-#define Z_IS_3589_EQ_3589U(...)  \,
-#define Z_IS_3589U_EQ_3589U(...) \,
-#define Z_IS_3590_EQ_3590(...)   \,
-#define Z_IS_3590U_EQ_3590(...)  \,
-#define Z_IS_3590_EQ_3590U(...)  \,
-#define Z_IS_3590U_EQ_3590U(...) \,
-#define Z_IS_3591_EQ_3591(...)   \,
-#define Z_IS_3591U_EQ_3591(...)  \,
-#define Z_IS_3591_EQ_3591U(...)  \,
-#define Z_IS_3591U_EQ_3591U(...) \,
-#define Z_IS_3592_EQ_3592(...)   \,
-#define Z_IS_3592U_EQ_3592(...)  \,
-#define Z_IS_3592_EQ_3592U(...)  \,
-#define Z_IS_3592U_EQ_3592U(...) \,
-#define Z_IS_3593_EQ_3593(...)   \,
-#define Z_IS_3593U_EQ_3593(...)  \,
-#define Z_IS_3593_EQ_3593U(...)  \,
-#define Z_IS_3593U_EQ_3593U(...) \,
-#define Z_IS_3594_EQ_3594(...)   \,
-#define Z_IS_3594U_EQ_3594(...)  \,
-#define Z_IS_3594_EQ_3594U(...)  \,
-#define Z_IS_3594U_EQ_3594U(...) \,
-#define Z_IS_3595_EQ_3595(...)   \,
-#define Z_IS_3595U_EQ_3595(...)  \,
-#define Z_IS_3595_EQ_3595U(...)  \,
-#define Z_IS_3595U_EQ_3595U(...) \,
-#define Z_IS_3596_EQ_3596(...)   \,
-#define Z_IS_3596U_EQ_3596(...)  \,
-#define Z_IS_3596_EQ_3596U(...)  \,
-#define Z_IS_3596U_EQ_3596U(...) \,
-#define Z_IS_3597_EQ_3597(...)   \,
-#define Z_IS_3597U_EQ_3597(...)  \,
-#define Z_IS_3597_EQ_3597U(...)  \,
-#define Z_IS_3597U_EQ_3597U(...) \,
-#define Z_IS_3598_EQ_3598(...)   \,
-#define Z_IS_3598U_EQ_3598(...)  \,
-#define Z_IS_3598_EQ_3598U(...)  \,
-#define Z_IS_3598U_EQ_3598U(...) \,
-#define Z_IS_3599_EQ_3599(...)   \,
-#define Z_IS_3599U_EQ_3599(...)  \,
-#define Z_IS_3599_EQ_3599U(...)  \,
-#define Z_IS_3599U_EQ_3599U(...) \,
-#define Z_IS_3600_EQ_3600(...)   \,
-#define Z_IS_3600U_EQ_3600(...)  \,
-#define Z_IS_3600_EQ_3600U(...)  \,
-#define Z_IS_3600U_EQ_3600U(...) \,
-#define Z_IS_3601_EQ_3601(...)   \,
-#define Z_IS_3601U_EQ_3601(...)  \,
-#define Z_IS_3601_EQ_3601U(...)  \,
-#define Z_IS_3601U_EQ_3601U(...) \,
-#define Z_IS_3602_EQ_3602(...)   \,
-#define Z_IS_3602U_EQ_3602(...)  \,
-#define Z_IS_3602_EQ_3602U(...)  \,
-#define Z_IS_3602U_EQ_3602U(...) \,
-#define Z_IS_3603_EQ_3603(...)   \,
-#define Z_IS_3603U_EQ_3603(...)  \,
-#define Z_IS_3603_EQ_3603U(...)  \,
-#define Z_IS_3603U_EQ_3603U(...) \,
-#define Z_IS_3604_EQ_3604(...)   \,
-#define Z_IS_3604U_EQ_3604(...)  \,
-#define Z_IS_3604_EQ_3604U(...)  \,
-#define Z_IS_3604U_EQ_3604U(...) \,
-#define Z_IS_3605_EQ_3605(...)   \,
-#define Z_IS_3605U_EQ_3605(...)  \,
-#define Z_IS_3605_EQ_3605U(...)  \,
-#define Z_IS_3605U_EQ_3605U(...) \,
-#define Z_IS_3606_EQ_3606(...)   \,
-#define Z_IS_3606U_EQ_3606(...)  \,
-#define Z_IS_3606_EQ_3606U(...)  \,
-#define Z_IS_3606U_EQ_3606U(...) \,
-#define Z_IS_3607_EQ_3607(...)   \,
-#define Z_IS_3607U_EQ_3607(...)  \,
-#define Z_IS_3607_EQ_3607U(...)  \,
-#define Z_IS_3607U_EQ_3607U(...) \,
-#define Z_IS_3608_EQ_3608(...)   \,
-#define Z_IS_3608U_EQ_3608(...)  \,
-#define Z_IS_3608_EQ_3608U(...)  \,
-#define Z_IS_3608U_EQ_3608U(...) \,
-#define Z_IS_3609_EQ_3609(...)   \,
-#define Z_IS_3609U_EQ_3609(...)  \,
-#define Z_IS_3609_EQ_3609U(...)  \,
-#define Z_IS_3609U_EQ_3609U(...) \,
-#define Z_IS_3610_EQ_3610(...)   \,
-#define Z_IS_3610U_EQ_3610(...)  \,
-#define Z_IS_3610_EQ_3610U(...)  \,
-#define Z_IS_3610U_EQ_3610U(...) \,
-#define Z_IS_3611_EQ_3611(...)   \,
-#define Z_IS_3611U_EQ_3611(...)  \,
-#define Z_IS_3611_EQ_3611U(...)  \,
-#define Z_IS_3611U_EQ_3611U(...) \,
-#define Z_IS_3612_EQ_3612(...)   \,
-#define Z_IS_3612U_EQ_3612(...)  \,
-#define Z_IS_3612_EQ_3612U(...)  \,
-#define Z_IS_3612U_EQ_3612U(...) \,
-#define Z_IS_3613_EQ_3613(...)   \,
-#define Z_IS_3613U_EQ_3613(...)  \,
-#define Z_IS_3613_EQ_3613U(...)  \,
-#define Z_IS_3613U_EQ_3613U(...) \,
-#define Z_IS_3614_EQ_3614(...)   \,
-#define Z_IS_3614U_EQ_3614(...)  \,
-#define Z_IS_3614_EQ_3614U(...)  \,
-#define Z_IS_3614U_EQ_3614U(...) \,
-#define Z_IS_3615_EQ_3615(...)   \,
-#define Z_IS_3615U_EQ_3615(...)  \,
-#define Z_IS_3615_EQ_3615U(...)  \,
-#define Z_IS_3615U_EQ_3615U(...) \,
-#define Z_IS_3616_EQ_3616(...)   \,
-#define Z_IS_3616U_EQ_3616(...)  \,
-#define Z_IS_3616_EQ_3616U(...)  \,
-#define Z_IS_3616U_EQ_3616U(...) \,
-#define Z_IS_3617_EQ_3617(...)   \,
-#define Z_IS_3617U_EQ_3617(...)  \,
-#define Z_IS_3617_EQ_3617U(...)  \,
-#define Z_IS_3617U_EQ_3617U(...) \,
-#define Z_IS_3618_EQ_3618(...)   \,
-#define Z_IS_3618U_EQ_3618(...)  \,
-#define Z_IS_3618_EQ_3618U(...)  \,
-#define Z_IS_3618U_EQ_3618U(...) \,
-#define Z_IS_3619_EQ_3619(...)   \,
-#define Z_IS_3619U_EQ_3619(...)  \,
-#define Z_IS_3619_EQ_3619U(...)  \,
-#define Z_IS_3619U_EQ_3619U(...) \,
-#define Z_IS_3620_EQ_3620(...)   \,
-#define Z_IS_3620U_EQ_3620(...)  \,
-#define Z_IS_3620_EQ_3620U(...)  \,
-#define Z_IS_3620U_EQ_3620U(...) \,
-#define Z_IS_3621_EQ_3621(...)   \,
-#define Z_IS_3621U_EQ_3621(...)  \,
-#define Z_IS_3621_EQ_3621U(...)  \,
-#define Z_IS_3621U_EQ_3621U(...) \,
-#define Z_IS_3622_EQ_3622(...)   \,
-#define Z_IS_3622U_EQ_3622(...)  \,
-#define Z_IS_3622_EQ_3622U(...)  \,
-#define Z_IS_3622U_EQ_3622U(...) \,
-#define Z_IS_3623_EQ_3623(...)   \,
-#define Z_IS_3623U_EQ_3623(...)  \,
-#define Z_IS_3623_EQ_3623U(...)  \,
-#define Z_IS_3623U_EQ_3623U(...) \,
-#define Z_IS_3624_EQ_3624(...)   \,
-#define Z_IS_3624U_EQ_3624(...)  \,
-#define Z_IS_3624_EQ_3624U(...)  \,
-#define Z_IS_3624U_EQ_3624U(...) \,
-#define Z_IS_3625_EQ_3625(...)   \,
-#define Z_IS_3625U_EQ_3625(...)  \,
-#define Z_IS_3625_EQ_3625U(...)  \,
-#define Z_IS_3625U_EQ_3625U(...) \,
-#define Z_IS_3626_EQ_3626(...)   \,
-#define Z_IS_3626U_EQ_3626(...)  \,
-#define Z_IS_3626_EQ_3626U(...)  \,
-#define Z_IS_3626U_EQ_3626U(...) \,
-#define Z_IS_3627_EQ_3627(...)   \,
-#define Z_IS_3627U_EQ_3627(...)  \,
-#define Z_IS_3627_EQ_3627U(...)  \,
-#define Z_IS_3627U_EQ_3627U(...) \,
-#define Z_IS_3628_EQ_3628(...)   \,
-#define Z_IS_3628U_EQ_3628(...)  \,
-#define Z_IS_3628_EQ_3628U(...)  \,
-#define Z_IS_3628U_EQ_3628U(...) \,
-#define Z_IS_3629_EQ_3629(...)   \,
-#define Z_IS_3629U_EQ_3629(...)  \,
-#define Z_IS_3629_EQ_3629U(...)  \,
-#define Z_IS_3629U_EQ_3629U(...) \,
-#define Z_IS_3630_EQ_3630(...)   \,
-#define Z_IS_3630U_EQ_3630(...)  \,
-#define Z_IS_3630_EQ_3630U(...)  \,
-#define Z_IS_3630U_EQ_3630U(...) \,
-#define Z_IS_3631_EQ_3631(...)   \,
-#define Z_IS_3631U_EQ_3631(...)  \,
-#define Z_IS_3631_EQ_3631U(...)  \,
-#define Z_IS_3631U_EQ_3631U(...) \,
-#define Z_IS_3632_EQ_3632(...)   \,
-#define Z_IS_3632U_EQ_3632(...)  \,
-#define Z_IS_3632_EQ_3632U(...)  \,
-#define Z_IS_3632U_EQ_3632U(...) \,
-#define Z_IS_3633_EQ_3633(...)   \,
-#define Z_IS_3633U_EQ_3633(...)  \,
-#define Z_IS_3633_EQ_3633U(...)  \,
-#define Z_IS_3633U_EQ_3633U(...) \,
-#define Z_IS_3634_EQ_3634(...)   \,
-#define Z_IS_3634U_EQ_3634(...)  \,
-#define Z_IS_3634_EQ_3634U(...)  \,
-#define Z_IS_3634U_EQ_3634U(...) \,
-#define Z_IS_3635_EQ_3635(...)   \,
-#define Z_IS_3635U_EQ_3635(...)  \,
-#define Z_IS_3635_EQ_3635U(...)  \,
-#define Z_IS_3635U_EQ_3635U(...) \,
-#define Z_IS_3636_EQ_3636(...)   \,
-#define Z_IS_3636U_EQ_3636(...)  \,
-#define Z_IS_3636_EQ_3636U(...)  \,
-#define Z_IS_3636U_EQ_3636U(...) \,
-#define Z_IS_3637_EQ_3637(...)   \,
-#define Z_IS_3637U_EQ_3637(...)  \,
-#define Z_IS_3637_EQ_3637U(...)  \,
-#define Z_IS_3637U_EQ_3637U(...) \,
-#define Z_IS_3638_EQ_3638(...)   \,
-#define Z_IS_3638U_EQ_3638(...)  \,
-#define Z_IS_3638_EQ_3638U(...)  \,
-#define Z_IS_3638U_EQ_3638U(...) \,
-#define Z_IS_3639_EQ_3639(...)   \,
-#define Z_IS_3639U_EQ_3639(...)  \,
-#define Z_IS_3639_EQ_3639U(...)  \,
-#define Z_IS_3639U_EQ_3639U(...) \,
-#define Z_IS_3640_EQ_3640(...)   \,
-#define Z_IS_3640U_EQ_3640(...)  \,
-#define Z_IS_3640_EQ_3640U(...)  \,
-#define Z_IS_3640U_EQ_3640U(...) \,
-#define Z_IS_3641_EQ_3641(...)   \,
-#define Z_IS_3641U_EQ_3641(...)  \,
-#define Z_IS_3641_EQ_3641U(...)  \,
-#define Z_IS_3641U_EQ_3641U(...) \,
-#define Z_IS_3642_EQ_3642(...)   \,
-#define Z_IS_3642U_EQ_3642(...)  \,
-#define Z_IS_3642_EQ_3642U(...)  \,
-#define Z_IS_3642U_EQ_3642U(...) \,
-#define Z_IS_3643_EQ_3643(...)   \,
-#define Z_IS_3643U_EQ_3643(...)  \,
-#define Z_IS_3643_EQ_3643U(...)  \,
-#define Z_IS_3643U_EQ_3643U(...) \,
-#define Z_IS_3644_EQ_3644(...)   \,
-#define Z_IS_3644U_EQ_3644(...)  \,
-#define Z_IS_3644_EQ_3644U(...)  \,
-#define Z_IS_3644U_EQ_3644U(...) \,
-#define Z_IS_3645_EQ_3645(...)   \,
-#define Z_IS_3645U_EQ_3645(...)  \,
-#define Z_IS_3645_EQ_3645U(...)  \,
-#define Z_IS_3645U_EQ_3645U(...) \,
-#define Z_IS_3646_EQ_3646(...)   \,
-#define Z_IS_3646U_EQ_3646(...)  \,
-#define Z_IS_3646_EQ_3646U(...)  \,
-#define Z_IS_3646U_EQ_3646U(...) \,
-#define Z_IS_3647_EQ_3647(...)   \,
-#define Z_IS_3647U_EQ_3647(...)  \,
-#define Z_IS_3647_EQ_3647U(...)  \,
-#define Z_IS_3647U_EQ_3647U(...) \,
-#define Z_IS_3648_EQ_3648(...)   \,
-#define Z_IS_3648U_EQ_3648(...)  \,
-#define Z_IS_3648_EQ_3648U(...)  \,
-#define Z_IS_3648U_EQ_3648U(...) \,
-#define Z_IS_3649_EQ_3649(...)   \,
-#define Z_IS_3649U_EQ_3649(...)  \,
-#define Z_IS_3649_EQ_3649U(...)  \,
-#define Z_IS_3649U_EQ_3649U(...) \,
-#define Z_IS_3650_EQ_3650(...)   \,
-#define Z_IS_3650U_EQ_3650(...)  \,
-#define Z_IS_3650_EQ_3650U(...)  \,
-#define Z_IS_3650U_EQ_3650U(...) \,
-#define Z_IS_3651_EQ_3651(...)   \,
-#define Z_IS_3651U_EQ_3651(...)  \,
-#define Z_IS_3651_EQ_3651U(...)  \,
-#define Z_IS_3651U_EQ_3651U(...) \,
-#define Z_IS_3652_EQ_3652(...)   \,
-#define Z_IS_3652U_EQ_3652(...)  \,
-#define Z_IS_3652_EQ_3652U(...)  \,
-#define Z_IS_3652U_EQ_3652U(...) \,
-#define Z_IS_3653_EQ_3653(...)   \,
-#define Z_IS_3653U_EQ_3653(...)  \,
-#define Z_IS_3653_EQ_3653U(...)  \,
-#define Z_IS_3653U_EQ_3653U(...) \,
-#define Z_IS_3654_EQ_3654(...)   \,
-#define Z_IS_3654U_EQ_3654(...)  \,
-#define Z_IS_3654_EQ_3654U(...)  \,
-#define Z_IS_3654U_EQ_3654U(...) \,
-#define Z_IS_3655_EQ_3655(...)   \,
-#define Z_IS_3655U_EQ_3655(...)  \,
-#define Z_IS_3655_EQ_3655U(...)  \,
-#define Z_IS_3655U_EQ_3655U(...) \,
-#define Z_IS_3656_EQ_3656(...)   \,
-#define Z_IS_3656U_EQ_3656(...)  \,
-#define Z_IS_3656_EQ_3656U(...)  \,
-#define Z_IS_3656U_EQ_3656U(...) \,
-#define Z_IS_3657_EQ_3657(...)   \,
-#define Z_IS_3657U_EQ_3657(...)  \,
-#define Z_IS_3657_EQ_3657U(...)  \,
-#define Z_IS_3657U_EQ_3657U(...) \,
-#define Z_IS_3658_EQ_3658(...)   \,
-#define Z_IS_3658U_EQ_3658(...)  \,
-#define Z_IS_3658_EQ_3658U(...)  \,
-#define Z_IS_3658U_EQ_3658U(...) \,
-#define Z_IS_3659_EQ_3659(...)   \,
-#define Z_IS_3659U_EQ_3659(...)  \,
-#define Z_IS_3659_EQ_3659U(...)  \,
-#define Z_IS_3659U_EQ_3659U(...) \,
-#define Z_IS_3660_EQ_3660(...)   \,
-#define Z_IS_3660U_EQ_3660(...)  \,
-#define Z_IS_3660_EQ_3660U(...)  \,
-#define Z_IS_3660U_EQ_3660U(...) \,
-#define Z_IS_3661_EQ_3661(...)   \,
-#define Z_IS_3661U_EQ_3661(...)  \,
-#define Z_IS_3661_EQ_3661U(...)  \,
-#define Z_IS_3661U_EQ_3661U(...) \,
-#define Z_IS_3662_EQ_3662(...)   \,
-#define Z_IS_3662U_EQ_3662(...)  \,
-#define Z_IS_3662_EQ_3662U(...)  \,
-#define Z_IS_3662U_EQ_3662U(...) \,
-#define Z_IS_3663_EQ_3663(...)   \,
-#define Z_IS_3663U_EQ_3663(...)  \,
-#define Z_IS_3663_EQ_3663U(...)  \,
-#define Z_IS_3663U_EQ_3663U(...) \,
-#define Z_IS_3664_EQ_3664(...)   \,
-#define Z_IS_3664U_EQ_3664(...)  \,
-#define Z_IS_3664_EQ_3664U(...)  \,
-#define Z_IS_3664U_EQ_3664U(...) \,
-#define Z_IS_3665_EQ_3665(...)   \,
-#define Z_IS_3665U_EQ_3665(...)  \,
-#define Z_IS_3665_EQ_3665U(...)  \,
-#define Z_IS_3665U_EQ_3665U(...) \,
-#define Z_IS_3666_EQ_3666(...)   \,
-#define Z_IS_3666U_EQ_3666(...)  \,
-#define Z_IS_3666_EQ_3666U(...)  \,
-#define Z_IS_3666U_EQ_3666U(...) \,
-#define Z_IS_3667_EQ_3667(...)   \,
-#define Z_IS_3667U_EQ_3667(...)  \,
-#define Z_IS_3667_EQ_3667U(...)  \,
-#define Z_IS_3667U_EQ_3667U(...) \,
-#define Z_IS_3668_EQ_3668(...)   \,
-#define Z_IS_3668U_EQ_3668(...)  \,
-#define Z_IS_3668_EQ_3668U(...)  \,
-#define Z_IS_3668U_EQ_3668U(...) \,
-#define Z_IS_3669_EQ_3669(...)   \,
-#define Z_IS_3669U_EQ_3669(...)  \,
-#define Z_IS_3669_EQ_3669U(...)  \,
-#define Z_IS_3669U_EQ_3669U(...) \,
-#define Z_IS_3670_EQ_3670(...)   \,
-#define Z_IS_3670U_EQ_3670(...)  \,
-#define Z_IS_3670_EQ_3670U(...)  \,
-#define Z_IS_3670U_EQ_3670U(...) \,
-#define Z_IS_3671_EQ_3671(...)   \,
-#define Z_IS_3671U_EQ_3671(...)  \,
-#define Z_IS_3671_EQ_3671U(...)  \,
-#define Z_IS_3671U_EQ_3671U(...) \,
-#define Z_IS_3672_EQ_3672(...)   \,
-#define Z_IS_3672U_EQ_3672(...)  \,
-#define Z_IS_3672_EQ_3672U(...)  \,
-#define Z_IS_3672U_EQ_3672U(...) \,
-#define Z_IS_3673_EQ_3673(...)   \,
-#define Z_IS_3673U_EQ_3673(...)  \,
-#define Z_IS_3673_EQ_3673U(...)  \,
-#define Z_IS_3673U_EQ_3673U(...) \,
-#define Z_IS_3674_EQ_3674(...)   \,
-#define Z_IS_3674U_EQ_3674(...)  \,
-#define Z_IS_3674_EQ_3674U(...)  \,
-#define Z_IS_3674U_EQ_3674U(...) \,
-#define Z_IS_3675_EQ_3675(...)   \,
-#define Z_IS_3675U_EQ_3675(...)  \,
-#define Z_IS_3675_EQ_3675U(...)  \,
-#define Z_IS_3675U_EQ_3675U(...) \,
-#define Z_IS_3676_EQ_3676(...)   \,
-#define Z_IS_3676U_EQ_3676(...)  \,
-#define Z_IS_3676_EQ_3676U(...)  \,
-#define Z_IS_3676U_EQ_3676U(...) \,
-#define Z_IS_3677_EQ_3677(...)   \,
-#define Z_IS_3677U_EQ_3677(...)  \,
-#define Z_IS_3677_EQ_3677U(...)  \,
-#define Z_IS_3677U_EQ_3677U(...) \,
-#define Z_IS_3678_EQ_3678(...)   \,
-#define Z_IS_3678U_EQ_3678(...)  \,
-#define Z_IS_3678_EQ_3678U(...)  \,
-#define Z_IS_3678U_EQ_3678U(...) \,
-#define Z_IS_3679_EQ_3679(...)   \,
-#define Z_IS_3679U_EQ_3679(...)  \,
-#define Z_IS_3679_EQ_3679U(...)  \,
-#define Z_IS_3679U_EQ_3679U(...) \,
-#define Z_IS_3680_EQ_3680(...)   \,
-#define Z_IS_3680U_EQ_3680(...)  \,
-#define Z_IS_3680_EQ_3680U(...)  \,
-#define Z_IS_3680U_EQ_3680U(...) \,
-#define Z_IS_3681_EQ_3681(...)   \,
-#define Z_IS_3681U_EQ_3681(...)  \,
-#define Z_IS_3681_EQ_3681U(...)  \,
-#define Z_IS_3681U_EQ_3681U(...) \,
-#define Z_IS_3682_EQ_3682(...)   \,
-#define Z_IS_3682U_EQ_3682(...)  \,
-#define Z_IS_3682_EQ_3682U(...)  \,
-#define Z_IS_3682U_EQ_3682U(...) \,
-#define Z_IS_3683_EQ_3683(...)   \,
-#define Z_IS_3683U_EQ_3683(...)  \,
-#define Z_IS_3683_EQ_3683U(...)  \,
-#define Z_IS_3683U_EQ_3683U(...) \,
-#define Z_IS_3684_EQ_3684(...)   \,
-#define Z_IS_3684U_EQ_3684(...)  \,
-#define Z_IS_3684_EQ_3684U(...)  \,
-#define Z_IS_3684U_EQ_3684U(...) \,
-#define Z_IS_3685_EQ_3685(...)   \,
-#define Z_IS_3685U_EQ_3685(...)  \,
-#define Z_IS_3685_EQ_3685U(...)  \,
-#define Z_IS_3685U_EQ_3685U(...) \,
-#define Z_IS_3686_EQ_3686(...)   \,
-#define Z_IS_3686U_EQ_3686(...)  \,
-#define Z_IS_3686_EQ_3686U(...)  \,
-#define Z_IS_3686U_EQ_3686U(...) \,
-#define Z_IS_3687_EQ_3687(...)   \,
-#define Z_IS_3687U_EQ_3687(...)  \,
-#define Z_IS_3687_EQ_3687U(...)  \,
-#define Z_IS_3687U_EQ_3687U(...) \,
-#define Z_IS_3688_EQ_3688(...)   \,
-#define Z_IS_3688U_EQ_3688(...)  \,
-#define Z_IS_3688_EQ_3688U(...)  \,
-#define Z_IS_3688U_EQ_3688U(...) \,
-#define Z_IS_3689_EQ_3689(...)   \,
-#define Z_IS_3689U_EQ_3689(...)  \,
-#define Z_IS_3689_EQ_3689U(...)  \,
-#define Z_IS_3689U_EQ_3689U(...) \,
-#define Z_IS_3690_EQ_3690(...)   \,
-#define Z_IS_3690U_EQ_3690(...)  \,
-#define Z_IS_3690_EQ_3690U(...)  \,
-#define Z_IS_3690U_EQ_3690U(...) \,
-#define Z_IS_3691_EQ_3691(...)   \,
-#define Z_IS_3691U_EQ_3691(...)  \,
-#define Z_IS_3691_EQ_3691U(...)  \,
-#define Z_IS_3691U_EQ_3691U(...) \,
-#define Z_IS_3692_EQ_3692(...)   \,
-#define Z_IS_3692U_EQ_3692(...)  \,
-#define Z_IS_3692_EQ_3692U(...)  \,
-#define Z_IS_3692U_EQ_3692U(...) \,
-#define Z_IS_3693_EQ_3693(...)   \,
-#define Z_IS_3693U_EQ_3693(...)  \,
-#define Z_IS_3693_EQ_3693U(...)  \,
-#define Z_IS_3693U_EQ_3693U(...) \,
-#define Z_IS_3694_EQ_3694(...)   \,
-#define Z_IS_3694U_EQ_3694(...)  \,
-#define Z_IS_3694_EQ_3694U(...)  \,
-#define Z_IS_3694U_EQ_3694U(...) \,
-#define Z_IS_3695_EQ_3695(...)   \,
-#define Z_IS_3695U_EQ_3695(...)  \,
-#define Z_IS_3695_EQ_3695U(...)  \,
-#define Z_IS_3695U_EQ_3695U(...) \,
-#define Z_IS_3696_EQ_3696(...)   \,
-#define Z_IS_3696U_EQ_3696(...)  \,
-#define Z_IS_3696_EQ_3696U(...)  \,
-#define Z_IS_3696U_EQ_3696U(...) \,
-#define Z_IS_3697_EQ_3697(...)   \,
-#define Z_IS_3697U_EQ_3697(...)  \,
-#define Z_IS_3697_EQ_3697U(...)  \,
-#define Z_IS_3697U_EQ_3697U(...) \,
-#define Z_IS_3698_EQ_3698(...)   \,
-#define Z_IS_3698U_EQ_3698(...)  \,
-#define Z_IS_3698_EQ_3698U(...)  \,
-#define Z_IS_3698U_EQ_3698U(...) \,
-#define Z_IS_3699_EQ_3699(...)   \,
-#define Z_IS_3699U_EQ_3699(...)  \,
-#define Z_IS_3699_EQ_3699U(...)  \,
-#define Z_IS_3699U_EQ_3699U(...) \,
-#define Z_IS_3700_EQ_3700(...)   \,
-#define Z_IS_3700U_EQ_3700(...)  \,
-#define Z_IS_3700_EQ_3700U(...)  \,
-#define Z_IS_3700U_EQ_3700U(...) \,
-#define Z_IS_3701_EQ_3701(...)   \,
-#define Z_IS_3701U_EQ_3701(...)  \,
-#define Z_IS_3701_EQ_3701U(...)  \,
-#define Z_IS_3701U_EQ_3701U(...) \,
-#define Z_IS_3702_EQ_3702(...)   \,
-#define Z_IS_3702U_EQ_3702(...)  \,
-#define Z_IS_3702_EQ_3702U(...)  \,
-#define Z_IS_3702U_EQ_3702U(...) \,
-#define Z_IS_3703_EQ_3703(...)   \,
-#define Z_IS_3703U_EQ_3703(...)  \,
-#define Z_IS_3703_EQ_3703U(...)  \,
-#define Z_IS_3703U_EQ_3703U(...) \,
-#define Z_IS_3704_EQ_3704(...)   \,
-#define Z_IS_3704U_EQ_3704(...)  \,
-#define Z_IS_3704_EQ_3704U(...)  \,
-#define Z_IS_3704U_EQ_3704U(...) \,
-#define Z_IS_3705_EQ_3705(...)   \,
-#define Z_IS_3705U_EQ_3705(...)  \,
-#define Z_IS_3705_EQ_3705U(...)  \,
-#define Z_IS_3705U_EQ_3705U(...) \,
-#define Z_IS_3706_EQ_3706(...)   \,
-#define Z_IS_3706U_EQ_3706(...)  \,
-#define Z_IS_3706_EQ_3706U(...)  \,
-#define Z_IS_3706U_EQ_3706U(...) \,
-#define Z_IS_3707_EQ_3707(...)   \,
-#define Z_IS_3707U_EQ_3707(...)  \,
-#define Z_IS_3707_EQ_3707U(...)  \,
-#define Z_IS_3707U_EQ_3707U(...) \,
-#define Z_IS_3708_EQ_3708(...)   \,
-#define Z_IS_3708U_EQ_3708(...)  \,
-#define Z_IS_3708_EQ_3708U(...)  \,
-#define Z_IS_3708U_EQ_3708U(...) \,
-#define Z_IS_3709_EQ_3709(...)   \,
-#define Z_IS_3709U_EQ_3709(...)  \,
-#define Z_IS_3709_EQ_3709U(...)  \,
-#define Z_IS_3709U_EQ_3709U(...) \,
-#define Z_IS_3710_EQ_3710(...)   \,
-#define Z_IS_3710U_EQ_3710(...)  \,
-#define Z_IS_3710_EQ_3710U(...)  \,
-#define Z_IS_3710U_EQ_3710U(...) \,
-#define Z_IS_3711_EQ_3711(...)   \,
-#define Z_IS_3711U_EQ_3711(...)  \,
-#define Z_IS_3711_EQ_3711U(...)  \,
-#define Z_IS_3711U_EQ_3711U(...) \,
-#define Z_IS_3712_EQ_3712(...)   \,
-#define Z_IS_3712U_EQ_3712(...)  \,
-#define Z_IS_3712_EQ_3712U(...)  \,
-#define Z_IS_3712U_EQ_3712U(...) \,
-#define Z_IS_3713_EQ_3713(...)   \,
-#define Z_IS_3713U_EQ_3713(...)  \,
-#define Z_IS_3713_EQ_3713U(...)  \,
-#define Z_IS_3713U_EQ_3713U(...) \,
-#define Z_IS_3714_EQ_3714(...)   \,
-#define Z_IS_3714U_EQ_3714(...)  \,
-#define Z_IS_3714_EQ_3714U(...)  \,
-#define Z_IS_3714U_EQ_3714U(...) \,
-#define Z_IS_3715_EQ_3715(...)   \,
-#define Z_IS_3715U_EQ_3715(...)  \,
-#define Z_IS_3715_EQ_3715U(...)  \,
-#define Z_IS_3715U_EQ_3715U(...) \,
-#define Z_IS_3716_EQ_3716(...)   \,
-#define Z_IS_3716U_EQ_3716(...)  \,
-#define Z_IS_3716_EQ_3716U(...)  \,
-#define Z_IS_3716U_EQ_3716U(...) \,
-#define Z_IS_3717_EQ_3717(...)   \,
-#define Z_IS_3717U_EQ_3717(...)  \,
-#define Z_IS_3717_EQ_3717U(...)  \,
-#define Z_IS_3717U_EQ_3717U(...) \,
-#define Z_IS_3718_EQ_3718(...)   \,
-#define Z_IS_3718U_EQ_3718(...)  \,
-#define Z_IS_3718_EQ_3718U(...)  \,
-#define Z_IS_3718U_EQ_3718U(...) \,
-#define Z_IS_3719_EQ_3719(...)   \,
-#define Z_IS_3719U_EQ_3719(...)  \,
-#define Z_IS_3719_EQ_3719U(...)  \,
-#define Z_IS_3719U_EQ_3719U(...) \,
-#define Z_IS_3720_EQ_3720(...)   \,
-#define Z_IS_3720U_EQ_3720(...)  \,
-#define Z_IS_3720_EQ_3720U(...)  \,
-#define Z_IS_3720U_EQ_3720U(...) \,
-#define Z_IS_3721_EQ_3721(...)   \,
-#define Z_IS_3721U_EQ_3721(...)  \,
-#define Z_IS_3721_EQ_3721U(...)  \,
-#define Z_IS_3721U_EQ_3721U(...) \,
-#define Z_IS_3722_EQ_3722(...)   \,
-#define Z_IS_3722U_EQ_3722(...)  \,
-#define Z_IS_3722_EQ_3722U(...)  \,
-#define Z_IS_3722U_EQ_3722U(...) \,
-#define Z_IS_3723_EQ_3723(...)   \,
-#define Z_IS_3723U_EQ_3723(...)  \,
-#define Z_IS_3723_EQ_3723U(...)  \,
-#define Z_IS_3723U_EQ_3723U(...) \,
-#define Z_IS_3724_EQ_3724(...)   \,
-#define Z_IS_3724U_EQ_3724(...)  \,
-#define Z_IS_3724_EQ_3724U(...)  \,
-#define Z_IS_3724U_EQ_3724U(...) \,
-#define Z_IS_3725_EQ_3725(...)   \,
-#define Z_IS_3725U_EQ_3725(...)  \,
-#define Z_IS_3725_EQ_3725U(...)  \,
-#define Z_IS_3725U_EQ_3725U(...) \,
-#define Z_IS_3726_EQ_3726(...)   \,
-#define Z_IS_3726U_EQ_3726(...)  \,
-#define Z_IS_3726_EQ_3726U(...)  \,
-#define Z_IS_3726U_EQ_3726U(...) \,
-#define Z_IS_3727_EQ_3727(...)   \,
-#define Z_IS_3727U_EQ_3727(...)  \,
-#define Z_IS_3727_EQ_3727U(...)  \,
-#define Z_IS_3727U_EQ_3727U(...) \,
-#define Z_IS_3728_EQ_3728(...)   \,
-#define Z_IS_3728U_EQ_3728(...)  \,
-#define Z_IS_3728_EQ_3728U(...)  \,
-#define Z_IS_3728U_EQ_3728U(...) \,
-#define Z_IS_3729_EQ_3729(...)   \,
-#define Z_IS_3729U_EQ_3729(...)  \,
-#define Z_IS_3729_EQ_3729U(...)  \,
-#define Z_IS_3729U_EQ_3729U(...) \,
-#define Z_IS_3730_EQ_3730(...)   \,
-#define Z_IS_3730U_EQ_3730(...)  \,
-#define Z_IS_3730_EQ_3730U(...)  \,
-#define Z_IS_3730U_EQ_3730U(...) \,
-#define Z_IS_3731_EQ_3731(...)   \,
-#define Z_IS_3731U_EQ_3731(...)  \,
-#define Z_IS_3731_EQ_3731U(...)  \,
-#define Z_IS_3731U_EQ_3731U(...) \,
-#define Z_IS_3732_EQ_3732(...)   \,
-#define Z_IS_3732U_EQ_3732(...)  \,
-#define Z_IS_3732_EQ_3732U(...)  \,
-#define Z_IS_3732U_EQ_3732U(...) \,
-#define Z_IS_3733_EQ_3733(...)   \,
-#define Z_IS_3733U_EQ_3733(...)  \,
-#define Z_IS_3733_EQ_3733U(...)  \,
-#define Z_IS_3733U_EQ_3733U(...) \,
-#define Z_IS_3734_EQ_3734(...)   \,
-#define Z_IS_3734U_EQ_3734(...)  \,
-#define Z_IS_3734_EQ_3734U(...)  \,
-#define Z_IS_3734U_EQ_3734U(...) \,
-#define Z_IS_3735_EQ_3735(...)   \,
-#define Z_IS_3735U_EQ_3735(...)  \,
-#define Z_IS_3735_EQ_3735U(...)  \,
-#define Z_IS_3735U_EQ_3735U(...) \,
-#define Z_IS_3736_EQ_3736(...)   \,
-#define Z_IS_3736U_EQ_3736(...)  \,
-#define Z_IS_3736_EQ_3736U(...)  \,
-#define Z_IS_3736U_EQ_3736U(...) \,
-#define Z_IS_3737_EQ_3737(...)   \,
-#define Z_IS_3737U_EQ_3737(...)  \,
-#define Z_IS_3737_EQ_3737U(...)  \,
-#define Z_IS_3737U_EQ_3737U(...) \,
-#define Z_IS_3738_EQ_3738(...)   \,
-#define Z_IS_3738U_EQ_3738(...)  \,
-#define Z_IS_3738_EQ_3738U(...)  \,
-#define Z_IS_3738U_EQ_3738U(...) \,
-#define Z_IS_3739_EQ_3739(...)   \,
-#define Z_IS_3739U_EQ_3739(...)  \,
-#define Z_IS_3739_EQ_3739U(...)  \,
-#define Z_IS_3739U_EQ_3739U(...) \,
-#define Z_IS_3740_EQ_3740(...)   \,
-#define Z_IS_3740U_EQ_3740(...)  \,
-#define Z_IS_3740_EQ_3740U(...)  \,
-#define Z_IS_3740U_EQ_3740U(...) \,
-#define Z_IS_3741_EQ_3741(...)   \,
-#define Z_IS_3741U_EQ_3741(...)  \,
-#define Z_IS_3741_EQ_3741U(...)  \,
-#define Z_IS_3741U_EQ_3741U(...) \,
-#define Z_IS_3742_EQ_3742(...)   \,
-#define Z_IS_3742U_EQ_3742(...)  \,
-#define Z_IS_3742_EQ_3742U(...)  \,
-#define Z_IS_3742U_EQ_3742U(...) \,
-#define Z_IS_3743_EQ_3743(...)   \,
-#define Z_IS_3743U_EQ_3743(...)  \,
-#define Z_IS_3743_EQ_3743U(...)  \,
-#define Z_IS_3743U_EQ_3743U(...) \,
-#define Z_IS_3744_EQ_3744(...)   \,
-#define Z_IS_3744U_EQ_3744(...)  \,
-#define Z_IS_3744_EQ_3744U(...)  \,
-#define Z_IS_3744U_EQ_3744U(...) \,
-#define Z_IS_3745_EQ_3745(...)   \,
-#define Z_IS_3745U_EQ_3745(...)  \,
-#define Z_IS_3745_EQ_3745U(...)  \,
-#define Z_IS_3745U_EQ_3745U(...) \,
-#define Z_IS_3746_EQ_3746(...)   \,
-#define Z_IS_3746U_EQ_3746(...)  \,
-#define Z_IS_3746_EQ_3746U(...)  \,
-#define Z_IS_3746U_EQ_3746U(...) \,
-#define Z_IS_3747_EQ_3747(...)   \,
-#define Z_IS_3747U_EQ_3747(...)  \,
-#define Z_IS_3747_EQ_3747U(...)  \,
-#define Z_IS_3747U_EQ_3747U(...) \,
-#define Z_IS_3748_EQ_3748(...)   \,
-#define Z_IS_3748U_EQ_3748(...)  \,
-#define Z_IS_3748_EQ_3748U(...)  \,
-#define Z_IS_3748U_EQ_3748U(...) \,
-#define Z_IS_3749_EQ_3749(...)   \,
-#define Z_IS_3749U_EQ_3749(...)  \,
-#define Z_IS_3749_EQ_3749U(...)  \,
-#define Z_IS_3749U_EQ_3749U(...) \,
-#define Z_IS_3750_EQ_3750(...)   \,
-#define Z_IS_3750U_EQ_3750(...)  \,
-#define Z_IS_3750_EQ_3750U(...)  \,
-#define Z_IS_3750U_EQ_3750U(...) \,
-#define Z_IS_3751_EQ_3751(...)   \,
-#define Z_IS_3751U_EQ_3751(...)  \,
-#define Z_IS_3751_EQ_3751U(...)  \,
-#define Z_IS_3751U_EQ_3751U(...) \,
-#define Z_IS_3752_EQ_3752(...)   \,
-#define Z_IS_3752U_EQ_3752(...)  \,
-#define Z_IS_3752_EQ_3752U(...)  \,
-#define Z_IS_3752U_EQ_3752U(...) \,
-#define Z_IS_3753_EQ_3753(...)   \,
-#define Z_IS_3753U_EQ_3753(...)  \,
-#define Z_IS_3753_EQ_3753U(...)  \,
-#define Z_IS_3753U_EQ_3753U(...) \,
-#define Z_IS_3754_EQ_3754(...)   \,
-#define Z_IS_3754U_EQ_3754(...)  \,
-#define Z_IS_3754_EQ_3754U(...)  \,
-#define Z_IS_3754U_EQ_3754U(...) \,
-#define Z_IS_3755_EQ_3755(...)   \,
-#define Z_IS_3755U_EQ_3755(...)  \,
-#define Z_IS_3755_EQ_3755U(...)  \,
-#define Z_IS_3755U_EQ_3755U(...) \,
-#define Z_IS_3756_EQ_3756(...)   \,
-#define Z_IS_3756U_EQ_3756(...)  \,
-#define Z_IS_3756_EQ_3756U(...)  \,
-#define Z_IS_3756U_EQ_3756U(...) \,
-#define Z_IS_3757_EQ_3757(...)   \,
-#define Z_IS_3757U_EQ_3757(...)  \,
-#define Z_IS_3757_EQ_3757U(...)  \,
-#define Z_IS_3757U_EQ_3757U(...) \,
-#define Z_IS_3758_EQ_3758(...)   \,
-#define Z_IS_3758U_EQ_3758(...)  \,
-#define Z_IS_3758_EQ_3758U(...)  \,
-#define Z_IS_3758U_EQ_3758U(...) \,
-#define Z_IS_3759_EQ_3759(...)   \,
-#define Z_IS_3759U_EQ_3759(...)  \,
-#define Z_IS_3759_EQ_3759U(...)  \,
-#define Z_IS_3759U_EQ_3759U(...) \,
-#define Z_IS_3760_EQ_3760(...)   \,
-#define Z_IS_3760U_EQ_3760(...)  \,
-#define Z_IS_3760_EQ_3760U(...)  \,
-#define Z_IS_3760U_EQ_3760U(...) \,
-#define Z_IS_3761_EQ_3761(...)   \,
-#define Z_IS_3761U_EQ_3761(...)  \,
-#define Z_IS_3761_EQ_3761U(...)  \,
-#define Z_IS_3761U_EQ_3761U(...) \,
-#define Z_IS_3762_EQ_3762(...)   \,
-#define Z_IS_3762U_EQ_3762(...)  \,
-#define Z_IS_3762_EQ_3762U(...)  \,
-#define Z_IS_3762U_EQ_3762U(...) \,
-#define Z_IS_3763_EQ_3763(...)   \,
-#define Z_IS_3763U_EQ_3763(...)  \,
-#define Z_IS_3763_EQ_3763U(...)  \,
-#define Z_IS_3763U_EQ_3763U(...) \,
-#define Z_IS_3764_EQ_3764(...)   \,
-#define Z_IS_3764U_EQ_3764(...)  \,
-#define Z_IS_3764_EQ_3764U(...)  \,
-#define Z_IS_3764U_EQ_3764U(...) \,
-#define Z_IS_3765_EQ_3765(...)   \,
-#define Z_IS_3765U_EQ_3765(...)  \,
-#define Z_IS_3765_EQ_3765U(...)  \,
-#define Z_IS_3765U_EQ_3765U(...) \,
-#define Z_IS_3766_EQ_3766(...)   \,
-#define Z_IS_3766U_EQ_3766(...)  \,
-#define Z_IS_3766_EQ_3766U(...)  \,
-#define Z_IS_3766U_EQ_3766U(...) \,
-#define Z_IS_3767_EQ_3767(...)   \,
-#define Z_IS_3767U_EQ_3767(...)  \,
-#define Z_IS_3767_EQ_3767U(...)  \,
-#define Z_IS_3767U_EQ_3767U(...) \,
-#define Z_IS_3768_EQ_3768(...)   \,
-#define Z_IS_3768U_EQ_3768(...)  \,
-#define Z_IS_3768_EQ_3768U(...)  \,
-#define Z_IS_3768U_EQ_3768U(...) \,
-#define Z_IS_3769_EQ_3769(...)   \,
-#define Z_IS_3769U_EQ_3769(...)  \,
-#define Z_IS_3769_EQ_3769U(...)  \,
-#define Z_IS_3769U_EQ_3769U(...) \,
-#define Z_IS_3770_EQ_3770(...)   \,
-#define Z_IS_3770U_EQ_3770(...)  \,
-#define Z_IS_3770_EQ_3770U(...)  \,
-#define Z_IS_3770U_EQ_3770U(...) \,
-#define Z_IS_3771_EQ_3771(...)   \,
-#define Z_IS_3771U_EQ_3771(...)  \,
-#define Z_IS_3771_EQ_3771U(...)  \,
-#define Z_IS_3771U_EQ_3771U(...) \,
-#define Z_IS_3772_EQ_3772(...)   \,
-#define Z_IS_3772U_EQ_3772(...)  \,
-#define Z_IS_3772_EQ_3772U(...)  \,
-#define Z_IS_3772U_EQ_3772U(...) \,
-#define Z_IS_3773_EQ_3773(...)   \,
-#define Z_IS_3773U_EQ_3773(...)  \,
-#define Z_IS_3773_EQ_3773U(...)  \,
-#define Z_IS_3773U_EQ_3773U(...) \,
-#define Z_IS_3774_EQ_3774(...)   \,
-#define Z_IS_3774U_EQ_3774(...)  \,
-#define Z_IS_3774_EQ_3774U(...)  \,
-#define Z_IS_3774U_EQ_3774U(...) \,
-#define Z_IS_3775_EQ_3775(...)   \,
-#define Z_IS_3775U_EQ_3775(...)  \,
-#define Z_IS_3775_EQ_3775U(...)  \,
-#define Z_IS_3775U_EQ_3775U(...) \,
-#define Z_IS_3776_EQ_3776(...)   \,
-#define Z_IS_3776U_EQ_3776(...)  \,
-#define Z_IS_3776_EQ_3776U(...)  \,
-#define Z_IS_3776U_EQ_3776U(...) \,
-#define Z_IS_3777_EQ_3777(...)   \,
-#define Z_IS_3777U_EQ_3777(...)  \,
-#define Z_IS_3777_EQ_3777U(...)  \,
-#define Z_IS_3777U_EQ_3777U(...) \,
-#define Z_IS_3778_EQ_3778(...)   \,
-#define Z_IS_3778U_EQ_3778(...)  \,
-#define Z_IS_3778_EQ_3778U(...)  \,
-#define Z_IS_3778U_EQ_3778U(...) \,
-#define Z_IS_3779_EQ_3779(...)   \,
-#define Z_IS_3779U_EQ_3779(...)  \,
-#define Z_IS_3779_EQ_3779U(...)  \,
-#define Z_IS_3779U_EQ_3779U(...) \,
-#define Z_IS_3780_EQ_3780(...)   \,
-#define Z_IS_3780U_EQ_3780(...)  \,
-#define Z_IS_3780_EQ_3780U(...)  \,
-#define Z_IS_3780U_EQ_3780U(...) \,
-#define Z_IS_3781_EQ_3781(...)   \,
-#define Z_IS_3781U_EQ_3781(...)  \,
-#define Z_IS_3781_EQ_3781U(...)  \,
-#define Z_IS_3781U_EQ_3781U(...) \,
-#define Z_IS_3782_EQ_3782(...)   \,
-#define Z_IS_3782U_EQ_3782(...)  \,
-#define Z_IS_3782_EQ_3782U(...)  \,
-#define Z_IS_3782U_EQ_3782U(...) \,
-#define Z_IS_3783_EQ_3783(...)   \,
-#define Z_IS_3783U_EQ_3783(...)  \,
-#define Z_IS_3783_EQ_3783U(...)  \,
-#define Z_IS_3783U_EQ_3783U(...) \,
-#define Z_IS_3784_EQ_3784(...)   \,
-#define Z_IS_3784U_EQ_3784(...)  \,
-#define Z_IS_3784_EQ_3784U(...)  \,
-#define Z_IS_3784U_EQ_3784U(...) \,
-#define Z_IS_3785_EQ_3785(...)   \,
-#define Z_IS_3785U_EQ_3785(...)  \,
-#define Z_IS_3785_EQ_3785U(...)  \,
-#define Z_IS_3785U_EQ_3785U(...) \,
-#define Z_IS_3786_EQ_3786(...)   \,
-#define Z_IS_3786U_EQ_3786(...)  \,
-#define Z_IS_3786_EQ_3786U(...)  \,
-#define Z_IS_3786U_EQ_3786U(...) \,
-#define Z_IS_3787_EQ_3787(...)   \,
-#define Z_IS_3787U_EQ_3787(...)  \,
-#define Z_IS_3787_EQ_3787U(...)  \,
-#define Z_IS_3787U_EQ_3787U(...) \,
-#define Z_IS_3788_EQ_3788(...)   \,
-#define Z_IS_3788U_EQ_3788(...)  \,
-#define Z_IS_3788_EQ_3788U(...)  \,
-#define Z_IS_3788U_EQ_3788U(...) \,
-#define Z_IS_3789_EQ_3789(...)   \,
-#define Z_IS_3789U_EQ_3789(...)  \,
-#define Z_IS_3789_EQ_3789U(...)  \,
-#define Z_IS_3789U_EQ_3789U(...) \,
-#define Z_IS_3790_EQ_3790(...)   \,
-#define Z_IS_3790U_EQ_3790(...)  \,
-#define Z_IS_3790_EQ_3790U(...)  \,
-#define Z_IS_3790U_EQ_3790U(...) \,
-#define Z_IS_3791_EQ_3791(...)   \,
-#define Z_IS_3791U_EQ_3791(...)  \,
-#define Z_IS_3791_EQ_3791U(...)  \,
-#define Z_IS_3791U_EQ_3791U(...) \,
-#define Z_IS_3792_EQ_3792(...)   \,
-#define Z_IS_3792U_EQ_3792(...)  \,
-#define Z_IS_3792_EQ_3792U(...)  \,
-#define Z_IS_3792U_EQ_3792U(...) \,
-#define Z_IS_3793_EQ_3793(...)   \,
-#define Z_IS_3793U_EQ_3793(...)  \,
-#define Z_IS_3793_EQ_3793U(...)  \,
-#define Z_IS_3793U_EQ_3793U(...) \,
-#define Z_IS_3794_EQ_3794(...)   \,
-#define Z_IS_3794U_EQ_3794(...)  \,
-#define Z_IS_3794_EQ_3794U(...)  \,
-#define Z_IS_3794U_EQ_3794U(...) \,
-#define Z_IS_3795_EQ_3795(...)   \,
-#define Z_IS_3795U_EQ_3795(...)  \,
-#define Z_IS_3795_EQ_3795U(...)  \,
-#define Z_IS_3795U_EQ_3795U(...) \,
-#define Z_IS_3796_EQ_3796(...)   \,
-#define Z_IS_3796U_EQ_3796(...)  \,
-#define Z_IS_3796_EQ_3796U(...)  \,
-#define Z_IS_3796U_EQ_3796U(...) \,
-#define Z_IS_3797_EQ_3797(...)   \,
-#define Z_IS_3797U_EQ_3797(...)  \,
-#define Z_IS_3797_EQ_3797U(...)  \,
-#define Z_IS_3797U_EQ_3797U(...) \,
-#define Z_IS_3798_EQ_3798(...)   \,
-#define Z_IS_3798U_EQ_3798(...)  \,
-#define Z_IS_3798_EQ_3798U(...)  \,
-#define Z_IS_3798U_EQ_3798U(...) \,
-#define Z_IS_3799_EQ_3799(...)   \,
-#define Z_IS_3799U_EQ_3799(...)  \,
-#define Z_IS_3799_EQ_3799U(...)  \,
-#define Z_IS_3799U_EQ_3799U(...) \,
-#define Z_IS_3800_EQ_3800(...)   \,
-#define Z_IS_3800U_EQ_3800(...)  \,
-#define Z_IS_3800_EQ_3800U(...)  \,
-#define Z_IS_3800U_EQ_3800U(...) \,
-#define Z_IS_3801_EQ_3801(...)   \,
-#define Z_IS_3801U_EQ_3801(...)  \,
-#define Z_IS_3801_EQ_3801U(...)  \,
-#define Z_IS_3801U_EQ_3801U(...) \,
-#define Z_IS_3802_EQ_3802(...)   \,
-#define Z_IS_3802U_EQ_3802(...)  \,
-#define Z_IS_3802_EQ_3802U(...)  \,
-#define Z_IS_3802U_EQ_3802U(...) \,
-#define Z_IS_3803_EQ_3803(...)   \,
-#define Z_IS_3803U_EQ_3803(...)  \,
-#define Z_IS_3803_EQ_3803U(...)  \,
-#define Z_IS_3803U_EQ_3803U(...) \,
-#define Z_IS_3804_EQ_3804(...)   \,
-#define Z_IS_3804U_EQ_3804(...)  \,
-#define Z_IS_3804_EQ_3804U(...)  \,
-#define Z_IS_3804U_EQ_3804U(...) \,
-#define Z_IS_3805_EQ_3805(...)   \,
-#define Z_IS_3805U_EQ_3805(...)  \,
-#define Z_IS_3805_EQ_3805U(...)  \,
-#define Z_IS_3805U_EQ_3805U(...) \,
-#define Z_IS_3806_EQ_3806(...)   \,
-#define Z_IS_3806U_EQ_3806(...)  \,
-#define Z_IS_3806_EQ_3806U(...)  \,
-#define Z_IS_3806U_EQ_3806U(...) \,
-#define Z_IS_3807_EQ_3807(...)   \,
-#define Z_IS_3807U_EQ_3807(...)  \,
-#define Z_IS_3807_EQ_3807U(...)  \,
-#define Z_IS_3807U_EQ_3807U(...) \,
-#define Z_IS_3808_EQ_3808(...)   \,
-#define Z_IS_3808U_EQ_3808(...)  \,
-#define Z_IS_3808_EQ_3808U(...)  \,
-#define Z_IS_3808U_EQ_3808U(...) \,
-#define Z_IS_3809_EQ_3809(...)   \,
-#define Z_IS_3809U_EQ_3809(...)  \,
-#define Z_IS_3809_EQ_3809U(...)  \,
-#define Z_IS_3809U_EQ_3809U(...) \,
-#define Z_IS_3810_EQ_3810(...)   \,
-#define Z_IS_3810U_EQ_3810(...)  \,
-#define Z_IS_3810_EQ_3810U(...)  \,
-#define Z_IS_3810U_EQ_3810U(...) \,
-#define Z_IS_3811_EQ_3811(...)   \,
-#define Z_IS_3811U_EQ_3811(...)  \,
-#define Z_IS_3811_EQ_3811U(...)  \,
-#define Z_IS_3811U_EQ_3811U(...) \,
-#define Z_IS_3812_EQ_3812(...)   \,
-#define Z_IS_3812U_EQ_3812(...)  \,
-#define Z_IS_3812_EQ_3812U(...)  \,
-#define Z_IS_3812U_EQ_3812U(...) \,
-#define Z_IS_3813_EQ_3813(...)   \,
-#define Z_IS_3813U_EQ_3813(...)  \,
-#define Z_IS_3813_EQ_3813U(...)  \,
-#define Z_IS_3813U_EQ_3813U(...) \,
-#define Z_IS_3814_EQ_3814(...)   \,
-#define Z_IS_3814U_EQ_3814(...)  \,
-#define Z_IS_3814_EQ_3814U(...)  \,
-#define Z_IS_3814U_EQ_3814U(...) \,
-#define Z_IS_3815_EQ_3815(...)   \,
-#define Z_IS_3815U_EQ_3815(...)  \,
-#define Z_IS_3815_EQ_3815U(...)  \,
-#define Z_IS_3815U_EQ_3815U(...) \,
-#define Z_IS_3816_EQ_3816(...)   \,
-#define Z_IS_3816U_EQ_3816(...)  \,
-#define Z_IS_3816_EQ_3816U(...)  \,
-#define Z_IS_3816U_EQ_3816U(...) \,
-#define Z_IS_3817_EQ_3817(...)   \,
-#define Z_IS_3817U_EQ_3817(...)  \,
-#define Z_IS_3817_EQ_3817U(...)  \,
-#define Z_IS_3817U_EQ_3817U(...) \,
-#define Z_IS_3818_EQ_3818(...)   \,
-#define Z_IS_3818U_EQ_3818(...)  \,
-#define Z_IS_3818_EQ_3818U(...)  \,
-#define Z_IS_3818U_EQ_3818U(...) \,
-#define Z_IS_3819_EQ_3819(...)   \,
-#define Z_IS_3819U_EQ_3819(...)  \,
-#define Z_IS_3819_EQ_3819U(...)  \,
-#define Z_IS_3819U_EQ_3819U(...) \,
-#define Z_IS_3820_EQ_3820(...)   \,
-#define Z_IS_3820U_EQ_3820(...)  \,
-#define Z_IS_3820_EQ_3820U(...)  \,
-#define Z_IS_3820U_EQ_3820U(...) \,
-#define Z_IS_3821_EQ_3821(...)   \,
-#define Z_IS_3821U_EQ_3821(...)  \,
-#define Z_IS_3821_EQ_3821U(...)  \,
-#define Z_IS_3821U_EQ_3821U(...) \,
-#define Z_IS_3822_EQ_3822(...)   \,
-#define Z_IS_3822U_EQ_3822(...)  \,
-#define Z_IS_3822_EQ_3822U(...)  \,
-#define Z_IS_3822U_EQ_3822U(...) \,
-#define Z_IS_3823_EQ_3823(...)   \,
-#define Z_IS_3823U_EQ_3823(...)  \,
-#define Z_IS_3823_EQ_3823U(...)  \,
-#define Z_IS_3823U_EQ_3823U(...) \,
-#define Z_IS_3824_EQ_3824(...)   \,
-#define Z_IS_3824U_EQ_3824(...)  \,
-#define Z_IS_3824_EQ_3824U(...)  \,
-#define Z_IS_3824U_EQ_3824U(...) \,
-#define Z_IS_3825_EQ_3825(...)   \,
-#define Z_IS_3825U_EQ_3825(...)  \,
-#define Z_IS_3825_EQ_3825U(...)  \,
-#define Z_IS_3825U_EQ_3825U(...) \,
-#define Z_IS_3826_EQ_3826(...)   \,
-#define Z_IS_3826U_EQ_3826(...)  \,
-#define Z_IS_3826_EQ_3826U(...)  \,
-#define Z_IS_3826U_EQ_3826U(...) \,
-#define Z_IS_3827_EQ_3827(...)   \,
-#define Z_IS_3827U_EQ_3827(...)  \,
-#define Z_IS_3827_EQ_3827U(...)  \,
-#define Z_IS_3827U_EQ_3827U(...) \,
-#define Z_IS_3828_EQ_3828(...)   \,
-#define Z_IS_3828U_EQ_3828(...)  \,
-#define Z_IS_3828_EQ_3828U(...)  \,
-#define Z_IS_3828U_EQ_3828U(...) \,
-#define Z_IS_3829_EQ_3829(...)   \,
-#define Z_IS_3829U_EQ_3829(...)  \,
-#define Z_IS_3829_EQ_3829U(...)  \,
-#define Z_IS_3829U_EQ_3829U(...) \,
-#define Z_IS_3830_EQ_3830(...)   \,
-#define Z_IS_3830U_EQ_3830(...)  \,
-#define Z_IS_3830_EQ_3830U(...)  \,
-#define Z_IS_3830U_EQ_3830U(...) \,
-#define Z_IS_3831_EQ_3831(...)   \,
-#define Z_IS_3831U_EQ_3831(...)  \,
-#define Z_IS_3831_EQ_3831U(...)  \,
-#define Z_IS_3831U_EQ_3831U(...) \,
-#define Z_IS_3832_EQ_3832(...)   \,
-#define Z_IS_3832U_EQ_3832(...)  \,
-#define Z_IS_3832_EQ_3832U(...)  \,
-#define Z_IS_3832U_EQ_3832U(...) \,
-#define Z_IS_3833_EQ_3833(...)   \,
-#define Z_IS_3833U_EQ_3833(...)  \,
-#define Z_IS_3833_EQ_3833U(...)  \,
-#define Z_IS_3833U_EQ_3833U(...) \,
-#define Z_IS_3834_EQ_3834(...)   \,
-#define Z_IS_3834U_EQ_3834(...)  \,
-#define Z_IS_3834_EQ_3834U(...)  \,
-#define Z_IS_3834U_EQ_3834U(...) \,
-#define Z_IS_3835_EQ_3835(...)   \,
-#define Z_IS_3835U_EQ_3835(...)  \,
-#define Z_IS_3835_EQ_3835U(...)  \,
-#define Z_IS_3835U_EQ_3835U(...) \,
-#define Z_IS_3836_EQ_3836(...)   \,
-#define Z_IS_3836U_EQ_3836(...)  \,
-#define Z_IS_3836_EQ_3836U(...)  \,
-#define Z_IS_3836U_EQ_3836U(...) \,
-#define Z_IS_3837_EQ_3837(...)   \,
-#define Z_IS_3837U_EQ_3837(...)  \,
-#define Z_IS_3837_EQ_3837U(...)  \,
-#define Z_IS_3837U_EQ_3837U(...) \,
-#define Z_IS_3838_EQ_3838(...)   \,
-#define Z_IS_3838U_EQ_3838(...)  \,
-#define Z_IS_3838_EQ_3838U(...)  \,
-#define Z_IS_3838U_EQ_3838U(...) \,
-#define Z_IS_3839_EQ_3839(...)   \,
-#define Z_IS_3839U_EQ_3839(...)  \,
-#define Z_IS_3839_EQ_3839U(...)  \,
-#define Z_IS_3839U_EQ_3839U(...) \,
-#define Z_IS_3840_EQ_3840(...)   \,
-#define Z_IS_3840U_EQ_3840(...)  \,
-#define Z_IS_3840_EQ_3840U(...)  \,
-#define Z_IS_3840U_EQ_3840U(...) \,
-#define Z_IS_3841_EQ_3841(...)   \,
-#define Z_IS_3841U_EQ_3841(...)  \,
-#define Z_IS_3841_EQ_3841U(...)  \,
-#define Z_IS_3841U_EQ_3841U(...) \,
-#define Z_IS_3842_EQ_3842(...)   \,
-#define Z_IS_3842U_EQ_3842(...)  \,
-#define Z_IS_3842_EQ_3842U(...)  \,
-#define Z_IS_3842U_EQ_3842U(...) \,
-#define Z_IS_3843_EQ_3843(...)   \,
-#define Z_IS_3843U_EQ_3843(...)  \,
-#define Z_IS_3843_EQ_3843U(...)  \,
-#define Z_IS_3843U_EQ_3843U(...) \,
-#define Z_IS_3844_EQ_3844(...)   \,
-#define Z_IS_3844U_EQ_3844(...)  \,
-#define Z_IS_3844_EQ_3844U(...)  \,
-#define Z_IS_3844U_EQ_3844U(...) \,
-#define Z_IS_3845_EQ_3845(...)   \,
-#define Z_IS_3845U_EQ_3845(...)  \,
-#define Z_IS_3845_EQ_3845U(...)  \,
-#define Z_IS_3845U_EQ_3845U(...) \,
-#define Z_IS_3846_EQ_3846(...)   \,
-#define Z_IS_3846U_EQ_3846(...)  \,
-#define Z_IS_3846_EQ_3846U(...)  \,
-#define Z_IS_3846U_EQ_3846U(...) \,
-#define Z_IS_3847_EQ_3847(...)   \,
-#define Z_IS_3847U_EQ_3847(...)  \,
-#define Z_IS_3847_EQ_3847U(...)  \,
-#define Z_IS_3847U_EQ_3847U(...) \,
-#define Z_IS_3848_EQ_3848(...)   \,
-#define Z_IS_3848U_EQ_3848(...)  \,
-#define Z_IS_3848_EQ_3848U(...)  \,
-#define Z_IS_3848U_EQ_3848U(...) \,
-#define Z_IS_3849_EQ_3849(...)   \,
-#define Z_IS_3849U_EQ_3849(...)  \,
-#define Z_IS_3849_EQ_3849U(...)  \,
-#define Z_IS_3849U_EQ_3849U(...) \,
-#define Z_IS_3850_EQ_3850(...)   \,
-#define Z_IS_3850U_EQ_3850(...)  \,
-#define Z_IS_3850_EQ_3850U(...)  \,
-#define Z_IS_3850U_EQ_3850U(...) \,
-#define Z_IS_3851_EQ_3851(...)   \,
-#define Z_IS_3851U_EQ_3851(...)  \,
-#define Z_IS_3851_EQ_3851U(...)  \,
-#define Z_IS_3851U_EQ_3851U(...) \,
-#define Z_IS_3852_EQ_3852(...)   \,
-#define Z_IS_3852U_EQ_3852(...)  \,
-#define Z_IS_3852_EQ_3852U(...)  \,
-#define Z_IS_3852U_EQ_3852U(...) \,
-#define Z_IS_3853_EQ_3853(...)   \,
-#define Z_IS_3853U_EQ_3853(...)  \,
-#define Z_IS_3853_EQ_3853U(...)  \,
-#define Z_IS_3853U_EQ_3853U(...) \,
-#define Z_IS_3854_EQ_3854(...)   \,
-#define Z_IS_3854U_EQ_3854(...)  \,
-#define Z_IS_3854_EQ_3854U(...)  \,
-#define Z_IS_3854U_EQ_3854U(...) \,
-#define Z_IS_3855_EQ_3855(...)   \,
-#define Z_IS_3855U_EQ_3855(...)  \,
-#define Z_IS_3855_EQ_3855U(...)  \,
-#define Z_IS_3855U_EQ_3855U(...) \,
-#define Z_IS_3856_EQ_3856(...)   \,
-#define Z_IS_3856U_EQ_3856(...)  \,
-#define Z_IS_3856_EQ_3856U(...)  \,
-#define Z_IS_3856U_EQ_3856U(...) \,
-#define Z_IS_3857_EQ_3857(...)   \,
-#define Z_IS_3857U_EQ_3857(...)  \,
-#define Z_IS_3857_EQ_3857U(...)  \,
-#define Z_IS_3857U_EQ_3857U(...) \,
-#define Z_IS_3858_EQ_3858(...)   \,
-#define Z_IS_3858U_EQ_3858(...)  \,
-#define Z_IS_3858_EQ_3858U(...)  \,
-#define Z_IS_3858U_EQ_3858U(...) \,
-#define Z_IS_3859_EQ_3859(...)   \,
-#define Z_IS_3859U_EQ_3859(...)  \,
-#define Z_IS_3859_EQ_3859U(...)  \,
-#define Z_IS_3859U_EQ_3859U(...) \,
-#define Z_IS_3860_EQ_3860(...)   \,
-#define Z_IS_3860U_EQ_3860(...)  \,
-#define Z_IS_3860_EQ_3860U(...)  \,
-#define Z_IS_3860U_EQ_3860U(...) \,
-#define Z_IS_3861_EQ_3861(...)   \,
-#define Z_IS_3861U_EQ_3861(...)  \,
-#define Z_IS_3861_EQ_3861U(...)  \,
-#define Z_IS_3861U_EQ_3861U(...) \,
-#define Z_IS_3862_EQ_3862(...)   \,
-#define Z_IS_3862U_EQ_3862(...)  \,
-#define Z_IS_3862_EQ_3862U(...)  \,
-#define Z_IS_3862U_EQ_3862U(...) \,
-#define Z_IS_3863_EQ_3863(...)   \,
-#define Z_IS_3863U_EQ_3863(...)  \,
-#define Z_IS_3863_EQ_3863U(...)  \,
-#define Z_IS_3863U_EQ_3863U(...) \,
-#define Z_IS_3864_EQ_3864(...)   \,
-#define Z_IS_3864U_EQ_3864(...)  \,
-#define Z_IS_3864_EQ_3864U(...)  \,
-#define Z_IS_3864U_EQ_3864U(...) \,
-#define Z_IS_3865_EQ_3865(...)   \,
-#define Z_IS_3865U_EQ_3865(...)  \,
-#define Z_IS_3865_EQ_3865U(...)  \,
-#define Z_IS_3865U_EQ_3865U(...) \,
-#define Z_IS_3866_EQ_3866(...)   \,
-#define Z_IS_3866U_EQ_3866(...)  \,
-#define Z_IS_3866_EQ_3866U(...)  \,
-#define Z_IS_3866U_EQ_3866U(...) \,
-#define Z_IS_3867_EQ_3867(...)   \,
-#define Z_IS_3867U_EQ_3867(...)  \,
-#define Z_IS_3867_EQ_3867U(...)  \,
-#define Z_IS_3867U_EQ_3867U(...) \,
-#define Z_IS_3868_EQ_3868(...)   \,
-#define Z_IS_3868U_EQ_3868(...)  \,
-#define Z_IS_3868_EQ_3868U(...)  \,
-#define Z_IS_3868U_EQ_3868U(...) \,
-#define Z_IS_3869_EQ_3869(...)   \,
-#define Z_IS_3869U_EQ_3869(...)  \,
-#define Z_IS_3869_EQ_3869U(...)  \,
-#define Z_IS_3869U_EQ_3869U(...) \,
-#define Z_IS_3870_EQ_3870(...)   \,
-#define Z_IS_3870U_EQ_3870(...)  \,
-#define Z_IS_3870_EQ_3870U(...)  \,
-#define Z_IS_3870U_EQ_3870U(...) \,
-#define Z_IS_3871_EQ_3871(...)   \,
-#define Z_IS_3871U_EQ_3871(...)  \,
-#define Z_IS_3871_EQ_3871U(...)  \,
-#define Z_IS_3871U_EQ_3871U(...) \,
-#define Z_IS_3872_EQ_3872(...)   \,
-#define Z_IS_3872U_EQ_3872(...)  \,
-#define Z_IS_3872_EQ_3872U(...)  \,
-#define Z_IS_3872U_EQ_3872U(...) \,
-#define Z_IS_3873_EQ_3873(...)   \,
-#define Z_IS_3873U_EQ_3873(...)  \,
-#define Z_IS_3873_EQ_3873U(...)  \,
-#define Z_IS_3873U_EQ_3873U(...) \,
-#define Z_IS_3874_EQ_3874(...)   \,
-#define Z_IS_3874U_EQ_3874(...)  \,
-#define Z_IS_3874_EQ_3874U(...)  \,
-#define Z_IS_3874U_EQ_3874U(...) \,
-#define Z_IS_3875_EQ_3875(...)   \,
-#define Z_IS_3875U_EQ_3875(...)  \,
-#define Z_IS_3875_EQ_3875U(...)  \,
-#define Z_IS_3875U_EQ_3875U(...) \,
-#define Z_IS_3876_EQ_3876(...)   \,
-#define Z_IS_3876U_EQ_3876(...)  \,
-#define Z_IS_3876_EQ_3876U(...)  \,
-#define Z_IS_3876U_EQ_3876U(...) \,
-#define Z_IS_3877_EQ_3877(...)   \,
-#define Z_IS_3877U_EQ_3877(...)  \,
-#define Z_IS_3877_EQ_3877U(...)  \,
-#define Z_IS_3877U_EQ_3877U(...) \,
-#define Z_IS_3878_EQ_3878(...)   \,
-#define Z_IS_3878U_EQ_3878(...)  \,
-#define Z_IS_3878_EQ_3878U(...)  \,
-#define Z_IS_3878U_EQ_3878U(...) \,
-#define Z_IS_3879_EQ_3879(...)   \,
-#define Z_IS_3879U_EQ_3879(...)  \,
-#define Z_IS_3879_EQ_3879U(...)  \,
-#define Z_IS_3879U_EQ_3879U(...) \,
-#define Z_IS_3880_EQ_3880(...)   \,
-#define Z_IS_3880U_EQ_3880(...)  \,
-#define Z_IS_3880_EQ_3880U(...)  \,
-#define Z_IS_3880U_EQ_3880U(...) \,
-#define Z_IS_3881_EQ_3881(...)   \,
-#define Z_IS_3881U_EQ_3881(...)  \,
-#define Z_IS_3881_EQ_3881U(...)  \,
-#define Z_IS_3881U_EQ_3881U(...) \,
-#define Z_IS_3882_EQ_3882(...)   \,
-#define Z_IS_3882U_EQ_3882(...)  \,
-#define Z_IS_3882_EQ_3882U(...)  \,
-#define Z_IS_3882U_EQ_3882U(...) \,
-#define Z_IS_3883_EQ_3883(...)   \,
-#define Z_IS_3883U_EQ_3883(...)  \,
-#define Z_IS_3883_EQ_3883U(...)  \,
-#define Z_IS_3883U_EQ_3883U(...) \,
-#define Z_IS_3884_EQ_3884(...)   \,
-#define Z_IS_3884U_EQ_3884(...)  \,
-#define Z_IS_3884_EQ_3884U(...)  \,
-#define Z_IS_3884U_EQ_3884U(...) \,
-#define Z_IS_3885_EQ_3885(...)   \,
-#define Z_IS_3885U_EQ_3885(...)  \,
-#define Z_IS_3885_EQ_3885U(...)  \,
-#define Z_IS_3885U_EQ_3885U(...) \,
-#define Z_IS_3886_EQ_3886(...)   \,
-#define Z_IS_3886U_EQ_3886(...)  \,
-#define Z_IS_3886_EQ_3886U(...)  \,
-#define Z_IS_3886U_EQ_3886U(...) \,
-#define Z_IS_3887_EQ_3887(...)   \,
-#define Z_IS_3887U_EQ_3887(...)  \,
-#define Z_IS_3887_EQ_3887U(...)  \,
-#define Z_IS_3887U_EQ_3887U(...) \,
-#define Z_IS_3888_EQ_3888(...)   \,
-#define Z_IS_3888U_EQ_3888(...)  \,
-#define Z_IS_3888_EQ_3888U(...)  \,
-#define Z_IS_3888U_EQ_3888U(...) \,
-#define Z_IS_3889_EQ_3889(...)   \,
-#define Z_IS_3889U_EQ_3889(...)  \,
-#define Z_IS_3889_EQ_3889U(...)  \,
-#define Z_IS_3889U_EQ_3889U(...) \,
-#define Z_IS_3890_EQ_3890(...)   \,
-#define Z_IS_3890U_EQ_3890(...)  \,
-#define Z_IS_3890_EQ_3890U(...)  \,
-#define Z_IS_3890U_EQ_3890U(...) \,
-#define Z_IS_3891_EQ_3891(...)   \,
-#define Z_IS_3891U_EQ_3891(...)  \,
-#define Z_IS_3891_EQ_3891U(...)  \,
-#define Z_IS_3891U_EQ_3891U(...) \,
-#define Z_IS_3892_EQ_3892(...)   \,
-#define Z_IS_3892U_EQ_3892(...)  \,
-#define Z_IS_3892_EQ_3892U(...)  \,
-#define Z_IS_3892U_EQ_3892U(...) \,
-#define Z_IS_3893_EQ_3893(...)   \,
-#define Z_IS_3893U_EQ_3893(...)  \,
-#define Z_IS_3893_EQ_3893U(...)  \,
-#define Z_IS_3893U_EQ_3893U(...) \,
-#define Z_IS_3894_EQ_3894(...)   \,
-#define Z_IS_3894U_EQ_3894(...)  \,
-#define Z_IS_3894_EQ_3894U(...)  \,
-#define Z_IS_3894U_EQ_3894U(...) \,
-#define Z_IS_3895_EQ_3895(...)   \,
-#define Z_IS_3895U_EQ_3895(...)  \,
-#define Z_IS_3895_EQ_3895U(...)  \,
-#define Z_IS_3895U_EQ_3895U(...) \,
-#define Z_IS_3896_EQ_3896(...)   \,
-#define Z_IS_3896U_EQ_3896(...)  \,
-#define Z_IS_3896_EQ_3896U(...)  \,
-#define Z_IS_3896U_EQ_3896U(...) \,
-#define Z_IS_3897_EQ_3897(...)   \,
-#define Z_IS_3897U_EQ_3897(...)  \,
-#define Z_IS_3897_EQ_3897U(...)  \,
-#define Z_IS_3897U_EQ_3897U(...) \,
-#define Z_IS_3898_EQ_3898(...)   \,
-#define Z_IS_3898U_EQ_3898(...)  \,
-#define Z_IS_3898_EQ_3898U(...)  \,
-#define Z_IS_3898U_EQ_3898U(...) \,
-#define Z_IS_3899_EQ_3899(...)   \,
-#define Z_IS_3899U_EQ_3899(...)  \,
-#define Z_IS_3899_EQ_3899U(...)  \,
-#define Z_IS_3899U_EQ_3899U(...) \,
-#define Z_IS_3900_EQ_3900(...)   \,
-#define Z_IS_3900U_EQ_3900(...)  \,
-#define Z_IS_3900_EQ_3900U(...)  \,
-#define Z_IS_3900U_EQ_3900U(...) \,
-#define Z_IS_3901_EQ_3901(...)   \,
-#define Z_IS_3901U_EQ_3901(...)  \,
-#define Z_IS_3901_EQ_3901U(...)  \,
-#define Z_IS_3901U_EQ_3901U(...) \,
-#define Z_IS_3902_EQ_3902(...)   \,
-#define Z_IS_3902U_EQ_3902(...)  \,
-#define Z_IS_3902_EQ_3902U(...)  \,
-#define Z_IS_3902U_EQ_3902U(...) \,
-#define Z_IS_3903_EQ_3903(...)   \,
-#define Z_IS_3903U_EQ_3903(...)  \,
-#define Z_IS_3903_EQ_3903U(...)  \,
-#define Z_IS_3903U_EQ_3903U(...) \,
-#define Z_IS_3904_EQ_3904(...)   \,
-#define Z_IS_3904U_EQ_3904(...)  \,
-#define Z_IS_3904_EQ_3904U(...)  \,
-#define Z_IS_3904U_EQ_3904U(...) \,
-#define Z_IS_3905_EQ_3905(...)   \,
-#define Z_IS_3905U_EQ_3905(...)  \,
-#define Z_IS_3905_EQ_3905U(...)  \,
-#define Z_IS_3905U_EQ_3905U(...) \,
-#define Z_IS_3906_EQ_3906(...)   \,
-#define Z_IS_3906U_EQ_3906(...)  \,
-#define Z_IS_3906_EQ_3906U(...)  \,
-#define Z_IS_3906U_EQ_3906U(...) \,
-#define Z_IS_3907_EQ_3907(...)   \,
-#define Z_IS_3907U_EQ_3907(...)  \,
-#define Z_IS_3907_EQ_3907U(...)  \,
-#define Z_IS_3907U_EQ_3907U(...) \,
-#define Z_IS_3908_EQ_3908(...)   \,
-#define Z_IS_3908U_EQ_3908(...)  \,
-#define Z_IS_3908_EQ_3908U(...)  \,
-#define Z_IS_3908U_EQ_3908U(...) \,
-#define Z_IS_3909_EQ_3909(...)   \,
-#define Z_IS_3909U_EQ_3909(...)  \,
-#define Z_IS_3909_EQ_3909U(...)  \,
-#define Z_IS_3909U_EQ_3909U(...) \,
-#define Z_IS_3910_EQ_3910(...)   \,
-#define Z_IS_3910U_EQ_3910(...)  \,
-#define Z_IS_3910_EQ_3910U(...)  \,
-#define Z_IS_3910U_EQ_3910U(...) \,
-#define Z_IS_3911_EQ_3911(...)   \,
-#define Z_IS_3911U_EQ_3911(...)  \,
-#define Z_IS_3911_EQ_3911U(...)  \,
-#define Z_IS_3911U_EQ_3911U(...) \,
-#define Z_IS_3912_EQ_3912(...)   \,
-#define Z_IS_3912U_EQ_3912(...)  \,
-#define Z_IS_3912_EQ_3912U(...)  \,
-#define Z_IS_3912U_EQ_3912U(...) \,
-#define Z_IS_3913_EQ_3913(...)   \,
-#define Z_IS_3913U_EQ_3913(...)  \,
-#define Z_IS_3913_EQ_3913U(...)  \,
-#define Z_IS_3913U_EQ_3913U(...) \,
-#define Z_IS_3914_EQ_3914(...)   \,
-#define Z_IS_3914U_EQ_3914(...)  \,
-#define Z_IS_3914_EQ_3914U(...)  \,
-#define Z_IS_3914U_EQ_3914U(...) \,
-#define Z_IS_3915_EQ_3915(...)   \,
-#define Z_IS_3915U_EQ_3915(...)  \,
-#define Z_IS_3915_EQ_3915U(...)  \,
-#define Z_IS_3915U_EQ_3915U(...) \,
-#define Z_IS_3916_EQ_3916(...)   \,
-#define Z_IS_3916U_EQ_3916(...)  \,
-#define Z_IS_3916_EQ_3916U(...)  \,
-#define Z_IS_3916U_EQ_3916U(...) \,
-#define Z_IS_3917_EQ_3917(...)   \,
-#define Z_IS_3917U_EQ_3917(...)  \,
-#define Z_IS_3917_EQ_3917U(...)  \,
-#define Z_IS_3917U_EQ_3917U(...) \,
-#define Z_IS_3918_EQ_3918(...)   \,
-#define Z_IS_3918U_EQ_3918(...)  \,
-#define Z_IS_3918_EQ_3918U(...)  \,
-#define Z_IS_3918U_EQ_3918U(...) \,
-#define Z_IS_3919_EQ_3919(...)   \,
-#define Z_IS_3919U_EQ_3919(...)  \,
-#define Z_IS_3919_EQ_3919U(...)  \,
-#define Z_IS_3919U_EQ_3919U(...) \,
-#define Z_IS_3920_EQ_3920(...)   \,
-#define Z_IS_3920U_EQ_3920(...)  \,
-#define Z_IS_3920_EQ_3920U(...)  \,
-#define Z_IS_3920U_EQ_3920U(...) \,
-#define Z_IS_3921_EQ_3921(...)   \,
-#define Z_IS_3921U_EQ_3921(...)  \,
-#define Z_IS_3921_EQ_3921U(...)  \,
-#define Z_IS_3921U_EQ_3921U(...) \,
-#define Z_IS_3922_EQ_3922(...)   \,
-#define Z_IS_3922U_EQ_3922(...)  \,
-#define Z_IS_3922_EQ_3922U(...)  \,
-#define Z_IS_3922U_EQ_3922U(...) \,
-#define Z_IS_3923_EQ_3923(...)   \,
-#define Z_IS_3923U_EQ_3923(...)  \,
-#define Z_IS_3923_EQ_3923U(...)  \,
-#define Z_IS_3923U_EQ_3923U(...) \,
-#define Z_IS_3924_EQ_3924(...)   \,
-#define Z_IS_3924U_EQ_3924(...)  \,
-#define Z_IS_3924_EQ_3924U(...)  \,
-#define Z_IS_3924U_EQ_3924U(...) \,
-#define Z_IS_3925_EQ_3925(...)   \,
-#define Z_IS_3925U_EQ_3925(...)  \,
-#define Z_IS_3925_EQ_3925U(...)  \,
-#define Z_IS_3925U_EQ_3925U(...) \,
-#define Z_IS_3926_EQ_3926(...)   \,
-#define Z_IS_3926U_EQ_3926(...)  \,
-#define Z_IS_3926_EQ_3926U(...)  \,
-#define Z_IS_3926U_EQ_3926U(...) \,
-#define Z_IS_3927_EQ_3927(...)   \,
-#define Z_IS_3927U_EQ_3927(...)  \,
-#define Z_IS_3927_EQ_3927U(...)  \,
-#define Z_IS_3927U_EQ_3927U(...) \,
-#define Z_IS_3928_EQ_3928(...)   \,
-#define Z_IS_3928U_EQ_3928(...)  \,
-#define Z_IS_3928_EQ_3928U(...)  \,
-#define Z_IS_3928U_EQ_3928U(...) \,
-#define Z_IS_3929_EQ_3929(...)   \,
-#define Z_IS_3929U_EQ_3929(...)  \,
-#define Z_IS_3929_EQ_3929U(...)  \,
-#define Z_IS_3929U_EQ_3929U(...) \,
-#define Z_IS_3930_EQ_3930(...)   \,
-#define Z_IS_3930U_EQ_3930(...)  \,
-#define Z_IS_3930_EQ_3930U(...)  \,
-#define Z_IS_3930U_EQ_3930U(...) \,
-#define Z_IS_3931_EQ_3931(...)   \,
-#define Z_IS_3931U_EQ_3931(...)  \,
-#define Z_IS_3931_EQ_3931U(...)  \,
-#define Z_IS_3931U_EQ_3931U(...) \,
-#define Z_IS_3932_EQ_3932(...)   \,
-#define Z_IS_3932U_EQ_3932(...)  \,
-#define Z_IS_3932_EQ_3932U(...)  \,
-#define Z_IS_3932U_EQ_3932U(...) \,
-#define Z_IS_3933_EQ_3933(...)   \,
-#define Z_IS_3933U_EQ_3933(...)  \,
-#define Z_IS_3933_EQ_3933U(...)  \,
-#define Z_IS_3933U_EQ_3933U(...) \,
-#define Z_IS_3934_EQ_3934(...)   \,
-#define Z_IS_3934U_EQ_3934(...)  \,
-#define Z_IS_3934_EQ_3934U(...)  \,
-#define Z_IS_3934U_EQ_3934U(...) \,
-#define Z_IS_3935_EQ_3935(...)   \,
-#define Z_IS_3935U_EQ_3935(...)  \,
-#define Z_IS_3935_EQ_3935U(...)  \,
-#define Z_IS_3935U_EQ_3935U(...) \,
-#define Z_IS_3936_EQ_3936(...)   \,
-#define Z_IS_3936U_EQ_3936(...)  \,
-#define Z_IS_3936_EQ_3936U(...)  \,
-#define Z_IS_3936U_EQ_3936U(...) \,
-#define Z_IS_3937_EQ_3937(...)   \,
-#define Z_IS_3937U_EQ_3937(...)  \,
-#define Z_IS_3937_EQ_3937U(...)  \,
-#define Z_IS_3937U_EQ_3937U(...) \,
-#define Z_IS_3938_EQ_3938(...)   \,
-#define Z_IS_3938U_EQ_3938(...)  \,
-#define Z_IS_3938_EQ_3938U(...)  \,
-#define Z_IS_3938U_EQ_3938U(...) \,
-#define Z_IS_3939_EQ_3939(...)   \,
-#define Z_IS_3939U_EQ_3939(...)  \,
-#define Z_IS_3939_EQ_3939U(...)  \,
-#define Z_IS_3939U_EQ_3939U(...) \,
-#define Z_IS_3940_EQ_3940(...)   \,
-#define Z_IS_3940U_EQ_3940(...)  \,
-#define Z_IS_3940_EQ_3940U(...)  \,
-#define Z_IS_3940U_EQ_3940U(...) \,
-#define Z_IS_3941_EQ_3941(...)   \,
-#define Z_IS_3941U_EQ_3941(...)  \,
-#define Z_IS_3941_EQ_3941U(...)  \,
-#define Z_IS_3941U_EQ_3941U(...) \,
-#define Z_IS_3942_EQ_3942(...)   \,
-#define Z_IS_3942U_EQ_3942(...)  \,
-#define Z_IS_3942_EQ_3942U(...)  \,
-#define Z_IS_3942U_EQ_3942U(...) \,
-#define Z_IS_3943_EQ_3943(...)   \,
-#define Z_IS_3943U_EQ_3943(...)  \,
-#define Z_IS_3943_EQ_3943U(...)  \,
-#define Z_IS_3943U_EQ_3943U(...) \,
-#define Z_IS_3944_EQ_3944(...)   \,
-#define Z_IS_3944U_EQ_3944(...)  \,
-#define Z_IS_3944_EQ_3944U(...)  \,
-#define Z_IS_3944U_EQ_3944U(...) \,
-#define Z_IS_3945_EQ_3945(...)   \,
-#define Z_IS_3945U_EQ_3945(...)  \,
-#define Z_IS_3945_EQ_3945U(...)  \,
-#define Z_IS_3945U_EQ_3945U(...) \,
-#define Z_IS_3946_EQ_3946(...)   \,
-#define Z_IS_3946U_EQ_3946(...)  \,
-#define Z_IS_3946_EQ_3946U(...)  \,
-#define Z_IS_3946U_EQ_3946U(...) \,
-#define Z_IS_3947_EQ_3947(...)   \,
-#define Z_IS_3947U_EQ_3947(...)  \,
-#define Z_IS_3947_EQ_3947U(...)  \,
-#define Z_IS_3947U_EQ_3947U(...) \,
-#define Z_IS_3948_EQ_3948(...)   \,
-#define Z_IS_3948U_EQ_3948(...)  \,
-#define Z_IS_3948_EQ_3948U(...)  \,
-#define Z_IS_3948U_EQ_3948U(...) \,
-#define Z_IS_3949_EQ_3949(...)   \,
-#define Z_IS_3949U_EQ_3949(...)  \,
-#define Z_IS_3949_EQ_3949U(...)  \,
-#define Z_IS_3949U_EQ_3949U(...) \,
-#define Z_IS_3950_EQ_3950(...)   \,
-#define Z_IS_3950U_EQ_3950(...)  \,
-#define Z_IS_3950_EQ_3950U(...)  \,
-#define Z_IS_3950U_EQ_3950U(...) \,
-#define Z_IS_3951_EQ_3951(...)   \,
-#define Z_IS_3951U_EQ_3951(...)  \,
-#define Z_IS_3951_EQ_3951U(...)  \,
-#define Z_IS_3951U_EQ_3951U(...) \,
-#define Z_IS_3952_EQ_3952(...)   \,
-#define Z_IS_3952U_EQ_3952(...)  \,
-#define Z_IS_3952_EQ_3952U(...)  \,
-#define Z_IS_3952U_EQ_3952U(...) \,
-#define Z_IS_3953_EQ_3953(...)   \,
-#define Z_IS_3953U_EQ_3953(...)  \,
-#define Z_IS_3953_EQ_3953U(...)  \,
-#define Z_IS_3953U_EQ_3953U(...) \,
-#define Z_IS_3954_EQ_3954(...)   \,
-#define Z_IS_3954U_EQ_3954(...)  \,
-#define Z_IS_3954_EQ_3954U(...)  \,
-#define Z_IS_3954U_EQ_3954U(...) \,
-#define Z_IS_3955_EQ_3955(...)   \,
-#define Z_IS_3955U_EQ_3955(...)  \,
-#define Z_IS_3955_EQ_3955U(...)  \,
-#define Z_IS_3955U_EQ_3955U(...) \,
-#define Z_IS_3956_EQ_3956(...)   \,
-#define Z_IS_3956U_EQ_3956(...)  \,
-#define Z_IS_3956_EQ_3956U(...)  \,
-#define Z_IS_3956U_EQ_3956U(...) \,
-#define Z_IS_3957_EQ_3957(...)   \,
-#define Z_IS_3957U_EQ_3957(...)  \,
-#define Z_IS_3957_EQ_3957U(...)  \,
-#define Z_IS_3957U_EQ_3957U(...) \,
-#define Z_IS_3958_EQ_3958(...)   \,
-#define Z_IS_3958U_EQ_3958(...)  \,
-#define Z_IS_3958_EQ_3958U(...)  \,
-#define Z_IS_3958U_EQ_3958U(...) \,
-#define Z_IS_3959_EQ_3959(...)   \,
-#define Z_IS_3959U_EQ_3959(...)  \,
-#define Z_IS_3959_EQ_3959U(...)  \,
-#define Z_IS_3959U_EQ_3959U(...) \,
-#define Z_IS_3960_EQ_3960(...)   \,
-#define Z_IS_3960U_EQ_3960(...)  \,
-#define Z_IS_3960_EQ_3960U(...)  \,
-#define Z_IS_3960U_EQ_3960U(...) \,
-#define Z_IS_3961_EQ_3961(...)   \,
-#define Z_IS_3961U_EQ_3961(...)  \,
-#define Z_IS_3961_EQ_3961U(...)  \,
-#define Z_IS_3961U_EQ_3961U(...) \,
-#define Z_IS_3962_EQ_3962(...)   \,
-#define Z_IS_3962U_EQ_3962(...)  \,
-#define Z_IS_3962_EQ_3962U(...)  \,
-#define Z_IS_3962U_EQ_3962U(...) \,
-#define Z_IS_3963_EQ_3963(...)   \,
-#define Z_IS_3963U_EQ_3963(...)  \,
-#define Z_IS_3963_EQ_3963U(...)  \,
-#define Z_IS_3963U_EQ_3963U(...) \,
-#define Z_IS_3964_EQ_3964(...)   \,
-#define Z_IS_3964U_EQ_3964(...)  \,
-#define Z_IS_3964_EQ_3964U(...)  \,
-#define Z_IS_3964U_EQ_3964U(...) \,
-#define Z_IS_3965_EQ_3965(...)   \,
-#define Z_IS_3965U_EQ_3965(...)  \,
-#define Z_IS_3965_EQ_3965U(...)  \,
-#define Z_IS_3965U_EQ_3965U(...) \,
-#define Z_IS_3966_EQ_3966(...)   \,
-#define Z_IS_3966U_EQ_3966(...)  \,
-#define Z_IS_3966_EQ_3966U(...)  \,
-#define Z_IS_3966U_EQ_3966U(...) \,
-#define Z_IS_3967_EQ_3967(...)   \,
-#define Z_IS_3967U_EQ_3967(...)  \,
-#define Z_IS_3967_EQ_3967U(...)  \,
-#define Z_IS_3967U_EQ_3967U(...) \,
-#define Z_IS_3968_EQ_3968(...)   \,
-#define Z_IS_3968U_EQ_3968(...)  \,
-#define Z_IS_3968_EQ_3968U(...)  \,
-#define Z_IS_3968U_EQ_3968U(...) \,
-#define Z_IS_3969_EQ_3969(...)   \,
-#define Z_IS_3969U_EQ_3969(...)  \,
-#define Z_IS_3969_EQ_3969U(...)  \,
-#define Z_IS_3969U_EQ_3969U(...) \,
-#define Z_IS_3970_EQ_3970(...)   \,
-#define Z_IS_3970U_EQ_3970(...)  \,
-#define Z_IS_3970_EQ_3970U(...)  \,
-#define Z_IS_3970U_EQ_3970U(...) \,
-#define Z_IS_3971_EQ_3971(...)   \,
-#define Z_IS_3971U_EQ_3971(...)  \,
-#define Z_IS_3971_EQ_3971U(...)  \,
-#define Z_IS_3971U_EQ_3971U(...) \,
-#define Z_IS_3972_EQ_3972(...)   \,
-#define Z_IS_3972U_EQ_3972(...)  \,
-#define Z_IS_3972_EQ_3972U(...)  \,
-#define Z_IS_3972U_EQ_3972U(...) \,
-#define Z_IS_3973_EQ_3973(...)   \,
-#define Z_IS_3973U_EQ_3973(...)  \,
-#define Z_IS_3973_EQ_3973U(...)  \,
-#define Z_IS_3973U_EQ_3973U(...) \,
-#define Z_IS_3974_EQ_3974(...)   \,
-#define Z_IS_3974U_EQ_3974(...)  \,
-#define Z_IS_3974_EQ_3974U(...)  \,
-#define Z_IS_3974U_EQ_3974U(...) \,
-#define Z_IS_3975_EQ_3975(...)   \,
-#define Z_IS_3975U_EQ_3975(...)  \,
-#define Z_IS_3975_EQ_3975U(...)  \,
-#define Z_IS_3975U_EQ_3975U(...) \,
-#define Z_IS_3976_EQ_3976(...)   \,
-#define Z_IS_3976U_EQ_3976(...)  \,
-#define Z_IS_3976_EQ_3976U(...)  \,
-#define Z_IS_3976U_EQ_3976U(...) \,
-#define Z_IS_3977_EQ_3977(...)   \,
-#define Z_IS_3977U_EQ_3977(...)  \,
-#define Z_IS_3977_EQ_3977U(...)  \,
-#define Z_IS_3977U_EQ_3977U(...) \,
-#define Z_IS_3978_EQ_3978(...)   \,
-#define Z_IS_3978U_EQ_3978(...)  \,
-#define Z_IS_3978_EQ_3978U(...)  \,
-#define Z_IS_3978U_EQ_3978U(...) \,
-#define Z_IS_3979_EQ_3979(...)   \,
-#define Z_IS_3979U_EQ_3979(...)  \,
-#define Z_IS_3979_EQ_3979U(...)  \,
-#define Z_IS_3979U_EQ_3979U(...) \,
-#define Z_IS_3980_EQ_3980(...)   \,
-#define Z_IS_3980U_EQ_3980(...)  \,
-#define Z_IS_3980_EQ_3980U(...)  \,
-#define Z_IS_3980U_EQ_3980U(...) \,
-#define Z_IS_3981_EQ_3981(...)   \,
-#define Z_IS_3981U_EQ_3981(...)  \,
-#define Z_IS_3981_EQ_3981U(...)  \,
-#define Z_IS_3981U_EQ_3981U(...) \,
-#define Z_IS_3982_EQ_3982(...)   \,
-#define Z_IS_3982U_EQ_3982(...)  \,
-#define Z_IS_3982_EQ_3982U(...)  \,
-#define Z_IS_3982U_EQ_3982U(...) \,
-#define Z_IS_3983_EQ_3983(...)   \,
-#define Z_IS_3983U_EQ_3983(...)  \,
-#define Z_IS_3983_EQ_3983U(...)  \,
-#define Z_IS_3983U_EQ_3983U(...) \,
-#define Z_IS_3984_EQ_3984(...)   \,
-#define Z_IS_3984U_EQ_3984(...)  \,
-#define Z_IS_3984_EQ_3984U(...)  \,
-#define Z_IS_3984U_EQ_3984U(...) \,
-#define Z_IS_3985_EQ_3985(...)   \,
-#define Z_IS_3985U_EQ_3985(...)  \,
-#define Z_IS_3985_EQ_3985U(...)  \,
-#define Z_IS_3985U_EQ_3985U(...) \,
-#define Z_IS_3986_EQ_3986(...)   \,
-#define Z_IS_3986U_EQ_3986(...)  \,
-#define Z_IS_3986_EQ_3986U(...)  \,
-#define Z_IS_3986U_EQ_3986U(...) \,
-#define Z_IS_3987_EQ_3987(...)   \,
-#define Z_IS_3987U_EQ_3987(...)  \,
-#define Z_IS_3987_EQ_3987U(...)  \,
-#define Z_IS_3987U_EQ_3987U(...) \,
-#define Z_IS_3988_EQ_3988(...)   \,
-#define Z_IS_3988U_EQ_3988(...)  \,
-#define Z_IS_3988_EQ_3988U(...)  \,
-#define Z_IS_3988U_EQ_3988U(...) \,
-#define Z_IS_3989_EQ_3989(...)   \,
-#define Z_IS_3989U_EQ_3989(...)  \,
-#define Z_IS_3989_EQ_3989U(...)  \,
-#define Z_IS_3989U_EQ_3989U(...) \,
-#define Z_IS_3990_EQ_3990(...)   \,
-#define Z_IS_3990U_EQ_3990(...)  \,
-#define Z_IS_3990_EQ_3990U(...)  \,
-#define Z_IS_3990U_EQ_3990U(...) \,
-#define Z_IS_3991_EQ_3991(...)   \,
-#define Z_IS_3991U_EQ_3991(...)  \,
-#define Z_IS_3991_EQ_3991U(...)  \,
-#define Z_IS_3991U_EQ_3991U(...) \,
-#define Z_IS_3992_EQ_3992(...)   \,
-#define Z_IS_3992U_EQ_3992(...)  \,
-#define Z_IS_3992_EQ_3992U(...)  \,
-#define Z_IS_3992U_EQ_3992U(...) \,
-#define Z_IS_3993_EQ_3993(...)   \,
-#define Z_IS_3993U_EQ_3993(...)  \,
-#define Z_IS_3993_EQ_3993U(...)  \,
-#define Z_IS_3993U_EQ_3993U(...) \,
-#define Z_IS_3994_EQ_3994(...)   \,
-#define Z_IS_3994U_EQ_3994(...)  \,
-#define Z_IS_3994_EQ_3994U(...)  \,
-#define Z_IS_3994U_EQ_3994U(...) \,
-#define Z_IS_3995_EQ_3995(...)   \,
-#define Z_IS_3995U_EQ_3995(...)  \,
-#define Z_IS_3995_EQ_3995U(...)  \,
-#define Z_IS_3995U_EQ_3995U(...) \,
-#define Z_IS_3996_EQ_3996(...)   \,
-#define Z_IS_3996U_EQ_3996(...)  \,
-#define Z_IS_3996_EQ_3996U(...)  \,
-#define Z_IS_3996U_EQ_3996U(...) \,
-#define Z_IS_3997_EQ_3997(...)   \,
-#define Z_IS_3997U_EQ_3997(...)  \,
-#define Z_IS_3997_EQ_3997U(...)  \,
-#define Z_IS_3997U_EQ_3997U(...) \,
-#define Z_IS_3998_EQ_3998(...)   \,
-#define Z_IS_3998U_EQ_3998(...)  \,
-#define Z_IS_3998_EQ_3998U(...)  \,
-#define Z_IS_3998U_EQ_3998U(...) \,
-#define Z_IS_3999_EQ_3999(...)   \,
-#define Z_IS_3999U_EQ_3999(...)  \,
-#define Z_IS_3999_EQ_3999U(...)  \,
-#define Z_IS_3999U_EQ_3999U(...) \,
-#define Z_IS_4000_EQ_4000(...)   \,
-#define Z_IS_4000U_EQ_4000(...)  \,
-#define Z_IS_4000_EQ_4000U(...)  \,
-#define Z_IS_4000U_EQ_4000U(...) \,
-#define Z_IS_4001_EQ_4001(...)   \,
-#define Z_IS_4001U_EQ_4001(...)  \,
-#define Z_IS_4001_EQ_4001U(...)  \,
-#define Z_IS_4001U_EQ_4001U(...) \,
-#define Z_IS_4002_EQ_4002(...)   \,
-#define Z_IS_4002U_EQ_4002(...)  \,
-#define Z_IS_4002_EQ_4002U(...)  \,
-#define Z_IS_4002U_EQ_4002U(...) \,
-#define Z_IS_4003_EQ_4003(...)   \,
-#define Z_IS_4003U_EQ_4003(...)  \,
-#define Z_IS_4003_EQ_4003U(...)  \,
-#define Z_IS_4003U_EQ_4003U(...) \,
-#define Z_IS_4004_EQ_4004(...)   \,
-#define Z_IS_4004U_EQ_4004(...)  \,
-#define Z_IS_4004_EQ_4004U(...)  \,
-#define Z_IS_4004U_EQ_4004U(...) \,
-#define Z_IS_4005_EQ_4005(...)   \,
-#define Z_IS_4005U_EQ_4005(...)  \,
-#define Z_IS_4005_EQ_4005U(...)  \,
-#define Z_IS_4005U_EQ_4005U(...) \,
-#define Z_IS_4006_EQ_4006(...)   \,
-#define Z_IS_4006U_EQ_4006(...)  \,
-#define Z_IS_4006_EQ_4006U(...)  \,
-#define Z_IS_4006U_EQ_4006U(...) \,
-#define Z_IS_4007_EQ_4007(...)   \,
-#define Z_IS_4007U_EQ_4007(...)  \,
-#define Z_IS_4007_EQ_4007U(...)  \,
-#define Z_IS_4007U_EQ_4007U(...) \,
-#define Z_IS_4008_EQ_4008(...)   \,
-#define Z_IS_4008U_EQ_4008(...)  \,
-#define Z_IS_4008_EQ_4008U(...)  \,
-#define Z_IS_4008U_EQ_4008U(...) \,
-#define Z_IS_4009_EQ_4009(...)   \,
-#define Z_IS_4009U_EQ_4009(...)  \,
-#define Z_IS_4009_EQ_4009U(...)  \,
-#define Z_IS_4009U_EQ_4009U(...) \,
-#define Z_IS_4010_EQ_4010(...)   \,
-#define Z_IS_4010U_EQ_4010(...)  \,
-#define Z_IS_4010_EQ_4010U(...)  \,
-#define Z_IS_4010U_EQ_4010U(...) \,
-#define Z_IS_4011_EQ_4011(...)   \,
-#define Z_IS_4011U_EQ_4011(...)  \,
-#define Z_IS_4011_EQ_4011U(...)  \,
-#define Z_IS_4011U_EQ_4011U(...) \,
-#define Z_IS_4012_EQ_4012(...)   \,
-#define Z_IS_4012U_EQ_4012(...)  \,
-#define Z_IS_4012_EQ_4012U(...)  \,
-#define Z_IS_4012U_EQ_4012U(...) \,
-#define Z_IS_4013_EQ_4013(...)   \,
-#define Z_IS_4013U_EQ_4013(...)  \,
-#define Z_IS_4013_EQ_4013U(...)  \,
-#define Z_IS_4013U_EQ_4013U(...) \,
-#define Z_IS_4014_EQ_4014(...)   \,
-#define Z_IS_4014U_EQ_4014(...)  \,
-#define Z_IS_4014_EQ_4014U(...)  \,
-#define Z_IS_4014U_EQ_4014U(...) \,
-#define Z_IS_4015_EQ_4015(...)   \,
-#define Z_IS_4015U_EQ_4015(...)  \,
-#define Z_IS_4015_EQ_4015U(...)  \,
-#define Z_IS_4015U_EQ_4015U(...) \,
-#define Z_IS_4016_EQ_4016(...)   \,
-#define Z_IS_4016U_EQ_4016(...)  \,
-#define Z_IS_4016_EQ_4016U(...)  \,
-#define Z_IS_4016U_EQ_4016U(...) \,
-#define Z_IS_4017_EQ_4017(...)   \,
-#define Z_IS_4017U_EQ_4017(...)  \,
-#define Z_IS_4017_EQ_4017U(...)  \,
-#define Z_IS_4017U_EQ_4017U(...) \,
-#define Z_IS_4018_EQ_4018(...)   \,
-#define Z_IS_4018U_EQ_4018(...)  \,
-#define Z_IS_4018_EQ_4018U(...)  \,
-#define Z_IS_4018U_EQ_4018U(...) \,
-#define Z_IS_4019_EQ_4019(...)   \,
-#define Z_IS_4019U_EQ_4019(...)  \,
-#define Z_IS_4019_EQ_4019U(...)  \,
-#define Z_IS_4019U_EQ_4019U(...) \,
-#define Z_IS_4020_EQ_4020(...)   \,
-#define Z_IS_4020U_EQ_4020(...)  \,
-#define Z_IS_4020_EQ_4020U(...)  \,
-#define Z_IS_4020U_EQ_4020U(...) \,
-#define Z_IS_4021_EQ_4021(...)   \,
-#define Z_IS_4021U_EQ_4021(...)  \,
-#define Z_IS_4021_EQ_4021U(...)  \,
-#define Z_IS_4021U_EQ_4021U(...) \,
-#define Z_IS_4022_EQ_4022(...)   \,
-#define Z_IS_4022U_EQ_4022(...)  \,
-#define Z_IS_4022_EQ_4022U(...)  \,
-#define Z_IS_4022U_EQ_4022U(...) \,
-#define Z_IS_4023_EQ_4023(...)   \,
-#define Z_IS_4023U_EQ_4023(...)  \,
-#define Z_IS_4023_EQ_4023U(...)  \,
-#define Z_IS_4023U_EQ_4023U(...) \,
-#define Z_IS_4024_EQ_4024(...)   \,
-#define Z_IS_4024U_EQ_4024(...)  \,
-#define Z_IS_4024_EQ_4024U(...)  \,
-#define Z_IS_4024U_EQ_4024U(...) \,
-#define Z_IS_4025_EQ_4025(...)   \,
-#define Z_IS_4025U_EQ_4025(...)  \,
-#define Z_IS_4025_EQ_4025U(...)  \,
-#define Z_IS_4025U_EQ_4025U(...) \,
-#define Z_IS_4026_EQ_4026(...)   \,
-#define Z_IS_4026U_EQ_4026(...)  \,
-#define Z_IS_4026_EQ_4026U(...)  \,
-#define Z_IS_4026U_EQ_4026U(...) \,
-#define Z_IS_4027_EQ_4027(...)   \,
-#define Z_IS_4027U_EQ_4027(...)  \,
-#define Z_IS_4027_EQ_4027U(...)  \,
-#define Z_IS_4027U_EQ_4027U(...) \,
-#define Z_IS_4028_EQ_4028(...)   \,
-#define Z_IS_4028U_EQ_4028(...)  \,
-#define Z_IS_4028_EQ_4028U(...)  \,
-#define Z_IS_4028U_EQ_4028U(...) \,
-#define Z_IS_4029_EQ_4029(...)   \,
-#define Z_IS_4029U_EQ_4029(...)  \,
-#define Z_IS_4029_EQ_4029U(...)  \,
-#define Z_IS_4029U_EQ_4029U(...) \,
-#define Z_IS_4030_EQ_4030(...)   \,
-#define Z_IS_4030U_EQ_4030(...)  \,
-#define Z_IS_4030_EQ_4030U(...)  \,
-#define Z_IS_4030U_EQ_4030U(...) \,
-#define Z_IS_4031_EQ_4031(...)   \,
-#define Z_IS_4031U_EQ_4031(...)  \,
-#define Z_IS_4031_EQ_4031U(...)  \,
-#define Z_IS_4031U_EQ_4031U(...) \,
-#define Z_IS_4032_EQ_4032(...)   \,
-#define Z_IS_4032U_EQ_4032(...)  \,
-#define Z_IS_4032_EQ_4032U(...)  \,
-#define Z_IS_4032U_EQ_4032U(...) \,
-#define Z_IS_4033_EQ_4033(...)   \,
-#define Z_IS_4033U_EQ_4033(...)  \,
-#define Z_IS_4033_EQ_4033U(...)  \,
-#define Z_IS_4033U_EQ_4033U(...) \,
-#define Z_IS_4034_EQ_4034(...)   \,
-#define Z_IS_4034U_EQ_4034(...)  \,
-#define Z_IS_4034_EQ_4034U(...)  \,
-#define Z_IS_4034U_EQ_4034U(...) \,
-#define Z_IS_4035_EQ_4035(...)   \,
-#define Z_IS_4035U_EQ_4035(...)  \,
-#define Z_IS_4035_EQ_4035U(...)  \,
-#define Z_IS_4035U_EQ_4035U(...) \,
-#define Z_IS_4036_EQ_4036(...)   \,
-#define Z_IS_4036U_EQ_4036(...)  \,
-#define Z_IS_4036_EQ_4036U(...)  \,
-#define Z_IS_4036U_EQ_4036U(...) \,
-#define Z_IS_4037_EQ_4037(...)   \,
-#define Z_IS_4037U_EQ_4037(...)  \,
-#define Z_IS_4037_EQ_4037U(...)  \,
-#define Z_IS_4037U_EQ_4037U(...) \,
-#define Z_IS_4038_EQ_4038(...)   \,
-#define Z_IS_4038U_EQ_4038(...)  \,
-#define Z_IS_4038_EQ_4038U(...)  \,
-#define Z_IS_4038U_EQ_4038U(...) \,
-#define Z_IS_4039_EQ_4039(...)   \,
-#define Z_IS_4039U_EQ_4039(...)  \,
-#define Z_IS_4039_EQ_4039U(...)  \,
-#define Z_IS_4039U_EQ_4039U(...) \,
-#define Z_IS_4040_EQ_4040(...)   \,
-#define Z_IS_4040U_EQ_4040(...)  \,
-#define Z_IS_4040_EQ_4040U(...)  \,
-#define Z_IS_4040U_EQ_4040U(...) \,
-#define Z_IS_4041_EQ_4041(...)   \,
-#define Z_IS_4041U_EQ_4041(...)  \,
-#define Z_IS_4041_EQ_4041U(...)  \,
-#define Z_IS_4041U_EQ_4041U(...) \,
-#define Z_IS_4042_EQ_4042(...)   \,
-#define Z_IS_4042U_EQ_4042(...)  \,
-#define Z_IS_4042_EQ_4042U(...)  \,
-#define Z_IS_4042U_EQ_4042U(...) \,
-#define Z_IS_4043_EQ_4043(...)   \,
-#define Z_IS_4043U_EQ_4043(...)  \,
-#define Z_IS_4043_EQ_4043U(...)  \,
-#define Z_IS_4043U_EQ_4043U(...) \,
-#define Z_IS_4044_EQ_4044(...)   \,
-#define Z_IS_4044U_EQ_4044(...)  \,
-#define Z_IS_4044_EQ_4044U(...)  \,
-#define Z_IS_4044U_EQ_4044U(...) \,
-#define Z_IS_4045_EQ_4045(...)   \,
-#define Z_IS_4045U_EQ_4045(...)  \,
-#define Z_IS_4045_EQ_4045U(...)  \,
-#define Z_IS_4045U_EQ_4045U(...) \,
-#define Z_IS_4046_EQ_4046(...)   \,
-#define Z_IS_4046U_EQ_4046(...)  \,
-#define Z_IS_4046_EQ_4046U(...)  \,
-#define Z_IS_4046U_EQ_4046U(...) \,
-#define Z_IS_4047_EQ_4047(...)   \,
-#define Z_IS_4047U_EQ_4047(...)  \,
-#define Z_IS_4047_EQ_4047U(...)  \,
-#define Z_IS_4047U_EQ_4047U(...) \,
-#define Z_IS_4048_EQ_4048(...)   \,
-#define Z_IS_4048U_EQ_4048(...)  \,
-#define Z_IS_4048_EQ_4048U(...)  \,
-#define Z_IS_4048U_EQ_4048U(...) \,
-#define Z_IS_4049_EQ_4049(...)   \,
-#define Z_IS_4049U_EQ_4049(...)  \,
-#define Z_IS_4049_EQ_4049U(...)  \,
-#define Z_IS_4049U_EQ_4049U(...) \,
-#define Z_IS_4050_EQ_4050(...)   \,
-#define Z_IS_4050U_EQ_4050(...)  \,
-#define Z_IS_4050_EQ_4050U(...)  \,
-#define Z_IS_4050U_EQ_4050U(...) \,
-#define Z_IS_4051_EQ_4051(...)   \,
-#define Z_IS_4051U_EQ_4051(...)  \,
-#define Z_IS_4051_EQ_4051U(...)  \,
-#define Z_IS_4051U_EQ_4051U(...) \,
-#define Z_IS_4052_EQ_4052(...)   \,
-#define Z_IS_4052U_EQ_4052(...)  \,
-#define Z_IS_4052_EQ_4052U(...)  \,
-#define Z_IS_4052U_EQ_4052U(...) \,
-#define Z_IS_4053_EQ_4053(...)   \,
-#define Z_IS_4053U_EQ_4053(...)  \,
-#define Z_IS_4053_EQ_4053U(...)  \,
-#define Z_IS_4053U_EQ_4053U(...) \,
-#define Z_IS_4054_EQ_4054(...)   \,
-#define Z_IS_4054U_EQ_4054(...)  \,
-#define Z_IS_4054_EQ_4054U(...)  \,
-#define Z_IS_4054U_EQ_4054U(...) \,
-#define Z_IS_4055_EQ_4055(...)   \,
-#define Z_IS_4055U_EQ_4055(...)  \,
-#define Z_IS_4055_EQ_4055U(...)  \,
-#define Z_IS_4055U_EQ_4055U(...) \,
-#define Z_IS_4056_EQ_4056(...)   \,
-#define Z_IS_4056U_EQ_4056(...)  \,
-#define Z_IS_4056_EQ_4056U(...)  \,
-#define Z_IS_4056U_EQ_4056U(...) \,
-#define Z_IS_4057_EQ_4057(...)   \,
-#define Z_IS_4057U_EQ_4057(...)  \,
-#define Z_IS_4057_EQ_4057U(...)  \,
-#define Z_IS_4057U_EQ_4057U(...) \,
-#define Z_IS_4058_EQ_4058(...)   \,
-#define Z_IS_4058U_EQ_4058(...)  \,
-#define Z_IS_4058_EQ_4058U(...)  \,
-#define Z_IS_4058U_EQ_4058U(...) \,
-#define Z_IS_4059_EQ_4059(...)   \,
-#define Z_IS_4059U_EQ_4059(...)  \,
-#define Z_IS_4059_EQ_4059U(...)  \,
-#define Z_IS_4059U_EQ_4059U(...) \,
-#define Z_IS_4060_EQ_4060(...)   \,
-#define Z_IS_4060U_EQ_4060(...)  \,
-#define Z_IS_4060_EQ_4060U(...)  \,
-#define Z_IS_4060U_EQ_4060U(...) \,
-#define Z_IS_4061_EQ_4061(...)   \,
-#define Z_IS_4061U_EQ_4061(...)  \,
-#define Z_IS_4061_EQ_4061U(...)  \,
-#define Z_IS_4061U_EQ_4061U(...) \,
-#define Z_IS_4062_EQ_4062(...)   \,
-#define Z_IS_4062U_EQ_4062(...)  \,
-#define Z_IS_4062_EQ_4062U(...)  \,
-#define Z_IS_4062U_EQ_4062U(...) \,
-#define Z_IS_4063_EQ_4063(...)   \,
-#define Z_IS_4063U_EQ_4063(...)  \,
-#define Z_IS_4063_EQ_4063U(...)  \,
-#define Z_IS_4063U_EQ_4063U(...) \,
-#define Z_IS_4064_EQ_4064(...)   \,
-#define Z_IS_4064U_EQ_4064(...)  \,
-#define Z_IS_4064_EQ_4064U(...)  \,
-#define Z_IS_4064U_EQ_4064U(...) \,
-#define Z_IS_4065_EQ_4065(...)   \,
-#define Z_IS_4065U_EQ_4065(...)  \,
-#define Z_IS_4065_EQ_4065U(...)  \,
-#define Z_IS_4065U_EQ_4065U(...) \,
-#define Z_IS_4066_EQ_4066(...)   \,
-#define Z_IS_4066U_EQ_4066(...)  \,
-#define Z_IS_4066_EQ_4066U(...)  \,
-#define Z_IS_4066U_EQ_4066U(...) \,
-#define Z_IS_4067_EQ_4067(...)   \,
-#define Z_IS_4067U_EQ_4067(...)  \,
-#define Z_IS_4067_EQ_4067U(...)  \,
-#define Z_IS_4067U_EQ_4067U(...) \,
-#define Z_IS_4068_EQ_4068(...)   \,
-#define Z_IS_4068U_EQ_4068(...)  \,
-#define Z_IS_4068_EQ_4068U(...)  \,
-#define Z_IS_4068U_EQ_4068U(...) \,
-#define Z_IS_4069_EQ_4069(...)   \,
-#define Z_IS_4069U_EQ_4069(...)  \,
-#define Z_IS_4069_EQ_4069U(...)  \,
-#define Z_IS_4069U_EQ_4069U(...) \,
-#define Z_IS_4070_EQ_4070(...)   \,
-#define Z_IS_4070U_EQ_4070(...)  \,
-#define Z_IS_4070_EQ_4070U(...)  \,
-#define Z_IS_4070U_EQ_4070U(...) \,
-#define Z_IS_4071_EQ_4071(...)   \,
-#define Z_IS_4071U_EQ_4071(...)  \,
-#define Z_IS_4071_EQ_4071U(...)  \,
-#define Z_IS_4071U_EQ_4071U(...) \,
-#define Z_IS_4072_EQ_4072(...)   \,
-#define Z_IS_4072U_EQ_4072(...)  \,
-#define Z_IS_4072_EQ_4072U(...)  \,
-#define Z_IS_4072U_EQ_4072U(...) \,
-#define Z_IS_4073_EQ_4073(...)   \,
-#define Z_IS_4073U_EQ_4073(...)  \,
-#define Z_IS_4073_EQ_4073U(...)  \,
-#define Z_IS_4073U_EQ_4073U(...) \,
-#define Z_IS_4074_EQ_4074(...)   \,
-#define Z_IS_4074U_EQ_4074(...)  \,
-#define Z_IS_4074_EQ_4074U(...)  \,
-#define Z_IS_4074U_EQ_4074U(...) \,
-#define Z_IS_4075_EQ_4075(...)   \,
-#define Z_IS_4075U_EQ_4075(...)  \,
-#define Z_IS_4075_EQ_4075U(...)  \,
-#define Z_IS_4075U_EQ_4075U(...) \,
-#define Z_IS_4076_EQ_4076(...)   \,
-#define Z_IS_4076U_EQ_4076(...)  \,
-#define Z_IS_4076_EQ_4076U(...)  \,
-#define Z_IS_4076U_EQ_4076U(...) \,
-#define Z_IS_4077_EQ_4077(...)   \,
-#define Z_IS_4077U_EQ_4077(...)  \,
-#define Z_IS_4077_EQ_4077U(...)  \,
-#define Z_IS_4077U_EQ_4077U(...) \,
-#define Z_IS_4078_EQ_4078(...)   \,
-#define Z_IS_4078U_EQ_4078(...)  \,
-#define Z_IS_4078_EQ_4078U(...)  \,
-#define Z_IS_4078U_EQ_4078U(...) \,
-#define Z_IS_4079_EQ_4079(...)   \,
-#define Z_IS_4079U_EQ_4079(...)  \,
-#define Z_IS_4079_EQ_4079U(...)  \,
-#define Z_IS_4079U_EQ_4079U(...) \,
-#define Z_IS_4080_EQ_4080(...)   \,
-#define Z_IS_4080U_EQ_4080(...)  \,
-#define Z_IS_4080_EQ_4080U(...)  \,
-#define Z_IS_4080U_EQ_4080U(...) \,
-#define Z_IS_4081_EQ_4081(...)   \,
-#define Z_IS_4081U_EQ_4081(...)  \,
-#define Z_IS_4081_EQ_4081U(...)  \,
-#define Z_IS_4081U_EQ_4081U(...) \,
-#define Z_IS_4082_EQ_4082(...)   \,
-#define Z_IS_4082U_EQ_4082(...)  \,
-#define Z_IS_4082_EQ_4082U(...)  \,
-#define Z_IS_4082U_EQ_4082U(...) \,
-#define Z_IS_4083_EQ_4083(...)   \,
-#define Z_IS_4083U_EQ_4083(...)  \,
-#define Z_IS_4083_EQ_4083U(...)  \,
-#define Z_IS_4083U_EQ_4083U(...) \,
-#define Z_IS_4084_EQ_4084(...)   \,
-#define Z_IS_4084U_EQ_4084(...)  \,
-#define Z_IS_4084_EQ_4084U(...)  \,
-#define Z_IS_4084U_EQ_4084U(...) \,
-#define Z_IS_4085_EQ_4085(...)   \,
-#define Z_IS_4085U_EQ_4085(...)  \,
-#define Z_IS_4085_EQ_4085U(...)  \,
-#define Z_IS_4085U_EQ_4085U(...) \,
-#define Z_IS_4086_EQ_4086(...)   \,
-#define Z_IS_4086U_EQ_4086(...)  \,
-#define Z_IS_4086_EQ_4086U(...)  \,
-#define Z_IS_4086U_EQ_4086U(...) \,
-#define Z_IS_4087_EQ_4087(...)   \,
-#define Z_IS_4087U_EQ_4087(...)  \,
-#define Z_IS_4087_EQ_4087U(...)  \,
-#define Z_IS_4087U_EQ_4087U(...) \,
-#define Z_IS_4088_EQ_4088(...)   \,
-#define Z_IS_4088U_EQ_4088(...)  \,
-#define Z_IS_4088_EQ_4088U(...)  \,
-#define Z_IS_4088U_EQ_4088U(...) \,
-#define Z_IS_4089_EQ_4089(...)   \,
-#define Z_IS_4089U_EQ_4089(...)  \,
-#define Z_IS_4089_EQ_4089U(...)  \,
-#define Z_IS_4089U_EQ_4089U(...) \,
-#define Z_IS_4090_EQ_4090(...)   \,
-#define Z_IS_4090U_EQ_4090(...)  \,
-#define Z_IS_4090_EQ_4090U(...)  \,
-#define Z_IS_4090U_EQ_4090U(...) \,
-#define Z_IS_4091_EQ_4091(...)   \,
-#define Z_IS_4091U_EQ_4091(...)  \,
-#define Z_IS_4091_EQ_4091U(...)  \,
-#define Z_IS_4091U_EQ_4091U(...) \,
-#define Z_IS_4092_EQ_4092(...)   \,
-#define Z_IS_4092U_EQ_4092(...)  \,
-#define Z_IS_4092_EQ_4092U(...)  \,
-#define Z_IS_4092U_EQ_4092U(...) \,
-#define Z_IS_4093_EQ_4093(...)   \,
-#define Z_IS_4093U_EQ_4093(...)  \,
-#define Z_IS_4093_EQ_4093U(...)  \,
-#define Z_IS_4093U_EQ_4093U(...) \,
-#define Z_IS_4094_EQ_4094(...)   \,
-#define Z_IS_4094U_EQ_4094(...)  \,
-#define Z_IS_4094_EQ_4094U(...)  \,
-#define Z_IS_4094U_EQ_4094U(...) \,
-#define Z_IS_4095_EQ_4095(...)   \,
-#define Z_IS_4095U_EQ_4095(...)  \,
-#define Z_IS_4095_EQ_4095U(...)  \,
-#define Z_IS_4095U_EQ_4095U(...) \,
-#define Z_IS_4096_EQ_4096(...)   \,
-#define Z_IS_4096U_EQ_4096(...)  \,
-#define Z_IS_4096_EQ_4096U(...)  \,
-#define Z_IS_4096U_EQ_4096U(...) \,
+#define Z_IS_0_EQ_0(...) \,
+#define Z_IS_1_EQ_1(...) \,
+#define Z_IS_2_EQ_2(...) \,
+#define Z_IS_3_EQ_3(...) \,
+#define Z_IS_4_EQ_4(...) \,
+#define Z_IS_5_EQ_5(...) \,
+#define Z_IS_6_EQ_6(...) \,
+#define Z_IS_7_EQ_7(...) \,
+#define Z_IS_8_EQ_8(...) \,
+#define Z_IS_9_EQ_9(...) \,
+#define Z_IS_10_EQ_10(...) \,
+#define Z_IS_11_EQ_11(...) \,
+#define Z_IS_12_EQ_12(...) \,
+#define Z_IS_13_EQ_13(...) \,
+#define Z_IS_14_EQ_14(...) \,
+#define Z_IS_15_EQ_15(...) \,
+#define Z_IS_16_EQ_16(...) \,
+#define Z_IS_17_EQ_17(...) \,
+#define Z_IS_18_EQ_18(...) \,
+#define Z_IS_19_EQ_19(...) \,
+#define Z_IS_20_EQ_20(...) \,
+#define Z_IS_21_EQ_21(...) \,
+#define Z_IS_22_EQ_22(...) \,
+#define Z_IS_23_EQ_23(...) \,
+#define Z_IS_24_EQ_24(...) \,
+#define Z_IS_25_EQ_25(...) \,
+#define Z_IS_26_EQ_26(...) \,
+#define Z_IS_27_EQ_27(...) \,
+#define Z_IS_28_EQ_28(...) \,
+#define Z_IS_29_EQ_29(...) \,
+#define Z_IS_30_EQ_30(...) \,
+#define Z_IS_31_EQ_31(...) \,
+#define Z_IS_32_EQ_32(...) \,
+#define Z_IS_33_EQ_33(...) \,
+#define Z_IS_34_EQ_34(...) \,
+#define Z_IS_35_EQ_35(...) \,
+#define Z_IS_36_EQ_36(...) \,
+#define Z_IS_37_EQ_37(...) \,
+#define Z_IS_38_EQ_38(...) \,
+#define Z_IS_39_EQ_39(...) \,
+#define Z_IS_40_EQ_40(...) \,
+#define Z_IS_41_EQ_41(...) \,
+#define Z_IS_42_EQ_42(...) \,
+#define Z_IS_43_EQ_43(...) \,
+#define Z_IS_44_EQ_44(...) \,
+#define Z_IS_45_EQ_45(...) \,
+#define Z_IS_46_EQ_46(...) \,
+#define Z_IS_47_EQ_47(...) \,
+#define Z_IS_48_EQ_48(...) \,
+#define Z_IS_49_EQ_49(...) \,
+#define Z_IS_50_EQ_50(...) \,
+#define Z_IS_51_EQ_51(...) \,
+#define Z_IS_52_EQ_52(...) \,
+#define Z_IS_53_EQ_53(...) \,
+#define Z_IS_54_EQ_54(...) \,
+#define Z_IS_55_EQ_55(...) \,
+#define Z_IS_56_EQ_56(...) \,
+#define Z_IS_57_EQ_57(...) \,
+#define Z_IS_58_EQ_58(...) \,
+#define Z_IS_59_EQ_59(...) \,
+#define Z_IS_60_EQ_60(...) \,
+#define Z_IS_61_EQ_61(...) \,
+#define Z_IS_62_EQ_62(...) \,
+#define Z_IS_63_EQ_63(...) \,
+#define Z_IS_64_EQ_64(...) \,
+#define Z_IS_65_EQ_65(...) \,
+#define Z_IS_66_EQ_66(...) \,
+#define Z_IS_67_EQ_67(...) \,
+#define Z_IS_68_EQ_68(...) \,
+#define Z_IS_69_EQ_69(...) \,
+#define Z_IS_70_EQ_70(...) \,
+#define Z_IS_71_EQ_71(...) \,
+#define Z_IS_72_EQ_72(...) \,
+#define Z_IS_73_EQ_73(...) \,
+#define Z_IS_74_EQ_74(...) \,
+#define Z_IS_75_EQ_75(...) \,
+#define Z_IS_76_EQ_76(...) \,
+#define Z_IS_77_EQ_77(...) \,
+#define Z_IS_78_EQ_78(...) \,
+#define Z_IS_79_EQ_79(...) \,
+#define Z_IS_80_EQ_80(...) \,
+#define Z_IS_81_EQ_81(...) \,
+#define Z_IS_82_EQ_82(...) \,
+#define Z_IS_83_EQ_83(...) \,
+#define Z_IS_84_EQ_84(...) \,
+#define Z_IS_85_EQ_85(...) \,
+#define Z_IS_86_EQ_86(...) \,
+#define Z_IS_87_EQ_87(...) \,
+#define Z_IS_88_EQ_88(...) \,
+#define Z_IS_89_EQ_89(...) \,
+#define Z_IS_90_EQ_90(...) \,
+#define Z_IS_91_EQ_91(...) \,
+#define Z_IS_92_EQ_92(...) \,
+#define Z_IS_93_EQ_93(...) \,
+#define Z_IS_94_EQ_94(...) \,
+#define Z_IS_95_EQ_95(...) \,
+#define Z_IS_96_EQ_96(...) \,
+#define Z_IS_97_EQ_97(...) \,
+#define Z_IS_98_EQ_98(...) \,
+#define Z_IS_99_EQ_99(...) \,
+#define Z_IS_100_EQ_100(...) \,
+#define Z_IS_101_EQ_101(...) \,
+#define Z_IS_102_EQ_102(...) \,
+#define Z_IS_103_EQ_103(...) \,
+#define Z_IS_104_EQ_104(...) \,
+#define Z_IS_105_EQ_105(...) \,
+#define Z_IS_106_EQ_106(...) \,
+#define Z_IS_107_EQ_107(...) \,
+#define Z_IS_108_EQ_108(...) \,
+#define Z_IS_109_EQ_109(...) \,
+#define Z_IS_110_EQ_110(...) \,
+#define Z_IS_111_EQ_111(...) \,
+#define Z_IS_112_EQ_112(...) \,
+#define Z_IS_113_EQ_113(...) \,
+#define Z_IS_114_EQ_114(...) \,
+#define Z_IS_115_EQ_115(...) \,
+#define Z_IS_116_EQ_116(...) \,
+#define Z_IS_117_EQ_117(...) \,
+#define Z_IS_118_EQ_118(...) \,
+#define Z_IS_119_EQ_119(...) \,
+#define Z_IS_120_EQ_120(...) \,
+#define Z_IS_121_EQ_121(...) \,
+#define Z_IS_122_EQ_122(...) \,
+#define Z_IS_123_EQ_123(...) \,
+#define Z_IS_124_EQ_124(...) \,
+#define Z_IS_125_EQ_125(...) \,
+#define Z_IS_126_EQ_126(...) \,
+#define Z_IS_127_EQ_127(...) \,
+#define Z_IS_128_EQ_128(...) \,
+#define Z_IS_129_EQ_129(...) \,
+#define Z_IS_130_EQ_130(...) \,
+#define Z_IS_131_EQ_131(...) \,
+#define Z_IS_132_EQ_132(...) \,
+#define Z_IS_133_EQ_133(...) \,
+#define Z_IS_134_EQ_134(...) \,
+#define Z_IS_135_EQ_135(...) \,
+#define Z_IS_136_EQ_136(...) \,
+#define Z_IS_137_EQ_137(...) \,
+#define Z_IS_138_EQ_138(...) \,
+#define Z_IS_139_EQ_139(...) \,
+#define Z_IS_140_EQ_140(...) \,
+#define Z_IS_141_EQ_141(...) \,
+#define Z_IS_142_EQ_142(...) \,
+#define Z_IS_143_EQ_143(...) \,
+#define Z_IS_144_EQ_144(...) \,
+#define Z_IS_145_EQ_145(...) \,
+#define Z_IS_146_EQ_146(...) \,
+#define Z_IS_147_EQ_147(...) \,
+#define Z_IS_148_EQ_148(...) \,
+#define Z_IS_149_EQ_149(...) \,
+#define Z_IS_150_EQ_150(...) \,
+#define Z_IS_151_EQ_151(...) \,
+#define Z_IS_152_EQ_152(...) \,
+#define Z_IS_153_EQ_153(...) \,
+#define Z_IS_154_EQ_154(...) \,
+#define Z_IS_155_EQ_155(...) \,
+#define Z_IS_156_EQ_156(...) \,
+#define Z_IS_157_EQ_157(...) \,
+#define Z_IS_158_EQ_158(...) \,
+#define Z_IS_159_EQ_159(...) \,
+#define Z_IS_160_EQ_160(...) \,
+#define Z_IS_161_EQ_161(...) \,
+#define Z_IS_162_EQ_162(...) \,
+#define Z_IS_163_EQ_163(...) \,
+#define Z_IS_164_EQ_164(...) \,
+#define Z_IS_165_EQ_165(...) \,
+#define Z_IS_166_EQ_166(...) \,
+#define Z_IS_167_EQ_167(...) \,
+#define Z_IS_168_EQ_168(...) \,
+#define Z_IS_169_EQ_169(...) \,
+#define Z_IS_170_EQ_170(...) \,
+#define Z_IS_171_EQ_171(...) \,
+#define Z_IS_172_EQ_172(...) \,
+#define Z_IS_173_EQ_173(...) \,
+#define Z_IS_174_EQ_174(...) \,
+#define Z_IS_175_EQ_175(...) \,
+#define Z_IS_176_EQ_176(...) \,
+#define Z_IS_177_EQ_177(...) \,
+#define Z_IS_178_EQ_178(...) \,
+#define Z_IS_179_EQ_179(...) \,
+#define Z_IS_180_EQ_180(...) \,
+#define Z_IS_181_EQ_181(...) \,
+#define Z_IS_182_EQ_182(...) \,
+#define Z_IS_183_EQ_183(...) \,
+#define Z_IS_184_EQ_184(...) \,
+#define Z_IS_185_EQ_185(...) \,
+#define Z_IS_186_EQ_186(...) \,
+#define Z_IS_187_EQ_187(...) \,
+#define Z_IS_188_EQ_188(...) \,
+#define Z_IS_189_EQ_189(...) \,
+#define Z_IS_190_EQ_190(...) \,
+#define Z_IS_191_EQ_191(...) \,
+#define Z_IS_192_EQ_192(...) \,
+#define Z_IS_193_EQ_193(...) \,
+#define Z_IS_194_EQ_194(...) \,
+#define Z_IS_195_EQ_195(...) \,
+#define Z_IS_196_EQ_196(...) \,
+#define Z_IS_197_EQ_197(...) \,
+#define Z_IS_198_EQ_198(...) \,
+#define Z_IS_199_EQ_199(...) \,
+#define Z_IS_200_EQ_200(...) \,
+#define Z_IS_201_EQ_201(...) \,
+#define Z_IS_202_EQ_202(...) \,
+#define Z_IS_203_EQ_203(...) \,
+#define Z_IS_204_EQ_204(...) \,
+#define Z_IS_205_EQ_205(...) \,
+#define Z_IS_206_EQ_206(...) \,
+#define Z_IS_207_EQ_207(...) \,
+#define Z_IS_208_EQ_208(...) \,
+#define Z_IS_209_EQ_209(...) \,
+#define Z_IS_210_EQ_210(...) \,
+#define Z_IS_211_EQ_211(...) \,
+#define Z_IS_212_EQ_212(...) \,
+#define Z_IS_213_EQ_213(...) \,
+#define Z_IS_214_EQ_214(...) \,
+#define Z_IS_215_EQ_215(...) \,
+#define Z_IS_216_EQ_216(...) \,
+#define Z_IS_217_EQ_217(...) \,
+#define Z_IS_218_EQ_218(...) \,
+#define Z_IS_219_EQ_219(...) \,
+#define Z_IS_220_EQ_220(...) \,
+#define Z_IS_221_EQ_221(...) \,
+#define Z_IS_222_EQ_222(...) \,
+#define Z_IS_223_EQ_223(...) \,
+#define Z_IS_224_EQ_224(...) \,
+#define Z_IS_225_EQ_225(...) \,
+#define Z_IS_226_EQ_226(...) \,
+#define Z_IS_227_EQ_227(...) \,
+#define Z_IS_228_EQ_228(...) \,
+#define Z_IS_229_EQ_229(...) \,
+#define Z_IS_230_EQ_230(...) \,
+#define Z_IS_231_EQ_231(...) \,
+#define Z_IS_232_EQ_232(...) \,
+#define Z_IS_233_EQ_233(...) \,
+#define Z_IS_234_EQ_234(...) \,
+#define Z_IS_235_EQ_235(...) \,
+#define Z_IS_236_EQ_236(...) \,
+#define Z_IS_237_EQ_237(...) \,
+#define Z_IS_238_EQ_238(...) \,
+#define Z_IS_239_EQ_239(...) \,
+#define Z_IS_240_EQ_240(...) \,
+#define Z_IS_241_EQ_241(...) \,
+#define Z_IS_242_EQ_242(...) \,
+#define Z_IS_243_EQ_243(...) \,
+#define Z_IS_244_EQ_244(...) \,
+#define Z_IS_245_EQ_245(...) \,
+#define Z_IS_246_EQ_246(...) \,
+#define Z_IS_247_EQ_247(...) \,
+#define Z_IS_248_EQ_248(...) \,
+#define Z_IS_249_EQ_249(...) \,
+#define Z_IS_250_EQ_250(...) \,
+#define Z_IS_251_EQ_251(...) \,
+#define Z_IS_252_EQ_252(...) \,
+#define Z_IS_253_EQ_253(...) \,
+#define Z_IS_254_EQ_254(...) \,
+#define Z_IS_255_EQ_255(...) \,
+#define Z_IS_256_EQ_256(...) \,
+#define Z_IS_257_EQ_257(...) \,
+#define Z_IS_258_EQ_258(...) \,
+#define Z_IS_259_EQ_259(...) \,
+#define Z_IS_260_EQ_260(...) \,
+#define Z_IS_261_EQ_261(...) \,
+#define Z_IS_262_EQ_262(...) \,
+#define Z_IS_263_EQ_263(...) \,
+#define Z_IS_264_EQ_264(...) \,
+#define Z_IS_265_EQ_265(...) \,
+#define Z_IS_266_EQ_266(...) \,
+#define Z_IS_267_EQ_267(...) \,
+#define Z_IS_268_EQ_268(...) \,
+#define Z_IS_269_EQ_269(...) \,
+#define Z_IS_270_EQ_270(...) \,
+#define Z_IS_271_EQ_271(...) \,
+#define Z_IS_272_EQ_272(...) \,
+#define Z_IS_273_EQ_273(...) \,
+#define Z_IS_274_EQ_274(...) \,
+#define Z_IS_275_EQ_275(...) \,
+#define Z_IS_276_EQ_276(...) \,
+#define Z_IS_277_EQ_277(...) \,
+#define Z_IS_278_EQ_278(...) \,
+#define Z_IS_279_EQ_279(...) \,
+#define Z_IS_280_EQ_280(...) \,
+#define Z_IS_281_EQ_281(...) \,
+#define Z_IS_282_EQ_282(...) \,
+#define Z_IS_283_EQ_283(...) \,
+#define Z_IS_284_EQ_284(...) \,
+#define Z_IS_285_EQ_285(...) \,
+#define Z_IS_286_EQ_286(...) \,
+#define Z_IS_287_EQ_287(...) \,
+#define Z_IS_288_EQ_288(...) \,
+#define Z_IS_289_EQ_289(...) \,
+#define Z_IS_290_EQ_290(...) \,
+#define Z_IS_291_EQ_291(...) \,
+#define Z_IS_292_EQ_292(...) \,
+#define Z_IS_293_EQ_293(...) \,
+#define Z_IS_294_EQ_294(...) \,
+#define Z_IS_295_EQ_295(...) \,
+#define Z_IS_296_EQ_296(...) \,
+#define Z_IS_297_EQ_297(...) \,
+#define Z_IS_298_EQ_298(...) \,
+#define Z_IS_299_EQ_299(...) \,
+#define Z_IS_300_EQ_300(...) \,
+#define Z_IS_301_EQ_301(...) \,
+#define Z_IS_302_EQ_302(...) \,
+#define Z_IS_303_EQ_303(...) \,
+#define Z_IS_304_EQ_304(...) \,
+#define Z_IS_305_EQ_305(...) \,
+#define Z_IS_306_EQ_306(...) \,
+#define Z_IS_307_EQ_307(...) \,
+#define Z_IS_308_EQ_308(...) \,
+#define Z_IS_309_EQ_309(...) \,
+#define Z_IS_310_EQ_310(...) \,
+#define Z_IS_311_EQ_311(...) \,
+#define Z_IS_312_EQ_312(...) \,
+#define Z_IS_313_EQ_313(...) \,
+#define Z_IS_314_EQ_314(...) \,
+#define Z_IS_315_EQ_315(...) \,
+#define Z_IS_316_EQ_316(...) \,
+#define Z_IS_317_EQ_317(...) \,
+#define Z_IS_318_EQ_318(...) \,
+#define Z_IS_319_EQ_319(...) \,
+#define Z_IS_320_EQ_320(...) \,
+#define Z_IS_321_EQ_321(...) \,
+#define Z_IS_322_EQ_322(...) \,
+#define Z_IS_323_EQ_323(...) \,
+#define Z_IS_324_EQ_324(...) \,
+#define Z_IS_325_EQ_325(...) \,
+#define Z_IS_326_EQ_326(...) \,
+#define Z_IS_327_EQ_327(...) \,
+#define Z_IS_328_EQ_328(...) \,
+#define Z_IS_329_EQ_329(...) \,
+#define Z_IS_330_EQ_330(...) \,
+#define Z_IS_331_EQ_331(...) \,
+#define Z_IS_332_EQ_332(...) \,
+#define Z_IS_333_EQ_333(...) \,
+#define Z_IS_334_EQ_334(...) \,
+#define Z_IS_335_EQ_335(...) \,
+#define Z_IS_336_EQ_336(...) \,
+#define Z_IS_337_EQ_337(...) \,
+#define Z_IS_338_EQ_338(...) \,
+#define Z_IS_339_EQ_339(...) \,
+#define Z_IS_340_EQ_340(...) \,
+#define Z_IS_341_EQ_341(...) \,
+#define Z_IS_342_EQ_342(...) \,
+#define Z_IS_343_EQ_343(...) \,
+#define Z_IS_344_EQ_344(...) \,
+#define Z_IS_345_EQ_345(...) \,
+#define Z_IS_346_EQ_346(...) \,
+#define Z_IS_347_EQ_347(...) \,
+#define Z_IS_348_EQ_348(...) \,
+#define Z_IS_349_EQ_349(...) \,
+#define Z_IS_350_EQ_350(...) \,
+#define Z_IS_351_EQ_351(...) \,
+#define Z_IS_352_EQ_352(...) \,
+#define Z_IS_353_EQ_353(...) \,
+#define Z_IS_354_EQ_354(...) \,
+#define Z_IS_355_EQ_355(...) \,
+#define Z_IS_356_EQ_356(...) \,
+#define Z_IS_357_EQ_357(...) \,
+#define Z_IS_358_EQ_358(...) \,
+#define Z_IS_359_EQ_359(...) \,
+#define Z_IS_360_EQ_360(...) \,
+#define Z_IS_361_EQ_361(...) \,
+#define Z_IS_362_EQ_362(...) \,
+#define Z_IS_363_EQ_363(...) \,
+#define Z_IS_364_EQ_364(...) \,
+#define Z_IS_365_EQ_365(...) \,
+#define Z_IS_366_EQ_366(...) \,
+#define Z_IS_367_EQ_367(...) \,
+#define Z_IS_368_EQ_368(...) \,
+#define Z_IS_369_EQ_369(...) \,
+#define Z_IS_370_EQ_370(...) \,
+#define Z_IS_371_EQ_371(...) \,
+#define Z_IS_372_EQ_372(...) \,
+#define Z_IS_373_EQ_373(...) \,
+#define Z_IS_374_EQ_374(...) \,
+#define Z_IS_375_EQ_375(...) \,
+#define Z_IS_376_EQ_376(...) \,
+#define Z_IS_377_EQ_377(...) \,
+#define Z_IS_378_EQ_378(...) \,
+#define Z_IS_379_EQ_379(...) \,
+#define Z_IS_380_EQ_380(...) \,
+#define Z_IS_381_EQ_381(...) \,
+#define Z_IS_382_EQ_382(...) \,
+#define Z_IS_383_EQ_383(...) \,
+#define Z_IS_384_EQ_384(...) \,
+#define Z_IS_385_EQ_385(...) \,
+#define Z_IS_386_EQ_386(...) \,
+#define Z_IS_387_EQ_387(...) \,
+#define Z_IS_388_EQ_388(...) \,
+#define Z_IS_389_EQ_389(...) \,
+#define Z_IS_390_EQ_390(...) \,
+#define Z_IS_391_EQ_391(...) \,
+#define Z_IS_392_EQ_392(...) \,
+#define Z_IS_393_EQ_393(...) \,
+#define Z_IS_394_EQ_394(...) \,
+#define Z_IS_395_EQ_395(...) \,
+#define Z_IS_396_EQ_396(...) \,
+#define Z_IS_397_EQ_397(...) \,
+#define Z_IS_398_EQ_398(...) \,
+#define Z_IS_399_EQ_399(...) \,
+#define Z_IS_400_EQ_400(...) \,
+#define Z_IS_401_EQ_401(...) \,
+#define Z_IS_402_EQ_402(...) \,
+#define Z_IS_403_EQ_403(...) \,
+#define Z_IS_404_EQ_404(...) \,
+#define Z_IS_405_EQ_405(...) \,
+#define Z_IS_406_EQ_406(...) \,
+#define Z_IS_407_EQ_407(...) \,
+#define Z_IS_408_EQ_408(...) \,
+#define Z_IS_409_EQ_409(...) \,
+#define Z_IS_410_EQ_410(...) \,
+#define Z_IS_411_EQ_411(...) \,
+#define Z_IS_412_EQ_412(...) \,
+#define Z_IS_413_EQ_413(...) \,
+#define Z_IS_414_EQ_414(...) \,
+#define Z_IS_415_EQ_415(...) \,
+#define Z_IS_416_EQ_416(...) \,
+#define Z_IS_417_EQ_417(...) \,
+#define Z_IS_418_EQ_418(...) \,
+#define Z_IS_419_EQ_419(...) \,
+#define Z_IS_420_EQ_420(...) \,
+#define Z_IS_421_EQ_421(...) \,
+#define Z_IS_422_EQ_422(...) \,
+#define Z_IS_423_EQ_423(...) \,
+#define Z_IS_424_EQ_424(...) \,
+#define Z_IS_425_EQ_425(...) \,
+#define Z_IS_426_EQ_426(...) \,
+#define Z_IS_427_EQ_427(...) \,
+#define Z_IS_428_EQ_428(...) \,
+#define Z_IS_429_EQ_429(...) \,
+#define Z_IS_430_EQ_430(...) \,
+#define Z_IS_431_EQ_431(...) \,
+#define Z_IS_432_EQ_432(...) \,
+#define Z_IS_433_EQ_433(...) \,
+#define Z_IS_434_EQ_434(...) \,
+#define Z_IS_435_EQ_435(...) \,
+#define Z_IS_436_EQ_436(...) \,
+#define Z_IS_437_EQ_437(...) \,
+#define Z_IS_438_EQ_438(...) \,
+#define Z_IS_439_EQ_439(...) \,
+#define Z_IS_440_EQ_440(...) \,
+#define Z_IS_441_EQ_441(...) \,
+#define Z_IS_442_EQ_442(...) \,
+#define Z_IS_443_EQ_443(...) \,
+#define Z_IS_444_EQ_444(...) \,
+#define Z_IS_445_EQ_445(...) \,
+#define Z_IS_446_EQ_446(...) \,
+#define Z_IS_447_EQ_447(...) \,
+#define Z_IS_448_EQ_448(...) \,
+#define Z_IS_449_EQ_449(...) \,
+#define Z_IS_450_EQ_450(...) \,
+#define Z_IS_451_EQ_451(...) \,
+#define Z_IS_452_EQ_452(...) \,
+#define Z_IS_453_EQ_453(...) \,
+#define Z_IS_454_EQ_454(...) \,
+#define Z_IS_455_EQ_455(...) \,
+#define Z_IS_456_EQ_456(...) \,
+#define Z_IS_457_EQ_457(...) \,
+#define Z_IS_458_EQ_458(...) \,
+#define Z_IS_459_EQ_459(...) \,
+#define Z_IS_460_EQ_460(...) \,
+#define Z_IS_461_EQ_461(...) \,
+#define Z_IS_462_EQ_462(...) \,
+#define Z_IS_463_EQ_463(...) \,
+#define Z_IS_464_EQ_464(...) \,
+#define Z_IS_465_EQ_465(...) \,
+#define Z_IS_466_EQ_466(...) \,
+#define Z_IS_467_EQ_467(...) \,
+#define Z_IS_468_EQ_468(...) \,
+#define Z_IS_469_EQ_469(...) \,
+#define Z_IS_470_EQ_470(...) \,
+#define Z_IS_471_EQ_471(...) \,
+#define Z_IS_472_EQ_472(...) \,
+#define Z_IS_473_EQ_473(...) \,
+#define Z_IS_474_EQ_474(...) \,
+#define Z_IS_475_EQ_475(...) \,
+#define Z_IS_476_EQ_476(...) \,
+#define Z_IS_477_EQ_477(...) \,
+#define Z_IS_478_EQ_478(...) \,
+#define Z_IS_479_EQ_479(...) \,
+#define Z_IS_480_EQ_480(...) \,
+#define Z_IS_481_EQ_481(...) \,
+#define Z_IS_482_EQ_482(...) \,
+#define Z_IS_483_EQ_483(...) \,
+#define Z_IS_484_EQ_484(...) \,
+#define Z_IS_485_EQ_485(...) \,
+#define Z_IS_486_EQ_486(...) \,
+#define Z_IS_487_EQ_487(...) \,
+#define Z_IS_488_EQ_488(...) \,
+#define Z_IS_489_EQ_489(...) \,
+#define Z_IS_490_EQ_490(...) \,
+#define Z_IS_491_EQ_491(...) \,
+#define Z_IS_492_EQ_492(...) \,
+#define Z_IS_493_EQ_493(...) \,
+#define Z_IS_494_EQ_494(...) \,
+#define Z_IS_495_EQ_495(...) \,
+#define Z_IS_496_EQ_496(...) \,
+#define Z_IS_497_EQ_497(...) \,
+#define Z_IS_498_EQ_498(...) \,
+#define Z_IS_499_EQ_499(...) \,
+#define Z_IS_500_EQ_500(...) \,
+#define Z_IS_501_EQ_501(...) \,
+#define Z_IS_502_EQ_502(...) \,
+#define Z_IS_503_EQ_503(...) \,
+#define Z_IS_504_EQ_504(...) \,
+#define Z_IS_505_EQ_505(...) \,
+#define Z_IS_506_EQ_506(...) \,
+#define Z_IS_507_EQ_507(...) \,
+#define Z_IS_508_EQ_508(...) \,
+#define Z_IS_509_EQ_509(...) \,
+#define Z_IS_510_EQ_510(...) \,
+#define Z_IS_511_EQ_511(...) \,
+#define Z_IS_512_EQ_512(...) \,
+#define Z_IS_513_EQ_513(...) \,
+#define Z_IS_514_EQ_514(...) \,
+#define Z_IS_515_EQ_515(...) \,
+#define Z_IS_516_EQ_516(...) \,
+#define Z_IS_517_EQ_517(...) \,
+#define Z_IS_518_EQ_518(...) \,
+#define Z_IS_519_EQ_519(...) \,
+#define Z_IS_520_EQ_520(...) \,
+#define Z_IS_521_EQ_521(...) \,
+#define Z_IS_522_EQ_522(...) \,
+#define Z_IS_523_EQ_523(...) \,
+#define Z_IS_524_EQ_524(...) \,
+#define Z_IS_525_EQ_525(...) \,
+#define Z_IS_526_EQ_526(...) \,
+#define Z_IS_527_EQ_527(...) \,
+#define Z_IS_528_EQ_528(...) \,
+#define Z_IS_529_EQ_529(...) \,
+#define Z_IS_530_EQ_530(...) \,
+#define Z_IS_531_EQ_531(...) \,
+#define Z_IS_532_EQ_532(...) \,
+#define Z_IS_533_EQ_533(...) \,
+#define Z_IS_534_EQ_534(...) \,
+#define Z_IS_535_EQ_535(...) \,
+#define Z_IS_536_EQ_536(...) \,
+#define Z_IS_537_EQ_537(...) \,
+#define Z_IS_538_EQ_538(...) \,
+#define Z_IS_539_EQ_539(...) \,
+#define Z_IS_540_EQ_540(...) \,
+#define Z_IS_541_EQ_541(...) \,
+#define Z_IS_542_EQ_542(...) \,
+#define Z_IS_543_EQ_543(...) \,
+#define Z_IS_544_EQ_544(...) \,
+#define Z_IS_545_EQ_545(...) \,
+#define Z_IS_546_EQ_546(...) \,
+#define Z_IS_547_EQ_547(...) \,
+#define Z_IS_548_EQ_548(...) \,
+#define Z_IS_549_EQ_549(...) \,
+#define Z_IS_550_EQ_550(...) \,
+#define Z_IS_551_EQ_551(...) \,
+#define Z_IS_552_EQ_552(...) \,
+#define Z_IS_553_EQ_553(...) \,
+#define Z_IS_554_EQ_554(...) \,
+#define Z_IS_555_EQ_555(...) \,
+#define Z_IS_556_EQ_556(...) \,
+#define Z_IS_557_EQ_557(...) \,
+#define Z_IS_558_EQ_558(...) \,
+#define Z_IS_559_EQ_559(...) \,
+#define Z_IS_560_EQ_560(...) \,
+#define Z_IS_561_EQ_561(...) \,
+#define Z_IS_562_EQ_562(...) \,
+#define Z_IS_563_EQ_563(...) \,
+#define Z_IS_564_EQ_564(...) \,
+#define Z_IS_565_EQ_565(...) \,
+#define Z_IS_566_EQ_566(...) \,
+#define Z_IS_567_EQ_567(...) \,
+#define Z_IS_568_EQ_568(...) \,
+#define Z_IS_569_EQ_569(...) \,
+#define Z_IS_570_EQ_570(...) \,
+#define Z_IS_571_EQ_571(...) \,
+#define Z_IS_572_EQ_572(...) \,
+#define Z_IS_573_EQ_573(...) \,
+#define Z_IS_574_EQ_574(...) \,
+#define Z_IS_575_EQ_575(...) \,
+#define Z_IS_576_EQ_576(...) \,
+#define Z_IS_577_EQ_577(...) \,
+#define Z_IS_578_EQ_578(...) \,
+#define Z_IS_579_EQ_579(...) \,
+#define Z_IS_580_EQ_580(...) \,
+#define Z_IS_581_EQ_581(...) \,
+#define Z_IS_582_EQ_582(...) \,
+#define Z_IS_583_EQ_583(...) \,
+#define Z_IS_584_EQ_584(...) \,
+#define Z_IS_585_EQ_585(...) \,
+#define Z_IS_586_EQ_586(...) \,
+#define Z_IS_587_EQ_587(...) \,
+#define Z_IS_588_EQ_588(...) \,
+#define Z_IS_589_EQ_589(...) \,
+#define Z_IS_590_EQ_590(...) \,
+#define Z_IS_591_EQ_591(...) \,
+#define Z_IS_592_EQ_592(...) \,
+#define Z_IS_593_EQ_593(...) \,
+#define Z_IS_594_EQ_594(...) \,
+#define Z_IS_595_EQ_595(...) \,
+#define Z_IS_596_EQ_596(...) \,
+#define Z_IS_597_EQ_597(...) \,
+#define Z_IS_598_EQ_598(...) \,
+#define Z_IS_599_EQ_599(...) \,
+#define Z_IS_600_EQ_600(...) \,
+#define Z_IS_601_EQ_601(...) \,
+#define Z_IS_602_EQ_602(...) \,
+#define Z_IS_603_EQ_603(...) \,
+#define Z_IS_604_EQ_604(...) \,
+#define Z_IS_605_EQ_605(...) \,
+#define Z_IS_606_EQ_606(...) \,
+#define Z_IS_607_EQ_607(...) \,
+#define Z_IS_608_EQ_608(...) \,
+#define Z_IS_609_EQ_609(...) \,
+#define Z_IS_610_EQ_610(...) \,
+#define Z_IS_611_EQ_611(...) \,
+#define Z_IS_612_EQ_612(...) \,
+#define Z_IS_613_EQ_613(...) \,
+#define Z_IS_614_EQ_614(...) \,
+#define Z_IS_615_EQ_615(...) \,
+#define Z_IS_616_EQ_616(...) \,
+#define Z_IS_617_EQ_617(...) \,
+#define Z_IS_618_EQ_618(...) \,
+#define Z_IS_619_EQ_619(...) \,
+#define Z_IS_620_EQ_620(...) \,
+#define Z_IS_621_EQ_621(...) \,
+#define Z_IS_622_EQ_622(...) \,
+#define Z_IS_623_EQ_623(...) \,
+#define Z_IS_624_EQ_624(...) \,
+#define Z_IS_625_EQ_625(...) \,
+#define Z_IS_626_EQ_626(...) \,
+#define Z_IS_627_EQ_627(...) \,
+#define Z_IS_628_EQ_628(...) \,
+#define Z_IS_629_EQ_629(...) \,
+#define Z_IS_630_EQ_630(...) \,
+#define Z_IS_631_EQ_631(...) \,
+#define Z_IS_632_EQ_632(...) \,
+#define Z_IS_633_EQ_633(...) \,
+#define Z_IS_634_EQ_634(...) \,
+#define Z_IS_635_EQ_635(...) \,
+#define Z_IS_636_EQ_636(...) \,
+#define Z_IS_637_EQ_637(...) \,
+#define Z_IS_638_EQ_638(...) \,
+#define Z_IS_639_EQ_639(...) \,
+#define Z_IS_640_EQ_640(...) \,
+#define Z_IS_641_EQ_641(...) \,
+#define Z_IS_642_EQ_642(...) \,
+#define Z_IS_643_EQ_643(...) \,
+#define Z_IS_644_EQ_644(...) \,
+#define Z_IS_645_EQ_645(...) \,
+#define Z_IS_646_EQ_646(...) \,
+#define Z_IS_647_EQ_647(...) \,
+#define Z_IS_648_EQ_648(...) \,
+#define Z_IS_649_EQ_649(...) \,
+#define Z_IS_650_EQ_650(...) \,
+#define Z_IS_651_EQ_651(...) \,
+#define Z_IS_652_EQ_652(...) \,
+#define Z_IS_653_EQ_653(...) \,
+#define Z_IS_654_EQ_654(...) \,
+#define Z_IS_655_EQ_655(...) \,
+#define Z_IS_656_EQ_656(...) \,
+#define Z_IS_657_EQ_657(...) \,
+#define Z_IS_658_EQ_658(...) \,
+#define Z_IS_659_EQ_659(...) \,
+#define Z_IS_660_EQ_660(...) \,
+#define Z_IS_661_EQ_661(...) \,
+#define Z_IS_662_EQ_662(...) \,
+#define Z_IS_663_EQ_663(...) \,
+#define Z_IS_664_EQ_664(...) \,
+#define Z_IS_665_EQ_665(...) \,
+#define Z_IS_666_EQ_666(...) \,
+#define Z_IS_667_EQ_667(...) \,
+#define Z_IS_668_EQ_668(...) \,
+#define Z_IS_669_EQ_669(...) \,
+#define Z_IS_670_EQ_670(...) \,
+#define Z_IS_671_EQ_671(...) \,
+#define Z_IS_672_EQ_672(...) \,
+#define Z_IS_673_EQ_673(...) \,
+#define Z_IS_674_EQ_674(...) \,
+#define Z_IS_675_EQ_675(...) \,
+#define Z_IS_676_EQ_676(...) \,
+#define Z_IS_677_EQ_677(...) \,
+#define Z_IS_678_EQ_678(...) \,
+#define Z_IS_679_EQ_679(...) \,
+#define Z_IS_680_EQ_680(...) \,
+#define Z_IS_681_EQ_681(...) \,
+#define Z_IS_682_EQ_682(...) \,
+#define Z_IS_683_EQ_683(...) \,
+#define Z_IS_684_EQ_684(...) \,
+#define Z_IS_685_EQ_685(...) \,
+#define Z_IS_686_EQ_686(...) \,
+#define Z_IS_687_EQ_687(...) \,
+#define Z_IS_688_EQ_688(...) \,
+#define Z_IS_689_EQ_689(...) \,
+#define Z_IS_690_EQ_690(...) \,
+#define Z_IS_691_EQ_691(...) \,
+#define Z_IS_692_EQ_692(...) \,
+#define Z_IS_693_EQ_693(...) \,
+#define Z_IS_694_EQ_694(...) \,
+#define Z_IS_695_EQ_695(...) \,
+#define Z_IS_696_EQ_696(...) \,
+#define Z_IS_697_EQ_697(...) \,
+#define Z_IS_698_EQ_698(...) \,
+#define Z_IS_699_EQ_699(...) \,
+#define Z_IS_700_EQ_700(...) \,
+#define Z_IS_701_EQ_701(...) \,
+#define Z_IS_702_EQ_702(...) \,
+#define Z_IS_703_EQ_703(...) \,
+#define Z_IS_704_EQ_704(...) \,
+#define Z_IS_705_EQ_705(...) \,
+#define Z_IS_706_EQ_706(...) \,
+#define Z_IS_707_EQ_707(...) \,
+#define Z_IS_708_EQ_708(...) \,
+#define Z_IS_709_EQ_709(...) \,
+#define Z_IS_710_EQ_710(...) \,
+#define Z_IS_711_EQ_711(...) \,
+#define Z_IS_712_EQ_712(...) \,
+#define Z_IS_713_EQ_713(...) \,
+#define Z_IS_714_EQ_714(...) \,
+#define Z_IS_715_EQ_715(...) \,
+#define Z_IS_716_EQ_716(...) \,
+#define Z_IS_717_EQ_717(...) \,
+#define Z_IS_718_EQ_718(...) \,
+#define Z_IS_719_EQ_719(...) \,
+#define Z_IS_720_EQ_720(...) \,
+#define Z_IS_721_EQ_721(...) \,
+#define Z_IS_722_EQ_722(...) \,
+#define Z_IS_723_EQ_723(...) \,
+#define Z_IS_724_EQ_724(...) \,
+#define Z_IS_725_EQ_725(...) \,
+#define Z_IS_726_EQ_726(...) \,
+#define Z_IS_727_EQ_727(...) \,
+#define Z_IS_728_EQ_728(...) \,
+#define Z_IS_729_EQ_729(...) \,
+#define Z_IS_730_EQ_730(...) \,
+#define Z_IS_731_EQ_731(...) \,
+#define Z_IS_732_EQ_732(...) \,
+#define Z_IS_733_EQ_733(...) \,
+#define Z_IS_734_EQ_734(...) \,
+#define Z_IS_735_EQ_735(...) \,
+#define Z_IS_736_EQ_736(...) \,
+#define Z_IS_737_EQ_737(...) \,
+#define Z_IS_738_EQ_738(...) \,
+#define Z_IS_739_EQ_739(...) \,
+#define Z_IS_740_EQ_740(...) \,
+#define Z_IS_741_EQ_741(...) \,
+#define Z_IS_742_EQ_742(...) \,
+#define Z_IS_743_EQ_743(...) \,
+#define Z_IS_744_EQ_744(...) \,
+#define Z_IS_745_EQ_745(...) \,
+#define Z_IS_746_EQ_746(...) \,
+#define Z_IS_747_EQ_747(...) \,
+#define Z_IS_748_EQ_748(...) \,
+#define Z_IS_749_EQ_749(...) \,
+#define Z_IS_750_EQ_750(...) \,
+#define Z_IS_751_EQ_751(...) \,
+#define Z_IS_752_EQ_752(...) \,
+#define Z_IS_753_EQ_753(...) \,
+#define Z_IS_754_EQ_754(...) \,
+#define Z_IS_755_EQ_755(...) \,
+#define Z_IS_756_EQ_756(...) \,
+#define Z_IS_757_EQ_757(...) \,
+#define Z_IS_758_EQ_758(...) \,
+#define Z_IS_759_EQ_759(...) \,
+#define Z_IS_760_EQ_760(...) \,
+#define Z_IS_761_EQ_761(...) \,
+#define Z_IS_762_EQ_762(...) \,
+#define Z_IS_763_EQ_763(...) \,
+#define Z_IS_764_EQ_764(...) \,
+#define Z_IS_765_EQ_765(...) \,
+#define Z_IS_766_EQ_766(...) \,
+#define Z_IS_767_EQ_767(...) \,
+#define Z_IS_768_EQ_768(...) \,
+#define Z_IS_769_EQ_769(...) \,
+#define Z_IS_770_EQ_770(...) \,
+#define Z_IS_771_EQ_771(...) \,
+#define Z_IS_772_EQ_772(...) \,
+#define Z_IS_773_EQ_773(...) \,
+#define Z_IS_774_EQ_774(...) \,
+#define Z_IS_775_EQ_775(...) \,
+#define Z_IS_776_EQ_776(...) \,
+#define Z_IS_777_EQ_777(...) \,
+#define Z_IS_778_EQ_778(...) \,
+#define Z_IS_779_EQ_779(...) \,
+#define Z_IS_780_EQ_780(...) \,
+#define Z_IS_781_EQ_781(...) \,
+#define Z_IS_782_EQ_782(...) \,
+#define Z_IS_783_EQ_783(...) \,
+#define Z_IS_784_EQ_784(...) \,
+#define Z_IS_785_EQ_785(...) \,
+#define Z_IS_786_EQ_786(...) \,
+#define Z_IS_787_EQ_787(...) \,
+#define Z_IS_788_EQ_788(...) \,
+#define Z_IS_789_EQ_789(...) \,
+#define Z_IS_790_EQ_790(...) \,
+#define Z_IS_791_EQ_791(...) \,
+#define Z_IS_792_EQ_792(...) \,
+#define Z_IS_793_EQ_793(...) \,
+#define Z_IS_794_EQ_794(...) \,
+#define Z_IS_795_EQ_795(...) \,
+#define Z_IS_796_EQ_796(...) \,
+#define Z_IS_797_EQ_797(...) \,
+#define Z_IS_798_EQ_798(...) \,
+#define Z_IS_799_EQ_799(...) \,
+#define Z_IS_800_EQ_800(...) \,
+#define Z_IS_801_EQ_801(...) \,
+#define Z_IS_802_EQ_802(...) \,
+#define Z_IS_803_EQ_803(...) \,
+#define Z_IS_804_EQ_804(...) \,
+#define Z_IS_805_EQ_805(...) \,
+#define Z_IS_806_EQ_806(...) \,
+#define Z_IS_807_EQ_807(...) \,
+#define Z_IS_808_EQ_808(...) \,
+#define Z_IS_809_EQ_809(...) \,
+#define Z_IS_810_EQ_810(...) \,
+#define Z_IS_811_EQ_811(...) \,
+#define Z_IS_812_EQ_812(...) \,
+#define Z_IS_813_EQ_813(...) \,
+#define Z_IS_814_EQ_814(...) \,
+#define Z_IS_815_EQ_815(...) \,
+#define Z_IS_816_EQ_816(...) \,
+#define Z_IS_817_EQ_817(...) \,
+#define Z_IS_818_EQ_818(...) \,
+#define Z_IS_819_EQ_819(...) \,
+#define Z_IS_820_EQ_820(...) \,
+#define Z_IS_821_EQ_821(...) \,
+#define Z_IS_822_EQ_822(...) \,
+#define Z_IS_823_EQ_823(...) \,
+#define Z_IS_824_EQ_824(...) \,
+#define Z_IS_825_EQ_825(...) \,
+#define Z_IS_826_EQ_826(...) \,
+#define Z_IS_827_EQ_827(...) \,
+#define Z_IS_828_EQ_828(...) \,
+#define Z_IS_829_EQ_829(...) \,
+#define Z_IS_830_EQ_830(...) \,
+#define Z_IS_831_EQ_831(...) \,
+#define Z_IS_832_EQ_832(...) \,
+#define Z_IS_833_EQ_833(...) \,
+#define Z_IS_834_EQ_834(...) \,
+#define Z_IS_835_EQ_835(...) \,
+#define Z_IS_836_EQ_836(...) \,
+#define Z_IS_837_EQ_837(...) \,
+#define Z_IS_838_EQ_838(...) \,
+#define Z_IS_839_EQ_839(...) \,
+#define Z_IS_840_EQ_840(...) \,
+#define Z_IS_841_EQ_841(...) \,
+#define Z_IS_842_EQ_842(...) \,
+#define Z_IS_843_EQ_843(...) \,
+#define Z_IS_844_EQ_844(...) \,
+#define Z_IS_845_EQ_845(...) \,
+#define Z_IS_846_EQ_846(...) \,
+#define Z_IS_847_EQ_847(...) \,
+#define Z_IS_848_EQ_848(...) \,
+#define Z_IS_849_EQ_849(...) \,
+#define Z_IS_850_EQ_850(...) \,
+#define Z_IS_851_EQ_851(...) \,
+#define Z_IS_852_EQ_852(...) \,
+#define Z_IS_853_EQ_853(...) \,
+#define Z_IS_854_EQ_854(...) \,
+#define Z_IS_855_EQ_855(...) \,
+#define Z_IS_856_EQ_856(...) \,
+#define Z_IS_857_EQ_857(...) \,
+#define Z_IS_858_EQ_858(...) \,
+#define Z_IS_859_EQ_859(...) \,
+#define Z_IS_860_EQ_860(...) \,
+#define Z_IS_861_EQ_861(...) \,
+#define Z_IS_862_EQ_862(...) \,
+#define Z_IS_863_EQ_863(...) \,
+#define Z_IS_864_EQ_864(...) \,
+#define Z_IS_865_EQ_865(...) \,
+#define Z_IS_866_EQ_866(...) \,
+#define Z_IS_867_EQ_867(...) \,
+#define Z_IS_868_EQ_868(...) \,
+#define Z_IS_869_EQ_869(...) \,
+#define Z_IS_870_EQ_870(...) \,
+#define Z_IS_871_EQ_871(...) \,
+#define Z_IS_872_EQ_872(...) \,
+#define Z_IS_873_EQ_873(...) \,
+#define Z_IS_874_EQ_874(...) \,
+#define Z_IS_875_EQ_875(...) \,
+#define Z_IS_876_EQ_876(...) \,
+#define Z_IS_877_EQ_877(...) \,
+#define Z_IS_878_EQ_878(...) \,
+#define Z_IS_879_EQ_879(...) \,
+#define Z_IS_880_EQ_880(...) \,
+#define Z_IS_881_EQ_881(...) \,
+#define Z_IS_882_EQ_882(...) \,
+#define Z_IS_883_EQ_883(...) \,
+#define Z_IS_884_EQ_884(...) \,
+#define Z_IS_885_EQ_885(...) \,
+#define Z_IS_886_EQ_886(...) \,
+#define Z_IS_887_EQ_887(...) \,
+#define Z_IS_888_EQ_888(...) \,
+#define Z_IS_889_EQ_889(...) \,
+#define Z_IS_890_EQ_890(...) \,
+#define Z_IS_891_EQ_891(...) \,
+#define Z_IS_892_EQ_892(...) \,
+#define Z_IS_893_EQ_893(...) \,
+#define Z_IS_894_EQ_894(...) \,
+#define Z_IS_895_EQ_895(...) \,
+#define Z_IS_896_EQ_896(...) \,
+#define Z_IS_897_EQ_897(...) \,
+#define Z_IS_898_EQ_898(...) \,
+#define Z_IS_899_EQ_899(...) \,
+#define Z_IS_900_EQ_900(...) \,
+#define Z_IS_901_EQ_901(...) \,
+#define Z_IS_902_EQ_902(...) \,
+#define Z_IS_903_EQ_903(...) \,
+#define Z_IS_904_EQ_904(...) \,
+#define Z_IS_905_EQ_905(...) \,
+#define Z_IS_906_EQ_906(...) \,
+#define Z_IS_907_EQ_907(...) \,
+#define Z_IS_908_EQ_908(...) \,
+#define Z_IS_909_EQ_909(...) \,
+#define Z_IS_910_EQ_910(...) \,
+#define Z_IS_911_EQ_911(...) \,
+#define Z_IS_912_EQ_912(...) \,
+#define Z_IS_913_EQ_913(...) \,
+#define Z_IS_914_EQ_914(...) \,
+#define Z_IS_915_EQ_915(...) \,
+#define Z_IS_916_EQ_916(...) \,
+#define Z_IS_917_EQ_917(...) \,
+#define Z_IS_918_EQ_918(...) \,
+#define Z_IS_919_EQ_919(...) \,
+#define Z_IS_920_EQ_920(...) \,
+#define Z_IS_921_EQ_921(...) \,
+#define Z_IS_922_EQ_922(...) \,
+#define Z_IS_923_EQ_923(...) \,
+#define Z_IS_924_EQ_924(...) \,
+#define Z_IS_925_EQ_925(...) \,
+#define Z_IS_926_EQ_926(...) \,
+#define Z_IS_927_EQ_927(...) \,
+#define Z_IS_928_EQ_928(...) \,
+#define Z_IS_929_EQ_929(...) \,
+#define Z_IS_930_EQ_930(...) \,
+#define Z_IS_931_EQ_931(...) \,
+#define Z_IS_932_EQ_932(...) \,
+#define Z_IS_933_EQ_933(...) \,
+#define Z_IS_934_EQ_934(...) \,
+#define Z_IS_935_EQ_935(...) \,
+#define Z_IS_936_EQ_936(...) \,
+#define Z_IS_937_EQ_937(...) \,
+#define Z_IS_938_EQ_938(...) \,
+#define Z_IS_939_EQ_939(...) \,
+#define Z_IS_940_EQ_940(...) \,
+#define Z_IS_941_EQ_941(...) \,
+#define Z_IS_942_EQ_942(...) \,
+#define Z_IS_943_EQ_943(...) \,
+#define Z_IS_944_EQ_944(...) \,
+#define Z_IS_945_EQ_945(...) \,
+#define Z_IS_946_EQ_946(...) \,
+#define Z_IS_947_EQ_947(...) \,
+#define Z_IS_948_EQ_948(...) \,
+#define Z_IS_949_EQ_949(...) \,
+#define Z_IS_950_EQ_950(...) \,
+#define Z_IS_951_EQ_951(...) \,
+#define Z_IS_952_EQ_952(...) \,
+#define Z_IS_953_EQ_953(...) \,
+#define Z_IS_954_EQ_954(...) \,
+#define Z_IS_955_EQ_955(...) \,
+#define Z_IS_956_EQ_956(...) \,
+#define Z_IS_957_EQ_957(...) \,
+#define Z_IS_958_EQ_958(...) \,
+#define Z_IS_959_EQ_959(...) \,
+#define Z_IS_960_EQ_960(...) \,
+#define Z_IS_961_EQ_961(...) \,
+#define Z_IS_962_EQ_962(...) \,
+#define Z_IS_963_EQ_963(...) \,
+#define Z_IS_964_EQ_964(...) \,
+#define Z_IS_965_EQ_965(...) \,
+#define Z_IS_966_EQ_966(...) \,
+#define Z_IS_967_EQ_967(...) \,
+#define Z_IS_968_EQ_968(...) \,
+#define Z_IS_969_EQ_969(...) \,
+#define Z_IS_970_EQ_970(...) \,
+#define Z_IS_971_EQ_971(...) \,
+#define Z_IS_972_EQ_972(...) \,
+#define Z_IS_973_EQ_973(...) \,
+#define Z_IS_974_EQ_974(...) \,
+#define Z_IS_975_EQ_975(...) \,
+#define Z_IS_976_EQ_976(...) \,
+#define Z_IS_977_EQ_977(...) \,
+#define Z_IS_978_EQ_978(...) \,
+#define Z_IS_979_EQ_979(...) \,
+#define Z_IS_980_EQ_980(...) \,
+#define Z_IS_981_EQ_981(...) \,
+#define Z_IS_982_EQ_982(...) \,
+#define Z_IS_983_EQ_983(...) \,
+#define Z_IS_984_EQ_984(...) \,
+#define Z_IS_985_EQ_985(...) \,
+#define Z_IS_986_EQ_986(...) \,
+#define Z_IS_987_EQ_987(...) \,
+#define Z_IS_988_EQ_988(...) \,
+#define Z_IS_989_EQ_989(...) \,
+#define Z_IS_990_EQ_990(...) \,
+#define Z_IS_991_EQ_991(...) \,
+#define Z_IS_992_EQ_992(...) \,
+#define Z_IS_993_EQ_993(...) \,
+#define Z_IS_994_EQ_994(...) \,
+#define Z_IS_995_EQ_995(...) \,
+#define Z_IS_996_EQ_996(...) \,
+#define Z_IS_997_EQ_997(...) \,
+#define Z_IS_998_EQ_998(...) \,
+#define Z_IS_999_EQ_999(...) \,
+#define Z_IS_1000_EQ_1000(...) \,
+#define Z_IS_1001_EQ_1001(...) \,
+#define Z_IS_1002_EQ_1002(...) \,
+#define Z_IS_1003_EQ_1003(...) \,
+#define Z_IS_1004_EQ_1004(...) \,
+#define Z_IS_1005_EQ_1005(...) \,
+#define Z_IS_1006_EQ_1006(...) \,
+#define Z_IS_1007_EQ_1007(...) \,
+#define Z_IS_1008_EQ_1008(...) \,
+#define Z_IS_1009_EQ_1009(...) \,
+#define Z_IS_1010_EQ_1010(...) \,
+#define Z_IS_1011_EQ_1011(...) \,
+#define Z_IS_1012_EQ_1012(...) \,
+#define Z_IS_1013_EQ_1013(...) \,
+#define Z_IS_1014_EQ_1014(...) \,
+#define Z_IS_1015_EQ_1015(...) \,
+#define Z_IS_1016_EQ_1016(...) \,
+#define Z_IS_1017_EQ_1017(...) \,
+#define Z_IS_1018_EQ_1018(...) \,
+#define Z_IS_1019_EQ_1019(...) \,
+#define Z_IS_1020_EQ_1020(...) \,
+#define Z_IS_1021_EQ_1021(...) \,
+#define Z_IS_1022_EQ_1022(...) \,
+#define Z_IS_1023_EQ_1023(...) \,
+#define Z_IS_1024_EQ_1024(...) \,
+#define Z_IS_1025_EQ_1025(...) \,
+#define Z_IS_1026_EQ_1026(...) \,
+#define Z_IS_1027_EQ_1027(...) \,
+#define Z_IS_1028_EQ_1028(...) \,
+#define Z_IS_1029_EQ_1029(...) \,
+#define Z_IS_1030_EQ_1030(...) \,
+#define Z_IS_1031_EQ_1031(...) \,
+#define Z_IS_1032_EQ_1032(...) \,
+#define Z_IS_1033_EQ_1033(...) \,
+#define Z_IS_1034_EQ_1034(...) \,
+#define Z_IS_1035_EQ_1035(...) \,
+#define Z_IS_1036_EQ_1036(...) \,
+#define Z_IS_1037_EQ_1037(...) \,
+#define Z_IS_1038_EQ_1038(...) \,
+#define Z_IS_1039_EQ_1039(...) \,
+#define Z_IS_1040_EQ_1040(...) \,
+#define Z_IS_1041_EQ_1041(...) \,
+#define Z_IS_1042_EQ_1042(...) \,
+#define Z_IS_1043_EQ_1043(...) \,
+#define Z_IS_1044_EQ_1044(...) \,
+#define Z_IS_1045_EQ_1045(...) \,
+#define Z_IS_1046_EQ_1046(...) \,
+#define Z_IS_1047_EQ_1047(...) \,
+#define Z_IS_1048_EQ_1048(...) \,
+#define Z_IS_1049_EQ_1049(...) \,
+#define Z_IS_1050_EQ_1050(...) \,
+#define Z_IS_1051_EQ_1051(...) \,
+#define Z_IS_1052_EQ_1052(...) \,
+#define Z_IS_1053_EQ_1053(...) \,
+#define Z_IS_1054_EQ_1054(...) \,
+#define Z_IS_1055_EQ_1055(...) \,
+#define Z_IS_1056_EQ_1056(...) \,
+#define Z_IS_1057_EQ_1057(...) \,
+#define Z_IS_1058_EQ_1058(...) \,
+#define Z_IS_1059_EQ_1059(...) \,
+#define Z_IS_1060_EQ_1060(...) \,
+#define Z_IS_1061_EQ_1061(...) \,
+#define Z_IS_1062_EQ_1062(...) \,
+#define Z_IS_1063_EQ_1063(...) \,
+#define Z_IS_1064_EQ_1064(...) \,
+#define Z_IS_1065_EQ_1065(...) \,
+#define Z_IS_1066_EQ_1066(...) \,
+#define Z_IS_1067_EQ_1067(...) \,
+#define Z_IS_1068_EQ_1068(...) \,
+#define Z_IS_1069_EQ_1069(...) \,
+#define Z_IS_1070_EQ_1070(...) \,
+#define Z_IS_1071_EQ_1071(...) \,
+#define Z_IS_1072_EQ_1072(...) \,
+#define Z_IS_1073_EQ_1073(...) \,
+#define Z_IS_1074_EQ_1074(...) \,
+#define Z_IS_1075_EQ_1075(...) \,
+#define Z_IS_1076_EQ_1076(...) \,
+#define Z_IS_1077_EQ_1077(...) \,
+#define Z_IS_1078_EQ_1078(...) \,
+#define Z_IS_1079_EQ_1079(...) \,
+#define Z_IS_1080_EQ_1080(...) \,
+#define Z_IS_1081_EQ_1081(...) \,
+#define Z_IS_1082_EQ_1082(...) \,
+#define Z_IS_1083_EQ_1083(...) \,
+#define Z_IS_1084_EQ_1084(...) \,
+#define Z_IS_1085_EQ_1085(...) \,
+#define Z_IS_1086_EQ_1086(...) \,
+#define Z_IS_1087_EQ_1087(...) \,
+#define Z_IS_1088_EQ_1088(...) \,
+#define Z_IS_1089_EQ_1089(...) \,
+#define Z_IS_1090_EQ_1090(...) \,
+#define Z_IS_1091_EQ_1091(...) \,
+#define Z_IS_1092_EQ_1092(...) \,
+#define Z_IS_1093_EQ_1093(...) \,
+#define Z_IS_1094_EQ_1094(...) \,
+#define Z_IS_1095_EQ_1095(...) \,
+#define Z_IS_1096_EQ_1096(...) \,
+#define Z_IS_1097_EQ_1097(...) \,
+#define Z_IS_1098_EQ_1098(...) \,
+#define Z_IS_1099_EQ_1099(...) \,
+#define Z_IS_1100_EQ_1100(...) \,
+#define Z_IS_1101_EQ_1101(...) \,
+#define Z_IS_1102_EQ_1102(...) \,
+#define Z_IS_1103_EQ_1103(...) \,
+#define Z_IS_1104_EQ_1104(...) \,
+#define Z_IS_1105_EQ_1105(...) \,
+#define Z_IS_1106_EQ_1106(...) \,
+#define Z_IS_1107_EQ_1107(...) \,
+#define Z_IS_1108_EQ_1108(...) \,
+#define Z_IS_1109_EQ_1109(...) \,
+#define Z_IS_1110_EQ_1110(...) \,
+#define Z_IS_1111_EQ_1111(...) \,
+#define Z_IS_1112_EQ_1112(...) \,
+#define Z_IS_1113_EQ_1113(...) \,
+#define Z_IS_1114_EQ_1114(...) \,
+#define Z_IS_1115_EQ_1115(...) \,
+#define Z_IS_1116_EQ_1116(...) \,
+#define Z_IS_1117_EQ_1117(...) \,
+#define Z_IS_1118_EQ_1118(...) \,
+#define Z_IS_1119_EQ_1119(...) \,
+#define Z_IS_1120_EQ_1120(...) \,
+#define Z_IS_1121_EQ_1121(...) \,
+#define Z_IS_1122_EQ_1122(...) \,
+#define Z_IS_1123_EQ_1123(...) \,
+#define Z_IS_1124_EQ_1124(...) \,
+#define Z_IS_1125_EQ_1125(...) \,
+#define Z_IS_1126_EQ_1126(...) \,
+#define Z_IS_1127_EQ_1127(...) \,
+#define Z_IS_1128_EQ_1128(...) \,
+#define Z_IS_1129_EQ_1129(...) \,
+#define Z_IS_1130_EQ_1130(...) \,
+#define Z_IS_1131_EQ_1131(...) \,
+#define Z_IS_1132_EQ_1132(...) \,
+#define Z_IS_1133_EQ_1133(...) \,
+#define Z_IS_1134_EQ_1134(...) \,
+#define Z_IS_1135_EQ_1135(...) \,
+#define Z_IS_1136_EQ_1136(...) \,
+#define Z_IS_1137_EQ_1137(...) \,
+#define Z_IS_1138_EQ_1138(...) \,
+#define Z_IS_1139_EQ_1139(...) \,
+#define Z_IS_1140_EQ_1140(...) \,
+#define Z_IS_1141_EQ_1141(...) \,
+#define Z_IS_1142_EQ_1142(...) \,
+#define Z_IS_1143_EQ_1143(...) \,
+#define Z_IS_1144_EQ_1144(...) \,
+#define Z_IS_1145_EQ_1145(...) \,
+#define Z_IS_1146_EQ_1146(...) \,
+#define Z_IS_1147_EQ_1147(...) \,
+#define Z_IS_1148_EQ_1148(...) \,
+#define Z_IS_1149_EQ_1149(...) \,
+#define Z_IS_1150_EQ_1150(...) \,
+#define Z_IS_1151_EQ_1151(...) \,
+#define Z_IS_1152_EQ_1152(...) \,
+#define Z_IS_1153_EQ_1153(...) \,
+#define Z_IS_1154_EQ_1154(...) \,
+#define Z_IS_1155_EQ_1155(...) \,
+#define Z_IS_1156_EQ_1156(...) \,
+#define Z_IS_1157_EQ_1157(...) \,
+#define Z_IS_1158_EQ_1158(...) \,
+#define Z_IS_1159_EQ_1159(...) \,
+#define Z_IS_1160_EQ_1160(...) \,
+#define Z_IS_1161_EQ_1161(...) \,
+#define Z_IS_1162_EQ_1162(...) \,
+#define Z_IS_1163_EQ_1163(...) \,
+#define Z_IS_1164_EQ_1164(...) \,
+#define Z_IS_1165_EQ_1165(...) \,
+#define Z_IS_1166_EQ_1166(...) \,
+#define Z_IS_1167_EQ_1167(...) \,
+#define Z_IS_1168_EQ_1168(...) \,
+#define Z_IS_1169_EQ_1169(...) \,
+#define Z_IS_1170_EQ_1170(...) \,
+#define Z_IS_1171_EQ_1171(...) \,
+#define Z_IS_1172_EQ_1172(...) \,
+#define Z_IS_1173_EQ_1173(...) \,
+#define Z_IS_1174_EQ_1174(...) \,
+#define Z_IS_1175_EQ_1175(...) \,
+#define Z_IS_1176_EQ_1176(...) \,
+#define Z_IS_1177_EQ_1177(...) \,
+#define Z_IS_1178_EQ_1178(...) \,
+#define Z_IS_1179_EQ_1179(...) \,
+#define Z_IS_1180_EQ_1180(...) \,
+#define Z_IS_1181_EQ_1181(...) \,
+#define Z_IS_1182_EQ_1182(...) \,
+#define Z_IS_1183_EQ_1183(...) \,
+#define Z_IS_1184_EQ_1184(...) \,
+#define Z_IS_1185_EQ_1185(...) \,
+#define Z_IS_1186_EQ_1186(...) \,
+#define Z_IS_1187_EQ_1187(...) \,
+#define Z_IS_1188_EQ_1188(...) \,
+#define Z_IS_1189_EQ_1189(...) \,
+#define Z_IS_1190_EQ_1190(...) \,
+#define Z_IS_1191_EQ_1191(...) \,
+#define Z_IS_1192_EQ_1192(...) \,
+#define Z_IS_1193_EQ_1193(...) \,
+#define Z_IS_1194_EQ_1194(...) \,
+#define Z_IS_1195_EQ_1195(...) \,
+#define Z_IS_1196_EQ_1196(...) \,
+#define Z_IS_1197_EQ_1197(...) \,
+#define Z_IS_1198_EQ_1198(...) \,
+#define Z_IS_1199_EQ_1199(...) \,
+#define Z_IS_1200_EQ_1200(...) \,
+#define Z_IS_1201_EQ_1201(...) \,
+#define Z_IS_1202_EQ_1202(...) \,
+#define Z_IS_1203_EQ_1203(...) \,
+#define Z_IS_1204_EQ_1204(...) \,
+#define Z_IS_1205_EQ_1205(...) \,
+#define Z_IS_1206_EQ_1206(...) \,
+#define Z_IS_1207_EQ_1207(...) \,
+#define Z_IS_1208_EQ_1208(...) \,
+#define Z_IS_1209_EQ_1209(...) \,
+#define Z_IS_1210_EQ_1210(...) \,
+#define Z_IS_1211_EQ_1211(...) \,
+#define Z_IS_1212_EQ_1212(...) \,
+#define Z_IS_1213_EQ_1213(...) \,
+#define Z_IS_1214_EQ_1214(...) \,
+#define Z_IS_1215_EQ_1215(...) \,
+#define Z_IS_1216_EQ_1216(...) \,
+#define Z_IS_1217_EQ_1217(...) \,
+#define Z_IS_1218_EQ_1218(...) \,
+#define Z_IS_1219_EQ_1219(...) \,
+#define Z_IS_1220_EQ_1220(...) \,
+#define Z_IS_1221_EQ_1221(...) \,
+#define Z_IS_1222_EQ_1222(...) \,
+#define Z_IS_1223_EQ_1223(...) \,
+#define Z_IS_1224_EQ_1224(...) \,
+#define Z_IS_1225_EQ_1225(...) \,
+#define Z_IS_1226_EQ_1226(...) \,
+#define Z_IS_1227_EQ_1227(...) \,
+#define Z_IS_1228_EQ_1228(...) \,
+#define Z_IS_1229_EQ_1229(...) \,
+#define Z_IS_1230_EQ_1230(...) \,
+#define Z_IS_1231_EQ_1231(...) \,
+#define Z_IS_1232_EQ_1232(...) \,
+#define Z_IS_1233_EQ_1233(...) \,
+#define Z_IS_1234_EQ_1234(...) \,
+#define Z_IS_1235_EQ_1235(...) \,
+#define Z_IS_1236_EQ_1236(...) \,
+#define Z_IS_1237_EQ_1237(...) \,
+#define Z_IS_1238_EQ_1238(...) \,
+#define Z_IS_1239_EQ_1239(...) \,
+#define Z_IS_1240_EQ_1240(...) \,
+#define Z_IS_1241_EQ_1241(...) \,
+#define Z_IS_1242_EQ_1242(...) \,
+#define Z_IS_1243_EQ_1243(...) \,
+#define Z_IS_1244_EQ_1244(...) \,
+#define Z_IS_1245_EQ_1245(...) \,
+#define Z_IS_1246_EQ_1246(...) \,
+#define Z_IS_1247_EQ_1247(...) \,
+#define Z_IS_1248_EQ_1248(...) \,
+#define Z_IS_1249_EQ_1249(...) \,
+#define Z_IS_1250_EQ_1250(...) \,
+#define Z_IS_1251_EQ_1251(...) \,
+#define Z_IS_1252_EQ_1252(...) \,
+#define Z_IS_1253_EQ_1253(...) \,
+#define Z_IS_1254_EQ_1254(...) \,
+#define Z_IS_1255_EQ_1255(...) \,
+#define Z_IS_1256_EQ_1256(...) \,
+#define Z_IS_1257_EQ_1257(...) \,
+#define Z_IS_1258_EQ_1258(...) \,
+#define Z_IS_1259_EQ_1259(...) \,
+#define Z_IS_1260_EQ_1260(...) \,
+#define Z_IS_1261_EQ_1261(...) \,
+#define Z_IS_1262_EQ_1262(...) \,
+#define Z_IS_1263_EQ_1263(...) \,
+#define Z_IS_1264_EQ_1264(...) \,
+#define Z_IS_1265_EQ_1265(...) \,
+#define Z_IS_1266_EQ_1266(...) \,
+#define Z_IS_1267_EQ_1267(...) \,
+#define Z_IS_1268_EQ_1268(...) \,
+#define Z_IS_1269_EQ_1269(...) \,
+#define Z_IS_1270_EQ_1270(...) \,
+#define Z_IS_1271_EQ_1271(...) \,
+#define Z_IS_1272_EQ_1272(...) \,
+#define Z_IS_1273_EQ_1273(...) \,
+#define Z_IS_1274_EQ_1274(...) \,
+#define Z_IS_1275_EQ_1275(...) \,
+#define Z_IS_1276_EQ_1276(...) \,
+#define Z_IS_1277_EQ_1277(...) \,
+#define Z_IS_1278_EQ_1278(...) \,
+#define Z_IS_1279_EQ_1279(...) \,
+#define Z_IS_1280_EQ_1280(...) \,
+#define Z_IS_1281_EQ_1281(...) \,
+#define Z_IS_1282_EQ_1282(...) \,
+#define Z_IS_1283_EQ_1283(...) \,
+#define Z_IS_1284_EQ_1284(...) \,
+#define Z_IS_1285_EQ_1285(...) \,
+#define Z_IS_1286_EQ_1286(...) \,
+#define Z_IS_1287_EQ_1287(...) \,
+#define Z_IS_1288_EQ_1288(...) \,
+#define Z_IS_1289_EQ_1289(...) \,
+#define Z_IS_1290_EQ_1290(...) \,
+#define Z_IS_1291_EQ_1291(...) \,
+#define Z_IS_1292_EQ_1292(...) \,
+#define Z_IS_1293_EQ_1293(...) \,
+#define Z_IS_1294_EQ_1294(...) \,
+#define Z_IS_1295_EQ_1295(...) \,
+#define Z_IS_1296_EQ_1296(...) \,
+#define Z_IS_1297_EQ_1297(...) \,
+#define Z_IS_1298_EQ_1298(...) \,
+#define Z_IS_1299_EQ_1299(...) \,
+#define Z_IS_1300_EQ_1300(...) \,
+#define Z_IS_1301_EQ_1301(...) \,
+#define Z_IS_1302_EQ_1302(...) \,
+#define Z_IS_1303_EQ_1303(...) \,
+#define Z_IS_1304_EQ_1304(...) \,
+#define Z_IS_1305_EQ_1305(...) \,
+#define Z_IS_1306_EQ_1306(...) \,
+#define Z_IS_1307_EQ_1307(...) \,
+#define Z_IS_1308_EQ_1308(...) \,
+#define Z_IS_1309_EQ_1309(...) \,
+#define Z_IS_1310_EQ_1310(...) \,
+#define Z_IS_1311_EQ_1311(...) \,
+#define Z_IS_1312_EQ_1312(...) \,
+#define Z_IS_1313_EQ_1313(...) \,
+#define Z_IS_1314_EQ_1314(...) \,
+#define Z_IS_1315_EQ_1315(...) \,
+#define Z_IS_1316_EQ_1316(...) \,
+#define Z_IS_1317_EQ_1317(...) \,
+#define Z_IS_1318_EQ_1318(...) \,
+#define Z_IS_1319_EQ_1319(...) \,
+#define Z_IS_1320_EQ_1320(...) \,
+#define Z_IS_1321_EQ_1321(...) \,
+#define Z_IS_1322_EQ_1322(...) \,
+#define Z_IS_1323_EQ_1323(...) \,
+#define Z_IS_1324_EQ_1324(...) \,
+#define Z_IS_1325_EQ_1325(...) \,
+#define Z_IS_1326_EQ_1326(...) \,
+#define Z_IS_1327_EQ_1327(...) \,
+#define Z_IS_1328_EQ_1328(...) \,
+#define Z_IS_1329_EQ_1329(...) \,
+#define Z_IS_1330_EQ_1330(...) \,
+#define Z_IS_1331_EQ_1331(...) \,
+#define Z_IS_1332_EQ_1332(...) \,
+#define Z_IS_1333_EQ_1333(...) \,
+#define Z_IS_1334_EQ_1334(...) \,
+#define Z_IS_1335_EQ_1335(...) \,
+#define Z_IS_1336_EQ_1336(...) \,
+#define Z_IS_1337_EQ_1337(...) \,
+#define Z_IS_1338_EQ_1338(...) \,
+#define Z_IS_1339_EQ_1339(...) \,
+#define Z_IS_1340_EQ_1340(...) \,
+#define Z_IS_1341_EQ_1341(...) \,
+#define Z_IS_1342_EQ_1342(...) \,
+#define Z_IS_1343_EQ_1343(...) \,
+#define Z_IS_1344_EQ_1344(...) \,
+#define Z_IS_1345_EQ_1345(...) \,
+#define Z_IS_1346_EQ_1346(...) \,
+#define Z_IS_1347_EQ_1347(...) \,
+#define Z_IS_1348_EQ_1348(...) \,
+#define Z_IS_1349_EQ_1349(...) \,
+#define Z_IS_1350_EQ_1350(...) \,
+#define Z_IS_1351_EQ_1351(...) \,
+#define Z_IS_1352_EQ_1352(...) \,
+#define Z_IS_1353_EQ_1353(...) \,
+#define Z_IS_1354_EQ_1354(...) \,
+#define Z_IS_1355_EQ_1355(...) \,
+#define Z_IS_1356_EQ_1356(...) \,
+#define Z_IS_1357_EQ_1357(...) \,
+#define Z_IS_1358_EQ_1358(...) \,
+#define Z_IS_1359_EQ_1359(...) \,
+#define Z_IS_1360_EQ_1360(...) \,
+#define Z_IS_1361_EQ_1361(...) \,
+#define Z_IS_1362_EQ_1362(...) \,
+#define Z_IS_1363_EQ_1363(...) \,
+#define Z_IS_1364_EQ_1364(...) \,
+#define Z_IS_1365_EQ_1365(...) \,
+#define Z_IS_1366_EQ_1366(...) \,
+#define Z_IS_1367_EQ_1367(...) \,
+#define Z_IS_1368_EQ_1368(...) \,
+#define Z_IS_1369_EQ_1369(...) \,
+#define Z_IS_1370_EQ_1370(...) \,
+#define Z_IS_1371_EQ_1371(...) \,
+#define Z_IS_1372_EQ_1372(...) \,
+#define Z_IS_1373_EQ_1373(...) \,
+#define Z_IS_1374_EQ_1374(...) \,
+#define Z_IS_1375_EQ_1375(...) \,
+#define Z_IS_1376_EQ_1376(...) \,
+#define Z_IS_1377_EQ_1377(...) \,
+#define Z_IS_1378_EQ_1378(...) \,
+#define Z_IS_1379_EQ_1379(...) \,
+#define Z_IS_1380_EQ_1380(...) \,
+#define Z_IS_1381_EQ_1381(...) \,
+#define Z_IS_1382_EQ_1382(...) \,
+#define Z_IS_1383_EQ_1383(...) \,
+#define Z_IS_1384_EQ_1384(...) \,
+#define Z_IS_1385_EQ_1385(...) \,
+#define Z_IS_1386_EQ_1386(...) \,
+#define Z_IS_1387_EQ_1387(...) \,
+#define Z_IS_1388_EQ_1388(...) \,
+#define Z_IS_1389_EQ_1389(...) \,
+#define Z_IS_1390_EQ_1390(...) \,
+#define Z_IS_1391_EQ_1391(...) \,
+#define Z_IS_1392_EQ_1392(...) \,
+#define Z_IS_1393_EQ_1393(...) \,
+#define Z_IS_1394_EQ_1394(...) \,
+#define Z_IS_1395_EQ_1395(...) \,
+#define Z_IS_1396_EQ_1396(...) \,
+#define Z_IS_1397_EQ_1397(...) \,
+#define Z_IS_1398_EQ_1398(...) \,
+#define Z_IS_1399_EQ_1399(...) \,
+#define Z_IS_1400_EQ_1400(...) \,
+#define Z_IS_1401_EQ_1401(...) \,
+#define Z_IS_1402_EQ_1402(...) \,
+#define Z_IS_1403_EQ_1403(...) \,
+#define Z_IS_1404_EQ_1404(...) \,
+#define Z_IS_1405_EQ_1405(...) \,
+#define Z_IS_1406_EQ_1406(...) \,
+#define Z_IS_1407_EQ_1407(...) \,
+#define Z_IS_1408_EQ_1408(...) \,
+#define Z_IS_1409_EQ_1409(...) \,
+#define Z_IS_1410_EQ_1410(...) \,
+#define Z_IS_1411_EQ_1411(...) \,
+#define Z_IS_1412_EQ_1412(...) \,
+#define Z_IS_1413_EQ_1413(...) \,
+#define Z_IS_1414_EQ_1414(...) \,
+#define Z_IS_1415_EQ_1415(...) \,
+#define Z_IS_1416_EQ_1416(...) \,
+#define Z_IS_1417_EQ_1417(...) \,
+#define Z_IS_1418_EQ_1418(...) \,
+#define Z_IS_1419_EQ_1419(...) \,
+#define Z_IS_1420_EQ_1420(...) \,
+#define Z_IS_1421_EQ_1421(...) \,
+#define Z_IS_1422_EQ_1422(...) \,
+#define Z_IS_1423_EQ_1423(...) \,
+#define Z_IS_1424_EQ_1424(...) \,
+#define Z_IS_1425_EQ_1425(...) \,
+#define Z_IS_1426_EQ_1426(...) \,
+#define Z_IS_1427_EQ_1427(...) \,
+#define Z_IS_1428_EQ_1428(...) \,
+#define Z_IS_1429_EQ_1429(...) \,
+#define Z_IS_1430_EQ_1430(...) \,
+#define Z_IS_1431_EQ_1431(...) \,
+#define Z_IS_1432_EQ_1432(...) \,
+#define Z_IS_1433_EQ_1433(...) \,
+#define Z_IS_1434_EQ_1434(...) \,
+#define Z_IS_1435_EQ_1435(...) \,
+#define Z_IS_1436_EQ_1436(...) \,
+#define Z_IS_1437_EQ_1437(...) \,
+#define Z_IS_1438_EQ_1438(...) \,
+#define Z_IS_1439_EQ_1439(...) \,
+#define Z_IS_1440_EQ_1440(...) \,
+#define Z_IS_1441_EQ_1441(...) \,
+#define Z_IS_1442_EQ_1442(...) \,
+#define Z_IS_1443_EQ_1443(...) \,
+#define Z_IS_1444_EQ_1444(...) \,
+#define Z_IS_1445_EQ_1445(...) \,
+#define Z_IS_1446_EQ_1446(...) \,
+#define Z_IS_1447_EQ_1447(...) \,
+#define Z_IS_1448_EQ_1448(...) \,
+#define Z_IS_1449_EQ_1449(...) \,
+#define Z_IS_1450_EQ_1450(...) \,
+#define Z_IS_1451_EQ_1451(...) \,
+#define Z_IS_1452_EQ_1452(...) \,
+#define Z_IS_1453_EQ_1453(...) \,
+#define Z_IS_1454_EQ_1454(...) \,
+#define Z_IS_1455_EQ_1455(...) \,
+#define Z_IS_1456_EQ_1456(...) \,
+#define Z_IS_1457_EQ_1457(...) \,
+#define Z_IS_1458_EQ_1458(...) \,
+#define Z_IS_1459_EQ_1459(...) \,
+#define Z_IS_1460_EQ_1460(...) \,
+#define Z_IS_1461_EQ_1461(...) \,
+#define Z_IS_1462_EQ_1462(...) \,
+#define Z_IS_1463_EQ_1463(...) \,
+#define Z_IS_1464_EQ_1464(...) \,
+#define Z_IS_1465_EQ_1465(...) \,
+#define Z_IS_1466_EQ_1466(...) \,
+#define Z_IS_1467_EQ_1467(...) \,
+#define Z_IS_1468_EQ_1468(...) \,
+#define Z_IS_1469_EQ_1469(...) \,
+#define Z_IS_1470_EQ_1470(...) \,
+#define Z_IS_1471_EQ_1471(...) \,
+#define Z_IS_1472_EQ_1472(...) \,
+#define Z_IS_1473_EQ_1473(...) \,
+#define Z_IS_1474_EQ_1474(...) \,
+#define Z_IS_1475_EQ_1475(...) \,
+#define Z_IS_1476_EQ_1476(...) \,
+#define Z_IS_1477_EQ_1477(...) \,
+#define Z_IS_1478_EQ_1478(...) \,
+#define Z_IS_1479_EQ_1479(...) \,
+#define Z_IS_1480_EQ_1480(...) \,
+#define Z_IS_1481_EQ_1481(...) \,
+#define Z_IS_1482_EQ_1482(...) \,
+#define Z_IS_1483_EQ_1483(...) \,
+#define Z_IS_1484_EQ_1484(...) \,
+#define Z_IS_1485_EQ_1485(...) \,
+#define Z_IS_1486_EQ_1486(...) \,
+#define Z_IS_1487_EQ_1487(...) \,
+#define Z_IS_1488_EQ_1488(...) \,
+#define Z_IS_1489_EQ_1489(...) \,
+#define Z_IS_1490_EQ_1490(...) \,
+#define Z_IS_1491_EQ_1491(...) \,
+#define Z_IS_1492_EQ_1492(...) \,
+#define Z_IS_1493_EQ_1493(...) \,
+#define Z_IS_1494_EQ_1494(...) \,
+#define Z_IS_1495_EQ_1495(...) \,
+#define Z_IS_1496_EQ_1496(...) \,
+#define Z_IS_1497_EQ_1497(...) \,
+#define Z_IS_1498_EQ_1498(...) \,
+#define Z_IS_1499_EQ_1499(...) \,
+#define Z_IS_1500_EQ_1500(...) \,
+#define Z_IS_1501_EQ_1501(...) \,
+#define Z_IS_1502_EQ_1502(...) \,
+#define Z_IS_1503_EQ_1503(...) \,
+#define Z_IS_1504_EQ_1504(...) \,
+#define Z_IS_1505_EQ_1505(...) \,
+#define Z_IS_1506_EQ_1506(...) \,
+#define Z_IS_1507_EQ_1507(...) \,
+#define Z_IS_1508_EQ_1508(...) \,
+#define Z_IS_1509_EQ_1509(...) \,
+#define Z_IS_1510_EQ_1510(...) \,
+#define Z_IS_1511_EQ_1511(...) \,
+#define Z_IS_1512_EQ_1512(...) \,
+#define Z_IS_1513_EQ_1513(...) \,
+#define Z_IS_1514_EQ_1514(...) \,
+#define Z_IS_1515_EQ_1515(...) \,
+#define Z_IS_1516_EQ_1516(...) \,
+#define Z_IS_1517_EQ_1517(...) \,
+#define Z_IS_1518_EQ_1518(...) \,
+#define Z_IS_1519_EQ_1519(...) \,
+#define Z_IS_1520_EQ_1520(...) \,
+#define Z_IS_1521_EQ_1521(...) \,
+#define Z_IS_1522_EQ_1522(...) \,
+#define Z_IS_1523_EQ_1523(...) \,
+#define Z_IS_1524_EQ_1524(...) \,
+#define Z_IS_1525_EQ_1525(...) \,
+#define Z_IS_1526_EQ_1526(...) \,
+#define Z_IS_1527_EQ_1527(...) \,
+#define Z_IS_1528_EQ_1528(...) \,
+#define Z_IS_1529_EQ_1529(...) \,
+#define Z_IS_1530_EQ_1530(...) \,
+#define Z_IS_1531_EQ_1531(...) \,
+#define Z_IS_1532_EQ_1532(...) \,
+#define Z_IS_1533_EQ_1533(...) \,
+#define Z_IS_1534_EQ_1534(...) \,
+#define Z_IS_1535_EQ_1535(...) \,
+#define Z_IS_1536_EQ_1536(...) \,
+#define Z_IS_1537_EQ_1537(...) \,
+#define Z_IS_1538_EQ_1538(...) \,
+#define Z_IS_1539_EQ_1539(...) \,
+#define Z_IS_1540_EQ_1540(...) \,
+#define Z_IS_1541_EQ_1541(...) \,
+#define Z_IS_1542_EQ_1542(...) \,
+#define Z_IS_1543_EQ_1543(...) \,
+#define Z_IS_1544_EQ_1544(...) \,
+#define Z_IS_1545_EQ_1545(...) \,
+#define Z_IS_1546_EQ_1546(...) \,
+#define Z_IS_1547_EQ_1547(...) \,
+#define Z_IS_1548_EQ_1548(...) \,
+#define Z_IS_1549_EQ_1549(...) \,
+#define Z_IS_1550_EQ_1550(...) \,
+#define Z_IS_1551_EQ_1551(...) \,
+#define Z_IS_1552_EQ_1552(...) \,
+#define Z_IS_1553_EQ_1553(...) \,
+#define Z_IS_1554_EQ_1554(...) \,
+#define Z_IS_1555_EQ_1555(...) \,
+#define Z_IS_1556_EQ_1556(...) \,
+#define Z_IS_1557_EQ_1557(...) \,
+#define Z_IS_1558_EQ_1558(...) \,
+#define Z_IS_1559_EQ_1559(...) \,
+#define Z_IS_1560_EQ_1560(...) \,
+#define Z_IS_1561_EQ_1561(...) \,
+#define Z_IS_1562_EQ_1562(...) \,
+#define Z_IS_1563_EQ_1563(...) \,
+#define Z_IS_1564_EQ_1564(...) \,
+#define Z_IS_1565_EQ_1565(...) \,
+#define Z_IS_1566_EQ_1566(...) \,
+#define Z_IS_1567_EQ_1567(...) \,
+#define Z_IS_1568_EQ_1568(...) \,
+#define Z_IS_1569_EQ_1569(...) \,
+#define Z_IS_1570_EQ_1570(...) \,
+#define Z_IS_1571_EQ_1571(...) \,
+#define Z_IS_1572_EQ_1572(...) \,
+#define Z_IS_1573_EQ_1573(...) \,
+#define Z_IS_1574_EQ_1574(...) \,
+#define Z_IS_1575_EQ_1575(...) \,
+#define Z_IS_1576_EQ_1576(...) \,
+#define Z_IS_1577_EQ_1577(...) \,
+#define Z_IS_1578_EQ_1578(...) \,
+#define Z_IS_1579_EQ_1579(...) \,
+#define Z_IS_1580_EQ_1580(...) \,
+#define Z_IS_1581_EQ_1581(...) \,
+#define Z_IS_1582_EQ_1582(...) \,
+#define Z_IS_1583_EQ_1583(...) \,
+#define Z_IS_1584_EQ_1584(...) \,
+#define Z_IS_1585_EQ_1585(...) \,
+#define Z_IS_1586_EQ_1586(...) \,
+#define Z_IS_1587_EQ_1587(...) \,
+#define Z_IS_1588_EQ_1588(...) \,
+#define Z_IS_1589_EQ_1589(...) \,
+#define Z_IS_1590_EQ_1590(...) \,
+#define Z_IS_1591_EQ_1591(...) \,
+#define Z_IS_1592_EQ_1592(...) \,
+#define Z_IS_1593_EQ_1593(...) \,
+#define Z_IS_1594_EQ_1594(...) \,
+#define Z_IS_1595_EQ_1595(...) \,
+#define Z_IS_1596_EQ_1596(...) \,
+#define Z_IS_1597_EQ_1597(...) \,
+#define Z_IS_1598_EQ_1598(...) \,
+#define Z_IS_1599_EQ_1599(...) \,
+#define Z_IS_1600_EQ_1600(...) \,
+#define Z_IS_1601_EQ_1601(...) \,
+#define Z_IS_1602_EQ_1602(...) \,
+#define Z_IS_1603_EQ_1603(...) \,
+#define Z_IS_1604_EQ_1604(...) \,
+#define Z_IS_1605_EQ_1605(...) \,
+#define Z_IS_1606_EQ_1606(...) \,
+#define Z_IS_1607_EQ_1607(...) \,
+#define Z_IS_1608_EQ_1608(...) \,
+#define Z_IS_1609_EQ_1609(...) \,
+#define Z_IS_1610_EQ_1610(...) \,
+#define Z_IS_1611_EQ_1611(...) \,
+#define Z_IS_1612_EQ_1612(...) \,
+#define Z_IS_1613_EQ_1613(...) \,
+#define Z_IS_1614_EQ_1614(...) \,
+#define Z_IS_1615_EQ_1615(...) \,
+#define Z_IS_1616_EQ_1616(...) \,
+#define Z_IS_1617_EQ_1617(...) \,
+#define Z_IS_1618_EQ_1618(...) \,
+#define Z_IS_1619_EQ_1619(...) \,
+#define Z_IS_1620_EQ_1620(...) \,
+#define Z_IS_1621_EQ_1621(...) \,
+#define Z_IS_1622_EQ_1622(...) \,
+#define Z_IS_1623_EQ_1623(...) \,
+#define Z_IS_1624_EQ_1624(...) \,
+#define Z_IS_1625_EQ_1625(...) \,
+#define Z_IS_1626_EQ_1626(...) \,
+#define Z_IS_1627_EQ_1627(...) \,
+#define Z_IS_1628_EQ_1628(...) \,
+#define Z_IS_1629_EQ_1629(...) \,
+#define Z_IS_1630_EQ_1630(...) \,
+#define Z_IS_1631_EQ_1631(...) \,
+#define Z_IS_1632_EQ_1632(...) \,
+#define Z_IS_1633_EQ_1633(...) \,
+#define Z_IS_1634_EQ_1634(...) \,
+#define Z_IS_1635_EQ_1635(...) \,
+#define Z_IS_1636_EQ_1636(...) \,
+#define Z_IS_1637_EQ_1637(...) \,
+#define Z_IS_1638_EQ_1638(...) \,
+#define Z_IS_1639_EQ_1639(...) \,
+#define Z_IS_1640_EQ_1640(...) \,
+#define Z_IS_1641_EQ_1641(...) \,
+#define Z_IS_1642_EQ_1642(...) \,
+#define Z_IS_1643_EQ_1643(...) \,
+#define Z_IS_1644_EQ_1644(...) \,
+#define Z_IS_1645_EQ_1645(...) \,
+#define Z_IS_1646_EQ_1646(...) \,
+#define Z_IS_1647_EQ_1647(...) \,
+#define Z_IS_1648_EQ_1648(...) \,
+#define Z_IS_1649_EQ_1649(...) \,
+#define Z_IS_1650_EQ_1650(...) \,
+#define Z_IS_1651_EQ_1651(...) \,
+#define Z_IS_1652_EQ_1652(...) \,
+#define Z_IS_1653_EQ_1653(...) \,
+#define Z_IS_1654_EQ_1654(...) \,
+#define Z_IS_1655_EQ_1655(...) \,
+#define Z_IS_1656_EQ_1656(...) \,
+#define Z_IS_1657_EQ_1657(...) \,
+#define Z_IS_1658_EQ_1658(...) \,
+#define Z_IS_1659_EQ_1659(...) \,
+#define Z_IS_1660_EQ_1660(...) \,
+#define Z_IS_1661_EQ_1661(...) \,
+#define Z_IS_1662_EQ_1662(...) \,
+#define Z_IS_1663_EQ_1663(...) \,
+#define Z_IS_1664_EQ_1664(...) \,
+#define Z_IS_1665_EQ_1665(...) \,
+#define Z_IS_1666_EQ_1666(...) \,
+#define Z_IS_1667_EQ_1667(...) \,
+#define Z_IS_1668_EQ_1668(...) \,
+#define Z_IS_1669_EQ_1669(...) \,
+#define Z_IS_1670_EQ_1670(...) \,
+#define Z_IS_1671_EQ_1671(...) \,
+#define Z_IS_1672_EQ_1672(...) \,
+#define Z_IS_1673_EQ_1673(...) \,
+#define Z_IS_1674_EQ_1674(...) \,
+#define Z_IS_1675_EQ_1675(...) \,
+#define Z_IS_1676_EQ_1676(...) \,
+#define Z_IS_1677_EQ_1677(...) \,
+#define Z_IS_1678_EQ_1678(...) \,
+#define Z_IS_1679_EQ_1679(...) \,
+#define Z_IS_1680_EQ_1680(...) \,
+#define Z_IS_1681_EQ_1681(...) \,
+#define Z_IS_1682_EQ_1682(...) \,
+#define Z_IS_1683_EQ_1683(...) \,
+#define Z_IS_1684_EQ_1684(...) \,
+#define Z_IS_1685_EQ_1685(...) \,
+#define Z_IS_1686_EQ_1686(...) \,
+#define Z_IS_1687_EQ_1687(...) \,
+#define Z_IS_1688_EQ_1688(...) \,
+#define Z_IS_1689_EQ_1689(...) \,
+#define Z_IS_1690_EQ_1690(...) \,
+#define Z_IS_1691_EQ_1691(...) \,
+#define Z_IS_1692_EQ_1692(...) \,
+#define Z_IS_1693_EQ_1693(...) \,
+#define Z_IS_1694_EQ_1694(...) \,
+#define Z_IS_1695_EQ_1695(...) \,
+#define Z_IS_1696_EQ_1696(...) \,
+#define Z_IS_1697_EQ_1697(...) \,
+#define Z_IS_1698_EQ_1698(...) \,
+#define Z_IS_1699_EQ_1699(...) \,
+#define Z_IS_1700_EQ_1700(...) \,
+#define Z_IS_1701_EQ_1701(...) \,
+#define Z_IS_1702_EQ_1702(...) \,
+#define Z_IS_1703_EQ_1703(...) \,
+#define Z_IS_1704_EQ_1704(...) \,
+#define Z_IS_1705_EQ_1705(...) \,
+#define Z_IS_1706_EQ_1706(...) \,
+#define Z_IS_1707_EQ_1707(...) \,
+#define Z_IS_1708_EQ_1708(...) \,
+#define Z_IS_1709_EQ_1709(...) \,
+#define Z_IS_1710_EQ_1710(...) \,
+#define Z_IS_1711_EQ_1711(...) \,
+#define Z_IS_1712_EQ_1712(...) \,
+#define Z_IS_1713_EQ_1713(...) \,
+#define Z_IS_1714_EQ_1714(...) \,
+#define Z_IS_1715_EQ_1715(...) \,
+#define Z_IS_1716_EQ_1716(...) \,
+#define Z_IS_1717_EQ_1717(...) \,
+#define Z_IS_1718_EQ_1718(...) \,
+#define Z_IS_1719_EQ_1719(...) \,
+#define Z_IS_1720_EQ_1720(...) \,
+#define Z_IS_1721_EQ_1721(...) \,
+#define Z_IS_1722_EQ_1722(...) \,
+#define Z_IS_1723_EQ_1723(...) \,
+#define Z_IS_1724_EQ_1724(...) \,
+#define Z_IS_1725_EQ_1725(...) \,
+#define Z_IS_1726_EQ_1726(...) \,
+#define Z_IS_1727_EQ_1727(...) \,
+#define Z_IS_1728_EQ_1728(...) \,
+#define Z_IS_1729_EQ_1729(...) \,
+#define Z_IS_1730_EQ_1730(...) \,
+#define Z_IS_1731_EQ_1731(...) \,
+#define Z_IS_1732_EQ_1732(...) \,
+#define Z_IS_1733_EQ_1733(...) \,
+#define Z_IS_1734_EQ_1734(...) \,
+#define Z_IS_1735_EQ_1735(...) \,
+#define Z_IS_1736_EQ_1736(...) \,
+#define Z_IS_1737_EQ_1737(...) \,
+#define Z_IS_1738_EQ_1738(...) \,
+#define Z_IS_1739_EQ_1739(...) \,
+#define Z_IS_1740_EQ_1740(...) \,
+#define Z_IS_1741_EQ_1741(...) \,
+#define Z_IS_1742_EQ_1742(...) \,
+#define Z_IS_1743_EQ_1743(...) \,
+#define Z_IS_1744_EQ_1744(...) \,
+#define Z_IS_1745_EQ_1745(...) \,
+#define Z_IS_1746_EQ_1746(...) \,
+#define Z_IS_1747_EQ_1747(...) \,
+#define Z_IS_1748_EQ_1748(...) \,
+#define Z_IS_1749_EQ_1749(...) \,
+#define Z_IS_1750_EQ_1750(...) \,
+#define Z_IS_1751_EQ_1751(...) \,
+#define Z_IS_1752_EQ_1752(...) \,
+#define Z_IS_1753_EQ_1753(...) \,
+#define Z_IS_1754_EQ_1754(...) \,
+#define Z_IS_1755_EQ_1755(...) \,
+#define Z_IS_1756_EQ_1756(...) \,
+#define Z_IS_1757_EQ_1757(...) \,
+#define Z_IS_1758_EQ_1758(...) \,
+#define Z_IS_1759_EQ_1759(...) \,
+#define Z_IS_1760_EQ_1760(...) \,
+#define Z_IS_1761_EQ_1761(...) \,
+#define Z_IS_1762_EQ_1762(...) \,
+#define Z_IS_1763_EQ_1763(...) \,
+#define Z_IS_1764_EQ_1764(...) \,
+#define Z_IS_1765_EQ_1765(...) \,
+#define Z_IS_1766_EQ_1766(...) \,
+#define Z_IS_1767_EQ_1767(...) \,
+#define Z_IS_1768_EQ_1768(...) \,
+#define Z_IS_1769_EQ_1769(...) \,
+#define Z_IS_1770_EQ_1770(...) \,
+#define Z_IS_1771_EQ_1771(...) \,
+#define Z_IS_1772_EQ_1772(...) \,
+#define Z_IS_1773_EQ_1773(...) \,
+#define Z_IS_1774_EQ_1774(...) \,
+#define Z_IS_1775_EQ_1775(...) \,
+#define Z_IS_1776_EQ_1776(...) \,
+#define Z_IS_1777_EQ_1777(...) \,
+#define Z_IS_1778_EQ_1778(...) \,
+#define Z_IS_1779_EQ_1779(...) \,
+#define Z_IS_1780_EQ_1780(...) \,
+#define Z_IS_1781_EQ_1781(...) \,
+#define Z_IS_1782_EQ_1782(...) \,
+#define Z_IS_1783_EQ_1783(...) \,
+#define Z_IS_1784_EQ_1784(...) \,
+#define Z_IS_1785_EQ_1785(...) \,
+#define Z_IS_1786_EQ_1786(...) \,
+#define Z_IS_1787_EQ_1787(...) \,
+#define Z_IS_1788_EQ_1788(...) \,
+#define Z_IS_1789_EQ_1789(...) \,
+#define Z_IS_1790_EQ_1790(...) \,
+#define Z_IS_1791_EQ_1791(...) \,
+#define Z_IS_1792_EQ_1792(...) \,
+#define Z_IS_1793_EQ_1793(...) \,
+#define Z_IS_1794_EQ_1794(...) \,
+#define Z_IS_1795_EQ_1795(...) \,
+#define Z_IS_1796_EQ_1796(...) \,
+#define Z_IS_1797_EQ_1797(...) \,
+#define Z_IS_1798_EQ_1798(...) \,
+#define Z_IS_1799_EQ_1799(...) \,
+#define Z_IS_1800_EQ_1800(...) \,
+#define Z_IS_1801_EQ_1801(...) \,
+#define Z_IS_1802_EQ_1802(...) \,
+#define Z_IS_1803_EQ_1803(...) \,
+#define Z_IS_1804_EQ_1804(...) \,
+#define Z_IS_1805_EQ_1805(...) \,
+#define Z_IS_1806_EQ_1806(...) \,
+#define Z_IS_1807_EQ_1807(...) \,
+#define Z_IS_1808_EQ_1808(...) \,
+#define Z_IS_1809_EQ_1809(...) \,
+#define Z_IS_1810_EQ_1810(...) \,
+#define Z_IS_1811_EQ_1811(...) \,
+#define Z_IS_1812_EQ_1812(...) \,
+#define Z_IS_1813_EQ_1813(...) \,
+#define Z_IS_1814_EQ_1814(...) \,
+#define Z_IS_1815_EQ_1815(...) \,
+#define Z_IS_1816_EQ_1816(...) \,
+#define Z_IS_1817_EQ_1817(...) \,
+#define Z_IS_1818_EQ_1818(...) \,
+#define Z_IS_1819_EQ_1819(...) \,
+#define Z_IS_1820_EQ_1820(...) \,
+#define Z_IS_1821_EQ_1821(...) \,
+#define Z_IS_1822_EQ_1822(...) \,
+#define Z_IS_1823_EQ_1823(...) \,
+#define Z_IS_1824_EQ_1824(...) \,
+#define Z_IS_1825_EQ_1825(...) \,
+#define Z_IS_1826_EQ_1826(...) \,
+#define Z_IS_1827_EQ_1827(...) \,
+#define Z_IS_1828_EQ_1828(...) \,
+#define Z_IS_1829_EQ_1829(...) \,
+#define Z_IS_1830_EQ_1830(...) \,
+#define Z_IS_1831_EQ_1831(...) \,
+#define Z_IS_1832_EQ_1832(...) \,
+#define Z_IS_1833_EQ_1833(...) \,
+#define Z_IS_1834_EQ_1834(...) \,
+#define Z_IS_1835_EQ_1835(...) \,
+#define Z_IS_1836_EQ_1836(...) \,
+#define Z_IS_1837_EQ_1837(...) \,
+#define Z_IS_1838_EQ_1838(...) \,
+#define Z_IS_1839_EQ_1839(...) \,
+#define Z_IS_1840_EQ_1840(...) \,
+#define Z_IS_1841_EQ_1841(...) \,
+#define Z_IS_1842_EQ_1842(...) \,
+#define Z_IS_1843_EQ_1843(...) \,
+#define Z_IS_1844_EQ_1844(...) \,
+#define Z_IS_1845_EQ_1845(...) \,
+#define Z_IS_1846_EQ_1846(...) \,
+#define Z_IS_1847_EQ_1847(...) \,
+#define Z_IS_1848_EQ_1848(...) \,
+#define Z_IS_1849_EQ_1849(...) \,
+#define Z_IS_1850_EQ_1850(...) \,
+#define Z_IS_1851_EQ_1851(...) \,
+#define Z_IS_1852_EQ_1852(...) \,
+#define Z_IS_1853_EQ_1853(...) \,
+#define Z_IS_1854_EQ_1854(...) \,
+#define Z_IS_1855_EQ_1855(...) \,
+#define Z_IS_1856_EQ_1856(...) \,
+#define Z_IS_1857_EQ_1857(...) \,
+#define Z_IS_1858_EQ_1858(...) \,
+#define Z_IS_1859_EQ_1859(...) \,
+#define Z_IS_1860_EQ_1860(...) \,
+#define Z_IS_1861_EQ_1861(...) \,
+#define Z_IS_1862_EQ_1862(...) \,
+#define Z_IS_1863_EQ_1863(...) \,
+#define Z_IS_1864_EQ_1864(...) \,
+#define Z_IS_1865_EQ_1865(...) \,
+#define Z_IS_1866_EQ_1866(...) \,
+#define Z_IS_1867_EQ_1867(...) \,
+#define Z_IS_1868_EQ_1868(...) \,
+#define Z_IS_1869_EQ_1869(...) \,
+#define Z_IS_1870_EQ_1870(...) \,
+#define Z_IS_1871_EQ_1871(...) \,
+#define Z_IS_1872_EQ_1872(...) \,
+#define Z_IS_1873_EQ_1873(...) \,
+#define Z_IS_1874_EQ_1874(...) \,
+#define Z_IS_1875_EQ_1875(...) \,
+#define Z_IS_1876_EQ_1876(...) \,
+#define Z_IS_1877_EQ_1877(...) \,
+#define Z_IS_1878_EQ_1878(...) \,
+#define Z_IS_1879_EQ_1879(...) \,
+#define Z_IS_1880_EQ_1880(...) \,
+#define Z_IS_1881_EQ_1881(...) \,
+#define Z_IS_1882_EQ_1882(...) \,
+#define Z_IS_1883_EQ_1883(...) \,
+#define Z_IS_1884_EQ_1884(...) \,
+#define Z_IS_1885_EQ_1885(...) \,
+#define Z_IS_1886_EQ_1886(...) \,
+#define Z_IS_1887_EQ_1887(...) \,
+#define Z_IS_1888_EQ_1888(...) \,
+#define Z_IS_1889_EQ_1889(...) \,
+#define Z_IS_1890_EQ_1890(...) \,
+#define Z_IS_1891_EQ_1891(...) \,
+#define Z_IS_1892_EQ_1892(...) \,
+#define Z_IS_1893_EQ_1893(...) \,
+#define Z_IS_1894_EQ_1894(...) \,
+#define Z_IS_1895_EQ_1895(...) \,
+#define Z_IS_1896_EQ_1896(...) \,
+#define Z_IS_1897_EQ_1897(...) \,
+#define Z_IS_1898_EQ_1898(...) \,
+#define Z_IS_1899_EQ_1899(...) \,
+#define Z_IS_1900_EQ_1900(...) \,
+#define Z_IS_1901_EQ_1901(...) \,
+#define Z_IS_1902_EQ_1902(...) \,
+#define Z_IS_1903_EQ_1903(...) \,
+#define Z_IS_1904_EQ_1904(...) \,
+#define Z_IS_1905_EQ_1905(...) \,
+#define Z_IS_1906_EQ_1906(...) \,
+#define Z_IS_1907_EQ_1907(...) \,
+#define Z_IS_1908_EQ_1908(...) \,
+#define Z_IS_1909_EQ_1909(...) \,
+#define Z_IS_1910_EQ_1910(...) \,
+#define Z_IS_1911_EQ_1911(...) \,
+#define Z_IS_1912_EQ_1912(...) \,
+#define Z_IS_1913_EQ_1913(...) \,
+#define Z_IS_1914_EQ_1914(...) \,
+#define Z_IS_1915_EQ_1915(...) \,
+#define Z_IS_1916_EQ_1916(...) \,
+#define Z_IS_1917_EQ_1917(...) \,
+#define Z_IS_1918_EQ_1918(...) \,
+#define Z_IS_1919_EQ_1919(...) \,
+#define Z_IS_1920_EQ_1920(...) \,
+#define Z_IS_1921_EQ_1921(...) \,
+#define Z_IS_1922_EQ_1922(...) \,
+#define Z_IS_1923_EQ_1923(...) \,
+#define Z_IS_1924_EQ_1924(...) \,
+#define Z_IS_1925_EQ_1925(...) \,
+#define Z_IS_1926_EQ_1926(...) \,
+#define Z_IS_1927_EQ_1927(...) \,
+#define Z_IS_1928_EQ_1928(...) \,
+#define Z_IS_1929_EQ_1929(...) \,
+#define Z_IS_1930_EQ_1930(...) \,
+#define Z_IS_1931_EQ_1931(...) \,
+#define Z_IS_1932_EQ_1932(...) \,
+#define Z_IS_1933_EQ_1933(...) \,
+#define Z_IS_1934_EQ_1934(...) \,
+#define Z_IS_1935_EQ_1935(...) \,
+#define Z_IS_1936_EQ_1936(...) \,
+#define Z_IS_1937_EQ_1937(...) \,
+#define Z_IS_1938_EQ_1938(...) \,
+#define Z_IS_1939_EQ_1939(...) \,
+#define Z_IS_1940_EQ_1940(...) \,
+#define Z_IS_1941_EQ_1941(...) \,
+#define Z_IS_1942_EQ_1942(...) \,
+#define Z_IS_1943_EQ_1943(...) \,
+#define Z_IS_1944_EQ_1944(...) \,
+#define Z_IS_1945_EQ_1945(...) \,
+#define Z_IS_1946_EQ_1946(...) \,
+#define Z_IS_1947_EQ_1947(...) \,
+#define Z_IS_1948_EQ_1948(...) \,
+#define Z_IS_1949_EQ_1949(...) \,
+#define Z_IS_1950_EQ_1950(...) \,
+#define Z_IS_1951_EQ_1951(...) \,
+#define Z_IS_1952_EQ_1952(...) \,
+#define Z_IS_1953_EQ_1953(...) \,
+#define Z_IS_1954_EQ_1954(...) \,
+#define Z_IS_1955_EQ_1955(...) \,
+#define Z_IS_1956_EQ_1956(...) \,
+#define Z_IS_1957_EQ_1957(...) \,
+#define Z_IS_1958_EQ_1958(...) \,
+#define Z_IS_1959_EQ_1959(...) \,
+#define Z_IS_1960_EQ_1960(...) \,
+#define Z_IS_1961_EQ_1961(...) \,
+#define Z_IS_1962_EQ_1962(...) \,
+#define Z_IS_1963_EQ_1963(...) \,
+#define Z_IS_1964_EQ_1964(...) \,
+#define Z_IS_1965_EQ_1965(...) \,
+#define Z_IS_1966_EQ_1966(...) \,
+#define Z_IS_1967_EQ_1967(...) \,
+#define Z_IS_1968_EQ_1968(...) \,
+#define Z_IS_1969_EQ_1969(...) \,
+#define Z_IS_1970_EQ_1970(...) \,
+#define Z_IS_1971_EQ_1971(...) \,
+#define Z_IS_1972_EQ_1972(...) \,
+#define Z_IS_1973_EQ_1973(...) \,
+#define Z_IS_1974_EQ_1974(...) \,
+#define Z_IS_1975_EQ_1975(...) \,
+#define Z_IS_1976_EQ_1976(...) \,
+#define Z_IS_1977_EQ_1977(...) \,
+#define Z_IS_1978_EQ_1978(...) \,
+#define Z_IS_1979_EQ_1979(...) \,
+#define Z_IS_1980_EQ_1980(...) \,
+#define Z_IS_1981_EQ_1981(...) \,
+#define Z_IS_1982_EQ_1982(...) \,
+#define Z_IS_1983_EQ_1983(...) \,
+#define Z_IS_1984_EQ_1984(...) \,
+#define Z_IS_1985_EQ_1985(...) \,
+#define Z_IS_1986_EQ_1986(...) \,
+#define Z_IS_1987_EQ_1987(...) \,
+#define Z_IS_1988_EQ_1988(...) \,
+#define Z_IS_1989_EQ_1989(...) \,
+#define Z_IS_1990_EQ_1990(...) \,
+#define Z_IS_1991_EQ_1991(...) \,
+#define Z_IS_1992_EQ_1992(...) \,
+#define Z_IS_1993_EQ_1993(...) \,
+#define Z_IS_1994_EQ_1994(...) \,
+#define Z_IS_1995_EQ_1995(...) \,
+#define Z_IS_1996_EQ_1996(...) \,
+#define Z_IS_1997_EQ_1997(...) \,
+#define Z_IS_1998_EQ_1998(...) \,
+#define Z_IS_1999_EQ_1999(...) \,
+#define Z_IS_2000_EQ_2000(...) \,
+#define Z_IS_2001_EQ_2001(...) \,
+#define Z_IS_2002_EQ_2002(...) \,
+#define Z_IS_2003_EQ_2003(...) \,
+#define Z_IS_2004_EQ_2004(...) \,
+#define Z_IS_2005_EQ_2005(...) \,
+#define Z_IS_2006_EQ_2006(...) \,
+#define Z_IS_2007_EQ_2007(...) \,
+#define Z_IS_2008_EQ_2008(...) \,
+#define Z_IS_2009_EQ_2009(...) \,
+#define Z_IS_2010_EQ_2010(...) \,
+#define Z_IS_2011_EQ_2011(...) \,
+#define Z_IS_2012_EQ_2012(...) \,
+#define Z_IS_2013_EQ_2013(...) \,
+#define Z_IS_2014_EQ_2014(...) \,
+#define Z_IS_2015_EQ_2015(...) \,
+#define Z_IS_2016_EQ_2016(...) \,
+#define Z_IS_2017_EQ_2017(...) \,
+#define Z_IS_2018_EQ_2018(...) \,
+#define Z_IS_2019_EQ_2019(...) \,
+#define Z_IS_2020_EQ_2020(...) \,
+#define Z_IS_2021_EQ_2021(...) \,
+#define Z_IS_2022_EQ_2022(...) \,
+#define Z_IS_2023_EQ_2023(...) \,
+#define Z_IS_2024_EQ_2024(...) \,
+#define Z_IS_2025_EQ_2025(...) \,
+#define Z_IS_2026_EQ_2026(...) \,
+#define Z_IS_2027_EQ_2027(...) \,
+#define Z_IS_2028_EQ_2028(...) \,
+#define Z_IS_2029_EQ_2029(...) \,
+#define Z_IS_2030_EQ_2030(...) \,
+#define Z_IS_2031_EQ_2031(...) \,
+#define Z_IS_2032_EQ_2032(...) \,
+#define Z_IS_2033_EQ_2033(...) \,
+#define Z_IS_2034_EQ_2034(...) \,
+#define Z_IS_2035_EQ_2035(...) \,
+#define Z_IS_2036_EQ_2036(...) \,
+#define Z_IS_2037_EQ_2037(...) \,
+#define Z_IS_2038_EQ_2038(...) \,
+#define Z_IS_2039_EQ_2039(...) \,
+#define Z_IS_2040_EQ_2040(...) \,
+#define Z_IS_2041_EQ_2041(...) \,
+#define Z_IS_2042_EQ_2042(...) \,
+#define Z_IS_2043_EQ_2043(...) \,
+#define Z_IS_2044_EQ_2044(...) \,
+#define Z_IS_2045_EQ_2045(...) \,
+#define Z_IS_2046_EQ_2046(...) \,
+#define Z_IS_2047_EQ_2047(...) \,
+#define Z_IS_2048_EQ_2048(...) \,
+#define Z_IS_2049_EQ_2049(...) \,
+#define Z_IS_2050_EQ_2050(...) \,
+#define Z_IS_2051_EQ_2051(...) \,
+#define Z_IS_2052_EQ_2052(...) \,
+#define Z_IS_2053_EQ_2053(...) \,
+#define Z_IS_2054_EQ_2054(...) \,
+#define Z_IS_2055_EQ_2055(...) \,
+#define Z_IS_2056_EQ_2056(...) \,
+#define Z_IS_2057_EQ_2057(...) \,
+#define Z_IS_2058_EQ_2058(...) \,
+#define Z_IS_2059_EQ_2059(...) \,
+#define Z_IS_2060_EQ_2060(...) \,
+#define Z_IS_2061_EQ_2061(...) \,
+#define Z_IS_2062_EQ_2062(...) \,
+#define Z_IS_2063_EQ_2063(...) \,
+#define Z_IS_2064_EQ_2064(...) \,
+#define Z_IS_2065_EQ_2065(...) \,
+#define Z_IS_2066_EQ_2066(...) \,
+#define Z_IS_2067_EQ_2067(...) \,
+#define Z_IS_2068_EQ_2068(...) \,
+#define Z_IS_2069_EQ_2069(...) \,
+#define Z_IS_2070_EQ_2070(...) \,
+#define Z_IS_2071_EQ_2071(...) \,
+#define Z_IS_2072_EQ_2072(...) \,
+#define Z_IS_2073_EQ_2073(...) \,
+#define Z_IS_2074_EQ_2074(...) \,
+#define Z_IS_2075_EQ_2075(...) \,
+#define Z_IS_2076_EQ_2076(...) \,
+#define Z_IS_2077_EQ_2077(...) \,
+#define Z_IS_2078_EQ_2078(...) \,
+#define Z_IS_2079_EQ_2079(...) \,
+#define Z_IS_2080_EQ_2080(...) \,
+#define Z_IS_2081_EQ_2081(...) \,
+#define Z_IS_2082_EQ_2082(...) \,
+#define Z_IS_2083_EQ_2083(...) \,
+#define Z_IS_2084_EQ_2084(...) \,
+#define Z_IS_2085_EQ_2085(...) \,
+#define Z_IS_2086_EQ_2086(...) \,
+#define Z_IS_2087_EQ_2087(...) \,
+#define Z_IS_2088_EQ_2088(...) \,
+#define Z_IS_2089_EQ_2089(...) \,
+#define Z_IS_2090_EQ_2090(...) \,
+#define Z_IS_2091_EQ_2091(...) \,
+#define Z_IS_2092_EQ_2092(...) \,
+#define Z_IS_2093_EQ_2093(...) \,
+#define Z_IS_2094_EQ_2094(...) \,
+#define Z_IS_2095_EQ_2095(...) \,
+#define Z_IS_2096_EQ_2096(...) \,
+#define Z_IS_2097_EQ_2097(...) \,
+#define Z_IS_2098_EQ_2098(...) \,
+#define Z_IS_2099_EQ_2099(...) \,
+#define Z_IS_2100_EQ_2100(...) \,
+#define Z_IS_2101_EQ_2101(...) \,
+#define Z_IS_2102_EQ_2102(...) \,
+#define Z_IS_2103_EQ_2103(...) \,
+#define Z_IS_2104_EQ_2104(...) \,
+#define Z_IS_2105_EQ_2105(...) \,
+#define Z_IS_2106_EQ_2106(...) \,
+#define Z_IS_2107_EQ_2107(...) \,
+#define Z_IS_2108_EQ_2108(...) \,
+#define Z_IS_2109_EQ_2109(...) \,
+#define Z_IS_2110_EQ_2110(...) \,
+#define Z_IS_2111_EQ_2111(...) \,
+#define Z_IS_2112_EQ_2112(...) \,
+#define Z_IS_2113_EQ_2113(...) \,
+#define Z_IS_2114_EQ_2114(...) \,
+#define Z_IS_2115_EQ_2115(...) \,
+#define Z_IS_2116_EQ_2116(...) \,
+#define Z_IS_2117_EQ_2117(...) \,
+#define Z_IS_2118_EQ_2118(...) \,
+#define Z_IS_2119_EQ_2119(...) \,
+#define Z_IS_2120_EQ_2120(...) \,
+#define Z_IS_2121_EQ_2121(...) \,
+#define Z_IS_2122_EQ_2122(...) \,
+#define Z_IS_2123_EQ_2123(...) \,
+#define Z_IS_2124_EQ_2124(...) \,
+#define Z_IS_2125_EQ_2125(...) \,
+#define Z_IS_2126_EQ_2126(...) \,
+#define Z_IS_2127_EQ_2127(...) \,
+#define Z_IS_2128_EQ_2128(...) \,
+#define Z_IS_2129_EQ_2129(...) \,
+#define Z_IS_2130_EQ_2130(...) \,
+#define Z_IS_2131_EQ_2131(...) \,
+#define Z_IS_2132_EQ_2132(...) \,
+#define Z_IS_2133_EQ_2133(...) \,
+#define Z_IS_2134_EQ_2134(...) \,
+#define Z_IS_2135_EQ_2135(...) \,
+#define Z_IS_2136_EQ_2136(...) \,
+#define Z_IS_2137_EQ_2137(...) \,
+#define Z_IS_2138_EQ_2138(...) \,
+#define Z_IS_2139_EQ_2139(...) \,
+#define Z_IS_2140_EQ_2140(...) \,
+#define Z_IS_2141_EQ_2141(...) \,
+#define Z_IS_2142_EQ_2142(...) \,
+#define Z_IS_2143_EQ_2143(...) \,
+#define Z_IS_2144_EQ_2144(...) \,
+#define Z_IS_2145_EQ_2145(...) \,
+#define Z_IS_2146_EQ_2146(...) \,
+#define Z_IS_2147_EQ_2147(...) \,
+#define Z_IS_2148_EQ_2148(...) \,
+#define Z_IS_2149_EQ_2149(...) \,
+#define Z_IS_2150_EQ_2150(...) \,
+#define Z_IS_2151_EQ_2151(...) \,
+#define Z_IS_2152_EQ_2152(...) \,
+#define Z_IS_2153_EQ_2153(...) \,
+#define Z_IS_2154_EQ_2154(...) \,
+#define Z_IS_2155_EQ_2155(...) \,
+#define Z_IS_2156_EQ_2156(...) \,
+#define Z_IS_2157_EQ_2157(...) \,
+#define Z_IS_2158_EQ_2158(...) \,
+#define Z_IS_2159_EQ_2159(...) \,
+#define Z_IS_2160_EQ_2160(...) \,
+#define Z_IS_2161_EQ_2161(...) \,
+#define Z_IS_2162_EQ_2162(...) \,
+#define Z_IS_2163_EQ_2163(...) \,
+#define Z_IS_2164_EQ_2164(...) \,
+#define Z_IS_2165_EQ_2165(...) \,
+#define Z_IS_2166_EQ_2166(...) \,
+#define Z_IS_2167_EQ_2167(...) \,
+#define Z_IS_2168_EQ_2168(...) \,
+#define Z_IS_2169_EQ_2169(...) \,
+#define Z_IS_2170_EQ_2170(...) \,
+#define Z_IS_2171_EQ_2171(...) \,
+#define Z_IS_2172_EQ_2172(...) \,
+#define Z_IS_2173_EQ_2173(...) \,
+#define Z_IS_2174_EQ_2174(...) \,
+#define Z_IS_2175_EQ_2175(...) \,
+#define Z_IS_2176_EQ_2176(...) \,
+#define Z_IS_2177_EQ_2177(...) \,
+#define Z_IS_2178_EQ_2178(...) \,
+#define Z_IS_2179_EQ_2179(...) \,
+#define Z_IS_2180_EQ_2180(...) \,
+#define Z_IS_2181_EQ_2181(...) \,
+#define Z_IS_2182_EQ_2182(...) \,
+#define Z_IS_2183_EQ_2183(...) \,
+#define Z_IS_2184_EQ_2184(...) \,
+#define Z_IS_2185_EQ_2185(...) \,
+#define Z_IS_2186_EQ_2186(...) \,
+#define Z_IS_2187_EQ_2187(...) \,
+#define Z_IS_2188_EQ_2188(...) \,
+#define Z_IS_2189_EQ_2189(...) \,
+#define Z_IS_2190_EQ_2190(...) \,
+#define Z_IS_2191_EQ_2191(...) \,
+#define Z_IS_2192_EQ_2192(...) \,
+#define Z_IS_2193_EQ_2193(...) \,
+#define Z_IS_2194_EQ_2194(...) \,
+#define Z_IS_2195_EQ_2195(...) \,
+#define Z_IS_2196_EQ_2196(...) \,
+#define Z_IS_2197_EQ_2197(...) \,
+#define Z_IS_2198_EQ_2198(...) \,
+#define Z_IS_2199_EQ_2199(...) \,
+#define Z_IS_2200_EQ_2200(...) \,
+#define Z_IS_2201_EQ_2201(...) \,
+#define Z_IS_2202_EQ_2202(...) \,
+#define Z_IS_2203_EQ_2203(...) \,
+#define Z_IS_2204_EQ_2204(...) \,
+#define Z_IS_2205_EQ_2205(...) \,
+#define Z_IS_2206_EQ_2206(...) \,
+#define Z_IS_2207_EQ_2207(...) \,
+#define Z_IS_2208_EQ_2208(...) \,
+#define Z_IS_2209_EQ_2209(...) \,
+#define Z_IS_2210_EQ_2210(...) \,
+#define Z_IS_2211_EQ_2211(...) \,
+#define Z_IS_2212_EQ_2212(...) \,
+#define Z_IS_2213_EQ_2213(...) \,
+#define Z_IS_2214_EQ_2214(...) \,
+#define Z_IS_2215_EQ_2215(...) \,
+#define Z_IS_2216_EQ_2216(...) \,
+#define Z_IS_2217_EQ_2217(...) \,
+#define Z_IS_2218_EQ_2218(...) \,
+#define Z_IS_2219_EQ_2219(...) \,
+#define Z_IS_2220_EQ_2220(...) \,
+#define Z_IS_2221_EQ_2221(...) \,
+#define Z_IS_2222_EQ_2222(...) \,
+#define Z_IS_2223_EQ_2223(...) \,
+#define Z_IS_2224_EQ_2224(...) \,
+#define Z_IS_2225_EQ_2225(...) \,
+#define Z_IS_2226_EQ_2226(...) \,
+#define Z_IS_2227_EQ_2227(...) \,
+#define Z_IS_2228_EQ_2228(...) \,
+#define Z_IS_2229_EQ_2229(...) \,
+#define Z_IS_2230_EQ_2230(...) \,
+#define Z_IS_2231_EQ_2231(...) \,
+#define Z_IS_2232_EQ_2232(...) \,
+#define Z_IS_2233_EQ_2233(...) \,
+#define Z_IS_2234_EQ_2234(...) \,
+#define Z_IS_2235_EQ_2235(...) \,
+#define Z_IS_2236_EQ_2236(...) \,
+#define Z_IS_2237_EQ_2237(...) \,
+#define Z_IS_2238_EQ_2238(...) \,
+#define Z_IS_2239_EQ_2239(...) \,
+#define Z_IS_2240_EQ_2240(...) \,
+#define Z_IS_2241_EQ_2241(...) \,
+#define Z_IS_2242_EQ_2242(...) \,
+#define Z_IS_2243_EQ_2243(...) \,
+#define Z_IS_2244_EQ_2244(...) \,
+#define Z_IS_2245_EQ_2245(...) \,
+#define Z_IS_2246_EQ_2246(...) \,
+#define Z_IS_2247_EQ_2247(...) \,
+#define Z_IS_2248_EQ_2248(...) \,
+#define Z_IS_2249_EQ_2249(...) \,
+#define Z_IS_2250_EQ_2250(...) \,
+#define Z_IS_2251_EQ_2251(...) \,
+#define Z_IS_2252_EQ_2252(...) \,
+#define Z_IS_2253_EQ_2253(...) \,
+#define Z_IS_2254_EQ_2254(...) \,
+#define Z_IS_2255_EQ_2255(...) \,
+#define Z_IS_2256_EQ_2256(...) \,
+#define Z_IS_2257_EQ_2257(...) \,
+#define Z_IS_2258_EQ_2258(...) \,
+#define Z_IS_2259_EQ_2259(...) \,
+#define Z_IS_2260_EQ_2260(...) \,
+#define Z_IS_2261_EQ_2261(...) \,
+#define Z_IS_2262_EQ_2262(...) \,
+#define Z_IS_2263_EQ_2263(...) \,
+#define Z_IS_2264_EQ_2264(...) \,
+#define Z_IS_2265_EQ_2265(...) \,
+#define Z_IS_2266_EQ_2266(...) \,
+#define Z_IS_2267_EQ_2267(...) \,
+#define Z_IS_2268_EQ_2268(...) \,
+#define Z_IS_2269_EQ_2269(...) \,
+#define Z_IS_2270_EQ_2270(...) \,
+#define Z_IS_2271_EQ_2271(...) \,
+#define Z_IS_2272_EQ_2272(...) \,
+#define Z_IS_2273_EQ_2273(...) \,
+#define Z_IS_2274_EQ_2274(...) \,
+#define Z_IS_2275_EQ_2275(...) \,
+#define Z_IS_2276_EQ_2276(...) \,
+#define Z_IS_2277_EQ_2277(...) \,
+#define Z_IS_2278_EQ_2278(...) \,
+#define Z_IS_2279_EQ_2279(...) \,
+#define Z_IS_2280_EQ_2280(...) \,
+#define Z_IS_2281_EQ_2281(...) \,
+#define Z_IS_2282_EQ_2282(...) \,
+#define Z_IS_2283_EQ_2283(...) \,
+#define Z_IS_2284_EQ_2284(...) \,
+#define Z_IS_2285_EQ_2285(...) \,
+#define Z_IS_2286_EQ_2286(...) \,
+#define Z_IS_2287_EQ_2287(...) \,
+#define Z_IS_2288_EQ_2288(...) \,
+#define Z_IS_2289_EQ_2289(...) \,
+#define Z_IS_2290_EQ_2290(...) \,
+#define Z_IS_2291_EQ_2291(...) \,
+#define Z_IS_2292_EQ_2292(...) \,
+#define Z_IS_2293_EQ_2293(...) \,
+#define Z_IS_2294_EQ_2294(...) \,
+#define Z_IS_2295_EQ_2295(...) \,
+#define Z_IS_2296_EQ_2296(...) \,
+#define Z_IS_2297_EQ_2297(...) \,
+#define Z_IS_2298_EQ_2298(...) \,
+#define Z_IS_2299_EQ_2299(...) \,
+#define Z_IS_2300_EQ_2300(...) \,
+#define Z_IS_2301_EQ_2301(...) \,
+#define Z_IS_2302_EQ_2302(...) \,
+#define Z_IS_2303_EQ_2303(...) \,
+#define Z_IS_2304_EQ_2304(...) \,
+#define Z_IS_2305_EQ_2305(...) \,
+#define Z_IS_2306_EQ_2306(...) \,
+#define Z_IS_2307_EQ_2307(...) \,
+#define Z_IS_2308_EQ_2308(...) \,
+#define Z_IS_2309_EQ_2309(...) \,
+#define Z_IS_2310_EQ_2310(...) \,
+#define Z_IS_2311_EQ_2311(...) \,
+#define Z_IS_2312_EQ_2312(...) \,
+#define Z_IS_2313_EQ_2313(...) \,
+#define Z_IS_2314_EQ_2314(...) \,
+#define Z_IS_2315_EQ_2315(...) \,
+#define Z_IS_2316_EQ_2316(...) \,
+#define Z_IS_2317_EQ_2317(...) \,
+#define Z_IS_2318_EQ_2318(...) \,
+#define Z_IS_2319_EQ_2319(...) \,
+#define Z_IS_2320_EQ_2320(...) \,
+#define Z_IS_2321_EQ_2321(...) \,
+#define Z_IS_2322_EQ_2322(...) \,
+#define Z_IS_2323_EQ_2323(...) \,
+#define Z_IS_2324_EQ_2324(...) \,
+#define Z_IS_2325_EQ_2325(...) \,
+#define Z_IS_2326_EQ_2326(...) \,
+#define Z_IS_2327_EQ_2327(...) \,
+#define Z_IS_2328_EQ_2328(...) \,
+#define Z_IS_2329_EQ_2329(...) \,
+#define Z_IS_2330_EQ_2330(...) \,
+#define Z_IS_2331_EQ_2331(...) \,
+#define Z_IS_2332_EQ_2332(...) \,
+#define Z_IS_2333_EQ_2333(...) \,
+#define Z_IS_2334_EQ_2334(...) \,
+#define Z_IS_2335_EQ_2335(...) \,
+#define Z_IS_2336_EQ_2336(...) \,
+#define Z_IS_2337_EQ_2337(...) \,
+#define Z_IS_2338_EQ_2338(...) \,
+#define Z_IS_2339_EQ_2339(...) \,
+#define Z_IS_2340_EQ_2340(...) \,
+#define Z_IS_2341_EQ_2341(...) \,
+#define Z_IS_2342_EQ_2342(...) \,
+#define Z_IS_2343_EQ_2343(...) \,
+#define Z_IS_2344_EQ_2344(...) \,
+#define Z_IS_2345_EQ_2345(...) \,
+#define Z_IS_2346_EQ_2346(...) \,
+#define Z_IS_2347_EQ_2347(...) \,
+#define Z_IS_2348_EQ_2348(...) \,
+#define Z_IS_2349_EQ_2349(...) \,
+#define Z_IS_2350_EQ_2350(...) \,
+#define Z_IS_2351_EQ_2351(...) \,
+#define Z_IS_2352_EQ_2352(...) \,
+#define Z_IS_2353_EQ_2353(...) \,
+#define Z_IS_2354_EQ_2354(...) \,
+#define Z_IS_2355_EQ_2355(...) \,
+#define Z_IS_2356_EQ_2356(...) \,
+#define Z_IS_2357_EQ_2357(...) \,
+#define Z_IS_2358_EQ_2358(...) \,
+#define Z_IS_2359_EQ_2359(...) \,
+#define Z_IS_2360_EQ_2360(...) \,
+#define Z_IS_2361_EQ_2361(...) \,
+#define Z_IS_2362_EQ_2362(...) \,
+#define Z_IS_2363_EQ_2363(...) \,
+#define Z_IS_2364_EQ_2364(...) \,
+#define Z_IS_2365_EQ_2365(...) \,
+#define Z_IS_2366_EQ_2366(...) \,
+#define Z_IS_2367_EQ_2367(...) \,
+#define Z_IS_2368_EQ_2368(...) \,
+#define Z_IS_2369_EQ_2369(...) \,
+#define Z_IS_2370_EQ_2370(...) \,
+#define Z_IS_2371_EQ_2371(...) \,
+#define Z_IS_2372_EQ_2372(...) \,
+#define Z_IS_2373_EQ_2373(...) \,
+#define Z_IS_2374_EQ_2374(...) \,
+#define Z_IS_2375_EQ_2375(...) \,
+#define Z_IS_2376_EQ_2376(...) \,
+#define Z_IS_2377_EQ_2377(...) \,
+#define Z_IS_2378_EQ_2378(...) \,
+#define Z_IS_2379_EQ_2379(...) \,
+#define Z_IS_2380_EQ_2380(...) \,
+#define Z_IS_2381_EQ_2381(...) \,
+#define Z_IS_2382_EQ_2382(...) \,
+#define Z_IS_2383_EQ_2383(...) \,
+#define Z_IS_2384_EQ_2384(...) \,
+#define Z_IS_2385_EQ_2385(...) \,
+#define Z_IS_2386_EQ_2386(...) \,
+#define Z_IS_2387_EQ_2387(...) \,
+#define Z_IS_2388_EQ_2388(...) \,
+#define Z_IS_2389_EQ_2389(...) \,
+#define Z_IS_2390_EQ_2390(...) \,
+#define Z_IS_2391_EQ_2391(...) \,
+#define Z_IS_2392_EQ_2392(...) \,
+#define Z_IS_2393_EQ_2393(...) \,
+#define Z_IS_2394_EQ_2394(...) \,
+#define Z_IS_2395_EQ_2395(...) \,
+#define Z_IS_2396_EQ_2396(...) \,
+#define Z_IS_2397_EQ_2397(...) \,
+#define Z_IS_2398_EQ_2398(...) \,
+#define Z_IS_2399_EQ_2399(...) \,
+#define Z_IS_2400_EQ_2400(...) \,
+#define Z_IS_2401_EQ_2401(...) \,
+#define Z_IS_2402_EQ_2402(...) \,
+#define Z_IS_2403_EQ_2403(...) \,
+#define Z_IS_2404_EQ_2404(...) \,
+#define Z_IS_2405_EQ_2405(...) \,
+#define Z_IS_2406_EQ_2406(...) \,
+#define Z_IS_2407_EQ_2407(...) \,
+#define Z_IS_2408_EQ_2408(...) \,
+#define Z_IS_2409_EQ_2409(...) \,
+#define Z_IS_2410_EQ_2410(...) \,
+#define Z_IS_2411_EQ_2411(...) \,
+#define Z_IS_2412_EQ_2412(...) \,
+#define Z_IS_2413_EQ_2413(...) \,
+#define Z_IS_2414_EQ_2414(...) \,
+#define Z_IS_2415_EQ_2415(...) \,
+#define Z_IS_2416_EQ_2416(...) \,
+#define Z_IS_2417_EQ_2417(...) \,
+#define Z_IS_2418_EQ_2418(...) \,
+#define Z_IS_2419_EQ_2419(...) \,
+#define Z_IS_2420_EQ_2420(...) \,
+#define Z_IS_2421_EQ_2421(...) \,
+#define Z_IS_2422_EQ_2422(...) \,
+#define Z_IS_2423_EQ_2423(...) \,
+#define Z_IS_2424_EQ_2424(...) \,
+#define Z_IS_2425_EQ_2425(...) \,
+#define Z_IS_2426_EQ_2426(...) \,
+#define Z_IS_2427_EQ_2427(...) \,
+#define Z_IS_2428_EQ_2428(...) \,
+#define Z_IS_2429_EQ_2429(...) \,
+#define Z_IS_2430_EQ_2430(...) \,
+#define Z_IS_2431_EQ_2431(...) \,
+#define Z_IS_2432_EQ_2432(...) \,
+#define Z_IS_2433_EQ_2433(...) \,
+#define Z_IS_2434_EQ_2434(...) \,
+#define Z_IS_2435_EQ_2435(...) \,
+#define Z_IS_2436_EQ_2436(...) \,
+#define Z_IS_2437_EQ_2437(...) \,
+#define Z_IS_2438_EQ_2438(...) \,
+#define Z_IS_2439_EQ_2439(...) \,
+#define Z_IS_2440_EQ_2440(...) \,
+#define Z_IS_2441_EQ_2441(...) \,
+#define Z_IS_2442_EQ_2442(...) \,
+#define Z_IS_2443_EQ_2443(...) \,
+#define Z_IS_2444_EQ_2444(...) \,
+#define Z_IS_2445_EQ_2445(...) \,
+#define Z_IS_2446_EQ_2446(...) \,
+#define Z_IS_2447_EQ_2447(...) \,
+#define Z_IS_2448_EQ_2448(...) \,
+#define Z_IS_2449_EQ_2449(...) \,
+#define Z_IS_2450_EQ_2450(...) \,
+#define Z_IS_2451_EQ_2451(...) \,
+#define Z_IS_2452_EQ_2452(...) \,
+#define Z_IS_2453_EQ_2453(...) \,
+#define Z_IS_2454_EQ_2454(...) \,
+#define Z_IS_2455_EQ_2455(...) \,
+#define Z_IS_2456_EQ_2456(...) \,
+#define Z_IS_2457_EQ_2457(...) \,
+#define Z_IS_2458_EQ_2458(...) \,
+#define Z_IS_2459_EQ_2459(...) \,
+#define Z_IS_2460_EQ_2460(...) \,
+#define Z_IS_2461_EQ_2461(...) \,
+#define Z_IS_2462_EQ_2462(...) \,
+#define Z_IS_2463_EQ_2463(...) \,
+#define Z_IS_2464_EQ_2464(...) \,
+#define Z_IS_2465_EQ_2465(...) \,
+#define Z_IS_2466_EQ_2466(...) \,
+#define Z_IS_2467_EQ_2467(...) \,
+#define Z_IS_2468_EQ_2468(...) \,
+#define Z_IS_2469_EQ_2469(...) \,
+#define Z_IS_2470_EQ_2470(...) \,
+#define Z_IS_2471_EQ_2471(...) \,
+#define Z_IS_2472_EQ_2472(...) \,
+#define Z_IS_2473_EQ_2473(...) \,
+#define Z_IS_2474_EQ_2474(...) \,
+#define Z_IS_2475_EQ_2475(...) \,
+#define Z_IS_2476_EQ_2476(...) \,
+#define Z_IS_2477_EQ_2477(...) \,
+#define Z_IS_2478_EQ_2478(...) \,
+#define Z_IS_2479_EQ_2479(...) \,
+#define Z_IS_2480_EQ_2480(...) \,
+#define Z_IS_2481_EQ_2481(...) \,
+#define Z_IS_2482_EQ_2482(...) \,
+#define Z_IS_2483_EQ_2483(...) \,
+#define Z_IS_2484_EQ_2484(...) \,
+#define Z_IS_2485_EQ_2485(...) \,
+#define Z_IS_2486_EQ_2486(...) \,
+#define Z_IS_2487_EQ_2487(...) \,
+#define Z_IS_2488_EQ_2488(...) \,
+#define Z_IS_2489_EQ_2489(...) \,
+#define Z_IS_2490_EQ_2490(...) \,
+#define Z_IS_2491_EQ_2491(...) \,
+#define Z_IS_2492_EQ_2492(...) \,
+#define Z_IS_2493_EQ_2493(...) \,
+#define Z_IS_2494_EQ_2494(...) \,
+#define Z_IS_2495_EQ_2495(...) \,
+#define Z_IS_2496_EQ_2496(...) \,
+#define Z_IS_2497_EQ_2497(...) \,
+#define Z_IS_2498_EQ_2498(...) \,
+#define Z_IS_2499_EQ_2499(...) \,
+#define Z_IS_2500_EQ_2500(...) \,
+#define Z_IS_2501_EQ_2501(...) \,
+#define Z_IS_2502_EQ_2502(...) \,
+#define Z_IS_2503_EQ_2503(...) \,
+#define Z_IS_2504_EQ_2504(...) \,
+#define Z_IS_2505_EQ_2505(...) \,
+#define Z_IS_2506_EQ_2506(...) \,
+#define Z_IS_2507_EQ_2507(...) \,
+#define Z_IS_2508_EQ_2508(...) \,
+#define Z_IS_2509_EQ_2509(...) \,
+#define Z_IS_2510_EQ_2510(...) \,
+#define Z_IS_2511_EQ_2511(...) \,
+#define Z_IS_2512_EQ_2512(...) \,
+#define Z_IS_2513_EQ_2513(...) \,
+#define Z_IS_2514_EQ_2514(...) \,
+#define Z_IS_2515_EQ_2515(...) \,
+#define Z_IS_2516_EQ_2516(...) \,
+#define Z_IS_2517_EQ_2517(...) \,
+#define Z_IS_2518_EQ_2518(...) \,
+#define Z_IS_2519_EQ_2519(...) \,
+#define Z_IS_2520_EQ_2520(...) \,
+#define Z_IS_2521_EQ_2521(...) \,
+#define Z_IS_2522_EQ_2522(...) \,
+#define Z_IS_2523_EQ_2523(...) \,
+#define Z_IS_2524_EQ_2524(...) \,
+#define Z_IS_2525_EQ_2525(...) \,
+#define Z_IS_2526_EQ_2526(...) \,
+#define Z_IS_2527_EQ_2527(...) \,
+#define Z_IS_2528_EQ_2528(...) \,
+#define Z_IS_2529_EQ_2529(...) \,
+#define Z_IS_2530_EQ_2530(...) \,
+#define Z_IS_2531_EQ_2531(...) \,
+#define Z_IS_2532_EQ_2532(...) \,
+#define Z_IS_2533_EQ_2533(...) \,
+#define Z_IS_2534_EQ_2534(...) \,
+#define Z_IS_2535_EQ_2535(...) \,
+#define Z_IS_2536_EQ_2536(...) \,
+#define Z_IS_2537_EQ_2537(...) \,
+#define Z_IS_2538_EQ_2538(...) \,
+#define Z_IS_2539_EQ_2539(...) \,
+#define Z_IS_2540_EQ_2540(...) \,
+#define Z_IS_2541_EQ_2541(...) \,
+#define Z_IS_2542_EQ_2542(...) \,
+#define Z_IS_2543_EQ_2543(...) \,
+#define Z_IS_2544_EQ_2544(...) \,
+#define Z_IS_2545_EQ_2545(...) \,
+#define Z_IS_2546_EQ_2546(...) \,
+#define Z_IS_2547_EQ_2547(...) \,
+#define Z_IS_2548_EQ_2548(...) \,
+#define Z_IS_2549_EQ_2549(...) \,
+#define Z_IS_2550_EQ_2550(...) \,
+#define Z_IS_2551_EQ_2551(...) \,
+#define Z_IS_2552_EQ_2552(...) \,
+#define Z_IS_2553_EQ_2553(...) \,
+#define Z_IS_2554_EQ_2554(...) \,
+#define Z_IS_2555_EQ_2555(...) \,
+#define Z_IS_2556_EQ_2556(...) \,
+#define Z_IS_2557_EQ_2557(...) \,
+#define Z_IS_2558_EQ_2558(...) \,
+#define Z_IS_2559_EQ_2559(...) \,
+#define Z_IS_2560_EQ_2560(...) \,
+#define Z_IS_2561_EQ_2561(...) \,
+#define Z_IS_2562_EQ_2562(...) \,
+#define Z_IS_2563_EQ_2563(...) \,
+#define Z_IS_2564_EQ_2564(...) \,
+#define Z_IS_2565_EQ_2565(...) \,
+#define Z_IS_2566_EQ_2566(...) \,
+#define Z_IS_2567_EQ_2567(...) \,
+#define Z_IS_2568_EQ_2568(...) \,
+#define Z_IS_2569_EQ_2569(...) \,
+#define Z_IS_2570_EQ_2570(...) \,
+#define Z_IS_2571_EQ_2571(...) \,
+#define Z_IS_2572_EQ_2572(...) \,
+#define Z_IS_2573_EQ_2573(...) \,
+#define Z_IS_2574_EQ_2574(...) \,
+#define Z_IS_2575_EQ_2575(...) \,
+#define Z_IS_2576_EQ_2576(...) \,
+#define Z_IS_2577_EQ_2577(...) \,
+#define Z_IS_2578_EQ_2578(...) \,
+#define Z_IS_2579_EQ_2579(...) \,
+#define Z_IS_2580_EQ_2580(...) \,
+#define Z_IS_2581_EQ_2581(...) \,
+#define Z_IS_2582_EQ_2582(...) \,
+#define Z_IS_2583_EQ_2583(...) \,
+#define Z_IS_2584_EQ_2584(...) \,
+#define Z_IS_2585_EQ_2585(...) \,
+#define Z_IS_2586_EQ_2586(...) \,
+#define Z_IS_2587_EQ_2587(...) \,
+#define Z_IS_2588_EQ_2588(...) \,
+#define Z_IS_2589_EQ_2589(...) \,
+#define Z_IS_2590_EQ_2590(...) \,
+#define Z_IS_2591_EQ_2591(...) \,
+#define Z_IS_2592_EQ_2592(...) \,
+#define Z_IS_2593_EQ_2593(...) \,
+#define Z_IS_2594_EQ_2594(...) \,
+#define Z_IS_2595_EQ_2595(...) \,
+#define Z_IS_2596_EQ_2596(...) \,
+#define Z_IS_2597_EQ_2597(...) \,
+#define Z_IS_2598_EQ_2598(...) \,
+#define Z_IS_2599_EQ_2599(...) \,
+#define Z_IS_2600_EQ_2600(...) \,
+#define Z_IS_2601_EQ_2601(...) \,
+#define Z_IS_2602_EQ_2602(...) \,
+#define Z_IS_2603_EQ_2603(...) \,
+#define Z_IS_2604_EQ_2604(...) \,
+#define Z_IS_2605_EQ_2605(...) \,
+#define Z_IS_2606_EQ_2606(...) \,
+#define Z_IS_2607_EQ_2607(...) \,
+#define Z_IS_2608_EQ_2608(...) \,
+#define Z_IS_2609_EQ_2609(...) \,
+#define Z_IS_2610_EQ_2610(...) \,
+#define Z_IS_2611_EQ_2611(...) \,
+#define Z_IS_2612_EQ_2612(...) \,
+#define Z_IS_2613_EQ_2613(...) \,
+#define Z_IS_2614_EQ_2614(...) \,
+#define Z_IS_2615_EQ_2615(...) \,
+#define Z_IS_2616_EQ_2616(...) \,
+#define Z_IS_2617_EQ_2617(...) \,
+#define Z_IS_2618_EQ_2618(...) \,
+#define Z_IS_2619_EQ_2619(...) \,
+#define Z_IS_2620_EQ_2620(...) \,
+#define Z_IS_2621_EQ_2621(...) \,
+#define Z_IS_2622_EQ_2622(...) \,
+#define Z_IS_2623_EQ_2623(...) \,
+#define Z_IS_2624_EQ_2624(...) \,
+#define Z_IS_2625_EQ_2625(...) \,
+#define Z_IS_2626_EQ_2626(...) \,
+#define Z_IS_2627_EQ_2627(...) \,
+#define Z_IS_2628_EQ_2628(...) \,
+#define Z_IS_2629_EQ_2629(...) \,
+#define Z_IS_2630_EQ_2630(...) \,
+#define Z_IS_2631_EQ_2631(...) \,
+#define Z_IS_2632_EQ_2632(...) \,
+#define Z_IS_2633_EQ_2633(...) \,
+#define Z_IS_2634_EQ_2634(...) \,
+#define Z_IS_2635_EQ_2635(...) \,
+#define Z_IS_2636_EQ_2636(...) \,
+#define Z_IS_2637_EQ_2637(...) \,
+#define Z_IS_2638_EQ_2638(...) \,
+#define Z_IS_2639_EQ_2639(...) \,
+#define Z_IS_2640_EQ_2640(...) \,
+#define Z_IS_2641_EQ_2641(...) \,
+#define Z_IS_2642_EQ_2642(...) \,
+#define Z_IS_2643_EQ_2643(...) \,
+#define Z_IS_2644_EQ_2644(...) \,
+#define Z_IS_2645_EQ_2645(...) \,
+#define Z_IS_2646_EQ_2646(...) \,
+#define Z_IS_2647_EQ_2647(...) \,
+#define Z_IS_2648_EQ_2648(...) \,
+#define Z_IS_2649_EQ_2649(...) \,
+#define Z_IS_2650_EQ_2650(...) \,
+#define Z_IS_2651_EQ_2651(...) \,
+#define Z_IS_2652_EQ_2652(...) \,
+#define Z_IS_2653_EQ_2653(...) \,
+#define Z_IS_2654_EQ_2654(...) \,
+#define Z_IS_2655_EQ_2655(...) \,
+#define Z_IS_2656_EQ_2656(...) \,
+#define Z_IS_2657_EQ_2657(...) \,
+#define Z_IS_2658_EQ_2658(...) \,
+#define Z_IS_2659_EQ_2659(...) \,
+#define Z_IS_2660_EQ_2660(...) \,
+#define Z_IS_2661_EQ_2661(...) \,
+#define Z_IS_2662_EQ_2662(...) \,
+#define Z_IS_2663_EQ_2663(...) \,
+#define Z_IS_2664_EQ_2664(...) \,
+#define Z_IS_2665_EQ_2665(...) \,
+#define Z_IS_2666_EQ_2666(...) \,
+#define Z_IS_2667_EQ_2667(...) \,
+#define Z_IS_2668_EQ_2668(...) \,
+#define Z_IS_2669_EQ_2669(...) \,
+#define Z_IS_2670_EQ_2670(...) \,
+#define Z_IS_2671_EQ_2671(...) \,
+#define Z_IS_2672_EQ_2672(...) \,
+#define Z_IS_2673_EQ_2673(...) \,
+#define Z_IS_2674_EQ_2674(...) \,
+#define Z_IS_2675_EQ_2675(...) \,
+#define Z_IS_2676_EQ_2676(...) \,
+#define Z_IS_2677_EQ_2677(...) \,
+#define Z_IS_2678_EQ_2678(...) \,
+#define Z_IS_2679_EQ_2679(...) \,
+#define Z_IS_2680_EQ_2680(...) \,
+#define Z_IS_2681_EQ_2681(...) \,
+#define Z_IS_2682_EQ_2682(...) \,
+#define Z_IS_2683_EQ_2683(...) \,
+#define Z_IS_2684_EQ_2684(...) \,
+#define Z_IS_2685_EQ_2685(...) \,
+#define Z_IS_2686_EQ_2686(...) \,
+#define Z_IS_2687_EQ_2687(...) \,
+#define Z_IS_2688_EQ_2688(...) \,
+#define Z_IS_2689_EQ_2689(...) \,
+#define Z_IS_2690_EQ_2690(...) \,
+#define Z_IS_2691_EQ_2691(...) \,
+#define Z_IS_2692_EQ_2692(...) \,
+#define Z_IS_2693_EQ_2693(...) \,
+#define Z_IS_2694_EQ_2694(...) \,
+#define Z_IS_2695_EQ_2695(...) \,
+#define Z_IS_2696_EQ_2696(...) \,
+#define Z_IS_2697_EQ_2697(...) \,
+#define Z_IS_2698_EQ_2698(...) \,
+#define Z_IS_2699_EQ_2699(...) \,
+#define Z_IS_2700_EQ_2700(...) \,
+#define Z_IS_2701_EQ_2701(...) \,
+#define Z_IS_2702_EQ_2702(...) \,
+#define Z_IS_2703_EQ_2703(...) \,
+#define Z_IS_2704_EQ_2704(...) \,
+#define Z_IS_2705_EQ_2705(...) \,
+#define Z_IS_2706_EQ_2706(...) \,
+#define Z_IS_2707_EQ_2707(...) \,
+#define Z_IS_2708_EQ_2708(...) \,
+#define Z_IS_2709_EQ_2709(...) \,
+#define Z_IS_2710_EQ_2710(...) \,
+#define Z_IS_2711_EQ_2711(...) \,
+#define Z_IS_2712_EQ_2712(...) \,
+#define Z_IS_2713_EQ_2713(...) \,
+#define Z_IS_2714_EQ_2714(...) \,
+#define Z_IS_2715_EQ_2715(...) \,
+#define Z_IS_2716_EQ_2716(...) \,
+#define Z_IS_2717_EQ_2717(...) \,
+#define Z_IS_2718_EQ_2718(...) \,
+#define Z_IS_2719_EQ_2719(...) \,
+#define Z_IS_2720_EQ_2720(...) \,
+#define Z_IS_2721_EQ_2721(...) \,
+#define Z_IS_2722_EQ_2722(...) \,
+#define Z_IS_2723_EQ_2723(...) \,
+#define Z_IS_2724_EQ_2724(...) \,
+#define Z_IS_2725_EQ_2725(...) \,
+#define Z_IS_2726_EQ_2726(...) \,
+#define Z_IS_2727_EQ_2727(...) \,
+#define Z_IS_2728_EQ_2728(...) \,
+#define Z_IS_2729_EQ_2729(...) \,
+#define Z_IS_2730_EQ_2730(...) \,
+#define Z_IS_2731_EQ_2731(...) \,
+#define Z_IS_2732_EQ_2732(...) \,
+#define Z_IS_2733_EQ_2733(...) \,
+#define Z_IS_2734_EQ_2734(...) \,
+#define Z_IS_2735_EQ_2735(...) \,
+#define Z_IS_2736_EQ_2736(...) \,
+#define Z_IS_2737_EQ_2737(...) \,
+#define Z_IS_2738_EQ_2738(...) \,
+#define Z_IS_2739_EQ_2739(...) \,
+#define Z_IS_2740_EQ_2740(...) \,
+#define Z_IS_2741_EQ_2741(...) \,
+#define Z_IS_2742_EQ_2742(...) \,
+#define Z_IS_2743_EQ_2743(...) \,
+#define Z_IS_2744_EQ_2744(...) \,
+#define Z_IS_2745_EQ_2745(...) \,
+#define Z_IS_2746_EQ_2746(...) \,
+#define Z_IS_2747_EQ_2747(...) \,
+#define Z_IS_2748_EQ_2748(...) \,
+#define Z_IS_2749_EQ_2749(...) \,
+#define Z_IS_2750_EQ_2750(...) \,
+#define Z_IS_2751_EQ_2751(...) \,
+#define Z_IS_2752_EQ_2752(...) \,
+#define Z_IS_2753_EQ_2753(...) \,
+#define Z_IS_2754_EQ_2754(...) \,
+#define Z_IS_2755_EQ_2755(...) \,
+#define Z_IS_2756_EQ_2756(...) \,
+#define Z_IS_2757_EQ_2757(...) \,
+#define Z_IS_2758_EQ_2758(...) \,
+#define Z_IS_2759_EQ_2759(...) \,
+#define Z_IS_2760_EQ_2760(...) \,
+#define Z_IS_2761_EQ_2761(...) \,
+#define Z_IS_2762_EQ_2762(...) \,
+#define Z_IS_2763_EQ_2763(...) \,
+#define Z_IS_2764_EQ_2764(...) \,
+#define Z_IS_2765_EQ_2765(...) \,
+#define Z_IS_2766_EQ_2766(...) \,
+#define Z_IS_2767_EQ_2767(...) \,
+#define Z_IS_2768_EQ_2768(...) \,
+#define Z_IS_2769_EQ_2769(...) \,
+#define Z_IS_2770_EQ_2770(...) \,
+#define Z_IS_2771_EQ_2771(...) \,
+#define Z_IS_2772_EQ_2772(...) \,
+#define Z_IS_2773_EQ_2773(...) \,
+#define Z_IS_2774_EQ_2774(...) \,
+#define Z_IS_2775_EQ_2775(...) \,
+#define Z_IS_2776_EQ_2776(...) \,
+#define Z_IS_2777_EQ_2777(...) \,
+#define Z_IS_2778_EQ_2778(...) \,
+#define Z_IS_2779_EQ_2779(...) \,
+#define Z_IS_2780_EQ_2780(...) \,
+#define Z_IS_2781_EQ_2781(...) \,
+#define Z_IS_2782_EQ_2782(...) \,
+#define Z_IS_2783_EQ_2783(...) \,
+#define Z_IS_2784_EQ_2784(...) \,
+#define Z_IS_2785_EQ_2785(...) \,
+#define Z_IS_2786_EQ_2786(...) \,
+#define Z_IS_2787_EQ_2787(...) \,
+#define Z_IS_2788_EQ_2788(...) \,
+#define Z_IS_2789_EQ_2789(...) \,
+#define Z_IS_2790_EQ_2790(...) \,
+#define Z_IS_2791_EQ_2791(...) \,
+#define Z_IS_2792_EQ_2792(...) \,
+#define Z_IS_2793_EQ_2793(...) \,
+#define Z_IS_2794_EQ_2794(...) \,
+#define Z_IS_2795_EQ_2795(...) \,
+#define Z_IS_2796_EQ_2796(...) \,
+#define Z_IS_2797_EQ_2797(...) \,
+#define Z_IS_2798_EQ_2798(...) \,
+#define Z_IS_2799_EQ_2799(...) \,
+#define Z_IS_2800_EQ_2800(...) \,
+#define Z_IS_2801_EQ_2801(...) \,
+#define Z_IS_2802_EQ_2802(...) \,
+#define Z_IS_2803_EQ_2803(...) \,
+#define Z_IS_2804_EQ_2804(...) \,
+#define Z_IS_2805_EQ_2805(...) \,
+#define Z_IS_2806_EQ_2806(...) \,
+#define Z_IS_2807_EQ_2807(...) \,
+#define Z_IS_2808_EQ_2808(...) \,
+#define Z_IS_2809_EQ_2809(...) \,
+#define Z_IS_2810_EQ_2810(...) \,
+#define Z_IS_2811_EQ_2811(...) \,
+#define Z_IS_2812_EQ_2812(...) \,
+#define Z_IS_2813_EQ_2813(...) \,
+#define Z_IS_2814_EQ_2814(...) \,
+#define Z_IS_2815_EQ_2815(...) \,
+#define Z_IS_2816_EQ_2816(...) \,
+#define Z_IS_2817_EQ_2817(...) \,
+#define Z_IS_2818_EQ_2818(...) \,
+#define Z_IS_2819_EQ_2819(...) \,
+#define Z_IS_2820_EQ_2820(...) \,
+#define Z_IS_2821_EQ_2821(...) \,
+#define Z_IS_2822_EQ_2822(...) \,
+#define Z_IS_2823_EQ_2823(...) \,
+#define Z_IS_2824_EQ_2824(...) \,
+#define Z_IS_2825_EQ_2825(...) \,
+#define Z_IS_2826_EQ_2826(...) \,
+#define Z_IS_2827_EQ_2827(...) \,
+#define Z_IS_2828_EQ_2828(...) \,
+#define Z_IS_2829_EQ_2829(...) \,
+#define Z_IS_2830_EQ_2830(...) \,
+#define Z_IS_2831_EQ_2831(...) \,
+#define Z_IS_2832_EQ_2832(...) \,
+#define Z_IS_2833_EQ_2833(...) \,
+#define Z_IS_2834_EQ_2834(...) \,
+#define Z_IS_2835_EQ_2835(...) \,
+#define Z_IS_2836_EQ_2836(...) \,
+#define Z_IS_2837_EQ_2837(...) \,
+#define Z_IS_2838_EQ_2838(...) \,
+#define Z_IS_2839_EQ_2839(...) \,
+#define Z_IS_2840_EQ_2840(...) \,
+#define Z_IS_2841_EQ_2841(...) \,
+#define Z_IS_2842_EQ_2842(...) \,
+#define Z_IS_2843_EQ_2843(...) \,
+#define Z_IS_2844_EQ_2844(...) \,
+#define Z_IS_2845_EQ_2845(...) \,
+#define Z_IS_2846_EQ_2846(...) \,
+#define Z_IS_2847_EQ_2847(...) \,
+#define Z_IS_2848_EQ_2848(...) \,
+#define Z_IS_2849_EQ_2849(...) \,
+#define Z_IS_2850_EQ_2850(...) \,
+#define Z_IS_2851_EQ_2851(...) \,
+#define Z_IS_2852_EQ_2852(...) \,
+#define Z_IS_2853_EQ_2853(...) \,
+#define Z_IS_2854_EQ_2854(...) \,
+#define Z_IS_2855_EQ_2855(...) \,
+#define Z_IS_2856_EQ_2856(...) \,
+#define Z_IS_2857_EQ_2857(...) \,
+#define Z_IS_2858_EQ_2858(...) \,
+#define Z_IS_2859_EQ_2859(...) \,
+#define Z_IS_2860_EQ_2860(...) \,
+#define Z_IS_2861_EQ_2861(...) \,
+#define Z_IS_2862_EQ_2862(...) \,
+#define Z_IS_2863_EQ_2863(...) \,
+#define Z_IS_2864_EQ_2864(...) \,
+#define Z_IS_2865_EQ_2865(...) \,
+#define Z_IS_2866_EQ_2866(...) \,
+#define Z_IS_2867_EQ_2867(...) \,
+#define Z_IS_2868_EQ_2868(...) \,
+#define Z_IS_2869_EQ_2869(...) \,
+#define Z_IS_2870_EQ_2870(...) \,
+#define Z_IS_2871_EQ_2871(...) \,
+#define Z_IS_2872_EQ_2872(...) \,
+#define Z_IS_2873_EQ_2873(...) \,
+#define Z_IS_2874_EQ_2874(...) \,
+#define Z_IS_2875_EQ_2875(...) \,
+#define Z_IS_2876_EQ_2876(...) \,
+#define Z_IS_2877_EQ_2877(...) \,
+#define Z_IS_2878_EQ_2878(...) \,
+#define Z_IS_2879_EQ_2879(...) \,
+#define Z_IS_2880_EQ_2880(...) \,
+#define Z_IS_2881_EQ_2881(...) \,
+#define Z_IS_2882_EQ_2882(...) \,
+#define Z_IS_2883_EQ_2883(...) \,
+#define Z_IS_2884_EQ_2884(...) \,
+#define Z_IS_2885_EQ_2885(...) \,
+#define Z_IS_2886_EQ_2886(...) \,
+#define Z_IS_2887_EQ_2887(...) \,
+#define Z_IS_2888_EQ_2888(...) \,
+#define Z_IS_2889_EQ_2889(...) \,
+#define Z_IS_2890_EQ_2890(...) \,
+#define Z_IS_2891_EQ_2891(...) \,
+#define Z_IS_2892_EQ_2892(...) \,
+#define Z_IS_2893_EQ_2893(...) \,
+#define Z_IS_2894_EQ_2894(...) \,
+#define Z_IS_2895_EQ_2895(...) \,
+#define Z_IS_2896_EQ_2896(...) \,
+#define Z_IS_2897_EQ_2897(...) \,
+#define Z_IS_2898_EQ_2898(...) \,
+#define Z_IS_2899_EQ_2899(...) \,
+#define Z_IS_2900_EQ_2900(...) \,
+#define Z_IS_2901_EQ_2901(...) \,
+#define Z_IS_2902_EQ_2902(...) \,
+#define Z_IS_2903_EQ_2903(...) \,
+#define Z_IS_2904_EQ_2904(...) \,
+#define Z_IS_2905_EQ_2905(...) \,
+#define Z_IS_2906_EQ_2906(...) \,
+#define Z_IS_2907_EQ_2907(...) \,
+#define Z_IS_2908_EQ_2908(...) \,
+#define Z_IS_2909_EQ_2909(...) \,
+#define Z_IS_2910_EQ_2910(...) \,
+#define Z_IS_2911_EQ_2911(...) \,
+#define Z_IS_2912_EQ_2912(...) \,
+#define Z_IS_2913_EQ_2913(...) \,
+#define Z_IS_2914_EQ_2914(...) \,
+#define Z_IS_2915_EQ_2915(...) \,
+#define Z_IS_2916_EQ_2916(...) \,
+#define Z_IS_2917_EQ_2917(...) \,
+#define Z_IS_2918_EQ_2918(...) \,
+#define Z_IS_2919_EQ_2919(...) \,
+#define Z_IS_2920_EQ_2920(...) \,
+#define Z_IS_2921_EQ_2921(...) \,
+#define Z_IS_2922_EQ_2922(...) \,
+#define Z_IS_2923_EQ_2923(...) \,
+#define Z_IS_2924_EQ_2924(...) \,
+#define Z_IS_2925_EQ_2925(...) \,
+#define Z_IS_2926_EQ_2926(...) \,
+#define Z_IS_2927_EQ_2927(...) \,
+#define Z_IS_2928_EQ_2928(...) \,
+#define Z_IS_2929_EQ_2929(...) \,
+#define Z_IS_2930_EQ_2930(...) \,
+#define Z_IS_2931_EQ_2931(...) \,
+#define Z_IS_2932_EQ_2932(...) \,
+#define Z_IS_2933_EQ_2933(...) \,
+#define Z_IS_2934_EQ_2934(...) \,
+#define Z_IS_2935_EQ_2935(...) \,
+#define Z_IS_2936_EQ_2936(...) \,
+#define Z_IS_2937_EQ_2937(...) \,
+#define Z_IS_2938_EQ_2938(...) \,
+#define Z_IS_2939_EQ_2939(...) \,
+#define Z_IS_2940_EQ_2940(...) \,
+#define Z_IS_2941_EQ_2941(...) \,
+#define Z_IS_2942_EQ_2942(...) \,
+#define Z_IS_2943_EQ_2943(...) \,
+#define Z_IS_2944_EQ_2944(...) \,
+#define Z_IS_2945_EQ_2945(...) \,
+#define Z_IS_2946_EQ_2946(...) \,
+#define Z_IS_2947_EQ_2947(...) \,
+#define Z_IS_2948_EQ_2948(...) \,
+#define Z_IS_2949_EQ_2949(...) \,
+#define Z_IS_2950_EQ_2950(...) \,
+#define Z_IS_2951_EQ_2951(...) \,
+#define Z_IS_2952_EQ_2952(...) \,
+#define Z_IS_2953_EQ_2953(...) \,
+#define Z_IS_2954_EQ_2954(...) \,
+#define Z_IS_2955_EQ_2955(...) \,
+#define Z_IS_2956_EQ_2956(...) \,
+#define Z_IS_2957_EQ_2957(...) \,
+#define Z_IS_2958_EQ_2958(...) \,
+#define Z_IS_2959_EQ_2959(...) \,
+#define Z_IS_2960_EQ_2960(...) \,
+#define Z_IS_2961_EQ_2961(...) \,
+#define Z_IS_2962_EQ_2962(...) \,
+#define Z_IS_2963_EQ_2963(...) \,
+#define Z_IS_2964_EQ_2964(...) \,
+#define Z_IS_2965_EQ_2965(...) \,
+#define Z_IS_2966_EQ_2966(...) \,
+#define Z_IS_2967_EQ_2967(...) \,
+#define Z_IS_2968_EQ_2968(...) \,
+#define Z_IS_2969_EQ_2969(...) \,
+#define Z_IS_2970_EQ_2970(...) \,
+#define Z_IS_2971_EQ_2971(...) \,
+#define Z_IS_2972_EQ_2972(...) \,
+#define Z_IS_2973_EQ_2973(...) \,
+#define Z_IS_2974_EQ_2974(...) \,
+#define Z_IS_2975_EQ_2975(...) \,
+#define Z_IS_2976_EQ_2976(...) \,
+#define Z_IS_2977_EQ_2977(...) \,
+#define Z_IS_2978_EQ_2978(...) \,
+#define Z_IS_2979_EQ_2979(...) \,
+#define Z_IS_2980_EQ_2980(...) \,
+#define Z_IS_2981_EQ_2981(...) \,
+#define Z_IS_2982_EQ_2982(...) \,
+#define Z_IS_2983_EQ_2983(...) \,
+#define Z_IS_2984_EQ_2984(...) \,
+#define Z_IS_2985_EQ_2985(...) \,
+#define Z_IS_2986_EQ_2986(...) \,
+#define Z_IS_2987_EQ_2987(...) \,
+#define Z_IS_2988_EQ_2988(...) \,
+#define Z_IS_2989_EQ_2989(...) \,
+#define Z_IS_2990_EQ_2990(...) \,
+#define Z_IS_2991_EQ_2991(...) \,
+#define Z_IS_2992_EQ_2992(...) \,
+#define Z_IS_2993_EQ_2993(...) \,
+#define Z_IS_2994_EQ_2994(...) \,
+#define Z_IS_2995_EQ_2995(...) \,
+#define Z_IS_2996_EQ_2996(...) \,
+#define Z_IS_2997_EQ_2997(...) \,
+#define Z_IS_2998_EQ_2998(...) \,
+#define Z_IS_2999_EQ_2999(...) \,
+#define Z_IS_3000_EQ_3000(...) \,
+#define Z_IS_3001_EQ_3001(...) \,
+#define Z_IS_3002_EQ_3002(...) \,
+#define Z_IS_3003_EQ_3003(...) \,
+#define Z_IS_3004_EQ_3004(...) \,
+#define Z_IS_3005_EQ_3005(...) \,
+#define Z_IS_3006_EQ_3006(...) \,
+#define Z_IS_3007_EQ_3007(...) \,
+#define Z_IS_3008_EQ_3008(...) \,
+#define Z_IS_3009_EQ_3009(...) \,
+#define Z_IS_3010_EQ_3010(...) \,
+#define Z_IS_3011_EQ_3011(...) \,
+#define Z_IS_3012_EQ_3012(...) \,
+#define Z_IS_3013_EQ_3013(...) \,
+#define Z_IS_3014_EQ_3014(...) \,
+#define Z_IS_3015_EQ_3015(...) \,
+#define Z_IS_3016_EQ_3016(...) \,
+#define Z_IS_3017_EQ_3017(...) \,
+#define Z_IS_3018_EQ_3018(...) \,
+#define Z_IS_3019_EQ_3019(...) \,
+#define Z_IS_3020_EQ_3020(...) \,
+#define Z_IS_3021_EQ_3021(...) \,
+#define Z_IS_3022_EQ_3022(...) \,
+#define Z_IS_3023_EQ_3023(...) \,
+#define Z_IS_3024_EQ_3024(...) \,
+#define Z_IS_3025_EQ_3025(...) \,
+#define Z_IS_3026_EQ_3026(...) \,
+#define Z_IS_3027_EQ_3027(...) \,
+#define Z_IS_3028_EQ_3028(...) \,
+#define Z_IS_3029_EQ_3029(...) \,
+#define Z_IS_3030_EQ_3030(...) \,
+#define Z_IS_3031_EQ_3031(...) \,
+#define Z_IS_3032_EQ_3032(...) \,
+#define Z_IS_3033_EQ_3033(...) \,
+#define Z_IS_3034_EQ_3034(...) \,
+#define Z_IS_3035_EQ_3035(...) \,
+#define Z_IS_3036_EQ_3036(...) \,
+#define Z_IS_3037_EQ_3037(...) \,
+#define Z_IS_3038_EQ_3038(...) \,
+#define Z_IS_3039_EQ_3039(...) \,
+#define Z_IS_3040_EQ_3040(...) \,
+#define Z_IS_3041_EQ_3041(...) \,
+#define Z_IS_3042_EQ_3042(...) \,
+#define Z_IS_3043_EQ_3043(...) \,
+#define Z_IS_3044_EQ_3044(...) \,
+#define Z_IS_3045_EQ_3045(...) \,
+#define Z_IS_3046_EQ_3046(...) \,
+#define Z_IS_3047_EQ_3047(...) \,
+#define Z_IS_3048_EQ_3048(...) \,
+#define Z_IS_3049_EQ_3049(...) \,
+#define Z_IS_3050_EQ_3050(...) \,
+#define Z_IS_3051_EQ_3051(...) \,
+#define Z_IS_3052_EQ_3052(...) \,
+#define Z_IS_3053_EQ_3053(...) \,
+#define Z_IS_3054_EQ_3054(...) \,
+#define Z_IS_3055_EQ_3055(...) \,
+#define Z_IS_3056_EQ_3056(...) \,
+#define Z_IS_3057_EQ_3057(...) \,
+#define Z_IS_3058_EQ_3058(...) \,
+#define Z_IS_3059_EQ_3059(...) \,
+#define Z_IS_3060_EQ_3060(...) \,
+#define Z_IS_3061_EQ_3061(...) \,
+#define Z_IS_3062_EQ_3062(...) \,
+#define Z_IS_3063_EQ_3063(...) \,
+#define Z_IS_3064_EQ_3064(...) \,
+#define Z_IS_3065_EQ_3065(...) \,
+#define Z_IS_3066_EQ_3066(...) \,
+#define Z_IS_3067_EQ_3067(...) \,
+#define Z_IS_3068_EQ_3068(...) \,
+#define Z_IS_3069_EQ_3069(...) \,
+#define Z_IS_3070_EQ_3070(...) \,
+#define Z_IS_3071_EQ_3071(...) \,
+#define Z_IS_3072_EQ_3072(...) \,
+#define Z_IS_3073_EQ_3073(...) \,
+#define Z_IS_3074_EQ_3074(...) \,
+#define Z_IS_3075_EQ_3075(...) \,
+#define Z_IS_3076_EQ_3076(...) \,
+#define Z_IS_3077_EQ_3077(...) \,
+#define Z_IS_3078_EQ_3078(...) \,
+#define Z_IS_3079_EQ_3079(...) \,
+#define Z_IS_3080_EQ_3080(...) \,
+#define Z_IS_3081_EQ_3081(...) \,
+#define Z_IS_3082_EQ_3082(...) \,
+#define Z_IS_3083_EQ_3083(...) \,
+#define Z_IS_3084_EQ_3084(...) \,
+#define Z_IS_3085_EQ_3085(...) \,
+#define Z_IS_3086_EQ_3086(...) \,
+#define Z_IS_3087_EQ_3087(...) \,
+#define Z_IS_3088_EQ_3088(...) \,
+#define Z_IS_3089_EQ_3089(...) \,
+#define Z_IS_3090_EQ_3090(...) \,
+#define Z_IS_3091_EQ_3091(...) \,
+#define Z_IS_3092_EQ_3092(...) \,
+#define Z_IS_3093_EQ_3093(...) \,
+#define Z_IS_3094_EQ_3094(...) \,
+#define Z_IS_3095_EQ_3095(...) \,
+#define Z_IS_3096_EQ_3096(...) \,
+#define Z_IS_3097_EQ_3097(...) \,
+#define Z_IS_3098_EQ_3098(...) \,
+#define Z_IS_3099_EQ_3099(...) \,
+#define Z_IS_3100_EQ_3100(...) \,
+#define Z_IS_3101_EQ_3101(...) \,
+#define Z_IS_3102_EQ_3102(...) \,
+#define Z_IS_3103_EQ_3103(...) \,
+#define Z_IS_3104_EQ_3104(...) \,
+#define Z_IS_3105_EQ_3105(...) \,
+#define Z_IS_3106_EQ_3106(...) \,
+#define Z_IS_3107_EQ_3107(...) \,
+#define Z_IS_3108_EQ_3108(...) \,
+#define Z_IS_3109_EQ_3109(...) \,
+#define Z_IS_3110_EQ_3110(...) \,
+#define Z_IS_3111_EQ_3111(...) \,
+#define Z_IS_3112_EQ_3112(...) \,
+#define Z_IS_3113_EQ_3113(...) \,
+#define Z_IS_3114_EQ_3114(...) \,
+#define Z_IS_3115_EQ_3115(...) \,
+#define Z_IS_3116_EQ_3116(...) \,
+#define Z_IS_3117_EQ_3117(...) \,
+#define Z_IS_3118_EQ_3118(...) \,
+#define Z_IS_3119_EQ_3119(...) \,
+#define Z_IS_3120_EQ_3120(...) \,
+#define Z_IS_3121_EQ_3121(...) \,
+#define Z_IS_3122_EQ_3122(...) \,
+#define Z_IS_3123_EQ_3123(...) \,
+#define Z_IS_3124_EQ_3124(...) \,
+#define Z_IS_3125_EQ_3125(...) \,
+#define Z_IS_3126_EQ_3126(...) \,
+#define Z_IS_3127_EQ_3127(...) \,
+#define Z_IS_3128_EQ_3128(...) \,
+#define Z_IS_3129_EQ_3129(...) \,
+#define Z_IS_3130_EQ_3130(...) \,
+#define Z_IS_3131_EQ_3131(...) \,
+#define Z_IS_3132_EQ_3132(...) \,
+#define Z_IS_3133_EQ_3133(...) \,
+#define Z_IS_3134_EQ_3134(...) \,
+#define Z_IS_3135_EQ_3135(...) \,
+#define Z_IS_3136_EQ_3136(...) \,
+#define Z_IS_3137_EQ_3137(...) \,
+#define Z_IS_3138_EQ_3138(...) \,
+#define Z_IS_3139_EQ_3139(...) \,
+#define Z_IS_3140_EQ_3140(...) \,
+#define Z_IS_3141_EQ_3141(...) \,
+#define Z_IS_3142_EQ_3142(...) \,
+#define Z_IS_3143_EQ_3143(...) \,
+#define Z_IS_3144_EQ_3144(...) \,
+#define Z_IS_3145_EQ_3145(...) \,
+#define Z_IS_3146_EQ_3146(...) \,
+#define Z_IS_3147_EQ_3147(...) \,
+#define Z_IS_3148_EQ_3148(...) \,
+#define Z_IS_3149_EQ_3149(...) \,
+#define Z_IS_3150_EQ_3150(...) \,
+#define Z_IS_3151_EQ_3151(...) \,
+#define Z_IS_3152_EQ_3152(...) \,
+#define Z_IS_3153_EQ_3153(...) \,
+#define Z_IS_3154_EQ_3154(...) \,
+#define Z_IS_3155_EQ_3155(...) \,
+#define Z_IS_3156_EQ_3156(...) \,
+#define Z_IS_3157_EQ_3157(...) \,
+#define Z_IS_3158_EQ_3158(...) \,
+#define Z_IS_3159_EQ_3159(...) \,
+#define Z_IS_3160_EQ_3160(...) \,
+#define Z_IS_3161_EQ_3161(...) \,
+#define Z_IS_3162_EQ_3162(...) \,
+#define Z_IS_3163_EQ_3163(...) \,
+#define Z_IS_3164_EQ_3164(...) \,
+#define Z_IS_3165_EQ_3165(...) \,
+#define Z_IS_3166_EQ_3166(...) \,
+#define Z_IS_3167_EQ_3167(...) \,
+#define Z_IS_3168_EQ_3168(...) \,
+#define Z_IS_3169_EQ_3169(...) \,
+#define Z_IS_3170_EQ_3170(...) \,
+#define Z_IS_3171_EQ_3171(...) \,
+#define Z_IS_3172_EQ_3172(...) \,
+#define Z_IS_3173_EQ_3173(...) \,
+#define Z_IS_3174_EQ_3174(...) \,
+#define Z_IS_3175_EQ_3175(...) \,
+#define Z_IS_3176_EQ_3176(...) \,
+#define Z_IS_3177_EQ_3177(...) \,
+#define Z_IS_3178_EQ_3178(...) \,
+#define Z_IS_3179_EQ_3179(...) \,
+#define Z_IS_3180_EQ_3180(...) \,
+#define Z_IS_3181_EQ_3181(...) \,
+#define Z_IS_3182_EQ_3182(...) \,
+#define Z_IS_3183_EQ_3183(...) \,
+#define Z_IS_3184_EQ_3184(...) \,
+#define Z_IS_3185_EQ_3185(...) \,
+#define Z_IS_3186_EQ_3186(...) \,
+#define Z_IS_3187_EQ_3187(...) \,
+#define Z_IS_3188_EQ_3188(...) \,
+#define Z_IS_3189_EQ_3189(...) \,
+#define Z_IS_3190_EQ_3190(...) \,
+#define Z_IS_3191_EQ_3191(...) \,
+#define Z_IS_3192_EQ_3192(...) \,
+#define Z_IS_3193_EQ_3193(...) \,
+#define Z_IS_3194_EQ_3194(...) \,
+#define Z_IS_3195_EQ_3195(...) \,
+#define Z_IS_3196_EQ_3196(...) \,
+#define Z_IS_3197_EQ_3197(...) \,
+#define Z_IS_3198_EQ_3198(...) \,
+#define Z_IS_3199_EQ_3199(...) \,
+#define Z_IS_3200_EQ_3200(...) \,
+#define Z_IS_3201_EQ_3201(...) \,
+#define Z_IS_3202_EQ_3202(...) \,
+#define Z_IS_3203_EQ_3203(...) \,
+#define Z_IS_3204_EQ_3204(...) \,
+#define Z_IS_3205_EQ_3205(...) \,
+#define Z_IS_3206_EQ_3206(...) \,
+#define Z_IS_3207_EQ_3207(...) \,
+#define Z_IS_3208_EQ_3208(...) \,
+#define Z_IS_3209_EQ_3209(...) \,
+#define Z_IS_3210_EQ_3210(...) \,
+#define Z_IS_3211_EQ_3211(...) \,
+#define Z_IS_3212_EQ_3212(...) \,
+#define Z_IS_3213_EQ_3213(...) \,
+#define Z_IS_3214_EQ_3214(...) \,
+#define Z_IS_3215_EQ_3215(...) \,
+#define Z_IS_3216_EQ_3216(...) \,
+#define Z_IS_3217_EQ_3217(...) \,
+#define Z_IS_3218_EQ_3218(...) \,
+#define Z_IS_3219_EQ_3219(...) \,
+#define Z_IS_3220_EQ_3220(...) \,
+#define Z_IS_3221_EQ_3221(...) \,
+#define Z_IS_3222_EQ_3222(...) \,
+#define Z_IS_3223_EQ_3223(...) \,
+#define Z_IS_3224_EQ_3224(...) \,
+#define Z_IS_3225_EQ_3225(...) \,
+#define Z_IS_3226_EQ_3226(...) \,
+#define Z_IS_3227_EQ_3227(...) \,
+#define Z_IS_3228_EQ_3228(...) \,
+#define Z_IS_3229_EQ_3229(...) \,
+#define Z_IS_3230_EQ_3230(...) \,
+#define Z_IS_3231_EQ_3231(...) \,
+#define Z_IS_3232_EQ_3232(...) \,
+#define Z_IS_3233_EQ_3233(...) \,
+#define Z_IS_3234_EQ_3234(...) \,
+#define Z_IS_3235_EQ_3235(...) \,
+#define Z_IS_3236_EQ_3236(...) \,
+#define Z_IS_3237_EQ_3237(...) \,
+#define Z_IS_3238_EQ_3238(...) \,
+#define Z_IS_3239_EQ_3239(...) \,
+#define Z_IS_3240_EQ_3240(...) \,
+#define Z_IS_3241_EQ_3241(...) \,
+#define Z_IS_3242_EQ_3242(...) \,
+#define Z_IS_3243_EQ_3243(...) \,
+#define Z_IS_3244_EQ_3244(...) \,
+#define Z_IS_3245_EQ_3245(...) \,
+#define Z_IS_3246_EQ_3246(...) \,
+#define Z_IS_3247_EQ_3247(...) \,
+#define Z_IS_3248_EQ_3248(...) \,
+#define Z_IS_3249_EQ_3249(...) \,
+#define Z_IS_3250_EQ_3250(...) \,
+#define Z_IS_3251_EQ_3251(...) \,
+#define Z_IS_3252_EQ_3252(...) \,
+#define Z_IS_3253_EQ_3253(...) \,
+#define Z_IS_3254_EQ_3254(...) \,
+#define Z_IS_3255_EQ_3255(...) \,
+#define Z_IS_3256_EQ_3256(...) \,
+#define Z_IS_3257_EQ_3257(...) \,
+#define Z_IS_3258_EQ_3258(...) \,
+#define Z_IS_3259_EQ_3259(...) \,
+#define Z_IS_3260_EQ_3260(...) \,
+#define Z_IS_3261_EQ_3261(...) \,
+#define Z_IS_3262_EQ_3262(...) \,
+#define Z_IS_3263_EQ_3263(...) \,
+#define Z_IS_3264_EQ_3264(...) \,
+#define Z_IS_3265_EQ_3265(...) \,
+#define Z_IS_3266_EQ_3266(...) \,
+#define Z_IS_3267_EQ_3267(...) \,
+#define Z_IS_3268_EQ_3268(...) \,
+#define Z_IS_3269_EQ_3269(...) \,
+#define Z_IS_3270_EQ_3270(...) \,
+#define Z_IS_3271_EQ_3271(...) \,
+#define Z_IS_3272_EQ_3272(...) \,
+#define Z_IS_3273_EQ_3273(...) \,
+#define Z_IS_3274_EQ_3274(...) \,
+#define Z_IS_3275_EQ_3275(...) \,
+#define Z_IS_3276_EQ_3276(...) \,
+#define Z_IS_3277_EQ_3277(...) \,
+#define Z_IS_3278_EQ_3278(...) \,
+#define Z_IS_3279_EQ_3279(...) \,
+#define Z_IS_3280_EQ_3280(...) \,
+#define Z_IS_3281_EQ_3281(...) \,
+#define Z_IS_3282_EQ_3282(...) \,
+#define Z_IS_3283_EQ_3283(...) \,
+#define Z_IS_3284_EQ_3284(...) \,
+#define Z_IS_3285_EQ_3285(...) \,
+#define Z_IS_3286_EQ_3286(...) \,
+#define Z_IS_3287_EQ_3287(...) \,
+#define Z_IS_3288_EQ_3288(...) \,
+#define Z_IS_3289_EQ_3289(...) \,
+#define Z_IS_3290_EQ_3290(...) \,
+#define Z_IS_3291_EQ_3291(...) \,
+#define Z_IS_3292_EQ_3292(...) \,
+#define Z_IS_3293_EQ_3293(...) \,
+#define Z_IS_3294_EQ_3294(...) \,
+#define Z_IS_3295_EQ_3295(...) \,
+#define Z_IS_3296_EQ_3296(...) \,
+#define Z_IS_3297_EQ_3297(...) \,
+#define Z_IS_3298_EQ_3298(...) \,
+#define Z_IS_3299_EQ_3299(...) \,
+#define Z_IS_3300_EQ_3300(...) \,
+#define Z_IS_3301_EQ_3301(...) \,
+#define Z_IS_3302_EQ_3302(...) \,
+#define Z_IS_3303_EQ_3303(...) \,
+#define Z_IS_3304_EQ_3304(...) \,
+#define Z_IS_3305_EQ_3305(...) \,
+#define Z_IS_3306_EQ_3306(...) \,
+#define Z_IS_3307_EQ_3307(...) \,
+#define Z_IS_3308_EQ_3308(...) \,
+#define Z_IS_3309_EQ_3309(...) \,
+#define Z_IS_3310_EQ_3310(...) \,
+#define Z_IS_3311_EQ_3311(...) \,
+#define Z_IS_3312_EQ_3312(...) \,
+#define Z_IS_3313_EQ_3313(...) \,
+#define Z_IS_3314_EQ_3314(...) \,
+#define Z_IS_3315_EQ_3315(...) \,
+#define Z_IS_3316_EQ_3316(...) \,
+#define Z_IS_3317_EQ_3317(...) \,
+#define Z_IS_3318_EQ_3318(...) \,
+#define Z_IS_3319_EQ_3319(...) \,
+#define Z_IS_3320_EQ_3320(...) \,
+#define Z_IS_3321_EQ_3321(...) \,
+#define Z_IS_3322_EQ_3322(...) \,
+#define Z_IS_3323_EQ_3323(...) \,
+#define Z_IS_3324_EQ_3324(...) \,
+#define Z_IS_3325_EQ_3325(...) \,
+#define Z_IS_3326_EQ_3326(...) \,
+#define Z_IS_3327_EQ_3327(...) \,
+#define Z_IS_3328_EQ_3328(...) \,
+#define Z_IS_3329_EQ_3329(...) \,
+#define Z_IS_3330_EQ_3330(...) \,
+#define Z_IS_3331_EQ_3331(...) \,
+#define Z_IS_3332_EQ_3332(...) \,
+#define Z_IS_3333_EQ_3333(...) \,
+#define Z_IS_3334_EQ_3334(...) \,
+#define Z_IS_3335_EQ_3335(...) \,
+#define Z_IS_3336_EQ_3336(...) \,
+#define Z_IS_3337_EQ_3337(...) \,
+#define Z_IS_3338_EQ_3338(...) \,
+#define Z_IS_3339_EQ_3339(...) \,
+#define Z_IS_3340_EQ_3340(...) \,
+#define Z_IS_3341_EQ_3341(...) \,
+#define Z_IS_3342_EQ_3342(...) \,
+#define Z_IS_3343_EQ_3343(...) \,
+#define Z_IS_3344_EQ_3344(...) \,
+#define Z_IS_3345_EQ_3345(...) \,
+#define Z_IS_3346_EQ_3346(...) \,
+#define Z_IS_3347_EQ_3347(...) \,
+#define Z_IS_3348_EQ_3348(...) \,
+#define Z_IS_3349_EQ_3349(...) \,
+#define Z_IS_3350_EQ_3350(...) \,
+#define Z_IS_3351_EQ_3351(...) \,
+#define Z_IS_3352_EQ_3352(...) \,
+#define Z_IS_3353_EQ_3353(...) \,
+#define Z_IS_3354_EQ_3354(...) \,
+#define Z_IS_3355_EQ_3355(...) \,
+#define Z_IS_3356_EQ_3356(...) \,
+#define Z_IS_3357_EQ_3357(...) \,
+#define Z_IS_3358_EQ_3358(...) \,
+#define Z_IS_3359_EQ_3359(...) \,
+#define Z_IS_3360_EQ_3360(...) \,
+#define Z_IS_3361_EQ_3361(...) \,
+#define Z_IS_3362_EQ_3362(...) \,
+#define Z_IS_3363_EQ_3363(...) \,
+#define Z_IS_3364_EQ_3364(...) \,
+#define Z_IS_3365_EQ_3365(...) \,
+#define Z_IS_3366_EQ_3366(...) \,
+#define Z_IS_3367_EQ_3367(...) \,
+#define Z_IS_3368_EQ_3368(...) \,
+#define Z_IS_3369_EQ_3369(...) \,
+#define Z_IS_3370_EQ_3370(...) \,
+#define Z_IS_3371_EQ_3371(...) \,
+#define Z_IS_3372_EQ_3372(...) \,
+#define Z_IS_3373_EQ_3373(...) \,
+#define Z_IS_3374_EQ_3374(...) \,
+#define Z_IS_3375_EQ_3375(...) \,
+#define Z_IS_3376_EQ_3376(...) \,
+#define Z_IS_3377_EQ_3377(...) \,
+#define Z_IS_3378_EQ_3378(...) \,
+#define Z_IS_3379_EQ_3379(...) \,
+#define Z_IS_3380_EQ_3380(...) \,
+#define Z_IS_3381_EQ_3381(...) \,
+#define Z_IS_3382_EQ_3382(...) \,
+#define Z_IS_3383_EQ_3383(...) \,
+#define Z_IS_3384_EQ_3384(...) \,
+#define Z_IS_3385_EQ_3385(...) \,
+#define Z_IS_3386_EQ_3386(...) \,
+#define Z_IS_3387_EQ_3387(...) \,
+#define Z_IS_3388_EQ_3388(...) \,
+#define Z_IS_3389_EQ_3389(...) \,
+#define Z_IS_3390_EQ_3390(...) \,
+#define Z_IS_3391_EQ_3391(...) \,
+#define Z_IS_3392_EQ_3392(...) \,
+#define Z_IS_3393_EQ_3393(...) \,
+#define Z_IS_3394_EQ_3394(...) \,
+#define Z_IS_3395_EQ_3395(...) \,
+#define Z_IS_3396_EQ_3396(...) \,
+#define Z_IS_3397_EQ_3397(...) \,
+#define Z_IS_3398_EQ_3398(...) \,
+#define Z_IS_3399_EQ_3399(...) \,
+#define Z_IS_3400_EQ_3400(...) \,
+#define Z_IS_3401_EQ_3401(...) \,
+#define Z_IS_3402_EQ_3402(...) \,
+#define Z_IS_3403_EQ_3403(...) \,
+#define Z_IS_3404_EQ_3404(...) \,
+#define Z_IS_3405_EQ_3405(...) \,
+#define Z_IS_3406_EQ_3406(...) \,
+#define Z_IS_3407_EQ_3407(...) \,
+#define Z_IS_3408_EQ_3408(...) \,
+#define Z_IS_3409_EQ_3409(...) \,
+#define Z_IS_3410_EQ_3410(...) \,
+#define Z_IS_3411_EQ_3411(...) \,
+#define Z_IS_3412_EQ_3412(...) \,
+#define Z_IS_3413_EQ_3413(...) \,
+#define Z_IS_3414_EQ_3414(...) \,
+#define Z_IS_3415_EQ_3415(...) \,
+#define Z_IS_3416_EQ_3416(...) \,
+#define Z_IS_3417_EQ_3417(...) \,
+#define Z_IS_3418_EQ_3418(...) \,
+#define Z_IS_3419_EQ_3419(...) \,
+#define Z_IS_3420_EQ_3420(...) \,
+#define Z_IS_3421_EQ_3421(...) \,
+#define Z_IS_3422_EQ_3422(...) \,
+#define Z_IS_3423_EQ_3423(...) \,
+#define Z_IS_3424_EQ_3424(...) \,
+#define Z_IS_3425_EQ_3425(...) \,
+#define Z_IS_3426_EQ_3426(...) \,
+#define Z_IS_3427_EQ_3427(...) \,
+#define Z_IS_3428_EQ_3428(...) \,
+#define Z_IS_3429_EQ_3429(...) \,
+#define Z_IS_3430_EQ_3430(...) \,
+#define Z_IS_3431_EQ_3431(...) \,
+#define Z_IS_3432_EQ_3432(...) \,
+#define Z_IS_3433_EQ_3433(...) \,
+#define Z_IS_3434_EQ_3434(...) \,
+#define Z_IS_3435_EQ_3435(...) \,
+#define Z_IS_3436_EQ_3436(...) \,
+#define Z_IS_3437_EQ_3437(...) \,
+#define Z_IS_3438_EQ_3438(...) \,
+#define Z_IS_3439_EQ_3439(...) \,
+#define Z_IS_3440_EQ_3440(...) \,
+#define Z_IS_3441_EQ_3441(...) \,
+#define Z_IS_3442_EQ_3442(...) \,
+#define Z_IS_3443_EQ_3443(...) \,
+#define Z_IS_3444_EQ_3444(...) \,
+#define Z_IS_3445_EQ_3445(...) \,
+#define Z_IS_3446_EQ_3446(...) \,
+#define Z_IS_3447_EQ_3447(...) \,
+#define Z_IS_3448_EQ_3448(...) \,
+#define Z_IS_3449_EQ_3449(...) \,
+#define Z_IS_3450_EQ_3450(...) \,
+#define Z_IS_3451_EQ_3451(...) \,
+#define Z_IS_3452_EQ_3452(...) \,
+#define Z_IS_3453_EQ_3453(...) \,
+#define Z_IS_3454_EQ_3454(...) \,
+#define Z_IS_3455_EQ_3455(...) \,
+#define Z_IS_3456_EQ_3456(...) \,
+#define Z_IS_3457_EQ_3457(...) \,
+#define Z_IS_3458_EQ_3458(...) \,
+#define Z_IS_3459_EQ_3459(...) \,
+#define Z_IS_3460_EQ_3460(...) \,
+#define Z_IS_3461_EQ_3461(...) \,
+#define Z_IS_3462_EQ_3462(...) \,
+#define Z_IS_3463_EQ_3463(...) \,
+#define Z_IS_3464_EQ_3464(...) \,
+#define Z_IS_3465_EQ_3465(...) \,
+#define Z_IS_3466_EQ_3466(...) \,
+#define Z_IS_3467_EQ_3467(...) \,
+#define Z_IS_3468_EQ_3468(...) \,
+#define Z_IS_3469_EQ_3469(...) \,
+#define Z_IS_3470_EQ_3470(...) \,
+#define Z_IS_3471_EQ_3471(...) \,
+#define Z_IS_3472_EQ_3472(...) \,
+#define Z_IS_3473_EQ_3473(...) \,
+#define Z_IS_3474_EQ_3474(...) \,
+#define Z_IS_3475_EQ_3475(...) \,
+#define Z_IS_3476_EQ_3476(...) \,
+#define Z_IS_3477_EQ_3477(...) \,
+#define Z_IS_3478_EQ_3478(...) \,
+#define Z_IS_3479_EQ_3479(...) \,
+#define Z_IS_3480_EQ_3480(...) \,
+#define Z_IS_3481_EQ_3481(...) \,
+#define Z_IS_3482_EQ_3482(...) \,
+#define Z_IS_3483_EQ_3483(...) \,
+#define Z_IS_3484_EQ_3484(...) \,
+#define Z_IS_3485_EQ_3485(...) \,
+#define Z_IS_3486_EQ_3486(...) \,
+#define Z_IS_3487_EQ_3487(...) \,
+#define Z_IS_3488_EQ_3488(...) \,
+#define Z_IS_3489_EQ_3489(...) \,
+#define Z_IS_3490_EQ_3490(...) \,
+#define Z_IS_3491_EQ_3491(...) \,
+#define Z_IS_3492_EQ_3492(...) \,
+#define Z_IS_3493_EQ_3493(...) \,
+#define Z_IS_3494_EQ_3494(...) \,
+#define Z_IS_3495_EQ_3495(...) \,
+#define Z_IS_3496_EQ_3496(...) \,
+#define Z_IS_3497_EQ_3497(...) \,
+#define Z_IS_3498_EQ_3498(...) \,
+#define Z_IS_3499_EQ_3499(...) \,
+#define Z_IS_3500_EQ_3500(...) \,
+#define Z_IS_3501_EQ_3501(...) \,
+#define Z_IS_3502_EQ_3502(...) \,
+#define Z_IS_3503_EQ_3503(...) \,
+#define Z_IS_3504_EQ_3504(...) \,
+#define Z_IS_3505_EQ_3505(...) \,
+#define Z_IS_3506_EQ_3506(...) \,
+#define Z_IS_3507_EQ_3507(...) \,
+#define Z_IS_3508_EQ_3508(...) \,
+#define Z_IS_3509_EQ_3509(...) \,
+#define Z_IS_3510_EQ_3510(...) \,
+#define Z_IS_3511_EQ_3511(...) \,
+#define Z_IS_3512_EQ_3512(...) \,
+#define Z_IS_3513_EQ_3513(...) \,
+#define Z_IS_3514_EQ_3514(...) \,
+#define Z_IS_3515_EQ_3515(...) \,
+#define Z_IS_3516_EQ_3516(...) \,
+#define Z_IS_3517_EQ_3517(...) \,
+#define Z_IS_3518_EQ_3518(...) \,
+#define Z_IS_3519_EQ_3519(...) \,
+#define Z_IS_3520_EQ_3520(...) \,
+#define Z_IS_3521_EQ_3521(...) \,
+#define Z_IS_3522_EQ_3522(...) \,
+#define Z_IS_3523_EQ_3523(...) \,
+#define Z_IS_3524_EQ_3524(...) \,
+#define Z_IS_3525_EQ_3525(...) \,
+#define Z_IS_3526_EQ_3526(...) \,
+#define Z_IS_3527_EQ_3527(...) \,
+#define Z_IS_3528_EQ_3528(...) \,
+#define Z_IS_3529_EQ_3529(...) \,
+#define Z_IS_3530_EQ_3530(...) \,
+#define Z_IS_3531_EQ_3531(...) \,
+#define Z_IS_3532_EQ_3532(...) \,
+#define Z_IS_3533_EQ_3533(...) \,
+#define Z_IS_3534_EQ_3534(...) \,
+#define Z_IS_3535_EQ_3535(...) \,
+#define Z_IS_3536_EQ_3536(...) \,
+#define Z_IS_3537_EQ_3537(...) \,
+#define Z_IS_3538_EQ_3538(...) \,
+#define Z_IS_3539_EQ_3539(...) \,
+#define Z_IS_3540_EQ_3540(...) \,
+#define Z_IS_3541_EQ_3541(...) \,
+#define Z_IS_3542_EQ_3542(...) \,
+#define Z_IS_3543_EQ_3543(...) \,
+#define Z_IS_3544_EQ_3544(...) \,
+#define Z_IS_3545_EQ_3545(...) \,
+#define Z_IS_3546_EQ_3546(...) \,
+#define Z_IS_3547_EQ_3547(...) \,
+#define Z_IS_3548_EQ_3548(...) \,
+#define Z_IS_3549_EQ_3549(...) \,
+#define Z_IS_3550_EQ_3550(...) \,
+#define Z_IS_3551_EQ_3551(...) \,
+#define Z_IS_3552_EQ_3552(...) \,
+#define Z_IS_3553_EQ_3553(...) \,
+#define Z_IS_3554_EQ_3554(...) \,
+#define Z_IS_3555_EQ_3555(...) \,
+#define Z_IS_3556_EQ_3556(...) \,
+#define Z_IS_3557_EQ_3557(...) \,
+#define Z_IS_3558_EQ_3558(...) \,
+#define Z_IS_3559_EQ_3559(...) \,
+#define Z_IS_3560_EQ_3560(...) \,
+#define Z_IS_3561_EQ_3561(...) \,
+#define Z_IS_3562_EQ_3562(...) \,
+#define Z_IS_3563_EQ_3563(...) \,
+#define Z_IS_3564_EQ_3564(...) \,
+#define Z_IS_3565_EQ_3565(...) \,
+#define Z_IS_3566_EQ_3566(...) \,
+#define Z_IS_3567_EQ_3567(...) \,
+#define Z_IS_3568_EQ_3568(...) \,
+#define Z_IS_3569_EQ_3569(...) \,
+#define Z_IS_3570_EQ_3570(...) \,
+#define Z_IS_3571_EQ_3571(...) \,
+#define Z_IS_3572_EQ_3572(...) \,
+#define Z_IS_3573_EQ_3573(...) \,
+#define Z_IS_3574_EQ_3574(...) \,
+#define Z_IS_3575_EQ_3575(...) \,
+#define Z_IS_3576_EQ_3576(...) \,
+#define Z_IS_3577_EQ_3577(...) \,
+#define Z_IS_3578_EQ_3578(...) \,
+#define Z_IS_3579_EQ_3579(...) \,
+#define Z_IS_3580_EQ_3580(...) \,
+#define Z_IS_3581_EQ_3581(...) \,
+#define Z_IS_3582_EQ_3582(...) \,
+#define Z_IS_3583_EQ_3583(...) \,
+#define Z_IS_3584_EQ_3584(...) \,
+#define Z_IS_3585_EQ_3585(...) \,
+#define Z_IS_3586_EQ_3586(...) \,
+#define Z_IS_3587_EQ_3587(...) \,
+#define Z_IS_3588_EQ_3588(...) \,
+#define Z_IS_3589_EQ_3589(...) \,
+#define Z_IS_3590_EQ_3590(...) \,
+#define Z_IS_3591_EQ_3591(...) \,
+#define Z_IS_3592_EQ_3592(...) \,
+#define Z_IS_3593_EQ_3593(...) \,
+#define Z_IS_3594_EQ_3594(...) \,
+#define Z_IS_3595_EQ_3595(...) \,
+#define Z_IS_3596_EQ_3596(...) \,
+#define Z_IS_3597_EQ_3597(...) \,
+#define Z_IS_3598_EQ_3598(...) \,
+#define Z_IS_3599_EQ_3599(...) \,
+#define Z_IS_3600_EQ_3600(...) \,
+#define Z_IS_3601_EQ_3601(...) \,
+#define Z_IS_3602_EQ_3602(...) \,
+#define Z_IS_3603_EQ_3603(...) \,
+#define Z_IS_3604_EQ_3604(...) \,
+#define Z_IS_3605_EQ_3605(...) \,
+#define Z_IS_3606_EQ_3606(...) \,
+#define Z_IS_3607_EQ_3607(...) \,
+#define Z_IS_3608_EQ_3608(...) \,
+#define Z_IS_3609_EQ_3609(...) \,
+#define Z_IS_3610_EQ_3610(...) \,
+#define Z_IS_3611_EQ_3611(...) \,
+#define Z_IS_3612_EQ_3612(...) \,
+#define Z_IS_3613_EQ_3613(...) \,
+#define Z_IS_3614_EQ_3614(...) \,
+#define Z_IS_3615_EQ_3615(...) \,
+#define Z_IS_3616_EQ_3616(...) \,
+#define Z_IS_3617_EQ_3617(...) \,
+#define Z_IS_3618_EQ_3618(...) \,
+#define Z_IS_3619_EQ_3619(...) \,
+#define Z_IS_3620_EQ_3620(...) \,
+#define Z_IS_3621_EQ_3621(...) \,
+#define Z_IS_3622_EQ_3622(...) \,
+#define Z_IS_3623_EQ_3623(...) \,
+#define Z_IS_3624_EQ_3624(...) \,
+#define Z_IS_3625_EQ_3625(...) \,
+#define Z_IS_3626_EQ_3626(...) \,
+#define Z_IS_3627_EQ_3627(...) \,
+#define Z_IS_3628_EQ_3628(...) \,
+#define Z_IS_3629_EQ_3629(...) \,
+#define Z_IS_3630_EQ_3630(...) \,
+#define Z_IS_3631_EQ_3631(...) \,
+#define Z_IS_3632_EQ_3632(...) \,
+#define Z_IS_3633_EQ_3633(...) \,
+#define Z_IS_3634_EQ_3634(...) \,
+#define Z_IS_3635_EQ_3635(...) \,
+#define Z_IS_3636_EQ_3636(...) \,
+#define Z_IS_3637_EQ_3637(...) \,
+#define Z_IS_3638_EQ_3638(...) \,
+#define Z_IS_3639_EQ_3639(...) \,
+#define Z_IS_3640_EQ_3640(...) \,
+#define Z_IS_3641_EQ_3641(...) \,
+#define Z_IS_3642_EQ_3642(...) \,
+#define Z_IS_3643_EQ_3643(...) \,
+#define Z_IS_3644_EQ_3644(...) \,
+#define Z_IS_3645_EQ_3645(...) \,
+#define Z_IS_3646_EQ_3646(...) \,
+#define Z_IS_3647_EQ_3647(...) \,
+#define Z_IS_3648_EQ_3648(...) \,
+#define Z_IS_3649_EQ_3649(...) \,
+#define Z_IS_3650_EQ_3650(...) \,
+#define Z_IS_3651_EQ_3651(...) \,
+#define Z_IS_3652_EQ_3652(...) \,
+#define Z_IS_3653_EQ_3653(...) \,
+#define Z_IS_3654_EQ_3654(...) \,
+#define Z_IS_3655_EQ_3655(...) \,
+#define Z_IS_3656_EQ_3656(...) \,
+#define Z_IS_3657_EQ_3657(...) \,
+#define Z_IS_3658_EQ_3658(...) \,
+#define Z_IS_3659_EQ_3659(...) \,
+#define Z_IS_3660_EQ_3660(...) \,
+#define Z_IS_3661_EQ_3661(...) \,
+#define Z_IS_3662_EQ_3662(...) \,
+#define Z_IS_3663_EQ_3663(...) \,
+#define Z_IS_3664_EQ_3664(...) \,
+#define Z_IS_3665_EQ_3665(...) \,
+#define Z_IS_3666_EQ_3666(...) \,
+#define Z_IS_3667_EQ_3667(...) \,
+#define Z_IS_3668_EQ_3668(...) \,
+#define Z_IS_3669_EQ_3669(...) \,
+#define Z_IS_3670_EQ_3670(...) \,
+#define Z_IS_3671_EQ_3671(...) \,
+#define Z_IS_3672_EQ_3672(...) \,
+#define Z_IS_3673_EQ_3673(...) \,
+#define Z_IS_3674_EQ_3674(...) \,
+#define Z_IS_3675_EQ_3675(...) \,
+#define Z_IS_3676_EQ_3676(...) \,
+#define Z_IS_3677_EQ_3677(...) \,
+#define Z_IS_3678_EQ_3678(...) \,
+#define Z_IS_3679_EQ_3679(...) \,
+#define Z_IS_3680_EQ_3680(...) \,
+#define Z_IS_3681_EQ_3681(...) \,
+#define Z_IS_3682_EQ_3682(...) \,
+#define Z_IS_3683_EQ_3683(...) \,
+#define Z_IS_3684_EQ_3684(...) \,
+#define Z_IS_3685_EQ_3685(...) \,
+#define Z_IS_3686_EQ_3686(...) \,
+#define Z_IS_3687_EQ_3687(...) \,
+#define Z_IS_3688_EQ_3688(...) \,
+#define Z_IS_3689_EQ_3689(...) \,
+#define Z_IS_3690_EQ_3690(...) \,
+#define Z_IS_3691_EQ_3691(...) \,
+#define Z_IS_3692_EQ_3692(...) \,
+#define Z_IS_3693_EQ_3693(...) \,
+#define Z_IS_3694_EQ_3694(...) \,
+#define Z_IS_3695_EQ_3695(...) \,
+#define Z_IS_3696_EQ_3696(...) \,
+#define Z_IS_3697_EQ_3697(...) \,
+#define Z_IS_3698_EQ_3698(...) \,
+#define Z_IS_3699_EQ_3699(...) \,
+#define Z_IS_3700_EQ_3700(...) \,
+#define Z_IS_3701_EQ_3701(...) \,
+#define Z_IS_3702_EQ_3702(...) \,
+#define Z_IS_3703_EQ_3703(...) \,
+#define Z_IS_3704_EQ_3704(...) \,
+#define Z_IS_3705_EQ_3705(...) \,
+#define Z_IS_3706_EQ_3706(...) \,
+#define Z_IS_3707_EQ_3707(...) \,
+#define Z_IS_3708_EQ_3708(...) \,
+#define Z_IS_3709_EQ_3709(...) \,
+#define Z_IS_3710_EQ_3710(...) \,
+#define Z_IS_3711_EQ_3711(...) \,
+#define Z_IS_3712_EQ_3712(...) \,
+#define Z_IS_3713_EQ_3713(...) \,
+#define Z_IS_3714_EQ_3714(...) \,
+#define Z_IS_3715_EQ_3715(...) \,
+#define Z_IS_3716_EQ_3716(...) \,
+#define Z_IS_3717_EQ_3717(...) \,
+#define Z_IS_3718_EQ_3718(...) \,
+#define Z_IS_3719_EQ_3719(...) \,
+#define Z_IS_3720_EQ_3720(...) \,
+#define Z_IS_3721_EQ_3721(...) \,
+#define Z_IS_3722_EQ_3722(...) \,
+#define Z_IS_3723_EQ_3723(...) \,
+#define Z_IS_3724_EQ_3724(...) \,
+#define Z_IS_3725_EQ_3725(...) \,
+#define Z_IS_3726_EQ_3726(...) \,
+#define Z_IS_3727_EQ_3727(...) \,
+#define Z_IS_3728_EQ_3728(...) \,
+#define Z_IS_3729_EQ_3729(...) \,
+#define Z_IS_3730_EQ_3730(...) \,
+#define Z_IS_3731_EQ_3731(...) \,
+#define Z_IS_3732_EQ_3732(...) \,
+#define Z_IS_3733_EQ_3733(...) \,
+#define Z_IS_3734_EQ_3734(...) \,
+#define Z_IS_3735_EQ_3735(...) \,
+#define Z_IS_3736_EQ_3736(...) \,
+#define Z_IS_3737_EQ_3737(...) \,
+#define Z_IS_3738_EQ_3738(...) \,
+#define Z_IS_3739_EQ_3739(...) \,
+#define Z_IS_3740_EQ_3740(...) \,
+#define Z_IS_3741_EQ_3741(...) \,
+#define Z_IS_3742_EQ_3742(...) \,
+#define Z_IS_3743_EQ_3743(...) \,
+#define Z_IS_3744_EQ_3744(...) \,
+#define Z_IS_3745_EQ_3745(...) \,
+#define Z_IS_3746_EQ_3746(...) \,
+#define Z_IS_3747_EQ_3747(...) \,
+#define Z_IS_3748_EQ_3748(...) \,
+#define Z_IS_3749_EQ_3749(...) \,
+#define Z_IS_3750_EQ_3750(...) \,
+#define Z_IS_3751_EQ_3751(...) \,
+#define Z_IS_3752_EQ_3752(...) \,
+#define Z_IS_3753_EQ_3753(...) \,
+#define Z_IS_3754_EQ_3754(...) \,
+#define Z_IS_3755_EQ_3755(...) \,
+#define Z_IS_3756_EQ_3756(...) \,
+#define Z_IS_3757_EQ_3757(...) \,
+#define Z_IS_3758_EQ_3758(...) \,
+#define Z_IS_3759_EQ_3759(...) \,
+#define Z_IS_3760_EQ_3760(...) \,
+#define Z_IS_3761_EQ_3761(...) \,
+#define Z_IS_3762_EQ_3762(...) \,
+#define Z_IS_3763_EQ_3763(...) \,
+#define Z_IS_3764_EQ_3764(...) \,
+#define Z_IS_3765_EQ_3765(...) \,
+#define Z_IS_3766_EQ_3766(...) \,
+#define Z_IS_3767_EQ_3767(...) \,
+#define Z_IS_3768_EQ_3768(...) \,
+#define Z_IS_3769_EQ_3769(...) \,
+#define Z_IS_3770_EQ_3770(...) \,
+#define Z_IS_3771_EQ_3771(...) \,
+#define Z_IS_3772_EQ_3772(...) \,
+#define Z_IS_3773_EQ_3773(...) \,
+#define Z_IS_3774_EQ_3774(...) \,
+#define Z_IS_3775_EQ_3775(...) \,
+#define Z_IS_3776_EQ_3776(...) \,
+#define Z_IS_3777_EQ_3777(...) \,
+#define Z_IS_3778_EQ_3778(...) \,
+#define Z_IS_3779_EQ_3779(...) \,
+#define Z_IS_3780_EQ_3780(...) \,
+#define Z_IS_3781_EQ_3781(...) \,
+#define Z_IS_3782_EQ_3782(...) \,
+#define Z_IS_3783_EQ_3783(...) \,
+#define Z_IS_3784_EQ_3784(...) \,
+#define Z_IS_3785_EQ_3785(...) \,
+#define Z_IS_3786_EQ_3786(...) \,
+#define Z_IS_3787_EQ_3787(...) \,
+#define Z_IS_3788_EQ_3788(...) \,
+#define Z_IS_3789_EQ_3789(...) \,
+#define Z_IS_3790_EQ_3790(...) \,
+#define Z_IS_3791_EQ_3791(...) \,
+#define Z_IS_3792_EQ_3792(...) \,
+#define Z_IS_3793_EQ_3793(...) \,
+#define Z_IS_3794_EQ_3794(...) \,
+#define Z_IS_3795_EQ_3795(...) \,
+#define Z_IS_3796_EQ_3796(...) \,
+#define Z_IS_3797_EQ_3797(...) \,
+#define Z_IS_3798_EQ_3798(...) \,
+#define Z_IS_3799_EQ_3799(...) \,
+#define Z_IS_3800_EQ_3800(...) \,
+#define Z_IS_3801_EQ_3801(...) \,
+#define Z_IS_3802_EQ_3802(...) \,
+#define Z_IS_3803_EQ_3803(...) \,
+#define Z_IS_3804_EQ_3804(...) \,
+#define Z_IS_3805_EQ_3805(...) \,
+#define Z_IS_3806_EQ_3806(...) \,
+#define Z_IS_3807_EQ_3807(...) \,
+#define Z_IS_3808_EQ_3808(...) \,
+#define Z_IS_3809_EQ_3809(...) \,
+#define Z_IS_3810_EQ_3810(...) \,
+#define Z_IS_3811_EQ_3811(...) \,
+#define Z_IS_3812_EQ_3812(...) \,
+#define Z_IS_3813_EQ_3813(...) \,
+#define Z_IS_3814_EQ_3814(...) \,
+#define Z_IS_3815_EQ_3815(...) \,
+#define Z_IS_3816_EQ_3816(...) \,
+#define Z_IS_3817_EQ_3817(...) \,
+#define Z_IS_3818_EQ_3818(...) \,
+#define Z_IS_3819_EQ_3819(...) \,
+#define Z_IS_3820_EQ_3820(...) \,
+#define Z_IS_3821_EQ_3821(...) \,
+#define Z_IS_3822_EQ_3822(...) \,
+#define Z_IS_3823_EQ_3823(...) \,
+#define Z_IS_3824_EQ_3824(...) \,
+#define Z_IS_3825_EQ_3825(...) \,
+#define Z_IS_3826_EQ_3826(...) \,
+#define Z_IS_3827_EQ_3827(...) \,
+#define Z_IS_3828_EQ_3828(...) \,
+#define Z_IS_3829_EQ_3829(...) \,
+#define Z_IS_3830_EQ_3830(...) \,
+#define Z_IS_3831_EQ_3831(...) \,
+#define Z_IS_3832_EQ_3832(...) \,
+#define Z_IS_3833_EQ_3833(...) \,
+#define Z_IS_3834_EQ_3834(...) \,
+#define Z_IS_3835_EQ_3835(...) \,
+#define Z_IS_3836_EQ_3836(...) \,
+#define Z_IS_3837_EQ_3837(...) \,
+#define Z_IS_3838_EQ_3838(...) \,
+#define Z_IS_3839_EQ_3839(...) \,
+#define Z_IS_3840_EQ_3840(...) \,
+#define Z_IS_3841_EQ_3841(...) \,
+#define Z_IS_3842_EQ_3842(...) \,
+#define Z_IS_3843_EQ_3843(...) \,
+#define Z_IS_3844_EQ_3844(...) \,
+#define Z_IS_3845_EQ_3845(...) \,
+#define Z_IS_3846_EQ_3846(...) \,
+#define Z_IS_3847_EQ_3847(...) \,
+#define Z_IS_3848_EQ_3848(...) \,
+#define Z_IS_3849_EQ_3849(...) \,
+#define Z_IS_3850_EQ_3850(...) \,
+#define Z_IS_3851_EQ_3851(...) \,
+#define Z_IS_3852_EQ_3852(...) \,
+#define Z_IS_3853_EQ_3853(...) \,
+#define Z_IS_3854_EQ_3854(...) \,
+#define Z_IS_3855_EQ_3855(...) \,
+#define Z_IS_3856_EQ_3856(...) \,
+#define Z_IS_3857_EQ_3857(...) \,
+#define Z_IS_3858_EQ_3858(...) \,
+#define Z_IS_3859_EQ_3859(...) \,
+#define Z_IS_3860_EQ_3860(...) \,
+#define Z_IS_3861_EQ_3861(...) \,
+#define Z_IS_3862_EQ_3862(...) \,
+#define Z_IS_3863_EQ_3863(...) \,
+#define Z_IS_3864_EQ_3864(...) \,
+#define Z_IS_3865_EQ_3865(...) \,
+#define Z_IS_3866_EQ_3866(...) \,
+#define Z_IS_3867_EQ_3867(...) \,
+#define Z_IS_3868_EQ_3868(...) \,
+#define Z_IS_3869_EQ_3869(...) \,
+#define Z_IS_3870_EQ_3870(...) \,
+#define Z_IS_3871_EQ_3871(...) \,
+#define Z_IS_3872_EQ_3872(...) \,
+#define Z_IS_3873_EQ_3873(...) \,
+#define Z_IS_3874_EQ_3874(...) \,
+#define Z_IS_3875_EQ_3875(...) \,
+#define Z_IS_3876_EQ_3876(...) \,
+#define Z_IS_3877_EQ_3877(...) \,
+#define Z_IS_3878_EQ_3878(...) \,
+#define Z_IS_3879_EQ_3879(...) \,
+#define Z_IS_3880_EQ_3880(...) \,
+#define Z_IS_3881_EQ_3881(...) \,
+#define Z_IS_3882_EQ_3882(...) \,
+#define Z_IS_3883_EQ_3883(...) \,
+#define Z_IS_3884_EQ_3884(...) \,
+#define Z_IS_3885_EQ_3885(...) \,
+#define Z_IS_3886_EQ_3886(...) \,
+#define Z_IS_3887_EQ_3887(...) \,
+#define Z_IS_3888_EQ_3888(...) \,
+#define Z_IS_3889_EQ_3889(...) \,
+#define Z_IS_3890_EQ_3890(...) \,
+#define Z_IS_3891_EQ_3891(...) \,
+#define Z_IS_3892_EQ_3892(...) \,
+#define Z_IS_3893_EQ_3893(...) \,
+#define Z_IS_3894_EQ_3894(...) \,
+#define Z_IS_3895_EQ_3895(...) \,
+#define Z_IS_3896_EQ_3896(...) \,
+#define Z_IS_3897_EQ_3897(...) \,
+#define Z_IS_3898_EQ_3898(...) \,
+#define Z_IS_3899_EQ_3899(...) \,
+#define Z_IS_3900_EQ_3900(...) \,
+#define Z_IS_3901_EQ_3901(...) \,
+#define Z_IS_3902_EQ_3902(...) \,
+#define Z_IS_3903_EQ_3903(...) \,
+#define Z_IS_3904_EQ_3904(...) \,
+#define Z_IS_3905_EQ_3905(...) \,
+#define Z_IS_3906_EQ_3906(...) \,
+#define Z_IS_3907_EQ_3907(...) \,
+#define Z_IS_3908_EQ_3908(...) \,
+#define Z_IS_3909_EQ_3909(...) \,
+#define Z_IS_3910_EQ_3910(...) \,
+#define Z_IS_3911_EQ_3911(...) \,
+#define Z_IS_3912_EQ_3912(...) \,
+#define Z_IS_3913_EQ_3913(...) \,
+#define Z_IS_3914_EQ_3914(...) \,
+#define Z_IS_3915_EQ_3915(...) \,
+#define Z_IS_3916_EQ_3916(...) \,
+#define Z_IS_3917_EQ_3917(...) \,
+#define Z_IS_3918_EQ_3918(...) \,
+#define Z_IS_3919_EQ_3919(...) \,
+#define Z_IS_3920_EQ_3920(...) \,
+#define Z_IS_3921_EQ_3921(...) \,
+#define Z_IS_3922_EQ_3922(...) \,
+#define Z_IS_3923_EQ_3923(...) \,
+#define Z_IS_3924_EQ_3924(...) \,
+#define Z_IS_3925_EQ_3925(...) \,
+#define Z_IS_3926_EQ_3926(...) \,
+#define Z_IS_3927_EQ_3927(...) \,
+#define Z_IS_3928_EQ_3928(...) \,
+#define Z_IS_3929_EQ_3929(...) \,
+#define Z_IS_3930_EQ_3930(...) \,
+#define Z_IS_3931_EQ_3931(...) \,
+#define Z_IS_3932_EQ_3932(...) \,
+#define Z_IS_3933_EQ_3933(...) \,
+#define Z_IS_3934_EQ_3934(...) \,
+#define Z_IS_3935_EQ_3935(...) \,
+#define Z_IS_3936_EQ_3936(...) \,
+#define Z_IS_3937_EQ_3937(...) \,
+#define Z_IS_3938_EQ_3938(...) \,
+#define Z_IS_3939_EQ_3939(...) \,
+#define Z_IS_3940_EQ_3940(...) \,
+#define Z_IS_3941_EQ_3941(...) \,
+#define Z_IS_3942_EQ_3942(...) \,
+#define Z_IS_3943_EQ_3943(...) \,
+#define Z_IS_3944_EQ_3944(...) \,
+#define Z_IS_3945_EQ_3945(...) \,
+#define Z_IS_3946_EQ_3946(...) \,
+#define Z_IS_3947_EQ_3947(...) \,
+#define Z_IS_3948_EQ_3948(...) \,
+#define Z_IS_3949_EQ_3949(...) \,
+#define Z_IS_3950_EQ_3950(...) \,
+#define Z_IS_3951_EQ_3951(...) \,
+#define Z_IS_3952_EQ_3952(...) \,
+#define Z_IS_3953_EQ_3953(...) \,
+#define Z_IS_3954_EQ_3954(...) \,
+#define Z_IS_3955_EQ_3955(...) \,
+#define Z_IS_3956_EQ_3956(...) \,
+#define Z_IS_3957_EQ_3957(...) \,
+#define Z_IS_3958_EQ_3958(...) \,
+#define Z_IS_3959_EQ_3959(...) \,
+#define Z_IS_3960_EQ_3960(...) \,
+#define Z_IS_3961_EQ_3961(...) \,
+#define Z_IS_3962_EQ_3962(...) \,
+#define Z_IS_3963_EQ_3963(...) \,
+#define Z_IS_3964_EQ_3964(...) \,
+#define Z_IS_3965_EQ_3965(...) \,
+#define Z_IS_3966_EQ_3966(...) \,
+#define Z_IS_3967_EQ_3967(...) \,
+#define Z_IS_3968_EQ_3968(...) \,
+#define Z_IS_3969_EQ_3969(...) \,
+#define Z_IS_3970_EQ_3970(...) \,
+#define Z_IS_3971_EQ_3971(...) \,
+#define Z_IS_3972_EQ_3972(...) \,
+#define Z_IS_3973_EQ_3973(...) \,
+#define Z_IS_3974_EQ_3974(...) \,
+#define Z_IS_3975_EQ_3975(...) \,
+#define Z_IS_3976_EQ_3976(...) \,
+#define Z_IS_3977_EQ_3977(...) \,
+#define Z_IS_3978_EQ_3978(...) \,
+#define Z_IS_3979_EQ_3979(...) \,
+#define Z_IS_3980_EQ_3980(...) \,
+#define Z_IS_3981_EQ_3981(...) \,
+#define Z_IS_3982_EQ_3982(...) \,
+#define Z_IS_3983_EQ_3983(...) \,
+#define Z_IS_3984_EQ_3984(...) \,
+#define Z_IS_3985_EQ_3985(...) \,
+#define Z_IS_3986_EQ_3986(...) \,
+#define Z_IS_3987_EQ_3987(...) \,
+#define Z_IS_3988_EQ_3988(...) \,
+#define Z_IS_3989_EQ_3989(...) \,
+#define Z_IS_3990_EQ_3990(...) \,
+#define Z_IS_3991_EQ_3991(...) \,
+#define Z_IS_3992_EQ_3992(...) \,
+#define Z_IS_3993_EQ_3993(...) \,
+#define Z_IS_3994_EQ_3994(...) \,
+#define Z_IS_3995_EQ_3995(...) \,
+#define Z_IS_3996_EQ_3996(...) \,
+#define Z_IS_3997_EQ_3997(...) \,
+#define Z_IS_3998_EQ_3998(...) \,
+#define Z_IS_3999_EQ_3999(...) \,
+#define Z_IS_4000_EQ_4000(...) \,
+#define Z_IS_4001_EQ_4001(...) \,
+#define Z_IS_4002_EQ_4002(...) \,
+#define Z_IS_4003_EQ_4003(...) \,
+#define Z_IS_4004_EQ_4004(...) \,
+#define Z_IS_4005_EQ_4005(...) \,
+#define Z_IS_4006_EQ_4006(...) \,
+#define Z_IS_4007_EQ_4007(...) \,
+#define Z_IS_4008_EQ_4008(...) \,
+#define Z_IS_4009_EQ_4009(...) \,
+#define Z_IS_4010_EQ_4010(...) \,
+#define Z_IS_4011_EQ_4011(...) \,
+#define Z_IS_4012_EQ_4012(...) \,
+#define Z_IS_4013_EQ_4013(...) \,
+#define Z_IS_4014_EQ_4014(...) \,
+#define Z_IS_4015_EQ_4015(...) \,
+#define Z_IS_4016_EQ_4016(...) \,
+#define Z_IS_4017_EQ_4017(...) \,
+#define Z_IS_4018_EQ_4018(...) \,
+#define Z_IS_4019_EQ_4019(...) \,
+#define Z_IS_4020_EQ_4020(...) \,
+#define Z_IS_4021_EQ_4021(...) \,
+#define Z_IS_4022_EQ_4022(...) \,
+#define Z_IS_4023_EQ_4023(...) \,
+#define Z_IS_4024_EQ_4024(...) \,
+#define Z_IS_4025_EQ_4025(...) \,
+#define Z_IS_4026_EQ_4026(...) \,
+#define Z_IS_4027_EQ_4027(...) \,
+#define Z_IS_4028_EQ_4028(...) \,
+#define Z_IS_4029_EQ_4029(...) \,
+#define Z_IS_4030_EQ_4030(...) \,
+#define Z_IS_4031_EQ_4031(...) \,
+#define Z_IS_4032_EQ_4032(...) \,
+#define Z_IS_4033_EQ_4033(...) \,
+#define Z_IS_4034_EQ_4034(...) \,
+#define Z_IS_4035_EQ_4035(...) \,
+#define Z_IS_4036_EQ_4036(...) \,
+#define Z_IS_4037_EQ_4037(...) \,
+#define Z_IS_4038_EQ_4038(...) \,
+#define Z_IS_4039_EQ_4039(...) \,
+#define Z_IS_4040_EQ_4040(...) \,
+#define Z_IS_4041_EQ_4041(...) \,
+#define Z_IS_4042_EQ_4042(...) \,
+#define Z_IS_4043_EQ_4043(...) \,
+#define Z_IS_4044_EQ_4044(...) \,
+#define Z_IS_4045_EQ_4045(...) \,
+#define Z_IS_4046_EQ_4046(...) \,
+#define Z_IS_4047_EQ_4047(...) \,
+#define Z_IS_4048_EQ_4048(...) \,
+#define Z_IS_4049_EQ_4049(...) \,
+#define Z_IS_4050_EQ_4050(...) \,
+#define Z_IS_4051_EQ_4051(...) \,
+#define Z_IS_4052_EQ_4052(...) \,
+#define Z_IS_4053_EQ_4053(...) \,
+#define Z_IS_4054_EQ_4054(...) \,
+#define Z_IS_4055_EQ_4055(...) \,
+#define Z_IS_4056_EQ_4056(...) \,
+#define Z_IS_4057_EQ_4057(...) \,
+#define Z_IS_4058_EQ_4058(...) \,
+#define Z_IS_4059_EQ_4059(...) \,
+#define Z_IS_4060_EQ_4060(...) \,
+#define Z_IS_4061_EQ_4061(...) \,
+#define Z_IS_4062_EQ_4062(...) \,
+#define Z_IS_4063_EQ_4063(...) \,
+#define Z_IS_4064_EQ_4064(...) \,
+#define Z_IS_4065_EQ_4065(...) \,
+#define Z_IS_4066_EQ_4066(...) \,
+#define Z_IS_4067_EQ_4067(...) \,
+#define Z_IS_4068_EQ_4068(...) \,
+#define Z_IS_4069_EQ_4069(...) \,
+#define Z_IS_4070_EQ_4070(...) \,
+#define Z_IS_4071_EQ_4071(...) \,
+#define Z_IS_4072_EQ_4072(...) \,
+#define Z_IS_4073_EQ_4073(...) \,
+#define Z_IS_4074_EQ_4074(...) \,
+#define Z_IS_4075_EQ_4075(...) \,
+#define Z_IS_4076_EQ_4076(...) \,
+#define Z_IS_4077_EQ_4077(...) \,
+#define Z_IS_4078_EQ_4078(...) \,
+#define Z_IS_4079_EQ_4079(...) \,
+#define Z_IS_4080_EQ_4080(...) \,
+#define Z_IS_4081_EQ_4081(...) \,
+#define Z_IS_4082_EQ_4082(...) \,
+#define Z_IS_4083_EQ_4083(...) \,
+#define Z_IS_4084_EQ_4084(...) \,
+#define Z_IS_4085_EQ_4085(...) \,
+#define Z_IS_4086_EQ_4086(...) \,
+#define Z_IS_4087_EQ_4087(...) \,
+#define Z_IS_4088_EQ_4088(...) \,
+#define Z_IS_4089_EQ_4089(...) \,
+#define Z_IS_4090_EQ_4090(...) \,
+#define Z_IS_4091_EQ_4091(...) \,
+#define Z_IS_4092_EQ_4092(...) \,
+#define Z_IS_4093_EQ_4093(...) \,
+#define Z_IS_4094_EQ_4094(...) \,
+#define Z_IS_4095_EQ_4095(...) \,
+#define Z_IS_4096_EQ_4096(...) \,
 
 #endif /* ZEPHYR_INCLUDE_SYS_UTIL_INTERNAL_IS_EQ_H_ */
diff --git a/include/zephyr/sys/util_macro.h b/include/zephyr/sys/util_macro.h
index 1460d745c94..5b3864d2e3c 100644
--- a/include/zephyr/sys/util_macro.h
+++ b/include/zephyr/sys/util_macro.h
@@ -280,19 +280,7 @@ extern "C" {
  * @brief Like <tt>a == b</tt>, but does evaluation and
  * short-circuiting at C preprocessor time.
  *
- * This however only works for integer literal from 0 to 4096 (literals with U suffix,
- * e.g. 0U are also included).
- *
- * Examples:
- *
- *   IS_EQ(1, 1)   -> 1
- *   IS_EQ(1U, 1U) -> 1
- *   IS_EQ(1U, 1)  -> 1
- *   IS_EQ(1, 1U)  -> 1
- *   IS_EQ(1, 0)   -> 0
- *
- * @param a Integer literal (can be with U suffix)
- * @param b Integer literal
+ * This however only works for integer literal from 0 to 4095.
  *
  */
 #define IS_EQ(a, b) Z_IS_EQ(a, b)

From 14ea1eebf306f5f21d8333aca2c8cee594e14ec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:15 +0100
Subject: [PATCH 1229/2913] Revert "[nrf fromlist] tests: drivers: spi: nordic:
 add device PM runtime"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 51d538f0a4a264aeedcd34d02e140c95a48c5625.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf52840dk_nrf52840.overlay                |  1 -
 .../boards/nrf54h20dk_nrf54h20_common.dtsi            |  1 -
 .../boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay    |  1 -
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay         |  2 --
 .../spi/spi_controller_peripheral/testcase.yaml       |  6 ------
 .../spi/spi_loopback/boards/nrf51dk_nrf51822.overlay  |  1 -
 .../spi_loopback/boards/nrf52840dk_nrf52840.overlay   |  1 -
 .../spi/spi_loopback/boards/nrf52dk_nrf52832.overlay  |  1 -
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay         | 11 -----------
 .../boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay    |  1 -
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay         |  1 -
 .../spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay |  1 -
 tests/drivers/spi/spi_loopback/testcase.yaml          |  5 -----
 13 files changed, 33 deletions(-)

diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
index a1a0dc42a36..97802a7a637 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
@@ -50,7 +50,6 @@
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
-	zephyr,pm-device-runtime-auto;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi
index d431933ab5a..8661760a5e3 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi
@@ -60,7 +60,6 @@
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
-	zephyr,pm-device-runtime-auto;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
index 4441819249f..0523426db45 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
@@ -55,7 +55,6 @@
 	overrun-character = <0x00>;
 	memory-regions = <&dma_fast_region>;
 	cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
-	zephyr,pm-device-runtime-auto;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 0188a2c4e24..73a50a7c6fc 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -54,11 +54,9 @@
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
-	zephyr,pm-device-runtime-auto;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(16)>;
 	};
 };
 
diff --git a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
index 41884efcdb5..e55a6a6a69d 100644
--- a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
+++ b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
@@ -58,9 +58,3 @@ tests:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
       - nrf54h20dk/nrf54h20/cpuppr
-
-  drivers.spi.pm_runtime:
-    extra_configs:
-      - CONFIG_PM_DEVICE=y
-      - CONFIG_PM_DEVICE_RUNTIME=y
-    filter: CONFIG_SOC_FAMILY_NORDIC_NRF
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay b/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay
index 06a0d63816a..812f643f3e8 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay
@@ -7,7 +7,6 @@
 &spi1 {
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
-	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay
index 7de4d8d6322..7f511d0753d 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay
@@ -8,7 +8,6 @@
 	overrun-character = <0x00>;
 	rx-delay = <1>;
 	cs-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
-	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay b/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay
index 06a0d63816a..812f643f3e8 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay
@@ -7,7 +7,6 @@
 &spi1 {
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
-	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index 1455ac160b8..e9338612aed 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -8,15 +8,4 @@
 &spi130 {
 	status = "okay";
 	memory-regions = <&cpuapp_dma_region>;
-	zephyr,pm-device-runtime-auto;
-	slow@0 {
-		compatible = "test-spi-loopback-slow";
-		reg = <0>;
-		spi-max-frequency = <DT_FREQ_K(500)>;
-	};
-	fast@0 {
-		compatible = "test-spi-loopback-fast";
-		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(8)>;
-	};
 };
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
index 2857c48f6fb..d6c3c972afd 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
@@ -30,7 +30,6 @@
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
 	memory-regions = <&dma_fast_region>;
-	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 8dcf6fd190d..f2e84b72f9b 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -29,7 +29,6 @@
 	pinctrl-1 = <&spi00_sleep>;
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
-	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay b/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay
index bcd2472166a..a07ed5fbf5d 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay
@@ -7,7 +7,6 @@
 &spi3 {
 	overrun-character = <0x00>;
 	cs-gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
-	zephyr,pm-device-runtime-auto;
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;
diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml
index 682446401cd..5ed122bfd01 100644
--- a/tests/drivers/spi/spi_loopback/testcase.yaml
+++ b/tests/drivers/spi/spi_loopback/testcase.yaml
@@ -216,8 +216,3 @@ tests:
     filter: CONFIG_SOC_FAMILY_MAX32
     platform_allow:
       - apard32690/max32690/m4
-  drivers.spi.nrf_pm_runtime:
-    extra_configs:
-      - CONFIG_PM_DEVICE=y
-      - CONFIG_PM_DEVICE_RUNTIME=y
-    filter: CONFIG_SOC_FAMILY_NORDIC_NRF

From 0a1323e8a1fa5df3efe8a89e6c13edbd508074b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:15 +0100
Subject: [PATCH 1230/2913] Revert "[nrf fromlist] drivers: spi: nrfx_spim: Add
 support for device runtime PM"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit aa120ad0d75c589161378af3938c37ecfad34ee1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/spi/spi_nrfx_spim.c | 73 +++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c
index 11ba2e584a1..b0eecc07625 100644
--- a/drivers/spi/spi_nrfx_spim.c
+++ b/drivers/spi/spi_nrfx_spim.c
@@ -8,7 +8,6 @@
 #include <zephyr/drivers/spi/rtio.h>
 #include <zephyr/cache.h>
 #include <zephyr/pm/device.h>
-#include <zephyr/pm/device_runtime.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
 #include <soc.h>
@@ -91,8 +90,6 @@ static inline void finalize_spi_transaction(const struct device *dev, bool deact
 	if (NRF_SPIM_IS_320MHZ_SPIM(reg) && !(dev_data->ctx.config->operation & SPI_HOLD_ON_CS)) {
 		nrfy_spim_disable(reg);
 	}
-
-	pm_device_runtime_put_async(dev, K_NO_WAIT);
 }
 
 static inline uint32_t get_nrf_spim_frequency(uint32_t frequency)
@@ -463,7 +460,6 @@ static int transceive(const struct device *dev,
 	void *reg = dev_config->spim.p_reg;
 	int error;
 
-	pm_device_runtime_get(dev);
 	spi_context_lock(&dev_data->ctx, asynchronous, cb, userdata, spi_cfg);
 
 	error = configure(dev, spi_cfg);
@@ -575,49 +571,56 @@ static const struct spi_driver_api spi_nrfx_driver_api = {
 	.release = spi_nrfx_release,
 };
 
-static void spim_resume(const struct device *dev)
+#ifdef CONFIG_PM_DEVICE
+static int spim_nrfx_pm_action(const struct device *dev,
+			       enum pm_device_action action)
 {
+	int ret = 0;
+	struct spi_nrfx_data *dev_data = dev->data;
 	const struct spi_nrfx_config *dev_config = dev->config;
 
-	(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_DEFAULT);
-	/* nrfx_spim_init() will be called at configuration before
-	 * the next transfer.
-	 */
+	switch (action) {
+	case PM_DEVICE_ACTION_RESUME:
+		ret = pinctrl_apply_state(dev_config->pcfg,
+					  PINCTRL_STATE_DEFAULT);
+		if (ret < 0) {
+			return ret;
+		}
+		/* nrfx_spim_init() will be called at configuration before
+		 * the next transfer.
+		 */
 
 #ifdef CONFIG_SOC_NRF54H20_GPD
-	nrf_gpd_retain_pins_set(dev_config->pcfg, false);
+		nrf_gpd_retain_pins_set(dev_config->pcfg, false);
 #endif
-}
 
-static void spim_suspend(const struct device *dev)
-{
-	const struct spi_nrfx_config *dev_config = dev->config;
-	struct spi_nrfx_data *dev_data = dev->data;
+		break;
 
-	if (dev_data->initialized) {
-		nrfx_spim_uninit(&dev_config->spim);
-		dev_data->initialized = false;
-	}
+	case PM_DEVICE_ACTION_SUSPEND:
+		if (dev_data->initialized) {
+			nrfx_spim_uninit(&dev_config->spim);
+			dev_data->initialized = false;
+		}
 
 #ifdef CONFIG_SOC_NRF54H20_GPD
-	nrf_gpd_retain_pins_set(dev_config->pcfg, true);
+		nrf_gpd_retain_pins_set(dev_config->pcfg, true);
 #endif
 
-	(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
-}
+		ret = pinctrl_apply_state(dev_config->pcfg,
+					  PINCTRL_STATE_SLEEP);
+		if (ret < 0) {
+			return ret;
+		}
+		break;
 
-static int spim_nrfx_pm_action(const struct device *dev, enum pm_device_action action)
-{
-	if (action == PM_DEVICE_ACTION_RESUME) {
-		spim_resume(dev);
-	} else if (IS_ENABLED(CONFIG_PM_DEVICE) && (action == PM_DEVICE_ACTION_SUSPEND)) {
-		spim_suspend(dev);
-	} else {
-		return -ENOTSUP;
+	default:
+		ret = -ENOTSUP;
 	}
 
-	return 0;
+	return ret;
 }
+#endif /* CONFIG_PM_DEVICE */
+
 
 static int spi_nrfx_init(const struct device *dev)
 {
@@ -652,12 +655,10 @@ static int spi_nrfx_init(const struct device *dev)
 	spi_context_unlock_unconditionally(&dev_data->ctx);
 
 #ifdef CONFIG_SOC_NRF52832_ALLOW_SPIM_DESPITE_PAN_58
-	err = anomaly_58_workaround_init(dev);
-	if (err < 0) {
-		return err;
-	}
+	return anomaly_58_workaround_init(dev);
+#else
+	return 0;
 #endif
-	return pm_device_driver_init(dev, spim_nrfx_pm_action);
 }
 /*
  * We use NODELABEL here because the nrfx API requires us to call

From 41cd81619f1fcc7997c08219e94ea521933ab0ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:16 +0100
Subject: [PATCH 1231/2913] Revert "[nrf fromtree] tests: drivers: spi:
 spi_loopback: Add nrf54h20dk cpurad"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 197bf739057fd7f3ae6abf042e23d1377817bb6d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_common.dtsi    | 49 -------------------
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 34 ++++++++++++-
 .../boards/nrf54h20dk_nrf54h20_cpurad.overlay | 11 -----
 3 files changed, 33 insertions(+), 61 deletions(-)
 delete mode 100644 tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_common.dtsi
 delete mode 100644 tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpurad.overlay

diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_common.dtsi b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_common.dtsi
deleted file mode 100644
index 0d31bf6e66e..00000000000
--- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_common.dtsi
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&pinctrl {
-	spi130_default: spi130_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 0)>,
-				<NRF_PSEL(SPIM_MISO, 0, 6)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 7)>;
-		};
-	};
-
-	spi130_sleep: spi130_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 0)>,
-				<NRF_PSEL(SPIM_MISO, 0, 6)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 7)>;
-			low-power-enable;
-		};
-	};
-};
-
-&spi130 {
-	pinctrl-0 = <&spi130_default>;
-	pinctrl-1 = <&spi130_sleep>;
-	pinctrl-names = "default", "sleep";
-	overrun-character = <0x00>;
-	slow@0 {
-		compatible = "test-spi-loopback-slow";
-		reg = <0>;
-		spi-max-frequency = <DT_FREQ_K(500)>;
-	};
-	fast@0 {
-		compatible = "test-spi-loopback-fast";
-		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(8)>;
-	};
-};
-
-&gpio0 {
-	status = "okay";
-};
-
-&gpiote130 {
-	status = "okay";
-};
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index e9338612aed..89e5fbad08a 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -3,9 +3,41 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include "nrf54h20dk_nrf54h20_common.dtsi"
+
+&pinctrl {
+	spi130_default: spi130_default {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 0, 0)>,
+				<NRF_PSEL(SPIM_MOSI, 0, 7)>,
+				<NRF_PSEL(SPIM_MISO, 0, 6)>;
+		};
+	};
+
+	spi130_sleep: spi130_sleep {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 0, 0)>,
+				<NRF_PSEL(SPIM_MISO, 0, 6)>,
+				<NRF_PSEL(SPIM_MOSI, 0, 7)>;
+			low-power-enable;
+		};
+	};
+};
 
 &spi130 {
 	status = "okay";
+	pinctrl-0 = <&spi130_default>;
+	pinctrl-1 = <&spi130_sleep>;
+	pinctrl-names = "default", "sleep";
+	overrun-character = <0x00>;
 	memory-regions = <&cpuapp_dma_region>;
+	slow@0 {
+		compatible = "test-spi-loopback-slow";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_K(500)>;
+	};
+	fast@0 {
+		compatible = "test-spi-loopback-fast";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(8)>;
+	};
 };
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpurad.overlay
deleted file mode 100644
index b94da1560f6..00000000000
--- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpurad.overlay
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include "nrf54h20dk_nrf54h20_common.dtsi"
-
-&spi130 {
-	status = "okay";
-	memory-regions = <&cpurad_dma_region>;
-};

From 86ac0646515f1db3d86fb4a58059d2afb5a6b8f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:16 +0100
Subject: [PATCH 1232/2913] Revert "[nrf fromtree] tests: drivers: spi:
 spi_loopback: Support RTIO tests for APARD32690"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8d50189aa84e6353ace4d41d2bd391087882c5cd.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/apard32690_max32690_m4.overlay     | 19 -------------------
 .../spi_loopback/overlay-max32-spi-rtio.conf  |  7 -------
 tests/drivers/spi/spi_loopback/testcase.yaml  |  6 ------
 3 files changed, 32 deletions(-)
 delete mode 100644 tests/drivers/spi/spi_loopback/boards/apard32690_max32690_m4.overlay
 delete mode 100644 tests/drivers/spi/spi_loopback/overlay-max32-spi-rtio.conf

diff --git a/tests/drivers/spi/spi_loopback/boards/apard32690_max32690_m4.overlay b/tests/drivers/spi/spi_loopback/boards/apard32690_max32690_m4.overlay
deleted file mode 100644
index 0a3dbc158db..00000000000
--- a/tests/drivers/spi/spi_loopback/boards/apard32690_max32690_m4.overlay
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2024 Analog Devices, Inc.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-arduino_spi: &spi1 {
-	status = "okay";
-	slow@0 {
-		compatible = "test-spi-loopback-slow";
-		reg = <0>;
-		spi-max-frequency = <128000>;
-	};
-	fast@0 {
-		compatible = "test-spi-loopback-fast";
-		reg = <0>;
-		spi-max-frequency = <500000>;
-	};
-};
diff --git a/tests/drivers/spi/spi_loopback/overlay-max32-spi-rtio.conf b/tests/drivers/spi/spi_loopback/overlay-max32-spi-rtio.conf
deleted file mode 100644
index dcf44166a3b..00000000000
--- a/tests/drivers/spi/spi_loopback/overlay-max32-spi-rtio.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2024 Analog Devices, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_RTIO=y
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml
index 5ed122bfd01..3087e65c640 100644
--- a/tests/drivers/spi/spi_loopback/testcase.yaml
+++ b/tests/drivers/spi/spi_loopback/testcase.yaml
@@ -210,9 +210,3 @@ tests:
     platform_allow:
       - s32z2xxdc2/s32z270/rtu0
       - s32z2xxdc2/s32z270/rtu1
-  drivers.spi.max32_spi_rtio.loopback:
-    extra_args:
-      - OVERLAY_CONFIG="overlay-max32-spi-rtio.conf"
-    filter: CONFIG_SOC_FAMILY_MAX32
-    platform_allow:
-      - apard32690/max32690/m4

From 26ebfedcfd6fdacf51f05a95203209ce2a7a91f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:16 +0100
Subject: [PATCH 1233/2913] Revert "[nrf fromtree] tests: drivers: spi: enable
 test spi_loopback"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0dc6122b095ee3dbf4a3848395fa70301461a1ff.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/s32z2xxdc2_s32z270_dspi.overlay    | 40 -------------------
 tests/drivers/spi/spi_loopback/testcase.yaml  |  6 ---
 2 files changed, 46 deletions(-)
 delete mode 100644 tests/drivers/spi/spi_loopback/boards/s32z2xxdc2_s32z270_dspi.overlay

diff --git a/tests/drivers/spi/spi_loopback/boards/s32z2xxdc2_s32z270_dspi.overlay b/tests/drivers/spi/spi_loopback/boards/s32z2xxdc2_s32z270_dspi.overlay
deleted file mode 100644
index c6111cbd703..00000000000
--- a/tests/drivers/spi/spi_loopback/boards/s32z2xxdc2_s32z270_dspi.overlay
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2024 NXP
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&pinctrl {
-	dspi0_default: dspi0_default {
-		group1 {
-			pinmux = <LVDS_DSPI_10_SOUT>, <LVDS_DSPI_10_SCK>;
-			output-enable;
-			nxp,current-reference-control;
-			nxp,termination-resistor;
-		};
-		group2 {
-			pinmux = <LVDS_DSPI_10_SIN>;
-			input-enable;
-			nxp,current-reference-control;
-			nxp,termination-resistor;
-		};
-	};
-};
-
-&dspi0 {
-	pinctrl-0 = <&dspi0_default>;
-	pinctrl-names = "default";
-	status = "okay";
-
-	slow@0 {
-		compatible = "test-spi-loopback-slow";
-		reg = <0>;
-		spi-max-frequency = <500000>;
-	};
-
-	fast@0 {
-		compatible = "test-spi-loopback-fast";
-		reg = <0>;
-		spi-max-frequency = <16000000>;
-	};
-};
diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml
index 3087e65c640..47d2ec28178 100644
--- a/tests/drivers/spi/spi_loopback/testcase.yaml
+++ b/tests/drivers/spi/spi_loopback/testcase.yaml
@@ -204,9 +204,3 @@ tests:
   drivers.spi.max32_dma.loopback:
     extra_args: EXTRA_CONF_FILE="overlay-max32-spi-dma.conf"
     filter: CONFIG_SOC_FAMILY_MAX32
-  drivers.spi.s32z_dspi.loopback:
-    extra_args:
-      - DTC_OVERLAY_FILE=boards/s32z2xxdc2_s32z270_dspi.overlay
-    platform_allow:
-      - s32z2xxdc2/s32z270/rtu0
-      - s32z2xxdc2/s32z270/rtu1

From d97086518e6db973ab77cd5ce565f971237f95f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:16 +0100
Subject: [PATCH 1234/2913] Revert "[nrf fromtree] yaml: use EXTRA_CONF_FILE in
 .yaml files"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0982e74dfd328ded59680e8a2263051e69e40ea7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/drivers/jesd216/sample.yaml           |  2 +-
 samples/drivers/spi_flash_at45/sample.yaml    |  8 ++---
 .../modules/thrift/hello/client/sample.yaml   |  2 +-
 .../modules/thrift/hello/server/sample.yaml   |  2 +-
 .../net/cloud/tagoio_http_post/sample.yaml    |  4 +--
 samples/net/lwm2m_client/sample.yaml          |  4 +--
 .../net/openthread/coprocessor/sample.yaml    |  4 +--
 .../secure_mqtt_sensor_actuator/sample.yaml   |  4 +--
 .../net/sockets/big_http_download/sample.yaml |  2 +-
 .../net/sockets/dumb_http_server/sample.yaml  |  4 +--
 samples/net/sockets/echo_client/sample.yaml   | 28 +++++++--------
 samples/net/sockets/echo_server/sample.yaml   | 36 +++++++++----------
 samples/net/sockets/http_get/sample.yaml      |  4 +--
 samples/net/zperf/sample.yaml                 |  8 ++---
 samples/subsys/fs/fs_sample/sample.yaml       |  6 ++--
 samples/subsys/fs/littlefs/sample.yaml        | 14 ++++----
 samples/subsys/logging/logger/sample.yaml     |  2 +-
 samples/subsys/logging/syst/sample.yaml       | 10 +++---
 .../subsys/mgmt/mcumgr/smp_svr/sample.yaml    | 20 +++++------
 samples/subsys/mgmt/updatehub/sample.yaml     |  4 +--
 samples/subsys/modbus/rtu_server/sample.yaml  |  2 +-
 samples/subsys/shell/devmem_load/sample.yaml  |  2 +-
 samples/subsys/shell/shell_module/sample.yaml |  4 +--
 samples/subsys/usb/dfu/sample.yaml            |  2 +-
 .../mcuboot_recovery_retention/testcase.yaml  |  2 +-
 tests/crypto/secp256r1/testcase.yaml          |  6 ++--
 tests/drivers/adc/adc_api/testcase.yaml       |  6 ++--
 tests/drivers/bbram/testcase.yaml             |  4 +--
 tests/drivers/build_all/sensor/testcase.yaml  | 12 +++----
 tests/drivers/eeprom/api/testcase.yaml        |  2 +-
 tests/drivers/entropy/api/testcase.yaml       |  4 +--
 tests/drivers/flash/common/testcase.yaml      | 14 ++++----
 tests/drivers/retained_mem/api/testcase.yaml  |  2 +-
 tests/drivers/spi/spi_loopback/testcase.yaml  | 22 ++++++------
 .../drivers/uart/uart_basic_api/testcase.yaml |  2 +-
 .../watchdog/wdt_basic_api/testcase.yaml      |  2 +-
 tests/lib/gui/lvgl/testcase.yaml              |  2 +-
 tests/modules/thrift/ThriftTest/testcase.yaml |  2 +-
 tests/net/lib/tls_credentials/testcase.yaml   |  2 +-
 tests/subsys/dfu/img_util/testcase.yaml       |  2 +-
 .../logging/log_switch_format/testcase.yaml   |  6 ++--
 .../mgmt/mcumgr/all_options/testcase.yaml     |  2 +-
 .../fs_mgmt_hash_supported/testcase.yaml      |  6 ++--
 .../mgmt/mcumgr/handler_demo/testcase.yaml    |  2 +-
 tests/subsys/pm/power_mgmt/testcase.yaml      |  2 +-
 .../settings/functional/nvs/testcase.yaml     |  2 +-
 tests/subsys/storage/flash_map/testcase.yaml  |  6 ++--
 47 files changed, 145 insertions(+), 145 deletions(-)

diff --git a/samples/drivers/jesd216/sample.yaml b/samples/drivers/jesd216/sample.yaml
index afc3b200554..c2742a68d46 100644
--- a/samples/drivers/jesd216/sample.yaml
+++ b/samples/drivers/jesd216/sample.yaml
@@ -24,7 +24,7 @@ tests:
   sample.drivers.jesd216.nrf52840dk_spi:
     extra_args:
       - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_spi.overlay
-      - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_spi.conf
+      - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_spi.conf
     platform_allow: nrf52840dk/nrf52840
     integration_platforms:
       - nrf52840dk/nrf52840
diff --git a/samples/drivers/spi_flash_at45/sample.yaml b/samples/drivers/spi_flash_at45/sample.yaml
index c362fa5a693..2195f6f7756 100644
--- a/samples/drivers/spi_flash_at45/sample.yaml
+++ b/samples/drivers/spi_flash_at45/sample.yaml
@@ -9,7 +9,7 @@ tests:
     filter: dt_compat_enabled("atmel,at45")
     build_only: true
   sample.drivers.spi.flash.at45.build.page_layout:
-    extra_args: EXTRA_CONF_FILE="overlay-page_layout.conf"
+    extra_args: OVERLAY_CONFIG="overlay-page_layout.conf"
     tags:
       - spi
       - flash
@@ -17,7 +17,7 @@ tests:
     filter: dt_compat_enabled("atmel,at45")
     build_only: true
   sample.drivers.spi.flash.at45.build.pm:
-    extra_args: EXTRA_CONF_FILE="overlay-pm.conf"
+    extra_args: OVERLAY_CONFIG="overlay-pm.conf"
     tags:
       - spi
       - flash
@@ -25,7 +25,7 @@ tests:
     filter: dt_compat_enabled("atmel,at45")
     build_only: true
   sample.drivers.spi.flash.at45.build.page_layout_pm:
-    extra_args: EXTRA_CONF_FILE="overlay-page_layout.conf;overlay-pm.conf"
+    extra_args: OVERLAY_CONFIG="overlay-page_layout.conf;overlay-pm.conf"
     tags:
       - spi
       - flash
@@ -33,7 +33,7 @@ tests:
     filter: dt_compat_enabled("atmel,at45")
     build_only: true
   sample.drivers.spi.flash.at45:
-    extra_args: EXTRA_CONF_FILE="overlay-page_layout.conf;overlay-pm.conf"
+    extra_args: OVERLAY_CONFIG="overlay-page_layout.conf;overlay-pm.conf"
     tags:
       - spi
       - flash
diff --git a/samples/modules/thrift/hello/client/sample.yaml b/samples/modules/thrift/hello/client/sample.yaml
index 319d49a506d..6a1ef0caecd 100644
--- a/samples/modules/thrift/hello/client/sample.yaml
+++ b/samples/modules/thrift/hello/client/sample.yaml
@@ -21,4 +21,4 @@ tests:
     extra_configs:
       - CONFIG_THRIFT_COMPACT_PROTOCOL=y
   sample.thrift.hello.client.tlsTransport:
-    extra_args: EXTRA_CONF_FILE="../overlay-tls.conf"
+    extra_args: OVERLAY_CONFIG="../overlay-tls.conf"
diff --git a/samples/modules/thrift/hello/server/sample.yaml b/samples/modules/thrift/hello/server/sample.yaml
index eca296a8a1c..02bfe323d01 100644
--- a/samples/modules/thrift/hello/server/sample.yaml
+++ b/samples/modules/thrift/hello/server/sample.yaml
@@ -21,4 +21,4 @@ tests:
     extra_configs:
       - CONFIG_THRIFT_COMPACT_PROTOCOL=y
   sample.thrift.hello.server.tlsTransport:
-    extra_args: EXTRA_CONF_FILE="../overlay-tls.conf"
+    extra_args: OVERLAY_CONFIG="../overlay-tls.conf"
diff --git a/samples/net/cloud/tagoio_http_post/sample.yaml b/samples/net/cloud/tagoio_http_post/sample.yaml
index 6265708da27..08a67c0343a 100644
--- a/samples/net/cloud/tagoio_http_post/sample.yaml
+++ b/samples/net/cloud/tagoio_http_post/sample.yaml
@@ -18,12 +18,12 @@ tests:
     integration_platforms:
       - frdm_k64f
   sample.net.cloud.tagoio_http_post.wifi:
-    extra_args: EXTRA_CONF_FILE="overlay-wifi.conf"
+    extra_args: OVERLAY_CONFIG="overlay-wifi.conf"
     platform_allow: disco_l475_iot1
   sample.net.cloud.tagoio_http_post.wifi.esp:
     extra_args:
       - SHIELD=esp_8266_arduino
-      - EXTRA_CONF_FILE="overlay-wifi.conf"
+      - OVERLAY_CONFIG="overlay-wifi.conf"
     platform_allow:
       - frdm_k64f
       - nucleo_f767zi
diff --git a/samples/net/lwm2m_client/sample.yaml b/samples/net/lwm2m_client/sample.yaml
index 5c8f0eb7f11..f70290d287e 100644
--- a/samples/net/lwm2m_client/sample.yaml
+++ b/samples/net/lwm2m_client/sample.yaml
@@ -40,7 +40,7 @@ tests:
   sample.net.lwm2m_client.dtls:
     harness: net
     depends_on: netif
-    extra_args: EXTRA_CONF_FILE=overlay-dtls.conf
+    extra_args: OVERLAY_CONFIG=overlay-dtls.conf
     platform_allow:
       - qemu_x86
       - frdm_k64f
@@ -55,7 +55,7 @@ tests:
   sample.net.lwm2m_client.queue_mode:
     harness: net
     depends_on: netif
-    extra_args: EXTRA_CONF_FILE=overlay-queue.conf
+    extra_args: OVERLAY_CONFIG=overlay-queue.conf
     platform_allow:
       - qemu_x86
       - native_sim
diff --git a/samples/net/openthread/coprocessor/sample.yaml b/samples/net/openthread/coprocessor/sample.yaml
index 26487beb0f3..aa917223de9 100644
--- a/samples/net/openthread/coprocessor/sample.yaml
+++ b/samples/net/openthread/coprocessor/sample.yaml
@@ -26,7 +26,7 @@ tests:
       - nrf52840dk/nrf52840
     tags: ci_build
     extra_args:
-      - EXTRA_CONF_FILE=overlay-usb-nrf-br.conf
+      - OVERLAY_CONFIG=overlay-usb-nrf-br.conf
       - DTC_OVERLAY_FILE="usb.overlay"
   sample.openthread.coprocessor.rcp:
     build_only: true
@@ -36,4 +36,4 @@ tests:
       - tlsr9518adk80d
     integration_platforms:
       - nrf52840dk/nrf52840
-    extra_args: EXTRA_CONF_FILE=overlay-rcp.conf
+    extra_args: OVERLAY_CONFIG=overlay-rcp.conf
diff --git a/samples/net/secure_mqtt_sensor_actuator/sample.yaml b/samples/net/secure_mqtt_sensor_actuator/sample.yaml
index f970f9a53d7..44b9a4d7d2a 100644
--- a/samples/net/secure_mqtt_sensor_actuator/sample.yaml
+++ b/samples/net/secure_mqtt_sensor_actuator/sample.yaml
@@ -12,7 +12,7 @@ tests:
       - adi_eval_adin1110ebz
   sample.net.secure_mqtt_sensor_actuator.staticip:
     harness: net
-    extra_args: EXTRA_CONF_FILE="overlay-static.conf"
+    extra_args: OVERLAY_CONFIG="overlay-static.conf"
     tags:
       - net
       - mqtt
@@ -22,7 +22,7 @@ tests:
       - native_sim
   sample.net.secure_mqtt_sensor_actuator.staticip_insecure:
     harness: net
-    extra_args: EXTRA_CONF_FILE="overlay-static-insecure.conf"
+    extra_args: OVERLAY_CONFIG="overlay-static-insecure.conf"
     tags:
       - net
       - mqtt
diff --git a/samples/net/sockets/big_http_download/sample.yaml b/samples/net/sockets/big_http_download/sample.yaml
index 0851eeffec0..d27f131836d 100644
--- a/samples/net/sockets/big_http_download/sample.yaml
+++ b/samples/net/sockets/big_http_download/sample.yaml
@@ -18,4 +18,4 @@ tests:
     extra_configs:
       - CONFIG_POSIX_API=y
   sample.net.sockets.big_http_download.ci:
-    extra_args: EXTRA_CONF_FILE=overlay-ci.conf
+    extra_args: OVERLAY_CONFIG=overlay-ci.conf
diff --git a/samples/net/sockets/dumb_http_server/sample.yaml b/samples/net/sockets/dumb_http_server/sample.yaml
index 7e076a94eb1..53fe319293d 100644
--- a/samples/net/sockets/dumb_http_server/sample.yaml
+++ b/samples/net/sockets/dumb_http_server/sample.yaml
@@ -17,7 +17,7 @@ tests:
   sample.net.sockets.dumb_http_server.netusb:
     depends_on: usb_device
     harness: net
-    extra_args: EXTRA_CONF_FILE="overlay-netusb.conf"
+    extra_args: OVERLAY_CONFIG="overlay-netusb.conf"
     tags: usb
     # native_sim usb driver does not work with CONFIG_POSIX_API
     platform_exclude:
@@ -28,7 +28,7 @@ tests:
   sample.net.sockets.dumb_http_server.netusb_zeroconf:
     depends_on: usb_device
     harness: net
-    extra_args: EXTRA_CONF_FILE="overlay-netusb.conf;overlay-zeroconf.conf"
+    extra_args: OVERLAY_CONFIG="overlay-netusb.conf;overlay-zeroconf.conf"
     tags: usb
     # native_sim usb driver does not work with CONFIG_POSIX_API
     platform_exclude:
diff --git a/samples/net/sockets/echo_client/sample.yaml b/samples/net/sockets/echo_client/sample.yaml
index b10777df087..2f3d58fb81c 100644
--- a/samples/net/sockets/echo_client/sample.yaml
+++ b/samples/net/sockets/echo_client/sample.yaml
@@ -19,20 +19,20 @@ tests:
     integration_platforms:
       - qemu_x86
   sample.net.sockets.echo_client.802154:
-    extra_args: EXTRA_CONF_FILE="overlay-qemu_802154.conf"
+    extra_args: OVERLAY_CONFIG="overlay-qemu_802154.conf"
     platform_allow: qemu_x86
   sample.net.sockets.echo_client.802154.rf2xx:
-    extra_args: EXTRA_CONF_FILE="overlay-802154.conf"
+    extra_args: OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow: samr21_xpro
   sample.net.sockets.echo_client.802154.rf2xx.xplained:
     extra_args:
       - SHIELD=atmel_rf2xx_xplained
-      - EXTRA_CONF_FILE="overlay-802154.conf"
+      - OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow: sam4s_xplained
   sample.net.sockets.echo_client.802154.rf2xx.xpro:
     extra_args:
       - SHIELD=atmel_rf2xx_xpro
-      - EXTRA_CONF_FILE="overlay-802154.conf"
+      - OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow:
       - sam4e_xpro
       - sam_v71_xult/samv71q21
@@ -41,7 +41,7 @@ tests:
   sample.net.sockets.echo_client.802154.rf2xx.legacy:
     extra_args:
       - SHIELD=atmel_rf2xx_legacy
-      - EXTRA_CONF_FILE="overlay-802154.conf"
+      - OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow:
       - sam4e_xpro
       - sam_v71_xult/samv71q21
@@ -50,7 +50,7 @@ tests:
   sample.net.sockets.echo_client.802154.rf2xx.arduino:
     extra_args:
       - SHIELD=atmel_rf2xx_arduino
-      - EXTRA_CONF_FILE="overlay-802154.conf"
+      - OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow:
       - sam_v71_xult/samv71q21
       - frdm_k64f
@@ -60,18 +60,18 @@ tests:
   sample.net.sockets.echo_client.802154.rf2xx.mikrobus:
     extra_args:
       - SHIELD=atmel_rf2xx_mikrobus
-      - EXTRA_CONF_FILE="overlay-802154.conf"
+      - OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow: lpcxpresso55s69/lpc55s69/cpu0/ns
   sample.net.sockets.echo_client.mcr20a:
     extra_args:
       - SHIELD=frdm_cr20a
-      - EXTRA_CONF_FILE=overlay-802154.conf
+      - OVERLAY_CONFIG=overlay-802154.conf
     platform_allow: frdm_k64f
   sample.net.sockets.echo_client.nrf_802154:
-    extra_args: EXTRA_CONF_FILE="overlay-802154.conf"
+    extra_args: OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow: nrf52840dk/nrf52840
   sample.net.sockets.echo_client.nrf_openthread:
-    extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
+    extra_args: OVERLAY_CONFIG="overlay-ot.conf"
     slow: true
     tags:
       - net
@@ -79,10 +79,10 @@ tests:
     platform_allow: nrf52840dk/nrf52840
     filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   sample.net.sockets.echo_client.b91_802154:
-    extra_args: EXTRA_CONF_FILE="overlay-802154.conf"
+    extra_args: OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow: tlsr9518adk80d
   sample.net.sockets.echo_client.b91_openthread:
-    extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
+    extra_args: OVERLAY_CONFIG="overlay-ot.conf"
     slow: true
     tags:
       - net
@@ -90,7 +90,7 @@ tests:
     platform_allow: tlsr9518adk80d
     filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   sample.net.sockets.echo_client.kw41z_openthread:
-    extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
+    extra_args: OVERLAY_CONFIG="overlay-ot.conf"
     slow: true
     tags:
       - net
@@ -100,7 +100,7 @@ tests:
   sample.net.sockets.echo_client.userspace:
     extra_args:
       - CONFIG_USERSPACE=y
-      - EXTRA_CONF_FILE="overlay-e1000.conf"
+      - OVERLAY_CONFIG="overlay-e1000.conf"
     platform_allow:
       - qemu_x86
       - qemu_x86_64
diff --git a/samples/net/sockets/echo_server/sample.yaml b/samples/net/sockets/echo_server/sample.yaml
index 224221a4f8b..949b34e9cbb 100644
--- a/samples/net/sockets/echo_server/sample.yaml
+++ b/samples/net/sockets/echo_server/sample.yaml
@@ -22,19 +22,19 @@ tests:
     integration_platforms:
       - qemu_x86
   sample.net.sockets.echo_server.802154:
-    extra_args: EXTRA_CONF_FILE="overlay-qemu_802154.conf"
+    extra_args: OVERLAY_CONFIG="overlay-qemu_802154.conf"
     platform_allow: qemu_x86
     integration_platforms:
       - qemu_x86
   sample.net.sockets.echo_server.802154.rf2xx.xplained:
     extra_args:
       - SHIELD=atmel_rf2xx_xplained
-      - EXTRA_CONF_FILE="overlay-802154.conf"
+      - OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow: sam4s_xplained
   sample.net.sockets.echo_server.802154.rf2xx.xpro:
     extra_args:
       - SHIELD=atmel_rf2xx_xpro
-      - EXTRA_CONF_FILE="overlay-802154.conf"
+      - OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow:
       - sam4e_xpro
       - sam_v71_xult/samv71q21
@@ -43,7 +43,7 @@ tests:
   sample.net.sockets.echo_server.802154.rf2xx.legacy:
     extra_args:
       - SHIELD=atmel_rf2xx_legacy
-      - EXTRA_CONF_FILE="overlay-802154.conf"
+      - OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow:
       - sam4e_xpro
       - sam_v71_xult/samv71q21
@@ -52,7 +52,7 @@ tests:
   sample.net.sockets.echo_server.802154.rf2xx.arduino:
     extra_args:
       - SHIELD=atmel_rf2xx_arduino
-      - EXTRA_CONF_FILE="overlay-802154.conf"
+      - OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow:
       - sam_v71_xult/samv71q21
       - frdm_k64f
@@ -62,23 +62,23 @@ tests:
   sample.net.sockets.echo_server.802154.rf2xx.mikrobus:
     extra_args:
       - SHIELD=atmel_rf2xx_mikrobus
-      - EXTRA_CONF_FILE="overlay-802154.conf"
+      - OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow: lpcxpresso55s69/lpc55s69/cpu0/ns
   sample.net.sockets.echo_server.mcr20a:
     extra_args:
       - SHIELD=frdm_cr20a
-      - EXTRA_CONF_FILE=overlay-802154.conf
+      - OVERLAY_CONFIG=overlay-802154.conf
     platform_allow: frdm_k64f
   sample.net.sockets.echo_server.nrf_802154:
-    extra_args: EXTRA_CONF_FILE="overlay-802154.conf"
+    extra_args: OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow: nrf52840dk/nrf52840
   sample.net.sockets.echo_server.b91_802154:
-    extra_args: EXTRA_CONF_FILE="overlay-802154.conf"
+    extra_args: OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow: tlsr9518adk80d
   sample.net.sockets.echo_server.usbnet:
     depends_on: usb_device
     harness: net
-    extra_args: EXTRA_CONF_FILE="overlay-netusb.conf"
+    extra_args: OVERLAY_CONFIG="overlay-netusb.conf"
     tags:
       - net
       - usb
@@ -89,7 +89,7 @@ tests:
       - native_posix
       - native_posix/native/64
   sample.net.sockets.echo_server.nrf_openthread:
-    extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
+    extra_args: OVERLAY_CONFIG="overlay-ot.conf"
     slow: true
     tags:
       - net
@@ -97,7 +97,7 @@ tests:
     platform_allow: nrf52840dk/nrf52840
     filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   sample.net.sockets.echo_server.b91_openthread:
-    extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
+    extra_args: OVERLAY_CONFIG="overlay-ot.conf"
     slow: true
     tags:
       - net
@@ -105,7 +105,7 @@ tests:
     platform_allow: tlsr9518adk80d
     filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   sample.net.sockets.echo_server.kw41z_openthread:
-    extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
+    extra_args: OVERLAY_CONFIG="overlay-ot.conf"
     slow: true
     tags:
       - net
@@ -113,23 +113,23 @@ tests:
     platform_allow: frdm_kw41z
     filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   sample.net.sockets.echo_server.e1000:
-    extra_args: EXTRA_CONF_FILE="overlay-e1000.conf"
+    extra_args: OVERLAY_CONFIG="overlay-e1000.conf"
     tags: net
     platform_allow:
       - qemu_x86
       - qemu_x86_64
   sample.net.sockets.echo_server.stellaris:
-    extra_args: EXTRA_CONF_FILE="overlay-qemu_cortex_m3_eth.conf"
+    extra_args: OVERLAY_CONFIG="overlay-qemu_cortex_m3_eth.conf"
     tags: net
     platform_allow: qemu_cortex_m3
   sample.net.sockets.echo_server.smsc911x:
-    extra_args: EXTRA_CONF_FILE="overlay-smsc911x.conf"
+    extra_args: OVERLAY_CONFIG="overlay-smsc911x.conf"
     tags: net
     platform_allow: mps2/an385
   sample.net.sockets.echo_server.userspace:
     extra_args:
       - CONFIG_USERSPACE=y
-      - EXTRA_CONF_FILE="overlay-e1000.conf"
+      - OVERLAY_CONFIG="overlay-e1000.conf"
       - CONFIG_MAX_THREAD_BYTES=3
     platform_allow:
       - qemu_x86
@@ -141,7 +141,7 @@ tests:
       - native_sim
       - native_sim/native/64
     extra_args:
-      - EXTRA_CONF_FILE="overlay-nsos.conf"
+      - OVERLAY_CONFIG="overlay-nsos.conf"
   sample.net.sockets.echo_server.802154.subg:
     extra_args: EXTRA_CONF_FILE="overlay-802154-subg.conf"
     platform_allow: beagleconnect_freedom
diff --git a/samples/net/sockets/http_get/sample.yaml b/samples/net/sockets/http_get/sample.yaml
index 8e94ffaf341..292058bfce9 100644
--- a/samples/net/sockets/http_get/sample.yaml
+++ b/samples/net/sockets/http_get/sample.yaml
@@ -43,7 +43,7 @@ tests:
     platform_allow:
       - native_sim
       - native_sim/native/64
-    extra_args: EXTRA_CONF_FILE="overlay-nsos.conf"
+    extra_args: OVERLAY_CONFIG="overlay-nsos.conf"
   sample.net.sockets.http_get.nsos.https:
     harness: console
     harness_config:
@@ -56,7 +56,7 @@ tests:
     platform_allow:
       - native_sim
       - native_sim/native/64
-    extra_args: EXTRA_CONF_FILE="overlay-nsos.conf;overlay-tls.conf"
+    extra_args: OVERLAY_CONFIG="overlay-nsos.conf;overlay-tls.conf"
   sample.net.sockets.http_get.wifi.nrf70dk:
     extra_args:
       - SNIPPET=wifi-ipv4
diff --git a/samples/net/zperf/sample.yaml b/samples/net/zperf/sample.yaml
index 3c5e30bb47b..35260fd723a 100644
--- a/samples/net/zperf/sample.yaml
+++ b/samples/net/zperf/sample.yaml
@@ -34,7 +34,7 @@ tests:
     platform_allow: qemu_x86
   sample.net.zperf.netusb_ecm:
     harness: net
-    extra_args: EXTRA_CONF_FILE="overlay-netusb.conf"
+    extra_args: OVERLAY_CONFIG="overlay-netusb.conf"
     tags:
       - usb
       - net
@@ -48,14 +48,14 @@ tests:
       - native_posix/native/64
   sample.net.zperf.device_next_ecm:
     harness: net
-    extra_args: EXTRA_CONF_FILE="overlay-usbd_next_ecm.conf"
+    extra_args: OVERLAY_CONFIG="overlay-usbd_next_ecm.conf"
                 DTC_OVERLAY_FILE="usbd_next_ecm.overlay"
     platform_allow: nrf52840dk/nrf52840 frdm_k64f
     tags: usb net zperf
     depends_on: usb_device
   sample.net.zperf.netusb_eem:
     harness: net
-    extra_args: EXTRA_CONF_FILE="overlay-netusb.conf"
+    extra_args: OVERLAY_CONFIG="overlay-netusb.conf"
     extra_configs:
       - CONFIG_USB_DEVICE_NETWORK_ECM=n
       - CONFIG_USB_DEVICE_NETWORK_EEM=y
@@ -72,7 +72,7 @@ tests:
       - native_posix/native/64
   sample.net.zperf.netusb_rndis:
     harness: net
-    extra_args: EXTRA_CONF_FILE="overlay-netusb.conf"
+    extra_args: OVERLAY_CONFIG="overlay-netusb.conf"
     extra_configs:
       - CONFIG_USB_DEVICE_NETWORK_ECM=n
       - CONFIG_USB_DEVICE_NETWORK_RNDIS=y
diff --git a/samples/subsys/fs/fs_sample/sample.yaml b/samples/subsys/fs/fs_sample/sample.yaml
index 91c0fe100b4..b16976876be 100644
--- a/samples/subsys/fs/fs_sample/sample.yaml
+++ b/samples/subsys/fs/fs_sample/sample.yaml
@@ -47,13 +47,13 @@ tests:
     build_only: true
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_ram_disk.conf
+      - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_ram_disk.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_ram_disk.overlay
   sample.filesystem.fat_fs.nrf52840dk_nrf52840_ram_disk_region:
     build_only: true
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_ram_disk.conf
+      - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_ram_disk.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_ram_disk_region.overlay
   sample.filesystem.fat_fs.nrf54l15dk:
     build_only: true
@@ -62,7 +62,7 @@ tests:
     build_only: true
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_qspi.conf
+      - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_qspi.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_qspi.overlay
   sample.filesystem.fat_fs.has_sdmmc_disk:
     build_only: true
diff --git a/samples/subsys/fs/littlefs/sample.yaml b/samples/subsys/fs/littlefs/sample.yaml
index ea62b0103ca..2160d38515e 100644
--- a/samples/subsys/fs/littlefs/sample.yaml
+++ b/samples/subsys/fs/littlefs/sample.yaml
@@ -40,19 +40,19 @@ tests:
     build_only: true
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_spi.conf
+      - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_spi.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_spi.overlay
   sample.filesystem.littlefs.nrf52840dk_qspi:
     build_only: true
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_qspi.conf
+      - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_qspi.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_qspi.overlay
   sample.filesystem.littlefs.stm32h747i_disco_m7_blk:
     build_only: true
     platform_allow: stm32h747i_disco/stm32h747xx/m7
     extra_args:
-      - EXTRA_CONF_FILE=boards/stm32_blk.conf
+      - OVERLAY_CONFIG=boards/stm32_blk.conf
       - CONF_FILE=prj_blk.conf
     extra_configs:
       - CONFIG_SDMMC_STM32_HWFC=y
@@ -60,23 +60,23 @@ tests:
     build_only: true
     platform_allow: nucleo_h743zi
     extra_args:
-      - EXTRA_CONF_FILE=boards/nucleo_h743zi_qspi.conf
+      - OVERLAY_CONFIG=boards/nucleo_h743zi_qspi.conf
   sample.filesystem.littlefs.nucleo_h743zi_blk:
     build_only: true
     platform_allow: nucleo_h743zi
     extra_args:
-      - EXTRA_CONF_FILE=boards/nucleo_h743zi_blk.conf
+      - OVERLAY_CONFIG=boards/nucleo_h743zi_blk.conf
       - CONF_FILE=prj_blk.conf
   sample.filesystem.littlefs.stm32l562e_dk_ospi:
     build_only: true
     platform_allow: stm32l562e_dk
     extra_args:
-      - EXTRA_CONF_FILE=boards/stm32l562e_dk_ospi.conf
+      - OVERLAY_CONFIG=boards/stm32l562e_dk_ospi.conf
   sample.filesystem.littlefs.stm32f746g_disco_blk:
     build_only: true
     platform_allow: stm32f746g_disco
     extra_args:
-      - EXTRA_CONF_FILE=boards/stm32_blk.conf
+      - OVERLAY_CONFIG=boards/stm32_blk.conf
       - CONF_FILE=prj_blk.conf
     extra_configs:
       - CONFIG_SDMMC_STM32_HWFC=y
diff --git a/samples/subsys/logging/logger/sample.yaml b/samples/subsys/logging/logger/sample.yaml
index 38c94026394..9801f6177c2 100644
--- a/samples/subsys/logging/logger/sample.yaml
+++ b/samples/subsys/logging/logger/sample.yaml
@@ -42,7 +42,7 @@ tests:
     arch_exclude:
       - posix
     extra_args:
-      - EXTRA_CONF_FILE="overlay-bt.conf"
+      - OVERLAY_CONFIG="overlay-bt.conf"
       - DTC_OVERLAY_FILE="bt.overlay"
 
   sample.logger.usermode:
diff --git a/samples/subsys/logging/syst/sample.yaml b/samples/subsys/logging/syst/sample.yaml
index 828c4fa33bd..8c4681c4fe8 100644
--- a/samples/subsys/logging/syst/sample.yaml
+++ b/samples/subsys/logging/syst/sample.yaml
@@ -17,7 +17,7 @@ tests:
     integration_platforms:
       - mps2/an385
       - qemu_x86
-    extra_args: EXTRA_CONF_FILE=overlay_deferred.conf
+    extra_args: OVERLAY_CONFIG=overlay_deferred.conf
     harness: console
     harness_config:
       type: multi_line
@@ -35,7 +35,7 @@ tests:
       - CONFIG_REQUIRES_FULL_LIBC=y
   sample.logger.syst.immediate:
     toolchain_exclude: xcc
-    extra_args: EXTRA_CONF_FILE=overlay_immediate.conf
+    extra_args: OVERLAY_CONFIG=overlay_immediate.conf
     integration_platforms:
       - qemu_x86
       - sam_e70_xplained/same70q21
@@ -50,7 +50,7 @@ tests:
       - CONFIG_REQUIRES_FULL_LIBC=y
   sample.logger.syst.catalog.deferred:
     toolchain_exclude: xcc
-    extra_args: EXTRA_CONF_FILE=overlay_deferred.conf
+    extra_args: OVERLAY_CONFIG=overlay_deferred.conf
     integration_platforms:
       - qemu_x86
       - qemu_x86_64
@@ -79,7 +79,7 @@ tests:
     filter: CONFIG_FULL_LIBC_SUPPORTED
   sample.logger.syst.deferred_cpp:
     toolchain_exclude: xcc
-    extra_args: EXTRA_CONF_FILE=overlay_deferred.conf
+    extra_args: OVERLAY_CONFIG=overlay_deferred.conf
     integration_platforms:
       - qemu_x86
       - qemu_x86_64
@@ -108,7 +108,7 @@ tests:
     filter: CONFIG_FULL_LIBC_SUPPORTED
   sample.logger.syst.catalog.deferred_cpp:
     toolchain_exclude: xcc
-    extra_args: EXTRA_CONF_FILE=overlay_deferred.conf
+    extra_args: OVERLAY_CONFIG=overlay_deferred.conf
     integration_platforms:
       - qemu_x86
       - qemu_x86_64
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index ec4d3fb7b08..33b37512615 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -6,7 +6,7 @@ common:
   tags: bluetooth
 tests:
   sample.mcumgr.smp_svr.bt:
-    extra_args: EXTRA_CONF_FILE="overlay-bt.conf"
+    extra_args: OVERLAY_CONFIG="overlay-bt.conf"
     platform_allow:
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
@@ -19,7 +19,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf54l15dk/nrf54l15/cpuapp
   sample.mcumgr.smp_svr.bt_static_svc:
-    extra_args: EXTRA_CONF_FILE="overlay-bt.conf"
+    extra_args: OVERLAY_CONFIG="overlay-bt.conf"
     extra_configs:
       - CONFIG_MCUMGR_TRANSPORT_BT_DYNAMIC_SVC_REGISTRATION=n
     platform_allow:
@@ -29,13 +29,13 @@ tests:
     integration_platforms:
       - nrf52840dk/nrf52840
   sample.mcumgr.smp_svr.udp:
-    extra_args: EXTRA_CONF_FILE="overlay-udp.conf"
+    extra_args: OVERLAY_CONFIG="overlay-udp.conf"
     platform_allow: frdm_k64f
     integration_platforms:
       - frdm_k64f
   sample.mcumgr.smp_svr.cdc:
     extra_args:
-      - EXTRA_CONF_FILE="overlay-cdc.conf"
+      - OVERLAY_CONFIG="overlay-cdc.conf"
       - DTC_OVERLAY_FILE="usb.overlay"
     platform_allow:
       - nrf52833dk/nrf52820
@@ -49,7 +49,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
   sample.mcumgr.smp_svr.serial:
-    extra_args: EXTRA_CONF_FILE="overlay-serial.conf"
+    extra_args: OVERLAY_CONFIG="overlay-serial.conf"
     platform_allow:
       - nrf52840dk/nrf52840
       - pinnacle_100_dvk
@@ -60,7 +60,7 @@ tests:
   # transport. Transport does not affect flags so it does not really matter which is selected,
   # flags should affect any transport the same way.
   sample.mcumgr.smp_svr.mcuboot_flags.direct_xip_withrevert:
-    extra_args: EXTRA_CONF_FILE="overlay-serial.conf"
+    extra_args: OVERLAY_CONFIG="overlay-serial.conf"
     extra_configs:
       - CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT=y
     platform_allow:
@@ -70,7 +70,7 @@ tests:
     integration_platforms:
       - nrf52840dk/nrf52840
   sample.mcumgr.smp_svr.serial-console:
-    extra_args: EXTRA_CONF_FILE="overlay-serial-console.conf"
+    extra_args: OVERLAY_CONFIG="overlay-serial-console.conf"
     platform_allow:
       - nrf52840dk/nrf52840
       - pinnacle_100_dvk
@@ -78,7 +78,7 @@ tests:
     integration_platforms:
       - nrf52840dk/nrf52840
   sample.mcumgr.smp_svr.shell:
-    extra_args: EXTRA_CONF_FILE="overlay-shell.conf"
+    extra_args: OVERLAY_CONFIG="overlay-shell.conf"
     platform_allow:
       - nrf52840dk/nrf52840
       - mimxrt1060_evk
@@ -90,7 +90,7 @@ tests:
       - mimxrt1060_evk
       - mimxrt1064_evk
   sample.mcumgr.smp_svr.shell_mgmt:
-    extra_args: EXTRA_CONF_FILE="overlay-shell-mgmt.conf"
+    extra_args: OVERLAY_CONFIG="overlay-shell-mgmt.conf"
     platform_allow:
       - nrf52840dk/nrf52840
       - pinnacle_100_dvk
@@ -98,7 +98,7 @@ tests:
     integration_platforms:
       - nrf52840dk/nrf52840
   sample.mcumgr.smp_svr.fs:
-    extra_args: EXTRA_CONF_FILE="overlay-fs.conf"
+    extra_args: OVERLAY_CONFIG="overlay-fs.conf"
     platform_allow:
       - nrf52840dk/nrf52840
       - pinnacle_100_dvk
diff --git a/samples/subsys/mgmt/updatehub/sample.yaml b/samples/subsys/mgmt/updatehub/sample.yaml
index 161cdb41327..de8192d957e 100644
--- a/samples/subsys/mgmt/updatehub/sample.yaml
+++ b/samples/subsys/mgmt/updatehub/sample.yaml
@@ -20,7 +20,7 @@ tests:
       - CONFIG_UPDATEHUB_CE=y
       - CONFIG_UPDATEHUB_SERVER="updatehub.io"
   sample.net.updatehub.psa:
-    extra_args: EXTRA_CONF_FILE="overlay-psa.conf"
+    extra_args: OVERLAY_CONFIG="overlay-psa.conf"
     extra_configs:
       - CONFIG_UPDATEHUB_PRODUCT_UID="e4d37cfe6ec48a2d069cc0bbb8b078677e9a0d8df3a027c4d8ea131130c4265f"
       - CONFIG_UPDATEHUB_POLL_INTERVAL=1
@@ -34,7 +34,7 @@ tests:
       - CONFIG_UPDATEHUB_SERVER="updatehub.io"
       - CONFIG_USERSPACE=y
   sample.net.updatehub.dtls:
-    extra_args: EXTRA_CONF_FILE="overlay-dtls.conf"
+    extra_args: OVERLAY_CONFIG="overlay-dtls.conf"
     extra_configs:
       - CONFIG_UPDATEHUB_PRODUCT_UID="e4d37cfe6ec48a2d069cc0bbb8b078677e9a0d8df3a027c4d8ea131130c4265f"
       - CONFIG_UPDATEHUB_POLL_INTERVAL=1
diff --git a/samples/subsys/modbus/rtu_server/sample.yaml b/samples/subsys/modbus/rtu_server/sample.yaml
index f69d51f4eeb..76f1eba7f44 100644
--- a/samples/subsys/modbus/rtu_server/sample.yaml
+++ b/samples/subsys/modbus/rtu_server/sample.yaml
@@ -31,6 +31,6 @@ tests:
             dt_enabled_alias_with_parent_compat("led1", "gpio-leds") and
             dt_enabled_alias_with_parent_compat("led2", "gpio-leds")
     extra_args:
-      - EXTRA_CONF_FILE="overlay-cdc-acm.conf"
+      - OVERLAY_CONFIG="overlay-cdc-acm.conf"
       - DTC_OVERLAY_FILE="cdc-acm.overlay"
     depends_on: usb_device
diff --git a/samples/subsys/shell/devmem_load/sample.yaml b/samples/subsys/shell/devmem_load/sample.yaml
index e4702ca5a96..2d59490a0eb 100644
--- a/samples/subsys/shell/devmem_load/sample.yaml
+++ b/samples/subsys/shell/devmem_load/sample.yaml
@@ -10,7 +10,7 @@ tests:
   sample.devmem_load.polled:
     integration_platforms:
       - native_sim
-    extra_args: EXTRA_CONF_FILE="prj_poll.conf"
+    extra_args: OVERLAY_CONFIG="prj_poll.conf"
   sample.devmem_load.uart.interrupt:
     integration_platforms:
       - frdm_k64f
diff --git a/samples/subsys/shell/shell_module/sample.yaml b/samples/subsys/shell/shell_module/sample.yaml
index 46c7fbb127f..62f9b30af0f 100644
--- a/samples/subsys/shell/shell_module/sample.yaml
+++ b/samples/subsys/shell/shell_module/sample.yaml
@@ -22,7 +22,7 @@ tests:
     harness: keyboard
     min_ram: 40
     extra_args:
-      - EXTRA_CONF_FILE="overlay-usb.conf"
+      - OVERLAY_CONFIG="overlay-usb.conf"
       - DTC_OVERLAY_FILE="usb.overlay"
     integration_platforms:
       - native_sim
@@ -62,7 +62,7 @@ tests:
     arch_exclude:
       - posix
     extra_args:
-      - EXTRA_CONF_FILE="overlay-bt.conf"
+      - OVERLAY_CONFIG="overlay-bt.conf"
       - DTC_OVERLAY_FILE="bt.overlay"
   sample.shell.shell_module.login:
     filter: CONFIG_SERIAL and dt_chosen_enabled("zephyr,shell-uart")
diff --git a/samples/subsys/usb/dfu/sample.yaml b/samples/subsys/usb/dfu/sample.yaml
index 122a8f63c7f..1700b087473 100644
--- a/samples/subsys/usb/dfu/sample.yaml
+++ b/samples/subsys/usb/dfu/sample.yaml
@@ -32,4 +32,4 @@ tests:
     tags: usb
   sample.usb.dfu.permanent.download:
     tags: usb
-    extra_args: EXTRA_CONF_FILE=overlay-permanent-download.conf
+    extra_args: OVERLAY_CONFIG=overlay-permanent-download.conf
diff --git a/tests/boot/mcuboot_recovery_retention/testcase.yaml b/tests/boot/mcuboot_recovery_retention/testcase.yaml
index f8d872d7a9f..8ec7fa47496 100644
--- a/tests/boot/mcuboot_recovery_retention/testcase.yaml
+++ b/tests/boot/mcuboot_recovery_retention/testcase.yaml
@@ -30,7 +30,7 @@ tests:
   bootloader.mcuboot.recovery.retention.mem:
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - EXTRA_CONF_FILE="boards/nrf52840dk_nrf52840_mem.conf"
+      - OVERLAY_CONFIG="boards/nrf52840dk_nrf52840_mem.conf"
       - DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_mem.overlay"
       - mcuboot_TARGET_OVERLAY_CONFIG="boards/nrf52840dk_nrf52840_mem.conf"
       - mcuboot_TARGET_DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_mem.overlay"
diff --git a/tests/crypto/secp256r1/testcase.yaml b/tests/crypto/secp256r1/testcase.yaml
index 0e21e0d86b5..70de8a787b2 100644
--- a/tests/crypto/secp256r1/testcase.yaml
+++ b/tests/crypto/secp256r1/testcase.yaml
@@ -10,8 +10,8 @@ common:
     - p256-m
 tests:
   crypto.secp256r1.mbedtls:
-    extra_args: EXTRA_CONF_FILE=mbedtls.conf
+    extra_args: OVERLAY_CONFIG=mbedtls.conf
   crypto.secp256r1.p256-m_raw:
-    extra_args: EXTRA_CONF_FILE=p256-m_raw.conf
+    extra_args: OVERLAY_CONFIG=p256-m_raw.conf
   crypto.secp256r1.tinycrypt:
-    extra_args: EXTRA_CONF_FILE=tinycrypt.conf
+    extra_args: OVERLAY_CONFIG=tinycrypt.conf
diff --git a/tests/drivers/adc/adc_api/testcase.yaml b/tests/drivers/adc/adc_api/testcase.yaml
index 8227a92bec8..96a24ba2259 100644
--- a/tests/drivers/adc/adc_api/testcase.yaml
+++ b/tests/drivers/adc/adc_api/testcase.yaml
@@ -14,7 +14,7 @@ tests:
       - b_u585i_iot02a
   drivers.adc.dma_st_stm32:
     extra_args:
-      - EXTRA_CONF_FILE="overlay-dma-stm32.conf"
+      - OVERLAY_CONFIG="overlay-dma-stm32.conf"
     depends_on:
       - adc
       - dma
@@ -41,7 +41,7 @@ tests:
       - stm32h573i_dk
   drivers.adc.dma_nxp_kinetis:
     extra_args:
-      - EXTRA_CONF_FILE="overlay-dma-kinetis.conf"
+      - OVERLAY_CONFIG="overlay-dma-kinetis.conf"
     depends_on:
       - adc
       - dma
@@ -53,7 +53,7 @@ tests:
       - frdm_k82f
   drivers.adc.dma_espressif:
     extra_args:
-      - EXTRA_CONF_FILE="overlay-dma-esp32.conf"
+      - OVERLAY_CONFIG="overlay-dma-esp32.conf"
     depends_on:
       - adc
       - dma
diff --git a/tests/drivers/bbram/testcase.yaml b/tests/drivers/bbram/testcase.yaml
index f9ff3da2310..88debe7ab31 100644
--- a/tests/drivers/bbram/testcase.yaml
+++ b/tests/drivers/bbram/testcase.yaml
@@ -18,13 +18,13 @@ tests:
     integration_platforms:
       - npcx9m6f_evb
   drivers.bbram.stm32:
-    extra_args: EXTRA_CONF_FILE="stm32.conf"
+    extra_args: OVERLAY_CONFIG="stm32.conf"
     filter: dt_compat_enabled("st,stm32-bbram")
     integration_platforms:
       - nucleo_g071rb
       - stm32f746g_disco
   drivers.bbram.stm32_rtc:
-    extra_args: EXTRA_CONF_FILE="stm32_rtc.conf"
+    extra_args: OVERLAY_CONFIG="stm32_rtc.conf"
     filter: dt_compat_enabled("st,stm32-bbram")
     integration_platforms:
       - nucleo_g071rb
diff --git a/tests/drivers/build_all/sensor/testcase.yaml b/tests/drivers/build_all/sensor/testcase.yaml
index a02e59e1195..7fc17df202b 100644
--- a/tests/drivers/build_all/sensor/testcase.yaml
+++ b/tests/drivers/build_all/sensor/testcase.yaml
@@ -10,18 +10,18 @@ common:
   build_only: true
 tests:
   sensors.build.sensorhub:
-    extra_args: EXTRA_CONF_FILE=sensors_shub.conf;sensors_die_temp.conf
+    extra_args: OVERLAY_CONFIG=sensors_shub.conf;sensors_die_temp.conf
   sensors.build.trigger.own:
-    extra_args: EXTRA_CONF_FILE=sensors_trigger_own.conf;sensors_die_temp.conf
+    extra_args: OVERLAY_CONFIG=sensors_trigger_own.conf;sensors_die_temp.conf
   sensors.build.trigger.global:
-    extra_args: EXTRA_CONF_FILE=sensors_trigger_global.conf;sensors_die_temp.conf
+    extra_args: OVERLAY_CONFIG=sensors_trigger_global.conf;sensors_die_temp.conf
   sensors.build.trigger.none:
-    extra_args: EXTRA_CONF_FILE=sensors_trigger_none.conf;sensors_die_temp.conf
+    extra_args: OVERLAY_CONFIG=sensors_trigger_none.conf;sensors_die_temp.conf
   sensors.build.no_default:
-    extra_args: EXTRA_CONF_FILE=sensors_no_default.conf
+    extra_args: OVERLAY_CONFIG=sensors_no_default.conf
   sensors.build:
     tags: sensors
-    extra_args: EXTRA_CONF_FILE=sensors_die_temp.conf
+    extra_args: OVERLAY_CONFIG=sensors_die_temp.conf
     extra_configs:
       - CONFIG_UART_INTERRUPT_DRIVEN=y
   sensors.build.pm:
diff --git a/tests/drivers/eeprom/api/testcase.yaml b/tests/drivers/eeprom/api/testcase.yaml
index f91021b0e95..3f2032b6305 100644
--- a/tests/drivers/eeprom/api/testcase.yaml
+++ b/tests/drivers/eeprom/api/testcase.yaml
@@ -20,7 +20,7 @@ tests:
     # Tests overwrite EEPROM content, only run on select boards
     extra_args:
       - DTC_OVERLAY_FILE=at2x_emul.overlay
-      - EXTRA_CONF_FILE=at2x_emul.conf
+      - OVERLAY_CONFIG=at2x_emul.conf
     platform_allow:
       - native_posix
       - native_posix/native/64
diff --git a/tests/drivers/entropy/api/testcase.yaml b/tests/drivers/entropy/api/testcase.yaml
index d0e7532aa47..f875cadab42 100644
--- a/tests/drivers/entropy/api/testcase.yaml
+++ b/tests/drivers/entropy/api/testcase.yaml
@@ -10,7 +10,7 @@ tests:
       - nrf5340bsim/nrf5340/cpunet
     extra_args:
       - DTC_OVERLAY_FILE=./entropy_bt_hci.overlay
-      - EXTRA_CONF_FILE=./entropy_bt_hci.conf
+      - OVERLAY_CONFIG=./entropy_bt_hci.conf
     tags:
       - driver
       - entropy
@@ -19,7 +19,7 @@ tests:
     filter: CONFIG_BUILD_WITH_TFM
     extra_args:
       - DTC_OVERLAY_FILE=./entropy_psa_crypto.overlay
-      - EXTRA_CONF_FILE=./entropy_psa_crypto.conf
+      - OVERLAY_CONFIG=./entropy_psa_crypto.conf
     tags:
       - driver
       - entropy
diff --git a/tests/drivers/flash/common/testcase.yaml b/tests/drivers/flash/common/testcase.yaml
index 9ee460f6ed2..5c8e755dc4d 100644
--- a/tests/drivers/flash/common/testcase.yaml
+++ b/tests/drivers/flash/common/testcase.yaml
@@ -5,20 +5,20 @@ common:
 tests:
   drivers.flash.common.nrf_qspi_nor:
     platform_allow: nrf52840dk/nrf52840
-    extra_args: EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_qspi_nor.conf
+    extra_args: OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_qspi_nor.conf
     integration_platforms:
       - nrf52840dk/nrf52840
   drivers.flash.common.nrf_qspi_nor.size_in_bytes:
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_qspi_nor.conf
+      - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_qspi_nor.conf
       - DTC_OVERLAY_FILE=boards/nrf52840_size_in_bytes.overlay
     integration_platforms:
       - nrf52840dk/nrf52840
   drivers.flash.common.nrf_qspi_nor_4B_addr:
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_qspi_nor.conf
+      - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_qspi_nor.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_mx25l51245g.overlay
     harness_config:
       fixture: external_flash_mx25l51245g
@@ -26,7 +26,7 @@ tests:
       - nrf52840dk/nrf52840
   drivers.flash.common.soc_flash_nrf:
     platform_allow: nrf52840dk/nrf52840
-    extra_args: EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_soc.conf
+    extra_args: OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_soc.conf
     integration_platforms:
       - nrf52840dk/nrf52840
   drivers.flash.common.default:
@@ -73,7 +73,7 @@ tests:
   drivers.flash.common.mx25r_high_perf:
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - EXTRA_CONF_FILE=boards/nrf52840dk_flash_spi.conf
+      - OVERLAY_CONFIG=boards/nrf52840dk_flash_spi.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_mx25r_high_perf.overlay
     integration_platforms:
       - nrf52840dk/nrf52840
@@ -84,14 +84,14 @@ tests:
   drivers.flash.common.spi_nor:
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - EXTRA_CONF_FILE=boards/nrf52840dk_flash_spi.conf
+      - OVERLAY_CONFIG=boards/nrf52840dk_flash_spi.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_spi_nor.overlay
     harness_config:
       fixture: external_flash_mx25v1635f
   drivers.flash.common.spi_nor_wp_hold:
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - EXTRA_CONF_FILE=boards/nrf52840dk_flash_spi.conf
+      - OVERLAY_CONFIG=boards/nrf52840dk_flash_spi.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_spi_nor_wp_hold.overlay
     harness_config:
       fixture: external_flash_mx25v1635f
diff --git a/tests/drivers/retained_mem/api/testcase.yaml b/tests/drivers/retained_mem/api/testcase.yaml
index 1f2e228ee01..f6b6844a1b4 100644
--- a/tests/drivers/retained_mem/api/testcase.yaml
+++ b/tests/drivers/retained_mem/api/testcase.yaml
@@ -19,7 +19,7 @@ tests:
     platform_allow: nrf52840dk/nrf52840
     extra_args:
       - DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_ram.overlay"
-      - EXTRA_CONF_FILE="boards/nrf52840dk_nrf52840_ram.conf"
+      - OVERLAY_CONFIG="boards/nrf52840dk_nrf52840_ram.conf"
     tags:
       - drivers
       - retained_mem
diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml
index 47d2ec28178..5760aa0d879 100644
--- a/tests/drivers/spi/spi_loopback/testcase.yaml
+++ b/tests/drivers/spi/spi_loopback/testcase.yaml
@@ -35,12 +35,12 @@ tests:
       - mimxrt1170_evk/mimxrt1176/cm7
   drivers.spi.mcux_dspi_dma.loopback:
     extra_args:
-      - EXTRA_CONF_FILE="overlay-mcux-dspi-dma.conf"
+      - OVERLAY_CONFIG="overlay-mcux-dspi-dma.conf"
       - DTC_OVERLAY_FILE="overlay-mcux-dspi-dma.overlay"
     platform_allow: frdm_k64f
   drivers.spi.sam_spi_dma.loopback:
     extra_args:
-      - EXTRA_CONF_FILE="overlay-sam-spi-dma.conf"
+      - OVERLAY_CONFIG="overlay-sam-spi-dma.conf"
       - DTC_OVERLAY_FILE="overlay-sam-spi-dma.overlay"
     platform_allow:
       - sam_e70_xplained/same70q21
@@ -50,7 +50,7 @@ tests:
       - sam_e70_xplained/same70q21
   drivers.spi.stm32_spi_16bits_frames.loopback:
     extra_args:
-      - EXTRA_CONF_FILE="overlay-stm32-spi-16bits.conf"
+      - OVERLAY_CONFIG="overlay-stm32-spi-16bits.conf"
       - DTC_OVERLAY_FILE="overlay-stm32-spi-16bits.overlay"
     filter: CONFIG_SOC_FAMILY_STM32
     platform_allow:
@@ -59,7 +59,7 @@ tests:
       - nucleo_h745zi_q/stm32h745xx/m4
       - nucleo_h745zi_q/stm32h745xx/m7
   drivers.spi.stm32_spi_dma.loopback:
-    extra_args: EXTRA_CONF_FILE="overlay-stm32-spi-dma.conf"
+    extra_args: OVERLAY_CONFIG="overlay-stm32-spi-dma.conf"
     filter: CONFIG_SOC_FAMILY_STM32
     platform_allow:
       - b_u585i_iot02a
@@ -82,7 +82,7 @@ tests:
     # this test case is for when nocache memory region is defined in DT
     # using `zephyr,memory-attr = < DT_MEM_ARM_MPU_RAM_NOCACHE)>`
     extra_args:
-      - EXTRA_CONF_FILE="overlay-stm32-spi-dma-dt-nocache-mem.conf"
+      - OVERLAY_CONFIG="overlay-stm32-spi-dma-dt-nocache-mem.conf"
     filter: CONFIG_SOC_FAMILY_STM32 and CONFIG_CPU_HAS_DCACHE
     platform_allow:
       - nucleo_h743zi
@@ -91,7 +91,7 @@ tests:
       - nucleo_h745zi_q/stm32h745xx/m7
   drivers.spi.stm32_spi_16bits_frames_dma.loopback:
     extra_args:
-      - EXTRA_CONF_FILE="overlay-stm32-spi-16bits-dma.conf"
+      - OVERLAY_CONFIG="overlay-stm32-spi-16bits-dma.conf"
       - DTC_OVERLAY_FILE="overlay-stm32-spi-16bits.overlay"
     filter: CONFIG_SOC_FAMILY_STM32
     platform_allow:
@@ -101,7 +101,7 @@ tests:
       - nucleo_h745zi_q/stm32h745xx/m7
   drivers.spi.stm32_spi_16bits_frames_dma_dt_nocache_mem.loopback:
     extra_args:
-      - EXTRA_CONF_FILE="overlay-stm32-spi-16bits-dma-dt-nocache-mem.conf"
+      - OVERLAY_CONFIG="overlay-stm32-spi-16bits-dma-dt-nocache-mem.conf"
       - DTC_OVERLAY_FILE="overlay-stm32-spi-16bits.overlay"
     filter: CONFIG_SOC_FAMILY_STM32 and CONFIG_CPU_HAS_DCACHE
     platform_allow:
@@ -110,7 +110,7 @@ tests:
       - nucleo_h745zi_q/stm32h745xx/m4
       - nucleo_h745zi_q/stm32h745xx/m7
   drivers.spi.stm32_spi_interrupt.loopback:
-    extra_args: EXTRA_CONF_FILE="overlay-stm32-spi-interrupt.conf"
+    extra_args: OVERLAY_CONFIG="overlay-stm32-spi-interrupt.conf"
     filter: CONFIG_SOC_FAMILY_STM32
     platform_allow:
       - b_u585i_iot02a
@@ -129,7 +129,7 @@ tests:
       - stm32f3_disco
       - stm32h573i_dk
   drivers.spi.gd32_spi_interrupt.loopback:
-    extra_args: EXTRA_CONF_FILE="overlay-gd32-spi-interrupt.conf"
+    extra_args: OVERLAY_CONFIG="overlay-gd32-spi-interrupt.conf"
     platform_allow:
       - gd32f403z_eval
       - gd32f407v_start
@@ -142,7 +142,7 @@ tests:
       - longan_nano
       - longan_nano/gd32vf103/lite
   drivers.spi.gd32_spi_dma.loopback:
-    extra_args: EXTRA_CONF_FILE="overlay-gd32-spi-dma.conf"
+    extra_args: OVERLAY_CONFIG="overlay-gd32-spi-dma.conf"
     platform_allow:
       - gd32f403z_eval
       - gd32f407v_start
@@ -202,5 +202,5 @@ tests:
       - frdm_ke17z
       - frdm_ke17z512
   drivers.spi.max32_dma.loopback:
-    extra_args: EXTRA_CONF_FILE="overlay-max32-spi-dma.conf"
+    extra_args: OVERLAY_CONFIG="overlay-max32-spi-dma.conf"
     filter: CONFIG_SOC_FAMILY_MAX32
diff --git a/tests/drivers/uart/uart_basic_api/testcase.yaml b/tests/drivers/uart/uart_basic_api/testcase.yaml
index 45bb49c04a5..8a6c9210ace 100644
--- a/tests/drivers/uart/uart_basic_api/testcase.yaml
+++ b/tests/drivers/uart/uart_basic_api/testcase.yaml
@@ -39,7 +39,7 @@ tests:
       - mps2/an385
   drivers.uart.basic_api.cdc_acm:
     extra_args:
-      - EXTRA_CONF_FILE="overlay-usb.conf"
+      - OVERLAY_CONFIG="overlay-usb.conf"
       - DTC_OVERLAY_FILE="usb.overlay"
     tags:
       - drivers
diff --git a/tests/drivers/watchdog/wdt_basic_api/testcase.yaml b/tests/drivers/watchdog/wdt_basic_api/testcase.yaml
index ce0dd4fe287..8736f0c20eb 100644
--- a/tests/drivers/watchdog/wdt_basic_api/testcase.yaml
+++ b/tests/drivers/watchdog/wdt_basic_api/testcase.yaml
@@ -80,7 +80,7 @@ tests:
   drivers.watchdog.counter_watchdog:
     platform_allow: nrf52840dk/nrf52840
     extra_args:
-      - EXTRA_CONF_FILE="boards/nrf52840dk_nrf52840_counter.conf"
+      - OVERLAY_CONFIG="boards/nrf52840dk_nrf52840_counter.conf"
       - DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_counter.overlay"
   drivers.watchdog.gd32fwdgt:
     filter: dt_compat_enabled("gd,gd32-fwdgt")
diff --git a/tests/lib/gui/lvgl/testcase.yaml b/tests/lib/gui/lvgl/testcase.yaml
index 16533041fac..db356ec5569 100644
--- a/tests/lib/gui/lvgl/testcase.yaml
+++ b/tests/lib/gui/lvgl/testcase.yaml
@@ -84,6 +84,6 @@ tests:
       - CONFIG_DUMMY_DISPLAY=n
     extra_args:
       - SHIELD=st_b_lcd40_dsi1_mb1166
-      - EXTRA_CONF_FILE=prj_blk.conf
+      - OVERLAY_CONFIG=prj_blk.conf
     tags:
       - shield
diff --git a/tests/modules/thrift/ThriftTest/testcase.yaml b/tests/modules/thrift/ThriftTest/testcase.yaml
index 820714408cb..9933f2e3a38 100644
--- a/tests/modules/thrift/ThriftTest/testcase.yaml
+++ b/tests/modules/thrift/ThriftTest/testcase.yaml
@@ -20,4 +20,4 @@ tests:
     extra_configs:
       - CONFIG_THRIFT_COMPACT_PROTOCOL=y
   thrift.ThriftTest.newlib.tlsTransport:
-    extra_args: EXTRA_CONF_FILE="overlay-tls.conf"
+    extra_args: OVERLAY_CONFIG="overlay-tls.conf"
diff --git a/tests/net/lib/tls_credentials/testcase.yaml b/tests/net/lib/tls_credentials/testcase.yaml
index 1e812e2164b..2971f1b3b7c 100644
--- a/tests/net/lib/tls_credentials/testcase.yaml
+++ b/tests/net/lib/tls_credentials/testcase.yaml
@@ -6,7 +6,7 @@ tests:
     depends_on: netif
   net.tls_credentials.trusted_tfm:
     filter: CONFIG_BUILD_WITH_TFM
-    extra_args: EXTRA_CONF_FILE=./prj_trusted_tfm.conf
+    extra_args: OVERLAY_CONFIG=./prj_trusted_tfm.conf
     tags:
       - net
       - tls
diff --git a/tests/subsys/dfu/img_util/testcase.yaml b/tests/subsys/dfu/img_util/testcase.yaml
index f0eabc4c4f1..54b8de1320e 100644
--- a/tests/subsys/dfu/img_util/testcase.yaml
+++ b/tests/subsys/dfu/img_util/testcase.yaml
@@ -11,5 +11,5 @@ tests:
   dfu.image_util:
     tags: dfu_image_util
   dfu.image_util.progressive:
-    extra_args: EXTRA_CONF_FILE=progressively_overlay.conf
+    extra_args: OVERLAY_CONFIG=progressively_overlay.conf
     tags: dfu_image_util
diff --git a/tests/subsys/logging/log_switch_format/testcase.yaml b/tests/subsys/logging/log_switch_format/testcase.yaml
index 07540075917..bc1f1e933b7 100644
--- a/tests/subsys/logging/log_switch_format/testcase.yaml
+++ b/tests/subsys/logging/log_switch_format/testcase.yaml
@@ -15,7 +15,7 @@ tests:
     integration_platforms:
       - mps2/an385
       - qemu_x86
-    extra_args: EXTRA_CONF_FILE=overlay_deferred.conf
+    extra_args: OVERLAY_CONFIG=overlay_deferred.conf
     # "CONFIG_FULL_LIBC_SUPPORTED" filter was applied
     # because of following chain of dependencies:
     # LOG_MIPI_SYST_ENABLE=y --> CONFIG_MIPI_SYST_LIB --> \
@@ -26,7 +26,7 @@ tests:
     extra_configs:
       - CONFIG_REQUIRES_FULL_LIBC=y
   logging.format.switch.immediate:
-    extra_args: EXTRA_CONF_FILE=overlay_immediate.conf
+    extra_args: OVERLAY_CONFIG=overlay_immediate.conf
     integration_platforms:
       - mps2/an385
       - qemu_x86
@@ -34,7 +34,7 @@ tests:
     extra_configs:
       - CONFIG_REQUIRES_FULL_LIBC=y
   logging.format.switch.custom_output:
-    extra_args: EXTRA_CONF_FILE=overlay_custom_output.conf
+    extra_args: OVERLAY_CONFIG=overlay_custom_output.conf
     integration_platforms:
       - mps2/an385
       - qemu_x86
diff --git a/tests/subsys/mgmt/mcumgr/all_options/testcase.yaml b/tests/subsys/mgmt/mcumgr/all_options/testcase.yaml
index 1708d7e7869..f21fad9510f 100644
--- a/tests/subsys/mgmt/mcumgr/all_options/testcase.yaml
+++ b/tests/subsys/mgmt/mcumgr/all_options/testcase.yaml
@@ -14,4 +14,4 @@ tests:
   mgmt.mcumgr.all.options: {}
   mgmt.mcumgr.all.options.other:
     extra_args:
-      - EXTRA_CONF_FILE="other-options.conf"
+      - OVERLAY_CONFIG="other-options.conf"
diff --git a/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml b/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml
index 91ba348e02b..b7aeddd6c05 100644
--- a/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml
+++ b/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml
@@ -21,10 +21,10 @@ common:
 tests:
   mgmt.mcumgr.fs.mgmt.hash.supported.crc32:
     extra_args: >
-      EXTRA_CONF_FILE="configuration/crc32.conf"
+      OVERLAY_CONFIG="configuration/crc32.conf"
   mgmt.mcumgr.fs.mgmt.hash.supported.sha256:
     extra_args: >
-      EXTRA_CONF_FILE="configuration/sha256.conf"
+      OVERLAY_CONFIG="configuration/sha256.conf"
   mgmt.mcumgr.fs.mgmt.hash.supported.all:
     extra_args: >
-      EXTRA_CONF_FILE="configuration/all.conf"
+      OVERLAY_CONFIG="configuration/all.conf"
diff --git a/tests/subsys/mgmt/mcumgr/handler_demo/testcase.yaml b/tests/subsys/mgmt/mcumgr/handler_demo/testcase.yaml
index a4dfe3bc0bd..dbd18f8d1c5 100644
--- a/tests/subsys/mgmt/mcumgr/handler_demo/testcase.yaml
+++ b/tests/subsys/mgmt/mcumgr/handler_demo/testcase.yaml
@@ -18,7 +18,7 @@ tests:
     build_only: true
   mgmt.mcumgr.handler.demo.module:
     extra_args:
-      - EXTRA_CONF_FILE="module.conf"
+      - OVERLAY_CONFIG="module.conf"
     platform_allow:
       - nrf52840dk/nrf52840
     integration_platforms:
diff --git a/tests/subsys/pm/power_mgmt/testcase.yaml b/tests/subsys/pm/power_mgmt/testcase.yaml
index 9f87ac0d666..8c4a1c92e3d 100644
--- a/tests/subsys/pm/power_mgmt/testcase.yaml
+++ b/tests/subsys/pm/power_mgmt/testcase.yaml
@@ -5,4 +5,4 @@ tests:
   pm.system: {}
   pm.system.no.device.pm:
     extra_args:
-      - EXTRA_CONF_FILE="no-device-pm.conf"
+      - OVERLAY_CONFIG="no-device-pm.conf"
diff --git a/tests/subsys/settings/functional/nvs/testcase.yaml b/tests/subsys/settings/functional/nvs/testcase.yaml
index d9f2f8d2f2f..8abb0039b19 100644
--- a/tests/subsys/settings/functional/nvs/testcase.yaml
+++ b/tests/subsys/settings/functional/nvs/testcase.yaml
@@ -20,7 +20,7 @@ tests:
       - settings
       - nvs
   settings.functional.nvs.dk:
-    extra_args: EXTRA_CONF_FILE=mpu.conf
+    extra_args: OVERLAY_CONFIG=mpu.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
diff --git a/tests/subsys/storage/flash_map/testcase.yaml b/tests/subsys/storage/flash_map/testcase.yaml
index 7d4f8ba074a..11c43dcac62 100644
--- a/tests/subsys/storage/flash_map/testcase.yaml
+++ b/tests/subsys/storage/flash_map/testcase.yaml
@@ -13,7 +13,7 @@ tests:
     integration_platforms:
       - native_sim
   storage.flash_map.mpu:
-    extra_args: EXTRA_CONF_FILE=overlay-mpu.conf
+    extra_args: OVERLAY_CONFIG=overlay-mpu.conf
     timeout: 120
     platform_allow:
       - nrf52840dk/nrf52840
@@ -25,7 +25,7 @@ tests:
       - nrf52840dk/nrf52840
     tags: flash_map
   storage.flash_map.mbedtls:
-    extra_args: EXTRA_CONF_FILE=overlay-mbedtls.conf
+    extra_args: OVERLAY_CONFIG=overlay-mbedtls.conf
     platform_allow:
       - nrf51dk/nrf51822
       - qemu_x86
@@ -38,7 +38,7 @@ tests:
     integration_platforms:
       - native_sim
   storage.flash_map.psa:
-    extra_args: EXTRA_CONF_FILE=overlay-psa.conf
+    extra_args: OVERLAY_CONFIG=overlay-psa.conf
     platform_allow:
       - nrf51dk/nrf51822
       - native_posix

From 2eb789118f6c34dd9993ef883e533846cacdb41b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:16 +0100
Subject: [PATCH 1235/2913] Revert "[nrf fromtree] samples: net: sockets:
 echo_server: Add 802154-subg test"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8d80b676bb60aea17c55b2edf40f9f05ca8cbd84.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/net/sockets/echo_server/sample.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/samples/net/sockets/echo_server/sample.yaml b/samples/net/sockets/echo_server/sample.yaml
index 949b34e9cbb..b1f2b6009e2 100644
--- a/samples/net/sockets/echo_server/sample.yaml
+++ b/samples/net/sockets/echo_server/sample.yaml
@@ -142,6 +142,3 @@ tests:
       - native_sim/native/64
     extra_args:
       - OVERLAY_CONFIG="overlay-nsos.conf"
-  sample.net.sockets.echo_server.802154.subg:
-    extra_args: EXTRA_CONF_FILE="overlay-802154-subg.conf"
-    platform_allow: beagleconnect_freedom

From 8410792dac9d3c20a2303ad6af282dee166ead81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:16 +0100
Subject: [PATCH 1236/2913] Revert "[nrf fromtree] tests: drivers: spi:
 spi_controller_peripheral: Add nrf54h20dk cpuppr"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ffb3d0d6b60c9ea2abf9663e7fb28eebe800b31c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuppr.overlay    |  6 ------
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay    | 16 ----------------
 .../sysbuild/vpr_launcher/prj.conf               |  1 -
 .../spi/spi_controller_peripheral/testcase.yaml  |  5 ++---
 4 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
 delete mode 100644 tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 delete mode 100644 tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/prj.conf

diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
deleted file mode 100644
index 83d3121c189..00000000000
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include "nrf54h20dk_nrf54h20_common.dtsi"
diff --git a/tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index 4343187f21f..00000000000
--- a/tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include "../../../boards/nrf54h20dk_nrf54h20_common.dtsi"
-
-&spi130 {
-	status = "reserved";
-	interrupt-parent = <&cpuppr_clic>;
-};
-
-&dut_spis {
-	status = "reserved";
-	interrupt-parent = <&cpuppr_clic>;
-};
diff --git a/tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/prj.conf b/tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/prj.conf
deleted file mode 100644
index b2a4ba59104..00000000000
--- a/tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/prj.conf
+++ /dev/null
@@ -1 +0,0 @@
-# nothing here
diff --git a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
index e55a6a6a69d..675259a4dd0 100644
--- a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
+++ b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
@@ -5,8 +5,8 @@ common:
   harness_config:
     fixture: gpio_spi_loopback
   platform_allow: |
-    nrf52840dk/nrf52840 nrf54l15dk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp
-    nrf54h20dk/nrf54h20/cpurad nrf54h20dk/nrf54h20/cpuppr
+    nrf52840dk/nrf52840 nrf54l15dk/nrf54l15/cpuapp
+    nrf54h20dk/nrf54h20/cpuapp nrf54h20dk/nrf54h20/cpurad
 
 tests:
   drivers.spi.spi_mode0:
@@ -57,4 +57,3 @@ tests:
       - nrf52840dk/nrf52840
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
-      - nrf54h20dk/nrf54h20/cpuppr

From e982ec3ec913ee58f5d5772733cad404971865b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:16 +0100
Subject: [PATCH 1237/2913] Revert "[nrf fromlist] modules: hal_nordic: nrfs:
 Optimize communication"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c3b324172acc815831f9d5b53edf8e090d64e86f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c b/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c
index bf5dec9fe16..129098e9b2d 100644
--- a/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c
+++ b/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c
@@ -176,10 +176,7 @@ nrfs_err_t nrfs_backend_send(void *message, size_t size)
 
 nrfs_err_t nrfs_backend_send_ex(void *message, size_t size, k_timeout_t timeout, bool high_prio)
 {
-	if (!k_is_in_isr() && nrfs_backend_connected()) {
-		return ipc_service_send(&ipc_cpusys_channel_config.ipc_ept, message, size) ?
-			NRFS_SUCCESS : NRFS_ERR_IPC;
-	} else if (size <= MAX_PACKET_DATA_SIZE) {
+	if (size <= MAX_PACKET_DATA_SIZE) {
 		int err;
 		struct ipc_data_packet tx_data;
 

From e96adb90945053258c8c43a2061f299f83f6af5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:16 +0100
Subject: [PATCH 1238/2913] Revert "[nrf fromlist] tests: drivers:
 clock_control: nrf: add global hsfll clock"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0f2b574e26e65fcd5aaf0b0758595913c4514527.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf_clock_control/src/main.c              | 36 ++-----------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/tests/drivers/clock_control/nrf_clock_control/src/main.c b/tests/drivers/clock_control/nrf_clock_control/src/main.c
index 1f12969eb3d..60cb9549f3d 100644
--- a/tests/drivers/clock_control/nrf_clock_control/src/main.c
+++ b/tests/drivers/clock_control/nrf_clock_control/src/main.c
@@ -104,29 +104,6 @@ static const struct test_clk_context cpurad_hsfll_test_clk_contexts[] = {
 };
 #endif
 
-const struct nrf_clock_spec test_clk_specs_global_hsfll[] = {
-	{
-		.frequency = MHZ(320),
-	},
-	{
-		.frequency = MHZ(256),
-	},
-	{
-		.frequency = MHZ(128),
-	},
-	{
-		.frequency = MHZ(64),
-	},
-};
-
-static const struct test_clk_context global_hsfll_test_clk_contexts[] = {
-	{
-		.clk_dev = DEVICE_DT_GET(DT_NODELABEL(hsfll120)),
-		.clk_specs = test_clk_specs_global_hsfll,
-		.clk_specs_size = ARRAY_SIZE(test_clk_specs_global_hsfll),
-	},
-};
-
 const struct nrf_clock_spec test_clk_specs_lfclk[] = {
 	{
 		.frequency = 32768,
@@ -174,10 +151,8 @@ static void test_request_release_clock_spec(const struct device *clk_dev,
 	zassert_ok(ret);
 	zassert_ok(res);
 	ret = clock_control_get_rate(clk_dev, NULL, &rate);
-	if (ret != -ENOSYS) {
-		zassert_ok(ret);
-		zassert_equal(rate, clk_spec->frequency);
-	}
+	zassert_ok(ret);
+	zassert_equal(rate, clk_spec->frequency);
 	k_msleep(1000);
 	ret = nrf_clock_control_release(clk_dev, clk_spec);
 	zassert_equal(ret, ONOFF_STATE_ON);
@@ -274,13 +249,6 @@ ZTEST(nrf2_clock_control, test_lfclk_control)
 	test_clock_control_request(lfclk_test_clk_contexts, ARRAY_SIZE(lfclk_test_clk_contexts));
 }
 
-ZTEST(nrf2_clock_control, test_global_hsfll_control)
-{
-	TC_PRINT("Global HSFLL test\n");
-	test_clock_control_request(global_hsfll_test_clk_contexts,
-				   ARRAY_SIZE(global_hsfll_test_clk_contexts));
-}
-
 ZTEST(nrf2_clock_control, test_safe_request_cancellation)
 {
 	int ret = 0;

From ce4cb961a4aa89be6f47f8707bef7df3afe101d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:16 +0100
Subject: [PATCH 1239/2913] Revert "[nrf fromlist] samples: boards: nordic:
 clock_control: support global hsfll"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 06ebfd2185c06281f2b3cf8e1529a631148c474f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nordic/clock_control/configs/global_hsfll.conf   |  6 ------
 .../clock_control/configs/global_hsfll.overlay       | 11 -----------
 samples/boards/nordic/clock_control/sample.yaml      | 12 ------------
 3 files changed, 29 deletions(-)
 delete mode 100644 samples/boards/nordic/clock_control/configs/global_hsfll.conf
 delete mode 100644 samples/boards/nordic/clock_control/configs/global_hsfll.overlay

diff --git a/samples/boards/nordic/clock_control/configs/global_hsfll.conf b/samples/boards/nordic/clock_control/configs/global_hsfll.conf
deleted file mode 100644
index 53eebac30be..00000000000
--- a/samples/boards/nordic/clock_control/configs/global_hsfll.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_CLOCK_CONTROL=y
-
-CONFIG_SAMPLE_CLOCK_FREQUENCY_HZ=320000000
diff --git a/samples/boards/nordic/clock_control/configs/global_hsfll.overlay b/samples/boards/nordic/clock_control/configs/global_hsfll.overlay
deleted file mode 100644
index 24585f5a5c6..00000000000
--- a/samples/boards/nordic/clock_control/configs/global_hsfll.overlay
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/{
-	aliases {
-		sample-clock = &hsfll120;
-	};
-};
diff --git a/samples/boards/nordic/clock_control/sample.yaml b/samples/boards/nordic/clock_control/sample.yaml
index 820ad0de75f..dd2cfe86c41 100644
--- a/samples/boards/nordic/clock_control/sample.yaml
+++ b/samples/boards/nordic/clock_control/sample.yaml
@@ -29,15 +29,3 @@ tests:
     extra_args:
       - CONF_FILE="configs/cpuapp_hsfll.conf"
       - DTC_OVERLAY_FILE="configs/cpuapp_hsfll.overlay"
-  sample.boards.nrf.clock_control.global_hsfll:
-    filter: dt_nodelabel_enabled("hsfll120")
-    extra_args:
-      - CONF_FILE="configs/global_hsfll.conf"
-      - DTC_OVERLAY_FILE="configs/global_hsfll.overlay"
-  sample.boards.nrf.clock_control.global_hsfll.req_low_freq_n:
-    filter: dt_nodelabel_enabled("hsfll120")
-    extra_configs:
-      - CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_REQ_LOW_FREQ=n
-    extra_args:
-      - CONF_FILE="configs/global_hsfll.conf"
-      - DTC_OVERLAY_FILE="configs/global_hsfll.overlay"

From 493df95b4dc18da0168aa77d2c5fa729353a3feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:16 +0100
Subject: [PATCH 1240/2913] Revert "[nrf fromlist] dts: bindings: update
 nrf-hsfll to nrf-hsfll-local"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d5173debd5f599d4bc092d0ea54c3ff79784dcb5.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/clock_control/clock_control_nrf2_hsfll.c       |  2 +-
 ...rdic,nrf-hsfll-local.yaml => nordic,nrf-hsfll.yaml} | 10 +++++-----
 dts/common/nordic/nrf54h20.dtsi                        |  4 ++--
 dts/common/nordic/nrf9280.dtsi                         |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename dts/bindings/clock/{nordic,nrf-hsfll-local.yaml => nordic,nrf-hsfll.yaml} (83%)

diff --git a/drivers/clock_control/clock_control_nrf2_hsfll.c b/drivers/clock_control/clock_control_nrf2_hsfll.c
index b0d0ff364b3..026edf9abbd 100644
--- a/drivers/clock_control/clock_control_nrf2_hsfll.c
+++ b/drivers/clock_control/clock_control_nrf2_hsfll.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define DT_DRV_COMPAT nordic_nrf_hsfll_local
+#define DT_DRV_COMPAT nordic_nrf_hsfll
 
 #include "clock_control_nrf2_common.h"
 #include <zephyr/devicetree.h>
diff --git a/dts/bindings/clock/nordic,nrf-hsfll-local.yaml b/dts/bindings/clock/nordic,nrf-hsfll.yaml
similarity index 83%
rename from dts/bindings/clock/nordic,nrf-hsfll-local.yaml
rename to dts/bindings/clock/nordic,nrf-hsfll.yaml
index 01d0dd7aa3a..f1077dbc4f0 100644
--- a/dts/bindings/clock/nordic,nrf-hsfll-local.yaml
+++ b/dts/bindings/clock/nordic,nrf-hsfll.yaml
@@ -2,15 +2,15 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  Nordic nRF local HSFLL
+  Nordic nRF HSFLL
 
-  The local HSFLL mixed-mode IP generates several clock frequencies in the range
-  from 64 MHz to 400 MHz (in steps of 16 MHz).
+  The HSFLL mixed-mode IP generates several clock frequencies in the range from
+  64 MHz to 400 MHz (in steps of 16 MHz).
 
   Usage example:
 
     hsfll: clock@deadbeef {
-        compatible = "nordic,nrf-hsfll-local";
+        compatible = "nordic,nrf-hsfll";
         reg = <0xdeadbeef 0x1000>;
         clocks = <&fll16m>;
         clock-frequency = <DT_FREQ_M(320)>;
@@ -22,7 +22,7 @@ description: |
 
   Required FICR entries are for VSUP, COARSE and FINE trim values.
 
-compatible: "nordic,nrf-hsfll-local"
+compatible: "nordic,nrf-hsfll"
 
 include: [base.yaml, fixed-clock.yaml, nordic-nrf-ficr-client.yaml]
 
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index bb57f4a20aa..4ac4b2d17cf 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -259,7 +259,7 @@
 			ranges = <0x0 0x52000000 0x1000000>;
 
 			cpuapp_hsfll: clock@d000 {
-				compatible = "nordic,nrf-hsfll-local";
+				compatible = "nordic,nrf-hsfll";
 				#clock-cells = <0>;
 				reg = <0xd000 0x1000>;
 				clocks = <&fll16m>;
@@ -313,7 +313,7 @@
 			ranges = <0x0 0x53000000 0x1000000>;
 
 			cpurad_hsfll: clock@d000 {
-				compatible = "nordic,nrf-hsfll-local";
+				compatible = "nordic,nrf-hsfll";
 				#clock-cells = <0>;
 				reg = <0xd000 0x1000>;
 				clocks = <&fll16m>;
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 62b22b4fbc2..4fd64cd10be 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -149,7 +149,7 @@
 			ranges = <0x0 0x52000000 0x1000000>;
 
 			cpuapp_hsfll: clock@d000 {
-				compatible = "nordic,nrf-hsfll-local";
+				compatible = "nordic,nrf-hsfll";
 				#clock-cells = <0>;
 				reg = <0xd000 0x1000>;
 				clocks = <&fll16m>;
@@ -201,7 +201,7 @@
 			ranges = <0x0 0x53000000 0x1000000>;
 
 			cpurad_hsfll: clock@d000 {
-				compatible = "nordic,nrf-hsfll-local";
+				compatible = "nordic,nrf-hsfll";
 				#clock-cells = <0>;
 				reg = <0xd000 0x1000>;
 				clocks = <&fll16m>;

From cfc71a77b349f10223e32e6c515aeec506069444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:16 +0100
Subject: [PATCH 1241/2913] Revert "[nrf fromlist] dts: nordic: specify device
 model of global hsfll clock"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fc924f8d5ff23723c25efd967800e598d1f6c3ef.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../clock/nordic,nrf-hsfll-global.yaml        | 44 -------------------
 dts/common/nordic/nrf54h20.dtsi               |  8 +---
 2 files changed, 2 insertions(+), 50 deletions(-)
 delete mode 100644 dts/bindings/clock/nordic,nrf-hsfll-global.yaml

diff --git a/dts/bindings/clock/nordic,nrf-hsfll-global.yaml b/dts/bindings/clock/nordic,nrf-hsfll-global.yaml
deleted file mode 100644
index d743cd76679..00000000000
--- a/dts/bindings/clock/nordic,nrf-hsfll-global.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: |
-  Nordic Global HSFLL clock.
-
-  The lowest supported clock frequency is the default
-  clock frequency.
-
-  Example:
-
-    global_hsfll: global_hsfll {
-            compatible = "nordic,nrf-hsfll-global";
-            clocks = <&fll16>;
-            #clock-cells = <0>;
-            clock-frequency = <320000000>;
-            supported-clock-frequencies = <64000000
-                                           128000000
-                                           256000000
-                                           320000000>;
-    };
-
-compatible: "nordic,nrf-hsfll-global"
-
-include:
-  - "base.yaml"
-  - "clock-controller.yaml"
-
-properties:
-  clocks:
-    required: true
-
-  "#clock-cells":
-    const: 0
-
-  supported-clock-frequencies:
-    type: array
-    description: Supported clock frequencies in ascending order
-
-  clock-frequency:
-    type: int
-    description: |
-      Optional fixed frequency specified if used in fixed
-      frequency mode.
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 4ac4b2d17cf..5e019542f66 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -180,14 +180,10 @@
 		};
 
 		hsfll120: hsfll120 {
-			compatible = "nordic,nrf-hsfll-global";
+			compatible = "fixed-clock";
 			clocks = <&fll16m>;
 			#clock-cells = <0>;
-			clock-frequency = <320000000>;
-			supported-clock-frequencies = <64000000
-						       128000000
-						       256000000
-						       320000000>;
+			clock-frequency = <DT_FREQ_M(320)>;
 		};
 
 		lfclk: lfclk {

From 8abeeddbe30dc3ef48c9dca34005ba0c8edf8aad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:16 +0100
Subject: [PATCH 1242/2913] Revert "[nrf fromlist] soc: nordic: nrf54h: gpd:
 align GPD domain names"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9481ac59e9d60e1bbaf1dbe97f951f13c0cba69c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../zephyr/dt-bindings/power/nordic-nrf-gpd.h | 10 ++---
 soc/nordic/nrf54h/gpd/gpd.c                   | 42 ++-----------------
 2 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/include/zephyr/dt-bindings/power/nordic-nrf-gpd.h b/include/zephyr/dt-bindings/power/nordic-nrf-gpd.h
index e4a5b83a304..7f6952f6f0b 100644
--- a/include/zephyr/dt-bindings/power/nordic-nrf-gpd.h
+++ b/include/zephyr/dt-bindings/power/nordic-nrf-gpd.h
@@ -8,10 +8,10 @@
 #define ZEPHYR_INCLUDE_DT_BINDINGS_POWER_NORDIC_NRF_GLOBAL_PD
 
 /* numbers aligned to nrfs service identifiers */
-#define NRF_GPD_FAST_ACTIVE0 0U
-#define NRF_GPD_FAST_ACTIVE1 1U
-#define NRF_GPD_FAST_MAIN 2U
-#define NRF_GPD_SLOW_ACTIVE 3U
-#define NRF_GPD_SLOW_MAIN 4U
+#define NRF_GPD_SLOW_MAIN 2U
+#define NRF_GPD_SLOW_ACTIVE 1U
+#define NRF_GPD_FAST_MAIN 3U
+#define NRF_GPD_FAST_ACTIVE1 0U
+#define NRF_GPD_FAST_ACTIVE0 4U
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_POWER_NORDIC_NRF_GLOBAL_PD */
diff --git a/soc/nordic/nrf54h/gpd/gpd.c b/soc/nordic/nrf54h/gpd/gpd.c
index 3cee31b700e..a4d1889e53f 100644
--- a/soc/nordic/nrf54h/gpd/gpd.c
+++ b/soc/nordic/nrf54h/gpd/gpd.c
@@ -20,11 +20,9 @@
 LOG_MODULE_REGISTER(gpd, CONFIG_SOC_LOG_LEVEL);
 
 /* enforce alignment between DT<->nrfs */
-BUILD_ASSERT(GDPWR_GD_FAST_ACTIVE_0 == NRF_GPD_FAST_ACTIVE0);
-BUILD_ASSERT(GDPWR_GD_FAST_ACTIVE_1 == NRF_GPD_FAST_ACTIVE1);
-BUILD_ASSERT(GDPWR_GD_FAST_MAIN == NRF_GPD_FAST_MAIN);
-BUILD_ASSERT(GDPWR_GD_SLOW_ACTIVE == NRF_GPD_SLOW_ACTIVE);
-BUILD_ASSERT(GDPWR_GD_SLOW_MAIN == NRF_GPD_SLOW_MAIN);
+BUILD_ASSERT(GDPWR_POWER_DOMAIN_ACTIVE_FAST == NRF_GPD_FAST_ACTIVE1);
+BUILD_ASSERT(GDPWR_POWER_DOMAIN_ACTIVE_SLOW == NRF_GPD_SLOW_ACTIVE);
+BUILD_ASSERT(GDPWR_POWER_DOMAIN_MAIN_SLOW == NRF_GPD_SLOW_MAIN);
 
 struct gpd_onoff_manager {
 	struct onoff_manager mgr;
@@ -46,21 +44,11 @@ static void stop(struct onoff_manager *mgr, onoff_notify_fn notify);
 #define GPD_SERVICE_REQ_ERR BIT(3)
 static atomic_t gpd_service_status = ATOMIC_INIT(0);
 
-static struct gpd_onoff_manager fast_active0 = {
-	.id = NRF_GPD_FAST_ACTIVE0,
-	.lock = Z_MUTEX_INITIALIZER(fast_active0.lock),
-	.sem = Z_SEM_INITIALIZER(fast_active0.sem, 0, 1),
-};
 static struct gpd_onoff_manager fast_active1 = {
 	.id = NRF_GPD_FAST_ACTIVE1,
 	.lock = Z_MUTEX_INITIALIZER(fast_active1.lock),
 	.sem = Z_SEM_INITIALIZER(fast_active1.sem, 0, 1),
 };
-static struct gpd_onoff_manager fast_main = {
-	.id = NRF_GPD_FAST_MAIN,
-	.lock = Z_MUTEX_INITIALIZER(fast_main.lock),
-	.sem = Z_SEM_INITIALIZER(fast_main.sem, 0, 1),
-};
 static struct gpd_onoff_manager slow_active = {
 	.id = NRF_GPD_SLOW_ACTIVE,
 	.lock = Z_MUTEX_INITIALIZER(slow_active.lock),
@@ -78,12 +66,8 @@ static const struct onoff_transitions transitions =
 static struct gpd_onoff_manager *get_mgr(uint8_t id)
 {
 	switch (id) {
-	case NRF_GPD_FAST_ACTIVE0:
-		return &fast_active0;
 	case NRF_GPD_FAST_ACTIVE1:
 		return &fast_active1;
-	case NRF_GPD_FAST_MAIN:
-		return &fast_main;
 	case NRF_GPD_SLOW_ACTIVE:
 		return &slow_active;
 	case NRF_GPD_SLOW_MAIN:
@@ -302,21 +286,11 @@ static int nrf_gpd_pre_init(void)
 {
 	int ret;
 
-	ret = onoff_manager_init(&fast_active0.mgr, &transitions);
-	if (ret < 0) {
-		return ret;
-	}
-
 	ret = onoff_manager_init(&fast_active1.mgr, &transitions);
 	if (ret < 0) {
 		return ret;
 	}
 
-	ret = onoff_manager_init(&fast_main.mgr, &transitions);
-	if (ret < 0) {
-		return ret;
-	}
-
 	ret = onoff_manager_init(&slow_active.mgr, &transitions);
 	if (ret < 0) {
 		return ret;
@@ -348,21 +322,11 @@ static int nrf_gpd_post_init(void)
 	}
 
 	/* submit GD requests now to align collected statuses */
-	ret = nrf_gpd_sync(&fast_active0);
-	if (ret < 0) {
-		goto err;
-	}
-
 	ret = nrf_gpd_sync(&fast_active1);
 	if (ret < 0) {
 		goto err;
 	}
 
-	ret = nrf_gpd_sync(&fast_main);
-	if (ret < 0) {
-		goto err;
-	}
-
 	ret = nrf_gpd_sync(&slow_active);
 	if (ret < 0) {
 		goto err;

From 19263b3d6a7fa752d7af9e1b9ba3a6c811c5b3fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:16 +0100
Subject: [PATCH 1243/2913] Revert "[nrf fromlist] manifest: hal_nordic: update
 to include nrfs services"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1e48643065340f9b423e1b2c90b58dee9d4af4af.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 6061b2c5a05..7ff65298332 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: fae15426c6b5a1f67362d508cf51b691ae5ab4b4
+      revision: e0e48c4ec75595767a286389e2fcda72b21363b0
       path: modules/hal/nordic
       groups:
         - hal

From 2b8f6f4def421dae2756efd8d603c7e95f6011e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:16 +0100
Subject: [PATCH 1244/2913] Revert "[nrf fromtree] manifest: Update the
 hal_nordic revision to get the latest suit blob"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 404969907293917541c9205dc58d94a33199d1bd.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 7ff65298332..6e2e87c992d 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: e0e48c4ec75595767a286389e2fcda72b21363b0
+      revision: 5fbccc3fa8341d0cd5a128bc94f23ee03b763239
       path: modules/hal/nordic
       groups:
         - hal

From 525186ec1072405a7a32773593930bf003f70082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:16 +0100
Subject: [PATCH 1245/2913] Revert "[nrf fromtree] manifest: hal_nordic: Update
 to latest"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a01607b46b86643bd0bc2d09ae06f2232b3caf2c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 6e2e87c992d..14f53cc6462 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 5fbccc3fa8341d0cd5a128bc94f23ee03b763239
+      revision: ce87268bb5610b7e90acce3efa5c511e95aeeeae
       path: modules/hal/nordic
       groups:
         - hal

From 316e0d4f5a2ba6897e2a1a4bc4f9adb49be8c337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:16 +0100
Subject: [PATCH 1246/2913] Revert "[nrf fromtree] root: Remove temp file"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ca451ac1623d5d3a4deb21128bbce94688bddb13.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 we | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 we

diff --git a/we b/we
new file mode 100644
index 00000000000..e69de29bb2d

From 6930444c59a59cd641b59eeb9824048705cdac8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:17 +0100
Subject: [PATCH 1247/2913] Revert "[nrf fromtree] manifest: hal_nordic: Pull
 nRF Wi-Fi removal"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit bd49978448e4b5a3da159d9aa728104a263a9de1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 we       | 0
 west.yml | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 we

diff --git a/we b/we
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/west.yml b/west.yml
index 14f53cc6462..3e66f68d53c 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: ce87268bb5610b7e90acce3efa5c511e95aeeeae
+      revision: 54bde38c6f6ffb3780b26ae728cf79426184384e
       path: modules/hal/nordic
       groups:
         - hal

From a1b67e68ec7ea336ce3df0b6090b202b89b0d8ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:17 +0100
Subject: [PATCH 1248/2913] Revert "[nrf fromlist] soc: nordic: poweroff:
 disable remaining RAM on emul l05/l10 targets"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8798cb4caeedf0e78699cba48e4d3c7636d347a7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/common/poweroff.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/soc/nordic/common/poweroff.c b/soc/nordic/common/poweroff.c
index 8d95463e275..99a2bcfb3d6 100644
--- a/soc/nordic/common/poweroff.c
+++ b/soc/nordic/common/poweroff.c
@@ -50,15 +50,6 @@ void z_sys_poweroff(void)
 
 	/* Disable retention for all memory blocks */
 	nrfx_ram_ctrl_retention_enable_set(ram_start, ram_size, false);
-#if defined(DEVELOP_IN_NRF54L15) && defined(NRF54L05_XXAA)
-	nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 0, 0x1F8, false);
-	nrf_memconf_ramblock_ret2_mask_enable_set(NRF_MEMCONF, 0, 0x1F8, false);
-#endif
-#if defined(DEVELOP_IN_NRF54L15) && defined(NRF54L10_XXAA)
-	nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 0, 0x1C0, false);
-	nrf_memconf_ramblock_ret2_mask_enable_set(NRF_MEMCONF, 0, 0x1C0, false);
-#endif
-
 #endif
 
 #if defined(CONFIG_RETAINED_MEM_NRF_RAM_CTRL)

From d6bdca04b21cc94c2a8c45fad8816da0c2e494f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:17 +0100
Subject: [PATCH 1249/2913] Revert "[nrf noup] dfu: boot: mcuboot: Fix
 selecting wrong active slot"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d99f13efc7fe216de96ab072b353ffdbe3f96ae1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/dfu/boot/mcuboot.c | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/subsys/dfu/boot/mcuboot.c b/subsys/dfu/boot/mcuboot.c
index 4a66befaa91..a6e05700ac7 100644
--- a/subsys/dfu/boot/mcuboot.c
+++ b/subsys/dfu/boot/mcuboot.c
@@ -37,22 +37,6 @@
 #if USE_PARTITION_MANAGER
 #include <pm_config.h>
 
-#if CONFIG_MCUBOOT_APPLICATION_IMAGE_NUMBER != -1
-/* Sysbuild */
-#ifdef CONFIG_MCUBOOT
-/* lib is part of MCUboot -> operate on the primary application slot */
-#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_PRIMARY_ID
-#else
-/* TODO: Add firmware loader support */
-/* lib is part of the app -> operate on active slot */
-#if defined(CONFIG_NCS_IS_VARIANT_IMAGE)
-#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_SECONDARY_ID
-#else
-#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_PRIMARY_ID
-#endif
-#endif /* CONFIG_MCUBOOT */
-#else
-/* Legacy child/parent */
 #if CONFIG_BUILD_WITH_TFM
 	#define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE + PM_TFM_SIZE)
 #else
@@ -60,19 +44,20 @@
 #endif
 
 #ifdef CONFIG_MCUBOOT
-	/* lib is part of MCUboot -> operate on the primary application slot */
-	#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_PRIMARY_ID
+	/* lib is part of MCUboot -> operate on the primart application slot */
+	#define ACTIVE_SLOT_ID		PM_MCUBOOT_PRIMARY_ID
 #else
 	/* lib is part of the App -> operate on active slot */
 #if (PM_ADDRESS - PM_ADDRESS_OFFSET) == PM_MCUBOOT_PRIMARY_ADDRESS
-	#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_PRIMARY_ID
+	#define ACTIVE_SLOT_ID		PM_MCUBOOT_PRIMARY_ID
 #elif (PM_ADDRESS - PM_ADDRESS_OFFSET) == PM_MCUBOOT_SECONDARY_ADDRESS
-	#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_SECONDARY_ID
+	#define ACTIVE_SLOT_ID		PM_MCUBOOT_SECONDARY_ID
 #else
 	#error Missing partition definitions.
 #endif
 #endif /* CONFIG_MCUBOOT */
-#endif /* CONFIG_MCUBOOT_APPLICATION_IMAGE_NUMBER != -1 */
+
+#define ACTIVE_SLOT_FLASH_AREA_ID ACTIVE_SLOT_ID
 #else
 /* Get active partition. zephyr,code-partition chosen node must be defined */
 #define ACTIVE_SLOT_FLASH_AREA_ID DT_FIXED_PARTITION_ID(DT_CHOSEN(zephyr_code_partition))

From fee9c176ed33ad4938a35b06c3718cb9830b6834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:17 +0100
Subject: [PATCH 1250/2913] Revert "[nrf fromtree] scripts: nrf_common: Move
 MPI to sysbuild Kconfig"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6e53c5702ecb1f3dddfdc051ff487550d6c24672.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/west_commands/runners/nrf_common.py | 51 ++++++++++-----------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index 1479f254ac1..be4201a7c83 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -281,28 +281,26 @@ def program_hex(self):
                 mpi_hex_dir = Path(os.path.join(self.cfg.build_dir, 'zephyr'))
 
                 # Handle Manifest Provisioning Information
-                if self.sysbuild_conf.getboolean('SB_CONFIG_SUIT_MPI_GENERATE'):
+                if self.build_conf.getboolean('CONFIG_SUIT_MPI_GENERATE'):
                     app_mpi_hex_file = os.fspath(
-                        mpi_hex_dir / self.sysbuild_conf.get('SB_CONFIG_SUIT_MPI_APP_AREA_PATH'))
+                        mpi_hex_dir / self.build_conf.get('CONFIG_SUIT_MPI_APP_AREA_PATH'))
                     rad_mpi_hex_file = os.fspath(
-                        mpi_hex_dir / self.sysbuild_conf.get('SB_CONFIG_SUIT_MPI_RAD_AREA_PATH')
+                        mpi_hex_dir / self.build_conf.get('CONFIG_SUIT_MPI_RAD_AREA_PATH')
+                    )
+                    self.op_program(
+                        app_mpi_hex_file,
+                        'ERASE_NONE',
+                        None,
+                        defer=True,
+                        core='NRFDL_DEVICE_CORE_APPLICATION',
+                    )
+                    self.op_program(
+                        rad_mpi_hex_file,
+                        'ERASE_NONE',
+                        None,
+                        defer=True,
+                        core='NRFDL_DEVICE_CORE_NETWORK',
                     )
-                    if os.path.exists(app_mpi_hex_file):
-                        self.op_program(
-                            app_mpi_hex_file,
-                            'ERASE_NONE',
-                            None,
-                            defer=True,
-                            core='NRFDL_DEVICE_CORE_APPLICATION',
-                        )
-                    if os.path.exists(rad_mpi_hex_file):
-                        self.op_program(
-                            rad_mpi_hex_file,
-                            'ERASE_NONE',
-                            None,
-                            defer=True,
-                            core='NRFDL_DEVICE_CORE_NETWORK',
-                        )
 
                 # Handle SUIT root manifest if application manifests are not used.
                 # If an application firmware is built, the root envelope is merged
@@ -311,14 +309,13 @@ def program_hex(self):
                     app_root_envelope_hex_file = os.fspath(
                         mpi_hex_dir / 'suit_installed_envelopes_application_merged.hex'
                     )
-                    if os.path.exists(app_root_envelope_hex_file):
-                        self.op_program(
-                            app_root_envelope_hex_file,
-                            'ERASE_NONE',
-                            None,
-                            defer=True,
-                            core='NRFDL_DEVICE_CORE_APPLICATION',
-                        )
+                    self.op_program(
+                        app_root_envelope_hex_file,
+                        'ERASE_NONE',
+                        None,
+                        defer=True,
+                        core='NRFDL_DEVICE_CORE_APPLICATION',
+                    )
 
             if cpuapp:
                 if not self.erase and self.build_conf.getboolean('CONFIG_NRF_REGTOOL_GENERATE_UICR'):

From ba499fc8c97899cf021943a416fc593e0c192e00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:17 +0100
Subject: [PATCH 1251/2913] Revert "[nrf fromtree] scripts: west_commands:
 runners: Fix line-too-long (E501)"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8a8c01aa5d4ac6f99ac228db4d6f3b216345cfe5.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/west_commands/runners/bossac.py       |  4 +-
 .../west_commands/runners/canopen_program.py  |  6 +-
 scripts/west_commands/runners/core.py         | 21 +++----
 scripts/west_commands/runners/ezflashcli.py   |  4 +-
 scripts/west_commands/runners/intel_adsp.py   |  3 +-
 .../west_commands/runners/intel_cyclonev.py   | 16 ++---
 scripts/west_commands/runners/jlink.py        | 58 ++++++++-----------
 scripts/west_commands/runners/linkserver.py   | 13 ++---
 scripts/west_commands/runners/mdb.py          | 11 ++--
 scripts/west_commands/runners/nrf_common.py   | 41 +++----------
 scripts/west_commands/runners/openocd.py      |  3 +-
 scripts/west_commands/runners/pyocd.py        |  3 +-
 scripts/west_commands/runners/renode-robot.py |  3 +-
 scripts/west_commands/runners/renode.py       |  3 +-
 .../west_commands/runners/silabs_commander.py |  3 +-
 scripts/west_commands/runners/spi_burn.py     | 21 ++-----
 .../runners/stm32cubeprogrammer.py            |  5 +-
 17 files changed, 70 insertions(+), 148 deletions(-)

diff --git a/scripts/west_commands/runners/bossac.py b/scripts/west_commands/runners/bossac.py
index ad456d9b49d..fcbd6fdf92b 100644
--- a/scripts/west_commands/runners/bossac.py
+++ b/scripts/west_commands/runners/bossac.py
@@ -151,9 +151,7 @@ def get_image_offset(self, supports_offset):
 
     def is_gnu_coreutils_stty(self):
         try:
-            result = subprocess.run(
-                ['stty', '--version'], capture_output=True, text=True, check=True
-            )
+            result = subprocess.run(['stty', '--version'], capture_output=True, text=True, check=True)
             return 'coreutils' in result.stdout
         except subprocess.CalledProcessError:
             return False
diff --git a/scripts/west_commands/runners/canopen_program.py b/scripts/west_commands/runners/canopen_program.py
index e55aec968da..5b4c055fa8b 100644
--- a/scripts/west_commands/runners/canopen_program.py
+++ b/scripts/west_commands/runners/canopen_program.py
@@ -112,10 +112,8 @@ def do_add_parser(cls, parser):
         parser.add_argument('--sdo-timeout', type=float, default=DEFAULT_SDO_TIMEOUT,
                             help=f'''CANopen SDO response timeout in seconds
                             (default: {DEFAULT_SDO_TIMEOUT})''')
-        parser.add_argument('--download-buffer-size', type=int,
-                            default=DEFAULT_PROGRAM_DOWNLOAD_BUFFER_SIZE,
-                            help=f'''Program download buffer size in bytes
-                            (default: {DEFAULT_PROGRAM_DOWNLOAD_BUFFER_SIZE})''')
+        parser.add_argument('--download-buffer-size', type=int, default=DEFAULT_PROGRAM_DOWNLOAD_BUFFER_SIZE,
+                            help=f'Program download buffer size in bytes (default: {DEFAULT_PROGRAM_DOWNLOAD_BUFFER_SIZE})')
         parser.add_argument('--block-transfer', default=False, action='store_true',
                             help='Use SDO block transfers (experimental, default: no)')
 
diff --git a/scripts/west_commands/runners/core.py b/scripts/west_commands/runners/core.py
index 81838f95fdc..6126cb6a398 100644
--- a/scripts/west_commands/runners/core.py
+++ b/scripts/west_commands/runners/core.py
@@ -577,22 +577,16 @@ def add_parser(cls, parser):
         else:
             parser.add_argument('--elf-file',
                                 metavar='FILE',
-                                action=(partial(depr_action, cls=cls,
-                                                replacement='-f/--file') if caps.file else None),
-                                help='path to zephyr.elf'
-                                if not caps.file else 'Deprecated, use -f/--file instead.')
+                                action=(partial(depr_action, cls=cls, replacement='-f/--file') if caps.file else None),
+                                help='path to zephyr.elf' if not caps.file else 'Deprecated, use -f/--file instead.')
             parser.add_argument('--hex-file',
                                 metavar='FILE',
-                                action=(partial(depr_action, cls=cls,
-                                                replacement='-f/--file') if caps.file else None),
-                                help='path to zephyr.hex'
-                                if not caps.file else 'Deprecated, use -f/--file instead.')
+                                action=(partial(depr_action, cls=cls, replacement='-f/--file') if caps.file else None),
+                                help='path to zephyr.hex' if not caps.file else 'Deprecated, use -f/--file instead.')
             parser.add_argument('--bin-file',
                                 metavar='FILE',
-                                action=(partial(depr_action, cls=cls,
-                                                replacement='-f/--file') if caps.file else None),
-                                help='path to zephyr.bin'
-                                if not caps.file else 'Deprecated, use -f/--file instead.')
+                                action=(partial(depr_action, cls=cls, replacement='-f/--file') if caps.file else None),
+                                help='path to zephyr.bin' if not caps.file else 'Deprecated, use -f/--file instead.')
 
         parser.add_argument('--erase', '--no-erase', nargs=0,
                             action=_ToggleAction,
@@ -618,8 +612,7 @@ def add_parser(cls, parser):
         if caps.rtt:
             parser.add_argument('--rtt-address', dest='rtt_address',
                                 type=lambda x: int(x, 0),
-                                help="""address of RTT control block. If not supplied,
-                                it will be autodetected if possible""")
+                                help="address of RTT control block. If not supplied, it will be autodetected if possible")
         else:
             parser.add_argument('--rtt-address', help=argparse.SUPPRESS)
 
diff --git a/scripts/west_commands/runners/ezflashcli.py b/scripts/west_commands/runners/ezflashcli.py
index 39b68ab80e7..ca3c226dbbf 100644
--- a/scripts/west_commands/runners/ezflashcli.py
+++ b/scripts/west_commands/runners/ezflashcli.py
@@ -84,9 +84,7 @@ def program_bin(self):
             self.check_call([self.tool] + options + ["image_flash", self.bin_])
         else:
             load_offset = self.build_conf['CONFIG_FLASH_LOAD_OFFSET']
-            self.check_call(
-                [self.tool] + options + ["write_flash", f'0x{load_offset:x}', self.bin_]
-            )
+            self.check_call([self.tool] + options + ["write_flash", f'0x{load_offset:x}', self.bin_])
 
     def reset_device(self):
         self.logger.info("Resetting...")
diff --git a/scripts/west_commands/runners/intel_adsp.py b/scripts/west_commands/runners/intel_adsp.py
index 5690f49c594..24552c8f61c 100644
--- a/scripts/west_commands/runners/intel_adsp.py
+++ b/scripts/west_commands/runners/intel_adsp.py
@@ -60,8 +60,7 @@ def do_add_parser(cls, parser):
 
         for old_sign_param in [ '--rimage-tool', '--config-dir', '--default-key', '--key']:
             parser.add_argument(old_sign_param, action=SignParamError,
-                                help='''do not use, "west sign" is now called from CMake,
-                                see "west sign -h"''')
+                            help='do not use, "west sign" is now called from CMake, see "west sign -h"')
 
     @classmethod
     def tool_opt_help(cls) -> str:
diff --git a/scripts/west_commands/runners/intel_cyclonev.py b/scripts/west_commands/runners/intel_cyclonev.py
index e33c190202e..c1e08f6de9e 100644
--- a/scripts/west_commands/runners/intel_cyclonev.py
+++ b/scripts/west_commands/runners/intel_cyclonev.py
@@ -107,8 +107,7 @@ def do_add_parser(cls, parser):
                             help='''if given, override default config file;
                             may be given multiple times''')
         parser.add_argument('--serial', default="",
-                            help='''if given, selects FTDI instance by its serial number,
-                            defaults to empty''')
+                            help='if given, selects FTDI instance by its serial number, defaults to empty')
         parser.add_argument('--use-elf', default=False, action='store_true',
                             help='if given, Elf file will be used for loading instead of HEX image')
         # Options for flashing:
@@ -243,12 +242,11 @@ def do_flash_elf(self, **kwargs):
         server_cmd = (self.openocd_cmd + self.serial + self.cfg_cmd +        #added mevalver
                       pre_init_cmd)
         temp_str = '--cd=' + os.environ.get('ZEPHYR_BASE') #Go to Zephyr base Dir
-        # Execute First Script in Zephyr Base Dir
         gdb_cmd = (self.gdb_cmd + self.tui_arg +
-                   [temp_str,'-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch'])
-        # Execute Second Script in Build Dir
+                   [temp_str,'-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch']) #Execute First Script in Zephyr Base Dir
+
         gdb_cmd2 = (self.gdb_cmd + self.tui_arg +
-                   ['-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch'])
+                   ['-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch'])	#Execute Second Script in Build Dir
         echo = ['echo']
         if self.gdb_init is not None:
             for i in self.gdb_init:
@@ -305,13 +303,11 @@ def do_attach_debug(self, command, **kwargs):
 
         temp_str = '--cd=' + os.environ.get('ZEPHYR_BASE') #Go to Zephyr base Dir
 
-        # Execute First Script in Zephyr Base Dir
         gdb_cmd = (self.gdb_cmd + self.tui_arg +
-                   [temp_str,'-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch'])
+                   [temp_str,'-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch']) #Execute First Script in Zephyr Base Dir
 
-        # Execute Second Script in Build Dir
         gdb_cmd2 = (self.gdb_cmd + self.tui_arg +
-                   ['-ex', f'target extended-remote :{self.gdb_port}' , '-batch'])
+                   ['-ex', f'target extended-remote :{self.gdb_port}' , '-batch'])	#Execute Second Script in Build Dir
 
 
         if self.gdb_init is not None:
diff --git a/scripts/west_commands/runners/jlink.py b/scripts/west_commands/runners/jlink.py
index 535e2bec2b5..3d5727991e2 100644
--- a/scripts/west_commands/runners/jlink.py
+++ b/scripts/west_commands/runners/jlink.py
@@ -247,25 +247,21 @@ def do_run(self, command, **kwargs):
                                'RTOSPlugin_Zephyr')
         big_endian = self.build_conf.getboolean('CONFIG_BIG_ENDIAN')
 
-        server_cmd = (
-            [self.gdbserver]
-            + [
-                '-select',
-                ('ip' if (is_ip(self.dev_id) or is_tunnel(self.dev_id)) else 'usb')
-                + (f'={self.dev_id}' if self.dev_id else ''),
-            ]
-            + ['-port', str(self.gdb_port)]
-            + ['-if', self.iface]
-            + ['-speed', self.speed]
-            + ['-device', self.device]
-            + ['-silent']
-            + ['-endian' 'big' if big_endian else 'little']
-            + ['-singlerun']
-            + (['-nogui'] if self.supports_nogui else [])
-            + (['-rtos', plugin_dir] if rtos else [])
-            + ['-rtttelnetport', str(self.rtt_port)]
-            + self.tool_opt
-        )
+        server_cmd = ([self.gdbserver] +
+                      ['-select',
+                                           ('ip' if (is_ip(self.dev_id) or is_tunnel(self.dev_id)) else 'usb') +
+                                           (f'={self.dev_id}' if self.dev_id else ''),
+                       '-port', str(self.gdb_port),
+                       '-if', self.iface,
+                       '-speed', self.speed,
+                       '-device', self.device,
+                       '-silent',
+                       '-endian', 'big' if big_endian else 'little',
+                       '-singlerun'] +
+                      (['-nogui'] if self.supports_nogui else []) +
+                      (['-rtos', plugin_dir] if rtos else []) +
+                      ['-rtttelnetport', str(self.rtt_port)] +
+                      self.tool_opt)
 
         if command == 'flash':
             self.flash(**kwargs)
@@ -409,21 +405,15 @@ def flash(self, **kwargs):
             if self.supports_loader and self.loader:
                 loader_details = "?" + self.loader
 
-            cmd = (
-                [self.commander]
-                + (
-                    ['-IP', f'{self.dev_id}']
-                    if (is_ip(self.dev_id) or is_tunnel(self.dev_id))
-                    else (['-USB', f'{self.dev_id}'] if self.dev_id else [])
-                )
-                + (['-nogui', '1'] if self.supports_nogui else [])
-                + ['-if', self.iface]
-                + ['-speed', self.speed]
-                + ['-device', self.device + loader_details]
-                + ['-CommanderScript', fname]
-                + (['-nogui', '1'] if self.supports_nogui else [])
-                + self.tool_opt
-            )
+            cmd = ([self.commander] +
+                   (['-IP', f'{self.dev_id}'] if (is_ip(self.dev_id) or is_tunnel(self.dev_id)) else (['-USB', f'{self.dev_id}'] if self.dev_id else [])) +
+                   (['-nogui', '1'] if self.supports_nogui else []) +
+                   ['-if', self.iface,
+                    '-speed', self.speed,
+                    '-device', self.device + loader_details,
+                    '-CommanderScript', fname] +
+                   (['-nogui', '1'] if self.supports_nogui else []) +
+                   self.tool_opt)
 
             self.logger.info(f'Flashing file: {flash_file}')
             kwargs = {}
diff --git a/scripts/west_commands/runners/linkserver.py b/scripts/west_commands/runners/linkserver.py
index 9d038157803..9ffcdf63605 100644
--- a/scripts/west_commands/runners/linkserver.py
+++ b/scripts/west_commands/runners/linkserver.py
@@ -89,13 +89,12 @@ def do_add_parser(cls, parser):
                             {DEFAULT_LINKSERVER_EXE}''')
         # user may need to override settings.
         parser.add_argument('--override', required=False, action='append',
-                            help='''configuration overrides as defined bylinkserver.
-                            Example: /device/memory/0/location=0xcafecafe''')
+                            help='''configuration overrides as defined bylinkserver. Example: /device/memory/0/location=0xcafecafe''')
 
     @classmethod
     def do_create(cls, cfg, args):
 
-        print(f"RUNNER - gdb_port = {args.gdb_port}, semih port = {args.semihost_port}")
+        print("RUNNER - gdb_port = " + str(args.gdb_port) + ", semih port = " + str(args.semihost_port))
         return LinkServerBinaryRunner(cfg, args.device, args.core,
                                  linkserver=args.linkserver,
                                  dt_flash=args.dt_flash,
@@ -181,12 +180,8 @@ def _build_override_cli(self):
         return override_cli
 
     def flash(self, **kwargs):
-        linkserver_cmd = (
-            [self.linkserver, "flash"]
-            + ["--probe", str(self.probe)]
-            + self.override_cli
-            + [self.device]
-        )
+
+        linkserver_cmd = ([self.linkserver, "flash"] + ["--probe", str(self.probe)] + self.override_cli + [self.device])
         self.logger.debug(f'LinkServer cmd:  + {linkserver_cmd}')
 
         if self.erase:
diff --git a/scripts/west_commands/runners/mdb.py b/scripts/west_commands/runners/mdb.py
index 412e457df2e..bef14effbdd 100644
--- a/scripts/west_commands/runners/mdb.py
+++ b/scripts/west_commands/runners/mdb.py
@@ -36,14 +36,11 @@ def is_flash_cmd_need_exit_immediately(mdb_runner):
 
 def smp_core_order(mdb_runner, id):
     if is_simulation_run(mdb_runner):
-        # for simulation targets we start cores in direct order
-        # (core 0 first, core 1 second, etc...)
-        # otherwise we face mismatch arcnum (code ID) with ARConnect ID
-        # and core ID in instruction traces
+        # for simulation targets we start cores in direct order (core 0 first, core 1 second, etc...)
+        # otherwise we face mismatch arcnum (code ID) with ARConnect ID and core ID in instruction traces
         return id
     else:
-        # for HW targets we want to start the primary core last,
-        # to avoid ARConnect initialization interfere
+        # for HW targets we want to start the primary core last, to avoid ARConnect initialization interfere
         # with secondary cores startup - so we reverse start order
         return mdb_runner.cores - 1 - id
 
@@ -94,7 +91,7 @@ def mdb_do_run(mdb_runner, command):
             if i > 0: mdb_sub_cmd += ['-prop=download=2']
             mdb_sub_cmd += mdb_basic_options + mdb_target + [mdb_runner.elf_name]
             mdb_runner.check_call(mdb_sub_cmd, cwd=mdb_runner.build_dir)
-            mdb_multifiles += f'{"" if i == 0 else ","}core{smp_core_order(mdb_runner, i)}'
+            mdb_multifiles += ('core{}' if i == 0 else ',core{}').format(smp_core_order(mdb_runner, i))
 
         # to enable multi-core aware mode for use with the MetaWare debugger,
         # need to set the NSIM_MULTICORE environment variable to a non-zero value
diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index be4201a7c83..372002ac2c7 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -273,11 +273,8 @@ def program_hex(self):
 
             # Manage SUIT artifacts.
             # This logic should be executed only once per build.
-            # Use sysbuild board qualifiers to select the context,
-            # with which the artifacts will be programmed.
-            if self.build_conf.get('CONFIG_BOARD_QUALIFIERS') == self.sysbuild_conf.get(
-                'SB_CONFIG_BOARD_QUALIFIERS'
-            ):
+            # Use sysbuild board qualifiers to select the context, with which the artifacts will be programmed.
+            if self.build_conf.get('CONFIG_BOARD_QUALIFIERS') == self.sysbuild_conf.get('SB_CONFIG_BOARD_QUALIFIERS'):
                 mpi_hex_dir = Path(os.path.join(self.cfg.build_dir, 'zephyr'))
 
                 # Handle Manifest Provisioning Information
@@ -285,37 +282,17 @@ def program_hex(self):
                     app_mpi_hex_file = os.fspath(
                         mpi_hex_dir / self.build_conf.get('CONFIG_SUIT_MPI_APP_AREA_PATH'))
                     rad_mpi_hex_file = os.fspath(
-                        mpi_hex_dir / self.build_conf.get('CONFIG_SUIT_MPI_RAD_AREA_PATH')
-                    )
-                    self.op_program(
-                        app_mpi_hex_file,
-                        'ERASE_NONE',
-                        None,
-                        defer=True,
-                        core='NRFDL_DEVICE_CORE_APPLICATION',
-                    )
-                    self.op_program(
-                        rad_mpi_hex_file,
-                        'ERASE_NONE',
-                        None,
-                        defer=True,
-                        core='NRFDL_DEVICE_CORE_NETWORK',
-                    )
+                        mpi_hex_dir / self.build_conf.get('CONFIG_SUIT_MPI_RAD_AREA_PATH'))
+                    self.op_program(app_mpi_hex_file, 'ERASE_NONE', None, defer=True, core='NRFDL_DEVICE_CORE_APPLICATION')
+                    self.op_program(rad_mpi_hex_file, 'ERASE_NONE', None, defer=True, core='NRFDL_DEVICE_CORE_NETWORK')
 
                 # Handle SUIT root manifest if application manifests are not used.
-                # If an application firmware is built, the root envelope is merged
-                # with other application manifests as well as the output HEX file.
+                # If an application firmware is built, the root envelope is merged with other application manifests
+                # as well as the output HEX file.
                 if not cpuapp and self.sysbuild_conf.get('SB_CONFIG_SUIT_ENVELOPE'):
                     app_root_envelope_hex_file = os.fspath(
-                        mpi_hex_dir / 'suit_installed_envelopes_application_merged.hex'
-                    )
-                    self.op_program(
-                        app_root_envelope_hex_file,
-                        'ERASE_NONE',
-                        None,
-                        defer=True,
-                        core='NRFDL_DEVICE_CORE_APPLICATION',
-                    )
+                        mpi_hex_dir / 'suit_installed_envelopes_application_merged.hex')
+                    self.op_program(app_root_envelope_hex_file, 'ERASE_NONE', None, defer=True, core='NRFDL_DEVICE_CORE_APPLICATION')
 
             if cpuapp:
                 if not self.erase and self.build_conf.getboolean('CONFIG_NRF_REGTOOL_GENERATE_UICR'):
diff --git a/scripts/west_commands/runners/openocd.py b/scripts/west_commands/runners/openocd.py
index 5789cf579a5..2569371ff9b 100644
--- a/scripts/west_commands/runners/openocd.py
+++ b/scripts/west_commands/runners/openocd.py
@@ -117,8 +117,7 @@ def do_add_parser(cls, parser):
                             help='''if given, override default config file;
                             may be given multiple times''')
         parser.add_argument('--serial', default="",
-                            help='''if given, selects FTDI instance by its serial number,
-                            defaults to empty''')
+                            help='if given, selects FTDI instance by its serial number, defaults to empty')
         parser.add_argument('--use-elf', default=False, action='store_true',
                             help='if given, Elf file will be used for loading instead of HEX image')
         # Options for flashing:
diff --git a/scripts/west_commands/runners/pyocd.py b/scripts/west_commands/runners/pyocd.py
index d3e3b4d8b8a..653276bd69b 100644
--- a/scripts/west_commands/runners/pyocd.py
+++ b/scripts/west_commands/runners/pyocd.py
@@ -159,8 +159,7 @@ def flash(self, **kwargs):
             fname = self.elf_name
         else:
             raise ValueError(
-                f'Cannot flash; no hex ({self.hex_name}), bin ({self.bin_name}) '
-                f'or elf ({self.elf_name}) files found. ')
+                f'Cannot flash; no hex ({self.hex_name}), bin ({self.bin_name}) or elf ({self.elf_name}) files found. ')
 
         erase_method = 'chip' if self.erase else 'sector'
 
diff --git a/scripts/west_commands/runners/renode-robot.py b/scripts/west_commands/runners/renode-robot.py
index ff80a2289e7..68fe453b8ac 100644
--- a/scripts/west_commands/runners/renode-robot.py
+++ b/scripts/west_commands/runners/renode-robot.py
@@ -59,6 +59,5 @@ def run_test(self, **kwargs):
                 for suite in self.testsuite:
                     cmd.append(suite)
             else:
-                self.logger.error("No Robot testsuite passed to renode-test! "
-                                  "Use the `--testsuite` argument to provide one.")
+                self.logger.error("No Robot testsuite passed to renode-test! Use the `--testsuite` argument to provide one.")
         subprocess.run(cmd, check=True)
diff --git a/scripts/west_commands/runners/renode.py b/scripts/west_commands/runners/renode.py
index 598912d8a19..8937199420c 100644
--- a/scripts/west_commands/runners/renode.py
+++ b/scripts/west_commands/runners/renode.py
@@ -30,8 +30,7 @@ def do_add_parser(cls, parser):
         parser.add_argument('--renode-arg',
                             metavar='ARG',
                             action='append',
-                            help='''additional argument passed to Renode;
-                            `--help` will print all possible arguments''')
+                            help='additional argument passed to Renode; `--help` will print all possible arguments')
         parser.add_argument('--renode-command',
                             metavar='COMMAND',
                             action='append',
diff --git a/scripts/west_commands/runners/silabs_commander.py b/scripts/west_commands/runners/silabs_commander.py
index 5d0bdd96c1c..e9df0d83104 100644
--- a/scripts/west_commands/runners/silabs_commander.py
+++ b/scripts/west_commands/runners/silabs_commander.py
@@ -119,8 +119,7 @@ def do_run(self, command, **kwargs):
                 flash_file = self.bin_name
                 flash_args = ['--binary', '--address', f'0x{flash_addr:x}', flash_file]
             else:
-                raise ValueError(f'Cannot flash; no hex ({self.hex_name}) or '
-                                 f'bin ({self.bin_name}) files found.')
+                raise ValueError(f'Cannot flash; no hex ({self.hex_name}) or bin ({self.bin_name}) files found.')
 
         args = [self.commander, 'flash'] + opts + self.tool_opt + flash_args
 
diff --git a/scripts/west_commands/runners/spi_burn.py b/scripts/west_commands/runners/spi_burn.py
index 07253710dbb..265d1cd29bc 100644
--- a/scripts/west_commands/runners/spi_burn.py
+++ b/scripts/west_commands/runners/spi_burn.py
@@ -39,8 +39,7 @@ def do_add_parser(cls, parser):
                             help='ICEman connection establishing timeout in seconds')
         parser.add_argument('--telink-tools-path', help='path to Telink flash tools')
         parser.add_argument('--gdb-port', default='1111', help='Port to connect for gdb-client')
-        parser.add_argument('--gdb-ex', default='', nargs='?',
-                            help='Additional gdb commands to run')
+        parser.add_argument('--gdb-ex', default='', nargs='?', help='Additional gdb commands to run')
 
     @classmethod
     def do_create(cls, cfg, args):
@@ -49,23 +48,18 @@ def do_create(cls, cfg, args):
             spiburn = f'{args.telink_tools_path}/flash/bin/SPI_burn'
             iceman = f'{args.telink_tools_path}/ice/ICEman'
         else:
-            # If telink_tools_path arg is not specified then
-            # pass to tools shall be specified in PATH
+            # If telink_tools_path arg is not specified then pass to tools shall be specified in PATH
             spiburn = 'SPI_burn'
             iceman  = 'ICEman'
 
         # Get flash address offset
         if args.dt_flash == 'y':
             build_conf = BuildConfiguration(cfg.build_dir)
-            address = hex(
-                cls.get_flash_address(args, build_conf) - build_conf['CONFIG_FLASH_BASE_ADDRESS']
-            )
+            address = hex(cls.get_flash_address(args, build_conf) - build_conf['CONFIG_FLASH_BASE_ADDRESS'])
         else:
             address = args.addr
 
-        return SpiBurnBinaryRunner(
-            cfg, address, spiburn, iceman, args.timeout, args.gdb_port, args.gdb_ex, args.erase
-        )
+        return SpiBurnBinaryRunner(cfg, address, spiburn, iceman, args.timeout, args.gdb_port, args.gdb_ex, args.erase)
 
     def do_run(self, command, **kwargs):
 
@@ -133,12 +127,7 @@ def _debug(self):
             gdb_ex = re.split("(-ex) ", self.gdb_ex)[1::]
 
             # Compose gdb command
-            client_cmd = [
-                self.cfg.gdb,
-                self.cfg.elf_file,
-                '-ex',
-                f'target remote :{self.gdb_port}',
-            ] + gdb_ex
+            client_cmd = [self.cfg.gdb, self.cfg.elf_file, '-ex', f'target remote :{self.gdb_port}'] + gdb_ex
 
             # Run gdb
             self.run_client(client_cmd)
diff --git a/scripts/west_commands/runners/stm32cubeprogrammer.py b/scripts/west_commands/runners/stm32cubeprogrammer.py
index 7519530d6f3..43d9a19adfa 100644
--- a/scripts/west_commands/runners/stm32cubeprogrammer.py
+++ b/scripts/west_commands/runners/stm32cubeprogrammer.py
@@ -53,10 +53,7 @@ def __init__(
         self._erase = erase
 
         if extload:
-            p = (
-                STM32CubeProgrammerBinaryRunner._get_stm32cubeprogrammer_path().parent.resolve()
-                / 'ExternalLoader'
-            )
+            p = STM32CubeProgrammerBinaryRunner._get_stm32cubeprogrammer_path().parent.resolve() / 'ExternalLoader'
             self._extload = ['-el', str(p / extload)]
         else:
             self._extload = []

From 4664ac67aab218bcbc9f0de8a605a613c381ef35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:17 +0100
Subject: [PATCH 1252/2913] Revert "[nrf fromtree] scripts: west_commands:
 runners: Fix f-string (UP032)"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4300e6ab24b01078c735a376803a4ced38dfbc3c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/west_commands/runners/__init__.py     |  2 +-
 .../west_commands/runners/blackmagicprobe.py  | 20 +++++++++++--------
 .../west_commands/runners/canopen_program.py  | 10 +++++-----
 scripts/west_commands/runners/core.py         |  5 +++--
 scripts/west_commands/runners/dfu.py          |  6 +++---
 scripts/west_commands/runners/esp32.py        |  3 ++-
 .../west_commands/runners/intel_cyclonev.py   | 10 +++++-----
 scripts/west_commands/runners/jlink.py        |  7 ++++---
 scripts/west_commands/runners/linkserver.py   |  5 +++--
 scripts/west_commands/runners/mdb.py          |  6 +++---
 scripts/west_commands/runners/native.py       |  5 +++--
 scripts/west_commands/runners/nios2.py        |  7 ++++---
 scripts/west_commands/runners/nrf_common.py   |  9 +++++----
 scripts/west_commands/runners/nsim.py         |  6 +++---
 scripts/west_commands/runners/pyocd.py        | 18 ++++++++++-------
 .../west_commands/runners/silabs_commander.py |  2 +-
 scripts/west_commands/runners/stm32flash.py   | 14 ++++++-------
 scripts/west_commands/runners/teensy.py       |  4 ++--
 18 files changed, 77 insertions(+), 62 deletions(-)

diff --git a/scripts/west_commands/runners/__init__.py b/scripts/west_commands/runners/__init__.py
index 3af86e74828..6d5539905e3 100644
--- a/scripts/west_commands/runners/__init__.py
+++ b/scripts/west_commands/runners/__init__.py
@@ -71,6 +71,6 @@ def get_runner_cls(runner):
     for cls in ZephyrBinaryRunner.get_runners():
         if cls.name() == runner:
             return cls
-    raise ValueError(f'unknown runner "{runner}"')
+    raise ValueError('unknown runner "{}"'.format(runner))
 
 __all__ = ['ZephyrBinaryRunner', 'get_runner_cls']
diff --git a/scripts/west_commands/runners/blackmagicprobe.py b/scripts/west_commands/runners/blackmagicprobe.py
index 0ffdd58a9b9..1c2c8fa0d6a 100644
--- a/scripts/west_commands/runners/blackmagicprobe.py
+++ b/scripts/west_commands/runners/blackmagicprobe.py
@@ -170,11 +170,12 @@ def bmp_flash(self, command, **kwargs):
 
         command = (self.gdb +
                    ['-ex', "set confirm off",
-                    '-ex', f"target extended-remote {self.gdb_serial}"] +
+                    '-ex', "target extended-remote {}".format(
+                        self.gdb_serial)] +
                     self.connect_rst_enable_arg +
                    ['-ex', "monitor swdp_scan",
                     '-ex', "attach 1",
-                    '-ex', f"load {flash_file}",
+                    '-ex', "load {}".format(flash_file),
                     '-ex', "kill",
                     '-ex', "quit",
                     '-silent'])
@@ -191,18 +192,20 @@ def bmp_attach(self, command, **kwargs):
         if self.elf_file is None:
             command = (self.gdb +
                        ['-ex', "set confirm off",
-                        '-ex', f"target extended-remote {self.gdb_serial}"] +
+                        '-ex', "target extended-remote {}".format(
+                            self.gdb_serial)] +
                         self.connect_rst_disable_arg +
                        ['-ex', "monitor swdp_scan",
                         '-ex', "attach 1"])
         else:
             command = (self.gdb +
                        ['-ex', "set confirm off",
-                        '-ex', f"target extended-remote {self.gdb_serial}"] +
+                        '-ex', "target extended-remote {}".format(
+                            self.gdb_serial)] +
                         self.connect_rst_disable_arg +
                        ['-ex', "monitor swdp_scan",
                         '-ex', "attach 1",
-                        '-ex', f"file {self.elf_file}"])
+                        '-ex', "file {}".format(self.elf_file)])
         self.check_call_ignore_sigint(command)
 
     def bmp_debug(self, command, **kwargs):
@@ -210,12 +213,13 @@ def bmp_debug(self, command, **kwargs):
             raise ValueError('Cannot debug; elf file is missing')
         command = (self.gdb +
                    ['-ex', "set confirm off",
-                    '-ex', f"target extended-remote {self.gdb_serial}"] +
+                    '-ex', "target extended-remote {}".format(
+                        self.gdb_serial)] +
                     self.connect_rst_enable_arg +
                    ['-ex', "monitor swdp_scan",
                     '-ex', "attach 1",
-                    '-ex', f"file {self.elf_file}",
-                    '-ex', f"load {self.elf_file}"])
+                    '-ex', "file {}".format(self.elf_file),
+                    '-ex', "load {}".format(self.elf_file)])
         self.check_call_ignore_sigint(command)
 
     def do_run(self, command, **kwargs):
diff --git a/scripts/west_commands/runners/canopen_program.py b/scripts/west_commands/runners/canopen_program.py
index 5b4c055fa8b..667a5d3adbb 100644
--- a/scripts/west_commands/runners/canopen_program.py
+++ b/scripts/west_commands/runners/canopen_program.py
@@ -151,8 +151,8 @@ def flash(self, **kwargs):
         if status == 0:
             self.downloader.swid()
         else:
-            self.logger.warning(f'Flash status 0x{status:02x}, '
-                                'skipping software identification')
+            self.logger.warning('Flash status 0x{:02x}, '
+                                'skipping software identification'.format(status))
 
         self.downloader.enter_pre_operational()
 
@@ -172,7 +172,7 @@ def flash(self, **kwargs):
         status = self.downloader.wait_for_flash_status_ok(self.timeout)
         if status != 0:
             raise ValueError('Program download failed: '
-                             f'flash status 0x{status:02x}')
+                             'flash status 0x{:02x}'.format(status))
 
         self.downloader.swid()
         self.downloader.start_program()
@@ -234,7 +234,7 @@ def _ctrl_program(self, cmd):
         try:
             self.ctrl_sdo.raw = cmd
         except Exception as err:
-            raise ValueError(f'Unable to write control command 0x{cmd:02x}') from err
+            raise ValueError('Unable to write control command 0x{:02x}'.format(cmd)) from err
 
     def stop_program(self):
         '''Write stop control command to CANopen object dictionary (0x1f51)'''
@@ -262,7 +262,7 @@ def swid(self):
             swid = self.swid_sdo.raw
         except Exception as err:
             raise ValueError('Failed to read software identification') from err
-        self.logger.info(f'Program software identification: 0x{swid:08x}')
+        self.logger.info('Program software identification: 0x{:08x}'.format(swid))
         return swid
 
     def flash_status(self):
diff --git a/scripts/west_commands/runners/core.py b/scripts/west_commands/runners/core.py
index 6126cb6a398..d216dffcd18 100644
--- a/scripts/west_commands/runners/core.py
+++ b/scripts/west_commands/runners/core.py
@@ -482,7 +482,7 @@ def __init__(self, cfg: RunnerConfig):
         self.cfg = cfg
         '''RunnerConfig for this instance.'''
 
-        self.logger = logging.getLogger(f'runners.{self.name()}')
+        self.logger = logging.getLogger('runners.{}'.format(self.name()))
         '''logging.Logger for this instance.'''
 
     @staticmethod
@@ -701,7 +701,8 @@ def run(self, command: str, **kwargs):
         This is the main entry point to this runner.'''
         caps = self.capabilities()
         if command not in caps.commands:
-            raise ValueError(f'runner {self.name()} does not implement command {command}')
+            raise ValueError('runner {} does not implement command {}'.format(
+                self.name(), command))
         self.do_run(command, **kwargs)
 
     @abc.abstractmethod
diff --git a/scripts/west_commands/runners/dfu.py b/scripts/west_commands/runners/dfu.py
index 1a02ff4b839..875780e4802 100644
--- a/scripts/west_commands/runners/dfu.py
+++ b/scripts/west_commands/runners/dfu.py
@@ -25,11 +25,11 @@ def __init__(self, cfg, dev_id, alt, img, exe='dfu-util',
         self.dev_id = dev_id # Used only for error checking in do_run
         self.alt = alt
         self.img = img
-        self.cmd = [exe, f'-d,{dev_id}']
+        self.cmd = [exe, '-d,{}'.format(dev_id)]
         try:
-            self.list_pattern = f', alt={int(self.alt)},'
+            self.list_pattern = ', alt={},'.format(int(self.alt))
         except ValueError:
-            self.list_pattern = f', name="{self.alt}",'
+            self.list_pattern = ', name="{}",'.format(self.alt)
 
         if dfuse_config is None:
             self.dfuse = False
diff --git a/scripts/west_commands/runners/esp32.py b/scripts/west_commands/runners/esp32.py
index ce323ab256e..8a0d5c8ae75 100644
--- a/scripts/west_commands/runners/esp32.py
+++ b/scripts/west_commands/runners/esp32.py
@@ -132,5 +132,6 @@ def do_run(self, command, **kwargs):
         else:
             cmd_flash.extend([self.app_address, self.app_bin])
 
-        self.logger.info(f"Flashing esp32 chip on {self.device} ({self.baud}bps)")
+        self.logger.info("Flashing esp32 chip on {} ({}bps)".
+                         format(self.device, self.baud))
         self.check_call(cmd_flash)
diff --git a/scripts/west_commands/runners/intel_cyclonev.py b/scripts/west_commands/runners/intel_cyclonev.py
index c1e08f6de9e..490beca4da8 100644
--- a/scripts/west_commands/runners/intel_cyclonev.py
+++ b/scripts/west_commands/runners/intel_cyclonev.py
@@ -243,10 +243,10 @@ def do_flash_elf(self, **kwargs):
                       pre_init_cmd)
         temp_str = '--cd=' + os.environ.get('ZEPHYR_BASE') #Go to Zephyr base Dir
         gdb_cmd = (self.gdb_cmd + self.tui_arg +
-                   [temp_str,'-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch']) #Execute First Script in Zephyr Base Dir
+                   [temp_str,'-ex', 'target extended-remote localhost:{}'.format(self.gdb_port) , '-batch']) #Execute First Script in Zephyr Base Dir
 
         gdb_cmd2 = (self.gdb_cmd + self.tui_arg +
-                   ['-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch'])	#Execute Second Script in Build Dir
+                   ['-ex', 'target extended-remote localhost:{}'.format(self.gdb_port) , '-batch'])	#Execute Second Script in Build Dir
         echo = ['echo']
         if self.gdb_init is not None:
             for i in self.gdb_init:
@@ -298,16 +298,16 @@ def do_attach_debug(self, command, **kwargs):
                       pre_init_cmd)
 
         gdb_attach = (self.gdb_cmd + self.tui_arg +
-                   ['-ex', f'target extended-remote :{self.gdb_port}',
+                   ['-ex', 'target extended-remote :{}'.format(self.gdb_port),
                     self.elf_name, '-q'])
 
         temp_str = '--cd=' + os.environ.get('ZEPHYR_BASE') #Go to Zephyr base Dir
 
         gdb_cmd = (self.gdb_cmd + self.tui_arg +
-                   [temp_str,'-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch']) #Execute First Script in Zephyr Base Dir
+                   [temp_str,'-ex', 'target extended-remote localhost:{}'.format(self.gdb_port) , '-batch']) #Execute First Script in Zephyr Base Dir
 
         gdb_cmd2 = (self.gdb_cmd + self.tui_arg +
-                   ['-ex', f'target extended-remote :{self.gdb_port}' , '-batch'])	#Execute Second Script in Build Dir
+                   ['-ex', 'target extended-remote :{}'.format(self.gdb_port) , '-batch'])	#Execute Second Script in Build Dir
 
 
         if self.gdb_init is not None:
diff --git a/scripts/west_commands/runners/jlink.py b/scripts/west_commands/runners/jlink.py
index 3d5727991e2..ce500490349 100644
--- a/scripts/west_commands/runners/jlink.py
+++ b/scripts/west_commands/runners/jlink.py
@@ -125,7 +125,8 @@ def do_add_parser(cls, parser):
                             help='custom gdb host, defaults to the empty string '
                             'and runs a gdb server')
         parser.add_argument('--gdb-port', default=DEFAULT_JLINK_GDB_PORT,
-                            help=f'pyocd gdb port, defaults to {DEFAULT_JLINK_GDB_PORT}')
+                            help='pyocd gdb port, defaults to {}'.format(
+                                DEFAULT_JLINK_GDB_PORT))
         parser.add_argument('--commander', default=DEFAULT_JLINK_EXE,
                             help=f'''J-Link Commander, default is
                             {DEFAULT_JLINK_EXE}''')
@@ -306,7 +307,7 @@ def do_run(self, command, **kwargs):
             client_cmd = (self.gdb_cmd +
                           self.tui_arg +
                           [elf_name] +
-                          ['-ex', f'target remote {self.gdb_host}:{self.gdb_port}'])
+                          ['-ex', 'target remote {}:{}'.format(self.gdb_host, self.gdb_port)])
             if command == 'debug':
                 client_cmd += ['-ex', 'monitor halt',
                                '-ex', 'monitor reset',
@@ -415,7 +416,7 @@ def flash(self, **kwargs):
                    (['-nogui', '1'] if self.supports_nogui else []) +
                    self.tool_opt)
 
-            self.logger.info(f'Flashing file: {flash_file}')
+            self.logger.info('Flashing file: {}'.format(flash_file))
             kwargs = {}
             if not self.logger.isEnabledFor(logging.DEBUG):
                 kwargs['stdout'] = subprocess.DEVNULL
diff --git a/scripts/west_commands/runners/linkserver.py b/scripts/west_commands/runners/linkserver.py
index 9ffcdf63605..8179adc1e60 100644
--- a/scripts/west_commands/runners/linkserver.py
+++ b/scripts/west_commands/runners/linkserver.py
@@ -78,7 +78,8 @@ def do_add_parser(cls, parser):
                             help='if given, GDB uses -tui')
 
         parser.add_argument('--gdb-port', default=DEFAULT_LINKSERVER_GDB_PORT,
-                            help=f'gdb port to open, defaults to {DEFAULT_LINKSERVER_GDB_PORT}')
+                            help='gdb port to open, defaults to {}'.format(
+                               DEFAULT_LINKSERVER_GDB_PORT))
 
         parser.add_argument('--semihost-port', default=DEFAULT_LINKSERVER_SEMIHOST_PORT,
                             help='semihost port to open, defaults to the empty string '
@@ -146,7 +147,7 @@ def do_run(self, command, **kwargs):
                 gdb_cmd = ([self.gdb_cmd] +
                            self.tui_arg +
                            [self.elf_name] +
-                           ['-ex', f'target remote {self.gdb_host}:{self.gdb_port}'])
+                           ['-ex', 'target remote {}:{}'.format(self.gdb_host, self.gdb_port)])
 
                 if command == 'debug':
                     gdb_cmd += [ '-ex', 'load', '-ex', 'monitor reset']
diff --git a/scripts/west_commands/runners/mdb.py b/scripts/west_commands/runners/mdb.py
index bef14effbdd..6dbffa30dbd 100644
--- a/scripts/west_commands/runners/mdb.py
+++ b/scripts/west_commands/runners/mdb.py
@@ -68,7 +68,7 @@ def mdb_do_run(mdb_runner, command):
             if mdb_runner.dig_device: mdb_target += [mdb_runner.dig_device]
         else:
             # \todo: add support of other debuggers
-            raise ValueError(f'unsupported jtag adapter {mdb_runner.jtag}')
+            raise ValueError('unsupported jtag adapter {}'.format(mdb_runner.jtag))
 
     if command == 'flash':
         if is_flash_cmd_need_exit_immediately(mdb_runner):
@@ -85,7 +85,7 @@ def mdb_do_run(mdb_runner, command):
     elif 1 < mdb_runner.cores <= 12:
         mdb_multifiles = '-multifiles='
         for i in range(mdb_runner.cores):
-            mdb_sub_cmd = [commander] + [f'-pset={i + 1}', f'-psetname=core{i}']
+            mdb_sub_cmd = [commander] + ['-pset={}'.format(i + 1), '-psetname=core{}'.format(i)]
             # -prop=download=2 is used for SMP application debug, only the 1st core
             # will download the shared image.
             if i > 0: mdb_sub_cmd += ['-prop=download=2']
@@ -100,7 +100,7 @@ def mdb_do_run(mdb_runner, command):
 
         mdb_cmd = [commander] + [mdb_multifiles] + mdb_run
     else:
-        raise ValueError(f'unsupported cores {mdb_runner.cores}')
+        raise ValueError('unsupported cores {}'.format(mdb_runner.cores))
 
     mdb_runner.call(mdb_cmd, cwd=mdb_runner.build_dir)
 
diff --git a/scripts/west_commands/runners/native.py b/scripts/west_commands/runners/native.py
index c2cd414f012..2cbcf60d3ab 100644
--- a/scripts/west_commands/runners/native.py
+++ b/scripts/west_commands/runners/native.py
@@ -43,7 +43,8 @@ def do_add_parser(cls, parser: argparse.ArgumentParser):
         parser.add_argument('--tui', default=False, action='store_true',
                             help='if given, GDB uses -tui')
         parser.add_argument('--gdb-port', default=DEFAULT_GDB_PORT,
-                            help=f'gdb port, defaults to {DEFAULT_GDB_PORT}')
+                            help='gdb port, defaults to {}'.format(
+                                DEFAULT_GDB_PORT))
 
     @classmethod
     def do_create(cls, cfg: RunnerConfig, args: argparse.Namespace) -> ZephyrBinaryRunner:
@@ -75,6 +76,6 @@ def do_debug(self, **kwargs):
         self.check_call(cmd)
 
     def do_debugserver(self, **kwargs):
-        cmd = (['gdbserver', f':{self.gdb_port}', self.cfg.exe_file])
+        cmd = (['gdbserver', ':{}'.format(self.gdb_port), self.cfg.exe_file])
 
         self.check_call(cmd)
diff --git a/scripts/west_commands/runners/nios2.py b/scripts/west_commands/runners/nios2.py
index 4d84a775ec5..aface007b31 100644
--- a/scripts/west_commands/runners/nios2.py
+++ b/scripts/west_commands/runners/nios2.py
@@ -62,7 +62,7 @@ def flash(self, **kwargs):
             raise ValueError('Cannot flash; --cpu-sof not given.')
         self.ensure_output('hex')
 
-        self.logger.info(f'Flashing file: {self.hex_name}')
+        self.logger.info('Flashing file: {}'.format(self.hex_name))
         cmd = [self.quartus_py,
                '--sof', self.cpu_sof,
                '--kernel', self.hex_name]
@@ -70,7 +70,8 @@ def flash(self, **kwargs):
         self.check_call(cmd)
 
     def print_gdbserver_message(self, gdb_port):
-        self.logger.info(f'Nios II GDB server running on port {gdb_port}')
+        self.logger.info('Nios II GDB server running on port {}'.
+                         format(gdb_port))
 
     def debug_debugserver(self, command, **kwargs):
         # Per comments in the shell script, the NIOSII GDB server
@@ -99,7 +100,7 @@ def debug_debugserver(self, command, **kwargs):
             gdb_cmd = (self.gdb_cmd +
                        self.tui_arg +
                        [self.elf_name,
-                        '-ex', f'target remote :{gdb_port}'])
+                        '-ex', 'target remote :{}'.format(gdb_port)])
             self.require(gdb_cmd[0])
 
             self.print_gdbserver_message(gdb_port)
diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index 372002ac2c7..6324ca8dc7a 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -129,7 +129,7 @@ def get_board_snr(self, glob):
         elif len(snrs) == 1:
             board_snr = snrs[0]
             self.verify_snr(board_snr)
-            print(f"Using board {board_snr}")
+            print("Using board {}".format(board_snr))
             return board_snr
         elif not sys.stdin.isatty():
             raise RuntimeError(
@@ -142,9 +142,10 @@ def get_board_snr(self, glob):
         print('There are multiple boards connected{}.'.format(
                         f" matching '{glob}'" if glob != "*" else ""))
         for i, snr in enumerate(snrs, 1):
-            print(f'{i}. {snr}')
+            print('{}. {}'.format(i, snr))
 
-        p = f'Please select one with desired serial number (1-{len(snrs)}): '
+        p = 'Please select one with desired serial number (1-{}): '.format(
+                len(snrs))
         while True:
             try:
                 value = input(p)
@@ -250,7 +251,7 @@ def recover_target(self):
 
     def program_hex(self):
         # Get the command use to actually program self.hex_.
-        self.logger.info(f'Flashing file: {self.hex_}')
+        self.logger.info('Flashing file: {}'.format(self.hex_))
 
         # What type of erase/core arguments should we pass to the tool?
         core = None
diff --git a/scripts/west_commands/runners/nsim.py b/scripts/west_commands/runners/nsim.py
index 5ed17839203..94bd09c3dac 100644
--- a/scripts/west_commands/runners/nsim.py
+++ b/scripts/west_commands/runners/nsim.py
@@ -83,10 +83,10 @@ def do_debug(self, **kwargs):
         config = kwargs['nsim-cfg']
 
         server_cmd = (self.nsim_cmd + ['-gdb',
-                                       f'-port={self.gdb_port}',
+                                       '-port={}'.format(self.gdb_port),
                                        '-propsfile', config])
         gdb_cmd = (self.gdb_cmd +
-                   ['-ex', f'target remote :{self.gdb_port}',
+                   ['-ex', 'target remote :{}'.format(self.gdb_port),
                     '-ex', 'load', self.cfg.elf_file])
         self.require(gdb_cmd[0])
 
@@ -96,7 +96,7 @@ def debugserver(self, **kwargs):
         config = kwargs['nsim-cfg']
 
         cmd = (self.nsim_cmd +
-               ['-gdb', f'-port={self.gdb_port}',
+               ['-gdb', '-port={}'.format(self.gdb_port),
                 '-propsfile', config])
 
         self.check_call(cmd)
diff --git a/scripts/west_commands/runners/pyocd.py b/scripts/west_commands/runners/pyocd.py
index 653276bd69b..40519c6f2c1 100644
--- a/scripts/west_commands/runners/pyocd.py
+++ b/scripts/west_commands/runners/pyocd.py
@@ -100,9 +100,11 @@ def do_add_parser(cls, parser):
         parser.add_argument('--frequency',
                             help='SWD clock frequency in Hz')
         parser.add_argument('--gdb-port', default=DEFAULT_PYOCD_GDB_PORT,
-                            help=f'pyocd gdb port, defaults to {DEFAULT_PYOCD_GDB_PORT}')
+                            help='pyocd gdb port, defaults to {}'.format(
+                                DEFAULT_PYOCD_GDB_PORT))
         parser.add_argument('--telnet-port', default=DEFAULT_PYOCD_TELNET_PORT,
-                            help=f'pyocd telnet port, defaults to {DEFAULT_PYOCD_TELNET_PORT}')
+                            help='pyocd telnet port, defaults to {}'.format(
+                                DEFAULT_PYOCD_TELNET_PORT))
         parser.add_argument('--tui', default=False, action='store_true',
                             help='if given, GDB uses -tui')
         parser.add_argument('--board-id', dest='dev_id',
@@ -130,7 +132,7 @@ def do_create(cls, cfg, args):
         daparg = os.environ.get('PYOCD_DAPARG')
         if not ret.daparg_args and daparg:
             ret.logger.warning('PYOCD_DAPARG is deprecated; use --daparg')
-            ret.logger.debug(f'--daparg={daparg} via PYOCD_DAPARG')
+            ret.logger.debug('--daparg={} via PYOCD_DAPARG'.format(daparg))
             ret.daparg_args = ['-da', daparg]
 
         return ret
@@ -159,7 +161,8 @@ def flash(self, **kwargs):
             fname = self.elf_name
         else:
             raise ValueError(
-                f'Cannot flash; no hex ({self.hex_name}), bin ({self.bin_name}) or elf ({self.elf_name}) files found. ')
+                'Cannot flash; no hex ({}), bin ({}) or elf ({}) files found. '.format(
+                    self.hex_name, self.bin_name, self.elf_name))
 
         erase_method = 'chip' if self.erase else 'sector'
 
@@ -176,11 +179,12 @@ def flash(self, **kwargs):
                self.flash_extra +
                [fname])
 
-        self.logger.info(f'Flashing file: {fname}')
+        self.logger.info('Flashing file: {}'.format(fname))
         self.check_call(cmd)
 
     def log_gdbserver_message(self):
-        self.logger.info(f'pyOCD GDB server running on port {self.gdb_port}')
+        self.logger.info('pyOCD GDB server running on port {}'.
+                         format(self.gdb_port))
 
     def debug_debugserver(self, command, **kwargs):
         server_cmd = ([self.pyocd] +
@@ -203,7 +207,7 @@ def debug_debugserver(self, command, **kwargs):
             client_cmd = (self.gdb_cmd +
                           self.tui_args +
                           [self.elf_name] +
-                          ['-ex', f'target remote :{self.gdb_port}'])
+                          ['-ex', 'target remote :{}'.format(self.gdb_port)])
             if command == 'debug':
                 client_cmd += ['-ex', 'monitor halt',
                                '-ex', 'monitor reset',
diff --git a/scripts/west_commands/runners/silabs_commander.py b/scripts/west_commands/runners/silabs_commander.py
index e9df0d83104..b5c74631626 100644
--- a/scripts/west_commands/runners/silabs_commander.py
+++ b/scripts/west_commands/runners/silabs_commander.py
@@ -123,5 +123,5 @@ def do_run(self, command, **kwargs):
 
         args = [self.commander, 'flash'] + opts + self.tool_opt + flash_args
 
-        self.logger.info(f'Flashing file: {flash_file}')
+        self.logger.info('Flashing file: {}'.format(flash_file))
         self.check_call(args)
diff --git a/scripts/west_commands/runners/stm32flash.py b/scripts/west_commands/runners/stm32flash.py
index 027ab445f9b..5aa544d4b2a 100644
--- a/scripts/west_commands/runners/stm32flash.py
+++ b/scripts/west_commands/runners/stm32flash.py
@@ -98,19 +98,19 @@ def do_run(self, command, **kwargs):
 
         if action == 'info':
             # show device information and exit
-            msg_text = f"get device info from {self.device}"
+            msg_text = "get device info from {}".format(self.device)
 
         elif action == 'erase':
             # erase flash
             #size_aligned = (int(bin_size)  >> 12) + 1 << 12
             size_aligned = (int(bin_size) & 0xfffff000) + 4096
-            msg_text = f"erase {size_aligned} bit starting at {self.start_addr}"
+            msg_text = "erase {} bit starting at {}".format(size_aligned, self.start_addr)
             cmd_flash.extend([
             '-S', str(self.start_addr) + ":" + str(size_aligned), '-o'])
 
         elif action == 'start':
             # start execution
-            msg_text = f"start code execution at {self.exec_addr}"
+            msg_text = "start code execution at {}".format(self.exec_addr)
             if self.exec_addr:
                 if self.exec_addr == 0 or self.exec_addr.lower() == '0x0':
                     msg_text += " (flash start)"
@@ -121,7 +121,7 @@ def do_run(self, command, **kwargs):
 
         elif action == 'write':
             # flash binary file
-            msg_text = f"write {bin_size} bytes starting at {self.start_addr}"
+            msg_text = "write {} bytes starting at {}".format(bin_size, self.start_addr)
             cmd_flash.extend([
             '-S', str(self.start_addr) + ":" + str(bin_size),
             '-w', bin_name])
@@ -139,11 +139,11 @@ def do_run(self, command, **kwargs):
                 cmd_flash.extend(['-v'])
 
         else:
-            msg_text = f"invalid action \'{action}\' passed!"
-            self.logger.error(f'Invalid action \'{action}\' passed!')
+            msg_text = "invalid action \'{}\' passed!".format(action)
+            self.logger.error('Invalid action \'{}\' passed!'.format(action))
             return -1
 
         cmd_flash.extend([self.device])
         self.logger.info("Board: " + msg_text)
         self.check_call(cmd_flash)
-        self.logger.info(f'Board: finished \'{action}\' .')
+        self.logger.info('Board: finished \'{}\' .'.format(action))
diff --git a/scripts/west_commands/runners/teensy.py b/scripts/west_commands/runners/teensy.py
index e43ea3ced2c..a0854f619b2 100644
--- a/scripts/west_commands/runners/teensy.py
+++ b/scripts/west_commands/runners/teensy.py
@@ -47,13 +47,13 @@ def flash(self):
             fname = self.hex_name
         else:
             raise ValueError(
-                f'Cannot flash; no hex ({self.hex_name}) file found. ')
+                'Cannot flash; no hex ({}) file found. '.format(self.hex_name))
 
         cmd = ([self.teensy_loader] +
                self.mcu_args +
                [fname])
 
-        self.logger.info(f'Flashing file: {fname}')
+        self.logger.info('Flashing file: {}'.format(fname))
 
         try:
             self.check_output(cmd)

From eb51f0ad0bf20a5e9b360ef37edeb0a06ed82096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:17 +0100
Subject: [PATCH 1253/2913] Revert "[nrf fromtree] scripts: west_commands:
 runners: Fix bare except (E722 & B904)"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 195b1b67aec7a775080135733ebf824f3aa7fbc2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../west_commands/runners/canopen_program.py  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/scripts/west_commands/runners/canopen_program.py b/scripts/west_commands/runners/canopen_program.py
index 667a5d3adbb..2fb8ba42b01 100644
--- a/scripts/west_commands/runners/canopen_program.py
+++ b/scripts/west_commands/runners/canopen_program.py
@@ -214,8 +214,8 @@ def connect(self):
         '''Connect to CAN network'''
         try:
             self.network.connect(context=self.can_context)
-        except Exception as err:
-            raise ValueError('Unable to connect to CAN network') from err
+        except:
+            raise ValueError('Unable to connect to CAN network')
 
     def disconnect(self):
         '''Disconnect from CAN network'''
@@ -226,15 +226,15 @@ def enter_pre_operational(self):
         self.logger.info("Entering pre-operational mode")
         try:
             self.node.nmt.state = 'PRE-OPERATIONAL'
-        except Exception as err:
-            raise ValueError('Failed to enter pre-operational mode') from err
+        except:
+            raise ValueError('Failed to enter pre-operational mode')
 
     def _ctrl_program(self, cmd):
         '''Write program control command to CANopen object dictionary (0x1f51)'''
         try:
             self.ctrl_sdo.raw = cmd
-        except Exception as err:
-            raise ValueError('Unable to write control command 0x{:02x}'.format(cmd)) from err
+        except:
+            raise ValueError('Unable to write control command 0x{:02x}'.format(cmd))
 
     def stop_program(self):
         '''Write stop control command to CANopen object dictionary (0x1f51)'''
@@ -260,8 +260,8 @@ def swid(self):
         '''Read software identification from CANopen object dictionary (0x1f56)'''
         try:
             swid = self.swid_sdo.raw
-        except Exception as err:
-            raise ValueError('Failed to read software identification') from err
+        except:
+            raise ValueError('Failed to read software identification')
         self.logger.info('Program software identification: 0x{:08x}'.format(swid))
         return swid
 
@@ -269,8 +269,8 @@ def flash_status(self):
         '''Read flash status identification'''
         try:
             status = self.flash_sdo.raw
-        except Exception as err:
-            raise ValueError('Failed to read flash status identification') from err
+        except:
+            raise ValueError('Failed to read flash status identification')
         return status
 
     def download(self, bin_file):
@@ -289,8 +289,8 @@ def download(self, bin_file):
                     break
                 outfile.write(chunk)
                 progress.next(n=len(chunk))
-        except Exception as err:
-            raise ValueError('Failed to download program') from err
+        except:
+            raise ValueError('Failed to download program')
         finally:
             progress.finish()
             infile.close()
@@ -301,8 +301,8 @@ def wait_for_bootup(self, timeout=DEFAULT_TIMEOUT):
         self.logger.info('Waiting for boot-up message...')
         try:
             self.node.nmt.wait_for_bootup(timeout=timeout)
-        except Exception as err:
-            raise ValueError('Timeout waiting for boot-up message') from err
+        except:
+            raise ValueError('Timeout waiting for boot-up message')
 
     def wait_for_flash_status_ok(self, timeout=DEFAULT_TIMEOUT):
         '''Wait for flash status ok'''

From 468049890a3587dc85b17688a8f4f322e98d1ab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:17 +0100
Subject: [PATCH 1254/2913] Revert "[nrf fromtree] scripts: west_commands:
 runners: Fix f-string-missing-placeholders (F541)"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit de56519cc8dc19e4cb0aada6a276ae53f05fa8d6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/west_commands/runners/linkserver.py | 2 +-
 scripts/west_commands/runners/nrfutil.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/west_commands/runners/linkserver.py b/scripts/west_commands/runners/linkserver.py
index 8179adc1e60..60eaafce0ab 100644
--- a/scripts/west_commands/runners/linkserver.py
+++ b/scripts/west_commands/runners/linkserver.py
@@ -90,7 +90,7 @@ def do_add_parser(cls, parser):
                             {DEFAULT_LINKSERVER_EXE}''')
         # user may need to override settings.
         parser.add_argument('--override', required=False, action='append',
-                            help='''configuration overrides as defined bylinkserver. Example: /device/memory/0/location=0xcafecafe''')
+                            help=f'''configuration overrides as defined bylinkserver. Example: /device/memory/0/location=0xcafecafe''')
 
     @classmethod
     def do_create(cls, cfg, args):
diff --git a/scripts/west_commands/runners/nrfutil.py b/scripts/west_commands/runners/nrfutil.py
index 584c5e78349..ec1328e4edc 100644
--- a/scripts/west_commands/runners/nrfutil.py
+++ b/scripts/west_commands/runners/nrfutil.py
@@ -97,7 +97,7 @@ def _exec_batch(self):
                             indent=4) + '\n'
 
         hex_dir = Path(self.hex_).parent
-        json_file = os.fspath(hex_dir / 'generated_nrfutil_batch.json')
+        json_file = os.fspath(hex_dir / f'generated_nrfutil_batch.json')
 
         with open(json_file, "w") as f:
             f.write(batch)

From 7f28466019c58012b9b8f8dde8756e4841fc807d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:17 +0100
Subject: [PATCH 1255/2913] Revert "[nrf fromtree] scripts: west_commands:
 runners: Fix pylint unbound issues"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7f7b13201462069f704582acf12f3d36f1ab578a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/west_commands/runners/intel_cyclonev.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/west_commands/runners/intel_cyclonev.py b/scripts/west_commands/runners/intel_cyclonev.py
index 490beca4da8..764ebd7420b 100644
--- a/scripts/west_commands/runners/intel_cyclonev.py
+++ b/scripts/west_commands/runners/intel_cyclonev.py
@@ -34,10 +34,6 @@ def __init__(self, cfg, pre_init=None, reset_halt_cmd=DEFAULT_OPENOCD_RESET_HALT
 
         support = path.join(cfg.board_dir, 'support')
 
-        gdb_commands = None
-        gdb_commands2 = None
-        gdb_commands_deb = None
-
         if not config:
             default = path.join(support, 'openocd.cfg')
             default2 = path.join(support, 'download_all.gdb')

From 944e44597e7e276362152b4a18d4a5f714f20a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:17 +0100
Subject: [PATCH 1256/2913] Revert "[nrf fromtree] scripts: west_commands:
 runners: Remove obsolete pylint ignores"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ffae05f11b565965d2e03f9765057fe01cd53cdb.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/west_commands/runners/intel_cyclonev.py | 1 +
 scripts/west_commands/runners/uf2.py            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/west_commands/runners/intel_cyclonev.py b/scripts/west_commands/runners/intel_cyclonev.py
index 764ebd7420b..c14e20b967f 100644
--- a/scripts/west_commands/runners/intel_cyclonev.py
+++ b/scripts/west_commands/runners/intel_cyclonev.py
@@ -174,6 +174,7 @@ def print_gdbserver_message(self):
         self.logger.info('OpenOCD GDB server running on port '
                          f'{self.gdb_port}{thread_msg}')
 
+    # pylint: disable=R0201
     def to_num(self, number):
         dev_match = re.search(r"^\d*\+dev", number)
         dev_version = not dev_match is None
diff --git a/scripts/west_commands/runners/uf2.py b/scripts/west_commands/runners/uf2.py
index 0db4f0b9b44..87db248c7bf 100644
--- a/scripts/west_commands/runners/uf2.py
+++ b/scripts/west_commands/runners/uf2.py
@@ -10,7 +10,7 @@
 from runners.core import ZephyrBinaryRunner, RunnerCaps
 
 try:
-    import psutil
+    import psutil  # pylint: disable=unused-import
     MISSING_PSUTIL = False
 except ImportError:
     # This can happen when building the documentation for the

From 22b2c7356e06a653655134e29aa94c063ac59e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:17 +0100
Subject: [PATCH 1257/2913] Revert "[nrf fromtree] west: linkserver: change the
 default port number for semihost"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c1f7804897e9074062b218a7831e3eef2e79fe20.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/west_commands/runners/linkserver.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/west_commands/runners/linkserver.py b/scripts/west_commands/runners/linkserver.py
index 60eaafce0ab..886e855bb43 100644
--- a/scripts/west_commands/runners/linkserver.py
+++ b/scripts/west_commands/runners/linkserver.py
@@ -18,7 +18,7 @@
 
 DEFAULT_LINKSERVER_EXE = 'Linkserver.exe' if sys.platform == 'win32' else 'LinkServer'
 DEFAULT_LINKSERVER_GDB_PORT =  3333
-DEFAULT_LINKSERVER_SEMIHOST_PORT = 8888
+DEFAULT_LINKSERVER_SEMIHOST_PORT = 3334
 
 class LinkServerBinaryRunner(ZephyrBinaryRunner):
     '''Runner front-end for NXP Linkserver'''
@@ -95,7 +95,6 @@ def do_add_parser(cls, parser):
     @classmethod
     def do_create(cls, cfg, args):
 
-        print("RUNNER - gdb_port = " + str(args.gdb_port) + ", semih port = " + str(args.semihost_port))
         return LinkServerBinaryRunner(cfg, args.device, args.core,
                                  linkserver=args.linkserver,
                                  dt_flash=args.dt_flash,

From 27048f50564d73b8f8b593096904a6a6764fe02f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:17 +0100
Subject: [PATCH 1258/2913] Revert "[nrf fromtree] runners: jlink: add support
 for J-Link tunnels"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9486638a04ff34eddaa8eb4a51fe2ea47ead378c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/west_commands/runners/jlink.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/west_commands/runners/jlink.py b/scripts/west_commands/runners/jlink.py
index ce500490349..af4a0fe8787 100644
--- a/scripts/west_commands/runners/jlink.py
+++ b/scripts/west_commands/runners/jlink.py
@@ -36,9 +36,6 @@ def is_ip(ip):
         return False
     return True
 
-def is_tunnel(tunnel):
-    return tunnel.startswith("tunnel:")
-
 class ToggleAction(argparse.Action):
 
     def __call__(self, parser, args, ignored, option):
@@ -250,7 +247,7 @@ def do_run(self, command, **kwargs):
 
         server_cmd = ([self.gdbserver] +
                       ['-select',
-                                           ('ip' if (is_ip(self.dev_id) or is_tunnel(self.dev_id)) else 'usb') +
+                                           ('ip' if is_ip(self.dev_id) else 'usb') +
                                            (f'={self.dev_id}' if self.dev_id else ''),
                        '-port', str(self.gdb_port),
                        '-if', self.iface,
@@ -407,7 +404,7 @@ def flash(self, **kwargs):
                 loader_details = "?" + self.loader
 
             cmd = ([self.commander] +
-                   (['-IP', f'{self.dev_id}'] if (is_ip(self.dev_id) or is_tunnel(self.dev_id)) else (['-USB', f'{self.dev_id}'] if self.dev_id else [])) +
+                   (['-IP', f'{self.dev_id}'] if is_ip(self.dev_id) else (['-USB', f'{self.dev_id}'] if self.dev_id else [])) +
                    (['-nogui', '1'] if self.supports_nogui else []) +
                    ['-if', self.iface,
                     '-speed', self.speed,

From 2eb5fff37ad6a057009395b65724f342ae2f9f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:17 +0100
Subject: [PATCH 1259/2913] Revert "[nrf fromtree] west: commands: runners:
 canopen: add download-buffer-size option"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 32c4684c890207041cd42982e483d8cd749ad460.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../west_commands/runners/canopen_program.py  | 21 ++++++++-----------
 .../tests/test_canopen_program.py             |  9 ++------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/scripts/west_commands/runners/canopen_program.py b/scripts/west_commands/runners/canopen_program.py
index 2fb8ba42b01..c51f07891a2 100644
--- a/scripts/west_commands/runners/canopen_program.py
+++ b/scripts/west_commands/runners/canopen_program.py
@@ -24,7 +24,10 @@
 DEFAULT_PROGRAM_NUMBER = 1
 
 # Program download buffer size in bytes
-DEFAULT_PROGRAM_DOWNLOAD_BUFFER_SIZE = 1024
+PROGRAM_DOWNLOAD_BUFFER_SIZE = 1024
+
+# Program download chunk size in bytes
+PROGRAM_DOWNLOAD_CHUNK_SIZE = PROGRAM_DOWNLOAD_BUFFER_SIZE // 2
 
 # Default timeouts and retries
 DEFAULT_TIMEOUT = 10.0 # seconds
@@ -55,7 +58,7 @@ def __init__(self, cfg, dev_id, can_context=DEFAULT_CAN_CONTEXT,
                  program_number=DEFAULT_PROGRAM_NUMBER, confirm=True,
                  confirm_only=True, timeout=DEFAULT_TIMEOUT,
                  sdo_retries=DEFAULT_SDO_RETRIES, sdo_timeout=DEFAULT_SDO_TIMEOUT,
-                 download_buffer_size=DEFAULT_PROGRAM_DOWNLOAD_BUFFER_SIZE, block_transfer=False):
+                 block_transfer=False):
         if MISSING_REQUIREMENTS:
             raise RuntimeError('one or more Python dependencies were missing; '
                                "see the getting started guide for details on "
@@ -73,9 +76,7 @@ def __init__(self, cfg, dev_id, can_context=DEFAULT_CAN_CONTEXT,
                                                    program_number=program_number,
                                                    sdo_retries=sdo_retries,
                                                    sdo_timeout=sdo_timeout,
-                                                   download_buffer_size=download_buffer_size,
-                                                   block_transfer=block_transfer,
-                                                   )
+                                                   block_transfer=block_transfer)
 
     @classmethod
     def name(cls):
@@ -112,8 +113,6 @@ def do_add_parser(cls, parser):
         parser.add_argument('--sdo-timeout', type=float, default=DEFAULT_SDO_TIMEOUT,
                             help=f'''CANopen SDO response timeout in seconds
                             (default: {DEFAULT_SDO_TIMEOUT})''')
-        parser.add_argument('--download-buffer-size', type=int, default=DEFAULT_PROGRAM_DOWNLOAD_BUFFER_SIZE,
-                            help=f'Program download buffer size in bytes (default: {DEFAULT_PROGRAM_DOWNLOAD_BUFFER_SIZE})')
         parser.add_argument('--block-transfer', default=False, action='store_true',
                             help='Use SDO block transfers (experimental, default: no)')
 
@@ -129,7 +128,6 @@ def do_create(cls, cfg, args):
                                    timeout=args.timeout,
                                    sdo_retries=args.sdo_retries,
                                    sdo_timeout=args.sdo_timeout,
-                                   download_buffer_size=args.download_buffer_size,
                                    block_transfer=args.block_transfer)
 
     def do_run(self, command, **kwargs):
@@ -190,7 +188,7 @@ class CANopenProgramDownloader(object):
     def __init__(self, logger, node_id, can_context=DEFAULT_CAN_CONTEXT,
                  program_number=DEFAULT_PROGRAM_NUMBER,
                  sdo_retries=DEFAULT_SDO_RETRIES, sdo_timeout=DEFAULT_SDO_TIMEOUT,
-                 download_buffer_size=DEFAULT_PROGRAM_DOWNLOAD_BUFFER_SIZE, block_transfer=False):
+                 block_transfer=False):
         super(CANopenProgramDownloader, self).__init__()
         self.logger = logger
         self.node_id = node_id
@@ -203,7 +201,6 @@ def __init__(self, logger, node_id, can_context=DEFAULT_CAN_CONTEXT,
         self.ctrl_sdo = self.node.sdo[H1F51_PROGRAM_CTRL][self.program_number]
         self.swid_sdo = self.node.sdo[H1F56_PROGRAM_SWID][self.program_number]
         self.flash_sdo = self.node.sdo[H1F57_FLASH_STATUS][self.program_number]
-        self.download_buffer_size = download_buffer_size
 
         self.node.sdo.MAX_RETRIES = sdo_retries
         self.node.sdo.RESPONSE_TIMEOUT = sdo_timeout
@@ -279,12 +276,12 @@ def download(self, bin_file):
         try:
             size = os.path.getsize(bin_file)
             infile = open(bin_file, 'rb')
-            outfile = self.data_sdo.open('wb', buffering=self.download_buffer_size,
+            outfile = self.data_sdo.open('wb', buffering=PROGRAM_DOWNLOAD_BUFFER_SIZE,
                                          size=size, block_transfer=self.block_transfer)
 
             progress = Bar('%(percent)d%%', max=size, suffix='%(index)d/%(max)dB')
             while True:
-                chunk = infile.read(self.download_buffer_size // 2)
+                chunk = infile.read(PROGRAM_DOWNLOAD_CHUNK_SIZE)
                 if not chunk:
                     break
                 outfile.write(chunk)
diff --git a/scripts/west_commands/tests/test_canopen_program.py b/scripts/west_commands/tests/test_canopen_program.py
index 39aed2d34f4..934b4ca919c 100644
--- a/scripts/west_commands/tests/test_canopen_program.py
+++ b/scripts/west_commands/tests/test_canopen_program.py
@@ -22,7 +22,7 @@
 # Test cases
 #
 
-TEST_CASES = [(n, x, p, c, o, t, r, s, d, b)
+TEST_CASES = [(n, x, p, c, o, t, r, s, b)
               for n in range(1, 3)
               for x in (None, TEST_ALT_CONTEXT)
               for p in range(1, 3)
@@ -31,7 +31,6 @@
               for t in range(1, 3)
               for r in range(1, 3)
               for s in range(1, 3)
-              for d in [256, 1024]
               for b in range(False, True)]
 
 os_path_isfile = os.path.isfile
@@ -45,7 +44,7 @@ def os_path_isfile_patch(filename):
 @patch('runners.canopen_program.CANopenProgramDownloader')
 def test_canopen_program_create(cpd, test_case, runner_config):
     '''Test CANopen runner created from command line parameters.'''
-    node_id, context, program_number, confirm, confirm_only, timeout, sdo_retries, sdo_timeout, download_buffer_size, block_transfer = test_case
+    node_id, context, program_number, confirm, confirm_only, timeout, sdo_retries, sdo_timeout, block_transfer = test_case
 
     args = ['--node-id', str(node_id)]
     if context is not None:
@@ -62,8 +61,6 @@ def test_canopen_program_create(cpd, test_case, runner_config):
         args.extend(['--sdo-retries', str(sdo_retries)])
     if sdo_timeout:
         args.extend(['--sdo-timeout', str(sdo_timeout)])
-    if download_buffer_size:
-        args.extend(['--download-buffer-size', str(download_buffer_size)])
     if block_transfer:
         args.append('--block_transfer')
 
@@ -87,7 +84,6 @@ def test_canopen_program_create(cpd, test_case, runner_config):
                                      program_number=program_number,
                                      sdo_retries=sdo_retries,
                                      sdo_timeout=sdo_timeout,
-                                     download_buffer_size=download_buffer_size,
                                      block_transfer=block_transfer)
     else:
         assert cpd.call_args == call(node_id=node_id,
@@ -96,7 +92,6 @@ def test_canopen_program_create(cpd, test_case, runner_config):
                                      program_number=program_number,
                                      sdo_retries=sdo_retries,
                                      sdo_timeout=sdo_timeout,
-                                     download_buffer_size=download_buffer_size,
                                      block_transfer=block_transfer)
 
     mock.connect.assert_called_once()

From 5fe65a6db3af907df081d694e7e81925143dbf52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:17 +0100
Subject: [PATCH 1260/2913] Revert "[nrf noup] drivers: flash: Allow reading
 secure mem by nrf_rram."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 711346aa377a65263784cd0d37efc9230e68229b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/flash/soc_flash_nrf_rram.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/drivers/flash/soc_flash_nrf_rram.c b/drivers/flash/soc_flash_nrf_rram.c
index b697df505b3..35a6c98862c 100644
--- a/drivers/flash/soc_flash_nrf_rram.c
+++ b/drivers/flash/soc_flash_nrf_rram.c
@@ -54,11 +54,6 @@ LOG_MODULE_REGISTER(flash_nrf_rram, CONFIG_FLASH_LOG_LEVEL);
 #define WRITE_BLOCK_SIZE_FROM_DT DT_PROP(RRAM, write_block_size)
 #define ERASE_VALUE              0xFF
 
-#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER
-#include <soc_secure.h>
-#include <pm_config.h>
-#endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER */
-
 #ifdef CONFIG_MULTITHREADING
 static struct k_sem sem_lock;
 #define SYNC_INIT()   k_sem_init(&sem_lock, 1, 1)
@@ -284,12 +279,6 @@ static int nrf_rram_read(const struct device *dev, off_t addr, void *data, size_
 	}
 	addr += RRAM_START;
 
-#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER && PM_APP_ADDRESS
-	if (addr < PM_APP_ADDRESS) {
-		return soc_secure_mem_read(data, (void *)addr, len);
-	}
-#endif
-
 	memcpy(data, (void *)addr, len);
 
 	return 0;

From 3dbd47858c0109093bb3b6a0be0296003cdeedba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:17 +0100
Subject: [PATCH 1261/2913] Revert "[nrf fromtree] logging: frontends: stmesp:
 alternate message output option"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6d04ddbedbe373b5d2bae3ad7e78ab9329034c4f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/logging/frontends/Kconfig              |  8 -----
 .../logging/frontends/log_frontend_stmesp.c   | 32 ++++---------------
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/subsys/logging/frontends/Kconfig b/subsys/logging/frontends/Kconfig
index ec045846806..e35e252ba2b 100644
--- a/subsys/logging/frontends/Kconfig
+++ b/subsys/logging/frontends/Kconfig
@@ -73,14 +73,6 @@ config LOG_FRONTEND_STMESP_GUARANTEED_ACCESS
 	  When enabled, accessing STMESP registers will stall if write cannot be
 	  performed (e.g. ETR buffer is full).
 
-config LOG_FRONTEND_STMESP_MSG_END_TIMESTAMP
-	bool "Generate timestamp and marker at message end"
-	help
-	  Generate a zero data byte with timestamp and marker at message end,
-	  instead of generating a timestamp and marker at message start and
-	  a flag at end. This can be used to maintain compatibility with
-	  certain decoders.
-
 endif # LOG_FRONTEND_STMESP
 
 config LOG_FRONTEND_STMESP_DEMUX
diff --git a/subsys/logging/frontends/log_frontend_stmesp.c b/subsys/logging/frontends/log_frontend_stmesp.c
index 89a2701d92d..4042fac853c 100644
--- a/subsys/logging/frontends/log_frontend_stmesp.c
+++ b/subsys/logging/frontends/log_frontend_stmesp.c
@@ -314,11 +314,7 @@ static inline int16_t get_source_id(const void *source)
 
 static void packet_end(STMESP_Type *stm_esp)
 {
-	if (IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_MSG_END_TIMESTAMP)) {
-		STM_D8(stm_esp, 0, true, true);
-	} else {
-		STM_FLAG(stm_esp);
-	}
+	STM_FLAG(stm_esp);
 	atomic_set(&new_data, 1);
 }
 
@@ -369,11 +365,7 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
 			return;
 		}
 
-		if (IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_MSG_END_TIMESTAMP)) {
-			STM_D32(stm_esp, hdr.raw, false, false);
-		} else {
-			STM_D32(stm_esp, hdr.raw, use_timestamp, true);
-		}
+		STM_D32(stm_esp, hdr.raw, use_timestamp, true);
 		(void)cbprintf_package_convert(package, desc.package_len, package_cb, stm_esp,
 					       flags, strl, ARRAY_SIZE(strl));
 		write_data(sname, sname_len, stm_esp);
@@ -422,11 +414,7 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
 			return;
 		}
 
-		if (IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_MSG_END_TIMESTAMP)) {
-			STM_D32(stm_esp, dict_desc.raw, false, false);
-		} else {
-			STM_D32(stm_esp, dict_desc.raw, true, true);
-		}
+		STM_D32(stm_esp, dict_desc.raw, true, true);
 		(void)cbprintf_package_convert(package, desc.package_len, package_cb, stm_esp,
 					       flags, NULL, 0);
 		if (data) {
@@ -474,11 +462,7 @@ static inline void msg_start(STMESP_Type *stm_esp, uint32_t level, const void *s
 {
 	union stm_log_dict_hdr dict_desc = DICT_HDR_INITIALIZER(level, get_source_id(source), 0);
 
-	if (IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_MSG_END_TIMESTAMP)) {
-		STM_D32(stm_esp, dict_desc.raw, false, false);
-	} else {
-		STM_D32(stm_esp, dict_desc.raw, true, true);
-	}
+	STM_D32(stm_esp, dict_desc.raw, true, true);
 	STM_D32(stm_esp, package_hdr, false, false);
 	STM_D32(stm_esp, (uint32_t)fmt, false, false);
 }
@@ -627,12 +611,8 @@ int log_frontend_stmesp_etr_ready(void)
 	early_buf_read_mode();
 
 	while ((len = early_buf_get_data((void **)&buf)) > 0) {
-		if (IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_MSG_END_TIMESTAMP)) {
-			STM_D32(stm_esp, *buf, false, false);
-		} else {
-			/* Write first word with Marked and timestamp. */
-			STM_D32(stm_esp, *buf, true, true);
-		}
+		/* Write first word with Marked and timestamp. */
+		STM_D32(stm_esp, *buf, true, true);
 		buf++;
 		len -= sizeof(uint32_t);
 

From 118fcb291c93ad6ffcde281720129d61bb081fb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:17 +0100
Subject: [PATCH 1262/2913] Revert "[nrf fromlist] drivers: audio: dmic_nrfx:
 Add DMM support to driver"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a8ca36c91a813597f57d1f16a26292232827b74d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/audio/dmic_nrfx_pdm.c | 70 +++++++----------------------------
 1 file changed, 14 insertions(+), 56 deletions(-)

diff --git a/drivers/audio/dmic_nrfx_pdm.c b/drivers/audio/dmic_nrfx_pdm.c
index 98183e23254..971fd902665 100644
--- a/drivers/audio/dmic_nrfx_pdm.c
+++ b/drivers/audio/dmic_nrfx_pdm.c
@@ -8,25 +8,17 @@
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
-#include <dmm.h>
 #include <nrfx_pdm.h>
 
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
 LOG_MODULE_REGISTER(dmic_nrfx_pdm, CONFIG_AUDIO_DMIC_LOG_LEVEL);
 
-#if CONFIG_SOC_SERIES_NRF54HX
-#define DMIC_NRFX_CLOCK_FREQ 8*1000*1000UL
-#else
-#define DMIC_NRFX_CLOCK_FREQ 32*1000*1000UL
-#endif
-
 struct dmic_nrfx_pdm_drv_data {
 	const nrfx_pdm_t *pdm;
 	struct onoff_manager *clk_mgr;
 	struct onoff_client clk_cli;
 	struct k_mem_slab *mem_slab;
-	void *mem_slab_buffer;
 	uint32_t block_size;
 	struct k_msgq rx_queue;
 	bool request_clock : 1;
@@ -44,25 +36,17 @@ struct dmic_nrfx_pdm_drv_cfg {
 		PCLK32M_HFXO,
 		ACLK
 	} clk_src;
-	void *mem_reg;
 };
 
-static void free_buffer(struct dmic_nrfx_pdm_drv_data *drv_data)
-{
-	k_mem_slab_free(drv_data->mem_slab, drv_data->mem_slab_buffer);
-	LOG_DBG("Freed buffer %p", drv_data->mem_slab_buffer);
-}
-
-static void stop_pdm(struct dmic_nrfx_pdm_drv_data *drv_data)
+static void free_buffer(struct dmic_nrfx_pdm_drv_data *drv_data, void *buffer)
 {
-	drv_data->stopping = true;
-	nrfx_pdm_stop(drv_data->pdm);
+	k_mem_slab_free(drv_data->mem_slab, buffer);
+	LOG_DBG("Freed buffer %p", buffer);
 }
 
 static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 {
 	struct dmic_nrfx_pdm_drv_data *drv_data = dev->data;
-	const struct dmic_nrfx_pdm_drv_cfg *drv_cfg = dev->config;
 	int ret;
 	bool stop = false;
 
@@ -70,18 +54,11 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 		void *buffer;
 		nrfx_err_t err;
 
-		ret = k_mem_slab_alloc(drv_data->mem_slab, &drv_data->mem_slab_buffer, K_NO_WAIT);
+		ret = k_mem_slab_alloc(drv_data->mem_slab, &buffer, K_NO_WAIT);
 		if (ret < 0) {
 			LOG_ERR("Failed to allocate buffer: %d", ret);
 			stop = true;
 		} else {
-			ret = dmm_buffer_in_prepare(drv_cfg->mem_reg, drv_data->mem_slab_buffer,
-						    drv_data->block_size, &buffer);
-			if (ret < 0) {
-				LOG_ERR("Failed to prepare buffer: %d", ret);
-				stop_pdm(drv_data);
-				return;
-			}
 			err = nrfx_pdm_buffer_set(drv_data->pdm, buffer, drv_data->block_size / 2);
 			if (err != NRFX_SUCCESS) {
 				LOG_ERR("Failed to set buffer: 0x%08x", err);
@@ -92,14 +69,7 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 
 	if (drv_data->stopping) {
 		if (evt->buffer_released) {
-			ret = dmm_buffer_in_release(drv_cfg->mem_reg, drv_data->mem_slab_buffer,
-						    drv_data->block_size, evt->buffer_released);
-			if (ret < 0) {
-				LOG_ERR("Failed to release buffer: %d", ret);
-				stop_pdm(drv_data);
-				return;
-			}
-			free_buffer(drv_data);
+			free_buffer(drv_data, evt->buffer_released);
 		}
 
 		if (drv_data->active) {
@@ -109,26 +79,22 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 			}
 		}
 	} else if (evt->buffer_released) {
-		ret = dmm_buffer_in_release(drv_cfg->mem_reg, drv_data->mem_slab_buffer,
-					    drv_data->block_size, evt->buffer_released);
-		if (ret < 0) {
-			LOG_ERR("Failed to release buffer: %d", ret);
-			stop_pdm(drv_data);
-			return;
-		}
 		ret = k_msgq_put(&drv_data->rx_queue,
-				 &drv_data->mem_slab_buffer,
+				 &evt->buffer_released,
 				 K_NO_WAIT);
 		if (ret < 0) {
 			LOG_ERR("No room in RX queue");
 			stop = true;
-			free_buffer(drv_data);
+
+			free_buffer(drv_data, evt->buffer_released);
 		} else {
 			LOG_DBG("Queued buffer %p", evt->buffer_released);
 		}
 	}
+
 	if (stop) {
-		stop_pdm(drv_data);
+		drv_data->stopping = true;
+		nrfx_pdm_stop(drv_data->pdm);
 	}
 }
 
@@ -202,7 +168,7 @@ static bool check_pdm_frequencies(const struct dmic_nrfx_pdm_drv_cfg *drv_cfg,
 		better_found = true;
 	}
 #else
-	if (IS_ENABLED(CONFIG_SOC_SERIES_NRF53X) || IS_ENABLED(CONFIG_SOC_SERIES_NRF54HX)) {
+	if (IS_ENABLED(CONFIG_SOC_SERIES_NRF53X)) {
 		const uint32_t src_freq =
 			(NRF_PDM_HAS_MCLKCONFIG && drv_cfg->clk_src == ACLK)
 			/* The DMIC_NRFX_PDM_DEVICE() macro contains build
@@ -214,13 +180,9 @@ static bool check_pdm_frequencies(const struct dmic_nrfx_pdm_drv_cfg *drv_cfg,
 			 * not defined (this expression will be eventually
 			 * optimized away then).
 			 */
-			/* TODO : PS does not provide correct formula for nRF54H20 PDM_CLK.
-			 * Assume that master clock source frequency is 8 MHz. Remove once
-			 * correct formula is found.
-			 */
 			? DT_PROP_OR(DT_NODELABEL(clock), hfclkaudio_frequency,
 				     0)
-			: DMIC_NRFX_CLOCK_FREQ;
+			: 32*1000*1000UL;
 		uint32_t req_freq = req_rate * ratio;
 		/* As specified in the nRF5340 PS:
 		 *
@@ -600,7 +562,6 @@ static int dmic_nrfx_pdm_read(const struct device *dev,
 	return ret;
 }
 
-#if CONFIG_CLOCK_CONTROL_NRF
 static void init_clock_manager(const struct device *dev)
 {
 	struct dmic_nrfx_pdm_drv_data *drv_data = dev->data;
@@ -620,7 +581,6 @@ static void init_clock_manager(const struct device *dev)
 	drv_data->clk_mgr = z_nrf_clock_control_get_onoff(subsys);
 	__ASSERT_NO_MSG(drv_data->clk_mgr != NULL);
 }
-#endif
 
 static const struct _dmic_ops dmic_ops = {
 	.configure = dmic_nrfx_pdm_configure,
@@ -649,8 +609,7 @@ static const struct _dmic_ops dmic_ops = {
 		k_msgq_init(&dmic_nrfx_pdm_data##idx.rx_queue,		     \
 			    (char *)rx_msgs##idx, sizeof(void *),	     \
 			    ARRAY_SIZE(rx_msgs##idx));			     \
-		IF_ENABLED(CONFIG_CLOCK_CONTROL_NRF,			     \
-			   (init_clock_manager(dev);))			     \
+		init_clock_manager(dev);				     \
 		return 0;						     \
 	}								     \
 	static void event_handler##idx(const nrfx_pdm_evt_t *evt)	     \
@@ -665,7 +624,6 @@ static const struct _dmic_ops dmic_ops = {
 		.nrfx_def_cfg.skip_psel_cfg = true,			     \
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(PDM(idx)),		     \
 		.clk_src = PDM_CLK_SRC(idx),				     \
-		.mem_reg = DMM_DEV_TO_REG(PDM(idx)),			     \
 	};								     \
 	BUILD_ASSERT(PDM_CLK_SRC(idx) != ACLK || NRF_PDM_HAS_MCLKCONFIG,     \
 		"Clock source ACLK is not available.");			     \

From 4430afb0843ae9b1ef8a2ac751d5a5a108817f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:17 +0100
Subject: [PATCH 1263/2913] Revert "[nrf fromlist] dts: common: nordic: Add PDM
 to nrf54h20 dts"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5503683318f643737870905d75dbc8de5d08343e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/bindings/audio/nordic,nrf-pdm.yaml | 2 +-
 dts/common/nordic/nrf54h20.dtsi        | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/dts/bindings/audio/nordic,nrf-pdm.yaml b/dts/bindings/audio/nordic,nrf-pdm.yaml
index 78b08567b7d..c18d9ceebe8 100644
--- a/dts/bindings/audio/nordic,nrf-pdm.yaml
+++ b/dts/bindings/audio/nordic,nrf-pdm.yaml
@@ -5,7 +5,7 @@ description: Nordic PDM (Pulse Density Modulation interface)
 
 compatible: "nordic,nrf-pdm"
 
-include: ["base.yaml", "pinctrl-device.yaml", "memory-region.yaml", "nordic-clockpin.yaml"]
+include: [base.yaml, pinctrl-device.yaml]
 
 properties:
   reg:
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 5e019542f66..6d4f50a57c6 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -905,15 +905,6 @@
 				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
-			pdm0: pdm@993000 {
-				compatible = "nordic,nrf-pdm";
-				reg = <0x993000 0x1000>;
-				status = "disabled";
-				interrupts = <403 NRF_DEFAULT_IRQ_PRIORITY>;
-				nordic,clockpin-enable = <NRF_FUN_PDM_CLK>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
-			};
-
 			qdec130: qdec@994000 {
 				compatible = "nordic,nrf-qdec";
 				reg = <0x994000 0x1000>;

From 389c19a93c9537c9c01ae0c33e19ec0f055ad0e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:18 +0100
Subject: [PATCH 1264/2913] Revert "[nrf fromtree] net: openthread: Add
 `modcarrier` command to OT diag module."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c9fea6236830ea4be58eca0154df23c0208f09b6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/ieee802154/Kconfig                    |  1 -
 modules/openthread/Kconfig.features           |  1 +
 modules/openthread/platform/diag.c            | 37 -------------------
 modules/openthread/platform/platform-zephyr.h |  9 +----
 modules/openthread/platform/radio.c           | 29 ---------------
 5 files changed, 2 insertions(+), 75 deletions(-)

diff --git a/drivers/ieee802154/Kconfig b/drivers/ieee802154/Kconfig
index 629b492a579..af405551f63 100644
--- a/drivers/ieee802154/Kconfig
+++ b/drivers/ieee802154/Kconfig
@@ -102,7 +102,6 @@ config IEEE802154_SELECTIVE_TXCHANNEL
 
 config IEEE802154_CARRIER_FUNCTIONS
 	bool "Support for carrier functions"
-	default y if OPENTHREAD_DIAG
 	help
 	  Enable support for functions such as modulated carrier and continuous carrier.
 
diff --git a/modules/openthread/Kconfig.features b/modules/openthread/Kconfig.features
index ccdd3236d38..514b9b85745 100644
--- a/modules/openthread/Kconfig.features
+++ b/modules/openthread/Kconfig.features
@@ -136,6 +136,7 @@ config OPENTHREAD_DHCP6_SERVER
 
 config OPENTHREAD_DIAG
 	bool "Diagnostic functions support"
+	depends on IEEE802154_CARRIER_FUNCTIONS
 	help
 	  Enable OpenThread CLI diagnostic commands
 
diff --git a/modules/openthread/platform/diag.c b/modules/openthread/platform/diag.c
index 23ea3b97986..b92e34209b8 100644
--- a/modules/openthread/platform/diag.c
+++ b/modules/openthread/platform/diag.c
@@ -7,11 +7,9 @@
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 
-#include <openthread/error.h>
 #include <openthread/platform/diag.h>
 
 #include "platform-zephyr.h"
-#include "zephyr/sys/util.h"
 
 /**
  * Diagnostics mode variables.
@@ -21,8 +19,6 @@ static bool sDiagMode;
 static void *sDiagCallbackContext;
 static otPlatDiagOutputCallback sDiagOutputCallback;
 
-static otError startModCarrier(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[]);
-
 static void diag_output(const char *aFormat, ...)
 {
 	va_list args;
@@ -51,12 +47,6 @@ otError otPlatDiagProcess(otInstance *aInstance, uint8_t aArgsLength, char *aArg
 	ARG_UNUSED(aInstance);
 	ARG_UNUSED(aArgsLength);
 
-#if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
-	if (strcmp(aArgs[0], "modcarrier") == 0) {
-		return startModCarrier(aInstance, aArgsLength - 1, aArgs + 1);
-	}
-#endif
-
 	/* Add more platform specific diagnostics features here. */
 	diag_output("diag feature '%s' is not supported\r\n", aArgs[0]);
 
@@ -286,30 +276,3 @@ otError otPlatDiagGpioGetMode(uint32_t aGpio, otGpioMode *aMode)
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(openthread_config) && \
 	* DT_NODE_HAS_PROP(DT_COMPAT_GET_ANY_STATUS_OKAY(openthread_config), diag_gpios)
 	*/
-
-#if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
-
-static otError startModCarrier(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[])
-{
-	ARG_UNUSED(aInstance);
-	ARG_UNUSED(aArgsLength);
-
-	bool enable = true;
-	uint8_t data[OT_RADIO_FRAME_MAX_SIZE + 1];
-
-	if (aArgsLength <= 0) {
-		return OT_ERROR_INVALID_ARGS;
-	}
-
-	if (strcmp(aArgs[0], "stop") == 0) {
-		enable = false;
-	} else {
-		if (hex2bin(aArgs[0], strlen(aArgs[0]), data, ARRAY_SIZE(data)) == 0) {
-			return OT_ERROR_INVALID_ARGS;
-		}
-	}
-
-	return platformRadioTransmitModulatedCarrier(aInstance, enable, data);
-}
-
-#endif
diff --git a/modules/openthread/platform/platform-zephyr.h b/modules/openthread/platform/platform-zephyr.h
index ca25fedf2b1..94fd04d7057 100644
--- a/modules/openthread/platform/platform-zephyr.h
+++ b/modules/openthread/platform/platform-zephyr.h
@@ -77,20 +77,13 @@ uint16_t platformRadioChannelGet(otInstance *aInstance);
 otError platformRadioTransmitCarrier(otInstance *aInstance, bool aEnable);
 #endif /* CONFIG_IEEE802154_CARRIER_FUNCTIONS */
 
-#if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
-/**
- * Start/stop modulated carrier wave transmission.
- */
-otError platformRadioTransmitModulatedCarrier(otInstance *aInstance, bool aEnable,
-					      const uint8_t *aData);
-#endif
-
 /**
  * This function initializes the random number service used by OpenThread.
  *
  */
 void platformRandomInit(void);
 
+
 /**
  *  Initialize platform Shell driver.
  */
diff --git a/modules/openthread/platform/radio.c b/modules/openthread/platform/radio.c
index 73f6f4dc9cc..33fc7b42bbf 100644
--- a/modules/openthread/platform/radio.c
+++ b/modules/openthread/platform/radio.c
@@ -11,7 +11,6 @@
  *
  */
 
-#include <openthread/error.h>
 #define LOG_MODULE_NAME net_otPlat_radio
 
 #include <zephyr/logging/log.h>
@@ -833,34 +832,6 @@ otError platformRadioTransmitCarrier(otInstance *aInstance, bool aEnable)
 
 	return OT_ERROR_NONE;
 }
-
-otError platformRadioTransmitModulatedCarrier(otInstance *aInstance, bool aEnable,
-					      const uint8_t *aData)
-{
-	if (radio_api->modulated_carrier == NULL) {
-		return OT_ERROR_NOT_IMPLEMENTED;
-	}
-
-	if (aEnable && sState == OT_RADIO_STATE_RECEIVE) {
-		if (aData == NULL) {
-			return OT_ERROR_INVALID_ARGS;
-		}
-
-		radio_api->set_txpower(radio_dev, get_transmit_power_for_channel(channel));
-
-		if (radio_api->modulated_carrier(radio_dev, aData) != 0) {
-			return OT_ERROR_FAILED;
-		}
-		sState = OT_RADIO_STATE_TRANSMIT;
-	} else if ((!aEnable) && sState == OT_RADIO_STATE_TRANSMIT) {
-		return otPlatRadioReceive(aInstance, channel);
-	} else {
-		return OT_ERROR_INVALID_STATE;
-	}
-
-	return OT_ERROR_NONE;
-}
-
 #endif /* CONFIG_IEEE802154_CARRIER_FUNCTIONS */
 
 otRadioState otPlatRadioGetState(otInstance *aInstance)

From d441800da9f9692c69658051c3bc5c457e7519bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:18 +0100
Subject: [PATCH 1265/2913] Revert "[nrf fromtree] drivers: ieee802154: New API
 for modulated carrier wave transmission."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3ac6a883c29e3f078b9ea3810d99b1a3ada9d2e0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/ieee802154/Kconfig                    |  5 ----
 drivers/ieee802154/ieee802154_nrf5.c          | 24 +++---------------
 include/zephyr/net/ieee802154_radio.h         | 25 -------------------
 modules/hal_nordic/Kconfig                    |  2 +-
 modules/openthread/Kconfig.features           |  1 -
 modules/openthread/platform/diag.c            |  2 --
 modules/openthread/platform/platform-zephyr.h |  2 --
 modules/openthread/platform/radio.c           |  2 --
 8 files changed, 4 insertions(+), 59 deletions(-)

diff --git a/drivers/ieee802154/Kconfig b/drivers/ieee802154/Kconfig
index af405551f63..a4e4e6d307d 100644
--- a/drivers/ieee802154/Kconfig
+++ b/drivers/ieee802154/Kconfig
@@ -100,11 +100,6 @@ config IEEE802154_SELECTIVE_TXCHANNEL
 	  this Kconfig option is enabled. If the Kconfig option is disabled the drivers
 	  MUST NOT have the capability.
 
-config IEEE802154_CARRIER_FUNCTIONS
-	bool "Support for carrier functions"
-	help
-	  Enable support for functions such as modulated carrier and continuous carrier.
-
 module = IEEE802154_DRIVER
 module-str = IEEE 802.15.4 driver
 module-help = Sets log level for IEEE 802.15.4 Device Drivers.
diff --git a/drivers/ieee802154/ieee802154_nrf5.c b/drivers/ieee802154/ieee802154_nrf5.c
index a74606edf44..613c913868b 100644
--- a/drivers/ieee802154/ieee802154_nrf5.c
+++ b/drivers/ieee802154/ieee802154_nrf5.c
@@ -720,7 +720,7 @@ static int nrf5_stop(const struct device *dev)
 	return 0;
 }
 
-#if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
+#if defined(CONFIG_NRF_802154_CARRIER_FUNCTIONS)
 static int nrf5_continuous_carrier(const struct device *dev)
 {
 	ARG_UNUSED(dev);
@@ -737,23 +737,6 @@ static int nrf5_continuous_carrier(const struct device *dev)
 
 	return 0;
 }
-
-static int nrf_modulated_carrier(const struct device *dev, const uint8_t *data)
-{
-	ARG_UNUSED(dev);
-
-	nrf_802154_tx_power_set(nrf5_data.txpwr);
-
-	if (!nrf_802154_modulated_carrier(data)) {
-		LOG_ERR("Failed to enter modulated carrier state");
-		return -EIO;
-	}
-
-	LOG_DBG("Modulated carrier wave transmission started (channel: %d)",
-		nrf_802154_channel_get());
-
-	return 0;
-}
 #endif
 
 #if !defined(CONFIG_IEEE802154_NRF5_EXT_IRQ_MGMT)
@@ -1261,16 +1244,15 @@ static const struct ieee802154_radio_api nrf5_radio_api = {
 	.set_txpower = nrf5_set_txpower,
 	.start = nrf5_start,
 	.stop = nrf5_stop,
-#if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
+#if defined(CONFIG_NRF_802154_CARRIER_FUNCTIONS)
 	.continuous_carrier = nrf5_continuous_carrier,
-	.modulated_carrier = nrf_modulated_carrier,
 #endif
 	.tx = nrf5_tx,
 	.ed_scan = nrf5_energy_scan_start,
 	.get_time = nrf5_get_time,
 	.get_sch_acc = nrf5_get_acc,
 	.configure = nrf5_configure,
-	.attr_get = nrf5_attr_get,
+	.attr_get = nrf5_attr_get
 };
 
 #if defined(CONFIG_NET_L2_IEEE802154)
diff --git a/include/zephyr/net/ieee802154_radio.h b/include/zephyr/net/ieee802154_radio.h
index e2ab96ffac4..f9a557beba0 100644
--- a/include/zephyr/net/ieee802154_radio.h
+++ b/include/zephyr/net/ieee802154_radio.h
@@ -1765,7 +1765,6 @@ struct ieee802154_radio_api {
 	 */
 	int (*stop)(const struct device *dev);
 
-#if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 	/**
 	 * @brief Start continuous carrier wave transmission.
 	 *
@@ -1787,30 +1786,6 @@ struct ieee802154_radio_api {
 	 */
 	int (*continuous_carrier)(const struct device *dev);
 
-	/**
-	 * @brief Start modulated carrier wave transmission.
-	 *
-	 * @details When the radio is emitting modulated carrier signals, it
-	 * blocks all transmissions on the selected channel.
-	 * This function is to be called only during radio
-	 * tests. Do not use it during normal device operation.
-	 *
-	 * @note Implementations MAY **sleep** and will usually NOT be
-	 * **isr-ok**. MAY be called in any interface state once the driver is
-	 * fully initialized ("ready").
-	 *
-	 * @param dev pointer to IEEE 802.15.4 driver device
-	 * @param data Pointer to a buffer to modulate the carrier with.
-	 * The first byte is the data length.
-	 *
-	 * @retval 0 modulated carrier wave transmission started
-	 * @retval -EALREADY The driver was already in "TESTING" state and
-	 * emitting a modulated carrier.
-	 * @retval -EIO not started
-	 */
-	int (*modulated_carrier)(const struct device *dev, const uint8_t *data);
-#endif /* CONFIG_IEEE802154_CARRIER_FUNCTIONS */
-
 	/**
 	 * @brief Set or update driver configuration.
 	 *
diff --git a/modules/hal_nordic/Kconfig b/modules/hal_nordic/Kconfig
index f29b77e120e..dd4e0a0859b 100644
--- a/modules/hal_nordic/Kconfig
+++ b/modules/hal_nordic/Kconfig
@@ -204,7 +204,7 @@ config NRF_802154_SECURITY_KEY_STORAGE_SIZE
 
 config NRF_802154_CARRIER_FUNCTIONS
 	bool "nRF 802.15.4 carrier functions"
-	default y if (OPENTHREAD_DIAG || IEEE802154_CARRIER_FUNCTIONS)
+	default y if OPENTHREAD_DIAG
 	help
 	  This option enables functions such as modulated carrier and continuous carrier.
 	  If this option is modified on a multicore SoC, its remote counterpart must be set to the exact same value.
diff --git a/modules/openthread/Kconfig.features b/modules/openthread/Kconfig.features
index 514b9b85745..ccdd3236d38 100644
--- a/modules/openthread/Kconfig.features
+++ b/modules/openthread/Kconfig.features
@@ -136,7 +136,6 @@ config OPENTHREAD_DHCP6_SERVER
 
 config OPENTHREAD_DIAG
 	bool "Diagnostic functions support"
-	depends on IEEE802154_CARRIER_FUNCTIONS
 	help
 	  Enable OpenThread CLI diagnostic commands
 
diff --git a/modules/openthread/platform/diag.c b/modules/openthread/platform/diag.c
index b92e34209b8..a55368bb10f 100644
--- a/modules/openthread/platform/diag.c
+++ b/modules/openthread/platform/diag.c
@@ -86,7 +86,6 @@ void otPlatDiagRadioReceived(otInstance *aInstance,
 	ARG_UNUSED(aError);
 }
 
-#if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 otError otPlatDiagRadioTransmitCarrier(otInstance *aInstance, bool aEnable)
 {
 	if (!otPlatDiagModeGet()) {
@@ -95,7 +94,6 @@ otError otPlatDiagRadioTransmitCarrier(otInstance *aInstance, bool aEnable)
 
 	return platformRadioTransmitCarrier(aInstance, aEnable);
 }
-#endif /* CONFIG_IEEE802154_CARRIER_FUNCTIONS */
 
 void otPlatDiagAlarmCallback(otInstance *aInstance)
 {
diff --git a/modules/openthread/platform/platform-zephyr.h b/modules/openthread/platform/platform-zephyr.h
index 94fd04d7057..8e2d91bd5ef 100644
--- a/modules/openthread/platform/platform-zephyr.h
+++ b/modules/openthread/platform/platform-zephyr.h
@@ -70,12 +70,10 @@ void platformUartPanic(void);
  */
 uint16_t platformRadioChannelGet(otInstance *aInstance);
 
-#if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 /**
  * Start/stop continuous carrier wave transmission.
  */
 otError platformRadioTransmitCarrier(otInstance *aInstance, bool aEnable);
-#endif /* CONFIG_IEEE802154_CARRIER_FUNCTIONS */
 
 /**
  * This function initializes the random number service used by OpenThread.
diff --git a/modules/openthread/platform/radio.c b/modules/openthread/platform/radio.c
index 33fc7b42bbf..7e2943e734f 100644
--- a/modules/openthread/platform/radio.c
+++ b/modules/openthread/platform/radio.c
@@ -809,7 +809,6 @@ otError otPlatRadioReceiveAt(otInstance *aInstance, uint8_t aChannel,
 }
 #endif
 
-#if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 otError platformRadioTransmitCarrier(otInstance *aInstance, bool aEnable)
 {
 	if (radio_api->continuous_carrier == NULL) {
@@ -832,7 +831,6 @@ otError platformRadioTransmitCarrier(otInstance *aInstance, bool aEnable)
 
 	return OT_ERROR_NONE;
 }
-#endif /* CONFIG_IEEE802154_CARRIER_FUNCTIONS */
 
 otRadioState otPlatRadioGetState(otInstance *aInstance)
 {

From 62fbbcacf7e38e85d7985361b72282f76e29c855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:18 +0100
Subject: [PATCH 1266/2913] Revert "[nrf fromtree] drivers: ieee802154: add
 Kconfig IEEE802154_SELECTIVE_TXCHANNEL"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 314231f4404895840dcc2b8404d7789b5632b9a1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/ieee802154/Kconfig                    |  8 -----
 include/zephyr/net/ieee802154_pkt.h           | 22 ------------
 include/zephyr/net/ieee802154_radio.h         | 36 +------------------
 .../zephyr/net/ieee802154_radio_openthread.h  |  3 --
 4 files changed, 1 insertion(+), 68 deletions(-)

diff --git a/drivers/ieee802154/Kconfig b/drivers/ieee802154/Kconfig
index a4e4e6d307d..916cc1a9ddb 100644
--- a/drivers/ieee802154/Kconfig
+++ b/drivers/ieee802154/Kconfig
@@ -92,14 +92,6 @@ config IEEE802154_CSL_DEBUG
 	help
 	  Enable support for CSL debugging by avoiding sleep state in favor of receive state.
 
-config IEEE802154_SELECTIVE_TXCHANNEL
-	bool "Support for selective TX channel setting"
-	help
-	  Enable support for selectively setting TX channel for every timed transmission request.
-	  The drivers MAY have the capability IEEE802154_HW_SELECTIVE_TXCHANNEL only if
-	  this Kconfig option is enabled. If the Kconfig option is disabled the drivers
-	  MUST NOT have the capability.
-
 module = IEEE802154_DRIVER
 module-str = IEEE 802.15.4 driver
 module-help = Sets log level for IEEE 802.15.4 Device Drivers.
diff --git a/include/zephyr/net/ieee802154_pkt.h b/include/zephyr/net/ieee802154_pkt.h
index b51db139c60..3270f994248 100644
--- a/include/zephyr/net/ieee802154_pkt.h
+++ b/include/zephyr/net/ieee802154_pkt.h
@@ -59,16 +59,6 @@ struct net_pkt_cb_ieee802154 {
 			 */
 			uint8_t rssi;
 		};
-		struct {
-#if defined(CONFIG_IEEE802154_SELECTIVE_TXCHANNEL)
-			/* The channel used for timed transmissions.
-			 *
-			 * Please refer to `ieee802154_radio_api::tx` documentation for
-			 * details.
-			 */
-			uint8_t txchannel;
-#endif /* CONFIG_IEEE802154_SELECTIVE_TXCHANNEL */
-		};
 	};
 
 	/* Flags */
@@ -189,18 +179,6 @@ static inline void net_pkt_set_ieee802154_rssi_dbm(struct net_pkt *pkt, int16_t
 	CODE_UNREACHABLE;
 }
 
-#if defined(CONFIG_IEEE802154_SELECTIVE_TXCHANNEL)
-static inline uint8_t net_pkt_ieee802154_txchannel(struct net_pkt *pkt)
-{
-	return net_pkt_cb_ieee802154(pkt)->txchannel;
-}
-
-static inline void net_pkt_set_ieee802154_txchannel(struct net_pkt *pkt, uint8_t channel)
-{
-	net_pkt_cb_ieee802154(pkt)->txchannel = channel;
-}
-#endif /* CONFIG_IEEE802154_SELECTIVE_TXCHANNEL */
-
 static inline bool net_pkt_ieee802154_ack_fpb(struct net_pkt *pkt)
 {
 	return net_pkt_cb_ieee802154(pkt)->ack_fpb;
diff --git a/include/zephyr/net/ieee802154_radio.h b/include/zephyr/net/ieee802154_radio.h
index f9a557beba0..10a1922f6fa 100644
--- a/include/zephyr/net/ieee802154_radio.h
+++ b/include/zephyr/net/ieee802154_radio.h
@@ -520,26 +520,13 @@ enum ieee802154_hw_caps {
 	/** RxOnWhenIdle handling supported */
 	IEEE802154_RX_ON_WHEN_IDLE = BIT(12),
 
-	/** Support for timed transmissions on selective channel.
-	 *
-	 *  This capability informs that transmissions with modes
-	 *  @ref IEEE802154_TX_MODE_TXTIME and @ref IEEE802154_TX_MODE_TXTIME_CCA support
-	 *  scheduling of timed transmissions on selective tx channel.
-	 *  The driver MAY have this capability only if the Kconfig option
-	 *  `CONFIG_IEEE802154_SELECTIVE_TXCHANNEL` is set, otherwise the driver MUST
-	 *  NOT have this capability.
-	 *
-	 *  Please refer to the `ieee802154_radio_api::tx` documentation for details.
-	 */
-	IEEE802154_HW_SELECTIVE_TXCHANNEL = BIT(13),
-
 	/* Note: Update also IEEE802154_HW_CAPS_BITS_COMMON_COUNT when changing
 	 * the ieee802154_hw_caps type.
 	 */
 };
 
 /** @brief Number of bits used by ieee802154_hw_caps type. */
-#define IEEE802154_HW_CAPS_BITS_COMMON_COUNT (14)
+#define IEEE802154_HW_CAPS_BITS_COMMON_COUNT (13)
 
 /** @brief This and higher values are specific to the protocol- or driver-specific extensions. */
 #define IEEE802154_HW_CAPS_BITS_PRIV_START IEEE802154_HW_CAPS_BITS_COMMON_COUNT
@@ -638,8 +625,6 @@ enum ieee802154_tx_mode {
 	 * Transmit packet in the future, at the specified time, no CCA.
 	 *
 	 * @note requires IEEE802154_HW_TXTIME capability.
-	 *
-	 * @note capability IEEE802154_HW_SELECTIVE_TXCHANNEL may apply.
 	 */
 	IEEE802154_TX_MODE_TXTIME,
 
@@ -650,8 +635,6 @@ enum ieee802154_tx_mode {
 	 *
 	 * @note Required for Thread 1.2 Coordinated Sampled Listening feature
 	 * (see Thread specification 1.2.0, ch. 3.2.6.3).
-	 *
-	 * @note capability IEEE802154_HW_SELECTIVE_TXCHANNEL may apply.
 	 */
 	IEEE802154_TX_MODE_TXTIME_CCA,
 
@@ -1674,23 +1657,6 @@ struct ieee802154_radio_api {
 	 * considerable idle waiting time. SHALL return `-ENETDOWN` unless the
 	 * interface is "UP".
 	 *
-	 * @note The transmission occurs on the radio channel set by the call to
-	 * `set_channel()`. However, if the `CONFIG_IEEE802154_SELECTIVE_TXCHANNEL`
-	 * is set and the driver has the capability `IEEE802154_HW_SELECTIVE_TXCHANNEL`
-	 * then the transmissions requested with `mode` IEEE802154_TX_MODE_TXTIME
-	 * or `IEEE802154_TX_MODE_TXTIME_CCA` SHALL use the radio channel
-	 * returned by `net_pkt_ieee802154_txchannel()` to transmit the packet
-	 * and receive an ACK on that channel if the frame requested it. After
-	 * the operation the driver should return to the channel set previously by
-	 * `set_channel()` call.
-	 * It is responsibility of an upper layer to set the required radio channel
-	 * for the packet by a call to `net_pkt_set_ieee802154_txchannel()`.
-	 * This feature allows CSL transmissions as stated in IEEE 802.15.4-2020
-	 * chapter 6.12.2.7 CSL over multiple channels. This feature allows to perform
-	 * a switch of the radio channel as late as possible before transmission without
-	 * interrupting possible reception that could occur if separate `set_channel()`
-	 * was called.
-	 *
 	 * @param dev pointer to IEEE 802.15.4 driver device
 	 * @param mode the transmission mode, some of which require specific
 	 * offloading capabilities.
diff --git a/include/zephyr/net/ieee802154_radio_openthread.h b/include/zephyr/net/ieee802154_radio_openthread.h
index 3606c7a2b78..e45bbc6b85b 100644
--- a/include/zephyr/net/ieee802154_radio_openthread.h
+++ b/include/zephyr/net/ieee802154_radio_openthread.h
@@ -64,9 +64,6 @@ enum ieee802154_openthread_tx_mode {
 	 * section 11.3, table 11-2).
 	 *
 	 * Requires IEEE802154_OPENTHREAD_HW_MULTIPLE_CCA capability.
-	 *
-	 * @note Capability @ref IEEE802154_HW_SELECTIVE_TXCHANNEL applies as for
-	 *       @ref IEEE802154_TX_MODE_TXTIME_CCA.
 	 */
 	IEEE802154_OPENTHREAD_TX_MODE_TXTIME_MULTIPLE_CCA = IEEE802154_TX_MODE_PRIV_START
 };

From 101f827022fb26d9b24791b9330d550196924751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:18 +0100
Subject: [PATCH 1267/2913] Revert "[nrf fromlist] soc: nordic: common:
 mram_latency: Add option to auto request no latency"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a7fe5f7c4aab18312bd7f61afef55647e38f3db6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/common/Kconfig        | 7 -------
 soc/nordic/common/mram_latency.c | 4 ----
 2 files changed, 11 deletions(-)

diff --git a/soc/nordic/common/Kconfig b/soc/nordic/common/Kconfig
index db75ed28115..0170f266de3 100644
--- a/soc/nordic/common/Kconfig
+++ b/soc/nordic/common/Kconfig
@@ -25,13 +25,6 @@ config MRAM_LATENCY_SYNC_TIMEOUT
 	help
 	  Timeout is given in milliseconds.
 
-config MRAM_LATENCY_AUTO_REQ
-	bool "Request MRAM without latency at start"
-	help
-	  When enabled then MRAM configuration without latency is requested
-	  during the initialization and is kept enabled until the mram_latency API user
-	  calls mram_no_latency_sync_release().
-
 module = MRAM_LATENCY
 module-str = mram_latency
 source "subsys/logging/Kconfig.template.log_config"
diff --git a/soc/nordic/common/mram_latency.c b/soc/nordic/common/mram_latency.c
index cba1b498d6c..0bfc6d4bfe2 100644
--- a/soc/nordic/common/mram_latency.c
+++ b/soc/nordic/common/mram_latency.c
@@ -168,10 +168,6 @@ static int init_nrfs(void)
 
 	state = MRAM_LATENCY_ON;
 
-	if (IS_ENABLED(CONFIG_MRAM_LATENCY_AUTO_REQ)) {
-		mram_no_latency_sync_request();
-	}
-
 	return rv;
 }
 

From 6b1b2cd71cb34fddbd32249d943cf5e19c21cf4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:18 +0100
Subject: [PATCH 1268/2913] Revert "[nrf fromtree] tests: boards: nrf: Add MRAM
 latency test"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c9ce3be7b1f9df54ad479c6e5723542b3ab833b6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/boards/nrf/mram_latency/CMakeLists.txt |  10 -
 tests/boards/nrf/mram_latency/prj.conf       |   2 -
 tests/boards/nrf/mram_latency/src/main.c     | 189 -------------------
 tests/boards/nrf/mram_latency/testcase.yaml  |  12 --
 4 files changed, 213 deletions(-)
 delete mode 100644 tests/boards/nrf/mram_latency/CMakeLists.txt
 delete mode 100644 tests/boards/nrf/mram_latency/prj.conf
 delete mode 100644 tests/boards/nrf/mram_latency/src/main.c
 delete mode 100644 tests/boards/nrf/mram_latency/testcase.yaml

diff --git a/tests/boards/nrf/mram_latency/CMakeLists.txt b/tests/boards/nrf/mram_latency/CMakeLists.txt
deleted file mode 100644
index 4ac7b855575..00000000000
--- a/tests/boards/nrf/mram_latency/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(mram_latency)
-
-FILE(GLOB app_sources src/*.c)
-
-target_sources(app PRIVATE ${app_sources})
diff --git a/tests/boards/nrf/mram_latency/prj.conf b/tests/boards/nrf/mram_latency/prj.conf
deleted file mode 100644
index ed9ce9820c1..00000000000
--- a/tests/boards/nrf/mram_latency/prj.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_ZTEST=y
-CONFIG_MRAM_LATENCY=y
diff --git a/tests/boards/nrf/mram_latency/src/main.c b/tests/boards/nrf/mram_latency/src/main.c
deleted file mode 100644
index b7110dd7ae3..00000000000
--- a/tests/boards/nrf/mram_latency/src/main.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <errno.h>
-#include <string.h>
-#include <zephyr/cache.h>
-#include <zephyr/kernel.h>
-#include <zephyr/ztest.h>
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(test);
-
-#include <mram_latency.h>
-
-#define TIMEOUT_MS 10
-
-static volatile uint32_t current_state;
-static struct onoff_monitor monitor;
-static struct onoff_client early_client;
-static int early_rv;
-static int early_result;
-
-struct test_req {
-	struct onoff_client cli;
-	struct k_sem sem;
-	int res;
-	uint32_t state;
-};
-
-static void basic_cb(struct onoff_manager *mgr, struct onoff_client *cli, uint32_t state, int res)
-{
-	struct test_req *req = CONTAINER_OF(cli, struct test_req, cli);
-
-	req->res = res;
-	req->state = state;
-	k_sem_give(&req->sem);
-}
-
-static void monitor_cb(struct onoff_manager *mgr, struct onoff_monitor *mon, uint32_t state,
-		       int res)
-{
-	current_state = state;
-}
-
-ZTEST(mram_latency, test_basic_requests)
-{
-	struct test_req req1, req2;
-	uint32_t exp_state;
-	int rv;
-
-	k_sem_init(&req1.sem, 0, 1);
-	k_sem_init(&req2.sem, 0, 1);
-
-	sys_notify_init_callback(&req1.cli.notify, basic_cb);
-	exp_state = ONOFF_STATE_OFF;
-	/* Req: 0->1 trigger to on */
-	rv = mram_no_latency_request(&req1.cli);
-	zassert_equal(rv, exp_state, "Unexpected rv:%d (exp:%d)", rv, exp_state);
-
-	sys_notify_init_callback(&req2.cli.notify, basic_cb);
-	exp_state = ONOFF_STATE_TO_ON;
-	/* Req: 1->2 */
-	rv = mram_no_latency_request(&req2.cli);
-	zassert_equal(rv, exp_state, "Unexpected rv:%d (exp:%d)", rv, exp_state);
-
-	rv = k_sem_take(&req1.sem, K_MSEC(TIMEOUT_MS));
-	zassert_equal(rv, 0, "Unexpected rv:%d", rv);
-	zassert_equal(req1.res, 0, "Unexpected res:%d", req1.res);
-	zassert_equal(req1.state, ONOFF_STATE_ON, "Unexpected state:%08x", req1.state);
-
-	rv = k_sem_take(&req2.sem, K_MSEC(TIMEOUT_MS));
-	zassert_equal(rv, 0, "Unexpected rv:%d", rv);
-	zassert_equal(req2.res, 0, "Unexpected res:%d", req2.res);
-	zassert_equal(req2.state, ONOFF_STATE_ON);
-
-	exp_state = ONOFF_STATE_ON;
-	rv = mram_no_latency_cancel_or_release(&req2.cli);
-	/* Req: 2->1 */
-	zassert_equal(rv, exp_state, "Unexpected rv:%d (exp:%d)", rv, exp_state);
-
-	/* Req: 1->0 going to off triggered*/
-	rv = mram_no_latency_cancel_or_release(&req1.cli);
-	zassert_equal(rv, exp_state, "Unexpected rv:%d (exp:%d)", rv, exp_state);
-
-	sys_notify_init_callback(&req1.cli.notify, basic_cb);
-	exp_state = ONOFF_STATE_OFF;
-
-	/* Req: 0->1 triggered to on while in to off. */
-	rv = mram_no_latency_request(&req1.cli);
-	zassert_equal(rv, exp_state, "Unexpected rv:%d (exp:%d)", rv, exp_state);
-
-	/* Req: 1->0 releases which to off. */
-	exp_state = ONOFF_STATE_TO_ON;
-	rv = mram_no_latency_cancel_or_release(&req1.cli);
-	zassert_equal(rv, exp_state, "Unexpected rv:%d (exp:%d)", rv, exp_state);
-
-	k_msleep(10);
-}
-
-static void timeout(struct k_timer *timer)
-{
-	struct test_req *req = k_timer_user_data_get(timer);
-	uint32_t exp_state;
-	int rv;
-
-	sys_notify_init_callback(&req->cli.notify, basic_cb);
-	exp_state = ONOFF_STATE_OFF;
-	rv = mram_no_latency_request(&req->cli);
-	zassert_equal(rv, exp_state, "Unexpected rv:%d (exp:%d)", rv, exp_state);
-}
-
-ZTEST(mram_latency, test_req_from_irq)
-{
-	struct test_req req;
-	struct k_timer timer;
-	uint32_t exp_state;
-	int rv;
-
-	k_sem_init(&req.sem, 0, 1);
-	k_timer_init(&timer, timeout, NULL);
-	k_timer_user_data_set(&timer, &req);
-	/* Start k_timer and from that context request MRAM latency. */
-	k_timer_start(&timer, K_MSEC(1), K_NO_WAIT);
-
-	exp_state = ONOFF_STATE_ON;
-	rv = k_sem_take(&req.sem, K_MSEC(TIMEOUT_MS));
-	zassert_equal(rv, 0, "Unexpected rv:%d", rv);
-	zassert_equal(req.res, 0, "Unexpected res:%d", req.res);
-	zassert_equal(req.state, exp_state);
-
-	rv = mram_no_latency_cancel_or_release(&req.cli);
-	zassert_equal(rv, exp_state, "Unexpected rv:%d (exp:%d)", rv, exp_state);
-}
-
-ZTEST(mram_latency, test_sync_req)
-{
-	zassert_equal(current_state, ONOFF_STATE_OFF);
-	mram_no_latency_sync_request();
-	zassert_equal(current_state, ONOFF_STATE_ON);
-	mram_no_latency_sync_release();
-	zassert_equal(current_state, ONOFF_STATE_OFF);
-}
-
-ZTEST(mram_latency, test_early_req)
-{
-	zassert_true(early_rv >= 0);
-	zassert_true(early_result >= 0);
-}
-
-static void *setup(void)
-{
-	int rv;
-
-	monitor.callback = monitor_cb;
-	rv = onoff_monitor_register(&mram_latency_mgr, &monitor);
-	zassert_equal(rv, 0);
-
-	if (early_rv >= 0) {
-		sys_notify_fetch_result(&early_client.notify, &early_result);
-	}
-
-	mram_no_latency_cancel_or_release(&early_client);
-
-	return NULL;
-}
-
-static void before(void *arg)
-{
-	zassert_equal(current_state, ONOFF_STATE_OFF);
-}
-
-static void after(void *arg)
-{
-	zassert_equal(current_state, ONOFF_STATE_OFF);
-}
-
-static int early_mram_client(void)
-{
-	sys_notify_init_spinwait(&early_client.notify);
-	early_rv = mram_no_latency_request(&early_client);
-
-	return 0;
-}
-
-SYS_INIT(early_mram_client, PRE_KERNEL_2, 0);
-
-ZTEST_SUITE(mram_latency, NULL, setup, before, after, NULL);
diff --git a/tests/boards/nrf/mram_latency/testcase.yaml b/tests/boards/nrf/mram_latency/testcase.yaml
deleted file mode 100644
index 691370a5618..00000000000
--- a/tests/boards/nrf/mram_latency/testcase.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-common:
-  tags: drivers
-  harness: ztest
-
-tests:
-  boards.nrf.mram_latency:
-    platform_allow:
-      - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54h20dk/nrf54h20/cpurad
-    integration_platforms:
-      - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54h20dk/nrf54h20/cpurad

From a933c226fb915de2c37b98a79f174fdbd1eef293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:18 +0100
Subject: [PATCH 1269/2913] Revert "[nrf fromtree] soc: nordic: common: Add
 mram latency manager"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5b1321eeea1dcd3e99f898b9ac3e5df9926b80dd.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/common/CMakeLists.txt |   1 -
 soc/nordic/common/Kconfig        |  20 ----
 soc/nordic/common/mram_latency.c | 175 -------------------------------
 soc/nordic/common/mram_latency.h |  91 ----------------
 4 files changed, 287 deletions(-)
 delete mode 100644 soc/nordic/common/mram_latency.c
 delete mode 100644 soc/nordic/common/mram_latency.h

diff --git a/soc/nordic/common/CMakeLists.txt b/soc/nordic/common/CMakeLists.txt
index 8c00b768b90..4808319557c 100644
--- a/soc/nordic/common/CMakeLists.txt
+++ b/soc/nordic/common/CMakeLists.txt
@@ -34,4 +34,3 @@ if(CONFIG_TFM_PARTITION_PLATFORM)
 endif()
 
 zephyr_library_sources_ifdef(CONFIG_NRF_SYS_EVENT nrf_sys_event.c)
-zephyr_library_sources_ifdef(CONFIG_MRAM_LATENCY mram_latency.c)
diff --git a/soc/nordic/common/Kconfig b/soc/nordic/common/Kconfig
index 0170f266de3..e7e24ca8cf2 100644
--- a/soc/nordic/common/Kconfig
+++ b/soc/nordic/common/Kconfig
@@ -11,24 +11,4 @@ config NRF_SYS_EVENT
 	bool "nRF system event support"
 	select NRFX_POWER if !NRF_PLATFORM_HALTIUM
 
-config MRAM_LATENCY
-	bool "MRAM latency manager"
-	depends on NRFS_HAS_MRAM_SERVICE
-	select ONOFF
-	select NRFS_MRAM_SERVICE_ENABLED
-
-if MRAM_LATENCY
-
-config MRAM_LATENCY_SYNC_TIMEOUT
-	int "Timeout in synchronous request"
-	default 1000
-	help
-	  Timeout is given in milliseconds.
-
-module = MRAM_LATENCY
-module-str = mram_latency
-source "subsys/logging/Kconfig.template.log_config"
-
-endif # MRAM_LATENCY
-
 rsource "vpr/Kconfig"
diff --git a/soc/nordic/common/mram_latency.c b/soc/nordic/common/mram_latency.c
deleted file mode 100644
index 0bfc6d4bfe2..00000000000
--- a/soc/nordic/common/mram_latency.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <mram_latency.h>
-#include <zephyr/kernel.h>
-#include <nrfs_mram.h>
-#include <nrfs_backend_ipc_service.h>
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(mram_latency, CONFIG_MRAM_LATENCY_LOG_LEVEL);
-
-enum mram_latency_state {
-	MRAM_LATENCY_OFF = 0,
-	MRAM_LATENCY_OFF_PENDING,
-	MRAM_LATENCY_ON,
-};
-
-static struct k_work work;
-static bool no_latency;
-static enum mram_latency_state state;
-
-static onoff_notify_fn onoff_notify;
-struct onoff_manager mram_latency_mgr;
-
-struct sync_latency_req {
-	struct onoff_client cli;
-	struct k_sem sem;
-	int res;
-};
-
-static void latency_change_req(bool latency_not_allowed)
-{
-	nrfs_err_t err;
-
-	if (latency_not_allowed) {
-		err = nrfs_mram_set_latency(MRAM_LATENCY_NOT_ALLOWED, NULL);
-		if (err != NRFS_SUCCESS) {
-			onoff_notify(&mram_latency_mgr, -EIO);
-		}
-	} else {
-		/* There is no event for that setting so we can notify onoff manager
-		 * immediately.
-		 */
-		err = nrfs_mram_set_latency(MRAM_LATENCY_ALLOWED, NULL);
-		onoff_notify(&mram_latency_mgr, err != NRFS_SUCCESS ? -EIO : 0);
-	}
-}
-
-static void latency_change(bool latency_not_allowed)
-{
-	LOG_DBG("Request: latency %s allowed", latency_not_allowed ? "not " : "");
-	if (state == MRAM_LATENCY_OFF) {
-		state = MRAM_LATENCY_OFF_PENDING;
-	} else if (k_is_in_isr()) {
-		/* nrfs cannot be called from interrupt context so defer to the work
-		 * queue context and execute from there.
-		 */
-		no_latency = latency_not_allowed;
-		k_work_submit(&work);
-	} else {
-		latency_change_req(latency_not_allowed);
-	}
-}
-
-static void no_latency_start(struct onoff_manager *mgr, onoff_notify_fn notify)
-{
-	onoff_notify = notify;
-	latency_change(true);
-}
-
-static void no_latency_stop(struct onoff_manager *mgr, onoff_notify_fn notify)
-{
-	latency_change(false);
-}
-
-static void evt_handler(nrfs_mram_latency_evt_t const *p_evt, void *context)
-{
-	int res = p_evt->type == NRFS_MRAM_LATENCY_REQ_APPLIED ? 0 : -EIO;
-
-	LOG_DBG("Latency not allowed - applied");
-	onoff_notify(&mram_latency_mgr, res);
-}
-
-static void work_handler(struct k_work *work)
-{
-	latency_change_req(no_latency);
-}
-
-int mram_no_latency_cancel_or_release(struct onoff_client *cli)
-{
-	return onoff_cancel_or_release(&mram_latency_mgr, cli);
-}
-
-int mram_no_latency_request(struct onoff_client *cli)
-{
-	return onoff_request(&mram_latency_mgr, cli);
-}
-
-static void sync_req_cb(struct onoff_manager *mgr, struct onoff_client *cli, uint32_t state,
-			int res)
-{
-	struct sync_latency_req *req = CONTAINER_OF(cli, struct sync_latency_req, cli);
-
-	req->res = res;
-	k_sem_give(&req->sem);
-}
-
-int mram_no_latency_sync_request(void)
-{
-	struct sync_latency_req req;
-	int rv;
-
-	if (k_is_in_isr() || (state != MRAM_LATENCY_ON)) {
-		return -ENOTSUP;
-	}
-
-	k_sem_init(&req.sem, 0, 1);
-	sys_notify_init_callback(&req.cli.notify, sync_req_cb);
-	rv = onoff_request(&mram_latency_mgr, &req.cli);
-	if (rv < 0) {
-		return rv;
-	}
-
-	rv = k_sem_take(&req.sem, K_MSEC(CONFIG_MRAM_LATENCY_SYNC_TIMEOUT));
-	if (rv < 0) {
-		return rv;
-	}
-
-	return req.res;
-}
-
-int mram_no_latency_sync_release(void)
-{
-	return onoff_release(&mram_latency_mgr) >= 0 ? 0 : -EIO;
-}
-
-/* First initialize onoff manager to be able to accept requests. */
-static int init_manager(void)
-{
-	static const struct onoff_transitions transitions =
-		ONOFF_TRANSITIONS_INITIALIZER(no_latency_start, no_latency_stop, NULL);
-
-	return onoff_manager_init(&mram_latency_mgr, &transitions);
-}
-
-/* When kernel and IPC is running initialize nrfs. Optionally, execute pending request. */
-static int init_nrfs(void)
-{
-	nrfs_err_t err;
-	int rv;
-
-	err = nrfs_backend_wait_for_connection(K_FOREVER);
-	if (err != NRFS_SUCCESS) {
-		return -EIO;
-	}
-
-	err = nrfs_mram_init(evt_handler);
-	if (err != NRFS_SUCCESS) {
-		return -EIO;
-	}
-
-	k_work_init(&work, work_handler);
-
-	if (state == MRAM_LATENCY_OFF_PENDING) {
-		latency_change(true);
-	}
-
-	state = MRAM_LATENCY_ON;
-
-	return rv;
-}
-
-SYS_INIT(init_manager, PRE_KERNEL_1, 0);
-SYS_INIT(init_nrfs, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY);
diff --git a/soc/nordic/common/mram_latency.h b/soc/nordic/common/mram_latency.h
deleted file mode 100644
index dc24566a905..00000000000
--- a/soc/nordic/common/mram_latency.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @file
- * nRF SoC specific public APIs for MRAM latency management
- * @brief Experimental. It will be replaced by the PM latency policy API in the future.
- */
-
-#ifndef SOC_NORDIC_COMMON_MRAM_LATENCY_H_
-#define SOC_NORDIC_COMMON_MRAM_LATENCY_H_
-
-#include <zephyr/sys/onoff.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @internal For test purposes only. */
-extern struct onoff_manager mram_latency_mgr;
-
-/** @brief Request MRAM operations without latency.
- *
- * The return value indicates the success or failure of an attempt to initiate
- * an operation to request the MRAM low latency. If initiation of the
- * operation succeeds, the result of the request operation is provided through
- * the configured client notification method, possibly before this call returns.
- *
- * @param cli pointer to client state providing instructions on synchronous
- *            expectations and how to notify the client when the request
- *            completes. Behavior is undefined if client passes a pointer
- *            object associated with an incomplete service operation.
- *
- * @retval non-negative the observed state of the on-off service associated
- *                      with the MRAM latency service.
- * @retval -EIO if MRAM latency service returned error.
- * @retval -EINVAL if the parameters are invalid.
- * @retval -EAGAIN if the reference count would overflow.
- */
-int mram_no_latency_request(struct onoff_client *cli);
-
-/** @brief Request MRAM operations without latency.
- *
- * Request is synchronous and blocks until it is completed. It can be called only
- * from the thread context and cannot be called in the pre kernel stage.
- *
- * @retval 0 on successful request.
- * @retval -EIO if MRAM latency service returned error.
- * @retval -EAGAIN if request was not completed on time.
- */
-int mram_no_latency_sync_request(void);
-
-/**
- * @brief Safely cancel a request for MRAM operations without latency.
- *
- * It may be that a client has issued a reservation request but needs to
- * shut down before the request has completed. This function attempts to
- * cancel the request and issues a release if cancellation fails because
- * the request was completed. This synchronously ensures that ownership
- * data reverts to the client so is available for a future request.
- *
- * @param cli a pointer to the same client state that was provided
- *            when the operation to be cancelled was issued.
- *
- * @retval ONOFF_STATE_TO_ON if the cancellation occurred before the transition
- *                           completed.
- * @retval ONOFF_STATE_ON if the cancellation occurred after the transition
- *                        completed.
- * @retval -EINVAL if the parameters are invalid.
- * @retval -EIO if MRAM latency service returned error.
- * @retval negative other errors produced by onoff_release().
- */
-int mram_no_latency_cancel_or_release(struct onoff_client *cli);
-
-/**
- * @brief Release a request for MRAM operations without latency.
- *
- * It should match with a completed @ref mram_no_latency_sync_request call.
- *
- * @retval 0 on successful request.
- * @retval -EIO if MRAM latency service returned error.
- */
-int mram_no_latency_sync_release(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SOC_NORDIC_COMMON_MRAM_LATENCY_H_ */

From 80c9428e38fca4746b606c9eed0283936af06052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:18 +0100
Subject: [PATCH 1270/2913] Revert "[nrf fromlist] tests: boards: nrf: i2c: add
 support for nRF54H20 cpuppr"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 160c2850d341c7f57559a84faaca618e58f6ec33.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuppr.conf    |  1 -
 .../boards/nrf54h20dk_nrf54h20_cpuppr.overlay | 62 -------------------
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 51 ---------------
 .../i2c_slave/sysbuild/vpr_launcher/prj.conf  |  1 -
 tests/boards/nrf/i2c/i2c_slave/testcase.yaml  |  2 -
 5 files changed, 117 deletions(-)
 delete mode 100644 tests/boards/nrf/i2c/i2c_slave/boards/nrf54h20dk_nrf54h20_cpuppr.conf
 delete mode 100644 tests/boards/nrf/i2c/i2c_slave/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
 delete mode 100644 tests/boards/nrf/i2c/i2c_slave/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 delete mode 100644 tests/boards/nrf/i2c/i2c_slave/sysbuild/vpr_launcher/prj.conf

diff --git a/tests/boards/nrf/i2c/i2c_slave/boards/nrf54h20dk_nrf54h20_cpuppr.conf b/tests/boards/nrf/i2c/i2c_slave/boards/nrf54h20dk_nrf54h20_cpuppr.conf
deleted file mode 100644
index 157e0a11f72..00000000000
--- a/tests/boards/nrf/i2c/i2c_slave/boards/nrf54h20dk_nrf54h20_cpuppr.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NRFX_TWIS131=y
diff --git a/tests/boards/nrf/i2c/i2c_slave/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/tests/boards/nrf/i2c/i2c_slave/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
deleted file mode 100644
index e9698b2b2bc..00000000000
--- a/tests/boards/nrf/i2c/i2c_slave/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
+++ /dev/null
@@ -1,62 +0,0 @@
-/ {
-	aliases {
-		i2c-slave = &i2c131;
-	};
-};
-
-&pinctrl {
-	i2c130_default_alt: i2c130_default_alt {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 2, 8)>,
-				<NRF_PSEL(TWIM_SCL, 1, 2)>;
-		};
-	};
-
-	i2c130_sleep_alt: i2c130_sleep_alt {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 2, 8)>,
-				<NRF_PSEL(TWIM_SCL, 1, 2)>;
-			low-power-enable;
-		};
-	};
-
-	i2c131_default_alt: i2c131_default_alt {
-		group1 {
-/* Temporary workaround as it is currently not possible
- * to configure pins for TWIS with pinctrl.
- */
-			psels = <NRF_PSEL(TWIM_SDA, 2, 9)>,
-				<NRF_PSEL(TWIM_SCL, 1, 3)>;
-			bias-pull-up;
-		};
-	};
-
-	i2c131_sleep_alt: i2c131_sleep_alt {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 2, 9)>,
-				<NRF_PSEL(TWIM_SCL, 1, 3)>;
-			low-power-enable;
-		};
-	};
-};
-
-&i2c130 {
-	compatible = "nordic,nrf-twim";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-	pinctrl-0 = <&i2c130_default_alt>;
-	pinctrl-1 = <&i2c130_sleep_alt>;
-	pinctrl-names = "default", "sleep";
-	sensor: sensor@54 {
-		reg = <0x54>;
-	};
-};
-
-&i2c131 {
-	compatible = "nordic,nrf-twis";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-	pinctrl-0 = <&i2c131_default_alt>;
-	pinctrl-1 = <&i2c131_sleep_alt>;
-	pinctrl-names = "default", "sleep";
-};
diff --git a/tests/boards/nrf/i2c/i2c_slave/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/boards/nrf/i2c/i2c_slave/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index 1d770095936..00000000000
--- a/tests/boards/nrf/i2c/i2c_slave/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,51 +0,0 @@
-&pinctrl {
-	i2c130_default_alt: i2c130_default_alt {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 2, 8)>,
-				<NRF_PSEL(TWIM_SCL, 1, 2)>;
-		};
-	};
-
-	i2c130_sleep_alt: i2c130_sleep_alt {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 2, 8)>,
-				<NRF_PSEL(TWIM_SCL, 1, 2)>;
-			low-power-enable;
-		};
-	};
-
-	i2c131_default_alt: i2c131_default_alt {
-		group1 {
-/* Temporary workaround as it is currently not possible
- * to configure pins for TWIS with pinctrl.
- */
-			psels = <NRF_PSEL(TWIM_SDA, 2, 9)>,
-				<NRF_PSEL(TWIM_SCL, 1, 3)>;
-			bias-pull-up;
-		};
-	};
-
-	i2c131_sleep_alt: i2c131_sleep_alt {
-		group1 {
-			psels = <NRF_PSEL(TWIM_SDA, 2, 9)>,
-				<NRF_PSEL(TWIM_SCL, 1, 3)>;
-			low-power-enable;
-		};
-	};
-};
-
-&i2c130 {
-	status = "reserved";
-	pinctrl-0 = <&i2c130_default_alt>;
-	pinctrl-1 = <&i2c130_sleep_alt>;
-	pinctrl-names = "default", "sleep";
-	interrupt-parent = <&cpuppr_clic>;
-};
-
-&i2c131 {
-	status = "reserved";
-	pinctrl-0 = <&i2c131_default_alt>;
-	pinctrl-1 = <&i2c131_sleep_alt>;
-	pinctrl-names = "default", "sleep";
-	interrupt-parent = <&cpuppr_clic>;
-};
diff --git a/tests/boards/nrf/i2c/i2c_slave/sysbuild/vpr_launcher/prj.conf b/tests/boards/nrf/i2c/i2c_slave/sysbuild/vpr_launcher/prj.conf
deleted file mode 100644
index b2a4ba59104..00000000000
--- a/tests/boards/nrf/i2c/i2c_slave/sysbuild/vpr_launcher/prj.conf
+++ /dev/null
@@ -1 +0,0 @@
-# nothing here
diff --git a/tests/boards/nrf/i2c/i2c_slave/testcase.yaml b/tests/boards/nrf/i2c/i2c_slave/testcase.yaml
index 6a63242ee25..ad3b34058c7 100644
--- a/tests/boards/nrf/i2c/i2c_slave/testcase.yaml
+++ b/tests/boards/nrf/i2c/i2c_slave/testcase.yaml
@@ -10,10 +10,8 @@ tests:
       - nrf5340dk/nrf5340/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54h20dk/nrf54h20/cpuppr
     integration_platforms:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54h20dk/nrf54h20/cpuppr

From 1d1ed5b78c2a3b0815b477dd0c723803c79302e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:18 +0100
Subject: [PATCH 1271/2913] Revert "[nrf fromlist] nrfwifi: Display
 EAP_TLS_SHA256 security in scan results"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4092e6df311e18779fe1bb28ca29fff9e7931891.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c b/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
index f85c71c4f5f..e30f572aeb3 100644
--- a/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
+++ b/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
@@ -297,8 +297,6 @@ static inline enum wifi_security_type drv_to_wifi_mgmt(int drv_security_type)
 		return WIFI_SECURITY_TYPE_WAPI;
 	case NRF_WIFI_EAP:
 		return WIFI_SECURITY_TYPE_EAP;
-	case NRF_WIFI_EAP_TLS_SHA256:
-		return WIFI_SECURITY_TYPE_EAP_TLS_SHA256;
 	default:
 		return WIFI_SECURITY_TYPE_UNKNOWN;
 	}

From 9b1fb3cf4996a953902ce4a5b68786abbd57d645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:18 +0100
Subject: [PATCH 1272/2913] Revert "[nrf fromlist] manifest: Update nrf_wifi"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d5f626ec9394c199529963f6c6bff19dea7bcdd7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 3e66f68d53c..fadcb7d7daf 100644
--- a/west.yml
+++ b/west.yml
@@ -303,7 +303,7 @@ manifest:
       revision: 3cfca0192ff84da919e9bc7978bcc2239cd6a395
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: f6b950a3b5c0187fe499b0e518426d5bf88b7e68
+      revision: 71261e2b719b98500b7741c3398a74a5fb631596
       path: modules/lib/nrf_wifi
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719

From ddd179a173588ff05db50ed036af4055fd15a323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:18 +0100
Subject: [PATCH 1273/2913] Revert "[nrf fromlist] samples: nordic: system_off:
 use retained_mem on all targets"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0a2e205750dc7eff8767afa543b2fd23a1fbb332.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nordic/system_off/CMakeLists.txt   |   2 +-
 samples/boards/nordic/system_off/Kconfig      |  16 +-
 samples/boards/nordic/system_off/README.rst   |   8 +-
 .../boards/nrf52840dk_nrf52840.overlay        |  22 ---
 .../boards/nrf52dk_nrf52832.overlay           |  22 ---
 ...15dk_nrf54l05_cpuapp_retained_mem.overlay} |   0
 ...15dk_nrf54l10_cpuapp_retained_mem.overlay} |   0
 ...15dk_nrf54l15_cpuapp_retained_mem.overlay} |   0
 samples/boards/nordic/system_off/sample.yaml  |  27 +++-
 samples/boards/nordic/system_off/src/main.c   |   4 +-
 .../boards/nordic/system_off/src/retained.c   | 152 ++++++++++++++++--
 11 files changed, 181 insertions(+), 72 deletions(-)
 delete mode 100644 samples/boards/nordic/system_off/boards/nrf52840dk_nrf52840.overlay
 delete mode 100644 samples/boards/nordic/system_off/boards/nrf52dk_nrf52832.overlay
 rename samples/boards/nordic/system_off/boards/{nrf54l15dk_nrf54l05_cpuapp.overlay => nrf54l15dk_nrf54l05_cpuapp_retained_mem.overlay} (100%)
 rename samples/boards/nordic/system_off/boards/{nrf54l15dk_nrf54l10_cpuapp.overlay => nrf54l15dk_nrf54l10_cpuapp_retained_mem.overlay} (100%)
 rename samples/boards/nordic/system_off/boards/{nrf54l15dk_nrf54l15_cpuapp.overlay => nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay} (100%)

diff --git a/samples/boards/nordic/system_off/CMakeLists.txt b/samples/boards/nordic/system_off/CMakeLists.txt
index 986fca97f34..1cff779506b 100644
--- a/samples/boards/nordic/system_off/CMakeLists.txt
+++ b/samples/boards/nordic/system_off/CMakeLists.txt
@@ -5,6 +5,6 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(nrf_system_off)
 
 target_sources(app PRIVATE src/main.c)
-if (CONFIG_APP_USE_RETAINED_MEM)
+if (CONFIG_APP_USE_NRF_RETENTION OR CONFIG_APP_USE_RETAINED_MEM)
   target_sources(app PRIVATE src/retained.c)
 endif()
diff --git a/samples/boards/nordic/system_off/Kconfig b/samples/boards/nordic/system_off/Kconfig
index 798927205bd..c5a0f492d90 100644
--- a/samples/boards/nordic/system_off/Kconfig
+++ b/samples/boards/nordic/system_off/Kconfig
@@ -3,9 +3,23 @@
 
 mainmenu "Nordic SYSTEM_OFF demo"
 
+choice
+	prompt "Use retention"
+	optional
+
+config APP_USE_NRF_RETENTION
+	bool "Use state retention in system off using nRF POWER"
+	depends on SOC_COMPATIBLE_NRF52X && CRC
+	help
+	  On some Nordic chips this application supports retaining
+	  memory while in system off using POWER peripheral.
+	  Select this to enable the feature.
+
 config APP_USE_RETAINED_MEM
 	bool "Use state retention in system off using retained_mem driver"
-	select RETAINED_MEM
+	depends on RETAINED_MEM
+
+endchoice
 
 config GRTC_WAKEUP_ENABLE
 	bool "Use GRTC to wake up device from system off"
diff --git a/samples/boards/nordic/system_off/README.rst b/samples/boards/nordic/system_off/README.rst
index 5124d087b77..7c98a4e8336 100644
--- a/samples/boards/nordic/system_off/README.rst
+++ b/samples/boards/nordic/system_off/README.rst
@@ -13,10 +13,10 @@ deep sleep on Nordic platforms.
 RAM Retention
 =============
 
-This sample can also demonstrate RAM retention.
-By selecting ``CONFIG_APP_USE_RETAINED_MEM=y`` state related to number of boots,
-number of times system off was entered, and total uptime since initial power-on
-are retained in a checksummed data structure.
+This sample can also can demonstrate RAM retention. By selecting
+``CONFIG_APP_USE_NRF_RETENTION=y`` or ``CONFIG_APP_USE_RETAINED_MEM=y``
+state related to number of boots, number of times system off was entered,
+and total uptime since initial power-on are retained in a checksummed data structure.
 RAM is configured to keep the containing section powered while in system-off mode.
 
 Requirements
diff --git a/samples/boards/nordic/system_off/boards/nrf52840dk_nrf52840.overlay b/samples/boards/nordic/system_off/boards/nrf52840dk_nrf52840.overlay
deleted file mode 100644
index c203d90a0a1..00000000000
--- a/samples/boards/nordic/system_off/boards/nrf52840dk_nrf52840.overlay
+++ /dev/null
@@ -1,22 +0,0 @@
-/ {
-	sram0@2003f000 {
-		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x2003f000 DT_SIZE_K(4)>;
-		zephyr,memory-region = "RetainedMem";
-		status = "okay";
-
-		retainedmem0: retainedmem {
-			compatible = "zephyr,retained-ram";
-			status = "okay";
-		};
-	};
-
-	aliases {
-		retainedmemdevice = &retainedmem0;
-	};
-};
-
-&sram0 {
-	/* Shrink SRAM size to avoid overlap with retained memory region */
-	reg = <0x20000000 DT_SIZE_K(252)>;
-};
diff --git a/samples/boards/nordic/system_off/boards/nrf52dk_nrf52832.overlay b/samples/boards/nordic/system_off/boards/nrf52dk_nrf52832.overlay
deleted file mode 100644
index 13e2e99ddf2..00000000000
--- a/samples/boards/nordic/system_off/boards/nrf52dk_nrf52832.overlay
+++ /dev/null
@@ -1,22 +0,0 @@
-/ {
-	sram0@20007000 {
-		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x20007000 DT_SIZE_K(4)>;
-		zephyr,memory-region = "RetainedMem";
-		status = "okay";
-
-		retainedmem0: retainedmem {
-			compatible = "zephyr,retained-ram";
-			status = "okay";
-		};
-	};
-
-	aliases {
-		retainedmemdevice = &retainedmem0;
-	};
-};
-
-&sram0 {
-	/* Shrink SRAM size to avoid overlap with retained memory region */
-	reg = <0x20000000 DT_SIZE_K(28)>;
-};
diff --git a/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l05_cpuapp_retained_mem.overlay
similarity index 100%
rename from samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
rename to samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l05_cpuapp_retained_mem.overlay
diff --git a/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l10_cpuapp_retained_mem.overlay
similarity index 100%
rename from samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
rename to samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l10_cpuapp_retained_mem.overlay
diff --git a/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay
similarity index 100%
rename from samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay
diff --git a/samples/boards/nordic/system_off/sample.yaml b/samples/boards/nordic/system_off/sample.yaml
index fcc96f6c44d..18f629c4e54 100644
--- a/samples/boards/nordic/system_off/sample.yaml
+++ b/samples/boards/nordic/system_off/sample.yaml
@@ -22,17 +22,32 @@ tests:
         - "system off demo"
         - "Retained data not supported"
         - "Entering system off; press sw0 to restart"
-  sample.boards.nrf.system_off.retained_mem:
+  sample.boards.nrf.system_off.nrf_retained:
     integration_platforms:
       - nrf52840dk/nrf52840
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
+    extra_configs:
+      - CONFIG_APP_USE_NRF_RETENTION=y
+    harness: console
+    harness_config:
+      type: multi_line
+      ordered: true
+      regex:
+        - "system off demo"
+        - "Retained data: INVALID"
+        - "Boot count: 1"
+        - "Off count: 0"
+        - "Active Ticks:"
+        - "Entering system off; press sw0 to restart"
+  sample.boards.nrf.system_off.retained_mem:
+    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay"
+    platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15dk/nrf54l10/cpuapp
-      - nrf54l15dk/nrf54l05/cpuapp
     extra_configs:
       - CONFIG_APP_USE_RETAINED_MEM=y
+      - CONFIG_RETAINED_MEM=y
     harness: console
     harness_config:
       type: multi_line
@@ -47,8 +62,6 @@ tests:
   sample.boards.nrf.system_off.grtc_wakeup:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15dk/nrf54l10/cpuapp
-      - nrf54l15dk/nrf54l05/cpuapp
     extra_configs:
       - CONFIG_GRTC_WAKEUP_ENABLE=y
     harness: console
@@ -66,13 +79,13 @@ tests:
         - "Retained data not supported"
         - "Entering system off; wait 2 seconds to restart"
   sample.boards.nrf.system_off.retained_mem.grtc_wakeup:
+    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay"
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15dk/nrf54l10/cpuapp
-      - nrf54l15dk/nrf54l05/cpuapp
     extra_configs:
       - CONFIG_APP_USE_RETAINED_MEM=y
       - CONFIG_GRTC_WAKEUP_ENABLE=y
+      - CONFIG_RETAINED_MEM=y
     harness: console
     harness_config:
       type: multi_line
diff --git a/samples/boards/nordic/system_off/src/main.c b/samples/boards/nordic/system_off/src/main.c
index 40c4f2bb7a5..b40b1ea26da 100644
--- a/samples/boards/nordic/system_off/src/main.c
+++ b/samples/boards/nordic/system_off/src/main.c
@@ -35,7 +35,7 @@ int main(void)
 
 	printf("\n%s system off demo\n", CONFIG_BOARD);
 
-	if (IS_ENABLED(CONFIG_APP_USE_RETAINED_MEM)) {
+	if (IS_ENABLED(CONFIG_APP_USE_NRF_RETENTION) || IS_ENABLED(CONFIG_APP_USE_RETAINED_MEM)) {
 		bool retained_ok = retained_validate();
 
 		/* Increment for this boot attempt and update. */
@@ -81,7 +81,7 @@ int main(void)
 		return 0;
 	}
 
-	if (IS_ENABLED(CONFIG_APP_USE_RETAINED_MEM)) {
+	if (IS_ENABLED(CONFIG_APP_USE_NRF_RETENTION) || IS_ENABLED(CONFIG_APP_USE_RETAINED_MEM)) {
 		/* Update the retained state */
 		retained.off_count += 1;
 		retained_update();
diff --git a/samples/boards/nordic/system_off/src/retained.c b/samples/boards/nordic/system_off/src/retained.c
index 316ec165d62..66f6a353f04 100644
--- a/samples/boards/nordic/system_off/src/retained.c
+++ b/samples/boards/nordic/system_off/src/retained.c
@@ -15,24 +15,147 @@
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/crc.h>
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(retainedmemdevice))
+#if CONFIG_APP_USE_NRF_RETENTION
+#include <hal/nrf_power.h>
+
+/* nRF52 RAM (really, RAM AHB slaves) are partitioned as:
+ * * Up to 8 blocks of two 4 KiBy byte "small" sections
+ * * A 9th block of with 32 KiBy "large" sections
+ *
+ * At time of writing the maximum number of large sections is 6, all
+ * within the first large block.  Theoretically there could be more
+ * sections in the 9th block, and possibly more blocks.
+ */
+
+/* Inclusive address of RAM start */
+#define SRAM_BEGIN (uintptr_t)DT_REG_ADDR(DT_NODELABEL(sram0))
+
+/* Exclusive address of RAM end */
+#define SRAM_END (SRAM_BEGIN + (uintptr_t)DT_REG_SIZE(DT_NODELABEL(sram0)))
+
+/* Size of a controllable RAM section in the small blocks */
+#define SMALL_SECTION_SIZE 4096
+
+/* Number of controllable RAM sections in each of the lower blocks */
+#define SMALL_SECTIONS_PER_BLOCK 2
+
+/* Span of a small block */
+#define SMALL_BLOCK_SIZE (SMALL_SECTIONS_PER_BLOCK * SMALL_SECTION_SIZE)
+
+/* Number of small blocks */
+#define SMALL_BLOCK_COUNT 8
+
+/* Span of the SRAM area covered by small sections */
+#define SMALL_SECTION_SPAN (SMALL_BLOCK_COUNT * SMALL_BLOCK_SIZE)
+
+/* Inclusive address of the RAM range covered by large sections */
+#define LARGE_SECTION_BEGIN (SRAM_BEGIN + SMALL_SECTION_SPAN)
+
+/* Size of a controllable RAM section in large blocks */
+#define LARGE_SECTION_SIZE 32768
+
+#elif CONFIG_APP_USE_RETAINED_MEM
 const static struct device *retained_mem_device = DEVICE_DT_GET(DT_ALIAS(retainedmemdevice));
+#endif
+
+/* Set or clear RAM retention in SYSTEM_OFF for the provided object.
+ *
+ * @param ptr pointer to the start of the retainable object
+ *
+ * @param len length of the retainable object
+ *
+ * @param enable true to enable retention, false to clear retention
+ */
+static int ram_range_retain(const void *ptr,
+			    size_t len,
+			    bool enable)
+{
+	int rc = 0;
+
+#if CONFIG_APP_USE_NRF_RETENTION
+	/* This only works for nRF52 with the POWER module.
+	 * The other  Nordic chips use a different low-level API,
+	 * which is not currently used by this variant.
+	 */
+	uintptr_t addr = (uintptr_t)ptr;
+	uintptr_t addr_end = addr + len;
+
+	/* Error if the provided range is empty or doesn't lie
+	 * entirely within the SRAM address space.
+	 */
+	if ((len == 0U)
+	    || (addr < SRAM_BEGIN)
+	    || (addr > (SRAM_END - len))) {
+		return -EINVAL;
+	}
+
+	/* Iterate over each section covered by the range, setting the
+	 * corresponding RAM OFF retention bit in the parent block.
+	 */
+	do {
+		uintptr_t block_base = SRAM_BEGIN;
+		uint32_t section_size = SMALL_SECTION_SIZE;
+		uint32_t sections_per_block = SMALL_SECTIONS_PER_BLOCK;
+		bool is_large = (addr >= LARGE_SECTION_BEGIN);
+		uint8_t block = 0;
+
+		if (is_large) {
+			block = 8;
+			block_base = LARGE_SECTION_BEGIN;
+			section_size = LARGE_SECTION_SIZE;
+
+			/* RAM[x] supports only 16 sections, each its own bit
+			 * for POWER (0..15) and RETENTION (16..31).  We don't
+			 * know directly how many sections are present, so
+			 * assume they all are; the true limit will be
+			 * determined by the SRAM size.
+			 */
+			sections_per_block = 16;
+		}
+
+		uint32_t section = (addr - block_base) / section_size;
+
+		if (section >= sections_per_block) {
+			block += section / sections_per_block;
+			section %= sections_per_block;
+		}
+
+		uint32_t section_mask =
+			(POWER_RAM_POWERSET_S0RETENTION_On
+					 << (section + POWER_RAM_POWERSET_S0RETENTION_Pos));
+
+		if (enable) {
+			nrf_power_rampower_mask_on(NRF_POWER, block, section_mask);
+		} else {
+			nrf_power_rampower_mask_off(NRF_POWER, block, section_mask);
+		}
+
+		/* Move to the first address in the next section. */
+		addr += section_size - (addr % section_size);
+	} while (addr < addr_end);
+#elif CONFIG_APP_USE_RETAINED_MEM
+	/* Retention setting cannot be controlled runtime with retained_mem API */
+	(void)enable;
+	rc = retained_mem_write(retained_mem_device, 0, ptr, len);
 #else
-#error "retained_mem region not defined"
+	#error "Unsupported retention setting"
 #endif
 
-struct retained_data retained;
+	return rc;
+}
+
+/* Retained data must be defined in a no-init section to prevent the C
+ * runtime initialization from zeroing it before anybody can see it.
+ * It is not necesarry when retained_mem driver is utilized
+ * as in this case retained data is stored in an area not initialized in runtime.
+ */
+__noinit struct retained_data retained;
 
 #define RETAINED_CRC_OFFSET offsetof(struct retained_data, crc)
 #define RETAINED_CHECKED_SIZE (RETAINED_CRC_OFFSET + sizeof(retained.crc))
 
 bool retained_validate(void)
 {
-	int rc;
-
-	rc = retained_mem_read(retained_mem_device, 0, (uint8_t *)&retained, sizeof(retained));
-	__ASSERT_NO_MSG(rc == 0);
-
 	/* The residue of a CRC is what you get from the CRC over the
 	 * message catenated with its CRC.  This is the post-final-xor
 	 * residue for CRC-32 (CRC-32/ISO-HDLC) which Zephyr calls
@@ -51,13 +174,19 @@ bool retained_validate(void)
 	/* Reset to accrue runtime from this session. */
 	retained.uptime_latest = 0;
 
+	/* Reconfigure to retain the state during system off, regardless of
+	 * whether validation succeeded.  Although these values can sometimes
+	 * be observed to be preserved across System OFF, the product
+	 * specification states they are not retained in that situation, and
+	 * that can also be observed.
+	 */
+	(void)ram_range_retain(&retained, RETAINED_CHECKED_SIZE, true);
+
 	return valid;
 }
 
 void retained_update(void)
 {
-	int rc;
-
 	uint64_t now = k_uptime_ticks();
 
 	retained.uptime_sum += (now - retained.uptime_latest);
@@ -67,7 +196,4 @@ void retained_update(void)
 				  RETAINED_CRC_OFFSET);
 
 	retained.crc = sys_cpu_to_le32(crc);
-
-	rc = retained_mem_write(retained_mem_device, 0, (uint8_t *)&retained, sizeof(retained));
-	__ASSERT_NO_MSG(rc == 0);
 }

From f00eb74ef51097091b8c851a267f2d1f068aee28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:18 +0100
Subject: [PATCH 1274/2913] Revert "[nrf fromlist] soc: nordic: poweroff: add
 retention management"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 49e3fe1e493137cb9e1c895f8000fe638927d0c3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/common/poweroff.c | 38 ------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/soc/nordic/common/poweroff.c b/soc/nordic/common/poweroff.c
index 99a2bcfb3d6..b3210da697d 100644
--- a/soc/nordic/common/poweroff.c
+++ b/soc/nordic/common/poweroff.c
@@ -5,7 +5,6 @@
 
 #include <zephyr/sys/poweroff.h>
 #include <zephyr/toolchain.h>
-#include <zephyr/drivers/retained_mem/nrf_retained_mem.h>
 
 #if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_SERIES_NRF52X)
 #include <hal/nrf_power.h>
@@ -18,45 +17,8 @@
 #include <helpers/nrfx_reset_reason.h>
 #endif
 
-#if defined(CONFIG_HAS_NORDIC_RAM_CTRL)
-#include <helpers/nrfx_ram_ctrl.h>
-#endif
-
 void z_sys_poweroff(void)
 {
-#if defined(CONFIG_HAS_NORDIC_RAM_CTRL)
-	uint8_t *ram_start;
-	size_t ram_size;
-
-#if defined(NRF_MEMORY_RAM_BASE)
-	ram_start = (uint8_t *)NRF_MEMORY_RAM_BASE;
-#else
-	ram_start = (uint8_t *)NRF_MEMORY_RAM0_BASE;
-#endif
-
-	ram_size = 0;
-#if defined(NRF_MEMORY_RAM_SIZE)
-	ram_size += NRF_MEMORY_RAM_SIZE;
-#endif
-#if defined(NRF_MEMORY_RAM0_SIZE)
-	ram_size += NRF_MEMORY_RAM0_SIZE;
-#endif
-#if defined(NRF_MEMORY_RAM1_SIZE)
-	ram_size += NRF_MEMORY_RAM1_SIZE;
-#endif
-#if defined(NRF_MEMORY_RAM2_SIZE)
-	ram_size += NRF_MEMORY_RAM2_SIZE;
-#endif
-
-	/* Disable retention for all memory blocks */
-	nrfx_ram_ctrl_retention_enable_set(ram_start, ram_size, false);
-#endif
-
-#if defined(CONFIG_RETAINED_MEM_NRF_RAM_CTRL)
-	/* Restore retention for retained_mem driver regions defined in devicetree */
-	(void)z_nrf_retained_mem_retention_apply();
-#endif
-
 #if defined(CONFIG_SOC_SERIES_NRF54LX)
 	nrfx_reset_reason_clear(UINT32_MAX);
 #endif

From 578637c3236308812b1266cbe3d681983a2e51c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:18 +0100
Subject: [PATCH 1275/2913] Revert "[nrf fromlist] drivers: retained_mem: nrf:
 make ram_ctrl variant explicit"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ee2e2b8d3b24779ff5a9c482d1b3174be3d6d4d3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../retained_mem/retained_mem_nrf_ram_ctrl.c  |  5 +--
 .../drivers/retained_mem/nrf_retained_mem.h   | 36 -------------------
 2 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 include/zephyr/drivers/retained_mem/nrf_retained_mem.h

diff --git a/drivers/retained_mem/retained_mem_nrf_ram_ctrl.c b/drivers/retained_mem/retained_mem_nrf_ram_ctrl.c
index 08e777aa6fa..8be3d5c35a3 100644
--- a/drivers/retained_mem/retained_mem_nrf_ram_ctrl.c
+++ b/drivers/retained_mem/retained_mem_nrf_ram_ctrl.c
@@ -6,7 +6,6 @@
 
 #include <zephyr/devicetree.h>
 #include <zephyr/kernel.h>
-#include <zephyr/drivers/retained_mem/nrf_retained_mem.h>
 
 #include <helpers/nrfx_ram_ctrl.h>
 
@@ -23,7 +22,7 @@ static const struct ret_mem_region ret_mem_regions[] = {
 	DT_FOREACH_STATUS_OKAY(zephyr_retained_ram, _BUILD_MEM_REGION)
 };
 
-int z_nrf_retained_mem_retention_apply(void)
+static int retained_mem_nrf_init(void)
 {
 	const struct ret_mem_region *rmr;
 
@@ -34,3 +33,5 @@ int z_nrf_retained_mem_retention_apply(void)
 
 	return 0;
 }
+
+SYS_INIT(retained_mem_nrf_init, PRE_KERNEL_1, 0);
diff --git a/include/zephyr/drivers/retained_mem/nrf_retained_mem.h b/include/zephyr/drivers/retained_mem/nrf_retained_mem.h
deleted file mode 100644
index 376673c92d1..00000000000
--- a/include/zephyr/drivers/retained_mem/nrf_retained_mem.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_DRIVERS_RETAINED_MEM_NRF_RETAINED_MEM_H
-#define ZEPHYR_INCLUDE_DRIVERS_RETAINED_MEM_NRF_RETAINED_MEM_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <zephyr/drivers/retained_mem.h>
-
-#if defined(CONFIG_RETAINED_MEM_NRF_RAM_CTRL) || defined(__DOXYGEN__)
-/** @brief Apply memory retention settings.
- *
- * Memory retention settings to apply are derived from devicetree configuration.
- *
- * @retval 0 if the retention settings were applied successfully.
- * @retval -ENOTSUP if retention configuration is not present in devicetree.
- */
-int z_nrf_retained_mem_retention_apply(void);
-#else
-static inline int z_nrf_retained_mem_retention_apply(void)
-{
-	return -ENOTSUP;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZEPHYR_INCLUDE_DRIVERS_RETAINED_MEM_NRF_RETAINED_MEM_H */

From e435e03509211fb8c7ffd3440dbd718740e77d3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:18 +0100
Subject: [PATCH 1276/2913] Revert "[nrf fromlist] soc: nordic: add common
 symbol for RAM control helper presence"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 826e8e92885324744c0bca6af35c159d33dd32e1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/retained_mem/Kconfig.nrf       | 2 +-
 modules/hal_nordic/nrfx/CMakeLists.txt | 2 +-
 soc/nordic/common/Kconfig              | 3 ---
 soc/nordic/nrf52/Kconfig               | 1 -
 soc/nordic/nrf54h/Kconfig              | 2 --
 soc/nordic/nrf54l/Kconfig              | 1 -
 6 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/retained_mem/Kconfig.nrf b/drivers/retained_mem/Kconfig.nrf
index 70aef8b504f..348361e5f6f 100644
--- a/drivers/retained_mem/Kconfig.nrf
+++ b/drivers/retained_mem/Kconfig.nrf
@@ -13,6 +13,6 @@ config RETAINED_MEM_NRF_RAM_CTRL
 	bool "nRF RAM retention driver"
 	default y
 	depends on DT_HAS_ZEPHYR_RETAINED_RAM_ENABLED && RETAINED_MEM_ZEPHYR_RAM && POWEROFF
-	depends on HAS_NORDIC_RAM_CTRL
+	depends on SOC_FAMILY_NORDIC_NRF
 	help
 	  Enable driver for Nordic RAM retention.
diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 81428db0538..1665c122c9f 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -111,7 +111,7 @@ zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF92X  ${MDK_DIR}/system_nrf92.c
 
 zephyr_library_sources(nrfx_glue.c)
 zephyr_library_sources(${HELPERS_DIR}/nrfx_flag32_allocator.c)
-zephyr_library_sources_ifdef(CONFIG_HAS_NORDIC_RAM_CTRL       ${HELPERS_DIR}/nrfx_ram_ctrl.c)
+zephyr_library_sources_ifdef(CONFIG_RETAINED_MEM_NRF_RAM_CTRL ${HELPERS_DIR}/nrfx_ram_ctrl.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI                 ${HELPERS_DIR}/nrfx_gppi_dppi.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_PPI                  ${HELPERS_DIR}/nrfx_gppi_ppi.c)
 
diff --git a/soc/nordic/common/Kconfig b/soc/nordic/common/Kconfig
index e7e24ca8cf2..ef32e7403c1 100644
--- a/soc/nordic/common/Kconfig
+++ b/soc/nordic/common/Kconfig
@@ -4,9 +4,6 @@
 config HAS_NORDIC_DMM
 	bool
 
-config HAS_NORDIC_RAM_CTRL
-	bool "nRF RAM control helper support"
-
 config NRF_SYS_EVENT
 	bool "nRF system event support"
 	select NRFX_POWER if !NRF_PLATFORM_HALTIUM
diff --git a/soc/nordic/nrf52/Kconfig b/soc/nordic/nrf52/Kconfig
index edc2b70d667..adb57916627 100644
--- a/soc/nordic/nrf52/Kconfig
+++ b/soc/nordic/nrf52/Kconfig
@@ -11,7 +11,6 @@ config SOC_SERIES_NRF52X
 	imply XIP
 	select HAS_NRFX
 	select HAS_NORDIC_DRIVERS
-	select HAS_NORDIC_RAM_CTRL
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select HAS_SWO
 	select HAS_POWEROFF
diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
index 36979b554e0..0baab4121ad 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -21,7 +21,6 @@ config SOC_NRF54H20_CPUAPP_COMMON
 	select CPU_HAS_FPU
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
 	select HAS_NORDIC_DMM
-	select HAS_NORDIC_RAM_CTRL
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select NRFS_HAS_CLOCK_SERVICE
 	select NRFS_HAS_DVFS_SERVICE
@@ -53,7 +52,6 @@ config SOC_NRF54H20_CPURAD_COMMON
 	select NRFS_HAS_TEMP_SERVICE
 	select NRFS_HAS_VBUS_DETECTOR_SERVICE
 	select HAS_NORDIC_DMM
-	select HAS_NORDIC_RAM_CTRL
 	select HAS_PM
 	select HAS_POWEROFF
 
diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index ab5f1c745b9..c4cd8e6aa0f 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -20,7 +20,6 @@ config SOC_NRF54L_CPUAPP_COMMON
 	select CPU_HAS_FPU
 	select HAS_HW_NRF_RADIO_IEEE802154
 	select HAS_POWEROFF
-	select HAS_NORDIC_RAM_CTRL
 
 config SOC_NRF54L05_CPUAPP
 	select SOC_NRF54L_CPUAPP_COMMON

From efdc90f351c5a571d6096041bcb91dc5fb10b7ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:18 +0100
Subject: [PATCH 1277/2913] Revert "[nrf fromlist] Bluetooth: Host: Cancel
 pending deferred work on disconnect"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a198e078af5b96feacceb2e38bb9fd9118fee89f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/host/conn.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index a51b9a73787..8a62c1fb3ba 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -1264,11 +1264,6 @@ void bt_conn_set_state(struct bt_conn *conn, bt_conn_state_t state)
 		 */
 		switch (old_state) {
 		case BT_CONN_DISCONNECT_COMPLETE:
-			/* Any previously scheduled deferred work now becomes invalid
-			 * so cancel it here, before we yield to tx thread.
-			 */
-			k_work_cancel_delayable(&conn->deferred_work);
-
 			bt_conn_tx_notify(conn, true);
 
 			bt_conn_reset_rx_state(conn);

From 9e19c98c7683d5e5f286a79915d6afcc1abba77a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:18 +0100
Subject: [PATCH 1278/2913] Revert "[nrf fromlist] tests: boards: nrf70: Add
 ztests for bus library"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 70969ee3f1f4b36cfbab6c5a353dfb8996fa0c54.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/boards/nrf/nrf70/bustest/CMakeLists.txt |  16 --
 tests/boards/nrf/nrf70/bustest/Kconfig        |  15 --
 tests/boards/nrf/nrf70/bustest/prj.conf       |  27 ---
 tests/boards/nrf/nrf70/bustest/src/main.c     | 198 ------------------
 tests/boards/nrf/nrf70/bustest/testcase.yaml  |  20 --
 5 files changed, 276 deletions(-)
 delete mode 100644 tests/boards/nrf/nrf70/bustest/CMakeLists.txt
 delete mode 100644 tests/boards/nrf/nrf70/bustest/Kconfig
 delete mode 100644 tests/boards/nrf/nrf70/bustest/prj.conf
 delete mode 100644 tests/boards/nrf/nrf70/bustest/src/main.c
 delete mode 100644 tests/boards/nrf/nrf70/bustest/testcase.yaml

diff --git a/tests/boards/nrf/nrf70/bustest/CMakeLists.txt b/tests/boards/nrf/nrf70/bustest/CMakeLists.txt
deleted file mode 100644
index 741d622b119..00000000000
--- a/tests/boards/nrf/nrf70/bustest/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-cmake_minimum_required(VERSION 3.20.0)
-
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(nrf70_bustest)
-
-target_sources(app PRIVATE
-  src/main.c
-)
-
-target_link_libraries(app PUBLIC nrf70-buslib)
diff --git a/tests/boards/nrf/nrf70/bustest/Kconfig b/tests/boards/nrf/nrf70/bustest/Kconfig
deleted file mode 100644
index d76ab2cda6c..00000000000
--- a/tests/boards/nrf/nrf70/bustest/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-source "Kconfig.zephyr"
-
-menu "NRF70 Buslib test sample"
-
-config NRF70BUS_MEMTEST_LENGTH
-	int "Memory test length"
-	default 1024
-	help
-	  This option sets the default length for the memory test.
-endmenu
diff --git a/tests/boards/nrf/nrf70/bustest/prj.conf b/tests/boards/nrf/nrf70/bustest/prj.conf
deleted file mode 100644
index 52107957801..00000000000
--- a/tests/boards/nrf/nrf70/bustest/prj.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-CONFIG_NRF70_BUSLIB=y
-CONFIG_ZTEST=y
-
-CONFIG_HEAP_MEM_POOL_SIZE=50000
-CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y
-
-# System settings
-CONFIG_ASSERT=y
-
-CONFIG_INIT_STACKS=y
-
-# Memories
-CONFIG_MAIN_STACK_SIZE=5200
-
-# Debugging
-CONFIG_STACK_SENTINEL=y
-CONFIG_DEBUG_COREDUMP=y
-CONFIG_DEBUG_COREDUMP_BACKEND_LOGGING=y
-CONFIG_SHELL_CMDS_RESIZE=n
-CONFIG_WIFI_NRF70_BUSLIB_LOG_LEVEL_DBG=y
-
-# Logging
-CONFIG_LOG=y
-CONFIG_PRINTK=y
-# If below config is enabled, printk logs are
-# buffered. For unbuffered messages, disable this.
-CONFIG_LOG_PRINTK=n
diff --git a/tests/boards/nrf/nrf70/bustest/src/main.c b/tests/boards/nrf/nrf70/bustest/src/main.c
deleted file mode 100644
index cf7cdfa4164..00000000000
--- a/tests/boards/nrf/nrf70/bustest/src/main.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @brief File containing ztests for nrf70 buslib library
- */
-
-#include <zephyr/shell/shell.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/ztest.h>
-#include <zephyr/drivers/wifi/nrf_wifi/bus/rpu_hw_if.h>
-#include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
-
-LOG_MODULE_REGISTER(nrf70_bustest, CONFIG_WIFI_NRF70_BUSLIB_LOG_LEVEL);
-
-#define DATARAM_ADDR 0x0C0000
-static struct qspi_dev *dev;
-
-static int wifi_on(void *state)
-{
-	int ret;
-
-	ARG_UNUSED(state);
-
-	dev = qspi_dev();
-
-	ret = rpu_init();
-	if (ret) {
-		LOG_ERR("%s: RPU init failed with error %d", __func__, ret);
-		return -1;
-	}
-
-	ret = dev->init(qspi_defconfig());
-	if (ret) {
-		LOG_ERR("%s: QSPI device init failed", __func__);
-		return -1;
-	}
-
-	ret = rpu_enable();
-	if (ret) {
-		LOG_ERR("%s: RPU enable failed with error %d", __func__, ret);
-		return -1;
-	}
-	k_sleep(K_MSEC(10));
-	LOG_INF("Wi-Fi ON done");
-	return 0;
-}
-
-static void wifi_off(void *state)
-{
-	ARG_UNUSED(state);
-
-	int ret;
-
-	ret = rpu_disable();
-	if (ret) {
-		LOG_ERR("%s: RPU disable failed with error %d", __func__, ret);
-	}
-
-	ret = dev->deinit();
-	if (ret) {
-		LOG_ERR("%s: QSPI device de-init failed", __func__);
-	}
-	k_sleep(K_MSEC(10));
-	LOG_INF("Wi-Fi OFF done");
-}
-
-
-static int memtest(uint32_t addr, char *memblock_name)
-{
-	const uint32_t pattern = 0x12345678;
-	uint32_t offset = 1;
-	uint32_t *buff, *rxbuff;
-	int i;
-
-	int err_count;
-	int32_t rem_words = CONFIG_NRF70BUS_MEMTEST_LENGTH;
-	uint32_t test_chunk, chunk_no = 0;
-	int ret = -1;
-
-	buff = k_malloc(CONFIG_NRF70BUS_MEMTEST_LENGTH * 4);
-	if (buff == NULL) {
-		LOG_ERR("Failed to allocate memory for buff");
-		return -1;
-	}
-
-	rxbuff = k_malloc(CONFIG_NRF70BUS_MEMTEST_LENGTH * 4);
-	if (rxbuff == NULL) {
-		LOG_ERR("Failed to allocate memory for rxbuff");
-		k_free(buff);
-		return -1;
-	}
-
-	while (rem_words > 0) {
-		test_chunk = (rem_words < CONFIG_NRF70BUS_MEMTEST_LENGTH) ?
-					  rem_words : CONFIG_NRF70BUS_MEMTEST_LENGTH;
-
-		for (i = 0; i < test_chunk; i++) {
-			buff[i] = pattern +
-					  (i + chunk_no * CONFIG_NRF70BUS_MEMTEST_LENGTH) * offset;
-		}
-
-		addr = addr + chunk_no * CONFIG_NRF70BUS_MEMTEST_LENGTH;
-
-		if (rpu_write(addr, buff, test_chunk * 4) ||
-		    rpu_read(addr, rxbuff, test_chunk * 4)) {
-			goto err;
-		}
-
-		err_count = 0;
-		for (i = 0; i < test_chunk; i++) {
-			if (buff[i] != rxbuff[i]) {
-				err_count++;
-				LOG_ERR("%s: failed (%d), Expected 0x%x, Read 0x%x",
-						__func__, i, buff[i], rxbuff[i]);
-				if (err_count > 4)
-					goto err;
-			}
-		}
-		if (err_count) {
-			goto err;
-		}
-		rem_words -= CONFIG_NRF70BUS_MEMTEST_LENGTH;
-		chunk_no++;
-	}
-	ret = 0;
-err:
-	k_free(rxbuff);
-	k_free(buff);
-	return ret;
-}
-
-static int test_sysbus(void)
-{
-	int val, i;
-	/* List of some SYS bus addresses and default values to test bus read
-	 *  integrity
-	 */
-	const uint32_t addr[] = {0x714, 0x71c, 0x720,
-							0x728, 0x734, 0x738};
-	const uint32_t val_arr[] = {
-		0x000003f3, 0x0110f13f, 0x000003f3,
-		0x0003073f, 0x0003073f, 0x03013f8f};
-
-	for (i = 0; i < ARRAY_SIZE(addr); i++) {
-		rpu_read(addr[i], &val, 4);
-		if (val != val_arr[i]) {
-			LOG_ERR("%s: SYSBUS R/W failed (%d) : read = 0x%x, expected = 0x%x",
-						 __func__, i, val, val_arr[i]);
-			return -1;
-		}
-	}
-	return 0;
-}
-
-static int test_peripbus(void)
-{
-	uint32_t val;
-	int i;
-	/* Some Perip bus addresses that we can write/read to validate bus access*/
-	const uint32_t addr[] = {0x62820, 0x62830, 0x62840, 0x62850, 0x62860, 0x62870};
-
-	for (i = 0; i < ARRAY_SIZE(addr); i++) {
-		val = 0xA5A5A5A5; /* Test pattern */
-		rpu_write(addr[i], &val, 4);
-		val = 0;
-		rpu_read(addr[i], &val, 4);
-		/* Perip bus is 24-bit and hence LS 8 bits read are invalid, so discard them
-		 * in the check
-		 */
-		if (val >> 8 != 0xA5A5A5) {
-			LOG_ERR("%s: PERIP BUS R/W failed (%d): read = 0x%x",
-						__func__, i, val >> 8);
-			return -1;
-		}
-	}
-	return 0;
-}
-
-ZTEST_SUITE(bustest_suite, NULL, (void *)wifi_on, NULL, NULL, wifi_off);
-
-ZTEST(bustest_suite, test_sysbus)
-{
-	zassert_equal(0, test_sysbus(), "SYSBUS read validation failed!!!");
-}
-
-ZTEST(bustest_suite, test_peripbus)
-{
-	zassert_equal(0, test_peripbus(), "PERIP BUS read/write validation failed!!!");
-}
-
-ZTEST(bustest_suite, test_dataram)
-{
-	zassert_equal(0, memtest(DATARAM_ADDR, "DATA RAM"), "DATA RAM memtest failed!!!");
-}
diff --git a/tests/boards/nrf/nrf70/bustest/testcase.yaml b/tests/boards/nrf/nrf70/bustest/testcase.yaml
deleted file mode 100644
index 29dc054b823..00000000000
--- a/tests/boards/nrf/nrf70/bustest/testcase.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-tests:
-  nrf_wifi.bustest.nrf7002:
-    sysbuild: true
-    build_only: true
-    integration_platforms:
-      - nrf7002dk/nrf5340/cpuapp
-    platform_allow: nrf7002dk/nrf5340/cpuapp
-
-  nrf_wifi.bustest.nrf7002ek:
-    sysbuild: true
-    build_only: true
-    extra_args: SHIELD=nrf7002ek
-    integration_platforms:
-      - nrf5340dk/nrf5340/cpuapp
-      - nrf52840dk/nrf52840
-      - nucleo_h723zg
-    platform_allow:
-      - nrf5340dk/nrf5340/cpuapp
-      - nrf52840dk/nrf52840
-      - nucleo_h723zg

From 824ec389968092f023a27fdae4efabad5178e6a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:18 +0100
Subject: [PATCH 1279/2913] Revert "[nrf fromlist] drivers: nrf_wifi:
 Restructure to carve out a new nrf70 bus lib"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b062985ee272fcbba29d77f364361be518460533.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/CMakeLists.txt          |  17 +-
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi         |  14 +-
 .../wifi/nrf_wifi/src/qspi/inc/ficr_prog.h    |  23 ++
 .../wifi/nrf_wifi/src/qspi/inc}/qspi_if.h     |   0
 .../wifi/nrf_wifi/src/qspi/inc}/rpu_hw_if.h   |   0
 .../wifi/nrf_wifi/src/qspi/inc}/spi_if.h      |   0
 .../wifi/nrf_wifi/src/qspi/inc}/spi_nor.h     |   0
 .../wifi/nrf_wifi/src/qspi/src}/device.c      |  26 +-
 .../wifi/nrf_wifi/src/qspi/src/ficr_prog.c    | 379 ++++++++++++++++++
 .../wifi/nrf_wifi/src/qspi/src}/qspi_if.c     |   4 +-
 .../wifi/nrf_wifi/src/qspi/src}/rpu_hw_if.c   |  15 +-
 .../wifi/nrf_wifi/src/qspi/src}/spi_if.c      |   4 +-
 modules/nrf_wifi/CMakeLists.txt               | 186 ++++++++-
 modules/nrf_wifi/Kconfig                      |   2 -
 modules/nrf_wifi/bus/CMakeLists.txt           |  27 --
 modules/nrf_wifi/bus/Kconfig                  |  46 ---
 modules/nrf_wifi/os/CMakeLists.txt            | 186 ---------
 modules/nrf_wifi/{os => }/shim.c              |   4 +-
 modules/nrf_wifi/{os => }/shim.h              |   0
 modules/nrf_wifi/{os => }/timer.c             |   0
 modules/nrf_wifi/{os => }/timer.h             |   0
 modules/nrf_wifi/{os => }/work.c              |   0
 modules/nrf_wifi/{os => }/work.h              |   0
 23 files changed, 635 insertions(+), 298 deletions(-)
 create mode 100644 drivers/wifi/nrf_wifi/src/qspi/inc/ficr_prog.h
 rename {include/zephyr/drivers/wifi/nrf_wifi/bus => drivers/wifi/nrf_wifi/src/qspi/inc}/qspi_if.h (100%)
 rename {include/zephyr/drivers/wifi/nrf_wifi/bus => drivers/wifi/nrf_wifi/src/qspi/inc}/rpu_hw_if.h (100%)
 rename {modules/nrf_wifi/bus => drivers/wifi/nrf_wifi/src/qspi/inc}/spi_if.h (100%)
 rename {modules/nrf_wifi/bus => drivers/wifi/nrf_wifi/src/qspi/inc}/spi_nor.h (100%)
 rename {modules/nrf_wifi/bus => drivers/wifi/nrf_wifi/src/qspi/src}/device.c (78%)
 create mode 100644 drivers/wifi/nrf_wifi/src/qspi/src/ficr_prog.c
 rename {modules/nrf_wifi/bus => drivers/wifi/nrf_wifi/src/qspi/src}/qspi_if.c (99%)
 rename {modules/nrf_wifi/bus => drivers/wifi/nrf_wifi/src/qspi/src}/rpu_hw_if.c (96%)
 rename {modules/nrf_wifi/bus => drivers/wifi/nrf_wifi/src/qspi/src}/spi_if.c (98%)
 delete mode 100644 modules/nrf_wifi/bus/CMakeLists.txt
 delete mode 100644 modules/nrf_wifi/bus/Kconfig
 delete mode 100644 modules/nrf_wifi/os/CMakeLists.txt
 rename modules/nrf_wifi/{os => }/shim.c (99%)
 rename modules/nrf_wifi/{os => }/shim.h (100%)
 rename modules/nrf_wifi/{os => }/timer.c (100%)
 rename modules/nrf_wifi/{os => }/timer.h (100%)
 rename modules/nrf_wifi/{os => }/work.c (100%)
 rename modules/nrf_wifi/{os => }/work.h (100%)

diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
index 27d8ba8081c..e631e930e07 100644
--- a/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -11,6 +11,7 @@ set(FW_BINS_BASE ${ZEPHYR_NRF_WIFI_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
 
 zephyr_include_directories(
   inc
+  src/qspi/inc
   # for net_sprint_ll_addr
   ${ZEPHYR_BASE}/subsys/net/ip
 )
@@ -23,6 +24,12 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_SR_COEX
   src/coex.c
 )
 
+zephyr_library_sources(
+  src/qspi/src/device.c
+  src/qspi/src/rpu_hw_if.c
+  src/qspi/src/ficr_prog.c
+)
+
 zephyr_library_sources_ifndef(CONFIG_NRF70_OFFLOADED_RAW_TX
   src/fmac_main.c
 )
@@ -58,6 +65,14 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
 zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
   src/wpa_supp_if.c)
 
+zephyr_library_sources_ifdef(CONFIG_NRF70_ON_QSPI
+  src/qspi/src/qspi_if.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_ON_SPI
+  src/qspi/src/spi_if.c
+)
+
 zephyr_library_sources_ifdef(CONFIG_NRF70_UTIL
   src/wifi_util.c
 )
@@ -73,8 +88,6 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF70_ON_QSPI
   -DNRF53_ERRATA_159_ENABLE_WORKAROUND=0
 )
 
-target_link_libraries(nrf_wifi PRIVATE nrf70-buslib)
-
 if (CONFIG_NRF_WIFI_BUILD_ONLY_MODE)
   message(WARNING "
   ------------------------------------------------------------------------
diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index 45a22b7e7fa..f0d2c8ead71 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -11,7 +11,6 @@ menuconfig WIFI_NRF70
 	select NET_L2_ETHERNET_MGMT if NETWORKING && NET_L2_ETHERNET
 	select WIFI_USE_NATIVE_NETWORKING if NETWORKING
 	select EXPERIMENTAL if !SOC_SERIES_NRF53X && !SOC_SERIES_NRF91X
-	select NRF70_BUSLIB
 	default y
 	depends on \
 		DT_HAS_NORDIC_NRF7002_SPI_ENABLED || DT_HAS_NORDIC_NRF7002_QSPI_ENABLED || \
@@ -34,9 +33,16 @@ config WIFI_NRF7000
 	bool
 	default y if DT_HAS_NORDIC_NRF7000_SPI_ENABLED || DT_HAS_NORDIC_NRF7000_QSPI_ENABLED
 
-config NRF70_QSPI_LOW_POWER
-	bool "low power mode in QSPI"
-	default y if NRF_WIFI_LOW_POWER
+
+module = WIFI_NRF70_BUS
+module-dep = LOG
+module-str = Log level for Wi-Fi nRF70 bus layers
+module-help = Sets log level for Wi-Fi nRF70 bus layers
+source "subsys/net/Kconfig.template.log_config.net"
+
+config WIFI_NRF70_BUS_LOG_LEVEL
+	# Enable error by default
+	default 1
 
 choice NRF70_OPER_MODES
 	bool "nRF70 operating modes"
diff --git a/drivers/wifi/nrf_wifi/src/qspi/inc/ficr_prog.h b/drivers/wifi/nrf_wifi/src/qspi/inc/ficr_prog.h
new file mode 100644
index 00000000000..35c4bda1fa3
--- /dev/null
+++ b/drivers/wifi/nrf_wifi/src/qspi/inc/ficr_prog.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @brief Header containing address/offets and functions for writing
+ * the FICR fields of the OTP memory on nRF7002 device
+ */
+
+#ifndef __OTP_PROG_H_
+#define __OTP_PROG_H_
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int write_otp_memory(unsigned int otp_addr, unsigned int *write_val);
+int read_otp_memory(unsigned int otp_addr, unsigned int *read_val, int len);
+unsigned int check_protection(unsigned int *buff, unsigned int off1, unsigned int off2,
+					unsigned int off3, unsigned int off4);
+
+#endif /* __OTP_PROG_H_ */
diff --git a/include/zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h b/drivers/wifi/nrf_wifi/src/qspi/inc/qspi_if.h
similarity index 100%
rename from include/zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h
rename to drivers/wifi/nrf_wifi/src/qspi/inc/qspi_if.h
diff --git a/include/zephyr/drivers/wifi/nrf_wifi/bus/rpu_hw_if.h b/drivers/wifi/nrf_wifi/src/qspi/inc/rpu_hw_if.h
similarity index 100%
rename from include/zephyr/drivers/wifi/nrf_wifi/bus/rpu_hw_if.h
rename to drivers/wifi/nrf_wifi/src/qspi/inc/rpu_hw_if.h
diff --git a/modules/nrf_wifi/bus/spi_if.h b/drivers/wifi/nrf_wifi/src/qspi/inc/spi_if.h
similarity index 100%
rename from modules/nrf_wifi/bus/spi_if.h
rename to drivers/wifi/nrf_wifi/src/qspi/inc/spi_if.h
diff --git a/modules/nrf_wifi/bus/spi_nor.h b/drivers/wifi/nrf_wifi/src/qspi/inc/spi_nor.h
similarity index 100%
rename from modules/nrf_wifi/bus/spi_nor.h
rename to drivers/wifi/nrf_wifi/src/qspi/inc/spi_nor.h
diff --git a/modules/nrf_wifi/bus/device.c b/drivers/wifi/nrf_wifi/src/qspi/src/device.c
similarity index 78%
rename from modules/nrf_wifi/bus/device.c
rename to drivers/wifi/nrf_wifi/src/qspi/src/device.c
index 8cf0b77cd67..4acbaf3861f 100644
--- a/modules/nrf_wifi/bus/device.c
+++ b/drivers/wifi/nrf_wifi/src/qspi/src/device.c
@@ -12,26 +12,30 @@
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
 #include <stdio.h>
 #include <string.h>
 
+#include "qspi_if.h"
 #include "spi_if.h"
 
 static struct qspi_config config;
 
 #if defined(CONFIG_NRF70_ON_QSPI)
-static struct qspi_dev qspi = {.init = qspi_init,
-			       .deinit = qspi_deinit,
-			       .read = qspi_read,
-			       .write = qspi_write,
-			       .hl_read = qspi_hl_read};
+static struct qspi_dev qspi = {
+	.init = qspi_init,
+	.deinit = qspi_deinit,
+	.read = qspi_read,
+	.write = qspi_write,
+	.hl_read = qspi_hl_read
+};
 #else
-static struct qspi_dev spim = {.init = spim_init,
-			       .deinit = spim_deinit,
-			       .read = spim_read,
-			       .write = spim_write,
-			       .hl_read = spim_hl_read};
+static struct qspi_dev spim = {
+	.init = spim_init,
+	.deinit = spim_deinit,
+	.read = spim_read,
+	.write = spim_write,
+	.hl_read = spim_hl_read
+};
 #endif
 
 struct qspi_config *qspi_defconfig(void)
diff --git a/drivers/wifi/nrf_wifi/src/qspi/src/ficr_prog.c b/drivers/wifi/nrf_wifi/src/qspi/src/ficr_prog.c
new file mode 100644
index 00000000000..5558b35e837
--- /dev/null
+++ b/drivers/wifi/nrf_wifi/src/qspi/src/ficr_prog.c
@@ -0,0 +1,379 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* @file
+ * @brief NRF Wi-Fi radio FICR programming functions
+ */
+
+#include <zephyr/logging/log.h>
+#include <zephyr/kernel.h>
+#include "rpu_if.h"
+#include "rpu_hw_if.h"
+#include "ficr_prog.h"
+
+
+LOG_MODULE_DECLARE(otp_prog, CONFIG_WIFI_NRF70_BUS_LOG_LEVEL);
+
+static void write_word(unsigned int addr, unsigned int data)
+{
+	rpu_write(addr, &data, 4);
+}
+
+static void read_word(unsigned int addr, unsigned int *data)
+{
+	rpu_read(addr, data, 4);
+}
+
+unsigned int check_protection(unsigned int *buff, unsigned int off1, unsigned int off2,
+		    unsigned int off3, unsigned int off4)
+{
+	if ((buff[off1] == OTP_PROGRAMMED) &&
+		(buff[off2] == OTP_PROGRAMMED)  &&
+		(buff[off3] == OTP_PROGRAMMED) &&
+		(buff[off4] == OTP_PROGRAMMED))
+		return OTP_PROGRAMMED;
+	else if ((buff[off1] == OTP_FRESH_FROM_FAB) &&
+		(buff[off2] == OTP_FRESH_FROM_FAB) &&
+		(buff[off3] == OTP_FRESH_FROM_FAB) &&
+		(buff[off4] == OTP_FRESH_FROM_FAB))
+		return OTP_FRESH_FROM_FAB;
+	else if ((buff[off1] == OTP_ENABLE_PATTERN) &&
+		(buff[off2] == OTP_ENABLE_PATTERN) &&
+		(buff[off3] == OTP_ENABLE_PATTERN) &&
+		(buff[off4] == OTP_ENABLE_PATTERN))
+		return OTP_ENABLE_PATTERN;
+	else
+		return OTP_INVALID;
+}
+
+
+static void set_otp_timing_reg_40mhz(void)
+{
+	write_word(OTP_TIMING_REG1_ADDR, OTP_TIMING_REG1_VAL);
+	write_word(OTP_TIMING_REG2_ADDR, OTP_TIMING_REG2_VAL);
+}
+
+static int poll_otp_ready(void)
+{
+	int otp_mem_status = 0;
+	int poll = 0;
+
+	while (poll != 100) {
+		read_word(OTP_POLL_ADDR, &otp_mem_status);
+
+		if ((otp_mem_status & OTP_READY) == OTP_READY) {
+			return 0;
+		}
+		poll++;
+	}
+	LOG_ERR("OTP is not ready");
+	return -ENOEXEC;
+}
+
+
+static int req_otp_standby_mode(void)
+{
+	write_word(OTP_RWSBMODE_ADDR, 0x0);
+	return poll_otp_ready();
+}
+
+
+static int otp_wr_voltage_2V5(void)
+{
+	int err;
+
+	err = req_otp_standby_mode();
+
+	if (err) {
+		LOG_ERR("Failed Setting OTP voltage IOVDD to 2.5V");
+		return -ENOEXEC;
+	}
+	write_word(OTP_VOLTCTRL_ADDR, OTP_VOLTCTRL_2V5);
+	return 0;
+}
+
+static int poll_otp_read_valid(void)
+{
+	int otp_mem_status = 0;
+	int poll = 0;
+
+	while (poll < 100) {
+		read_word(OTP_POLL_ADDR, &otp_mem_status);
+
+		if ((otp_mem_status & OTP_READ_VALID) == OTP_READ_VALID) {
+			return 0;
+		}
+		poll++;
+	}
+	LOG_ERR("%s: OTP read failed", __func__);
+	return -ENOEXEC;
+}
+
+static int poll_otp_wrdone(void)
+{
+	int otp_mem_status = 0;
+	int poll = 0;
+
+	while (poll < 100) {
+		read_word(OTP_POLL_ADDR, &otp_mem_status);
+
+		if ((otp_mem_status & OTP_WR_DONE) == OTP_WR_DONE) {
+			return 0;
+		}
+		poll++;
+	}
+	LOG_ERR("%s: OTP write done failed", __func__);
+	return -ENOEXEC;
+}
+
+static int req_otp_read_mode(void)
+{
+	write_word(OTP_RWSBMODE_ADDR, OTP_READ_MODE);
+	return poll_otp_ready();
+}
+
+
+static int req_otp_byte_write_mode(void)
+{
+	write_word(OTP_RWSBMODE_ADDR, OTP_BYTE_WRITE_MODE);
+	return poll_otp_ready();
+}
+
+static unsigned int read_otp_location(unsigned int offset, unsigned int *read_val)
+{
+	int err;
+
+	write_word(OTP_RDENABLE_ADDR,  offset);
+	err = poll_otp_read_valid();
+	if (err) {
+		LOG_ERR("OTP read failed");
+		return err;
+	}
+	read_word(OTP_READREG_ADDR, read_val);
+
+	return 0;
+}
+
+static int  write_otp_location(unsigned int otp_location_offset, unsigned int otp_data)
+{
+	write_word(OTP_WRENABLE_ADDR,  otp_location_offset);
+	write_word(OTP_WRITEREG_ADDR,  otp_data);
+
+	return poll_otp_wrdone();
+}
+
+
+static int otp_rd_voltage_1V8(void)
+{
+	int err;
+
+	err = req_otp_standby_mode();
+	if (err) {
+		LOG_ERR("error in %s", __func__);
+		return err;
+	}
+	write_word(OTP_VOLTCTRL_ADDR, OTP_VOLTCTRL_1V8);
+
+	return 0;
+}
+
+static int update_mac_addr(unsigned int index, unsigned int *write_val)
+{
+	int ret = 0;
+
+	for (int i = 0; i < 2; i++) {
+		ret = write_otp_location(MAC0_ADDR + 2 * index + i, write_val[i]);
+		if (ret == -ENOEXEC) {
+			LOG_ERR("FICR: Failed to update MAC ADDR%d", index);
+			break;
+		}
+		LOG_INF("mac addr %d : Reg%d (0x%x) = 0x%04x",
+					index, (i+1), (MAC0_ADDR + i) << 2, write_val[i]);
+	}
+	return ret;
+}
+
+int write_otp_memory(unsigned int otp_addr, unsigned int *write_val)
+{
+	int err = 0;
+	int	mask_val;
+	int ret = 0;
+	int retrim_loc = 0;
+
+	err = poll_otp_ready();
+	if (err) {
+		LOG_ERR("err in otp ready poll");
+		return err;
+	}
+
+	set_otp_timing_reg_40mhz();
+
+	err = otp_wr_voltage_2V5();
+	if (err) {
+		LOG_ERR("error in write_voltage 2V5");
+		goto _exit_otp_write;
+	}
+
+	err = req_otp_byte_write_mode();
+	if (err) {
+		LOG_ERR("error in OTP byte write mode");
+		goto _exit_otp_write;
+	}
+
+	switch (otp_addr) {
+	case REGION_PROTECT:
+		write_otp_location(REGION_PROTECT, write_val[0]);
+		write_otp_location(REGION_PROTECT+1, write_val[0]);
+		write_otp_location(REGION_PROTECT+2, write_val[0]);
+		write_otp_location(REGION_PROTECT+3, write_val[0]);
+
+		LOG_INF("Written REGION_PROTECT0 (0x%x) : 0x%04x",
+						(REGION_PROTECT << 2), write_val[0]);
+		LOG_INF("Written REGION_PROTECT1 (0x%x) : 0x%04x",
+						(REGION_PROTECT+1) << 2, write_val[0]);
+		LOG_INF("Written REGION_PROTECT2 (0x%x) : 0x%04x",
+						(REGION_PROTECT+2) << 2, write_val[0]);
+		LOG_INF("Written REGION_PROTECT3 (0x%x) : 0x%04x",
+						(REGION_PROTECT+3) << 2, write_val[0]);
+		break;
+	case QSPI_KEY:
+		mask_val = QSPI_KEY_FLAG_MASK;
+		for (int i = 0; i < QSPI_KEY_LENGTH_BYTES / 4; i++) {
+			ret = write_otp_location(QSPI_KEY + i, write_val[i]);
+			if (ret == -ENOEXEC) {
+				LOG_ERR("FICR: Failed to write QSPI key offset-%d", QSPI_KEY + i);
+				goto _exit_otp_write;
+			}
+			LOG_INF("Written QSPI_KEY0 (0x%x) : 0x%04x",
+						(QSPI_KEY + i) << 2, write_val[i]);
+		}
+		write_otp_location(REGION_DEFAULTS, mask_val);
+		LOG_INF("Written REGION_DEFAULTS (0x%x) : 0x%04x",
+						(REGION_DEFAULTS) << 2, mask_val);
+		break;
+	case MAC0_ADDR:
+		mask_val = MAC0_ADDR_FLAG_MASK;
+		ret = update_mac_addr(0, write_val);
+		if (ret == -ENOEXEC) {
+			goto _exit_otp_write;
+		}
+
+		write_otp_location(REGION_DEFAULTS, mask_val);
+		LOG_INF("Written MAC address 0");
+		LOG_INF("Written REGION_DEFAULTS (0x%x) : 0x%04x",
+						(REGION_DEFAULTS) << 2, mask_val);
+		break;
+	case MAC1_ADDR:
+		mask_val = MAC1_ADDR_FLAG_MASK;
+		ret = update_mac_addr(1, write_val);
+		if (ret == -ENOEXEC) {
+			goto _exit_otp_write;
+		}
+		write_otp_location(REGION_DEFAULTS, mask_val);
+		LOG_INF("Written MAC address 1");
+		LOG_INF("Written REGION_DEFAULTS (0x%x) : 0x%04x",
+						(REGION_DEFAULTS) << 2, mask_val);
+		break;
+	case CALIB_XO:
+		mask_val = CALIB_XO_FLAG_MASK;
+		ret = write_otp_location(CALIB_XO, write_val[0]);
+
+		if (ret == -ENOEXEC) {
+			LOG_ERR("XO_Update Exception");
+			goto _exit_otp_write;
+		} else {
+			write_otp_location(REGION_DEFAULTS, mask_val);
+
+			LOG_INF("Written CALIB_XO (0x%x) to 0x%04x",
+						CALIB_XO << 2, write_val[0]);
+			LOG_INF("Written REGION_DEFAULTS (0x%x) : 0x%04x",
+						(REGION_DEFAULTS) << 2, mask_val);
+		}
+		break;
+	case PRODRETEST_PROGVERSION:
+		ret = write_otp_location(PRODRETEST_PROGVERSION, *write_val);
+
+		if (ret == -ENOEXEC) {
+			LOG_ERR("PRODRETEST.PROGVERSION_Update Exception");
+			goto _exit_otp_write;
+		} else {
+			LOG_INF("Written PRODRETEST.PROGVERSION 0x%04x", *write_val);
+		}
+		break;
+	case PRODRETEST_TRIM0:
+	case PRODRETEST_TRIM1:
+	case PRODRETEST_TRIM2:
+	case PRODRETEST_TRIM3:
+	case PRODRETEST_TRIM4:
+	case PRODRETEST_TRIM5:
+	case PRODRETEST_TRIM6:
+	case PRODRETEST_TRIM7:
+	case PRODRETEST_TRIM8:
+	case PRODRETEST_TRIM9:
+	case PRODRETEST_TRIM10:
+	case PRODRETEST_TRIM11:
+	case PRODRETEST_TRIM12:
+	case PRODRETEST_TRIM13:
+	case PRODRETEST_TRIM14:
+		retrim_loc = otp_addr - PRODRETEST_TRIM0;
+		ret = write_otp_location(otp_addr, *write_val);
+
+		if (ret == -ENOEXEC) {
+			LOG_ERR("PRODRETEST.TRIM_Update Exception");
+			goto _exit_otp_write;
+		} else {
+			LOG_INF("Written PRODRETEST.TRIM%d 0x%04x",
+						retrim_loc, *write_val);
+		}
+		break;
+	case REGION_DEFAULTS:
+		write_otp_location(REGION_DEFAULTS, write_val[0]);
+
+		LOG_INF("Written REGION_DEFAULTS (0x%x) to 0x%04x",
+						REGION_DEFAULTS << 2, write_val[0]);
+		break;
+	default:
+		LOG_ERR("unknown field received: %d", otp_addr);
+
+	}
+	return ret;
+
+_exit_otp_write:
+	err  = req_otp_standby_mode();
+	err |= otp_rd_voltage_1V8();
+	return err;
+}
+
+int read_otp_memory(unsigned int otp_addr, unsigned int *read_val, int len)
+{
+	int	err;
+
+	err = poll_otp_ready();
+	if (err) {
+		LOG_ERR("err in otp ready poll");
+		return -ENOEXEC;
+	}
+
+	set_otp_timing_reg_40mhz();
+
+	err = otp_rd_voltage_1V8();
+	if (err) {
+		LOG_ERR("error in read_voltage 1V8");
+		return -ENOEXEC;
+	}
+
+	err = req_otp_read_mode();
+	if (err) {
+		LOG_ERR("error in req_otp_read_mode()");
+		return -ENOEXEC;
+	}
+
+	for (int i = 0; i < len; i++) {
+		read_otp_location(otp_addr + i, &read_val[i]);
+	}
+
+	return req_otp_standby_mode();
+}
diff --git a/modules/nrf_wifi/bus/qspi_if.c b/drivers/wifi/nrf_wifi/src/qspi/src/qspi_if.c
similarity index 99%
rename from modules/nrf_wifi/bus/qspi_if.c
rename to drivers/wifi/nrf_wifi/src/qspi/src/qspi_if.c
index 8c381ff60c5..754fe149713 100644
--- a/modules/nrf_wifi/bus/qspi_if.c
+++ b/drivers/wifi/nrf_wifi/src/qspi/src/qspi_if.c
@@ -15,7 +15,6 @@
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/drivers/pinctrl.h>
-#include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
 
 #include <soc.h>
 #include <nrf_erratas.h>
@@ -24,6 +23,7 @@
 #include <hal/nrf_gpio.h>
 
 #include "spi_nor.h"
+#include "qspi_if.h"
 
 /* The QSPI bus node which the NRF70 is on */
 #define QSPI_IF_BUS_NODE DT_NODELABEL(qspi)
@@ -152,7 +152,7 @@ static void qspi_device_uninit(const struct device *dev);
 
 #define WORD_SIZE 4
 
-LOG_MODULE_DECLARE(wifi_nrf_bus, CONFIG_WIFI_NRF70_BUSLIB_LOG_LEVEL);
+LOG_MODULE_DECLARE(wifi_nrf_bus, CONFIG_WIFI_NRF70_BUS_LOG_LEVEL);
 
 /**
  * @brief QSPI buffer structure
diff --git a/modules/nrf_wifi/bus/rpu_hw_if.c b/drivers/wifi/nrf_wifi/src/qspi/src/rpu_hw_if.c
similarity index 96%
rename from modules/nrf_wifi/bus/rpu_hw_if.c
rename to drivers/wifi/nrf_wifi/src/qspi/src/rpu_hw_if.c
index 8b9393f6f2e..6fac7412362 100644
--- a/modules/nrf_wifi/bus/rpu_hw_if.c
+++ b/drivers/wifi/nrf_wifi/src/qspi/src/rpu_hw_if.c
@@ -17,12 +17,12 @@
 #include <zephyr/devicetree.h>
 #include <zephyr/dt-bindings/gpio/nordic-nrf-gpio.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/drivers/wifi/nrf_wifi/bus/rpu_hw_if.h>
-#include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
 
+#include "rpu_hw_if.h"
+#include "qspi_if.h"
 #include "spi_if.h"
 
-LOG_MODULE_REGISTER(wifi_nrf_bus, CONFIG_WIFI_NRF70_BUSLIB_LOG_LEVEL);
+LOG_MODULE_REGISTER(wifi_nrf_bus, CONFIG_WIFI_NRF70_BUS_LOG_LEVEL);
 
 #define NRF7002_NODE DT_NODELABEL(nrf70)
 
@@ -44,7 +44,7 @@ uint32_t rpu_7002_memmap[][3] = {
 	{ 0x009000, 0x03FFFF, 2 },
 	{ 0x040000, 0x07FFFF, 1 },
 	{ 0x0C0000, 0x0F0FFF, 0 },
-	{ 0x080000, 0x092000, 2 },
+	{ 0x080000, 0x092000, 1 },
 	{ 0x100000, 0x134000, 1 },
 	{ 0x140000, 0x14C000, 1 },
 	{ 0x180000, 0x190000, 1 },
@@ -483,16 +483,11 @@ int rpu_enable(void)
 		goto rpu_pwroff;
 	}
 
-/* TODO: rpu_validate_comms() needs firmware download to be done
- * successfully before it can be called. So, disable this for
- * nrf70_buslib only usage.
- */
-#ifdef CONFIG_WIFI_NRF70
 	ret = rpu_validate_comms();
 	if (ret) {
 		goto rpu_pwroff;
 	}
-#endif
+
 	return 0;
 rpu_pwroff:
 	rpu_pwroff();
diff --git a/modules/nrf_wifi/bus/spi_if.c b/drivers/wifi/nrf_wifi/src/qspi/src/spi_if.c
similarity index 98%
rename from modules/nrf_wifi/bus/spi_if.c
rename to drivers/wifi/nrf_wifi/src/qspi/src/spi_if.c
index fba9f1f00bf..4bf9f464391 100644
--- a/modules/nrf_wifi/bus/spi_if.c
+++ b/drivers/wifi/nrf_wifi/src/qspi/src/spi_if.c
@@ -13,11 +13,11 @@
 
 #include <zephyr/drivers/spi.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
 
+#include "qspi_if.h"
 #include "spi_if.h"
 
-LOG_MODULE_DECLARE(wifi_nrf_bus, CONFIG_WIFI_NRF70_BUSLIB_LOG_LEVEL);
+LOG_MODULE_DECLARE(wifi_nrf_bus, CONFIG_WIFI_NRF70_BUS_LOG_LEVEL);
 
 #define NRF7002_NODE DT_NODELABEL(nrf70)
 
diff --git a/modules/nrf_wifi/CMakeLists.txt b/modules/nrf_wifi/CMakeLists.txt
index 982272fce6a..e3b96f0db7b 100644
--- a/modules/nrf_wifi/CMakeLists.txt
+++ b/modules/nrf_wifi/CMakeLists.txt
@@ -1,6 +1,184 @@
-#
+# Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
-#
 
-add_subdirectory_ifdef(CONFIG_WIFI_NRF70 os)
-add_subdirectory_ifdef(CONFIG_NRF70_BUSLIB bus)
+if(NOT CONFIG_WIFI_NRF70)
+  return()
+endif()
+zephyr_interface_library_named(nrf-wifi-interface)
+zephyr_library()
+
+set(NRF_WIFI_DIR ${ZEPHYR_CURRENT_MODULE_DIR})
+
+# Translate the configuration to the OS agnostic code
+target_compile_definitions(
+  nrf-wifi-interface
+  INTERFACE
+  $<$<BOOL:${CONFIG_NRF_WIFI_LOW_POWER}>:NRF_WIFI_LOW_POWER>
+  $<$<BOOL:${CONFIG_NRF_WIFI_RPU_RECOVERY}>:NRF_WIFI_RPU_RECOVERY>
+  $<$<BOOL:${CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT}>:NRF_WIFI_AP_DEAD_DETECT_TIMEOUT=${CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT}>
+  $<$<BOOL:${CONFIG_NRF_WIFI_IFACE_MTU}>:NRF_WIFI_IFACE_MTU=${CONFIG_NRF_WIFI_IFACE_MTU}>
+  $<$<BOOL:${CONFIG_NRF70_STA_MODE}>:NRF70_STA_MODE>
+  $<$<BOOL:${CONFIG_NRF70_DATA_TX}>:NRF70_DATA_TX>
+  $<$<BOOL:${CONFIG_NRF70_RAW_DATA_TX}>:NRF70_RAW_DATA_TX>
+  $<$<BOOL:${CONFIG_NRF70_RAW_DATA_RX}>:NRF70_RAW_DATA_RX>
+  $<$<BOOL:${CONFIG_NRF70_PROMISC_DATA_RX}>:NRF70_PROMISC_DATA_RX>
+  $<$<BOOL:${CONFIG_NRF70_TX_DONE_WQ_ENABLED}>:NRF70_TX_DONE_WQ_ENABLED>
+  $<$<BOOL:${CONFIG_NRF70_RX_WQ_ENABLED}>:NRF70_RX_WQ_ENABLED>
+  $<$<BOOL:${CONFIG_NRF70_UTIL}>:NRF70_UTIL>
+  $<$<BOOL:${CONFIG_NRF70_RADIO_TEST}>:NRF70_RADIO_TEST>
+  $<$<BOOL:${CONFIG_NRF70_OFFLOADED_RAW_TX}>:NRF70_OFFLOADED_RAW_TX>
+  $<$<BOOL:${CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD}>:NRF70_TCP_IP_CHECKSUM_OFFLOAD>
+  $<$<BOOL:${CONFIG_NRF70_RPU_EXTEND_TWT_SP}>:NRF70_RPU_EXTEND_TWT_SP>
+  $<$<BOOL:${CONFIG_NRF70_SYSTEM_WITH_RAW_MODES}>:NRF70_SYSTEM_WITH_RAW_MODES>
+  $<$<BOOL:${CONFIG_NRF70_SCAN_ONLY}>:NRF70_SCAN_ONLY>
+  $<$<BOOL:${CONFIG_NRF70_SYSTEM_MODE}>:NRF70_SYSTEM_MODE>
+  $<$<BOOL:${CONFIG_NRF70_2_4G_ONLY}>:NRF70_2_4G_ONLY>
+  $<$<BOOL:${CONFIG_NRF70_LOG_VERBOSE}>:NRF70_LOG_VERBOSE>
+  $<$<BOOL:${CONFIG_NRF70_AP_MODE}>:NRF70_AP_MODE>
+  $<$<BOOL:${CONFIG_NRF_WIFI_MGMT_BUFF_OFFLOAD}>:NRF_WIFI_MGMT_BUFF_OFFLOAD>
+  $<$<BOOL:${CONFIG_NRF_WIFI_FEAT_KEEPALIVE}>:NRF_WIFI_FEAT_KEEPALIVE>
+  $<$<BOOL:${CONFIG_NRF_WIFI_FEAT_KEEPALIVE}>:NRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}>
+  $<$<BOOL:${CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS}>:WIFI_MGMT_RAW_SCAN_RESULTS>
+  NRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
+  NRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}
+  NRF70_RX_MAX_DATA_SIZE=${CONFIG_NRF70_RX_MAX_DATA_SIZE}
+  NRF70_MAX_TX_PENDING_QLEN=${CONFIG_NRF70_MAX_TX_PENDING_QLEN}
+  NRF70_RPU_PS_IDLE_TIMEOUT_MS=${CONFIG_NRF70_RPU_PS_IDLE_TIMEOUT_MS}
+  NRF70_REG_DOMAIN=${CONFIG_NRF70_REG_DOMAIN}
+  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS}
+  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT}
+  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE}
+  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS}
+  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT}
+  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE}
+  NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT}
+  NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE}
+  NRF70_PCB_LOSS_2G=${CONFIG_NRF70_PCB_LOSS_2G}
+  NRF70_PCB_LOSS_5G_BAND1=${CONFIG_NRF70_PCB_LOSS_5G_BAND1}
+  NRF70_PCB_LOSS_5G_BAND2=${CONFIG_NRF70_PCB_LOSS_5G_BAND2}
+  NRF70_PCB_LOSS_5G_BAND3=${CONFIG_NRF70_PCB_LOSS_5G_BAND3}
+  NRF70_ANT_GAIN_2G=${CONFIG_NRF70_ANT_GAIN_2G}
+  NRF70_ANT_GAIN_5G_BAND1=${CONFIG_NRF70_ANT_GAIN_5G_BAND1}
+  NRF70_ANT_GAIN_5G_BAND2=${CONFIG_NRF70_ANT_GAIN_5G_BAND2}
+  NRF70_ANT_GAIN_5G_BAND3=${CONFIG_NRF70_ANT_GAIN_5G_BAND3}
+  NRF_WIFI_PS_INT_PS=${CONFIG_NRF_WIFI_PS_INT_PS}
+  NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS=${CONFIG_NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS}
+)
+
+target_include_directories(
+  nrf-wifi-interface
+  INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}
+  ${NRF_WIFI_DIR}/utils/inc
+  ${NRF_WIFI_DIR}/os_if/inc
+  ${NRF_WIFI_DIR}/bus_if/bus/qspi/inc
+  ${NRF_WIFI_DIR}/bus_if/bal/inc
+  ${NRF_WIFI_DIR}/fw_if/umac_if/inc
+  ${NRF_WIFI_DIR}/fw_load/mips/fw/inc
+  ${NRF_WIFI_DIR}/hw_if/hal/inc
+  ${NRF_WIFI_DIR}/hw_if/hal/inc/fw
+  ${NRF_WIFI_DIR}/fw_if/umac_if/inc/fw
+)
+
+if(CONFIG_NRF70_RADIO_TEST)
+  target_include_directories(nrf-wifi-interface INTERFACE
+    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/radio_test
+  )
+elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
+  target_include_directories(nrf-wifi-interface INTERFACE
+    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/offload_raw_tx
+    off_raw_tx/inc
+  )
+else()
+  target_include_directories(nrf-wifi-interface INTERFACE
+    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/default
+  )
+endif()
+
+zephyr_library_sources(
+  ${NRF_WIFI_DIR}/os_if/src/osal.c
+  ${NRF_WIFI_DIR}/utils/src/list.c
+  ${NRF_WIFI_DIR}/utils/src/queue.c
+  ${NRF_WIFI_DIR}/utils/src/util.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_api.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_fw_patch_loader.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_interrupt.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_mem.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_reg.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hpqm.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/pal.c
+  ${NRF_WIFI_DIR}/bus_if/bal/src/bal.c
+  ${NRF_WIFI_DIR}/bus_if/bus/qspi/src/qspi.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/cmd.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/event.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_api_common.c
+)
+
+if(CONFIG_NRF70_RADIO_TEST)
+  zephyr_library_sources(
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/radio_test/fmac_api.c
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+  )
+elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
+  zephyr_library_sources(
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/offload_raw_tx/fmac_api.c
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+  )
+else()
+  zephyr_library_sources(
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/rx.c
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_vif.c
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+    ${NRF_WIFI_DIR}/fw_if/umac_if/src/default/fmac_api.c
+  )
+endif()
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_DATA_TX
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/tx.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_promisc.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_AP_MODE
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_ap.c
+)
+
+# Without WPA supplicant we only support scan
+zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+)
+
+zephyr_library_sources(
+  shim.c
+  timer.c
+  work.c
+)
+
+target_link_libraries(zephyr_interface INTERFACE nrf-wifi-interface)
diff --git a/modules/nrf_wifi/Kconfig b/modules/nrf_wifi/Kconfig
index 655fce838e5..9fe8172c68d 100644
--- a/modules/nrf_wifi/Kconfig
+++ b/modules/nrf_wifi/Kconfig
@@ -3,5 +3,3 @@
 
 config ZEPHYR_NRF_WIFI_MODULE
 	bool
-
-source "modules/nrf_wifi/bus/Kconfig"
diff --git a/modules/nrf_wifi/bus/CMakeLists.txt b/modules/nrf_wifi/bus/CMakeLists.txt
deleted file mode 100644
index f939ce3287c..00000000000
--- a/modules/nrf_wifi/bus/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-# Check if ZEPHYR_BASE is set
-if(NOT DEFINED ENV{ZEPHYR_BASE})
-    message(FATAL_ERROR "ZEPHYR_BASE environment variable is not set. Please set it to the Zephyr base directory.")
-endif()
-
-if (CONFIG_NRF70_BUSLIB)
-  zephyr_library_named(nrf70-buslib)
-  zephyr_library_include_directories(
-    inc
-  )
-  zephyr_library_sources(
-    rpu_hw_if.c
-    device.c
-  )
-  zephyr_library_sources_ifdef(CONFIG_NRF70_ON_QSPI
-    qspi_if.c
-  )
-  zephyr_library_sources_ifdef(CONFIG_NRF70_ON_SPI
-    spi_if.c
-  )
-endif()
diff --git a/modules/nrf_wifi/bus/Kconfig b/modules/nrf_wifi/bus/Kconfig
deleted file mode 100644
index 152904e86b7..00000000000
--- a/modules/nrf_wifi/bus/Kconfig
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-DT_COMPAT_NORDIC_NRF7002_QSPI := nordic,nrf7002-qspi
-DT_COMPAT_NORDIC_NRF7002_SPI := nordic,nrf7002-spi
-DT_COMPAT_NORDIC_NRF7001_QSPI := nordic,nrf7001-qspi
-DT_COMPAT_NORDIC_NRF7001_SPI := nordic,nrf7001-spi
-DT_COMPAT_NORDIC_NRF7000_QSPI := nordic,nrf7000-qspi
-DT_COMPAT_NORDIC_NRF7000_SPI := nordic,nrf7000-spi
-
-menuconfig NRF70_BUSLIB
-	bool "NRF70 Bus Library"
-	help
-	  Enable the NRF70 Bus Library for the nRF7002 Wi-Fi shield.
-
-if NRF70_BUSLIB
-
-config NRF70_ON_QSPI
-	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF7002_QSPI)) ||\
-			 $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF7001_QSPI)) ||\
-			 $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF7000_QSPI))
-	select NRFX_QSPI
-
-config NRF70_ON_SPI
-	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF7002_SPI)) ||\
-			 $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF7001_SPI)) ||\
-			 $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF7000_SPI))
-	select SPI
-
-module = WIFI_NRF70_BUSLIB
-module-dep = LOG
-module-str = Log level for Wi-Fi nRF70 bus library
-source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"
-
-config WIFI_NRF70_BUSLIB_LOG_LEVEL
-	# Enable error by default
-	default 1
-
-config NRF70_LOG_VERBOSE
-	bool "Maintains the verbosity of information in logs"
-	default y
-
-endif # NRF70_BUSLIB
diff --git a/modules/nrf_wifi/os/CMakeLists.txt b/modules/nrf_wifi/os/CMakeLists.txt
deleted file mode 100644
index daef05f2098..00000000000
--- a/modules/nrf_wifi/os/CMakeLists.txt
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if(NOT CONFIG_WIFI_NRF70)
-  return()
-endif()
-zephyr_interface_library_named(nrf-wifi-interface)
-zephyr_library()
-
-set(NRF_WIFI_DIR ${ZEPHYR_CURRENT_MODULE_DIR})
-
-# Translate the configuration to the OS agnostic code
-target_compile_definitions(
-  nrf-wifi-interface
-  INTERFACE
-  $<$<BOOL:${CONFIG_NRF_WIFI_LOW_POWER}>:NRF_WIFI_LOW_POWER>
-  $<$<BOOL:${CONFIG_NRF_WIFI_RPU_RECOVERY}>:NRF_WIFI_RPU_RECOVERY>
-  $<$<BOOL:${CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT}>:NRF_WIFI_AP_DEAD_DETECT_TIMEOUT=${CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT}>
-  $<$<BOOL:${CONFIG_NRF_WIFI_IFACE_MTU}>:NRF_WIFI_IFACE_MTU=${CONFIG_NRF_WIFI_IFACE_MTU}>
-  $<$<BOOL:${CONFIG_NRF70_STA_MODE}>:NRF70_STA_MODE>
-  $<$<BOOL:${CONFIG_NRF70_DATA_TX}>:NRF70_DATA_TX>
-  $<$<BOOL:${CONFIG_NRF70_RAW_DATA_TX}>:NRF70_RAW_DATA_TX>
-  $<$<BOOL:${CONFIG_NRF70_RAW_DATA_RX}>:NRF70_RAW_DATA_RX>
-  $<$<BOOL:${CONFIG_NRF70_PROMISC_DATA_RX}>:NRF70_PROMISC_DATA_RX>
-  $<$<BOOL:${CONFIG_NRF70_TX_DONE_WQ_ENABLED}>:NRF70_TX_DONE_WQ_ENABLED>
-  $<$<BOOL:${CONFIG_NRF70_RX_WQ_ENABLED}>:NRF70_RX_WQ_ENABLED>
-  $<$<BOOL:${CONFIG_NRF70_UTIL}>:NRF70_UTIL>
-  $<$<BOOL:${CONFIG_NRF70_RADIO_TEST}>:NRF70_RADIO_TEST>
-  $<$<BOOL:${CONFIG_NRF70_OFFLOADED_RAW_TX}>:NRF70_OFFLOADED_RAW_TX>
-  $<$<BOOL:${CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD}>:NRF70_TCP_IP_CHECKSUM_OFFLOAD>
-  $<$<BOOL:${CONFIG_NRF70_RPU_EXTEND_TWT_SP}>:NRF70_RPU_EXTEND_TWT_SP>
-  $<$<BOOL:${CONFIG_NRF70_SYSTEM_WITH_RAW_MODES}>:NRF70_SYSTEM_WITH_RAW_MODES>
-  $<$<BOOL:${CONFIG_NRF70_SCAN_ONLY}>:NRF70_SCAN_ONLY>
-  $<$<BOOL:${CONFIG_NRF70_SYSTEM_MODE}>:NRF70_SYSTEM_MODE>
-  $<$<BOOL:${CONFIG_NRF70_2_4G_ONLY}>:NRF70_2_4G_ONLY>
-  $<$<BOOL:${CONFIG_NRF70_LOG_VERBOSE}>:NRF70_LOG_VERBOSE>
-  $<$<BOOL:${CONFIG_NRF70_AP_MODE}>:NRF70_AP_MODE>
-  $<$<BOOL:${CONFIG_NRF_WIFI_MGMT_BUFF_OFFLOAD}>:NRF_WIFI_MGMT_BUFF_OFFLOAD>
-  $<$<BOOL:${CONFIG_NRF_WIFI_FEAT_KEEPALIVE}>:NRF_WIFI_FEAT_KEEPALIVE>
-  $<$<BOOL:${CONFIG_NRF_WIFI_FEAT_KEEPALIVE}>:NRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}>
-  $<$<BOOL:${CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS}>:WIFI_MGMT_RAW_SCAN_RESULTS>
-  NRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
-  NRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}
-  NRF70_RX_MAX_DATA_SIZE=${CONFIG_NRF70_RX_MAX_DATA_SIZE}
-  NRF70_MAX_TX_PENDING_QLEN=${CONFIG_NRF70_MAX_TX_PENDING_QLEN}
-  NRF70_RPU_PS_IDLE_TIMEOUT_MS=${CONFIG_NRF70_RPU_PS_IDLE_TIMEOUT_MS}
-  NRF70_REG_DOMAIN=${CONFIG_NRF70_REG_DOMAIN}
-  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS}
-  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS}
-  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE}
-  NRF70_PCB_LOSS_2G=${CONFIG_NRF70_PCB_LOSS_2G}
-  NRF70_PCB_LOSS_5G_BAND1=${CONFIG_NRF70_PCB_LOSS_5G_BAND1}
-  NRF70_PCB_LOSS_5G_BAND2=${CONFIG_NRF70_PCB_LOSS_5G_BAND2}
-  NRF70_PCB_LOSS_5G_BAND3=${CONFIG_NRF70_PCB_LOSS_5G_BAND3}
-  NRF70_ANT_GAIN_2G=${CONFIG_NRF70_ANT_GAIN_2G}
-  NRF70_ANT_GAIN_5G_BAND1=${CONFIG_NRF70_ANT_GAIN_5G_BAND1}
-  NRF70_ANT_GAIN_5G_BAND2=${CONFIG_NRF70_ANT_GAIN_5G_BAND2}
-  NRF70_ANT_GAIN_5G_BAND3=${CONFIG_NRF70_ANT_GAIN_5G_BAND3}
-  NRF_WIFI_PS_INT_PS=${CONFIG_NRF_WIFI_PS_INT_PS}
-  NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS=${CONFIG_NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS}
-)
-
-target_include_directories(
-  nrf-wifi-interface
-  INTERFACE
-  ${CMAKE_CURRENT_LIST_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/../bus
-  ${NRF_WIFI_DIR}/utils/inc
-  ${NRF_WIFI_DIR}/os_if/inc
-  ${NRF_WIFI_DIR}/bus_if/bus/qspi/inc
-  ${NRF_WIFI_DIR}/bus_if/bal/inc
-  ${NRF_WIFI_DIR}/fw_if/umac_if/inc
-  ${NRF_WIFI_DIR}/fw_load/mips/fw/inc
-  ${NRF_WIFI_DIR}/hw_if/hal/inc
-  ${NRF_WIFI_DIR}/hw_if/hal/inc/fw
-  ${NRF_WIFI_DIR}/fw_if/umac_if/inc/fw
-)
-
-if(CONFIG_NRF70_RADIO_TEST)
-  target_include_directories(nrf-wifi-interface INTERFACE
-    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/radio_test
-  )
-elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
-  target_include_directories(nrf-wifi-interface INTERFACE
-    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/offload_raw_tx
-    off_raw_tx/inc
-  )
-else()
-  target_include_directories(nrf-wifi-interface INTERFACE
-    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/default
-  )
-endif()
-
-zephyr_library_sources(
-  ${NRF_WIFI_DIR}/os_if/src/osal.c
-  ${NRF_WIFI_DIR}/utils/src/list.c
-  ${NRF_WIFI_DIR}/utils/src/queue.c
-  ${NRF_WIFI_DIR}/utils/src/util.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_api.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_fw_patch_loader.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_interrupt.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_mem.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_reg.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hpqm.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/pal.c
-  ${NRF_WIFI_DIR}/bus_if/bal/src/bal.c
-  ${NRF_WIFI_DIR}/bus_if/bus/qspi/src/qspi.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/cmd.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/event.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_api_common.c
-)
-
-if(CONFIG_NRF70_RADIO_TEST)
-  zephyr_library_sources(
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/radio_test/fmac_api.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-  )
-elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
-  zephyr_library_sources(
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/offload_raw_tx/fmac_api.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-  )
-else()
-  zephyr_library_sources(
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/rx.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_vif.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/default/fmac_api.c
-  )
-endif()
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_DATA_TX
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/tx.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_promisc.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_AP_MODE
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_ap.c
-)
-
-# Without WPA supplicant we only support scan
-zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-)
-
-zephyr_library_sources(
-  shim.c
-  timer.c
-  work.c
-)
-
-target_link_libraries(zephyr_interface INTERFACE nrf-wifi-interface)
-target_link_libraries(nrf_wifi PRIVATE nrf70-buslib)
diff --git a/modules/nrf_wifi/os/shim.c b/modules/nrf_wifi/shim.c
similarity index 99%
rename from modules/nrf_wifi/os/shim.c
rename to modules/nrf_wifi/shim.c
index ed6acf95846..93cafa905c2 100644
--- a/modules/nrf_wifi/os/shim.c
+++ b/modules/nrf_wifi/shim.c
@@ -18,13 +18,13 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/__assert.h>
-#include <zephyr/drivers/wifi/nrf_wifi/bus/rpu_hw_if.h>
-#include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
 
+#include "rpu_hw_if.h"
 #include "shim.h"
 #include "work.h"
 #include "timer.h"
 #include "osal_ops.h"
+#include "qspi_if.h"
 
 LOG_MODULE_REGISTER(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 
diff --git a/modules/nrf_wifi/os/shim.h b/modules/nrf_wifi/shim.h
similarity index 100%
rename from modules/nrf_wifi/os/shim.h
rename to modules/nrf_wifi/shim.h
diff --git a/modules/nrf_wifi/os/timer.c b/modules/nrf_wifi/timer.c
similarity index 100%
rename from modules/nrf_wifi/os/timer.c
rename to modules/nrf_wifi/timer.c
diff --git a/modules/nrf_wifi/os/timer.h b/modules/nrf_wifi/timer.h
similarity index 100%
rename from modules/nrf_wifi/os/timer.h
rename to modules/nrf_wifi/timer.h
diff --git a/modules/nrf_wifi/os/work.c b/modules/nrf_wifi/work.c
similarity index 100%
rename from modules/nrf_wifi/os/work.c
rename to modules/nrf_wifi/work.c
diff --git a/modules/nrf_wifi/os/work.h b/modules/nrf_wifi/work.h
similarity index 100%
rename from modules/nrf_wifi/os/work.h
rename to modules/nrf_wifi/work.h

From 90113071f726f12d1e03c96beeb458db31f12d2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:19 +0100
Subject: [PATCH 1280/2913] Revert "[nrf fromtree] cmake: clear llvm bintool
 gapfill property"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 167370f5f21e4b8d42d6fc704f4c38db59d78b7a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/bintools/llvm/target_bintools.cmake | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cmake/bintools/llvm/target_bintools.cmake b/cmake/bintools/llvm/target_bintools.cmake
index f310d57bf2b..cd3d55342b5 100644
--- a/cmake/bintools/llvm/target_bintools.cmake
+++ b/cmake/bintools/llvm/target_bintools.cmake
@@ -44,8 +44,11 @@ set_property(TARGET bintools PROPERTY elfconvert_flag_section_remove "--remove-s
 set_property(TARGET bintools PROPERTY elfconvert_flag_section_only "--only-section=")
 set_property(TARGET bintools PROPERTY elfconvert_flag_section_rename "--rename-section;")
 
-# llvm-objcopy doesn't support gap fill argument.
-set_property(TARGET bintools PROPERTY elfconvert_flag_gapfill "")
+# Note, placing a ';' at the end results in the following param  to be a list,
+# and hence space separated.
+# Thus the command line argument becomes:
+# `--gap-file <value>` instead of `--gap-fill<value>` (The latter would result in an error)
+set_property(TARGET bintools PROPERTY elfconvert_flag_gapfill "--gap-fill;")
 set_property(TARGET bintools PROPERTY elfconvert_flag_srec_len "--srec-len=")
 
 set_property(TARGET bintools PROPERTY elfconvert_flag_infile "")

From 616c61a099ea9de5982e3153f4a0cb7069741ec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:19 +0100
Subject: [PATCH 1281/2913] Revert "[nrf fromtree] cmake: deprecate
 BUILD_NO_GAP_FILL and introduce type specific gap fill"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ad855faf4c639984d8b2dcf086679f0502b3c5fa.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 CMakeLists.txt | 13 +++++++------
 Kconfig.zephyr | 27 +--------------------------
 2 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64c0f1f8ef5..410aff11ab4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1617,9 +1617,10 @@ list(APPEND
 )
 list(APPEND post_build_byproducts ${KERNEL_MAP_NAME})
 
-# Use ';' as separator to get proper space in resulting command.
-set(gap_fill_prop "$<TARGET_PROPERTY:bintools,elfconvert_flag_gapfill>")
-set(gap_fill "$<$<BOOL:${gap_fill_prop}>:${gap_fill_prop}${CONFIG_BUILD_GAP_FILL_PATTERN}>")
+if(NOT CONFIG_BUILD_NO_GAP_FILL)
+  # Use ';' as separator to get proper space in resulting command.
+  set(GAP_FILL "$<TARGET_PROPERTY:bintools,elfconvert_flag_gapfill>0xff")
+endif()
 
 if(CONFIG_OUTPUT_PRINT_MEMORY_USAGE)
   target_link_libraries(${logical_target_for_zephyr_elf} $<TARGET_PROPERTY:linker,memusage>)
@@ -1680,7 +1681,7 @@ if(CONFIG_BUILD_OUTPUT_HEX OR BOARD_FLASH_RUNNER STREQUAL openocd)
       post_build_commands
       COMMAND $<TARGET_PROPERTY:bintools,elfconvert_command>
               $<TARGET_PROPERTY:bintools,elfconvert_flag>
-              $<$<BOOL:${CONFIG_BUILD_OUTPUT_HEX_GAP_FILL}>:${gap_fill}>
+              ${GAP_FILL}
               $<TARGET_PROPERTY:bintools,elfconvert_flag_outtarget>ihex
               ${remove_sections_argument_list}
               $<TARGET_PROPERTY:bintools,elfconvert_flag_infile>${KERNEL_ELF_NAME}
@@ -1702,7 +1703,7 @@ if(CONFIG_BUILD_OUTPUT_BIN)
       post_build_commands
       COMMAND $<TARGET_PROPERTY:bintools,elfconvert_command>
               $<TARGET_PROPERTY:bintools,elfconvert_flag>
-              ${gap_fill}
+              ${GAP_FILL}
               $<TARGET_PROPERTY:bintools,elfconvert_flag_outtarget>binary
               ${remove_sections_argument_list}
               $<TARGET_PROPERTY:bintools,elfconvert_flag_infile>${KERNEL_ELF_NAME}
@@ -1789,7 +1790,7 @@ if(CONFIG_BUILD_OUTPUT_S19)
       post_build_commands
       COMMAND $<TARGET_PROPERTY:bintools,elfconvert_command>
               $<TARGET_PROPERTY:bintools,elfconvert_flag>
-              $<$<BOOL:${CONFIG_BUILD_OUTPUT_S19_GAP_FILL}>:${gap_fill}>
+              ${GAP_FILL}
               $<TARGET_PROPERTY:bintools,elfconvert_flag_outtarget>srec
               $<TARGET_PROPERTY:bintools,elfconvert_flag_srec_len>1
               $<TARGET_PROPERTY:bintools,elfconvert_flag_infile>${KERNEL_ELF_NAME}
diff --git a/Kconfig.zephyr b/Kconfig.zephyr
index 510769d8aa7..68abf89b42f 100644
--- a/Kconfig.zephyr
+++ b/Kconfig.zephyr
@@ -706,21 +706,8 @@ config CLEANUP_INTERMEDIATE_FILES
 	  from the build process. Note this breaks incremental builds, west spdx
 	  (Software Bill of Material generation), and maybe others.
 
-config BUILD_GAP_FILL_PATTERN
-	hex "Gap fill pattern"
-	default 0xFF
-	help
-	  Pattern used for gap filling of output files.
-	  This value should be set to the value of a clean flash as this can
-	  significantly reduce flash write times.
-	  This setting only defines the gap fill pattern and doesn't enable gap
-	  filling.
-	  Note: binary files are always gap filled as they contain no address
-	  information.
-
 config BUILD_NO_GAP_FILL
-	bool "Don't fill gaps in generated hex/s19 files [DEPRECATED]."
-	select DEPRECATED
+	bool "Don't fill gaps in generated hex/bin/s19 files."
 
 config BUILD_OUTPUT_HEX
 	bool "Build a binary in HEX format"
@@ -728,12 +715,6 @@ config BUILD_OUTPUT_HEX
 	  Build an Intel HEX binary zephyr/zephyr.hex in the build directory.
 	  The name of this file can be customized with CONFIG_KERNEL_BIN_NAME.
 
-config BUILD_OUTPUT_HEX_GAP_FILL
-	bool "Fill gaps in hex files"
-	depends on !BUILD_NO_GAP_FILL
-	help
-	  Fill gaps in hex based files.
-
 config BUILD_OUTPUT_BIN
 	bool "Build a binary in BIN format"
 	default y
@@ -768,12 +749,6 @@ config BUILD_OUTPUT_S19
 	  Build an S19 binary zephyr/zephyr.s19 in the build directory.
 	  The name of this file can be customized with CONFIG_KERNEL_BIN_NAME.
 
-config BUILD_OUTPUT_S19_GAP_FILL
-	bool "Fill gaps in s19 files"
-	depends on !BUILD_NO_GAP_FILL
-	help
-	  Fill gaps in s19 based files.
-
 config BUILD_OUTPUT_UF2
 	bool "Build a binary in UF2 format"
 	depends on BUILD_OUTPUT_BIN

From d3d5e62b370112955b01a80e52e75e650a0c5423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:19 +0100
Subject: [PATCH 1282/2913] Revert "[nrf fromtree] cmake: update build_info()
 calls to use PATH argument"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0108dd5fb9f4da8949501e5afd5b47153dc658a0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/modules/FindHostTools.cmake |  2 +-
 cmake/modules/dts.cmake           | 10 +++++-----
 cmake/modules/kconfig.cmake       |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmake/modules/FindHostTools.cmake b/cmake/modules/FindHostTools.cmake
index 1dfce4d3d4a..876a86934b1 100644
--- a/cmake/modules/FindHostTools.cmake
+++ b/cmake/modules/FindHostTools.cmake
@@ -116,4 +116,4 @@ set(HostTools_FOUND TRUE)
 set(HOSTTOOLS_FOUND TRUE)
 build_info(toolchain name VALUE ${ZEPHYR_TOOLCHAIN_VARIANT})
 string(TOUPPER ${ZEPHYR_TOOLCHAIN_VARIANT} zephyr_toolchain_variant_upper)
-build_info(toolchain path PATH "${${zephyr_toolchain_variant_upper}_TOOLCHAIN_PATH}")
+build_info(toolchain path VALUE "${${zephyr_toolchain_variant_upper}_TOOLCHAIN_PATH}")
diff --git a/cmake/modules/dts.cmake b/cmake/modules/dts.cmake
index eb7869548fe..b029dd5be3e 100644
--- a/cmake/modules/dts.cmake
+++ b/cmake/modules/dts.cmake
@@ -182,7 +182,7 @@ set(dts_files
 if(DTC_OVERLAY_FILE)
   zephyr_list(TRANSFORM DTC_OVERLAY_FILE NORMALIZE_PATHS
               OUTPUT_VARIABLE DTC_OVERLAY_FILE_AS_LIST)
-  build_info(devicetree user-files PATH ${DTC_OVERLAY_FILE_AS_LIST})
+  build_info(devicetree user-files VALUE ${DTC_OVERLAY_FILE_AS_LIST})
   list(APPEND
     dts_files
     ${DTC_OVERLAY_FILE_AS_LIST}
@@ -192,7 +192,7 @@ endif()
 if(EXTRA_DTC_OVERLAY_FILE)
   zephyr_list(TRANSFORM EXTRA_DTC_OVERLAY_FILE NORMALIZE_PATHS
               OUTPUT_VARIABLE EXTRA_DTC_OVERLAY_FILE_AS_LIST)
-  build_info(devicetree extra-user-files PATH ${EXTRA_DTC_OVERLAY_FILE_AS_LIST})
+  build_info(devicetree extra-user-files VALUE ${EXTRA_DTC_OVERLAY_FILE_AS_LIST})
   list(APPEND
     dts_files
     ${EXTRA_DTC_OVERLAY_FILE_AS_LIST}
@@ -399,6 +399,6 @@ elseif(stderr)
 endif()
 endif(DTC)
 
-build_info(devicetree files PATH ${dts_files})
-build_info(devicetree include-dirs PATH ${DTS_ROOT_SYSTEM_INCLUDE_DIRS})
-build_info(devicetree bindings-dirs PATH ${DTS_ROOT_BINDINGS})
+build_info(devicetree files VALUE ${dts_files})
+build_info(devicetree include-dirs VALUE ${DTS_ROOT_SYSTEM_INCLUDE_DIRS})
+build_info(devicetree bindings-dirs VALUE ${DTS_ROOT_BINDINGS})
diff --git a/cmake/modules/kconfig.cmake b/cmake/modules/kconfig.cmake
index 02bebbe0851..377aa0d11e1 100644
--- a/cmake/modules/kconfig.cmake
+++ b/cmake/modules/kconfig.cmake
@@ -98,13 +98,13 @@ set(PARSED_KCONFIG_SOURCES_TXT ${PROJECT_BINARY_DIR}/kconfig/sources.txt)
 if(CONF_FILE)
   string(CONFIGURE "${CONF_FILE}" CONF_FILE_EXPANDED)
   string(REPLACE " " ";" CONF_FILE_AS_LIST "${CONF_FILE_EXPANDED}")
-  build_info(kconfig user-files PATH ${CONF_FILE_AS_LIST})
+  build_info(kconfig user-files VALUE ${CONF_FILE_AS_LIST})
 endif()
 
 if(EXTRA_CONF_FILE)
   string(CONFIGURE "${EXTRA_CONF_FILE}" EXTRA_CONF_FILE_EXPANDED)
   string(REPLACE " " ";" EXTRA_CONF_FILE_AS_LIST "${EXTRA_CONF_FILE_EXPANDED}")
-  build_info(kconfig extra-user-files PATH ${EXTRA_CONF_FILE_AS_LIST})
+  build_info(kconfig extra-user-files VALUE ${EXTRA_CONF_FILE_AS_LIST})
 endif()
 
 zephyr_file(CONF_FILES ${BOARD_EXTENSION_DIRS} KCONF board_extension_conf_files SUFFIX ${FILE_SUFFIX})
@@ -359,7 +359,7 @@ endif()
 if(CREATE_NEW_DOTCONFIG)
   set(input_configs_flags --handwritten-input-configs)
   set(input_configs ${merge_config_files} ${FORCED_CONF_FILE})
-  build_info(kconfig files PATH ${input_configs})
+  build_info(kconfig files VALUE ${input_configs})
 else()
   set(input_configs ${DOTCONFIG} ${FORCED_CONF_FILE})
 endif()

From 774f065e0b5b04689139d533d804371a3594e8c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:19 +0100
Subject: [PATCH 1283/2913] Revert "[nrf fromtree] cmake: nordic: save build
 information regarding SVD file used."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 79b1c3f52360807e469a9ed82c5cf06e882f79d1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/nrfx/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 1665c122c9f..3863fa177ed 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -242,4 +242,3 @@ mdk_svd_ifdef(CONFIG_SOC_NRF9160              nrf9160.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9230_ENGB_CPUAPP  nrf9230_engb_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9230_ENGB_CPUPPR  nrf9230_engb_ppr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9230_ENGB_CPURAD  nrf9230_engb_radiocore.svd)
-build_info(vendor-specific nordic svdfile VALUE ${SOC_SVD_FILE})

From ee6b0c3c8568809fc1f6ae1491ec0a6e28f57a75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:19 +0100
Subject: [PATCH 1284/2913] Revert "[nrf fromtree] cmake: support build info in
 Zephyr"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7db55e638d59852114053e9f4aa52c67d921e49d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 CMakeLists.txt                          | 7 -------
 cmake/modules/FindHostTools.cmake       | 3 ---
 cmake/modules/boards.cmake              | 4 ----
 cmake/modules/configuration_files.cmake | 2 --
 cmake/modules/dts.cmake                 | 6 ------
 cmake/modules/kconfig.cmake             | 3 ---
 share/sysbuild/CMakeLists.txt           | 7 -------
 7 files changed, 32 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 410aff11ab4..cbd6ac7bb1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2234,10 +2234,3 @@ add_subdirectory_ifdef(
   )
 
 toolchain_linker_finalize()
-
-yaml_context(EXISTS NAME build_info result)
-if(result)
-  build_info(zephyr version VALUE ${PROJECT_VERSION_STR})
-  build_info(zephyr zephyr-base VALUE ${ZEPHYR_BASE})
-  yaml_save(NAME build_info)
-endif()
diff --git a/cmake/modules/FindHostTools.cmake b/cmake/modules/FindHostTools.cmake
index 876a86934b1..8d3c9eccaaf 100644
--- a/cmake/modules/FindHostTools.cmake
+++ b/cmake/modules/FindHostTools.cmake
@@ -114,6 +114,3 @@ set_ifndef(TOOLCHAIN_KCONFIG_DIR ${TOOLCHAIN_ROOT}/cmake/toolchain/${ZEPHYR_TOOL
 
 set(HostTools_FOUND TRUE)
 set(HOSTTOOLS_FOUND TRUE)
-build_info(toolchain name VALUE ${ZEPHYR_TOOLCHAIN_VARIANT})
-string(TOUPPER ${ZEPHYR_TOOLCHAIN_VARIANT} zephyr_toolchain_variant_upper)
-build_info(toolchain path VALUE "${${zephyr_toolchain_variant_upper}_TOOLCHAIN_PATH}")
diff --git a/cmake/modules/boards.cmake b/cmake/modules/boards.cmake
index 2b78845482a..d13e0a16f2d 100644
--- a/cmake/modules/boards.cmake
+++ b/cmake/modules/boards.cmake
@@ -353,7 +353,3 @@ if(BOARD_EXTENSIONS)
     list(APPEND BOARD_EXTENSION_DIRS ${board_extension_dir})
   endforeach()
 endif()
-build_info(board name VALUE ${BOARD})
-string(REGEX REPLACE "^/" "" qualifiers "${BOARD_QUALIFIERS}")
-build_info(board qualifiers VALUE ${qualifiers})
-build_info(board revision VALUE ${BOARD_REVISION})
diff --git a/cmake/modules/configuration_files.cmake b/cmake/modules/configuration_files.cmake
index ff7a172445c..84af8c5b635 100644
--- a/cmake/modules/configuration_files.cmake
+++ b/cmake/modules/configuration_files.cmake
@@ -99,5 +99,3 @@ zephyr_boilerplate_watch(DTC_OVERLAY_FILE)
 zephyr_get(EXTRA_CONF_FILE SYSBUILD LOCAL VAR EXTRA_CONF_FILE OVERLAY_CONFIG MERGE REVERSE)
 zephyr_get(EXTRA_DTC_OVERLAY_FILE SYSBUILD LOCAL MERGE REVERSE)
 zephyr_get(DTS_EXTRA_CPPFLAGS SYSBUILD LOCAL MERGE REVERSE)
-build_info(application source-dir VALUE ${APPLICATION_SOURCE_DIR})
-build_info(application configuration-dir VALUE ${APPLICATION_CONFIG_DIR})
diff --git a/cmake/modules/dts.cmake b/cmake/modules/dts.cmake
index b029dd5be3e..42e822c6c91 100644
--- a/cmake/modules/dts.cmake
+++ b/cmake/modules/dts.cmake
@@ -182,7 +182,6 @@ set(dts_files
 if(DTC_OVERLAY_FILE)
   zephyr_list(TRANSFORM DTC_OVERLAY_FILE NORMALIZE_PATHS
               OUTPUT_VARIABLE DTC_OVERLAY_FILE_AS_LIST)
-  build_info(devicetree user-files VALUE ${DTC_OVERLAY_FILE_AS_LIST})
   list(APPEND
     dts_files
     ${DTC_OVERLAY_FILE_AS_LIST}
@@ -192,7 +191,6 @@ endif()
 if(EXTRA_DTC_OVERLAY_FILE)
   zephyr_list(TRANSFORM EXTRA_DTC_OVERLAY_FILE NORMALIZE_PATHS
               OUTPUT_VARIABLE EXTRA_DTC_OVERLAY_FILE_AS_LIST)
-  build_info(devicetree extra-user-files VALUE ${EXTRA_DTC_OVERLAY_FILE_AS_LIST})
   list(APPEND
     dts_files
     ${EXTRA_DTC_OVERLAY_FILE_AS_LIST}
@@ -398,7 +396,3 @@ elseif(stderr)
   message(WARNING "dtc raised one or more warnings:\n${stderr}")
 endif()
 endif(DTC)
-
-build_info(devicetree files VALUE ${dts_files})
-build_info(devicetree include-dirs VALUE ${DTS_ROOT_SYSTEM_INCLUDE_DIRS})
-build_info(devicetree bindings-dirs VALUE ${DTS_ROOT_BINDINGS})
diff --git a/cmake/modules/kconfig.cmake b/cmake/modules/kconfig.cmake
index 377aa0d11e1..ba461d30bbc 100644
--- a/cmake/modules/kconfig.cmake
+++ b/cmake/modules/kconfig.cmake
@@ -98,13 +98,11 @@ set(PARSED_KCONFIG_SOURCES_TXT ${PROJECT_BINARY_DIR}/kconfig/sources.txt)
 if(CONF_FILE)
   string(CONFIGURE "${CONF_FILE}" CONF_FILE_EXPANDED)
   string(REPLACE " " ";" CONF_FILE_AS_LIST "${CONF_FILE_EXPANDED}")
-  build_info(kconfig user-files VALUE ${CONF_FILE_AS_LIST})
 endif()
 
 if(EXTRA_CONF_FILE)
   string(CONFIGURE "${EXTRA_CONF_FILE}" EXTRA_CONF_FILE_EXPANDED)
   string(REPLACE " " ";" EXTRA_CONF_FILE_AS_LIST "${EXTRA_CONF_FILE_EXPANDED}")
-  build_info(kconfig extra-user-files VALUE ${EXTRA_CONF_FILE_AS_LIST})
 endif()
 
 zephyr_file(CONF_FILES ${BOARD_EXTENSION_DIRS} KCONF board_extension_conf_files SUFFIX ${FILE_SUFFIX})
@@ -359,7 +357,6 @@ endif()
 if(CREATE_NEW_DOTCONFIG)
   set(input_configs_flags --handwritten-input-configs)
   set(input_configs ${merge_config_files} ${FORCED_CONF_FILE})
-  build_info(kconfig files VALUE ${input_configs})
 else()
   set(input_configs ${DOTCONFIG} ${FORCED_CONF_FILE})
 endif()
diff --git a/share/sysbuild/CMakeLists.txt b/share/sysbuild/CMakeLists.txt
index f2fbb4b2718..8370490fb94 100644
--- a/share/sysbuild/CMakeLists.txt
+++ b/share/sysbuild/CMakeLists.txt
@@ -25,10 +25,3 @@ if(EXISTS ${APP_DIR}/sysbuild/CMakeLists.txt)
 else()
   add_subdirectory(template _sysbuild)
 endif()
-
-build_info(sysbuild VALUE true)
-build_info(application source-dir VALUE ${CMAKE_CURRENT_SOURCE_DIR})
-yaml_context(EXISTS NAME build_info result)
-if(result)
-  yaml_save(NAME build_info)
-endif()

From 82f302fffe3ad44da3039a1e4cc38aa6e63aabfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:19 +0100
Subject: [PATCH 1285/2913] Revert "[nrf fromtree] cmake: detect LLVM picolibc
 and newlib support"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 43626570e47b95dfae01f41933a27755f12e9b52.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/compiler/clang/target.cmake  | 36 ------------------------------
 cmake/toolchain/llvm/generic.cmake | 24 +-------------------
 2 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/cmake/compiler/clang/target.cmake b/cmake/compiler/clang/target.cmake
index 62c39b0ec6f..d2d41e8b23c 100644
--- a/cmake/compiler/clang/target.cmake
+++ b/cmake/compiler/clang/target.cmake
@@ -64,42 +64,6 @@ if(NOT "${ARCH}" STREQUAL "posix")
     endif()
   endif()
 
-  # LLVM will use a default sysroot for selection of the C library. The default
-  # C library sysroot was defined at built time of clang/LLVM.
-  #
-  # For example, LLVM for Arm comes pre-built with Picolibc, and thus no flags
-  # are required for selecting Picolibc.
-  #
-  # Other clang/LLVM distributions may come with other pre-built C libraries.
-  # clang/LLVM supports using an alternative C library, either by direct linking,
-  # or by specifying '--sysroot <path>'.
-  #
-  # LLVM for Arm provides a 'newlib.cfg' file for newlib C selection.
-  # Let us support this principle by looking for a dedicated 'newlib.cfg' or
-  # 'picolibc.cfg' and specify '--config <spec>.cfg' if such a file is found.
-  # If no cfg-file matching the chosen C implementation, then we assume that the
-  # chosen C implementation is identical to the default C library used be the
-  # toolchain.
-  if(CONFIG_NEWLIB_LIBC)
-    file(GLOB_RECURSE newlib_cfg ${LLVM_TOOLCHAIN_PATH}/newlib.cfg)
-    if(newlib_cfg)
-      list(GET newlib_cfg 0 newlib_cfg)
-      set_linker_property(PROPERTY c_library "--config=${newlib_cfg};-lc")
-      list(APPEND CMAKE_REQUIRED_FLAGS --config=${newlib_cfg})
-      list(APPEND TOOLCHAIN_C_FLAGS --config=${newlib_cfg})
-    endif()
-  endif()
-
-  if(CONFIG_PICOLIBC)
-    file(GLOB_RECURSE picolibc_cfg ${LLVM_TOOLCHAIN_PATH}/picolibc.cfg)
-    if(picolibc_cfg)
-      list(GET picolibc_cfg 0 picolibc_cfg)
-      set_linker_property(PROPERTY c_library "--config=${picolibc_cfg};-lc")
-      list(APPEND CMAKE_REQUIRED_FLAGS --config=${picolibc_cfg})
-      list(APPEND TOOLCHAIN_C_FLAGS --config=${picolibc_cfg})
-    endif()
-  endif()
-
   # This libgcc code is partially duplicated in compiler/*/target.cmake
   execute_process(
     COMMAND ${CMAKE_C_COMPILER} ${clang_target_flag} ${TOOLCHAIN_C_FLAGS}
diff --git a/cmake/toolchain/llvm/generic.cmake b/cmake/toolchain/llvm/generic.cmake
index f6d7878288d..45474b7df30 100644
--- a/cmake/toolchain/llvm/generic.cmake
+++ b/cmake/toolchain/llvm/generic.cmake
@@ -17,28 +17,6 @@ set(LLVM_TOOLCHAIN_PATH ${CLANG_ROOT_DIR} CACHE PATH "clang install directory")
 set(COMPILER clang)
 set(BINTOOLS llvm)
 
-# LLVM is flexible, meaning that it can in principle always support newlib or picolibc.
-# This is not decided by LLVM itself, but depends on libraries distributed with  the installation.
-# Also newlib or picolibc may be created as add-ons. Thus always stating that LLVM does not have
-# newlib or picolibc would be wrong. Same with stating that LLVM has newlib or Picolibc.
-# The best assumption for TOOLCHAIN_HAS_<NEWLIB|PICOLIBC> is to check for the  presence of
-# '_newlib_version.h' / 'picolibc' and have the default value set accordingly.
-# This provides a best effort mechanism to allow developers to have the newlib C / Picolibc library
-# selection available in Kconfig.
-# Developers can manually indicate library support with '-DTOOLCHAIN_HAS_<NEWLIB|PICOLIBC>=<ON|OFF>'
-
-# Support for newlib is indicated by the presence of '_newlib_version.h' in the toolchain path.
-if(NOT LLVM_TOOLCHAIN_PATH STREQUAL "")
-  file(GLOB_RECURSE newlib_header ${LLVM_TOOLCHAIN_PATH}/_newlib_version.h)
-  if(newlib_header)
-    set(TOOLCHAIN_HAS_NEWLIB ON CACHE BOOL "True if toolchain supports newlib")
-  endif()
-
-  # Support for picolibc is indicated by the presence of 'picolibc.h' in the toolchain path.
-  file(GLOB_RECURSE picolibc_header ${LLVM_TOOLCHAIN_PATH}/picolibc.h)
-  if(picolibc_header)
-    set(TOOLCHAIN_HAS_PICOLIBC ON CACHE BOOL "True if toolchain supports picolibc")
-  endif()
-endif()
+set(TOOLCHAIN_HAS_NEWLIB OFF CACHE BOOL "True if toolchain supports newlib")
 
 message(STATUS "Found toolchain: llvm (clang/ld)")

From 7109ff8685ff3c2353888099f3a67853311d25e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:19 +0100
Subject: [PATCH 1286/2913] Revert "[nrf fromtree] manifest: update picolibc to
 support the new c_library property"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a11337328d384b76a4fc1c0a835ee67ebc7386c4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index fadcb7d7daf..4ca8aa06f6a 100644
--- a/west.yml
+++ b/west.yml
@@ -318,7 +318,7 @@ manifest:
         - debug
     - name: picolibc
       path: modules/lib/picolibc
-      revision: 27746bbc246841852912fc3bb5b45094cd8a505a
+      revision: e15656f7682500fc8953e1a2008f7b1ae4f65ce8
     - name: segger
       revision: b011c45b585e097d95d9cf93edf4f2e01588d3cd
       path: modules/debug/segger

From 6621f7a6cd7e84cf88bf9192a80deffb45f9d622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:19 +0100
Subject: [PATCH 1287/2913] Revert "[nrf fromtree] cmake: move specs compiler
 and linker flags to toolchain properties"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3a488abdeabe67ad1e1ac426339d2ec74ed6c740.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/compiler/clang/compiler_flags.cmake    | 2 --
 cmake/compiler/compiler_flags_template.cmake | 4 ----
 cmake/compiler/gcc/compiler_flags.cmake      | 2 --
 cmake/linker/ld/gcc/linker_flags.cmake       | 2 --
 cmake/linker/linker_flags_template.cmake     | 4 ----
 lib/libc/picolibc/CMakeLists.txt             | 5 +++--
 6 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/cmake/compiler/clang/compiler_flags.cmake b/cmake/compiler/clang/compiler_flags.cmake
index a64150eb58c..acc9b629171 100644
--- a/cmake/compiler/clang/compiler_flags.cmake
+++ b/cmake/compiler/clang/compiler_flags.cmake
@@ -125,5 +125,3 @@ set_compiler_property(PROPERTY warning_error_coding_guideline
 )
 
 set_compiler_property(PROPERTY no_global_merge "-mno-global-merge")
-
-set_compiler_property(PROPERTY specs)
diff --git a/cmake/compiler/compiler_flags_template.cmake b/cmake/compiler/compiler_flags_template.cmake
index 5a4386f49be..c72e9b70f5d 100644
--- a/cmake/compiler/compiler_flags_template.cmake
+++ b/cmake/compiler/compiler_flags_template.cmake
@@ -139,7 +139,3 @@ set_compiler_property(PROPERTY warning_shadow_variables)
 # Compiler flags to avoid recognizing built-in functions
 set_compiler_property(PROPERTY no_builtin)
 set_compiler_property(PROPERTY no_builtin_malloc)
-
-# Compiler flag for defining specs. Used only by gcc, other compilers may keep
-# this undefined.
-set_compiler_property(PROPERTY specs)
diff --git a/cmake/compiler/gcc/compiler_flags.cmake b/cmake/compiler/gcc/compiler_flags.cmake
index c346a750af4..e982f75aa78 100644
--- a/cmake/compiler/gcc/compiler_flags.cmake
+++ b/cmake/compiler/gcc/compiler_flags.cmake
@@ -241,5 +241,3 @@ set_compiler_property(PROPERTY warning_shadow_variables -Wshadow)
 
 set_compiler_property(PROPERTY no_builtin -fno-builtin)
 set_compiler_property(PROPERTY no_builtin_malloc -fno-builtin-malloc)
-
-set_compiler_property(PROPERTY specs -specs=)
diff --git a/cmake/linker/ld/gcc/linker_flags.cmake b/cmake/linker/ld/gcc/linker_flags.cmake
index c442c9c8921..4cde7d96ff3 100644
--- a/cmake/linker/ld/gcc/linker_flags.cmake
+++ b/cmake/linker/ld/gcc/linker_flags.cmake
@@ -15,5 +15,3 @@ add_link_options(-gdwarf-4)
 
 # Extra warnings options for twister run
 set_property(TARGET linker PROPERTY warnings_as_errors -Wl,--fatal-warnings)
-
-set_linker_property(PROPERTY specs -specs=)
diff --git a/cmake/linker/linker_flags_template.cmake b/cmake/linker/linker_flags_template.cmake
index 8b0b948b028..870c597be24 100644
--- a/cmake/linker/linker_flags_template.cmake
+++ b/cmake/linker/linker_flags_template.cmake
@@ -49,7 +49,3 @@ set_property(TARGET linker PROPERTY no_relax)
 
 # Linker flag for enabling relaxation of address optimization for jump calls.
 set_property(TARGET linker PROPERTY relax)
-
-# Linker flag for defining specs. Defined only by gcc, when gcc is used as
-# front-end for ld.
-set_compiler_property(PROPERTY specs)
diff --git a/lib/libc/picolibc/CMakeLists.txt b/lib/libc/picolibc/CMakeLists.txt
index 14af66b7b7d..fcb4f9f2b57 100644
--- a/lib/libc/picolibc/CMakeLists.txt
+++ b/lib/libc/picolibc/CMakeLists.txt
@@ -15,8 +15,9 @@ if(NOT CONFIG_PICOLIBC_USE_MODULE)
   # Use picolibc provided with the toolchain. This requires a new enough
   # toolchain so that the version of picolibc supports auto-detecting a
   # Zephyr build (via the __ZEPHYR__ macro) to expose the Zephyr C API
-  zephyr_compile_options(PROPERTY specs picolibc.specs)
-  zephyr_link_libraries(PROPERTY specs picolibc.specs)
+
+  zephyr_compile_options(--specs=picolibc.specs)
+  zephyr_libc_link_libraries(--specs=picolibc.specs)
   if(CONFIG_PICOLIBC_IO_FLOAT)
     zephyr_compile_definitions(PICOLIBC_DOUBLE_PRINTF_SCANF)
     zephyr_link_libraries(-DPICOLIBC_DOUBLE_PRINTF_SCANF)

From e7b7bea3ff1b411a995825087e327723f9fd8cde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:19 +0100
Subject: [PATCH 1288/2913] Revert "[nrf fromtree] cmake: make TARGET optional
 in set_linker_property()"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 72b9bb5efb3d7db478635db3caa41aaf180b3d84.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/modules/extensions.cmake | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index 921a457067d..1dc516460f4 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -2441,7 +2441,7 @@ endfunction()
 #            defined with a value.
 # APPEND: Flag indicated that the property should be appended to the existing
 #         value list for the property.
-# TARGET: Name of target on which to add the property (default: linker)
+# TARGET: Name of target on which to add the property (commonly: linker)
 # PROPERTY: Name of property with the value(s) following immediately after
 #           property name
 function(set_linker_property)
@@ -2454,10 +2454,6 @@ function(set_linker_property)
    set(APPEND "APPEND")
   endif()
 
-  if(NOT DEFINED LINKER_PROPERTY_TARGET)
-   set(LINKER_PROPERTY_TARGET "linker")
-  endif()
-
   if(LINKER_PROPERTY_NO_CREATE)
     list(GET LINKER_PROPERTY_PROPERTY 0 property_name)
     get_target_property(var ${LINKER_PROPERTY_TARGET} ${property_name})
@@ -2477,7 +2473,7 @@ endfunction()
 #
 # APPEND: Flag indicated that the property should be appended to the existing
 #         value list for the property.
-# TARGET: Name of target on which to add the property (default: linker)
+# TARGET: Name of target on which to add the property (commonly: linker)
 # PROPERTY: Name of property with the value(s) following immediately after
 #           property name
 function(check_set_linker_property)
@@ -2490,10 +2486,6 @@ function(check_set_linker_property)
    set(APPEND "APPEND")
   endif()
 
-  if(NOT DEFINED LINKER_PROPERTY_TARGET)
-   set(LINKER_PROPERTY_TARGET "linker")
-  endif()
-
   list(GET LINKER_PROPERTY_PROPERTY 0 property)
   list(REMOVE_AT LINKER_PROPERTY_PROPERTY 0)
 

From 6e3ec7e5c2c3b33591e3cf890296283a1b39212d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:19 +0100
Subject: [PATCH 1289/2913] Revert "[nrf fromtree] cmake: PROPERTY flag support
 on compile options and link libraries"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c0f406063c7bc0fb76c69d2276914a9c96508d56.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/modules/extensions.cmake | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index 1dc516460f4..4773b563865 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -109,37 +109,16 @@ endfunction()
 
 # https://cmake.org/cmake/help/latest/command/target_compile_options.html
 function(zephyr_compile_options)
-  if(ARGV0 STREQUAL "PROPERTY")
-    set(property $<TARGET_PROPERTY:compiler,${ARGV1}>)
-    set(property_defined $<BOOL:${property}>)
-    if(ARGC GREATER 3)
-      message(FATAL_ERROR "zephyr_compile_options(PROPERTY <prop> [<var>]) "
-                          "called with too many arguments."
-      )
-    elseif(ARGC EQUAL 3)
-      target_compile_options(zephyr_interface INTERFACE $<${property_defined}:${property}${ARGV2}>)
-    else()
-      target_compile_options(zephyr_interface INTERFACE ${property})
-    endif()
-  else()
-    target_compile_options(zephyr_interface INTERFACE ${ARGV})
-  endif()
+  target_compile_options(zephyr_interface INTERFACE ${ARGV})
 endfunction()
 
 # https://cmake.org/cmake/help/latest/command/target_link_libraries.html
 function(zephyr_link_libraries)
   if(ARGV0 STREQUAL "PROPERTY")
-    set(property $<TARGET_PROPERTY:linker,${ARGV1}>)
-    set(property_defined $<BOOL:${property}>)
-    if(ARGC GREATER 3)
-      message(FATAL_ERROR "zephyr_link_options(PROPERTY <prop> [<val>]) "
-                          "called with too many arguments."
-      )
-    elseif(ARGC EQUAL 3)
-      target_link_libraries(zephyr_interface INTERFACE $<${property_defined}:${property}${ARGV2}>)
-    else()
-      target_link_libraries(zephyr_interface INTERFACE ${property})
+    if(ARGC GREATER 2)
+      message(FATAL_ERROR "zephyr_link_libraries(PROPERTY <prop>) only allows a single property.")
     endif()
+    target_link_libraries(zephyr_interface INTERFACE $<TARGET_PROPERTY:linker,${ARGV1}>)
   else()
     target_link_libraries(zephyr_interface INTERFACE ${ARGV})
   endif()

From b9fa11ddd9028472cbdae7d3a338df0fb9e855ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:19 +0100
Subject: [PATCH 1290/2913] Revert "[nrf fromtree] cmake: improve Zephyr link
 phase"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 20528f7dc207e15901c69c59ef3d838c9467223a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 CMakeLists.txt                               |  2 -
 cmake/compiler/clang/target.cmake            |  4 +-
 cmake/compiler/gcc/target.cmake              |  3 +-
 cmake/linker/armlink/linker_flags.cmake      |  6 +++
 cmake/linker/armlink/linker_libraries.cmake  |  8 ----
 cmake/linker/armlink/target.cmake            | 18 --------
 cmake/linker/ld/linker_flags.cmake           |  4 ++
 cmake/linker/ld/linker_libraries.cmake       | 38 ----------------
 cmake/linker/ld/target.cmake                 | 46 ++++++--------------
 cmake/linker/linker_libraries_template.cmake | 16 -------
 cmake/linker/lld/linker_flags.cmake          |  4 +-
 cmake/linker/lld/linker_libraries.cmake      | 21 ---------
 cmake/linker/lld/target.cmake                | 22 +---------
 cmake/linker/target_template.cmake           | 13 ------
 cmake/linker/xt-ld/target.cmake              | 22 +---------
 cmake/modules/FindTargetTools.cmake          |  2 -
 cmake/modules/extensions.cmake               | 33 --------------
 cmake/target_toolchain_flags.cmake           |  2 -
 cmake/toolchain/llvm/generic.cmake           |  2 +-
 lib/libc/newlib/CMakeLists.txt               | 28 ++++++++++++
 lib/libc/picolibc/CMakeLists.txt             |  2 +-
 21 files changed, 62 insertions(+), 234 deletions(-)
 create mode 100644 cmake/linker/armlink/linker_flags.cmake
 delete mode 100644 cmake/linker/armlink/linker_libraries.cmake
 delete mode 100644 cmake/linker/ld/linker_libraries.cmake
 delete mode 100644 cmake/linker/linker_libraries_template.cmake
 delete mode 100644 cmake/linker/lld/linker_libraries.cmake
 delete mode 100644 cmake/linker/target_template.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbd6ac7bb1d..952acccbba8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2232,5 +2232,3 @@ add_subdirectory_ifdef(
   CONFIG_MAKEFILE_EXPORTS
   cmake/makefile_exports
   )
-
-toolchain_linker_finalize()
diff --git a/cmake/compiler/clang/target.cmake b/cmake/compiler/clang/target.cmake
index d2d41e8b23c..30e5da399af 100644
--- a/cmake/compiler/clang/target.cmake
+++ b/cmake/compiler/clang/target.cmake
@@ -76,8 +76,8 @@ if(NOT "${ARCH}" STREQUAL "posix")
   get_filename_component(RTLIB_NAME_WITH_PREFIX ${RTLIB_FILE_NAME} NAME_WLE)
   string(REPLACE lib "" RTLIB_NAME ${RTLIB_NAME_WITH_PREFIX})
 
-  set_property(TARGET linker PROPERTY lib_include_dir "-L${RTLIB_DIR}")
-  set_property(TARGET linker PROPERTY rt_library "-l${RTLIB_NAME}")
+  list(APPEND LIB_INCLUDE_DIR -L${RTLIB_DIR})
+  list(APPEND TOOLCHAIN_LIBS ${RTLIB_NAME})
 
   list(APPEND CMAKE_REQUIRED_FLAGS -nostartfiles -nostdlib ${isystem_include_flags})
   string(REPLACE ";" " " CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
diff --git a/cmake/compiler/gcc/target.cmake b/cmake/compiler/gcc/target.cmake
index 7e8ffc48173..5b1e5db1218 100644
--- a/cmake/compiler/gcc/target.cmake
+++ b/cmake/compiler/gcc/target.cmake
@@ -109,7 +109,8 @@ get_filename_component(LIBGCC_DIR ${LIBGCC_FILE_NAME} DIRECTORY)
 
 assert_exists(LIBGCC_DIR)
 
-set_linker_property(PROPERTY lib_include_dir "-L\"${LIBGCC_DIR}\"")
+LIST(APPEND LIB_INCLUDE_DIR "-L\"${LIBGCC_DIR}\"")
+LIST(APPEND TOOLCHAIN_LIBS gcc)
 
 # For CMake to be able to test if a compiler flag is supported by the
 # toolchain we need to give CMake the necessary flags to compile and
diff --git a/cmake/linker/armlink/linker_flags.cmake b/cmake/linker/armlink/linker_flags.cmake
new file mode 100644
index 00000000000..b0f93a7b9e7
--- /dev/null
+++ b/cmake/linker/armlink/linker_flags.cmake
@@ -0,0 +1,6 @@
+# The ARMClang linker, armlink, requires a dedicated linking signature in
+# order for Zephyr to control the map file.
+
+set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_LINKER> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES> <OBJECTS> -o <TARGET>")
+set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_LINKER> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES> <OBJECTS> -o <TARGET>")
+set(CMAKE_ASM_LINK_EXECUTABLE "<CMAKE_LINKER> <CMAKE_ASM_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES> <OBJECTS> -o <TARGET>")
diff --git a/cmake/linker/armlink/linker_libraries.cmake b/cmake/linker/armlink/linker_libraries.cmake
deleted file mode 100644
index 8374e7c3cd2..00000000000
--- a/cmake/linker/armlink/linker_libraries.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor
-#
-# SPDX-License-Identifier: Apache-2.0
-
-# Per default armclang (Arm Compiler 6) doesn't need explicit C library linking
-# so we only need to set link order linking in case a custom C library is linked
-# in, such as picolibc.
-set_property(TARGET linker APPEND PROPERTY link_order_library "c;rt")
diff --git a/cmake/linker/armlink/target.cmake b/cmake/linker/armlink/target.cmake
index b2e1e867f90..9aa32ad0e6f 100644
--- a/cmake/linker/armlink/target.cmake
+++ b/cmake/linker/armlink/target.cmake
@@ -108,23 +108,5 @@ function(toolchain_ld_link_elf)
   )
 endfunction(toolchain_ld_link_elf)
 
-# This function will generate the correct CMAKE_C_LINK_EXECUTABLE / CMAKE_CXX_LINK_EXECUTABLE
-# rule to ensure that standard c and runtime libraries are correctly placed
-# and the end of link invocation and doesn't appear in the middle of the link
-# command invocation.
-macro(toolchain_linker_finalize)
-  set(zephyr_std_libs)
-  get_property(link_order TARGET linker PROPERTY link_order_library)
-  foreach(lib ${link_order})
-    get_property(link_flag TARGET linker PROPERTY ${lib}_library)
-    set(zephyr_std_libs "${zephyr_std_libs} ${link_flag}")
-  endforeach()
-
-  set(common_link "<LINK_FLAGS> <LINK_LIBRARIES> <OBJECTS> ${zephyr_std_libs} -o <TARGET>")
-  set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_LINKER> <CMAKE_C_LINK_FLAGS> ${common_link}")
-  set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_LINKER> <CMAKE_CXX_LINK_FLAGS> ${common_link}")
-  set(CMAKE_ASM_LINK_EXECUTABLE "<CMAKE_LINKER> <CMAKE_ASM_LINK_FLAGS> ${common_link}")
-endmacro()
-
 include(${ZEPHYR_BASE}/cmake/linker/ld/target_relocation.cmake)
 include(${ZEPHYR_BASE}/cmake/linker/ld/target_configure.cmake)
diff --git a/cmake/linker/ld/linker_flags.cmake b/cmake/linker/ld/linker_flags.cmake
index 5063ddb46fb..49bba260d3a 100644
--- a/cmake/linker/ld/linker_flags.cmake
+++ b/cmake/linker/ld/linker_flags.cmake
@@ -7,6 +7,10 @@ check_set_linker_property(TARGET linker PROPERTY base
                           ${LINKERFLAGPREFIX},--build-id=none
 )
 
+if(NOT CONFIG_MINIMAL_LIBCPP AND NOT CONFIG_NATIVE_LIBRARY AND NOT CONFIG_EXTERNAL_MODULE_LIBCPP)
+  set_property(TARGET linker PROPERTY cpp_base -lstdc++)
+endif()
+
 check_set_linker_property(TARGET linker PROPERTY baremetal
                           -nostdlib
                           -static
diff --git a/cmake/linker/ld/linker_libraries.cmake b/cmake/linker/ld/linker_libraries.cmake
deleted file mode 100644
index 1305d682ab5..00000000000
--- a/cmake/linker/ld/linker_libraries.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor
-#
-# SPDX-License-Identifier: Apache-2.0
-
-# Do not specify default link libraries when targeting host (native build).
-if(NOT CONFIG_NATIVE_BUILD)
-  set_linker_property(NO_CREATE PROPERTY c_library    "-lc")
-  set_linker_property(NO_CREATE PROPERTY rt_library   "-lgcc")
-  set_linker_property(NO_CREATE PROPERTY c++_library  "-lstdc++")
-  set_linker_property(NO_CREATE PROPERTY math_library "-lm")
-  # Keeping default include dir empty. The linker will then select libraries
-  # from its default search path. The toolchain may adjust the value to a
-  # specific location, for example gcc infrastructure will set the value based
-  # on output from --print-libgcc-file-name.
-  set_linker_property(NO_CREATE PROPERTY lib_include_dir "")
-endif()
-
-if(CONFIG_CPP
-   AND NOT CONFIG_MINIMAL_LIBCPP
-   AND NOT CONFIG_NATIVE_LIBRARY
-   # When new link principle is fully introduced, then the below condition can
-   # be removed, and instead the external module c++ should use:
-   # set_property(TARGET linker PROPERTY c++_library  "<external_c++_lib>")
-   AND NOT CONFIG_EXTERNAL_MODULE_LIBCPP
-)
-  set_property(TARGET linker PROPERTY link_order_library "c++")
-endif()
-
-
-if(CONFIG_NEWLIB_LIBC AND CMAKE_C_COMPILER_ID STREQUAL "GNU")
-  # We are using c;rt;c (expands to '-lc -lgcc -lc') in code below.
-  # This is needed because when linking with newlib on aarch64, then libgcc has a
-  # link dependency to libc (strchr), but libc also has dependencies to libgcc.
-  # Lib C depends on libgcc. e.g. libc.a(lib_a-fvwrite.o) references __aeabi_idiv
-  set_property(TARGET linker APPEND PROPERTY link_order_library "math;c;rt;c")
-else()
-  set_property(TARGET linker APPEND PROPERTY link_order_library "c;rt")
-endif()
diff --git a/cmake/linker/ld/target.cmake b/cmake/linker/ld/target.cmake
index c941d8ee89e..4382f156dcc 100644
--- a/cmake/linker/ld/target.cmake
+++ b/cmake/linker/ld/target.cmake
@@ -14,6 +14,18 @@ if((${CMAKE_LINKER} STREQUAL "${CROSS_COMPILE}ld.bfd") OR
   string(REPLACE ";" " " CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
 endif()
 
+if(NOT "${ZEPHYR_TOOLCHAIN_VARIANT}" STREQUAL "host")
+  if(CONFIG_CPP_EXCEPTIONS AND LIBGCC_DIR)
+    # When building with C++ Exceptions, it is important that crtbegin and crtend
+    # are linked at specific locations.
+    # The location is so important that we cannot let this be controlled by normal
+    # link libraries, instead we must control the link command specifically as
+    # part of toolchain.
+    set(CMAKE_CXX_LINK_EXECUTABLE
+        "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> ${LIBGCC_DIR}/crtbegin.o <OBJECTS> -o <TARGET> <LINK_LIBRARIES> ${LIBGCC_DIR}/crtend.o")
+  endif()
+endif()
+
 # Run $LINKER_SCRIPT file through the C preprocessor, producing ${linker_script_gen}
 # NOTE: ${linker_script_gen} will be produced at build-time; not at configure-time
 macro(configure_linker_script linker_script_gen linker_pass_define)
@@ -127,44 +139,14 @@ function(toolchain_ld_link_elf)
     ${LINKERFLAGPREFIX},--no-whole-archive
     ${NO_WHOLE_ARCHIVE_LIBS}
     $<TARGET_OBJECTS:${OFFSETS_LIB}>
+    ${LIB_INCLUDE_DIR}
     -L${PROJECT_BINARY_DIR}
+    ${TOOLCHAIN_LIBS}
 
     ${TOOLCHAIN_LD_LINK_ELF_DEPENDENCIES}
   )
 endfunction(toolchain_ld_link_elf)
 
-# Function for finalizing link setup after Zephyr configuration has completed.
-#
-# This function will generate the correct CMAKE_C_LINK_EXECUTABLE / CMAKE_CXX_LINK_EXECUTABLE
-# rule to ensure that standard c and runtime libraries are correctly placed
-# and the end of link invocation and doesn't appear in the middle of the link
-# command invocation.
-macro(toolchain_linker_finalize)
-  get_property(zephyr_std_libs TARGET linker PROPERTY lib_include_dir)
-  get_property(link_order TARGET linker PROPERTY link_order_library)
-  foreach(lib ${link_order})
-    get_property(link_flag TARGET linker PROPERTY ${lib}_library)
-    list(APPEND zephyr_std_libs "${link_flag}")
-  endforeach()
-  string(REPLACE ";" " " zephyr_std_libs "${zephyr_std_libs}")
-
-  set(link_libraries "<LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> ${zephyr_std_libs}")
-  set(common_link "<LINK_FLAGS> ${link_libraries}")
-
-  set(CMAKE_ASM_LINK_EXECUTABLE "<CMAKE_ASM_COMPILER> <FLAGS> <CMAKE_ASM_LINK_FLAGS> ${common_link}")
-  set(CMAKE_C_LINK_EXECUTABLE   "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> ${common_link}")
-
-  set(cpp_link "${common_link}")
-  if(NOT "${ZEPHYR_TOOLCHAIN_VARIANT}" STREQUAL "host")
-    if(CONFIG_CPP_EXCEPTIONS AND LIBGCC_DIR)
-      # When building with C++ Exceptions, it is important that crtbegin and crtend
-      # are linked at specific locations.
-      set(cpp_link "<LINK_FLAGS> ${LIBGCC_DIR}/crtbegin.o ${link_libraries} ${LIBGCC_DIR}/crtend.o")
-    endif()
-  endif()
-  set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> ${cpp_link}")
-endmacro()
-
 # Load toolchain_ld-family macros
 include(${ZEPHYR_BASE}/cmake/linker/${LINKER}/target_relocation.cmake)
 include(${ZEPHYR_BASE}/cmake/linker/${LINKER}/target_configure.cmake)
diff --git a/cmake/linker/linker_libraries_template.cmake b/cmake/linker/linker_libraries_template.cmake
deleted file mode 100644
index 481ee5c473e..00000000000
--- a/cmake/linker/linker_libraries_template.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor
-#
-# SPDX-License-Identifier: Apache-2.0
-
-# Linker flags for fixed linking with standard libraries, such as the C and runtime libraries.
-# It is the responsibility of the linker infrastructure to use those properties to specify the
-# correct placement of those libraries for correct link order.
-# For example, GCC usually has the order: -lc -lgcc
-# It is also possible to define extra libraries of the form `<name>_library`, and then include
-# Fixed library search path can be defined in the `lib_include_dir` property if needed.
-# <name> in the link_order_property.
-# Usage example:
-# set_linker_property(PROPERTY lib_include_dir "-L/path/to/libs")
-# set_linker_property(PROPERTY c_library  "-lc")
-# set_linker_property(PROPERTY rt_library "-lgcc")
-# set_linker_property(PROPERTY link_order_library "c;rt")
diff --git a/cmake/linker/lld/linker_flags.cmake b/cmake/linker/lld/linker_flags.cmake
index f11139aa1e2..f6e873ad631 100644
--- a/cmake/linker/lld/linker_flags.cmake
+++ b/cmake/linker/lld/linker_flags.cmake
@@ -1,6 +1,4 @@
 # Copyright (c) 2022 Google LLC
-# Copyright (c) 2024 Nordic Semiconductor
-#
 # SPDX-License-Identifier: Apache-2.0
 
 # Since lld is a drop in replacement for ld, we can just use ld's flags as a base
@@ -8,7 +6,7 @@
 include(${ZEPHYR_BASE}/cmake/linker/ld/linker_flags.cmake OPTIONAL)
 
 if(NOT CONFIG_MINIMAL_LIBCPP AND NOT CONFIG_NATIVE_LIBRARY AND NOT CONFIG_EXTERNAL_MODULE_LIBCPP)
-  set_property(TARGET linker PROPERTY cpp_base ${LINKERFLAGPREFIX},-z,norelro)
+  set_property(TARGET linker PROPERTY cpp_base -lc++ ${LINKERFLAGPREFIX},-z,norelro)
 endif()
 
 # Force LLVM to use built-in lld linker
diff --git a/cmake/linker/lld/linker_libraries.cmake b/cmake/linker/lld/linker_libraries.cmake
deleted file mode 100644
index 2347898ad64..00000000000
--- a/cmake/linker/lld/linker_libraries.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor
-#
-# SPDX-License-Identifier: Apache-2.0
-
-set_linker_property(NO_CREATE TARGET linker PROPERTY c_library "-lc")
-# Default per standard, will be populated by clang/target.cmake based on clang output.
-set_linker_property(NO_CREATE TARGET linker PROPERTY rt_library "")
-set_linker_property(TARGET linker PROPERTY c++_library "-lc++;-lc++abi")
-
-if(CONFIG_CPP
-   AND NOT CONFIG_MINIMAL_LIBCPP
-   AND NOT CONFIG_NATIVE_LIBRARY
-   # When new link principle is fully introduced, then the below condition can
-   # be removed, and instead the external module c++ should use:
-   # set_property(TARGET linker PROPERTY c++_library  "<external_c++_lib>")
-   AND NOT CONFIG_EXTERNAL_MODULE_LIBCPP
-)
-  set_property(TARGET linker PROPERTY link_order_library "c++")
-endif()
-
-set_property(TARGET linker APPEND PROPERTY link_order_library "c;rt")
diff --git a/cmake/linker/lld/target.cmake b/cmake/linker/lld/target.cmake
index b6b96525e70..9ce3313334f 100644
--- a/cmake/linker/lld/target.cmake
+++ b/cmake/linker/lld/target.cmake
@@ -101,32 +101,14 @@ function(toolchain_ld_link_elf)
     ${LINKERFLAGPREFIX},--no-whole-archive
     ${NO_WHOLE_ARCHIVE_LIBS}
     $<TARGET_OBJECTS:${OFFSETS_LIB}>
+    ${LIB_INCLUDE_DIR}
     -L${PROJECT_BINARY_DIR}
+    ${TOOLCHAIN_LIBS}
 
     ${TOOLCHAIN_LD_LINK_ELF_DEPENDENCIES}
   )
 endfunction(toolchain_ld_link_elf)
 
-# Function for finalizing link setup after Zephyr configuration has completed.
-#
-# This function will generate the correct CMAKE_C_LINK_EXECUTABLE / CMAKE_CXX_LINK_EXECUTABLE
-# signature to ensure that standard c and runtime libraries are correctly placed
-# and the end of link invocation and doesn't appear in the middle of the link
-# command invocation.
-macro(toolchain_linker_finalize)
-  get_property(zephyr_std_libs TARGET linker PROPERTY lib_include_dir)
-  get_property(link_order TARGET linker PROPERTY link_order_library)
-  foreach(lib ${link_order})
-    get_property(link_flag TARGET linker PROPERTY ${lib}_library)
-    list(APPEND zephyr_std_libs "${link_flag}")
-  endforeach()
-  string(REPLACE ";" " " zephyr_std_libs "${zephyr_std_libs}")
-
- set(common_link "<LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> ${zephyr_std_libs}")
- set(CMAKE_ASM_LINK_EXECUTABLE "<CMAKE_ASM_COMPILER> <FLAGS> <CMAKE_ASM_LINK_FLAGS> ${common_link}")
- set(CMAKE_C_LINK_EXECUTABLE   "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> ${common_link}")
- set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> ${common_link}")
-endmacro()
 
 # Load toolchain_ld-family macros
 include(${ZEPHYR_BASE}/cmake/linker/ld/target_relocation.cmake)
diff --git a/cmake/linker/target_template.cmake b/cmake/linker/target_template.cmake
deleted file mode 100644
index efa27de6fb4..00000000000
--- a/cmake/linker/target_template.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright (c) 2024, Nordic Semiconductor ASA
-
-# Template file for optional Zephyr linker macros.
-#
-# This file will define optional linker macros for toolchains that are not
-# defining these macros themselves.
-
-if(NOT COMMAND toolchain_linker_finalize)
-  macro(toolchain_linker_finalize)
-  endmacro()
-endif()
diff --git a/cmake/linker/xt-ld/target.cmake b/cmake/linker/xt-ld/target.cmake
index 3546881cc71..4f8e4fcfbdb 100644
--- a/cmake/linker/xt-ld/target.cmake
+++ b/cmake/linker/xt-ld/target.cmake
@@ -129,6 +129,7 @@ function(toolchain_ld_link_elf)
     ${LINKERFLAGPREFIX},--no-whole-archive
     ${NO_WHOLE_ARCHIVE_LIBS}
     $<TARGET_OBJECTS:${OFFSETS_LIB}>
+    ${LIB_INCLUDE_DIR}
     -L${PROJECT_BINARY_DIR}
     ${TOOLCHAIN_LIBS}
 
@@ -136,27 +137,6 @@ function(toolchain_ld_link_elf)
   )
 endfunction(toolchain_ld_link_elf)
 
-# Function for finalizing link setup after Zephyr configuration has completed.
-#
-# This function will generate the correct CMAKE_C_LINK_EXECUTABLE / CMAKE_CXX_LINK_EXECUTABLE
-# rule to ensure that standard c and runtime libraries are correctly placed
-# and the end of link invocation and doesn't appear in the middle of the link
-# command invocation.
-macro(toolchain_linker_finalize)
-  get_property(zephyr_std_libs TARGET linker PROPERTY lib_include_dir)
-  get_property(link_order TARGET linker PROPERTY link_order_library)
-  foreach(lib ${link_order})
-    get_property(link_flag TARGET linker PROPERTY ${lib}_library)
-    list(APPEND zephyr_std_libs "${link_flag}")
-  endforeach()
-  string(REPLACE ";" " " zephyr_std_libs "${zephyr_std_libs}")
-
- set(common_link "<LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> ${zephyr_std_libs}")
- set(CMAKE_ASM_LINK_EXECUTABLE "<CMAKE_ASM_COMPILER> <FLAGS> <CMAKE_ASM_LINK_FLAGS> ${common_link}")
- set(CMAKE_C_LINK_EXECUTABLE   "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> ${common_link}")
- set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> ${common_link}")
-endmacro()
-
 # xt-ld is Xtensa's own version of binutils' ld.
 # So we can reuse most of the ld configurations.
 include(${ZEPHYR_BASE}/cmake/linker/ld/target_relocation.cmake)
diff --git a/cmake/modules/FindTargetTools.cmake b/cmake/modules/FindTargetTools.cmake
index e35f577d697..a1fa4bf5c67 100644
--- a/cmake/modules/FindTargetTools.cmake
+++ b/cmake/modules/FindTargetTools.cmake
@@ -105,7 +105,5 @@ include(${TOOLCHAIN_ROOT}/cmake/linker/${LINKER}/target.cmake OPTIONAL)
 include(${ZEPHYR_BASE}/cmake/bintools/bintools_template.cmake)
 include(${TOOLCHAIN_ROOT}/cmake/bintools/${BINTOOLS}/target.cmake OPTIONAL)
 
-include(${TOOLCHAIN_ROOT}/cmake/linker/target_template.cmake)
-
 set(TargetTools_FOUND TRUE)
 set(TARGETTOOLS_FOUND TRUE)
diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index 4773b563865..23c30789b73 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -2410,39 +2410,6 @@ function(toolchain_parse_make_rule input_file include_files)
   set(${include_files} ${result} PARENT_SCOPE)
 endfunction()
 
-# 'set_linker_property' is a function that sets the property for the linker
-# property target used for toolchain abstraction.
-#
-# This function is similar in nature to the CMake set_property function, but
-# with some additional extension flags for improved behavioral control.
-#
-# NO_CREATE: Flag to indicate that the property should only be set if not already
-#            defined with a value.
-# APPEND: Flag indicated that the property should be appended to the existing
-#         value list for the property.
-# TARGET: Name of target on which to add the property (commonly: linker)
-# PROPERTY: Name of property with the value(s) following immediately after
-#           property name
-function(set_linker_property)
-  set(options APPEND NO_CREATE)
-  set(single_args TARGET)
-  set(multi_args  PROPERTY)
-  cmake_parse_arguments(LINKER_PROPERTY "${options}" "${single_args}" "${multi_args}" ${ARGN})
-
-  if(LINKER_PROPERTY_APPEND)
-   set(APPEND "APPEND")
-  endif()
-
-  if(LINKER_PROPERTY_NO_CREATE)
-    list(GET LINKER_PROPERTY_PROPERTY 0 property_name)
-    get_target_property(var ${LINKER_PROPERTY_TARGET} ${property_name})
-    if(NOT "${var}" STREQUAL "var-NOTFOUND")
-      return()
-    endif()
-  endif()
-  set_property(TARGET ${LINKER_PROPERTY_TARGET} ${APPEND} PROPERTY ${LINKER_PROPERTY_PROPERTY})
-endfunction()
-
 # 'check_set_linker_property' is a function that check the provided linker
 # flag and only set the linker property if the check succeeds
 #
diff --git a/cmake/target_toolchain_flags.cmake b/cmake/target_toolchain_flags.cmake
index 716cc8f55e7..1df7e5eddc6 100644
--- a/cmake/target_toolchain_flags.cmake
+++ b/cmake/target_toolchain_flags.cmake
@@ -35,10 +35,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/compiler/compiler_features.cmake)
 # a new toolchain.
 include(${CMAKE_CURRENT_LIST_DIR}/compiler/compiler_flags_template.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/linker/linker_flags_template.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/linker/linker_libraries_template.cmake)
 
 # Configure the toolchain flags based on what toolchain technology is used
 # (gcc, host-gcc etc.)
 include(${TOOLCHAIN_ROOT}/cmake/compiler/${COMPILER}/compiler_flags.cmake OPTIONAL)
 include(${TOOLCHAIN_ROOT}/cmake/linker/${LINKER}/linker_flags.cmake OPTIONAL)
-include(${TOOLCHAIN_ROOT}/cmake/linker/${LINKER}/linker_libraries.cmake OPTIONAL)
diff --git a/cmake/toolchain/llvm/generic.cmake b/cmake/toolchain/llvm/generic.cmake
index 45474b7df30..0b138c2868c 100644
--- a/cmake/toolchain/llvm/generic.cmake
+++ b/cmake/toolchain/llvm/generic.cmake
@@ -19,4 +19,4 @@ set(BINTOOLS llvm)
 
 set(TOOLCHAIN_HAS_NEWLIB OFF CACHE BOOL "True if toolchain supports newlib")
 
-message(STATUS "Found toolchain: llvm (clang/ld)")
+message(STATUS "Found toolchain: host (clang/ld)")
diff --git a/lib/libc/newlib/CMakeLists.txt b/lib/libc/newlib/CMakeLists.txt
index d3dc448ecca..de39b8ce213 100644
--- a/lib/libc/newlib/CMakeLists.txt
+++ b/lib/libc/newlib/CMakeLists.txt
@@ -34,12 +34,40 @@ zephyr_compile_definitions(_ANSI_SOURCE)
 zephyr_compile_definitions(__LINUX_ERRNO_EXTENSIONS__)
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+  # We are using
+  # - ${CMAKE_C_LINKER_WRAPPER_FLAG}${CMAKE_LINK_LIBRARY_FLAG}c
+  # - ${CMAKE_C_LINKER_WRAPPER_FLAG}${CMAKE_LINK_LIBRARY_FLAG}gcc
+  # - c
+  # in code below.
+  # This is needed because when linking with newlib on aarch64, then libgcc has a
+  # link dependency to libc (strchr), but libc also has dependencies to libgcc.
+  #
+  # CMake is capable of handling circular link dependencies for CMake defined
+  # static libraries, which can be further controlled using LINK_INTERFACE_MULTIPLICITY.
+  # However, libc and libgcc are not regular CMake libraries, and is seen as linker
+  # flags by CMake, and thus symbol de-duplications will be performed.
+  # CMake link options cannot be used, as that will place those libs first on the
+  # linker invocation. -Wl,--start-group is problematic as the placement of -lc
+  # and -lgcc is not guaranteed in case later libraries are also using
+  # -lc / -libbgcc as interface linker flags.
+  #
+  # Thus, we resort to use `${CMAKE_C_LINKER_WRAPPER_FLAG}${CMAKE_LINK_LIBRARY_FLAG}`
+  # as this ensures the uniqueness and thus avoids symbol de-duplication which means
+  # libc will be followed by libgcc, which is finally followed by libc again.
+
+  list(JOIN CMAKE_C_LINKER_WRAPPER_FLAG "" linker_wrapper_string)
+
   zephyr_link_libraries(
+    m
+    "${linker_wrapper_string}${CMAKE_LINK_LIBRARY_FLAG}c"
     ${LIBC_LIBRARY_DIR_FLAG} # NB: Optional
     $<$<BOOL:${CONFIG_NEWLIB_LIBC_FLOAT_PRINTF}>:-u_printf_float>
     $<$<BOOL:${CONFIG_NEWLIB_LIBC_FLOAT_SCANF}>:-u_scanf_float>
+    # Lib C depends on libgcc. e.g. libc.a(lib_a-fvwrite.o) references __aeabi_idiv
+    "${linker_wrapper_string}${CMAKE_LINK_LIBRARY_FLAG}gcc"
     )
 endif()
+zephyr_link_libraries(c)
 
 if(CONFIG_NEWLIB_LIBC_NANO)
   zephyr_link_libraries(
diff --git a/lib/libc/picolibc/CMakeLists.txt b/lib/libc/picolibc/CMakeLists.txt
index fcb4f9f2b57..87fb0d9d8ec 100644
--- a/lib/libc/picolibc/CMakeLists.txt
+++ b/lib/libc/picolibc/CMakeLists.txt
@@ -17,7 +17,7 @@ if(NOT CONFIG_PICOLIBC_USE_MODULE)
   # Zephyr build (via the __ZEPHYR__ macro) to expose the Zephyr C API
 
   zephyr_compile_options(--specs=picolibc.specs)
-  zephyr_libc_link_libraries(--specs=picolibc.specs)
+  zephyr_libc_link_libraries(--specs=picolibc.specs c -lgcc)
   if(CONFIG_PICOLIBC_IO_FLOAT)
     zephyr_compile_definitions(PICOLIBC_DOUBLE_PRINTF_SCANF)
     zephyr_link_libraries(-DPICOLIBC_DOUBLE_PRINTF_SCANF)

From a21dad37a4f19cd2aeaea0f5bc63729922baf57a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:19 +0100
Subject: [PATCH 1291/2913] Revert "[nrf fromtree] cmake: linker: Use the same
 linker for cmake checks and final build"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 356327485e2bb7958d5f89c437f2147e66eaea5b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/linker/ld/target.cmake  | 15 +++++++--------
 cmake/linker/lld/target.cmake |  4 ----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/cmake/linker/ld/target.cmake b/cmake/linker/ld/target.cmake
index 4382f156dcc..ed29e88aa16 100644
--- a/cmake/linker/ld/target.cmake
+++ b/cmake/linker/ld/target.cmake
@@ -6,14 +6,6 @@ set(CMAKE_LINKER ${GNULD_LINKER})
 
 set_ifndef(LINKERFLAGPREFIX -Wl)
 
-if((${CMAKE_LINKER} STREQUAL "${CROSS_COMPILE}ld.bfd") OR
-   ${GNULD_LINKER_IS_BFD})
-  # ld.bfd was found so let's explicitly use that for linking, see #32237
-  list(APPEND TOOLCHAIN_LD_FLAGS -fuse-ld=bfd)
-  list(APPEND CMAKE_REQUIRED_FLAGS -fuse-ld=bfd)
-  string(REPLACE ";" " " CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
-endif()
-
 if(NOT "${ZEPHYR_TOOLCHAIN_VARIANT}" STREQUAL "host")
   if(CONFIG_CPP_EXCEPTIONS AND LIBGCC_DIR)
     # When building with C++ Exceptions, it is important that crtbegin and crtend
@@ -126,9 +118,16 @@ function(toolchain_ld_link_elf)
     ${ARGN}                                                   # input args to parse
   )
 
+  if((${CMAKE_LINKER} STREQUAL "${CROSS_COMPILE}ld.bfd") OR
+     ${GNULD_LINKER_IS_BFD})
+    # ld.bfd was found so let's explicitly use that for linking, see #32237
+    set(use_linker "-fuse-ld=bfd")
+  endif()
+
   target_link_libraries(
     ${TOOLCHAIN_LD_LINK_ELF_TARGET_ELF}
     ${TOOLCHAIN_LD_LINK_ELF_LIBRARIES_PRE_SCRIPT}
+    ${use_linker}
     ${TOPT}
     ${TOOLCHAIN_LD_LINK_ELF_LINKER_SCRIPT}
     ${TOOLCHAIN_LD_LINK_ELF_LIBRARIES_POST_SCRIPT}
diff --git a/cmake/linker/lld/target.cmake b/cmake/linker/lld/target.cmake
index 9ce3313334f..a16529eeef7 100644
--- a/cmake/linker/lld/target.cmake
+++ b/cmake/linker/lld/target.cmake
@@ -6,10 +6,6 @@ set(CMAKE_LINKER ${LLVMLLD_LINKER})
 
 set_ifndef(LINKERFLAGPREFIX -Wl)
 
-list(APPEND TOOLCHAIN_LD_FLAGS -fuse-ld=lld)
-list(APPEND CMAKE_REQUIRED_FLAGS -fuse-ld=lld)
-string(REPLACE ";" " " CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
-
 # Run $LINKER_SCRIPT file through the C preprocessor, producing ${linker_script_gen}
 # NOTE: ${linker_script_gen} will be produced at build-time; not at configure-time
 macro(configure_linker_script linker_script_gen linker_pass_define)

From f8842893fb1e9250e170d3cff289740adf4b700a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:19 +0100
Subject: [PATCH 1292/2913] Revert "[nrf fromtree] picolibc: Update module to
 version 1.8.8"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1ed92e4ad5e3fbf9ba0a888048b80acb5e057aeb.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 4ca8aa06f6a..11cd720a905 100644
--- a/west.yml
+++ b/west.yml
@@ -318,7 +318,7 @@ manifest:
         - debug
     - name: picolibc
       path: modules/lib/picolibc
-      revision: e15656f7682500fc8953e1a2008f7b1ae4f65ce8
+      revision: 06bde1fd7531b1f788f6e42b6f7b358c0fe4f814
     - name: segger
       revision: b011c45b585e097d95d9cf93edf4f2e01588d3cd
       path: modules/debug/segger

From 1e0cbc5b73f8ea5b1f7c0779e1823e7a68533573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:19 +0100
Subject: [PATCH 1293/2913] Revert "[nrf noup] modules: hostap: Fix Enterpise
 mode with nRF security"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit eb8409f6ae8fb556e8617fe72dc70a9ee71c9407.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index 237ed3ea5e3..813a9b91ed6 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -183,7 +183,7 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA
 
 config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	bool "Enterprise Crypto support for WiFi"
-	select MBEDTLS_PEM_CERTIFICATE_FORMAT if MBEDTLS_BUILTIN
+	select MBEDTLS_PEM_CERTIFICATE_FORMAT
 	depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
 
 config EAP_TLS

From b7ed8673e19a44ac51c220e6e71830b32fbc65ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:19 +0100
Subject: [PATCH 1294/2913] Revert "[nrf fromtree] Bluetooth: Mesh: Fix cfg_cli
 KRP not working for key_net_idx != 0"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1441c775f6a0aa09a33ee8476040d3b329e66e75.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/mesh/cfg_cli.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/subsys/bluetooth/mesh/cfg_cli.c b/subsys/bluetooth/mesh/cfg_cli.c
index 20e7ec065b4..9c4301e0b09 100644
--- a/subsys/bluetooth/mesh/cfg_cli.c
+++ b/subsys/bluetooth/mesh/cfg_cli.c
@@ -1187,7 +1187,6 @@ int bt_mesh_cfg_cli_krp_get(uint16_t net_idx, uint16_t addr, uint16_t key_net_id
 	struct krp_param param = {
 		.status = status,
 		.phase = phase,
-		.net_idx = key_net_idx,
 	};
 	const struct bt_mesh_msg_rsp_ctx rsp = {
 		.ack = &cli->ack_ctx,
@@ -1210,7 +1209,6 @@ int bt_mesh_cfg_cli_krp_set(uint16_t net_idx, uint16_t addr, uint16_t key_net_id
 	struct krp_param param = {
 		.status = status,
 		.phase = phase,
-		.net_idx = key_net_idx,
 	};
 	const struct bt_mesh_msg_rsp_ctx rsp = {
 		.ack = &cli->ack_ctx,

From 5e7b9ffd8976d0218f1df5c241eefbcff3a17559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:19 +0100
Subject: [PATCH 1295/2913] Revert "[nrf fromtree] bluetooth: mesh: cfg_cli:
 Update logs when pulling out CDP0 and 1"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0e3169221939902e2c4ffcf44ff08b336c065784.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/mesh/cfg_cli.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/subsys/bluetooth/mesh/cfg_cli.c b/subsys/bluetooth/mesh/cfg_cli.c
index 9c4301e0b09..225b60e84a8 100644
--- a/subsys/bluetooth/mesh/cfg_cli.c
+++ b/subsys/bluetooth/mesh/cfg_cli.c
@@ -2275,7 +2275,6 @@ struct bt_mesh_comp_p0_elem *bt_mesh_comp_p0_elem_pull(const struct bt_mesh_comp
 	size_t modlist_size;
 
 	if (page->_buf->len < 4) {
-		LOG_DBG("Buffer is too short");
 		return NULL;
 	}
 
@@ -2286,7 +2285,6 @@ struct bt_mesh_comp_p0_elem *bt_mesh_comp_p0_elem_pull(const struct bt_mesh_comp
 	modlist_size = elem->nsig * 2 + elem->nvnd * 4;
 
 	if (page->_buf->len < modlist_size) {
-		LOG_DBG("Buffer is shorter than number of claimed models");
 		return NULL;
 	}
 
@@ -2323,7 +2321,7 @@ struct bt_mesh_comp_p1_elem *bt_mesh_comp_p1_elem_pull(struct net_buf_simple *bu
 						       struct bt_mesh_comp_p1_elem *elem)
 {
 	if (buf->len < 4) {
-		LOG_DBG("Buffer is too short");
+		LOG_DBG("No more elements to pull or missing data");
 		return NULL;
 	}
 	size_t elem_size = 0;
@@ -2335,7 +2333,6 @@ struct bt_mesh_comp_p1_elem *bt_mesh_comp_p1_elem_pull(struct net_buf_simple *bu
 	elem->nvnd = net_buf_simple_pull_u8(buf);
 	for (i = 0; i < elem->nsig + elem->nvnd; i++) {
 		if (buf->len < elem_size + 1) {
-			LOG_DBG("Buffer is shorter than number of claimed models");
 			return NULL;
 		}
 
@@ -2354,7 +2351,6 @@ struct bt_mesh_comp_p1_elem *bt_mesh_comp_p1_elem_pull(struct net_buf_simple *bu
 	}
 
 	if (buf->len < elem_size) {
-		LOG_DBG("No more elements to pull or missing data");
 		return NULL;
 	}
 
@@ -2385,7 +2381,6 @@ struct bt_mesh_comp_p1_model_item *bt_mesh_comp_p1_item_pull(
 	item_size = item->ext_item_cnt * (item->format + 1);
 	if (item->cor_present) {
 		if (elem->_buf->len < 1) {
-			LOG_DBG("Coresponding_Present field is claimed but not present");
 			return NULL;
 		}
 
@@ -2393,7 +2388,6 @@ struct bt_mesh_comp_p1_model_item *bt_mesh_comp_p1_item_pull(
 	}
 
 	if (elem->_buf->len < item_size) {
-		LOG_DBG("No more elements to pull or missing data");
 		return NULL;
 	}
 

From ddefed8a272eda06efb2a2e54da58830fa01578f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:20 +0100
Subject: [PATCH 1296/2913] Revert "[nrf fromtree] bluetooth: mesh: cfg_cli:
 Check buf len when pulling out data"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7310fc7d1da6d6da1b0e9467f6ea53851739700a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/mesh/cfg_cli.c | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/subsys/bluetooth/mesh/cfg_cli.c b/subsys/bluetooth/mesh/cfg_cli.c
index 225b60e84a8..aa762e9b906 100644
--- a/subsys/bluetooth/mesh/cfg_cli.c
+++ b/subsys/bluetooth/mesh/cfg_cli.c
@@ -2332,10 +2332,6 @@ struct bt_mesh_comp_p1_elem *bt_mesh_comp_p1_elem_pull(struct net_buf_simple *bu
 	elem->nsig = net_buf_simple_pull_u8(buf);
 	elem->nvnd = net_buf_simple_pull_u8(buf);
 	for (i = 0; i < elem->nsig + elem->nvnd; i++) {
-		if (buf->len < elem_size + 1) {
-			return NULL;
-		}
-
 		header = buf->data[elem_size];
 		cor_present = COR_PRESENT(header);
 		fmt = FMT(header);
@@ -2350,10 +2346,6 @@ struct bt_mesh_comp_p1_elem *bt_mesh_comp_p1_elem_pull(struct net_buf_simple *bu
 		elem_size += (1 + cor_present) + (fmt + 1) * ext_item_cnt;
 	}
 
-	if (buf->len < elem_size) {
-		return NULL;
-	}
-
 	net_buf_simple_init_with_data(elem->_buf,
 				      net_buf_simple_pull_mem(buf, elem_size),
 				      elem_size);
@@ -2380,17 +2372,9 @@ struct bt_mesh_comp_p1_model_item *bt_mesh_comp_p1_item_pull(
 	item->ext_item_cnt = EXT_ITEM_CNT(header);
 	item_size = item->ext_item_cnt * (item->format + 1);
 	if (item->cor_present) {
-		if (elem->_buf->len < 1) {
-			return NULL;
-		}
-
 		item->cor_id = net_buf_simple_pull_u8(elem->_buf);
 	}
 
-	if (elem->_buf->len < item_size) {
-		return NULL;
-	}
-
 	net_buf_simple_init_with_data(item->_buf,
 				      net_buf_simple_pull_mem(elem->_buf, item_size),
 				      item_size);

From 569f0a52e9dbb0ee6d6a2c00d07a5e68d88bf35d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:20 +0100
Subject: [PATCH 1297/2913] Revert "[nrf fromtree] bluetooth: mesh: proxy_msg:
 Fix extracting role from k_work"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5b8badb6ebd38e833d9fb49c457763f20c600159.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/mesh/proxy_msg.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/subsys/bluetooth/mesh/proxy_msg.c b/subsys/bluetooth/mesh/proxy_msg.c
index edee3ad384c..861935f58cc 100644
--- a/subsys/bluetooth/mesh/proxy_msg.c
+++ b/subsys/bluetooth/mesh/proxy_msg.c
@@ -252,9 +252,11 @@ int bt_mesh_proxy_relay_send(struct bt_conn *conn, struct bt_mesh_adv *adv)
 
 static void proxy_msg_send_pending(struct k_work *work)
 {
-	struct bt_mesh_proxy_role *role = CONTAINER_OF(work, struct bt_mesh_proxy_role, work);
+	struct bt_mesh_proxy_role *role;
+	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
 	struct bt_mesh_adv *adv;
 
+	role = CONTAINER_OF(dwork, struct bt_mesh_proxy_role, sar_timer);
 	if (!role->conn) {
 		return;
 	}

From d2ed50be06d94d02f6cc39a715cdeafdeffe84c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:20 +0100
Subject: [PATCH 1298/2913] Revert "[nrf fromtree] bluetooth: mesh: gatt: Move
 generic GATT related defines to gatt.h"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit eab2aea54f6a393e1e417e859511a4c16cc53901.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/mesh/gatt.h        | 19 -------------------
 subsys/bluetooth/mesh/pb_gatt_srv.c |  1 -
 subsys/bluetooth/mesh/proxy.h       | 14 ++++++++++++++
 subsys/bluetooth/mesh/proxy_srv.c   |  1 -
 4 files changed, 14 insertions(+), 21 deletions(-)
 delete mode 100644 subsys/bluetooth/mesh/gatt.h

diff --git a/subsys/bluetooth/mesh/gatt.h b/subsys/bluetooth/mesh/gatt.h
deleted file mode 100644
index ee5edf9cadc..00000000000
--- a/subsys/bluetooth/mesh/gatt.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define ADV_SLOW_INT                                                           \
-	.interval_min = BT_GAP_ADV_SLOW_INT_MIN,                               \
-	.interval_max = BT_GAP_ADV_SLOW_INT_MAX
-
-#define ADV_FAST_INT                                                           \
-	.interval_min = BT_GAP_ADV_FAST_INT_MIN_2,                             \
-	.interval_max = BT_GAP_ADV_FAST_INT_MAX_2
-
-#define BT_DEVICE_NAME (IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC) ? \
-			(const uint8_t *)bt_get_name() : \
-			(const uint8_t *)CONFIG_BT_DEVICE_NAME)
-#define BT_DEVICE_NAME_LEN (IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC) ? strlen(bt_get_name()) : \
-			    (sizeof(CONFIG_BT_DEVICE_NAME) - 1))
diff --git a/subsys/bluetooth/mesh/pb_gatt_srv.c b/subsys/bluetooth/mesh/pb_gatt_srv.c
index 24211edea70..6f257a16e82 100644
--- a/subsys/bluetooth/mesh/pb_gatt_srv.c
+++ b/subsys/bluetooth/mesh/pb_gatt_srv.c
@@ -26,7 +26,6 @@
 #include "foundation.h"
 #include "access.h"
 #include "proxy.h"
-#include "gatt.h"
 #include "proxy_msg.h"
 #include "pb_gatt_srv.h"
 
diff --git a/subsys/bluetooth/mesh/proxy.h b/subsys/bluetooth/mesh/proxy.h
index 102ff1834a7..c56e9dab0d1 100644
--- a/subsys/bluetooth/mesh/proxy.h
+++ b/subsys/bluetooth/mesh/proxy.h
@@ -10,6 +10,20 @@
 #define ADV_OPT_USE_IDENTITY 0
 #endif
 
+#define ADV_SLOW_INT                                                           \
+	.interval_min = BT_GAP_ADV_SLOW_INT_MIN,                               \
+	.interval_max = BT_GAP_ADV_SLOW_INT_MAX
+
+#define ADV_FAST_INT                                                           \
+	.interval_min = BT_GAP_ADV_FAST_INT_MIN_2,                             \
+	.interval_max = BT_GAP_ADV_FAST_INT_MAX_2
+
+#define BT_DEVICE_NAME (IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC) ? \
+			(const uint8_t *)bt_get_name() : \
+			(const uint8_t *)CONFIG_BT_DEVICE_NAME)
+#define BT_DEVICE_NAME_LEN (IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC) ? strlen(bt_get_name()) : \
+			    (sizeof(CONFIG_BT_DEVICE_NAME) - 1))
+
 #define BT_MESH_ID_TYPE_NET	  0x00
 #define BT_MESH_ID_TYPE_NODE	  0x01
 #define BT_MESH_ID_TYPE_PRIV_NET  0x02
diff --git a/subsys/bluetooth/mesh/proxy_srv.c b/subsys/bluetooth/mesh/proxy_srv.c
index 63d7755df1a..39bfac07792 100644
--- a/subsys/bluetooth/mesh/proxy_srv.c
+++ b/subsys/bluetooth/mesh/proxy_srv.c
@@ -28,7 +28,6 @@
 #include "foundation.h"
 #include "access.h"
 #include "proxy.h"
-#include "gatt.h"
 #include "proxy_msg.h"
 #include "crypto.h"
 

From b50b42768e3a5c01f8f6c945d5a1680dd570a480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:20 +0100
Subject: [PATCH 1299/2913] Revert "[nrf fromtree] bluetooth: mesh: Use
 bt_get_name to get device name"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 453a680b5518f1dcf4747e2d0a45008147600871.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/mesh/pb_gatt_srv.c | 13 +++++++------
 subsys/bluetooth/mesh/proxy.h       |  6 ------
 subsys/bluetooth/mesh/proxy_srv.c   | 29 ++++++++---------------------
 3 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/subsys/bluetooth/mesh/pb_gatt_srv.c b/subsys/bluetooth/mesh/pb_gatt_srv.c
index 6f257a16e82..85b60cbe0fd 100644
--- a/subsys/bluetooth/mesh/pb_gatt_srv.c
+++ b/subsys/bluetooth/mesh/pb_gatt_srv.c
@@ -243,12 +243,13 @@ static size_t gatt_prov_adv_create(struct bt_data prov_sd[2])
 	prov_sd_len += 1;
 
 dev_name:
-	if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT_USE_DEVICE_NAME)) {
-		prov_sd[prov_sd_len].type = BT_DATA_NAME_COMPLETE;
-		prov_sd[prov_sd_len].data_len = BT_DEVICE_NAME_LEN;
-		prov_sd[prov_sd_len].data = BT_DEVICE_NAME;
-		prov_sd_len += 1;
-	}
+#if defined(CONFIG_BT_MESH_PB_GATT_USE_DEVICE_NAME)
+	prov_sd[prov_sd_len].type = BT_DATA_NAME_COMPLETE;
+	prov_sd[prov_sd_len].data_len = sizeof(CONFIG_BT_DEVICE_NAME) - 1;
+	prov_sd[prov_sd_len].data = CONFIG_BT_DEVICE_NAME;
+
+	prov_sd_len += 1;
+#endif
 
 	return prov_sd_len;
 }
diff --git a/subsys/bluetooth/mesh/proxy.h b/subsys/bluetooth/mesh/proxy.h
index c56e9dab0d1..34a119c3df6 100644
--- a/subsys/bluetooth/mesh/proxy.h
+++ b/subsys/bluetooth/mesh/proxy.h
@@ -18,12 +18,6 @@
 	.interval_min = BT_GAP_ADV_FAST_INT_MIN_2,                             \
 	.interval_max = BT_GAP_ADV_FAST_INT_MAX_2
 
-#define BT_DEVICE_NAME (IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC) ? \
-			(const uint8_t *)bt_get_name() : \
-			(const uint8_t *)CONFIG_BT_DEVICE_NAME)
-#define BT_DEVICE_NAME_LEN (IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC) ? strlen(bt_get_name()) : \
-			    (sizeof(CONFIG_BT_DEVICE_NAME) - 1))
-
 #define BT_MESH_ID_TYPE_NET	  0x00
 #define BT_MESH_ID_TYPE_NODE	  0x01
 #define BT_MESH_ID_TYPE_PRIV_NET  0x02
diff --git a/subsys/bluetooth/mesh/proxy_srv.c b/subsys/bluetooth/mesh/proxy_srv.c
index 39bfac07792..32e865773b3 100644
--- a/subsys/bluetooth/mesh/proxy_srv.c
+++ b/subsys/bluetooth/mesh/proxy_srv.c
@@ -483,6 +483,12 @@ static const struct bt_data net_id_ad[] = {
 	BT_DATA(BT_DATA_SVC_DATA16, proxy_svc_data, NET_ID_LEN),
 };
 
+static const struct bt_data sd[] = {
+#if defined(CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME)
+	BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1),
+#endif
+};
+
 static int randomize_bt_addr(void)
 {
 	/* TODO: There appears to be no way to force an RPA/NRPA refresh. */
@@ -504,7 +510,6 @@ static int enc_id_adv(struct bt_mesh_subnet *sub, uint8_t type,
 					 type == BT_MESH_ID_TYPE_PRIV_NODE),
 		ADV_FAST_INT,
 	};
-	struct bt_data sd[1];
 	int err;
 
 	err = bt_mesh_encrypt(&sub->keys[SUBNET_KEY_TX_IDX(sub)].identity, hash, hash);
@@ -524,17 +529,9 @@ static int enc_id_adv(struct bt_mesh_subnet *sub, uint8_t type,
 	proxy_svc_data[2] = type;
 	memcpy(&proxy_svc_data[3], &hash[8], 8);
 
-	if (IS_ENABLED(CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME)) {
-		sd[0].type = BT_DATA_NAME_COMPLETE;
-		sd[0].data_len = BT_DEVICE_NAME_LEN;
-		sd[0].data = BT_DEVICE_NAME;
-	}
-
 	err = bt_mesh_adv_gatt_start(
 		type == BT_MESH_ID_TYPE_PRIV_NET ? &slow_adv_param : &fast_adv_param,
-		duration, enc_id_ad, ARRAY_SIZE(enc_id_ad),
-		IS_ENABLED(CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME) ? sd : NULL,
-		IS_ENABLED(CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME) ? ARRAY_SIZE(sd) : 0);
+		duration, enc_id_ad, ARRAY_SIZE(enc_id_ad), sd, ARRAY_SIZE(sd));
 	if (err) {
 		LOG_WRN("Failed to advertise using type 0x%02x (err %d)", type, err);
 		return err;
@@ -610,7 +607,6 @@ static int net_id_adv(struct bt_mesh_subnet *sub, int32_t duration)
 		.options = ADV_OPT_PROXY(false),
 		ADV_SLOW_INT,
 	};
-	struct bt_data sd[1];
 	int err;
 
 	proxy_svc_data[2] = BT_MESH_ID_TYPE_NET;
@@ -619,17 +615,8 @@ static int net_id_adv(struct bt_mesh_subnet *sub, int32_t duration)
 
 	memcpy(proxy_svc_data + 3, sub->keys[SUBNET_KEY_TX_IDX(sub)].net_id, 8);
 
-	if (IS_ENABLED(CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME)) {
-		sd[0].type = BT_DATA_NAME_COMPLETE;
-		sd[0].data_len = BT_DEVICE_NAME_LEN;
-		sd[0].data = BT_DEVICE_NAME;
-	}
-
 	err = bt_mesh_adv_gatt_start(&slow_adv_param, duration, net_id_ad,
-				     ARRAY_SIZE(net_id_ad),
-				     IS_ENABLED(CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME) ? sd : NULL,
-				     IS_ENABLED(CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME) ?
-					ARRAY_SIZE(sd) : 0);
+				     ARRAY_SIZE(net_id_ad), sd, ARRAY_SIZE(sd));
 	if (err) {
 		LOG_WRN("Failed to advertise using Network ID (err %d)", err);
 		return err;

From c8b356df6b1ce077ba3ae6a645a641a9cfaec437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:20 +0100
Subject: [PATCH 1300/2913] Revert "[nrf fromtree] Bluetooth: Mesh: Use net
 xmit params for bridge"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2a2d2fbf747eaa12f6bb5a59187841e675393d74.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/mesh/net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/bluetooth/mesh/net.c b/subsys/bluetooth/mesh/net.c
index cf95884fd5a..25d0551a2ee 100644
--- a/subsys/bluetooth/mesh/net.c
+++ b/subsys/bluetooth/mesh/net.c
@@ -705,7 +705,7 @@ static void bt_mesh_net_relay(struct net_buf_simple *sbuf, struct bt_mesh_net_rx
 	 * Anything else (like GATT to adv, or locally originated packets)
 	 * use the Network Transmit state.
 	 */
-	if (rx->net_if == BT_MESH_NET_IF_ADV && !rx->friend_cred && !bridge) {
+	if (rx->net_if == BT_MESH_NET_IF_ADV && !rx->friend_cred) {
 		transmit = bt_mesh_relay_retransmit_get();
 	} else {
 		transmit = bt_mesh_net_transmit_get();

From 668ada1bf858c93013e6e395144b0db5ffe490bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:20 +0100
Subject: [PATCH 1301/2913] Revert "[nrf fromtree] Bluetooth: Mesh: Fix proxy
 advertising set sending Mesh messages"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9dfcaf1a848fba95c2d77b2d023da89e68a75d47.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/mesh/adv.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/subsys/bluetooth/mesh/adv.c b/subsys/bluetooth/mesh/adv.c
index 2f406e52f9a..7cc163ba8f8 100644
--- a/subsys/bluetooth/mesh/adv.c
+++ b/subsys/bluetooth/mesh/adv.c
@@ -233,11 +233,6 @@ struct bt_mesh_adv *bt_mesh_adv_get_by_tag(enum bt_mesh_adv_tag_bit tags, k_time
 		return k_fifo_get(&bt_mesh_relay_queue, timeout);
 	}
 
-	if (IS_ENABLED(CONFIG_BT_MESH_ADV_EXT_GATT_SEPARATE) &&
-	    tags & BT_MESH_ADV_TAG_BIT_PROXY) {
-		return NULL;
-	}
-
 	return bt_mesh_adv_get(timeout);
 }
 

From 077385833235704c8e5bdfbaabc68b70e7fa474b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:20 +0100
Subject: [PATCH 1302/2913] Revert "[nrf fromtree] doc: samples: Adopt
 code-sample-category across tree"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b979e73fbf9c8eb07bc142beb3df45aa3574a41c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../feather_m0_basic_proto/doc/index.rst      |  2 +-
 boards/adafruit/feather_m0_lora/doc/index.rst |  2 +-
 .../grand_central_m4_express/doc/index.rst    |  2 +-
 .../itsybitsy_m4_express/doc/index.rst        |  2 +-
 boards/adafruit/trinket_m0/doc/index.rst      |  2 +-
 boards/arduino/mkrzero/doc/index.rst          |  2 +-
 boards/arduino/nano_33_iot/doc/index.rst      |  2 +-
 boards/arduino/zero/doc/index.rst             |  2 +-
 .../esp32_devkitc_wroom/doc/index.rst         |  2 +-
 .../esp32_devkitc_wrover/doc/index.rst        |  2 +-
 .../espressif/esp32s3_devkitc/doc/index.rst   |  2 +-
 .../espressif/esp32s3_devkitm/doc/index.rst   |  2 +-
 boards/openisa/rv32m1_vega/doc/index.rst      |  2 +-
 boards/others/serpente/doc/index.rst          |  2 +-
 boards/seeed/seeeduino_xiao/doc/index.rst     |  2 +-
 boards/seeed/wio_terminal/doc/index.rst       |  2 +-
 boards/shields/npm1300_ek/doc/index.rst       |  2 +-
 boards/shields/npm6001_ek/doc/index.rst       |  2 +-
 boards/snps/hsdk/doc/index.rst                |  6 +--
 boards/snps/hsdk4xd/doc/index.rst             |  5 ++-
 .../esp32s3_touch_lcd_1_28/doc/index.rst      |  2 +-
 doc/connectivity/bluetooth/bluetooth-arch.rst |  2 +-
 doc/connectivity/bluetooth/bluetooth-dev.rst  |  2 +-
 doc/connectivity/usb/device/usb_device.rst    |  2 +-
 doc/connectivity/usb/pd/ucds.rst              |  2 +-
 doc/develop/application/index.rst             |  4 +-
 doc/develop/beyond-GSG.rst                    |  2 +-
 doc/develop/getting_started/index.rst         |  2 +-
 doc/releases/release-notes-1.7.rst            |  2 +-
 doc/services/device_mgmt/ota.rst              |  8 ++--
 .../portability/posix/overview/index.rst      |  3 +-
 .../application_development.rst               | 13 ++++--
 samples/arch/index.rst                        | 13 ++++--
 samples/arch/mpu/index.rst                    | 14 ++++---
 samples/arch/smp/index.rst                    | 13 ++++--
 samples/basic/basic.rst                       | 13 ++++--
 .../bap_broadcast_assistant/README.rst        |  2 +-
 .../bluetooth/bap_broadcast_sink/README.rst   |  2 +-
 .../bluetooth/bap_broadcast_source/README.rst |  2 +-
 .../bluetooth/bap_unicast_client/README.rst   |  2 +-
 .../bluetooth/bap_unicast_server/README.rst   |  2 +-
 samples/bluetooth/beacon/README.rst           |  2 +-
 samples/bluetooth/bluetooth.rst               | 14 ++++---
 samples/bluetooth/broadcaster/README.rst      |  2 +-
 .../bluetooth/broadcaster_multiple/README.rst |  2 +-
 .../bthome_sensor_template/README.rst         |  2 +-
 samples/bluetooth/cap_acceptor/README.rst     |  2 +-
 samples/bluetooth/cap_initiator/README.rst    |  2 +-
 samples/bluetooth/central/README.rst          |  2 +-
 .../bluetooth/central_gatt_write/README.rst   |  2 +-
 samples/bluetooth/central_hr/README.rst       |  2 +-
 samples/bluetooth/central_ht/README.rst       |  2 +-
 .../bluetooth/central_multilink/README.rst    |  2 +-
 samples/bluetooth/central_otc/README.rst      |  2 +-
 samples/bluetooth/central_past/README.rst     |  2 +-
 samples/bluetooth/direct_adv/README.rst       |  2 +-
 samples/bluetooth/eddystone/README.rst        |  2 +-
 .../encrypted_advertising/README.rst          |  2 +-
 samples/bluetooth/extended_adv/README.rst     |  2 +-
 samples/bluetooth/handsfree/README.rst        |  2 +-
 samples/bluetooth/handsfree_ag/README.rst     |  2 +-
 samples/bluetooth/hap_ha/README.rst           |  2 +-
 samples/bluetooth/hci_ipc/README.rst          |  2 +-
 samples/bluetooth/hci_pwr_ctrl/README.rst     |  2 +-
 samples/bluetooth/hci_spi/README.rst          |  2 +-
 samples/bluetooth/hci_usb/README.rst          |  2 +-
 samples/bluetooth/hci_usb_h4/README.rst       |  2 +-
 samples/bluetooth/hci_vs_scan_req/README.rst  |  2 +-
 samples/bluetooth/ibeacon/README.rst          |  2 +-
 samples/bluetooth/iso_broadcast/README.rst    |  2 +-
 .../iso_broadcast_benchmark/README.rst        |  2 +-
 samples/bluetooth/iso_central/README.rst      |  2 +-
 .../iso_connected_benchmark/README.rst        |  2 +-
 samples/bluetooth/iso_peripheral/README.rst   |  2 +-
 samples/bluetooth/iso_receive/README.rst      |  2 +-
 samples/bluetooth/mesh/README.rst             |  2 +-
 samples/bluetooth/mesh_demo/README.rst        |  2 +-
 samples/bluetooth/mesh_provisioner/README.rst |  2 +-
 samples/bluetooth/mtu_update/README.rst       |  2 +-
 samples/bluetooth/observer/README.rst         |  2 +-
 .../pbp_public_broadcast_sink/README.rst      |  2 +-
 .../pbp_public_broadcast_source/README.rst    |  2 +-
 samples/bluetooth/periodic_adv/README.rst     |  2 +-
 .../bluetooth/periodic_adv_conn/README.rst    |  2 +-
 samples/bluetooth/periodic_adv_rsp/README.rst |  2 +-
 samples/bluetooth/periodic_sync/README.rst    |  2 +-
 .../bluetooth/periodic_sync_conn/README.rst   |  2 +-
 .../bluetooth/periodic_sync_rsp/README.rst    |  2 +-
 samples/bluetooth/peripheral/README.rst       |  2 +-
 .../peripheral_accept_list/README.rst         |  2 +-
 samples/bluetooth/peripheral_csc/README.rst   |  2 +-
 samples/bluetooth/peripheral_dis/README.rst   |  2 +-
 samples/bluetooth/peripheral_esp/README.rst   |  2 +-
 .../peripheral_gatt_write/README.rst          |  2 +-
 samples/bluetooth/peripheral_hids/README.rst  |  2 +-
 samples/bluetooth/peripheral_hr/README.rst    |  2 +-
 samples/bluetooth/peripheral_ht/README.rst    |  2 +-
 .../bluetooth/peripheral_identity/README.rst  |  2 +-
 samples/bluetooth/peripheral_nus/README.rst   |  2 +-
 samples/bluetooth/peripheral_ots/README.rst   |  2 +-
 samples/bluetooth/peripheral_past/README.rst  |  2 +-
 .../bluetooth/peripheral_sc_only/README.rst   |  2 +-
 samples/bluetooth/scan_adv/README.rst         |  2 +-
 samples/bluetooth/st_ble_sensor/README.rst    |  2 +-
 samples/bluetooth/tmap_bmr/README.rst         |  2 +-
 samples/bluetooth/tmap_bms/README.rst         |  2 +-
 samples/bluetooth/tmap_central/README.rst     |  2 +-
 samples/bluetooth/tmap_peripheral/README.rst  |  2 +-
 samples/boards/96boards/argonkey/index.rst    | 13 ++++--
 samples/boards/96boards/index.rst             | 13 ++++--
 samples/boards/arc_secure_services/README.rst |  2 -
 samples/boards/bbc/index.rst                  | 14 +++++--
 samples/boards/bbc/microbit/microbit.rst      | 13 ++++--
 samples/boards/boards.rst                     | 14 +++++--
 samples/boards/enjoydigital/index.rst         | 14 ++++---
 .../boards/enjoydigital/litex/i2s/README.rst  |  2 -
 samples/boards/espressif/index.rst            | 13 ++++--
 samples/boards/google/index.rst               | 14 ++++---
 samples/boards/intel/index.rst                | 14 ++++---
 samples/boards/microchip/index.rst            | 13 ++++--
 .../mec15xxevb_assy6853.rst                   | 13 ++++--
 samples/boards/nordic/index.rst               | 14 ++++---
 .../boards/nordic/mesh/onoff-app/README.rst   |  2 +-
 .../onoff_level_lighting_vnd_app/README.rst   |  2 +-
 samples/boards/nxp/index.rst                  | 14 ++++---
 samples/boards/phytec/index.rst               | 13 ++++--
 samples/boards/phytec/reel_board/index.rst    |  5 ---
 .../phytec/reel_board/mesh_badge/README.rst   |  2 +-
 samples/boards/quicklogic/index.rst           | 13 ++++--
 samples/boards/st/bluetooth/index.rst         |  5 ---
 samples/boards/st/index.rst                   | 14 ++++---
 samples/boards/st/power_mgmt/index.rst        |  5 ---
 samples/boards/ti/index.rst                   | 14 ++++---
 samples/classic.rst                           | 15 +++++++
 samples/cpp/cpp.rst                           | 13 ++++--
 samples/drivers/adc/index.rst                 |  5 ---
 samples/drivers/audio/index.rst               |  5 ---
 samples/drivers/can/index.rst                 |  5 ---
 samples/drivers/counter/index.rst             |  5 ---
 samples/drivers/drivers.rst                   | 17 +++++---
 samples/drivers/ethernet/index.rst            |  5 ---
 samples/drivers/fpga/index.rst                |  5 ---
 samples/drivers/haptics/README.rst            |  5 ---
 samples/drivers/i2c/README.rst                |  5 ---
 samples/drivers/i2s/README.rst                |  5 ---
 samples/drivers/ipm/README.rst                |  5 ---
 samples/drivers/led/index.rst                 |  5 ---
 samples/drivers/lora/index.rst                |  6 ---
 samples/drivers/misc/README.rst               |  5 ---
 samples/drivers/mspi/index.rst                |  5 ---
 samples/drivers/uart/README.rst               |  5 ---
 samples/drivers/video/video.rst               | 13 ++++--
 samples/drivers/virtualization/index.rst      |  6 ---
 samples/drivers/w1/README.rst                 |  5 ---
 samples/fuel_gauge/fuel_gauge.rst             | 13 ++++--
 samples/fuel_gauge/max17048/README.rst        |  6 +--
 samples/index.rst                             | 42 ++++++++++++-------
 .../condition_variables/simple/README.rst     |  2 -
 samples/kernel/index.rst                      | 14 ++++---
 samples/modules/cmsis_dsp/cmsis_dsp.rst       | 16 ++++---
 samples/modules/compression/compression.rst   | 13 ++++--
 samples/modules/index.rst                     | 14 +++++--
 samples/modules/lvgl/lvgl.rst                 | 16 +++++--
 samples/modules/tflite-micro/tflite-micro.rst | 16 +++++--
 samples/modules/thrift/thrift.rst             | 14 +++++--
 samples/net/cloud/README.rst                  |  5 ---
 samples/net/net.rst                           | 14 ++++---
 samples/net/openthread/coprocessor/README.rst |  2 -
 samples/net/sockets/sockets.rst               |  5 ---
 samples/posix/posix.rst                       | 13 ++++--
 samples/sensor/sensor.rst                     | 13 ++++--
 samples/shields/npm1300_ek/doc/index.rst      |  6 +--
 samples/shields/npm6001_ek/doc/index.rst      |  6 +--
 samples/shields/shields.rst                   | 14 ++++---
 samples/shields/x_nucleo_iks01a2/README.rst   |  5 ---
 samples/shields/x_nucleo_iks01a3/README.rst   |  5 ---
 samples/shields/x_nucleo_iks02a1/README.rst   |  5 ---
 samples/shields/x_nucleo_iks4a1/README.rst    |  5 ---
 samples/subsys/bindesc/bindesc.rst            | 13 ++++--
 samples/subsys/canbus/canbus.rst              |  7 ----
 samples/subsys/console/console.rst            | 13 ++++--
 samples/subsys/debug/index.rst                | 13 ++++--
 samples/subsys/display/display.rst            | 13 ++++--
 samples/subsys/fs/fs.rst                      | 13 ++++--
 samples/subsys/input/input.rst                | 13 ++++--
 samples/subsys/ipc/ipc.rst                    | 14 ++++---
 samples/subsys/llext/llext.rst                | 13 ++++--
 samples/subsys/logging/logging.rst            | 13 ++++--
 samples/subsys/lorawan/lorawan.rst            | 13 ++++--
 samples/subsys/mgmt/mcumgr/smp_svr/README.rst |  2 -
 samples/subsys/mgmt/mgmt.rst                  | 13 ++++--
 samples/subsys/modbus/modbus.rst              | 13 ++++--
 samples/subsys/portability/portability.rst    | 16 ++++---
 samples/subsys/profiling/profiling.rst        | 13 ++++--
 samples/subsys/sensing/sensing.rst            | 13 ++++--
 samples/subsys/shell/shell.rst                | 13 ++++--
 samples/subsys/smf/smf.rst                    | 13 ++++--
 samples/subsys/subsys.rst                     | 14 +++++--
 samples/subsys/testsuite/testsuite.rst        | 14 +++++--
 samples/subsys/usb/usb.rst                    | 14 ++++---
 samples/subsys/usb_c/usbc.rst                 | 13 ++++--
 samples/subsys/zbus/zbus.rst                  | 13 ++++--
 samples/sysbuild/sysbuild.rst                 | 13 ++++--
 samples/sysbuild/with_mcuboot/README.rst      |  6 +--
 samples/tfm_integration/tfm_integration.rst   | 16 ++++---
 samples/userspace/hello_world_user/README.rst |  6 +--
 samples/userspace/index.rst                   | 13 ++++--
 samples/userspace/prod_consumer/README.rst    |  8 ++--
 samples/userspace/shared_mem/README.rst       |  6 +--
 samples/userspace/syscall_perf/README.rst     |  5 +--
 210 files changed, 766 insertions(+), 573 deletions(-)
 delete mode 100644 samples/boards/phytec/reel_board/index.rst
 delete mode 100644 samples/boards/st/bluetooth/index.rst
 delete mode 100644 samples/boards/st/power_mgmt/index.rst
 create mode 100644 samples/classic.rst
 delete mode 100644 samples/drivers/adc/index.rst
 delete mode 100644 samples/drivers/audio/index.rst
 delete mode 100644 samples/drivers/can/index.rst
 delete mode 100644 samples/drivers/counter/index.rst
 delete mode 100644 samples/drivers/ethernet/index.rst
 delete mode 100644 samples/drivers/fpga/index.rst
 delete mode 100644 samples/drivers/haptics/README.rst
 delete mode 100644 samples/drivers/i2c/README.rst
 delete mode 100644 samples/drivers/i2s/README.rst
 delete mode 100644 samples/drivers/ipm/README.rst
 delete mode 100644 samples/drivers/led/index.rst
 delete mode 100644 samples/drivers/lora/index.rst
 delete mode 100644 samples/drivers/misc/README.rst
 delete mode 100644 samples/drivers/mspi/index.rst
 delete mode 100644 samples/drivers/uart/README.rst
 delete mode 100644 samples/drivers/virtualization/index.rst
 delete mode 100644 samples/drivers/w1/README.rst
 delete mode 100644 samples/net/cloud/README.rst
 delete mode 100644 samples/net/sockets/sockets.rst
 delete mode 100644 samples/shields/x_nucleo_iks01a2/README.rst
 delete mode 100644 samples/shields/x_nucleo_iks01a3/README.rst
 delete mode 100644 samples/shields/x_nucleo_iks02a1/README.rst
 delete mode 100644 samples/shields/x_nucleo_iks4a1/README.rst

diff --git a/boards/adafruit/feather_m0_basic_proto/doc/index.rst b/boards/adafruit/feather_m0_basic_proto/doc/index.rst
index a01fe241d59..04206783b15 100644
--- a/boards/adafruit/feather_m0_basic_proto/doc/index.rst
+++ b/boards/adafruit/feather_m0_basic_proto/doc/index.rst
@@ -96,7 +96,7 @@ USB Device Port
 ===============
 
 The SAMD21 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
+with a host PC.  See the :ref:`usb-samples` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual
 serial port that echos characters back to the host PC.
 
diff --git a/boards/adafruit/feather_m0_lora/doc/index.rst b/boards/adafruit/feather_m0_lora/doc/index.rst
index 92d63b36ce3..b75f73d6fdc 100644
--- a/boards/adafruit/feather_m0_lora/doc/index.rst
+++ b/boards/adafruit/feather_m0_lora/doc/index.rst
@@ -99,7 +99,7 @@ USB Device Port
 ===============
 
 The SAMD21 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
+with a host PC.  See the :ref:`usb-samples` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual
 serial port that echos characters back to the host PC.
 
diff --git a/boards/adafruit/grand_central_m4_express/doc/index.rst b/boards/adafruit/grand_central_m4_express/doc/index.rst
index 0244fa73f87..e9cf733843a 100644
--- a/boards/adafruit/grand_central_m4_express/doc/index.rst
+++ b/boards/adafruit/grand_central_m4_express/doc/index.rst
@@ -98,7 +98,7 @@ USB Device Port
 ===============
 
 The SAMD51 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
+with a host PC.  See the :ref:`usb-samples` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual
 serial port that echos characters back to the host PC.
 
diff --git a/boards/adafruit/itsybitsy_m4_express/doc/index.rst b/boards/adafruit/itsybitsy_m4_express/doc/index.rst
index 2ab1f7a5853..ce3efb89b1f 100644
--- a/boards/adafruit/itsybitsy_m4_express/doc/index.rst
+++ b/boards/adafruit/itsybitsy_m4_express/doc/index.rst
@@ -106,7 +106,7 @@ USB Device Port
 ===============
 
 The SAMD51 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
+with a host PC.  See the :ref:`usb-samples` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual
 serial port that echos characters back to the host PC.
 
diff --git a/boards/adafruit/trinket_m0/doc/index.rst b/boards/adafruit/trinket_m0/doc/index.rst
index 4714f9d1aff..e02b829d7a0 100644
--- a/boards/adafruit/trinket_m0/doc/index.rst
+++ b/boards/adafruit/trinket_m0/doc/index.rst
@@ -98,7 +98,7 @@ USB Device Port
 ===============
 
 The SAMD21 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
+with a host PC.  See the :ref:`usb-samples` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual
 serial port that echos characters back to the host PC.
 
diff --git a/boards/arduino/mkrzero/doc/index.rst b/boards/arduino/mkrzero/doc/index.rst
index b6f92d96930..2ea120d9313 100644
--- a/boards/arduino/mkrzero/doc/index.rst
+++ b/boards/arduino/mkrzero/doc/index.rst
@@ -111,7 +111,7 @@ USB Device Port
 ===============
 
 The SAMD21 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
+with a host PC.  See the :ref:`usb-samples` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual
 serial port that echos characters back to the host PC.
 
diff --git a/boards/arduino/nano_33_iot/doc/index.rst b/boards/arduino/nano_33_iot/doc/index.rst
index 419c02a5cea..e6a51198b92 100644
--- a/boards/arduino/nano_33_iot/doc/index.rst
+++ b/boards/arduino/nano_33_iot/doc/index.rst
@@ -102,7 +102,7 @@ USB Device Port
 ===============
 
 The SAMD21 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
+with a host PC.  See the :ref:`usb-samples` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual
 serial port that echos characters back to the host PC.
 
diff --git a/boards/arduino/zero/doc/index.rst b/boards/arduino/zero/doc/index.rst
index 9e665aa75cd..3ec0a0fd82a 100644
--- a/boards/arduino/zero/doc/index.rst
+++ b/boards/arduino/zero/doc/index.rst
@@ -98,7 +98,7 @@ USB Device Port
 ===============
 
 The SAMD21 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
+with a host PC.  See the :ref:`usb-samples` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual
 serial port that echos characters back to the host PC.
 
diff --git a/boards/espressif/esp32_devkitc_wroom/doc/index.rst b/boards/espressif/esp32_devkitc_wroom/doc/index.rst
index 4107dbf6cfe..68955f9c17c 100644
--- a/boards/espressif/esp32_devkitc_wroom/doc/index.rst
+++ b/boards/espressif/esp32_devkitc_wroom/doc/index.rst
@@ -54,7 +54,7 @@ Asymmetric Multiprocessing (AMP)
 ********************************
 
 ESP32-DevKitC-WROOM allows 2 different applications to be executed in ESP32 SoC. Due to its dual-core architecture, each core can be enabled to execute customized tasks in stand-alone mode
-and/or exchanging data over OpenAMP framework. See :zephyr:code-sample-category:`ipc` folder as code reference.
+and/or exchanging data over OpenAMP framework. See :ref:`ipc_samples` folder as code reference.
 
 Supported Features
 ==================
diff --git a/boards/espressif/esp32_devkitc_wrover/doc/index.rst b/boards/espressif/esp32_devkitc_wrover/doc/index.rst
index 79bb94f6b1a..81c75c598ca 100644
--- a/boards/espressif/esp32_devkitc_wrover/doc/index.rst
+++ b/boards/espressif/esp32_devkitc_wrover/doc/index.rst
@@ -54,7 +54,7 @@ Asymmetric Multiprocessing (AMP)
 ********************************
 
 ESP32-DevKitC-WROVER allows 2 different applications to be executed in ESP32 SoC. Due to its dual-core architecture, each core can be enabled to execute customized tasks in stand-alone mode
-and/or exchanging data over OpenAMP framework. See :zephyr:code-sample-category:`ipc` folder as code reference.
+and/or exchanging data over OpenAMP framework. See :ref:`ipc_samples` folder as code reference.
 
 Supported Features
 ==================
diff --git a/boards/espressif/esp32s3_devkitc/doc/index.rst b/boards/espressif/esp32s3_devkitc/doc/index.rst
index cd49316dacd..984a714d0f7 100644
--- a/boards/espressif/esp32s3_devkitc/doc/index.rst
+++ b/boards/espressif/esp32s3_devkitc/doc/index.rst
@@ -76,7 +76,7 @@ Asymmetric Multiprocessing (AMP)
 
 ESP32S3-DevKitC allows 2 different applications to be executed in ESP32-S3 SoC. Due to its dual-core
 architecture, each core can be enabled to execute customized tasks in stand-alone mode
-and/or exchanging data over OpenAMP framework. See :zephyr:code-sample-category:`ipc` folder as code reference.
+and/or exchanging data over OpenAMP framework. See :ref:`ipc_samples` folder as code reference.
 
 For more information, check the datasheet at `ESP32-S3 Datasheet`_ or the technical reference
 manual at `ESP32-S3 Technical Reference Manual`_.
diff --git a/boards/espressif/esp32s3_devkitm/doc/index.rst b/boards/espressif/esp32s3_devkitm/doc/index.rst
index 04a3997abba..b1e79766ed9 100644
--- a/boards/espressif/esp32s3_devkitm/doc/index.rst
+++ b/boards/espressif/esp32s3_devkitm/doc/index.rst
@@ -76,7 +76,7 @@ Asymmetric Multiprocessing (AMP)
 
 ESP32S3-DevKitM allows 2 different applications to be executed in ESP32-S3 SoC. Due to its dual-core
 architecture, each core can be enabled to execute customized tasks in stand-alone mode
-and/or exchanging data over OpenAMP framework. See :zephyr:code-sample-category:`ipc` folder as code reference.
+and/or exchanging data over OpenAMP framework. See :ref:`ipc_samples` folder as code reference.
 
 For more information, check the datasheet at `ESP32-S3 Datasheet`_ or the technical reference
 manual at `ESP32-S3 Technical Reference Manual`_.
diff --git a/boards/openisa/rv32m1_vega/doc/index.rst b/boards/openisa/rv32m1_vega/doc/index.rst
index a8ff0b6c4b8..92d9e999752 100644
--- a/boards/openisa/rv32m1_vega/doc/index.rst
+++ b/boards/openisa/rv32m1_vega/doc/index.rst
@@ -578,7 +578,7 @@ toolchain and OpenOCD::
    You need to make sure this happens every time you use this board.
 
 Now let's compile the :zephyr:code-sample:`hello_world` application. (You can try
-others as well; see :zephyr:code-sample-category:`samples` for more.)
+others as well; see :ref:`samples-and-demos` for more.)
 
 .. We can't use zephyr-app-commands to provide build instructions
    due to the below mentioned linker issue.
diff --git a/boards/others/serpente/doc/index.rst b/boards/others/serpente/doc/index.rst
index e7140707d74..c624c5ad062 100644
--- a/boards/others/serpente/doc/index.rst
+++ b/boards/others/serpente/doc/index.rst
@@ -74,7 +74,7 @@ USB Device Port
 ===============
 
 The SAMD21 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
+with a host PC.  See the :ref:`usb-samples` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which prints "Hello World!"
 to the host PC.
 
diff --git a/boards/seeed/seeeduino_xiao/doc/index.rst b/boards/seeed/seeeduino_xiao/doc/index.rst
index 48003fdb63c..8f3614918f6 100644
--- a/boards/seeed/seeeduino_xiao/doc/index.rst
+++ b/boards/seeed/seeeduino_xiao/doc/index.rst
@@ -98,7 +98,7 @@ USB Device Port
 ===============
 
 The SAMD21 MCU has a USB device port that can be used to communicate
-with a host PC.  See the :zephyr:code-sample-category:`usb` sample applications for
+with a host PC.  See the :ref:`usb-samples` sample applications for
 more, such as the :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual
 serial port that echos characters back to the host PC.
 
diff --git a/boards/seeed/wio_terminal/doc/index.rst b/boards/seeed/wio_terminal/doc/index.rst
index f640f11b445..73cef0f3c5b 100644
--- a/boards/seeed/wio_terminal/doc/index.rst
+++ b/boards/seeed/wio_terminal/doc/index.rst
@@ -121,7 +121,7 @@ USB Device Port
 ===============
 
 The SAMD51 MCU has a USB device port that can be used to communicate with a
-host PC.  See the :zephyr:code-sample-category:`usb` sample applications for more, such as the
+host PC.  See the :ref:`usb-samples` sample applications for more, such as the
 :zephyr:code-sample:`usb-cdc-acm` sample which sets up a virtual serial port that echos
 characters back to the host PC.
 
diff --git a/boards/shields/npm1300_ek/doc/index.rst b/boards/shields/npm1300_ek/doc/index.rst
index 816c31a5fff..f46a8cf47a0 100644
--- a/boards/shields/npm1300_ek/doc/index.rst
+++ b/boards/shields/npm1300_ek/doc/index.rst
@@ -22,7 +22,7 @@ Usage
 *****
 
 The shield can be used in any application by setting ``--shield npm1300_ek``
-when invoking ``west build``. You can check :zephyr:code-sample:`npm1300_ek` for a
+when invoking ``west build``. You can check :ref:`npm1300_ek_sample` for a
 comprehensive sample.
 
 References
diff --git a/boards/shields/npm6001_ek/doc/index.rst b/boards/shields/npm6001_ek/doc/index.rst
index 32305cd5a8c..bc982d7f436 100644
--- a/boards/shields/npm6001_ek/doc/index.rst
+++ b/boards/shields/npm6001_ek/doc/index.rst
@@ -28,7 +28,7 @@ Usage
 *****
 
 The shield can be used in any application by setting ``--shield npm6001_ek``
-when invoking ``west build``. You can check :zephyr:code-sample:`npm6001_ek` for a
+when invoking ``west build``. You can check :ref:`npm6001_ek_sample` for a
 comprehensive sample.
 
 References
diff --git a/boards/snps/hsdk/doc/index.rst b/boards/snps/hsdk/doc/index.rst
index b79ecbca968..a7165a27658 100644
--- a/boards/snps/hsdk/doc/index.rst
+++ b/boards/snps/hsdk/doc/index.rst
@@ -387,9 +387,9 @@ Set up Zephyr Software
 Building Sample Applications
 ==============================
 
-You can try many of the :zephyr:code-sample-category:`sample applications and demos <samples>`.
-We'll use :zephyr:code-sample:`hello_world`, found in :zephyr_file:`samples/hello_world` as an
-example.
+You can try many of the :ref:`sample applications and demos
+<samples-and-demos>`.  We'll use :zephyr:code-sample:`hello_world`, found in
+:zephyr_file:`samples/hello_world` as an example.
 
 Configuring
 -----------
diff --git a/boards/snps/hsdk4xd/doc/index.rst b/boards/snps/hsdk4xd/doc/index.rst
index 04b30bcaf9b..a5cfd534c00 100644
--- a/boards/snps/hsdk4xd/doc/index.rst
+++ b/boards/snps/hsdk4xd/doc/index.rst
@@ -384,8 +384,9 @@ Set up Zephyr Software
 Building Sample Applications
 ==============================
 
-You can try many of the :zephyr:code-sample-category:`sample applications and demos <samples>`.
-We'll use :zephyr:code-sample:`hello_world`, found in :zephyr_file:`samples/hello_world` as an example.
+You can try many of the :ref:`sample applications and demos
+<samples-and-demos>`.  We'll use :zephyr:code-sample:`hello_world`, found in
+:zephyr_file:`samples/hello_world` as an example.
 
 Configuring
 -----------
diff --git a/boards/waveshare/esp32s3_touch_lcd_1_28/doc/index.rst b/boards/waveshare/esp32s3_touch_lcd_1_28/doc/index.rst
index b80884a2e96..2d56d559b96 100644
--- a/boards/waveshare/esp32s3_touch_lcd_1_28/doc/index.rst
+++ b/boards/waveshare/esp32s3_touch_lcd_1_28/doc/index.rst
@@ -52,7 +52,7 @@ Asymmetric Multiprocessing (AMP)
 
 ESP32-S3 allows 2 different applications to be executed in ESP32-S3 SoC. Due to its dual-core
 architecture, each core can be enabled to execute customized tasks in stand-alone mode
-and/or exchanging data over OpenAMP framework. See :zephyr:code-sample-category:`ipc` folder as code reference.
+and/or exchanging data over OpenAMP framework. See :ref:`ipc_samples` folder as code reference.
 
 For more information, check the datasheet at `ESP32-S3 Datasheet`_ or the technical reference
 manual at `ESP32-S3 Technical Reference Manual`_.
diff --git a/doc/connectivity/bluetooth/bluetooth-arch.rst b/doc/connectivity/bluetooth/bluetooth-arch.rst
index 04fcf365888..c442412d2f4 100644
--- a/doc/connectivity/bluetooth/bluetooth-arch.rst
+++ b/doc/connectivity/bluetooth/bluetooth-arch.rst
@@ -197,7 +197,7 @@ The stack is split up as follows in the source tree:
   have their own drivers.
 
 ``samples/bluetooth/``
-  :zephyr:code-sample-category:`Sample Bluetooth code <bluetooth>`. This is a good reference to
+  :ref:`Sample Bluetooth code <bluetooth-samples>`. This is a good reference to
   get started with Bluetooth application development.
 
 ``tests/bluetooth/``
diff --git a/doc/connectivity/bluetooth/bluetooth-dev.rst b/doc/connectivity/bluetooth/bluetooth-dev.rst
index afefaf45a7e..05a7a672922 100644
--- a/doc/connectivity/bluetooth/bluetooth-dev.rst
+++ b/doc/connectivity/bluetooth/bluetooth-dev.rst
@@ -189,7 +189,7 @@ and scan response data.
 More Examples
 *************
 
-More :zephyr:code-sample-category:`sample Bluetooth applications <bluetooth>` are available in
+More :ref:`sample Bluetooth applications <bluetooth-samples>` are available in
 ``samples/bluetooth/``.
 
 .. _BabbleSim: https://babblesim.github.io/
diff --git a/doc/connectivity/usb/device/usb_device.rst b/doc/connectivity/usb/device/usb_device.rst
index 30ee886ea8c..fac90690727 100644
--- a/doc/connectivity/usb/device/usb_device.rst
+++ b/doc/connectivity/usb/device/usb_device.rst
@@ -565,7 +565,7 @@ The USB Vendor ID for the Zephyr project is ``0x2FE3``.
 This USB Vendor ID must not be used when a vendor
 integrates Zephyr USB device support into its own product.
 
-Each USB :zephyr:code-sample-category:`sample<usb>` has its own unique Product ID.
+Each USB :ref:`sample<usb-samples>` has its own unique Product ID.
 The USB maintainer, if one is assigned, or otherwise the Zephyr Technical
 Steering Committee, may allocate other USB Product IDs based on well-motivated
 and documented requests.
diff --git a/doc/connectivity/usb/pd/ucds.rst b/doc/connectivity/usb/pd/ucds.rst
index 39b6a6030d9..609e3dfed2d 100644
--- a/doc/connectivity/usb/pd/ucds.rst
+++ b/doc/connectivity/usb/pd/ucds.rst
@@ -17,7 +17,7 @@ It provides the following functionalities:
 Currently the device stack supports implementation of Sink only and Source only
 devices. Dual Role Power (DRP) devices are not yet supported.
 
-:zephyr:code-sample-category:`List<usbc>` of samples for different purposes.
+:ref:`List<usbc-samples>` of samples for different purposes.
 
 Implementing a Sink Type-C and Power Delivery USB-C device
 **********************************************************
diff --git a/doc/develop/application/index.rst b/doc/develop/application/index.rst
index 6bf3620adfd..bcad2900b88 100644
--- a/doc/develop/application/index.rst
+++ b/doc/develop/application/index.rst
@@ -303,7 +303,7 @@ Creating an Application by Hand
 
 You can follow these steps to create a basic application directory from
 scratch. However, using the `example-application`_ repository or one of
-Zephyr's :zephyr:code-sample-category:`samples` as a starting point is likely to be easier.
+Zephyr's :ref:`samples-and-demos` as a starting point is likely to be easier.
 
 #. Create an application directory.
 
@@ -643,7 +643,7 @@ assignment:
 
    CONFIG_CPP=y
 
-Looking at :zephyr:code-sample-category:`existing samples <samples>` is a good way to get
+Looking at :ref:`existing samples <samples-and-demos>` is a good way to get
 started.
 
 See :ref:`setting_configuration_values` for detailed documentation on setting
diff --git a/doc/develop/beyond-GSG.rst b/doc/develop/beyond-GSG.rst
index ab0a1aba84f..42f1f6c5f38 100644
--- a/doc/develop/beyond-GSG.rst
+++ b/doc/develop/beyond-GSG.rst
@@ -213,7 +213,7 @@ format. Other binary formats, disassembly, and map files may be present
 depending on your board.
 
 The other sample applications in the :zephyr_file:`samples` folder are
-documented in :zephyr:code-sample-category:`samples`.
+documented in :ref:`samples-and-demos`.
 
 .. note:: If you want to reuse an
    existing build directory for another board or application, you need to
diff --git a/doc/develop/getting_started/index.rst b/doc/develop/getting_started/index.rst
index 3cb87da9ec6..34f21e427cd 100644
--- a/doc/develop/getting_started/index.rst
+++ b/doc/develop/getting_started/index.rst
@@ -478,7 +478,7 @@ Next Steps
 
 Here are some next steps for exploring Zephyr:
 
-* Try other :zephyr:code-sample-category:`samples`
+* Try other :ref:`samples-and-demos`
 * Learn about :ref:`application` and the :ref:`west <west>` tool
 * Find out about west's :ref:`flashing and debugging <west-build-flash-debug>`
   features, or more about :ref:`flashing_and_debugging` in general
diff --git a/doc/releases/release-notes-1.7.rst b/doc/releases/release-notes-1.7.rst
index e13dfdfd582..8f4bce1a77e 100644
--- a/doc/releases/release-notes-1.7.rst
+++ b/doc/releases/release-notes-1.7.rst
@@ -147,7 +147,7 @@ Documentation
 * Site-wide glossary added.
 * Porting guides added.
 * Sample README files converted to documents included in the website.
-* Improved consistency of :ref:`boards` and :zephyr:code-sample-category:`samples`.
+* Improved consistency of :ref:`boards` and :ref:`samples-and-demos`.
 
 
 JIRA Related Items
diff --git a/doc/services/device_mgmt/ota.rst b/doc/services/device_mgmt/ota.rst
index 4548ce8b028..a61e1c7f545 100644
--- a/doc/services/device_mgmt/ota.rst
+++ b/doc/services/device_mgmt/ota.rst
@@ -45,7 +45,7 @@ is downloaded and installed. MCUboot can be used to verify the signature before
 upgrading the firmware.
 
 There is a :zephyr:code-sample:`hawkbit-api` sample included in the
-Zephyr :zephyr:code-sample-category:`mgmt` section.
+Zephyr :ref:`mgmt-samples` section.
 
 UpdateHub
 =========
@@ -56,7 +56,7 @@ the binary is downloaded and installed. MCUboot can be used to verify the
 signature before upgrading the firmware.
 
 There is an :zephyr:code-sample:`updatehub-fota` sample included in the Zephyr
-:zephyr:code-sample-category:`mgmt` section.
+:ref:`mgmt-samples` section.
 
 SMP Server
 ==========
@@ -66,8 +66,8 @@ Bluetooth Low Energy (BLE) or UDP. :ref:`mcu_mgr` is used to send a signed
 firmware binary to the remote device where it is verified by MCUboot before the
 upgrade occurs.
 
-There is an :zephyr:code-sample:`smp-svr` sample included in the Zephyr
-:zephyr:code-sample-category:`mgmt` section.
+There is an :zephyr:code-sample:`smp-svr` sample included in the Zephyr :ref:`mgmt-samples`
+section.
 
 Lightweight M2M (LWM2M)
 =======================
diff --git a/doc/services/portability/posix/overview/index.rst b/doc/services/portability/posix/overview/index.rst
index c0ab06b6e8a..6c352cf2454 100644
--- a/doc/services/portability/posix/overview/index.rst
+++ b/doc/services/portability/posix/overview/index.rst
@@ -113,8 +113,7 @@ leverages the ``nanosleep()`` and ``perror()`` POSIX functions.
         return 0;
     }
 
-For more examples of POSIX applications, please see the
-:zephyr:code-sample-category:`POSIX sample applications<posix>`.
+For more examples of POSIX applications, please see the :ref:`POSIX sample applications<posix-samples>`.
 
 .. _posix_config:
 
diff --git a/samples/application_development/application_development.rst b/samples/application_development/application_development.rst
index 9a7d9b2975a..f467600d235 100644
--- a/samples/application_development/application_development.rst
+++ b/samples/application_development/application_development.rst
@@ -1,11 +1,16 @@
-.. zephyr:code-sample-category:: application_development
-   :name: Application Development
-   :show-listing:
+.. _application-development-samples:
 
-   These samples illustrate some useful application development patterns and techniques.
+Application development samples
+###############################
 
 For application development you should also consider looking at
 `example-application`_. Among others, you will find on it out of tree driver
 or board examples.
 
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
+
 .. _example-application: https://github.com/zephyrproject-rtos/example-application
diff --git a/samples/arch/index.rst b/samples/arch/index.rst
index fbc2871be9c..a43bda20d80 100644
--- a/samples/arch/index.rst
+++ b/samples/arch/index.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: arch
-   :name: Architecture-dependent Samples
-   :show-listing:
+.. _arch-samples:
 
-   Samples that demonstrate some architecture-specific features.
+Architecture Dependent Samples
+##############################
+
+.. toctree::
+   :maxdepth: 2
+   :glob:
+
+   */*
diff --git a/samples/arch/mpu/index.rst b/samples/arch/mpu/index.rst
index b1161af69b6..64016b946ad 100644
--- a/samples/arch/mpu/index.rst
+++ b/samples/arch/mpu/index.rst
@@ -1,6 +1,10 @@
-.. zephyr:code-sample-category:: mmu_mpu
-   :name: MMU/MPU
-   :show-listing:
+.. _mmu_mpu-samples:
 
-   Samples that demonstrate the Memory Management Unit (MMU) and Memory Protection Unit (MPU)
-   features.
+MMU/MPU Samples
+###############
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/arch/smp/index.rst b/samples/arch/smp/index.rst
index fe1ed4490a2..64c4660aaed 100644
--- a/samples/arch/smp/index.rst
+++ b/samples/arch/smp/index.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: smp
-   :name: Symmetric Multiprocessing (SMP)
-   :show-listing:
+.. _smp-samples:
 
-   Samples that demonstrate the use of :ref:`Symmetric Multiprocessing <smp_arch>`.
+Various SMP Samples
+###################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/basic/basic.rst b/samples/basic/basic.rst
index 7985892834c..d40b04527ac 100644
--- a/samples/basic/basic.rst
+++ b/samples/basic/basic.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: basic
-   :name: Basic
-   :show-listing:
+.. _basic-sample:
 
-   These samples demonstrate basic functionality of the Zephyr kernel.
+Basic Samples
+#############
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/bluetooth/bap_broadcast_assistant/README.rst b/samples/bluetooth/bap_broadcast_assistant/README.rst
index f8ba3fb582b..011631d6120 100644
--- a/samples/bluetooth/bap_broadcast_assistant/README.rst
+++ b/samples/bluetooth/bap_broadcast_assistant/README.rst
@@ -21,7 +21,7 @@ Source sample).
 This sample can be found under
 :zephyr_file:`samples/bluetooth/bap_broadcast_assistant` in the Zephyr tree.
 
-Check the :zephyr:code-sample-category:`bluetooth` samples for general information.
+Check the :ref:`bluetooth samples section <bluetooth-samples>` for general information.
 
 Requirements
 ************
diff --git a/samples/bluetooth/bap_broadcast_sink/README.rst b/samples/bluetooth/bap_broadcast_sink/README.rst
index 52bb8208ef2..efbb69e3810 100644
--- a/samples/bluetooth/bap_broadcast_sink/README.rst
+++ b/samples/bluetooth/bap_broadcast_sink/README.rst
@@ -14,7 +14,7 @@ the first found and listens to it until the source is (potentially) stopped.
 This sample can be found under
 :zephyr_file:`samples/bluetooth/bap_broadcast_sink` in the Zephyr tree.
 
-Check the :zephyr:code-sample-category:`bluetooth` samples for general information.
+Check the :ref:`bluetooth samples section <bluetooth-samples>` for general information.
 
 Use :kconfig:option:`CONFIG_TARGET_BROADCAST_NAME` Kconfig to specify the name
 (:kconfig:option:`CONFIG_BT_DEVICE_NAME`) of a broadcast source to listen to. With default value
diff --git a/samples/bluetooth/bap_broadcast_source/README.rst b/samples/bluetooth/bap_broadcast_source/README.rst
index f0dadc990c1..1baf971623b 100644
--- a/samples/bluetooth/bap_broadcast_source/README.rst
+++ b/samples/bluetooth/bap_broadcast_source/README.rst
@@ -17,7 +17,7 @@ The broadcast source will reset every 30 seconds to show the full API.
 This sample can be found under
 :zephyr_file:`samples/bluetooth/bap_broadcast_source` in the Zephyr tree.
 
-Check the :zephyr:code-sample-category:`bluetooth` samples for general information.
+Check the :ref:`bluetooth samples section <bluetooth-samples>` for general information.
 
 Requirements
 ************
diff --git a/samples/bluetooth/bap_unicast_client/README.rst b/samples/bluetooth/bap_unicast_client/README.rst
index b70667582d3..b99826f5fa0 100644
--- a/samples/bluetooth/bap_unicast_client/README.rst
+++ b/samples/bluetooth/bap_unicast_client/README.rst
@@ -13,7 +13,7 @@ connects to a LE Audio unicast server and establishes an audio stream.
 This sample can be found under
 :zephyr_file:`samples/bluetooth/bap_unicast_client` in the Zephyr tree.
 
-Check the :zephyr:code-sample-category:`bluetooth` samples for general information.
+Check the :ref:`bluetooth samples section <bluetooth-samples>` for general information.
 
 Requirements
 ************
diff --git a/samples/bluetooth/bap_unicast_server/README.rst b/samples/bluetooth/bap_unicast_server/README.rst
index f0b2de5e971..b24c6385443 100644
--- a/samples/bluetooth/bap_unicast_server/README.rst
+++ b/samples/bluetooth/bap_unicast_server/README.rst
@@ -13,7 +13,7 @@ Starts advertising and awaits connection from a LE Audio unicast client.
 This sample can be found under
 :zephyr_file:`samples/bluetooth/bap_unicast_server` in the Zephyr tree.
 
-Check the :zephyr:code-sample-category:`bluetooth` samples for general information.
+Check the :ref:`bluetooth samples section <bluetooth-samples>` for general information.
 
 Requirements
 ************
diff --git a/samples/bluetooth/beacon/README.rst b/samples/bluetooth/beacon/README.rst
index 20270aa23c7..06e8d7e765a 100644
--- a/samples/bluetooth/beacon/README.rst
+++ b/samples/bluetooth/beacon/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/beacon` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/bluetooth.rst b/samples/bluetooth/bluetooth.rst
index 0c3b7a21f2f..1c3d4d18d81 100644
--- a/samples/bluetooth/bluetooth.rst
+++ b/samples/bluetooth/bluetooth.rst
@@ -1,7 +1,7 @@
-.. zephyr:code-sample-category:: bluetooth
-   :name: Bluetooth
+.. _bluetooth-samples:
 
-   These samples demonstrate the use of Bluetooth in Zephyr.
+Bluetooth samples
+#################
 
 To build any of the Bluetooth samples, follow the same steps as building
 any other Zephyr application. Refer to :ref:`bluetooth-dev` for more information.
@@ -29,6 +29,8 @@ documentation and are prefixed with :literal:`hci_` in their folder names.
    connections will fail. You can force a re-paring and new key to be created
    by removing the device from the associated devices list on the host.
 
-.. zephyr:code-sample-listing::
-   :categories: bluetooth
-   :live-search:
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/bluetooth/broadcaster/README.rst b/samples/bluetooth/broadcaster/README.rst
index 60b47956e21..72e395d347a 100644
--- a/samples/bluetooth/broadcaster/README.rst
+++ b/samples/bluetooth/broadcaster/README.rst
@@ -25,4 +25,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/broadcaster` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/broadcaster_multiple/README.rst b/samples/bluetooth/broadcaster_multiple/README.rst
index c99595b12fc..5170cf9dbff 100644
--- a/samples/bluetooth/broadcaster_multiple/README.rst
+++ b/samples/bluetooth/broadcaster_multiple/README.rst
@@ -34,4 +34,4 @@ To test this sample use the Observer sample with Extended Scanning enabled,
 found under
 :zephyr_file:`samples/bluetooth/observer` in the Zephyr tree.
 
-See :zephyr:code-sample-category:`Bluetooth samples section <bluetooth>` for details.
+See :ref:`Bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/bthome_sensor_template/README.rst b/samples/bluetooth/bthome_sensor_template/README.rst
index 809dc282e90..94f438bd0fa 100644
--- a/samples/bluetooth/bthome_sensor_template/README.rst
+++ b/samples/bluetooth/bthome_sensor_template/README.rst
@@ -20,7 +20,7 @@ Building and Running
 
 This sample can be found under :zephyr_file:`samples/bluetooth/bthome_sensor_template` in the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
 
 When the sample is running, navigate to Devices & Services under settings in Home
 Assistant. There you will be asked to configure the BTHome sensor if everything
diff --git a/samples/bluetooth/cap_acceptor/README.rst b/samples/bluetooth/cap_acceptor/README.rst
index 60c70e69bb2..0a9854616f1 100644
--- a/samples/bluetooth/cap_acceptor/README.rst
+++ b/samples/bluetooth/cap_acceptor/README.rst
@@ -12,7 +12,7 @@ Starts by advertising for a CAP Initiator to connect and set up available stream
 
 This sample can be found under :zephyr_file:`samples/bluetooth/cap_acceptor` in the Zephyr tree.
 
-Check the :zephyr:code-sample-category:`bluetooth` samples for general information.
+Check the :ref:`bluetooth samples section <bluetooth-samples>` for general information.
 
 Requirements
 ************
diff --git a/samples/bluetooth/cap_initiator/README.rst b/samples/bluetooth/cap_initiator/README.rst
index 36c1631f1bf..b3c84ff9dec 100644
--- a/samples/bluetooth/cap_initiator/README.rst
+++ b/samples/bluetooth/cap_initiator/README.rst
@@ -13,7 +13,7 @@ audio streams, sets up a broadcast audio stream, or both.
 
 This sample can be found under :zephyr_file:`samples/bluetooth/cap_initiator` in the Zephyr tree.
 
-Check the :zephyr:code-sample-category:`bluetooth` samples for general information.
+Check the :ref:`bluetooth samples section <bluetooth-samples>` for general information.
 
 Requirements
 ************
diff --git a/samples/bluetooth/central/README.rst b/samples/bluetooth/central/README.rst
index 0a47dd07b5c..ceb9710bdd4 100644
--- a/samples/bluetooth/central/README.rst
+++ b/samples/bluetooth/central/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/central` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/central_gatt_write/README.rst b/samples/bluetooth/central_gatt_write/README.rst
index 0190374b994..37ac2da26d8 100644
--- a/samples/bluetooth/central_gatt_write/README.rst
+++ b/samples/bluetooth/central_gatt_write/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/central_gatt_write`
 in the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/central_hr/README.rst b/samples/bluetooth/central_hr/README.rst
index 8d3e1b88a3c..af3d1be3e12 100644
--- a/samples/bluetooth/central_hr/README.rst
+++ b/samples/bluetooth/central_hr/README.rst
@@ -23,4 +23,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/central_hr` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/central_ht/README.rst b/samples/bluetooth/central_ht/README.rst
index e0a58a7ea25..8c81e5aa80c 100644
--- a/samples/bluetooth/central_ht/README.rst
+++ b/samples/bluetooth/central_ht/README.rst
@@ -23,4 +23,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/central_ht` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/central_multilink/README.rst b/samples/bluetooth/central_multilink/README.rst
index 61d64d79806..dcabb8785fc 100644
--- a/samples/bluetooth/central_multilink/README.rst
+++ b/samples/bluetooth/central_multilink/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/central_multilink`
 in the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/central_otc/README.rst b/samples/bluetooth/central_otc/README.rst
index 67b75f21aa6..18b4443c949 100644
--- a/samples/bluetooth/central_otc/README.rst
+++ b/samples/bluetooth/central_otc/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/central_otc` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/central_past/README.rst b/samples/bluetooth/central_past/README.rst
index a6b15fbf5c6..a39b1a3370c 100644
--- a/samples/bluetooth/central_past/README.rst
+++ b/samples/bluetooth/central_past/README.rst
@@ -29,4 +29,4 @@ Use the sample found under :zephyr_file:`samples/bluetooth/peripheral_past` in
 the Zephyr tree on another board that will advertise and await a periodic
 advertising sync transfer.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/direct_adv/README.rst b/samples/bluetooth/direct_adv/README.rst
index 65191c1636a..adc3a14ccab 100644
--- a/samples/bluetooth/direct_adv/README.rst
+++ b/samples/bluetooth/direct_adv/README.rst
@@ -30,4 +30,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/direct_adv` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/eddystone/README.rst b/samples/bluetooth/eddystone/README.rst
index 1e1a555a689..d39c4cfdebb 100644
--- a/samples/bluetooth/eddystone/README.rst
+++ b/samples/bluetooth/eddystone/README.rst
@@ -26,6 +26,6 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/eddystone` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
 
 .. _Eddystone Configuration Service: https://github.com/google/eddystone/tree/master/configuration-service
diff --git a/samples/bluetooth/encrypted_advertising/README.rst b/samples/bluetooth/encrypted_advertising/README.rst
index d55017f35ce..b62a479fcca 100644
--- a/samples/bluetooth/encrypted_advertising/README.rst
+++ b/samples/bluetooth/encrypted_advertising/README.rst
@@ -35,7 +35,7 @@ Building and Running
 This sample can be found under
 :zephyr_file:`samples/bluetooth/encrypted_advertising` in the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
 
 This sample uses two applications, so two devices need to be setup.
 Flash one device with the central application, and another device with the
diff --git a/samples/bluetooth/extended_adv/README.rst b/samples/bluetooth/extended_adv/README.rst
index f05fe6e2f64..b7901fd8e6b 100644
--- a/samples/bluetooth/extended_adv/README.rst
+++ b/samples/bluetooth/extended_adv/README.rst
@@ -34,7 +34,7 @@ Building and Running
 This sample can be found under
 :zephyr_file:`samples/bluetooth/extended_adv` in the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
 
 This sample uses two applications, so two devices need to be setup.
 Flash one device with the scanner application, and another device with the
diff --git a/samples/bluetooth/handsfree/README.rst b/samples/bluetooth/handsfree/README.rst
index 2df63ba2ee1..609139ef04a 100644
--- a/samples/bluetooth/handsfree/README.rst
+++ b/samples/bluetooth/handsfree/README.rst
@@ -21,4 +21,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/handsfree` in
 the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/handsfree_ag/README.rst b/samples/bluetooth/handsfree_ag/README.rst
index e28d80433b0..21c190ab360 100644
--- a/samples/bluetooth/handsfree_ag/README.rst
+++ b/samples/bluetooth/handsfree_ag/README.rst
@@ -21,4 +21,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/handsfree_ag` in
 the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/hap_ha/README.rst b/samples/bluetooth/hap_ha/README.rst
index 9960c02d3de..945ceaa5ef5 100644
--- a/samples/bluetooth/hap_ha/README.rst
+++ b/samples/bluetooth/hap_ha/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under
 :zephyr_file:`samples/bluetooth/hap_ha` in the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/hci_ipc/README.rst b/samples/bluetooth/hci_ipc/README.rst
index 8f01d3f0619..be2634ba5c1 100644
--- a/samples/bluetooth/hci_ipc/README.rst
+++ b/samples/bluetooth/hci_ipc/README.rst
@@ -37,4 +37,4 @@ You might need to adjust the Kconfig configuration of this sample to make it
 compatible with the peer application. For example, :kconfig:option:`CONFIG_BT_MAX_CONN`
 must be equal to the maximum number of connections supported by the peer application.
 
-Refer to :zephyr:code-sample-category:`bluetooth` for general information about Bluetooth samples.
+Refer to :ref:`bluetooth-samples` for general information about Bluetooth samples.
diff --git a/samples/bluetooth/hci_pwr_ctrl/README.rst b/samples/bluetooth/hci_pwr_ctrl/README.rst
index 00d89d06738..b902b07534e 100644
--- a/samples/bluetooth/hci_pwr_ctrl/README.rst
+++ b/samples/bluetooth/hci_pwr_ctrl/README.rst
@@ -35,4 +35,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/hci_pwr_ctrl`
 in the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/hci_spi/README.rst b/samples/bluetooth/hci_spi/README.rst
index 1276889e6a5..70c6e465a86 100644
--- a/samples/bluetooth/hci_spi/README.rst
+++ b/samples/bluetooth/hci_spi/README.rst
@@ -36,6 +36,6 @@ application is compatible with the HCI SPI master driver provided by
 Zephyr's Bluetooth HCI driver core; see the help associated with the
 :kconfig:option:`CONFIG_BT_SPI` configuration option for more information.
 
-Refer to :zephyr:code-sample-category:`bluetooth` for general Bluetooth information, and
+Refer to :ref:`bluetooth-samples` for general Bluetooth information, and
 to :ref:`96b_carbon_nrf51_bluetooth` for instructions specific to the
 96Boards Carbon board.
diff --git a/samples/bluetooth/hci_usb/README.rst b/samples/bluetooth/hci_usb/README.rst
index c8ac294a72f..3d88357513a 100644
--- a/samples/bluetooth/hci_usb/README.rst
+++ b/samples/bluetooth/hci_usb/README.rst
@@ -21,4 +21,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/hci_usb` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/hci_usb_h4/README.rst b/samples/bluetooth/hci_usb_h4/README.rst
index dbce1c85cb1..8126c2adf9a 100644
--- a/samples/bluetooth/hci_usb_h4/README.rst
+++ b/samples/bluetooth/hci_usb_h4/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/hci_usb_h4` in
 the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/hci_vs_scan_req/README.rst b/samples/bluetooth/hci_vs_scan_req/README.rst
index a1d3fbd1428..9c4d3281dc8 100644
--- a/samples/bluetooth/hci_vs_scan_req/README.rst
+++ b/samples/bluetooth/hci_vs_scan_req/README.rst
@@ -28,4 +28,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/hci_vs_scan_req`
 in the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/ibeacon/README.rst b/samples/bluetooth/ibeacon/README.rst
index 9cc00f418f1..38ba89f8f70 100644
--- a/samples/bluetooth/ibeacon/README.rst
+++ b/samples/bluetooth/ibeacon/README.rst
@@ -29,7 +29,7 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/ibeacon` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details on how
+See :ref:`bluetooth samples section <bluetooth-samples>` for details on how
 to run the sample inside QEMU.
 
 For other boards, build and flash the application as follows:
diff --git a/samples/bluetooth/iso_broadcast/README.rst b/samples/bluetooth/iso_broadcast/README.rst
index 79eae0e3a7d..a27f302247f 100644
--- a/samples/bluetooth/iso_broadcast/README.rst
+++ b/samples/bluetooth/iso_broadcast/README.rst
@@ -29,4 +29,4 @@ Use the sample found under :zephyr_file:`samples/bluetooth/iso_receive` in the
 Zephyr tree that will scan, establish a periodic advertising synchronization,
 generate BIGInfo reports and synchronize to BIG events from this sample.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/iso_broadcast_benchmark/README.rst b/samples/bluetooth/iso_broadcast_benchmark/README.rst
index bba796a6b46..cd371c3e11f 100644
--- a/samples/bluetooth/iso_broadcast_benchmark/README.rst
+++ b/samples/bluetooth/iso_broadcast_benchmark/README.rst
@@ -33,7 +33,7 @@ Building and running
 This sample can be found under
 :zephyr_file:`samples/bluetooth/iso_broadcast_benchmark` in the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
 
 
 Testing
diff --git a/samples/bluetooth/iso_central/README.rst b/samples/bluetooth/iso_central/README.rst
index c3739340705..1169425afd4 100644
--- a/samples/bluetooth/iso_central/README.rst
+++ b/samples/bluetooth/iso_central/README.rst
@@ -44,4 +44,4 @@ the Zephyr tree.
 
       ISO Channel 0x200048f8 connected
 
-See :zephyr:code-sample-category:`bluetooth` samples for more details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for more details.
diff --git a/samples/bluetooth/iso_connected_benchmark/README.rst b/samples/bluetooth/iso_connected_benchmark/README.rst
index bf489e94306..c4c30f73263 100644
--- a/samples/bluetooth/iso_connected_benchmark/README.rst
+++ b/samples/bluetooth/iso_connected_benchmark/README.rst
@@ -32,7 +32,7 @@ Building and running
 This sample can be found under
 :zephyr_file:`samples/bluetooth/iso_connected_benchmark` in the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
 
 
 Testing
diff --git a/samples/bluetooth/iso_peripheral/README.rst b/samples/bluetooth/iso_peripheral/README.rst
index 4ad55953ebb..f9f0d874add 100644
--- a/samples/bluetooth/iso_peripheral/README.rst
+++ b/samples/bluetooth/iso_peripheral/README.rst
@@ -64,4 +64,4 @@ This sample can be found under :zephyr_file:`samples/bluetooth/iso_peripheral` i
       Incoming data channel 0x20000698 len 12
                000102...090a0b
 
-See :zephyr:code-sample-category:`bluetooth` samples for more details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for more details.
diff --git a/samples/bluetooth/iso_receive/README.rst b/samples/bluetooth/iso_receive/README.rst
index cbd33a20610..85201981c7f 100644
--- a/samples/bluetooth/iso_receive/README.rst
+++ b/samples/bluetooth/iso_receive/README.rst
@@ -30,4 +30,4 @@ another board that will start periodic advertising, create BIG to which this
 sample will establish periodic advertising synchronization and synchronize to
 the Broadcast Isochronous Stream.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/mesh/README.rst b/samples/bluetooth/mesh/README.rst
index f566c071ad2..99514c9e606 100644
--- a/samples/bluetooth/mesh/README.rst
+++ b/samples/bluetooth/mesh/README.rst
@@ -31,7 +31,7 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/mesh` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details on how
+See :ref:`bluetooth samples section <bluetooth-samples>` for details on how
 to run the sample inside QEMU.
 
 For other boards, build and flash the application as follows:
diff --git a/samples/bluetooth/mesh_demo/README.rst b/samples/bluetooth/mesh_demo/README.rst
index 070dd5a45a4..a46f39f49cd 100644
--- a/samples/bluetooth/mesh_demo/README.rst
+++ b/samples/bluetooth/mesh_demo/README.rst
@@ -42,7 +42,7 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/mesh_demo` in
 the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details on how
+See :ref:`bluetooth samples section <bluetooth-samples>` for details on how
 to run the sample inside QEMU.
 
 For other boards, build and flash the application as follows:
diff --git a/samples/bluetooth/mesh_provisioner/README.rst b/samples/bluetooth/mesh_provisioner/README.rst
index 10600ef89f3..b6f1364b280 100644
--- a/samples/bluetooth/mesh_provisioner/README.rst
+++ b/samples/bluetooth/mesh_provisioner/README.rst
@@ -40,7 +40,7 @@ Building and Running
 This sample can be found under
 :zephyr_file:`samples/bluetooth/mesh_provisioner` in the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details on
+See :ref:`bluetooth samples section <bluetooth-samples>` for details on
 how to run the sample inside QEMU.
 
 For other boards, build and flash the application as follows:
diff --git a/samples/bluetooth/mtu_update/README.rst b/samples/bluetooth/mtu_update/README.rst
index 92b445ce600..fb5069aa11f 100644
--- a/samples/bluetooth/mtu_update/README.rst
+++ b/samples/bluetooth/mtu_update/README.rst
@@ -76,7 +76,7 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/mtu_update` in
 the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
 
 If the devices are close enough, the central should connect to the peripheral
 and send his MTU to the other device. If the MTU exchange succeeds, the central
diff --git a/samples/bluetooth/observer/README.rst b/samples/bluetooth/observer/README.rst
index 6ef62f3870e..42001e36242 100644
--- a/samples/bluetooth/observer/README.rst
+++ b/samples/bluetooth/observer/README.rst
@@ -27,4 +27,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/observer` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`Bluetooth samples section <bluetooth>` for details.
+See :ref:`Bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/pbp_public_broadcast_sink/README.rst b/samples/bluetooth/pbp_public_broadcast_sink/README.rst
index 5a3ae3b2cc0..72ec4fc3c8f 100644
--- a/samples/bluetooth/pbp_public_broadcast_sink/README.rst
+++ b/samples/bluetooth/pbp_public_broadcast_sink/README.rst
@@ -15,7 +15,7 @@ a High Quality Public Broadcast Audio Stream configuration.
 This sample can be found under
 :zephyr_file:`samples/bluetooth/pbp_public_broadcast_sink` in the Zephyr tree.
 
-Check the :zephyr:code-sample-category:`bluetooth` samples for general information.
+Check the :ref:`bluetooth samples section <bluetooth-samples>` for general information.
 
 Requirements
 ************
diff --git a/samples/bluetooth/pbp_public_broadcast_source/README.rst b/samples/bluetooth/pbp_public_broadcast_source/README.rst
index e1c168cedaf..c12c2b762f4 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/README.rst
+++ b/samples/bluetooth/pbp_public_broadcast_source/README.rst
@@ -15,7 +15,7 @@ every 15 seconds.
 This sample can be found under
 :zephyr_file:`samples/bluetooth/pbp_public_broadcast_source` in the Zephyr tree.
 
-Check the :zephyr:code-sample-category:`bluetooth` samples for general information.
+Check the :ref:`bluetooth samples section <bluetooth-samples>` for general information.
 
 Requirements
 ************
diff --git a/samples/bluetooth/periodic_adv/README.rst b/samples/bluetooth/periodic_adv/README.rst
index 7f0f1f546a0..4613abff7be 100644
--- a/samples/bluetooth/periodic_adv/README.rst
+++ b/samples/bluetooth/periodic_adv/README.rst
@@ -24,4 +24,4 @@ Use the sample found under :zephyr_file:`samples/bluetooth/periodic_sync` in the
 Zephyr tree that will scan and establish a periodic advertising synchronization
 to this sample.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/periodic_adv_conn/README.rst b/samples/bluetooth/periodic_adv_conn/README.rst
index 7ae2095c78b..5b968f19c40 100644
--- a/samples/bluetooth/periodic_adv_conn/README.rst
+++ b/samples/bluetooth/periodic_adv_conn/README.rst
@@ -30,4 +30,4 @@ the Zephyr tree.
 Use the sample found under :zephyr_file:`samples/bluetooth/periodic_sync_conn` in the
 Zephyr tree that will synchronize and respond to this sample.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/periodic_adv_rsp/README.rst b/samples/bluetooth/periodic_adv_rsp/README.rst
index 82575f3d4dd..f9e2e6ded00 100644
--- a/samples/bluetooth/periodic_adv_rsp/README.rst
+++ b/samples/bluetooth/periodic_adv_rsp/README.rst
@@ -36,4 +36,4 @@ the Zephyr tree.
 Use the sample found under :zephyr_file:`samples/bluetooth/periodic_sync_rsp` in the
 Zephyr tree that will synchronize and respond to this sample.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/periodic_sync/README.rst b/samples/bluetooth/periodic_sync/README.rst
index 8dc424cf9c6..72fed008480 100644
--- a/samples/bluetooth/periodic_sync/README.rst
+++ b/samples/bluetooth/periodic_sync/README.rst
@@ -25,4 +25,4 @@ Use the sample found under :zephyr_file:`samples/bluetooth/periodic_adv` on
 another board that will start periodic advertising, to which this sample will
 establish periodic advertising synchronization.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/periodic_sync_conn/README.rst b/samples/bluetooth/periodic_sync_conn/README.rst
index 1ec8aec3d25..510b01454c0 100644
--- a/samples/bluetooth/periodic_sync_conn/README.rst
+++ b/samples/bluetooth/periodic_sync_conn/README.rst
@@ -30,4 +30,4 @@ Use the sample found under :zephyr_file:`samples/bluetooth/periodic_adv_conn` on
 another board that will start periodic advertising and connect to this sample
 once synced.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/periodic_sync_rsp/README.rst b/samples/bluetooth/periodic_sync_rsp/README.rst
index 9c43ae9c4e4..fceb640cca8 100644
--- a/samples/bluetooth/periodic_sync_rsp/README.rst
+++ b/samples/bluetooth/periodic_sync_rsp/README.rst
@@ -38,4 +38,4 @@ Use the sample found under :zephyr_file:`samples/bluetooth/periodic_adv_rsp` on
 another board that will start periodic advertising, which will connect to this
 sample and transfer the synchronization info.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/peripheral/README.rst b/samples/bluetooth/peripheral/README.rst
index 7ce65e8ebd7..33ec088d503 100644
--- a/samples/bluetooth/peripheral/README.rst
+++ b/samples/bluetooth/peripheral/README.rst
@@ -23,4 +23,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/peripheral_accept_list/README.rst b/samples/bluetooth/peripheral_accept_list/README.rst
index 4f405561466..a501dd382e5 100644
--- a/samples/bluetooth/peripheral_accept_list/README.rst
+++ b/samples/bluetooth/peripheral_accept_list/README.rst
@@ -31,4 +31,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_accept_list` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/peripheral_csc/README.rst b/samples/bluetooth/peripheral_csc/README.rst
index aeaa7601db3..2dcbd143345 100644
--- a/samples/bluetooth/peripheral_csc/README.rst
+++ b/samples/bluetooth/peripheral_csc/README.rst
@@ -24,4 +24,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_csc` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/peripheral_dis/README.rst b/samples/bluetooth/peripheral_dis/README.rst
index 44c9591e70b..3d30490009e 100644
--- a/samples/bluetooth/peripheral_dis/README.rst
+++ b/samples/bluetooth/peripheral_dis/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_dis` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/peripheral_esp/README.rst b/samples/bluetooth/peripheral_esp/README.rst
index 100d5b88e24..e6fdc565040 100644
--- a/samples/bluetooth/peripheral_esp/README.rst
+++ b/samples/bluetooth/peripheral_esp/README.rst
@@ -23,4 +23,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_esp` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/peripheral_gatt_write/README.rst b/samples/bluetooth/peripheral_gatt_write/README.rst
index 46c22e82690..5d39f99f3dd 100644
--- a/samples/bluetooth/peripheral_gatt_write/README.rst
+++ b/samples/bluetooth/peripheral_gatt_write/README.rst
@@ -23,4 +23,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_gatt_write`
 in the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/peripheral_hids/README.rst b/samples/bluetooth/peripheral_hids/README.rst
index 53a9ec87ede..72be337fc88 100644
--- a/samples/bluetooth/peripheral_hids/README.rst
+++ b/samples/bluetooth/peripheral_hids/README.rst
@@ -29,4 +29,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_hids` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/peripheral_hr/README.rst b/samples/bluetooth/peripheral_hr/README.rst
index b1e01beda02..c1caa3d90b8 100644
--- a/samples/bluetooth/peripheral_hr/README.rst
+++ b/samples/bluetooth/peripheral_hr/README.rst
@@ -24,4 +24,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_hr` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/peripheral_ht/README.rst b/samples/bluetooth/peripheral_ht/README.rst
index b0bdb080b57..498b3d38a01 100644
--- a/samples/bluetooth/peripheral_ht/README.rst
+++ b/samples/bluetooth/peripheral_ht/README.rst
@@ -27,4 +27,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_ht` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/peripheral_identity/README.rst b/samples/bluetooth/peripheral_identity/README.rst
index cc67c426801..bb56c48168f 100644
--- a/samples/bluetooth/peripheral_identity/README.rst
+++ b/samples/bluetooth/peripheral_identity/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_identity`
 in the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/peripheral_nus/README.rst b/samples/bluetooth/peripheral_nus/README.rst
index 419464e87d5..bf5be7126b3 100644
--- a/samples/bluetooth/peripheral_nus/README.rst
+++ b/samples/bluetooth/peripheral_nus/README.rst
@@ -24,4 +24,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_nus` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/peripheral_ots/README.rst b/samples/bluetooth/peripheral_ots/README.rst
index 83176747188..1e26dfcf305 100644
--- a/samples/bluetooth/peripheral_ots/README.rst
+++ b/samples/bluetooth/peripheral_ots/README.rst
@@ -22,4 +22,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_ots` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/peripheral_past/README.rst b/samples/bluetooth/peripheral_past/README.rst
index 543771ce092..22190ebb2c3 100644
--- a/samples/bluetooth/peripheral_past/README.rst
+++ b/samples/bluetooth/peripheral_past/README.rst
@@ -25,4 +25,4 @@ Use the sample found under :zephyr_file:`samples/bluetooth/central_past` on
 another board that will connect to this and transfer a periodic advertisement
 sync.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/peripheral_sc_only/README.rst b/samples/bluetooth/peripheral_sc_only/README.rst
index ba48d3c6a0f..bbf73b748eb 100644
--- a/samples/bluetooth/peripheral_sc_only/README.rst
+++ b/samples/bluetooth/peripheral_sc_only/README.rst
@@ -24,4 +24,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/peripheral_sc_only`
 in the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/scan_adv/README.rst b/samples/bluetooth/scan_adv/README.rst
index d2c476e3fd2..7fbfc54f4c8 100644
--- a/samples/bluetooth/scan_adv/README.rst
+++ b/samples/bluetooth/scan_adv/README.rst
@@ -25,4 +25,4 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/scan_adv` in the
 Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/st_ble_sensor/README.rst b/samples/bluetooth/st_ble_sensor/README.rst
index b1cad9d78e8..88257ed7f05 100644
--- a/samples/bluetooth/st_ble_sensor/README.rst
+++ b/samples/bluetooth/st_ble_sensor/README.rst
@@ -29,7 +29,7 @@ To connect click on the device shown in the Device List.
 After connected, tap LED image on Android to test LED service.
 Push SW0 button on embedded device to test button service.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
 
 .. _ST Bluetooth LE Sensor Android app:
     https://play.google.com/store/apps/details?id=com.st.bluems
diff --git a/samples/bluetooth/tmap_bmr/README.rst b/samples/bluetooth/tmap_bmr/README.rst
index 2f7f5df2bab..356ab6f2abf 100644
--- a/samples/bluetooth/tmap_bmr/README.rst
+++ b/samples/bluetooth/tmap_bmr/README.rst
@@ -19,4 +19,4 @@ Building and Running
 ********************
 This sample can be found under :zephyr_file:`samples/bluetooth/tmap_bmr` in the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/tmap_bms/README.rst b/samples/bluetooth/tmap_bms/README.rst
index ac648ead315..a5f19fdbf45 100644
--- a/samples/bluetooth/tmap_bms/README.rst
+++ b/samples/bluetooth/tmap_bms/README.rst
@@ -20,4 +20,4 @@ Building and Running
 ********************
 This sample can be found under :zephyr_file:`samples/bluetooth/tmap_bms` in the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/tmap_central/README.rst b/samples/bluetooth/tmap_central/README.rst
index 9a89fb87ee5..8195b79ecce 100644
--- a/samples/bluetooth/tmap_central/README.rst
+++ b/samples/bluetooth/tmap_central/README.rst
@@ -20,4 +20,4 @@ Building and Running
 This sample can be found under
 :zephyr_file:`samples/bluetooth/tmap_central` in the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/bluetooth/tmap_peripheral/README.rst b/samples/bluetooth/tmap_peripheral/README.rst
index b0888224537..d0ebd02e548 100644
--- a/samples/bluetooth/tmap_peripheral/README.rst
+++ b/samples/bluetooth/tmap_peripheral/README.rst
@@ -20,4 +20,4 @@ Building and Running
 This sample can be found under
 :zephyr_file:`samples/bluetooth/tmap_peripheral` in the Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/boards/96boards/argonkey/index.rst b/samples/boards/96boards/argonkey/index.rst
index 5720889c884..2713379253d 100644
--- a/samples/boards/96boards/argonkey/index.rst
+++ b/samples/boards/96boards/argonkey/index.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: 96b_argonkey
-   :name: 96Boards ArgonKey
-   :show-listing:
+.. _argonkey-samples:
 
-   Samples that demonstrate some board-specific features on 96Boards ArgonKey.
+Argonkey Samples
+################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   */*
diff --git a/samples/boards/96boards/index.rst b/samples/boards/96boards/index.rst
index 3cab6851eca..0a024b7cf27 100644
--- a/samples/boards/96boards/index.rst
+++ b/samples/boards/96boards/index.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: 96boards
-   :name: 96Boards
-   :show-listing:
+.. _96boards_samples:
 
-   These samples showcase the use of 96Boards in Zephyr.
+96Boards
+========
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   */*
diff --git a/samples/boards/arc_secure_services/README.rst b/samples/boards/arc_secure_services/README.rst
index a7744af7812..e63a9b9e910 100644
--- a/samples/boards/arc_secure_services/README.rst
+++ b/samples/boards/arc_secure_services/README.rst
@@ -1,5 +1,3 @@
-:orphan:
-
 .. _arc_secure_service:
 
 ARC Secure Service
diff --git a/samples/boards/bbc/index.rst b/samples/boards/bbc/index.rst
index f6b69ecd3d7..73d1dc1adba 100644
--- a/samples/boards/bbc/index.rst
+++ b/samples/boards/bbc/index.rst
@@ -1,5 +1,11 @@
-.. zephyr:code-sample-category:: bbc
-   :name: BBC
-   :show-listing:
+.. _bbc_samples:
 
-   These samples showcase the use of BBC boards in Zephyr.
+BBC
+===
+
+.. toctree::
+   :titlesonly:
+   :maxdepth: 1
+   :glob:
+
+   */*
diff --git a/samples/boards/bbc/microbit/microbit.rst b/samples/boards/bbc/microbit/microbit.rst
index 907a63577b0..3a325452a49 100644
--- a/samples/boards/bbc/microbit/microbit.rst
+++ b/samples/boards/bbc/microbit/microbit.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: bbc_microbit
-   :name: BBC micro:bit
-   :show-listing:
+.. _microbit-samples:
 
-   Samples that demonstrate some board-specific features on BBC micro:bit.
+BBC micro:bit Samples
+#####################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/boards/boards.rst b/samples/boards/boards.rst
index 424101b8625..c5433a6a9fe 100644
--- a/samples/boards/boards.rst
+++ b/samples/boards/boards.rst
@@ -1,5 +1,11 @@
-.. zephyr:code-sample-category:: boards
-   :name: Boards
-   :show-listing:
+.. _board-specific-samples:
 
-   These samples demonstrate some board-specific features in Zephyr.
+Board-specific samples
+######################
+
+.. toctree::
+   :titlesonly:
+   :maxdepth: 2
+   :glob:
+
+   */*
diff --git a/samples/boards/enjoydigital/index.rst b/samples/boards/enjoydigital/index.rst
index d0df43c338a..9b75eca52e1 100644
--- a/samples/boards/enjoydigital/index.rst
+++ b/samples/boards/enjoydigital/index.rst
@@ -1,6 +1,10 @@
-.. zephyr:code-sample-category:: enjoydigital
-   :name: EnjoyDigital
-   :show-listing:
-   :glob: **/*
+.. _enjoydigital_samples:
 
-   These samples showcase the use of EnjoyDigital boards in Zephyr.
+EnjoyDigital
+============
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   **/*
diff --git a/samples/boards/enjoydigital/litex/i2s/README.rst b/samples/boards/enjoydigital/litex/i2s/README.rst
index eb8a0cde6af..3e0e35ba800 100644
--- a/samples/boards/enjoydigital/litex/i2s/README.rst
+++ b/samples/boards/enjoydigital/litex/i2s/README.rst
@@ -1,5 +1,3 @@
-:orphan:
-
 .. _i2s_litex_example:
 
 #####################
diff --git a/samples/boards/espressif/index.rst b/samples/boards/espressif/index.rst
index 56a8eaba580..525e8e831a9 100644
--- a/samples/boards/espressif/index.rst
+++ b/samples/boards/espressif/index.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: espressif
-   :name: Espressif ESP32 boards
-   :show-listing:
+.. _espressif_samples:
 
-   Samples that demonstrate the use of Espressif ESP32 boards in Zephyr.
+Espressif
+=========
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   **/*
diff --git a/samples/boards/google/index.rst b/samples/boards/google/index.rst
index 38765be0389..ba16924e063 100644
--- a/samples/boards/google/index.rst
+++ b/samples/boards/google/index.rst
@@ -1,6 +1,10 @@
-.. zephyr:code-sample-category:: Google
-   :name: Google
-   :show-listing:
-   :glob: **/*
+.. _google_samples:
 
-   These samples showcase the use of Google boards in Zephyr.
+Google
+======
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   **/*
diff --git a/samples/boards/intel/index.rst b/samples/boards/intel/index.rst
index 3f2ffe22145..737134a5529 100644
--- a/samples/boards/intel/index.rst
+++ b/samples/boards/intel/index.rst
@@ -1,6 +1,10 @@
-.. zephyr:code-sample-category:: intel
-   :name: Intel
-   :show-listing:
-   :glob: **/*
+.. _intel_samples:
 
-   These samples showcase the use of Intel boards in Zephyr.
+Intel
+=====
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   **/*
diff --git a/samples/boards/microchip/index.rst b/samples/boards/microchip/index.rst
index cabaa322cca..85e4926721e 100644
--- a/samples/boards/microchip/index.rst
+++ b/samples/boards/microchip/index.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: microchip
-   :name: Microchip
-   :show-listing:
+.. _microchip_samples:
 
-   These samples showcase the use of Microchip boards in Zephyr.
+Microchip
+=========
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   **/*
diff --git a/samples/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853.rst b/samples/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853.rst
index 6961892cc63..e4337f43181 100644
--- a/samples/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853.rst
+++ b/samples/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: mec15xxevb_assy6853
-   :name: MEC15xxEVB Reference Board
-   :show-listing:
+.. _mec15xxevb_assy6853-samples:
 
-   These samples showcase the use of MEC15xxEVB Reference Board in Zephyr.
+MEC15xxEVB Reference Board Samples
+##################################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/boards/nordic/index.rst b/samples/boards/nordic/index.rst
index 9559a68ea52..01d44950439 100644
--- a/samples/boards/nordic/index.rst
+++ b/samples/boards/nordic/index.rst
@@ -1,6 +1,10 @@
-.. zephyr:code-sample-category:: nordic
-   :name: Nordic Semiconductor
-   :show-listing:
-   :glob: **/*
+.. _nordic_samples:
 
-   These samples showcase the use of Nordic Semiconductor boards in Zephyr.
+Nordic Semiconductor
+====================
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   **/*
diff --git a/samples/boards/nordic/mesh/onoff-app/README.rst b/samples/boards/nordic/mesh/onoff-app/README.rst
index c09498b1103..64051709a22 100644
--- a/samples/boards/nordic/mesh/onoff-app/README.rst
+++ b/samples/boards/nordic/mesh/onoff-app/README.rst
@@ -97,4 +97,4 @@ Group addresses are not supported.
 This application was derived from the sample mesh skeleton at
 :zephyr_file:`samples/bluetooth/mesh`.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/README.rst b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/README.rst
index 5392b9c5407..1139581efe2 100644
--- a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/README.rst
+++ b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/README.rst
@@ -114,4 +114,4 @@ Group addresses are not supported.
 This application was derived from the sample mesh skeleton at
 :zephyr_file:`samples/bluetooth/mesh`.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+See :ref:`bluetooth samples section <bluetooth-samples>` for details.
diff --git a/samples/boards/nxp/index.rst b/samples/boards/nxp/index.rst
index dba7cb6e829..318bc81e0bb 100644
--- a/samples/boards/nxp/index.rst
+++ b/samples/boards/nxp/index.rst
@@ -1,6 +1,10 @@
-.. zephyr:code-sample-category:: nxp
-   :name: NXP
-   :show-listing:
-   :glob: **/*
+.. _nxp_samples:
 
-   These samples showcase the use of NXP boards in Zephyr.
+NXP
+===
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   **/*
diff --git a/samples/boards/phytec/index.rst b/samples/boards/phytec/index.rst
index 3402c63f44e..81f1d5f2f38 100644
--- a/samples/boards/phytec/index.rst
+++ b/samples/boards/phytec/index.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: phytec
-   :name: PHYTEC
-   :show-listing:
+.. _phytec_samples:
 
-   These samples showcase the use of PHYTEC boards in Zephyr.
+PHYTEC
+======
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   **/*
diff --git a/samples/boards/phytec/reel_board/index.rst b/samples/boards/phytec/reel_board/index.rst
deleted file mode 100644
index f43c8677bb9..00000000000
--- a/samples/boards/phytec/reel_board/index.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: reelboard
-   :name: reel board
-   :show-listing:
-
-   Samples that demonstrate some board-specific features on reel board.
diff --git a/samples/boards/phytec/reel_board/mesh_badge/README.rst b/samples/boards/phytec/reel_board/mesh_badge/README.rst
index 74d30f61081..ef00511edd4 100644
--- a/samples/boards/phytec/reel_board/mesh_badge/README.rst
+++ b/samples/boards/phytec/reel_board/mesh_badge/README.rst
@@ -7,7 +7,7 @@
 Overview
 ********
 
-This sample app for the reel board showcases Bluetooth Mesh.
+This sample app for the reel board showcases Bluetooth Mesh
 
 The app starts off as a regular Bluetooth GATT peripheral application.
 Install the "nRF Connect" app on your phone (available both for
diff --git a/samples/boards/quicklogic/index.rst b/samples/boards/quicklogic/index.rst
index bf8e563ee15..9de957464e2 100644
--- a/samples/boards/quicklogic/index.rst
+++ b/samples/boards/quicklogic/index.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: quicklogic
-   :name: QuickLogic
-   :show-listing:
+.. _quicklogic_samples:
 
-   These samples showcase the use of QuickLogic boards in Zephyr.
+QuickLogic Corp.
+================
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   **/*
diff --git a/samples/boards/st/bluetooth/index.rst b/samples/boards/st/bluetooth/index.rst
deleted file mode 100644
index 4e791b6a9bc..00000000000
--- a/samples/boards/st/bluetooth/index.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: stm32_bluetooth
-   :name: Bluetooth
-   :show-listing:
-
-   Samples that demonstrate the use of Bluetooth on STM32 boards.
diff --git a/samples/boards/st/index.rst b/samples/boards/st/index.rst
index 2fbf890669d..06ccf192ab6 100644
--- a/samples/boards/st/index.rst
+++ b/samples/boards/st/index.rst
@@ -1,6 +1,10 @@
-.. zephyr:code-sample-category:: st
-   :name: STMicroelectronics
-   :show-listing:
-   :glob: **/*
+.. _st_samples:
 
-   Samples that demonstrate some board-specific features on STM32 boards.
+STMicroelectronics
+==================
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   **/*
diff --git a/samples/boards/st/power_mgmt/index.rst b/samples/boards/st/power_mgmt/index.rst
deleted file mode 100644
index 3ab69379b60..00000000000
--- a/samples/boards/st/power_mgmt/index.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: stm32_pm
-   :name: Power Management
-   :show-listing:
-
-   Samples that demonstrate the use of power management features on STM32 boards.
diff --git a/samples/boards/ti/index.rst b/samples/boards/ti/index.rst
index 349b72f0801..ad970714f40 100644
--- a/samples/boards/ti/index.rst
+++ b/samples/boards/ti/index.rst
@@ -1,6 +1,10 @@
-.. zephyr:code-sample-category:: ti
-   :name: Texas Instruments
-   :show-listing:
-   :glob: **/*
+.. _ti_samples:
 
-   These samples showcase the use of Texas Instruments boards in Zephyr.
+Texas Instruments
+=================
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   **/*
diff --git a/samples/classic.rst b/samples/classic.rst
new file mode 100644
index 00000000000..707d1a590eb
--- /dev/null
+++ b/samples/classic.rst
@@ -0,0 +1,15 @@
+.. _classic_samples:
+
+Classic Samples
+###############
+
+The following are samples that can be run on any of the supported
+platforms:
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   hello_world/*
+   synchronization/*
+   philosophers/*
diff --git a/samples/cpp/cpp.rst b/samples/cpp/cpp.rst
index 4722683a9ee..aeecebadcca 100644
--- a/samples/cpp/cpp.rst
+++ b/samples/cpp/cpp.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: cpp
-   :name: C++
-   :show-listing:
+.. _cpp-samples:
 
-   These samples demonstrate how to write Zephyr applications in C++.
+C++ Samples
+###########
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/drivers/adc/index.rst b/samples/drivers/adc/index.rst
deleted file mode 100644
index c1e9a2abfa6..00000000000
--- a/samples/drivers/adc/index.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: adc
-   :name: ADC
-   :show-listing:
-
-   These samples demonstrate how to use the ADC driver API.
diff --git a/samples/drivers/audio/index.rst b/samples/drivers/audio/index.rst
deleted file mode 100644
index 46e68b287df..00000000000
--- a/samples/drivers/audio/index.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: audio
-   :name: Audio
-   :show-listing:
-
-   These sample demonstrate how to use the :ref:`Audio driver <audio_reference>` API.
diff --git a/samples/drivers/can/index.rst b/samples/drivers/can/index.rst
deleted file mode 100644
index c085669fbbb..00000000000
--- a/samples/drivers/can/index.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: can
-   :name: Controller Area Network (CAN)
-   :show-listing:
-
-   These samples demonstrate how to use the :ref:`can` driver API.
diff --git a/samples/drivers/counter/index.rst b/samples/drivers/counter/index.rst
deleted file mode 100644
index ff5ebf8932d..00000000000
--- a/samples/drivers/counter/index.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: counter
-   :name: Counter
-   :show-listing:
-
-   These samples demonstrate how to use the :ref:`counter_api` driver API.
diff --git a/samples/drivers/drivers.rst b/samples/drivers/drivers.rst
index 24b9578a6e9..84c5426094a 100644
--- a/samples/drivers/drivers.rst
+++ b/samples/drivers/drivers.rst
@@ -1,6 +1,13 @@
-.. zephyr:code-sample-category:: drivers
-   :name: Drivers
-   :show-listing:
-   :live-search:
+.. _driver-samples:
 
-   These samples demonstrate how to use various drivers supported by Zephyr.
+Driver Samples
+##############
+
+The following samples demonstrate how to use various drivers supported
+by Zephyr.
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/drivers/ethernet/index.rst b/samples/drivers/ethernet/index.rst
deleted file mode 100644
index 8b46ca0f725..00000000000
--- a/samples/drivers/ethernet/index.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: ethernet
-   :name: Ethernet
-   :show-listing:
-
-   These samples demonstrate how to use the :ref:`Ethernet <ethernet_interface>` driver API.
diff --git a/samples/drivers/fpga/index.rst b/samples/drivers/fpga/index.rst
deleted file mode 100644
index 395a953740b..00000000000
--- a/samples/drivers/fpga/index.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: fpga
-   :name: FPGA
-   :show-listing:
-
-   These samples demonstrate how to use the FPGA driver API.
diff --git a/samples/drivers/haptics/README.rst b/samples/drivers/haptics/README.rst
deleted file mode 100644
index d4e08884b80..00000000000
--- a/samples/drivers/haptics/README.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: haptics
-   :name: Haptics
-   :show-listing:
-
-   These samples demonstrate how to use the :ref:`haptics_api` driver API.
diff --git a/samples/drivers/i2c/README.rst b/samples/drivers/i2c/README.rst
deleted file mode 100644
index 9e934001301..00000000000
--- a/samples/drivers/i2c/README.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: i2c
-   :name: Inter-Integrated Circuit (I2C) Bus
-   :show-listing:
-
-   These samples demonstrate how to use the :ref:`I2C <i2c_api>` driver API.
diff --git a/samples/drivers/i2s/README.rst b/samples/drivers/i2s/README.rst
deleted file mode 100644
index 8243878f3a5..00000000000
--- a/samples/drivers/i2s/README.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: i2s
-   :name: I2S
-   :show-listing:
-
-   These samples demonstrate how to use the I2S driver API.
diff --git a/samples/drivers/ipm/README.rst b/samples/drivers/ipm/README.rst
deleted file mode 100644
index e3a1f40a6fb..00000000000
--- a/samples/drivers/ipm/README.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: ipm
-   :name: Inter-Processor Mailbox (IPM)
-   :show-listing:
-
-   These samples demonstrate how to use the :ref:`IPM <ipm_api>` driver API.
diff --git a/samples/drivers/led/index.rst b/samples/drivers/led/index.rst
deleted file mode 100644
index 30dbf504131..00000000000
--- a/samples/drivers/led/index.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: led
-   :name: Light-Emitting Diode (LED)
-   :show-listing:
-
-   These samples demonstrate how to use the LED driver API.
diff --git a/samples/drivers/lora/index.rst b/samples/drivers/lora/index.rst
deleted file mode 100644
index 8156d9d2638..00000000000
--- a/samples/drivers/lora/index.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-.. zephyr:code-sample-category:: lora
-   :name: LoRa
-   :show-listing:
-
-   These samples demonstrate how to use :ref:`LoRa <lora_api>` for long-range wireless
-   communication.
diff --git a/samples/drivers/misc/README.rst b/samples/drivers/misc/README.rst
deleted file mode 100644
index 2c4101f51d1..00000000000
--- a/samples/drivers/misc/README.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: misc_drivers
-   :name: Miscellaneous
-   :show-listing:
-
-   These samples demonstrate how to use miscellaneous driver APIs.
diff --git a/samples/drivers/mspi/index.rst b/samples/drivers/mspi/index.rst
deleted file mode 100644
index 3cd994ba127..00000000000
--- a/samples/drivers/mspi/index.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: mspi
-   :name: Multi-bit SPI Bus (MSPI)
-   :show-listing:
-
-   These samples demonstrate how to use the :ref:`MSPI <mspi_api>` driver API.
diff --git a/samples/drivers/uart/README.rst b/samples/drivers/uart/README.rst
deleted file mode 100644
index 4501bd73a3d..00000000000
--- a/samples/drivers/uart/README.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: uart
-   :name: Universal Asynchronous Receiver-Transmitter (UART)
-   :show-listing:
-
-   These samples demonstrate how to use the :ref:`UART <uart_api>` driver API.
diff --git a/samples/drivers/video/video.rst b/samples/drivers/video/video.rst
index 99a4b24449e..326a337f05b 100644
--- a/samples/drivers/video/video.rst
+++ b/samples/drivers/video/video.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: video
-   :name: Video
-   :show-listing:
+.. _video-samples:
 
-   These samples demonstrate how to use the :ref:`video <video_api>` driver API.
+Video Samples
+#############
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/drivers/virtualization/index.rst b/samples/drivers/virtualization/index.rst
deleted file mode 100644
index 0716ac7bd37..00000000000
--- a/samples/drivers/virtualization/index.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-.. zephyr:code-sample-category:: virtualization
-   :name: Virtualization
-   :show-listing:
-   :glob: **/*
-
-   These samples demonstrate some of the virtualization capabilities of Zephyr.
diff --git a/samples/drivers/w1/README.rst b/samples/drivers/w1/README.rst
deleted file mode 100644
index 7025ee7e0b4..00000000000
--- a/samples/drivers/w1/README.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: w1
-   :name: 1-Wire
-   :show-listing:
-
-   These samples demonstrate how to use the :ref:`1-Wire <w1_api>` driver API.
diff --git a/samples/fuel_gauge/fuel_gauge.rst b/samples/fuel_gauge/fuel_gauge.rst
index 01df07c8aaa..979180fb72b 100644
--- a/samples/fuel_gauge/fuel_gauge.rst
+++ b/samples/fuel_gauge/fuel_gauge.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: fuel_gauge
-   :name: Fuel Gauge
-   :show-listing:
+.. _fuel_gauge-samples:
 
-   Samples that show how to interact with :ref:`fuel_gauge_api`.
+Fuel Gauge Samples
+##################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/fuel_gauge/max17048/README.rst b/samples/fuel_gauge/max17048/README.rst
index cdb08e1e4ec..f2fd2618220 100644
--- a/samples/fuel_gauge/max17048/README.rst
+++ b/samples/fuel_gauge/max17048/README.rst
@@ -1,7 +1,7 @@
-.. zephyr:code-sample:: max17048
-   :name: MAX17048 Li-Ion battery fuel gauge
+.. _MAX17048_sample:
 
-   Read battery percentage and power status using MAX17048 fuel gauge.
+MAX17048 Li-Ion battery fuel gauge
+###################################
 
 Overview
 ********
diff --git a/samples/index.rst b/samples/index.rst
index 40151ea0915..d8f28152c73 100644
--- a/samples/index.rst
+++ b/samples/index.rst
@@ -1,23 +1,35 @@
-.. zephyr:code-sample-category:: samples
-   :name: Samples and Demos
+.. _samples-and-demos:
 
-Zephyr offers a comprehensive collection of samples and demos that highlight the features of the
-kernel and its subsystems.
+Samples and Demos
+#################
 
-These samples are crafted to be simple and easy to understand, serving as a starting point for your
-own projects.
-
-We welcome contributions of new samples to the project and you are encouraged to read more about
-the :ref:`definition_and_criteria` if you are interested in submitting your own sample.
-
-.. zephyr:code-sample-listing::
-   :categories: samples
-   :live-search:
 
 .. toctree::
    :titlesonly:
-   :maxdepth: 1
-   :hidden:
+   :maxdepth: 2
    :glob:
 
    sample_definition_and_criteria
+   classic
+   basic/*
+   userspace/*
+   sysbuild/*
+   subsys/subsys.rst
+   net/net.rst
+   bluetooth/bluetooth.rst
+   sensor/*
+   arch/*
+   boards/*
+   drivers/drivers.rst
+   application_development/*
+   shields/*
+   cpp/*
+   posix/*
+   kernel/*
+   tfm_integration/tfm_integration.rst
+   modules/*
+   fuel_gauge/*
+
+.. comment
+   To add a new sample document, please use the template available under
+   ``doc/templates/sample.tmpl``
diff --git a/samples/kernel/condition_variables/simple/README.rst b/samples/kernel/condition_variables/simple/README.rst
index b3db950dd58..2977b72cc97 100644
--- a/samples/kernel/condition_variables/simple/README.rst
+++ b/samples/kernel/condition_variables/simple/README.rst
@@ -1,5 +1,3 @@
-:orphan:
-
 .. _samples_kernel_simple_condition_variables:
 
 Condition Variables
diff --git a/samples/kernel/index.rst b/samples/kernel/index.rst
index 710a4bda95c..13c31ecb31a 100644
--- a/samples/kernel/index.rst
+++ b/samples/kernel/index.rst
@@ -1,6 +1,10 @@
-.. zephyr:code-sample-category:: kernel
-   :name: Kernel and Scheduler
-   :show-listing:
-   :glob: **/*
+.. _kernel-samples:
 
-   These samples demonstrate how to use various kernel and scheduler features.
+Various Kernel and Scheduler Samples
+####################################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/modules/cmsis_dsp/cmsis_dsp.rst b/samples/modules/cmsis_dsp/cmsis_dsp.rst
index 0506721f4e0..dce6b8cad96 100644
--- a/samples/modules/cmsis_dsp/cmsis_dsp.rst
+++ b/samples/modules/cmsis_dsp/cmsis_dsp.rst
@@ -1,6 +1,12 @@
-.. zephyr:code-sample-category:: cmsis_dsp
-   :name: CMSIS-DSP
-   :show-listing:
+CMSIS-DSP
+#########
 
-   These samples demonstrate how to use the CMSIS-DSP module to perform signal processing operations
-   in Zephyr.
+These samples demonstrate how to use the CMSIS-DSP module to perform signal processing operations
+in Zephyr.
+
+.. toctree::
+   :titlesonly:
+   :glob:
+   :maxdepth: 1
+
+   */*
diff --git a/samples/modules/compression/compression.rst b/samples/modules/compression/compression.rst
index 095c326584e..9cc3cd3d3c3 100644
--- a/samples/modules/compression/compression.rst
+++ b/samples/modules/compression/compression.rst
@@ -1,3 +1,10 @@
-.. zephyr:code-sample-category:: compression
-   :name: Compression
-   :show-listing:
+.. _compression-samples:
+
+Compression Samples
+###################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/modules/index.rst b/samples/modules/index.rst
index 8c5c9b47aa3..c40b9fe7850 100644
--- a/samples/modules/index.rst
+++ b/samples/modules/index.rst
@@ -1,5 +1,11 @@
-.. zephyr:code-sample-category:: modules
-   :name: External modules
-   :show-listing:
+.. _module-samples:
 
-   These samples demonstrate the use of external modules in Zephyr.
+External Module Samples
+#######################
+
+.. toctree::
+   :titlesonly:
+   :maxdepth: 2
+   :glob:
+
+   */*
diff --git a/samples/modules/lvgl/lvgl.rst b/samples/modules/lvgl/lvgl.rst
index fa2ca5459c7..736ddd1a00b 100644
--- a/samples/modules/lvgl/lvgl.rst
+++ b/samples/modules/lvgl/lvgl.rst
@@ -1,5 +1,13 @@
-.. zephyr:code-sample-category:: lvgl
-   :name: LVGL
-   :show-listing:
+.. _lvgl_samples:
 
-   These samples demonstrate how to build graphical user interfaces using LVGL in Zephyr.
+LVGL
+####
+
+These samples demonstrate how to build graphical user interfaces using LVGL in Zephyr.
+
+.. toctree::
+   :titlesonly:
+   :glob:
+   :maxdepth: 1
+
+   **/*
diff --git a/samples/modules/tflite-micro/tflite-micro.rst b/samples/modules/tflite-micro/tflite-micro.rst
index 316791c7271..861618a645b 100644
--- a/samples/modules/tflite-micro/tflite-micro.rst
+++ b/samples/modules/tflite-micro/tflite-micro.rst
@@ -1,5 +1,13 @@
-.. zephyr:code-sample-category:: tflite-micro
-   :name: TensorFlow Lite for Microcontrollers
-   :show-listing:
+.. _tflitemicro_samples:
 
-   These samples demonstrate how to use TensorFlow Lite for Microcontrollers in Zephyr.
+TensorFlow Lite for Microcontrollers
+####################################
+
+These samples demonstrate how to use TensorFlow Lite for Microcontrollers in Zephyr.
+
+.. toctree::
+   :titlesonly:
+   :glob:
+   :maxdepth: 1
+
+   **/*
diff --git a/samples/modules/thrift/thrift.rst b/samples/modules/thrift/thrift.rst
index 9d6f86734d3..3ea28f1831b 100644
--- a/samples/modules/thrift/thrift.rst
+++ b/samples/modules/thrift/thrift.rst
@@ -1,5 +1,11 @@
-.. zephyr:code-sample-category:: thrift
-   :name: Apache Thrift
-   :show-listing:
+Apache Thrift
+=============
 
-   These samples demonstrate how to use Apache Thrift in Zephyr.
+These samples demonstrate how to use Apache Thrift in Zephyr.
+
+.. toctree::
+   :titlesonly:
+   :glob:
+   :maxdepth: 1
+
+   */*
diff --git a/samples/net/cloud/README.rst b/samples/net/cloud/README.rst
deleted file mode 100644
index 8bc388d36f1..00000000000
--- a/samples/net/cloud/README.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: cloud
-   :name: IoT Cloud
-   :show-listing:
-
-   These samples demonstrate how to connect Zephyr devices to various IoT cloud services.
diff --git a/samples/net/net.rst b/samples/net/net.rst
index 7359b8c171b..cbccd04fdf8 100644
--- a/samples/net/net.rst
+++ b/samples/net/net.rst
@@ -1,6 +1,10 @@
-.. zephyr:code-sample-category:: net
-   :name: Networking
-   :show-listing:
-   :live-search:
+.. _networking-samples:
 
-   These samples demonstrate how to use the networking subsystem.
+Networking Samples
+##################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/net/openthread/coprocessor/README.rst b/samples/net/openthread/coprocessor/README.rst
index 373fbdf8f59..5fbf49c8368 100644
--- a/samples/net/openthread/coprocessor/README.rst
+++ b/samples/net/openthread/coprocessor/README.rst
@@ -1,5 +1,3 @@
-:orphan:
-
 .. zephyr:code-sample:: coprocessor
    :name: OpenThread co-processor
    :relevant-api: openthread
diff --git a/samples/net/sockets/sockets.rst b/samples/net/sockets/sockets.rst
deleted file mode 100644
index edeaab1ffcc..00000000000
--- a/samples/net/sockets/sockets.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: sockets
-   :name: Sockets API
-   :show-listing:
-
-   These samples demonstrate how to use the :ref:`bsd_sockets_interface` API.
diff --git a/samples/posix/posix.rst b/samples/posix/posix.rst
index 2e975069b66..f7d026eb2cd 100644
--- a/samples/posix/posix.rst
+++ b/samples/posix/posix.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: posix
-   :name: POSIX API
-   :show-listing:
+.. _posix-samples:
 
-   These samples demonstrate how to use the :ref:`POSIX API <posix_support>` in Zephyr.
+POSIX API Samples
+#################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/sensor/sensor.rst b/samples/sensor/sensor.rst
index dfc882c2fab..567574977dc 100644
--- a/samples/sensor/sensor.rst
+++ b/samples/sensor/sensor.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: sensors
-   :name: Sensors
-   :show-listing:
+.. _sensor-samples:
 
-   These samples demonstrate how to use various sensors supported by Zephyr.
+Sensor Samples
+##############
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/shields/npm1300_ek/doc/index.rst b/samples/shields/npm1300_ek/doc/index.rst
index be2e8db34cf..4761ba6f8a2 100644
--- a/samples/shields/npm1300_ek/doc/index.rst
+++ b/samples/shields/npm1300_ek/doc/index.rst
@@ -1,7 +1,7 @@
-.. zephyr:code-sample:: npm1300_ek
-   :name: nPM1300 EK
+.. _npm1300_ek_sample:
 
-   Interact with the nPM1300 PMIC using the shell interface.
+nPM1300 EK sample
+#################
 
 Overview
 ********
diff --git a/samples/shields/npm6001_ek/doc/index.rst b/samples/shields/npm6001_ek/doc/index.rst
index 394adb2c56b..13e4f64ce29 100644
--- a/samples/shields/npm6001_ek/doc/index.rst
+++ b/samples/shields/npm6001_ek/doc/index.rst
@@ -1,7 +1,7 @@
-.. zephyr:code-sample:: npm6001_ek
-   :name: nPM6001 EK
+.. _npm6001_ek_sample:
 
-   Interact with the nPM6001 PMIC using the shell interface.
+nPM6001 EK sample
+#################
 
 Overview
 ********
diff --git a/samples/shields/shields.rst b/samples/shields/shields.rst
index f1cea031eeb..52f436fd93c 100644
--- a/samples/shields/shields.rst
+++ b/samples/shields/shields.rst
@@ -1,6 +1,10 @@
-.. zephyr:code-sample-category:: shields
-   :name: Shields
-   :show-listing:
-   :glob: **/*
+.. _shields-samples:
 
-   Samples that demonstrate the use of shields in Zephyr.
+Shields Samples
+###############
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/shields/x_nucleo_iks01a2/README.rst b/samples/shields/x_nucleo_iks01a2/README.rst
deleted file mode 100644
index 1a5c865570e..00000000000
--- a/samples/shields/x_nucleo_iks01a2/README.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: x_nucleo_iks01a2
-   :name: X-NUCLEO-IKS01A2 shield
-   :show-listing:
-
-   These samples showcase various features of the X-NUCLEO-IKS01A2 shield.
diff --git a/samples/shields/x_nucleo_iks01a3/README.rst b/samples/shields/x_nucleo_iks01a3/README.rst
deleted file mode 100644
index 35f4cdd94e2..00000000000
--- a/samples/shields/x_nucleo_iks01a3/README.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: x_nucleo_iks01a3
-   :name: X-NUCLEO-IKS01A3 shield
-   :show-listing:
-
-   These samples showcase various features of the X-NUCLEO-IKS01A3 shield.
diff --git a/samples/shields/x_nucleo_iks02a1/README.rst b/samples/shields/x_nucleo_iks02a1/README.rst
deleted file mode 100644
index 59aec43bcff..00000000000
--- a/samples/shields/x_nucleo_iks02a1/README.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: x_nucleo_iks02a1
-   :name: X-NUCLEO-IKS02A1 shield
-   :show-listing:
-
-   These samples showcase various features of the X-NUCLEO-IKS02A1 shield.
diff --git a/samples/shields/x_nucleo_iks4a1/README.rst b/samples/shields/x_nucleo_iks4a1/README.rst
deleted file mode 100644
index 4e0861f42aa..00000000000
--- a/samples/shields/x_nucleo_iks4a1/README.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. zephyr:code-sample-category:: x_nucleo_iks4a1
-   :name: X-NUCLEO-IKS4A1 shield
-   :show-listing:
-
-   These samples showcase various features of the X-NUCLEO-IKS4A1 shield.
diff --git a/samples/subsys/bindesc/bindesc.rst b/samples/subsys/bindesc/bindesc.rst
index 5efd18abbe6..105d6f80dc8 100644
--- a/samples/subsys/bindesc/bindesc.rst
+++ b/samples/subsys/bindesc/bindesc.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: bindesc
-   :name: Binary Descriptor
-   :show-listing:
+.. _bindesc_samples:
 
-   Samples that demonstrate how to use :ref:`binary_descriptors`.
+Binary Descriptor Samples
+#########################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/subsys/canbus/canbus.rst b/samples/subsys/canbus/canbus.rst
index cfc8c75756a..8772cc5ff9a 100644
--- a/samples/subsys/canbus/canbus.rst
+++ b/samples/subsys/canbus/canbus.rst
@@ -8,10 +8,3 @@ Controller Area Network (CAN) Bus Samples
    :glob:
 
    **/*
-
-
-.. zephyr:code-sample-category:: canbus
-   :name: Controller Area Network (CAN) Bus
-   :show-listing:
-
-   Samples that demonstrate the :ref:`Controller Area Network (CAN) bus <canbus>` features.
diff --git a/samples/subsys/console/console.rst b/samples/subsys/console/console.rst
index 5ad7b1a6748..eb9a5127660 100644
--- a/samples/subsys/console/console.rst
+++ b/samples/subsys/console/console.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: console
-   :name: Console
-   :show-listing:
+.. _console-samples:
 
-   Samples that demonstrate the :ref:`console` subsystem.
+Console Samples
+###############
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/subsys/debug/index.rst b/samples/subsys/debug/index.rst
index 8c73a163e87..3e28648b1f5 100644
--- a/samples/subsys/debug/index.rst
+++ b/samples/subsys/debug/index.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: debug
-   :name: Debug
-   :show-listing:
+.. _debug-samples:
 
-   Samples that demonstrate advanced debugging features.
+Debug Samples
+#################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/subsys/display/display.rst b/samples/subsys/display/display.rst
index 21dc6ebf5d7..955eeaaea5b 100644
--- a/samples/subsys/display/display.rst
+++ b/samples/subsys/display/display.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: display
-   :name: Display
-   :show-listing:
+.. _display-samples:
 
-   These samples demonstrate how to use the display subsystem.
+Display Samples
+###############
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/subsys/fs/fs.rst b/samples/subsys/fs/fs.rst
index 0ba8ed68016..0875b1ea0bd 100644
--- a/samples/subsys/fs/fs.rst
+++ b/samples/subsys/fs/fs.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: fs
-   :name: File Systems
-   :show-listing:
+.. _fs-samples:
 
-   Samples that demonstrate how to interact with :ref:`file_system_api`.
+FS Samples
+##########
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/subsys/input/input.rst b/samples/subsys/input/input.rst
index 0435d6beb4a..19e01dc755c 100644
--- a/samples/subsys/input/input.rst
+++ b/samples/subsys/input/input.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: input
-   :name: Input
-   :show-listing:
+.. _input-samples:
 
-   Samples that demonstrate the :ref:`input` subsystem.
+Input Samples
+#############
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/subsys/ipc/ipc.rst b/samples/subsys/ipc/ipc.rst
index 8d536c4addd..c75a201fd3e 100644
--- a/samples/subsys/ipc/ipc.rst
+++ b/samples/subsys/ipc/ipc.rst
@@ -1,6 +1,10 @@
-.. zephyr:code-sample-category:: ipc
-   :name: Inter-Processor Communication (IPC)
-   :show-listing:
-   :glob: **/*
+.. _ipc_samples:
 
-   Samples that demonstrate :ref:`Inter-Processor Communication (IPC) <ipc_service>` features.
+IPC Samples
+###########
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/subsys/llext/llext.rst b/samples/subsys/llext/llext.rst
index b0eee9d8772..f9001e2847b 100644
--- a/samples/subsys/llext/llext.rst
+++ b/samples/subsys/llext/llext.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: llext
-   :name: Linkable Loadable Extensions (LLEXT)
-   :show-listing:
+.. _llext-samples:
 
-   Samples that demonstrate the :ref:`llext` subsystem.
+Linkable Loadable Extension Samples
+###################################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/subsys/logging/logging.rst b/samples/subsys/logging/logging.rst
index 49bbd040aa6..6b43a116f28 100644
--- a/samples/subsys/logging/logging.rst
+++ b/samples/subsys/logging/logging.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: logging
-   :name: Logging
-   :show-listing:
+.. _logging-samples:
 
-   Samples that demonstrate the :ref:`logging_api` subsystem.
+Logging Sample
+################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/subsys/lorawan/lorawan.rst b/samples/subsys/lorawan/lorawan.rst
index 0f5aab0bbd0..ffe86ce523f 100644
--- a/samples/subsys/lorawan/lorawan.rst
+++ b/samples/subsys/lorawan/lorawan.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: lorawan
-   :name: LoRaWAN
-   :show-listing:
+.. _lorawan-samples:
 
-   Samples that demonstrate the :ref:`LoRaWAN <lorawan_api>` subsystem.
+LoRaWAN Samples
+###############
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/README.rst b/samples/subsys/mgmt/mcumgr/smp_svr/README.rst
index 8d8830903b9..a9ddfcbf4a1 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/README.rst
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/README.rst
@@ -1,5 +1,3 @@
-:orphan:
-
 .. zephyr:code-sample:: smp-svr
    :name: SMP server
 
diff --git a/samples/subsys/mgmt/mgmt.rst b/samples/subsys/mgmt/mgmt.rst
index a1112077e45..a8fa8135aa7 100644
--- a/samples/subsys/mgmt/mgmt.rst
+++ b/samples/subsys/mgmt/mgmt.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: mgmt
-   :name: Management
-   :show-listing:
+.. _mgmt-samples:
 
-   Samples that demonstrate various device management features.
+Management Samples
+##################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/subsys/modbus/modbus.rst b/samples/subsys/modbus/modbus.rst
index 94719d7a231..133dbd43be7 100644
--- a/samples/subsys/modbus/modbus.rst
+++ b/samples/subsys/modbus/modbus.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: modbus
-   :name: Modbus
-   :show-listing:
+.. _modbus-samples:
 
-   Samples that demonstrate the :ref:`modbus` subsystem.
+Modbus Samples
+##############
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/subsys/portability/portability.rst b/samples/subsys/portability/portability.rst
index bf282e94547..9034372320f 100644
--- a/samples/subsys/portability/portability.rst
+++ b/samples/subsys/portability/portability.rst
@@ -1,8 +1,12 @@
-.. zephyr:code-sample-category:: portability
-   :name: Portability
-   :show-listing:
-   :glob: **/*
+.. _portability-samples:
 
-   Samples that demonstrate :ref:`OS abstraction and portability <osal>` features.
+Portability Samples
+###################
 
-   See also :zephyr:code-sample-category:`POSIX sample applications<posix>`.
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
+
+See also :ref:`POSIX API Samples <posix-samples>`.
diff --git a/samples/subsys/profiling/profiling.rst b/samples/subsys/profiling/profiling.rst
index 777bb9ba07a..a9765517a4b 100644
--- a/samples/subsys/profiling/profiling.rst
+++ b/samples/subsys/profiling/profiling.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: profiling
-   :name: Profiling
-   :show-listing:
+.. _profiling-samples:
 
-   Samples that demonstrate the :ref:`profiling` subsystem.
+Profiling subsystem samples
+###########################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/subsys/sensing/sensing.rst b/samples/subsys/sensing/sensing.rst
index bfd39ed399e..99fdf509c08 100644
--- a/samples/subsys/sensing/sensing.rst
+++ b/samples/subsys/sensing/sensing.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: sensing
-   :name: Sensing
-   :show-listing:
+.. _sensing-subsystem-samples:
 
-   Samples that demonstrate the :ref:`sensing` subsystem.
+Sensing Subsystem Samples
+#########################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/subsys/shell/shell.rst b/samples/subsys/shell/shell.rst
index b783261a07a..1cd81f59b0c 100644
--- a/samples/subsys/shell/shell.rst
+++ b/samples/subsys/shell/shell.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: shell
-   :name: Shell
-   :show-listing:
+.. _shell-samples:
 
-   Samples that demonstrate the :ref:`shell_api` subsystem.
+Shell System Samples
+####################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/subsys/smf/smf.rst b/samples/subsys/smf/smf.rst
index 772771a6daf..bc48258b99f 100644
--- a/samples/subsys/smf/smf.rst
+++ b/samples/subsys/smf/smf.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: smf
-   :name: State Machine Framework
-   :show-listing:
+.. _smf-samples:
 
-   These samples demonstrate how to use the :ref:`State Machine Framework <smf>` subsystem.
+State Machine Framework Samples
+###############################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/subsys/subsys.rst b/samples/subsys/subsys.rst
index 4651375ada8..bf58c7dda63 100644
--- a/samples/subsys/subsys.rst
+++ b/samples/subsys/subsys.rst
@@ -1,5 +1,11 @@
-.. zephyr:code-sample-category:: subsys
-   :name: Subsystems
-   :show-listing:
+.. _subsystem-samples:
 
-   These samples demonstrate how to use various subsystems supported by Zephyr.
+Various Subsystems Samples
+##########################
+
+.. toctree::
+   :titlesonly:
+   :maxdepth: 2
+   :glob:
+
+   */*
diff --git a/samples/subsys/testsuite/testsuite.rst b/samples/subsys/testsuite/testsuite.rst
index e3438ace124..7c84784e9a6 100644
--- a/samples/subsys/testsuite/testsuite.rst
+++ b/samples/subsys/testsuite/testsuite.rst
@@ -1,4 +1,10 @@
-.. zephyr:code-sample-category:: testsuite
-   :name: Test suites
-   :show-listing:
-   :glob: **/*
+.. _testsuite-samples:
+
+Testsuite samples
+#################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/README
diff --git a/samples/subsys/usb/usb.rst b/samples/subsys/usb/usb.rst
index a86c7cb3a1f..5da80b0e219 100644
--- a/samples/subsys/usb/usb.rst
+++ b/samples/subsys/usb/usb.rst
@@ -1,6 +1,10 @@
-.. zephyr:code-sample-category:: usb
-   :name: USB device support
-   :show-listing:
-   :glob: **/*
+.. _usb-samples:
 
-   Samples that demonstrate :ref:`usb_device_stack`.
+USB device support samples
+##########################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/README
diff --git a/samples/subsys/usb_c/usbc.rst b/samples/subsys/usb_c/usbc.rst
index 8ef11f95118..da0db220b15 100644
--- a/samples/subsys/usb_c/usbc.rst
+++ b/samples/subsys/usb_c/usbc.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: usbc
-   :name: USB-C device support
-   :show-listing:
+.. _usbc-samples:
 
-   Samples that demonstrate the :ref:`usbc_api`.
+USB-C device support samples
+############################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/subsys/zbus/zbus.rst b/samples/subsys/zbus/zbus.rst
index 41a0619193d..052589eed94 100644
--- a/samples/subsys/zbus/zbus.rst
+++ b/samples/subsys/zbus/zbus.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: zbus
-   :name: zbus
-   :show-listing:
+.. _zbus_samples:
 
-   These samples demonstrate how to use the :ref:`zbus <zbus>` subsystem.
+zbus Samples
+############
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/sysbuild/sysbuild.rst b/samples/sysbuild/sysbuild.rst
index bd1c4be9dca..c959e82a3a3 100644
--- a/samples/sysbuild/sysbuild.rst
+++ b/samples/sysbuild/sysbuild.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: sysbuild
-   :name: Sysbuild
-   :show-listing:
+.. _sysbuild-samples:
 
-   Samples that demonstrate how to use :ref:`sysbuild`.
+Sysbuild samples
+################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/sysbuild/with_mcuboot/README.rst b/samples/sysbuild/with_mcuboot/README.rst
index cf8729ab0f8..6ae3b81e6ec 100644
--- a/samples/sysbuild/with_mcuboot/README.rst
+++ b/samples/sysbuild/with_mcuboot/README.rst
@@ -1,7 +1,7 @@
-.. zephyr:code-sample:: with_mcuboot
-   :name: MCUboot with sysbuild
+.. _with_mcuboot:
 
-   Build a Zephyr application + MCUboot using sysbuild.
+Sample with MCUboot
+###################
 
 Overview
 ********
diff --git a/samples/tfm_integration/tfm_integration.rst b/samples/tfm_integration/tfm_integration.rst
index a445c38cfb2..02cd3e97855 100644
--- a/samples/tfm_integration/tfm_integration.rst
+++ b/samples/tfm_integration/tfm_integration.rst
@@ -1,12 +1,18 @@
-.. zephyr:code-sample-category:: tfm_integration
-   :name: TF-M Integration
-   :show-listing:
+.. _tfm_integration-samples:
 
-   These TF-M integration examples can be used with a supported Armv8-M board, and demonstrate how
-   the TF-M APIs can be used with Zephyr.
+TF-M Integration Samples
+########################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   */*
 
 Overview
 ********
+These TF-M integration examples can be used with a supported Armv8-M board, and
+demonstrate how the TF-M APIs can be used with Zephyr.
 
 Trusted Firmware Platform Security Architecture (PSA) APIs are used for the
 secure processing environment (S), with Zephyr running in the non-secure
diff --git a/samples/userspace/hello_world_user/README.rst b/samples/userspace/hello_world_user/README.rst
index 22ece4becea..4f6d83d692b 100644
--- a/samples/userspace/hello_world_user/README.rst
+++ b/samples/userspace/hello_world_user/README.rst
@@ -1,7 +1,7 @@
-.. zephyr:code-sample:: helloworld_user
-   :name: Hello World
+.. _hello_world_user:
 
-   Print a simple "Hello World" from userspace.
+Hello World
+###########
 
 Overview
 ********
diff --git a/samples/userspace/index.rst b/samples/userspace/index.rst
index 7d387d360d9..6c455acb9f1 100644
--- a/samples/userspace/index.rst
+++ b/samples/userspace/index.rst
@@ -1,5 +1,10 @@
-.. zephyr:code-sample-category:: userspace
-   :name: Userspace
-   :show-listing:
+.. _userspace-samples:
 
-   Samples that demonstrate how to run code in :ref:`usermode_api`.
+Userspace Samples
+#################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/userspace/prod_consumer/README.rst b/samples/userspace/prod_consumer/README.rst
index cbe6b72295a..ad6f37e521e 100644
--- a/samples/userspace/prod_consumer/README.rst
+++ b/samples/userspace/prod_consumer/README.rst
@@ -1,7 +1,9 @@
-.. zephyr:code-sample:: userspace_prod_consumer
-   :name: Producer/consumer
+.. _userspace_prod_consumer:
 
-   Manipulate basic user mode concepts.
+Producer/consumer
+=================
+
+This is a sample application that exercises some user mode concepts.
 
 Overview
 ********
diff --git a/samples/userspace/shared_mem/README.rst b/samples/userspace/shared_mem/README.rst
index 33cf81ee0be..7c9db36f243 100644
--- a/samples/userspace/shared_mem/README.rst
+++ b/samples/userspace/shared_mem/README.rst
@@ -1,7 +1,7 @@
-.. zephyr:code-sample:: userspace_protected_memory
-   :name: Userspace Protected Memory
+.. _userspace_protected_memory:
 
-   Use memory partitioning to protect memory between threads.
+Userspace Protected Memory
+##########################
 
 Overview
 ********
diff --git a/samples/userspace/syscall_perf/README.rst b/samples/userspace/syscall_perf/README.rst
index c0e677597a0..2f5c1ed78ee 100644
--- a/samples/userspace/syscall_perf/README.rst
+++ b/samples/userspace/syscall_perf/README.rst
@@ -1,7 +1,4 @@
-.. zephyr:code-sample:: syscall_perf
-   :name: Syscall performance
-
-   Measure performance overhead of a system calls compared to direct function calls.
+.. _syscall_perf:
 
 Syscall performances
 ====================

From 78253cae5e9630030a8e5cb2335a56049e5d622a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:20 +0100
Subject: [PATCH 1303/2913] Revert "[nrf fromtree] doc: extensions: samples:
 Introduce code sample categories"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 84eaf20175bdf24a95bbe08222de23400876ebc6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/_extensions/zephyr/domain/__init__.py     | 462 +-----------------
 .../static/css/codesample-livesearch.css      |  42 --
 .../domain/static/js/codesample-livesearch.js | 115 -----
 doc/_static/css/custom.css                    |   8 -
 doc/contribute/documentation/guidelines.rst   |  76 ---
 doc/requirements.txt                          |   3 -
 6 files changed, 21 insertions(+), 685 deletions(-)
 delete mode 100644 doc/_extensions/zephyr/domain/static/css/codesample-livesearch.css
 delete mode 100644 doc/_extensions/zephyr/domain/static/js/codesample-livesearch.js

diff --git a/doc/_extensions/zephyr/domain/__init__.py b/doc/_extensions/zephyr/domain/__init__.py
index 51eda4a29ce..e4c1ade9642 100644
--- a/doc/_extensions/zephyr/domain/__init__.py
+++ b/doc/_extensions/zephyr/domain/__init__.py
@@ -12,48 +12,31 @@
 ----------
 
 - ``zephyr:code-sample::`` - Defines a code sample.
-- ``zephyr:code-sample-category::`` - Defines a category for grouping code samples.
-- ``zephyr:code-sample-listing::`` - Shows a listing of code samples found in a given category.
 
 Roles
 -----
 
 - ``:zephyr:code-sample:`` - References a code sample.
-- ``:zephyr:code-sample-category:`` - References a code sample category.
 
 """
-
-from os import path
-from pathlib import Path
 from typing import Any, Dict, Iterator, List, Tuple
 
 from docutils import nodes
+from docutils.nodes import Node
 from docutils.parsers.rst import Directive, directives
-from docutils.statemachine import StringList
-
 from sphinx import addnodes
-from sphinx.application import Sphinx
 from sphinx.domains import Domain, ObjType
-from sphinx.environment import BuildEnvironment
 from sphinx.roles import XRefRole
 from sphinx.transforms import SphinxTransform
 from sphinx.transforms.post_transforms import SphinxPostTransform
 from sphinx.util import logging
-from sphinx.util.docutils import SphinxDirective, switch_source_input
 from sphinx.util.nodes import NodeMatcher, make_refnode
-from sphinx.util.parsing import nested_parse_to_nodes
-
 from zephyr.doxybridge import DoxygenGroupDirective
 from zephyr.gh_utils import gh_link_get_url
 
-
 import json
 
-from anytree import Node, Resolver, ChildResolverError, PreOrderIter, search
-
-__version__ = "0.2.0"
-
-RESOURCES_DIR = Path(__file__).parent / "static"
+__version__ = "0.1.0"
 
 logger = logging.getLogger(__name__)
 
@@ -66,14 +49,6 @@ class RelatedCodeSamplesNode(nodes.Element):
     pass
 
 
-class CodeSampleCategoryNode(nodes.Element):
-    pass
-
-
-class CodeSampleListingNode(nodes.Element):
-    pass
-
-
 class ConvertCodeSampleNode(SphinxTransform):
     default_priority = 100
 
@@ -162,188 +137,6 @@ def convert_node(self, node):
             node.document += json_ld
 
 
-class ConvertCodeSampleCategoryNode(SphinxTransform):
-    default_priority = 100
-
-    def apply(self):
-        matcher = NodeMatcher(CodeSampleCategoryNode)
-        for node in self.document.traverse(matcher):
-            self.convert_node(node)
-
-    def convert_node(self, node):
-        # move all the siblings of the category node underneath the section it contains
-        parent = node.parent
-        siblings_to_move = []
-        if parent is not None:
-            index = parent.index(node)
-            siblings_to_move = parent.children[index + 1 :]
-
-            node.children[0].extend(siblings_to_move)
-            for sibling in siblings_to_move:
-                parent.remove(sibling)
-
-        # note document as needing toc patching
-        self.document["needs_toc_patch"] = True
-
-        # finally, replace the category node with the section it contains
-        node.replace_self(node.children[0])
-
-
-class CodeSampleCategoriesTocPatching(SphinxPostTransform):
-    default_priority = 5  # needs to run *before* ReferencesResolver
-
-    def output_sample_categories_list_items(self, tree, container: nodes.Node):
-        list_item = nodes.list_item()
-        compact_paragraph = addnodes.compact_paragraph()
-        # find docname for tree.category["id"]
-        docname = self.env.domaindata["zephyr"]["code-samples-categories"][tree.category["id"]][
-            "docname"
-        ]
-        reference = nodes.reference(
-            "",
-            "",
-            internal=True,
-            refuri=docname,
-            anchorname="",
-            *[nodes.Text(tree.category["name"])],
-            classes=["category-link"],
-        )
-        compact_paragraph += reference
-        list_item += compact_paragraph
-
-        sorted_children = sorted(tree.children, key=lambda x: x.category["name"])
-
-        # add bullet list for children (if there are any, i.e. there are subcategories or at least
-        # one code sample in the category)
-        if sorted_children or any(
-            code_sample.get("category") == tree.category["id"]
-            for code_sample in self.env.domaindata["zephyr"]["code-samples"].values()
-        ):
-            bullet_list = nodes.bullet_list()
-            for child in sorted_children:
-                self.output_sample_categories_list_items(child, bullet_list)
-
-            for code_sample in sorted(
-                [
-                    code_sample
-                    for code_sample in self.env.domaindata["zephyr"]["code-samples"].values()
-                    if code_sample.get("category") == tree.category["id"]
-                ],
-                key=lambda x: x["name"].casefold(),
-            ):
-                li = nodes.list_item()
-                sample_xref = nodes.reference(
-                    "",
-                    "",
-                    internal=True,
-                    refuri=code_sample["docname"],
-                    anchorname="",
-                    *[nodes.Text(code_sample["name"])],
-                    classes=["code-sample-link"],
-                )
-                sample_xref["reftitle"] = code_sample["description"].astext()
-                compact_paragraph = addnodes.compact_paragraph()
-                compact_paragraph += sample_xref
-                li += compact_paragraph
-                bullet_list += li
-
-            list_item += bullet_list
-
-        container += list_item
-
-    def run(self, **kwargs: Any) -> None:
-        if not self.document.get("needs_toc_patch"):
-            return
-
-        code_samples_categories_tree = self.env.domaindata["zephyr"]["code-samples-categories-tree"]
-
-        category = search.find(
-            code_samples_categories_tree,
-            lambda node: hasattr(node, "category") and node.category["docname"] == self.env.docname,
-        )
-
-        bullet_list = nodes.bullet_list()
-        self.output_sample_categories_list_items(category, bullet_list)
-
-        self.env.tocs[self.env.docname] = bullet_list
-
-
-class ProcessCodeSampleListingNode(SphinxPostTransform):
-    default_priority = 5  # needs to run *before* ReferencesResolver
-
-    def output_sample_categories_sections(self, tree, container: nodes.Node, show_titles=False):
-        if show_titles:
-            section = nodes.section(ids=[tree.category["id"]])
-
-            link = make_refnode(
-                self.env.app.builder,
-                self.env.docname,
-                tree.category["docname"],
-                targetid=None,
-                child=nodes.Text(tree.category["name"]),
-            )
-            title = nodes.title("", "", link)
-            section += title
-            container += section
-        else:
-            section = container
-
-        # list samples from this category
-        list = create_code_sample_list(
-            [
-                code_sample
-                for code_sample in self.env.domaindata["zephyr"]["code-samples"].values()
-                if code_sample.get("category") == tree.category["id"]
-            ]
-        )
-        section += list
-
-        sorted_children = sorted(tree.children, key=lambda x: x.name)
-        for child in sorted_children:
-            self.output_sample_categories_sections(child, section, show_titles=True)
-
-    def run(self, **kwargs: Any) -> None:
-        matcher = NodeMatcher(CodeSampleListingNode)
-
-        for node in self.document.traverse(matcher):
-            code_samples_categories = self.env.domaindata["zephyr"]["code-samples-categories"]
-            code_samples_categories_tree = self.env.domaindata["zephyr"][
-                "code-samples-categories-tree"
-            ]
-
-            container = nodes.container()
-            container["classes"].append("code-sample-listing")
-
-            if self.env.app.builder.format == "html" and node["live-search"]:
-                search_input = nodes.raw(
-                    "",
-                    """
-                    <div class="cs-search-bar">
-                      <input type="text" class="cs-search-input" placeholder="Filter code samples..." onkeyup="filterSamples(this)">
-                      <i class="fa fa-search"></i>
-                    </div>
-                    """,
-                    format="html",
-                )
-                container += search_input
-
-            for category in node["categories"]:
-                if category not in code_samples_categories:
-                    logger.error(
-                        f"Category {category} not found in code samples categories",
-                        location=(self.env.docname, node.line),
-                    )
-                    continue
-
-                category_node = search.find(
-                    code_samples_categories_tree,
-                    lambda node: hasattr(node, "category") and node.category["id"] == category,
-                )
-                self.output_sample_categories_sections(category_node, container)
-
-            node.replace_self(container)
-
-
 def create_code_sample_list(code_samples):
     """
     Creates a bullet list (`nodes.bullet_list`) of code samples from a list of code samples.
@@ -395,8 +188,8 @@ def run(self, **kwargs: Any) -> None:
                 admonition = nodes.admonition()
                 admonition += nodes.title(text="Related code samples")
                 admonition["classes"].append("related-code-samples")
-                admonition["classes"].append("dropdown")  # used by sphinx-togglebutton extension
-                admonition["classes"].append("toggle-shown")  # show the content by default
+                admonition["classes"].append("dropdown") # used by sphinx-togglebutton extension
+                admonition["classes"].append("toggle-shown") # show the content by default
 
                 sample_list = create_code_sample_list(code_samples)
                 admonition += sample_list
@@ -458,118 +251,23 @@ def run(self):
         return [code_sample_node]
 
 
-class CodeSampleCategoryDirective(SphinxDirective):
-    required_arguments = 1  # Category ID
-    optional_arguments = 0
-    option_spec = {
-        "name": directives.unchanged,
-        "show-listing": directives.flag,
-        "live-search": directives.flag,
-        "glob": directives.unchanged,
-    }
-    has_content = True  # Category description
-    final_argument_whitespace = True
-
-    def run(self):
-        env = self.state.document.settings.env
-        id = self.arguments[0]
-        name = self.options.get("name", id)
-
-        category_node = CodeSampleCategoryNode()
-        category_node["id"] = id
-        category_node["name"] = name
-        category_node["docname"] = env.docname
-
-        description_node = self.parse_content_to_nodes()
-        category_node["description"] = description_node
-
-        code_sample_category = {
-            "docname": env.docname,
-            "id": id,
-            "name": name,
-        }
-
-        # Add the category to the domain
-        domain = env.get_domain("zephyr")
-        domain.add_code_sample_category(code_sample_category)
-
-        # Fake a toctree directive to ensure the code-sample-category directive implicitly acts as
-        # a toctree and correctly mounts whatever relevant documents under it in the global toc
-        lines = [
-            name,
-            "#" * len(name),
-            "",
-            ".. toctree::",
-            "   :titlesonly:",
-            "   :glob:",
-            "   :hidden:",
-            "   :maxdepth: 1",
-            "",
-            f"   {self.options['glob']}" if "glob" in self.options else "   */*",
-            "",
-        ]
-        stringlist = StringList(lines, source=env.docname)
-
-        with switch_source_input(self.state, stringlist):
-            parsed_section = nested_parse_to_nodes(self.state, stringlist)[0]
-
-        category_node += parsed_section
-
-        parsed_section += description_node
-
-        if "show-listing" in self.options:
-            listing_node = CodeSampleListingNode()
-            listing_node["categories"] = [id]
-            listing_node["live-search"] = "live-search" in self.options
-            parsed_section += listing_node
-
-        return [category_node]
-
-
-class CodeSampleListingDirective(SphinxDirective):
-    has_content = False
-    required_arguments = 0
-    optional_arguments = 0
-    option_spec = {
-        "categories": directives.unchanged_required,
-        "live-search": directives.flag,
-    }
-
-    def run(self):
-        code_sample_listing_node = CodeSampleListingNode()
-        code_sample_listing_node["categories"] = self.options.get("categories").split()
-        code_sample_listing_node["live-search"] = "live-search" in self.options
-
-        return [code_sample_listing_node]
-
-
 class ZephyrDomain(Domain):
     """Zephyr domain"""
 
     name = "zephyr"
-    label = "Zephyr"
+    label = "Zephyr Project"
 
     roles = {
         "code-sample": XRefRole(innernodeclass=nodes.inline, warn_dangling=True),
-        "code-sample-category": XRefRole(innernodeclass=nodes.inline, warn_dangling=True),
     }
 
-    directives = {
-        "code-sample": CodeSampleDirective,
-        "code-sample-listing": CodeSampleListingDirective,
-        "code-sample-category": CodeSampleCategoryDirective,
-    }
+    directives = {"code-sample": CodeSampleDirective}
 
     object_types: Dict[str, ObjType] = {
-        "code-sample": ObjType("code sample", "code-sample"),
-        "code-sample-category": ObjType("code sample category", "code-sample-category"),
+        "code-sample": ObjType("code-sample", "code-sample"),
     }
 
-    initial_data: Dict[str, Any] = {
-        "code-samples": {},  # id -> code sample data
-        "code-samples-categories": {},  # id -> code sample category data
-        "code-samples-categories-tree": Node("samples"),
-    }
+    initial_data: Dict[str, Any] = {"code-samples": {}}
 
     def clear_doc(self, docname: str) -> None:
         self.data["code-samples"] = {
@@ -578,30 +276,8 @@ def clear_doc(self, docname: str) -> None:
             if sample_data["docname"] != docname
         }
 
-        self.data["code-samples-categories"] = {
-            category_id: category_data
-            for category_id, category_data in self.data["code-samples-categories"].items()
-            if category_data["docname"] != docname
-        }
-
-        # TODO clean up the anytree as well
-
     def merge_domaindata(self, docnames: List[str], otherdata: Dict) -> None:
         self.data["code-samples"].update(otherdata["code-samples"])
-        self.data["code-samples-categories"].update(otherdata["code-samples-categories"])
-
-        # merge category trees by adding all the categories found in the "other" tree that to
-        # self tree
-        other_tree = otherdata["code-samples-categories-tree"]
-        categories = [n for n in PreOrderIter(other_tree) if hasattr(n, "category")]
-        for category in categories:
-            category_path = f"/{'/'.join(n.name for n in category.path)}"
-            self.add_category_to_tree(
-                category_path,
-                category.category["id"],
-                category.category["name"],
-                category.category["docname"],
-            )
 
     def get_objects(self):
         for _, code_sample in self.data["code-samples"].items():
@@ -614,16 +290,6 @@ def get_objects(self):
                 1,
             )
 
-        for _, code_sample_category in self.data["code-samples-categories"].items():
-            yield (
-                code_sample_category["id"],
-                code_sample_category["name"],
-                "code-sample-category",
-                code_sample_category["docname"],
-                code_sample_category["id"],
-                1,
-            )
-
     # used by Sphinx Immaterial theme
     def get_object_synopses(self) -> Iterator[Tuple[Tuple[str, str], str]]:
         for _, code_sample in self.data["code-samples"].items():
@@ -634,71 +300,23 @@ def get_object_synopses(self) -> Iterator[Tuple[Tuple[str, str], str]]:
 
     def resolve_xref(self, env, fromdocname, builder, type, target, node, contnode):
         if type == "code-sample":
-            elem = self.data["code-samples"].get(target)
-        elif type == "code-sample-category":
-            elem = self.data["code-samples-categories"].get(target)
-        else:
-            return
-
-        if elem:
-            if not node.get("refexplicit"):
-                contnode = [nodes.Text(elem["name"])]
-
-            return make_refnode(
-                builder,
-                fromdocname,
-                elem["docname"],
-                elem["id"],
-                contnode,
-                elem["description"].astext() if type == "code-sample" else None,
-            )
+            code_sample_info = self.data["code-samples"].get(target)
+            if code_sample_info:
+                if not node.get("refexplicit"):
+                    contnode = [nodes.Text(code_sample_info["name"])]
+
+                return make_refnode(
+                    builder,
+                    fromdocname,
+                    code_sample_info["docname"],
+                    code_sample_info["id"],
+                    contnode,
+                    code_sample_info["description"].astext(),
+                )
 
     def add_code_sample(self, code_sample):
         self.data["code-samples"][code_sample["id"]] = code_sample
 
-    def add_code_sample_category(self, code_sample_category):
-        self.data["code-samples-categories"][code_sample_category["id"]] = code_sample_category
-        self.add_category_to_tree(
-            path.dirname(code_sample_category["docname"]),
-            code_sample_category["id"],
-            code_sample_category["name"],
-            code_sample_category["docname"],
-        )
-
-    def add_category_to_tree(
-        self, category_path: str, category_id: str, category_name: str, docname: str
-    ) -> Node:
-        resolver = Resolver("name")
-        tree = self.data["code-samples-categories-tree"]
-
-        if not category_path.startswith("/"):
-            category_path = "/" + category_path
-
-        # node either already exists (and we update it to make it a category node), or we need to
-        # create it
-        try:
-            node = resolver.get(tree, category_path)
-            if hasattr(node, "category") and node.category["id"] != category_id:
-                raise ValueError(
-                    f"Can't add code sample category {category_id} as category "
-                    f"{node.category['id']} is already defined in {node.category['docname']}. "
-                    "You may only have one category per path."
-                )
-        except ChildResolverError as e:
-            path_of_last_existing_node = f"/{'/'.join(n.name for n in e.node.path)}"
-            common_path = path.commonpath([path_of_last_existing_node, category_path])
-            remaining_path = path.relpath(category_path, common_path)
-
-            # Add missing nodes under the last existing node
-            for node_name in remaining_path.split("/"):
-                e.node = Node(node_name, parent=e.node)
-
-            node = e.node
-
-        node.category = {"id": category_id, "name": category_name, "docname": docname}
-
-        return tree
-
 
 class CustomDoxygenGroupDirective(DoxygenGroupDirective):
     """Monkey patch for Breathe's DoxygenGroupDirective."""
@@ -712,52 +330,14 @@ def run(self) -> List[Node]:
             return nodes
 
 
-def compute_sample_categories_hierarchy(app: Sphinx, env: BuildEnvironment) -> None:
-    domain = env.get_domain("zephyr")
-    code_samples = domain.data["code-samples"]
-
-    category_tree = env.domaindata["zephyr"]["code-samples-categories-tree"]
-    resolver = Resolver("name")
-    for code_sample in code_samples.values():
-        try:
-            # Try to get the node at the specified path
-            node = resolver.get(category_tree, "/" + path.dirname(code_sample["docname"]))
-        except ChildResolverError as e:
-            # starting with e.node and up, find the first node that has a category
-            node = e.node
-            while not hasattr(node, "category"):
-                node = node.parent
-            code_sample["category"] = node.category["id"]
-
-
-def install_codesample_livesearch(
-    app: Sphinx, pagename: str, templatename: str, context: dict[str, Any], event_arg: Any
-) -> None:
-    # TODO only add the CSS/JS if the page contains a code sample listing
-    # As these resources are really small, it's not a big deal to include them on every page for now
-    app.add_css_file("css/codesample-livesearch.css")
-    app.add_js_file("js/codesample-livesearch.js")
-
-
 def setup(app):
     app.add_config_value("zephyr_breathe_insert_related_samples", False, "env")
 
     app.add_domain(ZephyrDomain)
 
     app.add_transform(ConvertCodeSampleNode)
-    app.add_transform(ConvertCodeSampleCategoryNode)
-
-    app.add_post_transform(ProcessCodeSampleListingNode)
-    app.add_post_transform(CodeSampleCategoriesTocPatching)
     app.add_post_transform(ProcessRelatedCodeSamplesNode)
 
-    app.connect(
-        "builder-inited",
-        (lambda app: app.config.html_static_path.append(RESOURCES_DIR.as_posix())),
-    )
-    app.connect("html-page-context", install_codesample_livesearch)
-    app.connect("env-updated", compute_sample_categories_hierarchy)
-
     # monkey-patching of the DoxygenGroupDirective
     app.add_directive("doxygengroup", CustomDoxygenGroupDirective, override=True)
 
diff --git a/doc/_extensions/zephyr/domain/static/css/codesample-livesearch.css b/doc/_extensions/zephyr/domain/static/css/codesample-livesearch.css
deleted file mode 100644
index 36c7818fd18..00000000000
--- a/doc/_extensions/zephyr/domain/static/css/codesample-livesearch.css
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright (c) 2024, The Linux Foundation.
- * SPDX-License-Identifier: Apache-2.0
- */
-.cs-search-bar {
-  position: relative;
-  display: inline-block;
-  width: 100%;
-  margin-bottom: 2rem;
-  margin-top: 1rem;
-}
-
-.cs-search-bar input {
-  background-color: var(--input-background-color);
-  color: var(--input-text-color);
-  width: 100%;
-  padding: 10px 40px 10px 20px;
-  border: 1px solid #ccc;
-  border-radius: 25px;
-  font-size: 16px;
-  outline: none;
-  box-shadow: none;
-}
-
-.cs-search-bar i {
-  position: absolute;
-  top: 50%;
-  right: 15px;
-  transform: translateY(-50%);
-  color: #ccc;
-  font-size: 18px;
-}
-
-.code-sample-listing mark {
-  background: inherit;
-  font-style: inherit;
-  font-weight: inherit;
-  color: inherit;
-  border-radius: 4px;
-  outline: 4px solid rgba(255, 255, 0, 0.3);
-  outline-offset: 2px;
-}
diff --git a/doc/_extensions/zephyr/domain/static/js/codesample-livesearch.js b/doc/_extensions/zephyr/domain/static/js/codesample-livesearch.js
deleted file mode 100644
index 4a5268cc84c..00000000000
--- a/doc/_extensions/zephyr/domain/static/js/codesample-livesearch.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * Copyright (c) 2024, The Linux Foundation.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-function filterSamples(input) {
-  const searchQuery = input.value.toLowerCase();
-  const container = input.closest(".code-sample-listing");
-
-  function removeHighlights(element) {
-    const marks = element.querySelectorAll("mark");
-    marks.forEach((mark) => {
-      const parent = mark.parentNode;
-      while (mark.firstChild) {
-        parent.insertBefore(mark.firstChild, mark);
-      }
-      parent.removeChild(mark);
-      parent.normalize(); // Merge adjacent text nodes
-    });
-  }
-
-  function highlightMatches(node, query) {
-    if (node.nodeType === Node.TEXT_NODE) {
-      const text = node.textContent;
-      const index = text.toLowerCase().indexOf(query);
-      if (index !== -1 && query.length > 0) {
-        const highlightedFragment = document.createDocumentFragment();
-
-        const before = document.createTextNode(text.substring(0, index));
-        const highlight = document.createElement("mark");
-        highlight.textContent = text.substring(index, index + query.length);
-        const after = document.createTextNode(text.substring(index + query.length));
-
-        highlightedFragment.appendChild(before);
-        highlightedFragment.appendChild(highlight);
-        highlightedFragment.appendChild(after);
-
-        node.parentNode.replaceChild(highlightedFragment, node);
-      }
-    } else if (node.nodeType === Node.ELEMENT_NODE) {
-      node.childNodes.forEach((child) => highlightMatches(child, query));
-    }
-  }
-
-  function processSection(section) {
-    let sectionVisible = false;
-    const lists = section.querySelectorAll(":scope > ul.code-sample-list");
-    const childSections = section.querySelectorAll(":scope > section");
-
-    // Process lists directly under this section
-    lists.forEach((list) => {
-      let listVisible = false;
-      const items = list.querySelectorAll("li");
-
-      items.forEach((item) => {
-        const nameElement = item.querySelector(".code-sample-name");
-        const descElement = item.querySelector(".code-sample-description");
-
-        removeHighlights(nameElement);
-        removeHighlights(descElement);
-
-        const sampleName = nameElement.textContent.toLowerCase();
-        const sampleDescription = descElement.textContent.toLowerCase();
-
-        if (
-          sampleName.includes(searchQuery) ||
-          sampleDescription.includes(searchQuery)
-        ) {
-          if (searchQuery) {
-            highlightMatches(nameElement, searchQuery);
-            highlightMatches(descElement, searchQuery);
-          }
-
-          item.style.display = "";
-          listVisible = true;
-          sectionVisible = true;
-        } else {
-          item.style.display = "none";
-        }
-      });
-
-      // Show or hide the list based on whether any items are visible
-      list.style.display = listVisible ? "" : "none";
-    });
-
-    // Recursively process child sections
-    childSections.forEach((childSection) => {
-      const childVisible = processSection(childSection);
-      if (childVisible) {
-        sectionVisible = true;
-      }
-    });
-
-    // Show or hide the section heading based on visibility
-    const heading = section.querySelector(
-      ":scope > h2, :scope > h3, :scope > h4, :scope > h5, :scope > h6"
-    );
-    if (sectionVisible) {
-      if (heading) heading.style.display = "";
-      section.style.display = "";
-    } else {
-      if (heading) heading.style.display = "none";
-      section.style.display = "none";
-    }
-
-    return sectionVisible;
-  }
-
-  // Start processing from the container
-  processSection(container);
-
-  // Ensure the input and its container are always visible
-  input.style.display = "";
-  container.style.display = "";
-}
diff --git a/doc/_static/css/custom.css b/doc/_static/css/custom.css
index b302ba82026..f8cbab2073f 100644
--- a/doc/_static/css/custom.css
+++ b/doc/_static/css/custom.css
@@ -1053,11 +1053,3 @@ dark-mode-toggle::part(toggleLabel){
     font-family: 'FontAwesome';
     padding-right: 0.5em;
 }
-
-li>a.code-sample-link.reference.internal {
-    font-weight: 100;
-}
-
-li>a.code-sample-link.reference.internal.current {
-    text-decoration: underline;
-}
\ No newline at end of file
diff --git a/doc/contribute/documentation/guidelines.rst b/doc/contribute/documentation/guidelines.rst
index dbf0f6b89ff..a919443529c 100644
--- a/doc/contribute/documentation/guidelines.rst
+++ b/doc/contribute/documentation/guidelines.rst
@@ -1104,79 +1104,3 @@ Code samples
    Will render as:
 
       Check out :zephyr:code-sample:`blinky code sample <blinky>` for more information.
-
-.. rst:directive:: .. zephyr:code-sample-category:: id
-
-   This directive is used to define a category for grouping code samples.
-
-   For example::
-
-      .. zephyr:code-sample-category:: gpio
-         :name: GPIO
-         :show-listing:
-
-         Samples related to the GPIO subsystem.
-
-   The contents of the directive is used as the description of the category. It can contain any
-   valid reStructuredText content.
-
-   .. rubric:: Options
-
-   .. rst:directive:option:: name
-      :type: text
-
-      Indicates the human-readable name of the category.
-
-   .. rst:directive:option:: show-listing
-      :type: flag
-
-      If set, a listing of code samples in the category will be shown. The listing is automatically
-      generated based on all code samples found in the subdirectories of the current document.
-
-   .. rst:directive:option:: glob
-      :type: text
-
-      A glob pattern to match the files to include in the listing. The default is `*/*` but it can
-      be overridden e.g. when samples may be found in directories not sitting directly under the
-      category directory.
-
-.. rst:role:: zephyr:code-sample-category
-
-   This role is used to reference a code sample category described using
-   :rst:dir:`zephyr:code-sample-category`.
-
-   For example::
-
-      Check out :zephyr:code-sample-category:`cloud` samples for more information.
-
-   Will render as:
-
-      Check out :zephyr:code-sample-category:`cloud` samples for more information.
-
-.. rst:directive:: .. zephyr:code-sample-listing::
-
-   This directive is used to show a listing of all code samples found in one or more categories.
-
-   For example::
-
-      .. zephyr:code-sample-listing::
-         :categories: cloud
-
-   Will render as:
-
-      .. zephyr:code-sample-listing::
-         :categories: cloud
-
-   .. rubric:: Options
-
-   .. rst:directive:option:: categories
-      :type: text
-
-      A space-separated list of category IDs for which to show the listing.
-
-   .. rst:directive:option:: live-search
-      :type: flag
-
-      A flag to include a search box right above the listing. The search box allows users to filter
-      the listing by code sample name/description, which can be useful for categories with a large
-      number of samples. This option is only available in the HTML builder.
diff --git a/doc/requirements.txt b/doc/requirements.txt
index b979eeedf8a..aa77efa604f 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -21,6 +21,3 @@ pyserial
 
 # Doxygen doxmlparser
 doxmlparser
-
-# Used by the Zephyr domain to organize code samples
-anytree

From e358936f881307da1e729aa52e129b7e12425b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:20 +0100
Subject: [PATCH 1304/2913] Revert "[nrf fromtree] doc: extensions: move Zephyr
 domain extension to dedicated package"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a7aadfe0f1ac4494ac466359cd03439a7a0ed7c0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/_extensions/zephyr/{domain/__init__.py => domain.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename doc/_extensions/zephyr/{domain/__init__.py => domain.py} (100%)

diff --git a/doc/_extensions/zephyr/domain/__init__.py b/doc/_extensions/zephyr/domain.py
similarity index 100%
rename from doc/_extensions/zephyr/domain/__init__.py
rename to doc/_extensions/zephyr/domain.py

From e5767a273a4d296b07d7c99ecae87862365353ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:20 +0100
Subject: [PATCH 1305/2913] Revert "[nrf fromtree] samples: doc: convert
 philosophers sample to code-sample directive"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e4179620cd60100b3ba7bc1e9f3ca29c291af1fa.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/boards/arc_secure_services/README.rst | 2 +-
 samples/philosophers/README.rst               | 7 +++----
 samples/posix/philosophers/README.rst         | 5 +++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/samples/boards/arc_secure_services/README.rst b/samples/boards/arc_secure_services/README.rst
index e63a9b9e910..817af34e975 100644
--- a/samples/boards/arc_secure_services/README.rst
+++ b/samples/boards/arc_secure_services/README.rst
@@ -68,7 +68,7 @@ Currently, in normal application, MPU is not accessible, so no user space and
 mpu-based stack checking. Please copy the specific dts file and def_config
 file to the specific board dir to build normal application.
 
-Here,take :zephyr:code-sample:`dining-philosophers` as an example for normal
+Here,take :ref:`dining-philosophers-sample` as an example for normal
 application.
 
 .. zephyr-app-commands::
diff --git a/samples/philosophers/README.rst b/samples/philosophers/README.rst
index 8ff1ea33e9a..d0701832cbe 100644
--- a/samples/philosophers/README.rst
+++ b/samples/philosophers/README.rst
@@ -1,8 +1,7 @@
-.. zephyr:code-sample:: dining-philosophers
-  :name: Dining Philosophers
-  :relevant-api: semaphore_apis mutex_apis stack_apis thread_apis fifo_apis lifo_apis
+.. _dining-philosophers-sample:
 
-  Implement a solution to the Dining Philosophers problem using Zephyr kernel services.
+Dining Philosophers
+###################
 
 Overview
 ********
diff --git a/samples/posix/philosophers/README.rst b/samples/posix/philosophers/README.rst
index 6cd73ee637f..604fb8858dd 100644
--- a/samples/posix/philosophers/README.rst
+++ b/samples/posix/philosophers/README.rst
@@ -6,7 +6,7 @@
 Overview
 ********
 
-This sample implements Zephyr's :zephyr:code-sample:`dining-philosophers` sample using the
+This sample implements Zephyr's :ref:`Dining Philosophers Sample <dining-philosophers-sample>` using the
 :ref:`POSIX API <posix_support>`. The source code for this sample can be found under
 :file:`samples/posix/philosophers`.
 
@@ -52,4 +52,5 @@ Like the original philosophers sample, the POSIX variant also enables
 Additional Information
 **********************
 
-For additional information, please refer to the :zephyr:code-sample:`dining-philosophers` sample.
+For additional information, please refer to the
+:ref:`Dining Philosophers Sample <dining-philosophers-sample>`.

From 96add87c356a226af97badf4f23843c2557d2f47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:20 +0100
Subject: [PATCH 1306/2913] Revert "[nrf fromtree] wifi: nrf_wifi: Remove
 duplicate Kconfig option"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7b2b462f060805de771abc5f24a76db1e1ff6c0e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index f0d2c8ead71..4aabc46106a 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -682,6 +682,15 @@ config NET_MGMT_EVENT_QUEUE_SIZE
 	# Doing interface down and up even with delay puts a lot of events in the queue
 	default 16
 
+config NRF_WIFI_RPU_RECOVERY_PROPAGATION_DELAY_MS
+	int "RPU recovery propagation delay in milliseconds"
+	default 10
+	help
+	  Propagation delay in milliseconds to wait after the RPU is powered down
+	  before powering it up. This delay is required to ensure that the recovery
+	  is propagated to all the applications and stack, and has enough time to
+	  clean up the resources.
+
 config NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS
 	int "RPU recovery power save active timeout in milliseconds"
 	default 50000

From 55cb227b38813369cd603eab526f1def7f0a424d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:20 +0100
Subject: [PATCH 1307/2913] Revert "[nrf fromlist] drivers: wifi: Add RPU
 recovery info"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1bb3a575bb4bf922114556065758b244a309b23f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/inc/fmac_main.h |  2 --
 drivers/wifi/nrf_wifi/src/net_if.c    |  6 ----
 drivers/wifi/nrf_wifi/src/wifi_util.c | 52 ---------------------------
 3 files changed, 60 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/inc/fmac_main.h b/drivers/wifi/nrf_wifi/inc/fmac_main.h
index de6780069b0..57d4b8b9df5 100644
--- a/drivers/wifi/nrf_wifi/inc/fmac_main.h
+++ b/drivers/wifi/nrf_wifi/inc/fmac_main.h
@@ -113,8 +113,6 @@ struct nrf_wifi_ctx_zep {
 	bool rpu_recovery_in_progress;
 	unsigned long last_rpu_recovery_time_ms;
 	unsigned int rpu_recovery_retries;
-	int rpu_recovery_success;
-	int rpu_recovery_failure;
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 };
 
diff --git a/drivers/wifi/nrf_wifi/src/net_if.c b/drivers/wifi/nrf_wifi/src/net_if.c
index 5c7fb9759f7..19b232b6fe3 100644
--- a/drivers/wifi/nrf_wifi/src/net_if.c
+++ b/drivers/wifi/nrf_wifi/src/net_if.c
@@ -74,7 +74,6 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 								nrf_wifi_rpu_recovery_work);
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
 	int ret;
-	bool recovery_fail = false;
 
 	if (!vif_ctx_zep) {
 		LOG_ERR("%s: vif_ctx_zep is NULL", __func__);
@@ -144,8 +143,6 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 	/* This indirectly does a cold-boot of RPU */
 	ret = net_if_down(vif_ctx_zep->zep_net_if_ctx);
 	if (ret) {
-		rpu_ctx_zep->rpu_recovery_failure++;
-		recovery_fail = true;
 		LOG_ERR("%s: net_if_down failed: %d", __func__, ret);
 		/* Continue with the recovery */
 	}
@@ -161,9 +158,6 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 	}
 	rpu_ctx_zep->rpu_recovery_in_progress = false;
 	rpu_ctx_zep->last_rpu_recovery_time_ms = k_uptime_get();
-	if (!recovery_fail) {
-		rpu_ctx_zep->rpu_recovery_success++;
-	}
 	k_mutex_unlock(&rpu_ctx_zep->rpu_lock);
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 	LOG_ERR("%s: RPU recovery done", __func__);
diff --git a/drivers/wifi/nrf_wifi/src/wifi_util.c b/drivers/wifi/nrf_wifi/src/wifi_util.c
index 2d2ca2a2b5b..528c41fa184 100644
--- a/drivers/wifi/nrf_wifi/src/wifi_util.c
+++ b/drivers/wifi/nrf_wifi/src/wifi_util.c
@@ -915,52 +915,6 @@ static int nrf_wifi_util_trigger_rpu_recovery(const struct shell *sh,
 	k_mutex_unlock(&ctx->rpu_lock);
 	return ret;
 }
-
-static int nrf_wifi_util_rpu_recovery_info(const struct shell *sh,
-					   size_t argc,
-					   const char *argv[])
-{
-	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
-	struct nrf_wifi_hal_dev_ctx *hal_dev_ctx = NULL;
-	unsigned long current_time_ms = nrf_wifi_osal_time_get_curr_ms();
-	int ret;
-
-	k_mutex_lock(&ctx->rpu_lock, K_FOREVER);
-	if (!ctx || !ctx->rpu_ctx) {
-		shell_fprintf(sh,
-			      SHELL_ERROR,
-			      "RPU context not initialized\n");
-		ret = -ENOEXEC;
-		goto unlock;
-	}
-
-	fmac_dev_ctx = ctx->rpu_ctx;
-	hal_dev_ctx = fmac_dev_ctx->hal_dev_ctx;
-
-	shell_fprintf(sh,
-		      SHELL_INFO,
-		      "wdt_irq_received: %d\n"
-		      "wdt_irq_ignored: %d\n"
-		      "last_wakeup_now_asserted_time_ms: %lu milliseconds\n"
-		      "last_wakeup_now_deasserted_time_ms: %lu milliseconds\n"
-		      "last_rpu_sleep_opp_time_ms: %lu milliseconds\n"
-		      "current time: %lu milliseconds\n"
-		      "rpu_recovery_success: %d\n"
-		      "rpu_recovery_failure: %d\n\n",
-		      hal_dev_ctx->wdt_irq_received,
-		      hal_dev_ctx->wdt_irq_ignored,
-		      hal_dev_ctx->last_wakeup_now_asserted_time_ms,
-		      hal_dev_ctx->last_wakeup_now_deasserted_time_ms,
-		      hal_dev_ctx->last_rpu_sleep_opp_time_ms,
-		      current_time_ms,
-		      ctx->rpu_recovery_success,
-		      ctx->rpu_recovery_failure);
-
-	ret = 0;
-unlock:
-	k_mutex_unlock(&ctx->rpu_lock);
-	return ret;
-}
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 
 SHELL_STATIC_SUBCMD_SET_CREATE(
@@ -1059,12 +1013,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      nrf_wifi_util_trigger_rpu_recovery,
 		      1,
 		      0),
-	SHELL_CMD_ARG(rpu_recovery_info,
-		      NULL,
-		      "Dump RPU recovery information",
-		      nrf_wifi_util_rpu_recovery_info,
-		      1,
-		      0),
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 	SHELL_SUBCMD_SET_END);
 

From a2aac5c62b4e6de5fe40f713aa1c3019765365a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:20 +0100
Subject: [PATCH 1308/2913] Revert "[nrf fromlist] manifest: update nrf_wifi
 revision for recovery stats"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c83539ce5018c7fa8c3cca6637c201bf76aa7548.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 11cd720a905..248d015f6ae 100644
--- a/west.yml
+++ b/west.yml
@@ -303,7 +303,7 @@ manifest:
       revision: 3cfca0192ff84da919e9bc7978bcc2239cd6a395
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: 71261e2b719b98500b7741c3398a74a5fb631596
+      revision: f9e2abdb70761003912b1b929a37b536f68a91da
       path: modules/lib/nrf_wifi
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719

From fa6680b4425ef8796adab4db77e9e0c6a6187424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:20 +0100
Subject: [PATCH 1309/2913] Revert "[nrf fromlist] soc: nordic: nrf54l: fix
 APPROTECT handling"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2deed84b44553ed814e10589b3366fd35c5ffcc1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/Kconfig | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/soc/nordic/Kconfig b/soc/nordic/Kconfig
index 7c7a07fba4b..f76b1d19acc 100644
--- a/soc/nordic/Kconfig
+++ b/soc/nordic/Kconfig
@@ -98,9 +98,9 @@ config NFCT_PINS_AS_GPIOS
 
 choice NRF_APPROTECT_HANDLING
 	bool "APPROTECT handling"
-	depends on SOC_SERIES_NRF52X || SOC_SERIES_NRF53X || SOC_NRF54L_CPUAPP_COMMON || \
+	depends on SOC_SERIES_NRF52X || SOC_SERIES_NRF53X || SOC_NRF54L15_CPUAPP || \
 		   SOC_SERIES_NRF91X
-	default NRF_APPROTECT_DISABLE if SOC_NRF54L_CPUAPP_COMMON
+	default NRF_APPROTECT_DISABLE if SOC_NRF54L15_CPUAPP
 	default NRF_APPROTECT_USE_UICR
 	help
 	  Specifies how the SystemInit() function should handle the APPROTECT
@@ -108,7 +108,7 @@ choice NRF_APPROTECT_HANDLING
 
 config NRF_APPROTECT_DISABLE
 	bool "Disable"
-	depends on SOC_NRF54L_CPUAPP_COMMON
+	depends on SOC_NRF54L15_CPUAPP
 	help
 	  When this option is selected, the SystemInit() disables
 	  the APPROTECT mechanism.
@@ -140,8 +140,8 @@ endchoice
 
 choice NRF_SECURE_APPROTECT_HANDLING
 	bool "Secure APPROTECT handling"
-	depends on SOC_NRF5340_CPUAPP || SOC_NRF54L_CPUAPP_COMMON || SOC_SERIES_NRF91X
-	default NRF_SECURE_APPROTECT_DISABLE if SOC_NRF54L_CPUAPP_COMMON
+	depends on SOC_NRF5340_CPUAPP || SOC_NRF54L15_CPUAPP || SOC_SERIES_NRF91X
+	default NRF_SECURE_APPROTECT_DISABLE if SOC_NRF54L15_CPUAPP
 	default NRF_SECURE_APPROTECT_USE_UICR
 	help
 	  Specifies how the SystemInit() function should handle the secure
@@ -149,7 +149,7 @@ choice NRF_SECURE_APPROTECT_HANDLING
 
 config NRF_SECURE_APPROTECT_DISABLE
 	bool "Disable"
-	depends on SOC_NRF54L_CPUAPP_COMMON
+	depends on SOC_NRF54L15_CPUAPP
 	help
 	  When this option is selected, the SystemInit() disables
 	  the secure APPROTECT mechanism.

From 65dd37b8d0825b4c56efde7b68ccfc0e2bb4ea0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:20 +0100
Subject: [PATCH 1310/2913] Revert "[nrf fromtree] dts: bindings: arm: nordic:
 tddconf: Add etrbuffer"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 591a05a7068eed5e3877810a7af22d62b94ae239.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/bindings/arm/nordic,nrf-tddconf.yaml                    | 4 ----
 snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay | 1 -
 snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay      | 1 -
 3 files changed, 6 deletions(-)

diff --git a/dts/bindings/arm/nordic,nrf-tddconf.yaml b/dts/bindings/arm/nordic,nrf-tddconf.yaml
index 2273082c12f..46f9a0e7b2d 100644
--- a/dts/bindings/arm/nordic,nrf-tddconf.yaml
+++ b/dts/bindings/arm/nordic,nrf-tddconf.yaml
@@ -38,7 +38,3 @@ properties:
       - 1
       - 2
       - 3
-
-  etrbuffer:
-    description: phandle to the memory region used for the ETR buffer
-    type: phandle
diff --git a/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay b/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay
index fec54817364..d620b83872f 100644
--- a/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay
+++ b/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay
@@ -12,5 +12,4 @@
 	etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE | NRF_TDDCONF_SOURCE_STMPPR |
 		NRF_TDDCONF_SOURCE_STMFLPR)>;
 	portconfig = <0>;
-	etrbuffer = <&etr_buffer>;
 };
diff --git a/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay b/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay
index fec54817364..d620b83872f 100644
--- a/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay
+++ b/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay
@@ -12,5 +12,4 @@
 	etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE | NRF_TDDCONF_SOURCE_STMPPR |
 		NRF_TDDCONF_SOURCE_STMFLPR)>;
 	portconfig = <0>;
-	etrbuffer = <&etr_buffer>;
 };

From bfe378b5ae287c8487aca39c4c51b61455d5a72c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:21 +0100
Subject: [PATCH 1311/2913] Revert "[nrf fromtree] dts: common: nordic:
 nrf54l20: Add missing nodes"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 559f627e1751ab2d299a1197bf04b102950cfc41.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/common/nordic/nrf54l20.dtsi | 78 ---------------------------------
 1 file changed, 78 deletions(-)

diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 67ccb152a5f..8479c6111a8 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -501,84 +501,6 @@
 				status = "disabled";
 			};
 
-			i2c23: i2c@ed000 {
-				compatible = "nordic,nrf-twim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xed000 0x1000>;
-				interrupts = <237 NRF_DEFAULT_IRQ_PRIORITY>;
-				easydma-maxcnt-bits = <16>;
-				status = "disabled";
-				zephyr,pm-device-runtime-auto;
-			};
-
-			spi23: spi@ed000 {
-				/*
-				 * This spi node can be either SPIM or SPIS,
-				 * for the user to pick:
-				 * compatible = "nordic,nrf-spim" or
-				 *              "nordic,nrf-spis".
-				 */
-				compatible = "nordic,nrf-spim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xed000 0x1000>;
-				interrupts = <237 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(8)>;
-				easydma-maxcnt-bits = <16>;
-				rx-delay-supported;
-				rx-delay = <1>;
-				status = "disabled";
-			};
-
-			uart23: uart@ed000 {
-				compatible = "nordic,nrf-uarte";
-				reg = <0xed000 0x1000>;
-				interrupts = <237 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				endtx-stoptx-supported;
-				frame-timeout-supported;
-			};
-
-			i2c24: i2c@ee000 {
-				compatible = "nordic,nrf-twim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xee000 0x1000>;
-				interrupts = <238 NRF_DEFAULT_IRQ_PRIORITY>;
-				easydma-maxcnt-bits = <16>;
-				status = "disabled";
-				zephyr,pm-device-runtime-auto;
-			};
-
-			spi24: spi@ee000 {
-				/*
-				 * This spi node can be either SPIM or SPIS,
-				 * for the user to pick:
-				 * compatible = "nordic,nrf-spim" or
-				 *              "nordic,nrf-spis".
-				 */
-				compatible = "nordic,nrf-spim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xee000 0x1000>;
-				interrupts = <238 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(8)>;
-				easydma-maxcnt-bits = <16>;
-				rx-delay-supported;
-				rx-delay = <1>;
-				status = "disabled";
-			};
-
-			uart24: uart@ee000 {
-				compatible = "nordic,nrf-uarte";
-				reg = <0xee000 0x1000>;
-				interrupts = <238 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				endtx-stoptx-supported;
-				frame-timeout-supported;
-			};
-
 			dppic30: dppic@102000 {
 				compatible = "nordic,nrf-dppic";
 				reg = <0x102000 0x808>;

From fc71ba980a7de643575d98a7dc7d5df55f65a757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:21 +0100
Subject: [PATCH 1312/2913] Revert "[nrf fromlist] modules: nordic: nrfx:
 workaround MDK erratas symbol for nRF54L05 & L10"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c2ce47682c8e2d1c32963fb1f1c8eddc34746cd3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/nrfx/CMakeLists.txt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 3863fa177ed..08c9610e7fe 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -44,12 +44,10 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUPPR     NRF54H20_XXAA
                                                                 NRF_PPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR    NRF54H20_XXAA
                                                                 NRF_FLPR)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05            NRF54L05_XXAA
-                                                                DEVELOP_IN_NRF54L15)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05            NRF54L05_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR    NRF_FLPR)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10            NRF54L10_XXAA
-                                                                DEVELOP_IN_NRF54L15)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10            NRF54L10_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10_CPUFLPR    NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15            NRF54L15_XXAA)

From 0f4ae3554e7d114422d4e09d73ea71119b2a9d85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:21 +0100
Subject: [PATCH 1313/2913] Revert "[nrf fromlist] soc: nordic: nrf54l: add
 preliminary workaround for nRF54L anomaly 31"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9042ad0f7fe6378b24f674e2af3a6fad24098d43.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54l/soc.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index 76749c1983a..f70675517b8 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -30,7 +30,6 @@
 #endif
 #include <soc/nrfx_coredep.h>
 
-#include <nrf_erratas.h>
 #include <system_nrf54l.h>
 
 LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
@@ -154,13 +153,6 @@ static int nordicsemi_nrf54l_init(void)
 	}
 
 #if (DT_PROP(DT_NODELABEL(vregmain), regulator_initial_mode) == NRF5X_REG_MODE_DCDC)
-#if NRF54L_ERRATA_31_ENABLE_WORKAROUND
-	/* Workaround for Errata 31 */
-	if (nrf54l_errata_31()) {
-		*((volatile uint32_t *)0x50120624ul) = 20 | 1<<5;
-		*((volatile uint32_t *)0x5012063Cul) &= ~(1<<19);
-	}
-#endif
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);
 #endif
 

From ccb66b1e9481dbeb2df6f40b0dec1a496d324aa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:21 +0100
Subject: [PATCH 1314/2913] Revert "[nrf fromlist] soc: nordic: nrf54l: remove
 configuration of DCDC regulator"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit aaa933a19955e697d9999583a5ba1bb3db884839.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54l/soc.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index f70675517b8..b0ed4ba0ef7 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -153,6 +153,11 @@ static int nordicsemi_nrf54l_init(void)
 	}
 
 #if (DT_PROP(DT_NODELABEL(vregmain), regulator_initial_mode) == NRF5X_REG_MODE_DCDC)
+#if defined(__CORTEX_M) && !defined(NRF_TRUSTZONE_NONSECURE) && defined(__ARM_FEATURE_CMSE)
+	if (*(uint32_t volatile *)0x00FFC334 <= 0x180A1D00) {
+		*(uint32_t volatile *)0x50120640 = 0x1EA9E040;
+	}
+#endif
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);
 #endif
 

From e5a095f1caaa2c4debdfbb269170bd87b7d092ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:21 +0100
Subject: [PATCH 1315/2913] Revert "[nrf fromtree] soc: nordic: nrf54h: disable
 IRQ before PM config"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3cda675d719de500459fd42b625a0062883a7456.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54h/pm_s2ram.c | 3 +++
 soc/nordic/nrf54h/power.c    | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/soc/nordic/nrf54h/pm_s2ram.c b/soc/nordic/nrf54h/pm_s2ram.c
index 20c28e42df5..88529c4bb75 100644
--- a/soc/nordic/nrf54h/pm_s2ram.c
+++ b/soc/nordic/nrf54h/pm_s2ram.c
@@ -111,15 +111,18 @@ int soc_s2ram_suspend(pm_s2ram_system_off_fn_t system_off)
 {
 	int ret;
 
+	__disable_irq();
 	nvic_suspend(&backup_data.nvic_context);
 	mpu_suspend(&backup_data.mpu_context);
 	ret = arch_pm_s2ram_suspend(system_off);
 	if (ret < 0) {
+		__enable_irq();
 		return ret;
 	}
 
 	mpu_resume(&backup_data.mpu_context);
 	nvic_resume(&backup_data.nvic_context);
+	__enable_irq();
 
 	return ret;
 }
diff --git a/soc/nordic/nrf54h/power.c b/soc/nordic/nrf54h/power.c
index a3b39a4c5fe..07a49609151 100644
--- a/soc/nordic/nrf54h/power.c
+++ b/soc/nordic/nrf54h/power.c
@@ -174,19 +174,15 @@ static void s2ram_enter(void)
 void pm_state_set(enum pm_state state, uint8_t substate_id)
 {
 	if (state == PM_STATE_SUSPEND_TO_IDLE) {
-		__disable_irq();
 		s2idle_enter(substate_id);
 		/* Resume here. */
 		s2idle_exit(substate_id);
-		__enable_irq();
 	}
 #if defined(CONFIG_PM_S2RAM)
 	else if (state == PM_STATE_SUSPEND_TO_RAM) {
-		__disable_irq();
 		s2ram_enter();
 		/* On resuming or error we return exactly *HERE* */
 		s2ram_exit();
-		__enable_irq();
 	}
 #endif
 	else {

From 8802ee439ced6172d69da1a9f97cce00e26eee1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:21 +0100
Subject: [PATCH 1316/2913] Revert "[nrf fromtree] dts: arm: nordic: Add power
 states for nRF54H20"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a83331b6b5dfa5aa1fb9a6606a36149c8cd7c3b4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/common/nordic/nrf54h20.dtsi | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 6d4f50a57c6..2e1f2ea8376 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -31,7 +31,7 @@
 			device_type = "cpu";
 			clocks = <&cpuapp_hsfll>;
 			clock-frequency = <DT_FREQ_M(320)>;
-			cpu-power-states = <&idle_cache_disabled &s2ram>;
+			cpu-power-states = <&idle &s2ram>;
 		};
 
 		cpurad: cpu@3 {
@@ -40,7 +40,6 @@
 			device_type = "cpu";
 			clocks = <&cpurad_hsfll>;
 			clock-frequency = <DT_FREQ_M(256)>;
-			cpu-power-states = <&idle_cache_disabled>;
 		};
 
 		cpuppr: cpu@d {
@@ -129,14 +128,12 @@
 		};
 
 		power-states {
-			// substate-id = <0>; is reserved for "idle", cache powered on
-			// substate-id = <1>; is reserved for "idle-cache-retained"
-			idle_cache_disabled: idle_cache_disabled {
+			idle: idle {
 				compatible = "zephyr,power-state";
 				power-state-name = "suspend-to-idle";
-				substate-id = <2>;
 				min-residency-us = <100000>;
 			};
+
 			s2ram: s2ram {
 				compatible = "zephyr,power-state";
 				power-state-name = "suspend-to-ram";

From c94a966e41e03343d12b3b48673a8222d0c89629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:21 +0100
Subject: [PATCH 1317/2913] Revert "[nrf fromtree] soc: nordic: Add LRCCONF
 management"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 899a506915c2a119686b13218159a8f0cb4a8a6f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../clock_control/clock_control_nrf2_common.c |  35 ++++
 .../clock_control/clock_control_nrf2_common.h |  10 ++
 .../clock_control/clock_control_nrf2_fll16m.c |   8 +-
 .../clock_control/clock_control_nrf2_hfxo.c   |   8 +-
 soc/nordic/common/CMakeLists.txt              |   3 -
 soc/nordic/common/soc_lrcconf.c               |  62 -------
 soc/nordic/common/soc_lrcconf.h               |  34 ----
 soc/nordic/nrf54h/power.c                     | 151 ++++++------------
 soc/nordic/nrf54h/soc.c                       |  12 +-
 9 files changed, 110 insertions(+), 213 deletions(-)
 delete mode 100644 soc/nordic/common/soc_lrcconf.c
 delete mode 100644 soc/nordic/common/soc_lrcconf.h

diff --git a/drivers/clock_control/clock_control_nrf2_common.c b/drivers/clock_control/clock_control_nrf2_common.c
index f3b21a5dd1f..7f8f2cbcd42 100644
--- a/drivers/clock_control/clock_control_nrf2_common.c
+++ b/drivers/clock_control/clock_control_nrf2_common.c
@@ -4,6 +4,7 @@
  */
 
 #include "clock_control_nrf2_common.h"
+#include <hal/nrf_lrcconf.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
@@ -24,6 +25,9 @@ LOG_MODULE_REGISTER(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
  */
 STRUCT_CLOCK_CONFIG(generic, ONOFF_CNT_MAX);
 
+static sys_slist_t poweron_main_list;
+static struct k_spinlock poweron_main_lock;
+
 static void update_config(struct clock_config_generic *cfg)
 {
 	atomic_val_t prev_flags = atomic_or(&cfg->flags, FLAG_UPDATE_NEEDED);
@@ -159,3 +163,34 @@ int api_nosys_on_off(const struct device *dev, clock_control_subsys_t sys)
 
 	return -ENOSYS;
 }
+
+void clock_request_lrcconf_poweron_main(struct clock_lrcconf_sink *sink)
+{
+	K_SPINLOCK(&poweron_main_lock) {
+		if (sys_slist_len(&poweron_main_list) == 0) {
+			LOG_DBG("%s forced on", "main domain");
+			NRF_LRCCONF010->POWERON &= ~LRCCONF_POWERON_MAIN_Msk;
+			NRF_LRCCONF010->POWERON |= LRCCONF_POWERON_MAIN_AlwaysOn;
+		}
+
+		sys_slist_find_and_remove(&poweron_main_list, &sink->node);
+		sys_slist_append(&poweron_main_list, &sink->node);
+	}
+}
+
+void clock_release_lrcconf_poweron_main(struct clock_lrcconf_sink *sink)
+{
+	K_SPINLOCK(&poweron_main_lock) {
+		if (!sys_slist_find_and_remove(&poweron_main_list, &sink->node)) {
+			K_SPINLOCK_BREAK;
+		}
+
+		if (sys_slist_len(&poweron_main_list) > 0) {
+			K_SPINLOCK_BREAK;
+		}
+
+		LOG_DBG("%s automatic", "main domain");
+		NRF_LRCCONF010->POWERON &= ~LRCCONF_POWERON_MAIN_Msk;
+		NRF_LRCCONF010->POWERON |= LRCCONF_POWERON_MAIN_Automatic;
+	}
+}
diff --git a/drivers/clock_control/clock_control_nrf2_common.h b/drivers/clock_control/clock_control_nrf2_common.h
index 858698c38ea..67d303c132d 100644
--- a/drivers/clock_control/clock_control_nrf2_common.h
+++ b/drivers/clock_control/clock_control_nrf2_common.h
@@ -75,4 +75,14 @@ void clock_config_update_end(void *clk_cfg, int status);
 
 int api_nosys_on_off(const struct device *dev, clock_control_subsys_t sys);
 
+struct clock_lrcconf_sink {
+	sys_snode_t node;
+};
+
+/**
+ * @brief Request or release lrcconf main power domain
+ */
+void clock_request_lrcconf_poweron_main(struct clock_lrcconf_sink *sink);
+void clock_release_lrcconf_poweron_main(struct clock_lrcconf_sink *sink);
+
 #endif /* ZEPHYR_DRIVERS_CLOCK_CONTROL_NRF2_COMMON_H_ */
diff --git a/drivers/clock_control/clock_control_nrf2_fll16m.c b/drivers/clock_control/clock_control_nrf2_fll16m.c
index 613e433e527..7462d822f44 100644
--- a/drivers/clock_control/clock_control_nrf2_fll16m.c
+++ b/drivers/clock_control/clock_control_nrf2_fll16m.c
@@ -8,7 +8,7 @@
 #include "clock_control_nrf2_common.h"
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
-#include <soc_lrcconf.h>
+#include <hal/nrf_lrcconf.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
@@ -64,7 +64,7 @@ static const struct clock_options {
 struct fll16m_dev_data {
 	STRUCT_CLOCK_CONFIG(fll16m, ARRAY_SIZE(clock_options)) clk_cfg;
 	struct onoff_client hfxo_cli;
-	sys_snode_t fll16m_node;
+	struct clock_lrcconf_sink lrcconf_sink;
 };
 
 struct fll16m_dev_config {
@@ -76,13 +76,13 @@ static void activate_fll16m_mode(struct fll16m_dev_data *dev_data, uint8_t mode)
 	/* TODO: change to nrf_lrcconf_* function when such is available. */
 
 	if (mode != FLL16M_MODE_DEFAULT) {
-		soc_lrcconf_poweron_request(&dev_data->fll16m_node, NRF_LRCCONF_POWER_MAIN);
+		clock_request_lrcconf_poweron_main(&dev_data->lrcconf_sink);
 	}
 
 	NRF_LRCCONF010->CLKCTRL[0].SRC = mode;
 
 	if (mode == FLL16M_MODE_DEFAULT) {
-		soc_lrcconf_poweron_release(&dev_data->fll16m_node, NRF_LRCCONF_POWER_MAIN);
+		clock_release_lrcconf_poweron_main(&dev_data->lrcconf_sink);
 	}
 
 	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_CLKSTART_0);
diff --git a/drivers/clock_control/clock_control_nrf2_hfxo.c b/drivers/clock_control/clock_control_nrf2_hfxo.c
index 977c0aaa0d6..ca49d9015cc 100644
--- a/drivers/clock_control/clock_control_nrf2_hfxo.c
+++ b/drivers/clock_control/clock_control_nrf2_hfxo.c
@@ -11,7 +11,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
 
-#include <soc_lrcconf.h>
+#include <hal/nrf_lrcconf.h>
 
 BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
 	     "multiple instances not supported");
@@ -20,7 +20,7 @@ struct dev_data_hfxo {
 	struct onoff_manager mgr;
 	onoff_notify_fn notify;
 	struct k_timer timer;
-	sys_snode_t hfxo_node;
+	struct clock_lrcconf_sink lrcconf_sink;
 };
 
 struct dev_config_hfxo {
@@ -58,7 +58,7 @@ static void onoff_start_hfxo(struct onoff_manager *mgr, onoff_notify_fn notify)
 	dev_data->notify = notify;
 
 	nrf_lrcconf_event_clear(NRF_LRCCONF010, NRF_LRCCONF_EVENT_HFXOSTARTED);
-	soc_lrcconf_poweron_request(&dev_data->hfxo_node, NRF_LRCCONF_POWER_MAIN);
+	clock_request_lrcconf_poweron_main(&dev_data->lrcconf_sink);
 	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_REQHFXO);
 
 	/* Due to a hardware issue, the HFXOSTARTED event is currently
@@ -74,7 +74,7 @@ static void onoff_stop_hfxo(struct onoff_manager *mgr, onoff_notify_fn notify)
 		CONTAINER_OF(mgr, struct dev_data_hfxo, mgr);
 
 	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_STOPREQHFXO);
-	soc_lrcconf_poweron_release(&dev_data->hfxo_node, NRF_LRCCONF_POWER_MAIN);
+	clock_release_lrcconf_poweron_main(&dev_data->lrcconf_sink);
 	notify(mgr, 0);
 }
 
diff --git a/soc/nordic/common/CMakeLists.txt b/soc/nordic/common/CMakeLists.txt
index 4808319557c..1a4e17c20d1 100644
--- a/soc/nordic/common/CMakeLists.txt
+++ b/soc/nordic/common/CMakeLists.txt
@@ -12,9 +12,6 @@ if(CONFIG_ARM)
 endif()
 
 zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c)
-if(CONFIG_ARM)
-  zephyr_library_sources_ifdef(CONFIG_NRF_PLATFORM_HALTIUM soc_lrcconf.c)
-endif()
 
 if((CONFIG_SOC_SERIES_NRF54HX OR CONFIG_SOC_SERIES_NRF92X) AND CONFIG_CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS)
   zephyr_library_sources(nrf54hx_nrf92x_mpu_regions.c)
diff --git a/soc/nordic/common/soc_lrcconf.c b/soc/nordic/common/soc_lrcconf.c
deleted file mode 100644
index da6dbf10b3f..00000000000
--- a/soc/nordic/common/soc_lrcconf.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <soc_lrcconf.h>
-#include <zephyr/kernel.h>
-
-static struct k_spinlock lock;
-static sys_slist_t poweron_main_list;
-static sys_slist_t poweron_active_list;
-
-void soc_lrcconf_poweron_request(sys_snode_t *node, nrf_lrcconf_power_domain_mask_t domain)
-{
-	__ASSERT(is_power_of_two(domain), "Only one bit can be set for the domain parameter");
-
-	sys_slist_t *poweron_list;
-
-	if (domain == NRF_LRCCONF_POWER_MAIN) {
-		poweron_list = &poweron_main_list;
-	} else if (domain == NRF_LRCCONF_POWER_DOMAIN_0) {
-		poweron_list = &poweron_active_list;
-	} else {
-		return;
-	}
-
-	K_SPINLOCK(&lock) {
-		if (sys_slist_len(poweron_list) == 0) {
-			nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, domain, true);
-		}
-
-		sys_slist_find_and_remove(poweron_list, node);
-		sys_slist_append(poweron_list, node);
-	}
-}
-
-void soc_lrcconf_poweron_release(sys_snode_t *node, nrf_lrcconf_power_domain_mask_t domain)
-{
-	__ASSERT(is_power_of_two(domain), "Only one bit can be set for the domain parameter");
-
-	sys_slist_t *poweron_list;
-
-	if (domain == NRF_LRCCONF_POWER_MAIN) {
-		poweron_list = &poweron_main_list;
-	} else if (domain == NRF_LRCCONF_POWER_DOMAIN_0) {
-		poweron_list = &poweron_active_list;
-	} else {
-		return;
-	}
-
-	K_SPINLOCK(&lock) {
-		if (!sys_slist_find_and_remove(poweron_list, node)) {
-			K_SPINLOCK_BREAK;
-		}
-
-		if (sys_slist_len(poweron_list) > 0) {
-			K_SPINLOCK_BREAK;
-		}
-		nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, domain, false);
-	}
-}
diff --git a/soc/nordic/common/soc_lrcconf.h b/soc/nordic/common/soc_lrcconf.h
deleted file mode 100644
index 5ce47112529..00000000000
--- a/soc/nordic/common/soc_lrcconf.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @file nRF SoC specific helpers for lrcconf management
- */
-
-#ifndef ZEPHYR_SOC_NORDIC_COMMON_LRCCONF_H_
-#define ZEPHYR_SOC_NORDIC_COMMON_LRCCONF_H_
-
-#include <hal/nrf_lrcconf.h>
-
-/**
- * @brief Request lrcconf power domain
- *
- * @param node	 Pointer to the @ref sys_snode_t structure which is the ID of the
- *		 requesting module.
- * @param domain The mask that represents the power domain ID.
- */
-void soc_lrcconf_poweron_request(sys_snode_t *node, nrf_lrcconf_power_domain_mask_t domain);
-
-/**
- * @brief Release lrcconf power domain
- *
- * @param node	 Pointer to the @ref sys_snode_t structure which is the ID of the
- *		 requesting module.
- * @param domain The mask that represents the power domain ID.
- */
-void soc_lrcconf_poweron_release(sys_snode_t *node, nrf_lrcconf_power_domain_mask_t domain);
-
-#endif /* ZEPHYR_SOC_NORDIC_COMMON_LRCCONF_H_ */
diff --git a/soc/nordic/nrf54h/power.c b/soc/nordic/nrf54h/power.c
index 07a49609151..ad7ae18d9bb 100644
--- a/soc/nordic/nrf54h/power.c
+++ b/soc/nordic/nrf54h/power.c
@@ -9,24 +9,20 @@
 #include <zephyr/pm/policy.h>
 #include <zephyr/arch/common/pm_s2ram.h>
 #include <hal/nrf_resetinfo.h>
+#include <hal/nrf_lrcconf.h>
 #include <hal/nrf_memconf.h>
 #include <zephyr/cache.h>
 #include <power.h>
-#include <soc_lrcconf.h>
-#include "soc.h"
 #include "pm_s2ram.h"
 
-extern sys_snode_t soc_node;
-
-static void common_suspend(void)
+static void suspend_common(void)
 {
-	if (IS_ENABLED(CONFIG_DCACHE)) {
-		/* Flush, disable and power down DCACHE */
-		sys_cache_data_flush_all();
-		sys_cache_data_disable();
-		nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
-							RAMBLOCK_CONTROL_BIT_DCACHE, false);
-	}
+
+	/* Flush, disable and power down DCACHE */
+	sys_cache_data_flush_all();
+	sys_cache_data_disable();
+	nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
+						RAMBLOCK_CONTROL_BIT_DCACHE, false);
 
 	if (IS_ENABLED(CONFIG_ICACHE)) {
 		/* Disable and power down ICACHE */
@@ -35,26 +31,9 @@ static void common_suspend(void)
 							RAMBLOCK_CONTROL_BIT_ICACHE, false);
 	}
 
-	soc_lrcconf_poweron_release(&soc_node, NRF_LRCCONF_POWER_DOMAIN_0);
-}
-
-static void common_resume(void)
-{
-	if (IS_ENABLED(CONFIG_ICACHE)) {
-		/* Power up and re-enable ICACHE */
-		nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
-							RAMBLOCK_CONTROL_BIT_ICACHE, true);
-		sys_cache_instr_enable();
-	}
-
-	if (IS_ENABLED(CONFIG_DCACHE)) {
-		/* Power up and re-enable DCACHE */
-		nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
-							RAMBLOCK_CONTROL_BIT_DCACHE, true);
-		sys_cache_data_enable();
-	}
-
-	soc_lrcconf_poweron_request(&soc_node, NRF_LRCCONF_POWER_DOMAIN_0);
+	/* Disable retention */
+	nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, false);
+	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, false);
 }
 
 void nrf_poweroff(void)
@@ -62,12 +41,13 @@ void nrf_poweroff(void)
 	nrf_resetinfo_resetreas_local_set(NRF_RESETINFO, 0);
 	nrf_resetinfo_restore_valid_set(NRF_RESETINFO, false);
 
-#if !defined(CONFIG_SOC_NRF54H20_CPURAD)
-	/* Disable retention */
 	nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_MAIN, false);
-	nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, false);
-#endif
-	common_suspend();
+
+	/* TODO: Move it around k_cpu_idle() implementation. */
+	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_MAIN, false);
+	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, false);
+
+	suspend_common();
 
 	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_SYSTEMOFFREADY);
 
@@ -79,57 +59,30 @@ void nrf_poweroff(void)
 	CODE_UNREACHABLE;
 }
 
-static void s2idle_enter(uint8_t substate_id)
+#if IS_ENABLED(CONFIG_PM_S2RAM)
+/* Resume domain after local suspend to RAM. */
+static void sys_resume(void)
 {
-	switch (substate_id) {
-	case 0:
-		/* Substate for idle with cache powered on - not implemented yet. */
-		break;
-	case 1: /* Substate for idle with cache retained - not implemented yet. */
-		break;
-	case 2: /* Substate for idle with cache disabled. */
-#if !defined(CONFIG_SOC_NRF54H20_CPURAD)
-		soc_lrcconf_poweron_request(&soc_node, NRF_LRCCONF_POWER_MAIN);
-#endif
-		common_suspend();
-		break;
-	default: /* Unknown substate. */
-		return;
+	if (IS_ENABLED(CONFIG_ICACHE)) {
+		/* Power up and re-enable ICACHE */
+		nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
+							RAMBLOCK_CONTROL_BIT_ICACHE, true);
+		sys_cache_instr_enable();
 	}
 
-	__set_BASEPRI(0);
-	__ISB();
-	__DSB();
-	__WFI();
-}
-
-static void s2idle_exit(uint8_t substate_id)
-{
-	switch (substate_id) {
-	case 0:
-		/* Substate for idle with cache powered on - not implemented yet. */
-		break;
-	case 1: /* Substate for idle with cache retained - not implemented yet. */
-		break;
-	case 2: /* Substate for idle with cache disabled. */
-		common_resume();
-#if !defined(CONFIG_SOC_NRF54H20_CPURAD)
-		soc_lrcconf_poweron_release(&soc_node, NRF_LRCCONF_POWER_MAIN);
-#endif
-	default: /* Unknown substate. */
-		return;
+	if (IS_ENABLED(CONFIG_DCACHE)) {
+		/* Power up and re-enable DCACHE */
+		nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
+							RAMBLOCK_CONTROL_BIT_DCACHE, true);
+		sys_cache_data_enable();
 	}
-}
 
-#if defined(CONFIG_PM_S2RAM)
-/* Resume domain after local suspend to RAM. */
-static void s2ram_exit(void)
-{
-	common_resume();
-#if !defined(CONFIG_SOC_NRF54H20_CPURAD)
 	/* Re-enable domain retention. */
 	nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, true);
-#endif
+
+	/* TODO: Move it around k_cpu_idle() implementation. */
+	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_MAIN,
+				      !IS_ENABLED(CONFIG_SOC_NRF54H20_CPURAD));
 }
 
 /* Function called during local domain suspend to RAM. */
@@ -141,12 +94,10 @@ static int sys_suspend_to_ram(void)
 	nrf_resetinfo_resetreas_local_set(NRF_RESETINFO,
 					  NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK);
 	nrf_resetinfo_restore_valid_set(NRF_RESETINFO, true);
+	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, false);
+	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_MAIN, false);
 
-#if !defined(CONFIG_SOC_NRF54H20_CPURAD)
-	/* Disable retention */
-	nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, false);
-#endif
-	common_suspend();
+	suspend_common();
 
 	__set_BASEPRI(0);
 	__ISB();
@@ -159,7 +110,7 @@ static int sys_suspend_to_ram(void)
 	return -EBUSY;
 }
 
-static void s2ram_enter(void)
+static void do_suspend_to_ram(void)
 {
 	/*
 	 * Save the CPU context (including the return address),set the SRAM
@@ -168,26 +119,24 @@ static void s2ram_enter(void)
 	if (soc_s2ram_suspend(sys_suspend_to_ram)) {
 		return;
 	}
+
+	/*
+	 * On resuming or error we return exactly *HERE*
+	 */
+
+	sys_resume();
 }
-#endif /* defined(CONFIG_PM_S2RAM) */
+#endif /* IS_ENABLED(CONFIG_PM_S2RAM) */
 
 void pm_state_set(enum pm_state state, uint8_t substate_id)
 {
-	if (state == PM_STATE_SUSPEND_TO_IDLE) {
-		s2idle_enter(substate_id);
-		/* Resume here. */
-		s2idle_exit(substate_id);
-	}
-#if defined(CONFIG_PM_S2RAM)
-	else if (state == PM_STATE_SUSPEND_TO_RAM) {
-		s2ram_enter();
-		/* On resuming or error we return exactly *HERE* */
-		s2ram_exit();
-	}
-#endif
-	else {
+	if (state != PM_STATE_SUSPEND_TO_RAM) {
 		k_cpu_idle();
+		return;
 	}
+#if IS_ENABLED(CONFIG_PM_S2RAM)
+	do_suspend_to_ram();
+#endif
 }
 
 void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
diff --git a/soc/nordic/nrf54h/soc.c b/soc/nordic/nrf54h/soc.c
index 43c84e1b9a7..4ffb17bef51 100644
--- a/soc/nordic/nrf54h/soc.c
+++ b/soc/nordic/nrf54h/soc.c
@@ -19,7 +19,6 @@
 #include <hal/nrf_spu.h>
 #include <hal/nrf_memconf.h>
 #include <soc/nrfx_coredep.h>
-#include <soc_lrcconf.h>
 #include <dmm.h>
 
 LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
@@ -30,8 +29,6 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 #define HSFLL_NODE DT_NODELABEL(cpurad_hsfll)
 #endif
 
-sys_snode_t soc_node;
-
 #define FICR_ADDR_GET(node_id, name)                                           \
 	DT_REG_ADDR(DT_PHANDLE_BY_NAME(node_id, nordic_ficrs, name)) +         \
 		DT_PHA_BY_NAME(node_id, nordic_ficrs, name, offset)
@@ -55,9 +52,13 @@ static void power_domain_init(void)
 	 *  WFI the power domain will be correctly retained.
 	 */
 
-	soc_lrcconf_poweron_request(&soc_node, NRF_LRCCONF_POWER_DOMAIN_0);
-	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_MAIN, false);
+	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0,
+				      !IS_ENABLED(CONFIG_SOC_NRF54H20_CPURAD));
+	nrf_lrcconf_poweron_force_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_MAIN,
+				      !IS_ENABLED(CONFIG_SOC_NRF54H20_CPURAD));
 
+	nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_MAIN, true);
+	nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, true);
 	nrf_memconf_ramblock_ret_enable_set(NRF_MEMCONF, 0, RAMBLOCK_RET_BIT_ICACHE, false);
 	nrf_memconf_ramblock_ret_enable_set(NRF_MEMCONF, 0, RAMBLOCK_RET_BIT_DCACHE, false);
 	nrf_memconf_ramblock_ret_enable_set(NRF_MEMCONF, 1, RAMBLOCK_RET_BIT_ICACHE, false);
@@ -121,6 +122,7 @@ bool z_arm_on_enter_cpu_idle(void)
 #ifdef CONFIG_LOG_FRONTEND_STMESP
 	log_frontend_stmesp_pre_sleep();
 #endif
+
 	return true;
 }
 #endif

From 74b24674fe19d92ce281111033faa2b40a8f367a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:21 +0100
Subject: [PATCH 1318/2913] Revert "[nrf fromtree] drivers: udc_dwc2: Wait for
 USBHS clock start"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a0511567799961a7b4cc09f37baad2f97ada5c5e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2_vendor_quirks.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2_vendor_quirks.h b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
index f45404c2b84..d12d64ef848 100644
--- a/drivers/usb/udc/udc_dwc2_vendor_quirks.h
+++ b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
@@ -201,9 +201,6 @@ static inline int usbhs_enable_core(const struct device *dev)
 	wrapper->ENABLE = USBHS_ENABLE_PHY_Msk | USBHS_ENABLE_CORE_Msk;
 	wrapper->TASKS_START = 1UL;
 
-	/* Wait for clock to start to avoid hang on too early register read */
-	k_busy_wait(1);
-
 	/* Enable interrupts */
 	wrapper->INTENSET = 1UL;
 

From 9cb8cea204af72ff75610fcdcfd86db860a4f5db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:21 +0100
Subject: [PATCH 1319/2913] Revert "[nrf fromtree] drivers: udc_dwc2:
 Workaround endpoint disable race condition"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b56a27fd9ec44736cfef822b7a0b8ddffebfaf1d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 7f1256a10f0..da9faf22fa4 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -1402,19 +1402,6 @@ static void udc_dwc2_ep_disable(const struct device *dev,
 		return;
 	}
 
-	/* FIXME: This function needs to be changed to not synchronously wait
-	 * for the events to happen because the actions here are racing against
-	 * the USB host packets. It is possible that the IN token or OUT DATA
-	 * gets sent shortly before this function disables the endpoint. If this
-	 * happens, the XferCompl would be set and driver will incorrectly think
-	 * that either:
-	 *   * never queued transfer finished, OR
-	 *   * transfer queued in incompisoin handler finished (before it really
-	 *     does and then it'll "double"-finish when it actually finishes)
-	 *
-	 * For the time being XferCompl is cleared as a workaround.
-	 */
-
 	if (USB_EP_DIR_IS_OUT(cfg->addr)) {
 		mem_addr_t dctl_reg, gintsts_reg, doepint_reg;
 		uint32_t dctl;
@@ -1453,7 +1440,7 @@ static void udc_dwc2_ep_disable(const struct device *dev,
 		}
 
 		/* Clear Endpoint Disabled interrupt */
-		sys_write32(USB_DWC2_DOEPINT_EPDISBLD | USB_DWC2_DOEPINT_XFERCOMPL, doepint_reg);
+		sys_write32(USB_DWC2_DIEPINT_EPDISBLD, doepint_reg);
 
 		dctl |= USB_DWC2_DCTL_CGOUTNAK;
 		sys_write32(dctl, dctl_reg);
@@ -1477,7 +1464,7 @@ static void udc_dwc2_ep_disable(const struct device *dev,
 		dwc2_wait_for_bit(dev, diepint_reg, USB_DWC2_DIEPINT_EPDISBLD);
 
 		/* Clear Endpoint Disabled interrupt */
-		sys_write32(USB_DWC2_DIEPINT_EPDISBLD | USB_DWC2_DIEPINT_XFERCOMPL, diepint_reg);
+		sys_write32(USB_DWC2_DIEPINT_EPDISBLD, diepint_reg);
 
 		/* TODO: Read DIEPTSIZn here? Programming Guide suggest it to
 		 * let application know how many bytes of interrupted transfer

From 20f0bb0d46f3616ea3b4285fa98f1ae626c1069a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:21 +0100
Subject: [PATCH 1320/2913] Revert "[nrf fromtree] usb: device_next: uac2:
 Double buffering on IN data endpoints"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5d6f03e768de776edb68631800bd6b926c1cadbb.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/usb/device_next/class/usbd_uac2.c | 30 ++++++++++--------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/subsys/usb/device_next/class/usbd_uac2.c b/subsys/usb/device_next/class/usbd_uac2.c
index f3e1a707b33..0e7144ec622 100644
--- a/subsys/usb/device_next/class/usbd_uac2.c
+++ b/subsys/usb/device_next/class/usbd_uac2.c
@@ -20,15 +20,14 @@ LOG_MODULE_REGISTER(usbd_uac2, CONFIG_USBD_UAC2_LOG_LEVEL);
 
 #define DT_DRV_COMPAT zephyr_uac2
 
-#define COUNT_UAC2_AS_ENDPOINT_BUFFERS(node)					\
+#define COUNT_UAC2_AS_ENDPOINTS(node)						\
 	IF_ENABLED(DT_NODE_HAS_COMPAT(node, zephyr_uac2_audio_streaming), (	\
 		+ AS_HAS_ISOCHRONOUS_DATA_ENDPOINT(node) +			\
-		+ AS_IS_USB_ISO_IN(node) /* ISO IN double buffering */ +	\
 		AS_HAS_EXPLICIT_FEEDBACK_ENDPOINT(node)))
-#define COUNT_UAC2_EP_BUFFERS(i)						\
+#define COUNT_UAC2_ENDPOINTS(i)							\
 	+ DT_PROP(DT_DRV_INST(i), interrupt_endpoint)				\
-	DT_INST_FOREACH_CHILD(i, COUNT_UAC2_AS_ENDPOINT_BUFFERS)
-#define UAC2_NUM_EP_BUFFERS DT_INST_FOREACH_STATUS_OKAY(COUNT_UAC2_EP_BUFFERS)
+	DT_INST_FOREACH_CHILD(i, COUNT_UAC2_AS_ENDPOINTS)
+#define UAC2_NUM_ENDPOINTS DT_INST_FOREACH_STATUS_OKAY(COUNT_UAC2_ENDPOINTS)
 
 /* Net buf is used mostly with external data. The main reason behind external
  * data is avoiding unnecessary isochronous data copy operations.
@@ -41,7 +40,7 @@ LOG_MODULE_REGISTER(usbd_uac2, CONFIG_USBD_UAC2_LOG_LEVEL);
  * "wasted memory" here is likely to be smaller than the memory overhead for
  * more complex "only as much as needed" schemes (e.g. heap).
  */
-UDC_BUF_POOL_DEFINE(uac2_pool, UAC2_NUM_EP_BUFFERS, 6,
+UDC_BUF_POOL_DEFINE(uac2_pool, UAC2_NUM_ENDPOINTS, 6,
 		    sizeof(struct udc_buf_info), NULL);
 
 /* 5.2.2 Control Request Layout */
@@ -81,7 +80,6 @@ struct uac2_ctx {
 	 */
 	atomic_t as_active;
 	atomic_t as_queued;
-	atomic_t as_double;
 	uint32_t fb_queued;
 };
 
@@ -249,7 +247,6 @@ int usbd_uac2_send(const struct device *dev, uint8_t terminal,
 	struct uac2_ctx *ctx = dev->data;
 	struct net_buf *buf;
 	const struct usb_ep_descriptor *desc;
-	atomic_t *queued_bits = &ctx->as_queued;
 	uint8_t ep = 0;
 	int as_idx = terminal_to_as_interface(dev, terminal);
 	int ret;
@@ -270,12 +267,9 @@ int usbd_uac2_send(const struct device *dev, uint8_t terminal,
 		return 0;
 	}
 
-	if (atomic_test_and_set_bit(queued_bits, as_idx)) {
-		queued_bits = &ctx->as_double;
-		if (atomic_test_and_set_bit(queued_bits, as_idx)) {
-			LOG_DBG("Already double queued on 0x%02x", ep);
-			return -EAGAIN;
-		}
+	if (atomic_test_and_set_bit(&ctx->as_queued, as_idx)) {
+		LOG_ERR("Previous send not finished yet on 0x%02x", ep);
+		return -EAGAIN;
 	}
 
 	buf = uac2_buf_alloc(ep, data, size);
@@ -284,7 +278,7 @@ int usbd_uac2_send(const struct device *dev, uint8_t terminal,
 		 * enough, but if it does all we loose is just single packet.
 		 */
 		LOG_ERR("No netbuf for send");
-		atomic_clear_bit(queued_bits, as_idx);
+		atomic_clear_bit(&ctx->as_queued, as_idx);
 		ctx->ops->buf_release_cb(dev, terminal, data, ctx->user_data);
 		return -ENOMEM;
 	}
@@ -293,7 +287,7 @@ int usbd_uac2_send(const struct device *dev, uint8_t terminal,
 	if (ret) {
 		LOG_ERR("Failed to enqueue net_buf for 0x%02x", ep);
 		net_buf_unref(buf);
-		atomic_clear_bit(queued_bits, as_idx);
+		atomic_clear_bit(&ctx->as_queued, as_idx);
 		ctx->ops->buf_release_cb(dev, terminal, data, ctx->user_data);
 	}
 
@@ -767,8 +761,8 @@ static int uac2_request(struct usbd_class_data *const c_data, struct net_buf *bu
 
 	if (is_feedback) {
 		ctx->fb_queued &= ~BIT(as_idx);
-	} else if (!atomic_test_and_clear_bit(&ctx->as_queued, as_idx) || buf->frags) {
-		atomic_clear_bit(&ctx->as_double, as_idx);
+	} else {
+		atomic_clear_bit(&ctx->as_queued, as_idx);
 	}
 
 	if (USB_EP_DIR_IS_OUT(ep)) {

From 29a5154ab09197dbf0477e32fbc1f630b4e7d1ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:21 +0100
Subject: [PATCH 1321/2913] Revert "[nrf fromtree] drivers: udc_dwc2: Queue
 next packet on incomplete iso IN interrupt"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 527fbb4dddb4b1081b3bde3bf41576e4c4076b53.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index da9faf22fa4..2ecf230baaf 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -2572,11 +2572,7 @@ static void dwc2_handle_incompisoin(const struct device *dev)
 
 				buf = udc_buf_get(dev, cfg->addr);
 				if (buf) {
-					/* Data is no longer relevant */
 					udc_submit_ep_event(dev, buf, 0);
-
-					/* Try to queue next packet before SOF */
-					dwc2_handle_xfer_next(dev, cfg);
 				}
 			}
 		}

From 4c44d1c33bb72b37b3aa61587fd1449c0070eb32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:21 +0100
Subject: [PATCH 1322/2913] Revert "[nrf fromtree] drivers: udc_dwc2: Fix
 isochronous endpoint disable"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4e1073cf91afc9a5c2d7f6199097e714e864c221.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 2ecf230baaf..7e716201d3c 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -1387,12 +1387,11 @@ static void udc_dwc2_ep_disable(const struct device *dev,
 	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
 	mem_addr_t dxepctl_reg;
 	uint32_t dxepctl;
-	const bool is_iso = dwc2_ep_is_iso(cfg);
 
 	dxepctl_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
 	dxepctl = sys_read32(dxepctl_reg);
 
-	if (!is_iso && (dxepctl & USB_DWC2_DEPCTL_NAKSTS)) {
+	if (dxepctl & USB_DWC2_DEPCTL_NAKSTS) {
 		/* Endpoint already sends forced NAKs. STALL if necessary. */
 		if (stall) {
 			dxepctl |= USB_DWC2_DEPCTL_STALL;

From bd436ae84d4dedc9806cb12d0ff4b36669c9ffc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:21 +0100
Subject: [PATCH 1323/2913] Revert "[nrf fromtree] usb: device_next: fix null
 pointer dereference in Get Interface"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6171f7d7706e98fe0a61cceb86133c1bbc125a44.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/usb/device_next/usbd_ch9.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/subsys/usb/device_next/usbd_ch9.c b/subsys/usb/device_next/usbd_ch9.c
index ed7cf14f68d..6910c6df147 100644
--- a/subsys/usb/device_next/usbd_ch9.c
+++ b/subsys/usb/device_next/usbd_ch9.c
@@ -858,13 +858,7 @@ static int sreq_get_interface(struct usbd_context *const uds_ctx,
 		return 0;
 	}
 
-	/* Treat as error in default (not specified) and addressed states. */
 	cfg_nd = usbd_config_get_current(uds_ctx);
-	if (cfg_nd == NULL) {
-		errno = -EPERM;
-		return 0;
-	}
-
 	cfg_desc = cfg_nd->desc;
 
 	if (setup->wIndex > UINT8_MAX ||

From ebca7e421f1f4cbfefe75c32e97683876baa9a45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:21 +0100
Subject: [PATCH 1324/2913] Revert "[nrf fromtree] nrf_usbd_common: Do not
 trigger DMA in low power mode"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 92381442c98094a24e09480bbb288b5c6d23d3b3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/common/nrf_usbd_common/nrf_usbd_common.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/usb/common/nrf_usbd_common/nrf_usbd_common.c b/drivers/usb/common/nrf_usbd_common/nrf_usbd_common.c
index 9e502483765..fcd5cff5ef6 100644
--- a/drivers/usb/common/nrf_usbd_common/nrf_usbd_common.c
+++ b/drivers/usb/common/nrf_usbd_common/nrf_usbd_common.c
@@ -834,10 +834,9 @@ static void usbd_dmareq_process(void)
 {
 	if ((m_ep_dma_waiting & m_ep_ready) &&
 	    (k_sem_take(&dma_available, K_NO_WAIT) == 0)) {
-		const bool low_power = nrf_usbd_common_suspend_check();
 		uint32_t req;
 
-		while (!low_power && 0 != (req = m_ep_dma_waiting & m_ep_ready)) {
+		while (0 != (req = m_ep_dma_waiting & m_ep_ready)) {
 			uint8_t pos;
 
 			if (NRFX_USBD_CONFIG_DMASCHEDULER_ISO_BOOST &&
@@ -1311,11 +1310,7 @@ bool nrf_usbd_common_is_started(void)
 bool nrf_usbd_common_suspend(void)
 {
 	bool suspended = false;
-	unsigned int irq_lock_key;
-
-	/* DMA doesn't work in Low Power mode, ensure there is no active DMA */
-	k_sem_take(&dma_available, K_FOREVER);
-	irq_lock_key = irq_lock();
+	unsigned int irq_lock_key = irq_lock();
 
 	if (m_bus_suspend) {
 		if (!(NRF_USBD->EVENTCAUSE & USBD_EVENTCAUSE_RESUME_Msk)) {
@@ -1332,7 +1327,6 @@ bool nrf_usbd_common_suspend(void)
 	}
 
 	irq_unlock(irq_lock_key);
-	k_sem_give(&dma_available);
 
 	return suspended;
 }

From c0282b5fdf61e37eb75f5344e8f7b4b1eb360dfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:21 +0100
Subject: [PATCH 1325/2913] Revert "[nrf fromtree] drivers: udc_nrf: Handle
 Suspend and Resume in thread"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit dc2aeea09a1fa5335649b3f7682ebc0a2789c924.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_nrf.c | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/drivers/usb/udc/udc_nrf.c b/drivers/usb/udc/udc_nrf.c
index e7229174463..bf04a274ad6 100644
--- a/drivers/usb/udc/udc_nrf.c
+++ b/drivers/usb/udc/udc_nrf.c
@@ -443,22 +443,6 @@ static void udc_nrf_thread(void *p1, void *p2, void *p3)
 		case UDC_NRF_EVT_HAL:
 			ep = evt.hal_evt.data.eptransfer.ep;
 			switch (evt.hal_evt.type) {
-			case NRF_USBD_COMMON_EVT_SUSPEND:
-				LOG_INF("SUSPEND state detected");
-				nrf_usbd_common_suspend();
-				udc_set_suspended(udc_nrf_dev, true);
-				udc_submit_event(udc_nrf_dev, UDC_EVT_SUSPEND, 0);
-				break;
-			case NRF_USBD_COMMON_EVT_RESUME:
-				LOG_INF("RESUMING from suspend");
-				udc_set_suspended(udc_nrf_dev, false);
-				udc_submit_event(udc_nrf_dev, UDC_EVT_RESUME, 0);
-				break;
-			case NRF_USBD_COMMON_EVT_WUREQ:
-				LOG_INF("Remote wakeup initiated");
-				udc_set_suspended(udc_nrf_dev, false);
-				udc_submit_event(udc_nrf_dev, UDC_EVT_RESUME, 0);
-				break;
 			case NRF_USBD_COMMON_EVT_EPTRANSFER:
 				start_xfer = true;
 				if (USB_EP_DIR_IS_IN(ep)) {
@@ -515,6 +499,22 @@ static void udc_sof_check_iso_out(const struct device *dev)
 static void usbd_event_handler(nrf_usbd_common_evt_t const *const hal_evt)
 {
 	switch (hal_evt->type) {
+	case NRF_USBD_COMMON_EVT_SUSPEND:
+		LOG_INF("SUSPEND state detected");
+		nrf_usbd_common_suspend();
+		udc_set_suspended(udc_nrf_dev, true);
+		udc_submit_event(udc_nrf_dev, UDC_EVT_SUSPEND, 0);
+		break;
+	case NRF_USBD_COMMON_EVT_RESUME:
+		LOG_INF("RESUMING from suspend");
+		udc_set_suspended(udc_nrf_dev, false);
+		udc_submit_event(udc_nrf_dev, UDC_EVT_RESUME, 0);
+		break;
+	case NRF_USBD_COMMON_EVT_WUREQ:
+		LOG_INF("Remote wakeup initiated");
+		udc_set_suspended(udc_nrf_dev, false);
+		udc_submit_event(udc_nrf_dev, UDC_EVT_RESUME, 0);
+		break;
 	case NRF_USBD_COMMON_EVT_RESET:
 		LOG_INF("Reset");
 		udc_submit_event(udc_nrf_dev, UDC_EVT_RESET, 0);
@@ -523,9 +523,6 @@ static void usbd_event_handler(nrf_usbd_common_evt_t const *const hal_evt)
 		udc_submit_event(udc_nrf_dev, UDC_EVT_SOF, 0);
 		udc_sof_check_iso_out(udc_nrf_dev);
 		break;
-	case NRF_USBD_COMMON_EVT_SUSPEND:
-	case NRF_USBD_COMMON_EVT_RESUME:
-	case NRF_USBD_COMMON_EVT_WUREQ:
 	case NRF_USBD_COMMON_EVT_EPTRANSFER:
 	case NRF_USBD_COMMON_EVT_SETUP: {
 		struct udc_nrf_evt evt = {

From 752eb4c50575e4ab179f84d2768f1444449ddbde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:21 +0100
Subject: [PATCH 1326/2913] Revert "[nrf fromlist] tests: drivers: nrf_wifi:
 Add a build all test"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1eed7bf27b176aca6cfc666b18e015739419f596.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/drivers/wifi/nrf_wifi/CMakeLists.txt |  8 ---
 tests/drivers/wifi/nrf_wifi/prj.conf       | 84 ----------------------
 tests/drivers/wifi/nrf_wifi/src/main.c     | 10 ---
 tests/drivers/wifi/nrf_wifi/testcase.yaml  | 46 ------------
 4 files changed, 148 deletions(-)
 delete mode 100644 tests/drivers/wifi/nrf_wifi/CMakeLists.txt
 delete mode 100644 tests/drivers/wifi/nrf_wifi/prj.conf
 delete mode 100644 tests/drivers/wifi/nrf_wifi/src/main.c
 delete mode 100644 tests/drivers/wifi/nrf_wifi/testcase.yaml

diff --git a/tests/drivers/wifi/nrf_wifi/CMakeLists.txt b/tests/drivers/wifi/nrf_wifi/CMakeLists.txt
deleted file mode 100644
index d9d097f0bc0..00000000000
--- a/tests/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(build_nrf70_wifi_driver_all)
-
-FILE(GLOB app_sources src/*.c)
-target_sources(app PRIVATE ${app_sources})
diff --git a/tests/drivers/wifi/nrf_wifi/prj.conf b/tests/drivers/wifi/nrf_wifi/prj.conf
deleted file mode 100644
index 04bda53a4a6..00000000000
--- a/tests/drivers/wifi/nrf_wifi/prj.conf
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF70=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT=y
-CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
-
-CONFIG_TEST_RANDOM_GENERATOR=y
-# Networking
-CONFIG_NETWORKING=y
-CONFIG_NET_SOCKETS=y
-CONFIG_NET_LOG=y
-CONFIG_NET_IPV6=y
-CONFIG_NET_IPV4=y
-CONFIG_NET_UDP=y
-CONFIG_NET_TCP=y
-CONFIG_NET_DHCPV4=y
-CONFIG_DNS_RESOLVER=y
-
-CONFIG_NET_STATISTICS=y
-CONFIG_NET_STATISTICS_WIFI=y
-CONFIG_NET_STATISTICS_USER_API=y
-
-CONFIG_NET_PKT_RX_COUNT=8
-CONFIG_NET_PKT_TX_COUNT=8
-
-# Below section is the primary contributor to SRAM and is currently
-# tuned for performance, but this will be revisited in the future.
-CONFIG_NET_BUF_RX_COUNT=16
-CONFIG_NET_BUF_TX_COUNT=16
-CONFIG_NRF70_RX_NUM_BUFS=16
-CONFIG_NRF70_MAX_TX_AGGREGATION=4
-# nRF70 is main consumer: (16 + 8) * 1600 = ~40KB + ~40KB control path (experimental)
-CONFIG_HEAP_MEM_POOL_SIZE=100000
-CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y
-CONFIG_NET_TC_TX_COUNT=1
-
-CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=4
-CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=5
-CONFIG_NET_MAX_CONTEXTS=5
-CONFIG_NET_CONTEXT_SYNC_RECV=y
-
-CONFIG_INIT_STACKS=y
-
-# Memories
-CONFIG_MAIN_STACK_SIZE=5200
-CONFIG_SHELL_STACK_SIZE=5200
-
-CONFIG_NET_TX_STACK_SIZE=4096
-CONFIG_NET_RX_STACK_SIZE=4096
-
-# Debugging
-CONFIG_STACK_SENTINEL=y
-CONFIG_DEBUG_COREDUMP=y
-CONFIG_DEBUG_COREDUMP_BACKEND_LOGGING=y
-CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y
-CONFIG_SHELL_CMDS_RESIZE=n
-#CONFIG_DEBUG=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_INF=y
-
-# Kernel options
-CONFIG_ENTROPY_GENERATOR=y
-CONFIG_REBOOT=y
-
-# Logging
-CONFIG_LOG=y
-CONFIG_PRINTK=y
-CONFIG_SHELL=y
-CONFIG_SHELL_GETOPT=y
-CONFIG_DEVICE_SHELL=y
-CONFIG_POSIX_CLOCK=y
-CONFIG_DATE_SHELL=y
-CONFIG_NET_CONFIG_AUTO_INIT=n
-CONFIG_POSIX_API=y
-
-# printing of scan results puts pressure on queues in new locking
-# design in net_mgmt. So, use a higher timeout for a crowded
-# environment.
-CONFIG_NET_MGMT_EVENT_QUEUE_TIMEOUT=5000
-CONFIG_NET_SOCKETS_POLL_MAX=12
-CONFIG_NET_MGMT_EVENT_QUEUE_SIZE=16
diff --git a/tests/drivers/wifi/nrf_wifi/src/main.c b/tests/drivers/wifi/nrf_wifi/src/main.c
deleted file mode 100644
index a05ee591430..00000000000
--- a/tests/drivers/wifi/nrf_wifi/src/main.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-int main(void)
-{
-	return 0;
-}
diff --git a/tests/drivers/wifi/nrf_wifi/testcase.yaml b/tests/drivers/wifi/nrf_wifi/testcase.yaml
deleted file mode 100644
index f8dac0a1ea8..00000000000
--- a/tests/drivers/wifi/nrf_wifi/testcase.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-common:
-  build_only: true
-  tags:
-    - drivers
-    - wifi
-    - net
-  platform_allow:
-    - nrf7002dk/nrf5340/cpuapp
-tests:
-  nrf70.build.radio_test:
-    extra_configs:
-      - CONFIG_NRF70_RADIO_TEST=y
-      - CONFIG_NETWORKING=n
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
-  nrf70.build.scan_only:
-    extra_configs:
-      - CONFIG_NRF70_SCAN_ONLY=y
-      - CONFIG_NETWORKING=y
-      - CONFIG_NET_DHCPV4=n
-      - CONFIG_NET_NATIVE=n
-      - CONFIG_NET_OFFLOAD=y
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
-  nrf70.build.raw_scan_results:
-    extra_configs:
-      - CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS=y
-      - CONFIG_NRF70_SCAN_ONLY=y
-      - CONFIG_NETWORKING=y
-      - CONFIG_NET_DHCPV4=n
-      - CONFIG_NET_NATIVE=n
-      - CONFIG_NET_OFFLOAD=y
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
-  nrf70.build.raw_tx:
-    extra_configs:
-      - CONFIG_NRF70_RAW_DATA_TX=y
-  nrf70.build.raw_rx:
-    extra_configs:
-      - CONFIG_NRF70_RAW_DATA_RX=y
-  nrf70.build.promiscuous:
-    extra_configs:
-      - CONFIG_NRF70_PROMISC_DATA_RX=y
-  nrf70.build.offloaded_raw_tx:
-    extra_configs:
-      - CONFIG_NRF70_OFFLOADED_RAW_TX=y
-      - CONFIG_NETWORKING=n
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
-      - CONFIG_NET_L2_WIFI_MGMT=n

From 65bb9ceb0edfdfb4e0e6c5a119515ad3ff81f962 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:22 +0100
Subject: [PATCH 1327/2913] Revert "[nrf fromlist] modules: nrf_wifi: Fix raw
 scan results build"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5d0d19babb8a1036dcb0e7dafe793f0efe9ad50b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/nrf_wifi/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/nrf_wifi/CMakeLists.txt b/modules/nrf_wifi/CMakeLists.txt
index e3b96f0db7b..41d48b50f7e 100644
--- a/modules/nrf_wifi/CMakeLists.txt
+++ b/modules/nrf_wifi/CMakeLists.txt
@@ -38,7 +38,6 @@ target_compile_definitions(
   $<$<BOOL:${CONFIG_NRF_WIFI_MGMT_BUFF_OFFLOAD}>:NRF_WIFI_MGMT_BUFF_OFFLOAD>
   $<$<BOOL:${CONFIG_NRF_WIFI_FEAT_KEEPALIVE}>:NRF_WIFI_FEAT_KEEPALIVE>
   $<$<BOOL:${CONFIG_NRF_WIFI_FEAT_KEEPALIVE}>:NRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}>
-  $<$<BOOL:${CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS}>:WIFI_MGMT_RAW_SCAN_RESULTS>
   NRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
   NRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}
   NRF70_RX_MAX_DATA_SIZE=${CONFIG_NRF70_RX_MAX_DATA_SIZE}

From 090c2d5136ad6dc1d056f5b0bbe7437f97e65f02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:22 +0100
Subject: [PATCH 1328/2913] Revert "[nrf fromlist] modules: nrf_wifi: Fix the
 directory variable"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit eb34c6f110c5be3fc99cfd9cf906c61f5f016e9d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/nrf_wifi/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nrf_wifi/CMakeLists.txt b/modules/nrf_wifi/CMakeLists.txt
index 41d48b50f7e..e5c85cda679 100644
--- a/modules/nrf_wifi/CMakeLists.txt
+++ b/modules/nrf_wifi/CMakeLists.txt
@@ -161,7 +161,7 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
 )
 
 zephyr_library_sources_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_promisc.c
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_promisc.c
 )
 
 zephyr_library_sources_ifdef(CONFIG_NRF70_AP_MODE

From a5ca01a702c64c12647adcc667c17c04c39c6718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:22 +0100
Subject: [PATCH 1329/2913] Revert "[nrf fromlist] modules: nrf_wifi: Fix
 offloaded raw TX build"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fb891ffcbec1fd9cd6ac90ae3af6d5b963772040.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/nrf_wifi/CMakeLists.txt | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/modules/nrf_wifi/CMakeLists.txt b/modules/nrf_wifi/CMakeLists.txt
index e5c85cda679..ad04414b511 100644
--- a/modules/nrf_wifi/CMakeLists.txt
+++ b/modules/nrf_wifi/CMakeLists.txt
@@ -131,24 +131,17 @@ zephyr_library_sources(
   ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_api_common.c
 )
 
-if(CONFIG_NRF70_RADIO_TEST)
-  zephyr_library_sources(
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/radio_test/fmac_api.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-  )
-elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
-  zephyr_library_sources(
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/offload_raw_tx/fmac_api.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-  )
-else()
-  zephyr_library_sources(
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/rx.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_vif.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/default/fmac_api.c
-  )
-endif()
+zephyr_library_sources_ifndef(CONFIG_NRF70_RADIO_TEST
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/rx.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_vif.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/default/fmac_api.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_RADIO_TEST
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/radio_test/fmac_api.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
+)
 
 zephyr_library_sources_ifdef(CONFIG_NRF70_DATA_TX
   ${NRF_WIFI_DIR}/fw_if/umac_if/src/tx.c

From f99c10b99f2478b8a1badf9d2f38586769ee059a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:22 +0100
Subject: [PATCH 1330/2913] Revert "[nrf fromtree] drivers: wifi: Fix blobs
 handling"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 047f8ea3000435b72e70b5e337955ef2a14f104d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/CMakeLists.txt | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
index e631e930e07..443b54796cd 100644
--- a/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -96,7 +96,6 @@ if (CONFIG_NRF_WIFI_BUILD_ONLY_MODE)
   ------------------------------------------------------------------------
   ")
 elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
-  zephyr_blobs_verify(MODULE nrf_wifi REQUIRED)
   # RPU FW patch binaries based on the selected configuration
   if(CONFIG_NRF70_SYSTEM_MODE)
     set(NRF70_PATCH ${FW_BINS_BASE}/default/nrf70.bin)
@@ -113,6 +112,15 @@ elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
     message(FATAL_ERROR "Unsupported nRF70 patch configuration")
   endif()
 
+  if(NOT EXISTS ${NRF70_PATCH})
+    message(FATAL_ERROR "
+      ------------------------------------------------------------------------
+      Missing blobs for nRF70 device driver, please install by running:
+          $ west update
+          $ west blobs fetch hal_nordic
+      ------------------------------------------------------------------------")
+  endif()
+
   set(gen_inc_dir ${ZEPHYR_BINARY_DIR}/misc/generated)
   zephyr_include_directories(${gen_inc_dir})
   set(gen_dir ${gen_inc_dir}/nrf70_fw_patch)

From 1e0d6b100db91497964a6658c74473a442f1a7ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:22 +0100
Subject: [PATCH 1331/2913] Revert "[nrf fromtree] nrf_wifi: Move shim files
 from driver to module"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 16a9e206e32f712185f77ada6be4dc0d2e0c52d1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/CMakeLists.txt                    | 3 +++
 {modules/nrf_wifi => drivers/wifi/nrf_wifi/src}/shim.c  | 0
 {modules/nrf_wifi => drivers/wifi/nrf_wifi/src}/shim.h  | 0
 {modules/nrf_wifi => drivers/wifi/nrf_wifi/src}/timer.c | 0
 {modules/nrf_wifi => drivers/wifi/nrf_wifi/src}/timer.h | 0
 {modules/nrf_wifi => drivers/wifi/nrf_wifi/src}/work.c  | 0
 {modules/nrf_wifi => drivers/wifi/nrf_wifi/src}/work.h  | 0
 modules/nrf_wifi/CMakeLists.txt                         | 6 ------
 8 files changed, 3 insertions(+), 6 deletions(-)
 rename {modules/nrf_wifi => drivers/wifi/nrf_wifi/src}/shim.c (100%)
 rename {modules/nrf_wifi => drivers/wifi/nrf_wifi/src}/shim.h (100%)
 rename {modules/nrf_wifi => drivers/wifi/nrf_wifi/src}/timer.c (100%)
 rename {modules/nrf_wifi => drivers/wifi/nrf_wifi/src}/timer.h (100%)
 rename {modules/nrf_wifi => drivers/wifi/nrf_wifi/src}/work.c (100%)
 rename {modules/nrf_wifi => drivers/wifi/nrf_wifi/src}/work.h (100%)

diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
index 443b54796cd..4e3878dfcfd 100644
--- a/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -25,6 +25,9 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_SR_COEX
 )
 
 zephyr_library_sources(
+  src/shim.c
+  src/work.c
+  src/timer.c
   src/qspi/src/device.c
   src/qspi/src/rpu_hw_if.c
   src/qspi/src/ficr_prog.c
diff --git a/modules/nrf_wifi/shim.c b/drivers/wifi/nrf_wifi/src/shim.c
similarity index 100%
rename from modules/nrf_wifi/shim.c
rename to drivers/wifi/nrf_wifi/src/shim.c
diff --git a/modules/nrf_wifi/shim.h b/drivers/wifi/nrf_wifi/src/shim.h
similarity index 100%
rename from modules/nrf_wifi/shim.h
rename to drivers/wifi/nrf_wifi/src/shim.h
diff --git a/modules/nrf_wifi/timer.c b/drivers/wifi/nrf_wifi/src/timer.c
similarity index 100%
rename from modules/nrf_wifi/timer.c
rename to drivers/wifi/nrf_wifi/src/timer.c
diff --git a/modules/nrf_wifi/timer.h b/drivers/wifi/nrf_wifi/src/timer.h
similarity index 100%
rename from modules/nrf_wifi/timer.h
rename to drivers/wifi/nrf_wifi/src/timer.h
diff --git a/modules/nrf_wifi/work.c b/drivers/wifi/nrf_wifi/src/work.c
similarity index 100%
rename from modules/nrf_wifi/work.c
rename to drivers/wifi/nrf_wifi/src/work.c
diff --git a/modules/nrf_wifi/work.h b/drivers/wifi/nrf_wifi/src/work.h
similarity index 100%
rename from modules/nrf_wifi/work.h
rename to drivers/wifi/nrf_wifi/src/work.h
diff --git a/modules/nrf_wifi/CMakeLists.txt b/modules/nrf_wifi/CMakeLists.txt
index ad04414b511..2d0e4c8a45e 100644
--- a/modules/nrf_wifi/CMakeLists.txt
+++ b/modules/nrf_wifi/CMakeLists.txt
@@ -167,10 +167,4 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
   ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
 )
 
-zephyr_library_sources(
-  shim.c
-  timer.c
-  work.c
-)
-
 target_link_libraries(zephyr_interface INTERFACE nrf-wifi-interface)

From d20a47e2ec791b9f490a4b9a69809e7d8456eacb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:22 +0100
Subject: [PATCH 1332/2913] Revert "[nrf fromtree] drivers: nrf_wifi: Remove
 OSAL code handling"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 47f08f79f3bdc91f62244f0f187e701cd302befb.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/CMakeLists.txt | 225 ++++++++++++++++++++++++++-
 1 file changed, 224 insertions(+), 1 deletion(-)

diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
index 4e3878dfcfd..e1a76bf3d90 100644
--- a/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -11,20 +11,54 @@ set(FW_BINS_BASE ${ZEPHYR_NRF_WIFI_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
 
 zephyr_include_directories(
   inc
+  ${OS_AGNOSTIC_BASE}/utils/inc
+  ${OS_AGNOSTIC_BASE}/os_if/inc
+  ${OS_AGNOSTIC_BASE}/bus_if/bus/qspi/inc
+  ${OS_AGNOSTIC_BASE}/bus_if/bal/inc
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc
+  ${OS_AGNOSTIC_BASE}/fw_load/mips/fw/inc
+  ${OS_AGNOSTIC_BASE}/hw_if/hal/inc
   src/qspi/inc
   # for net_sprint_ll_addr
   ${ZEPHYR_BASE}/subsys/net/ip
+  ${OS_AGNOSTIC_BASE}/hw_if/hal/inc/fw
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/fw
+)
+
+zephyr_include_directories_ifdef(CONFIG_NRF70_RADIO_TEST
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/radio_test
 )
 
 zephyr_include_directories_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/offload_raw_tx
   off_raw_tx/inc
 )
 
+if(NOT CONFIG_NRF70_RADIO_TEST AND NOT CONFIG_NRF70_OFFLOADED_RAW_TX)
+  zephyr_include_directories(${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/default)
+endif()
+
 zephyr_library_sources_ifdef(CONFIG_NRF70_SR_COEX
   src/coex.c
 )
 
 zephyr_library_sources(
+  ${OS_AGNOSTIC_BASE}/os_if/src/osal.c
+  ${OS_AGNOSTIC_BASE}/utils/src/list.c
+  ${OS_AGNOSTIC_BASE}/utils/src/queue.c
+  ${OS_AGNOSTIC_BASE}/utils/src/util.c
+  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_api.c
+  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_fw_patch_loader.c
+  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_interrupt.c
+  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_mem.c
+  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/hal_reg.c
+  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/hpqm.c
+  ${OS_AGNOSTIC_BASE}/hw_if/hal/src/pal.c
+  ${OS_AGNOSTIC_BASE}/bus_if/bal/src/bal.c
+  ${OS_AGNOSTIC_BASE}/bus_if/bus/qspi/src/qspi.c
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/cmd.c
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/event.c
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_api_common.c
   src/shim.c
   src/work.c
   src/timer.c
@@ -43,7 +77,11 @@ zephyr_library_sources_ifdef(CONFIG_NRF_WIFI_PATCHES_BUILTIN
 
 if(NOT CONFIG_NRF70_RADIO_TEST AND NOT CONFIG_NRF70_OFFLOADED_RAW_TX)
   zephyr_library_sources(
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/rx.c
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_vif.c
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
   src/net_if.c
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/default/fmac_api.c
 )
 endif()
 
@@ -55,18 +93,44 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_SYSTEM_MODE_COMMON
   src/wifi_mgmt.c
 )
 
+zephyr_library_sources_ifdef(CONFIG_NRF70_RADIO_TEST
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/radio_test/fmac_api.c
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
+)
+
 zephyr_library_sources_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/offload_raw_tx/fmac_api.c
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
   off_raw_tx/src/off_raw_tx_api.c
 )
 
+zephyr_library_sources_ifdef(CONFIG_NRF70_DATA_TX
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/tx.c
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_peer.c
+)
+
 zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
   src/wpa_supp_if.c
   src/wifi_mgmt.c
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_peer.c
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
 )
 
+zephyr_library_sources_ifdef(CONFIG_NRF70_AP_MODE
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_ap.c
+)
+
+
 # Without WPA supplicant we only support scan
 zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
-  src/wpa_supp_if.c)
+  src/wpa_supp_if.c
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_peer.c
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_promisc.c
+)
 
 zephyr_library_sources_ifdef(CONFIG_NRF70_ON_QSPI
   src/qspi/src/qspi_if.c
@@ -133,3 +197,162 @@ elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
     ${gen_dir}/nrf70.bin.inc
   )
 endif()
+
+
+
+# Translate the configuration to the OS agnostic code
+zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_LOW_POWER
+  -DNRF_WIFI_LOW_POWER
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_RPU_RECOVERY
+  -DNRF_WIFI_RPU_RECOVERY
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT
+  -DNRF_WIFI_AP_DEAD_DETECT_TIMEOUT=${CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT}
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_IFACE_MTU
+  -DNRF_WIFI_IFACE_MTU=${CONFIG_NRF_WIFI_IFACE_MTU}
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_STA_MODE
+  -DNRF70_STA_MODE
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_DATA_TX
+  -DNRF70_DATA_TX
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_RAW_DATA_TX
+  -DNRF70_RAW_DATA_TX
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_RAW_DATA_RX
+  -DNRF70_RAW_DATA_RX
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
+  -DNRF70_PROMISC_DATA_RX
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_TX_DONE_WQ_ENABLED
+  -DNRF70_TX_DONE_WQ_ENABLED
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_RX_WQ_ENABLED
+  -DNRF70_RX_WQ_ENABLED
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_UTIL
+  -DNRF70_UTIL
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_RADIO_TEST
+  -DNRF70_RADIO_TEST
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
+  -DNRF70_OFFLOADED_RAW_TX
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD
+  -DNRF70_TCP_IP_CHECKSUM_OFFLOAD
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_RPU_EXTEND_TWT_SP
+  -DNRF70_RPU_EXTEND_TWT_SP
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_SYSTEM_WITH_RAW_MODES
+  -DNRF70_SYSTEM_WITH_RAW_MODES
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_SCAN_ONLY
+  -DNRF70_SCAN_ONLY
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_SYSTEM_MODE
+  -DNRF70_SYSTEM_MODE
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_2_4G_ONLY
+  -DNRF70_2_4G_ONLY
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_LOG_VERBOSE
+  -DNRF70_LOG_VERBOSE
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_AP_MODE
+  -DNRF70_AP_MODE
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_MGMT_BUFF_OFFLOAD
+  -DNRF_WIFI_MGMT_BUFF_OFFLOAD
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_FEAT_KEEPALIVE
+  -DNRF_WIFI_FEAT_KEEPALIVE
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_FEAT_KEEPALIVE
+  -DNRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS
+  -DWIFI_MGMT_RAW_SCAN_RESULTS=${CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS}
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
+  -DNRF_NRF70_OFFLOADED_RAW_TX
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_PASSIVE_SCAN_ONLY
+  -DNRF70_PASSIVE_SCAN_ONLY
+)
+
+zephyr_compile_definitions(
+  -DNRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
+  -DNRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}
+  -DNRF70_RX_MAX_DATA_SIZE=${CONFIG_NRF70_RX_MAX_DATA_SIZE}
+  -DNRF70_MAX_TX_PENDING_QLEN=${CONFIG_NRF70_MAX_TX_PENDING_QLEN}
+  -DNRF70_RPU_PS_IDLE_TIMEOUT_MS=${CONFIG_NRF70_RPU_PS_IDLE_TIMEOUT_MS}
+  -DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS}
+  -DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT}
+  -DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE}
+  -DNRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS}
+  -DNRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT}
+  -DNRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE}
+  -DNRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT}
+  -DNRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE}
+  -DNRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT}
+  -DNRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE}
+  -DNRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT}
+  -DNRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE}
+  -DNRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT}
+  -DNRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE}
+  -DNRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT}
+  -DNRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE}
+  -DNRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT}
+  -DNRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE}
+  -DNRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT}
+  -DNRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE}
+  -DNRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT}
+  -DNRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE}
+  -DNRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT}
+  -DNRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE}
+  -DNRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT}
+  -DNRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE}
+  -DNRF70_PCB_LOSS_2G=${CONFIG_NRF70_PCB_LOSS_2G}
+  -DNRF70_PCB_LOSS_5G_BAND1=${CONFIG_NRF70_PCB_LOSS_5G_BAND1}
+  -DNRF70_PCB_LOSS_5G_BAND2=${CONFIG_NRF70_PCB_LOSS_5G_BAND2}
+  -DNRF70_PCB_LOSS_5G_BAND3=${CONFIG_NRF70_PCB_LOSS_5G_BAND3}
+  -DNRF70_ANT_GAIN_2G=${CONFIG_NRF70_ANT_GAIN_2G}
+  -DNRF70_ANT_GAIN_5G_BAND1=${CONFIG_NRF70_ANT_GAIN_5G_BAND1}
+  -DNRF70_ANT_GAIN_5G_BAND2=${CONFIG_NRF70_ANT_GAIN_5G_BAND2}
+  -DNRF70_ANT_GAIN_5G_BAND3=${CONFIG_NRF70_ANT_GAIN_5G_BAND3}
+  -DNRF_WIFI_PS_INT_PS=${CONFIG_NRF_WIFI_PS_INT_PS}
+  -DNRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS=${CONFIG_NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS}
+)

From 169fed4af0273c449eb09b19dc30476c55838873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:22 +0100
Subject: [PATCH 1333/2913] Revert "[nrf fromtree] modules: nrf_wifi: Add a new
 module for nRF70 Wi-Fi"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a8916358ec373721b1d24e8f9ea8cc5e4b831eec.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 MAINTAINERS.yml                 |  10 --
 modules/nrf_wifi/CMakeLists.txt | 170 --------------------------------
 modules/nrf_wifi/Kconfig        |   5 -
 west.yml                        |   3 -
 4 files changed, 188 deletions(-)
 delete mode 100644 modules/nrf_wifi/CMakeLists.txt
 delete mode 100644 modules/nrf_wifi/Kconfig

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index fdc0a25a5f1..957302c5104 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -4980,16 +4980,6 @@ West:
   labels:
     - "area: native port"
 
-"West project: nrf_wifi":
-  status: maintained
-  maintainers:
-    - krish2718
-    - sachinthegreen
-  files:
-    - modules/nrf_wifi/
-  labels:
-    - "area: Wi-Fi"
-
 "West project: open-amp":
   status: odd fixes
   collaborators:
diff --git a/modules/nrf_wifi/CMakeLists.txt b/modules/nrf_wifi/CMakeLists.txt
deleted file mode 100644
index 2d0e4c8a45e..00000000000
--- a/modules/nrf_wifi/CMakeLists.txt
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if(NOT CONFIG_WIFI_NRF70)
-  return()
-endif()
-zephyr_interface_library_named(nrf-wifi-interface)
-zephyr_library()
-
-set(NRF_WIFI_DIR ${ZEPHYR_CURRENT_MODULE_DIR})
-
-# Translate the configuration to the OS agnostic code
-target_compile_definitions(
-  nrf-wifi-interface
-  INTERFACE
-  $<$<BOOL:${CONFIG_NRF_WIFI_LOW_POWER}>:NRF_WIFI_LOW_POWER>
-  $<$<BOOL:${CONFIG_NRF_WIFI_RPU_RECOVERY}>:NRF_WIFI_RPU_RECOVERY>
-  $<$<BOOL:${CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT}>:NRF_WIFI_AP_DEAD_DETECT_TIMEOUT=${CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT}>
-  $<$<BOOL:${CONFIG_NRF_WIFI_IFACE_MTU}>:NRF_WIFI_IFACE_MTU=${CONFIG_NRF_WIFI_IFACE_MTU}>
-  $<$<BOOL:${CONFIG_NRF70_STA_MODE}>:NRF70_STA_MODE>
-  $<$<BOOL:${CONFIG_NRF70_DATA_TX}>:NRF70_DATA_TX>
-  $<$<BOOL:${CONFIG_NRF70_RAW_DATA_TX}>:NRF70_RAW_DATA_TX>
-  $<$<BOOL:${CONFIG_NRF70_RAW_DATA_RX}>:NRF70_RAW_DATA_RX>
-  $<$<BOOL:${CONFIG_NRF70_PROMISC_DATA_RX}>:NRF70_PROMISC_DATA_RX>
-  $<$<BOOL:${CONFIG_NRF70_TX_DONE_WQ_ENABLED}>:NRF70_TX_DONE_WQ_ENABLED>
-  $<$<BOOL:${CONFIG_NRF70_RX_WQ_ENABLED}>:NRF70_RX_WQ_ENABLED>
-  $<$<BOOL:${CONFIG_NRF70_UTIL}>:NRF70_UTIL>
-  $<$<BOOL:${CONFIG_NRF70_RADIO_TEST}>:NRF70_RADIO_TEST>
-  $<$<BOOL:${CONFIG_NRF70_OFFLOADED_RAW_TX}>:NRF70_OFFLOADED_RAW_TX>
-  $<$<BOOL:${CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD}>:NRF70_TCP_IP_CHECKSUM_OFFLOAD>
-  $<$<BOOL:${CONFIG_NRF70_RPU_EXTEND_TWT_SP}>:NRF70_RPU_EXTEND_TWT_SP>
-  $<$<BOOL:${CONFIG_NRF70_SYSTEM_WITH_RAW_MODES}>:NRF70_SYSTEM_WITH_RAW_MODES>
-  $<$<BOOL:${CONFIG_NRF70_SCAN_ONLY}>:NRF70_SCAN_ONLY>
-  $<$<BOOL:${CONFIG_NRF70_SYSTEM_MODE}>:NRF70_SYSTEM_MODE>
-  $<$<BOOL:${CONFIG_NRF70_2_4G_ONLY}>:NRF70_2_4G_ONLY>
-  $<$<BOOL:${CONFIG_NRF70_LOG_VERBOSE}>:NRF70_LOG_VERBOSE>
-  $<$<BOOL:${CONFIG_NRF70_AP_MODE}>:NRF70_AP_MODE>
-  $<$<BOOL:${CONFIG_NRF_WIFI_MGMT_BUFF_OFFLOAD}>:NRF_WIFI_MGMT_BUFF_OFFLOAD>
-  $<$<BOOL:${CONFIG_NRF_WIFI_FEAT_KEEPALIVE}>:NRF_WIFI_FEAT_KEEPALIVE>
-  $<$<BOOL:${CONFIG_NRF_WIFI_FEAT_KEEPALIVE}>:NRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}>
-  NRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
-  NRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}
-  NRF70_RX_MAX_DATA_SIZE=${CONFIG_NRF70_RX_MAX_DATA_SIZE}
-  NRF70_MAX_TX_PENDING_QLEN=${CONFIG_NRF70_MAX_TX_PENDING_QLEN}
-  NRF70_RPU_PS_IDLE_TIMEOUT_MS=${CONFIG_NRF70_RPU_PS_IDLE_TIMEOUT_MS}
-  NRF70_REG_DOMAIN=${CONFIG_NRF70_REG_DOMAIN}
-  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS}
-  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS}
-  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE}
-  NRF70_PCB_LOSS_2G=${CONFIG_NRF70_PCB_LOSS_2G}
-  NRF70_PCB_LOSS_5G_BAND1=${CONFIG_NRF70_PCB_LOSS_5G_BAND1}
-  NRF70_PCB_LOSS_5G_BAND2=${CONFIG_NRF70_PCB_LOSS_5G_BAND2}
-  NRF70_PCB_LOSS_5G_BAND3=${CONFIG_NRF70_PCB_LOSS_5G_BAND3}
-  NRF70_ANT_GAIN_2G=${CONFIG_NRF70_ANT_GAIN_2G}
-  NRF70_ANT_GAIN_5G_BAND1=${CONFIG_NRF70_ANT_GAIN_5G_BAND1}
-  NRF70_ANT_GAIN_5G_BAND2=${CONFIG_NRF70_ANT_GAIN_5G_BAND2}
-  NRF70_ANT_GAIN_5G_BAND3=${CONFIG_NRF70_ANT_GAIN_5G_BAND3}
-  NRF_WIFI_PS_INT_PS=${CONFIG_NRF_WIFI_PS_INT_PS}
-  NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS=${CONFIG_NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS}
-)
-
-target_include_directories(
-  nrf-wifi-interface
-  INTERFACE
-  ${CMAKE_CURRENT_LIST_DIR}
-  ${NRF_WIFI_DIR}/utils/inc
-  ${NRF_WIFI_DIR}/os_if/inc
-  ${NRF_WIFI_DIR}/bus_if/bus/qspi/inc
-  ${NRF_WIFI_DIR}/bus_if/bal/inc
-  ${NRF_WIFI_DIR}/fw_if/umac_if/inc
-  ${NRF_WIFI_DIR}/fw_load/mips/fw/inc
-  ${NRF_WIFI_DIR}/hw_if/hal/inc
-  ${NRF_WIFI_DIR}/hw_if/hal/inc/fw
-  ${NRF_WIFI_DIR}/fw_if/umac_if/inc/fw
-)
-
-if(CONFIG_NRF70_RADIO_TEST)
-  target_include_directories(nrf-wifi-interface INTERFACE
-    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/radio_test
-  )
-elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
-  target_include_directories(nrf-wifi-interface INTERFACE
-    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/offload_raw_tx
-    off_raw_tx/inc
-  )
-else()
-  target_include_directories(nrf-wifi-interface INTERFACE
-    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/default
-  )
-endif()
-
-zephyr_library_sources(
-  ${NRF_WIFI_DIR}/os_if/src/osal.c
-  ${NRF_WIFI_DIR}/utils/src/list.c
-  ${NRF_WIFI_DIR}/utils/src/queue.c
-  ${NRF_WIFI_DIR}/utils/src/util.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_api.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_fw_patch_loader.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_interrupt.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_mem.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_reg.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hpqm.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/pal.c
-  ${NRF_WIFI_DIR}/bus_if/bal/src/bal.c
-  ${NRF_WIFI_DIR}/bus_if/bus/qspi/src/qspi.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/cmd.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/event.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_api_common.c
-)
-
-zephyr_library_sources_ifndef(CONFIG_NRF70_RADIO_TEST
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/rx.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_vif.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/default/fmac_api.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_RADIO_TEST
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/radio_test/fmac_api.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_DATA_TX
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/tx.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_promisc.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_AP_MODE
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_ap.c
-)
-
-# Without WPA supplicant we only support scan
-zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-)
-
-target_link_libraries(zephyr_interface INTERFACE nrf-wifi-interface)
diff --git a/modules/nrf_wifi/Kconfig b/modules/nrf_wifi/Kconfig
deleted file mode 100644
index 9fe8172c68d..00000000000
--- a/modules/nrf_wifi/Kconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config ZEPHYR_NRF_WIFI_MODULE
-	bool
diff --git a/west.yml b/west.yml
index 248d015f6ae..976de15f4ee 100644
--- a/west.yml
+++ b/west.yml
@@ -302,9 +302,6 @@ manifest:
     - name: nrf_hw_models
       revision: 3cfca0192ff84da919e9bc7978bcc2239cd6a395
       path: modules/bsim_hw_models/nrf_hw_models
-    - name: nrf_wifi
-      revision: f9e2abdb70761003912b1b929a37b536f68a91da
-      path: modules/lib/nrf_wifi
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719
       path: modules/lib/open-amp

From b12538da7a6b28be7f76c44e02903036f636cd1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:22 +0100
Subject: [PATCH 1334/2913] Revert "[nrf fromtree] drivers: nrf_wifi: Fix the
 path to OSAL code"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit df63c3a811016e636741589bd192cdd0282c6039.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
index e1a76bf3d90..302234d6d62 100644
--- a/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -6,8 +6,8 @@
 
 zephyr_library_named(nrf_wifi)
 
-set(OS_AGNOSTIC_BASE ${ZEPHYR_NRF_WIFI_MODULE_DIR})
-set(FW_BINS_BASE ${ZEPHYR_NRF_WIFI_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
+set(OS_AGNOSTIC_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/drivers/nrf_wifi)
+set(FW_BINS_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
 
 zephyr_include_directories(
   inc

From 9518bd780df8800125b99a5910fae13710aab1dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:22 +0100
Subject: [PATCH 1335/2913] Revert "[nrf fromtree] nrf_wifi: Fix the directory
 name"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 434fbcf597c23647813abe70494de1e3b119e0c6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 MAINTAINERS.yml                                               | 2 +-
 drivers/wifi/CMakeLists.txt                                   | 2 +-
 drivers/wifi/Kconfig                                          | 2 +-
 drivers/wifi/{nrf_wifi => nrfwifi}/CMakeLists.txt             | 4 ++--
 drivers/wifi/{nrf_wifi => nrfwifi}/Kconfig.nrfwifi            | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/inc/coex.h                 | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/inc/coex_struct.h          | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/inc/fmac_main.h            | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/inc/net_if.h               | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/inc/wifi_mgmt.h            | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/inc/wifi_mgmt_scan.h       | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/inc/wpa_supp_if.h          | 0
 .../wifi/{nrf_wifi => nrfwifi}/off_raw_tx/inc/off_raw_tx.h    | 0
 .../{nrf_wifi => nrfwifi}/off_raw_tx/src/off_raw_tx_api.c     | 2 +-
 drivers/wifi/{nrf_wifi => nrfwifi}/src/coex.c                 | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/fmac_main.c            | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/fw_load.c              | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/net_if.c               | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/inc/ficr_prog.h   | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/inc/qspi_if.h     | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/inc/rpu_hw_if.h   | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/inc/spi_if.h      | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/inc/spi_nor.h     | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/src/device.c      | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/src/ficr_prog.c   | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/src/qspi_if.c     | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/src/rpu_hw_if.c   | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/src/spi_if.c      | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/shim.c                 | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/shim.h                 | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/timer.c                | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/timer.h                | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/wifi_mgmt.c            | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/wifi_mgmt_scan.c       | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/wifi_util.c            | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/wifi_util.h            | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/work.c                 | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/work.h                 | 0
 drivers/wifi/{nrf_wifi => nrfwifi}/src/wpa_supp_if.c          | 0
 .../wifi/{nrf_wifi => nrfwifi}/off_raw_tx/off_raw_tx_api.h    | 0
 40 files changed, 6 insertions(+), 6 deletions(-)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/CMakeLists.txt (99%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/Kconfig.nrfwifi (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/inc/coex.h (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/inc/coex_struct.h (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/inc/fmac_main.h (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/inc/net_if.h (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/inc/wifi_mgmt.h (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/inc/wifi_mgmt_scan.h (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/inc/wpa_supp_if.h (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/off_raw_tx/inc/off_raw_tx.h (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/off_raw_tx/src/off_raw_tx_api.c (99%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/coex.c (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/fmac_main.c (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/fw_load.c (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/net_if.c (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/inc/ficr_prog.h (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/inc/qspi_if.h (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/inc/rpu_hw_if.h (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/inc/spi_if.h (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/inc/spi_nor.h (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/src/device.c (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/src/ficr_prog.c (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/src/qspi_if.c (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/src/rpu_hw_if.c (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/qspi/src/spi_if.c (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/shim.c (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/shim.h (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/timer.c (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/timer.h (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/wifi_mgmt.c (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/wifi_mgmt_scan.c (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/wifi_util.c (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/wifi_util.h (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/work.c (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/work.h (100%)
 rename drivers/wifi/{nrf_wifi => nrfwifi}/src/wpa_supp_if.c (100%)
 rename include/zephyr/drivers/wifi/{nrf_wifi => nrfwifi}/off_raw_tx/off_raw_tx_api.h (100%)

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index 957302c5104..a77bbf643c0 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -2185,7 +2185,7 @@ Release Notes:
   collaborators:
     - sachinthegreen
   files:
-    - drivers/wifi/nrf_wifi/
+    - drivers/wifi/nrfwifi/
     - dts/bindings/wifi/nordic,nrf70.yaml
     - dts/bindings/wifi/nordic,nrf70-qspi.yaml
     - dts/bindings/wifi/nordic,nrf70-spi.yaml
diff --git a/drivers/wifi/CMakeLists.txt b/drivers/wifi/CMakeLists.txt
index c71e161d710..bd175b8e28f 100644
--- a/drivers/wifi/CMakeLists.txt
+++ b/drivers/wifi/CMakeLists.txt
@@ -10,4 +10,4 @@ add_subdirectory_ifdef(CONFIG_WIFI_SIMPLELINK   simplelink)
 add_subdirectory_ifdef(CONFIG_WIFI_WINC1500     winc1500)
 add_subdirectory_ifdef(CONFIG_WIFI_NXP          nxp)
 add_subdirectory_ifdef(CONFIG_WIFI_AIROC        infineon)
-add_subdirectory_ifdef(CONFIG_WIFI_NRF70        nrf_wifi)
+add_subdirectory_ifdef(CONFIG_WIFI_NRF70        nrfwifi)
diff --git a/drivers/wifi/Kconfig b/drivers/wifi/Kconfig
index 55b2a943ff2..7ad7b530c74 100644
--- a/drivers/wifi/Kconfig
+++ b/drivers/wifi/Kconfig
@@ -42,6 +42,6 @@ source "drivers/wifi/esp_at/Kconfig.esp_at"
 source "drivers/wifi/esp32/Kconfig.esp32"
 source "drivers/wifi/nxp/Kconfig.nxp"
 source "drivers/wifi/infineon/Kconfig.airoc"
-source "drivers/wifi/nrf_wifi/Kconfig.nrfwifi"
+source "drivers/wifi/nrfwifi/Kconfig.nrfwifi"
 
 endif # WIFI
diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
similarity index 99%
rename from drivers/wifi/nrf_wifi/CMakeLists.txt
rename to drivers/wifi/nrfwifi/CMakeLists.txt
index 302234d6d62..439263ec615 100644
--- a/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-zephyr_library_named(nrf_wifi)
+zephyr_library_named(nrfwifi)
 
 set(OS_AGNOSTIC_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/drivers/nrf_wifi)
 set(FW_BINS_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
@@ -192,7 +192,7 @@ elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
   zephyr_include_directories(${gen_inc_dir})
   set(gen_dir ${gen_inc_dir}/nrf70_fw_patch)
   generate_inc_file_for_target(
-    nrf_wifi
+    nrfwifi
     ${NRF70_PATCH}
     ${gen_dir}/nrf70.bin.inc
   )
diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
similarity index 100%
rename from drivers/wifi/nrf_wifi/Kconfig.nrfwifi
rename to drivers/wifi/nrfwifi/Kconfig.nrfwifi
diff --git a/drivers/wifi/nrf_wifi/inc/coex.h b/drivers/wifi/nrfwifi/inc/coex.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/inc/coex.h
rename to drivers/wifi/nrfwifi/inc/coex.h
diff --git a/drivers/wifi/nrf_wifi/inc/coex_struct.h b/drivers/wifi/nrfwifi/inc/coex_struct.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/inc/coex_struct.h
rename to drivers/wifi/nrfwifi/inc/coex_struct.h
diff --git a/drivers/wifi/nrf_wifi/inc/fmac_main.h b/drivers/wifi/nrfwifi/inc/fmac_main.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/inc/fmac_main.h
rename to drivers/wifi/nrfwifi/inc/fmac_main.h
diff --git a/drivers/wifi/nrf_wifi/inc/net_if.h b/drivers/wifi/nrfwifi/inc/net_if.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/inc/net_if.h
rename to drivers/wifi/nrfwifi/inc/net_if.h
diff --git a/drivers/wifi/nrf_wifi/inc/wifi_mgmt.h b/drivers/wifi/nrfwifi/inc/wifi_mgmt.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/inc/wifi_mgmt.h
rename to drivers/wifi/nrfwifi/inc/wifi_mgmt.h
diff --git a/drivers/wifi/nrf_wifi/inc/wifi_mgmt_scan.h b/drivers/wifi/nrfwifi/inc/wifi_mgmt_scan.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/inc/wifi_mgmt_scan.h
rename to drivers/wifi/nrfwifi/inc/wifi_mgmt_scan.h
diff --git a/drivers/wifi/nrf_wifi/inc/wpa_supp_if.h b/drivers/wifi/nrfwifi/inc/wpa_supp_if.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/inc/wpa_supp_if.h
rename to drivers/wifi/nrfwifi/inc/wpa_supp_if.h
diff --git a/drivers/wifi/nrf_wifi/off_raw_tx/inc/off_raw_tx.h b/drivers/wifi/nrfwifi/off_raw_tx/inc/off_raw_tx.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/off_raw_tx/inc/off_raw_tx.h
rename to drivers/wifi/nrfwifi/off_raw_tx/inc/off_raw_tx.h
diff --git a/drivers/wifi/nrf_wifi/off_raw_tx/src/off_raw_tx_api.c b/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
similarity index 99%
rename from drivers/wifi/nrf_wifi/off_raw_tx/src/off_raw_tx_api.c
rename to drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
index b714b902eeb..155c8a5cd5e 100644
--- a/drivers/wifi/nrf_wifi/off_raw_tx/src/off_raw_tx_api.c
+++ b/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/drivers/wifi/nrf_wifi/off_raw_tx/off_raw_tx_api.h>
+#include <zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h>
 #include <off_raw_tx.h>
 #include <fmac_api.h>
 
diff --git a/drivers/wifi/nrf_wifi/src/coex.c b/drivers/wifi/nrfwifi/src/coex.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/coex.c
rename to drivers/wifi/nrfwifi/src/coex.c
diff --git a/drivers/wifi/nrf_wifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/fmac_main.c
rename to drivers/wifi/nrfwifi/src/fmac_main.c
diff --git a/drivers/wifi/nrf_wifi/src/fw_load.c b/drivers/wifi/nrfwifi/src/fw_load.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/fw_load.c
rename to drivers/wifi/nrfwifi/src/fw_load.c
diff --git a/drivers/wifi/nrf_wifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/net_if.c
rename to drivers/wifi/nrfwifi/src/net_if.c
diff --git a/drivers/wifi/nrf_wifi/src/qspi/inc/ficr_prog.h b/drivers/wifi/nrfwifi/src/qspi/inc/ficr_prog.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/qspi/inc/ficr_prog.h
rename to drivers/wifi/nrfwifi/src/qspi/inc/ficr_prog.h
diff --git a/drivers/wifi/nrf_wifi/src/qspi/inc/qspi_if.h b/drivers/wifi/nrfwifi/src/qspi/inc/qspi_if.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/qspi/inc/qspi_if.h
rename to drivers/wifi/nrfwifi/src/qspi/inc/qspi_if.h
diff --git a/drivers/wifi/nrf_wifi/src/qspi/inc/rpu_hw_if.h b/drivers/wifi/nrfwifi/src/qspi/inc/rpu_hw_if.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/qspi/inc/rpu_hw_if.h
rename to drivers/wifi/nrfwifi/src/qspi/inc/rpu_hw_if.h
diff --git a/drivers/wifi/nrf_wifi/src/qspi/inc/spi_if.h b/drivers/wifi/nrfwifi/src/qspi/inc/spi_if.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/qspi/inc/spi_if.h
rename to drivers/wifi/nrfwifi/src/qspi/inc/spi_if.h
diff --git a/drivers/wifi/nrf_wifi/src/qspi/inc/spi_nor.h b/drivers/wifi/nrfwifi/src/qspi/inc/spi_nor.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/qspi/inc/spi_nor.h
rename to drivers/wifi/nrfwifi/src/qspi/inc/spi_nor.h
diff --git a/drivers/wifi/nrf_wifi/src/qspi/src/device.c b/drivers/wifi/nrfwifi/src/qspi/src/device.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/qspi/src/device.c
rename to drivers/wifi/nrfwifi/src/qspi/src/device.c
diff --git a/drivers/wifi/nrf_wifi/src/qspi/src/ficr_prog.c b/drivers/wifi/nrfwifi/src/qspi/src/ficr_prog.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/qspi/src/ficr_prog.c
rename to drivers/wifi/nrfwifi/src/qspi/src/ficr_prog.c
diff --git a/drivers/wifi/nrf_wifi/src/qspi/src/qspi_if.c b/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/qspi/src/qspi_if.c
rename to drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c
diff --git a/drivers/wifi/nrf_wifi/src/qspi/src/rpu_hw_if.c b/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/qspi/src/rpu_hw_if.c
rename to drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c
diff --git a/drivers/wifi/nrf_wifi/src/qspi/src/spi_if.c b/drivers/wifi/nrfwifi/src/qspi/src/spi_if.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/qspi/src/spi_if.c
rename to drivers/wifi/nrfwifi/src/qspi/src/spi_if.c
diff --git a/drivers/wifi/nrf_wifi/src/shim.c b/drivers/wifi/nrfwifi/src/shim.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/shim.c
rename to drivers/wifi/nrfwifi/src/shim.c
diff --git a/drivers/wifi/nrf_wifi/src/shim.h b/drivers/wifi/nrfwifi/src/shim.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/shim.h
rename to drivers/wifi/nrfwifi/src/shim.h
diff --git a/drivers/wifi/nrf_wifi/src/timer.c b/drivers/wifi/nrfwifi/src/timer.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/timer.c
rename to drivers/wifi/nrfwifi/src/timer.c
diff --git a/drivers/wifi/nrf_wifi/src/timer.h b/drivers/wifi/nrfwifi/src/timer.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/timer.h
rename to drivers/wifi/nrfwifi/src/timer.h
diff --git a/drivers/wifi/nrf_wifi/src/wifi_mgmt.c b/drivers/wifi/nrfwifi/src/wifi_mgmt.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/wifi_mgmt.c
rename to drivers/wifi/nrfwifi/src/wifi_mgmt.c
diff --git a/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c b/drivers/wifi/nrfwifi/src/wifi_mgmt_scan.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
rename to drivers/wifi/nrfwifi/src/wifi_mgmt_scan.c
diff --git a/drivers/wifi/nrf_wifi/src/wifi_util.c b/drivers/wifi/nrfwifi/src/wifi_util.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/wifi_util.c
rename to drivers/wifi/nrfwifi/src/wifi_util.c
diff --git a/drivers/wifi/nrf_wifi/src/wifi_util.h b/drivers/wifi/nrfwifi/src/wifi_util.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/wifi_util.h
rename to drivers/wifi/nrfwifi/src/wifi_util.h
diff --git a/drivers/wifi/nrf_wifi/src/work.c b/drivers/wifi/nrfwifi/src/work.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/work.c
rename to drivers/wifi/nrfwifi/src/work.c
diff --git a/drivers/wifi/nrf_wifi/src/work.h b/drivers/wifi/nrfwifi/src/work.h
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/work.h
rename to drivers/wifi/nrfwifi/src/work.h
diff --git a/drivers/wifi/nrf_wifi/src/wpa_supp_if.c b/drivers/wifi/nrfwifi/src/wpa_supp_if.c
similarity index 100%
rename from drivers/wifi/nrf_wifi/src/wpa_supp_if.c
rename to drivers/wifi/nrfwifi/src/wpa_supp_if.c
diff --git a/include/zephyr/drivers/wifi/nrf_wifi/off_raw_tx/off_raw_tx_api.h b/include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h
similarity index 100%
rename from include/zephyr/drivers/wifi/nrf_wifi/off_raw_tx/off_raw_tx_api.h
rename to include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h

From 1bbe3b58197a5280dd5bc92a81ed885ab42d2587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:22 +0100
Subject: [PATCH 1336/2913] Revert "[nrf fromtree] drivers: wifi: Fix offloaded
 raw TX feature flags"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4e50858759d961fe3286e37775125415bcfe73a3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/CMakeLists.txt | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 439263ec615..65dfe9579fd 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -305,14 +305,6 @@ zephyr_compile_definitions_ifdef(CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS
   -DWIFI_MGMT_RAW_SCAN_RESULTS=${CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS}
 )
 
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
-  -DNRF_NRF70_OFFLOADED_RAW_TX
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_PASSIVE_SCAN_ONLY
-  -DNRF70_PASSIVE_SCAN_ONLY
-)
-
 zephyr_compile_definitions(
   -DNRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
   -DNRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}

From 9b3ca086ae29a27001d5c59340e5eb294846916c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:22 +0100
Subject: [PATCH 1337/2913] Revert "[nrf fromtree] drivers: nrfwifi: Fix
 passing of RAW scan results flag"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 63f0523ffc098afa1d5a49a9619138aa4a2ddb1e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 65dfe9579fd..ad665916ceb 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -301,10 +301,6 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_FEAT_KEEPALIVE
   -DNRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}
 )
 
-zephyr_compile_definitions_ifdef(CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS
-  -DWIFI_MGMT_RAW_SCAN_RESULTS=${CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS}
-)
-
 zephyr_compile_definitions(
   -DNRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
   -DNRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}

From 00080ec53941c83dee752ca8062df2e8b9dd9a90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:22 +0100
Subject: [PATCH 1338/2913] Revert "[nrf fromtree] modules: hostap: Add
 external crypto support"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 86cf2419a2cac5934cfbf3f6bf9b2ab25a855867.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/Kconfig | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index 813a9b91ed6..e22059f00f0 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -166,14 +166,6 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT
 config WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
 	bool "No Crypto support for WiFi"
 
-config WIFI_NM_WPA_SUPPLICANT_CRYPTO_EXT
-	bool "External Crypto support for hostap"
-	help
-	  Use external crypto implementation for hostp, this is useful for
-	  platforms where the crypto implementation is provided by the platform
-	  and not by Zephyr. The external crypto implementation should provide
-	  the required APIs and any other dependencies required by hostap.
-
 endchoice
 
 config WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA

From fd8f5f6814ef79044b3176f80d2a99062720f66e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:22 +0100
Subject: [PATCH 1339/2913] Revert "[nrf fromtree] ci: do not pull babblesim in
 twister test workflow"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fd45cf7ef1491416c7f0ebd064a2417ae30648a5.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .github/workflows/twister_tests_blackbox.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/twister_tests_blackbox.yml b/.github/workflows/twister_tests_blackbox.yml
index b19bce0c535..8845c7eddd4 100644
--- a/.github/workflows/twister_tests_blackbox.yml
+++ b/.github/workflows/twister_tests_blackbox.yml
@@ -44,8 +44,7 @@ jobs:
 
         west init -l . || true
         # we do not depend on any hals, tools or bootloader, save some time and space...
-        west config manifest.group-filter -- -hal,-tools,-bootloader,-babblesim
-        west config manifest.project-filter -- -nrf_hw_models
+        west config manifest.group-filter -- -hal,-tools,-bootloader
         west config --global update.narrow true
         west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /github/cache/zephyrproject)
         west forall -c 'git reset --hard HEAD'

From e8627b72324111763324b494be81b6dbdf6224fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:22 +0100
Subject: [PATCH 1340/2913] Revert "[nrf fromtree] twister: blackbox: coverage:
 fix matching pattern"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6736f1890277540d243bca442eac17f2b4b8fd7e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/tests/twister_blackbox/test_coverage.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/tests/twister_blackbox/test_coverage.py b/scripts/tests/twister_blackbox/test_coverage.py
index 56fe73845ce..0d5e035ecd2 100644
--- a/scripts/tests/twister_blackbox/test_coverage.py
+++ b/scripts/tests/twister_blackbox/test_coverage.py
@@ -46,7 +46,7 @@ class TestCoverage:
                 'coverage.log', 'coverage.json',
                 'coverage'
             ],
-            r'{"files": \[\], "gcovr/format_version": ".*"}'
+            r'{"files": \[], "gcovr/format_version": ".*"}'
         ),
     ]
     TESTDATA_4 = [
@@ -243,7 +243,7 @@ def test_coverage_basedir(self, capfd, test_path, test_platforms, out_path, file
                 with open(path, "r") as json_file:
                     json_content = json.load(json_file)
                     pattern = re.compile(expected_content)
-                    assert pattern.match(json.dumps(json_content, sort_keys=True))
+                    assert pattern.match(json.dumps(json_content))
         if os.path.exists(base_dir):
             os.rmdir(base_dir)
 

From a7b8533e46e52353479252a69c17d309d86663db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:22 +0100
Subject: [PATCH 1341/2913] Revert "[nrf fromtree] twister: Allow sharing
 hardware platform between variants"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 510f46f8e8b86d45088a607cc6cb48787f23c421.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/develop/test/twister.rst                  | 19 -------
 scripts/pylib/twister/twisterlib/handlers.py  | 36 ++++----------
 .../pylib/twister/twisterlib/hardwaremap.py   | 49 ++++++++-----------
 scripts/schemas/twister/hwmap-schema.yaml     |  2 +-
 scripts/tests/twister/test_handlers.py        |  1 -
 5 files changed, 32 insertions(+), 75 deletions(-)

diff --git a/doc/develop/test/twister.rst b/doc/develop/test/twister.rst
index 0cc391e5b89..a362c79861a 100644
--- a/doc/develop/test/twister.rst
+++ b/doc/develop/test/twister.rst
@@ -1255,25 +1255,6 @@ using an external J-Link probe.  The ``probe_id`` keyword overrides the
       runner: jlink
       serial: null
 
-Using Single Board For Multiple Variants
-++++++++++++++++++++++++++++++++++++++++
-
-  The ``platform`` attribute can be a list of names or a string
-  with names separated by spaces. This allows to run tests for
-  different platform variants on the same physical board, without
-  re-configuring the hardware map file for each variant. For example:
-
-.. code-block:: yaml
-
-    - connected: true
-      id: '001234567890'
-      platform:
-      - nrf5340dk/nrf5340/cpuapp
-      - nrf5340dk/nrf5340/cpuapp/ns
-      product: J-Link
-      runner: nrfjprog
-      serial: /dev/ttyACM1
-
 Quarantine
 ++++++++++
 
diff --git a/scripts/pylib/twister/twisterlib/handlers.py b/scripts/pylib/twister/twisterlib/handlers.py
index 14e45d2c811..0ebab95434b 100755
--- a/scripts/pylib/twister/twisterlib/handlers.py
+++ b/scripts/pylib/twister/twisterlib/handlers.py
@@ -21,7 +21,6 @@
 import threading
 import time
 
-from contextlib import contextmanager
 from pathlib import Path
 from queue import Queue, Empty
 from twisterlib.environment import ZEPHYR_BASE, strip_ansi_sequences
@@ -459,17 +458,6 @@ def monitor_serial(self, ser, halt_event, harness):
 
         log_out_fp.close()
 
-    @staticmethod
-    @contextmanager
-    def acquire_dut_locks(duts):
-        try:
-            for d in duts:
-                d.lock.acquire()
-            yield
-        finally:
-            for d in duts:
-                d.lock.release()
-
     def device_is_available(self, instance):
         device = instance.platform.name
         fixture = instance.testsuite.harness_config.get("fixture")
@@ -487,16 +475,15 @@ def device_is_available(self, instance):
 
         # Select an available DUT with less failures
         for d in sorted(duts_found, key=lambda _dut: _dut.failures):
-            duts_shared_hw = [_d for _d in self.duts if _d.id == d.id]  # get all DUTs with the same id
-            with self.acquire_dut_locks(duts_shared_hw):
-                avail = False
-                if d.available:
-                    for _d in duts_shared_hw:
-                        _d.available = 0
-                    d.counter_increment()
-                    avail = True
-                    logger.debug(f"Retain DUT:{d.platform}, Id:{d.id}, "
-                                f"counter:{d.counter}, failures:{d.failures}")
+            d.lock.acquire()
+            avail = False
+            if d.available:
+                d.available = 0
+                d.counter_increment()
+                avail = True
+                logger.debug(f"Retain DUT:{d.platform}, Id:{d.id}, "
+                             f"counter:{d.counter}, failures:{d.failures}")
+            d.lock.release()
             if avail:
                 return d
 
@@ -507,10 +494,7 @@ def make_dut_available(self, dut):
             dut.failures_increment()
         logger.debug(f"Release DUT:{dut.platform}, Id:{dut.id}, "
                      f"counter:{dut.counter}, failures:{dut.failures}")
-        duts_shared_hw = [_d for _d in self.duts if _d.id == dut.id]  # get all DUTs with the same id
-        with self.acquire_dut_locks(duts_shared_hw):
-            for _d in duts_shared_hw:
-                _d.available = 1
+        dut.available = 1
 
     @staticmethod
     def run_custom_script(script, timeout):
diff --git a/scripts/pylib/twister/twisterlib/hardwaremap.py b/scripts/pylib/twister/twisterlib/hardwaremap.py
index fad8ace910a..6ca6dbcdb7d 100644
--- a/scripts/pylib/twister/twisterlib/hardwaremap.py
+++ b/scripts/pylib/twister/twisterlib/hardwaremap.py
@@ -259,13 +259,7 @@ def load(self, map_file):
             flash_before = dut.get('flash_before')
             if flash_before is None:
                 flash_before = self.options.flash_before and (not (flash_with_test or serial_pty))
-            platform = dut.get('platform')
-            if isinstance(platform, str):
-                platforms = platform.split()
-            elif isinstance(platform, list):
-                platforms = platform
-            else:
-                raise ValueError(f"Invalid platform value: {platform}")
+            platform  = dut.get('platform')
             id = dut.get('id')
             runner = dut.get('runner')
             runner_params = dut.get('runner_params')
@@ -274,29 +268,28 @@ def load(self, map_file):
             baud = dut.get('baud', None)
             product = dut.get('product')
             fixtures = dut.get('fixtures', [])
-            connected = dut.get('connected') and ((serial or serial_pty) is not None)
+            connected= dut.get('connected') and ((serial or serial_pty) is not None)
             if not connected:
                 continue
-            for plat in platforms:
-                new_dut = DUT(platform=plat,
-                              product=product,
-                              runner=runner,
-                              runner_params=runner_params,
-                              id=id,
-                              serial_pty=serial_pty,
-                              serial=serial,
-                              serial_baud=baud,
-                              connected=connected,
-                              pre_script=pre_script,
-                              flash_before=flash_before,
-                              post_script=post_script,
-                              post_flash_script=post_flash_script,
-                              script_param=script_param,
-                              flash_timeout=flash_timeout,
-                              flash_with_test=flash_with_test)
-                new_dut.fixtures = fixtures
-                new_dut.counter = 0
-                self.duts.append(new_dut)
+            new_dut = DUT(platform=platform,
+                          product=product,
+                          runner=runner,
+                          runner_params=runner_params,
+                          id=id,
+                          serial_pty=serial_pty,
+                          serial=serial,
+                          serial_baud=baud,
+                          connected=connected,
+                          pre_script=pre_script,
+                          flash_before=flash_before,
+                          post_script=post_script,
+                          post_flash_script=post_flash_script,
+                          script_param=script_param,
+                          flash_timeout=flash_timeout,
+                          flash_with_test=flash_with_test)
+            new_dut.fixtures = fixtures
+            new_dut.counter = 0
+            self.duts.append(new_dut)
 
     def scan(self, persistent=False):
         from serial.tools import list_ports
diff --git a/scripts/schemas/twister/hwmap-schema.yaml b/scripts/schemas/twister/hwmap-schema.yaml
index 142d4a1969b..f45bd8f79c7 100644
--- a/scripts/schemas/twister/hwmap-schema.yaml
+++ b/scripts/schemas/twister/hwmap-schema.yaml
@@ -16,7 +16,7 @@ sequence:
         type: str
         required: false
       "platform":
-        type: any
+        type: str
         required: true
       "probe_id":
         type: str
diff --git a/scripts/tests/twister/test_handlers.py b/scripts/tests/twister/test_handlers.py
index 8e539a04a46..3475c65197e 100644
--- a/scripts/tests/twister/test_handlers.py
+++ b/scripts/tests/twister/test_handlers.py
@@ -1273,7 +1273,6 @@ def mock_serial(*args, **kwargs):
     dut = DUT()
     dut.available = 0
     dut.failures = 0
-    handler.duts = [dut]
 
     hardware_baud = 14400
     flash_timeout = 60

From 0fcf70595591f3ec7dece699b55b2111a6524a31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:22 +0100
Subject: [PATCH 1342/2913] Revert "[nrf fromtree] modules: hal_nordic: nrfs:
 Enqueue requests when not connected"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8afab7ad6d39d5a51108b13736a74ea704fd7f27.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrfs/backends/nrfs_backend_ipc_service.c        | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c b/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c
index 129098e9b2d..66077337422 100644
--- a/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c
+++ b/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c
@@ -95,10 +95,6 @@ static void ipc_sysctrl_ept_bound(void *priv)
 	LOG_DBG("Bound to sysctrl.");
 	k_event_post(&ipc_connected_event, IPC_INIT_DONE_EVENT);
 	atomic_set(&ipc_cpusys_channel_config.status, CONNECTED);
-
-	if (k_msgq_num_used_get(&ipc_transmit_msgq) > 0) {
-		k_work_submit(&backend_send_work);
-	}
 }
 
 static void ipc_sysctrl_ept_recv(const void *data, size_t size, void *priv)
@@ -176,6 +172,11 @@ nrfs_err_t nrfs_backend_send(void *message, size_t size)
 
 nrfs_err_t nrfs_backend_send_ex(void *message, size_t size, k_timeout_t timeout, bool high_prio)
 {
+	if (atomic_get(&ipc_cpusys_channel_config.status) != CONNECTED) {
+		LOG_WRN("Backend not yet connected to sysctrl");
+		return NRFS_ERR_INVALID_STATE;
+	}
+
 	if (size <= MAX_PACKET_DATA_SIZE) {
 		int err;
 		struct ipc_data_packet tx_data;
@@ -189,9 +190,7 @@ nrfs_err_t nrfs_backend_send_ex(void *message, size_t size, k_timeout_t timeout,
 			return NRFS_ERR_IPC;
 		}
 
-		if (nrfs_backend_connected()) {
-			err = k_work_submit(&backend_send_work);
-		}
+		err = k_work_submit(&backend_send_work);
 
 		return err >= 0 ? 0 : NRFS_ERR_IPC;
 	}

From 356bb95e062d18d6dd2a8a812ef0f23f7398390b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:23 +0100
Subject: [PATCH 1343/2913] Revert "[nrf fromlist] modules: openthread: Add of
 Kconfigs to change child timeouts"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 03f65b199ca7e105719f2fcb5b5e4c3389a0b8c2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/openthread/Kconfig.thread             | 21 -------------
 .../platform/openthread-core-zephyr-config.h  | 31 -------------------
 2 files changed, 52 deletions(-)

diff --git a/modules/openthread/Kconfig.thread b/modules/openthread/Kconfig.thread
index 5a5a10d6712..22f11d5c606 100644
--- a/modules/openthread/Kconfig.thread
+++ b/modules/openthread/Kconfig.thread
@@ -210,24 +210,3 @@ config OPENTHREAD_STORE_FRAME_COUNTER_AHEAD
 	default 100000
 	help
 	  Openthread value ahead of the current frame counter for persistent storage.
-
-config OPENTHREAD_CHILD_SUPERVISION_CHECK_TIMEOUT
-	int "Openthread child supervision check timeout in seconds"
-	default 190
-	help
-	  The supervision check timeout interval in seconds used by a device in child state.
-	  Set to zero to disable the supervision check process on the child.
-
-config OPENTHREAD_CHILD_SUPERVISION_INTERVAL
-	int "Openthread child supervision interval in seconds"
-	default 129
-	help
-	  The supervision interval used by a parent device to send a supervision message
-	  to the child, if there is no transmission to the child within this interval.
-	  Set to zero to disable the supervision check process on the child.
-
-config OPENTHREAD_MLE_CHILD_TIMEOUT
-	int "Openthread MLE child timeout in seconds"
-	default 240
-	help
-	  The value of MLE child timeout in seconds.
diff --git a/modules/openthread/platform/openthread-core-zephyr-config.h b/modules/openthread/platform/openthread-core-zephyr-config.h
index fac10d211c6..434d69783be 100644
--- a/modules/openthread/platform/openthread-core-zephyr-config.h
+++ b/modules/openthread/platform/openthread-core-zephyr-config.h
@@ -468,35 +468,4 @@
 #define OPENTHREAD_CONFIG_STORE_FRAME_COUNTER_AHEAD CONFIG_OPENTHREAD_STORE_FRAME_COUNTER_AHEAD
 #endif
 
-/**
- * @def OPENTHREAD_CONFIG_CHILD_SUPERVISION_CHECK_TIMEOUT
- *
- * The value of the child supervision check timeout in seconds.
- *
- */
-#ifdef CONFIG_OPENTHREAD_CHILD_SUPERVISION_CHECK_TIMEOUT
-#define OPENTHREAD_CONFIG_CHILD_SUPERVISION_CHECK_TIMEOUT                                          \
-	CONFIG_OPENTHREAD_CHILD_SUPERVISION_CHECK_TIMEOUT
-#endif
-
-/**
- * @def OPENTHREAD_CONFIG_CHILD_SUPERVISION_INTERVAL
- *
- * The value of the child supervision interval in seconds.
- *
- */
-#ifdef CONFIG_OPENTHREAD_CHILD_SUPERVISION_INTERVAL
-#define OPENTHREAD_CONFIG_CHILD_SUPERVISION_INTERVAL CONFIG_OPENTHREAD_CHILD_SUPERVISION_INTERVAL
-#endif
-
-/**
- * @def OPENTHREAD_CONFIG_MLE_CHILD_TIMEOUT_DEFAULT
- *
- * The value of the MLE child timeout in seconds.
- *
- */
-#ifdef CONFIG_OPENTHREAD_MLE_CHILD_TIMEOUT
-#define OPENTHREAD_CONFIG_MLE_CHILD_TIMEOUT_DEFAULT CONFIG_OPENTHREAD_MLE_CHILD_TIMEOUT
-#endif
-
 #endif  /* OPENTHREAD_CORE_ZEPHYR_CONFIG_H_ */

From f6de858cb1f532fb5bc18ca8d0d6f571b6313cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:23 +0100
Subject: [PATCH 1344/2913] Revert "[nrf fromtree] net: lib: coap_client: Const
 pointers in request"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d02544f75f3dc9b5e9cc25fc94bde307965a2a27.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/coap_client.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/zephyr/net/coap_client.h b/include/zephyr/net/coap_client.h
index ce09c56dd2e..bbeebb2d26c 100644
--- a/include/zephyr/net/coap_client.h
+++ b/include/zephyr/net/coap_client.h
@@ -53,16 +53,16 @@ typedef void (*coap_client_response_cb_t)(int16_t result_code,
  * @brief Representation of a CoAP client request.
  */
 struct coap_client_request {
-	enum coap_method method;                  /**< Method of the request */
-	bool confirmable;                         /**< CoAP Confirmable/Non-confirmable message */
-	const char *path;                         /**< Path of the requested resource */
-	enum coap_content_format fmt;             /**< Content format to be used */
-	const uint8_t *payload;                   /**< User allocated buffer for send request */
-	size_t len;                               /**< Length of the payload */
-	coap_client_response_cb_t cb;             /**< Callback when response received */
-	const struct coap_client_option *options; /**< Extra options to be added to request */
-	uint8_t num_options;                      /**< Number of extra options */
-	void *user_data;                          /**< User provided context */
+	enum coap_method method;            /**< Method of the request */
+	bool confirmable;	            /**< CoAP Confirmable/Non-confirmable message */
+	const char *path;	            /**< Path of the requested resource */
+	enum coap_content_format fmt;       /**< Content format to be used */
+	uint8_t *payload;	            /**< User allocated buffer for send request */
+	size_t len;		            /**< Length of the payload */
+	coap_client_response_cb_t cb;       /**< Callback when response received */
+	struct coap_client_option *options; /**< Extra options to be added to request */
+	uint8_t num_options;                /**< Number of extra options */
+	void *user_data;	            /**< User provided context */
 };
 
 /**

From a8f55c78b6f6ae481bb7e2f78ef964e43d5e38da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:23 +0100
Subject: [PATCH 1345/2913] Revert "[nrf fromtree] net: lib: coap_client:
 Release non-confirmable requests"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d3cba27aae225bfcb09afe8192d9a8e2b8f70bc8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 53 +++++++++++--------------------
 1 file changed, 18 insertions(+), 35 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index a3c56281819..30dcbb42005 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -105,10 +105,6 @@ static bool exchange_lifetime_exceeded(struct coap_client_internal_request *inte
 		return true;
 	}
 
-	if (internal_req->pending.t0 == 0) {
-		return true;
-	}
-
 	time_since_t0 = k_uptime_get() - internal_req->pending.t0;
 	exchange_lifetime =
 		(internal_req->pending.params.ack_timeout * COAP_EXCHANGE_LIFETIME_FACTOR);
@@ -368,7 +364,7 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
 	/* Don't allow changing to a different socket if there is already request ongoing. */
 	if (client->fd != sock && has_ongoing_request(client)) {
 		ret = -EALREADY;
-		goto release;
+		goto out;
 	}
 
 	/* Don't allow changing to a different address if there is already request ongoing. */
@@ -377,7 +373,7 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
 			if (has_ongoing_request(client)) {
 				LOG_WRN("Can't change to a different socket, request ongoing.");
 				ret = -EALREADY;
-				goto release;
+				goto out;
 			}
 
 			memcpy(&client->address, addr, sizeof(*addr));
@@ -388,7 +384,7 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
 			if (has_ongoing_request(client)) {
 				LOG_WRN("Can't change to a different socket, request ongoing.");
 				ret = -EALREADY;
-				goto release;
+				goto out;
 			}
 
 			memset(&client->address, 0, sizeof(client->address));
@@ -401,7 +397,7 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
 	ret = coap_client_init_request(client, req, internal_req, false);
 	if (ret < 0) {
 		LOG_ERR("Failed to initialize coap request");
-		goto release;
+		goto out;
 	}
 
 	if (client->send_echo) {
@@ -409,7 +405,7 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
 						client->echo_option.value, client->echo_option.len);
 		if (ret < 0) {
 			LOG_ERR("Failed to append echo option");
-			goto release;
+			goto out;
 		}
 		client->send_echo = false;
 	}
@@ -417,36 +413,28 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
 	ret = coap_client_schedule_poll(client, sock, req, internal_req);
 	if (ret < 0) {
 		LOG_ERR("Failed to schedule polling");
-		goto release;
+		goto out;
 	}
 
-	ret = coap_pending_init(&internal_req->pending, &internal_req->request,
-				&client->address, params);
+	/* only TYPE_CON messages need pending tracking */
+	if (coap_header_get_type(&internal_req->request) == COAP_TYPE_CON) {
+		ret = coap_pending_init(&internal_req->pending, &internal_req->request,
+					&client->address, params);
 
-	if (ret < 0) {
-		LOG_ERR("Failed to initialize pending struct");
-		goto release;
-	}
+		if (ret < 0) {
+			LOG_ERR("Failed to initialize pending struct");
+			goto out;
+		}
 
-	/* Non-Confirmable messages are not retried, but we still track the lifetime as
-	 * replies are acceptable.
-	 */
-	if (coap_header_get_type(&internal_req->request) == COAP_TYPE_NON_CON) {
-		internal_req->pending.retries = 0;
+		coap_pending_cycle(&internal_req->pending);
+		internal_req->is_observe = coap_request_is_observe(&internal_req->request);
+		LOG_DBG("Request is_observe %d", internal_req->is_observe);
 	}
-	coap_pending_cycle(&internal_req->pending);
-	internal_req->is_observe = coap_request_is_observe(&internal_req->request);
-	LOG_DBG("Request is_observe %d", internal_req->is_observe);
 
 	ret = send_request(sock, internal_req->request.data, internal_req->request.offset, 0,
 			  &client->address, client->socklen);
 	if (ret < 0) {
-		ret = -errno;
-	}
-
-release:
-	if (ret < 0) {
-		LOG_ERR("Failed to send request: %d", ret);
+		LOG_ERR("Transmission failed: %d", errno);
 		reset_internal_request(internal_req);
 	} else {
 		/* Do not return the number of bytes sent */
@@ -533,11 +521,6 @@ static void coap_client_resend_handler(struct coap_client *client)
 
 	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
 		if (timeout_expired(&client->requests[i])) {
-			if (!client->requests[i].coap_request.confirmable) {
-				release_internal_request(&client->requests[i]);
-				continue;
-			}
-
 			ret = resend_request(client, &client->requests[i]);
 			if (ret < 0) {
 				report_callback_error(&client->requests[i], ret);

From 7b200f7c15060c77a98057a33f6ec85aa18054aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:23 +0100
Subject: [PATCH 1346/2913] Revert "[nrf fromtree] net: lib: coap_client: Fix
 timeout for separate response"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6bfc61def481d410a67bd1f81907f29c19a7ecb7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 30dcbb42005..468505f5eb5 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -793,7 +793,7 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 			return 0;
 		}
 		internal_req->pending.t0 = k_uptime_get();
-		internal_req->pending.timeout = COAP_SEPARATE_TIMEOUT;
+		internal_req->pending.timeout = internal_req->pending.t0 + COAP_SEPARATE_TIMEOUT;
 		internal_req->pending.retries = 0;
 		return 1;
 	}

From 8072de1a571e8a565250c01c01a7a4e580506624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:23 +0100
Subject: [PATCH 1347/2913] Revert "[nrf fromtree] tests: coap_client: Add test
 for non-confirmable request"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5cd6dd06f4fcdb295fa46fcb5a1ad76998895d76.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/lib/coap_client/src/main.c | 32 ----------------------------
 1 file changed, 32 deletions(-)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 02d7693a7a0..a620b1985e0 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -903,35 +903,3 @@ ZTEST(coap_client, test_cancel_match)
 	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 
 }
-
-ZTEST(coap_client, test_non_confirmable)
-{
-	struct coap_client_request req = {
-		.method = COAP_METHOD_GET,
-		.confirmable = false,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem1
-	};
-
-	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
-	set_socket_events(client.fd, ZSOCK_POLLOUT);
-
-	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
-		zassert_ok(coap_client_req(&client, 0, &dst_address, &req, NULL));
-	}
-	zassert_equal(coap_client_req(&client, 0, &dst_address, &req, NULL), -EAGAIN, "");
-
-	k_sleep(K_MSEC(MORE_THAN_LONG_EXCHANGE_LIFETIME_MS));
-
-	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
-		zassert_ok(coap_client_req(&client, 0, &dst_address, &req, NULL));
-	}
-	zassert_equal(coap_client_req(&client, 0, &dst_address, &req, NULL), -EAGAIN, "");
-
-	/* No callbacks from non-confirmable */
-	zassert_not_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-}

From 608ff508443e1bef509741cfc80db9b58e11fa75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:23 +0100
Subject: [PATCH 1348/2913] Revert "[nrf fromtree] tests: coap_client: Refactor
 tests"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ca63cdbf413b06ed74377b20c98327c77fd71a31.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/lib/coap_client/src/main.c | 594 +++++++++++++++++++++------
 1 file changed, 475 insertions(+), 119 deletions(-)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index a620b1985e0..72b84a60f5e 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -27,48 +27,20 @@ DEFINE_FFF_GLOBALS;
 #define VALID_MESSAGE_ID BIT(31)
 #define TOKEN_OFFSET          4
 
-void coap_callback(int16_t code, size_t offset, const uint8_t *payload, size_t len, bool last_block,
-		   void *user_data);
-
 static int16_t last_response_code;
-static const char test_path[] = "test";
+static const char *test_path = "test";
 
 static uint32_t messages_needing_response[2];
 static uint8_t last_token[2][COAP_TOKEN_MAX_LEN];
 static const uint8_t empty_token[COAP_TOKEN_MAX_LEN] = {0};
-K_SEM_DEFINE(sem1, 0, 1);
-K_SEM_DEFINE(sem2, 0, 1);
 
 static struct coap_client client;
 static struct coap_client client2 = {
 	.fd = 1,
 };
 
-static const char short_payload[] = "testing";
-static const char long_payload[] = LOREM_IPSUM_SHORT;
-static struct coap_client_request short_request = {
-	.method = COAP_METHOD_GET,
-	.confirmable = true,
-	.path = test_path,
-	.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-	.cb = coap_callback,
-	.payload = short_payload,
-	.len = sizeof(short_payload) - 1,
-	.user_data = &sem1,
-};
-static struct coap_client_request long_request = {
-	.method = COAP_METHOD_GET,
-	.confirmable = true,
-	.path = test_path,
-	.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-	.cb = coap_callback,
-	.payload = long_payload,
-	.len = sizeof(long_payload) - 1,
-	.user_data = &sem2,
-};
-static struct sockaddr dst_address;
-
-
+static char *short_payload = "testing";
+static char *long_payload = LOREM_IPSUM_SHORT;
 
 static uint16_t get_next_pending_message_id(void)
 {
@@ -451,16 +423,6 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_observe(int sock, void *buf, si
 	return ret;
 }
 
-void coap_callback(int16_t code, size_t offset, const uint8_t *payload, size_t len, bool last_block,
-		   void *user_data)
-{
-	LOG_INF("CoAP response callback, %d", code);
-	last_response_code = code;
-	if (user_data) {
-		k_sem_give((struct k_sem *) user_data);
-	}
-}
-
 extern void net_coap_init(void);
 
 static void *suite_setup(void)
@@ -501,38 +463,90 @@ static void test_setup(void *data)
 
 	memset(&client.requests, 0, sizeof(client.requests));
 	memset(last_token, 0, sizeof(last_token));
+
 	last_response_code = 0;
-	k_sem_reset(&sem1);
-	k_sem_reset(&sem2);
 
 	k_mutex_unlock(&client.lock);
 }
 
-static void test_after(void *data)
+void coap_callback(int16_t code, size_t offset, const uint8_t *payload, size_t len, bool last_block,
+		   void *user_data)
 {
-	coap_client_cancel_requests(&client);
-	coap_client_cancel_requests(&client2);
+	LOG_INF("CoAP response callback, %d", code);
+	last_response_code = code;
+	if (user_data) {
+		k_sem_give((struct k_sem *) user_data);
+	}
 }
 
-ZTEST_SUITE(coap_client, NULL, suite_setup, test_setup, test_after, NULL);
+ZTEST_SUITE(coap_client, NULL, suite_setup, test_setup, NULL, NULL);
 
 ZTEST(coap_client, test_get_request)
 {
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, NULL));
+	int ret = 0;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = NULL,
+		.len = 0
+	};
+
+	client_request.payload = short_payload;
+	client_request.len = strlen(short_payload);
+
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
+	LOG_INF("Test done");
 }
 
 ZTEST(coap_client, test_request_block)
 {
+	int ret = 0;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+	};
+
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_block;
 
-	zassert_equal(coap_client_req(&client, 0, &dst_address, &short_request, NULL), -EAGAIN, "");
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_equal(ret, -EAGAIN, "");
 }
 
+
 ZTEST(coap_client, test_resend_request)
 {
+	int ret = 0;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+	};
+
 	int (*sendto_fakes[])(int, void *, size_t, int, const struct sockaddr *, socklen_t) = {
 		z_impl_zsock_sendto_custom_fake_no_reply,
 		z_impl_zsock_sendto_custom_fake_block,
@@ -542,43 +556,86 @@ ZTEST(coap_client, test_resend_request)
 	SET_CUSTOM_FAKE_SEQ(z_impl_zsock_sendto, sendto_fakes, ARRAY_SIZE(sendto_fakes));
 	set_socket_events(client.fd, ZSOCK_POLLOUT);
 
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, NULL));
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	k_sleep(K_MSEC(MORE_THAN_ACK_TIMEOUT_MS));
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 	zassert_equal(z_impl_zsock_sendto_fake.call_count, 3);
+	LOG_INF("Test done");
 }
 
 ZTEST(coap_client, test_echo_option)
 {
+	int ret = 0;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = NULL,
+		.len = 0
+	};
+
+	client_request.payload = short_payload;
+	client_request.len = strlen(short_payload);
+
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_echo;
 
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, NULL));
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
+	LOG_INF("Test done");
 }
 
 ZTEST(coap_client, test_echo_option_next_req)
 {
-	struct coap_client_request req = short_request;
+	int ret = 0;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = NULL,
+		.len = 0
+	};
+
+	client_request.payload = short_payload;
+	client_request.len = strlen(short_payload);
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_echo_next_req;
 
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, NULL));
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
 	char *payload = "echo testing";
 
-	req.method = COAP_METHOD_POST;
-	req.payload = payload;
-	req.len = strlen(payload);
+	client_request.method = COAP_METHOD_POST;
+	client_request.payload = payload;
+	client_request.len = strlen(payload);
 
 	LOG_INF("Send next request");
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &req, NULL));
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
@@ -586,15 +643,51 @@ ZTEST(coap_client, test_echo_option_next_req)
 
 ZTEST(coap_client, test_get_no_path)
 {
-	struct coap_client_request req = short_request;
+	int ret = 0;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = NULL,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = NULL,
+		.len = 0
+	};
 
-	req.path = NULL;
-	zassert_equal(coap_client_req(&client, 0, &dst_address, &req, NULL), -EINVAL, "");
+	client_request.payload = short_payload;
+	client_request.len = strlen(short_payload);
+
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+
+	zassert_equal(ret, -EINVAL, "Get request without path");
 }
 
 ZTEST(coap_client, test_send_large_data)
 {
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &long_request, NULL));
+	int ret = 0;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = NULL,
+		.len = 0
+	};
+
+	client_request.payload = long_payload;
+	client_request.len = strlen(long_payload);
+
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
@@ -602,16 +695,35 @@ ZTEST(coap_client, test_send_large_data)
 
 ZTEST(coap_client, test_no_response)
 {
+	int ret = 0;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = NULL,
+		.len = 0
+	};
 	struct coap_transmission_parameters params = {
 		.ack_timeout = LONG_ACK_TIMEOUT_MS,
 		.coap_backoff_percent = 200,
 		.max_retransmission = 0
 	};
 
+	client_request.payload = short_payload;
+	client_request.len = strlen(short_payload);
+
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
 	set_socket_events(client.fd, ZSOCK_POLLOUT);
 
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, &params));
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, &params);
+
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
 	k_sleep(K_MSEC(MORE_THAN_LONG_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, -ETIMEDOUT, "Unexpected response");
@@ -619,9 +731,28 @@ ZTEST(coap_client, test_no_response)
 
 ZTEST(coap_client, test_separate_response)
 {
+	int ret = 0;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = NULL,
+		.len = 0
+	};
+
+	client_request.payload = short_payload;
+	client_request.len = strlen(short_payload);
+
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_empty_ack;
 
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, NULL));
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
@@ -629,24 +760,50 @@ ZTEST(coap_client, test_separate_response)
 
 ZTEST(coap_client, test_separate_response_lost)
 {
-	struct coap_client_request req = short_request;
-
-	req.user_data = &sem1;
+	int ret = 0;
+	struct k_sem sem;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem,
+	};
 
+	zassert_ok(k_sem_init(&sem, 0, 1));
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_only_ack;
 	set_socket_events(client.fd, ZSOCK_POLLOUT);
 
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &req, NULL));
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
-	zassert_ok(k_sem_take(&sem1, K_MSEC(COAP_SEPARATE_TIMEOUT)));
+	zassert_ok(k_sem_take(&sem, K_MSEC(COAP_SEPARATE_TIMEOUT)));
 	zassert_equal(last_response_code, -ETIMEDOUT, "");
 }
 
 ZTEST(coap_client, test_separate_response_ack_fail)
 {
-	struct coap_client_request req = short_request;
-
-	req.user_data = &sem1;
+	int ret = 0;
+	struct k_sem sem;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem,
+	};
+	zassert_ok(k_sem_init(&sem, 0, 1));
 
 	int (*sendto_fakes[])(int, void *, size_t, int, const struct sockaddr *, socklen_t) = {
 		z_impl_zsock_sendto_custom_fake,
@@ -656,47 +813,95 @@ ZTEST(coap_client, test_separate_response_ack_fail)
 	SET_CUSTOM_FAKE_SEQ(z_impl_zsock_sendto, sendto_fakes, ARRAY_SIZE(sendto_fakes));
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_empty_ack;
 
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &req, NULL));
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
-	zassert_ok(k_sem_take(&sem1, K_MSEC(COAP_SEPARATE_TIMEOUT)));
+	zassert_ok(k_sem_take(&sem, K_MSEC(COAP_SEPARATE_TIMEOUT)));
 	zassert_equal(last_response_code, -ENETDOWN, "");
 }
 
 ZTEST(coap_client, test_multiple_requests)
 {
-	struct coap_client_request req1 = short_request;
-	struct coap_client_request req2 = short_request;
+	int ret = 0;
+	int retry = MORE_THAN_EXCHANGE_LIFETIME_MS;
+	struct k_sem sem1, sem2;
+
+	struct sockaddr address = {0};
+	struct coap_client_request req1 = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem1
+	};
+	struct coap_client_request req2 = req1;
 
-	req1.user_data = &sem1;
 	req2.user_data = &sem2;
 
+	k_sem_init(&sem1, 0, 1);
+	k_sem_init(&sem2, 0, 1);
+
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
 
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &req1, NULL));
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &req2, NULL));
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &req1, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+
+	ret = coap_client_req(&client, 0, &address, &req2, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
 	set_socket_events(client.fd, ZSOCK_POLLIN);
-	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	while (last_response_code == 0 && retry > 0) {
+		retry--;
+		k_sleep(K_MSEC(1));
+	}
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
 	last_response_code = 0;
 	set_socket_events(client.fd, ZSOCK_POLLIN);
+	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
 
 ZTEST(coap_client, test_unmatching_tokens)
 {
+	int ret = 0;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = NULL,
+		.len = 0
+	};
 	struct coap_transmission_parameters params = {
 		.ack_timeout = LONG_ACK_TIMEOUT_MS,
 		.coap_backoff_percent = 200,
 		.max_retransmission = 0
 	};
 
+	client_request.payload = short_payload;
+	client_request.len = strlen(short_payload);
+
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_unmatching;
 	set_socket_events(client.fd, ZSOCK_POLLIN | ZSOCK_POLLOUT);
 
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, &params));
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, &params);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
 	k_sleep(K_MSEC(MORE_THAN_LONG_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, -ETIMEDOUT, "Unexpected response");
@@ -704,14 +909,45 @@ ZTEST(coap_client, test_unmatching_tokens)
 
 ZTEST(coap_client, test_multiple_clients)
 {
-	struct coap_client_request req1 = short_request;
-	struct coap_client_request req2 = long_request;
+	int ret;
+	int retry = MORE_THAN_EXCHANGE_LIFETIME_MS;
+	struct k_sem sem1, sem2;
+	struct sockaddr address = {0};
+	struct coap_client_request req1 = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem1
+	};
+	struct coap_client_request req2 = req1;
 
-	req1.user_data = &sem1;
 	req2.user_data = &sem2;
+	req2.payload = long_payload;
+	req2.len = strlen(long_payload);
+
+	zassert_ok(k_sem_init(&sem1, 0, 1));
+	zassert_ok(k_sem_init(&sem2, 0, 1));
+
+	k_sleep(K_MSEC(1));
 
-	zassert_ok(coap_client_req(&client, client.fd, &dst_address, &req1, NULL));
-	zassert_ok(coap_client_req(&client2, client2.fd, &dst_address, &req2, NULL));
+	LOG_INF("Sending requests");
+	ret = coap_client_req(&client, client.fd, &address, &req1, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+
+	ret = coap_client_req(&client2, client2.fd, &address, &req2, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+
+	while (last_response_code == 0 && retry > 0) {
+		retry--;
+		k_sleep(K_MSEC(1));
+	}
+	set_socket_events(client2.fd, ZSOCK_POLLIN);
+
+	k_sleep(K_SECONDS(1));
 
 	/* ensure we got both responses */
 	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
@@ -722,10 +958,26 @@ ZTEST(coap_client, test_multiple_clients)
 
 ZTEST(coap_client, test_poll_err)
 {
+	int ret = 0;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+	};
+
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
 	set_socket_events(client.fd, ZSOCK_POLLERR);
 
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, NULL));
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, -EIO, "Unexpected response");
@@ -733,10 +985,29 @@ ZTEST(coap_client, test_poll_err)
 
 ZTEST(coap_client, test_poll_err_after_response)
 {
+	int ret = 0;
+	struct k_sem sem1;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem1
+	};
+
+	zassert_ok(k_sem_init(&sem1, 0, 1));
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
 	set_socket_events(client.fd, ZSOCK_POLLIN);
 
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, NULL));
+	k_sleep(K_MSEC(1));
+
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
 	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
@@ -747,17 +1018,35 @@ ZTEST(coap_client, test_poll_err_after_response)
 
 ZTEST(coap_client, test_poll_err_on_another_sock)
 {
-	struct coap_client_request req1 = short_request;
-	struct coap_client_request req2 = short_request;
+	int ret = 0;
+	struct k_sem sem1, sem2;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem1
+	};
+	struct coap_client_request request2 = client_request;
 
-	req1.user_data = &sem1;
-	req2.user_data = &sem2;
+	request2.user_data = &sem2;
+
+	zassert_ok(k_sem_init(&sem1, 0, 1));
+	zassert_ok(k_sem_init(&sem2, 0, 1));
 
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
 	set_socket_events(client.fd, ZSOCK_POLLERR);
 
-	zassert_ok(coap_client_req(&client2, client2.fd, &dst_address, &req2, NULL));
-	zassert_ok(coap_client_req(&client, client.fd, &dst_address, &req1, NULL));
+	k_sleep(K_MSEC(1));
+
+	ret = coap_client_req(&client2, client2.fd, &address, &request2, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	ret = coap_client_req(&client, client.fd, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
 	set_socket_events(client2.fd, ZSOCK_POLLIN);
 
@@ -769,25 +1058,45 @@ ZTEST(coap_client, test_poll_err_on_another_sock)
 
 ZTEST(coap_client, test_duplicate_response)
 {
+	int ret = 0;
+	struct k_sem sem;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem,
+	};
+
+	zassert_ok(k_sem_init(&sem, 0, 2));
 	z_impl_zsock_recvfrom_fake.custom_fake =
 		z_impl_zsock_recvfrom_custom_fake_duplicate_response;
 
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, NULL));
+	k_sleep(K_MSEC(1));
+	LOG_INF("Send request");
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
+	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
-	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
-	zassert_equal(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)), -EAGAIN, "");
+	zassert_equal(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)), -EAGAIN, "");
 }
 
 ZTEST(coap_client, test_observe)
 {
+	struct k_sem sem;
+	struct sockaddr address = {0};
 	struct coap_client_option options = {
 		.code = COAP_OPTION_OBSERVE,
 		.value[0] = 0,
 		.len = 1,
 	};
-	struct coap_client_request req = {
+	struct coap_client_request client_request = {
 		.method = COAP_METHOD_GET,
 		.confirmable = true,
 		.path = test_path,
@@ -797,47 +1106,79 @@ ZTEST(coap_client, test_observe)
 		.len = strlen(short_payload),
 		.options = &options,
 		.num_options = 1,
-		.user_data = &sem1,
+		.user_data = &sem,
 	};
 
+	zassert_ok(k_sem_init(&sem, 0, 1));
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_observe;
 
+	k_sleep(K_MSEC(1));
 
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &req, NULL));
+	zassert_ok(coap_client_req(&client, 0, &address, &client_request, NULL));
 
-	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 
 	coap_client_cancel_requests(&client);
-	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, -ECANCELED, "");
 
-	zassert_not_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_not_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 }
 
 ZTEST(coap_client, test_request_rst)
 {
+	struct k_sem sem;
+	struct sockaddr address = {0};
+	struct coap_client_request client_request = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem,
+	};
+
+	zassert_ok(k_sem_init(&sem, 0, 1));
+	k_sleep(K_MSEC(1));
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_rst;
 
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &short_request, NULL));
+	zassert_ok(coap_client_req(&client, 0, &address, &client_request, NULL));
 
-	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, -ECONNRESET, "");
 }
 
 ZTEST(coap_client, test_cancel)
 {
-	struct coap_client_request req1 = short_request;
-	struct coap_client_request req2 = short_request;
+	struct k_sem sem1, sem2;
+	struct sockaddr address = {0};
+	struct coap_client_request req1 = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem1
+	};
+	struct coap_client_request req2 = req1;
 
-	req1.user_data = &sem1;
 	req2.user_data = &sem2;
 
+	k_sem_init(&sem1, 0, 1);
+	k_sem_init(&sem2, 0, 1);
+
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
 
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &req1, NULL));
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &req2, NULL));
+	k_sleep(K_MSEC(1));
+
+	zassert_ok(coap_client_req(&client, 0, &address, &req1, NULL));
+	zassert_ok(coap_client_req(&client, 0, &address, &req2, NULL));
 
 	k_sleep(K_SECONDS(1));
 
@@ -855,17 +1196,32 @@ ZTEST(coap_client, test_cancel)
 
 ZTEST(coap_client, test_cancel_match)
 {
-	struct coap_client_request req1 = short_request;
-	struct coap_client_request req2 = short_request;
+	struct k_sem sem1, sem2;
+	struct sockaddr address = {0};
+	struct coap_client_request req1 = {
+		.method = COAP_METHOD_GET,
+		.confirmable = true,
+		.path = test_path,
+		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
+		.cb = coap_callback,
+		.payload = short_payload,
+		.len = strlen(short_payload),
+		.user_data = &sem1
+	};
+	struct coap_client_request req2 = req1;
 
-	req1.user_data = &sem1;
 	req2.user_data = &sem2;
 	req2.path = "another";
 
+	k_sem_init(&sem1, 0, 1);
+	k_sem_init(&sem2, 0, 1);
+
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
 
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &req1, NULL));
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &req2, NULL));
+	k_sleep(K_MSEC(1));
+
+	zassert_ok(coap_client_req(&client, 0, &address, &req1, NULL));
+	zassert_ok(coap_client_req(&client, 0, &address, &req2, NULL));
 
 	k_sleep(K_SECONDS(1));
 
@@ -877,7 +1233,7 @@ ZTEST(coap_client, test_cancel_match)
 	zassert_not_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, -ECANCELED, "");
 
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &req1, NULL));
+	zassert_ok(coap_client_req(&client, 0, &address, &req1, NULL));
 
 	/* should not match */
 	coap_client_cancel_request(&client, &(struct coap_client_request) {
@@ -894,8 +1250,8 @@ ZTEST(coap_client, test_cancel_match)
 	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &req1, NULL));
-	zassert_ok(coap_client_req(&client, 0, &dst_address, &req2, NULL));
+	zassert_ok(coap_client_req(&client, 0, &address, &req1, NULL));
+	zassert_ok(coap_client_req(&client, 0, &address, &req2, NULL));
 
 	/* match both (wildcard)*/
 	coap_client_cancel_request(&client, &(struct coap_client_request) {0});

From b3a7b7fef23634b98025bcba414d27d6d0979d97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:23 +0100
Subject: [PATCH 1349/2913] Revert "[nrf fromtree] tests: coap_client: Proper
 slow-down"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1fb3da9ccad15e9bfcfa482016d030531e876a74.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/lib/coap_client/CMakeLists.txt         |  2 +-
 tests/net/lib/coap_client/boards/native_sim.conf |  1 -
 tests/net/lib/coap_client/src/main.c             | 15 +++------------
 tests/net/lib/coap_client/src/stubs.c            |  5 +----
 4 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 tests/net/lib/coap_client/boards/native_sim.conf

diff --git a/tests/net/lib/coap_client/CMakeLists.txt b/tests/net/lib/coap_client/CMakeLists.txt
index 74d11c90fbf..07a4d8a9827 100644
--- a/tests/net/lib/coap_client/CMakeLists.txt
+++ b/tests/net/lib/coap_client/CMakeLists.txt
@@ -26,7 +26,7 @@ add_compile_definitions(CONFIG_COAP_CLIENT_MESSAGE_HEADER_SIZE=48)
 add_compile_definitions(CONFIG_COAP_CLIENT_STACK_SIZE=1024)
 add_compile_definitions(CONFIG_COAP_CLIENT_THREAD_PRIORITY=10)
 add_compile_definitions(CONFIG_COAP_LOG_LEVEL=4)
-add_compile_definitions(CONFIG_COAP_INIT_ACK_TIMEOUT_MS=1000)
+add_compile_definitions(CONFIG_COAP_INIT_ACK_TIMEOUT_MS=100)
 add_compile_definitions(CONFIG_COAP_CLIENT_MAX_REQUESTS=2)
 add_compile_definitions(CONFIG_COAP_CLIENT_MAX_INSTANCES=2)
 add_compile_definitions(CONFIG_COAP_MAX_RETRANSMIT=4)
diff --git a/tests/net/lib/coap_client/boards/native_sim.conf b/tests/net/lib/coap_client/boards/native_sim.conf
deleted file mode 100644
index 0843e94acbd..00000000000
--- a/tests/net/lib/coap_client/boards/native_sim.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME=y
diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 72b84a60f5e..2f3fa28ebff 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -8,9 +8,7 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/misc/lorem_ipsum.h>
 #include <zephyr/ztest.h>
-#if defined(CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME)
-#include "timer_model.h"
-#endif
+
 #include "stubs.h"
 
 LOG_MODULE_REGISTER(coap_client_test, LOG_LEVEL_DBG);
@@ -18,12 +16,12 @@ LOG_MODULE_REGISTER(coap_client_test, LOG_LEVEL_DBG);
 DEFINE_FFF_GLOBALS;
 #define FFF_FAKES_LIST(FAKE)
 
-#define LONG_ACK_TIMEOUT_MS                 (2 * CONFIG_COAP_INIT_ACK_TIMEOUT_MS)
+#define LONG_ACK_TIMEOUT_MS                 200
 #define MORE_THAN_EXCHANGE_LIFETIME_MS      4 * CONFIG_COAP_INIT_ACK_TIMEOUT_MS
 #define MORE_THAN_LONG_EXCHANGE_LIFETIME_MS 4 * LONG_ACK_TIMEOUT_MS
 #define MORE_THAN_ACK_TIMEOUT_MS                                                                   \
 	(CONFIG_COAP_INIT_ACK_TIMEOUT_MS + CONFIG_COAP_INIT_ACK_TIMEOUT_MS / 2)
-#define COAP_SEPARATE_TIMEOUT (6000 * 2) /* Needs a safety marging, tests run faster than -rt */
+#define COAP_SEPARATE_TIMEOUT (6000 * 3) /* Needs a safety marging, tests run faster than -rt */
 #define VALID_MESSAGE_ID BIT(31)
 #define TOKEN_OFFSET          4
 
@@ -427,13 +425,6 @@ extern void net_coap_init(void);
 
 static void *suite_setup(void)
 {
-#if defined(CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME)
-	/* It is enough that some slow-down is happening on sleeps, it does not have to be
-	 * real time
-	 */
-	hwtimer_set_rt_ratio(100.0);
-	k_sleep(K_MSEC(1));
-#endif
 	net_coap_init();
 	zassert_ok(coap_client_init(&client, NULL));
 	zassert_ok(coap_client_init(&client2, NULL));
diff --git a/tests/net/lib/coap_client/src/stubs.c b/tests/net/lib/coap_client/src/stubs.c
index b3dbfc6df75..f3451df054f 100644
--- a/tests/net/lib/coap_client/src/stubs.c
+++ b/tests/net/lib/coap_client/src/stubs.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 #include <stubs.h>
 
-LOG_MODULE_DECLARE(coap_client_test, LOG_LEVEL_DBG);
+LOG_MODULE_DECLARE(coap_client_test);
 
 DEFINE_FAKE_VALUE_FUNC(uint32_t, z_impl_sys_rand32_get);
 DEFINE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_recvfrom, int, void *, size_t, int, struct sockaddr *,
@@ -45,9 +45,6 @@ int z_impl_zsock_poll(struct zsock_pollfd *fds, int nfds, int poll_timeout)
 			events++;
 		}
 	}
-	if (events == 0) {
-		k_sleep(K_MSEC(poll_timeout));
-	}
 
 	return events;
 }

From 060d3cd80a16157568119ac229dcabe7d1ce0f27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:23 +0100
Subject: [PATCH 1350/2913] Revert "[nrf fromtree] net: lwm2m: add
 set_socketoptions cb to pull context LwM2M context"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ef545e39341b3904845498fbafac88dd786f4bc1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/lwm2m.h                | 14 +-------------
 subsys/net/lib/lwm2m/lwm2m_pull_context.c |  6 +-----
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/include/zephyr/net/lwm2m.h b/include/zephyr/net/lwm2m.h
index c080018e657..8a2cbf557d0 100644
--- a/include/zephyr/net/lwm2m.h
+++ b/include/zephyr/net/lwm2m.h
@@ -182,7 +182,6 @@ enum lwm2m_rd_client_event {
 typedef void (*lwm2m_ctx_event_cb_t)(struct lwm2m_ctx *ctx,
 				     enum lwm2m_rd_client_event event);
 
-typedef int (*lwm2m_set_sockopt_cb_t)(struct lwm2m_ctx *client_ctx);
 
 /**
  * @brief Different traffic states of the LwM2M socket.
@@ -259,7 +258,7 @@ struct lwm2m_ctx {
 	 * a callback that is called after a socket is created and before
 	 * connect.
 	 */
-	lwm2m_set_sockopt_cb_t set_socketoptions;
+	int (*set_socketoptions)(struct lwm2m_ctx *client_ctx);
 
 	/** Flag to indicate if context should use DTLS.
 	 *  Enabled via the use of coaps:// protocol prefix in connection
@@ -1622,17 +1621,6 @@ int lwm2m_security_mode(struct lwm2m_ctx *ctx);
  */
 int lwm2m_set_default_sockopt(struct lwm2m_ctx *ctx);
 
-/**
- * @brief Set the @ref lwm2m_ctx::set_socketoptions callback for the pull context's client.
- *
- * This allows setting specific socket options on the socket that is used to pull
- * firmware updates. The callback will be called after the pull context socket has been
- * created and before it will connect.
- *
- * @param[in] set_sockopt_cb A callback function to set sockopts for the pull context client.
- */
-void lwm2m_pull_context_set_sockopt_callback(lwm2m_set_sockopt_cb_t set_sockopt_cb);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/subsys/net/lib/lwm2m/lwm2m_pull_context.c b/subsys/net/lib/lwm2m/lwm2m_pull_context.c
index 8081c3793ed..356f19705f5 100644
--- a/subsys/net/lib/lwm2m/lwm2m_pull_context.c
+++ b/subsys/net/lib/lwm2m/lwm2m_pull_context.c
@@ -446,6 +446,7 @@ int lwm2m_pull_context_start_transfer(char *uri, struct requesting_object req, k
 	context.result_cb = req.result_cb;
 	context.write_cb = req.write_cb;
 
+	(void)memset(&context.firmware_ctx, 0, sizeof(struct lwm2m_ctx));
 	(void)memset(&context.block_ctx, 0, sizeof(struct coap_block_context));
 	context.firmware_ctx.sock_fd = -1;
 
@@ -453,8 +454,3 @@ int lwm2m_pull_context_start_transfer(char *uri, struct requesting_object req, k
 
 	return 0;
 }
-
-void lwm2m_pull_context_set_sockopt_callback(lwm2m_set_sockopt_cb_t set_sockopt_cb)
-{
-	context.firmware_ctx.set_socketoptions = set_sockopt_cb;
-}

From acc531d32b82427b2ff6f0b0ac753bbe75a1264f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:23 +0100
Subject: [PATCH 1351/2913] Revert "[nrf fromtree] net: lib: coap_client: Add
 API to cancel specific request"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2658ac423ca2cef0b6466c4ab28af678a7c78d30.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/coap_client.h     |  15 ----
 subsys/net/lib/coap/coap_client.c    |  35 ---------
 tests/net/lib/coap_client/src/main.c | 108 ---------------------------
 3 files changed, 158 deletions(-)

diff --git a/include/zephyr/net/coap_client.h b/include/zephyr/net/coap_client.h
index bbeebb2d26c..1d68661da3b 100644
--- a/include/zephyr/net/coap_client.h
+++ b/include/zephyr/net/coap_client.h
@@ -158,21 +158,6 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
  */
 void coap_client_cancel_requests(struct coap_client *client);
 
-/**
- * @brief Cancel matching requests.
- *
- * This function cancels all CoAP client request that matches the given request.
- * The request is matched based on the method, path, callback and user_data, if provided.
- * Any field set to NULL is considered a wildcard.
- *
- * (struct coap_client_request){0} cancels all requests.
- * (struct coap_client_request){.method = COAP_METHOD_GET} cancels all GET requests.
- *
- * @param client Pointer to the CoAP client instance.
- * @param req Pointer to the CoAP client request to be canceled.
- */
-void coap_client_cancel_request(struct coap_client *client, struct coap_client_request *req);
-
 /**
  * @brief Initialise a Block2 option to be added to a request
  *
diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 468505f5eb5..505a9932311 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -1016,41 +1016,6 @@ void coap_client_cancel_requests(struct coap_client *client)
 	k_sleep(K_MSEC(COAP_PERIODIC_TIMEOUT));
 }
 
-static bool requests_match(struct coap_client_request *a, struct coap_client_request *b)
-{
-	/* enum coap_method does not have value for zero, so differentiate valid values */
-	if (a->method && b->method && a->method != b->method) {
-		return false;
-	}
-	if (a->path && b->path && strcmp(a->path, b->path) != 0) {
-		return false;
-	}
-	if (a->cb && b->cb && a->cb != b->cb) {
-		return false;
-	}
-	if (a->user_data && b->user_data && a->user_data != b->user_data) {
-		return false;
-	}
-	/* It is intentional that (struct coap_client_request){0} matches all */
-	return true;
-}
-
-void coap_client_cancel_request(struct coap_client *client, struct coap_client_request *req)
-{
-	k_mutex_lock(&client->lock, K_FOREVER);
-
-	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
-		if (client->requests[i].request_ongoing &&
-		    requests_match(&client->requests[i].coap_request, req)) {
-			LOG_DBG("Cancelling request %d", i);
-			report_callback_error(&client->requests[i], -ECANCELED);
-			release_internal_request(&client->requests[i]);
-		}
-	}
-
-	k_mutex_unlock(&client->lock);
-}
-
 void coap_client_recv(void *coap_cl, void *a, void *b)
 {
 	int ret;
diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 2f3fa28ebff..c44fd30fbdc 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -1142,111 +1142,3 @@ ZTEST(coap_client, test_request_rst)
 	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, -ECONNRESET, "");
 }
-
-ZTEST(coap_client, test_cancel)
-{
-	struct k_sem sem1, sem2;
-	struct sockaddr address = {0};
-	struct coap_client_request req1 = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem1
-	};
-	struct coap_client_request req2 = req1;
-
-	req2.user_data = &sem2;
-
-	k_sem_init(&sem1, 0, 1);
-	k_sem_init(&sem2, 0, 1);
-
-	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
-
-	k_sleep(K_MSEC(1));
-
-	zassert_ok(coap_client_req(&client, 0, &address, &req1, NULL));
-	zassert_ok(coap_client_req(&client, 0, &address, &req2, NULL));
-
-	k_sleep(K_SECONDS(1));
-
-	coap_client_cancel_request(&client, &req1);
-	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_not_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_equal(last_response_code, -ECANCELED, "");
-
-	set_socket_events(client.fd, ZSOCK_POLLIN); /* First response is the cancelled one */
-	zassert_not_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	set_socket_events(client.fd, ZSOCK_POLLIN);
-	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "");
-}
-
-ZTEST(coap_client, test_cancel_match)
-{
-	struct k_sem sem1, sem2;
-	struct sockaddr address = {0};
-	struct coap_client_request req1 = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem1
-	};
-	struct coap_client_request req2 = req1;
-
-	req2.user_data = &sem2;
-	req2.path = "another";
-
-	k_sem_init(&sem1, 0, 1);
-	k_sem_init(&sem2, 0, 1);
-
-	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
-
-	k_sleep(K_MSEC(1));
-
-	zassert_ok(coap_client_req(&client, 0, &address, &req1, NULL));
-	zassert_ok(coap_client_req(&client, 0, &address, &req2, NULL));
-
-	k_sleep(K_SECONDS(1));
-
-	/* match only one */
-	coap_client_cancel_request(&client, &(struct coap_client_request) {
-		.path = test_path
-	});
-	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_not_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_equal(last_response_code, -ECANCELED, "");
-
-	zassert_ok(coap_client_req(&client, 0, &address, &req1, NULL));
-
-	/* should not match */
-	coap_client_cancel_request(&client, &(struct coap_client_request) {
-		.path = test_path,
-		.user_data = &sem2,
-	});
-	zassert_not_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_not_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-
-	/* match both (all GET queries) */
-	coap_client_cancel_request(&client, &(struct coap_client_request) {
-		.method = COAP_METHOD_GET,
-	});
-	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-
-	zassert_ok(coap_client_req(&client, 0, &address, &req1, NULL));
-	zassert_ok(coap_client_req(&client, 0, &address, &req2, NULL));
-
-	/* match both (wildcard)*/
-	coap_client_cancel_request(&client, &(struct coap_client_request) {0});
-	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-
-}

From 4d41d2aa605da09f2b23c1bdec5671a66cf4a2a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:23 +0100
Subject: [PATCH 1352/2913] Revert "[nrf fromtree] net: lib: coap_client: Stop
 polling on unneeded sockets"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6a42194217e8061cec9507c801f029986efc4da9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 56 +++++++------------------------
 1 file changed, 13 insertions(+), 43 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 505a9932311..9aaf2b6b267 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -532,17 +532,6 @@ static void coap_client_resend_handler(struct coap_client *client)
 	k_mutex_unlock(&client->lock);
 }
 
-static struct coap_client *get_client(int sock)
-{
-	for (int i = 0; i < num_clients; i++) {
-		if (clients[i]->fd == sock) {
-			return clients[i];
-		}
-	}
-
-	return NULL;
-}
-
 static int handle_poll(void)
 {
 	int ret = 0;
@@ -552,16 +541,10 @@ static int handle_poll(void)
 
 	/* Use periodic timeouts */
 	for (int i = 0; i < num_clients; i++) {
-		short events = (has_ongoing_exchange(clients[i]) ? ZSOCK_POLLIN : 0) |
-			       (has_timeout_expired(clients[i]) ? ZSOCK_POLLOUT : 0);
-
-		if (events == 0) {
-			/* Skip this socket */
-			continue;
-		}
-		fds[nfds].fd = clients[i]->fd;
-		fds[nfds].events = events;
-		fds[nfds].revents = 0;
+		fds[i].fd = clients[i]->fd;
+		fds[i].events = (has_ongoing_exchange(clients[i]) ? ZSOCK_POLLIN : 0) |
+				(has_timeout_expired(clients[i]) ? ZSOCK_POLLOUT : 0);
+		fds[i].revents = 0;
 		nfds++;
 	}
 
@@ -576,49 +559,42 @@ static int handle_poll(void)
 	}
 
 	for (int i = 0; i < nfds; i++) {
-		struct coap_client *client = get_client(fds[i].fd);
-
-		if (!client) {
-			LOG_ERR("No client found for socket %d", fds[i].fd);
-			continue;
-		}
-
 		if (fds[i].revents & ZSOCK_POLLOUT) {
-			coap_client_resend_handler(client);
+			coap_client_resend_handler(clients[i]);
 		}
 		if (fds[i].revents & ZSOCK_POLLIN) {
 			struct coap_packet response;
 			bool response_truncated = false;
 
-			ret = recv_response(client, &response, &response_truncated);
+			ret = recv_response(clients[i], &response, &response_truncated);
 			if (ret < 0) {
 				if (ret == -EAGAIN) {
 					continue;
 				}
 				LOG_ERR("Error receiving response");
-				cancel_requests_with(client, -EIO);
+				cancel_requests_with(clients[i], -EIO);
 				continue;
 			}
 
-			k_mutex_lock(&client->lock, K_FOREVER);
-			ret = handle_response(client, &response, response_truncated);
+			k_mutex_lock(&clients[i]->lock, K_FOREVER);
+			ret = handle_response(clients[i], &response, response_truncated);
 			if (ret < 0) {
 				LOG_ERR("Error handling response");
 			}
 
-			k_mutex_unlock(&client->lock);
+			k_mutex_unlock(&clients[i]->lock);
 		}
 		if (fds[i].revents & ZSOCK_POLLERR) {
 			LOG_ERR("Error in poll for socket %d", fds[i].fd);
-			cancel_requests_with(client, -EIO);
+			cancel_requests_with(clients[i], -EIO);
 		}
 		if (fds[i].revents & ZSOCK_POLLHUP) {
 			LOG_ERR("Error in poll: POLLHUP for socket %d", fds[i].fd);
-			cancel_requests_with(client, -EIO);
+			cancel_requests_with(clients[i], -EIO);
 		}
 		if (fds[i].revents & ZSOCK_POLLNVAL) {
 			LOG_ERR("Error in poll: POLLNVAL - fd %d not open", fds[i].fd);
-			cancel_requests_with(client, -EIO);
+			cancel_requests_with(clients[i], -EIO);
 		}
 	}
 
@@ -998,12 +974,6 @@ static void cancel_requests_with(struct coap_client *client, int error)
 			report_callback_error(&client->requests[i], error);
 			release_internal_request(&client->requests[i]);
 		}
-		/* If our socket has failed, clear all requests, even completed ones,
-		 * so that our handle_poll() does not poll() anymore for this socket.
-		 */
-		if (error == -EIO) {
-			reset_internal_request(&client->requests[i]);
-		}
 	}
 	k_mutex_unlock(&client->lock);
 

From 8216c29afc987a7aad1beb71c8fb5b1d24c60df7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:23 +0100
Subject: [PATCH 1353/2913] Revert "[nrf fromtree] net: lib: coap_client: All
 error cases should be reported to callback"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f3267a33acbdc3c2063323ff45da093e7ad6e178.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 9aaf2b6b267..d2a07301581 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -950,10 +950,7 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 		}
 	}
 fail:
-	if (ret < 0) {
-		report_callback_error(internal_req, ret);
-	}
-	if (!internal_req->is_observe) {
+	if (ret < 0 || !internal_req->is_observe) {
 		release_internal_request(internal_req);
 	}
 	return ret;

From ee8cfd887e4d3fefa1dd997d54ddb73b1135e0a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:23 +0100
Subject: [PATCH 1354/2913] Revert "[nrf fromtree] net: lib: coap_client: Drop
 duplicate MID only after responding with Ack"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b8fbc5f7b8a3ca88f7b35ee5d308ec72457c82b2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index d2a07301581..9766c698a83 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -781,6 +781,14 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 		return 0;
 	}
 
+	/* MID-based deduplication */
+	if (response_id == internal_req->last_response_id) {
+		LOG_WRN("Duplicate MID, dropping");
+		goto fail;
+	}
+
+	internal_req->last_response_id = response_id;
+
 	/* Received echo option */
 	if (find_echo_option(response, &client->echo_option)) {
 		 /* Resend request with echo option */
@@ -839,21 +847,13 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 		}
 	}
 
-	/* MID-based deduplication */
-	if (response_id == internal_req->last_response_id) {
-		LOG_WRN("Duplicate MID, dropping");
-		return 0;
-	}
-
-	internal_req->last_response_id = response_id;
-
 	if (!internal_req->request_ongoing) {
 		if (internal_req->is_observe) {
 			(void) send_rst(client, response);
 			return 0;
 		}
 		LOG_DBG("Drop request, already handled");
-		return 0;
+		goto fail;
 	}
 
 	if (internal_req->pending.timeout != 0) {

From 0adcf89eaa052aa5194ac60943eede8afe90e9b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:23 +0100
Subject: [PATCH 1355/2913] Revert "[nrf fromtree] net: lib: coap_client:
 Return -errno from send_request()"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d42710c56263391cb9605e16f5abbc95b997a99d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 9766c698a83..57d7d4af4a3 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -36,16 +36,12 @@ static struct coap_client_internal_request *get_request_with_mid(struct coap_cli
 static int send_request(int sock, const void *buf, size_t len, int flags,
 			const struct sockaddr *dest_addr, socklen_t addrlen)
 {
-	int ret;
-
 	LOG_HEXDUMP_DBG(buf, len, "Send CoAP Request:");
 	if (addrlen == 0) {
-		ret = zsock_sendto(sock, buf, len, flags, NULL, 0);
+		return zsock_sendto(sock, buf, len, flags, NULL, 0);
 	} else {
-		ret = zsock_sendto(sock, buf, len, flags, dest_addr, addrlen);
+		return zsock_sendto(sock, buf, len, flags, dest_addr, addrlen);
 	}
-
-	return ret >= 0 ? ret : -errno;
 }
 
 static int receive(int sock, void *buf, size_t max_len, int flags,
@@ -61,7 +57,7 @@ static int receive(int sock, void *buf, size_t max_len, int flags,
 	if (err > 0) {
 		LOG_HEXDUMP_DBG(buf, err, "Receive CoAP Response:");
 	}
-	return err >= 0 ? err : -errno;
+	return err;
 }
 
 /** Reset all fields to zero.
@@ -497,12 +493,13 @@ static int resend_request(struct coap_client *client,
 					client->socklen);
 		if (ret > 0) {
 			ret = 0;
-		} else if (ret == -EAGAIN) {
+		} else if (ret == -1 && errno == EAGAIN) {
 			/* Restore the pending structure, retry later */
 			internal_req->pending = tmp;
 			/* Not a fatal socket error, will trigger a retry */
 			ret = 0;
 		} else {
+			ret = -errno;
 			LOG_ERR("Failed to resend request, %d", ret);
 		}
 	} else {

From 2452ffde4e3177d8cc2786379a25f1d4394c8cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:23 +0100
Subject: [PATCH 1356/2913] Revert "[nrf fromtree] net: lib: coap_client: Drop
 duplicate responses"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f5ee44efe85a92d6b96f5e86518b7045d585426f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 57d7d4af4a3..9518da30e74 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -844,15 +844,6 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 		}
 	}
 
-	if (!internal_req->request_ongoing) {
-		if (internal_req->is_observe) {
-			(void) send_rst(client, response);
-			return 0;
-		}
-		LOG_DBG("Drop request, already handled");
-		goto fail;
-	}
-
 	if (internal_req->pending.timeout != 0) {
 		coap_pending_clear(&internal_req->pending);
 	}

From d844eec762c1f8f711ea15df6b1490b2bb6e2968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:23 +0100
Subject: [PATCH 1357/2913] Revert "[nrf fromtree] net: lib: coap_client: Don't
 match zero length tokens"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit db28a52a1fd35ddb18355cf72c5b04a48b3405b2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 9518da30e74..1f6b93c2221 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -687,9 +687,6 @@ static struct coap_client_internal_request *get_request_with_token(
 	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
 		if (client->requests[i].request_ongoing ||
 		    !exchange_lifetime_exceeded(&client->requests[i])) {
-			if (client->requests[i].request_tkl == 0) {
-				continue;
-			}
 			if (client->requests[i].request_tkl != response_tkl) {
 				continue;
 			}

From abf96daf941eae53ce891b3a66d944186fbfb183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:23 +0100
Subject: [PATCH 1358/2913] Revert "[nrf fromtree] net: lib: coap_client: Parse
 incoming MID only once"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 704a63de8f302b39d65e574cccc18552c72f02bf.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 1f6b93c2221..43cb6416d9a 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -30,8 +30,9 @@ static void cancel_requests_with(struct coap_client *client, int error);
 static int recv_response(struct coap_client *client, struct coap_packet *response, bool *truncated);
 static int handle_response(struct coap_client *client, const struct coap_packet *response,
 			   bool response_truncated);
-static struct coap_client_internal_request *get_request_with_mid(struct coap_client *client,
-								 uint16_t mid);
+static struct coap_client_internal_request *get_request_with_mid(
+	struct coap_client *client, const struct coap_packet *resp);
+
 
 static int send_request(int sock, const void *buf, size_t len, int flags,
 			const struct sockaddr *dest_addr, socklen_t addrlen)
@@ -700,12 +701,14 @@ static struct coap_client_internal_request *get_request_with_token(
 	return NULL;
 }
 
-static struct coap_client_internal_request *get_request_with_mid(struct coap_client *client,
-								 uint16_t mid)
+static struct coap_client_internal_request *get_request_with_mid(
+	struct coap_client *client, const struct coap_packet *resp)
 {
+	uint16_t mid = coap_header_get_id(resp);
+
 	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
 		if (client->requests[i].request_ongoing) {
-			if (client->requests[i].last_id == (int)mid) {
+			if (client->requests[i].last_id == mid) {
 				return &client->requests[i];
 			}
 		}
@@ -714,6 +717,7 @@ static struct coap_client_internal_request *get_request_with_mid(struct coap_cli
 	return NULL;
 }
 
+
 static bool find_echo_option(const struct coap_packet *response, struct coap_option *option)
 {
 	return coap_find_options(response, COAP_OPTION_ECHO, option, 1);
@@ -744,7 +748,7 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 	const uint8_t *payload = coap_packet_get_payload(response, &payload_len);
 
 	if (response_type == COAP_TYPE_RESET) {
-		internal_req = get_request_with_mid(client, response_id);
+		internal_req = get_request_with_mid(client, response);
 		if (!internal_req) {
 			LOG_WRN("No matching request for RESET");
 			return 0;
@@ -757,7 +761,7 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 	/* Separate response coming */
 	if (payload_len == 0 && response_type == COAP_TYPE_ACK &&
 	    response_code == COAP_CODE_EMPTY) {
-		internal_req = get_request_with_mid(client, response_id);
+		internal_req = get_request_with_mid(client, response);
 		if (!internal_req) {
 			LOG_WRN("No matching request for ACK");
 			return 0;

From 0a55c2a6d00d96a9012ef1a469e1bb9af32e2fd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:23 +0100
Subject: [PATCH 1359/2913] Revert "[nrf fromtree] net: lib: coap_client: Don't
 clear internal structures on response"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 32ebf5b57a57a364bee33c72024f356dbf25dd93.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 43cb6416d9a..ebf99bade9f 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -61,24 +61,16 @@ static int receive(int sock, void *buf, size_t max_len, int flags,
 	return err;
 }
 
-/** Reset all fields to zero.
- * Use when a new request is filled in.
- */
 static void reset_internal_request(struct coap_client_internal_request *request)
 {
-	*request = (struct coap_client_internal_request){
-		.last_response_id = -1,
-	};
-}
-
-/** Release a request structure.
- * Use when a request is no longer needed, but we might still receive
- * responses for it, which must be handled.
- */
-static void release_internal_request(struct coap_client_internal_request *request)
-{
+	request->offset = 0;
+	request->last_id = 0;
+	request->last_response_id = -1;
 	request->request_ongoing = false;
+	request->is_observe = false;
 	request->pending.timeout = 0;
+	request->recv_blk_ctx = (struct coap_block_context){ 0 };
+	request->send_blk_ctx = (struct coap_block_context){ 0 };
 }
 
 static int coap_client_schedule_poll(struct coap_client *client, int sock,
@@ -425,7 +417,6 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
 
 		coap_pending_cycle(&internal_req->pending);
 		internal_req->is_observe = coap_request_is_observe(&internal_req->request);
-		LOG_DBG("Request is_observe %d", internal_req->is_observe);
 	}
 
 	ret = send_request(sock, internal_req->request.data, internal_req->request.offset, 0,
@@ -522,7 +513,7 @@ static void coap_client_resend_handler(struct coap_client *client)
 			ret = resend_request(client, &client->requests[i]);
 			if (ret < 0) {
 				report_callback_error(&client->requests[i], ret);
-				release_internal_request(&client->requests[i]);
+				reset_internal_request(&client->requests[i]);
 			}
 		}
 	}
@@ -754,7 +745,7 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 			return 0;
 		}
 		report_callback_error(internal_req, -ECONNRESET);
-		release_internal_request(internal_req);
+		reset_internal_request(internal_req);
 		return 0;
 	}
 
@@ -940,7 +931,7 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 	}
 fail:
 	if (ret < 0 || !internal_req->is_observe) {
-		release_internal_request(internal_req);
+		reset_internal_request(internal_req);
 	}
 	return ret;
 }
@@ -958,7 +949,7 @@ static void cancel_requests_with(struct coap_client *client, int error)
 			 * request was cancelled anyway.
 			 */
 			report_callback_error(&client->requests[i], error);
-			release_internal_request(&client->requests[i]);
+			reset_internal_request(&client->requests[i]);
 		}
 	}
 	k_mutex_unlock(&client->lock);

From 04dcc921276f60b8870e113f5edf1804060ae830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:24 +0100
Subject: [PATCH 1360/2913] Revert "[nrf fromtree] tests: coap_client: Add
 testcase for receiving RST"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6523f8e85474d26c7a891cd674df0b5595405fcf.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/lib/coap_client/src/main.c | 44 ----------------------------
 1 file changed, 44 deletions(-)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index c44fd30fbdc..6c4b624798c 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -279,25 +279,6 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_empty_ack(int sock, void *buf,
 	return sizeof(ack_data);
 }
 
-static ssize_t z_impl_zsock_recvfrom_custom_fake_rst(int sock, void *buf, size_t max_len, int flags,
-						     struct sockaddr *src_addr, socklen_t *addrlen)
-{
-	uint16_t last_message_id = 0;
-
-	static uint8_t rst_data[] = {0x70, 0x00, 0x00, 0x00, 0x00, 0x00,
-				     0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-	last_message_id = get_next_pending_message_id();
-
-	rst_data[2] = (uint8_t)(last_message_id >> 8);
-	rst_data[3] = (uint8_t)last_message_id;
-
-	memcpy(buf, rst_data, sizeof(rst_data));
-	clear_socket_events(sock, ZSOCK_POLLIN);
-
-	return sizeof(rst_data);
-}
-
 static ssize_t z_impl_zsock_recvfrom_custom_fake_only_ack(int sock, void *buf, size_t max_len,
 							  int flags, struct sockaddr *src_addr,
 							  socklen_t *addrlen)
@@ -1117,28 +1098,3 @@ ZTEST(coap_client, test_observe)
 
 	zassert_not_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 }
-
-ZTEST(coap_client, test_request_rst)
-{
-	struct k_sem sem;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem,
-	};
-
-	zassert_ok(k_sem_init(&sem, 0, 1));
-	k_sleep(K_MSEC(1));
-	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_rst;
-
-	zassert_ok(coap_client_req(&client, 0, &address, &client_request, NULL));
-
-	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_equal(last_response_code, -ECONNRESET, "");
-}

From 10194627c9ced506ef36e46ebf4847f0262b2bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:24 +0100
Subject: [PATCH 1361/2913] Revert "[nrf fromtree] tests: coap_client: Add
 testcase for observation"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8eb504507ccf7f900edf5d5e5f0b46bbb18d591a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/lib/coap_client/src/main.c | 52 ----------------------------
 1 file changed, 52 deletions(-)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 6c4b624798c..69e5b7dc9bd 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -390,18 +390,6 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_duplicate_response(int sock, vo
 	return ret;
 }
 
-static ssize_t z_impl_zsock_recvfrom_custom_fake_observe(int sock, void *buf, size_t max_len,
-							 int flags, struct sockaddr *src_addr,
-							 socklen_t *addrlen)
-{
-	int ret = z_impl_zsock_recvfrom_custom_fake_duplicate_response(sock, buf, max_len, flags,
-								       src_addr, addrlen);
-
-	set_next_pending_message_id(get_next_pending_message_id() + 1);
-	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_observe;
-	return ret;
-}
-
 extern void net_coap_init(void);
 
 static void *suite_setup(void)
@@ -1058,43 +1046,3 @@ ZTEST(coap_client, test_duplicate_response)
 
 	zassert_equal(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)), -EAGAIN, "");
 }
-
-ZTEST(coap_client, test_observe)
-{
-	struct k_sem sem;
-	struct sockaddr address = {0};
-	struct coap_client_option options = {
-		.code = COAP_OPTION_OBSERVE,
-		.value[0] = 0,
-		.len = 1,
-	};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.options = &options,
-		.num_options = 1,
-		.user_data = &sem,
-	};
-
-	zassert_ok(k_sem_init(&sem, 0, 1));
-	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_observe;
-
-	k_sleep(K_MSEC(1));
-
-	zassert_ok(coap_client_req(&client, 0, &address, &client_request, NULL));
-
-	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-
-	coap_client_cancel_requests(&client);
-	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_equal(last_response_code, -ECANCELED, "");
-
-	zassert_not_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-}

From f34b067617f4a549cc5b2188ec41d5851e9971ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:24 +0100
Subject: [PATCH 1362/2913] Revert "[nrf fromtree] tests: coap_client: Test for
 operating on socket while another fails"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit dd49fcfd88cb8614af27312849017b33cea5a5a6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/lib/coap_client/src/main.c | 45 ++--------------------------
 1 file changed, 3 insertions(+), 42 deletions(-)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 69e5b7dc9bd..7554ffcd7ab 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -395,8 +395,7 @@ extern void net_coap_init(void);
 static void *suite_setup(void)
 {
 	net_coap_init();
-	zassert_ok(coap_client_init(&client, NULL));
-	zassert_ok(coap_client_init(&client2, NULL));
+	coap_client_init(&client, NULL);
 
 	return NULL;
 }
@@ -892,6 +891,8 @@ ZTEST(coap_client, test_multiple_clients)
 	zassert_ok(k_sem_init(&sem1, 0, 1));
 	zassert_ok(k_sem_init(&sem2, 0, 1));
 
+	zassert_ok(coap_client_init(&client2, NULL));
+
 	k_sleep(K_MSEC(1));
 
 	LOG_INF("Sending requests");
@@ -976,46 +977,6 @@ ZTEST(coap_client, test_poll_err_after_response)
 	zassert_not_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 }
 
-ZTEST(coap_client, test_poll_err_on_another_sock)
-{
-	int ret = 0;
-	struct k_sem sem1, sem2;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem1
-	};
-	struct coap_client_request request2 = client_request;
-
-	request2.user_data = &sem2;
-
-	zassert_ok(k_sem_init(&sem1, 0, 1));
-	zassert_ok(k_sem_init(&sem2, 0, 1));
-
-	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
-	set_socket_events(client.fd, ZSOCK_POLLERR);
-
-	k_sleep(K_MSEC(1));
-
-	ret = coap_client_req(&client2, client2.fd, &address, &request2, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-	ret = coap_client_req(&client, client.fd, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-
-	set_socket_events(client2.fd, ZSOCK_POLLIN);
-
-	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_equal(last_response_code, -EIO, "");
-	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "");
-}
-
 ZTEST(coap_client, test_duplicate_response)
 {
 	int ret = 0;

From 7d045f9d3e50e3aeac7a57e0e2c1abc55ea74ee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:24 +0100
Subject: [PATCH 1363/2913] Revert "[nrf fromtree] tests: coap_client: Add
 testcase for Ack failure"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit bcdf3575e1433dc2fc8ff7687fdf036bc7416b62.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/lib/coap_client/src/main.c | 35 ----------------------------
 1 file changed, 35 deletions(-)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 7554ffcd7ab..330ad689b97 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -747,41 +747,6 @@ ZTEST(coap_client, test_separate_response_lost)
 	zassert_equal(last_response_code, -ETIMEDOUT, "");
 }
 
-ZTEST(coap_client, test_separate_response_ack_fail)
-{
-	int ret = 0;
-	struct k_sem sem;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem,
-	};
-	zassert_ok(k_sem_init(&sem, 0, 1));
-
-	int (*sendto_fakes[])(int, void *, size_t, int, const struct sockaddr *, socklen_t) = {
-		z_impl_zsock_sendto_custom_fake,
-		z_impl_zsock_sendto_custom_fake_err,
-	};
-
-	SET_CUSTOM_FAKE_SEQ(z_impl_zsock_sendto, sendto_fakes, ARRAY_SIZE(sendto_fakes));
-	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_empty_ack;
-
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-
-	zassert_ok(k_sem_take(&sem, K_MSEC(COAP_SEPARATE_TIMEOUT)));
-	zassert_equal(last_response_code, -ENETDOWN, "");
-}
-
 ZTEST(coap_client, test_multiple_requests)
 {
 	int ret = 0;

From f6830b9511865289ddc581fc6460885d97b5253c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:24 +0100
Subject: [PATCH 1364/2913] Revert "[nrf fromtree] tests: coap_client: Improve
 retry testcases"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5d9879b01ee383528312e7388ee86bbad9c90091.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/lib/coap_client/src/main.c | 57 ++++------------------------
 1 file changed, 7 insertions(+), 50 deletions(-)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 330ad689b97..1ed77cbfc62 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -220,22 +220,6 @@ static ssize_t z_impl_zsock_sendto_custom_fake_echo_next_req(int sock, void *buf
 	return 1;
 }
 
-static ssize_t z_impl_zsock_sendto_custom_fake_block(int sock, void *buf, size_t len, int flags,
-						     const struct sockaddr *dest_addr,
-						     socklen_t addrlen)
-{
-	errno = EAGAIN;
-	return -1;
-}
-
-static ssize_t z_impl_zsock_sendto_custom_fake_err(int sock, void *buf, size_t len, int flags,
-						   const struct sockaddr *dest_addr,
-						   socklen_t addrlen)
-{
-	errno = ENETDOWN;
-	return -1;
-}
-
 static ssize_t z_impl_zsock_recvfrom_custom_fake_response(int sock, void *buf, size_t max_len,
 							  int flags, struct sockaddr *src_addr,
 							  socklen_t *addrlen)
@@ -468,30 +452,6 @@ ZTEST(coap_client, test_get_request)
 	LOG_INF("Test done");
 }
 
-ZTEST(coap_client, test_request_block)
-{
-	int ret = 0;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-	};
-
-	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_block;
-
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_equal(ret, -EAGAIN, "");
-}
-
-
 ZTEST(coap_client, test_resend_request)
 {
 	int ret = 0;
@@ -502,18 +462,14 @@ ZTEST(coap_client, test_resend_request)
 		.path = test_path,
 		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
 		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
+		.payload = NULL,
+		.len = 0
 	};
 
-	int (*sendto_fakes[])(int, void *, size_t, int, const struct sockaddr *, socklen_t) = {
-		z_impl_zsock_sendto_custom_fake_no_reply,
-		z_impl_zsock_sendto_custom_fake_block,
-		z_impl_zsock_sendto_custom_fake,
-	};
+	client_request.payload = short_payload;
+	client_request.len = strlen(short_payload);
 
-	SET_CUSTOM_FAKE_SEQ(z_impl_zsock_sendto, sendto_fakes, ARRAY_SIZE(sendto_fakes));
-	set_socket_events(client.fd, ZSOCK_POLLOUT);
+	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
 
 	k_sleep(K_MSEC(1));
 
@@ -521,10 +477,11 @@ ZTEST(coap_client, test_resend_request)
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	k_sleep(K_MSEC(MORE_THAN_ACK_TIMEOUT_MS));
+	set_socket_events(client.fd, ZSOCK_POLLIN | ZSOCK_POLLOUT);
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
-	zassert_equal(z_impl_zsock_sendto_fake.call_count, 3);
+	zassert_equal(z_impl_zsock_sendto_fake.call_count, 2);
 	LOG_INF("Test done");
 }
 

From 9120005a965ce74a304824f027340365f5004827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:24 +0100
Subject: [PATCH 1365/2913] Revert "[nrf fromtree] tests: coap_client: Add test
 when separate response is lost"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f106640953519a58a3ed808a7d4293d61e4ac67f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/lib/coap_client/src/main.c | 47 +---------------------------
 1 file changed, 1 insertion(+), 46 deletions(-)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 1ed77cbfc62..d03160ca53f 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -21,7 +21,7 @@ DEFINE_FFF_GLOBALS;
 #define MORE_THAN_LONG_EXCHANGE_LIFETIME_MS 4 * LONG_ACK_TIMEOUT_MS
 #define MORE_THAN_ACK_TIMEOUT_MS                                                                   \
 	(CONFIG_COAP_INIT_ACK_TIMEOUT_MS + CONFIG_COAP_INIT_ACK_TIMEOUT_MS / 2)
-#define COAP_SEPARATE_TIMEOUT (6000 * 3) /* Needs a safety marging, tests run faster than -rt */
+
 #define VALID_MESSAGE_ID BIT(31)
 #define TOKEN_OFFSET          4
 
@@ -33,9 +33,6 @@ static uint8_t last_token[2][COAP_TOKEN_MAX_LEN];
 static const uint8_t empty_token[COAP_TOKEN_MAX_LEN] = {0};
 
 static struct coap_client client;
-static struct coap_client client2 = {
-	.fd = 1,
-};
 
 static char *short_payload = "testing";
 static char *long_payload = LOREM_IPSUM_SHORT;
@@ -263,18 +260,6 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_empty_ack(int sock, void *buf,
 	return sizeof(ack_data);
 }
 
-static ssize_t z_impl_zsock_recvfrom_custom_fake_only_ack(int sock, void *buf, size_t max_len,
-							  int flags, struct sockaddr *src_addr,
-							  socklen_t *addrlen)
-{
-	int ret;
-
-	ret = z_impl_zsock_recvfrom_custom_fake_empty_ack(sock, buf, max_len, flags, src_addr,
-							  addrlen);
-	clear_socket_events(sock, ZSOCK_POLLIN);
-	return ret;
-}
-
 static ssize_t z_impl_zsock_recvfrom_custom_fake_unmatching(int sock, void *buf, size_t max_len,
 							    int flags, struct sockaddr *src_addr,
 							    socklen_t *addrlen)
@@ -674,36 +659,6 @@ ZTEST(coap_client, test_separate_response)
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
 
-ZTEST(coap_client, test_separate_response_lost)
-{
-	int ret = 0;
-	struct k_sem sem;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem,
-	};
-
-	zassert_ok(k_sem_init(&sem, 0, 1));
-	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_only_ack;
-	set_socket_events(client.fd, ZSOCK_POLLOUT);
-
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-
-	zassert_ok(k_sem_take(&sem, K_MSEC(COAP_SEPARATE_TIMEOUT)));
-	zassert_equal(last_response_code, -ETIMEDOUT, "");
-}
-
 ZTEST(coap_client, test_multiple_requests)
 {
 	int ret = 0;

From 14bda3d28e6c69928172758fe5fd84a3d69343a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:24 +0100
Subject: [PATCH 1366/2913] Revert "[nrf fromtree] tests: coap_client: Add test
 for duplicate response"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fea1c8c4bae244a03045a80072b684ab64517899.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/lib/coap_client/CMakeLists.txt |  2 +-
 tests/net/lib/coap_client/src/main.c     | 55 ------------------------
 2 files changed, 1 insertion(+), 56 deletions(-)

diff --git a/tests/net/lib/coap_client/CMakeLists.txt b/tests/net/lib/coap_client/CMakeLists.txt
index 07a4d8a9827..d7f0c0cce5e 100644
--- a/tests/net/lib/coap_client/CMakeLists.txt
+++ b/tests/net/lib/coap_client/CMakeLists.txt
@@ -26,7 +26,7 @@ add_compile_definitions(CONFIG_COAP_CLIENT_MESSAGE_HEADER_SIZE=48)
 add_compile_definitions(CONFIG_COAP_CLIENT_STACK_SIZE=1024)
 add_compile_definitions(CONFIG_COAP_CLIENT_THREAD_PRIORITY=10)
 add_compile_definitions(CONFIG_COAP_LOG_LEVEL=4)
-add_compile_definitions(CONFIG_COAP_INIT_ACK_TIMEOUT_MS=100)
+add_compile_definitions(CONFIG_COAP_INIT_ACK_TIMEOUT_MS=10)
 add_compile_definitions(CONFIG_COAP_CLIENT_MAX_REQUESTS=2)
 add_compile_definitions(CONFIG_COAP_CLIENT_MAX_INSTANCES=2)
 add_compile_definitions(CONFIG_COAP_MAX_RETRANSMIT=4)
diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index d03160ca53f..e066f86bae6 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -335,30 +335,6 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_echo_next_req(int sock, void *b
 	return sizeof(ack_data);
 }
 
-static ssize_t z_impl_zsock_recvfrom_custom_fake_duplicate_response(int sock, void *buf,
-								    size_t max_len, int flags,
-								    struct sockaddr *src_addr,
-								    socklen_t *addrlen)
-{
-	uint8_t token[TOKEN_OFFSET + COAP_TOKEN_MAX_LEN];
-
-	uint16_t last_message_id = get_next_pending_message_id();
-
-	restore_token(token);
-
-	set_next_pending_message_id(last_message_id);
-	set_next_pending_message_id(last_message_id);
-	store_token(token);
-	store_token(token);
-
-	int ret = z_impl_zsock_recvfrom_custom_fake(sock, buf, max_len, flags, src_addr, addrlen);
-
-	set_socket_events(sock, ZSOCK_POLLIN);
-	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake;
-
-	return ret;
-}
-
 extern void net_coap_init(void);
 
 static void *suite_setup(void)
@@ -853,34 +829,3 @@ ZTEST(coap_client, test_poll_err_after_response)
 	set_socket_events(client.fd, ZSOCK_POLLERR);
 	zassert_not_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 }
-
-ZTEST(coap_client, test_duplicate_response)
-{
-	int ret = 0;
-	struct k_sem sem;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem,
-	};
-
-	zassert_ok(k_sem_init(&sem, 0, 2));
-	z_impl_zsock_recvfrom_fake.custom_fake =
-		z_impl_zsock_recvfrom_custom_fake_duplicate_response;
-
-	k_sleep(K_MSEC(1));
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-
-	zassert_ok(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
-
-	zassert_equal(k_sem_take(&sem, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)), -EAGAIN, "");
-}

From 9a8b92714fcb6b809322b0b0f1a24817efc17f22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:24 +0100
Subject: [PATCH 1367/2913] Revert "[nrf fromtree] tests: coap_client: Improve
 socket stubs"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 591e5ddddc764d28aef4750e50394a40cab16161.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/lib/coap_client/prj.conf    |  1 -
 tests/net/lib/coap_client/src/main.c  | 91 ++++++++-------------------
 tests/net/lib/coap_client/src/stubs.c | 20 +++---
 tests/net/lib/coap_client/src/stubs.h |  7 ++-
 4 files changed, 42 insertions(+), 77 deletions(-)

diff --git a/tests/net/lib/coap_client/prj.conf b/tests/net/lib/coap_client/prj.conf
index 8405a56f800..c7265029a21 100644
--- a/tests/net/lib/coap_client/prj.conf
+++ b/tests/net/lib/coap_client/prj.conf
@@ -1,4 +1,3 @@
 #Testing
 CONFIG_ZTEST=y
 CONFIG_ZTEST_STACK_SIZE=4096
-CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index e066f86bae6..f06a0ce646c 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -11,7 +11,7 @@
 
 #include "stubs.h"
 
-LOG_MODULE_REGISTER(coap_client_test, LOG_LEVEL_DBG);
+LOG_MODULE_REGISTER(coap_client_test);
 
 DEFINE_FFF_GLOBALS;
 #define FFF_FAKES_LIST(FAKE)
@@ -23,14 +23,11 @@ DEFINE_FFF_GLOBALS;
 	(CONFIG_COAP_INIT_ACK_TIMEOUT_MS + CONFIG_COAP_INIT_ACK_TIMEOUT_MS / 2)
 
 #define VALID_MESSAGE_ID BIT(31)
-#define TOKEN_OFFSET          4
 
 static int16_t last_response_code;
 static const char *test_path = "test";
 
 static uint32_t messages_needing_response[2];
-static uint8_t last_token[2][COAP_TOKEN_MAX_LEN];
-static const uint8_t empty_token[COAP_TOKEN_MAX_LEN] = {0};
 
 static struct coap_client client;
 
@@ -64,27 +61,6 @@ static void set_next_pending_message_id(uint16_t id)
 	}
 }
 
-static void store_token(uint8_t *buf)
-{
-	for (int i = 0; i < ARRAY_SIZE(last_token); i++) {
-		if (memcmp(last_token[i], empty_token, 8) == 0) {
-			memcpy(last_token[i], buf + TOKEN_OFFSET, COAP_TOKEN_MAX_LEN);
-			return;
-		}
-	}
-}
-
-static void restore_token(uint8_t *buf)
-{
-	for (int i = 0; i < ARRAY_SIZE(last_token); i++) {
-		if (memcmp(last_token[i], empty_token, 8) != 0) {
-			memcpy(buf + TOKEN_OFFSET, last_token[i], COAP_TOKEN_MAX_LEN);
-			memset(last_token[i], 0, COAP_TOKEN_MAX_LEN);
-			return;
-		}
-	}
-}
-
 static ssize_t z_impl_zsock_recvfrom_custom_fake(int sock, void *buf, size_t max_len, int flags,
 						 struct sockaddr *src_addr, socklen_t *addrlen)
 {
@@ -98,11 +74,10 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake(int sock, void *buf, size_t max
 
 	ack_data[2] = (uint8_t)(last_message_id >> 8);
 	ack_data[3] = (uint8_t)last_message_id;
-	restore_token(ack_data);
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
-	clear_socket_events(sock, ZSOCK_POLLIN);
+	clear_socket_events(ZSOCK_POLLIN);
 
 	return sizeof(ack_data);
 }
@@ -115,14 +90,14 @@ static ssize_t z_impl_zsock_sendto_custom_fake(int sock, void *buf, size_t len,
 
 	last_message_id |= ((uint8_t *)buf)[2] << 8;
 	last_message_id |= ((uint8_t *)buf)[3];
+
 	type = (((uint8_t *)buf)[0] & 0x30) >> 4;
-	store_token(buf);
 
 	set_next_pending_message_id(last_message_id);
 	LOG_INF("Latest message ID: %d", last_message_id);
 
 	if (type == 0) {
-		set_socket_events(sock, ZSOCK_POLLIN);
+		set_socket_events(ZSOCK_POLLIN);
 	}
 
 	return 1;
@@ -136,7 +111,6 @@ static ssize_t z_impl_zsock_sendto_custom_fake_no_reply(int sock, void *buf, siz
 
 	last_message_id |= ((uint8_t *)buf)[2] << 8;
 	last_message_id |= ((uint8_t *)buf)[3];
-	store_token(buf);
 
 	set_next_pending_message_id(last_message_id);
 	LOG_INF("Latest message ID: %d", last_message_id);
@@ -154,7 +128,6 @@ static ssize_t z_impl_zsock_sendto_custom_fake_echo(int sock, void *buf, size_t
 
 	last_message_id |= ((uint8_t *)buf)[2] << 8;
 	last_message_id |= ((uint8_t *)buf)[3];
-	store_token(buf);
 
 	set_next_pending_message_id(last_message_id);
 	LOG_INF("Latest message ID: %d", last_message_id);
@@ -171,7 +144,7 @@ static ssize_t z_impl_zsock_sendto_custom_fake_echo(int sock, void *buf, size_t
 
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake;
 
-	set_socket_events(sock, ZSOCK_POLLIN);
+	set_socket_events(ZSOCK_POLLIN);
 
 	return 1;
 }
@@ -187,7 +160,6 @@ static ssize_t z_impl_zsock_sendto_custom_fake_echo_next_req(int sock, void *buf
 
 	last_message_id |= ((uint8_t *)buf)[2] << 8;
 	last_message_id |= ((uint8_t *)buf)[3];
-	store_token(buf);
 
 	set_next_pending_message_id(last_message_id);
 	LOG_INF("Latest message ID: %d", last_message_id);
@@ -212,7 +184,7 @@ static ssize_t z_impl_zsock_sendto_custom_fake_echo_next_req(int sock, void *buf
 
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake;
 
-	set_socket_events(sock, ZSOCK_POLLIN);
+	set_socket_events(ZSOCK_POLLIN);
 
 	return 1;
 }
@@ -230,11 +202,10 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_response(int sock, void *buf, s
 
 	ack_data[2] = (uint8_t)(last_message_id >> 8);
 	ack_data[3] = (uint8_t)last_message_id;
-	restore_token(ack_data);
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
-	clear_socket_events(sock, ZSOCK_POLLIN);
+	clear_socket_events(ZSOCK_POLLIN);
 
 	return sizeof(ack_data);
 }
@@ -245,7 +216,7 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_empty_ack(int sock, void *buf,
 {
 	uint16_t last_message_id = 0;
 
-	static uint8_t ack_data[] = {0x60, 0x00, 0x00, 0x00, 0x00, 0x00,
+	static uint8_t ack_data[] = {0x68, 0x00, 0x00, 0x00, 0x00, 0x00,
 				     0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
 	last_message_id = get_next_pending_message_id();
@@ -276,7 +247,7 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_unmatching(int sock, void *buf,
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
-	clear_socket_events(sock, ZSOCK_POLLIN);
+	clear_socket_events(ZSOCK_POLLIN);
 
 	return sizeof(ack_data);
 }
@@ -296,14 +267,13 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_echo(int sock, void *buf, size_
 
 	ack_data[2] = (uint8_t)(last_message_id >> 8);
 	ack_data[3] = (uint8_t)last_message_id;
-	restore_token(ack_data);
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_response;
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_echo;
 
-	clear_socket_events(sock, ZSOCK_POLLIN);
+	clear_socket_events(ZSOCK_POLLIN);
 
 	return sizeof(ack_data);
 }
@@ -323,23 +293,19 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_echo_next_req(int sock, void *b
 
 	ack_data[2] = (uint8_t)(last_message_id >> 8);
 	ack_data[3] = (uint8_t)last_message_id;
-	restore_token(ack_data);
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_response;
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_echo_next_req;
 
-	clear_socket_events(sock, ZSOCK_POLLIN);
+	clear_socket_events(ZSOCK_POLLIN);
 
 	return sizeof(ack_data);
 }
 
-extern void net_coap_init(void);
-
 static void *suite_setup(void)
 {
-	net_coap_init();
 	coap_client_init(&client, NULL);
 
 	return NULL;
@@ -349,8 +315,6 @@ static void test_setup(void *data)
 {
 	int i;
 
-	k_mutex_lock(&client.lock, K_FOREVER);
-
 	/* Register resets */
 	DO_FOREACH_FAKE(RESET_FAKE);
 	/* reset common FFF internal structures */
@@ -358,19 +322,13 @@ static void test_setup(void *data)
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake;
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake;
-	clear_socket_events(0, ZSOCK_POLLIN | ZSOCK_POLLOUT | ZSOCK_POLLERR);
-	clear_socket_events(1, ZSOCK_POLLIN | ZSOCK_POLLOUT | ZSOCK_POLLERR);
+	clear_socket_events(ZSOCK_POLLIN | ZSOCK_POLLOUT | ZSOCK_POLLERR);
 
 	for (i = 0; i < ARRAY_SIZE(messages_needing_response); i++) {
 		messages_needing_response[i] = 0;
 	}
 
-	memset(&client.requests, 0, sizeof(client.requests));
-	memset(last_token, 0, sizeof(last_token));
-
 	last_response_code = 0;
-
-	k_mutex_unlock(&client.lock);
 }
 
 void coap_callback(int16_t code, size_t offset, const uint8_t *payload, size_t len, bool last_block,
@@ -438,7 +396,7 @@ ZTEST(coap_client, test_resend_request)
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	k_sleep(K_MSEC(MORE_THAN_ACK_TIMEOUT_MS));
-	set_socket_events(client.fd, ZSOCK_POLLIN | ZSOCK_POLLOUT);
+	set_socket_events(ZSOCK_POLLIN | ZSOCK_POLLOUT);
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
@@ -593,7 +551,7 @@ ZTEST(coap_client, test_no_response)
 	client_request.len = strlen(short_payload);
 
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
-	set_socket_events(client.fd, ZSOCK_POLLOUT);
+	set_socket_events(ZSOCK_POLLOUT);
 
 	k_sleep(K_MSEC(1));
 
@@ -670,7 +628,7 @@ ZTEST(coap_client, test_multiple_requests)
 	ret = coap_client_req(&client, 0, &address, &req2, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
-	set_socket_events(client.fd, ZSOCK_POLLIN);
+	set_socket_events(ZSOCK_POLLIN);
 	while (last_response_code == 0 && retry > 0) {
 		retry--;
 		k_sleep(K_MSEC(1));
@@ -678,7 +636,7 @@ ZTEST(coap_client, test_multiple_requests)
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
 	last_response_code = 0;
-	set_socket_events(client.fd, ZSOCK_POLLIN);
+	set_socket_events(ZSOCK_POLLIN);
 	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
@@ -707,7 +665,7 @@ ZTEST(coap_client, test_unmatching_tokens)
 	client_request.len = strlen(short_payload);
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_unmatching;
-	set_socket_events(client.fd, ZSOCK_POLLIN | ZSOCK_POLLOUT);
+	set_socket_events(ZSOCK_POLLIN | ZSOCK_POLLOUT);
 
 	k_sleep(K_MSEC(1));
 
@@ -723,6 +681,9 @@ ZTEST(coap_client, test_multiple_clients)
 {
 	int ret;
 	int retry = MORE_THAN_EXCHANGE_LIFETIME_MS;
+	static struct coap_client client2 = {
+		.fd = 2,
+	};
 	struct k_sem sem1, sem2;
 	struct sockaddr address = {0};
 	struct coap_client_request req1 = {
@@ -749,17 +710,17 @@ ZTEST(coap_client, test_multiple_clients)
 	k_sleep(K_MSEC(1));
 
 	LOG_INF("Sending requests");
-	ret = coap_client_req(&client, client.fd, &address, &req1, NULL);
+	ret = coap_client_req(&client, 1, &address, &req1, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
-	ret = coap_client_req(&client2, client2.fd, &address, &req2, NULL);
+	ret = coap_client_req(&client2, 2, &address, &req2, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
 	while (last_response_code == 0 && retry > 0) {
 		retry--;
 		k_sleep(K_MSEC(1));
 	}
-	set_socket_events(client2.fd, ZSOCK_POLLIN);
+	set_socket_events(ZSOCK_POLLIN);
 
 	k_sleep(K_SECONDS(1));
 
@@ -785,7 +746,7 @@ ZTEST(coap_client, test_poll_err)
 	};
 
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
-	set_socket_events(client.fd, ZSOCK_POLLERR);
+	set_socket_events(ZSOCK_POLLERR);
 
 	k_sleep(K_MSEC(1));
 
@@ -815,7 +776,7 @@ ZTEST(coap_client, test_poll_err_after_response)
 
 	zassert_ok(k_sem_init(&sem1, 0, 1));
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
-	set_socket_events(client.fd, ZSOCK_POLLIN);
+	set_socket_events(ZSOCK_POLLIN);
 
 	k_sleep(K_MSEC(1));
 
@@ -826,6 +787,6 @@ ZTEST(coap_client, test_poll_err_after_response)
 	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
-	set_socket_events(client.fd, ZSOCK_POLLERR);
+	set_socket_events(ZSOCK_POLLERR);
 	zassert_not_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 }
diff --git a/tests/net/lib/coap_client/src/stubs.c b/tests/net/lib/coap_client/src/stubs.c
index f3451df054f..63307e27fb7 100644
--- a/tests/net/lib/coap_client/src/stubs.c
+++ b/tests/net/lib/coap_client/src/stubs.c
@@ -10,6 +10,7 @@
 LOG_MODULE_DECLARE(coap_client_test);
 
 DEFINE_FAKE_VALUE_FUNC(uint32_t, z_impl_sys_rand32_get);
+DEFINE_FAKE_VOID_FUNC(z_impl_sys_rand_get, void *, size_t);
 DEFINE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_recvfrom, int, void *, size_t, int, struct sockaddr *,
 		       socklen_t *);
 DEFINE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_sendto, int, void *, size_t, int,
@@ -21,17 +22,21 @@ struct zsock_pollfd {
 	short revents;
 };
 
-static short my_events[NUM_FD];
+static short my_events;
 
-void set_socket_events(int fd, short events)
+void set_socket_events(short events)
 {
-	__ASSERT_NO_MSG(fd < NUM_FD);
-	my_events[fd] |= events;
+	my_events |= events;
 }
 
-void clear_socket_events(int fd, short events)
+void clear_socket_events(short events)
 {
-	my_events[fd] &= ~events;
+	my_events &= ~events;
+}
+
+int z_impl_zsock_socket(int family, int type, int proto)
+{
+	return 0;
 }
 
 int z_impl_zsock_poll(struct zsock_pollfd *fds, int nfds, int poll_timeout)
@@ -39,8 +44,7 @@ int z_impl_zsock_poll(struct zsock_pollfd *fds, int nfds, int poll_timeout)
 	int events = 0;
 	k_sleep(K_MSEC(1));
 	for (int i = 0; i < nfds; i++) {
-		fds[i].revents =
-			my_events[fds[i].fd] & (fds[i].events | ZSOCK_POLLERR | ZSOCK_POLLHUP);
+		fds[i].revents = my_events & (fds[i].events | ZSOCK_POLLERR | ZSOCK_POLLHUP);
 		if (fds[i].revents) {
 			events++;
 		}
diff --git a/tests/net/lib/coap_client/src/stubs.h b/tests/net/lib/coap_client/src/stubs.h
index c3024536b54..9a9f929ce76 100644
--- a/tests/net/lib/coap_client/src/stubs.h
+++ b/tests/net/lib/coap_client/src/stubs.h
@@ -36,12 +36,12 @@
 #define ZSOCK_POLLNVAL 0x20
 /** @} */
 
-#define NUM_FD 2
 
-void set_socket_events(int fd, short events);
-void clear_socket_events(int fd, short events);
+void set_socket_events(short events);
+void clear_socket_events(short events);
 
 DECLARE_FAKE_VALUE_FUNC(uint32_t, z_impl_sys_rand32_get);
+DECLARE_FAKE_VOID_FUNC(z_impl_sys_rand_get, void *, size_t);
 DECLARE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_recvfrom, int, void *, size_t, int, struct sockaddr *,
 			socklen_t *);
 DECLARE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_sendto, int, void*, size_t, int,
@@ -50,6 +50,7 @@ DECLARE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_sendto, int, void*, size_t, int,
 #define DO_FOREACH_FAKE(FUNC)                                                                      \
 	do {                                                                                       \
 		FUNC(z_impl_sys_rand32_get)                                                        \
+		FUNC(z_impl_sys_rand_get)                                                          \
 		FUNC(z_impl_zsock_recvfrom)                                                        \
 		FUNC(z_impl_zsock_sendto)                                                          \
 	} while (0)

From e04c68d345ecd08621c18865b80775006f76e68c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:24 +0100
Subject: [PATCH 1368/2913] Revert "[nrf fromtree] tests: net: lib: lwm2m:
 interop: Fix strip-with-multi-characters (B005)"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e8add6b6b8b5dd48c4772c6e44a7d8e51236448f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/lib/lwm2m/interop/pytest/leshan.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/net/lib/lwm2m/interop/pytest/leshan.py b/tests/net/lib/lwm2m/interop/pytest/leshan.py
index 916661a8a4e..024bc6775c0 100644
--- a/tests/net/lib/lwm2m/interop/pytest/leshan.py
+++ b/tests/net/lib/lwm2m/interop/pytest/leshan.py
@@ -455,7 +455,7 @@ def next_event(self, event: str):
                     for line in self._it:
                         if not line.startswith('data: '):
                             continue
-                        data = json.loads(line.removeprefix('data: '))
+                        data = json.loads(line.lstrip('data: '))
                         if event == 'SEND' or (event == 'NOTIFICATION' and data['kind'] == 'composite'):
                             return Leshan.parse_composite(data['val'])
                         if event == 'NOTIFICATION':

From e067ed0956fa1f3d91c95266406b7a34b008d5c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:24 +0100
Subject: [PATCH 1369/2913] Revert "[nrf fromtree] net: lwm2m: Add
 TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 to cipher list"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4ff5024dce9b48b9f871b743421ddf667288fd5f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/lwm2m/lwm2m_engine.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/subsys/net/lib/lwm2m/lwm2m_engine.c b/subsys/net/lib/lwm2m/lwm2m_engine.c
index bafa1be4517..833b72217f1 100644
--- a/subsys/net/lib/lwm2m/lwm2m_engine.c
+++ b/subsys/net/lib/lwm2m/lwm2m_engine.c
@@ -1023,7 +1023,6 @@ static const int cipher_list_psk[] = {
 };
 
 static const int cipher_list_cert[] = {
-	MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8,
 	MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
 };
 

From b036d1be5478a67a2b579ce4857a95cf2d1bd507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:24 +0100
Subject: [PATCH 1370/2913] Revert "[nrf fromtree] net: lib: lwm2m:
 lwm2m_rw_senml_cbor: only assign time on get_s64() success"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3eb363876bddde0edce2e4c880276db8b81d065b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/lwm2m/lwm2m_rw_senml_cbor.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/subsys/net/lib/lwm2m/lwm2m_rw_senml_cbor.c b/subsys/net/lib/lwm2m/lwm2m_rw_senml_cbor.c
index 2429c60864f..c371840b113 100644
--- a/subsys/net/lib/lwm2m/lwm2m_rw_senml_cbor.c
+++ b/subsys/net/lib/lwm2m/lwm2m_rw_senml_cbor.c
@@ -601,9 +601,7 @@ static int get_time(struct lwm2m_input_context *in, time_t *value)
 	int ret;
 
 	ret = get_s64(in, &temp64);
-	if (ret == 0) {
-		*value = (time_t)temp64;
-	}
+	*value = (time_t)temp64;
 
 	return ret;
 }

From 2801f05f2e4e89ccf00f9fc941a3747ceb21738d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:24 +0100
Subject: [PATCH 1371/2913] Revert "[nrf fromtree] net: lwm2m: Add shell
 command for listing resources"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7655e94e15204875241a04f28b9a57d72df54d16.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/connectivity/networking/api/lwm2m.rst |   3 -
 subsys/net/lib/lwm2m/lwm2m_shell.c        | 123 +---------------------
 2 files changed, 1 insertion(+), 125 deletions(-)

diff --git a/doc/connectivity/networking/api/lwm2m.rst b/doc/connectivity/networking/api/lwm2m.rst
index cc48086613f..b0d1a04f0de 100644
--- a/doc/connectivity/networking/api/lwm2m.rst
+++ b/doc/connectivity/networking/api/lwm2m.rst
@@ -789,9 +789,6 @@ required actions from the server side.
     resume  :LwM2M engine thread resume
     lock    :Lock the LwM2M registry
     unlock  :Unlock the LwM2M registry
-    obs     : List observations
-    ls      : ls [PATH]
-            List objects, instances, resources
 
 
 
diff --git a/subsys/net/lib/lwm2m/lwm2m_shell.c b/subsys/net/lib/lwm2m/lwm2m_shell.c
index 59749763263..03e8cff7471 100644
--- a/subsys/net/lib/lwm2m/lwm2m_shell.c
+++ b/subsys/net/lib/lwm2m/lwm2m_shell.c
@@ -56,8 +56,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #define LWM2M_HELP_OBSERV "List observations"
 #define LWM2M_HELP_CACHE "cache PATH NUM\nEnable data cache for resource\n" \
 	"PATH is LwM2M path\n" \
-	"NUM how many elements to cache\n"
-#define LWM2M_HELP_LS "ls [PATH]\nList objects, instances, resources\n"
+	"NUM how many elements to cache\n" \
 
 static void send_cb(enum lwm2m_send_status status)
 {
@@ -713,125 +712,6 @@ static int cmd_observations(const struct shell *sh, size_t argc, char **argv)
 	return 0;
 }
 
-static int print_object_instance(const struct shell *sh, struct lwm2m_engine_obj_inst *oi)
-{
-	struct lwm2m_engine_obj *obj;
-
-	if (!oi) {
-		return -ENOEXEC;
-	}
-
-	obj = oi->obj;
-
-	for (int i = 0; i < oi->resource_count; i++) {
-		struct lwm2m_engine_res *re = &oi->resources[i];
-
-		for (int j = 0; j < re->res_inst_count; j++) {
-			struct lwm2m_engine_res_inst *ri = &re->res_instances[j];
-
-			if (ri->data_ptr && ri->data_len > 0 &&
-			    ri->res_inst_id != RES_INSTANCE_NOT_CREATED) {
-				struct lwm2m_engine_obj_field *field =
-					lwm2m_get_engine_obj_field(obj, re->res_id);
-				char path[LWM2M_MAX_PATH_STR_SIZE];
-
-				if (re->multi_res_inst) {
-					snprintf(path, sizeof(path), "%hu/%hu/%hu/%hu", obj->obj_id,
-						 oi->obj_inst_id, re->res_id, ri->res_inst_id);
-				} else {
-					snprintf(path, sizeof(path), "%hu/%hu/%hu", obj->obj_id,
-						 oi->obj_inst_id, re->res_id);
-				}
-				switch (field->data_type) {
-				case LWM2M_RES_TYPE_STRING:
-					shell_print(sh, "%s : %s", path, (char *)ri->data_ptr);
-					break;
-				case LWM2M_RES_TYPE_U8:
-				case LWM2M_RES_TYPE_S8:
-				case LWM2M_RES_TYPE_BOOL:
-					shell_print(sh, "%s : %u", path, *(uint8_t *)ri->data_ptr);
-					break;
-				case LWM2M_RES_TYPE_U16:
-				case LWM2M_RES_TYPE_S16:
-					shell_print(sh, "%s : %u", path, *(uint16_t *)ri->data_ptr);
-					break;
-				case LWM2M_RES_TYPE_U32:
-				case LWM2M_RES_TYPE_S32:
-					shell_print(sh, "%s : %u", path, *(uint32_t *)ri->data_ptr);
-					break;
-				case LWM2M_RES_TYPE_S64:
-				case LWM2M_RES_TYPE_TIME:
-					shell_print(sh, "%s : %lld", path,
-						    *(int64_t *)ri->data_ptr);
-					break;
-				case LWM2M_RES_TYPE_FLOAT:
-					shell_print(sh, "%s : %lf", path, *(double *)ri->data_ptr);
-					break;
-				case LWM2M_RES_TYPE_OPAQUE:
-					shell_print(sh, "%s : OPAQUE(%hu/%hu)", path, ri->data_len,
-						    ri->max_data_len);
-					break;
-				}
-			}
-		}
-	}
-	return 0;
-}
-
-static int print_object(const struct shell *sh, struct lwm2m_engine_obj *obj)
-{
-	if (!obj) {
-		return -ENOEXEC;
-	}
-	struct lwm2m_engine_obj_inst *oi = next_engine_obj_inst(obj->obj_id, -1);
-
-	for (int i = 0; i < obj->instance_count; i++) {
-		print_object_instance(sh, oi);
-		oi = next_engine_obj_inst(obj->obj_id, oi->obj_inst_id);
-	}
-	return 0;
-}
-
-static int print_all_objs(const struct shell *sh)
-{
-	struct lwm2m_engine_obj *obj;
-
-	SYS_SLIST_FOR_EACH_CONTAINER(lwm2m_engine_obj_list(), obj, node) {
-		print_object(sh, obj);
-	}
-	return 0;
-}
-
-static int cmd_ls(const struct shell *sh, size_t argc, char **argv)
-{
-	struct lwm2m_obj_path path;
-	int ret;
-
-	if (argc < 2) {
-		return print_all_objs(sh);
-	}
-
-	ret = lwm2m_string_to_path(argv[1], &path, '/');
-	if (ret < 0) {
-		return -ENOEXEC;
-	}
-
-	if (path.level == LWM2M_PATH_LEVEL_NONE) {
-		return print_all_objs(sh);
-	} else if (path.level == LWM2M_PATH_LEVEL_OBJECT) {
-		struct lwm2m_engine_obj *obj = lwm2m_engine_get_obj(&path);
-
-		return print_object(sh, obj);
-	} else if (path.level == LWM2M_PATH_LEVEL_OBJECT_INST) {
-		struct lwm2m_engine_obj_inst *oi = lwm2m_engine_get_obj_inst(&path);
-
-		return print_object_instance(sh, oi);
-	} else if (path.level == LWM2M_PATH_LEVEL_RESOURCE) {
-		return cmd_read(sh, argc, argv);
-	}
-	return -ENOEXEC;
-}
-
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	sub_lwm2m,
 	SHELL_COND_CMD_ARG(CONFIG_LWM2M_VERSION_1_1, send, NULL,
@@ -850,7 +730,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 	SHELL_CMD_ARG(lock, NULL, LWM2M_HELP_LOCK, cmd_lock, 1, 0),
 	SHELL_CMD_ARG(unlock, NULL, LWM2M_HELP_UNLOCK, cmd_unlock, 1, 0),
 	SHELL_CMD_ARG(obs, NULL, LWM2M_HELP_OBSERV, cmd_observations, 1, 0),
-	SHELL_CMD_ARG(ls, NULL, LWM2M_HELP_LS, cmd_ls, 1, 1),
 	SHELL_SUBCMD_SET_END);
 SHELL_COND_CMD_ARG_REGISTER(CONFIG_LWM2M_SHELL, lwm2m, &sub_lwm2m,
 			    LWM2M_HELP_CMD, NULL, 1, 0);

From 6cf3bd4728084f49dbf2a4bf5533e3b20bdb40b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:24 +0100
Subject: [PATCH 1372/2913] Revert "[nrf fromtree] net: lwm2m: Remove
 hostname_verify flag from context"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a3bd26244c94862f90149430c176c3ff5ff557bd.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/lwm2m.h                    | 2 ++
 subsys/net/lib/lwm2m/lwm2m_engine.c           | 2 +-
 subsys/net/lib/lwm2m/lwm2m_message_handling.c | 1 +
 tests/net/lib/lwm2m/lwm2m_engine/src/main.c   | 9 ++++++---
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/include/zephyr/net/lwm2m.h b/include/zephyr/net/lwm2m.h
index 8a2cbf557d0..d69e508c8f3 100644
--- a/include/zephyr/net/lwm2m.h
+++ b/include/zephyr/net/lwm2m.h
@@ -245,6 +245,8 @@ struct lwm2m_ctx {
 	char *desthostname;
 	/** Destination hostname length */
 	uint16_t desthostnamelen;
+	/** Flag to indicate if hostname verification is enabled */
+	bool hostname_verify;
 
 	/** Custom load_credentials function.
 	 *  Client can set load_credentials function as a way of overriding
diff --git a/subsys/net/lib/lwm2m/lwm2m_engine.c b/subsys/net/lib/lwm2m/lwm2m_engine.c
index 833b72217f1..03d978fb913 100644
--- a/subsys/net/lib/lwm2m/lwm2m_engine.c
+++ b/subsys/net/lib/lwm2m/lwm2m_engine.c
@@ -1070,7 +1070,7 @@ int lwm2m_set_default_sockopt(struct lwm2m_ctx *ctx)
 			}
 		}
 
-		if (ctx->desthostname != NULL && lwm2m_security_mode(ctx) == LWM2M_SECURITY_CERT) {
+		if (ctx->hostname_verify && (ctx->desthostname != NULL)) {
 			/** store character at len position */
 			tmp = ctx->desthostname[ctx->desthostnamelen];
 
diff --git a/subsys/net/lib/lwm2m/lwm2m_message_handling.c b/subsys/net/lib/lwm2m/lwm2m_message_handling.c
index 95347719206..1b136fd8fdc 100644
--- a/subsys/net/lib/lwm2m/lwm2m_message_handling.c
+++ b/subsys/net/lib/lwm2m/lwm2m_message_handling.c
@@ -3324,6 +3324,7 @@ int lwm2m_parse_peerinfo(char *url, struct lwm2m_ctx *client_ctx, bool is_firmwa
 		/** copy url pointer to be used in socket */
 		client_ctx->desthostname = url + off;
 		client_ctx->desthostnamelen = len;
+		client_ctx->hostname_verify = true;
 #endif
 
 #else
diff --git a/tests/net/lib/lwm2m/lwm2m_engine/src/main.c b/tests/net/lib/lwm2m/lwm2m_engine/src/main.c
index fc1f8dea2de..d982f3aecae 100644
--- a/tests/net/lib/lwm2m/lwm2m_engine/src/main.c
+++ b/tests/net/lib/lwm2m/lwm2m_engine/src/main.c
@@ -105,6 +105,7 @@ ZTEST(lwm2m_engine, test_start_stop)
 	ctx.load_credentials = NULL;
 	ctx.desthostname = host_name;
 	ctx.desthostnamelen = strlen(host_name);
+	ctx.hostname_verify = true;
 	ctx.use_dtls = true;
 
 	ret = lwm2m_engine_start(&ctx);
@@ -435,6 +436,7 @@ ZTEST(lwm2m_engine, test_security)
 	ctx.load_credentials = NULL;
 	ctx.desthostname = host_name;
 	ctx.desthostnamelen = strlen(host_name);
+	ctx.hostname_verify = true;
 	ctx.use_dtls = false;
 
 	lwm2m_security_mode_fake.return_val = LWM2M_SECURITY_NOSEC;
@@ -450,8 +452,9 @@ ZTEST(lwm2m_engine, test_security)
 	lwm2m_security_mode_fake.return_val = LWM2M_SECURITY_PSK;
 	zassert_equal(lwm2m_engine_start(&ctx), 0);
 	zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[0], TLS_SEC_TAG_LIST);
-	zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[1], TLS_PEER_VERIFY);
-	zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[2], TLS_CIPHERSUITE_LIST);
+	zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[1], TLS_HOSTNAME);
+	zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[2], TLS_PEER_VERIFY);
+	zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[3], TLS_CIPHERSUITE_LIST);
 	zassert_true(tls_credential_delete_fake.call_count > 3);
 	zassert_true(tls_credential_add_fake.call_count == 2);
 	zassert_equal(tls_credential_add_fake.arg1_history[0], TLS_CREDENTIAL_PSK_ID);
@@ -461,7 +464,7 @@ ZTEST(lwm2m_engine, test_security)
 	RESET_FAKE(z_impl_zsock_setsockopt);
 	RESET_FAKE(tls_credential_add);
 	lwm2m_security_mode_fake.return_val = LWM2M_SECURITY_CERT;
-	ctx.desthostname = NULL;
+	ctx.hostname_verify = false;
 	zassert_equal(lwm2m_engine_start(&ctx), 0);
 	zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[0], TLS_SEC_TAG_LIST);
 	zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[1], TLS_PEER_VERIFY);

From 40c7e86c7f42046f8920ab28d77b47a27b667fc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:24 +0100
Subject: [PATCH 1373/2913] Revert "[nrf fromtree] Bluetooth: Host: Log when
 connecting while scanning may give bad params"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2b43663f36e220160b21f2416542f21302fd8140.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/host/conn.c |  6 ------
 subsys/bluetooth/host/scan.c | 17 -----------------
 subsys/bluetooth/host/scan.h | 10 ----------
 3 files changed, 33 deletions(-)

diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 8a62c1fb3ba..9797337000a 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -3756,12 +3756,6 @@ int bt_conn_le_create(const bt_addr_le_t *peer, const struct bt_conn_le_create_p
 		return -ENOMEM;
 	}
 
-	if (BT_LE_STATES_SCAN_INIT(bt_dev.le.states) &&
-	    bt_le_explicit_scanner_running() &&
-	    !bt_le_explicit_scanner_uses_same_params(create_param)) {
-		LOG_WRN("Use same scan and connection create params to obtain best performance");
-	}
-
 	create_param_setup(create_param);
 
 #if defined(CONFIG_BT_SMP)
diff --git a/subsys/bluetooth/host/scan.c b/subsys/bluetooth/host/scan.c
index 05ad120fb38..0dbfa27bd08 100644
--- a/subsys/bluetooth/host/scan.c
+++ b/subsys/bluetooth/host/scan.c
@@ -2414,20 +2414,3 @@ bool bt_le_explicit_scanner_running(void)
 {
 	return atomic_test_bit(scan_state.scan_flags, BT_LE_SCAN_USER_EXPLICIT_SCAN);
 }
-
-bool bt_le_explicit_scanner_uses_same_params(const struct bt_conn_le_create_param *create_param)
-{
-	if (scan_state.explicit_scan_param.window != create_param->window ||
-	    scan_state.explicit_scan_param.interval != create_param->interval){
-		return false;
-	}
-
-	if (scan_state.explicit_scan_param.options & BT_LE_SCAN_OPT_CODED) {
-		if (scan_state.explicit_scan_param.window_coded != create_param->window_coded ||
-		    scan_state.explicit_scan_param.interval_coded != create_param->interval_coded){
-			return false;
-		}
-	}
-
-	return true;
-}
diff --git a/subsys/bluetooth/host/scan.h b/subsys/bluetooth/host/scan.h
index 85e1e4f828b..b30adfca3ba 100644
--- a/subsys/bluetooth/host/scan.h
+++ b/subsys/bluetooth/host/scan.h
@@ -121,14 +121,4 @@ int bt_le_scan_user_remove(enum bt_le_scan_user flag);
  * Check if the explicit scanner was enabled.
  */
 bool bt_le_explicit_scanner_running(void);
-
-/**
- * Check if an explicit scanner uses the same parameters
- *
- * @param create_param Parameters used for connection establishment.
- *
- * @return true If explicit scanner uses the same parameters
- * @return false If explicit scanner uses different parameters
- */
-bool bt_le_explicit_scanner_uses_same_params(const struct bt_conn_le_create_param *create_param);
 #endif /* defined SUBSYS_BLUETOOTH_HOST_SCAN_H_ */

From 1c5b19ce68f82f3ae9ac7b5525477bfb45d9e586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:24 +0100
Subject: [PATCH 1374/2913] Revert "[nrf fromlist] tests: drivers: gpio:
 gpio_basic_api: restore support for nrf54l15 flpr"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fdff0c586699b73ff56beee2878e85e2ec872183.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay    | 1 -
 .../boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay               | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
 delete mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay

diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
deleted file mode 100644
index e26399cd4c4..00000000000
--- a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay
deleted file mode 100644
index e26399cd4c4..00000000000
--- a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf54l15dk_nrf54l15_cpuapp.overlay"

From 69f06ba19454d2829cf6749e0b691bc421504bdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:24 +0100
Subject: [PATCH 1375/2913] Revert "[nrf fromlist] samples: boards: nordic:
 system_off: add console checking"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6e3dd5e0eb54dd019bb2fb954e442dd128a8a080.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/boards/nordic/system_off/sample.yaml | 80 ++------------------
 1 file changed, 7 insertions(+), 73 deletions(-)

diff --git a/samples/boards/nordic/system_off/sample.yaml b/samples/boards/nordic/system_off/sample.yaml
index 18f629c4e54..32ce78c1c9e 100644
--- a/samples/boards/nordic/system_off/sample.yaml
+++ b/samples/boards/nordic/system_off/sample.yaml
@@ -4,25 +4,18 @@ common:
   tags: power
 tests:
   sample.boards.nrf.system_off:
+    build_only: true
     integration_platforms:
       - nrf52840dk/nrf52840
     platform_allow:
-      - nrf51dk/nrf51822
-      - nrf52840dk/nrf52840
-      - nrf52dk/nrf52832
-      - nrf5340dk/nrf5340/cpuapp
       - nrf54l15dk/nrf54l05/cpuapp
       - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
-    harness: console
-    harness_config:
-      type: multi_line
-      ordered: true
-      regex:
-        - "system off demo"
-        - "Retained data not supported"
-        - "Entering system off; press sw0 to restart"
+      - nrf52840dk/nrf52840
+      - nrf52dk/nrf52832
+      - nrf51dk/nrf51822
   sample.boards.nrf.system_off.nrf_retained:
+    build_only: true
     integration_platforms:
       - nrf52840dk/nrf52840
     platform_allow:
@@ -30,76 +23,17 @@ tests:
       - nrf52dk/nrf52832
     extra_configs:
       - CONFIG_APP_USE_NRF_RETENTION=y
-    harness: console
-    harness_config:
-      type: multi_line
-      ordered: true
-      regex:
-        - "system off demo"
-        - "Retained data: INVALID"
-        - "Boot count: 1"
-        - "Off count: 0"
-        - "Active Ticks:"
-        - "Entering system off; press sw0 to restart"
   sample.boards.nrf.system_off.retained_mem:
     extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay"
+    build_only: true
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
     extra_configs:
       - CONFIG_APP_USE_RETAINED_MEM=y
       - CONFIG_RETAINED_MEM=y
-    harness: console
-    harness_config:
-      type: multi_line
-      ordered: true
-      regex:
-        - "system off demo"
-        - "Retained data: INVALID"
-        - "Boot count: 1"
-        - "Off count: 0"
-        - "Active Ticks:"
-        - "Entering system off; press sw0 to restart"
   sample.boards.nrf.system_off.grtc_wakeup:
+    build_only: true
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
     extra_configs:
       - CONFIG_GRTC_WAKEUP_ENABLE=y
-    harness: console
-    harness_config:
-      type: multi_line
-      ordered: true
-      regex:
-        - "system off demo"
-        - "Retained data not supported"
-        - "Entering system off; wait 2 seconds to restart"
-        - "system off demo"
-        - "Retained data not supported"
-        - "Entering system off; wait 2 seconds to restart"
-        - "system off demo"
-        - "Retained data not supported"
-        - "Entering system off; wait 2 seconds to restart"
-  sample.boards.nrf.system_off.retained_mem.grtc_wakeup:
-    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay"
-    platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
-    extra_configs:
-      - CONFIG_APP_USE_RETAINED_MEM=y
-      - CONFIG_GRTC_WAKEUP_ENABLE=y
-      - CONFIG_RETAINED_MEM=y
-    harness: console
-    harness_config:
-      type: multi_line
-      ordered: true
-      regex:
-        - "system off demo"
-        - "Retained data: INVALID"
-        - "Boot count: 1"
-        - "Off count: 0"
-        - "Active Ticks:"
-        - "Entering system off; wait 2 seconds to restart"
-        - "system off demo"
-        - "Retained data: valid"
-        - "Boot count: 2"
-        - "Off count: 1"
-        - "Active Ticks:"
-        - "Entering system off; wait 2 seconds to restart"

From 86200e6a68d71945fe1bc3819937861b1cb540ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:25 +0100
Subject: [PATCH 1376/2913] Revert "[nrf fromtree] boards: nrf54l15dk: Enable
 tests and samples for the L05 and L10"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9af112cd94ba685399956017f6bbfd5d9f28619b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 ...l15dk_nrf54l05_cpuapp_retained_mem.overlay | 25 -------------------
 ...l15dk_nrf54l10_cpuapp_retained_mem.overlay | 25 -------------------
 samples/boards/nordic/system_off/sample.yaml  |  2 --
 .../boards/nrf54l15dk_nrf54l05_cpuapp.conf    |  2 --
 .../boards/nrf54l15dk_nrf54l10_cpuapp.conf    |  2 --
 samples/subsys/settings/sample.yaml           |  2 --
 tests/drivers/flash/common/testcase.yaml      |  2 --
 .../boards/nrf54l15dk_nrf54l05_cpuapp.conf    |  1 -
 .../boards/nrf54l15dk_nrf54l05_cpuapp.overlay | 25 -------------------
 .../boards/nrf54l15dk_nrf54l10_cpuapp.conf    |  1 -
 .../boards/nrf54l15dk_nrf54l10_cpuapp.overlay | 25 -------------------
 tests/drivers/retained_mem/api/testcase.yaml  |  2 --
 12 files changed, 114 deletions(-)
 delete mode 100644 samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l05_cpuapp_retained_mem.overlay
 delete mode 100644 samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l10_cpuapp_retained_mem.overlay
 delete mode 100644 samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf
 delete mode 100644 samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf
 delete mode 100644 tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l05_cpuapp.conf
 delete mode 100644 tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
 delete mode 100644 tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l10_cpuapp.conf
 delete mode 100644 tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay

diff --git a/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l05_cpuapp_retained_mem.overlay b/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l05_cpuapp_retained_mem.overlay
deleted file mode 100644
index 6f4a9be80f9..00000000000
--- a/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l05_cpuapp_retained_mem.overlay
+++ /dev/null
@@ -1,25 +0,0 @@
-/ {
-	cpuapp_sram@20017000 {
-		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x20017000 DT_SIZE_K(4)>;
-		zephyr,memory-region = "RetainedMem";
-		status = "okay";
-
-		retainedmem0: retainedmem {
-			compatible = "zephyr,retained-ram";
-			status = "okay";
-		};
-	};
-
-	aliases {
-		retainedmemdevice = &retainedmem0;
-	};
-};
-
-&cpuapp_sram {
-	/* Shrink SRAM size to avoid overlap with retained memory region:
-	 * 96 - 4 = 92KB = 0x17000
-	 */
-	reg = <0x20000000 0x17000>;
-	ranges = <0x0 0x20000000 0x17000>;
-};
diff --git a/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l10_cpuapp_retained_mem.overlay b/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l10_cpuapp_retained_mem.overlay
deleted file mode 100644
index 9705cf335a7..00000000000
--- a/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l10_cpuapp_retained_mem.overlay
+++ /dev/null
@@ -1,25 +0,0 @@
-/ {
-	cpuapp_sram@2002f000 {
-		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x2002f000 DT_SIZE_K(4)>;
-		zephyr,memory-region = "RetainedMem";
-		status = "okay";
-
-		retainedmem0: retainedmem {
-			compatible = "zephyr,retained-ram";
-			status = "okay";
-		};
-	};
-
-	aliases {
-		retainedmemdevice = &retainedmem0;
-	};
-};
-
-&cpuapp_sram {
-	/* Shrink SRAM size to avoid overlap with retained memory region:
-	 * 192 - 4 = 188KB = 0x2f000
-	 */
-	reg = <0x20000000 0x2f000>;
-	ranges = <0x0 0x20000000 0x2f000>;
-};
diff --git a/samples/boards/nordic/system_off/sample.yaml b/samples/boards/nordic/system_off/sample.yaml
index 32ce78c1c9e..ab6a12aeb16 100644
--- a/samples/boards/nordic/system_off/sample.yaml
+++ b/samples/boards/nordic/system_off/sample.yaml
@@ -8,8 +8,6 @@ tests:
     integration_platforms:
       - nrf52840dk/nrf52840
     platform_allow:
-      - nrf54l15dk/nrf54l05/cpuapp
-      - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
diff --git a/samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf
deleted file mode 100644
index 3746c13c741..00000000000
--- a/samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf
deleted file mode 100644
index 3746c13c741..00000000000
--- a/samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/sample.yaml b/samples/subsys/settings/sample.yaml
index a19c9baaa0d..09d191c352a 100644
--- a/samples/subsys/settings/sample.yaml
+++ b/samples/subsys/settings/sample.yaml
@@ -12,8 +12,6 @@ tests:
       - native_sim
       - native_sim/native/64
       - mr_canhubk3
-      - nrf54l15dk/nrf54l05/cpuapp
-      - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
     integration_platforms:
diff --git a/tests/drivers/flash/common/testcase.yaml b/tests/drivers/flash/common/testcase.yaml
index 5c8e755dc4d..977fea9d0ed 100644
--- a/tests/drivers/flash/common/testcase.yaml
+++ b/tests/drivers/flash/common/testcase.yaml
@@ -38,8 +38,6 @@ tests:
       - mimxrt1060_evk
   drivers.flash.common.no_explicit_erase:
     platform_allow:
-      - nrf54l15dk/nrf54l05/cpuapp
-      - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
   drivers.flash.common.tfm_ns:
diff --git a/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l05_cpuapp.conf
deleted file mode 100644
index c15ba3ed96d..00000000000
--- a/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l05_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_POWEROFF=y
diff --git a/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
deleted file mode 100644
index 300823ba9c0..00000000000
--- a/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
+++ /dev/null
@@ -1,25 +0,0 @@
-/ {
-	cpuapp_sram@20017000 {
-		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x20017000 DT_SIZE_K(4)>;
-		zephyr,memory-region = "RetainedMem";
-		status = "okay";
-
-		retainedmem0: retainedmem {
-			compatible = "zephyr,retained-ram";
-			status = "okay";
-		};
-	};
-
-	aliases {
-		retainedmemtestdevice = &retainedmem0;
-	};
-};
-
-&cpuapp_sram {
-	/* Shrink SRAM size to avoid overlap with retained memory region:
-	 * 96 - 4 = 92KB = 0x17000
-	 */
-	reg = <0x20000000 0x17000>;
-	ranges = <0x0 0x20000000 0x17000>;
-};
diff --git a/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l10_cpuapp.conf
deleted file mode 100644
index c15ba3ed96d..00000000000
--- a/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l10_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_POWEROFF=y
diff --git a/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
deleted file mode 100644
index 7005c29f307..00000000000
--- a/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
+++ /dev/null
@@ -1,25 +0,0 @@
-/ {
-	cpuapp_sram@2002f000 {
-		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x2002f000 DT_SIZE_K(4)>;
-		zephyr,memory-region = "RetainedMem";
-		status = "okay";
-
-		retainedmem0: retainedmem {
-			compatible = "zephyr,retained-ram";
-			status = "okay";
-		};
-	};
-
-	aliases {
-		retainedmemtestdevice = &retainedmem0;
-	};
-};
-
-&cpuapp_sram {
-	/* Shrink SRAM size to avoid overlap with retained memory region:
-	 * 192 - 4 = 188KB = 0x2f000
-	 */
-	reg = <0x20000000 0x2f000>;
-	ranges = <0x0 0x20000000 0x2f000>;
-};
diff --git a/tests/drivers/retained_mem/api/testcase.yaml b/tests/drivers/retained_mem/api/testcase.yaml
index f6b6844a1b4..02f7c7c8b27 100644
--- a/tests/drivers/retained_mem/api/testcase.yaml
+++ b/tests/drivers/retained_mem/api/testcase.yaml
@@ -9,8 +9,6 @@ tests:
       - qemu_cortex_m3
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
-      - nrf54l15dk/nrf54l05/cpuapp
-      - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
     tags:
       - drivers

From faf74018cc7a49d45289a6adb69c8b0ec0274db6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:25 +0100
Subject: [PATCH 1377/2913] Revert "[nrf fromlist] tests: drivers: enable more
 tests for nrf54l10 and nrf54l05"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit dd09ff52f4bc4b751b10525546a8267ff6431ab3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../counter_basic_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay  | 1 -
 .../counter_basic_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay  | 1 -
 .../i2s/i2s_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay        | 1 -
 .../i2s/i2s_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay        | 1 -
 .../i2s/i2s_speed/boards/nrf54l15dk_nrf54l05_cpuapp.overlay      | 1 -
 .../i2s/i2s_speed/boards/nrf54l15dk_nrf54l10_cpuapp.overlay      | 1 -
 .../uart_async_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay     | 1 -
 .../uart_async_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay     | 1 -
 .../uart_async_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay    | 1 -
 9 files changed, 9 deletions(-)
 delete mode 100644 tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
 delete mode 100644 tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
 delete mode 100644 tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
 delete mode 100644 tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
 delete mode 100644 tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
 delete mode 100644 tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
 delete mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
 delete mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
 delete mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay

diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
deleted file mode 100644
index e26399cd4c4..00000000000
--- a/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
deleted file mode 100644
index e26399cd4c4..00000000000
--- a/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
deleted file mode 100644
index e26399cd4c4..00000000000
--- a/tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
deleted file mode 100644
index e26399cd4c4..00000000000
--- a/tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
deleted file mode 100644
index e26399cd4c4..00000000000
--- a/tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
deleted file mode 100644
index e26399cd4c4..00000000000
--- a/tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
deleted file mode 100644
index e26399cd4c4..00000000000
--- a/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
deleted file mode 100644
index e26399cd4c4..00000000000
--- a/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
deleted file mode 100644
index e26399cd4c4..00000000000
--- a/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf54l15dk_nrf54l15_cpuapp.overlay"

From d3a0174f23a64e8a779d2af90d3cc2f551ec5ce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:25 +0100
Subject: [PATCH 1378/2913] Revert "[nrf noup] dts: Select SoftDevice
 Controller DTS binding as default"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e88198c09a18ebf8a12aa0674cf535433d105018.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/arm/nordic/nrf52805.dtsi                  |  11 +-
 dts/arm/nordic/nrf52810.dtsi                  |  11 +-
 dts/arm/nordic/nrf52811.dtsi                  |  11 +-
 dts/arm/nordic/nrf52820.dtsi                  |  11 +-
 dts/arm/nordic/nrf52832.dtsi                  |  11 +-
 dts/arm/nordic/nrf52833.dtsi                  |  11 +-
 dts/arm/nordic/nrf52840.dtsi                  |  11 +-
 dts/arm/nordic/nrf5340_cpunet.dtsi            |  11 +-
 dts/arm/nordic/nrf54h20_cpurad.dtsi           |   4 +-
 dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi    |   4 +-
 dts/common/nordic/nrf54h20.dtsi               |   7 +-
 dts/common/nordic/nrf54l_05_10_15.dtsi        |   8 +-
 .../bluetooth/bap_broadcast_sink/sample.yaml  |   4 +-
 .../bap_broadcast_source/sample.yaml          |   4 +-
 .../bap_broadcast_source/sysbuild.cmake       |   4 -
 .../bluetooth/bap_unicast_client/sample.yaml  |   4 +-
 .../bap_unicast_client/sysbuild.cmake         |   4 -
 .../bluetooth/bap_unicast_server/sample.yaml  |   4 +-
 .../bap_unicast_server/sysbuild.cmake         |   4 -
 samples/bluetooth/beacon/sample.yaml          |   4 +-
 .../bluetooth/cap_initiator/sysbuild.cmake    |   4 -
 .../direction_finding_central/sample.yaml     |  15 +--
 .../sample.yaml                               |  14 +--
 .../sample.yaml                               |  14 +--
 .../direction_finding_peripheral/sample.yaml  |  15 +--
 samples/bluetooth/hci_ipc/sample.yaml         |  34 ++----
 samples/bluetooth/hci_uart/sample.yaml        |  18 +---
 samples/bluetooth/hci_vs_scan_req/sample.yaml |   2 -
 samples/bluetooth/iso_central/sample.yaml     |   6 +-
 .../pbp_public_broadcast_sink/sample.yaml     |   4 +-
 .../pbp_public_broadcast_sink/sysbuild.cmake  |   4 -
 .../pbp_public_broadcast_source/sample.yaml   |   4 +-
 .../sysbuild.cmake                            |   4 -
 .../controller/ll_sw/nordic/lll/lll.c         |   2 +-
 .../controller/ctrl_api/testcase.yaml         |   2 -
 .../controller/ctrl_chmu/testcase.yaml        |   2 -
 .../controller/ctrl_cis_create/testcase.yaml  |   2 -
 .../ctrl_cis_terminate/testcase.yaml          |   2 -
 .../controller/ctrl_collision/testcase.yaml   |   2 -
 .../controller/ctrl_conn_update/testcase.yaml |  11 +-
 .../controller/ctrl_cte_req/testcase.yaml     |   2 -
 .../ctrl_data_length_update/testcase.yaml     |  10 +-
 .../controller/ctrl_encrypt/testcase.yaml     |   2 -
 .../ctrl_feature_exchange/testcase.yaml       |   2 -
 .../controller/ctrl_hci/testcase.yaml         |   2 -
 .../controller/ctrl_invalid/testcase.yaml     |   2 -
 .../controller/ctrl_le_ping/testcase.yaml     |   2 -
 .../ctrl_min_used_chans/testcase.yaml         |   2 -
 .../controller/ctrl_phy_update/testcase.yaml  |   6 +-
 .../controller/ctrl_sca_update/testcase.yaml  |   2 -
 .../controller/ctrl_sw_privacy/testcase.yaml  |   2 -
 .../controller/ctrl_terminate/testcase.yaml   |   2 -
 .../ctrl_tx_buffer_alloc/testcase.yaml        |  22 +---
 .../controller/ctrl_tx_queue/testcase.yaml    |   2 -
 .../controller/ctrl_unsupported/testcase.yaml |   6 +-
 .../controller/ctrl_user_ext/testcase.yaml    |   2 -
 .../controller/ctrl_version/testcase.yaml     |   2 -
 .../df/connection_cte_req/testcase.yaml       |   2 -
 .../df/connection_cte_tx_params/testcase.yaml |   2 -
 .../connectionless_cte_chains/testcase.yaml   |   2 -
 .../df/connectionless_cte_rx/testcase.yaml    |   2 -
 .../df/connectionless_cte_tx/testcase.yaml    |   2 -
 tests/bluetooth/init/testcase.yaml            | 101 +++++-------------
 63 files changed, 120 insertions(+), 365 deletions(-)

diff --git a/dts/arm/nordic/nrf52805.dtsi b/dts/arm/nordic/nrf52805.dtsi
index aa9061d4aab..e1c8e6a2efb 100644
--- a/dts/arm/nordic/nrf52805.dtsi
+++ b/dts/arm/nordic/nrf52805.dtsi
@@ -11,7 +11,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -97,13 +97,12 @@
 			status = "okay";
 			ble-2mbps-supported;
 
-			bt_hci_sdc: bt_hci_sdc {
-				compatible = "nordic,bt-hci-sdc";
-				status = "okay";
-			};
+			/* Note: In the nRF Connect SDK the SoftDevice Controller
+			 * is added and set as the default Bluetooth Controller.
+			 */
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "disabled";
+				status = "okay";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
index 8ed7a32bfec..40d872dda44 100644
--- a/dts/arm/nordic/nrf52810.dtsi
+++ b/dts/arm/nordic/nrf52810.dtsi
@@ -7,7 +7,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -101,13 +101,12 @@
 			status = "okay";
 			ble-2mbps-supported;
 
-			bt_hci_sdc: bt_hci_sdc {
-				compatible = "nordic,bt-hci-sdc";
-				status = "okay";
-			};
+			/* Note: In the nRF Connect SDK the SoftDevice Controller
+			 * is added and set as the default Bluetooth Controller.
+			 */
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "disabled";
+				status = "okay";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi
index 4c5f4ca58f7..735bfee427b 100644
--- a/dts/arm/nordic/nrf52811.dtsi
+++ b/dts/arm/nordic/nrf52811.dtsi
@@ -11,7 +11,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -113,13 +113,12 @@
 				status = "disabled";
 			};
 
-			bt_hci_sdc: bt_hci_sdc {
-				compatible = "nordic,bt-hci-sdc";
-				status = "okay";
-			};
+			/* Note: In the nRF Connect SDK the SoftDevice Controller
+			 * is added and set as the default Bluetooth Controller.
+			 */
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "disabled";
+				status = "okay";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52820.dtsi b/dts/arm/nordic/nrf52820.dtsi
index f7ec2b926f6..82bdcb58934 100644
--- a/dts/arm/nordic/nrf52820.dtsi
+++ b/dts/arm/nordic/nrf52820.dtsi
@@ -11,7 +11,7 @@
 / {
 
 	chosen {
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -115,13 +115,12 @@
 				status = "disabled";
 			};
 
-			bt_hci_sdc: bt_hci_sdc {
-				compatible = "nordic,bt-hci-sdc";
-				status = "okay";
-			};
+			/* Note: In the nRF Connect SDK another Bluetooth controller
+			 * is added and set as the default.
+			 */
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "disabled";
+				status = "okay";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
index f09793f5020..abb1aed468c 100644
--- a/dts/arm/nordic/nrf52832.dtsi
+++ b/dts/arm/nordic/nrf52832.dtsi
@@ -7,7 +7,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -101,13 +101,12 @@
 			status = "okay";
 			ble-2mbps-supported;
 
-			bt_hci_sdc: bt_hci_sdc {
-				compatible = "nordic,bt-hci-sdc";
-				status = "okay";
-			};
+			/* Note: In the nRF Connect SDK the SoftDevice Controller
+			 * is added and set as the default Bluetooth Controller.
+			 */
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "disabled";
+				status = "okay";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi
index a881898a8f3..e8a033b4002 100644
--- a/dts/arm/nordic/nrf52833.dtsi
+++ b/dts/arm/nordic/nrf52833.dtsi
@@ -11,7 +11,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -115,13 +115,12 @@
 				status = "disabled";
 			};
 
-			bt_hci_sdc: bt_hci_sdc {
-				compatible = "nordic,bt-hci-sdc";
-				status = "okay";
-			};
+			/* Note: In the nRF Connect SDK the SoftDevice Controller
+			 * is added and set as the default Bluetooth Controller.
+			 */
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "disabled";
+				status = "okay";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index e331e8b422f..b0049bfa605 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -7,7 +7,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 		zephyr,entropy = &cryptocell;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -103,13 +103,12 @@
 				status = "disabled";
 			};
 
-			bt_hci_sdc: bt_hci_sdc {
-				compatible = "nordic,bt-hci-sdc";
-				status = "okay";
-			};
+			/* Note: In the nRF Connect SDK the SoftDevice Controller
+			 * is added and set as the default Bluetooth Controller.
+			 */
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "disabled";
+				status = "okay";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf5340_cpunet.dtsi b/dts/arm/nordic/nrf5340_cpunet.dtsi
index d33b4080deb..acf95077669 100644
--- a/dts/arm/nordic/nrf5340_cpunet.dtsi
+++ b/dts/arm/nordic/nrf5340_cpunet.dtsi
@@ -9,7 +9,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -102,13 +102,12 @@
 				status = "disabled";
 			};
 
-			bt_hci_sdc: bt_hci_sdc {
-				compatible = "nordic,bt-hci-sdc";
-				status = "okay";
-			};
+			/* Note: In the nRF Connect SDK the SoftDevice Controller
+			 * is added and set as the default Bluetooth Controller.
+			 */
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "disabled";
+				status = "okay";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf54h20_cpurad.dtsi b/dts/arm/nordic/nrf54h20_cpurad.dtsi
index e8ff2dac3a4..2cfda47afc5 100644
--- a/dts/arm/nordic/nrf54h20_cpurad.dtsi
+++ b/dts/arm/nordic/nrf54h20_cpurad.dtsi
@@ -24,7 +24,7 @@ wdt011: &cpurad_wdt011 {};
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 	};
 
 	soc {
@@ -104,6 +104,6 @@ wdt011: &cpurad_wdt011 {};
 	status = "okay";
 };
 
-&bt_hci_sdc {
+&bt_hci_controller {
 	status = "okay";
 };
diff --git a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
index 2de29fcdbd2..5b0fda68586 100644
--- a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
@@ -15,7 +15,7 @@ nvic: &cpuapp_nvic {};
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 		zephyr,entropy = &psa_rng;
 	};
 
@@ -31,7 +31,7 @@ nvic: &cpuapp_nvic {};
 	};
 };
 
-&bt_hci_sdc {
+&bt_hci_controller {
 	status = "okay";
 };
 
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 2e1f2ea8376..f7665221e3b 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -425,10 +425,9 @@
 					status = "disabled";
 				};
 
-				bt_hci_sdc: bt_hci_sdc {
-					compatible = "nordic,bt-hci-sdc";
-					status = "disabled";
-				};
+				/* Note: In the nRF Connect SDK the SoftDevice Controller
+				 * is added and set as the default Bluetooth Controller.
+				 */
 				bt_hci_controller: bt_hci_controller {
 					compatible = "zephyr,bt-hci-ll-sw-split";
 					status = "disabled";
diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi
index d997e01c488..04fae0272bc 100644
--- a/dts/common/nordic/nrf54l_05_10_15.dtsi
+++ b/dts/common/nordic/nrf54l_05_10_15.dtsi
@@ -234,11 +234,9 @@
 					status = "disabled";
 				};
 
-				bt_hci_sdc: bt_hci_sdc {
-					compatible = "nordic,bt-hci-sdc";
-					status = "disabled";
-				};
-
+				/* Note: In the nRF Connect SDK the SoftDevice Controller
+				 * is added and set as the default Bluetooth Controller.
+				 */
 				bt_hci_controller: bt_hci_controller {
 					compatible = "zephyr,bt-hci-ll-sw-split";
 					status = "disabled";
diff --git a/samples/bluetooth/bap_broadcast_sink/sample.yaml b/samples/bluetooth/bap_broadcast_sink/sample.yaml
index e19e17d57a0..b6360768f0a 100644
--- a/samples/bluetooth/bap_broadcast_sink/sample.yaml
+++ b/samples/bluetooth/bap_broadcast_sink/sample.yaml
@@ -24,7 +24,5 @@ tests:
       - nrf52_bsim
       - nrf52833dk/nrf52833
       - nrf52840dongle/nrf52840
-    extra_args:
-      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/bap_broadcast_source/sample.yaml b/samples/bluetooth/bap_broadcast_source/sample.yaml
index 4b9b7c705e5..27262103b29 100644
--- a/samples/bluetooth/bap_broadcast_source/sample.yaml
+++ b/samples/bluetooth/bap_broadcast_source/sample.yaml
@@ -25,7 +25,5 @@ tests:
       - nrf52_bsim
       - nrf52833dk/nrf52833
       - nrf52840dongle/nrf52840
-    extra_args:
-      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/bap_broadcast_source/sysbuild.cmake b/samples/bluetooth/bap_broadcast_source/sysbuild.cmake
index d5d260789ff..2523aac8ea7 100644
--- a/samples/bluetooth/bap_broadcast_source/sysbuild.cmake
+++ b/samples/bluetooth/bap_broadcast_source/sysbuild.cmake
@@ -18,10 +18,6 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
-	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
-	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
-	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
-
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/bap_unicast_client/sample.yaml b/samples/bluetooth/bap_unicast_client/sample.yaml
index e69083f2669..536ab9144f0 100644
--- a/samples/bluetooth/bap_unicast_client/sample.yaml
+++ b/samples/bluetooth/bap_unicast_client/sample.yaml
@@ -22,7 +22,5 @@ tests:
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52dk/nrf52832
-    extra_args:
-      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/bap_unicast_client/sysbuild.cmake b/samples/bluetooth/bap_unicast_client/sysbuild.cmake
index d5d260789ff..2523aac8ea7 100644
--- a/samples/bluetooth/bap_unicast_client/sysbuild.cmake
+++ b/samples/bluetooth/bap_unicast_client/sysbuild.cmake
@@ -18,10 +18,6 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
-	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
-	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
-	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
-
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/bap_unicast_server/sample.yaml b/samples/bluetooth/bap_unicast_server/sample.yaml
index 744833234b9..fc14175a2d1 100644
--- a/samples/bluetooth/bap_unicast_server/sample.yaml
+++ b/samples/bluetooth/bap_unicast_server/sample.yaml
@@ -22,7 +22,5 @@ tests:
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52dk/nrf52832
-    extra_args:
-      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/bap_unicast_server/sysbuild.cmake b/samples/bluetooth/bap_unicast_server/sysbuild.cmake
index d5d260789ff..2523aac8ea7 100644
--- a/samples/bluetooth/bap_unicast_server/sysbuild.cmake
+++ b/samples/bluetooth/bap_unicast_server/sysbuild.cmake
@@ -18,10 +18,6 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
-	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
-	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
-	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
-
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/beacon/sample.yaml b/samples/bluetooth/beacon/sample.yaml
index 6ab2413ca8f..e0bf6d22fb9 100644
--- a/samples/bluetooth/beacon/sample.yaml
+++ b/samples/bluetooth/beacon/sample.yaml
@@ -16,9 +16,7 @@ tests:
       - nrf52dk/nrf52832
       - nrf54l15dk/nrf54l15/cpuapp
   sample.bluetooth.beacon-coex:
-    extra_args:
-      - CONF_FILE="prj-coex.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE="prj-coex.conf"
     harness: bluetooth
     platform_allow:
       - nrf52840dk/nrf52840
diff --git a/samples/bluetooth/cap_initiator/sysbuild.cmake b/samples/bluetooth/cap_initiator/sysbuild.cmake
index d5d260789ff..2523aac8ea7 100644
--- a/samples/bluetooth/cap_initiator/sysbuild.cmake
+++ b/samples/bluetooth/cap_initiator/sysbuild.cmake
@@ -18,10 +18,6 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
-	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
-	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
-	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
-
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/direction_finding_central/sample.yaml b/samples/bluetooth/direction_finding_central/sample.yaml
index c1d1adae2c4..b0c94537b51 100644
--- a/samples/bluetooth/direction_finding_central/sample.yaml
+++ b/samples/bluetooth/direction_finding_central/sample.yaml
@@ -14,24 +14,15 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding.central.aod_with_controller:
+  sample.bluetooth.direction_finding.central.aod:
     harness: bluetooth
-    extra_args:
-      - OVERLAY_CONFIG="overlay-aod.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG="overlay-aod.conf"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+      - nrf5340dk/nrf5340/cpuapp
     tags: bluetooth
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-  sample.bluetooth.direction_finding.central.aod_host_only:
-    harness: bluetooth
-    extra_args:
-      - OVERLAY_CONFIG="overlay-aod.conf"
-    platform_allow:
-      - nrf5340dk/nrf5340/cpuapp
-    tags: bluetooth
-    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
index 97d4fea9e69..1c79df41275 100644
--- a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
+++ b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
@@ -12,22 +12,14 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding_connectionless_rx.aod_with_controller:
+  sample.bluetooth.direction_finding_connectionless_rx.aod:
     harness: bluetooth
-    extra_args:
-      - OVERLAY_CONFIG="overlay-aod.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG="overlay-aod.conf"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+      - nrf5340dk/nrf5340/cpuapp
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-  sample.bluetooth.direction_finding_connectionless_rx.aod_host_only:
-    harness: bluetooth
-    extra_args:
-      - OVERLAY_CONFIG="overlay-aod.conf"
-    platform_allow:
-      - nrf5340dk/nrf5340/cpuapp
-    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
index e1833b9be8a..1ea189f5088 100644
--- a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
+++ b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
@@ -12,22 +12,14 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding_connectionless.aoa_with_controller:
+  sample.bluetooth.direction_finding_connectionless.aoa:
     harness: bluetooth
-    extra_args:
-      - OVERLAY_CONFIG="overlay-aoa.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG="overlay-aoa.conf"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+      - nrf5340dk/nrf5340/cpuapp
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-  sample.bluetooth.direction_finding_connectionless.aoa_host_only:
-    harness: bluetooth
-    extra_args:
-      - OVERLAY_CONFIG="overlay-aoa.conf"
-    platform_allow:
-      - nrf5340dk/nrf5340/cpuapp
-    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_peripheral/sample.yaml b/samples/bluetooth/direction_finding_peripheral/sample.yaml
index 00a8c0b79d1..126355a735f 100644
--- a/samples/bluetooth/direction_finding_peripheral/sample.yaml
+++ b/samples/bluetooth/direction_finding_peripheral/sample.yaml
@@ -14,24 +14,15 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding.peripheral.aod_with_controller:
+  sample.bluetooth.direction_finding.peripheral.aod:
     harness: bluetooth
-    extra_args:
-      - OVERLAY_CONFIG="overlay-aoa.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG="overlay-aoa.conf"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+      - nrf5340dk/nrf5340/cpuapp
     tags: bluetooth
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-  sample.bluetooth.direction_finding.peripheral.aod_host_only:
-    harness: bluetooth
-    extra_args:
-      - OVERLAY_CONFIG="overlay-aoa.conf"
-    platform_allow:
-      - nrf5340dk/nrf5340/cpuapp
-    tags: bluetooth
-    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/hci_ipc/sample.yaml b/samples/bluetooth/hci_ipc/sample.yaml
index 15d47e6866e..e88726aa45f 100644
--- a/samples/bluetooth/hci_ipc/sample.yaml
+++ b/samples/bluetooth/hci_ipc/sample.yaml
@@ -15,9 +15,7 @@ tests:
   sample.bluetooth.hci_ipc.iso_broadcast.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args:
-      - CONF_FILE="nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE="nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -28,9 +26,7 @@ tests:
   sample.bluetooth.hci_ipc.iso_receive.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args:
-      - CONF_FILE="nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE="nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -40,9 +36,7 @@ tests:
   sample.bluetooth.hci_ipc.bis.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args:
-      - CONF_FILE="nrf5340_cpunet_bis-bt_ll_sw_split.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE="nrf5340_cpunet_bis-bt_ll_sw_split.conf"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -52,9 +46,7 @@ tests:
   sample.bluetooth.hci_ipc.iso_central.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args:
-      - CONF_FILE="nrf5340_cpunet_iso_central-bt_ll_sw_split.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE="nrf5340_cpunet_iso_central-bt_ll_sw_split.conf"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -64,9 +56,7 @@ tests:
   sample.bluetooth.hci_ipc.iso_peripheral.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args:
-      - CONF_FILE="nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE="nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -76,9 +66,7 @@ tests:
   sample.bluetooth.hci_ipc.cis.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args:
-      - CONF_FILE="nrf5340_cpunet_cis-bt_ll_sw_split.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE="nrf5340_cpunet_cis-bt_ll_sw_split.conf"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -88,9 +76,7 @@ tests:
   sample.bluetooth.hci_ipc.iso.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args:
-      - CONF_FILE="nrf5340_cpunet_iso-bt_ll_sw_split.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE="nrf5340_cpunet_iso-bt_ll_sw_split.conf"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340bsim/nrf5340/cpunet
@@ -102,7 +88,6 @@ tests:
     extra_args:
       - CONF_FILE="nrf5340_cpunet_df-bt_ll_sw_split.conf"
       - DTC_OVERLAY_FILE="nrf5340_cpunet_df-bt_ll_sw_split.overlay"
-      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
@@ -113,16 +98,13 @@ tests:
       - CONF_FILE="nrf5340_cpunet_df-bt_ll_sw_split.conf"
       - DTC_OVERLAY_FILE="nrf5340_cpunet_df-bt_ll_sw_split.overlay"
       - CONFIG_BT_CTLR_PHY_CODED=n
-      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
   sample.bluetooth.hci_ipc.mesh.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args:
-      - CONF_FILE="nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf"
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE="nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
diff --git a/samples/bluetooth/hci_uart/sample.yaml b/samples/bluetooth/hci_uart/sample.yaml
index c626906f1ea..a83ac48cbf0 100644
--- a/samples/bluetooth/hci_uart/sample.yaml
+++ b/samples/bluetooth/hci_uart/sample.yaml
@@ -12,9 +12,7 @@ tests:
   sample.bluetooth.hci_uart.nrf52833.df:
     harness: bluetooth
     platform_allow: nrf52833dk/nrf52833
-    extra_args:
-      - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
     tags:
@@ -23,9 +21,7 @@ tests:
   sample.bluetooth.hci_uart.nrf5340_netcore.df:
     harness: bluetooth
     platform_allow: nrf5340dk/nrf5340/cpunet
-    extra_args:
-      - DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
     tags:
@@ -34,9 +30,7 @@ tests:
   sample.bluetooth.hci_uart.nrf52833.df.iq_report:
     harness: bluetooth
     platform_allow: nrf52833dk/nrf52833
-    extra_args:
-      - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
       - CONFIG_BT_CTLR_DTM_HCI_DF_IQ_REPORT=y
@@ -46,9 +40,7 @@ tests:
   sample.bluetooth.hci_uart.nrf5340_netcore.df.iq_report:
     harness: bluetooth
     platform_allow: nrf5340dk/nrf5340/cpunet
-    extra_args:
-      - DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
       - CONFIG_BT_CTLR_DTM_HCI_DF_IQ_REPORT=y
@@ -63,7 +55,6 @@ tests:
     extra_args:
       - OVERLAY_CONFIG=overlay-all-bt_ll_sw_split.conf
       - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
-      - SNIPPET="bt-ll-sw-split"
     tags:
       - uart
       - bluetooth
@@ -75,7 +66,6 @@ tests:
     extra_args:
       - OVERLAY_CONFIG=overlay-all-bt_ll_sw_split.conf
       - DTC_OVERLAY_FILE=./boards/nrf54l15dk_nrf54l15_cpuapp_df.overlay
-      - SNIPPET="bt-ll-sw-split"
     tags:
       - uart
       - bluetooth
diff --git a/samples/bluetooth/hci_vs_scan_req/sample.yaml b/samples/bluetooth/hci_vs_scan_req/sample.yaml
index 49526522d16..245a83aa0d9 100644
--- a/samples/bluetooth/hci_vs_scan_req/sample.yaml
+++ b/samples/bluetooth/hci_vs_scan_req/sample.yaml
@@ -9,6 +9,4 @@ tests:
       - nrf52dk/nrf52832
     extra_configs:
       - CONFIG_BT_LL_SW_SPLIT=y
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/iso_central/sample.yaml b/samples/bluetooth/iso_central/sample.yaml
index fd5ec7ac4fe..d4350e0d9cf 100644
--- a/samples/bluetooth/iso_central/sample.yaml
+++ b/samples/bluetooth/iso_central/sample.yaml
@@ -11,11 +11,11 @@ tests:
   sample.bluetooth.iso_central.bt_ll_sw_split:
     harness: bluetooth
     platform_allow:
+      - qemu_cortex_m3
+      - qemu_x86
       - nrf52_bsim
       - nrf52833dk/nrf52833
     integration_platforms:
       - nrf52833dk/nrf52833
-    extra_args:
-      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml b/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
index daa63336080..2c4d31fd4b9 100644
--- a/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
+++ b/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
@@ -23,7 +23,5 @@ tests:
     integration_platforms:
       - nrf52_bsim
       - nrf52833dk/nrf52833
-    extra_args:
-      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake b/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake
index d5d260789ff..2523aac8ea7 100644
--- a/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake
+++ b/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake
@@ -18,10 +18,6 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
-	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
-	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
-	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
-
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/pbp_public_broadcast_source/sample.yaml b/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
index 75cdc80ec6f..31809027f29 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
+++ b/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
@@ -23,7 +23,5 @@ tests:
     integration_platforms:
       - nrf52_bsim
       - nrf52833dk/nrf52833
-    extra_args:
-      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake b/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake
index e0a7fd9d175..d3bf7be5b6c 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake
+++ b/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake
@@ -18,10 +18,6 @@ if(NOT("${SB_CONFIG_NET_CORE_BOARD}" STREQUAL ""))
 	 CACHE INTERNAL ""
 	)
 
-	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
-	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
-	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
-
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
index 956834765ce..77b4360cabd 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
@@ -62,7 +62,7 @@ static struct {
 /* FIXME: This could probably use a chosen entropy device instead on relying on
  * the nodelabel being the same as for the old nrf rng.
  */
-static const struct device *const dev_entropy = DEVICE_DT_GET(DT_CHOSEN(zephyr_entropy));
+static const struct device *const dev_entropy = DEVICE_DT_GET(DT_NODELABEL(rng));
 #endif /* CONFIG_ENTROPY_HAS_DRIVER */
 
 static int init_reset(void);
diff --git a/tests/bluetooth/controller/ctrl_api/testcase.yaml b/tests/bluetooth/controller/ctrl_api/testcase.yaml
index 21f178bf9b2..19bf6c9ab49 100644
--- a/tests/bluetooth/controller/ctrl_api/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_api/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_api.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_chmu/testcase.yaml b/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
index 9c3ee626433..f7e8068d60e 100644
--- a/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_chmu.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml b/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
index 2371d7063eb..99612a89bc3 100644
--- a/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_cis_create.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml b/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
index a98229ba45f..956172a89b2 100644
--- a/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_cis_terminate.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_collision/testcase.yaml b/tests/bluetooth/controller/ctrl_collision/testcase.yaml
index daa8f3bc6c3..6086a9a4ebc 100644
--- a/tests/bluetooth/controller/ctrl_collision/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_collision/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_collision.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml b/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
index fc4ecb0b647..5b0bda4b908 100644
--- a/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
@@ -7,18 +7,11 @@ common:
 tests:
   bluetooth.controller.ctrl_conn_update.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_conn_update.apm_test:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_apm.conf
-      - SNIPPET="bt-ll-sw-split"
-
+    extra_args: CONF_FILE=prj_apm.conf
 
   bluetooth.controller.ctrl_conn_update.no_param_req_test:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_no_param_req.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_no_param_req.conf
diff --git a/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml b/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
index c6288aecc43..fd6ff51118d 100644
--- a/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_cte_req.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml b/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
index c7d1174e12b..9778af435b4 100644
--- a/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
@@ -6,17 +6,11 @@ common:
 tests:
   bluetooth.controller.ctrl_data_length_update.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_data_length_update.test_nocodedphy:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_nocoded.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_nocoded.conf
 
   bluetooth.controller.ctrl_data_length_update.test_nophy:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_nophy.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_nophy.conf
diff --git a/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml b/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
index 86dd5bfe4d3..d5bb2cb8b11 100644
--- a/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_encrypt.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml b/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
index 087e49575ff..257542f3612 100644
--- a/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_feature_exchange.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_hci/testcase.yaml b/tests/bluetooth/controller/ctrl_hci/testcase.yaml
index 5e00c85f6f4..c750ebc8dd8 100644
--- a/tests/bluetooth/controller/ctrl_hci/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_hci/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_hci.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_invalid/testcase.yaml b/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
index cee54e6b09e..2d1741931e3 100644
--- a/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_invalid.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml b/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
index 54178905da1..b6a77528f32 100644
--- a/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_le_ping.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml b/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
index a9445cbf8c4..0991b0cdd43 100644
--- a/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_min_used_chans.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml b/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
index d5c49d587a8..1d7da169f1d 100644
--- a/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
@@ -6,10 +6,6 @@ common:
 tests:
   bluetooth.controller.ctrl_phy_update.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
   bluetooth.controller.ctrl_phy_update.test_reduced_buf:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_rx_cnt.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_rx_cnt.conf
diff --git a/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml b/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
index cbc3c3faf72..cbf63aa1b57 100644
--- a/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_sca_update.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml b/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml
index ac5dd6e957e..778606d6954 100644
--- a/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml
@@ -4,5 +4,3 @@ common:
 tests:
   bluetooth.ctrl_sw_privacy.test:
     platform_allow: nrf52_bsim
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_terminate/testcase.yaml b/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
index 6b1409e9653..cbe639401ea 100644
--- a/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_terminate.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml
index 363986bd3d3..614eb7fe94c 100644
--- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml
@@ -6,35 +6,23 @@ common:
 tests:
   bluetooth.controller.ctrl_tx_buffer_alloc.test_0_per_conn:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_1_per_conn:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_1.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_1.conf
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_2_per_conn:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_2.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_2.conf
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_3_per_conn:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_3.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_3.conf
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_max_per_conn_alloc:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_max.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_max.conf
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_max_common_alloc:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_max_common.conf
-       - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_max_common.conf
diff --git a/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml b/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml
index 282b620b317..295ad891a63 100644
--- a/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml
@@ -5,5 +5,3 @@ common:
 tests:
   bluetooth.ctrl_tx_queue.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml b/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml
index 48b18af9353..28aba1a752a 100644
--- a/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml
@@ -6,11 +6,7 @@ common:
 tests:
   bluetooth.controller.ctrl_unsupported.default.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_unsupported.test:
     type: unit
-    extra_args:
-      - CONF_FILE=prj_unsupported.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_unsupported.conf
diff --git a/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml b/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml
index be963df24a8..af319a7a719 100644
--- a/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml
@@ -4,5 +4,3 @@ common:
 tests:
   bluetooth.ctrl_user_ext.test:
     platform_allow: nrf52_bsim
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_version/testcase.yaml b/tests/bluetooth/controller/ctrl_version/testcase.yaml
index 5df86b9bca9..6badcbc7254 100644
--- a/tests/bluetooth/controller/ctrl_version/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_version/testcase.yaml
@@ -6,5 +6,3 @@ common:
 tests:
   bluetooth.controller.ctrl_version.test:
     type: unit
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connection_cte_req/testcase.yaml b/tests/bluetooth/df/connection_cte_req/testcase.yaml
index fbfe4b0d9a1..768aba4a51f 100644
--- a/tests/bluetooth/df/connection_cte_req/testcase.yaml
+++ b/tests/bluetooth/df/connection_cte_req/testcase.yaml
@@ -2,5 +2,3 @@ tests:
   bluetooth.df.conection_cte_req:
     platform_allow: nrf52_bsim
     tags: bluetooth
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml b/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml
index a9986c5b0e5..38a23b0950e 100644
--- a/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml
+++ b/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml
@@ -2,5 +2,3 @@ tests:
   bluetooth.df.conection_cte_tx_params:
     platform_allow: nrf52_bsim
     tags: bluetooth
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml b/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
index 844a7bbb524..6aa5bb0f0c1 100644
--- a/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
@@ -2,5 +2,3 @@ tests:
   bluetooth.df.connectionless_cte_chains:
     platform_allow: nrf52_bsim
     tags: bluetooth
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml b/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml
index c8f08a90843..f839b1910eb 100644
--- a/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml
@@ -2,5 +2,3 @@ tests:
   bluetooth.df.connectionless_cte_rx:
     platform_allow: nrf52_bsim
     tags: bluetooth
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml b/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml
index 491cc0e7e59..77d651d0cbc 100644
--- a/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml
@@ -2,5 +2,3 @@ tests:
   bluetooth.df.connectionless_cte_tx:
     platform_allow: nrf52_bsim
     tags: bluetooth
-    extra_args:
-      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/init/testcase.yaml b/tests/bluetooth/init/testcase.yaml
index d0f917f1fe2..69afaaf8b08 100644
--- a/tests/bluetooth/init/testcase.yaml
+++ b/tests/bluetooth/init/testcase.yaml
@@ -74,9 +74,7 @@ tests:
     extra_args: CONF_FILE=prj_9.conf
     platform_allow: qemu_cortex_m3
   bluetooth.init.test_ctlr:
-    extra_args:
-      - CONF_FILE=prj_ctlr.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -88,9 +86,7 @@ tests:
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_4_0:
-    extra_args:
-      - CONF_FILE=prj_ctlr_4_0.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_4_0.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -99,9 +95,7 @@ tests:
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_4_0_dbg:
-    extra_args:
-      - CONF_FILE=prj_ctlr_4_0_dbg.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_4_0_dbg.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -110,9 +104,7 @@ tests:
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_tiny:
-    extra_args:
-      - CONF_FILE=prj_ctlr_tiny.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_tiny.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -124,7 +116,6 @@ tests:
     extra_args:
       - CONF_FILE=prj_ctlr_dbg.conf
       - DTC_OVERLAY_FILE=pa_lna.overlay
-      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -135,7 +126,6 @@ tests:
     extra_args:
       - CONF_FILE=prj_ctlr_5_x_dbg.conf
       - DTC_OVERLAY_FILE=pa_lna.overlay
-      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -147,7 +137,6 @@ tests:
       - CONF_FILE=prj_ctlr.conf
       - CONFIG_BT_CTLR_ADVANCED_FEATURES=y
       - CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER=y
-      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf52840dk/nrf52840
@@ -159,7 +148,6 @@ tests:
   bluetooth.init.test_ctlr_ticker:
     extra_args:
       - CONF_FILE=prj_ctlr_ticker.conf
-      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -167,36 +155,28 @@ tests:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
   bluetooth.init.test_ctlr_broadcaster:
-    extra_args:
-      - CONF_FILE=prj_ctlr_broadcaster.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_broadcaster.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_peripheral:
-    extra_args:
-      - CONF_FILE=prj_ctlr_peripheral.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_peripheral.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_peripheral_priv:
-    extra_args:
-      - CONF_FILE=prj_ctlr_peripheral_priv.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_peripheral_priv.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_observer:
-    extra_args:
-      - CONF_FILE=prj_ctlr_observer.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_observer.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -207,9 +187,7 @@ tests:
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_central:
-    extra_args:
-      - CONF_FILE=prj_ctlr_central.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_central.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -220,9 +198,7 @@ tests:
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_central_priv:
-    extra_args:
-      - CONF_FILE=prj_ctlr_central_priv.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_central_priv.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -233,9 +209,7 @@ tests:
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_broadcaster_ext:
-    extra_args:
-      - CONF_FILE=prj_ctlr_broadcaster_ext.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_broadcaster_ext.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -244,9 +218,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_peripheral_ext:
-    extra_args:
-      - CONF_FILE=prj_ctlr_peripheral_ext.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_peripheral_ext.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -255,9 +227,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_peripheral_ext_priv:
-    extra_args:
-      - CONF_FILE=prj_ctlr_peripheral_ext_priv.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_peripheral_ext_priv.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -266,9 +236,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_oberver_ext:
-    extra_args:
-      - CONF_FILE=prj_ctlr_observer_ext.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_observer_ext.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -277,9 +245,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_central_ext:
-    extra_args:
-      - CONF_FILE=prj_ctlr_central_ext.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_central_ext.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -288,9 +254,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_central_ext_priv:
-    extra_args:
-      - CONF_FILE=prj_ctlr_central_ext_priv.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_central_ext_priv.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -299,9 +263,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_adv:
-    extra_args:
-      - CONF_FILE=prj_ctlr_per_adv.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_per_adv.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -310,9 +272,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_adv_no_adi:
-    extra_args:
-      - CONF_FILE=prj_ctlr_per_adv_no_adi.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_per_adv_no_adi.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -321,9 +281,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_sync:
-    extra_args:
-      - CONF_FILE=prj_ctlr_per_sync.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_per_sync.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -332,9 +290,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_sync_no_adi:
-    extra_args:
-      - CONF_FILE=prj_ctlr_per_sync_no_adi.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_per_sync_no_adi.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -343,9 +299,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_sync_no_filter:
-    extra_args:
-      - CONF_FILE=prj_ctlr_per_sync_no_filter.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_per_sync_no_filter.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -354,9 +308,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_peripheral_iso:
-    extra_args:
-      - CONF_FILE=prj_ctlr_peripheral_iso.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_peripheral_iso.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -365,9 +317,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_central_iso:
-    extra_args:
-      - CONF_FILE=prj_ctlr_central_iso.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_ctlr_central_iso.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -386,9 +336,7 @@ tests:
       - DTC_OVERLAY_FILE=h5.overlay
     platform_allow: qemu_cortex_m3
   bluetooth.init.test_llcp:
-    extra_args:
-      - CONF_FILE=prj_llcp.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: CONF_FILE=prj_llcp.conf
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -401,6 +349,5 @@ tests:
     extra_args:
       - CONF_FILE=prj_ctlr.conf
       - CONFIG_BT_RECV_WORKQ_BT=y
-      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840

From 5fc819aeca52306cac1582176b76455b86a55193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:25 +0100
Subject: [PATCH 1379/2913] Revert "[nrf noup] dts: choose a crypto accelerator
 for entropy"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 296400609adfab07a708db306d58bd7773918300.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/arm/nordic/nrf52840.dtsi               | 4 ++--
 dts/arm/nordic/nrf5340_cpuapp.dtsi         | 4 ++--
 dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi | 3 +--
 dts/arm/nordic/nrf91.dtsi                  | 3 +--
 soc/nordic/common/Kconfig.peripherals      | 6 ++----
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index b0049bfa605..e2265c130b0 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -8,7 +8,7 @@
 / {
 	chosen {
 		zephyr,bt-hci = &bt_hci_controller;
-		zephyr,entropy = &cryptocell;
+		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
 
@@ -562,7 +562,7 @@
 			reg = <0x5002a000 0x1000>, <0x5002b000 0x1000>;
 			reg-names = "wrapper", "core";
 			interrupts = <42 NRF_DEFAULT_IRQ_PRIORITY>;
-			status = "okay";
+			status = "disabled";
 		};
 	};
 };
diff --git a/dts/arm/nordic/nrf5340_cpuapp.dtsi b/dts/arm/nordic/nrf5340_cpuapp.dtsi
index ec59f40ab9c..c02f939a7fa 100644
--- a/dts/arm/nordic/nrf5340_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuapp.dtsi
@@ -34,7 +34,7 @@
 	};
 
 	chosen {
-		zephyr,entropy = &cryptocell;
+		zephyr,entropy = &rng_hci;
 		zephyr,flash-controller = &flash_controller;
 	};
 
@@ -103,7 +103,7 @@
 			reg = <0x50844000 0x1000>, <0x50845000 0x1000>;
 			reg-names = "wrapper", "core";
 			interrupts = <68 NRF_DEFAULT_IRQ_PRIORITY>;
-			status = "okay";
+			status = "disabled";
 		};
 	};
 
diff --git a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
index 5b0fda68586..33b0d2cd453 100644
--- a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
@@ -16,7 +16,6 @@ nvic: &cpuapp_nvic {};
 / {
 	chosen {
 		zephyr,bt-hci = &bt_hci_controller;
-		zephyr,entropy = &psa_rng;
 	};
 
 	soc {
@@ -27,7 +26,7 @@ nvic: &cpuapp_nvic {};
 
 	psa_rng: psa-rng {
 		compatible = "zephyr,psa-crypto-rng";
-		status = "okay";
+		status = "disabled";
 	};
 };
 
diff --git a/dts/arm/nordic/nrf91.dtsi b/dts/arm/nordic/nrf91.dtsi
index 5e65519929e..9a64ed92229 100644
--- a/dts/arm/nordic/nrf91.dtsi
+++ b/dts/arm/nordic/nrf91.dtsi
@@ -28,7 +28,6 @@
 	};
 
 	chosen {
-		zephyr,entropy = &cryptocell;
 		zephyr,flash-controller = &flash_controller;
 	};
 
@@ -52,7 +51,7 @@
 			reg = <0x50840000 0x1000>, <0x50841000 0x1000>;
 			reg-names = "wrapper", "core";
 			interrupts = <64 NRF_DEFAULT_IRQ_PRIORITY>;
-			status = "okay";
+			status = "disabled";
 		};
 
 		ctrlap: ctrlap@50006000 {
diff --git a/soc/nordic/common/Kconfig.peripherals b/soc/nordic/common/Kconfig.peripherals
index 9ea6ebc45c5..8ba97b225b9 100644
--- a/soc/nordic/common/Kconfig.peripherals
+++ b/soc/nordic/common/Kconfig.peripherals
@@ -13,12 +13,10 @@ config HAS_HW_NRF_BPROT
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_BPROT))
 
 config HAS_HW_NRF_CC310
-	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_310)) || \
-		 ($(dt_nodelabel_enabled,psa_rng) && SOC_SERIES_NRF91X)
+	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_310))
 
 config HAS_HW_NRF_CC312
-	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_312)) || \
-		 ($(dt_nodelabel_enabled,psa_rng) && SOC_NRF5340_CPUAPP)
+	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_312))
 
 config HAS_HW_NRF_CCM
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_CCM))

From a24ecfc01b4d2c221d970aef74e8f2a9b9117bb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:25 +0100
Subject: [PATCH 1380/2913] Revert "[nrf noup] boards: Add non-secure target
 for nrf54L15dk"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d651a29606395d80abe754ddbd12d73157f6c675.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf54l15dk/Kconfig              | 34 ----------
 boards/nordic/nrf54l15dk/Kconfig.defconfig    | 18 -----
 boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk   |  2 +-
 boards/nordic/nrf54l15dk/board.cmake          |  8 ---
 boards/nordic/nrf54l15dk/board.yml            |  2 -
 .../nrf54l15dk_nrf54l15_cpuapp_ns.dts         | 65 -------------------
 .../nrf54l15dk_nrf54l15_cpuapp_ns.yaml        | 22 -------
 .../nrf54l15dk_nrf54l15_cpuapp_ns_defconfig   | 31 ---------
 8 files changed, 1 insertion(+), 181 deletions(-)
 delete mode 100644 boards/nordic/nrf54l15dk/Kconfig
 delete mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts
 delete mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml
 delete mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig

diff --git a/boards/nordic/nrf54l15dk/Kconfig b/boards/nordic/nrf54l15dk/Kconfig
deleted file mode 100644
index c8890bc4498..00000000000
--- a/boards/nordic/nrf54l15dk/Kconfig
+++ /dev/null
@@ -1,34 +0,0 @@
-# nRF54L15 DK board configuration
-
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
-
-config NRF_MPC_REGION_SIZE
-	hex
-	default 0x1000
-	help
-	  Region size for the Memory Protection Controller (MPC) in bytes.
-
-config NRF_TRUSTZONE_FLASH_REGION_SIZE
-	hex
-	default NRF_MPC_REGION_SIZE
-	help
-	  This defines the flash region size from the TRUSTZONE perspective.
-	  It is used when configuring the TRUSTZONE and when setting alignments
-	  requirements for the partitions.
-	  This abstraction allows us to configure TRUSTZONE without depending
-	  on peripheral specific symbols.
-
-config NRF_TRUSTZONE_RAM_REGION_SIZE
-	hex
-	default NRF_MPC_REGION_SIZE
-	help
-	  This defines the RAM region size from the TRUSTZONE perspective.
-	  It is used when configuring the TRUSTZONE and when setting alignments
-	  requirements for the partitions.
-	  This abstraction allows us to configure TRUSTZONE without depending
-	  on peripheral specific symbols.
-
-endif #BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
diff --git a/boards/nordic/nrf54l15dk/Kconfig.defconfig b/boards/nordic/nrf54l15dk/Kconfig.defconfig
index bffc4ac3c86..d2d686fd576 100644
--- a/boards/nordic/nrf54l15dk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l15dk/Kconfig.defconfig
@@ -13,21 +13,3 @@ config ROM_START_OFFSET
 
 endif # BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
 	# BOARD_NRF54L15DK_NRF54L15_CPUAPP
-
-if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
-
-config BT_CTLR
-	default BT
-
-# By default, if we build for a Non-Secure version of the board,
-# enable building with TF-M as the Secure Execution Environment.
-config BUILD_WITH_TFM
-	default y if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
-
-# By default, if we build with TF-M, instruct build system to
-# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
-config TFM_FLASH_MERGED_BINARY
-	default y
-	depends on BUILD_WITH_TFM
-
-endif #BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
diff --git a/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk b/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk
index 57b90e2c516..25472cfff6c 100644
--- a/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk
+++ b/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk
@@ -4,6 +4,6 @@
 config BOARD_NRF54L15DK
 	select SOC_NRF54L05_CPUAPP if BOARD_NRF54L15DK_NRF54L05_CPUAPP
 	select SOC_NRF54L10_CPUAPP if BOARD_NRF54L15DK_NRF54L10_CPUAPP
-	select SOC_NRF54L15_CPUAPP if BOARD_NRF54L15DK_NRF54L15_CPUAPP || BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
+	select SOC_NRF54L15_CPUAPP if BOARD_NRF54L15DK_NRF54L15_CPUAPP
 	select SOC_NRF54L15_CPUFLPR if BOARD_NRF54L15DK_NRF54L15_CPUFLPR || \
 					    BOARD_NRF54L15DK_NRF54L15_CPUFLPR_XIP
diff --git a/boards/nordic/nrf54l15dk/board.cmake b/boards/nordic/nrf54l15dk/board.cmake
index 664cb158a6a..c69f8460c0a 100644
--- a/boards/nordic/nrf54l15dk/board.cmake
+++ b/boards/nordic/nrf54l15dk/board.cmake
@@ -9,13 +9,5 @@ elseif(CONFIG_SOC_NRF54L05_CPUFLPR OR CONFIG_SOC_NRF54L10_CPUFLPR OR
   board_runner_args(jlink "--speed=4000")
 endif()
 
-if(BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS)
-  set(TFM_PUBLIC_KEY_FORMAT "full")
-endif()
-
-if(CONFIG_TFM_FLASH_MERGED_BINARY)
-  set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex)
-endif()
-
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf54l15dk/board.yml b/boards/nordic/nrf54l15dk/board.yml
index f4214f09d28..f1a873cc35f 100644
--- a/boards/nordic/nrf54l15dk/board.yml
+++ b/boards/nordic/nrf54l15dk/board.yml
@@ -9,5 +9,3 @@ board:
     variants:
     - name: xip
       cpucluster: cpuflpr
-    - name: ns
-      cpucluster: cpuapp
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts
deleted file mode 100644
index e629a8b4ad7..00000000000
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-
-#define USE_NON_SECURE_ADDRESS_MAP 1
-
-#include <nordic/nrf54l15_cpuapp.dtsi>
-#include "nrf54l_05_10_15_cpuapp_common.dtsi"
-
-/ {
-	compatible = "nordic,nrf54l15dk_nrf54l15-cpuapp";
-	model = "Nordic nRF54L15 DK nRF54L15 Application MCU";
-
-	chosen {
-		zephyr,code-partition = &slot0_partition;
-		zephyr,sram = &cpuapp_sram;
-	};
-};
-
-&cpuapp_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-		boot_partition: partition@0 {
-			label = "mcuboot";
-			reg = <0x0 DT_SIZE_K(64)>;
-		};
-		slot0_partition: partition@10000 {
-			label = "image-0";
-			reg = <0x10000 DT_SIZE_K(324)>;
-		};
-		slot0_ns_partition: partition@61000 {
-			label = "image-0-nonsecure";
-			reg = <0x61000 DT_SIZE_K(324)>;
-		};
-		slot1_partition: partition@b2000 {
-			label = "image-1";
-			reg = <0xb2000 DT_SIZE_K(324)>;
-		};
-		slot1_ns_partition: partition@103000 {
-			label = "image-1-nonsecure";
-			reg = <0x103000 DT_SIZE_K(324)>;
-		};
-		/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
-		storage_partition: partition@15c000 {
-			label = "storage";
-			reg = <0x15c000 DT_SIZE_K(36)>;
-		};
-	};
-};
-
-&uart30 {
-	/* Disable so that TF-M can use this UART */
-	status = "disabled";
-
-	current-speed = <115200>;
-	pinctrl-0 = <&uart30_default>;
-	pinctrl-1 = <&uart30_sleep>;
-	pinctrl-names = "default", "sleep";
-};
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml
deleted file mode 100644
index 56b8e9618c0..00000000000
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
-
-identifier: nrf54l15dk/nrf54l15/cpuapp/ns
-name: nRF54l15-DK-nRF54l15-Application-Non-Secure
-type: mcu
-arch: arm
-toolchain:
-  - gnuarmemb
-  - xtools
-  - zephyr
-ram: 256
-flash: 1524
-supported:
-  - adc
-  - gpio
-  - i2c
-  - spi
-  - counter
-  - watchdog
-  - adc
-  - i2s
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig
deleted file mode 100644
index 70f01d7c9ba..00000000000
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
-
-# Enable MPU
-CONFIG_ARM_MPU=y
-
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
-CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
-
-# Enable TrustZone-M
-CONFIG_ARM_TRUSTZONE_M=y
-
-# This Board implies building Non-Secure firmware
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
-
-# Don't enable the cache in the non-secure image as it is a
-# secure-only peripheral on 54l
-CONFIG_CACHE_MANAGEMENT=n
-CONFIG_EXTERNAL_CACHE=n
-
-CONFIG_UART_CONSOLE=y
-CONFIG_CONSOLE=y
-CONFIG_SERIAL=y
-
-# Enable GPIO
-CONFIG_GPIO=y
-
-# Start SYSCOUNTER on driver init
-CONFIG_NRF_GRTC_START_SYSCOUNTER=y

From 9175992531e5c92c5be0fa08f698e8e0df1c399d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:25 +0100
Subject: [PATCH 1381/2913] Revert "[nrf fromtree] boards: nordic: nRF54L15DK:
 Add basic support for the L05 and L10 ICs"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2b2f0b6754af50b3d2231504d2625a0d4c7cf1bd.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf54l15dk/Kconfig.defconfig    |  6 +-
 boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk   |  2 -
 boards/nordic/nrf54l15dk/board.cmake          |  6 +-
 boards/nordic/nrf54l15dk/board.yml            |  2 -
 ...ommon.dtsi => nrf54l15_cpuapp_common.dtsi} | 34 ++++++++++
 .../nordic/nrf54l15dk/nrf54l15dk_common.dtsi  |  2 +-
 .../nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts | 63 -------------------
 .../nrf54l15dk_nrf54l05_cpuapp.yaml           | 24 -------
 .../nrf54l15dk_nrf54l05_cpuapp_defconfig      | 29 ---------
 .../nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts | 63 -------------------
 .../nrf54l15dk_nrf54l10_cpuapp.yaml           | 24 -------
 .../nrf54l15dk_nrf54l10_cpuapp_defconfig      | 29 ---------
 ....dtsi => nrf54l15dk_nrf54l15-pinctrl.dtsi} |  0
 .../nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts | 36 +----------
 .../boards/nrf54l15dk_nrf54l05_cpuapp.overlay |  8 ---
 .../boards/nrf54l15dk_nrf54l10_cpuapp.overlay |  8 ---
 .../boards/nrf54l15dk_nrf54l05_cpuapp.overlay | 43 -------------
 .../boards/nrf54l15dk_nrf54l10_cpuapp.overlay | 43 -------------
 .../boards/nrf54l15dk_nrf54l05_cpuapp.overlay |  9 ---
 .../boards/nrf54l15dk_nrf54l10_cpuapp.overlay |  9 ---
 tests/lib/cpp/cxx/testcase.yaml               |  4 +-
 21 files changed, 41 insertions(+), 403 deletions(-)
 rename boards/nordic/nrf54l15dk/{nrf54l_05_10_15_cpuapp_common.dtsi => nrf54l15_cpuapp_common.dtsi} (70%)
 delete mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts
 delete mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.yaml
 delete mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp_defconfig
 delete mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts
 delete mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.yaml
 delete mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_defconfig
 rename boards/nordic/nrf54l15dk/{nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi => nrf54l15dk_nrf54l15-pinctrl.dtsi} (100%)
 delete mode 100644 samples/drivers/watchdog/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
 delete mode 100644 samples/drivers/watchdog/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
 delete mode 100644 tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
 delete mode 100644 tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
 delete mode 100644 tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
 delete mode 100644 tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay

diff --git a/boards/nordic/nrf54l15dk/Kconfig.defconfig b/boards/nordic/nrf54l15dk/Kconfig.defconfig
index d2d686fd576..06a426bd8ed 100644
--- a/boards/nordic/nrf54l15dk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l15dk/Kconfig.defconfig
@@ -1,8 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
-	BOARD_NRF54L15DK_NRF54L15_CPUAPP
+if BOARD_NRF54L15DK_NRF54L15_CPUAPP
 
 config BT_CTLR
 	default BT
@@ -11,5 +10,4 @@ config ROM_START_OFFSET
 	default 0 if PARTITION_MANAGER_ENABLED
 	default 0x800 if BOOTLOADER_MCUBOOT
 
-endif # BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
-	# BOARD_NRF54L15DK_NRF54L15_CPUAPP
+endif # BOARD_NRF54L15DK_NRF54L15_CPUAPP
diff --git a/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk b/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk
index 25472cfff6c..e385ef84f89 100644
--- a/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk
+++ b/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk
@@ -2,8 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF54L15DK
-	select SOC_NRF54L05_CPUAPP if BOARD_NRF54L15DK_NRF54L05_CPUAPP
-	select SOC_NRF54L10_CPUAPP if BOARD_NRF54L15DK_NRF54L10_CPUAPP
 	select SOC_NRF54L15_CPUAPP if BOARD_NRF54L15DK_NRF54L15_CPUAPP
 	select SOC_NRF54L15_CPUFLPR if BOARD_NRF54L15DK_NRF54L15_CPUFLPR || \
 					    BOARD_NRF54L15DK_NRF54L15_CPUFLPR_XIP
diff --git a/boards/nordic/nrf54l15dk/board.cmake b/boards/nordic/nrf54l15dk/board.cmake
index c69f8460c0a..1fd92b7fced 100644
--- a/boards/nordic/nrf54l15dk/board.cmake
+++ b/boards/nordic/nrf54l15dk/board.cmake
@@ -1,11 +1,9 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_SOC_NRF54L05_CPUAPP OR CONFIG_SOC_NRF54L10_CPUAPP OR
-		CONFIG_SOC_NRF54L15_CPUAPP)
+if(CONFIG_SOC_NRF54L15_CPUAPP)
   board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
-elseif(CONFIG_SOC_NRF54L05_CPUFLPR OR CONFIG_SOC_NRF54L10_CPUFLPR OR
-		CONFIG_SOC_NRF54L15_CPUFLPR)
+elseif(CONFIG_SOC_NRF54L15_CPUFLPR)
   board_runner_args(jlink "--speed=4000")
 endif()
 
diff --git a/boards/nordic/nrf54l15dk/board.yml b/boards/nordic/nrf54l15dk/board.yml
index f1a873cc35f..8d750b3d14b 100644
--- a/boards/nordic/nrf54l15dk/board.yml
+++ b/boards/nordic/nrf54l15dk/board.yml
@@ -3,8 +3,6 @@ board:
   full_name: nRF54L15 DK
   vendor: nordic
   socs:
-  - name: nrf54l05
-  - name: nrf54l10
   - name: nrf54l15
     variants:
     - name: xip
diff --git a/boards/nordic/nrf54l15dk/nrf54l_05_10_15_cpuapp_common.dtsi b/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi
similarity index 70%
rename from boards/nordic/nrf54l15dk/nrf54l_05_10_15_cpuapp_common.dtsi
rename to boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi
index 323ebfd1a1b..f8714861936 100644
--- a/boards/nordic/nrf54l15dk/nrf54l_05_10_15_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi
@@ -6,6 +6,7 @@
 
 /* This file is common to the secure and non-secure domain */
 
+#include <nordic/nrf54l15_cpuapp.dtsi>
 #include "nrf54l15dk_common.dtsi"
 
 / {
@@ -51,6 +52,39 @@
 	status = "okay";
 };
 
+&cpuapp_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x0 DT_SIZE_K(64)>;
+		};
+		slot0_partition: partition@10000 {
+			label = "image-0";
+			reg = <0x10000 DT_SIZE_K(324)>;
+		};
+		slot0_ns_partition: partition@61000 {
+			label = "image-0-nonsecure";
+			reg = <0x61000 DT_SIZE_K(324)>;
+		};
+		slot1_partition: partition@b2000 {
+			label = "image-1";
+			reg = <0xb2000 DT_SIZE_K(324)>;
+		};
+		slot1_ns_partition: partition@103000 {
+			label = "image-1-nonsecure";
+			reg = <0x103000 DT_SIZE_K(324)>;
+		};
+		/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
+		storage_partition: partition@15c000 {
+			label = "storage";
+			reg = <0x15c000 DT_SIZE_K(36)>;
+		};
+	};
+};
+
 &uart20 {
 	status = "okay";
 };
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi b/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi
index 33cfebb55d6..02170276476 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi"
+#include "nrf54l15dk_nrf54l15-pinctrl.dtsi"
 
 / {
 	leds {
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts
deleted file mode 100644
index e2215ce1294..00000000000
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-
-#include <nordic/nrf54l05_cpuapp.dtsi>
-#include "nrf54l_05_10_15_cpuapp_common.dtsi"
-
-/ {
-	compatible = "nordic,nrf54l15dk_nrf54l05-cpuapp";
-	model = "Nordic nRF54L15 DK nRF54L05 Application MCU";
-
-	chosen {
-		zephyr,code-partition = &slot0_partition;
-		zephyr,sram = &cpuapp_sram;
-	};
-};
-
-/* FLPR not supported yet, give all SRAM and RRAM to the APP core */
-&cpuapp_sram {
-	reg = <0x20000000 DT_SIZE_K(96)>;
-	ranges = <0x0 0x20000000 DT_SIZE_K(96)>;
-};
-
-&cpuapp_rram {
-	reg = <0x0 DT_SIZE_K(500)>;
-};
-
-/* These partition sizes assume no FLPR area in RRAM */
-&cpuapp_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-		boot_partition: partition@0 {
-			label = "mcuboot";
-			reg = <0x0 DT_SIZE_K(64)>;
-		};
-		slot0_partition: partition@10000 {
-			label = "image-0";
-			reg = <0x10000 DT_SIZE_K(100)>;
-		};
-		slot0_ns_partition: partition@29000 {
-			label = "image-0-nonsecure";
-			reg = <0x29000 DT_SIZE_K(100)>;
-		};
-		slot1_partition: partition@42000 {
-			label = "image-1";
-			reg = <0x42000 DT_SIZE_K(100)>;
-		};
-		slot1_ns_partition: partition@5b000 {
-			label = "image-1-nonsecure";
-			reg = <0x5b000 DT_SIZE_K(100)>;
-		};
-		storage_partition: partition@74000 {
-			label = "storage";
-			reg = <0x74000 DT_SIZE_K(36)>;
-		};
-	};
-};
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.yaml b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.yaml
deleted file mode 100644
index 0c451b19a2e..00000000000
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54l15dk/nrf54l05/cpuapp
-name: nRF54L15-DK-nRF54L05-Application
-type: mcu
-arch: arm
-toolchain:
-  - gnuarmemb
-  - xtools
-  - zephyr
-sysbuild: true
-ram: 96
-flash: 100
-supported:
-  - adc
-  - counter
-  - gpio
-  - i2c
-  - pwm
-  - retained_mem
-  - spi
-  - watchdog
-  - i2s
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp_defconfig
deleted file mode 100644
index 02796a1361e..00000000000
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp_defconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-# Enable UART driver
-CONFIG_SERIAL=y
-
-# Enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-
-# Enable GPIO
-CONFIG_GPIO=y
-
-# Enable MPU
-CONFIG_ARM_MPU=y
-
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
-# MPU-based null-pointer dereferencing detection cannot
-# be applied as the (0x0 - 0x400) is unmapped for this target.
-CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
-
-# Enable Cache
-CONFIG_CACHE_MANAGEMENT=y
-CONFIG_EXTERNAL_CACHE=y
-
-# Start SYSCOUNTER on driver init
-CONFIG_NRF_GRTC_START_SYSCOUNTER=y
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts
deleted file mode 100644
index 1ae6be3e9e9..00000000000
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-
-#include <nordic/nrf54l10_cpuapp.dtsi>
-#include "nrf54l_05_10_15_cpuapp_common.dtsi"
-
-/ {
-	compatible = "nordic,nrf54l15dk_nrf54l10-cpuapp";
-	model = "Nordic nRF54L15 DK nRF54L10 Application MCU";
-
-	chosen {
-		zephyr,code-partition = &slot0_partition;
-		zephyr,sram = &cpuapp_sram;
-	};
-};
-
-/* FLPR not supported yet, give all SRAM and RRAM to the APP core */
-&cpuapp_sram {
-	reg = <0x20000000 DT_SIZE_K(192)>;
-	ranges = <0x0 0x20000000 DT_SIZE_K(192)>;
-};
-
-&cpuapp_rram {
-	reg = <0x0 DT_SIZE_K(1022)>;
-};
-
-/* These partition sizes assume no FLPR area in RRAM */
-&cpuapp_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-		boot_partition: partition@0 {
-			label = "mcuboot";
-			reg = <0x0 DT_SIZE_K(64)>;
-		};
-		slot0_partition: partition@10000 {
-			label = "image-0";
-			reg = <0x10000 DT_SIZE_K(230)>;
-		};
-		slot0_ns_partition: partition@49800 {
-			label = "image-0-nonsecure";
-			reg = <0x49800 DT_SIZE_K(230)>;
-		};
-		slot1_partition: partition@83000 {
-			label = "image-1";
-			reg = <0x83000 DT_SIZE_K(230)>;
-		};
-		slot1_ns_partition: partition@bc800 {
-			label = "image-1-nonsecure";
-			reg = <0xbc800 DT_SIZE_K(230)>;
-		};
-		storage_partition: partition@f6000 {
-			label = "storage";
-			reg = <0xf6000 DT_SIZE_K(38)>;
-		};
-	};
-};
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.yaml b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.yaml
deleted file mode 100644
index 63afb059b93..00000000000
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54l15dk/nrf54l10/cpuapp
-name: nRF54L15-DK-nRF54L10-Application
-type: mcu
-arch: arm
-toolchain:
-  - gnuarmemb
-  - xtools
-  - zephyr
-sysbuild: true
-ram: 192
-flash: 230
-supported:
-  - adc
-  - counter
-  - gpio
-  - i2c
-  - pwm
-  - retained_mem
-  - spi
-  - watchdog
-  - i2s
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_defconfig
deleted file mode 100644
index 02796a1361e..00000000000
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_defconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-# Enable UART driver
-CONFIG_SERIAL=y
-
-# Enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-
-# Enable GPIO
-CONFIG_GPIO=y
-
-# Enable MPU
-CONFIG_ARM_MPU=y
-
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
-# MPU-based null-pointer dereferencing detection cannot
-# be applied as the (0x0 - 0x400) is unmapped for this target.
-CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
-
-# Enable Cache
-CONFIG_CACHE_MANAGEMENT=y
-CONFIG_EXTERNAL_CACHE=y
-
-# Start SYSCOUNTER on driver init
-CONFIG_NRF_GRTC_START_SYSCOUNTER=y
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15-pinctrl.dtsi
similarity index 100%
rename from boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi
rename to boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15-pinctrl.dtsi
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts
index 79b16bd4125..b71f55c5fb4 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts
@@ -6,8 +6,7 @@
 
 /dts-v1/;
 
-#include <nordic/nrf54l15_cpuapp.dtsi>
-#include "nrf54l_05_10_15_cpuapp_common.dtsi"
+#include "nrf54l15_cpuapp_common.dtsi"
 
 / {
 	compatible = "nordic,nrf54l15dk_nrf54l15-cpuapp";
@@ -18,36 +17,3 @@
 		zephyr,sram = &cpuapp_sram;
 	};
 };
-
-&cpuapp_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-		boot_partition: partition@0 {
-			label = "mcuboot";
-			reg = <0x0 DT_SIZE_K(64)>;
-		};
-		slot0_partition: partition@10000 {
-			label = "image-0";
-			reg = <0x10000 DT_SIZE_K(324)>;
-		};
-		slot0_ns_partition: partition@61000 {
-			label = "image-0-nonsecure";
-			reg = <0x61000 DT_SIZE_K(324)>;
-		};
-		slot1_partition: partition@b2000 {
-			label = "image-1";
-			reg = <0xb2000 DT_SIZE_K(324)>;
-		};
-		slot1_ns_partition: partition@103000 {
-			label = "image-1-nonsecure";
-			reg = <0x103000 DT_SIZE_K(324)>;
-		};
-		/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
-		storage_partition: partition@15c000 {
-			label = "storage";
-			reg = <0x15c000 DT_SIZE_K(36)>;
-		};
-	};
-};
diff --git a/samples/drivers/watchdog/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/samples/drivers/watchdog/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
deleted file mode 100644
index 5c765a8a896..00000000000
--- a/samples/drivers/watchdog/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&wdt31 {
-	status = "okay";
-};
diff --git a/samples/drivers/watchdog/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/samples/drivers/watchdog/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
deleted file mode 100644
index 5c765a8a896..00000000000
--- a/samples/drivers/watchdog/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&wdt31 {
-	status = "okay";
-};
diff --git a/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
deleted file mode 100644
index 87707847eea..00000000000
--- a/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (c) 2024 Nordic Semiconductor ASA
- */
-
-/ {
-	zephyr,user {
-		io-channels = <&adc 0>, <&adc 1> , <&adc 2>;
-	};
-};
-
-&adc {
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
-		zephyr,input-positive = <NRF_SAADC_AIN1>;
-		zephyr,resolution = <10>;
-	};
-
-	channel@1 {
-		reg = <1>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_EXTERNAL0";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,input-positive = <NRF_SAADC_AIN4>;
-		zephyr,resolution = <12>;
-	};
-
-	channel@2 {
-		reg = <2>;
-		zephyr,gain = "ADC_GAIN_2_3";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
-		zephyr,input-positive = <NRF_SAADC_AIN2>;
-		zephyr,resolution = <10>;
-	};
-};
diff --git a/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
deleted file mode 100644
index 87707847eea..00000000000
--- a/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (c) 2024 Nordic Semiconductor ASA
- */
-
-/ {
-	zephyr,user {
-		io-channels = <&adc 0>, <&adc 1> , <&adc 2>;
-	};
-};
-
-&adc {
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
-		zephyr,input-positive = <NRF_SAADC_AIN1>;
-		zephyr,resolution = <10>;
-	};
-
-	channel@1 {
-		reg = <1>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_EXTERNAL0";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,input-positive = <NRF_SAADC_AIN4>;
-		zephyr,resolution = <12>;
-	};
-
-	channel@2 {
-		reg = <2>;
-		zephyr,gain = "ADC_GAIN_2_3";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
-		zephyr,input-positive = <NRF_SAADC_AIN2>;
-		zephyr,resolution = <10>;
-	};
-};
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
deleted file mode 100644
index 8d3dce3b380..00000000000
--- a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&wdt31 {
-	status = "okay";
-};
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
deleted file mode 100644
index 8d3dce3b380..00000000000
--- a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&wdt31 {
-	status = "okay";
-};
diff --git a/tests/lib/cpp/cxx/testcase.yaml b/tests/lib/cpp/cxx/testcase.yaml
index ef9cdf156cf..bd14285146d 100644
--- a/tests/lib/cpp/cxx/testcase.yaml
+++ b/tests/lib/cpp/cxx/testcase.yaml
@@ -34,11 +34,9 @@ tests:
   # -std=c++98)
   cpp.main.cpp98:
     arch_exclude: posix
-    # Exclude nRF54L series, nRF54H20 and nRF9280 as Nordic HAL is not compatible with C++98.
+    # Exclude nRF54L15, nRF54H20 and nRF9280 as Nordic HAL is not compatible with C++98.
     # Exclude CONFIG_HAS_RENESAS_RA_FSP as Renesas RA HAL is not compatible with C++98.
     platform_exclude:
-      - nrf54l15dk/nrf54l05/cpuapp
-      - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp

From 484568e4eaf84f8970b38db205859971445f7a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:25 +0100
Subject: [PATCH 1382/2913] Revert "[nrf fromtree] boards: nordic: nrf54l15dk:
 Rename the board common file"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a838f5afd7f6e14e90458203e0c9958b79d1b258.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi            | 2 +-
 .../{nrf54l15dk_common.dtsi => nrf54l15dk_nrf54l15-common.dtsi} | 0
 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts        | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename boards/nordic/nrf54l15dk/{nrf54l15dk_common.dtsi => nrf54l15dk_nrf54l15-common.dtsi} (100%)

diff --git a/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi b/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi
index f8714861936..191babb632f 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi
@@ -7,7 +7,7 @@
 /* This file is common to the secure and non-secure domain */
 
 #include <nordic/nrf54l15_cpuapp.dtsi>
-#include "nrf54l15dk_common.dtsi"
+#include "nrf54l15dk_nrf54l15-common.dtsi"
 
 / {
 	chosen {
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15-common.dtsi
similarity index 100%
rename from boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi
rename to boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15-common.dtsi
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts
index 2bc4ba292be..472e3f2b8d3 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts
@@ -6,7 +6,7 @@
 
 /dts-v1/;
 #include <nordic/nrf54l15_cpuflpr.dtsi>
-#include "nrf54l15dk_common.dtsi"
+#include "nrf54l15dk_nrf54l15-common.dtsi"
 
 / {
 	model = "Nordic nRF54L15 DK nRF54L15 FLPR MCU";

From 88bcbf1ccd8544d6fe18f560681d7a2e23712064 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:25 +0100
Subject: [PATCH 1383/2913] Revert "[nrf fromtree] soc: nordic: Introduce the
 nRF54L05 and nRF54L10"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 56e5537b7ff7bb777f368370c57e18c50656ea8c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/adc/adc_nrfx_saadc.c                  |    4 +-
 drivers/comparator/comparator_nrf_comp.c      |    2 +-
 drivers/comparator/comparator_nrf_lpcomp.c    |    2 +-
 .../nordic_vpr_launcher/nordic_vpr_launcher.c |    4 +-
 dts/arm/nordic/nrf54l05_cpuapp.dtsi           |    8 -
 dts/arm/nordic/nrf54l10_cpuapp.dtsi           |    8 -
 dts/arm/nordic/nrf54l15_cpuapp.dtsi           |   82 +-
 dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi    |   86 -
 dts/common/nordic/nrf54l05.dtsi               |   39 -
 dts/common/nordic/nrf54l10.dtsi               |   39 -
 dts/common/nordic/nrf54l15.dtsi               |  750 ++++++-
 dts/common/nordic/nrf54l_05_10_15.dtsi        |  734 -------
 dts/riscv/nordic/nrf54l05_cpuflpr.dtsi        |    8 -
 dts/riscv/nordic/nrf54l10_cpuflpr.dtsi        |    8 -
 dts/riscv/nordic/nrf54l15_cpuflpr.dtsi        |   61 +-
 dts/riscv/nordic/nrf54l_05_10_15_cpuflpr.dtsi |   65 -
 modules/hal_nordic/nrfx/CMakeLists.txt        |   12 +-
 modules/hal_nordic/nrfx/nrfx_config.h         |    8 -
 .../nrfx/nrfx_config_nrf54l05_application.h   | 1775 ----------------
 .../nrfx/nrfx_config_nrf54l05_flpr.h          | 1784 -----------------
 .../nrfx/nrfx_config_nrf54l10_application.h   | 1775 ----------------
 .../nrfx/nrfx_config_nrf54l10_flpr.h          | 1784 -----------------
 .../nrfx/nrfx_config_nrf54l15_application.h   |  170 +-
 .../nrfx/nrfx_config_nrf54l15_flpr.h          |  172 +-
 soc/nordic/nrf54l/Kconfig                     |   16 +-
 .../nrf54l/Kconfig.defconfig.nrf54l15_cpuapp  |   11 +
 ...lpr => Kconfig.defconfig.nrf54l15_cpuflpr} |    6 +-
 .../Kconfig.defconfig.nrf54l_05_10_15_cpuapp  |   11 -
 soc/nordic/nrf54l/Kconfig.soc                 |   38 -
 soc/nordic/soc.yml                            |   26 -
 soc/nordic/validate_base_addresses.c          |    2 +-
 tests/drivers/flash/negative_tests/src/main.c |    2 +-
 .../drivers/mbox/mbox_error_cases/src/main.c  |    3 +-
 .../watchdog/wdt_error_cases/src/main.c       |    3 +-
 tests/kernel/interrupt/src/nested_irq.c       |    2 +-
 35 files changed, 939 insertions(+), 8561 deletions(-)
 delete mode 100644 dts/arm/nordic/nrf54l05_cpuapp.dtsi
 delete mode 100644 dts/arm/nordic/nrf54l10_cpuapp.dtsi
 delete mode 100644 dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
 delete mode 100644 dts/common/nordic/nrf54l05.dtsi
 delete mode 100644 dts/common/nordic/nrf54l10.dtsi
 delete mode 100644 dts/common/nordic/nrf54l_05_10_15.dtsi
 delete mode 100644 dts/riscv/nordic/nrf54l05_cpuflpr.dtsi
 delete mode 100644 dts/riscv/nordic/nrf54l10_cpuflpr.dtsi
 delete mode 100644 dts/riscv/nordic/nrf54l_05_10_15_cpuflpr.dtsi
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l05_application.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l05_flpr.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l10_application.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l10_flpr.h
 create mode 100644 soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuapp
 rename soc/nordic/nrf54l/{Kconfig.defconfig.nrf54l_05_10_15_cpuflpr => Kconfig.defconfig.nrf54l15_cpuflpr} (52%)
 delete mode 100644 soc/nordic/nrf54l/Kconfig.defconfig.nrf54l_05_10_15_cpuapp

diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index c5b68f564a8..b8782d02454 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -31,7 +31,7 @@ static const uint8_t saadc_psels[NRF_SAADC_AIN7 + 1] = {
 	[NRF_SAADC_AIN6] = NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
 	[NRF_SAADC_AIN7] = NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
 };
-#elif defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || defined(CONFIG_SOC_NRF54L15)
+#elif defined(CONFIG_SOC_NRF54L15)
 static const uint32_t saadc_psels[NRF_SAADC_DVDD + 1] = {
 	[NRF_SAADC_AIN0] = NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
 	[NRF_SAADC_AIN1] = NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
@@ -667,7 +667,7 @@ static const struct adc_driver_api adc_nrfx_driver_api = {
 #ifdef CONFIG_ADC_ASYNC
 	.read_async    = adc_nrfx_read_async,
 #endif
-#if defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) ||  defined(CONFIG_SOC_NRF54L15)
+#if defined(CONFIG_SOC_NRF54L15)
 	.ref_internal  = 900,
 #elif defined(CONFIG_NRF_PLATFORM_HALTIUM)
 	.ref_internal  = 1024,
diff --git a/drivers/comparator/comparator_nrf_comp.c b/drivers/comparator/comparator_nrf_comp.c
index 383b852fc33..339d24f8dcd 100644
--- a/drivers/comparator/comparator_nrf_comp.c
+++ b/drivers/comparator/comparator_nrf_comp.c
@@ -78,7 +78,7 @@ static const uint32_t shim_nrf_comp_ain_map[] = {
 	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
-#elif defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || defined(CONFIG_SOC_NRF54L15)
+#elif defined(CONFIG_SOC_NRF54L15)
 	NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
diff --git a/drivers/comparator/comparator_nrf_lpcomp.c b/drivers/comparator/comparator_nrf_lpcomp.c
index cfb64bccf27..6c6710d337d 100644
--- a/drivers/comparator/comparator_nrf_lpcomp.c
+++ b/drivers/comparator/comparator_nrf_lpcomp.c
@@ -49,7 +49,7 @@ static const uint32_t shim_nrf_lpcomp_ain_map[] = {
 	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
-#elif defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) ||  defined(CONFIG_SOC_NRF54L15)
+#elif defined(CONFIG_SOC_NRF54L15)
 	NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
diff --git a/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c b/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
index 2c2915a7984..c688a97f654 100644
--- a/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
+++ b/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
@@ -14,7 +14,7 @@
 #include <zephyr/toolchain.h>
 
 #include <hal/nrf_vpr.h>
-#if defined(CONFIG_SOC_NRF54L_CPUAPP_COMMON) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
+#if defined(CONFIG_SOC_NRF54L15_CPUAPP) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
 #include <hal/nrf_spu.h>
 #endif
 
@@ -41,7 +41,7 @@ static int nordic_vpr_launcher_init(const struct device *dev)
 	}
 #endif
 
-#if defined(CONFIG_SOC_NRF54L_CPUAPP_COMMON) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
+#if defined(CONFIG_SOC_NRF54L15_CPUAPP) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
 	nrf_spu_periph_perm_secattr_set(NRF_SPU00, nrf_address_slave_get((uint32_t)config->vpr),
 					true);
 #endif
diff --git a/dts/arm/nordic/nrf54l05_cpuapp.dtsi b/dts/arm/nordic/nrf54l05_cpuapp.dtsi
deleted file mode 100644
index 45bdfea1f9c..00000000000
--- a/dts/arm/nordic/nrf54l05_cpuapp.dtsi
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <nordic/nrf54l05.dtsi>
-#include "nrf54l_05_10_15_cpuapp.dtsi"
diff --git a/dts/arm/nordic/nrf54l10_cpuapp.dtsi b/dts/arm/nordic/nrf54l10_cpuapp.dtsi
deleted file mode 100644
index cf8bc6ab5ea..00000000000
--- a/dts/arm/nordic/nrf54l10_cpuapp.dtsi
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <nordic/nrf54l10.dtsi>
-#include "nrf54l_05_10_15_cpuapp.dtsi"
diff --git a/dts/arm/nordic/nrf54l15_cpuapp.dtsi b/dts/arm/nordic/nrf54l15_cpuapp.dtsi
index 59ffca714dd..458d5a2e12a 100644
--- a/dts/arm/nordic/nrf54l15_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l15_cpuapp.dtsi
@@ -5,4 +5,84 @@
  */
 
 #include <nordic/nrf54l15.dtsi>
-#include "nrf54l_05_10_15_cpuapp.dtsi"
+
+cpu: &cpuapp {};
+systick: &cpuapp_systick {};
+nvic: &cpuapp_nvic {};
+
+/delete-node/ &cpuflpr;
+/delete-node/ &cpuflpr_rram;
+/delete-node/ &cpuflpr_sram;
+/delete-node/ &cpuflpr_clic;
+
+/ {
+	chosen {
+		zephyr,bt-hci = &bt_hci_controller;
+	};
+
+	soc {
+		compatible = "simple-bus";
+		interrupt-parent = <&cpuapp_nvic>;
+		ranges;
+	};
+
+	psa_rng: psa-rng {
+		compatible = "zephyr,psa-crypto-rng";
+		status = "disabled";
+	};
+};
+
+&bt_hci_controller {
+	status = "okay";
+};
+
+&cpuflpr_vpr {
+	cpuapp_vevif_rx: mailbox@1 {
+		compatible = "nordic,nrf-vevif-event-rx";
+		reg = <0x0 0x1000>;
+		status = "disabled";
+		interrupts = <76 NRF_DEFAULT_IRQ_PRIORITY>;
+		#mbox-cells = <1>;
+		nordic,events = <1>;
+		nordic,events-mask = <0x00100000>;
+	};
+
+	cpuapp_vevif_tx: mailbox@0 {
+		compatible = "nordic,nrf-vevif-task-tx";
+		reg = <0x0 0x1000>;
+		#mbox-cells = <1>;
+		nordic,tasks = <7>;
+		nordic,tasks-mask = <0x007f0000>;
+		status = "disabled";
+	};
+};
+
+&cpuapp_ppb {
+	compatible = "simple-bus";
+	ranges;
+};
+
+&grtc {
+#ifdef USE_NON_SECURE_ADDRESS_MAP
+	interrupts = <227 NRF_DEFAULT_IRQ_PRIORITY>,
+#else
+	interrupts = <228 NRF_DEFAULT_IRQ_PRIORITY>,
+#endif
+		<229 NRF_DEFAULT_IRQ_PRIORITY>; /* reserved for Zero Latency IRQs */
+};
+
+&gpiote20 {
+#ifdef USE_NON_SECURE_ADDRESS_MAP
+	interrupts = <218 NRF_DEFAULT_IRQ_PRIORITY>;
+#else
+	interrupts = <219 NRF_DEFAULT_IRQ_PRIORITY>;
+#endif
+};
+
+&gpiote30 {
+#ifdef USE_NON_SECURE_ADDRESS_MAP
+	interrupts = <268 NRF_DEFAULT_IRQ_PRIORITY>;
+#else
+	interrupts = <269 NRF_DEFAULT_IRQ_PRIORITY>;
+#endif
+};
diff --git a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
deleted file mode 100644
index 33b0d2cd453..00000000000
--- a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-cpu: &cpuapp {};
-systick: &cpuapp_systick {};
-nvic: &cpuapp_nvic {};
-
-/delete-node/ &cpuflpr;
-/delete-node/ &cpuflpr_rram;
-/delete-node/ &cpuflpr_sram;
-/delete-node/ &cpuflpr_clic;
-
-/ {
-	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
-	};
-
-	soc {
-		compatible = "simple-bus";
-		interrupt-parent = <&cpuapp_nvic>;
-		ranges;
-	};
-
-	psa_rng: psa-rng {
-		compatible = "zephyr,psa-crypto-rng";
-		status = "disabled";
-	};
-};
-
-&bt_hci_controller {
-	status = "okay";
-};
-
-&cpuflpr_vpr {
-	cpuapp_vevif_rx: mailbox@1 {
-		compatible = "nordic,nrf-vevif-event-rx";
-		reg = <0x0 0x1000>;
-		status = "disabled";
-		interrupts = <76 NRF_DEFAULT_IRQ_PRIORITY>;
-		#mbox-cells = <1>;
-		nordic,events = <1>;
-		nordic,events-mask = <0x00100000>;
-	};
-
-	cpuapp_vevif_tx: mailbox@0 {
-		compatible = "nordic,nrf-vevif-task-tx";
-		reg = <0x0 0x1000>;
-		#mbox-cells = <1>;
-		nordic,tasks = <7>;
-		nordic,tasks-mask = <0x007f0000>;
-		status = "disabled";
-	};
-};
-
-&cpuapp_ppb {
-	compatible = "simple-bus";
-	ranges;
-};
-
-&grtc {
-#ifdef USE_NON_SECURE_ADDRESS_MAP
-	interrupts = <227 NRF_DEFAULT_IRQ_PRIORITY>,
-#else
-	interrupts = <228 NRF_DEFAULT_IRQ_PRIORITY>,
-#endif
-		<229 NRF_DEFAULT_IRQ_PRIORITY>; /* reserved for Zero Latency IRQs */
-};
-
-&gpiote20 {
-#ifdef USE_NON_SECURE_ADDRESS_MAP
-	interrupts = <218 NRF_DEFAULT_IRQ_PRIORITY>;
-#else
-	interrupts = <219 NRF_DEFAULT_IRQ_PRIORITY>;
-#endif
-};
-
-&gpiote30 {
-#ifdef USE_NON_SECURE_ADDRESS_MAP
-	interrupts = <268 NRF_DEFAULT_IRQ_PRIORITY>;
-#else
-	interrupts = <269 NRF_DEFAULT_IRQ_PRIORITY>;
-#endif
-};
diff --git a/dts/common/nordic/nrf54l05.dtsi b/dts/common/nordic/nrf54l05.dtsi
deleted file mode 100644
index 747fea0c549..00000000000
--- a/dts/common/nordic/nrf54l05.dtsi
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf54l_05_10_15.dtsi"
-
-&cpuapp_sram {
-	reg = <0x20000000 DT_SIZE_K(72)>;
-	ranges = <0x0 0x20000000 DT_SIZE_K(72)>;
-};
-
-/* 72 + 24 = 96KB */
-/ {
-	soc {
-		cpuflpr_sram: memory@20012000 {
-			compatible = "mmio-sram";
-			reg = <0x20012000 DT_SIZE_K(24)>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0x0 0x20012000 DT_SIZE_K(24)>;
-		};
-	};
-};
-
-&cpuapp_rram {
-	reg = <0x0 DT_SIZE_K(470)>;
-};
-
-/* 470 + 30 = 500KB */
-&rram_controller {
-	cpuflpr_rram: rram@75800 {
-		compatible = "soc-nv-flash";
-		reg = <0x75800 DT_SIZE_K(30)>;
-		erase-block-size = <4096>;
-		write-block-size = <16>;
-	};
-};
diff --git a/dts/common/nordic/nrf54l10.dtsi b/dts/common/nordic/nrf54l10.dtsi
deleted file mode 100644
index a515fbb42f5..00000000000
--- a/dts/common/nordic/nrf54l10.dtsi
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf54l_05_10_15.dtsi"
-
-&cpuapp_sram {
-	reg = <0x20000000 DT_SIZE_K(144)>;
-	ranges = <0x0 0x20000000 DT_SIZE_K(144)>;
-};
-
-/* 144 + 48 = 192KB */
-/ {
-	soc {
-		cpuflpr_sram: memory@20024000 {
-			compatible = "mmio-sram";
-			reg = <0x20024000 DT_SIZE_K(48)>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0x0 0x20024000 DT_SIZE_K(48)>;
-		};
-	};
-};
-
-&cpuapp_rram {
-	reg = <0x0 DT_SIZE_K(960)>;
-};
-
-/* 960 + 62 = 1022KB */
-&rram_controller {
-	cpuflpr_rram: rram@f0000 {
-		compatible = "soc-nv-flash";
-		reg = <0xf0000 DT_SIZE_K(62)>;
-		erase-block-size = <4096>;
-		write-block-size = <16>;
-	};
-};
diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index 56c97ae87ac..5a49efd468d 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -4,36 +4,748 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "nrf54l_05_10_15.dtsi"
+#include <mem.h>
+#include <nordic/nrf_common.dtsi>
+#include <zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h>
+#include <zephyr/dt-bindings/regulator/nrf5x.h>
 
-&cpuapp_sram {
-	reg = <0x20000000 DT_SIZE_K(188)>;
-	ranges = <0x0 0x20000000 DT_SIZE_K(188)>;
-};
+/delete-node/ &sw_pwm;
+
+/* Domain IDs. Can be used to specify channel links in IPCT nodes. */
+#define NRF_DOMAIN_ID_APPLICATION 0
+#define NRF_DOMAIN_ID_FLPR 1
 
-/* 188 + 68 = 256KB */
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpuapp: cpu@0 {
+			compatible = "arm,cortex-m33f";
+			reg = <0>;
+			device_type = "cpu";
+			clock-frequency = <DT_FREQ_M(128)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			itm: itm@e0000000 {
+				compatible = "arm,armv8m-itm";
+				reg = <0xe0000000 0x1000>;
+				swo-ref-frequency = <DT_FREQ_M(128)>;
+			};
+		};
+
+		cpuflpr: cpu@1 {
+			compatible = "nordic,vpr";
+			reg = <1>;
+			device_type = "cpu";
+			clock-frequency = <DT_FREQ_M(128)>;
+			riscv,isa = "rv32emc";
+			nordic,bus-width = <32>;
+		};
+	};
+
+	clocks {
+		lfxo: lfxo {
+			compatible = "nordic,nrf-lfxo";
+			#clock-cells = <0>;
+			clock-frequency = <32768>;
+		};
+
+		hfxo: hfxo {
+			compatible = "nordic,nrf-hfxo";
+			#clock-cells = <0>;
+			clock-frequency = <DT_FREQ_M(32)>;
+		};
+	};
+
 	soc {
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+#ifdef USE_NON_SECURE_ADDRESS_MAP
+		/* intentionally empty because UICR is hardware fixed to Secure */
+#else
+		uicr: uicr@ffd000 {
+			compatible = "nordic,nrf-uicr";
+			reg = <0xffd000 0x1000>;
+		};
+#endif
+		ficr: ficr@ffc000 {
+			compatible = "nordic,nrf-ficr";
+			reg = <0xffc000 0x1000>;
+			#nordic,ficr-cells = <1>;
+		};
+
+		cpuapp_sram: memory@20000000 {
+			compatible = "mmio-sram";
+			reg = <0x20000000 DT_SIZE_K(188)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x20000000 0x2f000>;
+		};
+
 		cpuflpr_sram: memory@2002f000 {
 			compatible = "mmio-sram";
 			reg = <0x2002f000 DT_SIZE_K(68)>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0x0 0x2002f000 DT_SIZE_K(68)>;
+			ranges = <0x0 0x2002f000 0x11000>;
 		};
-	};
-};
 
-&cpuapp_rram {
-	reg = <0x0 DT_SIZE_K(1428)>;
-};
+#ifdef USE_NON_SECURE_ADDRESS_MAP
+		global_peripherals: peripheral@40000000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x40000000 0x10000000>;
+#else
+		global_peripherals: peripheral@50000000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x50000000 0x10000000>;
+#endif
+
+			dppic00: dppic@42000 {
+				compatible = "nordic,nrf-dppic";
+				reg = <0x42000 0x808>;
+				status = "disabled";
+			};
+
+			ppib00: ppib@43000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x43000 0x1000>;
+				status = "disabled";
+			};
+
+			ppib01: ppib@44000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x44000 0x1000>;
+				status = "disabled";
+			};
+
+			spi00: spi@4a000 {
+				/*
+				 * This spi node can be either SPIM or SPIS,
+				 * for the user to pick:
+				 * compatible = "nordic,nrf-spim" or
+				 *              "nordic,nrf-spis".
+				 */
+				compatible = "nordic,nrf-spim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0x4a000 0x1000>;
+				interrupts = <74 NRF_DEFAULT_IRQ_PRIORITY>;
+				max-frequency = <DT_FREQ_M(32)>;
+				easydma-maxcnt-bits = <16>;
+				rx-delay-supported;
+				rx-delay = <1>;
+				status = "disabled";
+			};
+
+			uart00: uart@4a000 {
+				compatible = "nordic,nrf-uarte";
+				reg = <0x4a000 0x1000>;
+				interrupts = <74 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				endtx-stoptx-supported;
+				frame-timeout-supported;
+			};
+
+			cpuflpr_vpr: vpr@4c000 {
+				compatible = "nordic,nrf-vpr-coprocessor";
+				reg = <0x4c000 0x1000>;
+				ranges = <0x0 0x4c000 0x1000>;
+				#address-cells = <1>;
+				#size-cells = <1>;
+				status = "disabled";
+
+				cpuflpr_clic: interrupt-controller@f0000000 {
+					compatible = "nordic,nrf-clic";
+					reg = <0xf0000000 0x1780>;
+					interrupt-controller;
+					#interrupt-cells = <2>;
+					#address-cells = <1>;
+					status = "disabled";
+				};
+			};
+
+			gpio2: gpio@50400 {
+				compatible = "nordic,nrf-gpio";
+				gpio-controller;
+				reg = <0x50400 0x300>;
+				#gpio-cells = <2>;
+				ngpios = <11>;
+				status = "disabled";
+				port = <2>;
+			};
+
+			timer00: timer@55000 {
+				compatible = "nordic,nrf-timer";
+				status = "disabled";
+				reg = <0x55000 0x1000>;
+				cc-num = <6>;
+				max-bit-width = <32>;
+				interrupts = <85 NRF_DEFAULT_IRQ_PRIORITY>;
+				max-frequency = <DT_FREQ_M(128)>;
+				prescaler = <0>;
+			};
+
+			dppic10: dppic@82000 {
+				compatible = "nordic,nrf-dppic";
+				reg = <0x82000 0x808>;
+				status = "disabled";
+			};
+
+			ppib10: ppib@83000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x83000 0x1000>;
+				status = "disabled";
+			};
+
+			ppib11: ppib@84000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x84000 0x1000>;
+				status = "disabled";
+			};
+
+			timer10: timer@85000 {
+				compatible = "nordic,nrf-timer";
+				status = "disabled";
+				reg = <0x85000 0x1000>;
+				cc-num = <8>;
+				max-bit-width = <32>;
+				interrupts = <133 NRF_DEFAULT_IRQ_PRIORITY>;
+				max-frequency = <DT_FREQ_M(32)>;
+				prescaler = <0>;
+			};
+
+			egu10: egu@87000 {
+				compatible = "nordic,nrf-egu";
+				reg = <0x87000 0x1000>;
+				interrupts = <135 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+
+			radio: radio@8a000 {
+				compatible = "nordic,nrf-radio";
+				reg = <0x8a000 0x1000>;
+				interrupts = <138 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				dfe-supported;
+				ieee802154-supported;
+				ble-2mbps-supported;
+				ble-coded-phy-supported;
+				cs-supported;
+
+				ieee802154: ieee802154 {
+					compatible = "nordic,nrf-ieee802154";
+					status = "disabled";
+				};
+
+				/* Note: In the nRF Connect SDK the SoftDevice Controller
+				 * is added and set as the default Bluetooth Controller.
+				 */
+				bt_hci_controller: bt_hci_controller {
+					compatible = "zephyr,bt-hci-ll-sw-split";
+					status = "disabled";
+				};
+			};
+
+			dppic20: dppic@c2000 {
+				compatible = "nordic,nrf-dppic";
+				reg = <0xc2000 0x808>;
+				status = "disabled";
+			};
+
+			ppib20: ppib@c3000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0xc3000 0x1000>;
+				status = "disabled";
+			};
+
+			ppib21: ppib@c4000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0xc4000 0x1000>;
+				status = "disabled";
+			};
+
+			ppib22: ppib@c5000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0xc5000 0x1000>;
+				status = "disabled";
+			};
+
+			i2c20: i2c@c6000 {
+				compatible = "nordic,nrf-twim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xc6000 0x1000>;
+				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
+				easydma-maxcnt-bits = <16>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+
+			spi20: spi@c6000 {
+				/*
+				 * This spi node can be either SPIM or SPIS,
+				 * for the user to pick:
+				 * compatible = "nordic,nrf-spim" or
+				 *              "nordic,nrf-spis".
+				 */
+				compatible = "nordic,nrf-spim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xc6000 0x1000>;
+				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
+				max-frequency = <DT_FREQ_M(8)>;
+				easydma-maxcnt-bits = <16>;
+				rx-delay-supported;
+				rx-delay = <1>;
+				status = "disabled";
+			};
 
-/* 1428 + 96 = 1524KB */
-&rram_controller {
-	cpuflpr_rram: rram@165000 {
-		compatible = "soc-nv-flash";
-		reg = <0x165000 DT_SIZE_K(96)>;
-		erase-block-size = <4096>;
-		write-block-size = <16>;
+			uart20: uart@c6000 {
+				compatible = "nordic,nrf-uarte";
+				reg = <0xc6000 0x1000>;
+				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				endtx-stoptx-supported;
+				frame-timeout-supported;
+			};
+
+			i2c21: i2c@c7000 {
+				compatible = "nordic,nrf-twim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xc7000 0x1000>;
+				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
+				easydma-maxcnt-bits = <16>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+
+			spi21: spi@c7000 {
+				/*
+				 * This spi node can be either SPIM or SPIS,
+				 * for the user to pick:
+				 * compatible = "nordic,nrf-spim" or
+				 *              "nordic,nrf-spis".
+				 */
+				compatible = "nordic,nrf-spim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xc7000 0x1000>;
+				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
+				max-frequency = <DT_FREQ_M(8)>;
+				easydma-maxcnt-bits = <16>;
+				rx-delay-supported;
+				rx-delay = <1>;
+				status = "disabled";
+			};
+
+			uart21: uart@c7000 {
+				compatible = "nordic,nrf-uarte";
+				reg = <0xc7000 0x1000>;
+				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				endtx-stoptx-supported;
+				frame-timeout-supported;
+			};
+
+			i2c22: i2c@c8000 {
+				compatible = "nordic,nrf-twim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xc8000 0x1000>;
+				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
+				easydma-maxcnt-bits = <16>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+
+			spi22: spi@c8000 {
+				/*
+				 * This spi node can be either SPIM or SPIS,
+				 * for the user to pick:
+				 * compatible = "nordic,nrf-spim" or
+				 *              "nordic,nrf-spis".
+				 */
+				compatible = "nordic,nrf-spim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xc8000 0x1000>;
+				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
+				max-frequency = <DT_FREQ_M(8)>;
+				easydma-maxcnt-bits = <16>;
+				rx-delay-supported;
+				rx-delay = <1>;
+				status = "disabled";
+			};
+
+			uart22: uart@c8000 {
+				compatible = "nordic,nrf-uarte";
+				reg = <0xc8000 0x1000>;
+				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				endtx-stoptx-supported;
+				frame-timeout-supported;
+			};
+
+			egu20: egu@c9000 {
+				compatible = "nordic,nrf-egu";
+				reg = <0xc9000 0x1000>;
+				interrupts = <201 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+
+			timer20: timer@ca000 {
+				compatible = "nordic,nrf-timer";
+				status = "disabled";
+				reg = <0xca000 0x1000>;
+				cc-num = <6>;
+				max-bit-width = <32>;
+				interrupts = <202 NRF_DEFAULT_IRQ_PRIORITY>;
+				prescaler = <0>;
+			};
+
+			timer21: timer@cb000 {
+				compatible = "nordic,nrf-timer";
+				status = "disabled";
+				reg = <0xcb000 0x1000>;
+				cc-num = <6>;
+				max-bit-width = <32>;
+				interrupts = <203 NRF_DEFAULT_IRQ_PRIORITY>;
+				prescaler = <0>;
+			};
+
+			timer22: timer@cc000 {
+				compatible = "nordic,nrf-timer";
+				status = "disabled";
+				reg = <0xcc000 0x1000>;
+				cc-num = <6>;
+				max-bit-width = <32>;
+				interrupts = <204 NRF_DEFAULT_IRQ_PRIORITY>;
+				prescaler = <0>;
+			};
+
+			timer23: timer@cd000 {
+				compatible = "nordic,nrf-timer";
+				status = "disabled";
+				reg = <0xcd000 0x1000>;
+				cc-num = <6>;
+				max-bit-width = <32>;
+				interrupts = <205 NRF_DEFAULT_IRQ_PRIORITY>;
+				prescaler = <0>;
+			};
+
+			timer24: timer@ce000 {
+				compatible = "nordic,nrf-timer";
+				status = "disabled";
+				reg = <0xce000 0x1000>;
+				cc-num = <6>;
+				max-bit-width = <32>;
+				interrupts = <206 NRF_DEFAULT_IRQ_PRIORITY>;
+				prescaler = <0>;
+			};
+
+			pdm20: pdm@d0000 {
+				compatible = "nordic,nrf-pdm";
+				status = "disabled";
+				reg = <0xd0000 0x1000>;
+				interrupts = <208 NRF_DEFAULT_IRQ_PRIORITY>;
+			};
+
+			pdm21: pdm@d1000 {
+				compatible = "nordic,nrf-pdm";
+				status = "disabled";
+				reg = <0xd1000 0x1000>;
+				interrupts = <209 NRF_DEFAULT_IRQ_PRIORITY>;
+			};
+
+			pwm20: pwm@d2000 {
+				compatible = "nordic,nrf-pwm";
+				status = "disabled";
+				reg = <0xd2000 0x1000>;
+				interrupts = <210 NRF_DEFAULT_IRQ_PRIORITY>;
+				#pwm-cells = <3>;
+			};
+
+			pwm21: pwm@d3000 {
+				compatible = "nordic,nrf-pwm";
+				status = "disabled";
+				reg = <0xd3000 0x1000>;
+				interrupts = <211 NRF_DEFAULT_IRQ_PRIORITY>;
+				#pwm-cells = <3>;
+			};
+
+			pwm22: pwm@d4000 {
+				compatible = "nordic,nrf-pwm";
+				status = "disabled";
+				reg = <0xd4000 0x1000>;
+				interrupts = <212 NRF_DEFAULT_IRQ_PRIORITY>;
+				#pwm-cells = <3>;
+			};
+
+			adc: adc@d5000 {
+				compatible = "nordic,nrf-saadc";
+				reg = <0xd5000 0x1000>;
+				interrupts = <213 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				#io-channel-cells = <1>;
+			};
+
+			nfct: nfct@d6000 {
+				compatible = "nordic,nrf-nfct";
+				reg = <0xd6000 0x1000>;
+				interrupts = <214 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+
+			temp: temp@d7000 {
+				compatible = "nordic,nrf-temp";
+				reg = <0xd7000 0x1000>;
+				interrupts = <215 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+
+			gpio1: gpio@d8200 {
+				compatible = "nordic,nrf-gpio";
+				gpio-controller;
+				reg = <0xd8200 0x300>;
+				#gpio-cells = <2>;
+				ngpios = <16>;
+				status = "disabled";
+				port = <1>;
+				gpiote-instance = <&gpiote20>;
+			};
+
+			gpiote20: gpiote@da000 {
+				compatible = "nordic,nrf-gpiote";
+				reg = <0xda000 0x1000>;
+				status = "disabled";
+				instance = <20>;
+			};
+
+			i2s20: i2s@dd000 {
+				compatible = "nordic,nrf-i2s";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xdd000 0x1000>;
+				interrupts = <221 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+
+			qdec20: qdec@e0000 {
+				compatible = "nordic,nrf-qdec";
+				reg = <0xe0000 0x1000>;
+				interrupts = <224 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+
+			qdec21: qdec@e1000 {
+				compatible = "nordic,nrf-qdec";
+				reg = <0xe1000 0x1000>;
+				interrupts = <225 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+
+			grtc: grtc@e2000 {
+				compatible = "nordic,nrf-grtc";
+				reg = <0xe2000 0x1000>;
+				cc-num = <12>;
+				status = "disabled";
+			};
+
+			dppic30: dppic@102000 {
+				compatible = "nordic,nrf-dppic";
+				reg = <0x102000 0x808>;
+				status = "disabled";
+			};
+
+			ppib30: ppib@103000 {
+				compatible = "nordic,nrf-ppib";
+				reg = <0x103000 0x1000>;
+				status = "disabled";
+			};
+
+			i2c30: i2c@104000 {
+				compatible = "nordic,nrf-twim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0x104000 0x1000>;
+				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
+				easydma-maxcnt-bits = <16>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+
+			spi30: spi@104000 {
+				/*
+				 * This spi node can be either SPIM or SPIS,
+				 * for the user to pick:
+				 * compatible = "nordic,nrf-spim" or
+				 *              "nordic,nrf-spis".
+				 */
+				compatible = "nordic,nrf-spim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0x104000 0x1000>;
+				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
+				max-frequency = <DT_FREQ_M(8)>;
+				easydma-maxcnt-bits = <16>;
+				rx-delay-supported;
+				rx-delay = <1>;
+				status = "disabled";
+			};
+
+			uart30: uart@104000 {
+				compatible = "nordic,nrf-uarte";
+				reg = <0x104000 0x1000>;
+				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				endtx-stoptx-supported;
+				frame-timeout-supported;
+			};
+
+			comp: comparator@106000 {
+				/*
+				 * Use compatible "nordic,nrf-comp" to configure as COMP
+				 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
+				 */
+				compatible = "nordic,nrf-comp";
+				reg = <0x106000 0x1000>;
+				status = "disabled";
+				interrupts = <262 NRF_DEFAULT_IRQ_PRIORITY>;
+			};
+
+#ifdef USE_NON_SECURE_ADDRESS_MAP
+			/* intentionally empty because WDT30 is hardware fixed to Secure */
+#else
+			wdt30: watchdog@108000 {
+				compatible = "nordic,nrf-wdt";
+				reg = <0x108000 0x620>;
+				interrupts = <264 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+#endif
+
+			wdt31: watchdog@109000 {
+				compatible = "nordic,nrf-wdt";
+				reg = <0x109000 0x620>;
+				interrupts = <265 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+
+			gpio0: gpio@10a000 {
+				compatible = "nordic,nrf-gpio";
+				gpio-controller;
+				reg = <0x10a000 0x300>;
+				#gpio-cells = <2>;
+				ngpios = <5>;
+				status = "disabled";
+				port = <0>;
+				gpiote-instance = <&gpiote30>;
+			};
+
+			gpiote30: gpiote@10c000 {
+				compatible = "nordic,nrf-gpiote";
+				reg = <0x10c000 0x1000>;
+				status = "disabled";
+				instance = <30>;
+			};
+
+			clock: clock@10e000 {
+				compatible = "nordic,nrf-clock";
+				reg = <0x10e000 0x1000>;
+				interrupts = <270 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+			};
+
+			power: power@10e000 {
+				compatible = "nordic,nrf-power";
+				reg = <0x10e000 0x1000>;
+				ranges = <0x0 0x10e000 0x1000>;
+				interrupts = <270 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				gpregret1: gpregret1@51c {
+					#address-cells = <1>;
+					#size-cells = <1>;
+					compatible = "nordic,nrf-gpregret";
+					reg = <0x51c 0x1>;
+					status = "disabled";
+				};
+
+				gpregret2: gpregret2@520 {
+					#address-cells = <1>;
+					#size-cells = <1>;
+					compatible = "nordic,nrf-gpregret";
+					reg = <0x520 0x1>;
+					status = "disabled";
+				};
+			};
+
+			regulators: regulator@120000 {
+				compatible = "nordic,nrf54l-regulators";
+				reg = <0x120000 0x1000>;
+				status = "disabled";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				vregmain: regulator@120600 {
+					compatible = "nordic,nrf5x-regulator";
+					reg = <0x120600 0x1>;
+					status = "disabled";
+					regulator-name = "VREGMAIN";
+					regulator-initial-mode = <NRF5X_REG_MODE_LDO>;
+				};
+			};
+		};
+
+		rram_controller: rram-controller@5004b000 {
+			compatible = "nordic,rram-controller";
+			reg = <0x5004b000 0x1000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			interrupts = <75 NRF_DEFAULT_IRQ_PRIORITY>;
+
+			cpuapp_rram: rram@0 {
+				compatible = "soc-nv-flash";
+				reg = <0x0 DT_SIZE_K(1428)>;
+				erase-block-size = <4096>;
+				write-block-size = <16>;
+			};
+			cpuflpr_rram: rram@165000 {
+				compatible = "soc-nv-flash";
+				reg = <0x165000 DT_SIZE_K(96)>;
+				erase-block-size = <4096>;
+				write-block-size = <16>;
+			};
+		};
+
+		cpuapp_ppb: cpuapp-ppb-bus {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			cpuapp_nvic: interrupt-controller@e000e100  {
+				#address-cells = <1>;
+				compatible = "arm,v8m-nvic";
+				reg = <0xe000e100 0xc00>;
+				arm,num-irq-priority-bits = <3>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+			};
+
+			cpuapp_systick: timer@e000e010 {
+				compatible = "arm,armv8m-systick";
+				reg = <0xe000e010 0x10>;
+				status = "disabled";
+			};
+		};
 	};
 };
diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi
deleted file mode 100644
index 04fae0272bc..00000000000
--- a/dts/common/nordic/nrf54l_05_10_15.dtsi
+++ /dev/null
@@ -1,734 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <mem.h>
-#include <nordic/nrf_common.dtsi>
-#include <zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h>
-#include <zephyr/dt-bindings/regulator/nrf5x.h>
-
-/delete-node/ &sw_pwm;
-
-/* Domain IDs. Can be used to specify channel links in IPCT nodes. */
-#define NRF_DOMAIN_ID_APPLICATION 0
-#define NRF_DOMAIN_ID_FLPR 1
-
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpuapp: cpu@0 {
-			compatible = "arm,cortex-m33f";
-			reg = <0>;
-			device_type = "cpu";
-			clock-frequency = <DT_FREQ_M(128)>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			itm: itm@e0000000 {
-				compatible = "arm,armv8m-itm";
-				reg = <0xe0000000 0x1000>;
-				swo-ref-frequency = <DT_FREQ_M(128)>;
-			};
-		};
-
-		cpuflpr: cpu@1 {
-			compatible = "nordic,vpr";
-			reg = <1>;
-			device_type = "cpu";
-			clock-frequency = <DT_FREQ_M(128)>;
-			riscv,isa = "rv32emc";
-			nordic,bus-width = <32>;
-		};
-	};
-
-	clocks {
-		lfxo: lfxo {
-			compatible = "nordic,nrf-lfxo";
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
-
-		hfxo: hfxo {
-			compatible = "nordic,nrf-hfxo";
-			#clock-cells = <0>;
-			clock-frequency = <DT_FREQ_M(32)>;
-		};
-	};
-
-	soc {
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-#ifdef USE_NON_SECURE_ADDRESS_MAP
-		/* intentionally empty because UICR is hardware fixed to Secure */
-#else
-		uicr: uicr@ffd000 {
-			compatible = "nordic,nrf-uicr";
-			reg = <0xffd000 0x1000>;
-		};
-#endif
-		ficr: ficr@ffc000 {
-			compatible = "nordic,nrf-ficr";
-			reg = <0xffc000 0x1000>;
-			#nordic,ficr-cells = <1>;
-		};
-
-		cpuapp_sram: memory@20000000 {
-			compatible = "mmio-sram";
-			#address-cells = <1>;
-			#size-cells = <1>;
-		};
-
-#ifdef USE_NON_SECURE_ADDRESS_MAP
-		global_peripherals: peripheral@40000000 {
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0x0 0x40000000 0x10000000>;
-#else
-		global_peripherals: peripheral@50000000 {
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0x0 0x50000000 0x10000000>;
-#endif
-
-			dppic00: dppic@42000 {
-				compatible = "nordic,nrf-dppic";
-				reg = <0x42000 0x808>;
-				status = "disabled";
-			};
-
-			ppib00: ppib@43000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x43000 0x1000>;
-				status = "disabled";
-			};
-
-			ppib01: ppib@44000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x44000 0x1000>;
-				status = "disabled";
-			};
-
-			spi00: spi@4a000 {
-				/*
-				 * This spi node can be either SPIM or SPIS,
-				 * for the user to pick:
-				 * compatible = "nordic,nrf-spim" or
-				 *              "nordic,nrf-spis".
-				 */
-				compatible = "nordic,nrf-spim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0x4a000 0x1000>;
-				interrupts = <74 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(32)>;
-				easydma-maxcnt-bits = <16>;
-				rx-delay-supported;
-				rx-delay = <1>;
-				status = "disabled";
-			};
-
-			uart00: uart@4a000 {
-				compatible = "nordic,nrf-uarte";
-				reg = <0x4a000 0x1000>;
-				interrupts = <74 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				endtx-stoptx-supported;
-				frame-timeout-supported;
-			};
-
-			cpuflpr_vpr: vpr@4c000 {
-				compatible = "nordic,nrf-vpr-coprocessor";
-				reg = <0x4c000 0x1000>;
-				ranges = <0x0 0x4c000 0x1000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-				status = "disabled";
-
-				cpuflpr_clic: interrupt-controller@f0000000 {
-					compatible = "nordic,nrf-clic";
-					reg = <0xf0000000 0x1780>;
-					interrupt-controller;
-					#interrupt-cells = <2>;
-					#address-cells = <1>;
-					status = "disabled";
-				};
-			};
-
-			gpio2: gpio@50400 {
-				compatible = "nordic,nrf-gpio";
-				gpio-controller;
-				reg = <0x50400 0x300>;
-				#gpio-cells = <2>;
-				ngpios = <11>;
-				status = "disabled";
-				port = <2>;
-			};
-
-			timer00: timer@55000 {
-				compatible = "nordic,nrf-timer";
-				status = "disabled";
-				reg = <0x55000 0x1000>;
-				cc-num = <6>;
-				max-bit-width = <32>;
-				interrupts = <85 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(128)>;
-				prescaler = <0>;
-			};
-
-			dppic10: dppic@82000 {
-				compatible = "nordic,nrf-dppic";
-				reg = <0x82000 0x808>;
-				status = "disabled";
-			};
-
-			ppib10: ppib@83000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x83000 0x1000>;
-				status = "disabled";
-			};
-
-			ppib11: ppib@84000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x84000 0x1000>;
-				status = "disabled";
-			};
-
-			timer10: timer@85000 {
-				compatible = "nordic,nrf-timer";
-				status = "disabled";
-				reg = <0x85000 0x1000>;
-				cc-num = <8>;
-				max-bit-width = <32>;
-				interrupts = <133 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(32)>;
-				prescaler = <0>;
-			};
-
-			egu10: egu@87000 {
-				compatible = "nordic,nrf-egu";
-				reg = <0x87000 0x1000>;
-				interrupts = <135 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-
-			radio: radio@8a000 {
-				compatible = "nordic,nrf-radio";
-				reg = <0x8a000 0x1000>;
-				interrupts = <138 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				dfe-supported;
-				ieee802154-supported;
-				ble-2mbps-supported;
-				ble-coded-phy-supported;
-				cs-supported;
-
-				ieee802154: ieee802154 {
-					compatible = "nordic,nrf-ieee802154";
-					status = "disabled";
-				};
-
-				/* Note: In the nRF Connect SDK the SoftDevice Controller
-				 * is added and set as the default Bluetooth Controller.
-				 */
-				bt_hci_controller: bt_hci_controller {
-					compatible = "zephyr,bt-hci-ll-sw-split";
-					status = "disabled";
-				};
-			};
-
-			dppic20: dppic@c2000 {
-				compatible = "nordic,nrf-dppic";
-				reg = <0xc2000 0x808>;
-				status = "disabled";
-			};
-
-			ppib20: ppib@c3000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0xc3000 0x1000>;
-				status = "disabled";
-			};
-
-			ppib21: ppib@c4000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0xc4000 0x1000>;
-				status = "disabled";
-			};
-
-			ppib22: ppib@c5000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0xc5000 0x1000>;
-				status = "disabled";
-			};
-
-			i2c20: i2c@c6000 {
-				compatible = "nordic,nrf-twim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xc6000 0x1000>;
-				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
-				easydma-maxcnt-bits = <16>;
-				status = "disabled";
-				zephyr,pm-device-runtime-auto;
-			};
-
-			spi20: spi@c6000 {
-				/*
-				 * This spi node can be either SPIM or SPIS,
-				 * for the user to pick:
-				 * compatible = "nordic,nrf-spim" or
-				 *              "nordic,nrf-spis".
-				 */
-				compatible = "nordic,nrf-spim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xc6000 0x1000>;
-				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(8)>;
-				easydma-maxcnt-bits = <16>;
-				rx-delay-supported;
-				rx-delay = <1>;
-				status = "disabled";
-			};
-
-			uart20: uart@c6000 {
-				compatible = "nordic,nrf-uarte";
-				reg = <0xc6000 0x1000>;
-				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				endtx-stoptx-supported;
-				frame-timeout-supported;
-			};
-
-			i2c21: i2c@c7000 {
-				compatible = "nordic,nrf-twim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xc7000 0x1000>;
-				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
-				easydma-maxcnt-bits = <16>;
-				status = "disabled";
-				zephyr,pm-device-runtime-auto;
-			};
-
-			spi21: spi@c7000 {
-				/*
-				 * This spi node can be either SPIM or SPIS,
-				 * for the user to pick:
-				 * compatible = "nordic,nrf-spim" or
-				 *              "nordic,nrf-spis".
-				 */
-				compatible = "nordic,nrf-spim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xc7000 0x1000>;
-				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(8)>;
-				easydma-maxcnt-bits = <16>;
-				rx-delay-supported;
-				rx-delay = <1>;
-				status = "disabled";
-			};
-
-			uart21: uart@c7000 {
-				compatible = "nordic,nrf-uarte";
-				reg = <0xc7000 0x1000>;
-				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				endtx-stoptx-supported;
-				frame-timeout-supported;
-			};
-
-			i2c22: i2c@c8000 {
-				compatible = "nordic,nrf-twim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xc8000 0x1000>;
-				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
-				easydma-maxcnt-bits = <16>;
-				status = "disabled";
-				zephyr,pm-device-runtime-auto;
-			};
-
-			spi22: spi@c8000 {
-				/*
-				 * This spi node can be either SPIM or SPIS,
-				 * for the user to pick:
-				 * compatible = "nordic,nrf-spim" or
-				 *              "nordic,nrf-spis".
-				 */
-				compatible = "nordic,nrf-spim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xc8000 0x1000>;
-				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(8)>;
-				easydma-maxcnt-bits = <16>;
-				rx-delay-supported;
-				rx-delay = <1>;
-				status = "disabled";
-			};
-
-			uart22: uart@c8000 {
-				compatible = "nordic,nrf-uarte";
-				reg = <0xc8000 0x1000>;
-				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				endtx-stoptx-supported;
-				frame-timeout-supported;
-			};
-
-			egu20: egu@c9000 {
-				compatible = "nordic,nrf-egu";
-				reg = <0xc9000 0x1000>;
-				interrupts = <201 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-
-			timer20: timer@ca000 {
-				compatible = "nordic,nrf-timer";
-				status = "disabled";
-				reg = <0xca000 0x1000>;
-				cc-num = <6>;
-				max-bit-width = <32>;
-				interrupts = <202 NRF_DEFAULT_IRQ_PRIORITY>;
-				prescaler = <0>;
-			};
-
-			timer21: timer@cb000 {
-				compatible = "nordic,nrf-timer";
-				status = "disabled";
-				reg = <0xcb000 0x1000>;
-				cc-num = <6>;
-				max-bit-width = <32>;
-				interrupts = <203 NRF_DEFAULT_IRQ_PRIORITY>;
-				prescaler = <0>;
-			};
-
-			timer22: timer@cc000 {
-				compatible = "nordic,nrf-timer";
-				status = "disabled";
-				reg = <0xcc000 0x1000>;
-				cc-num = <6>;
-				max-bit-width = <32>;
-				interrupts = <204 NRF_DEFAULT_IRQ_PRIORITY>;
-				prescaler = <0>;
-			};
-
-			timer23: timer@cd000 {
-				compatible = "nordic,nrf-timer";
-				status = "disabled";
-				reg = <0xcd000 0x1000>;
-				cc-num = <6>;
-				max-bit-width = <32>;
-				interrupts = <205 NRF_DEFAULT_IRQ_PRIORITY>;
-				prescaler = <0>;
-			};
-
-			timer24: timer@ce000 {
-				compatible = "nordic,nrf-timer";
-				status = "disabled";
-				reg = <0xce000 0x1000>;
-				cc-num = <6>;
-				max-bit-width = <32>;
-				interrupts = <206 NRF_DEFAULT_IRQ_PRIORITY>;
-				prescaler = <0>;
-			};
-
-			pdm20: pdm@d0000 {
-				compatible = "nordic,nrf-pdm";
-				status = "disabled";
-				reg = <0xd0000 0x1000>;
-				interrupts = <208 NRF_DEFAULT_IRQ_PRIORITY>;
-			};
-
-			pdm21: pdm@d1000 {
-				compatible = "nordic,nrf-pdm";
-				status = "disabled";
-				reg = <0xd1000 0x1000>;
-				interrupts = <209 NRF_DEFAULT_IRQ_PRIORITY>;
-			};
-
-			pwm20: pwm@d2000 {
-				compatible = "nordic,nrf-pwm";
-				status = "disabled";
-				reg = <0xd2000 0x1000>;
-				interrupts = <210 NRF_DEFAULT_IRQ_PRIORITY>;
-				#pwm-cells = <3>;
-			};
-
-			pwm21: pwm@d3000 {
-				compatible = "nordic,nrf-pwm";
-				status = "disabled";
-				reg = <0xd3000 0x1000>;
-				interrupts = <211 NRF_DEFAULT_IRQ_PRIORITY>;
-				#pwm-cells = <3>;
-			};
-
-			pwm22: pwm@d4000 {
-				compatible = "nordic,nrf-pwm";
-				status = "disabled";
-				reg = <0xd4000 0x1000>;
-				interrupts = <212 NRF_DEFAULT_IRQ_PRIORITY>;
-				#pwm-cells = <3>;
-			};
-
-			adc: adc@d5000 {
-				compatible = "nordic,nrf-saadc";
-				reg = <0xd5000 0x1000>;
-				interrupts = <213 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				#io-channel-cells = <1>;
-			};
-
-			nfct: nfct@d6000 {
-				compatible = "nordic,nrf-nfct";
-				reg = <0xd6000 0x1000>;
-				interrupts = <214 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-
-			temp: temp@d7000 {
-				compatible = "nordic,nrf-temp";
-				reg = <0xd7000 0x1000>;
-				interrupts = <215 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-
-			gpio1: gpio@d8200 {
-				compatible = "nordic,nrf-gpio";
-				gpio-controller;
-				reg = <0xd8200 0x300>;
-				#gpio-cells = <2>;
-				ngpios = <16>;
-				status = "disabled";
-				port = <1>;
-				gpiote-instance = <&gpiote20>;
-			};
-
-			gpiote20: gpiote@da000 {
-				compatible = "nordic,nrf-gpiote";
-				reg = <0xda000 0x1000>;
-				status = "disabled";
-				instance = <20>;
-			};
-
-			i2s20: i2s@dd000 {
-				compatible = "nordic,nrf-i2s";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xdd000 0x1000>;
-				interrupts = <221 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-
-			qdec20: qdec@e0000 {
-				compatible = "nordic,nrf-qdec";
-				reg = <0xe0000 0x1000>;
-				interrupts = <224 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-
-			qdec21: qdec@e1000 {
-				compatible = "nordic,nrf-qdec";
-				reg = <0xe1000 0x1000>;
-				interrupts = <225 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-
-			grtc: grtc@e2000 {
-				compatible = "nordic,nrf-grtc";
-				reg = <0xe2000 0x1000>;
-				cc-num = <12>;
-				status = "disabled";
-			};
-
-			dppic30: dppic@102000 {
-				compatible = "nordic,nrf-dppic";
-				reg = <0x102000 0x808>;
-				status = "disabled";
-			};
-
-			ppib30: ppib@103000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x103000 0x1000>;
-				status = "disabled";
-			};
-
-			i2c30: i2c@104000 {
-				compatible = "nordic,nrf-twim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0x104000 0x1000>;
-				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
-				easydma-maxcnt-bits = <16>;
-				status = "disabled";
-				zephyr,pm-device-runtime-auto;
-			};
-
-			spi30: spi@104000 {
-				/*
-				 * This spi node can be either SPIM or SPIS,
-				 * for the user to pick:
-				 * compatible = "nordic,nrf-spim" or
-				 *              "nordic,nrf-spis".
-				 */
-				compatible = "nordic,nrf-spim";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0x104000 0x1000>;
-				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(8)>;
-				easydma-maxcnt-bits = <16>;
-				rx-delay-supported;
-				rx-delay = <1>;
-				status = "disabled";
-			};
-
-			uart30: uart@104000 {
-				compatible = "nordic,nrf-uarte";
-				reg = <0x104000 0x1000>;
-				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				endtx-stoptx-supported;
-				frame-timeout-supported;
-			};
-
-			clock: clock@10e000 {
-				compatible = "nordic,nrf-clock";
-				reg = <0x10e000 0x1000>;
-				interrupts = <261 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-
-			power: power@10e000 {
-				compatible = "nordic,nrf-power";
-				reg = <0x10e000 0x1000>;
-				ranges = <0x0 0x10e000 0x1000>;
-				interrupts = <261 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				gpregret1: gpregret1@51c {
-					#address-cells = <1>;
-					#size-cells = <1>;
-					compatible = "nordic,nrf-gpregret";
-					reg = <0x51c 0x1>;
-					status = "disabled";
-				};
-
-				gpregret2: gpregret2@520 {
-					#address-cells = <1>;
-					#size-cells = <1>;
-					compatible = "nordic,nrf-gpregret";
-					reg = <0x520 0x1>;
-					status = "disabled";
-				};
-			};
-
-			comp: comparator@106000 {
-				/*
-				 * Use compatible "nordic,nrf-comp" to configure as COMP
-				 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
-				 */
-				compatible = "nordic,nrf-comp";
-				reg = <0x106000 0x1000>;
-				status = "disabled";
-				interrupts = <262 NRF_DEFAULT_IRQ_PRIORITY>;
-			};
-
-#ifdef USE_NON_SECURE_ADDRESS_MAP
-			/* intentionally empty because WDT30 is hardware fixed to Secure */
-#else
-			wdt30: watchdog@108000 {
-				compatible = "nordic,nrf-wdt";
-				reg = <0x108000 0x620>;
-				interrupts = <264 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-#endif
-
-			wdt31: watchdog@109000 {
-				compatible = "nordic,nrf-wdt";
-				reg = <0x109000 0x620>;
-				interrupts = <265 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-			};
-
-			gpio0: gpio@10a000 {
-				compatible = "nordic,nrf-gpio";
-				gpio-controller;
-				reg = <0x10a000 0x300>;
-				#gpio-cells = <2>;
-				ngpios = <5>;
-				status = "disabled";
-				port = <0>;
-				gpiote-instance = <&gpiote30>;
-			};
-
-			gpiote30: gpiote@10c000 {
-				compatible = "nordic,nrf-gpiote";
-				reg = <0x10c000 0x1000>;
-				status = "disabled";
-				instance = <30>;
-			};
-
-			regulators: regulator@120000 {
-				compatible = "nordic,nrf54l-regulators";
-				reg = <0x120000 0x1000>;
-				status = "disabled";
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				vregmain: regulator@120600 {
-					compatible = "nordic,nrf5x-regulator";
-					reg = <0x120600 0x1>;
-					status = "disabled";
-					regulator-name = "VREGMAIN";
-					regulator-initial-mode = <NRF5X_REG_MODE_LDO>;
-				};
-			};
-		};
-
-		rram_controller: rram-controller@5004b000 {
-			compatible = "nordic,rram-controller";
-			reg = <0x5004b000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			interrupts = <75 NRF_DEFAULT_IRQ_PRIORITY>;
-
-			cpuapp_rram: rram@0 {
-				compatible = "soc-nv-flash";
-				erase-block-size = <4096>;
-				write-block-size = <16>;
-			};
-		};
-
-		cpuapp_ppb: cpuapp-ppb-bus {
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			cpuapp_nvic: interrupt-controller@e000e100  {
-				#address-cells = <1>;
-				compatible = "arm,v8m-nvic";
-				reg = <0xe000e100 0xc00>;
-				arm,num-irq-priority-bits = <3>;
-				interrupt-controller;
-				#interrupt-cells = <2>;
-			};
-
-			cpuapp_systick: timer@e000e010 {
-				compatible = "arm,armv8m-systick";
-				reg = <0xe000e010 0x10>;
-				status = "disabled";
-			};
-		};
-	};
-};
diff --git a/dts/riscv/nordic/nrf54l05_cpuflpr.dtsi b/dts/riscv/nordic/nrf54l05_cpuflpr.dtsi
deleted file mode 100644
index d4725112a46..00000000000
--- a/dts/riscv/nordic/nrf54l05_cpuflpr.dtsi
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <nordic/nrf54l05.dtsi>
-#include "nrf54l_05_10_15_cpuflpr.dtsi"
diff --git a/dts/riscv/nordic/nrf54l10_cpuflpr.dtsi b/dts/riscv/nordic/nrf54l10_cpuflpr.dtsi
deleted file mode 100644
index cea4112d363..00000000000
--- a/dts/riscv/nordic/nrf54l10_cpuflpr.dtsi
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <nordic/nrf54l10.dtsi>
-#include "nrf54l_05_10_15_cpuflpr.dtsi"
diff --git a/dts/riscv/nordic/nrf54l15_cpuflpr.dtsi b/dts/riscv/nordic/nrf54l15_cpuflpr.dtsi
index 4dedf1fbca5..fefa43b76c0 100644
--- a/dts/riscv/nordic/nrf54l15_cpuflpr.dtsi
+++ b/dts/riscv/nordic/nrf54l15_cpuflpr.dtsi
@@ -5,4 +5,63 @@
  */
 
 #include <nordic/nrf54l15.dtsi>
-#include "nrf54l_05_10_15_cpuflpr.dtsi"
+
+cpu: &cpuflpr {};
+clic: &cpuflpr_clic {};
+
+/delete-node/ &cpuapp;
+/delete-node/ &cpuapp_rram;
+/delete-node/ &cpuapp_ppb;
+/delete-node/ &cpuapp_sram;
+
+/ {
+	soc {
+		compatible = "simple-bus";
+		interrupt-parent = <&cpuflpr_clic>;
+		ranges;
+	};
+};
+
+&cpuflpr {
+	cpuflpr_vevif_rx: mailbox {
+		compatible = "nordic,nrf-vevif-task-rx";
+		status = "disabled";
+		interrupt-parent = <&cpuflpr_clic>;
+		interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <17 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <18 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <19 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <20 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <21 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <22 NRF_DEFAULT_IRQ_PRIORITY>;
+		#mbox-cells = <1>;
+		nordic,tasks = <7>;
+		nordic,tasks-mask = <0x007f0000>;
+	};
+};
+
+&cpuflpr_vpr {
+	cpuflpr_vevif_tx: mailbox {
+		compatible = "nordic,nrf-vevif-event-tx";
+		#mbox-cells = <1>;
+		nordic,events = <1>;
+		nordic,events-mask = <0x00100000>;
+		status = "disabled";
+	};
+};
+
+&cpuflpr_clic {
+	status = "okay";
+};
+
+&grtc {
+	interrupts = <226 NRF_DEFAULT_IRQ_PRIORITY>;
+};
+
+&gpiote20 {
+	interrupts = <218 NRF_DEFAULT_IRQ_PRIORITY>;
+};
+
+&gpiote30 {
+	interrupts = <268 NRF_DEFAULT_IRQ_PRIORITY>;
+};
diff --git a/dts/riscv/nordic/nrf54l_05_10_15_cpuflpr.dtsi b/dts/riscv/nordic/nrf54l_05_10_15_cpuflpr.dtsi
deleted file mode 100644
index b20ddbb1bda..00000000000
--- a/dts/riscv/nordic/nrf54l_05_10_15_cpuflpr.dtsi
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-cpu: &cpuflpr {};
-clic: &cpuflpr_clic {};
-
-/delete-node/ &cpuapp;
-/delete-node/ &cpuapp_rram;
-/delete-node/ &cpuapp_ppb;
-/delete-node/ &cpuapp_sram;
-
-/ {
-	soc {
-		compatible = "simple-bus";
-		interrupt-parent = <&cpuflpr_clic>;
-		ranges;
-	};
-};
-
-&cpuflpr {
-	cpuflpr_vevif_rx: mailbox {
-		compatible = "nordic,nrf-vevif-task-rx";
-		status = "disabled";
-		interrupt-parent = <&cpuflpr_clic>;
-		interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>,
-			     <17 NRF_DEFAULT_IRQ_PRIORITY>,
-			     <18 NRF_DEFAULT_IRQ_PRIORITY>,
-			     <19 NRF_DEFAULT_IRQ_PRIORITY>,
-			     <20 NRF_DEFAULT_IRQ_PRIORITY>,
-			     <21 NRF_DEFAULT_IRQ_PRIORITY>,
-			     <22 NRF_DEFAULT_IRQ_PRIORITY>;
-		#mbox-cells = <1>;
-		nordic,tasks = <7>;
-		nordic,tasks-mask = <0x007f0000>;
-	};
-};
-
-&cpuflpr_vpr {
-	cpuflpr_vevif_tx: mailbox {
-		compatible = "nordic,nrf-vevif-event-tx";
-		#mbox-cells = <1>;
-		nordic,events = <1>;
-		nordic,events-mask = <0x00100000>;
-		status = "disabled";
-	};
-};
-
-&cpuflpr_clic {
-	status = "okay";
-};
-
-&grtc {
-	interrupts = <226 NRF_DEFAULT_IRQ_PRIORITY>;
-};
-
-&gpiote20 {
-	interrupts = <218 NRF_DEFAULT_IRQ_PRIORITY>;
-};
-
-&gpiote30 {
-	interrupts = <268 NRF_DEFAULT_IRQ_PRIORITY>;
-};
diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 08c9610e7fe..e800b909ec4 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -44,12 +44,6 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUPPR     NRF54H20_XXAA
                                                                 NRF_PPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR    NRF54H20_XXAA
                                                                 NRF_FLPR)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05            NRF54L05_XXAA)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUAPP     NRF_APPLICATION)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR    NRF_FLPR)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10            NRF54L10_XXAA)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10_CPUAPP     NRF_APPLICATION)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10_CPUFLPR    NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15            NRF54L15_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR    NRF_FLPR)
@@ -178,7 +172,7 @@ if(DEFINED uicr_path)
   endif()
 endif()
 
-if(CONFIG_SOC_NRF54L_CPUAPP_COMMON)
+if(CONFIG_SOC_NRF54L15_CPUAPP OR CONFIG_SOC_NRF54L20_ENGA_CPUAPP)
 	dt_prop(clock_frequency PATH "/cpus/cpu@0" PROPERTY "clock-frequency")
 	math(EXPR clock_frequency_mhz "${clock_frequency} / 1000000")
 	zephyr_compile_definitions("NRF_CONFIG_CPU_FREQ_MHZ=${clock_frequency_mhz}")
@@ -228,10 +222,6 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUAPP      nrf54h20_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUPPR      nrf54h20_ppr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR     nrf54h20_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPURAD      nrf54h20_radiocore.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54L05_CPUAPP      nrf54l05_application.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR     nrf54l05_flpr.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUAPP      nrf54l10_application.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUFLPR     nrf54l10_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP      nrf54l15_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR     nrf54l15_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54l20_enga_application.svd)
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index 5a6c8bf01c7..48b3b8226fb 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -1129,14 +1129,6 @@
     #include <nrfx_config_nrf54h20_ppr.h>
 #elif defined(NRF54H20_XXAA) && defined(NRF_FLPR)
     #include <nrfx_config_nrf54h20_flpr.h>
-#elif defined(NRF54L05_XXAA) && defined(NRF_APPLICATION)
-    #include <nrfx_config_nrf54l05_application.h>
-#elif defined(NRF54L05_XXAA) && defined(NRF_FLPR)
-    #include <nrfx_config_nrf54l05_flpr.h>
-#elif defined(NRF54L10_XXAA) && defined(NRF_APPLICATION)
-    #include <nrfx_config_nrf54l10_application.h>
-#elif defined(NRF54L10_XXAA) && defined(NRF_FLPR)
-    #include <nrfx_config_nrf54l10_flpr.h>
 #elif defined(NRF54L15_XXAA) && defined(NRF_APPLICATION)
     #include <nrfx_config_nrf54l15_application.h>
 #elif defined(NRF54L15_XXAA) && defined(NRF_FLPR)
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l05_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l05_application.h
deleted file mode 100644
index 503405b49f6..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l05_application.h
+++ /dev/null
@@ -1,1775 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54L05_APPLICATION_H__
-#define NRFX_CONFIG_NRF54L05_APPLICATION_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI00_ENABLED
-#define NRFX_DPPI00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI10_ENABLED
-#define NRFX_DPPI10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI20_ENABLED
-#define NRFX_DPPI20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI30_ENABLED
-#define NRFX_DPPI30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU10_ENABLED
-#define NRFX_EGU10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU20_ENABLED
-#define NRFX_EGU20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE20_ENABLED
-#define NRFX_GPIOTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE30_ENABLED
-#define NRFX_GPIOTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 8
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x00000f0f
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S20_ENABLED
-#define NRFX_I2S20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM20_ENABLED
-#define NRFX_PDM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM21_ENABLED
-#define NRFX_PDM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PPIB_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_ENABLED
-#define NRFX_PPIB_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_ENABLED
-#define NRFX_PPIB_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_LEVEL
-#define NRFX_PPIB_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PPIB00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB00_ENABLED
-#define NRFX_PPIB00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB01_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB01_ENABLED
-#define NRFX_PPIB01_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB10_ENABLED
-#define NRFX_PPIB10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB11_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB11_ENABLED
-#define NRFX_PPIB11_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB20_ENABLED
-#define NRFX_PPIB20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB21_ENABLED
-#define NRFX_PPIB21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB22_ENABLED
-#define NRFX_PPIB22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB30_ENABLED
-#define NRFX_PPIB30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM20_ENABLED
-#define NRFX_PWM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM21_ENABLED
-#define NRFX_PWM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM22_ENABLED
-#define NRFX_PWM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC20_ENABLED
-#define NRFX_QDEC20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC21_ENABLED
-#define NRFX_QDEC21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_ENABLED
-#define NRFX_RRAMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
-#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
-#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC10_ENABLED
-#define NRFX_RTC10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC30_ENABLED
-#define NRFX_RTC30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM00_ENABLED
-#define NRFX_SPIM00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM20_ENABLED
-#define NRFX_SPIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM21_ENABLED
-#define NRFX_SPIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM22_ENABLED
-#define NRFX_SPIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM30_ENABLED
-#define NRFX_SPIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS00_ENABLED
-#define NRFX_SPIS00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS20_ENABLED
-#define NRFX_SPIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS21_ENABLED
-#define NRFX_SPIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS22_ENABLED
-#define NRFX_SPIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS30_ENABLED
-#define NRFX_SPIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER00_ENABLED
-#define NRFX_TIMER00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER10_ENABLED
-#define NRFX_TIMER10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER20_ENABLED
-#define NRFX_TIMER20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER21_ENABLED
-#define NRFX_TIMER21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER22_ENABLED
-#define NRFX_TIMER22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER23_ENABLED
-#define NRFX_TIMER23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER24_ENABLED
-#define NRFX_TIMER24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM20_ENABLED
-#define NRFX_TWIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM21_ENABLED
-#define NRFX_TWIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM22_ENABLED
-#define NRFX_TWIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM30_ENABLED
-#define NRFX_TWIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
- *        Assume that any instance would be initialized only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS20_ENABLED
-#define NRFX_TWIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS21_ENABLED
-#define NRFX_TWIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS22_ENABLED
-#define NRFX_TWIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS30_ENABLED
-#define NRFX_TWIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
- *        If enabled, support for configuring GPIO pins is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
- *        If enabled, support for configuring PSEL registers is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE00_ENABLED
-#define NRFX_UARTE00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE20_ENABLED
-#define NRFX_UARTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE21_ENABLED
-#define NRFX_UARTE21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE22_ENABLED
-#define NRFX_UARTE22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE30_ENABLED
-#define NRFX_UARTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT30_ENABLED
-#define NRFX_WDT30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT31_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT31_ENABLED
-#define NRFX_WDT31_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54L05_APPLICATION_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l05_flpr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l05_flpr.h
deleted file mode 100644
index 4d83d5cba22..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l05_flpr.h
+++ /dev/null
@@ -1,1784 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54L05_FLPR_H__
-#define NRFX_CONFIG_NRF54L05_FLPR_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COREDEP_VPR_LEGACY
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COREDEP_VPR_LEGACY
-#define NRFX_COREDEP_VPR_LEGACY 0
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI00_ENABLED
-#define NRFX_DPPI00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI10_ENABLED
-#define NRFX_DPPI10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI20_ENABLED
-#define NRFX_DPPI20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI30_ENABLED
-#define NRFX_DPPI30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU10_ENABLED
-#define NRFX_EGU10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU20_ENABLED
-#define NRFX_EGU20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE20_ENABLED
-#define NRFX_GPIOTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE30_ENABLED
-#define NRFX_GPIOTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 4
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x000000f0
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S20_ENABLED
-#define NRFX_I2S20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM20_ENABLED
-#define NRFX_PDM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM21_ENABLED
-#define NRFX_PDM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PPIB_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_ENABLED
-#define NRFX_PPIB_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_ENABLED
-#define NRFX_PPIB_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_LEVEL
-#define NRFX_PPIB_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PPIB00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB00_ENABLED
-#define NRFX_PPIB00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB01_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB01_ENABLED
-#define NRFX_PPIB01_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB10_ENABLED
-#define NRFX_PPIB10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB11_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB11_ENABLED
-#define NRFX_PPIB11_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB20_ENABLED
-#define NRFX_PPIB20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB21_ENABLED
-#define NRFX_PPIB21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB22_ENABLED
-#define NRFX_PPIB22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB30_ENABLED
-#define NRFX_PPIB30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM20_ENABLED
-#define NRFX_PWM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM21_ENABLED
-#define NRFX_PWM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM22_ENABLED
-#define NRFX_PWM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC20_ENABLED
-#define NRFX_QDEC20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC21_ENABLED
-#define NRFX_QDEC21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_ENABLED
-#define NRFX_RRAMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
-#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
-#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC10_ENABLED
-#define NRFX_RTC10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC30_ENABLED
-#define NRFX_RTC30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM00_ENABLED
-#define NRFX_SPIM00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM20_ENABLED
-#define NRFX_SPIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM21_ENABLED
-#define NRFX_SPIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM22_ENABLED
-#define NRFX_SPIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM30_ENABLED
-#define NRFX_SPIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS00_ENABLED
-#define NRFX_SPIS00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS20_ENABLED
-#define NRFX_SPIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS21_ENABLED
-#define NRFX_SPIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS22_ENABLED
-#define NRFX_SPIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS30_ENABLED
-#define NRFX_SPIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER00_ENABLED
-#define NRFX_TIMER00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER10_ENABLED
-#define NRFX_TIMER10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER20_ENABLED
-#define NRFX_TIMER20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER21_ENABLED
-#define NRFX_TIMER21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER22_ENABLED
-#define NRFX_TIMER22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER23_ENABLED
-#define NRFX_TIMER23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER24_ENABLED
-#define NRFX_TIMER24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM20_ENABLED
-#define NRFX_TWIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM21_ENABLED
-#define NRFX_TWIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM22_ENABLED
-#define NRFX_TWIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM30_ENABLED
-#define NRFX_TWIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
- *        Assume that any instance would be initialized only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS20_ENABLED
-#define NRFX_TWIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS21_ENABLED
-#define NRFX_TWIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS22_ENABLED
-#define NRFX_TWIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS30_ENABLED
-#define NRFX_TWIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
- *        If enabled, support for configuring GPIO pins is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
- *        If enabled, support for configuring PSEL registers is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE00_ENABLED
-#define NRFX_UARTE00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE20_ENABLED
-#define NRFX_UARTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE21_ENABLED
-#define NRFX_UARTE21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE22_ENABLED
-#define NRFX_UARTE22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE30_ENABLED
-#define NRFX_UARTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_VEVIF_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_VEVIF_ENABLED
-#define NRFX_VEVIF_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT30_ENABLED
-#define NRFX_WDT30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT31_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT31_ENABLED
-#define NRFX_WDT31_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54L05_FLPR_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l10_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l10_application.h
deleted file mode 100644
index ab781f507e5..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l10_application.h
+++ /dev/null
@@ -1,1775 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54L10_APPLICATION_H__
-#define NRFX_CONFIG_NRF54L10_APPLICATION_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI00_ENABLED
-#define NRFX_DPPI00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI10_ENABLED
-#define NRFX_DPPI10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI20_ENABLED
-#define NRFX_DPPI20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI30_ENABLED
-#define NRFX_DPPI30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU10_ENABLED
-#define NRFX_EGU10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU20_ENABLED
-#define NRFX_EGU20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE20_ENABLED
-#define NRFX_GPIOTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE30_ENABLED
-#define NRFX_GPIOTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 8
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x00000f0f
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S20_ENABLED
-#define NRFX_I2S20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM20_ENABLED
-#define NRFX_PDM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM21_ENABLED
-#define NRFX_PDM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PPIB_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_ENABLED
-#define NRFX_PPIB_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_ENABLED
-#define NRFX_PPIB_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_LEVEL
-#define NRFX_PPIB_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PPIB00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB00_ENABLED
-#define NRFX_PPIB00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB01_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB01_ENABLED
-#define NRFX_PPIB01_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB10_ENABLED
-#define NRFX_PPIB10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB11_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB11_ENABLED
-#define NRFX_PPIB11_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB20_ENABLED
-#define NRFX_PPIB20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB21_ENABLED
-#define NRFX_PPIB21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB22_ENABLED
-#define NRFX_PPIB22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB30_ENABLED
-#define NRFX_PPIB30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM20_ENABLED
-#define NRFX_PWM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM21_ENABLED
-#define NRFX_PWM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM22_ENABLED
-#define NRFX_PWM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC20_ENABLED
-#define NRFX_QDEC20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC21_ENABLED
-#define NRFX_QDEC21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_ENABLED
-#define NRFX_RRAMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
-#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
-#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC10_ENABLED
-#define NRFX_RTC10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC30_ENABLED
-#define NRFX_RTC30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM00_ENABLED
-#define NRFX_SPIM00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM20_ENABLED
-#define NRFX_SPIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM21_ENABLED
-#define NRFX_SPIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM22_ENABLED
-#define NRFX_SPIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM30_ENABLED
-#define NRFX_SPIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS00_ENABLED
-#define NRFX_SPIS00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS20_ENABLED
-#define NRFX_SPIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS21_ENABLED
-#define NRFX_SPIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS22_ENABLED
-#define NRFX_SPIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS30_ENABLED
-#define NRFX_SPIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER00_ENABLED
-#define NRFX_TIMER00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER10_ENABLED
-#define NRFX_TIMER10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER20_ENABLED
-#define NRFX_TIMER20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER21_ENABLED
-#define NRFX_TIMER21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER22_ENABLED
-#define NRFX_TIMER22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER23_ENABLED
-#define NRFX_TIMER23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER24_ENABLED
-#define NRFX_TIMER24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM20_ENABLED
-#define NRFX_TWIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM21_ENABLED
-#define NRFX_TWIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM22_ENABLED
-#define NRFX_TWIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM30_ENABLED
-#define NRFX_TWIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
- *        Assume that any instance would be initialized only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS20_ENABLED
-#define NRFX_TWIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS21_ENABLED
-#define NRFX_TWIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS22_ENABLED
-#define NRFX_TWIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS30_ENABLED
-#define NRFX_TWIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
- *        If enabled, support for configuring GPIO pins is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
- *        If enabled, support for configuring PSEL registers is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE00_ENABLED
-#define NRFX_UARTE00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE20_ENABLED
-#define NRFX_UARTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE21_ENABLED
-#define NRFX_UARTE21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE22_ENABLED
-#define NRFX_UARTE22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE30_ENABLED
-#define NRFX_UARTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT30_ENABLED
-#define NRFX_WDT30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT31_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT31_ENABLED
-#define NRFX_WDT31_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54L10_APPLICATION_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l10_flpr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l10_flpr.h
deleted file mode 100644
index 784cb0435a1..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l10_flpr.h
+++ /dev/null
@@ -1,1784 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54L10_FLPR_H__
-#define NRFX_CONFIG_NRF54L10_FLPR_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COREDEP_VPR_LEGACY
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COREDEP_VPR_LEGACY
-#define NRFX_COREDEP_VPR_LEGACY 0
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI00_ENABLED
-#define NRFX_DPPI00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI10_ENABLED
-#define NRFX_DPPI10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI20_ENABLED
-#define NRFX_DPPI20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI30_ENABLED
-#define NRFX_DPPI30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU10_ENABLED
-#define NRFX_EGU10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU20_ENABLED
-#define NRFX_EGU20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE20_ENABLED
-#define NRFX_GPIOTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE30_ENABLED
-#define NRFX_GPIOTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 4
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x000000f0
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S20_ENABLED
-#define NRFX_I2S20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM20_ENABLED
-#define NRFX_PDM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM21_ENABLED
-#define NRFX_PDM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PPIB_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_ENABLED
-#define NRFX_PPIB_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_ENABLED
-#define NRFX_PPIB_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_LEVEL
-#define NRFX_PPIB_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PPIB00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB00_ENABLED
-#define NRFX_PPIB00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB01_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB01_ENABLED
-#define NRFX_PPIB01_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB10_ENABLED
-#define NRFX_PPIB10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB11_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB11_ENABLED
-#define NRFX_PPIB11_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB20_ENABLED
-#define NRFX_PPIB20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB21_ENABLED
-#define NRFX_PPIB21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB22_ENABLED
-#define NRFX_PPIB22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB30_ENABLED
-#define NRFX_PPIB30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM20_ENABLED
-#define NRFX_PWM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM21_ENABLED
-#define NRFX_PWM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM22_ENABLED
-#define NRFX_PWM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC20_ENABLED
-#define NRFX_QDEC20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC21_ENABLED
-#define NRFX_QDEC21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_ENABLED
-#define NRFX_RRAMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
-#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
-#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC10_ENABLED
-#define NRFX_RTC10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC30_ENABLED
-#define NRFX_RTC30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM00_ENABLED
-#define NRFX_SPIM00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM20_ENABLED
-#define NRFX_SPIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM21_ENABLED
-#define NRFX_SPIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM22_ENABLED
-#define NRFX_SPIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM30_ENABLED
-#define NRFX_SPIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS00_ENABLED
-#define NRFX_SPIS00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS20_ENABLED
-#define NRFX_SPIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS21_ENABLED
-#define NRFX_SPIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS22_ENABLED
-#define NRFX_SPIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS30_ENABLED
-#define NRFX_SPIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER00_ENABLED
-#define NRFX_TIMER00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER10_ENABLED
-#define NRFX_TIMER10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER20_ENABLED
-#define NRFX_TIMER20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER21_ENABLED
-#define NRFX_TIMER21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER22_ENABLED
-#define NRFX_TIMER22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER23_ENABLED
-#define NRFX_TIMER23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER24_ENABLED
-#define NRFX_TIMER24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM20_ENABLED
-#define NRFX_TWIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM21_ENABLED
-#define NRFX_TWIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM22_ENABLED
-#define NRFX_TWIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM30_ENABLED
-#define NRFX_TWIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
- *        Assume that any instance would be initialized only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS20_ENABLED
-#define NRFX_TWIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS21_ENABLED
-#define NRFX_TWIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS22_ENABLED
-#define NRFX_TWIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS30_ENABLED
-#define NRFX_TWIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
- *        If enabled, support for configuring GPIO pins is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
- *        If enabled, support for configuring PSEL registers is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE00_ENABLED
-#define NRFX_UARTE00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE20_ENABLED
-#define NRFX_UARTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE21_ENABLED
-#define NRFX_UARTE21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE22_ENABLED
-#define NRFX_UARTE22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE30_ENABLED
-#define NRFX_UARTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_VEVIF_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_VEVIF_ENABLED
-#define NRFX_VEVIF_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT30_ENABLED
-#define NRFX_WDT30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT31_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT31_ENABLED
-#define NRFX_WDT31_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54L10_FLPR_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h
index cf49a5f4fa6..e423c8b515d 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h
@@ -136,15 +136,6 @@
 #define NRFX_COMP_CONFIG_LOG_LEVEL 3
 #endif
 
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
 /**
  * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
  *
@@ -169,42 +160,6 @@
 #define NRFX_DPPI_CONFIG_LOG_LEVEL 3
 #endif
 
-/**
- * @brief NRFX_DPPI00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI00_ENABLED
-#define NRFX_DPPI00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI10_ENABLED
-#define NRFX_DPPI10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI20_ENABLED
-#define NRFX_DPPI20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI30_ENABLED
-#define NRFX_DPPI30_ENABLED 0
-#endif
-
 /**
  * @brief NRFX_EGU_ENABLED
  *
@@ -319,13 +274,22 @@
 #define NRFX_GRTC_ENABLED 0
 #endif
 
+/**
+ * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
+#endif
+
 /**
  * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
  * Boolean. Accepted values: 0 and 1.
  */
 #ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
+#define NRFX_GRTC_CONFIG_AUTOEN 0
 #endif
 
 /**
@@ -617,111 +581,6 @@
 #define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
 #endif
 
-/**
- * @brief NRFX_PPIB_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_ENABLED
-#define NRFX_PPIB_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_ENABLED
-#define NRFX_PPIB_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_LEVEL
-#define NRFX_PPIB_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PPIB00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB00_ENABLED
-#define NRFX_PPIB00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB01_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB01_ENABLED
-#define NRFX_PPIB01_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB10_ENABLED
-#define NRFX_PPIB10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB11_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB11_ENABLED
-#define NRFX_PPIB11_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB20_ENABLED
-#define NRFX_PPIB20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB21_ENABLED
-#define NRFX_PPIB21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB22_ENABLED
-#define NRFX_PPIB22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB30_ENABLED
-#define NRFX_PPIB30_ENABLED 0
-#endif
-
 /**
  * @brief NRFX_PRS_ENABLED
  *
@@ -1625,6 +1484,15 @@
 #define NRFX_UARTE_CONFIG_TX_LINK 1
 #endif
 
+/**
+ * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
+ *
+ * Integer value. Minimum: 0. Maximum: 255.
+ */
+#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
+#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
+#endif
+
 /**
  * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
  *
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h
index 4d506938337..a036f8c0a26 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h
@@ -145,15 +145,6 @@
 #define NRFX_COREDEP_VPR_LEGACY 0
 #endif
 
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
 /**
  * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
  *
@@ -178,42 +169,6 @@
 #define NRFX_DPPI_CONFIG_LOG_LEVEL 3
 #endif
 
-/**
- * @brief NRFX_DPPI00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI00_ENABLED
-#define NRFX_DPPI00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI10_ENABLED
-#define NRFX_DPPI10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI20_ENABLED
-#define NRFX_DPPI20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI30_ENABLED
-#define NRFX_DPPI30_ENABLED 0
-#endif
-
 /**
  * @brief NRFX_EGU_ENABLED
  *
@@ -328,13 +283,22 @@
 #define NRFX_GRTC_ENABLED 0
 #endif
 
+/**
+ * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
+#endif
+
 /**
  * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
  * Boolean. Accepted values: 0 and 1.
  */
 #ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
+#define NRFX_GRTC_CONFIG_AUTOEN 0
 #endif
 
 /**
@@ -343,7 +307,7 @@
  * Boolean. Accepted values: 0 and 1.
  */
 #ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
+#define NRFX_GRTC_CONFIG_AUTOSTART 1
 #endif
 
 /**
@@ -626,111 +590,6 @@
 #define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
 #endif
 
-/**
- * @brief NRFX_PPIB_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_ENABLED
-#define NRFX_PPIB_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_ENABLED
-#define NRFX_PPIB_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_LEVEL
-#define NRFX_PPIB_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PPIB00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB00_ENABLED
-#define NRFX_PPIB00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB01_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB01_ENABLED
-#define NRFX_PPIB01_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB10_ENABLED
-#define NRFX_PPIB10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB11_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB11_ENABLED
-#define NRFX_PPIB11_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB20_ENABLED
-#define NRFX_PPIB20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB21_ENABLED
-#define NRFX_PPIB21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB22_ENABLED
-#define NRFX_PPIB22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB30_ENABLED
-#define NRFX_PPIB30_ENABLED 0
-#endif
-
 /**
  * @brief NRFX_PRS_ENABLED
  *
@@ -1625,6 +1484,15 @@
 #define NRFX_UARTE_CONFIG_TX_LINK 1
 #endif
 
+/**
+ * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
+ *
+ * Integer value. Minimum: 0. Maximum: 255.
+ */
+#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
+#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
+#endif
+
 /**
  * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
  *
diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index c4cd8e6aa0f..45a597de15e 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -21,27 +21,15 @@ config SOC_NRF54L_CPUAPP_COMMON
 	select HAS_HW_NRF_RADIO_IEEE802154
 	select HAS_POWEROFF
 
-config SOC_NRF54L05_CPUAPP
-	select SOC_NRF54L_CPUAPP_COMMON
-
-config SOC_NRF54L10_CPUAPP
-	select SOC_NRF54L_CPUAPP_COMMON
-
 config SOC_NRF54L15_CPUAPP
 	select SOC_NRF54L_CPUAPP_COMMON
 
-config SOC_NRF54L05_CPUFLPR
-	depends on RISCV_CORE_NORDIC_VPR
-
-config SOC_NRF54L10_CPUFLPR
-	depends on RISCV_CORE_NORDIC_VPR
+config SOC_NRF54L20_ENGA_CPUAPP
+	select SOC_NRF54L_CPUAPP_COMMON
 
 config SOC_NRF54L15_CPUFLPR
 	depends on RISCV_CORE_NORDIC_VPR
 
-config SOC_NRF54L20_ENGA_CPUAPP
-	select SOC_NRF54L_CPUAPP_COMMON
-
 if SOC_SERIES_NRF54LX
 
 config SOC_NRF54LX_SKIP_CLOCK_CONFIG
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuapp b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuapp
new file mode 100644
index 00000000000..9c8e0b4e34b
--- /dev/null
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuapp
@@ -0,0 +1,11 @@
+# Nordic Semiconductor nRF54L15 MCU
+
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_NRF54L15_CPUAPP
+
+config NUM_IRQS
+	default 271
+
+endif # SOC_NRF54L15_CPUAPP
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l_05_10_15_cpuflpr b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuflpr
similarity index 52%
rename from soc/nordic/nrf54l/Kconfig.defconfig.nrf54l_05_10_15_cpuflpr
rename to soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuflpr
index 76af5524728..7c653d14b93 100644
--- a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l_05_10_15_cpuflpr
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuflpr
@@ -1,9 +1,9 @@
-# Nordic Semiconductor nRF54 L05, L10 and L15 MCUs
+# Nordic Semiconductor nRF54L15 MCU
 
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NRF54L05_CPUFLPR || SOC_NRF54L10_CPUFLPR || SOC_NRF54L15_CPUFLPR
+if SOC_NRF54L15_CPUFLPR
 
 config NUM_IRQS
 	default 287
@@ -12,4 +12,4 @@ config NUM_IRQS
 config ASSERT
 	default n
 
-endif # SOC_NRF54L05_CPUFLPR || SOC_NRF54L10_CPUFLPR || SOC_NRF54L15_CPUFLPR
+endif # SOC_NRF54L15_CPUFLPR
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l_05_10_15_cpuapp b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l_05_10_15_cpuapp
deleted file mode 100644
index ecc2e6124da..00000000000
--- a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l_05_10_15_cpuapp
+++ /dev/null
@@ -1,11 +0,0 @@
-# Nordic Semiconductor nRF54 L05, L10 and L15 MCUs
-
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_NRF54L05_CPUAPP || SOC_NRF54L10_CPUAPP || SOC_NRF54L15_CPUAPP
-
-config NUM_IRQS
-	default 271
-
-endif # SOC_NRF54L05_CPUAPP || SOC_NRF54L10_CPUAPP || SOC_NRF54L15_CPUAPP
diff --git a/soc/nordic/nrf54l/Kconfig.soc b/soc/nordic/nrf54l/Kconfig.soc
index f7c5adf6924..25deae9fade 100644
--- a/soc/nordic/nrf54l/Kconfig.soc
+++ b/soc/nordic/nrf54l/Kconfig.soc
@@ -3,42 +3,6 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-config SOC_NRF54L05
-	bool
-	select SOC_SERIES_NRF54LX
-	help
-	  NRF54L05
-
-config SOC_NRF54L05_CPUAPP
-	bool
-	select SOC_NRF54L05
-	help
-	  NRF54L05 CPUAPP
-
-config SOC_NRF54L05_CPUFLPR
-	bool
-	select SOC_NRF54L05
-	help
-	  NRF54L05 CPUFLPR
-
-config SOC_NRF54L10
-	bool
-	select SOC_SERIES_NRF54LX
-	help
-	  NRF54L10
-
-config SOC_NRF54L10_CPUAPP
-	bool
-	select SOC_NRF54L10
-	help
-	  NRF54L10 CPUAPP
-
-config SOC_NRF54L10_CPUFLPR
-	bool
-	select SOC_NRF54L10
-	help
-	  NRF54L10 CPUFLPR
-
 config SOC_NRF54L15
 	bool
 	select SOC_SERIES_NRF54LX
@@ -76,7 +40,5 @@ config SOC_NRF54L20_ENGA_CPUAPP
 	  NRF54L20 ENGA CPUAPP
 
 config SOC
-	default "nrf54l05" if SOC_NRF54L05
-	default "nrf54l10" if SOC_NRF54L10
 	default "nrf54l15" if SOC_NRF54L15
 	default "nrf54l20" if SOC_NRF54L20
diff --git a/soc/nordic/soc.yml b/soc/nordic/soc.yml
index ee79c7ee868..9879f82f61a 100644
--- a/soc/nordic/soc.yml
+++ b/soc/nordic/soc.yml
@@ -21,14 +21,6 @@ family:
               - name: cpunet
       - name: nrf54l
         socs:
-          - name: nrf54l05
-            cpuclusters:
-              - name: cpuapp
-              - name: cpuflpr
-          - name: nrf54l10
-            cpuclusters:
-              - name: cpuapp
-              - name: cpuflpr
           - name: nrf54l15
             cpuclusters:
               - name: cpuapp
@@ -102,12 +94,6 @@ runners:
           - qualifiers:
               - nrf9161
               - nrf9161/ns
-          - qualifiers:
-              - nrf54l05/cpuapp
-              - nrf54l05/cpuflpr
-          - qualifiers:
-              - nrf54l10/cpuapp
-              - nrf54l10/cpuflpr
           - qualifiers:
               - nrf54l15/cpuapp
               - nrf54l15/cpuflpr
@@ -162,12 +148,6 @@ runners:
           - qualifiers:
               - nrf9161
               - nrf9161/ns
-          - qualifiers:
-              - nrf54l05/cpuapp
-              - nrf54l05/cpuflpr
-          - qualifiers:
-              - nrf54l10/cpuapp
-              - nrf54l10/cpuflpr
           - qualifiers:
               - nrf54l15/cpuapp
               - nrf54l15/cpuflpr
@@ -222,12 +202,6 @@ runners:
           - qualifiers:
               - nrf9161
               - nrf9161/ns
-          - qualifiers:
-              - nrf54l05/cpuapp
-              - nrf54l05/cpuflpr
-          - qualifiers:
-              - nrf54l10/cpuapp
-              - nrf54l10/cpuflpr
           - qualifiers:
               - nrf54l15/cpuapp
               - nrf54l15/cpuflpr
diff --git a/soc/nordic/validate_base_addresses.c b/soc/nordic/validate_base_addresses.c
index f47c3dc456e..07ae94a233b 100644
--- a/soc/nordic/validate_base_addresses.c
+++ b/soc/nordic/validate_base_addresses.c
@@ -338,7 +338,7 @@ CHECK_DT_REG(usbreg, NRF_USBREGULATOR);
 CHECK_DT_REG(vmc, NRF_VMC);
 CHECK_DT_REG(cpuflpr_clic, NRF_FLPR_VPRCLIC);
 CHECK_DT_REG(cpuppr_clic, NRF_PPR_VPRCLIC);
-#if defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || defined(CONFIG_SOC_NRF54L15)
+#if defined(CONFIG_SOC_NRF54L15)
 CHECK_DT_REG(cpuflpr_vpr, NRF_VPR00);
 #elif defined(CONFIG_NRF_PLATFORM_HALTIUM)
 CHECK_DT_REG(cpuflpr_vpr, NRF_VPR121);
diff --git a/tests/drivers/flash/negative_tests/src/main.c b/tests/drivers/flash/negative_tests/src/main.c
index f4d5751ba20..2c4eac7c6a8 100644
--- a/tests/drivers/flash/negative_tests/src/main.c
+++ b/tests/drivers/flash/negative_tests/src/main.c
@@ -26,7 +26,7 @@
 #define TEST_AREA_SIZE   FIXED_PARTITION_SIZE(TEST_AREA)
 #define TEST_AREA_DEVICE FIXED_PARTITION_DEVICE(TEST_AREA)
 
-#if defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || defined(CONFIG_SOC_NRF54L15)
+#if defined(CONFIG_SOC_NRF54L15)
 #define TEST_FLASH_START (DT_REG_ADDR(DT_MEM_FROM_FIXED_PARTITION(DT_NODELABEL(TEST_AREA))))
 #define TEST_FLASH_SIZE  (DT_REG_SIZE(DT_MEM_FROM_FIXED_PARTITION(DT_NODELABEL(TEST_AREA))))
 #elif defined(CONFIG_SOC_NRF54H20)
diff --git a/tests/drivers/mbox/mbox_error_cases/src/main.c b/tests/drivers/mbox/mbox_error_cases/src/main.c
index 54a4a628ec2..555a89e2883 100644
--- a/tests/drivers/mbox/mbox_error_cases/src/main.c
+++ b/tests/drivers/mbox/mbox_error_cases/src/main.c
@@ -10,8 +10,7 @@
 
 int dummy_value;
 
-#if defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || \
-	defined(CONFIG_SOC_NRF54L15) || defined(CONFIG_SOC_NRF54H20)
+#if defined(CONFIG_SOC_NRF54L15) || defined(CONFIG_SOC_NRF54H20)
 #define EXPECTED_MTU_VALUE				(0)
 #define DATA_TRANSFER_MODE_SUPPORTED	(0)
 #define REMOTE_BUSY_SUPPORTED			(0)
diff --git a/tests/drivers/watchdog/wdt_error_cases/src/main.c b/tests/drivers/watchdog/wdt_error_cases/src/main.c
index 3182cdebd03..b05bedf01c3 100644
--- a/tests/drivers/watchdog/wdt_error_cases/src/main.c
+++ b/tests/drivers/watchdog/wdt_error_cases/src/main.c
@@ -42,8 +42,7 @@
 #define DEFAULT_WINDOW_MIN (0U)
 
 /* Align tests to the specific target: */
-#if defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || \
-	defined(CONFIG_SOC_NRF54L15) || defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280)
+#if defined(CONFIG_SOC_NRF54L15) || defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280)
 #define WDT_TEST_FLAGS                                                                             \
 	(WDT_DISABLE_SUPPORTED | WDT_FLAG_RESET_SOC_SUPPORTED |                                    \
 	 WDT_FLAG_ONLY_ONE_TIMEOUT_VALUE_SUPPORTED | WDT_OPT_PAUSE_IN_SLEEP_SUPPORTED |            \
diff --git a/tests/kernel/interrupt/src/nested_irq.c b/tests/kernel/interrupt/src/nested_irq.c
index d488be5b426..6d84dda2ef8 100644
--- a/tests/kernel/interrupt/src/nested_irq.c
+++ b/tests/kernel/interrupt/src/nested_irq.c
@@ -56,7 +56,7 @@
  */
 #define IRQ0_PRIO	IRQ_DEFAULT_PRIORITY
 #define IRQ1_PRIO	0x0
-#elif defined(CONFIG_SOC_SERIES_NRF54LX) && defined(CONFIG_RISCV_CORE_NORDIC_VPR)
+#elif defined(CONFIG_SOC_NRF54L15_CPUFLPR)
 #define IRQ0_LINE	16
 #define IRQ1_LINE	17
 

From 65059b26510fef312433dc4e51be9d3e340b3e61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:25 +0100
Subject: [PATCH 1384/2913] Revert "[nrf fromtree] soc: nordic: nRF54L:
 Consolidate common Kconfig options"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d7b903a694058afb591efcbc987b4410cb71701a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54l/Kconfig | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index 45a597de15e..2db8e8248f9 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -9,8 +9,7 @@ config SOC_SERIES_NRF54LX
 	select HAS_NORDIC_DRIVERS
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 
-config SOC_NRF54L_CPUAPP_COMMON
-	bool
+config SOC_NRF54L15_CPUAPP
 	select ARM
 	select ARMV8_M_DSP
 	select CPU_CORTEX_M33
@@ -21,11 +20,16 @@ config SOC_NRF54L_CPUAPP_COMMON
 	select HAS_HW_NRF_RADIO_IEEE802154
 	select HAS_POWEROFF
 
-config SOC_NRF54L15_CPUAPP
-	select SOC_NRF54L_CPUAPP_COMMON
-
 config SOC_NRF54L20_ENGA_CPUAPP
-	select SOC_NRF54L_CPUAPP_COMMON
+	select ARM
+	select ARMV8_M_DSP
+	select CPU_CORTEX_M33
+	select CPU_HAS_ARM_MPU
+	select CPU_HAS_ICACHE
+	select CPU_HAS_ARM_SAU
+	select CPU_HAS_FPU
+	select HAS_HW_NRF_RADIO_IEEE802154
+	select HAS_POWEROFF
 
 config SOC_NRF54L15_CPUFLPR
 	depends on RISCV_CORE_NORDIC_VPR

From 74eac8debaebf8f829d1193c047517235fa42be4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:25 +0100
Subject: [PATCH 1385/2913] Revert "[nrf fromtree] Bluetooth: Controller: nRF:
 Support MDK 8.68"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5569bda1a12ca5afec819b9ea5c94dcad418329a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
index cd8570ad0aa..9d3a312f51f 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
@@ -1696,15 +1696,11 @@ uint32_t radio_tmr_start_get(void)
 void radio_tmr_stop(void)
 {
 	nrf_timer_task_trigger(EVENT_TIMER, NRF_TIMER_TASK_STOP);
-#if defined(TIMER_TASKS_SHUTDOWN_TASKS_SHUTDOWN_Msk)
 	nrf_timer_task_trigger(EVENT_TIMER, NRF_TIMER_TASK_SHUTDOWN);
-#endif
 
 #if !defined(CONFIG_BT_CTLR_TIFS_HW)
 	nrf_timer_task_trigger(SW_SWITCH_TIMER, NRF_TIMER_TASK_STOP);
-#if defined(TIMER_TASKS_SHUTDOWN_TASKS_SHUTDOWN_Msk)
 	nrf_timer_task_trigger(SW_SWITCH_TIMER, NRF_TIMER_TASK_SHUTDOWN);
-#endif
 #endif /* !CONFIG_BT_CTLR_TIFS_HW */
 
 #if defined(CONFIG_SOC_COMPATIBLE_NRF54LX)

From ce5d11b50400881927da6feb971e9a9ba5d8f825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:25 +0100
Subject: [PATCH 1386/2913] Revert "[nrf fromtree] manifest: Update nRF hw
 models to version compatible with nrfx3.9"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5ba9c28b1a07f403a6197b01c18ae6e6644136ae.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 976de15f4ee..6b0f4ce906a 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: 3cfca0192ff84da919e9bc7978bcc2239cd6a395
+      revision: 42737c8ec8485987c7c9b0262b136de623e1ded2
       path: modules/bsim_hw_models/nrf_hw_models
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719

From 7aabd75879f14426dba8bfd037bcb4c711d7fb0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:25 +0100
Subject: [PATCH 1387/2913] Revert "[nrf fromtree] manifest: Update nRF hw
 models to latest"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8c4b3cd2d30d822c185db4c054c856aa8f011391.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 6b0f4ce906a..1ea092dea59 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: 42737c8ec8485987c7c9b0262b136de623e1ded2
+      revision: aeef3db9fa9e4b9d12b3bbec44f9cedc8fcb7d9c
       path: modules/bsim_hw_models/nrf_hw_models
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719

From 9d7b34a416e6244894df4c04d4aafce0f4eb63de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:25 +0100
Subject: [PATCH 1388/2913] Revert "[nrf fromtree] manifest: hal_nordic: Update
 to nrfx 3.9.0"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit db73a7454bf5026f78e9b7173ee16177e945d76b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/counter/counter_nrfx_timer.c | 2 +-
 west.yml                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/counter/counter_nrfx_timer.c b/drivers/counter/counter_nrfx_timer.c
index 333a436c80e..a9f0ed1d0bf 100644
--- a/drivers/counter/counter_nrfx_timer.c
+++ b/drivers/counter/counter_nrfx_timer.c
@@ -70,7 +70,7 @@ static int stop(const struct device *dev)
 {
 	const struct counter_nrfx_config *config = dev->config;
 
-	nrf_timer_task_trigger(config->timer, NRF_TIMER_TASK_STOP);
+	nrf_timer_task_trigger(config->timer, NRF_TIMER_TASK_SHUTDOWN);
 
 	return 0;
 }
diff --git a/west.yml b/west.yml
index 1ea092dea59..244b91bbf84 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 54bde38c6f6ffb3780b26ae728cf79426184384e
+      revision: 2dbb2ed6cf461062bbac59a65b6e9d4576656350
       path: modules/hal/nordic
       groups:
         - hal

From 7adea10c6c7e41e833e0656ce8e5b5a7c4eff1ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:25 +0100
Subject: [PATCH 1389/2913] Revert "[nrf fromtree] dts: nordic: remove
 clock-frequency from all i2c nodes"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 527f5485ebc0c228ef960e5fed5d2a20eff682a8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/arm/nordic/nrf51822.dtsi                   | 2 ++
 dts/arm/nordic/nrf52805.dtsi                   | 1 +
 dts/arm/nordic/nrf52810.dtsi                   | 1 +
 dts/arm/nordic/nrf52811.dtsi                   | 1 +
 dts/arm/nordic/nrf52820.dtsi                   | 2 ++
 dts/arm/nordic/nrf52832.dtsi                   | 2 ++
 dts/arm/nordic/nrf52833.dtsi                   | 2 ++
 dts/arm/nordic/nrf52840.dtsi                   | 2 ++
 dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi | 4 ++++
 dts/arm/nordic/nrf5340_cpunet.dtsi             | 1 +
 dts/arm/nordic/nrf91_peripherals.dtsi          | 4 ++++
 dts/common/nordic/nrf54l15.dtsi                | 4 ++++
 dts/common/nordic/nrf54l20.dtsi                | 4 ++++
 13 files changed, 30 insertions(+)

diff --git a/dts/arm/nordic/nrf51822.dtsi b/dts/arm/nordic/nrf51822.dtsi
index c3c85b110a3..a11677ad934 100644
--- a/dts/arm/nordic/nrf51822.dtsi
+++ b/dts/arm/nordic/nrf51822.dtsi
@@ -105,6 +105,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40003000 0x1000>;
+			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <8>;
 			status = "disabled";
@@ -132,6 +133,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40004000 0x1000>;
+			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <8>;
 			status = "disabled";
diff --git a/dts/arm/nordic/nrf52805.dtsi b/dts/arm/nordic/nrf52805.dtsi
index e1c8e6a2efb..fbf89434690 100644
--- a/dts/arm/nordic/nrf52805.dtsi
+++ b/dts/arm/nordic/nrf52805.dtsi
@@ -127,6 +127,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40003000 0x1000>;
+			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <14>;
 			status = "disabled";
diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
index 40d872dda44..3be690a987e 100644
--- a/dts/arm/nordic/nrf52810.dtsi
+++ b/dts/arm/nordic/nrf52810.dtsi
@@ -131,6 +131,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40003000 0x1000>;
+			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <10>;
 			status = "disabled";
diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi
index 735bfee427b..83a66d77792 100644
--- a/dts/arm/nordic/nrf52811.dtsi
+++ b/dts/arm/nordic/nrf52811.dtsi
@@ -143,6 +143,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40003000 0x1000>;
+			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <14>;
 			status = "disabled";
diff --git a/dts/arm/nordic/nrf52820.dtsi b/dts/arm/nordic/nrf52820.dtsi
index 82bdcb58934..71abcab55cc 100644
--- a/dts/arm/nordic/nrf52820.dtsi
+++ b/dts/arm/nordic/nrf52820.dtsi
@@ -145,6 +145,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40003000 0x1000>;
+			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <15>;
 			status = "disabled";
@@ -181,6 +182,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40004000 0x1000>;
+			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <15>;
 			status = "disabled";
diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
index abb1aed468c..49acb441c57 100644
--- a/dts/arm/nordic/nrf52832.dtsi
+++ b/dts/arm/nordic/nrf52832.dtsi
@@ -131,6 +131,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40003000 0x1000>;
+			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <8>;
 			status = "disabled";
@@ -167,6 +168,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40004000 0x1000>;
+			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <8>;
 			status = "disabled";
diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi
index e8a033b4002..7d23e15f5f8 100644
--- a/dts/arm/nordic/nrf52833.dtsi
+++ b/dts/arm/nordic/nrf52833.dtsi
@@ -145,6 +145,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40003000 0x1000>;
+			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
@@ -181,6 +182,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40004000 0x1000>;
+			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index e2265c130b0..56712a6bccc 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -133,6 +133,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40003000 0x1000>;
+			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
@@ -169,6 +170,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40004000 0x1000>;
+			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
diff --git a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
index a0c79972948..745e23d87ce 100644
--- a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
@@ -104,6 +104,7 @@ i2c0: i2c@8000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0x8000 0x1000>;
+	clock-frequency = <I2C_BITRATE_STANDARD>;
 	interrupts = <8 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <16>;
 	status = "disabled";
@@ -145,6 +146,7 @@ i2c1: i2c@9000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0x9000 0x1000>;
+	clock-frequency = <I2C_BITRATE_STANDARD>;
 	interrupts = <9 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <16>;
 	status = "disabled";
@@ -199,6 +201,7 @@ i2c2: i2c@b000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0xb000 0x1000>;
+	clock-frequency = <I2C_BITRATE_STANDARD>;
 	interrupts = <11 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <16>;
 	status = "disabled";
@@ -240,6 +243,7 @@ i2c3: i2c@c000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0xc000 0x1000>;
+	clock-frequency = <I2C_BITRATE_STANDARD>;
 	interrupts = <12 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <16>;
 	status = "disabled";
diff --git a/dts/arm/nordic/nrf5340_cpunet.dtsi b/dts/arm/nordic/nrf5340_cpunet.dtsi
index acf95077669..c17a8caf8f9 100644
--- a/dts/arm/nordic/nrf5340_cpunet.dtsi
+++ b/dts/arm/nordic/nrf5340_cpunet.dtsi
@@ -201,6 +201,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x41013000 0x1000>;
+			clock-frequency = <I2C_BITRATE_STANDARD>;
 			interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
diff --git a/dts/arm/nordic/nrf91_peripherals.dtsi b/dts/arm/nordic/nrf91_peripherals.dtsi
index 58cc3142bcf..75613b7df2c 100644
--- a/dts/arm/nordic/nrf91_peripherals.dtsi
+++ b/dts/arm/nordic/nrf91_peripherals.dtsi
@@ -156,6 +156,7 @@ i2c0: i2c@8000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0x8000 0x1000>;
+	clock-frequency = <I2C_BITRATE_STANDARD>;
 	interrupts = <8 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <13>;
 	status = "disabled";
@@ -172,6 +173,7 @@ i2c1: i2c@9000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0x9000 0x1000>;
+	clock-frequency = <I2C_BITRATE_STANDARD>;
 	interrupts = <9 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <13>;
 	status = "disabled";
@@ -188,6 +190,7 @@ i2c2: i2c@a000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0xa000 0x1000>;
+	clock-frequency = <I2C_BITRATE_STANDARD>;
 	interrupts = <10 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <13>;
 	status = "disabled";
@@ -204,6 +207,7 @@ i2c3: i2c@b000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0xb000 0x1000>;
+	clock-frequency = <I2C_BITRATE_STANDARD>;
 	interrupts = <11 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <13>;
 	status = "disabled";
diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index 5a49efd468d..71639075aa9 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -282,6 +282,7 @@
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0xc6000 0x1000>;
+				clock-frequency = <I2C_BITRATE_STANDARD>;
 				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
@@ -321,6 +322,7 @@
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0xc7000 0x1000>;
+				clock-frequency = <I2C_BITRATE_STANDARD>;
 				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
@@ -360,6 +362,7 @@
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0xc8000 0x1000>;
+				clock-frequency = <I2C_BITRATE_STANDARD>;
 				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
@@ -576,6 +579,7 @@
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x104000 0x1000>;
+				clock-frequency = <I2C_BITRATE_STANDARD>;
 				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 8479c6111a8..293f16e1910 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -233,6 +233,7 @@
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0xc6000 0x1000>;
+				clock-frequency = <I2C_BITRATE_STANDARD>;
 				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
@@ -272,6 +273,7 @@
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0xc7000 0x1000>;
+				clock-frequency = <I2C_BITRATE_STANDARD>;
 				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
@@ -311,6 +313,7 @@
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0xc8000 0x1000>;
+				clock-frequency = <I2C_BITRATE_STANDARD>;
 				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
@@ -518,6 +521,7 @@
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x104000 0x1000>;
+				clock-frequency = <I2C_BITRATE_STANDARD>;
 				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";

From 886f3c89a9f109195ed32efaf980407256fe8e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:25 +0100
Subject: [PATCH 1390/2913] Revert "[nrf fromtree] drivers: i2c: nrfx_twi[m]:
 default to I2C_BITRATE_STANDARD"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 51c4fee51427a38de62ab5f3d5d8d61357acc300.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/i2c/i2c_nrfx_twi_common.h  | 3 +--
 drivers/i2c/i2c_nrfx_twim_common.h | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/i2c/i2c_nrfx_twi_common.h b/drivers/i2c/i2c_nrfx_twi_common.h
index a3e9847bab5..a8925d3f75b 100644
--- a/drivers/i2c/i2c_nrfx_twi_common.h
+++ b/drivers/i2c/i2c_nrfx_twi_common.h
@@ -22,8 +22,7 @@ extern "C" {
 					  : I2C_NRFX_TWI_INVALID_FREQUENCY)
 #define I2C(idx) DT_NODELABEL(i2c##idx)
 #define I2C_FREQUENCY(idx)						       \
-	I2C_NRFX_TWI_FREQUENCY(DT_PROP_OR(I2C(idx), clock_frequency,	       \
-					  I2C_BITRATE_STANDARD))
+	I2C_NRFX_TWI_FREQUENCY(DT_PROP(I2C(idx), clock_frequency))
 
 struct i2c_nrfx_twi_common_data {
 	uint32_t dev_config;
diff --git a/drivers/i2c/i2c_nrfx_twim_common.h b/drivers/i2c/i2c_nrfx_twim_common.h
index ba7fa72f019..23811a225e7 100644
--- a/drivers/i2c/i2c_nrfx_twim_common.h
+++ b/drivers/i2c/i2c_nrfx_twim_common.h
@@ -28,8 +28,7 @@ extern "C" {
 
 #define I2C(idx)                DT_NODELABEL(i2c##idx)
 #define I2C_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(I2C(idx), prop)
-#define I2C_FREQUENCY(idx)      I2C_NRFX_TWIM_FREQUENCY(DT_PROP_OR(I2C(idx), clock_frequency,      \
-								   I2C_BITRATE_STANDARD))
+#define I2C_FREQUENCY(idx)      I2C_NRFX_TWIM_FREQUENCY(DT_PROP(I2C(idx), clock_frequency))
 
 struct i2c_nrfx_twim_common_config {
 	nrfx_twim_t twim;

From 76087a46c62f084833b763e4b677e83c7364fe6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:26 +0100
Subject: [PATCH 1391/2913] Revert "[nrf fromtree] i2c: nrfx_twim: native RTIO
 support"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6ea301d196a8177274c4eb3a42c8c7148945530e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/i2c/CMakeLists.txt       |  15 +-
 drivers/i2c/i2c_nrfx_twim_rtio.c | 290 -------------------------------
 2 files changed, 4 insertions(+), 301 deletions(-)
 delete mode 100644 drivers/i2c/i2c_nrfx_twim_rtio.c

diff --git a/drivers/i2c/CMakeLists.txt b/drivers/i2c/CMakeLists.txt
index 25a68ea5f8f..47dc4635f67 100644
--- a/drivers/i2c/CMakeLists.txt
+++ b/drivers/i2c/CMakeLists.txt
@@ -46,17 +46,10 @@ else()
 	)
 endif()
 
-if(CONFIG_I2C_RTIO)
-	zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWIM
-	i2c_nrfx_twim_rtio.c
-	i2c_nrfx_twim_common.c
-	)
-else()
-	zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWIM
-	i2c_nrfx_twim.c
-	i2c_nrfx_twim_common.c
-	)
-endif()
+zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWIM
+i2c_nrfx_twim.c
+i2c_nrfx_twim_common.c
+)
 zephyr_library_sources_ifdef(CONFIG_I2C_SAM_TWI		i2c_sam_twi.c)
 
 if(CONFIG_I2C_RTIO)
diff --git a/drivers/i2c/i2c_nrfx_twim_rtio.c b/drivers/i2c/i2c_nrfx_twim_rtio.c
deleted file mode 100644
index ad455433263..00000000000
--- a/drivers/i2c/i2c_nrfx_twim_rtio.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * Copyright (c) 2018, Nordic Semiconductor ASA
- * Copyright (c) 2024, Croxel Inc
- * Copyright (c) 2024, Embeint Inc
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/drivers/i2c.h>
-#include <zephyr/drivers/i2c/rtio.h>
-#include <zephyr/dt-bindings/i2c/i2c.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/pm/device.h>
-#include <zephyr/pm/device_runtime.h>
-#include <zephyr/drivers/pinctrl.h>
-#include <soc.h>
-#include <nrfx_twim.h>
-
-#include "i2c_nrfx_twim_common.h"
-
-LOG_MODULE_REGISTER(i2c_nrfx_twim, CONFIG_I2C_LOG_LEVEL);
-
-struct i2c_nrfx_twim_rtio_config {
-	struct i2c_nrfx_twim_common_config common;
-	struct i2c_rtio *ctx;
-};
-
-static bool i2c_nrfx_twim_rtio_msg_start(const struct device *dev, uint8_t flags, uint8_t *buf,
-					 size_t buf_len, uint16_t i2c_addr)
-{
-	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
-	struct i2c_rtio *ctx = config->ctx;
-	int ret = 0;
-
-	ret = i2c_nrfx_twim_msg_transfer(dev, flags, buf, buf_len, i2c_addr);
-	if (ret != 0) {
-		return i2c_rtio_complete(ctx, ret);
-	}
-
-	return false;
-}
-
-static bool i2c_nrfx_twim_rtio_start(const struct device *dev)
-{
-	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
-	struct i2c_rtio *ctx = config->ctx;
-	struct rtio_sqe *sqe = &ctx->txn_curr->sqe;
-	struct i2c_dt_spec *dt_spec = sqe->iodev->data;
-
-	switch (sqe->op) {
-	case RTIO_OP_RX:
-		return i2c_nrfx_twim_rtio_msg_start(dev, I2C_MSG_READ | sqe->iodev_flags,
-						    sqe->rx.buf, sqe->rx.buf_len, dt_spec->addr);
-	case RTIO_OP_TINY_TX:
-		return i2c_nrfx_twim_rtio_msg_start(dev, I2C_MSG_WRITE | sqe->iodev_flags,
-						    sqe->tiny_tx.buf, sqe->tiny_tx.buf_len,
-						    dt_spec->addr);
-	case RTIO_OP_TX:
-		/* If buffer is not accessible by DMA, copy it into the internal driver buffer */
-		if (!nrf_dma_accessible_check(&config->common.twim, sqe->tx.buf)) {
-			/* Validate buffer will fit */
-			if (sqe->tx.buf_len > config->common.msg_buf_size) {
-				LOG_ERR("Need to use the internal driver "
-					"buffer but its size is insufficient "
-					"(%u > %u). "
-					"Adjust the zephyr,concat-buf-size or "
-					"zephyr,flash-buf-max-size property "
-					"(the one with greater value) in the "
-					"\"%s\"' node.",
-					sqe->tx.buf_len, config->common.msg_buf_size, dev->name);
-				return i2c_rtio_complete(ctx, -ENOSPC);
-			}
-			memcpy(config->common.msg_buf, sqe->tx.buf, sqe->tx.buf_len);
-			sqe->tx.buf = config->common.msg_buf;
-		}
-		return i2c_nrfx_twim_rtio_msg_start(dev, I2C_MSG_WRITE | sqe->iodev_flags,
-						    sqe->tx.buf, sqe->tx.buf_len, dt_spec->addr);
-	case RTIO_OP_I2C_CONFIGURE:
-		(void)i2c_nrfx_twim_configure(dev, sqe->i2c_config);
-		return false;
-	case RTIO_OP_I2C_RECOVER:
-		(void)i2c_nrfx_twim_recover_bus(dev);
-		return false;
-	default:
-		LOG_ERR("Invalid op code %d for submission %p\n", sqe->op, (void *)sqe);
-		return i2c_rtio_complete(ctx, -EINVAL);
-	}
-}
-
-static void i2c_nrfx_twim_rtio_complete(const struct device *dev, int status)
-{
-	/** Finalize if there are no more pending xfers */
-	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
-	struct i2c_rtio *ctx = config->ctx;
-
-	if (i2c_rtio_complete(ctx, status)) {
-		(void)i2c_nrfx_twim_rtio_start(dev);
-	} else {
-		/* Release bus on completion */
-		pm_device_runtime_put(dev);
-	}
-}
-
-static int i2c_nrfx_twim_rtio_configure(const struct device *dev, uint32_t i2c_config)
-{
-	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
-	struct i2c_rtio *ctx = config->ctx;
-
-	return i2c_rtio_configure(ctx, i2c_config);
-}
-
-static int i2c_nrfx_twim_rtio_transfer(const struct device *dev, struct i2c_msg *msgs,
-				       uint8_t num_msgs, uint16_t addr)
-{
-	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
-	struct i2c_rtio *ctx = config->ctx;
-
-	return i2c_rtio_transfer(ctx, msgs, num_msgs, addr);
-}
-
-static int i2c_nrfx_twim_rtio_recover_bus(const struct device *dev)
-{
-	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
-	struct i2c_rtio *ctx = config->ctx;
-
-	return i2c_rtio_recover(ctx);
-}
-
-static void i2c_nrfx_twim_rtio_submit(const struct device *dev, struct rtio_iodev_sqe *iodev_seq)
-{
-	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
-	struct i2c_rtio *ctx = config->ctx;
-
-	if (i2c_rtio_submit(ctx, iodev_seq)) {
-		if (pm_device_runtime_get(dev) < 0) {
-			(void)i2c_rtio_complete(ctx, -EINVAL);
-		} else {
-			(void)i2c_nrfx_twim_rtio_start(dev);
-		}
-	}
-}
-
-static void event_handler(nrfx_twim_evt_t const *p_event, void *p_context)
-{
-	const struct device *dev = p_context;
-	int status = p_event->type == NRFX_TWIM_EVT_DONE ? 0 : -EIO;
-
-	i2c_nrfx_twim_rtio_complete(dev, status);
-}
-
-static const struct i2c_driver_api i2c_nrfx_twim_driver_api = {
-	.configure = i2c_nrfx_twim_rtio_configure,
-	.transfer = i2c_nrfx_twim_rtio_transfer,
-	.recover_bus = i2c_nrfx_twim_rtio_recover_bus,
-	.iodev_submit = i2c_nrfx_twim_rtio_submit,
-};
-
-int i2c_nrfx_twim_rtio_init(const struct device *dev)
-{
-	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
-
-	i2c_rtio_init(config->ctx, dev);
-	return i2c_nrfx_twim_common_init(dev);
-}
-
-#define CONCAT_BUF_SIZE(idx)                                                                       \
-	COND_CODE_1(DT_NODE_HAS_PROP(I2C(idx), zephyr_concat_buf_size),                            \
-		    (DT_PROP(I2C(idx), zephyr_concat_buf_size)), (0))
-#define FLASH_BUF_MAX_SIZE(idx)                                                                    \
-	COND_CODE_1(DT_NODE_HAS_PROP(I2C(idx), zephyr_flash_buf_max_size),                         \
-		    (DT_PROP(I2C(idx), zephyr_flash_buf_max_size)), (0))
-
-#define USES_MSG_BUF(idx)                                                                          \
-	COND_CODE_0(CONCAT_BUF_SIZE(idx), (COND_CODE_0(FLASH_BUF_MAX_SIZE(idx), (0), (1))), (1))
-#define MSG_BUF_SIZE(idx) MAX(CONCAT_BUF_SIZE(idx), FLASH_BUF_MAX_SIZE(idx))
-
-#define I2C_NRFX_TWIM_RTIO_DEVICE(idx)                                                             \
-	NRF_DT_CHECK_NODE_HAS_PINCTRL_SLEEP(I2C(idx));                                             \
-	BUILD_ASSERT(I2C_FREQUENCY(idx) != I2C_NRFX_TWIM_INVALID_FREQUENCY,                        \
-		     "Wrong I2C " #idx " frequency setting in dts");                               \
-	static void irq_connect##idx(void)                                                         \
-	{                                                                                          \
-		IRQ_CONNECT(DT_IRQN(I2C(idx)), DT_IRQ(I2C(idx), priority), nrfx_isr,               \
-			    nrfx_twim_##idx##_irq_handler, 0);                                     \
-	}                                                                                          \
-	IF_ENABLED(                                                                                \
-		USES_MSG_BUF(idx),                                                                 \
-		(static uint8_t twim_##idx##_msg_buf[MSG_BUF_SIZE(idx)] I2C_MEMORY_SECTION(idx);)) \
-	I2C_RTIO_DEFINE(_i2c##idx##_twim_rtio,                                                     \
-			DT_INST_PROP_OR(n, sq_size, CONFIG_I2C_RTIO_SQ_SIZE),                      \
-			DT_INST_PROP_OR(n, cq_size, CONFIG_I2C_RTIO_CQ_SIZE));                     \
-	PINCTRL_DT_DEFINE(I2C(idx));                                                               \
-	static const struct i2c_nrfx_twim_rtio_config twim_##idx##z_config = {                     \
-		.common =                                                                          \
-			{                                                                          \
-				.twim = NRFX_TWIM_INSTANCE(idx),                                   \
-				.twim_config =                                                     \
-					{                                                          \
-						.skip_gpio_cfg = true,                             \
-						.skip_psel_cfg = true,                             \
-						.frequency = I2C_FREQUENCY(idx),                   \
-					},                                                         \
-				.event_handler = event_handler,                                    \
-				.msg_buf_size = MSG_BUF_SIZE(idx),                                 \
-				.irq_connect = irq_connect##idx,                                   \
-				.pcfg = PINCTRL_DT_DEV_CONFIG_GET(I2C(idx)),                       \
-				IF_ENABLED(USES_MSG_BUF(idx), (.msg_buf = twim_##idx##_msg_buf,))  \
-					.max_transfer_size =                                       \
-					BIT_MASK(DT_PROP(I2C(idx), easydma_maxcnt_bits)),          \
-			},                                                                         \
-		.ctx = &_i2c##idx##_twim_rtio,                                                     \
-	};                                                                                         \
-	PM_DEVICE_DT_DEFINE(I2C(idx), twim_nrfx_pm_action);                                        \
-	I2C_DEVICE_DT_DEFINE(I2C(idx), i2c_nrfx_twim_rtio_init, PM_DEVICE_DT_GET(I2C(idx)), NULL,  \
-			     &twim_##idx##z_config, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY,         \
-			     &i2c_nrfx_twim_driver_api)
-
-#define I2C_MEMORY_SECTION(idx)                                                                    \
-	COND_CODE_1(I2C_HAS_PROP(idx, memory_regions),                                             \
-		    (__attribute__((__section__(                                                   \
-			    LINKER_DT_NODE_REGION_NAME(DT_PHANDLE(I2C(idx), memory_regions)))))),  \
-		    ())
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM0
-I2C_NRFX_TWIM_RTIO_DEVICE(0);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM1
-I2C_NRFX_TWIM_RTIO_DEVICE(1);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM2
-I2C_NRFX_TWIM_RTIO_DEVICE(2);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM3
-I2C_NRFX_TWIM_RTIO_DEVICE(3);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM20
-I2C_NRFX_TWIM_RTIO_DEVICE(20);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM21
-I2C_NRFX_TWIM_RTIO_DEVICE(21);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM22
-I2C_NRFX_TWIM_RTIO_DEVICE(22);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM30
-I2C_NRFX_TWIM_RTIO_DEVICE(30);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM120
-I2C_NRFX_TWIM_RTIO_DEVICE(120);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM130
-I2C_NRFX_TWIM_RTIO_DEVICE(130);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM131
-I2C_NRFX_TWIM_RTIO_DEVICE(131);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM132
-I2C_NRFX_TWIM_RTIO_DEVICE(132);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM133
-I2C_NRFX_TWIM_RTIO_DEVICE(133);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM134
-I2C_NRFX_TWIM_RTIO_DEVICE(134);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM135
-I2C_NRFX_TWIM_RTIO_DEVICE(135);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM136
-I2C_NRFX_TWIM_RTIO_DEVICE(136);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM137
-I2C_NRFX_TWIM_RTIO_DEVICE(137);
-#endif

From e6e3220c746570a904c197ca57a1dccca68e417a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:26 +0100
Subject: [PATCH 1392/2913] Revert "[nrf fromtree] i2c: i2c_nrfx_twim: update
 callback context to dev"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 79e39ab8e420eb0691c1fa4d85c5ff0b2a086108.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/i2c/i2c_nrfx_twim.c        | 3 +--
 drivers/i2c/i2c_nrfx_twim_common.c | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c
index 9609709d8c3..ea43e31811b 100644
--- a/drivers/i2c/i2c_nrfx_twim.c
+++ b/drivers/i2c/i2c_nrfx_twim.c
@@ -173,8 +173,7 @@ static int i2c_nrfx_twim_transfer(const struct device *dev,
 
 static void event_handler(nrfx_twim_evt_t const *p_event, void *p_context)
 {
-	const struct device *dev = p_context;
-	struct i2c_nrfx_twim_data *dev_data = dev->data;
+	struct i2c_nrfx_twim_data *dev_data = p_context;
 
 	switch (p_event->type) {
 	case NRFX_TWIM_EVT_DONE:
diff --git a/drivers/i2c/i2c_nrfx_twim_common.c b/drivers/i2c/i2c_nrfx_twim_common.c
index 1539d7c90dd..be0b78ac6b8 100644
--- a/drivers/i2c/i2c_nrfx_twim_common.c
+++ b/drivers/i2c/i2c_nrfx_twim_common.c
@@ -130,8 +130,8 @@ int i2c_nrfx_twim_common_init(const struct device *dev)
 
 	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
 
-	if (nrfx_twim_init(&config->twim, &config->twim_config, config->event_handler,
-			   (void *)dev) != NRFX_SUCCESS) {
+	if (nrfx_twim_init(&config->twim, &config->twim_config, config->event_handler, data) !=
+	    NRFX_SUCCESS) {
 		LOG_ERR("Failed to initialize device: %s", dev->name);
 		return -EIO;
 	}

From 939dafda56a1a0542da9d09e946293aa05dd684d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:26 +0100
Subject: [PATCH 1393/2913] Revert "[nrf fromtree] i2c: i2c_nrfx_twim: extract
 common code"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 67571ac7c65c6ddb47c7bd71a83a36991393825b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/i2c/CMakeLists.txt         |   5 +-
 drivers/i2c/i2c_nrfx_twim.c        | 185 +++++++++++++++++++++++++----
 drivers/i2c/i2c_nrfx_twim_common.c | 140 ----------------------
 drivers/i2c/i2c_nrfx_twim_common.h |  58 ---------
 4 files changed, 163 insertions(+), 225 deletions(-)
 delete mode 100644 drivers/i2c/i2c_nrfx_twim_common.c
 delete mode 100644 drivers/i2c/i2c_nrfx_twim_common.h

diff --git a/drivers/i2c/CMakeLists.txt b/drivers/i2c/CMakeLists.txt
index 47dc4635f67..cf7155ecdd8 100644
--- a/drivers/i2c/CMakeLists.txt
+++ b/drivers/i2c/CMakeLists.txt
@@ -46,10 +46,7 @@ else()
 	)
 endif()
 
-zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWIM
-i2c_nrfx_twim.c
-i2c_nrfx_twim_common.c
-)
+zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWIM	i2c_nrfx_twim.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_SAM_TWI		i2c_sam_twi.c)
 
 if(CONFIG_I2C_RTIO)
diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c
index ea43e31811b..e38512137ed 100644
--- a/drivers/i2c/i2c_nrfx_twim.c
+++ b/drivers/i2c/i2c_nrfx_twim.c
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/pm/device.h>
@@ -16,9 +17,6 @@
 
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
-
-#include "i2c_nrfx_twim_common.h"
-
 LOG_MODULE_REGISTER(i2c_nrfx_twim, CONFIG_I2C_LOG_LEVEL);
 
 #if CONFIG_I2C_NRFX_TRANSFER_TIMEOUT
@@ -33,18 +31,31 @@ struct i2c_nrfx_twim_data {
 	volatile nrfx_err_t res;
 };
 
+struct i2c_nrfx_twim_config {
+	nrfx_twim_t twim;
+	nrfx_twim_config_t twim_config;
+	uint16_t msg_buf_size;
+	void (*irq_connect)(void);
+	const struct pinctrl_dev_config *pcfg;
+	uint8_t *msg_buf;
+	uint16_t max_transfer_size;
+};
+
+static int i2c_nrfx_twim_recover_bus(const struct device *dev);
+
 static int i2c_nrfx_twim_transfer(const struct device *dev,
 				  struct i2c_msg *msgs,
 				  uint8_t num_msgs, uint16_t addr)
 {
 	struct i2c_nrfx_twim_data *dev_data = dev->data;
-	const struct i2c_nrfx_twim_common_config *dev_config = dev->config;
+	const struct i2c_nrfx_twim_config *dev_config = dev->config;
 	int ret = 0;
 	uint8_t *msg_buf = dev_config->msg_buf;
 	uint16_t msg_buf_used = 0;
 	uint16_t msg_buf_size = dev_config->msg_buf_size;
-	uint8_t *buf;
-	uint16_t buf_len;
+	nrfx_twim_xfer_desc_t cur_xfer = {
+		.address = addr
+	};
 
 	k_sem_take(&dev_data->transfer_sync, K_FOREVER);
 
@@ -105,15 +116,35 @@ static int i2c_nrfx_twim_transfer(const struct device *dev,
 		}
 
 		if (msg_buf_used == 0) {
-			buf = msgs[i].buf;
-			buf_len = msgs[i].len;
+			cur_xfer.p_primary_buf = msgs[i].buf;
+			cur_xfer.primary_length = msgs[i].len;
 		} else {
-			buf = msg_buf;
-			buf_len = msg_buf_used;
+			cur_xfer.p_primary_buf = msg_buf;
+			cur_xfer.primary_length = msg_buf_used;
 		}
-		ret = i2c_nrfx_twim_msg_transfer(dev, msgs[i].flags, buf, buf_len, addr);
-		if (ret < 0) {
-			break;
+		cur_xfer.type = (msgs[i].flags & I2C_MSG_READ) ?
+			NRFX_TWIM_XFER_RX : NRFX_TWIM_XFER_TX;
+
+		if (cur_xfer.primary_length > dev_config->max_transfer_size) {
+			LOG_ERR("Trying to transfer more than the maximum size "
+				"for this device: %d > %d",
+				cur_xfer.primary_length,
+				dev_config->max_transfer_size);
+			return -ENOSPC;
+		}
+
+		nrfx_err_t res = nrfx_twim_xfer(&dev_config->twim,
+						&cur_xfer,
+						(msgs[i].flags & I2C_MSG_STOP) ?
+						 0 : NRFX_TWIM_FLAG_TX_NO_STOP);
+		if (res != NRFX_SUCCESS) {
+			if (res == NRFX_ERROR_BUSY) {
+				ret = -EBUSY;
+				break;
+			} else {
+				ret = -EIO;
+				break;
+			}
 		}
 
 		ret = k_sem_take(&dev_data->completion_sync,
@@ -140,7 +171,9 @@ static int i2c_nrfx_twim_transfer(const struct device *dev,
 			break;
 		}
 
-		if (dev_data->res != NRFX_SUCCESS) {
+		res = dev_data->res;
+
+		if (res != NRFX_SUCCESS) {
 			ret = -EIO;
 			break;
 		}
@@ -148,7 +181,8 @@ static int i2c_nrfx_twim_transfer(const struct device *dev,
 		/* If concatenated messages were I2C_MSG_READ type, then
 		 * content of concatenation buffer has to be copied back into
 		 * buffers provided by user. */
-		if ((msgs[i].flags & I2C_MSG_READ) && (buf == msg_buf)) {
+		if ((msgs[i].flags & I2C_MSG_READ)
+		    && cur_xfer.p_primary_buf == msg_buf) {
 			int j = i;
 
 			while (msg_buf_used >= msgs[j].len) {
@@ -193,14 +227,65 @@ static void event_handler(nrfx_twim_evt_t const *p_event, void *p_context)
 	k_sem_give(&dev_data->completion_sync);
 }
 
-static int i2c_nrfx_twim_init(const struct device *dev)
+static int i2c_nrfx_twim_configure(const struct device *dev,
+				   uint32_t i2c_config)
+{
+	const struct i2c_nrfx_twim_config *dev_config = dev->config;
+
+	if (I2C_ADDR_10_BITS & i2c_config) {
+		return -EINVAL;
+	}
+
+	switch (I2C_SPEED_GET(i2c_config)) {
+	case I2C_SPEED_STANDARD:
+		nrf_twim_frequency_set(dev_config->twim.p_twim,
+				       NRF_TWIM_FREQ_100K);
+		break;
+	case I2C_SPEED_FAST:
+		nrf_twim_frequency_set(dev_config->twim.p_twim,
+				       NRF_TWIM_FREQ_400K);
+		break;
+#if NRF_TWIM_HAS_1000_KHZ_FREQ
+	case I2C_SPEED_FAST_PLUS:
+		nrf_twim_frequency_set(dev_config->twim.p_twim,
+				       NRF_TWIM_FREQ_1000K);
+		break;
+#endif
+	default:
+		LOG_ERR("unsupported speed");
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int i2c_nrfx_twim_recover_bus(const struct device *dev)
 {
-	struct i2c_nrfx_twim_data *data = dev->data;
+	const struct i2c_nrfx_twim_config *dev_config = dev->config;
+	enum pm_device_state state;
+	uint32_t scl_pin;
+	uint32_t sda_pin;
+	nrfx_err_t err;
+
+	scl_pin = nrf_twim_scl_pin_get(dev_config->twim.p_twim);
+	sda_pin = nrf_twim_sda_pin_get(dev_config->twim.p_twim);
+
+	/* disable peripheral if active (required to release SCL/SDA lines) */
+	(void)pm_device_state_get(dev, &state);
+	if (state == PM_DEVICE_STATE_ACTIVE) {
+		nrfx_twim_disable(&dev_config->twim);
+	}
 
-	k_sem_init(&data->transfer_sync, 1, 1);
-	k_sem_init(&data->completion_sync, 0, 1);
+	err = nrfx_twim_bus_recover(scl_pin, sda_pin);
+
+	/* restore peripheral if it was active before */
+	if (state == PM_DEVICE_STATE_ACTIVE) {
+		(void)pinctrl_apply_state(dev_config->pcfg,
+					  PINCTRL_STATE_DEFAULT);
+		nrfx_twim_enable(&dev_config->twim);
+	}
 
-	return i2c_nrfx_twim_common_init(dev);
+	return (err == NRFX_SUCCESS ? 0 : -EBUSY);
 }
 
 static const struct i2c_driver_api i2c_nrfx_twim_driver_api = {
@@ -212,6 +297,62 @@ static const struct i2c_driver_api i2c_nrfx_twim_driver_api = {
 	.recover_bus = i2c_nrfx_twim_recover_bus,
 };
 
+static int twim_nrfx_pm_action(const struct device *dev,
+			       enum pm_device_action action)
+{
+	const struct i2c_nrfx_twim_config *dev_config = dev->config;
+
+	switch (action) {
+	case PM_DEVICE_ACTION_RESUME:
+		(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_DEFAULT);
+		nrfx_twim_enable(&dev_config->twim);
+		break;
+	case PM_DEVICE_ACTION_SUSPEND:
+		nrfx_twim_disable(&dev_config->twim);
+		(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+static int i2c_nrfx_twim_init(const struct device *dev)
+{
+	const struct i2c_nrfx_twim_config *dev_config = dev->config;
+	struct i2c_nrfx_twim_data *dev_data = dev->data;
+
+	dev_config->irq_connect();
+
+	k_sem_init(&dev_data->transfer_sync, 1, 1);
+	k_sem_init(&dev_data->completion_sync, 0, 1);
+
+	(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
+
+	if (nrfx_twim_init(&dev_config->twim, &dev_config->twim_config,
+			   event_handler, dev_data) != NRFX_SUCCESS) {
+		LOG_ERR("Failed to initialize device: %s", dev->name);
+		return -EIO;
+	}
+
+	return pm_device_driver_init(dev, twim_nrfx_pm_action);
+}
+
+#define I2C_NRFX_TWIM_INVALID_FREQUENCY  ((nrf_twim_frequency_t)-1)
+#define I2C_NRFX_TWIM_FREQUENCY(bitrate)				       \
+	(bitrate == I2C_BITRATE_STANDARD  ? NRF_TWIM_FREQ_100K :	       \
+	 bitrate == 250000                ? NRF_TWIM_FREQ_250K :	       \
+	 bitrate == I2C_BITRATE_FAST      ? NRF_TWIM_FREQ_400K :	       \
+	IF_ENABLED(NRF_TWIM_HAS_1000_KHZ_FREQ,				       \
+	(bitrate == I2C_BITRATE_FAST_PLUS ? NRF_TWIM_FREQ_1000K :))	       \
+					    I2C_NRFX_TWIM_INVALID_FREQUENCY)
+
+#define I2C(idx) DT_NODELABEL(i2c##idx)
+#define I2C_HAS_PROP(idx, prop)	DT_NODE_HAS_PROP(I2C(idx), prop)
+#define I2C_FREQUENCY(idx)						       \
+	I2C_NRFX_TWIM_FREQUENCY(DT_PROP(I2C(idx), clock_frequency))
+
 #define CONCAT_BUF_SIZE(idx)						       \
 	COND_CODE_1(DT_NODE_HAS_PROP(I2C(idx), zephyr_concat_buf_size),	       \
 		    (DT_PROP(I2C(idx), zephyr_concat_buf_size)), (0))
@@ -240,15 +381,13 @@ static const struct i2c_driver_api i2c_nrfx_twim_driver_api = {
 		 I2C_MEMORY_SECTION(idx);))				       \
 	static struct i2c_nrfx_twim_data twim_##idx##_data;		       \
 	PINCTRL_DT_DEFINE(I2C(idx));					       \
-	static const							       \
-	struct i2c_nrfx_twim_common_config twim_##idx##z_config = {	       \
+	static const struct i2c_nrfx_twim_config twim_##idx##z_config = {      \
 		.twim = NRFX_TWIM_INSTANCE(idx),			       \
 		.twim_config = {					       \
 			.skip_gpio_cfg = true,				       \
 			.skip_psel_cfg = true,				       \
 			.frequency = I2C_FREQUENCY(idx),		       \
 		},							       \
-		.event_handler = event_handler,				       \
 		.msg_buf_size = MSG_BUF_SIZE(idx),			       \
 		.irq_connect = irq_connect##idx,			       \
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(I2C(idx)),		       \
diff --git a/drivers/i2c/i2c_nrfx_twim_common.c b/drivers/i2c/i2c_nrfx_twim_common.c
deleted file mode 100644
index be0b78ac6b8..00000000000
--- a/drivers/i2c/i2c_nrfx_twim_common.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2018, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/drivers/i2c.h>
-#include <zephyr/drivers/pinctrl.h>
-#include <zephyr/dt-bindings/i2c/i2c.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/pm/device_runtime.h>
-
-#include "i2c_nrfx_twim_common.h"
-
-LOG_MODULE_DECLARE(i2c_nrfx_twim);
-
-int i2c_nrfx_twim_recover_bus(const struct device *dev)
-{
-	const struct i2c_nrfx_twim_common_config *config = dev->config;
-	enum pm_device_state state;
-	uint32_t scl_pin;
-	uint32_t sda_pin;
-	nrfx_err_t err;
-
-	scl_pin = nrf_twim_scl_pin_get(config->twim.p_twim);
-	sda_pin = nrf_twim_sda_pin_get(config->twim.p_twim);
-
-	/* disable peripheral if active (required to release SCL/SDA lines) */
-	(void)pm_device_state_get(dev, &state);
-	if (state == PM_DEVICE_STATE_ACTIVE) {
-		nrfx_twim_disable(&config->twim);
-	}
-
-	err = nrfx_twim_bus_recover(scl_pin, sda_pin);
-
-	/* restore peripheral if it was active before */
-	if (state == PM_DEVICE_STATE_ACTIVE) {
-		(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
-		nrfx_twim_enable(&config->twim);
-	}
-
-	return (err == NRFX_SUCCESS ? 0 : -EBUSY);
-}
-
-int i2c_nrfx_twim_configure(const struct device *dev, uint32_t i2c_config)
-{
-	const struct i2c_nrfx_twim_common_config *config = dev->config;
-
-	if (I2C_ADDR_10_BITS & i2c_config) {
-		return -EINVAL;
-	}
-
-	switch (I2C_SPEED_GET(i2c_config)) {
-	case I2C_SPEED_STANDARD:
-		nrf_twim_frequency_set(config->twim.p_twim, NRF_TWIM_FREQ_100K);
-		break;
-	case I2C_SPEED_FAST:
-		nrf_twim_frequency_set(config->twim.p_twim, NRF_TWIM_FREQ_400K);
-		break;
-#if NRF_TWIM_HAS_1000_KHZ_FREQ
-	case I2C_SPEED_FAST_PLUS:
-		nrf_twim_frequency_set(config->twim.p_twim, NRF_TWIM_FREQ_1000K);
-		break;
-#endif
-	default:
-		LOG_ERR("unsupported speed");
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-int i2c_nrfx_twim_msg_transfer(const struct device *dev, uint8_t flags, uint8_t *buf,
-			       size_t buf_len, uint16_t i2c_addr)
-{
-	const struct i2c_nrfx_twim_common_config *config = dev->config;
-	nrfx_twim_xfer_desc_t cur_xfer = {
-		.address = i2c_addr,
-		.type = (flags & I2C_MSG_READ) ? NRFX_TWIM_XFER_RX : NRFX_TWIM_XFER_TX,
-		.p_primary_buf = buf,
-		.primary_length = buf_len,
-	};
-	nrfx_err_t res;
-	int ret = 0;
-
-	if (buf_len > config->max_transfer_size) {
-		LOG_ERR("Trying to transfer more than the maximum size "
-			"for this device: %d > %d",
-			buf_len, config->max_transfer_size);
-		return -ENOSPC;
-	}
-
-	res = nrfx_twim_xfer(&config->twim, &cur_xfer,
-			     (flags & I2C_MSG_STOP) ? 0 : NRFX_TWIM_FLAG_TX_NO_STOP);
-	if (res != NRFX_SUCCESS) {
-		if (res == NRFX_ERROR_BUSY) {
-			ret = -EBUSY;
-		} else {
-			ret = -EIO;
-		}
-	}
-	return ret;
-}
-
-int twim_nrfx_pm_action(const struct device *dev, enum pm_device_action action)
-{
-	const struct i2c_nrfx_twim_common_config *config = dev->config;
-
-	switch (action) {
-	case PM_DEVICE_ACTION_RESUME:
-		(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
-		nrfx_twim_enable(&config->twim);
-		break;
-	case PM_DEVICE_ACTION_SUSPEND:
-		nrfx_twim_disable(&config->twim);
-		(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
-		break;
-	default:
-		return -ENOTSUP;
-	}
-
-	return 0;
-}
-
-int i2c_nrfx_twim_common_init(const struct device *dev)
-{
-	const struct i2c_nrfx_twim_common_config *config = dev->config;
-
-	config->irq_connect();
-
-	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
-
-	if (nrfx_twim_init(&config->twim, &config->twim_config, config->event_handler, data) !=
-	    NRFX_SUCCESS) {
-		LOG_ERR("Failed to initialize device: %s", dev->name);
-		return -EIO;
-	}
-
-	return pm_device_driver_init(dev, twim_nrfx_pm_action);
-}
diff --git a/drivers/i2c/i2c_nrfx_twim_common.h b/drivers/i2c/i2c_nrfx_twim_common.h
deleted file mode 100644
index 23811a225e7..00000000000
--- a/drivers/i2c/i2c_nrfx_twim_common.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2024, Croxel Inc
- * Copyright (c) 2024, Embeint Inc
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_DRIVERS_I2C_I2C_NRFX_TWIM_COMMON_H_
-#define ZEPHYR_DRIVERS_I2C_I2C_NRFX_TWIM_COMMON_H_
-
-#include <zephyr/device.h>
-#include <zephyr/pm/device.h>
-#include <nrfx_twim.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define I2C_NRFX_TWIM_INVALID_FREQUENCY ((nrf_twim_frequency_t)-1)
-#define I2C_NRFX_TWIM_FREQUENCY(bitrate)                                                           \
-	(bitrate == I2C_BITRATE_STANDARD ? NRF_TWIM_FREQ_100K                                      \
-	 : bitrate == 250000             ? NRF_TWIM_FREQ_250K                                      \
-	 : bitrate == I2C_BITRATE_FAST                                                             \
-		 ? NRF_TWIM_FREQ_400K                                                              \
-		 : IF_ENABLED(NRF_TWIM_HAS_1000_KHZ_FREQ,                                          \
-			      (bitrate == I2C_BITRATE_FAST_PLUS ? NRF_TWIM_FREQ_1000K :))          \
-			   I2C_NRFX_TWIM_INVALID_FREQUENCY)
-
-#define I2C(idx)                DT_NODELABEL(i2c##idx)
-#define I2C_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(I2C(idx), prop)
-#define I2C_FREQUENCY(idx)      I2C_NRFX_TWIM_FREQUENCY(DT_PROP(I2C(idx), clock_frequency))
-
-struct i2c_nrfx_twim_common_config {
-	nrfx_twim_t twim;
-	nrfx_twim_config_t twim_config;
-	nrfx_twim_evt_handler_t event_handler;
-	uint16_t msg_buf_size;
-	void (*irq_connect)(void);
-	const struct pinctrl_dev_config *pcfg;
-	uint8_t *msg_buf;
-	uint16_t max_transfer_size;
-};
-
-int i2c_nrfx_twim_common_init(const struct device *dev);
-int i2c_nrfx_twim_configure(const struct device *dev, uint32_t i2c_config);
-int i2c_nrfx_twim_recover_bus(const struct device *dev);
-int i2c_nrfx_twim_msg_transfer(const struct device *dev, uint8_t flags, uint8_t *buf,
-			       size_t buf_len, uint16_t i2c_addr);
-
-#ifdef CONFIG_PM_DEVICE
-int twim_nrfx_pm_action(const struct device *dev, enum pm_device_action action);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZEPHYR_DRIVERS_I2C_I2C_NRFX_TWIM_COMMON_H_ */

From ff1532678890dbb79af715d5d02ef0a61e837548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:26 +0100
Subject: [PATCH 1394/2913] Revert "[nrf fromtree] drivers: i2c: nrfx_twim:
 simplify PM by using pm_device_driver_init"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6872c92b817a4e3afc51e7ad00fd28d6e338cb43.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/i2c/i2c_nrfx_twim.c                   | 39 ++++++++++++++++---
 dts/arm/nordic/nrf52805.dtsi                  |  1 -
 dts/arm/nordic/nrf52810.dtsi                  |  1 -
 dts/arm/nordic/nrf52811.dtsi                  |  1 -
 dts/arm/nordic/nrf52820.dtsi                  |  2 -
 dts/arm/nordic/nrf52832.dtsi                  |  2 -
 dts/arm/nordic/nrf52833.dtsi                  |  2 -
 dts/arm/nordic/nrf52840.dtsi                  |  2 -
 .../nordic/nrf5340_cpuapp_peripherals.dtsi    |  4 --
 dts/arm/nordic/nrf5340_cpunet.dtsi            |  1 -
 dts/arm/nordic/nrf91_peripherals.dtsi         |  4 --
 dts/common/nordic/nrf54h20.dtsi               |  8 ----
 dts/common/nordic/nrf54l15.dtsi               |  4 --
 dts/common/nordic/nrf54l20.dtsi               |  4 --
 dts/common/nordic/nrf9280.dtsi                |  8 ----
 15 files changed, 33 insertions(+), 50 deletions(-)

diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c
index e38512137ed..4d1ff0f4640 100644
--- a/drivers/i2c/i2c_nrfx_twim.c
+++ b/drivers/i2c/i2c_nrfx_twim.c
@@ -297,26 +297,40 @@ static const struct i2c_driver_api i2c_nrfx_twim_driver_api = {
 	.recover_bus = i2c_nrfx_twim_recover_bus,
 };
 
+#ifdef CONFIG_PM_DEVICE
 static int twim_nrfx_pm_action(const struct device *dev,
 			       enum pm_device_action action)
 {
 	const struct i2c_nrfx_twim_config *dev_config = dev->config;
+	int ret = 0;
 
 	switch (action) {
 	case PM_DEVICE_ACTION_RESUME:
-		(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_DEFAULT);
+		ret = pinctrl_apply_state(dev_config->pcfg,
+					  PINCTRL_STATE_DEFAULT);
+		if (ret < 0) {
+			return ret;
+		}
 		nrfx_twim_enable(&dev_config->twim);
 		break;
+
 	case PM_DEVICE_ACTION_SUSPEND:
 		nrfx_twim_disable(&dev_config->twim);
-		(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
+
+		ret = pinctrl_apply_state(dev_config->pcfg,
+					  PINCTRL_STATE_SLEEP);
+		if (ret < 0) {
+			return ret;
+		}
 		break;
+
 	default:
-		return -ENOTSUP;
+		ret = -ENOTSUP;
 	}
 
-	return 0;
+	return ret;
 }
+#endif /* CONFIG_PM_DEVICE */
 
 static int i2c_nrfx_twim_init(const struct device *dev)
 {
@@ -328,7 +342,13 @@ static int i2c_nrfx_twim_init(const struct device *dev)
 	k_sem_init(&dev_data->transfer_sync, 1, 1);
 	k_sem_init(&dev_data->completion_sync, 0, 1);
 
-	(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
+	int err = pinctrl_apply_state(dev_config->pcfg,
+				      COND_CODE_1(CONFIG_PM_DEVICE_RUNTIME,
+						  (PINCTRL_STATE_SLEEP),
+						  (PINCTRL_STATE_DEFAULT)));
+	if (err < 0) {
+		return err;
+	}
 
 	if (nrfx_twim_init(&dev_config->twim, &dev_config->twim_config,
 			   event_handler, dev_data) != NRFX_SUCCESS) {
@@ -336,7 +356,14 @@ static int i2c_nrfx_twim_init(const struct device *dev)
 		return -EIO;
 	}
 
-	return pm_device_driver_init(dev, twim_nrfx_pm_action);
+#ifdef CONFIG_PM_DEVICE_RUNTIME
+	pm_device_init_suspended(dev);
+	pm_device_runtime_enable(dev);
+#else
+	nrfx_twim_enable(&dev_config->twim);
+#endif
+
+	return 0;
 }
 
 #define I2C_NRFX_TWIM_INVALID_FREQUENCY  ((nrf_twim_frequency_t)-1)
diff --git a/dts/arm/nordic/nrf52805.dtsi b/dts/arm/nordic/nrf52805.dtsi
index fbf89434690..bd768ca85fe 100644
--- a/dts/arm/nordic/nrf52805.dtsi
+++ b/dts/arm/nordic/nrf52805.dtsi
@@ -131,7 +131,6 @@
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <14>;
 			status = "disabled";
-			zephyr,pm-device-runtime-auto;
 		};
 
 		spi0: spi@40004000 {
diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
index 3be690a987e..df3e7ab9fa6 100644
--- a/dts/arm/nordic/nrf52810.dtsi
+++ b/dts/arm/nordic/nrf52810.dtsi
@@ -135,7 +135,6 @@
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <10>;
 			status = "disabled";
-			zephyr,pm-device-runtime-auto;
 		};
 
 		spi0: spi@40004000 {
diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi
index 83a66d77792..415ece78612 100644
--- a/dts/arm/nordic/nrf52811.dtsi
+++ b/dts/arm/nordic/nrf52811.dtsi
@@ -147,7 +147,6 @@
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <14>;
 			status = "disabled";
-			zephyr,pm-device-runtime-auto;
 		};
 
 		spi1: spi@40003000 {
diff --git a/dts/arm/nordic/nrf52820.dtsi b/dts/arm/nordic/nrf52820.dtsi
index 71abcab55cc..4ddecb86a85 100644
--- a/dts/arm/nordic/nrf52820.dtsi
+++ b/dts/arm/nordic/nrf52820.dtsi
@@ -149,7 +149,6 @@
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <15>;
 			status = "disabled";
-			zephyr,pm-device-runtime-auto;
 		};
 
 		spi0: spi@40003000 {
@@ -186,7 +185,6 @@
 			interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <15>;
 			status = "disabled";
-			zephyr,pm-device-runtime-auto;
 		};
 
 		spi1: spi@40004000 {
diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
index 49acb441c57..cd2115028ca 100644
--- a/dts/arm/nordic/nrf52832.dtsi
+++ b/dts/arm/nordic/nrf52832.dtsi
@@ -135,7 +135,6 @@
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <8>;
 			status = "disabled";
-			zephyr,pm-device-runtime-auto;
 		};
 
 		spi0: spi@40003000 {
@@ -172,7 +171,6 @@
 			interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <8>;
 			status = "disabled";
-			zephyr,pm-device-runtime-auto;
 		};
 
 		spi1: spi@40004000 {
diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi
index 7d23e15f5f8..60291420be9 100644
--- a/dts/arm/nordic/nrf52833.dtsi
+++ b/dts/arm/nordic/nrf52833.dtsi
@@ -149,7 +149,6 @@
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
-			zephyr,pm-device-runtime-auto;
 		};
 
 		spi0: spi@40003000 {
@@ -186,7 +185,6 @@
 			interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
-			zephyr,pm-device-runtime-auto;
 		};
 
 		spi1: spi@40004000 {
diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index 56712a6bccc..b9c1655a614 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -137,7 +137,6 @@
 			interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
-			zephyr,pm-device-runtime-auto;
 		};
 
 		spi0: spi@40003000 {
@@ -174,7 +173,6 @@
 			interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
-			zephyr,pm-device-runtime-auto;
 		};
 
 		spi1: spi@40004000 {
diff --git a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
index 745e23d87ce..d91bb508d30 100644
--- a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
@@ -108,7 +108,6 @@ i2c0: i2c@8000 {
 	interrupts = <8 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <16>;
 	status = "disabled";
-	zephyr,pm-device-runtime-auto;
 };
 
 spi0: spi@8000 {
@@ -150,7 +149,6 @@ i2c1: i2c@9000 {
 	interrupts = <9 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <16>;
 	status = "disabled";
-	zephyr,pm-device-runtime-auto;
 };
 
 spi1: spi@9000 {
@@ -205,7 +203,6 @@ i2c2: i2c@b000 {
 	interrupts = <11 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <16>;
 	status = "disabled";
-	zephyr,pm-device-runtime-auto;
 };
 
 spi2: spi@b000 {
@@ -247,7 +244,6 @@ i2c3: i2c@c000 {
 	interrupts = <12 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <16>;
 	status = "disabled";
-	zephyr,pm-device-runtime-auto;
 };
 
 spi3: spi@c000 {
diff --git a/dts/arm/nordic/nrf5340_cpunet.dtsi b/dts/arm/nordic/nrf5340_cpunet.dtsi
index c17a8caf8f9..4b6c590858c 100644
--- a/dts/arm/nordic/nrf5340_cpunet.dtsi
+++ b/dts/arm/nordic/nrf5340_cpunet.dtsi
@@ -205,7 +205,6 @@
 			interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
 			easydma-maxcnt-bits = <16>;
 			status = "disabled";
-			zephyr,pm-device-runtime-auto;
 		};
 
 		spi0: spi@41013000 {
diff --git a/dts/arm/nordic/nrf91_peripherals.dtsi b/dts/arm/nordic/nrf91_peripherals.dtsi
index 75613b7df2c..14d05d27cee 100644
--- a/dts/arm/nordic/nrf91_peripherals.dtsi
+++ b/dts/arm/nordic/nrf91_peripherals.dtsi
@@ -160,7 +160,6 @@ i2c0: i2c@8000 {
 	interrupts = <8 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <13>;
 	status = "disabled";
-	zephyr,pm-device-runtime-auto;
 };
 
 i2c1: i2c@9000 {
@@ -177,7 +176,6 @@ i2c1: i2c@9000 {
 	interrupts = <9 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <13>;
 	status = "disabled";
-	zephyr,pm-device-runtime-auto;
 };
 
 i2c2: i2c@a000 {
@@ -194,7 +192,6 @@ i2c2: i2c@a000 {
 	interrupts = <10 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <13>;
 	status = "disabled";
-	zephyr,pm-device-runtime-auto;
 };
 
 i2c3: i2c@b000 {
@@ -211,7 +208,6 @@ i2c3: i2c@b000 {
 	interrupts = <11 NRF_DEFAULT_IRQ_PRIORITY>;
 	easydma-maxcnt-bits = <13>;
 	status = "disabled";
-	zephyr,pm-device-runtime-auto;
 };
 
 spi0: spi@8000 {
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index f7665221e3b..979695f7335 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -983,7 +983,6 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi130: spi@9a5000 {
@@ -1029,7 +1028,6 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi131: spi@9a6000 {
@@ -1116,7 +1114,6 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi132: spi@9b5000 {
@@ -1162,7 +1159,6 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi133: spi@9b6000 {
@@ -1249,7 +1245,6 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi134: spi@9c5000 {
@@ -1295,7 +1290,6 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi135: spi@9c6000 {
@@ -1382,7 +1376,6 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi136: spi@9d5000 {
@@ -1428,7 +1421,6 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi137: spi@9d6000 {
diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index 71639075aa9..7d59b20d36b 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -286,7 +286,6 @@
 				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi20: spi@c6000 {
@@ -326,7 +325,6 @@
 				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi21: spi@c7000 {
@@ -366,7 +364,6 @@
 				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi22: spi@c8000 {
@@ -583,7 +580,6 @@
 				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi30: spi@104000 {
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 293f16e1910..258cc856e5d 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -237,7 +237,6 @@
 				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi20: spi@c6000 {
@@ -277,7 +276,6 @@
 				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi21: spi@c7000 {
@@ -317,7 +315,6 @@
 				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi22: spi@c8000 {
@@ -525,7 +522,6 @@
 				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
 				easydma-maxcnt-bits = <16>;
 				status = "disabled";
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi30: spi@104000 {
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 4fd64cd10be..45b05f9262e 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -815,7 +815,6 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi130: spi@9a5000 {
@@ -855,7 +854,6 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi131: spi@9a6000 {
@@ -929,7 +927,6 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi132: spi@9b5000 {
@@ -969,7 +966,6 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi133: spi@9b6000 {
@@ -1043,7 +1039,6 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi134: spi@9c5000 {
@@ -1083,7 +1078,6 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi135: spi@9c6000 {
@@ -1157,7 +1151,6 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi136: spi@9d5000 {
@@ -1197,7 +1190,6 @@
 				#size-cells = <0>;
 				nordic,clockpin-enable = <NRF_FUN_TWIM_SDA>,
 							 <NRF_FUN_TWIM_SCL>;
-				zephyr,pm-device-runtime-auto;
 			};
 
 			spi137: spi@9d6000 {

From 3e7a969d1a96ed1f6e689b0d0e43a20eaabf4858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:26 +0100
Subject: [PATCH 1395/2913] Revert "[nrf fromtree] manifest: Update nRF hw
 models to latest"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 87840f4c71441db64e47abda628b4e0a5d45d2ae.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 244b91bbf84..33c3fdb14b5 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: aeef3db9fa9e4b9d12b3bbec44f9cedc8fcb7d9c
+      revision: aca798cf7cf0c5dc1fd89c66cf62670051feb8d0
       path: modules/bsim_hw_models/nrf_hw_models
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719

From adbb1acb143c9deceb07925d1bdb37f250824ea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:26 +0100
Subject: [PATCH 1396/2913] Revert "[nrf fromtree] manifest: Update bsim to
 version v2.4"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c254826213b76410b7e3a9a0b710eafef6b24d2a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/west.yml b/west.yml
index 33c3fdb14b5..0b7fdfece41 100644
--- a/west.yml
+++ b/west.yml
@@ -34,7 +34,7 @@ manifest:
       path: modules/lib/acpica
     - name: bsim
       repo-path: babblesim-manifest
-      revision: 1f242f4ed7fc141fdfcfeca8d21c6d9e801179d7
+      revision: 9ee22c707970f6621adba0375841c0a609e24628
       path: tools/bsim
       groups:
         - babblesim
@@ -42,21 +42,21 @@ manifest:
       remote: babblesim
       repo-path: base
       path: tools/bsim/components
-      revision: 0cc70e78a88c1de9d8ec045a703b38134861e7e7
+      revision: a3dff9a57f334fb25daa9625841cd64cbfe56681
       groups:
         - babblesim
     - name: babblesim_ext_2G4_libPhyComv1
       remote: babblesim
       repo-path: ext_2G4_libPhyComv1
       path: tools/bsim/components/ext_2G4_libPhyComv1
-      revision: 15ae0f87fa049e04cbec48a866f3bc37d903f950
+      revision: aa4951317cc7d84f24152ea38ac9ac21e6d78a76
       groups:
         - babblesim
     - name: babblesim_ext_2G4_phy_v1
       remote: babblesim
       repo-path: ext_2G4_phy_v1
       path: tools/bsim/components/ext_2G4_phy_v1
-      revision: 62e797b2c518e5bb6123a198382ed2b64b8c068e
+      revision: 04eeb3c3794444122fbeeb3715f4233b0b50cfbb
       groups:
         - babblesim
     - name: babblesim_ext_2G4_channel_NtNcable

From e5f0a14aa374e1fbd217bcb233c5dc7b5bdd3118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:26 +0100
Subject: [PATCH 1397/2913] Revert "[nrf fromtree] nordic: Remove the nRF54H20
 Engineering B"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7102aeee5115312c48155c30e50cdbb037f3af44.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/cache/Kconfig.nrf                     |  2 +-
 modules/hal_nordic/Kconfig                    |  2 +-
 modules/hal_nordic/nrfs/Kconfig               |  4 ++-
 modules/hal_nordic/nrfx/CMakeLists.txt        | 12 +++++++
 modules/hal_nordic/nrfx/nrfx_config.h         |  8 ++---
 scripts/west_commands/runners/nrf_common.py   |  2 ++
 soc/nordic/common/vpr/Kconfig.sysbuild        |  2 +-
 soc/nordic/nrf54h/Kconfig                     | 12 +++++++
 .../nrf54h/Kconfig.defconfig.nrf54h20_cpuapp  |  4 +--
 .../nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr |  4 +--
 .../nrf54h/Kconfig.defconfig.nrf54h20_cpuppr  |  4 +--
 .../nrf54h/Kconfig.defconfig.nrf54h20_cpurad  |  4 +--
 soc/nordic/nrf54h/Kconfig.soc                 | 32 ++++++++++++++++++-
 soc/nordic/nrf54h/gpd/Kconfig                 |  3 +-
 soc/nordic/nrf54h/soc.h                       |  4 +--
 subsys/logging/frontends/Kconfig              |  3 +-
 16 files changed, 81 insertions(+), 21 deletions(-)

diff --git a/drivers/cache/Kconfig.nrf b/drivers/cache/Kconfig.nrf
index c1cfc2c8c58..ffcbfe66d19 100644
--- a/drivers/cache/Kconfig.nrf
+++ b/drivers/cache/Kconfig.nrf
@@ -10,6 +10,6 @@ config CACHE_NRF_CACHE
 
 config CACHE_NRF_PATCH_LINEADDR
 	bool "Patch lineaddr"
-	default y if SOC_NRF54H20
+	default y if SOC_NRF54H20 || SOC_NRF54H20_ENGB
 	help
 	  Manually set 28th bit in the LINEADDR in Trustzone Secure build.
diff --git a/modules/hal_nordic/Kconfig b/modules/hal_nordic/Kconfig
index dd4e0a0859b..9d54c15d715 100644
--- a/modules/hal_nordic/Kconfig
+++ b/modules/hal_nordic/Kconfig
@@ -55,7 +55,7 @@ endchoice
 
 config NRF_802154_TEMPERATURE_UPDATE
 	bool "nRF 802.15.4 temperature update"
-	default y if !SOC_NRF54H20
+	default y if !SOC_NRF54H20 && !SOC_NRF54H20_ENGB
 	help
 	  Enable temperature update for nRF 802.15.4 driver
 
diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig
index 8c5b61bb11f..eafe0616764 100644
--- a/modules/hal_nordic/nrfs/Kconfig
+++ b/modules/hal_nordic/nrfs/Kconfig
@@ -40,7 +40,9 @@ config NRFS_HAS_VBUS_DETECTOR_SERVICE
 config NRFS
 	bool "nRF Services Support"
 	select NRFS_LOCAL_DOMAIN if SOC_NRF54H20_CPUAPP || \
+				    SOC_NRF54H20_ENGB_CPUAPP || \
 				    SOC_NRF54H20_CPURAD || \
+				    SOC_NRF54H20_ENGB_CPURAD || \
 				    SOC_NRF9280_CPUAPP || \
 				    SOC_NRF9280_CPURAD
 	depends on HAS_NRFS
@@ -101,7 +103,7 @@ config NRFS_PMIC_SERVICE_ENABLED
 config NRFS_DVFS_SERVICE_ENABLED
 	bool "DVFS service"
 	depends on NRFS_HAS_DVFS_SERVICE
-	default y if SOC_NRF54H20_CPUAPP || SOC_NRF9280_CPUAPP
+	default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || SOC_NRF9280_CPUAPP
 
 config NRFS_DIAG_SERVICE_ENABLED
 	bool "System Diagnostics service (only for development purposes)"
diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index e800b909ec4..1c854a822d5 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -44,6 +44,14 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUPPR     NRF54H20_XXAA
                                                                 NRF_PPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR    NRF54H20_XXAA
                                                                 NRF_FLPR)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP NRF54H20_ENGB_XXAA
+                                                                 NRF_APPLICATION)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD NRF54H20_ENGB_XXAA
+                                                                 NRF_RADIOCORE)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR NRF54H20_ENGB_XXAA
+                                                                 NRF_PPR)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR NRF54H20_ENGB_XXAA
+                                                                  NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15            NRF54L15_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR    NRF_FLPR)
@@ -222,6 +230,10 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUAPP      nrf54h20_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUPPR      nrf54h20_ppr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR     nrf54h20_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPURAD      nrf54h20_radiocore.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP  nrf54h20_engb_application.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR  nrf54h20_engb_ppr.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR nrf54h20_engb_flpr.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD  nrf54h20_engb_radiocore.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP      nrf54l15_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR     nrf54l15_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54l20_enga_application.svd)
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index 48b3b8226fb..cfd70516972 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -1121,13 +1121,13 @@
     #include <nrfx_config_nrf5340_application.h>
 #elif defined(NRF5340_XXAA_NETWORK)
     #include <nrfx_config_nrf5340_network.h>
-#elif defined(NRF54H20_XXAA) && defined(NRF_APPLICATION)
+#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_APPLICATION)
     #include <nrfx_config_nrf54h20_application.h>
-#elif defined(NRF54H20_XXAA) && defined(NRF_RADIOCORE)
+#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_RADIOCORE)
     #include <nrfx_config_nrf54h20_radiocore.h>
-#elif defined(NRF54H20_XXAA) && defined(NRF_PPR)
+#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_PPR)
     #include <nrfx_config_nrf54h20_ppr.h>
-#elif defined(NRF54H20_XXAA) && defined(NRF_FLPR)
+#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_FLPR)
     #include <nrfx_config_nrf54h20_flpr.h>
 #elif defined(NRF54L15_XXAA) && defined(NRF_APPLICATION)
     #include <nrfx_config_nrf54l15_application.h>
diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index 6324ca8dc7a..6423253233c 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -261,10 +261,12 @@ def program_hex(self):
 
             cpuapp = (
                 self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPUAPP') or
+                self.build_conf.getboolean('CONFIG_SOC_NRF54H20_ENGB_CPUAPP') or
                 self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPUAPP')
             )
             cpurad = (
                 self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPURAD') or
+                self.build_conf.getboolean('CONFIG_SOC_NRF54H20_ENGB_CPURAD') or
                 self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPURAD')
             )
 
diff --git a/soc/nordic/common/vpr/Kconfig.sysbuild b/soc/nordic/common/vpr/Kconfig.sysbuild
index cfbd619f623..8821810d63d 100644
--- a/soc/nordic/common/vpr/Kconfig.sysbuild
+++ b/soc/nordic/common/vpr/Kconfig.sysbuild
@@ -4,7 +4,7 @@
 config VPR_LAUNCHER
 	bool "VPR launcher"
 	default y
-	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR)
+	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR)
 	help
 	  Include VPR launcher in build.
 	  VPR launcher is a minimal sample built for an ARM core that starts given VPR core.
diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
index 0baab4121ad..1b667e25985 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -34,6 +34,9 @@ config SOC_NRF54H20_CPUAPP_COMMON
 config SOC_NRF54H20_CPUAPP
 	select SOC_NRF54H20_CPUAPP_COMMON
 
+config SOC_NRF54H20_ENGB_CPUAPP
+	select SOC_NRF54H20_CPUAPP_COMMON
+
 config SOC_NRF54H20_CPURAD_COMMON
 	bool
 	select ARM
@@ -58,10 +61,19 @@ config SOC_NRF54H20_CPURAD_COMMON
 config SOC_NRF54H20_CPURAD
 	select SOC_NRF54H20_CPURAD_COMMON
 
+config SOC_NRF54H20_ENGB_CPURAD
+	select SOC_NRF54H20_CPURAD_COMMON
+
 config SOC_NRF54H20_CPUPPR
 	depends on RISCV_CORE_NORDIC_VPR
 
+config SOC_NRF54H20_ENGB_CPUPPR
+	depends on RISCV_CORE_NORDIC_VPR
+
 config SOC_NRF54H20_CPUFLPR
 	depends on RISCV_CORE_NORDIC_VPR
 
+config SOC_NRF54H20_ENGB_CPUFLPR
+	depends on RISCV_CORE_NORDIC_VPR
+
 rsource "gpd/Kconfig"
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
index 61cc96da71f..597f7fbea22 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
@@ -3,7 +3,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NRF54H20_CPUAPP
+if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
 
 config NUM_IRQS
 	default 471
@@ -14,4 +14,4 @@ config NRF_REGTOOL_GENERATE_UICR
 config NRF_REGTOOL_GENERATE_BICR
 	default y
 
-endif # SOC_NRF54H20_CPUAPP
+endif # SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
index 2b792e9f1b9..97b1e89a9c1 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NRF54H20_CPUFLPR
+if SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR
 
 config NUM_IRQS
 	default 496
@@ -10,4 +10,4 @@ config NUM_IRQS
 config ASSERT
 	default n
 
-endif # SOC_NRF54H20_CPUFLPR
+endif # SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
index bf7c12a3a69..02649146ad7 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NRF54H20_CPUPPR
+if SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR
 
 config NUM_IRQS
 	default 496
@@ -13,4 +13,4 @@ config SYS_CLOCK_TICKS_PER_SEC
 config ASSERT
 	default n
 
-endif # SOC_NRF54H20_CPUPPR
+endif # SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad
index 4437e7aadc4..9ad0b30e1c8 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad
@@ -3,7 +3,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NRF54H20_CPURAD
+if SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
 
 config NUM_IRQS
 	default 471
@@ -11,4 +11,4 @@ config NUM_IRQS
 config NRF_REGTOOL_GENERATE_UICR
 	default y
 
-endif # SOC_NRF54H20_CPURAD
+endif # SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
diff --git a/soc/nordic/nrf54h/Kconfig.soc b/soc/nordic/nrf54h/Kconfig.soc
index 459854e13b2..852e92bb138 100644
--- a/soc/nordic/nrf54h/Kconfig.soc
+++ b/soc/nordic/nrf54h/Kconfig.soc
@@ -9,29 +9,59 @@ config SOC_NRF54H20
 	help
 	  nRF54H20
 
+config SOC_NRF54H20_ENGB
+	bool
+	select SOC_SERIES_NRF54HX
+	help
+	  nRF54H20 (EngB)
+
 config SOC_NRF54H20_CPUAPP
 	bool
 	select SOC_NRF54H20
 	help
 	  nRF54H20 CPUAPP
 
+config SOC_NRF54H20_ENGB_CPUAPP
+	bool
+	select SOC_NRF54H20_ENGB
+	help
+	  nRF54H20 (EngB) CPUAPP
+
 config SOC_NRF54H20_CPURAD
 	bool
 	select SOC_NRF54H20
 	help
 	  nRF54H20 CPURAD
 
+config SOC_NRF54H20_ENGB_CPURAD
+	bool
+	select SOC_NRF54H20_ENGB
+	help
+	  nRF54H20 (EngB) CPURAD
+
 config SOC_NRF54H20_CPUPPR
 	bool
 	select SOC_NRF54H20
 	help
 	  nRF54H20 CPUPPR
 
+config SOC_NRF54H20_ENGB_CPUPPR
+	bool
+	select SOC_NRF54H20_ENGB
+	help
+	  nRF54H20 (EngB) CPUPPR
+
 config SOC_NRF54H20_CPUFLPR
 	bool
 	select SOC_NRF54H20
 	help
 	  nRF54H20 CPUFLPR
 
+config SOC_NRF54H20_ENGB_CPUFLPR
+	bool
+	select SOC_NRF54H20_ENGB
+	help
+	  nRF54H20 (EngB) CPUFLPR
+
 config SOC
-	default "nrf54h20" if SOC_NRF54H20
+	default "nrf54h20" if SOC_NRF54H20 || SOC_NRF54H20_ENGB
diff --git a/soc/nordic/nrf54h/gpd/Kconfig b/soc/nordic/nrf54h/gpd/Kconfig
index 98b374f6de9..b9bd568cda6 100644
--- a/soc/nordic/nrf54h/gpd/Kconfig
+++ b/soc/nordic/nrf54h/gpd/Kconfig
@@ -6,6 +6,7 @@ config SOC_NRF54H20_GPD
 	imply NRFS
 	imply NRFS_GDPWR_SERVICE_ENABLED
 	select ONOFF
-	default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD
+	default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || \
+		     SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
 	help
 	  This option enables the Global Power Domain service.
diff --git a/soc/nordic/nrf54h/soc.h b/soc/nordic/nrf54h/soc.h
index 566c07a8c2c..db79e2c8c72 100644
--- a/soc/nordic/nrf54h/soc.h
+++ b/soc/nordic/nrf54h/soc.h
@@ -9,7 +9,7 @@
 
 #include <soc_nrf_common.h>
 
-#if defined(CONFIG_SOC_NRF54H20_CPUAPP)
+#if defined(CONFIG_SOC_NRF54H20_CPUAPP) || defined(CONFIG_SOC_NRF54H20_ENGB_CPUAPP)
 #define RAMBLOCK_CONTROL_BIT_ICACHE MEMCONF_POWER_CONTROL_MEM1_Pos
 #define RAMBLOCK_CONTROL_BIT_DCACHE MEMCONF_POWER_CONTROL_MEM2_Pos
 #define RAMBLOCK_POWER_ID           0
@@ -17,7 +17,7 @@
 #define RAMBLOCK_RET_MASK           (MEMCONF_POWER_RET_MEM0_Msk)
 #define RAMBLOCK_RET_BIT_ICACHE     MEMCONF_POWER_RET_MEM1_Pos
 #define RAMBLOCK_RET_BIT_DCACHE     MEMCONF_POWER_RET_MEM2_Pos
-#elif defined(CONFIG_SOC_NRF54H20_CPURAD)
+#elif defined(CONFIG_SOC_NRF54H20_CPURAD) || defined(CONFIG_SOC_NRF54H20_ENGB_CPURAD)
 #define RAMBLOCK_CONTROL_BIT_ICACHE MEMCONF_POWER_CONTROL_MEM6_Pos
 #define RAMBLOCK_CONTROL_BIT_DCACHE MEMCONF_POWER_CONTROL_MEM7_Pos
 #define RAMBLOCK_POWER_ID           0
diff --git a/subsys/logging/frontends/Kconfig b/subsys/logging/frontends/Kconfig
index e35e252ba2b..4d6d85e3e88 100644
--- a/subsys/logging/frontends/Kconfig
+++ b/subsys/logging/frontends/Kconfig
@@ -47,7 +47,8 @@ config LOG_FRONTEND_STMESP_DICT
 config LOG_FRONTEND_STMESP_FSC
 	bool "Send fully self-contained messages"
 	select LOG_MSG_APPEND_RO_STRING_LOC if !(NRF_ETR || \
-			SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR)
+			SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR || \
+			SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR)
 
 config LOG_FRONTEND_STMESP_FLUSH_COUNT
 	int "Number of flushing words"

From 8998cf4652652da1a72e1572a6baf63cdc990972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:26 +0100
Subject: [PATCH 1398/2913] Revert "[nrf fromtree] boards: nordic: Remove
 v0.8.0 of the nRF54H20 DK"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 467114626788df76caa6cbaba15788684a6d10ea.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk   | 14 +++++++----
 boards/nordic/nrf54h20dk/board.yml            |  1 +
 .../nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi | 15 ++++++++++++
 .../nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay  |  7 ++++++
 .../nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml     | 24 +++++++++++++++++++
 .../nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay |  7 ++++++
 .../nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml    | 18 ++++++++++++++
 ...nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml | 14 +++++++++++
 .../nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay  |  7 ++++++
 .../nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml     | 18 ++++++++++++++
 .../nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml | 14 +++++++++++
 .../nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay  |  7 ++++++
 .../nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml     | 19 +++++++++++++++
 13 files changed, 161 insertions(+), 4 deletions(-)
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml

diff --git a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
index 62ad7a0d21c..af29072fbd5 100644
--- a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
+++ b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
@@ -2,9 +2,15 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF54H20DK
-	select SOC_NRF54H20_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP
-	select SOC_NRF54H20_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD
+	select SOC_NRF54H20_ENGB_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP && BOARD_REVISION = "0.8.0"
+	select SOC_NRF54H20_ENGB_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD && BOARD_REVISION = "0.8.0"
+	select SOC_NRF54H20_ENGB_CPUPPR if (BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
+				       BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP) && BOARD_REVISION = "0.8.0"
+	select SOC_NRF54H20_ENGB_CPUFLPR if (BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
+				        BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP) && BOARD_REVISION = "0.8.0"
+	select SOC_NRF54H20_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP && BOARD_REVISION = "0.9.0"
+	select SOC_NRF54H20_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD && BOARD_REVISION = "0.9.0"
 	select SOC_NRF54H20_CPUPPR if (BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
-				       BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP)
+				       BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP) && BOARD_REVISION = "0.9.0"
 	select SOC_NRF54H20_CPUFLPR if (BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
-				        BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP)
+				        BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP) && BOARD_REVISION = "0.9.0"
diff --git a/boards/nordic/nrf54h20dk/board.yml b/boards/nordic/nrf54h20dk/board.yml
index 2d3d40c20e0..82a738d8b03 100644
--- a/boards/nordic/nrf54h20dk/board.yml
+++ b/boards/nordic/nrf54h20dk/board.yml
@@ -13,4 +13,5 @@ board:
     format: major.minor.patch
     default: "0.9.0"
     revisions:
+    - name: "0.8.0"
     - name: "0.9.0"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi
new file mode 100644
index 00000000000..940ac4d2391
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &suit_storage_partition;
+
+/ {
+	reserved-memory {
+		suit_storage_partition: memory@e1eb000 {
+			reg = <0xe1eb000 DT_SIZE_K(24)>;
+		};
+	};
+};
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay
new file mode 100644
index 00000000000..dfee18c5b6f
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml
new file mode 100644
index 00000000000..01c44b51577
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml
@@ -0,0 +1,24 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54h20dk@0.8.0/nrf54h20/cpuapp
+name: nRF54H20-DK-nRF54H20-Application (revision 0.8.0)
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+sysbuild: true
+ram: 256
+flash: 296
+supported:
+  - adc
+  - can
+  - counter
+  - gpio
+  - i2c
+  - pwm
+  - spi
+  - watchdog
+  - usbd
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay
new file mode 100644
index 00000000000..dfee18c5b6f
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml
new file mode 100644
index 00000000000..bd60b8d2af3
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54h20dk@0.8.0/nrf54h20/cpuflpr
+name: nRF54H20-DK-nRF54H20-FLPR (revision 0.8.0)
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 46
+flash: 46
+supported:
+  - counter
+  - gpio
+  - i2c
+  - pwm
+  - spi
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml
new file mode 100644
index 00000000000..7deaf20135f
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml
@@ -0,0 +1,14 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54h20dk@0.8.0/nrf54h20/cpuflpr/xip
+name: nRF54H20-DK-nRF54H20-FLPR (MRAM XIP) (revision 0.8.0)
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 46
+flash: 48
+supported:
+  - gpio
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay
new file mode 100644
index 00000000000..dfee18c5b6f
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml
new file mode 100644
index 00000000000..26412657070
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54h20dk@0.8.0/nrf54h20/cpuppr
+name: nRF54H20-DK-nRF54H20-PPR (revision 0.8.0)
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 62
+flash: 62
+supported:
+  - counter
+  - gpio
+  - i2c
+  - pwm
+  - spi
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml
new file mode 100644
index 00000000000..0ce1718cb60
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml
@@ -0,0 +1,14 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54h20dk@0.8.0/nrf54h20/cpuppr/xip
+name: nRF54H20-DK-nRF54H20-PPR (MRAM XIP) (revision 0.8.0)
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 62
+flash: 64
+supported:
+  - gpio
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay
new file mode 100644
index 00000000000..dfee18c5b6f
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml
new file mode 100644
index 00000000000..26df539a803
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml
@@ -0,0 +1,19 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54h20dk@0.8.0/nrf54h20/cpurad
+name: nRF54H20-DK-nRF54H20-Radio (revision 0.8.0)
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+sysbuild: true
+ram: 192
+flash: 256
+supported:
+  - counter
+  - gpio
+  - pwm
+  - spi

From 7f3b88e2837c710a28f251ada8fb6fd5994db12b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:26 +0100
Subject: [PATCH 1399/2913] Revert "[nrf fromtree] twister: oot soc: set
 soc_root using Path"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a494acc07ff76df0b02e29626cc74a215d8ddeb7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/pylib/twister/twisterlib/environment.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/pylib/twister/twisterlib/environment.py b/scripts/pylib/twister/twisterlib/environment.py
index 56c7b6255d1..315145b78c5 100644
--- a/scripts/pylib/twister/twisterlib/environment.py
+++ b/scripts/pylib/twister/twisterlib/environment.py
@@ -972,13 +972,13 @@ def __init__(self, options, default_options=None) -> None:
         for module in modules:
             soc_root = module.meta.get("build", {}).get("settings", {}).get("soc_root")
             if soc_root:
-                self.soc_roots.append(Path(module.project) / Path(soc_root))
+                self.soc_roots.append(os.path.join(module.project, soc_root))
             dts_root = module.meta.get("build", {}).get("settings", {}).get("dts_root")
             if dts_root:
-                self.dts_roots.append(Path(module.project) / Path(dts_root))
+                self.dts_roots.append(os.path.join(module.project, dts_root))
             arch_root = module.meta.get("build", {}).get("settings", {}).get("arch_root")
             if arch_root:
-                self.arch_roots.append(Path(module.project) / Path(arch_root))
+                self.arch_roots.append(os.path.join(module.project, arch_root))
 
         self.hwm = None
 

From 23d4d5473185dbad996eea1a5ca7fb6136f966b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:26 +0100
Subject: [PATCH 1400/2913] Revert "[nrf fromtree] soc: nordic: Enable VPR
 launcher on nRF54H20 EngB"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f4bae77976d0ec749096575d9c9b7dc04fac8e57.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/common/vpr/Kconfig.sysbuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soc/nordic/common/vpr/Kconfig.sysbuild b/soc/nordic/common/vpr/Kconfig.sysbuild
index 8821810d63d..cfbd619f623 100644
--- a/soc/nordic/common/vpr/Kconfig.sysbuild
+++ b/soc/nordic/common/vpr/Kconfig.sysbuild
@@ -4,7 +4,7 @@
 config VPR_LAUNCHER
 	bool "VPR launcher"
 	default y
-	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR)
+	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR)
 	help
 	  Include VPR launcher in build.
 	  VPR launcher is a minimal sample built for an ARM core that starts given VPR core.

From 16e1610b26ded24e3bc845e0465e3442ef493151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:26 +0100
Subject: [PATCH 1401/2913] Revert "[nrf fromtree] tests: drivers:
 adc_accuracy: add calibration before sampling"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fd55e1cfa3a83bf469eaab6145e21524bba76296.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/drivers/adc/adc_accuracy_test/src/ref_volt.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/drivers/adc/adc_accuracy_test/src/ref_volt.c b/tests/drivers/adc/adc_accuracy_test/src/ref_volt.c
index 9679720c51e..66eaddd5b03 100644
--- a/tests/drivers/adc/adc_accuracy_test/src/ref_volt.c
+++ b/tests/drivers/adc/adc_accuracy_test/src/ref_volt.c
@@ -20,7 +20,6 @@ static int test_ref_to_adc(void)
 	struct adc_sequence sequence = {
 		.buffer      = &sample_buffer,
 		.buffer_size = sizeof(sample_buffer),
-		.calibrate = true,
 	};
 
 	const struct adc_dt_spec *adc_channel = get_adc_channel();

From 6d90fded8d2d83f91062595b676df436b4358bc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:26 +0100
Subject: [PATCH 1402/2913] Revert "[nrf fromtree] tests: drivers:
 adc_accuracy: parametrize expected accuracy"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d080de6f944151701c1e2da76eec0c59a4498503.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/drivers/adc/adc_accuracy_test/boards/ek_ra8m1.overlay    | 1 -
 tests/drivers/adc/adc_accuracy_test/boards/frdm_kl25z.overlay  | 1 -
 .../drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.overlay  | 1 -
 .../adc/adc_accuracy_test/boards/nrf52840dk_nrf52840.overlay   | 1 -
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay                  | 1 -
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay                  | 1 -
 tests/drivers/adc/adc_accuracy_test/src/ref_volt.c             | 3 +--
 7 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra8m1.overlay b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra8m1.overlay
index 83209ee3b9e..e3aced0a41b 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra8m1.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra8m1.overlay
@@ -8,7 +8,6 @@
 	zephyr,user {
 		io-channels = <&adc0 0>;
 		reference_mv = <3300>;
-		expected_accuracy = <32>;
 	};
 };
 
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/frdm_kl25z.overlay b/tests/drivers/adc/adc_accuracy_test/boards/frdm_kl25z.overlay
index 3be90387270..148ecda4535 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/frdm_kl25z.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/frdm_kl25z.overlay
@@ -8,7 +8,6 @@
 	zephyr,user {
 		io-channels = <&adc0 12>;
 		reference_mv = <1100>;
-		expected_accuracy = <32>;
 	};
 };
 
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.overlay b/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.overlay
index 1397a540c92..7d0c761c944 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.overlay
@@ -10,7 +10,6 @@
 	zephyr,user {
 		io-channels = <&adc0 1>;
 		reference_mv = <1650>;
-		expected_accuracy = <32>;
 	};
 };
 
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/adc/adc_accuracy_test/boards/nrf52840dk_nrf52840.overlay
index 08aa282bc60..85a8c6880c9 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/nrf52840dk_nrf52840.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/nrf52840dk_nrf52840.overlay
@@ -9,7 +9,6 @@
 	zephyr,user {
 		io-channels = <&adc 0>;
 		reference_mv = <3000>;
-		expected_accuracy = <32>;
 	};
 };
 
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/adc/adc_accuracy_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index f6ee92720ca..20bd3110aff 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -8,7 +8,6 @@
 	zephyr,user {
 		io-channels = <&adc 0>;
 		reference_mv = <1800>;
-		expected_accuracy = <64>;
 	};
 };
 
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/adc/adc_accuracy_test/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 53facf3dc31..950c52047f6 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -8,7 +8,6 @@
 	zephyr,user {
 		io-channels = <&adc 0>;
 		reference_mv = <1800>;
-		expected_accuracy = <64>;
 	};
 };
 
diff --git a/tests/drivers/adc/adc_accuracy_test/src/ref_volt.c b/tests/drivers/adc/adc_accuracy_test/src/ref_volt.c
index 66eaddd5b03..1c4806b249e 100644
--- a/tests/drivers/adc/adc_accuracy_test/src/ref_volt.c
+++ b/tests/drivers/adc/adc_accuracy_test/src/ref_volt.c
@@ -8,7 +8,6 @@
 #include <zephyr/ztest.h>
 
 #define REF_V DT_PROP(DT_PATH(zephyr_user), reference_mv)
-#define EXP_ACC DT_PROP(DT_PATH(zephyr_user), expected_accuracy)
 
 extern const struct adc_dt_spec *get_adc_channel(void);
 
@@ -32,7 +31,7 @@ static int test_ref_to_adc(void)
 	ret = adc_raw_to_millivolts_dt(adc_channel, &sample_buffer);
 	zassert_equal(ret, 0, "adc_raw_to_millivolts_dt() failed with code %d",
 		      ret);
-	zassert_within(sample_buffer, REF_V, EXP_ACC,
+	zassert_within(sample_buffer, REF_V, 32,
 		"Value %d mV read from ADC does not match expected range (%d mV).",
 		sample_buffer, REF_V);
 

From 8d54eac2bd7440b76c9a566c0ca672edb7ad6809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:26 +0100
Subject: [PATCH 1403/2913] Revert "[nrf fromtree] tests: drivers: adc_api:
 change second channel gain for nrf54."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 12ddfcb81c035a1a486aeac9e470a1e278c5cd72.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../adc/adc_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay       | 2 +-
 .../adc/adc_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/drivers/adc/adc_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/adc/adc_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index 536366ec8d5..d9c1f965add 100644
--- a/tests/drivers/adc/adc_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/drivers/adc/adc_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -34,7 +34,7 @@
 
 	channel@2 {
 		reg = <2>;
-		zephyr,gain = "ADC_GAIN_2_3";
+		zephyr,gain = "ADC_GAIN_1_2";
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
 		zephyr,input-positive = <NRF_SAADC_AIN2>;
diff --git a/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 87707847eea..a7252902a0c 100644
--- a/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/adc/adc_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -34,7 +34,7 @@
 
 	channel@2 {
 		reg = <2>;
-		zephyr,gain = "ADC_GAIN_2_3";
+		zephyr,gain = "ADC_GAIN_2_5";
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
 		zephyr,input-positive = <NRF_SAADC_AIN2>;

From 076150d449b67595679e24653703c7c8e004d82c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:26 +0100
Subject: [PATCH 1404/2913] Revert "[nrf fromtree] tests: adc_accuracy: add
 overlay for nrf54l15dk."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2261985cfacdf16787f26cd1492c11d998927dc8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 26 -------------------
 .../adc/adc_accuracy_test/testcase.yaml       |  1 -
 2 files changed, 27 deletions(-)
 delete mode 100644 tests/drivers/adc/adc_accuracy_test/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/adc/adc_accuracy_test/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/adc/adc_accuracy_test/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 950c52047f6..00000000000
--- a/tests/drivers/adc/adc_accuracy_test/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (c) 2024 Nordic Semiconductor ASA
- */
-
-/ {
-	zephyr,user {
-		io-channels = <&adc 0>;
-		reference_mv = <1800>;
-	};
-};
-
-&adc {
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_2";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,input-positive = <NRF_SAADC_AIN2>;
-		zephyr,resolution = <14>;
-	};
-};
diff --git a/tests/drivers/adc/adc_accuracy_test/testcase.yaml b/tests/drivers/adc/adc_accuracy_test/testcase.yaml
index 4c7f2cfff5c..ccfaa02ed7d 100644
--- a/tests/drivers/adc/adc_accuracy_test/testcase.yaml
+++ b/tests/drivers/adc/adc_accuracy_test/testcase.yaml
@@ -21,5 +21,4 @@ tests:
       - ek_ra8m1
       - frdm_mcxc242
       - nrf52840dk/nrf52840
-      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp

From efc8fc5c9cc6b3a98789d8ee0a65ff0cc19bfc75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:26 +0100
Subject: [PATCH 1405/2913] Revert "[nrf fromtree] tests: adc_accuracy: Add
 overlay for nrf54h20dk."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 72828212a1cac53ceb61b9ae041db9569088f46a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 26 -------------------
 .../adc/adc_accuracy_test/testcase.yaml       |  1 -
 2 files changed, 27 deletions(-)
 delete mode 100644 tests/drivers/adc/adc_accuracy_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/tests/drivers/adc/adc_accuracy_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/adc/adc_accuracy_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index 20bd3110aff..00000000000
--- a/tests/drivers/adc/adc_accuracy_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (c) 2024 Nordic Semiconductor ASA
- */
-
-/ {
-	zephyr,user {
-		io-channels = <&adc 0>;
-		reference_mv = <1800>;
-	};
-};
-
-&adc {
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_2";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,input-positive = <NRF_SAADC_AIN4>;
-		zephyr,resolution = <14>;
-	};
-};
diff --git a/tests/drivers/adc/adc_accuracy_test/testcase.yaml b/tests/drivers/adc/adc_accuracy_test/testcase.yaml
index ccfaa02ed7d..210ef2b70f0 100644
--- a/tests/drivers/adc/adc_accuracy_test/testcase.yaml
+++ b/tests/drivers/adc/adc_accuracy_test/testcase.yaml
@@ -21,4 +21,3 @@ tests:
       - ek_ra8m1
       - frdm_mcxc242
       - nrf52840dk/nrf52840
-      - nrf54h20dk/nrf54h20/cpuapp

From 479aafaa8985e783b9901767ad6acc704257ac30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:26 +0100
Subject: [PATCH 1406/2913] Revert "[nrf fromtree] tests: adc_accuracy: Add
 overlay for nrf52840dk."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f3f8ba08b4d24a93c09b2f5bb5ddaf0ebe6501e8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf52840dk_nrf52840.overlay        | 28 -------------------
 .../adc/adc_accuracy_test/testcase.yaml       |  1 -
 2 files changed, 29 deletions(-)
 delete mode 100644 tests/drivers/adc/adc_accuracy_test/boards/nrf52840dk_nrf52840.overlay

diff --git a/tests/drivers/adc/adc_accuracy_test/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/adc/adc_accuracy_test/boards/nrf52840dk_nrf52840.overlay
deleted file mode 100644
index 85a8c6880c9..00000000000
--- a/tests/drivers/adc/adc_accuracy_test/boards/nrf52840dk_nrf52840.overlay
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (c) 2024 Nordic Semiconductor ASA
- */
-
-
-/ {
-	zephyr,user {
-		io-channels = <&adc 0>;
-		reference_mv = <3000>;
-	};
-};
-
-&adc {
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_6";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,input-positive = <NRF_SAADC_AIN1>; /* P0.03 */
-		zephyr,resolution = <14>;
-	};
-
-};
diff --git a/tests/drivers/adc/adc_accuracy_test/testcase.yaml b/tests/drivers/adc/adc_accuracy_test/testcase.yaml
index 210ef2b70f0..8f6978a49fc 100644
--- a/tests/drivers/adc/adc_accuracy_test/testcase.yaml
+++ b/tests/drivers/adc/adc_accuracy_test/testcase.yaml
@@ -20,4 +20,3 @@ tests:
       - frdm_kl25z
       - ek_ra8m1
       - frdm_mcxc242
-      - nrf52840dk/nrf52840

From 92bd79ab23c99abf0d33321d196623955a1e4d98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:27 +0100
Subject: [PATCH 1407/2913] Revert "[nrf fromtree] soc: nordic: Remove the
 nRF54L15 EngA"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cf8dece1fe3ceb19af4b0191872d4a2420a73eae.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/mbox/mbox_nrf_vevif_event_rx.c        |    5 +
 drivers/mbox/mbox_nrf_vevif_event_tx.c        |    4 +
 drivers/mbox/mbox_nrf_vevif_task_rx.c         |    5 +
 drivers/mbox/mbox_nrf_vevif_task_tx.c         |    4 +
 .../nordic_vpr_launcher/nordic_vpr_launcher.c |    6 +-
 dts/arm/nordic/nrf54l15_enga_cpuapp.dtsi      |   18 +
 dts/riscv/nordic/nrf54l15_enga_cpuflpr.dtsi   |   25 +
 modules/hal_nordic/nrfx/CMakeLists.txt        |    7 +-
 modules/hal_nordic/nrfx/nrfx_config.h         |    4 +
 .../nrfx_config_nrf54l15_enga_application.h   | 1667 ++++++++++++++++
 .../nrfx/nrfx_config_nrf54l15_enga_flpr.h     | 1668 +++++++++++++++++
 soc/nordic/common/vpr/Kconfig.sysbuild        |    2 +-
 soc/nordic/nrf54l/Kconfig                     |   14 +
 .../Kconfig.defconfig.nrf54l15_enga_cpuapp    |   14 +
 .../Kconfig.defconfig.nrf54l15_enga_cpuflpr   |   18 +
 soc/nordic/nrf54l/Kconfig.soc                 |   18 +
 tests/kernel/interrupt/src/nested_irq.c       |    2 +-
 17 files changed, 3476 insertions(+), 5 deletions(-)
 create mode 100644 dts/arm/nordic/nrf54l15_enga_cpuapp.dtsi
 create mode 100644 dts/riscv/nordic/nrf54l15_enga_cpuflpr.dtsi
 create mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_application.h
 create mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_flpr.h
 create mode 100644 soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuapp
 create mode 100644 soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuflpr

diff --git a/drivers/mbox/mbox_nrf_vevif_event_rx.c b/drivers/mbox/mbox_nrf_vevif_event_rx.c
index b5be6a97b79..a7ec6dd9fff 100644
--- a/drivers/mbox/mbox_nrf_vevif_event_rx.c
+++ b/drivers/mbox/mbox_nrf_vevif_event_rx.c
@@ -10,8 +10,13 @@
 
 #include <haly/nrfy_vpr.h>
 
+#if defined(CONFIG_SOC_NRF54L15_ENGA_CPUAPP)
+#define EVENTS_IDX_MIN 11U
+#define EVENTS_IDX_MAX 17U
+#else
 #define EVENTS_IDX_MIN NRF_VPR_EVENTS_TRIGGERED_MIN
 #define EVENTS_IDX_MAX NRF_VPR_EVENTS_TRIGGERED_MAX
+#endif
 
 /* callbacks */
 struct mbox_vevif_event_rx_cbs {
diff --git a/drivers/mbox/mbox_nrf_vevif_event_tx.c b/drivers/mbox/mbox_nrf_vevif_event_tx.c
index 8bd731f56a5..6a9e51aab50 100644
--- a/drivers/mbox/mbox_nrf_vevif_event_tx.c
+++ b/drivers/mbox/mbox_nrf_vevif_event_tx.c
@@ -12,7 +12,11 @@
 #include <hal/nrf_vpr_csr.h>
 #include <hal/nrf_vpr_csr_vevif.h>
 
+#if defined(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR)
+#define EVENTS_IDX_MAX 17U
+#else
 #define EVENTS_IDX_MAX NRF_VPR_EVENTS_TRIGGERED_MAX
+#endif
 
 #define VEVIF_EVENTS_NUM  DT_INST_PROP(0, nordic_events)
 #define VEVIF_EVENTS_MASK DT_INST_PROP(0, nordic_events_mask)
diff --git a/drivers/mbox/mbox_nrf_vevif_task_rx.c b/drivers/mbox/mbox_nrf_vevif_task_rx.c
index 8783424ae98..a489d4d3717 100644
--- a/drivers/mbox/mbox_nrf_vevif_task_rx.c
+++ b/drivers/mbox/mbox_nrf_vevif_task_rx.c
@@ -12,8 +12,13 @@
 #include <hal/nrf_vpr_csr.h>
 #include <hal/nrf_vpr_csr_vevif.h>
 
+#if defined(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR)
+#define TASKS_IDX_MIN 11U
+#define TASKS_IDX_MAX 17U
+#else
 #define TASKS_IDX_MIN NRF_VPR_TASKS_TRIGGER_MIN
 #define TASKS_IDX_MAX NRF_VPR_TASKS_TRIGGER_MAX
+#endif
 
 #define VEVIF_TASKS_NUM  DT_INST_PROP(0, nordic_tasks)
 #define VEVIF_TASKS_MASK DT_INST_PROP(0, nordic_tasks_mask)
diff --git a/drivers/mbox/mbox_nrf_vevif_task_tx.c b/drivers/mbox/mbox_nrf_vevif_task_tx.c
index a409ef214b7..191a94962d6 100644
--- a/drivers/mbox/mbox_nrf_vevif_task_tx.c
+++ b/drivers/mbox/mbox_nrf_vevif_task_tx.c
@@ -10,7 +10,11 @@
 
 #include <haly/nrfy_vpr.h>
 
+#if defined(CONFIG_SOC_NRF54L15_ENGA_CPUAPP)
+#define TASKS_IDX_MAX 17U
+#else
 #define TASKS_IDX_MAX NRF_VPR_TASKS_TRIGGER_MAX
+#endif
 
 struct mbox_vevif_task_tx_conf {
 	NRF_VPR_Type *vpr;
diff --git a/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c b/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
index c688a97f654..e50161f214c 100644
--- a/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
+++ b/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
@@ -14,7 +14,8 @@
 #include <zephyr/toolchain.h>
 
 #include <hal/nrf_vpr.h>
-#if defined(CONFIG_SOC_NRF54L15_CPUAPP) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
+#if (defined(CONFIG_SOC_NRF54L15_ENGA_CPUAPP) || defined(CONFIG_SOC_NRF54L15_CPUAPP)) && \
+	!defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
 #include <hal/nrf_spu.h>
 #endif
 
@@ -41,7 +42,8 @@ static int nordic_vpr_launcher_init(const struct device *dev)
 	}
 #endif
 
-#if defined(CONFIG_SOC_NRF54L15_CPUAPP) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
+#if (defined(CONFIG_SOC_NRF54L15_ENGA_CPUAPP) || defined(CONFIG_SOC_NRF54L15_CPUAPP)) && \
+	!defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
 	nrf_spu_periph_perm_secattr_set(NRF_SPU00, nrf_address_slave_get((uint32_t)config->vpr),
 					true);
 #endif
diff --git a/dts/arm/nordic/nrf54l15_enga_cpuapp.dtsi b/dts/arm/nordic/nrf54l15_enga_cpuapp.dtsi
new file mode 100644
index 00000000000..0d62590839c
--- /dev/null
+++ b/dts/arm/nordic/nrf54l15_enga_cpuapp.dtsi
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <arm/nordic/nrf54l15_cpuapp.dtsi>
+
+/delete-node/ &pdm20;
+/delete-node/ &pdm21;
+
+&cpuapp_vevif_rx {
+	nordic,events-mask = <0x00008000>;
+};
+
+&cpuapp_vevif_tx {
+	nordic,tasks-mask = <0x0003f800>;
+};
diff --git a/dts/riscv/nordic/nrf54l15_enga_cpuflpr.dtsi b/dts/riscv/nordic/nrf54l15_enga_cpuflpr.dtsi
new file mode 100644
index 00000000000..3f5e37ff405
--- /dev/null
+++ b/dts/riscv/nordic/nrf54l15_enga_cpuflpr.dtsi
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <riscv/nordic/nrf54l15_cpuflpr.dtsi>
+
+/delete-node/ &pdm20;
+/delete-node/ &pdm21;
+
+&cpuflpr_vevif_rx {
+	nordic,tasks-mask = <0x0003f800>;
+	interrupts = <11 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <12 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <13 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <14 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <15 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <16 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <17 NRF_DEFAULT_IRQ_PRIORITY>;
+};
+
+&cpuflpr_vevif_tx {
+		nordic,events-mask = <0x00008000>;
+};
diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 1c854a822d5..d451f5f1a54 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -52,6 +52,9 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR NRF54H20_ENGB_X
                                                                  NRF_PPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR NRF54H20_ENGB_XXAA
                                                                   NRF_FLPR)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA       NRF54L15_ENGA_XXAA)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUAPP NRF_APPLICATION)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15            NRF54L15_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR    NRF_FLPR)
@@ -180,7 +183,7 @@ if(DEFINED uicr_path)
   endif()
 endif()
 
-if(CONFIG_SOC_NRF54L15_CPUAPP OR CONFIG_SOC_NRF54L20_ENGA_CPUAPP)
+if(CONFIG_SOC_NRF54L15_ENGA_CPUAPP OR CONFIG_SOC_NRF54L15_CPUAPP OR CONFIG_SOC_NRF54L20_ENGA_CPUAPP)
 	dt_prop(clock_frequency PATH "/cpus/cpu@0" PROPERTY "clock-frequency")
 	math(EXPR clock_frequency_mhz "${clock_frequency} / 1000000")
 	zephyr_compile_definitions("NRF_CONFIG_CPU_FREQ_MHZ=${clock_frequency_mhz}")
@@ -234,6 +237,8 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP  nrf54h20_engb_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR  nrf54h20_engb_ppr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR nrf54h20_engb_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD  nrf54h20_engb_radiocore.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUAPP nrf54l15_enga_application.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR nrf54l15_enga_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP      nrf54l15_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR     nrf54l15_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54l20_enga_application.svd)
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index cfd70516972..3c91aae6de6 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -1129,6 +1129,10 @@
     #include <nrfx_config_nrf54h20_ppr.h>
 #elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_FLPR)
     #include <nrfx_config_nrf54h20_flpr.h>
+#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_APPLICATION)
+    #include <nrfx_config_nrf54l15_enga_application.h>
+#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_FLPR)
+    #include <nrfx_config_nrf54l15_enga_flpr.h>
 #elif defined(NRF54L15_XXAA) && defined(NRF_APPLICATION)
     #include <nrfx_config_nrf54l15_application.h>
 #elif defined(NRF54L15_XXAA) && defined(NRF_FLPR)
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_application.h
new file mode 100644
index 00000000000..aa23f93c9e3
--- /dev/null
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_application.h
@@ -0,0 +1,1667 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef NRFX_CONFIG_NRF54L15_ENGA_APPLICATION_H__
+#define NRFX_CONFIG_NRF54L15_ENGA_APPLICATION_H__
+
+#ifndef NRFX_CONFIG_H__
+#error "This file should not be included directly. Include nrfx_config.h instead."
+#endif
+
+
+/**
+ * @brief NRFX_DEFAULT_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_DEFAULT_IRQ_PRIORITY
+#define NRFX_DEFAULT_IRQ_PRIORITY 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_ENABLED
+#define NRFX_CLOCK_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LF_SRC
+ *
+ * Integer value.
+ * Supported values:
+ * - RC    = 0
+ * - XTAL  = 1
+ * - Synth = 2
+ */
+#ifndef NRFX_CLOCK_CONFIG_LF_SRC
+#define NRFX_CLOCK_CONFIG_LF_SRC 1
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
+#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
+#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
+#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
+#define NRFX_CLOCK_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_COMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COMP_ENABLED
+#define NRFX_COMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_COMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
+#define NRFX_COMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_COMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
+#define NRFX_COMP_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI_ENABLED
+#define NRFX_DPPI_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
+#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
+#define NRFX_DPPI_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_EGU_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU_ENABLED
+#define NRFX_EGU_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_EGU10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU10_ENABLED
+#define NRFX_EGU10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU20_ENABLED
+#define NRFX_EGU20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE_ENABLED
+#define NRFX_GPIOTE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
+ *
+ * Integer value. Minimum: 0. Maximum: 15.
+ */
+#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
+#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
+#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
+#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE20_ENABLED
+#define NRFX_GPIOTE20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE30_ENABLED
+#define NRFX_GPIOTE30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_ENABLED
+#define NRFX_GRTC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 1
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
+ *
+ * Integer value.
+ */
+#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
+#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 10
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
+ */
+#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
+#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x00000fe7
+#endif
+
+/**
+ * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
+#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
+#define NRFX_GRTC_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_I2S_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S_ENABLED
+#define NRFX_I2S_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_I2S_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
+#define NRFX_I2S_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_I2S_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
+#define NRFX_I2S_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_I2S20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S20_ENABLED
+#define NRFX_I2S20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_LPCOMP_ENABLED
+#define NRFX_LPCOMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
+#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
+#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_NFCT_ENABLED
+#define NRFX_NFCT_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
+ *
+ * Integer value. Minimum: 0. Maximum: 5.
+ */
+#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
+#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
+#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
+#define NRFX_NFCT_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_PDM_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_PDM_ENABLED
+#define NRFX_PDM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0 Maximum: 7
+ */
+#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY 0
+#endif
+
+/**
+ * @brief NRFX_PDM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
+#define NRFX_PDM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
+#define NRFX_PDM_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_POWER_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_POWER_ENABLED
+#define NRFX_POWER_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PRS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_ENABLED
+#define NRFX_PRS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
+#define NRFX_PRS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
+#define NRFX_PRS_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_0_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_0_ENABLED
+#define NRFX_PRS_BOX_0_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_1_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_1_ENABLED
+#define NRFX_PRS_BOX_1_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_2_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_2_ENABLED
+#define NRFX_PRS_BOX_2_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_3_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_3_ENABLED
+#define NRFX_PRS_BOX_3_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_4_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_4_ENABLED
+#define NRFX_PRS_BOX_4_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_5_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_5_ENABLED
+#define NRFX_PRS_BOX_5_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
+#define NRFX_PRS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
+#define NRFX_PRS_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_PWM_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_PWM_ENABLED
+#define NRFX_PWM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM20_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_PWM20_ENABLED
+#define NRFX_PWM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM21_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_PWM21_ENABLED
+#define NRFX_PWM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM22_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_PWM22_ENABLED
+#define NRFX_PWM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0 Maximum: 7
+ */
+#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY 0
+#endif
+
+/**
+ * @brief NRFX_PWM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
+#define NRFX_PWM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
+#define NRFX_PWM_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC_ENABLED
+#define NRFX_QDEC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC20_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_QDEC20_ENABLED
+#define NRFX_QDEC20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC21_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_QDEC21_ENABLED
+#define NRFX_QDEC21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
+#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
+#define NRFX_QDEC_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_QDEC20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC20_ENABLED
+#define NRFX_QDEC20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC21_ENABLED
+#define NRFX_QDEC21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RRAMC_ENABLED
+#define NRFX_RRAMC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
+#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
+#define NRFX_RRAMC_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_RTC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC_ENABLED
+#define NRFX_RTC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_RTC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
+#define NRFX_RTC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
+#define NRFX_RTC_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_RTC10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC10_ENABLED
+#define NRFX_RTC10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC30_ENABLED
+#define NRFX_RTC30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SAADC_ENABLED
+#define NRFX_SAADC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
+#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
+#define NRFX_SAADC_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM_ENABLED
+#define NRFX_SPIM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_EXTENDED_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM_EXTENDED_ENABLED
+#define NRFX_SPIM_EXTENDED_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
+#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
+#define NRFX_SPIM_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_SPIM00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM00_ENABLED
+#define NRFX_SPIM00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM20_ENABLED
+#define NRFX_SPIM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM21_ENABLED
+#define NRFX_SPIM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM22_ENABLED
+#define NRFX_SPIM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM30_ENABLED
+#define NRFX_SPIM30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS_ENABLED
+#define NRFX_SPIS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
+#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
+#define NRFX_SPIS_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_SPIS00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS00_ENABLED
+#define NRFX_SPIS00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS20_ENABLED
+#define NRFX_SPIS20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS21_ENABLED
+#define NRFX_SPIS21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS22_ENABLED
+#define NRFX_SPIS22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS30_ENABLED
+#define NRFX_SPIS30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SYSTICK_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SYSTICK_ENABLED
+#define NRFX_SYSTICK_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TEMP_ENABLED
+#define NRFX_TEMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
+#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
+#define NRFX_TEMP_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_TIMER_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER_ENABLED
+#define NRFX_TIMER_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
+#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
+#define NRFX_TIMER_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_TIMER00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER00_ENABLED
+#define NRFX_TIMER00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER10_ENABLED
+#define NRFX_TIMER10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER20_ENABLED
+#define NRFX_TIMER20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER21_ENABLED
+#define NRFX_TIMER21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER22_ENABLED
+#define NRFX_TIMER22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER23_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER23_ENABLED
+#define NRFX_TIMER23_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER24_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER24_ENABLED
+#define NRFX_TIMER24_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM_ENABLED
+#define NRFX_TWIM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
+#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
+#define NRFX_TWIM_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_TWIM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM20_ENABLED
+#define NRFX_TWIM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM21_ENABLED
+#define NRFX_TWIM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM22_ENABLED
+#define NRFX_TWIM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM30_ENABLED
+#define NRFX_TWIM30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_ENABLED
+#define NRFX_TWIS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
+#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
+ *        Assume that any instance would be initialized only once.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
+#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_NO_SYNC_MODE
+#define NRFX_TWIS_NO_SYNC_MODE 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
+#define NRFX_TWIS_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_TWIS20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS20_ENABLED
+#define NRFX_TWIS20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS21_ENABLED
+#define NRFX_TWIS21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS22_ENABLED
+#define NRFX_TWIS22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS30_ENABLED
+#define NRFX_TWIS30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_ENABLED
+#define NRFX_UARTE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
+ *        If enabled, support for configuring GPIO pins is removed from the driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
+#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
+ *        If enabled, support for configuring PSEL registers is removed from the driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
+#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_TX_LINK
+#define NRFX_UARTE_CONFIG_TX_LINK 1
+#endif
+
+/**
+ * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
+ *
+ * Integer value. Minimum: 0. Maximum: 255.
+ */
+#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
+#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
+#endif
+
+/**
+ * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
+#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
+#define NRFX_UARTE_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_UARTE00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE00_ENABLED
+#define NRFX_UARTE00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE20_ENABLED
+#define NRFX_UARTE20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE21_ENABLED
+#define NRFX_UARTE21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE22_ENABLED
+#define NRFX_UARTE22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE30_ENABLED
+#define NRFX_UARTE30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_ENABLED
+#define NRFX_WDT_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 7.
+ */
+#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_CONFIG_NO_IRQ
+#define NRFX_WDT_CONFIG_NO_IRQ 0
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
+#define NRFX_WDT_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
+#define NRFX_WDT_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_WDT30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT30_ENABLED
+#define NRFX_WDT30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT31_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT31_ENABLED
+#define NRFX_WDT31_ENABLED 0
+#endif
+
+#endif /* NRFX_CONFIG_NRF54L15_ENGA_APPLICATION_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_flpr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_flpr.h
new file mode 100644
index 00000000000..568790051a3
--- /dev/null
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_flpr.h
@@ -0,0 +1,1668 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef NRFX_CONFIG_NRF54L15_ENGA_FLPR_H__
+#define NRFX_CONFIG_NRF54L15_ENGA_FLPR_H__
+
+#ifndef NRFX_CONFIG_H__
+#error "This file should not be included directly. Include nrfx_config.h instead."
+#endif
+
+
+/**
+ * @brief NRFX_DEFAULT_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_DEFAULT_IRQ_PRIORITY
+#define NRFX_DEFAULT_IRQ_PRIORITY 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_ENABLED
+#define NRFX_CLOCK_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LF_SRC
+ *
+ * Integer value.
+ * Supported values:
+ * - RC    = 0
+ * - XTAL  = 1
+ * - Synth = 2
+ */
+#ifndef NRFX_CLOCK_CONFIG_LF_SRC
+#define NRFX_CLOCK_CONFIG_LF_SRC 1
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
+#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
+#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
+#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
+#define NRFX_CLOCK_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_COMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COMP_ENABLED
+#define NRFX_COMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_COMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
+#define NRFX_COMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_COMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
+#define NRFX_COMP_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI_ENABLED
+#define NRFX_DPPI_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
+#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
+#define NRFX_DPPI_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_EGU_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU_ENABLED
+#define NRFX_EGU_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_EGU10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU10_ENABLED
+#define NRFX_EGU10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_EGU20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_EGU20_ENABLED
+#define NRFX_EGU20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE_ENABLED
+#define NRFX_GPIOTE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
+ *
+ * Integer value. Minimum: 0. Maximum: 15.
+ */
+#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
+#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
+#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
+#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE20_ENABLED
+#define NRFX_GPIOTE20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GPIOTE30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GPIOTE30_ENABLED
+#define NRFX_GPIOTE30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_ENABLED
+#define NRFX_GRTC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
+ *
+ * Integer value.
+ */
+#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
+#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 2
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
+ */
+#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
+#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x00000018
+#endif
+
+/**
+ * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
+#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
+#define NRFX_GRTC_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_I2S_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S_ENABLED
+#define NRFX_I2S_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_I2S_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
+#define NRFX_I2S_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_I2S_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
+#define NRFX_I2S_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_I2S20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_I2S20_ENABLED
+#define NRFX_I2S20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_LPCOMP_ENABLED
+#define NRFX_LPCOMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
+#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
+#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_NFCT_ENABLED
+#define NRFX_NFCT_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
+ *
+ * Integer value. Minimum: 0. Maximum: 5.
+ */
+#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
+#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
+#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
+#define NRFX_NFCT_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_PDM_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_PDM_ENABLED
+#define NRFX_PDM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0 Maximum: 3
+ */
+#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY 0
+#endif
+
+/**
+ * @brief NRFX_PDM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
+#define NRFX_PDM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PDM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
+#define NRFX_PDM_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_POWER_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_POWER_ENABLED
+#define NRFX_POWER_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_PRS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_ENABLED
+#define NRFX_PRS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
+#define NRFX_PRS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
+#define NRFX_PRS_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_0_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_0_ENABLED
+#define NRFX_PRS_BOX_0_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_1_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_1_ENABLED
+#define NRFX_PRS_BOX_1_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_2_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_2_ENABLED
+#define NRFX_PRS_BOX_2_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_3_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_3_ENABLED
+#define NRFX_PRS_BOX_3_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_4_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_4_ENABLED
+#define NRFX_PRS_BOX_4_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_BOX_5_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_PRS_BOX_5_ENABLED
+#define NRFX_PRS_BOX_5_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
+#define NRFX_PRS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PRS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
+#define NRFX_PRS_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_PWM_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_PWM_ENABLED
+#define NRFX_PWM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM20_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_PWM20_ENABLED
+#define NRFX_PWM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM21_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_PWM21_ENABLED
+#define NRFX_PWM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM22_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_PWM22_ENABLED
+#define NRFX_PWM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0 Maximum: 3
+ */
+#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY 0
+#endif
+
+/**
+ * @brief NRFX_PWM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
+#define NRFX_PWM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_PWM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
+#define NRFX_PWM_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC_ENABLED
+#define NRFX_QDEC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC20_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_QDEC20_ENABLED
+#define NRFX_QDEC20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC21_ENABLED
+ *
+ * Boolean. Accepted values 0 and 1.
+ */
+#ifndef NRFX_QDEC21_ENABLED
+#define NRFX_QDEC21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
+#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
+#define NRFX_QDEC_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_QDEC20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC20_ENABLED
+#define NRFX_QDEC20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_QDEC21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_QDEC21_ENABLED
+#define NRFX_QDEC21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RRAMC_ENABLED
+#define NRFX_RRAMC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
+#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
+#define NRFX_RRAMC_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_RTC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC_ENABLED
+#define NRFX_RTC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_RTC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
+#define NRFX_RTC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
+#define NRFX_RTC_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_RTC10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC10_ENABLED
+#define NRFX_RTC10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_RTC30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_RTC30_ENABLED
+#define NRFX_RTC30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SAADC_ENABLED
+#define NRFX_SAADC_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
+#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
+#define NRFX_SAADC_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM_ENABLED
+#define NRFX_SPIM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_EXTENDED_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM_EXTENDED_ENABLED
+#define NRFX_SPIM_EXTENDED_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
+#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
+#define NRFX_SPIM_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_SPIM00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM00_ENABLED
+#define NRFX_SPIM00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM20_ENABLED
+#define NRFX_SPIM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM21_ENABLED
+#define NRFX_SPIM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM22_ENABLED
+#define NRFX_SPIM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIM30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIM30_ENABLED
+#define NRFX_SPIM30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS_ENABLED
+#define NRFX_SPIS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
+#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
+#define NRFX_SPIS_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_SPIS00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS00_ENABLED
+#define NRFX_SPIS00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS20_ENABLED
+#define NRFX_SPIS20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS21_ENABLED
+#define NRFX_SPIS21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS22_ENABLED
+#define NRFX_SPIS22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_SPIS30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_SPIS30_ENABLED
+#define NRFX_SPIS30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TEMP_ENABLED
+#define NRFX_TEMP_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
+#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
+#define NRFX_TEMP_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_TIMER_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER_ENABLED
+#define NRFX_TIMER_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
+#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
+#define NRFX_TIMER_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_TIMER00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER00_ENABLED
+#define NRFX_TIMER00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER10_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER10_ENABLED
+#define NRFX_TIMER10_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER20_ENABLED
+#define NRFX_TIMER20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER21_ENABLED
+#define NRFX_TIMER21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER22_ENABLED
+#define NRFX_TIMER22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER23_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER23_ENABLED
+#define NRFX_TIMER23_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TIMER24_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TIMER24_ENABLED
+#define NRFX_TIMER24_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM_ENABLED
+#define NRFX_TWIM_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
+#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
+#define NRFX_TWIM_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_TWIM20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM20_ENABLED
+#define NRFX_TWIM20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM21_ENABLED
+#define NRFX_TWIM21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM22_ENABLED
+#define NRFX_TWIM22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIM30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIM30_ENABLED
+#define NRFX_TWIM30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_ENABLED
+#define NRFX_TWIS_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
+#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
+ *        Assume that any instance would be initialized only once.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
+#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS_NO_SYNC_MODE
+#define NRFX_TWIS_NO_SYNC_MODE 0
+#endif
+
+/**
+ * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
+#define NRFX_TWIS_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_TWIS20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS20_ENABLED
+#define NRFX_TWIS20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS21_ENABLED
+#define NRFX_TWIS21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS22_ENABLED
+#define NRFX_TWIS22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_TWIS30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_TWIS30_ENABLED
+#define NRFX_TWIS30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_ENABLED
+#define NRFX_UARTE_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
+ *        If enabled, support for configuring GPIO pins is removed from the driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
+#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
+ *        If enabled, support for configuring PSEL registers is removed from the driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
+#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_TX_LINK
+ *        If enabled, driver supports linking of TX transfers.
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_TX_LINK
+#define NRFX_UARTE_CONFIG_TX_LINK 1
+#endif
+
+/**
+ * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
+ *
+ * Integer value. Minimum: 0. Maximum: 255.
+ */
+#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
+#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
+#endif
+
+/**
+ * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
+#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
+#define NRFX_UARTE_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_UARTE00_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE00_ENABLED
+#define NRFX_UARTE00_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE20_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE20_ENABLED
+#define NRFX_UARTE20_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE21_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE21_ENABLED
+#define NRFX_UARTE21_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE22_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE22_ENABLED
+#define NRFX_UARTE22_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_UARTE30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_UARTE30_ENABLED
+#define NRFX_UARTE30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_VEVIF_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_VEVIF_ENABLED
+#define NRFX_VEVIF_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_ENABLED
+#define NRFX_WDT_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
+ *
+ * Integer value. Minimum: 0. Maximum: 3.
+ */
+#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_CONFIG_NO_IRQ
+#define NRFX_WDT_CONFIG_NO_IRQ 0
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_LOG_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
+#define NRFX_WDT_CONFIG_LOG_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT_CONFIG_LOG_LEVEL
+ *
+ * Integer value.
+ * Supported values:
+ * - Off     = 0
+ * - Error   = 1
+ * - Warning = 2
+ * - Info    = 3
+ * - Debug   = 4
+ */
+#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
+#define NRFX_WDT_CONFIG_LOG_LEVEL 0
+#endif
+
+/**
+ * @brief NRFX_WDT30_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT30_ENABLED
+#define NRFX_WDT30_ENABLED 0
+#endif
+
+/**
+ * @brief NRFX_WDT31_ENABLED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_WDT31_ENABLED
+#define NRFX_WDT31_ENABLED 0
+#endif
+
+#endif /* NRFX_CONFIG_NRF54L15_ENGA_FLPR_H__ */
diff --git a/soc/nordic/common/vpr/Kconfig.sysbuild b/soc/nordic/common/vpr/Kconfig.sysbuild
index cfbd619f623..54464f10bc4 100644
--- a/soc/nordic/common/vpr/Kconfig.sysbuild
+++ b/soc/nordic/common/vpr/Kconfig.sysbuild
@@ -4,7 +4,7 @@
 config VPR_LAUNCHER
 	bool "VPR launcher"
 	default y
-	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR)
+	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L15_ENGA_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR)
 	help
 	  Include VPR launcher in build.
 	  VPR launcher is a minimal sample built for an ARM core that starts given VPR core.
diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index 2db8e8248f9..8c670b9355e 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -9,6 +9,17 @@ config SOC_SERIES_NRF54LX
 	select HAS_NORDIC_DRIVERS
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 
+config SOC_NRF54L15_ENGA_CPUAPP
+	select ARM
+	select ARMV8_M_DSP
+	select CPU_CORTEX_M33
+	select CPU_HAS_ARM_MPU
+	select CPU_HAS_ICACHE
+	select CPU_HAS_ARM_SAU
+	select CPU_HAS_FPU
+	select HAS_HW_NRF_RADIO_IEEE802154
+	select HAS_POWEROFF
+
 config SOC_NRF54L15_CPUAPP
 	select ARM
 	select ARMV8_M_DSP
@@ -31,6 +42,9 @@ config SOC_NRF54L20_ENGA_CPUAPP
 	select HAS_HW_NRF_RADIO_IEEE802154
 	select HAS_POWEROFF
 
+config SOC_NRF54L15_ENGA_CPUFLPR
+	depends on RISCV_CORE_NORDIC_VPR
+
 config SOC_NRF54L15_CPUFLPR
 	depends on RISCV_CORE_NORDIC_VPR
 
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuapp b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuapp
new file mode 100644
index 00000000000..80957abfdd7
--- /dev/null
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuapp
@@ -0,0 +1,14 @@
+# Nordic Semiconductor nRF54L15 MCU
+
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_NRF54L15_ENGA_CPUAPP
+
+config NUM_IRQS
+	default 271
+
+config IEEE802154_NRF5
+	default IEEE802154
+
+endif # SOC_NRF54L15_ENGA_CPUAPP
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuflpr b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuflpr
new file mode 100644
index 00000000000..86c80d08fc2
--- /dev/null
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuflpr
@@ -0,0 +1,18 @@
+# Nordic Semiconductor nRF54L15 MCU
+
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_NRF54L15_ENGA_CPUFLPR
+
+config RISCV_HAS_CPU_IDLE
+	bool
+
+config NUM_IRQS
+	int
+	default 287
+# As FLPR has limited memory most of tests does not fit with asserts enabled.
+config ASSERT
+	default n
+
+endif # SOC_NRF54L15_ENGA_CPUFLPR
diff --git a/soc/nordic/nrf54l/Kconfig.soc b/soc/nordic/nrf54l/Kconfig.soc
index 25deae9fade..9251c708c52 100644
--- a/soc/nordic/nrf54l/Kconfig.soc
+++ b/soc/nordic/nrf54l/Kconfig.soc
@@ -9,6 +9,24 @@ config SOC_NRF54L15
 	help
 	  NRF54L15
 
+config SOC_NRF54L15_ENGA
+	bool
+	select SOC_NRF54L15
+	help
+	  NRF54L15 ENGA
+
+config SOC_NRF54L15_ENGA_CPUAPP
+	bool
+	select SOC_NRF54L15_ENGA
+	help
+	  NRF54L15 ENGA CPUAPP
+
+config SOC_NRF54L15_ENGA_CPUFLPR
+	bool
+	select SOC_NRF54L15_ENGA
+	help
+	  NRF54L15 ENGA CPUFLPR
+
 config SOC_NRF54L15_CPUAPP
 	bool
 	select SOC_NRF54L15
diff --git a/tests/kernel/interrupt/src/nested_irq.c b/tests/kernel/interrupt/src/nested_irq.c
index 6d84dda2ef8..1650a7b77ec 100644
--- a/tests/kernel/interrupt/src/nested_irq.c
+++ b/tests/kernel/interrupt/src/nested_irq.c
@@ -56,7 +56,7 @@
  */
 #define IRQ0_PRIO	IRQ_DEFAULT_PRIORITY
 #define IRQ1_PRIO	0x0
-#elif defined(CONFIG_SOC_NRF54L15_CPUFLPR)
+#elif defined(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR) || defined(CONFIG_SOC_NRF54L15_CPUFLPR)
 #define IRQ0_LINE	16
 #define IRQ1_LINE	17
 

From 6cfd79decd19c382b4787f26c0fec0bbe4c9350b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:27 +0100
Subject: [PATCH 1408/2913] Revert "[nrf fromtree] boards: nordic: Remove
 nRF54L15 PDK"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a8888fd34d916848f858c1583fbbc96ae3f62789.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/deprecated.cmake                       |   3 +
 boards/nordic/nrf54l15pdk/Kconfig.defconfig   |  12 ++
 boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk |   7 +
 boards/nordic/nrf54l15pdk/board.cmake         |  12 ++
 boards/nordic/nrf54l15pdk/board.yml           |  15 ++
 .../doc/img/nrf54l15pdk_nrf54l15.webp         | Bin 0 -> 35746 bytes
 boards/nordic/nrf54l15pdk/doc/index.rst       | 142 ++++++++++++++++
 .../nrf54l15pdk/nrf54l15_cpuapp_common.dtsi   | 156 ++++++++++++++++++
 .../nrf54l15pdk_nrf54l15-common.dtsi          | 100 +++++++++++
 .../nrf54l15pdk_nrf54l15-pinctrl.dtsi         |  80 +++++++++
 .../nrf54l15pdk_nrf54l15_common_0_2_1.dtsi    |  52 ++++++
 .../nrf54l15pdk_nrf54l15_cpuapp.dts           |  19 +++
 .../nrf54l15pdk_nrf54l15_cpuapp.yaml          |  24 +++
 .../nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay |   7 +
 .../nrf54l15pdk_nrf54l15_cpuapp_defconfig     |  31 ++++
 .../nrf54l15pdk_nrf54l15_cpuflpr.dts          |  71 ++++++++
 .../nrf54l15pdk_nrf54l15_cpuflpr.yaml         |  18 ++
 ...nrf54l15pdk_nrf54l15_cpuflpr_0_2_1.overlay |   7 +
 .../nrf54l15pdk_nrf54l15_cpuflpr_defconfig    |  17 ++
 .../nrf54l15pdk_nrf54l15_cpuflpr_xip.dts      |  12 ++
 .../nrf54l15pdk_nrf54l15_cpuflpr_xip.yaml     |  18 ++
 ...4l15pdk_nrf54l15_cpuflpr_xip_0_2_1.overlay |   7 +
 ...nrf54l15pdk_nrf54l15_cpuflpr_xip_defconfig |  15 ++
 doc/releases/release-notes-4.0.rst            |   1 -
 samples/bluetooth/beacon/sample.yaml          |   1 +
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  12 ++
 .../nrf54l15pdk_nrf54l15_cpuapp_df.overlay    |  33 ++++
 samples/bluetooth/hci_uart/sample.yaml        |  11 ++
 samples/bluetooth/peripheral_hr/sample.yaml   |   1 +
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |   9 +
 samples/drivers/mbox/CMakeLists.txt           |   1 +
 samples/drivers/mbox/Kconfig.sysbuild         |   1 +
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  20 +++
 samples/drivers/mbox/remote/CMakeLists.txt    |   2 +
 .../nrf54l15pdk_nrf54l15_cpuflpr.overlay      |  24 +++
 .../nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay  |  24 +++
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |   9 +
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |   8 +
 .../nrf54l15pdk_nrf54l15_cpuflpr.overlay      |   8 +
 .../nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay  |   8 +
 .../boards/nrf54l15pdk_nrf54l15_cpuapp.conf   |  12 ++
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  45 +++++
 samples/subsys/fs/fs_sample/sample.yaml       |   3 +
 samples/subsys/fs/littlefs/sample.yaml        |   1 +
 .../ipc/ipc_service/icmsg/CMakeLists.txt      |   3 +-
 .../ipc/ipc_service/icmsg/Kconfig.sysbuild    |   1 +
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  41 +++++
 .../nrf54l15pdk_nrf54l15_cpuflpr.overlay      |  45 +++++
 .../boards/nrf54l15pdk_nrf54l15_cpuapp.conf   |   2 +
 samples/subsys/settings/sample.yaml           |   1 +
 samples/sysbuild/hello_world/sample.yaml      |   9 +
 .../nrf54l15pdk_nrf54l15_cpuflpr.conf         |   1 +
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  29 ++++
 snippets/nordic-flpr-xip/snippet.yml          |   3 +
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  43 +++++
 snippets/nordic-flpr/snippet.yml              |   3 +
 tests/boot/with_mcumgr/testcase.yaml          |   1 +
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  43 +++++
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  21 +++
 .../nrf54l15pdk_nrf54l15_cpuflpr.overlay      |  21 +++
 .../nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay  |  21 +++
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  30 ++++
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  30 ++++
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  23 +++
 .../drivers/mbox/mbox_error_cases/sample.yaml |   1 +
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  20 +++
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |   3 +
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  36 ++++
 .../nrf54l15pdk_nrf54l15_cpuflpr.overlay      |  30 ++++
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  54 ++++++
 tests/lib/cpp/cxx/testcase.yaml               |   1 +
 tests/subsys/fs/fcb/testcase.yaml             |   1 +
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  22 +++
 tests/subsys/fs/littlefs/testcase.yaml        |   2 +-
 .../storage/stream/stream_flash/testcase.yaml |   1 +
 75 files changed, 1598 insertions(+), 3 deletions(-)
 create mode 100644 boards/nordic/nrf54l15pdk/Kconfig.defconfig
 create mode 100644 boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk
 create mode 100644 boards/nordic/nrf54l15pdk/board.cmake
 create mode 100644 boards/nordic/nrf54l15pdk/board.yml
 create mode 100644 boards/nordic/nrf54l15pdk/doc/img/nrf54l15pdk_nrf54l15.webp
 create mode 100644 boards/nordic/nrf54l15pdk/doc/index.rst
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15_cpuapp_common.dtsi
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15-common.dtsi
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15-pinctrl.dtsi
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_common_0_2_1.dtsi
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.dts
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.yaml
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_defconfig
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.dts
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.yaml
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_0_2_1.overlay
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_defconfig
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip.dts
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip.yaml
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip_0_2_1.overlay
 create mode 100644 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip_defconfig
 create mode 100644 samples/bluetooth/hci_uart/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 create mode 100644 samples/bluetooth/hci_uart/boards/nrf54l15pdk_nrf54l15_cpuapp_df.overlay
 create mode 100644 samples/drivers/jesd216/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 create mode 100644 samples/drivers/mbox/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 create mode 100644 samples/drivers/mbox/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
 create mode 100644 samples/drivers/mbox/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
 create mode 100644 samples/drivers/spi_flash/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 create mode 100644 samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 create mode 100644 samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
 create mode 100644 samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
 create mode 100644 samples/subsys/fs/fs_sample/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
 create mode 100644 samples/subsys/fs/fs_sample/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 create mode 100644 samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 create mode 100644 samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
 create mode 100644 samples/subsys/settings/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
 create mode 100644 samples/sysbuild/hello_world/sysbuild/nrf54l15pdk_nrf54l15_cpuflpr.conf
 create mode 100644 snippets/nordic-flpr-xip/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 create mode 100644 snippets/nordic-flpr/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/drivers/adc/adc_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
 create mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
 create mode 100644 tests/drivers/i2s/i2s_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/drivers/i2s/i2s_speed/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/drivers/mbox/mbox_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/drivers/pwm/pwm_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/drivers/sensor/temp_sensor/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
 create mode 100644 tests/drivers/uart/uart_errors/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/subsys/fs/littlefs/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay

diff --git a/boards/deprecated.cmake b/boards/deprecated.cmake
index c2b49e34fef..a96f68b12da 100644
--- a/boards/deprecated.cmake
+++ b/boards/deprecated.cmake
@@ -508,6 +508,9 @@ set(nrf5340dk_nrf5340_cpuapp_ns_DEPRECATED
 set(nrf5340dk_nrf5340_cpunet_DEPRECATED
     nrf5340dk/nrf5340/cpunet
 )
+set(nrf54l15pdk_nrf54l15_cpuapp_DEPRECATED
+    nrf54l15pdk/nrf54l15/cpuapp
+)
 set(nrf9131ek_nrf9131_DEPRECATED
     nrf9131ek
 )
diff --git a/boards/nordic/nrf54l15pdk/Kconfig.defconfig b/boards/nordic/nrf54l15pdk/Kconfig.defconfig
new file mode 100644
index 00000000000..1c83abbb020
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/Kconfig.defconfig
@@ -0,0 +1,12 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_NRF54L15PDK_NRF54L15_CPUAPP
+
+config BT_CTLR
+	default BT
+
+config ROM_START_OFFSET
+	default 0x800 if BOOTLOADER_MCUBOOT
+
+endif # BOARD_NRF54L15PDK_NRF54L15_CPUAPP
diff --git a/boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk b/boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk
new file mode 100644
index 00000000000..d5116bd50c6
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/Kconfig.nrf54l15pdk
@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_NRF54L15PDK
+	select SOC_NRF54L15_ENGA_CPUAPP if BOARD_NRF54L15PDK_NRF54L15_CPUAPP
+	select SOC_NRF54L15_ENGA_CPUFLPR if BOARD_NRF54L15PDK_NRF54L15_CPUFLPR || \
+					    BOARD_NRF54L15PDK_NRF54L15_CPUFLPR_XIP
diff --git a/boards/nordic/nrf54l15pdk/board.cmake b/boards/nordic/nrf54l15pdk/board.cmake
new file mode 100644
index 00000000000..4a6a86a8f8a
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/board.cmake
@@ -0,0 +1,12 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if (CONFIG_SOC_NRF54L15_ENGA_CPUAPP)
+  board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
+elseif (CONFIG_SOC_NRF54L15_ENGA_CPUFLPR)
+  board_runner_args(jlink "--speed=4000")
+endif()
+
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf54l15pdk/board.yml b/boards/nordic/nrf54l15pdk/board.yml
new file mode 100644
index 00000000000..1432bfc3ea6
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/board.yml
@@ -0,0 +1,15 @@
+board:
+  name: nrf54l15pdk
+  full_name: nRF54L15 PDK
+  vendor: nordic
+  socs:
+  - name: nrf54l15
+    variants:
+    - name: xip
+      cpucluster: cpuflpr
+  revision:
+    format: major.minor.patch
+    default: "0.3.0"
+    revisions:
+    - name: "0.2.1"
+    - name: "0.3.0"
diff --git a/boards/nordic/nrf54l15pdk/doc/img/nrf54l15pdk_nrf54l15.webp b/boards/nordic/nrf54l15pdk/doc/img/nrf54l15pdk_nrf54l15.webp
new file mode 100644
index 0000000000000000000000000000000000000000..80fb2060a0772776c3ba1a4e092ba7c28f13bbd7
GIT binary patch
literal 35746
zcmZshLz6Cy4ur?HZQJ%4+qP}nwr!oUZQC}_*yek`A8@nks%%n~MdwMivXr=Zb_@`Z
zhM0(=x*``*{C~P(1vn3wW(cGPSm3X0feZy1MHyAA&cOmYwA?nnnpP_aZXpd2bOX*)
zJBGr$#hc*#XQ;D6OfKq`@OM3!kKpvzTtM<u8Gv)u<7NJ(Zy;b<aOkrJ@b|0w4)U#H
z1@oo<*`TZMitriW_;VDX_X7U=0YC)+TGoH>%n}~`iv^bgjsbv|%b%-v3ji!2V-52+
z001yV1pIFOko^P$z<=)6DZ>G=0PHW9U)tq>iQkBC!FPpS#=E@(Y>R736~>&O<Dd37
z2djdvfD(Y*huj6@n8I!Upbwb8)eq^<{9C`VLj6y{9ptLu3SbXFeT{rou>!aa@B=8E
z^8Nze=au`V0nh-MZ_WY4C&rtCH^AT*_wVtm&a}xb;f>%cAnzUY*W+gy!1y^oTVGyq
z+y5QV0C2m+y#)OBU-f|olm&!5-v9uB;e)q3MgZWq0CB&Ea<DbnfG82=11vCOf()!r
zn27ul8kjLr652OdNah3u<o`CI+TKwNVTtX|^8*0h?~DP*lu|Fe9mbh;>KM*jUF765
zL064Pv9%g$y=%<bw0|!8o>KSx7jwKM=P=_QM%)JG+KM@sSLkDvMo^V~ncloY;(XC8
zr~6_NZGEUC*c5R{K42-8ITK}Ads{)-+qLMRO--V#bK(iYZ~}8&i_Cnb%E$NgHD3`^
z;C@s4V&?5zAs-k$-#>TdT7<ZQNV=Vz!jN}q{<M`mcj0Vb(=(E#q(hWnKam|u570b5
z%!V7*=kli*6^N(A5Zv?J){>+ph;Df^Y&L#B3#tZAP*|Vr{q72b(FO_5tWMCZ?bTtg
zchU6ZG*`kA2F2_=STI+8Mae8}!dQHSK~qEwe&l_=^H!wdwjVP;J(@qInn9zrclk!x
zhW(=RTrpi}v1F`7M_n&i;7Ft+GE=sGkEX4X@bwjwdHfzpw1f0|*+>3BkGyML2Yn@o
zsp1o4*-&4Ob3>MC2bQ4fYg%`4-OQS9F7lbwhfg+HpO0MVVhL<%fS9k0tMAdH>wpm3
z15m>oT#vgJ8tTAut;?P@BMrCpZD%){`H<7V$C-?-6%hQW!8N+3Qs01W>|Mi?3}`cr
zN=dpeLIkGjvu9*J|7jv}f35<<>f`qHu2+>B=MBgDEwJ*-c+zZ>S)CRHjV6_fZrf1^
z1j#A+dB)fr;zYh$fDm$^eu~TSGOuu2j<FdrhnKTERCG%{xJa03xxx4vAh?fkOSr3T
zsRLnpq9TyS3eVigfGdC)Ttos<W@JICU@67}zj>wjHM}}3dVmX#ozr6w36w9}lM4~I
zKv)cVyvr#+@Dk!gi8#+pgyWzP1;ZWyp{44#T8&|ArP9lV5LHfuTQRh8yBc^SX!VG%
zzw2K?&g**uK0+qpEv)+z*|=w!Y4nXg*Xy?E)RubQYGx{z>2>PZrswnN_L_Rky+ZFx
ze#hME-z$Gw(iaGv^Iiz~DG@%{Ee>yk$D$XDqDHX;+$u<dVQ2?rp3g`&KaaLUF`=!G
zY<Lu4OAWCtgp}GsEKQ1$lUu$C%NJ(@-&-e_0vHmM9zbMctMj-D*E3ecaBfyO{F??v
z&fB^&9xm_ZdvpBldV~DP1D}##lI3P%hEHrrT4{5P%D06D*%ogP@s;!PlVs4~5-iY-
zOzt7W!quSg^2s{6ft}w-yFjZ$>8eLmb(dW38R$E-Ps&94RsF#-Ir!%2{=%%T^H5wv
z)l7XbZm=kwL>T-?l*>N6cNw{4#_YS*xEcekh!|tL!uf7NEZm1J+5ISFTOz|{L!ZVV
zaC}VrIdx}X#wSno6>J)c&$sX!&<WeH1hSRgo}xzY0a@LMEN#G*lz6Hu(Mm87ymy-)
zY_VzR`iyaZi;CmUOaez9yiX|Y#==jwMu?-6zOsSROp%9mh<VLzHkr&@Unac94KFdl
zwx?48D;<(9q{6oh{S*C%7V)7f{^Ahtz%*M9@Ax`y2j?zWe`idu?cgT$J^DShS+IB~
z=z;?Bs|h6Qb{H|Exby^T>*4oP*CjLeUQlQw=$-qe=HEjejZxuqyEBW@M%6))@IEfC
zV2OGvT861RTLeWR7vCX35kePuaU8H=yD?9l*K9eh0AkaV{<G(Ny~lbsakXH6Zx|Yh
z#Kt(I0u;GF0>XLKs+Z4J8QeO_lryTG%Zi86s^;|b`04L6Au*S4Z8C?6MEppm=?=X-
zX3~1k<syGXfaqmev0Sw8&}H3mC&by%#M@k#9qvZIClLv%K=pOpV-?)}>AnkEyrxm0
zA3q~0t^+=*!pIdj2q%n9!u<<a&+>HH4E+#aK!7m(jK9SI%QkTVknqzZ3jxWuN%|9q
zXV5m9iNl-89>s6rc9W2sy>w<h^-o9;y-w`nJA}3{k^QlyEK!nNW=KjIW;igQa`vl^
zQb6#Yh1D*}IlqQNFCqD+&%j^F_=pN5v&BW2$uM!(x@q?>o(LJ)_)?`&G^E3bY9}%;
z1*N;-2wh?Sm$-gcRkc}NkDa@nAU~o?nEY(iv*YatVpLAD5xQu&w#~8ZH~V}>ndaeI
z5p`rxHVg`|L6z!Z!%D*zeS=lxTqQKFFTR07vAorc+1BsO|C=~UK#*3Vt5H%1Y*=b!
zg)G<|mpyF%a%dxK;&|<i@|dyh@t6^7)r_bTQ(_?T6qgdQ+@?*U_{aHBD#_MC7V?lo
zr<t{qRIQg}4?*ar<vo<bxOC8u{bRFK=Q38$!sc=MiCfsgHp!%+YnX>e7|w8Hw=cP3
zli;6#Z{s88SCeejfW<hjpSOjktaOin_n7^f0Ol=f-9(rMO_Hjq#t7g{7|DJ0wX4%e
zIYHPL5!MSdT<3I54>6c)FZ@WgN5fu8ChJ)X-W)~{`ZHr$c=n*d_imW9yxXD%GI+<0
zTgKo|7|5xrGv<BeaKdFP^lLw=_NW<nzgilmU{(ADXzsNmh0Y0Y!-JK}q>U$)?IIa{
zO?c<jNe?R1JTc<zrLH=`>dQ>6)N;+J-bbeh_G(l_RirXpeO=xLUEj|n5;m`%)h6~V
z^{ej8`aOC1NH4MEaPm|lcjPo75_RAybT<iRhj(hvlq;%2xbW<B$X|U;$KCc0^8<c}
zfyNn?m1cTwx!iHqyimygFmPU7ywO32Qg1Pco(8tnQ(H8oAshbMHMK52Ry)7TG_&y-
zqY1POV)qZMLc@(1av23fgVi0gnSxg_#?BbAM?ZDF26tRcWAvpQ=1(2<N@p=5m?So?
zf+JClk9BvW=3pK!##HVCB^h59nCF(RLN(Gzs$Q>Ga1kI$hMD3S<+rD!xx@gixClRb
z!2>h-fGSN>EhGJVFn+n|p@u1rMFS??VuGsD`R8{ty13hcHEACDJ!2FdVDEd=f*(1j
zGY(X|l5MewDdpoF%OnP8@z`dHVMq%&xI<?$#&1(b2@&J8EqS#&ztLE=+U#q@whds3
zPx)pJN+lAZi{ET|eNt#NO1a;I#`}I$3U0U#1OmUC5>jlq=o5=dc8O7zT<Q@8E!9xc
zHS`bdW^Yss&d9#+yeW2bptQ)juz;Gm7Xy0p;(YG+RWkE>m);V=C+6?%;OBvqEZ>{2
zxwf@b**hqT%3An8>_s}oHv<%!7X{=7EdAH;4j3V#SohjVQtDjfCK6If65HPPdgF%$
z>_PH91hmCbXVVMSUl?X=`FqLtcD##iemBe*52aXn67HndsE-$4#zO9>0v=T<!Ncip
z9*DJij0AYMds1knGqbY=^?G&7`EKgbypK)zj-4klLBTfWzB**`kZizcxICNGO|LZ%
z_=S$(sA9|J$cX6=7RNC*XF~8Bk>HG{%Bsw8OAv&k5S5IeggwCM@(I{ij%AZ;JW9h>
z<OylcIVT!WlG0m?%o@X?Xo{k$(Lz#j(3>KFtz@lDT|Ukf?H>^CY;y13TSKTjq5bOJ
zOgsou&*?DS;z(nif2u$lS+cujP^w5!jN{qK?w22<=YH|PFj@C=i|uw{trsVbEpeaM
znzc@nYJy@B#P7iR$0@9P*)Ku+n7Pol`pYO10sh4{>`FrlO08PsK%A5sO5L`G$Lr;&
z$V6sHdtor_-*+XoOcL+x8kvGlQ_Xe5z027l%{ER0FF{xy0@8u3f)1kMi*xFdW&|^G
z+-n$&)B+v>A&VhxgH1%+YPkW&XlN22cRcOQTG;~|#)Ld2q{UydKaWI<USvlnU~rbi
zn>^5TI)r=HW^nCTkWp^IF!I5-^r8SmWFR345eWfP7h{{8Nt4hu@;^xVaBv6iGPu3Y
zDytWSpZ|#Uzj^XbV6_b6k~KQrnt9`j3@oAwm0+yB#l>tzM&%=`8MKOVzrr3)xnFJs
zGQbv?&ld_Q6-JfT3pg)2V%5Lv8TDnKWTy1=hD1{t{M)_jlej15=KoSqM)V*5$2{<B
z*9dzPr%?7+1+F6qS{L;+Ld8R1o<PP91MU1%Ea>;Pq>xZf1X?)PCMXGT9UY*IR((hr
zoYwRl@kV1ar8~v<hAr_=?jMh<z}^f_3(tt?mEM1$%03ZB0sp8Q$m%M~i@f!|7PW3K
z;pU~&n7gBC;(h+5{Bc5ay1F+QY8KWsWmE*26+07`D@vhe>U*4R!-ujoaE|pfjEn_c
zPhpHFP}SVpImT~@{o`C=0^vx#ZtV}S*m~!xnvHbk4h$2E`b)w9`hGS)!<TJZWrszE
z;y39n?>A7J%&czw!d{kj3jwl*YyuUZn7KGPXb`Eu^Q-jQ$ls>=xCL_F?Lm-Q^$SKm
zzKh#Sn9#i`-%Me<&y+EJitA(d!n=nT`o@J><Pz14Ui`|NQjDnc*k+*G#JNkBs>-b{
z<BNGmIC7WJhEaBgu<a+e9Y(L49b|?w?@sfQy$$}o99h6#4@-UM0pm83gYRyy<Y-!}
z%hREHZ;_zTot6Z0@#!(Y)fn!qp5n1X1D*I;8X|}g^?zZBI1uRfn_CFz{}ochUYW%i
znh*BlIk8bV-<zY;YjB=;X%?7-Z1u0R7t=oQA=E`s9jQ+c0`t6lVf3H#*oN7Q_UyVh
z(?u&NW8jl|st==@X|6rIy2dHqVp=5=4QBU=vw;uWK9!Ewe1bsgrNrXO&{q*uB(s>6
zB@I2(IgIi)i4GlyJToZ=A=Ks3mTkDwQr<)V7H6e5yr;G;h<`lW|9INrE7s1oRKYC!
z+O*Y_DcvVJZ^RKM5TTzx?OW%uHWLWQLvy<lXz&Sj<wP4Y$WfE*Xzxx+=-V{#w)m44
zy|J-$`h9;m=LY#c_;dJR)7OsIIOYgi!p4S)Lr&PEPwu1`{NU6^z<^@C9)46+Gt)$I
zh-BdHWhz}hGlK|S>r^YIGafV<h^5fe&CKl5OC)q1MX}-k)vkZv>r~u=pP>Flb%h=F
zWDd1Nj~3Cg6n3lqNa@DpZ3RQ+_MQ7~7Hrb?|Dt)1-A+753!CTBLX%0QDIZOk5^z2P
zmQM&p!abKKDFHHU=HU7?X8TdmHGJ?>V8^t_{UA_s=LoFsjKjJv5i|Xzhv*d#QZ<Rz
zruQRp8B^_G@)YU$ZO!Iv>-tXT$PX%VS3q)xOUJkp>7NcmL=7hn0dpMD_h|@_7oFCY
z2&%E8b)uQcYYPa%4mrYqD?ibHa6*vpeIs&Py2StBtA9Fl=Bil2%SNK%Y|FO&Z0dy6
zICCgk=3!ArR@1RygI3;~PfCH%+2~;`{VBhzaqaB06uQe{CYai2(4vtSLQ63eJaplr
z4x#JyRL%^j<b9OE9ySIQJB%Ff@-2oFCfI!qnK^*c7*T+eM9QZe|0aU;;xx6C*k)L?
z)<rjE+cBZ7pfKHN=be4;?=j&wM9m$X>8(<q$VYJ@9(qMQ=DBu-4>$z>rUa$JfHk^Q
zANj;w_ld~G<o(Az*=wrTrZir_gCuADa9hpRAYmiyc&0064fAg`@8Q^>r@(4bX!82j
z{1L}@Z1`<Cz#P&}J0YU9lwylqOH@LhBN|Xjs+^qc8Wk1Oy;G|>VI$ycsZwc@7T_7Z
zk9>BR#caz_WNi2E8YUEHz5vK~w!(6{!$cugtPC$(h{#*2+&+&~9~EL`pmvvosF&2c
z{#_Qxf;P5;ShTGV$7WswgwX&YeLX-rSJ}Y>q}d%-++p;(kfe6unGvUqc)jO>>b1jn
zFsE>pC9$9Iyr}kXl~1#20v^mfQJ-&c0)08?tU!Xs8NyF<`|c`z!3KN6rJ_X=!}HZ%
z!^z<3C65;=l1to1E9y29db8|ZEI9%Yi9`O!t4G5DtKA=?p!n$AFp&}*0n0v{@qcDt
zFpI=B$Hv)c?^{<Sry+8m5;5~y%l{m&EIHz-ma0-K(sXMKVSY4&MQ#}39F4BR`A9Vm
z-j5yNskt>tm*~r)fwv$}kOv_<llmRw0xns9k70s)Tx0x9G8m5EubqbXgjUt8ty=Kk
zQaBNqzjE=aA?VigWAHWZtQe7@dRxStS!L&@Y}W<G8!hmr$v-mI`xDxD4C=BnFlmut
z4E>fBI9fF9N{fqTz}gbc6|3jNVhxDkVo%az6<=$9I&K28SA-zb%#B&3;uUpJQ@bXY
zN5HQ1?M$6dn}zUEM-$d@YOojL<#vCzD_}+G_2%U7k=Bvi{YzbYLt9HtI+p~<G`2`I
zx3QT{j*)=5?dp&Xe7Ghgxt2X4<dZW+M#)PB>g`q=gWPFSUNb#yJAXTu4l{l)Hku*?
zCJ+>$W)g;jd-4uYV7rnfjNMqtX^!?s{Et%fwoXwz7?(20t<?$cf7KD>p@anX#pWm9
z;t8-%^1<kOXRHVjzOh@*7PtPYfe;b}1$<C<-?@0>b5C@~xwMlVXQ1a$7we-4M;qR6
z&_4VDdh^v0Y~mK@HY5tJv|$aAP2p@~#&z9Gx*Wz{i{18E)5q{#_EW<A%>L6iobx$D
z?SQ?skyzpKw}F=JH~NvC`NcpnjQgQ~daY$;YMj8Lw%M?~@Kj?8z2wQJpG%5LZeN&h
z>H7O5T|;>1w!U<=yv7eqo0|ZyUtYCH-^5ixvfw!%QtyX_y$WeZo=lwj{E?qSu{Q}X
z;~D;+=b-~8%C>&DI;DFAz3Po%5i#H?^2{SDzHTslMyICKGj-Sy2>;VoV2XKabf&Z)
zUjq+Atc5(twr%ZzWqSzJYKRyeV`sg-Tfu7o@;(g2v-s|KZkAG#=(5IsFI9~_tC(A8
z4daiJ%n6qMatwq_73G;faLEiR1kq}MHl$D<!meO|DwxX)d%-!Y@xz&?M<4^k$Bd*E
zvy7RtZMu<ZUN{K`vN$G#;skt?R*7BT^i`?klp7?hJ67@0A;oZHy1H_5ui8Z%5V%Hx
zXTsH#i`G@Vd(fx@3ajU|Jz>sfT{s#)6nOj^NF5Pd?HKi#py{`U$MUv8qQc)6Ebc}X
zs9;ik6HapWC!qT*hlZGe=*)G9+U@P;c<Px*QxA<odo>cSgqlHMLbz$F77VDavG6(M
zI#lMNr;H$z?z^ve#BghfXm}GNn0z<p?+utjaG_c$PW-<^(2Yj=h0K9>z53mH6|lcH
zhxyT>D#LR}MPn+0!Kr_tTTGE5RP7(aI`SYtB;;#j8JU8GZ9mS-K}TllHO4W#@SuDK
z1@j8z%zdHy->lA_RzWSTPOdjGb)ze0o0)&KAUL!=Lh+Tt<Qh2wYD?SxaH2u*-2Tmm
z^gBdj!)ROE97SSPC)`Pd-T8{}j+-aS=_bBvl%?yqD4>>b{Kn#CZe1c}T0@EcCXHH%
zjHh=!|L<`J^-&uxd51di!^~hUn#+o2@U4xYw&F#fh-(}Xy=5ynK&a$VZ&c5=&+&u-
z{(OC8x?6PCfk8<yw0lds&qlzr4Ya_5UuQJ1fQQl<JXmgQj$ho&n*w=Vj9RO&!qEzy
zaW>?VZ~Z1Q4;7)B;fQ*XU=n+s!C?EG9dpA(a=rP$%Dx_)&0{N2zp>zeKTF~IgQHCC
zFtEWHt%|xa?ei!h%RuJJCU0g^e1}JZxIh?e(#;1V$gzi2=E(NeO|Xb&5LKaMu?;UW
z_!T*N&AtzIA^d$jQ+<=pND}`eZ5UvaiZIH`F4k=Z&c=hRU2863OJUaP<zavm?t(j~
z`Dwti+j+Wq?8|C6{zAr*sq2dQB=zn7pY1Yl;;IG=N3xON{H<@9Zn6JW@DbMF8QjWn
z(Eb5OqQOiu4<mK`3Aejs`);tAp}pDV<GR@eZ4ale`SLU=rZZJXlkElpkEQ?8eIEI5
zXSyIESTjHQS5jL6jv1kU5Ix|ON3cCEvY4)DrT=o0YCS>|jYmwx&lQc_$s6x1Ch9~k
zXiA+^FNUDFT`#?Zd+t6JpxwePr|W$_I;}b*t`4272Z{q9E|mp#MppPF)N6djXv96$
z%d_x^rWA*i4d;3NL&_u+!i4+|9J$c|Hh6R6G05Su#~TSPBJf7yJl42E8iGZW{u%!%
zACF>Rhl4y8NasM{RMCjt&C!=4bHmFwnbjbNYX<eIS$|&DUn9lsKJ7f$KcCu#hUK<~
z94%HEew9)UEWxy*UU2|VNBDvr*cd29_4<3RW>%<!{tD06CmUl93CHOFo&uR8VrQw-
zoE7U457__4VvuOh)?kEb0>SR>QGyC05FXL56@SgbtHsMr5XTkNZp;(3*wgS>)a=&g
z>ac3?R>e_qwNbPiq(%G;?h%i!K8h9@lxmx~xm|VmNof?j&yu%TWx_9ZQtX|-VIw2t
zHP<pEdTwMDFH#R@`(ynf0PGU@2N8S*M#_gv2z+rB<6kY~ws6P-^10a{!GWD_b*gOt
z<3b}E+%^o(U8GtuD3J5t-p8+6^k0+)uvzB<m4Z|%PKoV$wrT@N0z7er25RC&N}QUn
z&yy&c`nA??1>T!jdS3LKX5+GM<2Aue11w|0hlgFuP$5xrMy!$8M3W#|FLs>3sot$#
zZq>5Tg9+<seXK;&vA)GnUb}8AvONXosJ<p4S`mdg_I|4?Z<p(;U*4?*G1h`_RitBG
zbkF_)D9^3+f_}{1x)i;1Gx4glso-a|ZQ4Qkvl4F8%rGt8$+wUxCvm)*b+q6i$=gBH
zN`%#ytB(9MIFm|9q}(ZV^YFer*1$pO)qZ7X7q?nUrJ=~cc!|Scdnc4#Q`b@qlqL26
za1ZCk9NzOKXw)VTLb6s9N7Od@p`3RUCnbeP#&Nr|cY~h0{@zd!ylm&SfB7??^=`_S
z>fZH0SE`GHI+ydhJ*y|o47}b{dG^k_J%BeZ^9xljU{A(pi*UVqCh5F>Oz#N(Y!*%M
z#D(!QwSf&E5G-7}Qe%x$N>0`i0WGMKjf$%nRdeQ~fz0Jg7y6Mu2E|{Ch0W%#w$$FB
z6yk?&(kvbvv^a=thvVSV5Mo@gG$T<?t{@laI_j#Zq)T{Cswse@g+OQwLGg+7(ZK0U
zt3^|WG!e;6<XC2g4L(mO-GFylV%+xz!S2AsD;M5v@$SrLg{h#|`HP(gJ%_q3?f8!G
zk{zXeeODWG*J2HOuFIiG<Wh>%ZafUHkfh?lB<%EmLt-D%G~@c8;3&?BRds=~0ad+b
z^hjUl<*na9iH>kc-{snPO(uB>>yhjb1I%FsM}>qXj)kMer<X|^cXe4qMTV4dEd2$n
z-D#tAnn3@w5-2DbX0+t}t)y7;enZYn`}^>)a|;DZaIk0_p3ay`y;(|C+6lp96Gs_R
z=mbm$qJ@TNTe`2?E-Z^be+dC#-_<!VatGeFvOBZ}Yz2X)g!<7VM|{6&P*KJB-bvY^
zK>oY?7@n&C&~{Y7X%N#g-GhM*RJceV;2iKe9<~*tP4%PX9yJq>*+|j`fIhV9tM9BO
z-RS0diuqqTk=`o}aVsP8dKhI{S?B~UVyoFhp^mh<Hk9jK9z4F$ph@%yK~~2Zy?)|+
z$$0H4xhdKRt5^~j{pJ>2!H0n%#$j$Nd6^?u@V=6v^vMy|gVRAGBKv3)wO<OCUD>TT
zf)lAvh^?79=cgCF86;d#K40AQ!?Nqu#*#%}wewLejHUikR@b<oB|3o5uMe6D>xP$V
zr&#ft22Yz+%{vLkr3DfVJdgu8NyT<vf`EId8sVgU;b|Fm!nJba?$=AOqp;J#SP~v)
zUpchKMOgkuGvat`l^8L0IFoi+CnJ)AT3m7;!o##Ao8o$+xeLs!1Wpe0Hf=Q9YNo@N
zdG4Lrth-+GRv_<ESGNQlKTq|FTA1*#|9&GbVijl<BC<hmc9eM?9#Xy*uW;qw$1LTv
zpY$u@u=!W9fwv%RC&qRm9h4VBP}hh?tq}wi<1IW;wkguvB>3P1o)xj7F^b9<Onp(2
zB#ohRFdOP~Q}vPTGe?pM_!D@HH<sJhYb`vsY22Wk)NIjY766uYgv#xNvQb4KHt(cW
zKhgH9N4BDFjiGZL+-5L(n%v+V^OShWYr-fw;%ig`K&;Bx7lls_%etnrODvdGRC<`k
ze5+_Oe2YMvDE6Dm%}@@XF|=x^KZtZ22%i@#@opUL1w%F3*-zb4Ir2aOI<*SZK`e~1
zeR$1#z1JKme4>HOO`ooi#iMs{TIuO<`T#l^(*eRvZgAi-7_k+7d2?Ov`;dz+1j#o7
z60f$;U>ObOlO&GdK~C4p7;y%^7+N5rNa}_d*Q-GEh?bXrC(q|lq2&Cfl_)q*=Ohd|
z=(Zi_O(qnU+s1F4Lwga(S=yg;)6`k$dt0Jl6w3amD4<gMAvCIT8i#ij^u0Emw9yB$
zEM-~*PM-RpjBO>uv7k2s!e~2yr9VbtYq@aMBBV};Xn$#?SQm*D8kH4Vcz==hy@q3l
zi>zcTw}7Hd7)^~^K`pM0p_?Abh+c@vN(c7ky;A;d+Ub;>S(iy#hSv+bzdOfj_SYv*
zBHhA5Vs{tX%^z=Rhj7cXq0vNbx{j`4Vp<_W#~zSsczTAwG3xtLVGnhwS1)5s4PGsF
z<<}1`qKc0pi705+E=Z;-IQE_zJ<pl`W~gA8+4d@4vj|cSF)LIN*#>>E7Iy4_a@S5U
zyeWA~M1@Zy>N=)ayHG83Ji}ZAjdt+%)+THIF#7rXzH=LQewRMZhtyot4`|jEr75<q
zhjltwNKtviQ32Becq}M(;#@BVBe1=fxl!zz2p+i4?#INl{C_ZCCzu~#dZ08DH7GVT
z7nz})+WL;}D8OEX(P88ibZE9y!KTS@&!{-1U{N{u$(Z#OZDx3I1p8g;QZ``50Fnxm
z<%MJq+I*)UQ>F3=o>`r*E2apWZrvCZ3ogd%a>tsgnEU@O;TZbA2=Lb^cQF~}d}k}8
z8dv$C)q>JHt}A^wq-rX88jHfS1cpXR>@M6QN+MrRl}(g$Gf?4jjS;v>jYwV<n%*Pt
znrn_@-c=&Pr%satK1LK5FOt*Zk9>5DCxs{FKrG(OGfMjn-TjwxL^M)lV}^3RQJ2^%
zX8422b-^g-QLVXJ06x9~U>{_PQx-?{V<1OM0B<FrzbV6xPa<LL1*gv0*cv~`RsY_s
zvdjyVu^lx6$9YjfoJ0WgAIjj!h7o9tz=h+FVwqu7+xGLA%Cg42M?FPAEbPy{z={)<
zvw>O8d^73q3HwZPXVCUjU)rSVMVhXtbw7YiE+YcAw6xH370#7OU*l1MdG+mLTrG*v
z@P3klVWEpi5v^GdL=eM%VM2U0{WKoxC=o2Rq#=VU?B6=6m!u9h0u?kRTA=wwT?;C_
zrnihr1P0TzBm$9G!<rYrL)ngwr82L3wXN2|)+qXu@~0(1i!kZyZ<&c(@5lUEaQ?U7
zd@gLZqF`wdWn^_Sf(FYb^y1*|WBjz%Lq39O?$UlgY3D@08ehFZwYJE_SPuL((w*0|
z_y<ctjEeUhiKvG6^~}EjHe*dh=friW;bsaDbvC(mvpqfI+1$y=bsllUXCDxVz*p=L
z)$mRu9)H*}p}&^kb?;|CytpCcju0wn;vt$tCw!mP8{YU|3WA+Q+_z)>*;Fa0ION{N
z%@roMFWg&gzs;x%=S2^7jK05Qa}6`dr*9@RR6gS{kC2-1$hRfm7?mq1fWO9N@Rmf@
z4Hq3Gb@J8fHyI5nR$EtcQ4j^-%ChN<2jKPQ7SmC5rE#uxnr3j4xt|KL-xv1mHQ3DW
zW)y`qi^brZ#1?8KK3S>pIZjMON2^*Yu_G^s4!pJeU;BLAAImCrxeqC)pp0t#@4*O}
zlES_H2a2ZBX35GWw!NO5i<40F{XqoGS%K8%B#;$0pTNhpOAOtj79N)>2O|adhued3
zKTb296HGl!{dE%S>bx73wE6WV?76@J6GgAQs_vx>2r}*pdwE_Jwwb5$p=r`w87sZ`
zp2F{XB6&KJ5jL_<S#xE$Db<q>yPu!x`t71&p307d-*dcyWDg%<n70I&HKfb4kj`5l
z^KjaCBi-cZKt{h^w|o~WM2maK_oJ_4e<-^Hzm{>w1)c(~Qp6vA=0nAzuI<Ai%~29N
z=x*Z?izFq^<qtcu@#ZXAuUUr6!E<;EB#<8bQsb;io(~ecCWVH{?fctFx72Y1(@LBd
z7vCp#+)Sc5M*vh9n_+~4_%gNxNE%)&?cbOwXfY?JC@^Xgz6aq=BYVWEDhPu^qjsmA
zHT<u8K9KZ~W9`DDR~^^MMIn)y`rFSm^F#wRRDuLfgBa3k9mG={iV-G3Gh7~hwq57%
z{4xYl`=-YrO}vECX5lub97uZh`}1Aq#Q5)$0kG;6i($z_wq!=e3vB=kf}EN?L|yuO
zi8?GkUIs<Jv_ESRO}K{x>J?fFZgaSwpc<ct5(oZ4%J_m82mXAw-)C-+=j44g?C_J=
z(1mtU!C5iF8*cS8gpe|5{UfxqZo+^c=JFFa7_8ZcQdik}yW*9#0OC1n_U%?w@FShk
zt7gbQ5#PIs*zwfZL?fl=Ue2W}ld+W-07CIx5@<^%j*-wsxh-)E)(fBodaqt|`%PX2
z*i;7@F`(Z4`<Pfux74fX!7{TeR>4C)2}lps1mS%O8**XQpahUAGbB1L&yG1RP8#nX
z1~g~<q(K>{2HN=+s}%<G^kfZ9G*7!ZaFsHjo~6ulF>sLL-=xCaY(*hz5GnL7Yn}^c
zIdkRNCCem-&bE|o!f86zo9yU5Uew>>Boxd-tIY2!+ryM=O7+=)2wK9DEdaZWz}p}}
z8?00fHx94^bJrEjg<^pQbI)3F-jn~b0z8w}s|_1)rl;vZ@mD+I9dR%@RLitFe&6Rs
zsu;~%B0$^S`$6EOxV;9YFErjyAPXz<Guz@AK1_k1I2Ie_%WXBVY5z9+dfH=2{&b=*
zG4P1*mBod*SGQa_r@6bs=d&mU1Vai9j?p%!AeC6;ZltapM;m@p?X!z?e}D$yjXrHu
z8-2v64f<KT9E@)4`m$_=X&DFIv4Wgvu}+9PSvQg$d=08voXz)KFm_8NhkthYE9-z^
zjM^0<SKt3|Io$Ir@C-*+nCwCXcp^CR$C+6TP1H^MNr}>W(fuQ0%GSU%UE5?+w}siX
zBxk4Oa3@2wbf^AB2|jJy8f<&u-DSm<wejC)(kR^4nSyi2<kBhI>v!0{X8x=oZ>f@D
zd9`3>w`ur*;ks|A?3Levy#wM8%9MOm@<Y4Hlet>~X*ea)sm>N=-k^Pyp?0|5{FnX-
zF?u99dyhgv%<iaVdB67;0PJybGsACt*5JRjpW{>-sn*ev`nZnEGR{_=sAD}mCBZh5
z(W}x>!;q^F9Ug^OlooQepdt;nO(l=v?01$#kEIesYcG$@v+8X3x3<GV(lr7bR5&hq
zwZnx{H47(UgLZmA)aN5QncHKE;cmE9mFfJri8R83imDw1$S2~}l`3A#Lo;a44&_mR
z(nFX4!b^J|B<$cVysnM!ue0qOu37DF;_Qgo+nei@@T6oSyVa3MxWm1zNWa&D_aG8!
zDXmRZgNXW%W*!V7->#=`3$>`%LlT%C(3XCbYO4?l5xd=81)d&d<ZBA^OKHlMUqD|`
zx!Pe&yg7eDi&Lrt?SgquJ9B2WfB+`28GM@t+BBR8yt{8BD{4{!VgtklYn4Ga&;3ce
zP(`Kft>CaFh?C=hAXySMCQNLpYkSaQ^u{{B{N6%##v(El)cV3hwY=SaL@d-)b!+>O
zb_YGk`%Ro+AYJ+lBL`@Kvw)L)5{$2GKs#s6fy2mAlJAoW^ke!qj19Jr2qwk2a`>jt
zb2{!OSaU&;7&uew65Ks49a8a~juzb5QrKY|GrG0Z_ZOO5N#*_75kqRE?N!9<Kou^7
zE2aTU;2DiZTIZ)N)cxd9SsmT=gsF6E8}E?!8V?O;X?wN+oU-_UaSvR*1Egr$DnvO{
zk-n673Dr+fuv!gUx!EDeDMqZ@I`xe)*7|nJzYp8}GVc^usC1p5Sg*}n39N1}u^0fO
z9H3zbh(##z)v<IsP`Tnxl8J^mMqR;``So0Np|E03H(eQ9VE`DGvLZj)7a$2S+7xVU
z_C`zeL+!;MX-m$X*NHv|jcg6Mc5%vbPH`saj-wuSO-Wvz%;^73gSe@c4p0903qru+
zd~~kz$BgGg?Oe+5DsW1q@@hsU=V7qA>63DE&NqSN1Y4LiPP4)6#$xl|Y3+rGVK9;o
z8eN=oU)lCIzeTtR<j0>;62gC6n~2w|5wltRUsCbS?Z9XeoMk+!lH||7lIly=ptR@`
zDo`Y+<xwM<;tKV23sRKKWEb@}yF;Rr54lXR#Qyn{Q}P_Z;Dpj7#cpOUy&b0}?ta0U
z<?o%oV|OB$WaQroY)z6z6p91jyVW#^H_knW=J-<y-xli#QWmaprrl;xR0zW?^iU|=
zB=<oB#!@oxl_QUpkBuDmcOJ<u(<{HI6LWb;N)#SvfAM?r;>#tJ@9jJJNJj;f%RXN`
z+DT#C#OxRH6@c~Y64i*@97q-lsqts={lRf$jDf1m7bJZ)WPqkfR=_?+F~|*v<qC7h
z8b7dcE7<VxK}`%w5#!kI6CCT{Ct2PG&gd7uK1j8Tl|BWg0mOz95<_mpzDVr9bDp|-
znFG@bI2@6)Ojt*+jIT^)M4e!CgR3iCJIg}*A>WF<32~=>e0j7)e#PPF=fUYLY?t5W
za3tb>Nxuk35+n^>V>c%vxxAq<hl`UIX{{04#fDc&wY=5G`W?Wt85B=BZB0i2(O%~q
zvVGw7Iak@=g9h2r`^gi!uHH=(&>rVr=&l#O;GWGLM#s<<(xfB*EwV&nx5s;33cpR}
zoYWr(gWiazF7Ru%DI=_E$5)U2qv)jZ2)eF20R1aMZWOP_BSJGTR#JFocQ<F4rz4X_
zjhQ*BrQmjyFcpEm*&7(!omnVn>jcVGkfR3MAXawp3<TI@2fN5h3Ot0InLzzM(ICah
zeURQdKI`R{*BT{SzM_5;Kw7_mxHF27u_i>x5t{S)Rst?PPWT772A3Mr-@M!bPEwiC
zU#e_lNO@w7EkKO`JqdgMi!oEPj^8f9wit9ew`bxvCB#bCe1ku;F%|;7=Po7-m4gn&
zOB>I=-qjO37WLq)aGXqBijpP2*1N(KNREElmDHh1k{TX>6xY=2O-B^|l``Z%7D4jm
zjQv&99p~`5Y<?R!Y7aSzl7GZV+2Yw4FRuO?*Y~3D-36B!v&Jh;?SZgk?YPLp?@kjZ
zYy&O22v0}98Gye?_nC?u=NANAgi?1GPS9T|Z3XLKx-c3MRj1qfWLc!@e)Ox#Wuk9i
z9T<}x*<;JWE|*=zs-Hav<Quv0S)=Q!c`*At759jS>d}iRz9~<LrO1~K><etedlXa=
zNoJe)KEH3q_zgs=Fc;Sgx%97`wBgtk(Vuwn#oPiiQfn&|^8!DOh><{?rKiCDfxO$1
zoV4@^*^iL9o5ItpNHOV|Tt6&ff+SJlGA(Q1v!%6M`ZzmLR;aEv+t%@_mJs%fKXqes
zRrhPDR~L_DecqNc4er)@&XXjv)`MDbk-x&{Eb8N~i^Zf<=5_#j>s05V?Fp*4cZUA~
z(Y&k`<)^7ibubpoXdoaj#5MKO(A3e`h3f1^soE@RXT&fSmo$yh#_6Cm5sqsDUNwvI
zP6*)N-J8G~tj%V%%ny(E*sS^6U5r`o$|xnD6#skX?tHK>kA8O@Kc=XgjAJg)3?&|*
z^Cufm+)}MIZ>)MCJJRmadw0qJmSR5hR3`89&2?XX3@o$Z-?hk6@O+&~Ek6pSv0wX)
zKFq#=AY&fCaS~tLXC?tnQXPEG{V3tjLDpVWua;52yi2Z{tnmbPc^amc1-6DqUWXs=
zM!1!`i1^|xnfNMWoiaUj(3U&SXUKGsBmrgjStW8md$Tc)RfNU1w_n*O&<c(o3m9uK
z%f2%IB_+RYWOYe+JSVrdsi%ny0z-51vX6{%t@tyIlf)(GGnBmm@lXU-j8g7l9xgE?
zcOwjGYE5IHNuO&!dSDujt}OB4`hx8tuu9k2#0YHM*q0HVGC&^XMq50_Nc;0aK92T$
z7DkMeTcRvt0&8%!QmqURyVt!333AhaT)qp6-k>r%){e78<mSt|kFyKYcC_m98tE0N
z<DI4fvdkrf36PWQ!LM1ldj=%U(J~pZ>|CT`fka;cniEx^6Q-SEq)2lrKx-b$bfQ7w
z@`RRjgkJw_!Vd`mY{}phFi`ckMVz#I51a-3ENr+X?30u7Wi|)P6HsIDmOrT2@f!jE
zy;N;*AKpxzO)CTb3(?e7XX&1jTla;NczY`SHxd;3aw!_a=M=$`Hc|x3lMD<$wxCcI
zHh>B7*|e{!LLy50ZR1@FHa)A_XtUt3?|saI9tmzM_6)RQ7Ba_yQ;Wkhy5oLoGW=R7
z{7G;`-Q%7VRKgJf4N@ilLxzIVXC4wXX@0wnT$SCtu6oGG$}#Mn6`Ztj?y!)jK<)lC
zn_%NntTl((0;kkTD?|?AU}e9c%E%9<6{{#m_6FC#k*x-h&MRvRCaA!B@J81oSeYk3
z_pjG}TqM2Pdzj2W9TS9qVl=`5zlsEk@Y>0Wci#SuOvVP%GJkon1}f7KH>{4CD%XF(
zvR_$C)-qR_s89ZPGB~v*-aF&l_*sQO6z&2k2uB9PC6sg^wxU#Vo@aMNg(hy-yGd0)
z>3b=AZq#%lo3cslE9qzFYws&1<OYlyX$xWWpLxMq<rt<;5*nnn?GSkq$4LP}nVBAg
zfK00*<LKE@(-7!X%_vAK4jG-f(#_ae`PybkoyO+EVA1%ZJiEga8LnwXDLw3^D0oMG
zScmS}BE|5W+W2d9XFGal34yhm@=PfzTEgRVINfrYtzZ`eRmz%WujaHi!5>)->Bh(L
z_fHjo1-W|5EGbOpsMBB)N)B!S#9Lr?mk?F_v;Oek6iERr>zVRyl1rJCJXV>~FqPM<
z_7iF|4NIzoW0oMnMz}K%OABbK0dq2rltl8ei^G1@(9Z|&vo2c^sD9;~V{~>N>3Dnh
z*oyft_e<FoiaFj_j?$~TD7iouCpgj${X36&VE56l=Spj2x_qK-C-L`SkeUUb1C-P8
z9+7<&wWDh`x}5PZJXr8tY8J<fubJRW-|4^cCLE7A8H4uv26maT`e*zfh*yD;Ud_*Q
z8;{G@ba|8i)ZF9;1l-MnoKpq=Xrr?tdc~~&A^P6Q#F0I`Woz*q-ob?*#Rgmjbu;c)
zng&1<-ZHHyQmuLGdpWSKRv~zw9p!h^crTnF|2si<vi4Ag**{UT9E!JE#5NDafj>iW
zG4ePsh!D*^gk3LT`oeNJxI-bn#46JxI7V{S(f#+8f2cDe*L>xF6EqA2iApy904mW(
zWD$nzk!|8TV|8o#jJGD)OoYkU8I2U2WDFZKfjUIqphRg&{uONgi{V{>^A_#K(4_uU
zC>u!bi#CI#M`e-#3obx7$GPNTT}_Y{FcTagyl!`rth{j1v;y^4)<E6u5644IjWEu1
zOec$Ol*ib6*I`BNeiB~O(lrcJ$T&$wsFwN0TWK?g%w5lcU^r=r`jK;pnJ(V#SD@6^
z=^$lnMK!$T4M`Q#zf|51tDWx`NADFc{m_?u9mgvJvN)>ik)lsI^E=&9_VFd>%kA))
zxiMi0ft567X%_soo(4PP2P{4URfk=iL|1n|2E#v|wRTpht8s(eryG2j#qdHfRqQm2
zu#1~N1OQX6X{NB`FfNf3b+Lpp{s`4tjS@<^Jnft>YsX*8<S&N)k=9|>QhqaJTv)zC
zdd~NtxI^TTUY8@ZB<LIRS?Bs$AU5e}9&XryK_V_uyLM*ab*<=KzR{jiIF^YB%c@69
z{I2<z21rE%dZ6O+Yz0M#ab3o35x+DG#6-hN=Bm0$Kn}qwDzJgjtB>c{w6l>~U>q4M
zaKO)l9|Jjqaj_u9Up)`)^C`G1JdrGP!EWUg`!F{h(w>di5OI67?a9AJkS~M|XQ&W6
z$(+h<`Ccei(UKn=7(t=`#gLj`!m=AVAOR{HLytf2?ng~^<S2b0&Z-Mm=f=9x#@DRt
z>5T(bK!5o~xu0yT&hNYzJ-8nZ%RfnH@hs-NSIdj{<k~bUTsBH7P#0<N@r5K7Fj=^Y
zhgz4E*?lQK5%|zx)`EeN-1#HEGn;qHeMsSUYtD@q6~SpBHMLCZ%)N{{tvxg$ulk({
zRzl!~jU?zO{4zsQ6L`c?&^$x@Tv(IcE%`JHkDHa`6_w3=kb(7DFr+TE($$c})Mymp
zqa2WTt3h9$+`|0L<0KTSt~cMNO}-X+lvP1b4GI*CdecQ*d>Ii;09qZ=?v^*`Yp~Rv
zkL8^^e$b$HDeeKCgi9c+lH3VCa!6H)f`SqUT@Y`z23+GI>J;-I$8w_knBc6F3*xNX
zJ={iDd!ZLA=hG|4?Do9iolEEfA{}WdbYWq#`V$?$g)0DSWy1+U7HC{gb{jV24LtvZ
z@|+M8@)oahC5g^4@(D&I6){d-@`lMH)r}&+_r{yMk<(1|`+^MLDNklw2h2lGg1k5D
z+;o?UCZ+m(bQ6a*#p3O^{Fm1bn5jEO2ddL1a`P=z#~+Mhg{dzx_k63i6cvSxW1Kyf
z>@cc`@h3Aat4fO|3{F*;(xjcl=iSG$kL<NS?l$^+i7mv~tBC{z5D@45`O6I}afQ7H
z%e!Arqxo0IP&c=xt~S%!9g@NrY9r@x^eF*HqL~9j<-vERT1X9(MmKKyhq1bFs}(p?
zv6J`|c@4JqJ3epS^sqprpz#{eN>F}ACf~c-lvEC@_lc+0YI6o=#Xf_V&z~A?Ak=~u
zN;e}_bh;EL_m=Q(O%YT`V=h$<{+Nnrl!%&17PQsH&l}!Q+>4>$@Ad5zn;2!MwI{-x
z^^`HyjDMvwQ5CS4^MM7{9lyYnp>ZCHP<wb%k!9V{i_3Dr9vTMgsk0{kn*WJIs#f}u
z&d+#z*z;OnWKhep<@;;Qv~}`g(MEm-?~qOc^#sSSatFC9JWi_1fv!@raqLkvS6jC;
z53kpRRP`o&>YJ7Bs$6UB3`FvP0#V=%npxQ~&^Kgn)sTB4psoTX0uj0xO-XK=tfr9w
zgiWJG@~nrpnREnOAewK`LPACOG8n+ajEr<f@?l|oe33*>aS7Z4E&w$+oH87UX@Aqu
zO0EkE8u`Y-Vu)FdkNy*dl$Ct_*ebTb@=mydl0Y3o(wc$mDtx?=6-axB`E2on<-H?Y
zf!z5uO;(QFHobnNkEwWWet`4d-9iP*S%D*jG`Q$NA`eA@UZ@X#n=GVnbbry2uy-#~
z@>m2OiACNwSa&adQa!U7%07#>1B8l|6Gp4nXw-N;$M~N2`lkf<AAY?MxamNt2u5h2
zce$YQe)DNx;+T52VXxvVOIMjqK|ygEdwCI3Jh=&?G5QFSjc4b!u^V^5oWuv|ocx25
z3}#xJYTe*By=N4JZHF0x{TaCY$TROWOwQw1kR{xqc`ZVt`{P1kb{ca4Q)@g}T?}}@
zq$$A|Zm%K3CjSy>A5f@lQ9XJuXMXI6&TP2W(lTwD7RJC2EXn{*1?<5N>@&qWC9BXt
z+`k%9YjBjpbPXp-J*Ivr;n-ea1S;?>lk;VcYh!~0w{BZH*x6ikhhJd9+DV^?HkV<5
z`p4C=p<Zhwg%;!W5|ajmT+A^A{FkvF3HTj%$@Leywt1j0yY$Z-wHaJ<e^Pv0-FPh>
zE2+lYorDQKxl)z`+{&xU(_dT}2SwF#+#;-BLFVR(h0?N1H<uJ7*Zlh}azkEPw=&M4
zs}Cn>d78h?P0+rAHvP`UW-+;oa>a`rMFK;fa3h@Wz-NOG_ivj@5z14B7c0kaPCq*t
zeydUjBow8A&WagVab4ai;}wD^{sulQ70|#3{$etWBZV(vq_^R@s!u55OOWp+C(Vx|
zue&zT2@~wIa@Yc4!E*T5r2cFV99eTJ-s&7+WI*LmLe;<cloS)ojMwm_t)r^_f;&!p
zWZA{u)(%&II@sO*a}O$Z^xm2yHDAYs&U>yHf47hEBG0;fi2f~B84*Z5e?b+Ullpm?
z+!&k)q3CNp^7M~IGj$lYFHN{qs9Qg<?#kz{GSIKEIDeYELOY9^;Hc9H^nS{$XCjnh
z=FG|j@txqnKZexTjW%>Rf)ZF!Ym!`etS(!>Z~2@ujF$cq8>KksU_9PTaY-^?$s@hF
zgaQ9e=Q)LRj#LSG+*mX&<IXUkT^|}M_bNtY`uD^&4BjR)^8C%?FQ(}3o0|#^7W5*p
z3EUq&JL>{<aga;VH0!h&T6NPsfA-6pVE3CclJPYo8Wzlq8`kK5&yxI{X6QrQ+T)t3
zp@$T?Y9gmPL2{JnmOh?2WCZOk83d9f1yl~7MN*82R5|zm5l*Ul@(n|r5W<neU$D+~
zkxkv?W#&&tqI=!Z*xw>6_!qJT&nFPycz@+q5xgWxLsX@qyWnil#B&^W^$G>LsvL0N
zACI`5Qn}JfrrzdJ@=0+;6&_4?G;w>{1$61l@X=^L=Q(&$8Y)xn_4Hq*f*u=N!Y7~p
zAOX83O5&5c8^)|_vL1ZwI^`jvf0WvsBk7>^X31?TvZI-l(FIdAaD?&oeM81QY^<3$
znNIK^L52e}unL@5>NLPRx7^x#gXp1-(jkcl&22yf)H9v3*wryO4d#ef?9fl6DHy_e
zHb(;Cmwtu6=J}cj)Whl>uYsR6G-;9Yotc+4NGw4aILb#Ns})(C&KPVb$_G)|XXy!-
zt6mlxBag98GKExeJVQe4=j5Z?sdaK^Bq1Eua+pa%eL%W%6~zK7T94<E$|H@p$d?k9
zOCv36OZHjE?ux{1VqhK~i$hthM%Bl~5Yglb#$WB?LGgfrVg6qHoDY`~MX{{QoTHlE
zBwz=wWc5Zh+0>*zg)|oh!v0hra28=}@1F-TN&z1%+JDeIc0c$y=~<I--U<S?jvg4E
z`(Wo+=1+giK)OJ*W^ES<K&6KoTp|-gJmp~bZFHb8&7q7>?N{X>qp`~*Oefc>MBcrX
zN@7?8Y`nmcCjD~fh*rrr3r~pEYxj@G)L_0fh`OIZ7V$qGna3o0&F-t2epIl<JEdVM
z$szVaQkCJ=FgkdaWA!_JO?Mm5h4=|dzNO6XF$b0GZcB<9G@M~)^>7XS`~yin3}m#s
zSELe{*zHf^Wfat~(w@3$%2{OHi<<pMC3sWRUodQl38nwc$+sqcN+&h->tuxxxK2^w
z6kXKi66Sv2+smDGIJ(ioz#jpIt(U0U6+0D$?eMIvn1K(qi3R?ExzWl?ghOoN(4+{w
zl@gCO4wem{8;8!;<5O*fPo+bL`Y@)D9NkCf3&nW9v<`wH!@VN*1ZN0P7~*?UvQz|>
zCk-X1#gPzC2J?q)!q3sGCf2?IPtg7kBS750a|?`<lgjyyE-Xi}!^x(~>vNLTr`Fy~
zV6DnGGTdyVqGBL23w8P7e?$?GrA7nXSZ!Yi*1|;LozC(;(Fw=5LFpV+(QsU2gTe+Z
z?b9&Bt+Lp0RN(;y7v5w3k0u7NoBmf)7QmXpMlu9<7g4}~7;p9j<2C0gxQvIhU`;Rt
zP&D*QMMNsC;)%DPZ7u7G%!#3YSFB<g3Q6`idQhW&L_(381$2qZac5F_H}k&PU_>(w
zC*v%z%!tT%gK)H!Wz(P(D~DG_#n_|Zc6SEYs`P&1GGowRrp^0EmnGc;zJ3V@FvK?(
z+#sJ!S$`pAVF3NcV2RJ3hHt<-I<Z5vNO8IWvf@X6inFedT_z|}>lb<__2(MZ@yu%&
zC0{eA{x}?J;yiavfX3r%d4?*uN;Lu0WkT<|AH{B~66RBTp&zZ^50LS-ais)aBAa=z
zymOsgd@Bn!LAB$hG4VXmK@Wn&KJLGLb~vtrMBnb1f3p17s}ecRlY){L5&?sp(_>iq
zjKgYj^Fh9x2}5ZvUi(TvFk$Jp)0FP3ofhwj&O6KS^=Od(=K0JFZNgiiagc*8iPV#f
zsFr7(SnN0`I28=7kzG#xfEpL7Yv!PmQ6}qSbtS&i*}5BRSLuJx+9H$Rh8`(E-NyPX
zsmK6#m76J|jX7<WZuxlHIGG75SM_8^Ru`GXi{@!x=VK6)BC8X{IGoa)&H+c9nx|zz
zEgmJ&l6GYWFGqP4EI3D%AqltiSZY9cCZ6$NjRdUI4}is!TjoQtEa^ITjHo2fXF<5X
z&2hGQjugJ`vqsk~%$Lt<y=z}Wv^|lsG&hp|Ylem0k92u_dLa<Q3=iGmrhq+(vhe4{
z4{?m7pn=0#(&i0rj@Hs_;4bL&-XM-@$ZCv_Dl69#<aN0<IgooK=VnvQCt{I=&_h3L
z6&35j^(Jlv{07{r1%a<UE!92yId<H!8&Q1wTzgzjk|=qx$D5eAXf@mCEQ>3|;tsu$
zE-%~n+Ymx?Wguz;Tq{!|9fX9%7fK2Av)Ln`JMla<KKPy*7Xx8TFCm%6&q>kTW#0&?
zAYG4R_SS{k0YLIj|83GSb8jL2%HJ>Hk#QR&@J2ArJ6CM9B4t0zf<GNLS1tR8J?0HU
z!`2{`CJ6%zcFXh%ffYG&dpnd(o^?4x(G*TgD`sx!7z6eB`Bunw9)#{CR29T;8)#wp
z&Y2`KJ2w)U`5}v}ZY7=i_tjMn7onS2PT5fcOB3vVanBYF8Cbw7Z{~zcj7C3w!(sRq
zjDlO`OVBuEb_cW)wBr$)7=@-slK6ASDkjo`oi14a<as#H&Mz@_3S7-Q4U*wunlwp?
zQMHr1t2L)qM+ZEx1#g(mqv(1ega38-Cn+s&Z4I9M6g43Kz*Py)Z}PkEp1@h(j@sM?
zUB12Zx6d+?mbYe@zk^fyoz-hw_^%nL<MTYqrNH!y^25bYHkAHHiu)eqb57fw0y)#f
zQVqogUdn#K9$x+q{V44#-vp~!Mpcdi43<qE&o#`~0=T^8$eb?n=}E@AkJ5>~)aFJW
zF~e|;f>p_CdwV|k(qQ+i)?0Tt$%aZ323bB&xh=JCiCZD0V3?1xAcAn3_&9y+(q9ZW
zNGyGX@kuhDD^@sLD6*^7mO!=r{2=<p<UU)=h;V|FM>AxKatIj}2db97Cw%LMW$4t=
zUtDpdB7p^39`hQY_oUPXovf40J5bQBIashcM${#CW35B-s9)Yh5XuAWTq5BBL4r%m
zK@6uVRXh3J7ALF{xU@>>>Zcaw2A@%G^Ip0+_?S~z;h*6|O0F^q%EJ)ahL}FWlHfxp
zPkOoPX>2Oj^Vco=YY~+Ub{UJQxN(}qH!-%bIgh2S?EnRAefc0p2c={aZfSMs^Pcnl
z=$`)Go0M?JMj^Q|te*Wp3s}O6XNlw0CUzz45sa@`O4sL_Z+v}u*IMc;&a=xZh(!V!
z0CVfDaqizU$sk~;|KBW`R19s!A`-OPBhp)x5uo_Ns4}M8py0LTx%tgPU0~wIOF6_1
ze?9Upiq&YKAHt<2n*Z<NOqtRs$8_R)3cPpdE7-F~PZT+H0KGYXZff8Rmi*?s3y}&k
zm~X_RCk_<6#<lR)5T??HT|9oxhm?uo#E!C~vB<3oT*KsO#V$BI>-hyi44i<p(0sB?
zqxe)vyomN0inZBwJXFLAM59o~E5=2>kE`;Bj`}$HVQRZmx3i(?gg$?`C>Q6)Hx%i;
zl>5{t{eW*wc?o1~QmY9|0$tfl^`1jb9%+CBnVh0qWEPzzUUL#9^Y{yg8#&3s`>drf
zZJPB?xu#)Nt3zb*)6re6yjm)6KdZ3LwaMk0*XHnHNldz0ExR(OT|^s>b+n%ymo`rP
zs;NUi?D2&n{JA!Y?_$TUu#pYRoe_hP8snip1o$r5`%VwfnJWY(cWdK9_G(Q6$PF;x
zUVh_Kyzd&rIM!eb^Xn*DXeYtB=+=H|Os_r-D#>+&vxEU!cjbOnapZ(lvp(1UGu;c8
ze5w??^f`4J;J;}SZ4AC=i6<BLIVEE2Qa&~R*e+h%lErP(%gN<@g8OZr1kkPAxs9iS
zSg*rB3=7=O{yEW~e?*_M^q8=*8%V5u9jcR;1_a3xZ2c>hPya^Vvr?rdkg7{uVkrWf
zz=Gc)_fNo|pJ#;XZn$3K5=bN7Z~(MQpQV|IwDnNCG;*=m04muF|K0Ru`yfVsYhCBm
zL$CBC#%tBLu5hPOWJ#?IEX@<>Om(~gl(t|`NKTOB9}RTw{%9qB|HylcA;&HI4J~qD
zyLK0oP;MT@MGv8rPyteQ(~-xD{G$FR-j#KXC&AH?6!>3}7xdPN0DI6nS?Wu6X0cfr
z5H*Rbw8hd}Mpd;DL;?(ns28@#@cZZEi>#2lrQ&}^lmxRjgy5&DVr;l+#LF<O$UYU9
zgqI{g+)?2j&T*IM>gY|ayy|4R6?rGHHkZxj;XQuZVnQ<0_0|o@kgDQFjd1{?(<B>6
zImVj!lejd8)**b4?r~P{CqT?;#YX2o6fd1?{5Bg<mWs0s2C!oCjX0B3lvH>5<e$Wl
zO{IaCpgS##ZRnxMLsmI<CDdpjX-+3|(u-e{nsAAe^PJFU%lhz=It=(rR;b@Fu6hWI
z<<=rtvv`B?1NoK0Ug*2NMowITsq<x61wDc%(!uyRWRT;aSfFx(iG8TLbtTq)C&9~j
zkSv5!GfsSS-jFdJWh^+9ajY{LF5l)rc!@XuL}j#}#jlLC&!Y^*!Gi?Y>n3gBZdsw1
z`JR1?HxWB3pf4Us<uI;7rNEvL7Eoi!pBpR9!=s5b=z2I(!E6bNtqm$IXKQ4f{#HhJ
zBbA%m`p~Km;QUspLeu6Xi-8(xg@Eh8j<rPo<b|>lY0*&H7aT5+Jx^p~?H|yp>3rw4
ziTdYw{wRK&u6rw^8j&6a74gK}zKm<{%CUI1%STvrttM^i&*L_vX6S`>Nls-C>sW-L
zkgR2P@L^mR0CU6Ho*FNs3v5hl+R1!I0nn3U^OpZx4wLG~R6<xr(NdlU2|=RL4NKn#
z!Jl~b@fe*LB3p!2;?uNRsMm0IgMjY`e1Slj1B7b%m#pOMT2Gx;6NRM8H>3q^;oLjt
zMch-g;EU70OAa!tL#|MVa~}C)De3ucN$28zrJEikx_eBWD=}iS>;tsYmy5z2JD9gF
zL{1I-Ua(qCtUy#=h=oIj=>Qn()~zBMB-<cBG<4~O>Eimj;=QXQL-PE`F2F@7y-HKU
zVGTmKy_Kwd=;91t>10WaU|)O!RN$jg{{k5-u#7km*J=rqL%~UZVs!vADz;k2WUf1h
z-sNf`A96N}b*$&`GaK|E32enJyc+R3S9W?$#Xol9VO!e%gmbM&f;_ykeBz$UA!ydT
zq-c3pBf<CmD=+cpOXU_jh}-+O{jPkT+)jLbYaD!d$BG7>1uPXlEzI=-Es~{yjTAQ+
zW@Xxd$-tiNsmc<a^Hz4<^X5GBPTKb$)lYm+CAwNDZ36AyU9WFv_QE!FquHIWsSJ+3
zq<gj9bM9z!mFpUEBu{2mE*TFxEeI*f*%uLg^`c**_^*j2VED!+=0&NNL)>p5h3^Hs
zAnc>6YMExyb&h-flah5I(z#!Lt~(xpoX<1v(P06C0oVGoWb21OkJ*?kY%fMQ)?`E8
zuCxuBnpdw2NKnD<c}cH)tStUW!m{nW7pO;q;Wrj4xuzd{Y>o_&lvL)i753?}cE8-m
zsYUE#$sFVugOyM`hW=Q%Gg(ICR~ulOQkICBc^;6#j=z7tOvHT`ZZ^Qt8S!V5lTw(D
z110|0vy2f~^o5YR!X0vjr18ke4ppMF;gQz9{RS|4=(gt+EBKU%4IZMSDpxM!4Z4`M
zsXhX7B_ku+h%2lOh+QdErt(#xk)rH-NgRFc<k=76N*^ms6>f}{KS`ch@%pFmfHnba
zeJkp)cbw;|u>k8#F_&%97d%&V;nyC1uEj_sS}G%$t&Q8eRj!wIS44lM=DIGTDBJQi
zS-HCc1P!<{+Z%jz^&H8YoJ5{eLs13%nI^DCJK8J35*`(?qXbvvll$y&p_3K!22w|n
zy_(IQq%*NaJKLabsN~JL9b`xX_N!=ZIV;k7<9!+wS1kVj=w0ByuPVLBF4}T+DplNc
z@c@8r)>BcRxjy>nkuP+&M+8xkrHA@Li~wq=C;I2LyXgF6Ox<pWjJ4%p*bJE)%j-Z;
zx|wg2>Ypqe^)qyTB}tq)mo>jp51bx}R*u6KiKhKA<2=2C+K_-aRKFZ^R)EP&r0PdZ
z(HvB2>yDL6%{biZKS<Lkb;X}qjDkBu1Qc-ycp37%t_&m9)4c*cDtVm*5k?tLl19|3
z*hp`>5UIuK26l!&9j`UsHQI+%K$or;b}i)88_o8CB&ZPSBG)B^hpBZ?un*c+7ko4}
z>d&S;DHnefh{mRCrz4p`nYS&nNIQxKdY--q$M6OyQdE>1&5p?l!NXexeR5T=68t!e
z%_MGjk_;COisEq%A62myn||Ze`ni0_JkOUS%C`=Nypb5c(M=3$F;|by{7>Qz`Mjj|
zXD~4)N<cF}cKf+S0fVpaCfM<-?&ed{PZl3t=qxHGG&eSfyrS~X_v>h}dE*dP-uj4D
z`gn|K1<mbfI7E)Uy7Qj}l7hJ#m@QcCWPYNT;Gd@E&ELB7Ebx$x*>)31<Im=vhHd6<
zYhR)dQJ>*<L$)AyFcx(YQnoY4p5?$xr{;9`7%S?sIatJS8bW|JRdW%mP{0!IR&(Rj
zV}1o(v5TtO=(|^Smd%+m)3k2lVF-+p4tkMdW>}GjWg8x2t$Svh1Haj=_M{V!@)sko
z;ip69V;%_0uo<kgRvgdRv6=~3`2D>{QWw690<!iU-k08FwRF%bF{xNr>BQKz(U@^+
zQOPO)AJ!c63v2K?;oK*OD?Y}XD^^qdc3+=+H7d4ONX9c^d;un&{T$GJeOsFGGzYDB
zQfE^TDk3M&Up0_(jYNAtqsiW(BbZ|bH<T+M563B#BF|y5S*JXy&U+S>gmhq2tnpS_
z+}LggatC@TF5TJpku@m$Oi>mRXy8^59V8^yyB3EtARDK+qgqI9^gAN!ro(&uRHAnJ
zSVKv+pWV)lt%k#10Ex{hg>m@;3eRC=t1+Min<wroU0tO0U!qr4Y=W-M=9cF2P#-8D
z4=TkU#K-cg7@SHwlKsJ_)FClsn8uUi{O-JUeqsOqe@JD%mreBMARDN%8R^IM--<-b
z+Ic=?(+a2|o(lW&GcD{|`!Lio5QtwPkUwB?M%X!^64+ztRcumQD<vu*|CA``_URnw
zOLX79ED}xmwVCZ>>-4AL$Z?hGFDQYU6KW~DTw7(oK}h%ODD0Ab^ds-9k3D+q%TeDZ
zoewN9@R_#SkgS$Ib!V<5wGY#Cx*9oi-vj`!y_?L<YmO!0&{3N1aN$$LciZrl9gvgM
z8V%BofD_H+ADmonnwQDI;DwqrePP?7f9)U7hC}<(uZDgq0Kx*!P}KRXmn%p{bCO=4
z=6e%A65YXAX_zpKp(OJSQ-)Npnbdu@m#09SX<S$uOEzZgeZTPHTSI@UeT>b#!<%84
zk~^ClC-HtQud}B48)CF8CWO!aAUFw_KxGJ79hK|)N?V%9GUAsPC*uo0a5C2%7maN#
zYZKZ_x8cBn{E4Jy#O-*4HgL!QM!-~xbY&J&@_UpPeZ}7S(S$kSsr9WLVZ8!wyT!ot
zm=6r~rqgUz2_$z<w0eLMlkwnYe>`0pYvQhy`Tw{jy}WNW<=phXNALBvRw|EUY8pXa
zc2GC|BR`dGeS279=lGbpY9*!YST$96lMhWr^Rein&381pU>vsY@m&KsMv|bfX-|nf
z4IE5{{-*n8*LuzySJlt%M&2ZrPXE?KZTA6;v|eDGV#5@vRgGH|d|L2vzq!$$G|evd
zAANLC!W}%`UQsgxq9PpLY~7H3UZm;k^eaEv`#LF1=MdFspW}#luaauS?CS#KbR=wI
z$l<VEE)1<!ZSh@Hj6}_>gO#s=<`Yn~X|dtEQ!uTU8>eh!At!05#FQ~Q2x%?}1d3j#
zmw(V5P^8TQF_@g<G!$K|aYnAEsjl(+%L8#(VE0cmA)>|u?>(W3Q-Z2fRVFmmZ2i#`
zCLGH&lEMzbs-M`tLPwt(`UIDolmIsYkY|=KD2GRn=kU@g`%!>@3QhVv>QEfz^Yu?0
z6<&iS7+Yw_aQXo{Na;t*&@M}Uu>Tu?TkTBy*F8lvPLs=r2@CfZ`rdD%nMMsrjkti{
z)XBd!q7$t;ig!$WDZj;2q5zTOCO?_aJa;Ap*I+04yq7lO%okJnGBN-m2#|$4&iOZW
z2?(l?<AdQcA^lEr0E-mb7+bp(H!q@(3~!cNTu#T}8)ikIbk_pUeZhuCAm!unMO@WK
zZG@PBq&NNO<D$+9A^E$_CGVKuSYBH>;&c~5utXT~z1CPavc+0Z8%(!FdMNa~v8+b|
zhfUnKcIj3v8`z=}Gl3Wh%}ZP>)$J@(O19?pJ0r&IZUM3#RRz}BW?w&^nX*nI2Z7f)
z)Tn6}b(v_Hc01}qm+H#mGMp7waABErTz<!9WFz6#X=WmL8M*W|)16=bdm<ppAjN?!
z=C^F%{^2Zt7RMv9(8_oEgUFvfhuQROADXZ!^i7{bVrWy3=cwAsDSH1f$QkTPEek@o
zLtQXmw%R$S$usXEo%~ih!x~y_20<AFtOuarZ8^qvn-()kPmduCxo`72_EFF9ACB>z
zJ_o(fyaJWscX}O1_Qxw)PN`bdY>aH*)%R1OonluEw3$nRlJ=n3;h)>z*IL@IVc-Bz
zY4clL04q$H(}~%Kz}mF}X_=d4gRf3xMa_)soj%Tke-*#cvKE7POR5?&jk%*x;+f}^
z?~_%0ASAwiB*~Le(=uK6nc@$9=ZzOfi_(h@rcmv?z04@z+zk>C&EB!Ap`x^X)BsuB
zNsa+SjREOzmj%yRQJ($;?Sx2UApQE0H*M<aqhI%A`jJ(^u7f{aTTj)tmQ4u48LJwb
zp)ZCEA;HVYpn{tClAVt1iO(T1d1N4!9F5GUJS6p1L2@xzGXubH$D*(t#iGsL4eu-8
zkk(v)JYjM^T{`YgQ@a3EX(^%a<1H^bbd5-SG(ayV)_M3r?x&-w23vVx%#T2guZ<6A
zIn&4-=0iXNS4@ELu95#<8ICZ-_JS@W{1R$8WXvRv-j{xrLE@<g(HumFlsHV_5r2^s
z7Y;&sqMXJ}u0zU%oFkzh)f5LsYU(tj`GPa?#4=gpY2J)67*^@elm5O?$QA5*kQq55
zarOGfoKdde^$}Oh$y(oXp^*({Bjjwj9jT&814$ouW>^BkCcBblNe-#26PpbZOKaFJ
zo8dNPRr|ObE;pF8$Go@nEgze`{m-Mo{OjM81~7^XnZq3*?Q@xt(`($Myr7MmCiJT^
zFYaZYg8_8WFN|m&Lq#OfLL%Ov{NSd-9i#?MX~Rdj7_MH<19B|)b&yf~MDGQEU#(&0
zaW_SVHxGUMAynQG(&onHlXtZusJ(P>wa*1;HF2Ekoz!M9ITkIaV9%e-S+;dsfWrB8
z6kOXLMubFNuLs<|^Pc&}0XpMd4-Yu7>vS&s>UTq9O)~A8LEvq?SW0BVD+o+k(=}=w
zJpf=%6?#;ToVS-r56;&nWFZMeCW3K(+YU$Y`H})RV})_+5+xyx_beoqg-CNw+buJ(
zoxE3OM`5`Ho06Qv8Dkc(Pm-4xC8b}obroBF0uTm;#YAI5G{`x}1#!J;$!K)SSr5@o
z8BU>yJ?d4y;hKJAvuG7rHfcfRCrZZp{aht98CO%RFOAEkd>V_}{UWwH65v`cnU>y!
z#+IzNq~{8a#aF?HENp+R5-wI9x%>sGxsCl@7qPu7p%U|bTfI+1x`wm|d{ChLF+YvZ
zNlXL^)iU}{bgRLsk4tpgZIEAf4?$X-zBK5MgM_}K+R`Kl^eHpRucICSu5<mWXB>Xw
z>Ae=X4@h9qWl!59-VHVxZ0CD|@+s;n+XU!(p1v?V9Uk5V0*1Owz`hg30|r<WH@Cj$
zrl6cKx}g(<o@eUrHWNNZ`p~_DE!YmLs4TzI%4DFhR_pATjZwKFq|%2p6Skd{+>mmm
z4*G$Q(17%b%^9MH5QfAMC!!UZ@5GVF=c1thV`9oq<2*iO^s}x#nn#r)Wv&L=u^7c1
znROXgVBMPM+wjz5<XI%6aU~LfR&P(kbYu^+9NN|MHP3$ngw!!Vzb}S2S}Z%|va9kq
zOn3q#ClrQ-V#6_=g_t~RvGtT_iFDovVO1slYIs#3%VHwnc0uuRCM`9~Ao}(wCS6&h
zbS^e|y8XsrC?vuOLss~Z)B*J+m8)i6VZ5jowwT6VZt*TDRh+ns@C^PCI+)ecg4b%=
zF0JJ&3W|-Q#PH&|E?c{q;AqYR_7hN2aLgG_XPDTmunvNxh%vhB=$ut#HMYB-;9mSn
z7%CTFXIc>>*W_21Tp7s1L47eVA%JKx@XfSAWv|nx)=gdNi&L>d%MY{Vb#xZ0B|)%j
zOY8$FzEyCU>=7Khgz8y2d};)X+0tr@XQAAfv8DUlYieEuBwjsWo;wZfWiKqq<5t*`
zH~<HFqCO2pHr)0|Blcwq1BO&ma~w?zN5Ii@ZOB#dk?L8J0LLvzI;_H9>Q=Jz>z3i0
z_+xL1>z(Pbso`n_&DeB2(K{Pny5sPsyQ8l3=sf4C+u}sWK)0cTQII=;5yq}_RW`*V
zFj}Q;YY;Rg>=QNmjfP5jZSB@XfZ>D5_6W4u`mMSWbJ%8CmYa{v{B6*D=DVTKFFJnK
zA@nVEim>f~V_}2k?T=Ts$g%6#@a-{_$`4q7-8%iNYKSQ`O9#427(O+`QHH*sCD3~^
zUy;L~6s`a=#MK-AC)j6_j*6lFaE!!G$?H5Ajxr$^Peoy=Q3&x?;;6W9HMfO>N0s=+
z5E!o}RdJkL)wCkX#Q*8@tmG|^Gr?y|D!9ZTOh_(<iK@v23kD7~Q)Y`Y)rh_NN}G$3
z`=QR8e63#!<CAR6-F+E}OiK5)Zk@UAFx+5FShgx&ybYolp`tFCd7(3uPr%`K42b!z
zeALSf0^wfn=3d>~91{Y1Nnc{cG;TCNlUPH{6suodkzFNrbD#guM!dWqExmhCHOYLQ
zg+iO3_l!q|{B_<C6y#Pv@(Of#U1%vYBsgSpOF}C1&0llD!aFgMwTj%+Uh^@PE?Z9y
ztN4<oGjS7kn@a%)mliy@-!dM+Odv25L;<3W@~X6P&e^~4&pLG|FcTjMTUH^Xd!Nq6
z6Ajk)e`O~m1_0!-2lDX9Y7Gs61+jeSLXP1ukk+wo#WZNO3zANHkD5K%zrt9{<=8v?
z=o)yw$}hJn$CpPZ39cwRG{4h+O66;}iX~!ns=MlDdJCcyMi!QH?y%HRA%!OhwcvNj
zJ8ri^<cLwiG0|ahM!(@DKT<|lmu_|2v3gU<Ox<Nsd~rFqaf3u%M*eV<@!!-fx`@qd
z^<%;s!J@7JrB5Lp<ce%x<)X5rXMNfYk_i&^Aa^A)<@@sH;>l4c(5j75{!A5Tv3g#J
zhAs3I<$cQ9)!QTQSc}K8W2!fsl_7Li5$xw({uS{j!;TR4Cds0yPWFG3f9o{uHX_ZO
z{A_P|8B^^jpY?&Gd%1cet<7hozj}ABak_pOpa*u{PiesqC;jYkpYQnRh=2HNhRV{u
zmD&8Vq7qT})5i7UEfwM~55pk&c&|Qb?2W-36u7BfEKj?H5!@%=M+i@3%{q3v)8am2
zCKF!JL&|V{=u?=i$4o>o`}B%}#{Y@skFbny)8cRP21lS3P=eAm3znL?d0b$w9mDJM
zGFRyBzmAQ;@$EcwG*5+fzl>$!H}Bp#4gvs!fo!?2BVBFZQD30fD^{+<hT)0F5^hC-
zqtJL-P~3Jnx~7N)cQ2L}2m@-5Tc5%&0U8#(v@(TEu_%&ZceH#DHG*~(tXlk7QPRod
zz~#?2<njkiV|12${wc01>s@KVxq8P_qn$S}K*9pK3<LD!KP}E{GMxALHBN-Uzh7bv
zM3Z>g(H${?Azsbq>+o^@v*UK1bv_%tj#v868k;HEyC0i~sZ|zy@;-+$Fa$!2G=GtB
zmrCdJ|Dc(sbbMD^ZdGg9xBhJB$f~`CCeMU$i~!nrmpFTg+>m~O7fIe2PiD;`io)h2
z8Ck4ia#O8oM14B6o<Vn=I0(;iiaZyBxQ9L1vw-f()@s@LHyDb~J|e^CXr3mXb=J+n
zlV3Xb*^m~VNO7;U!-A)@wGn}=BxCE|z(6dqFh~{a@AqM$e>~v1Id3sG99&F^bN(XO
z|CDZk^IVyx6rlKjAw&#(993>+Vff%(@~(r-+Y?xCLJF_wrNe3bGz2Z}rgSc=ylwO%
zLwn*LLMm9FurkHkr|@#wPLrvSOmfhtugqq1XorBL9bS2xpzUQ4N5V1_cFKkeb<9d6
zICy73>FO1L*Zs`bl`Ykc)o=I>Sv^y^8#i1-zLpq!Q}n*i8z&=98m#VPobW*JL0m*a
zch{dlbalNk#-UYt3eOCs;z0MNN3EuP)t8@oYUW#!-e4SadZ|YjPNhB0CnQNDJn8!@
z@RXz1{)O7T=cpRHSxBZ3<?o}f7H~UH|A?v}1gU{@33F96N)8#5Q)wCHGUiP?;zXHh
zQN8S%-M;`WsI<})8&4&5fs%J=mH95l@K5xY+H8rk+d`Vfq3(t36<jUW3bM`p-gMXN
zM-RCbn9=-`a9SXw@hPQb7HZn7{sjJFwlJe)>{#nHyn_(lDX$;hQt}aNVz7p&vKqWq
z)oJt~Sue4qfmv5Dc@|>-YCmBG=M)e1qO}oFsGuZZzw9@Y<Uu!(YpV&qb;ICnR(%Ki
zN_fJ4LECO$7kgRO!{u^2@c`4Y!3Ast7=ck*f>tt;UQG6Tyt2We8Vh7`SlBeyxyH%W
zn0YaqS}Fd9Cj3l0k{`Ra-*%`MOs+ko)_zuFoc-jr*9~qu_JuumU@*ZoOT@_$)ent8
zxe9oMM^{Z%B)i_?-C;7~d=^&P<?uT+^#z$a=#rO8|8|#TSL=|BF9kfLIory7(tWtc
zXS;H#O|UpBD7}e(Rd`(j+sKftQV(bl0wO+mD|vLGzx`#0MvJ5#5QV=IMV(Uh8d@A)
z?l|D&pMl^D^*x|Xo_iw^pwsPbQ?Sl8BX)%$gmlA9f(bl}u)E-e4gRDr_o2IN_axs4
zqj+h9lGkcG*95)<-C@DfbFW`zu}tqPaK(0iP7k?Ra}*Dc2O5M|_zc2Y3(K}gfa33s
zlb1G6|0#2{1E`_Q^V#2S-D)Mebz4>!Vw`yf1gqH>)Q=$RA>#ToSLp{Te7YXBc2i+=
zR;s>wZn<x>nW*nnsHTI+hpl8kudTUy(o2%)umX;JcwnUq@2i*(@*m*Cses48-_k<2
zI7MlM<H&d@z;k7#1b(3l;v>%xK4-`mk-42aeX*w);edE!EZO&gV;mSK<7_z=;ir`D
zs%ChvuvMGy0Kn9miz}NIl^dfFN4F0%LCCqp8qAr`*CjNTph|+MPeEKHFJK*&_aVH*
z_Oo&Q6vc<VyBFo@<2U6h^iv4=G6(N=twIlMCCLJJN@u!GfZr#5hb=@&6&JqDvi=Bp
zg*Z(ni~D3qA{v_dhnna2?+sLzi8WzY@r}!VT%Nj9<B%6N(uW|kUpmact>@{R_Y@`j
zkS)&DH{)dYehQ0Sf7}YkgVjm&=+>Zzv;Q!LO=get@8Et-zT*n!RLz2WSsa<tffniX
zs_J504dvGp+-VbA2m_`E1iy4i{TAUUsjer<i$BcWzi&F#^J|z&t9s3q+mjuhnE<p)
zZ8M1H2d_BpPoRw9BMw_mJDF?Mb8(=#7+D>BX8$*)UGXeB1`&a}*hwK<j+i{5#HvG4
zA3(<9^YmYYxT>N{J5wBZJY1oqf!3gtrUP-Orl1xaY9JZT!uG?kwl}B6pt}U^uva}G
z35qYx@b=)KF|!h6F3sylmXP^5EoD#_T4uTdS}b2PnY4QHx`+stpzQteY+FF^Fr$7n
z&Ap<CR8KR=+RKAo)XbB44136Q1R5S?{47pBnVSv90VM&LIfxXbpm*RM+t9gUf7pSF
zz^YAdQEF54{|lRp6k=F=2?4|WN!rbs4z3-#Oc#I^=kO~(Lp%&WNP^U9Wwb&g+DExq
zTF&JBWdbpqs^vIl&v6~K7FyUPGqyT)ol4l^@GH)XwtaOkq(0cBIiKKdMif~_5owz`
z*sq|pC$A=i9bynnMn+}G^D%S-0rd+URlDn%;7iRCJF5tBLGzA+jKb~DtQqYyj!3g-
z4^Py^mcuVimtgW4#289+lHo{@%@f@%ZLF`v<lM|5-i5jwH$6RnjoU!@DfG?Ef~5}~
z`sR#rUAwk8O!S2-uJdvb0(N3@&2A9+y_c!M0UDrZFe<K&a4f#h3Q5qGdxH6c;ToX}
zEgW;>6H5a`G;829Cr1H>c_qVv!XRh0dPJMQAZx~8cGR?VBxHmUaxzibQzv_K?kho7
z5TF$#2Tit}vd5oZf-|T>wy$}Kodo18u9m0#@U~E%IB}4BPp7dhJo-qR@{=Y@^ocIa
zfY?@GRJ;BmxHYYy;`gf6(^GFjX?EQkj}Wxs2vzxm4e5R-qoW<WHe6@C%(D)YyNS^q
zFJwVzB+N{}h+|mn`8>uFoCiFX#~9&V)v$k#xs{GRiY34$q6!K~j~c^hl2oQ(V-wB;
z!XuzNyav0hjeV7vo+t{aWeJcKmzRVnZs&7(%VH0H^bFWs$PhfaPk7RNd|u4aFOK_R
z(UC5x*A^P?z?Jn-zPMWo)iVC)=0_%qX|u2VW=$ixVmq_I7!FW<-}jhw`SG{~=9b`B
zJBjNKX`V8Sbh0K5$}%uGOmLdojn+KfiJ^LN-kA$F5UcDvD`v|GSU{9<4jiM*sY6v;
zzOxrypxjbfh0on*Mp;~mR%bsP^)~mwGZSMu_u6FX4~2HGd+YFttnt05IZ;5A|HM_I
zh!0s3qkTL1@+$*gNM$C)n|}<|rPW(N*;u|uS=9DeHM_Im&{d1xtZmha%zt-5j@$=!
zZ2~<i$Z90^;YWRxmhdVG5FW6j`z)5=J8w_+I`5|jNB9#3@a4{h_{)EA)#$_^G^*zq
z3=Kzg0S5q0XtY`AYEgt39khiWQ5z2B2CkkZizBP_oSf-D7}_<ofFwGtkPAm`=BwsE
zIu&<;@5wSGaq5n|-fbm#TOPLOLc9oX4!+xVdQRnAiUA$9ebg5PME>z5!{lAL>t8Uq
z+@FjkiObqBI2tGc#>XnIf4^p|!cFHX&P@Gp_&GYllNqeN|9n9C>$OTHSTl&2dNG=+
z!YV}Tx0LX>7ANGn&?<xy<9P~2-mhVnzdmOr!2poK*M)u&DD_vbuOE4JYce!<Yj0iB
zdIvlssm1(t3!O()vX$H9P(A|=`)W3<zTAt0aRVi$ah+UNRh<bAJc{JUb?MP3J1e2$
z=Vp-U>aRV%+n2Df^Q*GY_e16g7H0jyRXPxuU{+HOy3r~|`=%&7a*0)!#U*%)%@-;z
zKH(|=R||!^m3?d&UH~FlnYxofdGj>C8h3%;<yT>Puv}n=ot9`Te4q02xQ&`FEa`oq
z2>N~B7~AW)7QT}*uD9?pZC4MR&xr~lg~QKqcTdWYc&OA5-JQ#cVz+5o>F-Mqe;H~E
zh*0J9^_|b^97UXzrrh<>j(4@|cuR&s2Y}@bT!9}o>E@`)E597x^Bf>g+Kd<dAHxy1
z{b3-R_-0p~NBlMc_D-y>5RjNXJ}@i>zvYiDC^68zwhKv!aw|y0?7N6!5BZDnIzAMt
zJE~r=*8lqFpsTpn%l`|1>8`bWy552KgH2;yddj=LmLRPq#dUax+Z=0>$w59SP1lF_
zG>^0GY!I|&J8*vU#%49Ust(5CoO3f)T_=pn$aCouBSb8tgGi$uLHh2Ye)N>?dIRAJ
z{0YVjUNfcu-lOBZ${(Z95%%W__J$K>`0Sx>40@$(-4Sq+W-QTLdW+zo)>na^?CVe<
zd3)UQR1{|EmM&63tP9dH0>0r#{I}Q$^{1N*R2G|iS^X-*iDdmPji~b6a(yg<@~W~z
zinDJ=^5wpcdevSN$w{<7)p&L2O4aFFdfywAy!enYka+LZM)mtyzAr#D?^Y~7U2`K8
zFr8RN84X+Y>Fps&K1hHQh-953b!cssubC*5sbYf^e3#?f{^z|##L#<IqI2H2(RmO`
z74aD>HI}hPnDtX4N-iw#L6exaSMUs_)T&JMIp_b)^drMthTO6p=)DwF_G?ffbW?Se
z9L0<Je!ZUqWBVr3KSlI?cIfiqI~Q8FY)tnpNDFWm-UDGULgbIku!B*OgGj^B<Zs)Y
zl(5BJ*(?A**472zl{hk&Zz$qhHFp)Wqux$UdpR(pugT4o;TQXsV5iXS_pV%YzChD%
zRfwRzCT?IA(jn{l`RO*U&x76<6dheblE_{!mjz?}{JqJ?70QFgH_auGqQ;{kLr6cp
zTpo1Qmi3j&Ig-@Buh^#iq+xvL>L|nPB*J&kGWNuvS#18W*q)7(rf*JdGILA6@*-&>
z%Vg&e%OjGTX9zC2Y4(2x+#{IZ^3f?+f>cT21Cvt}Dd!0e2ry?gr5hcu!*QH$q<)Kv
zM)rHzA0*n>pJ9h*!}%qjtt9>57mla|!on3VOE3h7#FjmN%<tigkZumTBwb4|$0;5P
zDHuo;jQL8KzsSbfR0sbmE%S!Dq%CWp^reH6*-iHh4#SHRgUJ|@T7s;0(V@hQYeeGv
zP3Z;;ZX3%%(P*q>o~~bL0LQ#%rv}m!YdqOGrIgP%&O!ahB0{&FPll*a)FQf5B*soq
zZ7XQv-@o%2Hb!QAQ)@%d;lk<F5=wTd71C}7C?t+D5BYI*YB=Uy9iI3(5URhH)vEkS
zj1R<e4Pd&;jhui9ohom`0tEp9wZgk*&xp}4`v=?v3W{J6?3f%HD0?%zVI0A+R0w0&
zjBL|g+S>|_oM<p!55d_34Cx7*Nq{}GdRv8sD~RK46Isos>m`)GOu_epu?A#b8Wbaj
z&x^ve=1|5O!}z|tX3@-?p_Gikws%<D13$7W3AC_MTC)9TJUy%(8Hp)vxMY^KSKRzd
zkrro5aT){+)E-Uw*J~|k3RDQR6~F?}=<(KqjgD9>dqUo`R#uVv(sGS&lF<sQVV~dY
z3hsBKSHQ}f4}#bhS3y%5)PU1lL;?o9=`cEtFuw9Vx#>HYZ@cP|57MpjsjQd}pX-eI
z|1Sd`jGXBSnQuuRr++0SU#g%p-ZM1uRUkAP`UMNhEhwL_1P@|94BqwBSP=R$0DhN8
zh)KY5b2?JY2g84QhiKHNNe0zJB}#^skv?N2u3$Vcte~vMmF){0jbcL!KXf3UsFNE)
zWR<5a_w_hqkZ5vN)@DJ@IP;+lz$FH#gfaGJfZp`MaUbvb`R9u>$6QS!{DSX$k^wR{
zC64p{ZsE8@j^X1ovF*WtI7}hXz7^ouOq%*4gAL1v4^mWNGLubF#*tvy_0gXGnk?m>
zNUibw*P#)w#85cjdn>}Y<8&!V>;$LiU!#++N~{}n+{&MhrpmF((nKnof$lIrtQ|Ww
z^?^R@%A^};q*W?OWN9K+w?Yn2nK@1w^D2teaZlQPa4f@4h{8eWs~X~__4F&`RWX^9
zGFlcP0bIToxrNo+Vm_w|g&}V^8mM$UV!M@pOs^lJ$ZN@ko-`U)Z>C>M;I%NqI;CVk
zlUj)mU}TWT?8Xi!cM#7HHT;?@=S$~in7q^a1|pTz3}Z1^=X2Gjp)FmKCU&F%EMNmg
zcjB3orHNz+Sn*(ydkqUG{4Gh$;y5YLa<@n#Q#GBHLbZ1M51s$QV5(_Mzk=NKyUJ9R
z`d6QejNl_`0x1zKfAv>dG3E&SCuMf?(FFI21YRVNZkE^~{h*;hTPa}T<p<=@wg&C+
z)mYETC<Lvy3p<lT^JS3@MZO4721*PJ?ww<hUNBj`+5Q@Y*5WKJ9F(^?4rHl|5=i-m
z)d4j(&UT#IE+hafVyJb(mAt)6nb6!Q!h67UE_hVOJ>9b)m(V-vb}{D&UpiWu#Y0X|
z578>Q()z`|bK6qMRBKlr%-2ip45m(S3Dcqw8UQp?ihLn39k1I_kj-l7yrv72Iz=gk
zhS6&{p`+tO`+OfFdy!ELs4W+7UmR58#`CLjSq9VIKd@`GEEcYBY4bzrO34fuI=Tf{
z#?|}3F~g4@dVK+$W<?+Txi?@aNx07qZ(yNPogrcJj7fX$64tY8ck4MiQtjpJQ$t*0
z9mGhrIv9RKL5U#{8SBV-N_^~-Udg2^0sM+|9qt)FOQBCJU~%g5N4gzQK7=mb_xQ|X
z-ke4^R8CmLfHePTShK8d12U$}iF<6kpt|K}nfta<LMod+gpdW>TA4<_`YKb|8>uY_
z$Nl9q+(01|w3U~8eaJ<Y<BbP1pk#0Kc7^d~^dYJ&W%vnEJb-B?qD3(M4zCcDtMa}A
zp>mYKn4z(5JKI}ab2s5fTMey*mqfW|nzQaj{_+Rs1D=2in9<I0(gz&)pe}jIJ#+{G
zn=jx34R!E}Lo6%xa+D3VrW)X~kCP95mm>+ts1>88a?Zbf)8X7JAIju!b~GI7KU^&>
z(T8TTw;sAGTDL$d@p>cPr(7nuEJnOQ-J{fe3ASt8Q!Mt1S6;8T_hH~#sA9Sl#h_Tl
zD+UpjoH1=I*v@03*~P|K@rbvY-qv?{G@?el>`yg9jGYpkcmVfVECwLtK(5v<_RBEi
z3#|}zk$?md2`^y2cAtFdS_<H1z@+96^p~emq1cTO)ztCE0&>ve-Djh#1~%&(-AC`P
z(|O}&LlDr0Q?35KR&E6D;RYT~**7d|n~hw(Fh_JpFW=MN-KnGC0`s0dg`K2#%a5O;
z*(zyeamV2$CvCUINrtWfOgW#^5Ccd4qrQNafT#Zw-JFX+fM$QzrXZ5_P((9AIIdq>
zAcbF0Xd(q;?osWR1LQ1V^(=gsiUG|zOihnO9B0QeZ@vD3fCn*S2&o-(ULS+G$8^5T
zY=kNO+fG8P4X2agJIN{0z`=}k%SB*oKU5>j-Lflrhb>^{u&HhY9wa(U5`-Edjj=ru
zUGHVgHvpxG*TT#T5fAp&4D~A5(;=;2rj^SY?(1+TGox09aLq&tx!NH7A|PUBQsg86
z-?o{$68%r~jE|Nozs8a$p~M1dV<#<RtyWaR&E+0@!cW8DbBq-Yhr6el<vkg89ho{`
z;4k$4h5tQ;_6M0bWsprye6i494`+(bHb+rC0XJi0XH2Iaf9DzBG-~U2r%BLpc_3OD
z<6tC?h7r`Ia|4`jE>el=NLN{*wYqEHbZ-=Nea|M;n~$4Ma6u;6?iJI$4Dmk$gVN?n
z$J|~cV|;~K*wArSfQT7jbNZTc1y5JW=S4p-3&{c*XXQMwp6rl?Swi3TlMYggfEz7{
zJ%6kt@&@G-EKAd8ws}LJv&>^+20uqEV~FB%&8xcM3$We=K6V-kx{P@UT`?N4ZzLOs
zh@+!{pBW}<{yb4$R9?->U^?Ag;s2H-0OAqy<^{QB$SA^5za2I0jTX3~SF-@u^e*js
z)S7Lvv}@1trZbrfcSs_%*&7P7N(-ftUwki#^DmX%l?r{!L62d5?&S{#Xy1J~!tA<>
z7OvK(Qjc!z&EWDwPsbu%H1mW|sF9fq$mu`1#E%fr!nRllJ$S#s2KZy{GUjt>rD||?
z23AYwym5_Pv<0M-?d9ZqFY(YEREv|&>ywm?_mcCxUTlzf{><)_oJ@bb>ZmzMe#HNq
zPP;=7za9A%oMp^?bC+BfHTsdt8$(HRAg0ft7m$UaQ{wB26g1Ia)w<ulAMzppaC2N_
zY84jK0c+DGUqL+~Qf4mrT<Gtee>xX<u0)(3G_6KQFKLX5Aw+bPa?y>NIJWF|4cCI9
z6wCD+ke87muIVugb2!g9*&j!CxAN*3Pp6?>+q`igan?sf8HV|V{~I3{1YvN|ntFW7
zMAn{>;(y$*oitG9ChgrpR^ri#_6JqMFhOOM!pG%s2qU@8y>|WWFx}{jP^<!IW5)r;
ze8EhO2y-0*6ssyo6~VM~AAEjL!jT+$;k)DoBItwvDa%5e<JqXmAEY}_Ag6MGKlHfn
z1OGnKM76ArO5S<0wMUSjxD~jqk?Y>@*Uzx00J~YhUmpAQFVJK5%%L3#21votrlq&h
zTH}S8q^sJffGY^B5gZmk)h0&Q=D_~iP%R5uJO1o4t<f2?h|r^EW^FMyo!?hoC%L9j
zyO%AvIK*ilQXH_UV03@W)XqK#xsOA^u!G;2GW1EO5K!Q-RPo76zMzMauYRS77BV~)
z3oy1HqyJw88UfT3Zb19g2SM;2g>SYH7G#gNi7sZ4IO(DBU_yN0^FWQTd878XD0+s8
z`ratf6!$1$PL0UYyq)bEG0xQ6Wy*c?*9g0!V90=J^qw&!TWGURRLMn%4YO?QVVr1t
z?Hl40vqgQx0wZxz@ZaU|cAYiRH?&aU`bs4rc%AJE$c3W!7W{ZUYGK;t2UW-qLt!h3
zeb1Jd^#b=9a}%*;=!VioVMc38$6~^s<q#>w?cbHZ;)d=6P&A_suYfNvCBtKOXA_n7
z-^ihcQ2i<>>b#Eg0o7HMWC1ap<dth-sTUuHN-$bab`#(z>R*+sNk2Nq&jwbP4ILDt
z;aG&%)fRk*wvRRNP!z#%SD&G{`QORQj_r?AKIw1Va&>u&@9vVO501%$0Zo%&I?0jW
zSD+GROnLvS*!84`bw<jkwGgW7%XaaVG{mF~`w-Uh{O<|&q68j~aI^{II4aR^lbo9*
zz^s7-A=l3Pz(y3O3p+Y9w~rqf!;3*i^GtaD<^|oa*xEzcP%o>8ND;alF}IytsGjix
ze%lsoVLZZDkU@=kYlK8r9U9!%YZ`XRMOtV!cOotk>ROL!#r$<hDbeY61<AX^8nsS{
zd)c1`z~KfJKylB=0G46S=kt_Q9j31(TO`*hS+O<)D=us(kB4Hl-ZW;)*aRKl0@J|Z
za)MtUNHy&J0n)yFOewOydPl<Vb}EI^xfjQ@3N88~DQ1y{VmiU4`eCkqiQ+nh8^vHq
zzVg(Use`L5L6j}XrdD7z>v9jKh8=!qPrOm5t~d?2+(BS=Od}Td4dG#<Bl5X0zMhcb
zSk~Z@G7e>A4B%gx03SRmsZfVDtjtsWg<IzIX9G28JmE|SO%-vl$L0g(VHmzT%6n)E
zh?=PKiB#MK#epK72^83)uz<unpZs(eI+RB;3YqA06VC1v((1qPE|Iq<4B&Kp!|>M}
zi=2aK0t#)}NGL`M?US^iYMKw_&>+@CiBzzFZ?`dh>e+h<gqP^8(q!~FK(&j7*OJ4`
zOu3wH2yDWN4(2U76X|B!+zz%jRo>HPC}q*35xySZDHb^LeIV`{XrAr7KG%)fE=_|z
zs3>1i|AhcUQ5}yovwgP)Y&{pWN4NC@SXb=O**+O<xn6e4_DZOEOiwk*)}w5s?)O#p
z-VrB8<eD)~7d7m?xMd2J?T0)rb%(xE`Jq2BkRkcZI}lft0b+Fx+z@Gqw|S8ia|R@v
z;ijQ%k`<f@B`=}{1ldK@O%1d@evO+yZ1Gbq>CRx(o*zY?GObx$K_5kDFibalUY`^N
zNyz6LBQn%mJ@%3uTjcdL@N*nGV^lW;M!y&Y>nV&3V_&WDWmE{(d{SU_#3J6a-uU7~
zz)(pq&0Nyf`B;{mOwJA)C#`rIo+)_DuC`;50*>#nY<Q@X`dc!#F6jK>7tr5kMni+)
zLAoN0-1lA7FNdr*w<Z1^zzl<=FpmNAj?r41ox={wB7>9}F=6cL3OQ%WehZsR>Rs3r
zL<|JsOrT18t)250Z44hP^gbtX<6R-XA=!U+`S#ya@Bf&-wtY_3LT7dXoMaO`WMLv)
zD*2irK_pD~q5YNd{)f!n=!UC_iv)xTvv3`SK4L~92?4$)$R@4?AC9ix18*#w)AVp*
zL>3v|W9V#&g6{&>&Y@}Oed%NDNeAJ)6w0zQHJzqOS8|a~1!oiYZRZ%>-8qNGbtw^(
zOii3Od)>;tXh+V*eVA5~UmBPPs9~n5F(^FVF(vr&Q5_?AMoE6Wa>Lm0Y0(sPk9lJ3
zdNs9QcNNdrt*qijq@eQ4>f%s11@@?;YZrU|76=f}Ia5N}w`~swA}+OfJV&5O$QsG)
z0*Mnkv(uMMpPUnQ;XzM44PVJI+79eLnCw=GLSU5E0Vt2^B?Qe7f{MVIC1e3od{lsv
z$YWju3{a?;mzoKip6H_zDe@Qip>xq$P6&(7hBB3>Tq|R9zp=P2VQ1r8buBSg0lM2t
zP@S5J9^>0heI63Y!o93p;d)cjydksGZsqGV+T{px*9{FLwKDT-+fy8!h`hwW>0)9w
zw+~pSMLHnQw~M{Rs^@%ps|SZ$_#<cR#mOrfEZS9x+r4Xe?8}!L4rxi|TKSyZ26-l&
z^g&nvpbM=LS`{8NR%6_wD2mOg>~UF&Nck#7R-$k7sjq8;?|U2eOm4i8gU8ZnXVg4;
zb_or~vuU<#m9U?i+#^B{xN(~iPF1P(_a;gSXi(8dD_TDo_#5sZ^bT<&jFf+bO6DUn
ze+pqvb+279=VzVIPMCJP$f?@a;g@LZD-XW44ERt(9rL(MGy3!fx|DQP$whRq-^s&b
zl&qAL0;5k-$21}+-q077AaE)jJQFpnrQJy>m5HE@d!;t|$`Kpg_N99bx590U?0g<`
z5z{-g-yRT&4{%KkdG@>na=7}eeE960PnC%%B^$3Bw)Xw<Q1Td{T{leww6DU$x6(>;
z$QO&k^DP*A`!=17Oa}-xP;3cnXyne`AUA0B-E_P__s?+5D<@+F`~pxQ5cCRFtyK>X
z9dg%zzfocjp1XX$&=>ZJ{=tJMO(ziQKO@x-j~+<Tpvf*bfe20Sp!65&7PGuPy`r0(
znKH4>x~y;Ey2SY%XRf8>T_CY;0_&3xB4HMjyl9>tV=w~F1fG;=YK%H<XZJk8l7!Dp
z`vtN$eONL7zrB=e8gK6gKPY+WgkC<H^}6YWw{2rc#q<;0pKK*b!kLOT(X;X2nfw2t
zW%}mz$k>!q5k8H&z;j|HjfS#fBxYOouo-fIVT)p7X}W^Iv2Z{#`O3>uJCf~b?zx1L
zLq>VK>?U~#{9S8(C*+U;F$>Q0*cf@UAOJ52to|ybTj0Ab`{%OCv^+{$p~5%@Zrf>P
z9z0VE_=fM2K}6PS>^NX6loxjFL@9fVYew`bm#+GIh=EE10Ld^*=1I-xO<&Ng?Y2Y<
zo`y#eX&O1c!roqp_$cSf!1{4XWnPNu&i^T@QG3&Ti>{bG0yfysGZfTe^>LL=Y1sCY
zD|xMgKFN387irPu0QttZI}6l^B?!?u5wt`_zs!S`xu#!Hc&r4W)@qy&B^YC8(#vq?
z*B1!7m#M*`1rmTJL@Z&Vs=GX;z}_pnv#0>-#7^+{J1(SZ9!Tg1EYG;9J;%W)JUc78
zEr!iRe9wNO%8!B#XVy{#ARP<F9s2EeV-^S64wYtmmj7ZD3@}a+wxeW*7}U(;-6_;%
z;3TayrAN>!lm(QWO^8sj5-GT`8O8;}MS;h0>rz%3gXw0(br0MgJGBkl;**j;-;LkU
zt6Nz!hob;gb>zZX-3Sa%8{-Iu46X{~;Cx<iq)80<`cttyB0g+O5>z}O>*L%|KZL8i
zz>jTL`Z=LXU(zRXSy`bl6@8%C9kUl^mkjHW$9QY;vzzfh=k!a?;!+YIO4s&R0oNJ>
zbADBi*ktG)OxnDMtYw1C@`)km6R+kNHxavm*rnj8QdjfNV#f9HkT)Z@7F;ywkrwW%
zN<^K5n?)C^gn{igBc72Grh#r26~`1rDrK7UXfNR+y!b=mG0iqWtBtjoSD7Dh-59Vw
z+vCR$C+=lrHz{=(JTY9mDIK;yKen-8D=FXQ54t9vZD=Rj$)r?o`67AohrLR2R>ui%
zG|*Fla^A1DtYwQ!YS$KeCPl%ZmGXVJ;`87zmHhXB0!Nf!!Z4*%FanvflAx&5nCORx
z$UYHAa~#6Vx7^z72{Q#bZ6ti^4QU;IJp0-&riL~v&L|_RUj{<AoMS7A{XA9cYqSf^
zqR-?>b^_(-UnZfSa>c_Yp3BM^U@p--Q05B;q0I>@hWpS0wN?7le;m>LnY}HOWyI<Q
zG;?yQztatmYlI6A>rDJd(1dz7yFrZxBKfwQ+2(UT{0Dc6{OVr$Z?P~63;!pct|m}L
z@%|;@YpY2V-LX|QRZxGF^V!Qwlr^wF=}3*^fXsD>EA5~=lVLEMla?nqToBdAKVqKJ
z4+9o8_%7~Yw;slL82F2t%>K^JBgiJ=mx87RtV|6MBL~y#rnh_lrEH{?vf-0*vP}_5
za&w-^hq*2ZAU*j40%jWjX1#^0qs^l30}^ju{7&ld6eoU8Y|y*-1X%9q8XM)B7t7X(
zxY)R=3)B+Y!0!zhMHfZaf;K9AU33NAOK}w_V~2CaOeD|MUg^v3%QTnCfofJWuzNo@
zLm+zEu2H@m$RidKGlq)WDv->|d%pn(gvv>HjeTrK|F?Z!G^#k_^yG~b&#fNC8Kd`7
zn-5R0wKJ@8QumgYQMTdxh|aR`3(%4EYE%4@b4|M<GH1_%gTn`i(>0bJI&(7jZ89QM
zowJ07SfAxY<yrECBdG<tE;oNTZSm^z#?j6x14wJqAXxGsP6My@JZb&>;3cRXUlcub
zLP6DIY%#xDEiMs|PaOOEGK}&C@H%b&>udM=()JU@{W0i~Ezvt4=fBAEIdG%fNrL2#
zg+4Q-aLk<0Wy@UU_x-rWlI9-M>Ux5A(DeS1<I9MV+aFS*2i;u_MB`>-qgn6(!O#|t
zTYafoTw%VMXQUUUiEi<g8U14%)KLuSe=PD5n0^-XIVsVXy!-hA_!#OxT&%?VSz?V`
zN<++o$s<nNZDPiHRze!Fa^KadPf31H$>L7Si0=&yXa9kc6d9^jSjad3`%-Y<!LC8T
z;oJn(;cL7|+#Rddfw5w44aPDH#p;|jubOxowp#htTs#pq#B?@Ryo1Y_M>f8zg@?Q}
z>dsjM@BaLG<%k!HD>u_p(by+2<QAm*&N5~K1{-Im<8{}NHt50fjjKL{rW=%N!)AK(
zG=T5$UTCaLlo`a0?^*OPQ~8btQq9>~pnsdP%xbc!BARz6dIcTYx`kEpco_r7&6T$1
z{kyv^*JcPD5AmA`T@>d&Cbsq~@-{6`00GyTchvb_6kk?I;<()2R6Pm{x{w-RmIb>+
zXy^?6w{UF|n3nrQSN<XrbQb&R<d5%(9)E~1VK7zM>_Ije@~e0htJTM>cs?7l$s<r>
z&FW5U;WQf(W9A_vgax`qAk=eH9uU}T+Y<3WpC1ZgCq70ep<3M7Vbtbi?jW`=4nklI
z$vHMhA{bT|V=pv-;>-xyynSLiMsiGOl`f;+N}2kH3<WSN|7KCY(4pt?YqQ%3zoN}h
zzp6&9Hh=@RLIX1@j#2k+(O{BnTt{-7qp&TR#rh~sUQCD6sko>P)};lIz_isVwHenI
zh|H;@#b0!g0r9<UXUQNHsRn2gZt*n>Q2i;Xz<Z`WqdAxXFnq*BIrwjCUY&$)4p+&$
zz8T(DSAmx12_(S^>Bh6V>*cW0?#dbjy>Y$&>*F@+5$^26vN0{r?cQ*z<3`z!uEd9|
z5oOS9aI8IMJkiq-nA0A6B68Hx1z~egUYPhYT#VXk3^pL3;vd_2_#=3g5D~3@!geGp
zVp4-_SYmd?zY{It1=BWK1Z*M9o@-x;Xtf>Y!YSOS;k{7o>*+>$3V?-XKa=DNx#QS~
zz1LcfeP7ZD@zYP4NGQtM=-U@ZA7X+O+|)V#v`@qrjpHS6(05y8c2>ns6!NM7MlC2@
zh{}psQhZNd6!Mj{R%NDFqLg`Y?ho`(+0pCCp?lhdhJ_2=6&q!G7xNZZLb^Z{1<O!Q
zqxz+i$R5qPy<t2sxb&n4sc_5~*3`AFjsMmVP4XmqI}HZEUmYBZ3L#uRR}7OuX2!VT
z@4l`Qa7=SFD`)t|=ecPXL@V(XpDU5ciBb{Shf#m!ISQL1(W~3vG}?Qs<8aw#Vqk>d
z$S4F~B8-49n}iz+t6Buj1To3+oB2Ml9HK)xr`7aqV!vv3YJGE~zj0A;?*J8_Gr$wa
zd&|${Iw&AuVCE&vHT&&V+R%VtjRM%~&*XVb=G=VvVuDP{hUaLu;42<;f0ZhsU7vhn
zz5oZ|SPiH-`$4BRX_AHP;MEw~lytqy#)K4U4+Fh*Q!FKfs-|r;+W$%tM}n*`M<66t
z<R!r6hCBn2l${F0llf&q$KWzk8XrDDzfrH+4!?<80@MM1KxiXGANXi;pQ~)#s-Dtx
zt;vmdZx$|GjrJ^Y7i&FcV)Sdt!QG2EOpPK+%&V=EfS~807Y0~@eqqNd6stnJ2RHps
zb(QsL`=HaIYF=2JTBQ-@ufv|8{#5T8KzDUb6y2a{JnWW`BtKus81l7E?ayK)5(U_I
ziM}U09Sxi2Dn^rem*p@`!~ly9#aClkK5)VW2}RwDj|eZpRW8A~K=zl?FEQnUvQ8rp
zmwf|Vxc>v&NM%u@v3TNb#<?0WjMY}|S2(HQnTnA{Lsd%25nZ59VzGr!99mPNN9MJP
zt35JVhE-z}4OpJNGjUbT`m`goRr-{N869(3T`O5&m}egSZ9Cs^RxVb=_eU}$oY_#|
zFT)IyE8H+77uq%7siSg$4)kLczxyr~Ovii02Z&1yYrhVXMR=`%v$!I1IrM4btkk1I
zR?om5hb#mxj~PTxEp<SmM7&aAyS0EA(MOaDE*}%pTY%Xh@nB=nH57LqW?)RvN}?fK
z8({gz1+vnmLr%xeUx&4UKeBpJDGgr(jKAD&On|OWqjw_ow?>aAelSu6N}vD$00000
c0000000000000000000000000000000Kr;4x&QzG

literal 0
HcmV?d00001

diff --git a/boards/nordic/nrf54l15pdk/doc/index.rst b/boards/nordic/nrf54l15pdk/doc/index.rst
new file mode 100644
index 00000000000..3fae82b713c
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/doc/index.rst
@@ -0,0 +1,142 @@
+.. _nrf54l15pdk_nrf54l15:
+
+nRF54L15 PDK
+############
+
+Overview
+********
+
+.. note::
+
+   All software for the nRF54L15 SoC is experimental and hardware availability
+   is restricted to the participants in the limited sampling program.
+
+The nRF54L15 Preview Development Kit hardware provides
+support for the Nordic Semiconductor nRF54L15 Arm Cortex-M33 CPU and
+the following devices:
+
+* :abbr:`SAADC (Successive Approximation Analog to Digital Converter)`
+* CLOCK
+* RRAM
+* :abbr:`GPIO (General Purpose Input Output)`
+* :abbr:`TWIM (I2C-compatible two-wire interface master with EasyDMA)`
+* MEMCONF
+* :abbr:`MPU (Memory Protection Unit)`
+* :abbr:`NVIC (Nested Vectored Interrupt Controller)`
+* :abbr:`PWM (Pulse Width Modulation)`
+* :abbr:`GRTC (Global real-time counter)`
+* Segger RTT (RTT Console)
+* :abbr:`SPI (Serial Peripheral Interface)`
+* :abbr:`UARTE (Universal asynchronous receiver-transmitter)`
+* :abbr:`WDT (Watchdog Timer)`
+
+.. figure:: img/nrf54l15pdk_nrf54l15.webp
+     :align: center
+     :alt: nRF54L15 PDK
+
+     nRF54L15 PDK (Credit: Nordic Semiconductor)
+
+Hardware
+********
+
+nRF54L15 PDK has two crystal oscillators:
+
+* High-frequency 32 MHz crystal oscillator (HFXO)
+* Low-frequency 32.768 kHz crystal oscillator (LFXO)
+
+The crystal oscillators can be configured to use either
+internal or external capacitors.
+
+Supported Features
+==================
+
+The ``nrf54l15pdk/nrf54l15/cpuapp`` board configuration supports the following
+hardware features:
+
++-----------+------------+----------------------+
+| Interface | Controller | Driver/Component     |
++===========+============+======================+
+| SAADC     | on-chip    | adc                  |
++-----------+------------+----------------------+
+| CLOCK     | on-chip    | clock_control        |
++-----------+------------+----------------------+
+| RRAM      | on-chip    | flash                |
++-----------+------------+----------------------+
+| GPIO      | on-chip    | gpio                 |
++-----------+------------+----------------------+
+| TWIM      | on-chip    | i2c                  |
++-----------+------------+----------------------+
+| MEMCONF   | on-chip    | retained_mem         |
++-----------+------------+----------------------+
+| MPU       | on-chip    | arch/arm             |
++-----------+------------+----------------------+
+| NVIC      | on-chip    | arch/arm             |
++-----------+------------+----------------------+
+| PWM       | on-chip    | pwm                  |
++-----------+------------+----------------------+
+| GRTC      | on-chip    | counter              |
++-----------+------------+----------------------+
+| RTT       | Segger     | console              |
++-----------+------------+----------------------+
+| SPI(M/S)  | on-chip    | spi                  |
++-----------+------------+----------------------+
+| SPU       | on-chip    | system protection    |
++-----------+------------+----------------------+
+| UARTE     | on-chip    | serial               |
++-----------+------------+----------------------+
+| WDT       | on-chip    | watchdog             |
++-----------+------------+----------------------+
+
+Other hardware features have not been enabled yet for this board.
+
+Programming and Debugging
+*************************
+
+Applications for the ``nrf54l15pdk/nrf54l15/cpuapp`` board can be
+built, flashed, and debugged in the usual way. See
+:ref:`build_an_application` and :ref:`application_run` for more details on
+building and running.
+
+Flashing
+========
+
+As an example, this section shows how to build and flash the :zephyr:code-sample:`hello_world`
+application.
+
+.. warning::
+
+   When programming the device, you might get an error similar to the following message::
+
+    ERROR: The operation attempted is unavailable due to readback protection in
+    ERROR: your device. Please use --recover to unlock the device.
+
+   This error occurs when readback protection is enabled.
+   To disable the readback protection, you must *recover* your device.
+
+   Enter the following command to recover the core::
+
+    west flash --recover
+
+   The ``--recover`` command erases the flash memory and then writes a small binary into
+   the recovered flash memory.
+   This binary prevents the readback protection from enabling itself again after a pin
+   reset or power cycle.
+
+Follow the instructions in the :ref:`nordic_segger` page to install
+and configure all the necessary software. Further information can be
+found in :ref:`nordic_segger_flashing`.
+
+To build and program the sample to the nRF54L15 PDK, complete the following steps:
+
+First, connect the nRF54L15 PDK to you computer using the IMCU USB port on the PDK.
+Next, build the sample by running the following command:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: nrf54l15pdk/nrf54l15/cpuapp
+   :goals: build flash
+
+Testing the LEDs and buttons in the nRF54L15 PDK
+************************************************
+
+Test the nRF54L15 PDK with a :zephyr:code-sample:`blinky` sample.
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15_cpuapp_common.dtsi b/boards/nordic/nrf54l15pdk/nrf54l15_cpuapp_common.dtsi
new file mode 100644
index 00000000000..474874d110c
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15_cpuapp_common.dtsi
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* This file is common to the secure and non-secure domain */
+
+#include <nordic/nrf54l15_enga_cpuapp.dtsi>
+#include "nrf54l15pdk_nrf54l15-common.dtsi"
+
+/ {
+	chosen {
+		zephyr,console = &uart20;
+		zephyr,shell-uart = &uart20;
+		zephyr,uart-mcumgr = &uart20;
+		zephyr,bt-mon-uart = &uart20;
+		zephyr,bt-c2h-uart = &uart20;
+		zephyr,flash-controller = &rram_controller;
+		zephyr,flash = &cpuapp_rram;
+		zephyr,ieee802154 = &ieee802154;
+	};
+};
+
+&cpuapp_sram {
+	status = "okay";
+};
+
+&lfxo {
+	load-capacitors = "internal";
+	load-capacitance-femtofarad = <15500>;
+};
+
+&hfxo {
+	load-capacitors = "internal";
+	load-capacitance-femtofarad = <15000>;
+};
+
+&regulators {
+	status = "okay";
+};
+
+&vregmain {
+	status = "okay";
+	regulator-initial-mode = <NRF5X_REG_MODE_DCDC>;
+};
+
+&grtc {
+	owned-channels = <0 1 2 3 4 5 6 7 8 9 10 11>;
+	/* Channels 7-11 reserved for Zero Latency IRQs, 3-4 for FLPR */
+	child-owned-channels = <3 4 7 8 9 10 11>;
+	status = "okay";
+};
+
+&cpuapp_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x0 DT_SIZE_K(64)>;
+		};
+		slot0_partition: partition@10000 {
+			label = "image-0";
+			reg = <0x10000 DT_SIZE_K(324)>;
+		};
+		slot0_ns_partition: partition@61000 {
+			label = "image-0-nonsecure";
+			reg = <0x61000 DT_SIZE_K(324)>;
+		};
+		slot1_partition: partition@b2000 {
+			label = "image-1";
+			reg = <0xb2000 DT_SIZE_K(324)>;
+		};
+		slot1_ns_partition: partition@103000 {
+			label = "image-1-nonsecure";
+			reg = <0x103000 DT_SIZE_K(324)>;
+		};
+		/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
+		storage_partition: partition@15c000 {
+			label = "storage";
+			reg = <0x15c000 DT_SIZE_K(36)>;
+		};
+	};
+};
+
+&uart20 {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpiote30 {
+	status = "okay";
+};
+
+&radio {
+	status = "okay";
+};
+
+&ieee802154 {
+	status = "okay";
+};
+
+&temp {
+	status = "okay";
+};
+
+&clock {
+	status = "okay";
+};
+
+&spi00 {
+	status = "okay";
+	cs-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
+	pinctrl-0 = <&spi00_default>;
+	pinctrl-1 = <&spi00_sleep>;
+	pinctrl-names = "default", "sleep";
+
+	mx25r64: mx25r6435f@0 {
+		compatible = "jedec,spi-nor";
+		status = "disabled";
+		reg = <0>;
+		spi-max-frequency = <8000000>;
+		jedec-id = [c2 28 17];
+		sfdp-bfp = [
+			e5 20 f1 ff  ff ff ff 03  44 eb 08 6b  08 3b 04 bb
+			ee ff ff ff  ff ff 00 ff  ff ff 00 ff  0c 20 0f 52
+			10 d8 00 ff  23 72 f5 00  82 ed 04 cc  44 83 48 44
+			30 b0 30 b0  f7 c4 d5 5c  00 be 29 ff  f0 d0 ff ff
+		];
+		size = <67108864>;
+		has-dpd;
+		t-enter-dpd = <10000>;
+		t-exit-dpd = <35000>;
+	};
+};
+
+&adc {
+	status = "okay";
+};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15-common.dtsi b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15-common.dtsi
new file mode 100644
index 00000000000..9668cbe5bbf
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15-common.dtsi
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54l15pdk_nrf54l15-pinctrl.dtsi"
+
+/ {
+	leds {
+		compatible = "gpio-leds";
+		led0: led_0 {
+			gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;
+			label = "Green LED 0";
+		};
+		led1: led_1 {
+			gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+			label = "Green LED 1";
+		};
+		led2: led_2 {
+			gpios = <&gpio2 7 GPIO_ACTIVE_HIGH>;
+			label = "Green LED 2";
+		};
+		led3: led_3 {
+			gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
+			label = "Green LED 3";
+		};
+	};
+
+	pwmleds {
+		compatible = "pwm-leds";
+		/*
+		 * PWM signal can be exposed on GPIO pin only within same domain.
+		 * There is only one domain which contains both PWM and GPIO:
+		 * PWM20/21/22 and GPIO Port P1.
+		 * Only LEDs connected to P1 can work with PWM, for example LED1.
+		 */
+		pwm_led1: pwm_led_1 {
+			pwms = <&pwm20 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+		};
+	};
+
+	buttons {
+		compatible = "gpio-keys";
+		button0: button_0 {
+			gpios = <&gpio1 13 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button 0";
+			zephyr,code = <INPUT_KEY_0>;
+		};
+		button1: button_1 {
+			gpios = <&gpio1 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button 1";
+			zephyr,code = <INPUT_KEY_1>;
+		};
+		button2: button_2 {
+			gpios = <&gpio1 8 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button 2";
+			zephyr,code = <INPUT_KEY_2>;
+		};
+		button3: button_3 {
+			gpios = <&gpio0 4 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button 3";
+			zephyr,code = <INPUT_KEY_3>;
+		};
+	};
+
+	aliases {
+		led0 = &led0;
+		led1 = &led1;
+		led2 = &led2;
+		led3 = &led3;
+		pwm-led0 = &pwm_led1;
+		sw0 = &button0;
+		sw1 = &button1;
+		sw2 = &button2;
+		sw3 = &button3;
+		watchdog0 = &wdt31;
+	};
+};
+
+&uart20 {
+	current-speed = <115200>;
+	pinctrl-0 = <&uart20_default>;
+	pinctrl-1 = <&uart20_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&uart30 {
+	current-speed = <115200>;
+	pinctrl-0 = <&uart30_default>;
+	pinctrl-1 = <&uart30_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&pwm20 {
+	status = "okay";
+	pinctrl-0 = <&pwm20_default>;
+	pinctrl-1 = <&pwm20_sleep>;
+	pinctrl-names = "default", "sleep";
+};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15-pinctrl.dtsi b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15-pinctrl.dtsi
new file mode 100644
index 00000000000..0b6e2056a82
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15-pinctrl.dtsi
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	/omit-if-no-ref/ uart20_default: uart20_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 4)>,
+				<NRF_PSEL(UART_RTS, 1, 6)>;
+		};
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 1, 5)>,
+				<NRF_PSEL(UART_CTS, 1, 7)>;
+			bias-pull-up;
+		};
+	};
+
+	/omit-if-no-ref/ uart20_sleep: uart20_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 4)>,
+				<NRF_PSEL(UART_RX, 1, 5)>,
+				<NRF_PSEL(UART_RTS, 1, 6)>,
+				<NRF_PSEL(UART_CTS, 1, 7)>;
+			low-power-enable;
+		};
+	};
+
+	/omit-if-no-ref/ uart30_default: uart30_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RTS, 0, 2)>;
+		};
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 0, 1)>,
+				<NRF_PSEL(UART_CTS, 0, 3)>;
+			bias-pull-up;
+		};
+	};
+
+	/omit-if-no-ref/ uart30_sleep: uart30_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RX, 0, 1)>,
+				<NRF_PSEL(UART_RTS, 0, 2)>,
+				<NRF_PSEL(UART_CTS, 0, 3)>;
+			low-power-enable;
+		};
+	};
+
+	/omit-if-no-ref/ spi00_default: spi00_default {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 2, 1)>,
+				<NRF_PSEL(SPIM_MOSI, 2, 2)>,
+				<NRF_PSEL(SPIM_MISO, 2, 4)>;
+		};
+	};
+
+	/omit-if-no-ref/ spi00_sleep: spi00_sleep {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 2, 1)>,
+				<NRF_PSEL(SPIM_MOSI, 2, 2)>,
+				<NRF_PSEL(SPIM_MISO, 2, 4)>;
+				low-power-enable;
+		};
+	};
+
+	/omit-if-no-ref/ pwm20_default: pwm20_default {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 1, 10)>;
+		};
+	};
+
+	/omit-if-no-ref/ pwm20_sleep: pwm20_sleep {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 1, 10)>;
+			low-power-enable;
+		};
+	};
+};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_common_0_2_1.dtsi b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_common_0_2_1.dtsi
new file mode 100644
index 00000000000..a37cf230966
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_common_0_2_1.dtsi
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&led0 {
+	gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
+};
+
+&led1 {
+	gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
+};
+
+&led2 {
+	gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+};
+
+&led3 {
+	gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
+};
+
+&button0 {
+	gpios = <&gpio1 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+};
+
+&button1 {
+	gpios = <&gpio1 10 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+};
+
+&button2 {
+	gpios = <&gpio2 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+};
+
+&button3 {
+	gpios = <&gpio2 10 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+};
+
+&pinctrl {
+	/omit-if-no-ref/ pwm20_default: pwm20_default {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 1, 8)>;
+		};
+	};
+
+	/omit-if-no-ref/ pwm20_sleep: pwm20_sleep {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 1, 8)>;
+			low-power-enable;
+		};
+	};
+};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.dts b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.dts
new file mode 100644
index 00000000000..831479ea950
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.dts
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include "nrf54l15_cpuapp_common.dtsi"
+
+/ {
+	compatible = "nordic,nrf54l15pdk_nrf54l15-cpuapp";
+	model = "Nordic nRF54L15 PDK nRF54L15 Application MCU";
+
+	chosen {
+		zephyr,code-partition = &slot0_partition;
+		zephyr,sram = &cpuapp_sram;
+	};
+};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.yaml b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.yaml
new file mode 100644
index 00000000000..4b900736910
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.yaml
@@ -0,0 +1,24 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54l15pdk/nrf54l15/cpuapp
+name: nRF54l15-PDK-nRF54l15-Application
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+sysbuild: true
+ram: 188
+flash: 324
+supported:
+  - adc
+  - counter
+  - gpio
+  - i2c
+  - pwm
+  - retained_mem
+  - spi
+  - watchdog
+  - i2s
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay
new file mode 100644
index 00000000000..1ca5cadaff9
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54l15pdk_nrf54l15_common_0_2_1.dtsi"
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_defconfig b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_defconfig
new file mode 100644
index 00000000000..25559850091
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_defconfig
@@ -0,0 +1,31 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# MPU-based null-pointer dereferencing detection cannot
+# be applied as the (0x0 - 0x400) is unmapped for this target.
+CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
+
+# Enable Cache
+CONFIG_CACHE_MANAGEMENT=y
+CONFIG_EXTERNAL_CACHE=y
+
+CONFIG_SOC_NRF_FORCE_CONSTLAT=y
+
+# Start SYSCOUNTER on driver init
+CONFIG_NRF_GRTC_START_SYSCOUNTER=y
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.dts b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.dts
new file mode 100644
index 00000000000..c8ed4abb79f
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.dts
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf54l15_enga_cpuflpr.dtsi>
+#include "nrf54l15pdk_nrf54l15-common.dtsi"
+
+/ {
+	model = "Nordic nRF54L15 PDK nRF54L15 FLPR MCU";
+	compatible = "nordic,nrf54l15pdk_nrf54l15-cpuflpr";
+
+	chosen {
+		zephyr,console = &uart30;
+		zephyr,shell-uart = &uart30;
+		zephyr,code-partition = &cpuflpr_code_partition;
+		zephyr,flash = &cpuflpr_rram;
+		zephyr,sram = &cpuflpr_sram;
+	};
+};
+
+&cpuflpr_sram {
+	status = "okay";
+	/* size must be increased due to booting from SRAM */
+	reg = <0x20028000 DT_SIZE_K(96)>;
+	ranges = <0x0 0x20028000 0x18000>;
+};
+
+&cpuflpr_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		cpuflpr_code_partition: partition@0 {
+			label = "image-0";
+			reg = <0x0 DT_SIZE_K(96)>;
+		};
+	};
+};
+
+&grtc {
+	owned-channels = <3 4>;
+	status = "okay";
+};
+
+&uart30 {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpiote30 {
+	status = "okay";
+};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.yaml b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.yaml
new file mode 100644
index 00000000000..6e8789aeab7
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54l15pdk/nrf54l15/cpuflpr
+name: nRF54L15-PDK-nRF54L15-Fast-Lightweight-Peripheral-Processor
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 96
+flash: 96
+supported:
+  - counter
+  - gpio
+  - i2c
+  - spi
+  - watchdog
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_0_2_1.overlay b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_0_2_1.overlay
new file mode 100644
index 00000000000..1ca5cadaff9
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_0_2_1.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54l15pdk_nrf54l15_common_0_2_1.dtsi"
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_defconfig b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_defconfig
new file mode 100644
index 00000000000..256ac9103b4
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_defconfig
@@ -0,0 +1,17 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+CONFIG_USE_DT_CODE_PARTITION=y
+
+# Execute from SRAM
+CONFIG_XIP=n
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip.dts b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip.dts
new file mode 100644
index 00000000000..cab0eab896e
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip.dts
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54l15pdk_nrf54l15_cpuflpr.dts"
+
+&cpuflpr_sram {
+	reg = <0x2002f000 DT_SIZE_K(68)>;
+	ranges = <0x0 0x2002f000 0x11000>;
+};
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip.yaml b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip.yaml
new file mode 100644
index 00000000000..156cbb6f8b4
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54l15pdk/nrf54l15/cpuflpr/xip
+name: nRF54L15-PDK-nRF54L15-Fast-Lightweight-Peripheral-Processor (RRAM XIP)
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 68
+flash: 96
+supported:
+  - counter
+  - gpio
+  - i2c
+  - spi
+  - watchdog
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip_0_2_1.overlay b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip_0_2_1.overlay
new file mode 100644
index 00000000000..1ca5cadaff9
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip_0_2_1.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54l15pdk_nrf54l15_common_0_2_1.dtsi"
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip_defconfig b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip_defconfig
new file mode 100644
index 00000000000..0a436a648b4
--- /dev/null
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr_xip_defconfig
@@ -0,0 +1,15 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Execute from RRAM
+CONFIG_XIP=y
diff --git a/doc/releases/release-notes-4.0.rst b/doc/releases/release-notes-4.0.rst
index 8697497c8a6..44527737e3b 100644
--- a/doc/releases/release-notes-4.0.rst
+++ b/doc/releases/release-notes-4.0.rst
@@ -131,7 +131,6 @@ Boards & SoC Support
   * Support for Google Kukui EC board (``google_kukui``) has been dropped.
   * STM32: Deprecated MCO configuration via Kconfig in favour of setting it through devicetree.
     See ``samples/boards/stm32/mco`` sample.
-  * Removed the ``nrf54l15pdk`` board, use :ref:`nrf54l15dk_nrf54l15` instead.
 
 * Added support for the following shields:
 
diff --git a/samples/bluetooth/beacon/sample.yaml b/samples/bluetooth/beacon/sample.yaml
index e0bf6d22fb9..6952be223ec 100644
--- a/samples/bluetooth/beacon/sample.yaml
+++ b/samples/bluetooth/beacon/sample.yaml
@@ -9,6 +9,7 @@ tests:
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     tags: bluetooth
     integration_platforms:
       - qemu_cortex_m3
diff --git a/samples/bluetooth/hci_uart/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/bluetooth/hci_uart/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..7ba5755c681
--- /dev/null
+++ b/samples/bluetooth/hci_uart/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+ &uart20 {
+	compatible = "nordic,nrf-uarte";
+	current-speed = <1000000>;
+	status = "okay";
+	hw-flow-control;
+};
diff --git a/samples/bluetooth/hci_uart/boards/nrf54l15pdk_nrf54l15_cpuapp_df.overlay b/samples/bluetooth/hci_uart/boards/nrf54l15pdk_nrf54l15_cpuapp_df.overlay
new file mode 100644
index 00000000000..470bfdaa8c5
--- /dev/null
+++ b/samples/bluetooth/hci_uart/boards/nrf54l15pdk_nrf54l15_cpuapp_df.overlay
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&uart20 {
+	compatible = "nordic,nrf-uarte";
+	current-speed = <1000000>;
+	status = "okay";
+	hw-flow-control;
+};
+
+&radio {
+	status = "okay";
+	/* This is an example number of antennas that may be available
+	 * on antenna matrix board.
+	 */
+	dfe-antenna-num = <10>;
+	/* This is an example switch pattern that will be used to set an
+	 * antenna for Tx PDU (period before start of Tx CTE).
+	 */
+	dfe-pdu-antenna = <0x0>;
+
+	/* These are example GPIO pin numbers that are provided to
+	 * Radio peripheral. The pins will be acquired by Radio to
+	 * drive antenna switching when AoD is enabled.
+	 */
+	dfegpio0-gpios = <&gpio1 4 0>;
+	dfegpio1-gpios = <&gpio1 5 0>;
+	dfegpio2-gpios = <&gpio1 6 0>;
+	dfegpio3-gpios = <&gpio1 7 0>;
+};
diff --git a/samples/bluetooth/hci_uart/sample.yaml b/samples/bluetooth/hci_uart/sample.yaml
index a83ac48cbf0..6c87e6edede 100644
--- a/samples/bluetooth/hci_uart/sample.yaml
+++ b/samples/bluetooth/hci_uart/sample.yaml
@@ -69,3 +69,14 @@ tests:
     tags:
       - uart
       - bluetooth
+  sample.bluetooth.hci_uart.nrf54l15pdk.all:
+    harness: bluetooth
+    platform_allow: nrf54l15pdk/nrf54l15/cpuapp
+    integration_platforms:
+      - nrf54l15pdk/nrf54l15/cpuapp
+    extra_args:
+      - OVERLAY_CONFIG=overlay-all-bt_ll_sw_split.conf
+      - DTC_OVERLAY_FILE=./boards/nrf54l15pdk_nrf54l15_cpuapp_df.overlay
+    tags:
+      - uart
+      - bluetooth
diff --git a/samples/bluetooth/peripheral_hr/sample.yaml b/samples/bluetooth/peripheral_hr/sample.yaml
index b233fb48abc..c0af932a3ea 100644
--- a/samples/bluetooth/peripheral_hr/sample.yaml
+++ b/samples/bluetooth/peripheral_hr/sample.yaml
@@ -14,6 +14,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - qemu_cortex_m3
       - nrf52_bsim
diff --git a/samples/drivers/jesd216/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/drivers/jesd216/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..fb87b49cc22
--- /dev/null
+++ b/samples/drivers/jesd216/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&mx25r64 {
+	status = "okay";
+};
diff --git a/samples/drivers/mbox/CMakeLists.txt b/samples/drivers/mbox/CMakeLists.txt
index 7ae21a6a8e9..774377f894f 100644
--- a/samples/drivers/mbox/CMakeLists.txt
+++ b/samples/drivers/mbox/CMakeLists.txt
@@ -21,6 +21,7 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR
    CONFIG_BOARD_ESP32S3_DEVKITM_ESP32S3_PROCPU OR
    CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR
    CONFIG_BOARD_NRF54H20DK_NRF54H20_CPURAD OR
+   CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUAPP OR
    CONFIG_BOARD_NRF54L15DK_NRF54L15_CPUAPP OR
    CONFIG_BOARD_STM32H747I_DISCO_STM32H747XX_M7)
   message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as Main in this sample")
diff --git a/samples/drivers/mbox/Kconfig.sysbuild b/samples/drivers/mbox/Kconfig.sysbuild
index cc0a847f28d..91397da7245 100644
--- a/samples/drivers/mbox/Kconfig.sysbuild
+++ b/samples/drivers/mbox/Kconfig.sysbuild
@@ -15,6 +15,7 @@ config REMOTE_BOARD
 	default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk"
 	default "lpcxpresso55s69/lpc55s69/cpu1" if $(BOARD) = "lpcxpresso55s69"
 	default "nrf54h20dk/nrf54h20/cpuapp" if "$(BOARD)${BOARD_QUALIFIERS}" = "nrf54h20dk/nrf54h20/cpurad"
+	default "nrf54l15pdk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15pdk"
 	default "nrf54l15dk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15dk"
 	default "stm32h747i_disco/stm32h747xx/m4" if $(BOARD) = "stm32h747i_disco"
 	default "esp32_devkitc_wroom/esp32/appcpu" if "$(BOARD)${BOARD_QUALIFIERS}" = "esp32_devkitc_wroom/esp32/procpu"
diff --git a/samples/drivers/mbox/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/drivers/mbox/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..3ec014008e5
--- /dev/null
+++ b/samples/drivers/mbox/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&cpuapp_vevif_rx 15>, <&cpuapp_vevif_tx 16>;
+		mbox-names = "rx", "tx";
+	};
+};
+
+&cpuapp_vevif_rx {
+	status = "okay";
+};
+
+&cpuapp_vevif_tx {
+	status = "okay";
+};
diff --git a/samples/drivers/mbox/remote/CMakeLists.txt b/samples/drivers/mbox/remote/CMakeLists.txt
index 311e489177d..66ee8e60668 100644
--- a/samples/drivers/mbox/remote/CMakeLists.txt
+++ b/samples/drivers/mbox/remote/CMakeLists.txt
@@ -20,6 +20,8 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET OR
    CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUPPR OR
    CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUFLPR OR
    CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR
+   CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUFLPR OR
+   CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUFLPR_XIP OR
    CONFIG_BOARD_NRF54L15DK_NRF54L15_CPUFLPR OR
    CONFIG_BOARD_STM32H747I_DISCO_STM32H747XX_M4)
   message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as remote in this sample")
diff --git a/samples/drivers/mbox/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay b/samples/drivers/mbox/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
new file mode 100644
index 00000000000..20ce53cf824
--- /dev/null
+++ b/samples/drivers/mbox/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&cpuflpr_vevif_rx 16>, <&cpuflpr_vevif_tx 15>;
+		mbox-names = "rx", "tx";
+	};
+};
+
+&cpuflpr_vevif_rx {
+	status = "okay";
+};
+
+&cpuflpr_vevif_tx {
+	status = "okay";
+};
+
+&uart30 {
+	/delete-property/ hw-flow-control;
+};
diff --git a/samples/drivers/mbox/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay b/samples/drivers/mbox/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
new file mode 100644
index 00000000000..20ce53cf824
--- /dev/null
+++ b/samples/drivers/mbox/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&cpuflpr_vevif_rx 16>, <&cpuflpr_vevif_tx 15>;
+		mbox-names = "rx", "tx";
+	};
+};
+
+&cpuflpr_vevif_rx {
+	status = "okay";
+};
+
+&cpuflpr_vevif_tx {
+	status = "okay";
+};
+
+&uart30 {
+	/delete-property/ hw-flow-control;
+};
diff --git a/samples/drivers/spi_flash/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/drivers/spi_flash/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..fb87b49cc22
--- /dev/null
+++ b/samples/drivers/spi_flash/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&mx25r64 {
+	status = "okay";
+};
diff --git a/samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..5c765a8a896
--- /dev/null
+++ b/samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay b/samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
new file mode 100644
index 00000000000..5c765a8a896
--- /dev/null
+++ b/samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay b/samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
new file mode 100644
index 00000000000..5c765a8a896
--- /dev/null
+++ b/samples/drivers/watchdog/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/samples/subsys/fs/fs_sample/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/subsys/fs/fs_sample/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
new file mode 100644
index 00000000000..949237fd4ba
--- /dev/null
+++ b/samples/subsys/fs/fs_sample/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_DISK_DRIVERS=y
+CONFIG_DISK_DRIVER_FLASH=y
+# There may be no files on internal SoC flash, so this Kconfig
+# options has ben enabled to create some if listing does not
+# find in the first place.
+CONFIG_FS_SAMPLE_CREATE_SOME_ENTRIES=y
diff --git a/samples/subsys/fs/fs_sample/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/subsys/fs/fs_sample/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..391afea75a4
--- /dev/null
+++ b/samples/subsys/fs/fs_sample/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Because FAT FS needs at least 64kiB partition and default
+ * storage_partition is 36kiB for this board, we need to reorganize
+ * partitions to get at least 64KiB.
+ */
+/delete-node/ &slot0_partition;
+/delete-node/ &slot1_partition;
+/delete-node/ &slot0_ns_partition;
+/delete-node/ &slot1_ns_partition;
+/delete-node/ &storage_partition;
+
+&cpuapp_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		slot0_partition: parition@10000 {
+			reg = <0x00010000 DT_SIZE_K(300)>;
+		};
+		slot1_partition: partition@5b000 {
+			reg = <0x0005b000 DT_SIZE_K(300)>;
+		};
+
+		storage_partition: partition@a6000 {
+			label = "storage";
+			reg = <0x000a6000 DT_SIZE_K(128)>;
+		};
+	};
+};
+
+/ {
+	msc_disk0 {
+		status="okay";
+		compatible = "zephyr,flash-disk";
+		partition = <&storage_partition>;
+		disk-name = "SD";
+		cache-size = <512>;
+	};
+};
diff --git a/samples/subsys/fs/fs_sample/sample.yaml b/samples/subsys/fs/fs_sample/sample.yaml
index b16976876be..d54960c7589 100644
--- a/samples/subsys/fs/fs_sample/sample.yaml
+++ b/samples/subsys/fs/fs_sample/sample.yaml
@@ -55,6 +55,9 @@ tests:
     extra_args:
       - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_ram_disk.conf
       - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_ram_disk_region.overlay
+  sample.filesystem.fat_fs.nrf54l15pdk:
+    build_only: true
+    platform_allow: nrf54l15pdk/nrf54l15/cpuapp
   sample.filesystem.fat_fs.nrf54l15dk:
     build_only: true
     platform_allow: nrf54l15dk/nrf54l15/cpuapp
diff --git a/samples/subsys/fs/littlefs/sample.yaml b/samples/subsys/fs/littlefs/sample.yaml
index 2160d38515e..2d78141c9db 100644
--- a/samples/subsys/fs/littlefs/sample.yaml
+++ b/samples/subsys/fs/littlefs/sample.yaml
@@ -25,6 +25,7 @@ tests:
       - stm32h747i_disco/stm32h747xx/m7
       - stm32h750b_dk
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - frdm_ke17z
       - frdm_ke17z512
     integration_platforms:
diff --git a/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt b/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt
index 7fdf33f9621..21d9bafeab0 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt
+++ b/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt
@@ -11,7 +11,8 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 if(NOT CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP AND
     NOT CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUAPP AND
     NOT CONFIG_BOARD_STM32H747I_DISCO AND
-    NOT CONFIG_BOARD_NRF54L15DK_NRF54L15_CPUAPP)
+    NOT CONFIG_BOARD_NRF54L15DK_NRF54L15_CPUAPP AND
+    NOT CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUAPP)
   message(FATAL_ERROR "${BOARD} is not supported for this sample")
 endif()
 
diff --git a/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild b/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild
index 8ef1b70793b..ef6f7df968b 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild
+++ b/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild
@@ -8,5 +8,6 @@ config REMOTE_BOARD
 string
 	default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk"
 	default "nrf5340bsim/nrf5340/cpunet" if $(BOARD) = "nrf5340bsim"
+	default "nrf54l15pdk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15pdk"
 	default "nrf54l15dk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15dk"
 	default "stm32h747i_disco/stm32h747xx/m4" if $(BOARD) = "stm32h747i_disco"
diff --git a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..0cfaf565349
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	soc {
+		reserved-memory {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			sram_rx: memory@20018000 {
+				reg = <0x20018000 0x0800>;
+			};
+
+			sram_tx: memory@20020000 {
+				reg = <0x20020000 0x0800>;
+			};
+		};
+	};
+
+	ipc {
+		ipc0: ipc0 {
+			compatible = "zephyr,ipc-icmsg";
+			tx-region = <&sram_tx>;
+			rx-region = <&sram_rx>;
+			mboxes = <&cpuapp_vevif_rx 15>, <&cpuapp_vevif_tx 16>;
+			mbox-names = "rx", "tx";
+			status = "okay";
+		};
+	};
+};
+
+&cpuapp_vevif_rx {
+	status = "okay";
+};
+
+&cpuapp_vevif_tx {
+	status = "okay";
+};
diff --git a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
new file mode 100644
index 00000000000..b0e1f0d5034
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	soc {
+		reserved-memory {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			sram_tx: memory@20018000 {
+				reg = <0x20018000 0x0800>;
+			};
+
+			sram_rx: memory@20020000 {
+				reg = <0x20020000 0x0800>;
+			};
+		};
+	};
+
+	ipc {
+		ipc0: ipc0 {
+			compatible = "zephyr,ipc-icmsg";
+			tx-region = <&sram_tx>;
+			rx-region = <&sram_rx>;
+			mboxes = <&cpuflpr_vevif_rx 16>, <&cpuflpr_vevif_tx 15>;
+			mbox-names = "rx", "tx";
+			status = "okay";
+		};
+	};
+};
+
+&cpuflpr_vevif_rx {
+	status = "okay";
+};
+
+&cpuflpr_vevif_tx {
+	status = "okay";
+};
+
+&uart30 {
+	/delete-property/ hw-flow-control;
+};
diff --git a/samples/subsys/settings/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/subsys/settings/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
new file mode 100644
index 00000000000..3746c13c741
--- /dev/null
+++ b/samples/subsys/settings/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
@@ -0,0 +1,2 @@
+CONFIG_NVS=y
+CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/sample.yaml b/samples/subsys/settings/sample.yaml
index 09d191c352a..db06905ac90 100644
--- a/samples/subsys/settings/sample.yaml
+++ b/samples/subsys/settings/sample.yaml
@@ -13,6 +13,7 @@ tests:
       - native_sim/native/64
       - mr_canhubk3
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
     integration_platforms:
       - native_sim
diff --git a/samples/sysbuild/hello_world/sample.yaml b/samples/sysbuild/hello_world/sample.yaml
index d0a750bc87c..444410f46a3 100644
--- a/samples/sysbuild/hello_world/sample.yaml
+++ b/samples/sysbuild/hello_world/sample.yaml
@@ -47,6 +47,15 @@ tests:
       SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpuppr_xip.conf
       hello_world_SNIPPET=nordic-ppr-xip
 
+  sample.sysbuild.hello_world.nrf54l15pdk_nrf54l15_cpuflpr:
+    platform_allow:
+      - nrf54l15pdk/nrf54l15/cpuapp
+    integration_platforms:
+      - nrf54l15pdk/nrf54l15/cpuapp
+    extra_args:
+      SB_CONF_FILE=sysbuild/nrf54l15pdk_nrf54l15_cpuflpr.conf
+      hello_world_SNIPPET=nordic-flpr
+
   sample.sysbuild.hello_world.nrf54l15dk_nrf54l15_cpuflpr:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
diff --git a/samples/sysbuild/hello_world/sysbuild/nrf54l15pdk_nrf54l15_cpuflpr.conf b/samples/sysbuild/hello_world/sysbuild/nrf54l15pdk_nrf54l15_cpuflpr.conf
new file mode 100644
index 00000000000..f67b1bb74ec
--- /dev/null
+++ b/samples/sysbuild/hello_world/sysbuild/nrf54l15pdk_nrf54l15_cpuflpr.conf
@@ -0,0 +1 @@
+SB_CONFIG_REMOTE_BOARD="nrf54l15pdk/nrf54l15/cpuflpr"
diff --git a/snippets/nordic-flpr-xip/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/snippets/nordic-flpr-xip/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..0007419e1f8
--- /dev/null
+++ b/snippets/nordic-flpr-xip/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	soc {
+		reserved-memory {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			cpuflpr_code_partition: image@165000 {
+				/* FLPR core code partition */
+				reg = <0x165000 DT_SIZE_K(96)>;
+			};
+		};
+	};
+};
+
+&uart30 {
+	status = "reserved";
+};
+
+&cpuflpr_vpr {
+	execution-memory = <&cpuflpr_code_partition>;
+};
+
+&cpuapp_vevif_tx {
+	status = "okay";
+};
diff --git a/snippets/nordic-flpr-xip/snippet.yml b/snippets/nordic-flpr-xip/snippet.yml
index 921b186b039..e67274f37aa 100644
--- a/snippets/nordic-flpr-xip/snippet.yml
+++ b/snippets/nordic-flpr-xip/snippet.yml
@@ -3,6 +3,9 @@ append:
   EXTRA_DTC_OVERLAY_FILE: nordic-flpr-xip.overlay
 
 boards:
+  nrf54l15pdk/nrf54l15/cpuapp:
+    append:
+      EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
   nrf54l15dk/nrf54l15/cpuapp:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/snippets/nordic-flpr/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/snippets/nordic-flpr/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..beb9ece1340
--- /dev/null
+++ b/snippets/nordic-flpr/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	soc {
+		reserved-memory {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			cpuflpr_code_partition: image@165000 {
+				/* FLPR core code partition */
+				reg = <0x165000 DT_SIZE_K(96)>;
+			};
+		};
+
+		cpuflpr_sram_code_data: memory@20028000 {
+			compatible = "mmio-sram";
+			reg = <0x20028000 DT_SIZE_K(96)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x20028000 0x18000>;
+		};
+	};
+};
+
+&uart30 {
+	status = "reserved";
+};
+
+&cpuapp_sram {
+	reg = <0x20000000 DT_SIZE_K(160)>;
+	ranges = <0x0 0x20000000 0x28000>;
+};
+
+&cpuflpr_vpr {
+	execution-memory = <&cpuflpr_sram_code_data>;
+	source-memory = <&cpuflpr_code_partition>;
+};
+
+&cpuapp_vevif_tx {
+	status = "okay";
+};
diff --git a/snippets/nordic-flpr/snippet.yml b/snippets/nordic-flpr/snippet.yml
index 17f99b8400f..55bc247ea55 100644
--- a/snippets/nordic-flpr/snippet.yml
+++ b/snippets/nordic-flpr/snippet.yml
@@ -3,6 +3,9 @@ append:
   EXTRA_DTC_OVERLAY_FILE: nordic-flpr.overlay
 
 boards:
+  nrf54l15pdk/nrf54l15/cpuapp:
+    append:
+      EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
   nrf54l15dk/nrf54l15/cpuapp:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/tests/boot/with_mcumgr/testcase.yaml b/tests/boot/with_mcumgr/testcase.yaml
index 0500bbaddf5..37e7d91ffaf 100644
--- a/tests/boot/with_mcumgr/testcase.yaml
+++ b/tests/boot/with_mcumgr/testcase.yaml
@@ -4,6 +4,7 @@ common:
     - nrf52840dk/nrf52840
     - nrf5340dk/nrf5340/cpuapp
     - nrf54l15dk/nrf54l15/cpuapp
+    - nrf54l15pdk/nrf54l15/cpuapp
     - nrf9160dk/nrf9160
     - nucleo_wba55cg
   integration_platforms:
diff --git a/tests/drivers/adc/adc_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/adc/adc_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..a7252902a0c
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,43 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc 0>, <&adc 1> , <&adc 2>;
+	};
+};
+
+&adc {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
+		zephyr,input-positive = <NRF_SAADC_AIN1>;
+		zephyr,resolution = <10>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1_4";
+		zephyr,reference = "ADC_REF_EXTERNAL0";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN4>;
+		zephyr,resolution = <12>;
+	};
+
+	channel@2 {
+		reg = <2>;
+		zephyr,gain = "ADC_GAIN_2_5";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
+		zephyr,input-positive = <NRF_SAADC_AIN2>;
+		zephyr,resolution = <10>;
+	};
+};
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..8eb1b3c9f9f
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	resources {
+		compatible = "test-gpio-basic-api";
+		out-gpios = <&gpio1 10 0>;
+		in-gpios = <&gpio1 11 0>;
+	};
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
new file mode 100644
index 00000000000..8eb1b3c9f9f
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	resources {
+		compatible = "test-gpio-basic-api";
+		out-gpios = <&gpio1 10 0>;
+		in-gpios = <&gpio1 11 0>;
+	};
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
new file mode 100644
index 00000000000..8eb1b3c9f9f
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	resources {
+		compatible = "test-gpio-basic-api";
+		out-gpios = <&gpio1 10 0>;
+		in-gpios = <&gpio1 11 0>;
+	};
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
diff --git a/tests/drivers/i2s/i2s_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/i2s/i2s_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..8b82825a0f2
--- /dev/null
+++ b/tests/drivers/i2s/i2s_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* i2s-node0 is the transmitter/receiver */
+
+/ {
+	aliases {
+		i2s-node0 = &i2s20;
+	};
+};
+
+&pinctrl {
+	i2s20_default_alt: i2s20_default_alt {
+		group1 {
+			psels = <NRF_PSEL(I2S_SCK_M, 1, 11)>,
+				<NRF_PSEL(I2S_LRCK_M, 1, 12)>,
+				<NRF_PSEL(I2S_SDOUT, 1, 8)>,
+				<NRF_PSEL(I2S_SDIN, 1, 9)>;
+		};
+	};
+};
+
+&i2s20 {
+	status = "okay";
+	pinctrl-0 = <&i2s20_default_alt>;
+	pinctrl-names = "default";
+};
diff --git a/tests/drivers/i2s/i2s_speed/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/i2s/i2s_speed/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..8b82825a0f2
--- /dev/null
+++ b/tests/drivers/i2s/i2s_speed/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* i2s-node0 is the transmitter/receiver */
+
+/ {
+	aliases {
+		i2s-node0 = &i2s20;
+	};
+};
+
+&pinctrl {
+	i2s20_default_alt: i2s20_default_alt {
+		group1 {
+			psels = <NRF_PSEL(I2S_SCK_M, 1, 11)>,
+				<NRF_PSEL(I2S_LRCK_M, 1, 12)>,
+				<NRF_PSEL(I2S_SDOUT, 1, 8)>,
+				<NRF_PSEL(I2S_SDIN, 1, 9)>;
+		};
+	};
+};
+
+&i2s20 {
+	status = "okay";
+	pinctrl-0 = <&i2s20_default_alt>;
+	pinctrl-names = "default";
+};
diff --git a/tests/drivers/mbox/mbox_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/mbox/mbox_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..182d7324b6b
--- /dev/null
+++ b/tests/drivers/mbox/mbox_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&cpuapp_vevif_tx 16>, <&cpuapp_vevif_tx 32>,
+				 <&cpuapp_vevif_rx 15>, <&cpuapp_vevif_rx 32>;
+		mbox-names = "remote_valid", "remote_incorrect",
+					 "local_valid", "local_incorrect";
+
+	};
+};
+
+&cpuapp_vevif_rx {
+	status = "okay";
+};
+
+&cpuapp_vevif_tx {
+	status = "okay";
+};
diff --git a/tests/drivers/mbox/mbox_error_cases/sample.yaml b/tests/drivers/mbox/mbox_error_cases/sample.yaml
index 2025564e9a0..c6183d32d4f 100644
--- a/tests/drivers/mbox/mbox_error_cases/sample.yaml
+++ b/tests/drivers/mbox/mbox_error_cases/sample.yaml
@@ -15,6 +15,7 @@ tests:
   tests.drivers.mbox_error_cases.nrf54l:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     extra_args: SNIPPET=nordic-flpr
diff --git a/tests/drivers/pwm/pwm_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/pwm/pwm_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..013653617e4
--- /dev/null
+++ b/tests/drivers/pwm/pwm_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,20 @@
+&pinctrl {
+	pwm_default: pwm_default {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 1, 8)>;
+		};
+	};
+	pwm_sleep: pwm_sleep {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 1, 8)>;
+			low-power-enable;
+		};
+	};
+};
+
+&pwm20 {
+	status = "okay";
+	pinctrl-0 = <&pwm_default>;
+	pinctrl-1 = <&pwm_sleep>;
+	pinctrl-names = "default", "sleep";
+};
diff --git a/tests/drivers/sensor/temp_sensor/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/sensor/temp_sensor/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..435e4f4a6cc
--- /dev/null
+++ b/tests/drivers/sensor/temp_sensor/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,3 @@
+temp_sensor: &temp {
+	status = "okay";
+};
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..033aab401ac
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	uart21_default: uart21_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>;
+		};
+	};
+
+	uart21_sleep: uart21_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>;
+			low-power-enable;
+		};
+	};
+};
+
+/ {
+	chosen {
+		zephyr,console = &uart20;
+	};
+};
+
+dut: &uart21 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart21_default>;
+	pinctrl-1 = <&uart21_sleep>;
+	pinctrl-names = "default", "sleep";
+};
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
new file mode 100644
index 00000000000..1b4f1c8f71e
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	uart21_default: uart21_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>;
+		};
+	};
+
+	uart21_sleep: uart21_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>;
+			low-power-enable;
+		};
+	};
+};
+
+dut: &uart21 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart21_default>;
+	pinctrl-1 = <&uart21_sleep>;
+	pinctrl-names = "default", "sleep";
+};
diff --git a/tests/drivers/uart/uart_errors/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_errors/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..babbc740133
--- /dev/null
+++ b/tests/drivers/uart/uart_errors/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,54 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&pinctrl {
+	uart21_default: uart21_default {
+		group1 {
+			psels = <NRF_PSEL(UART_RX, 1, 8)>,
+				<NRF_PSEL(UART_RTS, 1, 10)>;
+		};
+	};
+
+	uart21_sleep: uart21_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_RX, 1, 8)>,
+				<NRF_PSEL(UART_RTS, 1, 10)>;
+			low-power-enable;
+		};
+	};
+
+	uart22_default: uart22_default {
+		group1 {
+			psels =
+				<NRF_PSEL(UART_CTS, 1, 11)>;
+				bias-pull-up;
+		};
+		group2 {
+			psels = <NRF_PSEL(UART_TX, 1, 9)>;
+		};
+	};
+
+	uart22_sleep: uart22_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 9)>,
+				<NRF_PSEL(UART_CTS, 1, 11)>;
+			low-power-enable;
+		};
+	};
+};
+
+dut: &uart21 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart21_default>;
+	pinctrl-1 = <&uart21_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+dut_aux: &uart22 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart22_default>;
+	pinctrl-1 = <&uart22_sleep>;
+	pinctrl-names = "default", "sleep";
+	disable-rx;
+};
diff --git a/tests/lib/cpp/cxx/testcase.yaml b/tests/lib/cpp/cxx/testcase.yaml
index bd14285146d..642a2ed984d 100644
--- a/tests/lib/cpp/cxx/testcase.yaml
+++ b/tests/lib/cpp/cxx/testcase.yaml
@@ -37,6 +37,7 @@ tests:
     # Exclude nRF54L15, nRF54H20 and nRF9280 as Nordic HAL is not compatible with C++98.
     # Exclude CONFIG_HAS_RENESAS_RA_FSP as Renesas RA HAL is not compatible with C++98.
     platform_exclude:
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
diff --git a/tests/subsys/fs/fcb/testcase.yaml b/tests/subsys/fs/fcb/testcase.yaml
index 315d3105e8f..5ec3bbf2a19 100644
--- a/tests/subsys/fs/fcb/testcase.yaml
+++ b/tests/subsys/fs/fcb/testcase.yaml
@@ -15,6 +15,7 @@ tests:
   filesystem.fcb.no_erase:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
   filesystem.fcb.native_sim.no_erase:
     extra_args: CONFIG_FLASH_SIMULATOR_EXPLICIT_ERASE=n
     platform_allow: native_sim
diff --git a/tests/subsys/fs/littlefs/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/subsys/fs/littlefs/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..292e98c96a0
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &slot0_ns_partition;
+/delete-node/ &slot1_partition;
+/delete-node/ &slot1_ns_partition;
+
+&cpuapp_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		small_partition: partition@67000 {
+			label = "small";
+			reg = <0x00067000 0x00010000>;
+		};
+	};
+};
diff --git a/tests/subsys/fs/littlefs/testcase.yaml b/tests/subsys/fs/littlefs/testcase.yaml
index bacc696844a..49f19492ab4 100644
--- a/tests/subsys/fs/littlefs/testcase.yaml
+++ b/tests/subsys/fs/littlefs/testcase.yaml
@@ -15,7 +15,7 @@ common:
 tests:
   filesystem.littlefs.default:
     timeout: 60
-    platform_allow: nrf54l15dk/nrf54l15/cpuapp
+    platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
   filesystem.littlefs.custom:
     timeout: 180
     extra_configs:
diff --git a/tests/subsys/storage/stream/stream_flash/testcase.yaml b/tests/subsys/storage/stream/stream_flash/testcase.yaml
index b623b64e04b..9d42d9c3182 100644
--- a/tests/subsys/storage/stream/stream_flash/testcase.yaml
+++ b/tests/subsys/storage/stream/stream_flash/testcase.yaml
@@ -22,6 +22,7 @@ tests:
   storage.stream_flash.no_explicit_erase:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
   storage.stream_flash.dword_wbs:
     extra_args: DTC_OVERLAY_FILE=unaligned_flush.overlay
     tags: stream_flash

From 86a9980285e7092b529d139366aaf41d03e82f43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:27 +0100
Subject: [PATCH 1409/2913] Revert "[nrf fromtree] modules: hal_nordic: Add
 nrfx configuration for nRF54L15 FP1"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fc2f7fb645ca2fa4581f70821eb3798e4d78baf4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/nrfx/nrfx_config.h         |    8 +-
 .../nrfx/nrfx_config_nrf54l15_application.h   | 1643 ----------------
 .../nrfx/nrfx_config_nrf54l15_flpr.h          | 1652 -----------------
 3 files changed, 2 insertions(+), 3301 deletions(-)
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h

diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index 3c91aae6de6..d0d3a671ae2 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -1129,14 +1129,10 @@
     #include <nrfx_config_nrf54h20_ppr.h>
 #elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_FLPR)
     #include <nrfx_config_nrf54h20_flpr.h>
-#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_APPLICATION)
+#elif (defined(NRF54L15_XXAA) || defined(NRF54L15_ENGA_XXAA)) && defined(NRF_APPLICATION)
     #include <nrfx_config_nrf54l15_enga_application.h>
-#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_FLPR)
+#elif (defined(NRF54L15_XXAA) || defined(NRF54L15_ENGA_XXAA)) && defined(NRF_FLPR)
     #include <nrfx_config_nrf54l15_enga_flpr.h>
-#elif defined(NRF54L15_XXAA) && defined(NRF_APPLICATION)
-    #include <nrfx_config_nrf54l15_application.h>
-#elif defined(NRF54L15_XXAA) && defined(NRF_FLPR)
-    #include <nrfx_config_nrf54l15_flpr.h>
 #elif (defined(NRF54L20_XXAA) || defined(NRF54L20_ENGA_XXAA)) && defined(NRF_APPLICATION)
     #include <nrfx_config_nrf54l20_enga_application.h>
 #elif defined(NRF9120_XXAA) || defined(NRF9160_XXAA)
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h
deleted file mode 100644
index e423c8b515d..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h
+++ /dev/null
@@ -1,1643 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54L15_APPLICATION_H__
-#define NRFX_CONFIG_NRF54L15_APPLICATION_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU10_ENABLED
-#define NRFX_EGU10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU20_ENABLED
-#define NRFX_EGU20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE20_ENABLED
-#define NRFX_GPIOTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE30_ENABLED
-#define NRFX_GPIOTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 8
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x00000f0f
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S20_ENABLED
-#define NRFX_I2S20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM20_ENABLED
-#define NRFX_PDM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM21_ENABLED
-#define NRFX_PDM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM20_ENABLED
-#define NRFX_PWM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM21_ENABLED
-#define NRFX_PWM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM22_ENABLED
-#define NRFX_PWM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC20_ENABLED
-#define NRFX_QDEC20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC21_ENABLED
-#define NRFX_QDEC21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_ENABLED
-#define NRFX_RRAMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
-#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
-#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC10_ENABLED
-#define NRFX_RTC10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC30_ENABLED
-#define NRFX_RTC30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM00_ENABLED
-#define NRFX_SPIM00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM20_ENABLED
-#define NRFX_SPIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM21_ENABLED
-#define NRFX_SPIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM22_ENABLED
-#define NRFX_SPIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM30_ENABLED
-#define NRFX_SPIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS00_ENABLED
-#define NRFX_SPIS00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS20_ENABLED
-#define NRFX_SPIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS21_ENABLED
-#define NRFX_SPIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS22_ENABLED
-#define NRFX_SPIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS30_ENABLED
-#define NRFX_SPIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER00_ENABLED
-#define NRFX_TIMER00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER10_ENABLED
-#define NRFX_TIMER10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER20_ENABLED
-#define NRFX_TIMER20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER21_ENABLED
-#define NRFX_TIMER21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER22_ENABLED
-#define NRFX_TIMER22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER23_ENABLED
-#define NRFX_TIMER23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER24_ENABLED
-#define NRFX_TIMER24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM20_ENABLED
-#define NRFX_TWIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM21_ENABLED
-#define NRFX_TWIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM22_ENABLED
-#define NRFX_TWIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM30_ENABLED
-#define NRFX_TWIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
- *        Assume that any instance would be initialized only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS20_ENABLED
-#define NRFX_TWIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS21_ENABLED
-#define NRFX_TWIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS22_ENABLED
-#define NRFX_TWIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS30_ENABLED
-#define NRFX_TWIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
- *        If enabled, support for configuring GPIO pins is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
- *        If enabled, support for configuring PSEL registers is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE00_ENABLED
-#define NRFX_UARTE00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE20_ENABLED
-#define NRFX_UARTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE21_ENABLED
-#define NRFX_UARTE21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE22_ENABLED
-#define NRFX_UARTE22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE30_ENABLED
-#define NRFX_UARTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT30_ENABLED
-#define NRFX_WDT30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT31_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT31_ENABLED
-#define NRFX_WDT31_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54L15_APPLICATION_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h
deleted file mode 100644
index a036f8c0a26..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h
+++ /dev/null
@@ -1,1652 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54L15_FLPR_H__
-#define NRFX_CONFIG_NRF54L15_FLPR_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COREDEP_VPR_LEGACY
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COREDEP_VPR_LEGACY
-#define NRFX_COREDEP_VPR_LEGACY 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU10_ENABLED
-#define NRFX_EGU10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU20_ENABLED
-#define NRFX_EGU20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE20_ENABLED
-#define NRFX_GPIOTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE30_ENABLED
-#define NRFX_GPIOTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 4
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x000000f0
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S20_ENABLED
-#define NRFX_I2S20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM20_ENABLED
-#define NRFX_PDM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM21_ENABLED
-#define NRFX_PDM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM20_ENABLED
-#define NRFX_PWM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM21_ENABLED
-#define NRFX_PWM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM22_ENABLED
-#define NRFX_PWM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC20_ENABLED
-#define NRFX_QDEC20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC21_ENABLED
-#define NRFX_QDEC21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_ENABLED
-#define NRFX_RRAMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
-#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
-#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC10_ENABLED
-#define NRFX_RTC10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC30_ENABLED
-#define NRFX_RTC30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM00_ENABLED
-#define NRFX_SPIM00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM20_ENABLED
-#define NRFX_SPIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM21_ENABLED
-#define NRFX_SPIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM22_ENABLED
-#define NRFX_SPIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM30_ENABLED
-#define NRFX_SPIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS00_ENABLED
-#define NRFX_SPIS00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS20_ENABLED
-#define NRFX_SPIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS21_ENABLED
-#define NRFX_SPIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS22_ENABLED
-#define NRFX_SPIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS30_ENABLED
-#define NRFX_SPIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER00_ENABLED
-#define NRFX_TIMER00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER10_ENABLED
-#define NRFX_TIMER10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER20_ENABLED
-#define NRFX_TIMER20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER21_ENABLED
-#define NRFX_TIMER21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER22_ENABLED
-#define NRFX_TIMER22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER23_ENABLED
-#define NRFX_TIMER23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER24_ENABLED
-#define NRFX_TIMER24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM20_ENABLED
-#define NRFX_TWIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM21_ENABLED
-#define NRFX_TWIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM22_ENABLED
-#define NRFX_TWIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM30_ENABLED
-#define NRFX_TWIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
- *        Assume that any instance would be initialized only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS20_ENABLED
-#define NRFX_TWIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS21_ENABLED
-#define NRFX_TWIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS22_ENABLED
-#define NRFX_TWIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS30_ENABLED
-#define NRFX_TWIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
- *        If enabled, support for configuring GPIO pins is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
- *        If enabled, support for configuring PSEL registers is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE00_ENABLED
-#define NRFX_UARTE00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE20_ENABLED
-#define NRFX_UARTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE21_ENABLED
-#define NRFX_UARTE21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE22_ENABLED
-#define NRFX_UARTE22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE30_ENABLED
-#define NRFX_UARTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_VEVIF_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_VEVIF_ENABLED
-#define NRFX_VEVIF_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT30_ENABLED
-#define NRFX_WDT30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT31_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT31_ENABLED
-#define NRFX_WDT31_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54L15_FLPR_H__ */

From e953494207c29616f21150a97f7b9121ced335c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:27 +0100
Subject: [PATCH 1410/2913] Revert "[nrf fromtree] boards: Set full_name for
 all boards"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fc2f0301cd28a1bceed299a88d4a82bfb69d8ff2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/01space/esp32c3_042_oled/board.yml              | 1 -
 boards/96boards/aerocore2/board.yml                    | 1 -
 boards/96boards/argonkey/board.yml                     | 1 -
 boards/96boards/avenger96/board.yml                    | 1 -
 boards/96boards/carbon/board.yml                       | 1 -
 boards/96boards/meerkat96/board.yml                    | 1 -
 boards/96boards/neonkey/board.yml                      | 1 -
 boards/96boards/nitrogen/board.yml                     | 1 -
 boards/96boards/stm32_sensor_mez/board.yml             | 1 -
 boards/96boards/wistrio/board.yml                      | 1 -
 boards/aconno/acn52832/board.yml                       | 1 -
 boards/acrn/acrn/board.yml                             | 2 --
 boards/actinius/icarus/board.yml                       | 1 -
 boards/actinius/icarus_bee/board.yml                   | 1 -
 boards/actinius/icarus_som/board.yml                   | 1 -
 boards/actinius/icarus_som_dk/board.yml                | 1 -
 boards/adafruit/feather_m0_basic_proto/board.yml       | 1 -
 boards/adafruit/feather_m0_lora/board.yml              | 1 -
 boards/adafruit/feather_nrf52840/board.yml             | 1 -
 boards/adafruit/feather_stm32f405/board.yml            | 1 -
 boards/adafruit/grand_central_m4_express/board.yml     | 1 -
 boards/adafruit/itsybitsy/board.yml                    | 1 -
 boards/adafruit/itsybitsy_m4_express/board.yml         | 1 -
 boards/adafruit/kb2040/board.yml                       | 1 -
 boards/adafruit/nrf52_adafruit_feather/board.yml       | 1 -
 boards/adafruit/qt_py_rp2040/board.yml                 | 1 -
 boards/adafruit/trinket_m0/board.yml                   | 1 -
 boards/adi/apard32690/board.yml                        | 1 -
 boards/adi/eval_adin1110ebz/board.yml                  | 1 -
 boards/adi/eval_adin2111ebz/board.yml                  | 1 -
 boards/adi/max32655evkit/board.yml                     | 1 -
 boards/adi/max32655fthr/board.yml                      | 1 -
 boards/adi/max32662evkit/board.yml                     | 1 -
 boards/adi/max32666evkit/board.yml                     | 1 -
 boards/adi/max32666fthr/board.yml                      | 1 -
 boards/adi/max32670evkit/board.yml                     | 1 -
 boards/adi/max32672evkit/board.yml                     | 1 -
 boards/adi/max32672fthr/board.yml                      | 1 -
 boards/adi/max32675evkit/board.yml                     | 1 -
 boards/adi/max32680evkit/board.yml                     | 1 -
 boards/adi/max32690evkit/board.yml                     | 1 -
 boards/adi/max32690fthr/board.yml                      | 1 -
 boards/adi/sdp_k1/board.yml                            | 1 -
 boards/alientek/pandora_stm32l475/board.yml            | 1 -
 boards/altr/max10/board.yml                            | 1 -
 boards/ambiq/apollo3_evb/board.yml                     | 1 -
 boards/ambiq/apollo3p_evb/board.yml                    | 1 -
 boards/ambiq/apollo4p_blue_kxr_evb/board.yml           | 1 -
 boards/ambiq/apollo4p_evb/board.yml                    | 1 -
 boards/amd/kv260_r5/board.yml                          | 1 -
 boards/andestech/adp_xc7k_ae350/board.yml              | 1 -
 boards/arduino/due/board.yml                           | 1 -
 boards/arduino/giga_r1/board.yml                       | 1 -
 boards/arduino/mkrzero/board.yml                       | 1 -
 boards/arduino/nano_33_ble/board.yml                   | 1 -
 boards/arduino/nano_33_iot/board.yml                   | 1 -
 boards/arduino/nicla_sense_me/board.yml                | 1 -
 boards/arduino/nicla_vision/board.yml                  | 1 -
 boards/arduino/opta/board.yml                          | 1 -
 boards/arduino/portenta_h7/board.yml                   | 1 -
 boards/arduino/uno_r4/board.yml                        | 2 --
 boards/arduino/zero/board.yml                          | 1 -
 boards/arm/fvp_base_revc_2xaemv8a/board.yml            | 1 -
 boards/arm/fvp_baser_aemv8r/board.yml                  | 1 -
 boards/arm/mps2/board.yml                              | 1 -
 boards/arm/mps3/board.yml                              | 1 -
 boards/arm/v2m_beetle/board.yml                        | 1 -
 boards/arm/v2m_musca_b1/board.yml                      | 1 -
 boards/arm/v2m_musca_s1/board.yml                      | 1 -
 boards/aspeed/ast1030_evb/board.yml                    | 1 -
 boards/atmarktechno/degu_evk/board.yml                 | 1 -
 boards/atmel/sam/sam4e_xpro/board.yml                  | 1 -
 boards/atmel/sam/sam4l_ek/board.yml                    | 1 -
 boards/atmel/sam/sam4s_xplained/board.yml              | 1 -
 boards/atmel/sam/sam_e70_xplained/board.yml            | 1 -
 boards/atmel/sam/sam_v71_xult/board.yml                | 1 -
 boards/atmel/sam0/samc21n_xpro/board.yml               | 1 -
 boards/atmel/sam0/samd20_xpro/board.yml                | 1 -
 boards/atmel/sam0/samd21_xpro/board.yml                | 1 -
 boards/atmel/sam0/same54_xpro/board.yml                | 1 -
 boards/atmel/sam0/saml21_xpro/board.yml                | 1 -
 boards/atmel/sam0/samr21_xpro/board.yml                | 1 -
 boards/atmel/sam0/samr34_xpro/board.yml                | 1 -
 boards/bbc/microbit/board.yml                          | 1 -
 boards/bbc/microbit_v2/board.yml                       | 1 -
 boards/bcdevices/plt_demo_v2/board.yml                 | 1 -
 boards/beagle/beagleconnect_freedom/board.yml          | 1 -
 boards/beagle/beagleplay/board.yml                     | 1 -
 boards/beagle/beaglev_fire/board.yml                   | 1 -
 boards/blues/swan_r5/board.yml                         | 1 -
 boards/brcm/bcm958401m2/board.yml                      | 1 -
 boards/brcm/bcm958402m2/board.yml                      | 1 -
 boards/bytesatwork/bytesensi_l/board.yml               | 1 -
 boards/cdns/xt-sim/board.yml                           | 1 -
 boards/circuitdojo/feather/board.yml                   | 1 -
 boards/contextualelectronics/abc/board.yml             | 1 -
 boards/croxel/croxel_cx1825/board.yml                  | 1 -
 boards/ct/ctcc/board.yml                               | 1 -
 boards/cypress/cy8ckit_062_ble/board.yml               | 1 -
 boards/cypress/cy8ckit_062_wifi_bt/board.yml           | 1 -
 boards/digilent/arty_a7/board.yml                      | 1 -
 boards/digilent/zybo/board.yml                         | 1 -
 boards/dptechnics/walter/board.yml                     | 1 -
 boards/dragino/lsn50/board.yml                         | 1 -
 boards/dragino/nbsn95/board.yml                        | 1 -
 boards/ebyte/e73_tbb/board.yml                         | 1 -
 boards/efinix/titanium_ti60_f225/board.yml             | 1 -
 boards/electronut/nrf52840_blip/board.yml              | 1 -
 boards/electronut/nrf52840_papyr/board.yml             | 1 -
 boards/element14/warp7/board.yml                       | 1 -
 boards/enclustra/mercury_xu/board.yml                  | 1 -
 boards/ene/kb1200_evb/board.yml                        | 1 -
 boards/enjoydigital/litex_vexriscv/board.yml           | 1 -
 boards/espressif/esp32_devkitc_wroom/board.yml         | 1 -
 boards/espressif/esp32_devkitc_wrover/board.yml        | 1 -
 boards/espressif/esp32_ethernet_kit/board.yml          | 1 -
 boards/espressif/esp32c3_devkitc/board.yml             | 1 -
 boards/espressif/esp32c3_devkitm/board.yml             | 1 -
 boards/espressif/esp32c3_rust/board.yml                | 1 -
 boards/espressif/esp32c6_devkitc/board.yml             | 1 -
 boards/espressif/esp32s2_devkitc/board.yml             | 1 -
 boards/espressif/esp32s2_saola/board.yml               | 1 -
 boards/espressif/esp32s3_devkitc/board.yml             | 1 -
 boards/espressif/esp32s3_devkitm/board.yml             | 1 -
 boards/espressif/esp32s3_eye/board.yml                 | 1 -
 boards/espressif/esp8684_devkitm/board.yml             | 1 -
 boards/espressif/esp_wrover_kit/board.yml              | 1 -
 boards/ezurio/bl5340_dvk/board.yml                     | 1 -
 boards/ezurio/bl652_dvk/board.yml                      | 1 -
 boards/ezurio/bl653_dvk/board.yml                      | 1 -
 boards/ezurio/bl654_dvk/board.yml                      | 1 -
 boards/ezurio/bl654_sensor_board/board.yml             | 1 -
 boards/ezurio/bl654_usb/board.yml                      | 1 -
 boards/ezurio/bt510/board.yml                          | 1 -
 boards/ezurio/bt610/board.yml                          | 1 -
 boards/ezurio/mg100/board.yml                          | 1 -
 boards/ezurio/pinnacle_100_dvk/board.yml               | 1 -
 boards/ezurio/rm1xx_dvk/board.yml                      | 1 -
 boards/fanke/fk7b0m1_vbt6/board.yml                    | 1 -
 boards/firefly/roc_rk3568_pc/board.yml                 | 1 -
 boards/franzininho/esp32s2_franzininho/board.yml       | 1 -
 boards/gaisler/generic_leon3/board.yml                 | 1 -
 boards/gaisler/gr716a_mini/board.yml                   | 1 -
 boards/gd/gd32a503v_eval/board.yml                     | 1 -
 boards/gd/gd32e103v_eval/board.yml                     | 1 -
 boards/gd/gd32e507v_start/board.yml                    | 1 -
 boards/gd/gd32e507z_eval/board.yml                     | 1 -
 boards/gd/gd32f350r_eval/board.yml                     | 1 -
 boards/gd/gd32f403z_eval/board.yml                     | 1 -
 boards/gd/gd32f407v_start/board.yml                    | 1 -
 boards/gd/gd32f450i_eval/board.yml                     | 1 -
 boards/gd/gd32f450v_start/board.yml                    | 1 -
 boards/gd/gd32f450z_eval/board.yml                     | 1 -
 boards/gd/gd32f470i_eval/board.yml                     | 1 -
 boards/gd/gd32l233r_eval/board.yml                     | 1 -
 boards/gd/gd32vf103c_starter/board.yml                 | 1 -
 boards/gd/gd32vf103v_eval/board.yml                    | 1 -
 boards/google/dragonclaw/board.yml                     | 1 -
 boards/google/twinkie_v2/board.yml                     | 1 -
 boards/hardkernel/odroid_go/board.yml                  | 1 -
 boards/heltec/heltec_wifi_lora32_v2/board.yml          | 1 -
 boards/heltec/heltec_wireless_stick_lite_v3/board.yml  | 1 -
 boards/holyiot/yj16019/board.yml                       | 1 -
 boards/infineon/cy8ckit_062s4/board.yml                | 1 -
 boards/infineon/cy8cproto_062_4343w/board.yml          | 1 -
 boards/infineon/cy8cproto_063_ble/board.yml            | 1 -
 boards/infineon/cyw920829m2evk_02/board.yml            | 1 -
 boards/infineon/xmc45_relax_kit/board.yml              | 1 -
 boards/infineon/xmc47_relax_kit/board.yml              | 1 -
 boards/innblue/innblue21/board.yml                     | 1 -
 boards/innblue/innblue22/board.yml                     | 1 -
 boards/intel/adl/board.yml                             | 2 --
 boards/intel/adsp/board.yml                            | 1 -
 boards/intel/ehl/board.yml                             | 1 -
 boards/intel/ish/board.yml                             | 3 ---
 boards/intel/niosv_g/board.yml                         | 1 -
 boards/intel/niosv_m/board.yml                         | 1 -
 boards/intel/rpl/board.yml                             | 2 --
 boards/intel/socfpga/agilex5_socdk/board.yml           | 1 -
 boards/intel/socfpga/agilex_socdk/board.yml            | 1 -
 boards/intel/socfpga_std/cyclonev_socdk/board.yml      | 1 -
 boards/ite/it82xx2_evb/board.yml                       | 1 -
 boards/ite/it8xxx2_evb/board.yml                       | 1 -
 boards/khadas/edgev/board.yml                          | 1 -
 boards/kincony/kincony_kc868_a32/board.yml             | 1 -
 boards/lilygo/ttgo_lora32/board.yml                    | 1 -
 boards/lilygo/ttgo_t8c3/board.yml                      | 1 -
 boards/lowrisc/opentitan_earlgrey/board.yml            | 1 -
 boards/luatos/esp32c3_luatos_core/board.yml            | 1 -
 boards/luatos/esp32s3_luatos_core/board.yml            | 1 -
 boards/m5stack/m5stack_atom_lite/board.yml             | 1 -
 boards/m5stack/m5stack_atoms3/board.yml                | 1 -
 boards/m5stack/m5stack_atoms3_lite/board.yml           | 1 -
 boards/m5stack/m5stack_core2/board.yml                 | 1 -
 boards/m5stack/m5stack_stamps3/board.yml               | 1 -
 boards/m5stack/m5stickc_plus/board.yml                 | 1 -
 boards/m5stack/stamp_c3/board.yml                      | 1 -
 boards/madmachine/mm_feather/board.yml                 | 1 -
 boards/madmachine/mm_swiftio/board.yml                 | 1 -
 boards/makerdiary/nrf52832_mdk/board.yml               | 1 -
 boards/makerdiary/nrf52840_mdk/board.yml               | 1 -
 boards/makerdiary/nrf52840_mdk_usb_dongle/board.yml    | 1 -
 boards/mediatek/mt8195_adsp/board.yml                  | 1 -
 boards/microchip/ev11l78a/board.yml                    | 1 -
 boards/microchip/m2gl025_miv/board.yml                 | 1 -
 boards/microchip/mec1501modular_assy6885/board.yml     | 1 -
 boards/microchip/mec15xxevb_assy6853/board.yml         | 1 -
 boards/microchip/mec172xevb_assy6906/board.yml         | 1 -
 boards/microchip/mec172xmodular_assy6930/board.yml     | 1 -
 boards/microchip/mpfs_icicle/board.yml                 | 1 -
 boards/mikroe/clicker_2/board.yml                      | 1 -
 boards/mikroe/clicker_ra4m1/board.yml                  | 1 -
 boards/mikroe/mini_m4_for_stm32/board.yml              | 1 -
 boards/mikroe/stm32_m4_clicker/board.yml               | 1 -
 boards/mxchip/az3166_iotdevkit/board.yml               | 1 -
 boards/native/native_posix/board.yml                   | 1 -
 boards/native/native_sim/board.yml                     | 1 -
 boards/native/nrf_bsim/board.yml                       | 3 ---
 boards/nordic/nrf21540dk/board.yml                     | 1 -
 boards/nordic/nrf51dk/board.yml                        | 1 -
 boards/nordic/nrf51dongle/board.yml                    | 1 -
 boards/nordic/nrf52833dk/board.yml                     | 1 -
 boards/nordic/nrf52840dk/board.yml                     | 1 -
 boards/nordic/nrf52840dongle/board.yml                 | 1 -
 boards/nordic/nrf52dk/board.yml                        | 1 -
 boards/nordic/nrf5340_audio_dk/board.yml               | 1 -
 boards/nordic/nrf5340dk/board.yml                      | 1 -
 boards/nordic/nrf54h20dk/board.yml                     | 1 -
 boards/nordic/nrf54l15dk/board.yml                     | 1 -
 boards/nordic/nrf54l15pdk/board.yml                    | 1 -
 boards/nordic/nrf54l20pdk/board.yml                    | 1 -
 boards/nordic/nrf7002dk/board.yml                      | 1 -
 boards/nordic/nrf9131ek/board.yml                      | 1 -
 boards/nordic/nrf9151dk/board.yml                      | 1 -
 boards/nordic/nrf9160dk/board.yml                      | 1 -
 boards/nordic/nrf9161dk/board.yml                      | 1 -
 boards/nordic/nrf9280pdk/board.yml                     | 1 -
 boards/nordic/thingy52/board.yml                       | 1 -
 boards/nordic/thingy53/board.yml                       | 1 -
 boards/nuvoton/npcm400_evb/board.yml                   | 1 -
 boards/nuvoton/npcx4m8f_evb/board.yml                  | 1 -
 boards/nuvoton/npcx7m6fb_evb/board.yml                 | 1 -
 boards/nuvoton/npcx9m6f_evb/board.yml                  | 1 -
 boards/nuvoton/numaker_m2l31ki/board.yml               | 1 -
 boards/nuvoton/numaker_pfm_m467/board.yml              | 1 -
 boards/nuvoton/numaker_pfm_m487/board.yml              | 1 -
 boards/nxp/frdm_k22f/board.yml                         | 1 -
 boards/nxp/frdm_k64f/board.yml                         | 1 -
 boards/nxp/frdm_k82f/board.yml                         | 1 -
 boards/nxp/frdm_ke15z/board.yml                        | 1 -
 boards/nxp/frdm_ke17z/board.yml                        | 1 -
 boards/nxp/frdm_ke17z512/board.yml                     | 1 -
 boards/nxp/frdm_kl25z/board.yml                        | 1 -
 boards/nxp/frdm_kw41z/board.yml                        | 1 -
 boards/nxp/frdm_mcxa156/board.yml                      | 1 -
 boards/nxp/frdm_mcxc242/board.yml                      | 1 -
 boards/nxp/frdm_mcxc444/board.yml                      | 1 -
 boards/nxp/frdm_mcxn236/board.yml                      | 1 -
 boards/nxp/frdm_mcxn947/board.yml                      | 1 -
 boards/nxp/frdm_mcxw71/board.yml                       | 1 -
 boards/nxp/frdm_rw612/board.yml                        | 1 -
 boards/nxp/hexiwear/board.yml                          | 1 -
 boards/nxp/imx8mm_evk/board.yml                        | 1 -
 boards/nxp/imx8mn_evk/board.yml                        | 1 -
 boards/nxp/imx8mp_evk/board.yml                        | 1 -
 boards/nxp/imx8mq_evk/board.yml                        | 1 -
 boards/nxp/imx8qm_mek/board.yml                        | 1 -
 boards/nxp/imx8qxp_mek/board.yml                       | 1 -
 boards/nxp/imx8ulp_evk/board.yml                       | 1 -
 boards/nxp/imx93_evk/board.yml                         | 1 -
 boards/nxp/imx95_evk/board.yml                         | 1 -
 boards/nxp/lpcxpresso11u68/board.yml                   | 1 -
 boards/nxp/lpcxpresso51u68/board.yml                   | 1 -
 boards/nxp/lpcxpresso54114/board.yml                   | 1 -
 boards/nxp/lpcxpresso55s06/board.yml                   | 1 -
 boards/nxp/lpcxpresso55s16/board.yml                   | 1 -
 boards/nxp/lpcxpresso55s28/board.yml                   | 1 -
 boards/nxp/lpcxpresso55s36/board.yml                   | 1 -
 boards/nxp/lpcxpresso55s69/board.yml                   | 1 -
 boards/nxp/ls1046ardb/board.yml                        | 1 -
 boards/nxp/mimxrt1010_evk/board.yml                    | 1 -
 boards/nxp/mimxrt1015_evk/board.yml                    | 1 -
 boards/nxp/mimxrt1020_evk/board.yml                    | 1 -
 boards/nxp/mimxrt1024_evk/board.yml                    | 1 -
 boards/nxp/mimxrt1040_evk/board.yml                    | 1 -
 boards/nxp/mimxrt1050_evk/board.yml                    | 1 -
 boards/nxp/mimxrt1060_evk/board.yml                    | 2 --
 boards/nxp/mimxrt1062_fmurt6/board.yml                 | 1 -
 boards/nxp/mimxrt1064_evk/board.yml                    | 1 -
 boards/nxp/mimxrt1160_evk/board.yml                    | 1 -
 boards/nxp/mimxrt1170_evk/board.yml                    | 1 -
 boards/nxp/mimxrt1180_evk/board.yml                    | 1 -
 boards/nxp/mimxrt595_evk/board.yml                     | 1 -
 boards/nxp/mimxrt685_evk/board.yml                     | 1 -
 boards/nxp/mr_canhubk3/board.yml                       | 1 -
 boards/nxp/rd_rw612_bga/board.yml                      | 1 -
 boards/nxp/rddrone_fmuk66/board.yml                    | 1 -
 boards/nxp/s32z2xxdc2/board.yml                        | 1 -
 boards/nxp/twr_ke18f/board.yml                         | 1 -
 boards/nxp/twr_kv58f220m/board.yml                     | 1 -
 boards/nxp/ucans32k1sic/board.yml                      | 1 -
 boards/nxp/usb_kw24d512/board.yml                      | 1 -
 boards/nxp/vmu_rt1170/board.yml                        | 1 -
 boards/olimex/lora_stm32wl_devkit/board.yml            | 1 -
 boards/olimex/olimex_esp32_evb/board.yml               | 1 -
 boards/olimex/olimexino_stm32/board.yml                | 1 -
 boards/olimex/stm32_e407/board.yml                     | 1 -
 boards/olimex/stm32_h103/board.yml                     | 1 -
 boards/olimex/stm32_h405/board.yml                     | 1 -
 boards/olimex/stm32_h407/board.yml                     | 1 -
 boards/olimex/stm32_p405/board.yml                     | 1 -
 boards/openisa/rv32m1_vega/board.yml                   | 1 -
 boards/others/black_f407ve/board.yml                   | 1 -
 boards/others/black_f407zg_pro/board.yml               | 1 -
 boards/others/icev_wireless/board.yml                  | 1 -
 boards/others/neorv32/board.yml                        | 1 -
 boards/others/serpente/board.yml                       | 1 -
 boards/others/stm32_min_dev/board.yml                  | 1 -
 boards/others/stm32f030_demo/board.yml                 | 1 -
 boards/others/stm32f103_mini/board.yml                 | 1 -
 boards/others/stm32f401_mini/board.yml                 | 1 -
 boards/panasonic/pan1770_evb/board.yml                 | 1 -
 boards/panasonic/pan1780_evb/board.yml                 | 1 -
 boards/panasonic/pan1781_evb/board.yml                 | 1 -
 boards/panasonic/pan1782_evb/board.yml                 | 1 -
 boards/panasonic/pan1783/board.yml                     | 3 ---
 boards/particle/argon/board.yml                        | 1 -
 boards/particle/boron/board.yml                        | 1 -
 boards/particle/nrf51_blenano/board.yml                | 1 -
 boards/particle/nrf52_blenano2/board.yml               | 1 -
 boards/particle/xenon/board.yml                        | 1 -
 boards/phytec/mimx8mm_phyboard_polis/board.yml         | 1 -
 boards/phytec/mimx8mp_phyboard_pollux/board.yml        | 1 -
 boards/phytec/phyboard_electra/board.yml               | 1 -
 boards/phytec/phyboard_lyra/board.yml                  | 1 -
 boards/phytec/reel_board/board.yml                     | 1 -
 boards/pine64/pinetime_devkit0/board.yml               | 1 -
 boards/pjrc/teensy4/board.yml                          | 2 --
 boards/qemu/arc/board.yml                              | 1 -
 boards/qemu/cortex_a53/board.yml                       | 1 -
 boards/qemu/cortex_a9/board.yml                        | 1 -
 boards/qemu/cortex_m0/board.yml                        | 1 -
 boards/qemu/cortex_m3/board.yml                        | 1 -
 boards/qemu/cortex_r5/board.yml                        | 1 -
 boards/qemu/kvm_arm64/board.yml                        | 1 -
 boards/qemu/leon3/board.yml                            | 1 -
 boards/qemu/malta/board.yml                            | 1 -
 boards/qemu/nios2/board.yml                            | 1 -
 boards/qemu/riscv32/board.yml                          | 1 -
 boards/qemu/riscv32_xip/board.yml                      | 1 -
 boards/qemu/riscv32e/board.yml                         | 1 -
 boards/qemu/riscv64/board.yml                          | 1 -
 boards/qemu/x86/board.yml                              | 8 ++++----
 boards/qemu/xtensa/board.yml                           | 1 -
 boards/qorvo/decawave_dwm1001_dev/board.yml            | 1 -
 boards/quicklogic/qomu/board.yml                       | 1 -
 boards/quicklogic/quick_feather/board.yml              | 1 -
 boards/rak/rak11720/board.yml                          | 1 -
 boards/rak/rak4631/board.yml                           | 1 -
 boards/rak/rak5010/board.yml                           | 1 -
 boards/raspberrypi/rpi_4b/board.yml                    | 1 -
 boards/raspberrypi/rpi_5/board.yml                     | 1 -
 boards/raspberrypi/rpi_pico/board.yml                  | 1 -
 boards/raytac/mdbt50q_db_33/board.yml                  | 1 -
 boards/raytac/mdbt50q_db_40/board.yml                  | 1 -
 boards/raytac/mdbt53_db_40/board.yml                   | 1 -
 boards/raytac/mdbt53v_db_40/board.yml                  | 1 -
 boards/renesas/da14695_dk_usb/board.yml                | 1 -
 boards/renesas/da1469x_dk_pro/board.yml                | 1 -
 boards/renesas/ek_ra2a1/board.yml                      | 1 -
 boards/renesas/ek_ra4e2/board.yml                      | 1 -
 boards/renesas/ek_ra4m2/board.yml                      | 1 -
 boards/renesas/ek_ra4m3/board.yml                      | 1 -
 boards/renesas/ek_ra4w1/board.yml                      | 1 -
 boards/renesas/ek_ra6e2/board.yml                      | 1 -
 boards/renesas/ek_ra6m1/board.yml                      | 1 -
 boards/renesas/ek_ra6m2/board.yml                      | 1 -
 boards/renesas/ek_ra6m3/board.yml                      | 1 -
 boards/renesas/ek_ra6m4/board.yml                      | 1 -
 boards/renesas/ek_ra6m5/board.yml                      | 1 -
 boards/renesas/ek_ra8d1/board.yml                      | 1 -
 boards/renesas/ek_ra8m1/board.yml                      | 1 -
 boards/renesas/fpb_ra6e1/board.yml                     | 1 -
 boards/renesas/fpb_ra6e2/board.yml                     | 1 -
 boards/renesas/mck_ra8t1/board.yml                     | 1 -
 boards/renesas/rcar_h3ulcb/board.yml                   | 1 -
 boards/renesas/rcar_salvator_x/board.yml               | 1 -
 boards/renesas/rcar_salvator_xs/board.yml              | 1 -
 boards/renesas/rcar_spider_s4/board.yml                | 1 -
 boards/renesas/rzt2m_starterkit/board.yml              | 1 -
 boards/renode/cortex_r8_virtual/board.yml              | 1 -
 boards/renode/riscv32_virtual/board.yml                | 1 -
 boards/ronoth/lodev/board.yml                          | 1 -
 boards/ruuvi/ruuvitag/board.yml                        | 1 -
 boards/sc/scobc_module1/board.yml                      | 1 -
 boards/seagate/faze/board.yml                          | 1 -
 boards/seagate/legend/board.yml                        | 1 -
 boards/seco/stm32f3_seco_d23/board.yml                 | 1 -
 boards/seeed/lora_e5_dev_board/board.yml               | 1 -
 boards/seeed/lora_e5_mini/board.yml                    | 1 -
 boards/seeed/seeeduino_xiao/board.yml                  | 1 -
 boards/seeed/wio_terminal/board.yml                    | 1 -
 boards/seeed/xiao_ble/board.yml                        | 1 -
 boards/seeed/xiao_esp32c3/board.yml                    | 1 -
 boards/seeed/xiao_esp32s3/board.yml                    | 1 -
 boards/seeed/xiao_rp2040/board.yml                     | 1 -
 boards/segger/ip_k66f/board.yml                        | 1 -
 boards/segger/trb_stm32f407/board.yml                  | 1 -
 boards/sensry/ganymed_bob/board.yml                    | 1 -
 boards/sifive/hifive1/board.yml                        | 1 -
 boards/sifive/hifive_unleashed/board.yml               | 1 -
 boards/sifive/hifive_unmatched/board.yml               | 1 -
 boards/silabs/dev_kits/sim3u1xx_dk/board.yml           | 1 -
 boards/silabs/dev_kits/sltb004a/board.yml              | 1 -
 boards/silabs/dev_kits/sltb009a/board.yml              | 1 -
 boards/silabs/dev_kits/sltb010a/board.yml              | 1 -
 boards/silabs/dev_kits/xg24_dk2601b/board.yml          | 1 -
 boards/silabs/dev_kits/xg27_dk2602a/board.yml          | 1 -
 boards/silabs/radio_boards/slwrb4104a/board.yml        | 1 -
 boards/silabs/radio_boards/slwrb4161a/board.yml        | 1 -
 boards/silabs/radio_boards/slwrb4170a/board.yml        | 1 -
 boards/silabs/radio_boards/slwrb4180a/board.yml        | 1 -
 boards/silabs/radio_boards/slwrb4250b/board.yml        | 1 -
 boards/silabs/radio_boards/slwrb4255a/board.yml        | 1 -
 boards/silabs/radio_boards/slwrb4321a/board.yml        | 1 -
 boards/silabs/radio_boards/xg24_rb4187c/board.yml      | 1 -
 boards/silabs/starter_kits/efm32wg_stk3800/board.yml   | 1 -
 boards/silabs/starter_kits/slstk3400a/board.yml        | 1 -
 boards/silabs/starter_kits/slstk3401a/board.yml        | 1 -
 boards/silabs/starter_kits/slstk3402a/board.yml        | 1 -
 boards/silabs/starter_kits/slstk3701a/board.yml        | 1 -
 boards/sipeed/longan_nano/board.yml                    | 1 -
 boards/snps/em_starterkit/board.yml                    | 1 -
 boards/snps/emsdp/board.yml                            | 1 -
 boards/snps/hsdk/board.yml                             | 1 -
 boards/snps/hsdk4xd/board.yml                          | 1 -
 boards/snps/iotdk/board.yml                            | 1 -
 boards/snps/nsim/arc_classic/board.yml                 | 1 -
 boards/snps/nsim/arc_v/board.yml                       | 1 -
 boards/sparkfun/micromod/board.yml                     | 1 -
 boards/sparkfun/nrf52_sparkfun/board.yml               | 1 -
 boards/sparkfun/pro_micro_rp2040/board.yml             | 1 -
 boards/sparkfun/red_v_things_plus/board.yml            | 1 -
 boards/sparkfun/thing_plus/board.yml                   | 1 -
 boards/sparkfun/thing_plus_matter_mgm240p/board.yml    | 1 -
 boards/st/b_g474e_dpow1/board.yml                      | 1 -
 boards/st/b_l072z_lrwan1/board.yml                     | 1 -
 boards/st/b_l4s5i_iot01a/board.yml                     | 1 -
 boards/st/b_u585i_iot02a/board.yml                     | 1 -
 boards/st/disco_l475_iot1/board.yml                    | 1 -
 boards/st/nucleo_c031c6/board.yml                      | 1 -
 boards/st/nucleo_f030r8/board.yml                      | 1 -
 boards/st/nucleo_f031k6/board.yml                      | 1 -
 boards/st/nucleo_f042k6/board.yml                      | 1 -
 boards/st/nucleo_f070rb/board.yml                      | 1 -
 boards/st/nucleo_f091rc/board.yml                      | 1 -
 boards/st/nucleo_f103rb/board.yml                      | 1 -
 boards/st/nucleo_f207zg/board.yml                      | 1 -
 boards/st/nucleo_f302r8/board.yml                      | 1 -
 boards/st/nucleo_f303k8/board.yml                      | 1 -
 boards/st/nucleo_f303re/board.yml                      | 1 -
 boards/st/nucleo_f334r8/board.yml                      | 1 -
 boards/st/nucleo_f401re/board.yml                      | 1 -
 boards/st/nucleo_f410rb/board.yml                      | 1 -
 boards/st/nucleo_f411re/board.yml                      | 1 -
 boards/st/nucleo_f412zg/board.yml                      | 1 -
 boards/st/nucleo_f413zh/board.yml                      | 1 -
 boards/st/nucleo_f429zi/board.yml                      | 1 -
 boards/st/nucleo_f446re/board.yml                      | 1 -
 boards/st/nucleo_f446ze/board.yml                      | 1 -
 boards/st/nucleo_f722ze/board.yml                      | 1 -
 boards/st/nucleo_f746zg/board.yml                      | 1 -
 boards/st/nucleo_f756zg/board.yml                      | 1 -
 boards/st/nucleo_f767zi/board.yml                      | 1 -
 boards/st/nucleo_g031k8/board.yml                      | 1 -
 boards/st/nucleo_g070rb/board.yml                      | 1 -
 boards/st/nucleo_g071rb/board.yml                      | 1 -
 boards/st/nucleo_g0b1re/board.yml                      | 1 -
 boards/st/nucleo_g431rb/board.yml                      | 1 -
 boards/st/nucleo_g474re/board.yml                      | 1 -
 boards/st/nucleo_h503rb/board.yml                      | 1 -
 boards/st/nucleo_h533re/board.yml                      | 1 -
 boards/st/nucleo_h563zi/board.yml                      | 1 -
 boards/st/nucleo_h723zg/board.yml                      | 1 -
 boards/st/nucleo_h743zi/board.yml                      | 1 -
 boards/st/nucleo_h745zi_q/board.yml                    | 1 -
 boards/st/nucleo_h753zi/board.yml                      | 1 -
 boards/st/nucleo_h755zi_q/board.yml                    | 1 -
 boards/st/nucleo_h7a3zi_q/board.yml                    | 1 -
 boards/st/nucleo_l011k4/board.yml                      | 1 -
 boards/st/nucleo_l031k6/board.yml                      | 1 -
 boards/st/nucleo_l053r8/board.yml                      | 1 -
 boards/st/nucleo_l073rz/board.yml                      | 1 -
 boards/st/nucleo_l152re/board.yml                      | 1 -
 boards/st/nucleo_l412rb_p/board.yml                    | 1 -
 boards/st/nucleo_l432kc/board.yml                      | 1 -
 boards/st/nucleo_l433rc_p/board.yml                    | 1 -
 boards/st/nucleo_l452re/board.yml                      | 1 -
 boards/st/nucleo_l476rg/board.yml                      | 1 -
 boards/st/nucleo_l496zg/board.yml                      | 1 -
 boards/st/nucleo_l4a6zg/board.yml                      | 1 -
 boards/st/nucleo_l4r5zi/board.yml                      | 1 -
 boards/st/nucleo_l552ze_q/board.yml                    | 1 -
 boards/st/nucleo_u031r8/board.yml                      | 1 -
 boards/st/nucleo_u083rc/board.yml                      | 1 -
 boards/st/nucleo_u575zi_q/board.yml                    | 1 -
 boards/st/nucleo_u5a5zj_q/board.yml                    | 1 -
 boards/st/nucleo_wb05kz/board.yml                      | 1 -
 boards/st/nucleo_wb09ke/board.yml                      | 1 -
 boards/st/nucleo_wb55rg/board.yml                      | 1 -
 boards/st/nucleo_wba52cg/board.yml                     | 1 -
 boards/st/nucleo_wba55cg/board.yml                     | 1 -
 boards/st/nucleo_wl55jc/board.yml                      | 1 -
 boards/st/sensortile_box/board.yml                     | 1 -
 boards/st/sensortile_box_pro/board.yml                 | 1 -
 boards/st/st25dv_mb1283_disco/board.yml                | 1 -
 boards/st/steval_fcu001v1/board.yml                    | 1 -
 boards/st/steval_stwinbx1/board.yml                    | 1 -
 boards/st/stm3210c_eval/board.yml                      | 1 -
 boards/st/stm32373c_eval/board.yml                     | 1 -
 boards/st/stm32c0116_dk/board.yml                      | 1 -
 boards/st/stm32f072_eval/board.yml                     | 1 -
 boards/st/stm32f072b_disco/board.yml                   | 1 -
 boards/st/stm32f0_disco/board.yml                      | 1 -
 boards/st/stm32f3_disco/board.yml                      | 1 -
 boards/st/stm32f411e_disco/board.yml                   | 1 -
 boards/st/stm32f412g_disco/board.yml                   | 1 -
 boards/st/stm32f429i_disc1/board.yml                   | 1 -
 boards/st/stm32f469i_disco/board.yml                   | 1 -
 boards/st/stm32f4_disco/board.yml                      | 1 -
 boards/st/stm32f723e_disco/board.yml                   | 1 -
 boards/st/stm32f746g_disco/board.yml                   | 1 -
 boards/st/stm32f7508_dk/board.yml                      | 1 -
 boards/st/stm32f769i_disco/board.yml                   | 1 -
 boards/st/stm32g0316_disco/board.yml                   | 1 -
 boards/st/stm32g071b_disco/board.yml                   | 1 -
 boards/st/stm32g081b_eval/board.yml                    | 1 -
 boards/st/stm32h573i_dk/board.yml                      | 1 -
 boards/st/stm32h735g_disco/board.yml                   | 1 -
 boards/st/stm32h745i_disco/board.yml                   | 1 -
 boards/st/stm32h747i_disco/board.yml                   | 1 -
 boards/st/stm32h750b_dk/board.yml                      | 1 -
 boards/st/stm32h7b3i_dk/board.yml                      | 1 -
 boards/st/stm32h7s78_dk/board.yml                      | 1 -
 boards/st/stm32l1_disco/board.yml                      | 2 --
 boards/st/stm32l476g_disco/board.yml                   | 1 -
 boards/st/stm32l496g_disco/board.yml                   | 1 -
 boards/st/stm32l4r9i_disco/board.yml                   | 1 -
 boards/st/stm32l562e_dk/board.yml                      | 1 -
 boards/st/stm32mp157c_dk2/board.yml                    | 1 -
 boards/st/stm32u083c_dk/board.yml                      | 1 -
 boards/st/stm32u5a9j_dk/board.yml                      | 1 -
 boards/st/stm32vl_disco/board.yml                      | 1 -
 boards/st/stm32wb5mm_dk/board.yml                      | 1 -
 boards/st/stm32wb5mmg/board.yml                        | 1 -
 boards/starfive/visionfive2/board.yml                  | 1 -
 boards/tdk/robokit1/board.yml                          | 1 -
 boards/technexion/pico_pi/board.yml                    | 1 -
 boards/telink/tlsr9518adk80d/board.yml                 | 1 -
 boards/ti/cc1352p1_launchxl/board.yml                  | 1 -
 boards/ti/cc1352p7_launchpad/board.yml                 | 1 -
 boards/ti/cc1352r1_launchxl/board.yml                  | 1 -
 boards/ti/cc1352r_sensortag/board.yml                  | 1 -
 boards/ti/cc26x2r1_launchxl/board.yml                  | 1 -
 boards/ti/cc3220sf_launchxl/board.yml                  | 1 -
 boards/ti/cc3235sf_launchxl/board.yml                  | 1 -
 boards/ti/msp_exp432p401r_launchxl/board.yml           | 1 -
 boards/ti/sk_am62/board.yml                            | 1 -
 boards/toradex/colibri_imx7d/board.yml                 | 1 -
 boards/toradex/verdin_imx8mp/board.yml                 | 1 -
 boards/u-blox/ubx_bmd300eval/board.yml                 | 1 -
 boards/u-blox/ubx_bmd330eval/board.yml                 | 1 -
 boards/u-blox/ubx_bmd340eval/board.yml                 | 1 -
 boards/u-blox/ubx_bmd345eval/board.yml                 | 1 -
 boards/u-blox/ubx_bmd360eval/board.yml                 | 1 -
 boards/u-blox/ubx_bmd380eval/board.yml                 | 1 -
 boards/u-blox/ubx_evkannab1/board.yml                  | 1 -
 boards/u-blox/ubx_evkninab1/board.yml                  | 1 -
 boards/u-blox/ubx_evkninab3/board.yml                  | 1 -
 boards/u-blox/ubx_evkninab4/board.yml                  | 1 -
 boards/udoo/udoo_neo_full/board.yml                    | 1 -
 boards/up-bridge-the-gap/up_squared/board.yml          | 1 -
 boards/up-bridge-the-gap/up_squared_pro_7000/board.yml | 1 -
 boards/vcc-gnd/yd_esp32/board.yml                      | 1 -
 boards/vcc-gnd/yd_stm32h750vb/board.yml                | 1 -
 boards/vngiotlab/nrf51_vbluno51/board.yml              | 1 -
 boards/vngiotlab/nrf52_vbluno52/board.yml              | 1 -
 boards/waveshare/esp32s3_touch_lcd_1_28/board.yml      | 1 -
 boards/waveshare/nrf51_ble400/board.yml                | 1 -
 boards/waveshare/open103z/board.yml                    | 1 -
 boards/we/ophelia1ev/board.yml                         | 1 -
 boards/we/proteus2ev/board.yml                         | 1 -
 boards/we/proteus3ev/board.yml                         | 1 -
 boards/weact/blackpill_f401cc/board.yml                | 1 -
 boards/weact/blackpill_f401ce/board.yml                | 1 -
 boards/weact/blackpill_f411ce/board.yml                | 1 -
 boards/weact/mini_stm32h743/board.yml                  | 1 -
 boards/weact/stm32f405_core/board.yml                  | 1 -
 boards/weact/stm32g431_core/board.yml                  | 1 -
 boards/wemos/esp32s2_lolin_mini/board.yml              | 1 -
 boards/witte/linum/board.yml                           | 1 -
 boards/wiznet/w5500_evb_pico/board.yml                 | 1 -
 boards/xen/xenvm/board.yml                             | 1 -
 603 files changed, 4 insertions(+), 619 deletions(-)

diff --git a/boards/01space/esp32c3_042_oled/board.yml b/boards/01space/esp32c3_042_oled/board.yml
index 35bcbdc0e60..40b7b0f5816 100644
--- a/boards/01space/esp32c3_042_oled/board.yml
+++ b/boards/01space/esp32c3_042_oled/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp32c3_042_oled
-  full_name: ESP32C3 0.42 OLED
   vendor: 01space
   socs:
   - name: esp32c3
diff --git a/boards/96boards/aerocore2/board.yml b/boards/96boards/aerocore2/board.yml
index cc94ae02283..42c4b7cae96 100644
--- a/boards/96boards/aerocore2/board.yml
+++ b/boards/96boards/aerocore2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: 96b_aerocore2
-  full_name: Aerocore2
   vendor: 96boards
   socs:
     - name: stm32f427xx
diff --git a/boards/96boards/argonkey/board.yml b/boards/96boards/argonkey/board.yml
index c142ce4d98c..9e78ee2394a 100644
--- a/boards/96boards/argonkey/board.yml
+++ b/boards/96boards/argonkey/board.yml
@@ -1,6 +1,5 @@
 board:
   name: 96b_argonkey
-  full_name: Argonkey
   vendor: 96boards
   socs:
     - name: stm32f412cx
diff --git a/boards/96boards/avenger96/board.yml b/boards/96boards/avenger96/board.yml
index 35f4e4b24f9..042bb6a472f 100644
--- a/boards/96boards/avenger96/board.yml
+++ b/boards/96boards/avenger96/board.yml
@@ -1,6 +1,5 @@
 board:
   name: 96b_avenger96
-  full_name: Avenger96
   vendor: 96boards
   socs:
     - name: stm32mp157cxx
diff --git a/boards/96boards/carbon/board.yml b/boards/96boards/carbon/board.yml
index 28a04570b7a..79101f957be 100644
--- a/boards/96boards/carbon/board.yml
+++ b/boards/96boards/carbon/board.yml
@@ -1,6 +1,5 @@
 board:
   name: 96b_carbon
-  full_name: Carbon
   vendor: 96boards
   socs:
   - name: stm32f401xe
diff --git a/boards/96boards/meerkat96/board.yml b/boards/96boards/meerkat96/board.yml
index 4e1425d035a..48d60ae6888 100644
--- a/boards/96boards/meerkat96/board.yml
+++ b/boards/96boards/meerkat96/board.yml
@@ -1,6 +1,5 @@
 board:
   name: 96b_meerkat96
-  full_name: Meerkat96
   vendor: 96boards
   socs:
     - name: mcimx7d
diff --git a/boards/96boards/neonkey/board.yml b/boards/96boards/neonkey/board.yml
index a9204af01c8..214cdc883bb 100644
--- a/boards/96boards/neonkey/board.yml
+++ b/boards/96boards/neonkey/board.yml
@@ -1,6 +1,5 @@
 board:
   name: 96b_neonkey
-  full_name: Neonkey
   vendor: 96boards
   socs:
     - name: stm32f411xe
diff --git a/boards/96boards/nitrogen/board.yml b/boards/96boards/nitrogen/board.yml
index 8c3156c9c19..279d2c63a66 100644
--- a/boards/96boards/nitrogen/board.yml
+++ b/boards/96boards/nitrogen/board.yml
@@ -1,6 +1,5 @@
 board:
   name: 96b_nitrogen
-  full_name: Nitrogen
   vendor: 96boards
   socs:
   - name: nrf52832
diff --git a/boards/96boards/stm32_sensor_mez/board.yml b/boards/96boards/stm32_sensor_mez/board.yml
index 19d96543563..e410dcc9e65 100644
--- a/boards/96boards/stm32_sensor_mez/board.yml
+++ b/boards/96boards/stm32_sensor_mez/board.yml
@@ -1,6 +1,5 @@
 board:
   name: 96b_stm32_sensor_mez
-  full_name: STM32 Sensor Mezzanine
   vendor: st
   socs:
     - name: stm32f446xx
diff --git a/boards/96boards/wistrio/board.yml b/boards/96boards/wistrio/board.yml
index 9cc1efae22e..508c590a6b5 100644
--- a/boards/96boards/wistrio/board.yml
+++ b/boards/96boards/wistrio/board.yml
@@ -1,6 +1,5 @@
 board:
   name: 96b_wistrio
-  full_name: WisTrio
   vendor: 96boards
   socs:
     - name: stm32l151xba
diff --git a/boards/aconno/acn52832/board.yml b/boards/aconno/acn52832/board.yml
index 3b7d75c68a2..179637e1ded 100644
--- a/boards/aconno/acn52832/board.yml
+++ b/boards/aconno/acn52832/board.yml
@@ -1,6 +1,5 @@
 board:
   name: acn52832
-  full_name: acn52832
   vendor: aconno
   socs:
   - name: nrf52832
diff --git a/boards/acrn/acrn/board.yml b/boards/acrn/acrn/board.yml
index dce367c0f96..4130a85b8f6 100644
--- a/boards/acrn/acrn/board.yml
+++ b/boards/acrn/acrn/board.yml
@@ -1,11 +1,9 @@
 boards:
 
   - name: acrn
-    full_name: ACRN hypervisor
     socs:
       - name: atom
 
   - name: acrn_ehl_crb
-    full_name: ACRN on EHL hypervisor
     socs:
       - name: elkhart_lake
diff --git a/boards/actinius/icarus/board.yml b/boards/actinius/icarus/board.yml
index 9f5b6450cf9..69d6aa45707 100644
--- a/boards/actinius/icarus/board.yml
+++ b/boards/actinius/icarus/board.yml
@@ -1,6 +1,5 @@
 board:
   name: actinius_icarus
-  full_name: Icarus
   vendor: actinius
   socs:
   - name: nrf9160
diff --git a/boards/actinius/icarus_bee/board.yml b/boards/actinius/icarus_bee/board.yml
index 648306ed93c..653294a9cf5 100644
--- a/boards/actinius/icarus_bee/board.yml
+++ b/boards/actinius/icarus_bee/board.yml
@@ -1,6 +1,5 @@
 board:
   name: actinius_icarus_bee
-  full_name: Icarus Bee
   vendor: actinius
   socs:
   - name: nrf9160
diff --git a/boards/actinius/icarus_som/board.yml b/boards/actinius/icarus_som/board.yml
index b3cf4ca8cb6..9acf3b4fa5e 100644
--- a/boards/actinius/icarus_som/board.yml
+++ b/boards/actinius/icarus_som/board.yml
@@ -1,6 +1,5 @@
 board:
   name: actinius_icarus_som
-  full_name: Icarus SoM
   vendor: actinius
   socs:
   - name: nrf9160
diff --git a/boards/actinius/icarus_som_dk/board.yml b/boards/actinius/icarus_som_dk/board.yml
index 9e5a596828e..137f39705d1 100644
--- a/boards/actinius/icarus_som_dk/board.yml
+++ b/boards/actinius/icarus_som_dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: actinius_icarus_som_dk
-  full_name: Icarus SoM DK
   vendor: actinius
   socs:
   - name: nrf9160
diff --git a/boards/adafruit/feather_m0_basic_proto/board.yml b/boards/adafruit/feather_m0_basic_proto/board.yml
index 15ee020f8a6..cf9353bf78c 100644
--- a/boards/adafruit/feather_m0_basic_proto/board.yml
+++ b/boards/adafruit/feather_m0_basic_proto/board.yml
@@ -1,6 +1,5 @@
 board:
   name: adafruit_feather_m0_basic_proto
-  full_name: Feather M0 Basic Proto
   vendor: adafruit
   socs:
     - name: samd21g18a
diff --git a/boards/adafruit/feather_m0_lora/board.yml b/boards/adafruit/feather_m0_lora/board.yml
index afef7ea91df..b720fc95ffe 100644
--- a/boards/adafruit/feather_m0_lora/board.yml
+++ b/boards/adafruit/feather_m0_lora/board.yml
@@ -1,6 +1,5 @@
 board:
   name: adafruit_feather_m0_lora
-  full_name: Feather M0 LoRa
   vendor: adafruit
   socs:
     - name: samd21g18a
diff --git a/boards/adafruit/feather_nrf52840/board.yml b/boards/adafruit/feather_nrf52840/board.yml
index 535b60d2f78..5841c2f4bf0 100644
--- a/boards/adafruit/feather_nrf52840/board.yml
+++ b/boards/adafruit/feather_nrf52840/board.yml
@@ -1,6 +1,5 @@
 board:
   name: adafruit_feather_nrf52840
-  full_name: Feather nRF52840 (Express, Sense)
   vendor: adafruit
   socs:
     - name: nrf52840
diff --git a/boards/adafruit/feather_stm32f405/board.yml b/boards/adafruit/feather_stm32f405/board.yml
index 839cd4b24c3..e30f5c0cbcf 100644
--- a/boards/adafruit/feather_stm32f405/board.yml
+++ b/boards/adafruit/feather_stm32f405/board.yml
@@ -1,6 +1,5 @@
 board:
   name: adafruit_feather_stm32f405
-  full_name: Feather STM32F405 Express
   vendor: adafruit
   socs:
     - name: stm32f405xx
diff --git a/boards/adafruit/grand_central_m4_express/board.yml b/boards/adafruit/grand_central_m4_express/board.yml
index 4393f3040c7..92a48d1b2b3 100644
--- a/boards/adafruit/grand_central_m4_express/board.yml
+++ b/boards/adafruit/grand_central_m4_express/board.yml
@@ -1,6 +1,5 @@
 board:
   name: adafruit_grand_central_m4_express
-  full_name: Grand Central M4 Express
   vendor: adafruit
   socs:
     - name: samd51p20a
diff --git a/boards/adafruit/itsybitsy/board.yml b/boards/adafruit/itsybitsy/board.yml
index baf9310f83c..484a68e348b 100644
--- a/boards/adafruit/itsybitsy/board.yml
+++ b/boards/adafruit/itsybitsy/board.yml
@@ -1,6 +1,5 @@
 board:
   name: adafruit_itsybitsy
-  full_name: ItsyBitsy nRF52840
   vendor: adafruit
   socs:
   - name: nrf52840
diff --git a/boards/adafruit/itsybitsy_m4_express/board.yml b/boards/adafruit/itsybitsy_m4_express/board.yml
index 31c9cd6354e..7d295017fc9 100644
--- a/boards/adafruit/itsybitsy_m4_express/board.yml
+++ b/boards/adafruit/itsybitsy_m4_express/board.yml
@@ -1,6 +1,5 @@
 board:
   name: adafruit_itsybitsy_m4_express
-  full_name: ItsyBitsy M4 Express
   vendor: adafruit
   socs:
     - name: samd51g19a
diff --git a/boards/adafruit/kb2040/board.yml b/boards/adafruit/kb2040/board.yml
index 39363e321aa..5fbe751090e 100644
--- a/boards/adafruit/kb2040/board.yml
+++ b/boards/adafruit/kb2040/board.yml
@@ -1,6 +1,5 @@
 board:
   name: adafruit_kb2040
-  full_name: KB2040
   vendor: adafruit
   socs:
   - name: rp2040
diff --git a/boards/adafruit/nrf52_adafruit_feather/board.yml b/boards/adafruit/nrf52_adafruit_feather/board.yml
index 301d270465e..a3d6b4274ce 100644
--- a/boards/adafruit/nrf52_adafruit_feather/board.yml
+++ b/boards/adafruit/nrf52_adafruit_feather/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf52_adafruit_feather
-  full_name: nRF52 Adafruit Feather
   vendor: adafruit
   socs:
   - name: nrf52832
diff --git a/boards/adafruit/qt_py_rp2040/board.yml b/boards/adafruit/qt_py_rp2040/board.yml
index ba0a3f89485..e07cab669c6 100644
--- a/boards/adafruit/qt_py_rp2040/board.yml
+++ b/boards/adafruit/qt_py_rp2040/board.yml
@@ -1,6 +1,5 @@
 board:
   name: adafruit_qt_py_rp2040
-  full_name: QT Py RP2040
   vendor: adafruit
   socs:
   - name: rp2040
diff --git a/boards/adafruit/trinket_m0/board.yml b/boards/adafruit/trinket_m0/board.yml
index 44b19bf565e..6d7a783ae3e 100644
--- a/boards/adafruit/trinket_m0/board.yml
+++ b/boards/adafruit/trinket_m0/board.yml
@@ -1,6 +1,5 @@
 board:
   name: adafruit_trinket_m0
-  full_name: Trinket M0
   vendor: adafruit
   socs:
     - name: samd21e18a
diff --git a/boards/adi/apard32690/board.yml b/boards/adi/apard32690/board.yml
index fc6aeac3b24..269b5789345 100644
--- a/boards/adi/apard32690/board.yml
+++ b/boards/adi/apard32690/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: apard32690
-  full_name: AD-APARD32690-SL
   vendor: adi
   socs:
     - name: max32690
diff --git a/boards/adi/eval_adin1110ebz/board.yml b/boards/adi/eval_adin1110ebz/board.yml
index 27763c338c6..e5af49e3f35 100644
--- a/boards/adi/eval_adin1110ebz/board.yml
+++ b/boards/adi/eval_adin1110ebz/board.yml
@@ -1,6 +1,5 @@
 board:
   name: adi_eval_adin1110ebz
-  full_name: EVAL-ADIN1110EVB Evaluation board
   vendor: adi
   socs:
     - name: stm32l4s5xx
diff --git a/boards/adi/eval_adin2111ebz/board.yml b/boards/adi/eval_adin2111ebz/board.yml
index d63f5c14edd..0151d544aca 100644
--- a/boards/adi/eval_adin2111ebz/board.yml
+++ b/boards/adi/eval_adin2111ebz/board.yml
@@ -1,6 +1,5 @@
 board:
   name: adi_eval_adin2111ebz
-  full_name: EVAL-ADIN2111EVB Evaluation board
   vendor: adi
   socs:
     - name: stm32l4s5xx
diff --git a/boards/adi/max32655evkit/board.yml b/boards/adi/max32655evkit/board.yml
index a3182fa647a..4824c6fe8e5 100644
--- a/boards/adi/max32655evkit/board.yml
+++ b/boards/adi/max32655evkit/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: max32655evkit
-  full_name: MAX32655EVKIT
   vendor: adi
   socs:
     - name: max32655
diff --git a/boards/adi/max32655fthr/board.yml b/boards/adi/max32655fthr/board.yml
index 81c6e41ae32..087b51d8d95 100644
--- a/boards/adi/max32655fthr/board.yml
+++ b/boards/adi/max32655fthr/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: max32655fthr
-  full_name: MAX32655FTHR
   vendor: adi
   socs:
     - name: max32655
diff --git a/boards/adi/max32662evkit/board.yml b/boards/adi/max32662evkit/board.yml
index 66ba25e1175..628de9d7668 100644
--- a/boards/adi/max32662evkit/board.yml
+++ b/boards/adi/max32662evkit/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: max32662evkit
-  full_name: MAX32662EVKIT
   vendor: adi
   socs:
     - name: max32662
diff --git a/boards/adi/max32666evkit/board.yml b/boards/adi/max32666evkit/board.yml
index 6cacbe69acf..5d1beff7716 100644
--- a/boards/adi/max32666evkit/board.yml
+++ b/boards/adi/max32666evkit/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: max32666evkit
-  full_name: MAX32666EVKIT
   vendor: adi
   socs:
     - name: max32666
diff --git a/boards/adi/max32666fthr/board.yml b/boards/adi/max32666fthr/board.yml
index a73062b5bfa..a071afb909e 100644
--- a/boards/adi/max32666fthr/board.yml
+++ b/boards/adi/max32666fthr/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: max32666fthr
-  full_name: MAX32666FTHR
   vendor: adi
   socs:
     - name: max32666
diff --git a/boards/adi/max32670evkit/board.yml b/boards/adi/max32670evkit/board.yml
index 530810b3be9..1d0aabb3954 100644
--- a/boards/adi/max32670evkit/board.yml
+++ b/boards/adi/max32670evkit/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: max32670evkit
-  full_name: MAX32670EVKIT
   vendor: adi
   socs:
     - name: max32670
diff --git a/boards/adi/max32672evkit/board.yml b/boards/adi/max32672evkit/board.yml
index cd2e29f832c..5df99f681bf 100644
--- a/boards/adi/max32672evkit/board.yml
+++ b/boards/adi/max32672evkit/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: max32672evkit
-  full_name: MAX32672EVKIT
   vendor: adi
   socs:
     - name: max32672
diff --git a/boards/adi/max32672fthr/board.yml b/boards/adi/max32672fthr/board.yml
index aa19cea2609..c99d16ad4a1 100644
--- a/boards/adi/max32672fthr/board.yml
+++ b/boards/adi/max32672fthr/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: max32672fthr
-  full_name: MAX32672FTHR
   vendor: adi
   socs:
     - name: max32672
diff --git a/boards/adi/max32675evkit/board.yml b/boards/adi/max32675evkit/board.yml
index 59ca667e03b..d51c7284c7f 100644
--- a/boards/adi/max32675evkit/board.yml
+++ b/boards/adi/max32675evkit/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: max32675evkit
-  full_name: MAX32675EVKIT
   vendor: adi
   socs:
     - name: max32675
diff --git a/boards/adi/max32680evkit/board.yml b/boards/adi/max32680evkit/board.yml
index 11cb8a55c09..23b5102a97f 100644
--- a/boards/adi/max32680evkit/board.yml
+++ b/boards/adi/max32680evkit/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: max32680evkit
-  full_name: MAX32680EVKIT
   vendor: adi
   socs:
     - name: max32680
diff --git a/boards/adi/max32690evkit/board.yml b/boards/adi/max32690evkit/board.yml
index b5d3be3c679..53f531e193b 100644
--- a/boards/adi/max32690evkit/board.yml
+++ b/boards/adi/max32690evkit/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: max32690evkit
-  full_name: MAX32690EVKIT
   vendor: adi
   socs:
     - name: max32690
diff --git a/boards/adi/max32690fthr/board.yml b/boards/adi/max32690fthr/board.yml
index b97f7e0e6ac..328035bdccd 100644
--- a/boards/adi/max32690fthr/board.yml
+++ b/boards/adi/max32690fthr/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: max32690fthr
-  full_name: MAX32690FTHR
   vendor: adi
   socs:
     - name: max32690
diff --git a/boards/adi/sdp_k1/board.yml b/boards/adi/sdp_k1/board.yml
index 26b2e819276..c659c3b14c8 100644
--- a/boards/adi/sdp_k1/board.yml
+++ b/boards/adi/sdp_k1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: adi_sdp_k1
-  full_name: SDP-K1
   vendor: adi
   socs:
     - name: stm32f469xx
diff --git a/boards/alientek/pandora_stm32l475/board.yml b/boards/alientek/pandora_stm32l475/board.yml
index 1cb4fd9a9ff..725d13c5f30 100644
--- a/boards/alientek/pandora_stm32l475/board.yml
+++ b/boards/alientek/pandora_stm32l475/board.yml
@@ -1,6 +1,5 @@
 board:
   name: pandora_stm32l475
-  full_name: STM32L475 Pandora
   vendor: alientek
   socs:
     - name: stm32l475xx
diff --git a/boards/altr/max10/board.yml b/boards/altr/max10/board.yml
index 9106b7e15ec..976a0f83a80 100644
--- a/boards/altr/max10/board.yml
+++ b/boards/altr/max10/board.yml
@@ -1,6 +1,5 @@
 board:
   name: altera_max10
-  full_name: MAX10
   vendor: altr
   socs:
   - name: zephyr_nios2f
diff --git a/boards/ambiq/apollo3_evb/board.yml b/boards/ambiq/apollo3_evb/board.yml
index 9e3a5bd5304..8c3925245c3 100644
--- a/boards/ambiq/apollo3_evb/board.yml
+++ b/boards/ambiq/apollo3_evb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: apollo3_evb
-  full_name: Apollo3 Blue EVB
   vendor: ambiq
   socs:
   - name: apollo3_blue
diff --git a/boards/ambiq/apollo3p_evb/board.yml b/boards/ambiq/apollo3p_evb/board.yml
index b6de5218ca8..507a85548b0 100644
--- a/boards/ambiq/apollo3p_evb/board.yml
+++ b/boards/ambiq/apollo3p_evb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: apollo3p_evb
-  full_name: Apollo3 Blue Plus EVB
   vendor: ambiq
   socs:
   - name: apollo3p_blue
diff --git a/boards/ambiq/apollo4p_blue_kxr_evb/board.yml b/boards/ambiq/apollo4p_blue_kxr_evb/board.yml
index ff5f3768774..16a9a6cc979 100644
--- a/boards/ambiq/apollo4p_blue_kxr_evb/board.yml
+++ b/boards/ambiq/apollo4p_blue_kxr_evb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: apollo4p_blue_kxr_evb
-  full_name: Apollo4 Blue Plus KXR EVB
   vendor: ambiq
   socs:
   - name: apollo4p_blue
diff --git a/boards/ambiq/apollo4p_evb/board.yml b/boards/ambiq/apollo4p_evb/board.yml
index 1716e415cd6..023487c3ecd 100644
--- a/boards/ambiq/apollo4p_evb/board.yml
+++ b/boards/ambiq/apollo4p_evb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: apollo4p_evb
-  full_name: Apollo4P EVB
   vendor: ambiq
   socs:
   - name: apollo4p
diff --git a/boards/amd/kv260_r5/board.yml b/boards/amd/kv260_r5/board.yml
index da3d08a19c0..9e43962bfc3 100644
--- a/boards/amd/kv260_r5/board.yml
+++ b/boards/amd/kv260_r5/board.yml
@@ -1,6 +1,5 @@
 board:
   name: kv260_r5
-  full_name: KV260 Development Board RPU Cortex-R5
   vendor: amd
   socs:
   - name: zynqmp_rpu
diff --git a/boards/andestech/adp_xc7k_ae350/board.yml b/boards/andestech/adp_xc7k_ae350/board.yml
index 7c8ace7d5a0..09ade0170f3 100644
--- a/boards/andestech/adp_xc7k_ae350/board.yml
+++ b/boards/andestech/adp_xc7k_ae350/board.yml
@@ -1,6 +1,5 @@
 board:
   name: adp_xc7k
-  full_name: ADP-XC7K AE350
   vendor: andestech
   socs:
   - name: ae350
diff --git a/boards/arduino/due/board.yml b/boards/arduino/due/board.yml
index 5c7cc707137..351bc719a15 100644
--- a/boards/arduino/due/board.yml
+++ b/boards/arduino/due/board.yml
@@ -1,6 +1,5 @@
 board:
   name: arduino_due
-  full_name: Arduino Due
   vendor: arduino
   socs:
     - name: sam3x8e
diff --git a/boards/arduino/giga_r1/board.yml b/boards/arduino/giga_r1/board.yml
index cfafa1282fd..3079c2f0d5c 100644
--- a/boards/arduino/giga_r1/board.yml
+++ b/boards/arduino/giga_r1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: arduino_giga_r1
-  full_name: Arduino GIGA R1 WiFi
   vendor: arduino
   socs:
     - name: stm32h747xx
diff --git a/boards/arduino/mkrzero/board.yml b/boards/arduino/mkrzero/board.yml
index 776deeb6c23..a53c04cbd18 100644
--- a/boards/arduino/mkrzero/board.yml
+++ b/boards/arduino/mkrzero/board.yml
@@ -1,6 +1,5 @@
 board:
   name: arduino_mkrzero
-  full_name: Arduino MKR Zero
   vendor: arduino
   socs:
     - name: samd21g18a
diff --git a/boards/arduino/nano_33_ble/board.yml b/boards/arduino/nano_33_ble/board.yml
index b1cbb7a9212..919864839ed 100644
--- a/boards/arduino/nano_33_ble/board.yml
+++ b/boards/arduino/nano_33_ble/board.yml
@@ -1,6 +1,5 @@
 board:
   name: arduino_nano_33_ble
-  full_name: Arduino Nano 33 BLE (Sense)
   vendor: arduino
   socs:
   - name: nrf52840
diff --git a/boards/arduino/nano_33_iot/board.yml b/boards/arduino/nano_33_iot/board.yml
index 56977e0f6e8..63b7dab7992 100644
--- a/boards/arduino/nano_33_iot/board.yml
+++ b/boards/arduino/nano_33_iot/board.yml
@@ -1,6 +1,5 @@
 board:
   name: arduino_nano_33_iot
-  full_name: Arduino Nano 33 IOT
   vendor: arduino
   socs:
     - name: samd21g18a
diff --git a/boards/arduino/nicla_sense_me/board.yml b/boards/arduino/nicla_sense_me/board.yml
index 58398263882..0a470e79ce5 100644
--- a/boards/arduino/nicla_sense_me/board.yml
+++ b/boards/arduino/nicla_sense_me/board.yml
@@ -1,6 +1,5 @@
 board:
   name: arduino_nicla_sense_me
-  full_name: Arduino Nicla Sense ME
   vendor: arduino
   socs:
   - name: nrf52832
diff --git a/boards/arduino/nicla_vision/board.yml b/boards/arduino/nicla_vision/board.yml
index 90b90977ae3..660cb3ca8aa 100644
--- a/boards/arduino/nicla_vision/board.yml
+++ b/boards/arduino/nicla_vision/board.yml
@@ -1,6 +1,5 @@
 board:
   name: arduino_nicla_vision
-  full_name: Arduino Nicla Vision
   vendor: arduino
   socs:
     - name: stm32h747xx
diff --git a/boards/arduino/opta/board.yml b/boards/arduino/opta/board.yml
index 013bfa1c06e..c572627b348 100644
--- a/boards/arduino/opta/board.yml
+++ b/boards/arduino/opta/board.yml
@@ -1,6 +1,5 @@
 board:
   name: arduino_opta
-  full_name: Arduino OPTA
   vendor: arduino
   socs:
     - name: stm32h747xx
diff --git a/boards/arduino/portenta_h7/board.yml b/boards/arduino/portenta_h7/board.yml
index fbea7ec271a..01e28f0b5fd 100644
--- a/boards/arduino/portenta_h7/board.yml
+++ b/boards/arduino/portenta_h7/board.yml
@@ -1,6 +1,5 @@
 board:
   name: arduino_portenta_h7
-  full_name: Arduino Portenta H7
   vendor: arduino
   socs:
     - name: stm32h747xx
diff --git a/boards/arduino/uno_r4/board.yml b/boards/arduino/uno_r4/board.yml
index 9c168c300c2..8286850b76c 100644
--- a/boards/arduino/uno_r4/board.yml
+++ b/boards/arduino/uno_r4/board.yml
@@ -1,11 +1,9 @@
 boards:
   - name: arduino_uno_r4_minima
-    full_name: Arduino UNO R4 Minima
     vendor: arduino
     socs:
       - name: r7fa4m1ab3cfm
   - name: arduino_uno_r4_wifi
-    full_name: Arduino UNO R4 WiFi
     vendor: arduino
     socs:
       - name: r7fa4m1ab3cfm
diff --git a/boards/arduino/zero/board.yml b/boards/arduino/zero/board.yml
index 495bca3dace..86d4a97c112 100644
--- a/boards/arduino/zero/board.yml
+++ b/boards/arduino/zero/board.yml
@@ -1,6 +1,5 @@
 board:
   name: arduino_zero
-  full_name: Arduino/Genuino Zero
   vendor: arduino
   socs:
     - name: samd21g18a
diff --git a/boards/arm/fvp_base_revc_2xaemv8a/board.yml b/boards/arm/fvp_base_revc_2xaemv8a/board.yml
index 3af023b670e..8c881c9d86a 100644
--- a/boards/arm/fvp_base_revc_2xaemv8a/board.yml
+++ b/boards/arm/fvp_base_revc_2xaemv8a/board.yml
@@ -1,6 +1,5 @@
 board:
   name: fvp_base_revc_2xaemv8a
-  full_name: BASE RevC AEMv8A Fixed Virtual Platforms
   vendor: arm
   socs:
   - name: fvp_base_revc_2xaemv8a
diff --git a/boards/arm/fvp_baser_aemv8r/board.yml b/boards/arm/fvp_baser_aemv8r/board.yml
index a11d3e00811..f80eb3a6ed0 100644
--- a/boards/arm/fvp_baser_aemv8r/board.yml
+++ b/boards/arm/fvp_baser_aemv8r/board.yml
@@ -1,6 +1,5 @@
 board:
   name: fvp_baser_aemv8r
-  full_name: Debug with Arm DS
   vendor: arm
   socs:
   - name: fvp_aemv8r_aarch64
diff --git a/boards/arm/mps2/board.yml b/boards/arm/mps2/board.yml
index 779a8ed21cc..a069852c1c6 100644
--- a/boards/arm/mps2/board.yml
+++ b/boards/arm/mps2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mps2
-  full_name: V2M MPS2
   vendor: arm
   socs:
   - name: an385
diff --git a/boards/arm/mps3/board.yml b/boards/arm/mps3/board.yml
index 9eea26dc244..5ee7ed7c037 100644
--- a/boards/arm/mps3/board.yml
+++ b/boards/arm/mps3/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mps3
-  full_name: MPS3 AN547
   vendor: arm
   socs:
   - name: 'an547'
diff --git a/boards/arm/v2m_beetle/board.yml b/boards/arm/v2m_beetle/board.yml
index 9104c0335cc..b19e9bfec75 100644
--- a/boards/arm/v2m_beetle/board.yml
+++ b/boards/arm/v2m_beetle/board.yml
@@ -1,6 +1,5 @@
 board:
   name: v2m_beetle
-  full_name: V2M Beetle
   vendor: arm
   socs:
   - name: beetle_r0
diff --git a/boards/arm/v2m_musca_b1/board.yml b/boards/arm/v2m_musca_b1/board.yml
index 40d16232d90..47cebc33bb1 100644
--- a/boards/arm/v2m_musca_b1/board.yml
+++ b/boards/arm/v2m_musca_b1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: v2m_musca_b1
-  full_name: V2M Musca B1
   vendor: arm
   socs:
   - name: musca_b1
diff --git a/boards/arm/v2m_musca_s1/board.yml b/boards/arm/v2m_musca_s1/board.yml
index 8cbc49ca31e..a7a3e18358d 100644
--- a/boards/arm/v2m_musca_s1/board.yml
+++ b/boards/arm/v2m_musca_s1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: v2m_musca_s1
-  full_name: V2M Musca-S1
   vendor: arm
   socs:
   - name: musca_s1
diff --git a/boards/aspeed/ast1030_evb/board.yml b/boards/aspeed/ast1030_evb/board.yml
index 002da5215bf..e129a899425 100644
--- a/boards/aspeed/ast1030_evb/board.yml
+++ b/boards/aspeed/ast1030_evb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ast1030_evb
-  full_name: AST1030_EVB
   vendor: aspeed
   socs:
   - name: ast1030
diff --git a/boards/atmarktechno/degu_evk/board.yml b/boards/atmarktechno/degu_evk/board.yml
index 483521e3a36..19859fc1e7d 100644
--- a/boards/atmarktechno/degu_evk/board.yml
+++ b/boards/atmarktechno/degu_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: degu_evk
-  full_name: Degu Evaluation Kit
   vendor: atmarktechno
   socs:
   - name: nrf52840
diff --git a/boards/atmel/sam/sam4e_xpro/board.yml b/boards/atmel/sam/sam4e_xpro/board.yml
index 52c0e9e8dee..017a22d62cd 100644
--- a/boards/atmel/sam/sam4e_xpro/board.yml
+++ b/boards/atmel/sam/sam4e_xpro/board.yml
@@ -1,6 +1,5 @@
 board:
   name: sam4e_xpro
-  full_name: SAM4E Xplained Pro
   vendor: atmel
   socs:
     - name: sam4e16e
diff --git a/boards/atmel/sam/sam4l_ek/board.yml b/boards/atmel/sam/sam4l_ek/board.yml
index 02dbed9f7e1..7045ba351ce 100644
--- a/boards/atmel/sam/sam4l_ek/board.yml
+++ b/boards/atmel/sam/sam4l_ek/board.yml
@@ -1,6 +1,5 @@
 board:
   name: sam4l_ek
-  full_name: SAM4L-EK
   vendor: atmel
   socs:
     - name: sam4lc4c
diff --git a/boards/atmel/sam/sam4s_xplained/board.yml b/boards/atmel/sam/sam4s_xplained/board.yml
index 0bbbe3a0590..c406301245b 100644
--- a/boards/atmel/sam/sam4s_xplained/board.yml
+++ b/boards/atmel/sam/sam4s_xplained/board.yml
@@ -1,6 +1,5 @@
 board:
   name: sam4s_xplained
-  full_name: SAM4S Xplained
   vendor: atmel
   socs:
     - name: sam4s16c
diff --git a/boards/atmel/sam/sam_e70_xplained/board.yml b/boards/atmel/sam/sam_e70_xplained/board.yml
index 905bcdf1887..1308363814a 100644
--- a/boards/atmel/sam/sam_e70_xplained/board.yml
+++ b/boards/atmel/sam/sam_e70_xplained/board.yml
@@ -1,6 +1,5 @@
 board:
   name: sam_e70_xplained
-  full_name: SAM E70(B) Xplained
   vendor: atmel
   socs:
     - name: same70q21
diff --git a/boards/atmel/sam/sam_v71_xult/board.yml b/boards/atmel/sam/sam_v71_xult/board.yml
index 2cf3c436ecb..68996e06485 100644
--- a/boards/atmel/sam/sam_v71_xult/board.yml
+++ b/boards/atmel/sam/sam_v71_xult/board.yml
@@ -1,6 +1,5 @@
 board:
   name: sam_v71_xult
-  full_name: SAM V71(B) Xplained Ultra
   vendor: atmel
   socs:
     - name: samv71q21
diff --git a/boards/atmel/sam0/samc21n_xpro/board.yml b/boards/atmel/sam0/samc21n_xpro/board.yml
index 72ab82fecd8..2037cde2398 100644
--- a/boards/atmel/sam0/samc21n_xpro/board.yml
+++ b/boards/atmel/sam0/samc21n_xpro/board.yml
@@ -1,6 +1,5 @@
 board:
   name: samc21n_xpro
-  full_name: SAM C21N Xplained Pro Evaluation Kit
   vendor: atmel
   socs:
     - name: samc21n18a
diff --git a/boards/atmel/sam0/samd20_xpro/board.yml b/boards/atmel/sam0/samd20_xpro/board.yml
index b9b4f5f91c1..c6c44e37830 100644
--- a/boards/atmel/sam0/samd20_xpro/board.yml
+++ b/boards/atmel/sam0/samd20_xpro/board.yml
@@ -1,6 +1,5 @@
 board:
   name: samd20_xpro
-  full_name: SAM D20 Xplained Pro Evaluation Kit
   vendor: atmel
   socs:
     - name: samd20j18
diff --git a/boards/atmel/sam0/samd21_xpro/board.yml b/boards/atmel/sam0/samd21_xpro/board.yml
index 80a77b66591..d4fd578dd35 100644
--- a/boards/atmel/sam0/samd21_xpro/board.yml
+++ b/boards/atmel/sam0/samd21_xpro/board.yml
@@ -1,6 +1,5 @@
 board:
   name: samd21_xpro
-  full_name: SAM D21 Xplained Pro Evaluation Kit
   vendor: atmel
   socs:
     - name: samd21j18a
diff --git a/boards/atmel/sam0/same54_xpro/board.yml b/boards/atmel/sam0/same54_xpro/board.yml
index 5f9db4f9cac..d10fef7e7b7 100644
--- a/boards/atmel/sam0/same54_xpro/board.yml
+++ b/boards/atmel/sam0/same54_xpro/board.yml
@@ -1,6 +1,5 @@
 board:
   name: same54_xpro
-  full_name: SAM E54 Xplained Pro Evaluation Kit
   vendor: atmel
   socs:
     - name: same54p20a
diff --git a/boards/atmel/sam0/saml21_xpro/board.yml b/boards/atmel/sam0/saml21_xpro/board.yml
index 84e7735c208..10e2284d58b 100644
--- a/boards/atmel/sam0/saml21_xpro/board.yml
+++ b/boards/atmel/sam0/saml21_xpro/board.yml
@@ -1,6 +1,5 @@
 board:
   name: saml21_xpro
-  full_name: SAM L21 Xplained Pro Evaluation Kit
   vendor: atmel
   socs:
     - name: saml21j18b
diff --git a/boards/atmel/sam0/samr21_xpro/board.yml b/boards/atmel/sam0/samr21_xpro/board.yml
index c84a465484a..c56b60ffc6f 100644
--- a/boards/atmel/sam0/samr21_xpro/board.yml
+++ b/boards/atmel/sam0/samr21_xpro/board.yml
@@ -1,6 +1,5 @@
 board:
   name: samr21_xpro
-  full_name: SAM R21 Xplained Pro Evaluation Kit
   vendor: atmel
   socs:
     - name: samr21g18a
diff --git a/boards/atmel/sam0/samr34_xpro/board.yml b/boards/atmel/sam0/samr34_xpro/board.yml
index 22e7d8ba93a..39df0e0451b 100644
--- a/boards/atmel/sam0/samr34_xpro/board.yml
+++ b/boards/atmel/sam0/samr34_xpro/board.yml
@@ -1,6 +1,5 @@
 board:
   name: samr34_xpro
-  full_name: SAM R34 Xplained Pro Evaluation Kit
   vendor: atmel
   socs:
     - name: samr34j18b
diff --git a/boards/bbc/microbit/board.yml b/boards/bbc/microbit/board.yml
index 228452b8afc..3983adf061e 100644
--- a/boards/bbc/microbit/board.yml
+++ b/boards/bbc/microbit/board.yml
@@ -1,6 +1,5 @@
 board:
   name: bbc_microbit
-  full_name: "micro:bit"
   vendor: bbc
   socs:
   - name: nrf51822
diff --git a/boards/bbc/microbit_v2/board.yml b/boards/bbc/microbit_v2/board.yml
index 11ceee12980..1355002a7d1 100644
--- a/boards/bbc/microbit_v2/board.yml
+++ b/boards/bbc/microbit_v2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: bbc_microbit_v2
-  full_name: "micro:bit V2"
   vendor: bbc
   socs:
   - name: nrf52833
diff --git a/boards/bcdevices/plt_demo_v2/board.yml b/boards/bcdevices/plt_demo_v2/board.yml
index f95af32a2ac..2d0c58bf628 100644
--- a/boards/bcdevices/plt_demo_v2/board.yml
+++ b/boards/bcdevices/plt_demo_v2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: blueclover_plt_demo_v2
-  full_name: Blue Clover PLT Demo V2 nRF52832
   vendor: bcdevices
   socs:
   - name: nrf52832
diff --git a/boards/beagle/beagleconnect_freedom/board.yml b/boards/beagle/beagleconnect_freedom/board.yml
index b7ce3ced0a0..a0d11fb2410 100644
--- a/boards/beagle/beagleconnect_freedom/board.yml
+++ b/boards/beagle/beagleconnect_freedom/board.yml
@@ -1,6 +1,5 @@
 board:
   name: beagleconnect_freedom
-  full_name: BeagleConnect Freedom
   vendor: beagle
   socs:
   - name: cc1352p7
diff --git a/boards/beagle/beagleplay/board.yml b/boards/beagle/beagleplay/board.yml
index bd63c308242..b412fda0ef3 100644
--- a/boards/beagle/beagleplay/board.yml
+++ b/boards/beagle/beagleplay/board.yml
@@ -1,6 +1,5 @@
 board:
   name: beagleplay
-  full_name: BeaglePlay (CC1352)
   vendor: beagle
   socs:
   - name: cc1352p7
diff --git a/boards/beagle/beaglev_fire/board.yml b/boards/beagle/beaglev_fire/board.yml
index 7275bd7aafd..60520301134 100644
--- a/boards/beagle/beaglev_fire/board.yml
+++ b/boards/beagle/beaglev_fire/board.yml
@@ -1,6 +1,5 @@
 board:
   name: beaglev_fire
-  full_name: BeagleV®-Fire
   vendor: beagle
   socs:
   - name: polarfire
diff --git a/boards/blues/swan_r5/board.yml b/boards/blues/swan_r5/board.yml
index 48db6d2a4e7..d9d4096e352 100644
--- a/boards/blues/swan_r5/board.yml
+++ b/boards/blues/swan_r5/board.yml
@@ -1,6 +1,5 @@
 board:
   name: swan_r5
-  full_name: Swan
   vendor: blues
   socs:
     - name: stm32l4r5xx
diff --git a/boards/brcm/bcm958401m2/board.yml b/boards/brcm/bcm958401m2/board.yml
index ac55cec0fe9..06c116fe825 100644
--- a/boards/brcm/bcm958401m2/board.yml
+++ b/boards/brcm/bcm958401m2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: bcm958401m2
-  full_name: BCM958401M2
   vendor: brcm
   socs:
   - name: bcm58400
diff --git a/boards/brcm/bcm958402m2/board.yml b/boards/brcm/bcm958402m2/board.yml
index 85a0692a3f7..e9ad1770ed5 100644
--- a/boards/brcm/bcm958402m2/board.yml
+++ b/boards/brcm/bcm958402m2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: bcm958402m2
-  full_name: BCM958402M2 (Cortex-M7)
   vendor: brcm
   socs:
   - name: bcm58402
diff --git a/boards/bytesatwork/bytesensi_l/board.yml b/boards/bytesatwork/bytesensi_l/board.yml
index b3c88c01c84..04e4cd9ad11 100644
--- a/boards/bytesatwork/bytesensi_l/board.yml
+++ b/boards/bytesatwork/bytesensi_l/board.yml
@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 board:
   name: bytesensi_l
-  full_name: byteSENSI-L
   vendor: bytesatwork
   socs:
   - name: nrf52832
diff --git a/boards/cdns/xt-sim/board.yml b/boards/cdns/xt-sim/board.yml
index b3a0b332df0..d162e416a3b 100644
--- a/boards/cdns/xt-sim/board.yml
+++ b/boards/cdns/xt-sim/board.yml
@@ -1,6 +1,5 @@
 board:
   name: xt-sim
-  full_name: Xtensa simulator
   vendor: cdns
   socs:
   - name: xtensa_sample_controller
diff --git a/boards/circuitdojo/feather/board.yml b/boards/circuitdojo/feather/board.yml
index 19758e27b6b..0eb6ff5c4c0 100644
--- a/boards/circuitdojo/feather/board.yml
+++ b/boards/circuitdojo/feather/board.yml
@@ -1,6 +1,5 @@
 board:
   name: circuitdojo_feather
-  full_name: nRF9160 Feather
   vendor: circuitdojo
   socs:
   - name: nrf9160
diff --git a/boards/contextualelectronics/abc/board.yml b/boards/contextualelectronics/abc/board.yml
index 6209af4e9c4..5c921f05256 100644
--- a/boards/contextualelectronics/abc/board.yml
+++ b/boards/contextualelectronics/abc/board.yml
@@ -1,6 +1,5 @@
 board:
   name: contextualelectronics_abc
-  full_name: Advanced BLE Cell
   vendor: contextualelectronics
   socs:
   - name: nrf52840
diff --git a/boards/croxel/croxel_cx1825/board.yml b/boards/croxel/croxel_cx1825/board.yml
index 8c32a6c2acd..eed390e4a2c 100644
--- a/boards/croxel/croxel_cx1825/board.yml
+++ b/boards/croxel/croxel_cx1825/board.yml
@@ -1,6 +1,5 @@
 board:
   name: croxel_cx1825
-  full_name: CX1825 nRF52840
   vendor: croxel
   socs:
   - name: nrf52840
diff --git a/boards/ct/ctcc/board.yml b/boards/ct/ctcc/board.yml
index b6212047d79..780a02f7e7c 100644
--- a/boards/ct/ctcc/board.yml
+++ b/boards/ct/ctcc/board.yml
@@ -1,5 +1,4 @@
 board:
   name: ctcc
-  full_name: Connectivity Card nRF52840
   socs:
     - name: nrf52840
diff --git a/boards/cypress/cy8ckit_062_ble/board.yml b/boards/cypress/cy8ckit_062_ble/board.yml
index 8640f1e7d98..f0b1325911a 100644
--- a/boards/cypress/cy8ckit_062_ble/board.yml
+++ b/boards/cypress/cy8ckit_062_ble/board.yml
@@ -1,6 +1,5 @@
 board:
   name: cy8ckit_062_ble
-  full_name: PSoC63 BLE Pioneer Kit
   vendor: cypress
   revision:
     format: "major.minor.patch"
diff --git a/boards/cypress/cy8ckit_062_wifi_bt/board.yml b/boards/cypress/cy8ckit_062_wifi_bt/board.yml
index f070d6f3960..f5113e41a55 100644
--- a/boards/cypress/cy8ckit_062_wifi_bt/board.yml
+++ b/boards/cypress/cy8ckit_062_wifi_bt/board.yml
@@ -1,6 +1,5 @@
 board:
   name: cy8ckit_062_wifi_bt
-  full_name: PSoC6 WiFi-BT Pioneer Kit
   vendor: cypress
   socs:
   - name: cy8c6247
diff --git a/boards/digilent/arty_a7/board.yml b/boards/digilent/arty_a7/board.yml
index 3ae72eb903b..14a2c9ef418 100644
--- a/boards/digilent/arty_a7/board.yml
+++ b/boards/digilent/arty_a7/board.yml
@@ -1,6 +1,5 @@
 board:
   name: arty_a7
-  full_name: Arty
   vendor: digilent
   socs:
   - name: designstart_fpga_cortex_m1
diff --git a/boards/digilent/zybo/board.yml b/boards/digilent/zybo/board.yml
index c8970300955..f9c9c98bea2 100644
--- a/boards/digilent/zybo/board.yml
+++ b/boards/digilent/zybo/board.yml
@@ -1,6 +1,5 @@
 board:
   name: zybo
-  full_name: Zybo
   vendor: digilent
   socs:
   - name: xc7z010
diff --git a/boards/dptechnics/walter/board.yml b/boards/dptechnics/walter/board.yml
index 7d5b0e1cc85..c416d547fb2 100644
--- a/boards/dptechnics/walter/board.yml
+++ b/boards/dptechnics/walter/board.yml
@@ -1,6 +1,5 @@
 board:
   name: walter
-  full_name: Walter
   vendor: dptechnics
   socs:
   - name: esp32s3
diff --git a/boards/dragino/lsn50/board.yml b/boards/dragino/lsn50/board.yml
index 20732b34290..e7c09a9c7bd 100644
--- a/boards/dragino/lsn50/board.yml
+++ b/boards/dragino/lsn50/board.yml
@@ -1,6 +1,5 @@
 board:
   name: dragino_lsn50
-  full_name: LSN50 LoRA Sensor Node
   vendor: dragino
   socs:
     - name: stm32l072xx
diff --git a/boards/dragino/nbsn95/board.yml b/boards/dragino/nbsn95/board.yml
index fd039983458..66d568935ec 100644
--- a/boards/dragino/nbsn95/board.yml
+++ b/boards/dragino/nbsn95/board.yml
@@ -1,6 +1,5 @@
 board:
   name: dragino_nbsn95
-  full_name: NBSN95 NB-IoT Sensor Node
   vendor: dragino
   socs:
     - name: stm32l072xx
diff --git a/boards/ebyte/e73_tbb/board.yml b/boards/ebyte/e73_tbb/board.yml
index bd8dc6ca8b0..3ae94fab665 100644
--- a/boards/ebyte/e73_tbb/board.yml
+++ b/boards/ebyte/e73_tbb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ebyte_e73_tbb
-  full_name: E73-TBB
   vendor: ebyte
   socs:
   - name: nrf52832
diff --git a/boards/efinix/titanium_ti60_f225/board.yml b/boards/efinix/titanium_ti60_f225/board.yml
index 5dfb38b38b0..7daa700f0b3 100644
--- a/boards/efinix/titanium_ti60_f225/board.yml
+++ b/boards/efinix/titanium_ti60_f225/board.yml
@@ -1,6 +1,5 @@
 board:
   name: titanium_ti60_f225
-  full_name: Titanium Ti60 F225
   vendor: efinix
   socs:
   - name: efinix_sapphire
diff --git a/boards/electronut/nrf52840_blip/board.yml b/boards/electronut/nrf52840_blip/board.yml
index 874c923a092..3964f015c2f 100644
--- a/boards/electronut/nrf52840_blip/board.yml
+++ b/boards/electronut/nrf52840_blip/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf52840_blip
-  full_name: Labs Blip
   vendor: electronut
   socs:
   - name: nrf52840
diff --git a/boards/electronut/nrf52840_papyr/board.yml b/boards/electronut/nrf52840_papyr/board.yml
index e24da1b0b51..fcb089ad625 100644
--- a/boards/electronut/nrf52840_papyr/board.yml
+++ b/boards/electronut/nrf52840_papyr/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf52840_papyr
-  full_name: Labs Papyr
   vendor: electronut
   socs:
   - name: nrf52840
diff --git a/boards/element14/warp7/board.yml b/boards/element14/warp7/board.yml
index 492d4e53898..99b037ded48 100644
--- a/boards/element14/warp7/board.yml
+++ b/boards/element14/warp7/board.yml
@@ -1,6 +1,5 @@
 board:
   name: warp7
-  full_name: WaRP7 - Next Generation IoT and Wearable Development Platform
   vendor: element14
   socs:
     - name: mcimx7d
diff --git a/boards/enclustra/mercury_xu/board.yml b/boards/enclustra/mercury_xu/board.yml
index 2f88257c1ef..739a5c95857 100644
--- a/boards/enclustra/mercury_xu/board.yml
+++ b/boards/enclustra/mercury_xu/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mercury_xu
-  full_name: MERCURY-XU
   vendor: enclustra
   socs:
   - name: zynqmp_rpu
diff --git a/boards/ene/kb1200_evb/board.yml b/boards/ene/kb1200_evb/board.yml
index 7bff5726453..d8dd4b412c7 100644
--- a/boards/ene/kb1200_evb/board.yml
+++ b/boards/ene/kb1200_evb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: kb1200_evb
-  full_name: ENE KB1200_EVB
   vendor: ene
   socs:
   - name: kb1200
diff --git a/boards/enjoydigital/litex_vexriscv/board.yml b/boards/enjoydigital/litex_vexriscv/board.yml
index c5cd6829183..18ea360bb83 100644
--- a/boards/enjoydigital/litex_vexriscv/board.yml
+++ b/boards/enjoydigital/litex_vexriscv/board.yml
@@ -1,6 +1,5 @@
 board:
   name: litex_vexriscv
-  full_name: LiteX VexRiscv
   vendor: litex
   socs:
   - name: litex_vexriscv
diff --git a/boards/espressif/esp32_devkitc_wroom/board.yml b/boards/espressif/esp32_devkitc_wroom/board.yml
index e0d766da0d1..42d9d88dc23 100644
--- a/boards/espressif/esp32_devkitc_wroom/board.yml
+++ b/boards/espressif/esp32_devkitc_wroom/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp32_devkitc_wroom
-  full_name: ESP32-DevKitC-WROOM
   vendor: espressif
   socs:
   - name: esp32
diff --git a/boards/espressif/esp32_devkitc_wrover/board.yml b/boards/espressif/esp32_devkitc_wrover/board.yml
index 2a8e2a226fd..e0eae97f70f 100644
--- a/boards/espressif/esp32_devkitc_wrover/board.yml
+++ b/boards/espressif/esp32_devkitc_wrover/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp32_devkitc_wrover
-  full_name: ESP32-DevKitC-WROVER
   vendor: espressif
   socs:
   - name: esp32
diff --git a/boards/espressif/esp32_ethernet_kit/board.yml b/boards/espressif/esp32_ethernet_kit/board.yml
index b7a96265433..747690f38a6 100644
--- a/boards/espressif/esp32_ethernet_kit/board.yml
+++ b/boards/espressif/esp32_ethernet_kit/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp32_ethernet_kit
-  full_name: ESP32-Ethernet-Kit
   vendor: espressif
   socs:
   - name: esp32
diff --git a/boards/espressif/esp32c3_devkitc/board.yml b/boards/espressif/esp32c3_devkitc/board.yml
index 5f122687f00..22db88f664c 100644
--- a/boards/espressif/esp32c3_devkitc/board.yml
+++ b/boards/espressif/esp32c3_devkitc/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp32c3_devkitc
-  full_name: ESP32-C3-DevKitC
   vendor: espressif
   socs:
   - name: esp32c3
diff --git a/boards/espressif/esp32c3_devkitm/board.yml b/boards/espressif/esp32c3_devkitm/board.yml
index 90bd85dacc8..649dce34a7d 100644
--- a/boards/espressif/esp32c3_devkitm/board.yml
+++ b/boards/espressif/esp32c3_devkitm/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp32c3_devkitm
-  full_name: ESP32-C3-DevKitM
   vendor: espressif
   socs:
   - name: esp32c3
diff --git a/boards/espressif/esp32c3_rust/board.yml b/boards/espressif/esp32c3_rust/board.yml
index b8beeef6819..36dd9b55248 100644
--- a/boards/espressif/esp32c3_rust/board.yml
+++ b/boards/espressif/esp32c3_rust/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: esp32c3_rust
-  full_name: ESP32-C3-DevKit-RUST
   vendor: espressif
   socs:
   - name: esp32c3
diff --git a/boards/espressif/esp32c6_devkitc/board.yml b/boards/espressif/esp32c6_devkitc/board.yml
index 485d35b548d..ad88f3a9315 100644
--- a/boards/espressif/esp32c6_devkitc/board.yml
+++ b/boards/espressif/esp32c6_devkitc/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp32c6_devkitc
-  full_name: ESP32-C6-DevKitC
   vendor: espressif
   socs:
   - name: esp32c6
diff --git a/boards/espressif/esp32s2_devkitc/board.yml b/boards/espressif/esp32s2_devkitc/board.yml
index 8ec0a493d8c..b3d62e88686 100644
--- a/boards/espressif/esp32s2_devkitc/board.yml
+++ b/boards/espressif/esp32s2_devkitc/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp32s2_devkitc
-  full_name: ESP32-S2-DevKitC
   vendor: espressif
   socs:
   - name: esp32s2
diff --git a/boards/espressif/esp32s2_saola/board.yml b/boards/espressif/esp32s2_saola/board.yml
index 69eacbf8a2c..aafb5f3ee1e 100644
--- a/boards/espressif/esp32s2_saola/board.yml
+++ b/boards/espressif/esp32s2_saola/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp32s2_saola
-  full_name: ESP32-S2-Saola
   vendor: espressif
   socs:
   - name: esp32s2
diff --git a/boards/espressif/esp32s3_devkitc/board.yml b/boards/espressif/esp32s3_devkitc/board.yml
index 9d2eb9508e0..a949122fd57 100644
--- a/boards/espressif/esp32s3_devkitc/board.yml
+++ b/boards/espressif/esp32s3_devkitc/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp32s3_devkitc
-  full_name: ESP32-S3-DevKitC
   vendor: espressif
   socs:
   - name: esp32s3
diff --git a/boards/espressif/esp32s3_devkitm/board.yml b/boards/espressif/esp32s3_devkitm/board.yml
index 0e4abbade2e..2d0195fc27d 100644
--- a/boards/espressif/esp32s3_devkitm/board.yml
+++ b/boards/espressif/esp32s3_devkitm/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp32s3_devkitm
-  full_name: ESP32-S3-DevKitM
   vendor: espressif
   socs:
   - name: esp32s3
diff --git a/boards/espressif/esp32s3_eye/board.yml b/boards/espressif/esp32s3_eye/board.yml
index 9396b3c45db..b16a5a1605c 100644
--- a/boards/espressif/esp32s3_eye/board.yml
+++ b/boards/espressif/esp32s3_eye/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp32s3_eye
-  full_name: ESP32-S3-EYE
   vendor: espressif
   socs:
   - name: esp32s3
diff --git a/boards/espressif/esp8684_devkitm/board.yml b/boards/espressif/esp8684_devkitm/board.yml
index c6e86e6f11b..5173f52326d 100644
--- a/boards/espressif/esp8684_devkitm/board.yml
+++ b/boards/espressif/esp8684_devkitm/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp8684_devkitm
-  full_name: ESP8684-DevKitM
   vendor: espressif
   socs:
   - name: esp32c2
diff --git a/boards/espressif/esp_wrover_kit/board.yml b/boards/espressif/esp_wrover_kit/board.yml
index feb5c6b8bb0..edfaae90477 100644
--- a/boards/espressif/esp_wrover_kit/board.yml
+++ b/boards/espressif/esp_wrover_kit/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp_wrover_kit
-  full_name: ESP-WROVER-KIT
   vendor: espressif
   socs:
   - name: esp32
diff --git a/boards/ezurio/bl5340_dvk/board.yml b/boards/ezurio/bl5340_dvk/board.yml
index db71cf9ebe0..69be46ffe62 100644
--- a/boards/ezurio/bl5340_dvk/board.yml
+++ b/boards/ezurio/bl5340_dvk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: bl5340_dvk
-  full_name: BL5340 DVK
   vendor: ezurio
   socs:
   - name: 'nrf5340'
diff --git a/boards/ezurio/bl652_dvk/board.yml b/boards/ezurio/bl652_dvk/board.yml
index 2e8064165c0..b573627457f 100644
--- a/boards/ezurio/bl652_dvk/board.yml
+++ b/boards/ezurio/bl652_dvk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: bl652_dvk
-  full_name: BL652 DVK
   vendor: ezurio
   socs:
   - name: nrf52832
diff --git a/boards/ezurio/bl653_dvk/board.yml b/boards/ezurio/bl653_dvk/board.yml
index 5f6dac2d9ae..dc42555309a 100644
--- a/boards/ezurio/bl653_dvk/board.yml
+++ b/boards/ezurio/bl653_dvk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: bl653_dvk
-  full_name: BL653 DVK
   vendor: ezurio
   socs:
   - name: nrf52833
diff --git a/boards/ezurio/bl654_dvk/board.yml b/boards/ezurio/bl654_dvk/board.yml
index e92ddc965cf..fdc9035ff68 100644
--- a/boards/ezurio/bl654_dvk/board.yml
+++ b/boards/ezurio/bl654_dvk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: bl654_dvk
-  full_name: BL654 DVK
   vendor: ezurio
   socs:
   - name: nrf52840
diff --git a/boards/ezurio/bl654_sensor_board/board.yml b/boards/ezurio/bl654_sensor_board/board.yml
index dacfa7f7276..566c992411d 100644
--- a/boards/ezurio/bl654_sensor_board/board.yml
+++ b/boards/ezurio/bl654_sensor_board/board.yml
@@ -1,6 +1,5 @@
 board:
   name: bl654_sensor_board
-  full_name: BL654 Sensor Board
   vendor: ezurio
   socs:
   - name: nrf52840
diff --git a/boards/ezurio/bl654_usb/board.yml b/boards/ezurio/bl654_usb/board.yml
index 6329e4db30c..13642fbe712 100644
--- a/boards/ezurio/bl654_usb/board.yml
+++ b/boards/ezurio/bl654_usb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: bl654_usb
-  full_name: BL654 USB (451-00004)
   vendor: ezurio
   socs:
   - name: nrf52840
diff --git a/boards/ezurio/bt510/board.yml b/boards/ezurio/bt510/board.yml
index d95dcc4edfb..e4692ed4526 100644
--- a/boards/ezurio/bt510/board.yml
+++ b/boards/ezurio/bt510/board.yml
@@ -1,6 +1,5 @@
 board:
   name: bt510
-  full_name: Sentrius BT510 Sensor
   vendor: ezurio
   socs:
   - name: nrf52840
diff --git a/boards/ezurio/bt610/board.yml b/boards/ezurio/bt610/board.yml
index b586cf0a5ca..0e4f29742c5 100644
--- a/boards/ezurio/bt610/board.yml
+++ b/boards/ezurio/bt610/board.yml
@@ -1,6 +1,5 @@
 board:
   name: bt610
-  full_name: Sentrius BT610 Sensor
   vendor: ezurio
   socs:
   - name: nrf52840
diff --git a/boards/ezurio/mg100/board.yml b/boards/ezurio/mg100/board.yml
index 5a44c139a68..4c62320fc5e 100644
--- a/boards/ezurio/mg100/board.yml
+++ b/boards/ezurio/mg100/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mg100
-  full_name: Sentrius™ MG100 Gateway
   vendor: ezurio
   socs:
   - name: nrf52840
diff --git a/boards/ezurio/pinnacle_100_dvk/board.yml b/boards/ezurio/pinnacle_100_dvk/board.yml
index f2b98cd1577..8ed639a9a0a 100644
--- a/boards/ezurio/pinnacle_100_dvk/board.yml
+++ b/boards/ezurio/pinnacle_100_dvk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: pinnacle_100_dvk
-  full_name: Pinnacle 100 DVK
   vendor: ezurio
   socs:
   - name: nrf52840
diff --git a/boards/ezurio/rm1xx_dvk/board.yml b/boards/ezurio/rm1xx_dvk/board.yml
index f293c416c2d..4a8792eecc5 100644
--- a/boards/ezurio/rm1xx_dvk/board.yml
+++ b/boards/ezurio/rm1xx_dvk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: rm1xx_dvk
-  full_name: RM1xx DVK
   vendor: ezurio
   socs:
   - name: nrf51822
diff --git a/boards/fanke/fk7b0m1_vbt6/board.yml b/boards/fanke/fk7b0m1_vbt6/board.yml
index e4ce6586425..204e3538a93 100644
--- a/boards/fanke/fk7b0m1_vbt6/board.yml
+++ b/boards/fanke/fk7b0m1_vbt6/board.yml
@@ -1,6 +1,5 @@
 board:
   name: fk7b0m1_vbt6
-  full_name: FK7B0M1-VBT6
   vendor: fanke
   socs:
     - name: stm32h7b0xx
diff --git a/boards/firefly/roc_rk3568_pc/board.yml b/boards/firefly/roc_rk3568_pc/board.yml
index a123b1f37cc..8a60a165dc4 100644
--- a/boards/firefly/roc_rk3568_pc/board.yml
+++ b/boards/firefly/roc_rk3568_pc/board.yml
@@ -1,6 +1,5 @@
 board:
   name: roc_rk3568_pc
-  full_name: ROC-RK3568-PC (Quad-core Cortex-A55)
   vendor: firefly
   socs:
   - name: rk3568
diff --git a/boards/franzininho/esp32s2_franzininho/board.yml b/boards/franzininho/esp32s2_franzininho/board.yml
index 530d5dcec4e..913c4d4232f 100644
--- a/boards/franzininho/esp32s2_franzininho/board.yml
+++ b/boards/franzininho/esp32s2_franzininho/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp32s2_franzininho
-  full_name: ESP32-S2 Franzininho
   vendor: espressif
   socs:
   - name: esp32s2
diff --git a/boards/gaisler/generic_leon3/board.yml b/boards/gaisler/generic_leon3/board.yml
index 582dd45593b..33c4d806add 100644
--- a/boards/gaisler/generic_leon3/board.yml
+++ b/boards/gaisler/generic_leon3/board.yml
@@ -1,6 +1,5 @@
 board:
   name: generic_leon3
-  full_name: Generic LEON3
   vendor: gaisler
   socs:
   - name: leon3
diff --git a/boards/gaisler/gr716a_mini/board.yml b/boards/gaisler/gr716a_mini/board.yml
index b9155b69a92..0de80629b40 100644
--- a/boards/gaisler/gr716a_mini/board.yml
+++ b/boards/gaisler/gr716a_mini/board.yml
@@ -1,6 +1,5 @@
 board:
   name: gr716a_mini
-  full_name: GR716-MINI Development Board
   vendor: gaisler
   socs:
   - name: gr716a
diff --git a/boards/gd/gd32a503v_eval/board.yml b/boards/gd/gd32a503v_eval/board.yml
index 6097143109e..129cf4b0b50 100644
--- a/boards/gd/gd32a503v_eval/board.yml
+++ b/boards/gd/gd32a503v_eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: gd32a503v_eval
-  full_name: GD32A503V-EVAL
   vendor: gd
   socs:
     - name: gd32a503
diff --git a/boards/gd/gd32e103v_eval/board.yml b/boards/gd/gd32e103v_eval/board.yml
index cc70a188967..1c489697783 100644
--- a/boards/gd/gd32e103v_eval/board.yml
+++ b/boards/gd/gd32e103v_eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: gd32e103v_eval
-  full_name: GD32E103V-EVAL
   vendor: gd
   socs:
     - name: gd32e103
diff --git a/boards/gd/gd32e507v_start/board.yml b/boards/gd/gd32e507v_start/board.yml
index 09e4310394c..b364620f61a 100644
--- a/boards/gd/gd32e507v_start/board.yml
+++ b/boards/gd/gd32e507v_start/board.yml
@@ -1,6 +1,5 @@
 board:
   name: gd32e507v_start
-  full_name: GD32E507V-START
   vendor: gd
   socs:
     - name: gd32e507
diff --git a/boards/gd/gd32e507z_eval/board.yml b/boards/gd/gd32e507z_eval/board.yml
index 2eaba014c2c..2325550db5d 100644
--- a/boards/gd/gd32e507z_eval/board.yml
+++ b/boards/gd/gd32e507z_eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: gd32e507z_eval
-  full_name: GD32E507Z-EVAL
   vendor: gd
   socs:
     - name: gd32e507
diff --git a/boards/gd/gd32f350r_eval/board.yml b/boards/gd/gd32f350r_eval/board.yml
index a272193e2e8..ee486b17983 100644
--- a/boards/gd/gd32f350r_eval/board.yml
+++ b/boards/gd/gd32f350r_eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: gd32f350r_eval
-  full_name: GD32F350R-EVAL
   vendor: gd
   socs:
     - name: gd32f350
diff --git a/boards/gd/gd32f403z_eval/board.yml b/boards/gd/gd32f403z_eval/board.yml
index 3d45844a0c5..222ba863858 100644
--- a/boards/gd/gd32f403z_eval/board.yml
+++ b/boards/gd/gd32f403z_eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: gd32f403z_eval
-  full_name: GD32F403Z-EVAL
   vendor: gd
   socs:
     - name: gd32f403
diff --git a/boards/gd/gd32f407v_start/board.yml b/boards/gd/gd32f407v_start/board.yml
index bf6d7af7c34..c4a99ab566e 100644
--- a/boards/gd/gd32f407v_start/board.yml
+++ b/boards/gd/gd32f407v_start/board.yml
@@ -1,6 +1,5 @@
 board:
   name: gd32f407v_start
-  full_name: GD32F407V-START
   vendor: gd
   socs:
     - name: gd32f407
diff --git a/boards/gd/gd32f450i_eval/board.yml b/boards/gd/gd32f450i_eval/board.yml
index 56b3f1eebed..a5da3b33c36 100644
--- a/boards/gd/gd32f450i_eval/board.yml
+++ b/boards/gd/gd32f450i_eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: gd32f450i_eval
-  full_name: GD32F450I-EVAL
   vendor: gd
   socs:
     - name: gd32f450
diff --git a/boards/gd/gd32f450v_start/board.yml b/boards/gd/gd32f450v_start/board.yml
index 02b20c36692..96e00536946 100644
--- a/boards/gd/gd32f450v_start/board.yml
+++ b/boards/gd/gd32f450v_start/board.yml
@@ -1,6 +1,5 @@
 board:
   name: gd32f450v_start
-  full_name: GD32F450V-START
   vendor: gd
   socs:
     - name: gd32f450
diff --git a/boards/gd/gd32f450z_eval/board.yml b/boards/gd/gd32f450z_eval/board.yml
index f82107573f7..53e30794b6a 100644
--- a/boards/gd/gd32f450z_eval/board.yml
+++ b/boards/gd/gd32f450z_eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: gd32f450z_eval
-  full_name: GD32F450Z-EVAL
   vendor: gd
   socs:
     - name: gd32f450
diff --git a/boards/gd/gd32f470i_eval/board.yml b/boards/gd/gd32f470i_eval/board.yml
index c6cc2501b15..a4205dc69d2 100644
--- a/boards/gd/gd32f470i_eval/board.yml
+++ b/boards/gd/gd32f470i_eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: gd32f470i_eval
-  full_name: GD32F470I-EVAL
   vendor: gd
   socs:
     - name: gd32f470
diff --git a/boards/gd/gd32l233r_eval/board.yml b/boards/gd/gd32l233r_eval/board.yml
index 5b731d9bcff..847def4fe2c 100644
--- a/boards/gd/gd32l233r_eval/board.yml
+++ b/boards/gd/gd32l233r_eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: gd32l233r_eval
-  full_name: GD32L233R-EVA
   vendor: gd
   socs:
     - name: gd32l233
diff --git a/boards/gd/gd32vf103c_starter/board.yml b/boards/gd/gd32vf103c_starter/board.yml
index d46555ad96f..e91c7178af8 100644
--- a/boards/gd/gd32vf103c_starter/board.yml
+++ b/boards/gd/gd32vf103c_starter/board.yml
@@ -1,6 +1,5 @@
 board:
   name: gd32vf103c_starter
-  full_name: GD32VF103C-STARTER
   vendor: gd
   socs:
     - name: gd32vf103
diff --git a/boards/gd/gd32vf103v_eval/board.yml b/boards/gd/gd32vf103v_eval/board.yml
index 58c34ef2232..3d12d916d38 100644
--- a/boards/gd/gd32vf103v_eval/board.yml
+++ b/boards/gd/gd32vf103v_eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: gd32vf103v_eval
-  full_name: GD32VF103V-EVAL
   vendor: gd
   socs:
     - name: gd32vf103
diff --git a/boards/google/dragonclaw/board.yml b/boards/google/dragonclaw/board.yml
index be55d603e76..18e233f99b6 100644
--- a/boards/google/dragonclaw/board.yml
+++ b/boards/google/dragonclaw/board.yml
@@ -1,6 +1,5 @@
 board:
   name: google_dragonclaw
-  full_name: Dragonclaw Development Board
   vendor: google
   socs:
     - name: stm32f412cx
diff --git a/boards/google/twinkie_v2/board.yml b/boards/google/twinkie_v2/board.yml
index f7129ebec4f..b77d79328f7 100644
--- a/boards/google/twinkie_v2/board.yml
+++ b/boards/google/twinkie_v2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: google_twinkie_v2
-  full_name: Twinkie V2
   vendor: google
   socs:
     - name: stm32g0b1xx
diff --git a/boards/hardkernel/odroid_go/board.yml b/boards/hardkernel/odroid_go/board.yml
index 390cff4aa57..fad513c5ee9 100644
--- a/boards/hardkernel/odroid_go/board.yml
+++ b/boards/hardkernel/odroid_go/board.yml
@@ -1,6 +1,5 @@
 board:
   name: odroid_go
-  full_name: ODROID-GO
   vendor: hardkernel
   socs:
   - name: esp32
diff --git a/boards/heltec/heltec_wifi_lora32_v2/board.yml b/boards/heltec/heltec_wifi_lora32_v2/board.yml
index dee24b3f3b6..e87344a9766 100644
--- a/boards/heltec/heltec_wifi_lora32_v2/board.yml
+++ b/boards/heltec/heltec_wifi_lora32_v2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: heltec_wifi_lora32_v2
-  full_name: WiFi LoRa 32 (V2)
   vendor: heltec
   socs:
   - name: esp32
diff --git a/boards/heltec/heltec_wireless_stick_lite_v3/board.yml b/boards/heltec/heltec_wireless_stick_lite_v3/board.yml
index 315b46477ed..12cb133cb4f 100644
--- a/boards/heltec/heltec_wireless_stick_lite_v3/board.yml
+++ b/boards/heltec/heltec_wireless_stick_lite_v3/board.yml
@@ -1,6 +1,5 @@
 board:
   name: heltec_wireless_stick_lite_v3
-  full_name: Wireless Stick Lite (V3)
   vendor: heltec
   socs:
   - name: esp32s3
diff --git a/boards/holyiot/yj16019/board.yml b/boards/holyiot/yj16019/board.yml
index db082ff6428..e8ab16bc427 100644
--- a/boards/holyiot/yj16019/board.yml
+++ b/boards/holyiot/yj16019/board.yml
@@ -1,6 +1,5 @@
 board:
   name: holyiot_yj16019
-  full_name: YJ-16019
   vendor: holyiot
   socs:
   - name: nrf52832
diff --git a/boards/infineon/cy8ckit_062s4/board.yml b/boards/infineon/cy8ckit_062s4/board.yml
index 12d2f987008..c460d9f0503 100644
--- a/boards/infineon/cy8ckit_062s4/board.yml
+++ b/boards/infineon/cy8ckit_062s4/board.yml
@@ -1,6 +1,5 @@
 board:
   name: cy8ckit_062s4
-  full_name: PSOC 62S4 Pioneer Kit
   vendor: infineon
   socs:
   - name: cy8c6244lqi_s4d92
diff --git a/boards/infineon/cy8cproto_062_4343w/board.yml b/boards/infineon/cy8cproto_062_4343w/board.yml
index 6d697b9b142..f89df6ee65e 100644
--- a/boards/infineon/cy8cproto_062_4343w/board.yml
+++ b/boards/infineon/cy8cproto_062_4343w/board.yml
@@ -1,6 +1,5 @@
 board:
   name: cy8cproto_062_4343w
-  full_name: CY8CPROTO-062-4343W
   vendor: infineon
   socs:
   - name: cy8c624abzi_s2d44
diff --git a/boards/infineon/cy8cproto_063_ble/board.yml b/boards/infineon/cy8cproto_063_ble/board.yml
index d6083a9b171..6ef5bd8e9d7 100644
--- a/boards/infineon/cy8cproto_063_ble/board.yml
+++ b/boards/infineon/cy8cproto_063_ble/board.yml
@@ -1,6 +1,5 @@
 board:
   name: cy8cproto_063_ble
-  full_name: CY8CPROTO-063-BLE
   vendor: infineon
   socs:
   - name: cyble_416045_02
diff --git a/boards/infineon/cyw920829m2evk_02/board.yml b/boards/infineon/cyw920829m2evk_02/board.yml
index c6103646441..e25e3922b53 100644
--- a/boards/infineon/cyw920829m2evk_02/board.yml
+++ b/boards/infineon/cyw920829m2evk_02/board.yml
@@ -1,6 +1,5 @@
 board:
   name: cyw920829m2evk_02
-  full_name: CYW920829M2EVK-02
   vendor: infineon
   socs:
   - name: cyw20829b0lkml
diff --git a/boards/infineon/xmc45_relax_kit/board.yml b/boards/infineon/xmc45_relax_kit/board.yml
index 77d1049bf4c..9622337aa30 100644
--- a/boards/infineon/xmc45_relax_kit/board.yml
+++ b/boards/infineon/xmc45_relax_kit/board.yml
@@ -1,6 +1,5 @@
 board:
   name: xmc45_relax_kit
-  full_name: XMC45-RELAX-KIT
   vendor: infineon
   socs:
   - name: xmc4500
diff --git a/boards/infineon/xmc47_relax_kit/board.yml b/boards/infineon/xmc47_relax_kit/board.yml
index 4a081064beb..e0077321e3a 100644
--- a/boards/infineon/xmc47_relax_kit/board.yml
+++ b/boards/infineon/xmc47_relax_kit/board.yml
@@ -1,6 +1,5 @@
 board:
   name: xmc47_relax_kit
-  full_name: XMC47-RELAX-KIT
   vendor: infineon
   socs:
   - name: xmc4700
diff --git a/boards/innblue/innblue21/board.yml b/boards/innblue/innblue21/board.yml
index e8250dccf0c..8d62be56790 100644
--- a/boards/innblue/innblue21/board.yml
+++ b/boards/innblue/innblue21/board.yml
@@ -1,6 +1,5 @@
 board:
   name: innblue21
-  full_name: nRF9160 INNBLUE21
   vendor: innblue
   socs:
   - name: nrf9160
diff --git a/boards/innblue/innblue22/board.yml b/boards/innblue/innblue22/board.yml
index 2b7f6691aba..eeb4f946ffb 100644
--- a/boards/innblue/innblue22/board.yml
+++ b/boards/innblue/innblue22/board.yml
@@ -1,6 +1,5 @@
 board:
   name: innblue22
-  full_name: nRF9160 INNBLUE22
   vendor: innblue
   socs:
   - name: nrf9160
diff --git a/boards/intel/adl/board.yml b/boards/intel/adl/board.yml
index 29b9272757c..fe51b63f813 100644
--- a/boards/intel/adl/board.yml
+++ b/boards/intel/adl/board.yml
@@ -1,11 +1,9 @@
 boards:
   - name: intel_adl_crb
-    full_name: Alder Lake CRB
     vendor: intel
     socs:
       - name: alder_lake
   - name: intel_adl_rvp
-    full_name: Alder Lake RVP
     vendor: intel
     socs:
       - name: alder_lake
diff --git a/boards/intel/adsp/board.yml b/boards/intel/adsp/board.yml
index c169a14487b..43004e8f2a4 100644
--- a/boards/intel/adsp/board.yml
+++ b/boards/intel/adsp/board.yml
@@ -1,6 +1,5 @@
 boards:
   - name: intel_adsp
-    full_name: Intel ADSP
     vendor: intel
     socs:
       - name: cavs25
diff --git a/boards/intel/ehl/board.yml b/boards/intel/ehl/board.yml
index 05bb75ffe05..5f8d3cafa1b 100644
--- a/boards/intel/ehl/board.yml
+++ b/boards/intel/ehl/board.yml
@@ -1,6 +1,5 @@
 board:
   name: intel_ehl_crb
-  full_name: Elkhart Lake CRB
   vendor: intel
   socs:
     - name: elkhart_lake
diff --git a/boards/intel/ish/board.yml b/boards/intel/ish/board.yml
index 3083cc961db..ee7c4661800 100644
--- a/boards/intel/ish/board.yml
+++ b/boards/intel/ish/board.yml
@@ -1,19 +1,16 @@
 boards:
 
   - name: intel_ish_5_4_1
-    full_name: Integrated Sensor Hub (ISH) 5.4.1
     vendor: intel
     socs:
       - name: intel_ish_5_4_1
 
   - name: intel_ish_5_6_0
-    full_name: Integrated Sensor Hub (ISH) 5.6.0
     vendor: intel
     socs:
       - name: intel_ish_5_6_0
 
   - name: intel_ish_5_8_0
-    full_name: Integrated Sensor Hub (ISH) 5.8.0
     vendor: intel
     socs:
       - name: intel_ish_5_8_0
diff --git a/boards/intel/niosv_g/board.yml b/boards/intel/niosv_g/board.yml
index 811aee73f34..7f6cc30ce62 100644
--- a/boards/intel/niosv_g/board.yml
+++ b/boards/intel/niosv_g/board.yml
@@ -1,5 +1,4 @@
 board:
   name: niosv_g
-  full_name: INTEL FPGA niosv_g
   socs:
     - name: niosv_g
diff --git a/boards/intel/niosv_m/board.yml b/boards/intel/niosv_m/board.yml
index cc7b9bb3bf5..a77efa39ff1 100644
--- a/boards/intel/niosv_m/board.yml
+++ b/boards/intel/niosv_m/board.yml
@@ -1,5 +1,4 @@
 board:
   name: niosv_m
-  full_name: INTEL FPGA niosv_m
   socs:
     - name: niosv_m
diff --git a/boards/intel/rpl/board.yml b/boards/intel/rpl/board.yml
index 9f35b648699..cc3969adced 100644
--- a/boards/intel/rpl/board.yml
+++ b/boards/intel/rpl/board.yml
@@ -1,11 +1,9 @@
 boards:
   - name: intel_rpl_p_crb
-    full_name: Raptor Lake P CRB
     vendor: intel
     socs:
       - name: raptor_lake
   - name: intel_rpl_s_crb
-    full_name: Raptor Lake S CRB
     vendor: intel
     socs:
       - name: raptor_lake
diff --git a/boards/intel/socfpga/agilex5_socdk/board.yml b/boards/intel/socfpga/agilex5_socdk/board.yml
index f8ccbf5d8c5..fd4f5c91d66 100644
--- a/boards/intel/socfpga/agilex5_socdk/board.yml
+++ b/boards/intel/socfpga/agilex5_socdk/board.yml
@@ -1,5 +1,4 @@
 board:
   name: intel_socfpga_agilex5_socdk
-  full_name: Agilex™ 5 SoC FPGA Development Kit
   socs:
     - name: agilex5
diff --git a/boards/intel/socfpga/agilex_socdk/board.yml b/boards/intel/socfpga/agilex_socdk/board.yml
index 80763baa41b..1c09cba0491 100644
--- a/boards/intel/socfpga/agilex_socdk/board.yml
+++ b/boards/intel/socfpga/agilex_socdk/board.yml
@@ -1,5 +1,4 @@
 board:
   name: intel_socfpga_agilex_socdk
-  full_name: Agilex SoC Development Kit
   socs:
     - name: agilex
diff --git a/boards/intel/socfpga_std/cyclonev_socdk/board.yml b/boards/intel/socfpga_std/cyclonev_socdk/board.yml
index 222de69429a..420762dda3f 100644
--- a/boards/intel/socfpga_std/cyclonev_socdk/board.yml
+++ b/boards/intel/socfpga_std/cyclonev_socdk/board.yml
@@ -1,5 +1,4 @@
 board:
   name: cyclonev_socdk
-  full_name: Cyclone® V SoC Development Kit
   socs:
     - name: cyclonev
diff --git a/boards/ite/it82xx2_evb/board.yml b/boards/ite/it82xx2_evb/board.yml
index b36117cb4b4..f986050cad3 100644
--- a/boards/ite/it82xx2_evb/board.yml
+++ b/boards/ite/it82xx2_evb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: it82xx2_evb
-  full_name: IT82XX2 series
   vendor: ite
   socs:
     - name: it82202ax
diff --git a/boards/ite/it8xxx2_evb/board.yml b/boards/ite/it8xxx2_evb/board.yml
index 55f12393958..a676ec35fa8 100644
--- a/boards/ite/it8xxx2_evb/board.yml
+++ b/boards/ite/it8xxx2_evb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: it8xxx2_evb
-  full_name: IT8XXX2 series
   vendor: ite
   socs:
     - name: it81302bx
diff --git a/boards/khadas/edgev/board.yml b/boards/khadas/edgev/board.yml
index 3feee76d7df..fc70dcf0a44 100644
--- a/boards/khadas/edgev/board.yml
+++ b/boards/khadas/edgev/board.yml
@@ -1,6 +1,5 @@
 board:
   name: khadas_edgev
-  full_name: Edge-V
   vendor: khadas
   socs:
   - name: rk3399
diff --git a/boards/kincony/kincony_kc868_a32/board.yml b/boards/kincony/kincony_kc868_a32/board.yml
index 9a2144f7cd6..99bf4fa715b 100644
--- a/boards/kincony/kincony_kc868_a32/board.yml
+++ b/boards/kincony/kincony_kc868_a32/board.yml
@@ -1,6 +1,5 @@
 board:
   name: kincony_kc868_a32
-  full_name: KC868-A32
   vendor: kincony
   socs:
   - name: esp32
diff --git a/boards/lilygo/ttgo_lora32/board.yml b/boards/lilygo/ttgo_lora32/board.yml
index 3997b696fc9..8cccfbbf7d2 100644
--- a/boards/lilygo/ttgo_lora32/board.yml
+++ b/boards/lilygo/ttgo_lora32/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ttgo_lora32
-  full_name: TTGO LoRa32
   vendor: lilygo
   socs:
   - name: esp32
diff --git a/boards/lilygo/ttgo_t8c3/board.yml b/boards/lilygo/ttgo_t8c3/board.yml
index e6c08739aff..8b1084a4493 100644
--- a/boards/lilygo/ttgo_t8c3/board.yml
+++ b/boards/lilygo/ttgo_t8c3/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ttgo_t8c3
-  full_name: TTGO T8-C3
   vendor: lilygo
   socs:
   - name: esp32c3
diff --git a/boards/lowrisc/opentitan_earlgrey/board.yml b/boards/lowrisc/opentitan_earlgrey/board.yml
index 2659998727c..d7e8a24879c 100644
--- a/boards/lowrisc/opentitan_earlgrey/board.yml
+++ b/boards/lowrisc/opentitan_earlgrey/board.yml
@@ -1,6 +1,5 @@
 board:
   name: opentitan_earlgrey
-  full_name: OpenTitan Earl Grey
   vendor: lowrisc
   socs:
   - name: opentitan
diff --git a/boards/luatos/esp32c3_luatos_core/board.yml b/boards/luatos/esp32c3_luatos_core/board.yml
index 0269d7dc85a..e1a5ed42046 100644
--- a/boards/luatos/esp32c3_luatos_core/board.yml
+++ b/boards/luatos/esp32c3_luatos_core/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp32c3_luatos_core
-  full_name: ESP32C3_LUATOS_CORE
   vendor: luatos
   socs:
   - name: esp32c3
diff --git a/boards/luatos/esp32s3_luatos_core/board.yml b/boards/luatos/esp32s3_luatos_core/board.yml
index e806b61e906..cd29886c969 100644
--- a/boards/luatos/esp32s3_luatos_core/board.yml
+++ b/boards/luatos/esp32s3_luatos_core/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp32s3_luatos_core
-  full_name: ESP32S3-Luatos-Core
   vendor: luatos
   socs:
   - name: esp32s3
diff --git a/boards/m5stack/m5stack_atom_lite/board.yml b/boards/m5stack/m5stack_atom_lite/board.yml
index 964abb52f7e..d7202eda266 100644
--- a/boards/m5stack/m5stack_atom_lite/board.yml
+++ b/boards/m5stack/m5stack_atom_lite/board.yml
@@ -1,6 +1,5 @@
 board:
   name: m5stack_atom_lite
-  full_name: ATOM Lite
   vendor: m5stack
   socs:
   - name: esp32
diff --git a/boards/m5stack/m5stack_atoms3/board.yml b/boards/m5stack/m5stack_atoms3/board.yml
index c74186cdcd5..4126aa17d2e 100644
--- a/boards/m5stack/m5stack_atoms3/board.yml
+++ b/boards/m5stack/m5stack_atoms3/board.yml
@@ -1,6 +1,5 @@
 board:
   name: m5stack_atoms3
-  full_name: AtomS3
   vendor: m5stack
   socs:
   - name: esp32s3
diff --git a/boards/m5stack/m5stack_atoms3_lite/board.yml b/boards/m5stack/m5stack_atoms3_lite/board.yml
index 6445b3d9a4f..c9204d5159c 100644
--- a/boards/m5stack/m5stack_atoms3_lite/board.yml
+++ b/boards/m5stack/m5stack_atoms3_lite/board.yml
@@ -1,6 +1,5 @@
 board:
   name: m5stack_atoms3_lite
-  full_name: AtomS3 Lite
   vendor: m5stack
   socs:
   - name: esp32s3
diff --git a/boards/m5stack/m5stack_core2/board.yml b/boards/m5stack/m5stack_core2/board.yml
index 9a002aa2859..1ff253f8201 100644
--- a/boards/m5stack/m5stack_core2/board.yml
+++ b/boards/m5stack/m5stack_core2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: m5stack_core2
-  full_name: Core2
   vendor: m5stack
   socs:
   - name: esp32
diff --git a/boards/m5stack/m5stack_stamps3/board.yml b/boards/m5stack/m5stack_stamps3/board.yml
index 0ac071b1667..e723d91c19a 100644
--- a/boards/m5stack/m5stack_stamps3/board.yml
+++ b/boards/m5stack/m5stack_stamps3/board.yml
@@ -1,6 +1,5 @@
 board:
   name: m5stack_stamps3
-  full_name: StampS3
   vendor: m5stack
   socs:
   - name: esp32s3
diff --git a/boards/m5stack/m5stickc_plus/board.yml b/boards/m5stack/m5stickc_plus/board.yml
index 20a1d324a9d..3a604266d07 100644
--- a/boards/m5stack/m5stickc_plus/board.yml
+++ b/boards/m5stack/m5stickc_plus/board.yml
@@ -1,6 +1,5 @@
 board:
   name: m5stickc_plus
-  full_name: M5StickC PLUS
   vendor: m5stack
   socs:
   - name: esp32
diff --git a/boards/m5stack/stamp_c3/board.yml b/boards/m5stack/stamp_c3/board.yml
index 244d9b12302..aa24963edd6 100644
--- a/boards/m5stack/stamp_c3/board.yml
+++ b/boards/m5stack/stamp_c3/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stamp_c3
-  full_name: STAMP-C3
   vendor: m5stack
   socs:
   - name: esp32c3
diff --git a/boards/madmachine/mm_feather/board.yml b/boards/madmachine/mm_feather/board.yml
index 23adcce1a2f..1b9ca3f2c7c 100644
--- a/boards/madmachine/mm_feather/board.yml
+++ b/boards/madmachine/mm_feather/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mm_feather
-  full_name: SwiftIO Feather
   vendor: madmachine
   socs:
     - name: mimxrt1062
diff --git a/boards/madmachine/mm_swiftio/board.yml b/boards/madmachine/mm_swiftio/board.yml
index 0f3f04f5526..784e79c52ad 100644
--- a/boards/madmachine/mm_swiftio/board.yml
+++ b/boards/madmachine/mm_swiftio/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mm_swiftio
-  full_name: SwiftIO
   vendor: madmachine
   socs:
     - name: mimxrt1052
diff --git a/boards/makerdiary/nrf52832_mdk/board.yml b/boards/makerdiary/nrf52832_mdk/board.yml
index 7faf1088ce7..70028809dc3 100644
--- a/boards/makerdiary/nrf52832_mdk/board.yml
+++ b/boards/makerdiary/nrf52832_mdk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf52832_mdk
-  full_name: nRF52832-mdk
   vendor: makerdiary
   socs:
   - name: nrf52832
diff --git a/boards/makerdiary/nrf52840_mdk/board.yml b/boards/makerdiary/nrf52840_mdk/board.yml
index dddbb5a3bb3..09e13811fc3 100644
--- a/boards/makerdiary/nrf52840_mdk/board.yml
+++ b/boards/makerdiary/nrf52840_mdk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf52840_mdk
-  full_name: nRF52840-mdk
   vendor: makerdiary
   socs:
   - name: nrf52840
diff --git a/boards/makerdiary/nrf52840_mdk_usb_dongle/board.yml b/boards/makerdiary/nrf52840_mdk_usb_dongle/board.yml
index 4326881bc4d..1c3020c52b5 100644
--- a/boards/makerdiary/nrf52840_mdk_usb_dongle/board.yml
+++ b/boards/makerdiary/nrf52840_mdk_usb_dongle/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf52840_mdk_usb_dongle
-  full_name: nRF52840 MDK USB Dongle
   vendor: makerdiary
   socs:
   - name: nrf52840
diff --git a/boards/mediatek/mt8195_adsp/board.yml b/boards/mediatek/mt8195_adsp/board.yml
index a58b33ecf8d..22c31deb1a0 100644
--- a/boards/mediatek/mt8195_adsp/board.yml
+++ b/boards/mediatek/mt8195_adsp/board.yml
@@ -1,6 +1,5 @@
 boards:
   - name: mt8195_adsp
-    full_name: MT8195 ADSP
     vendor: mediatek
     socs:
       - name: mt8195_adsp
diff --git a/boards/microchip/ev11l78a/board.yml b/boards/microchip/ev11l78a/board.yml
index b078a725e8c..abaabec67ab 100644
--- a/boards/microchip/ev11l78a/board.yml
+++ b/boards/microchip/ev11l78a/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ev11l78a
-  full_name: UPD301C Basic Sink Application Example
   vendor: microchip
   socs:
     - name: samd20e16
diff --git a/boards/microchip/m2gl025_miv/board.yml b/boards/microchip/m2gl025_miv/board.yml
index f3fba2a9720..84e61821f35 100644
--- a/boards/microchip/m2gl025_miv/board.yml
+++ b/boards/microchip/m2gl025_miv/board.yml
@@ -1,6 +1,5 @@
 board:
   name: m2gl025_miv
-  full_name: M2GL025 Mi-V
   vendor: microchip
   socs:
   - name: miv
diff --git a/boards/microchip/mec1501modular_assy6885/board.yml b/boards/microchip/mec1501modular_assy6885/board.yml
index 62f58a26666..d45ec4217f7 100644
--- a/boards/microchip/mec1501modular_assy6885/board.yml
+++ b/boards/microchip/mec1501modular_assy6885/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mec1501modular_assy6885
-  full_name: MEC1501 Modular card ASSY6885
   vendor: microchip
   socs:
     - name: mec1501_hsz
diff --git a/boards/microchip/mec15xxevb_assy6853/board.yml b/boards/microchip/mec15xxevb_assy6853/board.yml
index c4cba01d0dd..ae558489438 100644
--- a/boards/microchip/mec15xxevb_assy6853/board.yml
+++ b/boards/microchip/mec15xxevb_assy6853/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mec15xxevb_assy6853
-  full_name: MEC15xxEVB ASSY6853
   vendor: microchip
   socs:
     - name: mec1501_hsz
diff --git a/boards/microchip/mec172xevb_assy6906/board.yml b/boards/microchip/mec172xevb_assy6906/board.yml
index 0ad61bcc1c7..5f3f57b29a7 100644
--- a/boards/microchip/mec172xevb_assy6906/board.yml
+++ b/boards/microchip/mec172xevb_assy6906/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mec172xevb_assy6906
-  full_name: MEC172xEVB ASSY6906
   vendor: microchip
   socs:
     - name: mec172x_nsz
diff --git a/boards/microchip/mec172xmodular_assy6930/board.yml b/boards/microchip/mec172xmodular_assy6930/board.yml
index e7a176038af..1fe04eba6e8 100644
--- a/boards/microchip/mec172xmodular_assy6930/board.yml
+++ b/boards/microchip/mec172xmodular_assy6930/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mec172xmodular_assy6930
-  full_name: MEC172x Modular Card ASSY6930 (Rev. B)
   vendor: microchip
   socs:
     - name: mec172x_nsz
diff --git a/boards/microchip/mpfs_icicle/board.yml b/boards/microchip/mpfs_icicle/board.yml
index fb03fb4c8c4..b9799c5830e 100644
--- a/boards/microchip/mpfs_icicle/board.yml
+++ b/boards/microchip/mpfs_icicle/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mpfs_icicle
-  full_name: mpfs_icicle
   vendor: microchip
   socs:
   - name: polarfire
diff --git a/boards/mikroe/clicker_2/board.yml b/boards/mikroe/clicker_2/board.yml
index 11b092291cc..8ffead86036 100644
--- a/boards/mikroe/clicker_2/board.yml
+++ b/boards/mikroe/clicker_2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mikroe_clicker_2
-  full_name: Clicker 2 for STM32
   vendor: mikroe
   socs:
     - name: stm32f407xx
diff --git a/boards/mikroe/clicker_ra4m1/board.yml b/boards/mikroe/clicker_ra4m1/board.yml
index 7d4c5beee0e..1635cd26a5d 100644
--- a/boards/mikroe/clicker_ra4m1/board.yml
+++ b/boards/mikroe/clicker_ra4m1/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: mikroe_clicker_ra4m1
-  full_name: Clicker RA4M1
   vendor: mikroe
   socs:
     - name: r7fa4m1ab3cfm
diff --git a/boards/mikroe/mini_m4_for_stm32/board.yml b/boards/mikroe/mini_m4_for_stm32/board.yml
index 84a50a3e090..60dde764fe6 100644
--- a/boards/mikroe/mini_m4_for_stm32/board.yml
+++ b/boards/mikroe/mini_m4_for_stm32/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mikroe_mini_m4_for_stm32
-  full_name: MINI-M4 for STM32
   vendor: mikroe
   socs:
     - name: stm32f415xx
diff --git a/boards/mikroe/stm32_m4_clicker/board.yml b/boards/mikroe/stm32_m4_clicker/board.yml
index ad387120bc5..56a329a900f 100644
--- a/boards/mikroe/stm32_m4_clicker/board.yml
+++ b/boards/mikroe/stm32_m4_clicker/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: mikroe_stm32_m4_clicker
-  full_name: STM32 M4 Clicker
   vendor: mikroe
   socs:
     - name: stm32f415xx
diff --git a/boards/mxchip/az3166_iotdevkit/board.yml b/boards/mxchip/az3166_iotdevkit/board.yml
index 3cf58f575eb..4ac727ed1c2 100644
--- a/boards/mxchip/az3166_iotdevkit/board.yml
+++ b/boards/mxchip/az3166_iotdevkit/board.yml
@@ -1,6 +1,5 @@
 board:
   name: az3166_iotdevkit
-  full_name: AZ3166 MXChip IoT DevKit
   vendor: mxchip
   socs:
     - name: stm32f412rx
diff --git a/boards/native/native_posix/board.yml b/boards/native/native_posix/board.yml
index 07defd4185b..0f03465c79b 100644
--- a/boards/native/native_posix/board.yml
+++ b/boards/native/native_posix/board.yml
@@ -1,6 +1,5 @@
 boards:
 - name: native_posix
-  full_name: Native POSIX execution (native_posix)
   vendor: zephyr
   socs:
   - name: native
diff --git a/boards/native/native_sim/board.yml b/boards/native/native_sim/board.yml
index cebff14d48a..19492170138 100644
--- a/boards/native/native_sim/board.yml
+++ b/boards/native/native_sim/board.yml
@@ -1,6 +1,5 @@
 boards:
 - name: native_sim
-  full_name: Native simulator - native_sim
   vendor: zephyr
   socs:
   - name: native
diff --git a/boards/native/nrf_bsim/board.yml b/boards/native/nrf_bsim/board.yml
index 0ba40b33677..ba14ed8aef6 100644
--- a/boards/native/nrf_bsim/board.yml
+++ b/boards/native/nrf_bsim/board.yml
@@ -1,16 +1,13 @@
 boards:
 - name: nrf52_bsim
-  full_name: nRF52 simulated board (BabbleSim)
   vendor: zephyr
   socs:
   - name: native
 - name: nrf5340bsim
-  full_name: nRF5340 simulated boards (BabbleSim)
   vendor: zephyr
   socs:
   - name: nrf5340
 - name: nrf54l15bsim
-  full_name: nRF54L15 simulated boards (BabbleSim)
   vendor: zephyr
   socs:
   - name: nrf54l15
diff --git a/boards/nordic/nrf21540dk/board.yml b/boards/nordic/nrf21540dk/board.yml
index 3c977f4489f..4c9cf5943fe 100644
--- a/boards/nordic/nrf21540dk/board.yml
+++ b/boards/nordic/nrf21540dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf21540dk
-  full_name: nRF21540 DK
   vendor: nordic
   socs:
   - name: nrf52840
diff --git a/boards/nordic/nrf51dk/board.yml b/boards/nordic/nrf51dk/board.yml
index 888f9c883b5..788be3d79bc 100644
--- a/boards/nordic/nrf51dk/board.yml
+++ b/boards/nordic/nrf51dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf51dk
-  full_name: nRF51 DK
   vendor: nordic
   socs:
   - name: nrf51822
diff --git a/boards/nordic/nrf51dongle/board.yml b/boards/nordic/nrf51dongle/board.yml
index 99d423528ed..4c89cac7fdc 100644
--- a/boards/nordic/nrf51dongle/board.yml
+++ b/boards/nordic/nrf51dongle/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf51dongle
-  full_name: nRF51 Dongle
   vendor: nordic
   socs:
   - name: nrf51822
diff --git a/boards/nordic/nrf52833dk/board.yml b/boards/nordic/nrf52833dk/board.yml
index dbb8e020d51..2d6b6e5b12f 100644
--- a/boards/nordic/nrf52833dk/board.yml
+++ b/boards/nordic/nrf52833dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf52833dk
-  full_name: nRF52833 DK
   vendor: nordic
   socs:
   - name: nrf52820
diff --git a/boards/nordic/nrf52840dk/board.yml b/boards/nordic/nrf52840dk/board.yml
index 8b6bdef90e2..d15e1975027 100644
--- a/boards/nordic/nrf52840dk/board.yml
+++ b/boards/nordic/nrf52840dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf52840dk
-  full_name: nRF52840 DK
   vendor: nordic
   socs:
   # Physical nRF52840 SoC on PCA10056
diff --git a/boards/nordic/nrf52840dongle/board.yml b/boards/nordic/nrf52840dongle/board.yml
index 59eae5b3429..a22449e5519 100644
--- a/boards/nordic/nrf52840dongle/board.yml
+++ b/boards/nordic/nrf52840dongle/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf52840dongle
-  full_name: nRF52840 Dongle
   vendor: nordic
   socs:
   - name: nrf52840
diff --git a/boards/nordic/nrf52dk/board.yml b/boards/nordic/nrf52dk/board.yml
index bf4d819be0f..1f21be9c60e 100644
--- a/boards/nordic/nrf52dk/board.yml
+++ b/boards/nordic/nrf52dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf52dk
-  full_name: nRF52 DK
   vendor: nordic
   socs:
   - name: nrf52805
diff --git a/boards/nordic/nrf5340_audio_dk/board.yml b/boards/nordic/nrf5340_audio_dk/board.yml
index 4dc67d1bb6f..443381b9461 100644
--- a/boards/nordic/nrf5340_audio_dk/board.yml
+++ b/boards/nordic/nrf5340_audio_dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf5340_audio_dk
-  full_name: nRF5340 Audio DK
   vendor: nordic
   socs:
   - name: 'nrf5340'
diff --git a/boards/nordic/nrf5340dk/board.yml b/boards/nordic/nrf5340dk/board.yml
index 2454c47862b..fd90df34350 100644
--- a/boards/nordic/nrf5340dk/board.yml
+++ b/boards/nordic/nrf5340dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf5340dk
-  full_name: nRF5340 DK
   vendor: nordic
   socs:
   - name: 'nrf5340'
diff --git a/boards/nordic/nrf54h20dk/board.yml b/boards/nordic/nrf54h20dk/board.yml
index 82a738d8b03..7d57b61cd53 100644
--- a/boards/nordic/nrf54h20dk/board.yml
+++ b/boards/nordic/nrf54h20dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf54h20dk
-  full_name: nRF54H20 DK
   vendor: nordic
   socs:
   - name: nrf54h20
diff --git a/boards/nordic/nrf54l15dk/board.yml b/boards/nordic/nrf54l15dk/board.yml
index 8d750b3d14b..7a8bf2f5cf1 100644
--- a/boards/nordic/nrf54l15dk/board.yml
+++ b/boards/nordic/nrf54l15dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf54l15dk
-  full_name: nRF54L15 DK
   vendor: nordic
   socs:
   - name: nrf54l15
diff --git a/boards/nordic/nrf54l15pdk/board.yml b/boards/nordic/nrf54l15pdk/board.yml
index 1432bfc3ea6..e692040f7bd 100644
--- a/boards/nordic/nrf54l15pdk/board.yml
+++ b/boards/nordic/nrf54l15pdk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf54l15pdk
-  full_name: nRF54L15 PDK
   vendor: nordic
   socs:
   - name: nrf54l15
diff --git a/boards/nordic/nrf54l20pdk/board.yml b/boards/nordic/nrf54l20pdk/board.yml
index 4eaa66669fc..717adf8e75e 100644
--- a/boards/nordic/nrf54l20pdk/board.yml
+++ b/boards/nordic/nrf54l20pdk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf54l20pdk
-  full_name: nRF54L20 PDK
   vendor: nordic
   socs:
   - name: nrf54l20
diff --git a/boards/nordic/nrf7002dk/board.yml b/boards/nordic/nrf7002dk/board.yml
index 39db5dcfa3a..ca94d73429e 100644
--- a/boards/nordic/nrf7002dk/board.yml
+++ b/boards/nordic/nrf7002dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf7002dk
-  full_name: nRF7002 DK
   vendor: nordic
   socs:
     - name: nrf5340
diff --git a/boards/nordic/nrf9131ek/board.yml b/boards/nordic/nrf9131ek/board.yml
index 6e91098f63b..246aef6f4e3 100644
--- a/boards/nordic/nrf9131ek/board.yml
+++ b/boards/nordic/nrf9131ek/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf9131ek
-  full_name: nRF9131 EK
   vendor: nordic
   socs:
   - name: nrf9131
diff --git a/boards/nordic/nrf9151dk/board.yml b/boards/nordic/nrf9151dk/board.yml
index 468b8f0fa2a..f765134a460 100644
--- a/boards/nordic/nrf9151dk/board.yml
+++ b/boards/nordic/nrf9151dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf9151dk
-  full_name: nRF9151 DK
   vendor: nordic
   socs:
   - name: nrf9151
diff --git a/boards/nordic/nrf9160dk/board.yml b/boards/nordic/nrf9160dk/board.yml
index 1f043a0af8c..5e6dcfad89b 100644
--- a/boards/nordic/nrf9160dk/board.yml
+++ b/boards/nordic/nrf9160dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf9160dk
-  full_name: nRF9160 DK
   vendor: nordic
   socs:
   - name: nrf9160
diff --git a/boards/nordic/nrf9161dk/board.yml b/boards/nordic/nrf9161dk/board.yml
index da9bafb11d0..9bffcec81a6 100644
--- a/boards/nordic/nrf9161dk/board.yml
+++ b/boards/nordic/nrf9161dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf9161dk
-  full_name: nRF9161 DK
   vendor: nordic
   socs:
   - name: nrf9161
diff --git a/boards/nordic/nrf9280pdk/board.yml b/boards/nordic/nrf9280pdk/board.yml
index 963eae59ba0..450ef9db901 100644
--- a/boards/nordic/nrf9280pdk/board.yml
+++ b/boards/nordic/nrf9280pdk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf9280pdk
-  full_name: nRF9280 PDK
   vendor: nordic
   socs:
   - name: nrf9280
diff --git a/boards/nordic/thingy52/board.yml b/boards/nordic/thingy52/board.yml
index 010d40677db..425e24fb596 100644
--- a/boards/nordic/thingy52/board.yml
+++ b/boards/nordic/thingy52/board.yml
@@ -1,6 +1,5 @@
 board:
   name: thingy52
-  full_name: "Thingy:52"
   vendor: nordic
   socs:
   - name: nrf52832
diff --git a/boards/nordic/thingy53/board.yml b/boards/nordic/thingy53/board.yml
index 46c8112cc95..4659222a346 100644
--- a/boards/nordic/thingy53/board.yml
+++ b/boards/nordic/thingy53/board.yml
@@ -1,6 +1,5 @@
 board:
   name: thingy53
-  full_name: "Thingy:53"
   vendor: nordic
   socs:
   - name: 'nrf5340'
diff --git a/boards/nuvoton/npcm400_evb/board.yml b/boards/nuvoton/npcm400_evb/board.yml
index c73b1d69caa..1a428cc5fe1 100644
--- a/boards/nuvoton/npcm400_evb/board.yml
+++ b/boards/nuvoton/npcm400_evb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: npcm400_evb
-  full_name: NPCM400_EVB
   vendor: nuvoton
   socs:
   - name: npcm400
diff --git a/boards/nuvoton/npcx4m8f_evb/board.yml b/boards/nuvoton/npcx4m8f_evb/board.yml
index 39fcc762796..16f6190d195 100644
--- a/boards/nuvoton/npcx4m8f_evb/board.yml
+++ b/boards/nuvoton/npcx4m8f_evb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: npcx4m8f_evb
-  full_name: NPCX4M8F_EVB
   vendor: nuvoton
   socs:
   - name: npcx4m8f
diff --git a/boards/nuvoton/npcx7m6fb_evb/board.yml b/boards/nuvoton/npcx7m6fb_evb/board.yml
index 71c0df6ba3d..33528cde347 100644
--- a/boards/nuvoton/npcx7m6fb_evb/board.yml
+++ b/boards/nuvoton/npcx7m6fb_evb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: npcx7m6fb_evb
-  full_name: NPCX7M6FB_EVB
   vendor: nuvoton
   socs:
   - name: npcx7m6fb
diff --git a/boards/nuvoton/npcx9m6f_evb/board.yml b/boards/nuvoton/npcx9m6f_evb/board.yml
index ff77a27a292..7baeb00dfa3 100644
--- a/boards/nuvoton/npcx9m6f_evb/board.yml
+++ b/boards/nuvoton/npcx9m6f_evb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: npcx9m6f_evb
-  full_name: NPCX9M6F_EVB
   vendor: nuvoton
   socs:
   - name: npcx9m6f
diff --git a/boards/nuvoton/numaker_m2l31ki/board.yml b/boards/nuvoton/numaker_m2l31ki/board.yml
index 610fc26e81f..f01805447fa 100644
--- a/boards/nuvoton/numaker_m2l31ki/board.yml
+++ b/boards/nuvoton/numaker_m2l31ki/board.yml
@@ -1,6 +1,5 @@
 board:
   name: numaker_m2l31ki
-  full_name: NUMAKER M2L31KI
   vendor: nuvoton
   socs:
   - name: m2l31xxx
diff --git a/boards/nuvoton/numaker_pfm_m467/board.yml b/boards/nuvoton/numaker_pfm_m467/board.yml
index e57042889ff..d9b195940ee 100644
--- a/boards/nuvoton/numaker_pfm_m467/board.yml
+++ b/boards/nuvoton/numaker_pfm_m467/board.yml
@@ -1,6 +1,5 @@
 board:
   name: numaker_pfm_m467
-  full_name: NUMAKER PFM M467
   vendor: nuvoton
   socs:
   - name: m467
diff --git a/boards/nuvoton/numaker_pfm_m487/board.yml b/boards/nuvoton/numaker_pfm_m487/board.yml
index 82a0720db53..cc9dc43fe6a 100644
--- a/boards/nuvoton/numaker_pfm_m487/board.yml
+++ b/boards/nuvoton/numaker_pfm_m487/board.yml
@@ -1,6 +1,5 @@
 board:
   name: numaker_pfm_m487
-  full_name: NUMAKER PFM M487
   vendor: nuvoton
   socs:
   - name: m487
diff --git a/boards/nxp/frdm_k22f/board.yml b/boards/nxp/frdm_k22f/board.yml
index 0e8ad732f39..0498d799129 100644
--- a/boards/nxp/frdm_k22f/board.yml
+++ b/boards/nxp/frdm_k22f/board.yml
@@ -1,6 +1,5 @@
 board:
   name: frdm_k22f
-  full_name: FRDM-K22F
   vendor: nxp
   socs:
     - name: mk22f51212
diff --git a/boards/nxp/frdm_k64f/board.yml b/boards/nxp/frdm_k64f/board.yml
index 2de73a4ea2c..a338af6b99c 100644
--- a/boards/nxp/frdm_k64f/board.yml
+++ b/boards/nxp/frdm_k64f/board.yml
@@ -1,6 +1,5 @@
 board:
   name: frdm_k64f
-  full_name: FRDM-K64F
   vendor: nxp
   socs:
     - name: mk64f12
diff --git a/boards/nxp/frdm_k82f/board.yml b/boards/nxp/frdm_k82f/board.yml
index 513136f3e09..cf7bc47e121 100644
--- a/boards/nxp/frdm_k82f/board.yml
+++ b/boards/nxp/frdm_k82f/board.yml
@@ -1,6 +1,5 @@
 board:
   name: frdm_k82f
-  full_name: FRDM-K82F
   vendor: nxp
   socs:
     - name: mk82f25615
diff --git a/boards/nxp/frdm_ke15z/board.yml b/boards/nxp/frdm_ke15z/board.yml
index 927356cf0db..c637334b8b8 100644
--- a/boards/nxp/frdm_ke15z/board.yml
+++ b/boards/nxp/frdm_ke15z/board.yml
@@ -1,6 +1,5 @@
 board:
   name: frdm_ke15z
-  full_name: FRDM-KE15Z
   vendor: nxp
   socs:
     - name: mke15z7
diff --git a/boards/nxp/frdm_ke17z/board.yml b/boards/nxp/frdm_ke17z/board.yml
index 9576c95012a..a6b72f27f20 100644
--- a/boards/nxp/frdm_ke17z/board.yml
+++ b/boards/nxp/frdm_ke17z/board.yml
@@ -1,6 +1,5 @@
 board:
   name: frdm_ke17z
-  full_name: FRDM-KE17Z
   vendor: nxp
   socs:
     - name: mke17z7
diff --git a/boards/nxp/frdm_ke17z512/board.yml b/boards/nxp/frdm_ke17z512/board.yml
index 306ddf305bf..46839e065b1 100644
--- a/boards/nxp/frdm_ke17z512/board.yml
+++ b/boards/nxp/frdm_ke17z512/board.yml
@@ -1,6 +1,5 @@
 board:
   name: frdm_ke17z512
-  full_name: FRDM-KE17Z512
   vendor: nxp
   socs:
     - name: mke17z9
diff --git a/boards/nxp/frdm_kl25z/board.yml b/boards/nxp/frdm_kl25z/board.yml
index de3270eba7c..0caf35c690e 100644
--- a/boards/nxp/frdm_kl25z/board.yml
+++ b/boards/nxp/frdm_kl25z/board.yml
@@ -1,6 +1,5 @@
 board:
   name: frdm_kl25z
-  full_name: FRDM-KL25Z
   vendor: nxp
   socs:
     - name: mkl25z4
diff --git a/boards/nxp/frdm_kw41z/board.yml b/boards/nxp/frdm_kw41z/board.yml
index 94a99c91974..b17c67beb3e 100644
--- a/boards/nxp/frdm_kw41z/board.yml
+++ b/boards/nxp/frdm_kw41z/board.yml
@@ -1,6 +1,5 @@
 board:
   name: frdm_kw41z
-  full_name: FRDM-KW41Z
   vendor: nxp
   socs:
     - name: mkw41z4
diff --git a/boards/nxp/frdm_mcxa156/board.yml b/boards/nxp/frdm_mcxa156/board.yml
index 8107aa33aee..fd3cb5a5c6d 100644
--- a/boards/nxp/frdm_mcxa156/board.yml
+++ b/boards/nxp/frdm_mcxa156/board.yml
@@ -1,6 +1,5 @@
 board:
   name: frdm_mcxa156
-  full_name: FRDM-MCXA156
   vendor: nxp
   socs:
   - name: mcxa156
diff --git a/boards/nxp/frdm_mcxc242/board.yml b/boards/nxp/frdm_mcxc242/board.yml
index 9dc5bbe7f5f..2aa0aaa3da1 100644
--- a/boards/nxp/frdm_mcxc242/board.yml
+++ b/boards/nxp/frdm_mcxc242/board.yml
@@ -1,6 +1,5 @@
 board:
   name: frdm_mcxc242
-  full_name: FRDM-MCXC242
   vendor: nxp
   socs:
     - name: mcxc242
diff --git a/boards/nxp/frdm_mcxc444/board.yml b/boards/nxp/frdm_mcxc444/board.yml
index 960d2c3f377..d32af7cc92c 100644
--- a/boards/nxp/frdm_mcxc444/board.yml
+++ b/boards/nxp/frdm_mcxc444/board.yml
@@ -1,6 +1,5 @@
 board:
   name: frdm_mcxc444
-  full_name: FRDM-MCXC444
   vendor: nxp
   socs:
     - name: mcxc444
diff --git a/boards/nxp/frdm_mcxn236/board.yml b/boards/nxp/frdm_mcxn236/board.yml
index 6c1645c9272..0bd2d3928ba 100644
--- a/boards/nxp/frdm_mcxn236/board.yml
+++ b/boards/nxp/frdm_mcxn236/board.yml
@@ -1,6 +1,5 @@
 board:
   name: frdm_mcxn236
-  full_name: FRDM-MCXN236
   vendor: nxp
   socs:
   - name: mcxn236
diff --git a/boards/nxp/frdm_mcxn947/board.yml b/boards/nxp/frdm_mcxn947/board.yml
index dd17fc68dc4..b4a64533333 100644
--- a/boards/nxp/frdm_mcxn947/board.yml
+++ b/boards/nxp/frdm_mcxn947/board.yml
@@ -1,6 +1,5 @@
 board:
   name: frdm_mcxn947
-  full_name: FRDM-MCXN947
   vendor: nxp
   socs:
   - name: mcxn947
diff --git a/boards/nxp/frdm_mcxw71/board.yml b/boards/nxp/frdm_mcxw71/board.yml
index e0243a0f32b..2a40433c84b 100644
--- a/boards/nxp/frdm_mcxw71/board.yml
+++ b/boards/nxp/frdm_mcxw71/board.yml
@@ -1,6 +1,5 @@
 board:
   name: frdm_mcxw71
-  full_name: FRDM-MCXW71
   vendor: nxp
   socs:
     - name: mcxw716c
diff --git a/boards/nxp/frdm_rw612/board.yml b/boards/nxp/frdm_rw612/board.yml
index 17ec6bda829..e52333358c4 100644
--- a/boards/nxp/frdm_rw612/board.yml
+++ b/boards/nxp/frdm_rw612/board.yml
@@ -1,6 +1,5 @@
 board:
   name: frdm_rw612
-  full_name: FRDM_RW612
   vendor: nxp
   socs:
     - name: rw612
diff --git a/boards/nxp/hexiwear/board.yml b/boards/nxp/hexiwear/board.yml
index 63a0e80de9a..c478fa02678 100644
--- a/boards/nxp/hexiwear/board.yml
+++ b/boards/nxp/hexiwear/board.yml
@@ -1,6 +1,5 @@
 board:
   name: hexiwear
-  full_name: Hexiwear
   vendor: nxp
   socs:
     - name: mk64f12
diff --git a/boards/nxp/imx8mm_evk/board.yml b/boards/nxp/imx8mm_evk/board.yml
index 3b760999b3f..0c46177f70b 100644
--- a/boards/nxp/imx8mm_evk/board.yml
+++ b/boards/nxp/imx8mm_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: imx8mm_evk
-  full_name: i.MX8MM EVK
   vendor: nxp
   socs:
   - name: mimx8mm6
diff --git a/boards/nxp/imx8mn_evk/board.yml b/boards/nxp/imx8mn_evk/board.yml
index c26c08d5bb6..294060de506 100644
--- a/boards/nxp/imx8mn_evk/board.yml
+++ b/boards/nxp/imx8mn_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: imx8mn_evk
-  full_name: i.MX8MN EVK (Cortex-A53)
   vendor: nxp
   socs:
   - name: mimx8mn6
diff --git a/boards/nxp/imx8mp_evk/board.yml b/boards/nxp/imx8mp_evk/board.yml
index c9616826269..d810c27a596 100644
--- a/boards/nxp/imx8mp_evk/board.yml
+++ b/boards/nxp/imx8mp_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: imx8mp_evk
-  full_name: i.MX8MP EVK
   vendor: nxp
   socs:
   - name: mimx8ml8
diff --git a/boards/nxp/imx8mq_evk/board.yml b/boards/nxp/imx8mq_evk/board.yml
index cb272769958..c599f0a7afd 100644
--- a/boards/nxp/imx8mq_evk/board.yml
+++ b/boards/nxp/imx8mq_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: imx8mq_evk
-  full_name: MIMX8MQ EVK
   vendor: nxp
   socs:
   - name: mimx8mq6
diff --git a/boards/nxp/imx8qm_mek/board.yml b/boards/nxp/imx8qm_mek/board.yml
index c97d6c179e8..d044277a622 100644
--- a/boards/nxp/imx8qm_mek/board.yml
+++ b/boards/nxp/imx8qm_mek/board.yml
@@ -1,6 +1,5 @@
 board:
   name: imx8qm_mek
-  full_name: i.MX 8QuadMax Multisensory Enablement Kit (MEK)
   vendor: nxp
   socs:
     - name: mimx8qm6
diff --git a/boards/nxp/imx8qxp_mek/board.yml b/boards/nxp/imx8qxp_mek/board.yml
index a2c838ef239..e31754086d7 100644
--- a/boards/nxp/imx8qxp_mek/board.yml
+++ b/boards/nxp/imx8qxp_mek/board.yml
@@ -1,6 +1,5 @@
 board:
   name: imx8qxp_mek
-  full_name: i.MX 8QuadXPlus Multisensory Enablement Kit (MEK)
   vendor: nxp
   socs:
     - name: mimx8qx6
diff --git a/boards/nxp/imx8ulp_evk/board.yml b/boards/nxp/imx8ulp_evk/board.yml
index 45167a37f26..bd5e16dc93d 100644
--- a/boards/nxp/imx8ulp_evk/board.yml
+++ b/boards/nxp/imx8ulp_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: imx8ulp_evk
-  full_name: i.MX 8ULP Evaluation Kit
   vendor: nxp
   socs:
     - name: mimx8ud7
diff --git a/boards/nxp/imx93_evk/board.yml b/boards/nxp/imx93_evk/board.yml
index 008156c5fa5..110334be558 100644
--- a/boards/nxp/imx93_evk/board.yml
+++ b/boards/nxp/imx93_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: imx93_evk
-  full_name: i.MX93 EVK
   vendor: nxp
   socs:
   - name: mimx9352
diff --git a/boards/nxp/imx95_evk/board.yml b/boards/nxp/imx95_evk/board.yml
index 9f170d32918..14909074457 100644
--- a/boards/nxp/imx95_evk/board.yml
+++ b/boards/nxp/imx95_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: imx95_evk
-  full_name: i.MX95 EVK
   vendor: nxp
   socs:
   - name: mimx9596
diff --git a/boards/nxp/lpcxpresso11u68/board.yml b/boards/nxp/lpcxpresso11u68/board.yml
index b0e31a04eab..30712d42e69 100644
--- a/boards/nxp/lpcxpresso11u68/board.yml
+++ b/boards/nxp/lpcxpresso11u68/board.yml
@@ -1,6 +1,5 @@
 board:
   name: lpcxpresso11u68
-  full_name: LPCXpresso11U68
   vendor: nxp
   socs:
     - name: lpc11u68
diff --git a/boards/nxp/lpcxpresso51u68/board.yml b/boards/nxp/lpcxpresso51u68/board.yml
index b27419f0f99..7eb0f17095e 100644
--- a/boards/nxp/lpcxpresso51u68/board.yml
+++ b/boards/nxp/lpcxpresso51u68/board.yml
@@ -1,6 +1,5 @@
 board:
   name: lpcxpresso51u68
-  full_name: LPCXPRESSO51U68
   vendor: nxp
   socs:
     - name: lpc51u68
diff --git a/boards/nxp/lpcxpresso54114/board.yml b/boards/nxp/lpcxpresso54114/board.yml
index d891073c5f7..64477bf2ac8 100644
--- a/boards/nxp/lpcxpresso54114/board.yml
+++ b/boards/nxp/lpcxpresso54114/board.yml
@@ -1,6 +1,5 @@
 board:
   name: lpcxpresso54114
-  full_name: LPCXPRESSO54114
   vendor: nxp
   socs:
     - name: lpc54114
diff --git a/boards/nxp/lpcxpresso55s06/board.yml b/boards/nxp/lpcxpresso55s06/board.yml
index e8924e0d941..a15c5a1da85 100644
--- a/boards/nxp/lpcxpresso55s06/board.yml
+++ b/boards/nxp/lpcxpresso55s06/board.yml
@@ -1,6 +1,5 @@
 board:
   name: lpcxpresso55s06
-  full_name: LPCXpresso55S06
   vendor: nxp
   socs:
     - name: lpc55s06
diff --git a/boards/nxp/lpcxpresso55s16/board.yml b/boards/nxp/lpcxpresso55s16/board.yml
index 33328c04d1d..5b4c627af1c 100644
--- a/boards/nxp/lpcxpresso55s16/board.yml
+++ b/boards/nxp/lpcxpresso55s16/board.yml
@@ -1,6 +1,5 @@
 board:
   name: lpcxpresso55s16
-  full_name: LPCXpresso55S16
   vendor: nxp
   socs:
     - name: lpc55s16
diff --git a/boards/nxp/lpcxpresso55s28/board.yml b/boards/nxp/lpcxpresso55s28/board.yml
index 9cedc7e450c..d4309c4e3df 100644
--- a/boards/nxp/lpcxpresso55s28/board.yml
+++ b/boards/nxp/lpcxpresso55s28/board.yml
@@ -1,6 +1,5 @@
 board:
   name: lpcxpresso55s28
-  full_name: LPCXpresso55S28
   vendor: nxp
   socs:
     - name: lpc55s28
diff --git a/boards/nxp/lpcxpresso55s36/board.yml b/boards/nxp/lpcxpresso55s36/board.yml
index 7257c1d421a..e888d768815 100644
--- a/boards/nxp/lpcxpresso55s36/board.yml
+++ b/boards/nxp/lpcxpresso55s36/board.yml
@@ -1,6 +1,5 @@
 board:
   name: lpcxpresso55s36
-  full_name: LPCXpresso55S36
   vendor: nxp
   socs:
     - name: lpc55s36
diff --git a/boards/nxp/lpcxpresso55s69/board.yml b/boards/nxp/lpcxpresso55s69/board.yml
index 6c38dd06b0a..605ab7b3e9f 100644
--- a/boards/nxp/lpcxpresso55s69/board.yml
+++ b/boards/nxp/lpcxpresso55s69/board.yml
@@ -1,6 +1,5 @@
 board:
   name: lpcxpresso55s69
-  full_name: LPCXPRESSO55S69
   vendor: nxp
   socs:
   - name: lpc55s69
diff --git a/boards/nxp/ls1046ardb/board.yml b/boards/nxp/ls1046ardb/board.yml
index 64001359b9a..9ad69170480 100644
--- a/boards/nxp/ls1046ardb/board.yml
+++ b/boards/nxp/ls1046ardb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ls1046ardb
-  full_name: LS1046A RDB
   vendor: nxp
   socs:
   - name: ls1046a
diff --git a/boards/nxp/mimxrt1010_evk/board.yml b/boards/nxp/mimxrt1010_evk/board.yml
index 6a82a521460..8c5dd6f1d75 100644
--- a/boards/nxp/mimxrt1010_evk/board.yml
+++ b/boards/nxp/mimxrt1010_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mimxrt1010_evk
-  full_name: MIMXRT1010-EVK
   vendor: nxp
   socs:
     - name: mimxrt1011
diff --git a/boards/nxp/mimxrt1015_evk/board.yml b/boards/nxp/mimxrt1015_evk/board.yml
index 8661e008230..5f26dc3898b 100644
--- a/boards/nxp/mimxrt1015_evk/board.yml
+++ b/boards/nxp/mimxrt1015_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mimxrt1015_evk
-  full_name: MIMXRT1015-EVK
   vendor: nxp
   socs:
     - name: mimxrt1015
diff --git a/boards/nxp/mimxrt1020_evk/board.yml b/boards/nxp/mimxrt1020_evk/board.yml
index c56ebb2360d..4df4def13bc 100644
--- a/boards/nxp/mimxrt1020_evk/board.yml
+++ b/boards/nxp/mimxrt1020_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mimxrt1020_evk
-  full_name: MIMXRT1020-EVK
   vendor: nxp
   socs:
     - name: mimxrt1021
diff --git a/boards/nxp/mimxrt1024_evk/board.yml b/boards/nxp/mimxrt1024_evk/board.yml
index e3858413637..c9420ad2b75 100644
--- a/boards/nxp/mimxrt1024_evk/board.yml
+++ b/boards/nxp/mimxrt1024_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mimxrt1024_evk
-  full_name: MIMXRT1024-EVK
   vendor: nxp
   socs:
     - name: mimxrt1024
diff --git a/boards/nxp/mimxrt1040_evk/board.yml b/boards/nxp/mimxrt1040_evk/board.yml
index a5e5803ca22..ded85cfce4a 100644
--- a/boards/nxp/mimxrt1040_evk/board.yml
+++ b/boards/nxp/mimxrt1040_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mimxrt1040_evk
-  full_name: MIMXRT1040-EVK
   vendor: nxp
   socs:
     - name: mimxrt1042
diff --git a/boards/nxp/mimxrt1050_evk/board.yml b/boards/nxp/mimxrt1050_evk/board.yml
index 48b8680e4b5..c1276214baa 100644
--- a/boards/nxp/mimxrt1050_evk/board.yml
+++ b/boards/nxp/mimxrt1050_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mimxrt1050_evk
-  full_name: MIMXRT1050-EVK
   vendor: nxp
   socs:
     - name: mimxrt1052
diff --git a/boards/nxp/mimxrt1060_evk/board.yml b/boards/nxp/mimxrt1060_evk/board.yml
index c3787a5385e..6682fbd7228 100644
--- a/boards/nxp/mimxrt1060_evk/board.yml
+++ b/boards/nxp/mimxrt1060_evk/board.yml
@@ -1,13 +1,11 @@
 boards:
   - name: mimxrt1060_evk
-    full_name: MIMXRT1060-EVK
     vendor: nxp
     socs:
       - name: mimxrt1062
     revision:
       format: "custom"
   - name: mimxrt1060_evkb
-    full_name: MIMXRT1060-EVKB
     vendor: nxp
     socs:
       - name: mimxrt1062
diff --git a/boards/nxp/mimxrt1062_fmurt6/board.yml b/boards/nxp/mimxrt1062_fmurt6/board.yml
index 60541a7f361..bebcb6c7954 100644
--- a/boards/nxp/mimxrt1062_fmurt6/board.yml
+++ b/boards/nxp/mimxrt1062_fmurt6/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mimxrt1062_fmurt6
-  full_name: FMURT6
   vendor: nxp
   socs:
     - name: mimxrt1062
diff --git a/boards/nxp/mimxrt1064_evk/board.yml b/boards/nxp/mimxrt1064_evk/board.yml
index 9800be05066..b3116560663 100644
--- a/boards/nxp/mimxrt1064_evk/board.yml
+++ b/boards/nxp/mimxrt1064_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mimxrt1064_evk
-  full_name: MIMXRT1064-EVK
   vendor: nxp
   socs:
     - name: mimxrt1064
diff --git a/boards/nxp/mimxrt1160_evk/board.yml b/boards/nxp/mimxrt1160_evk/board.yml
index 85136c78580..4fe56f8d256 100644
--- a/boards/nxp/mimxrt1160_evk/board.yml
+++ b/boards/nxp/mimxrt1160_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mimxrt1160_evk
-  full_name: MIMXRT1160-EVK
   vendor: nxp
   socs:
     - name: mimxrt1166
diff --git a/boards/nxp/mimxrt1170_evk/board.yml b/boards/nxp/mimxrt1170_evk/board.yml
index 4a6a25318b0..0b8e2b058e0 100644
--- a/boards/nxp/mimxrt1170_evk/board.yml
+++ b/boards/nxp/mimxrt1170_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mimxrt1170_evk
-  full_name: MIMXRT1170-EVK/EVKB
   vendor: nxp
   socs:
     - name: mimxrt1176
diff --git a/boards/nxp/mimxrt1180_evk/board.yml b/boards/nxp/mimxrt1180_evk/board.yml
index 3c3a3680cb3..0153cf4260d 100644
--- a/boards/nxp/mimxrt1180_evk/board.yml
+++ b/boards/nxp/mimxrt1180_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mimxrt1180_evk
-  full_name: MIMXRT1180-EVK
   vendor: nxp
   socs:
     - name: mimxrt1189
diff --git a/boards/nxp/mimxrt595_evk/board.yml b/boards/nxp/mimxrt595_evk/board.yml
index 052648e5b86..5982f346712 100644
--- a/boards/nxp/mimxrt595_evk/board.yml
+++ b/boards/nxp/mimxrt595_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mimxrt595_evk
-  full_name: MIMXRT595-EVK
   vendor: nxp
   socs:
     - name: mimxrt595s
diff --git a/boards/nxp/mimxrt685_evk/board.yml b/boards/nxp/mimxrt685_evk/board.yml
index c65a7e860bc..41956acbb31 100644
--- a/boards/nxp/mimxrt685_evk/board.yml
+++ b/boards/nxp/mimxrt685_evk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mimxrt685_evk
-  full_name: MIMXRT685-EVK
   vendor: nxp
   socs:
     - name: mimxrt685s
diff --git a/boards/nxp/mr_canhubk3/board.yml b/boards/nxp/mr_canhubk3/board.yml
index fcf396d2c45..3840a8f3d30 100644
--- a/boards/nxp/mr_canhubk3/board.yml
+++ b/boards/nxp/mr_canhubk3/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mr_canhubk3
-  full_name: MR-CANHUBK3
   vendor: nxp
   socs:
     - name: s32k344
diff --git a/boards/nxp/rd_rw612_bga/board.yml b/boards/nxp/rd_rw612_bga/board.yml
index e5b918b3ec9..3316d695614 100644
--- a/boards/nxp/rd_rw612_bga/board.yml
+++ b/boards/nxp/rd_rw612_bga/board.yml
@@ -1,6 +1,5 @@
 board:
   name: rd_rw612_bga
-  full_name: RD-RW612-BGA
   vendor: nxp
   socs:
     - name: rw612
diff --git a/boards/nxp/rddrone_fmuk66/board.yml b/boards/nxp/rddrone_fmuk66/board.yml
index 5d83c0d237f..40707b2f2e4 100644
--- a/boards/nxp/rddrone_fmuk66/board.yml
+++ b/boards/nxp/rddrone_fmuk66/board.yml
@@ -1,6 +1,5 @@
 board:
   name: rddrone_fmuk66
-  full_name: RDDRONE-FMUK66
   vendor: nxp
   socs:
     - name: mk66f18
diff --git a/boards/nxp/s32z2xxdc2/board.yml b/boards/nxp/s32z2xxdc2/board.yml
index ab7e2be4c38..bffe1839c3c 100644
--- a/boards/nxp/s32z2xxdc2/board.yml
+++ b/boards/nxp/s32z2xxdc2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: s32z2xxdc2
-  full_name: X-S32Z27X-DC (DC2)
   vendor: nxp
   revision:
     format: letter
diff --git a/boards/nxp/twr_ke18f/board.yml b/boards/nxp/twr_ke18f/board.yml
index 0f18fed1466..ffaf5fb235f 100644
--- a/boards/nxp/twr_ke18f/board.yml
+++ b/boards/nxp/twr_ke18f/board.yml
@@ -1,6 +1,5 @@
 board:
   name: twr_ke18f
-  full_name: TWR-KE18F
   vendor: nxp
   socs:
     - name: mke18f16
diff --git a/boards/nxp/twr_kv58f220m/board.yml b/boards/nxp/twr_kv58f220m/board.yml
index d7ec86a420e..536e16c178f 100644
--- a/boards/nxp/twr_kv58f220m/board.yml
+++ b/boards/nxp/twr_kv58f220m/board.yml
@@ -1,6 +1,5 @@
 board:
   name: twr_kv58f220m
-  full_name: TWR-KV58F220M
   vendor: nxp
   socs:
     - name: mkv58f24
diff --git a/boards/nxp/ucans32k1sic/board.yml b/boards/nxp/ucans32k1sic/board.yml
index d4cdb83314b..87964b5201f 100644
--- a/boards/nxp/ucans32k1sic/board.yml
+++ b/boards/nxp/ucans32k1sic/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ucans32k1sic
-  full_name: UCANS32K1SIC
   vendor: nxp
   socs:
     - name: s32k146
diff --git a/boards/nxp/usb_kw24d512/board.yml b/boards/nxp/usb_kw24d512/board.yml
index a166d3bdca8..21dae9f8435 100644
--- a/boards/nxp/usb_kw24d512/board.yml
+++ b/boards/nxp/usb_kw24d512/board.yml
@@ -1,6 +1,5 @@
 board:
   name: usb_kw24d512
-  full_name: USB-KW24D512
   vendor: nxp
   socs:
     - name: mkw24d5
diff --git a/boards/nxp/vmu_rt1170/board.yml b/boards/nxp/vmu_rt1170/board.yml
index 45e37ad7898..91d9d2e83b2 100644
--- a/boards/nxp/vmu_rt1170/board.yml
+++ b/boards/nxp/vmu_rt1170/board.yml
@@ -1,6 +1,5 @@
 board:
   name: vmu_rt1170
-  full_name: VMU RT1170
   vendor: nxp
   socs:
     - name: mimxrt1176
diff --git a/boards/olimex/lora_stm32wl_devkit/board.yml b/boards/olimex/lora_stm32wl_devkit/board.yml
index 6b1397bf3b5..511de6634d2 100644
--- a/boards/olimex/lora_stm32wl_devkit/board.yml
+++ b/boards/olimex/lora_stm32wl_devkit/board.yml
@@ -1,6 +1,5 @@
 board:
   name: olimex_lora_stm32wl_devkit
-  full_name: LoRa STM32WL DevKit
   vendor: olimex
   revision:
     format: letter
diff --git a/boards/olimex/olimex_esp32_evb/board.yml b/boards/olimex/olimex_esp32_evb/board.yml
index ab25d5859c2..8dc816efceb 100644
--- a/boards/olimex/olimex_esp32_evb/board.yml
+++ b/boards/olimex/olimex_esp32_evb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: olimex_esp32_evb
-  full_name: ESP32-EVB
   vendor: olimex
   socs:
   - name: esp32
diff --git a/boards/olimex/olimexino_stm32/board.yml b/boards/olimex/olimexino_stm32/board.yml
index 6f2276da7b0..0944c4bb280 100644
--- a/boards/olimex/olimexino_stm32/board.yml
+++ b/boards/olimex/olimexino_stm32/board.yml
@@ -1,6 +1,5 @@
 board:
   name: olimexino_stm32
-  full_name: OLIMEXINO-STM32
   vendor: olimex
   socs:
     - name: stm32f103xb
diff --git a/boards/olimex/stm32_e407/board.yml b/boards/olimex/stm32_e407/board.yml
index d15c9456c2c..b01060566dc 100644
--- a/boards/olimex/stm32_e407/board.yml
+++ b/boards/olimex/stm32_e407/board.yml
@@ -1,6 +1,5 @@
 board:
   name: olimex_stm32_e407
-  full_name: OLIMEX-STM32-E407
   vendor: olimex
   socs:
     - name: stm32f407xx
diff --git a/boards/olimex/stm32_h103/board.yml b/boards/olimex/stm32_h103/board.yml
index eb8195402ae..2917e4e19d9 100644
--- a/boards/olimex/stm32_h103/board.yml
+++ b/boards/olimex/stm32_h103/board.yml
@@ -1,6 +1,5 @@
 board:
   name: olimex_stm32_h103
-  full_name: OLIMEX-STM32-H103
   vendor: olimex
   socs:
     - name: stm32f103xb
diff --git a/boards/olimex/stm32_h405/board.yml b/boards/olimex/stm32_h405/board.yml
index aa10f3c9ef9..bd0e8f4beaa 100644
--- a/boards/olimex/stm32_h405/board.yml
+++ b/boards/olimex/stm32_h405/board.yml
@@ -1,6 +1,5 @@
 board:
   name: olimex_stm32_h405
-  full_name: OLIMEX-STM32-H405
   vendor: olimex
   socs:
     - name: stm32f405xx
diff --git a/boards/olimex/stm32_h407/board.yml b/boards/olimex/stm32_h407/board.yml
index 452a712f595..5d2f0d7a783 100644
--- a/boards/olimex/stm32_h407/board.yml
+++ b/boards/olimex/stm32_h407/board.yml
@@ -1,6 +1,5 @@
 board:
   name: olimex_stm32_h407
-  full_name: OLIMEX-STM32-H407
   vendor: olimex
   socs:
     - name: stm32f407xx
diff --git a/boards/olimex/stm32_p405/board.yml b/boards/olimex/stm32_p405/board.yml
index 8ac0ac264ab..12201ed22c9 100644
--- a/boards/olimex/stm32_p405/board.yml
+++ b/boards/olimex/stm32_p405/board.yml
@@ -1,6 +1,5 @@
 board:
   name: olimex_stm32_p405
-  full_name: OLIMEX-STM32-P405
   vendor: olimex
   socs:
     - name: stm32f405xx
diff --git a/boards/openisa/rv32m1_vega/board.yml b/boards/openisa/rv32m1_vega/board.yml
index 4e60beab435..5813a21b54f 100644
--- a/boards/openisa/rv32m1_vega/board.yml
+++ b/boards/openisa/rv32m1_vega/board.yml
@@ -1,6 +1,5 @@
 board:
   name: rv32m1_vega
-  full_name: OpenISA VEGAboard
   vendor: openisa
   socs:
   - name: openisa_rv32m1
diff --git a/boards/others/black_f407ve/board.yml b/boards/others/black_f407ve/board.yml
index 6c14732f07c..472d766cbc7 100644
--- a/boards/others/black_f407ve/board.yml
+++ b/boards/others/black_f407ve/board.yml
@@ -1,6 +1,5 @@
 board:
   name: black_f407ve
-  full_name: Black STM32 F407VE Development Board
   vendor: others
   socs:
     - name: stm32f407xx
diff --git a/boards/others/black_f407zg_pro/board.yml b/boards/others/black_f407zg_pro/board.yml
index 96f2891f768..dc322315620 100644
--- a/boards/others/black_f407zg_pro/board.yml
+++ b/boards/others/black_f407zg_pro/board.yml
@@ -1,6 +1,5 @@
 board:
   name: black_f407zg_pro
-  full_name: Black STM32 F407ZG Pro Development Board
   vendor: others
   socs:
     - name: stm32f407xx
diff --git a/boards/others/icev_wireless/board.yml b/boards/others/icev_wireless/board.yml
index b810e970f76..2dcef96cbdf 100644
--- a/boards/others/icev_wireless/board.yml
+++ b/boards/others/icev_wireless/board.yml
@@ -1,6 +1,5 @@
 board:
   name: icev_wireless
-  full_name: ICE-V Wireless
   vendor: others
   socs:
   - name: esp32c3
diff --git a/boards/others/neorv32/board.yml b/boards/others/neorv32/board.yml
index 9154d90e8a9..f12fa42b78f 100644
--- a/boards/others/neorv32/board.yml
+++ b/boards/others/neorv32/board.yml
@@ -1,6 +1,5 @@
 board:
   name: neorv32
-  full_name: NEORV32
   vendor: others
   revision:
     format: major.minor.patch
diff --git a/boards/others/serpente/board.yml b/boards/others/serpente/board.yml
index 0be3e94ffe6..e5775329a06 100644
--- a/boards/others/serpente/board.yml
+++ b/boards/others/serpente/board.yml
@@ -1,6 +1,5 @@
 board:
   name: serpente
-  full_name: Arturo182 Serpente
   vendor: solderparty
   socs:
     - name: samd21e18a
diff --git a/boards/others/stm32_min_dev/board.yml b/boards/others/stm32_min_dev/board.yml
index 3ac7dfb8958..28a35697379 100644
--- a/boards/others/stm32_min_dev/board.yml
+++ b/boards/others/stm32_min_dev/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32_min_dev
-  full_name: STM32 Minimum Development Board
   vendor: others
   revision:
     format: custom
diff --git a/boards/others/stm32f030_demo/board.yml b/boards/others/stm32f030_demo/board.yml
index b0f19e11846..348d40a665b 100644
--- a/boards/others/stm32f030_demo/board.yml
+++ b/boards/others/stm32f030_demo/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32f030_demo
-  full_name: STM32F030 DEMO BOARD
   vendor: others
   socs:
     - name: stm32f030x6
diff --git a/boards/others/stm32f103_mini/board.yml b/boards/others/stm32f103_mini/board.yml
index f88d33224dd..4ea8f6fbb2d 100644
--- a/boards/others/stm32f103_mini/board.yml
+++ b/boards/others/stm32f103_mini/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32f103_mini
-  full_name: STM32F103 Mini
   vendor: st
   socs:
     - name: stm32f103xe
diff --git a/boards/others/stm32f401_mini/board.yml b/boards/others/stm32f401_mini/board.yml
index 6c057c149df..b6ec3cd3af8 100644
--- a/boards/others/stm32f401_mini/board.yml
+++ b/boards/others/stm32f401_mini/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32f401_mini
-  full_name: STM32 Mini F401
   vendor: others
   socs:
     - name: stm32f401xc
diff --git a/boards/panasonic/pan1770_evb/board.yml b/boards/panasonic/pan1770_evb/board.yml
index 91d8a8c01b7..0808b91b99b 100644
--- a/boards/panasonic/pan1770_evb/board.yml
+++ b/boards/panasonic/pan1770_evb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: pan1770_evb
-  full_name: PAN1770 Evaluation Board
   vendor: panasonic
   socs:
   - name: nrf52840
diff --git a/boards/panasonic/pan1780_evb/board.yml b/boards/panasonic/pan1780_evb/board.yml
index fcb9c21e6f5..53a9a68192a 100644
--- a/boards/panasonic/pan1780_evb/board.yml
+++ b/boards/panasonic/pan1780_evb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: pan1780_evb
-  full_name: PAN1780 Evaluation Board
   vendor: panasonic
   socs:
   - name: nrf52840
diff --git a/boards/panasonic/pan1781_evb/board.yml b/boards/panasonic/pan1781_evb/board.yml
index 9f4fae581f7..64a5a239961 100644
--- a/boards/panasonic/pan1781_evb/board.yml
+++ b/boards/panasonic/pan1781_evb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: pan1781_evb
-  full_name: PAN1781 Evaluation Board
   vendor: panasonic
   socs:
   - name: nrf52820
diff --git a/boards/panasonic/pan1782_evb/board.yml b/boards/panasonic/pan1782_evb/board.yml
index f4bfec853e0..649e5507d82 100644
--- a/boards/panasonic/pan1782_evb/board.yml
+++ b/boards/panasonic/pan1782_evb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: pan1782_evb
-  full_name: PAN1782 Evaluation Board
   vendor: panasonic
   socs:
   - name: nrf52833
diff --git a/boards/panasonic/pan1783/board.yml b/boards/panasonic/pan1783/board.yml
index 750f82b7848..461763d86f2 100644
--- a/boards/panasonic/pan1783/board.yml
+++ b/boards/panasonic/pan1783/board.yml
@@ -1,16 +1,13 @@
 boards:
 - name: pan1783_evb
-  full_name: PAN1783 Evaluation Board
   vendor: panasonic
   socs:
   - name: nrf5340
 - name: pan1783a_evb
-  full_name: PAN1783A Evaluation Board
   vendor: panasonic
   socs:
   - name: nrf5340
 - name: pan1783a_pa_evb
-  full_name: PAN1783A-PA Evaluation Board
   vendor: panasonic
   socs:
   - name: nrf5340
diff --git a/boards/particle/argon/board.yml b/boards/particle/argon/board.yml
index b4cf83969ec..08eadfda743 100644
--- a/boards/particle/argon/board.yml
+++ b/boards/particle/argon/board.yml
@@ -1,6 +1,5 @@
 board:
   name: particle_argon
-  full_name: Argon
   vendor: particle
   socs:
   - name: nrf52840
diff --git a/boards/particle/boron/board.yml b/boards/particle/boron/board.yml
index 25742d7ee79..bb77655e8c0 100644
--- a/boards/particle/boron/board.yml
+++ b/boards/particle/boron/board.yml
@@ -1,6 +1,5 @@
 board:
   name: particle_boron
-  full_name: Boron
   vendor: particle
   socs:
   - name: nrf52840
diff --git a/boards/particle/nrf51_blenano/board.yml b/boards/particle/nrf51_blenano/board.yml
index f4b6bc29495..bc651160fa4 100644
--- a/boards/particle/nrf51_blenano/board.yml
+++ b/boards/particle/nrf51_blenano/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf51_blenano
-  full_name: Redbear Labs Nano
   vendor: particle
   socs:
   - name: nrf51822
diff --git a/boards/particle/nrf52_blenano2/board.yml b/boards/particle/nrf52_blenano2/board.yml
index dc90277b7e7..fedad35babc 100644
--- a/boards/particle/nrf52_blenano2/board.yml
+++ b/boards/particle/nrf52_blenano2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf52_blenano2
-  full_name: Redbear Labs Nano v2
   vendor: particle
   socs:
   - name: nrf52832
diff --git a/boards/particle/xenon/board.yml b/boards/particle/xenon/board.yml
index 894b1cf6c90..a681db97a1f 100644
--- a/boards/particle/xenon/board.yml
+++ b/boards/particle/xenon/board.yml
@@ -1,6 +1,5 @@
 board:
   name: particle_xenon
-  full_name: Xenon
   vendor: particle
   socs:
   - name: nrf52840
diff --git a/boards/phytec/mimx8mm_phyboard_polis/board.yml b/boards/phytec/mimx8mm_phyboard_polis/board.yml
index 8f834205354..1c416b90eb1 100644
--- a/boards/phytec/mimx8mm_phyboard_polis/board.yml
+++ b/boards/phytec/mimx8mm_phyboard_polis/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mimx8mm_phyboard_polis
-  full_name: PhyBOARD Polis (NXP i.MX8M Mini)
   vendor: phytec
   socs:
     - name: mimx8mm6
diff --git a/boards/phytec/mimx8mp_phyboard_pollux/board.yml b/boards/phytec/mimx8mp_phyboard_pollux/board.yml
index a8e5cbf9a0a..b871a53e370 100644
--- a/boards/phytec/mimx8mp_phyboard_pollux/board.yml
+++ b/boards/phytec/mimx8mp_phyboard_pollux/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mimx8mp_phyboard_pollux
-  full_name: PhyBOARD Pollux (NXP i.MX8M Plus)
   vendor: phytec
   socs:
     - name: mimx8ml8
diff --git a/boards/phytec/phyboard_electra/board.yml b/boards/phytec/phyboard_electra/board.yml
index 5e58cfb5431..d5c24f15cbd 100644
--- a/boards/phytec/phyboard_electra/board.yml
+++ b/boards/phytec/phyboard_electra/board.yml
@@ -1,6 +1,5 @@
 board:
   name: phyboard_electra
-  full_name: phyBOARD-Electra AM64x M4F Core
   vendor: phytec
   socs:
   - name: am6442
diff --git a/boards/phytec/phyboard_lyra/board.yml b/boards/phytec/phyboard_lyra/board.yml
index c9a6c3a9b14..2b98d77f510 100644
--- a/boards/phytec/phyboard_lyra/board.yml
+++ b/boards/phytec/phyboard_lyra/board.yml
@@ -1,6 +1,5 @@
 board:
   name: phyboard_lyra
-  full_name: phyBOARD-Lyra AM62x A53 Core
   vendor: phytec
   socs:
   - name: am6234
diff --git a/boards/phytec/reel_board/board.yml b/boards/phytec/reel_board/board.yml
index 2fd1363c0d7..75878900418 100644
--- a/boards/phytec/reel_board/board.yml
+++ b/boards/phytec/reel_board/board.yml
@@ -1,6 +1,5 @@
 board:
   name: reel_board
-  full_name: reel board
   vendor: phytec
   socs:
   - name: nrf52840
diff --git a/boards/pine64/pinetime_devkit0/board.yml b/boards/pine64/pinetime_devkit0/board.yml
index 448cbca23b8..e4c926cf96b 100644
--- a/boards/pine64/pinetime_devkit0/board.yml
+++ b/boards/pine64/pinetime_devkit0/board.yml
@@ -1,6 +1,5 @@
 board:
   name: pinetime_devkit0
-  full_name: PineTime DevKit0
   vendor: pine64
   socs:
   - name: nrf52832
diff --git a/boards/pjrc/teensy4/board.yml b/boards/pjrc/teensy4/board.yml
index 0ae483ebc2c..7906ae3b823 100644
--- a/boards/pjrc/teensy4/board.yml
+++ b/boards/pjrc/teensy4/board.yml
@@ -1,11 +1,9 @@
 boards:
   - name: teensy40
-    full_name: Teensy 4.0
     vendor: pjrc
     socs:
       - name: mimxrt1062
   - name: teensy41
-    full_name: Teensy 4.1
     vendor: pjrc
     socs:
       - name: mimxrt1062
diff --git a/boards/qemu/arc/board.yml b/boards/qemu/arc/board.yml
index 27571b6c5ce..1fb49911afa 100644
--- a/boards/qemu/arc/board.yml
+++ b/boards/qemu/arc/board.yml
@@ -1,6 +1,5 @@
 board:
   name: qemu_arc
-  full_name: QEMU Emulation for ARCv2 & ARCv3
   vendor: qemu
   socs:
   - name: qemu_arc_em
diff --git a/boards/qemu/cortex_a53/board.yml b/boards/qemu/cortex_a53/board.yml
index d096f5495a1..ab04f6ac8f1 100644
--- a/boards/qemu/cortex_a53/board.yml
+++ b/boards/qemu/cortex_a53/board.yml
@@ -1,6 +1,5 @@
 board:
   name: qemu_cortex_a53
-  full_name: QEMU Emulation for ARM Cortex-A53
   vendor: arm
   socs:
   - name: qemu_cortex_a53
diff --git a/boards/qemu/cortex_a9/board.yml b/boards/qemu/cortex_a9/board.yml
index 4b48ca9d2ad..72cba6ce8d9 100644
--- a/boards/qemu/cortex_a9/board.yml
+++ b/boards/qemu/cortex_a9/board.yml
@@ -1,6 +1,5 @@
 board:
   name: qemu_cortex_a9
-  full_name: QEMU Emulation for Cortex-A9
   vendor: qemu
   socs:
   - name: xc7z007s
diff --git a/boards/qemu/cortex_m0/board.yml b/boards/qemu/cortex_m0/board.yml
index aa58b1a0ef4..fc71c63896b 100644
--- a/boards/qemu/cortex_m0/board.yml
+++ b/boards/qemu/cortex_m0/board.yml
@@ -1,6 +1,5 @@
 board:
   name: qemu_cortex_m0
-  full_name: QEMU Emulation for ARM Cortex-M0
   vendor: nordic
   socs:
   - name: nrf51822
diff --git a/boards/qemu/cortex_m3/board.yml b/boards/qemu/cortex_m3/board.yml
index 6422e416ef3..5566adb5e02 100644
--- a/boards/qemu/cortex_m3/board.yml
+++ b/boards/qemu/cortex_m3/board.yml
@@ -1,6 +1,5 @@
 board:
   name: qemu_cortex_m3
-  full_name: QEMU Emulation for ARM Cortex-M3
   vendor: qemu
   socs:
   - name: ti_lm3s6965
diff --git a/boards/qemu/cortex_r5/board.yml b/boards/qemu/cortex_r5/board.yml
index ae013f0a4ba..6cf5b2fee95 100644
--- a/boards/qemu/cortex_r5/board.yml
+++ b/boards/qemu/cortex_r5/board.yml
@@ -1,6 +1,5 @@
 board:
   name: qemu_cortex_r5
-  full_name: QEMU Emulation for ARM Cortex-R5
   vendor: qemu
   socs:
   - name: zynqmp_rpu
diff --git a/boards/qemu/kvm_arm64/board.yml b/boards/qemu/kvm_arm64/board.yml
index ff9a9e4c2be..dd0edf80316 100644
--- a/boards/qemu/kvm_arm64/board.yml
+++ b/boards/qemu/kvm_arm64/board.yml
@@ -1,6 +1,5 @@
 board:
   name: qemu_kvm_arm64
-  full_name: QEMU Emulation for ARM AArch64 Virt KVM
   vendor: arm
   socs:
   - name: qemu_virt_arm64
diff --git a/boards/qemu/leon3/board.yml b/boards/qemu/leon3/board.yml
index 61d3cd2f71a..6d4fdc189bf 100644
--- a/boards/qemu/leon3/board.yml
+++ b/boards/qemu/leon3/board.yml
@@ -1,6 +1,5 @@
 board:
   name: qemu_leon3
-  full_name: QEMU Emulation for LEON3
   vendor: gaisler
   socs:
   - name: leon3
diff --git a/boards/qemu/malta/board.yml b/boards/qemu/malta/board.yml
index acb375c5804..050bd381c73 100644
--- a/boards/qemu/malta/board.yml
+++ b/boards/qemu/malta/board.yml
@@ -1,6 +1,5 @@
 board:
   name: qemu_malta
-  full_name: QEMU Emulation for MIPS Malta
   vendor: qemu
   socs:
   - name: qemu_malta
diff --git a/boards/qemu/nios2/board.yml b/boards/qemu/nios2/board.yml
index aae11848062..93f6487d318 100644
--- a/boards/qemu/nios2/board.yml
+++ b/boards/qemu/nios2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: qemu_nios2
-  full_name: QEMU Emulation for Altera Nios-II
   vendor: altr
   socs:
   - name: qemu_nios2
diff --git a/boards/qemu/riscv32/board.yml b/boards/qemu/riscv32/board.yml
index 00b7b794e24..0ba208612a9 100644
--- a/boards/qemu/riscv32/board.yml
+++ b/boards/qemu/riscv32/board.yml
@@ -1,6 +1,5 @@
 board:
   name: qemu_riscv32
-  full_name: QEMU Emulation for RISCV32
   vendor: qemu
   socs:
     - name: qemu_virt_riscv32
diff --git a/boards/qemu/riscv32_xip/board.yml b/boards/qemu/riscv32_xip/board.yml
index 4c43b4d73c8..beca29532f4 100644
--- a/boards/qemu/riscv32_xip/board.yml
+++ b/boards/qemu/riscv32_xip/board.yml
@@ -1,6 +1,5 @@
 board:
   name: qemu_riscv32_xip
-  full_name: QEMU Emulation for RISCV32 XIP
   vendor: qemu
   socs:
     - name: fe310
diff --git a/boards/qemu/riscv32e/board.yml b/boards/qemu/riscv32e/board.yml
index e4b41d79f3e..cc8e6f0becc 100644
--- a/boards/qemu/riscv32e/board.yml
+++ b/boards/qemu/riscv32e/board.yml
@@ -1,6 +1,5 @@
 board:
   name: qemu_riscv32e
-  full_name: QEMU Emulation for RISCV32E Emulation
   vendor: qemu
   socs:
     - name: qemu_virt_riscv32e
diff --git a/boards/qemu/riscv64/board.yml b/boards/qemu/riscv64/board.yml
index eeab9480a24..aa51fd1fdba 100644
--- a/boards/qemu/riscv64/board.yml
+++ b/boards/qemu/riscv64/board.yml
@@ -1,6 +1,5 @@
 board:
   name: qemu_riscv64
-  full_name: QEMU Emulation for RISCV64
   vendor: qemu
   socs:
     - name: qemu_virt_riscv64
diff --git a/boards/qemu/x86/board.yml b/boards/qemu/x86/board.yml
index 7e0fa76a043..dafcffba24f 100644
--- a/boards/qemu/x86/board.yml
+++ b/boards/qemu/x86/board.yml
@@ -1,7 +1,7 @@
 boards:
 
   - name: qemu_x86
-    full_name: QEMU Emulation for X86
+    full_name: 'QEMU Emulation for X86'
     socs:
       - name: atom
         variants:
@@ -12,18 +12,18 @@ boards:
           - name: 'xip'
 
   - name: qemu_x86_lakemont
-    full_name: QEMU Emulation for X86 / Lakemont CPU
+    full_name: 'QEMU Emulation for X86 / Lakemont CPU'
     socs:
       - name: lakemont
 
   - name: qemu_x86_64
-    full_name: QEMU Emulation for X86 64bit
+    full_name: 'QEMU Emulation for X86 64bit'
     socs:
       - name: atom
         variants:
           - name: 'nokpti'
 
   - name: qemu_x86_tiny
-    full_name: QEMU Emulation for X86 Minimal Configuration
+    full_name: 'QEMU Emulation for X86 Minimal Configuration'
     socs:
       - name: atom
diff --git a/boards/qemu/xtensa/board.yml b/boards/qemu/xtensa/board.yml
index 116a53db80b..1441dcc25fc 100644
--- a/boards/qemu/xtensa/board.yml
+++ b/boards/qemu/xtensa/board.yml
@@ -1,6 +1,5 @@
 board:
   name: qemu_xtensa
-  full_name: QEMU Emulation for Xtensa
   vendor: cdns
   socs:
   - name: dc233c
diff --git a/boards/qorvo/decawave_dwm1001_dev/board.yml b/boards/qorvo/decawave_dwm1001_dev/board.yml
index 3197993cc38..f1d0ae7def0 100644
--- a/boards/qorvo/decawave_dwm1001_dev/board.yml
+++ b/boards/qorvo/decawave_dwm1001_dev/board.yml
@@ -1,6 +1,5 @@
 board:
   name: decawave_dwm1001_dev
-  full_name: Decawave DWM1001
   vendor: qorvo
   socs:
   - name: nrf52832
diff --git a/boards/quicklogic/qomu/board.yml b/boards/quicklogic/qomu/board.yml
index b1c9dd2ce60..e71125610fa 100644
--- a/boards/quicklogic/qomu/board.yml
+++ b/boards/quicklogic/qomu/board.yml
@@ -1,6 +1,5 @@
 board:
   name: qomu
-  full_name: Qomu
   vendor: quicklogic
   socs:
   - name: quicklogic_eos_s3
diff --git a/boards/quicklogic/quick_feather/board.yml b/boards/quicklogic/quick_feather/board.yml
index d271954fb97..3ca618cbe34 100644
--- a/boards/quicklogic/quick_feather/board.yml
+++ b/boards/quicklogic/quick_feather/board.yml
@@ -1,6 +1,5 @@
 board:
   name: quick_feather
-  full_name: QuickFeather
   vendor: quicklogic
   socs:
   - name: quicklogic_eos_s3
diff --git a/boards/rak/rak11720/board.yml b/boards/rak/rak11720/board.yml
index 418094b216c..827beef7e76 100644
--- a/boards/rak/rak11720/board.yml
+++ b/boards/rak/rak11720/board.yml
@@ -1,6 +1,5 @@
 board:
   name: rak11720
-  full_name: RAK11720
   vendor: rakwireless
   socs:
   - name: apollo3_blue
diff --git a/boards/rak/rak4631/board.yml b/boards/rak/rak4631/board.yml
index 5a97085dd0a..a3b88672823 100644
--- a/boards/rak/rak4631/board.yml
+++ b/boards/rak/rak4631/board.yml
@@ -1,6 +1,5 @@
 board:
   name: rak4631
-  full_name: RAK4631
   vendor: rakwireless
   socs:
   - name: nrf52840
diff --git a/boards/rak/rak5010/board.yml b/boards/rak/rak5010/board.yml
index d3fc3948831..c681ac27cb7 100644
--- a/boards/rak/rak5010/board.yml
+++ b/boards/rak/rak5010/board.yml
@@ -1,6 +1,5 @@
 board:
   name: rak5010
-  full_name: RAK5010
   vendor: rakwireless
   socs:
   - name: nrf52840
diff --git a/boards/raspberrypi/rpi_4b/board.yml b/boards/raspberrypi/rpi_4b/board.yml
index 9c8a7ad5bc2..a84904f9b29 100644
--- a/boards/raspberrypi/rpi_4b/board.yml
+++ b/boards/raspberrypi/rpi_4b/board.yml
@@ -1,6 +1,5 @@
 board:
   name: rpi_4b
-  full_name: Raspberry Pi 4 Model B (Cortex-A72)
   vendor: raspberrypi
   socs:
   - name: bcm2711
diff --git a/boards/raspberrypi/rpi_5/board.yml b/boards/raspberrypi/rpi_5/board.yml
index 2c90e5c2db0..d604b7f4e51 100644
--- a/boards/raspberrypi/rpi_5/board.yml
+++ b/boards/raspberrypi/rpi_5/board.yml
@@ -1,6 +1,5 @@
 board:
   name: rpi_5
-  full_name: Raspberry Pi 5 (Cortex-A76)
   vendor: raspberrypi
   socs:
   - name: bcm2712
diff --git a/boards/raspberrypi/rpi_pico/board.yml b/boards/raspberrypi/rpi_pico/board.yml
index c7378a32801..e4f8e5bc8d5 100644
--- a/boards/raspberrypi/rpi_pico/board.yml
+++ b/boards/raspberrypi/rpi_pico/board.yml
@@ -1,6 +1,5 @@
 board:
   name: rpi_pico
-  full_name: Raspberry Pi Pico
   vendor: raspberrypi
   socs:
   - name: rp2040
diff --git a/boards/raytac/mdbt50q_db_33/board.yml b/boards/raytac/mdbt50q_db_33/board.yml
index c15a873add0..dbad99fd489 100644
--- a/boards/raytac/mdbt50q_db_33/board.yml
+++ b/boards/raytac/mdbt50q_db_33/board.yml
@@ -1,6 +1,5 @@
 board:
   name: raytac_mdbt50q_db_33
-  full_name: MDBT50Q-DB-33
   vendor: raytac
   socs:
   - name: nrf52833
diff --git a/boards/raytac/mdbt50q_db_40/board.yml b/boards/raytac/mdbt50q_db_40/board.yml
index 1d06509fb2f..a8c109b715f 100644
--- a/boards/raytac/mdbt50q_db_40/board.yml
+++ b/boards/raytac/mdbt50q_db_40/board.yml
@@ -1,6 +1,5 @@
 board:
   name: raytac_mdbt50q_db_40
-  full_name: MDBT50Q-DB-40
   vendor: raytac
   socs:
   - name: nrf52840
diff --git a/boards/raytac/mdbt53_db_40/board.yml b/boards/raytac/mdbt53_db_40/board.yml
index 823043b0c01..84bef186b33 100644
--- a/boards/raytac/mdbt53_db_40/board.yml
+++ b/boards/raytac/mdbt53_db_40/board.yml
@@ -1,6 +1,5 @@
 board:
   name: raytac_mdbt53_db_40
-  full_name: MDBT53-DB-40
   vendor: raytac
   socs:
   - name: 'nrf5340'
diff --git a/boards/raytac/mdbt53v_db_40/board.yml b/boards/raytac/mdbt53v_db_40/board.yml
index 56fe6f20294..9d3bfd4689b 100644
--- a/boards/raytac/mdbt53v_db_40/board.yml
+++ b/boards/raytac/mdbt53v_db_40/board.yml
@@ -1,6 +1,5 @@
 board:
   name: raytac_mdbt53v_db_40
-  full_name: MDBT53V-DB-40
   vendor: raytac
   socs:
   - name: 'nrf5340'
diff --git a/boards/renesas/da14695_dk_usb/board.yml b/boards/renesas/da14695_dk_usb/board.yml
index fa0ea2c2bc2..b9d3f06cb1d 100644
--- a/boards/renesas/da14695_dk_usb/board.yml
+++ b/boards/renesas/da14695_dk_usb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: da14695_dk_usb
-  full_name: DA14695 Development Kit USB
   vendor: renesas
   socs:
   - name: da14695
diff --git a/boards/renesas/da1469x_dk_pro/board.yml b/boards/renesas/da1469x_dk_pro/board.yml
index 6c7388567ac..09ab03c0b26 100644
--- a/boards/renesas/da1469x_dk_pro/board.yml
+++ b/boards/renesas/da1469x_dk_pro/board.yml
@@ -1,6 +1,5 @@
 board:
   name: da1469x_dk_pro
-  full_name: DA1469x Development Kit Pro
   vendor: renesas
   socs:
   - name: da14699
diff --git a/boards/renesas/ek_ra2a1/board.yml b/boards/renesas/ek_ra2a1/board.yml
index 6c47b918ec5..82c498850aa 100644
--- a/boards/renesas/ek_ra2a1/board.yml
+++ b/boards/renesas/ek_ra2a1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ek_ra2a1
-  full_name: RA2A1 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa2a1ab3cfm
diff --git a/boards/renesas/ek_ra4e2/board.yml b/boards/renesas/ek_ra4e2/board.yml
index 161c7543ff9..8baa0819ff2 100644
--- a/boards/renesas/ek_ra4e2/board.yml
+++ b/boards/renesas/ek_ra4e2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ek_ra4e2
-  full_name: RA4E2 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa4e2b93cfm
diff --git a/boards/renesas/ek_ra4m2/board.yml b/boards/renesas/ek_ra4m2/board.yml
index 31a7e8e269a..c19484eff8a 100644
--- a/boards/renesas/ek_ra4m2/board.yml
+++ b/boards/renesas/ek_ra4m2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ek_ra4m2
-  full_name: RA4M2 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa4m2ad3cfp
diff --git a/boards/renesas/ek_ra4m3/board.yml b/boards/renesas/ek_ra4m3/board.yml
index b84c06cd531..30b3b39ac4e 100644
--- a/boards/renesas/ek_ra4m3/board.yml
+++ b/boards/renesas/ek_ra4m3/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ek_ra4m3
-  full_name: RA4M3 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa4m3af3cfb
diff --git a/boards/renesas/ek_ra4w1/board.yml b/boards/renesas/ek_ra4w1/board.yml
index 8783b2b957c..709a8435475 100644
--- a/boards/renesas/ek_ra4w1/board.yml
+++ b/boards/renesas/ek_ra4w1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ek_ra4w1
-  full_name: RA4W1 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa4w1ad2cng
diff --git a/boards/renesas/ek_ra6e2/board.yml b/boards/renesas/ek_ra6e2/board.yml
index 5c2629250d7..972476c9b2e 100644
--- a/boards/renesas/ek_ra6e2/board.yml
+++ b/boards/renesas/ek_ra6e2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ek_ra6e2
-  full_name: RA6E2 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa6e2bb3cfm
diff --git a/boards/renesas/ek_ra6m1/board.yml b/boards/renesas/ek_ra6m1/board.yml
index 003486b48ff..db68eb8a068 100644
--- a/boards/renesas/ek_ra6m1/board.yml
+++ b/boards/renesas/ek_ra6m1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ek_ra6m1
-  full_name: RA6M1 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa6m1ad3cfp
diff --git a/boards/renesas/ek_ra6m2/board.yml b/boards/renesas/ek_ra6m2/board.yml
index ec00a66bf19..325b1601c9a 100644
--- a/boards/renesas/ek_ra6m2/board.yml
+++ b/boards/renesas/ek_ra6m2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ek_ra6m2
-  full_name: RA6M2 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa6m2af3cfb
diff --git a/boards/renesas/ek_ra6m3/board.yml b/boards/renesas/ek_ra6m3/board.yml
index 084afa42ced..2bf115b0a18 100644
--- a/boards/renesas/ek_ra6m3/board.yml
+++ b/boards/renesas/ek_ra6m3/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ek_ra6m3
-  full_name: RA6M3 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa6m3ah3cfc
diff --git a/boards/renesas/ek_ra6m4/board.yml b/boards/renesas/ek_ra6m4/board.yml
index c7bb851f8d7..5c7e34ff180 100644
--- a/boards/renesas/ek_ra6m4/board.yml
+++ b/boards/renesas/ek_ra6m4/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ek_ra6m4
-  full_name: RA6M4 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa6m4af3cfb
diff --git a/boards/renesas/ek_ra6m5/board.yml b/boards/renesas/ek_ra6m5/board.yml
index d084f775ec1..826e64f943e 100644
--- a/boards/renesas/ek_ra6m5/board.yml
+++ b/boards/renesas/ek_ra6m5/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ek_ra6m5
-  full_name: RA6M5 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa6m5bh3cfc
diff --git a/boards/renesas/ek_ra8d1/board.yml b/boards/renesas/ek_ra8d1/board.yml
index d109cd234a3..9b48ea9b942 100644
--- a/boards/renesas/ek_ra8d1/board.yml
+++ b/boards/renesas/ek_ra8d1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ek_ra8d1
-  full_name: RA8D1 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa8d1bhecbd
diff --git a/boards/renesas/ek_ra8m1/board.yml b/boards/renesas/ek_ra8m1/board.yml
index f98587420bc..136846ecc81 100644
--- a/boards/renesas/ek_ra8m1/board.yml
+++ b/boards/renesas/ek_ra8m1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ek_ra8m1
-  full_name: RA8M1 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa8m1ahecbd
diff --git a/boards/renesas/fpb_ra6e1/board.yml b/boards/renesas/fpb_ra6e1/board.yml
index d2f980d6acc..ed1e0a18bfd 100644
--- a/boards/renesas/fpb_ra6e1/board.yml
+++ b/boards/renesas/fpb_ra6e1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: fpb_ra6e1
-  full_name: RA6E1 Fast Prototyping Board
   vendor: renesas
   socs:
   - name: r7fa6e10f2cfp
diff --git a/boards/renesas/fpb_ra6e2/board.yml b/boards/renesas/fpb_ra6e2/board.yml
index 586b7c74810..0d28094c404 100644
--- a/boards/renesas/fpb_ra6e2/board.yml
+++ b/boards/renesas/fpb_ra6e2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: fpb_ra6e2
-  full_name: RA6E2 Fast Prototyping Board
   vendor: renesas
   socs:
   - name: r7fa6e2bb3cfm
diff --git a/boards/renesas/mck_ra8t1/board.yml b/boards/renesas/mck_ra8t1/board.yml
index b7897016bbe..d7227163611 100644
--- a/boards/renesas/mck_ra8t1/board.yml
+++ b/boards/renesas/mck_ra8t1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mck_ra8t1
-  full_name: RA8T1 Evaluation Kit
   vendor: renesas
   socs:
   - name: r7fa8t1ahecbd
diff --git a/boards/renesas/rcar_h3ulcb/board.yml b/boards/renesas/rcar_h3ulcb/board.yml
index a0e38a44a90..7989c688e81 100644
--- a/boards/renesas/rcar_h3ulcb/board.yml
+++ b/boards/renesas/rcar_h3ulcb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: rcar_h3ulcb
-  full_name: R-CAR H3 ARM CA57 (ARMv8)
   vendor: renesas
   socs:
   - name: r8a77951
diff --git a/boards/renesas/rcar_salvator_x/board.yml b/boards/renesas/rcar_salvator_x/board.yml
index 11166fb0a2c..b85c3aebe67 100644
--- a/boards/renesas/rcar_salvator_x/board.yml
+++ b/boards/renesas/rcar_salvator_x/board.yml
@@ -1,6 +1,5 @@
 board:
   name: rcar_salvator_x
-  full_name: R-Car H3 Salvator-X
   vendor: renesas
   socs:
   - name: r8a77951
diff --git a/boards/renesas/rcar_salvator_xs/board.yml b/boards/renesas/rcar_salvator_xs/board.yml
index 2b8ded23f8a..b48fda7ff48 100644
--- a/boards/renesas/rcar_salvator_xs/board.yml
+++ b/boards/renesas/rcar_salvator_xs/board.yml
@@ -1,6 +1,5 @@
 board:
   name: rcar_salvator_xs
-  full_name: R-CAR Salvator XS M3 ARM CA57 (ARMv8)
   vendor: renesas
   socs:
   - name: r8a77961
diff --git a/boards/renesas/rcar_spider_s4/board.yml b/boards/renesas/rcar_spider_s4/board.yml
index caf9b8cf5ad..560ed7f2ae8 100644
--- a/boards/renesas/rcar_spider_s4/board.yml
+++ b/boards/renesas/rcar_spider_s4/board.yml
@@ -1,6 +1,5 @@
 board:
   name: rcar_spider_s4
-  full_name: R-CAR Spider S4 (ARM64)
   vendor: renesas
   socs:
   - name: r8a779f0
diff --git a/boards/renesas/rzt2m_starterkit/board.yml b/boards/renesas/rzt2m_starterkit/board.yml
index 21be12a29b2..def32c06cd2 100644
--- a/boards/renesas/rzt2m_starterkit/board.yml
+++ b/boards/renesas/rzt2m_starterkit/board.yml
@@ -1,6 +1,5 @@
 board:
   name: rzt2m_starter_kit
-  full_name: Starter Kit+ for RZ/T2M
   vendor: renesas
   socs:
   - name: renesas_rzt2m
diff --git a/boards/renode/cortex_r8_virtual/board.yml b/boards/renode/cortex_r8_virtual/board.yml
index b201b3e96c3..799b2a9ba12 100644
--- a/boards/renode/cortex_r8_virtual/board.yml
+++ b/boards/renode/cortex_r8_virtual/board.yml
@@ -1,6 +1,5 @@
 board:
   name: cortex_r8_virtual
-  full_name: Cortex-R8 Virtual
   vendor: renode
   socs:
   - name: cortex_r8_virtual
diff --git a/boards/renode/riscv32_virtual/board.yml b/boards/renode/riscv32_virtual/board.yml
index 27c5eb7c368..b059266009a 100644
--- a/boards/renode/riscv32_virtual/board.yml
+++ b/boards/renode/riscv32_virtual/board.yml
@@ -1,6 +1,5 @@
 board:
   name: riscv32_virtual
-  full_name: RISCV32 Virtual
   vendor: renode
   socs:
   - name: riscv_virtual_renode
diff --git a/boards/ronoth/lodev/board.yml b/boards/ronoth/lodev/board.yml
index db71507ae8a..008f2e5a7f5 100644
--- a/boards/ronoth/lodev/board.yml
+++ b/boards/ronoth/lodev/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ronoth_lodev
-  full_name: LoDev
   vendor: ronoth
   socs:
     - name: stm32l073xx
diff --git a/boards/ruuvi/ruuvitag/board.yml b/boards/ruuvi/ruuvitag/board.yml
index e0e6fc40a55..c8d45886d82 100644
--- a/boards/ruuvi/ruuvitag/board.yml
+++ b/boards/ruuvi/ruuvitag/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ruuvi_ruuvitag
-  full_name: RuuviTag
   vendor: ruuvi
   socs:
   - name: nrf52832
diff --git a/boards/sc/scobc_module1/board.yml b/boards/sc/scobc_module1/board.yml
index 2ffbcc51e54..d8f83a733ac 100644
--- a/boards/sc/scobc_module1/board.yml
+++ b/boards/sc/scobc_module1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: scobc_module1
-  full_name: OBC module 1
   vendor: spacecubics
   socs:
   - name: designstart_fpga_cortex_m3
diff --git a/boards/seagate/faze/board.yml b/boards/seagate/faze/board.yml
index 29ad19a2d55..bd672fe549f 100644
--- a/boards/seagate/faze/board.yml
+++ b/boards/seagate/faze/board.yml
@@ -1,6 +1,5 @@
 board:
   name: faze
-  full_name: FireCuda Gaming SSD (FaZe) board
   vendor: seagate
   socs:
     - name: lpc11u67
diff --git a/boards/seagate/legend/board.yml b/boards/seagate/legend/board.yml
index a015c60bc4e..0c100284bde 100644
--- a/boards/seagate/legend/board.yml
+++ b/boards/seagate/legend/board.yml
@@ -1,6 +1,5 @@
 board:
   name: legend
-  full_name: Legend
   vendor: seagate
   revision:
     format: custom
diff --git a/boards/seco/stm32f3_seco_d23/board.yml b/boards/seco/stm32f3_seco_d23/board.yml
index 75a16bd3b48..a7976211a2c 100644
--- a/boards/seco/stm32f3_seco_d23/board.yml
+++ b/boards/seco/stm32f3_seco_d23/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32f3_seco_d23
-  full_name: SECO SBC-3.5-PX30 (JUNO - D23) (STM32F302)
   vendor: seco
   socs:
     - name: stm32f302xc
diff --git a/boards/seeed/lora_e5_dev_board/board.yml b/boards/seeed/lora_e5_dev_board/board.yml
index e53e5451e0c..b6691948f2b 100644
--- a/boards/seeed/lora_e5_dev_board/board.yml
+++ b/boards/seeed/lora_e5_dev_board/board.yml
@@ -1,6 +1,5 @@
 board:
   name: lora_e5_dev_board
-  full_name: LoRa-E5 Dev Board
   vendor: seeed
   socs:
     - name: stm32wle5xx
diff --git a/boards/seeed/lora_e5_mini/board.yml b/boards/seeed/lora_e5_mini/board.yml
index 7f1080afb5d..1643caea3c1 100644
--- a/boards/seeed/lora_e5_mini/board.yml
+++ b/boards/seeed/lora_e5_mini/board.yml
@@ -1,6 +1,5 @@
 board:
   name: lora_e5_mini
-  full_name: LoRa-E5 mini
   vendor: seeed
   socs:
     - name: stm32wle5xx
diff --git a/boards/seeed/seeeduino_xiao/board.yml b/boards/seeed/seeeduino_xiao/board.yml
index 642e7e750e3..386a3b3cbb6 100644
--- a/boards/seeed/seeeduino_xiao/board.yml
+++ b/boards/seeed/seeeduino_xiao/board.yml
@@ -1,6 +1,5 @@
 board:
   name: seeeduino_xiao
-  full_name: Seeeduino XIAO
   vendor: seeed
   socs:
     - name: samd21g18a
diff --git a/boards/seeed/wio_terminal/board.yml b/boards/seeed/wio_terminal/board.yml
index 7972eeb9de5..a7080a87777 100644
--- a/boards/seeed/wio_terminal/board.yml
+++ b/boards/seeed/wio_terminal/board.yml
@@ -1,6 +1,5 @@
 board:
   name: wio_terminal
-  full_name: Wio Terminal
   vendor: seeed
   socs:
     - name: samd51p19a
diff --git a/boards/seeed/xiao_ble/board.yml b/boards/seeed/xiao_ble/board.yml
index ecc63f716ad..3f83399a7fb 100644
--- a/boards/seeed/xiao_ble/board.yml
+++ b/boards/seeed/xiao_ble/board.yml
@@ -1,6 +1,5 @@
 board:
   name: xiao_ble
-  full_name: XIAO BLE (Sense)
   vendor: seeed
   socs:
   - name: nrf52840
diff --git a/boards/seeed/xiao_esp32c3/board.yml b/boards/seeed/xiao_esp32c3/board.yml
index d9c7cef765c..2bd54cf346f 100644
--- a/boards/seeed/xiao_esp32c3/board.yml
+++ b/boards/seeed/xiao_esp32c3/board.yml
@@ -1,6 +1,5 @@
 board:
   name: xiao_esp32c3
-  full_name: XIAO ESP32C3
   vendor: seeed
   socs:
   - name: esp32c3
diff --git a/boards/seeed/xiao_esp32s3/board.yml b/boards/seeed/xiao_esp32s3/board.yml
index c3eb3a0204d..02ba87e5bc2 100644
--- a/boards/seeed/xiao_esp32s3/board.yml
+++ b/boards/seeed/xiao_esp32s3/board.yml
@@ -1,6 +1,5 @@
 board:
   name: xiao_esp32s3
-  full_name: XIAO ESP32S3
   vendor: seeed
   socs:
   - name: esp32s3
diff --git a/boards/seeed/xiao_rp2040/board.yml b/boards/seeed/xiao_rp2040/board.yml
index 75b352e9aee..7eaca915972 100644
--- a/boards/seeed/xiao_rp2040/board.yml
+++ b/boards/seeed/xiao_rp2040/board.yml
@@ -1,6 +1,5 @@
 board:
   name: xiao_rp2040
-  full_name: XIAO RP2040
   vendor: seeed
   socs:
   - name: rp2040
diff --git a/boards/segger/ip_k66f/board.yml b/boards/segger/ip_k66f/board.yml
index 21b7c0b65e4..c1593280a49 100644
--- a/boards/segger/ip_k66f/board.yml
+++ b/boards/segger/ip_k66f/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ip_k66f
-  full_name: IP Switch Board
   vendor: segger
   socs:
     - name: mk66f18
diff --git a/boards/segger/trb_stm32f407/board.yml b/boards/segger/trb_stm32f407/board.yml
index 1fc912e38ca..52ba24a33eb 100644
--- a/boards/segger/trb_stm32f407/board.yml
+++ b/boards/segger/trb_stm32f407/board.yml
@@ -1,6 +1,5 @@
 board:
   name: segger_trb_stm32f407
-  full_name: Cortex-M Trace Reference Board V1.2
   vendor: segger
   socs:
     - name: stm32f407xx
diff --git a/boards/sensry/ganymed_bob/board.yml b/boards/sensry/ganymed_bob/board.yml
index 5e444b0dbb8..cc6591f6253 100644
--- a/boards/sensry/ganymed_bob/board.yml
+++ b/boards/sensry/ganymed_bob/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: ganymed_bob
-  full_name: Ganymed Break-Out-Board (BOB)
   vendor: sensry
   socs:
     - name: sy120_gbm
diff --git a/boards/sifive/hifive1/board.yml b/boards/sifive/hifive1/board.yml
index a83c4f2e2c7..2909cb5aaeb 100644
--- a/boards/sifive/hifive1/board.yml
+++ b/boards/sifive/hifive1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: hifive1
-  full_name: HiFive1
   vendor: sifive
   socs:
     - name: fe310
diff --git a/boards/sifive/hifive_unleashed/board.yml b/boards/sifive/hifive_unleashed/board.yml
index 5535b9ca544..f9dd3ce6e6b 100644
--- a/boards/sifive/hifive_unleashed/board.yml
+++ b/boards/sifive/hifive_unleashed/board.yml
@@ -1,6 +1,5 @@
 board:
   name: hifive_unleashed
-  full_name: HiFive Unleashed
   vendor: sifive
   socs:
     - name: fu540
diff --git a/boards/sifive/hifive_unmatched/board.yml b/boards/sifive/hifive_unmatched/board.yml
index eb61e98e55c..703d94e852b 100644
--- a/boards/sifive/hifive_unmatched/board.yml
+++ b/boards/sifive/hifive_unmatched/board.yml
@@ -1,6 +1,5 @@
 board:
   name: hifive_unmatched
-  full_name: HiFive Unmatched
   vendor: sifive
   socs:
     - name: fu740
diff --git a/boards/silabs/dev_kits/sim3u1xx_dk/board.yml b/boards/silabs/dev_kits/sim3u1xx_dk/board.yml
index facdc0f817a..c70d5420483 100644
--- a/boards/silabs/dev_kits/sim3u1xx_dk/board.yml
+++ b/boards/silabs/dev_kits/sim3u1xx_dk/board.yml
@@ -4,7 +4,6 @@
 
 board:
   name: sim3u1xx_dk
-  full_name: SiM3U1xx 32-bit MCU USB Development Kit
   vendor: silabs
   socs:
     - name: sim3u167
diff --git a/boards/silabs/dev_kits/sltb004a/board.yml b/boards/silabs/dev_kits/sltb004a/board.yml
index 73c4c2aced7..2141aa3817d 100644
--- a/boards/silabs/dev_kits/sltb004a/board.yml
+++ b/boards/silabs/dev_kits/sltb004a/board.yml
@@ -1,6 +1,5 @@
 board:
   name: sltb004a
-  full_name: EFR32MG12 Thunderboard (SLTB004A)
   vendor: silabs
   socs:
   - name: efr32mg12p332f1024gl125
diff --git a/boards/silabs/dev_kits/sltb009a/board.yml b/boards/silabs/dev_kits/sltb009a/board.yml
index e42c7cd0b66..af69758728d 100644
--- a/boards/silabs/dev_kits/sltb009a/board.yml
+++ b/boards/silabs/dev_kits/sltb009a/board.yml
@@ -1,6 +1,5 @@
 board:
   name: sltb009a
-  full_name: EFM32GG12 Thunderboard (SLTB009A)
   vendor: silabs
   socs:
   - name: efm32gg12b810f1024gm64
diff --git a/boards/silabs/dev_kits/sltb010a/board.yml b/boards/silabs/dev_kits/sltb010a/board.yml
index 8e2cf705005..4586a51ef72 100644
--- a/boards/silabs/dev_kits/sltb010a/board.yml
+++ b/boards/silabs/dev_kits/sltb010a/board.yml
@@ -1,6 +1,5 @@
 boards:
   - name: sltb010a
-    full_name: EFR32BG22 Thunderboard (SLTB010A)
     vendor: silabs
     socs:
       - name: efr32bg22c224f512im40
diff --git a/boards/silabs/dev_kits/xg24_dk2601b/board.yml b/boards/silabs/dev_kits/xg24_dk2601b/board.yml
index 46b2e55a2ce..f946744d228 100644
--- a/boards/silabs/dev_kits/xg24_dk2601b/board.yml
+++ b/boards/silabs/dev_kits/xg24_dk2601b/board.yml
@@ -1,6 +1,5 @@
 board:
   name: xg24_dk2601b
-  full_name: EFR32xG24 Dev Kit (xG24-DK2601B)
   vendor: silabs
   socs:
   - name: efr32mg24b310f1536im48
diff --git a/boards/silabs/dev_kits/xg27_dk2602a/board.yml b/boards/silabs/dev_kits/xg27_dk2602a/board.yml
index 1d6d016ecf5..83a3037a1a7 100644
--- a/boards/silabs/dev_kits/xg27_dk2602a/board.yml
+++ b/boards/silabs/dev_kits/xg27_dk2602a/board.yml
@@ -1,6 +1,5 @@
 boards:
   - name: xg27_dk2602a
-    full_name: EFR32xG27 Dev Kit (xG27-DK2602A)
     vendor: silabs
     socs:
       - name: efr32bg27c140f768im40
diff --git a/boards/silabs/radio_boards/slwrb4104a/board.yml b/boards/silabs/radio_boards/slwrb4104a/board.yml
index d1122ace331..5ca377b2c8f 100644
--- a/boards/silabs/radio_boards/slwrb4104a/board.yml
+++ b/boards/silabs/radio_boards/slwrb4104a/board.yml
@@ -1,5 +1,4 @@
 boards:
   - name: slwrb4104a
-    full_name: EFR32BG13 2.4 GHz 10 dBm (SLWRB4104A)
     socs:
       - name: efr32bg13p632f512gm48
diff --git a/boards/silabs/radio_boards/slwrb4161a/board.yml b/boards/silabs/radio_boards/slwrb4161a/board.yml
index fd0c68e48b2..a05542a40d8 100644
--- a/boards/silabs/radio_boards/slwrb4161a/board.yml
+++ b/boards/silabs/radio_boards/slwrb4161a/board.yml
@@ -1,5 +1,4 @@
 boards:
   - name: slwrb4161a
-    full_name: EFR32MG12 2.4 GHz 19 dBm (SLWRB4161A)
     socs:
       - name: efr32mg12p432f1024gl125
diff --git a/boards/silabs/radio_boards/slwrb4170a/board.yml b/boards/silabs/radio_boards/slwrb4170a/board.yml
index 5d9fd340d3e..3137d819edb 100644
--- a/boards/silabs/radio_boards/slwrb4170a/board.yml
+++ b/boards/silabs/radio_boards/slwrb4170a/board.yml
@@ -1,5 +1,4 @@
 boards:
   - name: slwrb4170a
-    full_name: EFR32MG12 2400/868-915 MHz 19 dBm Dual Band (SLWRB4170A)
     socs:
       - name: efr32mg12p433f1024gm68
diff --git a/boards/silabs/radio_boards/slwrb4180a/board.yml b/boards/silabs/radio_boards/slwrb4180a/board.yml
index f77ecb3f65b..c6f825f735a 100644
--- a/boards/silabs/radio_boards/slwrb4180a/board.yml
+++ b/boards/silabs/radio_boards/slwrb4180a/board.yml
@@ -1,5 +1,4 @@
 boards:
   - name: slwrb4180a
-    full_name: EFR32xG21 2.4 GHz 20 dBm (SLWRB4180A)
     socs:
       - name: efr32mg21a020f1024im32
diff --git a/boards/silabs/radio_boards/slwrb4250b/board.yml b/boards/silabs/radio_boards/slwrb4250b/board.yml
index 052b39f83c3..cffd4c63dbb 100644
--- a/boards/silabs/radio_boards/slwrb4250b/board.yml
+++ b/boards/silabs/radio_boards/slwrb4250b/board.yml
@@ -1,5 +1,4 @@
 boards:
   - name: slwrb4250b
-    full_name: EFR32FG1 2400/868 MHz 13 dBm Dual Band (SLWRB4250B)
     socs:
       - name: efr32fg1p133f256gm48
diff --git a/boards/silabs/radio_boards/slwrb4255a/board.yml b/boards/silabs/radio_boards/slwrb4255a/board.yml
index 841a0858e13..4b76604b170 100644
--- a/boards/silabs/radio_boards/slwrb4255a/board.yml
+++ b/boards/silabs/radio_boards/slwrb4255a/board.yml
@@ -1,5 +1,4 @@
 boards:
   - name: slwrb4255a
-    full_name: EFR32FG13 2400/915 MHz 19 dBm Dual Band (SLWRB4255A)
     socs:
       - name: efr32fg13p233f512gm48
diff --git a/boards/silabs/radio_boards/slwrb4321a/board.yml b/boards/silabs/radio_boards/slwrb4321a/board.yml
index c0ad89de758..a86f5c2d620 100644
--- a/boards/silabs/radio_boards/slwrb4321a/board.yml
+++ b/boards/silabs/radio_boards/slwrb4321a/board.yml
@@ -1,6 +1,5 @@
 board:
   name: slwrb4321a
-  full_name: WGM160P Wi-Fi Module (SLWRB4321A)
   vendor: silabs
   socs:
   - name: efm32gg11b820f2048gm64
diff --git a/boards/silabs/radio_boards/xg24_rb4187c/board.yml b/boards/silabs/radio_boards/xg24_rb4187c/board.yml
index 36457142237..09a4d074370 100644
--- a/boards/silabs/radio_boards/xg24_rb4187c/board.yml
+++ b/boards/silabs/radio_boards/xg24_rb4187c/board.yml
@@ -1,5 +1,4 @@
 boards:
   - name: xg24_rb4187c
-    full_name: EFR32xG24 2.4 GHz 20 dBm (xG24-RB4187C)
     socs:
       - name: efr32mg24b220f1536im48
diff --git a/boards/silabs/starter_kits/efm32wg_stk3800/board.yml b/boards/silabs/starter_kits/efm32wg_stk3800/board.yml
index ab827f8b346..034c623141b 100644
--- a/boards/silabs/starter_kits/efm32wg_stk3800/board.yml
+++ b/boards/silabs/starter_kits/efm32wg_stk3800/board.yml
@@ -1,6 +1,5 @@
 board:
   name: efm32wg_stk3800
-  full_name: EFM32 Wonder Gecko (EFM32WG-STK3800)
   vendor: silabs
   socs:
   - name: efm32wg990f256
diff --git a/boards/silabs/starter_kits/slstk3400a/board.yml b/boards/silabs/starter_kits/slstk3400a/board.yml
index 30d6090012d..e6573ac89f5 100644
--- a/boards/silabs/starter_kits/slstk3400a/board.yml
+++ b/boards/silabs/starter_kits/slstk3400a/board.yml
@@ -1,6 +1,5 @@
 board:
   name: slstk3400a
-  full_name: EFM32 Happy Gecko (SLSTK3400A)
   vendor: silabs
   socs:
   - name: efm32hg322f64
diff --git a/boards/silabs/starter_kits/slstk3401a/board.yml b/boards/silabs/starter_kits/slstk3401a/board.yml
index 99ce00a0ad2..98ae08c1992 100644
--- a/boards/silabs/starter_kits/slstk3401a/board.yml
+++ b/boards/silabs/starter_kits/slstk3401a/board.yml
@@ -1,6 +1,5 @@
 board:
   name: slstk3401a
-  full_name: EFM32 Pearl Gecko (SLSTK3401A)
   vendor: silabs
   socs:
   - name: efm32pg1b200f256gm48
diff --git a/boards/silabs/starter_kits/slstk3402a/board.yml b/boards/silabs/starter_kits/slstk3402a/board.yml
index 6c9350d31bf..539af134c6d 100644
--- a/boards/silabs/starter_kits/slstk3402a/board.yml
+++ b/boards/silabs/starter_kits/slstk3402a/board.yml
@@ -1,6 +1,5 @@
 board:
   name: slstk3402a
-  full_name: EFM32 Pearl Gecko 12 (SLSTK3402A)
   vendor: silabs
   socs:
   - name: efm32pg12b500f1024gl125
diff --git a/boards/silabs/starter_kits/slstk3701a/board.yml b/boards/silabs/starter_kits/slstk3701a/board.yml
index 86615b1e8fe..5c1db884a42 100644
--- a/boards/silabs/starter_kits/slstk3701a/board.yml
+++ b/boards/silabs/starter_kits/slstk3701a/board.yml
@@ -1,6 +1,5 @@
 board:
   name: slstk3701a
-  full_name: EFM32 Giant Gecko 11 (SLSTK3701A)
   vendor: silabs
   socs:
   - name: efm32gg11b820f2048gl192
diff --git a/boards/sipeed/longan_nano/board.yml b/boards/sipeed/longan_nano/board.yml
index 4f1fedeba77..035ea8f540d 100644
--- a/boards/sipeed/longan_nano/board.yml
+++ b/boards/sipeed/longan_nano/board.yml
@@ -1,6 +1,5 @@
 board:
   name: longan_nano
-  full_name: Longan Nano
   vendor: sipeed
   socs:
     - name: gd32vf103
diff --git a/boards/snps/em_starterkit/board.yml b/boards/snps/em_starterkit/board.yml
index c9279e060f2..b5c30f1ba9d 100644
--- a/boards/snps/em_starterkit/board.yml
+++ b/boards/snps/em_starterkit/board.yml
@@ -1,6 +1,5 @@
 board:
   name: em_starterkit
-  full_name: ARC EM Starter Kit
   vendor: snps
   socs:
   - name: emsk_em7d
diff --git a/boards/snps/emsdp/board.yml b/boards/snps/emsdp/board.yml
index 6a5f944733d..463c30bc2fc 100644
--- a/boards/snps/emsdp/board.yml
+++ b/boards/snps/emsdp/board.yml
@@ -1,6 +1,5 @@
 board:
   name: emsdp
-  full_name: ARC EM Software Development Platform
   vendor: snps
   socs:
   - name: emsdp_em4
diff --git a/boards/snps/hsdk/board.yml b/boards/snps/hsdk/board.yml
index 164b176bae6..44363f8a9b8 100644
--- a/boards/snps/hsdk/board.yml
+++ b/boards/snps/hsdk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: hsdk
-  full_name: ARC HS Development Kit
   vendor: snps
   socs:
   - name: arc_hsdk
diff --git a/boards/snps/hsdk4xd/board.yml b/boards/snps/hsdk4xd/board.yml
index 147e75e69f0..70e04fa7e80 100644
--- a/boards/snps/hsdk4xd/board.yml
+++ b/boards/snps/hsdk4xd/board.yml
@@ -1,6 +1,5 @@
 board:
   name: hsdk4xd
-  full_name: ARC HS4x/HS4xD Development Kit
   vendor: snps
   socs:
   - name: arc_hsdk4xd
diff --git a/boards/snps/iotdk/board.yml b/boards/snps/iotdk/board.yml
index 9889a3762f8..5222ad815cf 100644
--- a/boards/snps/iotdk/board.yml
+++ b/boards/snps/iotdk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: iotdk
-  full_name: ARC IoT Development Kit
   vendor: snps
   socs:
   - name: arc_iot
diff --git a/boards/snps/nsim/arc_classic/board.yml b/boards/snps/nsim/arc_classic/board.yml
index 20bbd3071ec..a5089774c47 100644
--- a/boards/snps/nsim/arc_classic/board.yml
+++ b/boards/snps/nsim/arc_classic/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nsim
-  full_name: ARC nSIM and HAPS FPGA boards
   vendor: snps
   socs:
   - name: nsim_em
diff --git a/boards/snps/nsim/arc_v/board.yml b/boards/snps/nsim/arc_v/board.yml
index 4a8d44eee29..a91eaffd90a 100644
--- a/boards/snps/nsim/arc_v/board.yml
+++ b/boards/snps/nsim/arc_v/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nsim_arc_v
-  full_name: RISC-V nSIM and HAPS FPGA boards
   vendor: snps
   socs:
   - name: rmx100
diff --git a/boards/sparkfun/micromod/board.yml b/boards/sparkfun/micromod/board.yml
index 2f7df46ca0c..851ac345bc5 100644
--- a/boards/sparkfun/micromod/board.yml
+++ b/boards/sparkfun/micromod/board.yml
@@ -1,6 +1,5 @@
 board:
   name: micromod
-  full_name: MicroMod board Processor
   vendor: sparkfun
   socs:
   - name: nrf52840
diff --git a/boards/sparkfun/nrf52_sparkfun/board.yml b/boards/sparkfun/nrf52_sparkfun/board.yml
index d892ab054bb..5e44e8a072b 100644
--- a/boards/sparkfun/nrf52_sparkfun/board.yml
+++ b/boards/sparkfun/nrf52_sparkfun/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf52_sparkfun
-  full_name: nRF52832 breakout
   vendor: sparkfun
   socs:
   - name: nrf52832
diff --git a/boards/sparkfun/pro_micro_rp2040/board.yml b/boards/sparkfun/pro_micro_rp2040/board.yml
index e4c96de669d..ed9e449e8aa 100644
--- a/boards/sparkfun/pro_micro_rp2040/board.yml
+++ b/boards/sparkfun/pro_micro_rp2040/board.yml
@@ -1,6 +1,5 @@
 board:
   name: sparkfun_pro_micro_rp2040
-  full_name: Pro Micro RP2040
   vendor: sparkfun
   socs:
   - name: rp2040
diff --git a/boards/sparkfun/red_v_things_plus/board.yml b/boards/sparkfun/red_v_things_plus/board.yml
index fe588482767..6ef8e39c2f9 100644
--- a/boards/sparkfun/red_v_things_plus/board.yml
+++ b/boards/sparkfun/red_v_things_plus/board.yml
@@ -1,6 +1,5 @@
 board:
   name: sparkfun_red_v_things_plus
-  full_name: RED-V Things Plus
   vendor: sparkfun
   socs:
     - name: fe310
diff --git a/boards/sparkfun/thing_plus/board.yml b/boards/sparkfun/thing_plus/board.yml
index f632d9feab0..18037dfd5b6 100644
--- a/boards/sparkfun/thing_plus/board.yml
+++ b/boards/sparkfun/thing_plus/board.yml
@@ -1,6 +1,5 @@
 board:
   name: sparkfun_thing_plus
-  full_name: nRF9160 Thing Plus
   vendor: sparkfun
   socs:
   - name: nrf9160
diff --git a/boards/sparkfun/thing_plus_matter_mgm240p/board.yml b/boards/sparkfun/thing_plus_matter_mgm240p/board.yml
index e2d94d63e1c..69ecc88a5b8 100644
--- a/boards/sparkfun/thing_plus_matter_mgm240p/board.yml
+++ b/boards/sparkfun/thing_plus_matter_mgm240p/board.yml
@@ -1,6 +1,5 @@
 board:
   name: sparkfun_thing_plus_matter_mgm240p
-  full_name: THING PLUS MATTER
   vendor: sparkfun
   socs:
   - name: efr32mg24b020f1536im40
diff --git a/boards/st/b_g474e_dpow1/board.yml b/boards/st/b_g474e_dpow1/board.yml
index c2c81d97489..06d037f81a0 100644
--- a/boards/st/b_g474e_dpow1/board.yml
+++ b/boards/st/b_g474e_dpow1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: b_g474e_dpow1
-  full_name: B-G474E-DPOW1 Discovery
   vendor: st
   socs:
     - name: stm32g474xx
diff --git a/boards/st/b_l072z_lrwan1/board.yml b/boards/st/b_l072z_lrwan1/board.yml
index 70a1d334a4a..1a7b494de19 100644
--- a/boards/st/b_l072z_lrwan1/board.yml
+++ b/boards/st/b_l072z_lrwan1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: b_l072z_lrwan1
-  full_name: B-L072Z-LRWAN1 Discovery kit
   vendor: st
   socs:
     - name: stm32l072xx
diff --git a/boards/st/b_l4s5i_iot01a/board.yml b/boards/st/b_l4s5i_iot01a/board.yml
index de0a620a93f..e41cb4b1002 100644
--- a/boards/st/b_l4s5i_iot01a/board.yml
+++ b/boards/st/b_l4s5i_iot01a/board.yml
@@ -1,6 +1,5 @@
 board:
   name: b_l4s5i_iot01a
-  full_name: B-L4S5I-IOT01A Discovery kit
   vendor: st
   socs:
     - name: stm32l4s5xx
diff --git a/boards/st/b_u585i_iot02a/board.yml b/boards/st/b_u585i_iot02a/board.yml
index c5ae28435f0..55e740ec45d 100644
--- a/boards/st/b_u585i_iot02a/board.yml
+++ b/boards/st/b_u585i_iot02a/board.yml
@@ -1,6 +1,5 @@
 board:
   name: b_u585i_iot02a
-  full_name: B-U585I-IOT02A Discovery kit
   vendor: st
   socs:
     - name: stm32u585xx
diff --git a/boards/st/disco_l475_iot1/board.yml b/boards/st/disco_l475_iot1/board.yml
index 1179b080028..c11f22591a5 100644
--- a/boards/st/disco_l475_iot1/board.yml
+++ b/boards/st/disco_l475_iot1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: disco_l475_iot1
-  full_name: Disco L475 IOT01 (B-L475E-IOT01A)
   vendor: st
   socs:
     - name: stm32l475xx
diff --git a/boards/st/nucleo_c031c6/board.yml b/boards/st/nucleo_c031c6/board.yml
index 412db17f2df..37d48de4d52 100644
--- a/boards/st/nucleo_c031c6/board.yml
+++ b/boards/st/nucleo_c031c6/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_c031c6
-  full_name: Nucleo C031C6
   vendor: st
   socs:
     - name: stm32c031xx
diff --git a/boards/st/nucleo_f030r8/board.yml b/boards/st/nucleo_f030r8/board.yml
index bc62b0f7a8d..515aae8c5b0 100644
--- a/boards/st/nucleo_f030r8/board.yml
+++ b/boards/st/nucleo_f030r8/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f030r8
-  full_name: Nucleo F030R8
   vendor: st
   revision:
     format: number
diff --git a/boards/st/nucleo_f031k6/board.yml b/boards/st/nucleo_f031k6/board.yml
index 4e0c5730751..01fc79ac033 100644
--- a/boards/st/nucleo_f031k6/board.yml
+++ b/boards/st/nucleo_f031k6/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f031k6
-  full_name: Nucleo F031K6
   vendor: st
   socs:
     - name: stm32f031x6
diff --git a/boards/st/nucleo_f042k6/board.yml b/boards/st/nucleo_f042k6/board.yml
index 787d8d41b3d..89d8b050428 100644
--- a/boards/st/nucleo_f042k6/board.yml
+++ b/boards/st/nucleo_f042k6/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f042k6
-  full_name: Nucleo F042K6
   vendor: st
   socs:
     - name: stm32f042x6
diff --git a/boards/st/nucleo_f070rb/board.yml b/boards/st/nucleo_f070rb/board.yml
index 4ed7f75d40b..8f3a6a49878 100644
--- a/boards/st/nucleo_f070rb/board.yml
+++ b/boards/st/nucleo_f070rb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f070rb
-  full_name: Nucleo F070RB
   vendor: st
   socs:
     - name: stm32f070xb
diff --git a/boards/st/nucleo_f091rc/board.yml b/boards/st/nucleo_f091rc/board.yml
index 7e7b8e5876e..9f3fe67f8f6 100644
--- a/boards/st/nucleo_f091rc/board.yml
+++ b/boards/st/nucleo_f091rc/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f091rc
-  full_name: Nucleo F091RC
   vendor: st
   socs:
     - name: stm32f091xc
diff --git a/boards/st/nucleo_f103rb/board.yml b/boards/st/nucleo_f103rb/board.yml
index 230bda28975..57425f7832d 100644
--- a/boards/st/nucleo_f103rb/board.yml
+++ b/boards/st/nucleo_f103rb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f103rb
-  full_name: Nucleo F103RB
   vendor: st
   socs:
     - name: stm32f103xb
diff --git a/boards/st/nucleo_f207zg/board.yml b/boards/st/nucleo_f207zg/board.yml
index ea2312af9a7..8b35f4457cd 100644
--- a/boards/st/nucleo_f207zg/board.yml
+++ b/boards/st/nucleo_f207zg/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f207zg
-  full_name: Nucleo F207ZG
   vendor: st
   socs:
     - name: stm32f207xx
diff --git a/boards/st/nucleo_f302r8/board.yml b/boards/st/nucleo_f302r8/board.yml
index dd7c32ff7d7..a39ae3dc6d2 100644
--- a/boards/st/nucleo_f302r8/board.yml
+++ b/boards/st/nucleo_f302r8/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f302r8
-  full_name: Nucleo F302R8
   vendor: st
   socs:
     - name: stm32f302x8
diff --git a/boards/st/nucleo_f303k8/board.yml b/boards/st/nucleo_f303k8/board.yml
index 50a409d7358..ae44e2bbb55 100644
--- a/boards/st/nucleo_f303k8/board.yml
+++ b/boards/st/nucleo_f303k8/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f303k8
-  full_name: Nucleo F303K8
   vendor: st
   socs:
     - name: stm32f303x8
diff --git a/boards/st/nucleo_f303re/board.yml b/boards/st/nucleo_f303re/board.yml
index 5b33354408c..dc99dcc1d6a 100644
--- a/boards/st/nucleo_f303re/board.yml
+++ b/boards/st/nucleo_f303re/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f303re
-  full_name: Nucleo F303RE
   vendor: st
   socs:
     - name: stm32f303xe
diff --git a/boards/st/nucleo_f334r8/board.yml b/boards/st/nucleo_f334r8/board.yml
index 8ae552c4895..7a8a3e642d8 100644
--- a/boards/st/nucleo_f334r8/board.yml
+++ b/boards/st/nucleo_f334r8/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f334r8
-  full_name: Nucleo F334R8
   vendor: st
   socs:
     - name: stm32f334x8
diff --git a/boards/st/nucleo_f401re/board.yml b/boards/st/nucleo_f401re/board.yml
index 8d322a5d408..4cb781427b5 100644
--- a/boards/st/nucleo_f401re/board.yml
+++ b/boards/st/nucleo_f401re/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f401re
-  full_name: Nucleo F401RE
   vendor: st
   socs:
     - name: stm32f401xe
diff --git a/boards/st/nucleo_f410rb/board.yml b/boards/st/nucleo_f410rb/board.yml
index b2a93fcb445..23c247e3bad 100644
--- a/boards/st/nucleo_f410rb/board.yml
+++ b/boards/st/nucleo_f410rb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f410rb
-  full_name: Nucleo F410RB
   vendor: st
   socs:
     - name: stm32f410rx
diff --git a/boards/st/nucleo_f411re/board.yml b/boards/st/nucleo_f411re/board.yml
index e3cfe259304..6ed17fdc2c4 100644
--- a/boards/st/nucleo_f411re/board.yml
+++ b/boards/st/nucleo_f411re/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f411re
-  full_name: Nucleo F411RE
   vendor: st
   socs:
     - name: stm32f411xe
diff --git a/boards/st/nucleo_f412zg/board.yml b/boards/st/nucleo_f412zg/board.yml
index 07919c3f445..b4bb8372f50 100644
--- a/boards/st/nucleo_f412zg/board.yml
+++ b/boards/st/nucleo_f412zg/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f412zg
-  full_name: Nucleo F412ZG
   vendor: st
   socs:
     - name: stm32f412zx
diff --git a/boards/st/nucleo_f413zh/board.yml b/boards/st/nucleo_f413zh/board.yml
index a207e5e0357..a372cec4b8a 100644
--- a/boards/st/nucleo_f413zh/board.yml
+++ b/boards/st/nucleo_f413zh/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f413zh
-  full_name: Nucleo F413ZH
   vendor: st
   socs:
     - name: stm32f413xx
diff --git a/boards/st/nucleo_f429zi/board.yml b/boards/st/nucleo_f429zi/board.yml
index c2a2b867a11..ecf8e93828b 100644
--- a/boards/st/nucleo_f429zi/board.yml
+++ b/boards/st/nucleo_f429zi/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f429zi
-  full_name: Nucleo F429ZI
   vendor: st
   socs:
     - name: stm32f429xx
diff --git a/boards/st/nucleo_f446re/board.yml b/boards/st/nucleo_f446re/board.yml
index 659fff64636..d68a45990b8 100644
--- a/boards/st/nucleo_f446re/board.yml
+++ b/boards/st/nucleo_f446re/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f446re
-  full_name: Nucleo F446RE
   vendor: st
   socs:
     - name: stm32f446xx
diff --git a/boards/st/nucleo_f446ze/board.yml b/boards/st/nucleo_f446ze/board.yml
index 32861aa1789..eb577af456b 100644
--- a/boards/st/nucleo_f446ze/board.yml
+++ b/boards/st/nucleo_f446ze/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f446ze
-  full_name: Nucleo F446ZE
   vendor: st
   socs:
     - name: stm32f446xx
diff --git a/boards/st/nucleo_f722ze/board.yml b/boards/st/nucleo_f722ze/board.yml
index 80ab328c14e..793193bc2ca 100644
--- a/boards/st/nucleo_f722ze/board.yml
+++ b/boards/st/nucleo_f722ze/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f722ze
-  full_name: Nucleo F722ZE
   vendor: st
   socs:
     - name: stm32f722xx
diff --git a/boards/st/nucleo_f746zg/board.yml b/boards/st/nucleo_f746zg/board.yml
index d21d7faab75..1df68107ece 100644
--- a/boards/st/nucleo_f746zg/board.yml
+++ b/boards/st/nucleo_f746zg/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f746zg
-  full_name: Nucleo F746ZG
   vendor: st
   socs:
     - name: stm32f746xx
diff --git a/boards/st/nucleo_f756zg/board.yml b/boards/st/nucleo_f756zg/board.yml
index f95bc53df7f..791d7601754 100644
--- a/boards/st/nucleo_f756zg/board.yml
+++ b/boards/st/nucleo_f756zg/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f756zg
-  full_name: Nucleo F756ZG
   vendor: st
   socs:
     - name: stm32f756xx
diff --git a/boards/st/nucleo_f767zi/board.yml b/boards/st/nucleo_f767zi/board.yml
index 30dea098842..810b80a5fdc 100644
--- a/boards/st/nucleo_f767zi/board.yml
+++ b/boards/st/nucleo_f767zi/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_f767zi
-  full_name: Nucleo F767ZI
   vendor: st
   socs:
     - name: stm32f767xx
diff --git a/boards/st/nucleo_g031k8/board.yml b/boards/st/nucleo_g031k8/board.yml
index 2382e3e70fd..690afd52fb0 100644
--- a/boards/st/nucleo_g031k8/board.yml
+++ b/boards/st/nucleo_g031k8/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_g031k8
-  full_name: Nucleo G031K8
   vendor: st
   socs:
     - name: stm32g031xx
diff --git a/boards/st/nucleo_g070rb/board.yml b/boards/st/nucleo_g070rb/board.yml
index a0074bc9449..88306b0d7f0 100644
--- a/boards/st/nucleo_g070rb/board.yml
+++ b/boards/st/nucleo_g070rb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_g070rb
-  full_name: Nucleo G070RB
   vendor: st
   socs:
     - name: stm32g070xx
diff --git a/boards/st/nucleo_g071rb/board.yml b/boards/st/nucleo_g071rb/board.yml
index 63c1ce9add4..05e948a2f36 100644
--- a/boards/st/nucleo_g071rb/board.yml
+++ b/boards/st/nucleo_g071rb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_g071rb
-  full_name: Nucleo G071RB
   vendor: st
   socs:
     - name: stm32g071xx
diff --git a/boards/st/nucleo_g0b1re/board.yml b/boards/st/nucleo_g0b1re/board.yml
index f7732c1330f..b9d0f93261f 100644
--- a/boards/st/nucleo_g0b1re/board.yml
+++ b/boards/st/nucleo_g0b1re/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_g0b1re
-  full_name: Nucleo G0B1RE
   vendor: st
   socs:
     - name: stm32g0b1xx
diff --git a/boards/st/nucleo_g431rb/board.yml b/boards/st/nucleo_g431rb/board.yml
index e338c94cbaa..460dcf740e8 100644
--- a/boards/st/nucleo_g431rb/board.yml
+++ b/boards/st/nucleo_g431rb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_g431rb
-  full_name: Nucleo G431RB
   vendor: st
   socs:
     - name: stm32g431xx
diff --git a/boards/st/nucleo_g474re/board.yml b/boards/st/nucleo_g474re/board.yml
index 9921219d1e5..7cf7857f527 100644
--- a/boards/st/nucleo_g474re/board.yml
+++ b/boards/st/nucleo_g474re/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_g474re
-  full_name: Nucleo G474RE
   vendor: st
   socs:
     - name: stm32g474xx
diff --git a/boards/st/nucleo_h503rb/board.yml b/boards/st/nucleo_h503rb/board.yml
index 15f7b72e306..bbf3662873b 100644
--- a/boards/st/nucleo_h503rb/board.yml
+++ b/boards/st/nucleo_h503rb/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: nucleo_h503rb
-  full_name: Nucleo H503RB
   vendor: st
   socs:
     - name: stm32h503xx
diff --git a/boards/st/nucleo_h533re/board.yml b/boards/st/nucleo_h533re/board.yml
index 11b0d6aa069..4b633011b71 100644
--- a/boards/st/nucleo_h533re/board.yml
+++ b/boards/st/nucleo_h533re/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_h533re
-  full_name: Nucleo H533RE
   vendor: st
   socs:
     - name: stm32h533xx
diff --git a/boards/st/nucleo_h563zi/board.yml b/boards/st/nucleo_h563zi/board.yml
index fec89e6d37b..42319f55755 100644
--- a/boards/st/nucleo_h563zi/board.yml
+++ b/boards/st/nucleo_h563zi/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_h563zi
-  full_name: Nucleo H563ZI
   vendor: st
   socs:
     - name: stm32h563xx
diff --git a/boards/st/nucleo_h723zg/board.yml b/boards/st/nucleo_h723zg/board.yml
index 2efee3e24c4..56a6d5cfb52 100644
--- a/boards/st/nucleo_h723zg/board.yml
+++ b/boards/st/nucleo_h723zg/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_h723zg
-  full_name: Nucleo H723ZG
   vendor: st
   socs:
     - name: stm32h723xx
diff --git a/boards/st/nucleo_h743zi/board.yml b/boards/st/nucleo_h743zi/board.yml
index 8feba5b5c7a..e133a6fc034 100644
--- a/boards/st/nucleo_h743zi/board.yml
+++ b/boards/st/nucleo_h743zi/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_h743zi
-  full_name: Nucleo H743ZI
   vendor: st
   socs:
     - name: stm32h743xx
diff --git a/boards/st/nucleo_h745zi_q/board.yml b/boards/st/nucleo_h745zi_q/board.yml
index 6d9df5de248..7ba025f5bb7 100644
--- a/boards/st/nucleo_h745zi_q/board.yml
+++ b/boards/st/nucleo_h745zi_q/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_h745zi_q
-  full_name: Nucleo H745ZI-Q
   vendor: st
   socs:
     - name: stm32h745xx
diff --git a/boards/st/nucleo_h753zi/board.yml b/boards/st/nucleo_h753zi/board.yml
index 704face7bc9..12dc4b5a501 100644
--- a/boards/st/nucleo_h753zi/board.yml
+++ b/boards/st/nucleo_h753zi/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_h753zi
-  full_name: Nucleo H753ZI
   vendor: st
   socs:
     - name: stm32h753xx
diff --git a/boards/st/nucleo_h755zi_q/board.yml b/boards/st/nucleo_h755zi_q/board.yml
index 73e4e8e0cf1..ecffd3b0fd1 100644
--- a/boards/st/nucleo_h755zi_q/board.yml
+++ b/boards/st/nucleo_h755zi_q/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_h755zi_q
-  full_name: Nucleo H755ZI-Q
   vendor: st
   socs:
     - name: stm32h755xx
diff --git a/boards/st/nucleo_h7a3zi_q/board.yml b/boards/st/nucleo_h7a3zi_q/board.yml
index f3e32247481..0c64ac88228 100644
--- a/boards/st/nucleo_h7a3zi_q/board.yml
+++ b/boards/st/nucleo_h7a3zi_q/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_h7a3zi_q
-  full_name: Nucleo H7A3ZI-Q
   vendor: st
   socs:
     - name: stm32h7a3xx
diff --git a/boards/st/nucleo_l011k4/board.yml b/boards/st/nucleo_l011k4/board.yml
index 4f9e1429176..be64789e754 100644
--- a/boards/st/nucleo_l011k4/board.yml
+++ b/boards/st/nucleo_l011k4/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_l011k4
-  full_name: Nucleo L011K4
   vendor: st
   socs:
     - name: stm32l011xx
diff --git a/boards/st/nucleo_l031k6/board.yml b/boards/st/nucleo_l031k6/board.yml
index 43bbdbd2c22..7fc334c0c2d 100644
--- a/boards/st/nucleo_l031k6/board.yml
+++ b/boards/st/nucleo_l031k6/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_l031k6
-  full_name: Nucleo L031K6
   vendor: st
   socs:
     - name: stm32l031xx
diff --git a/boards/st/nucleo_l053r8/board.yml b/boards/st/nucleo_l053r8/board.yml
index 0952d7d4b8e..a31629d6443 100644
--- a/boards/st/nucleo_l053r8/board.yml
+++ b/boards/st/nucleo_l053r8/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_l053r8
-  full_name: Nucleo L053R8
   vendor: st
   socs:
     - name: stm32l053xx
diff --git a/boards/st/nucleo_l073rz/board.yml b/boards/st/nucleo_l073rz/board.yml
index 01d4430d252..232170aa06d 100644
--- a/boards/st/nucleo_l073rz/board.yml
+++ b/boards/st/nucleo_l073rz/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_l073rz
-  full_name: Nucleo L073RZ
   vendor: st
   socs:
     - name: stm32l073xx
diff --git a/boards/st/nucleo_l152re/board.yml b/boards/st/nucleo_l152re/board.yml
index 80adf11ee4d..2838a81f7b0 100644
--- a/boards/st/nucleo_l152re/board.yml
+++ b/boards/st/nucleo_l152re/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_l152re
-  full_name: Nucleo L152RE
   vendor: st
   socs:
     - name: stm32l152xe
diff --git a/boards/st/nucleo_l412rb_p/board.yml b/boards/st/nucleo_l412rb_p/board.yml
index 37a8159f3c5..92ab56d2df3 100644
--- a/boards/st/nucleo_l412rb_p/board.yml
+++ b/boards/st/nucleo_l412rb_p/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_l412rb_p
-  full_name: Nucleo L412RB-P
   vendor: st
   socs:
     - name: stm32l412xx
diff --git a/boards/st/nucleo_l432kc/board.yml b/boards/st/nucleo_l432kc/board.yml
index badd59ab6a5..25ccfc0ddf9 100644
--- a/boards/st/nucleo_l432kc/board.yml
+++ b/boards/st/nucleo_l432kc/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_l432kc
-  full_name: Nucleo L432KC
   vendor: st
   socs:
     - name: stm32l432xx
diff --git a/boards/st/nucleo_l433rc_p/board.yml b/boards/st/nucleo_l433rc_p/board.yml
index 3f5b40b949d..03c1f3c6f6f 100644
--- a/boards/st/nucleo_l433rc_p/board.yml
+++ b/boards/st/nucleo_l433rc_p/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_l433rc_p
-  full_name: Nucleo L433RC
   vendor: st
   socs:
     - name: stm32l433xx
diff --git a/boards/st/nucleo_l452re/board.yml b/boards/st/nucleo_l452re/board.yml
index 32318946ec8..9bbf9630497 100644
--- a/boards/st/nucleo_l452re/board.yml
+++ b/boards/st/nucleo_l452re/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_l452re
-  full_name: Nucleo L452RE
   vendor: st
   socs:
     - name: stm32l452xx
diff --git a/boards/st/nucleo_l476rg/board.yml b/boards/st/nucleo_l476rg/board.yml
index c250fa89a58..c6b21713e34 100644
--- a/boards/st/nucleo_l476rg/board.yml
+++ b/boards/st/nucleo_l476rg/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_l476rg
-  full_name: Nucleo L476RG
   vendor: st
   socs:
     - name: stm32l476xx
diff --git a/boards/st/nucleo_l496zg/board.yml b/boards/st/nucleo_l496zg/board.yml
index 4b0e2a75e3e..3d1c909cffc 100644
--- a/boards/st/nucleo_l496zg/board.yml
+++ b/boards/st/nucleo_l496zg/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_l496zg
-  full_name: Nucleo L496ZG
   vendor: st
   socs:
     - name: stm32l496xx
diff --git a/boards/st/nucleo_l4a6zg/board.yml b/boards/st/nucleo_l4a6zg/board.yml
index 5cf94c4be2e..6e935c5d082 100644
--- a/boards/st/nucleo_l4a6zg/board.yml
+++ b/boards/st/nucleo_l4a6zg/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_l4a6zg
-  full_name: Nucleo L4A6ZG
   vendor: st
   socs:
     - name: stm32l4a6xx
diff --git a/boards/st/nucleo_l4r5zi/board.yml b/boards/st/nucleo_l4r5zi/board.yml
index 86befedebd2..46ead4d8831 100644
--- a/boards/st/nucleo_l4r5zi/board.yml
+++ b/boards/st/nucleo_l4r5zi/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_l4r5zi
-  full_name: Nucleo L4R5ZI
   vendor: st
   socs:
     - name: stm32l4r5xx
diff --git a/boards/st/nucleo_l552ze_q/board.yml b/boards/st/nucleo_l552ze_q/board.yml
index 58e78575e12..713b695aeba 100644
--- a/boards/st/nucleo_l552ze_q/board.yml
+++ b/boards/st/nucleo_l552ze_q/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_l552ze_q
-  full_name: Nucleo L552ZE Q
   vendor: st
   socs:
     - name: stm32l552xx
diff --git a/boards/st/nucleo_u031r8/board.yml b/boards/st/nucleo_u031r8/board.yml
index 1a3d7fdf20b..afbb6b5b6b6 100644
--- a/boards/st/nucleo_u031r8/board.yml
+++ b/boards/st/nucleo_u031r8/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_u031r8
-  full_name: Nucleo U031R8
   vendor: st
   socs:
     - name: stm32u031xx
diff --git a/boards/st/nucleo_u083rc/board.yml b/boards/st/nucleo_u083rc/board.yml
index c26a846edc6..65d9734b288 100644
--- a/boards/st/nucleo_u083rc/board.yml
+++ b/boards/st/nucleo_u083rc/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_u083rc
-  full_name: Nucleo U083RC
   vendor: st
   socs:
     - name: stm32u083xx
diff --git a/boards/st/nucleo_u575zi_q/board.yml b/boards/st/nucleo_u575zi_q/board.yml
index 66fc909baef..ced9ac720b3 100644
--- a/boards/st/nucleo_u575zi_q/board.yml
+++ b/boards/st/nucleo_u575zi_q/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_u575zi_q
-  full_name: Nucleo U575ZI Q
   vendor: st
   socs:
     - name: stm32u575xx
diff --git a/boards/st/nucleo_u5a5zj_q/board.yml b/boards/st/nucleo_u5a5zj_q/board.yml
index d5376588b21..9e594c30fb1 100644
--- a/boards/st/nucleo_u5a5zj_q/board.yml
+++ b/boards/st/nucleo_u5a5zj_q/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_u5a5zj_q
-  full_name: Nucleo U5A5ZJ Q
   vendor: st
   socs:
     - name: stm32u5a5xx
diff --git a/boards/st/nucleo_wb05kz/board.yml b/boards/st/nucleo_wb05kz/board.yml
index 7b519b73009..645506c7953 100644
--- a/boards/st/nucleo_wb05kz/board.yml
+++ b/boards/st/nucleo_wb05kz/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_wb05kz
-  full_name: Nucleo WB05KZ
   vendor: st
   socs:
     - name: stm32wb05
diff --git a/boards/st/nucleo_wb09ke/board.yml b/boards/st/nucleo_wb09ke/board.yml
index faba2d61bd4..2bff9e912b5 100644
--- a/boards/st/nucleo_wb09ke/board.yml
+++ b/boards/st/nucleo_wb09ke/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_wb09ke
-  full_name: Nucleo WB09KE
   vendor: st
   socs:
     - name: stm32wb09
diff --git a/boards/st/nucleo_wb55rg/board.yml b/boards/st/nucleo_wb55rg/board.yml
index 8b161072dee..49366ba9e62 100644
--- a/boards/st/nucleo_wb55rg/board.yml
+++ b/boards/st/nucleo_wb55rg/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_wb55rg
-  full_name: Nucleo WB55RG
   vendor: st
   socs:
     - name: stm32wb55xx
diff --git a/boards/st/nucleo_wba52cg/board.yml b/boards/st/nucleo_wba52cg/board.yml
index 0b12139fcf2..70950acf34d 100644
--- a/boards/st/nucleo_wba52cg/board.yml
+++ b/boards/st/nucleo_wba52cg/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_wba52cg
-  full_name: Nucleo WBA52CG
   vendor: st
   socs:
     - name: stm32wba52xx
diff --git a/boards/st/nucleo_wba55cg/board.yml b/boards/st/nucleo_wba55cg/board.yml
index 0963755cc50..2fbe6b2bca4 100644
--- a/boards/st/nucleo_wba55cg/board.yml
+++ b/boards/st/nucleo_wba55cg/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_wba55cg
-  full_name: Nucleo WBA55CG
   vendor: st
   socs:
     - name: stm32wba55xx
diff --git a/boards/st/nucleo_wl55jc/board.yml b/boards/st/nucleo_wl55jc/board.yml
index 9313b6a7ef7..930da79b199 100644
--- a/boards/st/nucleo_wl55jc/board.yml
+++ b/boards/st/nucleo_wl55jc/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nucleo_wl55jc
-  full_name: Nucleo WL55JC
   vendor: st
   socs:
     - name: stm32wl55xx
diff --git a/boards/st/sensortile_box/board.yml b/boards/st/sensortile_box/board.yml
index f314a51c356..4ac086b2cb7 100644
--- a/boards/st/sensortile_box/board.yml
+++ b/boards/st/sensortile_box/board.yml
@@ -1,6 +1,5 @@
 board:
   name: sensortile_box
-  full_name: SensorTile.box
   vendor: st
   socs:
     - name: stm32l4r9xx
diff --git a/boards/st/sensortile_box_pro/board.yml b/boards/st/sensortile_box_pro/board.yml
index bfa681499cc..d3bb8ca9ee9 100644
--- a/boards/st/sensortile_box_pro/board.yml
+++ b/boards/st/sensortile_box_pro/board.yml
@@ -1,6 +1,5 @@
 board:
   name: sensortile_box_pro
-  full_name: SensorTile.box PRO
   vendor: st
   socs:
     - name: stm32u585xx
diff --git a/boards/st/st25dv_mb1283_disco/board.yml b/boards/st/st25dv_mb1283_disco/board.yml
index 054880ab5d9..8fc19fff61e 100644
--- a/boards/st/st25dv_mb1283_disco/board.yml
+++ b/boards/st/st25dv_mb1283_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: st25dv_mb1283_disco
-  full_name: ST25DV Discovery, MB1283 version
   vendor: st
   socs:
     - name: stm32f405xx
diff --git a/boards/st/steval_fcu001v1/board.yml b/boards/st/steval_fcu001v1/board.yml
index 23fb900e8c7..16357770fa4 100644
--- a/boards/st/steval_fcu001v1/board.yml
+++ b/boards/st/steval_fcu001v1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: steval_fcu001v1
-  full_name: STM32 Flight Controller Unit
   vendor: st
   socs:
     - name: stm32f401xc
diff --git a/boards/st/steval_stwinbx1/board.yml b/boards/st/steval_stwinbx1/board.yml
index e72eee7c5d2..64319223253 100644
--- a/boards/st/steval_stwinbx1/board.yml
+++ b/boards/st/steval_stwinbx1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: steval_stwinbx1
-  full_name: STEVAL STWINBX1 Development kit
   vendor: st
   socs:
     - name: stm32u585xx
diff --git a/boards/st/stm3210c_eval/board.yml b/boards/st/stm3210c_eval/board.yml
index d204be60d35..bb8003f01ab 100644
--- a/boards/st/stm3210c_eval/board.yml
+++ b/boards/st/stm3210c_eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm3210c_eval
-  full_name: STM3210C Evaluation
   vendor: st
   socs:
     - name: stm32f107xc
diff --git a/boards/st/stm32373c_eval/board.yml b/boards/st/stm32373c_eval/board.yml
index 6817d43bdb8..32da748e9a7 100644
--- a/boards/st/stm32373c_eval/board.yml
+++ b/boards/st/stm32373c_eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32373c_eval
-  full_name: STM32373C Evaluation
   vendor: st
   socs:
     - name: stm32f373xc
diff --git a/boards/st/stm32c0116_dk/board.yml b/boards/st/stm32c0116_dk/board.yml
index db0eb8377ae..1764907618b 100644
--- a/boards/st/stm32c0116_dk/board.yml
+++ b/boards/st/stm32c0116_dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32c0116_dk
-  full_name: STM32C0116-DK Discovery Kit
   vendor: st
   socs:
     - name: stm32c011xx
diff --git a/boards/st/stm32f072_eval/board.yml b/boards/st/stm32f072_eval/board.yml
index 70ea37e0567..43e4ec82854 100644
--- a/boards/st/stm32f072_eval/board.yml
+++ b/boards/st/stm32f072_eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32f072_eval
-  full_name: STM32F072 Evaluation
   vendor: st
   socs:
     - name: stm32f072xb
diff --git a/boards/st/stm32f072b_disco/board.yml b/boards/st/stm32f072b_disco/board.yml
index 9152aa3b6a2..ca3e636655f 100644
--- a/boards/st/stm32f072b_disco/board.yml
+++ b/boards/st/stm32f072b_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32f072b_disco
-  full_name: STM32F072B Discovery
   vendor: st
   socs:
     - name: stm32f072xb
diff --git a/boards/st/stm32f0_disco/board.yml b/boards/st/stm32f0_disco/board.yml
index df8b2b52b90..a195ae98ae7 100644
--- a/boards/st/stm32f0_disco/board.yml
+++ b/boards/st/stm32f0_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32f0_disco
-  full_name: STM32F0 Discovery
   vendor: st
   socs:
     - name: stm32f051x8
diff --git a/boards/st/stm32f3_disco/board.yml b/boards/st/stm32f3_disco/board.yml
index 7c2626178f5..ae48f138fa5 100644
--- a/boards/st/stm32f3_disco/board.yml
+++ b/boards/st/stm32f3_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32f3_disco
-  full_name: STM32F3 Discovery
   vendor: st
   revision:
     format: letter
diff --git a/boards/st/stm32f411e_disco/board.yml b/boards/st/stm32f411e_disco/board.yml
index fa455d610e8..f42b1ada4a4 100644
--- a/boards/st/stm32f411e_disco/board.yml
+++ b/boards/st/stm32f411e_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32f411e_disco
-  full_name: STM32F411E Discovery
   vendor: st
   revision:
     format: letter
diff --git a/boards/st/stm32f412g_disco/board.yml b/boards/st/stm32f412g_disco/board.yml
index ab33ccba899..836972823ad 100644
--- a/boards/st/stm32f412g_disco/board.yml
+++ b/boards/st/stm32f412g_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32f412g_disco
-  full_name: STM32F412G Discovery
   vendor: st
   socs:
     - name: stm32f412zx
diff --git a/boards/st/stm32f429i_disc1/board.yml b/boards/st/stm32f429i_disc1/board.yml
index 5843685a476..e8e33228307 100644
--- a/boards/st/stm32f429i_disc1/board.yml
+++ b/boards/st/stm32f429i_disc1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32f429i_disc1
-  full_name: STM32F429I Discovery
   vendor: st
   socs:
     - name: stm32f429xx
diff --git a/boards/st/stm32f469i_disco/board.yml b/boards/st/stm32f469i_disco/board.yml
index cd76731d91f..2f7407bbc38 100644
--- a/boards/st/stm32f469i_disco/board.yml
+++ b/boards/st/stm32f469i_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32f469i_disco
-  full_name: STM32F469I Discovery
   vendor: st
   socs:
     - name: stm32f469xx
diff --git a/boards/st/stm32f4_disco/board.yml b/boards/st/stm32f4_disco/board.yml
index 55f96320600..663f8613eec 100644
--- a/boards/st/stm32f4_disco/board.yml
+++ b/boards/st/stm32f4_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32f4_disco
-  full_name: STM32F4 Discovery
   vendor: st
   socs:
     - name: stm32f407xx
diff --git a/boards/st/stm32f723e_disco/board.yml b/boards/st/stm32f723e_disco/board.yml
index b90191d201f..65248705234 100644
--- a/boards/st/stm32f723e_disco/board.yml
+++ b/boards/st/stm32f723e_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32f723e_disco
-  full_name: STM32F723E Discovery
   vendor: st
   socs:
     - name: stm32f723xx
diff --git a/boards/st/stm32f746g_disco/board.yml b/boards/st/stm32f746g_disco/board.yml
index 2417218da2f..3522ea40ac3 100644
--- a/boards/st/stm32f746g_disco/board.yml
+++ b/boards/st/stm32f746g_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32f746g_disco
-  full_name: STM32F746G Discovery
   vendor: st
   socs:
     - name: stm32f746xx
diff --git a/boards/st/stm32f7508_dk/board.yml b/boards/st/stm32f7508_dk/board.yml
index ec81a75c0f0..46e12e5a6f0 100644
--- a/boards/st/stm32f7508_dk/board.yml
+++ b/boards/st/stm32f7508_dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32f7508_dk
-  full_name: STM32F7508-DK Discovery Kit
   vendor: st
   socs:
     - name: stm32f750xx
diff --git a/boards/st/stm32f769i_disco/board.yml b/boards/st/stm32f769i_disco/board.yml
index 552b7dd5ee3..de83c60be99 100644
--- a/boards/st/stm32f769i_disco/board.yml
+++ b/boards/st/stm32f769i_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32f769i_disco
-  full_name: STM32F769I Discovery
   vendor: st
   socs:
     - name: stm32f769xx
diff --git a/boards/st/stm32g0316_disco/board.yml b/boards/st/stm32g0316_disco/board.yml
index a032c898a75..5a67daf81d6 100644
--- a/boards/st/stm32g0316_disco/board.yml
+++ b/boards/st/stm32g0316_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32g0316_disco
-  full_name: STM32G0316 Discovery
   vendor: st
   socs:
     - name: stm32g031xx
diff --git a/boards/st/stm32g071b_disco/board.yml b/boards/st/stm32g071b_disco/board.yml
index 78b83fac451..5445391255f 100644
--- a/boards/st/stm32g071b_disco/board.yml
+++ b/boards/st/stm32g071b_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32g071b_disco
-  full_name: STM32G071B Discovery
   vendor: st
   socs:
     - name: stm32g071xx
diff --git a/boards/st/stm32g081b_eval/board.yml b/boards/st/stm32g081b_eval/board.yml
index 2a6fa75aadd..5cdb22ef9b8 100644
--- a/boards/st/stm32g081b_eval/board.yml
+++ b/boards/st/stm32g081b_eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32g081b_eval
-  full_name: STM32G081B Evaluation
   vendor: st
   socs:
     - name: stm32g081xx
diff --git a/boards/st/stm32h573i_dk/board.yml b/boards/st/stm32h573i_dk/board.yml
index 55f38200999..e6a08a9197f 100644
--- a/boards/st/stm32h573i_dk/board.yml
+++ b/boards/st/stm32h573i_dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32h573i_dk
-  full_name: STM32H573I-DK Discovery
   vendor: st
   socs:
     - name: stm32h573xx
diff --git a/boards/st/stm32h735g_disco/board.yml b/boards/st/stm32h735g_disco/board.yml
index acf25fbe1a2..146a622647e 100644
--- a/boards/st/stm32h735g_disco/board.yml
+++ b/boards/st/stm32h735g_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32h735g_disco
-  full_name: STM32H735G Discovery
   vendor: st
   socs:
     - name: stm32h735xx
diff --git a/boards/st/stm32h745i_disco/board.yml b/boards/st/stm32h745i_disco/board.yml
index cbd323cb9ce..e1da9c4b2f4 100644
--- a/boards/st/stm32h745i_disco/board.yml
+++ b/boards/st/stm32h745i_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32h745i_disco
-  full_name: STM32H745I Discovery
   vendor: st
   socs:
     - name: stm32h745xx
diff --git a/boards/st/stm32h747i_disco/board.yml b/boards/st/stm32h747i_disco/board.yml
index 67649b5dab6..431d3e4f486 100644
--- a/boards/st/stm32h747i_disco/board.yml
+++ b/boards/st/stm32h747i_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32h747i_disco
-  full_name: STM32H747I Discovery
   vendor: st
   socs:
     - name: stm32h747xx
diff --git a/boards/st/stm32h750b_dk/board.yml b/boards/st/stm32h750b_dk/board.yml
index 9c95b1c77d1..95275ee2e42 100644
--- a/boards/st/stm32h750b_dk/board.yml
+++ b/boards/st/stm32h750b_dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32h750b_dk
-  full_name: STM32H750B Discovery Kit
   vendor: st
   socs:
     - name: stm32h750xx
diff --git a/boards/st/stm32h7b3i_dk/board.yml b/boards/st/stm32h7b3i_dk/board.yml
index 6a9e0626b7c..5516412eac9 100644
--- a/boards/st/stm32h7b3i_dk/board.yml
+++ b/boards/st/stm32h7b3i_dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32h7b3i_dk
-  full_name: STM32H7B3I Discovery kit
   vendor: st
   socs:
     - name: stm32h7b3xx
diff --git a/boards/st/stm32h7s78_dk/board.yml b/boards/st/stm32h7s78_dk/board.yml
index fdc77091323..c17be71480c 100644
--- a/boards/st/stm32h7s78_dk/board.yml
+++ b/boards/st/stm32h7s78_dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32h7s78_dk
-  full_name: STM32H7S78-DK Discovery
   vendor: st
   socs:
     - name: stm32h7s7xx
diff --git a/boards/st/stm32l1_disco/board.yml b/boards/st/stm32l1_disco/board.yml
index 1f606b80070..97a69b88157 100644
--- a/boards/st/stm32l1_disco/board.yml
+++ b/boards/st/stm32l1_disco/board.yml
@@ -1,11 +1,9 @@
 boards:
   - name: stm32l1_disco
-    full_name: STM32L1 Discovery
     vendor: st
     socs:
       - name: stm32l151xb
   - name: stm32l152c_disco
-    full_name: STM32L152C Discovery
     vendor: st
     socs:
       - name: stm32l152xc
diff --git a/boards/st/stm32l476g_disco/board.yml b/boards/st/stm32l476g_disco/board.yml
index 7899adc9ea0..c82c2c61843 100644
--- a/boards/st/stm32l476g_disco/board.yml
+++ b/boards/st/stm32l476g_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32l476g_disco
-  full_name: STM32L476G Discovery
   vendor: st
   socs:
     - name: stm32l476xx
diff --git a/boards/st/stm32l496g_disco/board.yml b/boards/st/stm32l496g_disco/board.yml
index e5b9ec923c4..9d6b18a598d 100644
--- a/boards/st/stm32l496g_disco/board.yml
+++ b/boards/st/stm32l496g_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32l496g_disco
-  full_name: STM32L496G Discovery
   vendor: st
   socs:
     - name: stm32l496xx
diff --git a/boards/st/stm32l4r9i_disco/board.yml b/boards/st/stm32l4r9i_disco/board.yml
index eedbfcd51e2..267fd87932d 100644
--- a/boards/st/stm32l4r9i_disco/board.yml
+++ b/boards/st/stm32l4r9i_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32l4r9i_disco
-  full_name: STM32L4R9I Discovery
   vendor: st
   socs:
     - name: stm32l4r9xx
diff --git a/boards/st/stm32l562e_dk/board.yml b/boards/st/stm32l562e_dk/board.yml
index 93e80fb9f5d..225f25adc2e 100644
--- a/boards/st/stm32l562e_dk/board.yml
+++ b/boards/st/stm32l562e_dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32l562e_dk
-  full_name: STM32L562E-DK Discovery
   vendor: st
   socs:
     - name: stm32l562xx
diff --git a/boards/st/stm32mp157c_dk2/board.yml b/boards/st/stm32mp157c_dk2/board.yml
index 6226ea364e1..d8ffb9a66b5 100644
--- a/boards/st/stm32mp157c_dk2/board.yml
+++ b/boards/st/stm32mp157c_dk2/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32mp157c_dk2
-  full_name: STM32MP157C-DK2 Discovery
   vendor: st
   socs:
     - name: stm32mp157cxx
diff --git a/boards/st/stm32u083c_dk/board.yml b/boards/st/stm32u083c_dk/board.yml
index 18deefdfecc..7bcf691ac69 100644
--- a/boards/st/stm32u083c_dk/board.yml
+++ b/boards/st/stm32u083c_dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32u083c_dk
-  full_name: STM32U083C-DK
   vendor: st
   socs:
     - name: stm32u083xx
diff --git a/boards/st/stm32u5a9j_dk/board.yml b/boards/st/stm32u5a9j_dk/board.yml
index 665d0bbc419..93bcec39743 100644
--- a/boards/st/stm32u5a9j_dk/board.yml
+++ b/boards/st/stm32u5a9j_dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32u5a9j_dk
-  full_name: STM32U5A9J Discovery Kit
   vendor: st
   socs:
     - name: stm32u5a9xx
diff --git a/boards/st/stm32vl_disco/board.yml b/boards/st/stm32vl_disco/board.yml
index 011d7f7e71a..15c8b5b3cac 100644
--- a/boards/st/stm32vl_disco/board.yml
+++ b/boards/st/stm32vl_disco/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32vl_disco
-  full_name: STM32VL Discovery
   vendor: st
   socs:
     - name: stm32f100xb
diff --git a/boards/st/stm32wb5mm_dk/board.yml b/boards/st/stm32wb5mm_dk/board.yml
index 019c11d7905..5df998d28c1 100644
--- a/boards/st/stm32wb5mm_dk/board.yml
+++ b/boards/st/stm32wb5mm_dk/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32wb5mm_dk
-  full_name: STM32WB5MM-DK
   vendor: st
   socs:
     - name: stm32wb55xx
diff --git a/boards/st/stm32wb5mmg/board.yml b/boards/st/stm32wb5mmg/board.yml
index 29ce1a3426b..dc90a918930 100644
--- a/boards/st/stm32wb5mmg/board.yml
+++ b/boards/st/stm32wb5mmg/board.yml
@@ -1,6 +1,5 @@
 board:
   name: stm32wb5mmg
-  full_name: STM32WB5MMG
   vendor: st
   socs:
     - name: stm32wb55xx
diff --git a/boards/starfive/visionfive2/board.yml b/boards/starfive/visionfive2/board.yml
index 9d106a29a48..cc856efaa92 100644
--- a/boards/starfive/visionfive2/board.yml
+++ b/boards/starfive/visionfive2/board.yml
@@ -3,7 +3,6 @@
 
 board:
   name: visionfive2
-  full_name: VisionFive 2 JH7110
   vendor: starfive
   socs:
     - name: jh7110
diff --git a/boards/tdk/robokit1/board.yml b/boards/tdk/robokit1/board.yml
index 2aafcdd702e..c97c2a0c940 100644
--- a/boards/tdk/robokit1/board.yml
+++ b/boards/tdk/robokit1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: robokit1
-  full_name: RoboKit 1
   vendor: tdk
   socs:
     - name: same70q21b
diff --git a/boards/technexion/pico_pi/board.yml b/boards/technexion/pico_pi/board.yml
index 297ee427131..61c6713a925 100644
--- a/boards/technexion/pico_pi/board.yml
+++ b/boards/technexion/pico_pi/board.yml
@@ -1,6 +1,5 @@
 board:
   name: pico_pi
-  full_name: Pico-Pi i.MX7D - Android Things IoT Development Platform
   vendor: technexion
   socs:
     - name: mcimx7d
diff --git a/boards/telink/tlsr9518adk80d/board.yml b/boards/telink/tlsr9518adk80d/board.yml
index 454b29592eb..b4d45ba665d 100644
--- a/boards/telink/tlsr9518adk80d/board.yml
+++ b/boards/telink/tlsr9518adk80d/board.yml
@@ -1,6 +1,5 @@
 board:
   name: tlsr9518adk80d
-  full_name: TLSR9518ADK80D
   vendor: telink
   socs:
   - name: tlsr9518
diff --git a/boards/ti/cc1352p1_launchxl/board.yml b/boards/ti/cc1352p1_launchxl/board.yml
index 8ac020cd134..5d9b234947d 100644
--- a/boards/ti/cc1352p1_launchxl/board.yml
+++ b/boards/ti/cc1352p1_launchxl/board.yml
@@ -1,6 +1,5 @@
 board:
   name: cc1352p1_launchxl
-  full_name: CC1352P1 LaunchXL
   vendor: ti
   socs:
   - name: cc1352p
diff --git a/boards/ti/cc1352p7_launchpad/board.yml b/boards/ti/cc1352p7_launchpad/board.yml
index cf29dd69e6a..0e97ad4ff43 100644
--- a/boards/ti/cc1352p7_launchpad/board.yml
+++ b/boards/ti/cc1352p7_launchpad/board.yml
@@ -1,6 +1,5 @@
 board:
   name: cc1352p7_lp
-  full_name: CC1352P7 LaunchPad
   vendor: ti
   socs:
   - name: cc1352p7
diff --git a/boards/ti/cc1352r1_launchxl/board.yml b/boards/ti/cc1352r1_launchxl/board.yml
index b7b52e31053..a96d6d89a10 100644
--- a/boards/ti/cc1352r1_launchxl/board.yml
+++ b/boards/ti/cc1352r1_launchxl/board.yml
@@ -1,6 +1,5 @@
 board:
   name: cc1352r1_launchxl
-  full_name: CC1352R1 LaunchXL
   vendor: ti
   socs:
   - name: cc1352r
diff --git a/boards/ti/cc1352r_sensortag/board.yml b/boards/ti/cc1352r_sensortag/board.yml
index 055e40a74e1..b359f530fa2 100644
--- a/boards/ti/cc1352r_sensortag/board.yml
+++ b/boards/ti/cc1352r_sensortag/board.yml
@@ -1,6 +1,5 @@
 board:
   name: cc1352r_sensortag
-  full_name: CC1352R SensorTag
   vendor: ti
   socs:
   - name: cc1352r
diff --git a/boards/ti/cc26x2r1_launchxl/board.yml b/boards/ti/cc26x2r1_launchxl/board.yml
index 3c9e65ea3dd..3361b2ccff7 100644
--- a/boards/ti/cc26x2r1_launchxl/board.yml
+++ b/boards/ti/cc26x2r1_launchxl/board.yml
@@ -1,6 +1,5 @@
 board:
   name: cc26x2r1_launchxl
-  full_name: CC26x2R1 LaunchXL
   vendor: ti
   socs:
   - name: cc2652r
diff --git a/boards/ti/cc3220sf_launchxl/board.yml b/boards/ti/cc3220sf_launchxl/board.yml
index 498fbe37fb7..f902db4d392 100644
--- a/boards/ti/cc3220sf_launchxl/board.yml
+++ b/boards/ti/cc3220sf_launchxl/board.yml
@@ -1,6 +1,5 @@
 board:
   name: cc3220sf_launchxl
-  full_name: CC3220SF LaunchXL
   vendor: ti
   socs:
   - name: cc3220sf
diff --git a/boards/ti/cc3235sf_launchxl/board.yml b/boards/ti/cc3235sf_launchxl/board.yml
index 89dee3ce673..6cf8104545a 100644
--- a/boards/ti/cc3235sf_launchxl/board.yml
+++ b/boards/ti/cc3235sf_launchxl/board.yml
@@ -1,6 +1,5 @@
 board:
   name: cc3235sf_launchxl
-  full_name: CC3235SF LaunchXL
   vendor: ti
   socs:
   - name: cc3235sf
diff --git a/boards/ti/msp_exp432p401r_launchxl/board.yml b/boards/ti/msp_exp432p401r_launchxl/board.yml
index c8f10746b46..1e9ed0b7ed3 100644
--- a/boards/ti/msp_exp432p401r_launchxl/board.yml
+++ b/boards/ti/msp_exp432p401r_launchxl/board.yml
@@ -1,6 +1,5 @@
 board:
   name: msp_exp432p401r_launchxl
-  full_name: MSP-EXP432P401R LaunchXL
   vendor: ti
   socs:
   - name: msp432p401r
diff --git a/boards/ti/sk_am62/board.yml b/boards/ti/sk_am62/board.yml
index f0083b00434..da6e946fe02 100644
--- a/boards/ti/sk_am62/board.yml
+++ b/boards/ti/sk_am62/board.yml
@@ -1,6 +1,5 @@
 board:
   name: sk_am62
-  full_name: SK-AM62 M4F Core
   vendor: ti
   socs:
   - name: am6234
diff --git a/boards/toradex/colibri_imx7d/board.yml b/boards/toradex/colibri_imx7d/board.yml
index 32a4e1db7eb..7a6ffe62495 100644
--- a/boards/toradex/colibri_imx7d/board.yml
+++ b/boards/toradex/colibri_imx7d/board.yml
@@ -1,6 +1,5 @@
 board:
   name: colibri_imx7d
-  full_name: i.MX 7 Computer on Module - Colibri iMX7
   vendor: toradex
   socs:
     - name: mcimx7d
diff --git a/boards/toradex/verdin_imx8mp/board.yml b/boards/toradex/verdin_imx8mp/board.yml
index bc2f8ff6ba6..6ffbf4561a2 100644
--- a/boards/toradex/verdin_imx8mp/board.yml
+++ b/boards/toradex/verdin_imx8mp/board.yml
@@ -1,6 +1,5 @@
 board:
   name: verdin_imx8mp
-  full_name: Verdin iMX8M Plus SoM
   vendor: toradex
   socs:
   - name: mimx8ml8
diff --git a/boards/u-blox/ubx_bmd300eval/board.yml b/boards/u-blox/ubx_bmd300eval/board.yml
index 759e2345665..522c0808eed 100644
--- a/boards/u-blox/ubx_bmd300eval/board.yml
+++ b/boards/u-blox/ubx_bmd300eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ubx_bmd300eval
-  full_name: "EVK-BMD-30/35: BMD-300-EVAL, BMD-301-EVAL, and BMD-350-EVAL"
   vendor: u-blox
   socs:
   - name: nrf52832
diff --git a/boards/u-blox/ubx_bmd330eval/board.yml b/boards/u-blox/ubx_bmd330eval/board.yml
index 6c842ef563f..d50ce8816f7 100644
--- a/boards/u-blox/ubx_bmd330eval/board.yml
+++ b/boards/u-blox/ubx_bmd330eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ubx_bmd330eval
-  full_name: "EVK-BMD-330: BMD-330-EVAL"
   vendor: u-blox
   socs:
   - name: nrf52810
diff --git a/boards/u-blox/ubx_bmd340eval/board.yml b/boards/u-blox/ubx_bmd340eval/board.yml
index 2e57087548a..2440541fc45 100644
--- a/boards/u-blox/ubx_bmd340eval/board.yml
+++ b/boards/u-blox/ubx_bmd340eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ubx_bmd340eval
-  full_name: "EVK-BMD-34/38: BMD-340-EVAL and BMD-341-EVAL"
   vendor: u-blox
   socs:
   - name: nrf52840
diff --git a/boards/u-blox/ubx_bmd345eval/board.yml b/boards/u-blox/ubx_bmd345eval/board.yml
index 2f84225aea8..eec2be0b7d9 100644
--- a/boards/u-blox/ubx_bmd345eval/board.yml
+++ b/boards/u-blox/ubx_bmd345eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ubx_bmd345eval
-  full_name: "EVK-BMD-34/38: BMD-345-EVAL"
   vendor: u-blox
   socs:
   - name: nrf52840
diff --git a/boards/u-blox/ubx_bmd360eval/board.yml b/boards/u-blox/ubx_bmd360eval/board.yml
index 1866bd39f41..a06d24dd008 100644
--- a/boards/u-blox/ubx_bmd360eval/board.yml
+++ b/boards/u-blox/ubx_bmd360eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ubx_bmd360eval
-  full_name: "EVK-BMD-360: BMD-360-EVAL"
   vendor: u-blox
   socs:
   - name: nrf52811
diff --git a/boards/u-blox/ubx_bmd380eval/board.yml b/boards/u-blox/ubx_bmd380eval/board.yml
index b830ad7da0e..0f7ec7263e7 100644
--- a/boards/u-blox/ubx_bmd380eval/board.yml
+++ b/boards/u-blox/ubx_bmd380eval/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ubx_bmd380eval
-  full_name: "EVK-BMD-34/48: BMD-380-EVAL"
   vendor: u-blox
   socs:
   - name: nrf52840
diff --git a/boards/u-blox/ubx_evkannab1/board.yml b/boards/u-blox/ubx_evkannab1/board.yml
index 2a7540ed01d..3aeac881aba 100644
--- a/boards/u-blox/ubx_evkannab1/board.yml
+++ b/boards/u-blox/ubx_evkannab1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ubx_evkannab1
-  full_name: EVK-ANNA-B11x
   vendor: u-blox
   socs:
   - name: nrf52832
diff --git a/boards/u-blox/ubx_evkninab1/board.yml b/boards/u-blox/ubx_evkninab1/board.yml
index e6b70d481e6..3073c5833d2 100644
--- a/boards/u-blox/ubx_evkninab1/board.yml
+++ b/boards/u-blox/ubx_evkninab1/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ubx_evkninab1
-  full_name: EVK NINA-B11x
   vendor: u-blox
   socs:
   - name: nrf52832
diff --git a/boards/u-blox/ubx_evkninab3/board.yml b/boards/u-blox/ubx_evkninab3/board.yml
index 7b96e215daf..3914fd28149 100644
--- a/boards/u-blox/ubx_evkninab3/board.yml
+++ b/boards/u-blox/ubx_evkninab3/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ubx_evkninab3
-  full_name: EVK-NINA-B3
   vendor: u-blox
   socs:
   - name: nrf52840
diff --git a/boards/u-blox/ubx_evkninab4/board.yml b/boards/u-blox/ubx_evkninab4/board.yml
index f8dc4ba07e1..787ae9c4cdf 100644
--- a/boards/u-blox/ubx_evkninab4/board.yml
+++ b/boards/u-blox/ubx_evkninab4/board.yml
@@ -1,6 +1,5 @@
 board:
   name: ubx_evkninab4
-  full_name: EVK NINA-B40x
   vendor: u-blox
   socs:
   - name: nrf52833
diff --git a/boards/udoo/udoo_neo_full/board.yml b/boards/udoo/udoo_neo_full/board.yml
index c304b49b367..1c20ebdc15f 100644
--- a/boards/udoo/udoo_neo_full/board.yml
+++ b/boards/udoo/udoo_neo_full/board.yml
@@ -1,6 +1,5 @@
 board:
   name: udoo_neo_full
-  full_name: Neo Full
   vendor: udoo
   socs:
     - name: mcimx6x
diff --git a/boards/up-bridge-the-gap/up_squared/board.yml b/boards/up-bridge-the-gap/up_squared/board.yml
index 1525911058f..0955b6967af 100644
--- a/boards/up-bridge-the-gap/up_squared/board.yml
+++ b/boards/up-bridge-the-gap/up_squared/board.yml
@@ -1,5 +1,4 @@
 board:
   name: up_squared
-  full_name: UP Squared
   socs:
     - name: apollo_lake
diff --git a/boards/up-bridge-the-gap/up_squared_pro_7000/board.yml b/boards/up-bridge-the-gap/up_squared_pro_7000/board.yml
index c3546042dea..b929cca9967 100644
--- a/boards/up-bridge-the-gap/up_squared_pro_7000/board.yml
+++ b/boards/up-bridge-the-gap/up_squared_pro_7000/board.yml
@@ -1,5 +1,4 @@
 board:
   name: up_squared_pro_7000
-  full_name: UP Squared Pro 7000
   socs:
     - name: alder_lake
diff --git a/boards/vcc-gnd/yd_esp32/board.yml b/boards/vcc-gnd/yd_esp32/board.yml
index 86c8d22885f..a930386ed84 100644
--- a/boards/vcc-gnd/yd_esp32/board.yml
+++ b/boards/vcc-gnd/yd_esp32/board.yml
@@ -1,6 +1,5 @@
 board:
   name: yd_esp32
-  full_name: YD-ESP32
   vendor: vcc-gnd
   socs:
   - name: esp32
diff --git a/boards/vcc-gnd/yd_stm32h750vb/board.yml b/boards/vcc-gnd/yd_stm32h750vb/board.yml
index fd8114075b1..f26fffaa901 100644
--- a/boards/vcc-gnd/yd_stm32h750vb/board.yml
+++ b/boards/vcc-gnd/yd_stm32h750vb/board.yml
@@ -1,6 +1,5 @@
 board:
   name: yd_stm32h750vb
-  full_name: YD-STM32H750VB
   vendor: vcc-gnd
   socs:
     - name: stm32h750xx
diff --git a/boards/vngiotlab/nrf51_vbluno51/board.yml b/boards/vngiotlab/nrf51_vbluno51/board.yml
index 05958c1e11f..8e3a9bf9488 100644
--- a/boards/vngiotlab/nrf51_vbluno51/board.yml
+++ b/boards/vngiotlab/nrf51_vbluno51/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf51_vbluno51
-  full_name: nRF51-VBLUno51
   vendor: vngiotlab
   socs:
   - name: nrf51822
diff --git a/boards/vngiotlab/nrf52_vbluno52/board.yml b/boards/vngiotlab/nrf52_vbluno52/board.yml
index 1f3e21cc1ba..be59c421baa 100644
--- a/boards/vngiotlab/nrf52_vbluno52/board.yml
+++ b/boards/vngiotlab/nrf52_vbluno52/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf52_vbluno52
-  full_name: nRF52-VBLUno52
   vendor: vngiotlab
   socs:
   - name: nrf52832
diff --git a/boards/waveshare/esp32s3_touch_lcd_1_28/board.yml b/boards/waveshare/esp32s3_touch_lcd_1_28/board.yml
index d9a110650fc..821fd367821 100644
--- a/boards/waveshare/esp32s3_touch_lcd_1_28/board.yml
+++ b/boards/waveshare/esp32s3_touch_lcd_1_28/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp32s3_touch_lcd_1_28
-  full_name: ESP32-S3-Touch-LCD-1.28
   vendor: waveshare
   socs:
   - name: esp32s3
diff --git a/boards/waveshare/nrf51_ble400/board.yml b/boards/waveshare/nrf51_ble400/board.yml
index ea2be773ad3..d2c7da1f732 100644
--- a/boards/waveshare/nrf51_ble400/board.yml
+++ b/boards/waveshare/nrf51_ble400/board.yml
@@ -1,6 +1,5 @@
 board:
   name: nrf51_ble400
-  full_name: BLE400
   vendor: waveshare
   socs:
   - name: nrf51822
diff --git a/boards/waveshare/open103z/board.yml b/boards/waveshare/open103z/board.yml
index 4e98a29413a..7504feebf9f 100644
--- a/boards/waveshare/open103z/board.yml
+++ b/boards/waveshare/open103z/board.yml
@@ -1,6 +1,5 @@
 board:
   name: waveshare_open103z
-  full_name: Open103Z
   vendor: waveshare
   socs:
     - name: stm32f103xe
diff --git a/boards/we/ophelia1ev/board.yml b/boards/we/ophelia1ev/board.yml
index b69567e089d..ac80e1ed6e4 100644
--- a/boards/we/ophelia1ev/board.yml
+++ b/boards/we/ophelia1ev/board.yml
@@ -1,6 +1,5 @@
 board:
   name: we_ophelia1ev
-  full_name: Ophelia-I EV NRF52805
   vendor: wurth
   socs:
   - name: nrf52805
diff --git a/boards/we/proteus2ev/board.yml b/boards/we/proteus2ev/board.yml
index d246b6d1b4d..38cc08204e5 100644
--- a/boards/we/proteus2ev/board.yml
+++ b/boards/we/proteus2ev/board.yml
@@ -1,6 +1,5 @@
 board:
   name: we_proteus2ev
-  full_name: Proteus-II-EV
   vendor: wurth
   socs:
   - name: nrf52832
diff --git a/boards/we/proteus3ev/board.yml b/boards/we/proteus3ev/board.yml
index fa498a28014..6def880d7a5 100644
--- a/boards/we/proteus3ev/board.yml
+++ b/boards/we/proteus3ev/board.yml
@@ -1,6 +1,5 @@
 board:
   name: we_proteus3ev
-  full_name: Proteus-III-EV
   vendor: wurth
   socs:
   - name: nrf52840
diff --git a/boards/weact/blackpill_f401cc/board.yml b/boards/weact/blackpill_f401cc/board.yml
index 246a7e1cdfb..e72de492ef8 100644
--- a/boards/weact/blackpill_f401cc/board.yml
+++ b/boards/weact/blackpill_f401cc/board.yml
@@ -1,6 +1,5 @@
 board:
   name: blackpill_f401cc
-  full_name: Black Pill V1.2
   vendor: weact
   socs:
     - name: stm32f401xc
diff --git a/boards/weact/blackpill_f401ce/board.yml b/boards/weact/blackpill_f401ce/board.yml
index 84bd3b98354..83d26820943 100644
--- a/boards/weact/blackpill_f401ce/board.yml
+++ b/boards/weact/blackpill_f401ce/board.yml
@@ -1,6 +1,5 @@
 board:
   name: blackpill_f401ce
-  full_name: Black Pill V3.0
   vendor: weact
   socs:
     - name: stm32f401xe
diff --git a/boards/weact/blackpill_f411ce/board.yml b/boards/weact/blackpill_f411ce/board.yml
index deee6cbdd06..b145c5e7f01 100644
--- a/boards/weact/blackpill_f411ce/board.yml
+++ b/boards/weact/blackpill_f411ce/board.yml
@@ -1,6 +1,5 @@
 board:
   name: blackpill_f411ce
-  full_name: Black Pill V2.0
   vendor: weact
   socs:
     - name: stm32f411xe
diff --git a/boards/weact/mini_stm32h743/board.yml b/boards/weact/mini_stm32h743/board.yml
index 76ddce890ed..0789b364dfa 100644
--- a/boards/weact/mini_stm32h743/board.yml
+++ b/boards/weact/mini_stm32h743/board.yml
@@ -1,6 +1,5 @@
 board:
   name: mini_stm32h743
-  full_name: MiniSTM32H743 Core Board
   vendor: weact
   socs:
     - name: stm32h743xx
diff --git a/boards/weact/stm32f405_core/board.yml b/boards/weact/stm32f405_core/board.yml
index 1c97b9e6d2f..8f85783cde9 100644
--- a/boards/weact/stm32f405_core/board.yml
+++ b/boards/weact/stm32f405_core/board.yml
@@ -1,6 +1,5 @@
 board:
   name: weact_stm32f405_core
-  full_name: STM32F405 Core Board V1.0
   vendor: weact
   socs:
     - name: stm32f405xx
diff --git a/boards/weact/stm32g431_core/board.yml b/boards/weact/stm32g431_core/board.yml
index ba6032cf52d..359e74ed0d7 100644
--- a/boards/weact/stm32g431_core/board.yml
+++ b/boards/weact/stm32g431_core/board.yml
@@ -1,6 +1,5 @@
 board:
   name: weact_stm32g431_core
-  full_name: STM32G431 Core Board
   vendor: weact
   socs:
     - name: stm32g431xx
diff --git a/boards/wemos/esp32s2_lolin_mini/board.yml b/boards/wemos/esp32s2_lolin_mini/board.yml
index 06336f66be0..7df1267c214 100644
--- a/boards/wemos/esp32s2_lolin_mini/board.yml
+++ b/boards/wemos/esp32s2_lolin_mini/board.yml
@@ -1,6 +1,5 @@
 board:
   name: esp32s2_lolin_mini
-  full_name: ESP32-S2 Lolin Mini
   vendor: wemos
   socs:
   - name: esp32s2
diff --git a/boards/witte/linum/board.yml b/boards/witte/linum/board.yml
index 0bebfe2dec1..e9ae2c0307d 100644
--- a/boards/witte/linum/board.yml
+++ b/boards/witte/linum/board.yml
@@ -1,6 +1,5 @@
 board:
   name: linum
-  full_name: Linum Board
   vendor: witte
   socs:
     - name: stm32h753xx
diff --git a/boards/wiznet/w5500_evb_pico/board.yml b/boards/wiznet/w5500_evb_pico/board.yml
index eb4eed60b88..17ce17eea15 100644
--- a/boards/wiznet/w5500_evb_pico/board.yml
+++ b/boards/wiznet/w5500_evb_pico/board.yml
@@ -1,6 +1,5 @@
 board:
   name: w5500_evb_pico
-  full_name: W5500 Evaluation Pico
   vendor: wiznet
   socs:
   - name: rp2040
diff --git a/boards/xen/xenvm/board.yml b/boards/xen/xenvm/board.yml
index f10f659206a..5b5aec44c55 100644
--- a/boards/xen/xenvm/board.yml
+++ b/boards/xen/xenvm/board.yml
@@ -1,6 +1,5 @@
 board:
   name: xenvm
-  full_name: ARMv8 Xen Virtual Machine Example
   vendor: xen
   socs:
   - name: xenvm

From 7c25723d4342096405a92886341a3781f26449d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:27 +0100
Subject: [PATCH 1411/2913] Revert "[nrf fromtree] west: boards: add full_name
 support in format string"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 755861bed7934f02c19bd4b92a85b60f99cee74e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/west_commands/boards.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/west_commands/boards.py b/scripts/west_commands/boards.py
index 6c4ee168466..f329ea54217 100644
--- a/scripts/west_commands/boards.py
+++ b/scripts/west_commands/boards.py
@@ -49,7 +49,6 @@ def do_add_parser(self, parser_adder):
             The following arguments are available:
 
             - name: board name
-            - full_name: board full name (typically, its commercial name)
             - qualifiers: board qualifiers (will be empty for legacy boards)
             - arch: board architecture (deprecated)
                     (arch is ambiguous for boards described in new hw model)
@@ -103,7 +102,6 @@ def do_run(self, args, _):
             log.inf(
                 args.format.format(
                     name=board.name,
-                    full_name=board.full_name,
                     dir=board.dir,
                     hwm=board.hwm,
                     vendor=board.vendor,

From b2d22996a049b9e2a389e8bd4072c489ec3509c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:27 +0100
Subject: [PATCH 1412/2913] Revert "[nrf fromtree] boards: qemu_x86: add board
 description"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 432b3468c4bb9e81659f7990ba7f910632c9cf40.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/qemu/x86/board.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/boards/qemu/x86/board.yml b/boards/qemu/x86/board.yml
index dafcffba24f..75d0cd6eb4b 100644
--- a/boards/qemu/x86/board.yml
+++ b/boards/qemu/x86/board.yml
@@ -1,7 +1,6 @@
 boards:
 
   - name: qemu_x86
-    full_name: 'QEMU Emulation for X86'
     socs:
       - name: atom
         variants:
@@ -12,18 +11,15 @@ boards:
           - name: 'xip'
 
   - name: qemu_x86_lakemont
-    full_name: 'QEMU Emulation for X86 / Lakemont CPU'
     socs:
       - name: lakemont
 
   - name: qemu_x86_64
-    full_name: 'QEMU Emulation for X86 64bit'
     socs:
       - name: atom
         variants:
           - name: 'nokpti'
 
   - name: qemu_x86_tiny
-    full_name: 'QEMU Emulation for X86 Minimal Configuration'
     socs:
       - name: atom

From 9a5283dfdfed0d0e0d8eae55ecd16f07b961e78e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:27 +0100
Subject: [PATCH 1413/2913] Revert "[nrf noup] revertme: Resolve merge
 conflicts"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit eb8407396e80830d893bd969d545ec4ec50a4507.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/schemas/board-schema.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/schemas/board-schema.yml b/scripts/schemas/board-schema.yml
index 4c86c9d000c..94f291580c1 100644
--- a/scripts/schemas/board-schema.yml
+++ b/scripts/schemas/board-schema.yml
@@ -47,9 +47,6 @@ schema;board-schema:
       required: false
       type: str
       desc: Full name of the board. Typically set to the commercial name of the board.
-    extend:
-      required: false # Note: either name or extend is required, but that is handled in python
-      type: str
     vendor:
       required: false
       type: str

From 33144036771d5b835a83769e6ed4e1deebacdfca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:27 +0100
Subject: [PATCH 1414/2913] Revert "[nrf fromtree] boards: add board full_name
 field"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 73c99fe49b57c22074d20706c804bdac6b2a4cf5.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/list_boards.py           | 2 --
 scripts/schemas/board-schema.yml | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/scripts/list_boards.py b/scripts/list_boards.py
index 9c21e53541a..c2b8e3740b3 100755
--- a/scripts/list_boards.py
+++ b/scripts/list_boards.py
@@ -94,7 +94,6 @@ class Board:
     # HWMv1 only supports a single Path, and requires Board dataclass to be hashable.
     directories: Union[Path, List[Path]]
     hwm: str
-    full_name: str = None
     arch: str = None
     vendor: str = None
     revision_format: str = None
@@ -279,7 +278,6 @@ def load_v2_boards(board_name, board_yml, systems):
                 name=board['name'],
                 directories=[board_yml.parent],
                 vendor=board.get('vendor'),
-                full_name=board.get('full_name'),
                 revision_format=board.get('revision', {}).get('format'),
                 revision_default=board.get('revision', {}).get('default'),
                 revision_exact=board.get('revision', {}).get('exact', False),
diff --git a/scripts/schemas/board-schema.yml b/scripts/schemas/board-schema.yml
index 94f291580c1..c24c7f0b4d1 100644
--- a/scripts/schemas/board-schema.yml
+++ b/scripts/schemas/board-schema.yml
@@ -43,10 +43,6 @@ schema;board-schema:
       required: false # Note: either name or extend is required, but that is handled in python
       type: str
       desc: Name of the board
-    full_name:
-      required: false
-      type: str
-      desc: Full name of the board. Typically set to the commercial name of the board.
     vendor:
       required: false
       type: str

From 6644d3110d5fdfe1ba420973af478ae6789b6a28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:27 +0100
Subject: [PATCH 1415/2913] Revert "[nrf noup] revertme: Cover up merge
 conflicts"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d1900a66eb7a1e59304dd7e84fc228194620de81.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/schemas/board-schema.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/schemas/board-schema.yml b/scripts/schemas/board-schema.yml
index c24c7f0b4d1..3ca85af73c6 100644
--- a/scripts/schemas/board-schema.yml
+++ b/scripts/schemas/board-schema.yml
@@ -43,6 +43,9 @@ schema;board-schema:
       required: false # Note: either name or extend is required, but that is handled in python
       type: str
       desc: Name of the board
+    extend:
+      required: false # Note: either name or extend is required, but that is handled in python
+      type: str
     vendor:
       required: false
       type: str

From 84274bd8b2635178525998fd85e04e822ffe4ce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:27 +0100
Subject: [PATCH 1416/2913] Revert "[nrf fromtree] boards: renode: Add virtual
 Cortex-R8 board"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6e4259d1e4268fce22b1e2fa2e1462fef80afc7a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../Kconfig.cortex_r8_virtual                 |  5 --
 boards/renode/cortex_r8_virtual/board.cmake   |  6 --
 boards/renode/cortex_r8_virtual/board.yml     |  5 --
 .../cortex_r8_virtual/cortex_r8_virtual.dts   | 26 --------
 .../cortex_r8_virtual/cortex_r8_virtual.yaml  | 18 ------
 .../cortex_r8_virtual_defconfig               | 22 -------
 boards/renode/cortex_r8_virtual/doc/index.rst | 62 -------------------
 .../support/cortex_r8_virtual.repl            | 31 ----------
 .../support/cortex_r8_virtual.resc            | 18 ------
 9 files changed, 193 deletions(-)
 delete mode 100644 boards/renode/cortex_r8_virtual/Kconfig.cortex_r8_virtual
 delete mode 100644 boards/renode/cortex_r8_virtual/board.cmake
 delete mode 100644 boards/renode/cortex_r8_virtual/board.yml
 delete mode 100644 boards/renode/cortex_r8_virtual/cortex_r8_virtual.dts
 delete mode 100644 boards/renode/cortex_r8_virtual/cortex_r8_virtual.yaml
 delete mode 100644 boards/renode/cortex_r8_virtual/cortex_r8_virtual_defconfig
 delete mode 100644 boards/renode/cortex_r8_virtual/doc/index.rst
 delete mode 100644 boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.repl
 delete mode 100644 boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.resc

diff --git a/boards/renode/cortex_r8_virtual/Kconfig.cortex_r8_virtual b/boards/renode/cortex_r8_virtual/Kconfig.cortex_r8_virtual
deleted file mode 100644
index e9830df9f05..00000000000
--- a/boards/renode/cortex_r8_virtual/Kconfig.cortex_r8_virtual
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2024 Antmicro <www.antmicro.com>
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_CORTEX_R8_VIRTUAL
-	select SOC_CORTEX_R8_VIRTUAL
diff --git a/boards/renode/cortex_r8_virtual/board.cmake b/boards/renode/cortex_r8_virtual/board.cmake
deleted file mode 100644
index 272149871d0..00000000000
--- a/boards/renode/cortex_r8_virtual/board.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) 2024 Antmicro <www.antmicro.com>
-# SPDX-License-Identifier: Apache-2.0
-
-set(SUPPORTED_EMU_PLATFORMS renode)
-set(RENODE_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/support/cortex_r8_virtual.resc)
-set(RENODE_UART sysbus.uart0)
diff --git a/boards/renode/cortex_r8_virtual/board.yml b/boards/renode/cortex_r8_virtual/board.yml
deleted file mode 100644
index 799b2a9ba12..00000000000
--- a/boards/renode/cortex_r8_virtual/board.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-board:
-  name: cortex_r8_virtual
-  vendor: renode
-  socs:
-  - name: cortex_r8_virtual
diff --git a/boards/renode/cortex_r8_virtual/cortex_r8_virtual.dts b/boards/renode/cortex_r8_virtual/cortex_r8_virtual.dts
deleted file mode 100644
index 9e8bd04f7df..00000000000
--- a/boards/renode/cortex_r8_virtual/cortex_r8_virtual.dts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2024 Antmicro <www.antmicro.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-
-#include <cortex_r8_virt.dtsi>
-
-/ {
-	model = "Cortex-R8 Virtual target";
-	compatible = "renode,cortex-r8-virtual";
-	chosen {
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &uart0;
-		zephyr,shell-uart = &uart0;
-	};
-};
-
-&uart0 {
-	status = "okay";
-	current-speed = <115200>;
-	clock-frequency = <99999901>;
-};
diff --git a/boards/renode/cortex_r8_virtual/cortex_r8_virtual.yaml b/boards/renode/cortex_r8_virtual/cortex_r8_virtual.yaml
deleted file mode 100644
index 8d888e8806c..00000000000
--- a/boards/renode/cortex_r8_virtual/cortex_r8_virtual.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-identifier: cortex_r8_virtual
-name: Cortex R8 Virtual Board
-type: mcu
-arch: arm
-toolchain:
-  - zephyr
-ram: 131072
-simulation: renode
-simulation_exec: renode
-testing:
-  ignore_tags:
-    - net
-    - bluetooth
-  renode:
-    uart: sysbus.uart0
-    resc: boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.resc
-supported:
-  - uart
diff --git a/boards/renode/cortex_r8_virtual/cortex_r8_virtual_defconfig b/boards/renode/cortex_r8_virtual/cortex_r8_virtual_defconfig
deleted file mode 100644
index 1c358355b1e..00000000000
--- a/boards/renode/cortex_r8_virtual/cortex_r8_virtual_defconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2024 Antmicro <www.antmicro.com>
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_XIP=n
-
-CONFIG_ISR_STACK_SIZE=512
-CONFIG_THREAD_STACK_INFO=y
-
-CONFIG_MAX_DOMAIN_PARTITIONS=24
-
-# Enable UART driver
-CONFIG_SERIAL=y
-
-# Enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-
-# Enable serial port
-CONFIG_UART_XLNX_PS=y
-
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
-CONFIG_ARM_MPU=y
diff --git a/boards/renode/cortex_r8_virtual/doc/index.rst b/boards/renode/cortex_r8_virtual/doc/index.rst
deleted file mode 100644
index 07a18a77650..00000000000
--- a/boards/renode/cortex_r8_virtual/doc/index.rst
+++ /dev/null
@@ -1,62 +0,0 @@
-.. _cortex_r8_virtual:
-
-Cortex-R8 Virtual
-#################
-
-Overview
-********
-
-The Cortex-R8 Virtual board is a virtual platform that can be emulated with Renode.
-Edit the :zephyr_file:`boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.repl` file to adapt the platform layout to your needs.
-
-Refer to the `Renode documentation <https://renode.readthedocs.io/en/latest/>`_
-to learn how to obtain Renode for your host.
-
-Programming and debugging
-*************************
-
-Building
-========
-
-Applications for the ``cortex_r8_virtual`` board target can be built
-using the standard build flow (see :ref:`build_an_application`):
-
-.. zephyr-app-commands::
-   :board: cortex_r8_virtual
-   :goals: build
-
-Flashing
-========
-
-Your software will run in simulation and you don't need to "flash" the board in a traditional way,
-but you can use this configuration to run Zephyr applications
-and kernel tests directly in Renode with the use of the ``run`` command.
-
-For example, with the :zephyr:code-sample:`synchronization` sample:
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/synchronization
-   :host-os: unix
-   :board: cortex_r8_virtual
-   :goals: run
-
-This will build an image with the synchronization sample app, boot it using
-Renode, and display the following console output:
-
-.. code-block:: console
-
-        *** Booting Zephyr OS build v3.6.0-5689-g2a5c606abfa7 ***
-        thread_a: Hello World from cpu 0 on cortex_r8_virtual!
-        thread_b: Hello World from cpu 0 on cortex_r8_virtual!
-        thread_a: Hello World from cpu 0 on cortex_r8_virtual!
-        thread_b: Hello World from cpu 0 on cortex_r8_virtual!
-
-Exit Renode by pressing :kbd:`CTRL+C`.
-
-Debugging
-=========
-
-Refer to the detailed overview about :ref:`application_debugging`.
-
-Renode can serve as a GDB server. For more information, refer to the
-`Renode documentation about GDB debugging <https://renode.readthedocs.io/en/latest/debugging/gdb.html>`_.
diff --git a/boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.repl b/boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.repl
deleted file mode 100644
index 2c4c9d4cc6f..00000000000
--- a/boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.repl
+++ /dev/null
@@ -1,31 +0,0 @@
-cpu: CPU.ARMv7R @ sysbus
-    cpuType: "cortex-r8"
-    genericInterruptController: gic
-    numberOfMPURegions: 24
-    cpuId: 0
-
-scu: Miscellaneous.ArmSnoopControlUnit @ sysbus 0xae000000
-
-gic: IRQControllers.ARM_GenericInterruptController @ {
-        sysbus new Bus.BusMultiRegistration { address: 0xf9001000; size: 0x100; region: "cpuInterface" };
-        sysbus new Bus.BusMultiRegistration { address: 0xf9000000; size: 0x1000; region: "distributor" }
-    }
-    [0,1] -> cpu@[0,1]
-    architectureVersion: IRQControllers.ARM_GenericInterruptControllerVersion.GICv1
-    supportsTwoSecurityStates: false
-
-privateTimer0: Timers.ARM_PrivateTimer @ {
-        sysbus new Bus.BusPointRegistration { address: 0xae000600; cpu: cpu }
-    }
-    -> gic#0@29
-    frequency: 667000000
-
-mem: Memory.MappedMemory @ sysbus 0x0
-    size: 0x8000000
-
-uart0: UART.Cadence_UART @ sysbus 0xff000000
-    -> gic@21
-
-ttc0: Timers.Cadence_TTC @ sysbus 0xff110000
-    [0-2] -> gic@[36-38]
-    frequency: 5000000
diff --git a/boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.resc b/boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.resc
deleted file mode 100644
index 6fbf739750a..00000000000
--- a/boards/renode/cortex_r8_virtual/support/cortex_r8_virtual.resc
+++ /dev/null
@@ -1,18 +0,0 @@
-:name: Cortex-R8-Virtual
-:description: This script is prepared to run Zephyr on a virtual Cortex-R8 board.
-
-$name?="Cortex-R8-Virtual"
-
-using sysbus
-mach create $name
-machine LoadPlatformDescription $ORIGIN/cortex_r8_virtual.repl
-
-
-showAnalyzer uart0
-cpu PerformanceInMips 5
-
-macro reset
-"""
-    sysbus LoadELF $elf
-"""
-runMacro $reset

From 6401ba64301bc54ddc81f25a158d240d0c48363f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:27 +0100
Subject: [PATCH 1417/2913] Revert "[nrf fromtree] soc: renode: Add
 cortex_r8_virtual"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1fe081db47056e2e31f06d14e153ae7c4d484017.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/arm/cortex_r8_virt.dtsi                   | 63 ------------------
 soc/renode/cortex_r8_virtual/CMakeLists.txt   | 13 ----
 soc/renode/cortex_r8_virtual/Kconfig          |  9 ---
 .../cortex_r8_virtual/Kconfig.defconfig       | 20 ------
 soc/renode/cortex_r8_virtual/Kconfig.soc      | 10 ---
 .../cortex_r8_virtual/arm_mpu_regions.c       | 66 -------------------
 soc/renode/cortex_r8_virtual/soc.c            | 23 -------
 soc/renode/cortex_r8_virtual/soc.h            | 16 -----
 soc/renode/cortex_r8_virtual/soc.yml          |  2 -
 9 files changed, 222 deletions(-)
 delete mode 100644 dts/arm/cortex_r8_virt.dtsi
 delete mode 100644 soc/renode/cortex_r8_virtual/CMakeLists.txt
 delete mode 100644 soc/renode/cortex_r8_virtual/Kconfig
 delete mode 100644 soc/renode/cortex_r8_virtual/Kconfig.defconfig
 delete mode 100644 soc/renode/cortex_r8_virtual/Kconfig.soc
 delete mode 100644 soc/renode/cortex_r8_virtual/arm_mpu_regions.c
 delete mode 100644 soc/renode/cortex_r8_virtual/soc.c
 delete mode 100644 soc/renode/cortex_r8_virtual/soc.h
 delete mode 100644 soc/renode/cortex_r8_virtual/soc.yml

diff --git a/dts/arm/cortex_r8_virt.dtsi b/dts/arm/cortex_r8_virt.dtsi
deleted file mode 100644
index 704f17ed8ef..00000000000
--- a/dts/arm/cortex_r8_virt.dtsi
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2024 Antmicro <www.antmicro.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/interrupt-controller/arm-gic.h>
-
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-		cpu@0 {
-			device_type = "cpu";
-			compatible = "arm,cortex-r8f";
-			reg = <0>;
-		};
-	};
-	soc {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "simple-bus";
-		ranges;
-		interrupt-parent = < &gic >;
-		flash0: flash@c0000000 {
-			compatible = "soc-nv-flash";
-			reg = < 0xc0000000 0x2000000 >;
-		};
-		sram0: memory@0 {
-			compatible = "mmio-sram";
-			reg = < 0x0 0x4000000 >;
-		};
-		uart0: uart@ff000000 {
-			compatible = "xlnx,xuartps";
-			reg = < 0xff000000 0x4c >;
-			status = "disabled";
-			interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL
-					IRQ_DEFAULT_PRIORITY>;
-			interrupt-names = "irq_0";
-		};
-		ttc0: timer@ff110000 {
-			compatible = "xlnx,ttcps";
-			status = "okay";
-			interrupts = < 0x0 0x24 0x2 0xa0 >,
-				< 0x0 0x25 0x2 0xa0 >,
-				< 0x0 0x26 0x2 0xa0 >;
-			interrupt-names = "irq_0", "irq_1", "irq_2";
-			reg = < 0xff110000 0x1000 >;
-			clock-frequency = < 5000000 >;
-		};
-		gic: interrupt-controller@f9000000 {
-			compatible = "arm,gic-v1", "arm,gic";
-			reg = < 0xf9000000 0x1000 >, < 0xf9001000 0x100 >;
-			interrupt-controller;
-			#interrupt-cells = < 0x4 >;
-			status = "okay";
-			phandle = < 0x1 >;
-		};
-	};
-};
diff --git a/soc/renode/cortex_r8_virtual/CMakeLists.txt b/soc/renode/cortex_r8_virtual/CMakeLists.txt
deleted file mode 100644
index 2b8f495b04e..00000000000
--- a/soc/renode/cortex_r8_virtual/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2024 Antmicro <www.antmicro.com>
-# SPDX-License-Identifier: Apache-2.0
-
-zephyr_sources(soc.c)
-
-zephyr_sources_ifdef(
-  CONFIG_ARM_MPU
-  arm_mpu_regions.c
-)
-
-zephyr_include_directories(.)
-
-set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_a_r/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/renode/cortex_r8_virtual/Kconfig b/soc/renode/cortex_r8_virtual/Kconfig
deleted file mode 100644
index 769ee5e4af8..00000000000
--- a/soc/renode/cortex_r8_virtual/Kconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2024 Antmicro <www.antmicro.com>
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_CORTEX_R8_VIRTUAL
-	select ARM
-	select CPU_CORTEX_R8
-	select PLATFORM_SPECIFIC_INIT
-	select CPU_HAS_ARM_MPU
-	select VFP_DP_D16
diff --git a/soc/renode/cortex_r8_virtual/Kconfig.defconfig b/soc/renode/cortex_r8_virtual/Kconfig.defconfig
deleted file mode 100644
index 114978755a9..00000000000
--- a/soc/renode/cortex_r8_virtual/Kconfig.defconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (c) 2024 Antmicro <www.antmicro.com>
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_CORTEX_R8_VIRTUAL
-
-config NUM_IRQS
-	default 220
-
-config SYS_CLOCK_HW_CYCLES_PER_SEC
-	default 5000000
-
-DT_CHOSEN_Z_FLASH := zephyr,flash
-
-config FLASH_SIZE
-	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_FLASH),0,K)
-
-config FLASH_BASE_ADDRESS
-	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH))
-
-endif # SOC_CORTEX_R8_VIRTUAL
diff --git a/soc/renode/cortex_r8_virtual/Kconfig.soc b/soc/renode/cortex_r8_virtual/Kconfig.soc
deleted file mode 100644
index c326279f27b..00000000000
--- a/soc/renode/cortex_r8_virtual/Kconfig.soc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2024 Antmicro <www.antmicro.com>
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_CORTEX_R8_VIRTUAL
-	bool
-	help
-	  Cortex R8 Virtual system implementation
-
-config SOC
-	default "cortex_r8_virtual" if SOC_CORTEX_R8_VIRTUAL
diff --git a/soc/renode/cortex_r8_virtual/arm_mpu_regions.c b/soc/renode/cortex_r8_virtual/arm_mpu_regions.c
deleted file mode 100644
index 8287a0651d4..00000000000
--- a/soc/renode/cortex_r8_virtual/arm_mpu_regions.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (c) 2021 Lexmark International, Inc.
- * Copyright (c) 2024 Antmicro <www.antmicro.com>
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/arch/arm/mpu/arm_mpu.h>
-
-#define MPUTYPE_READ_ONLY \
-	{ \
-		.rasr = (P_RO_U_RO_Msk \
-				| (7 << MPU_RASR_TEX_Pos) \
-				| MPU_RASR_C_Msk \
-				| MPU_RASR_B_Msk \
-				| MPU_RASR_XN_Msk) \
-	}
-
-#define MPUTYPE_READ_ONLY_PRIV \
-	{ \
-		.rasr = (P_RO_U_RO_Msk \
-				| (5 << MPU_RASR_TEX_Pos) \
-				| MPU_RASR_B_Msk) \
-	}
-
-#define MPUTYPE_PRIV_WBWACACHE_XN \
-	{ \
-		.rasr = (P_RW_U_NA_Msk \
-				| (5 << MPU_RASR_TEX_Pos) \
-				| MPU_RASR_B_Msk \
-				| MPU_RASR_XN_Msk) \
-	}
-
-#define MPUTYPE_PRIV_DEVICE \
-	{ \
-		.rasr = (P_RW_U_NA_Msk \
-				| (2 << MPU_RASR_TEX_Pos)) \
-	}
-
-extern uint32_t _image_rom_end_order;
-static const struct arm_mpu_region mpu_regions[] = {
-	MPU_REGION_ENTRY("FLASH0",
-			0xc0000000,
-			REGION_32M,
-			MPUTYPE_READ_ONLY),
-
-	MPU_REGION_ENTRY("SRAM_PRIV",
-			0x00000000,
-			REGION_2G,
-			MPUTYPE_PRIV_WBWACACHE_XN),
-
-	MPU_REGION_ENTRY("SRAM",
-			0x00000000,
-			((uint32_t)&_image_rom_end_order),
-			MPUTYPE_READ_ONLY_PRIV),
-
-	MPU_REGION_ENTRY("REGISTERS",
-			0xf8000000,
-			REGION_128M,
-			MPUTYPE_PRIV_DEVICE),
-};
-
-const struct arm_mpu_config mpu_config = {
-	.num_regions = ARRAY_SIZE(mpu_regions),
-	.mpu_regions = mpu_regions,
-};
diff --git a/soc/renode/cortex_r8_virtual/soc.c b/soc/renode/cortex_r8_virtual/soc.c
deleted file mode 100644
index b5ec39c8108..00000000000
--- a/soc/renode/cortex_r8_virtual/soc.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2019 Lexmark International, Inc.
- * Copyright (c) 2024 Antmicro <www.antmicro.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/device.h>
-
-#include <cmsis_core.h>
-
-void z_arm_platform_init(void)
-{
-	/*
-	 * Use normal exception vectors address range (0x0-0x1C).
-	 */
-	unsigned int sctlr = __get_SCTLR();
-
-	sctlr &= ~SCTLR_V_Msk;
-	__set_SCTLR(sctlr);
-}
diff --git a/soc/renode/cortex_r8_virtual/soc.h b/soc/renode/cortex_r8_virtual/soc.h
deleted file mode 100644
index 952a91d5e3f..00000000000
--- a/soc/renode/cortex_r8_virtual/soc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2024 Antmicro <www.antmicro.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-#ifndef ZEPHYR_SOC_CORTEX_R8_VIRTUAL_SOC_H_
-#define ZEPHYR_SOC_CORTEX_R8_VIRTUAL_SOC_H_
-
-#define __CR_REV		1U
-
-#define __GIC_PRESENT		0U
-#define __TIM_PRESENT		0U
-
-#endif /* ZEPHYR_SOC_CORTEX_R8_VIRTUAL_SOC_H_ */
diff --git a/soc/renode/cortex_r8_virtual/soc.yml b/soc/renode/cortex_r8_virtual/soc.yml
deleted file mode 100644
index 8d0a0b279da..00000000000
--- a/soc/renode/cortex_r8_virtual/soc.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-socs:
-  - name: cortex_r8_virtual

From 271a1cc0fd479bf6335316c7924f7ba5d5498168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:27 +0100
Subject: [PATCH 1418/2913] Revert "[nrf fromtree] arch: Add Cortex-R8 support"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5d6a154941e5837be7c8a4fcfd95d8494655123c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 arch/arm/core/cortex_a_r/Kconfig                       |  8 --------
 cmake/gcc-m-cpu.cmake                                  |  9 ---------
 cmake/gcc-m-fpu.cmake                                  |  2 +-
 include/zephyr/arch/arm/cortex_a_r/mpu.h               |  2 +-
 modules/cmsis/cmsis_core_a_r.h                         |  2 --
 .../mcumgr/grp/os_mgmt/include/os_mgmt_processor.h     | 10 ----------
 6 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/arch/arm/core/cortex_a_r/Kconfig b/arch/arm/core/cortex_a_r/Kconfig
index 2ee3c945644..4095a277c61 100644
--- a/arch/arm/core/cortex_a_r/Kconfig
+++ b/arch/arm/core/cortex_a_r/Kconfig
@@ -93,14 +93,6 @@ config CPU_CORTEX_R7
 	help
 	  This option signifies the use of a Cortex-R7 CPU
 
-config CPU_CORTEX_R8
-	bool
-	select CPU_AARCH32_CORTEX_R
-	select ARMV7_R
-	select ARMV7_R_FP if CPU_HAS_FPU
-	help
-	  This option signifies the use of a Cortex-R8 CPU
-
 config CPU_CORTEX_R52
 	bool
 	select CPU_AARCH32_CORTEX_R
diff --git a/cmake/gcc-m-cpu.cmake b/cmake/gcc-m-cpu.cmake
index 6f00283b6b8..8cb777c4769 100644
--- a/cmake/gcc-m-cpu.cmake
+++ b/cmake/gcc-m-cpu.cmake
@@ -68,15 +68,6 @@ if("${ARCH}" STREQUAL "arm")
     else()
       set(GCC_M_CPU ${GCC_M_CPU}+nofp)
     endif()
-  elseif(CONFIG_CPU_CORTEX_R8)
-    set(GCC_M_CPU cortex-r8)
-    if(CONFIG_FPU AND CONFIG_CPU_HAS_VFP)
-      if(NOT CONFIG_VFP_FEATURE_DOUBLE_PRECISION)
-        set(GCC_M_CPU ${GCC_M_CPU}+nofp.dp)
-      endif()
-    else()
-      set(GCC_M_CPU ${GCC_M_CPU}+nofp)
-    endif()
   elseif(CONFIG_CPU_CORTEX_R52)
     set(GCC_M_CPU cortex-r52)
     if(CONFIG_FPU AND CONFIG_CPU_HAS_VFP)
diff --git a/cmake/gcc-m-fpu.cmake b/cmake/gcc-m-fpu.cmake
index d1ce9655b46..a25cdf05679 100644
--- a/cmake/gcc-m-fpu.cmake
+++ b/cmake/gcc-m-fpu.cmake
@@ -7,7 +7,7 @@ if(CONFIG_FPU)
 
 if("${ARCH}" STREQUAL "arm")
   if(CONFIG_CPU_AARCH32_CORTEX_R)
-    if(CONFIG_CPU_CORTEX_R4 OR CONFIG_CPU_CORTEX_R5 OR CONFIG_CPU_CORTEX_R8) # VFPv3
+    if(CONFIG_CPU_CORTEX_R4 OR CONFIG_CPU_CORTEX_R5) # VFPv3
       if(CONFIG_VFP_FEATURE_DOUBLE_PRECISION)
         set(GCC_M_FPU vfpv3-d16)
       elseif(CONFIG_VFP_FEATURE_SINGLE_PRECISION)
diff --git a/include/zephyr/arch/arm/cortex_a_r/mpu.h b/include/zephyr/arch/arm/cortex_a_r/mpu.h
index 896b73e20a2..e660247e4aa 100644
--- a/include/zephyr/arch/arm/cortex_a_r/mpu.h
+++ b/include/zephyr/arch/arm/cortex_a_r/mpu.h
@@ -32,7 +32,7 @@
 #define MPU_RASR_B_Pos                  0
 #define MPU_RASR_B_Msk                  (1UL << MPU_RASR_B_Pos)
 
-#if defined(CONFIG_CPU_CORTEX_R4) || defined(CONFIG_CPU_CORTEX_R5) || defined(CONFIG_CPU_CORTEX_R8)
+#if defined(CONFIG_CPU_CORTEX_R4) || defined(CONFIG_CPU_CORTEX_R5)
 #define ARM_MPU_REGION_SIZE_32B         ((uint8_t)0x04U)
 #define ARM_MPU_REGION_SIZE_64B         ((uint8_t)0x05U)
 #define ARM_MPU_REGION_SIZE_128B        ((uint8_t)0x06U)
diff --git a/modules/cmsis/cmsis_core_a_r.h b/modules/cmsis/cmsis_core_a_r.h
index bef0f602813..9f4514edb47 100644
--- a/modules/cmsis/cmsis_core_a_r.h
+++ b/modules/cmsis/cmsis_core_a_r.h
@@ -46,8 +46,6 @@ extern "C" {
 #include <core_cr5.h>
 #elif defined(CONFIG_CPU_CORTEX_R7)
 #include <core_cr7.h>
-#elif defined(CONFIG_CPU_CORTEX_R8)
-#include <core_cr8.h>
 #elif defined(CONFIG_CPU_CORTEX_R52)
 #include <core_cr52.h>
 #elif defined(CONFIG_CPU_AARCH32_CORTEX_A)
diff --git a/subsys/mgmt/mcumgr/grp/os_mgmt/include/os_mgmt_processor.h b/subsys/mgmt/mcumgr/grp/os_mgmt/include/os_mgmt_processor.h
index 71dfda7c193..83b2f598735 100644
--- a/subsys/mgmt/mcumgr/grp/os_mgmt/include/os_mgmt_processor.h
+++ b/subsys/mgmt/mcumgr/grp/os_mgmt/include/os_mgmt_processor.h
@@ -83,16 +83,6 @@ extern "C" {
 #else
 #define PROCESSOR_NAME "cortex-r7+nofp"
 #endif
-#elif defined(CONFIG_CPU_CORTEX_R8)
-#if defined(CONFIG_FPU) && defined(CONFIG_CPU_HAS_VFP)
-#if !defined(CONFIG_VFP_FEATURE_DOUBLE_PRECISION)
-#define PROCESSOR_NAME "cortex-r8+nofp.dp"
-#else
-#define PROCESSOR_NAME "cortex-r8"
-#endif
-#else
-#define PROCESSOR_NAME "cortex-r8+nofp"
-#endif
 #elif defined(CONFIG_CPU_CORTEX_R52)
 #if defined(CONFIG_FPU) && defined(CONFIG_CPU_HAS_VFP)
 #if !defined(CONFIG_VFP_FEATURE_DOUBLE_PRECISION)

From f279af14796a1ff3342add6e74db67bed41e09dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:27 +0100
Subject: [PATCH 1419/2913] Revert "[nrf fromtree] tests: adc: Enable ADC tests
 for frdm_mcxc242 board"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c0c37ae48f4ba45f3ab29be37715b2a36c00d9a5.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/frdm_mcxc242.conf                  |  1 -
 .../boards/frdm_mcxc242.overlay               | 28 ---------------
 .../adc/adc_accuracy_test/testcase.yaml       |  1 -
 .../adc/adc_api/boards/frdm_mcxc242.conf      |  1 -
 .../adc/adc_api/boards/frdm_mcxc242.overlay   | 34 -------------------
 5 files changed, 65 deletions(-)
 delete mode 100644 tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.conf
 delete mode 100644 tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.overlay
 delete mode 100644 tests/drivers/adc/adc_api/boards/frdm_mcxc242.conf
 delete mode 100644 tests/drivers/adc/adc_api/boards/frdm_mcxc242.overlay

diff --git a/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.conf b/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.conf
deleted file mode 100644
index 3201f7a9cc4..00000000000
--- a/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ADC_MCUX_ADC16_VREF_ALTERNATE=y
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.overlay b/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.overlay
deleted file mode 100644
index 7d0c761c944..00000000000
--- a/tests/drivers/adc/adc_accuracy_test/boards/frdm_mcxc242.overlay
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright 2024 NXP
- */
-
- /* Please connect voltage reference to J6.AN pin to run the test. */
-
-/ {
-	zephyr,user {
-		io-channels = <&adc0 1>;
-		reference_mv = <1650>;
-	};
-};
-
-&adc0 {
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@1 {
-		reg = <1>;
-		zephyr,gain = "ADC_GAIN_1";
-		zephyr,reference = "ADC_REF_VDD_1";
-		zephyr,vref-mv = <3300>;
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
diff --git a/tests/drivers/adc/adc_accuracy_test/testcase.yaml b/tests/drivers/adc/adc_accuracy_test/testcase.yaml
index 8f6978a49fc..e33f7237339 100644
--- a/tests/drivers/adc/adc_accuracy_test/testcase.yaml
+++ b/tests/drivers/adc/adc_accuracy_test/testcase.yaml
@@ -19,4 +19,3 @@ tests:
     platform_allow:
       - frdm_kl25z
       - ek_ra8m1
-      - frdm_mcxc242
diff --git a/tests/drivers/adc/adc_api/boards/frdm_mcxc242.conf b/tests/drivers/adc/adc_api/boards/frdm_mcxc242.conf
deleted file mode 100644
index 3201f7a9cc4..00000000000
--- a/tests/drivers/adc/adc_api/boards/frdm_mcxc242.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ADC_MCUX_ADC16_VREF_ALTERNATE=y
diff --git a/tests/drivers/adc/adc_api/boards/frdm_mcxc242.overlay b/tests/drivers/adc/adc_api/boards/frdm_mcxc242.overlay
deleted file mode 100644
index 020abbd2355..00000000000
--- a/tests/drivers/adc/adc_api/boards/frdm_mcxc242.overlay
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright 2024 NXP
- */
-
-/ {
-	zephyr,user {
-		io-channels = <&adc0 0>, <&adc0 1>;
-	};
-};
-
-&adc0 {
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1";
-		zephyr,reference = "ADC_REF_VDD_1";
-		zephyr,vref-mv = <3300>;
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-
-	channel@1 {
-		reg = <1>;
-		zephyr,gain = "ADC_GAIN_1";
-		zephyr,reference = "ADC_REF_VDD_1";
-		zephyr,vref-mv = <3300>;
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};

From 27e8f3f3c346859e17abae34a5c75bdd33d24de2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:27 +0100
Subject: [PATCH 1420/2913] Revert "[nrf fromtree] boards: beagle: add
 BeaglePlay on-board CC1352P7"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 23be9f1d9a52acea905d5ad35b35dc8607e3d85d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/beagle/beagleplay/CMakeLists.txt       |   8 -
 boards/beagle/beagleplay/Kconfig              |  18 --
 boards/beagle/beagleplay/Kconfig.beagleplay   |  11 -
 .../beagleplay-cc1352p7-pinctrl.dtsi          |  38 ----
 .../beagle/beagleplay/beagleplay_cc1352p7.dts |  95 ---------
 .../beagleplay/beagleplay_cc1352p7.yaml       |  15 --
 .../beagleplay/beagleplay_cc1352p7_defconfig  |  20 --
 boards/beagle/beagleplay/board.cmake          |  15 --
 boards/beagle/beagleplay/board.yml            |   5 -
 .../beagleplay/doc/beagleplay_cc1352p7.rst    | 194 ------------------
 .../beagleplay/doc/img/beagle_play.webp       | Bin 39536 -> 0 bytes
 boards/beagle/beagleplay/support/openocd.cfg  |   8 -
 soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig   |   1 -
 13 files changed, 428 deletions(-)
 delete mode 100644 boards/beagle/beagleplay/CMakeLists.txt
 delete mode 100644 boards/beagle/beagleplay/Kconfig
 delete mode 100644 boards/beagle/beagleplay/Kconfig.beagleplay
 delete mode 100644 boards/beagle/beagleplay/beagleplay-cc1352p7-pinctrl.dtsi
 delete mode 100644 boards/beagle/beagleplay/beagleplay_cc1352p7.dts
 delete mode 100644 boards/beagle/beagleplay/beagleplay_cc1352p7.yaml
 delete mode 100644 boards/beagle/beagleplay/beagleplay_cc1352p7_defconfig
 delete mode 100644 boards/beagle/beagleplay/board.cmake
 delete mode 100644 boards/beagle/beagleplay/board.yml
 delete mode 100644 boards/beagle/beagleplay/doc/beagleplay_cc1352p7.rst
 delete mode 100644 boards/beagle/beagleplay/doc/img/beagle_play.webp
 delete mode 100644 boards/beagle/beagleplay/support/openocd.cfg

diff --git a/boards/beagle/beagleplay/CMakeLists.txt b/boards/beagle/beagleplay/CMakeLists.txt
deleted file mode 100644
index b772e653618..00000000000
--- a/boards/beagle/beagleplay/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-zephyr_library()
-
-if(CONFIG_SOC_CC1352P7)
-  zephyr_library_sources(../beagleconnect_freedom/board_antenna.c)
-  zephyr_library_compile_definitions("DeviceFamily_CC13X2X7")
-endif()
diff --git a/boards/beagle/beagleplay/Kconfig b/boards/beagle/beagleplay/Kconfig
deleted file mode 100644
index 373566d6f26..00000000000
--- a/boards/beagle/beagleplay/Kconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# BeaglePlay CC1352 board configuration
-
-# Copyright (c) 2020 Erik Larson
-# Copyright (c) 2021-2022 Jason Kridner, BeagleBoard.org Foundation
-# Copyright (c) 2024 Ayush Singh <ayushdevel1325@gmail.com>
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_BEAGLEPLAY_CC1352P7
-
-config BOARD_ANTENNA_INIT_PRIO
-	int "Board antenna switch initialization priority"
-	default 70
-	help
-	  Set the priority for board init, must be greater than
-	  KERNEL_INIT_PRIORITY_DEVICE but smaller than
-	  IEEE802154_CC13XX_CC26XX_SUB_GHZ_INIT_PRIO.
-
-endif # BOARD_BEAGLEPLAY_CC1352
diff --git a/boards/beagle/beagleplay/Kconfig.beagleplay b/boards/beagle/beagleplay/Kconfig.beagleplay
deleted file mode 100644
index e0f220288d5..00000000000
--- a/boards/beagle/beagleplay/Kconfig.beagleplay
+++ /dev/null
@@ -1,11 +0,0 @@
-# BeaglePlay board configuration
-
-# Copyright (c) 2020 Erik Larson
-# Copyright (c) 2021-2022 Jason Kridner, BeagleBoard.org Foundation
-# Copyright (c) 2024 Ayush Singh, BeagleBoard.org Foundation
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_BEAGLEPLAY
-	select SOC_CC1352P7 if BOARD_BEAGLEPLAY_CC1352P7
-	help
-	  BeagleBoard.org BeaglePlay CC1352P7
diff --git a/boards/beagle/beagleplay/beagleplay-cc1352p7-pinctrl.dtsi b/boards/beagle/beagleplay/beagleplay-cc1352p7-pinctrl.dtsi
deleted file mode 100644
index 9f6b33da2ff..00000000000
--- a/boards/beagle/beagleplay/beagleplay-cc1352p7-pinctrl.dtsi
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2022 Vaishnav Achath
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/pinctrl/cc13xx_cc26xx-pinctrl.h>
-
-&pinctrl {
-	/* UART0 */
-	uart0_tx_default: uart0_tx_default {
-		pinmux = <13 IOC_PORT_MCU_UART0_TX>;
-		bias-disable;
-	};
-	uart0_rx_default: uart0_rx_default {
-		pinmux = <12 IOC_PORT_MCU_UART0_RX>;
-		bias-disable;
-		input-enable;
-	};
-
-	/* Antenna pinmux states */
-	board_ant_tx_pa_off: board_ant_tx_pa_off {
-		pinmux = <29 IOC_PORT_GPIO>;
-		bias-disable;
-	};
-	board_ant_tx_pa_on: board_ant_tx_pa_on {
-		pinmux = <29 IOC_PORT_RFC_GPO3>;
-		bias-disable;
-	};
-	board_ant_subg_off: board_ant_subg_off {
-		pinmux = <30 IOC_PORT_GPIO>;
-		bias-disable;
-	};
-	board_ant_subg_on: board_ant_subg_on {
-		pinmux = <30 IOC_PORT_RFC_GPO0>;
-		bias-disable;
-	};
-};
diff --git a/boards/beagle/beagleplay/beagleplay_cc1352p7.dts b/boards/beagle/beagleplay/beagleplay_cc1352p7.dts
deleted file mode 100644
index 858ca21d162..00000000000
--- a/boards/beagle/beagleplay/beagleplay_cc1352p7.dts
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2022 Jason Kridner, BeagleBoard.org Foundation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-
-#include <ti/cc1352r7.dtsi>
-#include "beagleplay-cc1352p7-pinctrl.dtsi"
-
-/ {
-	model = "beagleplay";
-	compatible = "beagle,beagleplay-cc1352p7";
-
-	aliases {
-		led0 = &led0;
-		led1 = &led1;
-	};
-
-	chosen {
-		zephyr,sram = &sram0;
-		zephyr,console = &uart0;
-		zephyr,shell-uart = &uart0;
-		zephyr,flash = &flash0;
-		zephyr,ieee802154 = &ieee802154g;
-	};
-
-	leds: leds {
-		compatible = "gpio-leds";
-		led0: led_0 {
-			gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>;
-			label = "LED1";
-		};
-
-		led1: led_1 {
-			gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
-			label = "LED2";
-		};
-	};
-
-	/**
-	 * The BeaglePlay cc1352 has an on-board antenna switch (SKY13317-373LF) used to
-	 * select the appropriate RF signal port based on the currently-used PHY.
-	 *
-	 * Truth table:
-	 *
-	 * Path         DIO29 DIO30
-	 * ===========  ===== =====
-	 * Off          0     0
-	 * Sub-1 GHz    0     1     // DIO30 mux to IOC_PORT_RFC_GPO0 for auto
-	 * 20 dBm TX    1     0     // DIO29 mux to IOC_PORT_RFC_GPO3 for auto
-	 */
-	antenna_mux0: antenna_mux0 {
-		compatible = "skyworks,sky13317";
-		status = "okay";
-		gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>, <&gpio0 30 GPIO_ACTIVE_HIGH>;
-		pinctrl-0 = <&board_ant_tx_pa_off &board_ant_subg_off>;
-		pinctrl-1 = <&board_ant_tx_pa_off &board_ant_subg_on>;
-		pinctrl-2 = <&board_ant_tx_pa_on &board_ant_subg_on>;
-		pinctrl-names = "default", "ant_subg", "ant_subg_pa";
-	};
-};
-
-&cpu0 {
-	clock-frequency = <48000000>;
-	cpu-power-states = <&idle &standby>;
-};
-
-&trng {
-	status = "okay";
-};
-
-&gpio0 {
-	status = "okay";
-};
-
-&uart0 {
-	status = "okay";
-	current-speed = <115200>;
-	pinctrl-0 = <&uart0_rx_default &uart0_tx_default>;
-	pinctrl-names = "default";
-};
-
-&rtc {
-	status = "okay";
-};
-
-&ieee802154 {
-	status = "okay";
-};
-
-&ieee802154g {
-	status = "okay";
-};
diff --git a/boards/beagle/beagleplay/beagleplay_cc1352p7.yaml b/boards/beagle/beagleplay/beagleplay_cc1352p7.yaml
deleted file mode 100644
index 816b755471f..00000000000
--- a/boards/beagle/beagleplay/beagleplay_cc1352p7.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-identifier: beagleplay/cc1352p7
-name: BeaglePlay CC1352P7
-type: mcu
-arch: arm
-ram: 144
-flash: 704
-toolchain:
-  - zephyr
-  - gnuarmemb
-  - xtools
-supported:
-  - gpio
-  - uart
-  - hwinfo
-vendor: beagle
diff --git a/boards/beagle/beagleplay/beagleplay_cc1352p7_defconfig b/boards/beagle/beagleplay/beagleplay_cc1352p7_defconfig
deleted file mode 100644
index b56ce4d3e8d..00000000000
--- a/boards/beagle/beagleplay/beagleplay_cc1352p7_defconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (c) 2022 Jason Kridner, BeagleBoard.org Foundation
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_GPIO=y
-
-CONFIG_BUILD_OUTPUT_HEX=y
-# Custom callback for the antenna switch configuration
-CONFIG_CC13X2_CC26X2_HAS_CUSTOM_RF_HWATTRS=y
-CONFIG_CC13X2_CC26X2_BOOTLOADER_ENABLE=y
-CONFIG_CC13X2_CC26X2_BOOTLOADER_BACKDOOR_ENABLE=y
-CONFIG_CC13X2_CC26X2_BOOTLOADER_BACKDOOR_PIN=15
-
-CONFIG_ARM_MPU=y
-CONFIG_HW_STACK_PROTECTION=y
-
-# Adjust for oscillator capacitors
-CONFIG_CC13X2_CC26X2_XOSC_CAPARRAY_DELTA=0x02
diff --git a/boards/beagle/beagleplay/board.cmake b/boards/beagle/beagleplay/board.cmake
deleted file mode 100644
index 61ee3cc2358..00000000000
--- a/boards/beagle/beagleplay/board.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2020 Erik Larson
-# Copyright (c) 2023 Jason Kridner, BeagleBoard.org Foundation
-# Copyright (c) 2024 Ayush Singh, BeagleBoard.org Foundation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-# Download cc1352-flasher (https://pypi.org/project/cc1352-flasher/) using the following command:
-# pip3 install cc1352-flasher
-# Be sure to disable the bcfserial driver because it will capture /dev/ttyS4
-
-if(CONFIG_SOC_CC1352P7)
-  find_program(CC1352_FLASHER NAMES cc1352_flasher)
-  board_set_flasher_ifnset(misc-flasher)
-  board_finalize_runner_args(misc-flasher ${CC1352_FLASHER} --play)
-endif()
diff --git a/boards/beagle/beagleplay/board.yml b/boards/beagle/beagleplay/board.yml
deleted file mode 100644
index b412fda0ef3..00000000000
--- a/boards/beagle/beagleplay/board.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-board:
-  name: beagleplay
-  vendor: beagle
-  socs:
-  - name: cc1352p7
diff --git a/boards/beagle/beagleplay/doc/beagleplay_cc1352p7.rst b/boards/beagle/beagleplay/doc/beagleplay_cc1352p7.rst
deleted file mode 100644
index fc36f0ce430..00000000000
--- a/boards/beagle/beagleplay/doc/beagleplay_cc1352p7.rst
+++ /dev/null
@@ -1,194 +0,0 @@
-.. _beagleplay_cc1352p7:
-
-BeaglePlay (CC1352)
-###################
-
-Overview
-********
-
-BeagleBoard.org BeaglePlay is an open hardware single board computer based on a TI Sitara AM6254
-quad-core ARM Cortex-A53 SoC with an external TI SimpleLink multi-standard CC1352P7 wireless MCU
-providing long-range, low-power connectivity.
-
-
-.. figure:: img/beagle_play.webp
-   :align: center
-   :width: 500px
-   :alt: BeagleBoard.org BeaglePlay
-
-   BeagleBoard.org BeaglePlay
-
-Hardware
-********
-
-* Processors
-
-  * TI Sitara AM6252 SoC
-
-    * 4x ARM Cortex-A53
-    * ARM Cortex-R5
-    * ARM Cortex-M4
-    * Dual-core 32-bit RISC Programmble Real-Time Unit (PRU)
-
-  * TI SimpleLink CC1352P7 Wireless MCU
-
-    * ARM Cortex-M4F programmable MCU
-    * ARM Cortex-M0+ software-defined radio processor
-
-* Memory
-
-  * 2GB DDR4
-  * 16GB eMMC flash
-  * I2C EEPROM
-
-* Wired connectivity
-
-  * Gigabit Ethernet (RJ45)
-  * Single-pair Ethernet with 5V/250mA PoDL output (RJ11)
-  * HDMI
-  * USB Type-A (host)
-  * USB Type-C (client/power)
-
-* Wireless connectivity
-
-  * TI WL1807 2.4GHz/5GHz WiFi
-  * BLE/SubG via CC1352P7
-
-* Expansion
-
-  * mikroBUS
-  * Grove
-  * QWIIC
-
-BeaglePlay ARM Cortex-A53 CPUs typically run Linux, while the CC1352P7 Cortex-M4 typically runs Zephyr.
-
-
-Supported Features
-==================
-
-The ``beagleplay/cc1352p7`` board target supports the following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PINMUX    | on-chip    | pinmux               |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | ieee802154           |
-+-----------+------------+----------------------+
-
-Connections and IOs
-===================
-
-CC1352 reset is connected to AM62 GPIO0_14.
-
-+-------+--------------+-------------------------------------+
-| Pin   | Function     | Usage                               |
-+=======+==============+=====================================+
-| DIO5  | N/C          |                                     |
-+-------+--------------+-------------------------------------+
-| DIO6  | N/C          |                                     |
-+-------+--------------+-------------------------------------+
-| DIO7  | N/C          |                                     |
-+-------+--------------+-------------------------------------+
-| DIO8  | N/C          |                                     |
-+-------+--------------+-------------------------------------+
-| DIO9  | N/C          |                                     |
-+-------+--------------+-------------------------------------+
-| DIO10 | N/C          |                                     |
-+-------+--------------+-------------------------------------+
-| DIO11 | N/C          |                                     |
-+-------+--------------+-------------------------------------+
-| DIO12 | CC1352_RX    | AM62 UART6_TXD                      |
-+-------+--------------+-------------------------------------+
-| DIO13 | CC1352_TX    | AM62 UART6_RXD                      |
-+-------+--------------+-------------------------------------+
-| DIO14 | N/C          |                                     |
-+-------+--------------+-------------------------------------+
-| DIO15 | CC1352_BOOT  | AM62 GPIO0_13                       |
-+-------+--------------+-------------------------------------+
-| DIO16 | CC1352_TDO   | TAG-CONNECT TDO                     |
-+-------+--------------+-------------------------------------+
-| DIO17 | CC1352_TDI   | TAG-CONNECT TDI                     |
-+-------+--------------+-------------------------------------+
-| DIO18 | N/C          |                                     |
-+-------+--------------+-------------------------------------+
-| DIO19 | N/C          |                                     |
-+-------+--------------+-------------------------------------+
-| DIO20 | N/C          |                                     |
-+-------+--------------+-------------------------------------+
-| DIO21 | N/C          |                                     |
-+-------+--------------+-------------------------------------+
-| DIO22 | N/C          |                                     |
-+-------+--------------+-------------------------------------+
-| DIO23 | N/C          |                                     |
-+-------+--------------+-------------------------------------+
-| DIO24 | N/C          |                                     |
-+-------+--------------+-------------------------------------+
-| DIO25 | N/C          |                                     |
-+-------+--------------+-------------------------------------+
-| DIO26 | N/C          |                                     |
-+-------+--------------+-------------------------------------+
-| DIO27 | LED1         | CC1352_LED1 yellow LED9             |
-+-------+--------------+-------------------------------------+
-| DIO28 | LED2         | CC1352_LED2 yellow LED8             |
-+-------+--------------+-------------------------------------+
-| DIO29 | RF_PA        | SubG/PA Antenna mux PA enable       |
-+-------+--------------+-------------------------------------+
-| DIO30 | RF_SUB1G     | SubG/PA Antenna mux SubG enable     |
-+-------+--------------+-------------------------------------+
-
-Programming and Debugging
-*************************
-
-Flashing
-========
-
-To flash, disable the existing driver that ties up the serial port and use
-the customized BSL Python script.
-
-1. Ensure the bcfserial or gb-beagleplay driver isn’t blocking the serial port. This can be done by
-   loading :file: ``/overlays/k3-am625-beagleplay-bcfserial-no-firmware.dtbo`` or selecting uboot
-   entry which disables bcfserial/gb-beagleplay.
-
-2. Now reboot the board.
-
-   .. code-block:: console
-
-      sudo shutdown -r now
-
-3. Install CC1352-flasher if not already installed
-
-   .. code-block:: console
-
-      if ! command -v cc1352_flasher &> /dev/null; then pip install cc1352-flasher; fi
-
-
-4. Flash the CC1352P7
-
-   .. code-block:: console
-
-      west flash
-
-Debugging
-=========
-
-For debugging, you can use the serial port or JTAG. You can use OpenOCD
-over the Tag-Connect header on the board.
-
-* Tagconnect JTAG
-
-References
-**********
-
-.. target-notes::
-
-.. _BeagleBoard.org BeaglePlay: https://beagleplay.org
-.. _Tagconnect JTAG: https://docs.beagleboard.org/latest/accessories/cables.html#tagconnect-jtag
diff --git a/boards/beagle/beagleplay/doc/img/beagle_play.webp b/boards/beagle/beagleplay/doc/img/beagle_play.webp
deleted file mode 100644
index 031cfc7e754132a7dd22ef3c859dffdbe615caf2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 39536
zcmYIvV{~OfvvzFTwrxyo+nyK`JDJ$d#5pl0I7ucpCbl!NZTozA?|tw3e(cq|dv#Y;
zKULlR>{`9m<)o!;vcbS~q{LOVRrz!gz`(%Jz8*XXusd)tF-28bSz0hK^t#CREtk@N
zPlrO@s>-`!@R$QsatM)f7|IONJ1&hn{g!;|MY>41vGK<GOwxqR#`x3*o$N%|#mqQr
zTn<>sxUmsCE)96UsN^up<uJx>3L*#Go&!K5idS!s{7*N)s7x?R2`!_GDrVgn-A|cp
zBE6JrWVwWhUu0o2vdVv}evvI8__(-vZD52=QngTsHbNDqD=wMQ?=JCKxlgKx)y$_|
zTIq&7uR;wQi0g)Un`Y02Q%9ZJ$X|9Q|A8VuN*QT0WD<)rEODo25?jA+c^>}iwZb)8
zxuF}glDU6u|5XT37N_fm;0Z8v8b?t_B|~<<6AfZW0&`p$U=`3}->3rc6wn!8`R|hT
zV^sOaEIEHsEQub<BLAY`QFd*GP(b&h<~RIV8U-jR?ZHz(a}#-d(STAwlh}#|`JgaW
zY4Xsy$IaE6{)-`0(XkF%IJ!rrU*TSV41Slg@)Iwo`iC^`D=e;l+91SOD_eyAYqEpM
z|I^pg`aoi6E5gw}{LfTp%A}qTV4k_o>2m%bhCu`0StR}%#M$rAPp0Vamd?wlH*);v
z9iA!EPqk8y%}%+fc4k{eW+`d&=$6ie<=)Qx=Y$uO2g8T$XbmmQsYFa+0mWU4CZeb0
zIcxdbT@))`FOJGw^p+lp&z(j{Z?(kc)!_d&p8PlCdb@M-Z?-rry`HEJp5V?6cn2jB
z8#)~6jbnPd&+>oRAvUycCZ`#G)pDfyjU%gTpW;hU{py@QG(>8ow0YeVZsC~>MaOOk
zEIkHrB~j=R9rJc|nZE|v%8{ynb;BBFOkQMe?_Utn^_GcyV)&|D?rCx|t@BO39gLi6
z5Apqh#Hl4Y`bZx+{e^n7^Ig|_7%x&Gd9fz2e^jZ?xk9*4REMH!Ep7Y5PWL(3g)FA}
z@@(D}2=%Dtm-=3Xr?<fj?<r%tHFLt{%q*kbLfx06wxZ*K;1`>;_`ycqbJ*7pC^=ZB
zYiK7enTO5j>pq19EW0L8A_p9fL+k1iW4>^s>TNhnDn~Mvtj>3mi1927ravb7)d63b
zCK=In^%ikj>(}jfNrU6JaN1H}1$!7j)Np_KC47>sJb&;35BsMEG57PtpS0ZLD>v$H
zz;~|3O%JYrmWwxx`=oCk?Gx7h=wQvbH9bPvxl27rsCs7yI7Y@B_#01#=dFeRd1|jI
zVozA^9ddr@B=}jnX1pDA(r8SYK1^u3*AnoV1*?F2@4ED<ebA7tPQ(xy&#QQyh+X%<
zKlN%2Zs<7=b(PjPbSC|eG`vPfl#-fWSgrM(_{XLZJRz^5i#xvqF)`Ue?<)-|ONWpA
zYpm(sP&ttyxIxCfdTmefc5@4@4>>H)CYrSawnNPnd%!~Io|DS>py5iZU6{&m)3YLj
z6cME5uHlS7Bo2lmW6?ThX9rzrDm$%<YJg#E2g6%h+U5SGwibHP2%?Nv@%KFvhfcew
zd8N9hcDh?5I48mTu4}sL&UX<F=Ygfd={Z*psFpl8xqZtO`PnVLI~Iq$yF%7HlJ#Z*
zdRHMRLYdmxEl7J(Tz<@uH533EKMdnhUb%mD_2RD-fZKL+mm9@!TDmwc9W9o_M=~q!
zSJQybU(q5{iz~t8D{O}^JFg^M){;q&NyG9$w61D>OU!bQ-Y#o9&XOp-Q*U$c>_`UA
zaxP>DEqPu)Kb=<ECNmUB9J)@~WtMs!BU$IR5CwV5pY8FQjXD1gYq_kAJH>3F2s(QY
z*+bWPO!Dn<yR7-}9``^CE>rWVLm1$0>`4l*dwyQ!+J@#;4L#d%JLCmLrsnK4y8-2Y
z<9iyj_pS)6tO_!Ivb0|GuW`(R31-B*`Z79P7~ur5u6v51mbdgxLG$u&AlZ}BBn~*r
zyz>7+_C)c}K<QmNEtt+HYH2#hkvTK91}g01Rd+Em<Mz9(QV0F;MLe%gh;k3BUPL=G
z#Z&g1MAI-ZJHgpO{hEwZNMg)(V{8Q93j@<ezNHCNGfUhLf6iRb7o&v5zB%L{C^!R4
zgF&2a$jW{P0Yfdlb3h@pAby9759uJ@T+b8XA(QaZSdv>gXoni*Xrj=0W6p_Z9^H1+
z%ss8TM_dZ)^m%>Gzuv-3d0sL@<E9s0bDg=c8C||nAkF@{Q=tR0>JRyl0DhN$=_-7k
z1i!RtrBM1-35T9ru~_^pauXTNY_D2JY^`c;&1mel8_x3UfN;%$D&G7^21gqfuC#`p
zj&TEDXj{be9Q7~lu+Ze}G;Bq=l|VGtk{oQXIS{u?1>qV#HbeQzo1JM<5}806L@GzS
z_gY=u`4poyvk)B~3+TQXC3Et#*q2Wmywp835Z<@+t$J9T$M+glNyve8MI7?hCfyOM
zjX1}KrCgQ^EhuQst}xRE#`K||__SfYF7mMR@6Vf9CsPrcA6YmS!MrYvFkYY@H}@3E
zLuwZJ<$4gky57qadrHr>h>x1s9BR6MEs(dK?TWk#nqK{;?bLy=zrxIq=wRuZuKd2z
z;hvWGg%b=QgW}R|63znHw<+btrv`1m{P%^9bgJDfE^(=UbCa8f(DdSAkEk~I&nDMY
z<eBLW%9pr{_a44>m?>YG6i7zX8?O{sqQ`FK%E&)XN)13P9A~*3*Mu$sNo5A>CPw-m
zDYKh)D8K%?M-r3It3I_VR)0_?Y^+Y4YaP*2ZQ>t6)C7Hx7=OqdAf9D4*3u@&l<4hF
zMb|uq$-rS-SMKkhO|df1bfgIaR}`fh|Crpf=fCt{D=BLZs6_%f0>1Sf0_0xF&I2N%
zb#}_M4onm;!WN&Bwt81j-Q=!9bF|kia&5vFw=&I~SBx(xOnQ~7KykA{I(jv}aRcLK
z7vBLJZBFvsN-n;MA(M;|&y5gYM!8Wz(AIb=y4V3jCJ|xzwGr)s+1sL3J0)6oP_zcv
z4kVxH^J``oxne{1|7pY8t3lvF%`57GU7Gqx|1@x!`|S}ky^2*G82pa0q-{-q;WB4u
z9dg41UBz3zuQ*~1h|ayvO|z3@+blDEc!l4b`q^X<F6!qpYj=dTcg3LF_0A4kT<1A}
z6=VW~Ta&$)Yo}4?`wtDEJ+R7+>930L)mFy0_%-$#nda2=;$XmE{i~m+qUs~PuCV*h
zTb63#OS4l^m$`Tqxi+l&>{Bd$6#Ju%q<e6_lXwd%`k+N0oHa%v;)Y+RCGNd)8J`3H
zJ}$ME?38Zgp_ZI*14&)gOM^xb=~PyQ1Q+A#o$;%?_@}DSTaQx=a{m}sHL4A241L)`
zNb_6($0BePG7*1!Zd&W{Ys0LQXvz2?vv|>E_Jvr)ME~`S3A4M;owAzvV$WTes8Qcd
zgAWkR8sktjHMfOqAKA{o0R>y54{*)5DxtPSekdKGw_^5C+z;S8mbH$#1BjS7#A+ua
zA}oney-&HR{C;e95d)k*RM!P$_t5Khj2`8|<^EX}><fQn)zK~RjiY2VyNLgRBDs@`
z*z;Jq^A{I=US5X30cMG%d$?X_J6i&XtU4dWLtotAa?;Yf%D<u5+|TV7iLt=r(Y!!*
z)j7hVyVgN5%F}wddlgPF?%iQML7rS(_w*wf)X!cu8M<Iti$ySZepk|<lQYdY#vcBp
ztO_ETjykn99uI9g1Ju(ZwGi>sa=8d>h25%&(1kTs<^Lc<D6b~CLQo<y`Q957sO<Q&
z3DLse5Wc+gTs1^mIf!6RC9ix7&YtzG&;+);^R#_t<ZmI{y(sk@ihb2yT7b)F;SepC
zx^K?FOi++~x7MStC^MjsI#N)bYwn6E<mUr?KH|VCGyP|Qq56SRVKm3mWnb?t{Lrs~
zRV|HoZX~bVjwkr|w0r_+$h)stMzGI7;narl>O9ZEiqGXsLB(8zR_+0}k91<MhreuX
zP_ZdOa@JvMkl5GIH3*=sY}tt$5R|dCe0^oeeED_FbpC;VK$ZLBlOG^G^mNoe!90H+
zzf!e$1bq-^_ZCJocI=6#f1gCDrrYs7B}ir`>JCMDMi%5ikEFHX|Bg^iOuREM&$o-c
zVN1a8u@YKo5_=xjRLq;T0>N9|{Laj!M&cM!zm{@~eg47xLDRa^$%?_H{%Z2G{tWY-
zdDs|Ms(m|R9EcEq-(!GcQ5@>831RQ7bZ55$UwKh1j%igvjymMq!(ohUuM_Xq3dX{B
z6iQD(-!g9I0(-!$`?cxqS-JFui<a41{;tA;X({oR)?*avy+3p5-F!4FOa`694{ZOo
zb!BxR7NB(1<S!`N6ZwKpJ(H+Q#r05iMIDe#i@omr54kWoI)Ngy+R0_9!$aFn;m>gB
zofas1Ru+HtvTwitj)PD`=Js48V_TIx*ZDI;j(}bici=d}Y|7(U%POm1O<A+=;kOP5
zi{QlTV8HU>hU@4u$iy<e)8O7D@=WVW1e1V&Jqb3ocsZO^xS7^6G1raaZO0d}-Jc-q
zvmQy>nP}Hv{>jduLV4`SrHi{uoKhptEc2W=cSnd8)z@={v9p9orNTB>dhGg=O_Aji
zXR71gv92#$4h0yz#w?Iumh4*dB?bQ=ghpkbu!UiWR?DURx0$5P{=zH~Uf0%<xTp<B
z^)-t|yi5DeG$xmNL`(ni`=9<7Y!hQienM`!k8dw<%3cRPg~_hg!g004yF#M=UOtnc
z6jm}?FGBZk-b5@qj-+K-qs7o{uNP29Z@Cb413~EX%T<cD*@vw8<I(;+5}Xz_2sDu@
z@JB}NF%mwJRw(-uV$)ICa-Yelkp{EOUv6LOJI)qiIlkA;Wu^BzL$1I(wBcW`S>>YO
zngewsNnd4`JXR()AwId55nMLcaf)%$icW=(`WT5re)vx=fap7RoW}jaq{l=JuoY{M
zi<2wWCqETV!a6n{Gr!X$9t<24tJoeY9dGar7*Frqe|c~1qHlj4Q=IZ3(Y$MEkWU>h
zQqUpny&haT<8fZGhZCu$7&5myZ2V&$3gnL^%_~}*Wl=M;)-kAwnR~e^HtW<Wj7k&P
zF~@bM4Slao{N*$6V%qQbDW7)GsXCuZoU}b-;fIlu?c4rZ14+t(I#|-qB*j_NkKdlO
zcYyhC;0P+EjnP5*h^Ygx);5PW#O@~8M_&<CXGet2ygwxkoqESQuh^yywW09FZ;Y&C
z=*v(k_L~x-_)Ny8ENCM1a>tm4a65??c@$#wk1&ZM3NcRhO9}pK5Vb3uGQZc>e#pqS
zG#+u6vcy|VA&6wB#iiioZCcv_bTMGa9L)S=`I!=lVCud>H<<=H5(6#oy>p*`i<v?k
zrlIfAIsSPZy)QIcj02szXa@M6&_sW1!r!+;ms{RqAI9qc+FcI4Q1!t<>T1s%$MTvL
zfr8W5dyEFq8t}pKpy88gQ!91{qW}z>ummtb6!Rj@EAr=|LUs|}d-eMK+CrZa_GwT>
zEO<<qQ2KO4{8|#8A>V04kox|jBvZQN4}z`_Wb}oZliaA-aZf7M*xHVBXC`F0*&2-Y
z8;^uKEpn&tr_<$OD{7t&petG3Ox-`|kS|!mlH=(g!?pzmh(~?M%M)-<!6ZQdUuEfR
zq0H*d{K72G$bPm4%ZTaUre-P!orhK^Rn9*?VOto8x4E}4<-OSBj2}a1CX$!UzVE9v
zpg(E>kPY9ImaGwe+omD%2l!{9d{cYdF@k1mw~LB+WQok$giZ-i8WZRUr)sf;^BGPx
z)WzS#o$Y(?`jJg9de}F!A)YeVGQ{)r{2stcsp}!ux_v^3y=3s1Ix{hvM}kzN;_~>n
zuuiKVK80db3qRNnujrSBpKwP_w}Ql#Q&=UV^s_m>U87vOP)6Xj{B<mmtg6O~Ro>u2
zEq*rr5rWz8_7VO!>*B`>Om!y}6J{iT>Z5>DLeaVj?H!iFtP>Py3(<_WWEK51<`{D-
zkic?WFz_@oOh6&1D{t)8#^&53bM5@D^dpw>yg&pyWi+uX_~^qcrJYs<Tkm+%noGks
z#?&EDC;RT@N@N-a051n(hI&t_<+9GhBalB9Pv|6WP<&2P;nV=#nV$b%%e6kKWOLTY
zo^!hw#y($I3gWY`W=6syo{#ucDb=QLlajDdVr#L@y%P=4#edY#C1U#4JN@CE`$rl0
zw>ob%$>L4OuQ6_Z<|hXpp+NGX_*fS~@tDQEg#r5Y_*5x>$JVbq!xs|*H75t8f8^`b
zTpCkSW)7psEcf@xhHl!!nchm|+rW--{;_XI(SS>uO0Qe@LgXSHTN_ssxFM$iN#wUP
zrRYzk9&B*Y20`h)13*pw4`k5XOrKrmTf($YpljVh?{VxgAQ}(7O@Ti+7!b5nj;vu_
z{QbcH@+)`=!|P`e`(J9oRQ;c%_V;i~O_XsDII*vnHgQ(fF0YXAHT}aQ%22~i&$H2|
zKs9v1m~MslX?DwE`FCi?0~ac`Dj@YXcI0Urn`)B7W~$btJ!=)ibpGVji+tlqDJO5Z
z`@tiBeUI}GBFcUfYTL5=w0>P6qtZsHSCevwMrU3q8PM($jyXrf#O&LB#LUD(A6uN!
zA|==L4MIROHNR#U8Q@JV7bjl`YpKRFDni*Iq-|}N>yKVeJG=<9L{eh@t*up?TBVLw
zNW`WItQ#t=ZCToxI^N!bK9qM;n~BYtcf59_O_^a-@5;4RVb)wB*C;4-J|6Bm`H9x%
z2Iftv3p=EKQ9_(^J`(HxKG4FK6vDsHOT_UrLi=EVM(B4)TZgsHagVcv##QwQF5IP^
z1z_eBS-<eP^O%PA)~xy|PlfXUfN|`rUNVm8v<bV{=pX5;d;+m3AkuO_IS?7B%qn@S
zk=fB686j_t*G_`IsR?(UJgw0faC&yTJGRlHjAIK?eV*Kw3mt6q`7T@=+V&ssmBWh9
zJalngVUgDX-=$jN5=0-uZ*79qy5}GYy=V{FZWw|O>R(bwV@(|@IF%$K#|ke5<xp@b
zE2@UnSjs3)6c+Wttd{qobNPJ=_Rx?1i4y;;p9O?{A7dSyX?BXhv`1gKOQ2~z9ztcE
zhp+?naIA?dH`C*FSY<|xE%VPbznjoBQ&eP_;Ij0)wy2$eRljKA$i6a~R<DXmNzm#S
zT>UmHYo;uSY~DJe5T4ii4ek0kgey5EY38ucr9@owvpYF(%oytaJ;9b`bMMX718mHB
z?0vEmXzHLPik!|^I>Y;fJH`ulETt0`+qPb*BS3a9=bvwB$~h6hDJD@WA+`sUnu>&2
z9fCDH*C<!;09#s5dAXj(?ORbTpHcK#LdxqQ3qqz$k`W=W1|!<YsDkYD8Zu^iFv;w=
zjhLA+IGAY*i0~?c+y7GVQ`Kpa4mr39cc1!lv44G%l1o$hNc`vmK0ylo?_yaG9v-G>
z^&I%=^}S(<HFlg<WLQK3DV*4mPC37NG?}r>Ha=vDki#t(7=!Z|;(IZ|5RMTR0f7N(
z&9bPKIcJFXKP9s|MH8R~LGPRUA%E5iidz-wjB1+}N{vEfmXidS&chSFQ0f+z4OpkI
z!m%h_WSb)=muC0W&m}8~v_$mYfh#5Uq(>R|;Fh!fUu<#A9ZXzYv$X{t`vRpJ&~^QH
zwlEt1irv{d%+n&qu4#^I0<rQ{;Wi0j@O3eb4p>#m8My~-PUEd+4Dw105hz{!E>!R>
zEkI(&4+%rN39ylOHJBo&^E3PCsM%N8#_*Ibz^;AHl_7#v+T-Ccj=EKjStkO9Xx>7<
z)M>vLxOD>(j_a~8)^(?h2UOeBE&GBu1CdC1^u___curXpxHU`XkchExI(J~Sn;mnA
z=f7|+$fn!|nM)OMiFs1SV`KIqP0SEaE7s6Qe0$A@`GwiZnQqJAPZX&0>kbwC#tua0
zLeD{4J7@Mr6VKEWVYrpqc@fBF&<n>3ySt)|O*<p%D(hL9e{8VP2X1KdR;}sqE=hLw
zv#i)#F5>>6Y8}Ew6uV1#qK~Jyu(U>`z3H~vtv(8b$9<3-j7!k6LfBcXA{?>eyy^*k
z*iV`8t~R&@Lcj2z{x*w-;>^4$Dk5X^wG}yKV<$v-D=hxHVc$Lgc%iSyo7afH0xnY1
z7~5-z3oCD0OwHZ0i?QM6l3B~~*XLX8t@S*WpWltTH2p#%<V~m*s{#9x$RYQqTlnXg
zk(9k-0RFdtQjJUe!a`RbBus?}e4uo&_GBXd^P3&d`T?Q_Blqv~@=8upZ?+#75;Xc~
z1z&tB6MRbXdhj+zq=UxhbiRhIfkHZn7UG_<Yl5p(I%5Vsn_*ddU}QZfZ5l0CqJu=?
zuwEtgT8n*96h9&vnm6o7(<LS_*%HQAJQb3Q`v+PCNvR<`CEM~Q#&@T@vN+BDnSuRD
zAt)>7H#$xYqfJhU!1(?dBU_Yxayr}~&H<!{G@3$S0OZ`TFkbukkqdl?s}CyY(&qa=
zO>eW{Wf^06f4u_hNw%iIn0k4reU~-L@3pSQ=WWMN^@)^-p~reb$|tFWzjz;6M|uS^
z_0g@1aKQOr9aHcx{-C<mAM&Pz0;{0GH;MAcTVcuk-9GpGIWqO%(kh8Fn;I3Nb3Fnk
zyx&kockf0qOTVOr-^Y53ppJC$IHz9uu{FJmd>DBL?k#eWHdcaR+L2h%e3Wooixo5{
zc16_#rs7??zw&ktJEV#r-02o7Idv8sm|w^BRGjuNUB=8%s_sh0b-}K}2o{L#^pW6X
z?thQY>pfXB7rvlb=cJ9ng|eI0&?5usqQoHwsJ!$*ptX&*J=Vfg#It|juMgM>2P-<V
z5~K0z+Xf|zhJ$Nv9<A?P`G`@vQuQGjIn^4VRT#}9UfU2OeR53_@`E)e+*ut=y_%{$
zDr9H9wS|LgdyEUcWE8PI7fk<z0P_o&vUrshb5V5`F{KIeDcmN`%Fd7s4e9HcBVvK+
zoDP_}I({rbJIOSc4zleFZqnI5$Y1E)7ZxF{f$Y!Vzna5FhO%!D&-(B|-VPAB!?=B8
z$Xq|<)JCc97!M~}E5s3gI80(20Lj4?d;<98%0otx<%Z6JhuB%F-GRpYu8+f6H==Zl
z5Xly!xWa3trnj$nsX(!SeYeX!;z;Gqn<Gi(?(T}3ZYK9&Ui(I{CDbvdCq`5ElO9EG
z^7qhdYC`aRBVYJ@g9#qwd1M-tL%W~3%78S)aJKe+k&iCAi$eu~I@s?6>I4>J{x{lV
zgoCT^DzK(^qvMVU(m*^jUtWgDms?j`i_ym*z9;X+qNZEJY!vnniDaBZ+|5Fw_~tm(
z@tYdmlEt#1W4uVhv=8ld3RXwabB*yGeWp3%Gpam`TlMgZBFO!w+FCA;Gy}#uS=@Ir
z_vAfT*BYElYU)SWCPhHB=@0F-$YZ(#<(dYaDf|>HyAx7P-CRTzrCB2yWvn&%ykAH6
zip{3U##^an^F)p})oE_Z6&HJsx+Q0kd}sIZf6CtmrDl5S`lXL5YVNVjeoP7S_344C
zAqujG459GtC!69=u^jiSBc=4ZT$T9FTu8ouj482gXjtJc(l0E6h6ajqJ6LIQKb)O^
zz4|4D<O=25r+zQ2Ju%YFy-T2eF~=8BZ}S8}11{AQ3`*$5j8X;b`GDPDZlG|_86dak
zDyul#CSaQS;vy{q=J8!}r>h2WQv9G)Yxf$7<_e`Rj%<dHb8uTFezaPCuF5W@q!B5^
zG_=_q=?+X~t}`FR<IY=&k!q`;B)_D7gsIkjOv^@DGFM}{LT_L088aQ+?WsK3;9wf!
zpQLmLx_04dGo6&@yOyEF{`kD1+OU5WN3U+JPV^m1M#I^Q*$TVlo>hZlWVtHMzu^g&
z(p?lTK~&mob3MtQAa9-w#dZU#P0#v%Nqb9mFF0Y<flwukFkw@L6#V)=&HpIXjngqw
zo(~rpAE?gzW26Tz$djO^a1w3KUQ19$m@c}-s1bGUduw?62kv|&t?1X>j+vT>m^H(R
z<T`Fj+?85g(W`XDfg&T$$^4~d!k!>@wXVN$#lg&Xrlq_~t5&tX80yf4JAgXV>aby~
zp&q>8l1R}n*HXOLCj;A-T>#QR%xQrN^L+VTT~rliw}KoI{6LIPWVrt86&=&1^XHlJ
zP>y)r?(J5%zQ{&|RL?o>4=Pkbv*A;-Q+~r}u;UAWJB4s*orO`H{#ZN)l(^Pi6(4HP
zA2e-E=R^$!{xfpAh(v1Q;R!KRZ6soByR2ubu<eRwWP$i-9@H;bG3~NeqD=8W>{gB9
z7WxwiFEz#&Mw{TW?dAh?W_!Rr{W+DHOP3|U;sY~0(Qh@#t1Cnl)D_xtW54~@H@_tJ
zp&-?s;HO{Uc!7tozoGtt6um*NTfgmmnq?yuJjsvch47W9)n0$(eITlkEYKqK9VEW*
zDKZ^=3iI8hlbnh7PjP{Ats>H%c$2Ou-O>sMGX(X*%Pza>vV#a7?h`5TGCuaL12z1<
z5E#OHh-)FEi}Xyi^2Ky!(EV{l_YkK=`3-pTE6%AztS<&Oz>dBP8*X7IK!uaHO%I0g
z&<nmP?NSKp;+8R`aFlhhZud9IX_iPeTIXFPCnrc3y!v?+?;$r(hdc@}J~Ct=yrSBb
zT9l7!BEcq_6fImGiQNSZ)0Yoohj_h2ss_SnBblJt(P!MEFCaR}M^I-VnhqYTEO54w
zf{Xb2(-hyT91X<eNLL(rLqc@@?qJTEzyE}*eiqC1MRAs#c@oJTOZ#-xtTStss3?8c
zNZ1AvTq;Prw;*U62E_Z0Wtdrp4d!W3&7Vw^wLoZB`$!8PREU@9`iztQ+u)$fQh0sC
z(ETyZ^$^EPZ<(-jYaX6*7g)yOL58aR&Y;BnAp<18oA|I{;>34WuQPl0&ek6Tyo|`|
zd}dC4gW>IsVT7$HH=K}(I1NY};d9F9i!mTko8C7@#jjdjrNx(e^@n$;5V@|j?nK7F
zXqdL<h}uskTA2}45k64k<}iFXH63DmY=$Moc~Vt5nUXo|5XmQxTNsGp9$3&&j!1&P
z%7`oQBCcNHk`Vr)R+fKvL^;9Qu)>iSler%Jm#UM<uWlg$K|%<G(m?nJqJP10{7<;>
z-lI<vb!G>E1&yg1Nf=_`J=peWBLp6QtCZ|OTyg1|=0sW3)WTOZCcM?ug8b1$@sY+@
zR=Ly5JWH@t69%(^b<zr3e@>3;+(ThC=i%bsgCN46$m7nc^Pl>bm*YLDrs?kts62)r
zalZ1->>NIe_f)dN|MCzCySc@L4{{@sdTtwpXfc8#jCJZvpYNz1a=m$B@q1dlgz!e=
zwd!_mN$d!Kk(h>F1|z+DUWfe=O-~gkdpg^2l##Uf?wGKyrecdCQcA#I{lwa+vUSm2
zg{FNoW`+5#T(~ShVo7Zx&P)e70pY$hs0@6Aw`7#d<E8^K;C2GtGUNsn8AWwFj1~*`
zPW*-z!CCy-sEEIt`M58bf4VU#z@$t1!QmhQ3d-j2!~O0>UU)O(t`Pb{7-1z-PZF_m
zEf<O5$vzCQnV!eUxZ}GJboAWK8Ei&MAy(?Rm4y!y8Cn&z{6z5S_B-I1jxU}n%MGU@
z=O=9Oled$El3)>WHp|LRFcE71_^O78cWU*8ETUGNJd;2_=?RndZI9+4;P_i)XN#<Y
z(ds`BN}{!DRGD_K0!s34hxPf?wOr}yS4w*(BcTU|=NInfQHbm=f|=|_Df#QRv%&2c
ztnaopi}N^Rbvv<n9HKPlC96U#w2%{VYK9HW20Q`T30i%9zW@r%@*J9|h!F{h4{6B=
zeE(Dp9MErBfj^-UJHma(p7>pwng(K(Z&g{Cbl+IHA4KoAovNHhcT=9ppb#%rROe|0
zx7~~LDhDl#grV*RhQE#@X}-<t+71p{^qh}3W4J@y4{0N3shz;sX(|9_eV)6FS>Gz`
zf~Ek4OCNuHPpRCLxF2<*jA>uqbcO9LCA5s8i(NKVYCZm{swGb{|DXZ(1S+wz+I&4t
zs|9eUR`xuvA5xC-Sv>j362(FgdxG^dw0+YUvE1<U<6k^NGOacmNcrvT%3qK@L&ljQ
z(}Y`I2{RILr^wBm$JD_d4s7i5hv$n$UdRhDQ9~u`A0%(y-3o#q`&<6MIh}FS?$i59
z+jmiyh0S2({fu|L&b>b+-BG>o@AKkHpiLO-4`zDv-1}y%qr=4yu8;M<D5!@(;(}V<
z*zH<TbjF!PQ9m9D^jkGZrWK6xGFKji$h;ueh@r_YAj+ZNu)m$ae9?BJTlUoig*jxK
zI?|n6Ej)Ku5Au|tFOMT4$PM){V+-9*KouI6#OJCz3CDY>!Zc7Ku021#KRzQ5Ktpf7
zG~lc2vW3K*4hr8H>pINL<k5t@yXy$cR&Jzgb<^@-kxMP<AUf1R(O6FQZGFfM!1Onc
zyPjqVeOUylE_ZXZdOn<9eY%<VP9$5g8D9iRD;>y#6ZvmWiLsj(DfK<C--#=Ie91l>
zuYIPH`qQ_J7022pXJj$y@|bL)A&#E6@5w*0g;iXOsy(n%^^l>VFXx3Hr_+J4@Su+6
zB>L1#1;Cvp|Cfxo=azuTot|pe8rbBantx}tLz9CYXA+p&p3p*0sOzgHn;h=fh<xbm
zCvHS*mqg6O$K7|Nv4NY4crAlGv6WR&i>pI!P{A-wHM&p<0pzB+qgu`wc(y7J&mIeB
zYlt$w+g_>n2V<NX?|ddU!!vos^>`4~9${f&MA&)BeZ29J^*`@>J{4Seuw`t>&<YwG
z|GOrP*TX8Mbg;uX@*Ri7SD>YkS19u`AiJox1tICc(9ME{cd7Sz*Eu}<)%rH+;r=mU
z@(?f{d81Xlz}-!#H``z!?z*chqNp>ux3JLDOrke8a+zwKs7aqmBEYb~wb%lo_pl2H
z&;FWd!zuN^0(Tp+p2y-Vt4DxpXtnRNU}4!@3yI!Ckx9kb{ta8hDIuxa{QZTr<#LN~
zaT#U@R>SG$*D`*<XgJ%c`f>s(LW4bZz=9^m#Yk<Bpqx_a*R>jthdwUu^lov>MZ`dC
zyKJGVBrRaOg3$+#<>F#Klt-S!H*MjoPSxc?0?Wlazlw_ub<0Jac=hFbFLcYrCz{Gi
zDuZM#9n$g&+Xg?zhEpq@xdlz9bh4^$tC)6WuE=C9kV|&^>szu`VlLLHKr^=9L(10I
zCa_^LmaH{Rysa>{AwkL`nvdFsCiSZ;o7GPQsleZo<nuAfkyXBX0$nKR`oO9B+v7)T
z=ihxCXsmVLta|&Zq;OO~avM9h%WV~V_r5!S!~GkkTaFBV0H)sCBCjR6Wf7d-`+D)`
zyIc@;!&`j)i@Zm8@&&61>s`ubB6V=#-lve_xt0QWFt5yk6^Ub?df!MQ2klAi-#M|X
znSG)Z(Bwc$fBT)rA7rPYlz|$|Y2@l5jKA5*mb;c%wK!il?8shS!N9H^!Slcw@FDKO
zMcDD8C5p%kG5n~%kwHTJX$ce^_8e!00)f4QeSm#}zrqEo<6v!Z?t3PT1sQddmY}w6
z0eXVg@Agjs!rig&y`oyajy};JjUT~J_4kvXTMM*r)^ExUpl_&)K;<h-)C-gQ9?xzF
zQQe@!&!G3<poa%A(A_Ecip6{4HRuuc&1(S^7g+hhdSmif{@&9nn&3bDh&qaTx%D8r
z@vawCeuz021OyH5M_$nG1a$>vf(kzgpA;@LZh}rgBcIZ~tS>EBpo{Jk5wReQPpOaT
zH|L9|XVOhju}V3pYQ3ip6bZ`t^jpDQVl4~;eqMZPfJ|Od6%rqW@!udp66>%pG7rvA
zJv$(O(K!(4HTEOpXXJX%TF@d$?IryY@_qTu`W<*HdMxVPoeoO-QZDhqdSTr#Jt^7^
zS^&|0=77pyKp;@C$w*IOP}S$zryEH0MHB>j>ptk&`}BL?`$z><z1-X@z2<$s-JKV2
zE4`_71u;jM-qtFOza@!SRbQsHYXvQ3If^{IH{*wnweep3=MCpQC%eVauR__XIvEkz
z?oR<R^q(RBH(0}g#rIjC(ph(KIU>7prh{i|>W+(1T36Kf(*UXOz%b_#;QNk~K*qP*
z0vA+yu0>_{doovO_R&yn=^c%U6E@w|c{Skd#eoynjOOpIP%%C08cW<}1DGR?LWd-5
zapl48VS96<7xTHAT4RwX{6WrtwHG?T6vGOnng5&DDKhxS4ij^&s-a<0=_GPRrZ29w
zIEDG-3HUz~l0xM$d+3%p%LSVXJ`C3eREmtjIRXNM1AaEbqDk=i{wYr&6Sk+_?D;jo
z=A#3ZVd^lyTnNm3Hpl^WA_ectBWN$@)^7Ezsng{?a7fC*iVzY$+GKo9?0=^SY0G{i
zMx*S_&vLOy(yY}x1Soa`x8j3RorD=yEa^g0X-Qii=Z*UxFtR@~?M=)4*S+Z=<>>{i
z9VN>C`Q}lwBT#CtbK^RO@YU`~xeaL2e3bvMF;p9#h3F{qQ2Ll2_}QWi!9<0+n`o^$
z0WNp_kTJ5wwf561#LVCBc+0;_ND^%}U<S@#nT(rdl0*xgZCQ4lDkS_v=#K$le79k*
zh(UAvk#~_9wQPq$Y6Cg+)A$04!|{1@ksui%8Dc49>Hj<qfavH>eQ5!U7yxD!x63ei
zuVK1_($2!WQuC#1A`!RaHWi|K8B3BcbVJZZHcRXO6^c~I{1@x}MCZf&N0=k+Y5rvK
zkLKlekvOL=-FheNbc%HnHooP4h0kK0U)V{Xf4ZSPy5x?Y24M(({MEGhS7n`&iFD5E
zh{^AglEOon_}{>UXYd&6_PaGKUu`kP#bHy8Ux|N+zURyM*}{SULo@g<B9I5^kOK88
zNwlvkRx=z;Vg(>2)7589e+Gg0_tt?S3nBj;H&|st^-|M#z`itV6fPm;P=|L|?9_|s
zk^aN|@XOztcIPoT)90k%c)}M^h0bp>xdC6qTfHx67!UNO(ru<9PBndcoEauiO04`(
z8!xc~hC<s!>+cZD9p#i#o$hEXk_4{0%*~w#ck>wWy2)9NQtALxUdpZ=5r-7yy?jHm
zX=CK+EQZ&1FWO=}9;MNu{8!Y}fS4}Xi-#$+^Y6Ml7d0^OGjQl}5|DZsFy@O`MJa9)
z?0Mh;iVsIt{&<}Rm>sSi3rQze(%|=mXz(kS6%3Hjs6fk%pSO_b-#b1?`((05U-cuD
zQ@czBb5?^RBko{{K7rti@c!YPbI^kkc5jbrwFu1V<Lrr}`<<9yi~HxX>-sS}G8~q1
zg>h{}X%T@wPfTPuYJLdxW%A-c$Ge$qmd0<lvK+~A$bE9Lvcsx0IM}M|@01T6rdf3#
z4^Hl+S3>rIqmVTV?mgxZju@qvoy=8S)My3+j!^QK*Jpo%D)$8P(cr(^Crv$d%7Be8
z1j4Xyj)I@*iChVf$sK69k)8O9)3pV>MCiU!pV#EQq#sRIhH5VavxQD?)nizcNY9aC
zE^CJE2?Co|>(?nExcbmO>1){jC3E?lL!m?&BdbAiS5zb7eD?YWIJda6C0yQ|dqh`Q
zi%%@}AazTDqi3E+!Q$_VO;oe{{1oJ-#9bWTeV_YWm>$LTQ|z4{AQ;!u)50va2fJhu
zUd&IR9XTbr=%^&ZtE;2Z+YDWg9FchQ>y-AwMuo?pA;Mh1g3AgplWU&GYf{2lbV9~J
z|7(69kVE;yX#)*Eh&=uQ_hNcC!LIkaqcj+S_TqborI!>s_HzKN<w87MYu2)Rj<j_$
zB{qUQVVEX938VKOZu;~3Vq*r(;i(s1@(5}`FsPQB`RAX2*&lxpd(w~TeLF?jpsqeC
zWe2T-_SI=R#ERs#`r1jk-BpCRbM=0&K(fa<H4csQ>50@L+3V8MIl&cq+NCZ$^*>CN
zd{`6vUCdG=^XjfJ4@w{6ao+!GPp{S0=W@RO)-z*csP)S_P;V`$(oNBQBI&5o9HYl~
z;O*XWC+&;~3sqoG2j`u@Z~ABQ-5b7uAkP&}m^V)zq_vuii@R^{kU`wWLei*XiU_B~
zT9x6yP}o6%{i+n{QY1A^EOM=phC58Oy4yMP)-912PYr!6Sk=KABOXW~vR1@GK-J7e
zj7}}?lhu55;!=)@FN|kdX3nt0RVRK2>7*c*$zf=MJ^ZDQC$2!Vohxks`&q@>AM})t
zGQ0#f*VM%qQZwu9&*Nz9-H7@To6|RCdylLoUq^+L(Zw+y&6pguqaGg$^y9c=e$Qyh
zti-lQ+^HiLXIzR}uOz(IotA}*Oq}g=%NKKtqn2h262RGmql{mjs!(}-P<Vje=yx}C
zJejQam$wkO>xgd<la2Dhj3$x4=hED5_ow4p#YiP`Va+9<;E7*`UIdzwCG=n)@<6<~
z!uP6m=-_#TRydyfi=ZtQ3yXjZ^fb#~0wnK(8KmihkL;e545@#GmkYs?`<-su-RUTM
z(Oo{vaNL<TIbj_-w<fcEdV)O_l>OgZX&qr=xA)F<M~!H3b{`eKvfmF_B>(y>$Th?s
zJ5k+fc;2mPtoJLM+`3+K-oz9~Drl0Z`Kf$7T-eU=IU)1ndIV*m9?qnFTz^ydoVb-K
z6~&__Q$?G@;mWFPH9}`sqAb8(Pu#gvBra6+=p9mrNcu<r=Zsf*qTzK%;F*TaI90i=
zJWE2<Hnr4}CRC87;|bs9`#YT&>d8DY6X%{Ty(3)I>18ijlugh-qP(<b_gMsM%_z(b
z8!IsLQ&P}(Y4EUBbV`)}Ll#bnZ?&1M@yCSVOP&<;QPcsBadt&4^Z%$jKq)!G^fa=P
zUtq8N9?h_}@kXn#3@>Zzsaip|5@Y(&CZqTvRiX|VEO`gOd2QnU^CMyoj}S#$jFAk6
z<w>|LLpM^WhiG?U<Shl`U~u|BFn%$J(Lh1O@#DVorm~a8to2aAj99Uxn2kj)T@&;b
zeh81$r%$dhQI@VKZ4Yy9!X>Bj@8o{cwZDA}Vl*;+K$B3gAGfcD5?HZykRA&OdJc*t
zTBAL-Pch7l(}wSqrkED~T0i28;H?6$s`K4>Xhqe7GM#R|x%MC6ua#E`xSVCzpnf{a
zqV4WKALouKk5oiw&EAWOOzwSgiT^ps6W!zaNR1Qg5bvmVTeGrCW<E~(G%1e=F_xM^
z<hteTjVZ_SACQ|VPKFtfnE%U|{>z;z@jA+ad<0zY^pveALfarTasNvr{+D{}XSKzS
zg6+F@y{P8)@qiq=B*_!o)^Gp6<}W_uIq3#8)2wtWsA7w*O8qZC5cmf6>7@k*25q>l
zQf0o}NBZn4yM=q2y-bxVkBt$V8`S9TCoGBeC{i|#Iz{nT6Fd=*1E-BXvdHnft(t{3
zkT0fdF$w1#Bd~hCqQ%+G?R>0L+oD1vAA?FZ&*KMIl3c24_KKuwCdJCbgD#s3V(34i
zyez{aI&+KTfN`EmlD#cBz1u|R44SY1Yrp|L9L;iIc}*O%X`_}L6xBY+c}{}Q@_3Cs
z=E-qNA^5_Jvi7_9*C%ZS9^q=e#;sX#_xqmivq{ZonN^vmOh^8um6s>VsCG9U^UmSV
zSRJedcxbu+Y_&Gbr(d9HJtj|<u5=%E#0-pr9%aFSvC;i=Lryv6ZU488A#{!kb5(gR
z+GC>ZZZms~<v_EQ9Tc+NFRSWqM<sZybL4IOW1$b1nz_S8t8?WH&;D{XkXeQxqyS6Y
z@p^3s{q;m9uE~sRNwg2QYoP3}JNj_R>g<l39J*BvTZIb}YUE+sRiT;`YHpJq`$&Gg
z{XBYyKhT+VF1Y!on}eZ3`>Wu&mS7O?xrSDGCP~&_m8ZYu1FLPPlg(P7@84kA^WPjf
zH&I@XIW!wL(qeLCVNQu8!~NQ5DT_K$n01lZr=5_e9_3cTI22b-OV@AH5(10LOZ!a$
zDX}er8skjNiql@^DbjFArNaB)XVkm#W3kI_BXD}bz;H<P#P2p&qG2vmLX5y_?QuRr
zt7ARIk^9*8QwDZd>qAs>wJFvKQ%|k(PKtj<>*vf8aaf`mn4G|A-L}}(DL(U>{`34b
z_m%?z)IgAfqV+1%u;32#6Nj5Y*bGkKB`E{7y<n1W%sUdLQb9B(ozNI0RKc|GgfktB
z=k$7+53C3dVnN?mU{)dcCud_Gbwej3{Mn%>Pq}oZpd*ns!7`KRi<zW9{&Y8%9^^{J
zZp&xCGCAjQPA`a=DOO;=1_MLHVQLzkS$^Pm<DoVmPi#GvC)AwzCJUtX%WEH`)$S5U
zyM`6A10y7`6VtIO;4HM=f@mK}$oRV$18f)UGVAm_#l5&$*p77q`ukcmhfHRA@#J>s
z%B!nq=7_gKttzek(v!)MOVbK9A~FC_YRQKokO{$zJoYIXhud2uYFo<ASF<zOCj3>h
zwqjynaQgH=RWx?gJdmP_2)r;%HEq^4ETirB#Uw%&z=LQc`+TzYYd-dcLIWk^ePqUv
z99DY78GIrU7qDXbMOGRxBBw#|ZDAKH(`<mF`fZS4<UL)zZ+48Ye%H8W(3$?Jk+@!e
z8hZcB-y73LD3p1RzbPqKqDs)@(~WfIdh50hkrK4Utfi`Sf<PcnDKw3rAIK0?q8W(z
z@CNy=nH&ZN28_GYyK$g|J&%Ul%$=_Oc7N!X(Qp>=mFOxYjQ~4dGgrkiYnbo9E2ZX2
zsDOJTfLSq+pZ`oCTWl4^iE*L`#yaVtXtLgHx)I%LI4Rl{P7G+DaBAy_Vw3^%1+D=c
z!6xPrQkLML%S(3aR1pqfLwK(!kNY$b6YdVUmp$x!3zls+e4pyJfe$oThNZrN5Mwzr
z2>dcUa4PsCvX_jyP}x5e|7bnX+ESLkHv}7=8+H@jwS<!823mK<@^??x_tqZ$m@=kR
zJlYCf0>`xW;TM5jJUCs|oT$Zf7_-6cC%L!H=3+31b1lb9(zux9txfvLDdq|{PXRf=
z;Ej|bPHWurAV&wGy$%L$cG*7iaJ_&tCSR0X?6BhFOq<l1vK_UKnm$Am!);J14wR|t
zEIub3n;MATyJ#j--uagpNREbUnbN?x+}wye0%;5PV-UIP6xv~-(w#GSjmi*%uR<U>
z>f_8jk|GuORv^_XD)5jm<Ec9$)*ZlC#Mk-v*(~q^Nn<oy?XY-yZenO|0J-YTgifPQ
zhFE;J7>sLoT>w)4&<SVlRx#I6>Dan{mQJPa&YlbD*f|}gzap@28Mb#WMMyoHqQ&@k
zL>t{K(CWi??zLP_&$(Gb)PWogC0z_mANI72IsrhvRgs!(A6p*3VIxtV;>Q{^rDosO
zloetV{ieoM57U!8#gY3)`%cRR{|5{VpG{ifr~Q#6RURx~L>rFX*UfOvsBbgwQePzu
zwk$Y}1sK?nT-}O2p%obf0^x>exPQ9F?42l^QnWob-y9GT=;HqZW)@litPtMZ-Ch_Z
zSU}DL0lN$#7)7B@TYJPY$^AsZ7g3Q6G?+=iwvoJM=}wux%kp~JXDGEWVQ<p#dJ_k+
zo#nQgjUsx{=dtcltTFLvuc;Eb@jbg8BPpiakFIEMcVliH%|}VxCrWfC%=yU<q|>)C
zr!7^mv6WfbDE_G``OG(Hks0690XYmhvLUtll9nRM)aT@wfn_bO8!?D3lR&@Hb)iUM
zG@4Jklh3Q`{Pr`|Ghn8Ng$AbHRi;*Q%=~rq&<}K%1yTS6baQ?!_h4ykYhOeF{&Lpa
z*C^6Wy!n8E!2s8qlipLeSa$Feo%sy=>YnveXAN@>S)#TbESg_)8XfPhSwNj*@v`a(
zZV{6VhC7=gXj^EE92W?QM&aM+gBhb`=7*ztwu^7aM%9m<vEaq^hm;L#F%pkB%@5Pr
zPsTHnB#+lvT5v18M{yXeW9EcaS4vO(G7f?)_UL36LMkCU_9K{$R7TckQ`Qpan5+vw
zsN95@&_LuvuK#p9hqfq|6OQ<Dy4nLP>W&TdE6aoYJl(MfXePt7>E}sgK%g~K(Bt%1
zfdlG$czyE=j9KpjSA!2l67hyBL>w8nj8W3m4-%@>*6S;=CSDstWN`9e)qi)34LO9~
zt#`e3#>8fyjQ8>wrE$BiKT^9n#lv=ec@WZ4{XTgKWeS~RVp$^aqktQV1$}Ni!6UR&
z>6*c&<Yhr|2#rizx)uzKpobdbo1Knb{m7FLKL1cUl%jfFK4-oT-kxCLEqx~e7PhC=
zt$n7_;3tZbV{S-iVxE3pkQ|d2#5!~>cTt>VgpV3!LjvfZD{F(u{P_1+zcw`!%e7$z
zojCAH%iv*e(eIj4o_mcq#as!`T|t%K7U15@Smg<{7EW&%S91eF!sfv$Xbz5UA`{fa
zBN(<7d8js*YZ#jav@c~C*v6z}kNf1t7R6=vkW{C-=5r0G=VJUv>_(p@95~5h1rKNr
zlLE_AN+p{60EVcaM$+)oVZ{(VIZzV&E;Rb<xceCV5Jj9;IoiJ)=r|xm=oeFnf(!Fv
z9!`E`SZ~CTFiUzfK-DWo-DpZ-9I}Wj>WYR56f3}#|FGQbIgD7zpe{aUw6#d$1q?nZ
z0xsBcxG|Bit#X>=6a7C*+m3#=%cV|6tvEZ^Skf@|9MjASRnqqJ^tj$uCj>0Cj3Htf
zDKVC(u6Q#R5*_*r@_s6vOq)e+I&BxAuY+T=`SkHl-KTpGN$^{$sFz-;<5>m&4UiVd
zO$wU4%T}PI7F=aI!~X^b##O|k7*Bh!;X<ub3j9a3T8O2i<?=T+VU(u5S|K5u^t=9(
zvu?2f;B)HTb$QK&6-Fe@5%=7*WNiFl%}PQphP`%C=GpmpJOlc``&XRppvCtKfS8dg
z;qQLrh7DEZHorI1Pr1P%+->kr=WGm10@2ypMPC1CCN|6_i$NPmh<$9CQ6lL64i-I0
z%f}x@`C;2{xw=aDJn&v!JudYvg3Lux_~QN%-L@0ahC@AEufOM`^AQM9m|&H=JOXw*
zL&8jhb=UDBXSaj9CPYuw)^wQh#p;MTTO?Afw1^N4IuiPnLKqWUQ(W%B)7v;Y{;&d*
zHN0ry-~}3~rcWBRhgEUXx102($>&|xxK9w8Z^CFa@zwtZ^LehH$Mhjww6x8VyM~#!
zuyS#U+Kf#qqoj+l)I{VezPmsH-Gl8QQXPOOoJVN&lPh{#2-pn2As2ENM=5waf762L
z9#>=9-3V1NK7IQQq=?tf-!J3%Pz-N%!<tq-ZOcq>J34+=o(WDpJRf6NkB_?*DjSl~
zEP-I3qI)DoujtoO;BLNDQNw8}YOF(ToUvZvdMXI?SFi&bW0;Y>osILU#WJeOlLUi7
zdsT^%aZ`cK&hw7Q&xZu@D^=jut^PHCw9y`tduK>2VykmYXwHv>GIgI7++ErECUarn
zVXx7|Fri!Kd`=W2MEaR%?!tj%-7w2_**mIPcsLN{g{b}`B1d2T)aHY9!Y4|Hk~4?m
z>b%NjcuQ#VRoeFB)U9^PoJ|ejyxO_VLF0sIk^gR=XTN*zza8&89R3R^-i9QEdTENL
zX2mhD{k^=_SVxphRuQ_mBBiyU`IaEV;LvXW(A?`|{%%9x3hBm;2IjkfGHfPWotg>)
zn#~W5RhU@*uJ<CYC1IPy7oIG|tTfTXy~Dns7R&vwzx3@n#9>>$u|ED(ZZk~{Xk%Bk
zt)}rie~TiR35ogh$CJp~qvHZLSUmVo$<|3T_aB6M?WDW%FB0$Ef-HQhHhSN)72Dr4
zcoKt4`-u>$-KS{1wtk{`$xmg7T35X}+rL$NBTtk5QX9pkXiB9nHLJi4Fb7a_T*74G
zS6a_*IH7;vg_tCe!sqX-ulxt-3}8;}gm@!5gC)rwu9EGFCS-K-Fw4z)F3#{>4~1DC
z;;&%%^`ht8xtb;Zf-W+MdZM+e1l1l=%?hQ>v(1wCB;&)qVQ*Y(*8E1jTG^I2)DzF2
z&r9oNG#p#$$|+w<<{C5Qp!D3y+m7>1!>k5tXwFw8hqntJuJce?s%vtvQBd)V*RNfl
zMD~J1`=;7)ua=yUnqYN&cP*zqBwr<KNV!;S7tf{jV>)NsyGZH3a#u1av5hSdq8{4k
zC0QE3`+opAK*qlo4~c=%Gu)P@AnQ<S!nSbr`yoc#%~4E<1CG1eW?b3Dt`NR-d59O;
znK7PT+mr|bRzZ2h4~OWRl3RQzLTJ6yGdKT)#`3MjG5ejh1SJ#A%7yKeX3sQ^oY<(-
zvfOw-oVmTH=Z(JNRtd@VnuQ1hNKm)zO6mnYUpBmS%%7nola>XJkE0fOh`|gO74`BN
zikpW?jr9!+FUOO?t-WQ+^`<{+iZd;HX;)9dW7J18FRa~*tPCVrG}4lu0AG|SnChZ(
zTJ!+7LNJd~G-8*6NcBfWxZKz;EQiMm6oRL$UqOo#W+Z?Q`>v_bVu_5;ybjS@TDnnm
zxIuYS#YH6$meNPN5*l@Yn>z;#enS!|?CC~VjL^WkHtuD4Cm1P{rdOF58*0ZOYI+>G
zKNV(aE)Vw^<GiQwSQ6C-v0EWT#YA}rs9upwM1%%DKX~*+VJ5KFbb)-y{-p4b?NyT(
zP9TJOqMW-M(P1}|_lt&$QO3y;FM3?2x-T!zYT^0+eXq7^pGJuCqqvJW4kjt=ci3k2
z1`t!_p_>m2pK|*`(eZWlup_~qqYtFcXg_XVL~9IZ(+cPLp|m5Ep?n#(3SEP9&HO*P
zFe3vOEt+XffNh-qjj6^;@5plAth4l4|M2gvtU{${JUmKBX=yJmI4eM}Jiq`2&(aPY
zI%EQH5Vk$?AF#69B8t=j1<ZxpIi*N8SrZ<Dacbw94WRI3!VNppO=QbJ9cxAo^8$P^
z6Qjg$=MMpBbc-OLE$vb$XHO0Kq8Ewu4zxiLoA0FPk(KK)&YfSMZM_q*d+Bgp%!c5k
zdE*W8Yw9UWx0~~ep|dvL{(;Fnki}y=jwX3tT$PeH(ZvUL10E$6<!$CjQ;6P8$b^uE
z1maVdCcs4b)7rdhMH=MJ(jw|RQ!@tkG0#T9BZvd`_To8g-8WhLxB81hwwGSA@ptPD
zzV&RPS>0P9J<k+#W0H8<X_?($X^>#rMW7eeYi3bxu4tNFgLwIeyM{r0C}WPhi<t8M
zZBKjM;_V=aUxc>!`RQeiK=RVu_rh8NkB7m;V^GW3xVphmeAn=D$s{jz7H8L<SPOu(
z{FFR#gtcVYi%Fi^Pw?}HLdM5ed)<?z^`_vol&u0nyh2yg{$9JDnC><rA}Vcb%O^!f
zfR;EUEWZdT&H|4NGPZETRueNMenIBvP9woOivZ3BzRR%$M+$mP&RP}jvc;O+^wPvM
z$M7#hA2C8-g@5~!yi~p=<d*R=LmQ4&Jh)cqnn+;-$LdR`&fD{e%G<i>7RYB4&Z$FC
zF(nbv0!veXE5WSio60TtEVS33G>DH+b*pny;AH?{5ovSS#BlkTcMit#fCB?(6U{8w
zU2?O=oW!;!0ezJqtO#3q>eLVf?l+#^GMP(vXjsdlda^;x)2@6nmtnJHota!*L?w$m
z(m@JZF+Lt8<Q_65YS@<5`ah$eO|pD}%mH`TuSoNf&BQJLb6eHbqiy0`qxu|0#}%uN
zx;ZPb`VHoWbRvce0^15F#utBl6WVLcOh$YufPet0`6v<syDi*JyoG<z=GqqGASthK
z;$vM2|6bytV%COtALfFG^KFgdb4fR6%DQIv&e+<31^^Kf&F8UMVwRC}AMKLpEbJPT
zF4vW=czra#oGf2UzKVX1mc7?UjlBzTFhc9=Jf%pQGe&!_1Lf?@rD*3A$JosSg}@@%
zz!r!eg^S3wR~VeB+Q_DV2FUQ6jL)N@LQuYZ;JzYoSH6di{@8K)iG@5Ol7;5SjVBVH
zp1UTv?PW}$IBu{40xh3sK*GD%n;q?|s7|gFf_&n!W>=+BQ{V5FBrlR$DD+6wOr<tT
z$V2`F<ZU)ui6_WG-@#=F)!+S>My;~P2xD;K>e35KdS0r;mfOwI@Cs=032nRqfsHB2
zV0Wpbe^rb3x{Pj_6x}5;;`lvl(EW!6<H*J1IeFu?Ke2dYv#ZW^Fq1@7tctx3#{uII
zsf|n^pKl%NeI-81V_-WB2uS((os#c&w8vkjQ3$C!qar?Vo5799r@AdxWtCR|8L1=T
zBd*P6Vqbm>Dw72|DW6SylZja4^X&lA*?xaFq7J4xg6v^FEHO`5V1i{9+X*-S>ZGCW
z=#9GpKXWP}aDd^xJhnNSXk(P}DhYW9cQR2S!GnunW8!xU+S`u~h_TC(EAf)-Oy(jY
zciv73>u3x$wi;0A7;dv$AANFK;L&%ADmycP0Eg_bCkq8_B{fXRP-bkY!llQ2N(EZ>
z#h@8kda*?uRO8rJupw};?|2VH*z#0GlV9-_O+YEaZOx5kRMYS5KUO%#kl+;EAe2z8
zrKF!cQc216gnWJ+N1*Q3OxzqZVpaYK<Qfd<HnwZV;tmdEIB`Dgem%K?5dW8hY2s_L
zc2?(nGG#X+I@Q46wtfi_w-$}}SXPB5`Lf8)fy8TukFe2b{0nOE+;>w2FFUh3%7Q&6
ziF{4wKk7IB%yZ_+K8L&h2{hZtVO&ptEkl+zX2MymzHtPI?^)Yz>468Jy(j|gHqa25
zpq$YHRQ1x-h7BFJwUKD_joSj6{kUzw(`Tqeg&Or<2^rG|c6_;bP+iMAv{dQID7xuJ
zQgKq4?st_?t2VJIt}9v>j$$C-M)J(8UBhb&{<t~yHX?pSq}_d^wC*0vOHJw@oOQ>D
z<Hi(N(F$IkK>rdY4{;T-$2`y@-o?~JNVcnX@%}%@c;#5AarOacEmLS9G7$@(d(8u)
zT~>iwKDQ{+`sk&?(7q@TBW^^yl!iE)lo9oDi0Q$h&B(<p#*^wq9a@Y5BsKaX83$4B
zKoRl_vk(G20RTjAk_qQJF8%j)$%rfCcpa~`k@d4prIo@YUhr?&-r!1;D_;8mP;+jD
zHtX+~Dke0P%lHX6Ko>s)MIi69nyIA$T=9VyqwKe}2}}ifiGtj57{1L&@!=Z;;U=h2
zwF2G=`?*usYO(4JRrWNSKvtroxqK2ed66!%3GWRl-DJK4qxv>;CW-U;8NO=cz=iV`
zR|HO_W&;$Kb%C9uw${@XsI`GHP>_K%wuJt5=AnkzbM><3mo-s!^U`CD6iP;AcBM8`
z7!Fp*1(L^yoB&sxIJ|8@_G8f}1+{S59Ytv=&0O>!e|fr~nK{9|2FfuHVE8Z^8AfTG
z!snGUv=M=KL?<$XO&^d0Q+d$5t)$}|?dWptRpa`wij5u({PUrJ7u=Cutg$YvdPm6?
zwG2PIlb})T!uMx3oPmPsb_Uu;um*%&4yOD6enxj)O61*BUcS2mqDlzV@MKZM!Y->h
zWeCc4Y~3#m-R$$a5_|!3V+L~YLyK>n?E?HBpPek*J-YF+h9O$jf1ATCbk{Uaf|!UZ
z_!VdvIgLnS|AT0#<d~{Z#8bFJ95=aPFuh|Np}d5?l#MoAg3tWY(>KfZOPr7U>x2r9
zU<5-Wde8o;T4N-mf`{9(B7<+=lVxl)2+_nK4Y=|qi`dz6nRt4mDsO7UE?`T}@V=3v
z9rjaEy9S3bGk4J6FjfqOi`}(E09o3cdMGL#VE7<*!n;sVYYv#ObkHb&JF~Mxhi$<1
z#2VQw%(y8Du3nPO3A(98T1=tZ4o=AmShS1{PooVw*wzXyr7F@`oGa6v!JE;%s@-R>
zX^`}pUtqUHqSH3P6Y~zs#Adbb_JN#K;{7`k=Wx`r>LyoXmxMe*;3nfSKeh^itm`#e
zwQvoq`(=@RmNkn$`*DDd`BBTq0RfxoLLLc6eMeL!jjW^GcuNP&t}TrQ0~(y7y$?<j
ztuF{j@cMZ-c9KY186c)=A7yi(Sr4^w8Zc>5UPa`3o;$Jgvrzokw^J*8==2O^T$ZGz
zTXcFcWJ820F7eKZXV5*agpjd{TRePY4i$<j;IM?TybF0o%tfxZ;XW_1i?e02Ojvtj
z0q)qDpIb>gJmv5#`ouFCBEBhd>=e2FR));I&Eo>p@<WXNlwmh}g~)#8U<5bV1{}R_
z4zWZUk+6Z95P8iZBO3Vo`Uy;+HeX{`zQc|=b1H}^gG)mT>G%r8GJZ)}>O;e8!D&fl
z)6jEHh-(D@y^)>0#Xzg(A4{)Ts=)mDQ9l@B7&=%shGwQ^fL_a`A^E!uIhIFj1AT6Z
z?=5@cw5n(N?}Ciipv~SP?kWYU7MQk+T-T-ZZCY$+&#W@~F}^VfrBGPm$~q0S3IL3F
zF}plY-z{nH5`~_b1tlgJ5~c`v{qieB86+fLxs10ltJJ?_cA~@^^`Oq0?MMGx@#W!2
zaY*Opj)vgY61jky+%Mh~PZYxd-INuNlPgJ3jG~Gn;`a-XGXg|ZlB_vDZ*c}U57)vu
z=XxkJGU5x1)MaKSjf3uKaE|IMRCP*IfhoIFIIy~)@rxzE=fJaBa%G|dyIC5+UPz2c
z;SII2Ssj&YMpj53?=46P3jIu^*2SNs!u$4;B$TlEBjK<EUm~aG#Fv|)FGo&_S^2?C
zF=?+m@xm8IfJ1x%Y=&dkeq5wz9Ytwq*C{++@#A1+lJkwR-H1tfuyOZ7DPN<PzPTZC
zb7Ksjk6cAAwN&kkW-C?YRcPxMf(Ny_DijokxH5m4)fI0DI-&a4Bw8Kbe;G6Pkhq6K
z-%)pD_PDQd|A<FqUw&7(ct)K5G+kyy9CU(nd}h0t@``m>hCS~DLV1b5e>6PZ9yv_W
z%Yx*CuN_%+glpzzV;^!RIy~lJM(MKu@F00E-+t1q7|P8E^5*vWsRP3EjjMgw8+g0M
z;MXA)$dABcA>WW6pzocaumIX+FrzwtsvzJEg_$rP9Z<|me`s1F(}#`X5zY<8Xmp&K
z0J#)MrEiQSni$!c!KddPxWnK!cUbv*Tyo=do-vS6c37AE)Ug|g>wY~GFkS5OFdBO5
z59~ed0-c1-1n$<1+$Esst*(%so%DBQ1z<hm5ib*!KmH}lVUhN)%_CO10;4AN#-DN@
zWp{<r&OGV=k*KX@3JIc4Lx|gY1VnqBBK*fo@nTy=mW&RXm6R!_Key8zvzp_}#`#vL
z&Hr-`=k74?h3We)4**_JBbt+^q0`{s@r?VeFta0@OVMv-#pddAmL}W36(YYZ=wWEy
z=%(+g0@<=iSGB}*Ndw$iFPOG_!&ut?8enD58Ii`PRF_Ad=g8q|0-kX+&8OK|KqFIE
z4X=L8DVAghj}se8S$=`S&ciRshrU<5KF^Uui|5r`Bh{7lX3xH^4Q?k~!HEo<E>-IW
zk*B1w-(F;TO#0ZrL4%LGe|it}A$(18YnEZM#{m8=&@bF@F1_8DF$V{N&XFwz!_RV7
zB;~<57!YYYCCDWBbE13It^+<e{-Y-2(z>)p<(^xQ*}%-O$+9Ci30505%x(=DHkJ`W
z{CmNWXt*T>)fsDVFm?c1+ikm)KMu&FBpPT!ASzTRl%c-7L<o%6Xg6k_y6)axuHD&@
zKT$ms%lHpChz4ZV1Mq(lVMoy5Se!kaLg~i^??|)Zpx-F?MtN;(xg&8^YRZ>{BS)^P
zoNWBQtO`&1G;xUMFY7DQC%Tj>4;EAnkN}=(n}PrgICeL$MCl@H;R>=xKAomn{}0zv
z!j+EoQFrJGz^u$@=5SlV;4xqIWO8{ZQc&O!M*KvMax{>3B|(}8(k<p;{V~6J!npo?
zoq;JeY(aw;1OrX;ehYWX;f(74{>t%_e1m{J+cs;m;KIrQG3!h8_00I1@xuzVS=tyw
zTP0w<0?dg<x~|S9(pchvh{R71DZ!How^65+U((>nxD)FBekA(&t|sL$>k;g_;_t4q
zBv@(RSppsgD3d-G)d-%#LnFp}o{Hh06hKaF0Wu_)-yajR!Jm_!^m^>Knz&76nR_Z7
zRx}tSRd*PxBAvb%#sLdMF|w&<@<Co;&^Vh8N>?_oON`C!3%QagkNfw`NIuwIOtSEl
zOy>nC&fdF0IIrRGd|Be8ZkkxXp+X=H{TMaXft~`bak|-T)d~ucl_rlio<R^w=m>?U
zzbvaco4&c81j5=Mm~ECJD^oieGz5p=Wui{HPQOg^Cz8pEuio_((jhl?c2(z&7lq4m
zH^5Dp5Bk}7cg>!2HwL}1)<{gn^VP%Y?$p%wGW;s;W|gsa(53Fi8tN+Za@p5$SUPd5
z)flsT-X3zrKE&wxav_&^5r6YVPsaU1=^*XeV+${(PXWYP65{2Ups_7RU{AwqKBp4N
zW`bCIHbVsYq3=fGeTQ_30tT!|skuFTO5nXL0{XU<ZOZ%!3EQ{Q@N6xaR`vUJWln1p
z)gz#HrY?EsfG_K(deA!O5}f1}HVPH&j3TVdT}5#||4{!U&0X+#0*}F>L@On}r_+Ak
zP$s*=I)--HA4d|8`33{y5#-@cYW`phN6y+AhPEGIQ+)7sL{GiHwGG$JKTSxl660_9
zdVtJze{Mbx`_bT<nf+t9G4isx$!aLpMYGbb3!dQko;Vf59P(TeR_g_L+XgZ)#9nTw
z<_52hP&XoSWE8c)g4ca1h8j|f)>JlXRhR*PJsxP44fdk{NpkQ#ai-Zp#(5!FN0UwE
zejqXk4z}HEj=b*^UFy89{mbjY`Z<iauz*sGsDjVyfhB3N7y(g#B<H$qFYqm{3~_}A
zzyS$DW?5iy<F&LPe_os^uj<bBQrBBOYs#G#A_yYIvFI5UIf!p?4G{aE9Psu%*42Ot
zN#c!{2pF7VN;$fHoey?uA^exq1{$D%!X5*M_)1~qy=7r%Zzj}4chqT8;jMP)ICS{;
zPdg_k0V)bUvEggZoa>BFlB1Jln2BRh>E;kn*D_7Yy;G!u{tNtsb{3wKhaH2`w?J%k
zFiJ)O%dTR(u3({Ts$Kl_UGKt*OLVqp(6WXs<9on^{Jnop(TpmFhTNfif94no77-T`
z%VYFVUlHZ15W|!VaFdwhr`M!nXb)b^)ghB@w+l?f^mQ_rY$HY24UDaBFUp$~z^}v;
z0S#s2V+uljtbb=^Vx!b3kPdKI^UFK>p=AzPJsrcplW&+6ZC6krkr0~%4sLe*68&8K
zBU?dd#Zp|%v1_DB$?Ej8u@rlYVO-NWl01@qLVUu6f%~Hmj+0F@tYW*2JGXhl&LqZV
zLJ=<k2v=fPzmK>Hl1y=4lQb0Igq&1I?J+Nmk@lK%k@FCka@0ZIC=oxX*3bZpm~FZ<
z7m?YzwV?8}5W7JlvL)?inWSGmhHwvADe9kLF<>8Obo^eq?K0m}3#{GF+OU?MXGX*w
zUDZh7Pubb6)u$gMA06TLbs%_m`=KjDP868DN&!$s8>tb`nTly|R{}~4L5;)0?V7o+
zkn6&3)$1VNBr*B}awvg9KKSQUZnC=m+mhTcV5AJFA*ww1TL-Z=ZjH9`o5O;A#(bf+
zWf$<F3flE+)HK|E?-c7r_u-SD7Esx|61@M`vmdvZ9T|hiq&?Ul@7k2$0SAY>kv$@U
zr}jv1ly>QXV`klrY`-F;kxtx5l8E4YOkeH`Y6j~^iRzRQP?XvSg+Un^sl57A^h@$<
zH{*H^k>KqvZ3ZVQegBWGgTn|YUAGfd3K@i6nn-EO8`8MdlEtR^VbkF7q!yV}$&h5R
zEXV|X3l4y9fkC6~GDBsNwG+G9>fUJ&kViX<1US)M@Zi15mJ}r=&goIYL?9_EkwB+M
zv$vVxHmBli(%~fAXCj^1&*jn|gmOd!sVNA_9JR!=3cxcuSIXbvfiBHu$ZpBXWeu$;
z)~7&|6kqCDTafw{mzNj2Z=h(87ytR3O@<SF@J5{8s4vKS(NfXb*>f|o;k}Deo*~-q
zWOiAL<#v2I8p2KXKUblfu6SRO=YO-(45Y}>%DC4U+*GAVP0)qPtFQF^FIDDOAep*i
z#K_V?Zw{-Ub|~Aftd^VP*hASJeSdnK5t#6P#V7D`YN=4|IYHW-+^nXFXN*Ps9~>_a
zN4>XH-&$v@n?q3e`K`fm!J;RX;5*~GYl6I!n}*=wO`m!>EB!@EXr-kCvOgQ~2dx{j
zOelb`05O_k!nH^P-7P*^lnUelO%xYNRJY6hUm&@ug6dWxjuH0aG^-4hh6E&4b7P;(
zitZhr@65)+Kz^iHU$lmr&V!-*o`pDc0Bvs@Ll!b_vYw1PjJ)>oDP4Qzq_Yjz8MGeg
zCxd$O4x_drgl%7HM&1TACWP@MJ~fB!o-3T4YzC_B3lp|2T)p@o#;Y#``Q;OYw(0u}
zi(bXS%b+v*&!^o^7Ki<QX^%~jYM1!|?LOsA->0vo*BMYt@URpQI@l4e$3qPJKf^P7
zQa!YHY?VeOcXw~g&)=~`Qd&7f+IXDJi}<_enP0j|_?XALh+W*w4fI<Ikk~mthKgD6
zEJSQPnr?KuKTB!($1WNdtZziOHsFsXeM%`J1N75T+IkW004lWYsSf$amARH_UFHYL
z$G3s&`t@&~fq~bbQGG?R->|aW<CqX0w3Y}n>9iFkK4R=&RI4?4=XJjS`n``ei$%}4
z15Mn7FWU6Q=jQyelGzbRKio)`6WTXC3++cdSE0eGgz2zmldr!Nd!(s(;Yi`@fQP5g
zdCVSjiZD1;OUXuWJwUs-nFwq>8B2Y@Wo}J>R7R2#P4+`QNTyc#>N8jY)hODkZd5rI
zwDnf89%972_W%E43@9Kh{+tASjqW8*QxOP5>+Xgi$c)*01i84U{kK1Egm-;-n|+{G
z8qKyOp?FDC%*I0~iF#4@GQSsmq%AfO2CVqiDm)?dvW|QBR4gWAvl|=Gbj0~g_iVb+
zT_vD!#F01x#ge;4#Tew{u+?5u?T*v#<juA3^(;%aq@2t-*~A^x84)tZj5%%?(bMfJ
zHU674+@`Z(vG;MNx8Duh(#Uc-(B>(j6Zqk!Pfmn7Z36HPVYK%CXz0mSBRocVTsCp?
z7^&i>9nwH0mH;GT(gyD;6Lw}OeHrXc2KDWG$ntG*1N&iw_23tzZW`J^hd7{<k(7j-
z!m5hCc?}VVw)wk_*><ft=0`gCQR#A_w0fKnq}JS*;vCFIa3nt?w2hsXk8$!!`#sBw
z7intlH9F83^*@{jJQvo`43{_NZ_YV7B~Jy$o-alWF2bkUt<kXaZ7Z=v@UPDJMAj&?
zTMs=NW7c=0A4PohSoe;kgPuU|h;O7?lv3daZ?YI;$K}HY@BSWh<ize79AJ727Ku#_
z_{z|BkU1KO2DdLw^vpNvWvDVfn8ON8bM;Y?Z%@W;8Edh5#eSkjTy7d5YM~IhwGway
z!l+mx8RjVxzG7Bu&{90KRp1#<cTByrzzWg*`ggZLU*ze1vCrSJHin5A2ig$%*}`M{
z(f_LtFjCCn_w~8XD|@|R4oato2a6SbsPo2t8+m-X(U6zOiSP(N4r&{vsi;^)B3H-L
zbQfHuH?{T;ASHUioEGqT!kqbo#FjF!rJ35CUD<*BT1~@*xmo@B5Xcnj@uwqIUxlv+
zY~7pkr$uvQAZc_bJ3E*wF8zxtinx@%l9#^38eKn=H&KMde1)vX1%P$vWXWN0aP9%Y
z`ad^0;cj|B{|K`$3)<J}y`h5{I{;eyJ?bTNXii`pFOfs2nh{}P0*;)nT2Lf4?q_ZE
zt#8wsoaU7dx9wn&*FQ7_&N<JprOEcRGq5m2InWEG&J5eM4fzWTy#J=wZ=i{=ya^^b
zp?z;p$U03TBTMDlw(9KCeE!D+m`6hn1-HtqOQpN-(+e^=v;sKH=yk1#zOg8`+*OIK
z3qE!MBjSD$l^kF?&^+1LcBEd^U{Y0|18!}OSWrmsK(j1mY1T4-o^1d+K*znnW2A!n
z4z+5b+s})=UIKbeEL<9fq!Yj~!wDRl$tPBUeT)XT^GA!(8QMrfj}mvliT?>qtt<(%
zbNQDt@)o=z<nCA|zeg+!Zv)D<j(0h|TSy@SAT=Di%~6#`rkE|V4DN-<UrF#-4IYTT
z152*?$s}nre%L`PBrWo}g=S1pquze#SA%(0a=j)Eb}r;SXi+_14##BMfM?j25JSW;
z+s^nYc+NBXhlmwvbC9yX+-Hks+eiJI8e5zQFg}{qt5c*O`m)qPwN4<u@TfAp5G~F6
zzCiR=s%+`DBeM#OcTpY9z$D$94@;LAZIGpcV9@HbDvGk#8&E;o!t=4wvAPGxaS}$3
z@TbtXo#7IYDnRg?(L!7U{`-D34T3%`rb+srRhi`Qp543U-Ps^V9JKdabw;-lX8*J-
z6#_EY!6($aN5!1;vUa<PKcPXZax)>r#QD?uHgwsNL^zj*YLKgI6>(3`c3F|-RX33?
zS-JW*>;V{xzbVJVjd34CSv&Z_8pIC?m^<qA9ys;()R%pC(|-1H@G2kZdA&zbf)2@d
zZN2f7fAdoj3`gt`4Ji$XTr31jQ*pZf0a}fS@yinEo~Ac%9Ph)s-C}Ks<4Y<5t#5#3
zf@k!qpEih#MqRiJ-;m03F|V~Y2X4wR6y8&5FA;#4x2$*SmR=J!X^HFpgw=`C>STD$
z6}kI&O?!k)gl*pBzD)R%;^zuky!{9&)Ci-7OP~rNZkH0mp--jlQDagj+0iRSa2FWL
z2bK&j{YuI}ezDNvZ7e&&Ax(Txx0^?Y6+M`Gj!O!A{O^?~8|p$C^P&FPNk;xk8n$pJ
z<Yu-YOT{2e{eQKljemOgocXrY(rNw<!?UO*mXB!Mq9|NrjrCiT?Pe$Qx%L(}_?(b>
zct)Gto!SYdEkJD4(A%g8Y{4|{>MF;k_9x=h`(PUM#e%Dek}kRrwkb%_jE+-h7?gW_
zRegTsK<O|}Pn{OlvUYqOhgIN*?v>hQAp!2s_P9q4!-zyav|oqn-?`G%y^zmL|I{6}
zjR2aK8GfjsE9j5cQZRrjWP7-QoQ1PH(&w7RltH>78tdAf4;LjtK$9)&B0>(J4!>s`
z`V>-IV5PhNxPmgDXGVgb#<zEmkk?o<b>}S)8`n>DP@~9Om+3_?@In9rVWjLmgd2-M
zLD%sgmhXF_x3vtBX@Lcw8=wm^32bQYpq$~c%8h>lmiww|KDBP~oR$^T46aP<kh}i)
z-`D1x3;IJsNVV@B1h%eID9+aU>*Rk46#NG)`sf?r;ScJyc4tw$@KR|ZZ^0EzQTFT!
zpF71j`AGBb{@*Kvs_)H<OC)TJ5ZW@K7vHeySpkfxEXsIQ`r&X(dgJ{o0Plabr9_Gu
zeIT%GnBaHgRWV64z8F>hEzb^v(CK^+#r;H5X-lXfx*DSF6Vn0Eqw-CzUyl)IURZ#M
z_3ok#7IRh%Z06k$QnqZa*G}^rmaQRKq_IYZ(ks_9goKD#r=YMR*jr@X&WnSW0QzVs
z6#3^82#JJmo5!8g3Kv9TVeGuS9gX96`T^E`{W<7{<)fNE#Jn5FZe&e}K~R(yDWr;N
zZT*}F{}4Cj4p8%k`qTZuW2~<>5T05*ANH9ZulU&8cOp6!XQBIU)?UJZ)YLYg=Mt-L
z!T^lienle_oxm{pLz{HbS;^AM<Msd&Cixk0;eHkpSg)K=J^p3H-7xd+A+br_lv_Cf
zot@_QT}@7x|01)c17PUUUf4&_w4tT#A6g%tLn|D!6vWxT^8Cg{yTm+*=PE(d?zTzd
z^lc?6;aI=fva7-Mpktr@cL~~54!GQNYC0e@7JA<X^r;K*vPr`5&pDn(0a=0#bp4rg
z^&xhk_9qQuTk{?{2<A{)9utDIKB}$OdVDd^ATN$0u9RpU&QyKv@XR|zhH;VFKS!Bl
zB*fnBeUyaLL!I$0j!<NX&7wSK*<AW)4;GB2z7kkBIVFLI$ju3p{xv4h-wZ<YV4$D%
z&}?JTt-Hj{-IXm9YX1y2*;JNu2NyKJ>L4w6I7B^&2=SveF&dJEFSS_?e!9HFb^<5?
zt<NoQU)i&)_07w)tLGvYNtg=R&mZVTMSr%)8^a0-dRO-XPn9ZK?z?3yUTRn0r<0J;
ztkii3D;*o7Y(mwE&5?h-<P#)H1lgN=O>QzDmuPP*bfd#p0j(ktHaWu>D&zwz`i|R@
zA-p;GTk?A_3GO@Gy$rB)46An7_GQiOyIsZtF|c0kI@FRaXXMqDYTj(xwr3xz)m+UN
zshr)^1Z5*6C~a(+S~5US3_Ef3yG873pIvuiI1HxPARjL#@k<=2A6|QD9dsD}N~qsi
zU&Us?MNv)Sio57n5jYNqC1}_l-Wc`a<ErnS5MFitc(;6K%@S&+y_@Ue9KVVx5W_Gn
zuy8BQO!1ku@FWPb?_ea<bSyYz2$XOK=|Y;r>wmYvCTd+s3$8+ll+)8Q!eQ$;$+TYc
z)m~*3M?l4Z);VXj-3B9ebHVtKBmDU=+_aIo2Q?1B;Rzz@DqWus%D|4c16GnewMiia
z2?Z?Hcj@Y%Uu<7abQORp@(6ucUBP9T!B?|RTG>%n6_E=zZen`dgc^-_#`9~HaE%FS
z<tqp!rW1kWX14Am7t0=FFymz3_e}_mMgOh8XfgL>joY{=2(vlA&t-QR>!|Z|5xLR7
z<Dc;$U)m4ipKFqTr@F}y?`H@iOD@CtUB&uUR_=A6v{3>4MSJ+)GUomv1lGA3MhvOB
z&h<8C6w4<~GSi@>iEixCeE|LTr*hDm+gaB9fzWW=Tn@&dZz&*7`(Vy&maEsOx8Gwm
z*u2cuxx5VzOf8<=eL{Hf69Ro?id(X+A7$~7aO?iw2(1TEwv10{g6HS^k(QQ_X*V2|
ztKPvf{2xab-)3gAK5j<$a~F<!xZe|uH-EN%?>3F5qw$=Jc=@K`)7>|-G!6-~e9=+k
z*!t(RCSo69k`z*N8|t^)hW|r(K}T%7#15o!f!!M~9cp4%X#kb`!5*dG0kzlXX#KH(
z+S<<)i{t-#I9LC}mIM-zOwx>(z%H=0dzl@81IwV3Eyx-JHo~Rjg~zlVx4k<=_`#sq
zBe04>7VRr8+Iz6TiF-tB>Hv&e$$pRpG{Jl(TvD;+5awQW>islYh5n>j0&LjB!CGBw
zNo00bKs)Y2CgVG3Q9eN^^)w-yGuiS5kp_%4NSjsnff{<moY*I^eqOYXL8}r58ba0#
zaq(AXX})zpGd56f^;*M`9QEuth#1TNS{MXnhL7PEc>ztlD2*eObz8*bZsKoDG~OYO
zH~JkNs5r0j6nXmcpxGGP20lLA>DMpRqz|CB!WR>PRuUBL#ZcKup(g~;Ax=+xnB}m9
zT7E|XAXrBrJur_J+46xAd?Fq%ls~NOjz!#jqP+HKTVkVdBdASYfapo<z(5d;yiVP7
z-k9~UF5+L=o?4UX0-a^`%#9x7Yjvv?baz$GFNP^L9^Fx(`}PEA#KN>!g&C$I2b)ny
z7YLpfCLpUg(cI)65jAKPBLoP*-V1NV&xe?9q$AG;W6&l>>JL~>u#j#Iovort`5jsJ
zI3EbO%kG+D`iwX;@mT9qt1+kpo5^%q*DBMLYWmVmURYY7Hqdo-hvnctIdB$oP7bSo
zpuSD_VsCEZmt69mI{LvzZt~PB@w5zu%b!Wt8U^YC9`g!dz)7P-PML3OEYqfkpIx6w
zH_}@p4{7+6!u5&-t~*COMrX0HL@NhL*A=`d4gkOA*AGq?g~1HO?@3cXBBNznA=ah=
zd1K!#7sg@Lq!dOTOALU}qiusF@A9l*@>$hgEAha=k9nNgJapo%u>+D*lgbwT%I*3W
zkI~nvJ|~4)Y@t)mp|<rnY?w!c!!Ji`%U@A0sI_`2_-hcq0+a96!J0h<Zo4R~HYV*}
z$a!;#QMeDU^BJ5rEHi)nao=_nikLWY8o?`i@==uJ)2^5=_92^tQ#uud$<RKW6;3x(
zlppifA`Uu}@(MlzGTjlRl^(=XHiU|FD$ZIk<gKTlCy0F8yw<^|_2k=V0*&ZCKf)RG
zqRBDK6qr9$;E!(oFtB>Y`@0z!*V4EJ0-0b<<tTyCp{|)IYcn$Ca<AC*u8d<(vdgOO
zAD*M9F)Dx66?p#!Bb?Pbcj%kQAST1Jka^t>>&hcB#(LguwPu+%xLi%}n~Ku$c9T!@
zUe9}$rBZzPu)~*=YoDy2;W2OGEj`QjVF%e$vW{Vo>rRJnaSFxpW^A>+$^;%|5txLc
zQLpdq${Gq;Gu=%u(r6-gTb>UuGKLs2fX2}^<l<7&M{lti{FfP@a%!Jx@2k)bJ!T2_
zu5GVo9jeCc3=rTx2EDZfy<*76L$_#{M0`ekz*+g#3<m1!UMLtA{+%vrDN?J(5%b>n
zNP(Z&-U_TH)PPlRl#B!9X9tNg>(Igk)2%eXWAM{>{5{^7a4#v0tGy%ylHv9`Cf~Td
zn>)2%aYx-{kI2`Vhzjrvvn18o-^|1|sD|Yk3B!vT)|>L1eEMl)s3DKJ^&K&EtQAnr
z5*Jh&DTAty@MQ8}_1xv9=OLcDwoXy)d0GuBoYDV%u(m9YZhLeJ%15jXOE~ydRBk)V
zNj&K*t@j*0m)MR-od11&@<BSHo6U=GJ-Tb(3Rm1c`FL4_0UO&tK~aKlyl}+*>8qm!
zUc2@TK2-Kt7WW^OCebHXGjDWixXhtRt_#wD<0oQ<8I1Z$B^X0})b;~%op)XRuE0ZD
z3uu;;|3UhD8*8s~!Q>x~hGA*_!I~wLb4+k;oT{Zj>_3qEWJjYRkMiyxfgl{w@X6;&
z+VMz`2+yA24juK*fJRyszFYP|JX%)wYp?IU)`vXJFG>1pt0AgaOQ9DFCgO5G1xqhA
zslTfMsamZOzg8IMZ<r+=&ji1!(_$zskFjA@Kz!UX2Fk}_MT;3>GLu@%ON?-|oBdX(
zdOT~WKoMcUrR;qsz4t1QaYt9O<tbk2NbD6}?THsXm_9GI{Qr5s;emcz)+!!WR6k6*
zO*na<IET?CMfk!QHJt?^L->#l2j4`W*gZ`xSa1a<lP#v3_|Ui$3EMceYFFE(rI#at
z)(#<|t%e&Z(jP=Qv+8aiJar~tX(ww-rCg37SE`30Ael^HLNbHBxbE5DA-JrYX+TBH
z+?TALw$akjXntrUK9mhe1GwxpC@D;nB!RmBy0?ZE`RGXj!a8taEade<sr)G;<1Q!7
z^n_*ir1_AB^{Y`M70ROWHmpPBR2CApHs}XY_D4qQ6@q!}*9t$Dca<33&Z`;djyI$M
zuf{GEj06kitGJh<#&GZHJV@K`Wfo<X0)@;=-Uus8!e4@uU$fXUmI}mc%()YJOKuX`
zO=W&kcBF)3AE;qYW_H#Qb^;YBnNshTR~!?mz?YJzMRg;sFtNV6cp*o*wU`qiv~l-5
zp4Uc;ue-e}?4)IAV$?u)M>5=01#+|;nOi{%V`>?+Yhw3lq7eu>R`}{F&0Lp;^dsfO
z-Axbi?RX1D_rl}lLUu|93chT`!&oX#svDl2iK}ZgdI7s2`j%nV1MUz<ra9zNr~_)b
zKSQ*hQ^VBHJu&k^VcX^;v^>>UTKORLVrEb`zt%7T3*8FTL|pI5n|~%TYmE5shJ;wJ
z5=$WAtF$}rl8ty<)I%f7Z?+x!dFP3_5yyYA<8z7~$`Mi<skKZbrY;hk>BTM<#!}?1
z5@3AaF&0@(XMYYCEjWsC>iP0HWZLpe`Z1LcYUdrmVSJP+Mnj?N1CaGGX~>l;MV~99
zlE5GFoQ?;OTH;+X{MWbibi1@}_K;~%5Iem{?N#&)+D~cN?c6wFIYO^hVb=NbRIbSi
zet<5!@N;t{_>ZyvH@Zgd|D*nmQJCPFsvhhVAz#?f;`AZ^ItpOuh7+;jUkJhN)o~R9
zVY03D3m883aRODFQnOnPVFE8>-RhY|^t<Sm&MWc0o%b-@bHmwMT86G{u024Y#J4G{
zJpQKB8Ot3R<|QRuo<5`MWt0>{E!22!#<rK2f_7f?$V$W6F5z&PyZV$jEW4e5fjDfn
zL<vGO&O2l2Qa>21N}mNiMT=5w#!lgWk0tk^_4j^cw^QmV#4`FJPO}rZJkTbcE`g$;
zG6%S|$=}tX2m^0$-QtHCp%_BVT}QhWKF+Xwzj8pK(Tqyd`Mx){$F9#PE#E*<`_Pzs
zaiND8Ocw5KhvvaE)0G)~M>!dmjqP5=yM~g)1uY%2>)lLo+zRxsi;PE7i$&C;X4unb
z$3U{E(IBt2VEV-e#&&SNl`t4k4cl7Brnkcr+tpCDGf^~>C99Bclbt_es|h+79T)?|
z3&RHgF&&>=s~IPkjZLx}btq=3XjPBMJ=2&~lH-My6~fmM(h}eP+IR3B9a*@G&A*dP
zYYlbLa*6wAMT)n~**Uj*ZT1<slQT<`T<n_J1N8@SHBJURWd02W)!hA@YkFxg+a%Kz
z(PhV7b8cXzA@(8N@vU1^PlTjkRmhuog2*WuL4NJ0bG5LQ?g={yRMy{{uFj!yBHz1d
zd(-TY>D5D=^5SNPC&WA$nOA!u5q9sf_`V2Ino0i3P|KkfrX9*;S3BbzUv?;&qF|>c
zxP@(PgSbr>O&oj2=sq=diU8ynw-$L4R)x@6vO9?FxRKiJkelrTs?nBLXEHnp*^tj}
z^pFx(<yE_L;zm7q&te2C0SJp~TIA03Sfqf%0!S|mXBu~K9Z|H~S6vtIh6h8p0=Ix!
zhnl#m_TK<H6F>>BzUVQGZjUJ~qPrPAD^Cw=&M8^Asw7Lscd#>weDNBeJ8f)CSK+-}
zMlC{lNOV<B>2@fZ@-o=8ht0!!OM}3jVei@vpYz)d5zat^?yt--rM)$AW6sG%75VX;
z8<O6@-@NLf=2$WE&3j(9G|c7-K5=cx$lkAi^5}IUjgfDPkr67~^e6|&Dy$1;W(a@q
zhmjcc@94MB5(I5G1YZ`eKqw22G1mn>A1kPlZSdhwS(4j^+fw0s6y!eRvRk#n&F+O+
zIdYso5!gJ!<L{m!9tbs)aP}erkDK+Hlw|^Dks6PR@W;_8%OoN<h$?FZ=bh&96EpKW
zm2R2=F<!;{=Igj70yXl+X!2fG>DcRaN%~VY=&wJ04w02X`v4QoYQoqDVOiZ?0J6ty
z1F;>EB(@);Hr3ml!D?Ww%c{3ifrbi8uTAr73Y(6xWQ2NJu-AeKPNrgNOmww`8NDQW
zfX$nmCbV`Sl!ukvMi6)V#H1%1Eb*~=P&YUXX8PGOhJd#s%I4^y=Z(}IHbCqr*TOcQ
zLKgJz<?$!5Z}93W;JHeMoalHO>%hbYjbAcG$3;FmVTf48VO(*<-mVSN;rYNDz-NYZ
z^VVj`1OlGDPj6(j&Jy^O>YW53_`<kuEdI67@Z~mcCV;RIgc%qt2)-L#8#^!%ZdW0D
zH(hwwGRrDI3ZRMv3;6mTK(FW_u%OX}pGwDt;gx6NrzCT&l=16b)5<_3jyQiQ=2V}A
zymevP?$WIuJZ4Mp;h*j}Gi|D$nud$FzUHYazV&{$v#mYBlU?9hBDdxSP3@UmR$(B2
z|I`m`#0D6l&AP)83^sUucw@-x{l&k@C^(I_<dGzHzK(rNX2PE0r>Gu>!D*vYTFSBK
z`XHD}Kdo@@p(JJPtzdJhu1OKbK3S|nJ-Q~SL5Mvy1J`|8-bsKxX(b(IlH>Z<cQF|j
z-3wXbU66D><0*31n!BJgQ3CIzx*KnOr&01aPR;7oSUU2R=e9kW(tPJl=DuBq#GN0I
zb%OoH`s6Ls<e%=-{hvhNy>C?`gTtDV&cGfn6Cmn2NP|&T>$j@nzL0mT6QGNolGp!;
z1>=A>PwOSeXh$P|Z%O8;f;~qID$`QES3BR3RstW<LdS)hdH6KjZzd#r8Bjha%TSv<
zYd3SO)UO$`QLL1IjWw*D{Sis#0+J(Lkm(zfT(kY1znD8*9gf~!Iv2K^JNNlHWKL@l
z8M?wzLP|c&u7Y<kpI(ipMl;>vhmkW!>F|?+p1abq;!<=e9#$M3-KC>0TFQd^$K8@F
z(Okxi{q8?<y?p4aPAe;CZpdWC9@PJMC<A|E%Qs#Z2zryiCMG9}Kb0>@%^p~>Cr8!r
zgd>hVhL}b0-K0WQiQo63w$DAO3!h~xK9lzspp=~tobhu-4fbKH{Pwp&RqkC8pY9d2
zv6w_BIj8=gWn$vhSPp+5@)}7icmK0lIZ|0u1O~iT;viLi<{r|*>%h~_h_~PJ-GsO5
zFO=*P2gIw5W$G=~A+WrUT5=EWnl63Oj9pij$zZtw!ZjaEcH^PPJcu57GL8Le3^WQ9
zKVFewEBTvT`JQlfq+<GT!9OZ?o}wn4KvxbvxXKXvEcY7xH)xyR1}n@TBEWq30A<j=
z6h18Py4&iXIWVQ>x46oU4tf-_LDaiX;pXRpTzp-Re&0#gxasyubrPh~Sa+-uxgxPE
z_Qa1n>ATvq6^2b_FRnyv`#2ukDootWis%a%SZ|)oJ>1&>DJB3T^_0}-8XMIJW|H%G
z9;eKTx^~s2L<&g?@33tA6HTc_U8;pAukMd!aox2oLz?`wWtaB*-jN)O54(|u87MS^
zJc>v9^g9Sz$usb10kJucn=W`Emp+4(Rl$Bo!(n8=W*&?I2?pLvl_M(kT9lHLG9GAP
zwui`6A5DDhKiSqGWr4WB)UWQF=bAM=3rLF3ymk8=N$eEw4P3H#o&3lSDlys~tM4Tr
zirt><@EPmJVPqSAb~5d-M+T*g32VMvUZVYJUK{y%FO68}7=n5B^W|rynk?f)ZheX=
z^<-54F?lL!N$<`Ke>B-<P4W~W=Exs5`ksN+Y#A?z6?5ANGW-)^63{XV#*iH5qmv$0
z10;nNNq!d<ptsa>kLME;o*OzMUQmq3=9zI5MEBkHQ(+nzpu8vJuKX^=U4KJ$D&@uU
zB$`?#K-&m<+pE2l0nWN)0M$bn7#y2ZJzwsV;H+i+Fi-`L#%nqg@M9KfUumc7{}YZ!
z9v)B$h0DA9-0X(3I{=L`fAOG4bM(4T*fu-Q-#a62t0*?KRHV9ku|X)(Cqo+|lDdx4
zHI#m95+>`oOH2}(k1x8!&{8z4p8w2|>YCl@>mV@{b7I_EenbrHG97=OQR=DzxBE2D
zxiU+A#+CA?<?x^y`bB@!-4yI@r1aliCr#`FttQud_LOn+FY?Q~Ou^B6>F~D3H`TrI
zQal!4pK`HctR$P~)qot#y9yUOZaA67k0E{2bu@AIO;v{7g|&;`C8SauOu=33eOw41
zbOgo%W##)V1y5<wi7l&q1;M21>EXSrCCAg~oSq7Zpw!DveX$hZcis|jN%GzfXE8IB
zcFol8R3cWCDqfBkAUX7x0;LHxN;`I~i-+=E+V@wHA6U@V#cYpcs1cEqz;0_W)yKC*
z+;+@FcCWAYJXf>!3A<e)T&|vj%cuIg@S>9nCiAj%-h&iVZOpsZm`fb2$x@(Gclh`2
z#NlfM45mDW(pcJw+KuR>+GHnX6BBRX-AG`8O$fh8Lr`%1zOKp3kAakYGS-JVYsJ)T
zAVNk&WxYG%|Eud6Zuf$1y4&wPy8JN>;y}M(K-wwg@IQDeLMcceP+|id=1!8m^oXR}
zqSc>TLmZOJ?~@R5faSftd0u7FVAes4xdvgNRlpJ-A5{<z8sP%ML^3l|(t?7WS<mhx
zx#J`B&tYv<eacm9(16F{HlBL-&Y>y+JKmA=bT!=u?dg6_bNSC@XL@CpyWwq(DkJ8v
z7r_rGooR;vT6dmgtaN}OhB;|PN%Q_bnVy!sDDBwlHoR?FbxT7(-0A|-$`^n&1C4)t
z)!*?lg#uM04gXWNj&xs3zB_LRmCWPwAZOU0WC_fPrpl1uBGA2K9!f}PK~77<z1?n>
zBn;HsZM?T%y`?rU>c1YlF)i;iat%iS2on&HUhNNqfC^w!+X+aJ9lk_2V)usoXi(;0
zRpVC%4yp$~K_tlw9{5h&!;X53#eCn;ym|8fUETqQg!xtUlY<-!(@||DF$E}1I!d1<
zC8%WyF@c|C&ufZ<yhws{^y&!dW0mLcYRxW4ojJLut*>8Vecf2!R7LP-TT`Jg$?H%*
zBIle1N0O`>C^;dXNZF*Jca~q)0qDGm0x~-Qq=&<@Z~h0Yv`#P>OI7<ps6f45cRX6d
z&fPm880Nap|D_++H0M-b?NsAu19DE6qz?Mhs!NRGdYvah%EXFfJN^rZZYnLsqHzM!
zIK=pTSE=<GbR4Z2kgF4p+v>?q_<+_XDPQ;c2%SyZg0`yCl&08BMfS7R9K&p|9(<6L
zg%sg1?>C(vywnU*@iyARZ&`#D^gQS`$Z8nrQ+(9_Ly8Z&@U}^#a+O1WF;pTtDqW`O
z1K@2?lIH%D4h8Ah*LUa#@%ea-A2(KdxBtf4+g2A2_;luWQcrI}V&EkEFoah&1wIWY
z=TztKVAW(QJomehuh<AfM5)($$0k2KsW<kvo#fT^9O$P861wkF)}*kn=^3J<b_9pt
z8pzt}`XbzltE%uRLX~Mycuz(VBS;siX08+l7~sCb%{Exlgd!KitAP^b6|1zRCV$S*
z*HGzh(kVE&>?aGrI043s*nK6!lvm>x>ojASoKz-z#~ZpT$;EI-h&FiRSNoW2g~&oo
zV)zV|CkU6W7%iykRywZdiXiN}jiFWL59?AVq|hf4UJO<oQO<pV1TuMcHpznyY9HxI
zi#u#MivG)z|IH9O&r<=XCCp9b#ai{|Y%IGWUZHj*w7?GlmsSO>e+(~L@2<vEN+O}I
zZK;{uR2S#IECM6l+m}bnkaAbDkN^x|T3Ip<3MX-Xa#OoHCSVG)uqP1$aaptYpbE6{
zROw7ms3!z~2^f6T$4oS!ZDGdjtAFi^$j<)AtzRnlp_^A=#HVdFm_e(IHAMQv-NoDa
z6oZeF<Ny?-|D?R?T8fv$BxBpqxH59*l}k&<hoWsvPNjjvPDM^o*-H2z$vg$9-V)Kc
z)4>4Sl3kbxp+ej`k1{?DD)d^`)u=16FJ5<}<6q?B(Z$F??&Nw&@wHyOu;sj39l%Q6
zgu7htjG8ZKI!qvCA8$?tbh$oVg{xbG{i&|LfB=;Hevfxd_1V%ZJ*F8=`6b2?`f8|$
zKd1=~pkPO$T2bWDtr?`jn2R3@F{9TTh1}`+T;6Hs=n)05=`#pmiYZLo{;<xGV9<_i
zooaOU%dHekig!mhxaM)~hi5lIpPqQ>F_AlxnDLha`DkD4g*3P_pPJ3@1Qt|lNZquR
zn)BBHab-E<zj>C4*beE}bofEZ7&Rh1;$q|Dq3)lhTT-pLdUWxfi8*oo<SxDky9X;U
z88L8AUb>%48||$`MpFEy+|*yMe_{!$vU3{W8<_=2mY$>)uBJk~`9dTC1w?$(lWb?*
z7&yKUl35DRTTenWte9Vbgjf?`u?U(FuVp|w89yP!e{#TE!|S#QS>@BWecZvkSm62f
z^pWOutAXBUfC|s;>w$DOFN$N9RYu{!0E^eREN_ijmv=z@n$)H^nD%ve7C_xP5Q7Mm
z%4W_1#&+0xcUm1G+OoHa#7vb0qkzKf01VyBC8y9<%-2&Ktxo0xlZMh>HE{_zdsJi8
z3@UbO+B=P0Y<1m~1ahV->=(uj_Xnz691Q!A>#+N2R;n%o(uTURc{Xu<e>$)}f`9&+
z-$O`i?)WZ)8|4#mH;auhEI0>iXKhSJ<;9$c=hX_^Mqo2(F)SNCq5<dRUDo@lwtYNb
z(84xS{&(bZmduaZER4{`o#U>^buGA#!7&3-{|1}dcU`qt;B$Ua?=kV;UjmE44`ZWW
zB_wwFhY7A!!2L#%hi|RcRY<JW8SJfB_e32>VE{H=mM)7<s?>m)n6K2pZ6uR%UKaK{
za<h`h9d<+PH|U-=bIp=D_*m!M6T4km^I8t`rr!U%<bA%{GJ!vUhT>D{L(6AK5g)@+
zm7ccI%&g{?E`D1JEN#iaAOyx?0XP}Q=7^fMRs?S@^v9e`90q~7KA*p3oOFPL+be(v
z^UD=pJ%&l%<s^SFpn7Jb|Cb4>sf^bp8k=UeME)4_OO|@oV%87u(~^?ZfGit=YIVDT
zN1j)Txm$_eH7=};uARuz(7Q=tv0m|F<a+#`GOv8v{n%wX?i<BpZ8zIK5&!_K4H<e{
zpb4t`V@;eQHKD2n-m#%#F(0!E8??}Wkba$}W`$HmG{WztGaZDP1p4%wLl(<BAGAqg
z$cbgCP_N-uAX#?@5LT%AVQt}^G=agebk1l9I@MP%D}Ml<KYMK4f4KO^%7vT&0djnO
zf_;{{#lwBmj0tQ~T#^+$<isf*r4qcG`<56d6Y^CnU@=cEi+1e@Ge+~g0kO{lr4<T9
zaO;b58Nl)bnO(5p;T}`aMgFpcVx2*#Id1IOfM)2m!x&BxL70WyG<$Q&)fRJyv{pf=
z?y>&EW_;f2uZtnbc3I(VYCGW^r)P{qBD8qeXTAg@^AQjW9zT8gi&86XcCDqs&9My!
zt~u)BvzLPX)+FEgLrKCIzRkPvNDBA<K3+fjCEKUD=M&d=(g0@S>mu0$9{g6$mn7OG
zK=#v6<pj;a2S_XW&HVm8A$pCLKdCV4qp}b6MS15&9V{s!T%(EFmgOBMZGcD7X8I-x
zFs4R1xEgbqtKBNS?2YDP^b1qcZIh`;QF@kPwv35heum#f{E7o_<{6{5!~kuaCEJ`0
zy&W|AnxsLQb!~)$U`{_2Qe;X*leyD_tuny?c^&wDS2<Mm{=wM<DGxl67S-TDBP!X9
z;x;{HT^{fRz;;nvW`yBwM*jixX2tbEluuawS0=G%#`q+zxAK9bv^ME~sldaS_k`AA
zxd?3XN)egSJ<pblHO2;K>J|bZT?gubMTcicCht>a4%TsJS@2<*)GYhGi_E0&89*p4
z=>m@VHfSnuu62}1cP3vHoMGu!h+9J7XJj?L1Uv%4a3lD@TUb)JHZ5%-*9s&>tH3^e
z#oeNa#3~iraamjUi0<$R$7ny<o!y8jl|7uA|2mv@n84hal?HS{poX4GB^NZZq3Max
zH^6N>a!O9p8l>@JH8gN?szLd55-?u6mI^p9$e|@jv}PH48Ft6PzEB4>+(?u|i*?#a
z7a%o~Kp%SIn{YICSc$4iAd0q}&!g-xK6INF`v}*LnYnvA6wqq%6&-)fMUaDg{+5Vx
zy)|UZJQ3wKL|q30c4NP?*9RZ1uiDSU#_W6prU!!Au*o<IQ=`&P91FM5-6x8WLuH&s
z7b&rG!xJ$^ddlKvviJAKbwFfU0av0KQ8m7P5apJ0LnOb$`0&Gj`W3ufX&{u;<o_e`
z(O;Tf^yKs^`6YTEHmeZrq)!UfdmDB>1$O`9q4${DSuQ;G0i<_2&O%25%9QwH7{9ce
zZmOVc_25lBe3M(O#&=iID^>~_;}MPYloZ_ajq~_&JQZ=~e3|A*^f!Uzh$nTEp<v!g
zOLn0#h@w@HNv^ccsGU@Qo3m3_v|n5oRbrjfG(^a<Q~<aqP0#il$G+}$L*##95szWi
zU-4@yVbmkLl($vhUeAe5Abkdr?&Q5t2a!?cJ~d@&y~EYoa{08zt_lHIb8*8vd_&F}
zHSCc`%aRS)=TOnt-q(NMz{>KPln87NTFYO|eRR?s@()-kc=RAa5{+Tg1MFE4lWsfW
z9~$_5eRB!9X7h@}gw&)f8~1SzAWq@J8jpZU3UtEyj)BCU`@vdmXkEfHUqJYceYVgf
z9q9eXKiU^c^zg?GS(x5j>($^^rI(knQq^-3K#Bzm#sTL53`Zd9@*!J$5z<BbW_M{y
z0G#m$)a8S_{2p^T4cW)>_gVqh#xIz}8&UfBphK9Ejk3WgcpWu@XjKgd3FsAZlktMt
zUy;uH8%s|+`i4>E8}^5y$JO^?Nz@F>=~K=1c~cd-g9QBDmC)`iTwS^4W{6Ld&4(e|
zY=mM&_Zcj3F`Gw0aNW^C*Ev@lv(gE^Gm3``Vaz!hw4!AMbJ=IkD=~@s7!_`yBrQ{m
zqpJNI_RP1Kin0sG&XrbfcH-p{7D52l5wy%T&YnG37WEQW6FV&9y#VGRKIp<l8-hui
z?1B!On*mpF0V>{lfB|a%!NI4R>&On}2I<I-YIIT48&tfb^2gMxn+$F)3$HgW(h~dT
z)8zAXCP{S<^`+EP*Lmn?ef=mNWCW~Z=>>V^VCNMM$~nHb3sfpd!^$`P88AZvlN9%X
zT2~$!x6j*YPf_5ViGIQDTc%fpYlI0Vd#hYep9j?r4bZAMi}y-^o$NEeVEvb#hrwV6
z+(1b+Z6;ZzcbDvU5KJJB!}kyer%G=vez5#F@^cOxXaQ5|eb&dX_tBL99w3FbwE^rA
z7T4SNFcQ>Eynq+D`rF6(f4opIPrw28Xize7(HxMeDBYs)(gh$OROL+Oxu7fjAvO&#
z7|WU?bBv4j_5WeK$m1xd0(}44?H`TRB;jF2Uaq?d=+4+xyw(#nwEA278xXI}rVkyC
zDEK&!cGZhAv8<w_m0=DYWMj~3U9{kednvtwH$^~roQt6vGiAGJ5-tRLSjaItY1L&c
z=O1ynccI3R)%u*M$hd7KIZQ`l&nxeQua-VD4?CFgfiE)zVsw#-ibPuRArY8SW+hs-
z=&AePrAb3z7-d<l`d9Sdfzlz4x<%wAsc@tzi%3rg8VVa}a?D<B&}5egzKmCNP6u8e
zR0ps3T?*6k##Mn;h$DgIc0ToxqQIFPyF_~))56MG+uGRko(UY_*LeDYPzqOU^9{h?
z6zlGeP&2tTfbVZ<Yy$wMoP1vq&^zo|wvmUCxhHs!vyap5T18%U2o<j~aN7!_-vz>y
zIZcW1)PaikR!}Y2MeJ!5rom;DtY)?qFUsA5H}UeYf4T0L++!d)=|5+L&y%3D?^U3=
z03;2f--5_8HfJp4ji>=0#CT<E<DdV<&5$ZbHGIvV_fA4_M;>OuuE<qK3U|%D_~VGB
zu0dT8G9;4PO6k)@X1V&WD!05w|F{d!tZb_blR5ceWH|#$5B36CR-(9=`QOpDDZsVT
zwavv1%5<@}8k7&7s`+mfCY0Qnh@$>!amQ}9kAxN|0GxCw8m#&qTbjP~9lg&=cL_zC
zUF0(XWwmGUU3(JjPvfSiOxDlMUtW{$&%rXw6{9@jm6T>T%$9x{jqh!)^^n{Xs5AKh
zV{Wad=$qX%MmSXJW)0GFs4T1UDJf(_2ALZwqEiNH#!Lt^r9JwPgt2Ef3440;aO-7}
z&tUS7_SnDqOI+tu64yIv@IR)&i@?+3x<K_{A#rEd3T)@p;pf6Xd{yTBK!&^ye6M9w
z7||}+`<%hj9tyeNi*-kFMVvd*;s%a}+F5M)4%(;Iz=Mr2;`o`D0+)H0PS%LhvS@>=
zSf8Q@?m$Y2*Wj$iUdn7jDcX*PH<1n&n&-k3MZs%rwlv$MDHyEI_=A3Iz_q0F2Zb_E
zr%l90dgX+A!G%)voDc<<V-9awH~mKrcQeX{$q0N;c$;TsEreykR<pc%i2zJBP6GGp
z-^~X&ISHGg7@-0a>)qOKeY-cOl!tGw^~e?5<u+wi5Hy@6B)wU*X#(8@A_03ewx(MF
z;O|Q(X=I2KdG&oNt-qg0)}t<)shgOI7LgNVZVY!o3kPFL{GISj1@qw#{aXZrw(^C^
z8;20+D9mh2n77-ONwjC{`K-QircCGYyaGW)>Ox}=yH`e7d(?Lm?r?)7oqi8ppc|9i
zL^onk<@CIwHKo9LsrgZHzh}p>=(s=&Vc2ejQa@#+Zvu^uN$Dx7F*Ld$`WU;Etx-^=
zfMzsnaG=K1t%-~gXHuWNF)qFus$O*aqvr7G1t`Bk@;COomiXV(EuTBS5?|<v3i7$?
zCbsq3>3Lggo;J^GLARKNx!5mDB8wBOCBTXtgvXi7T$WPOAB&b&JOmsYDLi?(q6;)b
zeZFeEc^_(}u(ao52;ElD85^OFuS14?X<EJyW~;!xpNwP#wSM$%nRk#2Mzv1o-MSVX
z>l?2UQpJ}QhoKyql{nU|CN&(NEBAmgz?Q0L#<x~K9$q6i^X{Vq+Yy7Jjd1;ty3oh~
z0crRIahUNAZ0K%>ep^tFX69qT8V?=xvSzjpMy}R1nCk5QXyZ|u9XCHam>A|TA7@l0
z`?uMoqn49UKC9IEM-V+i<~fJ_AUnhCOtTtrxX;Bmks=~5Rv`9XWrqMHYGR!?C`+dZ
z{4WiDBg11o53Q&u(1q*M-KqVE81#lrq4IeMH+7-lEM5K;G-9LM!yuU~t8ZzD6`69;
z9vlq)N47TR#PR=idvfKWo;mdWDey%Bnh#;6ogax_dzqN!JgtIx5huFZC9W%6w@hAm
zW8;!P22HmISF$HK$3v8N>1cO6-H=RQ342mp74z>&cQRncRIHYd2yVpvNxX;1y}P-y
zYU^kI4;WSM9{z!=g)Gi4ntn8<MXvZqKn;ce(S8VXb|h$-f%Z=+I$S(^)AMSO9+j;t
z7@IX#^}3JMB|Kz$QzYLLfVma#Qn#s8@*5Q3!KdpdpdZXc6hQjVLk?AWuguCpkwFFq
zn=FgD4=_#70pnwH%E`O*`5Oc^t4&F;QuDeKqSaCW9u`D*(`WZrrs<aPLG?64?C})h
zRW?MELWlEiCTn+>g9^o@uZI$!(VsPUOZ{u?_4J!iyyGmv0S?60{;FUXy$qE$mX{jJ
z<6tp1t`h565<Kn*#PDIn_fs$Jp?W+(0TLPiSe-A&Tnlj;T`(+jJ5(sm%_ZBQO%6r?
z4JNgHb9)F>|6Qib9+xf9$Ti5C9r4E_tFeEM?x!r8&~l{^9IJEC@-JG4nDk9#k6gH?
zf;d8YiO|Z!ylo0JR%B6KLjp7Nqrf;5T4kkN9>T%T1}q$dc0Kk_YX1DOeYY{Lw2JgO
z8EyWv=NlQs-FHQ{?^fb#-v9Mm8?d-hc8I*tDVLXjID9wP%S^On#a<$|XgxM1;-s*U
zzXPK^+9Z?xNaLitbGh6*I)<bJy^tcnFji6<w1$2dyG$qH`jA0@8~e!-rQ_E04R^%w
zQzW0{Q>XgK`>-HV#!9;dgmKpFf$&HEVmdlX_KJ0x+QauOLNE1N=PmV1YT$EUtBaJC
z-OWQhh?<01^GCXjbwGcNCup|IPl#SZbf<R;CR1!MH%ZiY52){pTU|n+p@&jo`Q_*{
zXmAe8zPxKU@CXYa&mS}V;c3G<teHgZF1Xe+UyHMV?Be~yD;$Qid4<o)B9tUAXj&E7
z=y_KqO(*(!HGq@V=P2C93PB!Sx7KUM?s2P1%if`|Ao|!w8R=AP-or+dV88$rm})7z
zh#@^=T8DtkRTP75lDIN;jP5cl67K);x-|i4SmUvEhBdM8_ztHS^r8~Z0Il|0%J$NP
zO`<j?&Xqo=#!~QflTSp(YGmwuncpI4l}_Ff_l7738_i`|mJPf(Y{d{t7j{iZ;OTM_
ze{r?Ko@el;TZ<(~=&F0a*QLKx)SGe|hnZup*~<$s$o*F*?2Ek!0?AyG%L1>pHJ_pR
zLhO<LEjToT{W`^x%1F7VeSu@}%Ln?Go=l;G4mNL~&>N#vQM7K;$1MZX7K0Q&q7;{m
zcj|U^`Dld*DKJo!4!>JqQVroB3fPs%WaNWv9v`ma5C&mh9R!`F!p3tye^NaTt|6Pw
z7VbTnK$P-{dy;_>U!^O9aw5@MemyNV#+`}ozhPm&vwD%-zdIn_WF@T)XBl!HY7GpE
zZ($5_2G<{!^eo3r0-j_znXPqZw~b0#&XF^(4S%4J+MVNZF${@tAAV<0cwSX%jH*dZ
zr^cam*f&6sY_nG^<8w4aDgM4<a?RD^*KVECDt>SU1ZA^mNHvxtuWL)uH$g%Fms8tk
zh@x~mqp%o>7{&(R;08hk6cWS@jh5zA+MrL3(AMy`t*Lv>tS5bIO5jw=iicEYNfxus
zz3c7`w-(N0OjU1tldsqf*!O+u_iq*XVMK&{nS_i_JXHG8Podp0rJN9=eH(@?4B#5m
z)(hcR%+H~%7qOakx2kw@CEH?CW%pWa=39WdN}U9pfrA>erVXFLlsaXT8+3d}j%5a9
zl3Xg67`miqM~fuzO&TFh-S>n<9qLxRD`;U;Jf3w-vJ<;(9Dn+%&wu(AR8D@4OJc6Z
zVkk$!P09hXe(fi&4{1V=6R=RXtkJMJ(J%9BLqz7Vsmx~1sTe#S)XZd?nI*^=E>+H;
zM)TvdE1(VDK|tXeKsHOsAlAv4gFhV|OzFcyH<LFnuRbDgVH1^@kej+lCXby!&>Brn
z{g;gI+rJ|}SrFdWZ)d`s#>~wH+#l-e^;Q?vc8E2Wp;~n%;XRR|i@2DlxAkcc<6+>p
zt=6>~^(9Mhx%xD3_>~G;1)N5EB!nV%ZO_QEK3Gj8nwd*irB}rPUh^z;>FIb2|IH+V
zCABGSKmY<RJrrC|VwF~tRJ*2hY&P)B_K0KzX(lZdP$~y89zRX44XG+<B3>5Ba|$5|
zx#_{We`HKKi!MJR`va4RZKFDNw{IGEXDR`zN>;0EdZZddMwS8CAXs~I!HAo!U{obY
z=rJ@NQih5@+Zmpmf|Xz`RhyTwGe;o^uaaAW6Hq|a|AURgm^s}L+iFp@@W(#<q5uLA
zUl6uEO<FxSxpqnuNXRB}SYc-^BlI;}3gpzBHA(?Z_~FtFzAJD+DMcXziU!T{@nz=E
z!U_aYHjsWR8|t~?K$%5D3L;qEPv1o@$AynAyNacp&_1bl>vfOCH+VY{&>)$~Rsuh`
zZB(L*s!aO776BwMKg4E1=<7idggJl(EE$ysz_otGYC9n`Rw7d3?I+@+`XGzIzY_$H
zz;Hj!tzmeFoN!A4f$4YBw!ZBJLv))_B21NcDf4G;tnFmp0nTCNAyiOu<i?szvw~N?
zZga|Y;YOWZ5Ok?S-wTa^v7|v<>+FK3;da>l0EKqGEdkC%YSl;a{n7_g2K&2}IqVYo
zM+jJCofz=--!!CeWVDt~_f9OeJ#fU4uMS#j{K;jewsFT$69p~%TOIn*#LzVHgrKdf
zE)r{~&{CwT_rmBkU={@CAAw@kyd6vYbSe!6H9qU9vTec(PcMTrvU*-zAQTJ)n9g~Q
z01TvL!|zsVvODX&=!GL|Ewx%;%GC8v6CaL+m`U0#rCV{yno|yjH-%7k!kejo?i_(|
z>dSE&QpG6Bvo@uEYvA3fWC!bt%y;KqUWl=w#MhV33A!*#TwfKlkX>*Ie}P-M35*rk
zZ+Cw?8$t&9Cpo;3O)XB2uLidTT`;H$v_x<P6()!P01RMr!&itPW;rYTEVfOQTuw_3
zv`3q&|7RXLF%X5rm-4T4SCxaG+E+cXi1*JzPl^7Sv$uLh4)KJe=YSpnTU)*qpk@`)
zR23V7%^BN;P_!w+tq3qJ=C-fhBcq4L5?@u1trRc?ybO$qS)7f+lXNb%li^YnpdcE$
zd9y(pFWWF@EppBgP3@PevnFRtpLw}=Td;!h73s%;*ZG%;ADeY<D$HBzxzojbKRA;k
zNlA_I3kY~jC8D8G)uJS>QhkV3*dqrQ;>b5rl}raop#v$FM{5M$FvoZk-*y;=g^Hra
zpvk11N$}B@!<gY?p=HR)9=wOoG@tDX^{TxL6Q+jf{~X=jT|}Zfim-GYyLhNAiF5;z
zA48#-Lbol2KUxU+0*Gy_76~ggy2^r=XJXz+{t~p5((gxk-^sz7t<jH>uR`y<S@`GW
zhWyZ>w=NaGqbe0|Zpgd-<UoU>AOHXW0AKpF5%KcyymAOMXCANqb34KqRPz5p@31My
zbY!7%>Z5XlyROgXk%s(j>9YfYzyz){;ff_|$p5rw>z_4ki66?fZg6lT4nMv+Xo%M0
z^zdu7&Frm3TCZH|q1bX<5TP4-n-1*__u3ovJ{KS@na!#=8)YMg27}YFXIxvqkiF0(
zawtKE_nh4GUs~o)3IQu~EYiEoBa2gO0{luUgjl2ot_V?ot@pP76@grwIq5_^*#XoE
zgyOTfNHS$ev1rU3mN(<6YY3~(i<kn5U;qFDnZ@xsK_TA`_huiud5#+xQ_fzv8?cPC
zBI7UPRq);nF92V0a7L(Y$QV;8Yf)+4HdgB->4+g_c0SRW=GjW2s*4x|Sr#R6wT@sI
zn1Ohgaz_QEpG46Yv2hifCeXuyQIc<E#pt{?wnoVTdP>J9PccTiLXF7jMaN0UDBe6}
zyZw#8KeY>mv-F|kwTI4~iOO2(uK+0B!NS;#A&Kn~l&x}38({T|G+t6$pS%-aqL4kT
zf$Pyezy<6w?iz4|PL(@UE1f%{r#%{G0m9MIl7ApvfOyr(j!_{XJ)1oL`<<;<U8H^P
zZk>#tfzPXHOt}kRUJ->v-M{v!w$F82b5DqLd5FYXI^Degd|XnF6$XsMyzZB;IH4fw
zi&ZaV0001678MUZD%ld1a=l#WVQ;K_7JB>*%r&%d3@X8A6(E<E;+cG0)Kx#2AX}-T
kmUY)<vj6JW531pUx;f{}1VkK-O|=)I)s}-WZ~y=R028Kp_y7O^

diff --git a/boards/beagle/beagleplay/support/openocd.cfg b/boards/beagle/beagleplay/support/openocd.cfg
deleted file mode 100644
index 64adba40393..00000000000
--- a/boards/beagle/beagleplay/support/openocd.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-#
-# TI CC13x2 LaunchPad Evaluation Kit
-#
-# Since BeaglePlay CC1352 does not have a built in debugger, we use XDS110 in launchpad
-#
-source [find board/ti_cc13x2_launchpad.cfg]
diff --git a/soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig b/soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig
index 9e9f3cb321a..d1b2fc58bd3 100644
--- a/soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig
+++ b/soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig
@@ -15,7 +15,6 @@ config SOC_SERIES_CC13X2X7_CC26X2X7
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select HAS_PM
 	select SOC_EARLY_INIT_HOOK
-	select PINCTRL
 
 menu "Customer Configuration (CCFG)"
 depends on SOC_SERIES_CC13X2X7_CC26X2X7

From 9c5999539262e40f12e441ef3852917d56b29e06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:28 +0100
Subject: [PATCH 1421/2913] Revert "[nrf fromtree] boards: nxp: Add
 FRDM-MCXW71"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ac4d00d3420c7e88e85f001da1261434e29c7bea.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nxp/frdm_mcxw71/Kconfig.frdm_mcxw71    |   6 -
 boards/nxp/frdm_mcxw71/board.cmake            |   6 -
 boards/nxp/frdm_mcxw71/board.yml              |   5 -
 boards/nxp/frdm_mcxw71/doc/frdm_mcxw71.webp   | Bin 95412 -> 0 bytes
 boards/nxp/frdm_mcxw71/doc/index.rst          | 141 ------------------
 .../nxp/frdm_mcxw71/frdm_mcxw71-pinctrl.dtsi  |  16 --
 boards/nxp/frdm_mcxw71/frdm_mcxw71.dts        |  62 --------
 boards/nxp/frdm_mcxw71/frdm_mcxw71.yaml       |  15 --
 boards/nxp/frdm_mcxw71/frdm_mcxw71_defconfig  |  13 --
 9 files changed, 264 deletions(-)
 delete mode 100644 boards/nxp/frdm_mcxw71/Kconfig.frdm_mcxw71
 delete mode 100644 boards/nxp/frdm_mcxw71/board.cmake
 delete mode 100644 boards/nxp/frdm_mcxw71/board.yml
 delete mode 100644 boards/nxp/frdm_mcxw71/doc/frdm_mcxw71.webp
 delete mode 100644 boards/nxp/frdm_mcxw71/doc/index.rst
 delete mode 100644 boards/nxp/frdm_mcxw71/frdm_mcxw71-pinctrl.dtsi
 delete mode 100644 boards/nxp/frdm_mcxw71/frdm_mcxw71.dts
 delete mode 100644 boards/nxp/frdm_mcxw71/frdm_mcxw71.yaml
 delete mode 100644 boards/nxp/frdm_mcxw71/frdm_mcxw71_defconfig

diff --git a/boards/nxp/frdm_mcxw71/Kconfig.frdm_mcxw71 b/boards/nxp/frdm_mcxw71/Kconfig.frdm_mcxw71
deleted file mode 100644
index 1febea3fe4a..00000000000
--- a/boards/nxp/frdm_mcxw71/Kconfig.frdm_mcxw71
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2024 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_FRDM_MCXW71
-	select SOC_MCXW716C
-	select SOC_PART_NUMBER_MCXW716CMFTA
diff --git a/boards/nxp/frdm_mcxw71/board.cmake b/boards/nxp/frdm_mcxw71/board.cmake
deleted file mode 100644
index 27c59c8d358..00000000000
--- a/boards/nxp/frdm_mcxw71/board.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2024 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-board_runner_args(jlink "--device=mcxw716" "--reset-after-load")
-
-include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nxp/frdm_mcxw71/board.yml b/boards/nxp/frdm_mcxw71/board.yml
deleted file mode 100644
index 2a40433c84b..00000000000
--- a/boards/nxp/frdm_mcxw71/board.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-board:
-  name: frdm_mcxw71
-  vendor: nxp
-  socs:
-    - name: mcxw716c
diff --git a/boards/nxp/frdm_mcxw71/doc/frdm_mcxw71.webp b/boards/nxp/frdm_mcxw71/doc/frdm_mcxw71.webp
deleted file mode 100644
index 25c7ca3feb5f280564f684eef66e02e335590af5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 95412
zcmdqI1&k%Tk~Ub()y2$=-Nnqz%uHR(%*@Qp%*@rr%*@Qp%(Z>r%<8?7=GX1JT4|+C
zDUZXEk+zTRw8If!$cqUJS2zFys0i`PD$BB}LID5(;QzkAzyZ8L0K^0YWMP1QX90j<
zEDS8|f#3lEEUg^u<VE=LRn^q-!Pfx*0Wbi70Vn|2^bG86_+(`z|C0XSugAsT(!Z~{
z?|+r`zsvj|xllh1?G1iEegA!H8`#)60001L{-&Xw9c=!hO@7nJ`sV+lJ^rHYemC$p
zKjtsm_`m3af64q8-SRIPMR|eWGULB#UgQ6u_5XwZ?|OfW000}%|CRi|dpQ`o{BA!0
zfG|G*z+Zj(U#0)Mul~&gM*ZCchTmgR@Nb@V9smIA!*71fzj^wp007N_008K#|K<_r
z006)R001;i893TG{Z}0Tn7`98z!6{r&^QQl=tp=S6gezLf*Xn$dUTFBVNf||tqXG-
zH_*`9G>;0?F3-8X6WXt@-?IeY%?=QN_7*G?kP-mG2ZXy(y-0?Pgy=g_a>+;zYN)Bz
z<?yH`C5E#X!W7t)>v^l;c1-2fbvFYoz~|mp{H)PdG}EVpwryt;j&cX=W?fgis^QnU
z_o$b&`{2ve?bn6(px3G!_>1@ASMuk}r~Sv((^MMVMA!Ds+*0;y*OFWM`>$)BGw*Ki
z%#Y+(;E(7J>pO0`Pv;M~54c;N_%8ges4vzpp^v#+nS;5DFSD+rXJs4jbDl@<j7Nya
z;B)V%uKus8$M@H*_pL)ur%$r?ug|MnZvdUyua2*?FM=zU4;d&p)kmNY|I@8cl`reZ
zuiGyVu31lwuf7lCcet3X6Q1?2i?66Jl{fR7udlD&p`+iw;X5J`&ghqP>jo`Dwo!XH
zgB<@q$$p;?<><2Y_ToYoU=Ff`S;c5zFfp2*$W8y_?36iTG`x4^Y$*cgiJCj62(jKC
zJlr3@{U231R<C%U&7bo@mVR+GhC|LkMDgLZ8Li$l?wJoRMOI^JGq+p1{7H6kY(*kf
zpK!gM30gv=vj@wp(BAoJ<4|A_ANQaB#g&U?xzv(0Boay^2b@8zI&oU2CORI4Pngp%
z);Z>X)T+OPHE6iXq7f`D>)bhnWcE&<Mb*AC(g#4-Ua+T(=za`qSJ(f;&i~zg$(C-d
z>CkY#P62`;D`FcgLir7^&F|TqddUT`;nuDg{m{Hr<KI9Q<D=h4hE*npiF$7sQLCCa
z*2)^(0vAJP;rx03@w{$+nynu1NPk>I|Mg|wn4=u5;z<x<)f&-UR;^`b4G8a(l7g&x
zJgbps!C$5O-2B<LO&!mU>FWWqW>Ym$yh`bWgAU>xDe2J&iYdu5>{z{gErb`Q?}1^6
z8Rw`bf$V+r)IwvUz1`8{?)L<G3B8W?w^=23CL_iuu!3d}N(BYn1%!CbW*t5ISVF60
z$gNu;YB`Bcz3&)h7?)BxucGZ@uJ97sUla)g9k*DMCKZslSvo&NslFa#j`L%G+$%*d
zg3D2WRwRRKyWTsJ;6kgf{<B#)Du<jv15h&6vPiGWWk--DYNxe{nOam^;YGAkCFLN$
z+#9k#U*Wbtn|d`LZ~(j|WuU4^vWZ@lIFs-lx?%JU1bK}+lG^7p5W+uU8;cK9cNDB@
zUM210rI)l$bqwg1B7jpL@c56vQq%*=WF+$ETK}L?vgZ=+E<g9QELU2~M@y0d5VBLd
zIXxl~@s{a%BM9sXqO+JivoEQ`KveZ|x?K<AEf1yD?%Vm7UQc~yEIA$>$LKqchs4?j
zs4p5qsinK9EmXUR%cx5Sszwh1&0BE|dO1AkV%>i*Y>GQW!RHP2D%hry``>{t8SFNL
zYH`Kq(WN!s=B8Tt9+=_s2GWxsF0%E@fzK~ardvZC?Bc8p&t^o8^P;|coyuM6ediS^
zii>HM`r$`s=~L4UG3WX=qFYoKz(JtYSFCh7>2!pPiV92%_-n!OEbEpInyf5rwk(h@
zpF1Pa$I%O0rb`W3cO_f(&zG#JpB^kQx{8MjN6EN`^6VQmGnn&Uvc%|GRa2|P@%R^P
zY#V-is6m9idoX^+LXWxr+K3eJ1E>8GzX%Fu7VakHTxMGt6y?1t)kWbxSuJp>HRMnl
zVq=(|cB)0fqE&CaYSr<8XkUqKHhq{@$E`^3>wZ``R%O`amUc-P>jtK$jki!I?(tc$
zKWJ3-e))~4zLT^4`Ib~kw9{gMB;~%y?pH(JLnxX<u+5!i70+d6FN9&Ocjsqgz878p
zgWw#=vs<X3SA}5F9L%&nsp~PRXS~#CHkRCowT(7Qz;Fr&A%4r3=_Ze-iPJjYDPUT_
zR+&=3^lW`9@C5rk(^yk+LN(ncSCfyWpg>7lag?ZXo!7u>JG#BY_2XG}%3@@2Wl5VO
zxcaS}8p=JxM9tc^BdB)2y}iod#cSgEIHNJEA_N+3{EeV{M!q_!yCy^C54RMZZ(TH%
za`gx^NI4~@#@~Fbcx|u8qj}F|h^X%Sn_m{MJR-ESD(jou;{%2r5HWgBktyNpA46<k
z&-ta@VXY&E4c^Wfegxle_>Z>Lp)wg*`=Fq5opDVoK&TgPbWaRHKep^phgQ`d8RVph
zXS!IS`k))^5a0?bYIinRz3r8q3(iG^f+bg+?^;fpfosScSC)!Cw7&*bRcw|yPFzrH
z%f2kf)vxpU6ZO%N8$*^<C<h#9!S28-;Mq-<m)qtiL5U+1kcxy`325z0a>Bjzkmdj3
zc3K^b4xSy(0{{e7#!aktg@ci1RorMXtASQm;1PPEGee#>6PC|FI0IB>(yke19AFFb
zd{5%9E?H<k&`uiu^&ZH0bq_-q86F&i_+)Ix;R+A_&6x%%H4U=L%sV*f&I4e#*n(lm
z6nI+A>D>^Ibf?`IpS1eY*Ao^3zI7>*W?ed%n8_LxLGB}pG==Se2qHP;$KLz$;YR8}
z5qy}i3xm4%y`-ws(S$74bv=lTRb09IYBFh06;G}eF{lDR%6&{BHNv_&MzyP$GZffR
z0jX?yBlbCuQE&Xvr#9HbLcOk!+n;DB^}gmP3(&7Mv0Y7^{*#*`zFkfB)J&_09EKZW
zjO!GZBmma1*pk%z!$UBM(;p^#WXeocimc!lXQmTj5F0!nYgtnHB}ee03}2x4_4Pes
zL3|dYoiwyzdA{tHdn9V(3-rqGh(TBy!lImC`{+4i?`S`lw5`mA8&LPs-@nhZfB5wj
z&^cPyj)@_di(wEvB(Eo`;2$8!X3(Cl1wGu=gAVT_UsxGJ5kw7)^rTs*v-OS5%G;=x
z?VC+Y5I*8<Q6Hgi*Rxy-dcfq?Ka`BWB;U~->Wp`#deeUzzK{Ly+0Nw2qQsDMfyfMG
zL42I~kInp{nl!_X(}y*1>)oBKRKLLrcIOS+du+=@xTWkp8!pqI!L)e5Y}}$?no!Q>
zoe?mtHTfaMp%sVq5seYdn7OE73o!h35M`}!kM>YYWW^>(Y_58EPM&3n#t$yGnUp4R
z`n1ti-45w!Pyzii{A7rB8V`#}sNyI*;rST9)(3ev71-zMof41tFtINDXlz$B4CqKr
zVKT=!Bt(LVi^V_gdPA8b<5Fz`5VwZ)VEeMwdF6*0u^Y#>W`+>1!(umr!ifp$;<RRl
zv1JY*!2duU)q2QmIly4;?zF>=C1$svf?1M==(9K|Glw0O7PNo-3BVW5@onT305&Q)
z^Pw|XS|v@5Al8oSB^r7Oz+=4XBZan4@DgW*&eUoWPAPgyYHiv~9WCz>dz#k%aL`70
zS1!&z(Z9va#?vkV%%}p9^INo7cY&LgvbJhZuQ~W)I3J#-=}UJ8Qq>CIO^j>vd@%8c
z2NTKi?TY0v684($<}K}yHjJ;7{ZjT8YTa(89#4vpcx*AF6*PjzC7-$ZJBPgEne--Y
z%D!O;<Tm%#FN?XQ%QbK|@5%rgqjFOW{qNUMwgIKX%6LrX%?W)eElSc<x}@cU;<MCS
zr^7D&!2h90|8FXMvy2g+`r*O4p45iXVL52tB#K-f(O4p5;mNFW>mGO{T7u<z{hKhZ
z1J5FE&Y%nk8;d?OG)g*#rilVL+~p#t7i*}uxoIOLcWgm-5U7pOz5|uvO*4!7PQ^lg
z1WOmQ{V}j@;gYkKZ-<N_y+>EjBufo;dN^u()PypEpAN_Shpcs;Ts8e^v`iTtj|~aR
zSd?}YH;j*Od%UvPkRk4S!{i;{j>Z6ASgSZn??zAech|Pn5-T#P?y0wpXhtms(b0->
z$}MWv1abB~1Drj!$=+Ig$*Guw!2G9IO<Xn#rLXvEyXm4c2sz>BKTu}}IhkpXuAt=D
zX*f>Z(G#FVzf%mJr7Bi2&dmkY-56~;n#R;LDCX-D69g3MtFMSSPWO?UxiIa^^!iK+
z_@w;eVmxk}xr8D^xURTgO?>$A{tXprsz}5D%~*I;WQ{x_FgnfWVo03b><(gT9uE^(
zZI7A*E5dUN_E|M4!Q{+KQ4V&lJfX3!cRXaYn!pHr<U-6*$x%FV??faz*%ZkzShe;v
zI16XT=dfELSp{kk@X4$<e!!C74!dy0xm|weo^ACubEL>pkvZd=fFdBOOf6sm*qexY
zakgSLcM0AAx*IfOSE5M=;f$UV(jT0hoX;tHOHLG7BBv3)kA&QI^{>i(Sby^YEL-`A
z7JM`*aU>HDj4G~1Im2GRM`ugTbX6nz^_fu$_5zYB&se>6Qp&e5Qxmf{NRR#;q<`M#
z-oz&A0M2C1`pwmv!$T4hDe$s6R!&?S!^_3Y3eb}V)vC8hYl2-VlFLI|5sgzcTSuf)
zv)Ax`x4$*(ohsoM>KpXlDZkyfRaRZW_e7-$_hla{%I#gp7c4)f=PVz^wAN$)YMhx{
ztRQUh^@|)}J_-Y-5^Ycj@cAXLT3i5@192wtR$*oPRs$btcSyGTMMdnRCawha*9<HB
zPl@Z2m(4#oORjJLiMg*J>^d+lUTB6!fvPOZmO&}(w4s7WMBC)vfJAtTtE`%eV=<<9
z001@25N!9Z5%vbB=`JF&{`jTDP?)oDPM{sj0c$u%a(NAsJEv0mDGT%(Kg&MqXNi#X
zv(^8oO6>96#XHGeY1-z4slm~cVFkBQX-pJCuyMLibTCG9Y|ZZ?`WZFcRa%J3njQaz
z_6<gBSbl@*;)`Ae1LM~-XtDE*zQr}oHg;5XeACULqL9-DL-o(G5336hw|grk9?7@O
z&zlm6&R6G7_%y1W?+kx`fUcKpQ&eN?B0=4!uX$dGZ&qU_|2hvQ$oayakhu9p<JUb`
zzlYki;=f{1?zeOdrd=d{jbvXtHqsiYr45&uanKyU@mXS~w9lM!Ee|$GMpgjJjjS1S
zjuk%<!~U~F@em(`RDhyejL^;x_|T;vCxGfkTr)m{zgWn%wYZhXIr`vc!bf4#@eX+*
zLWBGbE=J`?N)=lHxz&RP#+3xo4Y?uU<Zz)Lu&!R@>j12bTJgm=5qfYjEsh`uDi_@?
zhJy&wkn>MGqrJ+r6obr-98n&jE&lKMWkaewEq1Kxs&7S>e``sgH!P?aHW!Hp(frOO
zq-(e#T$0T*zjDRG-4e=m+criEj7T%`>DZ+Bwi}kHf4qj7yOEPJP*}>#$*)+qHoxh7
zh@t4-TN@~tv<(l!1q{&6j5(~5Z&OEMPA-ORv}}(4-h|zMqWX-cAnh?GM@JwUlUU<m
zp;-5YN;)3o7q$^yho&2u!Z))D{7QP*v9){Qe<!Re`XE)fp}vL9>7(}OnrKX}l{~^<
z6jc`Df|??v-ae{H=m~RxThTP_K0R1dp~r!3Am#GPh6x<otK9+!22jA|gKutKx|{t6
zwkvwD<Wg7jwfSPSokF_^r;}yEYW*^C)P4Al3E$~*lft&ctUYO)nnIHRy_6nJ3=~2C
zV>U^z2afTKm9r>9Ws}>{m-=9KWblef!eZ>6t1-hP2WTcv){rJ|Lp&9S%R9JvB)$q;
z3To?y+$F>PCuT>>X|$Cml(fxYZoD-TZAqS<7d8haS55;UPoac{xbBXIwwdF#hLg6|
z*xPxyOdaU*!c%F$n{?y+flFt6dQR4_?*_ReQK#(3<I2`sgzH^@VlL38Fp=$W&V7HJ
z9T}Wt@;Ku1zpy_acVuH(3eP2$K%i0eIG@9LizFlh^R6e*Ll2VS8jPh?G;mOe_00~#
zSTgJfH+uQ(#j1*l0yz|<)yj@(R(9e@i*qcqW2s(wAUU%%qMI(^Ulm2WY0WRpus0L7
z{UW|{pp_+C{I<Y}##op>G+nK=TkmUG2MsQgm&{I8uc*gGaXu{+V_jA&ZGbr@Y729T
z5QDak^g-c^rJ(xi%8yVTH<3GSe;^gIq(<CMSvd`8;SEN!A4fSY&rrhLQo#N9MiTAq
zGWjvj)ze_rbJ%bT^~Go-4E-2rw#&d1mz1-+)L1(oIk3<j_6+K1mOi#|`AG?Il?@)G
zE<T+L8qV`V*H4cKI6o{4y6WyIEjO^1J_a;F?I^hEZH~!p@B2}XJyHJm0C&`1^bniY
z4Fpl4S#_%@nh1SvGJWeCBhDF^+`p0leQO65W)u-@(MO2b<aTGZa!|XFXO@#+{re$l
z#QFt!pxW;x=(c~H@7K=J^{?O5SB8HaIY+#WB}4K#U6@>{lA@!l^_+G>?X+hDPXo;w
zqZ)zZq|UiXcN|Aa_VXjb1-Y!bY85s7fgzLrtlYqa4f?c;qyI>}-oOpFqNXEC{rc{w
z<<H1o3_#sSAIf5qlAoRCWN6%CMPvl-SP_`2e8)Gc)NYES&+cYA-%*&X-pwQn9$sOY
z*izRAAH<2(82l8&3M+-gz@Oka7?u@TLsJ2bIL}@KMBOrCtb&-VRPoL@46x*pMT=AK
z>GRa}NPHzCUa+$4;IvM--6`CFJ<0s~jTZr7=Cml;eb#!amZ>!!w+L8qy)l>W(oG)8
z*Fhz2ObPR&x0Pm7q{oDPl#P9RJ6*BYT_WHK9~BWhLSOXCgT#`)MW*^#3g7NwUarpi
znVXl3^gex!UYmTM|6T(@5)D;ISrHt;%k?+L-e1=^^CWFrK$l<v3u~S6kO>i!-<6IV
zoNo1zu@kr*Y1(~!uvIidjZSnKbBSsg=t@cFYT|)9@{3ROri{gFJouNgqm7-S=9+<J
z5ppYFJ)GvDoCg-+9vArDg!l4r=N*w~mKktMzo^Vf21}M6T3qsaSst6L^ce?@<&Bf6
zC>z<$4$~Sz+v*<R%zX;bH5D}rZm!;sexRUlK7tSaTE~S}I|e`-)Y4E_OyoYHS;@FP
zNap?V&H3s5r5@>ZQ4pZh`m5M+(4It>#CZw#2nIFiKy2`bYBcXiPwg-UjA0ZN!(oPJ
z5JNoO&Cq*yB-hVoZ$F01Q=K#6p#H-@F!Wnr73w7J@KS^LNvs^)B+u%|te_N<Vb~ik
zPS|grz@6Qlgj4fBuJPD@q6WU#_NDVDc7>$L(~{N^AYn%En~()(VaiO`tFK3&xy0I*
zr$W4zEGG-zKU#FR9!&EVy`9ZQgL1hq!#DZW0BFF526v<=#0dtZ(_Gx60>h6QalX2O
zLQ~Ztvx}dtO>Tu9_?X?7KmiI5M6x%*pi1f99z^8c^edo;J-9JW-Pk?9u7>PWOWy5t
z8B^g*MZ*#B<D228%ZAeG_hL57!e*88Sa68vdfIMsG`xz5re2HCL81ciV(@H3N{E7!
zrZdZF{Zs;M$UCijT||lWC3V3219O@AWds+}i`F4;Fdcd(T{ed!bV}nYGH!kbAo1%@
z%%HiYhHwG8e)}n+{?Q4~iOGvFhmt!y)Z~a3eUuc*2oGcc!8Q<E%eCbbO<DPU#8{_s
z<ZmM=Krn{K0zJt(xu>ShfVpb{0R$KpASv9z@lgD9gQO;J#lj>u>wssq<z_2vJT~_~
ze#!u5$H*EQ0}qlUfK@?=+abQjb1nBp5m_?+a-Hk%f1#Bz6xh`+K-qfY=%ea{F<`O2
z4Xj``*hd;_#+H5uw33Ld(>!;9@%QCm1K(tcXpfeQO8;W!NB#hoGXlLoeqkKLKr&pW
z$(Q^r-ea3RcZ`?boo{PCB7J!=J$-~1=yK9OF@C=2p%H!~LJ?Ppm`wS52Zph%B-p7u
z^R*|y@oua7IutNj{yB;7{gIpOa_<ga*z~(&nD%oD>O_Y&EmU^1ehwRuG`75qkUL==
zBM{<myX-C1F@mIL*1ciRGy+(b&gTKJbMZL~wjvV^fGnor!q!#0J~}Z-IO?IyXciP^
z$rV^jD-889LarSQ(c*?nSuIk*wcpOP_7o!Ntk-GrFyqeoo;?AxMaj~zWW8mk%aMPj
z&gV+f*Ebr5qTtYGyTbNJ#0sb^v0y4q-}#2qS^FPv2Th{3o072&go2Spa}QGla_r8N
z`8?yC6w0~>!r?kITkLmA^{K2j*TyNnY*+yd6n&6rWS8{t!=~&&xcFh27O-D=X>@Hn
zkOT982c#^6!Xb{we{cV@cof7$77jSY<#}cr|A?NzQ^gg&Rt@a4xAb_;H+=}W5|@9b
z)`mJ7^drYE4-L2UEP?cW2jtICFqom_p+-;XSnj6s=ADcNDl3lRdy|bFh;_;8R?auq
zdcY`!8mi%*^I;`x!juIyks>EYY?anbE>6l|deDNYS(4vfm@tFQnPOZrsG{gG1D*<9
zKv|J*QfyQ`62a8eu?#xx;gGNHRA@NVmXl8rjX+6#?$0aFUHLJg=zeSblO$M!rDa-5
zo*9apEr(1dH7dD?neSIYG!!4`yrtMVjVsw5k8NmJP#e1TIkj&|>jE79q{kCAMfj8~
zbXsoTMLR13t1vo5=zLEEx&ZN?xG8ZNf}m;;r2`dRgow{8%w$(f2;ON<8->`ReB=m9
z*Gi^^nnvzSjFhX)h-$|vo}4>2ofwRibou(BAY?6>3~bl^Id7)Vhy}l`b<|jeD}{bb
z@g;q?nh#qOf2kzEX3qC>0(TNZTxY7`e;O^O;E!B}O8+@Zqr;SoWHOAbLAmwAk;dkF
zD$RO}TPf-XJ4K<yHaANlzSg(oW_dD?=(2`_#cd$c(qvZRkWkN*GIqflZUe8GFpvWe
z|2DCyizR2PUl%bkPRoNVIf1eMh;<g@p1KTP>H?=K5*IM+CSAaOfc%i;fvX^$?Ghav
zOmF6Yp!TvagbJTXnuQRh$qeBTqJ6X|oPYA&Bp#H9?<zE~S<weBNl;ee;08!o69O*w
zE;h#n2f423va#tyJ8EetcGi{DA1(LZEvxB<t!z5gIq0-c!MX8m7FG%}{J06r;o2rI
z2i7T%A=h_|u8|rVIec%V>eP=xxir&H8&qz{Z~pK}m-qM0*7z14bIN8O)=-I)bc*u?
z6{48wGXPc&|7?3BoK`jGmYFFIyV;7{Is_)`=HI^$1<(KSP{#Cyw!@lG;=ZbOB+8Kx
zQY_t+U$Bf5o`fWhG=Rc#2m=%s0uJ@1E^C?`8u>93rm``jwE^wT<m=H8v(Wn$o&!pp
z^9PPm)a)LG_*(5D*L)FeEsH|O<H9-<!9xulOEd!jPc0V4_P4WIbo}<w<~(4dZ~h&$
zgdzx_^^s)bQQdl2ENs1MihNx7$N(N<=M^v(uBvIM^YEpatnWUd)Jj*Wv$WiNS(+{S
z9{6jUH&q%_l5=8j0>D{EoQZgFw6QS-xm7Y7W{MXfiT$=)Pdoz(9&Lp6Z%%I@;-U%n
z*SL&x>s}i6GF=djDwx^wv%bszR?`J{%*bn#;+)zBpLC8P#B_IeR>NVdPmc0>gT+u6
zz_DchnhJeWv_~nF8x`HoW&wz+fm{2jZ)m;rpHur-cJxdx+<&4ZwPUPb<6bR%YnAi&
zN&x~Tacfe@xD>7B(@A-W6>kl`$q92{CyJiL?7h-oZ`Y0(F>Yyr%dIvn-k&w60d}En
zcjY1f$<PtqqUR~`RB6ua2q?8Etr?<aheVIg*0T_sIi%3l&v(cxOP5vu?Lz5FJNfK>
zyc}9b$1Uw{klM!>2SP$S)mSlds{2<-wRDab69u&T+9r*VY<nl3n~X{54BY3vhn;W7
z8HPDix)IbikISyxEC9uz^GyzCNl}W$P+-TcKrn|ik=1gBIT@`8pkE0Og@IX;Myh`T
z3u9Vd3;8e1nD?cNy>;?wSvV)Q6J{s!$UiW~n(t4Q)%rP><JeThNRAsSfng}b_h>eS
zwMFg4W>nt0ZLT-O!Q;%z1o-$>QWDX7I7VPfc+&q!>t2mH8I*B5P7Ex<hQYX+DA5po
z9T5p}1aAl9SOKF$B5|YSp=|Ih!fx}$Dg|Z~9DQSGZ^Bn~^)D+V-=m!wyyd4#HIy}t
z3!`dX2Vm<jcg^+#9iK9bguDYIedXpbI7cMa+wf#M0I~KBKgi6sR$uSrrVHk_dKYzm
zYqFeQ9wRnVPR%~Wim!G?tiz=Pxc?h4gbx2hS)poejFNp|t1rCAXInD;pigP;aos%C
zI`WG9#>-fv-NDv&o5LFVTEDk|!QK@uB6|+V=AClD<^;7f-WQ|xKyr;%Z#=+`r`E6j
zbjQ5jh#{3OzAgS7*ZR!2w>U#r8(FC~|6jSG)CSTH5jV#7&n<O!1(e`w@F>7Ih()bg
z0Yzh7<ocOP?Ho~N`xNQ*-xY05%4?WF9;ofqGZzHV{gYm_O|mP1s5l)IIIE!;`fxBW
zvGuHSo_nE`)k|^kK%PzORgV$suMGac&1CUZ&6t_#8t;=xFV+lIIC&DG1<nqv<@=&^
z5UHg9+;yWq9%e9Kq2}G@05+s?(<MRK3QP)21ks}hYN3}W$;ra~?R2ebrbM?yfJmWm
z>IOIsv9z6r!xBu_PL>%?Y&u5lL_YQ-%BObhv7uXlIvdI6Ko2@2GM9B<4n%DZb_Tkd
z&E_?MmCrEvyGS}Y?jCCSrj0q=e0XZ!V-M4CfC^TJvn(}8gMIl7&Xl66oC*9q1GilC
z9J!+>bOU%Y?{b4))O_>vAGms<#ZC+xAF+8pmtkU~@DFK<7Irr3tTbG}=K}(`-qfvL
zY2SqhHe;TqVOc6_vDo20tXgS>K`TY9GFxR@e9>(qF^!hoTv4e*BhAn<=C8K`psbx#
zAa(nk_$n5%#BzxJ%*9%czPcFky4RkX^S)OX=1B+PLg>^*g&<5XT5)=Vy(QQg^rvC-
z!id`^<?=f%2!&6Ofbfkfi&v_#$sjK$|4eU0JKiC)u(yf68^kR2Wo_Y<iJVxLLAd$4
z5UnO&dx|a=+>{eH)sS5KJKW5#4<3n#`;uB#ATK{o6z5KLEj^F3>Kxjxl_U}&aZXbw
z=hk8P89~u01YhV5iVlU@{t1TxGps<C^7ChG2tvY<LT>Xq5@K|(1zl+#&1*){C!e^6
z`;d>-4dtuydJ{Ctm`3sBY1ePyh#;h_yJG19gwqp5H5kvljke40fp-YH?d>Y<0fm#)
z*`-}0JmY#s^ak-KM=3)3?cGvPjgX3_wEbO&!mrtF5bMVNba0o<5$#k`5#UcwAT0=7
zmC1|J37v3<hYy|`Q6!YP1M6sagWp&$1NJpjL-j?Mwp!iDn2NNm^PWZj!1Bl36bsLx
z*@EW#ZZXWWH^>_|l(Ys`*mtc>7M}}u2W?i|IQ>j6N2=Cjl)6`C%TxC~sPnG#;N@P8
zghxdLn<;km^XN{A=vwElE41epqUmKo{psEFP`po-!>G>PD~tIu0Qr!eeBaLxJ4M7R
zvQ+GruS4t`t)r_{jNrVdiS5c*o@~2b>g)y#5+EBvoqhDgHLA8t+WS+NkJ&7Rb41wd
zM4<$z2yW3D`OX}xyzfrz0R|wG>chZ<&dbi8K>AjCqe|Xg+Y9&lt-16E&0gg)vk$}j
z@@J&)x~nV~Q9sq6AfSG&kk7yez+U{yI>0*%lhY_LkSQQ%A8l$pZL@T8w~j`(Ckr7d
znnBVksW2MEu`NXs$WQPlwY(9+RR_8W3HzaHyaz?*oFN#mv{yWv=n2fU-_a0)`9-5q
zIqWnq=d>F%g>M3tBL*(68=w<+4tw1K#~8RwSMZg8_$K5g!n8nr@}ef+;TS9d3^ZOJ
zXpd@yi-F}MN#lMgl9#|vJBg7E@qYEuGRBgy%yEe2@5e)x3Og|<LLVn$rR-NzvhE>}
z{T((!T<Y^rw(q6U^7g!++9REXW+*bdVMJW=MIuF-QTD^Q@_DfFf?z{l0c#PjhN#9S
z3rq~q=6PXe`H~yk@+>>HKzO2>7cTfsG7x#sYPhoZIUjZcPEMT=ba&afa2NvyCUeGN
z#g}X8kCqG(Oz_3LB*vw*of(&YQlpYJ!M*y2{kcw1)yM)0!J9P?g2kOYo`{N_lFj#=
zy7J`%a2XC!lP#3M`*Ukv5~<KEkD(IxTE-p<9-09I*RHb+RA%d)B^1F~yxb)Hy{S5J
z^}7Z6+TX}Xvg7{<k=EocRakP>o!pFVp`jPZo~i&Ja%1aIl1{~Z<i&jQp*`KP!$|ro
zRi2@E3p4BJrVxFo{cOlIlxfhaL(SO&8~dZAtrik<)XstcE=jaxOe_B$`Bt~Sakh2h
z@@3vYFCJ28df$*D5TeS-2;dW*Ae5gjDNZ0Z5y7;_#Bw*`nBQdWJN>I&_YP(dMRnxs
zY<(B?t_+y%CvqN~haK15u!@9*=4<=lvFlGlk%76O79w+I5Ik575Rom;Av`qYE%ZNv
z0W3x0+h&C@At46^W;jfM09)!I2Uw#YA!JR_SkzO6AJ0W{Se<tR#my5HvU}&K3Ry<f
zhQkdTq7b@}RB_v!mg2<E=feosK#!QFB+@6r2As$99}TLJOC26KUlGDa%o!%|pm?v;
z$k*8v#MIaew5i93mQ=a1pSy_WD{ygzfKDQ_j#1_1auIf&1~)4f0Vc`&`P|D_X6Dgq
zdsp5|YU7d6=*NG8mwkktIp^uVnPB7Jg#3w{+Y+Wd@Q48T3qO^alvEoaU1ek~7(JfK
zyk}F{uoB;2BpHLkv%I*30}Hh|t3k;P!QSd8Rnw^t&&!ATL(d4Z>GiY_@cu60ATskr
zmUo-(qkC$C0&drF5412l77JKDw`lxE_Bt+zJBO?^B*WAT{%oR0LL8UZCxuUKC^3M)
z|1h3{Q|_kwuVQmpZLPJ7v2+S=^;P;;>s$!D;&zZIT;jp&W}p@EMN%TGZ+Eg;=lg4>
z7k}V&`WMDC>dlD&Te}ydf86{5;9hU;vCGGtR%$CIOPSD=<6Fk81P(_(8&gduj0Hr4
zo7${--VFM{IQ)t(J11fPdiOD)SDVIU3{=P^Hc)>DLeLU0z?QkIza$&BlxB~f$Ic2L
zEUWFC&@t0@5XI*Z0wq`1r%LuvCu`GImi?6JZ*9@Bk$!A$fpL5&hq@t5SMQ~Ch1tGg
z4InUsyuPNqF5G3;SvQLO>XND_K+)&oi$G#tL=;%EcI3hnIi&}E*Wm_Lw!+#=r>Mez
zjtZ@}=;0>Af_$equ_|jLNybGL>fMIO$xL$;DKJxe1q|+Qjfg9A<%4Wo%-1aI`L&q#
zYiVJQZ{D+REHK_R-i{j)m0yaOgy+&4EYvHQ`Nu_33J2yf|Auo)jHLhC4_3a{quR6r
zw?le>eNANh=;j)^CtWnGJJ26b62YN684>{I@pwzRIb_+(A$g2=a1+Z>TPmdrgDgc+
z@1I^wKOj8ghSp**l*Z{;L!Z~QIR~6u@Zd5XFJpYjtAjKK#x@wQP=5Y7649=W<83l9
zYE0lq^j$PQ_Pez9N4g>k!GP*EYipw0OWFMGFOd4EAHkIbif|g&Dk{^`@V%0hokyTR
zS+ql;%cH!GnR(&L-|kb4$Ej8wuzC90a@8MAN4hO)Yy5^PiILY>n|<;pHRW&B8aFRz
zL|7jDIxa>@o-;hon`e_xrVOV(VpCllS4Mf`*p4)YgoS%5OsC-Yp_v(a`@ScY{4nxD
zNe;cKe$QIft;RER!qXsnA^In{;|FMcc_uhs%hJGOBkhF(WqxVAJ%Hrb2r?AIl#JRg
zJ+qBZNuVr4GxcReBDAsaoNBp94UGeWrw~L!%E#TKVtM4WP)aNzTbR4`vO*{>oEU-I
zZaroC85)wDQP|!PWx7zMw)D5;XJQ1Af?XTcOdk$jOj$o4E%a3I!H{fQif0;t{rk@V
zr#%<S^MuY7uXj0pK1iV+13pKQ49GsH5rTh$%ARtoPSvRIZ;wE5wK}8*1@^sL89YPR
zD_}E>r_`0G<t8wwmkPZ|1MJ%e+m#<-SN#O)3Ym?6zGBgG5xEU11clijB}z<-m)0_+
zrp^GDBYWivuG-MfyykT^`6w**A(0v_mni8(otYqXi_1fxLc^WZVW{6=ceSb5e4sXk
zS)~JdM`fP$F`()F2$jm8xKaK`SZgB&`*YNAsgV9u`G81HJKk=JcGY!Us<J^608?z!
zT-wPFhplRR9jyBG28f1P!eDGZ$6=!blYx%2>DVnUr6h0jC`|w&*t3$G?6~2#CkTbT
zOKfDXGd1!qwr6C^pXWkcEy$>vsA)Pux|#%_aA*S**HxL2e6$O*=ly(PSVBPeon1zC
zX8;jyq>n5N9KzoNpFR9m{{W=(Z`ghPw&&8LgwHBVbCP<z5biC1Ux`tsbs3xpcyJ=h
zRO2)|DTm8KyD0Dwv$ib=HWR+6uz&imw6PY)@^8lrPv-?tu|In~Lh-ucE;p77BQIro
z2=*9f^;GH|ZQKk9Z0|RUYk!K{iv#X#?-tt3{UUr*ETurltG^3(H5RBZ%|@);yYgS4
z9%&Mo#<Bpd2+G?=szd({i%5L;53%@0t-X`=Im$0YOUl@v)eG&7ly1~mcP+c+6ONyR
z@mXvKa{?bxqnB_PL3NQeY;x}_Xljt;e2)HogD;|WOwI5~$yx{z4od1%(ItoRyUYC~
zlJO1^x`@*Z2!H?vy%=c}@@HMSQ7{2c-8j1?En)PV3!K^;Y}hBI^J#t=dZ^X37z(UV
zSw1_hqD?H{&%{@e^5LiDp8ozw^dEr+RiC7};#f7kJNZmV_HLQ!_>PC@aZ|)$d<&?8
zE`zAr6vSgiPBzsdsH!C=s9TRLS}H<Dj(t1!*3OhsAwi%8`uY7LjHmVh`GXgXr>$lY
zG9E#&1&v<be#DXs5{tyxsc2VDwG|`8;%pgj>#B-B=q`r`-G8zM`FYa`(ET~A_rJqZ
z3@%jft&1&>bTUWTxO>dpaPoM)yKuVM^a~{IINMJhh%Yileh@#x_L{9p<RvlYBp%%E
z4nC*)5~Jas^Lk;)Oxqqc?Bs6ce$m~?I>K+fQEp_|N$6UtcFP^)n}Tu}9M9$zXJlmH
z6a0C6$o~yYgXV(P`KhbQ5LykvIMbQ4U~J*%j^O2z$XzV0M&=SL2iD3P2Rj6`K$uV2
z1Xrk~6E#~+{v$9MKtD2TX;OMc+cntib=qJZP8@Cj9{*A-sUfK=PaZ$^54EQM5!hm7
ziU;@Br8MiEH8|3X6&FD<w0JWRTW#;RY4OGv#JP2oQqJ=J;gWEdlIRf1FcyX*d4jc>
zw_q56%YYfvl&{4OZ~Ff%3W$xFIg&gC;r$l;$FbPBVMHVkljN|wn37~_`aTNy=KaHW
zl1_JQA7Q<#j$AFoVM7K(s-=zuF_j=&+JCPN{~NsT|MZj;i3P^YjDz^PqL|JcIsi<}
zXiQLbHdW1#S&zK(wZG#Ddq?q~#1i}m05>poJONh%AUpQ)(q@mOPD$f#&5Q*D4VwD9
zZ>|C}{@=Nm|Hpv*+h1QWzH^-F5o_tmEE!2wvUi!<^dH~i-y(PZjp|ynVfb@B?4Jf0
z{eM>S@8HMJuNubx4)OaR39N4ue}FLZ^MRav`_}h}TMY{BDD1|S@*Z(};zjwC^5Qn8
zs*ic<kkEVzgXQC&y8n8aEWo945Mc5-qjPmbr2|4vV5gnfKRFS)X+89jzb6&7*78+H
zOU6@n<MGSbh_#F)t(FKmJtz=T=5pCHaLec<x_077fgL^>=H9xMC*@y7BL1A;M=~PL
z2`h|UeAEcF-P|$=uBJ&Rk&eSHIGqwO@s^8%G51lxB#iE6S`ND4E0I$T$)8N~yy+mw
zV3+SF$R;ZK70P$B{Ln#x25a4hW}f|5BqIQT2h3Hok;^x%qOz6Zu-XwQA+x-Gsl$LX
zUhgQ??Ve>|0%GlAmE{Q$pkIpTlO}U%!)RSTurRBFeW^dnHNJit4LOB<fepzVpLppu
zf2SHL);4iHTzvblvT0<(J_;nfOwRTOg2fJ{oFS7Ao3=X$^YWpqhO(u6bltG+5JN~q
znQbOx;7=V|o29N>kI7@;_RMOk{DygVDaIXAbjiS)=u0VaJq4!2%lj7zUEwGoi=_V5
zav)y<lqy<aLLC_ZPgQqc={K*&oo}RKQ9UpNYH<yLiHuC+!Q4gOiHl<j%7ANLu{XjC
zhRRp{sT(+A7p~mS*;xU6`yT2DjHQ>xpqaAEWe72I>~~g<#^(4r7nW$yI_XA(KEEph
z4&yagh`ZFJ)Xsfhj!VC%8UBO@vI(KU)sp5rT;%(8?2U53yntvak(_fH5Dd6w3M6ZM
zsV@-r<1R0V7yv~-$$h3U$&)B}ChQlwI~OSCBhJw43lK$HQAPMnpYKypX@;uJvo-4^
zyl`ccI)caTrD=m*n?uCMNSJ9Zk~`9*p<TQIpGmU1D{62bH7=Kwc_&c?wjIK`gBF&$
zkLT4!qS2FJe|>YeOB|Y8$(vwx$F`f(!maQtL~MaR?wXJq2S{zoFC_R%;$;$XpO(Ai
zUh)~jk3!5BGanHb%N1*~vvM8+8+Kpcdj(&KPvYeCdEYBDkO6xjuxn&}w^E7M2k+za
zsI-7$5GYbMCg2|TMrDlHV_+HRb#=aM@~Cop+8pA-)HS47O+1F84<<S5){lj7Krn%;
z&ef!qvI^J=o!_ua7AH;v(5h!&e*1A3L>~OVh7ZfM*0X3uo9<&(V7_xF131f~G>~@m
z*(Ef!t`PO8o_UvVv*|)Z-wig1Z-*G;L{_Uluc06KtZG2d95p}LU4pcR@caH(Cf2Qc
zUv!$@HzINpB`|rfktZTt!!Z<~o7A51VV!g6cPekOtfcr}@1HBzd31nG1qUz@j<L!K
zv%Xs(wV8Y&*^L_VOnDJ#&fzjaSx{c}^S65P`bBu6#lQkmZC3zS&oo`{as{$Gz^u;g
z>}_|I-Wl8Y3Kp$C-Q=S;0yDmO{;;0PTa3UiFevSC$9|+IAbhBO_vgBssZ~*Vu<A%9
zm$;cH?^tabo;G)40`UQrb*+{a9ir>!`9-r!ZAx=rz6??C9cLabxq7vmG!xiD(0dYu
z<w~QGc~LZ3BE2K7M*-3yk<fAinGc9dEAZz%p@>$Uv)h)0Dg3}|ks1yzm$H^N*T{+{
zWtwiaDt%)UN%c*qWU|C@bW0gZ-kK8T3w!11W-q{$-BP(@JudB719PI>3a1vj>>VgI
zrYl^%#uuwmsVz8b9&Rfp3*HsiCmw(g40#>}Yt>kRM?58DtT$f=@Br)1WOmA`Zr~2*
z#%=mUcD@Q)Y$otU>E$&j2~A6tRvokCys5O^B@9HI??8FzMWb6M$!U4R<G_eg0bxXS
zuDzNwJZPg<avl&}0I~?yg>lY~b%=CeXc#9)a=-N!^_))Viah%V`L`aN-^QC32HUOf
zjw0H>CJAq{o1M*kLBupo$;I|DvJ7AW6g~=zDZI`Nts&KD0JLz9*9nI3gSXQh0rE^{
zbD`cYVePKF3}L{vWW+FjeAPAAoU5#gtb6M0>2j{Ggv$*}0>n=AVWEd6qIshKqHJiq
zeWV@Ws+5)s9)A1Lzy&dPVzM^r@bcWTS-=~qaJMw&>!G<a=C)V3G%M<wJ+Dt}6jPgv
ze2-0d<#sAtJ73^t?fjq&nGrHw&MN<w<(l4DgBVp_%cIuSfIgT_Ag18ML0AyeqnEEE
zf)QWIfwVg|HLuy_Z0)mu$rzcDQr~niH@*sX-pkB)Rkq>}%WR7R15=1(pDi-$B>HF`
zvx)qKk<y;tHRI+KO(wUQ<(EPeYUc|A`MXmH&)Oj9Ta?WSd8*YeM)d$O_-oaNj@@<=
z#5OK5`XB!LlDyk^KbyqYTH{AA;kQ~Bt>_t91!tO`E8<Bu8R{$FR7YQeE~pjwlCjO}
z#WsZ%PKHcHC#L*?(^Ma9X(p5MHf8|9-ItqBH1^D{?x*n&`-QV5AS0>Kfg|Gw11s4S
zCN2v$VdObAGJ&lgg@y}+TnSdf`G%}CZVJ=+C{b9y8(exxT#~W}Xy5~fn5zT}Iop$`
zbU?<XKejcD2~vsM6lu(MIpKqbkc;Bvm*2;?0jKb%td;t%=!_wBdkTZTC*k+WdGa;=
zKy?$#42MvW@o_Q+S%yIOP%e(INm9W7JvRW!Zsp)7Vc$4UH>tcGGf{L3f&pztzWLU3
zv52IWUklp;8;9`jPf;6&R*QZNbsZ;hN}MT7OKO6mne2~lRVHGmK=y`fd@s1@5zb#l
z%a5@Q815cM2#=T~4a~kC>!79^a0p??p>!~yoie^Onk%oL`lReHy1<aRzYy!ybY+mN
z8x}PIYM~M!d8NoCbcCvXp&VTIs+Z6gPKa~!`wnBzmqMb?s^`qBH{5s)A+^P*g<;4M
zeYb#z(k=ECsq#F&z=_1vIH&$#dCQV!mZB^4ZO(b&`J~}j(6jMLvD(EY;sAs`o%2{q
zNoaHORP4pa^jYa-Yzb^*=+ulMea(Y2v(&dT#<<T+RaD32pDVwYlrqwD@}A_k5@jRy
zIF{n~MK_gKzvYV-NTY=etBr{0Zq3{Y0r4F>H5J~M5Fn(^c}185Ub9yi!uz6?r!_h{
zZ|rlF(Q+HPR7W>5nX1hO_-v}LdAk5!Fy5*}JbiP|2u020)KWM_W)W2B4?~%~#b2X1
zlkAwxir=yAYKS0{tb}>)aooLu*sMqeW}co!nGmTAeO846+AB(?D<i4UA-B&H(ZE=Y
zdMULbj&dyeo5j6$iwsEc$P4+v?hW9>XNFjO`j}YaccU`O*F&)H#PX&ZAAA^D@@E&t
zwYpw%f*v1SMfV=2Mg{vt^;yn$v2}h9Ja2FF1`BE<HxS*LWj1jsbo?NAD`<ocZ8&jl
zH)54I8g;;~{Pi^Yjv61r3Dg~+bq!q)011j4EEIuKK`#52mAH#R5*t#F(x<rzb#oH)
zmbjM}y?d`4!9qks_SXUgzz`O@UDKJSfAJG-_4#gC)WdY2q)h~>NzRLa)NR6}>dq*~
ztQXv;JRQjgqkl4)Y0Nsyr7FZ~h@Co%?*k2%3`08@r@~3tv7}g%vF!Vp?Plqt+n%`k
z&l~(bAJ?UVo?)kB(HM6#Y_AeRx)Er<#CyxDg;-vS&kSEhZw9TWIoN{gPoRSYki6^a
zC0&;$+9f1fUcT`ODRWYzO9*EaC`mCF4(g^)F?f4uh1-CZsnVHs?bp7VSwyp5airZ^
zC=2;d{Iep6nKoP+M6z}PsI5vR6U5DL1csv~&+^N^Tq;&qc8eW{`=-mqqf}eyn2~%5
ze_Se%V$68xOdrNNgCrQX?_vlzvI10G;wAa1EM&ajiTa?+e{{{!tZB+0E4h#+ta*ve
z%5M+jU9WFxQ?2~Kk6+;i5HDXSU;>b9E+@Ne#g8h~l@}1jf{X-X?+z2MDi2q9xh#vo
zB}mX)!kMt!51_~2w{?SDq|J&DX2eoS79{-y-db3qvCIm!=uAR5SS0o?MsIV9_kq{?
zVR?0X<;-~I@+A)@W02+OI*nQQsAELrywrivvHEN+l>nOKsDNpBaPN$4;&xGoVF5$k
z*Oc~7gUmVI?kSYZ;N+;W3L7Bk6TX#QfCCM!TSaEpOC0g#m<xf=-iuRA+p18&I;987
zt$@*fA+}jMGm&^NnJj_9_b4hfF|t`c&t*BD@JLY|O+<*n){)7%s&7kP5=%z~Zc7SV
z@Nkv^=Kt#{Yaz_9$#>|wMHuD2cYC2#XK+m~3<?0=+OuGSc*sqh!5$27X8MN6r4S(u
z1zCdyyk{S}*{x0!TVZGDhm>;%aVq_^Dhvb~&VD8#J3Lhj>3I3cSYP9hMjmNQj_`7}
z8DiU^f?dOjzOyK2!nT0Ju3xIJd$Oge!^AXi;^u&R5viV6D60@ZlJv2`Od_S%&YyyN
z#D(v-Dcq?AFKBL7!gSgyk8i@N2I=yOLn0>H9;+gI#>f==M!;qqLD$Op?IPAKSyF07
zC-EUP-R26~E(Tc(!I+AI3d^J9kmI4gj2E*(2#ivOy}K-~e0;O~Ccz`Ed6b~@gEM@7
ze=mR(oiJ<cm2N``jl$mvyTdPE4<&rIpv|m0r(G3kZPofnP-Y@>Qo&MPPFMntoH9Py
zC$$D9Az@+?$77GmH94x$tAhr*x?UY<e-<i@n<cCE(>Cnyn^g>IEFFMpCCyz1?Ij^3
zF}IJk(|Qg`$5JGH=LLNm*`O2syv%yWdu7JKu?6`FRXR$S>kV|em#euI2$aT%$_?DN
zyW{D%1;Ge5L)$$uw@n;<2%bPg3^C;9Z+`fze@>-@I6oL=j#Zc?)@TAA3frJugMxTF
zQCWoY&HZGgN0xdNrMw(S(9Ul!j+Y(H@=gyRjk48#B><@R=x2TcI?~%A*2Ha8V*k14
z8OTeZQrr9{Dv7*%6t<`t*3{F6Dww6?BY+0PMA6E6Xh6>Pu^yl35{~mUw~3XC+??Oj
znj|BfqF$hbMiUPTjB*lQiDkxja~|e2xZ@^i6n-U7b4+#`^8xz{rwJ}kW(h&t_h$kD
z`Za>-O#N4oNMQxHQd=E;mA%9bIFo0S3z&?7P&RM+8otvRXwj8M#OZQxSkRQ~CQI%f
zjQoo4ma62-*4Tbs9V*Ge9mgw<8)149#Wxje7_KWS-U=47D#j*>>8Bpc$vL7BA)iyt
zWU41WKYRfL^|FTTpTF|Tq{SA<GQgJdl&}TJY!M6_Z=EH99Es#Y-fM`nUk_*Hn)X=X
zSDn;fU4xZ%a4z^y6O}|9cUM3MvQ`LPYqyVSm!6GDP`g7<bYFcqIHQa}Z5aEE{NA;W
zNIrB5>Ny~|{Zi52D|3FR?Z9(<q9_DN;r|HLm*XJTlGI><`-aymAm56}70;P9BaTdn
zbjvAPDoYeXY_wS+bwvCT#11<9a*|e~J#$>zDQQL=clCZ*`S5wem@1b|Ye^CcEEU>!
zPLHx7O@zP!^_`ENn^Vx3aeSb7cuv%l-W{6;*9RR9)o!gG-;p3^Zpygc`=@veYk&g0
zDwg<CtQ0;!GMB9t8z##L@}P6x=iU{<7+p(U=Jqi$1}VQB*2YQ~6^HDlrq7caa0Cw`
zJNO-mmSDJ!_vqOWgtjN}=*}n+eRdrl*PhE^*E~3#9uOqc4$2l3HWK|D2rhi$(FYO#
zyaov+UCOQSwj{0OI1HK0Ed{)U)PuvbH-aOicEsnwb#EkYJu(xN#in1i0Whu#YDVOZ
z<zraP^AxRK@#32p6Ku2uf1*_OkEaDmW#e48pD{E#E^&8}H*2Ee^zqZ8VPV!)uaAYC
z2`A-gj*jcRQ#qRZJn=!%i(R^o&4VPnb^h5Ls02jQG_!#932?7^MzAl)s)Q8;PK*n|
z$Ayf5q8keD(l24;D<%9oN=z+4B@59lmMEOjUFs;v1-rPw&VOx~K-Axn5zN_vCXo3;
zWPZ_bF(wS#O!4>iIu2<~V;w^t3~+M{bIC$55Ni-$+6tUcqEPt+m2-Eh#zv?u8m(c#
z#Jl*N2R-EesDV(AXs&Jj1xes!z>x&p*nnj?>1vnBlrW$={(`Z&$YNPSF_1b45*CSJ
z5Npk_K(C}45thYmJ=IgKizS!n{F5E59M-PDhC%cBcXX~Wq~rU;NhWh+j+y$3HNcm3
zc>R;+2PZ0E41Cju2CrD8lWY&#EO>wjqQTHWsYY@GBW()%{?i`8g2R$>D_YyduY->W
zwE&HvXa{JUg!zen^$#kHQuT+cYDKd>lKI0brI<*<iQ@S0s|4VSX%)KaWAqa*@CSsm
zQ{e*ATSRt6<4Q9IK|<!-UIc(HoL(2T$K1s2rY5ra7iY;Lo`b^Tc{#|vn$|l~4x>Hp
zO+(b@G8!ef+;*vvdWVO#sJG$<y*1!GIhZ8|7yFu)kY*B7Wz37hd>yl8zeYeP?bR6H
z$IdK!uisr+?XSgU`Dk%UaaNOT-7?5+Dw8UT#YEE*E?A6l7_)vYK#tQ)F|)}=U-fL%
zC+-EFf$&UT<H!vcynLoL+ntCxdmJg%kUoa~UjQ*c&cB_^%hpzBaIXh-ln0><B7KhR
zV6ub{a?w->^&_#?QcozlJM+YNYb-1-0XdC5E$(dgrXqy>dS!vtaSl2+1?~%=`~F=9
zQto9m?{sORv&LM4>4_}6Eh12+vAS3X826qFRcrW*L3g-^LNyx9Zs+SbYd!QCw;IA;
z8nv3-d)Sl6kiSHMW6h`KY!;U4a2NgV2M9|Cw8iD~9+e(r{mf&sNmKvM+I*qy8yq#W
zwCdKbtNK2`a4%bBI<fCK6Un{Sd+`&77x<o06u9?Q#Ff-z`aZNyw3@Z$Ddd7=eE8!g
zEdMnnE6>Qx0RS^2T;;joujJC>ZrL~7V7|C!7oe2y`T%#N9NiOic4o;aX&z0%I(2p;
z-J>A}O$&@4g~{a&6IG70m?a~lh}+rUd}aM9#ZY8usfAJX!7|$3A9Ey}pkNlKI(dk2
zYgT2%=Oj*4dc)!_G%=}R+2E9QzKox8VT7?|e!Zt{+>g$FPM6&Bm>?N}sR<y%=z8Rj
z65&HIyXu7eYitVBZ*ogSwRt!(jE(4L_v~JzqKHi}fgXDdhdYP!3_WX&N4#m4#kJKG
zp-N;j=Rx-7<$*{27$=h7Ax(=Wrj*_ip^p)Cqk$=V`cMA+2xE)-_|WtzG$BwZ>;gLw
z25Hj=M2TP8*7mYI=!(ASc|`Ep^PT|^xIHPepPDmQ+ZzMscooQ1jQMW;y7o&uj}D0O
zQZ?ET9l}z2?J47ayhNv;cYI}?{xt>z>&$SDL9uv`B4+88c3xmqL7Iay>F|}+B(pIx
z`{}<0g~z}X2=Mn;-4!!zzLHegC6<#GMMf47VJV9~gu8#IrLd%#tYMZ52;gs@(`C@n
zSC3ZmycmiBDvf*4#qQOu(R@O=cNmsd5`s5Pa1#9ve_gOkl;b((7lqH@Nz$}s-#6SC
zl-0824;FKTt+ytBEdh-lDNO^w)nWhu001Ov2!Q4I)!S?EpN)~2%%`};I_^Du=x4E^
zYFR~v_#<q9HsZ+$A7Hy7ogVH`@#mCraKI21Zpqi8k1^H4e0j%6Kw{2V$-IdhJy=in
z`M)DelZ+7Z^2!<g5>8>Ih8R|&PN{*V2Ve=+i&GTjvOnsM#XS3)T<r$7ZZY8`h(9AH
zUW3SCPG=3$tfzC@@oHcF@$V46a1}e9$-$@7V(bkRQA*sZ5S-8Bzgj3eC6ik}>z77i
zqVW`U?Y$CEB^Xxkwjv4;dR6ZQZj%K{2Oim10s2oC!gs~J;iIw{V;(!6V@>O?im~>8
zmP)5(gN#PB#IikrEP}9o9}c}zhjSXbD7?`uVu4Q#W7<@^g?HHuKQ3ck%}=1zmuJON
z<iK?wMH{;la^QODmtp!`Bf=3;`f2P&y{3Us5*CygB9D$vJ)}Y(&=yQJhzGpRF{t_d
z-B$qyM3xn=L<MULws(-(LLvBPo4Cq;&oxi&-V^{~LZ`-CnPD=H=z3KAh5SiOm^Lh`
zUP^a4LX~y6a>|UgzlEGvYG^oM2m_l<LMN}gK&|mc6LkoL0?AWkno~C&?>$*=k;kvA
z2X7HW*m1fG<E|!>l{wej68+TZ#o_FuMpVImWNyLg%rWpuC(aiK6>}eEtfvhn#*X~*
zZKO(ZkL`LWQ{d+mW;>NpAyUDL*K@;C+eIPF$6Y@9X$yi6It}(qS#-iwu-{_WFnb7X
zZHAg<?nMPqvo@=3dVHI9xVk&k3=h65%LVT%P#n79pm4@IP9Ve+QmnwC@R9>2o*{Qn
zQ|%<%I~Ubzo0m+r(V<4UMPa-pp-y6j(wg>`xvxwMC060W0!w$cXyZ9+d&k1fCjMap
zcPo~Qu~qf227J#555Qk+LMI@nLJ;LEyV%9}u>zdZT`Mfy%-Ie8fK9p@xmSw0huqHf
zVCz++{|`ILSD2})n?fMiv<M31K+dD=^vrhUcHI3*JzX;br<0x@fHlLTt)h^up1SpN
z*I8bK`SZ;He#9-}lIamgh3`s{oiL-p**2!H&QH2f#(FjZ7wS8ck2a<1Pm;l~o+d2M
zPP&GwCfH&<+RwveDzFnk9Yr8t>|br(R+Gy-nW+nW-bLtarj*R2Z!{cLhiU>th1nqW
z3O2_sc4|jIB|?w=nCCOZ_SJwY+dmO$=^u8kbdN?XqtDG;E@D8aVu?4_z*o@tmjmr+
zC+b4Yy|wOW)!{Q!?cre56?PDcYEdifZuyrthCE!iED%Wj0iFQ;K(thsPAK(N4?j<)
z1&q3P28FghgVGIU8UqEJI0Ktck)UMD9J7gK3?!9Z4gh+W&jCUmM_n-By$bk{Y{7}A
zO;ydi!1V1^ed`JK0#cWnCN!*{DT0q0O^<(0U-kYsV3UHpNug}%fK8bAseotZx5VjG
zk;Cj5^n9%tpVp$0Qy>;cM%XtK40%_M?FJ#>4a#}Jw1j|ikX+bgwzVmeZU~4q$&26}
zD=`uBnZg*n?*7Uvw?QZDKoewF6)T{F7P&`;i8SAVq3fykqx*aBhiIA?D|?%IdKhhR
zs22znzq)Jh{&gT=Z<Tr4As{wxL-7f`vxs9VuoCOj<^M{ABfO`{pbmeNruy_BY^?b%
zU{SS*Z0;6g0<hmkw})i6Q#FdB^fFt2&}uU?7f3t~NZs%&XwOMD%n<YvVZH(Yze80b
zV?;*1<*Vr2yqo0pZS<)>5m-jx#RETooQ|1%(|f^q%!L91=Z@qI)&|V;>h5NBu|r|D
z&^|s>n?RAk&A6d>GRzl5`{|2g<W<cs*k=e0c^?woV_^4U1H^9<A>+T2I2|U>$h83j
zzDuNEOS071_Fk#G@6^gXd5~c3;d&x??Zvd1s}~vx+mvCOh57tajsJa%_R@KKuj0%%
z*vT`S2?2)J$N&HU5#XAhoEiEwVR-`*IbY%Uy421|IbQDpffb2%@h}5+xnJRwhr;Ts
z9U$j;Peu(qGEVsm5GYaB^1pP0>|UlBWl_fqr~BG^-`hvT(Kpxp{De*-FoH=HC(UTO
zMDR4f_fLVewKTDy6{{7l(6jo!N$#)2@mgt^gX`ML<)X3a$}mFvR3P8A%~F_kH9ApQ
z6J@6#1BX69z7K+afq0go?<S;7?6zfiiTabt+dsoa_&?fhffy)jkh}W^;u8<9Nz3T!
z=#^``T#4$VLkqyLL3j^<Q#hrmZNH$R)ws+BJ^!Q<h*vdEB<-Jm$v4<d#q7UJxtI0Y
z>$bgmaP`Nm1AT5zI~N8T4E+h~EGi=HdqHoT_O(ZAzrB{5wEE^e9-r)Z8&;8Fe@2@N
z_pWwK<YJ(PB6$yOpnl81Ki$MG6UtDw1DBn3UAp;puq12qr6>(q#7<qN|B8PDH<a4K
zX+EUw`rUtOi|mzmUwSR*r1}o;QBMsw!%~q^4VcI{$;#dIUiK_ntaXt0KIw*s>tS7P
z+Ex3&r|L|L|2IlGK=Dt;hcwrTZK||ZK8MsryFAFjkuZG~U5F3CQKH;{`$0+7qu5Kq
zvCfKvf!q$E3J=zRKUl+wSSK41*^sPFh&3VXqs0#R7*MwH#@kZU`v#+a5CcG1(sml>
zG9%g~Cl8Es*iRS*TWYv8W9()_NR%DzsYdW3nw`mfFI@+>YB;Be`nne*SJ|B1z{7Wd
zU^5l;ahC{PgZz=LStM-VRnMFO`Vre{fY``vMB8QALNb8JSeH=lIYXWQ%i?m?<0~C6
zg;*{1;nq}3Ac?9A1fT&lEJ(@cB&|c9;cZO%f3*^GL!OOj9(|dvtc<XI_Da<(knj{%
z(^@?l<uCVp7YakKv6nfIw4vV8QiU}EW28|e?l;gQtKyN9#2}mCZLd_9&E#Qs5vf6D
zRUNLDGsVOx313q?T}IdzPvfj1M@e|5b%s&wZpHz06H|(7*th!oJZFO!q<yD?+psK-
zo4P8KGGKM!do3F@V7Q?SNOBGGEet}~L4q*yl1#3_;gW6lu;ltt9u_L@EVFaiN>K|B
zdbeau#m51#1%^uWz#JHn<e70*ar1TaMaqDL<=Hp#=@cYWlV7DzQ)BV!b}wAAXwjHK
zAY=Zm!KUnq0;o_MW9(byDe^|vzKDD&H$OW5jJ;NZG5?WskkutCjw<B+`=@&ab2e%I
zuo(GC5a4Qq&HbMub3_UF%c;4?PVW|-peU;EWA&bN@7LP6#<p467i0>^KCH9$QXG>E
z;TCX?hpyAM9Bws?P<S|0v$qRbR%<;u14-fC7%sQ2gP<bgn<)P4;rR-2&Xt_g^#8f9
z<@&Mh(8>I%QEnH(SSA%bTNO=)(8tT^vqx^MJNxeul36!uHHOeCWUjmQEvAjE4++tx
zLleTv%Rf`*Su>pf!mG6O0UP^{P&ChN8k*Ud$OZAU{g-8eW7F!`uG2JqW}768*eyl`
zw>l2*?N)&6A4AF#VX!zHK#`00jrU>v<V;%6rb>wrI|`izwZ%&=A<QL&L9SNT6{4tR
zIoQ=mZgy<XbBroW->9ILZI|-9NK*^HEucXPm$kklB4c7Cy&fG7X07du?J9{&eTZwN
zXme04<rD*v(7|?T{JiyX>p;p8PFgGEg<9w%MT=99EI15bwGZ&&bnjPSpQ97DS>+f~
zv-t3}r7$%4RTS*DaZl=JQ*d%KgX>?i6;PW(C%435h;hES-c%`&%y7sKSDnZuIdHNs
zcY@)r(f!WSUq>dW&O;?LLukb}vk}5Jf|kV9{l8)?)364`@qM#(%V!_bV|%w3HG4^Z
zRUmeu-6qPs4K$T=VmjVci6v2_%1!wD-#Zz9nPMj$|8;JyvR4kYM9VA)Qw_tD+@G=o
zB;x!#%LPpsJWG+7y}kky4M~j-L#;^5G6^7UtRR{z`3F<zcnM?1GG+`5t?mkWzoih~
zZ*l05Um(`|_2{+SIe6gx<f~bm2WP+p-Z;iSao{9aonW3n0G?wxz;xDrKkT|xN>&qK
zM@lave3Br~(cY2ym`ECzY25O0Y0G<T_?5BQWzB~NE&<;_slv6kys6m1WJ}Q8Tz5ln
z2BGFq-KR@J3h|4&=tw8v#GzEYfB*mhBCqG>H|DtpUpKa%dO+2+ANd!EzWWFik0Su!
zZMnet3)Sx*IZ$(#{dl!I(s>vd?7`SgNHONL0(T}gD;Sn9OF_YP+NKQZEvzQb*8F<Y
z?VJCqF-I3f#l3ZD3lBT7?fwYv=#9S}jtI=l(4w2`IYBCSUQ=5>oqxfSxqZo}o&4nO
z@R;$*o(n&l;n<v!)_ig01Yu=_ML|y=QDokB(5yn;X27{u7-V@q+7Kuw21Om>P0OB2
zvO%di&Fw1a8zNHmZ=J?u%B^-IR!a}p7_Yq_Q#*B=@}8u05&5o$=IHPImFmBwcu`)q
zibz7O)STh1dVM2{m6{GNX+d+ImBoUUNXJ0lIvQ`HH3fG@;__?I1a`YK-lgao^Ga{3
zJ5!*Qk&rIQ!hcY7y=79s*0KSec~A#5+4Z})VXucLqYbx1tEQp!?tMPcsVz|g>bHu$
zVv0V2QNk_r`Lcc&>~i>xmtf>9z_ew9tv}}}q|uRW1E|!C5=NkrR7@lsXBUL6uzM(#
z6J#{}UVxEF4o-IX5m9_M)aGXrr|T3$;@puj(fH@9&q1P|DOSN*l;A2TUX0z(mZTIY
z_Z6TB4A;)P>4A3|8ul*&xryoNaInwWZYguh!0_bfeQ34<sBnSRB!Q}1a~SP6N&(Kw
zN?npFqC6B<iPIJPlLWqS{S@$TCaY~c<HTtouPlFg<jou9aolroh;tIP$f%Y*cY6$i
zQ$UEbv)<P4O@C)e&${r>xpMu0V0MOZ6God*$SG!S)=gy3<!XP5sN*f}Z=hX1;+yVg
z=&q2*jBy>6*M|T1X76T2-%cC$So+8xz|@q4R9kAuZoe!(Gg2G`!&kX+SIBWV6ef02
z3IE~m)E#Hvdg=5fXH&30nl9`_)5c()J{1G5kI#w`LDOWaXCTF)FG!O-1_ygkvB%3T
zdps2F&@Yp0)su9QLIM77BR{a~L*>3@$Dv>qsUA=Kx2v`Si**L^y=m+?OHH~uC=*rl
zwTvmVZEW;E>_}(8O%6D0q?!W;h%w$0g+KM`R(l9bc9csMV;PpWv{RxbL`uwfs7`ci
zP%NN?%SWJUG0qX!*i)d@cCOr@6W4+xMuGizkWvLNP0_deql;n}L7D0aZfXrZk9|ke
z48<Pu7)^VlMyH|IW8ozwrN-JwavE$!w1$g~b2kmX<258rBMCY7pnR1S`5{C90qU78
zq(rldeM5Iy-@_I`kuYp~F?To>e|y>ycc6^(@v%V|s%^=G6Cq|PC@Pkc`wBeW<PMnt
zs(G5Da0s-H!l14d%C`;zKxfyZtAkpdK+_?1uubP?1Bo?EG)Ksa=l22DNfd6#gHltp
z;NeH_%8k++sfsh!4x+hE+>X#)F?&33%6_x>0Z<$MJxREWq_SdA!}U&wU`@<PZyRyw
zFV0~n3ZBT%{9J<3F2(eAuH>l!THprggUdBQA~;&NL;pY~XxwO_ldAw{(yD8bfpKj_
z8CC{n8~ees64#{n=HPxt$kd{BglxdzA^U^LD(jQnYNy}-{H#sSj_#F3IY{EICQ1`I
z%x>;i%uWz?qjleJ?83vZ?R3_=6RjL$71ISX@7`@qHEE++{2Nx3bHS7h1Z0-*SjvSS
ztjw>!7zu)%G&`OU!1Uxka5yeO<nPC9?4*B!`YL(6;J75jY18kthTuIG6RzYy(?^1s
zI{J%2oE}9fx6*C$h@zj@Fav)^{VQoFnjcpLw)ZK&8DQnLx5NWD_Xd4Se}gLYUC}`;
zk)pH=T@l46byPp=te9zQ06Hds*nf*WzH2mYc>f5Cv)_IM+HIq;G;Q=oow$(6bi^GG
z2@V7h#XdIIQ@==jl}>%g?kxbDayQWg9ILACn$(^;t>RDXjD>Q9m{1iUgT5Ir-;;G$
zz3SKZ^wqMI1;ceg6z12?HY+ZYvLss|78S!#mWLPe=fh$x0*?inu{17}jAiONozU;V
zc~?;gV{ZssW<Dtp9l{}18>k9zd2-VrFy4qd&Lpjhr@+bjmu&yhK!gQyZS`%RJd7dA
zUs5JCyCuw(q4@+IHW&QRIoAkL`g~e_+%f#dG*yrS%8Ejo1bIl}Ljiq$W)d}iG&MJD
z%6T%|TXC#XeO0D?kb%G7vr71@@;VXzXbaTgfTuuUpyr5y%;~ag9?nA^fr}sn<<4rD
z!TIYNT$IFD2z50wv}c<zAs`$0mj`%)OGd{%7~s5q1lDdA9wCZLUk;WSe7#Bv#oB#<
zS6bm4!rHw4lWPX;8kr!N!T8|E!H8bLiU?(YsO35In$jcE0de%&x@n;cV(*l@$$YKD
zp)=f7i`q5T)jien-C!sCXa=_fJv4K7|5``XL|^X4yvFME7>Z-i1nQCVJzLHFlHI6o
z%S=Ss*l{2r0003Qb~hIZ>x^iy_tu>1>FWghsS|M@L1}b(XBLVsBPXF`=c$|s2OW52
z6kI~WhciG0v)C5Yy49>0HynroVfIcK;eQJaKblM`*y=wgat%RY+I=;F%`>7{zr?ct
z{T#AB0<jl#6PM}naLLr1ix*A)N~||Qovgq98WxJ2z@9RRQueT|0S*_9+|6N6_rWYE
zaMuPZZo#HCV9`l|x@~LA8wm8D!&fk6k<&97+(b<H(A?-yJPqRGvI8}KZQdQ(LsQ)$
zHX3d)?>r_p?na756NyoBMoC?sDWReuA~7q-nY6o235!f+b>41&$Uf1qkn}R?KnUr%
z0g6bL$MH@TtP4ayXv64UEu}huXpQpb10Y`$PMLbaF4gGuyu4Pd1AM&%MTwvz9#K$s
zod>pSNY7=rHg7U!{@2yrUgqj1X(DF+#A2wPD@M$W3O(fwI>2yq;WupZI<US%0(DlQ
zyrT}Qz-)j`d)l7N{Hg=;Lz6s*!&DWLc!q<!hRD7%=Bbs&9z-gMUu&FGUx}k>x}1jf
z++V&6qZc@{Q<bYarEE+j^*AgvgQo<MvU*ZAS`*}*2Y}J0fl!*}Yz0OGoAFGXz=485
zNdUa+s?>``5eWaqQpTvpdkw8I+YMVus$A!5_0Wb$X=#|-FcJpgooVGT*E^e#Sez3G
z$Vzs+i>PRbOX<XsZYcIAnceZY-|-_fZQ)P1D`M5Ti*?pX@sSv*V-i*VvIr3ZhI(KS
zi?{j6jYglzse_^nG+-zjcj0vAnzAed6K#Wdg00jGqGC(VU}o80pR@Vs?dtd%ccgMs
z2KC3PV(ywB@1QTR3abO*`(WLA|5%87K}js)5&M}Z=FoE8C@Pw=e!2=CG5SRBhat?*
z(ndZF&LUa|PC+k4Z-M^wjqvelta_$~BJIEa)%GztyF$Cw!zdl4Mh&hsj_5xY9H5I6
z$;GO8w{x@YyYQ&2O%f%J*_24YCf^^2HBCS%Kh<=%r)ddwvYH_rlY;>zVkqm0&iKZ3
z@AKW;cyw1pBeof_x^ry-sVug{*1WTYycMM1-|O>7xmR7=V`>TH#__ab4Z4!inh2$_
z%iZu4Erpv{SOOS>84G@;@O7E3*JtPkPMK0pXr`pYCFrUH{H}rjIIH!)Solz|5Ar<M
zk<k(1B8Ufz<y|4<b*w8Nv+AmTMNp!tuGBYHPR2p;LD=I}!vWg}_)d0$z+CV-9%(Us
zv+<^)HVbZ<r?J>$QX0am#~fJ|UZsP?pQuohx0UgiuwhVwe2lH*!-Yj!am9KDw@1Is
z$vXFi?rI8^-6+wVzT*V(Fl~Q^bU%aU|5@^hDm>uyE@7B!9g9#r)(u&IrR3xpk3LF0
ztuKwzCu<N9n=pAjlS`!UZ#hHXOvQ$OU>51J*w+`Yas;_#P?w^H21xl`sx!wHThMfN
zLlOw#AG>5VX0ja?5HTzj6`}sP<|gdg1^Ox(Wq13%^hWFG;Uwq502tTVYA4T+CSLv}
z(vIETe%+|@;zk#vjKS&aQYFOsNWD};BpGyGUBL<%oXay!u!sZC%*r<GTBG0<p|0X7
zZ3a_yigR3CRq;mtt<#i~h#UZrU?`GE$1lkD7JSSfyu`o{q+40L;rq}3SF!{FbQo;g
z8F9Z@{QG!BvY@91HCc5v4`EnawzaC--|TdWl2taOsla9`kRq=?Q8Ap3+y7S7t(o6K
zkVW6xn3BGJ^-jW`CW;)qahnaEaK%aR7)VIu%i))g)#Guocsv!mX6!-Dlyrd1f1SiD
ze5%^KQcZILoyn8HiMWf@-F}x!eAl|RodOhhBG3u}S6*gB;+5h$O4iEdhmRQNriq-;
z%{MC&+DL<jl0@5DLma&ZM7ZzMYmvuR%#|DD*JNI>yCV9j7WV%%`grUrPoK(GRcA~r
zx0zNrp1QN+-(ZjcqHbZ;9K+`9lwEd+9<y|rQS37>du}HfcKCf<Mi3P+3dWwEkDL^?
zy26|83vw&5ktgwY5O%{Q8C7SE7i#Iq6kH1cW26EIhZg~X+aZ(Q0hq1!Q>&j4*m%bJ
ztK@(4nr;z>IR}3x&Ge3F*X7K1pC!CbW?^1DaFiu9B&ueXQ8gg9@#mH4#c`~hzofv;
z000016oRhn*Vv(o7YI6U*eqXdueUC9EF9R(w?Grg0&mAEQNyQD&6!0F2gM-#Gd*fA
z{`XzEpl5QVW-^3?-tbEUVS7l5yhfBudo+Q}5YckqZ1CqM&B>ePk_065k-wV5lDXBv
z%nNp<O|5^Y3iM2o?|jwwNNl{-2{5T@-WQO%-a7IOF7zx>qPec7ue|tVR^bK#m$oBC
z%<rw{wBBx6IoFYXyU*Od&QY~aBlK?IWkdI0G8-BLWB*h^&D}B`b+#jUI&2GdF7sm@
z#a;Yjae3L^EZnSJ=J4&RoHFc!a2Q$LAL6V$@*|39VL;81sk0^2{7mvnHxYRcWd16&
z#sbugKue)vKKb{)h_Rf)dnrKV{O@`oPe-j4xz6(swe7c*#(?NFOFUMZOiV4bTfk5F
zaa$6s?xj8{Eb`1$i0)l$*L_>%B3v#L+?|u|elG;|#uw?E)=uOy3eyvA=e2SypxRjW
z6Ba3)9bOl}6b>kn{WJRa`H=ymk5HYhK@Gana<{}D@HX7BGj~bLlSnRGAub`K%Qp@6
z5J(&QuEPa|0Rml|ql$j)ZIFHRtqQV~A_~udNT6QpXdPS9JTFw{5rvN}Z|BhOAi~YJ
z$vUFD5f^tkcf2-esD-nOsGx!&{9ML9y2sy`8x{x33p=}$*44c+?+iW9@v)-UJPujs
z{_$17TX4uY`xvKr-@R4+aMwhOB~VXF!f`+00Tl${yCgR@3rOe*!rU^yo7ad<F-Jbm
z9(5u2c$Zkb&idub0--Yiwu%H)=Y;DpA7_tal;`Fx$x;c(_|PLha2ax$x4?e7)tR6)
zKFKY34|+?xM1YnpeU^PYt%|hah#{?3T2Fnz%G~xvpi|o2U5?KtvhD|O>mKX(LV(-$
zEO-p;KfMq-V@1h1T+B0!8bOQk33vL_+>l5zKr?1=?$)2mSI~)E#j#M*U#XCv+=$5{
z2ipH(iG@Qp2Kw(Gn@e_9WZhzq>G9}t4g@ShoEll$F4R8DywDdRbITjGcy7NhWFdKb
z$O+s-YI-5)Y%mMDWtlPf%|)V0Kg0G$O<Lg*SV()h$HU#p0o@z1Np%6TqR8KBJ#zv9
zK9%rzp$+ciiew}VUf*ImQ$Cv0al^o9#-WGnLpDhsqv1OanF;n5{p$bJ6l-=%wgUU!
zx7RD5vg`d5ofJ%W@6iM8nF?a!`J!*2SN=6?6RcnoAc5>fN22Hlp^ahrIv}hZASR%z
zIp)GimkRwp*Nxvy+9v*6iSz?0{AKrs-mB!qNpuIAQNT{!_!IY8CV)Aql-oWyRU{uw
zHSY+Jtx|ERNV)DDc0WY~uAPlWct~JxTi!XYSnkpkEFM~4CT_)RP`><_QRNzAdCAtB
zh3QJqZ;987k3~`8EvrSy?rQcQrBQ-<Y_)a(ik}iSg8g~u=9?{L<b4i>0Z4o%{X5a9
zBCSlnD$x?JRUT7>_X#wla<NG)oAleq(Sdxy=FjoB8mr)Bz(;Ch3|N0#Lat7uD;yFX
z5Cq$iGVt!deQLu!>t)`?#5U!r3HH$t{Cf}E>P2+W8kIor`fc()S;~lM`W?58$V=!5
z0yWh!b9-cPtggmrvDY^Xkbc$<>Dk4WCL96zYE!~4^M_4czg7DRemoNLFZJm6&(Jpd
zcIDE6&PlQ=ZY)s8zL;rnrK#LnX~6`hYk!zB!X>rN{HwFdj50#?BhQ=w57#Al1_jDF
zy+Bq@*qlKZHo>jRwTq7bz((wd0MFoc3-COWvs(SWH@Qiv8u3iw(XG(EsdT2Y7`o|n
z`?G7;|33!m+zlbMr6D!G&-M}bU=?^1G)i<sOsTuB7|vwFA%b%QI>uTSAG{y6Vl2&?
zw3P~M&(A^nWFey>g*NLGe$&FtkXs8tGF@wnQgRoCdaN?cSdqI+yc+AYtzk_&$q9t-
z95Doe{8%DS=JM*lZyrw-ml?nt@T))xK(b=@tgj|RLZAX}+;g+16Yf4nrhBR)ET=SS
zraS{#%FIeQIL3P+`GXgUG&6Ke?>j#ylugx{lGr8dMR@Uf)XC?H$W&1`?nke#E4yk?
znp?xqH{TQunWjSP_mSQg%tXp2LHhh&c|)@>lkbB4?Hisx`YoA^u{jQkI)njsXp|xH
zC(m?SKrISrmMC#8)V$P0mrmZIcY>|7gJNAj3Y3w*Eu;KTgQ2Y&cGLhRR(*d7{8~s+
zOR2c$30nXtVmTIGy|~}7?jot%_M5SqcG#{SpCemWiVm<UY2`ZWb42EM(hOjkuchzT
z-%hd7dfB|Jf}(}L3P!*H01^>TAq#s#U!ME;Z9Qw3^u{(qlsH!=o?%(JHamzljQ~|f
zT-=0gWg~GdYCday_gIh>)Nx~RHMU`QC;e|$a#m#k0Jqygyu(a9$iH8c73c>PPmZ{l
z9zc7yUq1*JjJt8ORGM$Yc?7tM*h)#~v<vxc(!sbG$%`{b>2q+uBi=~=JY$E2DXBOx
zALB}|OV~0ar&Nfud*c1VGh-2AKa<6Tj$9UQG#IpadNkqy(sQtgU8gv_$LOd{>|q2s
zoDE<lDEuwO=hBzb&hS5<Q|$%SGC^6)cW3RI16Sku8Ub>Ro&EXsz=eubs1eOpQ^&hN
z&-#ms{59O=wnzc+bj6CX?c;4e&kCwCr_hw8;Ohhs4(gLw<=lFUN*_A04YH*{KJ2X>
z?M0p_{XXG+SCrq@`7aeE9Ew>`*6MgsYacODM3S+sjNtik!aurdb9*<aXf&sy?+(&Z
z;;6!`9P#lp_BZCV7=hA9@p@^ek$kiyYND>5>DMkG8)I2RlS8UV#P)>z@FMPU2Rh_N
zFd7=HrCtD~*_PIIyGQcmqt??jLUrzC$LcE<&KNCpd|HEYZAwNKZ<@PH9YrcT5>3#H
z1g(>fumKbjhpxg;-R54f4JwZEv6!kyj}ClVUcY|hVvjm)vo8_LBD3zyY2?@@2Qx`@
zM~Q-Jv#&H56_YQKBOiS+D_zwl#N^Jjx$Wr_9O;f_Qa~pOF}ndM;V32XIO@AHZx=4g
zIq7e{Bfn9?{xptbnd|ECLp-eWIjMsZ+m2nxN4s^Mr9oejL>w7Z!gSYdBJv`vWA=3t
z+|~6gsLV*Q)KK@(_MrE#*U;F8`S>>=UqQRsc`_D0=04b)j^;X6$99h*c`~<!yjeXc
znpL3P6ohd5oLSG0{^ys-CnGEjabD^cZf!JDNS~wp7+=Zqg^Kzd_2;jc2~R^Ek!pOL
z%j>Zbrndb4vkC}wTwFCvdc4aTVFAN9k;>B`Z+J`A=Y>BP_;#2ig|cBmws(f5K8DPH
zk=MXA#Fl{s-nI8SLeec1{XX>2590Xj$519OAE-Iiilb}VZDun0A?m@6pLMfBF$9?*
zy`*~zkg(g;s{!Zf4cCk{@xY*Ffdg}$o^!p9nDUM3F8*iiAhlvlvEN|!07TP(p?y`9
zpksErlsb+xy4lZ9?)<PX1_};NgN!lmLVlP{b>3W*(fl`qjL~V@icJt)GTrz=uykrf
zWajzZ#wjG|s;p#eC$@cI-MJx#t#NOa91+G)t<CD7O~2-xEc`#T(cp%=lhS?5Z$Oth
zcupV*T&Kn%glaJ>dk6Opk1+N6=`yKC6+)+Ml8&V={&vTB&uh`SSU?b)<{`6~^@>Kr
z87iO5?lwx|GC<fT>5Vgkd+&ULL<kB3`L2Sga2DAWr?#9F-|#0DICH5~!m#x*n~&lK
zG~?RZ$}m`1$g~Xyo_;q-j?lig2GPd;=D>(YTq{~Kbrp;8!8`34tu8{{!yf*a;C>qh
zQG!a%g><FZk4rWxTq*+aD|uw^+-h9&U{CONM4~;AF#`A&GM_d?{yw>g_sh+!z+1ag
zgGvWy1@D#CdZM(RG$I2q`B;C&twHAkbgSH%{J76RhEqKnJVjjMZn<}_Qbd`If#08$
z$gMNEZA?%$F)xJwR>YjvuRZ~X%!4$CXGX?uF|0KSI17+sC`{@{f~+rO#k|W?@qBZt
z(myUOQHirKL7BkY`i$DdPz^%X+iv4WCclCEPHU-TtYrIS=}|iDfuUXpJKW!`xnN~n
zv*;>{56G`IgiCbqjjZYDTwqr@v>bjXamDU}`+a7ZN`>0Mc(r%ZTWLXxqPh|=Rj}lu
zEQdTR3|v6C`+v(njM70T{Th7Xk}IJMaCcO;Tnd5!WnM>{pAXd-ZMHAo?JUr|i}dhZ
z222U^H-B8&?o09dn3PU8-L}dHL#FHbWU5C}C@6G=sjV5}+#S%Iw!`ywMsn)wGkI3Y
z1}45EtTghwtWlMy{oTgyJl+`bplOg>vZnWiUv2=|QSKiD8x)o_o;8jo4>P#5M>U_x
zF6OLx&DB}(La}Bh+m?-HP+z6md6gwmR_|T-{by0)<aAU`vt%diV50Bw=*oXi8qBc3
zpBfelG{RW76Nl&I56y4kZJD@_#Y(lm$)MsJSFaYsVhu?5ZWQa?SQ4Qnzr|A*-++3X
z!<7sbRgCPq<`P=O$vsHWO3HwKVqoFu!x~5?=2zx;*^guV9Hc1CNHJHAwA%^)lKgBA
zb@sqi7vsLt#I4oW<CLdMeS<;;a;O|C-m_By=_?EGK2>zSYB^EiUqu964{bI4nhVH3
zha9ZP!IPLX+?fjO`JPsBU2@Fb5?i-4qd45I$6p<6pneXs<iS4Eb)afVk@O(pmXNlt
zd3U^(A4}?NG`Ek0y(>|ML5YRf8Fk++5;ge^Hs4IgMWct0*D6{V*`65-D~i&oqP)BY
zo?{ljaKQ3KYjA{S=`HMz00001MYHlSMyV__{!w9a0n6?H?!*0hD_AVOjZnv$7N^J{
z=BW@GXx&EJBSNp__tuak`B%`rvIdXRoS=U>*mi14Tk(1*HXlCv8$r2=^GHcs$-)2b
zad&n~Al5AKn*!+rx6p&XTL3K;t+-z#Qm$Y><IWU3y*9iZ!A=YNWe}<T#5o57;$qHV
z^f|{&j6&4~TX<Lsa`IMEbf3$aF`H7`C@VJqyU&TfiKdSNbg1Wch6x}SZ;ap5cAo4T
z*x##rtXoT!0o{E0Z$ja8&;F{mio?C87R`7!0{U%QZjEHjMDDR!GRQVl;j$uoj0aQH
zqpHK4B8S~71+=jiyoG%?GuwYLd-ZZ-%<)a$!TN$rQ1`vL)rOo_LpInEqffD&@=Rp5
znL;1Qj0fhJJ+A%cQ0%I#i3l=d1dpAQ>Xl6^I>BY)%O*k)pK9pVk!4<5@ef>dHPg%L
zPekv(d5}!ReqggmIBx&&PZX#?Tx4GeAE+<fD@reSkpac6k2@N{Q4CYovzUpqS!6Ge
zADEtTchhoTe3EeKx=m_#9N)X2q90TR`<9ej`O`*5M`}Q0m4uL4{9fSeC^g)wco~9S
z6j~fsYk_1TVslzyY;u^-Vld{lx}8+M`kod~NE*@$SEGx~%2NH@=B2pcQZuGG^uQl~
z@N5RF!WWI_7#MczJQw{AK+I{#`{4RUxr2hIO^w$oOED_=z#BiAb(*L=k<~IM>V&UM
zxjo9u<G41&<4`iFvC7S8Xbx6~Zz<}L6hKWDsAQ|HDW%VS6Bz^VA_kqnhY)+k9Eb`E
z_)NFo!~w8w>^mEF)DzsfXiIJQ?qz(^blr5frU(q>Xw?bwVNy?jK_}o3yY_`-eO|i}
z;c**k4khuJ&)<rJ&BW=Dql*xGT$M~=ZwLtO_{9c^ww`X*%up;gTPbuE1v7D=Exqha
zrTmTcfD_lT&B>ffqhkx8^`X7RQ5ZKzsq8?jp>HQwzPQ@(1caLu0Cg`>>Ttnyyd26f
z#Vr<1YRaWp#)s!LU{_T~jPu;Cl+WFF-H)tlOOs)Mgp)dPO2UvB5eT#4PMZAe@yUMt
zL;3+cZoF0THC1S=Kk)D{XuqT7=PH>T<Yd=tL-helhch})Iq`UZ<4<Z_quq9U`P2r#
z{56(~w4~p?x~Bt<7GXH#lTnln0Vz5?PC3wz9Rv(fST-6EF0LPyQvoEiz$5LOR<b6@
z>n+fz@r%4;#LL@eq*s#H<G8sPVKl!kq;#>02mC*&Vy8Q>^JJ1ac0&a1*>YfFEoy!#
zyY%T=!{6f(=lP>0qVfqx2RofZ{v2An2=Db-z@r`PmL{!A_6@jUH@S3F2T{OsAfexk
z(RbtZ^G4pft1V@7@9xg4AmW=%!6=~&wIm#hAUdf%tI8sY#4N9sG5{or%tC8npY68W
zAYe9*3+sk@f!}>0{5P`Sqm!M?YIok|4@2ZnhbbUhQStsVm(s$g7s>;$h6D-a=Qm%@
zY8Z*8fAw1l>phPL>-3~gA^RZH&Uv}p_&Gg61R$R)VoqSw^7XqfV&p@7{t`;A%vwuj
zvF{QzL!6W*k&;W&z|~w;g%i;g+zxC}>!@9pHBF%TuO*QCH2*KVV9+H!8Qk*S8C!oM
zn0t*`r^ezpkt=6t`<ubC=RR&8h@oS92=IF*F@^`LvQ99v`|Uz0z&pS=YIG5){z8(v
zJ)80>$wbR+Nn}SLn<Go#X0Md=+AKL*OA&9&vFZ*tk-8LH7;x!f;GJFP*_k#5t<<Fh
zsRD;K?e?;jbzx2ZV?@ZUkN2=@tag#mtMcdyED`A|iI|BdHdnB;{gvaY)H{-QR(w*&
z?9UP(0v$vS0=?d*eBW4X85lQE#^->}yr*;-bHnD?fg*6441|MJ{>v|}Mv(hTmsYAR
zD)(N#3rs{ginyjit96WH1N`ag-5+gTE%4?mxMt9LRwRG4Hc+pPjp(L|t^TuWpHo!Q
z4(PTu$H$k*#=A2zdJj&N-5H0$M)`vEb!-V)UhxNiLZBtOy#Ps2mH<nYyzjYJ_SoJ1
zr1TyaD<?#PCbl;L8V#@UyF_+w&)^XHw8IejdLLhF_J(QDEAiiu=RW;3eoH!c&*Oj8
z$MOJKOKvG$Kz^&@Ei#Y@cI+V7=Dt9U-D-ZF02iaL5rlH=fV|zEGMXu;rLU7Wf30!A
zM7Zk-oEaKXLTlnoiX?A|3w@HE%o?=jRK5eP!+MksI$nrhu=a0yqpt0HFibAXW=Q!U
zm!amCJwuRJ&L^eZ<&Kytop+P$#vg-sGw56hSD0!}QHB6>xI0g%B!wpJqmXrQ$<$E_
zy(*OAttQIeFu1WA5blQ?po4WL-d)J)`Z`tTxl8Q=2>MqlIJ>hSkh>pE1tvH~6nzpV
zG51Py2-ft}xM(BGbtA&tTL4FmC!b(K#!Sv2*Ngwh2iFi!HI=JkZSd+n`yoG;XThZM
z>B3~-T&M-LyzO3hiJ?Ueqi4+?a_8WEO?q?O?VB0MgoO+6(-@afK(`-tG{&8_p70<9
z|8NL__xW%vGt{>PC-IzW#I^^30000R^KK)#v-RqzhZW{On(MnfI3I~O%*FfYxD&_l
zjA{DWTJ}<JEt1F7UW6@!m*awM>o+*mBS<P#bj!Rzj56jC%EBY9-CrE=42XDX?-)w<
zIWKj*NP!-0RCEhHD>Bvxj9Qg#f=^4-s^Tk=ghI<+9m4UUj(?!`VEZ$-Z>(q5Zy&^%
z1;m64YdtAp<V0NaBHm--!wfi^V4`Sz{|KwT7!+O=#}<Ta&_1AI8?WdfM+N-+hpj{j
zAfvk*g{b-l3ErO=Wy#d??2v2^%}z}VY0S!6jm&TX{;li^0^EU5(;_;lBzs4$U;R|4
zaRib`MwD3~<l6;pG!lz1BUBL2$UBv-MAO9!nLw~C8C;z??pW`-LdOE@Nz`&|4d8W=
z$9@O?R^qW|nR5{T8ySlaRaNVFi^NiO^ToMg^V6Lb2t~L@((D@%QAp0(uDh6FrSVA(
zc94HQg5aqpDL)L^k*OMNr>Y@MykR!23#T)p9;0evYMg&=O522FsQmU7$p7uIr3yJt
zP%VHYYftYn=HOW5Ch<z7)S;e~FKp6((~8^IPT-z(YsgH)N}>OfYT*PIRlPlY+;rUS
zJmQ_cF?1%4Ld1`dtC+o3NJ)$D;~%C&GUFV%4WCkRV0FrN<G0tx_(Qlb>f=i2n-g9C
zMY<Mx8d4EqS-%`O$-Ay6<rV;>Axd8*g>f>kjd%in)8DvmE~b~uP_eqnkOsNs)lX;D
z0Zh1@ZnS34if56-H^O<uLi;|ykYo5B3V&Ix^Xkr`dQ^B|R0kFJ*RI}jY5I9jp>gWc
zJ9Le@MIzEkC3`Cm$58C>wUPKAKv(X2BmM!dSru_HxDvqp;ebsX#;S6SjXBb!MslWx
zNT8`l4mLX=0#e+`_u>X=?g+!~(KCtI^GL$mu<Fq-+!V<n=5?B}cBrFbesw_#vlj6T
z!&+4lnvZ7y`YeC8pmieO{kywn-FQ~@69s6G;FZY~?yXgi8vb?kQM@|2ve_;33&1>Y
z0XvO?K=HjD{{ZRtW!+ebBc*hXfo+dx)?RKUuj1kLKx*R7hGFqS<cF|f1=-~!Q`dJF
z)Ck<^xzDlK9$;i~X(7JpO~#xCDmb&>vs&&wt9z)M-sZ*(9?c5xM|@7<a5s7X?rhV1
zWrX<c<`T%_x`|e>XcHJ!Cv?M>RTX$ocB*#VaTbonS)cE(B3bX_|E$P~w;v?8JEwj2
zOm!68c8%Qfr?$>$WKaXRe(0o^cw2gxaNbEL>aP_abWj@NH=V_zfM;(iV%VoC2QISP
z1tv4f1M;WIxRB!?pXiJ@6+nvM=kv<6h(2Te;qdYf7j(3#jElqnHx_w=a@U=Hb=r6!
za5d>zklg8TsNfM@-<$~hCsDQi0wxK;6c){J@Sw2Hb~nkJDm3QV1!U}<&x2%Lmwj`k
zA3r%VZ{TSf^16u4hsu!BMX~O+Ar3juh+;xJy8H?pa=4`o3YP<U@QkV0jCZMO-~3gJ
zM@!%P9`4j^apNqkJVdg4w-|?j3m*)Cw~Qls>0XDk;2*9%3T@VP6NtXq3?SA|j=Y*Q
zaUPKfpfCeaO(Op;N62p(Epv5}?=NhM2*CH2xi`B|V=RZEHDzVh^y(6;XQZ>51)3tZ
zIiqr4P_>s7ahA2rz224L69D)4EkiNrC=ba%v|Q4hFRB|dere2n#EHTQ$k&lg!$l%3
zH)46ZDT}ieBbO9@w=CbxgjYryRlcNu2jPDT?5gB^xJfeH(Twa7lvNDbN8DOtEduUq
zxL}9^0~~sYGY}D7pMARl6G;($1~D;mXYoYVxo-)DTpXb>#<=MYCHbk9A0N;SW^MOo
zn0YVR>FVTqoQj2<x)IseKG*t(=l}{qfXynOY{war3#1VxRA=p&_bQR&lL-!j*K=j1
zscUAEN5-9Y(V#IK{8rddTH8Z%+^D1PYeaadxvz^}_?O??j}CcZbjyP!cG{WuRpo{D
zG{_oZ_}J{FvG1RvpdVJWh|McP5-f>NDvHmDxI0u}j9&@02+=-wK}}b-n)VxE1X>G~
zkPR8Z8#I*p=OuB7Bzp>2{g5)q5FYs9ph6(#|FxiYNFv)_o^at9;sE%xb7dunw5ajS
z)3A1q8~Ch6h6Pi3NwJRL@?Em&jspX=bf>U#drEj~xf)-J1!lIJjQtW5y@gQf#)+2=
zwdi}R4RID#D(0wxBHH4Hn56@4BI0|%z!w@8^@7de?qal>K2f3HpnFnf>y;O2b^d(*
z<+#bwgY>NOe!wR%9c%3asflw5?61)_j0&sG3wlJdgRW79i$7VGGjOjOZmiC{S<INY
zx7Sg4Oc!A;Wo*Urt~N1~4ze$vi<uZ_Zl!BX;orFIcl^I(DGWp2TCkLR6Ig0se~j59
zrPK?tSV%x<k3yg^twEs;@Mc8j=I*%CYTyj*Dnez`jsLsK5X>C%cq(Vz(>1ZoOocb4
z?O`s&>H*3dWf52|AL8ZU=k1yzIv(|&0BT!UQ%fH#PDiT*m_p_coX7vfY<$nk>8Pu8
zFfe)8L$&k@Y4?OrX39YRV;0?SfD!-z003#H@Pl!blH5ge0jY%-Zo-jXdnx?#v_`d3
zju}Jr4eM)k(m`lz-)Re^-+%oPcpUwQ;{|72k*0-$zWx2H7|DLmt{*NDYkpo|X&Dd+
zyX%w4ZK=L!AznUHIhXb*tjSo+LwUj{CbvOF$mC~g@ldGe{gK-Msah_uXoB?c-Tph$
zgW&(z#tc2y?oER!R<a<u2+oMI>qp<S-&$TFCJG^K<ky#${;#MLyJuB(ENvy<(<D@z
zh~Uzqsf>bpLx}?Hv5%c5(B`F_09#Mw{@QJ)Pm;WGadj&~Y!4XT7jLGy6!DaM&i$gP
z6YIaMXXcR6izKi}X@Z%@M97HnK>j9Mn@0_zg14wqun$1YRW*V+YCI6c58e0N@#GFN
z$_*NXx4AaiSx)U(^M)yL$Sh#;W&!FRQq*!^u&`f7=%+3oh4wIzJd4y#YCs#=H|Xu$
z?k=>Pp1Zg%&7(+nocqf#4vF54Rmtknb5n0Td!hY4TZVw_5`-X{m&1X|=&4^$9+4@}
z&*-jSG%njQk#bd9%OH2EjLbzq{()tnET;;ur0_AB6zU%7tKzcwj@1_5aV;|l1vB=*
z!mr&c#a+VbAU#z3ypOPUb}x(k?iOyS45Y1=<caS6xMtbo_!C45bNtC#crYt?M#FQT
zR3xYdh-MqW4=C|f)@Ps6rIA`R_hDi?$E}3q*f9Y#x$Jb>f?aYP6anfes0>gcBY%@O
zZ0F;>UZI?DyLRl2LGECVsdc*S1n(E8Hy)<#UuM+LUun|CGp4?9r2ZJwL8f3&cEReT
zQRsduTW#qSZYF+f1QZIXXLrlk!Rv;#Mg~1#+y6SO<kNEXaUo;oPQ<Sgjf`(Z2B8*{
zp7<b!-HW59CzLog&WGLg#HF|EQNrK?o%I<}KF&d&1}tnK6}<|fYn%kv5IZE?e`WQv
zn+Y8_@Vbd*1evvOX#cU`4tjgkCc{&)+CN2cv~{l7i-T7~8RO50eVZedzVvqJ_ivul
zO7Fd9q;}nw;SnuZsFX)S9{1UT)2SD${O`gb$(>jbZ@}b2RepDzwtno7x*!+IB&ez;
z90Z0HW*`XIQL@*0mETR;FJ*%@!m1&2k`BB7rwQIHsHCJ<?<sZFAG;!2Lg<l>AnHH7
zpkK{O!^TQy_HbQ3h0_!NK>+6q6_M_fvQo8dxU>F{G8)xKwxo614PRjNi@zi4sZC(x
zaVRF?Ye1#;-Huy8;%VmENaETyvT@=r)|PXq<T%dR%CFpZ0tent_0&HneO%op@*a$C
zgrMT*Zj&-7^QnzhZR@PjQaU7W!RNQ*vpD2Mz|L9H;7vA3VuKrURd*vs@Hp~QP)Fj-
zozAB}{?=QI+w)7a)ChdA4vr#TNaC#sB6SD_VXJ;^L<mjttkMmBVdOaPQL4@{kOj?D
zf|Kw+E_%P}F0n!t*>sDdau935{9&<2&9%E)&NVa#^*UcCKBcqq_Q}w4nm{d9O&iL)
zuwoFKtyPo=&sZRN_*N=VI^b?Z6Ii`6A1C-`)kXnvx;WSvYS#F*Lryx*Kx9-kC#-9v
z2k+(dGj)8G<`9TE;J_0<ZgBi5nv!7&r}n_|A!O4<GoG-_YIK*oU;#o)fIfBX_`yJN
zGqA9(^%Z_eTBdDxQpqE&rea*bBA@-isU$gp71l$(ga4J#>Kaq{E~2T;nIX(|;M9u9
z!|b56iriFS+iGZ3x}#Ir^)s14F>);vSp>fyn$t*z^nNJDwFRXi2K=Z6gh|sT$sFu3
zuI-f@JgN<aviL%#y&gk+eMfGITmDJ$RMCdNU>*+Tenn=nnetD3&0OQk#BnizrT7ap
z@?zeuLRQdDb#2k2VYcN$JiiUk<O?Xe9!he6s2tR+bWo_dgsiTF<pj+dP(6p@RbIXY
z0}eN5Y`dBQCx{3pcY`*Z5We#9ne7O=U|kcyzO$}Pm%anMVR4&n-_`puLT=9g?B|w&
z8;>BM3X>Zf><ivYqP^go$P)MXN2#<=f3Zi^h`$8YTd?`=GkZr3br|UVeAqE2cFus1
zNQi1y-iwjp9S!;etl1bd&5WT_3e?3o9Vw04K3^N6_oxa%Hfx!^SR{@BwNV7D6+G4A
zIj-8^s{qb&0ID(59#E-aUR}I*xgS5tq<j!g)PV*=9Tbdlj2eNLu(LC6aAHsBIO9g(
zMyn4O4JiG(-czSfuwR?n0>=A|aMBDsn?Bl-gz{jgBk&oBWqZ_5?@0}k2Z9#KZb|4m
z6L+}*?q-%e@~e|rs<3JK=>tASs<wJC))m+W>6KVgPX>OYBPAQ?f`Qe??l$s<&q7Fy
z_Lx0e2w+*lNO$SfOP{yoqp50`YuR-AEd?xoq!Iykg+~(rM?kp0D4?k8#Q*>R2({#G
z!v}Rb)c39}QQ9G(U{c$MP~~WIx|EZ%2;;@Z<zG$VO`A^A$H}r6?_7N=(bBY)9N;#(
z4pKhXJ|*6j(8*j{_=y$TAFH36krFW={L(2H<=hUXlkx&+FnbowTsFioSe5-BxVeu_
zR#m3mC2Ib9uK`$l3xB0i&M)Oygx5N;SO6MNr?uk2A}#N-E;iBsyyTW4$th$6u{TeV
z!Q6=67usi?sZ*9&fiO}ZDh4t>)gx;uxNRs!dKGe{^>V=xw+|aHaz!bVeu)^}?@r^K
zX6vU<=>)MchP?feY_zpvh(F<Ff2$QHn}bhs0L;}E<E!@qM-8{1ujPyq@MBCvN^;n0
zV@ioI5J|pOkPBC1b62IF%mjn25&{k+mMtE&U<{om^Xu1KSp8IfVjob%nB2pkHDct4
zzlS7+*ChG*!ftRzEep}NE7jo&_7$8V??G5}q1EwJ7_gUwT=;16wXgpJF;sShEi1?-
zmp#n*ILLy_gpw%wN5}z;)NTt0RI!2rv@O0%%`HS;Y*A9eJ(3vGbBrSY`v*{V0f5X=
z*;G{CZ_*LfvzY^NZg-VwjSAgsEW?He50=05R#H^vEqDsRNG%V#ns8_iH`2GmVb5|k
zixBbObzko)Sxh%gDt%O3U4~Ql5g)7C^te`R4zfN;f9eK==ZurJ51#LV7@$?U;4CfW
z%LKh2?(fhwo*Feo^oM^K!3%2mfuA9Q8Ay%{h|@KhAB93N>PieOFa1mndA^jQ2*4gw
zKKuQ{VPk`tK)qw5fJD7jxpY9D{wdgFIk!7<=E7E<LuEf3rHX?aZMyNXUF{BDg~LZQ
z0A3pUM&dQ}nN@j<)6kNBfl?8uplPWDCxV>i+bw;x${juWiZ;IV!?exl7AgXuwpNQN
zZq+rXD#5aM5;jcnpNtr)PmKIGBoVg7k1~WwGE6isQ8|e<O-SptzuYd4xb55z=8td)
zeO{+=$DtL31Tro%p4})B=3^t)U80JC`*q;f!uF+N{aIOPR{~FGXi{$@>S0mMuzmbY
z9N;a@v5@>D3-j>DgbiRVT7N@e-mD<H9(9U!bqyG4LnHdK$Q!af$A=k>ACr+BEFh$z
zx{so5_CkGV7W4x;6#&o)G{B=)ssPF`#1r$+K;?9Cvub*awUcnS3&HV@IRqgSf-|SI
zzkb<pMZ{}J#30GL{jIpE#Wagz%xOx3@hK~pT)KrdOr(JzIAP@v6OD_-;+N+Y2!T<B
zaa@qUe<vI&*F)ijCsO3Xfz7H9Saw05J1=AqMBDshK!O;np!{C+)^#j7P+(FA&Z|+V
zWW-?=c$9^KjM6)ba<1c<^Sx|NVWgj$Ciee7aFQj?0lnR~)Jj#B4F!iY!N0gqzzM{E
z1Q4}$4gq<<rzgn3$CSdP3B<|S6ebiL!WJqOKA^{W(`HHceN&Utisk?dT3R&tchb4-
z4!a@(d+O+7?r=`f;kMwh#Hs}A1@)}gO2*AKepOKZ8s21lmzG7`#iB}%m97TaWhhEu
zU8I4NUM!Sh=!<r?^Lb;Dfq!dPll_83H{+Tx{b6RSnb4fOsyP?mbVj;JJojs_*qQ@@
z=0ii3Kc7jVx;B6MLh4tF00bvB>`!ajyAZf9&hv}SK+d)dI0(%a!NPOIEV|VV{Kq8&
z#`El8!$$#<j=nbALUKjdOC$s*^tdvHhTP?d_A@W+YUM`<Uqt8d0MKi}t!VUiM-lZG
zifP;wjbCbA+yNe4!zXv=9`X^_3pE?J9zpEjS99HFe>B;%+i5Bp<-#_~96jLmuuDQh
zqi%y@=%qORI8!PRr+6(jqX6=H;29y<I-f*J$FEmqq;-w8so6G<?UGK+(4Ch^4cQ^z
zrmDiv?WH`4xY^&fgM95?HpiAL5WRv|xCscQ3u4*Na_PaalfCsSL9Z2;4iv3iXh*AL
z@`>okK(B;}1Fx@Wfo5GU!gAZ+`#19Uep0>5>u;Vh#w)J*uEs{}#VhRT*a!+G^i^@M
zjMPqosXjXrr-b%Y3~AY=87WXl{w@WjnG#O_o(uB`z0oC18AT7F&`cnD2U%n`IM0FC
z?<O^}*S-rZ=$a#o$R%_s_j<^FZ%o9;@>#p|WICu>rYDcx9)*L04lXbuB#M_J)Xbt<
zJf~?8%i}bRx#Df5?ghP3@O{%p^)mKG!tZjJmVf{N0BjAi79`^HFvu_GbX|n3oI6B#
z-y>u!P<%oZ_tXUjtwqA>P)xA$LV<&MP;Pei=+yA5un*#GS;Wog;VHj-_@-NM*j&JP
z7+UBflo_(dXSZv>a+*r$Oe-Jai<q=g0Zh^++ZN#Dr!MSOIJry=Z+hNT#hwnz()RTK
z6v#$^cjxq7jkuikp{H82Dh9kQh~NZW#N^6pG!dF55_MswOg08Ofl_F8`E_htGuM6C
zu4w<I*t)mmw~5cj&*<FtdiRVvyQ*KA%SUUJ4B#+q7QFr~9we?*pJTJqLH?pak-_p-
zVY~*g1CyWJt0dbm)U(QrX<watuBtA@{_REg;al2{C_ig>U*-`GMq2#252^MrWdwcD
zO@JlsmC84<4$^Buk__kQf=>aiVud%ztkAzA=Yb%;-)fcUb51!?heZZqC&(dr4f+J^
z$l+!Vxv06GEGzSs=n^TV#Hadh#|$(n@!NYB4hcL_>lE}1{Xs4;WBiH-d_MgCzfElQ
zb(E^oIwMBYfM7j9c3NE<{fM7@=7BC6ozw0|Ou5XhVKqavQpVvnJ&-{;ZeMV{NF;AE
z&3H*L3Q@|!oSqy#)O!1RCC`L6?N9S?6SEk(ZjL>Zn|==sdtTO7qgOVtnA;g8QwYEF
zY3)<+M0j*GB0!s>-1=oB7YG3<NdQhpT~QxZgp|i%+lopayR-imWcT}7R+hI3*IUYm
zu5zdV*G@XV=mqpn`2nJ|3jxGgU_pG$eL0FIG2;UH(^y!vzTgo6D{GGo^Ei;PPhO6>
zyGp@{zb{x$Z+c4cw^r^b&MYElAA(p;_84A@XZHY*qOf&ERtP^3ZvxkhC3`qGwrSYA
zln9E&WiNOi&lq~+jpM%+kNDqg;V6lgkzG;@H(-q}Ag*+>{KbfC1*pi<8yyuGnW<cc
z<(9$VqU$?NdxM`NTsp;YJkd|>mOL7v{!M-Tb*oN+A8pKnFXOU?E_5T&>F*e9ZDG?L
zM=XFePizXHA5CD|-8acorjKfLe!&@3wR$Bd>2_zdUK(OPzhtD4NQ?LU)2y(i)Mk)q
zC=iKj!pR_CaBIm#o-OpU2Ft((PU?ymbmi~s7Bk!Z#{0#dJYTaD-@bsmk4<e@B{r_6
zbDvV>>9UL-onMG6<(i~GoUE`%L9vWGYtc6M5a-81S}rDAf<1M|JRTJAdC<avksu__
zB9}_T$VTTvU*juVS#Fv=%@~_^ywWlPv2)ekbJwMA^wmon^lDkaeqCD4x|0JnJI{@o
zS#JH}O;CTE;{sA)+CF#Lz8`%=&hGfoeec7$Zgw#$jgN?p0SkO{v~59B0J@PO^5Ltc
z`@^vV9U*&Fme0(q<(xzxNtUic`EMh$j_Hg|<XzH{-j)`<pSMh^R%}R&+VL7=PpX||
z;C4jAp4R6bx}Z`#Wd&lsEottnU7<P6|B*28W-9T&Nl5KrZyDDVMxY1C!ikWoUnzg*
zTXFec8uLbP(U!YKS?cgy6q!cFq344LeLDeFAAkU1aqR90#0f{>`=9kqVZLNWj}02}
zoapvpK<U<8kEW7=G&J$tm$ZEieS=i0FOh=tH+DQZEp^Is#Dn}0M90MJWYDbv7m3P~
zRRp5|Z+75aa8*rX*QB_%k2IeOhycO7oT;~Dm@r2~mz*VWjbZ+LQT!0p5eCML@Qj}A
zgV`pBA!#y!cql6&<jBnzVe%3RMi^}u$<-M~E0#w&v@TPXSAum`zhGJyS<8dX;B0AF
zXI>(c+$yDiy%Mpc8q#ijm`~53!=&^Z(L_5!IaKv?+1G#gXV6UA@<^5Yir#tmUHlwX
z=Ptk0^ER5E2WySug3(D$H|qsKkHEw>aexrc!fJ3ekuUT*PE=xK@lvM6`*z#WzRmvI
zbN6>sQftzfeycDyjbZ_sMR|Yn=c*hh!cHFQs^4jsDI<q+Q6nDYX9hB-qMfm^*yp;O
zQodSjfditkQ=r%TX#Ic2+)&P(SmhdSEcbbT=>B_J^`8fuwU0gZCIZ)Vh1AkF>rPFf
z_FAB6jjosfqY328Qz43kzvqGFn)%TxMd4>1LRLsLX*-Tzi_b@LOj+;Yjg>Yn+OAxb
zn_PKd*G%V&Z<Gzi5T(?S6&S1nx7hdINtl|DWByt&JV~bGkjjE75)YGAmTrPoSvyQV
zisxYGW~u+z^Jv(>+M~AY>J1@+TXr3ZveI)$@>*Bw06J;ME79K_bsZ+}vXe755P2na
z5VE(BL`o~pQeG9J45I-9ThMzij+y_aC+zSND&z~)28AioetdOYp2v^?005`qA{VrD
zgl|u<WMt0MUEN%2d$OFQe4)<yQ+~gax-3$%vYQM$B=`)jw#;p_?MgpB7*QKvN+boF
zrm^z<_uo{Sdw4cQ#G<|ql6MnI!X5@+gp4V^(Z9RxaH`%5O8Y%pWU0oVAioTShB<M}
zVe2pS(evTl-wJ2x^9Xvaa;waU{BO?DyJEe4-qLMADlm9yvvgfX9XziX;xb8eUNZ;8
zNv1;sLzSATBM5j3;Y4k*lC5V6An&NIf{{j5Nl||8k#dth^J`fmWDs#mvLj95*WpSE
zpAn&fyl_nO7x>gnekn|T5*}@OaX^5VWQ-8Rir|(bYg0oQav&qV;~#*)Z3*YOI+Z4b
zC|kM{i8dnAz!vP@xw11T`_bhM@DT?&t2=;VY<;oOXzX(ahzLpqf*%wEwOLtq{b?l}
zn~qN!wz5nzj$WSma@lkN+4Sz|vXL*BTw?q>6z5Yb=#zo|F$S~r5f(tgPBIwCTF;&!
z-w)Ud+K~Vc;h6A|I)Bh_3GwRbrJrk#{6mOD3#q1HuOm@)O5-MpSWN%`s6=(hYPrKj
zRV=QhDs;U^Rlz7TSYS}UD6xmg<RMq@?`;<zl`VRGauqcynhYv?KSTj3VaY0s?vmjT
zvLC7twr@J@nlt&Ha=NC<v$lM2Q@fgD?qs6O(Y9!bB$fb`;eJTF@sRTvq(CgtLu-Yj
zwo_^ZVn{sQQ0fw*-hJ3n(t<-m_Gfd*N*>;8C{O;y{=L*lnNAuJzLx)F_|T}=z+`BD
z?cnSRqrX!(pJD2iE`kO(+kSBzH(pL05kWehf8UcH|0d%bbKkoQWPV>%>CoOm7!Z+C
z4=QB)`s96pkP8aAjdJJ%YAk;;2Q2!;tvgA2WZ2)28%7MQ%}jM0(+312RF_sm%0AY<
z$I6oB9_5(y@snuh0I$^8ZJvMzE`mR64PJ!GsO4sOY-?pVK^W6Gk*c~e26m-7fyTL|
z&7==q?$3zGi$8F9_RZUQSmOYy?&~zN$tl}|q~;O~u7_YIY@^rN1LW>&W)7MPvS5(h
zLh_yMh@eQoWU_CTCnUOO3jZ8-rnl3He$ZeXne|27#p;HoudX4B+=q+;QY2^&qc@qR
zb#|~AWQz=tB-9g*Y_$|8^U~=PZ*Bq*ANmA+F2k5#x2bjPgk)#s<ezs4s$V!A-hb>c
zgz56?L6)pf3fOFmKhvZcSIC~s8>BN{AV)b#@!2Haqj={3?CEwgwaGrRc%2n0KVHj2
z9-z)Xvm6kq1B-YbvpApVCwE-3VoeNNAT~cdCg{3VOwb?qYYG1hIxi6RyjGabxLiH0
z*$fW6=R5}B)~XE2u1yR|JZD_UpNoJrOR+WAH||nHTxHSKN~6w{Yiq-F9OzW8&EI1j
zpo_ut7TX33(VfS|1{D1ezY$+Yt#}dZ24yIzr!$}W3Kc2Uy}yL&3Ji-y8eS^MSQY~2
zj~937UH45@u&Q%<luH7#D`yqKR%2;Eo~$pH$Q$_Kvd0Fc2E6WIt1TBqeuj|>8+d15
zX@5SS+#@~&5wk=q#l!jx_H8@Nb;EnJYOa6M{*_;<C$OTL1P2`9rOau0HhY5A)Cvgs
z<M)3rS;?qiG>NVTs)`&0(PhAqN6ut;VTJ1<RQkmYQ12KIK+W^=No8HP$5zrtM$Ok|
zu1-1^AX(%xA;u|)x%rqy2BZ<MjN6wM6(tv}*u{X?lh7W=C&Q$bbmlVCoXV2){6U3}
zl}1}&!<@dg2C%zZMyj2Xc>rj}6vFnziY(Z6YyLE9w8wE6bc`a_%v5*%HorxB|Lr8j
z&OeO8Md9AnjMF2$M*A0+OK@I%jpwF(XUF{L?QjZj$t2>(Nf^J|ImceUR>h(nD}~jP
zf~%S~)I+|ALYBuo>vmrotT~>x4aa7ar+zp>V-^553r)ca_%c?@1!k*YX&1xPd`^0?
zbUiT!4_A?tK||?<bm2}s+M6~tpF+u05;EK&A!8)cgmXT0WS@+602UB-5jJq8kFM?<
zwtX_J4QYeU<M18Jf>*fXeNNGh@+;Y5E?SE<rR&Vmib+3G-t1yXEnwU3bCM^6`aBF2
zny`6xMU1rjg&&6ONRF!A8VK%|z$4Omf=f1eTETqkdOQA;{+2+r00002Gn>d(8wQ`M
za1{|osWPnHJ2Nh;hjeyz5H%M)cRGt()aJIMr@`=sQl?5k&4PBMgKgG1jr$Zqu!^>|
zmsg7D@!S1j=m&5|0$A4WjSrN)l_S055IxdnJHansx=@#`gS~OF!zqTT^Lug*nP_b=
z4zOOU)%_N1%d@D2P<#&vRea7MzXJHZ){r~N*71|V^uMMO8G$uEH<)FlOg)<M+UK-U
zv@5M4PVFZl2h~R0ZB{nCgVy=zX8yJ+ti9Lt@`u!U$Xt~1a8s(`sMkIVrD|0vB}@Kn
zb*JYts9KzdhR^H<!~Z7cco-o|twrTjtknwpN3ht?LUX+7bzNK~80Vr7Auz3vKjqEi
zgk-{B^@URMQPOlOoQ6aYU@^Vi@~M$kzMj^6=^p?SS2%kSCvaqX-62!b6A`Aoe$x1!
zm+Cm_GHXvC=)&hJKwGCzoSJu9ze^G*lMRfgxnHT=De8uLy}x#9Op+bm{QzOAbPB~Z
zUi1E`Z4rR8xT$rm5?R%BFw+dq{LVKsw$#LMPIcI9>IDfD%4;#&&v$=PT~2aDZ^<X)
zV?f4Xn^H}dgGAzF)ykHrTJ~)2*+)e)>iIzlsEh5~8*S){?;<;-!)L5_e&jvKpBFUb
z4$POYn%O~gc*h#cR^csVS*MYZz34h{XjIz!lQsZMp+KX?UNmErZS`$Ard>Hp&4OGG
znZ|qt-+m57qAHdKiIzTB6M?l>{k+Q-u%m}^McrT<b(3t4-RokkG~Q!rY)lC89W<-x
z`jqlUD^r+4f+bo=Xg$BdrX`RkAUyRrZ<2TfVRSU1HYABG@{1tojlB5uCu0AP-q}x2
zA7?4fn$_9+=QX%a&#^tMloh>Y6p03DShhOj$fY;-0aR2z7v>8K6(}IMoR^>eo=Slm
z8N08Yx4RtCZd9REMFd-K^=h$KHlhB69i+?3j9T+;!!}_Q%1eO!j<j+P+JxJ!Z0cRr
zrO$?VNJuYMf$m5A=MhC%K$pYdmozzzKPaPXn`OV0z**VV&2&zI&OfrOkiQ;ufxWX_
zc`c$x*3nUkDMfoJ=8V_H3Z7sf8<`lB^XITELWBPJ((f8p;v@!tOSWI$<YON*x}aI#
z5pW6VJ^UP4#RtMPaMnwfCl~PIzzKH%067&Uxm|Og1k5{|k&}t;--wS-ZibG4-FatQ
zBG8_Fq^BQpu&cYho1{r$lKt6pIF=gEr@H{Wd)VyLK3%L&yk8-{!k!kUb#QN=Xkjn}
zd0IMp&=Vdk=NJFR3-&QYfR|6UpW7pnjd1KwZegeu!p&UvJm5&srNHn8q4VtiUOT<?
z&Mn2|JL`)Rz=NG)5pWB{@)GfW%Qi<2AKl%n1_OtFjA>W8JS_op4zhA-EsuH%DegOe
zAAw68!FfHY`v*whBcmmOtK1h?Tc@i1pVmg7DwVX%l;?S=?l#I*uu#EyjZ~G4H!;Iu
zlg~z_y0e^aAT6Fn$D8l)(GvX!cEC<5t+4e9vmzS6*U}Hv5JC0%N&6m)vE*tl&YZuo
z75m_b0m62peEG~9tWslUB_#Yvfyq2x|5<N0^DIQn<Oa^A+}9h_J9Lbg2-Pfo+7HqX
z!ty8Vkj8J^%91y86G#nxqI*(n_y+`|jE#YcVZv)UKX3{3h6xJXJ~;I-;Q*o7(H4#1
z(__^^UrvivZ)3tJV7ZAO1q>n!evX{U^gdfyE63wN)Bh9vQ9^2lCn2exKvQ@wy<M;z
zRinYrH3d_B4(cj;G3ZSo)W;a<tetch#!*x}jbuMXIDLE0HB_$J0000v_Nq$~WmZH+
z^4q;|ALsIAS*a+lD-!E*vkkOj63=lyfPI6WA>duLQ>vKrp{t`&MFR+}UkP&36-q)I
z)9z+m0Xo}O)->S>UIXRSORmElQMjLhOkN-Nq^LX(F#l3D9Hh99Y;H|^S+9WZoR4J^
z`_i%i=X_BEl^r6(mNFY;b>uj0xTQ#L`_cH$i)>Z%lGNnxtShyD3i$3F4RLyAJHrb&
z@q-hux|#bP`nzREO-r3nhH*B3Z?S~meWbo-hjzQzZ#^R66z2j4O6YCZc{w#WnYeYc
zKndz{Sg+w3L0OA_Rh`bp)B&eGMM;qx6NwMAmq9zPpNh8u)2zWr0!C>536AY{Kmh#Y
zcS%xe8gEnPv>lvx?>Hey!Iguk_g+xwxHwYZ0U4RN0_E)$lk1y}uOt@Jk%J#s36^X3
z>=a`Ez8Y4=YXgs<G5J+$ts5v(ElU>bXFtkcj<&6F&g=pFV&gL^<>#WUz}~z2aB@;y
z7nhJ+s`yb8oLU!UN>n=fbR|T#B=RnHy><l4n0(4Gc+LnLDe`l;p@ECHqlZekpEh<j
z9@`#Q*kx9}JCw{=zggU6D>Z@F8lt58j~I`#DGG}W`dd^=WtDgw?Blk}aq@6Ve40#!
zg79+E1c4rRh(~akMMEj7`r211Jauyh^%ME__aE2wgY&t(v0{Rc?kM<b<&K<NW@J`@
z7fQ2=@MJCVw~V9KEmu(>QDE$9cRmqW<;9^as3PjtU%1)0|5bq9#ye?fVZzAd{_3s@
z{9Vgp-{G7nKqQb1&@f{mpg+eyRnz5>X!<E&9y%LWCUA=JBYius!wbrvJ+z6AAX-a(
z6jz;}y~8zb<v=0%r#-D4UvTWoM4N%h+Qc!taH)+4b)=yQ+rBLq;{%wC*Fzs0h#z}U
z`#IOGG-Hz;2&zdiWP)I&0!eJKV^$s*Tpx{lii>Lc@+{F1F~WWsPb!jqz@&;0^0Z1C
z)K6G=6UYRt@67Bjp#8&|t1lsRdI|gdW~m%y&51X~b{+oqs-|F~_@c=j98;8O^#W+{
z(+t2M7-hZJwj&WS9P*O5u?SgiczRO2!$Ykrg}+9>MV}9!vi9R}XqNn<_iq3JB1hYz
zw+FLeO*zUu)>79(9-r~{7c7`tXin-dU9~#Jg*r7Ge;&Nzou6tWH@wLFJNC&ErrVa{
z*3HuYUjDZpOp3`5-ThAZBS80#R$!9Sl$T^r_8hg4$!)d`t?wx%z;x(fr3)rfULtoG
z4oHkU014i_8EzXvT4Ny5X2wsAbDMxr*h*~nk%*sq8~m^~!$foQ;ud^`9T&;fr=mhe
z(Rp`vw1GvyyjZW0Bw-%Z`GF*@Z~PE?jo>Kj_PwYh&k^!Eitlvx{F$Z=hV7S{?s8(!
zJiWqrtKSZ>Uei71ySaH1RYTVLgNdmV_|mWsK%p54TaHkaRVrs97NA<;;g_CD^xn@l
z%e=!a!A3$^9c_khb+78Ij%e0EFLx&@eJVAWaChp>L!0G4KtsDOQH{swPtrPFw$x}6
z8fZ8*1zcZ-4$xtnPye@*SZ1+V4kZ+jid=nm2O2^r3jQvlAl!R;wGLAtM|b#a`4BDN
z#-<~=owsR_dU){b&ij5<0HwAyRgtku3W|zj9HghIW54s!17bkDSO%?82&2B7Q#Y_K
z6NeEu#YW6|vv~Ypr;g$<9x^nu0y*W&T0qx?eweNi0=x7~_?ZQnA6Bsx(Iwjr2ho+5
zC#nW{icuB*)BPnR!P5~80<@Z6krKoyr~}Ia6M1Z0vaAk&%_*NZzIK``eB>efA4>to
zOLSF-bzwH2dPh|Z=vx5a)O{hzcP<^tLogZPut0E>x&#|g6Y~@9tGrMro*1hUEpx7T
zaub$K(oFkB9m{oq)gJKs6}oJ!NGhMT{74~U&bN}RM^1(-^QKx=mY`;sXWn1lNDY5I
zS_BU!HP05^Kekw)fvIUfi_GQ6x`XVa&WBfApNlY^e%^fyaWo&rLT+8!rzT#_z_f1F
zUR$Iz0000TM$thQv!E=`^QW-o9=e>LVSXu92_NgV2)(#n#}ZeQDmm8<=N$XK{ymx}
zQ}2D+(ozt^_2$H0JE@7vU#{pD5Eb&|J-U9qWxt~0V56xg)m!_Tng{9^m<hGOlQ36o
z=!ZL%?ei;mv+@+?0lt8y5QAm27P?ba3b7H?bBt@r^38RNB)lY9u2c+EII#o_@-nFT
zkKTt{5NGldH9*O@C#(>o9sgJG&jfAukQe>F5Z!CU+yc@}KwxQZ%x`MrL$N>EFz+ro
zIb3T7BN$X0eKW8u3T{ldOo2YZLQ!rLQ_rJzEZ#<LQ7!Hmasf2wr@(X^+K}|wgjCk=
zv~#zJQz$o{MP`4}^=}3lASBnhe<*nKn%7dSl!2#ZmVjFb3J1UVbVfC0N#8QV?2c-k
zjtKW|?;mAWW0?iIFclP<weF=}(oaN5zQ5Osmut+Jmh8pz`yvZ9M`MWk|6}}1Yu2gn
zP&C`Z%M3sW!^-xkf&oA<fMZSnkW%b03DRd9(;l7Tw<RFJRuUdaEHyB&#d+GzA$_+V
zrXun8-Aos_UdU-jB>h-2sFSpl>*N#SV<FNsn!F9G^t=o>^^zUbLX=qzSQ5kcn6FA$
z0tG+ZTn=4Sw`EGRWiL-el*WCSrCTheS1T>SD{kJ-wY|0WGxG(Y;D>4?QD-FXsz>gf
z)5AdP8I}z1N;Nlj@Ko?kQT=>rCue1c+BXxToyU(*QbL1LA$TrdT#T#^0zo^%`nm*N
zWD9>mYlV?ZR6@qm%o16oY=G0(PldZ=1U?1(SzNx#`PLHEVxT$3e>{^L(r!?5TzPGP
zixucWf%gGzs7!cPfJ75SZi)tIQ_&A?j<(EJ`fwb;x0WN}-iu$rA`dpsMy9T89)$$=
z99n_3Wyzd~`v<dAHWEN2aE<tk<|CqlN@N8!x4RVH)gC#zboVF6ynOdTPndS>GK5SE
zOg*3MaG4@uBbW%bY5XsEj2LHLRkQ@nX`+ki3g9wIO?7OS*Fd1t_vs7nAR(9HK2#dI
zjd*&*%Ny)Q#j9~atQMu299k^>X_fPH+rofUtF$}x!YMev*#92tK0lMpeD=v^Qlm9;
z+5UU8;@6Fcz?w)Sk{4v-j}Pp)hC*M5`iWkg8}cb)k9mn|{`zahN_b=5sTLrsM1s46
zUuR_qcOVIjQtak@XMsFwTpaR^?3wsQiZi0dXUXr|ta<W&!6OMzG#;ne|Ha7C&&`Qh
zF`WTqG{H!U#QG26XieP*fq|W#NQ0$vL05d06dvclp0Hlgjp~7*Mu!?<NVuzjrtu+3
zd>SWY!|4haDy-WjQR^KA&jmhHAzV?SCLaCs1F$2v{9z>F5C4@bB<~5q_kSgr@p6hO
zfKzDBTD=T_HFkivd3(|v8}@yC$m=DL#SPn5R7$+>aYeWmvHia3&u+uS9Gguwt1@^F
z&p$)jfU6(8TL(k8Z&az40?DYdEPiJ6Eyxhu4;|HZpT%t%wzl#6kB}~zbJe^}h>my!
zV9Qe;%Vryy$=<N5$%%*1Au$8|5(|*A9U_i@cEXAZcc8ogm?PV-ElXZfj#+}-kkz^T
zV2jnQP1s_2K6>t;F%k^4$Cfo%xi3{>H`Hko<Mt)nmcQ%d3MEzLN<<@I(mP_<xk*46
z-f3Kx4N61hAj4w@cwR$E=8oqdKldsVCOm(YtQAj<d~`<UVly3-4R%4^xs+-2+fX03
zdjmI<AB8QiGI9{_c$U?rBg<h@g^jn0uEPfnz^m}w99c%FEoQ(k=3sbRbWSBC=$Dg^
zpAP@F8ok|xZ)NvNnUnD*7w1&916p)wNn{bM%?vg%S(ki+0>6axBj3#o%5z2zcJ-0$
zgy`Ns!5jvn&9<q-?YOtpjh1b9YIwew1^$cfvI%}!li|zihgNu^mI3ArxUwZiyK@FM
z3{S@}nVk#e1<|LH4|2e^7^BElmVBjWEO1a=D5vg!*Sfp6ADN3FV`HVz@R6~)m4U<x
zesQ&BO^hdwtwWXrcR8KE3*R1RWQ2qF4*Oh8NOK9!Gep3#^GNK-5q)U2B*X6=oq(J5
zS7ZDqe7@ylCdtYrh;W9MzC$kOD-LerRP2WyEyv?ya~0oxeDEGR?5)p%cx2EWz}M_T
zl>U(j!qWySMp_`yrX0P^&x{zz%IwY1aK2&&;-f<lGB>m*x+T!Z3(FbQ#h8N!NmJcd
zZ&S}n0{AFcW_vO*D$G~wVw6$S<-M{%7MG~QBh^?ab&F?#5607XbeTqcluT(MYNJsY
zgT5iCy#Ac?GJ0OT2X7Vt!hiq(EadnkS&l`dni8_|CZ5^-f-7kKaer-8DJ?q~nC3#O
zH7-=-`p6)ybi=1Ut^(1#SM*t*I$Ni>l=ukH>y0k%dLPa%u-JU%ZOEO?h#vv!O4l8Q
zh$lYtCmYm?xGva9^48K;07@<5bopV|%?oWBR90TBbMx@Mq{^a;l{2!)M`UyL7Ln)5
zZ5VkqhLf{@f!)u*&_^E?ZywOo76|v(;>u}4xO=}?lR>b7iI|?ylHf%v-|`Pl(b+pi
zQw@)FWwaeQr;YI&`drCgF<XU~)+w<MKjgY+<$T2zJ8_lRf7JB@&e-Fvz&a)7n-0P7
zQ<`$>lB_|m8_oIcIZdyv`a?DEvnp5nbTb0>u+U5lz3~7I-5nybNwlE1x3pA<?|@n;
z_;Lp5X`<q_z5+B?vLqLKJI-@SIR=SV$Fh0n4uh!Od-Gfp2s;hNfM#sTX%ve0d|Qw5
zz3{uuI7d{9K>)ndAId0E$fkC$=~%XR+Ms<)aS&x3d%RO>>Jfltivbi5t*UA!udIg?
z-hd&vKJdwP{f;$v@5&>M`;C>rRn}z9Vyf0+fw>?TW?xf(ft@|!4|kU2i7uQ%HA4BR
z7G@tG4J6_!2Q@SO0C!H-fF59Ry&s)+l)pvAvPfQy^|;f=vqncW3hMJEQ%RJ%Bg69a
z`|dxa1GU>$x1PB2jW`foMZHfNYkQ(`VjLk=wo>MOwQ(z8wmIh60+c<o3CG>GMRekV
z_m|0RB5#WXP?oyPD`HuCs8_o!ze}EBTlx-I*bJ;AUiTx0s2Wg6zyX9n*B#g2C!EhT
zErI|tOg!Y-MHq3DB|v_ziSb@Wm~i}2AQA`0At={244JxY`{S5^R(K@ny8`LT-2F9u
zG)6be{4g&b_{D`%8If+K%d#v#ljUByitWX~A-*rje|y!w-U6c^JWKuMw>!elblRSR
zjM2l&>0gUzM;R##L;yA&*S4o@Y52qkbjXvdL{-z*aDNk!wOS+Mvm{5%XqVnXJ8h_#
zHk`|6cR1;9(j7}+*V{2UjSV0hSXaFv);=^-fE|Ss0t*!QWpI7k0fQQHhl_d-rMks+
zeYx9eu;E()MkO7&dY~t5{SA0{HojE+Q061G<o*ofdm`DJ(dH`PAx?~i%bl9VKeHMS
z{C-#41PGjYjKFiz61Xhd!+%16OJ#D2bTMTNU0z903~Hup`4MN`SLgC$oX{I#bc&O#
zN2`;jxnrBq3A1wRgogd*c!tHF_2un(Yob@Y9IQ8n+?G@jX&5PGiFxigh|MA@Oe-})
zQU1)SeJ7zSXkuA1=tbILF;n58JtZ)eS{3Pc-NX9DIYE`u|GS1{e@rm6VVE3g`*0Q$
zy`)0DfGHF-MyR|T3SY<j3F3T&cusH_n%)X_)^iC2o<8c*9uZ7B!vd;g0F9`vx0-44
zb&603%irxOBoP4&f5GgqRl3AHO8x;H$fQ~P_8@yHjMw<7)$eOUEiZtSKqG~*mf&@J
zD@2vpPw5_eH!gVT$rMdNcr4X~#Nv&<zIkkiU##43VNB<4aTP3QGwf%{K49C%J};&J
z^%{$j0;ie2|4X+}0}{b$HLG}_8%JFsdRFY(iw(c+pQ#7xmB9dW<U?YqDf1G{bJQ`2
z=Fn)YaSeS84=!A0fO{tB7rd35R+=aWm;XQztI9TXc%HG~(`$QBB=id(eUby`Ig2{E
zJ_-Zykcs8L5#sPV1>l=b!rv1h$VE!cK#eg3Y?EUd(?orQ%B%t_RWzCScG#pc_~%vl
zLHUJ<tF9C)i-))z*XKxRIw{@41Bu!^bliX|hKY+YdK@ngV?ay#MTU&H|M6zxeBXt)
z2%Lt#L&zSZ5`Pq4y3Qk*TC7$XX1)lzE?_O*0{-_&6;Bt<M5nGOVB$sVw;6VlrhxZ^
zQv~_~I+lQ^e{S34?f7z4&5&d&N3fowaZ-Va36_&<SoJW`)BK76<C_-Ku#db)UrH3I
z444r7msxCPomTNjg&OtLf5u;n>sytA+O+C$TpM%EYCxjhkJ%q2@U`>%3Sef1P8N9c
zk_?4a?E+9*=fsC)s303*VpHR}@r@s-#t3nE2xxf=$m(G$+gdAe9zt1FABHZ}Kq7Av
zf!$J~e@zvyXkQ2vj+|+YRYy*&2a0HaW=`|bx#9zu$6O6usji&R-0&X`N%~fYE)oOy
zZ1y1|Yg2AzH&ry3IQbBMkb9y%KHw(5-2KbUb7S{^klP8`@WgZ+cA6vzQJM-@X@Gcc
zJGb*`99Z8c<@l~#<%Uvh-&J+<snBV;T6ZMf%4f{Wq7hd4>P^_b#CSviz>-k^_>REc
zs0{6QWZZ{3ktb~`+2$?G$IinQaxcPkD(O5*8Y8x<3?F4Yqx(kpQU+<y+W^h=|9{+d
zHca&)Ik9|rr*@}%!AB$dIFFDV5u8<NVYuyKg4UspFGb*W$^r=FbwHc#i=$E!8>b7J
zbX1<mX#S5Tdh4ca<KT&4Tp4H&0?~6@e{9;-iQ211d1Z^q8v>rg4k=hL)AXDT#C{`d
z<CY16ei#gS$CL^PEYri`k61<v6W1*yqbfxh{ArG;i;h~7bCy_U^qgQ@QFw_sqg1Sh
zBw@4X>&ww*nJ~*oDFZ-ww(8%BG#5N@wEwX=92RuE{d6?D8%WQt^^*S+TUk3smq$L7
z=PhMRPg0y~M_3fg>*xbI+M<*Zf<v-$-!mV|scXPaVvcUcUR3_1mOsmHdb2Q|7(V`}
ze(*F|^0-sdfaBT@m0=p7W0+$C{4Re^dcx4rI18=?|6aFpf5-p;5o_*Owm`Mr_1rPl
zHTi6oTnXJvK}EwtD~J9#LCsbxsA|uq8ap&pLeHmj9-k*oM;McA_e3$BhGl_-mO6R4
z!9M#p7m{v-SvFBmk{H0$YyZ0%_HxL!=>(l<JDJ4rGwmzwI3j$IHc3d@7l^A&R6jaH
zPlmksgM6k7=W!;87?DcJV@wV8^b&M7F!qxq&=T~`ya#Sd;T{dnZ6n)RT1{+BX|Fdi
z?P$jcbG$tW?@ojx^Gpk)CDNgiq=y-sbyrBU18X-QlI~8{fm<ixn4N$fy&!=l@kH36
zN^f%wDBcp35tc*skL5O8+I08@J9v~XZz$9fDZQD*(5eZmGc3z0fK&l@_f2=j@9QTF
z8B4f2o6F@bE=lDoi!EGFUZ`?0MqULFBtbc)(hC{)-;-DQ@ZSiWg0qAL4g1TN2T_*;
z!%xq@EAZA~7MS4ayAph>aLd?7Buw$Y7xTkARakQ8X>CMDQM^S+B<a3pQ1R@&5Ff`;
zun&x$SQR-}7dX?ncqr@c5!h8`X|9}?p*WeqHtRmrTQ&eex6_*mxKqWLN7c)o7ie}K
zK%Qtp(&eX~K>=>6)}lj|LKgGgvn~<<6O{o@Sk_1RZE;C7=#;d7L85m=6><EKEV@h5
zsq&hG*RDxFd2_mQg%QB<)gf6<CM(Kb)5*s|%8R(8Fr^`0=>Kb_0%T3t*+Vq;cMtMV
zm|I^R@K%y0I(z_^rTAl%v#agXt-wbhi8_zU8{P=bx20%_yN+y>+A_|F1q}6T<fW8E
zgo7+AQeVTsT0&8>$=_vnB>LJptZ3?TwXGHv!nmXNkb!^;>1GOo1cvD*)m<8AzJ{DZ
zoB1iyMlbPPJ>Sv8m%IbEI)GnSP<&2{E0|h@`q>?m&s&GTuZ12J;Ywdivcz;hf<}tT
zHt{keQV%nm+2q3bRky^d!kKhRSF>PYmfPfC8ArT4;k);qMrD(}JuY*bb7FRJrBZ01
zLWER}!s{O~9B}xnjG}H>!w=;9={tF9*8Y3VcRaOo@W1`H!ZiHr?~+7&Y$&IfNfs-K
z10#wVom31nK0p%X5e^MAOgFFVX_w`R6+Xk<zmPDGr$|bTG3kJE7Zfy12-4M26D2fj
zm&Xp7I}jb55U8CY%uB?e76tD)!kkBYD;tHBxQcajQQycN^>&*8#+FwMQq;by1DoC%
zOJa3~%o4`AJaUBD;3?q=;(5(vkO`}V|3>6w4dp3;=>6m5g(VC#tB~$8zFSYuhq+@i
zxP{$XBL$-mdSv!rb139`Dq#XZiw2@$!!i6vlkk?|sf8p*HLSBbctQnF%S<)aF0PrI
zgTs{h&Yb;yOGT2Ic}nHGFCsrngcGy<Zc8A+Hug$-$2_+I!@<NPo&dkYqQA6@j9+)W
zVzul6G)Quk4nNshnFyOc^X}Nwt~?xMyURU!TJHb*bzF2mqaSvi5j+@d<+*mf$0qrM
zmb8=k{0(*J*~1b?ts^^=30)7cIU|kZFwhXZ8Rb14oLNsW^s(R(QWs#$memHRSRh)u
z{+I=LkE%dl#sceEvR2C>G^rwT@)m<+36@5Y?5<Uk^mA4xf>X(c@!(3*=Z=p`19fug
zENzj%`{V7|!rkAJuaP0Z2OOO8!GZ7`<{z}GU+B}y(iHeedfrdlnf!3g6mHj|OmABl
z9L^(c-51h+`hlvJG^&da7n5a1@uNv~h?(SjKhCciiE+^D661JK;E{f%TQhWAg7V=n
z=Ynv8QSrL2r9M}-Go4GzrCe1EC1wd_TUQUZgTA@Q<AT1N@5aWS79`6V<ADsde7IB>
z&M4niC*8B`%_ww((!P!b^XcuvH#$8@vsC+&s|z_G1E;ZVMkJv#p#h_o3vd-=n~j6$
z<IPSCuHY#~`=E%QRK?CC@>LfT)WZy5;YJu{*zOe-U%_(0bK2*Ng=G@d*h_|29yq2X
zkT~D)6!S@&opk|;GTnS574*0Sf>Hc`p*{D7F}9?#hJJ>>OnC3*vN6Na>2yT1Yibp)
zUb2pt*x<Z`NkTX+Jp;SY{VS5xHIg-{?igT=VsQv5BN8x`${2bwaL#ES?~v`<YjFF`
z02%oW0Nw?9baK(Uq{Y(TB#HCJzpv21Yu&gJcC}l5saB-u*=#vh5nJ>yn<m$y)_vUV
zQMx1<PW-@mmvPzpaav8g0g>I!(Arv}?)y<K`KZf!{5w`gaT+qG@dN;1nKDivorw<4
zWs@osOU;Cu8w_wYAx=Tl`Ai89)m+?#lgL*vNzo}5e`f>q1Mf=ks{tu#5$e(hqv-cL
zS;7ohs;NTV7xU%`s1>a)*7VlEuMNqeaIF`hHt>NVU;6(S@Qo9F&60}{DcG9{+_aGO
z;S<`dij*%EEh`+hz2vksP{qLA_2bJcf4teiu+dFG8*+n%t1BGjY;plSOFfxm+I!j{
zqFF{H!cjS;L+7<Y*~U*7)%t(~@oo}<ITtJ6c1bi`s&_8fQaFDZXApx@rej(tgY$-^
zC{0r&J|V&Tc2AhSwM$G-GT0*3Wj!H!=~p7n3MwS6^m8{IiL!-2PwOy8KTem&KcV8m
zZ}#z|&UQB0+I<j#zDx=Y55noI&v7Rc4bkntG$zdqP|+UXLdjK9t!wbnm)^i|rPMd<
zN56FPZz$CEw#&ou>^mYYF}Co+M2&kw-~g)X!2AWPKmY&&2kF6xF5AEcV~P*Xu9o9%
z;!mOD7IJI9*b6n4vZ>+Zy-fR0UZ5xHrZ0V>u6)$9jeq>6y!S`Hd<T3Z00$I1P3xx`
z0XXKbxLPgSGD?>?ZAUb$sa*Zgkeb8qG1sJvSl)tKvrVC$-~5*F6LfzP4Z$NKhh<D)
zl-oc+{JpX3vjpPne+&69<I7G_Cq?5{3Dc50`I$YU0M*rivD~9@^mH;?=gKfXgZl-e
z#P9m=_lP??8!=x2O!pH3?UuHW7wf<;kXqKVh=rAGckdQs)HhRu<=^09`?pctXH5L`
z;#79M^Qx{X$cqM*dJh7PyY#4kI@kM1h~-SI4=BcAU$JZ=0Rx5?&dslAtP!>lu1|46
zrTjN0PSO29jh-JEAu++peb=Q&`e~2j3TJi3WG-q`PCN(&5JC~XxK@N8lbsfXJ;}Ul
z^M$S-Pd!eYox%b)l!M`Txt~+~NdxRn-MN%cf9z>4&q+W-w8z3m#yt$OJ-zQ{yW`~m
zU@zzIp*<>nbDdwcTpMvOf<W489<$AmSXt(C;orY1s$d20=NseMefcBpP5{1(+^C4J
z;@1mQ;&dGW>M~ct`u7+>M*aG6dlOb_^#n_W`Sg#qR%^$(u(zKGGQ1jRn9ziL&a?36
zI2nF|d~|oZWILoQN<f14`PakMiCP7W{V^V1rIE&VS^igjZ2w`dWYk#isL#JOmnS<x
z;U~V~g<8JSchsvRlLKnX)Xd;*hfnzJG-&o^efzrU)E^?_yhnk8k3&IuI|{j^acWDC
zXAxNc5Js4Z*<c^ZzY<x*1jv}ZZcmldzPWcZT;*j)72Qa%-Cak1`s7^_zI0I-=~xQp
z2lXaioI#AMrKNAX31!LUq51%rHH*q|k{n2j?uxZ*B$1xrbq1*d<mjX&miZ)_C$H>H
zSz$1Rv3=0guPc0zyvyXz>+`EW!}u5N-Q22|yEbH$iM)$4gk|L^KZUK>j<aR+MK}(!
z!rM~&9vn}5poqa(1K!n|m0tT?N(E?MO^lMrpr;g{Y0I-7Lw9gY2$Ki6nR^KkYY@?X
z7jw7GX{f_)mr;ly2d!5r`#rzZ^vc4iDsjw21@54RVL?RccCN<lspOt@!+>qmX3rQ(
zq5CAllbfn>D3Y+zp@?`ZVZM+TA=q4v^fGi%S?Zmr<wGcn2r0P^ou@n>qCzl3e3NS1
z88LFz72U@`fD~Dp(3}qm6&8GRe!W^_SMV9{xoX`6-#&Y(8FH&WG(0J=T@MV!GI%<5
zS_o~~tgt-2d+t*!!3=AogO<lmduw-6xbnIhNo&`y1SY|*0z%5M2=6N(s>HvZ4c3(H
zDp`qTk5x)Hphus1y;|DK`dQ1zc;Fb&-I#67OePQ^5`>^xNBh@Li2h2yls9e9IqQhZ
z`^EC;1gc!8sxau5P#Cbp7Um$0AsurYW+y!aUm<e2_hOoy8N{_ivC~4JfCJ){t9eyt
z@!qnqD`RQ~ty*ElWTc&fUBJZCjF@7>fDh$=#U>7S&D5k+Ul8&6p%_nyUX+tsO?=8l
zU^hTU)ibBVzS+wET>u1L!ckdC9RY7g5dNM-Pz#I)zSc&deu$P_OwPGh8Jxw?;|9zK
z)Zk>ciw|TKY%TfcsVW9Id3sI;tqWhzNp3;vK+k^OLB9xLG0oa)=?%~d9C_j+1oD)e
zf1T57FE-JOb1%K5?P6WD=QAbFX_v}62!{q7E6X^V1kOR_i5++UW~y>`ZMI_c#LS7E
zef+P7GG4Wf<daiC-pOP!!1xqeTdRZHpQ+Y!Y3mZH<|$y-AjS0-Jo-ZZwLAC7KSfe7
zAZdSkvri9jPOkw7hxA+Pe2A?EXhmxggC+hBG35PPZeN=GEr2qYpnn+%)@&62%a9Ox
zG3HueUIRVVT)~~peYqBEa~`v#5C8bFoEQ$gsUdu08It@IqoNS|s<C!Rr3qPI`2I8F
z-JioQnvJe7KWkLfy?+S_yZkuZPnL4X_j5hrBq$F^qEfyBx*57LV3tHv?%=;)E=3x6
z<T81WTozY~HT}!bqtgE^bGsyJO($Q;=S5&L<_3|k|7gA01tR5n-h0!a*4PY;ym{{&
zw=LX+Ko{#({SA+&Eq!SWAXp(;Ho@^XJEb#;%29Y}pIeI0e7(T+N%`|Jp=~fA>~Q>=
zt|K)RcOsr<w0A|15^--rl--U;Q1x<V;9nZ2xkPK^v7ZLj2vs3(^YHZ**cANUY~yWP
zNEE;ac-)KgEW6i6i;eIVR-TNoKt5jsPUFgT$B&960x7WVQ(ueDPrh{4`!iSQZ;AXh
zoog7z9pp?-D4mADQnBs%!%^_{CoFl)n3Rd4kn?}gp|Y7bG?kgv%jQY`6iu!}q-aMn
zdfAgS90(@!#9)mII_Dz&%;P8YwkfL-0iFp4*pFVY3e7*foo4_&KLs?5FAUR1?{(>J
zRev~+AHxl6GT$IkrM(Y72$S1vX`m0Yh+gvk9TM$6*5EnGxWT)4Si*2oA_ti(69op*
zmbrG5)ejKTz-yUv9sWg&@;fkkmQ|5jKO%m^;#-s4O`3r#1NCQcH>7yBvUaH8!Zwe~
zDUTP4+@Ca{VCc*zeo=JaJn}Yx=AjDx!aLs|{F8gn2xhl?#ci0DIPH>B_aZw7)_F_C
z>7rynVQ<m!eH}TTsBkRA3Q*4C4AD=K`9dq_YfeY`?!N52uiwMFatk^LQQn=3|3QLJ
z3L_%q3zhJu_v{@_P0K33N^f<4if!(WLsK1zoR}kIy8hy;OLEwipt`JHo?0`DSW1El
zz0HT8ile@|w29n72=XYFj^|O(m!||v>{dH8=M^+_gx?LJc5{<b3Y%zg{<KZ=D+d;P
z09^3Jeb%(`Eh>q{!<VXm<fepIAgR`Q0000koCe(hH?&$l?Ea9gga{&c!bV&=wh7uZ
zu$82VdK;$N2dD7*1rrvP?`wFHil-`!9B+g~`I#ZDQd<%IrB-dCrOuk>D;Lc)5u+oN
z$xA*+O`$Qf*XOd3n4eb6n;q)Eshz1fRVT*nFsHXYtM$B<1F&y@XrmO9Amdynv+XX&
zX6z0PKn1Cl6MH>}LuD%?7(!ppS88(9cDLhxBDXBIeet?wP6Y0dD+C&Zr7hT%%3zXO
zO9jxzO-5rxn~dd-An<Kjdsm}<H!G_9EUcG=LY-r#Dv2OpTCCGoFr*B-Mc*6ZaxPj8
z%%m<@g=e=3_#!t>$mU?F>v-mVifd~~iG>QPv*BAk%H)C`os+hwImz>AnC75)TrFE@
zsbd)Rsp4tBX`qH&WJi3cc^e)<-+N;8wu3g|_{2NJv@=rosW?U|!Kk@RRadGQS2Cul
zG9tkxk?aD3xak^}K3O7Hm!|JZsf|Na53tw760+X~`RNx-BW^6YG)oa&bWk|ki^V0h
z2Rl;a<&TN*VklT_e3M6lq|&6`K9*8ri3rihFW1<ihV|~o5+W=latDr$o7$*ANs_(-
zpb`VIa<)Aq0GD5ndV-Dn!+aMMCO~E6-QXo2abS5@pU#M!!~C%!Z|cTp_u=sLs+?Ot
z(TT^`@s%QD4F3OXZFKom)5_a*d2uC>QS^~2^cSo?Znw-N=(zTV#Yg6E0TNSZ%i3oF
zuqbQ)<B_jQw?0PzQ9!Q0s)IkRF<nuwwb=4j%<fp>u4nOci|Y_k-npt_+2mszI{g7X
z<15=}CPz#5<S|^p)YbUI(r4lrBhCmeXV~}1l0+jk5uaKYt}c&^%RmPewa%9LudPC}
zO5|Yqujj?rw}wk9w#3JMk?Zxty#-TW7&#JB=D7yp2YLk55wO2U$-U+4XSqvJ?C~Hy
zS_<hRz=gNP{fP?pXZTD;oTv_p-~aL7sn2xQM<dy>O_iJT0i(_sygrgNUbv-*Cpj$h
z=q*ov|8(?gxy&f8HAx}rDPP?#y!(SoC8=7oMj<svM$`+*#ptKqz;Xw`ch^WWqSs-f
zy@;LW;rY%O^1ku)g^#g7;DK#pvun0pPRARs3%pW2a+f4z2d8WQvC4fTk$`jK|M3<R
zDFUVGYVKNZmQU~`F7jK?c$%Gz=!=}<4Tv*_$v5(}IVurEv;@A|HZBzMxcTsddnWr4
zpwQ)Yy~!(VS1P>F<!^u4ZI)N3Q&Q+v#bLi@Z7TKZVL1zU^+Xv~yk~x}Dfb28yqG&U
zc1j%O0_?35?opc>rtMLyn+l8xXUiI%A#lNVV&bzJ2G=rl73B3-E5EnY;oB}2`vCe<
z?PKKOhNX%{S^ofQX`WMW<`MgfX3+nL#86%-rzI_;7mmM`$6*bg9s-bR>}*(5$|&eM
z!WTLPGfePoQVTYFOrz=KO|*9?g75LgjgPGu<q(N#lGkbCsbQjCzk!DaxI<)|BD@Ib
zij!9G_b6%JpcNZb66^&_)E?fUf{X(HgOvstn4Sd(oZV6QWQ3KjV{5yex{PRuj?&<?
z$4uc#qMONTL=Ql}AW;E2Mi&C~O6P2#r_)p`vTSqzfcKVW{7|b~VFfw)7ez&rM~KzT
ziVezoLv?6NLDjZT2z>_ARM{rN{1mWhMInXL1`d@fW8ajP8r&x(1}czztq*qu;sDSb
z+-#qmpf9ugmko|l?gH=T8dcG(1P!Y(1cj0tBtqY*Di>LS>L65kg1~O)+Y22G1w>$6
z8OdiUsE_clllF^8rm+klhXjT2oBB(W`nsfU`Y(#;rG0cG13BS)X6Vr2;8_ZJo;p~x
zwrM$T;QZVLherXNd8+?tc<ca(<}tr@_uDr4y)7}lw_^W&piY^gvMZjroWHlE!`N4#
zved6hQUJlQv5}N^UF`Q<Sw&c&B}YxN3JCh4#nt?C>D4kYv>*Qcj+VoeGPE)EP!}Vh
z8cRx~4A*HS4YFq$H19a~?%^cJf+w}j1zb%dGbne6KxR`ITHqeyTo7QU&Y^UoC23pP
z3Y_mAxRwE!@D5H4Z*pH<q_*iqxn}u4So^oC>91*9^NyZQH*N{;rmvE?*z~PBc&$R6
zM|ae-w=4I4Q>%fRDCKc%Bg`!8P%UD#5u**@3Aq64CRLr)whVocblYwUibX;<8nQxN
z4UZ@B)}Griz0<>8;s5W88@)!xX4V=_e0};=_d~lNlf`rt$DjQyW?F|VDqh{`3-XsR
z`TzAPqsKTs9+B<CaNgo~uqOF$qr1io#WJ}AxD$BH<YZZXELd7$ytdqsK8cIvQ)utY
z_N@4JVe2GwJpHE%ouM{H?{8gFA&SDUF^kG-G3{qPF?w}63raFeHNx>SQ1n(m1*?DO
zZ66vbC8-~mFnW*S;1C!BNRFl2qYAD+Umu^~QM0_^T)KTdv_y{<_^bZaUFsc&Jp&Nb
z$xq4FOPq=<Zb3$mNfyhyiSgIXY>@(CJ?%R)a=k{M<k2*JM*=L7AN7ZM=q!}o`k@%r
zxd!V)Ua%O}0kW=`JYS3!Rnv*Znd&_Jo7Fu(c%CgA?A+xN=Z^8b51A)cic|0FMJxM}
zgn38}0cP1krm_&lx!k;~5QpvEyO|SXFzlUdFHYgiO1x{r!ed9od8>GJ?MMErOM_Jg
z)=~IN<|kBPkk#muu$?EMHt^eoQK98juF)`YY@T6V#FU^-D{wsB8?5K~bD%m(52N*3
zui<{uLfT?I-sV=WKIYG`f(V%l*F^tuM#;9h=o$$MgsJ!hSYniwI9@1uyu(pgDXziv
zFWJF3#gjKX;wyeLUS-%96p(iJcLlB3OANVhRX_T@Mzb90S3(PQ(o7bNUls|XH1;--
z)o9$X&bSHm>1eyu=;$^fRDn3goj>wu+tf4nzqM*jcOY2$bKu=DiBpW^&7m2Dp7O_C
zcRB~_qq>mVb>jroQh#P>J*`V~L-@BO9o=3!tU^c~V5Hy;oK$*pV_<s4jttuq8b|FA
zpMK;ZZJO0cNwXF|;$je`0{bVG&1gdG?_j!TqEU>M`|1S{@5%HbV3?uqkbX@HZ+|d=
zzIbQ=001T2uH?N%Z_eYpsKGnm4PHkF%IRsdUhSpxWjwEsu00r%1lW036o#$>;|v3A
zl<WbG0!0bh4BSvgv_^-yZuZ+`3NFW?LQ|H~)bc{i4uZMj_J}6{%?iPHK*vmt17iGD
zz{e%-AT@w;;qbigoQegf1dcm1P^B;oq~n_Z8AYT@b1~*Us7KkZ-?j$1FF+=_b5qcO
z9{9483k50^?n9kFZbF{?tHGAm-*~otFag5!!q+?uJM8|z44gj`av!>BM-75o4Yjpo
z@U#gb*X<<p|Cd-kHuyF`F^%|E1(eM7zY}AxgY<Fa*A~6>Gk1nRrQ?w+yUJFOm|vBI
zfz1arODXz<4)t2q!6Jpe^|@*rp+r~W?Rm^uo1PaV$AQI^ELoAxvJ7+c1=k$?@0M9X
zk0r!GdwB;<qYGz3CSBPL=3kcmVG<sZrpg_Qol_Cs)FG+a=rh&)tA`+}LoIXD=7acv
z!-SkHTaJpVe*y4tJk#3Ybr_oUR&0gG%35?HF9ZFo$6s-eE&+ISR5n9Vm>{f;pJ;KX
zc^Y0b4!&f0Qk3Ipc&X1nG~Iiy(T_EZCnj@k!%|D55>*^|jj1C0-4O~$AS06K{81oY
z(>R4zY#i0b2{c47Xd9`{?k-*KF4kn+n*_+Lq49H%A5za>52Fo2x=v$v%)o;#JnjfH
zCZ%-m3Q>R1c|PK-^esIxCdg7un>dsRO-uukXV_$iBQHa49!{I}yw=>nB-UjcB>(88
zZy3$!XVxzpc6s=Y6_bIWThzCulwYlu{AZG#N*pUSn-pP!CezfQAok0uy_KsJvj)ww
zexXz^3`DNGv*2700FSwBd}ca!we7wQ9E>*HQ3x1@;fz0p%pxdKy~>q;CAO-PzTQuv
zG;*db!;ku1cNCXv@+<dfXwOy&F%Gc|B`Mk%4};T6pR%ICBP{8$B$#k!fbcO9PPnQS
zKg28Qlz-L9{&A^<&5WNGiur6^qw!@I{kY|ow^xr%N3qX}Cc6Crwk@CUIZnl}-l1p>
z(a)a%3^)0u6Mt}V;K3yzKdIF2IdGM0=%GDkZ^s`w*F8j_f42F!3I=oB`PqgBHH2k&
zIb6<UJKy&(41;mfojw{60NK1vovf)mAs5O263}#Wt{mbXNhlU7sYk%!$R}JJk1!c?
z!*>v2?SwteU2LJ7eH~US6;0#I-tJkpYI@9J4wI>rxjY*1;+X@FH75nxzA)TK8nv~B
z#~9sI$kBDa2|KmLZFzxMjy8Y@pJg7d@}D!Kshn2PVPoJ#Ma>E1lisDS{a3Gm(|N0V
zxK-xb$H9KlRv_1`4ICh6rrDvn^bEp0y{2Y_m-kM8u{Iz>l(Gli7L5C#K{Q{n?kH9a
z3PR_dm7>#9NQG}xMn0r=mUEaDNdsYR-;x7vgUb35A%8b3+FewJ2L)o^L+xV-&&|v;
z^@u|Z_`G#iOTQ|X0@C_oZXc^bu~Dy;a*PefEwX^u;ff7?j(gr@?y;H%rYVUeE8OaI
zVB5mDTIVvE(5`Xh_|aZXY4Zj0#*kZ!T)hI~hyN?h+9$2~lUxl4=y%w$bPw_*aUv5N
zyBs*!xM^So<QLVSv}egG-Qihzu05#`mn}l?7&T*7pmNX4B7+P1ZHxTc(;ywrXGQDP
zy-I0gYh3^kpYaP$q>c3&)yvGeiamzW0Opg)d|xOry4-G8y`+hoy#Bpry=BNHU`xV)
zKANXiCO6YLWn2=@y9E)8<{8@o`KV1b(ywk+LA7WG$5jZjkO1eyF?3^>4>8zQzw)w6
ze76uFo!|cl+%xB#9wE@Jif5s2qZk#+5^QjMG`d<#$|}pz&)Iz@8B}1a$IqB%7SlNY
zUYKDqJ{bM<5%?qr;lL|Ne?fq9VDU&gH6ey+^UDCxTq~c8hAU9#C_~REE!J-zGh#5=
zWmz|JGzG*0M&Dgd5C$5d@<Vozwz$5F!C4>w!IbYO)dzU#7=h+mfM<#_ZcP*Hojw|U
zGuj>E%L4n5<T^qs+vIJ;x%Y3>%+`x%t~2`d`c^4$z}8U&jK-Yn+i{emK(Sf)2Y=ZN
za4}_she@I}EsJ-MtwZrPX_TdP++?K5s)nzIVUg*p?=}9ciS}{y*&o=H^K1z~KLGjx
z>-rF52j**cx3`pRszmI+xIMu535<hT_5KqeBQdu|Whw#i<v;Ntt%#gcW1(9c?}d#n
z)hq6u)HY_QeeDn}N)_1lP>!wccx2%^%BmoUE54dn5fmG8o8dj`QP=TPixj?0a@o4u
zJB5f?eYfI8%Bza;N!nw!@!>u+TX;*(4u?of7%qxq4Oz~NlIZaufz@)<$TJb5uKW{S
zs%1SWF~v)n1L4GlD*NavWMD2b5umPzqe;)2MBkx2NE1>CS*{xpmOv9-Q+$<8*@sQT
zBi_WuEMu5mOcRKT0u~n$h+j(H59P)>j7%$?aYPpR&*hVAT!zT7W^<zC@?`qA2%cIz
za6kFtSLX3dAai&6KwWifYs2+Y1}ksK_1JA~F(N*C&!opKXp`h!qFfK4T;at%(G?=E
z%8Uu20L748i5O*9>doGD{YL9yp7hLAos9pdubs;%u;oQ0iYTXv306B}sgx_8z#x+0
zW(R#4mXMj_4tHosJcyetYN;770hV@wH)#cs2UEyu+Sw<2->*Yz&D7ULk^c|HKn%Li
zEClNnRXxma$*<h?{}hNFRDv?^fXQcvLp#K#Pj01RE7kzmgPF<FHLvp*?ENPJ#iHc+
zg?L38cH{w$2IXXQ4MdW2lv|Q}`-Q6#@lM?5EAbr8Mnpg+bWO9NOwRHn5qd}&XQYU9
zRn1y4k`X)*19Ac0RdB0BV~i2`rh=!u=kpWuS#eyzXo}1xc0oQ49%SIdr1a7d%SlTw
z+GZ-&L)KKjq=+;DOsSdywfv_8`!{g-Bp&{}03tjTiE7ZFb7$Pl$Q{cEDNX`%21?Tt
z^9R>U1f_xlQSt|AD@Rdh*5(0o?=D}|f?xxiL4;b-y+1_8M4975S*z3Oh+kXZ1t(jH
z6235hO_s5mx`kzD*pKjLlcD>H(=+1Q?d<r0FimDF!!7|0Vzuu(k01a50B_9`v2`?g
z_~2Trx8R_t|2YJD#d};uUp>Ojs*wt)CBufzr+~=fNj3}JXr3e$bf@S6YbaXtaVy7b
z|B`X@D#TzQLan5fglWg+@NxRQuzI&%<LO?rK%F?;EoJl@Qq2W0eYBb$+^msieV`6A
zITMkeo&$Q#IZU@}<S$(JZ+z7PGDV5oZ2ppnjou<qJ)q-89q%bX?+X3J{;cCHK^3b)
z7>p4|pcq1T9i)>d9Rv7j>AiTDumQkFeW0G+0;9nWV6y)rsztBE1vMhD`*G}}p0^)V
zLk(ZK7}~D;g%GQ~aA>w9gig%mLWEK$4Uu37wpJQJ^uxp#i;$;nX5dX&xecgL*fiol
zoD5hFi`B3W%F?FZ*=vuGIW$G&PXf+`bYzAUYi2nKvbRfK0TqC8y$ZV4%FKl`==MwH
z?(oyLY*PfjnA1CP1?A+@fZ6%J?Hc7@p#_BO4mqx}*~w1j_YXhl@f@<CoTCZyG4M8<
z(+3w+w$gYfA%FfA2XC8q2rHy5C3m<@A4jM4c@Ht3zT#k(+Hk?QkDj_<Rwh-9$zgtJ
z-k2!PG%!eR$f5G{;BA?yZekd473S4Rcvk+;Uk<jP*+D#bHQJ5#M>_0SZK9QqxWLni
z#;)d1qXf=pPEY@&R{3;h_ZK)jh&=avcdNenK-1|9z$^$@tzwj2SRGDlvl5)JNsDcU
z>?=KBI1Cp|lVdmYO(Lt7XfZ?IZ=)L6K9SB206|vq7|F>Kb8zaa-f7sHfsT0%b*I7v
z33a!KPr=y5otU7>OQ<j3IA!yG@V-i(HH)Y+-mm!9E43qW{kx6|2X@`S-HW!hJ@b1g
z4XfetxD5KE9F@7c5#Po~lNfcXY9&+`L-;e;Tsq~H^>IAWOCHd~_vj9_=2F^rVq8;a
zpoFOqF%pv3MB=<NpOmnyTt90tf|y;ugagvwq;!O-M5jVy+yGW&>~NG&U=sMIZj!^H
z<Ah#QRCHIiEbyN^xc9Vc0I8uH-4^LOW=AwCuXb+p6Rm))yiTEy@7XMI_q3VO1&ly2
z1bn-L>~pW5lL3MSA}^2PmJMH9Of1TpqaXy!rArEPXC;+W$PYocplqjcbJ7*w_5|0J
z#^aRfRO`|Q?Hx}#YxgvB+p9hkrjElHe&maEo6iXYO*RbYz6Scx7)Tv^jOY~Z)<?66
zPLFe`B1j~X+9h2N&MRd0N9Rs4VELtaJ0w}}C8CwEOYSS5wS?%F#ToW5iaWgxzU4ik
zx1$~GbSH?)AL8EC7MuRTDfyU@aidM^bPh`OvYRcMOkD2gqE(i6>+f*q;Ed4ZOh@QV
zx`@S)zBS!}lIOf4Uym{97k?kxGJ1CrGwfM)Uy;ilYD3gYjzVBLyB^}~o8HQ)j+8;a
zci}8Y>|EdPtA-vlI*<=2?@YxlcEI&B`@s$7iMQsl`G>UszR@li&Q{#BB2GL3BAW&w
zrfx|;GgXbf64p9!Mf4F#1f(kzPgGrR=@WHrth1(G2#pJ?4=Jg710SB87|H<cz0hV7
zNLCyAYf*sjH<<}jL)YX-&`{~r+L*rV0Cp&6dR|^B2T#Y1a{mE`rOrjkr3GNuM4DeN
z#e$jL94nqJs!vuHQyy|G^S(_v9!tcz=5mlrb_Bk2{j+6GW~X+T$cIzMY+`M|USs5d
zRVMJX$T#33ksC0QpvmXqiN=EX;`x1ZI9&7b5b#Xv3!U}fUhJ5xqM(gzXW>?UxF@15
z5(oZ4xb{A~dk)hu5HD$xG>K$WKJcUPWG6-zzF6%``|_ANdD2&mmT>T!&8oyuSyx^z
zgi~rAUd}5Zmjr39#V!CG1ds6in;uHkhkUgP8ZQ>#D@c<raQ@aL%bQbXjAsU4eh%Y=
ziQbyr?&8fNrG_8b`He9z>dMit9<)nygJtp<xbEP^Y|tkN1Pa3h1$1f!t%z7nZ|*u}
z{Ofarc@`&H0p`>~*8J?|5U49=)O#wKL^!x7M(->eI&I}!aUq37b^&Y1BoXdw+9LnC
z6XH-_>DkO{Qz=u%+$ZOMx8-`)x4flelm9v=rFyJ<V;1I3L_qPaLb~-Z^B9S__Q!f`
zAH3$^s~Jq%qboGT2-rdC$oUgc@$IfVmCq)in9ls*GQ^6(2crBzFEas=&=8`~Y|-Ud
ziE02WXo0bI-Bck~`BKCw{e?8w{3y3vt*!A$ShG@TzvQmPo_~K)Jd-kC8aUXm<GeDa
z12*g{7Rog{dkoW-^~+<X*u2hdIx-L6O5enjsyJAXrd}UqQ6V9|6K@>l?PBT?)MV+C
z7~wI{t^~b$8cK=l<wFr7hOxa#-1M->)v;ipxpT68*cP2x_pc5ju;I%Vw22_TrNyH7
zUJ{(Eg~Nspv9Lm%)dvIJY*(L_l)bnVM=wMcDiR62h^1i88|`i|M@Abci_!yJ0s5$@
zEbUMx{D4s&X%&}whtnC^-q%ekiW&xhtpWLE(XZOxBZ7zD>tVQpnHceTwpxFVuHkVq
z!>M4j>!<~taQX+H*YMw7c-k|PJ#A&8VXIQ{lAZEZ?90W){fw;eGZE0~L4ejoMNDD+
z<t;tdT#T_93RA(O!1w5iHpeeC0000RWDb;=z0rhaeYSt#AhbH6_$-)x&M?L9xR5#r
z6?$}%9QE_=PsT}ARqz{Mmqhf-EpQvV8+Pr)8230b`>hMf>3QIP*UASMY~K+{1Im(f
zzW_3mm`!dZ4c|^pd93X)naEF3my2X&-!Kx}CLA!t0fzgfbHfo1Ce4BR?_oznd~=P|
z6Rd$)&y<|Ku|Ko}wjPZuHRDzAQt8@2)X^BDxavi(h`rKjp(7#P^loh#R>H~5R0!%u
z`uCB4E-O<PH|X|$STiP2qkaI4r9f%ctoSIErHBNqdaE8>ZPc5vWX*o(M#h+s$^KTw
zv?qvzf2=2JMEsjD>ML^?;w0n(UkG;37}vsPnNXy-J{)~)cOKejuX{~=*H(y{JxQet
zbh5?ya^dmvA{>EU*I+m>Am1`WXRew@9w-6eEc#khoYNJL$WC`AtawHwJjnL-ci~nT
zJns=T3^+n8+10sMC2%)ps}+@+XC@qqfIha1B8ia?;%gRfT(|6ESH*i=+mQmu?NPp)
zNO4?|KkPYxic6IV=fHu1P^2tea5F08J^GH(bSgixm5^KtYArF-07PTD$jx`+Xc~gz
zcxR)M`si}MCa^YFJ`3oXC@*Z*pOOV$B0xfQw?ApS4(k`Ifk__f>Xa{l%KyWT$9M&R
zSbJho_~?0S`bS{dq^5<nP(`Z?P3uE@x^UaaBKrSsc5%y{v&Nib!&;Xk?%_2++R~rY
z{#J61`~jp&&A!LX0ZN+trnacfh+?oVC`){e+WWeL4#84(V%Bmz==@n4(w(ahT1fr-
z<1!77@K}#>q7@wV>RfnbGmHun$*rSJE-jXwuTu9cxSk}>5T8y6+51z}rI`KjA)$K{
zt+^KgBCS3<UELXkSeuTbwh<I9fbk$x?ylZ0_zU7QGX0Pl2!G0Jt3({JP`o<w{#2O6
zcB(Ok5w}7>Qw$jc=}3;R8TqM!<N$((UwXmo4T{>Nf8u4gKJc+Qt2P>>i3(V3WLq#M
zUPVg-`QL9ios-+`Wbxl0>{|+EWLLc04rL=6?M(ND2-gi+W22CTc3xb{zHCGgwcyrH
zwy5ukn=Vm`Fr)<dksyo;DaLh@xOoYjg2m=3E_-2#l_h+k+eN9OfXD1KlAG>Pt3WJW
zSy?C`)Rl^eJ9JSMcGO_|u3|a^WQ#+v;nbsiKLaSN4p$3==F&>alvS?~o#yj`7xn&V
zeRW-68Ah@C!kW%n1Y`9a>HS?`M*FmtZUDz~jB$(-rLeBifmI1K=etlHR#5@m<3oi~
zp{CL?S164~cj`-fMi7ZcF!=!u7OvXyk+TGWKS0)>@O<v5avr-a&~qXF1NlOmcR;BT
zYYPUSY7n>c&3(^|KG*{ZeWQDMZq(3*eu^JyK1hs1e=;pydX6G@>N3zg8g;0!(9Di?
zz;>*Sn7da0iM~1Q@4J{BY#+fE=?B8pEohZQQ-Y=*W0WTUhJ~F?=3uit0e?=HgxBb6
z6$~7#sYbE{UP!$eoF&5j9j*CdN*@c)ZXc=FlsTRf2Sm7g{>BU2<1WW;k^nw3&(+p2
zbYN!)vGBa3Y-R2Fgne<}Ls}@s-DeC21HboASUK$u*4HarBUl^oB&PXtf{dtK5et2$
z!}3FLQ1u>f)6iVv#F3zpb2K|*ZMJ6gdaRy+u6yq#+RRuV3#a-DU*8Q9z&h0AebNT(
zVdP|cGC^_3f)*l=5ib`g=-8-e3{Zd*@xwWxX^~04i4`{Z@601Yn2RcMsgj!;`G!je
zIi3)p=Lh_4bqVT5pH!`i`SOLjNkE@m&^PerHogW$z@l}t2vM2y@reL^ONnTR9aNu$
zJ!-oV77lCI>M{!YJx}0Z-~KE?jyYukJM4I_J)#G$ch-fRB4`8{){QH?#RY)E0?A3l
z)z0Y7plP5T9|IziVTs+)0PG2pQ@iw(BzD8=6R9i65C%BhWUHsiV^{ijY<xT;;aQxw
z)uJj?aQl)Va4Lh_8K*0M@Rduq#pNh8#0E}2*)!E1_yN=ygT?HC+dgD#NoCp+wKF}~
z%tPp&>9Tp*&Qor>k(kx4dh?EdN4k4*gGx&tTy~YKICd`ETQeI{MNoEkGWB>mQ5X+8
zK{#k%a?xE+zU|Fwcp*X9+jbp-dU?PiQ-noe(w0;X-3(T{pl({?*rXAV!$@}vP058N
zDWqTQ94W|vohs>m&*3#J-&Wh@D(57?*USwOl<D*)Qr$G)Sw2!5+-8`O5clqk#-924
zPKy7>31|f;*yM8QVR}18QT*D5Tqy_?q@a?cShSpWnB(}Vh=ZQ8%?yM)vAdn^Ly&yN
zCc|eROgkT7CnJg@t5B@7u8%~J-4Y)qz*yS1`aA(@Si+FRAR9F_h~EBfU9I>#vRFkR
zsADq<!OrFP$N&HUSdSaYZ3*Omk)oWtd`r)I`3A9{5y)?nGTi+Io3}LIN7J0xY6Pp!
zSdd)<=$#m-KQw~eR0$fmVO;PLjvN9e>PXwTUmQyfRv<;PxmK{OG3&+s{Fwyl|5Sx{
z02|H1!jmC`Nzhqkh8Q3;1K+8Tbu?}>@E24->wV3(Z$_34*knQ@9`O4J>*}#R9I$v%
zNLBhasjF94hxNAf_){m-22FPZfL$eXw!nrvhjU=m+Nw7-brqRC9=w>x;pW}-WBpBv
ztBm7Y55ZFgA$JWk><Gj$7<2cD8N}gJ5wuwjYCRy<p3Cf7^0;5Uv%gg0lj6{{AMqDN
zxD647=-Dwm3x=2u@z25NKeF9P^^et^r}J5D9=gl~u>a236$CC{Hzgs9!3ix7Y){ee
zm%8Wp-1-{sMbvhlRu|<igZF_dM>SlFyl_9zU{W6wZQ<9c@{^K2J~mLNXejSQ=T-f*
zR_9dtCOXzVS0xeq)z6ibV~ej13uW;qDB=$kJ2JpaUMwMOY-;HoSA(^gPz|y;KBviS
zkIp8V3ln?07ce0xJL%TiyTLn0o}O!r$XRO_Hi^4#G+-cXS|+sTFod5I)ZJKEJMFF(
za|S@mb##<*L-f+zn?#+C@i8X-r!a`e-r4sY?sUWD0|tmF+QKj8P(X~;P=*<2fam?U
zct8%5td!Zzb}1nlS#-qZ!@BGL;_#MiP?I{l%(?j$&B)vu<^c}c-aBQVjmAJ1Q>&K>
z7PxXtg{AgRmeeQ3X>e?oWy*ASU923qIAr7r6C1&V^Qb<m!$K~pyNjmd;X%|QXfNa#
zZW@mqix1B5PCxd%xl^xqBkFk4cYKLa*;)Jl)1xZ!%@lfs7m;#74q8@8#EswTe>?q?
zUfplu`sZibbt?*M`oic)00BLF<YW_zFX?v|WLH+BeIbKLz_}Act~ndLM_Fy5nTt!f
zY=<lxu!EE8xUy4yia@+JIBQ1mVuu5A*M{TjEpBtG4*bb!Ia#D1+=pOg@_4HpM~8nE
zAeVTG0_2RAq}8oM)mkuF3|HR=CFY?#AKaSW=vN>wR(Y6}9t;5}c1VovVQ&>;p>dMc
zJ(p>67z0n7MVAnlIi|q)7PQ`}4|-K8`E&qs0yTHWbAMtHX(}Gojpv3-{OjK^b5MUO
zeqTq+$g~Qfc)!i7BiXToZG}2tNRlpBoi6NX{De8$1$4ZUg>bWSZy%-I8yVC+u^*6(
zKMp@cN|Q+e<YjVFpE07H8uvm1qfDGElj|qNTB9&FcWF$GADNovtP)fHjo<BRbt9|9
z2$Yvg#`rPHjar}@HM(6w+Cn9mbAPa0%!pp)8Z@qXPat9{(i(qMc~jLPlu~i2<&6EV
z`cSR91MW03J^b0k)RTBlks2$V%V*88_gnyrZq;G1<RmSMnOPi~e*Yv3@*pcDqDP<9
z`6RuFDyC{Xvg!>Za-Cjg)=9D==m8_mkbDTrb%8vJe{T1I=tF1k?A~gL;2~Fg7q1BS
z%`6ivG9*~nk;{!nOn#kye~vizQB5cWh!TK0Tp?#kyy2)}sWH)~YD1)mjlP7*hl%qE
zN&7_cL%ttHM-V@39wIahj=X>R?jpvzK-S#t`ui%KFOmX8%HF?j`Y&8Vs0$;0E;Ekq
z2Wq(2?(+`e2Dz1<^q@^u&q^!yiV*$t=B-|V9s;HAu+O&7NHwt;(c56e<#!Rr1TXkd
z9U%STt|Wy@FF*aJnouXqQSL_PwJ=I`;{>Vhu0(sg(vX!0A7cYgZ2D#c6t0w&EgExt
zVpZe$6FC2~<J#p8e!GBS21UzceoNmy_6U30!gOo#Foc0}kO0nh@98J$X4!KYfLJnE
z&BzIAjhq0SB1jtqD`n*Ok}SQ9SudBeKxvY6^TomAVifYHQ#`u*g@tII!cFkLw$^@W
z#`!7inwbXx-dDXL&k0YqIgivqV|dGKdQj#KoT1qVvQ1Sh3Dqm@&fxzz5_v+c+?ya5
zuwXgDRrCQaKuKL<?+xA!1k!^wLca(;xh0X8eG2c%pR;;RGZ-6B9*#xfyu%ZQMX*dQ
zv5A`RtYS@E9U%!qHUAr|rgoNb@sb!#+#DE{V8_+J6hjCxtub#~RHghOi0L&BKAVSX
z%$h6@1A#tZ*pydG?mAu2Q+Mqns}%*?-a1RzJohr7kT8lv$9aQb-Zhn<;vzCo+Q5GN
zdpg5uMxcji1sOgU%sx*sKC0=6-P`47^_*W*zVn#MBpt{gNwEhGr5~vRq^>JE(^fLy
z5gO3MMwd=o5;wFe#u`Dw>QbTIF;uvkoB-H7!id;zbFNx!BlTm5xgad^wNSPrnNu*5
zi;XfBQY;j8j2!xKs!VA)I0pMJxm={ulJ{ZxI4=zpIxB{Zo(i5Mx8E*E@9^lh<@+hB
zWzKYDTx~3kj$pAaAAf~6-P5|T9_Jv>Qk*-&`<tk_ZdlmAU=N*#pbfRkyj}R859acg
z)#k}%q-1jby?gLywb8-aS_0ws@~CpQ_6S}3ikbib0e^cV5VRLuo?DjTXM%bl%T6pI
zrfk4%=TKC~Jt@04B&6=L=W2&{zHEu_Z*MADuQRWF$4@n~NRMwgG_Hb@FFs1L0BGHR
z_>%kqHnwat=R(xS3oNwlNv7}R!ohYP^P87|L5H<WV^-^DUQ55T(@3;U5<`vz!{qQF
zGh?^a_HwA&49`cRi3>v?W8`D(pdcR(f(#Oo$E`?Y#`0ay>}UY`DWx0^mQBSzZU1Ys
zoHL_;w3g@t#k=H9ytorNFH+n;m%pT2%s}5FFmGPI04e7e?_KPR)zRjuuKR}I6^1^|
zi@K^!9PTUWg8o=a@~2*XvS(H@2V~;}@3dJhZ7YET8Fr)aZT{wM4WVvxRB_KcX#|^g
zEeO)L@!_zcF;_cgFrx-+t|T_V95q>mr?|-PqnmA=!2Zogo(Mgm9WEG?Zrs|?IBPED
zxcfnHSmt^cN$bWs{p2n&$S;_Y=g^TfNb20h_M<#wJfVx08=q^_BXAQd&UqCS8MT7K
zL@ULmLGjISz~Io{ZLu=x7<-w22!x@|rew)wa+!c>(@Ve&8Q9!48ipHarbO*MfH)@w
zVK(APXDzWbXN~Vcv(_RxlhL92<&Lra)9j@wkueUL{tTfSEv}*`m#6E}NeG?kmm(O6
z6NSaeIe6!gHE1>ls_PtHkIQ&6fwrNyt?2AEjf2Rd_B(#zm+0S~p`IDM{C@@5*}ugY
zrn?Zj9)a7^%WK+qF$9m~;gQ^gJ~qLJ<n^&|nH3@DRYWkFUWB!`u{J0x^eUA!gC>#g
zati;u%kq#{pxmzSK}r1HN^u?dOu!;YsCY2Dj8-cn1y;1r`i!7P$^GPjj2zYBL*k$e
z+_NHfs}muMd(>(#bZv3RV(bj{!w4D3nAoLyk*6Axx-Duk&~+orIryF|2UO`Pq39zj
z&ht6;jk{};6>LUP-;6S2GpF>R2ga><u8cE;a8HH3tVj(ONWo~vg>)ffWd#zgi(t|-
zD`4vsLT05T>lKfbmFrO@8`l87-RiaO-2hlUkuNb^e4+2c?hak0vmKL3AZV~q`?Kbk
zKm<V6Jw&YfJt0n#G|&k^4T<Sudri@OB0T9ZnNd!kdS}$U!`ijd^$0P4#eT0JJlC|4
z=d0gtVKfT2d`4h<9Ff240~<W)GD2zqXN~j&E5UfL-YkXCZsb-3J4y2e<8EdmqL%lx
z5x&tUuX>*d+wJodaQFO-LkY34kN6C%!c)ljMwP%TYL-0VbpV82nz4f=(SDV#GtKI@
zqS72YURQ5iPe<T?nHUUsc%A)b>##T4m4kp)Q;Hg}RaqA%n4Ua^U`>3XBK9pK;$J0M
z<~{f0VNtsQap9J+LZ3xb22)7mxpLDWnD;#rX#o-whTu@VTMx6n7#}4vT`D@_ji~iX
zLMeZ;*j)B${LpRmIh4@OHloJ8LbM6TjhshUhOEdnivR|)y}5xNGJG?&2r~$IZB$XS
z&?xJD6n##30~-vE77OjLebM|+ZVToizL={*LJ=dN%QBRS<}>EiN@J~<;ae9$ty?QK
zu7GX5s)^$RwmT_DGaMVIEvW$!JK{Kgr#u7c5UjOVzEH;BjjT}g`YCo7+G8Ftf*7ID
zkm%H5B<%?e;ambS2*_PnGDo|j5Nr6VHWrmW6HWUE!F2_vW6d~UdCQv30)0yS<}cea
z;5`Q1W6PNeEh}-Cmo`OCHff~;;-AvLo8f(B-ny%cE9rg!I6VA-_}G$kmYlgTYC_$f
zxK&^MKe+F~hgbjs01a0rqS_=Gumkd*J0fvqJH=vmwuKo1-;`uo_T?Xn%slUAbVR02
znOx_zDUVCyiABg(T?lx4Kx}*iMKR=?x#~+}%7iJqat-e;5A=v|UE+5Y;iq&}9*KgT
zPSm~ve>WrU7tql^pr9F#vU3}a!zXA$v__8l8hDS9XOBl?LH)fXZ*t15%8_D2+1iml
zDL{{Uw2DhZZO+5vxi`3rm?#o3DNtArkSHbB-Ze^n$f0M}vC(W>J-SzLPkwE=--Y8w
zhxRxI({mDzBSZAX3F_bYJHFGU1MgK7`qqV$FLC?x_G0bd?^D?VXIF^Gvu|kFXklt&
z@Sji>3>#E19XvPgx9Ov(_z9lph`GUstD7D+z2vxRE|oKasOxJCPCQJ4Jq=F>pK@^w
z0#^eHk%d<0PL9O}b|8Q{=Qlrjjpemw)r5;*EgOFU21cxgnIT8|3Q{&KzhN$hip%`~
z*ib`Pd5ftT51IvQZvsIZJ;(pCrWDvH`j`@P_UVJsw#P2R^{ja#H~q8IE&3!p>~ttU
zA0-JJ=394*+E>wDfm-N#dqyimeWKi2fWS%olp5PfxFU_w4@3hB7T#SzQ*KvW8DP}%
z*BMnyRLXXea@KWY?hhuPCmz)0<JFLYHzmz=8RS*LGg$O(1dY*3jFez3M}?wYu}c*7
zfEvCGX@nBmh>=p*kzNz2N9*2{rbJecEIG%E{8GkUg>ITidqErK&-X}kQP<9yn#uhI
zRs%HA%`GIV%Z~scix5W$+XE6XmE-^b01Kn8;ZS2B!eB+LrTz|JkA^@&Sg&c}?nh-m
zdUVJy9a?M{97jL!fB-h7Px?KNy{hT(B7TP)rKhMFC`CL%xMpuSjZJ32zR^s8h!_rS
z%Q>sClr}B<#i#sj7Rz1gh5}D1myew;UIL`DprAzcA>jL89k63Yh;N1=3sO(h0u%F$
z1|AX;ypu)c!MdU`ep4iqM~M&#NqX%ylaq@^BBc-IFR_bD6z<v}IL&ktlaCqql^5*v
zN|M}xt+$k>bG3*c=_xP47C0<%P~2K7+PU5WMr#2ke29e{@L28`VmxoZN;m`*rh}t9
zOv^<K_VoTaQPBL_z|AfN)t6x`l^Si)G9j5w6g3j@ql5@6dg{FQi_PYhLu<j(Z0CjZ
znbJqnV9%!dc!09EXzC7!?tWPHZ%Ic5Ot~iBa7Z+cE|E`09+ap0Bo4{#@WIk}B6#A7
zDG4p{n=_~{39#ky(z28tLuFI<-KwN=ez}rLZ!O8-_SAbcjoL~qn8w++6kv*Ew6ZM%
zID0s3RW5>DvQ115O>GwBzBa0sdy!&u)<EzkXzIl~8C({^WZVlAOZRGL7!*{=a!7S@
zV*f5av?kURuX7L?o!un{0a}+7I&&8SgC;I*jSgx+^JlC{bBi(5#rAdlXl@_7y9<H@
z=!>#JWreC>;SU*qD$$C=79%;Hnp*NP<+w}et}DF*`$e_!PFoA)B3cHe$ai(_J|duu
zw0JRhx+lOOSRhPVEB~!$4nk#yfF$6_ThBn^wE|o!XLP7KER4`*dxjcUg!6c7@yd?R
z2hZeYbHa<-@$zB@KJ^gp5C{G=6gF(|i5eThf5=hBBICihuJTf%t|rpY2uZ6pnF+U`
z5>TJ91sS2}ZigrPct9FMR;7EUVF7RS<D6*%z$H`=!SR5?>Vfazx%P0L6IhLTF{M9z
zy+r!`h959}dsIS!H0hS8V3P*vlE5O0)i})d5I3<unc1{UXR54_Nv^-UnL@@Ynwy_H
zu<OGpaq3`0ls;O3Z*(#2*4=0x*>M>gjXtn1uRjc7;UBb}@Ua0_114v&ZpaKEL8_Ws
zUGbfv(~9|4`O@U@ym8fJG3pXV_GH?-{u0DKp%J~(5>ug+Z1ysR3%|l!6&$&~S2VQD
zf~1R}N=ui0eOh4RG}@#iytZh2#3T@Qtxl<yJLjTPuh%Egp`z0fWRB8}awfsgj+Dbw
zcAp@;B<-5Jf8f?SjXgDVlk)bx!l2)|<KEqa?}sR6;LUt>c=9paT%oEYGH7P|U@Vte
z_!=zNDhk7efa^>(^@@=K_h3!&p5NU0Sl}{N$}n`qQ+}K{PG!eeVh1-UE<-u`BV_ex
z|B^@AK#l=^Si?p$am{&$GhIhXkleoi5#JenRR`VRm_@E|J@t{d_tSY<jPUnxE8qQX
zJg8tdo33lLGR9&66MhKEv^T5~Bm(<#0>7=1y${!$8iUS#AEBmDsBT89Gr@ejN}7`v
z0Ush?&m58gw~<Z-b_^K6B>PbHQWS;odaZmO%148t8C1v|pr4L`R}L$C5J^E;aM~bd
z*3=ZiEXVsDMUl%Q1%Xv!=f?sbG=R~yQO{*QF8nZXMd={!TYlR+&FBtn7mhLT?@zHU
z61%|OR$1zi;*Et2?t=dJ#SNOU6kjbB1R)N&$(}CY$CnIWZKRKBoyI;Gcl#x+?2+Qp
z1&~tn(Yj;<YD}sV%zb}17&L9l5t125%VC=JQhnNqE+UNOI)e7d5F9^B6sezT#~vV*
z44P+mtgwqzg1N(gWk9;6FgtE$(G@yWkX7$OI}!fUNT1r^LAu%)W}$&jJ&j9wX)nPp
z26-SkBi79EGnIk~X9I+q&)IoWT>IWy0rKFPl#&v*MtFI{#YfZ`Yzy$da(cE7U7^l2
zu5X2H8(%J$&3HyV`P)_*`(sxwx*Cr*FY?X)?Mr(O8OjV$ozF*PxcgJl|AMC;ln*f<
zEgroG4aD?N3SLY>F;^6_riPB9xErpz`Q|9I<$om(bcT#OOcVfM<`9yE3heiXn}Am6
z90m@ZA{JnwaCVvO-zUVQuw00|jf2X|QMkVcLa3F>FHRGGS4@%w_h6F9G*WeB3TbAS
z6ylJplNs7Gs!8O#uN9jGivhuw_JLvSSenh)72E+oRY18W<H$tTbATowQL3Px6u>Vz
z;R;+9_VH{&BVt#sO78$h8qh$TcvvU^006=rC)1Wbk5#>pKZeMIl*G27<+4jzF)&N9
zYpak?fNOC9E@qZ!2L)#7HksgDQw`qBgc!olRVHxl@*8-_{5{Cd!M>BuMf)}4oXS7!
zK3tAQs};!lT(k{We?e<(+(zevFqeJ9KQzt_qW(U})COZ>pjVej%*Y{pcj9!*HS&{{
znsfc5%XQrTuu1{XD_Ws^kgi>9{`upY&7wUX%>hk;jn#5JUoih^LzMUn)+0Jf_rg?k
ztU=KrjL;6&27MPG!&}w&*CV3zgv-zbT_HNXl*H~%Ku2>>P24n2s4T=I0RXbBJPgrt
z!83`xa}=o@O}2f*QszZRFv;mR56$g8#D;Av6WT!Quye{}%qMz9Z&}0E_zS=9Rn1X)
z0`hq`6ykW^;?n01E}H}eh<97zPbcg^BM~@-FoeWHEw-`oPw}&E``zfs0y1hQBO*-M
z5E7sUw4m>OAU<z?4oyt|u(RX32;*pJL7&$zyFfU>GzeC29$68>h%NnKa$O(ygko62
zipd>%inzcu!D-bK_>r)ZQSozcNRw%h&H)2bSOP_`KoVJ!X+9e7Ws6B$#kC?KA7L+m
z>pLpiQf*gVLweb~Wwr;8=-W*`<l(kOBRL-AY`a5hK7#JO{<EGEprfbi&o2W7{nY`W
zdx(lQFBbT>8ah^>3Gvkz&sf*SWDVvZB(YF52pEkFB#kE{AHOD-Q&smuz(vW^NsE-A
zsY(hrf@eUk)@EA{(%Amw3*EZ|ap*6WX#BeGDfqaKCLOn7WIe=+Uc&Ew9@8m8zd4te
zmap8+5elLe=0*$om5p5$sqv@Lf_WWr(6bU0)m6tkTx0vWj;UJaV;b;i8XZ;<h|M>;
z=@!N0qcY)5mqW8*3~2ked!*zG)c|oEToWoF_`dG}sOQ;uKB>!m4PS11&n$syzx1+v
zc1Sh0?a&H|TJ=~u4;!6iEV%x&d@DPiui2846Wsadn|Fr=vO;rk&}KTNe)f$3%}$lg
zT1^fV{4~jMvzwg!+c0Tf&ECH}pP_p}hduIC2ip7STRVOLPS%RXSe!rP`6GZb>cb{b
zr2<Oui<O&({gB`Qh8HHC*2!UYVo6N+Z-P0_#qYM452?zPJ2;45^IZ+Wj_%@BD=0IM
zKzEyC8kBtMIobr~T`EgA|2%#nvd16l<28vzy=^QrP>fE}*BlXY)jGx3PoW+Lot_ez
zeruqBLe{U7`GPP_=<%?rUkuiE;8e+i#y(QEnvXs+tv)|z);*0U2d`!eDXh1$?Q9VV
zXyehEu43ScqYe|!%x^5!Tkj1fn8+B{tWJ0S$6On|AcM5zW?+k(;EiAvmVfY3%0wLr
zEtmr`G$r-G;|qXfbr!S!(O`X6h+rs=e%FFS%vBfgsve~Pl|C6`UB+Tnqv@dNbSKz-
zyfaJBhScl%6eyjdPA9POZ^pwspnj!26yOS5B-Vz?hQE`5^=>7TM^Y3#sE^ITTGf4K
zuJ3nf;);84O+vY3P0-;f7WL#=QYe*<iN3aBsnCn<;-b#bwKx+$$g}_e05qJ<vFib{
z?8Q^|<a}N^*j3Qpfn~nDP4;?o3%&1{Yl^rrH`j`m(MZM1Y^0~^n=6{?XUd1mdwlO{
zA$nmFY1$e<69?w+h~}gwie^&CIlTaBrH$H&9S`nQnHnnbP(o9~Xf5VL%_$VhZf4OQ
zFxO3~4%x+CPfBp49nRuhh`{}nRKQqPvw;4GrGo^l%8;4kmsS3zu!oGN^xCJj7hmp)
zatlHT-Ml_6fo;jvMsbT<Q>ohrT_aTtoh}gNSD3fV*#~sPO9D0)fMVcT;GxUT9@(GA
z)M&0*S9fl&CXoKQ533bddd0{rJz@bo0Li*Vbj4(7Q6a>gvQ0=9fMo&=dc)1Rf~Obg
zMDjGVkDv*<oXMFJ@HpV@71rb`C3Kr|*A|Th?nyRh&c7@irE}cENAf{Iw~npIxdw2I
zXY#u)FJQN*ZKGu&9JfMDV^#R`X8ia%yPw-nJeqMsG85>xn2#d#rEhU{QC}4_U4Y~g
z7=_1jkQ+Q@1mgq&M7}O~*c%*Y0Ppc6n+3R0DI#|B{{ebx;$HJdFdZ~~Hu+5PETe*?
z`OwGbjNP$NI~oo`gMv$m(V%ebdVtUsecPWRNTk&i2(;fK6N288v1XO2DE1t=*dibL
zATc=2z?Q9Vx2O-e3{;=KB(Iv%1u38zvQy7!C&{s}0);zeA)0YzA;;TX{@-P@=5~sK
zWhzH63u%+cA<%Uii28V}b`^6b)!S8q$F=V&jw~%BgpXAg?d5I}6bQ_?roZ0>;Tjt?
z$54`r_~Ux4V}gr_t3oK<Z)S77wQ=x`%Yga#=9Y@av*)@<&fsNYI(9aRdGR0{Lg&7C
zicTi3^{^Ox457Gs!_Jve(L;-LLY3CHY%b8B;$DAWUBEEE<>&)Ov7TY8(4GKgt10Py
z=N72fO@WZbZ9&aMJ}jNR{9hgNQDJ|M)VL6$1H}ydfR~Z<{_eN({>NjIf~M6DSaSgE
zz|D}HOr#XqiVNX3Kt52`K>pm{cs%DnCgaWJ!4C|7JR6U$D_$~}$@?K1)<vJ`%OG&$
ze`t@iSoi<>@<IqdIDr|_?~2|5iA7-4!H8$U+iEa?ZvJMD1OAavWIJ*{lWs)O^>q{O
z%q96PZDDtl{9FC&oOZ1b@O+hv1(QCooT;+{c|#OMI1wZ|(J@uUA+FVGTswznH_8>?
zDA~D}5<htChmKT(b;IpmUa@*6LHYAu#YVOOHb-GA&Mm3OHA!Q4mt%riAykG{#cj_G
znZxQHFIK9al&hLS;>(p?u!h|9wX1kjAV~1;^O{eb(z5qz*ySSfFPH0`J`qHhQ4ytA
znHfT7Tv6;d-vz_^R*h@I8!#~dS!u<!htw?vZRk>D3Oxs;OY_^#*iar+W~vPPRH+O@
zzXGGo+JV!rPp)qMKMtN?&b!-vPH69)DPP%KJoxLU2{AYmVW}ERAKcycM$?g;b8-9E
z6#zWcd`LKK3yu3v?{|cv8uTmx%ARq`WME`$pd+C4IOuH)nXVY3^UypM@@hZgCVt}~
z*;W5g6>#oCG`ZdffUw6k7NzJeZeUzF|4Soq+5i9mildXZQ00{zxo9L|p+FG19^y+v
zg+82lz^vF?plWahSw-cY<!U|Js$Uu@C1^x1-Z`Cb?a{7U1#;o%`(ZxUgYv9aT+GFf
z)zl!B$LuE1N7}1t^>*6Z#D;M}I2+K|Cd}7o6%sx49DT5_iQ9BYRhL)yV^0j^(Pbhc
z;)G;jO+!yA<@LTaZ5O6zRhI<vW~oIu?lC;X&~kG36YrdYN{W_V+gF#EK`O87S-nMF
zBh5m^?6fLXLfudUypon+4Ag={iSDmHrNyQ5?B_3-SyX?$NjAkZma@db-#tZE@Is5n
z*hn1xF3WQD5#r|e=ejM(*@mrb&Q3UxF~sVxZUzyE?G4qXrbp}!F@|OJI_wOItYLSL
zsEa#PQvbYe-r(92+Jy!*u)xV-?sfLI(x?xen!%u#9V<E=Xk}?)I_sH!_3(|8Ycz2Z
zxwR#vXnH13!`L+cIA9Q*N#*JcatE{KXR*H*O6|K*g~FF?-&Q?XnprvO=6XxVJtyIF
zo)HJ3Y~RRTBsN<TC}%a{(F7Z*@7S;)Y4wOG*BmNH0XIaZZH*fWciuCS6;oNSNmF1&
z69U4;!mN-&22e`qB7}k32!I#ik6xKAK^&e%$tgl)NK(_<+Mo0}Y=9TL$!dY5@wuQ(
z)syAdXn;TulS*GG8h8M07eU_;AUsGIDrrvt|IwcqhD)kGiL>XDi~swHAXb=CUPB)v
zm8#hVum0EI6ffUjVdwgy@HmkGo`*)EX5Wch<&`R7Z0v4;5{=xtU|qog*4DwJ4cB~F
zI$o&`pUlE)HhXV~_!k)2OaCW>jFaCJq*MJOpK~z#ALtp+Y3JR0v9zXP*C--daK9o{
z!|eVD3q=06TAw_7jZupIG+oKfFf2?>c58E0-GB-&cG~Y+_A%(c%m7%1#VFx{B>y(Y
zg^$+U^(#9t-q0aqH5$}TaY{VJVHm+zyw&*&AM?zPcgQ^0I~Lbd+H5yaK+@tFkvn;N
zCDUkoq`u*A`For<H%61ZQgHpJC-~N!mm&luanyiJpDsi>BiNw)i{|*aF&s>C+yGBN
zu)jD;mMz69dgFTik*C{Xb7G^z=De@zV$yy@{6-P0gT>LdH32G?!Ud4as1@GR+N8z>
z2iQTmFY9J}M<sN~mN8evwZ5Msjk%|EAMu-G_7Jp^3NRc2%o$tE`34Q0ZFFd?jNBxv
zQDu&O_H<}Tym#uEH%YUx+o3RD__w=^jn9imN`qT6(HROu5cLFh?cr&lU;RL8cLz^=
zfih*D)_G?q67Ayix&TLx8=Zmd=fc_v<YSALG2Uw<YQ5kE>>jz%`H)Siygee9SM>$S
z6?O=Ebnm{aW<|U6hx;p}@u-!hak)<d$(B#c*bXEENxB&o(*5*%M7NrmUqm<0D0e@`
z%$VkRd)u#A@I2l&x;K>_g4zH?4@V%-0h0WjaGYV`cZVdk=gpq9R`)>v&&2yl;K%}x
z23U0X;*3b2q^PW8&ZvwegSpM|UUm#G)m2Gq=A0hPe@w#o<9Y(y1xJXh3Yu99;m3f2
z+JJo#HU<IMn-v+P_#ooyE@G+|ZmByjT}1efO3&K?`^Ko}ZnNZG`jt`Mzb9FeS?nvE
zqRkE2`lSjQ;6CzwcIN60^iej<^KVzA<&=%LI>p|3)-)WKLP!?FYDu0lErNS2n&`SW
zZzK7v#BSGO)Qwg(8jAbDYKJ%M5&$^`oZD4M9wi6>00ABh0{A`pYqg{CVeQ*Bg_#oz
zKIw=kucNDDC9@rvlV|YG-P?1gn05u1zBg8CJ*+(u3xecAGLHib<spL=Ivv^6J4F4N
z;09LPvPQuQF)f>+sydqR$}(2tuTPdI9q82r)-XUSv<zzo?f0D;DeX^3Pd=yi9e@zC
z2vwt7TINn+OT75m3!7KfdB?zsdNcdoc-@4mI`RPo%QL$9pJFQW+aINp2>yj;*T;AU
zQvnJ`dw+Jgq1m(PZu{4He`#fYSG7^ApkVWq5XS3Ec#s)pF1HU`chR_tA}0`qS4*@R
zge1W;VNUK_3(RK4Xr-K6?j^5?mDUn#FfJwvsQ^Z*T^gbRTWh!*>s^yOm8$(d%hnpy
zDIY9Hsl{quyyxjPCwQcsistCFOu9tn{7^pbkjNL0t1mY0)~-RV8<;hVDFl0nB-G7l
zySy5m^Htr{Q2fA9YIK@w-4<jW=6l`JPy-V7&6YH@PuZ38<akHz1*?}vwG4bnEPVmR
zy<SUY6-SDxF|#<?3<rcfa}aN`gAU9mUD1{`{w57&Bzr(0XGRY}BvVIv+oTOI(5b|v
zh-Wk(@=r6}Ri=t99l0}LhhQXw&2;$wZP>{}eE`U?nie|))T5sEnB}<{`Uld)B9*@K
zZBRJ*5)62#I@)m^+ruu_<NS!JIjk?3m2-Q&DSvZJz@oW#Ro$Wk%@|4q@uYrXk^@3b
zKWBb2aoFF0g=&ky4+ZiBBe(mvCa-U*M6|#+$i`*{B6`0mcj+syRro@JR9iJ#l{9Oi
zfq6-<B;{PU#R)0CI#^D5kvxC@ijQm_CW3bn@H{AvC+;dNz96r95!lf}n+Uy5-S`jP
z7vuFV2oosFXGvNBVCRnkZ!o3p445I;Bum1*xIQ8jXs27L*qn4FkA;BO$(PGo-4@@>
zYCdnL6Ufi66mDBWS;asg%1O0Q`@4#sLD)0FhfuYav4pri!Nq%^yV8>}*&`BUL7|Ac
z$c|9X<I2Mf)biFqd9Vnv3r%Mo<n+{L)xnL6eU@A%HaC7O0}TOyO2w7@3^xS$vs0s#
zD+7Sq5X{!X7<o_0FuQG>Db6K_g)e~@t5pa>c2~|ww|hShorLo=@6nJ~+hqiClE7uP
z1qruXwd?`q>i>!+?_l*E`-Tt7(W0qqYZUdUXFap1E@X0%Uj;7Bble;W*aFWoNc&Yp
z6r(tP3^yZl$nrf>qZZ5Om~&eq?$K#V(9L8+j4d5q!jV=bJk1~}kOx(=sf{q>e=&Tx
zSp|x(gVQwDBDzIVd$)z$lw-s?HHfAWer~2Jqjf;uG}hA@cvD*@((5OEb=8ZFUaE-G
zeCov!y8xZQC<0oh=p{ih;3U%+X1LisSpeD}{ANKV%GBTIZLdu#79(VsWFYnoT)2Q@
z6fIzvL-!XkJz`{BCl&*RvOpMIrZngH?|dfj;WHIT>ISN4mz(Q^m?yENxvxu@MhQS<
zHz!8DlSuY^>4HY0YI9y&14af<F3*&MuM_{aej51dB(^{yxHo9A4bFO0saBLx)~Kti
zRNC4dIgBITtFuOU&|PqGn0tEI!o<NmbV~LW#&a}&T-BLtWIBU3hu$yHf+bYYm)KLu
zvO3XhupH0)jIu@;m4Vf;n*necHTrlra?FafR`)_>q;Rf9xuTM`tZ+vYN&V&wYg6yj
zwM3m`h5TX+oDQ5|Ea;M8Q1=h}V<xrd5Ht_XIk?%z(=uW5^*K{~m#SmGZNYJ_2Uf%o
zs~<Mk!`r!;Yzp6~{G^x%?h8Lf2BWYm4WAVzIrv;<*!D0f%9!`i7&a09vWpK~Yw+KU
zZa9|rY8afI{=jqdvzJujgNTgLkCY*0B~P2%0f|L1@4r`EP9P95;KU1)Gi4eOj|y9$
z<Kq^b?N23eyEa_QjW1U}qaXlm4X%-ybgaNn<zN5+0yQwPByYgEBbuT5J!yKS{4u!a
zhR9`tR{;g(5ZZxsg4*+5Jtn{2lSge&b51TNP-r>pVGU7ZhY#mZd*|FBd0R3Z>rLT-
z4FOHp@2y(3>WzN18uUo%A9#AqC+Hji>yfl-q(Qb)p;-i!G7Ul3G_>Rj6u%<z$@aWJ
z(>@PJpt<qR=Zew)%~TIaMZe4@*+C&x_s%7>kT<8&q>G&#qt~y#fndp~HY3qS0+9?n
zC)&}717nuQL8>|cxBRDNc1T=50|laT(x&M=)A3Y_PEZGv;w8b(So+;-Su3(^5`ioL
zjcjrscyCEU)*kL+KpBzU_$Js;;tQWHGDe?*u`w6}2BLfVh=hr6nO0!zZCaf)^nZa}
z6%jP7XECtpfPQ=n*oF9G)>juo`(Q}nwf+<h-t|8n?dNqxWYNM5$K;I*pTbd&t-Wph
z<)^p)e@ePzpfE-BPrnHL!$0`s^L!U$UovxmUW)X4Jo}=>=!==&Xrfcn(KGGU1}i)H
zbLX%jKB4Svws$$nuv5_j27U2mDuPe#rP$@L4@K4&J;t}qon#g>l?olci!vHkOiH93
z8&}U);RZCA86k%fjGpLF*|x?M_Ngi|YI*Le-eRU8ZovC)ru5&P5djgl3D&+VVFTD4
z_uWk$7pmp4C<z{HBeUt(eYBo!8$;q0fTYi2bpI1in0G9*Ln!Dnxm~Eq9VCJ7`4E%(
zETt?2a%ZRlO7UwXAdvuGeKTJav$21uLWycOH6G9@5+X3?)tf;uKrN`Dp&RK))N-bm
z*A&CNYbg84y@vjf1Llwb0)yYm&BEP{f*dhK5F2&6IE1}=6e4<Vvd1Cr#+YUCz5hVA
zZ%NB-j{AA7lV^Jj=>@NYxSj0C_~iBbR}4^f^#6zplMwTz=x_*qWE2^9wwvH(h}Ke{
zG)zB@xiM{}_IJAjcQrw08f>@V=ya;y2rqi2Z-KPtZ7==(AI%*WPN{5^Bm;2zkWMJ!
z=kg+lJ}zR_ANlp>uXnQQDU;5N;s^l$$XmDz&GIo!_uT-Knj(}iejhHu(a$s!n<pd*
zT%^<G+bIt?YKC%Qrk};-ZpB^LK=@S?3+7@}QS+YxqRXhK&fRu#K|Fi><TpRn+^Vf<
zfWPm`{b`bgwPK0}0tyyLH>C59yX;^*c1Sq(rUZEl6y<?_G6fh}U67T!C3}w`QPe%^
z<lEBnWrAfElU6)^L`JN5{S{P~(IkVHOi#r^JY5*?xh3@MuY3b<)kfsQZ+l0M^?1uO
zVo1go4$o^v^+&ted7tOgf|+}JI$0U9m8NCA9QksJ$h@7cg$ibNqAdn6KANfO2$cg8
z*f}N_8~$jif?arR$3<3FT(mUJD!>|UfV=fMg+U@<MR}9|omUqQ2j6y8e-)*PFGY{z
zFgh;}b4F2j@)!Hv%T#?oTs>D1dR@QZ*&9e>Pqv!lW5u^c2Tse)%~YEvsAOYcS*-ah
z81xe4rYkTlsjw$~ZufuZ=krs#$i~!IgqHO1J!QTt9HAL}y;Q0(_a}~0SpqxQv6G2h
z-xj4@+(}-nr&J<q89&nF*sJAEIm+dB>SNii7)f{0NDc%*+xr`<BrOV?*d5q7Q$r@9
zWUkOqqR#cEF>HSGZRY2zQrFB?SzNJO$-d@)@C~myWs#%FuA9`OIltaulb?<1k5+4P
zZLb^^j5a&mtn&w_T|xHxdE|Q}=nk&C=na!=X3xO<q4e2CpF2WJAU-QMYPTGKC%u?|
z*+?k4dP8Z@zet4DtkUyB*Cs(AX})xJP!9bMOj|+Hm0q#L^gM{w*SLunA+&mVRSg2G
zihgR4>!1@qWEbBMeM{e)qNzJ@g8GDxdi?75>@s0oCS);DEFlt8Iu|MQb+*9M$;g*+
zl}Vlc-1~VR_yrruOt|DN7LH1wBh12}(-A~;MBD2Ku{1z%qA^r_e&`|cbVh!`!PZ4B
zti_%MyAmCUJw}oQXR#3RhsZhaKpLo?&{ccU>b<2|W*#qlG{7B5t#T`ifOgRH7As2P
z)QUsG$C*pg`X~%gs&Zl5Afs4q6u?JYZyR2;Ii3OAr~m)}4rK+UVIXTXzW?C3A)hi3
z(F5!|M9vOi9WdUmqTNZl5~DuCnOw3d`zqMI2Fy?xj}Q8oLd$}asek=`ByyP3Bou3;
zE&g9+2EPs{HR;%c>kxMlG<{hjGqy(!RSZ9Q3KV&9yPdKVd4iWIBS+2`0((AaYhO>0
zD)8Dk!J(o-)z6o)ETodtXx@?L<C}#d{aGM@zdgw;hJR4#EID$KUeYxK?e-U0oXa_1
zOuH+36LpRi<}LBvcsuFFcAhnew^AtPTl#1?bwL})Mndjr*xZb0giI*>5OmjofvDTu
zQJmdnp!g9|tD3;|1ElBx7cT<j$X0BC=ZaPMs)Hjq9neq75Uy&57(E7J8Rf6fA-g8A
zx<`!<@VAC*lhDdtH71W#Ql)jLrT-c9vc#0mz79o5O}!uQzzw<{%Jd@^I{BepG#(F%
z<Y?M}N;c|7_>i1!wz)dP{XcnkPG?qXCp=CVw4^W6YttolXH!GUlKc-qm*!3iFyS1f
zFutJx4oyF7v#zeW%jasb)kd3<KFm1oks)%i^TtXH6H#UPad|C@6&<^^dHuVlO(Ufp
zHm0l0_^^kqU*hP;qI`xB$nI7Uc%nvP4CHMIdW~-B*MBCG%1YIX`sbT}bRMmi*+m<g
zb5)~+joZJ;Ot`~rh_anM2$QlXB9jxej4ni$SnonXgQ^$RXhj=syW&@Zsk0-{KQZOt
zP(i`ZeNgTvNqJC*e}KP05xqdt!p;azpGp2IH*dW#(2p~QD4*uh3b{*FU$Dyh07+k#
z(n4YBEF)RRD5&$!5sF+U{Txsz7|LvHu3Qj#GJ{#4!?Xk99Oc4d>=95E?#Z<2X`?mP
zODh<zlwX3wi_`=JE4g|1t$3N1yeIpHCXou-u%R!Z*k(p$z8@oOe=5d<RDK~-PWz7m
z)UeO+5qHVKgiq}ujg8Ew{5`u`n~z8A>uyfY2n`u<uny+TC_R`(kbHR9OJYR#%1zgr
zCDHGA2wUi@@`^6r=>YAu1i{sVuHb7*kk{1DDXgRb_&!^db&*LNkWHakR4Ss6W=Mkp
zJ)SSm_w4pqtz@ytUY85$Vg*qNsJKc;U)P7Pe#i!5GA&icqaO!pY$ktNejO~V9JG>Q
z=VU3j<sdq^0o|x9_lmV8#l(TK$DKa>Ldn-+N~_l9b~Lzr(pO4nd%bUc#EExD8J*)l
zGA1GaVZ=n0f4Hqf>m>9OjC$yM!jtfGy(%x&#C@H;V!a;cC8KlXeWc2U-j`$ID4ALC
z$Kf4@m8as|GP9iNYR%Dpy!A&mrU(}IcBux(5?8TxmE8fb#lb_xK)_N#Zu?IarIVT!
z>8gn4)YnzVjX`-wmWwbIQHlj@?=onGjy9^U;BnpLDVf0wMOBe-^D-J}`TpYjt;hwt
zLQ>Pdj%OcvAwURbH$nlD-C55m1@zL=G5@e^irN&4IQcVZ{C-Uq%iuwwp|uI0yKGaU
zc#}>F?7V8wM2INseM5Kx$fEF(0KD>SYIEinNTZ3<Kr6K}xg|Di6_`ZL2T$*6aaAvR
zyP0!gEYC{`a(L>Gu_f^!QaCl0-(2{RUNt-&v>oT)9XIAiU~bpkteljHpc7S}$7ZA$
zwed5ACQtgOD#i*++arDPvb8kI!2Bs%;z`pi0D>e)uheeVC?uMXc;!2xUhV!ZEmjea
zb%5V4dK|Wx;AL^YKV={oF$~%JfodlKj+Jxr_f;@7cJiY^&c4B^)Llqfx|(f*Wq(y#
zm{`v?mBb>j`_|%TtFY3p8^c*}M4IUu?4Xm)XfZ?;IPRuOu}auT{H_IVCLfy!UN1)G
zy<}pz=+~gh#oPB|pT2!y*T#!5cnTBUdrN-c3xG1M?%JgNS0zZqH4s;;nq0zPI_!&0
zO^h$QbDROP@VUWbA8cPR?HnEKwWpucp0G^eO9iM7z2kR6fB*m?0w^z{{BMUbDrx3n
zr9NU>7jwHW%0gX=d+mW^h{RO4?p_K?SRB}0rVk7afa{Q0D!NMp?4?eULPe}E0|w-u
z=l<5&?hW4gv~ud3P9?mQ3S&i1D}KLr!E>*60C5{;jtQk{qmiY2O_Lm2gDve!ehC_D
zfR+5q+{{7!vX-6$A)v5V^@Oh1!c(S(|893G$Dl-FWMh_o9ivrlgJNPFmx33MnZ%}l
z_K&mrDq5S&qm;Ufao*tzYDI$Vfiv_v*7X=Vf8a{=Bpcx1;dQ9>f^490snYZCHK*{2
zv{P4T+b*8ti2Cu*{qON}dCyi+hV5$zGVePz%{<#&6s}YQ0H@$K67S?1j&}v&Hu4*!
zyB+``e&+qc-Y4J%ou0@gUCKMlmpTQ4q~Rre*9CH#7gyF3I8e$92}{aW?rUsl+Mp`=
zu-l-i>CMYjvCfx2So=1iD0dzdc7q$(rkfF#7i-sdNh`TTCV<c>kirX3ZBf<7;HG!U
za0T4<n$)vAM{5GKf1Ze1A};e0OuQUPG&rj?DHccx86od<>lhqvx%KQ`7B~a^fu!Ws
zo@#2E5N4Q~1V!D%x+e8NwJm#}UrjooQx(_zzW$|2YLxEIRdG|DNNBo1);}lbBNL$#
zReglowy@Sp-~EcBA#3A*mcR}5+c(Aud3Aeg%WY?h#z``SXa9c*G(Meb{-?ZR;%(T<
zC!Ko6qFMBd7hnK36WxAQEFJ#bF3=BaftXbKUgo>(ON$=9bY?tA?asI+%`>jS#_>38
zU3vlMgK_V+Jo-ACxav_Dzg@t2se#^RuR;qbbrP9o5t7MWov`x8xXR|=+8fP0`?Bpy
z5oifAGzOXGyf|RVdo4?r{uN;=zC0@wy>b2%sdUq`%)V6{J{;%aD#o}X|EoBj6ehP|
zAY^s++OHHk^ROEplk>a>xvc+qO-dKrfSZ-tqh`v_?+GuoS)jI$Jg{(Xp2pMMaCuHF
z%=;XbN4shfA$>xz6ImEt&JCe*PXVr7v*~h#Df4sg2RVe_(mvkkj2Uik6`4##&HL*{
z#BW*-W_yr-*_xGb19K!WkXRqvx>)jrP;7#oD+<U5+ya>~3KC_9{K%o|KdNt?Yo0M?
zJZ8$JJ|lwRT;4|k@RwEc0wDO)E#~{=IvK1hwv$Q_;QoFxblU%dbo`fdYRDNBeDP_d
z>y45h!t8Mo{m~%l*8URU;=!>Ga%Wx$9ip12Y%^$g3dNrBlIPFCGMD=%(~z_Y(z6cV
zFg?>xe5qc>ssawTN}yGc_jnqsye#<{ej&8oK*u_Rb~cHwSZ^MjI~N1iQ9w*hTV!y%
zyMe=-*$_hY|ETdwwfF!oF{;iP{hoZv^`!V3D@<EBg^&Q(H$O#oRt|<VaPym5;1pcm
z#&&9j)q_H0Uvu_iX^R$5#bZP|ymO4wMN(Uh&@L&vvm}@&F$gs7p-!$RF*(av+hPpv
z<vq9int|A1`g&9IiI&f75y7dj`DayTYmqZvv^M_z_7{YTvlJbT(@FplV(biR3V^mU
zT^*hLKHEl@;}|%JH;KL-2~*GFqeT<aJ;0kB<W|~=U_AZFU<1<raOn?LZ?rz6p(Lv5
zB`)dB;%=ySTL4e60bEauWB=bCiRkQXM&s6_hy=3uCf<Fn8mfVjK!w_E6tnGOne&QV
z=3zjWWE~s@qNjAH$qgy>0w)yFX@;_H$5CodlYH%Cd{v4~^%meME;PO0#rmQw?8T}m
zhf|N-F4nwbOH}lD*7AaBhMQ~MIBZq|5y<sG+I4=YARf6<qi3zD=C%Lcxb{!r6Sc9E
zGIF0;gS-HL9Kov$TAos3x{yhl6k+Bqp3Hut9WM({`HD7!stgLDSbks{S^0X%(Eove
z)>$|zlNnfJ&BI+b?tlnk_X~BBYi1DiIIT(&+oA+@{Ud||RFvbi8lTCBtaK?mAm}-O
z`4F?{Og|^z|GI^-4NLVvXb&aGv+Ofehd_yw`{@Q!Zwy(xq7-(Npgsh%Os0-bQ{dOR
z42Q7|5DTa8l6*(=KmY(6koQl?(E(|mjkME!2Nh~mh;)56tiXEW36#0jsv71lOU-$#
zX^E%=IUH`Z1|q_ZuwgrVKJ#z!fhEDbSi_u|>C}GD8Ja+4y-VogN%8UhJy%yViF$lH
ztwwG-&SR*3m<QH_NpXO3$6<F+te&0Wg_>C`98o-GU%Ao21dA&tx7|+AL6QF>=06`&
zL2Dy6r-pw{(#f(7U(m(NTQi@`x$>i9r*xxu(tJaO-csBF)US!*mx?rPYnbq9;N@Yl
z8;)~d+FiE+7YjqUD=oHB`4zDQ#^IbqBaGMCzKPf)kU6+{8+p)f3@IP9+hiu{efou$
zh~C;Rp<mzAZlqh@Vb{u+5H-e=+GNJZbrSw54Q)7ZwHQ_9(odr$NycW0jH1t&=&nyG
zteMlxkf8o28N|d78S_W`Y^E7y&LzfC0WIiSZJPzu+ZpnU6C-^a?yM4=vmkF_;zDXu
zFIBpZcF_T5CT{ittkc~~L+r^9B-BnT{x8OVjk_%r%iESw(;;OiG7VVtSiT~a<~)5Z
zzTcen{oSr>DTKAWPLv1-XW|Pik=^ZW*F*<q0MUJM^_}<l^iK=dTMs=kcoIIhOW%oH
zbCk1_k)VLwQ!4IMm>Wq{>Hyb*McQ$Xcf2I2NqJ=dy0}WdRUBZ?cV8?nYW5wbrZ{W|
zsn^&U$~!y-7H(Gb%Vr?yr?4&LxiDQ^L;IY_=#bBu4d`00vgxVrV5bj2o;UA5s%hDw
zT#AyZ3x@DMAMSm-b$saZ<-3Rq9cyf;Fv~GbfM_Y3_TiPWmCkqlou)@d@)D)PFJj@4
z5f%}V*F9tMCn8%%YAPmJGk=Lwwm`u3VDu9a4}Wl-v$bCEHK0^dh+j#6>Oc}ioKF^)
zjE05h=K<gE+z%8h&&znmav&4_2ttjBBvAF<vm;?Ap?<px>V`=dl=Os7`W(gXfW(i=
z;7lT0y3snUnrP@I>$j+Lj1PKZU$UBL#*n5=0mC6{ggyB6^^hkKN?{(`H1gXh4D5uB
zVXa$93fFt~&c-aGU))E%K45GQK7@^gn89l9WYcF1oCMsYE+P^shKt?k3;^_jShq&5
zAybyeC=Msqt5EO<y3RG`eyIVQXX>M3eQYfqdCr~au#OMI=|@*s5FtQVi-DMwv>^3(
zkYcM_U_{4Y{)e9ig(O4q*U$8)(g4O3hG{g5o8Xa5;yMHZP8vPJhwF6R?;p=E7~?f9
zo}H|m?36R^G`c0nIYCsDYSAEHeQSw_k$%L9oY!1(JZg4GPE!yfE0r_eRNzay;Y!;^
z9$)uPCVM`zrH7k%BW$xU+I+poO!p{3v^~p~ChKvAHEf8I!`)v=Kcw1IxBhm9Svv@%
zbY5|xY;<{tEKi>6!z>nTG%!?FE?bKeb=dw2x|}gTW}c0YWr-?jYL%TI++7F<5#D;g
zX)W1v!IN;**JSNRx#FvJHkwsBW8gYS-4VI=GeQh~>3aMxeSgeYjI$G6IRDWhQc!XR
z4oVx=vw;_(IFB2Ehynf}P<JB@LLKlivL9IhUu2Q9L$#rHDsp-3&x>J$GB%fKrgb_o
zz>0u_;f13|r}8^=quZ;VLxiEgWN4k@+S0oakl>~TyuGmKbsS~18c7IQf~~W$=bNy(
zcvJROtk?2}+$OuIn<1M_-uECXflEp6gnVom{TGU*t=A=E`x$<n5eH05UDQ_h-k+QJ
z4|8pP2BUMztw+bOIi#pDTB5MFMjDe#wElzNFgv<n|Dr{rS>T&e)I|%Wl@=^W?_*(?
zL5>)EmWXF9k|&Y7aHR58Wmjv=Vu|1+b9h7Tm4NE<M2@uWp~A~>>eN+i%bQ@#h+&wY
zeoq+E1oD$%wC*T(^`E<)a=ZC}IFUGm4><7E_mtRj01D&Qs7?U%b_FWEb=vIz0ikuY
zjITu&I{do)2=~Yfbo>zK-<_WOtk`Uo^1Y=SI7x6OA(>i=&YDXBa~nAyr{;G2LDtvm
zR@-U0lmh8^fxCOt^A;XpLbZd*qz5=-7nQauXYU(Vpd>~g07F(E`g<M5c^w0iDw8-M
z#wEW}o7B!f;*GC5{70F5K_CDC03kDM!66O9kTh%=#h@%Jqij=cFoxNYGoD2#y&+uJ
z0F9auFXi*L{Y%AZ>}_aK9bT3~LN`!VGX=IRZvJ#<QN$R5n@#P{8EK9^i@9-U%Ny<y
ztCP)J#;FV8D3NQe_R5iiY;!eLQBqsnl<%F{f2QHamvGYvU&rddhaoq2(Q|{{%HhSG
zeMpLA2`}flbWpXrZm|Ta##(c@J1TP&9nt7gc|NEK(02Ex+4EB?v-v*S<8Vn9R->9&
z@>ZGAG$xVtesWKb6}Qg8YLUOnQS90(6j?Y!pwS}l;Th{U%z+1xS^`FGxayq}B_sb$
zPrnYsCR<?pqhO?5lo-lZ0Ht9Z8m*#jl^q%t@-q8By3nBwESqtZ7PH*p2|WcnPnA5>
zf277xdk{qXwa*ZE^<HASzRa=5D@n-2mJAB}_hBh^(6~kFg?%KLyik!G=-~a1p#6O+
zgCg17DC#?Z=R)Zrsm+wH*k;OQ1Px^`);&Tqs8;EAX1V`p8bc+jGVArkwB=c{$tTEG
zJg<!0_);-=XYqYw+tA@9Q)ucFn5`>a8xTU|f~V?4Z(`9=t9mxUz|o+&IyJ6ZXx`*s
zZ#qCfglKbB!SB6!lqKc~>7io!uJ4P9NE^UwL9;-)5DE*Ex&KDQ#Xh{u>ukRfcC&85
z#=+EGkh1wj1W?Jn4Mlr7Z272Tsqu5ud~kUgKp`&#_A&l*ltI5Eq}53-j+Xc@s@5Xo
zPQ^B=3v}hHJc@qqtP)D)AQtWrX9^g%ffduhSf!8s7SCs3HPj-?^lJ{G=d1Hzd7%rq
zBeFC5j@`huExC>LS9LI}`K=YFH%)BECvjT9Y8j1De(l#pX{m8yX=|8?Lh4d(JfK})
z!=WtXLq_6zTwV+%gPN97X|H;cZbt>VUMI}R1_25SzZ5yat|oDyV&A9u;;@u$223^&
zLl{-~EhF4lu`?7cClJlm$S{pROzF}$@CO+?pog*7m!rIJlc%dvsuLOKiX2Ptf_wAH
zTdU(0wpz<u8L8!^%BIk#jYK47382x}j?j!WcSwOVk+Iord}b?DX@<zF+ek7VHycX5
z?D4k9SZG-jdTJdRNA0fRy1pBb)XoTmH+S)fLLke!VklA_y?xB>@j>VFt1Fx+`%O45
zCap{_q1GQzAslb=w98BRy!(4-iG3aIAkFSG$)D>q@Q}EMEIqSHTEpKA)mm<?Z>E-B
z*Ahnv{s*eK80P?&_op~pVLmDt7dT7F#h07@p8Bg3X4jawsF>zJX0|A%cmK1d)vPsX
zzBU|lBT6HiXK;vR{iKKSdA8R>B+WK5hFoc{L|J*<!5w9hbNd>Q9$rv&)mV7}fad0v
z&OtG<J_449897mbCSCn?z%4jf;b-8St4lZ`+d47KIVEzyJsXKwv9vwSzd@7Erz%N>
zr>1sAn`Pn+pGNXKn`8fZdY@yF?6|)VGUyIUT$qX=0k#5lA)f}97_T|0Fz7hHG$CZ-
zyAQnZT#7<!E{XR1iU^T32~+=+wpRc%@ESc2fGlG)a_X4H4HtsZiOf8Fo1~uH;j;rW
zaDKp+gk)F$M79dmWS=^9lqINF{aq6Th}p)}5PxLUt_5k5t_x|3mba(yyIu+6RrjiX
z=gAH|V3|FAgCl=$A&b)ob%vW&i}XnEll~&OegqM9=BLVQB@Hh8DHf_(t_4U_|4JhU
z6>YXGuJ`3D%_A>qY0Nhm0=r-P(g_1f>CiLZSKLT600009RxpiBY^vaXqcRZT;IC*R
zh@<TMQ;_acFQ*Xv#u*{MJh!-rdH(^rLm<hxzCA^p*S`00RV<7IHzU?6hCgl&?W!;q
zIh1M1pkWm#I|%Sn0ir?!p;yA)b3p(~pMbzLMUX2Jq&$viBb^x&|Eh}p3ZOSMs=s3T
ze&c0z01`3)3m|V1-8q`p6EuBkj$7yaqtHwh#lXXxYjn%Czej|~@N8sBV0PT3LJiS*
z9_XIvoK%W}ap&;&U~Z(OO{8?;$Xe}1Q|9OL@iR;P>q*P142p@(zb}_6V6kM8QGy!X
z>7diSm*^Li2%REpuU6h*Jtnk@(2bGaQOVlmJpfq%T5Y_U1A9f0%@hJmDz>8V!<(fG
z^X#alAXZoV_~EIncfj<dEWqBF81)wTmw`wruTp$PRT_1w@#Fb!h|dkal&E3C7=WrL
zl(x96GK858UzA3Zre~?mLdtdfzR~#uge`<6PK-7mlAH2uUdbkl5c2Ep3!yt+i5Fbz
z-EvN->S7V!$`+HP>l(CNW(SHIYd08@F#ElS)PGJSTHR$39-2gwW6J>#aAtLYtI=Vy
z&A-~=X@he@0KmVWyA46|;sESrFIaW8o6@iRG$E!EbKs*}k_#dDF0<LYz)}<8=uf(y
zIi^NwlLPr)W1&Iq&+!mQm<CgSY}pJekB@R`ChRxM9(*`}+8dB8NV$L|<SE*EopRr+
z28eycSY&yoWE%|=Fngj?HiswZ;C6eZ76Xap<jt)7IAM1x`l;F*UlSVk@?vyxECZsI
zk){UyfnD|ag802bHmi%%xL(NofJFQU#;PlE-5dw`WRD~3FtSD1H_GB&LC?Z3$b#hk
zJlx8+v9Wc?ePoa?R~k(FTDt01$wN}t>LiA@ae~yQ*OgBf!}xwY95vFDWv=0<1d+VP
zBO!Ht^lO$a8EdCo)fuD>%L?njunG-OkD$sV63stV*fliU3kImOG>U(zSZmP6mjev;
z@4o$^3N=xcli2&i?ymo6P!xxrP)AD-^)Y17mZ#|;RsH#krB+q^3>cNQ<)K>Pe}tf|
zy3de*dqfKDZCYM>r9&;u#7T7~7*~nOGwxu||GJp&(7pXVhmOBZb{A^l40q*Z&W&u>
zRh{EIyq)&_nHm}Ci&TbKU|g$>IYSAH^Exv^u7$WZ+nfbe2kGsKuIm`b;c=0jHITj)
zR@<5wbej*$$l;~lZOX@pRw}Ql!?2l+K$<*x-hdR`Q>+w_sT#f(4Ef1A3FIrM9!DLO
zO}%SK(1{58@HDzrVq!LAdElWNlOgkl47+B-5))0PwtfUCSTKSaMAG=~j1P-iC{uGH
zSo~TF=>=nf+dAVzXM$k=5Ev27#!sAo`l+}qe1pZFpu0(jV$~%_L@kr{#Bv@V>~YEg
z7L3AyGa{dOn%e#Dq3w((qD12xWRrQ1BQJYareKJ8%}45@7vwlKR|{%oD2Qr_#2LuH
zi0WvM$upZ{NZ|Gu<dZ}z9Jg3`OZk5}_SBB{4L;q{rlPRv3<u`E4uAn8>7A5DEsg+I
zyV@iiKL~*9-#YT@qThkr3${y7cuNPH>ruYxFS^gVW$HoMfOR6lwRJC-G;&lt8Du1c
zSSj`bJSFiDjA_od(5*I?A-BJ`3T@_Gy_Kek35<#lwu5e}D);3kMpDv{kL?130~|eS
z_)h=;004!h+>X`#m<uAY0>z+9z?v7FM)f<}4h*60f>~Mw{o9lFhsvd^SF%Y1ItYwf
zoSGu<y$NW)6W3e`rcn+=6vCCjL45Vuy8}{+iGtq8kt6^1pZ7_?8HD9_n9UUeMQbpt
z&#Bzek?E@={ZNnajxI;Jcwm6^^&$R28fs9(OoK%x3j2P*hF*UWOQa#pKA#ePrw#uG
zN-}>4Q+u+S>BbU(f18sPK%Nbhq?2b?x)+EVV+hqI_;^JEGV&?#!T=O;D7I*_*`Q<a
z4yTLtJ~4jdE)S`o9A!@%W!U4hZwndU3+cWZAGc1TseV;tn)2(vdl$Xa$1%PB<dVgK
zNn~{#CSjQ(Qr}C1;kQYJsbezwr7Di0tMKCTOg}R${Ct%`mA$IBXEj1qf|ifv+B#ok
zSh!Le66o`IZyPJ#bo&KBie{_ZZh}T(rL(VVTNs2lxX3V{>Ln$F5{|by@rdcQpY>f0
z(`^Rwj?#vlH9^L-r0N$hCX0}7n!>4ZaI8i@T99{8sQXz>l{GQ=C!dg-v9Ekk<}Dqy
zK(%&;i7K!O5N<MLc9C&4Q&6bc#tuxuvH45^1<mOTf{3K!8Z3Z@Y06QHB!be5QU%{U
zEVxHS>)z>BZ47=vjim$tFQV(Kemj9C`-&G0kLZX<=a}PPEcLzo@%Go$f1Ii_SaJl{
z2WiufcvEixD@Cfy!mCaUI9qC@w`=nu4QRA$!X3?#(a@xt#|?Lq8=BZh8s&6FAcCxE
zebVPckOqEIf<$7E(O|;<RV6=$UR_}EDt0I=)Wh*%;gh4|-q8zlE%Y=kyBdIR2z18I
zl1cvEVX(j^0zDKhun(OJ;(QxMamC91qAmEUkBs64dz@8=1ikT4jtZdjvRfj+b5ksi
z#ayF@|6*}Jn$6=o4=kCD`6af)_CL{=qlK(AZoQ0$Ixg?B%=EwAr&#nrR5^_dYRI?5
z2gMb(m}$ix^mZ<R3pdv}>ok(yoKl4^z2d*?`}kP0#)z@*-wiTuHTih`y1nKNrP)vi
z#+%uni+{URz`ZRyCk2|hac|1MwggvT{kpxe);|!UR}MlV9%x5ue1ar1Sz&^jm#*Pw
zR~$2fMCZ7`NU9QoA1|smv~zzPja&aDeEwX-?%Z>=XpTN%)_x{Ht{V<u?Y9n-4AX0c
zB98E3Mo2v6)xs(n0ZJC7vs#kJXs;)<m@bG$#^W1Wvh1*`Gh6jlmWO(Y{#xw52azMx
zDr$U?vgq<Y2`ysVz-q`X{KqGtS=RUvt$47QyRAXODl6ZxtNW^b|C8K==!R$EP`Oji
zUf~w_WfELwNh!AaU<p3ohk*C~eT5Xy2~U*gu~VB&d5Yb~L@U}u*2k``i07re&+J?{
z6fMLW)3$r;%?Hf$<}1ZR!Q6f#dmc8;$5ART=n@yoMROrq7=SAkeyFrD`WP3li@YnT
z`BJW@6j2x4a?tR)M0VYjnwWWw(}4(-h{k=Gl;RwY)T4>z6ih}BVTI#c>jA7AX`+eW
z*`W1TBhubiQD_W=mhE?S+|8!G%(qy<FoIgSQiZ#SHyXZ+XJdqi&3UhgWd)2?P9#PR
z0q2&FP!O;v&{&NcG*bHqeJ-&Y?c^|qVx!(0%s0A+ueyOPeE!HWI-fAHkx1)4HxrEx
ze3HX-koKz{mSoDkpBU%G2TQl)6C3Gu9)e?l23~PEa0m6TPhL?u7#Ta5&;ohD6>*;p
z1T+8u00Ef|7kyStK$b#)B|Fa9t^Rjfa7p1uIV&-7$Pnbhm8i}V^bu)Oo+{@N#XTt1
zW-)}de$<?_4r&w;3u8?V$f$?9U9^|7;)Ym%yVtK<60*j&9W$=dL^GOHGlEx7Z0daa
zrzd%WXKyfwfl@PnlwqA3MtIz`2i0TRyn1KMw}++8fq3BErkFu9ZxK1}2^c*^8j8pc
zr<B;&ci_<YFF8h<n$>m5NPSaSSGq#ZM~V8xorN~mtn4b1=OASG)n%>#>CJUf*8yqF
zuI&BAnY!2kb@9}^jm;*LF$mv^O%gJ4j0!Ll5ki5k`?mm+i4|a1dRs^BE)AiKd6p>C
zpnYVQt&&(6Ku!H*z}+v&-QKE7F&V8C+BKR87LeVuRjmjNJZbfG|GPj{xWszGiK8uZ
z^yh;&mgZdfk%P0E6NZjR2n~FK^A))@^tGK!N&!iD5o(T=G=)FR&b7m6-C2H{2vY{m
zjZ=%6l`$T)9}|S`Z*&cQ`Oh#~#z$6j!}Y0jeIuoA;nunpx<mYp;t^pOW}AZox{k4f
zUV@GH6Mb+B>$!Ec1@EdUZaOfLXM08Ug_o*<NK#605PP*99*c?9+;$;aQsG^M(vBep
z?yZv=8#xfRE=BTvzM|04@@T6em5wA*rC^}qIk?YrOV;bbo&Ebashe-W`!>R7Vzc$I
z3v^o;oqT3!zH)=1GpF{nXkJ8JUKf+<219{hEs%lELFfoQgi#n_oF$qdb}*xE(JWuA
z$Dsnb8f>s>F^TFJGoykdp{08*nuRRK3|d{G`q)|~!2#|v`I?m$s2Zj6E1X4&d4Kh)
zN=v>kdj-n5Sz?Hc(*P>SI0HPF;a4Vp%QW1#TVk(at*`3dQpQ2W4L3RZIb6(u5ltbR
z=!nF~bwy%I9yF*~_PmRfTyO`B6zVxAovK*kJi>hx*MJPWF#?i&AI*-$od1F=;$(ok
zynaC?rngo6B3RM%As?aIZ*3Au>*JAkg>8po6n-2GpyqA2A7Av^f+!5j2qSre?`gne
ztTTRF8un^rR?GQ|j9Q^&{AH***WVWU-bXs-ZFAI5A_Lrf@_HCN2we5d(~dKaP3)IG
zgv>gP0vm&MkFPjIJ<#uc1ZSU-fXilh=68{4dvWexhysB`P47mj#WeH}-11e~6I~6|
z8(4w-tii5u$jS4cTnli5?P7ORWVgqq_^t+8*u~r}+YhSPa_0qIXRt1iwd@l~$7_Sj
zDaI@k6tI7#NjIJOD;$w7vCm8;$>1xlkUyDqC1JgQcG9YhHnW3URwSsW6*bX!$@Ab>
zF2x0%-(@PNo{jPbZYJxCN@SnT(xRSL(Ll+&hQMNd?<q}8t1oA<WLmhTQdlWJ?bIlH
zsy2;H$}y*?xGiv;P%$pReTDraqZ+3N^rzd@7jnm{;iTQ~e^&IbPmE;GPRCIR#3`h)
zO3p%GxNwgoj@>Zm)pFo>ibPVD5AcfyiSXpelBD78YAp&xChkzuQ+Cy5?#{c={F5o4
z_K{jhxa;MbRgp(+A@WiPfH!Hxl?oWTNuj4Lpf2pzS_X>&S}5SH7PQfzO`wI57F`4*
z01k6}|3D3R-(#OJ;_0=6?7Ly><!EN$D23*Za-j>Ym15u#rx=qYJ$42^!&M>DyqoJ&
z?_mWb>=tRsSEu-yR`-o{Cyl(>8b=bbor%Lk)V1UfdpQLuW*l?=K?V?QOC~4wXrhSs
zeEEipd!i|p4ytBc9_$L>`XjcE+P0`Z*S!$2J_GzMIg1x8#L0;}R3)wkBxMFCdq8R6
zRpQoUA7719){{Q>FNV+g!-_XPQ*@c)v5jC$FkfYA#h6U^E@5sq|Jj6aea$^}7t%U>
zCc4eUsh3nVN+1g?)_^7Y?m+^Wn!Z5uaC~-7Fd28Vpw)xI&V$zu?2~kv6v}LnFl8Rs
zkiHJs5_66d?6<FyA5apkqd-8UZ$D3X1oaxDmzJl^L=qVcoM6Km000008vbF+s>gjW
zAQToIiU<y^YH(*K4?DFY<WUJ^PBud<jWR-1A51;vVn9GCc_G3aD+In!GZ0>tuK_c%
zUw3pRJ-$?O)c>cx;Ry1`VHOgA7EnMze5TVaJk4B)*LE;$?H6&2dZO6Np!p%XvZ;SD
z4>`mJziQN<j&Ad3Q@7FLx=bvEI67(Z+0#G~J30wK&&`AR`h;k7gJ(_A<DX<^{o*Rr
z$<H++TAOZ%*156;85?>u!lrG&722nL#%`@~tUQ>(Gk-o6@N8uNqhoS(ok(g(9XU|F
zu=ssiMSmJe9bMoe^9suo$P>VTu;AhL7yze@Gi_xiB9hepQX??guM{`D`~b;37;qY&
zH(>WMIx*Ejmi_GvDi$Yb6-F5j4uk;x^>}5QXEy&XMQ0xz+V{ePH2(cBqZN4)vHeEU
znd%)2D`Iz>Y$bXAjbYIRL@C|t!OS=6<VN%j+cS5Mg<TebSN0uW`&+O0i{RH|$$WDN
z*^=QI5VD=SRvOF5m<UPsp!d4BIsyrF*hgX!8RO|l1xFYH>hU|+i=8XUR({CCR-KH<
zAp*qpOfm6P=#O%3da;I!uFqZ!056*a$;!IMhG>gSmci$WIS~O5&}+vElT>4`6kRJz
zJLiHlHvmU=!$T+$zeB6RH5`4;wm$|oY$X2%7Ywqivj_ue3uJ1XkyVo(K@)OmlHEba
z^%64^c3$V4gl)nI;YVM6y!0FHczlqj;Cbc6N^2nZv-x`Cy5K6MAWpCmBu<+LK9=oj
zwf)rDc&Xld2uk#?I&f98z4pO^==fS~d$V6|C6EKLZDb|s5+19fVAzQ5MwL@J$vNr)
z*bE7wtKDf|)BgeXY8e55`w&7%>`Xkv=frFSh8MDq&s27^pH!P!UT`Ks9PuEh8m$=f
za2{l>MDr_m)9XW_?@Jg-yp@Ooi@Esdcq)FPjI4?cUT9OsLyYR@Xf%oDJj+`7|GuG_
zE9;n^;&G*fbBKpmuUIHQ%UbX|=PpVJ1{@=^70)c*X<Z-ATI;_uL~PTDV#7q$D*0=Z
zM8ly4K+8J8tf1riBpXTjBST*pZ<7SEfa)-+CU5MXu6S^j{ZiD{_zl0xX!XA*bs&vm
zfaulYh0F+*jsE1#*9becqvPTeq@#h4r2(%GvhPLhYsia+<XTy(hU1IzW8Mh8tX4Nd
zXQnv&$mgE_KDIkP9yeoYP{y9T&vb1j&5`z*g95%Od*8J1CAN_Qu*8FT=?rl&jASlF
zEVSfTsvbZ_m#=*&6iscpJH@BFZ9oX(S_#5#*Y=ho0pemckwpbvjOZ#5r5GQA`d^89
zHIesxz5#<ad_x%rfbG!p?T!{t>KxvLBN<AFFm{*cb7_x}Kmo`gDGH@kScj$8*!w>;
zXIX(d92AsFj2Ab?#PwTFzvS7c8uNR|+&aUNLASL_3m5HV>CIRn6XKk~Ns~qYZazW;
zfdEL_0hhn#?@!T{2G{)3Cbm7piai4Tq&<-uc&p3G{c{7i%W8&h-6Mk)#iVfXub!_#
z1LHofB_e-IeAsm`aryGHq+)FR*dG|2&bm=3BXkOi>!q|lRJ-xzXa#iEnh@#$S*@Us
za>?NLkv)YY<1$;;HYXdpr9;5_l?t0k{&Um_B_DX$Tgt}<ot3*FvI2FwcP4Gu24t#A
zx{xC0`}DAjB#x+IP$3~b=}Xgy#FGNEr(ye1*Y2AiTq+W(l25cbNIRP!P$j(0WJ~Qa
z`O6mU!|LdfBOqqDa{^M3HFSIn7O%gX@k|TlB2}7YM>usAeIUt`S(osN7)Y};$Z);l
zP{r^4iZSAw_T<-rOP(f^=g$f>#a{8X#5s_n2fxzQ6$Z$Qpo8;1P<v*)ida2<h%CE_
z{f#b@Tv(wT#>f4-?zH35R{`m)+y)J>p$u<Jpb^+MzAlk(YNUgc-F$355z$mD(j0Z_
zdDFAU3s&B)*ADIAKf73=^xVveP_-ascQvN`xIw-mi(t^gDY{XrW<lF@#mKv5D4n)(
zwEJpp7RNf1LzWeU<1Dd&fB*mh1j8Z1;u5RvA6*w0hym!1h?S^;V@innL7+l^>>xk}
zpcO9%%sKd4GD$}Flgk@h))06J&K#|U-dHv;baM~S1%znqAPZv>g!ca5>roZwjkX?)
z-TTv9F{@<P>`2hBC^UP}(h+Cu8=8M5A~g!KPziF9X%H8ejd$Rt9RD($B0-yOPMMqm
zS;CjWldD=o%@VcHB@dVoQ7`cN4Wl+A!7wnH0XgXVU>Xo+jrJ3Zf@6$-9QsSfkLC2G
zW_<bLjiw{DBQQm!iHbL*2xok|j_@eOg_xu=y;_S!S4s%}X9xgS4%j^~f<z<T3Fmn6
z%NA*k-T53;8YFAGSK6(36DD5l2I?4y6`4c%dPUdJ=<&^PDwNfP&WKVsx;zo%MB0)g
zk7A#74_q**Jk?J(SQyk0SwDB6U?0&B<n%db8Rp4IXro*F^py;Sp$AKeph3XA)E_oC
zc@SP}t!qnfIwHsCJ^|j;sG8|z1r*{mzmet(GmYF3vv-PN{yyd{XivpRF%!8{+Z_$X
zTjDkMVG-~#EH%K0K$K!p_PLp?jF^BMLz~qY%kiva?0lztFmOXWfcM@8bvR%rtMix(
z>&Vj(PmR`R@VL_U@|a8bDa1jCVrCDG!Rbj}xN8|WuWaI0>vc{4z7qT6!F=Ds4@af(
zz8WtRbGBgWrw*X!i;Ss?nVs-%P}#eaJamXy%&_dyX7dkmMqVRR_t_j_gOyl$gulFS
zkza4@y?MCE5Ta4VS9aaz;Ue|#ite?ua;Fs;l_(WOzV}RpMmYz;yQjEK%eu<*;3Rr8
z=T!xTB45Hgw_ukl9|pTp0^p-gybefi0T!Bes|>aGWdPZ>AUV!_7FACS7HvQCLIiQ1
z9CadAW5KRzb=ghdQOsqw4EVmSexK7{{PO2bJst&gD1vhe@?l$~lg<RTy@)qIa-Du>
z&sW{S9LBZ$-c7G8oW<)LEJfS!1gB5FcaA!@pf-JSu4F&ncz)v?Wh(|@Zaseso(8d9
zWzOQKQh6F|>z@VHU-@Jj=dsrpw5Ctv8rAx6sf=Y^Ml76@5gJ1Gwm~k$`m9^V9LuUA
zLfN>ZglSECAtf{*%{v2`2M5MM>_EGYBn0LJeP<TU*6DSlMOj>iu^|kOc~1Mc6EIJM
z#=1U{&rafI0mQ5s^$W?=H1K{51yO};2~(nRr>EXid?C<cyB;U&JcHqte??PclaY#M
zK3f;uR+V@HRkwHhdy{bACN*@8#SFg?H2cm-oBM^39!K(RN^bxt336(lnl4A#R<Id)
zV2RYV$QjG4khS;lD~nc_169VAj-V7n!6A30PC$a#O-(gyuYx}=Ai(@sf%FX-%3&cr
z7msp>x>v)t*xiBB>-g9|wxn9@aq#Iox<*J9F#c`aHd$0b;uIs*JK;+h>Q=v=SG&Tn
z*HNFX+(R(N7&*7C-c@TwyJx>WXUtbV=&`8AS7yr9RNCO*I>-N)<)Oc<#Y)cXnPU{Y
z-qc~mmklFGp@|Uu5ZCmIw>y?*m#$)@_eVNj*~N@L(W|Ns(l9h602<d9G)O)a_stpl
z<mdS|g{<>t)(-Wsc7%Kib2DMEb|023O${$=vpFnggtslGn>`@%@8P2l)tj(5vuDKJ
zEL-}HONuFm#}L%%FJKU8jA29N!1W%dQ}~h9tJ2ED%Sfj_-t!EJ)C39bv&;(pdTq@$
zU{JVcW-{uUKtwhq-(9_^<OZi;YUMPTju(n5kWrR60&*Jxzoa6)tis(I7K|%4u@WXO
z8w<j9%4Z=GiokG_QDQ)KQ331KOXP%W0ViGn000055aG_sphwCV+_8<{VtbJkn84^d
z?53@$GFX$-<$+TlgJzXz-K&B6gXKfzGVnB~_Sge1+Nrwa+Ox=(EpU7d{&l!vO+v10
z&t$k4Wsq6eG+Z8dr#F~@p?E6iGYN8^m!<!rM70(TTmiWzM%gkw*DwG695EA+ITA2Z
zNl;rCjf<20a3`q?Kr`L;R92zkcq3ptM0=UHM<V6QQ|O~8r8M1DseRWx8RC$_&zzld
z`lh~!y-$#prK^VF;B*xvvefJn0#;hlv}327fl(~Mg<n5&fz^2pfd&A4aopi)^{3|6
z!VO#po62_9THrL{_eoU~8=4$#GdE)6&$FppXXdJ?S@f9P0sS#>OIXpT^1Rs07eRhw
z?lHq686IaL5E*le{G(M?PmSqSx5pz8OnyX)44UxwM`&z6*UhTRX_Kc_OzPH?p{0~G
zAU}NtDwUV+)><FwzzsR4W0*3CHX6?Y;uo5cKU|R-iQs7H`zto;+K*e!GJrr~0h&81
z)@$+OA3!(c1SKrY@RSOZCACqNH%17xS$I#_y4_wnq`WB4IVST*9?7id8R4vY#-xD&
zB>tJ|%I_{jszkU8?&T~0q1r4NW|LL7IM^_NM8y(f1jV=aA|PVxFxq5wz#U|#2xT8T
zuequ^(X&dgfuv&u4(PUY|I~YI+RRet?gPAfYJFS6>PlCGAKI64;IG#UI~y5h2dd`o
z#pzy~`K!&PMz*q&Yr~pUBPXwk0pr}aGsnK_d*O!XG{4{#=Z)^1t$BQ1ljYJ{*%(Bv
z3iY=$6x^`&BeqJabzF6>=Wzt`GGr7nMff3+Kmbwa6M1?r5d2Aa>sbv$D;hMPnf*Id
zw5ayEyKx4&{w=%I=)UcU*`sr%HE~QIhGI;h-gvAyg`|1a?e;`KO_aATM@0lr{rh4?
zei9U0paoZ(o(_)54IJA{P!{&i-KhoET%J+4<uQiuTGik?ACsLMt1~LV@c{POj07b?
z&5ozD9Ut(0_IOB~Ur{{AT2>0)hq@ZSi6hvUv-Adle5zi_I3SB$n`!xHyO^CDal!Gu
zZgb8)8Z?(&oiAk$%hY<Adf-0~!~<VY>vHiA4N^POXHy2;$UlM~mH(TCRkGwRrI?w;
zSS|mD0)oN8%QVtf4U&c71G=r+HxpiPbEACaGv}KBTankRO)KT${8N_yC~;Y`lDE*K
z>2sjK@^-5TVuOQjc59D{=ncb;Gxa~+XcW!3I<x)de&|j>ilG&CDy}pS0ZAW0Bk@!B
zN#<JK)?8!W0Wkbn2s~ntKXpva(>1VmWrdI5msT`W(Z4+SH0p#x`%3^YZGX1(bLSwB
zq>~2`*4{*Vpn?vJtW!Zca~d(i$&E?)1PB9h7Bq6+UCo}+#o3pLIG!sxeFZ?W{Sgm%
z0k9nvE{_ZW5f$f~_hDXLFii6lTw_1Vs5QGkWpE0RzF+Q89r=3Xgwyg`>q{T;;`0m?
zkb!h3w$V?W=WAt?n?92bDj-OTSZUkgqvi4S=_Cx*Tr<@<SaMTlO@xJd4jXJnU;-mr
z;H-v$wqU931)#818Ac6|h6#5@h*=<f<-YmIfXny&$k<oZ7Xv%-(G-<ZL~<V)iS|Jz
zbEg-*1RIkU3(7WF@U$;+KmY&$0fFsTuQ5I870&dDp|9oL`A5eka=R&zNx{I&o#?5T
z#MRC(YiK-mny8jPxMBwRfBIJK3Vj%ZB$H8srHUU)$I+N=icS4spDiv6xb-cMg>$}^
zaQm_hvDybcbXge&?RBWa6i=5%ot?4#8ekDNN6Y~a<hzfQFo~X+G`OsEsozWNP(UAC
z?wi*$7ytU-XYv2>GOxAT^p9LzLZd#pP6%79%X1&*nJl&G!mRun`ffwa5@=e$_hZgA
zE9Zrmr@c(|XT?^%G;~9w5BjVTj)CANQ+x5|Z0t{vHAuqg*Q~Tl+nii!O;2Sf)v;p0
zD^HiLE)Ivm(cmc-y@unU^c$PCu46dG7ls~cHAL!DF1#fGlYz|oeIPJ&fHc7Kp--EO
z3ej+&rO#JK>O*!TECpuXq;s(I6&*A<c*t{X7A-^#$@XPgG4_B&5ba>e7#=v1;-3=!
z^++X=(E1Xzd$Eyy_o5NeIU$JM83GMJAGBq+P6o^~ekt_Our76E4lJ%;Zioj^efZEq
zosfumuP4JZ2emOtX-IY1o#f?-@t@9>^1j$S%>>q#K-W_!7lH~~?SQ>a^X<<!T}f7d
zD&C8PIaUn_JQnLIQ__UppMrM$L-if~_6%1xe+vWknAYZNQbITUBNQxJx<m-FE+#(Q
zrj3W&8^M9V1Y5vO3SH{P-xG1Usy8Dxgt>qk=FNpY2EMQ@_MRS!OPNH!N)S;hU0JFU
z{2Ouim6akY106NmyKTbF^=JHxc8!@!7us0jFlH*<u*JHff!KwGRn||9L_6+kDVIE{
z562o*1ADgU!ZcNikEbu9FecwC)p+rO5k4kI!LQi9^yt8WVmNL@s8_P9j~9K&D;zhh
z-}$UuhhzJ8&(JZ{d|0o1LOzH=TPJp3lnYp^=c2$Sv>v{@6UJ_ydC_8)wiE{)<H;_?
zwptaURP~|x+<PJ8mQzqiU9@Y9`TW3biurw}yn-`rJp&6p9@g(Z%7p$&{{jm^dGndi
z@Mmc9Af=5egJxhneG>EFS3^Cwn%*Rj9fO=oq!q%3+n)Y!N(RyZ#|bRw+{`E}I%cba
zJq<83tLv7R&jyi(a2vdB>uFj2rZ{B+6<(8H45TJ7`*8se3>PH)r_aEc1l&8j;IGNU
zs+G}l7Gs5rN)(SfBr+D4iwd@s`Npg#M$P+0tC+L<TtQaV*4xe?Bl@17otOXPm(ZWd
zHJ`eaRRQ>x^5^#2We@k>YMTk61UwMovAnh}W8)_{W5PFkWxR<*v%vRc2q}VJY?Pf-
zL-?lN&R$%`Y3$v}M&R6jbEs>0b9^evmVoABy^`h(i<6rwuGc72GDkvw08=M$i&B!d
z%u&P`x{!H>t7HI?cH!lf4*ilDh4X5i4neace8Jloie0+SV)=r0eh<1cbe~oA6Cv04
zG`!1Dof!BUl8`>={xHgAOQm>;>;@Z1VbA(hvYaRY0003w)K@YLK&nr7@;RMiY)Bh*
zJI@?_fmbe352cyM3W)*D7arI6lazV#NyfT+1?64)wHRdFdjwM0z$9V0HEZByqKV|D
zty<l2cxRqGqj%PkIEekDmOxY`@3NwS5q?!)g~EMnPf{#sh-_~D-09PKByaYB^+AqV
z-1u+5ByBU0KneUj#<KwHS%&lEso|>^g!G^K6)v|QdSckRbf^`uW8$d^2H4;XEdC=#
z683t#jY1n|nG}sQE*`_8e@*^rUhA&<OlLgN4yQpG>RHBfMrB;7@85aerK*&IeTT&U
z%W&&$Af%MUhKtC$d9T}o7i^H?C?g-5h5N2|@6N<IQK88c%B~0PE05zcg0gYB_iEz4
z`;RPvUVT#1JmL4&Tk3ildea7ypi6|P%Ss{j@(9}Q%{AhSqZ8TooQ8)o#pqc{fjt+}
z6L>l86;?E|_0_*-Mf`{^4KANm5C2;kSt{k{-IL#N^I6JS-*V~{rs=&ywE1DTmL)LF
zGS|=LVE&<|QTo{v*-l2*Vko!;`h&b+V7AJ`ws7g{7L5P0j?FgOmr&Nn1n(Om?D9Tl
zm5q}o(kY4?j4EAq9x^xl$;Hn&9crUdoG@q5%|9$Afgu0WCTy~5FTA4R$fC^1C-S{l
zFgTuO&MUGB@}hD}d|2WaFJJ~U9r7s``YV^07FGwlG5p3z>t(2CtT0q}E!4i4tu?w>
z2s5Um{ArOAcSAHJfE-Zlr{&GeT-IB3NiHItrED<zt`u+I^%OGa-(*`<8Fu2`)j5{$
z9Y(vl{mGr1ZcP!PYb)TJK59nyM18<l+ns!InM;+xMG7BQOK;2X(n;2V&O&pQ*|nxo
z;r%cHh2a!KScHY8qv2QKra2TpU&+`{UE>P(UVbT&t7tO8<NO%`$!ROR|28a4NQHEM
zbaeIEQ9AbAC3F!6T;UR5wVeVi+IIM9csOU1K3>nBp><Vr_0`d9IU7PRk0)0loT8+x
zU2L?b^vZ5R$eZ(T7%0lJ{6f162>ny`sX;P1O_qt6*p4)g>wCepI~J~e6=_9jIJ+4G
zg0m9H?2><I+O|mUZmc%%@bSKFL&0+pK002IHj4r_pVK0Szb*PaNWWAm(9Wy(<^fLn
zr#ex^mUN@v^aL|TFlWdJrEn!~#r@wH+EHo!*;1n)-cSSq$u6L)QWOoMc5Y2T9AnpN
zpW7YJ^A~L;&d4UzVv96n)cqZ(odq;&$p}r8ADKLFb$rCrQBcIW%9O&nh%f16v{#vi
zhi(-(kg6H(O2&qgQ6IhCXrw|pBmLXc4=^;|63gS%dw=t7#vCC`mtmUwkOny^33f7m
z9T3uMCb%`0X@^5%W}*iG3LlF_>Wa;=OS%ZjU?j+|uX%C1b)IL^7#k`tV%)D!RP?5Z
z8gOUWbXq_p0<-SrYKRs{xWpZKhgF>IW%+N!AvV{r*#0P+Qy4t(kGbK+KH1%L1<&Qs
z0X(&P`uFK=rGCqVkSC(&Gk%Ho26wtz{)2}L*VKZtl&!O+f-LgT`!HS(;$nI962vPH
zK-j*87icLpQytNBSvpLAiIjCr9()K>N59ZxGsiNXa(pDKh@^B{f<eurA^EYaKNwoZ
zMNA$4O%2xZNBQ*^eJuhr(>Q6yZP2qKo;<?i^cKENLvh$B>g4ytfB*mh007Kh@O9JA
z(1<*)T;Da>OIvh!zNl5|DPXAQAx_{>Hn$;hO$>0U2l1>?w6y({+G$te^o7_Lm3)!<
zEEQm(1<y5<=T7Vce~20F>C+FUd!(x6?|Yf+LP3A$R;m_|{LyKkOv1by@!{%}gv%Vl
z@lldZmS8h-6FRcy#UNtwK|nsui>Gq~!=}g!Y89Ys2|?Z#&axL=BL)`RK(}|G|G<S;
zbCw3GYoG|7)%iM7g6@dt%ltMaCB9n#=!CrKC+pisaE>0_nC?uTl(P-+qX{z+Hc)Fg
zY+Z#&SG6|^_MTUfEO%b79}w^mRU|d>7SzzpJ09W!J!J6_*)e(wgde{@$LOsyd@NW^
zg&)BxK81dSL)Tu7tj55I(NJ8h;A(!PIozlA$ATs6=FETHRx#dmqb+ZsMJ|wTfJPPx
zTWnQPhQk^idMB|uZVjI=UrUZrz+B2$L&G_&PDEpUVs44@J{kXz%{Mk;7Bv|KG<Zop
z9DkT08s9<Sm^F|eQAseTl1!+#NmgO6Kl|iDm*?2_I5SL*?q1;I0OP<G;Cx_$0_Sjp
zpVLw+vxKM=!LK=z3Y6jYy7U?mbwFp3D5rcp*YXy5D>qJ&AOdTfCN=+DP(~DI_P^!W
z0DY@(+12j#_tJk;UDvv)oztU5uJ7}DduiOoO(TL=e@RaMh_|c79PJklM9RLk<9LV?
zX9Np}AdMk%oqc}jQdvBESQ|f1=Jj@y>L1Z+1d6ekJe%M+L0ZmzA9?r+uw2GF(Ae)C
zL~G_zp9RM3G6zR}zF=MW|IUH9iJPcGS$}twRTYVLR||TJZGuhL4%WA|?7qZpg0T8-
zJ4L3N9+{!uC;!Wp&=^><<tb>=N@bsoWNc=c`Z_9zZnPHFYSZqJ;7A1-x~2T_u<ReI
z+Q;0V;Wm$<{Qda40fE;aS*B9A8rSOWETP=OQTI04Omjbkqf{fTRS(u5R;DtCfR7+~
zpR!-(I6E0`A(h%B&NZzVhCjJ(JJ^WNE4gzQ%mFI5oD#iMv=G?O_^@PBqQ;EE&qYBo
zCV&($^{1O}c~;w@GRh}(+AhwVj06GoVSpQ#h-#}5Tuo$M>_i<)TeirWy{|XMWx?m{
zR^dhV7kiYTicM7+j6)g+5vkT?co}mc&&;LZ@x6*QF*=u5i@s4_T-ivb$9wAF&ez<P
z7mOHVq`|##gqMmu2ubbfs8LGCJ`r1FtK(z&+p;Bh|Na7s&DG==Om46DIvheHXltEc
z3}Cz`ZzjTJUJb3-{s=4BWfKkJeWZNlUx|Ky;^OTFFkmgHD6C7>qT^NM8dR0W(m)uk
zBH}xb-g!5T_F#nk4TXk#klMV=qYAJQ3XqLJ>BNSfbUfvO+RzQ1JPd%Fe}J5<N4KcU
zh;-+@YgKKQWVYcrP27%&FCLtRJztjBQyuRn02-pb4~mR#jC_^R*Q?DQu=LzZ*MNoH
z)ET(saDBHuNmIdbuld?G+jf7avAr><z4NoricEZ~R46qaIU@L&qH(~#?Z64db1bvv
zV)*=534f-Zi@l+?MBVrYrF2^X_)q`<002cICP?bx@#*EU%OQxf>I9(kH*UbrSDUdv
zWDnc${dzu99v|@WUB(ia_XC4MwOmqyG_hrnvCaN#T%(GHZZnyF|CJbEhI;}1=0jIR
zC+pD4sx~1x3CmbRlA)k5{2(i<`_;}<#1F=NhZZ^c&T`Qi&YOX;)0C-#boWQLSfGEn
zs3iYY>;pmkFU84k2f^Gck-t%qLh-US{kehs@6DH<ci#vq?68{Rz&t$4YCz^e26jOp
zD8oYzZnE68Br1_`%Af@jxU({yHV`9&Q)G(i*W;&$UOJ<dho>Z*MQcBBz`+sc4cTAc
z4?UQO1EL$NZlT%g6pI^BO^1m5yW|9gFwnqnnIA;TTA(rr_KWda`i1BDg%E0KZ<%yc
zd0v2cZpba{wqxOPu{R`5YfiM5wlp_c6+Gur@Yh07=pqR7X({rz_lhF^r@P??Byikz
zxT(j2QH8ArU4PX%JyAM{!H)1w0>a)auL`p9p{o90(k9Ta-WTs?dQ8I7QsDITbCk)%
zuEOGKg|4twgf`#eafl?oLg1ZdX#&oA^Lm4ei_urRa+6<-m}w^u<^P+~P94Yrlih<y
z#0*CurmJzTi<c6K{BZf{8@z=@MJxrJ(sL6Kwi-9QB4QLL`fnQslLCi%rGCB!z)jjg
z`VJCSP<^UZ^bF1EHrYOW4nkh`*8XK;iiy*E7^0R@5`nf-!bs>0^y`*<K(_H2-3ocE
zsvT*6vHtM6+sKpex*H;sEfm-ycBN!r@6$7vz_mfO(q)xYhMHUw3EoF$TL*R`d`p?3
zc;(qT3|HQt#wIA(e{y}J=D{<9d`AZCe1<fxj!Q;?Yv;jg^@4TTVWqbtN^^Rma&@fO
zGiChk!u;b3u;WI{bqJ?M>zKftrpTt-X68g)=f)8WXt^6)&PX^`q{xJn>1BY=_iLDM
zXx4XAd@JEedqP>%{0Q29ymf|qYfzb8xXrX|G(tAsAExth544m(N?n<b{I{nxJoAfS
zIiq^fl}>ii_hLP-q?^^Gz=Xl7Vblv?;5$gBp<YGB0n-?SURuqGh~4@@>Z?no+wWPW
z#6(5KC=;{xSmLEw!(bP!n`zaOA+}0~U)v-uf>ou=k#0v2p1d=%!do~t#d$dv&0vY0
zi#!%rs}+uzT8ebZL<~Yy!Xn}8hYRsWXnqkz-t(B5*Vr$be$rB29GY9=ucU!yB)*^<
ze@?`F5XXmX`dZ=U(Ix}ay-87CvB(vQ{i62?G^^<~m^4mor=|hn0V`5Nk{#ITCa{Rx
zPTwLNyxwD+7)S1z>ebC}wa91l4KuaukaxUxT0_4g-8Te0r2{1@^LdcD-o|JJ8TP69
zrW-}vkEWNwn-C1oZJ8(`Bl#!8-G~BiPax>%5S$3wqphvl&jfk9JEkxxxnffx?IszK
zA#w#hE!(C+rO;FLw(KKk{<pC}UH;Ep6KT>CJp8+`u;_Qj8&4Gbza;k-M%ri2DIlMa
z3TW1G<Mi?T4Icvyvnw-ck|bww+N0)G>?=arP8ITTH-BvCKdd0rqo*#6+)G@)L-d}*
z6SZ%aYb(vW*~OVUa0KrpN_>28yM=BAR3Sq>4Kq0-*R?E#?m413NSR&vM4R0(k+We?
zb})+N6@3eQ)LPEpVM1H~8=aS-7SLZ-P?eyw7Ni)?OXfI*UFBNip9&tqQVl<G!U|h$
zTVt448G$xV;#fd*9*u=FNSm;f&~4|jYN!#ZP$o1%oid~uZF0cZF$XrX!{&eh000St
zwQT;%xO+^1Wr_heOjq=K<PEek_K|&R=YYp<PaNu}&}um-b@04WkhDT5BNkFC1Q-aV
zx8|_uNFn8X@^U##%(=S;v#{2|2sos6!SWxq5N$v5F}7YyA`o(^`4FP?u|K)!(HgaV
z5J5soLvzI^$|&lQaVY?lRPDH%Z$cy2hW}odA8vxhZhf+R+r}i4)G{b6?f|+1CE2l@
zLU8<6`%`YzpV&er^}#C=vb8Orq8+%er=~mkrarwg3WhObDI>w854<XdP5BRndZgNI
z$=<`=|0UOLDq20-yO`LMMKiBmB5EZ>@?yMu?8kdgl?s&9@@Vzes*jqhVVkx|AN9}N
zat2l^b$b)U<6RTI@+KwuJ+q4{)Pwhg2o&*PX5~x*QTzFXerQ8K7@F{a1;Nl_rem_9
z;j4<D3$}gam$fzvRU%n<@kpL#grUc~VWmy<o4yAcPzdr$mymtYP*OU}A-Ef`0S)cT
zZz&A!&%$qzU|;|z%ZmU#ip-3<I-Xt9TPp^9{G@*~N(&x>A1J8s@xj-4y4(FY1to<J
zO?(qynzy?)%G4aDjF%7C-lPk4@)PXycrP1p_C>>osI*$Re_fS4cqR)|7y1}Y`0PC@
z9Ndmot=Th1(SZYqj?ogK$VF$-OmT9^I?!u#v#z+I=y+E)ta##RyDt1w0Ez0L>9p3<
zemkTAJ#ud%+VK>>Dz$|nR>3U$wn<~7i-)0i-2vb5J$ThuY~c^2?nOTCe`y+tP&WW^
z!Lb#s78|OKY^9Gib$yUJo@MlPq6e+4wl?*%Mts-Ra1^%b1~)f20{_*4`$%}brRat@
zq<=KNooiWwP8lZbV^U)`J9X<aDN?Nz^fyp_ly73h;rxlXdvsnY4~$F4JMcOa=7co>
zC_XC?Uj8wfL9N4N3WR$mYk!<{i`Z9$L*nJ$ARkdk0JR#zEbHzu@Op7n0+&JYTRXS;
z(FS;lfl@`F?(u=f4t(8h`!Pn>Q2P+hZPWv@nsY>eQ{XgTK@D_{*G|$}!r5)li9jSj
zu?aPM8cu4T1=aglCO)G?IJ~)67%jv;0Vc0vMBs-DpT;F#rk5|F4o4r1A0pWWJkpT<
znK=wYR$=ZcyFK4k(pB9>WP7Cd7CppOOhI^3o=G&HETJ9o%6{UtgG;Jn%vO~?Z#k^n
zTZ>71bPW7KC7S9F`Why3bo3qPH*%l%IWu0$ns3!4wvWyD_<DZ&b0e|2KWVBXEY#*z
z%d0z;$sSe+G!j)6l22FNbto^PVCn-Xi53!HfyLoP;sxeH7OlJSvZgiAEGPPA{>AOO
zKYO1pYSR{6j3kzXsmg)xb)#2kh{qGst_JWKA2*ok<nVC}(zrk7lWk+dcNHBA+)=Vt
zHh9nLxvu<ckUm`PEx;efmH@tF(etwOk^D{u+Y+1Ysjd`>GB}N)umFRd(&+0tI4f!W
z#fbA#@vW!XXneZB@Q~y%6!8ud@#&Zz!za)lP_IA`fIq0QEdT%j001W(=zN!y*ajjD
z>RDRyYRS+(<093xN#MP;3gUBz<E_^xqAIY$GlFHouByX8E^pX-4ImJTiUtY=B8w=t
zjn=E3<?*W(ntI{#Hg}g985?TB+MHINbZn|r2k(XHeJJt}b-wW|WWio$@9Vv98u*_8
zf8Mgf#lnz%;}L(OR<g=ScPi}Vq~~HH$xi$$^K!Tz=eIRAitR_?bj+_UoYjR0aDl{5
z)Pi=AvlO{}u!<f>>ppIHN!<l?p`>yc7JsRTpNpSoAxrM73Zc*L5Alqtk{6H*9;-_9
z%?)OAHb$&)Wg(77%~|#L9CAeuhfFNi2tN|nZVM)Y_UdsN?A7h~=w~>MZ#gVJctZgf
zdqFN7mCt~VFY-*(a9o)fw`>x4tgv{MwN2|a!U0a882zDBCr?kfz?yp&!(a+C*u`QW
zvI&lMhz)+mWGhbJUyamA(saGQvD^dvgZaQdvS9F|f1p9}K{)PYe>>v|0;gCaVOC(}
z(ewtq1bLIijGNj#Ic>Rh7Y3cN;UQ7A^6F9n!xM&MV<m<~tJXnAHGkHyfaQfA)h6X$
zwsN_FAd#xlb(<vK&+1;tKA72^QC8S;LDoaZjX&onC3x$zFolExX`zOQhy<xE6j_+G
zQ0bC56AX?B+a5Z{UASTfQamrfnY-1j6jG1G%!8gF*H7h|+*YGT0VskDZ{ZI^#zt-~
zgAe-6*b`1<qDJ9rK5XbPYKXU2ospVV6<c7Ac*GeiG<{voV8`1YQmoqm+ujZ&WptBG
z36y?te=`ju+7LXL03H!a4X+VZhN&eenBFDwJ&bZdDeu#stH4n__%d$K0f3^8n}>yF
z#!r&ZUJh5sB@$-du5g03uYXaW2wCC&jr`yMhd71c_fA#2-73taMlXCJWuQ95b_?@?
zM}{lnTPnW62;;o7YpAf9w|h{K)Z7C~?2DH_(ZC~1doI6~-cVArj7D&v7smTsqS}}}
zm|c1QD6VNvOl<nj2=O{O%vh<)1w&)N!vkTtu+sR7&gM;4lbzzi!L_H_R2RE8Smf(<
z(F%rC%%VF48WqavPMKp@lVl~7Kd~1%W0Hvf6u?7`$aA@)JrsL|000000eTn?9$!C@
zncBr64Y;)~l$xTTm!CE4oigT$pn{@VnyZO=I+uM)ij-k&SVGThoVdi6@=RIHMtc{$
zbxTj$kLp%9oD+BD53Kta?MN=Z7ukRrZoNDxu%s<bu$lO6B7@;4|F13$Z(uNSa(T|*
z#}T^Rg;wBOOzR=gS^NwE>{3hA@e+yEX}iQD>7J1a@cAKNUO?kw1TMI|!;GNd2zPS`
zi&mf9jCT3k!(rmFL(32&gAauMIXS2wkr7LfStvx292pJ?<SEx=%6(${R?oq=T}bfg
z?@$HGp{nF&Erf1NA$)Z|vv|4n->#hG9NaDU3x@aI9xll2@&e-LAs|4ZKZDm@?9o?n
z@yyglJiw|^D_|9SU)JCw?fq(6Wq}$pbV&=5UXY(_TgW(^;(WwH3|6NP9pn+BX))hn
zWO*YwnGuh5K9}-uu}4+0QB$<s@8$!I&FK0Kx}u}<YtN+FY_?v}iH{3YyF;phT;QeY
zBXKd~IPx#@7cobg3uN_DQzQ?`0aE8QyZh9o1Af&h)#)PU;>90o9(_nTIW=r$G@5_@
zt9dgdB(RL}*i1Z%t@AgZ!txmzy5GM==JVG(R0oD&(A#TuIeXH1Ky{p%b_xWJ2Fbj>
zH2cJ1jg<!wwiP)uVg#<3e~r`bl&@lTVZYyb_+&<Ctk$JTlGfyLRDBhiIGad4!en*}
z-8hx@oqA9f;6!=}9;_vG6!>3tAqBRG-xd>2+#xTpR*&I&q%qpHB|TIyhLGxOW_h6F
zM=~xD4LkMW*q$7W(4;4KLy}r=&NBF5;hec`tssE4Y%K%eMh0z0yg&c|0004YFKWtP
zF_dUvuWr43jb3aV@w5)g=IX>5l~nzrAr89iO<<2mGSHd+^OM4o&2i>Rdvn--*tOMV
z+}8iR)8p&rdU)>QJt&UthlU$eL1<y|fSn>*4)hyGrvRG>LcHQb?xZfSte>)?b1FtQ
zP?D_oy5a_*&p%(E%(T8NIk|HA6|7odMr>{}x5lo-n8JiW*Ek>kO0y*IEKFjMUXpq|
zUf;;8`7DXwM;Yp(Z!9%C7Lyt*PC4$7d_lL4BMBb3m>>4>2({;%a-%(@7%UWrL}E+i
zaB}B*O<3DNW5cYUR~v6lSD`D@mFV(_fVy>F;_Met-rg>g4jXTB)SM{*^A<8qCh}PP
zX?hl}tWbP1Z;<@A7}}ADZp)<?qgIQG`hHDReyhzg$zYZ{G>l1{<wpGKd%6Y@e-6Jx
zoUflL{zBRQm2hl14w#0Z(mvfb62*Ol*lRyzzUlCl^e?6K433*|F;~=HINk-cHB+1o
z#h?nFv-4m>YtRK<VX#((=JbAT`kcdWz4G(eU+aBk`ks(?yBzxYbLjm9cgxQtn7_O5
zrfwh)fCFujd-=%xIM)K8^T<+*dK*Kx`2YX_0001ZQs0t{#8cODh*BVZ%jx9yD>JWE
z2xDGr`AUA(x{$Bh^4rX(B{NAhQv6<8tRc^0V>%x<4W}>objdtX4bRSG;V)-W0*|*6
zoG05YM0nVuOxFloG08w5={?)GBY1Kie9^{Dru{{iMAY@L&Xh!QMLqDV2-7=Ja@rnj
z8&GCu+n#3kBR(mB!rg$zW4L?4FJ%a;oQ$s6oi7<EH{0M>_dkZG^+gHJF{YpBUN?iP
zC!gAM?|;Y>eREGpv&xs}Q8^?{!NCF|zn+BC8lkC#tINRPZj(Qokx+}gbQG-!ZEbs3
zIth8%RBu<r{7LlWOuyEa2iMkNLgrCRmy+L->ZB)(RCjvmVjwngZ*TjF7z3{1A?aeS
zExkCeb&6BErOq;dIxQgsC)4!qw5hqdDs{cm>3Gv5sPar%PlOK>w~w$&Fpbwe0SRN%
z2~Y(nP2t~x)U@n2<DFpJY`1_5Cd~~1000005WY&3hVNTRyl`jb>O9fe`SfyB#iIpk
zpqFi4`lxQEG7^}i1t?u$UA3nB$3Ei|B~G-2`9*}U;JeRPImq*c(u+MW7(Xt8@oqJq
z&SFO#BV3PKiV)cO>kEwKfb|RA$2<(3=l-w#i%?%S42pSEO~Q5YuoQg#0SxEaIwuKY
zJzqrVCm12QlcwR@p{HTFqMJlwxE1%G_k@UlO|TT4x{vXd=g~S`Q0gd)dcGy;|HPH7
zMnze)29ktvG}?P5<oMLsSnOvfB0`v_J9B_0Z+UauQ8rndEvii_9~yS$|Mi6gYpt^k
z1_n%*8AkvB0001U2>1^sTAdjj2)rIh;8K)ig-60s1kK0X%pN6$fw?ZmU-iOcH;rb0
zg-_J<JgqcS0`Ol7Sj>H~bJ?rL(<+(Qx#|htBn^_JKjK$Ra=MkXr6IosxHX1MsGkEZ
z1xKf2l3+El&rvUvHh07Y>D_u=o2GYYKF%&Ox0m5Y?l{Jf%FTx4xFM6wP<1o_00000
zLiFoKfC3DI)j|JcNG8FKMHOGa)BhuAMhcQcnY8g9)iBp{ErC|x4uq1vN9JNi!xa~Y
zg6{c)Bh(8<=8CHgy!$Oy2#p-6%~ZWbZPRcEYd=GP3&J)$p+!L-<ZS=|0000000000
W000000000000000000000001=p{HE{

diff --git a/boards/nxp/frdm_mcxw71/doc/index.rst b/boards/nxp/frdm_mcxw71/doc/index.rst
deleted file mode 100644
index 2ed258c39a4..00000000000
--- a/boards/nxp/frdm_mcxw71/doc/index.rst
+++ /dev/null
@@ -1,141 +0,0 @@
-.. _frdm_mcxw71:
-
-NXP FRDM-MCXW71
-################
-
-Overview
-********
-
-The FRDM-MCXW71 is a compact and scalable development board for rapid
-prototyping of the MCX W71 wireless MCU. It offers easy evaluation of the MCX
-W71's multiprotocol wireless support for Bluetooth LE, Zigbee, Thread and
-Matter. The board includes an on-board MCU-Link debugger, industry standard
-headers for easy access to the MCU’s I/Os, an accelerometer, a light sensor and
-external SPI flash memory.
-
-The MCX W71x family features a 96 MHz Arm® Cortex®-M33 core coupled with a
-multiprotocol radio subsystem supporting Matter, Thread, Zigbee and Bluetooth
-LE. The independent radio subsystem, with a dedicated core and memory, offloads
-the main CPU, preserving it for the primary application and allowing firmware
-updates to support future wireless standards.
-
-.. image:: frdm_mcxw71.webp
-   :align: center
-   :alt: FRDM-MCXW71
-
-Hardware
-********
-
-- MCXW71 Arm Cortex-M33 microcontroller running up to 96 MHz
-- 1MB on-chip Flash memory unit
-- 128 KB TCM RAM
-- On-board MCU-Link debugger with CMSIS-DAP
-
-For more information about the MCXW71 SoC and FRDM-MCXW71 board, see:
-
-- `MCXW71 SoC Website`_
-- `FRDM-MCXW71 Website`_
-
-Supported Features
-==================
-
-The ``frdm_mcxw71`` board target in Zephyr currently supports the following features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinctrl                             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| LPUART    | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-
-Programming and Debugging
-*************************
-
-Build and flash applications as usual (see :ref:`build_an_application` and
-:ref:`application_run` for more details).
-
-Configuring a Debug Probe
-=========================
-
-A debug probe is used for both flashing and debugging the board. This board is
-configured by default to use the MCU-Link CMSIS-DAP Onboard Debug Probe.
-
-Using J-Link
-------------
-
-There are two options. The onboard debug circuit can be updated with Segger
-J-Link firmware by following the instructions in
-:ref:`mcu-link-jlink-onboard-debug-probe`.
-To be able to program the firmware, you need to put the board in ``DFU mode``
-by shortening the jumper JP5.
-The second option is to attach a :ref:`jlink-external-debug-probe` to the
-10-pin SWD connector (J12) of the board.
-For both options use the ``-r jlink`` option with west to use the jlink runner.
-
-.. code-block:: console
-
-   west flash -r jlink
-
-Configuring a Console
-=====================
-
-Connect a USB cable from your PC to J10, and use the serial terminal of your choice
-(minicom, putty, etc.) with the following settings:
-
-- Speed: 115200
-- Data: 8 bits
-- Parity: None
-- Stop bits: 1
-
-Flashing
-========
-
-Here is an example for the :zephyr:code-sample:`hello_world` application.
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/hello_world
-   :board: frdm_mcxw71/mcxw716c
-   :goals: flash
-
-Open a serial terminal, reset the board (press the RESET button), and you should
-see the following message in the terminal:
-
-.. code-block:: console
-
-   *** Booting Zephyr OS build v3.7.0-xxx-xxxx ***
-   Hello World! frdm_mcxw71/mcxw716c
-
-Debugging
-=========
-
-Here is an example for the :zephyr:code-sample:`hello_world` application.
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/hello_world
-   :board: frdm_mcxw71/mcxw716c
-   :goals: debug
-
-Open a serial terminal, step through the application in your debugger, and you
-should see the following message in the terminal:
-
-.. code-block:: console
-
-   *** Booting Zephyr OS build v3.7.0-xxx-xxxx ***
-   Hello World! frdm_mcxw71/mcxw716c
-
-References
-**********
-
-.. _MCXW71 SoC Website:
-   https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/mcx-arm-cortex-m/mcx-w-series-microcontrollers/mcx-w71x-secure-and-ultra-low-power-mcus-for-matter-thread-zigbee-and-bluetooth-le:MCX-W71X
-
-.. _FRDM-MCXW71 Website:
-   https://www.nxp.com/design/design-center/development-boards-and-designs/general-purpose-mcus/frdm-development-board-for-mcx-w71x-wireless-mcus:FRDM-MCXW71
diff --git a/boards/nxp/frdm_mcxw71/frdm_mcxw71-pinctrl.dtsi b/boards/nxp/frdm_mcxw71/frdm_mcxw71-pinctrl.dtsi
deleted file mode 100644
index d834ed38453..00000000000
--- a/boards/nxp/frdm_mcxw71/frdm_mcxw71-pinctrl.dtsi
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright 2024 NXP
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <nxp/mcx/MCXW716CMFTA-pinctrl.h>
-
-&pinctrl {
-	pinmux_lpuart1: pinmux_lpuart1 {
-		group0 {
-			pinmux = <LPUART1_RX_PTC2>, <LPUART1_TX_PTC3>;
-			drive-strength = "low";
-			slew-rate = "fast";
-		};
-	};
-};
diff --git a/boards/nxp/frdm_mcxw71/frdm_mcxw71.dts b/boards/nxp/frdm_mcxw71/frdm_mcxw71.dts
deleted file mode 100644
index 6577fe5ccca..00000000000
--- a/boards/nxp/frdm_mcxw71/frdm_mcxw71.dts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2024 NXP
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-
-#include <nxp/nxp_mcxw71.dtsi>
-#include "frdm_mcxw71-pinctrl.dtsi"
-
-/ {
-	model = "NXP FRDM-MCXW71 board";
-
-	aliases {
-		led0 = &green_led;
-	};
-
-	chosen {
-		zephyr,flash = &flash;
-		zephyr,code-partition = &code_partition;
-		zephyr,sram = &stcm0;
-		zephyr,console = &lpuart1;
-		zephyr,shell-uart = &lpuart1;
-	};
-
-	user_led {
-		compatible = "gpio-leds";
-		green_led: led {
-			gpios = <&gpioc 1 GPIO_ACTIVE_LOW>;
-		};
-	};
-};
-
-&gpioc {
-	status = "okay";
-};
-
-&lpuart1 {
-	current-speed = <115200>;
-	status =  "okay";
-	pinctrl-0 = <&pinmux_lpuart1>;
-	pinctrl-names = "default";
-};
-
-&flash {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		code_partition: partition@0 {
-			reg = <0x0 DT_SIZE_K(896)>;
-			label = "code";
-			read-only;
-		};
-
-		storage_partition: partition@e0000 {
-			reg = <0xe0000 DT_SIZE_K(128)>;
-			label = "storage";
-		};
-	};
-};
diff --git a/boards/nxp/frdm_mcxw71/frdm_mcxw71.yaml b/boards/nxp/frdm_mcxw71/frdm_mcxw71.yaml
deleted file mode 100644
index bdc3c13959b..00000000000
--- a/boards/nxp/frdm_mcxw71/frdm_mcxw71.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-identifier: frdm_mcxw71
-name: NXP FRDM_MCXW71
-type: mcu
-arch: arm
-ram: 64
-flash: 1024
-toolchain:
-  - zephyr
-  - gnuarmemb
-  - xtools
-supported:
-  - gpio
-  - uart
-  - pinctrl
-  - flash
diff --git a/boards/nxp/frdm_mcxw71/frdm_mcxw71_defconfig b/boards/nxp/frdm_mcxw71/frdm_mcxw71_defconfig
deleted file mode 100644
index ef284e16e65..00000000000
--- a/boards/nxp/frdm_mcxw71/frdm_mcxw71_defconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright 2023 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_ARM_MPU=y
-CONFIG_TRUSTED_EXECUTION_SECURE=y
-CONFIG_PINCTRL=y
-CONFIG_SERIAL=y
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-CONFIG_GPIO=y

From b82e640dff2a6e70779e160a66d2c7916df59b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:28 +0100
Subject: [PATCH 1422/2913] Revert "[nrf fromtree] soc: nxp: Add MCXW71"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 50eb94ab51e708d16a248c7356efdbaf3c1f51f0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nxp/mcx/mcxw/CMakeLists.txt         |   9 --
 soc/nxp/mcx/mcxw/Kconfig                |  16 ---
 soc/nxp/mcx/mcxw/Kconfig.defconfig      |  12 --
 soc/nxp/mcx/mcxw/Kconfig.soc            |  22 ----
 soc/nxp/mcx/mcxw/linker.ld              |  25 ----
 soc/nxp/mcx/mcxw/mcxw71_platform_init.S |  59 ---------
 soc/nxp/mcx/mcxw/pinctrl_soc.h          |   7 -
 soc/nxp/mcx/mcxw/soc.c                  | 166 ------------------------
 soc/nxp/mcx/mcxw/soc.h                  |  13 --
 soc/nxp/mcx/soc.yml                     |   3 -
 west.yml                                |   2 +-
 11 files changed, 1 insertion(+), 333 deletions(-)
 delete mode 100644 soc/nxp/mcx/mcxw/CMakeLists.txt
 delete mode 100644 soc/nxp/mcx/mcxw/Kconfig
 delete mode 100644 soc/nxp/mcx/mcxw/Kconfig.defconfig
 delete mode 100644 soc/nxp/mcx/mcxw/Kconfig.soc
 delete mode 100644 soc/nxp/mcx/mcxw/linker.ld
 delete mode 100644 soc/nxp/mcx/mcxw/mcxw71_platform_init.S
 delete mode 100644 soc/nxp/mcx/mcxw/pinctrl_soc.h
 delete mode 100644 soc/nxp/mcx/mcxw/soc.c
 delete mode 100644 soc/nxp/mcx/mcxw/soc.h

diff --git a/soc/nxp/mcx/mcxw/CMakeLists.txt b/soc/nxp/mcx/mcxw/CMakeLists.txt
deleted file mode 100644
index 47cef05f237..00000000000
--- a/soc/nxp/mcx/mcxw/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2023 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-
-zephyr_sources(soc.c mcxw71_platform_init.S)
-
-zephyr_include_directories(.)
-
-set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld CACHE INTERNAL "")
diff --git a/soc/nxp/mcx/mcxw/Kconfig b/soc/nxp/mcx/mcxw/Kconfig
deleted file mode 100644
index 39028b33226..00000000000
--- a/soc/nxp/mcx/mcxw/Kconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2024 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_SERIES_MCXW
-	select ARM
-	select CPU_CORTEX_M33
-	select CPU_CORTEX_M_HAS_DWT
-	select ARM_TRUSTZONE_M
-	select CPU_CORTEX_M_HAS_SYSTICK
-	select CPU_HAS_FPU
-	select CPU_HAS_ARM_SAU
-	select CPU_HAS_ARM_MPU
-	select ARMV8_M_DSP
-	select HAS_MCUX
-	select PLATFORM_SPECIFIC_INIT
-	select CLOCK_CONTROL
diff --git a/soc/nxp/mcx/mcxw/Kconfig.defconfig b/soc/nxp/mcx/mcxw/Kconfig.defconfig
deleted file mode 100644
index b57cb97a8ff..00000000000
--- a/soc/nxp/mcx/mcxw/Kconfig.defconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2023-2024 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_SERIES_MCXW
-
-config NUM_IRQS
-	default 76
-
-config SYS_CLOCK_HW_CYCLES_PER_SEC
-	default 96000000 if CORTEX_M_SYSTICK
-
-endif # SOC_SERIES_MCXW
diff --git a/soc/nxp/mcx/mcxw/Kconfig.soc b/soc/nxp/mcx/mcxw/Kconfig.soc
deleted file mode 100644
index f6b03d9b893..00000000000
--- a/soc/nxp/mcx/mcxw/Kconfig.soc
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2024 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_SERIES_MCXW
-	bool
-	select SOC_FAMILY_NXP_MCX
-
-config SOC_SERIES
-	default "mcxw" if SOC_SERIES_MCXW
-
-config SOC_MCXW716C
-	bool
-	select SOC_SERIES_MCXW
-
-config SOC
-	default "mcxw716c" if SOC_MCXW716C
-
-config SOC_PART_NUMBER_MCXW716CMFTA
-	bool
-
-config SOC_PART_NUMBER
-	default "MCXW716CMFTA" if SOC_PART_NUMBER_MCXW716CMFTA
diff --git a/soc/nxp/mcx/mcxw/linker.ld b/soc/nxp/mcx/mcxw/linker.ld
deleted file mode 100644
index 91fd2750e64..00000000000
--- a/soc/nxp/mcx/mcxw/linker.ld
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2023 NXP
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/devicetree.h>
-
-m_sector_size                       = 0x2000;
-m_flash_end                         = 0x000FFFFF;
-
-
-m_fsl_prodInfo_size                 = m_sector_size;
-m_fsl_prodInfo_start                = m_flash_end - m_fsl_prodInfo_size + 1;
-m_fsl_prodInfo_end                  = m_flash_end;
-PROD_DATA_BASE_ADDR                 = m_fsl_prodInfo_start;
-
-/*
- * We perform all custom placement before including the generic linker file. This
- * is done because calling this linker at the beginning will place some sections
- * first, such as .noinit*, and this includes the rpmsg_sh_mem, which results
- * in placing the rpmsg section in RAM instead of shared mem.
- */
-
-#include <zephyr/arch/arm/cortex_m/scripts/linker.ld>
diff --git a/soc/nxp/mcx/mcxw/mcxw71_platform_init.S b/soc/nxp/mcx/mcxw/mcxw71_platform_init.S
deleted file mode 100644
index c161f7e8eb0..00000000000
--- a/soc/nxp/mcx/mcxw/mcxw71_platform_init.S
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2023 NXP
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @file
- * @brief MCXW71 Platform-Specific Initialization
- *
- * MCXW71 SOC reset code that initializes RAM
- * to prevent ECC causing faults, and calls SystemInit
- */
-
-#include <zephyr/toolchain.h>
-#include <zephyr/linker/sections.h>
-
-_ASM_FILE_PROLOGUE
-#ifdef CONFIG_PLATFORM_SPECIFIC_INIT
-
-
-GTEXT(z_arm_platform_init)
-SECTION_SUBSEC_FUNC(TEXT,_reset_section,z_arm_platform_init)
-
-.z_arm_platform_init:
-    ldr r0, =0x14000000
-    ldr r1, =.ram_init_ctcm01
-    bics r1, #0x10000000
-    cmp r0, r1
-    bcc .ram_init_done
-.ram_init_ctcm01: /* Initialize ctcm01 */
-    ldr r0, =0x14000000
-    ldr r1, =0x14004000
-    ldr r2, =0
-    ldr r3, =0
-    ldr r4, =0
-    ldr r5, =0
-.loop01:
-    stmia r0!, {r2 - r5}
-    cmp r0, r1
-    bcc .loop01
-.ram_init_stcm012: /* Initialize stcm012 */
-    ldr r0, =0x30000000
-    ldr r1, =0x30010000
-.loop012:
-    stmia r0!, {r2 - r5}
-    cmp r0, r1
-    bcc .loop012
-.ram_init_stcm5:
-    ldr r0, =0x3001a000
-    ldr r1, =0x3001c000
-.loop5: /* Initialize stcm5 */
-    stmia r0!, {r2 - r5}
-    cmp r0, r1
-    bcc .loop5
-.ram_init_done:
-    b SystemInit
-
-#endif /* CONFIG_PLATFORM_SPECIFIC_INIT */
diff --git a/soc/nxp/mcx/mcxw/pinctrl_soc.h b/soc/nxp/mcx/mcxw/pinctrl_soc.h
deleted file mode 100644
index 9a6c34358d0..00000000000
--- a/soc/nxp/mcx/mcxw/pinctrl_soc.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright 2024 NXP
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/drivers/pinctrl/pinctrl_soc_kinetis_common.h>
diff --git a/soc/nxp/mcx/mcxw/soc.c b/soc/nxp/mcx/mcxw/soc.c
deleted file mode 100644
index f37424ad198..00000000000
--- a/soc/nxp/mcx/mcxw/soc.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright 2023 NXP
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/arch/cpu.h>
-#include <zephyr/device.h>
-#include <zephyr/init.h>
-#include <zephyr/kernel.h>
-#include <zephyr/linker/sections.h>
-
-#include <soc.h>
-
-#include <fsl_ccm32k.h>
-#include <fsl_common.h>
-#include <fsl_clock.h>
-
-extern uint32_t SystemCoreClock;
-
-static ALWAYS_INLINE void clock_init(void)
-{
-	/* Unlock Reference Clock Status Registers to allow writes */
-	CLOCK_UnlockFircControlStatusReg();
-	CLOCK_UnlockSircControlStatusReg();
-	CLOCK_UnlockRoscControlStatusReg();
-	CLOCK_UnlockSysOscControlStatusReg();
-
-	/*
-	 * Configuration for the 32 kHz Oscillator module
-	 * Internal capatitor bank is required in order to use the more stable OSC32K source
-	 */
-	ccm32k_osc_config_t ccm32k_osc_config = {
-		.coarseAdjustment = kCCM32K_OscCoarseAdjustmentRange0, /* ESR_Range0 */
-		.enableInternalCapBank = true,      /* Internal capacitance bank is enabled */
-		.xtalCap = kCCM32K_OscXtal8pFCap,   /* 8 pF */
-		.extalCap = kCCM32K_OscExtal8pFCap, /* 8 pF */
-	};
-	/* Enable OSC32K */
-	CCM32K_Set32kOscConfig(CCM32K, kCCM32K_Enable32kHzCrystalOsc, &ccm32k_osc_config);
-	/* Disable ROSC Monitor, because switching the source would generate an expected error */
-	CLOCK_SetRoscMonitorMode(kSCG_RoscMonitorDisable);
-	/* Select the Real Time Clock (RTC) source as OSC32K */
-	CCM32K_SelectClockSource(CCM32K, kCCM32K_ClockSourceSelectOsc32k);
-	/* Wait for RTC Oscillator to be Valid */
-	while (!CLOCK_IsRoscValid())
-		;
-	/* Re-enable monitor */
-	CLOCK_SetRoscMonitorMode(kSCG_RoscMonitorInt);
-	/* Disable the FRO32K to save power */
-	CCM32K_Enable32kFro(CCM32K, false);
-
-	/* Configuration to set FIRC to maximum frequency */
-	scg_firc_config_t scg_firc_config = {
-		.enableMode = kSCG_FircEnable, /* Fast IRC is enabled */
-		.range = kSCG_FircRange96M,    /* 96 Mhz FIRC clock selected */
-		.trimConfig = NULL,
-	};
-
-	scg_sys_clk_config_t sys_clk_safe_config_source = {
-		.divSlow = (uint32_t)kSCG_SysClkDivBy4,
-		.divCore = (uint32_t)kSCG_SysClkDivBy1,
-		.src = (uint32_t)kSCG_SysClkSrcSirc,
-	};
-
-	CLOCK_SetRunModeSysClkConfig(&sys_clk_safe_config_source);
-
-	scg_sys_clk_config_t cur_config;
-
-	do {
-		CLOCK_GetCurSysClkConfig(&cur_config);
-	} while (cur_config.src != sys_clk_safe_config_source.src);
-
-	(void)CLOCK_InitFirc(&scg_firc_config);
-
-	scg_sys_clk_config_t sys_clk_config = {
-		.divSlow = (uint32_t)kSCG_SysClkDivBy4, /* Slow Clock Divider: divided by 4 */
-		.divBus = (uint32_t)kSCG_SysClkDivBy1,  /* Bus Clock Divider: divided by 1 */
-		.divCore = (uint32_t)kSCG_SysClkDivBy1, /* Core Clock Divider: divided by 1 */
-		.src = (uint32_t)kSCG_SysClkSrcFirc,    /* Select Fast IRC as System Clock */
-	};
-	CLOCK_SetRunModeSysClkConfig(&sys_clk_config);
-
-	/* Wait for clock source switch to finish */
-	do {
-		CLOCK_GetCurSysClkConfig(&cur_config);
-	} while (cur_config.src != sys_clk_config.src);
-
-	SystemCoreClock = 96000000U;
-
-	/* OSC-RF / System Oscillator Configuration */
-	scg_sosc_config_t sosc_config = {
-		.freq = 32000U,
-		.monitorMode = kSCG_SysOscMonitorDisable,
-		.enableMode = kSCG_SoscEnable,
-	};
-
-	/* Init OSC-RF / SOSC */
-	(void)CLOCK_InitSysOsc(&sosc_config);
-	CLOCK_SetXtal0Freq(sosc_config.freq);
-
-	/* Slow internal reference clock (SIRC) configuration */
-	scg_sirc_config_t sirc_config = {
-		.enableMode = kSCG_SircDisableInSleep,
-	};
-
-	/* Init SIRC */
-	(void)CLOCK_InitSirc(&sirc_config);
-
-	/* Attach Clocks */
-	CLOCK_SetIpSrc(kCLOCK_Lpuart0, kCLOCK_IpSrcFro192M);
-	CLOCK_SetIpSrc(kCLOCK_Lpuart1, kCLOCK_IpSrcFro192M);
-	CLOCK_SetIpSrc(kCLOCK_Lpspi0, kCLOCK_IpSrcFro192M);
-	CLOCK_SetIpSrc(kCLOCK_Lpspi1, kCLOCK_IpSrcFro192M);
-	CLOCK_SetIpSrc(kCLOCK_Can0, kCLOCK_IpSrcFro192M);
-	CLOCK_SetIpSrc(kCLOCK_Tpm0, kCLOCK_IpSrcFro192M);
-	CLOCK_SetIpSrc(kCLOCK_Tpm1, kCLOCK_IpSrcFro192M);
-	CLOCK_SetIpSrc(kCLOCK_Lpi2c0, kCLOCK_IpSrcFro192M);
-	CLOCK_SetIpSrcDiv(kCLOCK_Lpi2c0, kSCG_SysClkDivBy16);
-	CLOCK_SetIpSrc(kCLOCK_Lpi2c1, kCLOCK_IpSrcFro192M);
-	CLOCK_SetIpSrcDiv(kCLOCK_Lpi2c1, kSCG_SysClkDivBy16);
-
-	/* Ungate clocks if the peripheral is enabled in devicetree */
-#if (DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(lpuart0), nxp_lpc_lpuart, okay))
-	CLOCK_EnableClock(kCLOCK_Lpuart0);
-#endif
-#if (DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(lpuart1), nxp_lpc_lpuart, okay))
-	CLOCK_EnableClock(kCLOCK_Lpuart1);
-#endif
-}
-
-static void vbat_init(void)
-{
-	VBAT_Type *base = (VBAT_Type *)DT_REG_ADDR(DT_NODELABEL(vbat));
-
-	/* Write 1 to Clear POR detect status bit.
-	 *
-	 * Clearing this bit is acknowledement
-	 * that software has recognized a power on reset.
-	 *
-	 * This avoids also niche issues with NVIC read/write
-	 * when searching for available interrupt lines.
-	 */
-	base->STATUSA |= VBAT_STATUSA_POR_DET_MASK;
-};
-
-static int nxp_mcxw71_init(void)
-{
-	unsigned int oldLevel; /* old interrupt lock level */
-
-	/* disable interrupts */
-	oldLevel = irq_lock();
-
-	/* Initialize system clock to 40 MHz */
-	clock_init();
-
-	/* Smart power switch initialization */
-	vbat_init();
-
-	/* restore interrupt state */
-	irq_unlock(oldLevel);
-
-	return 0;
-}
-
-SYS_INIT(nxp_mcxw71_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/mcx/mcxw/soc.h b/soc/nxp/mcx/mcxw/soc.h
deleted file mode 100644
index bd6650d57c8..00000000000
--- a/soc/nxp/mcx/mcxw/soc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2023 NXP
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef _SOC__H_
-#define _SOC__H_
-
-#include <fsl_port.h>
-
-#define PORT_MUX_GPIO kPORT_MuxAsGpio
-
-#endif /* _SOC__H_ */
diff --git a/soc/nxp/mcx/soc.yml b/soc/nxp/mcx/soc.yml
index de7fee7da33..1f1087348b5 100644
--- a/soc/nxp/mcx/soc.yml
+++ b/soc/nxp/mcx/soc.yml
@@ -17,9 +17,6 @@ family:
   - name: mcxa
     socs:
     - name: mcxa156
-  - name: mcxw
-    socs:
-    - name: mcxw716c
 runners:
   run_once:
     '--erase':
diff --git a/west.yml b/west.yml
index 0b7fdfece41..b2240abbb96 100644
--- a/west.yml
+++ b/west.yml
@@ -198,7 +198,7 @@ manifest:
       groups:
         - hal
     - name: hal_nxp
-      revision: f4e26fad2cfd8b8e8988e835a28667573ed072cf
+      revision: 17aac63df44266c4ea0e111c731ca7664fe51e70
       path: modules/hal/nxp
       groups:
         - hal

From 10afa08610a9e5c17a5480b324908321aad2a847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:28 +0100
Subject: [PATCH 1423/2913] Revert "[nrf fromtree] soc: ti: move init code from
 SYS_INIT to hooks"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b0f9fe5b12ae186788257b1ea5fef9db84080193.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/ti/k3/am6x/Kconfig                      | 1 -
 soc/ti/k3/am6x/m4/soc.c                     | 5 ++++-
 soc/ti/simplelink/cc13x2_cc26x2/Kconfig     | 1 -
 soc/ti/simplelink/cc13x2_cc26x2/soc.c       | 6 +++++-
 soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig | 1 -
 soc/ti/simplelink/cc13x2x7_cc26x2x7/soc.c   | 6 +++++-
 soc/ti/simplelink/cc32xx/Kconfig            | 1 -
 soc/ti/simplelink/cc32xx/soc.c              | 6 +++++-
 soc/ti/simplelink/msp432p4xx/Kconfig        | 1 -
 soc/ti/simplelink/msp432p4xx/soc.c          | 6 +++++-
 10 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/soc/ti/k3/am6x/Kconfig b/soc/ti/k3/am6x/Kconfig
index 39eaf92c858..f5596944bf8 100644
--- a/soc/ti/k3/am6x/Kconfig
+++ b/soc/ti/k3/am6x/Kconfig
@@ -17,7 +17,6 @@ config SOC_SERIES_AM6X_M4
 	select EXTERNAL_ADDRESS_TRANSLATION
 	select MM_DRV
 	select MM_TI_RAT
-	select SOC_PREP_HOOK
 
 config SOC_PART_NUMBER
 	default "AM6234" if SOC_AM6234_A53
diff --git a/soc/ti/k3/am6x/m4/soc.c b/soc/ti/k3/am6x/m4/soc.c
index 519a3fab21b..b2e261a4e9c 100644
--- a/soc/ti/k3/am6x/m4/soc.c
+++ b/soc/ti/k3/am6x/m4/soc.c
@@ -62,9 +62,12 @@ static void am6x_mmr_unlock(void)
 	sys_write32(KICK1_UNLOCK_VAL, kickAddr);   /* KICK 1 */
 }
 
-void soc_prep_hook(void)
+static int am6x_m4_init(void)
 {
 	sys_mm_drv_ti_rat_init(am6x_region_config, ADDR_TRANSLATE_RAT_BASE_ADDR,
 		ARRAY_SIZE(am6x_region_config));
 	am6x_mmr_unlock();
+	return 0;
 }
+
+SYS_INIT(am6x_m4_init, EARLY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/soc/ti/simplelink/cc13x2_cc26x2/Kconfig b/soc/ti/simplelink/cc13x2_cc26x2/Kconfig
index 6885038cc16..01acc8f48d8 100644
--- a/soc/ti/simplelink/cc13x2_cc26x2/Kconfig
+++ b/soc/ti/simplelink/cc13x2_cc26x2/Kconfig
@@ -14,7 +14,6 @@ config SOC_SERIES_CC13X2_CC26X2
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select HAS_PM
 	select HAS_POWEROFF
-	select SOC_EARLY_INIT_HOOK
 
 menu "Customer Configuration (CCFG)"
 depends on SOC_SERIES_CC13X2_CC26X2
diff --git a/soc/ti/simplelink/cc13x2_cc26x2/soc.c b/soc/ti/simplelink/cc13x2_cc26x2/soc.c
index c896cf2691f..452c73254e7 100644
--- a/soc/ti/simplelink/cc13x2_cc26x2/soc.c
+++ b/soc/ti/simplelink/cc13x2_cc26x2/soc.c
@@ -8,9 +8,13 @@
 
 #include <driverlib/setup.h>
 
-void soc_early_init_hook(void)
+static int ti_cc13x2_cc26x2_init(void)
 {
 
 	/* Performs necessary trim of the device. */
 	SetupTrimDevice();
+
+	return 0;
 }
+
+SYS_INIT(ti_cc13x2_cc26x2_init, PRE_KERNEL_1, 0);
diff --git a/soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig b/soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig
index d1b2fc58bd3..e5c5a01eedf 100644
--- a/soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig
+++ b/soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig
@@ -14,7 +14,6 @@ config SOC_SERIES_CC13X2X7_CC26X2X7
 	select HAS_TI_CCFG if !BOOTLOADER_MCUBOOT
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select HAS_PM
-	select SOC_EARLY_INIT_HOOK
 
 menu "Customer Configuration (CCFG)"
 depends on SOC_SERIES_CC13X2X7_CC26X2X7
diff --git a/soc/ti/simplelink/cc13x2x7_cc26x2x7/soc.c b/soc/ti/simplelink/cc13x2x7_cc26x2x7/soc.c
index 22efa243e67..8c2ea2f5350 100644
--- a/soc/ti/simplelink/cc13x2x7_cc26x2x7/soc.c
+++ b/soc/ti/simplelink/cc13x2x7_cc26x2x7/soc.c
@@ -8,9 +8,13 @@
 
 #include <driverlib/setup.h>
 
-void soc_early_init_hook(void)
+static int ti_cc13x7_cc26x7_init(void)
 {
 
 	/* Performs necessary trim of the device. */
 	SetupTrimDevice();
+
+	return 0;
 }
+
+SYS_INIT(ti_cc13x7_cc26x7_init, PRE_KERNEL_1, 0);
diff --git a/soc/ti/simplelink/cc32xx/Kconfig b/soc/ti/simplelink/cc32xx/Kconfig
index 8698ddd3452..d8ec2f20715 100644
--- a/soc/ti/simplelink/cc32xx/Kconfig
+++ b/soc/ti/simplelink/cc32xx/Kconfig
@@ -7,7 +7,6 @@ config SOC_SERIES_CC32XX
 	select CPU_CORTEX_M4
 	select CPU_CORTEX_M_HAS_DWT
 	select DYNAMIC_INTERRUPTS
-	select SOC_EARLY_INIT_HOOK
 
 config SOC_CC3220SF
 	select HAS_CC3220SDK
diff --git a/soc/ti/simplelink/cc32xx/soc.c b/soc/ti/simplelink/cc32xx/soc.c
index 7e127ddfcba..f95141f5ddd 100644
--- a/soc/ti/simplelink/cc32xx/soc.c
+++ b/soc/ti/simplelink/cc32xx/soc.c
@@ -18,7 +18,7 @@ void sys_arch_reboot(int type)
 	MAP_PRCMMCUReset(!!type);
 }
 
-void soc_early_init_hook(void)
+static int ti_cc32xx_init(void)
 {
 
 	/* Note: This function also performs CC3220 Initialization */
@@ -32,4 +32,8 @@ void soc_early_init_hook(void)
 	MAP_PRCMPeripheralClkEnable(PRCM_UARTA0, PRCM_RUN_MODE_CLK |
 				    PRCM_SLP_MODE_CLK);
 #endif
+
+	return 0;
 }
+
+SYS_INIT(ti_cc32xx_init, PRE_KERNEL_1, 0);
diff --git a/soc/ti/simplelink/msp432p4xx/Kconfig b/soc/ti/simplelink/msp432p4xx/Kconfig
index d4a9b6cfac9..9b44c5f34ab 100644
--- a/soc/ti/simplelink/msp432p4xx/Kconfig
+++ b/soc/ti/simplelink/msp432p4xx/Kconfig
@@ -9,7 +9,6 @@ config SOC_SERIES_MSP432P4XX
 	select DYNAMIC_INTERRUPTS
 	select CPU_HAS_FPU
 	select CPU_HAS_ARM_MPU
-	select SOC_EARLY_INIT_HOOK
 
 config SOC_MSP432P401R
 	select HAS_MSP432P4XXSDK
diff --git a/soc/ti/simplelink/msp432p4xx/soc.c b/soc/ti/simplelink/msp432p4xx/soc.c
index 185124d7ec0..8faf547fdb1 100644
--- a/soc/ti/simplelink/msp432p4xx/soc.c
+++ b/soc/ti/simplelink/msp432p4xx/soc.c
@@ -9,8 +9,12 @@
 #include <zephyr/init.h>
 #include <soc.h>
 
-void soc_early_init_hook(void)
+static int ti_msp432p4xx_init(void)
 {
 
 	SystemInit();
+
+	return 0;
 }
+
+SYS_INIT(ti_msp432p4xx_init, PRE_KERNEL_1, 0);

From 74066a60f946ec2ffcf33b8498b2e75c71663a22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:28 +0100
Subject: [PATCH 1424/2913] Revert "[nrf fromtree] west.yml: hal_nxp: update
 hash"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0d2e0e9dad80188c84235d50c72317991ca683e7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index b2240abbb96..d5545988bef 100644
--- a/west.yml
+++ b/west.yml
@@ -198,7 +198,7 @@ manifest:
       groups:
         - hal
     - name: hal_nxp
-      revision: 17aac63df44266c4ea0e111c731ca7664fe51e70
+      revision: 77815705c465627b8436cbac51f0bf0594bbeba2
       path: modules/hal/nxp
       groups:
         - hal

From ffdacee0634158a669985a4c30c82a5e97c119fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:28 +0100
Subject: [PATCH 1425/2913] Revert "[nrf fromtree] boards: frdm_mcxc444: add
 frdm_mcxc444 support"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2e6e310ad79bd79dbfd06c1e94fe262485cf780d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nxp/frdm_mcxc444/Kconfig.frdm_mcxc444  |   6 -
 boards/nxp/frdm_mcxc444/board.cmake           |  13 --
 boards/nxp/frdm_mcxc444/board.yml             |   5 -
 boards/nxp/frdm_mcxc444/doc/frdm_mcxc444.webp | Bin 55062 -> 0 bytes
 boards/nxp/frdm_mcxc444/doc/index.rst         | 220 ------------------
 .../frdm_mcxc444/frdm_mcxc444-pinctrl.dtsi    |  19 --
 boards/nxp/frdm_mcxc444/frdm_mcxc444.dts      |  98 --------
 boards/nxp/frdm_mcxc444/frdm_mcxc444.yaml     |  23 --
 .../nxp/frdm_mcxc444/frdm_mcxc444_defconfig   |  10 -
 9 files changed, 394 deletions(-)
 delete mode 100644 boards/nxp/frdm_mcxc444/Kconfig.frdm_mcxc444
 delete mode 100644 boards/nxp/frdm_mcxc444/board.cmake
 delete mode 100644 boards/nxp/frdm_mcxc444/board.yml
 delete mode 100644 boards/nxp/frdm_mcxc444/doc/frdm_mcxc444.webp
 delete mode 100644 boards/nxp/frdm_mcxc444/doc/index.rst
 delete mode 100644 boards/nxp/frdm_mcxc444/frdm_mcxc444-pinctrl.dtsi
 delete mode 100644 boards/nxp/frdm_mcxc444/frdm_mcxc444.dts
 delete mode 100644 boards/nxp/frdm_mcxc444/frdm_mcxc444.yaml
 delete mode 100644 boards/nxp/frdm_mcxc444/frdm_mcxc444_defconfig

diff --git a/boards/nxp/frdm_mcxc444/Kconfig.frdm_mcxc444 b/boards/nxp/frdm_mcxc444/Kconfig.frdm_mcxc444
deleted file mode 100644
index 1fcfeb8fb36..00000000000
--- a/boards/nxp/frdm_mcxc444/Kconfig.frdm_mcxc444
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2024 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_FRDM_MCXC444
-	select SOC_MCXC444
-	select SOC_PART_NUMBER_MCXC444VLH
diff --git a/boards/nxp/frdm_mcxc444/board.cmake b/boards/nxp/frdm_mcxc444/board.cmake
deleted file mode 100644
index 0e2a64644b3..00000000000
--- a/boards/nxp/frdm_mcxc444/board.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright 2024 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-board_runner_args(jlink "--device=MCXC444")
-board_runner_args(linkserver "--device=MCXC444:FRDM-MCXC444")
-board_runner_args(pyocd "--target=mcxc444")
-
-include(${ZEPHYR_BASE}/boards/common/linkserver.board.cmake)
-include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
-include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nxp/frdm_mcxc444/board.yml b/boards/nxp/frdm_mcxc444/board.yml
deleted file mode 100644
index d32af7cc92c..00000000000
--- a/boards/nxp/frdm_mcxc444/board.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-board:
-  name: frdm_mcxc444
-  vendor: nxp
-  socs:
-    - name: mcxc444
diff --git a/boards/nxp/frdm_mcxc444/doc/frdm_mcxc444.webp b/boards/nxp/frdm_mcxc444/doc/frdm_mcxc444.webp
deleted file mode 100644
index 7ab0bb19ac05a7c72f4bf437e0f958adc191b9e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 55062
zcmV((K;XYpNk&Ev*8l)lMM6+kP&il$0000G0002v0sx-@06|PpNc<K6009|BZ6iri
z_M7l0JXdQGMD%|GP+2{L79Ad|A)U$``^Nl}V>}7Y++K;|O)7YXisUG0+eSKvKknT}
zAR;DUDH>Dgw8KAi%u{uWZaUjd#Y_c|5dPm+A|@bxZQHiCv2APD{YY}`aH~|WYMuLF
zW@cvi<71DRM`I4h*8AKWmYtMcz4z+RRzysIZ%L9YNs?@fNIkM({{L?qDqQJ7%{}ar
z-RWub5)l(1B@~h-BqRb{L<mB(fWRf7McN92-ZNmWrSnyEy=((|B`v*Z5fH?!0GE6f
zZb<Y_2!as!Mz~>%F9HFVaKn}$>_=`%Ak-4jRvRt-K=76Lh8r#}BJ@rOh!nKZ;^JFE
zg@MqL5EQg!P((x<SAM$w;4tJ>voM~Jkc6NDRg4*+FG3Uw0|NtGnlms0(wS|{^lL)>
za4;YG5C{bkL@1~NMUDY8D3=Nf+=`j4U{4ui8{u3oA4UUygp46h&wFKJfiQw$i$HA!
zg+PEPDyp;*0|=$91}IQLU<5f(FhT^37C{Jn5uu_KC<(L?Kp{c|ITmHBq97xZXd{U1
zg`@(wF%TheLnL+aMO%{rs>~wVis6Ru&6&IkK&obKWr%L*yPM0;S8YOigw>r~ynPV9
zU#76ZKuC&^RCA_|q4g{nFG?B1=8^zTa4hrtIdh<})7h2}%jIf(9dz@reCvn4^6Y5n
z6d{E|P>76S2-I*8&{9o^5Qt!Y&pGIOLTTh|b~CM|?eX@b|Np<w@3FI4fI(6y+iHxn
zU;g!rMc<rEI$;oNRt==5%qHV8nBqTQ;~}mC3Tq+-f*6r9998s!SvVGEg+rqXhJpbM
zm1?r6l|TpqL)JoBt3VZ@8Bq{AK(=!MCP=ge4w(coTxq5v5Cx#Tj5b1WND+WkfkQxO
zLvahV0z|C&e9j5F7<Dr(|LgDn=7Y;biteBbNI)W6>yLiur+?vO(WMb)LIOevVgjf@
z6tWr9fdeRFD-eNZ^NFMZ1$Upk|G)2lJbK@T)35#D_kaJlzH~P4Lkb~j4OoPfNM((L
zNgHAW)N`hM7uZ0iou=i){ipA}^VtJ(wu~T|P~^BA<NRlT{(Ros-bywD3WcULV~jz_
zug4gss1QK4Aqx<IDn&p-RH8@~pb`bR5P~RF04gj27z=IyTfAVYh=|pJfNzk6K!mI+
z1*IZVDO<6@tJn+{GzerZLYH?p*uV&6t2t+>0k$-F`Od%n-G`S6ivC~-vo3J9Zt<-j
z`q86VC&c6$fY=y-yv#NTL<HX0l(p5wgcLE%X7O<O?ngJdSN-u1{LUYL|HZruWDu`e
zgE2Pt>i*`gsaH04L0S?foa3m)*=ZMnKx^L{G}x=V+nWbt)Xlms2}w3!#bQ2J@Y*&~
zi0<_Hix>U<zrORy*!HOV*3bUlPk;Z(K__0%X3~J&S~HT303!gIG~F-=!S@;<TN~3d
zk^(?%*>xRyeQg;rfA;qI_}&MX<KE1l{rn&P`d5!btZN5+qm#T|rBis8w){aad?yeB
zf7XUu0Up)Q+^_dMAn=WTCbZ=aonx~>?7e4c2Z8#-^NacN<4<ndp2W$I{r;alI}qO)
z|7Jd^uZN4PAKtz={qV!jR^E^EAN=hfKOgi8Ji;q@LYw>)dNsTDjxSE@KJMX$yZD}G
z@QnZu@hraQF7D?Uyu}l1N80de!WxdA&sHDZEcZd(SAO!BzO|5ea``XlHEsHCS^hWn
z20hKLx^ZUP1>|mVb`qam-FOdT{=>igV;ADv`*&ymE58<gqZ$@pTHJnm+4f-m;)j0Z
zY?u<@#|8fOzQ^5$zX3saxX|5A^Ui7h_BX$_=%~?RJ|FJy$K1JCyf~W&WqLR`T;46c
z52pj`n$jk3^6ugJB=ChF(e<-&9QR=U{J7Ve*Tk0EbjOw5BYKaydzu~1VxmYZY_s#x
zAM}zo8C55lJy7%^Dzm`bf!RZ+snlsndjKj=@)pMIg+i)MTiXQts0g-IO%mS1g!TZT
zZOXHa#2(tzcjuTcPevQ$1nmcvT8Y@h9GeSOAkuq)y-8Kc+5%zZJqU`k5nIdbqom^W
zSOw`lAV9!-6yP=F-t3EBT{5v-(@%Xgy8w{4DBHm30>M3MQ%Wuv$emicf=Nr@{YfU5
z^fBAGOP5}t#2Zyg7a-(iczaU1gw~5Yv=5q{E={_*t;y@~2GzVk$c=iLUBSTn6p)=R
zFnQ_i2_ep3C^zbmYj&raQ^pmHcf)&AJsDTf=#AU6%(}weTH=C{c%L$*PG?iOM@#Vd
zVt${G;4N=Ry%0cu)w9kPiErGW{h~QJy8zvzLhxbFP6xi@ElC1o+d<LUA{a03&`k#y
z6rg*PZ~16;J~0CDzV!b1)pK^b2$b9O<NxOO_xV8LPMus(Ypzie%>Vq`1uSZH|Ni^k
z`LGZ!RCCTNlxw-Duw16(qB2-uP=Nxy1hzzRcS@pE>lKUu1Q^vPsSDt=BvGg1{BHND
ze&_%M1{J5`A`E>mzydI+FjZY4WjdKMeUyZ@5Ey|Xl<S3xL!;|M0!xT>ff(d*xmwwP
zT%nHb4lkac&Ibr2iHK0wDY*W>_ddNJ+ggnl4;W5gynWO$ZLm>-+s(&cJd92(yg{W2
z**^}>zVdRRM0VPCrdzhmmYKEz18A)}dq6jkV<wv=Gij=I9T2^<84OwjO&IV7m8gjJ
zQbeXH;T5}E;#H_p9ce7_Xl+re)!mvE@u-?T#$bOpM`%sO3pujkZlba)Em6Q#53oU~
zbhQ9_kSO29ktR(@<qJFldyNua`(ayB{gOkS5Tbqucz}(h`bBc2?Vx~_9s??15bkH$
z1O;4ZH)A9UxB%@1WQJ6}Oo-i$p@6NqA1w$|z$b$Pg^UYWa;S=!kw=7+`t6|FO$hAL
zB>|WRNF=o@TmpAPl3lybD1l7@4{$FLq$%K~94N_Iz!*UXfGOa@Az)O%NRE}M;G+%@
zm;#<c2gta9(R6U6zy%EHC|tiZ+RvhftMdQ>E?_o-_7WhwbS01yyW5yh>Dq28?u7tT
z!DkNk79D99u%@~j5u#-QJ6MvF(rti+`^h9xyIxMvy#U#&U_$IJVO+sRv48ZiDq&Oi
zlRBJPyChJe{d%&wc5RP{-MZe{>;jhTFLk(?5}vyeq0HhHE`fWAPK?ECvrzUnMxufX
z?M9APA8S_Wa%ry|AJoq#%D1t5j&}_6DL+o7N}LDWsGs)}wOgtER(GRkLr549pb3TW
zCe^0^ZMSxJbz^l{HbR;Z!~A&G3r%<%)uUuhu$>rh-+T9RX|N2SUJ{Dqw}0f~WDu3w
z*gcnDeEj)+8VG}(2@q#L`e)ylrci6No7?r(^|FBjFwQiXw|?=X+m?O;qmm>>9O$$G
z85uyVFYhkzR;Ex(9BZC(yuZ9p>U2)@n5WI<%?jyps!9~%>F5@NDAY|EoL>FmtgBQA
zosa(TpwkvAOa{2o>70$&ra&i`Y)ArBrSJm6h)NxJKHSoUsz5xQvn8cEkn?AAts2D@
zZC5H2I-PB^t|A2zxA!sm|BX_S3cQ4KtxOAa0o$%rNL(^&6=<E$#+54Mng;ADMR<)`
zT`Jw&ER*v~fK;F)43g6;BvGjc(dq0oU{@)DIKQ!})DjnzM78b$;0Zs8Csc{@5p_PB
zDjkAabh>gqU~+y*uRsM!fKDfg3LUtZ5U00m)SF@#Kosck6~+aHu-ELm^md8ov(r@S
zzVk6ohi&5tmnAnOsL6x#i(0KSJYC*>e7(vIc2R0Egi_A$<rlXrZveX-1-K;ZyhK{#
zxJ`i$JR}4N5a127qq9Ya3l+wJad0s7k`YM8Yhv-uubmH~FblmmqWxn2;>&Lx&Fz#F
zvTcF-!<Rqw)kRdMA3JQeTYvoG#YrTR*M+c992}h;4WZg3^a_yOG#p(#KX99BRtP{K
zB<iz38)>#vbc<;B%@~B37WLX;O?Fn-<I!eY@mSR;9x&Srb#}6@4Mkfa+RG_oqIi#A
z%<tIQHWI2|elh26xS<dQOgVrA6)y>T>R@-<MDf~eqVAVgpaS+}4EDCbqPiPI2^ZRr
z1gU`ekZ0{?T*8<lyBkYZ{c7Ua56g%OUX0x=iwa(7dszlmFiPADCxi-^4`;QTK@|*j
z#_qO61#gUMKPY0P>}R187IFYas$T`VUtmoA_A!ei1ukG(?PnuVz?B1xEJ|49ZWvL6
zTf9`Vy98N-F8_3Jq-0kx1lmmky8?MVi@hymD)>X5`+>j}421R)$hd$#WpJRtpz2lW
z5mh|E1B6SM#Qp|U!Bl3ufkg=yIHHJGIQBE30>(r+(xQR~M+jWPj@6pWTgbKxnB@^T
zso@8RfOG+iZ0tp-h%sZZyE-zd;K}|X<TMx+uL03cC~Q-}eb9`Z)eYpz6-?-Wo*XL}
z7`uzkP6~LX?xvY?<pM?^yLY{EEMfBqsdFX;JZiWXN)r_flKtIKsDh=mTaKu&U_Dj$
z%JG4I76PmZZ>JI!LLs}g)h+#^2aqS^ErcgjoVK4b*gNk(zgnK19EZYS%iuLhqEtI`
zH?J-~{w(`G0uVrgrEY$Fe$Wf8StW|tzumn1zn|PI0wW1qHvPfN@B8Vujyh4N2Sj_(
z9<D#XzG=;p!4k5gd-=0}{jD@5S_0BIaJ9U-TV{d{C@cdn{^h;vag$MH+73C^wlUjl
zdG-DmD|@O$&ln!^q_$C@LM71IpgTP1f@xK#VUyEqesMf#LxuK1v(pjtUJ|HE36l$U
zL8%TrUxd?@YW_R<XPizl*eX+1<06$>Cv>`OiAvRjIk`Yfq*BF`&em3|W(u_rnNLnH
zVHYYOIlb1X)M1_ufhtu~<@9D4Iu$A`yg=6lg<2_2AF^GlhRk_7z<|nB#qa{g6zab7
z>jI)y&u_;#pVJ16iWEYeKAS1k<BR$1bme;dqUY>v(Y?wc&p3T_t4i$x=)LMYzQ*Z_
zoAm@af3thlkV&Ugy;J#U#s!Cf_bACxb%EQpK&R6WT8kf^Y9MD<{hWP%Lng=-@HTZ_
zhw?G^6QoVghjO2m9L+pm-Kf?PbiVtwPR_4?n|k4&NC-mbo3s8d{qY8J`nX*Oo{qqK
z)m7zhw0|x`CY?|IGQ08TD#GOMF2n`9R|Vh|x>Zrg=?l77(Kz4zT8z#X;GIfk#@S`o
zoeH$`5jX4Pg0UIiq$2cmRB@-CT;hIRgY!#Lsj|4DsP7U2RHwpA2vMm6&j%8fIsh+F
ztpho~s?}9hti(E>y=GLVBsv|~l<N3@i!N8;>1<H7k_$?J%9L?Q#af{r(G?_>Dl|Hq
zDApx%dw-_h-I_VLpo>*-0h?N_5S<O-QiT?$7hqvjr4Tw@y$-peU97Y#)ay$qRIRQk
zsag%F^MwSePJ!XZnCC+h#X98dl2EB~BIg(7x+{ctC|^06ov-K)wMxK<3qahfQ@X%r
z`1xt^<JEHv>2z&;eq%d-&>LQ=#oq9bZaTPPpP>(W;Q8WjZ2rj!U7!s=L+;>jLiz#W
zX9ZmD(=MGaKEwX*1f)*@2z0jS1JDbv^k33XK#ftHUHkz2Rh|FAU*mMhy}F5dzT350
zovu$p`1iwyJ>&F#0;CNHJY7GLe&VNTSar5BJ^_DKwK3!LeFAzfFV?54Cq2gLq9y#3
z`>R@$;puMJ<@v_&<7DsnfwJrZd>TESK<^0B3;8@t;pyt*@VB$ckn_z7KL%dKANj!|
zz|+lHtoaf6JDQwdZr0*FpWs&b$0lv~cjUpWv*F-Y?HJ4_XRpXVKmVRECKqfLAL%yy
zJegep;#M7wd4Xud4@KY=dKJFa;^!s=h3IS|HDS;jhgkChZ|6Ik`LWq3+3b2KJyE6Y
z2;*IoQ|L{Z(8mV>X7|mT3tPN`^vbsYKR6cPFh)Bkf&Hf9uVhO_u!piH^d`c;2u2fb
zrqe!P-ay-@Y0H-GV&^2~8>tU=BC!VszloB-&yh7H!uB2@n{}f%N+6$T$KaN`2SyV`
z+9_%GjKi9;ijqNFm|zcV1$EjW_Mwek7aNSK6F3R&T((s|XhTgl+RBMLc5htHdZ{u!
zHk%dQ&W-oChw~0?Fseq@cJ`Q_Y3Ek=SBFQv*wO-nUSkHm>FFo_**w;5Y?^gDH{O1H
zdNRZ|#W`1Zbo1D`y!|BR=Ur@L5E$)U8`{d7{B&CLgx;V8{vny=!(BI<Yv;KAbk#pU
z5Zbh}EpGKA<F&WiM?V7rzUM}-fbb8<;QRZ#elf87?e72XzIwXgJJb)s2QkOn+ttxg
zw+GqY`Rw50S&w$Bt@i5o0r+31w|p-^0{^S@BK(<4|AV!7hPJfH%GK@VLw_>U9^el?
zyngxRSqEr4znbfMLU=+uacO(U7ro;<z4LyHZLI-xF<<qLdj!UjfyA4EzlFekJfX+5
zheri29U{c8Zui%pFBeDb=lIFre%Afmi$#cUyRW^E?0(-?cXM8T`oVB~*6&H)zWd?T
z;rX-U`Am8eH#(8fes-oU2_%64<24CAi5ndy^dq6S+M}I%%cb8<yR=h3Xor?w2>llJ
z*MuMA9v$T=_B7b5`%f?LkI#Gd)$N`C{@=r|ynO4Z6A}ir&F%s2^K*kXq}ysarn*iM
zJxD=jvL2xbZ=v1#y%vJYUqrjzUA}iWJMGxx@$Q3nKX}mW_;4N(5&{snA|U8hf@4T3
z1gHWbv@~I}E(P|uy#C^g>+HIax`pUMxqKK?I5oU=aoWaa8xYeW5R(9v2&p9sl!pd7
z1llkpCZRCK02C5jQH79#p*0_m>EnAcLj_e50f9hJfsg=ehN226pjHSdw53A|BlHI|
zY|c5qevQZYVm{}y=41>5r4nXp^ZE3FDj+x%3KY~=ArMBWB!fT=bQw|#0R<{xJkgdn
z*SD+YAqWwqQTO=u_3PKKuOStRi$Wj-N))O~R1lF%0vaI%SpkKNv!&fu4`1Beo?V;{
z?6X&2eDd-2GP^DWLSUf?L2bmFiDLoBhK?nGHZWjpkV63;AHMkPv+Fh}pj${?s6E`T
zGVI3e#mi^oIHq$`GGE1eQOm0O7#rh_WNmfhF+e2{$1)sCOFo9P=hxR9kMC!%hC`-`
zyy;ts%_qwki(A8*C=IPZV7#CdH(Y84JfF|`>z}W$$3H#4pU*j$$Ch)VZ9SjgeBlrg
z7-MXt;Mj0OA+UI%E<+Y!s9Ok3R}>h@&K#FxOIs2M3?awkF~%592#|o-Oob+!0|A17
zfSenELK|~ozOXzA*_z||QLyJ;-d=wG`PI#RrZJe!5=#KO5hx0VA}O*4K>)@E8zCe_
zj;mz@A%qY((_l=@4hEdIdCC?OuvlBzR3Q)~77Qss0NIpPKtLo2K-o0000Ctc1f&fF
zLV$oE5Zyo!q!LgHAV7&#gapYYAPUDA!=4nxOIeiyV^$!BfjS@p7)pu&L)JwDG|&g4
z(ij8A<WW8zLwJ1AjOa;4xQ*6qaWDj9lD6q3XU{olHj{*!#C(!6eMsLu2M)36;|UE6
zKxa^8Yy=Ri7P20aG#s2fI~v5^+v7N{niE?#vU-EqmhA*#16k$G*fwCW00aVOGAV<=
zU;u+c0XBdEk?-)P@iN|gV>6Ckj+JD4Yg1nK0|_8O5LmVYWHWv&Z%Zr?pi1$&1s5c?
zi;y=Jh*b<;$O~W#5(N>!5ymKo3S&^tB(RCD8)p3=$u{c-dp_s)^EoG?1dT-5p5$Nv
z(FEo|5Hx8JL=q6YN(v!GH|xdg(P<llSvP<E?GeaiTeEJ!>(BZ9oUul{8_XGNK$9qb
z$5v1{And;Y0MPORodGK30-ymtokE&PFe@o0E3@tpuoH=CZUy%(zNkb$i3MYjTvsty
zoLkOkLJ6rDFU>h&^8fdL=l>l2%>2Lk5A}bTUUU9S^l#(;yMLSikNw}=tLYym{=xl^
z{x9^NrvEeh{reB@-{wDNeqnz{|400H<j1Q2AivE2CH`~vm*hM1FX<oaKfeA@d~E(7
z?bm~r+5YGMcl$44A8@|u|EK)lkeAe+xPGDjQ}&nO8~RW9AN@b%z03d4;~nhY!C$U@
zS^w1k^ZyI}53=vpzux}Yd<_1^e#$c_gZP}8ta^k~AI@x;Gx6Ht#zBY&v#=rUg{+po
zLJ51w?c)v!V0PQNyQZw4>}0GKj?{G?b8d1FTu<0mD^{$Do@nF$!uwU>3BWI|3~leS
zlyWd60nqCG_$<<Z(y9>$=>M7St$7mmTzba>T{Ak)lk`|kw4QIzS7bY6xWW_oE$+8j
zdnsFB)q0rhfL$vTA4Yl$8)VIe%){`XO5}-vB+m)0_&FY7EKbM>W3=eLOH=`^?hOJr
zP!d-5TArxg{@zgjDfxaoo<$w$7JjU5UPJHD#l6`D<jx`}>KCcRZQZe$dqH{gr&^db
zZA$F`GZ4dxcCgu#?%!##0ZCWRJG1wPN8W~YVwcnB56U_K;7Aa&0-y9pa+gisOIujO
zcw$VOpDb8Y?NNOyFi&voX7l`NKPDYFmznedAbEXSHq*>O@54aP0r*SSiAHPHw8(TM
z)*2+FyFMK^E~ETzEp6hD*NJ`!`mH}G^=Ol0tm}m9DDm1k<P|O-Ww+EBTGq^5R6aE1
zi)sicK@EhUsm@atp!Bewb07|Z4!`cznv@-K%&FY>Fm9BHZxjxCwx#Tj0t)zgxgizC
zL+qV})AL~Wa|8JOOMf?j4Z(G7VW*kmwg&%2O(NoUmOMjy1X9{xSqHGknQKzoRTkMC
z<27_@C0<8e%NE(x;b;POfM$qR)XpW-k(Uaq5vWb^QgMavHPy1z+`$Q7h~N7)ALAlk
z!BHaW587K2zCii^Ig)3Sac>yDG(@zLyU4>dx3U`l&4YJ4P2~eM1t~v3D9#}?FgPDM
zIc2+VTn*Lk_=HIPx=>Tg_QV~VOtkKdQEgPy5kj3F_#K(;gr!bsjKBLBVZ6o<;57I>
z3!=6W6F`!OVQ`}5n~w#yCX7Ol-026~(6C1CO1ap=kRZ*gK6;nL!$iZ&Ht)K@26)*6
zqlb%UKr>I)Uj7N7zOPjydmhS)7=nr!u0zS!zS>oQ<^ND{Ef~T&k^l2w6zZzxh*O~@
z4ew+{tBr|P(dOtKnl`I->Axm!8Ce(eok2i1{G*gWAmk2{7QITyR*baLJ-<ATs~CTo
zIdyuR{JKYXscoH8J=i>-Hby(;G>Z7;GB{7CCnd4zhH}6;EXcaA4sF4Rg<oeqI$|)j
z@UYgJm;4gI(u|jdW5vY*q$ym`+YY$-z4Gh!U}LW$tBQ8{qxUh?!6?*6+e{sdQsnCH
zWl|&75&Y?isG9BYJ8N{Cw&YFJA0Y|?TXwkFe>*dL_A~jKSk?Em9oz}&TSuU;FgEdW
zXA(OU^?Q-~)ceUBl;G`fn#?`!FYgC#i_F0qWpnc5F-CR%cq<^ucu-8@MN&<3yibLG
z#|IzD%ABqcxprcKYuTC;^7oFw8e>YdoQ(R#DoCz>4qR38;0Wt4v_z}GRS@i@^xZ)m
z?!BB>>7gs=l-steP%3yjW5|P|!vpsoPh}DC$U#Nwz+g;O#cac=M`6EH%tvmsI{Qh~
z&kxcCB2au&Y2|wCgo6cO1&0u6bs0=OMIzl%lN}HgjO-#WFNs7u(L>kWb-}p}!D4Y+
zUd!h`oI^ZS2T`?!Fz>onTeLczk6vRf<)&8`fDZmaz;29=E=;DS7h8@lK)+NP_Uy)3
zH>jyH(MBU{ktPXCK(atdLZN($zIMc}nZqX#$PUY<l5wbu(FQomM<lMyu0!8GGZ^Kx
z0@gzQBB^nbW*k80YQ9->6tA@~r#%^=KM~xd`u?OSQE;SKSISiz6?`**@3FK>6Qb@^
zY7SJ(om;Kz83fiGbf|nfkW!SAdk~k?H5aBtc;4X63X(OTWm?J>=ZaS0Jt==tx<i0_
ze}$9SnavNsyP`mQLwJ~I1bBK^T(w5AHs@dbeavj?#7)P~Bdxa7`2743C3s3U^WmS&
z%#6aaF+U|sT?yQ6r`<`NDRzZ3L6cX6PID}w2*#oQgud23FwlfuJtS0k7@T$`TIO=!
z(O7CN0#OI>mQ~<yE#zq?XVKM}V5am3ccqOh^alyD?yc%JQ+X$>Lr+?OB;hsoax+(L
zB+Gfg$j=Mr%YM!a`&2eGXvo$Nvp#?YBLtetq*u;9J9fq3zi4g2y67Pzw}zohgdVUo
z{TEADW~r3#N$ej*#9{SAm0(>j_KudI5nEYbhG+A+E{2I{bWd8y3Q9SC(?n`~MFmCe
zRr`-oR;V;af0;`iNgjJkjM^#@V!L9u$HvAyP2l4A;=!>~Wyqi>#EvTZCAr_w515A7
z=%5Om))|aRfgc;T2m#?v@4~G=iXC4ciyDZ{SDeK0Z+O08{@lyWK58FELJ6y<3?XGF
z7TSy2j=;U^-lw)aCw_VL*1m4uf<^pBbiL1ghe$gKND5DWoBv8t&fUMFFzr3BPQ6u{
z3#E!Nnen`}QGKDEkhk?yZ00FqW&|t_pg1buh;$j~JWO`O{etaX%&hj(Om9MDBRJGF
zk4)PtMsS{3bCK6q9jwNg11ebcTCM>a+Oa^dXWZL7JJ~6KJE<__=*-JB@uc!=JLCEn
z1Tz1;k;T{?PhXT$RolKhreM$AEi7gn2+C>9ON>6UR4aB3Lqn`|j@sjb(ak9#&dKOP
zX2UtjTghh&2Q9oaLpWX4-L3#S)VlnH@*==J1QK)n`;7?k^cL-_`Uz%llOgujvk1$B
z3&*&If$;2Xaus=57O2QzW*vDHqfeBiS8VGSB3xr<GYiOQt~l@2smDB-n3x-tybH_b
z6Z2R%N2V2(#(g6s+&*}eYvU@tAul;!NBt1@RhU<m%<8%%bUXe1^Dd%gOrNsf74p32
zzulmZ%h6cL#A&Q1?0-o;mE%ueg-n(VLRE_@bPHHCaM#IKSZ|(E>&E&Yj7Mz*yXJKC
zu1oFoJr*BbbE20djWh0~3%of2UyExm-mLJ&aS-jiVpWPJ<k!+1Hu+1Ovil`%s{sxb
zQET_@s77M9Xk7X*He1?1MKO~BvO~$lijw7VmVZhKccVMBop86_`uLxjA@BF>#5b||
zF3ckL%?vYjx$4%VobPC&X8gUvvB$Ks3jRf-QfarMjpQ!gEO9hADhkzTT5R^?6%<c^
z^|8@|m+K8|K$$Cr4P7ygwTA0Ynu7+%KiVDRyU-u?f3!gJ>`uCEG8Cd7_D-OhE3&-7
zU{((s4G;kxh8W#w2t~v~iQ~B9eim6ocO6a&Y&~Kr+60-2Pun<ez{x1QI?cO+%S&ZP
zbbkB8>&IqL<CpH5mAZ{V>kgSURhtfbMO$G{G~UlEOhNoH;RPb|6`g3JKG<DGP1$4{
zb7YYb#G=VJGhdJmc%Q`vy<({;hJ<32oVtUAiyAl%&h0Bme0%~Mqrd7j{cVigs9hID
zB7E@uz1mqH{_8&0Th$ESZxg|J;6$HmoTiedM~`++>h$|5U7WJh$TvX>JEJhdu9V+F
zgTk)sz+EsS>JNOlCn)axU=#9Ht$j;v#mM;|^sbYDPvtNE&w48IU<3;pF`?ryliOIs
zd&ZfPS&Ykq?eD1N>&e3K$=icG5L<tjoKbo?GnL|~T+>VSK$7diwM3PMP(jDW(7_Tu
zW-nZDt<Dno;s}}cGLQ)>;Vi{uPn58UsXc}CTiIw4#dI`(RMb5uMwk{83LhFwGmz_<
z1DV8s!cHqA%(SmCVV$>o6|PvsZ`6DP)-#|5WmmA~-W23g>vwhsRgOAY?Ge<`EGcpq
zngpJ+wL^7-2Lm3ZT-+HFncv)Xl!&sIfO%N!dcWbo{euTl&Da@?bLQk>&Puu{EU3yV
zcl!P6vb>9ZQgqueY^Gh{k$g0KPXQ2Tx=xmk6&M-8$2{g2yJ2P2Z80-t3MxdK{{dV!
z>!t`>w>G`Ho1izm&-eh;SA9`nxkE7vN|eiO%j0+dDR%I|Ykuzrh*40c7pzz5B--GI
z>$&}nOX1V@EQT|(j8V~&=y1E%cGSuuWB(!6nnpfhKTl`t&Zz)=fq8=298X-79xN{v
zCIfiTaAmJ8?zh+|m3u&3axh?GpDz`>(EC21P}P>FI@FMj%vNa`SK?xBHl7|!0Y$#F
z{(lrCJNCgcaK~rGxvwJ2>pm{om4?)_9}|h=-l)KX*#6oLcv>+i(a_ZVmIq}aA3_n}
z5B>#?qpl!EtW)A4L|%#SdD&)+8I}1~XA5!W7EJdPg$oj!V1n98AwO-~wrVBonxw@C
zAN~Ob9_BN-DUsTyFS;lWp|$kKfXU7?=K=@AUoG6ohI9le?0XAE{JWO=&>+Z)PzAQ~
zz%S-RyA`&L2wN9g4M{G@oZFegQ(|{pq6c<aHupMCM3uoaY9DicPhzE%n>=}M2M3n^
zWvY0m$6He5NuqpA@3jiskKW3|gy+*)XQ)T)k1wVd4IWumtY--Y9?V4k6c2gWv-_zW
zo}+vSgmX7v+O9C1*kO8kt0)cn=m`;^v#orYZK{dFn#BB_@epgn5f)^llT=7OC6{Ue
zE0_iU_3Q8@o*C9^(d17O!k^AAU`lK(S`Vphy?l~_pA=@v164ss90{^sYeemnOzPO`
z-%SC~pB+3%i%nmlygLnTb*l2_1UNERy`Pjs-BR-U;)HjNlE)(asGBgfRg~thK4{AO
z@Ox;xDIYWdlr9i7BcX<#8(SJk>yHFB5#>#G^vZemmScdT!VttGIpFqUyzc%a3RdM<
zU)%K7Xqt!zTJ;AmQp*&Ku@E#eq9|Ky*L8UJqo;g`J8WMEpN)eNEEiX{x2gXKsKI>%
z|DK#79ogVO9A+ue(!;3LTDGx{LLT_%2~ch~sT4@99G-5mD}5Xc%fu@?896LRt+;wR
z-9jclyVu49u>D!(m1U>w3qIi-??jbxaFBoL1B=!Skx$aLtwif!q3L*Ru}`&?q_)u}
z)}#GX`^97L^-T;R@Sfl)Om1VFj_8~#Z>J%wq?b2r@p@79HY-@zW|BlZ!6ah@mV<_a
ziIKiB5$pc?@+#g`#`Y+Y0J&72D;qi6_ravu){0MJ^5JvJv)MFF4*qu_Shw8xGuu^{
zt7)5JHn=h;x^8(t#9qQUE;qo}-pv&<Bg%G8t_U98*ZL89IGuKU?fe4e!f8{?-1yX#
zSA1cB!JI3_h9m14LyLF&y)Dm%NrGk?I02@0Bk=)v8c3qw#^E+o05ggjvCZWx?K9`5
zsl9S^1$XLyV&7$VbgF)kO`j0=vy{z2FN|^b;jivcc-uVA+h9~OB?VdWv^eLJxa{O3
zNG>M-NOzh|q@WgtUEm&ITVv!C9rwBC^Yi8z5W>$+IlHN?j!t&Dqg)|GG5H2w=Hnon
z`b64I$dC_R+tp>LvN=Wt)AFYC5SDeZ5|oLo4IH@q(6nGEK^UhIAJBgO7bE;<j47i7
zA;u-j<xRn_J$fJ@sSQW^!o)bBTS=d}Dz^Yo$JjaIa{XT<$qsnrLsQbwHrSo&h|zK@
z4#tLYXGD7}O4dO@617%BBviNLR#XoCwW*=$Mk`_P>tX0Xb6)|v*-MSNS(Dj;M+KaD
zMwa8msoM!(EjK@f9uQd)1^Q6-(YSx<Nv@_sdY!=fq|tyz^S|02wjI=!?GwDb-PAsP
zHw5Ax84O+}yMb_BK8n#VuzQ;1BJcZ~9JD%eEdSk$_dgT|FK_1oUQgww%1Jwd4D^}1
z1aexaDZjgp>T@Vf+TCy+$VIUyy%kZ(&+-YhHqJPm%kjTI_mYAAH3?db$u7C*V~D^H
z>l#tnu_n>uUQ*Tve0BUy9~WA;1TE1KtThLkcIsd@c9<Ef1A-KnU`VA9R}9-zPJ>?i
zX`D0;gDEdj5lYB{9%PfaB3;8@!RM8eic#X^GZ6x!9Yh)lg2@CLu+UHbZ0>>gX$DKx
zy6gA7LADAR^^^R_XKpyaP)3fbd*@nX1mAYANW|IMvc&jL(p+vP+bdhjCB#%dsA;m9
z9eN?doSO<y$Z<R*a31a^xSK3$kN`6f+c%<n2e`;@Ym+#wML%pJ#rsV)HeSIlCw<%~
z(4rB(Q+YD@JoqwbjN(AER9-V%Kto+n2slH1u{4>OPw_GiDB6ss&+NMp@v0=z-f=8s
z46v?q2LMmnc)gR5u+p=%O^br}hCaP|KtN62b)m>i;K))L=^`wD{ZY{+V*7!_Y32_w
z%F8=-;+2p4y2#=<bxRhSzR-=FWER8tu5kn0xyX`V13xDON=wSp<41_|Earr)YQ?9i
zHX;U+d-`%5!^_euOB<QfVz~w$pK&cqs54|1AQgTJ(sQf~XO7te!{<sZ!f^+@+TW>X
zeu5^fr<_6{@~SqXN)hT1s9IoRu{%c;qxexoNZcEsE<1St3PO~nYO3<s$dQr96qJP5
z-djYg4y6JcW1N>;3K8Z6ppkrI{6F(_P)XCGF;mHE7<PRHZLZu^93tbJ02}cp{<<d;
zqdH;X-q5nYlH*?cqRQ4Pd{NDU^lr71c>zs`mC%c4B}bl>Qdu^M_!uU&cYVTm+L|%-
z6=yGD6z34~-i=br`f5?=?D-k`47J*@L}EZ8o2+5y=5Qq3_>WOi^n2I#;^I+v@+e1C
z(6~}9i6k0D-VmL^O`2=&*R|`m0Zba(eT%Ko9o6)<;q5vLH8fThz5*w3w$`Ou46C?7
zwNFXY8l%zuJyF2!?m?>Ghz3?vgA55c2&^pqCA)ZnWe5KGAj3v1jeEx8Eh*!lO2!V}
zRu}dKd`EUl0Ds|nW=5hy4^$H&g*31FhQ{l4!6@<}p+az|jnMQ^bUfiO`%r|B%W%Et
z9*}R>%tL-BDff{x3QfVm=ZtoHK(2W$Go5eL+=waXRM~#U{Se{{Xyp6Rrhzp2hgs~8
zjBDfA<Ww2)u{3zK*x=ubUYlaNJq_4f@LNP}oQz76&AP$pIExL~0;CtcgYrrC-28In
zKC0z%>?ny67p)4A8S(W@v(ms9y#I8yuM6L6@*@g=5?)?Y4;8(-oHuTfa^!q+m`pn0
z9H8QbQ!wAg2e|sK5L&%`AaQP)eZDoc4yZYc<5|#V%~UbBS|FNe#?5D9r|*r?i~aL?
zXQ=_3`KT#F*%wwy0<Y5F^u{gQe`DqQEgC2(NRzB)^P(^q{esF{1k6wdfQ~sWFnbHW
zN<(3`SPQkQ2Nbhvn;fP956?Kafnw_PFNpG08h0U)X5o?%Lc&?P_6P>*;CYsOz8ot0
z3<?9XiIllD-ejM6CO|=UvB8Wa%3gTD$BciGXlTVknBP%28pCmqgO=?xV`n8*q?M}N
z=ZdxZ;wnb7RaFe%=pSShTWJ=(4j?{C>yTnp#`fCD`VuS_9<ls?04L7EmE@x5)PzQK
zO)Fk*(y5zc-yYUu2t3-~!@ABb?R*=W(|>6Rk+P-gzpQW!CObr1nb`58Y{aLDgI#~a
zc>weFfzMhPuURICUfT-y7@;WE9!Virk#yjY5#>Fzco!5Wa1-n{x8+w8O!IUSTn<U1
zKMm&!F2tAO#yLPjKe{NfMu7x#goNul)z@J_`k542)!ABOpiBVd2(CR2Qg?S;WAwc-
zRx&$Xup@t<c%*`p0fc`VMpIkWzk1(IEOMKl01l$SWB|O@<w`4*(+uM^yAU=*!e3`O
zN({oImtonwY;m(a<r~MT5SLe0HP>M4<tZ*^Y1Q{%Tdjg*xn1nGrVYu$ohczWaKxe>
zpse8?wfL8lPy-%Txc34B;VNX}c;Eo`Hia`Drah%~w1nXQ9k(E$F!I+`5q2y$uSg0p
ztDBbMD}}gpG*V9&{det1#d@9I)+b2N0RG+B65z9!Uu7Tk6QHW`B#&GSMUb=qT(BRC
z8%ri{-HHaFpl*<a@hufeJ-5-6crD)rndZz1JgY)HLN4ig2qcq?^!NQAw7(}?yP`a4
zu;niL0Nq?9yaWe4aF7>Uf^Q~Xu97P{e&0~km_XDa=My$`N!gJd5U^nC?M>JY1C<T<
z5}%Z_;&9gLJ&bUt=k_YVo)kUL=9W%de!||^lm`Jq+btC@2h)RK8Z3SG%L@4Vnc>?O
z8%;3iq(M%Xyc^HYk<8#5Z6%tsN3wD<CHip0|C8O#JP3BXuKAA=t&TKVxKZ+jNZV9V
z6I-a8AwhTqgLlTVqYsux_Cy4q+QAgDpCu=3Pc2%A{R=Um{MIC}i&H>izoiZWNj0vn
z`8QlTdii**U&c~m030J2ReFXMVYuYI0@%hG&AJ#~6<@Q+JU<VdmttC9zz=jG0;V}^
zN;dy+$Iy{`)`ZST&+rYV?*v>Z!g%E*L)eKM&VT`5e!A>zZjdEw3d|^+TKmzUA7h>>
z6lKfgzu3Oj2c6BH^3}o0yFbJ*>{?o@_5Bxt*MVM~#IcGzer5?+mO^5-Hq#m-m>nZ5
z^Cl@%*7{L%;xNJ&wKKbtEdUZ78D9frGaHg3V6X(4WQ3ed<(+3xSVQLhO@3)#kcEKr
zjM?-n=r0As?wK1L-@O6G;>FcHbrVvgcW+*VPdk4}RWQ7(y1iFgTO161J$VUeJ+t06
zr{21;RBjEqf%a$k!s5v$9LEGZAC0U7kkF#O@raTIiU=-FRUD{)>R%ySCV&y>i%J@1
zSoF%&K?y9hpjiH@I}JYO9+M_0DSD2AAeq0I`YDE@c8SQfNEJ4WDNf;>b+IZdL6G$X
zZxv#;6K%v0oRqMlwO|mhsN}K)p&~U+hx1~>OJC_2Fggf<*e(-hHcbmWL+_bN4N$O_
z<UtH>_KX`q1IG-7&uLrjJAS?N66nq=oga(Odtw2W5{(pV{mVASXF~X`m+By6iGVU{
z6il|yx;6J?0#!)VpBKV?Bf8RP&DML2KpD*!jdHN!HgBR&_EJ{NAp=P6$=h&2cV#`c
z(8=1iJL;-R(|k9u<*Xarc4t|hisn5b{sXxot;?g+b}*8g%3kFnkRj=_pebKq$;Pvi
ztOihydxT^<RE{ud{Bto^oIi^8xfZlmc@vf&CQAmi0MIlupjEd>;3tXI^#;2FhBuV}
zTUzdQ0};lpb?qx)NIFk8?fZZM3uvd+<6&WgV9n$~CwRs2TM6e9X9p@t6)jwZuhuhv
zF}k#K8u6AQR{Dc`m}j@pweFCN(^#-G{p@}){p{~w4cy%MRY=hU(dVKrZ}w<1gQGQF
zIdB=?Ur&U<(cc8bjJuT{b|BQ7=F4S^!Fu7Qu`k<10#M{{7EbfZ8hA_@y#^u=9dx3l
zjX<J96EV`C!}bryLQGDIQZwST#2RmKS~NK*@M)8K;0Fim*55P>P0(?HZY<pPysG1Z
z_~eBp4Rk9>mRyfg;4laac9m3C##s~XO!?htZJmIstNK|tu#h={cka0R<CwNAkrI+x
z$<_#WLJG3LFPLZt7zdY8(-6l>*Q93wT4q4NZ2#Zu^YdZjbj?H;z7v7WYHJi4h`$NO
zohMW{`|1<+e$&X-Hs9(>3^iOb#o}+M12eHebxHjc{L|Z9PIlTKZ50Jl2MdkGWR3`3
z>C`+=Ua(=a)e4_7B-`$l89UBBd)Z}Z!UH)?=ZebqK&|}Kfsi`&4rV%Zba^x_ZB+qq
z@1`ZSs>a9CYrE5ks+(Ggv-o`4UiWjg9FiIFdA28%ZATM(bNHHL1pE|4Y&t_qrnGn7
zcs(SQ{ZRiUnFz%OtM(!iG-#|k+Oq1P$b^%nrna9|&>z2edbf=otrTB`6kPXOVX|D!
zQjN<V|7kSU2jPk|Guq0EF=`)Os=bFSMYMZn$-_mS<W^~?1n;8ex{v?rq8jt2c$f1k
zI$p`aj5O2ttrS<PM1j4?S~JiEdWZFnbu~JHM$<B{SsmD!Ubf^9?yXqSwGB>p*s{zM
zXoC%F7ec`W7?3*#bqd+harhti0PSA%?RrNqQ$yp&6Ht=AW{FT0)LHJtekvY_2^&_y
zItqWCO`@?3e(^4st72)U{boq;+Q0<=ckd+;LgEg{E_*R!*)^D=@#j<vgFOZ<)3u`Q
zF)2Gwo#?ZpLKqc}YvpfwMU|<Ev=5y|1G#5DMTzdTXO`TD5l|h`zc{iITGoe8>Z@8Z
zV$a}d?o#c&qyp#))Be1+n%XFwIFLXTaUuN7HY2ZkqYOAg$~c>__Ndr`I$gzsk{$|p
zzXOK{_$+hWmzri2oQW>I@W7g#vdtr(%1oX&2?5+B8&Vn@m*NXCjh4BwBY~j6^7Vmz
zRn%6v0Iue~`G-nW2$t>xJsf^Vqyt2%>l_ef+x!U3R94M(?rGZpvCKcaPK>*2Gnz}#
zq!3fvt3<2LGRs!LUkKX86@tk+ySY(;E?CG(CrTtv$c}dVu!X0i!^^SkH?MyTXtXFs
z`g?6b?BCaR8mA7O)a}2w4mh1BLI{p;xiDDiZz!JkV;D8pG&y^cR$wAKu~0)&<)4AE
zXEqZ}>YQJsidj+@odDIf;TV<6++8~j!p70|=9r-Lq8QSgAzgqEu7%--n5G@kS6>CF
zElF5BmzkLXd`(aE2PxQ2Uq3vYeee8+k(<%>nnVp;dBWjLc^Gfp4X@z(yjSrFxxu;m
zC<b7kj2_rT<3L*9-lE%XUSRYkqFGu!%F3xbav<WnopAHB3C%67x+k`=HA`?lW4X5@
z>BQ1xakR!#B#M8gGvP#po;vU3P*2%9y=o?3e({9!L1#jz9Wab06!2@A#ZeByk+%6A
zrcA*|c@j20-aI|1*$!{_C1+eH+TNh2H(shCs)v`QpNpSPA^m~VOW^XL<KhlzuC^V8
zB*Ft)ijz$@8jr+}4wv53R<sot_;riyS4WVQWo-@tIZjdGI!ZP3?~c&|%%&H;<Slb}
z^B~mKl;e=pE_oUMcKVoUO+qCA*^IN%vQRz51MNfT1>>dTi>61HFBgR$gFWgUbcTX*
zj+-QZCz5OfK~JC(LL13Q#r@5?`|aGL#1MTNtetHb+kVHJ`yweilCgve5(P6D{|BI_
z&4zsZrGVl*ThS;q23oW^WponNioF&Z8|URLj77uyeN!&{W?Irul-VK*ul7J1AYi&>
zB8=gcO`9#xw4_)T!n>Vk7IjtlpeNKYJ@+D*^{E?|EP3SU;)9rIZAHpK9|Z<k6@Sll
z3b7{<8NC5)=*wW^1Ev~KfBv3n)dl<?ra<9w{=)fGAOcldCtjrFj12n^eUC40jpEr~
zVsZT{Z@%Yg5OgH`x2Kp-OoKG}bQi$zY4pjx98MuIXdVnZGuhIzq}P)*CdS5}O-J1z
zI0*?nxK18<lz-C#je|mo(pAOaS;P&f1&Zrg*oHmc_Pge2qTB0cx-BUy@6i9#;X(D;
zlLMb`NakA*t|w6aLuXTJg%<w6N~m%JjCcy!+z53w0VyaO5GyztgPESj;R)NT+Do4_
z2||-d2D#OO{K0w!JYpVvb%uCO6KQcW01MK20awaLp2@8&iy5wZOFxw&D2s0)TV+)S
z?3iLro2ZnbR~}fL-3d9O*NN9zQZjc%p^mGU_0_Dp*g#@nAmqZoW)cb5&s+*D{SWeO
z2*x8UL4oe3hYtrvjnEef_R%EwtYF#5w`=HnZ<qHV6c#jTdRjvkS6g{h7qTT4Es(%k
z#GTO?HWw(ZO**W{j_@x*<+p-mMx2;icLd!=cT;C__mAlNs4sQXgy8lYZnYJn{m#7}
z?{F?r>m!n7lolB1WPb(kCREjt)h!PP%X2c0hPAx04ywCOV!ZfI=+Je~C*i_#yRd_h
z)TBOOjNT#ua7@|`x{`bbC^{?Hj^-p9Vxa;RR)Q43a(f7~JFFMv77{a5ZoW+>5XLXN
zJ}l<h!f@h?%Om3zA!wH9dY;bl<TuJLg#`0PXHHffy+IX3n#<}>3@+Ari~@z_)KIHw
z`a#kEh2f%D0+i+EqkR-a1W-+I>t`Izb`X1%fSu9SA2calM<e+ZSGTQRMkSCZq}PJY
zMBopARVhfrLo!3Dal1|0w{>AZlj0;pthvt*WZQ}Mp;8eRDdHkMgx&b`<R+-h79J!D
zlB;&q@~dS=QBz{cp2sP@+*;4FTT$b)9inBw^9RkVEBCgUfR<EZUM~01Qf0Vy$wyjX
z5_KX}b}U{jSLFkOR=*8RX{d*?8rrO*U^BSR1QWsZdmgJ_Tn5uf-G<=NP1$N};lPnR
z?H|KOlV~i`i2%Dx!YGCoZP}~f(IX+D)8u!`X8qnaz;nI#r*t!=0BB9aclBNNe3c3H
zOiIQ*7E=V+q(UH>%*C<R;R}T?E1sO({<?W`A2TqnAG&&8YL!OXBQIr)X(OtR0G~yN
ze{5P=?kA7zo%THYq^<?Iz?e}KIa_*U;AP=RLRKkW$tYe=Lmb~yi6t6_P(E$LPD1e0
zAh!Dn7@qX|<d1hzvHXn5)11p_ob>;Ku%trRgo_5@_Cv|(vg0&4E7>y}uMRaR!KFnF
zV9e}(5lh$g`XSKckCjFl>QXBt61{UtG7D=xRLlyvj`M~=yZY}Q^mDxVb=o^zL3o-J
zC5N-d;tKoyYzo;~{{;u>v4E$BsmG*DK|md}8N|x(zgcPu(Z{RAyx}F?K;k6OwspMY
zo2;P5))hOvT!t4bRDY3q@fXSHDN9SPnB?V(ob3w?ZhKOYKwU$x9<VX3U&vO!J+cD|
zj`fsT{cnBaTYzeVXTPZ<aonT7rA8u{E0w^ii=8<Q0E_v14y;FX;u;;sc9{$WXsV~&
zq-%uE6*9)2Ifbt>cWEDv351&?yAj_n)^_q~*fJ8YejqXpEl&ioql%*&MM@9p;egLX
ziUML~tvU=)#MdIIhoxDN!M)gYcSAi?=j}a>x+zZ*_MBL5ZA1XxcX&O4_XeKtV;ybH
z;$b%P)!2Hd3~~n#K|hPEA|$lfN4u|iE0Oikn78^SI5AGcH*NH4WsADk6O8aN$j0$K
zRAOY4mnY+;c`eZyX4QKYN57ww30%`r?k?*VFMtTj1Pr7`$Zk(z;2is)%icjWae{xC
z9!uZVNUJR9Hs%6SIzR%?3Df?vfJMnI|4xJX-8x1{2FPjFm`gF*R7wd68G%*sk%TNo
zDddYib0a>d_tMU3>Jc*!0K)ldkQyL$%H!@N)2EQ$XhUa|#C3(18Hx|7-3vvLl!rYb
z_OBPD?T8p~G_gX@{67}>Tx?<fMqJ=YgkZodMD%<qS09iR7TYz00lSono425(hjnUr
zVo5)c`P}&}@O8A)31;%6!B<lt9CY%Uyvx;P{F4Z@3>dOPB}$q*O_tkC{RUzySfSW`
zwG%nl;bq7(&xB*jtXFyopy+Y6fCVl1uqhrv>(|bympt-5hj*J?x7SMHoIcDB`3<`i
z*3iUjrkHOEWdR}ZSy4tB1XR_c9b_R1kX96RS565!kyjJYHDq&c{{SeIefSLz@bt5U
zOWY@^$CCi6DuYw-T)j1_X;hlt4}Iyf{SW5QmyL-@YrL{8ZkD^%aW$8?DF$z*ux)dr
zsZ6%^MS}#)BNju;Me)%OoN_nahT79T$?c<Z1CoJi6SG?aYJ{9nJcLEU6DEPXQu@m5
zRBntPGDTciOzXx{;J3d~GXBjI3;`UUN_CJ^65h^=c}5rYY!*5xmC;OR)%qTG&*ll|
zZ(j*12t23h@gkwdgRV=?t{1AyTvN!sW}T01{T=ejJlBL@-(L5vZRemBb0;7}iUX#f
z{Vxkle>rg)<rrt_XFW(<5BTn?M+#E23C@~RL^f0?V_&nLXF=ff66pXTK;FNW>)oyD
zOmwJfp|?MLD({co{y|gA45WG5_wlrU8Xv2z^$zk77>+i=M$mjB&+{H2I=7X~o9}w>
ze<Dc_B@#4*)j99;bzghRt1nF^^3`Xz-OBcfK&>^3W{$plSuIsLRWm)D+GZEg_qN4X
z5Z){QI}p<=JPx!Ms-m7fN3Mjbu&>1Y&d1IvWl;Iy&u<;uX4?@#^Axw#BC_BsLRU|Q
z!7i^v9aF8ahk|%M(d2M<fkU9(_hev*+ndy$6l_f_J|`~f|JpDNQ&P}`?yP@N<2o|n
zMfjt>4D3^Ss;HpL+88569rmEud9+d%BC_~V2Oyq6E4{u?X1Oj%d|ERd+9rJgFO%@{
z^&`U+qIl2%u!e>NmlxH@&}2B9nS{DI@D0g4f<`>L&y?JanGNEv3&Tt3jj49t0GAb^
zAtcp;K$ov(&@eu5IVVIWXin-V%~<?b9U9!O`x0VDO+KXo%5+@9YXIw}v;v~Fb{clS
z=p|k=;5Xu9Bxh_*%>6#1;wp>f@=D)OTBp+I7(RJv8ybd~Ei{@$3t=n<8S*RLbJl*P
zH1J8gD8i^&q{<Y3ZG=M+lz<+4+a645oe}^bt)#$d15^vgR;Ab5E+~Y#4=&$@*&;%Y
zLCfeuGMJt6x_t3$?C^VKFfzxZIC?F)oZ!>hCS3F&`q)`%cyoAG3w#N7aO*x3J^>--
zwxX1UTEDH;6b~~UI`j<?S9lKTSH}!>`N>Q-5E_ne!>#Ed+Pf&wUZQkRn`p>z=oRqi
zJgBBK=XYxGGUg2<|5_MMKGY0d8NFJmYH^ajgt{1-lb^>Q4yS_kAtKC%dq{+pSJb*k
z)Ve!dyU_UW_A5f~%zQ%v`Ljg{^G+#R&uvPt@v?=V$@{EZxYRy4q_&eqlQlriTP0xq
zvLj&j#HFu7l}RsjCi1S&u@GlN5<e<tQ<3JEk=m^Ade;=6ahz#JdHL&F$@VDKjkR^~
z1VYlC*NXR+zjsCZ0_CxydKMH2bPsmgP!fcArm0t*s;+2f9JRw60AS;%rBcG`B#Fbs
zu~v4L2dQ&$m{%L0OQ#>WxcSxg0(PkN1EqN`D8x=1A+FjUQ|;*E$)!#wDyrG$hQ(vP
zLiBZwE=;5J?vL13LP=NvaV|x%s}GL5RKT`<q?7OF`d+mPghN|7DGrp?oGub|iY&}J
z&dfI_HV?w!Tr{qKyu?BK`I~dB2Tq1t*q_y@;tFU4Fx2ukx`Dn9Ixnb4fQ|UE&hn!X
zJkMIw812OCkkl4zAKwGg=VQs%t_5jY9kY9*p5$%t;yxa=_|vp=Ohwxb)@8&BgwScJ
zJ>%#99nRBjtG=KRAN>EtQ~)viMX5LMidg37B=~s@R<+soczBme%%=?HmIa>l2(%JO
zmxWaJKfaifsYOW7PdiaTKu2y3sJW=O>`^;;njx4X*vM7hfK3fU$o>vri0}7ydQ*=9
z7UzD!i|VH2V>Dm9@iO!n;8cyzpDI>nLcIL-Ph`3(vr9&LX}$mWEv^$ez|gfuy*^>C
z8ztlVupnzydPlb~rQZit0f_xo?vjwLYvv)TlT_N@V9m21sEo~ofad<YV~1iNxROep
zg8*`6%tv8;X$P=<%R~5^(}5?$J@2ZB(A}Kf5qCF@UbgC%fgLp%abSXXTgvynd-qeA
zw`W1j&D@O*l~3kz7u@d^q7~W5DBXxFoG}WKYPjI{9qxx5h;Z8)IN~hN4i(p9eW^n2
z(hc)1>G1(_dlNw3+a(|^zD<$Q1RorUY#|VUdU|=B2BUDr5=r(D#Eq`ZwBNsZ)xFs{
zBtU_(xpeC5NeqAth0=W7ogD)T0~wsC2(D1*cJ&gmJBR4Lecvu{TS52urtXJFLNGl!
zSWlM~Q|_<KrGFpipFva*snvjEu#9sWRE7pHb9G$L7zUiTxMj3-2hf;SGQ@~sq%m)?
zS$fojg?6+x5v|Ya<3FP|@F|5le*P#dI`5T={W1fn&xg9rQ-we&X>^RH8kugP8@B@X
z<O&NP75L7mlsIPgywYUj<?^!ZGU8SU<eBCtkNHCR4gpn!e>S1`$eXaC67<<>?7p*l
z85D9Ge4mxs!IZ@*W(E^rH_A~*$t8l(BbObfMFJbEa7^t-*X3DQEOP8uMDd~m3WB|6
zx1n2vp$*G!6_~cO7n?W6RY-9)Oqx_s7mvp>MuG6wqm&Mpyh$5gbEbK>DCOWy0wypI
zC31-ilwt180$53;0S#lK!E%w70U<zOBjHyTW1kwy!d;fmQSgYO-#PSi+YkVQ-k!C$
z7mF;B=3$qp&N&|#MB@Q&8LMrErNwl2W4PucEAen>qMb8X2ck!q#j&y_$_fJ4pb09y
zfPs}O+v+lNwKvnm1-J$1xJAK_U|diOXU~nkBO9>b&SzsrV%43&53<Ku5vc~#)BFen
z1FaJHex;N3+;GI2r5Jx&E?{A`ynX%|=*=*Gz)vO`k9HYZNWvE!ZFqbb#5A;*G)IY`
zrJ8+ITfBw?@GVHAize-F)vM)hkFYP4`N394!B4r&{aa?2j!5}Jf1t1b!U<Ls_6@O+
zWZgwKeqTdiV&v&H;bi+U_G!os7La=ms&j4hsYgtDl+Uw3JYV>(Y$E*2Fb-X%9D=jw
z9>o)iK-XvXgGENLG7xFiv~Z%EAb_XYbl4p&vYayWQhKDVITBIZEH1)|5biY0W?+xy
ztgiFP3=wdJprJ1i_cD{E{{{E2@&zH#{u`U7?}wU=c6}YfPWxWj$|<vsgL5jkJ1WV$
zS^z}KukYfE6ER=6T}tgC0NZ*+;ow48*b{FEnsd19@UjEb^)nT_r8$7EP&u=J?;rMA
z8N9lQmgDG^k}okI*EYCUs+~-~l{cE@H5gZOHSM9n#!#;vxZ!!<eEOLj<rt6Le60Q+
z0IH&_55<usRKZQ?|HRO2fOOt}{El)j(Ke2A#zY&*E&CWBdtTfxwF=WrLpO+j6CO!W
zKe04O38Gv4$yBpD;AzjXhip?efSc7*wI*^5y~qsCVtW0TIp87Lwxc>m?0-$ziNz&R
z4l~Z3YJc@qzE;$;!RBl2ghMpzo9%P&*(0|<9V%NO4yhX+*G*gleGkU`lH~}cBq{+A
z@t&qdiPD9L20H7!`GrYXWRd{c#{4o1O#1ilXMZFId!&#myv3PASgKVt;N3&;YY?AU
z+>(usC3WTjKREnd9S3k2fNkhI4IV|_p<rLr(cBka$t?9!+y4vF^R?1P7~*bhK;1y_
zBHb$I^DIO%hV1z3rn&VqVy)!=;oh}i{<naAQNG=x$ex?_));zd$8OupfX2%MiiQ{4
z{N*(k1Y;vc#P=HAT)`bCH|v6^+9YzUBN83FxM^dJ?v@@b+(<Rs^6fmY<Tr}1<>KQ^
zUCD-AcAk}?U#^#+%qiQ^tCNMlEz_&i^k=6JW3Lx@|4$Q;WIT_MIR9N4F2{%OtTI;&
zpF1=93H{N-PjMx=fI;CwKb50JI|D3Es9IITQ`g)q|JyCh;+bJ!B0JOzoT|_JHXopk
z;|{bLtG9oCthOYdd)8`=s+oO5x+96}pn|$Qk}DlGx{;PeqZV5>7^}=ZW)Eo%9wap!
zJtJ8e!WzGJ7;zEZL4LEgHHLbf%Sw!IF%cyc&`rIj?qv+BDX9yP6mSXNkNqIl6Bm3Z
z`;D;Bp!l+SwU`tYPwc&_?Mrx6;KY|mT0JggE>@7UjKF$D!WTZtS#FUOB*DZ>Ur`Ip
zee!~vLYePD0%IC;GUA*_<WfHtfB<JWuA)Q(O^&Dt1P(yEp4%0Hs+MjLVDCPW0=%O*
zZ4MD&3F^=e=oT+*dSpiYmgwsTvS)h6RI3e2pO3J?iPgRI@qH+5)ZxU`fA+N4mQW3B
z+X~+22WycKJ@on@R(Hy3_;UlAs(WghD?Jw;Fh9=XaW3nK>f^;9aVkIa>Z5r{z3H6O
z%B@T1>id(?C*-W15F;{R-$haZ#;>0!(dP&y&q$bMZr5H^|GG^hgf3eS$59y2+#<E7
z$Wh~V)-u3YOrhtdG&{<lPG5U=tjv4n8DHs94wflG7%vueTNw8O^i;QGk0fP2bB34N
z%XjtrHMFS#>`YtwMpjS1tqnY#yObz}(kxz+G3Ce`NZ9UH+2=#vGPm#j72Ji~a=XM=
zZo1;;;v^ag)<l*{eqK>^M}2k5Tj4!f`8$TJhC*29H;$D$LXu)JaY$Y#nOxqJvfoM2
zc^HHcN?B_1pt1GOwUk6}vG;6d#_lW=p5DE`*b6*+S}vmD3PBus9$V;d_oYG?qNgQ)
zbkYL(aR|lXO*c*K=o~nGz>_YjJYzxep49@nYW!U=RcJxoHwQk!&tb9Cl8J(C0ly>K
z`Oi;UHVcJq7>FArr&isl56uO7J=C-Qg4ee7U9bwiwYT6amP<w$jD%A-QsCMqRLNV4
z$2>0>XPjK+4}CVa@_zoE`PW-)^fn%^Dmq7u(qHxG;Z9LMo>Je42pKvBK`POFFX@#+
zqZ}9;GH>^Y3?|<(f{<<X`!3ku6pW<bdw(7LM;jDmy{al3+NJg?Zrc=OuLo4~`pD;=
zf@@MIl&B3Qz2oZh^3A4(jxm6<{^1%as|lBJ;Z`8n487Yam3{JI0|^&VTcE7|pw7;0
zwE0(S22qM+Ozs%yh&&nK7LiPi^5a7gXu0`7zDe34`@VlRgC3)<r0XC-B{nXH)P&5c
z#z|!}8edEujlE2d2u?$;Fg#mV>`6Pb$9jQB=v1g=%oYb_XX^?tOCSrd#J$X>SkMNl
zV4N;*;bh|INw?_Vg_^1htf=ibb-njJOxX}$ozIZ!&WbpbL1~I#2kf8$!MUjiz{{D}
z+#b^%;q2&HmkvFUFPg|2HfNl$S5uw2(k)RNa|ve#@jYovUGH|NkUCJ6Zf<Q2-rLs~
z8ON(IvAug7^vGEQ*~k4Wqz@vCk>?mqe&49tv-3=-0TVN8q-cU>188sXEsF`<niJ13
zR?6@MErFpslsMl&bnedvkH9SRu=9C@1f#JFn~SEQsPhAnPKRdkFd75sJ6!)mO;r$l
z6h%xYk&?kOr!=^2Co>`BPPbxt*Q;J-{_w8~I-5@d+u)VRz_D4&r|t>XWHLt87;Q)*
z{hW+1dU-vH!O4PTp2{DTOlITS1>ApO+_TEq9Sh)!<h@dH-$;EL@tUKIZW7Q`^M_S9
zJ9(2>IFxl|#GYr`CwvwsQQE~}7zIN8Rzhx94NKc|`oF#Eiw>+xmu*sj?xU(8W`X^q
zD%DAsX8KL*t7M1deGQyUSLQrykBB<c2dJ)nY-3}kdQ=XNyg6eb7TCdqG~$c-+8l5b
z1Vrbo_X;{!3!a5~39>ACb92ATwQKT?(<Rt6*9-4)<54g*O{2H<$As7qCr|Qn7%tSO
ztmS>@lZxf=x@X&OdxH+GsLT-D*BeyOY>H%`0hc=YR`Qt&Q9Y{+!!-ENJ2hu7QK{GH
z3xU$K;Fj@x_LC_eVjJ~GZJ3ei&2jbO2(3{B^D~kE*dLJ_5O-#lD=`J*gD9^HLC)R?
zniL<5W`rhDCHyR)>s9(!k&L7#s(AbQ2aNz~JY^Na`EDnjHl&%1Pio1!@0peKEW%=F
zbf7~TXL(U2ble7lxpQ>1`@rM}8VD*?p{)Fvn2@M)0$4VV+<0^@*yvI;Y%gMIgj?%Y
ze!_ZU%8yC0P@d^sSyX8w40MxiIlQ^ZOyV`Z$FUeM<a0UFFZ)2I<5Kpz-9F4Kbd*FZ
zHy++ay$b2u<kkRIOS7|G>X@m42e{Cr6}QR{$gI*nRwJ!5RQ`edG%9ZGgM#QBa?Q=v
zBbrn%E7MAid2AB~?qS)__*<v?Kard{Uv|!#%&76YT`VAjdLJA#D#a2#a^CX+i3p<5
zPTv$9iAHG)AZ@P`N#+w+$%Nhy`+VX40*dZj_2~!_RBW~_<mGEmf$v6>P(vGA%mlkq
za(_N>kg}tPR1QU}NRu@XL%Zd3G&;V<KwcUlo_{?my(((6J^|t?)?2X3H|Ro$`s2Rr
zZGS(j@73?=PS}b~Vkg6DLegTmHtm9Ki*a7#ODbznA82&Cs-fK2@q9^$H26(UZeo(U
zvr9O@6zC0WDb$Nj_s|+8_K*HSLb5d%X&g-$qPl(^)>>ZP?BgTHp2{~=;=i`%A=?DM
zCa=t|ch(8#Vzy*Q^5TciL;+jlfM+Eh;sSt+E7`ciyyk$RySk5_4(8s*J{`xkn)!J9
z!X4RoRD({4G{gq?pT<-|3#C}S^~F&EtSF`i%LWyy?+JjjgcEq7+DlFW%w28;mb40Z
z`11q=MW6?sVVn-jSa<%f(+l`t0u2R3Vff6(0B>{{FrZ6utM5PY_}~VN@JCe4rA^S`
z2mnEbzKY;NX6&g^3>LPavdPh<`^Ox_nZ0&S=%kGZBr*TAgO9#MJslj+_ix7%5S{uE
zU57dO&DUb@if+B2{|KwCmkuw9ZcS5U!p6B{yD<B=x)FDBG;FAaun8ckl+?eirq|LN
zz1&`!cOO+0ou0FQd1I~Z-8JR9A3pCDa2S0{*js0rOeCCfm|Tg0y)Iypgbl!S@#&;Y
zb4fapWIZ$RKid02Pa>nJ@p47a1o3mx+*}g9)cmG@9=+Y~d;YYlWwyRNwzG`?-9!c|
zg8`r&{~f1*l>drek$3w!U_+Mo$1=IAz$dBKKpCsN4*cP(m|4#7WFEwG-t)P4oVt<q
zI~ki8%IoCSJC886u+e5FQ=^VY6HDuChnSdIw>SrP{539cEa{n8wW3SE^44C&8yCVi
zr=8iCx@)N6O6%S)`kN8cQ74+=B0!Vv1oD7WJtI9YP81%hpbl<cE$Jfy%C3IV^bNjB
z^_=hrfFyUK^UGY<GN!X0!8Ec#YH(nW+B=>+aX-22GH92Jv26apn=4KpQpTUhQQ<Hu
zXrEgPion6}2=2I$au=kGn`ZSjB*Tv&t50Fls47BzRJxhzT1wobd0gYfARv^?KHA3-
zOo!0;=wlp`A~l)T%*N<ls)XIrgbQU@p#V!crGj7w1LeGST+`xoB(MCj6Ft?lCqxdI
zlGx1>1Og{r*RciOFX?~mj=Ag&VOAc@+;VntE@^cxoJZxlBGD)#;r~YTM2Q?oml0$5
zd$14XV)LN^THB>*+5S%X&G#?7h_FR`_a(o1+^*0wQcaGQCJ;lLSuda$y0@jtU!A8v
zx$VPqcDaS{vHIaeT8O?pb`H!?95qE^;Hmw?UVw|WU?i8<st2j;BIA7`s1F&{lZ8s@
zoMwpW(%%*LEZ9__dEn~F8$?(xS048;9*bj?mNmsE%YC7o1F!KV6KMn`J4H<ywK2j#
z-o@u8b!*$VC2D(*hn8eE>|7E57zcWvU}KHy>B1Nh`rBRQ%?ZR#y{z0-{QDDKjREdd
z63a|<L3`jCAG7|%8g1|C^i32&V3s*KWVpmX9D3DqHW|)czq2=pV<{bLm4NGbLxE1D
z<SDPdv8McC&QzzT;Hk~72uCm32{Z4!a`lj9p^vp|7<rj|{|NMQd#Ag&s*)sRcq%mp
zGx%$CDykvZCvn1j1({=K-B9xAJ^qDxoBstzJ&Z-Rx_e2R5A~_zi*|H)#Xm%J6p5gx
ztRWY{ul~{*SADmEBg&X;f*2SN&2<1mitzBJO7_6%Yx$QAgMfl)?Eg^!KKi`AXUR$>
zI{Uo0trjKTA6c)Qt3#pxm)w2xzX{o<R6*&Q47RpTK!98GSG`&|ZnncyZdxXK5yxKb
z_@$TLOCLK~#4Tux<wjU_s>B|fHJHa~X7znte4S!N)Q)SxMT)*@Qs+O=Oa>&a55>$4
zqtA|7ce^6uj8?>Cv@roP2wktUGujmTe4_{`@CKrAubqZU1Lml&B)6Kw>|(RN*!h%W
zA4h6@$HZ^^e0S!YRiR>W!1;%BvsSXv3K{)--_zfNB1tjZ(O$eczqb*)93fpH8j!pq
zQ>`|5oS*@B@J3#)?$pE6?7~Y6uRr9ofC{n5?{sfbFS~u`+1xQX|9lr{&PL7NyKN3I
z0n~qC5nrYRePSIx@0@$*o?`Su1%GVdCJ~o?D0punyMe?M`kg;U!F)#nX#{C-JS#PK
zF$gjxsS(`NNcw;KYnn*_%F4VY73SL&j?nPPa8)(BCZkWIYTfHpDjH4L8}Y|w9RnKd
zTz$$H`Xp&XN;5c-^Y?S=9$_znk0u){dJay|r57#H1gwG|9<e)*?m-)cq@?9H*+~z$
zOozx~Ph8E2sOKALnM_DehOumBM;~w-uN4aX6D`nZQw>$Q3P4&g#(my?Ctp6bTK*#w
zOACuVY&ZJUT>}Oft@81J9dO`-J$p22VUXjE8_JCy-L2=1caen-j3rlE3>DW&Q@j|I
z4DB4Eh@%)fTDV|xRD8vck7l3a78pLl!j!h1fT0c*Zrqc@)1?JGe!Ul7Sil3EII)ew
z;%36^e$HK$TPK)_u_Q!Xv`KI>2A<zvCM`o=(ae;M@dnhh69BMugWQ;7*{Ni=E^DIj
z;Ifz-Ok$5A@~ceYYBw+u*kofUzryZmF-wHRAXJvQ%|{c6cThzrQ?ItelC#1M%ygoz
zUKjl+=>lhRdzMaTpw*3<<8YoqJ3G|K7$@|XJ!T}m#I*5T%yJH*Q#Qz0su^woW4Mn9
z%Y%4oe+8{m@$OD<x%ocBXRk(U^*%Hcm3dw+mSChi17b5fMnbl~;ZVw#L(+B%SCOaH
zmtvJLbUGBK(R*iGzdmIOP8xPx3|?%+l3L3A1JgBjm6s<PYNN2(%ZzRU;)}dBir7VE
z--zWk>gegeE~u9%`xc8C(;>U0Sj{P&{i-Ds8P5)-XH~}073U8$+0v^b5}Y9X>0^A7
z`nzxVCnB|rJ8}y)mZpujipt=t!fOgt7UHe_tIf$B90rjs7}N&j_DyZ7lic${&=zl8
zfuHGlkHD^rn41{zj<ix*@=Vt;9o!yg%WgK`>Y8<DIMJGEz&5pVo!fyQ31U31hFckj
z$gWEG3h;`O&j4z(Z%$5hCT+6;vzHjuDl<_$i!919GL^%a)R~0fbq)t<DXGiJE^EAn
zpburbjM{LKe<SAWrA_H=JgZu3&n_Y;);=1#6S-gKBaMY_^|TUOye%Evw6yUsKaE|)
z8S=<(a4VX@q~ys!IUKrm7O_7<2x;RyJq0}IDiGdf5h)+VNj`BTW^*zvpz06z9WE=f
z2u=Xx?o#Tu1Kz89h~koN3>_-b+?WFdjKWbAQ_SsL<Jws^Gk?|Elzx|7BZMkBH>iM=
z+!lXLo{g7l;FnlCO=AeOtVx;VD(<+37-0oFyG*o%2Xs*UHBjwN{rGLH6XP)K5!N=R
z!b?|LG3-XUIeE-l6uPeFP|#o%&7Y%zisT!7%~iB1qM$3C6_P3ej@T>~fz6j63Msn&
zrU#@0E8!~=SL3WKE?xz67QZDym&!Sa@pZ|fk%=t4wvq{8Ybji=+<2pHcC6}e+qL-q
zu-h)?rHLrJV4&B!HWG>@3<k%~|GFKTrO>Sd&=X{M1{LvUKMiBwP~Df&tx7WR+X=J`
z3zEI)Q7YEV*|#;Do-I4$+gu1?Br#j*2)f0RZ^~F~gH(5}N(HTHy*Z@Khq!P%!?<@g
zZw{ww4)#0?<2SU>2r{Z^(a=NRi6s;%5}9w6qsZYv6<gCF`42KBE`3UzKGjyOWp$S9
z5U5-LphW}Kb*W@kG1qnk5f2|Q1`%7)QY0DGpDu={;%`UIyfnc|j|b#&x&$h;>7o*V
zF6rvhxjO%Q&BkCo6IJ9Lyw9Cj^}c9`0aVi`UE52u%~=O*So#zV@(3`Smy6bMGI6<z
zEKvG4;{^_?M_dVlSchEg*`2KU^Je(Y2tt$=J?mPkR3PKXpEp~<Vc}0ic)ylLB>A+>
zyuAkHaMGZ9qaMCe5s*mFh%uZizL$Eq*rdp7?t$P7@@=1V*;pl&65Q1yjPo!NLJH|F
zWdfdBIREP22~<J<B8VvQB-93dpp}7boLcx=rHBgHO{o*ika{sXa_ZWdz30IW9$1i*
zBwtcZT%<d)HN6_P=NJh_*0w3Mj?^dH!KxXvK`(uGSLmufc@20m-`jNPOuzTYF?0Os
zEP&h*_$T+%Xk1%;IC)v|Og+mUPnaMtKw^7lE$2i?Z*iiNC$Y~mhvfd^G)u3qxUv(8
zGcl7>ttCss%6!OB%8X2D0Ih!(YlUk!RdNJ;DgVSgc6low4=K{A=Qj_Dr7^LGvuOG1
z%)P0PP*0*fOm)!qIUudypM`PKIXHI3?r6+^ioDI%Oim^Lwjs4ApGc8iznENaG1e(?
z_(=rw5<r{`!I6EYM$aeD{SEyT8U>b!>ldr#7R546VTj<632Xm6%S`=xpp<Ti)e}X>
z(s|B)j{w@LCsQqo=^eWgmLmXAw9hwvbjaVa=MWskMOfauf7U$e`@VemPopCpWs52R
zf|U}`Fw?_zeBLH5X8hx7;&YwuY51q1uhfRmeH#?MZAxv6zdU=p(Yq$Quq|G;8^8UN
ze+;PpO?^c^E5Bjk6^-=g_750ZwKnPYcDEX9<0Z-=HBus)|7McB-TW0!y`^&>*9M@&
z;+Qx**dN+2xZZ9Iyaq@pkPj$dy)a8~oX3$}cWw9{kQ-jUIj*pIt57p8e?7r8C#fR}
zcA=+)oftQ-2uX_Co41ilL)K@G6&k<Jw{EU>qqzXR8D97<xl#?pVkDL?DMNqKzw-dT
zT}NGY%Fd!=bsM5fgr=P>P5o(KDkw~VIjMr<a1q{2JO+&hjlR5$q=d3bW&q(rtXU@V
zD#(}&p?R5Tvt3QarK;3nBrtRmRu{4f1kvRa<Hl>|@|+PXr+qg+7Qaf?t=ArSI(7CX
zK&MUO#={mvqnj&XX1abq+ijF{=SC-+H`+}p!xM*B{iJJ18;5zeIFAVLZC)-u1hPHL
zQi+okpz``fNJk^8*4M*zUm4{If-?krSqv#^l}-zeUL`J^A^b>fe`4(_V)mAkk_Am<
zqAqq|v%f6eJJ1iW>UKD>c8Fv+*|)S_W~Gh2Tc^tKCg{Xvh>07RU*H}*Ss>Uu{%Zxr
zDDrd*z|av%2+~7^oshr5BfahgJoY>*V118mC$>p$;NaPF7Y`VmiFoyp4jNO)5omzg
z+T5SFkX&O>=Cjq0_=BI<5^k%N=c^^iV9!~_mPCfdW900Ma=zjrwaFPh^msCe)@_A1
zzXi>HKWox%du-96^4;-){kYQubVx73mQ_l$lp60Nhtoj`l&8IUpM-FY@o@Sud19o<
zB`PUa_+O5N(hZ7Ma6l?6S)F3tcW0&Uv2he@Ml#Pv-`10QJTn-qryi`sg#Rt*IQkVv
z@sF{{XvZwc&a?SK(yj~2FYwV505eQAlO|!7&BC5M-t_1;YpNBbz?Y-|9oTRCdG@v~
zB^BcGw@%X-XB(Qwb9Jzr^p(e4;+cBrZ_>kLZG^*>dDJE59xWvLpp&2$7cM1tok0sK
zBYL61!m$u+8Q)gl1%;_NO}1|1B1H$nKV}1V3=ykX4|6?_`ctUZMY7Yg1@`ssYn>d?
zrfd6EnH{q10~sUQg?6yqV<s(KeSVhc^i1^7GT=AK39p|h-)R!J{12vPU+w^<JlR9)
z`EWC}<cyGfxfCSy?=`}iw+BU11et~%%Kl)T0#?I7!~N_Ti&8^dDI|*C-UV^(XDzj(
zVG7>u1Rtut$3O|f>oN^METGo;_caY(@ic6BENI45v=}Jwa?|Xd*3K!F*mo|jw80fG
zwYY~eBl_nuG@`gMbR)iJ3n;5-{6&=|TPb;ebFk%C?6EC`CP|VT>gx{{o8?c?O>oA}
z>?|fz1a3F6Y!$aG3C9BJ!*)I~U>~(yFW@{scwEJ^cz%93Rds=~${yX~eVaD(`I8lu
zghOd2Z{lr{Yt=)T%%^Md$f7q!JD%@_z6|ba_y-LpPO8^aH|)VubjZB4rn9_8jH!x%
zcXbc8>WKtuVer63WTkN=XW!=dp1lF}P-}0y>Nv)qB4lzW1CPxc#*D37EJ>9zFTBNg
z&wNAv9sNfK^*6MrIVa6Y7;~3cj<1*gK{z415h0gvJx{OJ&#O1kJa{hF$I8Ym#p((i
zwzQe@@2U1Y_dfxG4A#F91YSg7@o!1gaabA_Fp)U-sGe3hW(I6olAko~5K64Ant;LO
z*glv{A`JZzh9<v{g0rlycj2eV*sI-!(hgo1v5@`Ih;t@Hw?`$EBEG4!Q=zN2S~eBQ
z{IMV#)3JE%DzQ-@XyE5>)WiUE)n`EnO_P&S{CR^@5|}UEyFOnu0@8Wmak(cJ;dVJd
zRk2yIDZ>9SLK1<+)aTUNLJzpqg<?@%y<rUiD($-U9>(Y-9_v{q9Mm@huBuAs^nMQO
z(BlzGFE=;!7??-*KFHqmY-sCeIHf%upz883vI`RrG49FrW8&8V;a?cELae_vq|BV|
z86+uoQ~+~7OXgK#6X?ZUf=(cK-0l~0-)4#{H)(ai3z*rDJ{PYwz8d5QTCD<8cw`E#
zPfGNLx@A-U6{Yjw{w2=L8=HNT!`b)Em#Gkqc-DTjj8ykjxCh>)dMcSKy)-k`l%=0D
z|4dFF<*@q-;5m1=UF@5uQ1%65@I`w-@cKG=FAytTg^j3>=p9&-f3S%SvPcoTNuBIo
zs91qG@Wns-W05(J$Ku2DPGDj3B}=|28kR;}LfTn}*X%_*=aa%}KNsDaZYm~-Al_JO
zOLwt5GC)kyJWiKFJay<I6kh3^`~F@xfs~bYgiXL_WuM|YEoYu3kR?a2#snG<{u9xb
zn`NkD(BttBoPDDnwlADNFF?+|V|ZyT&+S7BE+OcqF{Sr*Z=>?qLBlt6c&4InPfE*l
zcgT{~huUM%sOS1}H<@L{vB>-m>G1mh)9NWrY`asE%i;I)7#hMtD8Wi<ydzk!w<H1S
z;{54qhs7r9AvN=2H;DR6oqppCW6mHbOI#ZQ?0GGNL$c;E3ulbG?$fen@*R*Wh4WSa
z`0}2$+f-*G_S3u2Gd(q$vD}F&S~Or`AC;|_Pbov9mp(ovLDTA&F;jx8%q{DWOXPT_
zFoa;Nppo5J)tbFhjpmtnz=T;F$dgL6>Vg5<^LV_f8sD4sN4C?85ZwGyxQcb~`~qT^
z_A^$yuN>%dY-*D)uHs}}NY0?R3j^s1xr5_CSZ+G&Cgb(GrDcKqb{`XUMYf%j_HAD{
zl7h2OpG8VA?70}J<da~h$iQc6CjnR7{IzzEQzeK-V_Hiz*+cB5{NgjvebD_`TbqTa
zvx)M3AoZqn<NEv}Fn38;GMVY{d9`>9^N)HzhUTyrB)L24ekpU#sX;FC;R!(i5!M6-
zzjnw9YY{eh!*1lj&aU!DujN|6ZF5wD@`L`I?Cbo|D5kJVnSgBV60qt3&(E8S_AW(N
zflV{QT@@{+gKu4Km9j;ltsmNnf{+R9#dk@xJj1=<zV9yYOqxv6f_{F86Xh;C)VDi@
zp<n^Wu}(!wlZIu+*Z(AwmC7Dow*(@sjO2A|BO9aU`$;F`33O+`s*5<jL3F5gQlq%=
zH|EH4Pj|>)z5}{0DZWwy0o)_^Ko9GMB??SA1jP<xo;du?y^|qktJt$#5heToOL*R;
znFu|A=8zsB!v22bFajS^f^#IbY@RZK$Wd5SCIdR3Mw4MbOv|J?AnBtQ+ypC|vwZ5s
z$0QS$req^YYVtyU3DAM_quIB(hN;5f+#Etx?X^@By4Jom(=nTk1H|wPcoJnJ^Y}L;
zsdJ@)@o2Db>I|Z?u#;rkzb~?<8~H2U5}TV8`^qEZpDuAh!$kh}%G@<8HpvW92QmR+
zD^NEjsj+;+j>@J+s`@X{0K~z<-hK#+y?*UZ_z|E;HUC|H!7<Ua;slTqBP_O7ASGp}
z*%obkw`@9VZVI^FMm_Xkj}w_P3RSQ&!7_+~lMSjY%VAFhrj`-MGFL!eXPJrOvu@LD
z%l}tCuE(%_#mI_pqVC{`t$*lyRR3c56YXt#(cFHfIRRdL<VAB@cA)9R@r#~fp&*|q
z$2&eR;JxA6#sWOCpHc=Xw(e=O`Atyyl0ySTc@Krm$2-4DyE~Y9(@Nqvp}_EqO0<e{
zXAI*`22fw=*xRgc9)AQK^yF{ISA`(H=S$buFWtyCMX8P}j1Q4+<LmZb%8K^ajD12)
z;6}MP2H(c$lv47EoULJ@uf;p7csvF@jgJmD>cr<F+&VE&{%J5>wihd2TN@qhxI(oM
z1O&X+-l{3Hvj8wwzrE+9(+*w_Ar*rM-g7CPGkpQlk&Mixz4>7P`i5TtXfGixhQ<I>
zV`H@M?Ow~JS1>02tM8~HuplLkPPp7|6#AlADbEYZkMF{t)V%tY!{L^-I2!qoinc>>
zop0Aud1R*4|0t8pqt=^@5Ta|)pSJUAI11nqVy0B&D3sJk(*5B58v5=+Pnw=Dr%4>J
z&B-OT2}jR5^(3fyhCnKh$ugUo1PB+(F%eK72WY8hxCfo7e~QMfV4)AV6NgDC0Ge=J
zQZ2h9E}oy~AheGgtwB6u8YXEk5Tn!m*x3wC1&L?DT(S?BT9S3wFXZm~x97pH)5UCg
zu>M47%dR8!ZF@7-2|L1RD~FPIq=9ka$;ZkQ45W9tq@^!r@4oiUP$hvc(RBzLf-ckX
zq!d4J)p`p>3pF}cSgd$GU7b7$ZgxYug_oBY83K#$(^fXf#7UW5*;`^$OX<PV5pUO4
z6SypcPX8E>Z-fRl-(3w_Uw8F0vsacC%_5->Ekm0WXc>{Aii(>x>N#&U*d$H2ptQJ`
zmWny59fB9#Gg9Us{fiFsnzx4&IY6G3*uGehDjz6s*p$BgP4!mGK0LQ;)472$rsg`9
z$z8<yXtY#D;}snK)DmTeSpZJQjeFc&mm$L#<lxF9%03WEF@i~eN|UW*ofC>^76i3w
z3?nT~<h{nLJNdXxXLtD<JJ!O$09^NU*R%e@@tSUNT#ptXS7nTakiTZkgQ}P03Y{}!
z%6dSd6db`(`R}eAUWsfoTP3*7A*6c6+HP)_bSH;UDSp9<93Eub9FqRyIohXc)RmS%
zq>>FiOZFQ0%QA!+#L-Zal!T}0Wc^-i_>H3avF>OSpSW7MY|trP?*WKX$nLuxhAViG
zf&sRdWX(?D<)d!q1ISxwL?QbFsWX~ON7VUQw@JGcQSky9wRBj3Wa8d=MZhrWT6UP)
z?NcbU{;!_S2~MYdp>#`-Bg>3b4uOZ=gj{f`;jHT}CuC!&OZ@XKj_TK5i6{(aFKc?*
zpF;c`2+%Gl5VwWDSOtW;Me^l~k*3^+UZBJ$dT)@ATz8gyS^`9#ZPE@H42E=f{izg9
zNSe4A<ZvcUNRuX<1{rB|=WTY$tkJk!B9Ne<fy6O{Jzm17wD8LqRi8AKiV9HIo(2(4
zSkwYhOy3dpn4wz6uZv;jovGi=Z8fg3FCuB&ssD2@BMw;op@Oc0m@EYlOT2o1LwHi|
z5LvdqXnQdn1A@sgmZE}>J$YjR9ZT;M)|v>YcL#&oMXcP2{1O;R3T=nN;EW6!?f#9X
zL)LC*VvwDfqoo)Nw}ps!t-d2`VIf5729nESWWpvyAo0V4oB4m<%ur>Xm@8Kt3zX3K
zJB~aODyqSVzTSxci)3?p4D4g+=Yw}-`BFxtT*`MLpU&OD=PtCEcz8aaAW|j1XTi?Z
zFfy(_+-GkLCA@>$T&DnZ>}?h?;a`j+a7gA#XXYS{$j!+U-$?B;q^)<Qa6Cx9&U<8n
zzQU7sM(a0gAO5w)X5U3z{3Q)hiR0&EOavbuJH;q0FfOadXp2Tb>o1yZR|X6u`osir
zuB0`EFB`(cEsc3^cZQFsCf|{XoNBXXhL-2o6)B5<1pWCn0K#OgEuvMmv-B#Qkz&oo
zpMUlV43HQ~wO(`I<B1$lEiwWp(RC03o50BA*q>fT=HA7c(KXi_>m)w*Q0G8zVl<2A
z57sHuY_qtJ`Y_Qc$YQSX{49-pfs~Q$CQYp;^OwP<a>ZwgJ_#OZbWm$rpE@TiEn>^2
z^Hx=LDn2g=XQtFlk~hh9{d8sMCW3rGUdg-L^z)mzs)sVV!2>-ak`>(z%Mg@Rih%b7
z5wXXydDX{)c1_34-wfJH7#j*lH5OLZYsFOAV-|(%HJ*?Lm3+>|FQ*V_7rYxjxXzT?
z`ZmIW*I?+iZyVl?T5;e8KH2ptDAg%((Y9_;MMOubcEdf;NJ5xo|3xY}p4iS%FJ2TG
zU*$||ifCy6<Lfu%z6^~kv)+X$DG&>#%2bQKiQVJ5sz|F99n3090-SXhQI0j$d%vFM
z3uog?>fb(`k3Y1sy3bIN^)kjsqO+C5-<RC!8DxI2DD(baT0!Icko^wg=AIZ3wk_1|
zld^uRB=M{%X(G>jSJr&b48{a9+{7WiX%{DUXktSDfAQ(ArbeI5tUlOHI3t<6YlzlM
z_tYKoI?{~5Ux3cOXA26r7VbGDlmDuOGiBtuRVEz<g6|zB2LT^|ak|X&2+gWZggdh0
zYSGNuSRDTOw8p-=Zyz0u)4HS$De1p2ETS@?75Tc`pSnEb_ri9u*#iYjNh;Hfjuyg0
z%#Bt)M*Yyj^q(Lt8hPBE;}`kDp@g{tO(-7-EvAB1-@5+EYL{`)@nM`cG_JSJ&zW<g
z^C(_mot`(rAEGBr_@Id)4h?P?5CD8}oL7C+MbMij$bjV!Vwj7Q3wLGvzDvE~fhbbg
z(#pH&t=CQ7xzERG*l5tAFMhcV?1~jo+E6}+8H?%hfT<$fueauxa{ve<uCy}(V(jK%
zkQoSQ>N|iP7Z!n$=*Cc9L-i^||8rVt1&qLNU2DWYoBs;E6&l{-bFw-SPK2gUWRGE~
z$NZm=nK8pRdgF<5Z0MS^<FX2VcV1%l9c{hnz4T6Ju(|m4o>Iwdj&<;;UH?!#Bu}UR
z|1rjAJU#M6UpJ=}%ZX?DppqA6Fi<z(O3YrF%H$KpI^J}uJil$|R1T{F4~12*j}mz!
zd3nAKh2f-oIEoN!A&!GUFc_}cy*(FzH&9d**-MqoDBRr{vZ^PbAD^$A8&%Q)>Cgb4
zV#e|o91S_s844S%f@lc~?Msn>R?OnOXzMo1otgfA{wPzH2?;Y<ljw>%oun;TY|O;0
ziA7&fXVxzwG=L#WE=5~odOR6E>8VPL1+ns3#zDnaOLp;o1n1<~ZQdBKn5hB0ZN*tB
ziJgTL{3`i)^bb#mv0~Kuoch<zq>7P;NRMy#%d+CSO{>rx*aJnV%|-yX3X?3j-42^H
zpXB*JPcS05#IF}$_Si{^rG1inV4Se|N#3hL{{PzBizl_0k9_fgryFR3qg0H=JJNH)
zy~{q^7mlf)MJ-{x)@?xf0+1E|J%$dYl2z_N-1t_gYNH6-p9YDZsztv!V2mI={Fa8q
z7Jab>_u;Lja#1ws!B4g1O#Ue|75S9-^w;x&x2Lzy_x#0yiUXo612B<WkXMDm2^#Jn
zF0?GM@%Wj4rJK(fr`Xq{5_3hjAoZ$V=Y|<wOFBfc>09^&A)=ZEjF2R`YgrW9S}aWo
zZ@K%5z`uDVu*p@lZMO%6KzlprZ7?2^?3TePM&EdXU!W3G(&H!LZxcrypHN@8Vd_9+
z>hTziMk2nBgSMmgg}2ms@-+jFCj<c2xcs%8EDrx=PK%UPMs?aUUE;tZ^zfl8M~`t7
zmT3XNuZ#34B0@nmRg}2jRc`)UO!e4a`JdrStS^cZ!CD%fAD9e~6Qn8_h}}*af?Ppn
z;wC27eiMpR4u(dn;wdYa0DIT*8>dZME+&@SqmG%t%LfoZ!^-;cN}Vn-f+`<a%_Ei)
zR0M0^mvZsGrTd~cX9xjBup<!)^lCy*(%R<aZb9wiv<&!^x0cJl6`iNKj6GtmEkYy5
zZF<uSN`ka|%ryJk%%FiU41c@iIVGYLtFC|=WN$ICw$uW26Kh<o-eSLmkiEeW_d}WL
zU>&EY-(b{Drh%uKmai5D{3ey)%-FF4VTiL#VHc!!tlcBiBXwWP-CNuA)i-*^7<U^`
znc_@jarh%w5@jKFd}*L)Gn`I6!G9;2R2d@9z@6bugg$G<q5v?frtkFM24#imR_tVg
zHfNnOQllps6=0E01arGT23TO!6Lu*}cH+$i5_UNVp@E7!RTi3e3kgCo*rH+Zs$#fb
z-Wfg~J@99z1?VO`&x6mWi!x6jU!|S4j2kT(hMA3o8D!eWf%#MEp;C;SA`aTbM(Cyu
zgu9byS2$qEXuhg3j?Bs4oxbXXACw@ESi`C}=_m+3YUiAqCv%c*^w*~%#lCNH*y?c>
zQdDl+u^VtY`(*7*z=&5FJ&ejx1dMlga0Xt!#KbGSKScUdoYWubXzu`@PK;{=_&3+|
z>bjI$CWVB~8I%@gewnd)K4ln>6g12?R;;Ze>brwxMf%777O_c2XbSDY66jdG`9Jgv
zthKm)Qc-9-3Hyrhb4n~<DOLRPmcEZcYIzrzWm%o;GKP>$l<0hW=WVtY<6S4sozO`2
z<sER>1KIU4@Zz6$CJg5mL-$}!3@>FR&K`$}<@kv3;{;H|h(?*<nUmLRNh(+Qitokg
zgTY7fV~4bFoLmaYbUv;UbWulfl04u6`D@Hr!flP)d_eiZ@Ne|A_q@{>kx?_i?}-0G
z^}m!S22Vrel_$!zdBZY&!BhYOSC?9<#=t7D!OV-AeQXpGMETMj6~Zls`5Ta$tFAtr
zhm*uY=={y|ZGTmW=ULh^Mj;et&=Cl%jzFqbKe{R+FtSdFxc1EY7uHq-1WHjEZ0Q&X
zyp&5S$rD<hVRL>2Dq=dyabWN2xlmwt_-w^BZv5n72<)0Z?aP}F5*JBxMc96;{}8|*
z?tdY91sypZRGL|00`=L>t=z<6pjL~cxDKS0CjwFSB%jiSzLTPlTjGWRYDCe=fL8=M
z!+|Ful2uljLE)zkq)?Z@TYma)46jk3Kg)h{wy%<f!s~-Djv}#C91EB^G`Ogmqj!Fo
zMrqjuR5;%7mDYg;+UN|IHYQ8*D)h$!2uRyUZqP;-CI?8v(}1Oep2X8wYT+x=ItVql
zL}@ts$6uTR>c5V4z2RHNrM1g|bi#ME#`MqMbd0yb;k51KMyUKh0QX-0wg~lPgQT&w
zu<~xU>_|eJ#AXid<iJwajq<&dMQ<TbVeMCH2KRm?4CGVpE@CY$!N%w=8&tXAF8-L)
z-E+qSaD6&lUN0lTyZKO}c;h{+<!X5C*begcn5MQabF7*VB;DEy(0XiO_~hepltD7w
zP!mCZKq<-kWMMr0weqwn491z%J%|dk(vRc2)0n~t3f6cT#aUbYBC<!;;Vlpzi%5Pd
zmTSnC0_9%}J|56c+8F3x?th=2<vR|WCR~7iK_<*ZO{bVK(4&;ofW>DAS@&@bB2`(u
z)?alyV#CYv0%zx9C{?RYJc^KrnWerWf9BV27TC1bWn^BG!ygv#51j1fIH1L|4hFSy
zv;jkXH3k&l;=><%K${{Lmqi_GvU<*S9X$=f^o@<|>4!4tvTl<_WCc!o^|&c-`eqRO
zNps%N=tf*wPqxq`r@8Ca?|2K2rwxIrPeSRH4M(FO3CatoGPK9<DNoa&QjvirNXg9s
z{OJ@_u_9|`lJbPl5iTx=hoJ`FGnJ{@O7ZUJHJCjDY>a&J<FTZqH4bgOzdPuu!3$Cv
z-xwvk6j@0>btu}|AXC44ia(D%(O4A!gvRU;<hieTQ5)h{N9TqFN_&mEX(R(YoF+-}
zs`)AYa_YXVkfap^%&qbB-@;y6Dw%OcV^u%%*+&`3P8*=C<1S$M`_|AIN~idx^>j($
z6W8P;dtW_R3i+wXV5-$=>+X!#tUpiUhCF!PKjdC6$hUQldn-VGoXKj*u*3Cs>mjXz
z-L^_eKr1tvu{<lgHZBC!yCNMj?xT^SP55Xn%{L`90|)v2HuMym4D5o$$|X~|<o-kR
zFUUNEDB$roIZkZ6E$CyKt(T59IYb|(yHUCll~v<t9KD{v(Ly(1>h4;fHLZi8Dw=yU
z#jELWf40QEe=unVdT-5?k3pdLZP_+*V7cGsOVz!&O$kUyCIx$yG3_TiAhduq(l4*e
zs3tw#|6mx%kHi`E!v75rRFiU|oY<zOSyq@Q?!CIqVqT4Omzc-2oWwd@{Ta&~xp9t&
zcybX}8`i8C<D!SElg9(t#p1a@Lw`V65^tDRgkM}^stjbS_VnitV&><CbCCfVyoUO%
zx`_CWoOp)~?c=nGLKOccEK}h@eLYcoaxM&wb>iVSj#1)kRPxE#?r1Qm=a3{Bfw7LI
zTWh>ra-nM;^viN|b&fgGrg&Dg|1`q2qsR8-q7Z5soyXg7JryoJ1;zG(?P@msXB-AE
zm}I!kqMo?CY=pPH5QJ`?#qjj%%`(pbVV2ifMo#EYzgnkyp`20GtJoG4%O5D%`$;&q
z3;pIQo<W}e&@TS)lSLN?DESHEbITeLrXz}c*G#C7tHs)p?#_C6y&pq~ssd7>(ZG;7
zUgu|7rm!!d+$HA#JpM-tj)Ft|&Im!3!#g5dRY)K8i1<(KyV9am^oXW`@1@vsKvoXl
z4u1b+8<(r+5yQkzz1{S4?Ha7XH`T-Z%}yHzJ<I3<YKyk_AKep`<rzIKz*#1;X^LQ2
z4YyymzwIima>}zFV4Rdy;caNawbVosqA}afmAuLjk+tFCTki>_Wc&dbelt_6G|#PV
zyyp}$M>ls$DU<rM!T~d38$XFXY43vdCKOB@ViLQ~RlsOIjh9olUYbSF$-4GaIpkK~
z&y4NVM1fg_1^r!DT{rf$g;l5jlN||r#2ZB{ERKOY_hO|hJaW4~>-*SH0g`>qaofEt
zP+L>)9!tZPqUKc=Gf#(;dV0V)UVJw3^s!j%LZfSs@-{jdQa>Y(6aP2T6qPFP{WWT7
zGpJPW99IGRvdE;dWRj{z8A3?Tuw=MrsI>triKK9o%CL`6ZELwk+@{4SVE&4x&mgl^
zLV9ygx;5YK>EOqo2w54RSSq1p0JOaUd8+QlxICwmPXt=8vSEmKA4&Bz08zLasrMck
zkUx&d6A%jkHDITO_oA{;t2u>~aY5$T-F7HKQ*cw~!c(Q%Gvkc+AXgT=X{d?Hz<U{?
zyBh8qgN%%Nn@g2d0GdXObi*$TYoTQhpyv94{m+onr-i>=HzOZp!!meXgwYs>)-hAM
z#i7DPqH9vCnsTn?i3zu~4uT&Dfu=2~IRtbae_M!2Al17!`eV3QdHD;KBbauMXrfo8
zWc3rOL|B$A`@}AYr$ukG96yF-*r>ho6jPQ#_~9)B2GGP8enPB<v}*rKJx!Xzjm>H5
z-RPqI*ehg6|D>A#OY|sJVyP9+{9N;Dk(xNtsqAEPdMUjF!5-#I^NLO66;`wskuJBO
z$ms{fxAqi%?c(R;E#VghLA(*;`2Rb@Ri?S)qZM{S&692TPc++VD}tVjT6nJ9bBxlK
z5GjcPc3kuK+zqaF7_eN47KN@VIDLn!cnI){P5W3Y8G{z!_f@DokA_`cM@3nY|HgiM
z65Y?L>w7&Z220`j4Ua!wK?)P=zi23AMv1T{P5z`b#_KFAu(T#C1@F63jf)8stvYKE
zV@!fLl_VgrwbNk_G2#txVs}JntNJNU3WK*W3!rpK16_Er+e7pLvL<Vu|977J0n863
z8G6N==#F*5ploZUoZ<6r{RHV+r+_Cj@MW6VaZU$$#M~hMj^CE=#W)iN^Xl7WxskXM
z)V3Npz1tQ_PD`N0SJ|bv*!-DfBKrR6hoc*3{67R)07F2$zv(=BCw4R*OKwYRf%Vof
zZC1(+(gWMMu{P8?#n>smzPi<DMr;9%Bc8;P@7K(N@wx?`lAdI;2j)e4jY&i>cm7DV
z7J}G8k6fVgBEw$hu^~VRYwBdTI5tSEDkFvU4Ml(^dRl+Qf`#$8FK0=JGjZ)V*pxRI
zPc!7;nW2k2dXHdNms+yZsnbj=2I{prwtz=8#zBX&#Wo}@5<UY^U=sYPhNk2hNQtN@
zZfi?J(Hi%Qpj;dzY8^zj&Yxv-7lVGM54}wID;`H2!{bU#MZP{iwH-@qi{5%f!mfl~
zLFNW)u`Td<gfm%U!h>%~p#TI7i}*L)Mg!Rtwi-hRV=|T-!aQydJi#S_bQj=4)HGIt
zu`V6urd&q84q+Pr!yiRXekY6e0}&v7w^!7RMhVUF5;Wx`zUTr=MWb)3&U<UMxoS#M
z_JQoja_fTFdU8ubaY^0uVm(&T`e%K3&n^qH(Ld%_pvdt4&nr4p8!*?b@f&@8$heZd
zno^||bky#?nLogrL*~<nKwu%}M->1bdI$QW{}^jlo|ifqsSpr>L7qhOok8Lx)#m93
zO-`mSeM^vZ$_mhYYpgbgXjKhGfd9w^Oj*1fHau<b6*S(VclpshX2ZkyB>ICu5_9|I
zKlbQC+$4RNAbx>!9d%;}Ki{o|t4*q+b0fRAWB0&fX~@a}-URy?wW!}X&A@aN9fubx
z=VQU_Ui~xA^U1r^nOjow-@bhgb+@GfRfuM(dxN?4z%SVFAA0WnnLj*B-ee45+-ae6
zyUGsPx;Djz3`dg8x|kc*b<&@)Bgroi7KFOfb2JuJn}%&i2$y%{JH@)J7We!3H~AYg
zHVV<XCn$s#5jEVt{+;`-r|Ny|i1ad>$V#ICI3?@zmj5M+%F+51ux#CleUcpF=xyoY
zXTdKL-`;l4(6eyW?ZoAM7YZaS4M?a$^0z87|Ftg6=Fmy(kgA05(<cn~T@`H3)JOO3
z?8@S1lSj-%2)M%C_!ykl<6hWrg9Kmjl(x1eF(W=-Pb19x#oA0bOQ_YrRJ|>(7l%Y8
zv>UM@V<?Oy#@E}8YhM1LijYXP^?1tk{!DM;X1+q)8ZhT<mVHh<Hp_>k(ZjKlFo~<`
zACfb_3hpd_cm+}DSnTID>o$3e5_PDD2ss+2WqO_QM-VSas#LURYwJO}`hFM*IMkYS
z`@g@f5SwTUt(?3Cbk!UQc`Z_NQ^h64v(SWBN_}qkcDRbKDGtw9spFH?Vh+QEzXA<?
zz8X!mrfyS$PTh5W)Pe`uyS~+G+);x(QKzQ7tC4HL=VAXhO=;YLOrm^}U+Qz4B}SZ6
zAS?Hl`A|y73)o5|oHRx?)%8toA<+590xmH<vx$lr#MUr{x^EyKkQ25^a74i5A_}MJ
z`nWp0CxVV?A~zU`;W@Aj_xhqublm021!7F>4M46v6s-=r<xny>YFTN)skHr*FEQ=^
zT<kL?P)O}j05OuZQ&o9*jmD@d+c$!lW<j*Eac8#sbcu=Y%)IEHmSL`+%%Z~$W1JsI
zz}HA^*t=b>jLv}hYEL%TA<1i3PIQpHgc*07V|-ho?alypdHI%=c0~iC?BqE352w7(
zs@916&BCPohA38?`U?3$VK4|%wu^Wn-J);~n03NmD{MBl_az-<kdc5TMo1by=+#KR
zjl(fD_r#V=0gXYN4676Z`b^%!agHoX^ooRJ@w2Dk9!HY8i(?zAQIT%o`v&MPyod$C
z2tw#f=E-XFa9;>;@7cB1^QFWj{vl!o7sl3E$m}te=>k#@D`cu<fVduzB3zYt5~Z-B
z3*#n?-OMn0r?%cGV1Rm=%Z|FU`%JLLemmck&Htp`14-I$R*Zu<#-&T-+=b`e5rPzP
zOtF)C)Gajugma%(XKT=$%>>L%9(RV{fCui@{K+t3-7lP~Jr^><5NB7Y#XTM}2L;S#
z-6@8Q^)4=P;o`JBIrx=A{U*fxuCWx0=e-~q+hhZ{=G$34@W_p8)M6Y00t+m0NHmNF
z4~h%?8m!Jq2#4al+pFWeHjms@q>W&ykB}6WlM7sEis8c}xFamsc4kuu(MIGC<AO{X
zAH`s1zdo+K9jR&FJu@kx#K2H(6_MPU6e6?kAQx|k;_G;4kyAK=G%N;W<%_%5j1?x3
z4eT@6qswT1xyEN*@iGE$g($Lb7@yT^HL2|yvwPLdq=8pf^bovFZr|x15z6BOkcmhY
zQlNm@*me(0M*@B{u62M#0Y;=}B*F>x9ztAAfa5wX7Ar+RA37b8fP(L3jR|s}*&~+r
zseMMXow#%&QYTG&smD!Rx<14%pSy^?Yv-T-&5G)OFqw80KG5=SOzMmB0hMF$kfyo5
z9sXj3bJKg+L{}ViC_2gz>ZcZKs?nD;g0BZX96E--GpIEVG7#ddQ3uE{Y+y1edbL;c
zLda)n*p{znQq*SO6iFBCqBC;jw}1@4%F+#xwrWuJ=|**`ot>-@G3adJFEyeZf2ghm
zz<B+kMdBZhY5mVa7w^)$`wrcfOdIO_ZmWhFRnEvvEZr`MFWjT<@a&6zzf6F%Yv#+y
z{{u+TtRus^m^Hs~jzEgTF^K(DecojG%n@LBPUjmq1lv%V!2lGBFx#ZD&InuwC(`4x
z1oA%J#>1LNC11ay9D`uf6}~;aueN-FU4`1|lI6F0AEH4rSgjQb#+=4037hgM%Ic&t
z$!?#Tv*L@H$15u*LK2iD6tYV&JFM*EB0^PIK9+T?T~w=+F&tZ!$I@!WY2_?%k#AUl
zG+n{WAIX&-9O!x?{(uMtPy$S(8?qD{WPJiC0tKULNP4=pR2Qa@Y{oS=M$1ZD-oBAC
z-o541MtJ&FUJ_>3IuYSWHewzMMcCMPbkHexcOIDb^dWa<piR#SRqGeXXr;;bQ4OJR
znC!PgtHDudYl7+a+dV1a|KUoC<{ofSg~$?dVd_K<6~B0psM9Z&DSPY)M<z>Mk*`hh
zW;R&PV5EmP!)fibrIQWR*u>DaUggnj2L>t>(ot*Cpl29kd{Y}JUZrxlPt(^4ql-~K
zi&2ih<r<FMVl^kRW%JtxX=@;w!9y|zZ-4&qu46$yu~s0dIWM73sJuO6l;H^!WwhnJ
zElv@fj{km_1{U|?Z5%uk4GsX4ppQQ-S#A36rPtcR7X~>Q)Zkw4pR7=`o4+dx?S8HZ
z{w!NCQAV$|mFY<7XTJqHwEqI@^yZwpr0Vyj8B`!)@C8FVqRBvH^wLZm2Pfc_tDK8r
zH5ZNoa|ZtMu(^5-&KRB>bZL#xzLAGaD?BHv#P?C<WCrd|R#-=6V&!s4<$OYB>Cn2t
zl_laq^)+2Mj3IM$NO3wO%M}-8+?4QGubpURAGD)zl%nV@2l+~2<L=KaX@(F$%vM$x
z*}FtU0uOZpsx|V|$<?=MOM`A5kCqZ&BAjl5%xil3jJs@-HS<JM>-}KDzZhQw@~3EX
zviYD>@0e7wFQQ=f*dsa|1^c&>S6a<$q{spV4w-dWj6@~6(~0Vzq;8>s#N&b_DuoFU
zqa<JCOm0IpalMEH0CDtGR6Gz8z;>xrOrurM`Vz`7I&&1F5!cG$JKhOjdj=0;1$s2b
zd7IUsZZNK!kstk<6`_?^Oj5!@N0ewPC@li52|Vk89;1}O=bH1-c|1hn=0DcywwbB?
zn0=w_w0ji=iGgs=+&&32df3{F)PzlElwL+4M!1o#knOfsWKcswL91_y);|lby)trR
z*ax{nFs~L_3{r5d#(QCSyTCK28f2H3M$Htmj&*NQMZ4U@fV<nZnq}w1*}4e?`vhk}
z+RlURqHF9`<saw2%u$z??RiMEC36^-BLg0N!&J8~D0ryxjHNA9IG<#f>ab*U&yV8}
z9p@V2Ydk34+>gbp<ZDx2bLEU*NT{L)M~plGdD_D=p%P*Z0uT)Mc1*f_OhiW!B?DRx
zW_u711n?#`FLf}Y0>PfNeEsC_`R(j#)W&c#hSOjx2SL_eOq5$(Z_+HDW^?gd_u0%i
zx|9(JgRO8CyT%0TASd8~kTs;il@l=XlkWoVMyJgdw<vc1pU1qy6bJuOd!ZEC<?_Gy
z(7hz)G!ge7Yq+v%&|dt(a-q5<u6vr(8ZpWlu%v{eCoU=*)O^95Yl0aZYq+wcu8~7Y
zh`pR@4N<9t@boYZjBsXEfsBJ}v1L9noT;$>6OyMx==9=TO!3d>NCcCmDVl9hVfki<
zO+<q2UYsE17BY|KcnI+z{>^iS+#gvqVDMHi`mJ?HwQgh1;l$u`yamQMw`F#jb5WM~
zxcE&RG^BW*iH_7D+YyOs-maF4O4s@o5Na0Kzgi%z+=|w=#!g|uK|DuM!!g@kl!B3y
z*(BKK`KN%T&)1Y&6QbLU_m;VNrTk9vx8yyRh1S9GR;fwRiRH;KBmSldVafWlLAkfc
zVGl8~7c-uQ!rw-7wFR{$eTL+Iip4Dl!Esnw%O{?JWcE2YL0O&R>vKA&5cgWZ1O9(&
z{eum#{m}zLk^Ga-Sm0hySoj;uH@y_8eU=E9(5W^K?wIj62piTIzl0n99YYvLHPL~=
zuN--SfoayI-ELZJXDPcP15bgT!a0e7ImmLlY0(~)^)a~adKwRq>^yGqKtH>k0P@0Y
zGa{Q9L_OEgc$}eC>WF^SvrR7hcpMacF>g(07KS}{!haZ(I@1s+>RrlXI!_iZgl(>f
zfWzXWJLVhWv=E85{BFl|yZDz^Wzb_ceecB47WVHCHmQQxT=49wa=@Lp6*b&WWg_bJ
z7nR|@85-ItVTL98A>&kV#-B5*qz|o$<nAVeYw2fiR@)%NBMyT$zD<PuCl(6LJ1A*s
zOQ_^wQ!j$CW;UuDk}|&?P%9!$(7j_F$*J5OPZb3bml1jRv-c_V2WSmCd)k*jQd%kw
zA#psV-f7!B><<A8mu||uhSOm+hG3`xJNlYT_)qE&3Nkr5hepHd)WdGd>>ZFO=NSj8
zjConB<OMg>cZ@Lvf`Y!{KwXqTk@7myq@|1<0SAo096(jn@WN`X(9)u)OWV5FFLa){
z{WOcW(wb)E&-W6;`yRlC1-L3tuezN%a7$?BsBvg>Xy`@iSLLd+aWL3Z;%S^hgnqV4
z$rsjf=5_I+aa2N@eZCxR8HWJT20-TFPO2?LIndQyWXVlP(jj=E2e^v*g8bgtkDEm>
zlpSkGvINmza3C7rR>b~D+Ce9#zM+nc@`WqyfS{@*W&v>Rw4dwiy{wwtDl1Kc%#g<R
z%9+1S#z3ho1dT72bWBioO2cubHIr&fj*En=F)6f4Yh)lSON&9Ed>gVb7MctCFSTXR
zZ$=~7FfZvhzfq3Rc+eZims7z^CopdF`R;HZKVYjmmQOKVqL*KNVOB;+^jEaM1QcAj
z7l4z*2as&AJ2Aj_p2SBg4X$L3H(kbvA+)r9%Ai@n07AhTaJ5~%@)t%#>;cwz&(63s
zBa|~abhe;(TIPH~T7OYN70GDHyjS*Zwnf_*M}OpBcOsPQ;oy3xsQKZ8G$UalJNgX3
z>>9%C(3**FZsdpYiZT2@aDCu>QTlq`n6JC($?;4kN(0NIbbs5){z*F8oJ}FAQ+f19
zu~cDeMz8NVKkcRCsJ1g~3<6`eUz=k*ICX4Vy>aC;DeVaoAfev-vi3FHiG1V&09q*I
znQI4wIbK8R&Xh1^7h~Ql)-UEABkhF}XK~mpV_d~Ts7?+o2&$|6rzh@Y>TK0CT+!1e
zlQF*#IN)8Ai(1$WsV~+(M%xprBur%EGtES28OJk1JE&k1&h~`~A>jl#ov6@srJ^6b
zszt$o=}FD+m;TVfmE>BHG1hiOLyjA&gw}G6uF#4KGA<qN!*Zgb%3e|RVw<}IU;)DT
z7Tq>kdt_cy^54>s%FK^^#_>u%yJ)G;5g6Pmcs8#312V2@hGf!eJl1a>>h4mn_4il9
z*~2my|4#I+t9}{_;8W7YEp+YtPxDwm<Vd2h`b~41oE;Ku9&-iu-chiIqS2ojk*T&Q
zXPc+Ca<||i5DeDgs{^Wa%Yt#(c`jb>T=w6&uLGFXPbs}$3dnRbcN`PSSkxto0a)$>
z#DwhqX>IA55!_YCQJ2qtx=E6e#G+?IzO1OyX=3=JPH!j*H_+Kp;%Ejl@xIIv!HjDA
z4=KYT#s&eQVovBd<B}K#`909W3^mjgmHxc81}ruzlMS^H5AZ=E00LuXy{Z$)UGZfV
zsVR5onb^_!s*Mv5!jGHkB34a&K0^+CE$2u4PfX`tGE{-7(nhfwg%`4oyUkt19LO@n
zS^x4h;7s%u#6^Yp*NAR;>jLK`SkoT)L!s_a0w=RIntE{6Mb8XPa@?o4#r1^1W?T3O
zWDqF3QIGJ|n=!VK!eZh4qXEE_GxH42E~uV5HTG7rx`-rao4y#Ws|o6*#I;RAEH^uF
zFOF&j?hl7PXDHL_r;TO5Vu}y7J^dg5Q!!(%NcItuzd>jHxp)lwf{%kynf5h3Oi3i$
zjdq>+d^lyL=Jut=?(I%xYh1(PFh~8!<{sYt6w83j3kba_9eWTeE0k_Xmv{-NM(Jop
zmP^9@U`>)gK)3+20p41wx35?CDq#%lzi;yh`O$Xh4*~NN?6r6?^cy6Ps&(aV04Fth
zCl&`wWqx|=^cG5bDD#A%Y!49ILOyj}6CX=-I0xbGDD{lc8f&7$IIh&D`*2dNln39C
z3aAWK!&wKx%S#g;Tb-Bny)>X~|9+!DxZ`sSupSxXEZVpe(+`P+jZ16L-?@IuKun!j
zL4verfnv<hRy2D0p|H{F$|&IlXL(3`-H_PHmdh(U{1%m3UwVy{{$ZwC6~E7P!2Glq
z{#aZ{giLd>ZHSq+fD6{h+!&r<L45SZMFIVKK8yt^a*ekvuNThg<f`X#8OdIe@AyL@
zE9j+B#LPk?tHEb_^IMe6TD<EB3vlov`)b^sy-Hrq!_{svYX`a$jloHn7meS*%(ev@
z&lbce>|s3MQK>8daqK|kRgL3jUag1ic8~qiN4+GGr%pP?VuwKLtoV&Os`K!XSJ3oR
zkHpTB(TApG_$*B`hAW$7>}EwG{9+9UBr?8Va)|P(DNf(b{QvAI)N4jHDWgaCWl(z;
zUjT^VgTdJ1!N4RM_`;d+_6ni-JCiF?ptXmDZ<Q?+J_XGo=0tf(CcPQ(?~U6Vf(Wj&
ze@%gYPNAV|bg+dACe4~{0sMYEu=)7YHQzHv5o^iXG84jWpGd9OkTOXP%@GU-vd~lu
z&L!6R;#<(<<PW}K?X1-A^(+L`5n#;>Y=21xTLCU-@g#9Je6Opd>;6m$bH=pZJn+==
z{*qMM$siI_D3udUKJ6NABF1l^<`dG@XdJmRv<-|!MEB4**{WscLB6+v((!Cd7$Hq{
zS^4qaE4Eqw#K_*&b1)g;9+MC!>G!a->G$DxL~H(7<x;+AMjm-_x^g^PJ@~+)Ctd%m
z)}!q9W+S`37q(ELllGY>n_>rONiHqWg%|psGdcV!jm;Eqp>{z}7gx%P5uI5F-Dr*#
zZP4A~Gv{@57Ng_RGnmvcLtyB#WVKFc2w+N$uV;+jM-N<jAG&$T<rQ7%^qttgl@8)%
z2;Dg5xO<{#i~w}H{!hLD|Liz5w;-oEf23IYLLp`0l-+3MSwWUi255T3x+}Zz>ogsq
zMMTU>&kofzPkQ!0K5BsFGePZ5jZ(gQZ)%9ZHRKz(chPKBCKsK<7r#rj_$cZ^y0b@k
zE7DzRvj#S}(Uc$Xi*pbsFg_QR4%~fl@RaLat*Cgh$kqUBnKs3nafn+~9YdC?CA=)g
z*P9LX5LjhBqi{9Ah+YS;4j!<iW3qOt$pvo+CBD^<tSS?x<<o+V^A@*jIYL%jMr9-`
zTb|QMf`Z#s0)3N*l?fu*Kf!n^jmZI_FzsWUG_O0*z`(O272r!{uaj`$p5SRE6}1(p
zLnlUZ02yK{p_4S}f@SESCUj9a9^UAf=T1AAyV3So-uVuMbDkX_ef}o;RMyWzXIazj
zX`XK#aOlVK{e>i3%4s0#|Nq#tZaRkU)ik3VRK@y=v1z3Ub{mQefXy%K`6*ZQqfmQb
z%%^S(qn}4~a|No=2nqPlaq@D=Y&pRW$xa))R;$%+ITx?294~-oP+I1nCMt-suutLw
zh29obx8d>JvSFY%FfNhO)K2t|qu;eRWZNSVDgZO@xSZkbn-Q;i#`RQv+EZLf>oc8>
z;NTWQF2ub^BnX3k<TOTm8MQ*q1SpdK1S{49poD<wx?U?1*>@=hTY2#;iBLP%;ZSFo
zr(_CpM>0<U&XZVaqx&O`Q0=H*K(jBH!*x+x;;O9AiY)$C-;FrRIINwxRCZvG%+&R<
z7=Kxg?c55iJ@hMN<lL@JMIOD6Juz&6LXstU2(sbv=a`K6Bg3bpR{onhGnQesVx%h1
zI3Vf_jZpLW|GB(jbDa{h-$+C_(J^QFXdbfuTm8X%A4QHPH9CT2<?H9U1)(xfnzu3J
z7J2sqm=`+BO$Oe-B51^)3U_S>x(CC@0kQ5&F$wSZZzhQ2cPMTx7U`$9J$mKNSR)rt
znSm9zo(dA&iZ@OFt!?;ZrSUaZr{HOa7jhY=bByWKl2MaFo7UDIiOvKOJ#V;PrnhIO
zzFSsesPrTNg)um?zjf1sq7j(t-}jM8Es%1lgGL&2vVhzX8WCHd#nv=HSs)q^EHGK;
z`S#5oLWTv|t4l|_5JXSp6)H0XZoBaN!*%34snAWF!2o{A!+Hi=LYrGP778vt(Bkr5
zj>{+`D^l`VgO|cr*ZLPAdNxj1n6p*I{HH8_EzQCrlDdh@eoYHHks#Alz-9=h@-CTt
z3e>dPSytY{+TsA=H5!I+m~3J_RXjq<w%MRFxTC9L<2Q({beT#l=~yUV5q=F+q;%a>
zysbeOr%43hRSY`@9JRAWe`vk^jiRtfU}KoO1c6H^%Xogt+|dYaZMnY&+Pv9)Z_weL
zW>&vO!hIbGtK#eAE2Fw1qf2REL2@_JoXPTr{K_Per3zC){)!==6ZlBhX%((#@>iuC
zHHH8Ne_;?X82v>QNSuh(l?07(PsY-dg8lSoo@v(ndR6nD7rQt4@{MG9pCDr16UoiH
zw259$k1|vP&w9E^>>q2zLB<>q>>>J`b=FQ{b_dTM17`cH-cwQZ-aBRE1<r0}d}XCB
z&l*8wSFZkUvif_~*EP*EM)I>M^imiyFGLgXU9^HRfmo@hmo4>IDs4u8ofr353ni?s
zQ#h^qFD5B!3kX1zfyt8ooPgsRl_api{irG%c;Scpz{ykn@cDW}U|x5zR#ZdWd6-#8
zobGD?R3I=+(S-q%SaSQGg`6(D%Kc)%i}C9j2%YR}-C*<rRZ~odfV#K2h6dA=64A&8
zw|5!>`OIE8u9a{+^rm*s>go;TnfX8HRAEluu3Z19On6x1U^q0$<;Mq)<xMc@a3D}q
zmx<*N-D8bqHtD+nA<8c7Dq4a}IDFq4i`W?7I|ZBx84>%%CAO4XOqHTCYptaMQseb-
z=8UkGlEe$kCehDLN)tz;m)y+{SpEvd#i2A0oJ$CM`C^#VpGgxJ$W~S>yG0?BrsSCj
z@q&AIpU=p1Yu{yfVV{&q4ZUh@f}OQKH2?{PR?}!R-lwYKUI^*@0_WQi9B{A85JCV|
zer+^1lgGcd)YoLJ&C}4_%Z<%N$N@%~P~}w8SNeH3O>jG!YAM~b;p2IFAp{R~xVHoF
zb~{2n&s=<5erAkoLOM>SfF)bVEkyw)+xDpSWS~%Xsg74;8jjJwNMLB7lcWjz?=k1L
zW<dGoNuVRI5D$a0L4az<2XOP=!3{11Xtn}@lk#a*fbM!DId98*4&A>JCtM}qlMih;
zbN{NlnHAjkvbAk0ROh>X--xX2(Uc^yI4Y^j1jtmzJ0{;PrX+@e%)ti4T8SN;?v%X^
zQ8Kz!6x=sUf;d}Zd|GEpjb&>`k}pskMp)Eni{FLd%?}N*5Oj@92A&uTs0pcsBavd2
zUa|zhh_CZf5NBu1ciTXi(aW}hTiR#~jvC|aOEF7jrXK7OZwflX5xce#ZM+g0Nx{HV
z*0^h!Pb0IHe`Ohc`*Gtp>&?SusRZSVecRNV3gvX=1h|@<IXiUu?iG7wr;Mf@3=GC5
z6+RH)pTr-9?b)#;k<!?as?U0PU%m`7Jh{B;kB+3pkh|qOn{yb+wtFHV=_y0N(zDpL
z^!#XnEdS&44YRyzZE-YnUBbGIfy?p7?s8-VFlZ;rrv^MkD_;%|@vpTFlCSvIoi{cv
zk~O6aHg(pwGGuFu;afM|JYF#Z6K73h5M#o&Z6U)g;WGyT^VJQo6HJ0buH8653jV#O
z2K4%p`)JM_gGX13ZF582>XM7SY0=+tfk7$N>mLcW0<DQ%W7|4alA?A%aEny<^OaTH
zj(*faTK#X}(uG5Io+@Yn|E>CNqRX6*oOYGksMu4c&Af!cXl7pdwE1?ne4;|&Hqq5J
zM$_U5YJlioBXDM-J3nzi9(+mD-sX_Xev~A~(yQuz;DzcDy}+R_WQh2+i3K}sDJ?W=
z%TxFUs)1;QO8z|S289r9edBEkswbuddGZ&uMO;9Fe#d`x@o^o7i9~)@V_gROl#x-U
znnqlr(99xlDxziN$09)B@sYN4pWk(zDiQp<6kPdxi&k;D=3mSM!djZdj-G?~fI$SX
z`CT9VsP+w^)x5G1XdCf3%-<(+baOga)vIi#G;RBjSy8HBssMbmP(FA=xH0`#1H%^b
z10X@Oi?H$~#_#3#jV(I_X2Ln^vgAntdn!llu+hMX>3b>IF(tz;Y{g#@l%3BAi+RGm
z+(D(kPa&=B*w;49upuI9b%R(KqOTFXPkQf9Hqi$y-n_Dm4bAz!QW{1b(-b$gl8s4L
zvB&_MEdt#h%SsWo1j5n_98txYxj3IDLs1N;7Vt+1R?ZTinLzo;J4mXgPvTHs{MSQf
z@*Qk;us{P&V#GNZZ2KwMQ}me+`6WM8ObN@`sryr@ZdG+QyfNF1LW`aa3OMyv0;=#b
zhLJG9$mXFSwj+nTC4Mg-!A8yq;T7pq5bk!V3`Qabn~UDB=6;>#wU>`swP!wW_@$FM
z`qjcP$98hE{|=D&F@uqL)J{oD3-#Zii>mm=K#FX0F|0pz^`=a7L1M^JKw!<C>p8l$
z6D_ZpTr+~WRM1i$@?$c{T6Vw8$*^FL`?<qF5ki+f4kE8D<retV<B$gn6+MxZ@=9a2
z%|Zub^PTGH)Eak9Zy#!4<o!@xrf0RPL6T=Pl5cNV=2T5~K(13Ms`QygTIXlA9u8!(
zd&Tclb~~oG%tOOL?*Nfs0hP`Z(*|=aIVcB-d=ygCbqZ5@3w}tP4XBVIk(pC9dkv>m
ztPldFh><C|Tt|eG)N{&oC(D^#??8^{G9d2+DGd<Ig@fc``NkPUnl}vreeJw8N)v(I
z&r#b4G6V8#huNhOErYmRJCtMjx!=__|5yKVayT?y87Of}5847C>f6(ea`}QgWip6~
zo6Ng5>t7-fVY&2%vm`~AghyvqSRvTk&F8YY`cY;Hd0tmi(Eq%;kZh$v@{Z{ep@y$x
zr-vz*f!dU`k;N+7<cg~9{Dagp?;-ZcuG^NUVwoURtYF%yWA{#<30wW{Y_h(4YAebJ
zXZ1erVl`?0?0w`z<*0UnU`|a2TL0^g8qnbYSACa#Hqo4Rzpc4Z;gqoZWb9}4Hi77D
z>)2O$Q;2<!!q4~(N0>fK`Zwp{e+%B-+A{VZ$UCpyM@)%7a33ART2`<?Tm1TU&OWoU
zRUAWlYPdKe{Lu8x|E|_Nty+#d)5*;H-0^?0Zh*Z4;CNC3B6;4rQ%oGrA(_`#Mz8MM
zS^s28%W?Hw)1<&>Dx1|oTeOigkdhIaQPM3vjW*ijf%#YHjU0t!Y^CGoWxeaK*$xa|
z7)Lm=>OkxWaW%o(e;N;=u-vXEIs1nc$OT5KO#nJ$U7+>!Z!pDZGP$&jJrMs-3qM+)
z&(B#828nb}83?t=_-!F;1-o5bM*N98^XJXs@I6Ka#{(wuO6J)?10i-oi^$VR{MTs&
z#J98G4-P&Kk6NitI}Q-^d_TIj4~3rG!wg*i@i8c{h65R5G^Et0C<e6VY_-kk|1N;!
z>`>m<XG9-DSs5~5<&p)a<WRy=ZyC{yrDuovgqu&gRDD@KuiAbd_A!RKx>i5w)n9Qt
zvyL4dpRiTBQTgjWG~E;LHOMN!0BpT!r@E5r?o~>j$vOT%lJ7yjjbY<e6>m3?r1fn2
z%O93g?$QYLE64Ur3q2}*t1|-FrzXKB@C<XT{I4;8%yBHn`MAueyY+LspghuYZ<o4=
zT30<^s$b*+Jwj{O`a0gmK613zj+l+8_?|sS=}`X_J~vlzd3u$U-aW(9v;foY*Tf6D
zVS#N8)DntgQ_?$^bFE;n(^|*F7$MCjkQj|s9TFG{((og-hau@g8TojqD>iEMqy9r%
z0ToCQ@SF(9X`O0U%d~9WK{J4{;p%j}{J*4MIM?FZeB!v3OPadryR1jug5_}|ubq*E
z*05+wf~+Z-MI_LemSP@rUE6gpfJEPQ05{{znVXtvec<M9<2l`(GNM)Q0LW8meC8MC
z1y2S?bR4)wZ%$e>hJua|=^G7RbX33GVI8Hq+Yp*<yb{&7Bf0F{hh$A*SJ+}KwA%wz
z6SKbnguZhfRxM|E@{GWo+YAZElkN1|r)$;vzQhp5lk`u*ESs93t1e|K9PXQg0@jKW
zo&Hsa;_a}o%C!f^0NF_nj6pkDmC%Uu`yZ#A*?EeEJM^W1*UGVl$Lu{crzSc3UeJJ+
z=8e5M)flHNDJ1JYs-5AMsQX8mwuMOk43TTBA;XY2ZP!(6HovsclnV&4MZs5rm;Zc>
zC{N&Ud^pJA2U_7gsD(C9X>J+;C~b%?cEXv95jrLMF9raRg65RCNTemg7I=Ktl(;I`
zqusAQ46a(>Y%jy9A}R<^500mcf@Y$F&GxwbLCSi8K4A{Qc{2)H&VSXAI#R|NE||wz
z5VpnjiTg-B<Z96EJ1G1w2Fb^@e3y?|p@JMObN)c~#_+GXhEXmm=&Fai#xU_g{c8I0
zIFBpPnfn6K(<RA(oyGnY2&qsi0J6*7U+_R;`52y{P)vqQC4t71iFuoqK~c^b55=Lk
ze!Hj6B62)@U{@}Fj;)RzqB~26(4xk_r}*dE+mi^sav;kKSBDyOHU8IKRtg49kw|ux
z2iz`u+v-IVh3W58#t2%vG>x2u?6NU^1LmpdisBPQuVRWe_Oi&sLVM++%I`I_lXXng
zgbN!z>J^cs3<!P6;Ypkik5kgd#|ftmme~M}`RTVYBxp+G6)M()k?2S2O*-)7gkjt{
zo_Df_hR#1#Y~L+n?Dg_S@2tdRt;YCK(#UC|zJm&W>HwSrsrru#PJ|4s$+rY;W{G~U
zzQM%yp;G@+)kWcfX=Z<ny8w_A7#}QO8RZQ0IDz9v8Yd?bk1l&?(SNh~mb&43R=e0e
zSDPJ^1px4UD1h5P)xJwC2_A~`diS8PSIzZqz5;HUBduHN0A(JpWewJlvh#GL>qlz(
zN=tduwM2)}xFvp&wA8bMTyg8^%>2X02RBsZgdcZGJ|%2BNipoyl`+ZH7esHax<@fN
za^(~u`qY~0H(PnPrYQehmWXX!6_DXMMBr86s%!aeRE-UkZhW}aAYyZR8ZVR_sg7hZ
zyegs0Gk2hfz`G`GIgOyE^yLkkiUF@<wmeF$`uRGP1qBQMyzr<#dSO8(4$6Zndb*Re
zo<Q0IS{PC1@}iJo!f7q!Ix%*6*pEEM(gkP$J5lTS?VsaV&>4Ouzu^tRSHQc>tcmF+
ze(4X=3!%PUPKwujDx4C8nZ4Y!79G|EZq)u&2_dI){Jtbf_r=Eix5(OT_OAmPsf?*q
zMsVehcuQSN%uU(@RZRQM@iN;cuQ(M_?AXz~=G#mNe2|(J=b&Nbe_!)(w{N%m=A$7V
zcXE^|FuF<HTA1(dc@!`YZH0Kl>*X=)+U$1;v#Z+Te`DBX+Vqx0HFUb5?)EM|N%6*I
z9{KE|ljLKpm-1g-WSKOY=epR`<Fmq79{$R_my5L3lp9jhc=ZIycGE%cL0~bXZHKi-
z&{)4`xWuH6{aF)VBkHV7Wk?h6D<~ldgHlVU1^?8mYf5aoFD*gdD@x}(RUo^W&aI3K
z4nt*gUp*#i&?`exv>0PYXrZg$0x#2Mbh<K1X88T5_1y*<=e(WZ6Gx{>`pB$Ud?vQE
z`ga6~TWMujBu=?vWKzQ^Cy8pF`g*@gw6$o`?<Zz~QXJ-;S^sVR-TMX)o$^|M@c57C
z%UabmkzZA%H;uXP#%b^h;GBG)*g&NqLX>VAfJ21t#A%D`J!cU;xo8;ki;Bmb`d^An
ztZy?3Gc;$lZ(yW3J<QIta0+?n4YuKMTq!7=hH=p=1Z)LBYI#^OBv#uoQt9VWjKLgm
zg>Oq0FD!3NvL~OAgJVZ@k>t&d3=Z*i$_{5FpR8i(Es0aANXoTU((9KGxX7>zJ)7Yy
zXi{~>ptoH7QwB+Hr+H)zZYbrtNuz=g!`?f}5K;x&seU_o-WkBTZNe?O%(dP1@9M8`
zVuRxKz$a&WxI;omkm;b=Yy_RDrXj*RrO=M1aZ;eO5u1r3nq!r10(w(>bPd|~e}XG@
zhoQ@RK7qi9s{HLhrYZ7rFkZOh%~_*SE>kUeq_60;OFcD(^4CJ=;j~gl62Q!UG1<A|
zfwhy*1$3V5SWhVfJDd^z=%S$iiu1W-hP@SxJ)mSpKSGB1NSCWyf?Fnt@*e9B(a-yF
z`fgK(7ibEeVpcMO4m_IT4<8xcD*K2W7&|lB<-xVxU!<AzjGknN5H~Qs!7lx!Naf}p
zJjU^ZX$KTMI0=buc$v8DW~w-=YCv5q^my1z!dj{P-^P~_V5wGJ+l1KTKb>?1bK2ys
zl!`nzO5j?vO*M1w{fJh4c-ZquwmHK+R_6a8mlJ}ib9loQAJH>q-s!fZRbXEF1+eYn
z8|TzR-G&J@pqV^U{TTorwD8=W>xn!0I}fOK^HD;y=<KDG|IHv-L~#F2W}Fasv>Gjj
z6Z&=5UnnZa*5WEnm45a{oI<X4-I+dZCh-sg)GPi;pX&(f8m&CjFRD0Os=W>27H6l%
zS#V}bQJ%mte~I7XLVp@Dq{?vM1RJNh`z!F(sPAzRF~QR6x_uGzq>+W=U9l{OZqz*z
z<ubOzMsI=m7EuH=Sg`#E5{9*fRLal?)sp{&4$BE0@6$CQh(mh}8bp@E6`Yk2`2o(v
ziB+C^X==uusgIve3ERs5(tJ<uS3!Q#IASXZ0YPFkatex<39UI7DB_e6a6^BCkjr$Q
zP`#l`gpVzB_;M}O8l>gEvxf_j?&(w&jb>Q1TxOXT&62VON!+1^6(QC%np-S<1lzro
zsVLgCo&O-O?->AOPG_FWlra!Oh)_WsvIVZJB>BgnFI0;i3)>bO!DzyU_z<oQT%#U8
zrpm(^u)l3<Dw!uoaJbNOaU~YB!76`geOaV)(G6iO(YMtCxa4^_g{>rh{_P6^XNFaM
zQ>^DOF<xIlRoc~j;_)zWGoadDv;#iNgJ77ZrYrSqLe7zd=D!ollWP|4@vB_9C+FZ%
z2aB*Qo6oYjkV44cG>{&%^_KGvHUS^uS8C85;~tY2R~-U&uW)O_+84(!nO9S0@LAcj
zbm^DhM_^3*_7{Xgg<3l@L)fq=Nku^dG1U>nT-XVYvq8@%`$>ZhOqOoohAW_+*KcW;
z;WAW2Z<r-qn)=_dK@%v;>WF6L_))WK!uJsDgMByJ(Ig_Q5cU3hS|?>G!Y};1OF<Wa
zl*ZFL;jvPM9Z0z#V<R%<U+cs-0D$<+!i)gnpZe4=Uo4y%6s6otr0J>}o-mvLON2AZ
zn|BT}4*&f$ijgzHWo~51hu^bcZnzA1oFg-fo+uAm0QmqEvPheAq>+?blg9>&<52d;
z^mjX2^m#4lqXFk;+yUc_yXN59ep=C5wahObG$F5YAAvGn6)$5UV+>{1pBiVz_9tOb
zmdFBK_M*3Jo6LvaYI#7YX+$VdcPobSbCsfF|E6j;b&$vZEx+p12UL%_#F?SRoJ;t-
zFOI4MfY1BnXamRlx?Lh~bO}jw_Oa*o1z7Imo@7sKrcg77j6mG3P?-oF<~gB7>KX&i
zCx0tqfXNKv7M3X(VCs31%8VqWM?r3J#m&wF18L42t%6S8j&rju#yTsJlRmfT<!DUE
zO&OQc%81~U=<nb<e1NJ}yrcP!suTaJkvk|Iz-J&VaW(1g$|!9#B+y7%{a3@;68<mG
z;WZ#!W|olMls(UkTg!)OdJ{};I8o_7A>7ey6^hs#FjmJGc@t}{hka&QFPE_duhiU)
z?;Hl67&dOI65?@bx9aJC&3{pw>p-kpSvfaB*O`DGmsx!w)~f9lfGm|hW#0OG$-=V-
z142jyqm()@?0BxNOd0xovs;wWjW|jXocB=rg2A+T*`A-3NRHfYS`3YP|3fTrKMIXb
zG?K#cxR6fP>fh6mDa&6_8?BAtn=9sSu_IAxd|e4HW&pQg@5|k^C!*dymO2ZXPwDS|
zAC9c%^yP|n@NXUa!bayuU~vIqi(?$2N(US&ySY(+*dx}clBHqi7S=V_Gj&AZ|0|5-
z=uTQV1)9*Bh1l~3D*|WQB6;Cc=BfbOz&&nyHN{wC$yd<p1-@{?*i8`V22;w+4pCiF
zvPk&rKxbfE`PrT~@9M9GtYwdOD1LVq*jS5=#`g=UQcF$*WK~G{)Y|Ccx(AWf^a-V+
zt{N_rwm2cZ?<8>l++t+VRuN6{6kU(8vJBW&5@Tz)HGl`0svU;CpvC=zn<zX`B~yjW
z8p*8yBEL!f78j+`Qx52*Lg!0QFGF_rjsz{p>kqbYpImcYZy7HbT6fl}-HfU;R1rsp
z;oeks!J{U?L~D%qU}^i_H8DL_X3++K6GUSN^b@2_(3nE_0ZmhmTL+rYzOa^L3TdDr
zfQaDar*f#?87YQc&ad6u7xN8yJN6YnMO{y@SY^X&VFqfINC@cBcrSV3dv>*q?_m(Z
z=FN<9cE`h)p75<(jy*_v`5--K2N}{hfxYSRP_0^YDWvZDJ9UrKU6}Aht}mhaTDFQo
z_i0!%SwH&FGnbP@lt?U9op2%?B~u;NL8%@}4v{K%aAAiToYhwUVXVI^zkLEc0|sv?
zB6aR2$vTHd-|>fWpH;Xg2eH(M;W20TH5~InE&jo|C2bk<x+9_vf_-`!5SkIh>n{m$
z?s6Jnl)(8JpVu@o$?J!CK-!Y1ZqT+0Vrm^ifzQFyWm5VcdI-hUxWvyg9Em+{dY*@s
zOKEeC>oA1_!Q3KV34%Ht;1M%;pD=i6Ggur?O!rEM91TGi3ejC(hk?+80bvBdidCM}
zf#7Sjt8lNbdF(zP6-*ba71{@%dL7ZPn7z*LZF<|l=CfqFI_w0wJz5bq6Ps6{$?Ra1
zTyJY2kav+zk%KrDIqw;S(6f!S@igXp%4V|h)U+Xr*+h+YNtGJ^#or*BWQ}KaR;e*$
zm%OVXr{{HEJ|3PCLF0VrsEN{hJRa{})l1nVLjR-@{AZs6Ve-pR9d6)>#Nv?T`02ih
z$mEQ&uPKq*$}CLwG)~i{@qD5_Q8p+jfoZBnnGW$zP;Xd;R7~tfA@&@Xi{YDp*1)$a
z<N^Zv>wcwlOCZE*2>U9k{C5$-sQ6y?`-9Q9GNj^Cb6n?f|8)ZtZ2-9zk|wczdT8cP
zP&oInM{XDUq!YQ7K=+%cM($Cy0-?Z*MY9wyK<1|xa`81MKO7tE?}}`&aFCvZpb)!e
zrLFpP;DODs{^)cQ3|Cz#3QXqc1O>*1^=zMt6*6Z$#_&d^26Va9{V^)bkpfhh_*mPV
zp)9*@36&yS7T@t#-so^A0lc5YKA!fEx2Fp<o)B^2CdszjVHT$U2dW`cxxocEi9%Jx
zRVMIqEX|ya4&=aAL!dMO+=cLKEWeC1@;3S@uGpat7+$5o;~)LsW><zllys-9!>Z4l
zSkbt-Vfb{MU*r&!F7=@|B3GHDrl;xwiL2tUYK_z=voGy4c+jkuEGz4Qq!PrCD=o#i
z5jGcVp0$F`71=hHOI-~h?xXQ%6|zJGjNMMZ5j`E^ZDQke+SJZ~{bhwZ_XD1Em(2Rb
zqY%%1u8Y#z_`bfVJ><iJ+Zqwk((&ob&6@T_iK40)qp^11@Ue6V(@rTKuSth!*uE$p
z4Rhv!B;u+vDSyrJ{GQlINQwK~v2j}mb;078=GL(5p1-2h-%|rb@jvqx)v!$*!E7$!
zdiS0xR;4I`=RW><iHD2sHhKVWNMC&{uJ>7YVsoX9{SDNUIvx6vdN^%3BZKy`jOlkp
z$naK&bT&s_=cWM@Liy2aA`!|rI@}YZnd+8gvkXr};n`QpPWi&XBa^<rA7PtdETJnz
zKDS&aYZDnnHdcu;_V-#JErBsZOAme?Pr7rTBTRkP&pl^oN3F71JFoo_h>D^a7*89e
zP>IQAY+-RHd1QCJk`J`GX_8NzuA#NA=S14|=V2?{?PWYymoy2kc135!-&J=qJ}vtg
zw|T^kf~|J2yDC{x_zV!H1X<#wg4n7-#6B&U(zKW;Q4TAg$49EkgzowScKQ0=gGE%x
zlggzCgx|e64)32;uOohNwa_VUTrX794A`XKL-PwAqo!HEy(`T<xKniCe@ekaoA5MT
z_Ap@z7ZlWT<^C@N2>;cRz@nqc)9i<*A*tVZZghP|GqX=1mxhS39SpP;ZssCDz6@r5
zRx5k4x^Onkds^V})1CpLC{*C5gh?l9l#+rwo4i1jWZ1l}Rsl)H;CN!z5~PL~NcT(&
zq@pTPpj<(2yzfxpX&jN*F_XMpZb@paThAW%`Z>cxB{G0q8*yj%`}ce}6h6iZcVL8z
zu^DKPg3)48j}K0NRx36<9}HIW8mW}ciIsxA&YIczsJJEWOa$%h2Jp%djJHu#O|_;y
z=FP5?cURJI@#)`1&<goaINJUx7wqUq#Ed^oA0FO>oeh4cwKEmAd7Y{KoNH%y(o5!5
zW>ZlrKDs;XQL$Rwf;~PapdY9KVJcjnFyhL93NhCPn4!yd;=r=c@2(~5+9&lkhn6B%
z;t&uU0&8<CM8+uYT1OGL-_P*`DVqF=4>=*qyM<xQpXnny*=wCf{!JV!c&bp0+=jN7
zs3hx91(F*!1s%3wGjnF=lZ1^Gvj9amLSFZ!a|Ea0Y^$pCB)trNLcXGjuP2W~|CcXO
zy9>gP<Nw$#meTYIt}onP=`1MUarn3MQXbPeH`ss(O?|^|!S(B<Xi1C#`i6V;5D7p&
z4)M82ix9V_oo7-2WhVfwSHzCR<(yvYjjy;!=pwflvPnw9x8{wWA=1y6IpM-9fsEwa
zg5~q<{E*@e^Q@Z^?C!9mvZb$O^PbW~4k4~v7;%2aG&B4p1^BmImZQ?YKN#1Uy!JPU
zMQemFiTul)NK!w>-^)3E`#SgXr`M@GPFRNFlkN!n`<?OaR=JqXr6v67f?hMy^I3#@
z%X@6d-2G3O?!1&*JvCwKH69!Rh6fYr-?cFnpYK*CEJ>{KcTqaZzGN3t?eLC7<XkX;
zq5?lS{u6+?*D`+S^~eO(3~Gm}6Kq561K~`~P%(BQute`n|1OjFBi>7MP6J=T&#BSZ
zgLw8UprE#DB94}lD#5NLzkJ7|z74?sLYW41icJz~31b?mQWEHz=Y>Z>wy#6{8jLUN
zi1{>lFd4X##_@TM?*Tl$jd(vw?&BIAV}7{zRw+~07yhD{o<AZ6hid}4qSNG?Z^}Bb
zfOISlGKD$*VJE(vcDs^IO5ORTxw7Rh6mS~2WaEQ;RK9(m)tM+P{V1R1Z~5U3InqS%
z2fNe7$Ph7R#wu!!Dv*8O%J{#BZRR0ip#oWO!7wONN@7orMw?oJ=6TG-x*KZt%G<u?
z=T|~L6ogD=?(L)DF|8;$eP1h-cc5Jb*uk~0Ax?ebU3FJz&Fvn6arnQq<zS%820lP%
z>=v|+*NvbIO|aV80wKg_jNeO!R7yhlw!$!EDpqytpws{S89Nq&AOpE!{1$=?B3EQs
zpZDy{#2982L>-^E==$uFDXKyjijP>t+0Y(-p@aEsujg)WHiiY<??uuH1>CgHaH6DN
zMbnfH0i>Q-TXbo2hM;kJWYsit{ia96AX~k~Rjp>y?U8bH!Z4gv(K2UAj{A>Y=Klu8
zQY*zLF-nQBO#FNR>V|+c*dyP!e~Fh5-zhPRr0jJEaR?;x#toM%;>-4T<gfl!o~&xc
z$8h4$ZN&3C1}+5ZbX`Q{u&vx=ecezM4Hy{094e^15=S#q9W+B>Y*fN%ioYIhrE$@b
z5GD)i121?dL_Nn^ry4DitXcF)KfIiLIT28S#=9ab&wNYB5#<6o(l&<!4$H%EGS|yu
zla9zb7#8VHfB70M4Ypj9F0wk5-mGq!SXe~yyHx!rD0L2Q{rJ6pX$dfF-yt`hcSCf8
zW?-&%`qK&><P*Kh&Q{4Nl|iiDX|C;HSl`TybV>(uTHi2lV{eU89!Dg=mIM-SOE8<~
z)^;^av@^VT6Rm|^(X=x&w1eMvE*RO1i7PTHdAf|xmEY)sDGU^>haZ=cwRp6wS;Az@
zsY%gJX~x#u6@eACo_xO#l){pOmi2St5#}q8B-|p`pZFK$>_S7>sG~q3ilXm}1Tjy1
zd2#<~Yj`SXlAS-<kO93PQ)oA((_sfRT4oee_J&aEVX(a!WOSl1BXt^e<)G?%Zq8xN
zXUu^xe)8DOmn$<nt-$&|{w-XB=-8H4PEmRJK-r&p@nUm-Y@5MwI@&P>4kjmveBdjp
zTj<iH;=<n52drE&N=_<f5~uh8Ek-Et{^lv_?C2^yS_ne={{1aVIXZ>osStVee$oF~
zvIP)jmcmh8(GJ@1kxR?N(#({Dc&YcJYoa_lb^{k8e7Q`$YQ3jbc^v;Si_xFgxIbDX
z=^e`%7MNYz5imgE!J^EKO4XhKLj@jymx`%V^gbbF#qQNi!Nt(p>^%m<$RV_gav2;i
zV}>3-W7b&!%PshR(1}~D;mMtmh5V)(5f3Xy81l2YlUJ)yc#)|r7!pn5MjALC?IDvN
z0=W!wwbuUsvYm_XDdockha}1(AXI?#dcvV#$h!3Mb@xH><`^a<r9IA~Jf+6Hbl%C?
zCMOT7jf9Lf6oq~U_f~Q#b(9^5wujyqVF~>f_bCXRHYDN4^*myCVOR0V6xd{VE=1GG
zd6jK&TT;Un_)Q5oPZ?1E3P0W0Is)dL-3))OK>i%H=?r-;?=4Iyn$bkh^GL#fGAR>^
ziK~f_xv4+%PT!wWl3IU69mLkn%tJoCh#3fWdc>K^M?>k~5s(w<Dzvr_$IjBO(E4og
z@)(2LBmhK#q%8u26sKyohoFI?9yO;Vb@cYyBuHo>kXD`=1j3CpBBm`1ica%RxxglE
zlEA;1kzm4Zx^+S26hy~ScZR~igV1jMR8E?doI6iV14zPFtT1)EobGLV2GfD>QRrXK
z(V(=uXt=m@O!R=f_r6kYYO8|sT7iEEBD;Yd%0B<!&4O-ps}-oAh#U;uL1V}7Q)$jJ
zp69^ST2j7ZcdW?@Y07j(BLZ%`jXT^~8lBQBtt4e~o^4DXsUnzMHgaeU^_f&$*HypE
zYF|;rnzX5r?=<!s5Dn8vEqqMoUa|V%jnUA!&v?<GhTyA*okA#PRhss#GqG9#U|1O<
zt;In60h1PN=_YCmov*XCIwkH*Mmm<pX&@4}3AMUB35II$uBUC--);7mNx)q6*0MM(
z(R=Xb=<+C>tsOL~FY%zoL#&+pAd~teE4+ADTnPNQy0<v#vzL)`NRnZPF~bwLPutTf
z?UoGtQ-Nr9+}v%9PT0&KLZU17n8t}%UD;6i$@z1xnGbk?+&yCQj^N^}j~kI)0^BRm
z+E4DK5lkJMtLngI^@VbINJ)espQIdoSNzWQDr*K&4`uZ&ko8Olv}fkqMdd8MD+gN(
zT1lL3gv~P_J&e?vWx4fz*+lEN?gbxV34xmJ8ajq8x1=F+9>6pBLPeZvCIl$IefBK<
zmDy@NGBb`d9P+~m(WNX>?^QU-!|||kL%|G$$}X5;QJ+bU`i;Ovb_P<K-@1l`V3q4Z
zSRSoz_U3=FL&KRJ3Pb<0^O|t_2x5Y(y8b$dCZrC9ufR`Gf9mXq(>Z#=+j8$D1#*=!
z!Mpi=@0gHD;MpO!cfP}GqStXoSY`PHxzabekQx9D9w7M*gxpb93!p0eE^5|H8o5$t
z+1_^2>T2p3XmW5GfU6%9rrk14={S^$i&cdW7UBCc<HDkdBu=a+)!h&x{VvUZ&gE@v
zS$lX#yONE+0`Q~sk+7>CPPBZlldE+wSPuPiEd?qp71M53wwQn%zyPLy3`ny3ac+TV
zJzWpJPvK4)?q}Ken?{3@6>fv4Lx6KfQLqNkr`V{2bE$rx<ME{Le8jI*W+MMB{tN|+
z<&ZR3EdJgy*|`vB!)^V8BI&WCoa%gQ8J><#Q|8(9zY35;C!XD}<8TK>7$A`RwYSMm
zk3pYtQJKVAC{r~yeiHl+srP+=>fV7SfcNqzTx*j>9cB(bh(^hs-l=}eEO71?64ZGi
zE!vBu`8$qQDJqutXINIF;%uO7F)FxWV_W)O83^M-Oz1;u>u0yilrj>=)FjSd6x~Ae
zLqVz^3w1k|!|{vjrHs!cy5Zvm&~TThFo{i%A#x7IUbuA_#phwn>X3GD9|h<Bz`c+a
zXJpVa5L9{RoDa+vw<D?NWcM@{UZ7j<i4otZ0~;T#_Xvau%W~W($e;^Qe?I+x1@v_O
zpLV~Pj{1&RL-90NO?EYTAUcqkQND`V1?K7Lm#+|hpiq3mDeC?wgowBK3-A;QQ&>l4
zNko@9b=!ak<MYU}d+S@uG(Wk~B1$YQeYI;z271d`0lmw4Z_ba+4e?*Cp{Lt+_~aKb
z0+sP4QURad|Ly!fp3db2+I^>KWV}{pn6+oEymaEJ1|bTmyPT)?_w;ePi~@!`G?nj}
zh@ffWl@d;`96N9nN6DO-{RsC*I!|lNW&+a&bm^hKcFZdQMiU(Z|H$tv9;nMH(rO3r
zfCNg_oUR*UxG!;~xIrVCSww-nwdE!i`#Ih$^?PGtfPd$`NWU%~-%%5TYS{{c(#_Gi
zZbP<CzY-5Q4V*CUcS5XtMc99pwaCa~QzL|E;+2{`0i(d1H<ZZXtkjPQ`;#vKnEH98
ztuH;-1=m`Xg1-C8&aocn>a8J&|DJ~jKFu$qY}S=@t?|?E+(kX~5_CkOvLflprL_$X
z69;&Ab&+d;(D4c^Q2Q1FSdUj&7~n#_R)tJOI5mySn4dTLm9DWh$+VB2%>UpWu96-s
z;5!m_P<BzZ?NknvyM9%Hdom{PO+ax%Kfm(=DI)5N>%Hj!oRGZ32Y(g}w5Q9e#uT<o
zr)2#N3)gz5Uvm;<$V8z9pPQG%W(5`QV;uWVR5V~m@`YMK*Ky0LlR4XhPWVU6nBI~J
zAg`!(Sef{h4MppK<}!Qi>U=iP1wkwAcfUe1TPDpS&_!V^FOn8Yl&P>q8uI}l*mOIq
zg775I(k%rHYqm83K<?4Feao{e&G?DFVe4;B?DkRfLrHX40;YrcC9KnfJa?}7`dB2I
zNt++OMnm0f-4;3nEM#P>?}m}*W|SUR-LI5qt!t?Q<AH)u=K91Mv5>3L=iMr%0g$aQ
z0+f@9yfzDI0jIlSW@Vnp5<K3FmFud(4Jc!oq5rnB@Ck9ykD<<cR)bB6)KwHv8yM)W
z_1;oV#4xA*fQa6-^dDhX1Nf`W;~CWj<Qf-iyCWB02vx~`Tb$dkSdM@^<js=X%&r!A
z=)UriUDFo|BlpV6q@b06zm55EC|8PMTtt(rQ;pWlR3J7$y-kqlTmH=bl4Op0O;f`N
zQ)s83?8@T?;y9yHJ}5+sK4Vvmv+#3QQ-#29NMn;Q&|)qVe`Qof#xk81yAbE{^NQ4z
zG8QQck%?UZQJvb)YZQlmIc{(`Xf#-w$3e`x%4je?h$q;J<#1Y(RMH)@S18*QhYW0+
zcp5TS;Xy2}`h6a=y4NbFM<eWQ((`8#+IbY4@Kf#$t48i7xT_h8`ZDKm9w4dkQ0e&t
zQR!5iRdGnltkPqg7Zq#FnOQKGj?s*JXmce|R3yUf-(wAl_E!_<4VIj(*iDVvSj_1M
zM_B7y$J|9){TN*gakT&WBQZjnkSPC;51FmJSTD_aUaZm3VS%gC`xZU83<D~n53IwD
z3A$>;QFPa8oN0Z2dZA4FH1Q)ugR9c05;QM|imb4>1dyoQy*xTnC$F_!79;1|EQA%@
zLhOFP4t{*0H7K10lz<V+Y=iyZ-Z%GaJ{xd>&VKY}2S@^}X4<?%8Vf|!TaY#f$^J<Z
zyf1dDUoQM+>yR0I$WjveDC=RG=;L7h#LLH=DmoYd<P=tpcbtx_p}(y3AH;#`?MI?5
z?_7C#J+OufG`i1Xq2wQ$mc%TBf*7h`;jfa5V|ZE#+wr>of>)Eexz(208~Yg86@4o#
zJe1(uuXx&bKSdwN1Y?PorJ>rTQB?SC$3Enn++$)iJA*Skv&K-{4_Dv~8i(t+58A7R
zP=(Nmkdn?O%PvP>t!8+NF+cC`LVcsNBtya?U;)TL&*F4FDfeVzZ_YNEDqtkZ%O>V!
z@y8Z@KNUd3dD|s^wNF{We|8j7Bl*(f(;&*tM~x_0<jJw1ozVH)%?>IDNKDAYj%kqZ
z@1L3&PKMX_hY@m(DGMa=VvKh8Y7jD$4#W&7EOUb+Kr;^75F+!%R{O-YPAFTe;FhO%
zO~Ml8TXQ>vQ+p>kZZsq5ulvYSj><wjaj?&7h(;h7Ud?P3etE!fQC;-y`^lIK?9_Bj
z9gG<^N$1VmXFRq1l4F3D{M`U$WsI<O&h6tO8Na2^?o3FQIbm!T(c>UiFFj&<%}l&c
zkk2qs`z^|S)_N_$8jLH$UjqT80(~&T;ujT6|1V=yw*5hCBCys9;j%IA+=0Dft%MZ+
zLJ4|wp-zmjk$)tR2!f49O7&p~`C*Mh3rSuINzV$WJbk7+I3I{gGD%93lnc~EjF+su
zkJ-?r>_NccMMpB4t&&(z6L7%UPXCGNc~%&;_q(UJ1OwvPNP-ua-49cK%QDj}dW4QD
zi%bBEET4#B>M8XA%dMxH!hhH)x0dK>?_JSU?~cl~U*)p+3H;k?cE4!-FUaV?GLV|M
z+D(bbctYU?F8$isOb~MhHG-PAp4jzZL;hLR=wAQyA;jnq;NxCzi<);E<4cCJ{?5SI
zWXAjwq#)N($t0`F>%b2Z4akD=;3^&T`Jc&b2prO&ef(yO;!jh-_1&liacTxjlg#o+
z!@nmxJ;5NYm%Y3+cOuF-Y0ZpYXQdmcfT;uwqt20ndiH;CGMv(rxz%(KDyGb4)2$o~
z#^h1yp0v<^6Ya5czx46;OKw5X^!ZML7o;HCuwVRX_IIP&qFpKakfn1aJ@qZOd7W_f
z(Uke4@?G)DRo?a&6=$Xfs%9oUKwHhJJtLzq;*108F8KJ`gDK|*FnNp?=}VR59l{tu
z`U#Uh;&0kHZOu`F;2Z~aelluEN&pQLVgt-O?;ScRfy4v$M*qtg75-u0!^<<Z%*)*B
zUHkrZjng@nW@1x`e5RW@k8X1L@CuDICu50zjP3ACE883mMdtkSFu$?d`Okm4dU+pq
z0awh_@&DzP+u@j1OAe3HXlG|DYqa%E?UzG7@?p(}q>PhYvl|Qi>Hs;1lU9t$tiu+1
zELR}+XE9vI4oyQj^XEM|{*W04PTWFOqe}lXIUhOmzHI`+R?Ue*QcjbeWya9uxtWe6
z`C~&GuJU5kUL^2=#`hK#d4^E<*kTJ=%y(#ZW}+N%3}42qaX4mBvmuNz{RI?!Y3Fe+
z_#0e;UMS?iv}=J2cq@Q>6LSCE?F{EtLCKPh1Z2YQp>>Mym46_Eu=snkZfn1B>4p+O
z@U>q=+Vv5pV#S#Zk(K6WkT-L`uuYC565tvfFO>RB#%^Kr+@;_qpoCG%Mp95rgwTW+
z;Jv;s<CO$o^L#SM%Y7Q-$Wr|D<(PAv8)TiPjCWg)D1Ygy#qZ+g{~&lltAm_#vHSvt
zq>hlD0x#;tSqcRSUkRvO8f<l_cSB1CRg|ZI14cqKjF-?1lU6*JZ76HoNzYFDun;m^
zT-U;q+fl(G$f+kYRFzM{+u1EZoAx{ki;qwmz4WAwu^y1$=h5*1HwELj0__OJHr(n<
z3F>hJ;Al_<I6oiXHlOT^6IlR+W+Xs3!I%#US^you9-rY8L;-hXE6oIlE*zoeFD1=>
zufOEMYzo|djw$B*$1~_B(w4yAYavB}wmgTP1&Nv<kXo60cgFn`$t$1d`lX}_UUdPk
zFeFvR6R7zW=ap;#J(Q4h>cp5BCIeZGqYYp#w6Fj~zWld=8nYjZEtuLlu!2^}lX3v!
zZmdI24$o@R;>~8ey$VL_g2N>h0~kMV<MKcWKw~rGyZN=zT9Czad!VHeZ7m0)daPBE
zAOfk?%V~Z%<<LqZK6>J4*^4CX;#_M(md#Nii$2c<jKW*kBQJ=ZZ((gBRx7yE5i~@0
zJYeRa?lpCgRv^wo#B5-MD92C?UL4|&U#l^fvVOb?)I^H|GD&0>KZKbP<w{7ym2Gj;
z9)%l#RIf(IP^-5k?=J@PXT%XcMpjLR@o&4WsY{0Dwfsev4Fq*w5M{%+f$c4j@0?sL
z-EIf`{HjTE(%`(a|6E2_|Lu6Zwa<@>V%UxWvd&$+d=3V+4-D<C#{n+NF}g?0kE`+m
zA(q~2xIum!gtUI%5}Y*TOhHK5YB)ecek{xp))Gw0f@kZqWEM=5LMA{pIVFnvV~<C>
z6egmHoqHRz@zIJ%%E4A%D^W9QrX6b1Ox7nailAU}^3?gqI$RVe;m4<_m=`toZ%o>d
z5P%~(^%aJS015;Hh>Q?CEPgn(2rh%d(C$afTfE!>y6NXt=k~AtJ{h^8AR@kn^AAK(
z*m?|uYUXd+8(C~p5I|NWPH_tbequE6>XK!Gvu4MBmmd|Qf-|f?Ph5e^TtU`|TO+#<
z->hvE61_Nt#eiopi+uSz4bL-`76nC)gi#A#V9sAk#&giEjb@kU133{7A?egcim<=Y
zf}M}J#58NYx|Hv<z1U94<H*kp!3xjLT7)U&L?{2|sXv;5CHIC2UuuE|BMs%u@lH`z
z<Dbz%)`s+E)ck+CToyyz7?Q*jX@oLKwFBs;yOQ>?$~0q!M<;yzt~VD4Ki)FKN-v01
z`L@RQNRL1E*lPix@C>w9RNt$2unC7r@h~KoOL`#Al((=lxuve}H5#+(*S$$RusaHG
zX@k>bovyG{s~Ypa8WO&f>|~{^`b~=?PRxOcoG|`Z$?1Znzk^pjH=SCveOD4E7jiWo
z?;WiQhAH%?>olbq=Y!>9)maQLa`rwroV;?zZyQ|O4w5sxZtMCMWR=Gb9RP|~cgeV=
zg}DMpz7oR|>MZwS?*7?|bTDR%y@b@HVNh`v?o-6y$oVR*?PK(byeo{4GM8uQr__bc
zTQ|cQtx{Eou=ie2`V{)dI`WL#HH)MV`>vh9RscuJVUk>2?*^_A1MpN)Tq>KidaIWw
zE~l}1H0~#!R~crtvrxDiW4xV61e6|&7Gs{Ox}5<Ci^Y?F{x-wvPn&=8h=&CHg{EDq
zoA=CAVh1`f@3gI)E5XFsCu`%!6EH!<F^t#YcDIA`hwXEW7t0RlsBYJ<2Mq@-un6Xo
z^FQXB8)s^Mi}1bF{_fM0OneCj%@S{C8BXZlxUcU;x?8yZj3^OQ5A#!7E|)s50eZ==
zWKlONMnh6xDP}M`YlsTd-)RU2+!=~^fAv+-z<VGbVue@PH~c`LXc+Ma=cmCx@56Ar
zZj(=6;9i9>ihf(LQ&I>SC<D_e4a6F5ik4b6e7a$65!T&Kp1;C7-m=QCkMcd#qsBz$
zzJUM0xgcGSQU5?5>m0xJA!hagc5GWY=I+_))EH7-Cx?k$Wxv{L7!xiKTDvk3(j2h2
zY>qL^!$t;dgKm2wi4)s0E(Li_5AfgCHL-G_$BeMxbf8YS5R4d|hAeZBd;*qpxzb?p
z)gY2*$11Xxto(?h0OD{|ZXJR0;iFnUvTtNHC`kxLCR+n~>XWA(1UOq&{FEKz!`Vg;
z4~hK&s6>x!CQy=_*~Qsor$3xiWCHdtCmz|we`w1wI0W5mO&*tg;po5m<zXQEy8)-=
zsHv%-D_&x4s>JthNHI0gFx?$z;%&0Ozo%bkeXc1gUz_;4SICi5#}zpB6WP&93KKcH
z`+Q{z_Zv~}5b?r<T~1~{LJlP}nnKlTwUS~GGx<2-|7-bLa4|_JFMyA|4c<hc@yuft
zvur3zh!%6j6V%CHW}d5EZOh+k($W|V^E-7=Mo~5P)MD!K^49m6%m-@dLP}v1*AwgN
z0B8k~XjJp;_Y}-v@Q~PL>3rzTeSL5$Q{&V3l-R*TPTR;Mz{mgu1LR7<Ndm$SVFROP
z_$7LmOO1e20K|-bFSlNJMpJet<Ld<)<J`&wo+yZ~5tP-Fh3z+HFJfjf5Iu$q@_<{$
z79z9}@cpIo<TUAxJ5b@A?=K16p0*==Kmm*$?Lzxmtgc_e3<Mv*jyRcqE7Yl)C_7sM
z=`@~yh?~HH=dVNO;At8)n~-yv$4=c_AE#YK5igc4N(ed+XaQ78$HR<oCJG9Q%*SUQ
zfHwxD9uP^pQ|A19{QhbAKVMO}$0YfuLTy#5594B4Rn_<vLq**%Tt}U|BjHb%LiXmp
z^nYu&RxJM5^1J8K!<kJ&>;n!Bg;P`FdBN^JDdMh@-y4mS^G-zP$I(Wm`>dOFZ6mD{
zlZ!`4vs`_*seMIK5=dN9AH8fn$^pHKyqeO<N@n@ZH1^!SHlz7UuDMlBF}o*aCpT?F
zr{shztlKdU+~XpTk2x@Am<=V{zg?D?xx9r8dU_L}#NnB+>F+Z6btXSLrC))OVJzKb
z74*``D*oGopp`b7p<EW;Un!MYbgB?670%7phF)xj$7CUqr}`-Dp>EI*z-$|N|2YDF
zkB&eaH}>ap&8@uGT0;MZXqUiLqre&V%{aEel$<a3{a&l4i!i@Ijq$nK8UBx1@8-eY
zYs9{YC+|v0@ru2Q9z6rB6bH6LR#)id9oRlO@-iZ!bQ<Vq^Z~&+W?f($%w4fqRO~FY
z{h;Svi;|dnA4Cs_B^FxaTKEgi@I2(V*Hakf>RmH=3Cj2DA_ZM*%I|WJZKXVdiet;x
z3OSE}T87GyLQ1y-I&eFg40#*&=g{Ii1OzQ3jo_AimeR;bu^&)E3+JUonNA<kC89X#
TwDRBM33vNJAX69R_xJz+2lD&n

diff --git a/boards/nxp/frdm_mcxc444/doc/index.rst b/boards/nxp/frdm_mcxc444/doc/index.rst
deleted file mode 100644
index db72f8d6fad..00000000000
--- a/boards/nxp/frdm_mcxc444/doc/index.rst
+++ /dev/null
@@ -1,220 +0,0 @@
-.. _frdm_mcxc444:
-
-NXP FRDM-MCXC444
-################
-
-Overview
-********
-
-FRDM-MCXC444 is a compact and scalable development board for rapid
-prototyping of MCX C444 MCU. It offers industry standard headers
-for easy access to the MCU's I/Os, integrated open-standard serial
-interfaces and on-board MCU-Link debugger.
-The MCXC is a general purpose ultra-low-power MCU family,
-providing additional memory, communications and analog peripheral.
-
-
-.. image:: frdm_mcxc444.webp
-   :align: center
-   :alt: FRDM-MCXC444
-
-Hardware
-********
-
-- MCXC444VLH Arm Cortex-M0+ microcontroller running at 48 MHz
-- 64LQFP package
-- 256 KB flash
-- 32 KB SRAM
-- USB FS 2.0
-- 2x low-power UART, 1x UART, 2x I2C, 2x SPI
-- FXLS8974CF accelerometer
-- Tri-color LED
-- On-board MCU-Link debugger with CMSIS-DAP
-- Arduino Header, mikroBUS, Pmod
-
-For more information about the MCXC444 SoC and FRDM-MCXC444 board, see
-these references:
-
-- `MCX C14x/24x/44x Website`_
-- `MCX C44x Datasheet`_
-- `MCX C44x Reference Manual`_
-- `FRDM-MCXC444 Website`_
-- `FRDM-MCXC444 User Manual`_
-- `FRDM-MCXC444 Design Files`_
-
-Supported Features
-==================
-
-The ``frdm_mcxc444`` board target supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | soc flash                           |
-+-----------+------------+-------------------------------------+
-
-
-Targets available
-==================
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/frdm_mcxc444/frdm_mcxc444_defconfig`
-
-Other hardware features are not currently supported by the port.
-
-Connections and IOs
-===================
-
-The MCXC444 SoC has five pairs of pinmux/gpio controllers (PORTA/GPIOA,
-PORTB/GPIOB, PORTC/GPIOC, PORTD/GPIOD, and PORTE/GPIOE) for the FRDM-MCXC444 board.
-
-+-------+-------------+---------------------------+
-| Name  | Function    | Usage                     |
-+=======+=============+===========================+
-| PTE20 | ADC         | ADC0 channel 1            |
-+-------+-------------+---------------------------+
-| PTE31 | GPIO        | Red LED                   |
-+-------+-------------+---------------------------+
-| PTD5  | GPIO        | Green LED                 |
-+-------+-------------+---------------------------+
-| PTE29 | GPIO        | Blue LED                  |
-+-------+-------------+---------------------------+
-| PTA1  | LPUART0_RX  | UART Console              |
-+-------+-------------+---------------------------+
-| PTA2  | LPUART0_TX  | UART Console              |
-+-------+-------------+---------------------------+
-| PTA20 | RESET       | RESET Button SW1          |
-+-------+-------------+---------------------------+
-| PTC3  | GPIO        | User button SW2           |
-+-------+-------------+---------------------------+
-| PTA4  | GPIO        | User button SW3           |
-+-------+-------------+---------------------------+
-| PTE25 | I2C0_SDA    | I2C accelerometer         |
-+-------+-------------+---------------------------+
-| PTE24 | I2C0_SCL    | I2C accelerometer         |
-+-------+-------------+---------------------------+
-
-System Clock
-============
-
-The MCXC444 SoC is configured to use HIRC running at 48 MHz as a system clock source.
-
-Serial Port
-===========
-
-The MCXC444 LPUART0 is used for the console.
-
-Programming and Debugging
-*************************
-
-Build and flash applications as usual (see :ref:`build_an_application` and
-:ref:`application_run` for more details).
-
-Configuring a Debug Probe
-=========================
-
-A debug probe is used for both flashing and debugging the board. This board is
-configured by default to use the MCU-Link CMSIS-DAP Onboard Debug Probe.
-
-Using LinkServer
-----------------
-
-Linkserver is the default runner for this board, and supports the factory
-default MCU-Link firmware. Follow the instructions in
-:ref:`mcu-link-cmsis-onboard-debug-probe` to reprogram the default MCU-Link
-firmware. This only needs to be done if the default onboard debug circuit
-firmware was changed. To put the board in ``DFU mode`` to program the firmware,
-short jumper JP2.
-
-Using J-Link
-------------
-
-There are two options. The onboard debug circuit can be updated with Segger
-J-Link firmware by following the instructions in
-:ref:`mcu-link-jlink-onboard-debug-probe`.
-To be able to program the firmware, you need to put the board in ``DFU mode``
-by shortening the jumper JP1.
-The second option is to attach a :ref:`jlink-external-debug-probe` to the
-10-pin SWD connector (J10) of the board. Additionally, the jumper JP4 must
-be shortened.
-For both options use the ``-r jlink`` option with west to use the jlink runner.
-
-.. code-block:: console
-
-   west flash -r jlink
-
-Configuring a Console
-=====================
-
-Connect a USB cable from your PC to J13, and use the serial terminal of your choice
-(minicom, putty, etc.) with the following settings:
-
-- Speed: 115200
-- Data: 8 bits
-- Parity: None
-- Stop bits: 1
-
-Flashing
-========
-
-Here is an example for the :zephyr:code-sample:`hello_world` application.
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/hello_world
-   :board: frdm_mcxc444
-   :goals: flash
-
-Open a serial terminal, reset the board (press the SW1 button), and you should
-see the following message in the terminal:
-
-.. code-block:: console
-
-   *** Booting Zephyr OS build v3.6.0-4475-gfa5bd8bb098e ***
-   Hello World! frdm_mcxc444/mcxc444
-
-Debugging
-=========
-
-Here is an example for the :zephyr:code-sample:`hello_world` application.
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/hello_world
-   :board: frdm_mcxc444
-   :goals: debug
-
-Open a serial terminal, step through the application in your debugger, and you
-should see the following message in the terminal:
-
-.. code-block:: console
-
-   *** Booting Zephyr OS build v3.6.0-4475-gfa5bd8bb098e ***
-   Hello World! frdm_mcxc444/mcxc444
-
-.. _MCX C14x/24x/44x Website:
-   https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/mcx-arm-cortex-m/mcx-c-series-microcontrollers/mcx-c14x-24x-44x-mcus-with-arm-cortex-m0-plus-entry-level-mcus-with-usb-segment-lcd-and-classical-peripherals:MCX-C14x-24x-44x
-
-.. _MCX C44x Datasheet:
-   https://www.nxp.com/docs/en/data-sheet/MCXC44XP64M48SF6.pdf
-
-.. _MCX C44x Reference Manual:
-   https://www.nxp.com/webapp/Download?colCode=MCXC44XP64M48RM
-
-.. _FRDM-MCXC444 Website:
-   https://www.nxp.com/design/design-center/development-boards-and-designs/general-purpose-mcus/frdm-development-board-for-mcx-c444-mcus:FRDM-MCXC444
-
-.. _FRDM-MCXC444 User Manual:
-   https://www.nxp.com/webapp/Download?colCode=UM12120
-
-.. _FRDM-MCXC444 Design Files:
-   https://www.nxp.com/webapp/Download?colCode=FRDM-MCXC444-DESIGNFILES
diff --git a/boards/nxp/frdm_mcxc444/frdm_mcxc444-pinctrl.dtsi b/boards/nxp/frdm_mcxc444/frdm_mcxc444-pinctrl.dtsi
deleted file mode 100644
index 7f0010c3cbe..00000000000
--- a/boards/nxp/frdm_mcxc444/frdm_mcxc444-pinctrl.dtsi
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2024 NXP
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-#include <nxp/mcx/MCXC444VLH-pinctrl.h>
-
-&pinctrl {
-	pinmux_lpuart0: pinmux_lpuart0 {
-		group0 {
-			pinmux = <LPUART0_RX_PTA1>,
-				<LPUART0_TX_PTA2>;
-			drive-strength = "low";
-			slew-rate = "slow";
-		};
-	};
-};
diff --git a/boards/nxp/frdm_mcxc444/frdm_mcxc444.dts b/boards/nxp/frdm_mcxc444/frdm_mcxc444.dts
deleted file mode 100644
index 7e771a60725..00000000000
--- a/boards/nxp/frdm_mcxc444/frdm_mcxc444.dts
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2024 NXP
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-
-#include <nxp/nxp_mcxc444.dtsi>
-#include "frdm_mcxc444-pinctrl.dtsi"
-#include <zephyr/dt-bindings/input/input-event-codes.h>
-
-/ {
-	model = "NXP FRDM-MCXC444 board";
-	compatible = "nxp,mcxc444", "nxp,mcx";
-
-	aliases {
-		led0 = &red_led;
-		led1 = &green_led;
-		led2 = &red_led;
-		sw0 = &user_button_2;
-		sw1 = &user_button_3;
-	};
-
-	chosen {
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &lpuart0;
-		zephyr,shell-uart = &lpuart0;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		red_led: led_0 {
-			gpios = <&gpioe 31 GPIO_ACTIVE_LOW>;
-			label = "Red LED";
-		};
-		green_led: led_1 {
-			gpios = <&gpiob 5 GPIO_ACTIVE_LOW>;
-			label = "Green LED";
-		};
-		blue_led: led_2 {
-			gpios = <&gpioe 29 GPIO_ACTIVE_LOW>;
-			label = "Blue LED";
-		};
-	};
-
-	gpio_keys {
-		compatible = "gpio-keys";
-		user_button_2: button_2 {
-			label = "User SW2";
-			gpios = <&gpioc 3 GPIO_ACTIVE_LOW>;
-			zephyr,code = <INPUT_KEY_0>;
-		};
-		user_button_3: button_3 {
-			label = "User SW3";
-			gpios = <&gpioa 4 GPIO_ACTIVE_LOW>;
-			zephyr,code = <INPUT_KEY_1>;
-		};
-	};
-};
-
-&sim {
-	pllfll-select = <KINETIS_SIM_PLLFLLSEL_MCGPLLCLK>;
-	er32k-select = <KINETIS_SIM_ER32KSEL_LPO1KHZ>;
-};
-
-&cpu0 {
-	clock-frequency = <48000000>;
-};
-
-&osc {
-	clock-frequency = <32768>;
-	mode = "low-power";
-};
-
-&gpioa {
-	status = "okay";
-};
-
-&gpiob {
-	status = "okay";
-};
-
-&gpioc {
-	status = "okay";
-};
-
-&gpioe {
-	status = "okay";
-};
-
-&lpuart0 {
-	status = "okay";
-	current-speed = <115200>;
-	pinctrl-0 = <&pinmux_lpuart0>;
-	pinctrl-names = "default";
-};
diff --git a/boards/nxp/frdm_mcxc444/frdm_mcxc444.yaml b/boards/nxp/frdm_mcxc444/frdm_mcxc444.yaml
deleted file mode 100644
index dc92b7dfeb2..00000000000
--- a/boards/nxp/frdm_mcxc444/frdm_mcxc444.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright 2024 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-identifier: frdm_mcxc444
-name: NXP FRDM-MCXC444
-type: mcu
-arch: arm
-ram: 32
-flash: 256
-toolchain:
-  - zephyr
-  - gnuarmemb
-  - xtools
-supported:
-  - gpio
-testing:
-  ignore_tags:
-    - net
-    - bluetooth
-vendor: nxp
diff --git a/boards/nxp/frdm_mcxc444/frdm_mcxc444_defconfig b/boards/nxp/frdm_mcxc444/frdm_mcxc444_defconfig
deleted file mode 100644
index 3d640c35842..00000000000
--- a/boards/nxp/frdm_mcxc444/frdm_mcxc444_defconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright 2024 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-CONFIG_SERIAL=y
-CONFIG_GPIO=y

From 19fb1a8d5804b75b0061457bf018a4a8bc8b65b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:28 +0100
Subject: [PATCH 1426/2913] Revert "[nrf fromtree] soc: mcxc444: add soc
 support for mcxc444"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5b54935f621b97d4e5ee8bd36f87ab8413d1db09.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nxp/mcx/mcxc/Kconfig.soc | 13 -------------
 soc/nxp/mcx/soc.yml          |  1 -
 2 files changed, 14 deletions(-)

diff --git a/soc/nxp/mcx/mcxc/Kconfig.soc b/soc/nxp/mcx/mcxc/Kconfig.soc
index 67948a6d958..3ee9f9fc187 100644
--- a/soc/nxp/mcx/mcxc/Kconfig.soc
+++ b/soc/nxp/mcx/mcxc/Kconfig.soc
@@ -20,15 +20,10 @@ config SOC_MCXC242
 	bool
 	select SOC_SERIES_MCXC
 
-config SOC_MCXC444
-	bool
-	select SOC_SERIES_MCXC
-
 config SOC
 	default "mcxc141" if SOC_MCXC141
 	default "mcxc142" if SOC_MCXC142
 	default "mcxc242" if SOC_MCXC242
-	default "mcxc444" if SOC_MCXC444
 
 config SOC_PART_NUMBER_MCXC141VLH
 	bool
@@ -45,17 +40,9 @@ config SOC_PART_NUMBER_MCXC242VLH
 config SOC_PART_NUMBER_MCXC242VFM
 	bool
 
-config SOC_PART_NUMBER_MCXC444VLH
-	bool
-
-config SOC_PART_NUMBER_MCXC444VMP
-	bool
-
 config SOC_PART_NUMBER
 	default "MCXC141VFM" if SOC_PART_NUMBER_MCXC141VLH
 	default "MCXC141VFM" if SOC_PART_NUMBER_MCXC141VFM
 	default "MCXC141VFM" if SOC_PART_NUMBER_MCXC142VFM
 	default "MCXC242VLH" if SOC_PART_NUMBER_MCXC242VLH
 	default "MCXC242VFM" if SOC_PART_NUMBER_MCXC242VFM
-	default "MCXC444VLH" if SOC_PART_NUMBER_MCXC444VLH
-	default "MCXC444VMP" if SOC_PART_NUMBER_MCXC444VMP
diff --git a/soc/nxp/mcx/soc.yml b/soc/nxp/mcx/soc.yml
index 1f1087348b5..cf7a97c9966 100644
--- a/soc/nxp/mcx/soc.yml
+++ b/soc/nxp/mcx/soc.yml
@@ -13,7 +13,6 @@ family:
     - name: mcxc141
     - name: mcxc142
     - name: mcxc242
-    - name: mcxc444
   - name: mcxa
     socs:
     - name: mcxa156

From bcc0759149a7c78ec3546e66151273eef09086b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:28 +0100
Subject: [PATCH 1427/2913] Revert "[nrf fromtree] native_simulator: Get latest
 from upstream"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f8e302b7ec0facc8607140bd073fd23e52955037.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/native_simulator/common/src/include/nsi_utils.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/native_simulator/common/src/include/nsi_utils.h b/scripts/native_simulator/common/src/include/nsi_utils.h
index 43d171a8e89..997eac30005 100644
--- a/scripts/native_simulator/common/src/include/nsi_utils.h
+++ b/scripts/native_simulator/common/src/include/nsi_utils.h
@@ -28,7 +28,6 @@
 #define NSI_CODE_UNREACHABLE __builtin_unreachable()
 
 #define NSI_FUNC_NORETURN __attribute__((__noreturn__))
-#define NSI_WEAK __attribute__((__weak__))
 
 #if defined(__clang__)
   /* The address sanitizer in llvm adds padding (redzones) after data

From 8612a6386d9c9a534851a8b109e7fd4cf32ec99b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:28 +0100
Subject: [PATCH 1428/2913] Revert "[nrf fromtree] manifest: Update nRF hw
 models to latest"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 86d9e18824b24e36f3540bfb62398616caad1230.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index d5545988bef..dd0275031a6 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: aca798cf7cf0c5dc1fd89c66cf62670051feb8d0
+      revision: eeed2591d38e5e9bf89658df67555f2777249fc0
       path: modules/bsim_hw_models/nrf_hw_models
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719

From 670a28c454b2f24a2d85805098184b9bd0c55535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:28 +0100
Subject: [PATCH 1429/2913] Revert "[nrf fromtree] boards nrf_bsim: Provide
 IRQ_PRIO_LOWEST"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a65ec83749c94e331396c43c72c5542555d642ac.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/native/nrf_bsim/board_irq.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/boards/native/nrf_bsim/board_irq.h b/boards/native/nrf_bsim/board_irq.h
index 38f359fdf62..e1a385194fb 100644
--- a/boards/native/nrf_bsim/board_irq.h
+++ b/boards/native/nrf_bsim/board_irq.h
@@ -18,7 +18,6 @@ void nrfbsim_WFE_model(void);
 void nrfbsim_SEV_model(void);
 
 #define IRQ_ZERO_LATENCY	BIT(1) /* Unused in this board*/
-#define IRQ_PRIO_LOWEST		UINT8_MAX
 
 #ifdef __cplusplus
 }

From 7381718e47e5cdc3b13e8cc466498bf0457a92e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:28 +0100
Subject: [PATCH 1430/2913] Revert "[nrf fromtree] boards nrf_bsim: Add
 NVIC_GetPendingIRQ() equivalent"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5c672343d3084e92823aae9c7ea811d8200359a3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/native/nrf_bsim/common/cmsis/cmsis.c | 5 -----
 boards/native/nrf_bsim/common/cmsis/cmsis.h | 1 -
 2 files changed, 6 deletions(-)

diff --git a/boards/native/nrf_bsim/common/cmsis/cmsis.c b/boards/native/nrf_bsim/common/cmsis/cmsis.c
index dac5f82e699..e80aea6b4ff 100644
--- a/boards/native/nrf_bsim/common/cmsis/cmsis.c
+++ b/boards/native/nrf_bsim/common/cmsis/cmsis.c
@@ -30,11 +30,6 @@ void NVIC_DisableIRQ(IRQn_Type IRQn)
 	hw_irq_ctrl_disable_irq(CONFIG_NATIVE_SIMULATOR_MCU_N, IRQn);
 }
 
-uint32_t NVIC_GetPendingIRQ(IRQn_Type IRQn)
-{
-	return hw_irq_ctrl_is_irq_pending(CONFIG_NATIVE_SIMULATOR_MCU_N, IRQn);
-}
-
 void NVIC_EnableIRQ(IRQn_Type IRQn)
 {
 	hw_irq_ctrl_enable_irq(CONFIG_NATIVE_SIMULATOR_MCU_N, IRQn);
diff --git a/boards/native/nrf_bsim/common/cmsis/cmsis.h b/boards/native/nrf_bsim/common/cmsis/cmsis.h
index 2afc6e9ae50..ff9030ca547 100644
--- a/boards/native/nrf_bsim/common/cmsis/cmsis.h
+++ b/boards/native/nrf_bsim/common/cmsis/cmsis.h
@@ -30,7 +30,6 @@ void __set_PRIMASK(uint32_t primask);
 void NVIC_SetPendingIRQ(IRQn_Type IRQn);
 void NVIC_ClearPendingIRQ(IRQn_Type IRQn);
 void NVIC_DisableIRQ(IRQn_Type IRQn);
-uint32_t NVIC_GetPendingIRQ(IRQn_Type IRQn);
 void NVIC_EnableIRQ(IRQn_Type IRQn);
 void NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority);
 uint32_t NVIC_GetPriority(IRQn_Type IRQn);

From 37beb75f9f3e7b9176f8b0b1b69b0b18ddfafed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:28 +0100
Subject: [PATCH 1431/2913] Revert "[nrf fromtree] shell: Added assert"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cb361af71f3d060b5f4277e483a8423820109dbf.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/shell/Kconfig      | 1 -
 subsys/shell/shell.c      | 1 -
 subsys/shell/shell_cmds.c | 7 +++++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/subsys/shell/Kconfig b/subsys/shell/Kconfig
index 444e953dddd..626431b4cae 100644
--- a/subsys/shell/Kconfig
+++ b/subsys/shell/Kconfig
@@ -91,7 +91,6 @@ config SHELL_PRINTF_BUFF_SIZE
 
 config SHELL_DEFAULT_TERMINAL_WIDTH
 	int "Default terminal width"
-	range 1 $(UINT16_MAX)
 	default 80
 	help
 	  Default terminal width is used to break lines.
diff --git a/subsys/shell/shell.c b/subsys/shell/shell.c
index f55d5002a28..3ffe2691417 100644
--- a/subsys/shell/shell.c
+++ b/subsys/shell/shell.c
@@ -141,7 +141,6 @@ static void tab_item_print(const struct shell *sh, const char *option,
 
 	columns = (sh->ctx->vt100_ctx.cons.terminal_wid
 			- z_shell_strlen(tab)) / longest_option;
-	__ASSERT_NO_MSG(columns != 0);
 	diff = longest_option - z_shell_strlen(option);
 
 	if (sh->ctx->vt100_ctx.printed_cmd++ % columns == 0U) {
diff --git a/subsys/shell/shell_cmds.c b/subsys/shell/shell_cmds.c
index ef82c2b1c68..b1a29799a88 100644
--- a/subsys/shell/shell_cmds.c
+++ b/subsys/shell/shell_cmds.c
@@ -69,6 +69,9 @@
 /* 10 == {esc, [, 2, 5, 0, ;, 2, 5, 0, '\0'} */
 #define SHELL_CURSOR_POSITION_BUFFER	(10u)
 
+#define SHELL_DEFAULT_TERMINAL_WIDTH 80
+#define SHELL_DEFAULT_TERMINAL_HEIGHT 24
+
 /* Function reads cursor position from terminal. */
 static int cursor_position_get(const struct shell *sh, uint16_t *x, uint16_t *y)
 {
@@ -405,8 +408,8 @@ static int cmd_resize_default(const struct shell *sh,
 	ARG_UNUSED(argv);
 
 	Z_SHELL_VT100_CMD(sh, SHELL_VT100_SETCOL_80);
-	sh->ctx->vt100_ctx.cons.terminal_wid = CONFIG_SHELL_DEFAULT_TERMINAL_WIDTH;
-	sh->ctx->vt100_ctx.cons.terminal_hei = CONFIG_SHELL_DEFAULT_TERMINAL_HEIGHT;
+	sh->ctx->vt100_ctx.cons.terminal_wid = SHELL_DEFAULT_TERMINAL_WIDTH;
+	sh->ctx->vt100_ctx.cons.terminal_hei = SHELL_DEFAULT_TERMINAL_HEIGHT;
 
 	return 0;
 }

From 42b18657cfc38ad2f998eae305d2848850e4e0de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:28 +0100
Subject: [PATCH 1432/2913] Revert "[nrf fromtree] Bluetooth: Tester: Added
 flag parameter to CAP stop cmd"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 865e0aac5827999356601e6edb0e13c0a70859bf.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/bluetooth/tester/src/audio/btp/btp_cap.h | 2 --
 tests/bluetooth/tester/src/audio/btp_cap.c     | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/bluetooth/tester/src/audio/btp/btp_cap.h b/tests/bluetooth/tester/src/audio/btp/btp_cap.h
index 1d0f9037abb..4369e87536a 100644
--- a/tests/bluetooth/tester/src/audio/btp/btp_cap.h
+++ b/tests/bluetooth/tester/src/audio/btp/btp_cap.h
@@ -60,9 +60,7 @@ struct btp_cap_unicast_audio_update_data {
 #define BTP_CAP_UNICAST_AUDIO_STOP		0x06
 struct btp_cap_unicast_audio_stop_cmd {
 	uint8_t cig_id;
-	uint8_t flags;
 } __packed;
-#define BTP_CAP_UNICAST_AUDIO_STOP_FLAG_RELEASE BIT(0)
 
 #define BTP_CAP_BROADCAST_SOURCE_SETUP_STREAM	0x07
 struct btp_cap_broadcast_source_setup_stream_cmd {
diff --git a/tests/bluetooth/tester/src/audio/btp_cap.c b/tests/bluetooth/tester/src/audio/btp_cap.c
index 0009abedb63..fda96ee3602 100644
--- a/tests/bluetooth/tester/src/audio/btp_cap.c
+++ b/tests/bluetooth/tester/src/audio/btp_cap.c
@@ -438,7 +438,7 @@ static uint8_t btp_cap_unicast_audio_stop(const void *cmd, uint16_t cmd_len,
 	param.streams = streams;
 	param.count = stream_cnt;
 	param.type = BT_CAP_SET_TYPE_AD_HOC;
-	param.release = (cp->flags & BTP_CAP_UNICAST_AUDIO_STOP_FLAG_RELEASE) != 0;
+	param.release = true;
 
 	err = bt_cap_initiator_unicast_audio_stop(&param);
 	if (err != 0) {

From d518f6318e28e3fd0376a1b378e6ad4ab00e0070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:28 +0100
Subject: [PATCH 1433/2913] Revert "[nrf fromtree] Bluetooth: CAP: Add support
 for doing just disable for unicast stop"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f9004d8a50f07bdd72657aba0bfc48ab6094b094.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/audio/cap.h          |   8 +-
 subsys/bluetooth/audio/bap_stream.c           |   4 +-
 subsys/bluetooth/audio/cap_common.c           |  10 -
 subsys/bluetooth/audio/cap_initiator.c        | 484 ++++--------------
 subsys/bluetooth/audio/cap_internal.h         |   8 -
 subsys/bluetooth/audio/cap_stream.c           |  10 -
 subsys/bluetooth/audio/shell/cap_initiator.c  |   1 -
 .../audio/cap_initiator/CMakeLists.txt        |   1 -
 tests/bluetooth/audio/cap_initiator/prj.conf  |   2 -
 .../bluetooth/audio/cap_initiator/src/main.c  |   2 +
 .../audio/cap_initiator/src/test_common.c     |   2 -
 .../cap_initiator/src/test_unicast_start.c    |   2 +
 .../cap_initiator/src/test_unicast_stop.c     | 482 -----------------
 .../cap_initiator/uut/bap_unicast_client.c    |  95 +---
 tests/bluetooth/tester/src/audio/btp_cap.c    |   1 -
 .../audio/src/cap_initiator_unicast_test.c    |  34 +-
 .../bsim/bluetooth/audio/src/gmap_ugg_test.c  |   1 -
 17 files changed, 125 insertions(+), 1022 deletions(-)
 delete mode 100644 tests/bluetooth/audio/cap_initiator/src/test_unicast_stop.c

diff --git a/include/zephyr/bluetooth/audio/cap.h b/include/zephyr/bluetooth/audio/cap.h
index 4417477860d..50c29640a73 100644
--- a/include/zephyr/bluetooth/audio/cap.h
+++ b/include/zephyr/bluetooth/audio/cap.h
@@ -312,9 +312,6 @@ struct bt_cap_unicast_audio_stop_param {
 
 	/** Array of streams to stop */
 	struct bt_cap_stream **streams;
-
-	/** Whether to release the streams after they have stopped */
-	bool release;
 };
 
 /**
@@ -382,10 +379,7 @@ int bt_cap_initiator_unicast_audio_update(const struct bt_cap_unicast_audio_upda
  *
  * @param param Stop parameters.
  *
- * @return 0 on success
- * @retval -EBUSY if a CAP procedure is already in progress
- * @retval -EINVAL if any parameter is invalid
- * @retval -EALREADY if no state changes will occur
+ * @return 0 on success or negative error value on failure.
  */
 int bt_cap_initiator_unicast_audio_stop(const struct bt_cap_unicast_audio_stop_param *param);
 
diff --git a/subsys/bluetooth/audio/bap_stream.c b/subsys/bluetooth/audio/bap_stream.c
index ebc9a87712a..dbc6a6d5a18 100644
--- a/subsys/bluetooth/audio/bap_stream.c
+++ b/subsys/bluetooth/audio/bap_stream.c
@@ -445,7 +445,7 @@ void bt_bap_stream_detach(struct bt_bap_stream *stream)
 {
 	const bool is_broadcast = bt_bap_stream_is_broadcast(stream);
 
-	LOG_DBG("stream %p conn %p ep %p", stream, (void *)stream->conn, (void *)stream->ep);
+	LOG_DBG("stream %p", stream);
 
 	if (stream->conn != NULL) {
 		bt_conn_unref(stream->conn);
@@ -523,7 +523,7 @@ int bt_bap_stream_config(struct bt_conn *conn, struct bt_bap_stream *stream, str
 	       codec_cfg, codec_cfg ? codec_cfg->id : 0, codec_cfg ? codec_cfg->cid : 0,
 	       codec_cfg ? codec_cfg->vid : 0);
 
-	CHECKIF(conn == NULL || stream == NULL || codec_cfg == NULL || ep == NULL) {
+	CHECKIF(conn == NULL || stream == NULL || codec_cfg == NULL) {
 		LOG_DBG("NULL value(s) supplied)");
 		return -EINVAL;
 	}
diff --git a/subsys/bluetooth/audio/cap_common.c b/subsys/bluetooth/audio/cap_common.c
index 8780a3e357a..56e7741d2ee 100644
--- a/subsys/bluetooth/audio/cap_common.c
+++ b/subsys/bluetooth/audio/cap_common.c
@@ -64,11 +64,6 @@ void bt_cap_common_set_subproc(enum bt_cap_common_subproc_type subproc_type)
 	active_proc.subproc_type = subproc_type;
 }
 
-bool bt_cap_common_proc_is_type(enum bt_cap_common_proc_type proc_type)
-{
-	return active_proc.proc_type == proc_type;
-}
-
 bool bt_cap_common_subproc_is_type(enum bt_cap_common_subproc_type subproc_type)
 {
 	return active_proc.subproc_type == subproc_type;
@@ -127,12 +122,7 @@ void bt_cap_common_abort_proc(struct bt_conn *conn, int err)
 		return;
 	}
 
-#if defined(CONFIG_BT_CAP_INITIATOR_UNICAST)
-	LOG_DBG("Aborting proc %d with subproc %d for %p: %d", active_proc.proc_type,
-		active_proc.subproc_type, (void *)conn, err);
-#else  /* !CONFIG_BT_CAP_INITIATOR_UNICAST */
 	LOG_DBG("Aborting proc %d for %p: %d", active_proc.proc_type, (void *)conn, err);
-#endif /* CONFIG_BT_CAP_INITIATOR_UNICAST */
 
 	active_proc.err = err;
 	active_proc.failed_conn = conn;
diff --git a/subsys/bluetooth/audio/cap_initiator.c b/subsys/bluetooth/audio/cap_initiator.c
index 23295848b14..20d5011ebde 100644
--- a/subsys/bluetooth/audio/cap_initiator.c
+++ b/subsys/bluetooth/audio/cap_initiator.c
@@ -513,17 +513,6 @@ static void update_proc_done_cnt(struct bt_cap_common_proc *active_proc)
 			state = stream_get_state(bap_stream);
 
 			switch (subproc_type) {
-			case BT_CAP_COMMON_SUBPROC_TYPE_DISABLE:
-				if (state == BT_BAP_EP_STATE_QOS_CONFIGURED ||
-				    state == BT_BAP_EP_STATE_DISABLING) {
-					proc_done_cnt++;
-				}
-				break;
-			case BT_CAP_COMMON_SUBPROC_TYPE_STOP:
-				if (state == BT_BAP_EP_STATE_QOS_CONFIGURED) {
-					proc_done_cnt++;
-				}
-				break;
 			case BT_CAP_COMMON_SUBPROC_TYPE_RELEASE:
 				if (state == BT_BAP_EP_STATE_IDLE ||
 				    state == BT_BAP_EP_STATE_CODEC_CONFIGURED) {
@@ -585,60 +574,47 @@ get_next_proc_param(struct bt_cap_common_proc *active_proc)
 		struct bt_cap_initiator_proc_param *proc_param;
 		struct bt_cap_stream *cap_stream;
 		struct bt_bap_stream *bap_stream;
-		enum bt_bap_ep_state state;
 
 		proc_param = &active_proc->proc_param.initiator[i];
 		cap_stream = proc_param->stream;
 		bap_stream = &cap_stream->bap_stream;
-		state = stream_get_state(bap_stream);
 
 		switch (subproc_type) {
 		case BT_CAP_COMMON_SUBPROC_TYPE_CODEC_CONFIG:
-			if (state == BT_BAP_EP_STATE_IDLE) {
+			if (stream_is_in_state(bap_stream, BT_BAP_EP_STATE_IDLE)) {
 				return proc_param;
 			}
 			break;
 		case BT_CAP_COMMON_SUBPROC_TYPE_QOS_CONFIG:
-			if (state == BT_BAP_EP_STATE_CODEC_CONFIGURED) {
+			if (stream_is_in_state(bap_stream, BT_BAP_EP_STATE_CODEC_CONFIGURED)) {
 				return proc_param;
 			}
 			break;
 		case BT_CAP_COMMON_SUBPROC_TYPE_ENABLE:
-			if (state == BT_BAP_EP_STATE_QOS_CONFIGURED) {
+			if (stream_is_in_state(bap_stream, BT_BAP_EP_STATE_QOS_CONFIGURED)) {
 				return proc_param;
 			}
 			break;
 		case BT_CAP_COMMON_SUBPROC_TYPE_CONNECT:
-			if (state == BT_BAP_EP_STATE_ENABLING && !proc_param->start.connected) {
+			if (stream_is_in_state(bap_stream, BT_BAP_EP_STATE_ENABLING) &&
+			    !proc_param->start.connected) {
 				return proc_param;
 			}
 			break;
 		case BT_CAP_COMMON_SUBPROC_TYPE_START:
-			if (state == BT_BAP_EP_STATE_ENABLING) {
+			if (stream_is_in_state(bap_stream, BT_BAP_EP_STATE_ENABLING)) {
 				/* TODO: Add check for connected */
 				return proc_param;
 			}
 			break;
 		case BT_CAP_COMMON_SUBPROC_TYPE_META_UPDATE:
-			if (state == BT_BAP_EP_STATE_ENABLING ||
-			    state == BT_BAP_EP_STATE_STREAMING) {
-				return proc_param;
-			}
-			break;
-		case BT_CAP_COMMON_SUBPROC_TYPE_DISABLE:
-			if (state == BT_BAP_EP_STATE_ENABLING ||
-			    state == BT_BAP_EP_STATE_STREAMING) {
-				return proc_param;
-			}
-			break;
-		case BT_CAP_COMMON_SUBPROC_TYPE_STOP:
-			if (state == BT_BAP_EP_STATE_DISABLING) {
+			if (stream_is_in_state(bap_stream, BT_BAP_EP_STATE_ENABLING) ||
+			    stream_is_in_state(bap_stream, BT_BAP_EP_STATE_STREAMING)) {
 				return proc_param;
 			}
 			break;
 		case BT_CAP_COMMON_SUBPROC_TYPE_RELEASE:
-			if (proc_param->stop.release && state != BT_BAP_EP_STATE_IDLE &&
-			    state != BT_BAP_EP_STATE_CODEC_CONFIGURED) {
+			if (!stream_is_in_state(bap_stream, BT_BAP_EP_STATE_IDLE)) {
 				return proc_param;
 			}
 			break;
@@ -872,7 +848,6 @@ static int cap_initiator_unicast_audio_configure(
 	/* Since BAP operations may require a write long or a read long on the notification,
 	 * we cannot assume that we can do multiple streams at once, thus do it one at a time.
 	 * TODO: We should always be able to do one per ACL, so there is room for optimization.
-	 * This applies to all BAP calls in this file.
 	 */
 	err = bt_bap_stream_config(conn, bap_stream, ep, codec_cfg);
 	if (err != 0) {
@@ -971,6 +946,12 @@ void bt_cap_initiator_codec_configured(struct bt_cap_stream *cap_stream)
 		next_bap_stream = &next_cap_stream->bap_stream;
 		active_proc->proc_initiated_cnt++;
 
+		/* Since BAP operations may require a write long or a read long on the notification,
+		 * we cannot assume that we can do multiple streams at once, thus do it one at a
+		 * time.
+		 * TODO: We should always be able to do one per ACL, so there is room for
+		 * optimization.
+		 */
 		err = bt_bap_stream_config(conn, next_bap_stream, ep, codec_cfg);
 		if (err != 0) {
 			LOG_DBG("Failed to config stream %p: %d", next_cap_stream, err);
@@ -1061,6 +1042,10 @@ void bt_cap_initiator_codec_configured(struct bt_cap_stream *cap_stream)
 void bt_cap_initiator_qos_configured(struct bt_cap_stream *cap_stream)
 {
 	struct bt_cap_common_proc *active_proc = bt_cap_common_get_active_proc();
+	struct bt_cap_initiator_proc_param *proc_param;
+	struct bt_cap_stream *next_cap_stream;
+	struct bt_bap_stream *bap_stream;
+	int err;
 
 	if (!bt_cap_common_stream_in_active_proc(cap_stream)) {
 		/* State change happened outside of a procedure; ignore */
@@ -1069,9 +1054,7 @@ void bt_cap_initiator_qos_configured(struct bt_cap_stream *cap_stream)
 
 	LOG_DBG("cap_stream %p", cap_stream);
 
-	if (!(bt_cap_common_proc_is_type(BT_CAP_COMMON_PROC_TYPE_START) &&
-	      bt_cap_common_subproc_is_type(BT_CAP_COMMON_SUBPROC_TYPE_QOS_CONFIG)) &&
-	    !(bt_cap_common_proc_is_type(BT_CAP_COMMON_PROC_TYPE_STOP))) {
+	if (!bt_cap_common_subproc_is_type(BT_CAP_COMMON_SUBPROC_TYPE_QOS_CONFIG)) {
 		/* Unexpected callback - Abort */
 		bt_cap_common_abort_proc(cap_stream->bap_stream.conn, -EBADMSG);
 	} else {
@@ -1089,60 +1072,36 @@ void bt_cap_initiator_qos_configured(struct bt_cap_stream *cap_stream)
 		return;
 	}
 
-	if (bt_cap_common_proc_is_type(BT_CAP_COMMON_PROC_TYPE_START)) {
-		struct bt_cap_initiator_proc_param *proc_param;
-		struct bt_cap_stream *next_cap_stream;
-		struct bt_bap_stream *bap_stream;
-		int err;
-
-		if (!bt_cap_common_proc_is_done()) {
-			/* Not yet finished, wait for all */
-			return;
-		}
-
-		bt_cap_common_set_subproc(BT_CAP_COMMON_SUBPROC_TYPE_ENABLE);
-		proc_param = get_next_proc_param(active_proc);
-		if (proc_param == NULL) {
-			/* If proc_param is NULL then this step is a no-op and we can skip to the
-			 * next step
-			 */
-			bt_cap_initiator_enabled(active_proc->proc_param.initiator[0].stream);
-
-			return;
-		}
-
-		next_cap_stream = proc_param->stream;
-		bap_stream = &next_cap_stream->bap_stream;
-		active_proc->proc_initiated_cnt++;
-
-		err = bt_bap_stream_enable(bap_stream, bap_stream->codec_cfg->meta,
-					   bap_stream->codec_cfg->meta_len);
-		if (err != 0) {
-			LOG_DBG("Failed to enable stream %p: %d", next_cap_stream, err);
+	if (!bt_cap_common_proc_is_done()) {
+		/* Not yet finished, wait for all */
+		return;
+	}
 
-			bt_cap_common_abort_proc(bap_stream->conn, err);
-			cap_initiator_unicast_audio_proc_complete();
-		}
-	} else if (bt_cap_common_subproc_is_type(BT_CAP_COMMON_SUBPROC_TYPE_RELEASE)) {
-		struct bt_cap_initiator_proc_param *proc_param;
-		struct bt_cap_stream *next_cap_stream;
-		struct bt_bap_stream *next_bap_stream;
-		int err;
+	bt_cap_common_set_subproc(BT_CAP_COMMON_SUBPROC_TYPE_ENABLE);
+	proc_param = get_next_proc_param(active_proc);
+	if (proc_param == NULL) {
+		/* If proc_param is NULL then this step is a no-op and we can skip to the next step
+		 */
+		bt_cap_initiator_enabled(active_proc->proc_param.initiator[0].stream);
 
-		proc_param = get_next_proc_param(active_proc);
-		__ASSERT(proc_param != NULL, "proc is not done, but could not get next proc_param");
+		return;
+	}
 
-		next_cap_stream = proc_param->stream;
-		next_bap_stream = &next_cap_stream->bap_stream;
-		active_proc->proc_initiated_cnt++;
+	next_cap_stream = proc_param->stream;
+	bap_stream = &next_cap_stream->bap_stream;
+	active_proc->proc_initiated_cnt++;
 
-		err = bt_bap_stream_release(next_bap_stream);
-		if (err != 0) {
-			LOG_DBG("Failed to release stream %p: %d", next_cap_stream, err);
+	/* Since BAP operations may require a write long or a read long on the notification, we
+	 * cannot assume that we can do multiple streams at once, thus do it one at a time.
+	 * TODO: We should always be able to do one per ACL, so there is room for optimization.
+	 */
+	err = bt_bap_stream_enable(bap_stream, bap_stream->codec_cfg->meta,
+				   bap_stream->codec_cfg->meta_len);
+	if (err != 0) {
+		LOG_DBG("Failed to enable stream %p: %d", next_cap_stream, err);
 
-			bt_cap_common_abort_proc(next_bap_stream->conn, err);
-			cap_initiator_unicast_audio_proc_complete();
-		}
+		bt_cap_common_abort_proc(bap_stream->conn, err);
+		cap_initiator_unicast_audio_proc_complete();
 	}
 }
 
@@ -1189,6 +1148,12 @@ void bt_cap_initiator_enabled(struct bt_cap_stream *cap_stream)
 
 		active_proc->proc_initiated_cnt++;
 
+		/* Since BAP operations may require a write long or a read long on the notification,
+		 * we cannot assume that we can do multiple streams at once, thus do it one at a
+		 * time.
+		 * TODO: We should always be able to do one per ACL, so there is room for
+		 * optimization.
+		 */
 		err = bt_bap_stream_enable(next_bap_stream, next_bap_stream->codec_cfg->meta,
 					   next_bap_stream->codec_cfg->meta_len);
 		if (err != 0) {
@@ -1311,6 +1276,12 @@ void bt_cap_initiator_connected(struct bt_cap_stream *cap_stream)
 
 	bap_stream = &proc_param->stream->bap_stream;
 	if (stream_is_dir(bap_stream, BT_AUDIO_DIR_SOURCE)) {
+		/* Since BAP operations may require a write long or a read long on the notification,
+		 * we cannot assume that we can do multiple streams at once, thus do it one at a
+		 * time.
+		 * TODO: We should always be able to do one per ACL, so there is room for
+		 * optimization.
+		 */
 		err = bt_bap_stream_start(bap_stream);
 		if (err != 0) {
 			LOG_DBG("Failed to start stream %p: %d", proc_param->stream, err);
@@ -1359,6 +1330,12 @@ void bt_cap_initiator_started(struct bt_cap_stream *cap_stream)
 		if (stream_is_dir(next_bap_stream, BT_AUDIO_DIR_SOURCE)) {
 			int err;
 
+			/* Since BAP operations may require a write long or a read long on
+			 * the notification, we cannot assume that we can do multiple
+			 * streams at once, thus do it one at a time.
+			 * TODO: We should always be able to do one per ACL, so there is
+			 * room for optimization.
+			 */
 			err = bt_bap_stream_start(next_bap_stream);
 			if (err != 0) {
 				LOG_DBG("Failed to start stream %p: %d", next_cap_stream, err);
@@ -1501,9 +1478,6 @@ int bt_cap_initiator_unicast_audio_update(const struct bt_cap_unicast_audio_upda
 			&param->stream_params[i];
 		struct bt_cap_stream *cap_stream = stream_param->stream;
 
-		/* Ensure that ops are registered before any procedures are started */
-		bt_cap_stream_ops_register_bap(cap_stream);
-
 		active_proc->proc_param.initiator[i].stream = cap_stream;
 		active_proc->proc_param.initiator[i].meta_update.meta_len = stream_param->meta_len;
 		memcpy(&active_proc->proc_param.initiator[i].meta_update.meta, stream_param->meta,
@@ -1588,6 +1562,13 @@ void bt_cap_initiator_metadata_updated(struct bt_cap_stream *cap_stream)
 		bap_stream = &next_cap_stream->bap_stream;
 		active_proc->proc_initiated_cnt++;
 
+		/* Since BAP operations may require a write long or a read long on the notification,
+		 * we cannot assume that we can do multiple streams at once, thus do it one at a
+		 * time.
+		 * TODO: We should always be able to do one per ACL, so there is room for
+		 * optimization.
+		 */
+
 		err = bt_bap_stream_metadata(bap_stream, meta, meta_len);
 		if (err != 0) {
 			LOG_DBG("Failed to update metadata for stream %p: %d", next_cap_stream,
@@ -1603,43 +1584,13 @@ void bt_cap_initiator_metadata_updated(struct bt_cap_stream *cap_stream)
 	cap_initiator_unicast_audio_proc_complete();
 }
 
-static bool can_release_stream(const struct bt_bap_stream *bap_stream)
-{
-	enum bt_bap_ep_state state;
-
-	if (bap_stream->conn == NULL) {
-		return false;
-	}
-
-	state = stream_get_state(bap_stream);
-
-	/* We cannot release idle endpoints.
-	 * We do not know if we can release endpoints in the Codec Configured state as servers may
-	 * cache it, so treat it as idle
-	 */
-	return state != BT_BAP_EP_STATE_IDLE && state != BT_BAP_EP_STATE_CODEC_CONFIGURED;
-}
-
-static bool can_disable_stream(const struct bt_bap_stream *bap_stream)
-{
-	enum bt_bap_ep_state state;
-
-	if (bap_stream->conn == NULL) {
-		return false;
-	}
-
-	state = stream_get_state(bap_stream);
-
-	return state == BT_BAP_EP_STATE_STREAMING || state == BT_BAP_EP_STATE_ENABLING;
-}
-
-static bool can_stop_stream(const struct bt_bap_stream *bap_stream)
+static bool can_release(const struct bt_bap_stream *bap_stream)
 {
 	if (bap_stream->conn == NULL) {
 		return false;
 	}
 
-	return stream_is_in_state(bap_stream, BT_BAP_EP_STATE_DISABLING);
+	return !stream_is_in_state(bap_stream, BT_BAP_EP_STATE_IDLE);
 }
 
 static bool valid_unicast_audio_stop_param(const struct bt_cap_unicast_audio_stop_param *param)
@@ -1686,18 +1637,6 @@ static bool valid_unicast_audio_stop_param(const struct bt_cap_unicast_audio_sto
 			return -EINVAL;
 		}
 
-		if (param->type == BT_CAP_SET_TYPE_CSIP) {
-			struct bt_cap_common_client *client = bt_cap_common_get_client_by_acl(conn);
-
-			if (client->csis_inst == NULL) {
-				LOG_DBG("param->streams[%zu]->bap_stream.conn not part of a "
-					"coordinated set",
-					i);
-
-				return false;
-			}
-		}
-
 		CHECKIF(bap_stream->group == NULL) {
 			LOG_DBG("param->streams[%zu] is not in a unicast group", i);
 			return false;
@@ -1714,6 +1653,12 @@ static bool valid_unicast_audio_stop_param(const struct bt_cap_unicast_audio_sto
 			}
 		}
 
+		if (!can_release(bap_stream)) {
+			LOG_DBG("Cannot stop param->streams[%zu]", i);
+
+			return false;
+		}
+
 		for (size_t j = 0U; j < i; j++) {
 			if (param->streams[j] == cap_stream) {
 				LOG_DBG("param->stream_params[%zu] (%p) is "
@@ -1731,9 +1676,8 @@ static bool valid_unicast_audio_stop_param(const struct bt_cap_unicast_audio_sto
 int bt_cap_initiator_unicast_audio_stop(const struct bt_cap_unicast_audio_stop_param *param)
 {
 	struct bt_cap_common_proc *active_proc = bt_cap_common_get_active_proc();
-	bool can_release = false;
-	bool can_disable = false;
-	bool can_stop = false;
+	struct bt_cap_initiator_proc_param *proc_param;
+	struct bt_bap_stream *bap_stream;
 	int err;
 
 	if (bt_cap_common_proc_is_active()) {
@@ -1748,259 +1692,34 @@ int bt_cap_initiator_unicast_audio_stop(const struct bt_cap_unicast_audio_stop_p
 
 	for (size_t i = 0U; i < param->count; i++) {
 		struct bt_cap_stream *cap_stream = param->streams[i];
-		struct bt_bap_stream *bap_stream = &cap_stream->bap_stream;
-
-		/* Ensure that ops are registered before any procedures are started */
-		bt_cap_stream_ops_register_bap(cap_stream);
 
 		active_proc->proc_param.initiator[i].stream = cap_stream;
-		active_proc->proc_param.initiator[i].stop.release = param->release;
-
-		if (!can_disable && can_disable_stream(bap_stream)) {
-			can_disable = true;
-		}
-
-		if (!can_stop && can_stop_stream(bap_stream)) {
-			can_stop = true;
-		}
-
-		if (!can_release && param->release && can_release_stream(bap_stream)) {
-			can_release = true;
-		}
-	}
-
-	if (!can_disable && !can_stop && !can_release) {
-		LOG_DBG("Cannot %s any streams", !can_disable ? "disable"
-						 : !can_stop  ? "stop"
-							      : "release");
-		return -EALREADY;
 	}
 
 	bt_cap_common_start_proc(BT_CAP_COMMON_PROC_TYPE_STOP, param->count);
+
+	bt_cap_common_set_subproc(BT_CAP_COMMON_SUBPROC_TYPE_RELEASE);
+
 	/** TODO: If this is a CSIP set, then the order of the procedures may
 	 * not match the order in the parameters, and the CSIP ordered access
 	 * procedure should be used.
 	 */
+	proc_param = get_next_proc_param(active_proc);
+	__ASSERT(proc_param != NULL, "proc is not done, but could not get next proc_param");
 
-	if (can_disable) {
-		struct bt_cap_initiator_proc_param *proc_param;
-		struct bt_bap_stream *bap_stream;
-
-		bt_cap_common_set_subproc(BT_CAP_COMMON_SUBPROC_TYPE_DISABLE);
-
-		proc_param = get_next_proc_param(active_proc);
-		__ASSERT(proc_param != NULL,
-			 "proc is not started, but could not get next proc_param");
-		bap_stream = &proc_param->stream->bap_stream;
-		active_proc->proc_initiated_cnt++;
-
-		err = bt_bap_stream_disable(bap_stream);
-		if (err != 0) {
-			LOG_DBG("Failed to disable bap_stream %p: %d", proc_param->stream, err);
-
-			bt_cap_common_clear_active_proc();
-		}
-	} else if (can_stop) {
-		struct bt_cap_initiator_proc_param *proc_param;
-		struct bt_bap_stream *bap_stream;
-
-		bt_cap_common_set_subproc(BT_CAP_COMMON_SUBPROC_TYPE_STOP);
-
-		proc_param = get_next_proc_param(active_proc);
-		__ASSERT(proc_param != NULL,
-			 "proc is not started, but could not get next proc_param");
-		bap_stream = &proc_param->stream->bap_stream;
-		active_proc->proc_initiated_cnt++;
-
-		err = bt_bap_stream_stop(bap_stream);
-		if (err != 0) {
-			LOG_DBG("Failed to stop bap_stream %p: %d", proc_param->stream, err);
-
-			bt_cap_common_clear_active_proc();
-		}
-	} else {
-		struct bt_cap_initiator_proc_param *proc_param;
-		struct bt_bap_stream *bap_stream;
-
-		bt_cap_common_set_subproc(BT_CAP_COMMON_SUBPROC_TYPE_RELEASE);
-
-		proc_param = get_next_proc_param(active_proc);
-		__ASSERT(proc_param != NULL,
-			 "proc is not started, but could not get next proc_param");
-		bap_stream = &proc_param->stream->bap_stream;
-		active_proc->proc_initiated_cnt++;
+	bap_stream = &proc_param->stream->bap_stream;
+	active_proc->proc_initiated_cnt++;
 
-		err = bt_bap_stream_release(bap_stream);
-		if (err != 0) {
-			LOG_DBG("Failed to release bap_stream %p: %d", proc_param->stream, err);
+	err = bt_bap_stream_release(bap_stream);
+	if (err != 0) {
+		LOG_DBG("Failed to stop bap_stream %p: %d", proc_param->stream, err);
 
-			bt_cap_common_clear_active_proc();
-		}
+		bt_cap_common_clear_active_proc();
 	}
 
 	return err;
 }
 
-void bt_cap_initiator_disabled(struct bt_cap_stream *cap_stream)
-{
-	struct bt_cap_common_proc *active_proc = bt_cap_common_get_active_proc();
-
-	if (!bt_cap_common_stream_in_active_proc(cap_stream)) {
-		/* State change happened outside of a procedure; ignore */
-		return;
-	}
-
-	if (!bt_cap_common_subproc_is_type(BT_CAP_COMMON_SUBPROC_TYPE_DISABLE)) {
-		/* Unexpected callback - Abort */
-		bt_cap_common_abort_proc(cap_stream->bap_stream.conn, -EBADMSG);
-	} else {
-		update_proc_done_cnt(active_proc);
-
-		LOG_DBG("Stream %p disabled (%zu/%zu streams done)", cap_stream,
-			active_proc->proc_done_cnt, active_proc->proc_cnt);
-	}
-
-	if (bt_cap_common_proc_is_aborted()) {
-		if (bt_cap_common_proc_all_handled()) {
-			cap_initiator_unicast_audio_proc_complete();
-		}
-
-		return;
-	}
-
-	if (!bt_cap_common_proc_is_done()) {
-		struct bt_cap_initiator_proc_param *proc_param;
-		struct bt_cap_stream *next_cap_stream;
-		struct bt_bap_stream *next_bap_stream;
-		int err;
-
-		proc_param = get_next_proc_param(active_proc);
-		__ASSERT(proc_param != NULL, "proc is not done, but could not get next proc_param");
-		next_cap_stream = proc_param->stream;
-		next_bap_stream = &next_cap_stream->bap_stream;
-		active_proc->proc_initiated_cnt++;
-
-		err = bt_bap_stream_disable(next_bap_stream);
-		if (err != 0) {
-			LOG_DBG("Failed to disable stream %p: %d", next_cap_stream, err);
-
-			bt_cap_common_abort_proc(next_bap_stream->conn, err);
-			cap_initiator_unicast_audio_proc_complete();
-		}
-	} else {
-		struct bt_cap_initiator_proc_param *proc_param;
-		struct bt_cap_stream *next_cap_stream;
-		struct bt_bap_stream *next_bap_stream;
-		int err;
-
-		bt_cap_common_set_subproc(BT_CAP_COMMON_SUBPROC_TYPE_STOP);
-
-		proc_param = get_next_proc_param(active_proc);
-		if (proc_param == NULL) {
-			/* If proc_param is NULL then this step is a no-op and we can skip to the
-			 * next step
-			 */
-			bt_cap_initiator_stopped(active_proc->proc_param.initiator[0].stream);
-
-			return;
-		}
-
-		next_cap_stream = proc_param->stream;
-		next_bap_stream = &next_cap_stream->bap_stream;
-		active_proc->proc_initiated_cnt++;
-
-		err = bt_bap_stream_stop(next_bap_stream);
-		if (err != 0) {
-			LOG_DBG("Failed to stop stream %p: %d", next_cap_stream, err);
-
-			bt_cap_common_abort_proc(next_bap_stream->conn, err);
-			cap_initiator_unicast_audio_proc_complete();
-		}
-	}
-}
-
-void bt_cap_initiator_stopped(struct bt_cap_stream *cap_stream)
-{
-	struct bt_cap_common_proc *active_proc = bt_cap_common_get_active_proc();
-
-	if (!bt_cap_common_stream_in_active_proc(cap_stream)) {
-		/* State change happened outside of a procedure; ignore */
-		return;
-	}
-
-	if (!bt_cap_common_proc_is_type(BT_CAP_COMMON_PROC_TYPE_STOP)) {
-		/* Unexpected callback - Abort */
-		bt_cap_common_abort_proc(cap_stream->bap_stream.conn, -EBADMSG);
-	} else {
-		if (bt_cap_common_subproc_is_type(BT_CAP_COMMON_SUBPROC_TYPE_STOP)) {
-			update_proc_done_cnt(active_proc);
-
-			LOG_DBG("Stream %p stopped (%zu/%zu streams done)", cap_stream,
-				active_proc->proc_done_cnt, active_proc->proc_cnt);
-		} else {
-			/* We are still doing disable - Wait for those to be done, as stopped may
-			 * also be called when we are disabling sink ASEs
-			 */
-			return;
-		}
-	}
-
-	if (bt_cap_common_proc_is_aborted()) {
-		if (bt_cap_common_proc_all_handled()) {
-			cap_initiator_unicast_audio_proc_complete();
-		}
-
-		return;
-	}
-
-	if (!bt_cap_common_proc_is_done()) {
-		struct bt_cap_initiator_proc_param *proc_param;
-		struct bt_cap_stream *next_cap_stream;
-		struct bt_bap_stream *next_bap_stream;
-		int err;
-
-		proc_param = get_next_proc_param(active_proc);
-		__ASSERT(proc_param != NULL, "proc is not done, but could not get next proc_param");
-		next_cap_stream = proc_param->stream;
-		next_bap_stream = &next_cap_stream->bap_stream;
-
-		active_proc->proc_initiated_cnt++;
-
-		err = bt_bap_stream_stop(next_bap_stream);
-		if (err != 0) {
-			LOG_DBG("Failed to stop stream %p: %d", next_cap_stream, err);
-
-			bt_cap_common_abort_proc(next_bap_stream->conn, err);
-			cap_initiator_unicast_audio_proc_complete();
-		}
-	} else {
-		/* We are done stopping streams now - We mark the next subproc. If
-		 * get_next_proc_param returns a NULL value it means that we are complete done. If
-		 * it returns a non-NULL value, it means that we need to start releasing streams.
-		 * However, since the QoS Configured state is better suited to trigger this, we
-		 * simply wait until bt_cap_initiator_qos_configured is called.
-		 */
-		struct bt_cap_initiator_proc_param *proc_param;
-
-		if (!bt_cap_common_proc_is_done()) {
-			/* We are still disabling or stopping some */
-			return;
-		}
-
-		bt_cap_common_set_subproc(BT_CAP_COMMON_SUBPROC_TYPE_RELEASE);
-
-		proc_param = get_next_proc_param(active_proc);
-		if (proc_param == NULL) {
-			/* If proc_param is NULL then this step is a no-op and we can finish the
-			 * procedure
-			 */
-			cap_initiator_unicast_audio_proc_complete();
-
-			return;
-		} /* wait for bt_cap_initiator_qos_configured */
-	}
-}
-
 void bt_cap_initiator_released(struct bt_cap_stream *cap_stream)
 {
 	struct bt_cap_common_proc *active_proc = bt_cap_common_get_active_proc();
@@ -2029,22 +1748,23 @@ void bt_cap_initiator_released(struct bt_cap_stream *cap_stream)
 	}
 
 	if (!bt_cap_common_proc_is_done()) {
-		struct bt_cap_initiator_proc_param *proc_param;
-		struct bt_cap_stream *next_cap_stream;
-		struct bt_bap_stream *next_bap_stream;
+		struct bt_cap_stream *next_cap_stream =
+			active_proc->proc_param.initiator[active_proc->proc_done_cnt].stream;
+		struct bt_bap_stream *bap_stream = &next_cap_stream->bap_stream;
 		int err;
 
-		proc_param = get_next_proc_param(active_proc);
-		__ASSERT(proc_param != NULL, "proc is not done, but could not get next proc_param");
-		next_cap_stream = proc_param->stream;
-		next_bap_stream = &next_cap_stream->bap_stream;
 		active_proc->proc_initiated_cnt++;
-
-		err = bt_bap_stream_release(next_bap_stream);
+		/* Since BAP operations may require a write long or a read long on the
+		 * notification, we cannot assume that we can do multiple streams at once,
+		 * thus do it one at a time.
+		 * TODO: We should always be able to do one per ACL, so there is room for
+		 * optimization.
+		 */
+		err = bt_bap_stream_release(bap_stream);
 		if (err != 0) {
 			LOG_DBG("Failed to release stream %p: %d", next_cap_stream, err);
 
-			bt_cap_common_abort_proc(next_bap_stream->conn, err);
+			bt_cap_common_abort_proc(bap_stream->conn, err);
 			cap_initiator_unicast_audio_proc_complete();
 		}
 	} else {
diff --git a/subsys/bluetooth/audio/cap_internal.h b/subsys/bluetooth/audio/cap_internal.h
index 3543b35c387..839d4a31757 100644
--- a/subsys/bluetooth/audio/cap_internal.h
+++ b/subsys/bluetooth/audio/cap_internal.h
@@ -30,8 +30,6 @@ void bt_cap_initiator_enabled(struct bt_cap_stream *cap_stream);
 void bt_cap_initiator_started(struct bt_cap_stream *cap_stream);
 void bt_cap_initiator_connected(struct bt_cap_stream *cap_stream);
 void bt_cap_initiator_metadata_updated(struct bt_cap_stream *cap_stream);
-void bt_cap_initiator_disabled(struct bt_cap_stream *cap_stream);
-void bt_cap_initiator_stopped(struct bt_cap_stream *cap_stream);
 void bt_cap_initiator_released(struct bt_cap_stream *cap_stream);
 void bt_cap_stream_ops_register_bap(struct bt_cap_stream *cap_stream);
 
@@ -63,8 +61,6 @@ enum bt_cap_common_subproc_type {
 	BT_CAP_COMMON_SUBPROC_TYPE_CONNECT,
 	BT_CAP_COMMON_SUBPROC_TYPE_START,
 	BT_CAP_COMMON_SUBPROC_TYPE_META_UPDATE,
-	BT_CAP_COMMON_SUBPROC_TYPE_DISABLE,
-	BT_CAP_COMMON_SUBPROC_TYPE_STOP,
 	BT_CAP_COMMON_SUBPROC_TYPE_RELEASE,
 };
 
@@ -83,9 +79,6 @@ struct bt_cap_initiator_proc_param {
 			/** Codec Specific Capabilities Metadata */
 			uint8_t meta[CONFIG_BT_AUDIO_CODEC_CFG_MAX_METADATA_SIZE];
 		} meta_update;
-		struct {
-			bool release;
-		} stop;
 	};
 };
 
@@ -180,7 +173,6 @@ struct bt_cap_common_proc *bt_cap_common_get_active_proc(void);
 void bt_cap_common_clear_active_proc(void);
 void bt_cap_common_start_proc(enum bt_cap_common_proc_type proc_type, size_t proc_cnt);
 void bt_cap_common_set_subproc(enum bt_cap_common_subproc_type subproc_type);
-bool bt_cap_common_proc_is_type(enum bt_cap_common_proc_type proc_type);
 bool bt_cap_common_subproc_is_type(enum bt_cap_common_subproc_type subproc_type);
 struct bt_conn *bt_cap_common_get_member_conn(enum bt_cap_set_type type,
 					      const union bt_cap_set_member *member);
diff --git a/subsys/bluetooth/audio/cap_stream.c b/subsys/bluetooth/audio/cap_stream.c
index bbc645daa3e..e1ee733a448 100644
--- a/subsys/bluetooth/audio/cap_stream.c
+++ b/subsys/bluetooth/audio/cap_stream.c
@@ -132,11 +132,6 @@ static void cap_stream_disabled_cb(struct bt_bap_stream *bap_stream)
 
 	LOG_DBG("%p", cap_stream);
 
-	if (IS_ENABLED(CONFIG_BT_CAP_INITIATOR) && IS_ENABLED(CONFIG_BT_BAP_UNICAST_CLIENT) &&
-	    stream_is_central(bap_stream)) {
-		bt_cap_initiator_disabled(cap_stream);
-	}
-
 	if (ops != NULL && ops->disabled != NULL) {
 		ops->disabled(bap_stream);
 	}
@@ -193,11 +188,6 @@ static void cap_stream_stopped_cb(struct bt_bap_stream *bap_stream, uint8_t reas
 
 	LOG_DBG("%p", cap_stream);
 
-	if (IS_ENABLED(CONFIG_BT_CAP_INITIATOR) && IS_ENABLED(CONFIG_BT_BAP_UNICAST_CLIENT) &&
-	    stream_is_central(bap_stream)) {
-		bt_cap_initiator_stopped(cap_stream);
-	}
-
 	if (ops != NULL && ops->stopped != NULL) {
 		ops->stopped(bap_stream, reason);
 	}
diff --git a/subsys/bluetooth/audio/shell/cap_initiator.c b/subsys/bluetooth/audio/shell/cap_initiator.c
index 3027edf4d73..197c46059be 100644
--- a/subsys/bluetooth/audio/shell/cap_initiator.c
+++ b/subsys/bluetooth/audio/shell/cap_initiator.c
@@ -532,7 +532,6 @@ static int cmd_cap_initiator_unicast_stop(const struct shell *sh, size_t argc,
 
 	param.streams = streams;
 	param.type = BT_CAP_SET_TYPE_AD_HOC;
-	param.release = true;
 
 	err = bt_cap_initiator_unicast_audio_stop(&param);
 	if (err != 0) {
diff --git a/tests/bluetooth/audio/cap_initiator/CMakeLists.txt b/tests/bluetooth/audio/cap_initiator/CMakeLists.txt
index 8502038e975..2c7096e8c32 100644
--- a/tests/bluetooth/audio/cap_initiator/CMakeLists.txt
+++ b/tests/bluetooth/audio/cap_initiator/CMakeLists.txt
@@ -17,5 +17,4 @@ target_sources(testbinary
     src/main.c
     src/test_common.c
     src/test_unicast_start.c
-    src/test_unicast_stop.c
 )
diff --git a/tests/bluetooth/audio/cap_initiator/prj.conf b/tests/bluetooth/audio/cap_initiator/prj.conf
index 7f34c72a09a..18afc819e24 100644
--- a/tests/bluetooth/audio/cap_initiator/prj.conf
+++ b/tests/bluetooth/audio/cap_initiator/prj.conf
@@ -22,5 +22,3 @@ CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SRC_COUNT=2
 CONFIG_ASSERT=y
 CONFIG_ASSERT_LEVEL=2
 CONFIG_ASSERT_VERBOSE=y
-
-CONFIG_BT_BAP_STREAM_LOG_LEVEL_DBG=y
diff --git a/tests/bluetooth/audio/cap_initiator/src/main.c b/tests/bluetooth/audio/cap_initiator/src/main.c
index a15c1fc1c1f..54b78f0efe2 100644
--- a/tests/bluetooth/audio/cap_initiator/src/main.c
+++ b/tests/bluetooth/audio/cap_initiator/src/main.c
@@ -24,6 +24,8 @@
 #include "ztest_assert.h"
 #include "ztest_test.h"
 
+DEFINE_FFF_GLOBALS;
+
 static void mock_init_rule_before(const struct ztest_unit_test *test, void *fixture)
 {
 	test_mocks_init();
diff --git a/tests/bluetooth/audio/cap_initiator/src/test_common.c b/tests/bluetooth/audio/cap_initiator/src/test_common.c
index fc8d2b10ae2..dbb0c8a9470 100644
--- a/tests/bluetooth/audio/cap_initiator/src/test_common.c
+++ b/tests/bluetooth/audio/cap_initiator/src/test_common.c
@@ -18,8 +18,6 @@
 #include "test_common.h"
 #include "ztest_assert.h"
 
-DEFINE_FFF_GLOBALS;
-
 void test_mocks_init(void)
 {
 	mock_cap_initiator_init();
diff --git a/tests/bluetooth/audio/cap_initiator/src/test_unicast_start.c b/tests/bluetooth/audio/cap_initiator/src/test_unicast_start.c
index 27eb4773926..7ff7f2472ff 100644
--- a/tests/bluetooth/audio/cap_initiator/src/test_unicast_start.c
+++ b/tests/bluetooth/audio/cap_initiator/src/test_unicast_start.c
@@ -30,6 +30,8 @@
 #include "ztest_assert.h"
 #include "ztest_test.h"
 
+#define FFF_GLOBALS
+
 struct cap_initiator_test_unicast_start_fixture {
 	struct bt_cap_stream cap_streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT];
 	struct bt_bap_ep eps[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT];
diff --git a/tests/bluetooth/audio/cap_initiator/src/test_unicast_stop.c b/tests/bluetooth/audio/cap_initiator/src/test_unicast_stop.c
deleted file mode 100644
index 50175f588d0..00000000000
--- a/tests/bluetooth/audio/cap_initiator/src/test_unicast_stop.c
+++ /dev/null
@@ -1,482 +0,0 @@
-/* test_unicast_stop.c - unit test for unicast stop procedure */
-
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <errno.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <zephyr/autoconf.h>
-#include <zephyr/bluetooth/audio/audio.h>
-#include <zephyr/bluetooth/audio/bap.h>
-#include <zephyr/bluetooth/audio/bap_lc3_preset.h>
-#include <zephyr/bluetooth/audio/cap.h>
-#include <zephyr/bluetooth/hci_types.h>
-#include <zephyr/fff.h>
-#include <zephyr/sys/slist.h>
-#include <zephyr/sys/util.h>
-#include <sys/errno.h>
-
-#include "bap_endpoint.h"
-#include "cap_initiator.h"
-#include "conn.h"
-#include "expects_util.h"
-#include "test_common.h"
-#include "ztest_assert.h"
-#include "ztest_test.h"
-
-struct cap_initiator_test_unicast_stop_fixture {
-	struct bt_cap_stream cap_streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT];
-	struct bt_bap_ep eps[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT];
-	struct bt_bap_unicast_group unicast_group;
-	struct bt_conn conns[CONFIG_BT_MAX_CONN];
-	struct bt_bap_lc3_preset preset;
-};
-
-static void cap_initiator_test_unicast_stop_fixture_init(
-	struct cap_initiator_test_unicast_stop_fixture *fixture)
-{
-	fixture->preset = (struct bt_bap_lc3_preset)BT_BAP_LC3_UNICAST_PRESET_16_2_1(
-		BT_AUDIO_LOCATION_MONO_AUDIO, BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED);
-
-	for (size_t i = 0U; i < ARRAY_SIZE(fixture->conns); i++) {
-		test_conn_init(&fixture->conns[i]);
-	}
-
-	for (size_t i = 0U; i < ARRAY_SIZE(fixture->eps); i++) {
-		fixture->eps[i].dir = (i & 1) + 1; /* Makes it either 1 or 2 (sink or source)*/
-	}
-
-	for (size_t i = 0U; i < ARRAY_SIZE(fixture->cap_streams); i++) {
-		struct bt_cap_stream *cap_stream = &fixture->cap_streams[i];
-		struct bt_bap_stream *bap_stream = &cap_stream->bap_stream;
-
-		sys_slist_append(&fixture->unicast_group.streams, &bap_stream->_node);
-		bap_stream->group = &fixture->unicast_group;
-	}
-}
-
-static void *cap_initiator_test_unicast_stop_setup(void)
-{
-	struct cap_initiator_test_unicast_stop_fixture *fixture;
-
-	fixture = malloc(sizeof(*fixture));
-	zassert_not_null(fixture);
-
-	return fixture;
-}
-
-static void cap_initiator_test_unicast_stop_before(void *f)
-{
-	int err;
-
-	memset(f, 0, sizeof(struct cap_initiator_test_unicast_stop_fixture));
-	cap_initiator_test_unicast_stop_fixture_init(f);
-
-	err = bt_cap_initiator_register_cb(&mock_cap_initiator_cb);
-	zassert_equal(0, err, "Unexpected return value %d", err);
-}
-
-static void cap_initiator_test_unicast_stop_after(void *f)
-{
-	struct cap_initiator_test_unicast_stop_fixture *fixture = f;
-
-	bt_cap_initiator_unregister_cb(&mock_cap_initiator_cb);
-
-	for (size_t i = 0; i < ARRAY_SIZE(fixture->conns); i++) {
-		mock_bt_conn_disconnected(&fixture->conns[i], BT_HCI_ERR_REMOTE_USER_TERM_CONN);
-	}
-
-	/* In the case of a test failing, we cancel the procedure so that subsequent won't fail */
-	bt_cap_initiator_unicast_audio_cancel();
-}
-
-static void cap_initiator_test_unicast_stop_teardown(void *f)
-{
-	free(f);
-}
-
-ZTEST_SUITE(cap_initiator_test_unicast_stop, NULL, cap_initiator_test_unicast_stop_setup,
-	    cap_initiator_test_unicast_stop_before, cap_initiator_test_unicast_stop_after,
-	    cap_initiator_test_unicast_stop_teardown);
-
-static ZTEST_F(cap_initiator_test_unicast_stop,
-	       test_initiator_unicast_stop_disable_state_codec_configured)
-{
-	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
-	const struct bt_cap_unicast_audio_stop_param param = {
-		.type = BT_CAP_SET_TYPE_AD_HOC,
-		.count = ARRAY_SIZE(streams),
-		.streams = streams,
-		.release = false,
-	};
-	int err;
-
-	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
-		streams[i] = &fixture->cap_streams[i];
-
-		test_unicast_set_state(streams[i], &fixture->conns[i % ARRAY_SIZE(fixture->conns)],
-				       &fixture->eps[i], &fixture->preset,
-				       BT_BAP_EP_STATE_CODEC_CONFIGURED);
-	}
-
-	err = bt_cap_initiator_unicast_audio_stop(&param);
-	zassert_equal(err, -EALREADY, "Unexpected return value %d", err);
-
-	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 0,
-			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
-
-	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
-		const struct bt_bap_stream *bap_stream = &fixture->cap_streams[i].bap_stream;
-		const enum bt_bap_ep_state state = bap_stream->ep->status.state;
-
-		zassert_equal(state, BT_BAP_EP_STATE_CODEC_CONFIGURED,
-			      "[%zu]: Stream %p unexpected state: %d", i, bap_stream, state);
-	}
-}
-
-static ZTEST_F(cap_initiator_test_unicast_stop,
-	       test_initiator_unicast_stop_disable_state_qos_configured)
-{
-	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
-	const struct bt_cap_unicast_audio_stop_param param = {
-		.type = BT_CAP_SET_TYPE_AD_HOC,
-		.count = ARRAY_SIZE(streams),
-		.streams = streams,
-		.release = false,
-	};
-	int err;
-
-	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
-		streams[i] = &fixture->cap_streams[i];
-
-		test_unicast_set_state(streams[i], &fixture->conns[i % ARRAY_SIZE(fixture->conns)],
-				       &fixture->eps[i], &fixture->preset,
-				       BT_BAP_EP_STATE_QOS_CONFIGURED);
-	}
-
-	err = bt_cap_initiator_unicast_audio_stop(&param);
-	zassert_equal(err, -EALREADY, "Unexpected return value %d", err);
-
-	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 0,
-			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
-
-	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
-		const struct bt_bap_stream *bap_stream = &fixture->cap_streams[i].bap_stream;
-		const enum bt_bap_ep_state state = bap_stream->ep->status.state;
-
-		zassert_equal(state, BT_BAP_EP_STATE_QOS_CONFIGURED,
-			      "[%zu]: Stream %p unexpected state: %d", i, bap_stream, state);
-	}
-}
-
-static ZTEST_F(cap_initiator_test_unicast_stop, test_initiator_unicast_stop_disable_state_enabling)
-{
-	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
-	const struct bt_cap_unicast_audio_stop_param param = {
-		.type = BT_CAP_SET_TYPE_AD_HOC,
-		.count = ARRAY_SIZE(streams),
-		.streams = streams,
-		.release = false,
-	};
-	int err;
-
-	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
-		streams[i] = &fixture->cap_streams[i];
-
-		test_unicast_set_state(streams[i], &fixture->conns[i % ARRAY_SIZE(fixture->conns)],
-				       &fixture->eps[i], &fixture->preset,
-				       BT_BAP_EP_STATE_ENABLING);
-	}
-
-	err = bt_cap_initiator_unicast_audio_stop(&param);
-	zassert_equal(err, 0, "Unexpected return value %d", err);
-
-	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 1,
-			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
-
-	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
-		const struct bt_bap_stream *bap_stream = &fixture->cap_streams[i].bap_stream;
-		const enum bt_bap_ep_state state = bap_stream->ep->status.state;
-
-		zassert_equal(state, BT_BAP_EP_STATE_QOS_CONFIGURED,
-			      "[%zu]: Stream %p unexpected state: %d", i, bap_stream, state);
-	}
-}
-
-static ZTEST_F(cap_initiator_test_unicast_stop, test_initiator_unicast_stop_disable_state_streaming)
-{
-	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
-	const struct bt_cap_unicast_audio_stop_param param = {
-		.type = BT_CAP_SET_TYPE_AD_HOC,
-		.count = ARRAY_SIZE(streams),
-		.streams = streams,
-		.release = false,
-	};
-	int err;
-
-	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
-		streams[i] = &fixture->cap_streams[i];
-
-		test_unicast_set_state(streams[i], &fixture->conns[i % ARRAY_SIZE(fixture->conns)],
-				       &fixture->eps[i], &fixture->preset,
-				       BT_BAP_EP_STATE_STREAMING);
-	}
-
-	err = bt_cap_initiator_unicast_audio_stop(&param);
-	zassert_equal(err, 0, "Unexpected return value %d", err);
-
-	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 1,
-			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
-
-	for (size_t i = 0U; i < ARRAY_SIZE(fixture->cap_streams); i++) {
-		const struct bt_bap_stream *bap_stream = &fixture->cap_streams[i].bap_stream;
-		const enum bt_bap_ep_state state = bap_stream->ep->status.state;
-
-		zassert_equal(state, BT_BAP_EP_STATE_QOS_CONFIGURED,
-			      "[%zu]: Stream %p unexpected state: %d", i, bap_stream, state);
-	}
-}
-
-static ZTEST_F(cap_initiator_test_unicast_stop,
-	       test_initiator_unicast_stop_release_state_codec_configured)
-{
-	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
-	const struct bt_cap_unicast_audio_stop_param param = {
-		.type = BT_CAP_SET_TYPE_AD_HOC,
-		.count = ARRAY_SIZE(streams),
-		.streams = streams,
-		.release = true,
-	};
-	int err;
-
-	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
-		streams[i] = &fixture->cap_streams[i];
-
-		test_unicast_set_state(streams[i], &fixture->conns[i % ARRAY_SIZE(fixture->conns)],
-				       &fixture->eps[i], &fixture->preset,
-				       BT_BAP_EP_STATE_CODEC_CONFIGURED);
-	}
-
-	err = bt_cap_initiator_unicast_audio_stop(&param);
-	zassert_equal(err, -EALREADY, "Unexpected return value %d", err);
-
-	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 0,
-			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
-
-	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
-		const struct bt_bap_stream *bap_stream = &fixture->cap_streams[i].bap_stream;
-		const enum bt_bap_ep_state state = bap_stream->ep->status.state;
-
-		zassert_equal(state, BT_BAP_EP_STATE_CODEC_CONFIGURED,
-			      "[%zu]: Stream %p unexpected state: %d", i, bap_stream, state);
-	}
-}
-
-static ZTEST_F(cap_initiator_test_unicast_stop,
-	       test_initiator_unicast_stop_release_state_qos_configured)
-{
-	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
-	const struct bt_cap_unicast_audio_stop_param param = {
-		.type = BT_CAP_SET_TYPE_AD_HOC,
-		.count = ARRAY_SIZE(streams),
-		.streams = streams,
-		.release = true,
-	};
-	int err;
-
-	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
-		streams[i] = &fixture->cap_streams[i];
-
-		test_unicast_set_state(streams[i], &fixture->conns[i % ARRAY_SIZE(fixture->conns)],
-				       &fixture->eps[i], &fixture->preset,
-				       BT_BAP_EP_STATE_QOS_CONFIGURED);
-	}
-
-	err = bt_cap_initiator_unicast_audio_stop(&param);
-	zassert_equal(err, 0, "Unexpected return value %d", err);
-
-	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 1,
-			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
-
-	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
-		const struct bt_bap_stream *bap_stream = &fixture->cap_streams[i].bap_stream;
-		const enum bt_bap_ep_state state = fixture->eps[i].status.state;
-
-		zassert_equal(state, BT_BAP_EP_STATE_IDLE, "[%zu]: Stream %p unexpected state: %d",
-			      i, bap_stream, state);
-	}
-}
-
-static ZTEST_F(cap_initiator_test_unicast_stop, test_initiator_unicast_stop_release_state_enabling)
-{
-	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
-	const struct bt_cap_unicast_audio_stop_param param = {
-		.type = BT_CAP_SET_TYPE_AD_HOC,
-		.count = ARRAY_SIZE(streams),
-		.streams = streams,
-		.release = true,
-	};
-	int err;
-
-	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
-		streams[i] = &fixture->cap_streams[i];
-
-		test_unicast_set_state(streams[i], &fixture->conns[i % ARRAY_SIZE(fixture->conns)],
-				       &fixture->eps[i], &fixture->preset,
-				       BT_BAP_EP_STATE_ENABLING);
-	}
-
-	err = bt_cap_initiator_unicast_audio_stop(&param);
-	zassert_equal(err, 0, "Unexpected return value %d", err);
-
-	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 1,
-			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
-
-	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
-		const struct bt_bap_stream *bap_stream = &fixture->cap_streams[i].bap_stream;
-		const enum bt_bap_ep_state state = fixture->eps[i].status.state;
-
-		zassert_equal(state, BT_BAP_EP_STATE_IDLE, "[%zu]: Stream %p unexpected state: %d",
-			      i, bap_stream, state);
-	}
-}
-
-static ZTEST_F(cap_initiator_test_unicast_stop, test_initiator_unicast_stop_release_state_streaming)
-{
-	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
-	const struct bt_cap_unicast_audio_stop_param param = {
-		.type = BT_CAP_SET_TYPE_AD_HOC,
-		.count = ARRAY_SIZE(streams),
-		.streams = streams,
-		.release = true,
-	};
-	int err;
-
-	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
-		streams[i] = &fixture->cap_streams[i];
-
-		test_unicast_set_state(streams[i], &fixture->conns[i % ARRAY_SIZE(fixture->conns)],
-				       &fixture->eps[i], &fixture->preset,
-				       BT_BAP_EP_STATE_ENABLING);
-	}
-
-	err = bt_cap_initiator_unicast_audio_stop(&param);
-	zassert_equal(err, 0, "Unexpected return value %d", err);
-
-	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 1,
-			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
-
-	for (size_t i = 0U; i < ARRAY_SIZE(fixture->cap_streams); i++) {
-		const struct bt_bap_stream *bap_stream = &fixture->cap_streams[i].bap_stream;
-		const enum bt_bap_ep_state state = fixture->eps[i].status.state;
-
-		zassert_equal(state, BT_BAP_EP_STATE_IDLE, "[%zu]: Stream %p unexpected state: %d",
-			      i, bap_stream, state);
-	}
-}
-
-static ZTEST_F(cap_initiator_test_unicast_stop, test_initiator_unicast_stop_inval_param_null)
-{
-	int err;
-
-	err = bt_cap_initiator_unicast_audio_stop(NULL);
-	zassert_equal(err, -EINVAL, "Unexpected return value %d", err);
-
-	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 0,
-			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
-}
-
-static ZTEST_F(cap_initiator_test_unicast_stop,
-	       test_initiator_unicast_stop_inval_param_null_streams)
-{
-	const struct bt_cap_unicast_audio_stop_param param = {
-		.type = BT_CAP_SET_TYPE_AD_HOC,
-		.count = CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT,
-		.streams = NULL,
-		.release = true,
-	};
-	int err;
-
-	err = bt_cap_initiator_unicast_audio_stop(&param);
-	zassert_equal(err, -EINVAL, "Unexpected return value %d", err);
-
-	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 0,
-			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
-}
-
-static ZTEST_F(cap_initiator_test_unicast_stop, test_initiator_unicast_stop_inval_missing_cas)
-{
-	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
-	const struct bt_cap_unicast_audio_stop_param param = {
-		.type = BT_CAP_SET_TYPE_CSIP, /* CSIP requires CAS */
-		.count = ARRAY_SIZE(streams),
-		.streams = streams,
-		.release = true,
-	};
-	int err;
-
-	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
-		streams[i] = &fixture->cap_streams[i];
-
-		test_unicast_set_state(streams[i], &fixture->conns[i % ARRAY_SIZE(fixture->conns)],
-				       &fixture->eps[i], &fixture->preset,
-				       BT_BAP_EP_STATE_STREAMING);
-	}
-
-	err = bt_cap_initiator_unicast_audio_stop(&param);
-	zassert_equal(err, -EINVAL, "Unexpected return value %d", err);
-
-	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 0,
-			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
-}
-
-static ZTEST_F(cap_initiator_test_unicast_stop, test_initiator_unicast_stop_inval_param_zero_count)
-{
-	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
-	const struct bt_cap_unicast_audio_stop_param param = {
-		.type = BT_CAP_SET_TYPE_AD_HOC,
-		.count = 0U,
-		.streams = streams,
-		.release = true,
-	};
-	int err;
-
-	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
-		streams[i] = &fixture->cap_streams[i];
-	}
-
-	err = bt_cap_initiator_unicast_audio_stop(&param);
-	zassert_equal(err, -EINVAL, "Unexpected return value %d", err);
-
-	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 0,
-			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
-}
-
-static ZTEST_F(cap_initiator_test_unicast_stop, test_initiator_unicast_stop_inval_param_inval_count)
-{
-	struct bt_cap_stream *streams[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT] = {0};
-	const struct bt_cap_unicast_audio_stop_param param = {
-		.type = BT_CAP_SET_TYPE_AD_HOC,
-		.count = CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT + 1U,
-		.streams = streams,
-		.release = true,
-	};
-	int err;
-
-	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
-		streams[i] = &fixture->cap_streams[i];
-	}
-
-	err = bt_cap_initiator_unicast_audio_stop(&param);
-	zassert_equal(err, -EINVAL, "Unexpected return value %d", err);
-
-	zexpect_call_count("bt_cap_initiator_cb.unicast_stop_complete_cb", 0,
-			   mock_cap_initiator_unicast_stop_complete_cb_fake.call_count);
-}
diff --git a/tests/bluetooth/audio/cap_initiator/uut/bap_unicast_client.c b/tests/bluetooth/audio/cap_initiator/uut/bap_unicast_client.c
index 387aeaf41ba..52feeeb15d3 100644
--- a/tests/bluetooth/audio/cap_initiator/uut/bap_unicast_client.c
+++ b/tests/bluetooth/audio/cap_initiator/uut/bap_unicast_client.c
@@ -12,7 +12,6 @@
 
 #include <zephyr/bluetooth/audio/audio.h>
 #include <zephyr/bluetooth/audio/bap.h>
-#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/slist.h>
 #include <sys/errno.h>
@@ -150,6 +149,7 @@ int bt_bap_unicast_client_connect(struct bt_bap_stream *stream)
 	if (stream->ep != NULL && stream->ep->dir == BT_AUDIO_DIR_SINK) {
 		/* Mocking that the unicast server automatically starts the stream */
 		stream->ep->status.state = BT_BAP_EP_STATE_STREAMING;
+		printk("A %s %p\n", __func__, stream);
 
 		if (stream->ops != NULL && stream->ops->started != NULL) {
 			stream->ops->started(stream);
@@ -184,105 +184,18 @@ int bt_bap_unicast_client_start(struct bt_bap_stream *stream)
 
 int bt_bap_unicast_client_disable(struct bt_bap_stream *stream)
 {
-	printk("%s %p %d\n", __func__, stream, stream->ep->dir);
-
-	if (stream == NULL || stream->ep == NULL) {
-		return -EINVAL;
-	}
-
-	switch (stream->ep->status.state) {
-	case BT_BAP_EP_STATE_ENABLING:
-	case BT_BAP_EP_STATE_STREAMING:
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	/* Even though the ASCS spec does not have the disabling state for sink ASEs, the unicast
-	 * client implementation fakes the behavior of it and always calls the disabled callback
-	 * when leaving the streaming state in a non-release manner
-	 */
-
-	/* Disabled sink ASEs go directly to the QoS configured state */
-	if (stream->ep->dir == BT_AUDIO_DIR_SINK) {
-		stream->ep->status.state = BT_BAP_EP_STATE_QOS_CONFIGURED;
-
-		if (stream->ops != NULL && stream->ops->disabled != NULL) {
-			stream->ops->disabled(stream);
-		}
-
-		if (stream->ops != NULL && stream->ops->stopped != NULL) {
-			stream->ops->stopped(stream, BT_HCI_ERR_LOCALHOST_TERM_CONN);
-		}
-
-		if (stream->ops != NULL && stream->ops->qos_set != NULL) {
-			stream->ops->qos_set(stream);
-		}
-	} else if (stream->ep->dir == BT_AUDIO_DIR_SOURCE) {
-		stream->ep->status.state = BT_BAP_EP_STATE_DISABLING;
-
-		if (stream->ops != NULL && stream->ops->disabled != NULL) {
-			stream->ops->disabled(stream);
-		}
-	}
-
+	zassert_unreachable("Unexpected call to '%s()' occurred", __func__);
 	return 0;
 }
 
 int bt_bap_unicast_client_stop(struct bt_bap_stream *stream)
 {
-	printk("%s %p\n", __func__, stream);
-
-	/* As per the ASCS spec, only source streams can be stopped by the client */
-	if (stream == NULL || stream->ep == NULL || stream->ep->dir == BT_AUDIO_DIR_SINK) {
-		return -EINVAL;
-	}
-
-	switch (stream->ep->status.state) {
-	case BT_BAP_EP_STATE_DISABLING:
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	stream->ep->status.state = BT_BAP_EP_STATE_QOS_CONFIGURED;
-
-	if (stream->ops != NULL && stream->ops->stopped != NULL) {
-		stream->ops->stopped(stream, BT_HCI_ERR_LOCALHOST_TERM_CONN);
-	}
-
-	if (stream->ops != NULL && stream->ops->qos_set != NULL) {
-		stream->ops->qos_set(stream);
-	}
-
+	zassert_unreachable("Unexpected call to '%s()' occurred", __func__);
 	return 0;
 }
 
 int bt_bap_unicast_client_release(struct bt_bap_stream *stream)
 {
-	printk("%s %p\n", __func__, stream);
-
-	if (stream == NULL || stream->ep == NULL) {
-		return -EINVAL;
-	}
-
-	switch (stream->ep->status.state) {
-	case BT_BAP_EP_STATE_CODEC_CONFIGURED:
-	case BT_BAP_EP_STATE_QOS_CONFIGURED:
-	case BT_BAP_EP_STATE_ENABLING:
-	case BT_BAP_EP_STATE_STREAMING:
-	case BT_BAP_EP_STATE_DISABLING:
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	stream->ep->status.state = BT_BAP_EP_STATE_IDLE;
-	bt_bap_stream_reset(stream);
-
-	if (stream->ops != NULL && stream->ops->released != NULL) {
-		stream->ops->released(stream);
-	}
-
+	zassert_unreachable("Unexpected call to '%s()' occurred", __func__);
 	return 0;
 }
diff --git a/tests/bluetooth/tester/src/audio/btp_cap.c b/tests/bluetooth/tester/src/audio/btp_cap.c
index fda96ee3602..3c42ad292f7 100644
--- a/tests/bluetooth/tester/src/audio/btp_cap.c
+++ b/tests/bluetooth/tester/src/audio/btp_cap.c
@@ -438,7 +438,6 @@ static uint8_t btp_cap_unicast_audio_stop(const void *cmd, uint16_t cmd_len,
 	param.streams = streams;
 	param.count = stream_cnt;
 	param.type = BT_CAP_SET_TYPE_AD_HOC;
-	param.release = true;
 
 	err = bt_cap_initiator_unicast_audio_stop(&param);
 	if (err != 0) {
diff --git a/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c b/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c
index 719ef3f742c..24c697e0339 100644
--- a/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c
+++ b/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c
@@ -682,6 +682,17 @@ static void unicast_audio_update(void)
 	printk("READ LONG META\n");
 }
 
+static void unicast_audio_stop_inval(void)
+{
+	int err;
+
+	err = bt_cap_initiator_unicast_audio_stop(NULL);
+	if (err == 0) {
+		FAIL("bt_cap_initiator_unicast_audio_stop with NULL param did not fail\n");
+		return;
+	}
+}
+
 static void unicast_audio_stop(struct bt_bap_unicast_group *unicast_group)
 {
 	struct bt_cap_unicast_audio_stop_param param;
@@ -690,30 +701,8 @@ static void unicast_audio_stop(struct bt_bap_unicast_group *unicast_group)
 	param.type = BT_CAP_SET_TYPE_AD_HOC;
 	param.count = non_idle_streams_cnt;
 	param.streams = non_idle_streams;
-	param.release = false;
-
-	/* Stop without release first to verify that we enter the QoS Configured state */
-	UNSET_FLAG(flag_stopped);
-
-	err = bt_cap_initiator_unicast_audio_stop(&param);
-	if (err != 0) {
-		FAIL("Failed to stop unicast audio without release: %d\n", err);
-		return;
-	}
-
-	WAIT_FOR_FLAG(flag_stopped);
-
-	/* Verify that it cannot be stopped twice */
-	err = bt_cap_initiator_unicast_audio_stop(&param);
-	if (err == 0) {
-		FAIL("bt_cap_initiator_unicast_audio_stop without release with already-stopped "
-		     "streams did not fail\n");
-		return;
-	}
 
-	/* Stop with release first to verify that we enter the idle state */
 	UNSET_FLAG(flag_stopped);
-	param.release = true;
 
 	err = bt_cap_initiator_unicast_audio_stop(&param);
 	if (err != 0) {
@@ -831,6 +820,7 @@ static void test_main_cap_initiator_unicast_inval(void)
 	unicast_audio_update_inval();
 	unicast_audio_update();
 
+	unicast_audio_stop_inval();
 	unicast_audio_stop(unicast_group);
 
 	unicast_group_delete_inval();
diff --git a/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c b/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c
index a9d80d39dd6..be16111858e 100644
--- a/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c
+++ b/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c
@@ -928,7 +928,6 @@ static void unicast_audio_stop(struct bt_bap_unicast_group *unicast_group)
 	param.type = BT_CAP_SET_TYPE_AD_HOC;
 	param.count = started_unicast_streams_cnt;
 	param.streams = started_unicast_streams;
-	param.release = true;
 
 	err = bt_cap_initiator_unicast_audio_stop(&param);
 	if (err != 0) {

From 5f5421fcd9fbc4d20a64cc8049db8f2ecd878996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:28 +0100
Subject: [PATCH 1434/2913] Revert "[nrf fromtree] Bluetooth: CSIP: Fix
 off-by-one in in lock restore"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 482819def8f79d7be107d99fdea982bd0e42e9ce.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/audio/csip_set_coordinator.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/subsys/bluetooth/audio/csip_set_coordinator.c b/subsys/bluetooth/audio/csip_set_coordinator.c
index 2d83aa41c6a..b09d32dd890 100644
--- a/subsys/bluetooth/audio/csip_set_coordinator.c
+++ b/subsys/bluetooth/audio/csip_set_coordinator.c
@@ -1114,7 +1114,7 @@ static void csip_set_coordinator_write_lock_cb(struct bt_conn *conn,
 
 			active.members_restored = 0;
 
-			member = active.members[active.members_handled - 1];
+			member = active.members[active.members_handled - active.members_restored];
 			client->cur_inst = lookup_instance_by_set_info(member, &active.info);
 			if (client->cur_inst == NULL) {
 				LOG_DBG("Failed to lookup instance by set_info");
@@ -1131,10 +1131,10 @@ static void csip_set_coordinator_write_lock_cb(struct bt_conn *conn,
 				active_members_reset();
 				return;
 			}
-		} else {
-			lock_set_complete(err);
 		}
 
+		lock_set_complete(err);
+
 		return;
 	}
 

From 32cce843091f2c9a50d55699af02f5c5fc98ee82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:28 +0100
Subject: [PATCH 1435/2913] Revert "[nrf fromtree] Bluetooth: CSIP: Handle
 disconnects while in procedure"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e988078915c69310c87300d3fcf48ab6b7a87ea2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/audio/csip_set_coordinator.c | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/subsys/bluetooth/audio/csip_set_coordinator.c b/subsys/bluetooth/audio/csip_set_coordinator.c
index b09d32dd890..2b0c53db23c 100644
--- a/subsys/bluetooth/audio/csip_set_coordinator.c
+++ b/subsys/bluetooth/audio/csip_set_coordinator.c
@@ -58,7 +58,7 @@ LOG_MODULE_REGISTER(bt_csip_set_coordinator, CONFIG_BT_CSIP_SET_COORDINATOR_LOG_
 
 static struct active_members {
 	struct bt_csip_set_coordinator_set_member *members[CONFIG_BT_MAX_CONN];
-	struct bt_csip_set_coordinator_set_info info;
+	const struct bt_csip_set_coordinator_set_info *info;
 	uint8_t members_count;
 	uint8_t members_handled;
 	uint8_t members_restored;
@@ -169,7 +169,7 @@ static struct bt_csip_set_coordinator_svc_inst *lookup_instance_by_set_info(
 
 		member_set_info = &member->insts[i].info;
 		if (member_set_info->set_size == set_info->set_size &&
-		    memcmp(member_set_info->sirk, set_info->sirk, sizeof(set_info->sirk)) == 0) {
+		    memcmp(&member_set_info->sirk, &set_info->sirk, sizeof(set_info->sirk)) == 0) {
 			return bt_csip_set_coordinator_lookup_instance_by_index(inst->conn, i);
 		}
 	}
@@ -184,9 +184,9 @@ static struct bt_csip_set_coordinator_svc_inst *get_next_active_instance(void)
 
 	member = active.members[active.members_handled];
 
-	svc_inst = lookup_instance_by_set_info(member, &active.info);
+	svc_inst =  lookup_instance_by_set_info(member, active.info);
 	if (svc_inst == NULL) {
-		LOG_DBG("Failed to lookup instance by set_info");
+		LOG_DBG("Failed to lookup instance by set_info %p", active.info);
 	}
 
 	return svc_inst;
@@ -201,8 +201,8 @@ static int member_rank_compare_asc(const void *m1, const void *m2)
 	struct bt_csip_set_coordinator_svc_inst *svc_inst_1;
 	struct bt_csip_set_coordinator_svc_inst *svc_inst_2;
 
-	svc_inst_1 = lookup_instance_by_set_info(member_1, &active.info);
-	svc_inst_2 = lookup_instance_by_set_info(member_2, &active.info);
+	svc_inst_1 = lookup_instance_by_set_info(member_1, active.info);
+	svc_inst_2 = lookup_instance_by_set_info(member_2, active.info);
 
 	if (svc_inst_1 == NULL) {
 		LOG_ERR("svc_inst_1 was NULL for member %p", member_1);
@@ -232,7 +232,7 @@ static void active_members_store_ordered(const struct bt_csip_set_coordinator_se
 {
 	(void)memcpy(active.members, members, count * sizeof(members[0U]));
 	active.members_count = count;
-	memcpy(&active.info, info, sizeof(active.info));
+	active.info = info;
 
 	if (count > 1U && CONFIG_BT_MAX_CONN > 1) {
 		qsort(active.members, count, sizeof(members[0U]),
@@ -1080,7 +1080,7 @@ static void csip_set_coordinator_write_restore_cb(struct bt_conn *conn,
 		int csip_err;
 
 		member = active.members[active.members_handled - active.members_restored - 1];
-		client->cur_inst = lookup_instance_by_set_info(member, &active.info);
+		client->cur_inst = lookup_instance_by_set_info(member, active.info);
 		if (client->cur_inst == NULL) {
 			release_set_complete(-ENOENT);
 
@@ -1115,9 +1115,9 @@ static void csip_set_coordinator_write_lock_cb(struct bt_conn *conn,
 			active.members_restored = 0;
 
 			member = active.members[active.members_handled - active.members_restored];
-			client->cur_inst = lookup_instance_by_set_info(member, &active.info);
+			client->cur_inst = lookup_instance_by_set_info(member, active.info);
 			if (client->cur_inst == NULL) {
-				LOG_DBG("Failed to lookup instance by set_info");
+				LOG_DBG("Failed to lookup instance by set_info %p", active.info);
 
 				lock_set_complete(-ENOENT);
 				return;
@@ -1215,7 +1215,7 @@ static void csip_set_coordinator_write_release_cb(struct bt_conn *conn, uint8_t
 
 static void csip_set_coordinator_lock_state_read_cb(int err, bool locked)
 {
-	const struct bt_csip_set_coordinator_set_info *info = &active.info;
+	const struct bt_csip_set_coordinator_set_info *info = active.info;
 	struct bt_csip_set_coordinator_set_member *cur_member = NULL;
 
 	if (err || locked) {
@@ -1607,9 +1607,9 @@ csip_set_coordinator_get_lock_state(const struct bt_csip_set_coordinator_set_mem
 	for (uint8_t i = 0U; i < count; i++) {
 		struct bt_csip_set_coordinator_svc_inst *svc_inst;
 
-		svc_inst = lookup_instance_by_set_info(active.members[i], &active.info);
+		svc_inst = lookup_instance_by_set_info(active.members[i], active.info);
 		if (svc_inst == NULL) {
-			LOG_DBG("Failed to lookup instance by set_info");
+			LOG_DBG("Failed to lookup instance by set_info %p", active.info);
 
 			active_members_reset();
 			return -ENOENT;
@@ -1633,11 +1633,11 @@ csip_set_coordinator_get_lock_state(const struct bt_csip_set_coordinator_set_mem
 		 * here.
 		 */
 		if (active.oap_cb == NULL ||
-		    !active.oap_cb(&active.info, active.members, active.members_count)) {
+		    !active.oap_cb(active.info, active.members, active.members_count)) {
 			err = -ECANCELED;
 		}
 
-		ordered_access_complete(&active.info, err, false, NULL);
+		ordered_access_complete(active.info, err, false, NULL);
 	}
 
 	return err;
@@ -1690,9 +1690,9 @@ int bt_csip_set_coordinator_lock(
 
 	active_members_store_ordered(members, count, set_info, true);
 
-	svc_inst = lookup_instance_by_set_info(active.members[0], &active.info);
+	svc_inst = lookup_instance_by_set_info(active.members[0], active.info);
 	if (svc_inst == NULL) {
-		LOG_DBG("Failed to lookup instance by set_info");
+		LOG_DBG("Failed to lookup instance by set_info %p", active.info);
 
 		active_members_reset();
 		return -ENOENT;
@@ -1732,9 +1732,9 @@ int bt_csip_set_coordinator_release(const struct bt_csip_set_coordinator_set_mem
 
 	active_members_store_ordered(members, count, set_info, false);
 
-	svc_inst = lookup_instance_by_set_info(active.members[0], &active.info);
+	svc_inst = lookup_instance_by_set_info(active.members[0], active.info);
 	if (svc_inst == NULL) {
-		LOG_DBG("Failed to lookup instance by set_info");
+		LOG_DBG("Failed to lookup instance by set_info %p", active.info);
 
 		active_members_reset();
 		return -ENOENT;

From 7215c06811c86bb942f640c93e6313ac49dccb99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:28 +0100
Subject: [PATCH 1436/2913] Revert "[nrf fromtree] tests: Bluetooth: Tester:
 Fix use of uninitialized cig_id for CAP"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 714a26b9397865ec9f92848660728d51bc96321d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/bluetooth/tester/src/audio/btp_bap_unicast.c | 1 -
 tests/bluetooth/tester/src/audio/btp_bap_unicast.h | 4 ----
 tests/bluetooth/tester/src/audio/btp_cap.c         | 8 ++++----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/tests/bluetooth/tester/src/audio/btp_bap_unicast.c b/tests/bluetooth/tester/src/audio/btp_bap_unicast.c
index f71096bc167..0a78441f013 100644
--- a/tests/bluetooth/tester/src/audio/btp_bap_unicast.c
+++ b/tests/bluetooth/tester/src/audio/btp_bap_unicast.c
@@ -1131,7 +1131,6 @@ int btp_bap_unicast_group_create(uint8_t cig_id,
 	}
 
 	cigs[cig_id].in_use = true;
-	cigs[cig_id].cig_id = cig_id;
 	*out_unicast_group = &cigs[cig_id];
 
 	return 0;
diff --git a/tests/bluetooth/tester/src/audio/btp_bap_unicast.h b/tests/bluetooth/tester/src/audio/btp_bap_unicast.h
index 24651ec5a19..1ac0bac1aa9 100644
--- a/tests/bluetooth/tester/src/audio/btp_bap_unicast.h
+++ b/tests/bluetooth/tester/src/audio/btp_bap_unicast.h
@@ -2,13 +2,10 @@
 
 /*
  * Copyright (c) 2023 Codecoup
- * Copyright (c) 2024 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
-
 #include <zephyr/bluetooth/audio/cap.h>
 
 #define BTP_BAP_UNICAST_MAX_SNK_STREAMS_COUNT MIN(CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT, \
@@ -23,7 +20,6 @@
 struct btp_bap_unicast_group {
 	struct bt_audio_codec_qos qos[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT];
 	struct bt_bap_unicast_group *cig;
-	uint8_t cig_id;
 	bool in_use;
 };
 
diff --git a/tests/bluetooth/tester/src/audio/btp_cap.c b/tests/bluetooth/tester/src/audio/btp_cap.c
index 3c42ad292f7..19986060b94 100644
--- a/tests/bluetooth/tester/src/audio/btp_cap.c
+++ b/tests/bluetooth/tester/src/audio/btp_cap.c
@@ -104,13 +104,13 @@ static void unicast_start_complete_cb(int err, struct bt_conn *conn)
 
 	if (err != 0) {
 		LOG_DBG("Failed to unicast-start, err %d", err);
-		btp_send_cap_unicast_start_completed_ev(u_group->cig_id,
+		btp_send_cap_unicast_start_completed_ev(u_group->cig->index,
 							BTP_CAP_UNICAST_START_STATUS_FAILED);
 
 		return;
 	}
 
-	btp_send_cap_unicast_start_completed_ev(u_group->cig_id,
+	btp_send_cap_unicast_start_completed_ev(u_group->cig->index,
 						BTP_CAP_UNICAST_START_STATUS_SUCCESS);
 }
 
@@ -129,13 +129,13 @@ static void unicast_stop_complete_cb(int err, struct bt_conn *conn)
 
 	if (err != 0) {
 		LOG_DBG("Failed to unicast-stop, err %d", err);
-		btp_send_cap_unicast_stop_completed_ev(u_group->cig_id,
+		btp_send_cap_unicast_stop_completed_ev(u_group->cig->index,
 						       BTP_CAP_UNICAST_START_STATUS_FAILED);
 
 		return;
 	}
 
-	btp_send_cap_unicast_stop_completed_ev(u_group->cig_id,
+	btp_send_cap_unicast_stop_completed_ev(u_group->cig->index,
 					       BTP_CAP_UNICAST_START_STATUS_SUCCESS);
 }
 

From 3e12011166e9a4b0c1c44a6aa197c0cd158c38c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:29 +0100
Subject: [PATCH 1437/2913] Revert "[nrf noup] Bluetooth: Mesh: Disable
 processing of ext ADV packets"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f2772ab39ad889d5a0133364436e172ee6eb52b8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/mesh/Kconfig   | 11 -----------
 subsys/bluetooth/mesh/adv_ext.c | 12 ------------
 2 files changed, 23 deletions(-)

diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 5232ed081d6..ecbe1a7305b 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -210,17 +210,6 @@ config BT_MESH_ADV_EXT_FRIEND_SEPARATE
 	  messages as close to the start of the ReceiveWindow as possible,
 	  thus reducing the scanning time on the Low Power node.
 
-config BT_MESH_ADV_EXT_ACCEPT_EXT_ADV_PACKETS
-	bool "Reject or accept extended advertising packets"
-	depends on BT_LL_SOFTDEVICE
-	help
-	  Configure the scanner and initiator to either reject or accept extended
-	  advertising packets by the SoftDevice Controller. This is set to false
-	  by default, to prevent loss of scan time when receiving a pointer packet
-	  while scanning for Bluetooth Mesh packets. Set to true if extended
-	  advertising packets are to be received by the SoftDevice Controller for
-	  purposes other than Bluetooth Mesh.
-
 endif # BT_MESH_ADV_EXT
 
 endchoice
diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index 519485c3135..0ee63079ea5 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -478,18 +478,6 @@ void bt_mesh_adv_init(void)
 				   K_PRIO_COOP(MESH_WORKQ_PRIORITY), NULL);
 		k_thread_name_set(&bt_mesh_workq.thread, "BT MESH WQ");
 	}
-
-#if defined(CONFIG_BT_LL_SOFTDEVICE)
-	const sdc_hci_cmd_vs_scan_accept_ext_adv_packets_set_t cmd_params = {
-		.accept_ext_adv_packets = IS_ENABLED(CONFIG_BT_MESH_ADV_EXT_ACCEPT_EXT_ADV_PACKETS),
-	};
-
-	int err = sdc_hci_cmd_vs_scan_accept_ext_adv_packets_set(&cmd_params);
-
-	if (err) {
-		LOG_ERR("Failed to set accept_ext_adv_packets: %d", err);
-	}
-#endif
 }
 
 static struct bt_mesh_ext_adv *adv_instance_find(struct bt_le_ext_adv *instance)

From 717329e643d9dd2c9fee3586f2e5b2f5ecc5ee57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:29 +0100
Subject: [PATCH 1438/2913] Revert "[nrf fromtree] Bluetooth: Mesh: Introduce
 separate workq for ADV EXT"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 70bff191c4d64eb5d5be2bc80a371591639ae2e1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/releases/release-notes-4.0.rst            |  5 --
 subsys/bluetooth/mesh/Kconfig                 | 58 -------------------
 subsys/bluetooth/mesh/adv.h                   |  2 -
 subsys/bluetooth/mesh/adv_ext.c               | 39 ++-----------
 subsys/bluetooth/mesh/adv_legacy.c            |  5 --
 subsys/bluetooth/mesh/proxy_msg.c             | 49 +---------------
 subsys/bluetooth/mesh/proxy_msg.h             |  3 -
 subsys/bluetooth/mesh/proxy_srv.c             |  2 +-
 tests/bsim/bluetooth/mesh/compile.sh          |  5 +-
 .../bluetooth/mesh/overlay_workq_sys.conf     |  1 -
 tests/bsim/bluetooth/mesh/src/test_suspend.c  |  3 -
 .../mesh/tests_scripts/advertiser/disable.sh  |  3 -
 .../tests_scripts/advertiser/proxy_mixin.sh   |  3 -
 .../tests_scripts/advertiser/random_order.sh  |  3 -
 .../tests_scripts/advertiser/reverse_order.sh |  3 -
 .../tests_scripts/advertiser/send_order.sh    |  3 -
 .../tests_scripts/advertiser/tx_cb_multi.sh   |  3 -
 .../tests_scripts/advertiser/tx_cb_single.sh  |  3 -
 .../tests_scripts/proxy_sol/sol_replay.sh     | 12 ----
 19 files changed, 8 insertions(+), 197 deletions(-)
 delete mode 100644 tests/bsim/bluetooth/mesh/overlay_workq_sys.conf

diff --git a/doc/releases/release-notes-4.0.rst b/doc/releases/release-notes-4.0.rst
index 44527737e3b..76eaa3ac62f 100644
--- a/doc/releases/release-notes-4.0.rst
+++ b/doc/releases/release-notes-4.0.rst
@@ -107,11 +107,6 @@ Bluetooth
 
 * HCI Drivers
 
-* Mesh
-
-  * Introduced a mesh-specific workqueue to increase reliability of the mesh messages
-    transmission. To get the old behavior enable :kconfig:option:`CONFIG_BT_MESH_WORKQ_SYS`.
-
 Boards & SoC Support
 ********************
 
diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index ecbe1a7305b..3c362ce2641 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -107,64 +107,6 @@ menuconfig BT_MESH_ADV_EXT
 
 if BT_MESH_ADV_EXT
 
-choice BT_MESH_WORKQ_CONTEXT
-	prompt "Advertising thread selection"
-	default BT_MESH_WORKQ_MESH
-	help
-	  Defines a context for mesh messages transmission.
-
-config BT_MESH_WORKQ_MESH
-	bool "Mesh-specific workqueue"
-	help
-	  When this option is selected, the mesh sends messages from the
-	  mesh-specific workqueue. This will ensure that messages are always sent.
-	  The application needs to ensure the mesh-specific workqueue size is large
-	  enough. Refer to BT_MESH_ADV_STACK_SIZE for the recommended minimum.
-
-config BT_MESH_WORKQ_SYS
-	bool "System workqueue"
-	help
-	  When this option is selected, the mesh sends messages from
-	  the system work queue. The application needs to ensure the system
-	  workqueue stack size (SYSTEM_WORKQUEUE_STACK_SIZE) is large enough,
-	  refer to BT_MESH_ADV_STACK_SIZE for the recommended minimum.
-
-	  When this option is enabled and the mesh tries to send a message,
-	  and the host ran out the HCI command buffers controlled by
-	  CONFIG_BT_BUF_CMD_TX_COUNT, the host returns -ENOBUFS immediately
-	  and the mesh drops the message transmission. To mitigate this
-	  issue, make sure to have sufficient number of HCI command buffers.
-	  When this option is enabled, the latency of sending mesh messages
-	  will be affected by other users on the system work queue, resulting in
-	  reduced reliability for sending mesh messages.
-
-endchoice
-
-if BT_MESH_WORKQ_MESH
-
-config BT_MESH_ADV_STACK_SIZE
-	int "Mesh extended advertiser thread stack size"
-	default 1536 if BT_MESH_PROXY
-	default 1024 if BT_HOST_CRYPTO
-	default 776 if BT_MESH_PRIV_BEACONS
-	default 768
-	help
-	  Size of bt mesh adv thread stack.
-
-	  NOTE: This is an advanced setting and should not be changed unless
-	  absolutely necessary
-
-config BT_MESH_ADV_PRIO
-	int "Mesh advertiser thread priority"
-	default 7
-	help
-	  Priority of bt mesh adv thread.
-
-	  NOTE: This is an advanced setting and should not be changed unless
-	  absolutely necessary
-
-endif # BT_MESH_WORKQ_MESH
-
 config BT_MESH_RELAY_ADV_SETS
 	int "Maximum of simultaneous relay message support"
 	default 0
diff --git a/subsys/bluetooth/mesh/adv.h b/subsys/bluetooth/mesh/adv.h
index 563a2118b71..cbe4f6e9adb 100644
--- a/subsys/bluetooth/mesh/adv.h
+++ b/subsys/bluetooth/mesh/adv.h
@@ -123,6 +123,4 @@ int bt_mesh_scan_active_set(bool active);
 int bt_mesh_adv_bt_data_send(uint8_t num_events, uint16_t adv_interval,
 			     const struct bt_data *ad, size_t ad_len);
 
-int bt_mesh_wq_submit(struct k_work *work);
-
 #endif /* ZEPHYR_SUBSYS_BLUETOOTH_MESH_ADV_H_ */
diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index 0ee63079ea5..0dcdab9adf8 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -36,14 +36,6 @@ LOG_MODULE_REGISTER(bt_mesh_adv_ext);
 #define CONFIG_BT_MESH_RELAY_ADV_SETS 0
 #endif
 
-#ifdef CONFIG_BT_MESH_ADV_STACK_SIZE
-#define MESH_WORKQ_PRIORITY   CONFIG_BT_MESH_ADV_PRIO
-#define MESH_WORKQ_STACK_SIZE CONFIG_BT_MESH_ADV_STACK_SIZE
-#else
-#define MESH_WORKQ_PRIORITY   0
-#define MESH_WORKQ_STACK_SIZE 0
-#endif
-
 enum {
 	/** Controller is currently advertising */
 	ADV_FLAG_ACTIVE,
@@ -80,15 +72,6 @@ struct bt_mesh_ext_adv {
 static void send_pending_adv(struct k_work *work);
 static bool schedule_send(struct bt_mesh_ext_adv *ext_adv);
 
-static struct k_work_q bt_mesh_workq;
-static K_KERNEL_STACK_DEFINE(thread_stack, MESH_WORKQ_STACK_SIZE);
-
-#if defined(CONFIG_BT_MESH_WORKQ_MESH)
-#define MESH_WORKQ &bt_mesh_workq
-#else /* CONFIG_BT_MESH_WORKQ_SYS */
-#define MESH_WORKQ &k_sys_work_q
-#endif /* CONFIG_BT_MESH_WORKQ_MESH */
-
 static struct bt_mesh_ext_adv advs[] = {
 	[0] = {
 		.tags = (
@@ -300,7 +283,7 @@ static bool schedule_send_with_mask(struct bt_mesh_ext_adv *ext_adv, int ignore_
 	}
 
 	atomic_clear_bit(ext_adv->flags, ADV_FLAG_SCHEDULE_PENDING);
-	bt_mesh_wq_submit(&ext_adv->work);
+	k_work_submit(&ext_adv->work);
 
 	return true;
 }
@@ -449,7 +432,7 @@ int bt_mesh_adv_terminate(struct bt_mesh_adv *adv)
 
 		atomic_set_bit(ext_adv->flags, ADV_FLAG_SENT);
 
-		bt_mesh_wq_submit(&ext_adv->work);
+		k_work_submit(&ext_adv->work);
 
 		return 0;
 	}
@@ -471,13 +454,6 @@ void bt_mesh_adv_init(void)
 	for (int i = 0; i < ARRAY_SIZE(advs); i++) {
 		(void)memcpy(&advs[i].adv_param, &adv_param, sizeof(adv_param));
 	}
-
-	if (IS_ENABLED(CONFIG_BT_MESH_WORKQ_MESH)) {
-		k_work_queue_init(&bt_mesh_workq);
-		k_work_queue_start(&bt_mesh_workq, thread_stack, MESH_WORKQ_STACK_SIZE,
-				   K_PRIO_COOP(MESH_WORKQ_PRIORITY), NULL);
-		k_thread_name_set(&bt_mesh_workq.thread, "BT MESH WQ");
-	}
 }
 
 static struct bt_mesh_ext_adv *adv_instance_find(struct bt_le_ext_adv *instance)
@@ -507,7 +483,7 @@ static void adv_sent(struct bt_le_ext_adv *instance,
 
 	atomic_set_bit(ext_adv->flags, ADV_FLAG_SENT);
 
-	bt_mesh_wq_submit(&ext_adv->work);
+	k_work_submit(&ext_adv->work);
 }
 
 #if defined(CONFIG_BT_MESH_GATT_SERVER)
@@ -561,13 +537,13 @@ int bt_mesh_adv_enable(void)
 
 int bt_mesh_adv_disable(void)
 {
-	struct k_work_sync sync;
 	int err;
+	struct k_work_sync sync;
 
 	for (int i = 0; i < ARRAY_SIZE(advs); i++) {
 		atomic_set_bit(advs[i].flags, ADV_FLAG_SUSPENDING);
 
-		if (k_current_get() != k_work_queue_thread_get(MESH_WORKQ) ||
+		if (k_current_get() != &k_sys_work_q.thread ||
 		    (k_work_busy_get(&advs[i].work) & K_WORK_RUNNING) == 0) {
 			k_work_flush(&advs[i].work, &sync);
 		}
@@ -620,8 +596,3 @@ int bt_mesh_adv_bt_data_send(uint8_t num_events, uint16_t adv_interval,
 {
 	return bt_data_send(advs, num_events, adv_interval, ad, ad_len);
 }
-
-int bt_mesh_wq_submit(struct k_work *work)
-{
-	return k_work_submit_to_queue(MESH_WORKQ, work);
-}
diff --git a/subsys/bluetooth/mesh/adv_legacy.c b/subsys/bluetooth/mesh/adv_legacy.c
index 8b14055bd75..c79a118cf15 100644
--- a/subsys/bluetooth/mesh/adv_legacy.c
+++ b/subsys/bluetooth/mesh/adv_legacy.c
@@ -258,8 +258,3 @@ int bt_mesh_adv_gatt_start(const struct bt_le_adv_param *param, int32_t duration
 	adv_timeout = duration;
 	return bt_le_adv_start(param, ad, ad_len, sd, sd_len);
 }
-
-int bt_mesh_wq_submit(struct k_work *work)
-{
-	return k_work_submit(work);
-}
diff --git a/subsys/bluetooth/mesh/proxy_msg.c b/subsys/bluetooth/mesh/proxy_msg.c
index 861935f58cc..e2818f8634b 100644
--- a/subsys/bluetooth/mesh/proxy_msg.c
+++ b/subsys/bluetooth/mesh/proxy_msg.c
@@ -64,15 +64,6 @@ static void proxy_sar_timeout(struct k_work *work)
 	LOG_WRN("Proxy SAR timeout");
 
 	role = CONTAINER_OF(dwork, struct bt_mesh_proxy_role, sar_timer);
-
-	while (!k_fifo_is_empty(&role->pending)) {
-		struct bt_mesh_adv *adv = k_fifo_get(&role->pending, K_NO_WAIT);
-
-		__ASSERT_NO_MSG(adv);
-
-		bt_mesh_adv_unref(adv);
-	}
-
 	if (role->conn) {
 		bt_conn_disconnect(role->conn,
 				   BT_HCI_ERR_REMOTE_USER_TERM_CONN);
@@ -209,7 +200,7 @@ static void buf_send_end(struct bt_conn *conn, void *user_data)
 	bt_mesh_adv_unref(adv);
 }
 
-static int proxy_relay_send(struct bt_conn *conn, struct bt_mesh_adv *adv)
+int bt_mesh_proxy_relay_send(struct bt_conn *conn, struct bt_mesh_adv *adv)
 {
 	int err;
 
@@ -239,41 +230,6 @@ static int proxy_relay_send(struct bt_conn *conn, struct bt_mesh_adv *adv)
 	return err;
 }
 
-int bt_mesh_proxy_relay_send(struct bt_conn *conn, struct bt_mesh_adv *adv)
-{
-	struct bt_mesh_proxy_role *role = &roles[bt_conn_index(conn)];
-
-	k_fifo_put(&role->pending, bt_mesh_adv_ref(adv));
-
-	bt_mesh_wq_submit(&role->work);
-
-	return 0;
-}
-
-static void proxy_msg_send_pending(struct k_work *work)
-{
-	struct bt_mesh_proxy_role *role;
-	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
-	struct bt_mesh_adv *adv;
-
-	role = CONTAINER_OF(dwork, struct bt_mesh_proxy_role, sar_timer);
-	if (!role->conn) {
-		return;
-	}
-
-	adv = k_fifo_get(&role->pending, K_NO_WAIT);
-	if (!adv) {
-		return;
-	}
-
-	(void)proxy_relay_send(role->conn, adv);
-	bt_mesh_adv_unref(adv);
-
-	if (!k_fifo_is_empty(&role->pending)) {
-		bt_mesh_wq_submit(&role->work);
-	}
-}
-
 static void proxy_msg_init(struct bt_mesh_proxy_role *role)
 {
 	/* Check if buf has been allocated, in this way, we no longer need
@@ -291,9 +247,6 @@ static void proxy_msg_init(struct bt_mesh_proxy_role *role)
 
 	net_buf_simple_reset(&role->buf);
 
-	k_fifo_init(&role->pending);
-	k_work_init(&role->work, proxy_msg_send_pending);
-
 	k_work_init_delayable(&role->sar_timer, proxy_sar_timeout);
 }
 
diff --git a/subsys/bluetooth/mesh/proxy_msg.h b/subsys/bluetooth/mesh/proxy_msg.h
index 99564b71693..7ad4be7ae5d 100644
--- a/subsys/bluetooth/mesh/proxy_msg.h
+++ b/subsys/bluetooth/mesh/proxy_msg.h
@@ -37,9 +37,6 @@ struct bt_mesh_proxy_role {
 	struct bt_conn *conn;
 	uint8_t msg_type;
 
-	struct k_fifo pending;
-	struct k_work work;
-
 	struct {
 		proxy_send_cb_t send;
 		proxy_recv_cb_t recv;
diff --git a/subsys/bluetooth/mesh/proxy_srv.c b/subsys/bluetooth/mesh/proxy_srv.c
index 32e865773b3..c3b33035a3f 100644
--- a/subsys/bluetooth/mesh/proxy_srv.c
+++ b/subsys/bluetooth/mesh/proxy_srv.c
@@ -917,7 +917,7 @@ static ssize_t proxy_ccc_write(struct bt_conn *conn,
 	client = find_client(conn);
 	if (client->filter_type == NONE) {
 		client->filter_type = ACCEPT;
-		bt_mesh_wq_submit(&client->send_beacons);
+		k_work_submit(&client->send_beacons);
 	}
 
 	return sizeof(value);
diff --git a/tests/bsim/bluetooth/mesh/compile.sh b/tests/bsim/bluetooth/mesh/compile.sh
index 05c51f7bfe1..aa86e6ccb25 100755
--- a/tests/bsim/bluetooth/mesh/compile.sh
+++ b/tests/bsim/bluetooth/mesh/compile.sh
@@ -15,15 +15,12 @@ app=tests/bsim/bluetooth/mesh conf_overlay=overlay_pst.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_gatt.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_low_lat.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_psa.conf compile
-app=tests/bsim/bluetooth/mesh conf_overlay=overlay_workq_sys.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_pst.conf;overlay_psa.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_gatt.conf;overlay_psa.conf" compile
-app=tests/bsim/bluetooth/mesh conf_overlay="overlay_gatt.conf;overlay_workq_sys.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_low_lat.conf;overlay_psa.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_gatt.conf;overlay_low_lat.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_pst.conf;overlay_gatt.conf" compile
 app=tests/bsim/bluetooth/mesh \
   conf_overlay="overlay_pst.conf;overlay_gatt.conf;overlay_psa.conf" compile
-app=tests/bsim/bluetooth/mesh \
-  conf_overlay="overlay_pst.conf;overlay_gatt.conf;overlay_workq_sys.conf" compile
+
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/mesh/overlay_workq_sys.conf b/tests/bsim/bluetooth/mesh/overlay_workq_sys.conf
deleted file mode 100644
index b4ee51bf8d5..00000000000
--- a/tests/bsim/bluetooth/mesh/overlay_workq_sys.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BT_MESH_WORKQ_SYS=y
diff --git a/tests/bsim/bluetooth/mesh/src/test_suspend.c b/tests/bsim/bluetooth/mesh/src/test_suspend.c
index ada25b0a22f..5ec6a8dc685 100644
--- a/tests/bsim/bluetooth/mesh/src/test_suspend.c
+++ b/tests/bsim/bluetooth/mesh/src/test_suspend.c
@@ -295,9 +295,6 @@ static void dut_pub_common(bool disable_bt)
 		ASSERT_OK_MSG(k_sem_take(&publish_sem, K_SECONDS(30)), "Pub timed out");
 	}
 
-	/* Allow publishing to finish before suspending. */
-	k_sleep(K_MSEC(100));
-
 	ASSERT_OK_MSG(bt_mesh_suspend(), "Failed to suspend Mesh.");
 
 	if (disable_bt) {
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/disable.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/disable.sh
index d0288a3964b..50d2a53a16d 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/disable.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/disable.sh
@@ -36,6 +36,3 @@ RunTest mesh_adv_disable adv_tx_disable adv_rx_disable
 # Low latency overlay uses legacy advertiser
 overlay=overlay_low_lat_conf
 RunTest mesh_adv_disable adv_tx_disable adv_rx_disable
-
-overlay=overlay_workq_sys_conf
-RunTest mesh_adv_disable_workq adv_tx_disable adv_rx_disable
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh
index fb6af48f651..6c49d03fe9f 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh
@@ -21,8 +21,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 overlay=overlay_gatt_conf
 RunTest mesh_adv_proxy_mixin adv_tx_proxy_mixin adv_rx_proxy_mixin
 
-overlay=overlay_gatt_conf_overlay_workq_sys_conf
-RunTest mesh_adv_proxy_mixin_workq adv_tx_proxy_mixin adv_rx_proxy_mixin
-
 overlay="overlay_gatt_conf_overlay_psa_conf"
 RunTest mesh_adv_proxy_mixin_psa adv_tx_proxy_mixin adv_rx_proxy_mixin
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh
index 5808d2cd508..a171ffd60f3 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh
@@ -7,8 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # test buffer management by filling buffers and sending them in random order.
 RunTest mesh_adv_random_order adv_tx_random_order adv_rx_random_order
 
-overlay=overlay_workq_sys_conf
-RunTest mesh_adv_random_order_workq adv_tx_random_order adv_rx_random_order
-
 overlay=overlay_psa_conf
 RunTest mesh_adv_random_order_psa adv_tx_random_order adv_rx_random_order
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh
index 1428833a35b..2b047138109 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh
@@ -7,8 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # test buffer management by filling all the buffer and sending them in reversed order.
 RunTest mesh_adv_reverse_order adv_tx_reverse_order adv_rx_receive_order
 
-overlay=overlay_workq_sys_conf
-RunTest mesh_adv_reverse_order_workq adv_tx_reverse_order adv_rx_receive_order
-
 overlay=overlay_psa_conf
 RunTest mesh_adv_reverse_order_psa adv_tx_reverse_order adv_rx_receive_order
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh
index 5122d7fdf05..a9e8d1ea861 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh
@@ -7,8 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # test buffer management by filling all the buffer and sending them all in order.
 RunTest mesh_adv_send_order adv_tx_send_order adv_rx_receive_order
 
-overlay=overlay_workq_sys_conf
-RunTest mesh_adv_send_order_workq adv_tx_send_order adv_rx_receive_order
-
 overlay=overlay_psa_conf
 RunTest mesh_adv_send_order_psa adv_tx_send_order adv_rx_receive_order
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh
index a7e3ec95437..4ca2838ddf9 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh
@@ -7,8 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # test tx callbacks sequence for multiple advs
 RunTest mesh_adv_tx_cb_multi adv_tx_cb_multi
 
-overlay=overlay_workq_sys_conf
-RunTest mesh_adv_tx_cb_multi_workq adv_tx_cb_multi
-
 overlay=overlay_psa_conf
 RunTest mesh_adv_tx_cb_multi_psa adv_tx_cb_multi
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh
index 48d81a60136..a2b1ad0e961 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh
@@ -7,8 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # test tx callbacks parameters and xmit sequence for single adv
 RunTest mesh_adv_tx_cb_single adv_tx_cb_single adv_rx_xmit
 
-overlay=overlay_workq_sys_conf
-RunTest mesh_adv_tx_cb_single_workq adv_tx_cb_single adv_rx_xmit
-
 overlay=overlay_psa_conf
 RunTest mesh_adv_tx_cb_single_psa adv_tx_cb_single adv_rx_xmit
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/proxy_sol/sol_replay.sh b/tests/bsim/bluetooth/mesh/tests_scripts/proxy_sol/sol_replay.sh
index 02f7c933254..c3da4435eb1 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/proxy_sol/sol_replay.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/proxy_sol/sol_replay.sh
@@ -32,18 +32,6 @@ RunTest mesh_srpl_replay_attack \
 	proxy_sol_iut_power_replay_attack \
 	-flash=../results/mesh_srpl_replay_attack/flash.bin -flash_rm
 
-overlay="overlay_pst_conf_overlay_gatt_conf_overlay_workq_sys_conf"
-RunTest mesh_srpl_replay_attack_workq \
-	proxy_sol_tester_immediate_replay_attack \
-	proxy_sol_iut_immediate_replay_attack \
-	-flash=../results/mesh_srpl_replay_attack/flash.bin -flash_erase
-
-overlay="overlay_pst_conf_overlay_gatt_conf_overlay_workq_sys_conf"
-RunTest mesh_srpl_replay_attack_workq \
-	proxy_sol_tester_power_replay_attack \
-	proxy_sol_iut_power_replay_attack \
-	-flash=../results/mesh_srpl_replay_attack/flash.bin -flash_rm
-
 overlay="overlay_pst_conf_overlay_gatt_conf_overlay_psa_conf"
 RunTest mesh_srpl_replay_attack_psa \
 	proxy_sol_tester_immediate_replay_attack \

From 348798916dfa2484cdc2cb9f274af6cd61beeb81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:29 +0100
Subject: [PATCH 1439/2913] Revert "[nrf fromlist] tests: bluetooth: tester:
 make hci_ipc confs generic for multi-core"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 79fa53e6d022384dfe1805219945ea78418e5e1b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/bluetooth/tester/{hci_ipc.conf => nrf5340_hci_ipc.conf}   | 0
 .../tester/{hci_ipc_cpunet.conf => nrf5340_hci_ipc_cpunet.conf} | 0
 tests/bluetooth/tester/sysbuild.cmake                           | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename tests/bluetooth/tester/{hci_ipc.conf => nrf5340_hci_ipc.conf} (100%)
 rename tests/bluetooth/tester/{hci_ipc_cpunet.conf => nrf5340_hci_ipc_cpunet.conf} (100%)

diff --git a/tests/bluetooth/tester/hci_ipc.conf b/tests/bluetooth/tester/nrf5340_hci_ipc.conf
similarity index 100%
rename from tests/bluetooth/tester/hci_ipc.conf
rename to tests/bluetooth/tester/nrf5340_hci_ipc.conf
diff --git a/tests/bluetooth/tester/hci_ipc_cpunet.conf b/tests/bluetooth/tester/nrf5340_hci_ipc_cpunet.conf
similarity index 100%
rename from tests/bluetooth/tester/hci_ipc_cpunet.conf
rename to tests/bluetooth/tester/nrf5340_hci_ipc_cpunet.conf
diff --git a/tests/bluetooth/tester/sysbuild.cmake b/tests/bluetooth/tester/sysbuild.cmake
index e2fc2ed0de8..31d50a8cec3 100644
--- a/tests/bluetooth/tester/sysbuild.cmake
+++ b/tests/bluetooth/tester/sysbuild.cmake
@@ -30,7 +30,7 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	endif()
 
 	set(${NET_APP}_EXTRA_CONF_FILE
-	 ${APP_DIR}/hci_ipc_cpunet.conf
+	 ${APP_DIR}/nrf5340_hci_ipc_cpunet.conf
 	 CACHE INTERNAL ""
 	)
 

From be9f1d411ca7119a9ebf84d0dc27ce62b7355ee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:29 +0100
Subject: [PATCH 1440/2913] Revert "[nrf noup] tests: bluetooth: tester:
 sysbuild configurable 53/54H"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a7c968ab77b97a1480a80e6baa31a29a6abc0f8d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf54h20_cpurad-bt_ll_softdevice.conf     | 33 -------------------
 tests/bluetooth/tester/Kconfig.sysbuild       |  1 -
 tests/bluetooth/tester/sysbuild.cmake         | 23 ++++---------
 3 files changed, 6 insertions(+), 51 deletions(-)
 delete mode 100644 samples/bluetooth/hci_ipc/nrf54h20_cpurad-bt_ll_softdevice.conf

diff --git a/samples/bluetooth/hci_ipc/nrf54h20_cpurad-bt_ll_softdevice.conf b/samples/bluetooth/hci_ipc/nrf54h20_cpurad-bt_ll_softdevice.conf
deleted file mode 100644
index 1f7748e5cd7..00000000000
--- a/samples/bluetooth/hci_ipc/nrf54h20_cpurad-bt_ll_softdevice.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-CONFIG_IPC_SERVICE=y
-CONFIG_MBOX=y
-
-CONFIG_ISR_STACK_SIZE=1024
-CONFIG_IDLE_STACK_SIZE=256
-CONFIG_MAIN_STACK_SIZE=512
-CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
-CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512
-CONFIG_HEAP_MEM_POOL_SIZE=8192
-
-CONFIG_BT=y
-CONFIG_BT_HCI_RAW=y
-
-CONFIG_BT_BUF_EVT_RX_COUNT=16
-CONFIG_BT_BUF_EVT_RX_SIZE=255
-CONFIG_BT_BUF_ACL_RX_SIZE=255
-CONFIG_BT_BUF_ACL_TX_SIZE=251
-CONFIG_BT_BUF_CMD_TX_SIZE=255
-
-# Host
-CONFIG_BT_BROADCASTER=y
-CONFIG_BT_PERIPHERAL=y
-CONFIG_BT_OBSERVER=y
-CONFIG_BT_CENTRAL=y
-CONFIG_BT_EXT_ADV=y
-CONFIG_BT_PER_ADV=y
-CONFIG_BT_PER_ADV_SYNC=y
-
-# Controller
-CONFIG_BT_LL_SW_SPLIT=n
-CONFIG_BT_LL_SOFTDEVICE=y
-CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
-CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191
diff --git a/tests/bluetooth/tester/Kconfig.sysbuild b/tests/bluetooth/tester/Kconfig.sysbuild
index 6d3a155c660..5256fa48d88 100644
--- a/tests/bluetooth/tester/Kconfig.sysbuild
+++ b/tests/bluetooth/tester/Kconfig.sysbuild
@@ -5,7 +5,6 @@ source "share/sysbuild/Kconfig"
 
 config NET_CORE_BOARD
 	string
-	default "nrf54h20dk/nrf54h20/cpurad" if "$(BOARD)" = "nrf54h20dk"
 	default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk"
 	default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk"
 
diff --git a/tests/bluetooth/tester/sysbuild.cmake b/tests/bluetooth/tester/sysbuild.cmake
index 31d50a8cec3..605d7ab74da 100644
--- a/tests/bluetooth/tester/sysbuild.cmake
+++ b/tests/bluetooth/tester/sysbuild.cmake
@@ -2,6 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
+	# For builds in the nrf5340, we build the netcore image with the controller
+
 	set(NET_APP hci_ipc)
 	set(NET_APP_SRC_DIR ${ZEPHYR_BASE}/samples/bluetooth/${NET_APP})
 
@@ -11,23 +13,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 		BOARD       ${SB_CONFIG_NET_CORE_BOARD}
 	)
 
-	if(SB_CONFIG_SOC_NRF5340_CPUAPP)
-		set(${NET_APP}_CONF_FILE
-		${NET_APP_SRC_DIR}/nrf5340_cpunet_iso-bt_ll_sw_split.conf
-		CACHE INTERNAL ""
-		)
-		set(${NET_APP}_SNIPPET
-		"bt-ll-sw-split"
-		CACHE INTERNAL ""
-		)
-	endif()
-
-	if(SB_CONFIG_SOC_NRF54H20_CPUAPP)
-		set(${NET_APP}_CONF_FILE
-		${NET_APP_SRC_DIR}/nrf54h20_cpurad-bt_ll_softdevice.conf
-		CACHE INTERNAL ""
-		)
-	endif()
+	set(${NET_APP}_CONF_FILE
+	 ${NET_APP_SRC_DIR}/nrf5340_cpunet_iso-bt_ll_sw_split.conf
+	 CACHE INTERNAL ""
+	)
 
 	set(${NET_APP}_EXTRA_CONF_FILE
 	 ${APP_DIR}/nrf5340_hci_ipc_cpunet.conf

From 4cc6a4d570a73f968f456c91449f1cd819ca066d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:29 +0100
Subject: [PATCH 1441/2913] Revert "[nrf fromtree] tests: Bluetooth: tester:
 Workaround Bus Fault in nRF53x using full RAM"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ce3e3b7c5dae126f6bf4d4c2066c45cea00ed952.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/bluetooth/tester/Kconfig.sysbuild       | 14 ---------
 .../tester/nrf5340_hci_ipc_cpunet.conf        | 10 ++-----
 tests/bluetooth/tester/sysbuild.cmake         | 29 -------------------
 tests/bluetooth/tester/testcase.yaml          |  7 +----
 4 files changed, 3 insertions(+), 57 deletions(-)
 delete mode 100644 tests/bluetooth/tester/Kconfig.sysbuild
 delete mode 100644 tests/bluetooth/tester/sysbuild.cmake

diff --git a/tests/bluetooth/tester/Kconfig.sysbuild b/tests/bluetooth/tester/Kconfig.sysbuild
deleted file mode 100644
index 5256fa48d88..00000000000
--- a/tests/bluetooth/tester/Kconfig.sysbuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2023-2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-source "share/sysbuild/Kconfig"
-
-config NET_CORE_BOARD
-	string
-	default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk"
-	default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk"
-
-config NET_CORE_IMAGE_HCI_IPC
-	bool "HCI IPC image on network core"
-	default y
-	depends on NET_CORE_BOARD != ""
diff --git a/tests/bluetooth/tester/nrf5340_hci_ipc_cpunet.conf b/tests/bluetooth/tester/nrf5340_hci_ipc_cpunet.conf
index c224508d51a..91f6566f208 100644
--- a/tests/bluetooth/tester/nrf5340_hci_ipc_cpunet.conf
+++ b/tests/bluetooth/tester/nrf5340_hci_ipc_cpunet.conf
@@ -1,11 +1,5 @@
 # Apply this overlay at hci_ipc controller build
-
-# Changes towards reduced RAM usage, in order to fit the tweaks
-CONFIG_HEAP_MEM_POOL_SIZE=7168
-
-# PTS required counts
-CONFIG_BT_MAX_CONN=3
-
-# PTS tests specific tweaks
+CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO_EARLY_CIG_START=y
 CONFIG_BT_CTLR_ISOAL_PSN_IGNORE=y
+CONFIG_BT_MAX_CONN=3
diff --git a/tests/bluetooth/tester/sysbuild.cmake b/tests/bluetooth/tester/sysbuild.cmake
deleted file mode 100644
index 605d7ab74da..00000000000
--- a/tests/bluetooth/tester/sysbuild.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2023-2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
-	# For builds in the nrf5340, we build the netcore image with the controller
-
-	set(NET_APP hci_ipc)
-	set(NET_APP_SRC_DIR ${ZEPHYR_BASE}/samples/bluetooth/${NET_APP})
-
-	ExternalZephyrProject_Add(
-		APPLICATION ${NET_APP}
-		SOURCE_DIR  ${NET_APP_SRC_DIR}
-		BOARD       ${SB_CONFIG_NET_CORE_BOARD}
-	)
-
-	set(${NET_APP}_CONF_FILE
-	 ${NET_APP_SRC_DIR}/nrf5340_cpunet_iso-bt_ll_sw_split.conf
-	 CACHE INTERNAL ""
-	)
-
-	set(${NET_APP}_EXTRA_CONF_FILE
-	 ${APP_DIR}/nrf5340_hci_ipc_cpunet.conf
-	 CACHE INTERNAL ""
-	)
-
-	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
-endif()
-
-native_simulator_set_final_executable(${DEFAULT_IMAGE})
diff --git a/tests/bluetooth/tester/testcase.yaml b/tests/bluetooth/tester/testcase.yaml
index d58a878bf3c..f0f8187112d 100644
--- a/tests/bluetooth/tester/testcase.yaml
+++ b/tests/bluetooth/tester/testcase.yaml
@@ -25,14 +25,9 @@ tests:
       - native_sim
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340_audio_dk/nrf5340/cpuapp
-    integration_platforms:
-      - nrf5340dk/nrf5340/cpuapp
-      - nrf5340_audio_dk/nrf5340/cpuapp
-    extra_args:
-      - EXTRA_CONF_FILE="overlay-le-audio.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-le-audio.conf"
     tags: bluetooth
     harness: bluetooth
-    sysbuild: true
   bluetooth.general.tester_mesh:
     build_only: true
     platform_allow:

From fa8309a04a9523d8a0e2a3383ff843bc91ff84b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:29 +0100
Subject: [PATCH 1442/2913] Revert "[nrf fromtree] tests: testcase.yaml:
 replace deprecated OVERLAY_CONFIG w\ EXTRA_CONF_FILE"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f51aec622f26ce6e526a3cba20edee8cb11d19a3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/bluetooth/shell/testcase.yaml       | 2 +-
 tests/bluetooth/tester/testcase.yaml      | 4 ++--
 tests/bsim/bluetooth/ll/bis/testcase.yaml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/bluetooth/shell/testcase.yaml b/tests/bluetooth/shell/testcase.yaml
index 26b2ae81efb..cec0a9d0046 100644
--- a/tests/bluetooth/shell/testcase.yaml
+++ b/tests/bluetooth/shell/testcase.yaml
@@ -53,7 +53,7 @@ tests:
     build_only: true
   bluetooth.shell.cdc_acm:
     extra_args:
-      - EXTRA_CONF_FILE=cdc_acm.conf
+      - OVERLAY_CONFIG=cdc_acm.conf
       - DTC_OVERLAY_FILE="usb.overlay"
     depends_on: usb_device
     platform_allow:
diff --git a/tests/bluetooth/tester/testcase.yaml b/tests/bluetooth/tester/testcase.yaml
index f0f8187112d..25a4fcf83d0 100644
--- a/tests/bluetooth/tester/testcase.yaml
+++ b/tests/bluetooth/tester/testcase.yaml
@@ -25,7 +25,7 @@ tests:
       - native_sim
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340_audio_dk/nrf5340/cpuapp
-    extra_args: EXTRA_CONF_FILE="overlay-le-audio.conf"
+    extra_args: OVERLAY_CONFIG="overlay-le-audio.conf"
     tags: bluetooth
     harness: bluetooth
   bluetooth.general.tester_mesh:
@@ -35,6 +35,6 @@ tests:
       - native_posix
       - native_sim
       - nrf52840dk/nrf52840
-    extra_args: EXTRA_CONF_FILE="overlay-mesh.conf"
+    extra_args: OVERLAY_CONFIG="overlay-mesh.conf"
     tags: bluetooth
     harness: bluetooth
diff --git a/tests/bsim/bluetooth/ll/bis/testcase.yaml b/tests/bsim/bluetooth/ll/bis/testcase.yaml
index befc282922f..c13d68f3fb7 100644
--- a/tests/bsim/bluetooth/ll/bis/testcase.yaml
+++ b/tests/bsim/bluetooth/ll/bis/testcase.yaml
@@ -19,7 +19,7 @@ tests:
     harness_config:
       bsim_exe_name: tests_bsim_bluetooth_ll_bis_prj_conf
   bluetooth.ll.bis_ticker_expire_info:
-    extra_args: EXTRA_CONF_FILE=overlay-ticker_expire_info.conf
+    extra_args: OVERLAY_CONFIG=overlay-ticker_expire_info.conf
     platform_allow:
       - nrf52_bsim
       - nrf5340bsim/nrf5340/cpunet

From 2d420fa0b52a0df23507a57065c8111d71491265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:29 +0100
Subject: [PATCH 1443/2913] Revert "[nrf fromtree] tests: Bluetooth: tester:
 Add nRF5340 ADK as platform"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 46b124ab786c3ff7f6605889789b002e2d4c99ea.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf5340_audio_dk_nrf5340_cpuapp.conf      | 25 -------------------
 .../nrf5340_audio_dk_nrf5340_cpuapp.overlay   | 14 -----------
 tests/bluetooth/tester/testcase.yaml          |  1 -
 3 files changed, 40 deletions(-)
 delete mode 100644 tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
 delete mode 100644 tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.overlay

diff --git a/tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
deleted file mode 100644
index 6f723ffa160..00000000000
--- a/tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# CONFIG_TEST enforces minimal logging, which we don't want
-CONFIG_TEST=n
-
-CONFIG_ASSERT=y
-# Enable the option below to measure stack usage
-#CONFIG_INIT_STACKS=y
-CONFIG_THREAD_NAME=y
-CONFIG_HW_STACK_PROTECTION=y
-
-CONFIG_LOG=y
-CONFIG_LOG_BUFFER_SIZE=4096
-CONFIG_RTT_CONSOLE=y
-CONFIG_LOG_BACKEND_RTT=y
-CONFIG_LOG_BACKEND_RTT_MODE_DROP=y
-CONFIG_USE_SEGGER_RTT=y
-CONFIG_SEGGER_RTT_BUFFER_SIZE_UP=4096
-CONFIG_LOG_BACKEND_SHOW_COLOR=n
-CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1024
-
-CONFIG_LOG_DEFAULT_LEVEL=3
-CONFIG_BTTESTER_LOG_LEVEL_DBG=y
-
-CONFIG_UART_INTERRUPT_DRIVEN=y
-
-CONFIG_BT_TINYCRYPT_ECC=y
diff --git a/tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.overlay b/tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.overlay
deleted file mode 100644
index 12d45e2d0f2..00000000000
--- a/tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.overlay
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-
-/ {
-	chosen {
-		zephyr,uart-pipe = &uart0;
-	};
-};
-
-&uart0 {
-	compatible = "nordic,nrf-uarte";
-	current-speed = <115200>;
-	status = "okay";
-	hw-flow-control;
-};
diff --git a/tests/bluetooth/tester/testcase.yaml b/tests/bluetooth/tester/testcase.yaml
index 25a4fcf83d0..93868152f7d 100644
--- a/tests/bluetooth/tester/testcase.yaml
+++ b/tests/bluetooth/tester/testcase.yaml
@@ -24,7 +24,6 @@ tests:
       - native_posix
       - native_sim
       - nrf5340dk/nrf5340/cpuapp
-      - nrf5340_audio_dk/nrf5340/cpuapp
     extra_args: OVERLAY_CONFIG="overlay-le-audio.conf"
     tags: bluetooth
     harness: bluetooth

From a64c4f60aa6653e19e1ce1827337a8b4fe596e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:29 +0100
Subject: [PATCH 1444/2913] Revert "[nrf fromtree] drivers: udc_nrf: fix
 enqueue of control IN transfer with length 0"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 71743aca0eee341ce85c1f8bd1113cb027f6312f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_nrf.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/udc/udc_nrf.c b/drivers/usb/udc/udc_nrf.c
index bf04a274ad6..0a1987eb017 100644
--- a/drivers/usb/udc/udc_nrf.c
+++ b/drivers/usb/udc/udc_nrf.c
@@ -561,7 +561,7 @@ static void udc_nrf_power_handler(nrfx_power_usb_evt_t pwr_evt)
 	}
 }
 
-static bool udc_nrf_fake_status_in(const struct device *dev)
+static void udc_nrf_fake_status_in(const struct device *dev)
 {
 	struct udc_nrf_evt evt = {
 		.type = UDC_NRF_EVT_STATUS_IN,
@@ -572,10 +572,7 @@ static bool udc_nrf_fake_status_in(const struct device *dev)
 	    udc_nrf_fake_setup) {
 		/* Let controller perform status IN stage */
 		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
-		return true;
 	}
-
-	return false;
 }
 
 static int udc_nrf_ep_enqueue(const struct device *dev,
@@ -590,9 +587,8 @@ static int udc_nrf_ep_enqueue(const struct device *dev,
 	udc_buf_put(cfg, buf);
 
 	if (cfg->addr == USB_CONTROL_EP_IN && buf->len == 0) {
-		if (udc_nrf_fake_status_in(dev)) {
-			return 0;
-		}
+		udc_nrf_fake_status_in(dev);
+		return 0;
 	}
 
 	k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);

From 55889eb4a0bc935eaa5f0d9dd86573377307d28d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:29 +0100
Subject: [PATCH 1445/2913] Revert "[nrf fromtree] drivers: udc_dwc2: Reduce
 TxFIFO0 allocation size"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 097679811ab9f39020f3822c4079c3e9f4065126.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 7e716201d3c..00e4a370bac 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -54,11 +54,8 @@ enum dwc2_drv_event_type {
  */
 #define UDC_DWC2_GRXFSIZ_HS_DEFAULT	(13 + 1 + 774)
 
-/* TX FIFO0 depth in 32-bit words (used by control IN endpoint)
- * Try 2 * bMaxPacketSize0 to allow simultaneous operation with a fallback to
- * whatever is available when 2 * bMaxPacketSize0 is not possible.
- */
-#define UDC_DWC2_FIFO0_DEPTH		(2 * 16U)
+/* TX FIFO0 depth in 32-bit words (used by control IN endpoint) */
+#define UDC_DWC2_FIFO0_DEPTH		16U
 
 /* Get Data FIFO access register */
 #define UDC_DWC2_EP_FIFO(base, idx)	((mem_addr_t)base + 0x1000 * (idx + 1))
@@ -1187,7 +1184,7 @@ static int dwc2_set_dedicated_fifo(const struct device *dev,
 				  dwc2_get_txfaddr(dev, ep_idx - 2);
 		} else {
 			txfaddr = priv->rxfifo_depth +
-				MIN(UDC_DWC2_FIFO0_DEPTH, priv->max_txfifo_depth[0]);
+				MAX(UDC_DWC2_FIFO0_DEPTH, priv->max_txfifo_depth[0]);
 		}
 
 		/* Make sure to not set TxFIFO greater than hardware allows */
@@ -1942,7 +1939,7 @@ static int udc_dwc2_init_controller(const struct device *dev)
 		sys_write32(usb_dwc2_set_grxfsiz(priv->rxfifo_depth), grxfsiz_reg);
 
 		/* Set TxFIFO 0 depth */
-		val = MIN(UDC_DWC2_FIFO0_DEPTH, priv->max_txfifo_depth[0]);
+		val = MAX(UDC_DWC2_FIFO0_DEPTH, priv->max_txfifo_depth[0]);
 		gnptxfsiz = usb_dwc2_set_gnptxfsiz_nptxfdep(val) |
 			    usb_dwc2_set_gnptxfsiz_nptxfstaddr(priv->rxfifo_depth);
 

From e4ef0d5eeb79200ea0270e0210c0a3273bfbee57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:29 +0100
Subject: [PATCH 1446/2913] Revert "[nrf fromtree] drivers: udc_dwc2: Handle IN
 events before OUT events"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6df36e5c12b58eea81577081e27bfda3e6951f95.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 00e4a370bac..917910ad26d 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -99,9 +99,9 @@ struct udc_dwc2_data {
 	struct k_thread thread_data;
 	/* Main events the driver thread waits for */
 	struct k_event drv_evt;
-	/* Transfer triggers (IN on bits 0-15, OUT on bits 16-31) */
+	/* Transfer triggers (OUT on bits 0-15, IN on bits 16-31) */
 	struct k_event xfer_new;
-	/* Finished transactions (IN on bits 0-15, OUT on bits 16-31) */
+	/* Finished transactions (OUT on bits 0-15, IN on bits 16-31) */
 	struct k_event xfer_finished;
 	struct dwc2_reg_backup backup;
 	uint32_t ghwcfg1;
@@ -1554,9 +1554,9 @@ static int udc_dwc2_ep_clear_halt(const struct device *dev,
 		uint32_t ep_bit;
 
 		if (USB_EP_DIR_IS_IN(cfg->addr)) {
-			ep_bit = BIT(USB_EP_GET_IDX(cfg->addr));
-		} else {
 			ep_bit = BIT(16 + USB_EP_GET_IDX(cfg->addr));
+		} else {
+			ep_bit = BIT(USB_EP_GET_IDX(cfg->addr));
 		}
 
 		k_event_post(&priv->xfer_new, ep_bit);
@@ -1579,9 +1579,9 @@ static int udc_dwc2_ep_enqueue(const struct device *dev,
 		uint32_t ep_bit;
 
 		if (USB_EP_DIR_IS_IN(cfg->addr)) {
-			ep_bit = BIT(USB_EP_GET_IDX(cfg->addr));
-		} else {
 			ep_bit = BIT(16 + USB_EP_GET_IDX(cfg->addr));
+		} else {
+			ep_bit = BIT(USB_EP_GET_IDX(cfg->addr));
 		}
 
 		k_event_post(&priv->xfer_new, ep_bit);
@@ -2346,7 +2346,7 @@ static inline void dwc2_handle_in_xfercompl(const struct device *dev,
 		return;
 	}
 
-	k_event_post(&priv->xfer_finished, BIT(ep_idx));
+	k_event_post(&priv->xfer_finished, BIT(16 + ep_idx));
 	k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
 }
 
@@ -2452,7 +2452,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 	    net_buf_tailroom(buf)) {
 		dwc2_prep_rx(dev, buf, ep_cfg);
 	} else {
-		k_event_post(&priv->xfer_finished, BIT(16 + ep_idx));
+		k_event_post(&priv->xfer_finished, BIT(ep_idx));
 		k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
 	}
 }
@@ -2803,9 +2803,9 @@ static uint8_t pull_next_ep_from_bitmap(uint32_t *bitmap)
 	*bitmap &= ~BIT(bit);
 
 	if (bit >= 16) {
-		return USB_EP_DIR_OUT | (bit - 16);
+		return USB_EP_DIR_IN | (bit - 16);
 	} else {
-		return USB_EP_DIR_IN | bit;
+		return USB_EP_DIR_OUT | bit;
 	}
 }
 

From 2ebf35a3247bb254560588993073fb5ff18fd9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:29 +0100
Subject: [PATCH 1447/2913] Revert "[nrf fromtree] drivers: udc_nrf: handle
 overwritten Set Address commands"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 21d29cd34b946cdb943fdd233087db398362a803.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_nrf.c | 119 +++-----------------------------------
 1 file changed, 9 insertions(+), 110 deletions(-)

diff --git a/drivers/usb/udc/udc_nrf.c b/drivers/usb/udc/udc_nrf.c
index 0a1987eb017..c024d2a6a18 100644
--- a/drivers/usb/udc/udc_nrf.c
+++ b/drivers/usb/udc/udc_nrf.c
@@ -70,8 +70,7 @@ static struct k_thread drv_stack_data;
 
 static struct udc_ep_config ep_cfg_out[CFG_EPOUT_CNT + CFG_EP_ISOOUT_CNT + 1];
 static struct udc_ep_config ep_cfg_in[CFG_EPIN_CNT + CFG_EP_ISOIN_CNT + 1];
-static bool udc_nrf_setup_rcvd, udc_nrf_setup_set_addr, udc_nrf_fake_setup;
-static uint8_t udc_nrf_address;
+static bool udc_nrf_setup_rcvd;
 const static struct device *udc_nrf_dev;
 
 struct udc_nrf_config {
@@ -144,9 +143,7 @@ static void udc_event_xfer_ctrl_in(const struct device *dev,
 	/* Update to next stage of control transfer */
 	udc_ctrl_update_stage(dev, buf);
 
-	if (!udc_nrf_setup_set_addr) {
-		nrf_usbd_common_setup_clear();
-	}
+	nrf_usbd_common_setup_clear();
 }
 
 static void udc_event_fake_status_in(const struct device *dev)
@@ -320,7 +317,6 @@ static int usbd_ctrl_feed_dout(const struct device *dev,
 
 static int udc_event_xfer_setup(const struct device *dev)
 {
-	nrf_usbd_common_setup_t *setup;
 	struct net_buf *buf;
 	int err;
 
@@ -332,77 +328,7 @@ static int udc_event_xfer_setup(const struct device *dev)
 	}
 
 	udc_ep_buf_set_setup(buf);
-	setup = (nrf_usbd_common_setup_t *)buf->data;
-	nrf_usbd_common_setup_get(setup);
-
-	/* USBD peripheral automatically handles Set Address in slightly
-	 * different manner than the USB stack.
-	 *
-	 * USBD peripheral doesn't care about wLength, but the peripheral
-	 * switches to new address only after status stage. The device won't
-	 * automatically accept Data Stage packets.
-	 *
-	 * However, in the case the host:
-	 *   * sends SETUP Set Address with non-zero wLength
-	 *   * does not send corresponding OUT DATA packets (to match wLength)
-	 *     or sends the packets but disregards NAK
-	 *     or sends the packets that device ACKs
-	 *   * sends IN token (either incorrectly proceeds to status stage, or
-	 *     manages to send IN before SW sets STALL)
-	 * then the USBD peripheral will accept the address and USB stack won't.
-	 * This will lead to state mismatch between the stack and peripheral.
-	 *
-	 * In cases where the USB stack would like to STALL the request there is
-	 * a race condition between host issuing Set Address status stage (IN
-	 * token) and SW setting STALL bit. If host wins the race, the device
-	 * ACKs status stage and use new address. If device wins the race, the
-	 * device STALLs status stage and address remains unchanged.
-	 */
-	udc_nrf_setup_set_addr =
-		setup->bmRequestType == 0 &&
-		setup->bRequest == USB_SREQ_SET_ADDRESS;
-	if (udc_nrf_setup_set_addr) {
-		if (setup->wLength) {
-			/* Currently USB stack only STALLs OUT Data Stage when
-			 * buffer allocation fails. To prevent the device from
-			 * ACKing the Data Stage, simply ignore the request
-			 * completely.
-			 *
-			 * If host incorrectly proceeds to status stage there
-			 * will be address mismatch (unless the new address is
-			 * equal to current device address). If host does not
-			 * issue IN token then the mismatch will be avoided.
-			 */
-			net_buf_unref(buf);
-			return 0;
-		}
-
-		/* nRF52/nRF53 USBD doesn't care about wValue bits 8..15 and
-		 * wIndex value but USB device stack does.
-		 *
-		 * Just clear the bits so stack will handle the request in the
-		 * same way as USBD peripheral does, avoiding the mismatch.
-		 */
-		setup->wValue &= 0x7F;
-		setup->wIndex = 0;
-	}
-
-	if (!udc_nrf_setup_set_addr && udc_nrf_address != NRF_USBD->USBADDR) {
-		/* Address mismatch detected. Fake Set Address handling to
-		 * correct the situation, then repeat handling.
-		 */
-		udc_nrf_fake_setup = true;
-		udc_nrf_setup_set_addr = true;
-
-		setup->bmRequestType = 0;
-		setup->bRequest = USB_SREQ_SET_ADDRESS;
-		setup->wValue = NRF_USBD->USBADDR;
-		setup->wIndex = 0;
-		setup->wLength = 0;
-	} else {
-		udc_nrf_fake_setup = false;
-	}
-
+	nrf_usbd_common_setup_get((nrf_usbd_common_setup_t *)buf->data);
 	net_buf_add(buf, sizeof(nrf_usbd_common_setup_t));
 	udc_nrf_setup_rcvd = true;
 
@@ -568,8 +494,7 @@ static void udc_nrf_fake_status_in(const struct device *dev)
 		.ep = USB_CONTROL_EP_IN,
 	};
 
-	if (nrf_usbd_common_last_setup_dir_get() == USB_CONTROL_EP_OUT ||
-	    udc_nrf_fake_setup) {
+	if (nrf_usbd_common_last_setup_dir_get() == USB_CONTROL_EP_OUT) {
 		/* Let controller perform status IN stage */
 		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
 	}
@@ -683,38 +608,12 @@ static int udc_nrf_ep_clear_halt(const struct device *dev,
 
 static int udc_nrf_set_address(const struct device *dev, const uint8_t addr)
 {
-	/*
-	 * If the status stage already finished (which depends entirely on when
-	 * the host sends IN token) then NRF_USBD->USBADDR will have the same
-	 * address, otherwise it won't (unless new address is unchanged).
-	 *
-	 * Store the address so the driver can detect address mismatches
-	 * between USB stack and USBD peripheral. The mismatches can occur if:
-	 *   * SW has high enough latency in SETUP handling, or
-	 *   * Host did not issue Status Stage after Set Address request
-	 *
-	 * The SETUP handling latency is a problem because the Set Address is
-	 * automatically handled by device. Because whole Set Address handling
-	 * can finish in less than 21 us, the latency required (with perfect
-	 * timing) to hit the issue is relatively short (2 ms Set Address
-	 * recovery interval + negligible Set Address handling time). If host
-	 * sends new SETUP before SW had a chance to read the Set Address one,
-	 * the Set Address one will be overwritten without a trace.
+	/**
+	 * Nothing to do here. The USBD HW already takes care of initiating
+	 * STATUS stage. Just double check the address for sanity.
 	 */
-	udc_nrf_address = addr;
-
-	if (udc_nrf_fake_setup) {
-		struct udc_nrf_evt evt = {
-			.type = UDC_NRF_EVT_HAL,
-			.hal_evt = {
-				.type = NRF_USBD_COMMON_EVT_SETUP,
-			},
-		};
-
-		/* Finished handling lost Set Address, now handle the pending
-		 * SETUP transfer.
-		 */
-		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+	if (addr != (uint8_t)NRF_USBD->USBADDR) {
+		LOG_WRN("USB Address incorrect 0x%02x", addr);
 	}
 
 	return 0;

From c5afe8058d8681b41a6b250e96fb60b26a4959b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:29 +0100
Subject: [PATCH 1448/2913] Revert "[nrf fromtree] usb: device_next: check
 wIndex on Set Address"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 17dbcbc137b90a2b9d685562e07913f21d93a850.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/usb/device_next/usbd_ch9.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/subsys/usb/device_next/usbd_ch9.c b/subsys/usb/device_next/usbd_ch9.c
index 6910c6df147..45775e88c53 100644
--- a/subsys/usb/device_next/usbd_ch9.c
+++ b/subsys/usb/device_next/usbd_ch9.c
@@ -86,8 +86,8 @@ static int sreq_set_address(struct usbd_context *const uds_ctx)
 	struct usb_setup_packet *setup = usbd_get_setup_pkt(uds_ctx);
 	struct udc_device_caps caps = udc_caps(uds_ctx->dev);
 
-	/* Not specified if wIndex or wLength is non-zero, treat as error */
-	if (setup->wValue > 127 || setup->wIndex || setup->wLength) {
+	/* Not specified if wLength is non-zero, treat as error */
+	if (setup->wValue > 127 || setup->wLength) {
 		errno = -ENOTSUP;
 		return 0;
 	}

From 58b5422f65c66f304caf42e6c007de83bf8ce61e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:29 +0100
Subject: [PATCH 1449/2913] Revert "[nrf fromtree] samples: boards: nordic:
 coresight_stm: Test STM dictionary mode"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fa58e795d190daf173dbda0f61d195a49bd26a3a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nordic/coresight_stm/README.rst    | 102 -------
 .../nordic/coresight_stm/pytest/test_stm.py   | 258 ------------------
 .../boards/nordic/coresight_stm/sample.yaml   |  44 +--
 3 files changed, 24 insertions(+), 380 deletions(-)
 delete mode 100644 samples/boards/nordic/coresight_stm/README.rst
 delete mode 100644 samples/boards/nordic/coresight_stm/pytest/test_stm.py

diff --git a/samples/boards/nordic/coresight_stm/README.rst b/samples/boards/nordic/coresight_stm/README.rst
deleted file mode 100644
index 370253cf41c..00000000000
--- a/samples/boards/nordic/coresight_stm/README.rst
+++ /dev/null
@@ -1,102 +0,0 @@
-.. zephyr:code-sample:: coresight_stm_sample
-   :name: Coresight STM benchmark
-   :relevant-api: log_api
-
-Overview
-********
-
-This sample presents how to enable STM logging on nRF54H20 platform.
-
-Also, it prints timing for different log messages.
-Thus, performance of different loggers can be compared.
-
-There are three sample configurations in the :file:`sample.yaml`.
-
-* **sample.boards.nrf.coresight_stm.local_uart**
-
-  This configuration doesn't use STM.
-  Logs are printed on local console.
-
-* **sample.boards.nrf.coresight_stm**
-
-  This configuration use STM.
-  Application, Radio, PPR and FLPR cores send logs to an ETR buffer.
-  Proxy (Application core) gets logs from the ETR buffer, decodes STPv2 data
-  and prints human readable logs on UART.
-
-* **sample.boards.nrf.coresight_stm.dict**
-
-  This sample uses STM logging in dictionary mode.
-  Application, Radio, PPR and FLPR cores send logs to the ETR buffer.
-  Proxy (Application core) forwards data from the ETR to the host using UART.
-  Host tool is needed to decode the logs.
-
-Requirements
-************
-
-This application uses nRF54H20 DK board for the demo.
-
-**sample.boards.nrf.coresight_stm.dict** requires host tool like ``nrfutil trace``
-to decode the traces.
-
-Building and running
-********************
-
-To build the sample, use configuration setups from the :file:`sample.yaml` using the ``-T`` option.
-See the example:
-
-nRF54H20 DK
-
-  .. code-block:: console
-
-     west build -p -b nrf54h20dk/nrf54h20/cpuapp -T sample.boards.nrf.coresight_stm .
-
-Sample Output
-=============
-
-.. code-block:: console
-
-   *** Using Zephyr OS v3.6.99-5bb7bb0af17c ***
-   (...)
-   [00:00:00.227,264] <inf> app/app: test with one argument 100
-   [00:00:00.227,265] <inf> app/app: test with one argument 100
-   (...)
-   [00:00:00.585,558] <inf> rad/app: test with one argument 100
-   [00:00:00.585,569] <inf> rad/app: test with one argument 100
-   (...)
-   [00:00:00.624,408] <inf> ppr/app: test with one argument 100
-   [00:00:00.624,433] <inf> ppr/app: test with one argument 100
-   (...)
-   [00:00:00.625,249] <inf> flpr/app: test with one argument 100
-   [00:00:00.625,251] <inf> flpr/app: test with one argument 100
-   (...)
-   rad: Timing for log message with 0 arguments: 5.10us
-   rad: Timing for log message with 1 argument: 6.10us
-   rad: Timing for log message with 2 arguments: 6.0us
-   rad: Timing for log message with 3 arguments: 6.40us
-   rad: Timing for log_message with string: 7.10us
-   rad: Timing for tracepoint: 0.5us
-   rad: Timing for tracepoint_d32: 0.5us
-   flpr: Timing for log message with 0 arguments: 1.20us
-   flpr: Timing for log message with 1 argument: 1.20us
-   flpr: Timing for log message with 2 arguments: 1.20us
-   flpr: Timing for log message with 3 arguments: 1.30us
-   flpr: Timing for log_message with string: 3.0us
-   flpr: Timing for tracepoint: 0.0us
-   flpr: Timing for tracepoint_d32: 0.0us
-   app: Timing for log message with 0 arguments: 1.80us
-   app: Timing for log message with 1 argument: 2.0us
-   app: Timing for log message with 2 arguments: 2.0us
-   app: Timing for log message with 3 arguments: 2.10us
-   app: Timing for log_message with string: 4.40us
-   app: Timing for tracepoint: 0.10us
-   app: Timing for tracepoint_d32: 0.10us
-   ppr: Timing for log message with 0 arguments: 25.20us
-   ppr: Timing for log message with 1 argument: 26.20us
-   ppr: Timing for log message with 2 arguments: 26.90us
-   ppr: Timing for log message with 3 arguments: 27.40us
-   ppr: Timing for log_message with string: 64.80us
-   ppr: Timing for tracepoint: 0.30us
-   ppr: Timing for tracepoint_d32: 0.25us
-
-For logging on NRF54H20 using ARM Coresight STM see :ref:`logging_cs_stm`.
diff --git a/samples/boards/nordic/coresight_stm/pytest/test_stm.py b/samples/boards/nordic/coresight_stm/pytest/test_stm.py
deleted file mode 100644
index 2187805f15f..00000000000
--- a/samples/boards/nordic/coresight_stm/pytest/test_stm.py
+++ /dev/null
@@ -1,258 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-import logging
-import re
-import subprocess
-from pathlib import Path
-from time import sleep
-
-import psutil
-from twister_harness import DeviceAdapter
-
-logger = logging.getLogger(__name__)
-
-SB_CONFIG_APP_CPUPPR_RUN = None
-SB_CONFIG_APP_CPUFLPR_RUN = None
-
-# https://github.com/zephyrproject-rtos/zephyr/blob/main/drivers/misc/coresight/nrf_etr.c#L102
-STM_M_ID = {
-    "sec": 33,
-    "app": 34,
-    "rad": 35,
-    "mod": 36,
-    "sys": 44,
-    "flpr": 45,
-    "ppr": 46,
-    "hw": 128,
-}
-
-
-def _analyse_autoconf(filepath: str) -> None:
-    global SB_CONFIG_APP_CPUPPR_RUN
-    global SB_CONFIG_APP_CPUFLPR_RUN
-
-    SB_CONFIG_APP_CPUPPR_RUN = False
-    SB_CONFIG_APP_CPUFLPR_RUN = False
-
-    # Parse contents of {BUILD_DIR}/_sysbuild/autoconf.h
-    with open(f"{filepath}", errors="ignore") as autoconf:
-        for line in autoconf:
-            if "SB_CONFIG_APP_CPUPPR_RUN 1" in line:
-                SB_CONFIG_APP_CPUPPR_RUN = True
-                continue
-            if "SB_CONFIG_APP_CPUFLPR_RUN 1" in line:
-                SB_CONFIG_APP_CPUFLPR_RUN = True
-    logger.debug(f"{SB_CONFIG_APP_CPUPPR_RUN=}")
-    logger.debug(f"{SB_CONFIG_APP_CPUFLPR_RUN=}")
-
-
-def _check_benchmark_results(output: str, core: str) -> None:
-    """
-    Use regular expressions to parse 'output' string.
-    Search for benchmark results related to 'core' coprocessor.
-    """
-
-    latency_msg_0_str = re.search(
-        rf"{core}: Timing for log message with 0 arguments: (.+)us", output
-    ).group(1)
-    assert latency_msg_0_str is not None, "Timing for log message with 0 arguments NOT found"
-
-    latency_msg_1_str = re.search(
-        rf"{core}: Timing for log message with 1 argument: (.+)us", output
-    ).group(1)
-    assert latency_msg_1_str is not None, "Timing for log message with 1 argument NOT found"
-
-    latency_msg_2_str = re.search(
-        rf"{core}: Timing for log message with 2 arguments: (.+)us", output
-    ).group(1)
-    assert latency_msg_2_str is not None, "Timing for log message with 2 arguments NOT found"
-
-    latency_msg_3_str = re.search(
-        rf"{core}: Timing for log message with 3 arguments: (.+)us", output
-    ).group(1)
-    assert latency_msg_3_str is not None, "Timing for log message with 3 arguments NOT found"
-
-    latency_msg_string_str = re.search(
-        rf"{core}: Timing for log_message with string: (.+)us", output
-    ).group(1)
-    assert latency_msg_string_str is not None, "Timing for log_message with string NOT found"
-
-    latency_tracepoint_str = re.search(
-        rf"{core}: Timing for tracepoint: (.+)us", output
-    ).group(1)
-    assert latency_tracepoint_str is not None, "Timing for tracepoint NOT found"
-
-    latency_tracepoint_d32_str = re.search(
-        rf"{core}: Timing for tracepoint_d32: (.+)us", output
-    ).group(1)
-    assert latency_tracepoint_d32_str is not None, "Timing for tracepoint_d32 NOT found"
-
-
-# nrfutil starts children processes
-# when subprocess.terminate(nrfutil_process) is executed, only the parent terminates
-# this blocks serial port for other uses
-def _kill(proc):
-    try:
-        for child in psutil.Process(proc.pid).children(recursive=True):
-            child.kill()
-        proc.kill()
-    except Exception as e:
-        logger.exception(f'Could not kill nrfutil - {e}')
-
-
-def _nrfutil_dictionary_from_serial(
-    dut: DeviceAdapter,
-    decoded_file_name: str = "output.txt",
-    collect_time: float = 60.0,
-) -> None:
-    UART_PATH = dut.device_config.serial
-    UART_BAUDRATE = dut.device_config.baud
-    dut.close()
-
-    logger.debug(f"Using serial: {UART_PATH}")
-
-    if Path(f"{decoded_file_name}").exists():
-        logger.warning("Output file already exists!")
-
-    # prepare database config string
-    BUILD_DIR = str(dut.device_config.build_dir)
-    logger.debug(f"{BUILD_DIR=}")
-    config_str = f"{STM_M_ID['app']}:{BUILD_DIR}/coresight_stm/zephyr/log_dictionary.json"
-    config_str = config_str + f",{STM_M_ID['rad']}:{BUILD_DIR}/remote_rad/zephyr/log_dictionary.json"
-    if SB_CONFIG_APP_CPUPPR_RUN:
-        config_str = config_str + f",{STM_M_ID['ppr']}:{BUILD_DIR}/remote_ppr/zephyr/log_dictionary.json"
-    if SB_CONFIG_APP_CPUFLPR_RUN:
-        config_str = config_str + f",{STM_M_ID['flpr']}:{BUILD_DIR}/remote_flpr/zephyr/log_dictionary.json"
-    logger.debug(f"{config_str=}")
-
-    cmd = (
-        "nrfutil trace stm --database-config "
-        f"{config_str} "
-        f"--input-serialport {UART_PATH} --baudrate {UART_BAUDRATE} "
-        f"--output-ascii {decoded_file_name}"
-    )
-    try:
-        # run nrfutil trace in background non-blocking
-        logger.info(f"Executing:\n{cmd}")
-        proc = subprocess.Popen(cmd.split(), stdout=subprocess.DEVNULL)
-    except OSError as exc:
-        logger.error(f"Unable to start nrfutil trace:\n{cmd}\n{exc}")
-    try:
-        proc.wait(collect_time)
-    except subprocess.TimeoutExpired:
-        pass
-    finally:
-        _kill(proc)
-
-
-def test_STM_decoded(dut: DeviceAdapter):
-    """
-    Run sample.boards.nrf.coresight_stm from samples/boards/nrf/coresight_stm sample.
-    Both Application and Radio cores use STM for logging.
-    STM proxy (Application core) decodes logs from all domains.
-    After reset, coprocessors execute code in expected way and Application core
-    outputs STM traces on UART port.
-    """
-    BUILD_DIR = str(dut.device_config.build_dir)
-    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
-
-    # nrf54h20 prints immediately after it is flashed.
-    # Wait a bit to skipp logs from previous test.
-    sleep(4)
-
-    # Get output from serial port
-    output = "\n".join(dut.readlines())
-
-    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
-    _analyse_autoconf(autoconf_file)
-
-    # check that LOGs from Application core are present
-    _check_benchmark_results(
-        output=output,
-        core='app',
-    )
-
-    # check that LOGs from Radio core are present
-    _check_benchmark_results(
-        output=output,
-        core='rad',
-    )
-
-    if SB_CONFIG_APP_CPUPPR_RUN:
-        # check that LOGs from PPR core are present
-        _check_benchmark_results(
-            output=output,
-            core='ppr',
-        )
-
-    if SB_CONFIG_APP_CPUFLPR_RUN:
-        # check that LOGs from FLPR core are present
-        _check_benchmark_results(
-            output=output,
-            core='flpr',
-        )
-
-
-def test_STM_dictionary_mode(dut: DeviceAdapter):
-    """
-    Run sample.boards.nrf.coresight_stm.dict from samples/boards/nrf/coresight_stm sample.
-    Both Application and Radio cores use STM for logging.
-    STM proxy (Application core) prints on serial port raw logs from all domains.
-    Nrfutil trace is used to decode STM logs.
-    After reset, coprocessors execute code in expected way and Application core
-    outputs STM traces on UART port.
-    """
-    BUILD_DIR = str(dut.device_config.build_dir)
-    test_filename = f"{BUILD_DIR}/coresight_stm_dictionary.txt"
-    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
-    COLLECT_TIMEOUT = 10.0
-
-    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
-    # this information is needed to build nrfutil database-config
-    _analyse_autoconf(autoconf_file)
-
-    # use nrfutil trace to decode logs
-    _nrfutil_dictionary_from_serial(
-        dut=dut,
-        decoded_file_name=f"{test_filename}",
-        collect_time=COLLECT_TIMEOUT,
-    )
-
-    # read decoded logs
-    with open(f"{test_filename}", errors="ignore") as decoded_file:
-        decoded_file_content = decoded_file.read()
-
-    # if nothing in decoded_file, stop test
-    assert(
-        len(decoded_file_content) > 0
-    ), f"File {test_filename} is empty"
-
-    # check that LOGs from Application core are present
-    _check_benchmark_results(
-        output=decoded_file_content,
-        core='app',
-    )
-
-    # check that LOGs from Radio core are present
-    _check_benchmark_results(
-        output=decoded_file_content,
-        core='rad',
-    )
-
-    if SB_CONFIG_APP_CPUPPR_RUN:
-        # check that LOGs from PPR core are present
-        _check_benchmark_results(
-            output=decoded_file_content,
-            core='ppr',
-        )
-
-    if SB_CONFIG_APP_CPUFLPR_RUN:
-        # check that LOGs from FLPR core are present
-        _check_benchmark_results(
-            output=decoded_file_content,
-            core='flpr',
-        )
diff --git a/samples/boards/nordic/coresight_stm/sample.yaml b/samples/boards/nordic/coresight_stm/sample.yaml
index 4251c5d6df8..eb3971a2f4e 100644
--- a/samples/boards/nordic/coresight_stm/sample.yaml
+++ b/samples/boards/nordic/coresight_stm/sample.yaml
@@ -1,40 +1,44 @@
 sample:
   name: Logging using Coresight STM on nrf54h20
-
 common:
-  tags: stm
   sysbuild: true
-  platform_allow:
-    - nrf54h20dk/nrf54h20/cpuapp
-  integration_platforms:
-    - nrf54h20dk/nrf54h20/cpuapp
-
 tests:
   sample.boards.nrf.coresight_stm.dict:
-    harness: pytest
-    harness_config:
-      pytest_dut_scope: session
-      pytest_root:
-        - "pytest/test_stm.py::test_STM_dictionary_mode"
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    build_only: true
     required_snippets:
       - nordic-log-stm-dict
     extra_args:
       - SB_CONFIG_APP_CPUPPR_RUN=y
       - SB_CONFIG_APP_CPUFLPR_RUN=y
-
   sample.boards.nrf.coresight_stm:
-    harness: pytest
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    harness: console
     harness_config:
-      pytest_dut_scope: session
-      pytest_root:
-        - "pytest/test_stm.py::test_STM_decoded"
-    required_snippets:
-      - nordic-log-stm
+      type: multi_line
+      ordered: true
+      regex:
+        - "Timing for log message with 0 arguments:"
+        - "Timing for log message with 1 argument:"
+        - "Timing for log message with 2 arguments:"
+        - "Timing for log message with 3 arguments:"
+        - "Timing for log_message with string:"
     extra_args:
       - SB_CONFIG_APP_CPUPPR_RUN=y
       - SB_CONFIG_APP_CPUFLPR_RUN=y
-
+    required_snippets:
+      - nordic-log-stm
   sample.boards.nrf.coresight_stm.local_uart:
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
     harness: console
     harness_config:
       type: multi_line

From ea97363907e5bc912bbe9cb0b3fd62e49cfed01f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:29 +0100
Subject: [PATCH 1450/2913] Revert "[nrf noup] modules: hal_nordic: adjust nrfx
 reservations to NCS"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3467a9ba9ef51fa296c1dc8960d1e936cab3b271.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/nrfx/Kconfig               |   2 +-
 .../nrfx/nrfx_config_reserved_resources_ncs.h | 916 ------------------
 2 files changed, 1 insertion(+), 917 deletions(-)
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h

diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 14087daf8c5..9fbd6587c80 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -1212,6 +1212,6 @@ endmenu
 
 config NRFX_RESERVED_RESOURCES_HEADER
 	string
-	default "nrfx_config_reserved_resources_ncs.h"
+	default "nrfx_config_reserved_resources.h"
 
 endmenu # "nrfx drivers"
diff --git a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h
deleted file mode 100644
index 554b049f29f..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h
+++ /dev/null
@@ -1,916 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_RESERVED_RESOURCES_H__
-#define NRFX_CONFIG_RESERVED_RESOURCES_H__
-
-/** @brief Bitmask that defines GPIOTE130 channels reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_GPIOTE130_CHANNELS_USED                                                               \
-	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), owned_channels) |                           \
-	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), child_owned_channels))
-
-/** @brief Bitmask that defines GPIOTE131 channels reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_GPIOTE131_CHANNELS_USED                                                               \
-	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), owned_channels) |                           \
-	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), child_owned_channels))
-
-/** @brief Bitmask that defines EGU instances that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_EGUS_USED 0
-
-/** @brief Bitmask that defines TIMER instances that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_TIMERS_USED 0
-
-/*
- * The enabled Bluetooth controller subsystem is responsible for providing
- * definitions of the BT_CTLR_USED_* symbols used below in a file named
- * bt_ctlr_used_resources.h and for adding its location to global include
- * paths so that the file can be included here for all Zephyr libraries that
- * are to be built.
- */
-#if defined(CONFIG_BT_LL_SW_SPLIT)
-#include <bt_ctlr_used_resources.h>
-#if defined(DPPI_PRESENT)
-#if defined(NRF53_SERIES)
-#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
-#define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
-#elif defined(NRF54L_SERIES)
-#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
-#define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
-#endif
-#else /* defined(DPPI_PRESENT) */
-#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
-#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
-#endif /* defined(DPPI_PRESENT) */
-#endif /* defined(CONFIG_BT_LL_SW_SPLIT) */
-
-#if defined(CONFIG_BT_LL_SOFTDEVICE)
-#include <sdc_soc.h>
-#if defined(NRF52_SERIES)
-#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR SDC_PPI_CHANNELS_USED_MASK
-#elif defined(NRF53_SERIES)
-#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR SDC_DPPI_CHANNELS_USED_MASK
-#elif defined(NRF54L_SERIES)
-#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC10_CHANNELS_USED_MASK
-#define NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC00_CHANNELS_USED_MASK
-#define NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR                                                   \
-	(SDC_PPIB00_CHANNELS_USED_MASK | SDC_PPIB10_CHANNELS_USED_MASK)
-#elif defined(NRF54H_SERIES)
-#define NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC020_CHANNELS_USED_MASK
-#define NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC030_CHANNELS_USED_MASK
-#define NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR                                                 \
-	(SDC_PPIB020_CHANNELS_USED_MASK | SDC_PPIB030_CHANNELS_USED_MASK)
-#else
-#error Unsupported chip family
-#endif
-#endif /* defined(CONFIG_BT_LL_SOFTDEVICE) */
-
-#if defined(CONFIG_NRF_802154_RADIO_DRIVER)
-#if defined(NRF52_SERIES)
-#include <../src/nrf_802154_peripherals_nrf52.h>
-#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV NRF_802154_PPI_CHANNELS_USED_MASK
-#define NRFX_PPI_GROUPS_USED_BY_802154_DRV   NRF_802154_PPI_GROUPS_USED_MASK
-#elif defined(NRF53_SERIES)
-#include <../src/nrf_802154_peripherals_nrf53.h>
-#define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
-#define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
-#elif defined(NRF54L_SERIES)
-#include <../src/nrf_802154_peripherals_nrf54l.h>
-#define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
-#define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
-#elif defined(NRF54H_SERIES)
-#include <../src/nrf_802154_peripherals_nrf54h.h>
-#define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
-#define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
-#else
-#error Unsupported chip family
-#endif
-#endif /* CONFIG_NRF_802154_RADIO_DRIVER */
-
-#if defined(CONFIG_MPSL)
-#include <mpsl.h>
-#if defined(NRF52_SERIES)
-#define NRFX_PPI_CHANNELS_USED_BY_MPSL MPSL_PPI_CHANNELS_USED_MASK
-#elif defined(NRF53_SERIES)
-#define NRFX_DPPI0_CHANNELS_USED_BY_MPSL MPSL_DPPIC_CHANNELS_USED_MASK
-#elif defined(NRF54L_SERIES)
-#define NRFX_DPPI10_CHANNELS_USED_BY_MPSL MPSL_DPPIC10_CHANNELS_USED_MASK
-#define NRFX_DPPI20_CHANNELS_USED_BY_MPSL MPSL_DPPIC20_CHANNELS_USED_MASK
-#define NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL                                                      \
-	(MPSL_PPIB11_CHANNELS_USED_MASK | MPSL_PPIB21_CHANNELS_USED_MASK)
-#elif defined(NRF54H_SERIES)
-#define NRFX_DPPI020_CHANNELS_USED_BY_MPSL MPSL_DPPIC020_CHANNELS_USED_MASK
-#else
-#error Unsupported chip family
-#endif
-#endif
-
-#ifndef NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI0_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI0_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI0_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI0_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI0_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI00_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI00_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI00_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI00_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI00_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI00_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI10_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI10_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI10_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI10_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI10_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI20_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI20_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI20_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI20_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI20_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI20_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI30_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI30_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI30_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI30_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI30_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI30_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI020_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI020_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI020_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI020_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI020_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI030_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI030_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI030_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI030_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI030_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI030_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI120_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI120_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI120_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI120_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI120_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI120_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI130_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI130_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI130_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI130_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI130_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI130_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI131_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI131_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI131_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI131_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI131_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI131_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI132_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI132_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI132_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI132_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI132_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI132_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI133_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI133_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI133_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI133_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI133_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI133_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI134_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI134_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI134_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI134_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI134_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI134_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI135_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI135_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI135_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI135_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI135_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI135_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI136_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI136_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI136_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI136_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI136_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI136_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPI_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPI_GROUPS_USED_BY_BT_CTLR
-#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR 0
-#endif
-
-#ifndef NRFX_PPI_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPI_GROUPS_USED_BY_802154_DRV
-#define NRFX_PPI_GROUPS_USED_BY_802154_DRV 0
-#endif
-
-#ifndef NRFX_PPI_CHANNELS_USED_BY_MPSL
-#define NRFX_PPI_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_PPI_GROUPS_USED_BY_MPSL
-#define NRFX_PPI_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#if defined(NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL)
-
-BUILD_ASSERT((NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI0_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI0_GROUPS_USED_BY_802154_DRV & NRFX_DPPI0_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI00_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI00_GROUPS_USED_BY_802154_DRV & NRFX_DPPI00_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI10_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI10_GROUPS_USED_BY_802154_DRV & NRFX_DPPI10_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI20_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI20_GROUPS_USED_BY_802154_DRV & NRFX_DPPI20_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI30_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI30_GROUPS_USED_BY_802154_DRV & NRFX_DPPI30_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI020_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI020_GROUPS_USED_BY_802154_DRV & NRFX_DPPI020_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI030_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI030_GROUPS_USED_BY_802154_DRV & NRFX_DPPI030_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI120_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI120_GROUPS_USED_BY_802154_DRV & NRFX_DPPI120_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI130_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI130_GROUPS_USED_BY_802154_DRV & NRFX_DPPI130_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI131_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI131_GROUPS_USED_BY_802154_DRV & NRFX_DPPI131_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI132_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI132_GROUPS_USED_BY_802154_DRV & NRFX_DPPI132_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI133_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI133_GROUPS_USED_BY_802154_DRV & NRFX_DPPI133_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI134_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI134_GROUPS_USED_BY_802154_DRV & NRFX_DPPI134_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI135_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI135_GROUPS_USED_BY_802154_DRV & NRFX_DPPI135_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI136_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI136_GROUPS_USED_BY_802154_DRV & NRFX_DPPI136_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_PPI_CHANNELS_USED_BY_802154_DRV & NRFX_PPI_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_PPI_GROUPS_USED_BY_802154_DRV & NRFX_PPI_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV &
-	      NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV &
-	      NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV &
-	      NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV &
-	      NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV &
-	      NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV &
-	      NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV &
-	      NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-#endif /* NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL */
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI0_CHANNELS_USED                                                                   \
-	(NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI0_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI0_GROUPS_USED                                                                     \
-	(NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI0_GROUPS_USED_BY_802154_DRV |                \
-	 NRFX_DPPI0_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI00_CHANNELS_USED                                                                  \
-	(NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV |          \
-	 NRFX_DPPI00_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI00_GROUPS_USED                                                                    \
-	(NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI00_GROUPS_USED_BY_802154_DRV |              \
-	 NRFX_DPPI00_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI10_CHANNELS_USED                                                                  \
-	(NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV |          \
-	 NRFX_DPPI10_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI10_GROUPS_USED                                                                    \
-	(NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI10_GROUPS_USED_BY_802154_DRV |              \
-	 NRFX_DPPI10_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI20_CHANNELS_USED                                                                  \
-	(NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV |          \
-	 NRFX_DPPI20_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI20_GROUPS_USED                                                                    \
-	(NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI20_GROUPS_USED_BY_802154_DRV |              \
-	 NRFX_DPPI20_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI30_CHANNELS_USED                                                                  \
-	(NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV |          \
-	 NRFX_DPPI30_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI30_GROUPS_USED                                                                    \
-	(NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI30_GROUPS_USED_BY_802154_DRV |              \
-	 NRFX_DPPI30_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI020_CHANNELS_USED                                                                 \
-	(NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI020_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI020_GROUPS_USED                                                                   \
-	(NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI020_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI020_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI030_CHANNELS_USED                                                                 \
-	(NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI030_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI030_GROUPS_USED                                                                   \
-	(NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI030_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI030_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI120_CHANNELS_USED                                                                 \
-	(NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI120_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI120_GROUPS_USED                                                                   \
-	(NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI120_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI120_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI130_CHANNELS_USED                                                                 \
-	(NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI130_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI130_GROUPS_USED                                                                   \
-	(NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI130_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI130_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI131_CHANNELS_USED                                                                 \
-	(NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI131_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI131_GROUPS_USED                                                                   \
-	(NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI131_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI131_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI132_CHANNELS_USED                                                                 \
-	(NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI132_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI132_GROUPS_USED                                                                   \
-	(NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI132_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI132_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI133_CHANNELS_USED                                                                 \
-	(NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI133_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI133_GROUPS_USED                                                                   \
-	(NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI133_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI133_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI134_CHANNELS_USED                                                                 \
-	(NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI134_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI134_GROUPS_USED                                                                   \
-	(NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI134_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI134_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI135_CHANNELS_USED                                                                 \
-	(NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI135_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI135_GROUPS_USED                                                                   \
-	(NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI135_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI135_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI136_CHANNELS_USED                                                                 \
-	(NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI136_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI136_GROUPS_USED                                                                   \
-	(NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI136_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI136_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines PPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_PPI_CHANNELS_USED                                                                     \
-	(NRFX_PPI_CHANNELS_USED_BY_BT_CTLR | NRFX_PPI_CHANNELS_USED_BY_802154_DRV |                \
-	 NRFX_PPI_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_DPPI_CHANNELS_USED NRFX_DPPI0_CHANNELS_USED
-#define NRFX_DPPI_GROUPS_USED   NRFX_DPPI0_GROUPS_USED
-
-/** @brief Bitmask that defines PPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_PPI_GROUPS_USED                                                                       \
-	(NRFX_PPI_GROUPS_USED_BY_BT_CTLR | NRFX_PPI_GROUPS_USED_BY_802154_DRV |                    \
-	 NRFX_PPI_GROUPS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_00_10_CHANNELS_USED                                                 \
-	(NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV |  \
-	 NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_01_20_CHANNELS_USED                                                 \
-	(NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV |  \
-	 NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_11_21_CHANNELS_USED                                                 \
-	(NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV |  \
-	 NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_22_30_CHANNELS_USED                                                 \
-	(NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV |  \
-	 NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_02_03_CHANNELS_USED                                                 \
-	(NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV |  \
-	 NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_04_12_CHANNELS_USED                                                 \
-	(NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV |  \
-	 NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_020_030_CHANNELS_USED                                               \
-	(NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR |                                              \
-	 NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV | NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL)
-
-#endif /* NRFX_CONFIG_RESERVED_RESOURCES_H__ */

From 0bffb8d138ba92c1a48635d0426723005667a72e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:29 +0100
Subject: [PATCH 1451/2913] Revert "[nrf fromlist] dts: nordic: Add dppic0
 label to nRF53 and nRF91 devices"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit bcf61aa430eb39b9f0146307b78187f2b8a2161f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi | 2 +-
 dts/arm/nordic/nrf5340_cpunet.dtsi             | 2 +-
 dts/arm/nordic/nrf91_peripherals.dtsi          | 2 +-
 modules/hal_nordic/nrfx/Kconfig                | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
index d91bb508d30..50842fb3801 100644
--- a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
@@ -328,7 +328,7 @@ rtc1: rtc@15000 {
 	prescaler = <1>;
 };
 
-dppic0: dppic: dppic@17000 {
+dppic: dppic@17000 {
 	compatible = "nordic,nrf-dppic";
 	reg = <0x17000 0x1000>;
 	status = "okay";
diff --git a/dts/arm/nordic/nrf5340_cpunet.dtsi b/dts/arm/nordic/nrf5340_cpunet.dtsi
index 4b6c590858c..77b77759b22 100644
--- a/dts/arm/nordic/nrf5340_cpunet.dtsi
+++ b/dts/arm/nordic/nrf5340_cpunet.dtsi
@@ -159,7 +159,7 @@
 			status = "okay";
 		};
 
-		dppic0: dppic: dppic@4100f000 {
+		dppic: dppic@4100f000 {
 			compatible = "nordic,nrf-dppic";
 			reg = <0x4100f000 0x1000>;
 			status = "okay";
diff --git a/dts/arm/nordic/nrf91_peripherals.dtsi b/dts/arm/nordic/nrf91_peripherals.dtsi
index 14d05d27cee..93abc17d48b 100644
--- a/dts/arm/nordic/nrf91_peripherals.dtsi
+++ b/dts/arm/nordic/nrf91_peripherals.dtsi
@@ -28,7 +28,7 @@ adc: adc@e000 {
 	#io-channel-cells = <1>;
 };
 
-dppic0: dppic: dppic@17000 {
+dppic: dppic@17000 {
 	compatible = "nordic,nrf-dppic";
 	reg = <0x17000 0x1000>;
 	status = "okay";
diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 9fbd6587c80..1fbb694a291 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -31,8 +31,7 @@ config NRFX_DPPI
 config NRFX_DPPI0
 	bool "DPPI0 driver instance"
 	default y if NRFX_GPPI
-	depends on ($(dt_nodelabel_has_compat,dppic,$(DT_COMPAT_NORDIC_NRF_DPPIC)) || \
-		    $(dt_nodelabel_has_compat,dppic0,$(DT_COMPAT_NORDIC_NRF_DPPIC)))
+	depends on $(dt_nodelabel_has_compat,dppic,$(DT_COMPAT_NORDIC_NRF_DPPIC))
 	select NRFX_DPPI
 
 config NRFX_DPPI00

From 107e46596bd802589aeef6828b3ea19d9bbfbd82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:29 +0100
Subject: [PATCH 1452/2913] Revert "[nrf fromlist] modules: hal_nordic: replace
 LUMOS_XXAA with NRF54L_SERIES"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit aaa68d845034bff98737974d4cf3a4d241eaf1b3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h
index c40e22c17d7..132ba4cd89a 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h
@@ -44,7 +44,7 @@
 #if defined(NRF53_SERIES)
 #define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
 #define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
-#elif defined(NRF54L_SERIES)
+#elif defined(LUMOS_XXAA)
 #define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
 #define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
 #endif

From cc4a7c75b74b54e2f6bf82ce6582a21295445e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:30 +0100
Subject: [PATCH 1453/2913] Revert "[nrf fromlist] modules: hal_nordic: add
 Kconfig selecting resource header"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8ca30e0d4dff91feaa19720dca1053d4a3b34d89.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/nrfx/Kconfig     | 4 ----
 modules/hal_nordic/nrfx/nrfx_glue.h | 4 +---
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 1fbb694a291..1ffff73b356 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -1209,8 +1209,4 @@ config NRFX_PRS_BOX_4
 
 endmenu
 
-config NRFX_RESERVED_RESOURCES_HEADER
-	string
-	default "nrfx_config_reserved_resources.h"
-
 endmenu # "nrfx drivers"
diff --git a/modules/hal_nordic/nrfx/nrfx_glue.h b/modules/hal_nordic/nrfx/nrfx_glue.h
index 8f1109f4a79..c65318f1fe3 100644
--- a/modules/hal_nordic/nrfx/nrfx_glue.h
+++ b/modules/hal_nordic/nrfx/nrfx_glue.h
@@ -314,9 +314,7 @@ void nrfx_busy_wait(uint32_t usec_to_wait);
 
 /*------------------------------------------------------------------------------*/
 
-#ifdef CONFIG_NRFX_RESERVED_RESOURCES_HEADER
-#include CONFIG_NRFX_RESERVED_RESOURCES_HEADER
-#endif
+#include "nrfx_config_reserved_resources.h"
 
 //------------------------------------------------------------------------------
 

From 96664692603def432f7e0e261dd4b48e9333e5e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:30 +0100
Subject: [PATCH 1454/2913] Revert "[nrf fromtree] modules: hal_nordic: add
 NRFX_GPPI config"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 44e582f8dc7228ffd24e550c7302e6169e3a1b53.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/pwm/Kconfig.nrf_sw                |  3 ++-
 drivers/serial/Kconfig.nrfx_uart_instance |  6 +++--
 modules/hal_nordic/nrfx/CMakeLists.txt    |  4 ++--
 modules/hal_nordic/nrfx/Kconfig           | 29 -----------------------
 samples/boards/nordic/nrfx/Kconfig        |  6 +++++
 samples/boards/nordic/nrfx/prj.conf       |  1 -
 soc/nordic/nrf53/Kconfig                  |  2 +-
 soc/nordic/nrf53/Kconfig.sync_rtc         |  2 +-
 8 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/drivers/pwm/Kconfig.nrf_sw b/drivers/pwm/Kconfig.nrf_sw
index 915ceaa8b4a..1d68993db5a 100644
--- a/drivers/pwm/Kconfig.nrf_sw
+++ b/drivers/pwm/Kconfig.nrf_sw
@@ -8,7 +8,8 @@ config PWM_NRF_SW
 	default y if !PWM_NRFX
 	depends on DT_HAS_NORDIC_NRF_SW_PWM_ENABLED
 	select NRFX_GPIOTE
-	select NRFX_GPPI
+	select NRFX_PPI if HAS_HW_NRF_PPI
+	select NRFX_DPPI if HAS_HW_NRF_DPPIC
 	help
 	  Enable driver to utilize PWM on the Nordic Semiconductor nRF SoCs.
 
diff --git a/drivers/serial/Kconfig.nrfx_uart_instance b/drivers/serial/Kconfig.nrfx_uart_instance
index 8bc3f6c5e2c..d44c1ab7e02 100644
--- a/drivers/serial/Kconfig.nrfx_uart_instance
+++ b/drivers/serial/Kconfig.nrfx_uart_instance
@@ -24,7 +24,8 @@ config UART_$(nrfx_uart_num)_ENHANCED_POLL_OUT
 	default y
 	depends on HAS_HW_NRF_UARTE$(nrfx_uart_num)
 	depends on HAS_HW_NRF_PPI || HAS_HW_NRF_DPPIC
-	select NRFX_GPPI
+	select NRFX_PPI if HAS_HW_NRF_PPI
+	select NRFX_DPPI if HAS_HW_NRF_DPPIC
 	help
 	  When enabled, polling out does not trigger interrupt which stops TX.
 	  Feature uses a PPI channel.
@@ -54,7 +55,8 @@ config UART_$(nrfx_uart_num)_NRF_HW_ASYNC
 	depends on UART_ASYNC_API
 	depends on UART_NRFX_UARTE_LEGACY_SHIM
 	depends on HAS_HW_NRF_PPI || HAS_HW_NRF_DPPIC
-	select NRFX_GPPI
+	select NRFX_PPI if HAS_HW_NRF_PPI
+	select NRFX_DPPI if HAS_HW_NRF_DPPIC
 	help
 	  If default driver uses interrupts to count incoming bytes, it is possible
 	  that with higher speeds and/or high cpu load some data can be lost.
diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index d451f5f1a54..6c29b0b6156 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -115,7 +115,7 @@ zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF92X  ${MDK_DIR}/system_nrf92.c
 zephyr_library_sources(nrfx_glue.c)
 zephyr_library_sources(${HELPERS_DIR}/nrfx_flag32_allocator.c)
 zephyr_library_sources_ifdef(CONFIG_RETAINED_MEM_NRF_RAM_CTRL ${HELPERS_DIR}/nrfx_ram_ctrl.c)
-zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI                 ${HELPERS_DIR}/nrfx_gppi_dppi.c)
+zephyr_library_sources_ifdef(CONFIG_NRFX_DPPI                 ${HELPERS_DIR}/nrfx_gppi_dppi.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_PPI                  ${HELPERS_DIR}/nrfx_gppi_ppi.c)
 
 zephyr_library_sources_ifdef(CONFIG_NRFX_PRS     ${SRC_DIR}/prs/nrfx_prs.c)
@@ -199,7 +199,7 @@ if(CONFIG_SOC_NRF54L20_ENGA_CPUAPP)
   zephyr_compile_definitions(NRF_SKIP_TAMPC_SETUP)
 endif()
 
-if(CONFIG_SOC_SERIES_NRF54LX AND CONFIG_NRFX_GPPI)
+if(CONFIG_SOC_SERIES_NRF54LX AND CONFIG_NRFX_DPPI)
   zephyr_library_sources(${HELPERS_DIR}/nrfx_gppi_dppi_ppib_lumos.c)
   zephyr_library_sources(${NRFX_DIR}/soc/interconnect/dppic_ppib/nrfx_interconnect_dppic_ppib.c)
 endif()
diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 1ffff73b356..f374e028b93 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -30,85 +30,71 @@ config NRFX_DPPI
 
 config NRFX_DPPI0
 	bool "DPPI0 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic,$(DT_COMPAT_NORDIC_NRF_DPPIC))
 	select NRFX_DPPI
 
 config NRFX_DPPI00
 	bool "DPPI00 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic00,$(DT_COMPAT_NORDIC_NRF_DPPIC))
 	select NRFX_DPPI
 
 config NRFX_DPPI10
 	bool "DPPI10 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic10,$(DT_COMPAT_NORDIC_NRF_DPPIC))
 	select NRFX_DPPI
 
 config NRFX_DPPI20
 	bool "DPPI20 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic20,$(DT_COMPAT_NORDIC_NRF_DPPIC))
 	select NRFX_DPPI
 
 config NRFX_DPPI30
 	bool "DPPI30 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic30,$(DT_COMPAT_NORDIC_NRF_DPPIC))
 	select NRFX_DPPI
 
 config NRFX_DPPI020
 	bool "DPPI020 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic020,$(DT_COMPAT_NORDIC_NRF_DPPIC_LOCAL))
 	select NRFX_DPPI
 
 config NRFX_DPPI120
 	bool "DPPI120 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic120,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
 	select NRFX_DPPI
 
 config NRFX_DPPI130
 	bool "DPPI130 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic130,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
 	select NRFX_DPPI
 
 config NRFX_DPPI131
 	bool "DPPI131 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic131,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
 	select NRFX_DPPI
 
 config NRFX_DPPI132
 	bool "DPPI132 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic132,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
 	select NRFX_DPPI
 
 config NRFX_DPPI133
 	bool "DPPI133 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic133,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
 	select NRFX_DPPI
 
 config NRFX_DPPI134
 	bool "DPPI134 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic134,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
 	select NRFX_DPPI
 
 config NRFX_DPPI135
 	bool "DPPI135 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic135,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
 	select NRFX_DPPI
 
 config NRFX_DPPI136
 	bool "DPPI136 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,dppic136,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
 	select NRFX_DPPI
 
@@ -206,12 +192,6 @@ config NRFX_GPIOTE_NUM_OF_EVT_HANDLERS
 	  Specifies number of handlers that can be registered to nrfx_gpiote driver
 	  by the user.
 
-config NRFX_GPPI
-	bool "Generic PPI layer"
-	help
-	   Enable the nrfx_gppi utilities providing unified API for creating PPI
-	   connections across SoC families.
-
 config NRFX_GRTC
 	bool "GRTC driver"
 	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_GRTC))
@@ -277,7 +257,6 @@ config NRFX_POWER
 
 config NRFX_PPI
 	bool "PPI allocator"
-	default y if NRFX_GPPI
 	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_PPI))
 
 config NRFX_PPIB
@@ -285,49 +264,41 @@ config NRFX_PPIB
 
 config NRFX_PPIB00
 	bool "PPIB00 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,ppib00,$(DT_COMPAT_NORDIC_NRF_PPIB))
 	select NRFX_PPIB
 
 config NRFX_PPIB01
 	bool "PPIB01 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,ppib01,$(DT_COMPAT_NORDIC_NRF_PPIB))
 	select NRFX_PPIB
 
 config NRFX_PPIB10
 	bool "PPIB10 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,ppib10,$(DT_COMPAT_NORDIC_NRF_PPIB))
 	select NRFX_PPIB
 
 config NRFX_PPIB11
 	bool "PPIB11 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,ppib11,$(DT_COMPAT_NORDIC_NRF_PPIB))
 	select NRFX_PPIB
 
 config NRFX_PPIB20
 	bool "PPIB20 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,ppib20,$(DT_COMPAT_NORDIC_NRF_PPIB))
 	select NRFX_PPIB
 
 config NRFX_PPIB21
 	bool "PPIB21 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,ppib21,$(DT_COMPAT_NORDIC_NRF_PPIB))
 	select NRFX_PPIB
 
 config NRFX_PPIB22
 	bool "PPIB22 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,ppib22,$(DT_COMPAT_NORDIC_NRF_PPIB))
 	select NRFX_PPIB
 
 config NRFX_PPIB30
 	bool "PPIB30 driver instance"
-	default y if NRFX_GPPI
 	depends on $(dt_nodelabel_has_compat,ppib30,$(DT_COMPAT_NORDIC_NRF_PPIB))
 	select NRFX_PPIB
 
diff --git a/samples/boards/nordic/nrfx/Kconfig b/samples/boards/nordic/nrfx/Kconfig
index 776090f5bd2..67d02ef981b 100644
--- a/samples/boards/nordic/nrfx/Kconfig
+++ b/samples/boards/nordic/nrfx/Kconfig
@@ -3,6 +3,12 @@
 
 source "Kconfig.zephyr"
 
+config NRFX_DPPI
+	default $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_DPPIC))
+
+config NRFX_PPI
+	default $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_PPI))
+
 config NRFX_GPIOTE0
 	default y if SOC_SERIES_NRF51X || \
 		     SOC_SERIES_NRF52X || \
diff --git a/samples/boards/nordic/nrfx/prj.conf b/samples/boards/nordic/nrfx/prj.conf
index 224fa224132..d4f0c29699f 100644
--- a/samples/boards/nordic/nrfx/prj.conf
+++ b/samples/boards/nordic/nrfx/prj.conf
@@ -1,4 +1,3 @@
 CONFIG_GPIO=n
 CONFIG_LOG=y
 CONFIG_LOG_PROCESS_THREAD_SLEEP_MS=100
-CONFIG_NRFX_GPPI=y
diff --git a/soc/nordic/nrf53/Kconfig b/soc/nordic/nrf53/Kconfig
index f696ab95478..823d1be8e2d 100644
--- a/soc/nordic/nrf53/Kconfig
+++ b/soc/nordic/nrf53/Kconfig
@@ -82,7 +82,7 @@ config SOC_NRF53_ANOMALY_168_WORKAROUND_FOR_EXECUTION_FROM_RAM
 config SOC_NRF53_RTC_PRETICK
 	bool "Pre-tick workaround for nRF5340 anomaly 165"
 	depends on (SYS_CLOCK_EXISTS && SOC_NRF5340_CPUNET) || SOC_NRF5340_CPUAPP
-	select NRFX_GPPI
+	select NRFX_DPPI
 	select ARM_ON_ENTER_CPU_IDLE_HOOK if SOC_NRF5340_CPUNET
 	select ARM_ON_ENTER_CPU_IDLE_PREPARE_HOOK if SOC_NRF5340_CPUNET
 	help
diff --git a/soc/nordic/nrf53/Kconfig.sync_rtc b/soc/nordic/nrf53/Kconfig.sync_rtc
index b960465e442..475db911c67 100644
--- a/soc/nordic/nrf53/Kconfig.sync_rtc
+++ b/soc/nordic/nrf53/Kconfig.sync_rtc
@@ -5,7 +5,7 @@ config NRF53_SYNC_RTC
 	bool "RTC clock synchronization"
 	default y if LOG && !LOG_MODE_MINIMAL
 	depends on NRF_RTC_TIMER
-	select NRFX_GPPI
+	select NRFX_DPPI
 	select MBOX if !IPM
 
 if NRF53_SYNC_RTC

From 3f239d4e78ad6a7b4bcbff026c44df7a9b88f23c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:30 +0100
Subject: [PATCH 1455/2913] Revert "[nrf fromtree] modules: hal_nordic: rework
 resource reservations"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 667325ef8d445631ba197c7e3d9f13e34f51d3fe.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrfx/nrfx_config_reserved_resources.h     | 710 ------------------
 modules/hal_nordic/nrfx/nrfx_glue.h           |  99 ++-
 2 files changed, 98 insertions(+), 711 deletions(-)
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h

diff --git a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h
deleted file mode 100644
index 132ba4cd89a..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h
+++ /dev/null
@@ -1,710 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_RESERVED_RESOURCES_H__
-#define NRFX_CONFIG_RESERVED_RESOURCES_H__
-
-/** @brief Bitmask that defines GPIOTE130 channels reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_GPIOTE130_CHANNELS_USED                                                               \
-	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), owned_channels) |                           \
-	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), child_owned_channels))
-
-/** @brief Bitmask that defines GPIOTE131 channels reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_GPIOTE131_CHANNELS_USED                                                               \
-	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), owned_channels) |                           \
-	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), child_owned_channels))
-
-/** @brief Bitmask that defines EGU instances that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_EGUS_USED 0
-
-/** @brief Bitmask that defines TIMER instances that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_TIMERS_USED 0
-
-/*
- * The enabled Bluetooth controller subsystem is responsible for providing
- * definitions of the BT_CTLR_USED_* symbols used below in a file named
- * bt_ctlr_used_resources.h and for adding its location to global include
- * paths so that the file can be included here for all Zephyr libraries that
- * are to be built.
- */
-#if defined(CONFIG_BT_LL_SW_SPLIT)
-#include <bt_ctlr_used_resources.h>
-#if defined(DPPI_PRESENT)
-#if defined(NRF53_SERIES)
-#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
-#define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
-#elif defined(LUMOS_XXAA)
-#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
-#define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
-#endif
-#else /* defined(DPPI_PRESENT) */
-#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
-#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
-#endif /* defined(DPPI_PRESENT) */
-#endif /* defined(CONFIG_BT_LL_SW_SPLIT) */
-
-#if defined(CONFIG_NRF_802154_RADIO_DRIVER)
-#if defined(NRF52_SERIES)
-#include <../src/nrf_802154_peripherals_nrf52.h>
-#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV NRF_802154_PPI_CHANNELS_USED_MASK
-#define NRFX_PPI_GROUPS_USED_BY_802154_DRV   NRF_802154_PPI_GROUPS_USED_MASK
-#elif defined(NRF53_SERIES)
-#include <../src/nrf_802154_peripherals_nrf53.h>
-#define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
-#define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
-#elif defined(NRF54L_SERIES)
-#include <../src/nrf_802154_peripherals_nrf54l.h>
-#define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
-#define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
-#elif defined(NRF54H_SERIES)
-#include <../src/nrf_802154_peripherals_nrf54h.h>
-#define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
-#define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
-#else
-#error Unsupported chip family
-#endif
-#endif /* CONFIG_NRF_802154_RADIO_DRIVER */
-
-#ifndef NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI0_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI0_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI0_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI0_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI0_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI00_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI00_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI00_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI00_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI00_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI00_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI10_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI10_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI10_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI10_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI10_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI20_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI20_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI20_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI20_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI20_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI20_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI30_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI30_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI30_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI30_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI30_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI30_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI020_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI020_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI020_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI020_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI020_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI030_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI030_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI030_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI030_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI030_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI030_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI120_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI120_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI120_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI120_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI120_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI120_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI130_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI130_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI130_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI130_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI130_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI130_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI131_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI131_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI131_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI131_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI131_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI131_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI132_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI132_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI132_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI132_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI132_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI132_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI133_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI133_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI133_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI133_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI133_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI133_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI134_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI134_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI134_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI134_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI134_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI134_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI135_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI135_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI135_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI135_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI135_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI135_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI136_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI136_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI136_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI136_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI136_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI136_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPI_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPI_GROUPS_USED_BY_BT_CTLR
-#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR 0
-#endif
-
-#ifndef NRFX_PPI_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPI_GROUPS_USED_BY_802154_DRV
-#define NRFX_PPI_GROUPS_USED_BY_802154_DRV 0
-#endif
-
-#ifndef NRFX_PPI_CHANNELS_USED_BY_MPSL
-#define NRFX_PPI_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_PPI_GROUPS_USED_BY_MPSL
-#define NRFX_PPI_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL 0
-#endif
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI0_CHANNELS_USED                                                                   \
-	(NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI0_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI0_GROUPS_USED                                                                     \
-	(NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI0_GROUPS_USED_BY_802154_DRV |                \
-	 NRFX_DPPI0_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI00_CHANNELS_USED                                                                  \
-	(NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV |          \
-	 NRFX_DPPI00_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI00_GROUPS_USED                                                                    \
-	(NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI00_GROUPS_USED_BY_802154_DRV |              \
-	 NRFX_DPPI00_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI10_CHANNELS_USED                                                                  \
-	(NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV |          \
-	 NRFX_DPPI10_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI10_GROUPS_USED                                                                    \
-	(NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI10_GROUPS_USED_BY_802154_DRV |              \
-	 NRFX_DPPI10_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI20_CHANNELS_USED                                                                  \
-	(NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV |          \
-	 NRFX_DPPI20_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI20_GROUPS_USED                                                                    \
-	(NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI20_GROUPS_USED_BY_802154_DRV |              \
-	 NRFX_DPPI20_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI30_CHANNELS_USED                                                                  \
-	(NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV |          \
-	 NRFX_DPPI30_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI30_GROUPS_USED                                                                    \
-	(NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI30_GROUPS_USED_BY_802154_DRV |              \
-	 NRFX_DPPI30_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI020_CHANNELS_USED                                                                 \
-	(NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI020_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI020_GROUPS_USED                                                                   \
-	(NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI020_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI020_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI030_CHANNELS_USED                                                                 \
-	(NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI030_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI030_GROUPS_USED                                                                   \
-	(NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI030_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI030_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI120_CHANNELS_USED                                                                 \
-	(NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI120_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI120_GROUPS_USED                                                                   \
-	(NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI120_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI120_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI130_CHANNELS_USED                                                                 \
-	(NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI130_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI130_GROUPS_USED                                                                   \
-	(NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI130_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI130_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI131_CHANNELS_USED                                                                 \
-	(NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI131_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI131_GROUPS_USED                                                                   \
-	(NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI131_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI131_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI132_CHANNELS_USED                                                                 \
-	(NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI132_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI132_GROUPS_USED                                                                   \
-	(NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI132_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI132_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI133_CHANNELS_USED                                                                 \
-	(NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI133_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI133_GROUPS_USED                                                                   \
-	(NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI133_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI133_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI134_CHANNELS_USED                                                                 \
-	(NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI134_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI134_GROUPS_USED                                                                   \
-	(NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI134_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI134_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI135_CHANNELS_USED                                                                 \
-	(NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI135_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI135_GROUPS_USED                                                                   \
-	(NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI135_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI135_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI136_CHANNELS_USED                                                                 \
-	(NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI136_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI136_GROUPS_USED                                                                   \
-	(NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI136_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI136_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines PPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_PPI_CHANNELS_USED                                                                     \
-	(NRFX_PPI_CHANNELS_USED_BY_BT_CTLR | NRFX_PPI_CHANNELS_USED_BY_802154_DRV |                \
-	 NRFX_PPI_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_DPPI_CHANNELS_USED NRFX_DPPI0_CHANNELS_USED
-#define NRFX_DPPI_GROUPS_USED   NRFX_DPPI0_GROUPS_USED
-
-/** @brief Bitmask that defines PPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_PPI_GROUPS_USED                                                                       \
-	(NRFX_PPI_GROUPS_USED_BY_BT_CTLR | NRFX_PPI_GROUPS_USED_BY_802154_DRV |                    \
-	 NRFX_PPI_GROUPS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_00_10_CHANNELS_USED                                                 \
-	(NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV |  \
-	 NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_01_20_CHANNELS_USED                                                 \
-	(NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV |  \
-	 NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_11_21_CHANNELS_USED                                                 \
-	(NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV |  \
-	 NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_22_30_CHANNELS_USED                                                 \
-	(NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV |  \
-	 NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_02_03_CHANNELS_USED                                                 \
-	(NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV |  \
-	 NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_04_12_CHANNELS_USED                                                 \
-	(NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV |  \
-	 NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_020_030_CHANNELS_USED                                               \
-	(NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR |                                              \
-	 NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV | NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL)
-
-#endif /* NRFX_CONFIG_RESERVED_RESOURCES_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_glue.h b/modules/hal_nordic/nrfx/nrfx_glue.h
index c65318f1fe3..b7365e5163a 100644
--- a/modules/hal_nordic/nrfx/nrfx_glue.h
+++ b/modules/hal_nordic/nrfx/nrfx_glue.h
@@ -314,7 +314,104 @@ void nrfx_busy_wait(uint32_t usec_to_wait);
 
 /*------------------------------------------------------------------------------*/
 
-#include "nrfx_config_reserved_resources.h"
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside of the nrfx library. */
+#define NRFX_DPPI_CHANNELS_USED   (NRFX_PPI_CHANNELS_USED_BY_BT_CTLR |    \
+				   NRFX_PPI_CHANNELS_USED_BY_802154_DRV | \
+				   NRFX_PPI_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside of the nrfx library. */
+#define NRFX_DPPI_GROUPS_USED     (NRFX_PPI_GROUPS_USED_BY_BT_CTLR |    \
+				   NRFX_PPI_GROUPS_USED_BY_802154_DRV | \
+				   NRFX_PPI_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines PPI channels that are reserved for use outside of the nrfx library. */
+#define NRFX_PPI_CHANNELS_USED    (NRFX_PPI_CHANNELS_USED_BY_BT_CTLR |    \
+				   NRFX_PPI_CHANNELS_USED_BY_802154_DRV | \
+				   NRFX_PPI_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines PPI groups that are reserved for use outside of the nrfx library. */
+#define NRFX_PPI_GROUPS_USED      (NRFX_PPI_GROUPS_USED_BY_BT_CTLR |    \
+				   NRFX_PPI_GROUPS_USED_BY_802154_DRV | \
+				   NRFX_PPI_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines GPIOTE130 channels reserved for use outside of the nrfx library. */
+#define NRFX_GPIOTE130_CHANNELS_USED \
+	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), owned_channels) | \
+	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), child_owned_channels))
+
+/** @brief Bitmask that defines GPIOTE131 channels reserved for use outside of the nrfx library. */
+#define NRFX_GPIOTE131_CHANNELS_USED \
+	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), owned_channels) | \
+	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), child_owned_channels))
+
+
+#if defined(CONFIG_BT_CTLR)
+/*
+ * The enabled Bluetooth controller subsystem is responsible for providing
+ * definitions of the BT_CTLR_USED_* symbols used below in a file named
+ * bt_ctlr_used_resources.h and for adding its location to global include
+ * paths so that the file can be included here for all Zephyr libraries that
+ * are to be built.
+ */
+#include <bt_ctlr_used_resources.h>
+#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR    BT_CTLR_USED_PPI_CHANNELS
+#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR      BT_CTLR_USED_PPI_GROUPS
+#else
+#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR    0
+#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR      0
+#endif
+
+#if defined(CONFIG_NRF_802154_RADIO_DRIVER)
+#if defined(NRF52_SERIES)
+#include <../src/nrf_802154_peripherals_nrf52.h>
+#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV   NRF_802154_PPI_CHANNELS_USED_MASK
+#define NRFX_PPI_GROUPS_USED_BY_802154_DRV     NRF_802154_PPI_GROUPS_USED_MASK
+#elif defined(NRF53_SERIES)
+#include <../src/nrf_802154_peripherals_nrf53.h>
+#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV   NRF_802154_DPPI_CHANNELS_USED_MASK
+#define NRFX_PPI_GROUPS_USED_BY_802154_DRV     NRF_802154_DPPI_GROUPS_USED_MASK
+#elif defined(NRF54L_SERIES)
+#include <../src/nrf_802154_peripherals_nrf54l.h>
+#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV   NRF_802154_DPPI_CHANNELS_USED_MASK
+#define NRFX_PPI_GROUPS_USED_BY_802154_DRV     NRF_802154_DPPI_GROUPS_USED_MASK
+#elif defined(NRF54H_SERIES)
+#include <../src/nrf_802154_peripherals_nrf54h.h>
+#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV   NRF_802154_DPPI_CHANNELS_USED_MASK
+#define NRFX_PPI_GROUPS_USED_BY_802154_DRV     NRF_802154_DPPI_GROUPS_USED_MASK
+#else
+#error Unsupported chip family
+#endif
+#else // CONFIG_NRF_802154_RADIO_DRIVER
+#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV   0
+#define NRFX_PPI_GROUPS_USED_BY_802154_DRV     0
+#endif // CONFIG_NRF_802154_RADIO_DRIVER
+
+#if defined(CONFIG_NRF_802154_RADIO_DRIVER) && !defined(CONFIG_NRF_802154_SL_OPENSOURCE)
+#include <mpsl.h>
+#define NRFX_PPI_CHANNELS_USED_BY_MPSL   MPSL_RESERVED_PPI_CHANNELS
+#define NRFX_PPI_GROUPS_USED_BY_MPSL     0
+#else
+#define NRFX_PPI_CHANNELS_USED_BY_MPSL   0
+#define NRFX_PPI_GROUPS_USED_BY_MPSL     0
+#endif
+
+#if defined(NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL)
+BUILD_ASSERT(
+	(NRFX_PPI_CHANNELS_USED_BY_802154_DRV & NRFX_PPI_CHANNELS_USED_BY_MPSL) == 0,
+	"PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	"assigned to the MPSL.");
+
+BUILD_ASSERT(
+	(NRFX_PPI_GROUPS_USED_BY_802154_DRV & NRFX_PPI_GROUPS_USED_BY_MPSL) == 0,
+	"PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	"assigned to the MPSL.");
+#endif // NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL
+
+/** @brief Bitmask that defines EGU instances that are reserved for use outside of the nrfx library. */
+#define NRFX_EGUS_USED            0
+
+/** @brief Bitmask that defines TIMER instances that are reserved for use outside of the nrfx library. */
+#define NRFX_TIMERS_USED          0
 
 //------------------------------------------------------------------------------
 

From 1f8c8e3cdee3cb151a3e2dbb408f61b5dac9dafa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:30 +0100
Subject: [PATCH 1456/2913] Revert "[nrf fromtree] modules: hal_nordic: Enable
 nrfx_ppib drivers"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7c15c1540bebd2e5ab63eb8326c987dfd4427193.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/nrfx/CMakeLists.txt  |  1 -
 modules/hal_nordic/nrfx/Kconfig         | 43 -------------------------
 modules/hal_nordic/nrfx/Kconfig.logging |  4 ---
 modules/hal_nordic/nrfx/nrfx_config.h   | 31 ------------------
 4 files changed, 79 deletions(-)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 6c29b0b6156..565835ab1c8 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -135,7 +135,6 @@ zephyr_library_sources_ifdef(CONFIG_NRFX_NVMC    ${SRC_DIR}/nrfx_nvmc.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_PDM     ${SRC_DIR}/nrfx_pdm.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_POWER   ${SRC_DIR}/nrfx_power.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_PPI     ${SRC_DIR}/nrfx_ppi.c)
-zephyr_library_sources_ifdef(CONFIG_NRFX_PPIB    ${SRC_DIR}/nrfx_ppib.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_PWM     ${SRC_DIR}/nrfx_pwm.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_QDEC    ${SRC_DIR}/nrfx_qdec.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_QSPI    ${SRC_DIR}/nrfx_qspi.c)
diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index f374e028b93..16729bf68ae 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -259,49 +259,6 @@ config NRFX_PPI
 	bool "PPI allocator"
 	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_PPI))
 
-config NRFX_PPIB
-	bool
-
-config NRFX_PPIB00
-	bool "PPIB00 driver instance"
-	depends on $(dt_nodelabel_has_compat,ppib00,$(DT_COMPAT_NORDIC_NRF_PPIB))
-	select NRFX_PPIB
-
-config NRFX_PPIB01
-	bool "PPIB01 driver instance"
-	depends on $(dt_nodelabel_has_compat,ppib01,$(DT_COMPAT_NORDIC_NRF_PPIB))
-	select NRFX_PPIB
-
-config NRFX_PPIB10
-	bool "PPIB10 driver instance"
-	depends on $(dt_nodelabel_has_compat,ppib10,$(DT_COMPAT_NORDIC_NRF_PPIB))
-	select NRFX_PPIB
-
-config NRFX_PPIB11
-	bool "PPIB11 driver instance"
-	depends on $(dt_nodelabel_has_compat,ppib11,$(DT_COMPAT_NORDIC_NRF_PPIB))
-	select NRFX_PPIB
-
-config NRFX_PPIB20
-	bool "PPIB20 driver instance"
-	depends on $(dt_nodelabel_has_compat,ppib20,$(DT_COMPAT_NORDIC_NRF_PPIB))
-	select NRFX_PPIB
-
-config NRFX_PPIB21
-	bool "PPIB21 driver instance"
-	depends on $(dt_nodelabel_has_compat,ppib21,$(DT_COMPAT_NORDIC_NRF_PPIB))
-	select NRFX_PPIB
-
-config NRFX_PPIB22
-	bool "PPIB22 driver instance"
-	depends on $(dt_nodelabel_has_compat,ppib22,$(DT_COMPAT_NORDIC_NRF_PPIB))
-	select NRFX_PPIB
-
-config NRFX_PPIB30
-	bool "PPIB30 driver instance"
-	depends on $(dt_nodelabel_has_compat,ppib30,$(DT_COMPAT_NORDIC_NRF_PPIB))
-	select NRFX_PPIB
-
 config NRFX_PWM
 	bool
 
diff --git a/modules/hal_nordic/nrfx/Kconfig.logging b/modules/hal_nordic/nrfx/Kconfig.logging
index 2bf24721880..b24d683d3de 100644
--- a/modules/hal_nordic/nrfx/Kconfig.logging
+++ b/modules/hal_nordic/nrfx/Kconfig.logging
@@ -64,10 +64,6 @@ config NRFX_PPI_LOG
 	bool "PPI driver logging"
 	depends on NRFX_PPI
 
-config NRFX_PPIB_LOG
-	bool "PPIB driver logging"
-	depends on NRFX_PPIB
-
 config NRFX_PRS_LOG
 	bool "PRS driver logging"
 	depends on NRFX_PRS
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index d0d3a671ae2..b85df4c33a7 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -278,37 +278,6 @@
 #define NRFX_PPI_CONFIG_LOG_ENABLED 1
 #endif
 
-#ifdef CONFIG_NRFX_PPIB
-#define NRFX_PPIB_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPIB_LOG
-#define NRFX_PPIB_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPIB00
-#define NRFX_PPIB00_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPIB01
-#define NRFX_PPIB01_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPIB10
-#define NRFX_PPIB10_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPIB11
-#define NRFX_PPIB11_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPIB20
-#define NRFX_PPIB20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPIB21
-#define NRFX_PPIB21_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPIB22
-#define NRFX_PPIB22_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPIB30
-#define NRFX_PPIB30_ENABLED 1
-#endif
-
 #ifdef CONFIG_NRFX_PRS
 #define NRFX_PRS_ENABLED 1
 #endif

From dd775d82daeecf15f78ced57590ee0c5ff422e33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:30 +0100
Subject: [PATCH 1457/2913] Revert "[nrf fromtree] dts: nordic: 54l: Add PPIB
 device tree nodes and bindings"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d40b426076182a750031231b438d696e16a540ba.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/bindings/misc/nordic,nrf-ppib.yaml | 13 -------
 dts/common/nordic/nrf54l15.dtsi        | 48 --------------------------
 dts/common/nordic/nrf54l20.dtsi        | 48 --------------------------
 3 files changed, 109 deletions(-)
 delete mode 100644 dts/bindings/misc/nordic,nrf-ppib.yaml

diff --git a/dts/bindings/misc/nordic,nrf-ppib.yaml b/dts/bindings/misc/nordic,nrf-ppib.yaml
deleted file mode 100644
index 2bacbf28675..00000000000
--- a/dts/bindings/misc/nordic,nrf-ppib.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: |
-    Nordic PPIB (Programmable Peripheral Interconnect Bridge)
-
-compatible: "nordic,nrf-ppib"
-
-include: base.yaml
-
-properties:
-  reg:
-    required: true
diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index 7d59b20d36b..75fea0e22b0 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -113,18 +113,6 @@
 				status = "disabled";
 			};
 
-			ppib00: ppib@43000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x43000 0x1000>;
-				status = "disabled";
-			};
-
-			ppib01: ppib@44000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x44000 0x1000>;
-				status = "disabled";
-			};
-
 			spi00: spi@4a000 {
 				/*
 				 * This spi node can be either SPIM or SPIS,
@@ -198,18 +186,6 @@
 				status = "disabled";
 			};
 
-			ppib10: ppib@83000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x83000 0x1000>;
-				status = "disabled";
-			};
-
-			ppib11: ppib@84000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x84000 0x1000>;
-				status = "disabled";
-			};
-
 			timer10: timer@85000 {
 				compatible = "nordic,nrf-timer";
 				status = "disabled";
@@ -259,24 +235,6 @@
 				status = "disabled";
 			};
 
-			ppib20: ppib@c3000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0xc3000 0x1000>;
-				status = "disabled";
-			};
-
-			ppib21: ppib@c4000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0xc4000 0x1000>;
-				status = "disabled";
-			};
-
-			ppib22: ppib@c5000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0xc5000 0x1000>;
-				status = "disabled";
-			};
-
 			i2c20: i2c@c6000 {
 				compatible = "nordic,nrf-twim";
 				#address-cells = <1>;
@@ -565,12 +523,6 @@
 				status = "disabled";
 			};
 
-			ppib30: ppib@103000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x103000 0x1000>;
-				status = "disabled";
-			};
-
 			i2c30: i2c@104000 {
 				compatible = "nordic,nrf-twim";
 				#address-cells = <1>;
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 258cc856e5d..dfe8d7b4531 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -82,18 +82,6 @@
 				status = "disabled";
 			};
 
-			ppib00: ppib@44000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x44000 0x1000>;
-				status = "disabled";
-			};
-
-			ppib01: ppib@45000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x45000 0x1000>;
-				status = "disabled";
-			};
-
 			spi00: spi@4d000 {
 				/*
 				 * This spi node can be either SPIM or SPIS,
@@ -149,18 +137,6 @@
 				status = "disabled";
 			};
 
-			ppib10: ppib@83000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x83000 0x1000>;
-				status = "disabled";
-			};
-
-			ppib11: ppib@84000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x84000 0x1000>;
-				status = "disabled";
-			};
-
 			timer10: timer@85000 {
 				compatible = "nordic,nrf-timer";
 				status = "disabled";
@@ -210,24 +186,6 @@
 				status = "disabled";
 			};
 
-			ppib20: ppib@c3000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0xc3000 0x1000>;
-				status = "disabled";
-			};
-
-			ppib21: ppib@c4000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0xc4000 0x1000>;
-				status = "disabled";
-			};
-
-			ppib22: ppib@c5000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0xc5000 0x1000>;
-				status = "disabled";
-			};
-
 			i2c20: i2c@c6000 {
 				compatible = "nordic,nrf-twim";
 				#address-cells = <1>;
@@ -507,12 +465,6 @@
 				status = "disabled";
 			};
 
-			ppib30: ppib@103000 {
-				compatible = "nordic,nrf-ppib";
-				reg = <0x103000 0x1000>;
-				status = "disabled";
-			};
-
 			i2c30: i2c@104000 {
 				compatible = "nordic,nrf-twim";
 				#address-cells = <1>;

From 56482f4faec184ed1ddff3b38769ff579c177f20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:30 +0100
Subject: [PATCH 1458/2913] Revert "[nrf fromtree] manifest: update hal_nordic
 revision"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1ff30764cf33a998927d899892e068f695b6432d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/counter/counter_nrfx_rtc.c           | 11 ++-
 modules/hal_nordic/nrfx/Kconfig              | 73 +-------------------
 modules/hal_nordic/nrfx/nrfx_config.h        | 42 -----------
 modules/hal_nordic/nrfx/nrfx_config_common.h |  2 +-
 soc/nordic/nrf53/sync_rtc.c                  |  8 +--
 west.yml                                     |  2 +-
 6 files changed, 11 insertions(+), 127 deletions(-)

diff --git a/drivers/counter/counter_nrfx_rtc.c b/drivers/counter/counter_nrfx_rtc.c
index f6d7a936dba..203f980e78d 100644
--- a/drivers/counter/counter_nrfx_rtc.c
+++ b/drivers/counter/counter_nrfx_rtc.c
@@ -387,9 +387,7 @@ static int ppi_setup(const struct device *dev, uint8_t chan)
 
 	nrfy_rtc_event_enable(rtc, NRF_RTC_CHANNEL_INT_MASK(chan));
 #ifdef DPPI_PRESENT
-	nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
-
-	result = nrfx_dppi_channel_alloc(&dppi, &data->ppi_ch);
+	result = nrfx_dppi_channel_alloc(&data->ppi_ch);
 	if (result != NRFX_SUCCESS) {
 		ERR("Failed to allocate PPI channel.");
 		return -ENODEV;
@@ -397,7 +395,7 @@ static int ppi_setup(const struct device *dev, uint8_t chan)
 
 	nrfy_rtc_subscribe_set(rtc, NRF_RTC_TASK_CLEAR, data->ppi_ch);
 	nrfy_rtc_publish_set(rtc, evt, data->ppi_ch);
-	(void)nrfx_dppi_channel_enable(&dppi, data->ppi_ch);
+	(void)nrfx_dppi_channel_enable(data->ppi_ch);
 #else /* DPPI_PRESENT */
 	uint32_t evt_addr;
 	uint32_t task_addr;
@@ -431,12 +429,11 @@ static void ppi_free(const struct device *dev, uint8_t chan)
 	nrfy_rtc_event_disable(rtc, NRF_RTC_CHANNEL_INT_MASK(chan));
 #ifdef DPPI_PRESENT
 	nrf_rtc_event_t evt = NRF_RTC_CHANNEL_EVENT_ADDR(chan);
-	nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
 
-	(void)nrfx_dppi_channel_disable(&dppi, ppi_ch);
+	(void)nrfx_dppi_channel_disable(ppi_ch);
 	nrfy_rtc_subscribe_clear(rtc, NRF_RTC_TASK_CLEAR);
 	nrfy_rtc_publish_clear(rtc, evt);
-	(void)nrfx_dppi_channel_free(&dppi, ppi_ch);
+	(void)nrfx_dppi_channel_free(ppi_ch);
 #else /* DPPI_PRESENT */
 	(void)nrfx_ppi_channel_disable(ppi_ch);
 	(void)nrfx_ppi_channel_free(ppi_ch);
diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 16729bf68ae..83ce3f157cc 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -26,77 +26,8 @@ config NRFX_COMP
 	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_COMP))
 
 config NRFX_DPPI
-	bool
-
-config NRFX_DPPI0
-	bool "DPPI0 driver instance"
-	depends on $(dt_nodelabel_has_compat,dppic,$(DT_COMPAT_NORDIC_NRF_DPPIC))
-	select NRFX_DPPI
-
-config NRFX_DPPI00
-	bool "DPPI00 driver instance"
-	depends on $(dt_nodelabel_has_compat,dppic00,$(DT_COMPAT_NORDIC_NRF_DPPIC))
-	select NRFX_DPPI
-
-config NRFX_DPPI10
-	bool "DPPI10 driver instance"
-	depends on $(dt_nodelabel_has_compat,dppic10,$(DT_COMPAT_NORDIC_NRF_DPPIC))
-	select NRFX_DPPI
-
-config NRFX_DPPI20
-	bool "DPPI20 driver instance"
-	depends on $(dt_nodelabel_has_compat,dppic20,$(DT_COMPAT_NORDIC_NRF_DPPIC))
-	select NRFX_DPPI
-
-config NRFX_DPPI30
-	bool "DPPI30 driver instance"
-	depends on $(dt_nodelabel_has_compat,dppic30,$(DT_COMPAT_NORDIC_NRF_DPPIC))
-	select NRFX_DPPI
-
-config NRFX_DPPI020
-	bool "DPPI020 driver instance"
-	depends on $(dt_nodelabel_has_compat,dppic020,$(DT_COMPAT_NORDIC_NRF_DPPIC_LOCAL))
-	select NRFX_DPPI
-
-config NRFX_DPPI120
-	bool "DPPI120 driver instance"
-	depends on $(dt_nodelabel_has_compat,dppic120,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
-	select NRFX_DPPI
-
-config NRFX_DPPI130
-	bool "DPPI130 driver instance"
-	depends on $(dt_nodelabel_has_compat,dppic130,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
-	select NRFX_DPPI
-
-config NRFX_DPPI131
-	bool "DPPI131 driver instance"
-	depends on $(dt_nodelabel_has_compat,dppic131,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
-	select NRFX_DPPI
-
-config NRFX_DPPI132
-	bool "DPPI132 driver instance"
-	depends on $(dt_nodelabel_has_compat,dppic132,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
-	select NRFX_DPPI
-
-config NRFX_DPPI133
-	bool "DPPI133 driver instance"
-	depends on $(dt_nodelabel_has_compat,dppic133,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
-	select NRFX_DPPI
-
-config NRFX_DPPI134
-	bool "DPPI134 driver instance"
-	depends on $(dt_nodelabel_has_compat,dppic134,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
-	select NRFX_DPPI
-
-config NRFX_DPPI135
-	bool "DPPI135 driver instance"
-	depends on $(dt_nodelabel_has_compat,dppic135,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
-	select NRFX_DPPI
-
-config NRFX_DPPI136
-	bool "DPPI136 driver instance"
-	depends on $(dt_nodelabel_has_compat,dppic136,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
-	select NRFX_DPPI
+	bool "DPPI allocator"
+	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_DPPIC))
 
 config NRFX_EGU
 	bool
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index b85df4c33a7..47a12f90925 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -84,48 +84,6 @@
 #ifdef CONFIG_NRFX_DPPI_LOG
 #define NRFX_DPPI_CONFIG_LOG_ENABLED 1
 #endif
-#ifdef CONFIG_NRFX_DPPI0
-#define NRFX_DPPI0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI00
-#define NRFX_DPPI00_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI10
-#define NRFX_DPPI10_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI20
-#define NRFX_DPPI20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI30
-#define NRFX_DPPI30_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI020
-#define NRFX_DPPI020_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI120
-#define NRFX_DPPI120_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI130
-#define NRFX_DPPI130_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI131
-#define NRFX_DPPI131_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI132
-#define NRFX_DPPI132_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI133
-#define NRFX_DPPI133_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI134
-#define NRFX_DPPI134_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI135
-#define NRFX_DPPI135_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI136
-#define NRFX_DPPI136_ENABLED 1
-#endif
 
 #ifdef CONFIG_NRFX_EGU
 #define NRFX_EGU_ENABLED 1
diff --git a/modules/hal_nordic/nrfx/nrfx_config_common.h b/modules/hal_nordic/nrfx/nrfx_config_common.h
index 0cf80068038..e04a11c6df8 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_common.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_common.h
@@ -18,7 +18,7 @@
 
 /** @brief Symbol specifying minor version of the nrfx API to be used. */
 #ifndef NRFX_CONFIG_API_VER_MINOR
-#define NRFX_CONFIG_API_VER_MINOR 8
+#define NRFX_CONFIG_API_VER_MINOR 7
 #endif
 
 /** @brief Symbol specifying micro version of the nrfx API to be used. */
diff --git a/soc/nordic/nrf53/sync_rtc.c b/soc/nordic/nrf53/sync_rtc.c
index 724453583b3..94616ee3a0c 100644
--- a/soc/nordic/nrf53/sync_rtc.c
+++ b/soc/nordic/nrf53/sync_rtc.c
@@ -107,14 +107,13 @@ static void ppi_rtc_to_ipc(union rtc_sync_channels channels, bool setup)
 /* Free DPPI and RTC channels */
 static void free_resources(union rtc_sync_channels channels)
 {
-	nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
 	nrfx_err_t err;
 
 	nrfx_gppi_channels_disable(BIT(channels.ch.ppi));
 
 	z_nrf_rtc_timer_chan_free(channels.ch.rtc);
 
-	err = nrfx_dppi_channel_free(&dppi, channels.ch.ppi);
+	err = nrfx_dppi_channel_free(channels.ch.ppi);
 	__ASSERT_NO_MSG(err == NRFX_SUCCESS);
 }
 
@@ -225,13 +224,12 @@ static int mbox_rx_init(void *user_data)
 /* Setup RTC synchronization. */
 static int sync_rtc_setup(void)
 {
-	nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
 	nrfx_err_t err;
 	union rtc_sync_channels channels;
 	int32_t sync_rtc_ch;
 	int rv;
 
-	err = nrfx_dppi_channel_alloc(&dppi, &channels.ch.ppi);
+	err = nrfx_dppi_channel_alloc(&channels.ch.ppi);
 	if (err != NRFX_SUCCESS) {
 		rv = -ENODEV;
 		goto bail;
@@ -239,7 +237,7 @@ static int sync_rtc_setup(void)
 
 	sync_rtc_ch = z_nrf_rtc_timer_chan_alloc();
 	if (sync_rtc_ch < 0) {
-		nrfx_dppi_channel_free(&dppi, channels.ch.ppi);
+		nrfx_dppi_channel_free(channels.ch.ppi);
 		rv = sync_rtc_ch;
 		goto bail;
 	}
diff --git a/west.yml b/west.yml
index dd0275031a6..40c149d4dbd 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 2dbb2ed6cf461062bbac59a65b6e9d4576656350
+      revision: 5c8d109371ebb740fbef1f440a3b59e488a36717
       path: modules/hal/nordic
       groups:
         - hal

From 4489a87117b51811c17e666499a3666fecea3a38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:30 +0100
Subject: [PATCH 1459/2913] Revert "[nrf fromlist] tests: drivers: watchdog:
 disable DCACHE for nRF54H20dk"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3e3716dc93b94e70e46d6ab84402366841a13d3a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf        | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf

diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf
deleted file mode 100644
index 45e31e2fae4..00000000000
--- a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Disable dcache
-CONFIG_DCACHE=n

From 29a471ba53eda236d4c3d6d5748a4a5bd120ef24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:30 +0100
Subject: [PATCH 1460/2913] Revert "[nrf fromtree] net: openthread: Add
 platform message management"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c1db9f739ad5286939099b5f81fb4b00aed55c2d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/openthread/platform/CMakeLists.txt    |  1 -
 modules/openthread/platform/messagepool.c     | 68 -------------------
 .../platform/openthread-core-zephyr-config.h  | 10 ---
 subsys/net/l2/openthread/Kconfig              |  5 --
 4 files changed, 84 deletions(-)
 delete mode 100644 modules/openthread/platform/messagepool.c

diff --git a/modules/openthread/platform/CMakeLists.txt b/modules/openthread/platform/CMakeLists.txt
index 29e827c1584..542aa5186ea 100644
--- a/modules/openthread/platform/CMakeLists.txt
+++ b/modules/openthread/platform/CMakeLists.txt
@@ -16,7 +16,6 @@ zephyr_library_sources_ifdef(CONFIG_OPENTHREAD_COPROCESSOR uart.c)
 zephyr_library_sources_ifdef(CONFIG_OPENTHREAD_CRYPTO_PSA crypto_psa.c)
 zephyr_library_sources_ifdef(CONFIG_OPENTHREAD_SHELL shell.c)
 zephyr_library_sources_ifdef(CONFIG_OPENTHREAD_EXTERNAL_HEAP memory.c)
-zephyr_library_sources_ifdef(CONFIG_OPENTHREAD_PLATFORM_MESSAGE_MANAGEMENT messagepool.c)
 zephyr_library_sources_ifdef(CONFIG_SETTINGS settings.c)
 zephyr_library_sources_ifndef(CONFIG_LOG_BACKEND_SPINEL logging.c)
 
diff --git a/modules/openthread/platform/messagepool.c b/modules/openthread/platform/messagepool.c
deleted file mode 100644
index cb9a64674c4..00000000000
--- a/modules/openthread/platform/messagepool.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/logging/log.h>
-
-#include <openthread/platform/messagepool.h>
-
-#define LOG_MODULE_NAME net_otPlat_messagepool
-#define LOG_LEVEL       CONFIG_OPENTHREAD_LOG_LEVEL
-
-LOG_MODULE_REGISTER(LOG_MODULE_NAME);
-
-#define BUF_TIMEOUT K_MSEC(50)
-
-#define MESSAGE_POOL_SIZE                                                                          \
-	(CONFIG_OPENTHREAD_NUM_MESSAGE_BUFFERS * CONFIG_OPENTHREAD_MESSAGE_BUFFER_SIZE)
-#define MAX_ALIGNMENT __alignof__(z_max_align_t)
-
-BUILD_ASSERT(CONFIG_OPENTHREAD_MESSAGE_BUFFER_SIZE % MAX_ALIGNMENT == 0,
-	     "Invalid message buffer size");
-
-static struct k_mem_slab message_pool;
-__aligned(MAX_ALIGNMENT) static uint8_t message_pool_buffer[MESSAGE_POOL_SIZE];
-
-void otPlatMessagePoolInit(otInstance *aInstance, uint16_t aMinNumFreeBuffers, size_t aBufferSize)
-{
-	ARG_UNUSED(aInstance);
-
-	__ASSERT(aBufferSize == CONFIG_OPENTHREAD_MESSAGE_BUFFER_SIZE,
-		 "Message buffer size does not match configuration");
-
-	if (aMinNumFreeBuffers > CONFIG_OPENTHREAD_NUM_MESSAGE_BUFFERS) {
-		LOG_WRN("Minimum number of free buffers (%d) is greater than number of allocated "
-			"buffers (%d)",
-			aMinNumFreeBuffers, CONFIG_OPENTHREAD_NUM_MESSAGE_BUFFERS);
-	}
-
-	if (k_mem_slab_init(&message_pool, message_pool_buffer, aBufferSize,
-			    CONFIG_OPENTHREAD_NUM_MESSAGE_BUFFERS) != 0) {
-		__ASSERT(false, "Failed to initialize message pool");
-	}
-}
-
-otMessageBuffer *otPlatMessagePoolNew(otInstance *aInstance)
-{
-	ARG_UNUSED(aInstance);
-
-	otMessageBuffer *buffer;
-
-	if (k_mem_slab_alloc(&message_pool, (void **)&buffer, BUF_TIMEOUT) != 0) {
-		LOG_ERR("Failed to allocate message buffer");
-		return NULL;
-	}
-
-	buffer->mNext = NULL;
-	return buffer;
-}
-
-void otPlatMessagePoolFree(otInstance *aInstance, otMessageBuffer *aBuffer)
-{
-	ARG_UNUSED(aInstance);
-
-	k_mem_slab_free(&message_pool, (void *)aBuffer);
-}
diff --git a/modules/openthread/platform/openthread-core-zephyr-config.h b/modules/openthread/platform/openthread-core-zephyr-config.h
index 434d69783be..20f424ee2fe 100644
--- a/modules/openthread/platform/openthread-core-zephyr-config.h
+++ b/modules/openthread/platform/openthread-core-zephyr-config.h
@@ -416,16 +416,6 @@
 #define OPENTHREAD_CONFIG_MESSAGE_BUFFER_SIZE CONFIG_OPENTHREAD_MESSAGE_BUFFER_SIZE
 #endif
 
-/**
- * @def OPENTHREAD_CONFIG_PLATFORM_MESSAGE_MANAGEMENT
- *
- * The message pool is managed by platform defined logic.
- *
- */
-#ifdef CONFIG_OPENTHREAD_PLATFORM_MESSAGE_MANAGEMENT
-#define OPENTHREAD_CONFIG_PLATFORM_MESSAGE_MANAGEMENT CONFIG_OPENTHREAD_PLATFORM_MESSAGE_MANAGEMENT
-#endif
-
 /**
  * @def OPENTHREAD_CONFIG_MAC_STAY_AWAKE_BETWEEN_FRAGMENTS
  *
diff --git a/subsys/net/l2/openthread/Kconfig b/subsys/net/l2/openthread/Kconfig
index 0f3c83ef763..958de6f8179 100644
--- a/subsys/net/l2/openthread/Kconfig
+++ b/subsys/net/l2/openthread/Kconfig
@@ -273,11 +273,6 @@ config OPENTHREAD_MESSAGE_BUFFER_SIZE
 	help
 	  "The size of a message buffer in bytes"
 
-config OPENTHREAD_PLATFORM_MESSAGE_MANAGEMENT
-	bool "Use platform message management"
-	help
-	  The message pool is managed by platform defined logic.
-
 config OPENTHREAD_MAX_STATECHANGE_HANDLERS
 	int "The maximum number of state-changed callback handlers"
 	default 2

From 598a5fa76e411ad0a8453e8a07ab514df64f863e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:30 +0100
Subject: [PATCH 1461/2913] Revert "[nrf fromtree] Bluetooth: Host: Unit test
 for bt_le_cs_set_valid_chmap_bits"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d1e15258d7057915c290a4158b7055c66c0219e5.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../CMakeLists.txt                            | 26 ----------------
 .../cs/bt_le_cs_set_valid_chmap_bits/prj.conf | 10 -------
 .../bt_le_cs_set_valid_chmap_bits/src/main.c  | 30 -------------------
 .../testcase.yaml                             |  7 -----
 4 files changed, 73 deletions(-)
 delete mode 100644 tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/CMakeLists.txt
 delete mode 100644 tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/prj.conf
 delete mode 100644 tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/src/main.c
 delete mode 100644 tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/testcase.yaml

diff --git a/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/CMakeLists.txt b/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/CMakeLists.txt
deleted file mode 100644
index aee0c445f6b..00000000000
--- a/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-
-find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
-
-get_filename_component(project_name ${CMAKE_CURRENT_SOURCE_DIR} NAME)
-project(${project_name})
-
-include_directories(BEFORE
-    ${ZEPHYR_BASE}/tests/bluetooth/host/cs/mocks
-)
-
-add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/host host_mocks)
-add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/host/cs/mocks mocks)
-
-target_link_libraries(testbinary PRIVATE mocks host_mocks)
-
-target_sources(testbinary
-    PRIVATE
-    src/main.c
-
-    ${ZEPHYR_BASE}/subsys/bluetooth/host/cs.c
-    ${ZEPHYR_BASE}/lib/net_buf/buf_simple.c
-    ${ZEPHYR_BASE}/subsys/logging/log_minimal.c
-)
diff --git a/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/prj.conf b/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/prj.conf
deleted file mode 100644
index 8ff995b6f04..00000000000
--- a/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/prj.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG_ZTEST=y
-CONFIG_BT=y
-CONFIG_BT_HCI=y
-CONFIG_BT_CENTRAL=y
-CONFIG_BT_CHANNEL_SOUNDING=y
-CONFIG_ASSERT=y
-CONFIG_ASSERT_LEVEL=2
-CONFIG_ASSERT_VERBOSE=y
-CONFIG_ASSERT_ON_ERRORS=y
-CONFIG_NET_BUF=y
diff --git a/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/src/main.c b/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/src/main.c
deleted file mode 100644
index 72784fba71d..00000000000
--- a/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/src/main.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/bluetooth/cs.h>
-#include <zephyr/fff.h>
-
-DEFINE_FFF_GLOBALS;
-
-ZTEST_SUITE(bt_le_cs_set_valid_chmap_bits, NULL, NULL, NULL, NULL, NULL);
-
-/*
- *  Test uninitialized chmap buffer is populated correctly
- *
- *  Expected behaviour:
- *   - test_chmap matches correct_chmap
- */
-ZTEST(bt_le_cs_set_valid_chmap_bits, test_uninitialized_chmap)
-{
-	uint8_t test_chmap[10];
-
-	bt_le_cs_set_valid_chmap_bits(test_chmap);
-
-	uint8_t correct_chmap[10] = {0xFC, 0xFF, 0x7F, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F};
-
-	zassert_mem_equal(test_chmap, correct_chmap, 10);
-}
diff --git a/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/testcase.yaml b/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/testcase.yaml
deleted file mode 100644
index b040e501559..00000000000
--- a/tests/bluetooth/host/cs/bt_le_cs_set_valid_chmap_bits/testcase.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-common:
-  tags:
-    - bluetooth
-    - host
-tests:
-  bluetooth.host.cs.bt_le_cs_set_valid_chmap_bits:
-    type: unit

From f27b74cc84b63c3a1f1e46f1c2fc874fd49149a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:30 +0100
Subject: [PATCH 1462/2913] Revert "[nrf fromtree] Bluetooth: Host: Remove code
 causing build error"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 293c7bdd20bfec22f0818fbf60b68b2a1fc85bd8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/bluetooth/host/cs/mocks/hci_core.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/bluetooth/host/cs/mocks/hci_core.c b/tests/bluetooth/host/cs/mocks/hci_core.c
index 5830c302a47..34ae77164cc 100644
--- a/tests/bluetooth/host/cs/mocks/hci_core.c
+++ b/tests/bluetooth/host/cs/mocks/hci_core.c
@@ -9,5 +9,11 @@
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/kernel.h>
 
+#include <host/hci_core.h>
+
+struct bt_dev bt_dev = {
+	.manufacturer = 0x1234,
+};
+
 DEFINE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_create, uint16_t, uint8_t);
 DEFINE_FAKE_VALUE_FUNC(int, bt_hci_cmd_send_sync, uint16_t, struct net_buf *, struct net_buf **);

From f87576a2981f55346cc00aeed0a057e3ea7816de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:30 +0100
Subject: [PATCH 1463/2913] Revert "[nrf fromtree] Bluetooth: Host: Fix
 spelling mistakes in cs.h"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 30a68404464fa41cbb2c5acee64c8ea2484696e3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/cs.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index 2c661c09c57..0c9ce50043c 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -215,7 +215,7 @@ enum bt_le_cs_test_override_4_tone_antenna_permutation {
 	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_21 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_21,
 	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_22 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_22,
 	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_23 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_23,
-	/** Loop through all valid Antenna Permutation Indices starting
+	/** Loop through all valid Antenna Permuation Indices starting
 	 *  from the lowest index.
 	 */
 	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_LOOP =
@@ -638,7 +638,7 @@ int bt_le_cs_test_cb_register(struct bt_le_cs_test_cb cs_test_cb);
  * of either the initiator or reflector.
  *
  * The first mode-0 channel in the list is used as the starting channel for
- * the test. At the beginning of any test, the IUT in the reflector role shall
+ * the test. At the beginning of any test, the IUT in the flector role shall
  * listen on the first mode-0 channel until it receives the first transmission
  * from the initiator. Similarly, with the IUT in the initiator role, the tester
  * will start by listening on the first mode-0 channel and the IUT shall transmit
@@ -718,7 +718,7 @@ void bt_le_cs_step_data_parse(struct net_buf_simple *step_data_buf,
 
 /** @brief CS Security Enable
  *
- * This command is used to start or restart the Channel Sounding Security
+ * This commmand is used to start or restart the Channel Sounding Security
  * Start procedure in the local Controller for the ACL connection identified
  * in the conn parameter.
  *
@@ -753,7 +753,7 @@ int bt_le_cs_procedure_enable(struct bt_conn *conn,
 
 enum bt_le_cs_procedure_phy {
 	BT_LE_CS_PROCEDURE_PHY_1M = BT_HCI_OP_LE_CS_PROCEDURE_PHY_1M,
-	BT_LE_CS_PROCEDURE_PHY_2M = BT_HCI_OP_LE_CS_PROCEDURE_PHY_2M,
+	BT_LE_CS_PROCEUDRE_PHY_2M = BT_HCI_OP_LE_CS_PROCEDURE_PHY_2M,
 	BT_LE_CS_PROCEDURE_PHY_CODED_S8 = BT_HCI_OP_LE_CS_PROCEDURE_PHY_CODED_S8,
 	BT_LE_CS_PROCEDURE_PHY_CODED_S2 = BT_HCI_OP_LE_CS_PROCEDURE_PHY_CODED_S2,
 };

From 07566c74ff5f7ad04c1ca620738c5d8c21d4611c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:30 +0100
Subject: [PATCH 1464/2913] Revert "[nrf fromtree] bluetooth: host: Update FAE
 table type for HCI commands"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6855f20b092be1bd692b2899ec1fd06d380598bc.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/conn.h      | 2 +-
 include/zephyr/bluetooth/cs.h        | 2 +-
 include/zephyr/bluetooth/hci_types.h | 4 ++--
 subsys/bluetooth/host/cs.c           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index 4231bf1dea0..b4cf1c5c6ba 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -410,7 +410,7 @@ struct bt_conn_le_cs_capabilities {
 
 /** Remote FAE Table for LE connections supporting CS */
 struct bt_conn_le_cs_fae_table {
-	int8_t *remote_fae_table;
+	uint8_t *remote_fae_table;
 };
 
 /** Channel sounding main mode */
diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index 0c9ce50043c..e7043f66762 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -886,7 +886,7 @@ int bt_le_cs_write_cached_remote_supported_capabilities(
  *
  * @return Zero on success or (negative) error code on failure.
  */
-int bt_le_cs_write_cached_remote_fae_table(struct bt_conn *conn, int8_t remote_fae_table[72]);
+int bt_le_cs_write_cached_remote_fae_table(struct bt_conn *conn, uint8_t remote_fae_table[72]);
 
 #ifdef __cplusplus
 }
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index d31efb38dea..719accabfc6 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -2499,7 +2499,7 @@ struct bt_hci_cp_le_read_remote_fae_table {
 
 struct bt_hci_cp_le_write_cached_remote_fae_table {
 	uint16_t handle;
-	int8_t remote_fae_table[72];
+	uint8_t remote_fae_table[72];
 } __packed;
 
 #define BT_HCI_OP_LE_CS_SET_CHANNEL_CLASSIFICATION BT_OP(BT_OGF_LE, 0x0092) /* 0x2092 */
@@ -3534,7 +3534,7 @@ struct bt_hci_evt_le_cs_read_remote_supported_capabilities_complete {
 struct bt_hci_evt_le_cs_read_remote_fae_table_complete {
 	uint8_t status;
 	uint16_t conn_handle;
-	int8_t remote_fae_table[72];
+	uint8_t remote_fae_table[72];
 } __packed;
 
 #define BT_HCI_LE_CS_CONFIG_ACTION_REMOVED 0x00
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index 03cc3a8e95f..c11f262b5d2 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -1171,7 +1171,7 @@ int bt_le_cs_write_cached_remote_supported_capabilities(
 				    NULL);
 }
 
-int bt_le_cs_write_cached_remote_fae_table(struct bt_conn *conn, int8_t remote_fae_table[72])
+int bt_le_cs_write_cached_remote_fae_table(struct bt_conn *conn, uint8_t remote_fae_table[72])
 {
 	struct bt_hci_cp_le_write_cached_remote_fae_table *cp;
 	struct net_buf *buf;

From 8befc2c21684959a416bcd48abf950e6f63a4e1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:30 +0100
Subject: [PATCH 1465/2913] Revert "[nrf fromtree] bluetooth: host: Add helper
 function for parsing PCTs"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e14e72cf2ed118f921a723099be0a3b4e9531189.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/cs.h                 |  18 ---
 include/zephyr/bluetooth/hci_types.h          |   3 +-
 subsys/bluetooth/host/cs.c                    |  18 ---
 .../host/cs/bt_le_cs_parse_pct/CMakeLists.txt |  25 -----
 .../host/cs/bt_le_cs_parse_pct/prj.conf       |  10 --
 .../host/cs/bt_le_cs_parse_pct/src/main.c     | 106 ------------------
 .../host/cs/bt_le_cs_parse_pct/testcase.yaml  |   7 --
 7 files changed, 1 insertion(+), 186 deletions(-)
 delete mode 100644 tests/bluetooth/host/cs/bt_le_cs_parse_pct/CMakeLists.txt
 delete mode 100644 tests/bluetooth/host/cs/bt_le_cs_parse_pct/prj.conf
 delete mode 100644 tests/bluetooth/host/cs/bt_le_cs_parse_pct/src/main.c
 delete mode 100644 tests/bluetooth/host/cs/bt_le_cs_parse_pct/testcase.yaml

diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index e7043f66762..d5d34039d27 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -551,24 +551,6 @@ struct bt_le_cs_subevent_step {
 	const uint8_t *data;
 };
 
-/** Sign-extended IQ value extracted from step data. */
-struct bt_le_cs_iq_sample {
-	int16_t i;
-	int16_t q;
-};
-
-/** @brief Extract in-phase and quadrature terms from HCI-formatted PCT.
- *
- * Convenience function for processing 24-bit phase correction terms found
- * in CS step data. The 12-bit signed real and imaginary components are
- * converted to host endianness and sign-extended.
- *
- * @param pct 24-bit little-endian phase correction term.
- *
- * @return struct bt_le_cs_iq_sample containing real and imaginary terms as int16_t
- */
-struct bt_le_cs_iq_sample bt_le_cs_parse_pct(const uint8_t pct[3]);
-
 /** @brief Set all valid channel map bits
  *
  * This command is used to enable all valid channels in a
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 719accabfc6..1b22e172fcc 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -3607,8 +3607,7 @@ struct bt_hci_evt_le_cs_config_complete {
 
 #define BT_HCI_LE_CS_REF_POWER_LEVEL_UNAVAILABLE 0x7F
 
-#define BT_HCI_LE_CS_PCT_I_MASK 0x000FFF
-#define BT_HCI_LE_CS_PCT_Q_MASK 0xFFF000
+#define BT_HCI_LE_CS_PCT_MASK 0xFFF
 
 #define BT_HCI_LE_CS_TONE_QUALITY_HIGH        0x0
 #define BT_HCI_LE_CS_TONE_QUALITY_MED         0x1
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index c11f262b5d2..aa1e1beadf3 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -240,24 +240,6 @@ static void reset_reassembly_results(void)
 	memset(&reassembled_result, 0, sizeof(struct bt_conn_le_cs_subevent_result));
 }
 
-/** @brief Converts PCT to a pair of int16_t
- *
- */
-struct bt_le_cs_iq_sample bt_le_cs_parse_pct(const uint8_t pct[3])
-{
-	uint32_t pct_u32 = sys_get_le24(pct);
-
-	/* Extract I and Q. */
-	uint16_t i_u16 = pct_u32 & BT_HCI_LE_CS_PCT_I_MASK;
-	uint16_t q_u16 = (pct_u32 & BT_HCI_LE_CS_PCT_Q_MASK) >> 12;
-
-	/* Convert from 12-bit 2's complement to int16_t */
-	int16_t i = (i_u16 ^ BIT(11)) - BIT(11);
-	int16_t q = (q_u16 ^ BIT(11)) - BIT(11);
-
-	return (struct bt_le_cs_iq_sample){.i = i, .q = q};
-}
-
 void bt_le_cs_set_valid_chmap_bits(uint8_t channel_map[10])
 {
 	memset(channel_map, 0xFF, 10);
diff --git a/tests/bluetooth/host/cs/bt_le_cs_parse_pct/CMakeLists.txt b/tests/bluetooth/host/cs/bt_le_cs_parse_pct/CMakeLists.txt
deleted file mode 100644
index 089406a316f..00000000000
--- a/tests/bluetooth/host/cs/bt_le_cs_parse_pct/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-
-find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
-
-project(bt_step_data_parse)
-
-include_directories(BEFORE
-    ${ZEPHYR_BASE}/tests/bluetooth/host/cs/mocks
-)
-
-add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/host host_mocks)
-add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/host/cs/mocks mocks)
-
-target_link_libraries(testbinary PRIVATE mocks host_mocks)
-
-target_sources(testbinary
-    PRIVATE
-    src/main.c
-
-    ${ZEPHYR_BASE}/subsys/bluetooth/host/cs.c
-    ${ZEPHYR_BASE}/lib/net_buf/buf_simple.c
-    ${ZEPHYR_BASE}/subsys/logging/log_minimal.c
-)
diff --git a/tests/bluetooth/host/cs/bt_le_cs_parse_pct/prj.conf b/tests/bluetooth/host/cs/bt_le_cs_parse_pct/prj.conf
deleted file mode 100644
index 8ff995b6f04..00000000000
--- a/tests/bluetooth/host/cs/bt_le_cs_parse_pct/prj.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG_ZTEST=y
-CONFIG_BT=y
-CONFIG_BT_HCI=y
-CONFIG_BT_CENTRAL=y
-CONFIG_BT_CHANNEL_SOUNDING=y
-CONFIG_ASSERT=y
-CONFIG_ASSERT_LEVEL=2
-CONFIG_ASSERT_VERBOSE=y
-CONFIG_ASSERT_ON_ERRORS=y
-CONFIG_NET_BUF=y
diff --git a/tests/bluetooth/host/cs/bt_le_cs_parse_pct/src/main.c b/tests/bluetooth/host/cs/bt_le_cs_parse_pct/src/main.c
deleted file mode 100644
index 70f07748f53..00000000000
--- a/tests/bluetooth/host/cs/bt_le_cs_parse_pct/src/main.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/bluetooth/cs.h>
-#include <zephyr/fff.h>
-
-DEFINE_FFF_GLOBALS;
-
-ZTEST_SUITE(bt_le_cs_parse_pct, NULL, NULL, NULL, NULL, NULL);
-
-/*
- *  Test success case
- *
- *  Constraints:
- *   - Valid PCT is passed in
- *
- *  Expected behaviour:
- *   - IQ term matches expected values
- */
-ZTEST(bt_le_cs_parse_pct, test_parsing_success)
-{
-	struct bt_le_cs_iq_sample iq;
-
-	struct {
-		uint8_t input[3];
-		struct bt_le_cs_iq_sample output;
-	} test_vector[] = {
-		/* Edge cases */
-		{.input = {0x00, 0x00, 0x00}, .output = {.i = 0, .q = 0}},
-		{.input = {0xFF, 0xFF, 0xFF}, .output = {.i = -1, .q = -1}},
-		{.input = {0xFF, 0x00, 0xFF}, .output = {.i = 255, .q = -16}},
-		{.input = {0xFF, 0x00, 0x00}, .output = {.i = 255, .q = 0}},
-		{.input = {0x00, 0xFF, 0x00}, .output = {.i = -256, .q = 15}},
-		{.input = {0x00, 0x00, 0xFF}, .output = {.i = 0, .q = -16}},
-		{.input = {0x00, 0x08, 0x80}, .output = {.i = -2048, .q = -2048}},
-		{.input = {0xFF, 0xF7, 0x7F}, .output = {.i = 2047, .q = 2047}},
-
-		/* Randomly generated using python */
-		{.input = {0xEF, 0xCD, 0xAB}, .output = {.i = -529, .q = -1348}},
-		{.input = {0x30, 0x75, 0x44}, .output = {.i = 1328, .q = 1095}},
-		{.input = {0x46, 0x5D, 0xEB}, .output = {.i = -698, .q = -331}},
-		{.input = {0xE8, 0x14, 0x45}, .output = {.i = 1256, .q = 1105}},
-		{.input = {0x23, 0xCA, 0x5C}, .output = {.i = -1501, .q = 1484}},
-		{.input = {0x68, 0xA0, 0x15}, .output = {.i = 104, .q = 346}},
-		{.input = {0x39, 0x73, 0x1B}, .output = {.i = 825, .q = 439}},
-		{.input = {0x23, 0x72, 0x3D}, .output = {.i = 547, .q = 983}},
-		{.input = {0xF5, 0xF8, 0x3D}, .output = {.i = -1803, .q = 991}},
-		{.input = {0xF7, 0xB4, 0xB9}, .output = {.i = 1271, .q = -1125}},
-		{.input = {0x61, 0x9F, 0xD5}, .output = {.i = -159, .q = -679}},
-		{.input = {0x9B, 0x21, 0xC6}, .output = {.i = 411, .q = -926}},
-		{.input = {0x14, 0x86, 0x0F}, .output = {.i = 1556, .q = 248}},
-		{.input = {0x8E, 0xBB, 0xC6}, .output = {.i = -1138, .q = -917}},
-		{.input = {0x5B, 0xD1, 0xC2}, .output = {.i = 347, .q = -979}},
-		{.input = {0x99, 0x4A, 0x28}, .output = {.i = -1383, .q = 644}},
-		{.input = {0x32, 0x16, 0x2B}, .output = {.i = 1586, .q = 689}},
-		{.input = {0x3E, 0x8C, 0xD4}, .output = {.i = -962, .q = -696}},
-		{.input = {0x2B, 0x1F, 0x95}, .output = {.i = -213, .q = -1711}},
-		{.input = {0x22, 0xE6, 0xD6}, .output = {.i = 1570, .q = -658}},
-		{.input = {0x0B, 0x31, 0xD6}, .output = {.i = 267, .q = -669}},
-		{.input = {0x1B, 0x98, 0x9D}, .output = {.i = -2021, .q = -1575}},
-		{.input = {0x8E, 0x97, 0x63}, .output = {.i = 1934, .q = 1593}},
-		{.input = {0x97, 0x91, 0x8D}, .output = {.i = 407, .q = -1831}},
-		{.input = {0x67, 0xF7, 0x1F}, .output = {.i = 1895, .q = 511}},
-		{.input = {0xD6, 0x5C, 0x23}, .output = {.i = -810, .q = 565}},
-		{.input = {0x92, 0xD3, 0x0B}, .output = {.i = 914, .q = 189}},
-		{.input = {0xE8, 0xF3, 0x23}, .output = {.i = 1000, .q = 575}},
-		{.input = {0xE6, 0xE3, 0xAD}, .output = {.i = 998, .q = -1314}},
-		{.input = {0x6E, 0x70, 0xA9}, .output = {.i = 110, .q = -1385}},
-		{.input = {0x63, 0x65, 0x28}, .output = {.i = 1379, .q = 646}},
-		{.input = {0x27, 0x0F, 0x32}, .output = {.i = -217, .q = 800}},
-		{.input = {0x3F, 0x8C, 0xE1}, .output = {.i = -961, .q = -488}},
-		{.input = {0x4E, 0x86, 0xAA}, .output = {.i = 1614, .q = -1368}},
-		{.input = {0x9E, 0xD1, 0xF6}, .output = {.i = 414, .q = -147}},
-		{.input = {0x86, 0x09, 0x56}, .output = {.i = -1658, .q = 1376}},
-		{.input = {0xFF, 0x09, 0x41}, .output = {.i = -1537, .q = 1040}},
-		{.input = {0x89, 0xC5, 0x1F}, .output = {.i = 1417, .q = 508}},
-		{.input = {0x1A, 0xE2, 0x9A}, .output = {.i = 538, .q = -1618}},
-		{.input = {0x7E, 0x03, 0xB8}, .output = {.i = 894, .q = -1152}},
-		{.input = {0x5E, 0x28, 0xB3}, .output = {.i = -1954, .q = -1230}},
-		{.input = {0xFF, 0x50, 0xF0}, .output = {.i = 255, .q = -251}},
-		{.input = {0xB0, 0x07, 0x87}, .output = {.i = 1968, .q = -1936}},
-		{.input = {0x7E, 0xD7, 0x0C}, .output = {.i = 1918, .q = 205}},
-		{.input = {0x26, 0xA2, 0xC9}, .output = {.i = 550, .q = -870}},
-		{.input = {0x97, 0x71, 0x72}, .output = {.i = 407, .q = 1831}},
-		{.input = {0x73, 0x0E, 0xC1}, .output = {.i = -397, .q = -1008}},
-		{.input = {0xAC, 0x20, 0x6B}, .output = {.i = 172, .q = 1714}},
-		{.input = {0x85, 0x7D, 0xB4}, .output = {.i = -635, .q = -1209}},
-		{.input = {0xCC, 0xE3, 0x1B}, .output = {.i = 972, .q = 446}},
-		{.input = {0x88, 0x48, 0x65}, .output = {.i = -1912, .q = 1620}},
-	};
-
-	for (uint16_t k = 0; k < ARRAY_SIZE(test_vector); k++) {
-		iq = bt_le_cs_parse_pct(test_vector[k].input);
-
-		zassert_equal(iq.i, test_vector[k].output.i,
-			      "Failed for k = %u, expected %d, not %d", k, test_vector[k].output.i,
-			      iq.i);
-		zassert_equal(iq.q, test_vector[k].output.q,
-			      "Failed for k = %u, expected %d, not %d", k, test_vector[k].output.q,
-			      iq.q);
-	}
-}
diff --git a/tests/bluetooth/host/cs/bt_le_cs_parse_pct/testcase.yaml b/tests/bluetooth/host/cs/bt_le_cs_parse_pct/testcase.yaml
deleted file mode 100644
index deab8ebd294..00000000000
--- a/tests/bluetooth/host/cs/bt_le_cs_parse_pct/testcase.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-common:
-  tags:
-    - bluetooth
-    - host
-tests:
-  bluetooth.host.cs.bt_le_cs_parse_pct:
-    type: unit

From 88c9c90a0833082e65628b6aba0a04993a758ab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:30 +0100
Subject: [PATCH 1466/2913] Revert "[nrf fromtree] bluetooth: host: Unit tests
 for bt_le_cs_step_data_parse"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 43d99039d3ba7a543b6a0600488c6654898a083a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/host/cs.c                    |   5 -
 .../bt_le_cs_step_data_parse/CMakeLists.txt   |  25 ---
 .../host/cs/bt_le_cs_step_data_parse/prj.conf |  10 -
 .../cs/bt_le_cs_step_data_parse/src/main.c    | 171 ------------------
 .../cs/bt_le_cs_step_data_parse/testcase.yaml |   7 -
 tests/bluetooth/host/cs/mocks/CMakeLists.txt  |  17 --
 tests/bluetooth/host/cs/mocks/conn.c          |  22 ---
 tests/bluetooth/host/cs/mocks/conn.h          |  37 ----
 tests/bluetooth/host/cs/mocks/hci_core.c      |  19 --
 tests/bluetooth/host/cs/mocks/hci_core.h      |  16 --
 tests/bluetooth/host/cs/mocks/net_buf.c       |  17 --
 tests/bluetooth/host/cs/mocks/net_buf.h       |  21 ---
 12 files changed, 367 deletions(-)
 delete mode 100644 tests/bluetooth/host/cs/bt_le_cs_step_data_parse/CMakeLists.txt
 delete mode 100644 tests/bluetooth/host/cs/bt_le_cs_step_data_parse/prj.conf
 delete mode 100644 tests/bluetooth/host/cs/bt_le_cs_step_data_parse/src/main.c
 delete mode 100644 tests/bluetooth/host/cs/bt_le_cs_step_data_parse/testcase.yaml
 delete mode 100644 tests/bluetooth/host/cs/mocks/CMakeLists.txt
 delete mode 100644 tests/bluetooth/host/cs/mocks/conn.c
 delete mode 100644 tests/bluetooth/host/cs/mocks/conn.h
 delete mode 100644 tests/bluetooth/host/cs/mocks/hci_core.c
 delete mode 100644 tests/bluetooth/host/cs/mocks/hci_core.h
 delete mode 100644 tests/bluetooth/host/cs/mocks/net_buf.c
 delete mode 100644 tests/bluetooth/host/cs/mocks/net_buf.h

diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index aa1e1beadf3..b22877d31b8 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -1313,11 +1313,6 @@ void bt_le_cs_step_data_parse(struct net_buf_simple *step_data_buf,
 
 		step.data = step_data_buf->data;
 
-		if (step.data_len > step_data_buf->len) {
-			LOG_WRN("Step data appears malformed.");
-			return;
-		}
-
 		if (!func(&step, user_data)) {
 			return;
 		}
diff --git a/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/CMakeLists.txt b/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/CMakeLists.txt
deleted file mode 100644
index 089406a316f..00000000000
--- a/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-
-find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
-
-project(bt_step_data_parse)
-
-include_directories(BEFORE
-    ${ZEPHYR_BASE}/tests/bluetooth/host/cs/mocks
-)
-
-add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/host host_mocks)
-add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/host/cs/mocks mocks)
-
-target_link_libraries(testbinary PRIVATE mocks host_mocks)
-
-target_sources(testbinary
-    PRIVATE
-    src/main.c
-
-    ${ZEPHYR_BASE}/subsys/bluetooth/host/cs.c
-    ${ZEPHYR_BASE}/lib/net_buf/buf_simple.c
-    ${ZEPHYR_BASE}/subsys/logging/log_minimal.c
-)
diff --git a/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/prj.conf b/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/prj.conf
deleted file mode 100644
index 8ff995b6f04..00000000000
--- a/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/prj.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG_ZTEST=y
-CONFIG_BT=y
-CONFIG_BT_HCI=y
-CONFIG_BT_CENTRAL=y
-CONFIG_BT_CHANNEL_SOUNDING=y
-CONFIG_ASSERT=y
-CONFIG_ASSERT_LEVEL=2
-CONFIG_ASSERT_VERBOSE=y
-CONFIG_ASSERT_ON_ERRORS=y
-CONFIG_NET_BUF=y
diff --git a/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/src/main.c b/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/src/main.c
deleted file mode 100644
index 1ed0f2d640b..00000000000
--- a/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/src/main.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "mocks/conn.h"
-#include "mocks/hci_core.h"
-#include "mocks/net_buf.h"
-
-#include <zephyr/kernel.h>
-#include <zephyr/bluetooth/cs.h>
-#include <zephyr/fff.h>
-
-DEFINE_FFF_GLOBALS;
-
-FAKE_VALUE_FUNC(bool, bt_le_cs_step_data_parse_func, struct bt_le_cs_subevent_step *, void *);
-
-static void fff_reset_rule_before(const struct ztest_unit_test *test, void *fixture)
-{
-	RESET_FAKE(bt_le_cs_step_data_parse_func);
-	CONN_FFF_FAKES_LIST(RESET_FAKE);
-}
-
-ZTEST_RULE(fff_reset_rule, fff_reset_rule_before, NULL);
-
-ZTEST_SUITE(bt_le_cs_step_data_parse, NULL, NULL, NULL, NULL, NULL);
-
-/*
- *  Test empty data buffer
- *
- *  Constraints:
- *   - buffer len set to 0
- *
- *  Expected behaviour:
- *   - Callback function is not called
- */
-ZTEST(bt_le_cs_step_data_parse, test_parsing_empty_buf)
-{
-	struct net_buf_simple *buf = NET_BUF_SIMPLE(0);
-
-	bt_le_cs_step_data_parse(buf, bt_le_cs_step_data_parse_func, NULL);
-
-	zassert_equal(bt_le_cs_step_data_parse_func_fake.call_count, 0);
-}
-
-/*
- *  Test malformed step data
- *
- *  Constraints:
- *   - step data with a step length going out of bounds
- *
- *  Expected behaviour:
- *   - Callback function is called once
- */
-ZTEST(bt_le_cs_step_data_parse, test_parsing_invalid_length)
-{
-	struct net_buf_simple buf;
-	uint8_t data[] = {
-		0x00, 0x01, 0x01, 0x00,       /* mode 0 */
-		0x03, 0x20, 0x03, 0x00, 0x11, /* mode 3 step with bad length */
-	};
-
-	bt_le_cs_step_data_parse_func_fake.return_val = true;
-
-	net_buf_simple_init_with_data(&buf, data, ARRAY_SIZE(data));
-
-	bt_le_cs_step_data_parse(&buf, bt_le_cs_step_data_parse_func, NULL);
-
-	zassert_equal(1, bt_le_cs_step_data_parse_func_fake.call_count, "called %d",
-		      bt_le_cs_step_data_parse_func_fake.call_count);
-}
-
-/*
- *  Test parsing stopped
- *
- *  Constraints:
- *   - Data contains valid step data
- *   - Callback function returns false to stop parsing
- *
- *  Expected behaviour:
- *   - Once parsing is stopped, the callback is not called anymore
- */
-ZTEST(bt_le_cs_step_data_parse, test_parsing_stopped)
-{
-	struct net_buf_simple buf;
-	uint8_t data[] = {
-		0x00, 0x05, 0x01, 0x00,       /* mode 0 */
-		0x01, 0x10, 0x02, 0x00, 0x11, /* mode 1 */
-		0x02, 0x11, 0x02, 0x00, 0x11, /* mode 2 */
-	};
-
-	bt_le_cs_step_data_parse_func_fake.return_val = false;
-
-	net_buf_simple_init_with_data(&buf, data, ARRAY_SIZE(data));
-
-	bt_le_cs_step_data_parse(&buf, bt_le_cs_step_data_parse_func, NULL);
-
-	zassert_equal(1, bt_le_cs_step_data_parse_func_fake.call_count, "called %d",
-		      bt_le_cs_step_data_parse_func_fake.call_count);
-}
-
-struct custom_user_data {
-	const uint8_t *data;
-	size_t len;
-};
-
-static bool bt_le_cs_step_data_parse_func_custom_fake(struct bt_le_cs_subevent_step *step,
-						      void *user_data)
-{
-	struct custom_user_data *ud = user_data;
-
-	/* mode check */
-	zassert_true(ud->len-- > 0);
-	zassert_equal(step->mode, *ud->data);
-	ud->data++;
-
-	/* channel check */
-	zassert_true(ud->len-- > 0);
-	zassert_equal(step->channel, *ud->data);
-	ud->data++;
-
-	/* step data length check */
-	zassert_true(ud->len-- > 0);
-	zassert_equal(step->data_len, *ud->data);
-	ud->data++;
-
-	/* value check */
-	zassert_true(ud->len >= step->data_len);
-	zassert_mem_equal(step->data, ud->data, step->data_len);
-	ud->data += step->data_len;
-	ud->len -= step->data_len;
-
-	return true;
-}
-
-/*
- *  Test parsing successfully
- *
- *  Constraints:
- *   - Data contains valid step data
- *   - Callback function returns false to stop parsing
- *
- *  Expected behaviour:
- *   - Data passed to the callback match the expected data
- */
-ZTEST(bt_le_cs_step_data_parse, test_parsing_success)
-{
-	struct net_buf_simple buf;
-	uint8_t data[] = {
-		0x00, 0x05, 0x01, 0x00,       /* mode 0 */
-		0x03, 0x11, 0x01, 0x11,       /* mode 3 */
-		0x02, 0x12, 0x02, 0x00, 0x11, /* mode 2 */
-		0x03, 0x13, 0x01, 0x11,       /* mode 3 */
-		0x02, 0x14, 0x02, 0x00, 0x11, /* mode 2 */
-	};
-
-	struct custom_user_data user_data = {
-		.data = data,
-		.len = ARRAY_SIZE(data),
-	};
-
-	bt_le_cs_step_data_parse_func_fake.custom_fake = bt_le_cs_step_data_parse_func_custom_fake;
-
-	net_buf_simple_init_with_data(&buf, data, ARRAY_SIZE(data));
-
-	bt_le_cs_step_data_parse(&buf, bt_le_cs_step_data_parse_func, &user_data);
-
-	zassert_equal(5, bt_le_cs_step_data_parse_func_fake.call_count, "called %d",
-		      bt_le_cs_step_data_parse_func_fake.call_count);
-}
diff --git a/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/testcase.yaml b/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/testcase.yaml
deleted file mode 100644
index 2e65668c519..00000000000
--- a/tests/bluetooth/host/cs/bt_le_cs_step_data_parse/testcase.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-common:
-  tags:
-    - bluetooth
-    - host
-tests:
-  bluetooth.host.cs.bt_le_cs_step_data_parse:
-    type: unit
diff --git a/tests/bluetooth/host/cs/mocks/CMakeLists.txt b/tests/bluetooth/host/cs/mocks/CMakeLists.txt
deleted file mode 100644
index 1ab1a58a1d0..00000000000
--- a/tests/bluetooth/host/cs/mocks/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(mocks STATIC
-            conn.c
-            hci_core.c
-            net_buf.c
-)
-
-target_include_directories(mocks PUBLIC
-  ..
-  ${ZEPHYR_BASE}/subsys/bluetooth
-  ${ZEPHYR_BASE}/subsys/bluetooth/host
-  ${ZEPHYR_BASE}/tests/bluetooth/host
-  ${ZEPHYR_BASE}/tests/bluetooth/host/cs/mocks
-)
-
-target_link_libraries(mocks PRIVATE test_interface)
diff --git a/tests/bluetooth/host/cs/mocks/conn.c b/tests/bluetooth/host/cs/mocks/conn.c
deleted file mode 100644
index 910a06e3ce3..00000000000
--- a/tests/bluetooth/host/cs/mocks/conn.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "mocks/conn.h"
-
-#include <zephyr/kernel.h>
-
-DEFINE_FAKE_VOID_FUNC(bt_conn_unref, struct bt_conn *);
-DEFINE_FAKE_VALUE_FUNC(struct bt_conn *, bt_conn_lookup_handle, uint16_t, enum bt_conn_type);
-DEFINE_FAKE_VOID_FUNC(notify_remote_cs_capabilities, struct bt_conn *,
-		      struct bt_conn_le_cs_capabilities);
-DEFINE_FAKE_VOID_FUNC(notify_remote_cs_fae_table, struct bt_conn *, struct bt_conn_le_cs_fae_table);
-DEFINE_FAKE_VOID_FUNC(notify_cs_config_created, struct bt_conn *, struct bt_conn_le_cs_config *);
-DEFINE_FAKE_VOID_FUNC(notify_cs_config_removed, struct bt_conn *, uint8_t);
-DEFINE_FAKE_VOID_FUNC(notify_cs_subevent_result, struct bt_conn *,
-		      struct bt_conn_le_cs_subevent_result *);
-DEFINE_FAKE_VOID_FUNC(notify_cs_security_enable_available, struct bt_conn *);
-DEFINE_FAKE_VOID_FUNC(notify_cs_procedure_enable_available, struct bt_conn *,
-		      struct bt_conn_le_cs_procedure_enable_complete *);
diff --git a/tests/bluetooth/host/cs/mocks/conn.h b/tests/bluetooth/host/cs/mocks/conn.h
deleted file mode 100644
index 70aa9bdfd26..00000000000
--- a/tests/bluetooth/host/cs/mocks/conn.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/fff.h>
-#include <zephyr/kernel.h>
-
-#include <host/conn_internal.h>
-
-/* List of fakes used by this unit tester */
-#define CONN_FFF_FAKES_LIST(FAKE)                                                                  \
-	FAKE(bt_conn_unref)                                                                        \
-	FAKE(bt_conn_lookup_handle)                                                                \
-	FAKE(notify_remote_cs_capabilities)                                                        \
-	FAKE(notify_cs_config_created)                                                             \
-	FAKE(notify_cs_config_removed)                                                             \
-	FAKE(notify_cs_subevent_result)                                                            \
-	FAKE(notify_cs_security_enable_available)                                                  \
-	FAKE(notify_cs_procedure_enable_available)                                                 \
-	FAKE(notify_remote_cs_fae_table)
-
-DECLARE_FAKE_VOID_FUNC(bt_conn_unref, struct bt_conn *);
-DECLARE_FAKE_VALUE_FUNC(struct bt_conn *, bt_conn_lookup_handle, uint16_t, enum bt_conn_type);
-DECLARE_FAKE_VOID_FUNC(notify_remote_cs_capabilities, struct bt_conn *,
-		       struct bt_conn_le_cs_capabilities);
-DECLARE_FAKE_VOID_FUNC(notify_remote_cs_fae_table, struct bt_conn *,
-		       struct bt_conn_le_cs_fae_table);
-DECLARE_FAKE_VOID_FUNC(notify_cs_config_created, struct bt_conn *, struct bt_conn_le_cs_config *);
-DECLARE_FAKE_VOID_FUNC(notify_cs_config_removed, struct bt_conn *, uint8_t);
-DECLARE_FAKE_VOID_FUNC(notify_cs_subevent_result, struct bt_conn *,
-		       struct bt_conn_le_cs_subevent_result *);
-DECLARE_FAKE_VOID_FUNC(notify_cs_security_enable_available, struct bt_conn *);
-DECLARE_FAKE_VOID_FUNC(notify_cs_procedure_enable_available, struct bt_conn *,
-		       struct bt_conn_le_cs_procedure_enable_complete *);
diff --git a/tests/bluetooth/host/cs/mocks/hci_core.c b/tests/bluetooth/host/cs/mocks/hci_core.c
deleted file mode 100644
index 34ae77164cc..00000000000
--- a/tests/bluetooth/host/cs/mocks/hci_core.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "mocks/hci_core.h"
-
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/kernel.h>
-
-#include <host/hci_core.h>
-
-struct bt_dev bt_dev = {
-	.manufacturer = 0x1234,
-};
-
-DEFINE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_create, uint16_t, uint8_t);
-DEFINE_FAKE_VALUE_FUNC(int, bt_hci_cmd_send_sync, uint16_t, struct net_buf *, struct net_buf **);
diff --git a/tests/bluetooth/host/cs/mocks/hci_core.h b/tests/bluetooth/host/cs/mocks/hci_core.h
deleted file mode 100644
index 8dc28890755..00000000000
--- a/tests/bluetooth/host/cs/mocks/hci_core.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/fff.h>
-#include <zephyr/kernel.h>
-
-/* List of fakes used by this unit tester */
-#define HCI_CORE_FFF_FAKES_LIST(FAKE)                                                              \
-	FAKE(bt_hci_cmd_create)                                                                    \
-	FAKE(bt_hci_cmd_send_sync)
-
-DECLARE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_create, uint16_t, uint8_t);
-DECLARE_FAKE_VALUE_FUNC(int, bt_hci_cmd_send_sync, uint16_t, struct net_buf *, struct net_buf **);
diff --git a/tests/bluetooth/host/cs/mocks/net_buf.c b/tests/bluetooth/host/cs/mocks/net_buf.c
deleted file mode 100644
index 22ceb93a25e..00000000000
--- a/tests/bluetooth/host/cs/mocks/net_buf.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/net_buf.h>
-
-#include "mocks/net_buf.h"
-
-const struct net_buf_data_cb net_buf_fixed_cb;
-
-DEFINE_FAKE_VOID_FUNC(net_buf_unref, struct net_buf *);
-DEFINE_FAKE_VOID_FUNC(net_buf_reset, struct net_buf *);
-DEFINE_FAKE_VOID_FUNC(net_buf_slist_put, sys_slist_t *, struct net_buf *);
-DEFINE_FAKE_VALUE_FUNC(struct net_buf *, net_buf_alloc_fixed, struct net_buf_pool *, k_timeout_t);
diff --git a/tests/bluetooth/host/cs/mocks/net_buf.h b/tests/bluetooth/host/cs/mocks/net_buf.h
deleted file mode 100644
index 14437d3d158..00000000000
--- a/tests/bluetooth/host/cs/mocks/net_buf.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/fff.h>
-#include <zephyr/kernel.h>
-#include <zephyr/net_buf.h>
-
-/* List of fakes used by this unit tester */
-#define NET_BUF_FFF_FAKES_LIST(FAKE)                                                               \
-	FAKE(net_buf_unref)                                                                        \
-	FAKE(net_buf_reset)                                                                        \
-	FAKE(net_buf_slist_put)                                                                    \
-	FAKE(net_buf_alloc_fixed)
-
-DECLARE_FAKE_VOID_FUNC(net_buf_unref, struct net_buf *);
-DECLARE_FAKE_VOID_FUNC(net_buf_reset, struct net_buf *);
-DECLARE_FAKE_VOID_FUNC(net_buf_slist_put, sys_slist_t *, struct net_buf *);
-DECLARE_FAKE_VALUE_FUNC(struct net_buf *, net_buf_alloc_fixed, struct net_buf_pool *, k_timeout_t);

From 210d62a297d65d49cfc9b0b84c4482116ca1a1d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:30 +0100
Subject: [PATCH 1467/2913] Revert "[nrf fromlist] cmake: dts: Use temporary
 file for dts.cmake"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c530d584fe8fc371281dac2c4c273c6007873864.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/modules/dts.cmake | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/cmake/modules/dts.cmake b/cmake/modules/dts.cmake
index 42e822c6c91..82c5a302fbc 100644
--- a/cmake/modules/dts.cmake
+++ b/cmake/modules/dts.cmake
@@ -319,26 +319,17 @@ endif()
 #
 # Run GEN_DTS_CMAKE_SCRIPT.
 #
-# A temporary file is copied to the original file if it differs. This prevents issue such as a
-# cycle when sysbuild is used of configuring and building multiple times due to the dts.cmake file
-# of images having a newer modification time than the sysbuild build.ninja file, despite the
-# output having not changed
-#
-set(dts_cmake_tmp ${DTS_CMAKE}.new)
 
 execute_process(
   COMMAND ${PYTHON_EXECUTABLE} ${GEN_DTS_CMAKE_SCRIPT}
   --edt-pickle ${EDT_PICKLE}
-  --cmake-out ${dts_cmake_tmp}
+  --cmake-out ${DTS_CMAKE}
   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
   RESULT_VARIABLE ret
   )
 if(NOT "${ret}" STREQUAL "0")
   message(FATAL_ERROR "gen_dts_cmake.py failed with return code: ${ret}")
 else()
-  zephyr_file_copy(${dts_cmake_tmp} ${DTS_CMAKE} ONLY_IF_DIFFERENT)
-  file(REMOVE ${dts_cmake_tmp})
-  set(dts_cmake_tmp)
   message(STATUS "Including generated dts.cmake file: ${DTS_CMAKE}")
   include(${DTS_CMAKE})
 endif()

From 1e89213ea00eae56be5c328d521088f8e353a207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:30 +0100
Subject: [PATCH 1468/2913] Revert "[nrf fromlist] soc: nordic: add
 configuration for nrf54h20 flpr core"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1c73db7ef4897adf261b8a319c656cb09c8e9f8f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/soc.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/soc/nordic/soc.yml b/soc/nordic/soc.yml
index 9879f82f61a..27db57b9099 100644
--- a/soc/nordic/soc.yml
+++ b/soc/nordic/soc.yml
@@ -103,7 +103,6 @@ runners:
               - nrf54h20/cpuapp
               - nrf54h20/cpurad
               - nrf54h20/cpuppr
-              - nrf54h20/cpuflpr
           - qualifiers:
               - nrf9280/cpuapp
               - nrf9280/cpurad
@@ -157,7 +156,6 @@ runners:
               - nrf54h20/cpuapp
               - nrf54h20/cpurad
               - nrf54h20/cpuppr
-              - nrf54h20/cpuflpr
           - qualifiers:
               - nrf9280/cpuapp
               - nrf9280/cpurad
@@ -209,7 +207,6 @@ runners:
               - nrf54h20/cpuapp
               - nrf54h20/cpurad
               - nrf54h20/cpuppr
-              - nrf54h20/cpuflpr
           - qualifiers:
               - nrf9280/cpuapp
               - nrf9280/cpurad

From 63987a47929b910f639390f47fe87a8bb665686e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:31 +0100
Subject: [PATCH 1469/2913] Revert "[nrf fromlist] arch: arm: cortex_m:
 pm_s2ram: fix system_off rv as rv of s2ram_suspend"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 14b7851df94ceb31a42be8eb727a1f01a946ad94.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 arch/arm/core/cortex_m/pm_s2ram.S | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/arch/arm/core/cortex_m/pm_s2ram.S b/arch/arm/core/cortex_m/pm_s2ram.S
index aed8cf5b692..27c2a1e96a7 100644
--- a/arch/arm/core/cortex_m/pm_s2ram.S
+++ b/arch/arm/core/cortex_m/pm_s2ram.S
@@ -85,9 +85,6 @@ SECTION_FUNC(TEXT, arch_pm_s2ram_suspend)
 	 * not successful (in r0 the return value).
 	 */
 
-	/* Move return value of system_off to callee-saved register. */
-	mov 	r4, r0
-
 	/*
 	 * Reset the marking of suspend to RAM, return is ignored.
 	 */
@@ -95,9 +92,7 @@ SECTION_FUNC(TEXT, arch_pm_s2ram_suspend)
 	bl	pm_s2ram_mark_check_and_clear
 	mov 	lr, r1
 
-	/* Move the stored return value of system_off back to r0,
-	 * setting it as return value for this function.
-	 */
+	/* Move system_off back to r0 as return value */
 	mov	r0, r4
 
 	pop	{r4-r12, lr}

From 410e59528dfcff3b3d0040125eca3ac269f37930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:31 +0100
Subject: [PATCH 1470/2913] Revert "[nrf noup] ci: fix suit-dfu-test entries in
 test-spec"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 083162656d638aba0d5bf5733cc5a0deeba206a2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .github/test-spec.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/test-spec.yml b/.github/test-spec.yml
index bf09724ea49..63a29824c11 100644
--- a/.github/test-spec.yml
+++ b/.github/test-spec.yml
@@ -391,11 +391,10 @@
   - "drivers/mbox/**/*"
   - "drivers/serial/**/*"
   - "drivers/console/**/*"
-  - "drivers/gpio/**/*"
   - "dts/common/nordic/*"
-  - "dts/arm/nordic/nrf54h*/**/*"
-  - "dts/riscv/nordic/nrf54h*/**/*"
-  - "boards/nordic/nrf54h*/**/*"
+  - "dts/arm/nordic/nrf54h*"
+  - "dts/riscv/nordic/nrf54h*"
+  - "boards/nordic/nrf54h*"
   - "soc/nordic/nrf54h/**/*"
   - "include/zephyr/**/*"
   - "subsys/logging/**/*"

From c9781521c9d0aa0c29d1d53d595b200885578740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:31 +0100
Subject: [PATCH 1471/2913] Revert "[nrf fromlist] drivers: pwm: nrfx: add pin
 retention"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit bfcbcf4e59439d6574e121718fea30874a6693ee.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/pwm/pwm_nrfx.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index 230a90d6cdf..5161b299c3a 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -13,9 +13,6 @@
 #include <zephyr/linker/devicetree_regions.h>
 #include <zephyr/cache.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
-#ifdef CONFIG_SOC_NRF54H20_GPD
-#include <nrf/gpd.h>
-#endif
 
 #include <zephyr/logging/log.h>
 
@@ -277,10 +274,6 @@ static void pwm_resume(const struct device *dev)
 
 	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
 
-#ifdef CONFIG_SOC_NRF54H20_GPD
-	nrf_gpd_retain_pins_set(config->pcfg, false);
-#endif
-
 	for (size_t i = 0; i < NRF_PWM_CHANNEL_COUNT; i++) {
 		uint32_t psel;
 
@@ -309,10 +302,6 @@ static void pwm_suspend(const struct device *dev)
 	while (!nrfx_pwm_stopped_check(&config->pwm)) {
 	}
 
-#ifdef CONFIG_SOC_NRF54H20_GPD
-	nrf_gpd_retain_pins_set(config->pcfg, true);
-#endif
-
 	memset(dev->data, 0, sizeof(struct pwm_nrfx_data));
 	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
 }

From 8b1bd641ccb6fa9bfc883b5514587f57d4958945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:31 +0100
Subject: [PATCH 1472/2913] Revert "[nrf fromlist] drivers: spi: nrfx_spim:
 set/clear pins retention"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e8126dc55517fe74141777ea174deb29583af117.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/spi/spi_nrfx_spim.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c
index b0eecc07625..3de9f82709c 100644
--- a/drivers/spi/spi_nrfx_spim.c
+++ b/drivers/spi/spi_nrfx_spim.c
@@ -11,9 +11,6 @@
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
 #include <soc.h>
-#ifdef CONFIG_SOC_NRF54H20_GPD
-#include <nrf/gpd.h>
-#endif
 #ifdef CONFIG_SOC_NRF52832_ALLOW_SPIM_DESPITE_PAN_58
 #include <nrfx_ppi.h>
 #endif
@@ -589,11 +586,6 @@ static int spim_nrfx_pm_action(const struct device *dev,
 		/* nrfx_spim_init() will be called at configuration before
 		 * the next transfer.
 		 */
-
-#ifdef CONFIG_SOC_NRF54H20_GPD
-		nrf_gpd_retain_pins_set(dev_config->pcfg, false);
-#endif
-
 		break;
 
 	case PM_DEVICE_ACTION_SUSPEND:
@@ -602,10 +594,6 @@ static int spim_nrfx_pm_action(const struct device *dev,
 			dev_data->initialized = false;
 		}
 
-#ifdef CONFIG_SOC_NRF54H20_GPD
-		nrf_gpd_retain_pins_set(dev_config->pcfg, true);
-#endif
-
 		ret = pinctrl_apply_state(dev_config->pcfg,
 					  PINCTRL_STATE_SLEEP);
 		if (ret < 0) {

From 8433c5fde9ab688f81e47bf4dac539de04e596ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:31 +0100
Subject: [PATCH 1473/2913] Revert "[nrf noup] samples/smp_svr: Increase stack
 size required"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f70627b9dec3c9dcd5c0451bdea4893d95272c75.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/subsys/mgmt/mcumgr/smp_svr/prj.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/prj.conf b/samples/subsys/mgmt/mcumgr/smp_svr/prj.conf
index 925ac0c93a2..06a27644bac 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/prj.conf
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/prj.conf
@@ -8,7 +8,7 @@ CONFIG_FLASH_MAP=y
 
 # Some command handlers require a large stack.
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2304
-CONFIG_MAIN_STACK_SIZE=2176
+CONFIG_MAIN_STACK_SIZE=2048
 
 # Ensure an MCUboot-compatible binary is generated.
 CONFIG_BOOTLOADER_MCUBOOT=y

From 5c71e83256eeb5fc4abf3d9668d08630539d270c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:31 +0100
Subject: [PATCH 1474/2913] Revert "[nrf noup] mgmt/mcumgr: Add support for
 SHA512 in images"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 56b14cc5ac248991e18241a63f9ab863fd89acca.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h |  8 --------
 subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c       | 12 ++++++------
 subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c |  8 ++++----
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h b/subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h
index d584467ee2b..133a1abf054 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h
@@ -18,14 +18,6 @@
 extern "C" {
 #endif
 
-#ifdef CONFIG_MCUBOOT_BOOTLOADER_USES_SHA512
-#define IMAGE_TLV_SHA		IMAGE_TLV_SHA512
-#define IMAGE_SHA_LEN		64
-#else
-#define IMAGE_TLV_SHA		IMAGE_TLV_SHA256
-#define IMAGE_SHA_LEN		32
-#endif
-
 /**
  * @brief Ensures the spare slot (slot 1) is fully erased.
  *
diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
index 78cd8b736af..e10953a155a 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
@@ -253,7 +253,7 @@ int img_mgmt_read_info(int image_slot, struct image_version *ver, uint8_t *hash,
 		if (tlv.it_type == 0xff && tlv.it_len == 0xffff) {
 			return IMG_MGMT_ERR_INVALID_TLV;
 		}
-		if (tlv.it_type != IMAGE_TLV_SHA || tlv.it_len != IMAGE_SHA_LEN) {
+		if (tlv.it_type != IMAGE_TLV_SHA256 || tlv.it_len != IMAGE_HASH_LEN) {
 			/* Non-hash TLV.  Skip it. */
 			data_off += sizeof(tlv) + tlv.it_len;
 			continue;
@@ -267,10 +267,10 @@ int img_mgmt_read_info(int image_slot, struct image_version *ver, uint8_t *hash,
 
 		data_off += sizeof(tlv);
 		if (hash != NULL) {
-			if (data_off + IMAGE_SHA_LEN > data_end) {
+			if (data_off + IMAGE_HASH_LEN > data_end) {
 				return IMG_MGMT_ERR_TLV_INVALID_SIZE;
 			}
-			rc = img_mgmt_read(image_slot, data_off, hash, IMAGE_SHA_LEN);
+			rc = img_mgmt_read(image_slot, data_off, hash, IMAGE_HASH_LEN);
 			if (rc != 0) {
 				return rc;
 			}
@@ -313,13 +313,13 @@ int
 img_mgmt_find_by_hash(uint8_t *find, struct image_version *ver)
 {
 	int i;
-	uint8_t hash[IMAGE_SHA_LEN];
+	uint8_t hash[IMAGE_HASH_LEN];
 
 	for (i = 0; i < 2 * CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER; i++) {
 		if (img_mgmt_read_info(i, ver, hash, NULL) != 0) {
 			continue;
 		}
-		if (!memcmp(hash, find, IMAGE_SHA_LEN)) {
+		if (!memcmp(hash, find, IMAGE_HASH_LEN)) {
 			return i;
 		}
 	}
@@ -441,7 +441,7 @@ img_mgmt_upload_good_rsp(struct smp_streamer *ctxt)
 static int
 img_mgmt_upload_log(bool is_first, bool is_last, int status)
 {
-	uint8_t hash[IMAGE_SHA_LEN];
+	uint8_t hash[IMAGE_HASH_LEN];
 	const uint8_t *hashp;
 	int rc;
 
diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
index 60c377c79e9..6a4a0aeeea3 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
@@ -415,8 +415,8 @@ static bool img_mgmt_state_encode_slot(struct smp_streamer *ctxt, uint32_t slot,
 	zcbor_state_t *zse = ctxt->writer->zs;
 	uint32_t flags;
 	char vers_str[IMG_MGMT_VER_MAX_STR_LEN];
-	uint8_t hash[IMAGE_SHA_LEN];
-	struct zcbor_string zhash = { .value = hash, .len = IMAGE_SHA_LEN};
+	uint8_t hash[IMAGE_HASH_LEN]; /* SHA256 hash */
+	struct zcbor_string zhash = { .value = hash, .len = IMAGE_HASH_LEN };
 	struct image_version ver;
 	bool ok;
 	int rc = img_mgmt_read_info(slot, &ver, hash, &flags);
@@ -719,14 +719,14 @@ img_mgmt_state_write(struct smp_streamer *ctxt)
 					     IMG_MGMT_ERR_INVALID_HASH);
 			goto end;
 		}
-	} else if (zhash.len != IMAGE_SHA_LEN) {
+	} else if (zhash.len != IMAGE_HASH_LEN) {
 		/* The img_mgmt_find_by_hash does exact length compare
 		 * so just fail here.
 		 */
 		ok = smp_add_cmd_err(zse, MGMT_GROUP_ID_IMAGE, IMG_MGMT_ERR_INVALID_HASH);
 		goto end;
 	} else {
-		uint8_t hash[IMAGE_SHA_LEN];
+		uint8_t hash[IMAGE_HASH_LEN];
 
 		memcpy(hash, zhash.value, zhash.len);
 

From c431ef90ca061e1ed4c16a589d4a7e991f77d572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:31 +0100
Subject: [PATCH 1475/2913] Revert "[nrf noup] mcuboot: Add
 CONFIG_MCUBOOT_BOOTLOADER_USES_SHA512"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b5fda5ef3743044a9470cfb1e1e7747fa094b7a5.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/Kconfig.mcuboot | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/Kconfig.mcuboot b/modules/Kconfig.mcuboot
index 457a5b332f4..b46c709d8ef 100644
--- a/modules/Kconfig.mcuboot
+++ b/modules/Kconfig.mcuboot
@@ -256,11 +256,6 @@ config MCUBOOT_BOOTLOADER_NO_DOWNGRADE
 	  MCUBOOT_DOWNGRADE_PREVENTION option enabled.
 endif
 
-config MCUBOOT_BOOTLOADER_USES_SHA512
-	bool "MCUboot uses SHA512 for image hash"
-	help
-	  MCUboot has been compiled to verify images using SHA512.
-
 endmenu # On board MCUboot operation mode
 
 endif # BOOTLOADER_MCUBOOT

From 7c3cedab587e65865b561d27dad1f6f7516fa5ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:31 +0100
Subject: [PATCH 1476/2913] Revert "[nrf fromtree] dp: swdp_bitbang: fix
 missing reset pin error"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3629a679d9e75d25f68f81c9b4b92be9614372e4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/dp/swdp_bitbang.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/dp/swdp_bitbang.c b/drivers/dp/swdp_bitbang.c
index 8dec65b6c10..7822315ab8e 100644
--- a/drivers/dp/swdp_bitbang.c
+++ b/drivers/dp/swdp_bitbang.c
@@ -601,11 +601,9 @@ static int sw_port_on(const struct device *dev)
 		return ret;
 	}
 
-	if (config->reset.port) {
-		ret = gpio_pin_configure_dt(&config->reset, GPIO_OUTPUT_ACTIVE);
-		if (ret) {
-			return ret;
-		}
+	ret = gpio_pin_configure_dt(&config->reset, GPIO_OUTPUT_ACTIVE);
+	if (ret) {
+		return ret;
 	}
 
 	return 0;

From 68121873b53005dbd6593427d6190f8e6703658c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:31 +0100
Subject: [PATCH 1477/2913] Revert "[nrf fromlist] drivers: nrfwifi: Fix
 recovery for SAP"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7c830fa139055b0d69e46c4d23a77cd9ac9c80fa.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 4aabc46106a..d1073933f58 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -656,9 +656,7 @@ config NRF_WIFI_AP_DEAD_DETECT_TIMEOUT
 
 config NRF_WIFI_RPU_RECOVERY
 	bool "RPU recovery mechanism"
-	# Relies on power-save mode, so, LPM is needed and AP mode is not supported
 	depends on NRF_WIFI_LOW_POWER
-	depends on !NRF70_AP_MODE
 	default y
 	select EXPERIMENTAL
 	help

From 588bbd2ac1312f5c4f0afc7875833dc976cfe6d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:31 +0100
Subject: [PATCH 1478/2913] Revert "[nrf fromlist] tests: drivers: sensor:
 temp_sensor: enable for nrf54l15dk"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e9ac1d5855a9cee183bcb690d36ac9a6a10bdf37.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../temp_sensor/boards/nrf54l15dk_nrf54l15_cpuapp.overlay      | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 tests/drivers/sensor/temp_sensor/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/sensor/temp_sensor/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/sensor/temp_sensor/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 435e4f4a6cc..00000000000
--- a/tests/drivers/sensor/temp_sensor/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,3 +0,0 @@
-temp_sensor: &temp {
-	status = "okay";
-};

From 496d2f3acbbdd8ee014ea24abac2c0ad1277404e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:31 +0100
Subject: [PATCH 1479/2913] Revert "[nrf fromlist] tests: drivers: gpio:
 gpio_basic_api: enable for nrf54l15dk"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ef56b95358d5b61e2b46d70b05c5b86cbde099f9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 8eb1b3c9f9f..00000000000
--- a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	resources {
-		compatible = "test-gpio-basic-api";
-		out-gpios = <&gpio1 10 0>;
-		in-gpios = <&gpio1 11 0>;
-	};
-};
-
-&gpiote20 {
-	status = "okay";
-};
-
-&gpio1 {
-	status = "okay";
-};

From 06eccddb8961283355b56f9fc0966b740c886e0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:31 +0100
Subject: [PATCH 1480/2913] Revert "[nrf fromlist] Bluetooth: Tester: Increase
 config values to make tests pass"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 05fc1b41186ca67260a3bbe89a257ff323b7c1e4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/bluetooth/tester/prj.conf | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/tests/bluetooth/tester/prj.conf b/tests/bluetooth/tester/prj.conf
index db254d1f668..3046bebcba5 100644
--- a/tests/bluetooth/tester/prj.conf
+++ b/tests/bluetooth/tester/prj.conf
@@ -16,7 +16,6 @@ CONFIG_BT_BONDABLE=y
 CONFIG_BT_ATT_PREPARE_COUNT=12
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
-CONFIG_BT_L2CAP_TX_MTU=255
 CONFIG_BT_L2CAP_SEG_RECV=y
 CONFIG_BT_L2CAP_RECONFIGURE_EXPLICIT=y
 CONFIG_BT_DEVICE_NAME="Tester"
@@ -28,8 +27,8 @@ CONFIG_BT_L2CAP_ECRED=y
 CONFIG_BT_EATT_MAX=5
 CONFIG_BT_FILTER_ACCEPT_LIST=y
 CONFIG_BT_EATT_AUTO_CONNECT=n
-CONFIG_BT_MAX_CONN=3
-CONFIG_BT_MAX_PAIRED=3
+CONFIG_BT_MAX_CONN=2
+CONFIG_BT_MAX_PAIRED=2
 CONFIG_BT_GATT_NOTIFY_MULTIPLE=y
 CONFIG_BT_ATT_RETRY_ON_SEC_ERR=n
 CONFIG_BT_GATT_DYNAMIC_DB=y
@@ -56,9 +55,3 @@ CONFIG_BT_DIS_SERIAL_NUMBER=y
 CONFIG_BT_DIS_FW_REV=y
 CONFIG_BT_DIS_HW_REV=y
 CONFIG_BT_DIS_SW_REV=y
-
-CONFIG_BT_BUF_EVT_RX_COUNT=16
-CONFIG_BT_BUF_EVT_RX_SIZE=255
-CONFIG_BT_BUF_CMD_TX_SIZE=255
-CONFIG_BT_BUF_ACL_TX_SIZE=251
-CONFIG_BT_BUF_ACL_RX_SIZE=255

From 1f897e863c0461fb9eaf9d8226a69f47407e4677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:31 +0100
Subject: [PATCH 1481/2913] Revert "[nrf fromlist] Bluetooth: Tester: Use
 BT_L2CAP_SEG_RECV for L2CAP tests"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3ac9a1d87beccef8272e542c17eae79730f77f71.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/l2cap.h       |  21 ------
 subsys/bluetooth/host/Kconfig.l2cap    |   8 --
 subsys/bluetooth/host/l2cap.c          | 100 -------------------------
 tests/bluetooth/tester/prj.conf        |   3 +-
 tests/bluetooth/tester/src/btp_l2cap.c |  86 +++------------------
 5 files changed, 13 insertions(+), 205 deletions(-)

diff --git a/include/zephyr/bluetooth/l2cap.h b/include/zephyr/bluetooth/l2cap.h
index d3a49f9b3a9..0117da5ebb9 100644
--- a/include/zephyr/bluetooth/l2cap.h
+++ b/include/zephyr/bluetooth/l2cap.h
@@ -18,7 +18,6 @@
  * @{
  */
 
-#include <stdint.h>
 #include <sys/types.h>
 
 #include <zephyr/sys/atomic.h>
@@ -553,26 +552,6 @@ int bt_l2cap_ecred_chan_connect(struct bt_conn *conn,
  */
 int bt_l2cap_ecred_chan_reconfigure(struct bt_l2cap_chan **chans, uint16_t mtu);
 
-/** @brief Reconfigure Enhanced Credit Based L2CAP channels
- *
- *  Experimental API to reconfigure with explicit MPS and MTU values.
- *
- *  Reconfigure up to 5 L2CAP channels. Channels must be from the same bt_conn.
- *  Once reconfiguration is completed each channel reconfigured() callback will
- *  be called. MTU cannot be decreased on any of provided channels.
- *
- *  @kconfig_dep{CONFIG_BT_L2CAP_RECONFIGURE_EXPLICIT}
- *
- *  @param chans Array of channel objects. Null-terminated. Elements after the
- *               first 5 are silently ignored.
- *  @param mtu Channel MTU to reconfigure to.
- *  @param mps Channel MPS to reconfigure to.
- *
- *  @return 0 in case of success or negative value in case of error.
- */
-int bt_l2cap_ecred_chan_reconfigure_explicit(struct bt_l2cap_chan **chans, uint16_t mtu,
-					     uint16_t mps);
-
 /** @brief Connect L2CAP channel
  *
  *  Connect L2CAP channel by PSM, once the connection is completed channel
diff --git a/subsys/bluetooth/host/Kconfig.l2cap b/subsys/bluetooth/host/Kconfig.l2cap
index b886dc9d740..ed1428aade7 100644
--- a/subsys/bluetooth/host/Kconfig.l2cap
+++ b/subsys/bluetooth/host/Kconfig.l2cap
@@ -70,12 +70,4 @@ config BT_L2CAP_SEG_RECV
 	  This API enforces conformance with L2CAP TS, but is otherwise as
 	  flexible and semantically simple as possible.
 
-config BT_L2CAP_RECONFIGURE_EXPLICIT
-	bool "L2CAP Explicit reconfigure API [EXPERIMENTAL]"
-	select EXPERIMENTAL
-	help
-
-	  Enable API for explicit reconfiguration of an L2CAP channel's MTU and
-	  MPS.
-
 endmenu
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index ed185d12fd7..69197326df2 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -41,7 +41,6 @@ LOG_MODULE_REGISTER(bt_l2cap, CONFIG_BT_L2CAP_LOG_LEVEL);
 
 #define L2CAP_LE_MIN_MTU		23
 #define L2CAP_ECRED_MIN_MTU		64
-#define L2CAP_ECRED_MIN_MPS             64
 
 #define L2CAP_LE_MAX_CREDITS		(CONFIG_BT_BUF_ACL_RX_COUNT - 1)
 
@@ -3033,105 +3032,6 @@ int bt_l2cap_ecred_chan_reconfigure(struct bt_l2cap_chan **chans, uint16_t mtu)
 	return 0;
 }
 
-#if defined(CONFIG_BT_L2CAP_RECONFIGURE_EXPLICIT)
-int bt_l2cap_ecred_chan_reconfigure_explicit(struct bt_l2cap_chan **chans, uint16_t mtu,
-					     uint16_t mps)
-{
-	struct bt_l2cap_ecred_reconf_req *req;
-	struct bt_conn *conn = NULL;
-	struct bt_l2cap_le_chan *ch;
-	struct net_buf *buf;
-	bool multiple_chan;
-	uint8_t ident;
-	int i;
-
-	LOG_DBG("chans %p mtu 0x%04x mps 0x%04x", chans, mtu, mps);
-
-	if (!chans) {
-		return -EINVAL;
-	}
-
-	if (chans[0] == NULL) {
-		return -EINVAL;
-	}
-
-	if (mps < L2CAP_ECRED_MIN_MPS || mps > BT_L2CAP_RX_MTU) {
-		return -EINVAL;
-	}
-
-	multiple_chan = chans[1] != NULL;
-
-	for (i = 0; i < L2CAP_ECRED_CHAN_MAX_PER_REQ; i++) {
-		if (!chans[i]) {
-			break;
-		}
-
-		/* validate that all channels are from same connection */
-		if (conn) {
-			if (conn != chans[i]->conn) {
-				return -EINVAL;
-			}
-		} else {
-			conn = chans[i]->conn;
-		}
-
-		/* validate MTU is not decreased */
-		if (mtu < BT_L2CAP_LE_CHAN(chans[i])->rx.mtu) {
-			return -EINVAL;
-		}
-
-		/* MPS is not allowed to decrease when reconfiguring multiple channels.
-		 * Core Specification 3.A.4.27 v6.0
-		 */
-		if (multiple_chan && mps < BT_L2CAP_LE_CHAN(chans[i])->rx.mps) {
-			return -EINVAL;
-		}
-	}
-
-	if (!conn) {
-		return -ENOTCONN;
-	}
-
-	if (conn->type != BT_CONN_TYPE_LE) {
-		return -EINVAL;
-	}
-
-	/* allow only 1 request at time */
-	if (l2cap_find_pending_reconf(conn)) {
-		return -EBUSY;
-	}
-
-	ident = get_ident();
-
-	buf = l2cap_create_le_sig_pdu(BT_L2CAP_ECRED_RECONF_REQ, ident,
-				      sizeof(*req) + (i * sizeof(uint16_t)));
-	if (!buf) {
-		return -ENOMEM;
-	}
-
-	req = net_buf_add(buf, sizeof(*req));
-	req->mtu = sys_cpu_to_le16(mtu);
-	req->mps = sys_cpu_to_le16(mps);
-
-	for (int j = 0; j < i; j++) {
-		ch = BT_L2CAP_LE_CHAN(chans[j]);
-
-		ch->ident = ident;
-		ch->pending_rx_mtu = mtu;
-
-		net_buf_add_le16(buf, ch->rx.cid);
-	};
-
-	/* We set the RTX timer on one of the supplied channels, but when the
-	 * request resolves or times out we will act on all the channels in the
-	 * supplied array, using the ident field to find them.
-	 */
-	l2cap_chan_send_req(chans[0], buf, L2CAP_CONN_TIMEOUT);
-
-	return 0;
-}
-#endif /* defined(CONFIG_BT_L2CAP_RECONFIGURE_EXPLICIT) */
-
 #endif /* defined(CONFIG_BT_L2CAP_ECRED) */
 
 int bt_l2cap_chan_connect(struct bt_conn *conn, struct bt_l2cap_chan *chan,
diff --git a/tests/bluetooth/tester/prj.conf b/tests/bluetooth/tester/prj.conf
index 3046bebcba5..ba5a40d078b 100644
--- a/tests/bluetooth/tester/prj.conf
+++ b/tests/bluetooth/tester/prj.conf
@@ -16,8 +16,6 @@ CONFIG_BT_BONDABLE=y
 CONFIG_BT_ATT_PREPARE_COUNT=12
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
-CONFIG_BT_L2CAP_SEG_RECV=y
-CONFIG_BT_L2CAP_RECONFIGURE_EXPLICIT=y
 CONFIG_BT_DEVICE_NAME="Tester"
 CONFIG_BT_DEVICE_NAME_MAX=32
 CONFIG_BT_DEVICE_NAME_DYNAMIC=y
@@ -35,6 +33,7 @@ CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_EXT_ADV=y
 CONFIG_BT_PER_ADV=y
 CONFIG_BT_PER_ADV_SYNC=y
+CONFIG_BT_BUF_ACL_RX_SIZE=100
 CONFIG_BT_RX_STACK_SIZE=4096
 
 CONFIG_BT_TESTING=y
diff --git a/tests/bluetooth/tester/src/btp_l2cap.c b/tests/bluetooth/tester/src/btp_l2cap.c
index 6b62811eaf3..69c438f7f6f 100644
--- a/tests/bluetooth/tester/src/btp_l2cap.c
+++ b/tests/bluetooth/tester/src/btp_l2cap.c
@@ -19,15 +19,14 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 
 #include "btp/btp.h"
 
-#define L2CAP_MPS        96
-#define DATA_MTU         (3 * L2CAP_MPS)
-#define DATA_MTU_INITIAL (2 * L2CAP_MPS)
-
+#define DATA_MTU_INITIAL 128
+#define DATA_MTU 256
+#define DATA_BUF_SIZE BT_L2CAP_SDU_BUF_SIZE(DATA_MTU)
 #define CHANNELS 2
 #define SERVERS 1
 
-NET_BUF_POOL_FIXED_DEFINE(data_pool, CHANNELS, BT_L2CAP_SDU_BUF_SIZE(DATA_MTU),
-			  CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
+NET_BUF_POOL_FIXED_DEFINE(data_pool, CHANNELS, DATA_BUF_SIZE, CONFIG_BT_CONN_TX_USER_DATA_SIZE,
+			  NULL);
 
 static bool authorize_flag;
 static uint8_t req_keysize;
@@ -37,51 +36,18 @@ static struct channel {
 	struct bt_l2cap_le_chan le;
 	bool in_use;
 	bool hold_credit;
-#if defined(CONFIG_BT_L2CAP_SEG_RECV)
-	unsigned int pending_credits;
-	uint8_t recv_cb_buf[DATA_MTU + sizeof(struct btp_l2cap_data_received_ev)];
-#else
 	struct net_buf *pending_credit;
-#endif
 } channels[CHANNELS];
 
 /* TODO Extend to support multiple servers */
 static struct bt_l2cap_server servers[SERVERS];
 
-#if defined(CONFIG_BT_L2CAP_SEG_RECV)
-static void seg_recv_cb(struct bt_l2cap_chan *l2cap_chan, size_t sdu_len, off_t seg_offset,
-			struct net_buf_simple *seg)
-{
-	struct btp_l2cap_data_received_ev *ev;
-	struct bt_l2cap_le_chan *l2cap_le_chan =
-		CONTAINER_OF(l2cap_chan, struct bt_l2cap_le_chan, chan);
-	struct channel *chan = CONTAINER_OF(l2cap_le_chan, struct channel, le);
-
-	ev = (void *)chan->recv_cb_buf;
-	memcpy(&ev->data[seg_offset], seg->data, seg->len);
-
-	/* complete SDU received */
-	if (seg_offset + seg->len == sdu_len) {
-		ev->chan_id = chan->chan_id;
-		ev->data_length = sys_cpu_to_le16(sdu_len);
-
-		tester_event(BTP_SERVICE_ID_L2CAP, BTP_L2CAP_EV_DATA_RECEIVED, chan->recv_cb_buf,
-			     sizeof(*ev) + sdu_len);
-	}
-
-	if (chan->hold_credit) {
-		chan->pending_credits++;
-	} else {
-		bt_l2cap_chan_give_credits(l2cap_chan, 1);
-	}
-}
-#else
 static struct net_buf *alloc_buf_cb(struct bt_l2cap_chan *chan)
 {
 	return net_buf_alloc(&data_pool, K_FOREVER);
 }
 
-static uint8_t recv_cb_buf[DATA_MTU + sizeof(struct btp_l2cap_data_received_ev)];
+static uint8_t recv_cb_buf[DATA_BUF_SIZE + sizeof(struct btp_l2cap_data_received_ev)];
 
 static int recv_cb(struct bt_l2cap_chan *l2cap_chan, struct net_buf *buf)
 {
@@ -107,7 +73,6 @@ static int recv_cb(struct bt_l2cap_chan *l2cap_chan, struct net_buf *buf)
 
 	return 0;
 }
-#endif
 
 static void connected_cb(struct bt_l2cap_chan *l2cap_chan)
 {
@@ -146,13 +111,11 @@ static void disconnected_cb(struct bt_l2cap_chan *l2cap_chan)
 	struct channel *chan = CONTAINER_OF(l2cap_le_chan, struct channel, le);
 	struct bt_conn_info info;
 
-#if !defined(CONFIG_BT_L2CAP_SEG_RECV)
 	/* release netbuf on premature disconnection */
 	if (chan->pending_credit) {
 		net_buf_unref(chan->pending_credit);
 		chan->pending_credit = NULL;
 	}
-#endif
 
 	(void)memset(&ev, 0, sizeof(struct btp_l2cap_disconnected_ev));
 
@@ -197,16 +160,12 @@ static void reconfigured_cb(struct bt_l2cap_chan *l2cap_chan)
 #endif
 
 static const struct bt_l2cap_chan_ops l2cap_ops = {
-#if defined(CONFIG_BT_L2CAP_SEG_RECV)
-	.seg_recv = seg_recv_cb,
-#else
-	.alloc_buf = alloc_buf_cb,
-	.recv = recv_cb,
-#endif
-	.connected = connected_cb,
-	.disconnected = disconnected_cb,
+	.alloc_buf	= alloc_buf_cb,
+	.recv		= recv_cb,
+	.connected	= connected_cb,
+	.disconnected	= disconnected_cb,
 #if defined(CONFIG_BT_L2CAP_ECRED)
-	.reconfigured = reconfigured_cb,
+	.reconfigured	= reconfigured_cb,
 #endif
 };
 
@@ -263,15 +222,10 @@ static uint8_t connect(const void *cmd, uint16_t cmd_len,
 		}
 		chan->le.chan.ops = &l2cap_ops;
 		chan->le.rx.mtu = mtu;
-#if defined(CONFIG_BT_L2CAP_SEG_RECV)
-		chan->le.rx.mps = L2CAP_MPS;
-#endif
 		rp->chan_id[i] = chan->chan_id;
 		allocated_channels[i] = &chan->le.chan;
 
 		chan->hold_credit = cp->options & BTP_L2CAP_CONNECT_OPT_HOLD_CREDIT;
-
-		bt_l2cap_chan_give_credits(&chan->le.chan, 1);
 	}
 
 	if (cp->num == 1 && !ecfc) {
@@ -335,7 +289,6 @@ static uint8_t reconfigure(const void *cmd, uint16_t cmd_len,
 {
 	const struct btp_l2cap_reconfigure_cmd *cp = cmd;
 	uint16_t mtu;
-	uint16_t mps;
 	struct bt_conn *conn;
 	int err;
 	struct bt_l2cap_chan *reconf_channels[CHANNELS + 1] = {};
@@ -368,8 +321,7 @@ static uint8_t reconfigure(const void *cmd, uint16_t cmd_len,
 		return BTP_STATUS_FAILED;
 	}
 
-	mps = MIN(L2CAP_MPS, BT_L2CAP_RX_MTU);
-	err = bt_l2cap_ecred_chan_reconfigure_explicit(reconf_channels, mtu, mps);
+	err = bt_l2cap_ecred_chan_reconfigure(reconf_channels, mtu);
 	if (err) {
 		bt_conn_unref(conn);
 		return BTP_STATUS_FAILED;
@@ -502,14 +454,9 @@ static int accept(struct bt_conn *conn, struct bt_l2cap_server *server,
 
 	chan->le.chan.ops = &l2cap_ops;
 	chan->le.rx.mtu = DATA_MTU_INITIAL;
-#if defined(CONFIG_BT_L2CAP_SEG_RECV)
-	chan->le.rx.mps = L2CAP_MPS;
-#endif
 
 	*l2cap_chan = &chan->le.chan;
 
-	bt_l2cap_chan_give_credits(&chan->le.chan, 1);
-
 	return 0;
 }
 
@@ -577,15 +524,7 @@ static uint8_t credits(const void *cmd, uint16_t cmd_len,
 	if (!chan->in_use) {
 		return BTP_STATUS_FAILED;
 	}
-#if defined(CONFIG_BT_L2CAP_SEG_RECV)
-	if (chan->pending_credits) {
-		if (bt_l2cap_chan_give_credits(&chan->le.chan, chan->pending_credits) < 0) {
-			return BTP_STATUS_FAILED;
-		}
 
-		chan->pending_credits = 0;
-	}
-#else
 	if (chan->pending_credit) {
 		if (bt_l2cap_chan_recv_complete(&chan->le.chan,
 						chan->pending_credit) < 0) {
@@ -594,7 +533,6 @@ static uint8_t credits(const void *cmd, uint16_t cmd_len,
 
 		chan->pending_credit = NULL;
 	}
-#endif
 
 	return BTP_STATUS_SUCCESS;
 }

From d56580a838cca19861eb8d2962610151ff4418c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:31 +0100
Subject: [PATCH 1482/2913] Revert "[nrf fromlist] Bluetooth: Host: L2CAP: Fix
 seg_recv call on SDU overflow"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f5704f33313d8fbc87885cf053a7eefb5005c4ab.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/host/l2cap.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index 69197326df2..1e3850fd591 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -2557,7 +2557,6 @@ static void l2cap_chan_le_recv_seg_direct(struct bt_l2cap_le_chan *chan, struct
 	if (seg->len > sdu_remaining) {
 		LOG_WRN("L2CAP RX PDU total exceeds SDU");
 		bt_l2cap_chan_disconnect(&chan->chan);
-		return;
 	}
 
 	/* Commit receive. */

From ca07fdae6d82ba961673d77ad4dd041d4d22aeb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:31 +0100
Subject: [PATCH 1483/2913] Revert "[nrf noup] sample/smp_svr: nrf54l15dk test
 cases"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f478e8de4645d63d6835c29c49a7b1e818759000.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 ...4l15pdk_nrf54l15_cpuapp_ext_flash.overlay} |  0
 .../subsys/mgmt/mcumgr/smp_svr/sample.yaml    | 33 ++++++++-----------
 2 files changed, 14 insertions(+), 19 deletions(-)
 rename samples/subsys/mgmt/mcumgr/smp_svr/boards/{nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay => nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay} (100%)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
similarity index 100%
rename from samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay
rename to samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 33b37512615..3aa3ca449e5 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -12,12 +12,11 @@ tests:
       - nrf52840dk/nrf52840
       - pinnacle_100_dvk
       - mg100
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15dk/nrf54l10/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
   sample.mcumgr.smp_svr.bt_static_svc:
     extra_args: OVERLAY_CONFIG="overlay-bt.conf"
     extra_configs:
@@ -105,30 +104,26 @@ tests:
       - mg100
     integration_platforms:
       - nrf52840dk/nrf52840
-  sample.mcumgr.smp_svr.bt.nrf54l15dk.ext_flash:
+  sample.mcumgr.smp_svr.bt.nrf54l15pdk.ext_flash:
     extra_args:
       - OVERLAY_CONFIG="overlay-bt.conf"
-      - DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
-      - mcuboot_CONF_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.conf"
-      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
+      - DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
+      - mcuboot_CONF_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.conf"
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
     extra_configs:
       - CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
     platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15dk/nrf54l10/cpuapp
-      - nrf54l15dk/nrf54l05/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15dk/nrf54l15/cpuapp
-  sample.mcumgr.smp_svr.bt.nrf54l15dk.ext_flash.pure_dts:
+      - nrf54l15pdk/nrf54l15/cpuapp
+  sample.mcumgr.smp_svr.bt.nrf54l15pdk.ext_flash.pure_dts:
     extra_args:
       - OVERLAY_CONFIG="overlay-bt.conf"
-      - DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
-      - mcuboot_CONF_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.conf"
-      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
+      - DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
+      - mcuboot_CONF_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.conf"
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
       - SB_CONFIG_PARTITION_MANAGER=n
     platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15dk/nrf54l10/cpuapp
-      - nrf54l15dk/nrf54l05/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp

From 94cafbd7f5250aeffc39e17177e0811ebf152cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:31 +0100
Subject: [PATCH 1484/2913] Revert "[nrf fromlist] manifest: Update hal_nordic"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 433e9c4a2e5f705aa09c09cb9a461636aeaccbc4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 40c149d4dbd..7aec642cf8a 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 5c8d109371ebb740fbef1f440a3b59e488a36717
+      revision: 2d78179cc4f0601a891553132b13184fa51b6ef9
       path: modules/hal/nordic
       groups:
         - hal

From 01debf6d2f174ec78a3f1e72a7fecc26bd6452c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:32 +0100
Subject: [PATCH 1485/2913] Revert "[nrf fromtree] drivers: nrfwifi: Fixes from
 doc review"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3b420ee1bb5438b42b26a1f9322dac8884bdc285.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 144 ++++++++++++++-------------
 1 file changed, 76 insertions(+), 68 deletions(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index d1073933f58..7087e20beb6 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -69,14 +69,15 @@ config NRF70_RADIO_TEST
 	bool "Radio test mode of the nRF70 driver"
 
 config NRF70_OFFLOADED_RAW_TX
-	bool "Offloaded raw TX mode of the nRF70 driver"
+	bool "Offloaded raw Tx mode of the nRF70 driver"
 
 config NRF70_SYSTEM_WITH_RAW_MODES
 	bool "nRF70 system mode with raw modes"
 	depends on WIFI_NRF7002 || WIFI_NRF7001
 	select WIFI_NM_WPA_SUPPLICANT
 	help
-	  Select this option to enable system mode of the nRF70 driver with raw modes.
+	  Select this option to enable system mode of the nRF70 driver with raw modes
+
 endchoice
 
 config NRF70_SYSTEM_MODE_COMMON
@@ -87,7 +88,7 @@ config NET_L2_ETHERNET
 	default y if (!NRF70_RADIO_TEST && !NRF70_OFFLOADED_RAW_TX)
 
 config HEAP_MEM_POOL_ADD_SIZE_NRF70
-	# Use a maximum that works for typical use cases and boards, each sample/app can override
+	# Use a maximum that works for typical usecases and boards, each sample/app can override
 	# this value if needed by using CONFIG_HEAP_MEM_POOL_IGNORE_MIN
 	def_int 25000 if NRF70_SCAN_ONLY
 	def_int 150000
@@ -97,7 +98,7 @@ config NRF70_STA_MODE
 	bool "nRF70 STA mode"
 	default y
 	help
-	  Select this option to enable STA mode of the nRF70 driver.
+	  Select this option to enable STA mode of the nRF70 driver
 
 config NRF70_AP_MODE
 	bool "Access point mode"
@@ -116,7 +117,7 @@ config NRF70_RAW_DATA_RX
 	select EXPERIMENTAL
 
 config NRF70_PROMISC_DATA_RX
-	bool "Promiscuous RX sniffer operation in the driver"
+	bool "promiscuous RX sniffer operation in the driver"
 	select WIFI_NM_WPA_SUPPLICANT
 	select EXPERIMENTAL
 	select NET_PROMISCUOUS_MODE
@@ -153,7 +154,7 @@ config NRF_WIFI_PATCHES_EXTERNAL
 endchoice
 
 config NRF_WIFI_LOW_POWER
-	bool "Low power mode in nRF Wi-Fi chipsets"
+	bool "low power mode in nRF Wi-Fi chipsets"
 	default y
 
 config NRF70_TCP_IP_CHECKSUM_OFFLOAD
@@ -234,7 +235,7 @@ config NRF70_PCB_LOSS_2G
 	range 0 4
 	help
 	  Specifies PCB loss from the antenna connector to the RF pin.
-	  The values are in dB scale in steps of 1 dB and range of 0-4 dB.
+	  The values are in dB scale in steps of 1dB and range of 0-4dB.
 	  The loss is considered in the RX path only.
 
 config NRF70_PCB_LOSS_5G_BAND1
@@ -243,7 +244,7 @@ config NRF70_PCB_LOSS_5G_BAND1
 	range 0 4
 	help
 	  Specifies PCB loss from the antenna connector to the RF pin.
-	  The values are in dB scale in steps of 1 dB and range of 0-4 dB.
+	  The values are in dB scale in steps of 1dB and range of 0-4dB.
 	  The loss is considered in the RX path only.
 
 config NRF70_PCB_LOSS_5G_BAND2
@@ -252,7 +253,7 @@ config NRF70_PCB_LOSS_5G_BAND2
 	range 0 4
 	help
 	  Specifies PCB loss from the antenna connector to the RF pin.
-	  The values are in dB scale in steps of 1 dB and range of 0-4 dB.
+	  The values are in dB scale in steps of 1dB and range of 0-4dB.
 	  The loss is considered in the RX path only.
 
 config NRF70_PCB_LOSS_5G_BAND3
@@ -261,7 +262,7 @@ config NRF70_PCB_LOSS_5G_BAND3
 	range 0 4
 	help
 	  Specifies PCB loss from the antenna connector to the RF pin.
-	  The values are in dB scale in steps of 1 dB and range of 0-4 dB.
+	  The values are in dB scale in steps of 1dB and range of 0-4dB.
 	  The loss is considered in the RX path only.
 
 config NRF70_ANT_GAIN_2G
@@ -490,23 +491,25 @@ config NRF70_RPU_PS_IDLE_TIMEOUT_MS
 config NRF70_RPU_EXTEND_TWT_SP
 	bool "extending TWT service period"
 	help
-	  In case frames accepted before the beginning of SP are not
-	  transmitted before the SP completes, then typically they are
-	  dropped to conform to the SP window as per the specification that is, no
+	  In case frames accepted before beginning of SP are not
+	  transmitted before the SP completes then typically they are
+	  dropped to conform to SP window as per specification i.e., no
 	  transmission outside SP window.
-	  This feature mitigates frame loss by transmitting even after SP
-	  completion by using a standard contention mechanism, which is allowed
+
+	  This feature mitigates the frame loss by transmitting even after SP
+	  completion by using standard contention mechanism which is allowed
 	  in specification but not recommended. As the device is actively transmitting
 	  beyond SP, the power consumption increases depending on the amount
-	  of traffic available at the start of the SP.
-	  Note that if a frame is sent after the SP starts, it will be queued, and this
+	  of traffic available at the start of SP.
+
+	  Please note that if a frame is sent after SP starts it will be queued and this
 	  mechanism is not used.
 endif # NRF_WIFI_LOW_POWER
 
 config WIFI_FIXED_MAC_ADDRESS
-	string "Wi-Fi Fixed MAC address in format XX:XX:XX:XX:XX:XX"
+	string "WiFi Fixed MAC address in format XX:XX:XX:XX:XX:XX"
 	help
-	  This option overrides the MAC address read from OTP. It is strictly for testing purposes only.
+	  This overrides the MAC address read from OTP. Strictly for testing purposes only.
 
 choice
 	prompt "Wi-Fi MAC address type"
@@ -526,7 +529,7 @@ config WIFI_FIXED_MAC_ADDRESS_ENABLED
 	  Enable fixed MAC address
 
 config WIFI_RANDOM_MAC_ADDRESS
-	bool "Random MAC address generation at runtime"
+	bool "random MAC address generation at runtime"
 	depends on ENTROPY_GENERATOR
 	help
 	  This option enables random MAC address generation at runtime.
@@ -538,17 +541,17 @@ config NRF70_RSSI_STALE_TIMEOUT_MS
 	int "RSSI stale timeout in milliseconds"
 	default 1000
 	help
-	  RSSI stale timeout is the period after which the driver queries
-	  RPU to get the RSSI value.
-	  If data is active (for example, ping), the driver stores the RSSI value from
+	  RSSI stale timeout is the period after which driver queries
+	  RPU to get the RSSI the value.
+	  If data is active (e.g. ping), driver stores the RSSI value from
 	  the received frames and provides this stored information
-	  to wpa_supplicant. In this case, a higher value will be suitable
-	  as the stored RSSI value at the driver will be updated regularly.
+	  to wpa_supplicant. In this case a higher value will be suitable
+	  as stored RSSI value at driver will be updated regularly.
 	  If data is not active or after the stale timeout duration,
-	  the driver queries the RPU to get the RSSI value
-	  and provides it to wpa_supplicant. The value should be set to a lower
-	  value as the driver does not store it and requires RPU to provide the
-	  information.
+	  driver queries the RPU to get the RSSI value
+	  and provides it to wpa_supplicant. The value should be set to lower
+	  value as driver does not store it and requires RPU to provide the
+	  info.
 
 if NETWORKING
 # Finetune defaults for certain system components used by the driver
@@ -578,7 +581,7 @@ config MAIN_STACK_SIZE
 config SHELL_STACK_SIZE
 	default 4096
 
-# Override the Wi-Fi subsystems WIFI_MGMT_SCAN_SSID_FILT_MAX parameter,
+# Override the Wi-Fi subsytems WIFI_MGMT_SCAN_SSID_FILT_MAX parameter,
 # since we support a maximum of 2 SSIDs for scan result filtering.
 config WIFI_MGMT_SCAN_SSID_FILT_MAX
 	default 2
@@ -591,7 +594,7 @@ config NRF_WIFI_SCAN_MAX_BSS_CNT
 	  Maximum number of scan results to return. 0 represents unlimited number of BSSes.
 
 config NRF_WIFI_BEAMFORMING
-	bool "Wi-Fi beamforming. Enabling beamforming can provide a slight improvement in performance, whereas disabling it can provide better power savings in low network activity applications"
+	bool "Wi-Fi beamforming. Enabling beamforming can provide slight improvement in performance where as disabling it can provide better power saving in low network activity applications"
 	default y
 
 config WIFI_NRF70_SCAN_TIMEOUT_S
@@ -628,18 +631,19 @@ config NRF_WIFI_IFACE_MTU
 	default 1500
 
 config WIFI_NRF70_SKIP_LOCAL_ADMIN_MAC
-	bool "Suppress networks with non-individual MAC addresses as BSSID in the scan results"
+	bool "Suppress networks with non-individual MAC address as BSSID in the scan results"
 	help
-	  Wi-Fi access points use locally administered MAC addresses to manage
-	  multiple virtual interfaces. For geo-location use cases, these networks
-	  from the virtual interfaces do not help in any way as they are co-located with the primary interface
-	  that has a globally unique MAC address.
+	  Wi-Fi access points use locally administered MAC address to manage
+	  multiple virtual interfaces, for geo-location usecase these networks
+	  from the virtual interfaces do not help in anyway as they are co-located with the primary interface
+	  that has globally unique MAC address.
+
 	  So, to save resources, this option drops such networks from the scan results.
 
 config WIFI_NRF70_SCAN_DISABLE_DFS_CHANNELS
 	bool "Disables DFS channels in scan operation"
 	help
-	  This option disables inclusion of the DFS channels in the scan operation.
+	  This option disables inclusion of DFS channels in scan operation.
 	  This is useful to reduce the scan time, as DFS channels are seldom used.
 
 config NET_INTERFACE_NAME_LEN
@@ -651,8 +655,8 @@ config NRF_WIFI_AP_DEAD_DETECT_TIMEOUT
 	range 1 30
 	default 20
 	help
-		The number of seconds after which the AP is declared dead if no beacons
-		are received from the AP. This is used to detect AP silently going down, for example, due to power off.
+		The number of seconds after which AP is declared dead if no beacons
+		are received from the AP. Used to detect AP silently going down e.g., power off.
 
 config NRF_WIFI_RPU_RECOVERY
 	bool "RPU recovery mechanism"
@@ -660,20 +664,21 @@ config NRF_WIFI_RPU_RECOVERY
 	default y
 	select EXPERIMENTAL
 	help
-		Enable the RPU recovery mechanism to recover from an RPU (nRF70) hang.
-		This feature performs an interface reset (down and up), which triggers
-		a RPU cold boot. The application's network connection will be lost during
-		the recovery process, and it is the application's responsibility to
+		Enable RPU recovery mechanism to recover from RPU (nRF70) hang.
+		This feature performs an interface reset (down and up) which triggers
+		a RPU coldboot. Application's network connection will be lost during
+		the recovery process and it is application's responsibility to
 		re-establish the network connection.
 
 if NRF_WIFI_RPU_RECOVERY
+
 config NRF_WIFI_RPU_RECOVERY_PROPAGATION_DELAY_MS
 	int "RPU recovery propagation delay in milliseconds"
 	default 2000
 	help
 		Propagation delay in milliseconds to wait after RPU is powered down
 		before powering it up. This delay is required to ensure that the recovery
-		is propagated to all the applications and stack and have enough time to
+		is propagted to all the applications and stack and have enough time to
 		clean up the resources.
 
 config NET_MGMT_EVENT_QUEUE_SIZE
@@ -684,16 +689,16 @@ config NRF_WIFI_RPU_RECOVERY_PROPAGATION_DELAY_MS
 	int "RPU recovery propagation delay in milliseconds"
 	default 10
 	help
-	  Propagation delay in milliseconds to wait after the RPU is powered down
+	  Propagation delay in milliseconds to wait after RPU is powered down
 	  before powering it up. This delay is required to ensure that the recovery
-	  is propagated to all the applications and stack, and has enough time to
+	  is propagated to all the applications and stack and have enough time to
 	  clean up the resources.
 
 config NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS
 	int "RPU recovery power save active timeout in milliseconds"
 	default 50000
 	help
-	  Power save active timeout in milliseconds, after which the RPU recovery
+	  Power save active timeout in milliseconds after which RPU recovery
 	  mechanism will be triggered. This timeout is used to ensure that the
 	  RPU attempts to enter power save mode in case of inactivity.
 
@@ -708,7 +713,7 @@ config NRF_WIFI_RPU_MIN_TIME_TO_ENTER_SLEEP_MS
 config NRF_WIFI_RPU_RECOVERY_DEBUG
 	bool "RPU recovery debug logs"
 	help
-		Enable RPU recovery debug logs to help debug the RPU recovery mechanism.
+		Enable RPU recovery debug logs to help debug RPU recovery mechanism.
 
 config NRF_WIFI_RPU_RECOVERY_QUIET_PERIOD_MS
 	int "RPU recovery quiet period in milliseconds"
@@ -722,7 +727,7 @@ config NRF_WIFI_RPU_RECOVERY_MAX_RETRIES
 	default 0
 	help
 	  Maximum number of consecutive RPU recovery retries before giving up
-	  and resetting the system. Set it to 0 to keep retrying indefinitely.
+	  and resetting the system. Set to 0 to keep retrying indefinitely.
 
 config NRF_WIFI_RPU_RECOVERY_RETRY_WINDOW_S
 	int "RPU recovery retry window in seconds"
@@ -736,14 +741,16 @@ config NRF_WIFI_RPU_RECOVERY_RETRY_WINDOW_S
 config NRF_WIFI_RPU_RECOVERY_PS_STATE_DEBUG
 	bool "RPU recovery power save state debug logs"
 	help
-	  Enable RPU recovery power save state debug logs to help debug the RPU recovery mechanism.
+	  Enable RPU recovery power save state debug logs to help debug RPU recovery mechanism.
+
+
 endif # NRF_WIFI_RPU_RECOVERY
 
 config NRF_WIFI_FEAT_WMM
 	bool "WMM/QoS support"
 	default y
 	help
-	  This option controls disable/enable of the WMM (Wireless Multi-Media) feature.
+	  This option controls disable/enable of the WMM(Wireless Multi-Media) feature.
 
 choice NRF_WIFI_PS_DATA_RETRIEVAL_MECHANISM
 	prompt "Power save data retrieval mechanism"
@@ -752,36 +759,37 @@ choice NRF_WIFI_PS_DATA_RETRIEVAL_MECHANISM
 	  Select the mechanism to retrieve buffered data from AP.
 
 config NRF_WIFI_PS_POLL_BASED_RETRIEVAL
-	bool "PS-Poll frame-based mechanism to retrieve buffered data from AP"
+	bool "PS-Poll frame based mechanism to retrieve buffered data from AP"
 	help
-	  When the AP notifies about the availability of buffered data, the STA stays in power save
-	  and retrieves the frames one-by-one. This conserves more power but adds latency
-	  to the traffic. It is ideal for minimum number of frames.
+	  When AP notifies about availability of buffered data, the STA stays in power save
+	  and retrieves the frames one-by-one, this conserved more power but adds latency
+	  to the traffic. Ideal for minimum number of frames.
 
 config NRF_WIFI_QOS_NULL_BASED_RETRIEVAL
-	bool "QoS null frame-based mechanism to retrieve buffered data from AP"
+	bool "QoS null frame based mechanism to retrieve buffered data from AP"
 	help
-	  When the AP notifies about the availability of buffered data, the STA comes out of
-	  power save, and then AP can deliver all buffered frames without any additional
+	  When AP notifies about availability of buffered data, the STA comes out of
+	  power save and then AP can deliver all buffered frames without any additional
 	  overhead or latency, but STA enters power save after a delay costing more power
-	  depending on the delay. It is ideal for heavy buffered traffic.
+	  depending on the delay. Ideal for heavy buffered traffic.
+
 endchoice
 
 config NRF_WIFI_MGMT_BUFF_OFFLOAD
-	bool "Management buffer offload"
+	bool "management buffer offload"
 	default y
 	help
-	  This option offloads the refilling of management buffers to the UMAC, saving the host
-	  from having to exchange commands and events for every management packet even if it is
+	  This option offloads the refilling of management buffers to UMAC, saves host
+	  having to exchange commands and events for every management packet even if it is
 	  consumed by UMAC.
 
 config NRF_WIFI_FEAT_KEEPALIVE
 	bool "Wi-Fi keepalive feature for connection maintenance"
 	depends on NRF70_STA_MODE
 	help
-	  Enable the Wi-Fi keepalive feature to keep the connection alive by sending
-	  keepalive packets to the AP. This feature is primarily intended to interoperate with APs
-	  that disconnect idle clients without any explicit checks. It slightly increases
+	  Enable Wi-Fi keepalive feature to keep the connection alive by sending
+	  keepalive packets to the AP. Primarily intended to interoperate with APs
+	  that disconnect idle clients without any explicit checks. Slightly increases
 	  power consumption.
 
 if NRF_WIFI_FEAT_KEEPALIVE
@@ -808,9 +816,9 @@ config NRF_WIFI_PS_EXIT_EVERY_TIM
 config NRF_WIFI_PS_INT_PS
 	bool "Exit power save based on an intelligent algorithm"
 	help
-	  Exit power save based on an intelligent algorithm to retrieve buffered data from the AP.
+	  Exit power save based on an intelligent algorithm to retrieve buffered data from AP.
 	  The algorithm tracks the buffered data at the AP and then dynamically decides
-	  whether to stay in PS (for a lower amount of buffered data) or exit PS (for a higher
+	  whether to stay in PS (for lower amount of buffered data) or exit PS (for higher
 	  amount of buffered data).
 endchoice
 
@@ -819,5 +827,5 @@ config NRF70_PASSIVE_SCAN_ONLY
 	depends on NRF70_SCAN_ONLY
 	help
 	  Enable this configuration to force passive scan on all channels.
-	  This will override application-specified scan type.
+	  This will override application specified scan type.
 endif # WIFI_NRF70

From 26651492a0620885e173d7f9ef073429ee99619e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:32 +0100
Subject: [PATCH 1486/2913] Revert "[nrf fromlist] drivers: pwm: nrfx: adjust
 PWM driver to fast PWM120"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3fc04b2538bcf48c792dcf718807f12a6bcea0cd.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/pwm/pwm_nrfx.c | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index 5161b299c3a..420a9078c59 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -11,8 +11,6 @@
 #include <hal/nrf_gpio.h>
 #include <stdbool.h>
 #include <zephyr/linker/devicetree_regions.h>
-#include <zephyr/cache.h>
-#include <zephyr/mem_mgmt/mem_attr.h>
 
 #include <zephyr/logging/log.h>
 
@@ -42,10 +40,6 @@ struct pwm_nrfx_config {
 	nrfx_pwm_config_t initial_config;
 	nrf_pwm_sequence_t seq;
 	const struct pinctrl_dev_config *pcfg;
-	uint32_t clock_freq;
-#ifdef CONFIG_DCACHE
-	uint32_t mem_attr;
-#endif
 };
 
 struct pwm_nrfx_data {
@@ -182,12 +176,6 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 
 	seq_values_ptr_get(dev)[channel] = PWM_NRFX_CH_VALUE(compare_value, inverted);
 
-#ifdef CONFIG_DCACHE
-	if (config->mem_attr & DT_MEM_CACHEABLE) {
-		sys_cache_data_flush_range(seq_values_ptr_get(dev), config->seq.length);
-	}
-#endif
-
 	LOG_DBG("channel %u, pulse %u, period %u, prescaler: %u.",
 		channel, pulse_cycles, period_cycles, data->prescaler);
 
@@ -255,9 +243,11 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 static int pwm_nrfx_get_cycles_per_sec(const struct device *dev, uint32_t channel,
 				       uint64_t *cycles)
 {
-	const struct pwm_nrfx_config *config = dev->config;
-
-	*cycles = config->clock_freq;
+	/* TODO: Since this function might be removed, we will always return
+	 * 16MHz from this function and handle the conversion with prescaler,
+	 * etc, in the pin set function. See issue #6958.
+	 */
+	*cycles = 16ul * 1000ul * 1000ul;
 
 	return 0;
 }
@@ -343,18 +333,13 @@ static int pwm_nrfx_init(const struct device *dev)
 #define PWM(dev_idx) DT_NODELABEL(pwm##dev_idx)
 #define PWM_PROP(dev_idx, prop) DT_PROP(PWM(dev_idx), prop)
 #define PWM_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(PWM(idx), prop)
-#define PWM_MEM_REGION(idx)     DT_PHANDLE(PWM(idx), memory_regions)
 
 #define PWM_MEMORY_SECTION(idx)						      \
 	COND_CODE_1(PWM_HAS_PROP(idx, memory_regions),			      \
 		(__attribute__((__section__(LINKER_DT_NODE_REGION_NAME(	      \
-			PWM_MEM_REGION(idx)))))),			      \
+			DT_PHANDLE(PWM(idx), memory_regions)))))),	      \
 		())
 
-#define PWM_GET_MEM_ATTR(idx)						      \
-	COND_CODE_1(PWM_HAS_PROP(idx, memory_regions),			      \
-		(DT_PROP_OR(PWM_MEM_REGION(idx), zephyr_memory_attr, 0)), (0))
-
 #define PWM_NRFX_DEVICE(idx)						      \
 	NRF_DT_CHECK_NODE_HAS_PINCTRL_SLEEP(PWM(idx));			      \
 	static struct pwm_nrfx_data pwm_nrfx_##idx##_data;		      \
@@ -377,11 +362,6 @@ static int pwm_nrfx_init(const struct device *dev)
 		.seq.values.p_raw = pwm_##idx##_seq_values,		      \
 		.seq.length = NRF_PWM_CHANNEL_COUNT,			      \
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(PWM(idx)),		      \
-		.clock_freq = COND_CODE_1(DT_CLOCKS_HAS_IDX(PWM(idx), 0),     \
-			(DT_PROP(DT_CLOCKS_CTLR(PWM(idx)), clock_frequency)), \
-			(16ul * 1000ul * 1000ul)),			      \
-		IF_ENABLED(CONFIG_DCACHE,				      \
-			(.mem_attr = PWM_GET_MEM_ATTR(idx),))		      \
 	};								      \
 	static int pwm_nrfx_init##idx(const struct device *dev)		      \
 	{								      \

From f353541215be33f162c00b700f2d41b4977818b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:32 +0100
Subject: [PATCH 1487/2913] Revert "[nrf fromlist] dts: common: nordic: Add
 clock property for fast PWM120"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 92f8b824f525f0f9320937086d77e2614fa31b14.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/common/nordic/nrf54h20.dtsi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 979695f7335..5d5b4ba7434 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -635,7 +635,6 @@
 				reg = <0x8e4000 0x1000>;
 				status = "disabled";
 				interrupts = <228 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&hsfll120>;
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				#pwm-cells = <3>;
 			};

From 76a1a25a1d4b812a38af443ce5479a90de7528eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:32 +0100
Subject: [PATCH 1488/2913] Revert "[nrf fromtree] soc: nordic: nrf54h: gpd:
 fix compile warning when CONFIG_DEBUG=y"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 561806338cbed3b3d78c2b820cb3fa06268cdc2a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54h/gpd/gpd.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/soc/nordic/nrf54h/gpd/gpd.c b/soc/nordic/nrf54h/gpd/gpd.c
index a4d1889e53f..994b2c02b96 100644
--- a/soc/nordic/nrf54h/gpd/gpd.c
+++ b/soc/nordic/nrf54h/gpd/gpd.c
@@ -93,19 +93,16 @@ static int nrf_gpd_sync(struct gpd_onoff_manager *gpd_mgr)
 {
 	int64_t start;
 	nrfs_err_t err;
-	k_spinlock_key_t key;
 	gdpwr_request_type_t request;
 
-	key = k_spin_lock(&gpd_mgr->mgr.lock);
-
-	if (gpd_mgr->mgr.refs == 0) {
-		request = GDPWR_POWER_REQUEST_CLEAR;
-	} else {
-		request = GDPWR_POWER_REQUEST_SET;
+	K_SPINLOCK(&gpd_mgr->mgr.lock) {
+		if (gpd_mgr->mgr.refs == 0) {
+			request = GDPWR_POWER_REQUEST_CLEAR;
+		} else {
+			request = GDPWR_POWER_REQUEST_SET;
+		}
 	}
 
-	k_spin_unlock(&gpd_mgr->mgr.lock, key);
-
 	atomic_clear_bit(&gpd_service_status, GPD_SERVICE_REQ_ERR);
 	atomic_clear_bit(&gpd_service_status, GPD_SERVICE_REQ_OK);
 

From 2be6ca4d68c52194d02618a135426233995af4dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:32 +0100
Subject: [PATCH 1489/2913] Revert "[nrf fromlist] soc: nrf54h: gpd: use
 callback to fetch nrfs async result"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d13e33785b806178dc79a43c3e830abf6a3bcf14.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54h/gpd/gpd.c | 55 ++++---------------------------------
 1 file changed, 6 insertions(+), 49 deletions(-)

diff --git a/soc/nordic/nrf54h/gpd/gpd.c b/soc/nordic/nrf54h/gpd/gpd.c
index 994b2c02b96..ea439a54460 100644
--- a/soc/nordic/nrf54h/gpd/gpd.c
+++ b/soc/nordic/nrf54h/gpd/gpd.c
@@ -28,9 +28,6 @@ struct gpd_onoff_manager {
 	struct onoff_manager mgr;
 	onoff_notify_fn notify;
 	uint8_t id;
-	struct k_mutex lock;
-	struct k_sem sem;
-	int res;
 };
 
 static void start(struct onoff_manager *mgr, onoff_notify_fn notify);
@@ -44,21 +41,9 @@ static void stop(struct onoff_manager *mgr, onoff_notify_fn notify);
 #define GPD_SERVICE_REQ_ERR BIT(3)
 static atomic_t gpd_service_status = ATOMIC_INIT(0);
 
-static struct gpd_onoff_manager fast_active1 = {
-	.id = NRF_GPD_FAST_ACTIVE1,
-	.lock = Z_MUTEX_INITIALIZER(fast_active1.lock),
-	.sem = Z_SEM_INITIALIZER(fast_active1.sem, 0, 1),
-};
-static struct gpd_onoff_manager slow_active = {
-	.id = NRF_GPD_SLOW_ACTIVE,
-	.lock = Z_MUTEX_INITIALIZER(slow_active.lock),
-	.sem = Z_SEM_INITIALIZER(slow_active.sem, 0, 1),
-};
-static struct gpd_onoff_manager slow_main = {
-	.id = NRF_GPD_SLOW_MAIN,
-	.lock = Z_MUTEX_INITIALIZER(slow_main.lock),
-	.sem = Z_SEM_INITIALIZER(slow_main.sem, 0, 1),
-};
+static struct gpd_onoff_manager fast_active1 = {.id = NRF_GPD_FAST_ACTIVE1};
+static struct gpd_onoff_manager slow_active = {.id = NRF_GPD_SLOW_ACTIVE};
+static struct gpd_onoff_manager slow_main = {.id = NRF_GPD_SLOW_MAIN};
 
 static const struct onoff_transitions transitions =
 	ONOFF_TRANSITIONS_INITIALIZER(start, stop, NULL);
@@ -77,18 +62,6 @@ static struct gpd_onoff_manager *get_mgr(uint8_t id)
 	}
 }
 
-static void request_cb(struct onoff_manager *mgr_, struct onoff_client *cli, uint32_t state,
-		       int res)
-{
-	ARG_UNUSED(cli);
-	ARG_UNUSED(state);
-
-	struct gpd_onoff_manager *gpd_mgr = CONTAINER_OF(mgr_, struct gpd_onoff_manager, mgr);
-
-	gpd_mgr->res = res;
-	k_sem_give(&gpd_mgr->sem);
-}
-
 static int nrf_gpd_sync(struct gpd_onoff_manager *gpd_mgr)
 {
 	int64_t start;
@@ -208,27 +181,11 @@ int nrf_gpd_request(uint8_t id)
 		return -EIO;
 	}
 
-	if (k_is_pre_kernel()) {
-		sys_notify_init_spinwait(&client.notify);
-
-		ret = onoff_request(&gpd_mgr->mgr, &client);
-		if (ret < 0) {
-			return ret;
-		}
+	sys_notify_init_spinwait(&client.notify);
 
-		while (sys_notify_fetch_result(&client.notify, &ret) == -EAGAIN) {
-		}
-	} else {
-		sys_notify_init_callback(&client.notify, request_cb);
-		k_mutex_lock(&gpd_mgr->lock, K_FOREVER);
-
-		ret = onoff_request(&gpd_mgr->mgr, &client);
-		if (ret >= 0) {
-			(void)k_sem_take(&gpd_mgr->sem, K_FOREVER);
-			ret = gpd_mgr->res;
-		}
+	onoff_request(&gpd_mgr->mgr, &client);
 
-		k_mutex_unlock(&gpd_mgr->lock);
+	while (sys_notify_fetch_result(&client.notify, &ret) == -EAGAIN) {
 	}
 
 	return ret;

From b82317b7e33f09196aa836ca46a4469c2b393e98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:32 +0100
Subject: [PATCH 1490/2913] Revert "[nrf noup] moduled: hal_nordic: require
 nrf-regtool"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8758068d4570a4e34e0da2391144af7d5274e45c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt
index 0dd750d457e..4e3f388b266 100644
--- a/modules/hal_nordic/CMakeLists.txt
+++ b/modules/hal_nordic/CMakeLists.txt
@@ -15,7 +15,7 @@ if(CONFIG_NRF_REGTOOL_GENERATE_BICR)
   list(APPEND nrf_regtool_components GENERATE:BICR)
 endif()
 if(DEFINED nrf_regtool_components)
-  find_package(nrf-regtool 8.0.0 REQUIRED
+  find_package(nrf-regtool 8.0.0
     COMPONENTS ${nrf_regtool_components}
     PATHS ${CMAKE_CURRENT_LIST_DIR}/nrf-regtool
     NO_CMAKE_PATH

From 6c82ea5a5ddd7d38a4ee3ace96ff034e4ea2fc42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:32 +0100
Subject: [PATCH 1491/2913] Revert "[nrf fromtree] soc: nordic: nrf54h: disable
 PM_DEVICE_POWER_DOMAIN"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b907313cd47df1a1f548a63000952ed993fe95f9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54h/Kconfig.defconfig | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/soc/nordic/nrf54h/Kconfig.defconfig b/soc/nordic/nrf54h/Kconfig.defconfig
index 65023fc18ca..b09b24e5e70 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig
+++ b/soc/nordic/nrf54h/Kconfig.defconfig
@@ -39,7 +39,4 @@ config SPI_DW_HSSI
 config SPI_DW_ACCESS_WORD_ONLY
 	default y if SPI_DW
 
-config PM_DEVICE_POWER_DOMAIN
-	default n if PM_DEVICE
-
 endif # SOC_SERIES_NRF54HX

From abedd0d70bf56e68b6c416c8f03ac11c34e976e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:32 +0100
Subject: [PATCH 1492/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 set/clear pins retention"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 29536e577d7a1f5c258a6d236295dc7ee21a155f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/uart_nrfx_uarte.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 452307acaa8..2fb2ab3537e 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -23,11 +23,6 @@
 #include <zephyr/linker/devicetree_regions.h>
 #include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
-
-#ifdef CONFIG_SOC_NRF54H20_GPD
-#include <nrf/gpd.h>
-#endif
-
 LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 
 #if !defined(CONFIG_ARCH_POSIX)
@@ -2103,9 +2098,6 @@ static void uarte_pm_resume(const struct device *dev)
 
 	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || !LOW_POWER_ENABLED(cfg)) {
 		uarte_periph_enable(dev);
-#ifdef CONFIG_SOC_NRF54H20_GPD
-		nrf_gpd_retain_pins_set(cfg->pcfg, false);
-#endif
 	}
 }
 
@@ -2168,10 +2160,6 @@ static void uarte_pm_suspend(const struct device *dev)
 		wait_for_tx_stopped(dev);
 	}
 
-#ifdef CONFIG_SOC_NRF54H20_GPD
-	nrf_gpd_retain_pins_set(cfg->pcfg, true);
-#endif
-
 	nrf_uarte_disable(uarte);
 
 	(void)pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_SLEEP);

From dd62466c61a77162a3cd8c1066bc602dc82710dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:32 +0100
Subject: [PATCH 1493/2913] Revert "[nrf fromtree] soc: nordic: nrf54h: gpd:
 add API to set/clear pin retention"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 820f0ba0b5fe245c7af498578fdac310f342c6d9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54h/gpd/gpd.c             | 29 -------------------------
 soc/nordic/nrf54h/gpd/include/nrf/gpd.h | 12 ----------
 2 files changed, 41 deletions(-)

diff --git a/soc/nordic/nrf54h/gpd/gpd.c b/soc/nordic/nrf54h/gpd/gpd.c
index ea439a54460..33cdb876e16 100644
--- a/soc/nordic/nrf54h/gpd/gpd.c
+++ b/soc/nordic/nrf54h/gpd/gpd.c
@@ -12,7 +12,6 @@
 #include <zephyr/spinlock.h>
 #include <zephyr/sys/util.h>
 
-#include <hal/nrf_gpio.h>
 #include <nrf/gpd.h>
 #include <nrfs_gdpwr.h>
 #include <nrfs_backend_ipc_service.h>
@@ -208,34 +207,6 @@ int nrf_gpd_release(uint8_t id)
 	return onoff_release(&gpd_mgr->mgr);
 }
 
-int nrf_gpd_retain_pins_set(const struct pinctrl_dev_config *pcfg, bool retain)
-{
-	const struct pinctrl_state *state;
-	int ret;
-
-	ret = pinctrl_lookup_state(pcfg, PINCTRL_STATE_DEFAULT, &state);
-	if (ret < 0) {
-		return ret;
-	}
-
-	for (uint8_t i = 0U; i < state->pin_cnt; i++) {
-		uint32_t pin = NRF_GET_PIN(state->pins[i]);
-		NRF_GPIO_Type *reg = nrf_gpio_pin_port_decode(&pin);
-
-		if (pin == NRF_PIN_DISCONNECTED) {
-			continue;
-		}
-
-		if (retain) {
-			reg->RETAINSET = BIT(pin);
-		} else {
-			reg->RETAINCLR = BIT(pin);
-		}
-	}
-
-	return 0;
-}
-
 static int nrf_gpd_pre_init(void)
 {
 	int ret;
diff --git a/soc/nordic/nrf54h/gpd/include/nrf/gpd.h b/soc/nordic/nrf54h/gpd/include/nrf/gpd.h
index b8aab94accb..0504f94e858 100644
--- a/soc/nordic/nrf54h/gpd/include/nrf/gpd.h
+++ b/soc/nordic/nrf54h/gpd/include/nrf/gpd.h
@@ -9,7 +9,6 @@
 #include <stdint.h>
 
 #include <zephyr/dt-bindings/power/nordic-nrf-gpd.h>
-#include <zephyr/drivers/pinctrl.h>
 
 /**
  * @brief Request a global power domain.
@@ -31,15 +30,4 @@ int nrf_gpd_request(uint8_t id);
  */
 int nrf_gpd_release(uint8_t id);
 
-/**
- * @brief Retain set/clear a set of pins.
- *
- * @param pcfg Device pin configuration.
- * @param retain Retain or not.
- *
- * @retval 0 If the request was successful.
- * @retval -errno If the request was not successful.
- */
-int nrf_gpd_retain_pins_set(const struct pinctrl_dev_config *pcfg, bool retain);
-
 #endif /* ZEPHYR_SOC_NORDIC_NRF54H_GPD_INCLUDE_NRF_GPD_H_ */

From 362aa319dc7d7ae18a37d345fc4d3c8671499f6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:32 +0100
Subject: [PATCH 1494/2913] Revert "[nrf fromtree] scripts: checkpatch: add
 NRF_GPIO_Type to typedefs file"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 629c2592d1f1cea6b6e29c20900b1041dff05642.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/checkpatch/typedefsfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/checkpatch/typedefsfile b/scripts/checkpatch/typedefsfile
index 0fc22b9779b..62febe44e1b 100644
--- a/scripts/checkpatch/typedefsfile
+++ b/scripts/checkpatch/typedefsfile
@@ -8,4 +8,3 @@ io_rw_32
 \b[a-zA-Z_][a-zA-Z0-9_]*TypeDef
 Pwm
 FILE
-NRF_GPIO_Type

From 6bd7fbb2d7b4a718a84b897ac1737054ef7d1331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:32 +0100
Subject: [PATCH 1495/2913] Revert "[nrf fromtree] drivers: gpio: nrfx: add
 support for ports with pad on FAST_ACTIVE1"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 07d5f0c6aa1022d8fa2da1693c86ae6a3fc641be.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/gpio/gpio_nrfx.c | 116 +++------------------------------------
 1 file changed, 8 insertions(+), 108 deletions(-)

diff --git a/drivers/gpio/gpio_nrfx.c b/drivers/gpio/gpio_nrfx.c
index d9eb9129937..151cf1a830c 100644
--- a/drivers/gpio/gpio_nrfx.c
+++ b/drivers/gpio/gpio_nrfx.c
@@ -14,10 +14,6 @@
 
 #include <zephyr/drivers/gpio/gpio_utils.h>
 
-#ifdef CONFIG_SOC_NRF54H20_GPD
-#include <nrf/gpd.h>
-#endif
-
 struct gpio_nrfx_data {
 	/* gpio_driver_data needs to be first */
 	struct gpio_driver_data common;
@@ -31,9 +27,6 @@ struct gpio_nrfx_cfg {
 	uint32_t edge_sense;
 	uint8_t port_num;
 	nrfx_gpiote_t gpiote;
-#ifdef CONFIG_SOC_NRF54H20_GPD
-	uint8_t pad_pd;
-#endif
 };
 
 static inline struct gpio_nrfx_data *get_port_data(const struct device *port)
@@ -62,59 +55,9 @@ static nrf_gpio_pin_pull_t get_pull(gpio_flags_t flags)
 	return NRF_GPIO_PIN_NOPULL;
 }
 
-static int gpio_nrfx_gpd_retain_set(const struct device *port, uint32_t mask, gpio_flags_t flags)
-{
-#ifdef CONFIG_SOC_NRF54H20_GPD
-	const struct gpio_nrfx_cfg *cfg = get_port_cfg(port);
-
-	if (cfg->pad_pd == NRF_GPD_FAST_ACTIVE1) {
-		int ret;
-
-		if (flags & GPIO_OUTPUT) {
-			cfg->port->RETAINSET = mask;
-		}
-
-		ret = nrf_gpd_release(NRF_GPD_FAST_ACTIVE1);
-		if (ret < 0) {
-			return ret;
-		}
-	}
-#else
-	ARG_UNUSED(port);
-	ARG_UNUSED(mask);
-	ARG_UNUSED(flags);
-#endif
-
-	return 0;
-}
-
-static int gpio_nrfx_gpd_retain_clear(const struct device *port, uint32_t mask)
-{
-#ifdef CONFIG_SOC_NRF54H20_GPD
-	const struct gpio_nrfx_cfg *cfg = get_port_cfg(port);
-
-	if (cfg->pad_pd == NRF_GPD_FAST_ACTIVE1) {
-		int ret;
-
-		ret = nrf_gpd_request(NRF_GPD_FAST_ACTIVE1);
-		if (ret < 0) {
-			return ret;
-		}
-
-		cfg->port->RETAINCLR = mask;
-	}
-#else
-	ARG_UNUSED(port);
-	ARG_UNUSED(mask);
-#endif
-
-	return 0;
-}
-
 static int gpio_nrfx_pin_configure(const struct device *port, gpio_pin_t pin,
 				   gpio_flags_t flags)
 {
-	int ret = 0;
 	nrfx_err_t err = NRFX_SUCCESS;
 	uint8_t ch;
 	bool free_ch = false;
@@ -152,11 +95,6 @@ static int gpio_nrfx_pin_configure(const struct device *port, gpio_pin_t pin,
 		return -EINVAL;
 	}
 
-	ret = gpio_nrfx_gpd_retain_clear(port, BIT(pin));
-	if (ret < 0) {
-		return ret;
-	}
-
 	if (flags & GPIO_OUTPUT_INIT_HIGH) {
 		nrf_gpio_port_out_set(cfg->port, BIT(pin));
 	} else if (flags & GPIO_OUTPUT_INIT_LOW) {
@@ -172,8 +110,7 @@ static int gpio_nrfx_pin_configure(const struct device *port, gpio_pin_t pin,
 					   : NRF_GPIO_PIN_INPUT_DISCONNECT;
 
 		nrf_gpio_reconfigure(abs_pin, &dir, &input, &pull, &drive, NULL);
-
-		goto end;
+		return 0;
 	}
 
 	/* Get the GPIOTE channel associated with this pin, if any. It needs
@@ -200,8 +137,7 @@ static int gpio_nrfx_pin_configure(const struct device *port, gpio_pin_t pin,
 			err = nrfx_gpiote_input_configure(&cfg->gpiote,
 				abs_pin, &input_pin_config);
 			if (err != NRFX_SUCCESS) {
-				ret = -EINVAL;
-				goto end;
+				return -EINVAL;
 			}
 		}
 
@@ -226,8 +162,7 @@ static int gpio_nrfx_pin_configure(const struct device *port, gpio_pin_t pin,
 		}
 
 		if (err != NRFX_SUCCESS) {
-			ret = -EINVAL;
-			goto end;
+			return -EINVAL;
 		}
 	}
 
@@ -236,9 +171,7 @@ static int gpio_nrfx_pin_configure(const struct device *port, gpio_pin_t pin,
 		__ASSERT_NO_MSG(err == NRFX_SUCCESS);
 	}
 
-end:
-	(void)gpio_nrfx_gpd_retain_set(port, BIT(pin), flags);
-	return ret;
+	return 0;
 }
 
 static int gpio_nrfx_port_get_raw(const struct device *port,
@@ -256,52 +189,34 @@ static int gpio_nrfx_port_set_masked_raw(const struct device *port,
 					 gpio_port_value_t value)
 {
 	NRF_GPIO_Type *reg = get_port_cfg(port)->port;
-	int ret;
 
 	const uint32_t set_mask = value & mask;
 	const uint32_t clear_mask = (~set_mask) & mask;
 
-	ret = gpio_nrfx_gpd_retain_clear(port, mask);
-	if (ret < 0) {
-		return ret;
-	}
-
 	nrf_gpio_port_out_set(reg, set_mask);
 	nrf_gpio_port_out_clear(reg, clear_mask);
 
-	return gpio_nrfx_gpd_retain_set(port, mask, GPIO_OUTPUT);
+	return 0;
 }
 
 static int gpio_nrfx_port_set_bits_raw(const struct device *port,
 				       gpio_port_pins_t mask)
 {
 	NRF_GPIO_Type *reg = get_port_cfg(port)->port;
-	int ret;
-
-	ret = gpio_nrfx_gpd_retain_clear(port, mask);
-	if (ret < 0) {
-		return ret;
-	}
 
 	nrf_gpio_port_out_set(reg, mask);
 
-	return gpio_nrfx_gpd_retain_set(port, mask, GPIO_OUTPUT);
+	return 0;
 }
 
 static int gpio_nrfx_port_clear_bits_raw(const struct device *port,
 					 gpio_port_pins_t mask)
 {
 	NRF_GPIO_Type *reg = get_port_cfg(port)->port;
-	int ret;
-
-	ret = gpio_nrfx_gpd_retain_clear(port, mask);
-	if (ret < 0) {
-		return ret;
-	}
 
 	nrf_gpio_port_out_clear(reg, mask);
 
-	return gpio_nrfx_gpd_retain_set(port, mask, GPIO_OUTPUT);
+	return 0;
 }
 
 static int gpio_nrfx_port_toggle_bits(const struct device *port,
@@ -311,17 +226,11 @@ static int gpio_nrfx_port_toggle_bits(const struct device *port,
 	const uint32_t value = nrf_gpio_port_out_read(reg) ^ mask;
 	const uint32_t set_mask = value & mask;
 	const uint32_t clear_mask = (~value) & mask;
-	int ret;
-
-	ret = gpio_nrfx_gpd_retain_clear(port, mask);
-	if (ret < 0) {
-		return ret;
-	}
 
 	nrf_gpio_port_out_set(reg, set_mask);
 	nrf_gpio_port_out_clear(reg, clear_mask);
 
-	return gpio_nrfx_gpd_retain_set(port, mask, GPIO_OUTPUT);
+	return 0;
 }
 
 #ifdef CONFIG_GPIO_NRFX_INTERRUPT
@@ -541,14 +450,6 @@ static const struct gpio_driver_api gpio_nrfx_drv_api_funcs = {
 			"Please enable GPIOTE instance for used GPIO port!")), \
 		())
 
-#ifdef CONFIG_SOC_NRF54H20_GPD
-#define PAD_PD(inst) \
-	.pad_pd = DT_INST_PHA_BY_NAME_OR(inst, power_domains, pad, id,	       \
-					 NRF_GPD_SLOW_MAIN),
-#else
-#define PAD_PD(inst)
-#endif
-
 #define GPIO_NRF_DEVICE(id)						\
 	GPIOTE_CHECK(id);						\
 	static const struct gpio_nrfx_cfg gpio_nrfx_p##id##_cfg = {	\
@@ -560,7 +461,6 @@ static const struct gpio_driver_api gpio_nrfx_drv_api_funcs = {
 		.port_num = DT_INST_PROP(id, port),			\
 		.edge_sense = DT_INST_PROP_OR(id, sense_edge_mask, 0),	\
 		.gpiote = GPIOTE_INSTANCE(id),				\
-		PAD_PD(id)						\
 	};								\
 									\
 	static struct gpio_nrfx_data gpio_nrfx_p##id##_data;		\

From 39c7eeced4cbab5a24770c4dad2560bef67c2f3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:32 +0100
Subject: [PATCH 1496/2913] Revert "[nrf fromtree] modules: hal_nordic: bump
 regtool to 8.0.0"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e61d08929180e8f45d020b1956923284988d5cb9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt
index 4e3f388b266..3bed5a033b5 100644
--- a/modules/hal_nordic/CMakeLists.txt
+++ b/modules/hal_nordic/CMakeLists.txt
@@ -15,7 +15,7 @@ if(CONFIG_NRF_REGTOOL_GENERATE_BICR)
   list(APPEND nrf_regtool_components GENERATE:BICR)
 endif()
 if(DEFINED nrf_regtool_components)
-  find_package(nrf-regtool 8.0.0
+  find_package(nrf-regtool 7.0.0 REQUIRED
     COMPONENTS ${nrf_regtool_components}
     PATHS ${CMAKE_CURRENT_LIST_DIR}/nrf-regtool
     NO_CMAKE_PATH

From 6589a970d8093a2a40841e2cd64c06ad7bf59377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:32 +0100
Subject: [PATCH 1497/2913] Revert "[nrf fromtree] soc: nordic: nrf54h: add SoC
 level API to request/release GPD"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ddfcaa314a5a9c7dbc1614ff2f49062ca8ba619a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54h/CMakeLists.txt        |   2 -
 soc/nordic/nrf54h/Kconfig               |   2 -
 soc/nordic/nrf54h/gpd/CMakeLists.txt    |   5 -
 soc/nordic/nrf54h/gpd/Kconfig           |  12 --
 soc/nordic/nrf54h/gpd/gpd.c             | 276 ------------------------
 soc/nordic/nrf54h/gpd/include/nrf/gpd.h |  33 ---
 6 files changed, 330 deletions(-)
 delete mode 100644 soc/nordic/nrf54h/gpd/CMakeLists.txt
 delete mode 100644 soc/nordic/nrf54h/gpd/Kconfig
 delete mode 100644 soc/nordic/nrf54h/gpd/gpd.c
 delete mode 100644 soc/nordic/nrf54h/gpd/include/nrf/gpd.h

diff --git a/soc/nordic/nrf54h/CMakeLists.txt b/soc/nordic/nrf54h/CMakeLists.txt
index 7edc4d43ea1..0496841ffe7 100644
--- a/soc/nordic/nrf54h/CMakeLists.txt
+++ b/soc/nordic/nrf54h/CMakeLists.txt
@@ -15,5 +15,3 @@ zephyr_include_directories(.)
 # Ensure that image size aligns with 16 bytes so that MRAMC finalizes all writes
 # for the image correctly
 zephyr_linker_sources(SECTIONS SORT_KEY zzz_place_align_at_end align.ld)
-
-add_subdirectory(gpd)
diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
index 1b667e25985..9132ca8458b 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -75,5 +75,3 @@ config SOC_NRF54H20_CPUFLPR
 
 config SOC_NRF54H20_ENGB_CPUFLPR
 	depends on RISCV_CORE_NORDIC_VPR
-
-rsource "gpd/Kconfig"
diff --git a/soc/nordic/nrf54h/gpd/CMakeLists.txt b/soc/nordic/nrf54h/gpd/CMakeLists.txt
deleted file mode 100644
index 7d029d2c8fc..00000000000
--- a/soc/nordic/nrf54h/gpd/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor
-# SPDX-License-Identifier: Apache-2.0
-
-zephyr_library_sources_ifdef(CONFIG_SOC_NRF54H20_GPD gpd.c)
-zephyr_include_directories(include)
diff --git a/soc/nordic/nrf54h/gpd/Kconfig b/soc/nordic/nrf54h/gpd/Kconfig
deleted file mode 100644
index b9bd568cda6..00000000000
--- a/soc/nordic/nrf54h/gpd/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_NRF54H20_GPD
-	bool "Global Power Domain service"
-	imply NRFS
-	imply NRFS_GDPWR_SERVICE_ENABLED
-	select ONOFF
-	default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || \
-		     SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
-	help
-	  This option enables the Global Power Domain service.
diff --git a/soc/nordic/nrf54h/gpd/gpd.c b/soc/nordic/nrf54h/gpd/gpd.c
deleted file mode 100644
index 33cdb876e16..00000000000
--- a/soc/nordic/nrf54h/gpd/gpd.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <errno.h>
-
-#include <zephyr/init.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/sys/atomic.h>
-#include <zephyr/sys/onoff.h>
-#include <zephyr/spinlock.h>
-#include <zephyr/sys/util.h>
-
-#include <nrf/gpd.h>
-#include <nrfs_gdpwr.h>
-#include <nrfs_backend_ipc_service.h>
-
-LOG_MODULE_REGISTER(gpd, CONFIG_SOC_LOG_LEVEL);
-
-/* enforce alignment between DT<->nrfs */
-BUILD_ASSERT(GDPWR_POWER_DOMAIN_ACTIVE_FAST == NRF_GPD_FAST_ACTIVE1);
-BUILD_ASSERT(GDPWR_POWER_DOMAIN_ACTIVE_SLOW == NRF_GPD_SLOW_ACTIVE);
-BUILD_ASSERT(GDPWR_POWER_DOMAIN_MAIN_SLOW == NRF_GPD_SLOW_MAIN);
-
-struct gpd_onoff_manager {
-	struct onoff_manager mgr;
-	onoff_notify_fn notify;
-	uint8_t id;
-};
-
-static void start(struct onoff_manager *mgr, onoff_notify_fn notify);
-static void stop(struct onoff_manager *mgr, onoff_notify_fn notify);
-
-#define GPD_READY_TIMEOUT_MS 1000
-
-#define GPD_SERVICE_READY   BIT(0)
-#define GPD_SERVICE_ERROR   BIT(1)
-#define GPD_SERVICE_REQ_OK  BIT(2)
-#define GPD_SERVICE_REQ_ERR BIT(3)
-static atomic_t gpd_service_status = ATOMIC_INIT(0);
-
-static struct gpd_onoff_manager fast_active1 = {.id = NRF_GPD_FAST_ACTIVE1};
-static struct gpd_onoff_manager slow_active = {.id = NRF_GPD_SLOW_ACTIVE};
-static struct gpd_onoff_manager slow_main = {.id = NRF_GPD_SLOW_MAIN};
-
-static const struct onoff_transitions transitions =
-	ONOFF_TRANSITIONS_INITIALIZER(start, stop, NULL);
-
-static struct gpd_onoff_manager *get_mgr(uint8_t id)
-{
-	switch (id) {
-	case NRF_GPD_FAST_ACTIVE1:
-		return &fast_active1;
-	case NRF_GPD_SLOW_ACTIVE:
-		return &slow_active;
-	case NRF_GPD_SLOW_MAIN:
-		return &slow_main;
-	default:
-		return NULL;
-	}
-}
-
-static int nrf_gpd_sync(struct gpd_onoff_manager *gpd_mgr)
-{
-	int64_t start;
-	nrfs_err_t err;
-	gdpwr_request_type_t request;
-
-	K_SPINLOCK(&gpd_mgr->mgr.lock) {
-		if (gpd_mgr->mgr.refs == 0) {
-			request = GDPWR_POWER_REQUEST_CLEAR;
-		} else {
-			request = GDPWR_POWER_REQUEST_SET;
-		}
-	}
-
-	atomic_clear_bit(&gpd_service_status, GPD_SERVICE_REQ_ERR);
-	atomic_clear_bit(&gpd_service_status, GPD_SERVICE_REQ_OK);
-
-	err = nrfs_gdpwr_power_request(gpd_mgr->id, request, gpd_mgr);
-	if (err != NRFS_SUCCESS) {
-		return -EIO;
-	}
-
-	start = k_uptime_get();
-	while (k_uptime_get() - start < GPD_READY_TIMEOUT_MS) {
-		if (atomic_test_bit(&gpd_service_status, GPD_SERVICE_REQ_ERR)) {
-			return -EIO;
-		}
-
-		if (atomic_test_bit(&gpd_service_status, GPD_SERVICE_REQ_OK)) {
-			return 0;
-		}
-	}
-
-	LOG_ERR("nRFs GDPWR request timed out");
-
-	return -ETIMEDOUT;
-}
-
-static void evt_handler(nrfs_gdpwr_evt_t const *p_evt, void *context)
-{
-	if (atomic_test_bit(&gpd_service_status, GPD_SERVICE_READY)) {
-		struct gpd_onoff_manager *gpd_mgr = context;
-
-		switch (p_evt->type) {
-		case NRFS_GDPWR_REQ_APPLIED:
-			gpd_mgr->notify(&gpd_mgr->mgr, 0);
-			break;
-		default:
-			LOG_ERR("nRFs GDPWR request not applied");
-			gpd_mgr->notify(&gpd_mgr->mgr, -EIO);
-			break;
-		}
-	} else {
-		switch (p_evt->type) {
-		case NRFS_GDPWR_REQ_APPLIED:
-			atomic_set_bit(&gpd_service_status, GPD_SERVICE_REQ_OK);
-			break;
-		default:
-			LOG_ERR("nRFs GDPWR request not applied");
-			atomic_set_bit(&gpd_service_status, GPD_SERVICE_REQ_ERR);
-			break;
-		}
-	}
-}
-
-static void start(struct onoff_manager *mgr, onoff_notify_fn notify)
-{
-	struct gpd_onoff_manager *gpd_mgr = CONTAINER_OF(mgr, struct gpd_onoff_manager, mgr);
-
-	gpd_mgr->notify = notify;
-
-	if (!atomic_test_bit(&gpd_service_status, GPD_SERVICE_READY)) {
-		notify(mgr, 0);
-	} else {
-		nrfs_err_t err;
-
-		err = nrfs_gdpwr_power_request(gpd_mgr->id, GDPWR_POWER_REQUEST_SET, gpd_mgr);
-		if (err != NRFS_SUCCESS) {
-			LOG_ERR("nRFs GDPWR request failed (%d)", err);
-			notify(mgr, -EIO);
-		}
-	}
-}
-
-static void stop(struct onoff_manager *mgr, onoff_notify_fn notify)
-{
-	struct gpd_onoff_manager *gpd_mgr = CONTAINER_OF(mgr, struct gpd_onoff_manager, mgr);
-
-	gpd_mgr->notify = notify;
-
-	if (!atomic_test_bit(&gpd_service_status, GPD_SERVICE_READY)) {
-		notify(mgr, 0);
-	} else {
-		nrfs_err_t err;
-
-		err = nrfs_gdpwr_power_request(gpd_mgr->id, GDPWR_POWER_REQUEST_CLEAR, gpd_mgr);
-		if (err != NRFS_SUCCESS) {
-			LOG_ERR("nRFs GDPWR request failed (%d)", err);
-			notify(mgr, -EIO);
-		}
-	}
-}
-
-int nrf_gpd_request(uint8_t id)
-{
-	int ret;
-	struct onoff_client client;
-	struct gpd_onoff_manager *gpd_mgr;
-
-	gpd_mgr = get_mgr(id);
-	if (gpd_mgr == NULL) {
-		return -EINVAL;
-	}
-
-	if (atomic_test_bit(&gpd_service_status, GPD_SERVICE_ERROR)) {
-		LOG_ERR("GPD service did not initialize properly");
-		return -EIO;
-	}
-
-	sys_notify_init_spinwait(&client.notify);
-
-	onoff_request(&gpd_mgr->mgr, &client);
-
-	while (sys_notify_fetch_result(&client.notify, &ret) == -EAGAIN) {
-	}
-
-	return ret;
-}
-
-int nrf_gpd_release(uint8_t id)
-{
-	struct gpd_onoff_manager *gpd_mgr;
-
-	gpd_mgr = get_mgr(id);
-	if (gpd_mgr == NULL) {
-		return -EINVAL;
-	}
-
-	if (atomic_test_bit(&gpd_service_status, GPD_SERVICE_ERROR)) {
-		LOG_ERR("GPD service did not initialize properly");
-		return -EIO;
-	}
-
-	return onoff_release(&gpd_mgr->mgr);
-}
-
-static int nrf_gpd_pre_init(void)
-{
-	int ret;
-
-	ret = onoff_manager_init(&fast_active1.mgr, &transitions);
-	if (ret < 0) {
-		return ret;
-	}
-
-	ret = onoff_manager_init(&slow_active.mgr, &transitions);
-	if (ret < 0) {
-		return ret;
-	}
-
-	ret = onoff_manager_init(&slow_main.mgr, &transitions);
-	if (ret < 0) {
-		return ret;
-	}
-
-	return 0;
-}
-
-static int nrf_gpd_post_init(void)
-{
-	nrfs_err_t err;
-	int ret;
-
-	err = nrfs_backend_wait_for_connection(K_FOREVER);
-	if (err != NRFS_SUCCESS) {
-		ret = -EIO;
-		goto err;
-	}
-
-	err = nrfs_gdpwr_init(evt_handler);
-	if (err != NRFS_SUCCESS) {
-		ret = -EIO;
-		goto err;
-	}
-
-	/* submit GD requests now to align collected statuses */
-	ret = nrf_gpd_sync(&fast_active1);
-	if (ret < 0) {
-		goto err;
-	}
-
-	ret = nrf_gpd_sync(&slow_active);
-	if (ret < 0) {
-		goto err;
-	}
-
-	ret = nrf_gpd_sync(&slow_main);
-	if (ret < 0) {
-		goto err;
-	}
-
-	atomic_set_bit(&gpd_service_status, GPD_SERVICE_READY);
-
-	return 0;
-
-err:
-	atomic_set_bit(&gpd_service_status, GPD_SERVICE_ERROR);
-
-	return ret;
-}
-
-SYS_INIT(nrf_gpd_pre_init, PRE_KERNEL_1, 0);
-SYS_INIT(nrf_gpd_post_init, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY);
diff --git a/soc/nordic/nrf54h/gpd/include/nrf/gpd.h b/soc/nordic/nrf54h/gpd/include/nrf/gpd.h
deleted file mode 100644
index 0504f94e858..00000000000
--- a/soc/nordic/nrf54h/gpd/include/nrf/gpd.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_SOC_NORDIC_NRF54H_GPD_INCLUDE_NRF_GPD_H_
-#define ZEPHYR_SOC_NORDIC_NRF54H_GPD_INCLUDE_NRF_GPD_H_
-
-#include <stdint.h>
-
-#include <zephyr/dt-bindings/power/nordic-nrf-gpd.h>
-
-/**
- * @brief Request a global power domain.
- *
- * @param id Domain ID.
- *
- * @retval 0 If the request was successful.
- * @retval -errno If the request was not successful.
- */
-int nrf_gpd_request(uint8_t id);
-
-/**
- * @brief Release a global power domain.
- *
- * @param id Domain ID.
- *
- * @retval 0 If the request was successful.
- * @retval -errno If the request was not successful.
- */
-int nrf_gpd_release(uint8_t id);
-
-#endif /* ZEPHYR_SOC_NORDIC_NRF54H_GPD_INCLUDE_NRF_GPD_H_ */

From a55bb27249dad6b0fb8c4321d305ac67f7e1ccee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:32 +0100
Subject: [PATCH 1498/2913] Revert "[nrf fromtree] drivers: pinctrl: nrf: add
 flag to signal the FAST_ACTIVE1 peripherals"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d805bf3c313164784466d655db396331c4109cdd.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/pinctrl/pinctrl_nrf.c                 | 32 -------------------
 .../zephyr/dt-bindings/pinctrl/nrf-pinctrl.h  | 12 ++-----
 soc/nordic/common/pinctrl_soc.h               | 22 +------------
 3 files changed, 4 insertions(+), 62 deletions(-)

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 1e80de8fe67..7c6d83020bf 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -7,9 +7,6 @@
 #include <zephyr/drivers/pinctrl.h>
 
 #include <hal/nrf_gpio.h>
-#ifdef CONFIG_SOC_NRF54H20_GPD
-#include <nrf/gpd.h>
-#endif
 
 BUILD_ASSERT(((NRF_PULL_NONE == NRF_GPIO_PIN_NOPULL) &&
 	      (NRF_PULL_DOWN == NRF_GPIO_PIN_PULLDOWN) &&
@@ -355,21 +352,6 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 		if (psel != PSEL_DISCONNECTED) {
 			uint32_t pin = psel;
 
-#ifdef CONFIG_SOC_NRF54H20_GPD
-			if (NRF_GET_GPD_FAST_ACTIVE1(pins[i]) == 1U) {
-				int ret;
-				uint32_t d_pin = pin;
-				NRF_GPIO_Type *port = nrf_gpio_pin_port_decode(&d_pin);
-
-				ret = nrf_gpd_request(NRF_GPD_SLOW_ACTIVE);
-				if (ret < 0) {
-					return ret;
-				}
-
-				port->RETAINCLR = BIT(d_pin);
-			}
-#endif /* CONFIG_SOC_NRF54H20_GPD */
-
 			if (write != NO_WRITE) {
 				nrf_gpio_pin_write(pin, write);
 			}
@@ -385,20 +367,6 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 #if NRF_GPIO_HAS_CLOCKPIN
 			nrf_gpio_pin_clock_set(pin, NRF_GET_CLOCKPIN_ENABLE(pins[i]));
 #endif
-#ifdef CONFIG_SOC_NRF54H20_GPD
-			if (NRF_GET_GPD_FAST_ACTIVE1(pins[i]) == 1U) {
-				int ret;
-				uint32_t d_pin = pin;
-				NRF_GPIO_Type *port = nrf_gpio_pin_port_decode(&d_pin);
-
-				port->RETAINSET = BIT(d_pin);
-
-				ret = nrf_gpd_release(NRF_GPD_SLOW_ACTIVE);
-				if (ret < 0) {
-					return ret;
-				}
-			}
-#endif /* CONFIG_SOC_NRF54H20_GPD */
 		}
 	}
 
diff --git a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
index 4611baef95c..7afa6783814 100644
--- a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
@@ -10,9 +10,7 @@
  * The whole nRF pin configuration information is encoded in a 32-bit bitfield
  * organized as follows:
  *
- * - 31..24: Pin function.
- * - 19-23:  Reserved.
- * - 18:     Associated peripheral belongs to GD FAST ACTIVE1 (nRF54H only)
+ * - 31..18: Pin function.
  * - 17:     Clockpin enable.
  * - 16:     Pin inversion mode.
  * - 15:     Pin low power mode.
@@ -27,13 +25,9 @@
  */
 
 /** Position of the function field. */
-#define NRF_FUN_POS 24U
+#define NRF_FUN_POS 18U
 /** Mask for the function field. */
-#define NRF_FUN_MSK 0xFFU
-/** Position of the GPD FAST ACTIVE1 */
-#define NRF_GPD_FAST_ACTIVE1_POS 18U
-/** Mask for the GPD FAST ACTIVE1 */
-#define NRF_GPD_FAST_ACTIVE1_MSK 0x1U
+#define NRF_FUN_MSK 0x3FFFU
 /** Position of the clockpin enable field. */
 #define NRF_CLOCKPIN_ENABLE_POS 17U
 /** Mask for the clockpin enable field. */
diff --git a/soc/nordic/common/pinctrl_soc.h b/soc/nordic/common/pinctrl_soc.h
index f1d3b6357f9..ea0f0196e2b 100644
--- a/soc/nordic/common/pinctrl_soc.h
+++ b/soc/nordic/common/pinctrl_soc.h
@@ -14,7 +14,6 @@
 
 #include <zephyr/devicetree.h>
 #include <zephyr/dt-bindings/pinctrl/nrf-pinctrl.h>
-#include <zephyr/dt-bindings/power/nordic-nrf-gpd.h>
 #include <zephyr/types.h>
 
 #ifdef __cplusplus
@@ -56,16 +55,6 @@ typedef uint32_t pinctrl_soc_pin_t;
 			(), NRF_GET_FUN(DT_PROP_BY_IDX(node_id, prop, idx)))        \
 		      0)), (0))
 
-/**
- * @brief Utility macro to get the GPD_FAST_ACTIVE1 flag
- *
- * @param p_node_id Parent node identifier.
- */
-#define Z_GET_GPD_FAST_ACTIVE1(p_node_id)				       \
-	COND_CODE_1(DT_NODE_HAS_PROP(p_node_id, power_domains),		       \
-		    ((DT_PHA(p_node_id, power_domains, id) ==		       \
-		      NRF_GPD_FAST_ACTIVE1) << NRF_GPD_FAST_ACTIVE1_POS), (0))
-
 /**
  * @brief Utility macro to initialize each pin.
  *
@@ -81,8 +70,7 @@ typedef uint32_t pinctrl_soc_pin_t;
 	 (DT_PROP(node_id, nordic_drive_mode) << NRF_DRIVE_POS) |	       \
 	 ((NRF_LP_ENABLE * DT_PROP(node_id, low_power_enable)) << NRF_LP_POS) |\
 	 (DT_PROP(node_id, nordic_invert) << NRF_INVERT_POS) |		       \
-	 Z_GET_CLOCKPIN_ENABLE(node_id, prop, idx, p_node_id) |		       \
-	 Z_GET_GPD_FAST_ACTIVE1(p_node_id)				       \
+	 Z_GET_CLOCKPIN_ENABLE(node_id, prop, idx, p_node_id)		       \
 	),
 
 /**
@@ -111,14 +99,6 @@ typedef uint32_t pinctrl_soc_pin_t;
 #define NRF_GET_CLOCKPIN_ENABLE(pincfg) \
 	(((pincfg) >> NRF_CLOCKPIN_ENABLE_POS) & NRF_CLOCKPIN_ENABLE_MSK)
 
-/**
- * @brief Utility macro to obtain GPD_FAST_ACTIVE1 flag
- *
- * @param pincfg Pin configuration bit field.
- */
-#define NRF_GET_GPD_FAST_ACTIVE1(pincfg) \
-	(((pincfg) >> NRF_GPD_FAST_ACTIVE1_POS) & NRF_GPD_FAST_ACTIVE1_MSK)
-
 /**
  * @brief Utility macro to obtain pin inversion flag.
  *

From 08d0c558da85788f0f16cab9fa691f1a31eea7d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:32 +0100
Subject: [PATCH 1499/2913] Revert "[nrf fromtree] dts: nordic: nrf54h20: add
 power domain information"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0c4b34257f0ee3d2f49e3b0bbfa66df93ea93916.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/common/nordic/nrf54h20.dtsi | 84 ---------------------------------
 1 file changed, 84 deletions(-)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 5d5b4ba7434..b0992e66cd9 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -13,7 +13,6 @@
 #include <zephyr/dt-bindings/misc/nordic-owner-id-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-tddconf.h>
 #include <zephyr/dt-bindings/reserved-memory/nordic-owned-memory.h>
-#include <zephyr/dt-bindings/power/nordic-nrf-gpd.h>
 
 /delete-node/ &sw_pwm;
 
@@ -207,7 +206,6 @@
 		mram1x: mram@e000000 {
 			compatible = "nordic,mram";
 			reg = <0xe000000 DT_SIZE_K(2048)>;
-			power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 			erase-block-size = <4096>;
 			write-block-size = <16>;
 		};
@@ -492,7 +490,6 @@
 				reg = <0x86000 0x1000>, <0x2f700000 0x40000>;
 				reg-names = "wrapper", "core";
 				interrupts = <134 NRF_DEFAULT_IRQ_PRIORITY>;
-				power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 				num-in-eps = <8>;
 				num-out-eps = <10>;
 				ghwcfg1 = <0xaa555000>;
@@ -508,7 +505,6 @@
 				reg = <0x95000 0x500 0x95500 0xb00>;
 				reg-names = "wrapper", "core";
 				interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>;
-				power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 				clock-frequency = <DT_FREQ_M(400)>;
 				fifo-depth = <32>;
 				max-xfer-size = <16>;
@@ -518,21 +514,18 @@
 			cpusec_bellboard: mailbox@99000 {
 				reg = <0x99000 0x1000>;
 				status = "disabled";
-				power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 				#mbox-cells = <1>;
 			};
 
 			cpuapp_bellboard: mailbox@9a000 {
 				reg = <0x9a000 0x1000>;
 				status = "disabled";
-				power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 				#mbox-cells = <1>;
 			};
 
 			cpurad_bellboard: mailbox@9b000 {
 				reg = <0x9b000 0x1000>;
 				status = "disabled";
-				power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 				#mbox-cells = <1>;
 			};
 
@@ -573,7 +566,6 @@
 				compatible = "nordic,nrf-vpr-coprocessor";
 				reg = <0x8d4000 0x1000>;
 				status = "disabled";
-				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				ranges = <0x0 0x8d4000 0x1000>;
@@ -594,7 +586,6 @@
 				reg-names = "wrapper", "m_can", "message_ram";
 				interrupts = <216 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&canpll>;
-				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				bosch,mram-cfg = <0x0 28 8 3 3 0 1 1>;
 				status = "disabled";
 			};
@@ -603,7 +594,6 @@
 				compatible = "nordic,nrf-dppic-global";
 				reg = <0x8e1000 0x1000>;
 				status = "disabled";
-				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 			};
 
 			timer120: timer@8e2000 {
@@ -612,7 +602,6 @@
 				status = "disabled";
 				cc-num = <6>;
 				interrupts = <226 NRF_DEFAULT_IRQ_PRIORITY>;
-				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				max-bit-width = <32>;
 				max-frequency = <DT_FREQ_M(320)>;
 				prescaler = <0>;
@@ -624,7 +613,6 @@
 				status = "disabled";
 				cc-num = <6>;
 				interrupts = <227 NRF_DEFAULT_IRQ_PRIORITY>;
-				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				max-bit-width = <32>;
 				max-frequency = <DT_FREQ_M(320)>;
 				prescaler = <0>;
@@ -635,7 +623,6 @@
 				reg = <0x8e4000 0x1000>;
 				status = "disabled";
 				interrupts = <228 NRF_DEFAULT_IRQ_PRIORITY>;
-				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				#pwm-cells = <3>;
 			};
 
@@ -643,7 +630,6 @@
 				compatible = "nordic,nrf-spim";
 				reg = <0x8e6000 0x1000>;
 				status = "disabled";
-				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				easydma-maxcnt-bits = <15>;
 				interrupts = <230 NRF_DEFAULT_IRQ_PRIORITY>;
 				max-frequency = <DT_FREQ_M(32)>;
@@ -661,7 +647,6 @@
 				status = "disabled";
 				interrupts = <230 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&hsfll120>;
-				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;
 			};
@@ -672,7 +657,6 @@
 				status = "disabled";
 				easydma-maxcnt-bits = <15>;
 				interrupts = <231 NRF_DEFAULT_IRQ_PRIORITY>;
-				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				max-frequency = <DT_FREQ_M(32)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -689,7 +673,6 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 				ranges = <0x0 0x908000 0x1000>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 
 				cpuppr_vevif_tx: mailbox@0 {
 					compatible = "nordic,nrf-vevif-task-tx";
@@ -705,7 +688,6 @@
 				compatible = "nordic,nrf-ipct-global";
 				reg = <0x921000 0x1000>;
 				status = "disabled";
-				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 				channels = <8>;
 				global-domain-id = <13>;
 			};
@@ -714,7 +696,6 @@
 				compatible = "nordic,nrf-dppic-global";
 				reg = <0x922000 0x1000>;
 				status = "disabled";
-				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 			};
 
 			rtc130: rtc@928000 {
@@ -724,7 +705,6 @@
 				cc-num = <4>;
 				clock-frequency = <32768>;
 				interrupts = <296 NRF_DEFAULT_IRQ_PRIORITY>;
-				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 				clocks = <&lfclk>;
 				prescaler = <1>;
 			};
@@ -736,7 +716,6 @@
 				cc-num = <4>;
 				clock-frequency = <32768>;
 				interrupts = <297 NRF_DEFAULT_IRQ_PRIORITY>;
-				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 				clocks = <&lfclk>;
 				prescaler = <1>;
 			};
@@ -747,7 +726,6 @@
 				status = "disabled";
 				interrupts = <299 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&lfclk>;
-				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 			};
 
 			wdt132: watchdog@92c000 {
@@ -756,7 +734,6 @@
 				status = "disabled";
 				interrupts = <300 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&lfclk>;
-				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 			};
 
 			egu130: egu@92d000 {
@@ -764,14 +741,12 @@
 				reg = <0x92d000 0x1000>;
 				status = "disabled";
 				interrupts = <301 NRF_DEFAULT_IRQ_PRIORITY>;
-				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 			};
 
 			gpiote130: gpiote@934000 {
 				compatible = "nordic,nrf-gpiote";
 				reg = <0x934000 0x1000>;
 				status = "disabled";
-				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 				instance = <130>;
 			};
 
@@ -781,7 +756,6 @@
 				status = "disabled";
 				#gpio-cells = <2>;
 				gpio-controller;
-				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 				gpiote-instance = <&gpiote130>;
 				ngpios = <12>;
 				port = <0>;
@@ -793,7 +767,6 @@
 				status = "disabled";
 				#gpio-cells = <2>;
 				gpio-controller;
-				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 				gpiote-instance = <&gpiote130>;
 				ngpios = <12>;
 				port = <1>;
@@ -805,7 +778,6 @@
 				status = "disabled";
 				#gpio-cells = <2>;
 				gpio-controller;
-				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 				gpiote-instance = <&gpiote130>;
 				ngpios = <12>;
 				port = <2>;
@@ -817,9 +789,6 @@
 				status = "disabled";
 				#gpio-cells = <2>;
 				gpio-controller;
-				power-domains = <&gpd NRF_GPD_SLOW_MAIN>,
-						<&gpd NRF_GPD_FAST_ACTIVE1>;
-				power-domain-names = "peripheral", "pad";
 				ngpios = <14>;
 				port = <6>;
 			};
@@ -830,9 +799,6 @@
 				status = "disabled";
 				#gpio-cells = <2>;
 				gpio-controller;
-				power-domains = <&gpd NRF_GPD_SLOW_MAIN>,
-						<&gpd NRF_GPD_FAST_ACTIVE1>;
-				power-domain-names = "peripheral", "pad";
 				ngpios = <8>;
 				port = <7>;
 			};
@@ -843,7 +809,6 @@
 				status = "disabled";
 				#gpio-cells = <2>;
 				gpio-controller;
-				power-domains = <&gpd NRF_GPD_SLOW_MAIN>;
 				gpiote-instance = <&gpiote130>;
 				ngpios = <6>;
 				port = <9>;
@@ -853,7 +818,6 @@
 				compatible = "nordic,nrf-dppic-global";
 				reg = <0x981000 0x1000>;
 				status = "disabled";
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			adc: adc@982000 {
@@ -862,7 +826,6 @@
 				interrupts = <386 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				#io-channel-cells = <1>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			comp: comparator@983000 {
@@ -874,7 +837,6 @@
 				reg = <0x983000 0x1000>;
 				status = "disabled";
 				interrupts = <387 NRF_DEFAULT_IRQ_PRIORITY>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			temp: temperature-sensor@984000 {
@@ -882,7 +844,6 @@
 				reg = <0x984000 0x1000>;
 				interrupts = <388 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			nfct: nfct@985000 {
@@ -890,14 +851,12 @@
 				reg = <0x985000 0x1000>;
 				status = "disabled";
 				interrupts = <389 NRF_DEFAULT_IRQ_PRIORITY>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			dppic132: dppic@991000 {
 				compatible = "nordic,nrf-dppic-global";
 				reg = <0x991000 0x1000>;
 				status = "disabled";
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			qdec130: qdec@994000 {
@@ -905,7 +864,6 @@
 				reg = <0x994000 0x1000>;
 				status = "disabled";
 				interrupts = <404 NRF_DEFAULT_IRQ_PRIORITY>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			qdec131: qdec@995000 {
@@ -913,7 +871,6 @@
 				reg = <0x995000 0x1000>;
 				status = "disabled";
 				interrupts = <405 NRF_DEFAULT_IRQ_PRIORITY>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			grtc: grtc@99c000 {
@@ -926,14 +883,12 @@
 				 *  one is linked here.
 				 */
 				clocks = <&lfclk>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			dppic133: dppic@9a1000 {
 				compatible = "nordic,nrf-dppic-global";
 				reg = <0x9a1000 0x1000>;
 				status = "disabled";
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			timer130: timer@9a2000 {
@@ -943,7 +898,6 @@
 				cc-num = <6>;
 				interrupts = <418 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-bit-width = <32>;
 				prescaler = <0>;
 			};
@@ -955,7 +909,6 @@
 				cc-num = <6>;
 				interrupts = <419 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-bit-width = <32>;
 				prescaler = <0>;
 			};
@@ -966,7 +919,6 @@
 				status = "disabled";
 				interrupts = <420 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				#pwm-cells = <3>;
 			};
 
@@ -976,7 +928,6 @@
 				status = "disabled";
 				interrupts = <421 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				easydma-maxcnt-bits = <15>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -991,7 +942,6 @@
 				easydma-maxcnt-bits = <15>;
 				interrupts = <421 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-frequency = <DT_FREQ_M(8)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1009,7 +959,6 @@
 				status = "disabled";
 				interrupts = <421 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;
@@ -1021,7 +970,6 @@
 				status = "disabled";
 				interrupts = <422 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				easydma-maxcnt-bits = <15>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1036,7 +984,6 @@
 				easydma-maxcnt-bits = <15>;
 				interrupts = <422 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-frequency = <DT_FREQ_M(8)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1054,7 +1001,6 @@
 				status = "disabled";
 				interrupts = <422 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;
@@ -1064,7 +1010,6 @@
 				compatible = "nordic,nrf-dppic-global";
 				reg = <0x9b1000 0x1000>;
 				status = "disabled";
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			timer132: timer@9b2000 {
@@ -1074,7 +1019,6 @@
 				cc-num = <6>;
 				interrupts = <434 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-bit-width = <32>;
 				prescaler = <0>;
 			};
@@ -1086,7 +1030,6 @@
 				cc-num = <6>;
 				interrupts = <435 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-bit-width = <32>;
 				prescaler = <0>;
 			};
@@ -1097,7 +1040,6 @@
 				status = "disabled";
 				interrupts = <436 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				#pwm-cells = <3>;
 			};
 
@@ -1107,7 +1049,6 @@
 				status = "disabled";
 				interrupts = <437 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				easydma-maxcnt-bits = <15>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1122,7 +1063,6 @@
 				easydma-maxcnt-bits = <15>;
 				interrupts = <437 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-frequency = <DT_FREQ_M(8)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1140,7 +1080,6 @@
 				status = "disabled";
 				interrupts = <437 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;
@@ -1152,7 +1091,6 @@
 				status = "disabled";
 				interrupts = <438 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				easydma-maxcnt-bits = <15>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1167,7 +1105,6 @@
 				easydma-maxcnt-bits = <15>;
 				interrupts = <438 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-frequency = <DT_FREQ_M(8)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1185,7 +1122,6 @@
 				status = "disabled";
 				interrupts = <438 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;
@@ -1195,7 +1131,6 @@
 				compatible = "nordic,nrf-dppic-global";
 				reg = <0x9c1000 0x1000>;
 				status = "disabled";
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			timer134: timer@9c2000 {
@@ -1205,7 +1140,6 @@
 				cc-num = <6>;
 				interrupts = <450 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-bit-width = <32>;
 				prescaler = <0>;
 			};
@@ -1217,7 +1151,6 @@
 				cc-num = <6>;
 				interrupts = <451 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-bit-width = <32>;
 				prescaler = <0>;
 			};
@@ -1229,7 +1162,6 @@
 				interrupts = <452 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
 				#pwm-cells = <3>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			i2c134: i2c@9c5000 {
@@ -1238,7 +1170,6 @@
 				status = "disabled";
 				interrupts = <453 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				easydma-maxcnt-bits = <15>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1253,7 +1184,6 @@
 				easydma-maxcnt-bits = <15>;
 				interrupts = <453 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-frequency = <DT_FREQ_M(8)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1271,7 +1201,6 @@
 				status = "disabled";
 				interrupts = <453 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;
@@ -1283,7 +1212,6 @@
 				status = "disabled";
 				interrupts = <454 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				easydma-maxcnt-bits = <15>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1298,7 +1226,6 @@
 				easydma-maxcnt-bits = <15>;
 				interrupts = <454 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-frequency = <DT_FREQ_M(8)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1316,7 +1243,6 @@
 				status = "disabled";
 				interrupts = <454 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;
@@ -1326,7 +1252,6 @@
 				compatible = "nordic,nrf-dppic-global";
 				reg = <0x9d1000 0x1000>;
 				status = "disabled";
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			timer136: timer@9d2000 {
@@ -1336,7 +1261,6 @@
 				cc-num = <6>;
 				interrupts = <466 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-bit-width = <32>;
 				prescaler = <0>;
 			};
@@ -1348,7 +1272,6 @@
 				cc-num = <6>;
 				interrupts = <467 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-bit-width = <32>;
 				prescaler = <0>;
 			};
@@ -1360,7 +1283,6 @@
 				interrupts = <468 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
 				#pwm-cells = <3>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
 			i2c136: i2c@9d5000 {
@@ -1369,7 +1291,6 @@
 				status = "disabled";
 				interrupts = <469 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				easydma-maxcnt-bits = <15>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1384,7 +1305,6 @@
 				easydma-maxcnt-bits = <15>;
 				interrupts = <469 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-frequency = <DT_FREQ_M(8)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1402,7 +1322,6 @@
 				status = "disabled";
 				interrupts = <469 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;
@@ -1414,7 +1333,6 @@
 				status = "disabled";
 				interrupts = <470 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				easydma-maxcnt-bits = <15>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1429,7 +1347,6 @@
 				easydma-maxcnt-bits = <15>;
 				interrupts = <470 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				max-frequency = <DT_FREQ_M(8)>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1447,7 +1364,6 @@
 				status = "disabled";
 				interrupts = <470 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;

From 77b1b95c2dcf6d21c1cb8dfe88ab60b99bfe2c55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:32 +0100
Subject: [PATCH 1500/2913] Revert "[nrf fromtree] dts: nordic: nrf54h20:
 define global power domain"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit dd1dd4918e1b0f1b250efd535e5cb5456f218931.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/common/nordic/nrf54h20.dtsi | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index b0992e66cd9..a4b8f0d5530 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -194,11 +194,6 @@
 		};
 	};
 
-	gpd: global-power-domain {
-		compatible = "nordic,nrf-gpd";
-		#power-domain-cells = <1>;
-	};
-
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;

From 1cca08c316f99460fec444834562b41717974163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:33 +0100
Subject: [PATCH 1501/2913] Revert "[nrf fromtree] dts: bindings: power: add
 nordic,nrf-global-pd"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7b74e8a87d1123c718c30509aa7809a0cdd460b3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/bindings/power/nordic,nrf-gpd.yaml          | 11 -----------
 .../zephyr/dt-bindings/power/nordic-nrf-gpd.h   | 17 -----------------
 2 files changed, 28 deletions(-)
 delete mode 100644 dts/bindings/power/nordic,nrf-gpd.yaml
 delete mode 100644 include/zephyr/dt-bindings/power/nordic-nrf-gpd.h

diff --git a/dts/bindings/power/nordic,nrf-gpd.yaml b/dts/bindings/power/nordic,nrf-gpd.yaml
deleted file mode 100644
index feb5f2862e9..00000000000
--- a/dts/bindings/power/nordic,nrf-gpd.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: Nordic nRF Global Power Domain
-
-compatible: "nordic,nrf-gpd"
-
-include: base.yaml
-
-power-domain-cells:
-  - id
diff --git a/include/zephyr/dt-bindings/power/nordic-nrf-gpd.h b/include/zephyr/dt-bindings/power/nordic-nrf-gpd.h
deleted file mode 100644
index 7f6952f6f0b..00000000000
--- a/include/zephyr/dt-bindings/power/nordic-nrf-gpd.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_POWER_NORDIC_NRF_GLOBAL_PD
-#define ZEPHYR_INCLUDE_DT_BINDINGS_POWER_NORDIC_NRF_GLOBAL_PD
-
-/* numbers aligned to nrfs service identifiers */
-#define NRF_GPD_SLOW_MAIN 2U
-#define NRF_GPD_SLOW_ACTIVE 1U
-#define NRF_GPD_FAST_MAIN 3U
-#define NRF_GPD_FAST_ACTIVE1 0U
-#define NRF_GPD_FAST_ACTIVE0 4U
-
-#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_POWER_NORDIC_NRF_GLOBAL_PD */

From 7e1109f7c0ffbedbdace8d336a51b92b0448f103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:33 +0100
Subject: [PATCH 1502/2913] Revert "[nrf fromtree] pm:
 s/power-domain/power-domains and add power-domain-names"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7a696b4ba7abe8deca2f71b0c5a010ca7bb8fdc3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/services/pm/device_runtime.rst            |  2 +-
 doc/services/pm/power_domain.rst              |  4 +--
 dts/bindings/base/base.yaml                   | 12 -------
 dts/bindings/base/pm.yaml                     |  9 +++++
 .../power-domain/intel,adsp-power-domain.yaml |  3 --
 dts/bindings/power-domain/nxp,scu-pd.yaml     |  3 --
 .../power-domain-gpio-monitor.yaml            |  3 --
 .../power-domain/power-domain-gpio.yaml       |  3 --
 dts/bindings/power-domain/power-domain.yaml   |  4 ---
 dts/xtensa/intel/intel_adsp_ace15_mtpm.dtsi   | 33 +++++++------------
 dts/xtensa/intel/intel_adsp_ace20_lnl.dtsi    | 12 ++-----
 dts/xtensa/intel/intel_adsp_ace30.dtsi        | 24 +++++---------
 dts/xtensa/intel/intel_adsp_ace30_ptl.dtsi    | 24 +++++---------
 dts/xtensa/nxp/nxp_imx8.dtsi                  |  3 +-
 include/zephyr/pm/device.h                    |  2 +-
 .../build_all/power_domain/app.overlay        |  2 --
 tests/kernel/device/app.overlay               |  7 ++--
 .../device/boards/hifive_unmatched.overlay    |  4 +--
 .../subsys/pm/device_driver_init/app.overlay  | 15 +++------
 .../pm/device_power_domains/app.overlay       |  7 ++--
 tests/subsys/pm/power_domain/app.overlay      |  8 ++---
 21 files changed, 60 insertions(+), 124 deletions(-)

diff --git a/doc/services/pm/device_runtime.rst b/doc/services/pm/device_runtime.rst
index 350874009b9..c6173ef66f1 100644
--- a/doc/services/pm/device_runtime.rst
+++ b/doc/services/pm/device_runtime.rst
@@ -26,7 +26,7 @@ asynchronously, it will be put into the
 :c:enumerator:`PM_DEVICE_STATE_SUSPENDING` state first and then into the
 :c:enumerator:`PM_DEVICE_STATE_SUSPENDED` state when the action is run.
 
-For devices on a power domain (via the devicetree 'power-domains' property), device runtime
+For devices on a power domain (via the devicetree 'power-domain' property), device runtime
 power management automatically attempts to request and release the dependent domain
 in response to :c:func:`pm_device_runtime_get` and :c:func:`pm_device_runtime_put`
 calls on the child device.
diff --git a/doc/services/pm/power_domain.rst b/doc/services/pm/power_domain.rst
index bdab54a54e7..faa677b796a 100644
--- a/doc/services/pm/power_domain.rst
+++ b/doc/services/pm/power_domain.rst
@@ -131,13 +131,13 @@ Devices belonging to this device can be declared referring it in the
         &gpio0 {
                 compatible = "zephyr,gpio-emul";
                 gpio-controller;
-                power-domains = <&gpio_domain>;
+                power-domain = <&gpio_domain>;
         };
 
         &gpio1 {
                 compatible = "zephyr,gpio-emul";
                 gpio-controller;
-                power-domains = <&gpio_domain>;
+                power-domain = <&gpio_domain>;
         };
 
 All devices under a domain will be notified when the domain changes
diff --git a/dts/bindings/base/base.yaml b/dts/bindings/base/base.yaml
index 676292a296a..b2e670fb5d8 100644
--- a/dts/bindings/base/base.yaml
+++ b/dts/bindings/base/base.yaml
@@ -93,18 +93,6 @@ properties:
     type: string-array
     description: Provided names of mailbox / IPM channel specifiers
 
-  power-domains:
-    type: phandle-array
-    description: Power domain specifiers
-
-  power-domain-names:
-    type: string-array
-    description: Provided names of power domain specifiers
-
-  "#power-domain-cells":
-    type: int
-    description: Number of cells in power-domains property
-
   zephyr,deferred-init:
     type: boolean
     description: |
diff --git a/dts/bindings/base/pm.yaml b/dts/bindings/base/pm.yaml
index 6c0ffb1f637..50c016d07bd 100644
--- a/dts/bindings/base/pm.yaml
+++ b/dts/bindings/base/pm.yaml
@@ -16,6 +16,15 @@ properties:
       Wake up capable devices are disabled (interruptions will not wake up
       the system) by default but they can be enabled at runtime if necessary.
 
+  power-domain:
+    type: phandle
+    description: |
+
+      Power domain the device belongs to.
+
+      The device will be notified when the power domain it belongs to is either
+      suspended or resumed.
+
   zephyr,pm-device-runtime-auto:
     type: boolean
     description: |
diff --git a/dts/bindings/power-domain/intel,adsp-power-domain.yaml b/dts/bindings/power-domain/intel,adsp-power-domain.yaml
index 08533f9ea4c..70bf2a2c1ba 100644
--- a/dts/bindings/power-domain/intel,adsp-power-domain.yaml
+++ b/dts/bindings/power-domain/intel,adsp-power-domain.yaml
@@ -17,6 +17,3 @@ properties:
       read_address (PWRSTS) to set power active or confirm power active
       for a desired domain.
       Same for write and read addresses
-
-  "#power-domain-cells":
-    const: 0
diff --git a/dts/bindings/power-domain/nxp,scu-pd.yaml b/dts/bindings/power-domain/nxp,scu-pd.yaml
index 30f7b2e6474..7e1d0855389 100644
--- a/dts/bindings/power-domain/nxp,scu-pd.yaml
+++ b/dts/bindings/power-domain/nxp,scu-pd.yaml
@@ -15,6 +15,3 @@ properties:
       Number used by the firmware running on the SCU to identify
       the resource on which the PD-related operations are to be
       performed.
-
-  "#power-domain-cells":
-    const: 0
diff --git a/dts/bindings/power-domain/power-domain-gpio-monitor.yaml b/dts/bindings/power-domain/power-domain-gpio-monitor.yaml
index 45cee1387be..734aab8e6f7 100644
--- a/dts/bindings/power-domain/power-domain-gpio-monitor.yaml
+++ b/dts/bindings/power-domain/power-domain-gpio-monitor.yaml
@@ -20,6 +20,3 @@ properties:
     required: true
     description: |
       GPIO to use to sense if rail is powered on.
-
-  "#power-domain-cells":
-    const: 0
diff --git a/dts/bindings/power-domain/power-domain-gpio.yaml b/dts/bindings/power-domain/power-domain-gpio.yaml
index bba4c8602fe..1ece08fb5e3 100644
--- a/dts/bindings/power-domain/power-domain-gpio.yaml
+++ b/dts/bindings/power-domain/power-domain-gpio.yaml
@@ -28,6 +28,3 @@ properties:
     type: int
     default: 0
     description: Off delay time, in microseconds
-
-  "#power-domain-cells":
-    const: 0
diff --git a/dts/bindings/power-domain/power-domain.yaml b/dts/bindings/power-domain/power-domain.yaml
index 1040f5c43b7..429667fbb2e 100644
--- a/dts/bindings/power-domain/power-domain.yaml
+++ b/dts/bindings/power-domain/power-domain.yaml
@@ -6,7 +6,3 @@ description: Properties for power domains
 compatible: "power-domain"
 
 include: base.yaml
-
-properties:
-  "#power-domain-cells":
-    const: 0
diff --git a/dts/xtensa/intel/intel_adsp_ace15_mtpm.dtsi b/dts/xtensa/intel/intel_adsp_ace15_mtpm.dtsi
index 3500e51f761..7c2050b109f 100644
--- a/dts/xtensa/intel/intel_adsp_ace15_mtpm.dtsi
+++ b/dts/xtensa/intel/intel_adsp_ace15_mtpm.dtsi
@@ -150,7 +150,7 @@
 			fifo = <0x0008>;
 			interrupts = <0x08 0 0>;
 			interrupt-parent = <&ace_intc>;
-			power-domains = <&hub_ulp_domain>;
+			power-domain = <&hub_ulp_domain>;
 		};
 
 		dmic1: dmic1@10000 {
@@ -160,7 +160,7 @@
 			fifo = <0x0108>;
 			interrupts = <0x09 0 0>;
 			interrupt-parent = <&ace_intc>;
-			power-domains = <&hub_ulp_domain>;
+			power-domain = <&hub_ulp_domain>;
 		};
 
 		/*
@@ -285,7 +285,7 @@
 			dmas = <&lpgpdma0 2
 					&lpgpdma0 3>;
 			dma-names = "tx", "rx";
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			ssp-index = <0>;
 			status = "okay";
 
@@ -307,7 +307,7 @@
 			dmas = <&lpgpdma0 4
 					&lpgpdma0 5>;
 			dma-names = "tx", "rx";
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			ssp-index = <1>;
 			status = "okay";
 
@@ -329,7 +329,7 @@
 			dmas = <&lpgpdma0 6
 					&lpgpdma0 7>;
 			dma-names = "tx", "rx";
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			ssp-index = <2>;
 			status = "okay";
 
@@ -387,47 +387,38 @@
 			hub_ulp_domain: hub_ulp_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <15>;
-				#power-domain-cells = <0>;
 			};
 			ml1_domain: ml1_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <13>;
-				#power-domain-cells = <0>;
 			};
 			ml0_domain: ml0_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <12>;
-				#power-domain-cells = <0>;
 			};
 			io3_domain: io3_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <11>;
-				#power-domain-cells = <0>;
 			};
 			io2_domain: io2_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <10>;
-				#power-domain-cells = <0>;
 			};
 			io1_domain: io1_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <9>;
-				#power-domain-cells = <0>;
 			};
 			io0_domain: io0_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <8>;
-				#power-domain-cells = <0>;
 			};
 			hub_hp_domain: hub_hp_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <6>;
-				#power-domain-cells = <0>;
 			};
 			hst_domain: hst_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <4>;
-				#power-domain-cells = <0>;
 			};
 		};
 
@@ -473,7 +464,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <16>;
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			status = "okay";
 		};
 
@@ -485,7 +476,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <16>;
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			status = "okay";
 		};
 
@@ -497,7 +488,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <16>;
-			power-domains = <&hst_domain>;
+			power-domain = <&hst_domain>;
 			interrupts = <13 0 0>;
 			interrupt-parent = <&ace_intc>;
 			status = "okay";
@@ -511,7 +502,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <16>;
-			power-domains = <&hst_domain>;
+			power-domain = <&hst_domain>;
 			interrupts = <12 0 0>;
 			interrupt-parent = <&ace_intc>;
 			status = "okay";
@@ -550,7 +541,7 @@
 			dma-buf-size-alignment = <4>;
 			dma-copy-alignment = <4>;
 			status = "okay";
-			power-domains = <&hub_ulp_domain>;
+			power-domain = <&hub_ulp_domain>;
 			zephyr,pm-device-runtime-auto;
 		};
 
@@ -564,7 +555,7 @@
 			dma-buf-size-alignment = <4>;
 			dma-copy-alignment = <4>;
 			status = "okay";
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			zephyr,pm-device-runtime-auto;
 		};
 
@@ -577,7 +568,7 @@
 			interrupt-parent = <&core_intc>;
 			dma-buf-size-alignment = <4>;
 			dma-copy-alignment = <4>;
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			status = "okay";
 			zephyr,pm-device-runtime-auto;
 		};
diff --git a/dts/xtensa/intel/intel_adsp_ace20_lnl.dtsi b/dts/xtensa/intel/intel_adsp_ace20_lnl.dtsi
index 8dc4489d0ee..c26d2b815fe 100644
--- a/dts/xtensa/intel/intel_adsp_ace20_lnl.dtsi
+++ b/dts/xtensa/intel/intel_adsp_ace20_lnl.dtsi
@@ -215,7 +215,7 @@
 			dmas = <&hda_link_out 1
 				&hda_link_in 1>;
 			dma-names = "tx", "rx";
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			ssp-index = <0>;
 			status = "okay";
 
@@ -238,7 +238,7 @@
 			dmas = <&hda_link_out 2
 				&hda_link_in 2>;
 			dma-names = "tx", "rx";
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			ssp-index = <1>;
 			status = "okay";
 
@@ -261,7 +261,7 @@
 			dmas = <&hda_link_out 3
 				&hda_link_in 3>;
 			dma-names = "tx", "rx";
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			ssp-index = <2>;
 			status = "okay";
 
@@ -319,32 +319,26 @@
 			hub_ulp_domain: hub_ulp_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <15>;
-				#power-domain-cells = <0>;
 			};
 			ml0_domain: ml0_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <12>;
-				#power-domain-cells = <0>;
 			};
 			io1_domain: io1_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <9>;
-				#power-domain-cells = <0>;
 			};
 			io0_domain: io0_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <8>;
-				#power-domain-cells = <0>;
 			};
 			hub_hp_domain: hub_hp_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <6>;
-				#power-domain-cells = <0>;
 			};
 			hst_domain: hst_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <5>;
-				#power-domain-cells = <0>;
 			};
 		};
 
diff --git a/dts/xtensa/intel/intel_adsp_ace30.dtsi b/dts/xtensa/intel/intel_adsp_ace30.dtsi
index 26ae1c47f56..97be77eb757 100644
--- a/dts/xtensa/intel/intel_adsp_ace30.dtsi
+++ b/dts/xtensa/intel/intel_adsp_ace30.dtsi
@@ -169,7 +169,7 @@
 			fifo = <0x0008>;
 			interrupts = <0x08 0 0>;
 			interrupt-parent = <&ace_intc>;
-			power-domains = <&hub_ulp_domain>;
+			power-domain = <&hub_ulp_domain>;
 		};
 
 		dmic1: dai-dmic1@10100 {
@@ -179,7 +179,7 @@
 			fifo = <0x0108>;
 			interrupts = <0x08 0 0>;
 			interrupt-parent = <&ace_intc>;
-			power-domains = <&hub_ulp_domain>;
+			power-domain = <&hub_ulp_domain>;
 		};
 
 		dmicvss: dmicvss@16000 {
@@ -212,7 +212,7 @@
 				&hda_link_in 1>;
 			dma-names = "tx", "rx";
 			ssp-index = <0>;
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			status = "okay";
 
 			ssp00: ssp@0 {
@@ -277,7 +277,7 @@
 				&hda_link_in 2>;
 			dma-names = "tx", "rx";
 			ssp-index = <1>;
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			status = "okay";
 
 			ssp10: ssp@10 {
@@ -342,7 +342,7 @@
 				&hda_link_in 3>;
 			dma-names = "tx", "rx";
 			ssp-index = <2>;
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			status = "okay";
 
 			ssp20: ssp@20 {
@@ -441,32 +441,26 @@
 			hub_ulp_domain: hub_ulp_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <15>;
-				#power-domain-cells = <0>;
 			};
 			ml0_domain: ml0_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <12>;
-				#power-domain-cells = <0>;
 			};
 			io1_domain: io1_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <9>;
-				#power-domain-cells = <0>;
 			};
 			io0_domain: io0_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <8>;
-				#power-domain-cells = <0>;
 			};
 			hub_hp_domain: hub_hpp_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <6>;
-				#power-domain-cells = <0>;
 			};
 			hst_domain: hst_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <5>;
-				#power-domain-cells = <0>;
 			};
 		};
 
@@ -504,7 +498,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <32>;
-			power-domains = <&hst_domain>;
+			power-domain = <&hst_domain>;
 			interrupts = <13 0 0>;
 			interrupt-parent = <&ace_intc>;
 			status = "okay";
@@ -518,7 +512,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <32>;
-			power-domains = <&hst_domain>;
+			power-domain = <&hst_domain>;
 			interrupts = <12 0 0>;
 			interrupt-parent = <&ace_intc>;
 			status = "okay";
@@ -540,7 +534,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <32>;
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			status = "okay";
 		};
 
@@ -552,7 +546,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <32>;
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			status = "okay";
 		};
 
diff --git a/dts/xtensa/intel/intel_adsp_ace30_ptl.dtsi b/dts/xtensa/intel/intel_adsp_ace30_ptl.dtsi
index 26ae1c47f56..97be77eb757 100644
--- a/dts/xtensa/intel/intel_adsp_ace30_ptl.dtsi
+++ b/dts/xtensa/intel/intel_adsp_ace30_ptl.dtsi
@@ -169,7 +169,7 @@
 			fifo = <0x0008>;
 			interrupts = <0x08 0 0>;
 			interrupt-parent = <&ace_intc>;
-			power-domains = <&hub_ulp_domain>;
+			power-domain = <&hub_ulp_domain>;
 		};
 
 		dmic1: dai-dmic1@10100 {
@@ -179,7 +179,7 @@
 			fifo = <0x0108>;
 			interrupts = <0x08 0 0>;
 			interrupt-parent = <&ace_intc>;
-			power-domains = <&hub_ulp_domain>;
+			power-domain = <&hub_ulp_domain>;
 		};
 
 		dmicvss: dmicvss@16000 {
@@ -212,7 +212,7 @@
 				&hda_link_in 1>;
 			dma-names = "tx", "rx";
 			ssp-index = <0>;
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			status = "okay";
 
 			ssp00: ssp@0 {
@@ -277,7 +277,7 @@
 				&hda_link_in 2>;
 			dma-names = "tx", "rx";
 			ssp-index = <1>;
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			status = "okay";
 
 			ssp10: ssp@10 {
@@ -342,7 +342,7 @@
 				&hda_link_in 3>;
 			dma-names = "tx", "rx";
 			ssp-index = <2>;
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			status = "okay";
 
 			ssp20: ssp@20 {
@@ -441,32 +441,26 @@
 			hub_ulp_domain: hub_ulp_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <15>;
-				#power-domain-cells = <0>;
 			};
 			ml0_domain: ml0_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <12>;
-				#power-domain-cells = <0>;
 			};
 			io1_domain: io1_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <9>;
-				#power-domain-cells = <0>;
 			};
 			io0_domain: io0_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <8>;
-				#power-domain-cells = <0>;
 			};
 			hub_hp_domain: hub_hpp_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <6>;
-				#power-domain-cells = <0>;
 			};
 			hst_domain: hst_domain {
 				compatible = "intel,adsp-power-domain";
 				bit-position = <5>;
-				#power-domain-cells = <0>;
 			};
 		};
 
@@ -504,7 +498,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <32>;
-			power-domains = <&hst_domain>;
+			power-domain = <&hst_domain>;
 			interrupts = <13 0 0>;
 			interrupt-parent = <&ace_intc>;
 			status = "okay";
@@ -518,7 +512,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <32>;
-			power-domains = <&hst_domain>;
+			power-domain = <&hst_domain>;
 			interrupts = <12 0 0>;
 			interrupt-parent = <&ace_intc>;
 			status = "okay";
@@ -540,7 +534,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <32>;
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			status = "okay";
 		};
 
@@ -552,7 +546,7 @@
 			dma-buf-addr-alignment = <128>;
 			dma-buf-size-alignment = <32>;
 			dma-copy-alignment = <32>;
-			power-domains = <&io0_domain>;
+			power-domain = <&io0_domain>;
 			status = "okay";
 		};
 
diff --git a/dts/xtensa/nxp/nxp_imx8.dtsi b/dts/xtensa/nxp/nxp_imx8.dtsi
index 701f2a1dc39..21347b595fe 100644
--- a/dts/xtensa/nxp/nxp_imx8.dtsi
+++ b/dts/xtensa/nxp/nxp_imx8.dtsi
@@ -35,7 +35,7 @@
 	irqsteer: interrupt-controller@510a0000 {
 		compatible = "nxp,irqsteer-intc";
 		reg = <0x510a0000 DT_SIZE_K(64)>;
-		power-domains = <&irqstr_pd>;
+		power-domain = <&irqstr_pd>;
 
 		#size-cells = <0>;
 		#address-cells = <1>;
@@ -180,7 +180,6 @@
 				compatible = "nxp,imx8qm-scu-pd", "nxp,scu-pd";
 				reg = <0>;
 				nxp,resource-id = <IMX_SC_R_IRQSTR_DSP>;
-				#power-domain-cells = <0>;
 			};
 		};
 	};
diff --git a/include/zephyr/pm/device.h b/include/zephyr/pm/device.h
index f7c008f3cf2..a6e2ef032c0 100644
--- a/include/zephyr/pm/device.h
+++ b/include/zephyr/pm/device.h
@@ -208,7 +208,7 @@ BUILD_ASSERT(offsetof(struct pm_device_isr, base) == 0);
 #ifdef CONFIG_PM_DEVICE_POWER_DOMAIN
 #define	Z_PM_DEVICE_POWER_DOMAIN_INIT(_node_id)			\
 	.domain = DEVICE_DT_GET_OR_NULL(DT_PHANDLE(_node_id,	\
-				   power_domains)),
+				   power_domain)),
 #else
 #define Z_PM_DEVICE_POWER_DOMAIN_INIT(obj)
 #endif /* CONFIG_PM_DEVICE_POWER_DOMAIN */
diff --git a/tests/drivers/build_all/power_domain/app.overlay b/tests/drivers/build_all/power_domain/app.overlay
index 79437b515f2..0551d1b0289 100644
--- a/tests/drivers/build_all/power_domain/app.overlay
+++ b/tests/drivers/build_all/power_domain/app.overlay
@@ -19,7 +19,6 @@
 		power_domain_gpio {
 			compatible = "power-domain-gpio";
 			enable-gpios = <&test_gpio 0 0>;
-			#power-domain-cells = <0>;
 			zephyr,pm-device-runtime-auto;
 		};
 
@@ -27,7 +26,6 @@
 			compatible = "power-domain-gpio-monitor";
 			status = "okay";
 			gpios = <&test_gpio 0 0>;
-			#power-domain-cells = <0>;
 		};
 	};
 };
diff --git a/tests/kernel/device/app.overlay b/tests/kernel/device/app.overlay
index ac77f271cc5..108f14bdb3e 100644
--- a/tests/kernel/device/app.overlay
+++ b/tests/kernel/device/app.overlay
@@ -69,20 +69,17 @@
 	fakedomain_0: fakedomain_0 {
 		compatible = "fakedomain";
 		status = "okay";
-		power-domains = <&fakedomain_2>;
-		#power-domain-cells = <0>;
+		power-domain = <&fakedomain_2>;
 	};
 
 	fakedomain_1: fakedomain_1 {
 		compatible = "fakedomain";
 		status = "okay";
-		power-domains = <&fakedomain_0>;
-		#power-domain-cells = <0>;
+		power-domain = <&fakedomain_0>;
 	};
 
 	fakedomain_2: fakedomain_2 {
 		compatible = "fakedomain";
 		status = "okay";
-		#power-domain-cells = <0>;
 	};
 };
diff --git a/tests/kernel/device/boards/hifive_unmatched.overlay b/tests/kernel/device/boards/hifive_unmatched.overlay
index 6f16d2d9b7b..05f9992d889 100644
--- a/tests/kernel/device/boards/hifive_unmatched.overlay
+++ b/tests/kernel/device/boards/hifive_unmatched.overlay
@@ -66,13 +66,13 @@
 	fakedomain_0: fakedomain_0 {
 		compatible = "fakedomain";
 		status = "okay";
-		power-domains = <&fakedomain_2>;
+		power-domain = <&fakedomain_2>;
 	};
 
 	fakedomain_1: fakedomain_1 {
 		compatible = "fakedomain";
 		status = "okay";
-		power-domains = <&fakedomain_0>;
+		power-domain = <&fakedomain_0>;
 	};
 
 	fakedomain_2: fakedomain_2 {
diff --git a/tests/subsys/pm/device_driver_init/app.overlay b/tests/subsys/pm/device_driver_init/app.overlay
index ea02a035ba8..a5518b74be2 100644
--- a/tests/subsys/pm/device_driver_init/app.overlay
+++ b/tests/subsys/pm/device_driver_init/app.overlay
@@ -2,50 +2,43 @@
 	test_reg: test_reg {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 0 0>;
-		#power-domain-cells = <0>;
 	};
 
 	test_reg_chained: test_reg_chained {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 1 0>;
-		power-domains = <&test_reg>;
-		#power-domain-cells = <0>;
+		power-domain = <&test_reg>;
 	};
 
 	test_reg_chained_auto: test_reg_chained_auto {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 2 0>;
-		power-domains = <&test_reg>;
-		#power-domain-cells = <0>;
+		power-domain = <&test_reg>;
 		zephyr,pm-device-runtime-auto;
 	};
 
 	test_reg_auto: test_reg_auto {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 3 0>;
-		#power-domain-cells = <0>;
 		zephyr,pm-device-runtime-auto;
 	};
 
 	test_reg_auto_chained: test_reg_auto_chained {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 4 0>;
-		#power-domain-cells = <0>;
-		power-domains = <&test_reg_auto>;
+		power-domain = <&test_reg_auto>;
 	};
 
 	test_reg_auto_chained_auto: test_reg_auto_chained_auto {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 5 0>;
-		power-domains = <&test_reg_auto>;
-		#power-domain-cells = <0>;
+		power-domain = <&test_reg_auto>;
 		zephyr,pm-device-runtime-auto;
 	};
 
 	test_reg_disabled: test_reg_disabled {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 6 0>;
-		#power-domain-cells = <0>;
 		status = "disabled";
 	};
 };
diff --git a/tests/subsys/pm/device_power_domains/app.overlay b/tests/subsys/pm/device_power_domains/app.overlay
index e97f3827a2a..0d6dfdfbbd0 100644
--- a/tests/subsys/pm/device_power_domains/app.overlay
+++ b/tests/subsys/pm/device_power_domains/app.overlay
@@ -2,26 +2,23 @@
 	test_reg_0: test_reg_0 {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 0 0>;
-		#power-domain-cells = <0>;
 	};
 
 	test_reg_1: test_reg_1 {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 1 0>;
-		#power-domain-cells = <0>;
 	};
 
 	test_reg_chained: test_reg_chained {
 		compatible = "power-domain-gpio";
 		enable-gpios = <&gpio0 2 0>;
-		power-domains = <&test_reg_0>;
-		#power-domain-cells = <0>;
+		power-domain = <&test_reg_0>;
 	};
 
 	test_dev: test_dev {
 		compatible = "test-device-pm";
 		status = "okay";
-		power-domains = <&test_reg_1>;
+		power-domain = <&test_reg_1>;
 		alternate-domain = <&test_reg_chained>;
 	};
 };
diff --git a/tests/subsys/pm/power_domain/app.overlay b/tests/subsys/pm/power_domain/app.overlay
index 2b8acd67b50..b855ddbac89 100644
--- a/tests/subsys/pm/power_domain/app.overlay
+++ b/tests/subsys/pm/power_domain/app.overlay
@@ -8,30 +8,28 @@
 	test_domain: test_domain {
 		compatible = "power-domain";
 		status = "okay";
-		#power-domain-cells = <0>;
 	};
 
 	test_dev_a: test_dev_a {
 		compatible = "test-device-pm";
 		status = "okay";
-		power-domains = <&test_domain>;
+		power-domain = <&test_domain>;
 	};
 
 	test_dev_b: test_dev_b {
 		compatible = "test-device-pm";
 		status = "okay";
-		power-domains = <&test_domain>;
+		power-domain = <&test_domain>;
 	};
 
 	test_domain_balanced: test_domain_balanced {
 		compatible = "power-domain";
 		status = "okay";
-		#power-domain-cells = <0>;
 	};
 
 	test_dev_balanced: test_dev_balanced {
 		compatible = "test-device-pm";
 		status = "okay";
-		power-domains = <&test_domain_balanced>;
+		power-domain = <&test_domain_balanced>;
 	};
 };

From 6bc0e7009d49e07e310fe024257b2f7a6ddad709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:33 +0100
Subject: [PATCH 1503/2913] Revert "[nrf fromtree] tests: drivers: build_all:
 Add power_domain drivers test"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a4906a78ae576aa1f9e9cd169cc73aa3a86cddf9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../build_all/power_domain/CMakeLists.txt     |  8 -----
 .../build_all/power_domain/app.overlay        | 31 -------------------
 tests/drivers/build_all/power_domain/prj.conf |  4 ---
 .../drivers/build_all/power_domain/src/main.c | 10 ------
 .../build_all/power_domain/testcase.yaml      | 14 ---------
 5 files changed, 67 deletions(-)
 delete mode 100644 tests/drivers/build_all/power_domain/CMakeLists.txt
 delete mode 100644 tests/drivers/build_all/power_domain/app.overlay
 delete mode 100644 tests/drivers/build_all/power_domain/prj.conf
 delete mode 100644 tests/drivers/build_all/power_domain/src/main.c
 delete mode 100644 tests/drivers/build_all/power_domain/testcase.yaml

diff --git a/tests/drivers/build_all/power_domain/CMakeLists.txt b/tests/drivers/build_all/power_domain/CMakeLists.txt
deleted file mode 100644
index 0ee1f839afd..00000000000
--- a/tests/drivers/build_all/power_domain/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(build_all_power_domain)
-
-FILE(GLOB app_sources src/*.c)
-target_sources(app PRIVATE ${app_sources})
diff --git a/tests/drivers/build_all/power_domain/app.overlay b/tests/drivers/build_all/power_domain/app.overlay
deleted file mode 100644
index 0551d1b0289..00000000000
--- a/tests/drivers/build_all/power_domain/app.overlay
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2024 TOKITA Hiroshi
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	test {
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		test_gpio: gpio@deadbeef {
-			compatible = "vnd,gpio";
-			gpio-controller;
-			reg = <0xdeadbeef 0x1000>;
-			#gpio-cells = <0x2>;
-			status = "okay";
-		};
-
-		power_domain_gpio {
-			compatible = "power-domain-gpio";
-			enable-gpios = <&test_gpio 0 0>;
-			zephyr,pm-device-runtime-auto;
-		};
-
-		power_domain_gpio_monitor {
-			compatible = "power-domain-gpio-monitor";
-			status = "okay";
-			gpios = <&test_gpio 0 0>;
-		};
-	};
-};
diff --git a/tests/drivers/build_all/power_domain/prj.conf b/tests/drivers/build_all/power_domain/prj.conf
deleted file mode 100644
index 3a4d0d53f65..00000000000
--- a/tests/drivers/build_all/power_domain/prj.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_TEST=y
-CONFIG_TEST_USERSPACE=y
-CONFIG_GPIO=y
-CONFIG_POWER_DOMAIN=y
diff --git a/tests/drivers/build_all/power_domain/src/main.c b/tests/drivers/build_all/power_domain/src/main.c
deleted file mode 100644
index 19f5ee731af..00000000000
--- a/tests/drivers/build_all/power_domain/src/main.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2024 TOKITA Hiroshi
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-int main(void)
-{
-	return 0;
-}
diff --git a/tests/drivers/build_all/power_domain/testcase.yaml b/tests/drivers/build_all/power_domain/testcase.yaml
deleted file mode 100644
index e1e10d2f8e2..00000000000
--- a/tests/drivers/build_all/power_domain/testcase.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-common:
-  build_only: true
-  tags:
-    - drivers
-    - power_domain
-  platform_allow:
-    - native_sim
-    - native_sim/native/64
-tests:
-  drivers.power_domain.build: {}
-  drivers.power_domain.build.pm:
-    extra_configs:
-      - CONFIG_PM_DEVICE=y
-      - CONFIG_PM_DEVICE_RUNTIME=y

From 66a689a1fb3518ab05645bdaa5bc91fd49a2a84e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:33 +0100
Subject: [PATCH 1504/2913] Revert "[nrf fromtree] dts: xtensa: nxp_imx8: add
 bus clock for sai1"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit df1f799a48a535c40cf023f00ddfc4845fa60c88.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/xtensa/nxp/nxp_imx8.dtsi | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dts/xtensa/nxp/nxp_imx8.dtsi b/dts/xtensa/nxp/nxp_imx8.dtsi
index 21347b595fe..8dba2b7af08 100644
--- a/dts/xtensa/nxp/nxp_imx8.dtsi
+++ b/dts/xtensa/nxp/nxp_imx8.dtsi
@@ -132,8 +132,6 @@
 		reg = <0x59050000 DT_SIZE_K(64)>;
 		interrupt-parent = <&master5>;
 		interrupts = <28>;
-		clocks = <&ccm IMX_CCM_SAI1_CLK 0x0 0x0>;
-		clock-names = "bus";
 		dai-index = <1>;
 		dmas = <&edma0 15 0>, <&edma0 14 0>;
 		dma-names = "tx", "rx";

From 827df8da03ee0bc4054ebecf856cc0f6b1a6dbd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:33 +0100
Subject: [PATCH 1505/2913] Revert "[nrf fromtree] dts: xtensa: nxp_imx8: add
 power domain for irqsteer"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 178340cb720906a1b24339ff1ed65bd99db470cb.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/xtensa/nxp/nxp_imx8.dtsi | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/dts/xtensa/nxp/nxp_imx8.dtsi b/dts/xtensa/nxp/nxp_imx8.dtsi
index 8dba2b7af08..87713a71200 100644
--- a/dts/xtensa/nxp/nxp_imx8.dtsi
+++ b/dts/xtensa/nxp/nxp_imx8.dtsi
@@ -8,7 +8,6 @@
 #include <mem.h>
 #include <zephyr/dt-bindings/clock/imx_ccm.h>
 #include <zephyr/dt-bindings/dai/esai.h>
-#include <zephyr/dt-bindings/power/imx_scu_rsrc.h>
 
 / {
 	cpus {
@@ -35,7 +34,6 @@
 	irqsteer: interrupt-controller@510a0000 {
 		compatible = "nxp,irqsteer-intc";
 		reg = <0x510a0000 DT_SIZE_K(64)>;
-		power-domain = <&irqstr_pd>;
 
 		#size-cells = <0>;
 		#address-cells = <1>;
@@ -169,17 +167,6 @@
 				compatible = "nxp,imx8-pinctrl";
 			};
 		};
-
-		power-domains {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			irqstr_pd: pd@0 {
-				compatible = "nxp,imx8qm-scu-pd", "nxp,scu-pd";
-				reg = <0>;
-				nxp,resource-id = <IMX_SC_R_IRQSTR_DSP>;
-			};
-		};
 	};
 
 	lpuart2: serial@5a080000 {

From 88939e53e1e316da67df16d75c845c5afb1ffeb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:33 +0100
Subject: [PATCH 1506/2913] Revert "[nrf fromtree] soc: intel: renamed soc from
 ace30_ptl to ace30"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2fc4b357feedbf7643255de5c3b67398a7adfc86.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/intel/adsp/Kconfig.intel_adsp          |   4 +-
 boards/intel/adsp/board.yml                   |   6 +-
 boards/intel/adsp/intel_adsp_ace30_defconfig  |  12 -
 boards/intel/adsp/intel_adsp_ace30_ptl.yaml   |   2 +-
 .../intel/adsp/intel_adsp_ace30_ptl_sim.yaml  |   2 +-
 drivers/dai/intel/dmic/dmic.c                 |  14 +-
 drivers/dai/intel/dmic/dmic.h                 |   2 +-
 drivers/dai/intel/dmic/dmic_nhlt.c            |   4 +-
 drivers/dai/intel/ssp/dai-params-intel-ipc4.h |   2 +-
 drivers/dai/intel/ssp/ssp.c                   |  30 +-
 drivers/dai/intel/ssp/ssp.h                   |   4 +-
 drivers/dma/dma_intel_adsp_hda.c              |   2 +-
 dts/xtensa/intel/intel_adsp_ace30.dtsi        | 682 ------------------
 soc/intel/intel_adsp/ace/CMakeLists.txt       |   2 +-
 ...nfig.ace30 => Kconfig.defconfig.ace30_ptl} |   2 +-
 soc/intel/intel_adsp/ace/Kconfig.soc          |   6 +-
 .../include/{ace30 => ace30_ptl}/adsp_boot.h  |   0
 .../{ace30 => ace30_ptl}/adsp_interrupt.h     |   0
 .../{ace30 => ace30_ptl}/adsp_ipc_regs.h      |   0
 .../include/{ace30 => ace30_ptl}/adsp_power.h |   0
 .../include/{ace30 => ace30_ptl}/adsp_shim.h  |   0
 .../{ace30 => ace30_ptl}/dmic_regs_ace3x.h    |   0
 soc/intel/intel_adsp/ace/include/dmic_regs.h  |   4 +-
 soc/intel/intel_adsp/common/clk.c             |   2 +-
 soc/intel/intel_adsp/soc.yml                  |   2 +-
 ...p_ace30.conf => intel_adsp_ace30_ptl.conf} |   0
 ...p_ace30.conf => intel_adsp_ace30_ptl.conf} |   0
 ...p_ace30.conf => intel_adsp_ace30_ptl.conf} |   0
 ...p_ace30.conf => intel_adsp_ace30_ptl.conf} |   0
 29 files changed, 44 insertions(+), 740 deletions(-)
 delete mode 100644 boards/intel/adsp/intel_adsp_ace30_defconfig
 delete mode 100644 dts/xtensa/intel/intel_adsp_ace30.dtsi
 rename soc/intel/intel_adsp/ace/{Kconfig.defconfig.ace30 => Kconfig.defconfig.ace30_ptl} (96%)
 rename soc/intel/intel_adsp/ace/include/{ace30 => ace30_ptl}/adsp_boot.h (100%)
 rename soc/intel/intel_adsp/ace/include/{ace30 => ace30_ptl}/adsp_interrupt.h (100%)
 rename soc/intel/intel_adsp/ace/include/{ace30 => ace30_ptl}/adsp_ipc_regs.h (100%)
 rename soc/intel/intel_adsp/ace/include/{ace30 => ace30_ptl}/adsp_power.h (100%)
 rename soc/intel/intel_adsp/ace/include/{ace30 => ace30_ptl}/adsp_shim.h (100%)
 rename soc/intel/intel_adsp/ace/include/{ace30 => ace30_ptl}/dmic_regs_ace3x.h (100%)
 rename tests/kernel/mem_protect/sys_sem/boards/{intel_adsp_ace30.conf => intel_adsp_ace30_ptl.conf} (100%)
 rename tests/kernel/mutex/sys_mutex/boards/{intel_adsp_ace30.conf => intel_adsp_ace30_ptl.conf} (100%)
 rename tests/kernel/queue/boards/{intel_adsp_ace30.conf => intel_adsp_ace30_ptl.conf} (100%)
 rename tests/lib/c_lib/thrd/boards/{intel_adsp_ace30.conf => intel_adsp_ace30_ptl.conf} (100%)

diff --git a/boards/intel/adsp/Kconfig.intel_adsp b/boards/intel/adsp/Kconfig.intel_adsp
index 225a2747ad5..67c3989fe32 100644
--- a/boards/intel/adsp/Kconfig.intel_adsp
+++ b/boards/intel/adsp/Kconfig.intel_adsp
@@ -8,5 +8,5 @@ config BOARD_INTEL_ADSP
 	select SOC_INTEL_ACE15_MTPM if BOARD_INTEL_ADSP_ACE15_MTPM_SIM
 	select SOC_INTEL_ACE20_LNL if BOARD_INTEL_ADSP_ACE20_LNL
 	select SOC_INTEL_ACE20_LNL if BOARD_INTEL_ADSP_ACE20_LNL_SIM
-	select SOC_INTEL_ACE30 if BOARD_INTEL_ADSP_ACE30_PTL
-	select SOC_INTEL_ACE30 if BOARD_INTEL_ADSP_ACE30_PTL_SIM
+	select SOC_INTEL_ACE30_PTL if BOARD_INTEL_ADSP_ACE30_PTL
+	select SOC_INTEL_ACE30_PTL if BOARD_INTEL_ADSP_ACE30_PTL_SIM
diff --git a/boards/intel/adsp/board.yml b/boards/intel/adsp/board.yml
index 43004e8f2a4..5eadeb4fe1a 100644
--- a/boards/intel/adsp/board.yml
+++ b/boards/intel/adsp/board.yml
@@ -11,8 +11,6 @@ boards:
       - name: ace20_lnl
         variants:
           - name: 'sim'
-      - name: ace30
+      - name: ace30_ptl
         variants:
-          - name: 'ptl'
-            variants:
-              - name: 'sim'
+          - name: 'sim'
diff --git a/boards/intel/adsp/intel_adsp_ace30_defconfig b/boards/intel/adsp/intel_adsp_ace30_defconfig
deleted file mode 100644
index 913d2a8c3e3..00000000000
--- a/boards/intel/adsp/intel_adsp_ace30_defconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_MAIN_STACK_SIZE=4096
-
-CONFIG_GEN_ISR_TABLES=y
-CONFIG_GEN_IRQ_VECTOR_TABLE=n
-
-CONFIG_BUILD_OUTPUT_BIN=n
-
-CONFIG_DAI_SSP_HAS_POWER_CONTROL=y
-
-CONFIG_DCACHE_LINE_SIZE=64
diff --git a/boards/intel/adsp/intel_adsp_ace30_ptl.yaml b/boards/intel/adsp/intel_adsp_ace30_ptl.yaml
index 061ac9cd742..bdfe837bd08 100644
--- a/boards/intel/adsp/intel_adsp_ace30_ptl.yaml
+++ b/boards/intel/adsp/intel_adsp_ace30_ptl.yaml
@@ -1,4 +1,4 @@
-identifier: intel_adsp/ace30/ptl
+identifier: intel_adsp/ace30_ptl
 name: ACE 3.0 Panther Lake Audio DSP
 type: mcu
 arch: xtensa
diff --git a/boards/intel/adsp/intel_adsp_ace30_ptl_sim.yaml b/boards/intel/adsp/intel_adsp_ace30_ptl_sim.yaml
index 42b07e49ee3..3bf48d4c383 100644
--- a/boards/intel/adsp/intel_adsp_ace30_ptl_sim.yaml
+++ b/boards/intel/adsp/intel_adsp_ace30_ptl_sim.yaml
@@ -1,4 +1,4 @@
-identifier: intel_adsp/ace30/ptl/sim
+identifier: intel_adsp/ace30_ptl/sim
 name: ACE 3.0 Panther Lake Audio DSP
 type: sim
 simulation: custom
diff --git a/drivers/dai/intel/dmic/dmic.c b/drivers/dai/intel/dmic/dmic.c
index e528e96f38d..b0d44d4da55 100644
--- a/drivers/dai/intel/dmic/dmic.c
+++ b/drivers/dai/intel/dmic/dmic.c
@@ -160,7 +160,7 @@ static inline void dai_dmic_release_ownership(const struct dai_intel_dmic *dmic)
 
 static inline uint32_t dai_dmic_base(const struct dai_intel_dmic *dmic)
 {
-#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30)
+#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30_PTL)
 	return dmic->hdamldmic_base;
 #else
 	return dmic->shim_base;
@@ -173,7 +173,7 @@ static inline void dai_dmic_set_sync_period(uint32_t period, const struct dai_in
 	uint32_t val = CONFIG_DAI_DMIC_HW_IOCLK / period - 1;
 	uint32_t base = dai_dmic_base(dmic);
 	/* DMIC Change sync period */
-#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30)
+#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30_PTL)
 	sys_write32(sys_read32(base + DMICSYNC_OFFSET) | FIELD_PREP(DMICSYNC_SYNCPRD, val),
 		    base + DMICSYNC_OFFSET);
 	sys_write32(sys_read32(base + DMICSYNC_OFFSET) | DMICSYNC_SYNCPU,
@@ -287,7 +287,7 @@ static void dai_dmic_irq_handler(const void *data)
 static inline void dai_dmic_dis_clk_gating(const struct dai_intel_dmic *dmic)
 {
 	/* Disable DMIC clock gating */
-#if (CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30)
+#if (CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30_PTL)
 	sys_write32((sys_read32(dmic->vshim_base + DMICLVSCTL_OFFSET) | DMICLVSCTL_DCGD),
 		    dmic->vshim_base + DMICLVSCTL_OFFSET);
 #else
@@ -299,7 +299,7 @@ static inline void dai_dmic_dis_clk_gating(const struct dai_intel_dmic *dmic)
 static inline void dai_dmic_en_clk_gating(const struct dai_intel_dmic *dmic)
 {
 	/* Enable DMIC clock gating */
-#if (CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30)
+#if (CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30_PTL)
 	sys_write32((sys_read32(dmic->vshim_base + DMICLVSCTL_OFFSET) & ~DMICLVSCTL_DCGD),
 		    dmic->vshim_base + DMICLVSCTL_OFFSET);
 #else /* All other CAVS and ACE platforms */
@@ -313,7 +313,7 @@ static inline void dai_dmic_program_channel_map(const struct dai_intel_dmic *dmi
 						const struct dai_config *cfg,
 						uint32_t index)
 {
-#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30)
+#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30_PTL)
 	uint16_t pcmsycm = cfg->link_config;
 	uint32_t reg_add = dmic->shim_base + DMICXPCMSyCM_OFFSET + 0x0004*index;
 
@@ -322,7 +322,7 @@ static inline void dai_dmic_program_channel_map(const struct dai_intel_dmic *dmi
 	ARG_UNUSED(dmic);
 	ARG_UNUSED(cfg);
 	ARG_UNUSED(index);
-#endif /* defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30) */
+#endif /* defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30_PTL) */
 }
 
 static inline void dai_dmic_en_power(const struct dai_intel_dmic *dmic)
@@ -332,7 +332,7 @@ static inline void dai_dmic_en_power(const struct dai_intel_dmic *dmic)
 	sys_write32((sys_read32(base + DMICLCTL_OFFSET) | DMICLCTL_SPA),
 			base + DMICLCTL_OFFSET);
 
-#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30)
+#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30_PTL)
 	while (!(sys_read32(base + DMICLCTL_OFFSET) & DMICLCTL_CPA)) {
 		k_sleep(K_USEC(100));
 	}
diff --git a/drivers/dai/intel/dmic/dmic.h b/drivers/dai/intel/dmic/dmic.h
index 9b7d8c03ea8..c507ec1c0ee 100644
--- a/drivers/dai/intel/dmic/dmic.h
+++ b/drivers/dai/intel/dmic/dmic.h
@@ -173,7 +173,7 @@ struct dai_intel_dmic {
 	/* hardware parameters */
 	uint32_t reg_base;
 	uint32_t shim_base;
-#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30)
+#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30_PTL)
 	uint32_t hdamldmic_base;
 	uint32_t vshim_base;
 #endif
diff --git a/drivers/dai/intel/dmic/dmic_nhlt.c b/drivers/dai/intel/dmic/dmic_nhlt.c
index d041ef438ce..f71b0d47f2f 100644
--- a/drivers/dai/intel/dmic/dmic_nhlt.c
+++ b/drivers/dai/intel/dmic/dmic_nhlt.c
@@ -282,7 +282,7 @@ static int dai_nhlt_dmic_dai_params_get(struct dai_intel_dmic *dmic, const int c
 static inline void dai_dmic_clock_select_set(const struct dai_intel_dmic *dmic, uint32_t source)
 {
 	uint32_t val;
-#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30) /* ACE 2.0,3.0 */
+#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30_PTL) /* ACE 2.0,3.0 */
 	val = sys_read32(dmic->vshim_base + DMICLVSCTL_OFFSET);
 	val &= ~DMICLVSCTL_MLCS;
 	val |= FIELD_PREP(DMICLVSCTL_MLCS, source);
@@ -303,7 +303,7 @@ static inline void dai_dmic_clock_select_set(const struct dai_intel_dmic *dmic,
 static inline uint32_t dai_dmic_clock_select_get(const struct dai_intel_dmic *dmic)
 {
 	uint32_t val;
-#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30) /* ACE 2.0,3.0 */
+#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30_PTL) /* ACE 2.0,3.0 */
 	val = sys_read32(dmic->vshim_base + DMICLVSCTL_OFFSET);
 	return FIELD_GET(DMICLVSCTL_MLCS, val);
 #else
diff --git a/drivers/dai/intel/ssp/dai-params-intel-ipc4.h b/drivers/dai/intel/ssp/dai-params-intel-ipc4.h
index 46acee049ce..6d078cd0941 100644
--- a/drivers/dai/intel/ssp/dai-params-intel-ipc4.h
+++ b/drivers/dai/intel/ssp/dai-params-intel-ipc4.h
@@ -269,7 +269,7 @@ struct dai_intel_ipc4_ssp_mclk_config_2 {
 } __packed;
 
 struct dai_intel_ipc4_ssp_driver_config {
-#ifdef CONFIG_SOC_INTEL_ACE30
+#ifdef CONFIG_SOC_INTEL_ACE30_PTL
 	struct dai_intel_ipc4_ssp_config_ver_3_0 i2s_config;
 #else
 	struct dai_intel_ipc4_ssp_config i2s_config;
diff --git a/drivers/dai/intel/ssp/ssp.c b/drivers/dai/intel/ssp/ssp.c
index 218f3c33162..58ab0c10170 100644
--- a/drivers/dai/intel/ssp/ssp.c
+++ b/drivers/dai/intel/ssp/ssp.c
@@ -800,7 +800,7 @@ static void dai_ssp_pm_runtime_en_ssp_power(struct dai_intel_ssp *dp, uint32_t s
 	ret = dai_ssp_poll_for_register_delay(dai_ip_base(dp) + I2SLCTL_OFFSET,
 					      I2SLCTL_CPA(ssp_index), I2SLCTL_CPA(ssp_index),
 					      DAI_INTEL_SSP_MAX_SEND_TIME_PER_SAMPLE);
-#elif CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30
+#elif CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30_PTL
 	sys_write32(sys_read32(dai_hdamlssp_base(dp) + I2SLCTL_OFFSET) |
 			       I2SLCTL_SPA(ssp_index),
 			       dai_hdamlssp_base(dp) + I2SLCTL_OFFSET);
@@ -835,7 +835,7 @@ static void dai_ssp_pm_runtime_dis_ssp_power(struct dai_intel_ssp *dp, uint32_t
 					      I2SLCTL_CPA(ssp_index), 0,
 					      DAI_INTEL_SSP_MAX_SEND_TIME_PER_SAMPLE);
 
-#elif CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30
+#elif CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30_PTL
 	sys_write32(sys_read32(dai_hdamlssp_base(dp) + I2SLCTL_OFFSET) & (~I2SLCTL_SPA(ssp_index)),
 			dai_hdamlssp_base(dp) + I2SLCTL_OFFSET);
 
@@ -873,7 +873,7 @@ static void dai_ssp_program_channel_map(struct dai_intel_ssp *dp,
 		/* Program HDA input stream parameters */
 		sys_write16((pcmsycm & 0xffff), reg_add);
 	}
-#elif defined(CONFIG_SOC_INTEL_ACE30)
+#elif defined(CONFIG_SOC_INTEL_ACE30_PTL)
 	const struct dai_intel_ipc4_ssp_configuration_blob_ver_3_0 *blob30 = spec_config;
 	const struct dai_intel_ipc4_ssp_configuration_blob *blob = spec_config;
 	uint64_t time_slot_map = 0;
@@ -930,7 +930,7 @@ static void dai_ssp_empty_tx_fifo(struct dai_intel_ssp *dp)
 	 * SSSR_TNF is cleared when TX FIFO is empty or full,
 	 * so wait for set TNF then for TFL zero - order matter.
 	 */
-#ifdef CONFIG_SOC_INTEL_ACE30
+#ifdef CONFIG_SOC_INTEL_ACE30_PTL
 	ret = dai_ssp_poll_for_register_delay(dai_base(dp) + SSMODyCS(dp->tdm_slot_group),
 							SSMODyCS_TNF, SSMODyCS_TNF,
 							DAI_INTEL_SSP_MAX_SEND_TIME_PER_SAMPLE);
@@ -959,7 +959,7 @@ static void dai_ssp_empty_tx_fifo(struct dai_intel_ssp *dp)
 	}
 }
 
-#ifdef CONFIG_SOC_INTEL_ACE30
+#ifdef CONFIG_SOC_INTEL_ACE30_PTL
 static void ssp_empty_rx_fifo_on_start(struct dai_intel_ssp *dp)
 {
 	uint32_t retry = DAI_INTEL_SSP_RX_FLUSH_RETRY_MAX;
@@ -1191,7 +1191,7 @@ static int dai_ssp_bclk_prepare_enable(struct dai_intel_ssp *dp)
 	mdiv = ft[DAI_INTEL_SSP_DEFAULT_IDX].freq / ssp_plat_data->params.bclk_rate;
 #endif
 
-#ifndef CONFIG_SOC_INTEL_ACE30
+#ifndef CONFIG_SOC_INTEL_ACE30_PTL
 	if (need_ecs) {
 		sscr0 |= SSCR0_ECS;
 	}
@@ -1724,7 +1724,7 @@ static int dai_ssp_set_config_tplg(struct dai_intel_ssp *dp, const struct dai_co
 	sys_write32(sspsp2, dai_base(dp) + SSPSP2);
 	sys_write32(ssioc, dai_base(dp) + SSIOC);
 	sys_write32(ssto, dai_base(dp) + SSTO);
-#ifdef CONFIG_SOC_INTEL_ACE30
+#ifdef CONFIG_SOC_INTEL_ACE30_PTL
 	for (uint32_t idx = 0; idx < I2SIPCMC; ++idx) {
 		sys_write64(sstsa, dai_base(dp) + SSMODyTSA(idx));
 	}
@@ -1777,7 +1777,7 @@ static int dai_ssp_set_config_tplg(struct dai_intel_ssp *dp, const struct dai_co
 			ssp_plat_data->clk_active |= SSP_CLK_BCLK_ES_REQ;
 
 			if (enable_sse) {
-#ifdef CONFIG_SOC_INTEL_ACE30
+#ifdef CONFIG_SOC_INTEL_ACE30_PTL
 				dai_ssp_update_bits(dp, SSMIDyCS(dp->tdm_slot_group),
 						    SSMIDyCS_RSRE, SSMIDyCS_RSRE);
 				dai_ssp_update_bits(dp, SSMODyCS(dp->tdm_slot_group),
@@ -1806,7 +1806,7 @@ static int dai_ssp_set_config_tplg(struct dai_intel_ssp *dp, const struct dai_co
 			LOG_INF("hw_free stage: releasing BCLK clocks for SSP%d...",
 					dp->dai_index);
 			if (ssp_plat_data->clk_active & SSP_CLK_BCLK_ACTIVE) {
-#ifdef CONFIG_SOC_INTEL_ACE30
+#ifdef CONFIG_SOC_INTEL_ACE30_PTL
 				for (uint32_t idx = 0; idx < I2SOPCMC; ++idx) {
 					dai_ssp_update_bits(dp, SSMODyCS(idx), SSMODyCS_TSRE, 0);
 				}
@@ -1985,7 +1985,7 @@ static int dai_ssp_parse_tlv(struct dai_intel_ssp *dp, const uint8_t *aux_ptr, s
 				    ~I2CLCTL_MLCS(0x7)) |
 				    I2CLCTL_MLCS(link->clock_source), dai_ip_base(dp) +
 				    I2SLCTL_OFFSET);
-#elif CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30
+#elif CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30_PTL
 			sys_write32((sys_read32(dai_i2svss_base(dp) + I2SLCTL_OFFSET) &
 				    ~I2CLCTL_MLCS(0x7)) |
 				    I2CLCTL_MLCS(link->clock_source),
@@ -2065,7 +2065,7 @@ static int dai_ssp_set_clock_control_ver_1(struct dai_intel_ssp *dp,
 	return 0;
 }
 
-#ifdef CONFIG_SOC_INTEL_ACE30
+#ifdef CONFIG_SOC_INTEL_ACE30_PTL
 static void dai_ssp_set_reg_config(struct dai_intel_ssp *dp, const struct dai_config *cfg,
 				   const void *spec_config)
 {
@@ -2184,7 +2184,7 @@ static int dai_ssp_set_config_blob(struct dai_intel_ssp *dp, const struct dai_co
 	struct dai_intel_ssp_plat_data *ssp_plat_data = dai_get_plat_data(dp);
 	int err;
 
-#ifdef CONFIG_SOC_INTEL_ACE30
+#ifdef CONFIG_SOC_INTEL_ACE30_PTL
 	dp->tdm_slot_group = cfg->tdm_slot_group;
 #endif
 
@@ -2322,7 +2322,7 @@ static void dai_ssp_start(struct dai_intel_ssp *dp, int direction)
 
 
 	/* enable DMA */
-#if CONFIG_SOC_INTEL_ACE30
+#if CONFIG_SOC_INTEL_ACE30_PTL
 	if (direction == DAI_DIR_PLAYBACK) {
 		dai_ssp_update_bits(dp, SSMODyCS(dp->tdm_slot_group),
 				    SSMODyCS_TSRE, SSMODyCS_TSRE);
@@ -2392,7 +2392,7 @@ static void dai_ssp_stop(struct dai_intel_ssp *dp, int direction)
 	if (direction == DAI_DIR_CAPTURE &&
 	    dp->state[DAI_DIR_CAPTURE] != DAI_STATE_PRE_RUNNING) {
 		LOG_INF("SSP%d RX", dp->dai_index);
-#if CONFIG_SOC_INTEL_ACE30
+#if CONFIG_SOC_INTEL_ACE30_PTL
 		dai_ssp_update_bits(dp, SSMIDyCS(dp->tdm_slot_group), SSMIDyCS_RXEN, 0);
 		dai_ssp_update_bits(dp, SSMIDyCS(dp->tdm_slot_group), SSMIDyCS_RSRE, 0);
 #else
@@ -2407,7 +2407,7 @@ static void dai_ssp_stop(struct dai_intel_ssp *dp, int direction)
 	if (direction == DAI_DIR_PLAYBACK &&
 	    dp->state[DAI_DIR_PLAYBACK] != DAI_STATE_PRE_RUNNING) {
 		LOG_INF("SSP%d TX", dp->dai_index);
-#if CONFIG_SOC_INTEL_ACE30
+#if CONFIG_SOC_INTEL_ACE30_PTL
 		dai_ssp_update_bits(dp, SSMODyCS(dp->tdm_slot_group), SSMODyCS_TSRE, 0);
 		dai_ssp_empty_tx_fifo(dp);
 		dai_ssp_update_bits(dp, SSMODyCS(dp->tdm_slot_group), SSMODyCS_TXEN, 0);
diff --git a/drivers/dai/intel/ssp/ssp.h b/drivers/dai/intel/ssp/ssp.h
index 5d1c2943724..560b5d3df5f 100644
--- a/drivers/dai/intel/ssp/ssp.h
+++ b/drivers/dai/intel/ssp/ssp.h
@@ -52,7 +52,7 @@
 #include "ssp_regs_v1.h"
 #elif defined(CONFIG_SOC_INTEL_ACE20_LNL)
 #include "ssp_regs_v2.h"
-#elif defined(CONFIG_SOC_INTEL_ACE30)
+#elif defined(CONFIG_SOC_INTEL_ACE30_PTL)
 #include "ssp_regs_v3.h"
 #else
 #error "Missing ssp definitions"
@@ -116,7 +116,7 @@ struct dai_intel_ssp_plat_data {
 	uint32_t base;
 	uint32_t ip_base;
 	uint32_t shim_base;
-#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30)
+#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30_PTL)
 	uint32_t hdamlssp_base;
 	uint32_t i2svss_base;
 #endif
diff --git a/drivers/dma/dma_intel_adsp_hda.c b/drivers/dma/dma_intel_adsp_hda.c
index 2f9b98ed74b..5a2dc1a1e0f 100644
--- a/drivers/dma/dma_intel_adsp_hda.c
+++ b/drivers/dma/dma_intel_adsp_hda.c
@@ -235,7 +235,7 @@ int intel_adsp_hda_dma_status(const struct device *dev, uint32_t channel,
 	stat->pending_length = used;
 	stat->free = unused;
 
-#if CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30
+#if CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30_PTL
 	/* Linear Link Position via HDA-DMA is only supported on ACE2 or newer */
 	if (cfg->direction == MEMORY_TO_PERIPHERAL || cfg->direction == PERIPHERAL_TO_MEMORY) {
 		uint32_t tmp;
diff --git a/dts/xtensa/intel/intel_adsp_ace30.dtsi b/dts/xtensa/intel/intel_adsp_ace30.dtsi
deleted file mode 100644
index 97be77eb757..00000000000
--- a/dts/xtensa/intel/intel_adsp_ace30.dtsi
+++ /dev/null
@@ -1,682 +0,0 @@
-/*
- * Copyright (c) 2024 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <xtensa/xtensa.dtsi>
-#include <mem.h>
-
-/ {
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu0: cpu@0 {
-			device_type = "cpu";
-			compatible = "cdns,tensilica-xtensa-lx7";
-			reg = <0>;
-			cpu-power-states = <&d0i3 &d3>;
-			i-cache-line-size = <64>;
-			d-cache-line-size = <64>;
-		};
-
-		cpu1: cpu@1 {
-			device_type = "cpu";
-			compatible = "cdns,tensilica-xtensa-lx7";
-			reg = <1>;
-			cpu-power-states = <&d0i3 &d3>;
-		};
-
-		cpu2: cpu@2 {
-			device_type = "cpu";
-			compatible = "cdns,tensilica-xtensa-lx7";
-			reg = <2>;
-			cpu-power-states = <&d0i3 &d3>;
-		};
-
-		cpu3: cpu@3 {
-			device_type = "cpu";
-			compatible = "cdns,tensilica-xtensa-lx7";
-			reg = <3>;
-			cpu-power-states = <&d0i3 &d3>;
-		};
-
-		cpu4: cpu@4 {
-			device_type = "cpu";
-			compatible = "cdns,tensilica-xtensa-lx7";
-			reg = <4>;
-			cpu-power-states = <&d0i3 &d3>;
-		};
-	};
-
-	power-states {
-		d0i3: idle {
-			compatible = "zephyr,power-state";
-			power-state-name = "runtime-idle";
-			min-residency-us = <200>;
-			exit-latency-us = <100>;
-		};
-		/* PM_STATE_SOFT_OFF can be entered only by calling pm_state_force.
-		 * The procedure is triggered by IPC from the HOST (SET_DX).
-		 */
-		d3: off {
-			compatible = "zephyr,power-state";
-			power-state-name = "soft-off";
-			min-residency-us = <0>;
-			exit-latency-us = <0>;
-			status = "disabled";
-		};
-	};
-
-	sram0: memory@a0020000 {
-		device_type = "memory";
-		compatible = "mmio-sram";
-		reg = <0xa0020000 DT_SIZE_K(4608)>;
-	};
-
-	sram0virtual: virtualmemory@a0020000 {
-		device_type = "memory";
-		compatible = "mmio-sram";
-		reg = <0xa0020000 DT_SIZE_K(8192)>;
-	};
-
-	sram1: memory@a0000000 {
-		device_type = "memory";
-		compatible = "mmio-sram";
-		reg = <0xa0000000 DT_SIZE_K(64)>;
-	};
-
-	sysclk: system-clock {
-		compatible = "fixed-clock";
-		clock-frequency = <38400000>;
-		#clock-cells = <0>;
-	};
-
-	clkctl: clkctl {
-		compatible = "intel,adsp-shim-clkctl";
-		adsp-clkctl-clk-wovcro = <0>;
-		adsp-clkctl-clk-ipll = <1>;
-		adsp-clkctl-freq-enc = <0xc 0x4>;
-		adsp-clkctl-freq-mask = <0x0 0x0>;
-		adsp-clkctl-freq-default = <1>;
-		adsp-clkctl-freq-lowest = <0>;
-		wovcro-supported;
-	};
-
-	audioclk: audio-clock {
-		compatible = "fixed-clock";
-		clock-frequency = <24576000>;
-		#clock-cells = <0>;
-	};
-
-	pllclk: pll-clock {
-		compatible = "fixed-clock";
-		clock-frequency = <96000000>;
-		#clock-cells = <0>;
-	};
-
-	IMR1: memory@A1000000 {
-		compatible = "intel,adsp-imr";
-		reg = <0xA1000000 DT_SIZE_M(16)>;
-		block-size = <0x1000>;
-		zephyr,memory-region = "IMR1";
-	};
-
-	soc {
-		l1ccap: l1ccap@3fe80080 {
-			compatible = "intel,adsp-l1ccap";
-			reg = <0x3fe80080 0x4>;
-		};
-
-		l1ccfg: l1ccfg@3fe80084 {
-			compatible = "intel,adsp-l1ccfg";
-			reg = <0x3fe80084 0x4>;
-		};
-
-		l1pcfg: l1pcfg@3fe80088 {
-			compatible = "intel,adsp-l1pcfg";
-			reg = <0x3fe80088 0x4>;
-		};
-
-		lsbpm: lsbpm@71d80 {
-			compatible = "intel,adsp-lsbpm";
-			reg = <0x71d80 0x0008>;
-		};
-
-		hsbpm: hsbpm@17a800 {
-			compatible = "intel,adsp-hsbpm";
-			reg = <0x17a800 0x0008>;
-		};
-
-		core_intc: core_intc@0 {
-			compatible = "cdns,xtensa-core-intc";
-			reg = <0x00 0x400>;
-			interrupt-controller;
-			#interrupt-cells = <3>;
-		};
-
-		hdamlddmic: hdamlddmic@cc0 {
-			compatible = "intel,adsp-hda-dmic-cap";
-			reg = <0xcc0 0x40>;
-			status = "okay";
-		};
-
-		dmic0: dai-dmic0@10100 {
-			compatible = "intel,dai-dmic";
-			reg = <0x10100 0x8000>;
-			shim = <0x10000>;
-			fifo = <0x0008>;
-			interrupts = <0x08 0 0>;
-			interrupt-parent = <&ace_intc>;
-			power-domain = <&hub_ulp_domain>;
-		};
-
-		dmic1: dai-dmic1@10100 {
-			compatible = "intel,dai-dmic";
-			reg = <0x10100 0x8000>;
-			shim = <0x10000>;
-			fifo = <0x0108>;
-			interrupts = <0x08 0 0>;
-			interrupt-parent = <&ace_intc>;
-			power-domain = <&hub_ulp_domain>;
-		};
-
-		dmicvss: dmicvss@16000 {
-			compatible = "intel,adsp-dmic-vss";
-			reg = <0x16000 0x2000>;
-			status = "okay";
-		};
-
-		sspbase: ssp_base@28000 {
-			compatible = "intel,ssp-sspbase";
-			reg = <0x28000 0x1000>;
-		};
-
-		hdamlssp: hdamlssp@d00 {
-			compatible = "intel,adsp-hda-ssp-cap";
-			reg = <0xD00 0x40>;
-			status = "okay";
-		};
-
-		ssp0: ssp@28100 {
-			compatible = "intel,ssp";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			reg = <0x00028100 0x1000
-				   0x00079C00 0x200>;
-			i2svss = <0x00028C00 0x1000>;
-			interrupts = <0x00 0 0>;
-			interrupt-parent = <&ace_intc>;
-			dmas = <&hda_link_out 1
-				&hda_link_in 1>;
-			dma-names = "tx", "rx";
-			ssp-index = <0>;
-			power-domain = <&io0_domain>;
-			status = "okay";
-
-			ssp00: ssp@0 {
-				compatible = "intel,ssp-dai";
-				reg = <0x0>;
-				status = "okay";
-			};
-
-			ssp01: ssp@1 {
-				compatible = "intel,ssp-dai";
-				reg = <0x1>;
-				status = "okay";
-			};
-
-			ssp02: ssp@2 {
-				compatible = "intel,ssp-dai";
-				reg = <0x2>;
-				status = "okay";
-			};
-
-			ssp03: ssp@3 {
-				compatible = "intel,ssp-dai";
-				reg = <0x3>;
-				status = "okay";
-			};
-
-			ssp04: ssp@4 {
-				compatible = "intel,ssp-dai";
-				reg = <0x4>;
-				status = "okay";
-			};
-
-			ssp05: ssp@5 {
-				compatible = "intel,ssp-dai";
-				reg = <0x5>;
-				status = "okay";
-			};
-
-			ssp06: ssp@6 {
-				compatible = "intel,ssp-dai";
-				reg = <0x6>;
-				status = "okay";
-			};
-
-			ssp07: ssp@7 {
-				compatible = "intel,ssp-dai";
-				reg = <0x7>;
-				status = "okay";
-			};
-		};
-
-		ssp1: ssp@29100 {
-			compatible = "intel,ssp";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			reg = <0x00029100 0x1000
-				   0x00079C00 0x200>;
-			i2svss = <0x00029C00 0x1000>;
-			interrupts = <0x01 0 0>;
-			interrupt-parent = <&ace_intc>;
-			dmas = <&hda_link_out 2
-				&hda_link_in 2>;
-			dma-names = "tx", "rx";
-			ssp-index = <1>;
-			power-domain = <&io0_domain>;
-			status = "okay";
-
-			ssp10: ssp@10 {
-				compatible = "intel,ssp-dai";
-				reg = <0x10>;
-				status = "okay";
-			};
-
-			ssp11: ssp@11 {
-				compatible = "intel,ssp-dai";
-				reg = <0x11>;
-				status = "okay";
-			};
-
-			ssp12: ssp@12 {
-				compatible = "intel,ssp-dai";
-				reg = <0x12>;
-				status = "okay";
-			};
-
-			ssp13: ssp@13 {
-				compatible = "intel,ssp-dai";
-				reg = <0x13>;
-				status = "okay";
-			};
-
-			ssp14: ssp@14 {
-				compatible = "intel,ssp-dai";
-				reg = <0x14>;
-				status = "okay";
-			};
-
-			ssp15: ssp@15 {
-				compatible = "intel,ssp-dai";
-				reg = <0x15>;
-				status = "okay";
-			};
-
-			ssp16: ssp@16 {
-				compatible = "intel,ssp-dai";
-				reg = <0x16>;
-				status = "okay";
-			};
-
-			ssp17: ssp@17 {
-				compatible = "intel,ssp-dai";
-				reg = <0x17>;
-				status = "okay";
-			};
-		};
-
-		ssp2: ssp@2a100 {
-			compatible = "intel,ssp";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			reg = <0x0002a100 0x1000
-				   0x00079C00 0x200>;
-			i2svss = <0x0002AC00 0x1000>;
-			interrupts = <0x02 0 0>;
-			interrupt-parent = <&ace_intc>;
-			dmas = <&hda_link_out 3
-				&hda_link_in 3>;
-			dma-names = "tx", "rx";
-			ssp-index = <2>;
-			power-domain = <&io0_domain>;
-			status = "okay";
-
-			ssp20: ssp@20 {
-				compatible = "intel,ssp-dai";
-				reg = <0x20>;
-				status = "okay";
-			};
-
-			ssp21: ssp@21 {
-				compatible = "intel,ssp-dai";
-				reg = <0x21>;
-				status = "okay";
-			};
-
-			ssp22: ssp@22 {
-				compatible = "intel,ssp-dai";
-				reg = <0x22>;
-				status = "okay";
-			};
-
-			ssp23: ssp@23 {
-				compatible = "intel,ssp-dai";
-				reg = <0x23>;
-				status = "okay";
-			};
-
-			ssp24: ssp@24 {
-				compatible = "intel,ssp-dai";
-				reg = <0x24>;
-				status = "okay";
-			};
-
-			ssp25: ssp@25 {
-				compatible = "intel,ssp-dai";
-				reg = <0x25>;
-				status = "okay";
-			};
-
-			ssp26: ssp@26 {
-				compatible = "intel,ssp-dai";
-				reg = <0x26>;
-				status = "okay";
-			};
-
-			ssp27: ssp@27 {
-				compatible = "intel,ssp-dai";
-				reg = <0x27>;
-				status = "okay";
-			};
-		};
-
-		mem_window0: mem_window@70200 {
-			compatible = "intel,adsp-mem-window";
-			reg = <0x70200 0x8>;
-			offset = <0x4000>;
-			memory = <&sram0>;
-			initialize;
-			read-only;
-		};
-
-		mem_window1: mem_window@70208 {
-			compatible = "intel,adsp-mem-window";
-			reg = <0x70208 0x8>;
-			memory = <&sram0>;
-		};
-
-		mem_window2: mem_window@70210 {
-			compatible = "intel,adsp-mem-window";
-			reg = <0x70210 0x8>;
-			memory = <&sram0>;
-		};
-
-		mem_window3: mem_window@70218 {
-			compatible = "intel,adsp-mem-window";
-			reg = <0x70218 0x8>;
-			memory = <&sram0>;
-			read-only;
-		};
-
-		adsp_idc: ace_idc@92000 {
-			compatible = "intel,adsp-idc";
-			reg = <0x92000 0x0400>;
-			interrupts = <24 0 0>;
-			interrupt-parent = <&ace_intc>;
-		};
-
-		dfpmcch: dfpmcch@71ac0 {
-			compatible = "intel,adsp-dfpmcch";
-			reg = <0x00071ac0 0x40>;
-		};
-
-		dfpmccu: dfpmccu@71b00 {
-			compatible = "intel,adsp-dfpmccu";
-			reg = <0x71b00 0x100>;
-
-			hub_ulp_domain: hub_ulp_domain {
-				compatible = "intel,adsp-power-domain";
-				bit-position = <15>;
-			};
-			ml0_domain: ml0_domain {
-				compatible = "intel,adsp-power-domain";
-				bit-position = <12>;
-			};
-			io1_domain: io1_domain {
-				compatible = "intel,adsp-power-domain";
-				bit-position = <9>;
-			};
-			io0_domain: io0_domain {
-				compatible = "intel,adsp-power-domain";
-				bit-position = <8>;
-			};
-			hub_hp_domain: hub_hpp_domain {
-				compatible = "intel,adsp-power-domain";
-				bit-position = <6>;
-			};
-			hst_domain: hst_domain {
-				compatible = "intel,adsp-power-domain";
-				bit-position = <5>;
-			};
-		};
-
-		shim: shim@71f00 {
-			compatible = "intel,cavs-shim";
-			reg = <0x71f00 0x100>;
-		};
-
-		tts: tts@72000 {
-			compatible = "intel,adsp-tts";
-			reg = <0x72000 0x70>;
-			status = "okay";
-		};
-
-		ace_rtc_counter: ace_rtc_counter@72008 {
-			compatible = "intel,ace-rtc-counter";
-			reg = <0x72008 0x0064>;
-		};
-
-		ace_timestamp: ace_timestamp@72040 {
-			compatible = "intel,ace-timestamp";
-			reg = <0x72040 0x0032>;
-		};
-
-		ace_art_counter: ace_art_counter@72058 {
-			compatible = "intel,ace-art-counter";
-			reg = <0x72058 0x0064>;
-		};
-
-		hda_host_out: dma@72800 {
-			compatible = "intel,adsp-hda-host-out";
-			#dma-cells = <1>;
-			reg = <0x00072800 0x40>;
-			dma-channels = <9>;
-			dma-buf-addr-alignment = <128>;
-			dma-buf-size-alignment = <32>;
-			dma-copy-alignment = <32>;
-			power-domain = <&hst_domain>;
-			interrupts = <13 0 0>;
-			interrupt-parent = <&ace_intc>;
-			status = "okay";
-		};
-
-		hda_host_in: dma@72c00 {
-			compatible = "intel,adsp-hda-host-in";
-			#dma-cells = <1>;
-			reg = <0x00072c00 0x40>;
-			dma-channels = <11>;
-			dma-buf-addr-alignment = <128>;
-			dma-buf-size-alignment = <32>;
-			dma-copy-alignment = <32>;
-			power-domain = <&hst_domain>;
-			interrupts = <12 0 0>;
-			interrupt-parent = <&ace_intc>;
-			status = "okay";
-		};
-
-		adsp_host_ipc: ace_host_ipc@73000 {
-			compatible = "intel,adsp-host-ipc";
-			status = "okay";
-			reg = <0x73000 0x30>;
-			interrupts = <0 0 0>;
-			interrupt-parent = <&ace_intc>;
-		};
-
-		hda_link_out: dma@79400 {
-			compatible = "intel,adsp-hda-link-out";
-			#dma-cells = <1>;
-			reg = <0x00079400 0x40>;
-			dma-channels = <9>;
-			dma-buf-addr-alignment = <128>;
-			dma-buf-size-alignment = <32>;
-			dma-copy-alignment = <32>;
-			power-domain = <&io0_domain>;
-			status = "okay";
-		};
-
-		hda_link_in: dma@79800 {
-			compatible = "intel,adsp-hda-link-in";
-			#dma-cells = <1>;
-			reg = <0x00079800 0x40>;
-			dma-channels = <11>;
-			dma-buf-addr-alignment = <128>;
-			dma-buf-size-alignment = <32>;
-			dma-copy-alignment = <32>;
-			power-domain = <&io0_domain>;
-			status = "okay";
-		};
-
-		/* This is actually an array of per-core designware
-		 * controllers, but the special setup and extra
-		 * masking layer makes it easier for MTL to handle
-		 * this internally.
-		 */
-		ace_intc: ace_intc@94000  {
-			compatible = "intel,ace-intc";
-			reg = <0x94000 0xc00>;
-			interrupt-controller;
-			#interrupt-cells = <3>;
-			interrupts = <4 0 0>;
-			num-irqs = <28>;
-			interrupt-parent = <&core_intc>;
-		};
-
-		tlb: tlb@17e000 {
-			compatible = "intel,adsp-mtl-tlb";
-			reg = <0x17e000 0x1000>;
-			paddr-size = <12>;
-			exec-bit-idx = <14>;
-			write-bit-idx= <15>;
-		};
-
-		timer: timer {
-			compatible = "intel,adsp-timer";
-			syscon = <&tts>;
-		};
-	};
-
-	hdas {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		hda0: hda@0 {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <0>;
-		};
-		hda1: hda@1 {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <1>;
-		};
-		hda2: hda@2 {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <2>;
-		};
-		hda3: hda@3 {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <3>;
-		};
-		hda4: hda@4 {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <4>;
-		};
-		hda5: hda@5 {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <5>;
-		};
-		hda6: hda@6 {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <6>;
-		};
-		hda7: hda@7 {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <7>;
-		};
-		hda8: hda@8 {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <8>;
-		};
-		hda9: hda@9 {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <9>;
-		};
-		hda10: hda@a {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <0x0a>;
-		};
-		hda11: hda@b {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <0x0b>;
-		};
-		hda12: hda@c {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <0x0c>;
-		};
-		hda13: hda@d {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <0x0d>;
-		};
-		hda14: hda@e {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <0x0e>;
-		};
-		hda15: hda@f {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <0x0f>;
-		};
-		hda16: hda@10 {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <0x10>;
-		};
-		hda17: hda@11 {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <0x11>;
-		};
-		hda18: hda@12 {
-			compatible = "intel,hda-dai";
-			status = "okay";
-			reg = <0x12>;
-		};
-	};
-};
diff --git a/soc/intel/intel_adsp/ace/CMakeLists.txt b/soc/intel/intel_adsp/ace/CMakeLists.txt
index 519275d9047..0c9c43eb339 100644
--- a/soc/intel/intel_adsp/ace/CMakeLists.txt
+++ b/soc/intel/intel_adsp/ace/CMakeLists.txt
@@ -20,7 +20,7 @@ zephyr_library_sources_ifdef(CONFIG_SOC_INTEL_COMM_WIDGET comm_widget.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_INTEL_COMM_WIDGET comm_widget_messages.c)
 
 if (CONFIG_XTENSA_MMU)
-  zephyr_library_sources_ifdef(CONFIG_SOC_INTEL_ACE30 mmu_ace30.c)
+  zephyr_library_sources_ifdef(CONFIG_SOC_INTEL_ACE30_PTL mmu_ptl.c)
 endif()
 
 set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld CACHE INTERNAL "")
diff --git a/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace30 b/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace30_ptl
similarity index 96%
rename from soc/intel/intel_adsp/ace/Kconfig.defconfig.ace30
rename to soc/intel/intel_adsp/ace/Kconfig.defconfig.ace30_ptl
index a11e50a2af0..b5c67ea0f0b 100644
--- a/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace30
+++ b/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace30_ptl
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 
-if SOC_INTEL_ACE30
+if SOC_INTEL_ACE30_PTL
 
 config MP_MAX_NUM_CPUS
 	default 5
diff --git a/soc/intel/intel_adsp/ace/Kconfig.soc b/soc/intel/intel_adsp/ace/Kconfig.soc
index 729cd1eb4ab..89ef2eb30db 100644
--- a/soc/intel/intel_adsp/ace/Kconfig.soc
+++ b/soc/intel/intel_adsp/ace/Kconfig.soc
@@ -20,7 +20,7 @@ config SOC_INTEL_ACE20_LNL
 	help
 	  ACE 2.0 Lunar Lake PCH
 
-config SOC_INTEL_ACE30
+config SOC_INTEL_ACE30_PTL
 	bool
 	select SOC_SERIES_INTEL_ADSP_ACE
 	help
@@ -32,9 +32,9 @@ config SOC_SERIES
 config SOC_TOOLCHAIN_NAME
 	default "intel_ace15_mtpm" if SOC_INTEL_ACE15_MTPM
 	default "intel_ace15_mtpm" if SOC_INTEL_ACE20_LNL
-	default "intel_ace30_ptl" if SOC_INTEL_ACE30
+	default "intel_ace30_ptl" if SOC_INTEL_ACE30_PTL
 
 config SOC
 	default "ace15_mtpm" if SOC_INTEL_ACE15_MTPM
 	default "ace20_lnl" if SOC_INTEL_ACE20_LNL
-	default "ace30" if SOC_INTEL_ACE30
+	default "ace30_ptl" if SOC_INTEL_ACE30_PTL
diff --git a/soc/intel/intel_adsp/ace/include/ace30/adsp_boot.h b/soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_boot.h
similarity index 100%
rename from soc/intel/intel_adsp/ace/include/ace30/adsp_boot.h
rename to soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_boot.h
diff --git a/soc/intel/intel_adsp/ace/include/ace30/adsp_interrupt.h b/soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_interrupt.h
similarity index 100%
rename from soc/intel/intel_adsp/ace/include/ace30/adsp_interrupt.h
rename to soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_interrupt.h
diff --git a/soc/intel/intel_adsp/ace/include/ace30/adsp_ipc_regs.h b/soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_ipc_regs.h
similarity index 100%
rename from soc/intel/intel_adsp/ace/include/ace30/adsp_ipc_regs.h
rename to soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_ipc_regs.h
diff --git a/soc/intel/intel_adsp/ace/include/ace30/adsp_power.h b/soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_power.h
similarity index 100%
rename from soc/intel/intel_adsp/ace/include/ace30/adsp_power.h
rename to soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_power.h
diff --git a/soc/intel/intel_adsp/ace/include/ace30/adsp_shim.h b/soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_shim.h
similarity index 100%
rename from soc/intel/intel_adsp/ace/include/ace30/adsp_shim.h
rename to soc/intel/intel_adsp/ace/include/ace30_ptl/adsp_shim.h
diff --git a/soc/intel/intel_adsp/ace/include/ace30/dmic_regs_ace3x.h b/soc/intel/intel_adsp/ace/include/ace30_ptl/dmic_regs_ace3x.h
similarity index 100%
rename from soc/intel/intel_adsp/ace/include/ace30/dmic_regs_ace3x.h
rename to soc/intel/intel_adsp/ace/include/ace30_ptl/dmic_regs_ace3x.h
diff --git a/soc/intel/intel_adsp/ace/include/dmic_regs.h b/soc/intel/intel_adsp/ace/include/dmic_regs.h
index bff34b2dfc9..df69d3687f1 100644
--- a/soc/intel/intel_adsp/ace/include/dmic_regs.h
+++ b/soc/intel/intel_adsp/ace/include/dmic_regs.h
@@ -351,8 +351,8 @@
 #include <ace20_lnl/dmic_regs_ace2x.h>
 #elif CONFIG_SOC_INTEL_ACE15_MTPM
 #include <ace15_mtpm/dmic_regs_ace1x.h>
-#elif CONFIG_SOC_INTEL_ACE30
-#include <ace30/dmic_regs_ace3x.h>
+#elif CONFIG_SOC_INTEL_ACE30_PTL
+#include <ace30_ptl/dmic_regs_ace3x.h>
 #else
 #error "Unknown SoC"
 #endif
diff --git a/soc/intel/intel_adsp/common/clk.c b/soc/intel/intel_adsp/common/clk.c
index 66c86202198..ebcda7be1e7 100644
--- a/soc/intel/intel_adsp/common/clk.c
+++ b/soc/intel/intel_adsp/common/clk.c
@@ -96,7 +96,7 @@ void adsp_clock_init(void)
 	} else {
 		platform_lowest_freq_idx = ADSP_CPU_CLOCK_FREQ_IPLL;
 	}
-#if CONFIG_SOC_INTEL_ACE30
+#if CONFIG_SOC_INTEL_ACE30_PTL
 	/* Set the Cardinal clock divider to 18 to get 24.576MHz */
 	ACE_DfPMCCU.dfcrodiv &= ACE_CRODIV_CARCDS_MASK;
 	ACE_DfPMCCU.dfcrodiv |= ACE_CRODIV_CARCDS(0x12);
diff --git a/soc/intel/intel_adsp/soc.yml b/soc/intel/intel_adsp/soc.yml
index e797abd9de6..0f889aea963 100644
--- a/soc/intel/intel_adsp/soc.yml
+++ b/soc/intel/intel_adsp/soc.yml
@@ -5,7 +5,7 @@ family:
         socs:
           - name: ace15_mtpm
           - name: ace20_lnl
-          - name: ace30
+          - name: ace30_ptl
       - name: intel_adsp_cavs
         socs:
           - name: cavs25
diff --git a/tests/kernel/mem_protect/sys_sem/boards/intel_adsp_ace30.conf b/tests/kernel/mem_protect/sys_sem/boards/intel_adsp_ace30_ptl.conf
similarity index 100%
rename from tests/kernel/mem_protect/sys_sem/boards/intel_adsp_ace30.conf
rename to tests/kernel/mem_protect/sys_sem/boards/intel_adsp_ace30_ptl.conf
diff --git a/tests/kernel/mutex/sys_mutex/boards/intel_adsp_ace30.conf b/tests/kernel/mutex/sys_mutex/boards/intel_adsp_ace30_ptl.conf
similarity index 100%
rename from tests/kernel/mutex/sys_mutex/boards/intel_adsp_ace30.conf
rename to tests/kernel/mutex/sys_mutex/boards/intel_adsp_ace30_ptl.conf
diff --git a/tests/kernel/queue/boards/intel_adsp_ace30.conf b/tests/kernel/queue/boards/intel_adsp_ace30_ptl.conf
similarity index 100%
rename from tests/kernel/queue/boards/intel_adsp_ace30.conf
rename to tests/kernel/queue/boards/intel_adsp_ace30_ptl.conf
diff --git a/tests/lib/c_lib/thrd/boards/intel_adsp_ace30.conf b/tests/lib/c_lib/thrd/boards/intel_adsp_ace30_ptl.conf
similarity index 100%
rename from tests/lib/c_lib/thrd/boards/intel_adsp_ace30.conf
rename to tests/lib/c_lib/thrd/boards/intel_adsp_ace30_ptl.conf

From d857fcca27d86c52cf59d6f683b71a2fe031dfd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:33 +0100
Subject: [PATCH 1507/2913] Revert "[nrf fromtree] dts: bindings: power-domain:
 add binding for NXP's SCU-managed PDs"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 05a00eeb72ceeb67bf8ab728c4a5b81a6f562f46.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/bindings/power-domain/nxp,scu-pd.yaml | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 dts/bindings/power-domain/nxp,scu-pd.yaml

diff --git a/dts/bindings/power-domain/nxp,scu-pd.yaml b/dts/bindings/power-domain/nxp,scu-pd.yaml
deleted file mode 100644
index 7e1d0855389..00000000000
--- a/dts/bindings/power-domain/nxp,scu-pd.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2024 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-description: NXP SCU-managed power domain
-
-compatible: "nxp,scu-pd"
-
-include: power-domain.yaml
-
-properties:
-  nxp,resource-id:
-    type: int
-    required: true
-    description:
-      Number used by the firmware running on the SCU to identify
-      the resource on which the PD-related operations are to be
-      performed.

From 1e393dfd0499a31ab72bbd78d201dc17a5524a88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:33 +0100
Subject: [PATCH 1508/2913] Revert "[nrf fromtree] boards: nordic: nrf54l15dk:
 Fix references to pdk"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0127206ce0dcbd4271cf24d82abe1188a39c1a7e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf54l15dk/doc/index.rst                          | 2 +-
 tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 2 +-
 .../boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay  | 2 +-
 ...dk_nrf54l15_common.dtsi => nrf54l15pdk_nrf54l15_common.dtsi} | 0
 .../boards/nrf54l15bsim_nrf54l15_cpuapp.overlay                 | 2 +-
 ...54l15_cpuapp.overlay => nrf54l15pdk_nrf54l15_cpuapp.overlay} | 0
 tests/drivers/spi/spi_controller_peripheral/README.txt          | 2 +-
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename tests/boards/nrf/qdec/boards/{nrf54l15dk_nrf54l15_common.dtsi => nrf54l15pdk_nrf54l15_common.dtsi} (100%)
 rename tests/drivers/counter/counter_basic_api/boards/{nrf54l15dk_nrf54l15_cpuapp.overlay => nrf54l15pdk_nrf54l15_cpuapp.overlay} (100%)

diff --git a/boards/nordic/nrf54l15dk/doc/index.rst b/boards/nordic/nrf54l15dk/doc/index.rst
index 4886cadde76..f7b927bdc86 100644
--- a/boards/nordic/nrf54l15dk/doc/index.rst
+++ b/boards/nordic/nrf54l15dk/doc/index.rst
@@ -101,7 +101,7 @@ to be built as multicore configuration with code snippet called ``vpr_launcher``
 for the application core.
 
 Enter the following command to compile ``hello_world`` for the FLPR core::
- west build -p -b nrf54l15dk/nrf54l15/cpuflpr --sysbuild -- -DSB_VPR_LAUNCHER=y
+ west build -p -b nrf54l15pdk/nrf54l15/cpuflpr --sysbuild -- -DSB_VPR_LAUNCHER=y
 
 Flashing
 ========
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 65d42ec4086..dc39be6deb3 100644
--- a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "nrf54l15dk_nrf54l15_common.dtsi"
+#include "nrf54l15pdk_nrf54l15_common.dtsi"
 
 /* To prevent enabling console receiver. */
 &uart20 {
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
index 76038a2fa01..059222c801b 100644
--- a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "nrf54l15dk_nrf54l15_common.dtsi"
+#include "nrf54l15pdk_nrf54l15_common.dtsi"
 
 /* To prevent enabling console receiver. */
 &uart30 {
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_common.dtsi b/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi
similarity index 100%
rename from tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_common.dtsi
rename to tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
index e26399cd4c4..b1942e1f84f 100644
--- a/tests/drivers/counter/counter_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/counter/counter_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay
@@ -1 +1 @@
-#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
+#include "nrf54l15pdk_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to tests/drivers/counter/counter_basic_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/spi/spi_controller_peripheral/README.txt b/tests/drivers/spi/spi_controller_peripheral/README.txt
index 5d04e8da4f9..3098b50d0f4 100644
--- a/tests/drivers/spi/spi_controller_peripheral/README.txt
+++ b/tests/drivers/spi/spi_controller_peripheral/README.txt
@@ -2,7 +2,7 @@ In this test suite two instances of the SPI peripheral are connected together.
 One SPI instance works as a controller, second one is configured as a peripheral.
 In each test, both instances get identical configuration (CPOL, CPHA, bitrate, etc.).
 
-Four GPIO loopbacks are required (see overlay for nrf54l15dk for reference):
+Four GPIO loopbacks are required (see overlay for nrf54l15pdk for reference):
 1. spi22-SPIM_SCK connected with spi21-SPIS_SCK,
 2. spi22-SPIM_MISO connected with spi21-SPIS_MISO,
 3. spi22-SPIM_MOSI connected with spi21-SPIS_MOSI,

From 9978199dd27031740a64f6729d307078bd69faad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:33 +0100
Subject: [PATCH 1509/2913] Revert "[nrf fromtree] soc: nordic: nrf53:
 SOC_NRF53_CPUNET_ENABLE should not depend on !BT"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 625f08237074e17dbdcf8d24f4f8223f8bc87b6f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf53/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/soc/nordic/nrf53/Kconfig b/soc/nordic/nrf53/Kconfig
index 823d1be8e2d..6527509a1f8 100644
--- a/soc/nordic/nrf53/Kconfig
+++ b/soc/nordic/nrf53/Kconfig
@@ -197,6 +197,7 @@ config SOC_NRF53_CPUNET_MGMT
 
 config SOC_NRF53_CPUNET_ENABLE
 	bool "NRF53 Network MCU is enabled at boot time"
+	depends on !BT
 	default y if NRF_802154_SER_HOST
 	select SOC_NRF53_CPUNET_MGMT
 	help
@@ -214,6 +215,7 @@ config BOARD_ENABLE_CPUNET
 	bool "[DEPRECATED] NRF53 Network MCU is enabled at boot time"
 	select SOC_NRF53_CPUNET_ENABLE
 	select DEPRECATED
+	depends on !BT
 	help
 	  Use SOC_NRF53_CPUNET_ENABLE instead.
 

From a927e0ae7882e0468118cc19e7c25c9d63f73b3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:33 +0100
Subject: [PATCH 1510/2913] Revert "[nrf fromlist] drivers: timer: grtc: Add
 LFPRC as the source of GRTC"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d200a119c745723cad4cd61d6c06e3a6b4206820.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/timer/nrf_grtc_timer.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/drivers/timer/nrf_grtc_timer.c b/drivers/timer/nrf_grtc_timer.c
index ee3f35e09d0..fb9c859caeb 100644
--- a/drivers/timer/nrf_grtc_timer.c
+++ b/drivers/timer/nrf_grtc_timer.c
@@ -426,12 +426,8 @@ int z_nrf_grtc_wakeup_prepare(uint64_t wake_time_us)
 		nrfy_grtc_timeout_get(NRF_GRTC) * CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC / 32768 +
 		MAX_CC_LATCH_WAIT_TIME_US;
 	k_busy_wait(wait_time);
-#if NRF_GRTC_HAS_CLKSEL
-#if defined(CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC)
-	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFLPRC);
-#elif DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lfxo))
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lfxo)) && NRF_GRTC_HAS_CLKSEL
 	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFXO);
-#endif
 #endif
 	k_spin_unlock(&lock, key);
 	return 0;
@@ -505,15 +501,11 @@ static int sys_clock_driver_init(void)
 	z_nrf_clock_control_lf_on(mode);
 #endif
 
-#if defined(CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT) && NRF_GRTC_HAS_CLKSEL
-#if defined(CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC)
-	/* Switch to LFPRC as the low-frequency clock source. */
-	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFLPRC);
-#elif DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lfxo))
+#if defined(CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT) &&                                             \
+	DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lfxo)) && NRF_GRTC_HAS_CLKSEL
 	/* Switch to LFXO as the low-frequency clock source. */
 	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFXO);
 #endif
-#endif
 
 #if defined(CONFIG_NRF_GRTC_ALWAYS_ON)
 	nrfx_grtc_active_request_set(true);

From 919f08b610df7b9d22d0f326348d9fce5793ca5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:33 +0100
Subject: [PATCH 1511/2913] Revert "[nrf fromlist] drivers: serial: nrfx_uarte:
 Fix RX path without low power modes"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ea682c0c51a4e195686a75da7fb902d3ca7b592d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/uart_nrfx_uarte.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 2fb2ab3537e..5c19485946c 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -1516,7 +1516,7 @@ static void rxto_isr(const struct device *dev)
 			async_rx->total_user_byte_cnt += rx_flush(dev);
 		}
 #endif
-	} else if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || LOW_POWER_ENABLED(config)) {
+	} else {
 		async_rx->flush_cnt = rx_flush(dev);
 	}
 

From c49512090a935cea6f14f1b74f14d0548f34ae17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:33 +0100
Subject: [PATCH 1512/2913] Revert "[nrf fromlist] drivers: nrfwifi: WAR for
 performance regression"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit bbc43a302df9df02bb4bec275b2168edaa5cfa54.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c b/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c
index 754fe149713..46c92def8f7 100644
--- a/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c
+++ b/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c
@@ -125,10 +125,7 @@ BUILD_ASSERT(QSPI_IF_DEVICE_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 16),
  * starts. It was measured with a logic analyzer (unfortunately, the nRF5340
  * specification does not provide any numbers in this regard).
  */
-/* FIXME: This has adverse impact on performance, ~3Mbps, so, for now, it is
- * disabled till further investigation.
- */
-#define BASE_CLOCK_SWITCH_DELAY_US 0
+#define BASE_CLOCK_SWITCH_DELAY_US 7
 
 #else
 /*

From 7ecab9e997d2cb50db70b25fb09d69444033ff56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:33 +0100
Subject: [PATCH 1513/2913] Revert "[nrf fromlist] soc: nordic: nrf54l: tune
 configuration of DCDC regulator"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5d0724fe93d14b44517ae7e83f7de4fc8fb889a9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54l/soc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index b0ed4ba0ef7..840d767f798 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -154,8 +154,8 @@ static int nordicsemi_nrf54l_init(void)
 
 #if (DT_PROP(DT_NODELABEL(vregmain), regulator_initial_mode) == NRF5X_REG_MODE_DCDC)
 #if defined(__CORTEX_M) && !defined(NRF_TRUSTZONE_NONSECURE) && defined(__ARM_FEATURE_CMSE)
-	if (*(uint32_t volatile *)0x00FFC334 <= 0x180A1D00) {
-		*(uint32_t volatile *)0x50120640 = 0x1EA9E040;
+	if (*(uint32_t *)0x00FFC334 <= 0x180A1D00) {
+		*(uint32_t *)0x50120640 = 0x1FAAE85C;
 	}
 #endif
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);

From 11ffff513b81837ef0d7117195994ec09291fe25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:33 +0100
Subject: [PATCH 1514/2913] Revert "[nrf fromlist] drivers: nrfwifi: Fix CSUM
 support"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6b120485b8e524dbfc6ac0273059b1a304341824.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/net_if.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
index 19b232b6fe3..1a8b0c7361a 100644
--- a/drivers/wifi/nrfwifi/src/net_if.c
+++ b/drivers/wifi/nrfwifi/src/net_if.c
@@ -980,23 +980,10 @@ int nrf_wifi_if_get_config_zep(const struct device *dev,
 		goto unlock;
 	}
 
-	memset(config, 0, sizeof(struct ethernet_config));
-
 	if (type == ETHERNET_CONFIG_TYPE_TXINJECTION_MODE) {
 		config->txinjection_mode =
 			def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->txinjection_mode;
 	}
-#ifdef CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD
-	if (type  == ETHERNET_CONFIG_TYPE_TX_CHECKSUM_SUPPORT ||
-	    type == ETHERNET_CONFIG_TYPE_RX_CHECKSUM_SUPPORT) {
-		config->chksum_support = ETHERNET_CHECKSUM_SUPPORT_IPV4_HEADER |
-					 ETHERNET_CHECKSUM_SUPPORT_IPV4_ICMP |
-					 ETHERNET_CHECKSUM_SUPPORT_IPV6_HEADER |
-					 ETHERNET_CHECKSUM_SUPPORT_IPV6_ICMP |
-					 ETHERNET_CHECKSUM_SUPPORT_TCP |
-					 ETHERNET_CHECKSUM_SUPPORT_UDP;
-	}
-#endif
 	ret = 0;
 unlock:
 	k_mutex_unlock(&vif_ctx_zep->vif_lock);

From b3f769596c7872da9597a725c4676e4eb1b42562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:33 +0100
Subject: [PATCH 1515/2913] Revert "[nrf fromlist] drivers/wifi/nrfwifi: Add
 buffer for discard bytes"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 54bd7dcd3a0c344ca94531af2f043c09dccc367c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/qspi/src/spi_if.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/qspi/src/spi_if.c b/drivers/wifi/nrfwifi/src/qspi/src/spi_if.c
index 4bf9f464391..2cdf3662fd5 100644
--- a/drivers/wifi/nrfwifi/src/qspi/src/spi_if.c
+++ b/drivers/wifi/nrfwifi/src/qspi/src/spi_if.c
@@ -58,7 +58,6 @@ static int spim_xfer_rx(unsigned int addr, void *data, unsigned int len, unsigne
 		addr & 0xFF,
 		0 /* dummy byte */
 	};
-	uint8_t discard[sizeof(hdr) + 2 * 4];
 
 	const struct spi_buf tx_buf[] = {
 		{.buf = hdr,  .len = sizeof(hdr) },
@@ -68,17 +67,12 @@ static int spim_xfer_rx(unsigned int addr, void *data, unsigned int len, unsigne
 	const struct spi_buf_set tx = { .buffers = tx_buf, .count = 2 };
 
 	const struct spi_buf rx_buf[] = {
-		{.buf = discard,  .len = sizeof(hdr) + discard_bytes},
+		{.buf = NULL,  .len = sizeof(hdr) + discard_bytes},
 		{.buf = data, .len = len },
 	};
 
 	const struct spi_buf_set rx = { .buffers = rx_buf, .count = 2 };
 
-	if (rx_buf[0].len > sizeof(discard)) {
-		LOG_ERR("Discard bytes too large, please adjust buf size");
-		return -EINVAL;
-	}
-
 	return spi_transceive_dt(&spi_spec, &tx, &rx);
 }
 

From d4bda21364c07bd9784f69e4d61e5983aec8f4d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:33 +0100
Subject: [PATCH 1516/2913] Revert "[nrf fromlist] drivers: nrfiwif: Enable
 recovery by default"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cdea08647bf0b46e6f115819c64dd1ef2073435b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 7087e20beb6..36935ed8ba1 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -661,7 +661,6 @@ config NRF_WIFI_AP_DEAD_DETECT_TIMEOUT
 config NRF_WIFI_RPU_RECOVERY
 	bool "RPU recovery mechanism"
 	depends on NRF_WIFI_LOW_POWER
-	default y
 	select EXPERIMENTAL
 	help
 		Enable RPU recovery mechanism to recover from RPU (nRF70) hang.

From bb84db6d4477e332cbc62a8dec8b2e9688f2ba9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:34 +0100
Subject: [PATCH 1517/2913] Revert "[nrf fromlist] drivers: nrfwifi: Add a NULL
 check for FMAC context"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6ef5dce7ea538848ee4fa0f265b8cfa818a1e3e1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/net_if.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
index 1a8b0c7361a..a4404cfb1a7 100644
--- a/drivers/wifi/nrfwifi/src/net_if.c
+++ b/drivers/wifi/nrfwifi/src/net_if.c
@@ -877,7 +877,7 @@ int nrf_wifi_if_stop_zep(const struct device *dev)
 	}
 
 	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
-	if (!rpu_ctx_zep || !rpu_ctx_zep->rpu_ctx) {
+	if (!rpu_ctx_zep) {
 		LOG_ERR("%s: rpu_ctx_zep is NULL",
 			__func__);
 		goto unlock;

From b64566ea06f59cc99103156ecc199f7568c28305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:34 +0100
Subject: [PATCH 1518/2913] Revert "[nrf fromlist] manifest: hal_nordic: Pull
 logging level fix"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit acc650623e552f2f561e8e89a02aafceeb80bf5e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 7aec642cf8a..f2a65b025c9 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 2d78179cc4f0601a891553132b13184fa51b6ef9
+      revision: cb7600a1be4c8b177867e6d463729c07dd3f6d73
       path: modules/hal/nordic
       groups:
         - hal

From de7d84e2b331b8bcacd697220932f595ffe82edd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:34 +0100
Subject: [PATCH 1519/2913] Revert "[nrf fromtree] pm: policy: allow using
 latency API in standalone mode"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 51d8e76bc280c175ce94469290c1fb7ee7c998bc.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/pm/policy.h      | 129 ++++++++++++++++----------------
 subsys/pm/policy/CMakeLists.txt |   2 -
 subsys/pm/policy/Kconfig        |  10 ---
 3 files changed, 63 insertions(+), 78 deletions(-)

diff --git a/include/zephyr/pm/policy.h b/include/zephyr/pm/policy.h
index e1e910f3e0a..caba887805a 100644
--- a/include/zephyr/pm/policy.h
+++ b/include/zephyr/pm/policy.h
@@ -137,6 +137,49 @@ void pm_policy_state_lock_put(enum pm_state state, uint8_t substate_id);
  */
 bool pm_policy_state_lock_is_active(enum pm_state state, uint8_t substate_id);
 
+/**
+ * @brief Add a new latency requirement.
+ *
+ * The system will not enter any power state that would make the system to
+ * exceed the given latency value.
+ *
+ * @param req Latency request.
+ * @param value_us Maximum allowed latency in microseconds.
+ */
+void pm_policy_latency_request_add(struct pm_policy_latency_request *req,
+				   uint32_t value_us);
+
+/**
+ * @brief Update a latency requirement.
+ *
+ * @param req Latency request.
+ * @param value_us New maximum allowed latency in microseconds.
+ */
+void pm_policy_latency_request_update(struct pm_policy_latency_request *req,
+				      uint32_t value_us);
+
+/**
+ * @brief Remove a latency requirement.
+ *
+ * @param req Latency request.
+ */
+void pm_policy_latency_request_remove(struct pm_policy_latency_request *req);
+
+/**
+ * @brief Subscribe to maximum latency changes.
+ *
+ * @param req Subscription request.
+ * @param cb Callback function (NULL to disable).
+ */
+void pm_policy_latency_changed_subscribe(struct pm_policy_latency_subscription *req,
+					 pm_policy_latency_changed_cb_t cb);
+
+/**
+ * @brief Unsubscribe to maximum latency changes.
+ *
+ * @param req Subscription request.
+ */
+void pm_policy_latency_changed_unsubscribe(struct pm_policy_latency_subscription *req);
 
 /**
  * @brief Register an event.
@@ -234,6 +277,26 @@ static inline bool pm_policy_state_lock_is_active(enum pm_state state, uint8_t s
 	return false;
 }
 
+static inline void pm_policy_latency_request_add(
+	struct pm_policy_latency_request *req, uint32_t value_us)
+{
+	ARG_UNUSED(req);
+	ARG_UNUSED(value_us);
+}
+
+static inline void pm_policy_latency_request_update(
+	struct pm_policy_latency_request *req, uint32_t value_us)
+{
+	ARG_UNUSED(req);
+	ARG_UNUSED(value_us);
+}
+
+static inline void pm_policy_latency_request_remove(
+	struct pm_policy_latency_request *req)
+{
+	ARG_UNUSED(req);
+}
+
 static inline void pm_policy_event_register(struct pm_policy_event *evt, uint32_t cycle)
 {
 	ARG_UNUSED(evt);
@@ -268,72 +331,6 @@ static inline int32_t pm_policy_next_event_ticks(void)
 
 #endif /* CONFIG_PM */
 
-#if defined(CONFIG_PM) || defined(CONFIG_PM_POLICY_LATENCY_STANDALONE) || defined(__DOXYGEN__)
-/**
- * @brief Add a new latency requirement.
- *
- * The system will not enter any power state that would make the system to
- * exceed the given latency value.
- *
- * @param req Latency request.
- * @param value_us Maximum allowed latency in microseconds.
- */
-void pm_policy_latency_request_add(struct pm_policy_latency_request *req,
-				   uint32_t value_us);
-
-/**
- * @brief Update a latency requirement.
- *
- * @param req Latency request.
- * @param value_us New maximum allowed latency in microseconds.
- */
-void pm_policy_latency_request_update(struct pm_policy_latency_request *req,
-				      uint32_t value_us);
-
-/**
- * @brief Remove a latency requirement.
- *
- * @param req Latency request.
- */
-void pm_policy_latency_request_remove(struct pm_policy_latency_request *req);
-
-/**
- * @brief Subscribe to maximum latency changes.
- *
- * @param req Subscription request.
- * @param cb Callback function (NULL to disable).
- */
-void pm_policy_latency_changed_subscribe(struct pm_policy_latency_subscription *req,
-					 pm_policy_latency_changed_cb_t cb);
-
-/**
- * @brief Unsubscribe to maximum latency changes.
- *
- * @param req Subscription request.
- */
-void pm_policy_latency_changed_unsubscribe(struct pm_policy_latency_subscription *req);
-#else
-static inline void pm_policy_latency_request_add(
-	struct pm_policy_latency_request *req, uint32_t value_us)
-{
-	ARG_UNUSED(req);
-	ARG_UNUSED(value_us);
-}
-
-static inline void pm_policy_latency_request_update(
-	struct pm_policy_latency_request *req, uint32_t value_us)
-{
-	ARG_UNUSED(req);
-	ARG_UNUSED(value_us);
-}
-
-static inline void pm_policy_latency_request_remove(
-	struct pm_policy_latency_request *req)
-{
-	ARG_UNUSED(req);
-}
-#endif /* CONFIG_PM CONFIG_PM_POLICY_LATENCY_STANDALONE */
-
 /**
  * @}
  */
diff --git a/subsys/pm/policy/CMakeLists.txt b/subsys/pm/policy/CMakeLists.txt
index 899e9f60b20..e9d7d791ec5 100644
--- a/subsys/pm/policy/CMakeLists.txt
+++ b/subsys/pm/policy/CMakeLists.txt
@@ -11,6 +11,4 @@ if(CONFIG_PM)
   if(CONFIG_PM_POLICY_DEFAULT)
     zephyr_library_sources(policy_default.c)
   endif()
-elseif(CONFIG_PM_POLICY_LATENCY_STANDALONE)
-  zephyr_library_sources(policy_latency.c)
 endif()
diff --git a/subsys/pm/policy/Kconfig b/subsys/pm/policy/Kconfig
index 1a224c4ecc7..2060c52cb13 100644
--- a/subsys/pm/policy/Kconfig
+++ b/subsys/pm/policy/Kconfig
@@ -32,13 +32,3 @@ config PM_POLICY_DEVICE_CONSTRAINTS
 	  it is needed by the device.
 
 endif # PM
-
-config PM_POLICY_LATENCY_STANDALONE
-	bool "Allow gathering latency requirements in standalone mode"
-	depends on !PM
-	help
-	  This option allows using the pm_policy_latency* APIs to gather latency
-	  requirements on systems that do not support PM (e.g. systems whithout
-	  CPU idle states). Because the API has a subscription mechanism, it can
-	  be useful to perform system-level adjustments based on latency
-	  requirements gathered from multiple system components.

From cc48d66f42d138044db2c8a1e52bf8548ca25ca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:34 +0100
Subject: [PATCH 1520/2913] Revert "[nrf fromtree] pm: policy: split policy
 APIs implementations"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 630e9b374cd4e22f024975c05896058849e3c291.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/pm/CMakeLists.txt              |   4 +-
 subsys/pm/Kconfig                     |  31 +-
 subsys/pm/policy.c                    | 456 ++++++++++++++++++++++++++
 subsys/pm/policy/CMakeLists.txt       |  14 -
 subsys/pm/policy/Kconfig              |  34 --
 subsys/pm/policy/policy_default.c     |  79 -----
 subsys/pm/policy/policy_device_lock.c | 120 -------
 subsys/pm/policy/policy_events.c      | 101 ------
 subsys/pm/policy/policy_latency.c     | 107 ------
 subsys/pm/policy/policy_state_lock.c  |  86 -----
 10 files changed, 486 insertions(+), 546 deletions(-)
 create mode 100644 subsys/pm/policy.c
 delete mode 100644 subsys/pm/policy/CMakeLists.txt
 delete mode 100644 subsys/pm/policy/Kconfig
 delete mode 100644 subsys/pm/policy/policy_default.c
 delete mode 100644 subsys/pm/policy/policy_device_lock.c
 delete mode 100644 subsys/pm/policy/policy_events.c
 delete mode 100644 subsys/pm/policy/policy_latency.c
 delete mode 100644 subsys/pm/policy/policy_state_lock.c

diff --git a/subsys/pm/CMakeLists.txt b/subsys/pm/CMakeLists.txt
index 67d67729d8a..0e961abda78 100644
--- a/subsys/pm/CMakeLists.txt
+++ b/subsys/pm/CMakeLists.txt
@@ -1,12 +1,10 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(CONFIG_PM)
-  zephyr_sources(pm.c state.c)
+  zephyr_sources(pm.c policy.c state.c)
   zephyr_sources_ifdef(CONFIG_PM_STATS pm_stats.c)
 endif()
 
-add_subdirectory(policy)
-
 zephyr_sources_ifdef(CONFIG_PM_DEVICE device.c)
 zephyr_sources_ifdef(CONFIG_PM_DEVICE_RUNTIME device_runtime.c)
 zephyr_sources_ifdef(CONFIG_PM_DEVICE_SHELL pm_shell.c)
diff --git a/subsys/pm/Kconfig b/subsys/pm/Kconfig
index 8acee7c6848..bf69f778081 100644
--- a/subsys/pm/Kconfig
+++ b/subsys/pm/Kconfig
@@ -19,8 +19,6 @@ config PM
 	  power management subsystem of the number of ticks until the next kernel
 	  timer is due to expire.
 
-rsource "policy/Kconfig"
-
 if PM
 
 module = PM
@@ -53,6 +51,35 @@ config PM_NEED_ALL_DEVICES_IDLE
 	  When this option is enabled, check that no devices are busy before
 	  entering into system low power mode.
 
+choice PM_POLICY
+	prompt "Idle State Power Management Policy"
+	default PM_POLICY_DEFAULT
+	help
+	  Select the idle state power management policy.
+
+config PM_POLICY_DEFAULT
+	bool "Default PM policy"
+	help
+	  This option selects the default PM policy. Default policy is based
+	  on CPU residency times and other constraints imposed by the drivers or
+	  application.
+
+config PM_POLICY_CUSTOM
+	bool "Custom PM Policy"
+	help
+	  This options allows applications to override the default policy with
+	  a custom implementation.
+
+endchoice
+
+config PM_POLICY_DEVICE_CONSTRAINTS
+	bool "Power state constraints per device"
+	help
+	  This option allows devices to have a list of power states
+	  that when the system transition to them, cause power loss in the device.
+	  This used to set and release power state constraints when
+	  it is needed by the device.
+
 endif # PM
 
 config PM_DEVICE
diff --git a/subsys/pm/policy.c b/subsys/pm/policy.c
new file mode 100644
index 00000000000..39742cdf38c
--- /dev/null
+++ b/subsys/pm/policy.c
@@ -0,0 +1,456 @@
+/*
+ * Copyright (c) 2018 Intel Corporation.
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/pm/pm.h>
+#include <zephyr/pm/policy.h>
+#include <zephyr/pm/state.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/time_units.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/pm/device.h>
+
+#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
+
+#define DT_SUB_LOCK_INIT(node_id)				\
+	{ .state = PM_STATE_DT_INIT(node_id),			\
+	  .substate_id = DT_PROP_OR(node_id, substate_id, 0),	\
+	  .lock = ATOMIC_INIT(0),				\
+	},
+
+/**
+ * State and substate lock structure.
+ *
+ * This struct is associating a reference counting to each <state,substate>
+ * couple to be used with the pm_policy_substate_lock_* functions.
+ *
+ * Operations on this array are in the order of O(n) with the number of power
+ * states and this is mostly due to the random nature of the substate value
+ * (that can be anything from a small integer value to a bitmask). We can
+ * probably do better with an hashmap.
+ */
+static struct {
+	enum pm_state state;
+	uint8_t substate_id;
+	atomic_t lock;
+} substate_lock_t[] = {
+	DT_FOREACH_STATUS_OKAY(zephyr_power_state, DT_SUB_LOCK_INIT)
+};
+
+#endif
+
+#if defined(CONFIG_PM_POLICY_DEVICE_CONSTRAINTS)
+
+struct pm_state_device_constraint {
+	const struct device *const dev;
+	size_t pm_constraints_size;
+	struct pm_state_constraint *constraints;
+};
+
+/**
+ * @brief Synthesize the name of the object that holds a device pm constraint.
+ *
+ * @param dev_id Device identifier.
+ */
+#define PM_CONSTRAINTS_NAME(node_id) _CONCAT(__devicepmconstraints_, node_id)
+
+/**
+ * @brief initialize a device pm constraint with information from devicetree.
+ *
+ * @param node_id Node identifier.
+ */
+#define PM_STATE_CONSTRAINT_INIT(node_id)                                     \
+	{                                                                     \
+		.state = PM_STATE_DT_INIT(node_id),                           \
+		.substate_id = DT_PROP_OR(node_id, substate_id, 0),           \
+	}
+
+/**
+ * @brief Helper macro to define a device pm constraints.
+ */
+#define PM_STATE_CONSTRAINT_DEFINE(i, node_id)                                  \
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_PHANDLE_BY_IDX(node_id,          \
+		zephyr_disabling_power_states, i)),                             \
+		(PM_STATE_CONSTRAINT_INIT(DT_PHANDLE_BY_IDX(node_id,            \
+		zephyr_disabling_power_states, i)),), ())
+
+/**
+ * @brief Helper macro to generate a list of device pm constraints.
+ */
+#define PM_STATE_CONSTRAINTS_DEFINE(node_id)                                           \
+	{                                                                              \
+		LISTIFY(DT_PROP_LEN_OR(node_id, zephyr_disabling_power_states, 0),     \
+			PM_STATE_CONSTRAINT_DEFINE, (), node_id)                       \
+	}
+
+/**
+ * @brief Helper macro to define an array of device pm constraints.
+ */
+#define CONSTRAINTS_DEFINE(node_id)                         \
+	Z_DECL_ALIGN(struct pm_state_constraint)            \
+		PM_CONSTRAINTS_NAME(node_id)[] =            \
+		PM_STATE_CONSTRAINTS_DEFINE(node_id);
+
+#define DEVICE_CONSTRAINTS_DEFINE(node_id)                                           \
+	COND_CODE_0(DT_NODE_HAS_PROP(node_id, zephyr_disabling_power_states), (),    \
+		(CONSTRAINTS_DEFINE(node_id)))
+
+DT_FOREACH_STATUS_OKAY_NODE(DEVICE_CONSTRAINTS_DEFINE)
+
+/**
+ * @brief Helper macro to initialize a pm state device constraint
+ */
+#define PM_STATE_DEVICE_CONSTRAINT_INIT(node_id)                                              \
+	{                                                                                     \
+		.dev = DEVICE_DT_GET(node_id),                                                \
+		.pm_constraints_size = DT_PROP_LEN(node_id, zephyr_disabling_power_states),   \
+		.constraints = PM_CONSTRAINTS_NAME(node_id),                                  \
+	},
+
+/**
+ * @brief Helper macro to initialize a pm state device constraint
+ */
+#define PM_STATE_DEVICE_CONSTRAINT_DEFINE(node_id)                                      \
+	COND_CODE_0(DT_NODE_HAS_PROP(node_id, zephyr_disabling_power_states), (),       \
+		(PM_STATE_DEVICE_CONSTRAINT_INIT(node_id)))
+
+static struct pm_state_device_constraint _devices_constraints[] = {
+	DT_FOREACH_STATUS_OKAY_NODE(PM_STATE_DEVICE_CONSTRAINT_DEFINE)
+};
+
+#endif /* CONFIG_PM_POLICY_DEVICE_CONSTRAINTS */
+
+/** Lock to synchronize access to the latency request list. */
+static struct k_spinlock latency_lock;
+/** List of maximum latency requests. */
+static sys_slist_t latency_reqs;
+/** Maximum CPU latency in us */
+static int32_t max_latency_us = SYS_FOREVER_US;
+/** Maximum CPU latency in cycles */
+static int32_t max_latency_cyc = -1;
+/** List of latency change subscribers. */
+static sys_slist_t latency_subs;
+
+/** Lock to synchronize access to the events list. */
+static struct k_spinlock events_lock;
+/** List of events. */
+static sys_slist_t events_list;
+/** Pointer to Next Event. */
+static struct pm_policy_event *next_event;
+
+/** @brief Update maximum allowed latency. */
+static void update_max_latency(void)
+{
+	int32_t new_max_latency_us = SYS_FOREVER_US;
+	struct pm_policy_latency_request *req;
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&latency_reqs, req, node) {
+		if ((new_max_latency_us == SYS_FOREVER_US) ||
+		    ((int32_t)req->value_us < new_max_latency_us)) {
+			new_max_latency_us = (int32_t)req->value_us;
+		}
+	}
+
+	if (max_latency_us != new_max_latency_us) {
+		struct pm_policy_latency_subscription *sreq;
+		int32_t new_max_latency_cyc = -1;
+
+		SYS_SLIST_FOR_EACH_CONTAINER(&latency_subs, sreq, node) {
+			sreq->cb(new_max_latency_us);
+		}
+
+		if (new_max_latency_us != SYS_FOREVER_US) {
+			new_max_latency_cyc = (int32_t)k_us_to_cyc_ceil32(new_max_latency_us);
+		}
+
+		max_latency_us = new_max_latency_us;
+		max_latency_cyc = new_max_latency_cyc;
+	}
+}
+
+/** @brief Update next event. */
+static void update_next_event(uint32_t cyc)
+{
+	int64_t new_next_event_cyc = -1;
+	struct pm_policy_event *evt;
+
+	/* unset the next event pointer */
+	next_event = NULL;
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&events_list, evt, node) {
+		uint64_t cyc_evt = evt->value_cyc;
+
+		/*
+		 * cyc value is a 32-bit rolling counter:
+		 *
+		 * |---------------->-----------------------|
+		 * 0               cyc                  UINT32_MAX
+		 *
+		 * Values from [0, cyc) are events happening later than
+		 * [cyc, UINT32_MAX], so pad [0, cyc) with UINT32_MAX + 1 to do
+		 * the comparison.
+		 */
+		if (cyc_evt < cyc) {
+			cyc_evt += (uint64_t)UINT32_MAX + 1U;
+		}
+
+		if ((new_next_event_cyc < 0) || (cyc_evt < new_next_event_cyc)) {
+			new_next_event_cyc = cyc_evt;
+			next_event = evt;
+		}
+	}
+}
+
+int32_t pm_policy_next_event_ticks(void)
+{
+	int32_t cyc_evt = -1;
+
+	if ((next_event) && (next_event->value_cyc > 0)) {
+		cyc_evt = next_event->value_cyc - k_cycle_get_32();
+		cyc_evt = MAX(0, cyc_evt);
+		BUILD_ASSERT(CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC >= CONFIG_SYS_CLOCK_TICKS_PER_SEC,
+			     "HW Cycles per sec should be greater that ticks per sec");
+		return k_cyc_to_ticks_floor32(cyc_evt);
+	}
+
+	return -1;
+}
+
+#ifdef CONFIG_PM_POLICY_DEFAULT
+const struct pm_state_info *pm_policy_next_state(uint8_t cpu, int32_t ticks)
+{
+	int64_t cyc = -1;
+	uint8_t num_cpu_states;
+	const struct pm_state_info *cpu_states;
+
+#ifdef CONFIG_PM_NEED_ALL_DEVICES_IDLE
+	if (pm_device_is_any_busy()) {
+		return NULL;
+	}
+#endif
+
+	if (ticks != K_TICKS_FOREVER) {
+		cyc = k_ticks_to_cyc_ceil32(ticks);
+	}
+
+	num_cpu_states = pm_state_cpu_get_all(cpu, &cpu_states);
+
+	if ((next_event) && (next_event->value_cyc >= 0)) {
+		uint32_t cyc_curr = k_cycle_get_32();
+		int64_t cyc_evt = next_event->value_cyc - cyc_curr;
+
+		/* event happening after cycle counter max value, pad */
+		if (next_event->value_cyc <= cyc_curr) {
+			cyc_evt += UINT32_MAX;
+		}
+
+		if (cyc_evt > 0) {
+			/* if there's no system wakeup event always wins,
+			 * otherwise, who comes earlier wins
+			 */
+			if (cyc < 0) {
+				cyc = cyc_evt;
+			} else {
+				cyc = MIN(cyc, cyc_evt);
+			}
+		}
+	}
+
+	for (int16_t i = (int16_t)num_cpu_states - 1; i >= 0; i--) {
+		const struct pm_state_info *state = &cpu_states[i];
+		uint32_t min_residency_cyc, exit_latency_cyc;
+
+		/* check if there is a lock on state + substate */
+		if (pm_policy_state_lock_is_active(state->state, state->substate_id)) {
+			continue;
+		}
+
+		min_residency_cyc = k_us_to_cyc_ceil32(state->min_residency_us);
+		exit_latency_cyc = k_us_to_cyc_ceil32(state->exit_latency_us);
+
+		/* skip state if it brings too much latency */
+		if ((max_latency_cyc >= 0) &&
+		    (exit_latency_cyc >= max_latency_cyc)) {
+			continue;
+		}
+
+		if ((cyc < 0) ||
+		    (cyc >= (min_residency_cyc + exit_latency_cyc))) {
+			return state;
+		}
+	}
+
+	return NULL;
+}
+#endif
+
+void pm_policy_state_lock_get(enum pm_state state, uint8_t substate_id)
+{
+#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
+	for (size_t i = 0; i < ARRAY_SIZE(substate_lock_t); i++) {
+		if (substate_lock_t[i].state == state &&
+		   (substate_lock_t[i].substate_id == substate_id ||
+		    substate_id == PM_ALL_SUBSTATES)) {
+			atomic_inc(&substate_lock_t[i].lock);
+		}
+	}
+#endif
+}
+
+void pm_policy_state_lock_put(enum pm_state state, uint8_t substate_id)
+{
+#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
+	for (size_t i = 0; i < ARRAY_SIZE(substate_lock_t); i++) {
+		if (substate_lock_t[i].state == state &&
+		   (substate_lock_t[i].substate_id == substate_id ||
+		    substate_id == PM_ALL_SUBSTATES)) {
+			atomic_t cnt = atomic_dec(&substate_lock_t[i].lock);
+
+			ARG_UNUSED(cnt);
+
+			__ASSERT(cnt >= 1, "Unbalanced state lock get/put");
+		}
+	}
+#endif
+}
+
+bool pm_policy_state_lock_is_active(enum pm_state state, uint8_t substate_id)
+{
+#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
+	for (size_t i = 0; i < ARRAY_SIZE(substate_lock_t); i++) {
+		if (substate_lock_t[i].state == state &&
+		   (substate_lock_t[i].substate_id == substate_id ||
+		    substate_id == PM_ALL_SUBSTATES)) {
+			return (atomic_get(&substate_lock_t[i].lock) != 0);
+		}
+	}
+#endif
+
+	return false;
+}
+
+void pm_policy_latency_request_add(struct pm_policy_latency_request *req,
+				   uint32_t value_us)
+{
+	req->value_us = value_us;
+
+	k_spinlock_key_t key = k_spin_lock(&latency_lock);
+
+	sys_slist_append(&latency_reqs, &req->node);
+	update_max_latency();
+
+	k_spin_unlock(&latency_lock, key);
+}
+
+void pm_policy_latency_request_update(struct pm_policy_latency_request *req,
+				      uint32_t value_us)
+{
+	k_spinlock_key_t key = k_spin_lock(&latency_lock);
+
+	req->value_us = value_us;
+	update_max_latency();
+
+	k_spin_unlock(&latency_lock, key);
+}
+
+void pm_policy_latency_request_remove(struct pm_policy_latency_request *req)
+{
+	k_spinlock_key_t key = k_spin_lock(&latency_lock);
+
+	(void)sys_slist_find_and_remove(&latency_reqs, &req->node);
+	update_max_latency();
+
+	k_spin_unlock(&latency_lock, key);
+}
+
+void pm_policy_latency_changed_subscribe(struct pm_policy_latency_subscription *req,
+					 pm_policy_latency_changed_cb_t cb)
+{
+	k_spinlock_key_t key = k_spin_lock(&latency_lock);
+
+	req->cb = cb;
+	sys_slist_append(&latency_subs, &req->node);
+
+	k_spin_unlock(&latency_lock, key);
+}
+
+void pm_policy_latency_changed_unsubscribe(struct pm_policy_latency_subscription *req)
+{
+	k_spinlock_key_t key = k_spin_lock(&latency_lock);
+
+	(void)sys_slist_find_and_remove(&latency_subs, &req->node);
+
+	k_spin_unlock(&latency_lock, key);
+}
+
+void pm_policy_event_register(struct pm_policy_event *evt, uint32_t time_us)
+{
+	k_spinlock_key_t key = k_spin_lock(&events_lock);
+	uint32_t cyc = k_cycle_get_32();
+
+	evt->value_cyc = cyc + k_us_to_cyc_ceil32(time_us);
+	sys_slist_append(&events_list, &evt->node);
+	update_next_event(cyc);
+
+	k_spin_unlock(&events_lock, key);
+}
+
+void pm_policy_event_update(struct pm_policy_event *evt, uint32_t cycle)
+{
+	k_spinlock_key_t key = k_spin_lock(&events_lock);
+
+	evt->value_cyc = cycle;
+	update_next_event(k_cycle_get_32());
+
+	k_spin_unlock(&events_lock, key);
+}
+
+void pm_policy_event_unregister(struct pm_policy_event *evt)
+{
+	k_spinlock_key_t key = k_spin_lock(&events_lock);
+
+	(void)sys_slist_find_and_remove(&events_list, &evt->node);
+	update_next_event(k_cycle_get_32());
+
+	k_spin_unlock(&events_lock, key);
+}
+
+void pm_policy_device_power_lock_get(const struct device *dev)
+{
+#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state) && defined(CONFIG_PM_POLICY_DEVICE_CONSTRAINTS)
+	for (size_t i = 0; i < ARRAY_SIZE(_devices_constraints); i++) {
+		if (_devices_constraints[i].dev == dev) {
+			for (size_t j = 0; j < _devices_constraints[i].pm_constraints_size; j++) {
+				pm_policy_state_lock_get(
+						_devices_constraints[i].constraints[j].state,
+						_devices_constraints[i].constraints[j].substate_id);
+			}
+			break;
+		}
+	}
+#endif
+}
+
+void pm_policy_device_power_lock_put(const struct device *dev)
+{
+#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state) && defined(CONFIG_PM_POLICY_DEVICE_CONSTRAINTS)
+	for (size_t i = 0; i < ARRAY_SIZE(_devices_constraints); i++) {
+		if (_devices_constraints[i].dev == dev) {
+			for (size_t j = 0; j < _devices_constraints[i].pm_constraints_size; j++) {
+				pm_policy_state_lock_put(
+						_devices_constraints[i].constraints[j].state,
+						_devices_constraints[i].constraints[j].substate_id);
+			}
+			break;
+		}
+	}
+#endif
+}
diff --git a/subsys/pm/policy/CMakeLists.txt b/subsys/pm/policy/CMakeLists.txt
deleted file mode 100644
index e9d7d791ec5..00000000000
--- a/subsys/pm/policy/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if(CONFIG_PM)
-  zephyr_library_sources(policy_events.c policy_latency.c policy_state_lock.c)
-
-  if(CONFIG_PM_POLICY_DEVICE_CONSTRAINTS)
-    zephyr_library_sources(policy_device_lock.c)
-  endif()
-
-  if(CONFIG_PM_POLICY_DEFAULT)
-    zephyr_library_sources(policy_default.c)
-  endif()
-endif()
diff --git a/subsys/pm/policy/Kconfig b/subsys/pm/policy/Kconfig
deleted file mode 100644
index 2060c52cb13..00000000000
--- a/subsys/pm/policy/Kconfig
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if PM
-choice PM_POLICY
-	prompt "Idle State Power Management Policy"
-	default PM_POLICY_DEFAULT
-	help
-	  Select the idle state power management policy.
-
-config PM_POLICY_DEFAULT
-	bool "Default PM policy"
-	help
-	  This option selects the default PM policy. Default policy is based
-	  on CPU residency times and other constraints imposed by the drivers or
-	  application.
-
-config PM_POLICY_CUSTOM
-	bool "Custom PM Policy"
-	help
-	  This options allows applications to override the default policy with
-	  a custom implementation.
-
-endchoice
-
-config PM_POLICY_DEVICE_CONSTRAINTS
-	bool "Power state constraints per device"
-	help
-	  This option allows devices to have a list of power states
-	  that when the system transition to them, cause power loss in the device.
-	  This used to set and release power state constraints when
-	  it is needed by the device.
-
-endif # PM
diff --git a/subsys/pm/policy/policy_default.c b/subsys/pm/policy/policy_default.c
deleted file mode 100644
index 74a0443e6cd..00000000000
--- a/subsys/pm/policy/policy_default.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2018 Intel Corporation.
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/pm/policy.h>
-#include <zephyr/sys_clock.h>
-#include <zephyr/pm/device.h>
-
-extern struct pm_policy_event *next_event;
-extern int32_t max_latency_cyc;
-
-const struct pm_state_info *pm_policy_next_state(uint8_t cpu, int32_t ticks)
-{
-	int64_t cyc = -1;
-	uint8_t num_cpu_states;
-	const struct pm_state_info *cpu_states;
-
-#ifdef CONFIG_PM_NEED_ALL_DEVICES_IDLE
-	if (pm_device_is_any_busy()) {
-		return NULL;
-	}
-#endif
-
-	if (ticks != K_TICKS_FOREVER) {
-		cyc = k_ticks_to_cyc_ceil32(ticks);
-	}
-
-	num_cpu_states = pm_state_cpu_get_all(cpu, &cpu_states);
-
-	if ((next_event) && (next_event->value_cyc >= 0)) {
-		uint32_t cyc_curr = k_cycle_get_32();
-		int64_t cyc_evt = next_event->value_cyc - cyc_curr;
-
-		/* event happening after cycle counter max value, pad */
-		if (next_event->value_cyc <= cyc_curr) {
-			cyc_evt += UINT32_MAX;
-		}
-
-		if (cyc_evt > 0) {
-			/* if there's no system wakeup event always wins,
-			 * otherwise, who comes earlier wins
-			 */
-			if (cyc < 0) {
-				cyc = cyc_evt;
-			} else {
-				cyc = MIN(cyc, cyc_evt);
-			}
-		}
-	}
-
-	for (int16_t i = (int16_t)num_cpu_states - 1; i >= 0; i--) {
-		const struct pm_state_info *state = &cpu_states[i];
-		uint32_t min_residency_cyc, exit_latency_cyc;
-
-		/* check if there is a lock on state + substate */
-		if (pm_policy_state_lock_is_active(state->state, state->substate_id)) {
-			continue;
-		}
-
-		min_residency_cyc = k_us_to_cyc_ceil32(state->min_residency_us);
-		exit_latency_cyc = k_us_to_cyc_ceil32(state->exit_latency_us);
-
-		/* skip state if it brings too much latency */
-		if ((max_latency_cyc >= 0) &&
-		    (exit_latency_cyc >= max_latency_cyc)) {
-			continue;
-		}
-
-		if ((cyc < 0) ||
-		    (cyc >= (min_residency_cyc + exit_latency_cyc))) {
-			return state;
-		}
-	}
-
-	return NULL;
-}
diff --git a/subsys/pm/policy/policy_device_lock.c b/subsys/pm/policy/policy_device_lock.c
deleted file mode 100644
index b508819fb73..00000000000
--- a/subsys/pm/policy/policy_device_lock.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2018 Intel Corporation.
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/pm/policy.h>
-#include <zephyr/pm/state.h>
-#include <zephyr/sys/util_macro.h>
-#include <zephyr/pm/device.h>
-
-struct pm_state_device_constraint {
-	const struct device *const dev;
-	size_t pm_constraints_size;
-	struct pm_state_constraint *constraints;
-};
-
-/**
- * @brief Synthesize the name of the object that holds a device pm constraint.
- *
- * @param dev_id Device identifier.
- */
-#define PM_CONSTRAINTS_NAME(node_id) _CONCAT(__devicepmconstraints_, node_id)
-
-/**
- * @brief initialize a device pm constraint with information from devicetree.
- *
- * @param node_id Node identifier.
- */
-#define PM_STATE_CONSTRAINT_INIT(node_id)                                     \
-	{                                                                     \
-		.state = PM_STATE_DT_INIT(node_id),                           \
-		.substate_id = DT_PROP_OR(node_id, substate_id, 0),           \
-	}
-
-/**
- * @brief Helper macro to define a device pm constraints.
- */
-#define PM_STATE_CONSTRAINT_DEFINE(i, node_id)                                  \
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_PHANDLE_BY_IDX(node_id,          \
-		zephyr_disabling_power_states, i)),                             \
-		(PM_STATE_CONSTRAINT_INIT(DT_PHANDLE_BY_IDX(node_id,            \
-		zephyr_disabling_power_states, i)),), ())
-
-/**
- * @brief Helper macro to generate a list of device pm constraints.
- */
-#define PM_STATE_CONSTRAINTS_DEFINE(node_id)                                           \
-	{                                                                              \
-		LISTIFY(DT_PROP_LEN_OR(node_id, zephyr_disabling_power_states, 0),     \
-			PM_STATE_CONSTRAINT_DEFINE, (), node_id)                       \
-	}
-
-/**
- * @brief Helper macro to define an array of device pm constraints.
- */
-#define CONSTRAINTS_DEFINE(node_id)                         \
-	Z_DECL_ALIGN(struct pm_state_constraint)            \
-		PM_CONSTRAINTS_NAME(node_id)[] =            \
-		PM_STATE_CONSTRAINTS_DEFINE(node_id);
-
-#define DEVICE_CONSTRAINTS_DEFINE(node_id)                                           \
-	COND_CODE_0(DT_NODE_HAS_PROP(node_id, zephyr_disabling_power_states), (),    \
-		(CONSTRAINTS_DEFINE(node_id)))
-
-DT_FOREACH_STATUS_OKAY_NODE(DEVICE_CONSTRAINTS_DEFINE)
-
-/**
- * @brief Helper macro to initialize a pm state device constraint
- */
-#define PM_STATE_DEVICE_CONSTRAINT_INIT(node_id)                                              \
-	{                                                                                     \
-		.dev = DEVICE_DT_GET(node_id),                                                \
-		.pm_constraints_size = DT_PROP_LEN(node_id, zephyr_disabling_power_states),   \
-		.constraints = PM_CONSTRAINTS_NAME(node_id),                                  \
-	},
-
-/**
- * @brief Helper macro to initialize a pm state device constraint
- */
-#define PM_STATE_DEVICE_CONSTRAINT_DEFINE(node_id)                                      \
-	COND_CODE_0(DT_NODE_HAS_PROP(node_id, zephyr_disabling_power_states), (),       \
-		(PM_STATE_DEVICE_CONSTRAINT_INIT(node_id)))
-
-static struct pm_state_device_constraint _devices_constraints[] = {
-	DT_FOREACH_STATUS_OKAY_NODE(PM_STATE_DEVICE_CONSTRAINT_DEFINE)
-};
-
-void pm_policy_device_power_lock_get(const struct device *dev)
-{
-#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
-	for (size_t i = 0; i < ARRAY_SIZE(_devices_constraints); i++) {
-		if (_devices_constraints[i].dev == dev) {
-			for (size_t j = 0; j < _devices_constraints[i].pm_constraints_size; j++) {
-				pm_policy_state_lock_get(
-						_devices_constraints[i].constraints[j].state,
-						_devices_constraints[i].constraints[j].substate_id);
-			}
-			break;
-		}
-	}
-#endif
-}
-
-void pm_policy_device_power_lock_put(const struct device *dev)
-{
-#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
-	for (size_t i = 0; i < ARRAY_SIZE(_devices_constraints); i++) {
-		if (_devices_constraints[i].dev == dev) {
-			for (size_t j = 0; j < _devices_constraints[i].pm_constraints_size; j++) {
-				pm_policy_state_lock_put(
-						_devices_constraints[i].constraints[j].state,
-						_devices_constraints[i].constraints[j].substate_id);
-			}
-			break;
-		}
-	}
-#endif
-}
diff --git a/subsys/pm/policy/policy_events.c b/subsys/pm/policy/policy_events.c
deleted file mode 100644
index dc06bffdf55..00000000000
--- a/subsys/pm/policy/policy_events.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2018 Intel Corporation.
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stdint.h>
-
-#include <zephyr/kernel.h>
-#include <zephyr/pm/policy.h>
-#include <zephyr/spinlock.h>
-#include <zephyr/sys_clock.h>
-#include <zephyr/sys/time_units.h>
-
-/** Lock to synchronize access to the events list. */
-static struct k_spinlock events_lock;
-/** List of events. */
-static sys_slist_t events_list;
-/** Pointer to Next Event. */
-struct pm_policy_event *next_event;
-
-/** @brief Update next event. */
-static void update_next_event(uint32_t cyc)
-{
-	int64_t new_next_event_cyc = -1;
-	struct pm_policy_event *evt;
-
-	/* unset the next event pointer */
-	next_event = NULL;
-
-	SYS_SLIST_FOR_EACH_CONTAINER(&events_list, evt, node) {
-		uint64_t cyc_evt = evt->value_cyc;
-
-		/*
-		 * cyc value is a 32-bit rolling counter:
-		 *
-		 * |---------------->-----------------------|
-		 * 0               cyc                  UINT32_MAX
-		 *
-		 * Values from [0, cyc) are events happening later than
-		 * [cyc, UINT32_MAX], so pad [0, cyc) with UINT32_MAX + 1 to do
-		 * the comparison.
-		 */
-		if (cyc_evt < cyc) {
-			cyc_evt += (uint64_t)UINT32_MAX + 1U;
-		}
-
-		if ((new_next_event_cyc < 0) || (cyc_evt < new_next_event_cyc)) {
-			new_next_event_cyc = cyc_evt;
-			next_event = evt;
-		}
-	}
-}
-
-int32_t pm_policy_next_event_ticks(void)
-{
-	int32_t cyc_evt = -1;
-
-	if ((next_event) && (next_event->value_cyc > 0)) {
-		cyc_evt = next_event->value_cyc - k_cycle_get_32();
-		cyc_evt = MAX(0, cyc_evt);
-		BUILD_ASSERT(CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC >= CONFIG_SYS_CLOCK_TICKS_PER_SEC,
-			     "HW Cycles per sec should be greater that ticks per sec");
-		return k_cyc_to_ticks_floor32(cyc_evt);
-	}
-
-	return -1;
-}
-
-void pm_policy_event_register(struct pm_policy_event *evt, uint32_t time_us)
-{
-	k_spinlock_key_t key = k_spin_lock(&events_lock);
-	uint32_t cyc = k_cycle_get_32();
-
-	evt->value_cyc = cyc + k_us_to_cyc_ceil32(time_us);
-	sys_slist_append(&events_list, &evt->node);
-	update_next_event(cyc);
-
-	k_spin_unlock(&events_lock, key);
-}
-
-void pm_policy_event_update(struct pm_policy_event *evt, uint32_t cycle)
-{
-	k_spinlock_key_t key = k_spin_lock(&events_lock);
-
-	evt->value_cyc = cycle;
-	update_next_event(k_cycle_get_32());
-
-	k_spin_unlock(&events_lock, key);
-}
-
-void pm_policy_event_unregister(struct pm_policy_event *evt)
-{
-	k_spinlock_key_t key = k_spin_lock(&events_lock);
-
-	(void)sys_slist_find_and_remove(&events_list, &evt->node);
-	update_next_event(k_cycle_get_32());
-
-	k_spin_unlock(&events_lock, key);
-}
diff --git a/subsys/pm/policy/policy_latency.c b/subsys/pm/policy/policy_latency.c
deleted file mode 100644
index 68e6ffcc5d5..00000000000
--- a/subsys/pm/policy/policy_latency.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2018 Intel Corporation.
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stdint.h>
-
-#include <zephyr/pm/policy.h>
-#include <zephyr/spinlock.h>
-#include <zephyr/sys/time_units.h>
-
-/** Lock to synchronize access to the latency request list. */
-static struct k_spinlock latency_lock;
-/** List of maximum latency requests. */
-static sys_slist_t latency_reqs;
-/** Maximum CPU latency in us */
-static int32_t max_latency_us = SYS_FOREVER_US;
-/** Maximum CPU latency in cycles */
-int32_t max_latency_cyc = -1;
-/** List of latency change subscribers. */
-static sys_slist_t latency_subs;
-
-/** @brief Update maximum allowed latency. */
-static void update_max_latency(void)
-{
-	int32_t new_max_latency_us = SYS_FOREVER_US;
-	struct pm_policy_latency_request *req;
-
-	SYS_SLIST_FOR_EACH_CONTAINER(&latency_reqs, req, node) {
-		if ((new_max_latency_us == SYS_FOREVER_US) ||
-		    ((int32_t)req->value_us < new_max_latency_us)) {
-			new_max_latency_us = (int32_t)req->value_us;
-		}
-	}
-
-	if (max_latency_us != new_max_latency_us) {
-		struct pm_policy_latency_subscription *sreq;
-		int32_t new_max_latency_cyc = -1;
-
-		SYS_SLIST_FOR_EACH_CONTAINER(&latency_subs, sreq, node) {
-			sreq->cb(new_max_latency_us);
-		}
-
-		if (new_max_latency_us != SYS_FOREVER_US) {
-			new_max_latency_cyc = (int32_t)k_us_to_cyc_ceil32(new_max_latency_us);
-		}
-
-		max_latency_us = new_max_latency_us;
-		max_latency_cyc = new_max_latency_cyc;
-	}
-}
-
-void pm_policy_latency_request_add(struct pm_policy_latency_request *req,
-				   uint32_t value_us)
-{
-	req->value_us = value_us;
-
-	k_spinlock_key_t key = k_spin_lock(&latency_lock);
-
-	sys_slist_append(&latency_reqs, &req->node);
-	update_max_latency();
-
-	k_spin_unlock(&latency_lock, key);
-}
-
-void pm_policy_latency_request_update(struct pm_policy_latency_request *req,
-				      uint32_t value_us)
-{
-	k_spinlock_key_t key = k_spin_lock(&latency_lock);
-
-	req->value_us = value_us;
-	update_max_latency();
-
-	k_spin_unlock(&latency_lock, key);
-}
-
-void pm_policy_latency_request_remove(struct pm_policy_latency_request *req)
-{
-	k_spinlock_key_t key = k_spin_lock(&latency_lock);
-
-	(void)sys_slist_find_and_remove(&latency_reqs, &req->node);
-	update_max_latency();
-
-	k_spin_unlock(&latency_lock, key);
-}
-
-void pm_policy_latency_changed_subscribe(struct pm_policy_latency_subscription *req,
-					 pm_policy_latency_changed_cb_t cb)
-{
-	k_spinlock_key_t key = k_spin_lock(&latency_lock);
-
-	req->cb = cb;
-	sys_slist_append(&latency_subs, &req->node);
-
-	k_spin_unlock(&latency_lock, key);
-}
-
-void pm_policy_latency_changed_unsubscribe(struct pm_policy_latency_subscription *req)
-{
-	k_spinlock_key_t key = k_spin_lock(&latency_lock);
-
-	(void)sys_slist_find_and_remove(&latency_subs, &req->node);
-
-	k_spin_unlock(&latency_lock, key);
-}
diff --git a/subsys/pm/policy/policy_state_lock.c b/subsys/pm/policy/policy_state_lock.c
deleted file mode 100644
index 3876b76c804..00000000000
--- a/subsys/pm/policy/policy_state_lock.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2018 Intel Corporation.
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/pm/policy.h>
-#include <zephyr/pm/state.h>
-#include <zephyr/sys/__assert.h>
-#include <zephyr/sys/atomic.h>
-#include <zephyr/toolchain.h>
-
-#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
-
-#define DT_SUB_LOCK_INIT(node_id)				\
-	{ .state = PM_STATE_DT_INIT(node_id),			\
-	  .substate_id = DT_PROP_OR(node_id, substate_id, 0),	\
-	  .lock = ATOMIC_INIT(0),				\
-	},
-
-/**
- * State and substate lock structure.
- *
- * This struct is associating a reference counting to each <state,substate>
- * couple to be used with the pm_policy_substate_lock_* functions.
- *
- * Operations on this array are in the order of O(n) with the number of power
- * states and this is mostly due to the random nature of the substate value
- * (that can be anything from a small integer value to a bitmask). We can
- * probably do better with an hashmap.
- */
-static struct {
-	enum pm_state state;
-	uint8_t substate_id;
-	atomic_t lock;
-} substate_lock_t[] = {
-	DT_FOREACH_STATUS_OKAY(zephyr_power_state, DT_SUB_LOCK_INIT)
-};
-
-#endif
-
-void pm_policy_state_lock_get(enum pm_state state, uint8_t substate_id)
-{
-#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
-	for (size_t i = 0; i < ARRAY_SIZE(substate_lock_t); i++) {
-		if (substate_lock_t[i].state == state &&
-		   (substate_lock_t[i].substate_id == substate_id ||
-		    substate_id == PM_ALL_SUBSTATES)) {
-			atomic_inc(&substate_lock_t[i].lock);
-		}
-	}
-#endif
-}
-
-void pm_policy_state_lock_put(enum pm_state state, uint8_t substate_id)
-{
-#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
-	for (size_t i = 0; i < ARRAY_SIZE(substate_lock_t); i++) {
-		if (substate_lock_t[i].state == state &&
-		   (substate_lock_t[i].substate_id == substate_id ||
-		    substate_id == PM_ALL_SUBSTATES)) {
-			atomic_t cnt = atomic_dec(&substate_lock_t[i].lock);
-
-			ARG_UNUSED(cnt);
-
-			__ASSERT(cnt >= 1, "Unbalanced state lock get/put");
-		}
-	}
-#endif
-}
-
-bool pm_policy_state_lock_is_active(enum pm_state state, uint8_t substate_id)
-{
-#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_power_state)
-	for (size_t i = 0; i < ARRAY_SIZE(substate_lock_t); i++) {
-		if (substate_lock_t[i].state == state &&
-		   (substate_lock_t[i].substate_id == substate_id ||
-		    substate_id == PM_ALL_SUBSTATES)) {
-			return (atomic_get(&substate_lock_t[i].lock) != 0);
-		}
-	}
-#endif
-
-	return false;
-}

From 0aa934b095e727f964ba6e343e0aaff0dddabd6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:34 +0100
Subject: [PATCH 1521/2913] Revert "[nrf fromtree] zephyr: bulk update to
 DT_NODE_HAS_STATUS_OKAY"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4270d8ac31d2b34f56d73e0ed9b14a5b5f041687.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 arch/arm/core/cortex_m/fault.c                |   2 +-
 boards/arm/v2m_musca_b1/pinmux.c              |   2 +-
 boards/arm/v2m_musca_s1/pinmux.c              |   2 +-
 boards/digilent/arty_a7/board.c               |   4 +-
 boards/nordic/nrf9160dk/board.c               |   4 +-
 boards/nordic/nrf9160dk/nrf52840_reset.c      |   4 +-
 boards/nxp/frdm_mcxa156/board.c               |  22 +--
 boards/nxp/frdm_mcxn236/board.c               |  36 ++--
 boards/nxp/frdm_mcxn947/board.c               |  58 +++---
 boards/silabs/dev_kits/sltb004a/board.c       |   2 +-
 drivers/adc/adc_gd32.c                        |   6 +-
 drivers/audio/dmic_mcux.c                     |   2 +-
 drivers/clock_control/clock_control_gd32.c    |   2 +-
 .../clock_control/clock_control_ifx_cat1.c    | 174 +++++++++---------
 drivers/clock_control/clock_control_litex.h   |   2 +-
 drivers/clock_control/clock_control_max32.c   |  12 +-
 .../clock_control/clock_control_mcux_ccm.c    |  14 +-
 .../clock_control/clock_control_mcux_scg.c    |   4 +-
 .../clock_control/clock_control_mcux_sim.c    |   2 +-
 .../clock_control/clock_control_nrf2_fll16m.c |   2 +-
 .../clock_control/clock_control_nrf2_lfclk.c  |   2 +-
 .../clock_control/clock_control_renesas_ra.c  |   2 +-
 .../clock_control_renesas_ra_cgc.c            |   2 +-
 .../clock_control/clock_control_smartbond.c   |  18 +-
 drivers/clock_control/clock_stm32_ll_wb0.c    |   2 +-
 drivers/counter/counter_mcux_snvs.c           |   4 +-
 drivers/counter/counter_smartbond_timer.c     |   2 +-
 drivers/disk/sdmmc_stm32.c                    |   2 +-
 drivers/dma/dma_mcux_edma.c                   |   6 +-
 drivers/dma/dma_stm32.c                       |  16 +-
 drivers/dma/dma_stm32_bdma.c                  |   4 +-
 drivers/dma/dmamux_stm32.c                    |  28 +--
 drivers/espi/espi_mchp_xec_host_v2.c          |   6 +-
 drivers/ethernet/eth_stm32_hal.c              |   4 +-
 drivers/ethernet/nxp_enet/eth_mcux.c          |  10 +-
 drivers/ethernet/nxp_enet/eth_nxp_enet.c      |   2 +-
 drivers/ethernet/phy/phy_adin2111.c           |   2 +-
 drivers/flash/soc_flash_lpc.c                 |   4 +-
 drivers/flash/soc_flash_mcux.c                |  12 +-
 drivers/flash/soc_flash_nrf.c                 |   8 +-
 drivers/gpio/gpio_esp32.c                     |  14 +-
 drivers/gpio/gpio_gd32.c                      |   2 +-
 drivers/gpio/gpio_lpc11u6x.c                  |  12 +-
 drivers/gpio/gpio_mchp_xec.c                  |  24 +--
 drivers/gpio/gpio_nrfx.c                      |   2 +-
 drivers/gpio/gpio_nxp_s32.c                   |   8 +-
 drivers/gpio/gpio_renesas_ra_ioport.c         |   2 +-
 drivers/gpio/gpio_sam0.c                      |   8 +-
 drivers/gpio/gpio_stm32.c                     |   4 +-
 drivers/gpio/gpio_xlnx_axi.c                  |   2 +-
 drivers/i2c/i2c_esp32.c                       |   8 +-
 drivers/i2s/i2s_litex.c                       |   4 +-
 .../interrupt_controller/intc_mchp_ecia_xec.c |   2 +-
 drivers/led_strip/lpd880x.c                   |   2 +-
 drivers/lora/shell.c                          |   2 +-
 drivers/memc/memc_nxp_s32_qspi.c              |   2 +-
 drivers/pinctrl/pinctrl_esp32.c               |   4 +-
 drivers/pinctrl/pinctrl_ite_it8xxx2.c         |   2 +-
 drivers/pinctrl/pinctrl_kinetis.c             |   2 +-
 drivers/rtc/rtc_smartbond.c                   |   2 +-
 drivers/sensor/bosch/bmi08x/bmi08x.h          |   2 +-
 drivers/sensor/st/stm32_temp/stm32_temp.c     |   4 +-
 drivers/sensor/st/stm32_vbat/stm32_vbat.c     |   2 +-
 drivers/sensor/st/stm32_vref/stm32_vref.c     |   4 +-
 drivers/serial/leuart_gecko.c                 |   8 +-
 drivers/serial/uart_cmsdk_apb.c               |  20 +-
 drivers/serial/uart_lpc11u6x.c                |  84 ++++-----
 drivers/serial/uart_lpc11u6x.h                |  16 +-
 drivers/serial/uart_miv.c                     |   4 +-
 drivers/spi/spi_smartbond.c                   |   4 +-
 drivers/spi/spi_xec_qmspi.c                   |   4 +-
 drivers/timer/mcux_os_timer.c                 |  10 +-
 drivers/timer/nrf_grtc_timer.c                |   4 +-
 drivers/timer/smartbond_timer.c               |   2 +-
 drivers/usb/device/usb_dc_mcux.c              |   8 +-
 drivers/usb/device/usb_dc_nrfx.c              |   4 +-
 drivers/usb/udc/udc_nrf.c                     |   4 +-
 drivers/watchdog/wdt_esp32.c                  |   4 +-
 include/zephyr/device.h                       |   2 +-
 .../clock_control/stm32_clock_control.h       |   6 +-
 include/zephyr/drivers/emul.h                 |   2 +-
 include/zephyr/linker/linker-defs.h           |   9 +-
 include/zephyr/pm/state.h                     |   6 +-
 kernel/init.c                                 |   6 +-
 kernel/xip.c                                  |   6 +-
 modules/hal_nordic/nrfx/nrfx_config.h         |   2 +-
 samples/basic/button/src/main.c               |   2 +-
 samples/basic/threads/src/main.c              |   4 +-
 samples/bluetooth/central_otc/src/main.c      |   4 +-
 .../encrypted_advertising/central/src/main.c  |   2 +-
 .../peripheral/src/main.c                     |   2 +-
 samples/bluetooth/iso_receive/src/main.c      |   2 +-
 samples/bluetooth/mesh_provisioner/src/main.c |   8 +-
 samples/bluetooth/periodic_sync/src/main.c    |   2 +-
 samples/bluetooth/peripheral_hids/src/hog.c   |   2 +-
 samples/bluetooth/peripheral_hr/src/main.c    |   2 +-
 .../boards/espressif/deep_sleep/src/main.c    |   2 +-
 .../boards/espressif/light_sleep/src/main.c   |   2 +-
 samples/boards/nordic/battery/src/battery.c   |   4 +-
 .../nxp/mimxrt1060_evk/system_off/src/main.c  |   4 +-
 samples/boards/st/i2c_timing/src/main.c       |   2 +-
 samples/boards/st/mco/src/main.c              |   2 +-
 .../st/power_mgmt/standby_shutdown/src/main.c |   2 +-
 .../boards/st/power_mgmt/wkup_pins/src/main.c |   2 +-
 samples/drivers/espi/src/main.c               |  10 +-
 samples/drivers/i2s/echo/src/main.c           |  12 +-
 samples/drivers/lora/receive/src/main.c       |   2 +-
 samples/drivers/lora/send/src/main.c          |   2 +-
 samples/shields/x_nucleo_53l0a1/src/main.c    |   2 +-
 .../subsys/mgmt/osdp/control_panel/src/main.c |   2 +-
 .../mgmt/osdp/peripheral_device/src/main.c    |   2 +-
 samples/subsys/task_wdt/src/main.c            |   2 +-
 soc/arm/beetle/power.c                        |  12 +-
 soc/atmel/sam/common/soc_power.c              |   4 +-
 soc/intel/intel_adsp/common/clk.c             |   4 +-
 .../intel_adsp/common/include/adsp_clk.h      |   4 +-
 soc/intel/intel_adsp/common/mem_window.c      |   8 +-
 soc/ite/ec/it8xxx2/soc.c                      |   8 +-
 soc/microchip/mec/common/soc_dt.h             |   2 +-
 soc/microchip/mec/mec172x/device_power.c      |   6 +-
 .../common/nrf54hx_nrf92x_mpu_regions.c       |   6 +-
 soc/nordic/nrf52/soc.c                        |   2 +-
 soc/nordic/nrf53/soc.c                        |   2 +-
 soc/nordic/nrf54h/soc.c                       |   2 +-
 soc/nordic/nrf92/soc.c                        |   2 +-
 soc/nordic/validate_enabled_instances.c       |   6 +-
 soc/nxp/imx/imx6sx/soc.c                      |  86 ++++-----
 soc/nxp/imx/imx7d/soc.c                       |  26 +--
 soc/nxp/imx/imx8m/a53/soc.c                   |   8 +-
 soc/nxp/imx/imx8m/m4_mini/soc.c               |   8 +-
 soc/nxp/imx/imx8m/m4_quad/soc.c               |   8 +-
 soc/nxp/imx/imx8m/m7/soc.c                    |  24 +--
 soc/nxp/imxrt/imxrt10xx/flexspi.c             |   2 +-
 soc/nxp/imxrt/imxrt10xx/soc.c                 |  24 +--
 soc/nxp/imxrt/imxrt118x/soc.c                 |  36 ++--
 soc/nxp/imxrt/imxrt11xx/soc.c                 |  24 +--
 soc/nxp/imxrt/imxrt5xx/cm33/soc.c             |   4 +-
 soc/nxp/imxrt/imxrt6xx/cm33/soc.c             |   4 +-
 soc/nxp/imxrt/imxrt6xx/cm33/soc.h             |   4 +-
 soc/nxp/kinetis/k6x/soc.c                     |   2 +-
 soc/nxp/kinetis/ke1xf/soc.c                   |  32 ++--
 soc/nxp/kinetis/ke1xz/soc.c                   |  18 +-
 soc/nxp/kinetis/kl2x/soc.c                    |   2 +-
 soc/nxp/kinetis/kwx/soc_kw4xz.c               |   8 +-
 soc/nxp/lpc/lpc55xxx/soc.c                    |   2 +-
 soc/nxp/mcx/mcxc/soc.c                        |   2 +-
 soc/nxp/rw/power.c                            |  14 +-
 soc/nxp/rw/soc.c                              |  10 +-
 soc/openisa/rv32m1/soc.c                      |   8 +-
 soc/renesas/ra/ra4m1/soc.c                    |   2 +-
 soc/renesas/smartbond/da1469x/power.c         |   2 +-
 soc/snps/emsk/soc_config.c                    |   8 +-
 soc/st/stm32/stm32h7x/mpu_regions.c           |   4 +-
 soc/xlnx/zynq7000/xc7zxxx/soc.c               |   8 +-
 soc/xlnx/zynq7000/xc7zxxxs/soc.c              |   8 +-
 .../nordic/hal/nrf5/radio/radio_nrf5_fem.h    |   4 +-
 subsys/pm/policy.c                            |   4 +-
 subsys/tracing/sysview/sysview_config.c       |   2 +-
 subsys/usb/device/usb_device.c                |   2 +-
 .../host/id/mocks/zephyr/linker/linker-defs.h |   4 -
 tests/drivers/adc/adc_api/src/test_adc.c      |   4 +-
 .../src/test_stm32_clock_configuration_adc.c  |   2 +-
 .../src/test_stm32_clock_configuration_i2c.c  |   2 +-
 .../src/test_stm32_clock_configuration_i2s.c  |   2 +-
 .../test_stm32_clock_configuration_lptim.c    |   2 +-
 .../src/test_stm32_clock_configuration.c      |   2 +-
 tests/drivers/eeprom/api/src/main.c           |   4 +-
 tests/drivers/gpio/gpio_basic_api/src/main.c  |   2 +-
 .../gpio/gpio_basic_api/src/test_gpio.h       |   8 +-
 .../gpio/gpio_reserved_ranges/src/main.c      |  12 +-
 tests/drivers/i2c/i2c_api/src/test_i2c.c      |   6 +-
 tests/drivers/i2c/i2c_ram/src/test_i2c_ram.c  |   2 +-
 tests/drivers/i2c/i2c_tca954x/src/main.c      |   4 +-
 tests/drivers/memc/ram/src/main.c             |  24 +--
 tests/drivers/pwm/pwm_api/src/test_pwm.c      |   8 +-
 .../drivers/smbus/smbus_api/src/test_smbus.c  |   2 +-
 .../smbus/smbus_api/src/test_smbus_qemu.c     |   2 +-
 .../watchdog/wdt_basic_api/src/test_wdt.c     |   4 +-
 .../watchdog/wdt_basic_reset_none/src/main.c  |   2 +-
 .../watchdog/wdt_error_cases/src/main.c       |   4 +-
 180 files changed, 738 insertions(+), 743 deletions(-)

diff --git a/arch/arm/core/cortex_m/fault.c b/arch/arm/core/cortex_m/fault.c
index 4e604ba8033..4cc01f87129 100644
--- a/arch/arm/core/cortex_m/fault.c
+++ b/arch/arm/core/cortex_m/fault.c
@@ -743,7 +743,7 @@ static inline bool z_arm_is_pc_valid(uintptr_t pc)
 		return true;
 	}
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_itcm))
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_itcm), okay)
 	/* Is it in the ITCM */
 	if ((((uintptr_t)&__itcm_start) <= pc) && (pc < ((uintptr_t)&__itcm_end))) {
 		return true;
diff --git a/boards/arm/v2m_musca_b1/pinmux.c b/boards/arm/v2m_musca_b1/pinmux.c
index 2a2c44d62b9..443d462eb21 100644
--- a/boards/arm/v2m_musca_b1/pinmux.c
+++ b/boards/arm/v2m_musca_b1/pinmux.c
@@ -40,7 +40,7 @@ static void arm_musca_b1_pinmux_defaults(void)
 	scc[IOMUX_ALTF1_OUTSEL] = 0xffff;
 	scc[IOMUX_ALTF1_OENSEL] = 0xffff;
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart0), okay)
 	/* clear bit 0/1 for GPIO0/1 to steer from ALTF1 */
 	scc[IOMUX_MAIN_INSEL] &= ~(BIT(0) | BIT(1));
 	scc[IOMUX_MAIN_OUTSEL] &= ~(BIT(0) | BIT(1));
diff --git a/boards/arm/v2m_musca_s1/pinmux.c b/boards/arm/v2m_musca_s1/pinmux.c
index 3affa53dadf..a1a1a4ad252 100644
--- a/boards/arm/v2m_musca_s1/pinmux.c
+++ b/boards/arm/v2m_musca_s1/pinmux.c
@@ -40,7 +40,7 @@ static void arm_musca_s1_pinmux_defaults(void)
 	scc[IOMUX_ALTF1_OUTSEL] = 0xffff;
 	scc[IOMUX_ALTF1_OENSEL] = 0xffff;
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart0), okay)
 	/* clear bit 0/1 for GPIO0/1 to steer from ALTF1 */
 	scc[IOMUX_MAIN_INSEL]  &= ~(BIT(0) | BIT(1));
 	scc[IOMUX_MAIN_OUTSEL] &= ~(BIT(0) | BIT(1));
diff --git a/boards/digilent/arty_a7/board.c b/boards/digilent/arty_a7/board.c
index 0e087c212b4..984cd34ab43 100644
--- a/boards/digilent/arty_a7/board.c
+++ b/boards/digilent/arty_a7/board.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(board, CONFIG_LOG_DEFAULT_LEVEL);
 
 #define DAPLINK_QSPI_MUX_NODE DT_NODELABEL(daplink_qspi_mux)
 
-#if DT_NODE_HAS_STATUS_OKAY(DAPLINK_QSPI_MUX_NODE)
+#if DT_NODE_HAS_STATUS(DAPLINK_QSPI_MUX_NODE, okay)
 int board_daplink_qspi_mux_select(enum board_daplink_qspi_mux_mode mode)
 {
 	struct gpio_dt_spec mux = GPIO_DT_SPEC_GET(DAPLINK_QSPI_MUX_NODE, mux_gpios);
@@ -77,4 +77,4 @@ static int board_init(void)
 }
 
 SYS_INIT(board_init, POST_KERNEL, CONFIG_BOARD_INIT_PRIORITY);
-#endif /* DT_NODE_HAS_STATUS_OKAY(DAPLINK_QSPI_MUX_NODE) */
+#endif /* DT_NODE_HAS_STATUS(DAPLINK_QSPI_MUX_NODE, okay) */
diff --git a/boards/nordic/nrf9160dk/board.c b/boards/nordic/nrf9160dk/board.c
index c8e680c4539..adf137df196 100644
--- a/boards/nordic/nrf9160dk/board.c
+++ b/boards/nordic/nrf9160dk/board.c
@@ -32,7 +32,7 @@ LOG_MODULE_REGISTER(board_control, CONFIG_BOARD_NRF9160DK_LOG_LEVEL);
 				 GET_PORT(reset_input, gpios, 0) == 0 && \
 				 GET_PIN(reset_input, gpios, 0) == 18)
 #define USE_RESET_GPIO \
-	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(reset_input)) && \
+	(DT_NODE_HAS_STATUS(DT_NODELABEL(reset_input), okay) && \
 	 !RESET_INPUT_IS_PINRESET)
 
 struct switch_cfg {
@@ -47,7 +47,7 @@ struct switch_cfg {
 #endif
 };
 
-#define ROUTING_ENABLED(_name) DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(_name))
+#define ROUTING_ENABLED(_name) DT_NODE_HAS_STATUS(DT_NODELABEL(_name), okay)
 #define SWITCH_CFG(_name, _idx)					\
 {								\
 	.gpio  = GET_DEV(_name, control_gpios, _idx),		\
diff --git a/boards/nordic/nrf9160dk/nrf52840_reset.c b/boards/nordic/nrf9160dk/nrf52840_reset.c
index aa9f9d4b620..e639b5765b7 100644
--- a/boards/nordic/nrf9160dk/nrf52840_reset.c
+++ b/boards/nordic/nrf9160dk/nrf52840_reset.c
@@ -12,7 +12,7 @@
 
 #define RESET_NODE DT_NODELABEL(nrf52840_reset)
 
-#if DT_NODE_HAS_STATUS_OKAY(RESET_NODE)
+#if DT_NODE_HAS_STATUS(RESET_NODE, okay)
 
 #define RESET_GPIO_CTRL  DT_GPIO_CTLR(RESET_NODE, gpios)
 #define RESET_GPIO_PIN   DT_GPIO_PIN(RESET_NODE, gpios)
@@ -65,4 +65,4 @@ int bt_hci_transport_setup(const struct device *h4)
 	return 0;
 }
 
-#endif /* DT_NODE_HAS_STATUS_OKAY(RESET_NODE) */
+#endif /* DT_NODE_HAS_STATUS(RESET_NODE, okay) */
diff --git a/boards/nxp/frdm_mcxa156/board.c b/boards/nxp/frdm_mcxa156/board.c
index 84347c4715c..98801c47a1a 100644
--- a/boards/nxp/frdm_mcxa156/board.c
+++ b/boards/nxp/frdm_mcxa156/board.c
@@ -66,52 +66,52 @@ static int frdm_mcxa156_init(void)
 	CLOCK_SetClockDiv(kCLOCK_DivAHBCLK, 1U);     /* !< Set AHBCLKDIV divider to value 1 */
 	CLOCK_SetClockDiv(kCLOCK_DivFRO_HF_DIV, 1U); /* !< Set FROHFDIV divider to value 1 */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(porta))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(porta), okay)
 	RESET_ReleasePeripheralReset(kPORT0_RST_SHIFT_RSTn);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portb))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(portb), okay)
 	RESET_ReleasePeripheralReset(kPORT1_RST_SHIFT_RSTn);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portc))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(portc), okay)
 	RESET_ReleasePeripheralReset(kPORT2_RST_SHIFT_RSTn);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portd))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(portd), okay)
 	RESET_ReleasePeripheralReset(kPORT3_RST_SHIFT_RSTn);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(porte))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(porte), okay)
 	RESET_ReleasePeripheralReset(kPORT4_RST_SHIFT_RSTn);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
 	RESET_ReleasePeripheralReset(kGPIO0_RST_SHIFT_RSTn);
 	CLOCK_EnableClock(kCLOCK_GateGPIO0);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
 	RESET_ReleasePeripheralReset(kGPIO1_RST_SHIFT_RSTn);
 	CLOCK_EnableClock(kCLOCK_GateGPIO1);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay)
 	RESET_ReleasePeripheralReset(kGPIO2_RST_SHIFT_RSTn);
 	CLOCK_EnableClock(kCLOCK_GateGPIO2);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio3), okay)
 	RESET_ReleasePeripheralReset(kGPIO3_RST_SHIFT_RSTn);
 	CLOCK_EnableClock(kCLOCK_GateGPIO3);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio4), okay)
 	RESET_ReleasePeripheralReset(kGPIO4_RST_SHIFT_RSTn);
 	CLOCK_EnableClock(kCLOCK_GateGPIO4);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart0), okay)
 	CLOCK_SetClockDiv(kCLOCK_DivLPUART0, 1u);
 	CLOCK_AttachClk(kFRO12M_to_LPUART0);
 #endif
diff --git a/boards/nxp/frdm_mcxn236/board.c b/boards/nxp/frdm_mcxn236/board.c
index fbaf20ccd65..8f0d1fd7976 100644
--- a/boards/nxp/frdm_mcxn236/board.c
+++ b/boards/nxp/frdm_mcxn236/board.c
@@ -88,84 +88,84 @@ static int frdm_mcxn236_init(void)
 	/* Set AHBCLKDIV divider to value 1 */
 	CLOCK_SetClkDiv(kCLOCK_DivAhbClk, 1U);
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm1), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom1Clk, 1u);
 	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM1);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm2), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom2Clk, 1u);
 	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM2);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm3), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom3Clk, 1u);
 	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM3);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm4), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom4Clk, 1u);
 	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM4);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm5))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm5), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom5Clk, 1u);
 	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM5);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(os_timer))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(os_timer), okay)
 	CLOCK_AttachClk(kCLK_1M_to_OSTIMER);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
 	CLOCK_EnableClock(kCLOCK_Gpio0);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
 	CLOCK_EnableClock(kCLOCK_Gpio1);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay)
 	CLOCK_EnableClock(kCLOCK_Gpio2);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio3), okay)
 	CLOCK_EnableClock(kCLOCK_Gpio3);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio4), okay)
 	CLOCK_EnableClock(kCLOCK_Gpio4);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio5))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio5), okay)
 	CLOCK_EnableClock(kCLOCK_Gpio5);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(wwdt0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(wwdt0), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivWdt0Clk, 1u);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer0), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer0Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER0);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer1), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer1Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER1);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer2), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer2Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER2);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer3), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer3Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER3);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer4), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer4Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER4);
 #endif
diff --git a/boards/nxp/frdm_mcxn947/board.c b/boards/nxp/frdm_mcxn947/board.c
index db21a4ae194..37ec5f4dd6d 100644
--- a/boards/nxp/frdm_mcxn947/board.c
+++ b/boards/nxp/frdm_mcxn947/board.c
@@ -127,7 +127,7 @@ static int frdm_mcxn947_init(void)
 
 	CLOCK_SetupExtClocking(BOARD_XTAL0_CLK_HZ);
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcan0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcan0), okay)
 	/* Set up PLL1 for 80 MHz FlexCAN clock */
 	const pll_setup_t pll1Setup = {
 		.pllctrl = SCG_SPLLCTRL_SOURCE(1U) | SCG_SPLLCTRL_SELI(27U) |
@@ -146,50 +146,50 @@ static int frdm_mcxn947_init(void)
 	CLOCK_SetClkDiv(kCLOCK_DivPLL1Clk0, 1U);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm1), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom1Clk, 1u);
 	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM1);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm2), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom2Clk, 1u);
 	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM2);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcomm4), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom4Clk, 1u);
 	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM4);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(os_timer))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(os_timer), okay)
 	CLOCK_AttachClk(kCLK_1M_to_OSTIMER);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
 	CLOCK_EnableClock(kCLOCK_Gpio0);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
 	CLOCK_EnableClock(kCLOCK_Gpio1);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay)
 	CLOCK_EnableClock(kCLOCK_Gpio2);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio3), okay)
 	CLOCK_EnableClock(kCLOCK_Gpio3);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio4), okay)
 	CLOCK_EnableClock(kCLOCK_Gpio4);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio5))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio5), okay)
 	CLOCK_EnableClock(kCLOCK_Gpio5);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dac0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(dac0), okay)
 	SPC_EnableActiveModeAnalogModules(SPC0, kSPC_controlDac0);
 	CLOCK_SetClkDiv(kCLOCK_DivDac0Clk, 1u);
 	CLOCK_AttachClk(kFRO_HF_to_DAC0);
@@ -197,7 +197,7 @@ static int frdm_mcxn947_init(void)
 	CLOCK_EnableClock(kCLOCK_Dac0);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dac1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(dac1), okay)
 	SPC_EnableActiveModeAnalogModules(SPC0, kSPC_controlDac1);
 	CLOCK_SetClkDiv(kCLOCK_DivDac1Clk, 1u);
 	CLOCK_AttachClk(kFRO_HF_to_DAC1);
@@ -205,7 +205,7 @@ static int frdm_mcxn947_init(void)
 	CLOCK_EnableClock(kCLOCK_Dac1);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay)
 	CLOCK_AttachClk(kNONE_to_ENETRMII);
 	CLOCK_EnableClock(kCLOCK_Enet);
 	SYSCON0->PRESETCTRL2 = SYSCON_PRESETCTRL2_ENET_RST_MASK;
@@ -214,41 +214,41 @@ static int frdm_mcxn947_init(void)
 	SYSCON->ENET_PHY_INTF_SEL = SYSCON_ENET_PHY_INTF_SEL_PHY_SEL(1);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(wwdt0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(wwdt0), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivWdt0Clk, 1u);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer0), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer0Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER0);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer1), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer1Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER1);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer2), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer2Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER2);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer3), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer3Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER3);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ctimer4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer4), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivCtimer4Clk, 1U);
 	CLOCK_AttachClk(kPLL0_to_CTIMER4);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcan0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcan0), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcan0Clk, 1U);
 	CLOCK_AttachClk(kPLL1_CLK0_to_FLEXCAN0);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc0), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivUSdhcClk, 1u);
 	CLOCK_AttachClk(kFRO_HF_to_USDHC);
 #endif
@@ -260,17 +260,17 @@ static int frdm_mcxn947_init(void)
 	enable_cache64();
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(vref))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(vref), okay)
 	CLOCK_EnableClock(kCLOCK_Vref);
 	SPC_EnableActiveModeAnalogModules(SPC0, kSPC_controlVref);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpadc0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpadc0), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivAdc0Clk, 1U);
 	CLOCK_AttachClk(kFRO_HF_to_ADC0);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb1)) && CONFIG_USB_DC_NXP_EHCI
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb1), okay) && CONFIG_USB_DC_NXP_EHCI
 	usb_phy_config_struct_t usbPhyConfig = {
 		BOARD_USB_PHY_D_CAL, BOARD_USB_PHY_TXCAL45DP, BOARD_USB_PHY_TXCAL45DM,
 	};
@@ -312,13 +312,13 @@ static int frdm_mcxn947_init(void)
 	USB_EhciPhyInit(kUSB_ControllerEhci0, BOARD_XTAL0_CLK_HZ, &usbPhyConfig);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpcmp0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpcmp0), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivCmp0FClk, 1U);
 	CLOCK_AttachClk(kFRO12M_to_CMP0F);
 	SPC_EnableActiveModeAnalogModules(SPC0, (kSPC_controlCmp0 | kSPC_controlCmp0Dac));
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lptmr0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lptmr0), okay)
 
 /*
  * Clock Select Decides what input source the lptmr will clock from
@@ -340,9 +340,9 @@ static int frdm_mcxn947_init(void)
 	CLOCK_SetupClockCtrl(kCLOCK_CLKIN_ENA_FM_USBH_LPT);
 #endif /* DT_PROP(DT_NODELABEL(lptmr0), clk_source) */
 
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lptmr0)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(lptmr0), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexio0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexio0), okay)
 	CLOCK_SetClkDiv(kCLOCK_DivFlexioClk, 1u);
 	CLOCK_AttachClk(kPLL0_to_FLEXIO);
 #endif
diff --git a/boards/silabs/dev_kits/sltb004a/board.c b/boards/silabs/dev_kits/sltb004a/board.c
index 1b09177ce69..43dd2a6b3b2 100644
--- a/boards/silabs/dev_kits/sltb004a/board.c
+++ b/boards/silabs/dev_kits/sltb004a/board.c
@@ -37,7 +37,7 @@ static int efr32mg_sltb004a_init(void)
 
 #define CCS811 DT_NODELABEL(ccs811)
 
-#if DT_NODE_HAS_STATUS_OKAY(CCS811)
+#if DT_NODE_HAS_STATUS(CCS811, okay)
 	cfg = (struct supply_cfg){
 		.gpio = DEVICE_DT_GET(DT_GPIO_CTLR(CCS811, supply_gpios)),
 		.pin = DT_GPIO_PIN(CCS811, supply_gpios),
diff --git a/drivers/adc/adc_gd32.c b/drivers/adc/adc_gd32.c
index 46fbfc783b7..75760de6713 100644
--- a/drivers/adc/adc_gd32.c
+++ b/drivers/adc/adc_gd32.c
@@ -41,9 +41,9 @@ LOG_MODULE_REGISTER(adc_gd32, CONFIG_ADC_LOG_LEVEL);
 #define ADC1_NODE		DT_NODELABEL(adc1)
 #define ADC2_NODE		DT_NODELABEL(adc2)
 
-#define ADC0_ENABLE		DT_NODE_HAS_STATUS_OKAY(ADC0_NODE)
-#define ADC1_ENABLE		DT_NODE_HAS_STATUS_OKAY(ADC1_NODE)
-#define ADC2_ENABLE		DT_NODE_HAS_STATUS_OKAY(ADC2_NODE)
+#define ADC0_ENABLE		DT_NODE_HAS_STATUS(ADC0_NODE, okay)
+#define ADC1_ENABLE		DT_NODE_HAS_STATUS(ADC1_NODE, okay)
+#define ADC2_ENABLE		DT_NODE_HAS_STATUS(ADC2_NODE, okay)
 
 #ifndef	ADC0
 /**
diff --git a/drivers/audio/dmic_mcux.c b/drivers/audio/dmic_mcux.c
index 0f032e8368c..ff357fda9bb 100644
--- a/drivers/audio/dmic_mcux.c
+++ b/drivers/audio/dmic_mcux.c
@@ -686,7 +686,7 @@ static const struct _dmic_ops dmic_ops = {
 
 /* Gets pointer for a given PDM channel node */
 #define PDM_DMIC_CHAN_GET(pdm_node)						\
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(pdm_node),				\
+	COND_CODE_1(DT_NODE_HAS_STATUS(pdm_node, okay),				\
 		    (&pdm_channel_##pdm_node), (NULL)),
 
 /* Gets array of pointers to PDM channels */
diff --git a/drivers/clock_control/clock_control_gd32.c b/drivers/clock_control/clock_control_gd32.c
index 52b197e2029..1a20d5e4ab2 100644
--- a/drivers/clock_control/clock_control_gd32.c
+++ b/drivers/clock_control/clock_control_gd32.c
@@ -43,7 +43,7 @@ struct clock_control_gd32_config {
 #if DT_HAS_COMPAT_STATUS_OKAY(gd_gd32_timer)
 /* timer identifiers */
 #define TIMER_ID_OR_NONE(nodelabel)                                            \
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(nodelabel)),          \
+	COND_CODE_1(DT_NODE_HAS_STATUS(DT_NODELABEL(nodelabel), okay),         \
 		    (DT_CLOCKS_CELL(DT_NODELABEL(nodelabel), id),), ())
 
 static const uint16_t timer_ids[] = {
diff --git a/drivers/clock_control/clock_control_ifx_cat1.c b/drivers/clock_control/clock_control_ifx_cat1.c
index 606e06c4e46..1d89ed0fbe0 100644
--- a/drivers/clock_control/clock_control_ifx_cat1.c
+++ b/drivers/clock_control/clock_control_ifx_cat1.c
@@ -18,111 +18,111 @@
 
 /* Enumeration of enabled in device tree Clock, uses for indexing clock info table */
 enum {
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_imo))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_imo), okay)
 	INFINEON_CAT1_CLOCK_IMO,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_iho))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_iho), okay)
 	INFINEON_CAT1_CLOCK_IHO,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux0), okay)
 	INFINEON_CAT1_CLOCK_PATHMUX0,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux1), okay)
 	INFINEON_CAT1_CLOCK_PATHMUX1,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux2), okay)
 	INFINEON_CAT1_CLOCK_PATHMUX2,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux3), okay)
 	INFINEON_CAT1_CLOCK_PATHMUX3,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux4), okay)
 	INFINEON_CAT1_CLOCK_PATHMUX4,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf0), okay)
 	INFINEON_CAT1_CLOCK_HF0,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf1), okay)
 	INFINEON_CAT1_CLOCK_HF1,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf2), okay)
 	INFINEON_CAT1_CLOCK_HF2,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf3), okay)
 	INFINEON_CAT1_CLOCK_HF3,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf4), okay)
 	INFINEON_CAT1_CLOCK_HF4,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf5))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf5), okay)
 	INFINEON_CAT1_CLOCK_HF5,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf6))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf6), okay)
 	INFINEON_CAT1_CLOCK_HF6,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf7))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf7), okay)
 	INFINEON_CAT1_CLOCK_HF7,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf8))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf8), okay)
 	INFINEON_CAT1_CLOCK_HF8,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf9))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf9), okay)
 	INFINEON_CAT1_CLOCK_HF9,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf10))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf10), okay)
 	INFINEON_CAT1_CLOCK_HF10,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf11))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf11), okay)
 	INFINEON_CAT1_CLOCK_HF11,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf12))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf12), okay)
 	INFINEON_CAT1_CLOCK_HF12,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf13))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf13), okay)
 	INFINEON_CAT1_CLOCK_HF13,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_fast))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_fast), okay)
 	INFINEON_CAT1_CLOCK_FAST,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_slow))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_slow), okay)
 	INFINEON_CAT1_CLOCK_SLOW,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_peri))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_peri), okay)
 	INFINEON_CAT1_CLOCK_PERI,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pll0), okay)
 	INFINEON_CAT1_CLOCK_PLL0,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pll1), okay)
 	INFINEON_CAT1_CLOCK_PLL1,
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(fll0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(fll0), okay)
 	INFINEON_CAT1_CLOCK_FLL0,
 #endif
 
@@ -142,111 +142,111 @@ struct infineon_cat1_clock_info_t {
 static struct infineon_cat1_clock_info_t
 	clock_info_table[INFINEON_CAT1_ENABLED_CLOCK_COUNT] = {
 	/* We always have IMO */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_imo))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_imo), okay)
 	[INFINEON_CAT1_CLOCK_IMO] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_imo)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_iho))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_iho), okay)
 	[INFINEON_CAT1_CLOCK_IHO] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_iho)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux0), okay)
 	[INFINEON_CAT1_CLOCK_PATHMUX0] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(path_mux0)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux1), okay)
 	[INFINEON_CAT1_CLOCK_PATHMUX1] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(path_mux1)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux2), okay)
 	[INFINEON_CAT1_CLOCK_PATHMUX2] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(path_mux2)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux3), okay)
 	[INFINEON_CAT1_CLOCK_PATHMUX3] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(path_mux3)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux4), okay)
 	[INFINEON_CAT1_CLOCK_PATHMUX4] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(path_mux4)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf0), okay)
 	[INFINEON_CAT1_CLOCK_HF0] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf0)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf1), okay)
 	[INFINEON_CAT1_CLOCK_HF1] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf1)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf2), okay)
 	[INFINEON_CAT1_CLOCK_HF2] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf2)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf3), okay)
 	[INFINEON_CAT1_CLOCK_HF3] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf3)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf4), okay)
 	[INFINEON_CAT1_CLOCK_HF4] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf4)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf5))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf5), okay)
 	[INFINEON_CAT1_CLOCK_HF5] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf5)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf6))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf6), okay)
 	[INFINEON_CAT1_CLOCK_HF6] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf6)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf7))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf7), okay)
 	[INFINEON_CAT1_CLOCK_HF7] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf7)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf8))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf8), okay)
 	[INFINEON_CAT1_CLOCK_HF8] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf8)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf9))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf9), okay)
 	[INFINEON_CAT1_CLOCK_HF9] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf9)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf10))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf10), okay)
 	[INFINEON_CAT1_CLOCK_HF10] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf10)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf11))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf11), okay)
 	[INFINEON_CAT1_CLOCK_HF11] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf11)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf12))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf12), okay)
 	[INFINEON_CAT1_CLOCK_HF12] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf12)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf13))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf13), okay)
 	[INFINEON_CAT1_CLOCK_HF13] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_hf13)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_fast))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_fast), okay)
 	[INFINEON_CAT1_CLOCK_FAST] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_fast)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_slow))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_slow), okay)
 	[INFINEON_CAT1_CLOCK_SLOW] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_slow)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_peri))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_peri), okay)
 	[INFINEON_CAT1_CLOCK_PERI] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(clk_peri)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pll0), okay)
 	[INFINEON_CAT1_CLOCK_PLL0] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(pll0)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pll1), okay)
 	[INFINEON_CAT1_CLOCK_PLL1] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(pll1)) },
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(fll0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(fll0), okay)
 	[INFINEON_CAT1_CLOCK_FLL0] = { .dt_ord = DT_DEP_ORD(DT_NODELABEL(fll0)) },
 #endif
 };
@@ -326,7 +326,7 @@ static cyhal_clock_t *_get_hal_obj_from_ord(uint32_t dt_ord)
 	return ret_obj;
 }
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dpll_hp))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(dpll_hp), okay)
 __WEAK void cycfg_ClockStartupError(uint32_t error)
 {
 	(void)error; /* Suppress the compiler warning */
@@ -390,25 +390,25 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 	uint32 clock_div;
 
 	/* Configure IMO */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_imo))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_imo), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_IMO].obj;
 	if (cyhal_clock_get(clock_obj, &CYHAL_CLOCK_RSC_IMO)) {
 		return -EIO;
 	}
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_iho))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_iho), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_IHO].obj;
 	if (cyhal_clock_get(clock_obj, &CYHAL_CLOCK_RSC_IHO)) {
 		return -EIO;
 	}
 #endif
-#if !DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_imo)) && \
-	!DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_iho))
+#if !DT_NODE_HAS_STATUS(DT_NODELABEL(clk_imo), okay) && \
+	!DT_NODE_HAS_STATUS(DT_NODELABEL(clk_iho), okay)
 	#error "IMO clock or IHO clock must be enabled"
 #endif
 
 	/* Configure the PathMux[0] to source defined in tree device 'path_mux0' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux0), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_PATHMUX0].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(path_mux0));
 
@@ -418,7 +418,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the PathMux[1] to source defined in tree device 'path_mux1' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux1), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_PATHMUX1].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(path_mux1));
 
@@ -428,7 +428,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the PathMux[2] to source defined in tree device 'path_mux2' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux2), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_PATHMUX2].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(path_mux2));
 
@@ -438,7 +438,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the PathMux[3] to source defined in tree device 'path_mux3' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux3), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_PATHMUX3].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(path_mux3));
 
@@ -448,7 +448,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the PathMux[4] to source defined in tree device 'path_mux4' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(path_mux4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(path_mux4), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_PATHMUX4].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(path_mux4));
 
@@ -458,7 +458,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure FLL0 */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(fll0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(fll0), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_FLL0].obj;
 	frequency = DT_PROP(DT_NODELABEL(fll0), clock_frequency);
 
@@ -470,7 +470,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure PLL0 */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pll0), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_PLL0].obj;
 	frequency = DT_PROP(DT_NODELABEL(pll0), clock_frequency);
 
@@ -483,7 +483,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure PLL1 */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pll1), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_PLL1].obj;
 	frequency = DT_PROP(DT_NODELABEL(pll1), clock_frequency);
 
@@ -495,7 +495,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[0] to source defined in tree device 'clk_hf0' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf0), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF0].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf0));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf0), clock_div);
@@ -506,7 +506,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[1] to source defined in tree device 'clk_hf1' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf1), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF1].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf1));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf1), clock_div);
@@ -517,7 +517,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[2] to source defined in tree device 'clk_hf2' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf2), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF2].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf2));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf2), clock_div);
@@ -528,7 +528,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[3] to source defined in tree device 'clk_hf3' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf3), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF3].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf3));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf3), clock_div);
@@ -539,7 +539,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[4] to source defined in tree device 'clk_hf4' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf4), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF4].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf4));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf4), clock_div);
@@ -550,7 +550,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[5] to source defined in tree device 'clk_hf5' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf5))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf5), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF5].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf5));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf5), clock_div);
@@ -561,7 +561,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[6] to source defined in tree device 'clk_hf6' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf6))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf6), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF6].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf6));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf6), clock_div);
@@ -572,7 +572,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[7] to source defined in tree device 'clk_hf7' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf7))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf7), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF7].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf7));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf7), clock_div);
@@ -583,7 +583,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[8] to source defined in tree device 'clk_hf8' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf8))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf8), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF8].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf8));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf8), clock_div);
@@ -594,7 +594,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[9] to source defined in tree device 'clk_hf9' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf9))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf9), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF9].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf9));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf9), clock_div);
@@ -605,7 +605,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[10] to source defined in tree device 'clk_hf10' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf10))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf10), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF10].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf10));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf10), clock_div);
@@ -616,7 +616,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[11] to source defined in tree device 'clk_hf11' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf11))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf11), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF11].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf11));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf11), clock_div);
@@ -627,7 +627,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[12] to source defined in tree device 'clk_hf12' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf12))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf12), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF12].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf12));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf12), clock_div);
@@ -638,7 +638,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the HF[13] to source defined in tree device 'clk_hf13' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_hf13))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_hf13), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_HF13].obj;
 	clock_source_obj = _get_hal_obj_from_ord(GET_CLK_SOURCE_ORD(clk_hf13));
 	clock_div = DT_PROP(DT_NODELABEL(clk_hf13), clock_div);
@@ -649,7 +649,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the clock fast to source defined in tree device 'clk_fast' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_fast))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_fast), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_FAST].obj;
 	clock_div = DT_PROP(DT_NODELABEL(clk_fast), clock_div);
 
@@ -663,7 +663,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the clock peri to source defined in tree device 'clk_peri' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_peri))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_peri), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_PERI].obj;
 	clock_div = DT_PROP(DT_NODELABEL(clk_peri), clock_div);
 
@@ -677,7 +677,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 #endif
 
 	/* Configure the clock slow to source defined in tree device 'clk_slow' node */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_slow))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_slow), okay)
 	clock_obj = &clock_info_table[INFINEON_CAT1_CLOCK_SLOW].obj;
 	clock_div = DT_PROP(DT_NODELABEL(clk_slow), clock_div);
 
@@ -690,7 +690,7 @@ static int clock_control_infineon_cat1_init(const struct device *dev)
 	}
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dpll_hp))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(dpll_hp), okay)
 	Cy_SysClk_Dpll_Hp0_Init();
 	SystemCoreClockUpdate();
 #endif
@@ -713,7 +713,7 @@ static const struct clock_control_driver_api clock_control_infineon_cat1_api = {
 	.off = clock_control_infineon_cat_on_off
 };
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_imo))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_imo), okay)
 DEVICE_DT_DEFINE(DT_NODELABEL(clk_imo),
 		 clock_control_infineon_cat1_init,
 		 NULL,
@@ -723,7 +723,7 @@ DEVICE_DT_DEFINE(DT_NODELABEL(clk_imo),
 		 CONFIG_CLOCK_CONTROL_INIT_PRIORITY,
 		 &clock_control_infineon_cat1_api);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_iho))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_iho), okay)
 DEVICE_DT_DEFINE(DT_NODELABEL(clk_iho),
 		 clock_control_infineon_cat1_init,
 		 NULL,
diff --git a/drivers/clock_control/clock_control_litex.h b/drivers/clock_control/clock_control_litex.h
index 8a1b25de400..14d371c077c 100644
--- a/drivers/clock_control/clock_control_litex.h
+++ b/drivers/clock_control/clock_control_litex.h
@@ -73,7 +73,7 @@
 	lcko->margin.exp = CLKOUT_MARGIN_EXP(N);
 
 /* Devicetree clkout defines */
-#define CLKOUT_EXIST(N)		DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk##N))
+#define CLKOUT_EXIST(N)		DT_NODE_HAS_STATUS(DT_NODELABEL(clk##N), okay)
 #define CLKOUT_ID(N)		DT_REG_ADDR(DT_NODELABEL(clk##N))
 #define CLKOUT_FREQ(N)		DT_PROP(DT_NODELABEL(clk##N), \
 				litex_clock_frequency)
diff --git a/drivers/clock_control/clock_control_max32.c b/drivers/clock_control/clock_control_max32.c
index 29d7cc2fef4..2cbed41bd23 100644
--- a/drivers/clock_control/clock_control_max32.c
+++ b/drivers/clock_control/clock_control_max32.c
@@ -106,27 +106,27 @@ static void setup_fixed_clocks(void)
 	MXC_SYS_ClockSourceDisable(ADI_MAX32_CLK_EXTCLK);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_ipo))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_ipo), okay)
 	MXC_SYS_ClockSourceEnable(ADI_MAX32_CLK_IPO);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_erfo))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_erfo), okay)
 	MXC_SYS_ClockSourceEnable(ADI_MAX32_CLK_ERFO);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_ibro))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_ibro), okay)
 	MXC_SYS_ClockSourceEnable(ADI_MAX32_CLK_IBRO);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_iso))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_iso), okay)
 	MXC_SYS_ClockSourceEnable(ADI_MAX32_CLK_ISO);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_inro))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_inro), okay)
 	MXC_SYS_ClockSourceEnable(ADI_MAX32_CLK_INRO);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(clk_ertco))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_ertco), okay)
 	MXC_SYS_ClockSourceEnable(ADI_MAX32_CLK_ERTCO);
 #endif
 
diff --git a/drivers/clock_control/clock_control_mcux_ccm.c b/drivers/clock_control/clock_control_mcux_ccm.c
index c3b7f2416c4..8ff09672352 100644
--- a/drivers/clock_control/clock_control_mcux_ccm.c
+++ b/drivers/clock_control/clock_control_mcux_ccm.c
@@ -216,14 +216,14 @@ static int mcux_ccm_get_subsys_rate(const struct device *dev,
 #endif
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc1)) && CONFIG_IMX_USDHC
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc1), okay) && CONFIG_IMX_USDHC
 	case IMX_CCM_USDHC1_CLK:
 		*rate = CLOCK_GetSysPfdFreq(kCLOCK_Pfd0) /
 				(CLOCK_GetDiv(kCLOCK_Usdhc1Div) + 1U);
 		break;
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc2)) && CONFIG_IMX_USDHC
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc2), okay) && CONFIG_IMX_USDHC
 	case IMX_CCM_USDHC2_CLK:
 		*rate = CLOCK_GetSysPfdFreq(kCLOCK_Pfd0) /
 				(CLOCK_GetDiv(kCLOCK_Usdhc2Div) + 1U);
@@ -339,12 +339,12 @@ static int mcux_ccm_get_subsys_rate(const struct device *dev,
 				/ (CLOCK_GetDiv(kCLOCK_Sai3Div) + 1);
 		break;
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexspi))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexspi), okay)
 	case IMX_CCM_FLEXSPI_CLK:
 		*rate = CLOCK_GetClockRootFreq(kCLOCK_FlexspiClkRoot);
 		break;
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexspi2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexspi2), okay)
 	case IMX_CCM_FLEXSPI2_CLK:
 		*rate = CLOCK_GetClockRootFreq(kCLOCK_Flexspi2ClkRoot);
 		break;
@@ -354,7 +354,7 @@ static int mcux_ccm_get_subsys_rate(const struct device *dev,
 		*rate = CLOCK_GetFreq(kCLOCK_PerClk);
 		break;
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexio1)) && CONFIG_MCUX_FLEXIO
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexio1), okay) && CONFIG_MCUX_FLEXIO
 	case IMX_CCM_FLEXIO1_CLK:
 	{
 		uint32_t flexio_mux = CLOCK_GetMux(kCLOCK_Flexio1Mux);
@@ -376,8 +376,8 @@ static int mcux_ccm_get_subsys_rate(const struct device *dev,
 					/ (CLOCK_GetDiv(kCLOCK_Flexio1Div) + 1);
 	} break;
 #endif
-#if (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexio2)) \
-		 || DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexio3))) && CONFIG_MCUX_FLEXIO
+#if (DT_NODE_HAS_STATUS(DT_NODELABEL(flexio2), okay) \
+		 || DT_NODE_HAS_STATUS(DT_NODELABEL(flexio3), okay)) && CONFIG_MCUX_FLEXIO
 	case IMX_CCM_FLEXIO2_3_CLK:
 	{
 		uint32_t flexio_mux = CLOCK_GetMux(kCLOCK_Flexio2Mux);
diff --git a/drivers/clock_control/clock_control_mcux_scg.c b/drivers/clock_control/clock_control_mcux_scg.c
index 684cb8f2aa2..5642aabe8dd 100644
--- a/drivers/clock_control/clock_control_mcux_scg.c
+++ b/drivers/clock_control/clock_control_mcux_scg.c
@@ -125,7 +125,7 @@ static int mcux_scg_get_rate(const struct device *dev,
 
 static int mcux_scg_init(const struct device *dev)
 {
-#if DT_NODE_HAS_STATUS_OKAY(MCUX_SCG_CLOCK_NODE(clkout_clk))
+#if DT_NODE_HAS_STATUS(MCUX_SCG_CLOCK_NODE(clkout_clk), okay)
 #if DT_SAME_NODE(DT_CLOCKS_CTLR(MCUX_SCG_CLOCK_NODE(clkout_clk)), MCUX_SCG_CLOCK_NODE(slow_clk))
 	CLOCK_SetClkOutSel(kClockClkoutSelScgSlow);
 #elif DT_SAME_NODE(DT_CLOCKS_CTLR(MCUX_SCG_CLOCK_NODE(clkout_clk)), MCUX_SCG_CLOCK_NODE(sosc_clk))
@@ -139,7 +139,7 @@ static int mcux_scg_init(const struct device *dev)
 #else
 #error Unsupported SCG clkout clock source
 #endif
-#endif /* DT_NODE_HAS_STATUS_OKAY(MCUX_SCG_CLOCK_NODE(clkout_clk)) */
+#endif /* DT_NODE_HAS_STATUS(MCUX_SCG_CLOCK_NODE(clkout_clk), okay) */
 
 	return 0;
 }
diff --git a/drivers/clock_control/clock_control_mcux_sim.c b/drivers/clock_control/clock_control_mcux_sim.c
index 2b16e5d6361..26c9a3c1c2a 100644
--- a/drivers/clock_control/clock_control_mcux_sim.c
+++ b/drivers/clock_control/clock_control_mcux_sim.c
@@ -67,7 +67,7 @@ static int mcux_sim_get_subsys_rate(const struct device *dev,
 	return 0;
 }
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_kinetis_ke1xf_sim))
+#if DT_NODE_HAS_STATUS(DT_INST(0, nxp_kinetis_ke1xf_sim), okay)
 #define NXP_KINETIS_SIM_NODE DT_INST(0, nxp_kinetis_ke1xf_sim)
 #if DT_NODE_HAS_PROP(DT_INST(0, nxp_kinetis_ke1xf_sim), clkout_source)
 	#define NXP_KINETIS_SIM_CLKOUT_SOURCE \
diff --git a/drivers/clock_control/clock_control_nrf2_fll16m.c b/drivers/clock_control/clock_control_nrf2_fll16m.c
index 7462d822f44..4fdf9220c27 100644
--- a/drivers/clock_control/clock_control_nrf2_fll16m.c
+++ b/drivers/clock_control/clock_control_nrf2_fll16m.c
@@ -26,7 +26,7 @@ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
 #define FLL16M_LFXO_NODE DT_INST_PHANDLE_BY_NAME(0, clocks, lfxo)
 #define FLL16M_HFXO_NODE DT_INST_PHANDLE_BY_NAME(0, clocks, hfxo)
 
-#define FLL16M_HAS_LFXO DT_NODE_HAS_STATUS_OKAY(FLL16M_LFXO_NODE)
+#define FLL16M_HAS_LFXO DT_NODE_HAS_STATUS(FLL16M_LFXO_NODE, okay)
 
 #define FLL16M_LFXO_ACCURACY DT_PROP(FLL16M_LFXO_NODE, accuracy_ppm)
 #define FLL16M_HFXO_ACCURACY DT_PROP(FLL16M_HFXO_NODE, accuracy_ppm)
diff --git a/drivers/clock_control/clock_control_nrf2_lfclk.c b/drivers/clock_control/clock_control_nrf2_lfclk.c
index 36b8e247297..9ce7974570e 100644
--- a/drivers/clock_control/clock_control_nrf2_lfclk.c
+++ b/drivers/clock_control/clock_control_nrf2_lfclk.c
@@ -19,7 +19,7 @@ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
 #define LFCLK_LFXO_NODE DT_INST_PHANDLE_BY_NAME(0, clocks, lfxo)
 #define LFCLK_HFXO_NODE DT_INST_PHANDLE_BY_NAME(0, clocks, hfxo)
 
-#define LFCLK_HAS_LFXO DT_NODE_HAS_STATUS_OKAY(LFCLK_LFXO_NODE)
+#define LFCLK_HAS_LFXO DT_NODE_HAS_STATUS(LFCLK_LFXO_NODE, okay)
 
 #define LFCLK_LFLPRC_ACCURACY DT_INST_PROP(0, lflprc_accuracy_ppm)
 #define LFCLK_LFRC_ACCURACY DT_INST_PROP(0, lfrc_accuracy_ppm)
diff --git a/drivers/clock_control/clock_control_renesas_ra.c b/drivers/clock_control/clock_control_renesas_ra.c
index 3065c94e785..0b058633151 100644
--- a/drivers/clock_control/clock_control_renesas_ra.c
+++ b/drivers/clock_control/clock_control_renesas_ra.c
@@ -38,7 +38,7 @@
 
 #define CLKSRC_FREQ(clk) DT_PROP(DT_PATH(clocks, clk), clock_frequency)
 
-#define IS_CLKSRC_ENABLED(clk) DT_NODE_HAS_STATUS_OKAY(DT_PATH(clocks, clk))
+#define IS_CLKSRC_ENABLED(clk) DT_NODE_HAS_STATUS(DT_PATH(clocks, clk), okay)
 
 #define SCKSCR_INIT_VALUE _CONCAT(CLKSRC_, SYSCLK_SRC)
 
diff --git a/drivers/clock_control/clock_control_renesas_ra_cgc.c b/drivers/clock_control/clock_control_renesas_ra_cgc.c
index 70512905be7..b03852fc86e 100644
--- a/drivers/clock_control/clock_control_renesas_ra_cgc.c
+++ b/drivers/clock_control/clock_control_renesas_ra_cgc.c
@@ -12,7 +12,7 @@
 #include <zephyr/dt-bindings/clock/ra_clock.h>
 #include <zephyr/drivers/clock_control/renesas_ra_cgc.h>
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pclkblock))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pclkblock), okay)
 #define MSTP_REGS_ELEM(node_id, prop, idx)                                                         \
 	[DT_STRING_TOKEN_BY_IDX(node_id, prop, idx)] =                                             \
 		(volatile uint32_t *)DT_REG_ADDR_BY_IDX(node_id, idx),
diff --git a/drivers/clock_control/clock_control_smartbond.c b/drivers/clock_control/clock_control_smartbond.c
index 3d866fb4c58..ed0cc205264 100644
--- a/drivers/clock_control/clock_control_smartbond.c
+++ b/drivers/clock_control/clock_control_smartbond.c
@@ -265,7 +265,7 @@ static inline int smartbond_clock_control_off(const struct device *dev,
 	switch (clk) {
 	case SMARTBOND_CLK_RC32K:
 		/* RC32K is used by POWERUP and WAKEUP HW FSM */
-		BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(rc32k)),
+		BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_NODELABEL(rc32k), okay),
 				"RC32K is not allowed to be turned off");
 		ret = -EPERM;
 		break;
@@ -472,12 +472,12 @@ static void smartbond_clock_control_update_memory_settings(uint32_t sys_clock_fr
 {
 	if (sys_clock_freq > 32000000) {
 		da1469x_qspi_set_read_pipe_delay(QSPIC_ID, 7);
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(memc))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(memc), okay)
 		da1469x_qspi_set_read_pipe_delay(QSPIC2_ID, 7);
 #endif
 	} else {
 		da1469x_qspi_set_read_pipe_delay(QSPIC_ID, 2);
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(memc))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(memc), okay)
 		da1469x_qspi_set_read_pipe_delay(QSPIC2_ID, 2);
 #endif
 	}
@@ -485,7 +485,7 @@ static void smartbond_clock_control_update_memory_settings(uint32_t sys_clock_fr
 	da1469x_qspi_set_cs_delay(QSPIC_ID, SystemCoreClock,
 		DT_PROP(DT_NODELABEL(flash_controller), read_cs_idle_delay),
 		DT_PROP(DT_NODELABEL(flash_controller), erase_cs_idle_delay));
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(memc))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(memc), okay)
 	da1469x_qspi_set_cs_delay(QSPIC2_ID, SystemCoreClock,
 		DT_PROP(DT_NODELABEL(memc), read_cs_idle_min_ns),
 		DT_PROP_OR(DT_NODELABEL(memc), erase_cs_idle_min_ns, 0));
@@ -565,7 +565,7 @@ int smartbond_clocks_init(const struct device *dev)
 
 	ARG_UNUSED(dev);
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(memc))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(memc), okay)
 	/* Make sure QSPIC2 is enabled */
 	da1469x_clock_amba_enable(CRG_TOP_CLK_AMBA_REG_QSPI2_ENABLE_Msk);
 #endif
@@ -579,12 +579,12 @@ int smartbond_clocks_init(const struct device *dev)
 	DT_FOREACH_CHILD_STATUS_OKAY_SEP(DT_PATH(crg, osc), ENABLE_OSC, (;));
 
 	/* Make sure that selected sysclock is enabled */
-	BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DT_PROP(DT_NODELABEL(sys_clk), clock_src)),
+	BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_PROP(DT_NODELABEL(sys_clk), clock_src), okay),
 		     "Clock selected as system clock no enabled in DT");
-	BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DT_PROP(DT_NODELABEL(lp_clk), clock_src)),
+	BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_PROP(DT_NODELABEL(lp_clk), clock_src), okay),
 		     "Clock selected as LP clock no enabled in DT");
 	BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_NODELABEL(pll), disabled) ||
-		     DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(xtal32m)),
+		     DT_NODE_HAS_STATUS(DT_NODELABEL(xtal32m), okay),
 		     "PLL enabled in DT but XTAL32M is disabled");
 
 	clk_id = DT_DEP_ORD(DT_PROP(DT_NODELABEL(lp_clk), clock_src));
@@ -616,7 +616,7 @@ static int smartbond_clocks_pm_action(const struct device *dev, enum pm_device_a
 	case PM_DEVICE_ACTION_SUSPEND:
 		break;
 	case PM_DEVICE_ACTION_RESUME:
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(memc))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(memc), okay)
 		/* Make sure QSPIC2 is enabled */
 		da1469x_clock_amba_enable(CRG_TOP_CLK_AMBA_REG_QSPI2_ENABLE_Msk);
 #endif
diff --git a/drivers/clock_control/clock_stm32_ll_wb0.c b/drivers/clock_control/clock_stm32_ll_wb0.c
index 3a08cf64067..6654867e01e 100644
--- a/drivers/clock_control/clock_stm32_ll_wb0.c
+++ b/drivers/clock_control/clock_stm32_ll_wb0.c
@@ -39,7 +39,7 @@
 
 #if DT_NODE_HAS_PROP(STM32_CLOCK_CONTROL_NODE, slow_clock)
 
-#	if !DT_NODE_HAS_STATUS_OKAY(DT_RCC_SLOWCLK_NODE)
+#	if !DT_NODE_HAS_STATUS(DT_RCC_SLOWCLK_NODE, okay)
 #		error slow-clock source is not enabled
 #	endif
 
diff --git a/drivers/counter/counter_mcux_snvs.c b/drivers/counter/counter_mcux_snvs.c
index 172b4b894a3..3346cc21e75 100644
--- a/drivers/counter/counter_mcux_snvs.c
+++ b/drivers/counter/counter_mcux_snvs.c
@@ -311,7 +311,7 @@ static const struct counter_driver_api mcux_snvs_driver_api = {
 BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) <= 1,
 	     "unsupported snvs instance");
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0))
+#if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay)
 static struct mcux_snvs_data mcux_snvs_data_0;
 
 static void mcux_snvs_irq_config_0(const struct device *dev);
@@ -339,4 +339,4 @@ static void mcux_snvs_irq_config_0(const struct device *dev)
 		    mcux_snvs_isr, DEVICE_DT_INST_GET(0), 0);
 	irq_enable(DT_INST_IRQN(0));
 }
-#endif  /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0)) */
+#endif  /* DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) */
diff --git a/drivers/counter/counter_smartbond_timer.c b/drivers/counter/counter_smartbond_timer.c
index 8ee8f006dae..8dc3baba045 100644
--- a/drivers/counter/counter_smartbond_timer.c
+++ b/drivers/counter/counter_smartbond_timer.c
@@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(counter_timer, CONFIG_COUNTER_LOG_LEVEL);
 
 #define COUNTER_DT_DEVICE(_idx) DEVICE_DT_GET_OR_NULL(DT_NODELABEL(timer##_idx))
 
-#define PDC_XTAL_EN (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(xtal32m)) ? \
+#define PDC_XTAL_EN (DT_NODE_HAS_STATUS(DT_NODELABEL(xtal32m), okay) ? \
 					MCU_PDC_EN_XTAL : MCU_PDC_EN_NONE)
 
 struct counter_smartbond_data {
diff --git a/drivers/disk/sdmmc_stm32.c b/drivers/disk/sdmmc_stm32.c
index 393950fb664..a344bb9d192 100644
--- a/drivers/disk/sdmmc_stm32.c
+++ b/drivers/disk/sdmmc_stm32.c
@@ -710,7 +710,7 @@ static int disk_stm32_sdmmc_init(const struct device *dev)
 	return err;
 }
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0))
+#if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay)
 
 #if STM32_SDMMC_USE_DMA
 
diff --git a/drivers/dma/dma_mcux_edma.c b/drivers/dma/dma_mcux_edma.c
index 7da8bf79b06..26c7cf58c34 100644
--- a/drivers/dma/dma_mcux_edma.c
+++ b/drivers/dma/dma_mcux_edma.c
@@ -55,11 +55,11 @@ struct dma_mcux_edma_config {
 
 #ifdef CONFIG_DMA_MCUX_USE_DTCM_FOR_DMA_DESCRIPTORS
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm))
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
 #define EDMA_TCDPOOL_CACHE_ATTR __dtcm_noinit_section
-#else /* DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm)) */
+#else /* DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay) */
 #error Selected DTCM for MCUX DMA descriptors but no DTCM section.
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm)) */
+#endif /* DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay) */
 
 #elif defined(CONFIG_NOCACHE_MEMORY)
 #define EDMA_TCDPOOL_CACHE_ATTR __nocache
diff --git a/drivers/dma/dma_stm32.c b/drivers/dma/dma_stm32.c
index e2941a77cdc..178d83665b4 100644
--- a/drivers/dma/dma_stm32.c
+++ b/drivers/dma/dma_stm32.c
@@ -29,7 +29,7 @@ LOG_MODULE_REGISTER(dma_stm32, CONFIG_DMA_LOG_LEVEL);
 #define DT_DRV_COMPAT st_stm32_dma_v2bis
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0))
+#if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay)
 #if DT_INST_IRQ_HAS_IDX(0, 7)
 #define DMA_STM32_0_STREAM_COUNT 8
 #elif DT_INST_IRQ_HAS_IDX(0, 6)
@@ -41,9 +41,9 @@ LOG_MODULE_REGISTER(dma_stm32, CONFIG_DMA_LOG_LEVEL);
 #else
 #define DMA_STM32_0_STREAM_COUNT 3
 #endif
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0)) */
+#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1))
+#if DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay)
 #if DT_INST_IRQ_HAS_IDX(1, 7)
 #define DMA_STM32_1_STREAM_COUNT 8
 #elif DT_INST_IRQ_HAS_IDX(1, 6)
@@ -53,7 +53,7 @@ LOG_MODULE_REGISTER(dma_stm32, CONFIG_DMA_LOG_LEVEL);
 #else
 #define DMA_STM32_1_STREAM_COUNT 5
 #endif
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1)) */
+#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay) */
 
 static const uint32_t table_m_size[] = {
 	LL_DMA_MDATAALIGN_BYTE,
@@ -755,7 +755,7 @@ static void dma_stm32_irq_##dma##_##chan(const struct device *dev)	\
 #endif /* CONFIG_DMA_STM32_SHARED_IRQS */
 
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0))
+#if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay)
 
 DMA_STM32_DEFINE_IRQ_HANDLER(0, 0);
 DMA_STM32_DEFINE_IRQ_HANDLER(0, 1);
@@ -803,10 +803,10 @@ static void dma_stm32_config_irq_0(const struct device *dev)
 
 DMA_STM32_INIT_DEV(0);
 
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0)) */
+#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) */
 
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1))
+#if DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay)
 
 DMA_STM32_DEFINE_IRQ_HANDLER(1, 0);
 DMA_STM32_DEFINE_IRQ_HANDLER(1, 1);
@@ -855,4 +855,4 @@ static void dma_stm32_config_irq_1(const struct device *dev)
 
 DMA_STM32_INIT_DEV(1);
 
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1)) */
+#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay) */
diff --git a/drivers/dma/dma_stm32_bdma.c b/drivers/dma/dma_stm32_bdma.c
index 7f769f47ac4..1df5746facb 100644
--- a/drivers/dma/dma_stm32_bdma.c
+++ b/drivers/dma/dma_stm32_bdma.c
@@ -901,7 +901,7 @@ static void bdma_stm32_irq_##bdma##_##chan(const struct device *dev)	\
 	} while (false)
 
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0))
+#if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay)
 
 #define BDMA_STM32_DEFINE_IRQ_HANDLER_GEN(i, _) \
 	BDMA_STM32_DEFINE_IRQ_HANDLER(0, i)
@@ -918,4 +918,4 @@ static void bdma_stm32_config_irq_0(const struct device *dev)
 
 BDMA_STM32_INIT_DEV(0);
 
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0)) */
+#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) */
diff --git a/drivers/dma/dmamux_stm32.c b/drivers/dma/dmamux_stm32.c
index 27e02b1c188..d12a294eb7f 100644
--- a/drivers/dma/dmamux_stm32.c
+++ b/drivers/dma/dmamux_stm32.c
@@ -108,7 +108,7 @@ struct dmamux_stm32_dma_fops {
 };
 
 #if (defined(CONFIG_DMA_STM32_V1) || defined(CONFIG_DMA_STM32_V2)) && \
-	DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmamux1))
+	DT_NODE_HAS_STATUS(DT_NODELABEL(dmamux1), okay)
 static const struct dmamux_stm32_dma_fops dmamux1 = {
 	dma_stm32_configure,
 	dma_stm32_start,
@@ -118,7 +118,7 @@ static const struct dmamux_stm32_dma_fops dmamux1 = {
 };
 #endif
 
-#if defined(CONFIG_DMA_STM32_BDMA) && DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmamux2))
+#if defined(CONFIG_DMA_STM32_BDMA) && DT_NODE_HAS_STATUS(DT_NODELABEL(dmamux2), okay)
 static const struct dmamux_stm32_dma_fops dmamux2 = {
 	bdma_stm32_configure,
 	bdma_stm32_start,
@@ -130,17 +130,17 @@ static const struct dmamux_stm32_dma_fops dmamux2 = {
 
 const struct dmamux_stm32_dma_fops *get_dma_fops(const struct dmamux_stm32_config *dev_config)
 {
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmamux1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(dmamux1), okay)
 	if (dev_config->base == DT_REG_ADDR(DT_NODELABEL(dmamux1))) {
 		return &dmamux1;
 	}
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmamux1)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(dmamux1), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmamux2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(dmamux2), okay)
 	if (dev_config->base == DT_REG_ADDR(DT_NODELABEL(dmamux2))) {
 		return &dmamux2;
 	}
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmamux2)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(dmamux2), okay) */
 
 	__ASSERT(false, "Unknown dma base address %x", dev_config->base);
 	return (void *)0;
@@ -298,24 +298,24 @@ static int dmamux_stm32_init(const struct device *dev)
 	}
 #endif /* DT_INST_NODE_HAS_PROP(0, clocks) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmamux1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(dmamux1), okay)
 	/* DMA 1 and DMA2 for DMAMUX1, BDMA for DMAMUX2 */
 	if (config->base == DT_REG_ADDR(DT_NODELABEL(dmamux1))) {
 		/* DMAs assigned to DMAMUX channels at build time might not be ready. */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dma1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(dma1), okay)
 		if (device_is_ready(DEVICE_DT_GET(DT_NODELABEL(dma1))) == false) {
 			return -ENODEV;
 		}
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dma2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(dma2), okay)
 		if (device_is_ready(DEVICE_DT_GET(DT_NODELABEL(dma2))) == false) {
 			return -ENODEV;
 		}
 #endif
 	}
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmamux1)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(dmamux1), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmamux2)) && DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(bdma1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(dmamux2), okay) && DT_NODE_HAS_STATUS(DT_NODELABEL(bdma1), okay)
 	if (config->base == DT_REG_ADDR(DT_NODELABEL(dmamux2))) {
 		if (device_is_ready(DEVICE_DT_GET(DT_NODELABEL(bdma1))) == false) {
 			return -ENODEV;
@@ -346,19 +346,19 @@ static const struct dma_driver_api dma_funcs = {
 #define DMA_1_BEGIN_DMAMUX_CHANNEL DT_PROP_OR(DT_NODELABEL(dma1), dma_offset, 0)
 #define DMA_1_END_DMAMUX_CHANNEL (DMA_1_BEGIN_DMAMUX_CHANNEL + \
 				DT_PROP_OR(DT_NODELABEL(dma1), dma_requests, 0))
-#define DEV_DMA1 COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dma1)), \
+#define DEV_DMA1 COND_CODE_1(DT_NODE_HAS_STATUS(DT_NODELABEL(dma1), okay), \
 			     DEVICE_DT_GET(DT_NODELABEL(dma1)), NULL)
 
 #define DMA_2_BEGIN_DMAMUX_CHANNEL DT_PROP_OR(DT_NODELABEL(dma2), dma_offset, 0)
 #define DMA_2_END_DMAMUX_CHANNEL (DMA_2_BEGIN_DMAMUX_CHANNEL + \
 				DT_PROP_OR(DT_NODELABEL(dma2), dma_requests, 0))
-#define DEV_DMA2 COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dma2)), \
+#define DEV_DMA2 COND_CODE_1(DT_NODE_HAS_STATUS(DT_NODELABEL(dma2), okay), \
 			     DEVICE_DT_GET(DT_NODELABEL(dma2)), NULL)
 
 #define BDMA_1_BEGIN_DMAMUX_CHANNEL DT_PROP_OR(DT_NODELABEL(bdma1), dma_offset, 0)
 #define BDMA_1_END_DMAMUX_CHANNEL (BDMA_1_BEGIN_DMAMUX_CHANNEL + \
 				DT_PROP_OR(DT_NODELABEL(bdma1), dma_requests, 0))
-#define DEV_BDMA COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(bdma1)), \
+#define DEV_BDMA COND_CODE_1(DT_NODE_HAS_STATUS(DT_NODELABEL(bdma1), okay), \
 			     DEVICE_DT_GET(DT_NODELABEL(bdma1)), NULL)
 
 #define DEV_DMA_BINDING(mux_channel) \
diff --git a/drivers/espi/espi_mchp_xec_host_v2.c b/drivers/espi/espi_mchp_xec_host_v2.c
index 12d32007e84..8cf4e085ed5 100644
--- a/drivers/espi/espi_mchp_xec_host_v2.c
+++ b/drivers/espi/espi_mchp_xec_host_v2.c
@@ -108,7 +108,7 @@ static uint8_t ec_host_cmd_sram[CONFIG_ESPI_XEC_PERIPHERAL_HOST_CMD_PARAM_SIZE]
 
 #ifdef CONFIG_ESPI_PERIPHERAL_XEC_MAILBOX
 
-BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(mbox0)),
+BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_NODELABEL(mbox0), okay),
 	     "XEC mbox0 DT node is disabled!");
 
 static struct xec_mbox_config {
@@ -171,7 +171,7 @@ static int init_mbox0(const struct device *dev)
 
 #ifdef CONFIG_ESPI_PERIPHERAL_8042_KBC
 
-BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(kbc0)),
+BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_NODELABEL(kbc0), okay),
 	     "XEC kbc0 DT node is disabled!");
 
 struct xec_kbc0_config {
@@ -665,7 +665,7 @@ static int init_acpi_ec1(const struct device *dev)
 
 #ifdef CONFIG_ESPI_PERIPHERAL_EC_HOST_CMD
 
-BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(emi0)),
+BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_NODELABEL(emi0), okay),
 	     "XEC EMI0 DT node is disabled!");
 
 struct xec_emi_config {
diff --git a/drivers/ethernet/eth_stm32_hal.c b/drivers/ethernet/eth_stm32_hal.c
index 4186039a1be..02ae6830f60 100644
--- a/drivers/ethernet/eth_stm32_hal.c
+++ b/drivers/ethernet/eth_stm32_hal.c
@@ -50,7 +50,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #endif
 
 #if defined(CONFIG_ETH_STM32_HAL_USE_DTCM_FOR_DMA_BUFFER) && \
-	    !DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm))
+	    !DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
 #error DTCM for DMA buffer is activated but zephyr,dtcm is not present in dts
 #endif
 
@@ -91,7 +91,7 @@ static const struct device *eth_stm32_phy_dev = DEVICE_PHY_BY_NAME(0);
 #define ETH_DMA_TX_TIMEOUT_MS	20U  /* transmit timeout in milliseconds */
 
 #if defined(CONFIG_ETH_STM32_HAL_USE_DTCM_FOR_DMA_BUFFER) && \
-	    DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm))
+	    DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
 #define __eth_stm32_desc __dtcm_noinit_section
 #define __eth_stm32_buf  __dtcm_noinit_section
 #elif defined(CONFIG_SOC_SERIES_STM32H7X)
diff --git a/drivers/ethernet/nxp_enet/eth_mcux.c b/drivers/ethernet/nxp_enet/eth_mcux.c
index 397fa58bae1..2ac0296d6b2 100644
--- a/drivers/ethernet/nxp_enet/eth_mcux.c
+++ b/drivers/ethernet/nxp_enet/eth_mcux.c
@@ -149,7 +149,7 @@ static const char *eth_name(ENET_Type *base)
 	switch ((int)base) {
 	case DT_INST_REG_ADDR(0):
 		return "ETH_0";
-#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1))
+#if DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay)
 	case DT_INST_REG_ADDR(1):
 		return "ETH_1";
 #endif
@@ -964,10 +964,10 @@ static void eth_mcux_init(const struct device *dev)
 	context->phy_handle->ops = &phyksz8081_ops;
 
 #if defined(CONFIG_SOC_SERIES_IMXRT10XX)
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay)
 	sys_clock = CLOCK_GetFreq(kCLOCK_IpgClk);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet2), okay)
 	sys_clock = CLOCK_GetFreq(kCLOCK_EnetPll1Clk);
 #endif
 #elif defined(CONFIG_SOC_SERIES_IMXRT11XX)
@@ -1350,7 +1350,7 @@ static void eth_mcux_err_isr(const struct device *dev)
 	} while (false)
 
 #define ETH_MCUX_IRQ_PTP(n)						\
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(PTP_INST_NODEID(n)),	\
+	COND_CODE_1(DT_NODE_HAS_STATUS(PTP_INST_NODEID(n), okay),	\
 		    (ETH_MCUX_IRQ_PTP_INIT(n)),				\
 		    (ETH_MCUX_NONE))
 
@@ -1454,7 +1454,7 @@ static void eth_mcux_err_isr(const struct device *dev)
 #define ETH_MCUX_PINCTRL_INIT(n)
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm)) && \
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay) && \
 	CONFIG_ETH_MCUX_USE_DTCM_FOR_DMA_BUFFER
 /* Use DTCM for hardware DMA buffers */
 #define _mcux_dma_desc __dtcm_bss_section
diff --git a/drivers/ethernet/nxp_enet/eth_nxp_enet.c b/drivers/ethernet/nxp_enet/eth_nxp_enet.c
index b80e0cc34bd..a92b13f8da9 100644
--- a/drivers/ethernet/nxp_enet/eth_nxp_enet.c
+++ b/drivers/ethernet/nxp_enet/eth_nxp_enet.c
@@ -854,7 +854,7 @@ static const struct ethernet_api api_funcs = {
 #define NXP_ENET_DT_PHY_DEV(node_id, phy_phandle, idx)						\
 	DEVICE_DT_GET(DT_PHANDLE_BY_IDX(node_id, phy_phandle, idx))
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm)) && \
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay) && \
 	CONFIG_ETH_NXP_ENET_USE_DTCM_FOR_DMA_BUFFER
 #define _nxp_enet_dma_desc_section __dtcm_bss_section
 #define _nxp_enet_dma_buffer_section __dtcm_noinit_section
diff --git a/drivers/ethernet/phy/phy_adin2111.c b/drivers/ethernet/phy/phy_adin2111.c
index 902838bd08d..380def0ebe7 100644
--- a/drivers/ethernet/phy/phy_adin2111.c
+++ b/drivers/ethernet/phy/phy_adin2111.c
@@ -7,7 +7,7 @@
 
 #include <zephyr/logging/log.h>
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, adi_adin2111_phy))
+#if DT_NODE_HAS_STATUS(DT_INST(0, adi_adin2111_phy), okay)
 #define DT_DRV_COMPAT adi_adin2111_phy
 #else
 #define DT_DRV_COMPAT adi_adin1100_phy
diff --git a/drivers/flash/soc_flash_lpc.c b/drivers/flash/soc_flash_lpc.c
index 5f931a1bf73..ae457fe926b 100644
--- a/drivers/flash/soc_flash_lpc.c
+++ b/drivers/flash/soc_flash_lpc.c
@@ -17,9 +17,9 @@
 #include "fsl_flashiap.h"
 
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_iap_fmc11))
+#if DT_NODE_HAS_STATUS(DT_INST(0, nxp_iap_fmc11), okay)
 #define DT_DRV_COMPAT nxp_iap_fmc11
-#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_iap_fmc54))
+#elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_iap_fmc54), okay)
 #define DT_DRV_COMPAT nxp_iap_fmc54
 #else
 #error No matching compatible for soc_flash_lpc.c
diff --git a/drivers/flash/soc_flash_mcux.c b/drivers/flash/soc_flash_mcux.c
index cc743371baa..6eaf90cd010 100644
--- a/drivers/flash/soc_flash_mcux.c
+++ b/drivers/flash/soc_flash_mcux.c
@@ -22,19 +22,19 @@
 LOG_MODULE_REGISTER(flash_mcux);
 
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_kinetis_ftfa))
+#if DT_NODE_HAS_STATUS(DT_INST(0, nxp_kinetis_ftfa), okay)
 #define DT_DRV_COMPAT nxp_kinetis_ftfa
-#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_kinetis_ftfe))
+#elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_kinetis_ftfe), okay)
 #define DT_DRV_COMPAT nxp_kinetis_ftfe
-#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_kinetis_ftfl))
+#elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_kinetis_ftfl), okay)
 #define DT_DRV_COMPAT nxp_kinetis_ftfl
-#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_iap_fmc55))
+#elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_iap_fmc55), okay)
 #define DT_DRV_COMPAT nxp_iap_fmc55
 #define SOC_HAS_IAP 1
-#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_iap_fmc553))
+#elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_iap_fmc553), okay)
 #define DT_DRV_COMPAT nxp_iap_fmc553
 #define SOC_HAS_IAP 1
-#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_iap_msf1))
+#elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_iap_msf1), okay)
 #define DT_DRV_COMPAT nxp_iap_msf1
 #define SOC_HAS_IAP_MSF1 1
 #else
diff --git a/drivers/flash/soc_flash_nrf.c b/drivers/flash/soc_flash_nrf.c
index a960656f5d2..16ab00b9660 100644
--- a/drivers/flash/soc_flash_nrf.c
+++ b/drivers/flash/soc_flash_nrf.c
@@ -23,13 +23,13 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(flash_nrf);
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nordic_nrf51_flash_controller))
+#if DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf51_flash_controller), okay)
 #define DT_DRV_COMPAT nordic_nrf51_flash_controller
-#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nordic_nrf52_flash_controller))
+#elif DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf52_flash_controller), okay)
 #define DT_DRV_COMPAT nordic_nrf52_flash_controller
-#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nordic_nrf53_flash_controller))
+#elif DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf53_flash_controller), okay)
 #define DT_DRV_COMPAT nordic_nrf53_flash_controller
-#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nordic_nrf91_flash_controller))
+#elif DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf91_flash_controller), okay)
 #define DT_DRV_COMPAT nordic_nrf91_flash_controller
 #else
 #error No matching compatible for soc_flash_nrf.c
diff --git a/drivers/gpio/gpio_esp32.c b/drivers/gpio/gpio_esp32.c
index d0c933ca37d..ea12070235e 100644
--- a/drivers/gpio/gpio_esp32.c
+++ b/drivers/gpio/gpio_esp32.c
@@ -284,7 +284,7 @@ static int gpio_esp32_port_get_raw(const struct device *port, uint32_t *value)
 
 	if (cfg->gpio_port == 0) {
 		*value = cfg->gpio_dev->in;
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
 	} else {
 		*value = cfg->gpio_dev->in1.data;
 #endif
@@ -302,7 +302,7 @@ static int gpio_esp32_port_set_masked_raw(const struct device *port,
 
 	if (cfg->gpio_port == 0) {
 		cfg->gpio_dev->out = (cfg->gpio_dev->out & ~mask) | (mask & value);
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
 	} else {
 		cfg->gpio_dev->out1.data = (cfg->gpio_dev->out1.data & ~mask) | (mask & value);
 #endif
@@ -320,7 +320,7 @@ static int gpio_esp32_port_set_bits_raw(const struct device *port,
 
 	if (cfg->gpio_port == 0) {
 		cfg->gpio_dev->out_w1ts = pins;
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
 	} else {
 		cfg->gpio_dev->out1_w1ts.data = pins;
 #endif
@@ -336,7 +336,7 @@ static int gpio_esp32_port_clear_bits_raw(const struct device *port,
 
 	if (cfg->gpio_port == 0) {
 		cfg->gpio_dev->out_w1tc = pins;
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
 	} else {
 		cfg->gpio_dev->out1_w1tc.data = pins;
 #endif
@@ -353,7 +353,7 @@ static int gpio_esp32_port_toggle_bits(const struct device *port,
 
 	if (cfg->gpio_port == 0) {
 		cfg->gpio_dev->out ^= pins;
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
 	} else {
 		cfg->gpio_dev->out1.data ^= pins;
 #endif
@@ -531,11 +531,11 @@ static void IRAM_ATTR gpio_esp32_isr(void *param)
 {
 	ARG_UNUSED(param);
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
 	gpio_esp32_fire_callbacks(DEVICE_DT_INST_GET(0));
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
 	gpio_esp32_fire_callbacks(DEVICE_DT_INST_GET(1));
 #endif
 }
diff --git a/drivers/gpio/gpio_gd32.c b/drivers/gpio/gpio_gd32.c
index 1c40be4de4c..744f5e4a776 100644
--- a/drivers/gpio/gpio_gd32.c
+++ b/drivers/gpio/gpio_gd32.c
@@ -365,7 +365,7 @@ static int gpio_gd32_init(const struct device *port)
 		},							       \
 		.reg = DT_INST_REG_ADDR(n),				       \
 		.clkid = DT_INST_CLOCKS_CELL(n, id),			       \
-		COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(SYSCFG_NODE),	       \
+		COND_CODE_1(DT_NODE_HAS_STATUS(SYSCFG_NODE, okay),	       \
 			    (.clkid_exti = DT_CLOCKS_CELL(SYSCFG_NODE, id),),  \
 			    (.clkid_exti = DT_CLOCKS_CELL(AFIO_NODE, id),))    \
 		.reset = RESET_DT_SPEC_INST_GET(n),			       \
diff --git a/drivers/gpio/gpio_lpc11u6x.c b/drivers/gpio/gpio_lpc11u6x.c
index 102d8c3e8b6..a44deceed9b 100644
--- a/drivers/gpio/gpio_lpc11u6x.c
+++ b/drivers/gpio/gpio_lpc11u6x.c
@@ -459,21 +459,21 @@ static void gpio_lpc11u6x_isr(const void *arg)
 		}
 	}
 	/* For each port with active pins, fire the GPIO interrupt callbacks. */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
 	if (pins[0]) {
 		port = DEVICE_DT_GET(DT_NODELABEL(gpio0));
 		data = port->data;
 		gpio_fire_callbacks(&data->cb_list, port, pins[0]);
 	}
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
 	if (pins[1]) {
 		port = DEVICE_DT_GET(DT_NODELABEL(gpio1));
 		data = port->data;
 		gpio_fire_callbacks(&data->cb_list, port, pins[1]);
 	}
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay)
 	if (pins[2]) {
 		port = DEVICE_DT_GET(DT_NODELABEL(gpio2));
 		data = port->data;
@@ -589,14 +589,14 @@ DEVICE_DT_DEFINE(DT_NODELABEL(gpio##id),				\
 		    PRE_KERNEL_2, CONFIG_GPIO_INIT_PRIORITY,		\
 		    &gpio_lpc11u6x_driver_api)
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
 GPIO_LPC11U6X_INIT(0);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
 GPIO_LPC11U6X_INIT(1);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay)
 GPIO_LPC11U6X_INIT(2);
 #endif
diff --git a/drivers/gpio/gpio_mchp_xec.c b/drivers/gpio/gpio_mchp_xec.c
index e96130a0941..86d9f2a5d7a 100644
--- a/drivers/gpio/gpio_mchp_xec.c
+++ b/drivers/gpio/gpio_mchp_xec.c
@@ -341,7 +341,7 @@ static const struct gpio_driver_api gpio_xec_driver_api = {
 	.manage_callback = gpio_xec_manage_callback,
 };
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_000_036))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_000_036), okay)
 static int gpio_xec_port000_036_init(const struct device *dev);
 
 static const struct gpio_xec_config gpio_xec_port000_036_config = {
@@ -385,9 +385,9 @@ static int gpio_xec_port000_036_init(const struct device *dev)
 #endif
 	return 0;
 }
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_000_036)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_000_036), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_040_076))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_040_076), okay)
 static int gpio_xec_port040_076_init(const struct device *dev);
 
 static const struct gpio_xec_config gpio_xec_port040_076_config = {
@@ -431,9 +431,9 @@ static int gpio_xec_port040_076_init(const struct device *dev)
 #endif
 	return 0;
 }
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_040_076)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_040_076), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_100_136))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_100_136), okay)
 static int gpio_xec_port100_136_init(const struct device *dev);
 
 static const struct gpio_xec_config gpio_xec_port100_136_config = {
@@ -477,9 +477,9 @@ static int gpio_xec_port100_136_init(const struct device *dev)
 #endif
 	return 0;
 }
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_100_136)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_100_136), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_140_176))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_140_176), okay)
 static int gpio_xec_port140_176_init(const struct device *dev);
 
 static const struct gpio_xec_config gpio_xec_port140_176_config = {
@@ -523,9 +523,9 @@ static int gpio_xec_port140_176_init(const struct device *dev)
 #endif
 	return 0;
 }
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_140_176)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_140_176), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_200_236))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_200_236), okay)
 static int gpio_xec_port200_236_init(const struct device *dev);
 
 static const struct gpio_xec_config gpio_xec_port200_236_config = {
@@ -569,9 +569,9 @@ static int gpio_xec_port200_236_init(const struct device *dev)
 #endif
 	return 0;
 }
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_200_236)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_200_236), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_240_276))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_240_276), okay)
 static int gpio_xec_port240_276_init(const struct device *dev);
 
 static const struct gpio_xec_config gpio_xec_port240_276_config = {
@@ -615,4 +615,4 @@ static int gpio_xec_port240_276_init(const struct device *dev)
 #endif
 	return 0;
 }
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio_240_276)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_240_276), okay) */
diff --git a/drivers/gpio/gpio_nrfx.c b/drivers/gpio/gpio_nrfx.c
index 151cf1a830c..d89c964cc90 100644
--- a/drivers/gpio/gpio_nrfx.c
+++ b/drivers/gpio/gpio_nrfx.c
@@ -446,7 +446,7 @@ static const struct gpio_driver_api gpio_nrfx_drv_api_funcs = {
 
 #define GPIOTE_CHECK(id)						       \
 	COND_CODE_1(DT_INST_NODE_HAS_PROP(id, gpiote_instance),		       \
-		(BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(GPIOTE_PHANDLE(id)),    \
+		(BUILD_ASSERT(DT_NODE_HAS_STATUS(GPIOTE_PHANDLE(id), okay),    \
 			"Please enable GPIOTE instance for used GPIO port!")), \
 		())
 
diff --git a/drivers/gpio/gpio_nxp_s32.c b/drivers/gpio/gpio_nxp_s32.c
index 5e9e7a55471..e9bcc29c907 100644
--- a/drivers/gpio/gpio_nxp_s32.c
+++ b/drivers/gpio/gpio_nxp_s32.c
@@ -519,7 +519,7 @@ static const struct gpio_driver_api gpio_nxp_s32_driver_api = {
 			DT_NODE_HAS_PROP(DT_DRV_INST(n), interrupts)),		\
 			"interrupts and interrupt-parent must be set when "	\
 			"using external interrupts");				\
-	IF_ENABLED(DT_NODE_HAS_STATUS_OKAY(GPIO_NXP_S32_EIRQ_NODE(n)), (	\
+	IF_ENABLED(DT_NODE_HAS_STATUS(GPIO_NXP_S32_EIRQ_NODE(n), okay), (	\
 		static uint8_t gpio_nxp_s32_eirq_data_##n[] = {			\
 			LISTIFY(DT_NUM_IRQS(DT_DRV_INST(n)),			\
 				GPIO_NXP_S32_EIRQ_PIN_LINE, (,), n)		\
@@ -533,7 +533,7 @@ static const struct gpio_driver_api gpio_nxp_s32_driver_api = {
 	))
 
 #define GPIO_NXP_S32_GET_EIRQ_INFO(n)						\
-	.eirq_info = UTIL_AND(DT_NODE_HAS_STATUS_OKAY(GPIO_NXP_S32_EIRQ_NODE(n)),\
+	.eirq_info = UTIL_AND(DT_NODE_HAS_STATUS(GPIO_NXP_S32_EIRQ_NODE(n), okay),\
 				&gpio_nxp_s32_eirq_##n),
 #else
 #define GPIO_NXP_S32_SET_EIRQ_INFO(n)
@@ -547,7 +547,7 @@ static const struct gpio_driver_api gpio_nxp_s32_driver_api = {
 	BUILD_ASSERT((DT_INST_NODE_HAS_PROP(n, nxp_wkpu) ==			\
 			DT_INST_NODE_HAS_PROP(n, nxp_wkpu_interrupts)),		\
 			"nxp,wkpu and nxp,wkpu-interrupts must be provided");	\
-	IF_ENABLED(DT_NODE_HAS_STATUS_OKAY(GPIO_NXP_S32_WKPU_NODE(n)), (	\
+	IF_ENABLED(DT_NODE_HAS_STATUS(GPIO_NXP_S32_WKPU_NODE(n), okay), (	\
 		static uint8_t gpio_nxp_s32_wkpu_data_##n[] =			\
 			DT_INST_PROP(n, nxp_wkpu_interrupts);			\
 		static struct gpio_nxp_s32_irq_config gpio_nxp_s32_wkpu_##n = {	\
@@ -560,7 +560,7 @@ static const struct gpio_driver_api gpio_nxp_s32_driver_api = {
 	))
 
 #define GPIO_NXP_S32_GET_WKPU_INFO(n)						\
-	.wkpu_info = UTIL_AND(DT_NODE_HAS_STATUS_OKAY(GPIO_NXP_S32_WKPU_NODE(n)),\
+	.wkpu_info = UTIL_AND(DT_NODE_HAS_STATUS(GPIO_NXP_S32_WKPU_NODE(n), okay),\
 				&gpio_nxp_s32_wkpu_##n)
 #else
 #define GPIO_NXP_S32_SET_WKPU_INFO(n)
diff --git a/drivers/gpio/gpio_renesas_ra_ioport.c b/drivers/gpio/gpio_renesas_ra_ioport.c
index 65fc946438a..8005acab360 100644
--- a/drivers/gpio/gpio_renesas_ra_ioport.c
+++ b/drivers/gpio/gpio_renesas_ra_ioport.c
@@ -176,7 +176,7 @@ static const struct gpio_driver_api gpio_ra_drv_api_funcs = {
 			 DT_REG_ADDR(DT_NODELABEL(ioport##suffix)))
 
 #define GPIO_DEVICE_INIT_RA_IF_OKAY(suffix)                                                        \
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ioport##suffix)),                         \
+	COND_CODE_1(DT_NODE_HAS_STATUS(DT_NODELABEL(ioport##suffix), okay),                        \
 		    (GPIO_DEVICE_INIT_RA(suffix)),                                                 \
 		    ())
 
diff --git a/drivers/gpio/gpio_sam0.c b/drivers/gpio/gpio_sam0.c
index 98234d3319d..03cfab48e60 100644
--- a/drivers/gpio/gpio_sam0.c
+++ b/drivers/gpio/gpio_sam0.c
@@ -286,7 +286,7 @@ static const struct gpio_driver_api gpio_sam0_api = {
 static int gpio_sam0_init(const struct device *dev) { return 0; }
 
 /* Port A */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(porta))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(porta), okay)
 
 static const struct gpio_sam0_config gpio_sam0_config_0 = {
 	.common = {
@@ -308,7 +308,7 @@ DEVICE_DT_DEFINE(DT_NODELABEL(porta),
 #endif
 
 /* Port B */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portb))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(portb), okay)
 
 static const struct gpio_sam0_config gpio_sam0_config_1 = {
 	.common = {
@@ -330,7 +330,7 @@ DEVICE_DT_DEFINE(DT_NODELABEL(portb),
 #endif
 
 /* Port C */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portc))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(portc), okay)
 
 static const struct gpio_sam0_config gpio_sam0_config_2 = {
 	.common = {
@@ -352,7 +352,7 @@ DEVICE_DT_DEFINE(DT_NODELABEL(portc),
 #endif
 
 /* Port D */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portd))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(portd), okay)
 
 static const struct gpio_sam0_config gpio_sam0_config_3 = {
 	.common = {
diff --git a/drivers/gpio/gpio_stm32.c b/drivers/gpio/gpio_stm32.c
index 23edb977755..407c1a414e6 100644
--- a/drivers/gpio/gpio_stm32.c
+++ b/drivers/gpio/gpio_stm32.c
@@ -697,7 +697,7 @@ static int gpio_stm32_init(const struct device *dev)
 	}
 
 #if (defined(PWR_CR2_IOSV) || defined(PWR_SVMCR_IO2SV)) && \
-	DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpiog))
+	DT_NODE_HAS_STATUS(DT_NODELABEL(gpiog), okay)
 	z_stm32_hsem_lock(CFG_HW_RCC_SEMID, HSEM_LOCK_DEFAULT_RETRY);
 	/* Port G[15:2] requires external power supply */
 	/* Cf: L4/L5 RM, Chapter "Independent I/O supply rail" */
@@ -747,7 +747,7 @@ static int gpio_stm32_init(const struct device *dev)
 			 DT_CLOCKS_CELL(DT_NODELABEL(gpio##__suffix), bus))
 
 #define GPIO_DEVICE_INIT_STM32_IF_OKAY(__suffix, __SUFFIX) \
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio##__suffix)), \
+	COND_CODE_1(DT_NODE_HAS_STATUS(DT_NODELABEL(gpio##__suffix), okay), \
 		    (GPIO_DEVICE_INIT_STM32(__suffix, __SUFFIX)), \
 		    ())
 
diff --git a/drivers/gpio/gpio_xlnx_axi.c b/drivers/gpio/gpio_xlnx_axi.c
index 3b1238310f9..4b50bf85cd6 100644
--- a/drivers/gpio/gpio_xlnx_axi.c
+++ b/drivers/gpio/gpio_xlnx_axi.c
@@ -382,7 +382,7 @@ static const struct gpio_driver_api gpio_xlnx_axi_driver_api = {
 
 #define GPIO_XLNX_AXI_GPIO2_HAS_COMPAT_STATUS_OKAY(n)                                              \
 	UTIL_AND(DT_NODE_HAS_COMPAT(DT_INST_CHILD(n, gpio2), xlnx_xps_gpio_1_00_a_gpio2),          \
-		 DT_NODE_HAS_STATUS_OKAY(DT_INST_CHILD(n, gpio2)))
+		 DT_NODE_HAS_STATUS(DT_INST_CHILD(n, gpio2), okay))
 
 #define GPIO_XLNX_AXI_GPIO2_COND_INIT(n)                                                           \
 	IF_ENABLED(UTIL_AND(DT_INST_PROP_OR(n, xlnx_is_dual, 1),                                   \
diff --git a/drivers/i2c/i2c_esp32.c b/drivers/i2c/i2c_esp32.c
index 07c8ea536ca..3c138172209 100644
--- a/drivers/i2c/i2c_esp32.c
+++ b/drivers/i2c/i2c_esp32.c
@@ -843,7 +843,7 @@ static int IRAM_ATTR i2c_esp32_init(const struct device *dev)
 			     &i2c_esp32_config_##idx, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY,	   \
 			     &i2c_esp32_driver_api);
 
-#if DT_NODE_HAS_STATUS_OKAY(I2C(0))
+#if DT_NODE_HAS_STATUS(I2C(0), okay)
 #ifndef SOC_I2C_SUPPORT_HW_CLR_BUS
 #if !DT_NODE_HAS_PROP(I2C(0), sda_gpios) || !DT_NODE_HAS_PROP(I2C(0), scl_gpios)
 #error "Missing <sda-gpios> and <scl-gpios> properties to build for this target."
@@ -854,9 +854,9 @@ static int IRAM_ATTR i2c_esp32_init(const struct device *dev)
 #endif
 #endif /* !SOC_I2C_SUPPORT_HW_CLR_BUS */
 ESP32_I2C_INIT(0);
-#endif /* DT_NODE_HAS_STATUS_OKAY(I2C(0)) */
+#endif /* DT_NODE_HAS_STATUS(I2C(0), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(I2C(1))
+#if DT_NODE_HAS_STATUS(I2C(1), okay)
 #ifndef SOC_I2C_SUPPORT_HW_CLR_BUS
 #if !DT_NODE_HAS_PROP(I2C(1), sda_gpios) || !DT_NODE_HAS_PROP(I2C(1), scl_gpios)
 #error "Missing <sda-gpios> and <scl-gpios> properties to build for this target."
@@ -867,4 +867,4 @@ ESP32_I2C_INIT(0);
 #endif
 #endif /* !SOC_I2C_SUPPORT_HW_CLR_BUS */
 ESP32_I2C_INIT(1);
-#endif /* DT_NODE_HAS_STATUS_OKAY(I2C(1)) */
+#endif /* DT_NODE_HAS_STATUS(I2C(1), okay) */
diff --git a/drivers/i2s/i2s_litex.c b/drivers/i2s/i2s_litex.c
index 6105804d8ce..e66eaed7972 100644
--- a/drivers/i2s/i2s_litex.c
+++ b/drivers/i2s/i2s_litex.c
@@ -634,9 +634,9 @@ static const struct i2s_driver_api i2s_litex_driver_api = {
 		irq_enable(DT_IRQN(DT_NODELABEL(i2s_##dir)));                  \
 	}
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2s_rx))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2s_rx), okay)
 I2S_INIT(rx);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2s_tx))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2s_tx), okay)
 I2S_INIT(tx);
 #endif
diff --git a/drivers/interrupt_controller/intc_mchp_ecia_xec.c b/drivers/interrupt_controller/intc_mchp_ecia_xec.c
index c4844643ccb..f1fc0f8c28b 100644
--- a/drivers/interrupt_controller/intc_mchp_ecia_xec.c
+++ b/drivers/interrupt_controller/intc_mchp_ecia_xec.c
@@ -445,7 +445,7 @@ int mchp_ecia_info_unset_callback(int ecia_info)
  * Leaving a node disabled also allows another driver/application to take over
  * aggregation by managing the GIRQ itself.
  */
-#define XEC_CHK_REQ_AGGR(n) DT_NODE_HAS_STATUS_OKAY(n) |
+#define XEC_CHK_REQ_AGGR(n) DT_NODE_HAS_STATUS(n, okay) |
 
 #define XEC_ECIA_REQUIRE_AGGR_ISR					\
 	(								\
diff --git a/drivers/led_strip/lpd880x.c b/drivers/led_strip/lpd880x.c
index d4b56509db1..991e2e3fb57 100644
--- a/drivers/led_strip/lpd880x.c
+++ b/drivers/led_strip/lpd880x.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 #include <string.h>
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, greeled_lpd8806))
+#if DT_NODE_HAS_STATUS(DT_INST(0, greeled_lpd8806), okay)
 #define DT_DRV_COMPAT greeled_lpd8806
 #else
 #define DT_DRV_COMPAT greeled_lpd8803
diff --git a/drivers/lora/shell.c b/drivers/lora/shell.c
index 7d3775c9d5c..692446b06cf 100644
--- a/drivers/lora/shell.c
+++ b/drivers/lora/shell.c
@@ -13,7 +13,7 @@
 LOG_MODULE_REGISTER(lora_shell, CONFIG_LORA_LOG_LEVEL);
 
 #define DEFAULT_RADIO_NODE DT_ALIAS(lora0)
-BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DEFAULT_RADIO_NODE),
+BUILD_ASSERT(DT_NODE_HAS_STATUS(DEFAULT_RADIO_NODE, okay),
 	     "No default LoRa radio specified in DT");
 
 static struct lora_modem_config modem_config = {
diff --git a/drivers/memc/memc_nxp_s32_qspi.c b/drivers/memc/memc_nxp_s32_qspi.c
index e1d5c60bd67..f588a0bd9af 100644
--- a/drivers/memc/memc_nxp_s32_qspi.c
+++ b/drivers/memc/memc_nxp_s32_qspi.c
@@ -139,7 +139,7 @@ uint8_t memc_nxp_s32_qspi_get_instance(const struct device *dev)
 
 #define QSPI_PORT_SIZE_FN(node_id, side_upper, port)					\
 	COND_CODE_1(IS_EQ(DT_REG_ADDR(node_id), QSPI_PCSF##side_upper##port),		\
-		(COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(node_id),				\
+		(COND_CODE_1(DT_NODE_HAS_STATUS(node_id, okay),				\
 			(.memSize##side_upper##port = DT_PROP(node_id, size) / 8,),	\
 			(.memSize##side_upper##port = 0,))),				\
 		(EMPTY))
diff --git a/drivers/pinctrl/pinctrl_esp32.c b/drivers/pinctrl/pinctrl_esp32.c
index 4ed39229d56..89c1ba43b41 100644
--- a/drivers/pinctrl/pinctrl_esp32.c
+++ b/drivers/pinctrl/pinctrl_esp32.c
@@ -254,7 +254,7 @@ static int esp32_pin_configure(const uint32_t pin_mux, const uint32_t pin_cfg)
 			gpio_dev_t *const gpio_dev =
 				(gpio_dev_t *)DT_REG_ADDR(DT_NODELABEL(gpio0));
 			gpio_dev->out_w1ts = BIT(pin_num);
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
 		} else {
 			gpio_dev_t *const gpio_dev =
 				(gpio_dev_t *)DT_REG_ADDR(DT_NODELABEL(gpio1));
@@ -268,7 +268,7 @@ static int esp32_pin_configure(const uint32_t pin_mux, const uint32_t pin_cfg)
 			gpio_dev_t *const gpio_dev =
 				(gpio_dev_t *)DT_REG_ADDR(DT_NODELABEL(gpio0));
 			gpio_dev->out_w1tc = BIT(pin_num);
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
 		} else {
 			gpio_dev_t *const gpio_dev =
 				(gpio_dev_t *)DT_REG_ADDR(DT_NODELABEL(gpio1));
diff --git a/drivers/pinctrl/pinctrl_ite_it8xxx2.c b/drivers/pinctrl/pinctrl_ite_it8xxx2.c
index 422f8c6c67f..91ca93ea293 100644
--- a/drivers/pinctrl/pinctrl_ite_it8xxx2.c
+++ b/drivers/pinctrl/pinctrl_ite_it8xxx2.c
@@ -366,7 +366,7 @@ static int pinctrl_it8xxx2_init(const struct device *dev)
 	gpio_base->GPIO_GCR &= ~IT8XXX2_GPIO_LPCRSTEN;
 
 #ifdef CONFIG_SOC_IT8XXX2_REG_SET_V2
-#if defined(CONFIG_I2C_ITE_ENHANCE) && DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c5))
+#if defined(CONFIG_I2C_ITE_ENHANCE) && DT_NODE_HAS_STATUS(DT_NODELABEL(i2c5), okay)
 	const struct gpio_dt_spec scl_gpios = GPIO_DT_SPEC_GET(DT_NODELABEL(i2c5), scl_gpios);
 	const struct gpio_dt_spec sda_gpios = GPIO_DT_SPEC_GET(DT_NODELABEL(i2c5), sda_gpios);
 
diff --git a/drivers/pinctrl/pinctrl_kinetis.c b/drivers/pinctrl/pinctrl_kinetis.c
index bc250d742cf..7a8151c7be1 100644
--- a/drivers/pinctrl/pinctrl_kinetis.c
+++ b/drivers/pinctrl/pinctrl_kinetis.c
@@ -75,7 +75,7 @@ static int pinctrl_mcux_init(const struct device *dev)
 	return 0;
 }
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_kinetis_sim))
+#if DT_NODE_HAS_STATUS(DT_INST(0, nxp_kinetis_sim), okay)
 #define PINCTRL_MCUX_DT_INST_CLOCK_SUBSYS(n)                                                       \
 	CLK_GATE_DEFINE(DT_INST_CLOCKS_CELL(n, offset), DT_INST_CLOCKS_CELL(n, bits))
 #elif DT_HAS_COMPAT_STATUS_OKAY(nxp_scg_k4)
diff --git a/drivers/rtc/rtc_smartbond.c b/drivers/rtc/rtc_smartbond.c
index 3d171e58f69..7aa0d461d27 100644
--- a/drivers/rtc/rtc_smartbond.c
+++ b/drivers/rtc/rtc_smartbond.c
@@ -626,7 +626,7 @@ static int rtc_smartbond_init(const struct device *dev)
 
 	/* Wakeup device from RTC events (alarm/roll over) */
 #if CONFIG_PM
-	bool is_xtal32m_enabled = DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(xtal32m));
+	bool is_xtal32m_enabled = DT_NODE_HAS_STATUS(DT_NODELABEL(xtal32m), okay);
 	int pdc_idx = da1469x_pdc_add(MCU_PDC_TRIGGER_RTC_ALARM, MCU_PDC_MASTER_M33,
 					is_xtal32m_enabled ? MCU_PDC_EN_XTAL : 0);
 
diff --git a/drivers/sensor/bosch/bmi08x/bmi08x.h b/drivers/sensor/bosch/bmi08x/bmi08x.h
index 83926126e48..6b8b33f8ec7 100644
--- a/drivers/sensor/bosch/bmi08x/bmi08x.h
+++ b/drivers/sensor/bosch/bmi08x/bmi08x.h
@@ -427,7 +427,7 @@ enum bmi08x_odr {
 #define BMI08X_GYR_SCALE(range_dps) ((2 * range_dps * SENSOR_PI) / 180LL / 65536LL)
 
 /* report of data sync is selected */
-#define BMI08X_ACCEL_DATA_SYNC_EN(inst) DT_NODE_HAS_STATUS_OKAY(DT_INST_PHANDLE(inst, data_sync))
+#define BMI08X_ACCEL_DATA_SYNC_EN(inst) DT_NODE_HAS_STATUS(DT_INST_PHANDLE(inst, data_sync), okay)
 /* Macro used for compile time optimization to compile in/out code used for data-sync
  * if at least 1 bmi08x has data-sync enabled
  */
diff --git a/drivers/sensor/st/stm32_temp/stm32_temp.c b/drivers/sensor/st/stm32_temp/stm32_temp.c
index 787eb4c99e6..aa746e0c699 100644
--- a/drivers/sensor/st/stm32_temp/stm32_temp.c
+++ b/drivers/sensor/st/stm32_temp/stm32_temp.c
@@ -188,7 +188,7 @@ static int stm32_temp_init(const struct device *dev)
  * this driver even if the ADC used for measurement is disabled. In such cases,
  * fail build with an explicit error message.
  */
-#if !DT_NODE_HAS_STATUS_OKAY(DT_INST_IO_CHANNELS_CTLR(0))
+#if !DT_NODE_HAS_STATUS(DT_INST_IO_CHANNELS_CTLR(0), okay)
 
 /* Use BUILD_ASSERT to get preprocessing on the message */
 BUILD_ASSERT(0,	"ADC '" DT_NODE_FULL_NAME(DT_INST_IO_CHANNELS_CTLR(0)) "' needed by "
@@ -235,4 +235,4 @@ SENSOR_DEVICE_DT_INST_DEFINE(0, stm32_temp_init, NULL,
 			     POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 			     &stm32_temp_driver_api);
 
-#endif /* !DT_NODE_HAS_STATUS_OKAY(DT_INST_IO_CHANNELS_CTLR(0)) */
+#endif /* !DT_NODE_HAS_STATUS(DT_INST_IO_CHANNELS_CTLR(0), okay) */
diff --git a/drivers/sensor/st/stm32_vbat/stm32_vbat.c b/drivers/sensor/st/stm32_vbat/stm32_vbat.c
index 98bebad37fa..b74e0cf8b7f 100644
--- a/drivers/sensor/st/stm32_vbat/stm32_vbat.c
+++ b/drivers/sensor/st/stm32_vbat/stm32_vbat.c
@@ -125,7 +125,7 @@ static int stm32_vbat_init(const struct device *dev)
 }
 
 #define ASSERT_VBAT_ADC_ENABLED(inst)	\
-	BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DT_INST_IO_CHANNELS_CTLR(inst)),			\
+	BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_INST_IO_CHANNELS_CTLR(inst), okay),			\
 		"ADC instance '" DT_NODE_FULL_NAME(DT_INST_IO_CHANNELS_CTLR(inst)) "' needed "	\
 		"by Vbat sensor '" DT_NODE_FULL_NAME(DT_DRV_INST(inst)) "' is not enabled")
 
diff --git a/drivers/sensor/st/stm32_vref/stm32_vref.c b/drivers/sensor/st/stm32_vref/stm32_vref.c
index b76c2ea0e6e..b2cf7222fad 100644
--- a/drivers/sensor/st/stm32_vref/stm32_vref.c
+++ b/drivers/sensor/st/stm32_vref/stm32_vref.c
@@ -154,7 +154,7 @@ static int stm32_vref_init(const struct device *dev)
  * possible to compile this driver even if the ADC used for measurement is
  * disabled. In such cases, fail build with an explicit error message.
  */
-#if !DT_NODE_HAS_STATUS_OKAY(DT_INST_IO_CHANNELS_CTLR(0))
+#if !DT_NODE_HAS_STATUS(DT_INST_IO_CHANNELS_CTLR(0), okay)
 
 /* Use BUILD_ASSERT to get preprocessing on the message */
 BUILD_ASSERT(0,	"ADC '" DT_NODE_FULL_NAME(DT_INST_IO_CHANNELS_CTLR(0)) "' needed by "
@@ -183,4 +183,4 @@ static const struct stm32_vref_config stm32_vref_dev_config = {
 SENSOR_DEVICE_DT_INST_DEFINE(0, stm32_vref_init, NULL, &stm32_vref_dev_data, &stm32_vref_dev_config,
 			     POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &stm32_vref_driver_api);
 
-#endif /* !DT_NODE_HAS_STATUS_OKAY(DT_INST_IO_CHANNELS_CTLR(0)) */
+#endif /* !DT_NODE_HAS_STATUS(DT_INST_IO_CHANNELS_CTLR(0), okay) */
diff --git a/drivers/serial/leuart_gecko.c b/drivers/serial/leuart_gecko.c
index 9eec982802c..daaff59069c 100644
--- a/drivers/serial/leuart_gecko.c
+++ b/drivers/serial/leuart_gecko.c
@@ -317,7 +317,7 @@ static const struct uart_driver_api leuart_gecko_driver_api = {
 #endif
 };
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0))
+#if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay)
 
 #define PIN_LEUART_0_RXD {DT_INST_PROP_BY_IDX(0, location_rx, 1), \
 		DT_INST_PROP_BY_IDX(0, location_rx, 2), gpioModeInput, 1}
@@ -368,9 +368,9 @@ static void leuart_gecko_config_func_0(const struct device *dev)
 }
 #endif
 
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0)) */
+#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1))
+#if DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay)
 
 #define PIN_LEUART_1_RXD {DT_INST_PROP_BY_IDX(1, location_rx, 1), \
 		DT_INST_PROP_BY_IDX(1, location_rx, 2), gpioModeInput, 1}
@@ -421,4 +421,4 @@ static void leuart_gecko_config_func_1(const struct device *dev)
 }
 #endif
 
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1)) */
+#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay) */
diff --git a/drivers/serial/uart_cmsdk_apb.c b/drivers/serial/uart_cmsdk_apb.c
index e4ceb883bd6..a6568133b72 100644
--- a/drivers/serial/uart_cmsdk_apb.c
+++ b/drivers/serial/uart_cmsdk_apb.c
@@ -475,7 +475,7 @@ static const struct uart_driver_api uart_cmsdk_apb_driver_api = {
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN */
 };
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0))
+#if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay)
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void uart_cmsdk_apb_irq_config_func_0(const struct device *dev);
@@ -538,9 +538,9 @@ static void uart_cmsdk_apb_irq_config_func_0(const struct device *dev)
 #endif
 #endif
 
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0)) */
+#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1))
+#if DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay)
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void uart_cmsdk_apb_irq_config_func_1(const struct device *dev);
@@ -603,9 +603,9 @@ static void uart_cmsdk_apb_irq_config_func_1(const struct device *dev)
 #endif
 #endif
 
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1)) */
+#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(2))
+#if DT_NODE_HAS_STATUS(DT_DRV_INST(2), okay)
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void uart_cmsdk_apb_irq_config_func_2(const struct device *dev);
@@ -668,9 +668,9 @@ static void uart_cmsdk_apb_irq_config_func_2(const struct device *dev)
 #endif
 #endif
 
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(2)) */
+#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(2), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(3))
+#if DT_NODE_HAS_STATUS(DT_DRV_INST(3), okay)
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void uart_cmsdk_apb_irq_config_func_3(const struct device *dev);
@@ -733,9 +733,9 @@ static void uart_cmsdk_apb_irq_config_func_3(const struct device *dev)
 #endif
 #endif
 
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(3)) */
+#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(3), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(4))
+#if DT_NODE_HAS_STATUS(DT_DRV_INST(4), okay)
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void uart_cmsdk_apb_irq_config_func_4(const struct device *dev);
@@ -798,4 +798,4 @@ static void uart_cmsdk_apb_irq_config_func_4(const struct device *dev)
 #endif
 #endif
 
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(4)) */
+#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(4), okay) */
diff --git a/drivers/serial/uart_lpc11u6x.c b/drivers/serial/uart_lpc11u6x.c
index 3a13850429f..5645fb7910b 100644
--- a/drivers/serial/uart_lpc11u6x.c
+++ b/drivers/serial/uart_lpc11u6x.c
@@ -13,7 +13,7 @@
 
 #include "uart_lpc11u6x.h"
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart0), okay)
 static int lpc11u6x_uart0_poll_in(const struct device *dev, unsigned char *c)
 {
 	const struct lpc11u6x_uart0_config *cfg = dev->config;
@@ -443,12 +443,12 @@ static void lpc11u6x_uart0_isr_config(const struct device *dev)
 }
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN */
 
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart0)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart0), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) ||                                                \
-	DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) ||                                            \
-	DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3)) ||                                            \
-	DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) ||		\
+	DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) ||	\
+	DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay) ||	\
+	DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)
 
 static int lpc11u6x_uartx_poll_in(const struct device *dev, unsigned char *c)
 {
@@ -810,18 +810,18 @@ static int lpc11u6x_uartx_init(const struct device *dev)
 		LPC11U6X_UARTX_CFG_ENABLE;
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) || \
-	DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) || \
+	DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)
 	lpc11u6x_uartx_isr_config_1(dev);
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) ||
-	* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4))
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) ||
+	* DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)
 	*/
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) || \
-	DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) || \
+	DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay)
 	lpc11u6x_uartx_isr_config_2(dev);
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) ||
-	* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3))
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) ||
+	* DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay)
 	*/
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN */
 	return 0;
@@ -876,44 +876,44 @@ DEVICE_DT_DEFINE(DT_NODELABEL(uart##idx), 				      \
 		    PRE_KERNEL_1, CONFIG_SERIAL_INIT_PRIORITY,		      \
 		    &uartx_api)
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)
 LPC11U6X_UARTX_INIT(1);
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay)
 LPC11U6X_UARTX_INIT(2);
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay)
 LPC11U6X_UARTX_INIT(3);
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)
 LPC11U6X_UARTX_INIT(4);
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay) */
 
 #if CONFIG_UART_INTERRUPT_DRIVEN &&				\
-	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) ||	\
-	 DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4)))
+	(DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) ||	\
+	 DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay))
 
 struct lpc11u6x_uartx_shared_irq lpc11u6x_uartx_shared_irq_info_1 = {
 	.devices = {
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)
 		DEVICE_DT_GET(DT_NODELABEL(uart1)),
 #else
 		NULL,
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4))
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) */
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)
 		DEVICE_DT_GET(DT_NODELABEL(uart4)),
 #else
 		NULL,
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay) */
 	},
 };
 
 static void lpc11u6x_uartx_isr_config_1(const struct device *dev)
 {
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)
 	IRQ_CONNECT(DT_IRQN(DT_NODELABEL(uart1)),
 		    DT_IRQ(DT_NODELABEL(uart1), priority),
 		    lpc11u6x_uartx_shared_isr,
@@ -927,34 +927,34 @@ static void lpc11u6x_uartx_isr_config_1(const struct device *dev)
 		    &lpc11u6x_uartx_shared_irq_info_1,
 		    0);
 	irq_enable(DT_IRQN(DT_NODELABEL(uart4)));
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) */
 }
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN &&
-	* (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) ||
-	* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4)))
+	* (DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) ||
+	* DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay))
 	*/
 
 #if CONFIG_UART_INTERRUPT_DRIVEN && \
-	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) || \
-	 DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3)))
+	(DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) || \
+	 DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay))
 struct lpc11u6x_uartx_shared_irq lpc11u6x_uartx_shared_irq_info_2 = {
 	.devices = {
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay)
 		DEVICE_DT_GET(DT_NODELABEL(uart2)),
 #else
 		NULL,
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3))
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) */
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay)
 		DEVICE_DT_GET(DT_NODELABEL(uart3)),
 #else
 		NULL,
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay) */
 	},
 };
 
 static void lpc11u6x_uartx_isr_config_2(const struct device *dev)
 {
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay)
 	IRQ_CONNECT(DT_IRQN(DT_NODELABEL(uart2)),
 		    DT_IRQ(DT_NODELABEL(uart2), priority),
 		    lpc11u6x_uartx_shared_isr,
@@ -968,11 +968,11 @@ static void lpc11u6x_uartx_isr_config_2(const struct device *dev)
 		    &lpc11u6x_uartx_shared_irq_info_2,
 		    0);
 	irq_enable(DT_IRQN(DT_NODELABEL(uart3)));
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) */
 }
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN &&
-	* (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) ||
-	* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3)))
+	* (DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) ||
+	* DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay))
 	*/
 #endif  /* DT_NODE_EXISTS(DT_NODELABEL(uart1) ||
 	 * DT_NODE_EXISTS(DT_NODELABEL(uart2) ||
diff --git a/drivers/serial/uart_lpc11u6x.h b/drivers/serial/uart_lpc11u6x.h
index 257846cbdd4..8951945e65a 100644
--- a/drivers/serial/uart_lpc11u6x.h
+++ b/drivers/serial/uart_lpc11u6x.h
@@ -199,20 +199,20 @@ struct lpc11u6x_uartx_shared_irq {
 };
 
 #if CONFIG_UART_INTERRUPT_DRIVEN &&				\
-	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) ||	\
-	 DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4)))
+	(DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) ||	\
+	 DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay))
 static void lpc11u6x_uartx_isr_config_1(const struct device *dev);
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN &&
-	* (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) ||
-	* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3)))
+	* (DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) ||
+	* DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay))
 	*/
 
 #if CONFIG_UART_INTERRUPT_DRIVEN &&				\
-	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) ||	\
-	 DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3)))
+	(DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) ||	\
+	 DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay))
 static void lpc11u6x_uartx_isr_config_2(const struct device *dev);
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN &&
-	* (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) ||
-	* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3)))
+	* (DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) ||
+	* DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay))
 	*/
 #endif /* ZEPHYR_DRIVERS_SERIAL_UART_LPC11U6X_H_ */
diff --git a/drivers/serial/uart_miv.c b/drivers/serial/uart_miv.c
index d1b5cfb0e26..bf35b4cf656 100644
--- a/drivers/serial/uart_miv.c
+++ b/drivers/serial/uart_miv.c
@@ -387,7 +387,7 @@ static const struct uart_driver_api uart_miv_driver_api = {
 BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) <= 1,
 	     "unsupported uart_miv instance");
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0))
+#if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay)
 
 static struct uart_miv_data uart_miv_data_0;
 
@@ -424,4 +424,4 @@ static void uart_miv_irq_cfg_func_0(const struct device *dev)
 }
 #endif
 
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0)) */
+#endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) */
diff --git a/drivers/spi/spi_smartbond.c b/drivers/spi/spi_smartbond.c
index 7a2be279e98..324273bc12e 100644
--- a/drivers/spi/spi_smartbond.c
+++ b/drivers/spi/spi_smartbond.c
@@ -1227,11 +1227,11 @@ static int spi_smartbond_isr_connect(const struct device *dev)
 
 	switch ((uint32_t)cfg->regs) {
 	case (uint32_t)SPI:
-		COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(spi)),
+		COND_CODE_1(DT_NODE_HAS_STATUS(DT_NODELABEL(spi), okay),
 			(SPI_SMARTBOND_ISR_CONNECT), (NULL));
 		break;
 	case (uint32_t)SPI2:
-		COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(spi2)),
+		COND_CODE_1(DT_NODE_HAS_STATUS(DT_NODELABEL(spi2), okay),
 			(SPI2_SMARTBOND_ISR_CONNECT), (NULL));
 		break;
 	default:
diff --git a/drivers/spi/spi_xec_qmspi.c b/drivers/spi/spi_xec_qmspi.c
index 02cd34d259f..f606f3145c3 100644
--- a/drivers/spi/spi_xec_qmspi.c
+++ b/drivers/spi/spi_xec_qmspi.c
@@ -681,7 +681,7 @@ static const struct spi_driver_api spi_qmspi_driver_api = {
 				DT_INST_PROP(0, dldh),			\
 				DT_INST_PROP(0, dcsda))
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, microchip_xec_qmspi))
+#if DT_NODE_HAS_STATUS(DT_INST(0, microchip_xec_qmspi), okay)
 
 PINCTRL_DT_INST_DEFINE(0);
 
@@ -708,4 +708,4 @@ DEVICE_DT_INST_DEFINE(0,
 		    &spi_qmspi_0_config, POST_KERNEL,
 		    CONFIG_SPI_INIT_PRIORITY, &spi_qmspi_driver_api);
 
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_INST(0, microchip_xec_qmspi)) */
+#endif /* DT_NODE_HAS_STATUS(DT_INST(0, microchip_xec_qmspi), okay) */
diff --git a/drivers/timer/mcux_os_timer.c b/drivers/timer/mcux_os_timer.c
index c6eb776e43a..74580e684b0 100644
--- a/drivers/timer/mcux_os_timer.c
+++ b/drivers/timer/mcux_os_timer.c
@@ -36,7 +36,7 @@ static OSTIMER_Type *base;
  * certain deep sleep modes and the time elapsed when it is powered off.
  */
 static uint64_t cyc_sys_compensated;
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(standby)) && CONFIG_PM
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(standby), okay) && CONFIG_PM
 static const struct device *counter_dev;
 #endif
 
@@ -71,7 +71,7 @@ void mcux_lpc_ostick_isr(const void *arg)
 	sys_clock_announce(IS_ENABLED(CONFIG_TICKLESS_KERNEL) ? dticks : 1);
 }
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(standby)) && CONFIG_PM
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(standby), okay) && CONFIG_PM
 
 /* The OS Timer is disabled in certain low power modes and cannot wakeup the system
  * on timeout. This function will be called by the low power code to allow the
@@ -178,7 +178,7 @@ void sys_clock_set_timeout(int32_t ticks, bool idle)
 		return;
 	}
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(standby)) && CONFIG_PM
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(standby), okay) && CONFIG_PM
 	if (idle) {
 		/* OS Timer may not be able to wakeup in certain low power modes.
 		 * For these cases, we start a counter that can wakeup
@@ -247,7 +247,7 @@ uint64_t sys_clock_cycle_get_64(void)
 
 void sys_clock_idle_exit(void)
 {
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(standby)) && CONFIG_PM
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(standby), okay) && CONFIG_PM
 	/* The tick should be compensated for states where the
 	 * OS Timer is disabled
 	 */
@@ -280,7 +280,7 @@ static int sys_clock_driver_init(void)
 	irq_enable(DT_INST_IRQN(0));
 
 /* On some SoC's, OS Timer cannot wakeup from low power mode in standby modes */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(standby)) && CONFIG_PM
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(standby), okay) && CONFIG_PM
 	counter_dev = DEVICE_DT_GET_OR_NULL(DT_INST_PHANDLE(0, deep_sleep_counter));
 #endif
 
diff --git a/drivers/timer/nrf_grtc_timer.c b/drivers/timer/nrf_grtc_timer.c
index fb9c859caeb..07d58e402c9 100644
--- a/drivers/timer/nrf_grtc_timer.c
+++ b/drivers/timer/nrf_grtc_timer.c
@@ -426,7 +426,7 @@ int z_nrf_grtc_wakeup_prepare(uint64_t wake_time_us)
 		nrfy_grtc_timeout_get(NRF_GRTC) * CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC / 32768 +
 		MAX_CC_LATCH_WAIT_TIME_US;
 	k_busy_wait(wait_time);
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lfxo)) && NRF_GRTC_HAS_CLKSEL
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lfxo), okay) && NRF_GRTC_HAS_CLKSEL
 	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFXO);
 #endif
 	k_spin_unlock(&lock, key);
@@ -502,7 +502,7 @@ static int sys_clock_driver_init(void)
 #endif
 
 #if defined(CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT) &&                                             \
-	DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lfxo)) && NRF_GRTC_HAS_CLKSEL
+	DT_NODE_HAS_STATUS(DT_NODELABEL(lfxo), okay) && NRF_GRTC_HAS_CLKSEL
 	/* Switch to LFXO as the low-frequency clock source. */
 	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFXO);
 #endif
diff --git a/drivers/timer/smartbond_timer.c b/drivers/timer/smartbond_timer.c
index afa86617e0e..ceef22ce5fa 100644
--- a/drivers/timer/smartbond_timer.c
+++ b/drivers/timer/smartbond_timer.c
@@ -199,7 +199,7 @@ static int sys_clock_driver_init(void)
 	uint8_t pdc_idx;
 	uint8_t en_xtal;
 
-	en_xtal = DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(xtal32m)) ? MCU_PDC_EN_XTAL : 0;
+	en_xtal = DT_NODE_HAS_STATUS(DT_NODELABEL(xtal32m), okay) ? MCU_PDC_EN_XTAL : 0;
 
 	/* Enable wakeup by TIMER2 */
 	pdc_idx = da1469x_pdc_add(MCU_PDC_TRIGGER_TIMER2, MCU_PDC_MASTER_M33, en_xtal);
diff --git a/drivers/usb/device/usb_dc_mcux.c b/drivers/usb/device/usb_dc_mcux.c
index 14a8918d106..b28499db1d6 100644
--- a/drivers/usb/device/usb_dc_mcux.c
+++ b/drivers/usb/device/usb_dc_mcux.c
@@ -84,17 +84,17 @@ BUILD_ASSERT(NUM_INSTS <= 1, "Only one USB device supported");
 #elif defined(CONFIG_SOC_LPC55S36)
 #define CONTROLLER_ID	kUSB_ControllerLpcIp3511Fs0
 #elif defined(CONFIG_SOC_LPC55S69_CPU0) || defined(CONFIG_SOC_LPC55S69_CPU1)
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usbhs))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usbhs), okay)
 #define CONTROLLER_ID	kUSB_ControllerLpcIp3511Hs0
-#elif DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usbfs))
+#elif DT_NODE_HAS_STATUS(DT_NODELABEL(usbfs), okay)
 #define CONTROLLER_ID	kUSB_ControllerLpcIp3511Fs0
 #endif /* LPC55s69 */
 #elif defined(CONFIG_SOC_SERIES_IMXRT11XX) || \
 	defined(CONFIG_SOC_SERIES_IMXRT10XX) || \
 	defined(CONFIG_SOC_SERIES_MCXN)
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb1), okay)
 #define CONTROLLER_ID kUSB_ControllerEhci0
-#elif DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb2))
+#elif DT_NODE_HAS_STATUS(DT_NODELABEL(usb2), okay)
 #define CONTROLLER_ID kUSB_ControllerEhci1
 #endif /* IMX RT */
 #elif defined(CONFIG_SOC_SERIES_RW6XX)
diff --git a/drivers/usb/device/usb_dc_nrfx.c b/drivers/usb/device/usb_dc_nrfx.c
index c8442cb8f64..a165c24f789 100644
--- a/drivers/usb/device/usb_dc_nrfx.c
+++ b/drivers/usb/device/usb_dc_nrfx.c
@@ -1900,8 +1900,8 @@ static int usb_init(void)
 			   == NRF5X_REG_MODE_DCDC),
 #if NRFX_POWER_SUPPORTS_DCDCEN_VDDH
 		.dcdcenhv = COND_CODE_1(CONFIG_SOC_SERIES_NRF52X,
-			(DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nordic_nrf52x_regulator_hv))),
-			(DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nordic_nrf53x_regulator_hv)))),
+			(DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf52x_regulator_hv), okay)),
+			(DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf53x_regulator_hv), okay))),
 #endif
 	};
 
diff --git a/drivers/usb/udc/udc_nrf.c b/drivers/usb/udc/udc_nrf.c
index c024d2a6a18..c6951074c85 100644
--- a/drivers/usb/udc/udc_nrf.c
+++ b/drivers/usb/udc/udc_nrf.c
@@ -824,8 +824,8 @@ static const struct udc_nrf_config udc_nrf_cfg = {
 			   == NRF5X_REG_MODE_DCDC),
 #if NRFX_POWER_SUPPORTS_DCDCEN_VDDH
 		.dcdcenhv = COND_CODE_1(CONFIG_SOC_SERIES_NRF52X,
-			(DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nordic_nrf52x_regulator_hv))),
-			(DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nordic_nrf53x_regulator_hv)))),
+			(DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf52x_regulator_hv), okay)),
+			(DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf53x_regulator_hv), okay))),
 #endif
 	},
 
diff --git a/drivers/watchdog/wdt_esp32.c b/drivers/watchdog/wdt_esp32.c
index 1c7ee61ee64..8fe4c877fd0 100644
--- a/drivers/watchdog/wdt_esp32.c
+++ b/drivers/watchdog/wdt_esp32.c
@@ -226,10 +226,10 @@ static void wdt_esp32_isr(void *arg)
 }
 
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(wdt0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(wdt0), okay)
 ESP32_WDT_INIT(0);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(wdt1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(wdt1), okay)
 ESP32_WDT_INIT(1);
 #endif
diff --git a/include/zephyr/device.h b/include/zephyr/device.h
index 5f93954a9ff..52b8604db80 100644
--- a/include/zephyr/device.h
+++ b/include/zephyr/device.h
@@ -309,7 +309,7 @@ typedef int16_t device_handle_t;
  * @return a @ref device reference for the node identifier, which may be `NULL`.
  */
 #define DEVICE_DT_GET_OR_NULL(node_id)                                         \
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(node_id),                          \
+	COND_CODE_1(DT_NODE_HAS_STATUS(node_id, okay),                         \
 		    (DEVICE_DT_GET(node_id)), (NULL))
 
 /**
diff --git a/include/zephyr/drivers/clock_control/stm32_clock_control.h b/include/zephyr/drivers/clock_control/stm32_clock_control.h
index b03fa790027..c33714be976 100644
--- a/include/zephyr/drivers/clock_control/stm32_clock_control.h
+++ b/include/zephyr/drivers/clock_control/stm32_clock_control.h
@@ -250,7 +250,7 @@
 #endif
 
 /** PLL/PLL1 clock source */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll)) && \
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pll), okay) && \
 	DT_NODE_HAS_PROP(DT_NODELABEL(pll), clocks)
 #define DT_PLL_CLOCKS_CTRL	DT_CLOCKS_CTLR(DT_NODELABEL(pll))
 #if DT_SAME_NODE(DT_PLL_CLOCKS_CTRL, DT_NODELABEL(clk_msi))
@@ -275,7 +275,7 @@
 #endif
 
 /** PLL2 clock source */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll2)) && \
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pll2), okay) && \
 	DT_NODE_HAS_PROP(DT_NODELABEL(pll2), clocks)
 #define DT_PLL2_CLOCKS_CTRL	DT_CLOCKS_CTLR(DT_NODELABEL(pll2))
 #if DT_SAME_NODE(DT_PLL2_CLOCKS_CTRL, DT_NODELABEL(clk_msis))
@@ -291,7 +291,7 @@
 #endif
 
 /** PLL3 clock source */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll3)) && \
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pll3), okay) && \
 	DT_NODE_HAS_PROP(DT_NODELABEL(pll3), clocks)
 #define DT_PLL3_CLOCKS_CTRL	DT_CLOCKS_CTLR(DT_NODELABEL(pll3))
 #if DT_SAME_NODE(DT_PLL3_CLOCKS_CTRL, DT_NODELABEL(clk_msis))
diff --git a/include/zephyr/drivers/emul.h b/include/zephyr/drivers/emul.h
index a20679573e4..c0830bb0205 100644
--- a/include/zephyr/drivers/emul.h
+++ b/include/zephyr/drivers/emul.h
@@ -195,7 +195,7 @@ struct emul {
  * @return a @ref emul reference for the node identifier, which may be `NULL`.
  */
 #define EMUL_DT_GET_OR_NULL(node_id)                                                               \
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(node_id), (EMUL_DT_GET(node_id)), (NULL))
+	COND_CODE_1(DT_NODE_HAS_STATUS(node_id, okay), (EMUL_DT_GET(node_id)), (NULL))
 
 /**
  * @brief Set up a list of emulators
diff --git a/include/zephyr/linker/linker-defs.h b/include/zephyr/linker/linker-defs.h
index ff3cbe6ca6c..5c1089c0fcf 100644
--- a/include/zephyr/linker/linker-defs.h
+++ b/include/zephyr/linker/linker-defs.h
@@ -32,7 +32,6 @@
  */
 #ifdef ZTEST_UNITTEST
 #define DT_NODE_HAS_STATUS(node, status) 0
-#define DT_NODE_HAS_STATUS_OKAY(node) 0
 #else
 #include <zephyr/devicetree.h>
 #endif
@@ -160,7 +159,7 @@ extern char __gcov_bss_size[];
 /* end address of image, used by newlib for the heap */
 extern char _end[];
 
-#if (DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_ccm)))
+#if (DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_ccm), okay))
 extern char __ccm_data_rom_start[];
 extern char __ccm_start[];
 extern char __ccm_data_start[];
@@ -172,14 +171,14 @@ extern char __ccm_noinit_end[];
 extern char __ccm_end[];
 #endif
 
-#if (DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_itcm)))
+#if (DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_itcm), okay))
 extern char __itcm_start[];
 extern char __itcm_end[];
 extern char __itcm_size[];
 extern char __itcm_load_start[];
 #endif
 
-#if (DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm)))
+#if (DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay))
 extern char __dtcm_data_start[];
 extern char __dtcm_data_end[];
 extern char __dtcm_bss_start[];
@@ -191,7 +190,7 @@ extern char __dtcm_start[];
 extern char __dtcm_end[];
 #endif
 
-#if (DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_ocm)))
+#if (DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_ocm), okay))
 extern char __ocm_data_start[];
 extern char __ocm_data_end[];
 extern char __ocm_bss_start[];
diff --git a/include/zephyr/pm/state.h b/include/zephyr/pm/state.h
index 6590b90c385..87363ea27d2 100644
--- a/include/zephyr/pm/state.h
+++ b/include/zephyr/pm/state.h
@@ -194,7 +194,7 @@ struct pm_state_constraint {
  * @param idx Index within the array.
  */
 #define Z_DT_PHANDLE_01(node_id, prop, idx) \
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_PHANDLE_BY_IDX(node_id, prop, idx)), \
+	COND_CODE_1(DT_NODE_HAS_STATUS(DT_PHANDLE_BY_IDX(node_id, prop, idx), okay), \
 		    (1), (0))
 
 /**
@@ -207,7 +207,7 @@ struct pm_state_constraint {
  * @param node_id A node identifier with compatible zephyr,power-state
  */
 #define Z_PM_STATE_INFO_FROM_DT_CPU(i, node_id)                                                   \
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_PHANDLE_BY_IDX(node_id, cpu_power_states, i)),     \
+	COND_CODE_1(DT_NODE_HAS_STATUS(DT_PHANDLE_BY_IDX(node_id, cpu_power_states, i), okay),    \
 		    (PM_STATE_INFO_DT_INIT(DT_PHANDLE_BY_IDX(node_id, cpu_power_states, i)),), ())
 
 /**
@@ -220,7 +220,7 @@ struct pm_state_constraint {
  * @param node_id A node identifier with compatible zephyr,power-state
  */
 #define Z_PM_STATE_FROM_DT_CPU(i, node_id)                                                        \
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_PHANDLE_BY_IDX(node_id, cpu_power_states, i)),     \
+	COND_CODE_1(DT_NODE_HAS_STATUS(DT_PHANDLE_BY_IDX(node_id, cpu_power_states, i), okay),    \
 		    (PM_STATE_DT_INIT(DT_PHANDLE_BY_IDX(node_id, cpu_power_states, i)),), ())
 
 /** @endcond */
diff --git a/kernel/init.c b/kernel/init.c
index cd361e74936..1c24c5fc2b2 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -226,17 +226,17 @@ void z_bss_zero(void)
 	}
 
 	z_early_memset(__bss_start, 0, __bss_end - __bss_start);
-#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_ccm))
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_ccm), okay)
 	z_early_memset(&__ccm_bss_start, 0,
 		       (uintptr_t) &__ccm_bss_end
 		       - (uintptr_t) &__ccm_bss_start);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm))
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
 	z_early_memset(&__dtcm_bss_start, 0,
 		       (uintptr_t) &__dtcm_bss_end
 		       - (uintptr_t) &__dtcm_bss_start);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_ocm))
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_ocm), okay)
 	z_early_memset(&__ocm_bss_start, 0,
 		       (uintptr_t) &__ocm_bss_end
 		       - (uintptr_t) &__ocm_bss_start);
diff --git a/kernel/xip.c b/kernel/xip.c
index 34e92ef1844..a5752560c85 100644
--- a/kernel/xip.c
+++ b/kernel/xip.c
@@ -31,15 +31,15 @@ void z_data_copy(void)
 	z_early_memcpy(&__ramfunc_start, &__ramfunc_load_start,
 		       (uintptr_t) &__ramfunc_size);
 #endif /* CONFIG_ARCH_HAS_RAMFUNC_SUPPORT */
-#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_ccm))
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_ccm), okay)
 	z_early_memcpy(&__ccm_data_start, &__ccm_data_rom_start,
 		       __ccm_data_end - __ccm_data_start);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_itcm))
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_itcm), okay)
 	z_early_memcpy(&__itcm_start, &__itcm_load_start,
 		       (uintptr_t) &__itcm_size);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm))
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
 	z_early_memcpy(&__dtcm_data_start, &__dtcm_data_load_start,
 		       __dtcm_data_end - __dtcm_data_start);
 #endif
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index 47a12f90925..c7a7f169c01 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -1006,7 +1006,7 @@
 
 #define NRFX_IPCT_PUB_OR_SUB_MASK(inst_num) \
 	COND_CODE_1(IS_EMPTY(inst_num), \
-		(DT_NODE_HAS_STATUS_OKAY(NRFX_CONFIG_IPCT_LOCAL_NODE)), \
+		(DT_NODE_HAS_STATUS(NRFX_CONFIG_IPCT_LOCAL_NODE, okay)), \
 		(DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(ipct, inst_num)), owned_channels)))
 
 /* Variables names generation. */
diff --git a/samples/basic/button/src/main.c b/samples/basic/button/src/main.c
index a86407a65c2..b181afcc34e 100644
--- a/samples/basic/button/src/main.c
+++ b/samples/basic/button/src/main.c
@@ -18,7 +18,7 @@
  * Get button configuration from the devicetree sw0 alias. This is mandatory.
  */
 #define SW0_NODE	DT_ALIAS(sw0)
-#if !DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
+#if !DT_NODE_HAS_STATUS(SW0_NODE, okay)
 #error "Unsupported board: sw0 devicetree alias is not defined"
 #endif
 static const struct gpio_dt_spec button = GPIO_DT_SPEC_GET_OR(SW0_NODE, gpios,
diff --git a/samples/basic/threads/src/main.c b/samples/basic/threads/src/main.c
index 529df15908a..0554ddd9daf 100644
--- a/samples/basic/threads/src/main.c
+++ b/samples/basic/threads/src/main.c
@@ -20,11 +20,11 @@
 #define LED0_NODE DT_ALIAS(led0)
 #define LED1_NODE DT_ALIAS(led1)
 
-#if !DT_NODE_HAS_STATUS_OKAY(LED0_NODE)
+#if !DT_NODE_HAS_STATUS(LED0_NODE, okay)
 #error "Unsupported board: led0 devicetree alias is not defined"
 #endif
 
-#if !DT_NODE_HAS_STATUS_OKAY(LED1_NODE)
+#if !DT_NODE_HAS_STATUS(LED1_NODE, okay)
 #error "Unsupported board: led1 devicetree alias is not defined"
 #endif
 
diff --git a/samples/bluetooth/central_otc/src/main.c b/samples/bluetooth/central_otc/src/main.c
index 171bbe7187c..23a2968e14a 100644
--- a/samples/bluetooth/central_otc/src/main.c
+++ b/samples/bluetooth/central_otc/src/main.c
@@ -77,8 +77,8 @@ static void print_hex_number(const uint8_t *num, size_t len)
 #define SW1_NODE DT_ALIAS(sw1)
 #define SW2_NODE DT_ALIAS(sw2)
 #define SW3_NODE DT_ALIAS(sw3)
-#if !DT_NODE_HAS_STATUS_OKAY(SW0_NODE) || !DT_NODE_HAS_STATUS_OKAY(SW1_NODE) ||                    \
-	!DT_NODE_HAS_STATUS_OKAY(SW2_NODE) || !DT_NODE_HAS_STATUS_OKAY(SW3_NODE)
+#if !DT_NODE_HAS_STATUS(SW0_NODE, okay) || !DT_NODE_HAS_STATUS(SW1_NODE, okay) ||                  \
+	!DT_NODE_HAS_STATUS(SW2_NODE, okay) || !DT_NODE_HAS_STATUS(SW3_NODE, okay)
 #error "Unsupported board: This sample need 4 buttons to run"
 #endif
 
diff --git a/samples/bluetooth/encrypted_advertising/central/src/main.c b/samples/bluetooth/encrypted_advertising/central/src/main.c
index 122641b311a..888940af780 100644
--- a/samples/bluetooth/encrypted_advertising/central/src/main.c
+++ b/samples/bluetooth/encrypted_advertising/central/src/main.c
@@ -30,7 +30,7 @@ LOG_MODULE_DECLARE(ead_central_sample, CONFIG_BT_EAD_LOG_LEVEL);
  * Get button configuration from the devicetree sw0 alias. This is mandatory.
  */
 #define SW0_NODE DT_ALIAS(sw0)
-#if !DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
+#if !DT_NODE_HAS_STATUS(SW0_NODE, okay)
 #error "Unsupported board: sw0 devicetree alias is not defined"
 #endif
 static const struct gpio_dt_spec button = GPIO_DT_SPEC_GET_OR(SW0_NODE, gpios, {0});
diff --git a/samples/bluetooth/encrypted_advertising/peripheral/src/main.c b/samples/bluetooth/encrypted_advertising/peripheral/src/main.c
index affa5430af2..6b269d30513 100644
--- a/samples/bluetooth/encrypted_advertising/peripheral/src/main.c
+++ b/samples/bluetooth/encrypted_advertising/peripheral/src/main.c
@@ -26,7 +26,7 @@ LOG_MODULE_DECLARE(ead_peripheral_sample, CONFIG_BT_EAD_LOG_LEVEL);
  * Get button configuration from the devicetree sw0 alias. This is mandatory.
  */
 #define SW0_NODE DT_ALIAS(sw0)
-#if !DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
+#if !DT_NODE_HAS_STATUS(SW0_NODE, okay)
 #error "Unsupported board: sw0 devicetree alias is not defined"
 #endif
 static const struct gpio_dt_spec button = GPIO_DT_SPEC_GET_OR(SW0_NODE, gpios, {0});
diff --git a/samples/bluetooth/iso_receive/src/main.c b/samples/bluetooth/iso_receive/src/main.c
index 989694907b4..3b7c051f387 100644
--- a/samples/bluetooth/iso_receive/src/main.c
+++ b/samples/bluetooth/iso_receive/src/main.c
@@ -42,7 +42,7 @@ static K_SEM_DEFINE(sem_big_sync_lost, 0, BIS_ISO_CHAN_COUNT);
 /* The devicetree node identifier for the "led0" alias. */
 #define LED0_NODE DT_ALIAS(led0)
 
-#if DT_NODE_HAS_STATUS_OKAY(LED0_NODE)
+#if DT_NODE_HAS_STATUS(LED0_NODE, okay)
 static const struct gpio_dt_spec led_gpio = GPIO_DT_SPEC_GET(LED0_NODE, gpios);
 #define HAS_LED     1
 #define BLINK_ONOFF K_MSEC(500)
diff --git a/samples/bluetooth/mesh_provisioner/src/main.c b/samples/bluetooth/mesh_provisioner/src/main.c
index d4be8601304..472dc020d43 100644
--- a/samples/bluetooth/mesh_provisioner/src/main.c
+++ b/samples/bluetooth/mesh_provisioner/src/main.c
@@ -20,7 +20,7 @@ static uint8_t node_uuid[16];
 
 K_SEM_DEFINE(sem_unprov_beacon, 0, 1);
 K_SEM_DEFINE(sem_node_added, 0, 1);
-#if DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
+#if DT_NODE_HAS_STATUS(SW0_NODE, okay)
 K_SEM_DEFINE(sem_button_pressed, 0, 1);
 #endif
 
@@ -315,7 +315,7 @@ static uint8_t check_unconfigured(struct bt_mesh_cdb_node *node, void *data)
 	return BT_MESH_CDB_ITER_CONTINUE;
 }
 
-#if DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
+#if DT_NODE_HAS_STATUS(SW0_NODE, okay)
 static const struct gpio_dt_spec button = GPIO_DT_SPEC_GET_OR(SW0_NODE, gpios, {0});
 static struct gpio_callback button_cb_data;
 
@@ -366,7 +366,7 @@ int main(void)
 	printk("Bluetooth initialized\n");
 	bt_ready();
 
-#if DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
+#if DT_NODE_HAS_STATUS(SW0_NODE, okay)
 	button_init();
 #endif
 
@@ -383,7 +383,7 @@ int main(void)
 
 		bin2hex(node_uuid, 16, uuid_hex_str, sizeof(uuid_hex_str));
 
-#if DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
+#if DT_NODE_HAS_STATUS(SW0_NODE, okay)
 		k_sem_reset(&sem_button_pressed);
 		printk("Device %s detected, press button 1 to provision.\n", uuid_hex_str);
 		err = k_sem_take(&sem_button_pressed, K_SECONDS(30));
diff --git a/samples/bluetooth/periodic_sync/src/main.c b/samples/bluetooth/periodic_sync/src/main.c
index a8baf5d2600..44c5a8530b4 100644
--- a/samples/bluetooth/periodic_sync/src/main.c
+++ b/samples/bluetooth/periodic_sync/src/main.c
@@ -24,7 +24,7 @@ static K_SEM_DEFINE(sem_per_sync_lost, 0, 1);
 /* The devicetree node identifier for the "led0" alias. */
 #define LED0_NODE DT_ALIAS(led0)
 
-#if DT_NODE_HAS_STATUS_OKAY(LED0_NODE)
+#if DT_NODE_HAS_STATUS(LED0_NODE, okay)
 #define HAS_LED     1
 static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(LED0_NODE, gpios);
 #define BLINK_ONOFF K_MSEC(500)
diff --git a/samples/bluetooth/peripheral_hids/src/hog.c b/samples/bluetooth/peripheral_hids/src/hog.c
index 9aefdf2ea98..cf67521517d 100644
--- a/samples/bluetooth/peripheral_hids/src/hog.c
+++ b/samples/bluetooth/peripheral_hids/src/hog.c
@@ -180,7 +180,7 @@ void hog_init(void)
 
 void hog_button_loop(void)
 {
-#if DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
+#if DT_NODE_HAS_STATUS(SW0_NODE, okay)
 	const struct gpio_dt_spec sw0 = GPIO_DT_SPEC_GET(SW0_NODE, gpios);
 
 	gpio_pin_configure_dt(&sw0, GPIO_INPUT);
diff --git a/samples/bluetooth/peripheral_hr/src/main.c b/samples/bluetooth/peripheral_hr/src/main.c
index 19c640ca91b..8d7f73e5440 100644
--- a/samples/bluetooth/peripheral_hr/src/main.c
+++ b/samples/bluetooth/peripheral_hr/src/main.c
@@ -123,7 +123,7 @@ static void hrs_notify(void)
 /* The devicetree node identifier for the "led0" alias. */
 #define LED0_NODE DT_ALIAS(led0)
 
-#if DT_NODE_HAS_STATUS_OKAY(LED0_NODE)
+#if DT_NODE_HAS_STATUS(LED0_NODE, okay)
 #include <zephyr/drivers/gpio.h>
 #define HAS_LED     1
 static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(LED0_NODE, gpios);
diff --git a/samples/boards/espressif/deep_sleep/src/main.c b/samples/boards/espressif/deep_sleep/src/main.c
index 519a1a550df..edf8b559705 100644
--- a/samples/boards/espressif/deep_sleep/src/main.c
+++ b/samples/boards/espressif/deep_sleep/src/main.c
@@ -17,7 +17,7 @@
 #endif
 
 #ifdef CONFIG_EXAMPLE_GPIO_WAKEUP
-#if !DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(wakeup_button))
+#if !DT_NODE_HAS_STATUS(DT_ALIAS(wakeup_button), okay)
 #error "Unsupported: wakeup-button alias is not defined"
 #else
 static const struct gpio_dt_spec wakeup_button = GPIO_DT_SPEC_GET(DT_ALIAS(wakeup_button), gpios);
diff --git a/samples/boards/espressif/light_sleep/src/main.c b/samples/boards/espressif/light_sleep/src/main.c
index 9134f6a2006..50cb920d159 100644
--- a/samples/boards/espressif/light_sleep/src/main.c
+++ b/samples/boards/espressif/light_sleep/src/main.c
@@ -16,7 +16,7 @@
  */
 #define SW0_NODE	DT_ALIAS(sw0)
 
-#if !DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
+#if !DT_NODE_HAS_STATUS(SW0_NODE, okay)
 #error "unsupported board: sw0 devicetree alias is not defined"
 #endif
 
diff --git a/samples/boards/nordic/battery/src/battery.c b/samples/boards/nordic/battery/src/battery.c
index 3a31a91398b..a0fbb651b58 100644
--- a/samples/boards/nordic/battery/src/battery.c
+++ b/samples/boards/nordic/battery/src/battery.c
@@ -51,7 +51,7 @@ struct divider_config {
 };
 
 static const struct divider_config divider_config = {
-#if DT_NODE_HAS_STATUS_OKAY(VBATT)
+#if DT_NODE_HAS_STATUS(VBATT, okay)
 	.io_channel = {
 		DT_IO_CHANNELS_INPUT(VBATT),
 	},
@@ -72,7 +72,7 @@ struct divider_data {
 	int16_t raw;
 };
 static struct divider_data divider_data = {
-#if DT_NODE_HAS_STATUS_OKAY(VBATT)
+#if DT_NODE_HAS_STATUS(VBATT, okay)
 	.adc = DEVICE_DT_GET(DT_IO_CHANNELS_CTLR(VBATT)),
 #else
 	.adc = DEVICE_DT_GET(DT_IO_CHANNELS_CTLR(ZEPHYR_USER)),
diff --git a/samples/boards/nxp/mimxrt1060_evk/system_off/src/main.c b/samples/boards/nxp/mimxrt1060_evk/system_off/src/main.c
index af5dbf4b845..57b0298f861 100644
--- a/samples/boards/nxp/mimxrt1060_evk/system_off/src/main.c
+++ b/samples/boards/nxp/mimxrt1060_evk/system_off/src/main.c
@@ -17,12 +17,12 @@
 #define SOFT_OFF_S 10U
 
 #define SW0_NODE DT_ALIAS(sw0)
-#if !DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
+#if !DT_NODE_HAS_STATUS(SW0_NODE, okay)
 #error "Unsupported board: sw0 devicetree alias is not defined"
 #endif
 
 #define SNVS_RTC_NODE DT_NODELABEL(snvs_rtc)
-#if !DT_NODE_HAS_STATUS_OKAY(SNVS_RTC_NODE)
+#if !DT_NODE_HAS_STATUS(SNVS_RTC_NODE, okay)
 #error "Unsupported board: snvs_rtc node is not enabled"
 #endif
 
diff --git a/samples/boards/st/i2c_timing/src/main.c b/samples/boards/st/i2c_timing/src/main.c
index 80f8001318d..41b8dfa2dee 100644
--- a/samples/boards/st/i2c_timing/src/main.c
+++ b/samples/boards/st/i2c_timing/src/main.c
@@ -10,7 +10,7 @@
 #include <zephyr/kernel.h>
 
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(i2c_0))
+#if DT_NODE_HAS_STATUS(DT_ALIAS(i2c_0), okay)
 #define I2C_DEV_NODE	DT_ALIAS(i2c_0)
 #else
 #error "Please set the correct I2C device"
diff --git a/samples/boards/st/mco/src/main.c b/samples/boards/st/mco/src/main.c
index 7e79d1e8cd8..966e80f8525 100644
--- a/samples/boards/st/mco/src/main.c
+++ b/samples/boards/st/mco/src/main.c
@@ -25,7 +25,7 @@ int main(void)
 		return -1;
 	}
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(mco2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(mco2), okay)
 	dev = DEVICE_DT_GET(DT_NODELABEL(mco2));
 	if (device_is_ready(dev)) {
 		printk("MCO2 device successfully configured\n");
diff --git a/samples/boards/st/power_mgmt/standby_shutdown/src/main.c b/samples/boards/st/power_mgmt/standby_shutdown/src/main.c
index b74051bc99f..6610f01f955 100644
--- a/samples/boards/st/power_mgmt/standby_shutdown/src/main.c
+++ b/samples/boards/st/power_mgmt/standby_shutdown/src/main.c
@@ -23,7 +23,7 @@
 #define SLEEP_TIME_MS   3000
 
 #define SW0_NODE	DT_ALIAS(sw0)
-#if !DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
+#if !DT_NODE_HAS_STATUS(SW0_NODE, okay)
 #error "Unsupported board: sw0 devicetree alias is not defined"
 #endif
 
diff --git a/samples/boards/st/power_mgmt/wkup_pins/src/main.c b/samples/boards/st/power_mgmt/wkup_pins/src/main.c
index c83db862d43..2284a76b035 100644
--- a/samples/boards/st/power_mgmt/wkup_pins/src/main.c
+++ b/samples/boards/st/power_mgmt/wkup_pins/src/main.c
@@ -15,7 +15,7 @@
 #define WAIT_TIME_US 4000000
 
 #define WKUP_SRC_NODE DT_ALIAS(wkup_src)
-#if !DT_NODE_HAS_STATUS_OKAY(WKUP_SRC_NODE)
+#if !DT_NODE_HAS_STATUS(WKUP_SRC_NODE, okay)
 #error "Unsupported board: wkup_src devicetree alias is not defined"
 #endif
 
diff --git a/samples/drivers/espi/src/main.c b/samples/drivers/espi/src/main.c
index aa6b92a4725..fff0998459d 100644
--- a/samples/drivers/espi/src/main.c
+++ b/samples/drivers/espi/src/main.c
@@ -45,7 +45,7 @@ LOG_MODULE_DECLARE(espi, CONFIG_ESPI_LOG_LEVEL);
 /* The devicetree node identifier for the board power rails pins. */
 #define BRD_PWR_NODE DT_NODELABEL(board_power)
 
-#if DT_NODE_HAS_STATUS_OKAY(BRD_PWR_NODE)
+#if DT_NODE_HAS_STATUS(BRD_PWR_NODE, okay)
 static const struct gpio_dt_spec pwrgd_gpio = GPIO_DT_SPEC_GET(BRD_PWR_NODE, pwrg_gpios);
 static const struct gpio_dt_spec rsm_gpio = GPIO_DT_SPEC_GET(BRD_PWR_NODE, rsm_gpios);
 #endif
@@ -911,7 +911,7 @@ int espi_init(void)
 	return ret;
 }
 
-#if DT_NODE_HAS_STATUS_OKAY(BRD_PWR_NODE)
+#if DT_NODE_HAS_STATUS(BRD_PWR_NODE, okay)
 static int wait_for_pin(const struct gpio_dt_spec *gpio, uint16_t timeout, int exp_level)
 {
 	uint16_t loop_cnt = timeout;
@@ -1172,7 +1172,7 @@ int espi_test(void)
 	 */
 	k_sleep(K_SECONDS(1));
 
-#if DT_NODE_HAS_STATUS_OKAY(BRD_PWR_NODE)
+#if DT_NODE_HAS_STATUS(BRD_PWR_NODE, okay)
 	if (!gpio_is_ready_dt(&pwrgd_gpio)) {
 		LOG_ERR("%s: device not ready.", pwrgd_gpio.port->name);
 		return -ENODEV;
@@ -1201,7 +1201,7 @@ int espi_test(void)
 
 	LOG_INF("Hello eSPI test %s", CONFIG_BOARD);
 
-#if DT_NODE_HAS_STATUS_OKAY(BRD_PWR_NODE)
+#if DT_NODE_HAS_STATUS(BRD_PWR_NODE, okay)
 	ret = gpio_pin_configure_dt(&pwrgd_gpio, GPIO_INPUT);
 	if (ret) {
 		LOG_ERR("Unable to configure %d:%d", pwrgd_gpio.pin, ret);
@@ -1252,7 +1252,7 @@ int espi_test(void)
 	}
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(BRD_PWR_NODE)
+#if DT_NODE_HAS_STATUS(BRD_PWR_NODE, okay)
 	ret = wait_for_pin(&pwrgd_gpio, PWR_SEQ_TIMEOUT, 1);
 	if (ret) {
 		LOG_ERR("RSMRST_PWRGD timeout");
diff --git a/samples/drivers/i2s/echo/src/main.c b/samples/drivers/i2s/echo/src/main.c
index bffa794158b..c0ac1505d7b 100644
--- a/samples/drivers/i2s/echo/src/main.c
+++ b/samples/drivers/i2s/echo/src/main.c
@@ -30,12 +30,12 @@
 #define TIMEOUT             1000
 
 #define SW0_NODE        DT_ALIAS(sw0)
-#if DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
+#if DT_NODE_HAS_STATUS(SW0_NODE, okay)
 static struct gpio_dt_spec sw0_spec = GPIO_DT_SPEC_GET(SW0_NODE, gpios);
 #endif
 
 #define SW1_NODE        DT_ALIAS(sw1)
-#if DT_NODE_HAS_STATUS_OKAY(SW1_NODE)
+#if DT_NODE_HAS_STATUS(SW1_NODE, okay)
 static struct gpio_dt_spec sw1_spec = GPIO_DT_SPEC_GET(SW1_NODE, gpios);
 #endif
 
@@ -47,7 +47,7 @@ static int16_t echo_block[SAMPLES_PER_BLOCK];
 static volatile bool echo_enabled = true;
 static K_SEM_DEFINE(toggle_transfer, 1, 1);
 
-#if DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
+#if DT_NODE_HAS_STATUS(SW0_NODE, okay)
 static void sw0_handler(const struct device *dev, struct gpio_callback *cb,
 			uint32_t pins)
 {
@@ -58,7 +58,7 @@ static void sw0_handler(const struct device *dev, struct gpio_callback *cb,
 }
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(SW1_NODE)
+#if DT_NODE_HAS_STATUS(SW1_NODE, okay)
 static void sw1_handler(const struct device *dev, struct gpio_callback *cb,
 			uint32_t pins)
 {
@@ -70,7 +70,7 @@ static bool init_buttons(void)
 {
 	int ret;
 
-#if DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
+#if DT_NODE_HAS_STATUS(SW0_NODE, okay)
 	static struct gpio_callback sw0_cb_data;
 
 	if (!gpio_is_ready_dt(&sw0_spec)) {
@@ -98,7 +98,7 @@ static bool init_buttons(void)
 	printk("Press \"%s\" to toggle the echo effect\n", sw0_spec.port->name);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(SW1_NODE)
+#if DT_NODE_HAS_STATUS(SW1_NODE, okay)
 	static struct gpio_callback sw1_cb_data;
 
 	if (!gpio_is_ready_dt(&sw1_spec)) {
diff --git a/samples/drivers/lora/receive/src/main.c b/samples/drivers/lora/receive/src/main.c
index e6ba6086ae0..9b503354001 100644
--- a/samples/drivers/lora/receive/src/main.c
+++ b/samples/drivers/lora/receive/src/main.c
@@ -11,7 +11,7 @@
 #include <zephyr/kernel.h>
 
 #define DEFAULT_RADIO_NODE DT_ALIAS(lora0)
-BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DEFAULT_RADIO_NODE),
+BUILD_ASSERT(DT_NODE_HAS_STATUS(DEFAULT_RADIO_NODE, okay),
 	     "No default LoRa radio specified in DT");
 
 #define MAX_DATA_LEN 255
diff --git a/samples/drivers/lora/send/src/main.c b/samples/drivers/lora/send/src/main.c
index 7988fa8762e..63cce8367af 100644
--- a/samples/drivers/lora/send/src/main.c
+++ b/samples/drivers/lora/send/src/main.c
@@ -11,7 +11,7 @@
 #include <zephyr/kernel.h>
 
 #define DEFAULT_RADIO_NODE DT_ALIAS(lora0)
-BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DEFAULT_RADIO_NODE),
+BUILD_ASSERT(DT_NODE_HAS_STATUS(DEFAULT_RADIO_NODE, okay),
 	     "No default LoRa radio specified in DT");
 
 #define MAX_DATA_LEN 10
diff --git a/samples/shields/x_nucleo_53l0a1/src/main.c b/samples/shields/x_nucleo_53l0a1/src/main.c
index 9de9469ba7d..e2688eec21b 100644
--- a/samples/shields/x_nucleo_53l0a1/src/main.c
+++ b/samples/shields/x_nucleo_53l0a1/src/main.c
@@ -15,7 +15,7 @@
  * Get button configuration from the devicetree sw0 alias. This is mandatory.
  */
 #define SW0_NODE        DT_ALIAS(sw0)
-#if !DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
+#if !DT_NODE_HAS_STATUS(SW0_NODE, okay)
 #error "Unsupported board: sw0 devicetree alias is not defined"
 #endif
 
diff --git a/samples/subsys/mgmt/osdp/control_panel/src/main.c b/samples/subsys/mgmt/osdp/control_panel/src/main.c
index 2b58692e926..1942e822733 100644
--- a/samples/subsys/mgmt/osdp/control_panel/src/main.c
+++ b/samples/subsys/mgmt/osdp/control_panel/src/main.c
@@ -12,7 +12,7 @@
 /* The devicetree node identifier for the "led0" alias. */
 #define LED0_NODE DT_ALIAS(led0)
 
-#if !DT_NODE_HAS_STATUS_OKAY(LED0_NODE)
+#if !DT_NODE_HAS_STATUS(LED0_NODE, okay)
 #error "BOARD does not define a debug LED"
 #endif
 
diff --git a/samples/subsys/mgmt/osdp/peripheral_device/src/main.c b/samples/subsys/mgmt/osdp/peripheral_device/src/main.c
index 74d4fed6d2c..8ffdd10f081 100644
--- a/samples/subsys/mgmt/osdp/peripheral_device/src/main.c
+++ b/samples/subsys/mgmt/osdp/peripheral_device/src/main.c
@@ -12,7 +12,7 @@
 /* The devicetree node identifier for the "led0" alias. */
 #define LED0_NODE DT_ALIAS(led0)
 
-#if !DT_NODE_HAS_STATUS_OKAY(LED0_NODE)
+#if !DT_NODE_HAS_STATUS(LED0_NODE, okay)
 #error "BOARD does not define a debug LED"
 #endif
 
diff --git a/samples/subsys/task_wdt/src/main.c b/samples/subsys/task_wdt/src/main.c
index a366b3683eb..f06ef1faef2 100644
--- a/samples/subsys/task_wdt/src/main.c
+++ b/samples/subsys/task_wdt/src/main.c
@@ -21,7 +21,7 @@
  * from there. Otherwise, the task watchdog will be used without a
  * hardware watchdog fallback.
  */
-#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(watchdog0))
+#if DT_NODE_HAS_STATUS(DT_ALIAS(watchdog0), okay)
 #define WDT_NODE DT_ALIAS(watchdog0)
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_window_watchdog)
 #define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(st_stm32_window_watchdog)
diff --git a/soc/arm/beetle/power.c b/soc/arm/beetle/power.c
index 700969f4673..4377d79d3f0 100644
--- a/soc/arm/beetle/power.c
+++ b/soc/arm/beetle/power.c
@@ -11,13 +11,13 @@
 #include <soc_power.h>
 #include <zephyr/arch/cpu.h>
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
 #define CLK_BIT_GPIO0	_BEETLE_GPIO0
 #else
 #define CLK_BIT_GPIO0	0
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
 #define CLK_BIT_GPIO1	_BEETLE_GPIO1
 #else
 #define CLK_BIT_GPIO1	0
@@ -25,13 +25,13 @@
 
 #define AHB_CLK_BITS (CLK_BIT_GPIO0 | CLK_BIT_GPIO1)
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(timer0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(timer0), okay)
 #define CLK_BIT_TIMER0	_BEETLE_TIMER0
 #else
 #define CLK_BIT_TIMER0	0
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(timer1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(timer1), okay)
 #define CLK_BIT_TIMER1	_BEETLE_TIMER1
 #else
 #define CLK_BIT_TIMER1	0
@@ -43,13 +43,13 @@
 #define CLK_BIT_WDOG	0
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart0), okay)
 #define CLK_BIT_UART0	_BEETLE_UART0
 #else
 #define CLK_BIT_UART0	0
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)
 #define CLK_BIT_UART1	_BEETLE_UART1
 #else
 #define CLK_BIT_UART1	0
diff --git a/soc/atmel/sam/common/soc_power.c b/soc/atmel/sam/common/soc_power.c
index 0b477f9fbe9..08499b98b10 100644
--- a/soc/atmel/sam/common/soc_power.c
+++ b/soc/atmel/sam/common/soc_power.c
@@ -12,7 +12,7 @@
 #endif
 
 #if defined(CONFIG_REBOOT)
-#if DT_NODE_HAS_STATUS_OKAY(SAM_DT_RSTC_DRIVER)
+#if DT_NODE_HAS_STATUS(SAM_DT_RSTC_DRIVER, okay)
 
 void sys_arch_reboot(int type)
 {
@@ -33,5 +33,5 @@ void sys_arch_reboot(int type)
 	}
 }
 
-#endif /* DT_NODE_HAS_STATUS_OKAY */
+#endif /* DT_NODE_HAS_STATUS */
 #endif /* CONFIG_REBOOT */
diff --git a/soc/intel/intel_adsp/common/clk.c b/soc/intel/intel_adsp/common/clk.c
index ebcda7be1e7..3cb4b0e2db7 100644
--- a/soc/intel/intel_adsp/common/clk.c
+++ b/soc/intel/intel_adsp/common/clk.c
@@ -129,10 +129,10 @@ struct adsp_clock_source_desc adsp_clk_src_info[ADSP_CLOCK_SOURCE_COUNT] = {
 	 */
 	[ADSP_CLOCK_SOURCE_XTAL_OSC] = { CONFIG_DAI_DMIC_HW_IOCLK },
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(audioclk))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(audioclk), okay)
 	[ADSP_CLOCK_SOURCE_AUDIO_CARDINAL] = { DT_PROP(DT_NODELABEL(audioclk), clock_frequency) },
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pllclk))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pllclk), okay)
 	[ADSP_CLOCK_SOURCE_AUDIO_PLL_FIXED] = { DT_PROP(DT_NODELABEL(pllclk), clock_frequency) },
 #endif
 	[ADSP_CLOCK_SOURCE_MLCK_INPUT] = { 0 },
diff --git a/soc/intel/intel_adsp/common/include/adsp_clk.h b/soc/intel/intel_adsp/common/include/adsp_clk.h
index 591116c5561..ccfb5cdc7e7 100644
--- a/soc/intel/intel_adsp/common/include/adsp_clk.h
+++ b/soc/intel/intel_adsp/common/include/adsp_clk.h
@@ -64,10 +64,10 @@ struct adsp_cpu_clock_info *adsp_cpu_clocks_get(void);
 
 /* Clock sources used by dai */
 #define ADSP_CLOCK_SOURCE_XTAL_OSC		0
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(audioclk))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(audioclk), okay)
 #define ADSP_CLOCK_SOURCE_AUDIO_CARDINAL	1
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pllclk))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pllclk), okay)
 #define ADSP_CLOCK_SOURCE_AUDIO_PLL_FIXED	2
 #endif
 
diff --git a/soc/intel/intel_adsp/common/mem_window.c b/soc/intel/intel_adsp/common/mem_window.c
index ae5abcb77bf..8ca591deb36 100644
--- a/soc/intel/intel_adsp/common/mem_window.c
+++ b/soc/intel/intel_adsp/common/mem_window.c
@@ -58,15 +58,15 @@ void mem_window_idle_exit(void)
 			&mem_win_config_##n, PRE_KERNEL_1,                                         \
 			CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, NULL);
 
-#if DT_NODE_HAS_STATUS_OKAY(MEM_WINDOW_NODE(0))
+#if DT_NODE_HAS_STATUS(MEM_WINDOW_NODE(0), okay)
 MEM_WINDOW_DEFINE(0)
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(MEM_WINDOW_NODE(1))
+#if DT_NODE_HAS_STATUS(MEM_WINDOW_NODE(1), okay)
 MEM_WINDOW_DEFINE(1)
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(MEM_WINDOW_NODE(2))
+#if DT_NODE_HAS_STATUS(MEM_WINDOW_NODE(2), okay)
 MEM_WINDOW_DEFINE(2)
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(MEM_WINDOW_NODE(3))
+#if DT_NODE_HAS_STATUS(MEM_WINDOW_NODE(3), okay)
 MEM_WINDOW_DEFINE(3)
 #endif
diff --git a/soc/ite/ec/it8xxx2/soc.c b/soc/ite/ec/it8xxx2/soc.c
index 2c2660ac3b1..0f2501111be 100644
--- a/soc/ite/ec/it8xxx2/soc.c
+++ b/soc/ite/ec/it8xxx2/soc.c
@@ -403,7 +403,7 @@ static int ite_it8xxx2_init(void)
 	IT8XXX2_EGPIO_EGCR |= IT8XXX2_EGPIO_EEPODD;
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)
 	/* UART1 board init */
 	/* bit2: clocks to UART1 modules are not gated. */
 	IT8XXX2_ECPM_CGCTRL3R &= ~BIT(2);
@@ -417,9 +417,9 @@ static int ite_it8xxx2_init(void)
 	/* switch UART1 on without hardware flow control */
 	gpio_regs->GPIO_GCR1 |= IT8XXX2_GPIO_U1CTRL_SIN0_SOUT0_EN;
 
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay)
 	/* UART2 board init */
 	/* setting voltage 3.3v */
 	gpio_regs->GPIO_GCR21 &= ~(IT8XXX2_GPIO_GPH1VS | IT8XXX2_GPIO_GPH2VS);
@@ -435,7 +435,7 @@ static int ite_it8xxx2_init(void)
 	/* switch UART2 on without hardware flow control */
 	gpio_regs->GPIO_GCR1 |= IT8XXX2_GPIO_U2CTRL_SIN1_SOUT1_EN;
 
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) */
 
 #if (SOC_USBPD_ITE_PHY_PORT_COUNT > 0)
 	int port;
diff --git a/soc/microchip/mec/common/soc_dt.h b/soc/microchip/mec/common/soc_dt.h
index 39f772f964f..cfaa8821da9 100644
--- a/soc/microchip/mec/common/soc_dt.h
+++ b/soc/microchip/mec/common/soc_dt.h
@@ -35,7 +35,7 @@
 #define MCHP_DT_ESPI_VW_FLAG_RST_SRC_MSK0	0x7
 
 #define MCHP_DT_NODE_FROM_VWTABLE(name) DT_CHILD(DT_PATH(mchp_xec_espi_vw_routing), name)
-#define MCHP_DT_VW_NODE_HAS_STATUS(name) DT_NODE_HAS_STATUS_OKAY(MCHP_DT_NODE_FROM_VWTABLE(name))
+#define MCHP_DT_VW_NODE_HAS_STATUS(name) DT_NODE_HAS_STATUS(MCHP_DT_NODE_FROM_VWTABLE(name), okay)
 
 /* Macro to store eSPI virtual wire DT flags
  * b[0] = DT status property 0 is disabled, 1 enabled,
diff --git a/soc/microchip/mec/mec172x/device_power.c b/soc/microchip/mec/mec172x/device_power.c
index eab5bfb0419..8a35d6ddd00 100644
--- a/soc/microchip/mec/mec172x/device_power.c
+++ b/soc/microchip/mec/mec172x/device_power.c
@@ -93,14 +93,14 @@ void soc_deep_sleep_non_wake_dis(void)
 void soc_deep_sleep_wake_en(void)
 {
 #if defined(CONFIG_KSCAN) ||	\
-	(!defined(CONFIG_PM_DEVICE) && DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ps2_0)))
+	(!defined(CONFIG_PM_DEVICE) && DT_NODE_HAS_STATUS(DT_NODELABEL(ps2_0), okay))
 	struct ecia_named_regs *regs = ECIA_XEC_REG_BASE;
 #if defined(CONFIG_KSCAN)
 	/* Enable PLL wake via KSCAN  */
 	regs->GIRQ21.SRC = MCHP_KEYSCAN_GIRQ_BIT;
 	regs->GIRQ21.EN_SET = MCHP_KEYSCAN_GIRQ_BIT;
 #endif
-#if !defined(CONFIG_PM_DEVICE) && DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ps2_0))
+#if !defined(CONFIG_PM_DEVICE) && DT_NODE_HAS_STATUS(DT_NODELABEL(ps2_0), okay)
 	/* Enable PS2_0B_WK */
 	regs->GIRQ21.SRC = MCHP_PS2_0_PORT0B_WK_GIRQ_BIT;
 	regs->GIRQ21.EN_SET = MCHP_PS2_0_PORT0B_WK_GIRQ_BIT;
@@ -110,7 +110,7 @@ void soc_deep_sleep_wake_en(void)
 
 void soc_deep_sleep_wake_dis(void)
 {
-#if !defined(CONFIG_PM_DEVICE) && DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ps2_0))
+#if !defined(CONFIG_PM_DEVICE) && DT_NODE_HAS_STATUS(DT_NODELABEL(ps2_0), okay)
 	struct ecia_named_regs *regs = ECIA_XEC_REG_BASE;
 
 	/* Enable PS2_0B_WK */
diff --git a/soc/nordic/common/nrf54hx_nrf92x_mpu_regions.c b/soc/nordic/common/nrf54hx_nrf92x_mpu_regions.c
index b76fac86bcd..66659588411 100644
--- a/soc/nordic/common/nrf54hx_nrf92x_mpu_regions.c
+++ b/soc/nordic/common/nrf54hx_nrf92x_mpu_regions.c
@@ -28,15 +28,15 @@ static struct arm_mpu_region mpu_regions[] = {
 			 REGION_RAM_ATTR(CONFIG_SRAM_BASE_ADDRESS,
 				CONFIG_SRAM_SIZE * 1024)),
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usbhs))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usbhs), okay)
 	MPU_REGION_ENTRY("USBHS_CORE", USBHS_BASE,
 			 REGION_RAM_NOCACHE_ATTR(USBHS_BASE, USBHS_SIZE)),
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(can120))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(can120), okay)
 	MPU_REGION_ENTRY("CAN120_MCAN", CAN120_BASE,
 			 REGION_RAM_NOCACHE_ATTR(CAN120_BASE, CAN120_SIZE)),
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(can121))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(can121), okay)
 	MPU_REGION_ENTRY("CAN121_MCAN", CAN121_BASE,
 			 REGION_RAM_NOCACHE_ATTR(CAN121_BASE, CAN121_SIZE)),
 #endif
diff --git a/soc/nordic/nrf52/soc.c b/soc/nordic/nrf52/soc.c
index 4bb3b8640e5..3262b84bc85 100644
--- a/soc/nordic/nrf52/soc.c
+++ b/soc/nordic/nrf52/soc.c
@@ -37,7 +37,7 @@ static int nordicsemi_nrf52_init(void)
 	nrf_power_dcdcen_set(NRF_POWER, true);
 #endif
 #if NRF_POWER_HAS_DCDCEN_VDDH && (defined(CONFIG_SOC_DCDC_NRF52X_HV) || \
-	DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nordic_nrf52x_regulator_hv)))
+	DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf52x_regulator_hv), okay))
 	nrf_power_dcdcen_vddh_set(NRF_POWER, true);
 #endif
 
diff --git a/soc/nordic/nrf53/soc.c b/soc/nordic/nrf53/soc.c
index 67eb5dfb67b..46e8e5ca20d 100644
--- a/soc/nordic/nrf53/soc.c
+++ b/soc/nordic/nrf53/soc.c
@@ -531,7 +531,7 @@ static int nordicsemi_nrf53_init(void)
 	(DT_PROP(DT_NODELABEL(vregradio), regulator_initial_mode) == NRF5X_REG_MODE_DCDC)
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_RADIO, true);
 #endif
-#if defined(CONFIG_SOC_DCDC_NRF53X_HV) || DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(vregh))
+#if defined(CONFIG_SOC_DCDC_NRF53X_HV) || DT_NODE_HAS_STATUS(DT_NODELABEL(vregh), okay)
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_HIGH, true);
 #endif
 
diff --git a/soc/nordic/nrf54h/soc.c b/soc/nordic/nrf54h/soc.c
index 4ffb17bef51..2699a3ebd54 100644
--- a/soc/nordic/nrf54h/soc.c
+++ b/soc/nordic/nrf54h/soc.c
@@ -143,7 +143,7 @@ static int nordicsemi_nrf54h_init(void)
 		return err;
 	}
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ccm030))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ccm030), okay)
 	/* DMASEC is set to non-secure by default, which prevents CCM from
 	 * accessing secure memory. Change DMASEC to secure.
 	 */
diff --git a/soc/nordic/nrf92/soc.c b/soc/nordic/nrf92/soc.c
index d9a54e4f1aa..1a40bb58dda 100644
--- a/soc/nordic/nrf92/soc.c
+++ b/soc/nordic/nrf92/soc.c
@@ -93,7 +93,7 @@ static int nordicsemi_nrf92_init(void)
 
 	trim_hsfll();
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ccm030))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ccm030), okay)
 	/* DMASEC is set to non-secure by default, which prevents CCM from
 	 * accessing secure memory. Change DMASEC to secure.
 	 */
diff --git a/soc/nordic/validate_enabled_instances.c b/soc/nordic/validate_enabled_instances.c
index afcfc6e8ca8..b3e4dd70bbf 100644
--- a/soc/nordic/validate_enabled_instances.c
+++ b/soc/nordic/validate_enabled_instances.c
@@ -7,16 +7,16 @@
 #include <zephyr/kernel.h>
 
 #define I2C_ENABLED(idx)  (IS_ENABLED(CONFIG_I2C) && \
-			   DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c##idx)))
+			   DT_NODE_HAS_STATUS(DT_NODELABEL(i2c##idx), okay))
 
 #define SPI_ENABLED(idx)  (IS_ENABLED(CONFIG_SPI) && \
-			   DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(spi##idx)))
+			   DT_NODE_HAS_STATUS(DT_NODELABEL(spi##idx), okay))
 
 #define UART_ENABLED(idx) (IS_ENABLED(CONFIG_SERIAL) && \
 			   (IS_ENABLED(CONFIG_SOC_SERIES_NRF53X) || \
 			    IS_ENABLED(CONFIG_SOC_SERIES_NRF54LX) || \
 			    IS_ENABLED(CONFIG_SOC_SERIES_NRF91X)) && \
-			   DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart##idx)))
+			   DT_NODE_HAS_STATUS(DT_NODELABEL(uart##idx), okay))
 
 /*
  * In most Nordic SoCs, SPI and TWI peripherals with the same instance number
diff --git a/soc/nxp/imx/imx6sx/soc.c b/soc/nxp/imx/imx6sx/soc.c
index 516c2e9bcf6..11cbac10002 100644
--- a/soc/nxp/imx/imx6sx/soc.c
+++ b/soc/nxp/imx/imx6sx/soc.c
@@ -23,55 +23,55 @@ static void SOC_RdcInit(void)
 			RDC_DOMAIN_PERM(M4_DOMAIN_ID, RDC_DOMAIN_PERM_RW),
 			false, false);
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)
 	/* Set access to UART_1 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapUart1, RDC_DT_VAL(uart1), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay)
 	/* Set access to UART_2 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapUart2, RDC_DT_VAL(uart2), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay)
 	/* Set access to UART_3 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapUart3, RDC_DT_VAL(uart3), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)
 	/* Set access to UART_4 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapUart4, RDC_DT_VAL(uart4), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart5))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart5), okay)
 	/* Set access to UART_5 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapUart5, RDC_DT_VAL(uart5), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart6))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart6), okay)
 	/* Set access to UART_6 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapUart6, RDC_DT_VAL(uart6), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
 	/* Set access to GPIO_1 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapGpio1, RDC_DT_VAL(gpio1), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay)
 	/* Set access to GPIO_2 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapGpio2, RDC_DT_VAL(gpio2), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio3), okay)
 	/* Set access to GPIO_3 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapGpio3, RDC_DT_VAL(gpio3), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio4), okay)
 	/* Set access to GPIO_4 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapGpio4, RDC_DT_VAL(gpio4), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio5))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio5), okay)
 	/* Set access to GPIO_5 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapGpio5, RDC_DT_VAL(gpio5), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio6))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio6), okay)
 	/* Set access to GPIO_6 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapGpio6, RDC_DT_VAL(gpio6), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio7))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio7), okay)
 	/* Set access to GPIO_7 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapGpio7, RDC_DT_VAL(gpio7), false, false);
 #endif
@@ -81,69 +81,69 @@ static void SOC_RdcInit(void)
 	RDC_SetPdapAccess(RDC, rdcPdapMuB, RDC_DT_VAL(mub), false, false);
 #endif /* CONFIG_IPM_IMX */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(epit1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(epit1), okay)
 	/* Set access to EPIT_1 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapEpit1, RDC_DT_VAL(epit1), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(epit2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(epit2), okay)
 	/* Set access to EPIT_2 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapEpit2, RDC_DT_VAL(epit2), false, false);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay)
 	/* Set access to I2C-1 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapI2c1, RDC_DT_VAL(i2c1), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay)
 	/* Set access to I2C-2 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapI2c2, RDC_DT_VAL(i2c2), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c3), okay)
 	/* Set access to I2C-3 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapI2c3, RDC_DT_VAL(i2c3), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c4), okay)
 	/* Set access to I2C-4 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapI2c4, RDC_DT_VAL(i2c4), false, false);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm1), okay)
 	/* Set access to PWM-1 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm1, RDC_DT_VAL(pwm1), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm2), okay)
 	/* Set access to PWM-2 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm2, RDC_DT_VAL(pwm2), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm3), okay)
 	/* Set access to PWM-3 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm3, RDC_DT_VAL(pwm3), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm4), okay)
 	/* Set access to PWM-4 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm4, RDC_DT_VAL(pwm4), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm5))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm5), okay)
 	/* Set access to PWM-5 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm5, RDC_DT_VAL(pwm5), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm6))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm6), okay)
 	/* Set access to PWM-6 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm6, RDC_DT_VAL(pwm6), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm7))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm7), okay)
 	/* Set access to PWM-7 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm7, RDC_DT_VAL(pwm7), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm8))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm8), okay)
 	/* Set access to PWM-8 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm8, RDC_DT_VAL(pwm8), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(adc1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc1), okay)
 	/* Set access to ADC-1 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapAdc1, RDC_DT_VAL(adc1), false, false);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(adc2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc2), okay)
 	/* Set access to ADC-2 for M4 core */
 	RDC_SetPdapAccess(RDC, rdcPdapAdc2, RDC_DT_VAL(adc2), false, false);
 #endif
@@ -213,10 +213,10 @@ static void SOC_ClockInit(void)
 	CCM_SetRootDivider(CCM, ccmRootPerclkPodf, 0);
 
 	/* Enable EPIT clocks */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(epit1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(epit1), okay)
 	CCM_ControlGate(CCM, ccmCcgrGateEpit1Clk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(epit2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(epit2), okay)
 	CCM_ControlGate(CCM, ccmCcgrGateEpit2Clk, ccmClockNeededAll);
 #endif
 #endif /* CONFIG_COUNTER_IMX_EPIT */
@@ -229,16 +229,16 @@ static void SOC_ClockInit(void)
 	CCM_SetRootDivider(CCM, ccmRootPerclkPodf, 0);
 
 	/* Enable I2C clock */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay)
 	CCM_ControlGate(CCM, ccmCcgrGateI2c1Serialclk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay)
 	CCM_ControlGate(CCM, ccmCcgrGateI2c2Serialclk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c3), okay)
 	CCM_ControlGate(CCM, ccmCcgrGateI2c3Serialclk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c4), okay)
 	CCM_ControlGate(CCM, ccmCcgrGateI2c4Serialclk, ccmClockNeededAll);
 #endif
 #endif /* CONFIG_I2C_IMX */
@@ -251,28 +251,28 @@ static void SOC_ClockInit(void)
 	CCM_SetRootDivider(CCM, ccmRootPerclkPodf, 0);
 
 	/* Enable PWM clock */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm1), okay)
 	CCM_ControlGate(CCM, ccmCcgrGatePwm1Clk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm2), okay)
 	CCM_ControlGate(CCM, ccmCcgrGatePwm2Clk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm3), okay)
 	CCM_ControlGate(CCM, ccmCcgrGatePwm3Clk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm4), okay)
 	CCM_ControlGate(CCM, ccmCcgrGatePwm4Clk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm5))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm5), okay)
 	CCM_ControlGate(CCM, ccmCcgrGatePwm5Clk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm6))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm6), okay)
 	CCM_ControlGate(CCM, ccmCcgrGatePwm6Clk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm7))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm7), okay)
 	CCM_ControlGate(CCM, ccmCcgrGatePwm7Clk, ccmClockNeededAll);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm8))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm8), okay)
 	CCM_ControlGate(CCM, ccmCcgrGatePwm8Clk, ccmClockNeededAll);
 #endif
 #endif /* CONFIG_PWM_IMX */
diff --git a/soc/nxp/imx/imx7d/soc.c b/soc/nxp/imx/imx7d/soc.c
index 780c405a0bb..df3ee95f2e1 100644
--- a/soc/nxp/imx/imx7d/soc.c
+++ b/soc/nxp/imx/imx7d/soc.c
@@ -57,21 +57,21 @@ void SOC_RdcInit(void)
 static void nxp_mcimx7_gpio_config(void)
 {
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
 	RDC_SetPdapAccess(RDC, rdcPdapGpio1, RDC_DT_VAL(gpio1), false, false);
 	/* Enable gpio clock gate */
 	CCM_ControlGate(CCM, ccmCcgrGateGpio1, ccmClockNeededRunWait);
 #endif
 
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay)
 	RDC_SetPdapAccess(RDC, rdcPdapGpio2, RDC_DT_VAL(gpio2), false, false);
 	/* Enable gpio clock gate */
 	CCM_ControlGate(CCM, ccmCcgrGateGpio2, ccmClockNeededRunWait);
 #endif
 
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio7))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio7), okay)
 	RDC_SetPdapAccess(RDC, rdcPdapGpio7, RDC_DT_VAL(gpio7), false, false);
 	/* Enable gpio clock gate */
 	CCM_ControlGate(CCM, ccmCcgrGateGpio7, ccmClockNeededRunWait);
@@ -84,7 +84,7 @@ static void nxp_mcimx7_gpio_config(void)
 static void nxp_mcimx7_uart_config(void)
 {
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay)
 	/* We need to grasp board uart exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapUart2, RDC_DT_VAL(uart2), false, false);
 	/* Select clock derived from OSC clock(24M) */
@@ -99,7 +99,7 @@ static void nxp_mcimx7_uart_config(void)
 	CCM_ControlGate(CCM, ccmCcgrGateUart2, ccmClockNeededAll);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart6))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart6), okay)
 	/* We need to grasp board uart exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapUart6, RDC_DT_VAL(uart6), false, false);
 	/* Select clock derived from OSC clock(24M) */
@@ -121,7 +121,7 @@ static void nxp_mcimx7_uart_config(void)
 static void nxp_mcimx7_i2c_config(void)
 {
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay)
 	/* In this example, we need to grasp board I2C exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapI2c1, RDC_DT_VAL(i2c1), false, false);
 	/* Select I2C clock derived from OSC clock(24M) */
@@ -131,7 +131,7 @@ static void nxp_mcimx7_i2c_config(void)
 	CCM_ControlGate(CCM, ccmCcgrGateI2c1, ccmClockNeededRunWait);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay)
 	/* In this example, we need to grasp board I2C exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapI2c2, RDC_DT_VAL(i2c2), false, false);
 	/* Select I2C clock derived from OSC clock(24M) */
@@ -141,7 +141,7 @@ static void nxp_mcimx7_i2c_config(void)
 	CCM_ControlGate(CCM, ccmCcgrGateI2c2, ccmClockNeededRunWait);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c3), okay)
 	/* In this example, we need to grasp board I2C exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapI2c3, RDC_DT_VAL(i2c3), false, false);
 	/* Select I2C clock derived from OSC clock(24M) */
@@ -151,7 +151,7 @@ static void nxp_mcimx7_i2c_config(void)
 	CCM_ControlGate(CCM, ccmCcgrGateI2c3, ccmClockNeededRunWait);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c4), okay)
 	/* In this example, we need to grasp board I2C exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapI2c4, RDC_DT_VAL(i2c4), false, false);
 	/* Select I2C clock derived from OSC clock(24M) */
@@ -168,7 +168,7 @@ static void nxp_mcimx7_i2c_config(void)
 static void nxp_mcimx7_pwm_config(void)
 {
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm1), okay)
 	/* We need to grasp board pwm exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm1, RDC_DT_VAL(pwm1), false, false);
 	/* Select clock derived from OSC clock(24M) */
@@ -178,7 +178,7 @@ static void nxp_mcimx7_pwm_config(void)
 	CCM_ControlGate(CCM, ccmCcgrGatePwm1, ccmClockNeededAll);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm2), okay)
 	/* We need to grasp board pwm exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm2, RDC_DT_VAL(pwm2), false, false);
 	/* Select clock derived from OSC clock(24M) */
@@ -188,7 +188,7 @@ static void nxp_mcimx7_pwm_config(void)
 	CCM_ControlGate(CCM, ccmCcgrGatePwm2, ccmClockNeededAll);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm3), okay)
 	/* We need to grasp board pwm exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm3, RDC_DT_VAL(pwm3), false, false);
 	/* Select clock derived from OSC clock(24M) */
@@ -198,7 +198,7 @@ static void nxp_mcimx7_pwm_config(void)
 	CCM_ControlGate(CCM, ccmCcgrGatePwm3, ccmClockNeededAll);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pwm4), okay)
 	/* We need to grasp board pwm exclusively */
 	RDC_SetPdapAccess(RDC, rdcPdapPwm4, RDC_DT_VAL(pwm4), false, false);
 	/* Select clock derived from OSC clock(24M) */
diff --git a/soc/nxp/imx/imx8m/a53/soc.c b/soc/nxp/imx/imx8m/a53/soc.c
index a110213e2b6..a20ae395f18 100644
--- a/soc/nxp/imx/imx8m/a53/soc.c
+++ b/soc/nxp/imx/imx8m/a53/soc.c
@@ -12,7 +12,7 @@
 #include <fsl_common.h>
 #include <fsl_rdc.h>
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(rdc))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(rdc), okay)
 
 #define rdc_inst ((RDC_Type *)DT_REG_ADDR(DT_NODELABEL(rdc)))
 
@@ -28,19 +28,19 @@ static void soc_rdc_init(void)
 
 	RDC_GetDefaultPeriphAccessConfig(&periphConfig);
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2)) && DT_NODE_HAS_PROP(DT_NODELABEL(uart2), rdc)
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) && DT_NODE_HAS_PROP(DT_NODELABEL(uart2), rdc)
 	periphConfig.periph = kRDC_Periph_UART2;
 	periphConfig.policy = RDC_DT_VAL(uart2);
 	RDC_SetPeriphAccessConfig(rdc_inst, &periphConfig);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4)) && DT_NODE_HAS_PROP(DT_NODELABEL(uart4), rdc)
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay) && DT_NODE_HAS_PROP(DT_NODELABEL(uart4), rdc)
 	periphConfig.periph = kRDC_Periph_UART4;
 	periphConfig.policy = RDC_DT_VAL(uart4);
 	RDC_SetPeriphAccessConfig(rdc_inst, &periphConfig);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet)) && DT_NODE_HAS_PROP(DT_NODELABEL(enet), rdc)
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay) && DT_NODE_HAS_PROP(DT_NODELABEL(enet), rdc)
 	periphConfig.periph = kRDC_Periph_ENET1;
 	periphConfig.policy = RDC_DT_VAL(enet);
 	RDC_SetPeriphAccessConfig(rdc_inst, &periphConfig);
diff --git a/soc/nxp/imx/imx8m/m4_mini/soc.c b/soc/nxp/imx/imx8m/m4_mini/soc.c
index b809a900e11..784c39fcc04 100644
--- a/soc/nxp/imx/imx8m/m4_mini/soc.c
+++ b/soc/nxp/imx/imx8m/m4_mini/soc.c
@@ -104,25 +104,25 @@ static void SOC_ClockInit(void)
 	CLOCK_SetRootMux(kCLOCK_RootAudioAhb, kCLOCK_AudioAhbRootmuxSysPll1);
 
 #if defined(CONFIG_UART_MCUX_IUART)
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart1, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootUart1, 1U, 1U);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay)
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart2, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootUart2, 1U, 1U);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay)
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart3, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootUart3, 1U, 1U);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart4, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
diff --git a/soc/nxp/imx/imx8m/m4_quad/soc.c b/soc/nxp/imx/imx8m/m4_quad/soc.c
index eea984fc172..031121bc424 100644
--- a/soc/nxp/imx/imx8m/m4_quad/soc.c
+++ b/soc/nxp/imx/imx8m/m4_quad/soc.c
@@ -67,25 +67,25 @@ static void SOC_ClockInit(void)
 	CLOCK_SetRootMux(kCLOCK_RootM4, kCLOCK_M4RootmuxSysPll1Div3);
 
 #if defined(CONFIG_UART_MCUX_IUART)
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart1, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootUart1, 1U, 1U);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay)
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart2, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootUart2, 1U, 1U);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay)
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart3, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootUart3, 1U, 1U);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart4, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
diff --git a/soc/nxp/imx/imx8m/m7/soc.c b/soc/nxp/imx/imx8m/m7/soc.c
index 7cd42b3bb5d..683d550b149 100644
--- a/soc/nxp/imx/imx8m/m7/soc.c
+++ b/soc/nxp/imx/imx8m/m7/soc.c
@@ -107,25 +107,25 @@ static void SOC_ClockInit(void)
 	CLOCK_SetRootMux(kCLOCK_RootAhb, kCLOCK_AhbRootmuxSysPll1Div6);
 
 #if defined(CONFIG_UART_MCUX_IUART)
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay)
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart1, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootUart1, 1U, 1U);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay)
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart2, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootUart2, 1U, 1U);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart3), okay)
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart3, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootUart3, 1U, 1U);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay)
 	/* Set UART source to SysPLL1 Div10 80MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootUart4, kCLOCK_UartRootmuxSysPll1Div10);
 	/* Set root clock to 80MHZ/ 1= 80MHZ */
@@ -134,21 +134,21 @@ static void SOC_ClockInit(void)
 #endif
 
 #if defined(CONFIG_SPI_MCUX_ECSPI)
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ecspi1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ecspi1), okay)
 	/* Set ECSPI1 source to SYSTEM PLL1 800MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootEcspi1, kCLOCK_EcspiRootmuxSysPll1);
 	/* Set root clock to 800MHZ / 10 = 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootEcspi1, 2U, 5U);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ecspi2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ecspi2), okay)
 	/* Set ECSPI2 source to SYSTEM PLL1 800MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootEcspi2, kCLOCK_EcspiRootmuxSysPll1);
 	/* Set root clock to 800MHZ / 10 = 80MHZ */
 	CLOCK_SetRootDivider(kCLOCK_RootEcspi2, 2U, 5U);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ecspi3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ecspi3), okay)
 	/* Set ECSPI3 source to SYSTEM PLL1 800MHZ */
 	CLOCK_SetRootMux(kCLOCK_RootEcspi3, kCLOCK_EcspiRootmuxSysPll1);
 	/* Set root clock to 800MHZ / 10 = 80MHZ */
@@ -175,27 +175,27 @@ static void gpio_init(void)
 {
 
 #if defined(CONFIG_GPIO_MCUX_IGPIO)
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
 
 	CLOCK_EnableClock(kCLOCK_Gpio1);
 
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay)
 
 	CLOCK_EnableClock(kCLOCK_Gpio2);
 
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio3), okay)
 
 	CLOCK_EnableClock(kCLOCK_Gpio3);
 
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio4))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio4), okay)
 
 	CLOCK_EnableClock(kCLOCK_Gpio4);
 
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio5))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio5), okay)
 
 	CLOCK_EnableClock(kCLOCK_Gpio5);
 
diff --git a/soc/nxp/imxrt/imxrt10xx/flexspi.c b/soc/nxp/imxrt/imxrt10xx/flexspi.c
index 5f288747c1a..a6a6239e9e7 100644
--- a/soc/nxp/imxrt/imxrt10xx/flexspi.c
+++ b/soc/nxp/imxrt/imxrt10xx/flexspi.c
@@ -28,7 +28,7 @@ uint32_t flexspi_clock_set_freq(uint32_t clock_name, uint32_t rate)
 		div_sel = kCLOCK_FlexspiDiv;
 		clk_name = kCLOCK_FlexSpi;
 		break;
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexspi2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexspi2), okay)
 	case IMX_CCM_FLEXSPI2_CLK:
 		/* Get clock root frequency */
 		root_rate = CLOCK_GetClockRootFreq(kCLOCK_Flexspi2ClkRoot) *
diff --git a/soc/nxp/imxrt/imxrt10xx/soc.c b/soc/nxp/imxrt/imxrt10xx/soc.c
index 941ae1d3474..d8a11dafd34 100644
--- a/soc/nxp/imxrt/imxrt10xx/soc.c
+++ b/soc/nxp/imxrt/imxrt10xx/soc.c
@@ -67,10 +67,10 @@ const clock_enet_pll_config_t ethPllConfig = {
 	.enableClkOutput500M = true,
 #endif
 #if defined(CONFIG_ETH_NXP_ENET) || defined(CONFIG_ETH_MCUX)
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay)
 	.enableClkOutput = true,
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet2), okay)
 	.enableClkOutput1 = true,
 #endif
 #endif
@@ -79,10 +79,10 @@ const clock_enet_pll_config_t ethPllConfig = {
 #else
 	.enableClkOutput25M = false,
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay)
 	.loopDivider = 1,
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet2), okay)
 	.loopDivider1 = 1,
 #endif
 };
@@ -226,7 +226,7 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet)) && CONFIG_NET_L2_ETHERNET
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay) && CONFIG_NET_L2_ETHERNET
 #if CONFIG_ETH_MCUX_RMII_EXT_CLK
 	/* Enable clock input for ENET1 */
 	IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1TxClkOutputDir, false);
@@ -236,43 +236,43 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet2)) && CONFIG_NET_L2_ETHERNET
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet2), okay) && CONFIG_NET_L2_ETHERNET
 	/* Set ENET2 ref clock to be generated by External OSC,*/
 	/* direction as output and frequency to 50MHz */
 	IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET2TxClkOutputDir |
 				kIOMUXC_GPR_ENET2RefClkMode, true);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb1)) && \
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb1), okay) && \
 	(CONFIG_USB_DC_NXP_EHCI || CONFIG_UDC_NXP_EHCI)
 	CLOCK_EnableUsbhs0PhyPllClock(kCLOCK_Usb480M,
 		DT_PROP_BY_PHANDLE(DT_NODELABEL(usb1), clocks, clock_frequency));
 	CLOCK_EnableUsbhs0Clock(kCLOCK_Usb480M,
 		DT_PROP_BY_PHANDLE(DT_NODELABEL(usb1), clocks, clock_frequency));
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb1)) && CONFIG_USB_DC_NXP_EHCI
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb1), okay) && CONFIG_USB_DC_NXP_EHCI
 	USB_EhciPhyInit(kUSB_ControllerEhci0, CPU_XTAL_CLK_HZ, &usbPhyConfig);
 #endif
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb2)) && \
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb2), okay) && \
 	(CONFIG_USB_DC_NXP_EHCI || CONFIG_UDC_NXP_EHCI)
 	CLOCK_EnableUsbhs1PhyPllClock(kCLOCK_Usb480M,
 		DT_PROP_BY_PHANDLE(DT_NODELABEL(usb2), clocks, clock_frequency));
 	CLOCK_EnableUsbhs1Clock(kCLOCK_Usb480M,
 		DT_PROP_BY_PHANDLE(DT_NODELABEL(usb2), clocks, clock_frequency));
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb1)) && CONFIG_USB_DC_NXP_EHCI
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb1), okay) && CONFIG_USB_DC_NXP_EHCI
 	USB_EhciPhyInit(kUSB_ControllerEhci1, CPU_XTAL_CLK_HZ, &usbPhyConfig);
 #endif
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc1)) && CONFIG_IMX_USDHC
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc1), okay) && CONFIG_IMX_USDHC
 	/* Configure USDHC clock source and divider */
 	CLOCK_InitSysPfd(kCLOCK_Pfd0, 24U);
 	CLOCK_SetDiv(kCLOCK_Usdhc1Div, 1U);
 	CLOCK_SetMux(kCLOCK_Usdhc1Mux, 1U);
 	CLOCK_EnableClock(kCLOCK_Usdhc1);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc2)) && CONFIG_IMX_USDHC
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc2), okay) && CONFIG_IMX_USDHC
 	/* Configure USDHC clock source and divider */
 	CLOCK_InitSysPfd(kCLOCK_Pfd0, 24U);
 	CLOCK_SetDiv(kCLOCK_Usdhc2Div, 1U);
diff --git a/soc/nxp/imxrt/imxrt118x/soc.c b/soc/nxp/imxrt/imxrt118x/soc.c
index 1809d6b4b02..85299643de7 100644
--- a/soc/nxp/imxrt/imxrt118x/soc.c
+++ b/soc/nxp/imxrt/imxrt118x/soc.c
@@ -208,16 +208,16 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 
 #if defined(CONFIG_UART_MCUX_LPUART) && \
-	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart1)) \
-	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart2)))
+	(DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart1), okay) \
+	|| DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart2), okay))
 	/* Configure LPUART0102 using SYS_PLL3_DIV2_CLK */
 	rootCfg.mux = kCLOCK_LPUART0102_ClockRoot_MuxSysPll3Div2;
 	rootCfg.div = 10;
 #endif
 
 #if defined(CONFIG_I2C_MCUX_LPI2C) && \
-	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c1)) \
-	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c2)))
+	(DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay) \
+	|| DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c2), okay))
 	/* Configure LPI2C0102 using SYS_PLL3_DIV2_CLK */
 	rootCfg.mux = kCLOCK_LPI2C0102_ClockRoot_MuxSysPll3Div2;
 	rootCfg.div = 4;
@@ -225,8 +225,8 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 
 #if defined(CONFIG_I2C_MCUX_LPI2C) && \
-	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c3)) \
-	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c4)))
+	(DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c3), okay) \
+	|| DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c4), okay))
 	/* Configure LPI2C0304 using SYS_PLL3_DIV2_CLK */
 	rootCfg.mux = kCLOCK_LPI2C0304_ClockRoot_MuxSysPll3Div2;
 	rootCfg.div = 4;
@@ -234,8 +234,8 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 
 #if defined(CONFIG_I2C_MCUX_LPI2C) && \
-	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c5)) \
-	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c6)))
+	(DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c5), okay) \
+	|| DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c6), okay))
 	/* Configure LPI2C0506 using SYS_PLL3_DIV2_CLK */
 	rootCfg.mux = kCLOCK_LPI2C0506_ClockRoot_MuxSysPll3Div2;
 	rootCfg.div = 4;
@@ -243,8 +243,8 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 
 #if defined(CONFIG_SPI_MCUX_LPSPI) && \
-	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpspi1)) \
-	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpspi2)))
+	(DT_NODE_HAS_STATUS(DT_NODELABEL(lpspi1), okay) \
+	|| DT_NODE_HAS_STATUS(DT_NODELABEL(lpspi2), okay))
 	/* Configure LPSPI0102 using SYS_PLL3_PFD1_CLK */
 	rootCfg.mux = kCLOCK_LPSPI0102_ClockRoot_MuxSysPll3Pfd1;
 	rootCfg.div = 2;
@@ -253,28 +253,28 @@ static ALWAYS_INLINE void clock_init(void)
 
 #if defined(CONFIG_COUNTER_MCUX_GPT)
 
-#if (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpt1)))
+#if (DT_NODE_HAS_STATUS(DT_NODELABEL(gpt1), okay))
 	/* Configure GPT1 using SYS_PLL3_DIV2_CLK */
 	rootCfg.mux = kCLOCK_GPT1_ClockRoot_MuxSysPll3Div2;
 	rootCfg.div = 1;
 	CLOCK_SetRootClock(kCLOCK_Root_Gpt1, &rootCfg);
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpt1)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpt1), okay) */
 
-#if (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpt2)))
+#if (DT_NODE_HAS_STATUS(DT_NODELABEL(gpt2), okay))
 	/* Configure GPT2 using SYS_PLL3_DIV2_CLK */
 	rootCfg.mux = kCLOCK_GPT2_ClockRoot_MuxSysPll3Div2;
 	rootCfg.div = 1;
 	CLOCK_SetRootClock(kCLOCK_Root_Gpt2, &rootCfg);
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpt2)) */
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpt2), okay) */
 
 #endif /* CONFIG_COUNTER_MCUX_GPT */
 
 #ifdef CONFIG_MCUX_ACMP
 
-#if (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(acmp1))  \
-	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(acmp2)) \
-	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(acmp3)) \
-	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(acmp4)))
+#if (DT_NODE_HAS_STATUS(DT_NODELABEL(acmp1), okay)  \
+	|| DT_NODE_HAS_STATUS(DT_NODELABEL(acmp2), okay) \
+	|| DT_NODE_HAS_STATUS(DT_NODELABEL(acmp3), okay) \
+	|| DT_NODE_HAS_STATUS(DT_NODELABEL(acmp4), okay))
 	/* Configure ACMP using MuxSysPll3Out */
 	rootCfg.mux = kCLOCK_ACMP_ClockRoot_MuxSysPll3Out;
 	rootCfg.div = 2;
diff --git a/soc/nxp/imxrt/imxrt11xx/soc.c b/soc/nxp/imxrt/imxrt11xx/soc.c
index 10ae6866d13..7648052177b 100644
--- a/soc/nxp/imxrt/imxrt11xx/soc.c
+++ b/soc/nxp/imxrt/imxrt11xx/soc.c
@@ -409,7 +409,7 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 
 #if CONFIG_ETH_MCUX || CONFIG_ETH_NXP_ENET
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay)
 	/* 50 MHz ENET clock */
 	rootCfg.mux = kCLOCK_ENET1_ClockRoot_MuxSysPll1Div2;
 	rootCfg.div = 10;
@@ -424,7 +424,7 @@ static ALWAYS_INLINE void clock_init(void)
 		(IOMUXC_GPR_GPR4_ENET_REF_CLK_DIR(0x01U) | IOMUXC_GPR_GPR4_ENET_TX_CLK_SEL(0x1U));
 #endif
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet1g))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet1g), okay)
 	rootCfg.mux = kCLOCK_ENET2_ClockRoot_MuxSysPll1Div2;
 #if DT_ENUM_HAS_VALUE(DT_CHILD(DT_NODELABEL(enet1g), ethernet), phy_connection_type, rgmii)
 	/* 125 MHz ENET1G clock */
@@ -491,13 +491,13 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 
 #ifdef CONFIG_CAN_MCUX_FLEXCAN
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcan1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcan1), okay)
 	/* Configure CAN1 using Osc48MDiv2 */
 	rootCfg.mux = kCLOCK_CAN1_ClockRoot_MuxOscRc48MDiv2;
 	rootCfg.div = 1;
 	CLOCK_SetRootClock(kCLOCK_Root_Can1, &rootCfg);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcan3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcan3), okay)
 	/* Configure CAN1 using Osc48MDiv2 */
 	rootCfg.mux = kCLOCK_CAN3_ClockRoot_MuxOscRc48MDiv2;
 	rootCfg.div = 1;
@@ -506,7 +506,7 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 
 #ifdef CONFIG_MCUX_ACMP
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(acmp1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(acmp1), okay)
 	/* Configure ACMP1 using Osc48MDiv2*/
 	rootCfg.mux = kCLOCK_ACMP_ClockRoot_MuxOscRc48MDiv2;
 	rootCfg.div = 1;
@@ -532,28 +532,28 @@ static ALWAYS_INLINE void clock_init(void)
 	CLOCK_SetRootClock(kCLOCK_Root_Gpt1, &rootCfg);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb1)) && (CONFIG_USB_DC_NXP_EHCI || CONFIG_UDC_NXP_EHCI)
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb1), okay) && (CONFIG_USB_DC_NXP_EHCI || CONFIG_UDC_NXP_EHCI)
 	CLOCK_EnableUsbhs0PhyPllClock(
 		kCLOCK_Usb480M, DT_PROP_BY_PHANDLE(DT_NODELABEL(usb1), clocks, clock_frequency));
 	CLOCK_EnableUsbhs0Clock(kCLOCK_Usb480M,
 				DT_PROP_BY_PHANDLE(DT_NODELABEL(usb1), clocks, clock_frequency));
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb1)) && CONFIG_USB_DC_NXP_EHCI
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb1), okay) && CONFIG_USB_DC_NXP_EHCI
 	USB_EhciPhyInit(kUSB_ControllerEhci0, CPU_XTAL_CLK_HZ, &usbPhyConfig);
 #endif
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb2)) && (CONFIG_USB_DC_NXP_EHCI || CONFIG_UDC_NXP_EHCI)
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb2), okay) && (CONFIG_USB_DC_NXP_EHCI || CONFIG_UDC_NXP_EHCI)
 	CLOCK_EnableUsbhs1PhyPllClock(
 		kCLOCK_Usb480M, DT_PROP_BY_PHANDLE(DT_NODELABEL(usb2), clocks, clock_frequency));
 	CLOCK_EnableUsbhs1Clock(kCLOCK_Usb480M,
 				DT_PROP_BY_PHANDLE(DT_NODELABEL(usb2), clocks, clock_frequency));
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb1)) && CONFIG_USB_DC_NXP_EHCI
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb1), okay) && CONFIG_USB_DC_NXP_EHCI
 	USB_EhciPhyInit(kUSB_ControllerEhci1, CPU_XTAL_CLK_HZ, &usbPhyConfig);
 #endif
 #endif
 
 #if CONFIG_IMX_USDHC
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc1), okay)
 	/* Configure USDHC1 using  SysPll2Pfd2*/
 	rootCfg.mux = kCLOCK_USDHC1_ClockRoot_MuxSysPll2Pfd2;
 	rootCfg.div = 2;
@@ -561,7 +561,7 @@ static ALWAYS_INLINE void clock_init(void)
 	CLOCK_EnableClock(kCLOCK_Usdhc1);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc2), okay)
 	/* Configure USDHC2 using  SysPll2Pfd2*/
 	rootCfg.mux = kCLOCK_USDHC2_ClockRoot_MuxSysPll2Pfd2;
 	rootCfg.div = 2;
@@ -571,7 +571,7 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 
 #if !(DT_NODE_HAS_COMPAT(DT_CHOSEN(zephyr_flash), nxp_imx_flexspi)) &&                             \
-	defined(CONFIG_MEMC_MCUX_FLEXSPI) && DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexspi))
+	defined(CONFIG_MEMC_MCUX_FLEXSPI) && DT_NODE_HAS_STATUS(DT_NODELABEL(flexspi), okay)
 	/* Configure FLEXSPI1 using OSC_RC_48M_DIV2 */
 	rootCfg.mux = kCLOCK_FLEXSPI1_ClockRoot_MuxOscRc48MDiv2;
 	rootCfg.div = 1;
diff --git a/soc/nxp/imxrt/imxrt5xx/cm33/soc.c b/soc/nxp/imxrt/imxrt5xx/cm33/soc.c
index 5d99d069da9..f4371511e4e 100644
--- a/soc/nxp/imxrt/imxrt5xx/cm33/soc.c
+++ b/soc/nxp/imxrt/imxrt5xx/cm33/soc.c
@@ -351,7 +351,7 @@ void __weak rt5xx_clock_init(void)
 	/* Switch CLKOUT to FRO_DIV2 */
 	CLOCK_AttachClk(kFRO_DIV2_to_CLKOUT);
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc0)) && CONFIG_IMX_USDHC
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc0), okay) && CONFIG_IMX_USDHC
 	/* Make sure USDHC ram buffer has been power up*/
 	POWER_DisablePD(kPDRUNCFG_APD_USDHC0_SRAM);
 	POWER_DisablePD(kPDRUNCFG_PPD_USDHC0_SRAM);
@@ -366,7 +366,7 @@ void __weak rt5xx_clock_init(void)
 	RESET_PeripheralReset(kSDIO0_RST_SHIFT_RSTn);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(smartdma)) && CONFIG_DMA_MCUX_SMARTDMA
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(smartdma), okay) && CONFIG_DMA_MCUX_SMARTDMA
 	/* Power up SMARTDMA ram */
 	POWER_DisablePD(kPDRUNCFG_APD_SMARTDMA_SRAM);
 	POWER_DisablePD(kPDRUNCFG_PPD_SMARTDMA_SRAM);
diff --git a/soc/nxp/imxrt/imxrt6xx/cm33/soc.c b/soc/nxp/imxrt/imxrt6xx/cm33/soc.c
index a81c8bc201a..9071a20bd68 100644
--- a/soc/nxp/imxrt/imxrt6xx/cm33/soc.c
+++ b/soc/nxp/imxrt/imxrt6xx/cm33/soc.c
@@ -286,7 +286,7 @@ static ALWAYS_INLINE void clock_init(void)
 	CLOCK_AttachClk(kNONE_to_WDT0_CLK);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc0)) && CONFIG_IMX_USDHC
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc0), okay) && CONFIG_IMX_USDHC
 	/* Make sure USDHC ram buffer has been power up*/
 	POWER_DisablePD(kPDRUNCFG_APD_USDHC0_SRAM);
 	POWER_DisablePD(kPDRUNCFG_PPD_USDHC0_SRAM);
@@ -343,7 +343,7 @@ static ALWAYS_INLINE void clock_init(void)
 #endif /* CONFIG_SOC_MIMXRT685S_CM33 */
 }
 
-#if (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc0)) && CONFIG_IMX_USDHC)
+#if (DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc0), okay) && CONFIG_IMX_USDHC)
 
 void imxrt_usdhc_pinmux(uint16_t nusdhc, bool init, uint32_t speed, uint32_t strength)
 {
diff --git a/soc/nxp/imxrt/imxrt6xx/cm33/soc.h b/soc/nxp/imxrt/imxrt6xx/cm33/soc.h
index 71e5d69544e..356b0e5727c 100644
--- a/soc/nxp/imxrt/imxrt6xx/cm33/soc.h
+++ b/soc/nxp/imxrt/imxrt6xx/cm33/soc.h
@@ -85,8 +85,8 @@ extern "C" {
 #endif
 
 #if CONFIG_IMX_USDHC &&					\
-	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc0)) ||	\
-	 DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usdhc1)))
+	(DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc0), okay) ||	\
+	 DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc1), okay))
 
 void imxrt_usdhc_pinmux(uint16_t nusdhc,
 	bool init, uint32_t speed, uint32_t strength);
diff --git a/soc/nxp/kinetis/k6x/soc.c b/soc/nxp/kinetis/k6x/soc.c
index 32832dc8a0a..c8eb6ba7870 100644
--- a/soc/nxp/kinetis/k6x/soc.c
+++ b/soc/nxp/kinetis/k6x/soc.c
@@ -101,7 +101,7 @@ static ALWAYS_INLINE void clock_init(void)
 
 	CLOCK_SetSimConfig(&simConfig);
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart0), okay)
 	CLOCK_SetLpuartClock(LPUART0SRC_OSCERCLK);
 #endif
 
diff --git a/soc/nxp/kinetis/ke1xf/soc.c b/soc/nxp/kinetis/ke1xf/soc.c
index 35968f6acf0..5d3e2291fe6 100644
--- a/soc/nxp/kinetis/ke1xf/soc.c
+++ b/soc/nxp/kinetis/ke1xf/soc.c
@@ -61,7 +61,7 @@ static const scg_sys_clk_config_t scg_sys_clk_config = {
 #endif
 };
 
-#if DT_NODE_HAS_STATUS_OKAY(SCG_CLOCK_NODE(sosc_clk))
+#if DT_NODE_HAS_STATUS(SCG_CLOCK_NODE(sosc_clk), okay)
 /* System Oscillator (SOSC) configuration */
 ASSERT_ASYNC_CLK_DIV_VALID(SCG_CLOCK_DIV(soscdiv1_clk),
 		       "Invalid SCG SOSC divider 1 value");
@@ -155,7 +155,7 @@ static ALWAYS_INLINE void clk_init(void)
 	};
 	scg_sys_clk_config_t current;
 
-#if DT_NODE_HAS_STATUS_OKAY(SCG_CLOCK_NODE(sosc_clk))
+#if DT_NODE_HAS_STATUS(SCG_CLOCK_NODE(sosc_clk), okay)
 	/* Optionally initialize system oscillator */
 	CLOCK_InitSysOsc(&scg_sosc_config);
 	CLOCK_SetXtal0Freq(scg_sosc_config.freq);
@@ -179,59 +179,59 @@ static ALWAYS_INLINE void clk_init(void)
 		CLOCK_GetCurSysClkConfig(&current);
 	} while (current.src != scg_sys_clk_config.src);
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart0), okay)
 	CLOCK_SetIpSrc(kCLOCK_Lpuart0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpuart0), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart1), okay)
 	CLOCK_SetIpSrc(kCLOCK_Lpuart1,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpuart1), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart2), okay)
 	CLOCK_SetIpSrc(kCLOCK_Lpuart2,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpuart2), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c0), okay)
 	CLOCK_SetIpSrc(kCLOCK_Lpi2c0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpi2c0), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay)
 	CLOCK_SetIpSrc(kCLOCK_Lpi2c1,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpi2c1), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpspi0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpspi0), okay)
 	CLOCK_SetIpSrc(kCLOCK_Lpspi0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpspi0), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpspi1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpspi1), okay)
 	CLOCK_SetIpSrc(kCLOCK_Lpspi1,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpspi1), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(adc0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc0), okay)
 	CLOCK_SetIpSrc(kCLOCK_Adc0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(adc0), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(adc1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc1), okay)
 	CLOCK_SetIpSrc(kCLOCK_Adc1,
 		       DT_CLOCKS_CELL(DT_NODELABEL(adc1), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(adc2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc2), okay)
 	CLOCK_SetIpSrc(kCLOCK_Adc2,
 		       DT_CLOCKS_CELL(DT_NODELABEL(adc2), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ftm0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ftm0), okay)
 	CLOCK_SetIpSrc(kCLOCK_Ftm0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(ftm0), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ftm1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ftm1), okay)
 	CLOCK_SetIpSrc(kCLOCK_Ftm1,
 		       DT_CLOCKS_CELL(DT_NODELABEL(ftm1), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ftm2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ftm2), okay)
 	CLOCK_SetIpSrc(kCLOCK_Ftm2,
 		       DT_CLOCKS_CELL(DT_NODELABEL(ftm2), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ftm3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ftm3), okay)
 	CLOCK_SetIpSrc(kCLOCK_Ftm3,
 		       DT_CLOCKS_CELL(DT_NODELABEL(ftm3), ip_source));
 #endif
diff --git a/soc/nxp/kinetis/ke1xz/soc.c b/soc/nxp/kinetis/ke1xz/soc.c
index 0f8ad0de6ac..5a6b443c1fe 100644
--- a/soc/nxp/kinetis/ke1xz/soc.c
+++ b/soc/nxp/kinetis/ke1xz/soc.c
@@ -106,39 +106,39 @@ static ALWAYS_INLINE void clk_init(void)
 		CLOCK_GetCurSysClkConfig(&current);
 	} while (current.src != scg_sys_clk_config.src);
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart0), okay)
 	CLOCK_SetIpSrc(kCLOCK_Lpuart0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpuart0), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart1), okay)
 	CLOCK_SetIpSrc(kCLOCK_Lpuart1,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpuart1), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart2), okay)
 	CLOCK_SetIpSrc(kCLOCK_Lpuart2,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpuart2), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c0), okay)
 	CLOCK_SetIpSrc(kCLOCK_Lpi2c0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpi2c0), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpi2c1), okay)
 	CLOCK_SetIpSrc(kCLOCK_Lpi2c1,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpi2c1), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexio))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexio), okay)
 	CLOCK_SetIpSrc(kCLOCK_Flexio0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(flexio), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpspi0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpspi0), okay)
 	CLOCK_SetIpSrc(kCLOCK_Lpspi0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpspi0), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpspi1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpspi1), okay)
 	CLOCK_SetIpSrc(kCLOCK_Lpspi1,
 		       DT_CLOCKS_CELL(DT_NODELABEL(lpspi1), ip_source));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(adc0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc0), okay)
 	CLOCK_SetIpSrc(kCLOCK_Adc0,
 		       DT_CLOCKS_CELL(DT_NODELABEL(adc0), ip_source));
 #endif
diff --git a/soc/nxp/kinetis/kl2x/soc.c b/soc/nxp/kinetis/kl2x/soc.c
index 8ab125d4c7c..71fe3d35a35 100644
--- a/soc/nxp/kinetis/kl2x/soc.c
+++ b/soc/nxp/kinetis/kl2x/soc.c
@@ -70,7 +70,7 @@ static ALWAYS_INLINE void clock_init(void)
 	CLOCK_SetInternalRefClkConfig(kMCG_IrclkEnable, kMCG_IrcSlow, 0);
 	CLOCK_SetSimConfig(&simConfig);
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(uart0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart0), okay)
 	CLOCK_SetLpsci0Clock(LPSCI0SRC_MCGFLLCLK);
 #endif
 #if CONFIG_USB_KINETIS || CONFIG_UDC_KINETIS
diff --git a/soc/nxp/kinetis/kwx/soc_kw4xz.c b/soc/nxp/kinetis/kwx/soc_kw4xz.c
index f6baedb07b7..4e33f4df5b8 100644
--- a/soc/nxp/kinetis/kwx/soc_kw4xz.c
+++ b/soc/nxp/kinetis/kwx/soc_kw4xz.c
@@ -67,14 +67,14 @@ static ALWAYS_INLINE void clock_init(void)
 
 	CLOCK_SetSimConfig(&simConfig);
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart0), okay)
 	CLOCK_SetLpuartClock(LPUART0SRC_OSCERCLK);
 #endif
 
 #if defined(CONFIG_PWM) && \
-	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm0)) || \
-	 DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm1)) || \
-	 DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pwm2)))
+	(DT_NODE_HAS_STATUS(DT_NODELABEL(pwm0), okay) || \
+	 DT_NODE_HAS_STATUS(DT_NODELABEL(pwm1), okay) || \
+	 DT_NODE_HAS_STATUS(DT_NODELABEL(pwm2), okay))
 	CLOCK_SetTpmClock(TPMSRC_MCGPLLCLK);
 #endif
 }
diff --git a/soc/nxp/lpc/lpc55xxx/soc.c b/soc/nxp/lpc/lpc55xxx/soc.c
index 1959b525e92..233ab0d9d82 100644
--- a/soc/nxp/lpc/lpc55xxx/soc.c
+++ b/soc/nxp/lpc/lpc55xxx/soc.c
@@ -193,7 +193,7 @@ static ALWAYS_INLINE void clock_init(void)
 	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM4);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(hs_lspi))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(hs_lspi), okay)
 	/* Attach 12 MHz clock to HSLSPI */
 	CLOCK_AttachClk(kFRO_HF_DIV_to_HSLSPI);
 #endif
diff --git a/soc/nxp/mcx/mcxc/soc.c b/soc/nxp/mcx/mcxc/soc.c
index 01b42984b31..00001999a49 100644
--- a/soc/nxp/mcx/mcxc/soc.c
+++ b/soc/nxp/mcx/mcxc/soc.c
@@ -88,7 +88,7 @@ static void clock_init(void)
 	/* Set SystemCoreClock variable. */
 	SystemCoreClock = DT_PROP(DT_NODELABEL(cpu0), clock_frequency);
 	/* Set LPUART0 clock source. */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpuart0), okay)
 	CLOCK_SetLpuart0Clock(LPUART_CLOCK_SEL(lpuart0));
 #endif
 }
diff --git a/soc/nxp/rw/power.c b/soc/nxp/rw/power.c
index f4176b6349c..1f0255a388f 100644
--- a/soc/nxp/rw/power.c
+++ b/soc/nxp/rw/power.c
@@ -28,11 +28,11 @@ LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 power_sleep_config_t slp_cfg;
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin0)) || DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pin0), okay) || DT_NODE_HAS_STATUS(DT_NODELABEL(pin1), okay)
 pinctrl_soc_pin_t pin_cfg;
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pin0), okay)
 static void pin0_isr(const struct device *dev)
 {
 	uint8_t level = ~(DT_ENUM_IDX(DT_NODELABEL(pin0), wakeup_level)) & 0x1;
@@ -44,7 +44,7 @@ static void pin0_isr(const struct device *dev)
 }
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pin1), okay)
 static void pin1_isr(const struct device *dev)
 {
 	uint8_t level = ~(DT_ENUM_IDX(DT_NODELABEL(pin1), wakeup_level)) & 0x1;
@@ -61,7 +61,7 @@ __weak void pm_state_set(enum pm_state state, uint8_t substate_id)
 {
 	ARG_UNUSED(substate_id);
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pin0), okay)
 	pin_cfg = IOMUX_GPIO_IDX(24) | IOMUX_TYPE(IOMUX_GPIO);
 	pinctrl_configure_pins(&pin_cfg, 1, 0);
 	POWER_ConfigWakeupPin(kPOWER_WakeupPin0, DT_ENUM_IDX(DT_NODELABEL(pin0), wakeup_level));
@@ -70,7 +70,7 @@ __weak void pm_state_set(enum pm_state state, uint8_t substate_id)
 	EnableIRQ(DT_IRQN(DT_NODELABEL(pin0)));
 	POWER_EnableWakeup(DT_IRQN(DT_NODELABEL(pin0)));
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pin1), okay)
 	pin_cfg = IOMUX_GPIO_IDX(25) | IOMUX_TYPE(IOMUX_GPIO);
 	pinctrl_configure_pins(&pin_cfg, 1, 0);
 	POWER_ConfigWakeupPin(kPOWER_WakeupPin1, DT_ENUM_IDX(DT_NODELABEL(pin1), wakeup_level));
@@ -119,7 +119,7 @@ void nxp_rw6xx_power_init(void)
 	slp_cfg.memPdCfg = suspend_sleepconfig[3];
 	slp_cfg.pm3BuckCfg = suspend_sleepconfig[4];
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pin0), okay)
 	/* PIN 0 uses GPIO0_24, confiure the pin as GPIO */
 	pin_cfg = IOMUX_GPIO_IDX(24) | IOMUX_TYPE(IOMUX_GPIO);
 	pinctrl_configure_pins(&pin_cfg, 1, 0);
@@ -131,7 +131,7 @@ void nxp_rw6xx_power_init(void)
 		    NULL, 0);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(pin1), okay)
 	/* PIN 1 uses GPIO0_25, confiure the pin as GPIO */
 	pin_cfg = IOMUX_GPIO_IDX(25) | IOMUX_TYPE(IOMUX_GPIO);
 	pinctrl_configure_pins(&pin_cfg, 1, 0);
diff --git a/soc/nxp/rw/soc.c b/soc/nxp/rw/soc.c
index 9d3b6c548f1..1a52626a053 100644
--- a/soc/nxp/rw/soc.c
+++ b/soc/nxp/rw/soc.c
@@ -221,7 +221,7 @@ __ramfunc void clock_init(void)
 #endif
 #endif /* CONFIG_SPI */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmic0)) && CONFIG_AUDIO_DMIC_MCUX
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(dmic0), okay) && CONFIG_AUDIO_DMIC_MCUX
 	/* Clock DMIC from Audio PLL. PLL output is sourced from AVPLL
 	 * channel 1, which is clocked at 12.288 MHz. We can divide this
 	 * by 4 to achieve the desired DMIC bit clk of 3.072 MHz
@@ -230,7 +230,7 @@ __ramfunc void clock_init(void)
 	CLOCK_SetClkDiv(kCLOCK_DivDmicClk, 4);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lcdic)) && CONFIG_MIPI_DBI_NXP_LCDIC
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lcdic), okay) && CONFIG_MIPI_DBI_NXP_LCDIC
 	CLOCK_AttachClk(kMAIN_CLK_to_LCD_CLK);
 	RESET_PeripheralReset(kLCDIC_RST_SHIFT_RSTn);
 #endif
@@ -250,7 +250,7 @@ __ramfunc void clock_init(void)
 #endif
 #endif /* CONFIG_COUNTER_MCUX_CTIMER */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb_otg)) && CONFIG_USB_DC_NXP_EHCI
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usb_otg), okay) && CONFIG_USB_DC_NXP_EHCI
 	/* Enable system xtal from Analog */
 	SYSCTL2->ANA_GRP_CTRL |= SYSCTL2_ANA_GRP_CTRL_PU_AG_MASK;
 	/* reset USB */
@@ -261,7 +261,7 @@ __ramfunc void clock_init(void)
 	CLOCK_EnableUsbhsPhyClock();
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet)) && CONFIG_NET_L2_ETHERNET
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay) && CONFIG_NET_L2_ETHERNET
 	RESET_PeripheralReset(kENET_IPG_RST_SHIFT_RSTn);
 	RESET_PeripheralReset(kENET_IPG_S_RST_SHIFT_RSTn);
 #endif
@@ -289,7 +289,7 @@ void soc_early_init_hook(void)
 #define PMU_RESET_CAUSES \
 	COND_CODE_0(IS_EMPTY(PMU_RESET_CAUSES_), (PMU_RESET_CAUSES_), (0))
 #define WDT_RESET \
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(wwdt), (kPOWER_ResetSourceWdt), (0))
+	COND_CODE_1(DT_NODE_HAS_STATUS(wwdt, okay), (kPOWER_ResetSourceWdt), (0))
 #define RESET_CAUSES \
 	(PMU_RESET_CAUSES | WDT_RESET)
 #else
diff --git a/soc/openisa/rv32m1/soc.c b/soc/openisa/rv32m1/soc.c
index 0f41fc69ca6..95edf0c5383 100644
--- a/soc/openisa/rv32m1/soc.c
+++ b/soc/openisa/rv32m1/soc.c
@@ -197,16 +197,16 @@ static void rv32m1_switch_to_sirc(void)
  */
 static void rv32m1_setup_peripheral_clocks(void)
 {
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(tpm0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(tpm0), okay)
 	CLOCK_SetIpSrc(kCLOCK_Tpm0, kCLOCK_IpSrcFircAsync);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(tpm1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(tpm1), okay)
 	CLOCK_SetIpSrc(kCLOCK_Tpm1, kCLOCK_IpSrcFircAsync);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(tpm2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(tpm2), okay)
 	CLOCK_SetIpSrc(kCLOCK_Tpm2, kCLOCK_IpSrcFircAsync);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(tpm3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(tpm3), okay)
 	CLOCK_SetIpSrc(kCLOCK_Tpm3, kCLOCK_IpSrcFircAsync);
 #endif
 }
diff --git a/soc/renesas/ra/ra4m1/soc.c b/soc/renesas/ra/ra4m1/soc.c
index 7d8f2744914..7f021ba17fa 100644
--- a/soc/renesas/ra/ra4m1/soc.c
+++ b/soc/renesas/ra/ra4m1/soc.c
@@ -107,7 +107,7 @@ const struct opt_set_mem ops __attribute__((section(".opt_set_mem"))) = {
 		.LVDAS = 0x1, /* Disable voltage monitor 0 following reset */
 		.VDSEL1 = 0x3,
 		.RSVD2 = 0x3,
-		.HOCOEN = !DT_NODE_HAS_STATUS_OKAY(DT_PATH(clocks, hoco)),
+		.HOCOEN = !DT_NODE_HAS_STATUS(DT_PATH(clocks, hoco), okay),
 		.RSVD3 = 0x7,
 		.HOCOFRQ1 = OFS1_HOCO_FREQ,
 		.RSVD4 = 0x1ffff,
diff --git a/soc/renesas/smartbond/da1469x/power.c b/soc/renesas/smartbond/da1469x/power.c
index fec9b5f6c62..80a497acff5 100644
--- a/soc/renesas/smartbond/da1469x/power.c
+++ b/soc/renesas/smartbond/da1469x/power.c
@@ -48,7 +48,7 @@ void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
 static int renesas_da1469x_pm_init(void)
 {
 	static const struct da1469x_sleep_config sleep_cfg = {
-		.enable_xtal_on_wakeup = DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(xtal32m)),
+		.enable_xtal_on_wakeup = DT_NODE_HAS_STATUS(DT_NODELABEL(xtal32m), okay),
 	};
 
 	da1469x_sleep_config(&sleep_cfg);
diff --git a/soc/snps/emsk/soc_config.c b/soc/snps/emsk/soc_config.c
index 5c18898ecd2..c43942facb0 100644
--- a/soc/snps/emsk/soc_config.c
+++ b/soc/snps/emsk/soc_config.c
@@ -17,14 +17,14 @@ void soc_early_init_hook(void)
 	/* On ARC EM Starter kit board,
 	 * send the UART the command to clear the interrupt
 	 */
-#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, ns16550))
+#if DT_NODE_HAS_STATUS(DT_INST(0, ns16550), okay)
 	sys_write32(0, DT_REG_ADDR(DT_INST(0, ns16550))+0x4);
 	sys_write32(0, DT_REG_ADDR(DT_INST(0, ns16550))+0x10);
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_INST(0, ns16550)) */
-#if DT_NODE_HAS_STATUS_OKAY(DT_INST(1, ns16550))
+#endif /* DT_NODE_HAS_STATUS(DT_INST(0, ns16550), okay) */
+#if DT_NODE_HAS_STATUS(DT_INST(1, ns16550), okay)
 	sys_write32(0, DT_REG_ADDR(DT_INST(1, ns16550))+0x4);
 	sys_write32(0, DT_REG_ADDR(DT_INST(1, ns16550))+0x10);
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_INST(1, ns16550)) */
+#endif /* DT_NODE_HAS_STATUS(DT_INST(1, ns16550), okay) */
 }
 
 #endif /* CONFIG_UART_NS16550 */
diff --git a/soc/st/stm32/stm32h7x/mpu_regions.c b/soc/st/stm32/stm32h7x/mpu_regions.c
index 8582db60724..29825ad226a 100644
--- a/soc/st/stm32/stm32h7x/mpu_regions.c
+++ b/soc/st/stm32/stm32h7x/mpu_regions.c
@@ -21,8 +21,8 @@ static const struct arm_mpu_region mpu_regions[] = {
 					REGION_512K |
 					MPU_RASR_XN_Msk | P_RW_U_NA_Msk) }),
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(mac))
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sram3))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(mac), okay)
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(sram3), okay)
 	MPU_REGION_ENTRY("SRAM3_ETH_BUF",
 					 DT_REG_ADDR(DT_NODELABEL(sram3)),
 					 REGION_RAM_NOCACHE_ATTR(REGION_16K)),
diff --git a/soc/xlnx/zynq7000/xc7zxxx/soc.c b/soc/xlnx/zynq7000/xc7zxxx/soc.c
index c1dad84ff36..37d30b02426 100644
--- a/soc/xlnx/zynq7000/xc7zxxx/soc.c
+++ b/soc/xlnx/zynq7000/xc7zxxx/soc.c
@@ -39,13 +39,13 @@ static const struct arm_mmu_region mmu_regions[] = {
 	/* ARM Arch timer, GIC are covered by the MPCore mapping */
 
 /* GEMs */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gem0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gem0), okay)
 	MMU_REGION_FLAT_ENTRY("gem0",
 			      DT_REG_ADDR(DT_NODELABEL(gem0)),
 			      DT_REG_SIZE(DT_NODELABEL(gem0)),
 			      MT_DEVICE | MATTR_SHARED | MPERM_R | MPERM_W),
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gem1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gem1), okay)
 	MMU_REGION_FLAT_ENTRY("gem1",
 			      DT_REG_ADDR(DT_NODELABEL(gem1)),
 			      DT_REG_SIZE(DT_NODELABEL(gem1)),
@@ -53,7 +53,7 @@ static const struct arm_mmu_region mmu_regions[] = {
 #endif
 
 /* GPIO controller */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(psgpio))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(psgpio), okay)
 	MMU_REGION_FLAT_ENTRY("psgpio",
 			      DT_REG_ADDR(DT_NODELABEL(psgpio)),
 			      DT_REG_SIZE(DT_NODELABEL(psgpio)),
@@ -106,7 +106,7 @@ void soc_reset_hook(void)
 	sctlr &= ~SCTLR_A_Msk;
 	__set_SCTLR(sctlr);
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(slcr))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(slcr), okay)
 	mm_reg_t addr = DT_REG_ADDR(DT_NODELABEL(slcr));
 
 	/* Unlock System Level Control Registers (SLCR) */
diff --git a/soc/xlnx/zynq7000/xc7zxxxs/soc.c b/soc/xlnx/zynq7000/xc7zxxxs/soc.c
index 982ee094e01..a46d9a21784 100644
--- a/soc/xlnx/zynq7000/xc7zxxxs/soc.c
+++ b/soc/xlnx/zynq7000/xc7zxxxs/soc.c
@@ -39,13 +39,13 @@ static const struct arm_mmu_region mmu_regions[] = {
 	/* ARM Arch timer, GIC are covered by the MPCore mapping */
 
 /* GEMs */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gem0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gem0), okay)
 	MMU_REGION_FLAT_ENTRY("gem0",
 			      DT_REG_ADDR(DT_NODELABEL(gem0)),
 			      DT_REG_SIZE(DT_NODELABEL(gem0)),
 			      MT_DEVICE | MATTR_SHARED | MPERM_R | MPERM_W),
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gem1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(gem1), okay)
 	MMU_REGION_FLAT_ENTRY("gem1",
 			      DT_REG_ADDR(DT_NODELABEL(gem1)),
 			      DT_REG_SIZE(DT_NODELABEL(gem1)),
@@ -53,7 +53,7 @@ static const struct arm_mmu_region mmu_regions[] = {
 #endif
 
 /* GPIO controller */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(psgpio))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(psgpio), okay)
 	MMU_REGION_FLAT_ENTRY("psgpio",
 			      DT_REG_ADDR(DT_NODELABEL(psgpio)),
 			      DT_REG_SIZE(DT_NODELABEL(psgpio)),
@@ -106,7 +106,7 @@ void soc_reset_hook(void)
 	sctlr &= ~SCTLR_A_Msk;
 	__set_SCTLR(sctlr);
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(slcr))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(slcr), okay)
 	mm_reg_t addr = DT_REG_ADDR(DT_NODELABEL(slcr));
 
 	/* Unlock System Level Control Registers (SLCR) */
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_fem.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_fem.h
index a80de9f85e5..b9ada56b5ab 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_fem.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_fem.h
@@ -17,9 +17,9 @@
 
 #if DT_NODE_HAS_PROP(DT_NODELABEL(radio), fem)
 #define FEM_NODE             DT_PHANDLE(DT_NODELABEL(radio), fem)
-#if DT_NODE_HAS_STATUS_OKAY(FEM_NODE)
+#if DT_NODE_HAS_STATUS(FEM_NODE, okay)
 #define HAL_RADIO_HAVE_FEM
-#endif	/* DT_NODE_HAS_STATUS_OKAY(FEM_NODE) */
+#endif	/* DT_NODE_HAS_STATUS(FEM_NODE, okay) */
 #endif	/* DT_NODE_HAS_PROP(DT_NODELABEL(radio), fem)) */
 
 /* Does FEM_NODE have a particular DT compatible? */
diff --git a/subsys/pm/policy.c b/subsys/pm/policy.c
index 39742cdf38c..b13017f1603 100644
--- a/subsys/pm/policy.c
+++ b/subsys/pm/policy.c
@@ -77,8 +77,8 @@ struct pm_state_device_constraint {
  * @brief Helper macro to define a device pm constraints.
  */
 #define PM_STATE_CONSTRAINT_DEFINE(i, node_id)                                  \
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_PHANDLE_BY_IDX(node_id,          \
-		zephyr_disabling_power_states, i)),                             \
+	COND_CODE_1(DT_NODE_HAS_STATUS(DT_PHANDLE_BY_IDX(node_id,               \
+		zephyr_disabling_power_states, i), okay),                       \
 		(PM_STATE_CONSTRAINT_INIT(DT_PHANDLE_BY_IDX(node_id,            \
 		zephyr_disabling_power_states, i)),), ())
 
diff --git a/subsys/tracing/sysview/sysview_config.c b/subsys/tracing/sysview/sysview_config.c
index 0ef395e4516..e68cb4f8a79 100644
--- a/subsys/tracing/sysview/sysview_config.c
+++ b/subsys/tracing/sysview/sysview_config.c
@@ -97,7 +97,7 @@ void SEGGER_SYSVIEW_Conf(void)
 	SEGGER_SYSVIEW_Init(sys_clock_hw_cycles_per_sec(),
 			    sys_clock_hw_cycles_per_sec(),
 			    &SYSVIEW_X_OS_TraceAPI, cbSendSystemDesc);
-#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_sram))
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_sram), okay)
 	SEGGER_SYSVIEW_SetRAMBase(DT_REG_ADDR(DT_CHOSEN(zephyr_sram)));
 #else
 	/* Setting RAMBase is just an optimization: this value is subtracted
diff --git a/subsys/usb/device/usb_device.c b/subsys/usb/device/usb_device.c
index c285817e8ed..e3a065fae1a 100644
--- a/subsys/usb/device/usb_device.c
+++ b/subsys/usb/device/usb_device.c
@@ -1295,7 +1295,7 @@ static void forward_status_cb(enum usb_dc_status_code status, const uint8_t *par
 static int usb_vbus_set(bool on)
 {
 #define USB_DEV_NODE DT_CHOSEN(zephyr_usb_device)
-#if DT_NODE_HAS_STATUS_OKAY(USB_DEV_NODE) && \
+#if DT_NODE_HAS_STATUS(USB_DEV_NODE, okay) && \
     DT_NODE_HAS_PROP(USB_DEV_NODE, vbus_gpios)
 	int ret = 0;
 	struct gpio_dt_spec gpio_dev = GPIO_DT_SPEC_GET(USB_DEV_NODE, vbus_gpios);
diff --git a/tests/bluetooth/host/id/mocks/zephyr/linker/linker-defs.h b/tests/bluetooth/host/id/mocks/zephyr/linker/linker-defs.h
index 7bd7faa7935..f2f32310870 100644
--- a/tests/bluetooth/host/id/mocks/zephyr/linker/linker-defs.h
+++ b/tests/bluetooth/host/id/mocks/zephyr/linker/linker-defs.h
@@ -10,10 +10,6 @@
 #undef DT_NODE_HAS_STATUS
 #endif
 
-#ifdef DT_NODE_HAS_STATUS_OKAY
-#undef DT_NODE_HAS_STATUS_OKAY
-#endif
-
 #ifdef DT_FOREACH_OKAY_HELPER
 #undef DT_FOREACH_OKAY_HELPER
 #endif
diff --git a/tests/drivers/adc/adc_api/src/test_adc.c b/tests/drivers/adc/adc_api/src/test_adc.c
index e7d1958cd5a..7d778cc6ef7 100644
--- a/tests/drivers/adc/adc_api/src/test_adc.c
+++ b/tests/drivers/adc/adc_api/src/test_adc.c
@@ -55,7 +55,7 @@ const struct device *get_adc_device(void)
 	return adc_channels[0].dev;
 }
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(test_counter)) && \
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(test_counter), okay) && \
 	defined(CONFIG_COUNTER)
 static void init_counter(void)
 {
@@ -90,7 +90,7 @@ static void init_adc(void)
 		m_sample_buffer[i] = INVALID_ADC_VALUE;
 	}
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(test_counter)) && \
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(test_counter), okay) && \
 	defined(CONFIG_COUNTER)
 	init_counter();
 #endif
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_adc.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_adc.c
index 4ff7aec59db..fd28729a376 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_adc.c
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_adc.c
@@ -10,7 +10,7 @@
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include <zephyr/logging/log.h>
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(adc1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc1), okay)
 
 #undef DT_DRV_COMPAT
 #define DT_DRV_COMPAT st_stm32_adc
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_i2c.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_i2c.c
index 5a1f1998289..05a6dc0528f 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_i2c.c
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_i2c.c
@@ -11,7 +11,7 @@
 #include <zephyr/logging/log.h>
 
 #if !defined(CONFIG_SOC_SERIES_STM32F4X)
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay)
 
 #if DT_HAS_COMPAT_STATUS_OKAY(st_stm32_i2c_v1)
 #define DT_DRV_COMPAT st_stm32_i2c_v1
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_i2s.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_i2s.c
index c4d9c37726b..4235f04207b 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_i2s.c
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_i2s.c
@@ -10,7 +10,7 @@
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include <zephyr/logging/log.h>
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2s2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2s2), okay)
 
 #if DT_HAS_COMPAT_STATUS_OKAY(st_stm32_i2s)
 #define DT_DRV_COMPAT st_stm32_i2s
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_lptim.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_lptim.c
index 0b04e0882e2..3c85739dce9 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_lptim.c
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_lptim.c
@@ -10,7 +10,7 @@
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include <zephyr/logging/log.h>
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lptim1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lptim1), okay)
 
 #undef DT_DRV_COMPAT
 #define DT_DRV_COMPAT st_stm32_lptim
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32h7_devices/src/test_stm32_clock_configuration.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32h7_devices/src/test_stm32_clock_configuration.c
index aaa86026df4..d7b05edd7f6 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32h7_devices/src/test_stm32_clock_configuration.c
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32h7_devices/src/test_stm32_clock_configuration.c
@@ -80,7 +80,7 @@ ZTEST(stm32h7_devices_clocks, test_spi_clk_config)
 					RCC_SPI123CLKSOURCE_CLKP, spi1_actual_domain_clk);
 
 			/* Check perclk configuration */
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(perck))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(perck), okay)
 			uint32_t perclk_dt_domain_clk, perclk_actual_domain_clk;
 
 			perclk_dt_domain_clk = DT_CLOCKS_CELL_BY_IDX(DT_NODELABEL(perck), 0, bus);
diff --git a/tests/drivers/eeprom/api/src/main.c b/tests/drivers/eeprom/api/src/main.c
index 5d311b7567d..5a14565cccb 100644
--- a/tests/drivers/eeprom/api/src/main.c
+++ b/tests/drivers/eeprom/api/src/main.c
@@ -185,9 +185,9 @@ void test_main(void)
 {
 	run_tests_on_eeprom(DEVICE_DT_GET(DT_ALIAS(eeprom_0)));
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(eeprom_1))
+#if DT_NODE_HAS_STATUS(DT_ALIAS(eeprom_1), okay)
 	run_tests_on_eeprom(DEVICE_DT_GET(DT_ALIAS(eeprom_1)));
-#endif /* DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(eeprom_1)) */
+#endif /* DT_NODE_HAS_STATUS(DT_ALIAS(eeprom_1), okay) */
 
 	ztest_verify_all_test_suites_ran();
 }
diff --git a/tests/drivers/gpio/gpio_basic_api/src/main.c b/tests/drivers/gpio/gpio_basic_api/src/main.c
index 3e11722cf8c..67326505e98 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/main.c
+++ b/tests/drivers/gpio/gpio_basic_api/src/main.c
@@ -20,7 +20,7 @@
 
 static void board_setup(void)
 {
-#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, test_gpio_basic_api))
+#if DT_NODE_HAS_STATUS(DT_INST(0, test_gpio_basic_api), okay)
 	/* PIN_IN and PIN_OUT must be on same controller. */
 	const struct device *const in_dev = DEVICE_DT_GET(DEV_OUT);
 	const struct device *const out_dev = DEVICE_DT_GET(DEV_IN);
diff --git a/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h b/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
index 78709937089..ba3d3ae5eba 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
+++ b/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
@@ -12,7 +12,7 @@
 #include <zephyr/sys/util.h>
 #include <zephyr/ztest.h>
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, test_gpio_basic_api))
+#if DT_NODE_HAS_STATUS(DT_INST(0, test_gpio_basic_api), okay)
 
 /* Execution of the test requires hardware configuration described in
  * devicetree.  See the test,gpio_basic_api binding local to this test
@@ -29,11 +29,11 @@
 #define PIN_IN DT_GPIO_PIN(DT_INST(0, test_gpio_basic_api), in_gpios)
 #define PIN_IN_FLAGS DT_GPIO_FLAGS(DT_INST(0, test_gpio_basic_api), in_gpios)
 
-#elif DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(gpio_0))
+#elif DT_NODE_HAS_STATUS(DT_ALIAS(gpio_0), okay)
 #define DEV DT_GPIO_CTLR(DT_ALIAS(gpio_0))
-#elif DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(gpio_1))
+#elif DT_NODE_HAS_STATUS(DT_ALIAS(gpio_1), okay)
 #define DEV DT_GPIO_CTLR(DT_ALIAS(gpio_1))
-#elif DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(gpio_3))
+#elif DT_NODE_HAS_STATUS(DT_ALIAS(gpio_3), okay)
 #define DEV DT_GPIO_CTLR(DT_ALIAS(gpio_3))
 #else
 #error Unsupported board
diff --git a/tests/drivers/gpio/gpio_reserved_ranges/src/main.c b/tests/drivers/gpio/gpio_reserved_ranges/src/main.c
index 351a525d2ea..1a56df9adc0 100644
--- a/tests/drivers/gpio/gpio_reserved_ranges/src/main.c
+++ b/tests/drivers/gpio/gpio_reserved_ranges/src/main.c
@@ -33,12 +33,12 @@ ZTEST(gpio_reserved_ranges, test_path_props)
 
 ZTEST(gpio_reserved_ranges, test_has_status)
 {
-	zassert_equal(DT_NODE_HAS_STATUS_OKAY(TEST_GPIO_1), 1, "");
-	zassert_equal(DT_NODE_HAS_STATUS_OKAY(TEST_GPIO_2), 1, "");
-	zassert_equal(DT_NODE_HAS_STATUS_OKAY(TEST_GPIO_3), 1, "");
-	zassert_equal(DT_NODE_HAS_STATUS_OKAY(TEST_GPIO_4), 1, "");
-	zassert_equal(DT_NODE_HAS_STATUS_OKAY(TEST_GPIO_5), 1, "");
-	zassert_equal(DT_NODE_HAS_STATUS_OKAY(TEST_GPIO_6), 1, "");
+	zassert_equal(DT_NODE_HAS_STATUS(TEST_GPIO_1, okay), 1, "");
+	zassert_equal(DT_NODE_HAS_STATUS(TEST_GPIO_2, okay), 1, "");
+	zassert_equal(DT_NODE_HAS_STATUS(TEST_GPIO_3, okay), 1, "");
+	zassert_equal(DT_NODE_HAS_STATUS(TEST_GPIO_4, okay), 1, "");
+	zassert_equal(DT_NODE_HAS_STATUS(TEST_GPIO_5, okay), 1, "");
+	zassert_equal(DT_NODE_HAS_STATUS(TEST_GPIO_6, okay), 1, "");
 }
 
 ZTEST(gpio_reserved_ranges, test_reserved_ranges)
diff --git a/tests/drivers/i2c/i2c_api/src/test_i2c.c b/tests/drivers/i2c/i2c_api/src/test_i2c.c
index ce0256b4500..9ed4162b04b 100644
--- a/tests/drivers/i2c/i2c_api/src/test_i2c.c
+++ b/tests/drivers/i2c/i2c_api/src/test_i2c.c
@@ -16,11 +16,11 @@
 #include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(i2c_0))
+#if DT_NODE_HAS_STATUS(DT_ALIAS(i2c_0), okay)
 #define I2C_DEV_NODE DT_ALIAS(i2c_0)
-#elif DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(i2c_1))
+#elif DT_NODE_HAS_STATUS(DT_ALIAS(i2c_1), okay)
 #define I2C_DEV_NODE DT_ALIAS(i2c_1)
-#elif DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(i2c_2))
+#elif DT_NODE_HAS_STATUS(DT_ALIAS(i2c_2), okay)
 #define I2C_DEV_NODE DT_ALIAS(i2c_2)
 #else
 #error "Please set the correct I2C device"
diff --git a/tests/drivers/i2c/i2c_ram/src/test_i2c_ram.c b/tests/drivers/i2c/i2c_ram/src/test_i2c_ram.c
index 8fb39de2517..3992897d90f 100644
--- a/tests/drivers/i2c/i2c_ram/src/test_i2c_ram.c
+++ b/tests/drivers/i2c/i2c_ram/src/test_i2c_ram.c
@@ -20,7 +20,7 @@
 
 #define RAM_ADDR (0b10100010 >> 1)
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(i2c_ram))
+#if DT_NODE_HAS_STATUS(DT_ALIAS(i2c_ram), okay)
 #define I2C_DEV_NODE	DT_ALIAS(i2c_ram)
 #define TX_DATA_OFFSET 2
 static uint8_t tx_data[9] = {0x00, 0x00, 'Z', 'e', 'p', 'h', 'y', 'r', '\n'};
diff --git a/tests/drivers/i2c/i2c_tca954x/src/main.c b/tests/drivers/i2c/i2c_tca954x/src/main.c
index c5433f93a4a..5524b1ed4dd 100644
--- a/tests/drivers/i2c/i2c_tca954x/src/main.c
+++ b/tests/drivers/i2c/i2c_tca954x/src/main.c
@@ -8,13 +8,13 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/i2c.h>
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(i2c_channel_0))
+#if DT_NODE_HAS_STATUS(DT_ALIAS(i2c_channel_0), okay)
 #define I2C_0_CTRL_NODE_ID      DT_ALIAS(i2c_channel_0)
 #else
 #error "I2C 0 controller device not found"
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(i2c_channel_1))
+#if DT_NODE_HAS_STATUS(DT_ALIAS(i2c_channel_1), okay)
 #define I2C_1_CTRL_NODE_ID      DT_ALIAS(i2c_channel_1)
 #else
 #error "I2C 1 controller device not found"
diff --git a/tests/drivers/memc/ram/src/main.c b/tests/drivers/memc/ram/src/main.c
index 666f422da51..c8de856aa46 100644
--- a/tests/drivers/memc/ram/src/main.c
+++ b/tests/drivers/memc/ram/src/main.c
@@ -32,23 +32,23 @@ static void test_ram_rw(uint32_t *mem, size_t size)
 	}
 }
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sdram1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(sdram1), okay)
 BUF_DEF(sdram1);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sdram2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(sdram2), okay)
 BUF_DEF(sdram2);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sram1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(sram1), okay)
 BUF_DEF(sram1);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sram2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(sram2), okay)
 BUF_DEF(sram2);
 #endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(memc))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(memc), okay)
 BUF_DEF(psram);
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ram0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ram0), okay)
 #define RAM_SIZE DT_REG_SIZE(DT_NODELABEL(ram0))
 static uint32_t *buf_ram0 = (uint32_t *)DT_REG_ADDR(DT_NODELABEL(ram0));
 #endif
@@ -57,7 +57,7 @@ ZTEST_SUITE(test_ram, NULL, NULL, NULL, NULL, NULL);
 
 ZTEST(test_ram, test_sdram1)
 {
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sdram1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(sdram1), okay)
 	test_ram_rw(buf_sdram1, BUF_SIZE);
 #else
 	ztest_test_skip();
@@ -66,7 +66,7 @@ ZTEST(test_ram, test_sdram1)
 
 ZTEST(test_ram, test_ram0)
 {
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ram0))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(ram0), okay)
 	test_ram_rw(buf_ram0, RAM_SIZE);
 #else
 	ztest_test_skip();
@@ -75,7 +75,7 @@ ZTEST(test_ram, test_ram0)
 
 ZTEST(test_ram, test_sdram2)
 {
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sdram2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(sdram2), okay)
 	test_ram_rw(buf_sdram2, BUF_SIZE);
 #else
 	ztest_test_skip();
@@ -84,7 +84,7 @@ ZTEST(test_ram, test_sdram2)
 
 ZTEST(test_ram, test_sram1)
 {
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sram1))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(sram1), okay)
 	test_ram_rw(buf_sram1, BUF_SIZE);
 #else
 	ztest_test_skip();
@@ -93,7 +93,7 @@ ZTEST(test_ram, test_sram1)
 
 ZTEST(test_ram, test_sram2)
 {
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sram2))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(sram2), okay)
 	test_ram_rw(buf_sram2, BUF_SIZE);
 #else
 	ztest_test_skip();
@@ -102,7 +102,7 @@ ZTEST(test_ram, test_sram2)
 
 ZTEST(test_ram, test_psram)
 {
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(memc))
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(memc), okay)
 	test_ram_rw(buf_psram, BUF_SIZE);
 #else
 	ztest_test_skip();
diff --git a/tests/drivers/pwm/pwm_api/src/test_pwm.c b/tests/drivers/pwm/pwm_api/src/test_pwm.c
index 69a4dcaeacc..b5fc72b37e8 100644
--- a/tests/drivers/pwm/pwm_api/src/test_pwm.c
+++ b/tests/drivers/pwm/pwm_api/src/test_pwm.c
@@ -29,13 +29,13 @@
 #include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(pwm_0))
+#if DT_NODE_HAS_STATUS(DT_ALIAS(pwm_0), okay)
 #define PWM_DEV_NODE DT_ALIAS(pwm_0)
-#elif DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(pwm_1))
+#elif DT_NODE_HAS_STATUS(DT_ALIAS(pwm_1), okay)
 #define PWM_DEV_NODE DT_ALIAS(pwm_1)
-#elif DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(pwm_2))
+#elif DT_NODE_HAS_STATUS(DT_ALIAS(pwm_2), okay)
 #define PWM_DEV_NODE DT_ALIAS(pwm_2)
-#elif DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(pwm_3))
+#elif DT_NODE_HAS_STATUS(DT_ALIAS(pwm_3), okay)
 #define PWM_DEV_NODE DT_ALIAS(pwm_3)
 
 #elif DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_pwm)
diff --git a/tests/drivers/smbus/smbus_api/src/test_smbus.c b/tests/drivers/smbus/smbus_api/src/test_smbus.c
index 7743e04fbda..5d1dd9ca49a 100644
--- a/tests/drivers/smbus/smbus_api/src/test_smbus.c
+++ b/tests/drivers/smbus/smbus_api/src/test_smbus.c
@@ -14,7 +14,7 @@
 
 #include <smbus_utils.h>
 
-BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(smbus0)),
+BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_NODELABEL(smbus0), okay),
 	     "SMBus node is disabled!");
 
 #define FAKE_ADDRESS	0x10
diff --git a/tests/drivers/smbus/smbus_api/src/test_smbus_qemu.c b/tests/drivers/smbus/smbus_api/src/test_smbus_qemu.c
index 182794e7dc9..74d8ba4408e 100644
--- a/tests/drivers/smbus/smbus_api/src/test_smbus_qemu.c
+++ b/tests/drivers/smbus/smbus_api/src/test_smbus_qemu.c
@@ -16,7 +16,7 @@
 #include <zephyr/ztest.h>
 #include <zephyr/drivers/smbus.h>
 
-BUILD_ASSERT(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(smbus0)),
+BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_NODELABEL(smbus0), okay),
 	     "SMBus node is disabled!");
 
 /* Qemu q35 has default emulated EEPROM-like devices */
diff --git a/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c b/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c
index 353d189db54..3166176de43 100644
--- a/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c
+++ b/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c
@@ -66,7 +66,7 @@
  * 'watchdog0' property, or one of the following watchdog compatibles
  * must have an enabled node.
  */
-#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(watchdog0))
+#if DT_NODE_HAS_STATUS(DT_ALIAS(watchdog0), okay)
 #define WDT_NODE DT_ALIAS(watchdog0)
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_window_watchdog)
 #define WDT_NODE DT_INST(0, st_stm32_window_watchdog)
@@ -148,7 +148,7 @@ static struct wdt_timeout_cfg m_cfg_wdt1;
 #define DATATYPE uint32_t
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm))
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
 #define NOINIT_SECTION ".dtcm_noinit.test_wdt"
 #else
 #define NOINIT_SECTION ".noinit.test_wdt"
diff --git a/tests/drivers/watchdog/wdt_basic_reset_none/src/main.c b/tests/drivers/watchdog/wdt_basic_reset_none/src/main.c
index 9fa3e0bd752..6a025a1478c 100644
--- a/tests/drivers/watchdog/wdt_basic_reset_none/src/main.c
+++ b/tests/drivers/watchdog/wdt_basic_reset_none/src/main.c
@@ -13,7 +13,7 @@
  * 'watchdog0' property, or one of the following watchdog compatibles
  * must have an enabled node.
  */
-#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(watchdog0))
+#if DT_NODE_HAS_STATUS(DT_ALIAS(watchdog0), okay)
 #define WDT_NODE DT_ALIAS(watchdog0)
 #elif DT_HAS_COMPAT_STATUS_OKAY(nxp_s32_swt)
 #define WDT_NODE DT_INST(0, nxp_s32_swt)
diff --git a/tests/drivers/watchdog/wdt_error_cases/src/main.c b/tests/drivers/watchdog/wdt_error_cases/src/main.c
index b05bedf01c3..c1adc43eea3 100644
--- a/tests/drivers/watchdog/wdt_error_cases/src/main.c
+++ b/tests/drivers/watchdog/wdt_error_cases/src/main.c
@@ -13,7 +13,7 @@
  * 'watchdog0' property, or one of the following watchdog compatibles
  * must have an enabled node.
  */
-#if DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(watchdog0))
+#if DT_NODE_HAS_STATUS(DT_ALIAS(watchdog0), okay)
 #define WDT_NODE DT_ALIAS(watchdog0)
 #elif DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_wdt)
 #define WDT_NODE DT_INST(0, nordic_nrf_wdt)
@@ -21,7 +21,7 @@
 #define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(zephyr_counter_watchdog)
 #endif
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm))
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
 #define NOINIT_SECTION ".dtcm_noinit.test_wdt"
 #else
 #define NOINIT_SECTION ".noinit.test_wdt"

From e066187df91e2e3f9bf63fe75875ef4b134812fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:34 +0100
Subject: [PATCH 1522/2913] Revert "[nrf fromtree] devicetree: add
 `DT_NODE_HAS_STATUS_OKAY`"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit dd57835df6039b2019f8a8fa8923efd5c07d86cb.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/devicetree.h         | 22 ----------------------
 tests/lib/devicetree/api/src/main.c | 11 -----------
 2 files changed, 33 deletions(-)

diff --git a/include/zephyr/devicetree.h b/include/zephyr/devicetree.h
index eb894a1f9a9..38c5656079c 100644
--- a/include/zephyr/devicetree.h
+++ b/include/zephyr/devicetree.h
@@ -3403,28 +3403,6 @@
 #define DT_NODE_HAS_STATUS(node_id, status) \
 	DT_NODE_HAS_STATUS_INTERNAL(node_id, status)
 
-/**
- * @brief Does a node identifier refer to a node with a status `okay`?
- *
- * Example uses:
- *
- * @code{.c}
- *     DT_NODE_HAS_STATUS_OKAY(DT_PATH(soc, i2c_12340000))
- * @endcode
- *
- * Tests whether a node identifier refers to a node which:
- *
- * - exists in the devicetree, and
- * - has a status property as `okay`
- *
- * As usual, both a missing status and an `ok` status are treated as
- * `okay`.
- *
- * @param node_id a node identifier
- * @return 1 if the node has status as `okay`, 0 otherwise.
- */
-#define DT_NODE_HAS_STATUS_OKAY(node_id) DT_NODE_HAS_STATUS(node_id, okay)
-
 /**
  * @brief Does the devicetree have a status `okay` node with a compatible?
  *
diff --git a/tests/lib/devicetree/api/src/main.c b/tests/lib/devicetree/api/src/main.c
index aacbc16b404..9de03524d8a 100644
--- a/tests/lib/devicetree/api/src/main.c
+++ b/tests/lib/devicetree/api/src/main.c
@@ -366,17 +366,6 @@ ZTEST(devicetree_api, test_has_status)
 		      0, "");
 }
 
-ZTEST(devicetree_api, test_has_status_okay)
-{
-	zassert_equal(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(test_gpio_1)), 1);
-
-	zassert_equal(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(test_no_status)), 1);
-
-	zassert_equal(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(disabled_gpio)), 0);
-
-	zassert_equal(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(reserved_gpio)), 0);
-}
-
 ZTEST(devicetree_api, test_bus)
 {
 	int pin, flags;

From 62e0b60a8c280814bf0dca384929d1b9dc808d9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:34 +0100
Subject: [PATCH 1523/2913] Revert "[nrf fromtree] drivers: kinetis-pinctrl:
 Account for SCG K4"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit caa01767d22d85d0c1ef284b8b6b67f799aacad1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/pinctrl/pinctrl_kinetis.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/pinctrl/pinctrl_kinetis.c b/drivers/pinctrl/pinctrl_kinetis.c
index 7a8151c7be1..13b0c8ac720 100644
--- a/drivers/pinctrl/pinctrl_kinetis.c
+++ b/drivers/pinctrl/pinctrl_kinetis.c
@@ -76,13 +76,9 @@ static int pinctrl_mcux_init(const struct device *dev)
 }
 
 #if DT_NODE_HAS_STATUS(DT_INST(0, nxp_kinetis_sim), okay)
-#define PINCTRL_MCUX_DT_INST_CLOCK_SUBSYS(n)                                                       \
-	CLK_GATE_DEFINE(DT_INST_CLOCKS_CELL(n, offset), DT_INST_CLOCKS_CELL(n, bits))
-#elif DT_HAS_COMPAT_STATUS_OKAY(nxp_scg_k4)
-#define PINCTRL_MCUX_DT_INST_CLOCK_SUBSYS(n)                                                       \
-	(DT_INST_CLOCKS_CELL(n, mrcc_offset) == 0                                                  \
-		 ? 0                                                                               \
-		 : MAKE_MRCC_REGADDR(MRCC_BASE, DT_INST_CLOCKS_CELL(n, mrcc_offset)))
+#define PINCTRL_MCUX_DT_INST_CLOCK_SUBSYS(n) \
+	CLK_GATE_DEFINE(DT_INST_CLOCKS_CELL(n, offset), \
+			DT_INST_CLOCKS_CELL(n, bits))
 #else
 #define PINCTRL_MCUX_DT_INST_CLOCK_SUBSYS(n) \
 	DT_INST_CLOCKS_CELL(n, name)

From 7aa75fef4f8a0360845a86d6d96f478280917ba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:34 +0100
Subject: [PATCH 1524/2913] Revert "[nrf fromtree] soc: nxp: move init code
 from SYS_INIT to hooks"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 145d15b4fb6ac85b3425a593e8d9fe52b78aae66.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nxp/imx/imx6sx/Kconfig           |  1 -
 soc/nxp/imx/imx6sx/soc.c             |  6 +++++-
 soc/nxp/imx/imx7d/Kconfig            |  1 -
 soc/nxp/imx/imx7d/soc.c              |  6 +++++-
 soc/nxp/imx/imx8m/Kconfig            |  5 -----
 soc/nxp/imx/imx8m/a53/soc.c          |  6 +++++-
 soc/nxp/imx/imx8m/m4_mini/soc.c      |  6 +++++-
 soc/nxp/imx/imx8m/m4_quad/soc.c      |  6 +++++-
 soc/nxp/imx/imx8m/m7/soc.c           |  6 +++++-
 soc/nxp/imxrt/imxrt10xx/Kconfig      |  3 +--
 soc/nxp/imxrt/imxrt10xx/lpm_rt1064.c |  6 +++++-
 soc/nxp/imxrt/imxrt10xx/power.c      |  7 ++++++-
 soc/nxp/imxrt/imxrt10xx/soc.c        | 18 ++++++++----------
 soc/nxp/imxrt/imxrt118x/Kconfig      |  1 -
 soc/nxp/imxrt/imxrt118x/soc.c        |  6 +++++-
 soc/nxp/imxrt/imxrt5xx/Kconfig       |  1 -
 soc/nxp/imxrt/imxrt5xx/cm33/power.c  |  7 ++++++-
 soc/nxp/imxrt/imxrt5xx/cm33/soc.c    | 12 ++++++------
 soc/nxp/imxrt/imxrt6xx/Kconfig       |  1 -
 soc/nxp/imxrt/imxrt6xx/cm33/soc.c    |  8 +++++++-
 soc/nxp/kinetis/k2x/Kconfig          |  1 -
 soc/nxp/kinetis/k2x/soc.c            |  6 +++++-
 soc/nxp/kinetis/k6x/Kconfig          |  1 -
 soc/nxp/kinetis/k6x/soc.c            |  7 ++++++-
 soc/nxp/kinetis/k8x/Kconfig          |  1 -
 soc/nxp/kinetis/k8x/soc.c            |  6 +++++-
 soc/nxp/kinetis/ke1xf/Kconfig        |  1 -
 soc/nxp/kinetis/ke1xf/soc.c          |  6 +++++-
 soc/nxp/kinetis/ke1xz/Kconfig        |  1 -
 soc/nxp/kinetis/ke1xz/soc.c          |  6 +++++-
 soc/nxp/kinetis/kl2x/Kconfig         |  1 -
 soc/nxp/kinetis/kl2x/soc.c           |  6 +++++-
 soc/nxp/kinetis/kv5x/Kconfig         |  1 -
 soc/nxp/kinetis/kv5x/soc.c           |  6 +++++-
 soc/nxp/kinetis/kwx/Kconfig          |  1 -
 soc/nxp/kinetis/kwx/soc_kw2xd.c      |  6 +++++-
 soc/nxp/kinetis/kwx/soc_kw4xz.c      |  6 +++++-
 soc/nxp/lpc/lpc51u68/Kconfig         |  1 -
 soc/nxp/lpc/lpc51u68/soc.c           |  8 +++++++-
 soc/nxp/mcx/mcxc/Kconfig             |  1 -
 soc/nxp/mcx/mcxc/soc.c               |  5 ++++-
 soc/nxp/rw/Kconfig                   |  1 -
 soc/nxp/rw/power.c                   |  6 +++++-
 soc/nxp/rw/soc.c                     | 12 +++++++-----
 soc/nxp/s32/s32k1/Kconfig            |  1 -
 soc/nxp/s32/s32k1/soc.c              |  6 +++++-
 soc/nxp/s32/s32k3/Kconfig            |  1 -
 soc/nxp/s32/s32k3/soc.c              |  6 +++++-
 soc/nxp/s32/s32ze/Kconfig            |  1 -
 soc/nxp/s32/s32ze/soc.c              |  6 +++++-
 50 files changed, 158 insertions(+), 73 deletions(-)

diff --git a/soc/nxp/imx/imx6sx/Kconfig b/soc/nxp/imx/imx6sx/Kconfig
index f83d462be4c..901b2c90a64 100644
--- a/soc/nxp/imx/imx6sx/Kconfig
+++ b/soc/nxp/imx/imx6sx/Kconfig
@@ -9,7 +9,6 @@ config SOC_SERIES_IMX6SX
 	select CPU_HAS_FPU
 	select CPU_HAS_ARM_MPU
 	select CLOCK_CONTROL
-	select SOC_EARLY_INIT_HOOK
 
 config SOC_MCIMX6X_M4
 	select HAS_IMX_HAL
diff --git a/soc/nxp/imx/imx6sx/soc.c b/soc/nxp/imx/imx6sx/soc.c
index 11cbac10002..a968e5d5cb1 100644
--- a/soc/nxp/imx/imx6sx/soc.c
+++ b/soc/nxp/imx/imx6sx/soc.c
@@ -287,7 +287,7 @@ static void SOC_ClockInit(void)
  *
  * @return 0
  */
-void soc_early_init_hook(void)
+static int mcimx6x_m4_init(void)
 {
 	/* Configure RDC */
 	SOC_RdcInit();
@@ -300,4 +300,8 @@ void soc_early_init_hook(void)
 
 	/* Initialize clock */
 	SOC_ClockInit();
+
+	return 0;
 }
+
+SYS_INIT(mcimx6x_m4_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/imx/imx7d/Kconfig b/soc/nxp/imx/imx7d/Kconfig
index 1aa97734285..fbebe524242 100644
--- a/soc/nxp/imx/imx7d/Kconfig
+++ b/soc/nxp/imx/imx7d/Kconfig
@@ -8,7 +8,6 @@ config SOC_SERIES_IMX7D
 	select CLOCK_CONTROL
 	select CPU_HAS_FPU
 	select CPU_HAS_ARM_MPU
-	select SOC_EARLY_INIT_HOOK
 
 config SOC_MCIMX7D_M4
 	select HAS_IMX_HAL
diff --git a/soc/nxp/imx/imx7d/soc.c b/soc/nxp/imx/imx7d/soc.c
index df3ee95f2e1..5ebf3ec0738 100644
--- a/soc/nxp/imx/imx7d/soc.c
+++ b/soc/nxp/imx/imx7d/soc.c
@@ -222,7 +222,7 @@ static void nxp_mcimx7_mu_config(void)
 }
 #endif /* CONFIG_IPM_IMX */
 
-void soc_early_init_hook(void)
+static int nxp_mcimx7_init(void)
 {
 
 	/* SoC specific RDC settings */
@@ -250,4 +250,8 @@ void soc_early_init_hook(void)
 #ifdef CONFIG_IPM_IMX
 	nxp_mcimx7_mu_config();
 #endif /* CONFIG_IPM_IMX */
+
+	return 0;
 }
+
+SYS_INIT(nxp_mcimx7_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/imx/imx8m/Kconfig b/soc/nxp/imx/imx8m/Kconfig
index a1344a8c38e..fe206de1527 100644
--- a/soc/nxp/imx/imx8m/Kconfig
+++ b/soc/nxp/imx/imx8m/Kconfig
@@ -10,7 +10,6 @@ config SOC_MIMX8MM6_A53
 	select HAS_MCUX_IOMUXC if PINCTRL
 	select HAS_MCUX_RDC
 	select HAS_MCUX_CACHE
-	select SOC_PREP_HOOK
 
 config SOC_MIMX8MM6_M4
 	select ARM
@@ -22,7 +21,6 @@ config SOC_MIMX8MM6_M4
 	select HAS_MCUX_RDC
 	select HAS_MCUX_IGPIO
 	select HAS_MCUX_IOMUXC
-	select SOC_EARLY_INIT_HOOK
 
 config SOC_MIMX8ML8_A53
 	select ARM64
@@ -33,7 +31,6 @@ config SOC_MIMX8ML8_A53
 	select HAS_MCUX_IOMUXC if PINCTRL
 	select HAS_MCUX_RDC
 	select HAS_MCUX_CACHE
-	select SOC_PREP_HOOK
 
 config SOC_MIMX8MN6_A53
 	select ARM64
@@ -44,7 +41,6 @@ config SOC_MIMX8MN6_A53
 	select HAS_MCUX_IOMUXC if PINCTRL
 	select HAS_MCUX_RDC
 	select HAS_MCUX_CACHE
-	select SOC_PREP_HOOK
 
 config SOC_MIMX8ML8_ADSP
 	select XTENSA
@@ -75,7 +71,6 @@ config SOC_MIMX8ML8_M7
 	select ARM_MPU
 	select HAS_MCUX_IGPIO
 	select HAS_MCUX_IOMUXC
-	select SOC_EARLY_INIT_HOOK
 
 config SOC_MIMX8MQ6_M4
 	select ARM
diff --git a/soc/nxp/imx/imx8m/a53/soc.c b/soc/nxp/imx/imx8m/a53/soc.c
index a20ae395f18..c5eaa312370 100644
--- a/soc/nxp/imx/imx8m/a53/soc.c
+++ b/soc/nxp/imx/imx8m/a53/soc.c
@@ -52,7 +52,11 @@ static void soc_rdc_init(void)
 
 #endif
 
-void soc_prep_hook(void)
+static int soc_init(void)
 {
 	soc_rdc_init();
+
+	return 0;
 }
+
+SYS_INIT(soc_init, EARLY, 1);
diff --git a/soc/nxp/imx/imx8m/m4_mini/soc.c b/soc/nxp/imx/imx8m/m4_mini/soc.c
index 784c39fcc04..fab49d98bff 100644
--- a/soc/nxp/imx/imx8m/m4_mini/soc.c
+++ b/soc/nxp/imx/imx8m/m4_mini/soc.c
@@ -148,7 +148,7 @@ static void SOC_ClockInit(void)
 	CLOCK_EnableClock(kCLOCK_Sec_Debug);
 }
 
-void soc_early_init_hook(void)
+static int nxp_mimx8mm6_init(void)
 {
 
 	/* SoC specific RDC settings */
@@ -156,4 +156,8 @@ void soc_early_init_hook(void)
 
 	/* SoC specific Clock settings */
 	SOC_ClockInit();
+
+	return 0;
 }
+
+SYS_INIT(nxp_mimx8mm6_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/imx/imx8m/m4_quad/soc.c b/soc/nxp/imx/imx8m/m4_quad/soc.c
index 031121bc424..e2849f62fe4 100644
--- a/soc/nxp/imx/imx8m/m4_quad/soc.c
+++ b/soc/nxp/imx/imx8m/m4_quad/soc.c
@@ -111,7 +111,7 @@ static void SOC_ClockInit(void)
 	CLOCK_EnableClock(kCLOCK_Sec_Debug);
 }
 
-void soc_early_init_hook(void)
+static int nxp_mimx8mq6_init(void)
 {
 
 	/* SoC specific RDC settings */
@@ -119,4 +119,8 @@ void soc_early_init_hook(void)
 
 	/* SoC specific Clock settings */
 	SOC_ClockInit();
+
+	return 0;
 }
+
+SYS_INIT(nxp_mimx8mq6_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/imx/imx8m/m7/soc.c b/soc/nxp/imx/imx8m/m7/soc.c
index 683d550b149..724368eac37 100644
--- a/soc/nxp/imx/imx8m/m7/soc.c
+++ b/soc/nxp/imx/imx8m/m7/soc.c
@@ -203,7 +203,7 @@ static void gpio_init(void)
 #endif
 }
 
-void soc_early_init_hook(void)
+static int nxp_mimx8ml8_init(void)
 {
 
 	/* SoC specific RDC settings */
@@ -213,4 +213,8 @@ void soc_early_init_hook(void)
 	SOC_ClockInit();
 
 	gpio_init();
+
+	return 0;
 }
+
+SYS_INIT(nxp_mimx8ml8_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/imxrt/imxrt10xx/Kconfig b/soc/nxp/imxrt/imxrt10xx/Kconfig
index c86f946aab8..05eb7b5e8ac 100644
--- a/soc/nxp/imxrt/imxrt10xx/Kconfig
+++ b/soc/nxp/imxrt/imxrt10xx/Kconfig
@@ -6,6 +6,7 @@ config SOC_SERIES_IMXRT10XX
 	select CPU_CORTEX_M_HAS_DWT
 	select CPU_HAS_ICACHE
 	select CPU_HAS_DCACHE
+	select SOC_RESET_HOOK
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
 	select ARM
 	select CLOCK_CONTROL
@@ -28,8 +29,6 @@ config SOC_SERIES_IMXRT10XX
 	select HAS_MCUX_USB_EHCI
 	select HAS_SWO
 	select HAS_PM
-	select SOC_RESET_HOOK
-	select SOC_EARLY_INIT_HOOK
 
 config SOC_MIMXRT1011
 	select CPU_HAS_FPU
diff --git a/soc/nxp/imxrt/imxrt10xx/lpm_rt1064.c b/soc/nxp/imxrt/imxrt10xx/lpm_rt1064.c
index ad850f138f9..c7cc46d0307 100644
--- a/soc/nxp/imxrt/imxrt10xx/lpm_rt1064.c
+++ b/soc/nxp/imxrt/imxrt10xx/lpm_rt1064.c
@@ -339,7 +339,7 @@ void clock_lpm_init(void)
 	XTALOSC24M->OSC_CONFIG1 = tmp_reg;
 }
 
-void imxrt_lpm_init(void)
+static int imxrt_lpm_init(void)
 {
 
 	struct clock_callbacks callbacks;
@@ -464,4 +464,8 @@ void imxrt_lpm_init(void)
 
 	/* Install LPM callbacks */
 	imxrt_clock_pm_callbacks_register(&callbacks);
+	return 0;
 }
+
+
+SYS_INIT(imxrt_lpm_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/imxrt/imxrt10xx/power.c b/soc/nxp/imxrt/imxrt10xx/power.c
index 5936b70e02a..fac3180c0db 100644
--- a/soc/nxp/imxrt/imxrt10xx/power.c
+++ b/soc/nxp/imxrt/imxrt10xx/power.c
@@ -240,7 +240,7 @@ void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
 }
 
 /* Initialize power system */
-void rt10xx_power_init(void)
+static int rt10xx_power_init(void)
 {
 	dcdc_internal_regulator_config_t reg_config;
 
@@ -268,4 +268,9 @@ void rt10xx_power_init(void)
 
 	/* Enable high gate drive on power FETs to reduce leakage current */
 	PMU_CoreEnableIncreaseGateDrive(PMU, true);
+
+
+	return 0;
 }
+
+SYS_INIT(rt10xx_power_init, PRE_KERNEL_2, 0);
diff --git a/soc/nxp/imxrt/imxrt10xx/soc.c b/soc/nxp/imxrt/imxrt10xx/soc.c
index d8a11dafd34..9b197163567 100644
--- a/soc/nxp/imxrt/imxrt10xx/soc.c
+++ b/soc/nxp/imxrt/imxrt10xx/soc.c
@@ -332,29 +332,25 @@ void imxrt_audio_codec_pll_init(uint32_t clock_name, uint32_t clk_src,
 }
 #endif
 
-extern void rt10xx_power_init(void);
-extern void imxrt_lpm_init(void);
-
 /**
  *
  * @brief Perform basic hardware initialization
  *
  * Initialize the interrupt controller device drivers.
  * Also initialize the timer device driver, if required.
+ *
+ * @return 0
  */
-void soc_early_init_hook(void)
+
+static int imxrt_init(void)
 {
 	sys_cache_instr_enable();
 	sys_cache_data_enable();
 
 	/* Initialize system clock */
 	clock_init();
-#ifdef CONFIG_PM
-#ifdef CONFIG_SOC_MIMXRT1064
-	imxrt_lpm_init();
-#endif
-	rt10xx_power_init();
-#endif
+
+	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -369,3 +365,5 @@ void soc_reset_hook(void)
 #endif
 }
 #endif
+
+SYS_INIT(imxrt_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/imxrt/imxrt118x/Kconfig b/soc/nxp/imxrt/imxrt118x/Kconfig
index 8dc3afe19f9..10c8180c300 100644
--- a/soc/nxp/imxrt/imxrt118x/Kconfig
+++ b/soc/nxp/imxrt/imxrt118x/Kconfig
@@ -21,7 +21,6 @@ config SOC_SERIES_IMXRT118X
 	select HAS_MCUX_IOMUXC
 	select HAS_SWO
 	select HAS_MCUX_FLEXSPI
-	select SOC_EARLY_INIT_HOOK
 
 config SOC_MIMXRT1189_CM33
 	select CPU_CORTEX_M33
diff --git a/soc/nxp/imxrt/imxrt118x/soc.c b/soc/nxp/imxrt/imxrt118x/soc.c
index 85299643de7..2576c858b9e 100644
--- a/soc/nxp/imxrt/imxrt118x/soc.c
+++ b/soc/nxp/imxrt/imxrt118x/soc.c
@@ -394,7 +394,7 @@ static ALWAYS_INLINE void trdc_enable_all_access(void)
  * @return 0
  */
 
-void soc_early_init_hook(void)
+static int imxrt_init(void)
 {
 	/* Initialize system clock */
 	clock_init();
@@ -409,6 +409,8 @@ void soc_early_init_hook(void)
 #endif
 	__ISB();
 	__DSB();
+
+	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -417,3 +419,5 @@ void soc_reset_hook(void)
 	SystemInit();
 }
 #endif
+
+SYS_INIT(imxrt_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/imxrt/imxrt5xx/Kconfig b/soc/nxp/imxrt/imxrt5xx/Kconfig
index 81ccd78df6e..dcaf50b03b1 100644
--- a/soc/nxp/imxrt/imxrt5xx/Kconfig
+++ b/soc/nxp/imxrt/imxrt5xx/Kconfig
@@ -31,7 +31,6 @@ config SOC_MIMXRT595S_CM33
 	select HAS_MCUX_USDHC2
 	select HAS_MCUX_USB_LPCIP3511
 	select HAS_MCUX_CTIMER
-	select SOC_EARLY_INIT_HOOK
 
 config SOC_MIMXRT595S_F1
 	select XTENSA
diff --git a/soc/nxp/imxrt/imxrt5xx/cm33/power.c b/soc/nxp/imxrt/imxrt5xx/cm33/power.c
index 30911cbb22d..3599dcfa646 100644
--- a/soc/nxp/imxrt/imxrt5xx/cm33/power.c
+++ b/soc/nxp/imxrt/imxrt5xx/cm33/power.c
@@ -61,8 +61,10 @@ void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
 }
 
 /* Initialize power system */
-void rt5xx_power_init(void)
+static int rt5xx_power_init(void)
 {
+	int ret = 0;
+
 	/* This function is called to set vddcore low voltage detection
 	 * falling trip voltage, this is not impacting the voltage in anyway.
 	 */
@@ -73,4 +75,7 @@ void rt5xx_power_init(void)
 	POWER_UpdatePmicRecoveryTime(1);
 #endif
 
+	return ret;
 }
+
+SYS_INIT(rt5xx_power_init, PRE_KERNEL_2, 0);
diff --git a/soc/nxp/imxrt/imxrt5xx/cm33/soc.c b/soc/nxp/imxrt/imxrt5xx/cm33/soc.c
index f4371511e4e..c10b404ed48 100644
--- a/soc/nxp/imxrt/imxrt5xx/cm33/soc.c
+++ b/soc/nxp/imxrt/imxrt5xx/cm33/soc.c
@@ -511,16 +511,16 @@ void __weak imxrt_deinit_display_interface(void)
 
 #endif
 
-extern void rt5xx_power_init(void);
-
 /**
  *
  * @brief Perform basic hardware initialization
  *
  * Initialize the interrupt controller device drivers.
  * Also initialize the timer device driver, if required.
+ *
+ * @return 0
  */
-void soc_early_init_hook(void)
+static int nxp_rt500_init(void)
 {
 	/* Initialize clocks with tool generated code */
 	rt5xx_clock_init();
@@ -536,8 +536,8 @@ void soc_early_init_hook(void)
 	IOPCTL->PIO[1][15] = 0;
 	IOPCTL->PIO[3][28] = 0;
 	IOPCTL->PIO[3][29] = 0;
-#ifdef CONFIG_PM
-	rt5xx_power_init();
-#endif
 
+	return 0;
 }
+
+SYS_INIT(nxp_rt500_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/imxrt/imxrt6xx/Kconfig b/soc/nxp/imxrt/imxrt6xx/Kconfig
index 831b8b1b1ab..b68855292e3 100644
--- a/soc/nxp/imxrt/imxrt6xx/Kconfig
+++ b/soc/nxp/imxrt/imxrt6xx/Kconfig
@@ -30,7 +30,6 @@ config SOC_MIMXRT685S_CM33
 	select INIT_SYS_PLL
 	select HAS_MCUX_USB_LPCIP3511
 	select HAS_MCUX_CTIMER
-	select SOC_EARLY_INIT_HOOK
 
 if SOC_SERIES_IMXRT6XX
 
diff --git a/soc/nxp/imxrt/imxrt6xx/cm33/soc.c b/soc/nxp/imxrt/imxrt6xx/cm33/soc.c
index 9071a20bd68..d829558754e 100644
--- a/soc/nxp/imxrt/imxrt6xx/cm33/soc.c
+++ b/soc/nxp/imxrt/imxrt6xx/cm33/soc.c
@@ -360,9 +360,11 @@ void imxrt_usdhc_dat3_pull(bool pullup)
  *
  * Initialize the interrupt controller device drivers.
  * Also initialize the timer device driver, if required.
+ *
+ * @return 0
  */
 
-void soc_early_init_hook(void)
+static int nxp_rt600_init(void)
 {
 	/* Initialize clock */
 	clock_init();
@@ -370,6 +372,8 @@ void soc_early_init_hook(void)
 #ifndef CONFIG_IMXRT6XX_CODE_CACHE
 	CACHE64_DisableCache(CACHE64);
 #endif
+
+	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -396,3 +400,5 @@ void soc_reset_hook(void)
 }
 
 #endif
+
+SYS_INIT(nxp_rt600_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/kinetis/k2x/Kconfig b/soc/nxp/kinetis/k2x/Kconfig
index f89d6c86b4c..cf61f57132b 100644
--- a/soc/nxp/kinetis/k2x/Kconfig
+++ b/soc/nxp/kinetis/k2x/Kconfig
@@ -14,7 +14,6 @@ config SOC_SERIES_KINETIS_K2X
 	select CPU_CORTEX_M_HAS_DWT
 	select CLOCK_CONTROL
 	select SOC_RESET_HOOK
-	select SOC_EARLY_INIT_HOOK
 
 config SOC_MK22F51212
 	select HAS_MCUX
diff --git a/soc/nxp/kinetis/k2x/soc.c b/soc/nxp/kinetis/k2x/soc.c
index e89526f5556..82aecf9b687 100644
--- a/soc/nxp/kinetis/k2x/soc.c
+++ b/soc/nxp/kinetis/k2x/soc.c
@@ -118,13 +118,15 @@ static ALWAYS_INLINE void clock_init(void)
  * @return 0
  */
 
-void soc_early_init_hook(void)
+static int fsl_frdm_k22f_init(void)
 {
 	/* release I/O power hold to allow normal run state */
 	PMC->REGSC |= PMC_REGSC_ACKISO_MASK;
 
 	/* Initialize PLL/system clock to 120 MHz */
 	clock_init();
+
+	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -135,3 +137,5 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
+
+SYS_INIT(fsl_frdm_k22f_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/kinetis/k6x/Kconfig b/soc/nxp/kinetis/k6x/Kconfig
index af342ae30ca..5ec9c9acf21 100644
--- a/soc/nxp/kinetis/k6x/Kconfig
+++ b/soc/nxp/kinetis/k6x/Kconfig
@@ -11,7 +11,6 @@ config SOC_SERIES_KINETIS_K6X
 	select HAS_MCUX_PIT
 	select CLOCK_CONTROL
 	select SOC_RESET_HOOK
-	select SOC_EARLY_INIT_HOOK
 
 config SOC_MK64F12
 	select HAS_MCUX
diff --git a/soc/nxp/kinetis/k6x/soc.c b/soc/nxp/kinetis/k6x/soc.c
index c8eb6ba7870..41708af7954 100644
--- a/soc/nxp/kinetis/k6x/soc.c
+++ b/soc/nxp/kinetis/k6x/soc.c
@@ -124,9 +124,10 @@ static ALWAYS_INLINE void clock_init(void)
  * Initialize the interrupt controller device drivers.
  * Also initialize the timer device driver, if required.
  *
+ * @return 0
  */
 
-void soc_early_init_hook(void)
+static int k6x_init(void)
 {
 #if !defined(CONFIG_ARM_MPU)
 	uint32_t temp_reg;
@@ -161,6 +162,8 @@ void soc_early_init_hook(void)
 #endif
 	/* Initialize PLL/system clock up to 180 MHz */
 	clock_init();
+
+	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -171,3 +174,5 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
+
+SYS_INIT(k6x_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/kinetis/k8x/Kconfig b/soc/nxp/kinetis/k8x/Kconfig
index bf30d20797e..649300c3dba 100644
--- a/soc/nxp/kinetis/k8x/Kconfig
+++ b/soc/nxp/kinetis/k8x/Kconfig
@@ -27,7 +27,6 @@ config SOC_SERIES_KINETIS_K8X
 	select HAS_MCUX_RCM
 	select HAS_MCUX_CACHE
 	select SOC_RESET_HOOK
-	select SOC_EARLY_INIT_HOOK
 
 if SOC_SERIES_KINETIS_K8X
 
diff --git a/soc/nxp/kinetis/k8x/soc.c b/soc/nxp/kinetis/k8x/soc.c
index d338ad72a96..19d6f2df341 100644
--- a/soc/nxp/kinetis/k8x/soc.c
+++ b/soc/nxp/kinetis/k8x/soc.c
@@ -92,7 +92,7 @@ static ALWAYS_INLINE void clk_init(void)
 #endif
 }
 
-void soc_early_init_hook(void)
+static int k8x_init(void)
 {
 #if !defined(CONFIG_ARM_MPU)
 	uint32_t temp_reg;
@@ -116,6 +116,8 @@ void soc_early_init_hook(void)
 
 	/* Initialize system clocks and PLL */
 	clk_init();
+
+	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -126,3 +128,5 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
+
+SYS_INIT(k8x_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/kinetis/ke1xf/Kconfig b/soc/nxp/kinetis/ke1xf/Kconfig
index b3cf86dd935..a89888edaad 100644
--- a/soc/nxp/kinetis/ke1xf/Kconfig
+++ b/soc/nxp/kinetis/ke1xf/Kconfig
@@ -30,7 +30,6 @@ config SOC_SERIES_KINETIS_KE1XF
 	select HAS_MCUX_PWT
 	select HAS_MCUX_RCM
 	select SOC_RESET_HOOK
-	select SOC_EARLY_INIT_HOOK
 	select HAS_PM
 
 config SOC_MKE16F16
diff --git a/soc/nxp/kinetis/ke1xf/soc.c b/soc/nxp/kinetis/ke1xf/soc.c
index 5d3e2291fe6..7ada4249dfa 100644
--- a/soc/nxp/kinetis/ke1xf/soc.c
+++ b/soc/nxp/kinetis/ke1xf/soc.c
@@ -237,7 +237,7 @@ static ALWAYS_INLINE void clk_init(void)
 #endif
 }
 
-void soc_early_init_hook(void)
+static int ke1xf_init(void)
 
 {
 #if !defined(CONFIG_ARM_MPU)
@@ -264,6 +264,8 @@ void soc_early_init_hook(void)
 	/* SystemInit will have enabled the code cache. Disable it here */
 	L1CACHE_DisableCodeCache();
 #endif
+
+	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -312,3 +314,5 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
+
+SYS_INIT(ke1xf_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/kinetis/ke1xz/Kconfig b/soc/nxp/kinetis/ke1xz/Kconfig
index f8e878cb13a..2563a220041 100644
--- a/soc/nxp/kinetis/ke1xz/Kconfig
+++ b/soc/nxp/kinetis/ke1xz/Kconfig
@@ -13,4 +13,3 @@ config SOC_SERIES_KE1XZ
 	select HAS_MCUX
 	select HAS_PM
 	select SOC_RESET_HOOK
-	select SOC_EARLY_INIT_HOOK
diff --git a/soc/nxp/kinetis/ke1xz/soc.c b/soc/nxp/kinetis/ke1xz/soc.c
index 5a6b443c1fe..38521bccc85 100644
--- a/soc/nxp/kinetis/ke1xz/soc.c
+++ b/soc/nxp/kinetis/ke1xz/soc.c
@@ -144,11 +144,13 @@ static ALWAYS_INLINE void clk_init(void)
 #endif
 }
 
-void soc_early_init_hook(void)
+static int ke1xz_init(void)
 
 {
 	/* Initialize system clocks and PLL */
 	clk_init();
+
+	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -160,3 +162,5 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
+
+SYS_INIT(ke1xz_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/kinetis/kl2x/Kconfig b/soc/nxp/kinetis/kl2x/Kconfig
index e545c2a6800..c2e5255e00a 100644
--- a/soc/nxp/kinetis/kl2x/Kconfig
+++ b/soc/nxp/kinetis/kl2x/Kconfig
@@ -10,7 +10,6 @@ config SOC_SERIES_KINETIS_KL2X
 	select CPU_CORTEX_M_HAS_VTOR
 	select CLOCK_CONTROL
 	select SOC_RESET_HOOK
-	select SOC_EARLY_INIT_HOOK
 
 config SOC_MKL25Z4
 	select CPU_CORTEX_M0PLUS
diff --git a/soc/nxp/kinetis/kl2x/soc.c b/soc/nxp/kinetis/kl2x/soc.c
index 71fe3d35a35..9a525b2632c 100644
--- a/soc/nxp/kinetis/kl2x/soc.c
+++ b/soc/nxp/kinetis/kl2x/soc.c
@@ -79,10 +79,12 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 }
 
-void soc_early_init_hook(void)
+static int kl2x_init(void)
 {
 	/* Initialize system clock to 48 MHz */
 	clock_init();
+
+	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -93,3 +95,5 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
+
+SYS_INIT(kl2x_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/kinetis/kv5x/Kconfig b/soc/nxp/kinetis/kv5x/Kconfig
index d4d977ce212..6c9cd6f34ef 100644
--- a/soc/nxp/kinetis/kv5x/Kconfig
+++ b/soc/nxp/kinetis/kv5x/Kconfig
@@ -22,4 +22,3 @@ config SOC_SERIES_KINETIS_KV5X
 	select HAS_MCG
 	select HAS_MCUX_RCM
 	select SOC_RESET_HOOK
-	select SOC_EARLY_INIT_HOOK
diff --git a/soc/nxp/kinetis/kv5x/soc.c b/soc/nxp/kinetis/kv5x/soc.c
index cd5d4048c42..91c4823e4e2 100644
--- a/soc/nxp/kinetis/kv5x/soc.c
+++ b/soc/nxp/kinetis/kv5x/soc.c
@@ -78,7 +78,7 @@ static ALWAYS_INLINE void clk_init(void)
 	CLOCK_SetSimConfig(&sim_config);
 }
 
-void soc_early_init_hook(void)
+static int kv5x_init(void)
 {
 	/* release I/O power hold to allow normal run state */
 	PMC->REGSC |= PMC_REGSC_ACKISO_MASK;
@@ -93,6 +93,8 @@ void soc_early_init_hook(void)
 
 	sys_cache_instr_enable();
 	sys_cache_data_enable();
+
+	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -103,3 +105,5 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
+
+SYS_INIT(kv5x_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/kinetis/kwx/Kconfig b/soc/nxp/kinetis/kwx/Kconfig
index 150de248d4e..49a9f78c04b 100644
--- a/soc/nxp/kinetis/kwx/Kconfig
+++ b/soc/nxp/kinetis/kwx/Kconfig
@@ -9,7 +9,6 @@ config SOC_SERIES_KINETIS_KWX
 	select CPU_CORTEX_M_HAS_VTOR
 	select CLOCK_CONTROL
 	select SOC_RESET_HOOK
-	select SOC_EARLY_INIT_HOOK
 
 config SOC_MKW22D5
 	select CPU_CORTEX_M4
diff --git a/soc/nxp/kinetis/kwx/soc_kw2xd.c b/soc/nxp/kinetis/kwx/soc_kw2xd.c
index c2fcddfa6ed..95e5a955acc 100644
--- a/soc/nxp/kinetis/kwx/soc_kw2xd.c
+++ b/soc/nxp/kinetis/kwx/soc_kw2xd.c
@@ -147,13 +147,15 @@ static ALWAYS_INLINE void clock_init(void)
  *
  * @return 0
  */
-void soc_early_init_hook(void)
+static int kw2xd_init(void)
 {
 	/* release I/O power hold to allow normal run state */
 	PMC->REGSC |= PMC_REGSC_ACKISO_MASK;
 
 	/* Initialize PLL/system clock to 48 MHz */
 	clock_init();
+
+	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -164,3 +166,5 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
+
+SYS_INIT(kw2xd_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/kinetis/kwx/soc_kw4xz.c b/soc/nxp/kinetis/kwx/soc_kw4xz.c
index 4e33f4df5b8..a14fe28c165 100644
--- a/soc/nxp/kinetis/kwx/soc_kw4xz.c
+++ b/soc/nxp/kinetis/kwx/soc_kw4xz.c
@@ -79,10 +79,12 @@ static ALWAYS_INLINE void clock_init(void)
 #endif
 }
 
-void soc_early_init_hook(void)
+static int kwx_init(void)
 {
 	/* Initialize system clock to 40 MHz */
 	clock_init();
+
+	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -93,3 +95,5 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
+
+SYS_INIT(kwx_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/lpc/lpc51u68/Kconfig b/soc/nxp/lpc/lpc51u68/Kconfig
index 37c8231d7f6..8a2436d1237 100644
--- a/soc/nxp/lpc/lpc51u68/Kconfig
+++ b/soc/nxp/lpc/lpc51u68/Kconfig
@@ -16,7 +16,6 @@ config SOC_SERIES_LPC51U68
 	select CPU_CORTEX_M_HAS_SYSTICK
 	select CPU_CORTEX_M_HAS_VTOR
 	select SOC_RESET_HOOK
-	select SOC_EARLY_INIT_HOOK
 
 config SOC_LPC51U68
 	select CLOCK_CONTROL
diff --git a/soc/nxp/lpc/lpc51u68/soc.c b/soc/nxp/lpc/lpc51u68/soc.c
index fd8f23800b3..b38b601baaa 100644
--- a/soc/nxp/lpc/lpc51u68/soc.c
+++ b/soc/nxp/lpc/lpc51u68/soc.c
@@ -11,7 +11,7 @@
 #include <fsl_power.h>
 #include <fsl_clock.h>
 
-void soc_early_init_hook(void)
+int soc_init(void)
 {
 	POWER_DisablePD(kPDRUNCFG_PD_FRO_EN);
 	CLOCK_SetupFROClocking(12000000U);
@@ -42,11 +42,17 @@ void soc_early_init_hook(void)
 	POWER_DisablePD(kPDRUNCFG_PD_VD7_ENA);
 	POWER_DisablePD(kPDRUNCFG_PD_VREFP_SW);
 	POWER_DisablePD(kPDRUNCFG_PD_TEMPS);
+
+	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
+
 void soc_reset_hook(void)
 {
 	SystemInit();
 }
+
 #endif /* CONFIG_SOC_RESET_HOOK */
+
+SYS_INIT(soc_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/mcx/mcxc/Kconfig b/soc/nxp/mcx/mcxc/Kconfig
index ff49d66ae65..02ed4233bc0 100644
--- a/soc/nxp/mcx/mcxc/Kconfig
+++ b/soc/nxp/mcx/mcxc/Kconfig
@@ -16,7 +16,6 @@ config SOC_SERIES_MCXC
 	select HAS_MCUX_LPUART
 	select HAS_MCUX_LPI2C
 	select HAS_MCUX_TPM
-	select SOC_EARLY_INIT_HOOK
 
 if SOC_SERIES_MCXC
 
diff --git a/soc/nxp/mcx/mcxc/soc.c b/soc/nxp/mcx/mcxc/soc.c
index 00001999a49..a6d0d8bd9fd 100644
--- a/soc/nxp/mcx/mcxc/soc.c
+++ b/soc/nxp/mcx/mcxc/soc.c
@@ -93,9 +93,10 @@ static void clock_init(void)
 #endif
 }
 
-void soc_early_init_hook(void)
+static int mcxc_init(void)
 {
 	clock_init();
+	return 0;
 }
 
 #ifdef CONFIG_SOC_RESET_HOOK
@@ -106,3 +107,5 @@ void soc_reset_hook(void)
 }
 
 #endif /* CONFIG_SOC_RESET_HOOK */
+
+SYS_INIT(mcxc_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/rw/Kconfig b/soc/nxp/rw/Kconfig
index 272d7073bfa..e67d0013721 100644
--- a/soc/nxp/rw/Kconfig
+++ b/soc/nxp/rw/Kconfig
@@ -17,7 +17,6 @@ config SOC_SERIES_RW6XX
 	select HAS_MCUX_FLEXCOMM
 	select HAS_MCUX_CACHE
 	select HAS_PM
-	select SOC_EARLY_INIT_HOOK
 
 if SOC_SERIES_RW6XX
 
diff --git a/soc/nxp/rw/power.c b/soc/nxp/rw/power.c
index 1f0255a388f..2979d48ff5b 100644
--- a/soc/nxp/rw/power.c
+++ b/soc/nxp/rw/power.c
@@ -109,7 +109,7 @@ __weak void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
 	__enable_irq();
 }
 
-void nxp_rw6xx_power_init(void)
+static int nxp_rw6xx_power_init(void)
 {
 	uint32_t suspend_sleepconfig[5] = DT_PROP_OR(NODE_ID, deep_sleep_config, {});
 
@@ -142,4 +142,8 @@ void nxp_rw6xx_power_init(void)
 	IRQ_CONNECT(DT_IRQN(DT_NODELABEL(pin1)), DT_IRQ(DT_NODELABEL(pin1), priority), pin1_isr,
 		    NULL, 0);
 #endif
+
+	return 0;
 }
+
+SYS_INIT(nxp_rw6xx_power_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/soc/nxp/rw/soc.c b/soc/nxp/rw/soc.c
index 1a52626a053..8aa3d6f6dee 100644
--- a/soc/nxp/rw/soc.c
+++ b/soc/nxp/rw/soc.c
@@ -268,16 +268,17 @@ __ramfunc void clock_init(void)
 
 }
 
-extern void nxp_rw6xx_power_init(void);
 /**
  *
  * @brief Perform basic hardware initialization
  *
  * Initialize the interrupt controller device drivers.
  * Also initialize the timer device driver, if required.
+ *
+ * @return 0
  */
 
-void soc_early_init_hook(void)
+static int nxp_rw600_init(void)
 {
 #if (DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(wwdt), nxp_lpc_wwdt, okay))
 	POWER_EnableResetSource(kPOWER_ResetSourceWdt);
@@ -304,9 +305,8 @@ void soc_early_init_hook(void)
 #if defined(CONFIG_ADC_MCUX_GAU) ||  defined(CONFIG_DAC_MCUX_GAU)
 	POWER_PowerOnGau();
 #endif
-#if CONFIG_PM
-	nxp_rw6xx_power_init();
-#endif
+
+	return 0;
 }
 
 void soc_reset_hook(void)
@@ -314,3 +314,5 @@ void soc_reset_hook(void)
 	/* This is provided by the SDK */
 	SystemInit();
 }
+
+SYS_INIT(nxp_rw600_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/s32/s32k1/Kconfig b/soc/nxp/s32/s32k1/Kconfig
index 2bb3a271904..0883614c82b 100644
--- a/soc/nxp/s32/s32k1/Kconfig
+++ b/soc/nxp/s32/s32k1/Kconfig
@@ -19,7 +19,6 @@ config SOC_SERIES_S32K1
 	select HAS_MCUX_WDOG32
 	select HAS_MCUX_RTC
 	select HAS_MCUX_ADC12
-	select SOC_EARLY_INIT_HOOK
 
 config SOC_S32K116
 	select CPU_CORTEX_M0PLUS
diff --git a/soc/nxp/s32/s32k1/soc.c b/soc/nxp/s32/s32k1/soc.c
index 484838cf68c..20a27eb13c0 100644
--- a/soc/nxp/s32/s32k1/soc.c
+++ b/soc/nxp/s32/s32k1/soc.c
@@ -48,7 +48,7 @@ void z_arm_watchdog_init(void)
 }
 #endif /* CONFIG_WDOG_INIT */
 
-void soc_early_init_hook(void)
+static int soc_init(void)
 {
 #if !defined(CONFIG_ARM_MPU)
 	uint32_t tmp;
@@ -71,4 +71,8 @@ void soc_early_init_hook(void)
 #endif
 
 	OsIf_Init(NULL);
+
+	return 0;
 }
+
+SYS_INIT(soc_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/s32/s32k3/Kconfig b/soc/nxp/s32/s32k3/Kconfig
index 627898f7231..fdf0bba2687 100644
--- a/soc/nxp/s32/s32k3/Kconfig
+++ b/soc/nxp/s32/s32k3/Kconfig
@@ -22,7 +22,6 @@ config SOC_SERIES_S32K3
 	select HAS_MCUX_LPSPI
 	select HAS_MCUX_CACHE
 	select HAS_MCUX_EDMA
-	select SOC_EARLY_INIT_HOOK
 
 if SOC_SERIES_S32K3
 
diff --git a/soc/nxp/s32/s32k3/soc.c b/soc/nxp/s32/s32k3/soc.c
index e2ecba3c6fb..be822677189 100644
--- a/soc/nxp/s32/s32k3/soc.c
+++ b/soc/nxp/s32/s32k3/soc.c
@@ -49,10 +49,14 @@ const struct ivt ivt_header __attribute__((section(".ivt_header"))) = {
 };
 #endif /* CONFIG_XIP */
 
-void soc_early_init_hook(void)
+static int soc_init(void)
 {
 	sys_cache_instr_enable();
 	sys_cache_data_enable();
 
 	OsIf_Init(NULL);
+
+	return 0;
 }
+
+SYS_INIT(soc_init, PRE_KERNEL_1, 0);
diff --git a/soc/nxp/s32/s32ze/Kconfig b/soc/nxp/s32/s32ze/Kconfig
index 9ee9aaa1429..8c9041a2fe3 100644
--- a/soc/nxp/s32/s32ze/Kconfig
+++ b/soc/nxp/s32/s32ze/Kconfig
@@ -18,7 +18,6 @@ config SOC_SERIES_S32ZE
 	select HAS_MCUX_PIT
 	select HAS_MCUX_FLEXCAN
 	select HAS_MCUX_LPI2C
-	select SOC_EARLY_INIT_HOOK
 
 if SOC_SERIES_S32ZE
 
diff --git a/soc/nxp/s32/s32ze/soc.c b/soc/nxp/s32/s32ze/soc.c
index da05a2085b7..801e0173ae3 100644
--- a/soc/nxp/s32/s32ze/soc.c
+++ b/soc/nxp/s32/s32ze/soc.c
@@ -44,7 +44,11 @@ void soc_reset_hook(void)
 	}
 }
 
-void soc_early_init_hook(void)
+static int soc_init(void)
 {
 	OsIf_Init(NULL);
+
+	return 0;
 }
+
+SYS_INIT(soc_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);

From 45dc561affbcf77bfb5165765e36f16c79d437a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:34 +0100
Subject: [PATCH 1525/2913] Revert "[nrf fromtree] soc: imx8m: change RDC
 configuration based on device tree"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9415b1f6bf81c18e66c0e3a47b61afc2c44f0869.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nxp/imx/imx8m/a53/soc.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/soc/nxp/imx/imx8m/a53/soc.c b/soc/nxp/imx/imx8m/a53/soc.c
index c5eaa312370..002b884daa0 100644
--- a/soc/nxp/imx/imx8m/a53/soc.c
+++ b/soc/nxp/imx/imx8m/a53/soc.c
@@ -12,50 +12,40 @@
 #include <fsl_common.h>
 #include <fsl_rdc.h>
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(rdc), okay)
-
-#define rdc_inst ((RDC_Type *)DT_REG_ADDR(DT_NODELABEL(rdc)))
-
 /* set RDC permission for peripherals */
 static void soc_rdc_init(void)
 {
 	rdc_domain_assignment_t assignment = {0};
 	rdc_periph_access_config_t periphConfig;
 
-	RDC_Init(rdc_inst);
+	RDC_Init(RDC);
 	assignment.domainId = A53_DOMAIN_ID;
-	RDC_SetMasterDomainAssignment(rdc_inst, kRDC_Master_A53, &assignment);
+	RDC_SetMasterDomainAssignment(RDC, kRDC_Master_A53, &assignment);
 
 	RDC_GetDefaultPeriphAccessConfig(&periphConfig);
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) && DT_NODE_HAS_PROP(DT_NODELABEL(uart2), rdc)
 	periphConfig.periph = kRDC_Periph_UART2;
 	periphConfig.policy = RDC_DT_VAL(uart2);
-	RDC_SetPeriphAccessConfig(rdc_inst, &periphConfig);
+	RDC_SetPeriphAccessConfig(RDC, &periphConfig);
 #endif
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay) && DT_NODE_HAS_PROP(DT_NODELABEL(uart4), rdc)
 	periphConfig.periph = kRDC_Periph_UART4;
 	periphConfig.policy = RDC_DT_VAL(uart4);
-	RDC_SetPeriphAccessConfig(rdc_inst, &periphConfig);
+	RDC_SetPeriphAccessConfig(RDC, &periphConfig);
 #endif
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay) && DT_NODE_HAS_PROP(DT_NODELABEL(enet), rdc)
 	periphConfig.periph = kRDC_Periph_ENET1;
 	periphConfig.policy = RDC_DT_VAL(enet);
-	RDC_SetPeriphAccessConfig(rdc_inst, &periphConfig);
+	RDC_SetPeriphAccessConfig(RDC, &periphConfig);
 #endif
 }
-#else
-
-#define soc_rdc_init() do { } while (false)
-
-#endif
 
 static int soc_init(void)
 {
 	soc_rdc_init();
-
 	return 0;
 }
 

From 10fa589e13da9121e90e6209884858c2ac9d31f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:34 +0100
Subject: [PATCH 1526/2913] Revert "[nrf fromtree] soc: snps: move init code
 from SYS_INIT to hooks"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1100e23b7a257e75087d4ad56f57ee097d921368.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/snps/arc_iot/Kconfig   |  1 -
 soc/snps/arc_iot/soc.c     | 11 +++++++++--
 soc/snps/emsk/Kconfig      |  4 ----
 soc/snps/emsk/soc_config.c |  6 +++++-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/soc/snps/arc_iot/Kconfig b/soc/snps/arc_iot/Kconfig
index 0ea361d2325..362d2d1ae71 100644
--- a/soc/snps/arc_iot/Kconfig
+++ b/soc/snps/arc_iot/Kconfig
@@ -6,4 +6,3 @@ config SOC_ARC_IOT
 	select ARC
 	select CPU_HAS_MPU
 	select CPU_HAS_FPU
-	select SOC_EARLY_INIT_HOOK
diff --git a/soc/snps/arc_iot/soc.c b/soc/snps/arc_iot/soc.c
index d42ed3f9d9c..832c6df5f51 100644
--- a/soc/snps/arc_iot/soc.c
+++ b/soc/snps/arc_iot/soc.c
@@ -15,7 +15,14 @@
 
 #define CPU_FREQ DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
 
-void soc_early_init_hook(void)
+static int arc_iot_init(void)
 {
-	arc_iot_pll_fout_config(CPU_FREQ / 1000000);
+
+	if (arc_iot_pll_fout_config(CPU_FREQ / 1000000) < 0) {
+		return -1;
+	}
+
+	return 0;
 }
+
+SYS_INIT(arc_iot_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/soc/snps/emsk/Kconfig b/soc/snps/emsk/Kconfig
index 014d5357f0a..88cdfe70671 100644
--- a/soc/snps/emsk/Kconfig
+++ b/soc/snps/emsk/Kconfig
@@ -4,16 +4,12 @@
 
 config SOC_EMSK
 	select ARC
-	select SOC_EARLY_INIT_HOOK
 
 config SOC_EMSK_EM7D
 	select CPU_HAS_MPU
-	select SOC_EARLY_INIT_HOOK
 
 config SOC_EMSK_EM9D
 	select CPU_HAS_FPU
-	select SOC_EARLY_INIT_HOOK
 
 config SOC_EMSK_EM11D
 	select CPU_HAS_FPU
-	select SOC_EARLY_INIT_HOOK
diff --git a/soc/snps/emsk/soc_config.c b/soc/snps/emsk/soc_config.c
index c43942facb0..adca19b683c 100644
--- a/soc/snps/emsk/soc_config.c
+++ b/soc/snps/emsk/soc_config.c
@@ -11,7 +11,7 @@
 
 #ifdef CONFIG_UART_NS16550
 
-void soc_early_init_hook(void)
+static int uart_ns16550_init(void)
 {
 
 	/* On ARC EM Starter kit board,
@@ -25,6 +25,10 @@ void soc_early_init_hook(void)
 	sys_write32(0, DT_REG_ADDR(DT_INST(1, ns16550))+0x4);
 	sys_write32(0, DT_REG_ADDR(DT_INST(1, ns16550))+0x10);
 #endif /* DT_NODE_HAS_STATUS(DT_INST(1, ns16550), okay) */
+
+	return 0;
 }
 
+SYS_INIT(uart_ns16550_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+
 #endif /* CONFIG_UART_NS16550 */

From 87444de8fd84b37c092cfdd2902c8b814607b3af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:34 +0100
Subject: [PATCH 1527/2913] Revert "[nrf fromtree] soc: nordic: s2ram: Align
 s2ram marking procedures"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f5af365d61227e22be23cb361f64c36ffeedcb36.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54h/pm_s2ram.c | 49 ++++++++++--------------------------
 1 file changed, 13 insertions(+), 36 deletions(-)

diff --git a/soc/nordic/nrf54h/pm_s2ram.c b/soc/nordic/nrf54h/pm_s2ram.c
index 88529c4bb75..10cdd36a762 100644
--- a/soc/nordic/nrf54h/pm_s2ram.c
+++ b/soc/nordic/nrf54h/pm_s2ram.c
@@ -127,48 +127,25 @@ int soc_s2ram_suspend(pm_s2ram_system_off_fn_t system_off)
 	return ret;
 }
 
-void __attribute__((naked)) pm_s2ram_mark_set(void)
+void pm_s2ram_mark_set(void)
 {
 	/* empty */
-	__asm__ volatile("bx	lr\n");
 }
 
-bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
+bool pm_s2ram_mark_check_and_clear(void)
 {
-	__asm__ volatile(
-		/* Set return value to 0 */
-		"mov	r0, #0\n"
+	bool unretained_wake;
+	bool restore_valid;
+	uint32_t reset_reason = nrf_resetinfo_resetreas_local_get(NRF_RESETINFO);
 
-		/* Load and check RESETREAS register */
-		"ldr	r3, [%[resetinfo_addr], %[resetreas_offs]]\n"
-		"cmp	r3, %[resetreas_unretained_mask]\n"
-
-		"bne	exit\n"
-
-		/* Clear RESETREAS register */
-		"str	r0, [%[resetinfo_addr], %[resetreas_offs]]\n"
-
-		/* Load RESTOREVALID register */
-		"ldr	r3, [%[resetinfo_addr], %[restorevalid_offs]]\n"
-
-		/* Clear RESTOREVALID */
-		"str	r0, [%[resetinfo_addr], %[restorevalid_offs]]\n"
-
-		/* Check RESTOREVALID register */
-		"cmp	r3, %[restorevalid_present_mask]\n"
-		"bne	exit\n"
-
-		/* Set return value to 1 */
-		"mov	r0, #1\n"
+	if (reset_reason != NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK) {
+		return false;
+	}
+	unretained_wake = reset_reason & NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK;
+	nrf_resetinfo_resetreas_local_set(NRF_RESETINFO, 0);
 
-		"exit:\n"
-		"bx	lr\n"
-		:
-		: [resetinfo_addr] "r"(NRF_RESETINFO),
-		  [resetreas_offs] "r"(offsetof(NRF_RESETINFO_Type, RESETREAS.LOCAL)),
-		  [resetreas_unretained_mask] "r"(NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK),
-		  [restorevalid_offs] "r"(offsetof(NRF_RESETINFO_Type, RESTOREVALID)),
-		  [restorevalid_present_mask] "r"(RESETINFO_RESTOREVALID_RESTOREVALID_Msk)
+	restore_valid = nrf_resetinfo_restore_valid_check(NRF_RESETINFO);
+	nrf_resetinfo_restore_valid_set(NRF_RESETINFO, false);
 
-		: "r0", "r1", "r3", "r4", "memory");
+	return (unretained_wake & restore_valid) ? true : false;
 }

From 6cc51673d3706ce8405ceda8e5b43db6c9cdf0c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:34 +0100
Subject: [PATCH 1528/2913] Revert "[nrf fromtree] arch: arm: cortex_m:
 pm_s2ram: Rework S2RAM mark functions"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 70299cb5e2c29696ba24b6ec24db3e5f0b19d94a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 arch/arm/core/cortex_m/pm_s2ram.S     | 23 ++++++++-------
 arch/arm/core/cortex_m/pm_s2ram.c     | 40 ++++++---------------------
 include/zephyr/arch/common/pm_s2ram.h | 10 -------
 3 files changed, 19 insertions(+), 54 deletions(-)

diff --git a/arch/arm/core/cortex_m/pm_s2ram.S b/arch/arm/core/cortex_m/pm_s2ram.S
index 27c2a1e96a7..f9c82b4069b 100644
--- a/arch/arm/core/cortex_m/pm_s2ram.S
+++ b/arch/arm/core/cortex_m/pm_s2ram.S
@@ -70,9 +70,7 @@ SECTION_FUNC(TEXT, arch_pm_s2ram_suspend)
 	/*
 	 * Mark entering suspend to RAM.
 	 */
-	mov 	r1, lr
-	bl 	pm_s2ram_mark_set
-	mov	lr, r1
+	bl pm_s2ram_mark_set
 
 	/*
 	 * Call the system_off function passed as parameter. This should never
@@ -88,9 +86,7 @@ SECTION_FUNC(TEXT, arch_pm_s2ram_suspend)
 	/*
 	 * Reset the marking of suspend to RAM, return is ignored.
 	 */
-	mov 	r1, lr
-	bl	pm_s2ram_mark_check_and_clear
-	mov 	lr, r1
+	bl pm_s2ram_mark_check_and_clear
 
 	/* Move system_off back to r0 as return value */
 	mov	r0, r4
@@ -103,13 +99,16 @@ GTEXT(arch_pm_s2ram_resume)
 SECTION_FUNC(TEXT, arch_pm_s2ram_resume)
 	/*
 	 * Check if reset occurred after suspending to RAM.
+	 * Store LR to ensure we can continue boot when we are not suspended
+	 * to RAM. In addition to LR, R0 is pushed too, to ensure "SP mod 8 = 0",
+	 * as stated by ARM rule 6.2.1.2 for AAPCS32.
 	 */
-	mov 	r1, lr
-	bl 	pm_s2ram_mark_check_and_clear
-	mov 	lr, r1
-	cmp     r0, #0x1
-	beq     resume
-	bx      lr
+	push    {r0, lr}
+	bl      pm_s2ram_mark_check_and_clear
+	cmp	r0, #0x1
+	pop     {r0, lr}
+	beq	resume
+	bx	lr
 
 resume:
 	/*
diff --git a/arch/arm/core/cortex_m/pm_s2ram.c b/arch/arm/core/cortex_m/pm_s2ram.c
index b7fe5d9b626..2657d48dc32 100644
--- a/arch/arm/core/cortex_m/pm_s2ram.c
+++ b/arch/arm/core/cortex_m/pm_s2ram.c
@@ -22,44 +22,20 @@ __noinit _cpu_context_t _cpu_context;
  */
 static __noinit uint32_t marker;
 
-void __attribute__((naked)) pm_s2ram_mark_set(void)
+void pm_s2ram_mark_set(void)
 {
-	__asm__ volatile(
-		/* Set the marker to MAGIC value */
-		"str	%[_magic_val], [%[_marker]]\n"
-
-		"bx	lr\n"
-		:
-		: [_magic_val] "r"(MAGIC), [_marker] "r"(&marker)
-		: "r1", "r4", "memory");
+	marker = MAGIC;
 }
 
-bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
+bool pm_s2ram_mark_check_and_clear(void)
 {
-	__asm__ volatile(
-		/* Set return value to 0 */
-		"mov	r0, #0\n"
-
-		/* Check the marker */
-		"ldr	r3, [%[_marker]]\n"
-		"cmp	r3, %[_magic_val]\n"
-		"bne	exit\n"
-
-		/*
-		 * Reset the marker
-		 */
-		"str	r0, [%[_marker]]\n"
+	if (marker == MAGIC) {
+		marker = 0;
 
-		/*
-		 * Set return value to 1
-		 */
-		"mov	r0, #1\n"
+		return true;
+	}
 
-		"exit:\n"
-		"bx lr\n"
-		:
-		: [_magic_val] "r"(MAGIC), [_marker] "r"(&marker)
-		: "r0", "r1", "r3", "r4", "memory");
+	return false;
 }
 
 #endif /* CONFIG_PM_S2RAM_CUSTOM_MARKING */
diff --git a/include/zephyr/arch/common/pm_s2ram.h b/include/zephyr/arch/common/pm_s2ram.h
index ad9ab8ad7a4..34c544c769b 100644
--- a/include/zephyr/arch/common/pm_s2ram.h
+++ b/include/zephyr/arch/common/pm_s2ram.h
@@ -65,11 +65,6 @@ int arch_pm_s2ram_suspend(pm_s2ram_system_off_fn_t system_off);
  *
  * Default implementation is setting a magic word in RAM. CONFIG_PM_S2RAM_CUSTOM_MARKING
  * allows custom implementation.
- * The following requirements must be fulfilled:
- * - the function cannot use stack (asm function or function with 'naked' attribute)
- * - the content of the R1 and R4 registers must remain unchanged
- * - returning from the function should be performed with the `bx lr` instruction
- *
  */
 void pm_s2ram_mark_set(void);
 
@@ -81,11 +76,6 @@ void pm_s2ram_mark_set(void);
  *
  * Default implementation is checking a magic word in RAM. CONFIG_PM_S2RAM_CUSTOM_MARKING
  * allows custom implementation.
- * The following requirements must be fulfilled:
- * - the function cannot use stack (most likely asm function)
- * - the content of the R1 and R4 registers must remain unchanged
- * - the function's return value is passed by R0 register
- * - returning from the function should be performed with the `bx lr` instruction
  *
  * @retval true if marking is found which indicates resuming after suspend-to-RAM.
  * @retval false if marking is not found which indicates standard boot.

From 8236a7dff77f32588a052e6fc29bbf35ad1c8d29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:34 +0100
Subject: [PATCH 1529/2913] Revert "[nrf fromtree] net: lib: coap_client:
 Remove unnecessary atomic variable"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ba49975f4d076b59f144ae9ee7c56f4d1d60323a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index ebf99bade9f..cfbf8c42c05 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -24,6 +24,7 @@ static K_MUTEX_DEFINE(coap_client_mutex);
 static struct coap_client *clients[CONFIG_COAP_CLIENT_MAX_INSTANCES];
 static int num_clients;
 static K_SEM_DEFINE(coap_client_recv_sem, 0, 1);
+static atomic_t coap_client_recv_active;
 
 static bool timeout_expired(struct coap_client_internal_request *internal_req);
 static void cancel_requests_with(struct coap_client *client, int error);
@@ -81,7 +82,10 @@ static int coap_client_schedule_poll(struct coap_client *client, int sock,
 	memcpy(&internal_req->coap_request, req, sizeof(struct coap_client_request));
 	internal_req->request_ongoing = true;
 
-	k_sem_give(&coap_client_recv_sem);
+	if (!coap_client_recv_active) {
+		k_sem_give(&coap_client_recv_sem);
+	}
+	atomic_set(&coap_client_recv_active, 1);
 
 	return 0;
 }
@@ -952,6 +956,7 @@ static void cancel_requests_with(struct coap_client *client, int error)
 			reset_internal_request(&client->requests[i]);
 		}
 	}
+	atomic_clear(&coap_client_recv_active);
 	k_mutex_unlock(&client->lock);
 
 }
@@ -969,6 +974,7 @@ void coap_client_recv(void *coap_cl, void *a, void *b)
 
 	k_sem_take(&coap_client_recv_sem, K_FOREVER);
 	while (true) {
+		atomic_set(&coap_client_recv_active, 1);
 		ret = handle_poll();
 		if (ret < 0) {
 			/* Error in polling */
@@ -981,6 +987,7 @@ void coap_client_recv(void *coap_cl, void *a, void *b)
 			continue;
 		} else {
 idle:
+			atomic_set(&coap_client_recv_active, 0);
 			k_sem_take(&coap_client_recv_sem, K_FOREVER);
 		}
 	}

From 15e255ae152e7db9335dbfa6b8da4b9addc560e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:35 +0100
Subject: [PATCH 1530/2913] Revert "[nrf fromtree] tests: coap_client: Add
 tests for poll() errors"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a73c6e406b1d55c08f1bf739fb3b7cfa490114c4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/lib/coap_client/src/main.c | 61 ----------------------------
 1 file changed, 61 deletions(-)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index f06a0ce646c..20f1e4d8381 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -322,7 +322,6 @@ static void test_setup(void *data)
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake;
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake;
-	clear_socket_events(ZSOCK_POLLIN | ZSOCK_POLLOUT | ZSOCK_POLLERR);
 
 	for (i = 0; i < ARRAY_SIZE(messages_needing_response); i++) {
 		messages_needing_response[i] = 0;
@@ -728,65 +727,5 @@ ZTEST(coap_client, test_multiple_clients)
 	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
-}
-
-
-ZTEST(coap_client, test_poll_err)
-{
-	int ret = 0;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-	};
-
-	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
-	set_socket_events(ZSOCK_POLLERR);
-
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-
-	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
-	zassert_equal(last_response_code, -EIO, "Unexpected response");
-}
-
-ZTEST(coap_client, test_poll_err_after_response)
-{
-	int ret = 0;
-	struct k_sem sem1;
-	struct sockaddr address = {0};
-	struct coap_client_request client_request = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem1
-	};
-
-	zassert_ok(k_sem_init(&sem1, 0, 1));
-	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
-	set_socket_events(ZSOCK_POLLIN);
-
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-
-	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
-	set_socket_events(ZSOCK_POLLERR);
-	zassert_not_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
 }

From 0fde00579adeb12fc1d3787405f1de707ab3e3b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:35 +0100
Subject: [PATCH 1531/2913] Revert "[nrf fromtree] net: lib: coap_client: Send
 RST for unknown queries"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 19e6b8f1d0b1ddda62fd4ecaca82c44fb5acbeb9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index cfbf8c42c05..31b065be951 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -651,26 +651,6 @@ static int send_ack(struct coap_client *client, const struct coap_packet *req,
 	return 0;
 }
 
-static int send_rst(struct coap_client *client, const struct coap_packet *req)
-{
-	int ret;
-	struct coap_packet rst;
-
-	ret = coap_rst_init(&rst, req, client->send_buf, MAX_COAP_MSG_LEN);
-	if (ret < 0) {
-		LOG_ERR("Failed to initialize CoAP RST-message");
-		return ret;
-	}
-
-	ret = send_request(client->fd, rst.data, rst.offset, 0, &client->address, client->socklen);
-	if (ret < 0) {
-		LOG_ERR("Error sending a CoAP RST-message");
-		return ret;
-	}
-
-	return 0;
-}
-
 static struct coap_client_internal_request *get_request_with_token(
 	struct coap_client *client, const struct coap_packet *resp)
 {
@@ -770,7 +750,6 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 	internal_req = get_request_with_token(client, response);
 	if (!internal_req) {
 		LOG_WRN("No matching request for response");
-		(void) send_rst(client, response); /* Ignore errors, unrelated to our queries */
 		return 0;
 	}
 

From 474c69130d316c06d803709660b479edcd3c208a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:35 +0100
Subject: [PATCH 1532/2913] Revert "[nrf fromtree] net: lib: coap_client:
 Remove duplicate token comparison"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4dd06365cf5253e4971ae7c900de1d926243fdaf.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 31b065be951..ca592291ddf 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -594,6 +594,21 @@ static int handle_poll(void)
 	return 0;
 }
 
+static bool token_compare(struct coap_client_internal_request *internal_req,
+			  const struct coap_packet *resp)
+{
+	uint8_t response_token[COAP_TOKEN_MAX_LEN];
+	uint8_t response_tkl;
+
+	response_tkl = coap_header_get_token(resp, response_token);
+
+	if (internal_req->request_tkl != response_tkl) {
+		return false;
+	}
+
+	return memcmp(&internal_req->request_token, &response_token, response_tkl) == 0;
+}
+
 static int recv_response(struct coap_client *client, struct coap_packet *response, bool *truncated)
 {
 	int total_len;
@@ -753,6 +768,11 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 		return 0;
 	}
 
+	if (internal_req == NULL || !token_compare(internal_req, response)) {
+		LOG_WRN("Not matching tokens");
+		return 1;
+	}
+
 	/* MID-based deduplication */
 	if (response_id == internal_req->last_response_id) {
 		LOG_WRN("Duplicate MID, dropping");

From cf3199e8ba3c220f8feff65ab3298974c1416fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:35 +0100
Subject: [PATCH 1533/2913] Revert "[nrf fromtree] net: coap: Add API to send
 reset message"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit eccfce9174344aad6690ba3e6c25bc9890f8e219.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/coap.h  | 15 ---------------
 subsys/net/lib/coap/coap.c | 13 -------------
 2 files changed, 28 deletions(-)

diff --git a/include/zephyr/net/coap.h b/include/zephyr/net/coap.h
index 09df1e98f8a..7a0c7ee7f91 100644
--- a/include/zephyr/net/coap.h
+++ b/include/zephyr/net/coap.h
@@ -552,21 +552,6 @@ int coap_packet_init(struct coap_packet *cpkt, uint8_t *data, uint16_t max_len,
 int coap_ack_init(struct coap_packet *cpkt, const struct coap_packet *req,
 		  uint8_t *data, uint16_t max_len, uint8_t code);
 
-/**
- * @brief Create a new CoAP Reset message for given request.
- *
- * This function works like @ref coap_packet_init, filling CoAP header type,
- * and CoAP header message id fields.
- *
- * @param cpkt New packet to be initialized using the storage from @a data.
- * @param req CoAP request packet that is being acknowledged
- * @param data Data that will contain a CoAP packet information
- * @param max_len Maximum allowable length of data
- *
- * @return 0 in case of success or negative in case of error.
- */
-int coap_rst_init(struct coap_packet *cpkt, const struct coap_packet *req,
-		  uint8_t *data, uint16_t max_len);
 /**
  * @brief Returns a randomly generated array of 8 bytes, that can be
  * used as a message's token.
diff --git a/subsys/net/lib/coap/coap.c b/subsys/net/lib/coap/coap.c
index 70f2610adf0..25ad262c923 100644
--- a/subsys/net/lib/coap/coap.c
+++ b/subsys/net/lib/coap/coap.c
@@ -232,19 +232,6 @@ int coap_ack_init(struct coap_packet *cpkt, const struct coap_packet *req,
 				token, code, id);
 }
 
-int coap_rst_init(struct coap_packet *cpkt, const struct coap_packet *req,
-		  uint8_t *data, uint16_t max_len)
-{
-	uint16_t id;
-	uint8_t ver;
-
-	ver = coap_header_get_version(req);
-	id = coap_header_get_id(req);
-
-	return coap_packet_init(cpkt, data, max_len, ver, COAP_TYPE_RESET, 0,
-				NULL, 0, id);
-}
-
 static void option_header_set_delta(uint8_t *opt, uint8_t delta)
 {
 	*opt = (delta & 0xF) << 4;

From 8f29e6f0d2b04364a9fd61bee3b18b1d971065ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:35 +0100
Subject: [PATCH 1534/2913] Revert "[nrf fromtree] net: lib: coap_client: Fix
 reset handling"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b0716323b17f51f4fa2e89a30e2d827efb7285a4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/coap_client.h  |  2 +-
 subsys/net/lib/coap/coap_client.c | 54 +++++++------------------------
 2 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/include/zephyr/net/coap_client.h b/include/zephyr/net/coap_client.h
index 1d68661da3b..90a691de4e9 100644
--- a/include/zephyr/net/coap_client.h
+++ b/include/zephyr/net/coap_client.h
@@ -88,7 +88,7 @@ struct coap_client_option {
 struct coap_client_internal_request {
 	uint8_t request_token[COAP_TOKEN_MAX_LEN];
 	uint32_t offset;
-	uint16_t last_id;
+	uint32_t last_id;
 	uint8_t request_tkl;
 	bool request_ongoing;
 	atomic_t in_callback;
diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index ca592291ddf..550c790f69b 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -31,8 +31,6 @@ static void cancel_requests_with(struct coap_client *client, int error);
 static int recv_response(struct coap_client *client, struct coap_packet *response, bool *truncated);
 static int handle_response(struct coap_client *client, const struct coap_packet *response,
 			   bool response_truncated);
-static struct coap_client_internal_request *get_request_with_mid(
-	struct coap_client *client, const struct coap_packet *resp);
 
 
 static int send_request(int sock, const void *buf, size_t len, int flags,
@@ -691,23 +689,6 @@ static struct coap_client_internal_request *get_request_with_token(
 	return NULL;
 }
 
-static struct coap_client_internal_request *get_request_with_mid(
-	struct coap_client *client, const struct coap_packet *resp)
-{
-	uint16_t mid = coap_header_get_id(resp);
-
-	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
-		if (client->requests[i].request_ongoing) {
-			if (client->requests[i].last_id == mid) {
-				return &client->requests[i];
-			}
-		}
-	}
-
-	return NULL;
-}
-
-
 static bool find_echo_option(const struct coap_packet *response, struct coap_option *option)
 {
 	return coap_find_options(response, COAP_OPTION_ECHO, option, 1);
@@ -717,6 +698,7 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 			   bool response_truncated)
 {
 	int ret = 0;
+	int response_type;
 	int block_option;
 	int block_num;
 	bool blockwise_transfer = false;
@@ -729,45 +711,33 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 	 * NCON request results only as a separate CON or NCON message as there is no ACK
 	 * With RESET, just drop gloves and call the callback.
 	 */
+	response_type = coap_header_get_type(response);
+
+	internal_req = get_request_with_token(client, response);
+	/* Reset and Ack need to match the message ID with request */
+	if ((response_type == COAP_TYPE_ACK || response_type == COAP_TYPE_RESET) &&
+	     internal_req == NULL)  {
+		LOG_ERR("Unexpected ACK or Reset");
+		return -EFAULT;
+	} else if (response_type == COAP_TYPE_RESET) {
+		coap_pending_clear(&internal_req->pending);
+	}
 
 	/* CON, NON_CON and piggybacked ACK need to match the token with original request */
 	uint16_t payload_len;
-	uint8_t response_type = coap_header_get_type(response);
 	uint8_t response_code = coap_header_get_code(response);
 	uint16_t response_id = coap_header_get_id(response);
 	const uint8_t *payload = coap_packet_get_payload(response, &payload_len);
 
-	if (response_type == COAP_TYPE_RESET) {
-		internal_req = get_request_with_mid(client, response);
-		if (!internal_req) {
-			LOG_WRN("No matching request for RESET");
-			return 0;
-		}
-		report_callback_error(internal_req, -ECONNRESET);
-		reset_internal_request(internal_req);
-		return 0;
-	}
-
 	/* Separate response coming */
 	if (payload_len == 0 && response_type == COAP_TYPE_ACK &&
 	    response_code == COAP_CODE_EMPTY) {
-		internal_req = get_request_with_mid(client, response);
-		if (!internal_req) {
-			LOG_WRN("No matching request for ACK");
-			return 0;
-		}
 		internal_req->pending.t0 = k_uptime_get();
 		internal_req->pending.timeout = internal_req->pending.t0 + COAP_SEPARATE_TIMEOUT;
 		internal_req->pending.retries = 0;
 		return 1;
 	}
 
-	internal_req = get_request_with_token(client, response);
-	if (!internal_req) {
-		LOG_WRN("No matching request for response");
-		return 0;
-	}
-
 	if (internal_req == NULL || !token_compare(internal_req, response)) {
 		LOG_WRN("Not matching tokens");
 		return 1;

From 829f70fd24cf499ee3fc9dd65647d3a3a0d84ad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:35 +0100
Subject: [PATCH 1535/2913] Revert "[nrf fromtree] net: lib: coap_client: Use
 reset_internal_request() instead of flagging"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6d0b7ca7344682bae0f62c494ebdec802aa46026.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 550c790f69b..79c4c883f12 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -60,16 +60,24 @@ static int receive(int sock, void *buf, size_t max_len, int flags,
 	return err;
 }
 
+static void reset_block_contexts(struct coap_client_internal_request *request)
+{
+	request->recv_blk_ctx.block_size = 0;
+	request->recv_blk_ctx.total_size = 0;
+	request->recv_blk_ctx.current = 0;
+
+	request->send_blk_ctx.block_size = 0;
+	request->send_blk_ctx.total_size = 0;
+	request->send_blk_ctx.current = 0;
+}
+
 static void reset_internal_request(struct coap_client_internal_request *request)
 {
 	request->offset = 0;
 	request->last_id = 0;
 	request->last_response_id = -1;
 	request->request_ongoing = false;
-	request->is_observe = false;
-	request->pending.timeout = 0;
-	request->recv_blk_ctx = (struct coap_block_context){ 0 };
-	request->send_blk_ctx = (struct coap_block_context){ 0 };
+	reset_block_contexts(request);
 }
 
 static int coap_client_schedule_poll(struct coap_client *client, int sock,
@@ -904,7 +912,7 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 	}
 fail:
 	if (ret < 0 || !internal_req->is_observe) {
-		reset_internal_request(internal_req);
+		internal_req->request_ongoing = false;
 	}
 	return ret;
 }

From 9302829edde5cd7a5406a997c9724700904d7fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:35 +0100
Subject: [PATCH 1536/2913] Revert "[nrf fromtree] net: lib: coap_client: Don't
 decrease retry counter on send() failure"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 87168c280c7d9e9ad62c43fc21c19e7d2ecbd9bc.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 34 ++++++++++++-------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 79c4c883f12..f10adc39d98 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -471,13 +471,10 @@ static int resend_request(struct coap_client *client,
 {
 	int ret = 0;
 
-	/* Copy the pending structure if we need to restore it */
-	struct coap_pending tmp = internal_req->pending;
-
 	if (internal_req->request_ongoing &&
 	    internal_req->pending.timeout != 0 &&
 	    coap_pending_cycle(&internal_req->pending)) {
-		LOG_ERR("Timeout, retrying send");
+		LOG_ERR("Timeout in poll, retrying send");
 
 		/* Reset send block context as it was updated in previous init from packet */
 		if (internal_req->send_blk_ctx.total_size > 0) {
@@ -486,27 +483,22 @@ static int resend_request(struct coap_client *client,
 		ret = coap_client_init_request(client, &internal_req->coap_request,
 					       internal_req, true);
 		if (ret < 0) {
-			LOG_ERR("Error re-creating CoAP request %d", ret);
-			return ret;
-		}
-
-		ret = send_request(client->fd, internal_req->request.data,
-					internal_req->request.offset, 0, &client->address,
-					client->socklen);
-		if (ret > 0) {
-			ret = 0;
-		} else if (ret == -1 && errno == EAGAIN) {
-			/* Restore the pending structure, retry later */
-			internal_req->pending = tmp;
-			/* Not a fatal socket error, will trigger a retry */
-			ret = 0;
+			LOG_ERR("Error re-creating CoAP request");
 		} else {
-			ret = -errno;
-			LOG_ERR("Failed to resend request, %d", ret);
+			ret = send_request(client->fd, internal_req->request.data,
+					   internal_req->request.offset, 0, &client->address,
+					   client->socklen);
+			if (ret > 0) {
+				ret = 0;
+			} else {
+				LOG_ERR("Failed to resend request, %d", ret);
+			}
 		}
 	} else {
-		LOG_ERR("Timeout, no more retries left");
+		LOG_ERR("Timeout in poll, no more retries left");
 		ret = -ETIMEDOUT;
+		report_callback_error(internal_req, ret);
+		internal_req->request_ongoing = false;
 	}
 
 	return ret;

From 24cab8981afb16b3ef558b25f5737e7c97f8387e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:35 +0100
Subject: [PATCH 1537/2913] Revert "[nrf fromtree] net: lib: coap_client:
 Forward recv() errors to handling loop"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 249027597c1cbd5bbef762470b1923684cdb5765.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index f10adc39d98..896161b1a75 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -557,17 +557,16 @@ static int handle_poll(void)
 			struct coap_packet response;
 			bool response_truncated = false;
 
+			k_mutex_lock(&clients[i]->lock, K_FOREVER);
+
 			ret = recv_response(clients[i], &response, &response_truncated);
 			if (ret < 0) {
-				if (ret == -EAGAIN) {
-					continue;
-				}
 				LOG_ERR("Error receiving response");
 				cancel_requests_with(clients[i], -EIO);
+				k_mutex_unlock(&clients[i]->lock);
 				continue;
 			}
 
-			k_mutex_lock(&clients[i]->lock, K_FOREVER);
 			ret = handle_response(clients[i], &response, response_truncated);
 			if (ret < 0) {
 				LOG_ERR("Error handling response");
@@ -623,11 +622,14 @@ static int recv_response(struct coap_client *client, struct coap_packet *respons
 			    flags, &client->address, &client->socklen);
 
 	if (total_len < 0) {
-		ret = -errno;
-		return ret;
+		LOG_ERR("Error reading response: %d", errno);
+		if (errno == EOPNOTSUPP) {
+			return -errno;
+		}
+		return -EINVAL;
 	} else if (total_len == 0) {
-		/* Ignore, UDP can be zero length, but it is not CoAP anymore */
-		return 0;
+		LOG_ERR("Zero length recv");
+		return -EINVAL;
 	}
 
 	available_len = MIN(total_len, sizeof(client->recv_buf));
@@ -638,6 +640,7 @@ static int recv_response(struct coap_client *client, struct coap_packet *respons
 	ret = coap_packet_parse(response, client->recv_buf, available_len, NULL, 0);
 	if (ret < 0) {
 		LOG_ERR("Invalid data received");
+		return ret;
 	}
 
 	return ret;

From 322c4e2c3410c6d772795788e23c355de36759e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:35 +0100
Subject: [PATCH 1538/2913] Revert "[nrf fromtree] net: lib: coap_client: check
 poll() condition before retrying CoAP msg"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f4cab744bdd198c0787ba25f71721f3ac23fb4b1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/coap_client.h         |   2 +
 subsys/net/lib/coap/coap_client.c        | 204 ++++++++++++++---------
 tests/net/lib/coap_client/CMakeLists.txt |   1 -
 tests/net/lib/coap_client/src/main.c     |  94 ++---------
 tests/net/lib/coap_client/src/stubs.c    |  17 +-
 tests/net/lib/coap_client/src/stubs.h    |  23 +--
 6 files changed, 147 insertions(+), 194 deletions(-)

diff --git a/include/zephyr/net/coap_client.h b/include/zephyr/net/coap_client.h
index 90a691de4e9..00b97af60af 100644
--- a/include/zephyr/net/coap_client.h
+++ b/include/zephyr/net/coap_client.h
@@ -108,12 +108,14 @@ struct coap_client {
 	int fd;
 	struct sockaddr address;
 	socklen_t socklen;
+	bool response_ready;
 	struct k_mutex lock;
 	uint8_t send_buf[MAX_COAP_MSG_LEN];
 	uint8_t recv_buf[MAX_COAP_MSG_LEN];
 	struct coap_client_internal_request requests[CONFIG_COAP_CLIENT_MAX_REQUESTS];
 	struct coap_option echo_option;
 	bool send_echo;
+	int socket_error;
 };
 /** @endcond */
 
diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 896161b1a75..d7cfcdd680e 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -26,13 +26,6 @@ static int num_clients;
 static K_SEM_DEFINE(coap_client_recv_sem, 0, 1);
 static atomic_t coap_client_recv_active;
 
-static bool timeout_expired(struct coap_client_internal_request *internal_req);
-static void cancel_requests_with(struct coap_client *client, int error);
-static int recv_response(struct coap_client *client, struct coap_packet *response, bool *truncated);
-static int handle_response(struct coap_client *client, const struct coap_packet *response,
-			   bool response_truncated);
-
-
 static int send_request(int sock, const void *buf, size_t len, int flags,
 			const struct sockaddr *dest_addr, socklen_t addrlen)
 {
@@ -134,16 +127,6 @@ static bool has_ongoing_exchange(struct coap_client *client)
 	return false;
 }
 
-static bool has_timeout_expired(struct coap_client *client)
-{
-	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
-		if (timeout_expired(&client->requests[i])) {
-			return true;
-		}
-	}
-	return false;
-}
-
 static struct coap_client_internal_request *get_free_request(struct coap_client *client)
 {
 	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
@@ -156,6 +139,17 @@ static struct coap_client_internal_request *get_free_request(struct coap_client
 	return NULL;
 }
 
+static bool has_ongoing_requests(void)
+{
+	for (int i = 0; i < num_clients; i++) {
+		if (has_ongoing_request(clients[i])) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
 static bool has_ongoing_exchanges(void)
 {
 	for (int i = 0; i < num_clients; i++) {
@@ -504,91 +498,86 @@ static int resend_request(struct coap_client *client,
 	return ret;
 }
 
-static void coap_client_resend_handler(struct coap_client *client)
+static int coap_client_resend_handler(void)
 {
 	int ret = 0;
 
-	k_mutex_lock(&client->lock, K_FOREVER);
+	for (int i = 0; i < num_clients; i++) {
+		k_mutex_lock(&clients[i]->lock, K_FOREVER);
 
-	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
-		if (timeout_expired(&client->requests[i])) {
-			ret = resend_request(client, &client->requests[i]);
-			if (ret < 0) {
-				report_callback_error(&client->requests[i], ret);
-				reset_internal_request(&client->requests[i]);
+		for (int j = 0; j < CONFIG_COAP_CLIENT_MAX_REQUESTS; j++) {
+			if (timeout_expired(&clients[i]->requests[j])) {
+				ret = resend_request(clients[i], &clients[i]->requests[j]);
 			}
 		}
+
+		k_mutex_unlock(&clients[i]->lock);
 	}
 
-	k_mutex_unlock(&client->lock);
+	return ret;
 }
 
 static int handle_poll(void)
 {
 	int ret = 0;
 
-	struct zsock_pollfd fds[CONFIG_COAP_CLIENT_MAX_INSTANCES] = {0};
-	int nfds = 0;
-
-	/* Use periodic timeouts */
-	for (int i = 0; i < num_clients; i++) {
-		fds[i].fd = clients[i]->fd;
-		fds[i].events = (has_ongoing_exchange(clients[i]) ? ZSOCK_POLLIN : 0) |
-				(has_timeout_expired(clients[i]) ? ZSOCK_POLLOUT : 0);
-		fds[i].revents = 0;
-		nfds++;
-	}
-
-	ret = zsock_poll(fds, nfds, COAP_PERIODIC_TIMEOUT);
+	while (1) {
+		struct zsock_pollfd fds[CONFIG_COAP_CLIENT_MAX_INSTANCES] = {0};
+		int nfds = 0;
 
-	if (ret < 0) {
-		ret = -errno;
-		LOG_ERR("Error in poll:%d", ret);
-		return ret;
-	} else if (ret == 0) {
-		return 0;
-	}
-
-	for (int i = 0; i < nfds; i++) {
-		if (fds[i].revents & ZSOCK_POLLOUT) {
-			coap_client_resend_handler(clients[i]);
+		/* Use periodic timeouts */
+		for (int i = 0; i < num_clients; i++) {
+			fds[i].fd = clients[i]->fd;
+			fds[i].events = ZSOCK_POLLIN;
+			fds[i].revents = 0;
+			nfds++;
 		}
-		if (fds[i].revents & ZSOCK_POLLIN) {
-			struct coap_packet response;
-			bool response_truncated = false;
 
-			k_mutex_lock(&clients[i]->lock, K_FOREVER);
+		ret = zsock_poll(fds, nfds, COAP_PERIODIC_TIMEOUT);
+
+		if (ret < 0) {
+			LOG_ERR("Error in poll:%d", errno);
+			errno = 0;
+			return ret;
+		} else if (ret == 0) {
+			/* Resend all the expired pending messages */
+			ret = coap_client_resend_handler();
 
-			ret = recv_response(clients[i], &response, &response_truncated);
 			if (ret < 0) {
-				LOG_ERR("Error receiving response");
-				cancel_requests_with(clients[i], -EIO);
-				k_mutex_unlock(&clients[i]->lock);
-				continue;
+				LOG_ERR("Error resending request: %d", ret);
 			}
 
-			ret = handle_response(clients[i], &response, response_truncated);
-			if (ret < 0) {
-				LOG_ERR("Error handling response");
+			if (!has_ongoing_requests()) {
+				return ret;
 			}
 
-			k_mutex_unlock(&clients[i]->lock);
-		}
-		if (fds[i].revents & ZSOCK_POLLERR) {
-			LOG_ERR("Error in poll for socket %d", fds[i].fd);
-			cancel_requests_with(clients[i], -EIO);
-		}
-		if (fds[i].revents & ZSOCK_POLLHUP) {
-			LOG_ERR("Error in poll: POLLHUP for socket %d", fds[i].fd);
-			cancel_requests_with(clients[i], -EIO);
-		}
-		if (fds[i].revents & ZSOCK_POLLNVAL) {
-			LOG_ERR("Error in poll: POLLNVAL - fd %d not open", fds[i].fd);
-			cancel_requests_with(clients[i], -EIO);
+		} else {
+			for (int i = 0; i < nfds; i++) {
+
+				if (fds[i].revents & ZSOCK_POLLERR) {
+					LOG_ERR("Error in poll for socket %d", fds[i].fd);
+					clients[i]->socket_error = -EIO;
+				}
+				if (fds[i].revents & ZSOCK_POLLHUP) {
+					LOG_ERR("Error in poll: POLLHUP for socket %d", fds[i].fd);
+					clients[i]->socket_error = -ENOTCONN;
+				}
+				if (fds[i].revents & ZSOCK_POLLNVAL) {
+					LOG_ERR("Error in poll: POLLNVAL - fd %d not open",
+						fds[i].fd);
+					clients[i]->socket_error = -EINVAL;
+				}
+				if (fds[i].revents & ZSOCK_POLLIN) {
+					clients[i]->response_ready = true;
+				}
+
+			}
+
+			return 0;
 		}
 	}
 
-	return 0;
+	return ret;
 }
 
 static bool token_compare(struct coap_client_internal_request *internal_req,
@@ -906,13 +895,14 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 		}
 	}
 fail:
+	client->response_ready = false;
 	if (ret < 0 || !internal_req->is_observe) {
 		internal_req->request_ongoing = false;
 	}
 	return ret;
 }
 
-static void cancel_requests_with(struct coap_client *client, int error)
+void coap_client_cancel_requests(struct coap_client *client)
 {
 	k_mutex_lock(&client->lock, K_FOREVER);
 
@@ -924,20 +914,33 @@ static void cancel_requests_with(struct coap_client *client, int error)
 			 * do not reenter it. In that case, the user knows their
 			 * request was cancelled anyway.
 			 */
-			report_callback_error(&client->requests[i], error);
-			reset_internal_request(&client->requests[i]);
+			report_callback_error(&client->requests[i], -ECANCELED);
+			client->requests[i].request_ongoing = false;
+			client->requests[i].is_observe = false;
 		}
 	}
 	atomic_clear(&coap_client_recv_active);
 	k_mutex_unlock(&client->lock);
 
+	/* Wait until after zsock_poll() can time out and return. */
+	k_sleep(K_MSEC(COAP_PERIODIC_TIMEOUT));
 }
 
-void coap_client_cancel_requests(struct coap_client *client)
+static void signal_socket_error(struct coap_client *cli)
 {
-	cancel_requests_with(client, -ECANCELED);
-	/* Wait until after zsock_poll() can time out and return. */
-	k_sleep(K_MSEC(COAP_PERIODIC_TIMEOUT));
+	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
+		struct coap_client_internal_request *req = &cli->requests[i];
+
+		if (!req->request_ongoing) {
+			continue;
+		}
+
+		req->request_ongoing = false;
+		if (req->coap_request.cb) {
+			req->coap_request.cb(cli->socket_error, 0, NULL, 0,
+					     true, req->coap_request.user_data);
+		}
+	}
 }
 
 void coap_client_recv(void *coap_cl, void *a, void *b)
@@ -954,6 +957,41 @@ void coap_client_recv(void *coap_cl, void *a, void *b)
 			goto idle;
 		}
 
+		for (int i = 0; i < num_clients; i++) {
+			if (clients[i]->response_ready) {
+				struct coap_packet response;
+				bool response_truncated = false;
+
+				k_mutex_lock(&clients[i]->lock, K_FOREVER);
+
+				ret = recv_response(clients[i], &response, &response_truncated);
+				if (ret < 0) {
+					LOG_ERR("Error receiving response");
+					clients[i]->response_ready = false;
+					k_mutex_unlock(&clients[i]->lock);
+					if (ret == -EOPNOTSUPP) {
+						LOG_ERR("Socket misconfigured.");
+						goto idle;
+					}
+					continue;
+				}
+
+				ret = handle_response(clients[i], &response, response_truncated);
+				if (ret < 0) {
+					LOG_ERR("Error handling response");
+				}
+
+				clients[i]->response_ready = false;
+				k_mutex_unlock(&clients[i]->lock);
+			}
+
+			if (clients[i]->socket_error) {
+				signal_socket_error(clients[i]);
+				clients[i]->socket_error = 0;
+			}
+
+		}
+
 		/* There are more messages coming */
 		if (has_ongoing_exchanges()) {
 			continue;
diff --git a/tests/net/lib/coap_client/CMakeLists.txt b/tests/net/lib/coap_client/CMakeLists.txt
index d7f0c0cce5e..e12214fc6a9 100644
--- a/tests/net/lib/coap_client/CMakeLists.txt
+++ b/tests/net/lib/coap_client/CMakeLists.txt
@@ -31,4 +31,3 @@ add_compile_definitions(CONFIG_COAP_CLIENT_MAX_REQUESTS=2)
 add_compile_definitions(CONFIG_COAP_CLIENT_MAX_INSTANCES=2)
 add_compile_definitions(CONFIG_COAP_MAX_RETRANSMIT=4)
 add_compile_definitions(CONFIG_COAP_BACKOFF_PERCENT=200)
-add_compile_definitions(CONFIG_COAP_LOG_LEVEL=4)
diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 20f1e4d8381..25c2c58f2fd 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -77,7 +77,7 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake(int sock, void *buf, size_t max
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
-	clear_socket_events(ZSOCK_POLLIN);
+	clear_socket_events();
 
 	return sizeof(ack_data);
 }
@@ -205,7 +205,7 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_response(int sock, void *buf, s
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
-	clear_socket_events(ZSOCK_POLLIN);
+	clear_socket_events();
 
 	return sizeof(ack_data);
 }
@@ -247,7 +247,7 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_unmatching(int sock, void *buf,
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
-	clear_socket_events(ZSOCK_POLLIN);
+	clear_socket_events();
 
 	return sizeof(ack_data);
 }
@@ -273,7 +273,7 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_echo(int sock, void *buf, size_
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_response;
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_echo;
 
-	clear_socket_events(ZSOCK_POLLIN);
+	clear_socket_events();
 
 	return sizeof(ack_data);
 }
@@ -299,7 +299,7 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_echo_next_req(int sock, void *b
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_response;
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_echo_next_req;
 
-	clear_socket_events(ZSOCK_POLLIN);
+	clear_socket_events();
 
 	return sizeof(ack_data);
 }
@@ -335,9 +335,6 @@ void coap_callback(int16_t code, size_t offset, const uint8_t *payload, size_t l
 {
 	LOG_INF("CoAP response callback, %d", code);
 	last_response_code = code;
-	if (user_data) {
-		k_sem_give((struct k_sem *) user_data);
-	}
 }
 
 ZTEST_SUITE(coap_client, NULL, suite_setup, test_setup, NULL, NULL);
@@ -395,7 +392,7 @@ ZTEST(coap_client, test_resend_request)
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	k_sleep(K_MSEC(MORE_THAN_ACK_TIMEOUT_MS));
-	set_socket_events(ZSOCK_POLLIN | ZSOCK_POLLOUT);
+	set_socket_events(ZSOCK_POLLIN);
 
 	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
@@ -550,7 +547,6 @@ ZTEST(coap_client, test_no_response)
 	client_request.len = strlen(short_payload);
 
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
-	set_socket_events(ZSOCK_POLLOUT);
 
 	k_sleep(K_MSEC(1));
 
@@ -596,35 +592,30 @@ ZTEST(coap_client, test_multiple_requests)
 {
 	int ret = 0;
 	int retry = MORE_THAN_EXCHANGE_LIFETIME_MS;
-	struct k_sem sem1, sem2;
 
 	struct sockaddr address = {0};
-	struct coap_client_request req1 = {
+	struct coap_client_request client_request = {
 		.method = COAP_METHOD_GET,
 		.confirmable = true,
 		.path = test_path,
 		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
 		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem1
+		.payload = NULL,
+		.len = 0
 	};
-	struct coap_client_request req2 = req1;
-
-	req2.user_data = &sem2;
 
-	k_sem_init(&sem1, 0, 1);
-	k_sem_init(&sem2, 0, 1);
+	client_request.payload = short_payload;
+	client_request.len = strlen(short_payload);
 
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
 
 	k_sleep(K_MSEC(1));
 
 	LOG_INF("Send request");
-	ret = coap_client_req(&client, 0, &address, &req1, NULL);
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
-	ret = coap_client_req(&client, 0, &address, &req2, NULL);
+	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
 	set_socket_events(ZSOCK_POLLIN);
@@ -634,10 +625,8 @@ ZTEST(coap_client, test_multiple_requests)
 	}
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
-	last_response_code = 0;
 	set_socket_events(ZSOCK_POLLIN);
-	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
+	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
 
@@ -664,7 +653,6 @@ ZTEST(coap_client, test_unmatching_tokens)
 	client_request.len = strlen(short_payload);
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_unmatching;
-	set_socket_events(ZSOCK_POLLIN | ZSOCK_POLLOUT);
 
 	k_sleep(K_MSEC(1));
 
@@ -675,57 +663,3 @@ ZTEST(coap_client, test_unmatching_tokens)
 	k_sleep(K_MSEC(MORE_THAN_LONG_EXCHANGE_LIFETIME_MS));
 	zassert_equal(last_response_code, -ETIMEDOUT, "Unexpected response");
 }
-
-ZTEST(coap_client, test_multiple_clients)
-{
-	int ret;
-	int retry = MORE_THAN_EXCHANGE_LIFETIME_MS;
-	static struct coap_client client2 = {
-		.fd = 2,
-	};
-	struct k_sem sem1, sem2;
-	struct sockaddr address = {0};
-	struct coap_client_request req1 = {
-		.method = COAP_METHOD_GET,
-		.confirmable = true,
-		.path = test_path,
-		.fmt = COAP_CONTENT_FORMAT_TEXT_PLAIN,
-		.cb = coap_callback,
-		.payload = short_payload,
-		.len = strlen(short_payload),
-		.user_data = &sem1
-	};
-	struct coap_client_request req2 = req1;
-
-	req2.user_data = &sem2;
-	req2.payload = long_payload;
-	req2.len = strlen(long_payload);
-
-	zassert_ok(k_sem_init(&sem1, 0, 1));
-	zassert_ok(k_sem_init(&sem2, 0, 1));
-
-	zassert_ok(coap_client_init(&client2, NULL));
-
-	k_sleep(K_MSEC(1));
-
-	LOG_INF("Sending requests");
-	ret = coap_client_req(&client, 1, &address, &req1, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-
-	ret = coap_client_req(&client2, 2, &address, &req2, NULL);
-	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-
-	while (last_response_code == 0 && retry > 0) {
-		retry--;
-		k_sleep(K_MSEC(1));
-	}
-	set_socket_events(ZSOCK_POLLIN);
-
-	k_sleep(K_SECONDS(1));
-
-	/* ensure we got both responses */
-	zassert_ok(k_sem_take(&sem1, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_ok(k_sem_take(&sem2, K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS)));
-	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
-
-}
diff --git a/tests/net/lib/coap_client/src/stubs.c b/tests/net/lib/coap_client/src/stubs.c
index 63307e27fb7..471cc8642bc 100644
--- a/tests/net/lib/coap_client/src/stubs.c
+++ b/tests/net/lib/coap_client/src/stubs.c
@@ -29,9 +29,9 @@ void set_socket_events(short events)
 	my_events |= events;
 }
 
-void clear_socket_events(short events)
+void clear_socket_events(void)
 {
-	my_events &= ~events;
+	my_events = 0;
 }
 
 int z_impl_zsock_socket(int family, int type, int proto)
@@ -41,14 +41,13 @@ int z_impl_zsock_socket(int family, int type, int proto)
 
 int z_impl_zsock_poll(struct zsock_pollfd *fds, int nfds, int poll_timeout)
 {
-	int events = 0;
+	LOG_INF("Polling, events %d", my_events);
 	k_sleep(K_MSEC(1));
-	for (int i = 0; i < nfds; i++) {
-		fds[i].revents = my_events & (fds[i].events | ZSOCK_POLLERR | ZSOCK_POLLHUP);
-		if (fds[i].revents) {
-			events++;
-		}
+	fds->revents = my_events;
+
+	if (my_events) {
+		return 1;
 	}
 
-	return events;
+	return 0;
 }
diff --git a/tests/net/lib/coap_client/src/stubs.h b/tests/net/lib/coap_client/src/stubs.h
index 9a9f929ce76..eb340d914eb 100644
--- a/tests/net/lib/coap_client/src/stubs.h
+++ b/tests/net/lib/coap_client/src/stubs.h
@@ -15,30 +15,11 @@
 
 #include <zephyr/net/coap_client.h>
 
-
-/* Copy from zephyr/include/zephyr/net/socket.h */
-/**
- * @name Options for poll()
- * @{
- */
-/* ZSOCK_POLL* values are compatible with Linux */
-/** zsock_poll: Poll for readability */
-#define ZSOCK_POLLIN 1
-/** zsock_poll: Poll for exceptional condition */
-#define ZSOCK_POLLPRI 2
-/** zsock_poll: Poll for writability */
+#define ZSOCK_POLLIN  1
 #define ZSOCK_POLLOUT 4
-/** zsock_poll: Poll results in error condition (output value only) */
-#define ZSOCK_POLLERR 8
-/** zsock_poll: Poll detected closed connection (output value only) */
-#define ZSOCK_POLLHUP 0x10
-/** zsock_poll: Invalid socket (output value only) */
-#define ZSOCK_POLLNVAL 0x20
-/** @} */
-
 
 void set_socket_events(short events);
-void clear_socket_events(short events);
+void clear_socket_events(void);
 
 DECLARE_FAKE_VALUE_FUNC(uint32_t, z_impl_sys_rand32_get);
 DECLARE_FAKE_VOID_FUNC(z_impl_sys_rand_get, void *, size_t);

From 5e2e5b55fdb94f8c19fe6d8d3b73fd279c0bca3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:35 +0100
Subject: [PATCH 1539/2913] Revert "[nrf fromtree] net: lib: coap_client:
 Release internal request when failed to send"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2f805a195833fb05bd2197408292194fd83227c7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index d7cfcdd680e..bfe6aa323cf 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -69,7 +69,6 @@ static void reset_internal_request(struct coap_client_internal_request *request)
 	request->offset = 0;
 	request->last_id = 0;
 	request->last_response_id = -1;
-	request->request_ongoing = false;
 	reset_block_contexts(request);
 }
 
@@ -427,7 +426,6 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
 			  &client->address, client->socklen);
 	if (ret < 0) {
 		LOG_ERR("Transmission failed: %d", errno);
-		reset_internal_request(internal_req);
 	} else {
 		/* Do not return the number of bytes sent */
 		ret = 0;

From 95461ae212fcc08dd8762a8ba804836d8009f146 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:35 +0100
Subject: [PATCH 1540/2913] Revert "[nrf fromtree] net: lib: coap_client:
 Protect initialization with mutex"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ac333fc51bef57534b46fd0f7d64543d6e939552.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index bfe6aa323cf..24b1767fea5 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -20,7 +20,6 @@ LOG_MODULE_DECLARE(net_coap, CONFIG_COAP_LOG_LEVEL);
 #define BLOCK1_OPTION_SIZE 4
 #define PAYLOAD_MARKER_SIZE 1
 
-static K_MUTEX_DEFINE(coap_client_mutex);
 static struct coap_client *clients[CONFIG_COAP_CLIENT_MAX_INSTANCES];
 static int num_clients;
 static K_SEM_DEFINE(coap_client_recv_sem, 0, 1);
@@ -1007,9 +1006,7 @@ int coap_client_init(struct coap_client *client, const char *info)
 		return -EINVAL;
 	}
 
-	k_mutex_lock(&coap_client_mutex, K_FOREVER);
 	if (num_clients >= CONFIG_COAP_CLIENT_MAX_INSTANCES) {
-		k_mutex_unlock(&coap_client_mutex);
 		return -ENOSPC;
 	}
 
@@ -1018,7 +1015,6 @@ int coap_client_init(struct coap_client *client, const char *info)
 	clients[num_clients] = client;
 	num_clients++;
 
-	k_mutex_unlock(&coap_client_mutex);
 	return 0;
 }
 

From daa6cc182700ff2673c0a3378ffb5acc8233d27e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:35 +0100
Subject: [PATCH 1541/2913] Revert "[nrf fromtree] net: coap_client: signal
 socket error to user"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 69d77ff432f98de07429c09fd46f96cc0d80ec96.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/coap_client.h  |  1 -
 subsys/net/lib/coap/coap_client.c | 30 +-----------------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/include/zephyr/net/coap_client.h b/include/zephyr/net/coap_client.h
index 00b97af60af..a4f35374c93 100644
--- a/include/zephyr/net/coap_client.h
+++ b/include/zephyr/net/coap_client.h
@@ -115,7 +115,6 @@ struct coap_client {
 	struct coap_client_internal_request requests[CONFIG_COAP_CLIENT_MAX_REQUESTS];
 	struct coap_option echo_option;
 	bool send_echo;
-	int socket_error;
 };
 /** @endcond */
 
diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 24b1767fea5..e841a1998dc 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -550,24 +550,19 @@ static int handle_poll(void)
 
 		} else {
 			for (int i = 0; i < nfds; i++) {
-
 				if (fds[i].revents & ZSOCK_POLLERR) {
 					LOG_ERR("Error in poll for socket %d", fds[i].fd);
-					clients[i]->socket_error = -EIO;
 				}
 				if (fds[i].revents & ZSOCK_POLLHUP) {
 					LOG_ERR("Error in poll: POLLHUP for socket %d", fds[i].fd);
-					clients[i]->socket_error = -ENOTCONN;
 				}
 				if (fds[i].revents & ZSOCK_POLLNVAL) {
 					LOG_ERR("Error in poll: POLLNVAL - fd %d not open",
 						fds[i].fd);
-					clients[i]->socket_error = -EINVAL;
 				}
 				if (fds[i].revents & ZSOCK_POLLIN) {
 					clients[i]->response_ready = true;
 				}
-
 			}
 
 			return 0;
@@ -923,24 +918,7 @@ void coap_client_cancel_requests(struct coap_client *client)
 	k_sleep(K_MSEC(COAP_PERIODIC_TIMEOUT));
 }
 
-static void signal_socket_error(struct coap_client *cli)
-{
-	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
-		struct coap_client_internal_request *req = &cli->requests[i];
-
-		if (!req->request_ongoing) {
-			continue;
-		}
-
-		req->request_ongoing = false;
-		if (req->coap_request.cb) {
-			req->coap_request.cb(cli->socket_error, 0, NULL, 0,
-					     true, req->coap_request.user_data);
-		}
-	}
-}
-
-void coap_client_recv(void *coap_cl, void *a, void *b)
+static void coap_client_recv(void *coap_cl, void *a, void *b)
 {
 	int ret;
 
@@ -981,12 +959,6 @@ void coap_client_recv(void *coap_cl, void *a, void *b)
 				clients[i]->response_ready = false;
 				k_mutex_unlock(&clients[i]->lock);
 			}
-
-			if (clients[i]->socket_error) {
-				signal_socket_error(clients[i]);
-				clients[i]->socket_error = 0;
-			}
-
 		}
 
 		/* There are more messages coming */

From 105f248a9e7102fef348e7be3c9d3f8ad076e083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:35 +0100
Subject: [PATCH 1542/2913] Revert "[nrf fromtree] net: lib: coap: make ACK
 random factor runtime configurable"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit aa630f05b2ba65ee1e202f80c2a3d495b4099969.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/coap.h     | 9 +--------
 subsys/net/lib/coap/coap.c    | 8 ++------
 tests/net/lib/coap/src/main.c | 6 ------
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/include/zephyr/net/coap.h b/include/zephyr/net/coap.h
index 7a0c7ee7f91..bf0d86cfaf7 100644
--- a/include/zephyr/net/coap.h
+++ b/include/zephyr/net/coap.h
@@ -355,15 +355,8 @@ typedef int (*coap_reply_t)(const struct coap_packet *response,
  * @brief CoAP transmission parameters.
  */
 struct coap_transmission_parameters {
-	/** Initial ACK timeout. Value is used as a base value to retry pending CoAP packets. */
+	/**  Initial ACK timeout. Value is used as a base value to retry pending CoAP packets. */
 	uint32_t ack_timeout;
-#if defined(CONFIG_COAP_RANDOMIZE_ACK_TIMEOUT) || defined(__DOXYGEN__)
-	/**
-	 * Set CoAP ack random factor. A value of 150 means a factor of 1.5. A value of 0 defaults
-	 * to @kconfig{CONFIG_COAP_ACK_RANDOM_PERCENT}. The value must be >= 100.
-	 */
-	uint16_t ack_random_percent;
-#endif /* defined(CONFIG_COAP_RANDOMIZE_ACK_TIMEOUT) */
 	/** Set CoAP retry backoff factor. A value of 200 means a factor of 2.0. */
 	uint16_t coap_backoff_percent;
 	/** Maximum number of retransmissions. */
diff --git a/subsys/net/lib/coap/coap.c b/subsys/net/lib/coap/coap.c
index 25ad262c923..c557f3c424b 100644
--- a/subsys/net/lib/coap/coap.c
+++ b/subsys/net/lib/coap/coap.c
@@ -59,9 +59,6 @@ static uint16_t message_id;
 static struct coap_transmission_parameters coap_transmission_params = {
 	.max_retransmission = CONFIG_COAP_MAX_RETRANSMIT,
 	.ack_timeout = CONFIG_COAP_INIT_ACK_TIMEOUT_MS,
-#if defined(CONFIG_COAP_RANDOMIZE_ACK_TIMEOUT)
-	.ack_random_percent = CONFIG_COAP_ACK_RANDOM_PERCENT,
-#endif /* defined(CONFIG_COAP_RANDOMIZE_ACK_TIMEOUT) */
 	.coap_backoff_percent = CONFIG_COAP_BACKOFF_PERCENT
 };
 
@@ -1709,9 +1706,8 @@ struct coap_pending *coap_pending_next_to_expire(
 static uint32_t init_ack_timeout(const struct coap_transmission_parameters *params)
 {
 #if defined(CONFIG_COAP_RANDOMIZE_ACK_TIMEOUT)
-	const uint16_t random_percent = params->ack_random_percent ? params->ack_random_percent
-								   : CONFIG_COAP_ACK_RANDOM_PERCENT;
-	const uint32_t max_ack = params->ack_timeout * random_percent / 100U;
+	const uint32_t max_ack = params->ack_timeout *
+				 CONFIG_COAP_ACK_RANDOM_PERCENT / 100;
 	const uint32_t min_ack = params->ack_timeout;
 
 	/* Randomly generated initial ACK timeout
diff --git a/tests/net/lib/coap/src/main.c b/tests/net/lib/coap/src/main.c
index 10c7cef1d2c..18012cc7873 100644
--- a/tests/net/lib/coap/src/main.c
+++ b/tests/net/lib/coap/src/main.c
@@ -1750,15 +1750,12 @@ ZTEST(coap, test_transmission_parameters)
 
 	params = coap_get_transmission_parameters();
 	zassert_equal(params.ack_timeout, CONFIG_COAP_INIT_ACK_TIMEOUT_MS, "Wrong ACK timeout");
-	zassert_equal(params.ack_random_percent, CONFIG_COAP_ACK_RANDOM_PERCENT,
-		      "Wrong ACK random percent");
 	zassert_equal(params.coap_backoff_percent, CONFIG_COAP_BACKOFF_PERCENT,
 		      "Wrong backoff percent");
 	zassert_equal(params.max_retransmission, CONFIG_COAP_MAX_RETRANSMIT,
 		      "Wrong max retransmission value");
 
 	params.ack_timeout = 1000;
-	params.ack_random_percent = 110;
 	params.coap_backoff_percent = 150;
 	params.max_retransmission = 2;
 
@@ -1775,7 +1772,6 @@ ZTEST(coap, test_transmission_parameters)
 	zassert_not_null(pending, "No free pending");
 
 	params.ack_timeout = 3000;
-	params.ack_random_percent = 130;
 	params.coap_backoff_percent = 250;
 	params.max_retransmission = 3;
 
@@ -1784,7 +1780,6 @@ ZTEST(coap, test_transmission_parameters)
 	zassert_equal(r, 0, "Could not initialize packet");
 
 	zassert_equal(pending->params.ack_timeout, 3000, "Wrong ACK timeout");
-	zassert_equal(pending->params.ack_random_percent, 130, "Wrong ACK random percent");
 	zassert_equal(pending->params.coap_backoff_percent, 250, "Wrong backoff percent");
 	zassert_equal(pending->params.max_retransmission, 3, "Wrong max retransmission value");
 
@@ -1793,7 +1788,6 @@ ZTEST(coap, test_transmission_parameters)
 	zassert_equal(r, 0, "Could not initialize packet");
 
 	zassert_equal(pending->params.ack_timeout, 1000, "Wrong ACK timeout");
-	zassert_equal(pending->params.ack_random_percent, 110, "Wrong ACK random percent");
 	zassert_equal(pending->params.coap_backoff_percent, 150, "Wrong backoff percent");
 	zassert_equal(pending->params.max_retransmission, 2, "Wrong max retransmission value");
 }

From f392137261bf85a26b3887d639660e6497047e4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:35 +0100
Subject: [PATCH 1543/2913] Revert "[nrf fromtree] tests: coap_client:
 optimize/reduce sleep time"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3ce3d7f4e2c3059271ee492e585f3c3f7cbaa43d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/lib/coap_client/src/main.c  | 311 +++++++++++++-------------
 tests/net/lib/coap_client/src/stubs.c |   9 +-
 2 files changed, 164 insertions(+), 156 deletions(-)

diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 25c2c58f2fd..b487bdf7d5a 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -16,123 +16,87 @@ LOG_MODULE_REGISTER(coap_client_test);
 DEFINE_FFF_GLOBALS;
 #define FFF_FAKES_LIST(FAKE)
 
-#define LONG_ACK_TIMEOUT_MS                 200
-#define MORE_THAN_EXCHANGE_LIFETIME_MS      4 * CONFIG_COAP_INIT_ACK_TIMEOUT_MS
-#define MORE_THAN_LONG_EXCHANGE_LIFETIME_MS 4 * LONG_ACK_TIMEOUT_MS
-#define MORE_THAN_ACK_TIMEOUT_MS                                                                   \
-	(CONFIG_COAP_INIT_ACK_TIMEOUT_MS + CONFIG_COAP_INIT_ACK_TIMEOUT_MS / 2)
-
-#define VALID_MESSAGE_ID BIT(31)
-
 static int16_t last_response_code;
 static const char *test_path = "test";
 
-static uint32_t messages_needing_response[2];
+static uint16_t messages_needing_response[2];
 
 static struct coap_client client;
 
 static char *short_payload = "testing";
 static char *long_payload = LOREM_IPSUM_SHORT;
 
-static uint16_t get_next_pending_message_id(void)
-{
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(messages_needing_response); i++) {
-		if (messages_needing_response[i] & VALID_MESSAGE_ID) {
-			messages_needing_response[i] &= ~VALID_MESSAGE_ID;
-			return messages_needing_response[i];
-		}
-	}
-
-	return UINT16_MAX;
-}
-
-static void set_next_pending_message_id(uint16_t id)
-{
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(messages_needing_response); i++) {
-		if (!(messages_needing_response[i] & VALID_MESSAGE_ID)) {
-			messages_needing_response[i] = id;
-			messages_needing_response[i] |= VALID_MESSAGE_ID;
-			return;
-		}
-	}
-}
-
 static ssize_t z_impl_zsock_recvfrom_custom_fake(int sock, void *buf, size_t max_len, int flags,
-						 struct sockaddr *src_addr, socklen_t *addrlen)
+					  struct sockaddr *src_addr, socklen_t *addrlen)
 {
 	uint16_t last_message_id = 0;
 
 	LOG_INF("Recvfrom");
-	uint8_t ack_data[] = {0x68, 0x40, 0x00, 0x00, 0x00, 0x00,
-			      0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+	uint8_t ack_data[] = {
+		0x68, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	};
 
-	last_message_id = get_next_pending_message_id();
+	if (messages_needing_response[0] != 0) {
+		last_message_id = messages_needing_response[0];
+		messages_needing_response[0] = 0;
+	} else {
+		last_message_id = messages_needing_response[1];
+		messages_needing_response[1] = 0;
+	}
 
-	ack_data[2] = (uint8_t)(last_message_id >> 8);
-	ack_data[3] = (uint8_t)last_message_id;
+	ack_data[2] = (uint8_t) (last_message_id >> 8);
+	ack_data[3] = (uint8_t) last_message_id;
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
-	clear_socket_events();
-
 	return sizeof(ack_data);
 }
 
-static ssize_t z_impl_zsock_sendto_custom_fake(int sock, void *buf, size_t len, int flags,
-					       const struct sockaddr *dest_addr, socklen_t addrlen)
+static ssize_t z_impl_zsock_sendto_custom_fake(int sock, void *buf, size_t len,
+			       int flags, const struct sockaddr *dest_addr,
+			       socklen_t addrlen)
 {
 	uint16_t last_message_id = 0;
-	uint8_t type;
-
-	last_message_id |= ((uint8_t *)buf)[2] << 8;
-	last_message_id |= ((uint8_t *)buf)[3];
 
-	type = (((uint8_t *)buf)[0] & 0x30) >> 4;
+	last_message_id |= ((uint8_t *) buf)[2] << 8;
+	last_message_id |= ((uint8_t *) buf)[3];
 
-	set_next_pending_message_id(last_message_id);
-	LOG_INF("Latest message ID: %d", last_message_id);
-
-	if (type == 0) {
-		set_socket_events(ZSOCK_POLLIN);
+	if (messages_needing_response[0] == 0) {
+		messages_needing_response[0] = last_message_id;
+	} else {
+		messages_needing_response[1] = last_message_id;
 	}
 
-	return 1;
-}
+	last_response_code = ((uint8_t *) buf)[1];
 
-static ssize_t z_impl_zsock_sendto_custom_fake_no_reply(int sock, void *buf, size_t len, int flags,
-							const struct sockaddr *dest_addr,
-							socklen_t addrlen)
-{
-	uint16_t last_message_id = 0;
-
-	last_message_id |= ((uint8_t *)buf)[2] << 8;
-	last_message_id |= ((uint8_t *)buf)[3];
-
-	set_next_pending_message_id(last_message_id);
 	LOG_INF("Latest message ID: %d", last_message_id);
 
 	return 1;
 }
 
-static ssize_t z_impl_zsock_sendto_custom_fake_echo(int sock, void *buf, size_t len, int flags,
-						    const struct sockaddr *dest_addr,
-						    socklen_t addrlen)
+static ssize_t z_impl_zsock_sendto_custom_fake_echo(int sock, void *buf, size_t len,
+			       int flags, const struct sockaddr *dest_addr,
+			       socklen_t addrlen)
 {
 	uint16_t last_message_id = 0;
 	struct coap_packet response = {0};
 	struct coap_option option = {0};
 
-	last_message_id |= ((uint8_t *)buf)[2] << 8;
-	last_message_id |= ((uint8_t *)buf)[3];
+	last_message_id |= ((uint8_t *) buf)[2] << 8;
+	last_message_id |= ((uint8_t *) buf)[3];
+
+	if (messages_needing_response[0] == 0) {
+		messages_needing_response[0] = last_message_id;
+	} else {
+		messages_needing_response[1] = last_message_id;
+	}
+
+	last_response_code = ((uint8_t *) buf)[1];
 
-	set_next_pending_message_id(last_message_id);
 	LOG_INF("Latest message ID: %d", last_message_id);
 
 	int ret = coap_packet_parse(&response, buf, len, NULL, 0);
+
 	if (ret < 0) {
 		LOG_ERR("Invalid data received");
 	}
@@ -144,27 +108,32 @@ static ssize_t z_impl_zsock_sendto_custom_fake_echo(int sock, void *buf, size_t
 
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake;
 
-	set_socket_events(ZSOCK_POLLIN);
-
 	return 1;
 }
 
 static ssize_t z_impl_zsock_sendto_custom_fake_echo_next_req(int sock, void *buf, size_t len,
-							     int flags,
-							     const struct sockaddr *dest_addr,
-							     socklen_t addrlen)
+			       int flags, const struct sockaddr *dest_addr,
+			       socklen_t addrlen)
 {
 	uint16_t last_message_id = 0;
 	struct coap_packet response = {0};
 	struct coap_option option = {0};
 
-	last_message_id |= ((uint8_t *)buf)[2] << 8;
-	last_message_id |= ((uint8_t *)buf)[3];
+	last_message_id |= ((uint8_t *) buf)[2] << 8;
+	last_message_id |= ((uint8_t *) buf)[3];
+
+	if (messages_needing_response[0] == 0) {
+		messages_needing_response[0] = last_message_id;
+	} else {
+		messages_needing_response[1] = last_message_id;
+	}
+
+	last_response_code = ((uint8_t *) buf)[1];
 
-	set_next_pending_message_id(last_message_id);
 	LOG_INF("Latest message ID: %d", last_message_id);
 
 	int ret = coap_packet_parse(&response, buf, len, NULL, 0);
+
 	if (ret < 0) {
 		LOG_ERR("Invalid data received");
 	}
@@ -184,8 +153,6 @@ static ssize_t z_impl_zsock_sendto_custom_fake_echo_next_req(int sock, void *buf
 
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake;
 
-	set_socket_events(ZSOCK_POLLIN);
-
 	return 1;
 }
 
@@ -195,17 +162,50 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_response(int sock, void *buf, s
 {
 	uint16_t last_message_id = 0;
 
-	static uint8_t ack_data[] = {0x48, 0x40, 0x00, 0x00, 0x00, 0x00,
-				     0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+	static uint8_t ack_data[] = {
+		0x48, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	};
 
-	last_message_id = get_next_pending_message_id();
+	if (messages_needing_response[0] != 0) {
+		last_message_id = messages_needing_response[0];
+		messages_needing_response[0] = 0;
+	} else {
+		last_message_id = messages_needing_response[1];
+		messages_needing_response[1] = 0;
+	}
 
-	ack_data[2] = (uint8_t)(last_message_id >> 8);
-	ack_data[3] = (uint8_t)last_message_id;
+	ack_data[2] = (uint8_t) (last_message_id >> 8);
+	ack_data[3] = (uint8_t) last_message_id;
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
-	clear_socket_events();
+	return sizeof(ack_data);
+}
+
+static ssize_t z_impl_zsock_recvfrom_custom_fake_delayed_response(int sock, void *buf,
+								  size_t max_len, int flags,
+								  struct sockaddr *src_addr,
+								  socklen_t *addrlen)
+{
+	uint16_t last_message_id = 0;
+
+	static uint8_t ack_data[] = {
+		0x68, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	};
+
+	if (messages_needing_response[0] != 0) {
+		last_message_id = messages_needing_response[0];
+		messages_needing_response[0] = 0;
+	} else {
+		last_message_id = messages_needing_response[1];
+		messages_needing_response[1] = 0;
+	}
+
+	ack_data[2] = (uint8_t) (last_message_id >> 8);
+	ack_data[3] = (uint8_t) last_message_id;
+
+	memcpy(buf, ack_data, sizeof(ack_data));
+	k_sleep(K_MSEC(10));
 
 	return sizeof(ack_data);
 }
@@ -216,13 +216,20 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_empty_ack(int sock, void *buf,
 {
 	uint16_t last_message_id = 0;
 
-	static uint8_t ack_data[] = {0x68, 0x00, 0x00, 0x00, 0x00, 0x00,
-				     0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+	static uint8_t ack_data[] = {
+		0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	};
 
-	last_message_id = get_next_pending_message_id();
+	if (messages_needing_response[0] != 0) {
+		last_message_id = messages_needing_response[0];
+		messages_needing_response[0] = 0;
+	} else {
+		last_message_id = messages_needing_response[1];
+		messages_needing_response[1] = 0;
+	}
 
-	ack_data[2] = (uint8_t)(last_message_id >> 8);
-	ack_data[3] = (uint8_t)last_message_id;
+	ack_data[2] = (uint8_t) (last_message_id >> 8);
+	ack_data[3] = (uint8_t) last_message_id;
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
@@ -237,18 +244,23 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_unmatching(int sock, void *buf,
 {
 	uint16_t last_message_id = 0;
 
-	static uint8_t ack_data[] = {0x68, 0x40, 0x00, 0x00, 0x00, 0x00,
-				     0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
+	static uint8_t ack_data[] = {
+		0x68, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
+	};
 
-	last_message_id = get_next_pending_message_id();
+	if (messages_needing_response[0] != 0) {
+		last_message_id = messages_needing_response[0];
+		messages_needing_response[0] = 0;
+	} else {
+		last_message_id = messages_needing_response[1];
+		messages_needing_response[1] = 0;
+	}
 
-	ack_data[2] = (uint8_t)(last_message_id >> 8);
-	ack_data[3] = (uint8_t)last_message_id;
+	ack_data[2] = (uint8_t) (last_message_id >> 8);
+	ack_data[3] = (uint8_t) last_message_id;
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
-	clear_socket_events();
-
 	return sizeof(ack_data);
 }
 
@@ -263,18 +275,22 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_echo(int sock, void *buf, size_
 			      0x00, 0x00, 0x00, 0x00, 0xda, 0xef, 'e',  'c',
 			      'h',  'o',  '_',  'v',  'a',  'l',  'u',  'e'};
 
-	last_message_id = get_next_pending_message_id();
+	if (messages_needing_response[0] != 0) {
+		last_message_id = messages_needing_response[0];
+		messages_needing_response[0] = 0;
+	} else {
+		last_message_id = messages_needing_response[1];
+		messages_needing_response[1] = 0;
+	}
 
-	ack_data[2] = (uint8_t)(last_message_id >> 8);
-	ack_data[3] = (uint8_t)last_message_id;
+	ack_data[2] = (uint8_t) (last_message_id >> 8);
+	ack_data[3] = (uint8_t) last_message_id;
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_response;
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_echo;
 
-	clear_socket_events();
-
 	return sizeof(ack_data);
 }
 
@@ -289,18 +305,22 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_echo_next_req(int sock, void *b
 			      0x00, 0x00, 0x00, 0x00, 0xda, 0xef, 'e',  'c',
 			      'h',  'o',  '_',  'v',  'a',  'l',  'u',  'e'};
 
-	last_message_id = get_next_pending_message_id();
+	if (messages_needing_response[0] != 0) {
+		last_message_id = messages_needing_response[0];
+		messages_needing_response[0] = 0;
+	} else {
+		last_message_id = messages_needing_response[1];
+		messages_needing_response[1] = 0;
+	}
 
-	ack_data[2] = (uint8_t)(last_message_id >> 8);
-	ack_data[3] = (uint8_t)last_message_id;
+	ack_data[2] = (uint8_t) (last_message_id >> 8);
+	ack_data[3] = (uint8_t) last_message_id;
 
 	memcpy(buf, ack_data, sizeof(ack_data));
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_response;
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_echo_next_req;
 
-	clear_socket_events();
-
 	return sizeof(ack_data);
 }
 
@@ -313,8 +333,6 @@ static void *suite_setup(void)
 
 static void test_setup(void *data)
 {
-	int i;
-
 	/* Register resets */
 	DO_FOREACH_FAKE(RESET_FAKE);
 	/* reset common FFF internal structures */
@@ -322,12 +340,8 @@ static void test_setup(void *data)
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake;
 	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake;
-
-	for (i = 0; i < ARRAY_SIZE(messages_needing_response); i++) {
-		messages_needing_response[i] = 0;
-	}
-
-	last_response_code = 0;
+	messages_needing_response[0] = 0;
+	messages_needing_response[1] = 0;
 }
 
 void coap_callback(int16_t code, size_t offset, const uint8_t *payload, size_t len, bool last_block,
@@ -361,10 +375,10 @@ ZTEST(coap_client, test_get_request)
 	LOG_INF("Send request");
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
+	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
-	LOG_INF("Test done");
 }
 
 ZTEST(coap_client, test_resend_request)
@@ -384,20 +398,19 @@ ZTEST(coap_client, test_resend_request)
 	client_request.payload = short_payload;
 	client_request.len = strlen(short_payload);
 
-	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
+	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_delayed_response;
 
 	k_sleep(K_MSEC(1));
 
 	LOG_INF("Send request");
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-	k_sleep(K_MSEC(MORE_THAN_ACK_TIMEOUT_MS));
+	k_sleep(K_MSEC(15));
 	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
+	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 	zassert_equal(z_impl_zsock_sendto_fake.call_count, 2);
-	LOG_INF("Test done");
 }
 
 ZTEST(coap_client, test_echo_option)
@@ -424,10 +437,10 @@ ZTEST(coap_client, test_echo_option)
 	LOG_INF("Send request");
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
+	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
-	LOG_INF("Test done");
 }
 
 ZTEST(coap_client, test_echo_option_next_req)
@@ -454,8 +467,9 @@ ZTEST(coap_client, test_echo_option_next_req)
 	LOG_INF("Send request");
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
+	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
 	char *payload = "echo testing";
@@ -467,8 +481,9 @@ ZTEST(coap_client, test_echo_option_next_req)
 	LOG_INF("Send next request");
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
+	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
 
@@ -519,8 +534,9 @@ ZTEST(coap_client, test_send_large_data)
 	LOG_INF("Send request");
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
+	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
 
@@ -538,7 +554,7 @@ ZTEST(coap_client, test_no_response)
 		.len = 0
 	};
 	struct coap_transmission_parameters params = {
-		.ack_timeout = LONG_ACK_TIMEOUT_MS,
+		.ack_timeout = 200,
 		.coap_backoff_percent = 200,
 		.max_retransmission = 0
 	};
@@ -546,16 +562,15 @@ ZTEST(coap_client, test_no_response)
 	client_request.payload = short_payload;
 	client_request.len = strlen(short_payload);
 
-	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
-
 	k_sleep(K_MSEC(1));
 
 	LOG_INF("Send request");
+	clear_socket_events();
 	ret = coap_client_req(&client, 0, &address, &client_request, &params);
 
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
-	k_sleep(K_MSEC(MORE_THAN_LONG_EXCHANGE_LIFETIME_MS));
+	k_sleep(K_MSEC(700));
 	zassert_equal(last_response_code, -ETIMEDOUT, "Unexpected response");
 }
 
@@ -583,16 +598,15 @@ ZTEST(coap_client, test_separate_response)
 	LOG_INF("Send request");
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
+	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
 
 ZTEST(coap_client, test_multiple_requests)
 {
 	int ret = 0;
-	int retry = MORE_THAN_EXCHANGE_LIFETIME_MS;
-
 	struct sockaddr address = {0};
 	struct coap_client_request client_request = {
 		.method = COAP_METHOD_GET,
@@ -607,9 +621,8 @@ ZTEST(coap_client, test_multiple_requests)
 	client_request.payload = short_payload;
 	client_request.len = strlen(short_payload);
 
-	z_impl_zsock_sendto_fake.custom_fake = z_impl_zsock_sendto_custom_fake_no_reply;
-
 	k_sleep(K_MSEC(1));
+	set_socket_events(ZSOCK_POLLIN);
 
 	LOG_INF("Send request");
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
@@ -618,15 +631,10 @@ ZTEST(coap_client, test_multiple_requests)
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
-	set_socket_events(ZSOCK_POLLIN);
-	while (last_response_code == 0 && retry > 0) {
-		retry--;
-		k_sleep(K_MSEC(1));
-	}
+	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
-	set_socket_events(ZSOCK_POLLIN);
-	k_sleep(K_MSEC(MORE_THAN_EXCHANGE_LIFETIME_MS));
+	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
 
@@ -644,7 +652,7 @@ ZTEST(coap_client, test_unmatching_tokens)
 		.len = 0
 	};
 	struct coap_transmission_parameters params = {
-		.ack_timeout = LONG_ACK_TIMEOUT_MS,
+		.ack_timeout = 200,
 		.coap_backoff_percent = 200,
 		.max_retransmission = 0
 	};
@@ -654,12 +662,13 @@ ZTEST(coap_client, test_unmatching_tokens)
 
 	z_impl_zsock_recvfrom_fake.custom_fake = z_impl_zsock_recvfrom_custom_fake_unmatching;
 
-	k_sleep(K_MSEC(1));
-
 	LOG_INF("Send request");
 	ret = coap_client_req(&client, 0, &address, &client_request, &params);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(MORE_THAN_LONG_EXCHANGE_LIFETIME_MS));
+	k_sleep(K_MSEC(2));
+	clear_socket_events();
+	k_sleep(K_MSEC(700));
 	zassert_equal(last_response_code, -ETIMEDOUT, "Unexpected response");
 }
diff --git a/tests/net/lib/coap_client/src/stubs.c b/tests/net/lib/coap_client/src/stubs.c
index 471cc8642bc..13effd8f91b 100644
--- a/tests/net/lib/coap_client/src/stubs.c
+++ b/tests/net/lib/coap_client/src/stubs.c
@@ -13,7 +13,7 @@ DEFINE_FAKE_VALUE_FUNC(uint32_t, z_impl_sys_rand32_get);
 DEFINE_FAKE_VOID_FUNC(z_impl_sys_rand_get, void *, size_t);
 DEFINE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_recvfrom, int, void *, size_t, int, struct sockaddr *,
 		       socklen_t *);
-DEFINE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_sendto, int, void *, size_t, int,
+DEFINE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_sendto, int, void*, size_t, int,
 		       const struct sockaddr *, socklen_t);
 
 struct zsock_pollfd {
@@ -42,12 +42,11 @@ int z_impl_zsock_socket(int family, int type, int proto)
 int z_impl_zsock_poll(struct zsock_pollfd *fds, int nfds, int poll_timeout)
 {
 	LOG_INF("Polling, events %d", my_events);
-	k_sleep(K_MSEC(1));
+	k_sleep(K_MSEC(10));
 	fds->revents = my_events;
-
 	if (my_events) {
 		return 1;
+	} else {
+		return 0;
 	}
-
-	return 0;
 }

From 9c4aafa7fece728d9df3977e230659da261cf743 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:35 +0100
Subject: [PATCH 1544/2913] Revert "[nrf fromtree] include: zephyr: net:
 coap_service: Use _CONCAT expansion"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3b68ab4b691424e368a5b11c5d52e7da0aa45a0d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/coap_service.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/zephyr/net/coap_service.h b/include/zephyr/net/coap_service.h
index f5bf3f8405b..718d1fb1cfc 100644
--- a/include/zephyr/net/coap_service.h
+++ b/include/zephyr/net/coap_service.h
@@ -59,7 +59,7 @@ struct coap_service {
 };
 
 #define __z_coap_service_define(_name, _host, _port, _flags, _res_begin, _res_end)		\
-	static struct coap_service_data _CONCAT(coap_service_data_, _name) = {			\
+	static struct coap_service_data coap_service_data_##_name = {				\
 		.sock_fd = -1,									\
 	};											\
 	const STRUCT_SECTION_ITERABLE(coap_service, _name) = {					\
@@ -69,7 +69,7 @@ struct coap_service {
 		.flags = _flags,								\
 		.res_begin = (_res_begin),							\
 		.res_end = (_res_end),								\
-		.data = &_CONCAT(coap_service_data_, _name),					\
+		.data = &coap_service_data_##_name,						\
 	}
 
 /** @endcond */
@@ -111,8 +111,8 @@ struct coap_service {
  * @param _service Name of the associated service.
  */
 #define COAP_RESOURCE_DEFINE(_name, _service, ...)						\
-	STRUCT_SECTION_ITERABLE_ALTERNATE(_CONCAT(coap_resource_, _service), coap_resource,	\
-					  _name) = __VA_ARGS__
+	STRUCT_SECTION_ITERABLE_ALTERNATE(coap_resource_##_service, coap_resource, _name)	\
+		= __VA_ARGS__
 
 /**
  * @brief Define a CoAP service with static resources.
@@ -132,11 +132,11 @@ struct coap_service {
  * @param _flags Configuration flags @see @ref COAP_SERVICE_FLAGS.
  */
 #define COAP_SERVICE_DEFINE(_name, _host, _port, _flags)					\
-	extern struct coap_resource _CONCAT(_CONCAT(_coap_resource_, _name), _list_start)[];	\
-	extern struct coap_resource _CONCAT(_CONCAT(_coap_resource_, _name), _list_end)[];	\
+	extern struct coap_resource _CONCAT(_coap_resource_##_name, _list_start)[];		\
+	extern struct coap_resource _CONCAT(_coap_resource_##_name, _list_end)[];		\
 	__z_coap_service_define(_name, _host, _port, _flags,					\
-				&_CONCAT(_CONCAT(_coap_resource_, _name), _list_start)[0],	\
-				&_CONCAT(_CONCAT(_coap_resource_, _name), _list_end)[0])
+				&_CONCAT(_coap_resource_##_name, _list_start)[0],		\
+				&_CONCAT(_coap_resource_##_name, _list_end)[0])
 
 /**
  * @brief Count the number of CoAP services.
@@ -177,7 +177,7 @@ struct coap_service {
  * @param _it Name of iterator (of type @ref coap_resource)
  */
 #define COAP_RESOURCE_FOREACH(_service, _it)							\
-	STRUCT_SECTION_FOREACH_ALTERNATE(_CONCAT(coap_resource_, _service), coap_resource, _it)
+	STRUCT_SECTION_FOREACH_ALTERNATE(coap_resource_##_service, coap_resource, _it)
 
 /**
  * @brief Iterate over all static resources associated with @p _service .

From dbecbfc55e4f8ff39e2f17c54dcfed7029b0cdfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:36 +0100
Subject: [PATCH 1545/2913] Revert "[nrf fromtree] tests: coap_client: wait
 enough for requests to be unallocated"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6150de094e86f6949dab5deb8e15e5f02b1ed696.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/lib/coap_client/CMakeLists.txt |  2 +-
 tests/net/lib/coap_client/src/main.c     | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/tests/net/lib/coap_client/CMakeLists.txt b/tests/net/lib/coap_client/CMakeLists.txt
index e12214fc6a9..d99bb3145f9 100644
--- a/tests/net/lib/coap_client/CMakeLists.txt
+++ b/tests/net/lib/coap_client/CMakeLists.txt
@@ -26,7 +26,7 @@ add_compile_definitions(CONFIG_COAP_CLIENT_MESSAGE_HEADER_SIZE=48)
 add_compile_definitions(CONFIG_COAP_CLIENT_STACK_SIZE=1024)
 add_compile_definitions(CONFIG_COAP_CLIENT_THREAD_PRIORITY=10)
 add_compile_definitions(CONFIG_COAP_LOG_LEVEL=4)
-add_compile_definitions(CONFIG_COAP_INIT_ACK_TIMEOUT_MS=10)
+add_compile_definitions(CONFIG_COAP_INIT_ACK_TIMEOUT_MS=200)
 add_compile_definitions(CONFIG_COAP_CLIENT_MAX_REQUESTS=2)
 add_compile_definitions(CONFIG_COAP_CLIENT_MAX_INSTANCES=2)
 add_compile_definitions(CONFIG_COAP_MAX_RETRANSMIT=4)
diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index b487bdf7d5a..665aab30892 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -377,6 +377,7 @@ ZTEST(coap_client, test_get_request)
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	set_socket_events(ZSOCK_POLLIN);
 
+	k_sleep(K_MSEC(5));
 	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
@@ -405,7 +406,7 @@ ZTEST(coap_client, test_resend_request)
 	LOG_INF("Send request");
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
-	k_sleep(K_MSEC(15));
+	k_sleep(K_MSEC(300));
 	set_socket_events(ZSOCK_POLLIN);
 
 	k_sleep(K_MSEC(100));
@@ -439,6 +440,7 @@ ZTEST(coap_client, test_echo_option)
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	set_socket_events(ZSOCK_POLLIN);
 
+	k_sleep(K_MSEC(5));
 	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
@@ -469,6 +471,7 @@ ZTEST(coap_client, test_echo_option_next_req)
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	set_socket_events(ZSOCK_POLLIN);
 
+	k_sleep(K_MSEC(5));
 	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
@@ -483,6 +486,7 @@ ZTEST(coap_client, test_echo_option_next_req)
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	set_socket_events(ZSOCK_POLLIN);
 
+	k_sleep(K_MSEC(5));
 	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
@@ -536,6 +540,7 @@ ZTEST(coap_client, test_send_large_data)
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	set_socket_events(ZSOCK_POLLIN);
 
+	k_sleep(K_MSEC(5));
 	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
@@ -569,8 +574,8 @@ ZTEST(coap_client, test_no_response)
 	ret = coap_client_req(&client, 0, &address, &client_request, &params);
 
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
+	k_sleep(K_MSEC(300));
 
-	k_sleep(K_MSEC(700));
 	zassert_equal(last_response_code, -ETIMEDOUT, "Unexpected response");
 }
 
@@ -600,7 +605,9 @@ ZTEST(coap_client, test_separate_response)
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	set_socket_events(ZSOCK_POLLIN);
 
+	k_sleep(K_MSEC(5));
 	k_sleep(K_MSEC(100));
+
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
 
@@ -631,9 +638,11 @@ ZTEST(coap_client, test_multiple_requests)
 	ret = coap_client_req(&client, 0, &address, &client_request, NULL);
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 
+	k_sleep(K_MSEC(5));
 	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 
+	k_sleep(K_MSEC(5));
 	k_sleep(K_MSEC(100));
 	zassert_equal(last_response_code, COAP_RESPONSE_CODE_OK, "Unexpected response");
 }
@@ -667,8 +676,9 @@ ZTEST(coap_client, test_unmatching_tokens)
 	zassert_true(ret >= 0, "Sending request failed, %d", ret);
 	set_socket_events(ZSOCK_POLLIN);
 
-	k_sleep(K_MSEC(2));
+	k_sleep(K_MSEC(1));
+	k_sleep(K_MSEC(1));
 	clear_socket_events();
-	k_sleep(K_MSEC(700));
+	k_sleep(K_MSEC(500));
 	zassert_equal(last_response_code, -ETIMEDOUT, "Unexpected response");
 }

From f2275755ee9a873abd68a63e2403337af8c89dad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:36 +0100
Subject: [PATCH 1546/2913] Revert "[nrf fromtree] net: lib: coap_client: wait
 for all acknowledgements"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 18f355666bcd42f5afdfd8887a5b3e7ff388bcb3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 53 ++++---------------------------
 1 file changed, 6 insertions(+), 47 deletions(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index e841a1998dc..7c49a90981b 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -16,7 +16,6 @@ LOG_MODULE_DECLARE(net_coap, CONFIG_COAP_LOG_LEVEL);
 #define COAP_VERSION 1
 #define COAP_SEPARATE_TIMEOUT 6000
 #define COAP_PERIODIC_TIMEOUT 500
-#define COAP_EXCHANGE_LIFETIME_FACTOR 3
 #define BLOCK1_OPTION_SIZE 4
 #define PAYLOAD_MARKER_SIZE 1
 
@@ -87,21 +86,6 @@ static int coap_client_schedule_poll(struct coap_client *client, int sock,
 	return 0;
 }
 
-static bool exchange_lifetime_exceeded(struct coap_client_internal_request *internal_req)
-{
-	int64_t time_since_t0, exchange_lifetime;
-
-	if (coap_header_get_type(&internal_req->request) == COAP_TYPE_NON_CON) {
-		return true;
-	}
-
-	time_since_t0 = k_uptime_get() - internal_req->pending.t0;
-	exchange_lifetime =
-		(internal_req->pending.params.ack_timeout * COAP_EXCHANGE_LIFETIME_FACTOR);
-
-	return time_since_t0 > exchange_lifetime;
-}
-
 static bool has_ongoing_request(struct coap_client *client)
 {
 	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
@@ -113,23 +97,10 @@ static bool has_ongoing_request(struct coap_client *client)
 	return false;
 }
 
-static bool has_ongoing_exchange(struct coap_client *client)
-{
-	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
-		if (client->requests[i].request_ongoing == true ||
-		    !exchange_lifetime_exceeded(&client->requests[i])) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
 static struct coap_client_internal_request *get_free_request(struct coap_client *client)
 {
 	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
-		if (client->requests[i].request_ongoing == false &&
-		    exchange_lifetime_exceeded(&client->requests[i])) {
+		if (client->requests[i].request_ongoing == false) {
 			return &client->requests[i];
 		}
 	}
@@ -139,24 +110,13 @@ static struct coap_client_internal_request *get_free_request(struct coap_client
 
 static bool has_ongoing_requests(void)
 {
-	for (int i = 0; i < num_clients; i++) {
-		if (has_ongoing_request(clients[i])) {
-			return true;
-		}
-	}
+	bool has_requests = false;
 
-	return false;
-}
-
-static bool has_ongoing_exchanges(void)
-{
 	for (int i = 0; i < num_clients; i++) {
-		if (has_ongoing_exchange(clients[i])) {
-			return true;
-		}
+		has_requests |= has_ongoing_request(clients[i]);
 	}
 
-	return false;
+	return has_requests;
 }
 
 static enum coap_block_size coap_client_default_block_size(void)
@@ -658,8 +618,7 @@ static struct coap_client_internal_request *get_request_with_token(
 	response_tkl = coap_header_get_token(resp, response_token);
 
 	for (int i = 0; i < CONFIG_COAP_CLIENT_MAX_REQUESTS; i++) {
-		if (client->requests[i].request_ongoing ||
-		    !exchange_lifetime_exceeded(&client->requests[i])) {
+		if (client->requests[i].request_ongoing) {
 			if (client->requests[i].request_tkl != response_tkl) {
 				continue;
 			}
@@ -962,7 +921,7 @@ static void coap_client_recv(void *coap_cl, void *a, void *b)
 		}
 
 		/* There are more messages coming */
-		if (has_ongoing_exchanges()) {
+		if (has_ongoing_requests()) {
 			continue;
 		} else {
 idle:

From aeb52f00dd80c0e35a009b7295b7cb67b74458cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:36 +0100
Subject: [PATCH 1547/2913] Revert "[nrf fromtree] net: coap: add no-response
 option definition and values"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 33c27e339d862765c1a1a89150f12bea91ad6fa0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/coap.h | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/include/zephyr/net/coap.h b/include/zephyr/net/coap.h
index bf0d86cfaf7..11d2c3711f2 100644
--- a/include/zephyr/net/coap.h
+++ b/include/zephyr/net/coap.h
@@ -64,7 +64,6 @@ enum coap_option_num {
 	COAP_OPTION_PROXY_SCHEME = 39,   /**< Proxy-Scheme */
 	COAP_OPTION_SIZE1 = 60,          /**< Size1 */
 	COAP_OPTION_ECHO = 252,          /**< Echo (RFC 9175) */
-	COAP_OPTION_NO_RESPONSE = 258,   /**< No-Response (RFC 7967) */
 	COAP_OPTION_REQUEST_TAG = 292    /**< Request-Tag (RFC 9175) */
 };
 
@@ -223,22 +222,6 @@ enum coap_content_format {
 	COAP_CONTENT_FORMAT_APP_CBOR = 60               /**< application/cbor */
 };
 
-/**
- * @brief Set of No-Response option values for CoAP.
- *
- * To be used when encoding or decoding a No-Response option defined
- * in RFC 7967.
- */
-enum coap_no_response {
-	COAP_NO_RESPONSE_SUPPRESS_2_XX = 0x02,
-	COAP_NO_RESPONSE_SUPPRESS_4_XX = 0x08,
-	COAP_NO_RESPONSE_SUPPRESS_5_XX = 0x10,
-
-	COAP_NO_RESPONSE_SUPPRESS_ALL = COAP_NO_RESPONSE_SUPPRESS_2_XX |
-					COAP_NO_RESPONSE_SUPPRESS_4_XX |
-					COAP_NO_RESPONSE_SUPPRESS_5_XX,
-};
-
 /** @cond INTERNAL_HIDDEN */
 
 /* block option helper */

From 84cb20303a15581f27c6c0414d9c71263825ca46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:36 +0100
Subject: [PATCH 1548/2913] Revert "[nrf fromtree] linker: lto: Remove
 experimental label"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7a55d595709a141017b0ffa513e46e48717c4d2d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 Kconfig.zephyr | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Kconfig.zephyr b/Kconfig.zephyr
index 68abf89b42f..f97819896d9 100644
--- a/Kconfig.zephyr
+++ b/Kconfig.zephyr
@@ -536,10 +536,11 @@ config NO_OPTIMIZATIONS
 endchoice
 
 config LTO
-	bool "Link Time Optimization"
+	bool "Link Time Optimization [EXPERIMENTAL]"
 	depends on !(GEN_ISR_TABLES || GEN_IRQ_VECTOR_TABLE) || ISR_TABLES_LOCAL_DECLARATION
 	depends on !NATIVE_LIBRARY
 	depends on !CODE_DATA_RELOCATION
+	select EXPERIMENTAL
 	help
 	  This option enables Link Time Optimization.
 

From 4197ff2f491c6c220a02737d3c11c46e9f72803d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:36 +0100
Subject: [PATCH 1549/2913] Revert "[nrf fromlist] drivers: nrfwifi: Fix the
 undefined macro usage"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 43e0485afd33d6f23a1571770613d4d732d82c61.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c b/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c
index 46c92def8f7..26d9249248c 100644
--- a/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c
+++ b/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c
@@ -85,7 +85,7 @@ BUILD_ASSERT(QSPI_IF_DEVICE_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 16),
  * PCLK192M frequency"), but after that operation is complete, the default
  * divider needs to be restored to avoid increased current consumption.
  */
-#if (QSPI_IF_DEVICE_FREQUENCY >= NRF_QSPI_BASE_CLOCK_FREQ)
+#if (INST_0_SCK_FREQUENCY >= NRF_QSPI_BASE_CLOCK_FREQ)
 /* For requested SCK >= 96 MHz, use HFCLK192M / 1 / (2*1) = 96 MHz */
 #define BASE_CLOCK_DIV NRF_CLOCK_HFCLK_DIV_1
 #define INST_0_SCK_CFG NRF_QSPI_FREQ_DIV1
@@ -93,12 +93,12 @@ BUILD_ASSERT(QSPI_IF_DEVICE_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 16),
 #elif NRF53_ERRATA_159_ENABLE_WORKAROUND
 #define BASE_CLOCK_DIV NRF_CLOCK_HFCLK_DIV_1
 #define INST_0_SCK_CFG (DIV_ROUND_UP(NRF_QSPI_BASE_CLOCK_FREQ, \
-				     QSPI_IF_DEVICE_FREQUENCY) - 1)
-#elif (QSPI_IF_DEVICE_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 2))
+				     INST_0_SCK_FREQUENCY) - 1)
+#elif (INST_0_SCK_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 2))
 /* For 96 MHz > SCK >= 48 MHz, use HFCLK192M / 2 / (2*1) = 48 MHz */
 #define BASE_CLOCK_DIV NRF_CLOCK_HFCLK_DIV_2
 #define INST_0_SCK_CFG NRF_QSPI_FREQ_DIV1
-#elif (QSPI_IF_DEVICE_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 3))
+#elif (INST_0_SCK_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 3))
 /* For 48 MHz > SCK >= 32 MHz, use HFCLK192M / 1 / (2*3) = 32 MHz */
 #define BASE_CLOCK_DIV NRF_CLOCK_HFCLK_DIV_1
 #define INST_0_SCK_CFG NRF_QSPI_FREQ_DIV3

From dff5dd78131405180492cc4d686057888515fd2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:36 +0100
Subject: [PATCH 1550/2913] Revert "[nrf fromlist] boards: thingy53: Fix
 missing GPIOs"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f4e0b640c9a8984d13826ff8bc1a2b5f16a411b3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts b/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts
index 3003d4924ce..aa4d4df909c 100644
--- a/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts
+++ b/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts
@@ -72,9 +72,7 @@
 		#gpio-cells = <2>;
 		gpio-map-mask = <0xffffffff 0xffffffc0>;
 		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map = <5 0 &gpio1 1 0>,    /* P5, P1.01/GRANT */
-			   <6 0 &gpio1 0 0>,    /* P6, P1.00/REQ */
-			   <8 0 &gpio0 5 0>,	/* P8, P0.05/AIN1 */
+		gpio-map = <8 0 &gpio0 5 0>,	/* P8, P0.05/AIN1 */
 			   <9 0 &gpio0 4 0>,	/* P9, P0.04/AIN0 */
 			   <15 0 &gpio0 8 0>,	/* P15, P0.08/TRACEDATA3 */
 			   <16 0 &gpio0 9 0>,	/* P16, P0.09/TRACEDATA2 */

From d76ba120456e8ee5ac14890ff4c8f0a7a2577b46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:36 +0100
Subject: [PATCH 1551/2913] Revert "[nrf fromtree] drivers: nrfwifi: Fix label
 name"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 15301015749e9f16afa699d4b8a94d36421ad324.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/fmac_main.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c
index 470be6c8055..eb67e156800 100644
--- a/drivers/wifi/nrfwifi/src/fmac_main.c
+++ b/drivers/wifi/nrfwifi/src/fmac_main.c
@@ -320,27 +320,27 @@ int nrf_wifi_reg_domain(const struct device *dev, struct wifi_reg_domain *reg_do
 	k_mutex_lock(&reg_lock, K_FOREVER);
 
 	if (!dev || !reg_domain) {
-		goto out;
+		goto err;
 	}
 
 	vif_ctx_zep = dev->data;
 
 	if (!vif_ctx_zep) {
 		LOG_ERR("%s: vif_ctx_zep is NULL", __func__);
-		goto out;
+		goto err;
 	}
 
 	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
 
 	if (!rpu_ctx_zep) {
 		LOG_ERR("%s: rpu_ctx_zep is NULL", __func__);
-		goto out;
+		goto err;
 	}
 
 	fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
 	if (!fmac_dev_ctx) {
 		LOG_ERR("%s: fmac_dev_ctx is NULL", __func__);
-		goto out;
+		goto err;
 	}
 
 #ifdef CONFIG_NRF70_SCAN_ONLY
@@ -352,26 +352,26 @@ int nrf_wifi_reg_domain(const struct device *dev, struct wifi_reg_domain *reg_do
 		status = nrf_wifi_fmac_set_reg(fmac_dev_ctx, &reg_domain_info);
 		if (status != NRF_WIFI_STATUS_SUCCESS) {
 			LOG_ERR("%s: Failed to set regulatory domain", __func__);
-			goto out;
+			goto err;
 		}
 
-		goto out;
+		goto err;
 	}
 #endif
 	if (reg_domain->oper != WIFI_MGMT_GET) {
 		LOG_ERR("%s: Invalid operation: %d", __func__, reg_domain->oper);
-		goto out;
+		goto err;
 	}
 
 	if (!reg_domain->chan_info)	{
 		LOG_ERR("%s: Invalid regulatory info (NULL)\n", __func__);
-		goto out;
+		goto err;
 	}
 
 	status = nrf_wifi_fmac_get_reg(fmac_dev_ctx, &reg_domain_info);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: Failed to get regulatory domain", __func__);
-		goto out;
+		goto err;
 	}
 
 	memcpy(reg_domain->country_code, reg_domain_info.alpha2, WIFI_COUNTRY_CODE_LEN);
@@ -388,7 +388,7 @@ int nrf_wifi_reg_domain(const struct device *dev, struct wifi_reg_domain *reg_do
 	}
 
 	ret = 0;
-out:
+err:
 	k_mutex_unlock(&reg_lock);
 	return ret;
 }

From 35dc4bd668da26604684edd008fe93b88ecee384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:36 +0100
Subject: [PATCH 1552/2913] Revert "[nrf fromtree] drivers: nrfwifi: Fix
 regulatory domain regression"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 85b9857c88e578a59f6dc445d9b620ffd87eb117.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/inc/wpa_supp_if.h |  2 -
 drivers/wifi/nrfwifi/src/fmac_main.c   | 77 +++++++++++++++-----------
 drivers/wifi/nrfwifi/src/wpa_supp_if.c | 73 ------------------------
 3 files changed, 46 insertions(+), 106 deletions(-)

diff --git a/drivers/wifi/nrfwifi/inc/wpa_supp_if.h b/drivers/wifi/nrfwifi/inc/wpa_supp_if.h
index c543644e312..06a13261a70 100644
--- a/drivers/wifi/nrfwifi/inc/wpa_supp_if.h
+++ b/drivers/wifi/nrfwifi/inc/wpa_supp_if.h
@@ -123,8 +123,6 @@ int nrf_wifi_supp_get_conn_info(void *if_priv, struct wpa_conn_info *info);
 void nrf_wifi_supp_event_proc_get_conn_info(void *os_vif_ctx,
 					    struct nrf_wifi_umac_event_conn_info *info,
 					    unsigned int event_len);
-int nrf_wifi_supp_set_country(void *if_priv, const char *alpha2);
-int nrf_wifi_supp_get_country(void *if_priv, char *alpha2);
 
 #endif /* CONFIG_NRF70_STA_MODE */
 #ifdef CONFIG_NRF70_AP_MODE
diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c
index eb67e156800..f2f7ba41340 100644
--- a/drivers/wifi/nrfwifi/src/fmac_main.c
+++ b/drivers/wifi/nrfwifi/src/fmac_main.c
@@ -343,8 +343,28 @@ int nrf_wifi_reg_domain(const struct device *dev, struct wifi_reg_domain *reg_do
 		goto err;
 	}
 
-#ifdef CONFIG_NRF70_SCAN_ONLY
 	if (reg_domain->oper == WIFI_MGMT_SET) {
+#ifndef CONFIG_NRF70_RADIO_TEST
+#ifdef CONFIG_NRF70_STA_MODE
+		/* Need to check if WPA supplicant is initialized or not.
+		 * Must be checked when CONFIG_WIFI_NM_WPA_SUPPLICANT is enabled.
+		 * Not applicable for RADIO_TEST or when
+		 * CONFIG_WIFI_NM_WPA_SUPPLICANT is not enabled.
+		 */
+		/* It is possbile that during supplicant initialization driver may
+		 * get the command. lock will try to ensure that supplicant
+		 * initialization is complete.
+		 */
+		k_mutex_lock(&vif_ctx_zep->vif_lock, K_FOREVER);
+		if ((!vif_ctx_zep->supp_drv_if_ctx) ||
+		    (!wifi_nm_get_instance_iface(vif_ctx_zep->zep_net_if_ctx))) {
+			LOG_ERR("%s: WPA supplicant initialization not complete yet", __func__);
+			k_mutex_unlock(&vif_ctx_zep->vif_lock);
+			goto err;
+		}
+		k_mutex_unlock(&vif_ctx_zep->vif_lock);
+#endif /* CONFIG_NRF70_STA_MODE */
+#endif /* !CONFIG_NRF70_RADIO_TEST */
 		memcpy(reg_domain_info.alpha2, reg_domain->country_code, WIFI_COUNTRY_CODE_LEN);
 
 		reg_domain_info.force = reg_domain->force;
@@ -354,39 +374,36 @@ int nrf_wifi_reg_domain(const struct device *dev, struct wifi_reg_domain *reg_do
 			LOG_ERR("%s: Failed to set regulatory domain", __func__);
 			goto err;
 		}
+	} else if (reg_domain->oper == WIFI_MGMT_GET) {
 
-		goto err;
-	}
-#endif
-	if (reg_domain->oper != WIFI_MGMT_GET) {
-		LOG_ERR("%s: Invalid operation: %d", __func__, reg_domain->oper);
-		goto err;
-	}
+		if (!reg_domain->chan_info)	{
+			LOG_ERR("%s: Invalid regulatory info (NULL)\n", __func__);
+			goto err;
+		}
 
-	if (!reg_domain->chan_info)	{
-		LOG_ERR("%s: Invalid regulatory info (NULL)\n", __func__);
-		goto err;
-	}
+		status = nrf_wifi_fmac_get_reg(fmac_dev_ctx, &reg_domain_info);
+		if (status != NRF_WIFI_STATUS_SUCCESS) {
+			LOG_ERR("%s: Failed to get regulatory domain", __func__);
+			goto err;
+		}
 
-	status = nrf_wifi_fmac_get_reg(fmac_dev_ctx, &reg_domain_info);
-	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: Failed to get regulatory domain", __func__);
+		memcpy(reg_domain->country_code, reg_domain_info.alpha2, WIFI_COUNTRY_CODE_LEN);
+		reg_domain->num_channels = reg_domain_info.reg_chan_count;
+
+		for (chan_idx = 0; chan_idx < reg_domain_info.reg_chan_count; chan_idx++) {
+			chan_info = &(reg_domain->chan_info[chan_idx]);
+			reg_domain_chan_info = &(reg_domain_info.reg_chan_info[chan_idx]);
+			chan_info->center_frequency = reg_domain_chan_info->center_frequency;
+			chan_info->dfs = !!reg_domain_chan_info->dfs;
+			chan_info->max_power = reg_domain_chan_info->max_power;
+			chan_info->passive_only = !!reg_domain_chan_info->passive_channel;
+			chan_info->supported = !!reg_domain_chan_info->supported;
+		}
+	} else {
+		LOG_ERR("%s: Invalid operation: %d", __func__, reg_domain->oper);
 		goto err;
 	}
 
-	memcpy(reg_domain->country_code, reg_domain_info.alpha2, WIFI_COUNTRY_CODE_LEN);
-	reg_domain->num_channels = reg_domain_info.reg_chan_count;
-
-	for (chan_idx = 0; chan_idx < reg_domain_info.reg_chan_count; chan_idx++) {
-		chan_info = &(reg_domain->chan_info[chan_idx]);
-		reg_domain_chan_info = &(reg_domain_info.reg_chan_info[chan_idx]);
-		chan_info->center_frequency = reg_domain_chan_info->center_frequency;
-		chan_info->dfs = !!reg_domain_chan_info->dfs;
-		chan_info->max_power = reg_domain_chan_info->max_power;
-		chan_info->passive_only = !!reg_domain_chan_info->passive_channel;
-		chan_info->supported = !!reg_domain_chan_info->supported;
-	}
-
 	ret = 0;
 err:
 	k_mutex_unlock(&reg_lock);
@@ -833,7 +850,7 @@ static struct wifi_mgmt_ops nrf_wifi_mgmt_ops = {
 	.get_power_save_config = nrf_wifi_get_power_save_config,
 	.set_rts_threshold = nrf_wifi_set_rts_threshold,
 	.get_rts_threshold = nrf_wifi_get_rts_threshold,
-#endif
+#endif /* CONFIG_NRF70_STA_MODE */
 #ifdef CONFIG_NRF70_SYSTEM_WITH_RAW_MODES
 	.mode = nrf_wifi_mode,
 #endif
@@ -866,8 +883,6 @@ static struct zep_wpa_supp_dev_ops wpa_supp_ops = {
 	.register_frame = nrf_wifi_supp_register_frame,
 	.get_capa = nrf_wifi_supp_get_capa,
 	.get_conn_info = nrf_wifi_supp_get_conn_info,
-	.set_country = nrf_wifi_supp_set_country,
-	.get_country = nrf_wifi_supp_get_country,
 #ifdef CONFIG_NRF70_AP_MODE
 	.init_ap = nrf_wifi_wpa_supp_init_ap,
 	.start_ap = nrf_wifi_wpa_supp_start_ap,
diff --git a/drivers/wifi/nrfwifi/src/wpa_supp_if.c b/drivers/wifi/nrfwifi/src/wpa_supp_if.c
index 292c1b9117a..b022c8d5af1 100644
--- a/drivers/wifi/nrfwifi/src/wpa_supp_if.c
+++ b/drivers/wifi/nrfwifi/src/wpa_supp_if.c
@@ -1861,79 +1861,6 @@ int nrf_wifi_supp_get_conn_info(void *if_priv, struct wpa_conn_info *info)
 	return ret;
 }
 
-int nrf_wifi_supp_set_country(void *if_priv, const char *alpha2)
-{
-	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
-	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
-	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
-	struct nrf_wifi_fmac_reg_info reg_domain_info = {0};
-
-	if (!if_priv || !alpha2) {
-		LOG_ERR("%s: Invalid params", __func__);
-		return -1;
-	}
-
-	vif_ctx_zep = if_priv;
-	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
-	if (!rpu_ctx_zep) {
-		LOG_ERR("%s: rpu_ctx_zep is NULL", __func__);
-		return -1;
-	}
-
-	k_mutex_lock(&vif_ctx_zep->vif_lock, K_FOREVER);
-	if (!rpu_ctx_zep->rpu_ctx) {
-		LOG_DBG("%s: RPU context not initialized", __func__);
-		goto out;
-	}
-
-	memcpy(reg_domain_info.alpha2, alpha2, NRF_WIFI_COUNTRY_CODE_LEN);
-
-	status = nrf_wifi_fmac_set_reg(rpu_ctx_zep->rpu_ctx, &reg_domain_info);
-	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_set_reg failed", __func__);
-		goto out;
-	}
-out:
-	k_mutex_unlock(&vif_ctx_zep->vif_lock);
-	return status;
-}
-
-int nrf_wifi_supp_get_country(void *if_priv, char *alpha2)
-{
-	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
-	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
-	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
-	struct nrf_wifi_fmac_reg_info reg_domain_info = {0};
-
-	if (!if_priv || !alpha2) {
-		LOG_ERR("%s: Invalid params", __func__);
-		return -1;
-	}
-
-	vif_ctx_zep = if_priv;
-	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
-	if (!rpu_ctx_zep) {
-		LOG_ERR("%s: rpu_ctx_zep is NULL", __func__);
-		return -1;
-	}
-
-	k_mutex_lock(&vif_ctx_zep->vif_lock, K_FOREVER);
-	if (!rpu_ctx_zep->rpu_ctx) {
-		LOG_DBG("%s: RPU context not initialized", __func__);
-		goto out;
-	}
-
-	status = nrf_wifi_fmac_get_reg(rpu_ctx_zep->rpu_ctx, &reg_domain_info);
-	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_get_reg failed", __func__);
-		goto out;
-	}
-
-	memcpy(alpha2, reg_domain_info.alpha2, NRF_WIFI_COUNTRY_CODE_LEN);
-out:
-	k_mutex_unlock(&vif_ctx_zep->vif_lock);
-	return status;
-}
 
 void nrf_wifi_supp_event_proc_get_conn_info(void *if_priv,
 					   struct nrf_wifi_umac_event_conn_info *info,

From 08e49e9b5e8f6a66fea62abefb28b7c0cb347fa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:36 +0100
Subject: [PATCH 1553/2913] Revert "[nrf fromlist] soc: nordic: dmm: Fix
 DMM_REG_ALIGN_SIZE macro when CONFIG_DCACHE=n"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ab64d9637e07cd6d372c79b9716e3c42f7b12f54.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/common/dmm.h | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/soc/nordic/common/dmm.h b/soc/nordic/common/dmm.h
index 34b517c92df..e92f01d07b8 100644
--- a/soc/nordic/common/dmm.h
+++ b/soc/nordic/common/dmm.h
@@ -23,13 +23,12 @@ extern "C" {
 
 /** @cond INTERNAL_HIDDEN */
 
-#ifdef CONFIG_DCACHE
-
 /* Determine if memory region is cacheable. */
-#define DMM_IS_REG_CACHEABLE(node_id)					     \
-	COND_CODE_1(DT_NODE_HAS_PROP(node_id, zephyr_memory_attr),	     \
-		((DT_PROP(node_id, zephyr_memory_attr) & DT_MEM_CACHEABLE)), \
-		(0))
+#define DMM_IS_REG_CACHEABLE(node_id)					 \
+	COND_CODE_1(CONFIG_DCACHE,					 \
+	   (COND_CODE_1(DT_NODE_HAS_PROP(node_id, zephyr_memory_attr),	 \
+	    ((DT_PROP(node_id, zephyr_memory_attr) & DT_MEM_CACHEABLE)), \
+	    (0))), (0))
 
 /* Determine required alignment of the data buffers in specified memory region.
  * Cache line alignment is required if region is cacheable and data cache is enabled.
@@ -37,13 +36,6 @@ extern "C" {
 #define DMM_REG_ALIGN_SIZE(node_id) \
 	(DMM_IS_REG_CACHEABLE(node_id) ? CONFIG_DCACHE_LINE_SIZE : sizeof(uint8_t))
 
-#else
-
-#define DMM_IS_REG_CACHEABLE(node_id) 0
-#define DMM_REG_ALIGN_SIZE(node_id) (sizeof(uint8_t))
-
-#endif /* CONFIG_DCACHE */
-
 /* Determine required alignment of the data buffers in memory region
  * associated with specified device node.
  */

From 912b7f89efcc23cfe0c1af44508fbf9460745ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:36 +0100
Subject: [PATCH 1554/2913] Revert "[nrf fromlist] soc: nordic: nrf54l15: fix
 APPROTECT handling"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a40e6b16f49a743b74e316f89a41200ae6358336.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/nrfx/CMakeLists.txt |  9 +++------
 soc/nordic/Kconfig                     | 24 +++---------------------
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 565835ab1c8..8d7adc114d7 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -75,14 +75,11 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9230_ENGB_CPUPPR NRF9230_ENGB_XXA
 zephyr_compile_definitions_ifdef(CONFIG_NRF_APPROTECT_LOCK
                                  ENABLE_APPROTECT)
 zephyr_compile_definitions_ifdef(CONFIG_NRF_APPROTECT_USER_HANDLING
-                                 ENABLE_APPROTECT_USER_HANDLING
-                                 ENABLE_AUTHENTICATED_APPROTECT)
+                                 ENABLE_APPROTECT_USER_HANDLING)
 zephyr_compile_definitions_ifdef(CONFIG_NRF_SECURE_APPROTECT_LOCK
-                                 ENABLE_SECURE_APPROTECT
-                                 ENABLE_SECUREAPPROTECT)
+                                 ENABLE_SECURE_APPROTECT)
 zephyr_compile_definitions_ifdef(CONFIG_NRF_SECURE_APPROTECT_USER_HANDLING
-                                 ENABLE_SECURE_APPROTECT_USER_HANDLING
-                                 ENABLE_AUTHENTICATED_SECUREAPPROTECT)
+                                 ENABLE_SECURE_APPROTECT_USER_HANDLING)
 zephyr_library_compile_definitions_ifdef(CONFIG_NRF_TRACE_PORT
                                  ENABLE_TRACE)
 
diff --git a/soc/nordic/Kconfig b/soc/nordic/Kconfig
index f76b1d19acc..e0063b858ed 100644
--- a/soc/nordic/Kconfig
+++ b/soc/nordic/Kconfig
@@ -98,24 +98,15 @@ config NFCT_PINS_AS_GPIOS
 
 choice NRF_APPROTECT_HANDLING
 	bool "APPROTECT handling"
-	depends on SOC_SERIES_NRF52X || SOC_SERIES_NRF53X || SOC_NRF54L15_CPUAPP || \
-		   SOC_SERIES_NRF91X
-	default NRF_APPROTECT_DISABLE if SOC_NRF54L15_CPUAPP
+	depends on SOC_SERIES_NRF52X || SOC_NRF5340_CPUNET || \
+		   SOC_NRF5340_CPUAPP || SOC_SERIES_NRF91X
 	default NRF_APPROTECT_USE_UICR
 	help
 	  Specifies how the SystemInit() function should handle the APPROTECT
 	  mechanism.
 
-config NRF_APPROTECT_DISABLE
-	bool "Disable"
-	depends on SOC_NRF54L15_CPUAPP
-	help
-	  When this option is selected, the SystemInit() disables
-	  the APPROTECT mechanism.
-
 config NRF_APPROTECT_USE_UICR
 	bool "Use UICR"
-	depends on SOC_SERIES_NRF52X || SOC_SERIES_NRF53X || SOC_SERIES_NRF91X
 	help
 	  When this option is selected, the SystemInit() function loads the
 	  firmware branch state of the APPROTECT mechanism from UICR, so if
@@ -140,23 +131,14 @@ endchoice
 
 choice NRF_SECURE_APPROTECT_HANDLING
 	bool "Secure APPROTECT handling"
-	depends on SOC_NRF5340_CPUAPP || SOC_NRF54L15_CPUAPP || SOC_SERIES_NRF91X
-	default NRF_SECURE_APPROTECT_DISABLE if SOC_NRF54L15_CPUAPP
+	depends on SOC_NRF5340_CPUAPP || SOC_SERIES_NRF91X
 	default NRF_SECURE_APPROTECT_USE_UICR
 	help
 	  Specifies how the SystemInit() function should handle the secure
 	  APPROTECT mechanism.
 
-config NRF_SECURE_APPROTECT_DISABLE
-	bool "Disable"
-	depends on SOC_NRF54L15_CPUAPP
-	help
-	  When this option is selected, the SystemInit() disables
-	  the secure APPROTECT mechanism.
-
 config NRF_SECURE_APPROTECT_USE_UICR
 	bool "Use UICR"
-	depends on SOC_NRF5340_CPUAPP || SOC_SERIES_NRF91X
 	help
 	  When this option is selected, the SystemInit() function loads the
 	  firmware branch state of the secure APPROTECT mechanism from UICR,

From a1622e6f3b2fe0b12c9703d8ae2cb4abad5ec088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:36 +0100
Subject: [PATCH 1555/2913] Revert "[nrf fromtree] tests: bluetooth: host:
 conn: Add bt_conn_le_create unit test"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5b99bd62f67d132c8efa86a22769a0d8b71898ea.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/bluetooth/host/conn/CMakeLists.txt      |  27 ----
 .../bluetooth/host/conn/mocks/CMakeLists.txt  |  34 -----
 .../bluetooth/host/conn/mocks/addr_internal.c |  12 --
 .../bluetooth/host/conn/mocks/addr_internal.h |  17 ---
 .../bluetooth/host/conn/mocks/att_internal.c  |  11 --
 .../bluetooth/host/conn/mocks/att_internal.h  |  13 --
 tests/bluetooth/host/conn/mocks/bt_str.c      |  19 ---
 tests/bluetooth/host/conn/mocks/bt_str.h      |  10 --
 tests/bluetooth/host/conn/mocks/buf_view.c    |  14 --
 tests/bluetooth/host/conn/mocks/buf_view.h    |  18 ---
 tests/bluetooth/host/conn/mocks/hci_core.c    |  32 -----
 tests/bluetooth/host/conn/mocks/hci_core.h    |  41 ------
 tests/bluetooth/host/conn/mocks/id.c          |  11 --
 tests/bluetooth/host/conn/mocks/id.h          |  13 --
 tests/bluetooth/host/conn/mocks/kernel.c      |  33 -----
 tests/bluetooth/host/conn/mocks/kernel.h      |  54 -------
 .../host/conn/mocks/l2cap_internal.c          |  17 ---
 .../host/conn/mocks/l2cap_internal.h          |  26 ----
 .../host/conn/mocks/mock-sections.ld          |  29 ----
 tests/bluetooth/host/conn/mocks/scan.c        |  13 --
 tests/bluetooth/host/conn/mocks/scan.h        |  20 ---
 tests/bluetooth/host/conn/mocks/smp.c         |  11 --
 tests/bluetooth/host/conn/mocks/smp.h         |  13 --
 tests/bluetooth/host/conn/mocks/spinlock.c    |  13 --
 tests/bluetooth/host/conn/mocks/spinlock.h    |  18 ---
 tests/bluetooth/host/conn/mocks/sys_clock.c   |  12 --
 tests/bluetooth/host/conn/mocks/sys_clock.h   |  16 ---
 .../zephyr/drivers/bluetooth/hci_driver.h     |  11 --
 .../host/conn/mocks/zephyr/syscalls/device.h  |  10 --
 tests/bluetooth/host/conn/prj.conf            |  21 ---
 tests/bluetooth/host/conn/src/main.c          | 134 ------------------
 tests/bluetooth/host/conn/testcase.yaml       |  11 --
 32 files changed, 734 deletions(-)
 delete mode 100644 tests/bluetooth/host/conn/CMakeLists.txt
 delete mode 100644 tests/bluetooth/host/conn/mocks/CMakeLists.txt
 delete mode 100644 tests/bluetooth/host/conn/mocks/addr_internal.c
 delete mode 100644 tests/bluetooth/host/conn/mocks/addr_internal.h
 delete mode 100644 tests/bluetooth/host/conn/mocks/att_internal.c
 delete mode 100644 tests/bluetooth/host/conn/mocks/att_internal.h
 delete mode 100644 tests/bluetooth/host/conn/mocks/bt_str.c
 delete mode 100644 tests/bluetooth/host/conn/mocks/bt_str.h
 delete mode 100644 tests/bluetooth/host/conn/mocks/buf_view.c
 delete mode 100644 tests/bluetooth/host/conn/mocks/buf_view.h
 delete mode 100644 tests/bluetooth/host/conn/mocks/hci_core.c
 delete mode 100644 tests/bluetooth/host/conn/mocks/hci_core.h
 delete mode 100644 tests/bluetooth/host/conn/mocks/id.c
 delete mode 100644 tests/bluetooth/host/conn/mocks/id.h
 delete mode 100644 tests/bluetooth/host/conn/mocks/kernel.c
 delete mode 100644 tests/bluetooth/host/conn/mocks/kernel.h
 delete mode 100644 tests/bluetooth/host/conn/mocks/l2cap_internal.c
 delete mode 100644 tests/bluetooth/host/conn/mocks/l2cap_internal.h
 delete mode 100644 tests/bluetooth/host/conn/mocks/mock-sections.ld
 delete mode 100644 tests/bluetooth/host/conn/mocks/scan.c
 delete mode 100644 tests/bluetooth/host/conn/mocks/scan.h
 delete mode 100644 tests/bluetooth/host/conn/mocks/smp.c
 delete mode 100644 tests/bluetooth/host/conn/mocks/smp.h
 delete mode 100644 tests/bluetooth/host/conn/mocks/spinlock.c
 delete mode 100644 tests/bluetooth/host/conn/mocks/spinlock.h
 delete mode 100644 tests/bluetooth/host/conn/mocks/sys_clock.c
 delete mode 100644 tests/bluetooth/host/conn/mocks/sys_clock.h
 delete mode 100644 tests/bluetooth/host/conn/mocks/zephyr/include/zephyr/drivers/bluetooth/hci_driver.h
 delete mode 100644 tests/bluetooth/host/conn/mocks/zephyr/syscalls/device.h
 delete mode 100644 tests/bluetooth/host/conn/prj.conf
 delete mode 100644 tests/bluetooth/host/conn/src/main.c
 delete mode 100644 tests/bluetooth/host/conn/testcase.yaml

diff --git a/tests/bluetooth/host/conn/CMakeLists.txt b/tests/bluetooth/host/conn/CMakeLists.txt
deleted file mode 100644
index 23cf77fbd2f..00000000000
--- a/tests/bluetooth/host/conn/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-
-find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
-
-project(conn)
-
-include_directories(BEFORE
-    ${ZEPHYR_BASE}/tests/bluetooth/host/conn
-    ${ZEPHYR_BASE}/tests/bluetooth/host/conn/mocks/zephyr/include
-)
-
-add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/host host_mocks)
-add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/host/conn/mocks mocks)
-
-target_link_libraries(testbinary PRIVATE mocks host_mocks)
-
-target_sources(testbinary
-    PRIVATE
-    src/main.c
-
-    ${ZEPHYR_BASE}/subsys/bluetooth/host/conn.c
-    ${ZEPHYR_BASE}/subsys/logging/log_minimal.c
-    ${ZEPHYR_BASE}/lib/net_buf/buf.c
-    ${ZEPHYR_BASE}/lib/net_buf/buf_simple.c
-)
diff --git a/tests/bluetooth/host/conn/mocks/CMakeLists.txt b/tests/bluetooth/host/conn/mocks/CMakeLists.txt
deleted file mode 100644
index 2d4399c6b7d..00000000000
--- a/tests/bluetooth/host/conn/mocks/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# CMakeLists.txt file for creating of mocks library.
-#
-
-add_library(mocks STATIC
-	addr_internal.c
-	att_internal.c
-	bt_str.c
-	buf_view.c
-	hci_core.c
-	id.c
-	kernel.c
-	l2cap_internal.c
-	scan.c
-	smp.c
-	spinlock.c
-	sys_clock.c
-)
-
-target_include_directories(mocks PUBLIC
-	${ZEPHYR_BASE}/tests/bluetooth/host/conn/mocks
-	${ZEPHYR_BASE}/subsys/bluetooth
-)
-
-target_compile_options(test_interface INTERFACE -include ztest.h)
-target_link_libraries(mocks PRIVATE test_interface)
-target_link_options(mocks PUBLIC
-	"SHELL:-T ${ZEPHYR_BASE}/tests/bluetooth/host/conn/mocks/mock-sections.ld"
-)
-
-target_compile_options(mocks
-	PRIVATE
-	-DCONFIG_BT_ID_MAX=1
-)
diff --git a/tests/bluetooth/host/conn/mocks/addr_internal.c b/tests/bluetooth/host/conn/mocks/addr_internal.c
deleted file mode 100644
index c76067183ae..00000000000
--- a/tests/bluetooth/host/conn/mocks/addr_internal.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-
-#include "addr_internal.h"
-
-DEFINE_FAKE_VOID_FUNC(bt_addr_le_copy_resolved, bt_addr_le_t *, const bt_addr_le_t *);
-DEFINE_FAKE_VALUE_FUNC(bool, bt_addr_le_is_resolved, const bt_addr_le_t *);
diff --git a/tests/bluetooth/host/conn/mocks/addr_internal.h b/tests/bluetooth/host/conn/mocks/addr_internal.h
deleted file mode 100644
index 20651ea485c..00000000000
--- a/tests/bluetooth/host/conn/mocks/addr_internal.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/fff.h>
-#include <zephyr/bluetooth/addr.h>
-
-/* List of fakes used by this unit tester */
-#define ADDR_INTERNAL_MOCKS_FFF_FAKES_LIST(FAKE)                                                   \
-	FAKE(bt_addr_le_copy_resolved)                                                             \
-	FAKE(bt_addr_le_is_resolved)
-
-DECLARE_FAKE_VOID_FUNC(bt_addr_le_copy_resolved, bt_addr_le_t *, const bt_addr_le_t *);
-DECLARE_FAKE_VALUE_FUNC(bool, bt_addr_le_is_resolved, const bt_addr_le_t *);
diff --git a/tests/bluetooth/host/conn/mocks/att_internal.c b/tests/bluetooth/host/conn/mocks/att_internal.c
deleted file mode 100644
index 61485478153..00000000000
--- a/tests/bluetooth/host/conn/mocks/att_internal.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-
-#include "att_internal.h"
-
-DEFINE_FAKE_VOID_FUNC(bt_att_init);
diff --git a/tests/bluetooth/host/conn/mocks/att_internal.h b/tests/bluetooth/host/conn/mocks/att_internal.h
deleted file mode 100644
index b7a37ee9b46..00000000000
--- a/tests/bluetooth/host/conn/mocks/att_internal.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/fff.h>
-
-/* List of fakes used by this unit tester */
-#define ATT_INTERNAL_MOCKS_FFF_FAKES_LIST(FAKE) FAKE(bt_att_init)
-
-DECLARE_FAKE_VOID_FUNC(bt_att_init);
diff --git a/tests/bluetooth/host/conn/mocks/bt_str.c b/tests/bluetooth/host/conn/mocks/bt_str.c
deleted file mode 100644
index 21a1c72751b..00000000000
--- a/tests/bluetooth/host/conn/mocks/bt_str.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/bluetooth/addr.h>
-
-#include "bt_str.h"
-
-const char *bt_addr_le_str(const bt_addr_le_t *addr)
-{
-	static char str[BT_ADDR_LE_STR_LEN];
-
-	bt_addr_le_to_str(addr, str, sizeof(str));
-
-	return str;
-}
diff --git a/tests/bluetooth/host/conn/mocks/bt_str.h b/tests/bluetooth/host/conn/mocks/bt_str.h
deleted file mode 100644
index 53786cd31e2..00000000000
--- a/tests/bluetooth/host/conn/mocks/bt_str.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/bluetooth/addr.h>
-
-const char *bt_addr_le_str(const bt_addr_le_t *addr);
diff --git a/tests/bluetooth/host/conn/mocks/buf_view.c b/tests/bluetooth/host/conn/mocks/buf_view.c
deleted file mode 100644
index 30c11cc59ec..00000000000
--- a/tests/bluetooth/host/conn/mocks/buf_view.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-
-#include "buf_view.h"
-
-DEFINE_FAKE_VALUE_FUNC(bool, bt_buf_has_view, const struct net_buf *);
-DEFINE_FAKE_VALUE_FUNC(struct net_buf *, bt_buf_make_view, struct net_buf *, struct net_buf *,
-		       size_t, struct bt_buf_view_meta *);
-DEFINE_FAKE_VOID_FUNC(bt_buf_destroy_view, struct net_buf *, struct bt_buf_view_meta *);
diff --git a/tests/bluetooth/host/conn/mocks/buf_view.h b/tests/bluetooth/host/conn/mocks/buf_view.h
deleted file mode 100644
index 480510a8880..00000000000
--- a/tests/bluetooth/host/conn/mocks/buf_view.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/fff.h>
-
-/* List of fakes used by this unit tester */
-#define BUF_VIEW_MOCKS_FFF_FAKES_LIST(FAKE) FAKE(bt_buf_has_view)                                  \
-	FAKE(bt_buf_make_view)                                                                     \
-	FAKE(bt_buf_destroy_view)
-
-DECLARE_FAKE_VALUE_FUNC(bool, bt_buf_has_view, const struct net_buf *);
-DECLARE_FAKE_VALUE_FUNC(struct net_buf *, bt_buf_make_view, struct net_buf *, struct net_buf *,
-			size_t, struct bt_buf_view_meta *);
-DECLARE_FAKE_VOID_FUNC(bt_buf_destroy_view, struct net_buf *, struct bt_buf_view_meta *);
diff --git a/tests/bluetooth/host/conn/mocks/hci_core.c b/tests/bluetooth/host/conn/mocks/hci_core.c
deleted file mode 100644
index 363108dd3c0..00000000000
--- a/tests/bluetooth/host/conn/mocks/hci_core.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/bluetooth/hci.h>
-
-#include <host/hci_core.h>
-
-#include "hci_core.h"
-
-DEFINE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_create, uint16_t, uint8_t);
-DEFINE_FAKE_VALUE_FUNC(int, bt_hci_cmd_send_sync, uint16_t, struct net_buf *, struct net_buf **);
-DEFINE_FAKE_VALUE_FUNC(int, bt_hci_le_read_remote_features, struct bt_conn *);
-DEFINE_FAKE_VALUE_FUNC(int, bt_hci_disconnect, uint16_t, uint8_t);
-DEFINE_FAKE_VALUE_FUNC(bool, bt_le_conn_params_valid, const struct bt_le_conn_param *);
-DEFINE_FAKE_VOID_FUNC(bt_tx_irq_raise);
-DEFINE_FAKE_VALUE_FUNC(int, bt_send, struct net_buf *);
-DEFINE_FAKE_VOID_FUNC(bt_send_one_host_num_completed_packets, uint16_t);
-DEFINE_FAKE_VOID_FUNC(bt_acl_set_ncp_sent, struct net_buf *, bool);
-DEFINE_FAKE_VALUE_FUNC(int, bt_le_create_conn, const struct bt_conn *);
-DEFINE_FAKE_VALUE_FUNC(int, bt_le_create_conn_cancel);
-DEFINE_FAKE_VALUE_FUNC(int, bt_le_create_conn_synced, const struct bt_conn *,
-		       const struct bt_le_ext_adv *, uint8_t);
-DEFINE_FAKE_VALUE_FUNC(const bt_addr_le_t *, bt_lookup_id_addr, uint8_t, const bt_addr_le_t *);
-DEFINE_FAKE_VALUE_FUNC(int, bt_le_set_phy, struct bt_conn *, uint8_t, uint8_t, uint8_t, uint8_t);
-
-struct bt_dev bt_dev = {
-	.manufacturer = 0x1234,
-};
diff --git a/tests/bluetooth/host/conn/mocks/hci_core.h b/tests/bluetooth/host/conn/mocks/hci_core.h
deleted file mode 100644
index abc609c58ce..00000000000
--- a/tests/bluetooth/host/conn/mocks/hci_core.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/fff.h>
-
-/* List of fakes used by this unit tester */
-#define HCI_CORE_MOCKS_FFF_FAKES_LIST(FAKE)                                                        \
-	FAKE(bt_hci_cmd_create)                                                                    \
-	FAKE(bt_hci_cmd_send_sync)                                                                 \
-	FAKE(bt_hci_le_read_remote_features)                                                       \
-	FAKE(bt_hci_disconnect)                                                                    \
-	FAKE(bt_le_conn_params_valid)                                                              \
-	FAKE(bt_tx_irq_raise)                                                                      \
-	FAKE(bt_send)                                                                              \
-	FAKE(bt_send_one_host_num_completed_packets)                                               \
-	FAKE(bt_acl_set_ncp_sent)                                                                  \
-	FAKE(bt_le_create_conn)                                                                    \
-	FAKE(bt_le_create_conn_cancel)                                                             \
-	FAKE(bt_le_create_conn_synced)                                                             \
-	FAKE(bt_lookup_id_addr)                                                                    \
-	FAKE(bt_le_set_phy)
-
-DECLARE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_create, uint16_t, uint8_t);
-DECLARE_FAKE_VALUE_FUNC(int, bt_hci_cmd_send_sync, uint16_t, struct net_buf *, struct net_buf **);
-DECLARE_FAKE_VALUE_FUNC(int, bt_hci_le_read_remote_features, struct bt_conn *);
-DECLARE_FAKE_VALUE_FUNC(int, bt_hci_disconnect, uint16_t, uint8_t);
-DECLARE_FAKE_VALUE_FUNC(bool, bt_le_conn_params_valid, const struct bt_le_conn_param *);
-DECLARE_FAKE_VOID_FUNC(bt_tx_irq_raise);
-DECLARE_FAKE_VALUE_FUNC(int, bt_send, struct net_buf *);
-DECLARE_FAKE_VOID_FUNC(bt_send_one_host_num_completed_packets, uint16_t);
-DECLARE_FAKE_VOID_FUNC(bt_acl_set_ncp_sent, struct net_buf *, bool);
-DECLARE_FAKE_VALUE_FUNC(int, bt_le_create_conn, const struct bt_conn *);
-DECLARE_FAKE_VALUE_FUNC(int, bt_le_create_conn_cancel);
-DECLARE_FAKE_VALUE_FUNC(int, bt_le_create_conn_synced, const struct bt_conn *,
-			const struct bt_le_ext_adv *, uint8_t);
-DECLARE_FAKE_VALUE_FUNC(const bt_addr_le_t *, bt_lookup_id_addr, uint8_t, const bt_addr_le_t *);
-DECLARE_FAKE_VALUE_FUNC(int, bt_le_set_phy, struct bt_conn *, uint8_t, uint8_t, uint8_t, uint8_t);
diff --git a/tests/bluetooth/host/conn/mocks/id.c b/tests/bluetooth/host/conn/mocks/id.c
deleted file mode 100644
index 887ea69caad..00000000000
--- a/tests/bluetooth/host/conn/mocks/id.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-
-#include "id.h"
-
-DEFINE_FAKE_VALUE_FUNC(bool, bt_id_scan_random_addr_check);
diff --git a/tests/bluetooth/host/conn/mocks/id.h b/tests/bluetooth/host/conn/mocks/id.h
deleted file mode 100644
index e6e3bb8f8a2..00000000000
--- a/tests/bluetooth/host/conn/mocks/id.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/fff.h>
-
-/* List of fakes used by this unit tester */
-#define ID_MOCKS_FFF_FAKES_LIST(FAKE) FAKE(bt_id_scan_random_addr_check)
-
-DECLARE_FAKE_VALUE_FUNC(bool, bt_id_scan_random_addr_check);
diff --git a/tests/bluetooth/host/conn/mocks/kernel.c b/tests/bluetooth/host/conn/mocks/kernel.c
deleted file mode 100644
index ef56b52ec88..00000000000
--- a/tests/bluetooth/host/conn/mocks/kernel.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-
-#include "kernel.h"
-
-DEFINE_FAKE_VALUE_FUNC(bool, k_is_in_isr);
-DEFINE_FAKE_VALUE_FUNC(int, k_poll_signal_raise, struct k_poll_signal *, int);
-DEFINE_FAKE_VALUE_FUNC(int, k_sem_take, struct k_sem *, k_timeout_t);
-DEFINE_FAKE_VALUE_FUNC(unsigned int, k_sem_count_get, struct k_sem *);
-DEFINE_FAKE_VOID_FUNC(k_sem_give, struct k_sem *);
-DEFINE_FAKE_VALUE_FUNC(k_tid_t, k_sched_current_thread_query);
-DEFINE_FAKE_VOID_FUNC(k_work_init, struct k_work *, k_work_handler_t);
-DEFINE_FAKE_VOID_FUNC(k_work_init_delayable, struct k_work_delayable *, k_work_handler_t);
-DEFINE_FAKE_VALUE_FUNC(int, k_work_cancel_delayable, struct k_work_delayable *);
-DEFINE_FAKE_VALUE_FUNC(bool, k_work_flush, struct k_work *, struct k_work_sync *);
-DEFINE_FAKE_VALUE_FUNC(int, k_work_submit, struct k_work *);
-DEFINE_FAKE_VALUE_FUNC(int, k_work_submit_to_queue, struct k_work_q *, struct k_work *);
-DEFINE_FAKE_VALUE_FUNC(int, k_work_reschedule, struct k_work_delayable *, k_timeout_t);
-DEFINE_FAKE_VALUE_FUNC(int, k_work_schedule, struct k_work_delayable *, k_timeout_t);
-DEFINE_FAKE_VOID_FUNC(k_queue_init, struct k_queue *);
-DEFINE_FAKE_VOID_FUNC(k_queue_append, struct k_queue *, void *);
-DEFINE_FAKE_VALUE_FUNC(int, k_queue_is_empty, struct k_queue *);
-DEFINE_FAKE_VALUE_FUNC(void *, k_queue_get, struct k_queue *, k_timeout_t);
-DEFINE_FAKE_VOID_FUNC(k_queue_prepend, struct k_queue *, void *);
-DEFINE_FAKE_VALUE_FUNC(void *, k_heap_alloc, struct k_heap *, size_t, k_timeout_t);
-DEFINE_FAKE_VOID_FUNC(k_heap_free, struct k_heap *, void *);
-
-struct k_work_q k_sys_work_q;
diff --git a/tests/bluetooth/host/conn/mocks/kernel.h b/tests/bluetooth/host/conn/mocks/kernel.h
deleted file mode 100644
index d649c527d28..00000000000
--- a/tests/bluetooth/host/conn/mocks/kernel.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/fff.h>
-
-/* List of fakes used by this unit tester */
-#define KERNEL_MOCKS_FFF_FAKES_LIST(FAKE)                                                          \
-	FAKE(k_is_in_isr)                                                                          \
-	FAKE(k_poll_signal_raise)                                                                  \
-	FAKE(k_sem_take)                                                                           \
-	FAKE(k_sem_count_get)                                                                      \
-	FAKE(k_sem_give)                                                                           \
-	FAKE(k_sched_current_thread_query)                                                         \
-	FAKE(k_work_init)                                                                          \
-	FAKE(k_work_init_delayable)                                                                \
-	FAKE(k_work_cancel_delayable)                                                              \
-	FAKE(k_work_flush)                                                                         \
-	FAKE(k_work_submit)                                                                        \
-	FAKE(k_work_submit_to_queue)                                                               \
-	FAKE(k_work_reschedule)                                                                    \
-	FAKE(k_work_schedule)                                                                      \
-	FAKE(k_queue_init)                                                                         \
-	FAKE(k_queue_append)                                                                       \
-	FAKE(k_queue_is_empty)                                                                     \
-	FAKE(k_queue_get)                                                                          \
-	FAKE(k_queue_prepend)                                                                      \
-	FAKE(k_heap_alloc)                                                                         \
-	FAKE(k_heap_free)
-
-DECLARE_FAKE_VALUE_FUNC(bool, k_is_in_isr);
-DECLARE_FAKE_VALUE_FUNC(int, k_poll_signal_raise, struct k_poll_signal *, int);
-DECLARE_FAKE_VALUE_FUNC(int, k_sem_take, struct k_sem *, k_timeout_t);
-DECLARE_FAKE_VALUE_FUNC(unsigned int, k_sem_count_get, struct k_sem *);
-DECLARE_FAKE_VOID_FUNC(k_sem_give, struct k_sem *);
-DECLARE_FAKE_VALUE_FUNC(k_tid_t, k_sched_current_thread_query);
-DECLARE_FAKE_VOID_FUNC(k_work_init, struct k_work *, k_work_handler_t);
-DECLARE_FAKE_VOID_FUNC(k_work_init_delayable, struct k_work_delayable *, k_work_handler_t);
-DECLARE_FAKE_VALUE_FUNC(int, k_work_cancel_delayable, struct k_work_delayable *);
-DECLARE_FAKE_VALUE_FUNC(bool, k_work_flush, struct k_work *, struct k_work_sync *);
-DECLARE_FAKE_VALUE_FUNC(int, k_work_submit, struct k_work *);
-DECLARE_FAKE_VALUE_FUNC(int, k_work_submit_to_queue, struct k_work_q *, struct k_work *);
-DECLARE_FAKE_VALUE_FUNC(int, k_work_reschedule, struct k_work_delayable *, k_timeout_t);
-DECLARE_FAKE_VALUE_FUNC(int, k_work_schedule, struct k_work_delayable *, k_timeout_t);
-DECLARE_FAKE_VOID_FUNC(k_queue_init, struct k_queue *);
-DECLARE_FAKE_VOID_FUNC(k_queue_append, struct k_queue *, void *);
-DECLARE_FAKE_VALUE_FUNC(int, k_queue_is_empty, struct k_queue *);
-DECLARE_FAKE_VALUE_FUNC(void *, k_queue_get, struct k_queue *, k_timeout_t);
-DECLARE_FAKE_VOID_FUNC(k_queue_prepend, struct k_queue *, void *);
-DECLARE_FAKE_VALUE_FUNC(void *, k_heap_alloc, struct k_heap *, size_t, k_timeout_t);
-DECLARE_FAKE_VOID_FUNC(k_heap_free, struct k_heap *, void *);
diff --git a/tests/bluetooth/host/conn/mocks/l2cap_internal.c b/tests/bluetooth/host/conn/mocks/l2cap_internal.c
deleted file mode 100644
index 5f638fa12af..00000000000
--- a/tests/bluetooth/host/conn/mocks/l2cap_internal.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-
-#include "l2cap_internal.h"
-
-DEFINE_FAKE_VOID_FUNC(bt_l2cap_init);
-DEFINE_FAKE_VOID_FUNC(bt_l2cap_recv, struct bt_conn *, struct net_buf *, bool);
-DEFINE_FAKE_VOID_FUNC(bt_l2cap_connected, struct bt_conn *);
-DEFINE_FAKE_VALUE_FUNC(int, bt_l2cap_update_conn_param, struct bt_conn *,
-		       const struct bt_le_conn_param *);
-DEFINE_FAKE_VOID_FUNC(bt_l2cap_disconnected, struct bt_conn *);
-DEFINE_FAKE_VALUE_FUNC(struct net_buf *, l2cap_data_pull, struct bt_conn *, size_t, size_t *);
diff --git a/tests/bluetooth/host/conn/mocks/l2cap_internal.h b/tests/bluetooth/host/conn/mocks/l2cap_internal.h
deleted file mode 100644
index bf553d2cec7..00000000000
--- a/tests/bluetooth/host/conn/mocks/l2cap_internal.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/fff.h>
-#include <zephyr/bluetooth/addr.h>
-
-/* List of fakes used by this unit tester */
-#define L2CAP_INTERNAL_MOCKS_FFF_FAKES_LIST(FAKE)                                                  \
-	FAKE(bt_l2cap_init)                                                                        \
-	FAKE(bt_l2cap_recv)                                                                        \
-	FAKE(bt_l2cap_connected)                                                                   \
-	FAKE(bt_l2cap_update_conn_param)                                                           \
-	FAKE(bt_l2cap_disconnected)                                                                \
-	FAKE(l2cap_data_pull)
-
-DECLARE_FAKE_VOID_FUNC(bt_l2cap_init);
-DECLARE_FAKE_VOID_FUNC(bt_l2cap_recv, struct bt_conn *, struct net_buf *, bool);
-DECLARE_FAKE_VOID_FUNC(bt_l2cap_connected, struct bt_conn *);
-DECLARE_FAKE_VALUE_FUNC(int, bt_l2cap_update_conn_param, struct bt_conn *,
-			const struct bt_le_conn_param *);
-DECLARE_FAKE_VOID_FUNC(bt_l2cap_disconnected, struct bt_conn *);
-DECLARE_FAKE_VALUE_FUNC(struct net_buf *, l2cap_data_pull, struct bt_conn *, size_t, size_t *);
diff --git a/tests/bluetooth/host/conn/mocks/mock-sections.ld b/tests/bluetooth/host/conn/mocks/mock-sections.ld
deleted file mode 100644
index 3b296f55b1e..00000000000
--- a/tests/bluetooth/host/conn/mocks/mock-sections.ld
+++ /dev/null
@@ -1,29 +0,0 @@
-/* This is a stub file for the linker. None of the sections are used by the test. */
-
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-SECTIONS
-{
-	bt_conn_cb_area : ALIGN(4)
-	{
-		_bt_conn_cb_list_start = .;
-		KEEP(*(SORT_BY_NAME(._bt_conn_cb.static.*)))
-		_bt_conn_cb_list_end = .;
-	}
-}
-INSERT AFTER .data;
-
-SECTIONS
-{
-	net_buf_pool : ALIGN(4)
-	{
-		_net_buf_pool_list_start = .;
-		KEEP(*(SORT_BY_NAME(._net_buf_pool.static.*)))
-		_net_buf_pool_list_end_end = .;
-	}
-}
-INSERT AFTER .bss;
diff --git a/tests/bluetooth/host/conn/mocks/scan.c b/tests/bluetooth/host/conn/mocks/scan.c
deleted file mode 100644
index 6ccccd7bb88..00000000000
--- a/tests/bluetooth/host/conn/mocks/scan.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-
-#include "scan.h"
-
-DEFINE_FAKE_VALUE_FUNC(int, bt_le_scan_user_add, enum bt_le_scan_user);
-DEFINE_FAKE_VALUE_FUNC(int, bt_le_scan_user_remove, enum bt_le_scan_user);
-DEFINE_FAKE_VALUE_FUNC(bool, bt_le_explicit_scanner_running);
diff --git a/tests/bluetooth/host/conn/mocks/scan.h b/tests/bluetooth/host/conn/mocks/scan.h
deleted file mode 100644
index b694e309d16..00000000000
--- a/tests/bluetooth/host/conn/mocks/scan.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/fff.h>
-
-#include <host/scan.h>
-
-/* List of fakes used by this unit tester */
-#define SCAN_MOCKS_FFF_FAKES_LIST(FAKE)                                                            \
-	FAKE(bt_le_scan_user_add)                                                                  \
-	FAKE(bt_le_scan_user_remove)                                                               \
-	FAKE(bt_le_explicit_scanner_running)
-
-DECLARE_FAKE_VALUE_FUNC(int, bt_le_scan_user_add, enum bt_le_scan_user);
-DECLARE_FAKE_VALUE_FUNC(int, bt_le_scan_user_remove, enum bt_le_scan_user);
-DECLARE_FAKE_VALUE_FUNC(bool, bt_le_explicit_scanner_running);
diff --git a/tests/bluetooth/host/conn/mocks/smp.c b/tests/bluetooth/host/conn/mocks/smp.c
deleted file mode 100644
index 2377f49a998..00000000000
--- a/tests/bluetooth/host/conn/mocks/smp.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-
-#include "smp.h"
-
-DEFINE_FAKE_VOID_FUNC(bt_smp_init);
diff --git a/tests/bluetooth/host/conn/mocks/smp.h b/tests/bluetooth/host/conn/mocks/smp.h
deleted file mode 100644
index 3e64c15fd8d..00000000000
--- a/tests/bluetooth/host/conn/mocks/smp.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/fff.h>
-
-/* List of fakes used by this unit tester */
-#define SMP_MOCKS_FFF_FAKES_LIST(FAKE) FAKE(bt_smp_init)
-
-DECLARE_FAKE_VOID_FUNC(bt_smp_init);
diff --git a/tests/bluetooth/host/conn/mocks/spinlock.c b/tests/bluetooth/host/conn/mocks/spinlock.c
deleted file mode 100644
index 0fb772d1028..00000000000
--- a/tests/bluetooth/host/conn/mocks/spinlock.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-
-#include "spinlock.h"
-
-DEFINE_FAKE_VALUE_FUNC(bool, z_spin_lock_valid, struct k_spinlock *);
-DEFINE_FAKE_VALUE_FUNC(bool, z_spin_unlock_valid, struct k_spinlock *);
-DEFINE_FAKE_VOID_FUNC(z_spin_lock_set_owner, struct k_spinlock *);
diff --git a/tests/bluetooth/host/conn/mocks/spinlock.h b/tests/bluetooth/host/conn/mocks/spinlock.h
deleted file mode 100644
index 578c7176d8d..00000000000
--- a/tests/bluetooth/host/conn/mocks/spinlock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/fff.h>
-
-/* List of fakes used by this unit tester */
-#define SPINLOCK_MOCKS_FFF_FAKES_LIST(FAKE)                                                        \
-	FAKE(z_spin_lock_valid)                                                                    \
-	FAKE(z_spin_unlock_valid)                                                                  \
-	FAKE(z_spin_lock_set_owner)
-
-DECLARE_FAKE_VALUE_FUNC(bool, z_spin_lock_valid, struct k_spinlock *);
-DECLARE_FAKE_VALUE_FUNC(bool, z_spin_unlock_valid, struct k_spinlock *);
-DECLARE_FAKE_VOID_FUNC(z_spin_lock_set_owner, struct k_spinlock *);
diff --git a/tests/bluetooth/host/conn/mocks/sys_clock.c b/tests/bluetooth/host/conn/mocks/sys_clock.c
deleted file mode 100644
index 070d26855a6..00000000000
--- a/tests/bluetooth/host/conn/mocks/sys_clock.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-
-#include "sys_clock.h"
-
-DEFINE_FAKE_VALUE_FUNC(k_timepoint_t, sys_timepoint_calc, k_timeout_t);
-DEFINE_FAKE_VALUE_FUNC(k_timeout_t, sys_timepoint_timeout, k_timepoint_t);
diff --git a/tests/bluetooth/host/conn/mocks/sys_clock.h b/tests/bluetooth/host/conn/mocks/sys_clock.h
deleted file mode 100644
index 1594386e7fc..00000000000
--- a/tests/bluetooth/host/conn/mocks/sys_clock.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/fff.h>
-
-/* List of fakes used by this unit tester */
-#define SYS_CLOCK_MOCKS_FFF_FAKES_LIST(FAKE)                                                       \
-	FAKE(sys_timepoint_calc)                                                                   \
-	FAKE(sys_timepoint_timeout)
-
-DECLARE_FAKE_VALUE_FUNC(k_timepoint_t, sys_timepoint_calc, k_timeout_t);
-DECLARE_FAKE_VALUE_FUNC(k_timeout_t, sys_timepoint_timeout, k_timepoint_t);
diff --git a/tests/bluetooth/host/conn/mocks/zephyr/include/zephyr/drivers/bluetooth/hci_driver.h b/tests/bluetooth/host/conn/mocks/zephyr/include/zephyr/drivers/bluetooth/hci_driver.h
deleted file mode 100644
index 68285925d81..00000000000
--- a/tests/bluetooth/host/conn/mocks/zephyr/include/zephyr/drivers/bluetooth/hci_driver.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Stub for Bluetooth HCI driver API used to hide real hci_driver.h. */
-
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#ifndef ZEPHYR_INCLUDE_DRIVERS_BLUETOOTH_HCI_DRIVER_H_
-#define ZEPHYR_INCLUDE_DRIVERS_BLUETOOTH_HCI_DRIVER_H_
-
-#endif /* ZEPHYR_INCLUDE_DRIVERS_BLUETOOTH_HCI_DRIVER_H_ */
diff --git a/tests/bluetooth/host/conn/mocks/zephyr/syscalls/device.h b/tests/bluetooth/host/conn/mocks/zephyr/syscalls/device.h
deleted file mode 100644
index db591a5b5e5..00000000000
--- a/tests/bluetooth/host/conn/mocks/zephyr/syscalls/device.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * Dummy header file to avoid compiler errors
- * intentionally left blank
- */
diff --git a/tests/bluetooth/host/conn/prj.conf b/tests/bluetooth/host/conn/prj.conf
deleted file mode 100644
index f63ccd0a939..00000000000
--- a/tests/bluetooth/host/conn/prj.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-CONFIG_ZTEST=y
-CONFIG_ASSERT=y
-CONFIG_ASSERT_LEVEL=2
-CONFIG_ASSERT_VERBOSE=y
-
-CONFIG_BT=y
-CONFIG_BT_HCI=y
-CONFIG_BT_CENTRAL=y
-CONFIG_BT_EXT_ADV=y
-CONFIG_BT_PER_ADV=y
-CONFIG_BT_PER_ADV_SYNC=y
-
-CONFIG_BT_MAX_CONN=1
-CONFIG_BT_L2CAP_TX_MTU=23
-CONFIG_BT_CONN_TX_MAX=3
-CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=5000
-CONFIG_BT_L2CAP_TX_BUF_COUNT=3
-CONFIG_BT_ID_MAX=1
-CONFIG_BT_CENTRAL=y
-
-CONFIG_NET_BUF=y
diff --git a/tests/bluetooth/host/conn/src/main.c b/tests/bluetooth/host/conn/src/main.c
deleted file mode 100644
index 95220dc3873..00000000000
--- a/tests/bluetooth/host/conn/src/main.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/fff.h>
-#include <zephyr/kernel.h>
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/conn.h>
-
-#include "mocks/addr_internal.h"
-#include "mocks/att_internal.h"
-#include "mocks/bt_str.h"
-#include "mocks/buf_view.h"
-#include "mocks/hci_core.h"
-#include "mocks/id.h"
-#include "mocks/kernel.h"
-#include "mocks/l2cap_internal.h"
-#include "mocks/scan.h"
-#include "mocks/smp.h"
-#include "mocks/spinlock.h"
-#include "mocks/sys_clock.h"
-
-DEFINE_FFF_GLOBALS;
-
-static void fff_reset_rule_before(const struct ztest_unit_test *test, void *fixture)
-{
-	ADDR_INTERNAL_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
-	ATT_INTERNAL_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
-	BUF_VIEW_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
-	HCI_CORE_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
-	ID_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
-	KERNEL_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
-	L2CAP_INTERNAL_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
-	SCAN_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
-	SMP_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
-	SPINLOCK_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
-	SYS_CLOCK_MOCKS_FFF_FAKES_LIST(RESET_FAKE);
-}
-
-ZTEST_RULE(fff_reset_rule, fff_reset_rule_before, NULL);
-
-ZTEST_SUITE(conn, NULL, NULL, NULL, NULL, NULL);
-
-/*
- * Test that bt_conn_le_create() returns -EINVAL if conn is not NULL and
- * CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE is enabled.
- *
- * The test must be compiled with and without CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE
- * to ensure that the -EINVAL error is returned only when this Kconfig option is enabled.
- */
-ZTEST(conn, test_bt_conn_le_create_check_null_conn)
-{
-	bt_addr_le_t peer = {.a.val = {0x01}};
-	const struct bt_conn_le_create_param create_param = {
-		.options = BT_CONN_LE_OPT_NONE,
-		.interval = BT_GAP_SCAN_FAST_INTERVAL,
-		.window = BT_GAP_SCAN_FAST_WINDOW,
-		.interval_coded = 0,
-		.window_coded = 0,
-		.timeout = 100UL * MSEC_PER_SEC / 10,
-	};
-	struct bt_conn *conn;
-	int err;
-
-	/* Set conn to any non-NULL value to trigger the check. */
-	conn = (struct bt_conn *)1;
-
-	err = bt_conn_le_create(&peer, &create_param, BT_LE_CONN_PARAM_DEFAULT, &conn);
-	/* err must not be -EINVAL if CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE is not enabled,
-	 * otherwise -EAGAIN is returned.
-	 *
-	 * The printk is used to see what actually was compiled.
-	 */
-#if defined(CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE)
-	printk("Expected error -EINVAL\n");
-	zassert_equal(err, -EINVAL, "Failed starting initiator (err %d)", err);
-#else
-	printk("Expected error -EAGAIN\n");
-	zassert_equal(err, -EAGAIN, "Failed starting initiator (err %d)", err);
-#endif
-
-	/* If the conn is NULL, next error must not be -EINVAL. */
-	conn = NULL;
-	err = bt_conn_le_create(&peer, &create_param, BT_LE_CONN_PARAM_DEFAULT, &conn);
-	zassert_not_equal(err, -EINVAL, "Failed starting initiator (err %d)", err);
-}
-
-/*
- * Test that bt_conn_le_create_synced() returns -EINVAL if conn is not NULL and
- * CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE is enabled.
- *
- * The test must be compiled with and without CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE
- * to ensure that the -EINVAL error is returned only when this Kconfig option is enabled.
- */
-ZTEST(conn, test_bt_conn_le_create_synced_check_null_conn)
-{
-	bt_addr_le_t peer = {.a.val = {0x01}};
-	struct bt_le_conn_param conn_param = {
-		.interval_min = 0x30,
-		.interval_max = 0x30,
-		.latency = 0,
-		.timeout = 400,
-	};
-	struct bt_conn_le_create_synced_param synced_param = {
-		.peer = &peer,
-	};
-	struct bt_le_ext_adv *adv = NULL;
-	struct bt_conn *conn;
-	int err;
-
-	/* Set conn to any non-NULL value to trigger the check. */
-	conn = (struct bt_conn *)1;
-	err = bt_conn_le_create_synced(adv, &synced_param, &conn_param, &conn);
-
-	/* err must not be -EINVAL if CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE is not enabled,
-	 * otherwise -EAGAIN is returned.
-	 *
-	 * The printk is used to see what actually was compiled.
-	 */
-#if defined(CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE)
-	printk("Expected error -EINVAL\n");
-	zassert_equal(err, -EINVAL, "Failed starting initiator (err %d)", err);
-#else
-	printk("Expected error -EAGAIN\n");
-	zassert_equal(err, -EAGAIN, "Failed starting initiator (err %d)", err);
-#endif
-
-	/* If the conn is NULL, next error must not be -EINVAL. */
-	conn = NULL;
-	err = bt_conn_le_create_synced(adv, &synced_param, &conn_param, &conn);
-	zassert_not_equal(err, -EINVAL, "Failed starting initiator (err %d)", err);
-}
diff --git a/tests/bluetooth/host/conn/testcase.yaml b/tests/bluetooth/host/conn/testcase.yaml
deleted file mode 100644
index 1be5442b61d..00000000000
--- a/tests/bluetooth/host/conn/testcase.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-common:
-  tags:
-    - bluetooth
-    - host
-tests:
-  bluetooth.host.conn.test_default:
-    type: unit
-  bluetooth.host.conn.check_null_before_create:
-    type: unit
-    extra_configs:
-      - CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE=y

From d28f06379c75d6757c0b909d8b8ecbd6bccc7eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:36 +0100
Subject: [PATCH 1556/2913] Revert "[nrf fromtree] bluetooth: host: conn: Check
 if *conn is not NULL"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e7ce11094bd0d55140b4394178d1c7ccd9e512ab.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../bluetooth/api/connection_mgmt.rst         |  8 -----
 doc/releases/release-notes-4.0.rst            |  7 ----
 include/zephyr/bluetooth/conn.h               |  8 ++---
 subsys/bluetooth/host/Kconfig                 | 11 ------
 subsys/bluetooth/host/conn.c                  | 34 -------------------
 5 files changed, 2 insertions(+), 66 deletions(-)

diff --git a/doc/connectivity/bluetooth/api/connection_mgmt.rst b/doc/connectivity/bluetooth/api/connection_mgmt.rst
index 1b7ea2788c3..3a3d8d02a82 100644
--- a/doc/connectivity/bluetooth/api/connection_mgmt.rst
+++ b/doc/connectivity/bluetooth/api/connection_mgmt.rst
@@ -15,14 +15,6 @@ longer period of time, since this ensures that the object remains valid
 :c:func:`bt_conn_unref` API is to be used when releasing a reference
 to a connection.
 
-A common mistake is to forget unreleasing a reference to a connection
-object created by functions :c:func:`bt_conn_le_create` and
-:c:func:`bt_conn_le_create_synced`. To protect against this, use the
-:kconfig:option:`CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE` Kconfig option,
-which forces these functions return an error if the connection pointer
-passed to them is not NULL. This helps to spot such issues and avoid
-sporadic bugs caused by not releasing the connection object.
-
 An application may track connections by registering a
 :c:struct:`bt_conn_cb` struct using the :c:func:`bt_conn_cb_register`
 or :c:macro:`BT_CONN_CB_DEFINE` APIs. This struct lets the application
diff --git a/doc/releases/release-notes-4.0.rst b/doc/releases/release-notes-4.0.rst
index 76eaa3ac62f..976b9b156fb 100644
--- a/doc/releases/release-notes-4.0.rst
+++ b/doc/releases/release-notes-4.0.rst
@@ -98,13 +98,6 @@ Bluetooth
 
   * The host now disconnects from the peer upon ATT timeout.
 
-  * Added a warning to :c:func:`bt_conn_le_create` and :c:func:`bt_conn_le_create_synced` if
-    the connection pointer passed as an argument is not NULL.
-
-  * Added Kconfig option :kconfig:option:`CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE` to enforce
-    :c:func:`bt_conn_le_create` and :c:func:`bt_conn_le_create_synced` return an error if the
-    connection pointer passed as an argument is not NULL.
-
 * HCI Drivers
 
 Boards & SoC Support
diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index b4cf1c5c6ba..4d2da8d7a58 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -1336,9 +1336,7 @@ struct bt_conn_le_create_param {
  *  Allows initiate new LE link to remote peer using its address.
  *
  *  The caller gets a new reference to the connection object which must be
- *  released with bt_conn_unref() once done using the object. If
- *  @kconfig{CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE} is enabled, this function
- *  will return -EINVAL if dereferenced @p conn is not NULL.
+ *  released with bt_conn_unref() once done using the object.
  *
  *  This uses the General Connection Establishment procedure.
  *
@@ -1377,9 +1375,7 @@ struct bt_conn_le_create_synced_param {
  *  with Responses (PAwR) train.
  *
  *  The caller gets a new reference to the connection object which must be
- *  released with bt_conn_unref() once done using the object. If
- *  @kconfig{CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE} is enabled, this function
- *  will return -EINVAL if dereferenced @p conn is not NULL.
+ *  released with bt_conn_unref() once done using the object.
  *
  *  This uses the Periodic Advertising Connection Procedure.
  *
diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index bf3dd13cce9..3124b35b3df 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -343,17 +343,6 @@ config BT_CONN_PARAM_ANY
 	  min and max connection intervals in order to verify whether the
 	  desired parameters have been established in the connection.
 
-config BT_CONN_CHECK_NULL_BEFORE_CREATE
-	bool "Check if *conn is NULL when creating a connection"
-	help
-	  Enable this option to ensure that bt_conn_le_create and
-	  bt_conn_le_create_synced return an error if *conn is not initialized
-	  to NULL. This option is recommended to use to catch programming
-	  errors where the application reuses the connection pointer of an
-	  active connection object without dereferencing it. Without
-	  dereferencing, the connection object stays alive which can lead to an
-	  unpredictable behavior.
-
 config BT_USER_PHY_UPDATE
 	bool "User control of PHY Update Procedure"
 	depends on BT_PHY_UPDATE
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 9797337000a..21ed9de4a35 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -3729,23 +3729,6 @@ int bt_conn_le_create(const bt_addr_le_t *peer, const struct bt_conn_le_create_p
 	struct bt_conn *conn;
 	int err;
 
-	CHECKIF(ret_conn == NULL) {
-		return -EINVAL;
-	}
-
-	CHECKIF(*ret_conn != NULL) {
-		/* This rule helps application developers prevent leaks of connection references. If
-		 * a bt_conn variable is not null, it presumably holds a reference and must not be
-		 * overwritten. To avoid this warning, initialize the variables to null, and set
-		 * them to null when moving the reference.
-		 */
-		LOG_WRN("*conn should be unreferenced and initialized to NULL");
-
-		if (IS_ENABLED(CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE)) {
-			return -EINVAL;
-		}
-	}
-
 	err = conn_le_create_common_checks(peer, conn_param);
 	if (err) {
 		return err;
@@ -3805,23 +3788,6 @@ int bt_conn_le_create_synced(const struct bt_le_ext_adv *adv,
 	struct bt_conn *conn;
 	int err;
 
-	CHECKIF(ret_conn == NULL) {
-		return -EINVAL;
-	}
-
-	CHECKIF(*ret_conn != NULL) {
-		/* This rule helps application developers prevent leaks of connection references. If
-		 * a bt_conn variable is not null, it presumably holds a reference and must not be
-		 * overwritten. To avoid this warning, initialize the variables to null, and set
-		 * them to null when moving the reference.
-		 */
-		LOG_WRN("*conn should be unreferenced and initialized to NULL");
-
-		if (IS_ENABLED(CONFIG_BT_CONN_CHECK_NULL_BEFORE_CREATE)) {
-			return -EINVAL;
-		}
-	}
-
 	err = conn_le_create_common_checks(synced_param->peer, conn_param);
 	if (err) {
 		return err;

From 8827c20b6a570f7fb0df893725ee3dc4c0e6cddf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:36 +0100
Subject: [PATCH 1557/2913] Revert "[nrf noup] bluetooth: conn: Skip buffer ref
 count check in send_buf"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2f78c568f7016f5f9497a2420e55973a46d46018.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/host/conn.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 21ed9de4a35..bd3933d5b56 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -695,17 +695,13 @@ static int send_buf(struct bt_conn *conn, struct net_buf *buf,
 
 	uint16_t frag_len = MIN(conn_mtu(conn), len);
 
-	/* If ATT sent callback is delayed until data transmission is done by BLE controller, the
-	 * transmitted buffer may have an additional reference. The reference is used to extend
-	 * lifetime of the net buffer until the data transmission is confirmed by ACK of the remote.
-	 *
-	 * send_buf function can be called multiple times, if buffer has to be fragmented over HCI.
-	 * In that case, the callback is provided as an argument only for the last transmitted
-	 * fragment. The `buf->ref == 1` check is skipped because it's impossible to properly
-	 * validate number of references for the sent fragments if buffers may have the additional
-	 * reference.
-	 */
-	__ASSERT_NO_MSG(IS_ENABLED(CONFIG_BT_ATT_SENT_CB_AFTER_TX) || (buf->ref == 1));
+	if (buf->ref > 1 + (cb ? 1 : 0)) {
+		/* Allow for an additional buffer reference if callback is provided.
+		 * This can be used to extend lifetime of the net buffer until the
+		 * data transmission is confirmed by ACK of the remote.
+		 */
+		__ASSERT_NO_MSG(false);
+	}
 
 	if (buf->len > frag_len) {
 		LOG_DBG("keep %p around", buf);

From 6cd5a6e949802e41eb4117b980f037f59c2f0692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:36 +0100
Subject: [PATCH 1558/2913] Revert "[nrf noup] bluetooth: conn: Allow for an
 extra ref in bt_l2cap_send_pdu"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit db5300cf406ff1124e4047a6a3b2e0f1be0d94f8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/host/conn.c  | 8 +-------
 subsys/bluetooth/host/l2cap.c | 8 ++------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index bd3933d5b56..bc3e43b73c2 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -695,13 +695,7 @@ static int send_buf(struct bt_conn *conn, struct net_buf *buf,
 
 	uint16_t frag_len = MIN(conn_mtu(conn), len);
 
-	if (buf->ref > 1 + (cb ? 1 : 0)) {
-		/* Allow for an additional buffer reference if callback is provided.
-		 * This can be used to extend lifetime of the net buffer until the
-		 * data transmission is confirmed by ACK of the remote.
-		 */
-		__ASSERT_NO_MSG(false);
-	}
+	__ASSERT_NO_MSG(buf->ref == 1);
 
 	if (buf->len > frag_len) {
 		LOG_DBG("keep %p around", buf);
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index 1e3850fd591..3b5cfe82864 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -721,17 +721,13 @@ int bt_l2cap_send_pdu(struct bt_l2cap_le_chan *le_chan, struct net_buf *pdu,
 		return -ENOTCONN;
 	}
 
-	/* Allow for an additional buffer reference if callback is provided. This can be used to
-	 * extend lifetime of the net buffer until the data transmission is confirmed by ACK of the
-	 * remote.
-	 */
-	if (pdu->ref > 1 + (cb ? 1 : 0)) {
+	if (pdu->ref != 1) {
 		/* The host may alter the buf contents when fragmenting. Higher
 		 * layers cannot expect the buf contents to stay intact. Extra
 		 * refs suggests a silent data corruption would occur if not for
 		 * this error.
 		 */
-		LOG_ERR("Expecting up to %d refs, got %d", cb ? 2 : 1, pdu->ref);
+		LOG_ERR("Expecting 1 ref, got %d", pdu->ref);
 		return -EINVAL;
 	}
 

From ca5f8f6e673d37b68ea1671887ece7fd9b73bd15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:36 +0100
Subject: [PATCH 1559/2913] Revert "[nrf fromtree] bluetooth: host: l2cap:
 Check conn state before queueing PDU"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a1572f85f46db912d27f7010a6cea42076abbf02.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/host/l2cap.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index 3b5cfe82864..b6ca2f3ea00 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -717,10 +717,6 @@ static void cancel_data_ready(struct bt_l2cap_le_chan *le_chan)
 int bt_l2cap_send_pdu(struct bt_l2cap_le_chan *le_chan, struct net_buf *pdu,
 		      bt_conn_tx_cb_t cb, void *user_data)
 {
-	if (!le_chan->chan.conn || le_chan->chan.conn->state != BT_CONN_CONNECTED) {
-		return -ENOTCONN;
-	}
-
 	if (pdu->ref != 1) {
 		/* The host may alter the buf contents when fragmenting. Higher
 		 * layers cannot expect the buf contents to stay intact. Extra

From 1158e50f8ae9a1244ed71356b772e7de348e6b7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:37 +0100
Subject: [PATCH 1560/2913] Revert "[nrf fromtree] tests: bsim: bluetooth:
 host: att: Add ATT timeout test"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0fcbba50a66e7736f2f143a02d6c392592cfb682.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/host/att_internal.h          |   3 +-
 tests/bsim/bluetooth/host/att/compile.sh      |   1 -
 .../bluetooth/host/att/timeout/CMakeLists.txt |  24 --
 .../bluetooth/host/att/timeout/compile.sh     |  14 -
 tests/bsim/bluetooth/host/att/timeout/main.c  | 292 ------------------
 .../bsim/bluetooth/host/att/timeout/prj.conf  |  25 --
 .../host/att/timeout/test_scripts/run.sh      |  22 --
 7 files changed, 1 insertion(+), 380 deletions(-)
 delete mode 100644 tests/bsim/bluetooth/host/att/timeout/CMakeLists.txt
 delete mode 100755 tests/bsim/bluetooth/host/att/timeout/compile.sh
 delete mode 100644 tests/bsim/bluetooth/host/att/timeout/main.c
 delete mode 100644 tests/bsim/bluetooth/host/att/timeout/prj.conf
 delete mode 100755 tests/bsim/bluetooth/host/att/timeout/test_scripts/run.sh

diff --git a/subsys/bluetooth/host/att_internal.h b/subsys/bluetooth/host/att_internal.h
index 6eec4c5496e..7898dcedb74 100644
--- a/subsys/bluetooth/host/att_internal.h
+++ b/subsys/bluetooth/host/att_internal.h
@@ -10,8 +10,7 @@
 
 #define BT_EATT_PSM		0x27
 #define BT_ATT_DEFAULT_LE_MTU	23
-#define BT_ATT_TIMEOUT_SEC	30
-#define BT_ATT_TIMEOUT		K_SECONDS(BT_ATT_TIMEOUT_SEC)
+#define BT_ATT_TIMEOUT		K_SECONDS(30)
 
 /* Local ATT Rx MTU
  *
diff --git a/tests/bsim/bluetooth/host/att/compile.sh b/tests/bsim/bluetooth/host/att/compile.sh
index e6e25cf9c29..46fddfa1419 100755
--- a/tests/bsim/bluetooth/host/att/compile.sh
+++ b/tests/bsim/bluetooth/host/att/compile.sh
@@ -22,6 +22,5 @@ run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/att/sequential/compil
 run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/att/pipeline/compile.sh
 run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/att/long_read/compile.sh
 run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/att/open_close/compile.sh
-run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/att/timeout/compile.sh
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/att/timeout/CMakeLists.txt b/tests/bsim/bluetooth/host/att/timeout/CMakeLists.txt
deleted file mode 100644
index 66b7d8796c3..00000000000
--- a/tests/bsim/bluetooth/host/att/timeout/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-project(app)
-
-add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/common/testlib testlib)
-
-target_sources(app PRIVATE
-  ../long_read/bs_main.c
-  ../long_read/bs_sync.c
-  main.c
-)
-
-zephyr_include_directories(
-  ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
-  ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
-  ../long_read/
-)
-
-target_link_libraries(app PRIVATE
-  testlib
-)
diff --git a/tests/bsim/bluetooth/host/att/timeout/compile.sh b/tests/bsim/bluetooth/host/att/timeout/compile.sh
deleted file mode 100755
index b7b1eea135e..00000000000
--- a/tests/bsim/bluetooth/host/att/timeout/compile.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-set -eu
-: "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}"
-
-INCR_BUILD=1
-
-source ${ZEPHYR_BASE}/tests/bsim/compile.source
-
-app="$(guess_test_relpath)" compile
-
-wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/att/timeout/main.c b/tests/bsim/bluetooth/host/att/timeout/main.c
deleted file mode 100644
index 322dd20d9ba..00000000000
--- a/tests/bsim/bluetooth/host/att/timeout/main.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/* Copyright (c) 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <argparse.h>
-#include <zephyr/bluetooth/gatt.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/sys/__assert.h>
-#include <zephyr/settings/settings.h>
-#include <zephyr/sys/byteorder.h>
-#include <zephyr/bluetooth/bluetooth.h>
-
-#include "host/att_internal.h"
-
-#include "testlib/adv.h"
-#include "testlib/att_read.h"
-#include "testlib/att_write.h"
-#include "bs_macro.h"
-#include "bs_sync.h"
-#include <testlib/conn.h>
-#include "testlib/log_utils.h"
-#include "testlib/scan.h"
-#include "testlib/security.h"
-
-/* This test uses system asserts to fail tests. */
-BUILD_ASSERT(__ASSERT_ON);
-
-LOG_MODULE_REGISTER(main, LOG_LEVEL_DBG);
-
-#define CENTRAL_DEVICE_NBR    0
-#define PERIPHERAL_DEVICE_NBR 1
-
-#define UUID_1                                                                                     \
-	BT_UUID_DECLARE_128(0xdb, 0x1f, 0xe2, 0x52, 0xf3, 0xc6, 0x43, 0x66, 0xb3, 0x92, 0x5d,      \
-			    0xc6, 0xe7, 0xc9, 0x59, 0x9d)
-
-#define UUID_2                                                                                     \
-	BT_UUID_DECLARE_128(0x3f, 0xa4, 0x7f, 0x44, 0x2e, 0x2a, 0x43, 0x05, 0xab, 0x38, 0x07,      \
-			    0x8d, 0x16, 0xbf, 0x99, 0xf1)
-
-static bool trigger_att_timeout;
-static K_SEM_DEFINE(disconnected_sem, 0, 1);
-
-static ssize_t read_chrc(struct bt_conn *conn, const struct bt_gatt_attr *attr, void *buf,
-			 uint16_t buf_len, uint16_t offset)
-{
-	ssize_t read_len;
-
-	LOG_INF("ATT timeout will %sbe triggered", trigger_att_timeout ? "" : "not ");
-
-	if (trigger_att_timeout) {
-		/* Sleep longer than ATT Timeout (section 3.3.3). */
-		k_sleep(K_SECONDS(BT_ATT_TIMEOUT_SEC + 1));
-	}
-
-	__ASSERT_NO_MSG(offset == 0);
-	read_len = buf_len;
-
-	__ASSERT_NO_MSG(read_len >= 2);
-	sys_put_le16(read_len, buf);
-
-	return read_len;
-}
-
-static struct bt_gatt_attr attrs[] = {
-	BT_GATT_PRIMARY_SERVICE(UUID_1),
-	BT_GATT_CHARACTERISTIC(UUID_2, BT_GATT_CHRC_READ, BT_GATT_PERM_READ, read_chrc, NULL, NULL),
-};
-
-static struct bt_gatt_service svc = {
-	.attrs = attrs,
-	.attr_count = ARRAY_SIZE(attrs),
-};
-
-static void bs_sync_all_log(char *log_msg)
-{
-	/* Everyone meets here. */
-	bt_testlib_bs_sync_all();
-
-	if (get_device_nbr() == 0) {
-		LOG_WRN("Sync point: %s", log_msg);
-	}
-
-	/* Everyone waits for d0 to finish logging. */
-	bt_testlib_bs_sync_all();
-}
-
-static inline void bt_enable_quiet(void)
-{
-	bt_testlib_log_level_set("bt_hci_core", LOG_LEVEL_ERR);
-	bt_testlib_log_level_set("bt_id", LOG_LEVEL_ERR);
-
-	EXPECT_ZERO(bt_enable(NULL));
-
-	bt_testlib_log_level_set("bt_hci_core", LOG_LEVEL_INF);
-	bt_testlib_log_level_set("bt_id", LOG_LEVEL_INF);
-}
-
-static struct bt_conn *peripheral_setup(enum bt_att_chan_opt bearer, bool timeout)
-{
-	struct bt_conn *conn = NULL;
-
-	EXPECT_ZERO(bt_testlib_adv_conn(&conn, BT_ID_DEFAULT, bt_get_name()));
-
-	trigger_att_timeout = timeout;
-
-	return conn;
-}
-
-static struct bt_conn *central_setup(enum bt_att_chan_opt bearer, bool timeout)
-{
-	bt_addr_le_t adva;
-	struct bt_conn *conn = NULL;
-
-	EXPECT_ZERO(bt_testlib_scan_find_name(&adva, "peripheral"));
-	EXPECT_ZERO(bt_testlib_connect(&adva, &conn));
-
-	/* Establish EATT bearers. */
-	EXPECT_ZERO(bt_testlib_secure(conn, BT_SECURITY_L2));
-
-	while (bt_eatt_count(conn) == 0) {
-		k_msleep(100);
-	};
-
-	return conn;
-}
-
-static void central_read(struct bt_conn *conn, enum bt_att_chan_opt bearer, bool timeout)
-{
-	uint16_t actual_read_len;
-	uint16_t remote_read_send_len;
-	uint16_t handle = 0;
-	int err;
-
-	NET_BUF_SIMPLE_DEFINE(attr_value, sizeof(remote_read_send_len));
-
-	err = bt_testlib_att_read_by_type_sync(&attr_value, &actual_read_len, &handle, NULL, conn,
-					       bearer, UUID_2, BT_ATT_FIRST_ATTRIBUTE_HANDLE,
-					       BT_ATT_LAST_ATTRIBUTE_HANDLE);
-
-	if (timeout) {
-		__ASSERT(err == BT_ATT_ERR_UNLIKELY, "Unexpected error %d", err);
-	} else {
-		__ASSERT(!err, "Unexpected error %d", err);
-		__ASSERT(attr_value.len >= sizeof(remote_read_send_len),
-			 "Remote sent too little data.");
-		remote_read_send_len = net_buf_simple_pull_le16(&attr_value);
-		__ASSERT(remote_read_send_len == actual_read_len, "Length mismatch. %u %u",
-			 remote_read_send_len, actual_read_len);
-	}
-}
-
-/**
- * Test procedure:
- *
- * Central:
- * 1. Connect to the peripheral.
- * 2. Try to read a characteristic value.
- * 3. Expect BT_ATT_ERR_UNLIKELY error.
- * 4. Expect the peripheral to disconnect.
- * 5. Reconnect to the peripheral.
- * 6. Try to read a characteristic value.
- * 7. Expect the peripheral to respond with the characteristic value.
- * 8. Ensure that connection stays alive after a delay equal to ATT timeout.
- * 9. Disconnect from the peripheral.
- *
- * Peripheral:
- * 1. Start advertising.
- * 2. Make the read callback sleep for more than ATT Timeout when the central tries to read.
- * 3. Expect the disconnected callback to be called.
- * 4. Start advertising again.
- * 5. Make the read callback respond with the characteristic value when the central tries to read.
- * 6. Expect the connection stay alive after a delay equal to ATT timeout.
- * 7. Expect the central to disconnect.
- */
-static void test_timeout(enum bt_att_chan_opt bearer)
-{
-	bool central = (get_device_nbr() == CENTRAL_DEVICE_NBR);
-	bool peripheral = (get_device_nbr() == PERIPHERAL_DEVICE_NBR);
-	struct bt_conn *conn;
-	int err;
-
-	/* Test ATT timeout. */
-	if (peripheral) {
-		conn = peripheral_setup(bearer, true);
-	}
-
-	if (central) {
-		conn = central_setup(bearer, true);
-	}
-
-	bs_sync_all_log("Ready to test ATT timeout");
-
-	if (central) {
-		central_read(conn, bearer, true);
-	}
-
-	err = k_sem_take(&disconnected_sem, K_SECONDS(BT_ATT_TIMEOUT_SEC + 2));
-	/* Here disconnect is triggered by the Central host due to ATT timeout. */
-	__ASSERT(!err, "Unexpected error %d", err);
-	bt_testlib_conn_unref(&conn);
-
-	/* Test successful read. */
-	if (peripheral) {
-		conn = peripheral_setup(bearer, false);
-	}
-
-	if (central) {
-		conn = central_setup(bearer, false);
-	}
-
-	bs_sync_all_log("Ready to test successful read");
-
-	if (central) {
-		central_read(conn, bearer, false);
-	}
-
-	err = k_sem_take(&disconnected_sem, K_SECONDS(BT_ATT_TIMEOUT_SEC + 2));
-	/* Check that disconnect doesn't happen during time > ATT timeout. */
-	__ASSERT(err == -EAGAIN, "Unexpected error %d", err);
-
-	if (central) {
-		/* This time disconnect from the peripheral. */
-		EXPECT_ZERO(bt_testlib_disconnect(&conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN));
-	}
-
-	if (peripheral) {
-		/* Wait for the central to disconnect. */
-		bt_testlib_wait_disconnected(conn);
-		bt_testlib_conn_unref(&conn);
-	}
-
-	/* Clear the semaphore. */
-	err = k_sem_take(&disconnected_sem, K_SECONDS(1));
-	__ASSERT_NO_MSG(!err);
-}
-
-static void connected(struct bt_conn *conn, uint8_t err)
-{
-	LOG_INF("Connected");
-}
-
-static void disconnected(struct bt_conn *conn, uint8_t reason)
-{
-	bool central = (get_device_nbr() == CENTRAL_DEVICE_NBR);
-	bool peripheral = (get_device_nbr() == PERIPHERAL_DEVICE_NBR);
-	uint8_t expected_reason;
-
-	LOG_INF("Disconnected: %u", reason);
-
-	if (central) {
-		expected_reason = BT_HCI_ERR_LOCALHOST_TERM_CONN;
-	}
-
-	if (peripheral) {
-		expected_reason = BT_HCI_ERR_REMOTE_USER_TERM_CONN;
-	}
-
-	__ASSERT(expected_reason == reason, "Unexpected reason %u", reason);
-
-	k_sem_give(&disconnected_sem);
-}
-
-BT_CONN_CB_DEFINE(conn_callbacks) = {
-	.connected = connected,
-	.disconnected = disconnected,
-};
-
-void the_test(void)
-{
-	bool peripheral = (get_device_nbr() == PERIPHERAL_DEVICE_NBR);
-
-	if (peripheral) {
-		EXPECT_ZERO(bt_gatt_service_register(&svc));
-	}
-
-	bt_enable_quiet();
-
-	if (peripheral) {
-		EXPECT_ZERO(bt_set_name("peripheral"));
-	}
-
-	bs_sync_all_log("Testing UATT");
-	test_timeout(BT_ATT_CHAN_OPT_UNENHANCED_ONLY);
-
-	bs_sync_all_log("Testing EATT");
-	test_timeout(BT_ATT_CHAN_OPT_ENHANCED_ONLY);
-
-	bs_sync_all_log("Test Complete");
-
-	PASS("Test complete\n");
-}
diff --git a/tests/bsim/bluetooth/host/att/timeout/prj.conf b/tests/bsim/bluetooth/host/att/timeout/prj.conf
deleted file mode 100644
index ddcef1bc3fe..00000000000
--- a/tests/bsim/bluetooth/host/att/timeout/prj.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-CONFIG_ASSERT=y
-CONFIG_BOOT_BANNER=n
-CONFIG_BT_BUF_ACL_RX_SIZE=204
-CONFIG_BT_CENTRAL=y
-CONFIG_BT_DEVICE_NAME_DYNAMIC=y
-CONFIG_BT_EATT=y
-CONFIG_BT_EXT_ADV=y
-CONFIG_BT_GATT_CLIENT=y
-CONFIG_BT_GATT_DYNAMIC_DB=y
-CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
-CONFIG_BT_L2CAP_ECRED=y
-CONFIG_BT_L2CAP_TX_MTU=200
-CONFIG_BT_MAX_CONN=3
-CONFIG_BT_MAX_PAIRED=2
-CONFIG_BT_PERIPHERAL=y
-CONFIG_BT_PRIVACY=n
-CONFIG_BT_SMP=y
-CONFIG_BT_TESTING=y
-CONFIG_BT=y
-CONFIG_FLASH_MAP=y
-CONFIG_FLASH=y
-CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP=n
-CONFIG_LOG_RUNTIME_FILTERING=y
-CONFIG_LOG_TAG_MAX_LEN=20
-CONFIG_LOG=y
diff --git a/tests/bsim/bluetooth/host/att/timeout/test_scripts/run.sh b/tests/bsim/bluetooth/host/att/timeout/test_scripts/run.sh
deleted file mode 100755
index bda0787f074..00000000000
--- a/tests/bsim/bluetooth/host/att/timeout/test_scripts/run.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-set -eu -x
-
-source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
-
-simulation_id="timeout"
-dev_exe=bs_${BOARD_TS}_$(guess_test_long_name)_prj_conf
-args_all=(-s=${simulation_id} -D=2)
-args_dev=(-v=2 -RealEncryption=1 -testid=the_test)
-
-cd "${BSIM_OUT_PATH}/bin"
-
-Execute ./${dev_exe} "${args_all[@]}" "${args_dev[@]}" -d=0
-
-Execute ./${dev_exe} "${args_all[@]}" "${args_dev[@]}" -d=1
-
-Execute ./bs_2G4_phy_v1 "${args_all[@]}" -sim_length=200e6
-
-wait_for_background_jobs

From b81f4ae7744cbdcc2a832ded4e0e4883835920f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:37 +0100
Subject: [PATCH 1561/2913] Revert "[nrf fromtree] bluetooth: host: att:
 Implement disconnect on ATT timeout"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ba848524b837268d88389d4b1e4475707d07d883.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/connectivity/bluetooth/bluetooth-le-host.rst | 13 -------------
 doc/connectivity/bluetooth/img/att_timeout.svg   |  1 -
 doc/releases/release-notes-4.0.rst               |  2 --
 subsys/bluetooth/host/att.c                      | 13 +------------
 4 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 doc/connectivity/bluetooth/img/att_timeout.svg

diff --git a/doc/connectivity/bluetooth/bluetooth-le-host.rst b/doc/connectivity/bluetooth/bluetooth-le-host.rst
index 567961bc649..3fad3425681 100644
--- a/doc/connectivity/bluetooth/bluetooth-le-host.rst
+++ b/doc/connectivity/bluetooth/bluetooth-le-host.rst
@@ -274,19 +274,6 @@ over LE connections. A more detailed description of this layer and the
 API reference can be found in the
 :ref:`GATT API reference section <bt_gatt>`.
 
-ATT timeout
------------
-
-If the peer device does not respond to an ATT request (such as read or write)
-within the ATT timeout, the host will automatically initiate a disconnect. This
-simplifies error handling by reducing rare failure conditions to a common
-disconnection, allowing developers to manage unexpected disconnects without
-special cases for ATT timeouts.
-
-.. image:: img/att_timeout.svg
-  :align: center
-  :alt: ATT timeout
-
 Mesh
 ====
 
diff --git a/doc/connectivity/bluetooth/img/att_timeout.svg b/doc/connectivity/bluetooth/img/att_timeout.svg
deleted file mode 100644
index 8b1f2832b6e..00000000000
--- a/doc/connectivity/bluetooth/img/att_timeout.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="421.4523278203424" height="300.077684621"><desc>participant%20App%0Aparticipant%20Host%0Aparticipant%20Peer%0A%0AApp%20-%3E%20Host%3A%20bt_gatt_read(cb)%0A%0A%0A%0AHost%20-%3E%20Peer%3A%20ATT_READ_REQ%0Aactivate%20Host%0Aspace%20-4.1%0Aaboxright%20left%20of%20Host%3A%200%20seconds%20%20%0Aspace%20-2.8%0APeer%20-x%20Host%3A%20ATT_READ_RSP%0Aaboxright%20left%20of%20Host%3A%2030%20seconds%20%20%0Aspace%20-5.4%0AHost%20-%3E%20Host%3A%20bt_conn_disconnect%0Aspace%20-2.8%0Adeactivate%20Host</desc><defs/><g><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g><rect fill="white" stroke="none" x="0" y="0" width="421" height="300"/></g><g/><g><path fill="none" stroke="black" paint-order="fill stroke markers" d=" M 38.93352592923047 55.049635120999994 L 38.93352592923047 300.077684621" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray="12.565541,5.445067766666667"/><path fill="none" stroke="black" paint-order="fill stroke markers" d=" M 198.23498819400908 55.049635120999994 L 198.23498819400908 300.077684621" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray="12.565541,5.445067766666667"/><path fill="none" stroke="black" paint-order="fill stroke markers" d=" M 380.07786103417834 55.049635120999994 L 380.07786103417834 300.077684621" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray="12.565541,5.445067766666667"/></g><g><path fill="none" stroke="none"/><g><path fill="white" stroke="black" paint-order="fill stroke markers" d=" M 8.167601650000002 10.944586211000003 L 69.69945020846095 10.944586211000003 L 69.69945020846095 55.049635120999994 L 8.167601650000002 55.049635120999994 L 8.167601650000002 10.944586211000003 Z" stroke-miterlimit="10" stroke-width="2.613632528" stroke-dasharray=""/></g><g><g/><text fill="black" stroke="none" font-family="sans-serif" font-size="11pt" font-style="normal" font-weight="normal" text-decoration="normal" x="25.8912972305" y="38.71443182099999" text-anchor="start" dominant-baseline="alphabetic" xml:space="preserve">App</text></g><path fill="none" stroke="none"/><g><path fill="white" stroke="black" paint-order="fill stroke markers" d=" M 165.4397136340169 10.944586211000003 L 231.03026275400128 10.944586211000003 L 231.03026275400128 55.049635120999994 L 165.4397136340169 55.049635120999994 L 165.4397136340169 10.944586211000003 Z" stroke-miterlimit="10" stroke-width="2.613632528" stroke-dasharray=""/></g><g><g/><text fill="black" stroke="none" font-family="sans-serif" font-size="11pt" font-style="normal" font-weight="normal" text-decoration="normal" x="183.1634092145169" y="38.71443182099999" text-anchor="start" dominant-baseline="alphabetic" xml:space="preserve">Host</text></g><path fill="none" stroke="none"/><g><path fill="white" stroke="black" paint-order="fill stroke markers" d=" M 346.87099589801426 10.944586211000003 L 413.28472617034237 10.944586211000003 L 413.28472617034237 55.049635120999994 L 346.87099589801426 55.049635120999994 L 346.87099589801426 10.944586211000003 Z" stroke-miterlimit="10" stroke-width="2.613632528" stroke-dasharray=""/></g><g><g/><text fill="black" stroke="none" font-family="sans-serif" font-size="11pt" font-style="normal" font-weight="normal" text-decoration="normal" x="364.5946914785143" y="38.71443182099999" text-anchor="start" dominant-baseline="alphabetic" xml:space="preserve">Peer</text></g></g><g><path fill="white" stroke="black" paint-order="fill stroke markers" d=" M 190.06738654400908 154.694375251 L 206.40258984400907 154.694375251 L 206.40258984400907 242.904473071 L 190.06738654400908 242.904473071 L 190.06738654400908 154.694375251" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray=""/><g><rect fill="white" stroke="none" x="62.34731732589711" y="87.720041721" width="112.47387947144531" height="21.23576429"/><text fill="black" stroke="none" font-family="sans-serif" font-size="11pt" font-style="normal" font-weight="normal" text-decoration="normal" x="64.79759782089711" y="102.42172469100001" text-anchor="start" dominant-baseline="alphabetic" xml:space="preserve">bt_gatt_read(cb)</text></g><g><path fill="none" stroke="black" paint-order="fill stroke markers" d=" M 38.93352592923047 108.95580601099999 L 184.78567081034242 108.95580601099999" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray=""/><g transform="translate(198.23498819400908,108.95580601099999) translate(-198.23498819400908,-108.95580601099999)"><path fill="black" stroke="none" paint-order="stroke fill markers" d=" M 184.6223187773424 102.14947130266665 L 198.23498819400908 108.95580601099999 L 184.6223187773424 115.76214071933333 Z"/></g></g><g><rect fill="white" stroke="none" x="233.0877202126484" y="133.458610961" width="120.30501045289063" height="21.23576429"/><text fill="black" stroke="none" font-family="sans-serif" font-size="11pt" font-style="normal" font-weight="normal" text-decoration="normal" x="235.5380007076484" y="148.16029393099998" text-anchor="start" dominant-baseline="alphabetic" xml:space="preserve">ATT_READ_REQ</text></g><g><path fill="none" stroke="black" paint-order="fill stroke markers" d=" M 206.40258984400907 154.694375251 L 366.6285436505117 154.694375251" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray=""/><g transform="translate(380.07786103417834,154.694375251) translate(-380.07786103417834,-154.694375251)"><path fill="black" stroke="none" paint-order="stroke fill markers" d=" M 366.46519161751166 147.88804054266666 L 380.07786103417834 154.694375251 L 366.46519161751166 161.50070995933334 Z"/></g></g><path fill="white" stroke="black" paint-order="fill stroke markers" d=" M 190.06738654400908 155.511135416 L 181.8997848940091 155.511135416 M 61.18630110322784 136.725651621 L 167.19810192400908 136.725651621 L 181.8997848940091 155.511135416 L 167.19810192400908 174.296619211 L 61.18630110322784 174.296619211 L 61.18630110322784 136.725651621" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray=""/><g><text fill="black" stroke="none" font-family="sans-serif" font-size="11pt" font-style="normal" font-weight="normal" text-decoration="normal" x="84.05558572322784" y="159.59493624099997" text-anchor="start" dominant-baseline="alphabetic" xml:space="preserve">0 seconds  </text></g><g><rect fill="white" stroke="none" x="237.98398289067578" y="177.56365987100003" width="118.68008674683594" height="21.23576429"/><text fill="black" stroke="none" font-family="sans-serif" font-size="11pt" font-style="normal" font-weight="normal" text-decoration="normal" x="240.43426338567576" y="192.265342841" text-anchor="start" dominant-baseline="alphabetic" xml:space="preserve">ATT_READ_RSP</text></g><g><path fill="none" stroke="black" paint-order="fill stroke markers" d=" M 380.07786103417834 198.79942416100002 L 222.73779314400906 198.79942416100002" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray=""/><path fill="none" stroke="black" paint-order="fill stroke markers" d=" M 214.57019149400907 190.63182251100002 L 230.90539479400906 206.967025811 M 214.57019149400907 206.967025811 L 230.90539479400906 190.63182251100002" stroke-miterlimit="10" stroke-width="1.3612669416666667"/></g><path fill="white" stroke="black" paint-order="fill stroke markers" d=" M 190.06738654400908 242.08771290599998 L 181.8997848940091 242.08771290599998 M 53.0331181198294 223.30222911099997 L 167.19810192400908 223.30222911099997 L 181.8997848940091 242.08771290599998 L 167.19810192400908 260.873196701 L 53.0331181198294 260.873196701 L 53.0331181198294 223.30222911099997" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray=""/><g><text fill="black" stroke="none" font-family="sans-serif" font-size="11pt" font-style="normal" font-weight="normal" text-decoration="normal" x="75.9024027398294" y="246.17151373099995" text-anchor="start" dominant-baseline="alphabetic" xml:space="preserve">30 seconds  </text></g><g><rect fill="white" stroke="none" x="225.73258041567576" y="221.66870878100002" width="135.308519974375" height="21.23576429"/><text fill="black" stroke="none" font-family="sans-serif" font-size="11pt" font-style="normal" font-weight="normal" text-decoration="normal" x="228.18286091067574" y="236.370391751" text-anchor="start" dominant-baseline="alphabetic" xml:space="preserve">bt_conn_disconnect</text></g><g><path fill="none" stroke="black" paint-order="fill stroke markers" d=" M 206.40258984400907 242.904473071 L 271.7434030440091 242.904473071 L 271.7434030440091 264.140237361 L 219.85190722767572 264.140237361" stroke-miterlimit="10" stroke-width="1.3612669416666667" stroke-dasharray=""/><g transform="translate(206.40258984400907,264.140237361) translate(-206.40258984400907,-264.140237361)"><path fill="black" stroke="none" paint-order="stroke fill markers" d=" M 220.01525926067575 257.33390265266667 L 206.40258984400907 264.140237361 L 220.01525926067575 270.94657206933334 Z"/></g></g></g><g/><g/><g/></g></svg>
\ No newline at end of file
diff --git a/doc/releases/release-notes-4.0.rst b/doc/releases/release-notes-4.0.rst
index 976b9b156fb..85c2523ab00 100644
--- a/doc/releases/release-notes-4.0.rst
+++ b/doc/releases/release-notes-4.0.rst
@@ -96,8 +96,6 @@ Bluetooth
   * Added API :c:func:`bt_gatt_get_uatt_mtu` to get current Unenhanced ATT MTU of a given
     connection (experimental).
 
-  * The host now disconnects from the peer upon ATT timeout.
-
 * HCI Drivers
 
 Boards & SoC Support
diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c
index f5bca16d8d2..7af47a6a3b8 100644
--- a/subsys/bluetooth/host/att.c
+++ b/subsys/bluetooth/host/att.c
@@ -3150,10 +3150,9 @@ static void att_timeout(struct k_work *work)
 	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
 	struct bt_att_chan *chan = CONTAINER_OF(dwork, struct bt_att_chan,
 						timeout_work);
-	int err;
 
 	bt_addr_le_to_str(bt_conn_get_dst(chan->att->conn), addr, sizeof(addr));
-	LOG_ERR("ATT Timeout for device %s. Disconnecting...", addr);
+	LOG_ERR("ATT Timeout for device %s", addr);
 
 	/* BLUETOOTH SPECIFICATION Version 4.2 [Vol 3, Part F] page 480:
 	 *
@@ -3164,16 +3163,6 @@ static void att_timeout(struct k_work *work)
 	 * target device on this ATT Bearer.
 	 */
 	bt_att_disconnected(&chan->chan.chan);
-
-	/* The timeout state is local and can block new ATT operations, but does not affect the
-	 * remote side. Disconnecting the GATT connection upon ATT timeout simplifies error handling
-	 * for developers. This reduces rare failure conditions to a common one, allowing developers
-	 * to handle unexpected disconnections without needing special cases for ATT timeouts.
-	 */
-	err = bt_conn_disconnect(chan->chan.chan.conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
-	if (err) {
-		LOG_ERR("Disconnecting failed (err %d)", err);
-	}
 }
 
 static struct bt_att_chan *att_get_fixed_chan(struct bt_conn *conn)

From 0ed598f06d3e9e2a3e4e6ed6c399ece6949cb381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:37 +0100
Subject: [PATCH 1562/2913] Revert "[nrf fromtree] Bluetooth: host: Kconfig:
 Correct `help` of `BT_BONDABLE`"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b5c17988a848418ee151d9e07948dd60cb83aa16.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/host/Kconfig | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index 3124b35b3df..4710f24e90c 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -661,13 +661,9 @@ config BT_BONDABLE
 	bool "Bondable Mode"
 	default y
 	help
-	  This option is the default value of the bonding flag for any ACL connection.
-	  If the option is true, the default bonding flag is true. Or, the default
-	  bonding flag is false.
-	  After a connection is established, the bonding flag of the connection
-	  can also be changed by calling `bt_conn_set_bondable()` if the configuration
-	  `the bonding flag per-connection` (BT_BONDABLE_PER_CONNECTION) is
-	  enabled. Please see the BT_BONDABLE_PER_CONNECTION configuration.
+	  This option enables support for Bondable Mode. In this mode,
+	  Bonding flag in AuthReq of SMP Pairing Request/Response will be set
+	  indicating the support for this mode.
 
 config BT_BONDING_REQUIRED
 	bool "Always require bonding"

From 2569b57d16ec08095b3d71ed210da2e9764bfb63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:37 +0100
Subject: [PATCH 1563/2913] Revert "[nrf fromtree] Bluetooth: Host: smp: Add
 function to get bonding setting"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8fd9326ae1053ef63e94a24bab0b3f6b715924ed.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/conn.h | 11 -----------
 subsys/bluetooth/host/smp.c     |  5 -----
 2 files changed, 16 deletions(-)

diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index 4d2da8d7a58..23dd9fb89f8 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -1980,17 +1980,6 @@ static inline const char *bt_security_err_to_str(enum bt_security_err err)
  */
 void bt_set_bondable(bool enable);
 
-/** @brief Get bonding flag.
- *
- *  Get current bonding flag.
- *  The initial value of this flag depends on @kconfig{CONFIG_BT_BONDABLE} Kconfig
- *  setting.
- *  The Bonding flag can be updated using bt_set_bondable().
- *
- *  @return Current bonding flag.
- */
-bool bt_get_bondable(void);
-
 /** @brief Set/clear the bonding flag for a given connection.
  *
  *  Set/clear the Bonding flag in the Authentication Requirements of
diff --git a/subsys/bluetooth/host/smp.c b/subsys/bluetooth/host/smp.c
index 24ace96809d..1971f185f95 100644
--- a/subsys/bluetooth/host/smp.c
+++ b/subsys/bluetooth/host/smp.c
@@ -2639,11 +2639,6 @@ void bt_set_bondable(bool enable)
 	bondable = enable;
 }
 
-bool bt_get_bondable(void)
-{
-	return bondable;
-}
-
 void bt_le_oob_set_sc_flag(bool enable)
 {
 	sc_oobd_present = enable;

From 35dfaaeddeaf6fbeced5ce22c1f175df2c228e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:37 +0100
Subject: [PATCH 1564/2913] Revert "[nrf fromtree] Bluetooth: Host: SSP:
 Correct BR bonding type"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 236fdfacf9fbaa438e5e9680885bc1655f266063.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/host/classic/l2cap_br.c |  7 -------
 subsys/bluetooth/host/classic/rfcomm.c   |  7 -------
 subsys/bluetooth/host/classic/ssp.c      | 12 ++----------
 subsys/bluetooth/host/conn.c             |  1 -
 subsys/bluetooth/host/conn_internal.h    |  1 -
 5 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/subsys/bluetooth/host/classic/l2cap_br.c b/subsys/bluetooth/host/classic/l2cap_br.c
index 4c1461c7f04..523cce4600b 100644
--- a/subsys/bluetooth/host/classic/l2cap_br.c
+++ b/subsys/bluetooth/host/classic/l2cap_br.c
@@ -786,13 +786,6 @@ l2cap_br_conn_security(struct bt_l2cap_chan *chan, const uint16_t psm)
 	 * since service/profile requires that.
 	 */
 	if (check == 0) {
-		/*
-		 * General Bonding refers to the process of performing bonding
-		 * during connection setup or channel establishment procedures
-		 * as a precursor to accessing a service.
-		 * For current case, it is dedicated bonding.
-		 */
-		atomic_set_bit(chan->conn->flags, BT_CONN_BR_GENERAL_BONDING);
 		return L2CAP_CONN_SECURITY_PENDING;
 	}
 
diff --git a/subsys/bluetooth/host/classic/rfcomm.c b/subsys/bluetooth/host/classic/rfcomm.c
index f8742bff367..21ccba25e7e 100644
--- a/subsys/bluetooth/host/classic/rfcomm.c
+++ b/subsys/bluetooth/host/classic/rfcomm.c
@@ -829,13 +829,6 @@ static enum security_result rfcomm_dlc_security(struct bt_rfcomm_dlc *dlc)
 	}
 
 	if (!bt_conn_set_security(conn, dlc->required_sec_level)) {
-		/*
-		 * General Bonding refers to the process of performing bonding
-		 * during connection setup or channel establishment procedures
-		 * as a precursor to accessing a service.
-		 * For current case, it is dedicated bonding.
-		 */
-		atomic_set_bit(conn->flags, BT_CONN_BR_GENERAL_BONDING);
 		/* If Security elevation is initiated or in progress */
 		return RFCOMM_SECURITY_PENDING;
 	}
diff --git a/subsys/bluetooth/host/classic/ssp.c b/subsys/bluetooth/host/classic/ssp.c
index 41a42f829f3..72ac72624a7 100644
--- a/subsys/bluetooth/host/classic/ssp.c
+++ b/subsys/bluetooth/host/classic/ssp.c
@@ -666,17 +666,9 @@ void bt_hci_io_capa_req(struct net_buf *buf)
 	 */
 	if (atomic_test_bit(conn->flags, BT_CONN_BR_PAIRING_INITIATOR)) {
 		if (get_io_capa() != BT_IO_NO_INPUT_OUTPUT) {
-			if (atomic_test_bit(conn->flags, BT_CONN_BR_GENERAL_BONDING)) {
-				auth = BT_HCI_GENERAL_BONDING_MITM;
-			} else {
-				auth = BT_HCI_DEDICATED_BONDING_MITM;
-			}
+			auth = BT_HCI_DEDICATED_BONDING_MITM;
 		} else {
-			if (atomic_test_bit(conn->flags, BT_CONN_BR_GENERAL_BONDING)) {
-				auth = BT_HCI_GENERAL_BONDING;
-			} else {
-				auth = BT_HCI_DEDICATED_BONDING;
-			}
+			auth = BT_HCI_DEDICATED_BONDING;
 		}
 	} else {
 		auth = ssp_get_auth(conn);
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index bc3e43b73c2..8a2a05d8d72 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -2623,7 +2623,6 @@ static void reset_pairing(struct bt_conn *conn)
 		atomic_clear_bit(conn->flags, BT_CONN_BR_PAIRING);
 		atomic_clear_bit(conn->flags, BT_CONN_BR_PAIRING_INITIATOR);
 		atomic_clear_bit(conn->flags, BT_CONN_BR_LEGACY_SECURE);
-		atomic_clear_bit(conn->flags, BT_CONN_BR_GENERAL_BONDING);
 	}
 #endif /* CONFIG_BT_CLASSIC */
 
diff --git a/subsys/bluetooth/host/conn_internal.h b/subsys/bluetooth/host/conn_internal.h
index f5e747febdd..6b6c97b1902 100644
--- a/subsys/bluetooth/host/conn_internal.h
+++ b/subsys/bluetooth/host/conn_internal.h
@@ -60,7 +60,6 @@ enum {
 	BT_CONN_USER,                         /* user I/O when pairing */
 	BT_CONN_BR_PAIRING,                   /* BR connection in pairing context */
 	BT_CONN_BR_NOBOND,                    /* SSP no bond pairing tracker */
-	BT_CONN_BR_GENERAL_BONDING,           /* BR general bonding */
 	BT_CONN_BR_PAIRING_INITIATOR,         /* local host starts authentication */
 	BT_CONN_CLEANUP,                      /* Disconnected, pending cleanup */
 	BT_CONN_AUTO_INIT_PROCEDURES_DONE,    /* Auto-initiated procedures have run */

From 8b7018c9c83f13e166c198d68b6dbc3e5136323b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:37 +0100
Subject: [PATCH 1565/2913] Revert "[nrf fromtree] Bluetooth: Host: BT scan
 failure when connecting by name in shell"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 456faff53e2675ed3db17a1abb0cdb9a3bce512c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/shell/bt.c | 50 +++++++++----------------------------
 1 file changed, 12 insertions(+), 38 deletions(-)

diff --git a/subsys/bluetooth/shell/bt.c b/subsys/bluetooth/shell/bt.c
index 7b904f6262f..b08f67835e1 100644
--- a/subsys/bluetooth/shell/bt.c
+++ b/subsys/bluetooth/shell/bt.c
@@ -76,8 +76,6 @@ static struct bt_conn_auth_info_cb auth_info_cb;
  */
 #define HCI_CMD_MAX_PARAM 65
 
-#define DEFAULT_SCAN_TIMEOUT_SEC 10
-
 #if defined(CONFIG_BT_BROADCASTER)
 enum {
 	SHELL_ADV_OPT_CONNECTABLE,
@@ -220,31 +218,9 @@ static struct bt_auto_connect {
 	bool addr_set;
 	bool connect_name;
 } auto_connect;
-#endif /* CONFIG_BT_CENTRAL */
+#endif
 
 #if defined(CONFIG_BT_OBSERVER)
-static void active_scan_timeout(struct k_work *work)
-{
-	int err;
-
-	shell_print(ctx_shell, "Scan timeout");
-
-	err = bt_le_scan_stop();
-	if (err) {
-		shell_error(ctx_shell, "Failed to stop scan (err %d)", err);
-	}
-
-#if defined(CONFIG_BT_CENTRAL)
-	if (auto_connect.connect_name) {
-		auto_connect.connect_name = false;
-		/* "name" is what would be in argv[0] normally */
-		cmd_scan_filter_clear_name(ctx_shell, 1, (char *[]){ "name" });
-	}
-#endif /* CONFIG_BT_CENTRAL */
-}
-
-static K_WORK_DELAYABLE_DEFINE(active_scan_timeout_work, active_scan_timeout);
-
 static struct bt_scan_filter {
 	char name[NAME_LEN];
 	bool name_set;
@@ -615,6 +591,14 @@ static void scan_recv(const struct bt_le_scan_recv_info *info, struct net_buf_si
 static void scan_timeout(void)
 {
 	shell_print(ctx_shell, "Scan timeout");
+
+#if defined(CONFIG_BT_CENTRAL)
+	if (auto_connect.connect_name) {
+		auto_connect.connect_name = false;
+		/* "name" is what would be in argv[0] normally */
+		cmd_scan_filter_clear_name(ctx_shell, 1, (char *[]){ "name" });
+	}
+#endif /* CONFIG_BT_CENTRAL */
 }
 #endif /* CONFIG_BT_OBSERVER */
 
@@ -1618,7 +1602,7 @@ static int cmd_active_scan_on(const struct shell *sh, uint32_t options,
 			.options    = BT_LE_SCAN_OPT_NONE,
 			.interval   = BT_GAP_SCAN_FAST_INTERVAL,
 			.window     = BT_GAP_SCAN_FAST_WINDOW,
-			.timeout    = 0, };
+			.timeout    = timeout, };
 
 	param.options |= options;
 
@@ -1631,11 +1615,6 @@ static int cmd_active_scan_on(const struct shell *sh, uint32_t options,
 		shell_print(sh, "Bluetooth active scan enabled");
 	}
 
-	if (timeout != 0) {
-		/* Schedule the k_work to act as a timeout */
-		(void)k_work_reschedule(&active_scan_timeout_work, K_SECONDS(timeout));
-	}
-
 	return 0;
 }
 
@@ -1668,9 +1647,6 @@ static int cmd_scan_off(const struct shell *sh)
 {
 	int err;
 
-	/* Cancel the potentially pending scan timeout work */
-	(void)k_work_cancel_delayable(&active_scan_timeout_work);
-
 	err = bt_le_scan_stop();
 	if (err) {
 		shell_error(sh, "Stopping scanning failed (err %d)", err);
@@ -3351,12 +3327,13 @@ static int cmd_auto_conn(const struct shell *sh, size_t argc, char *argv[])
 
 static int cmd_connect_le_name(const struct shell *sh, size_t argc, char *argv[])
 {
+	const uint16_t timeout_seconds = 10;
 	const struct bt_le_scan_param param = {
 		.type       = BT_LE_SCAN_TYPE_ACTIVE,
 		.options    = BT_LE_SCAN_OPT_NONE,
 		.interval   = BT_GAP_SCAN_FAST_INTERVAL,
 		.window     = BT_GAP_SCAN_FAST_WINDOW,
-		.timeout    = 0,
+		.timeout    = timeout_seconds * 100, /* 10ms units */
 	};
 	int err;
 
@@ -3382,9 +3359,6 @@ static int cmd_connect_le_name(const struct shell *sh, size_t argc, char *argv[]
 	/* Set boolean to tell the scan callback to connect to this name */
 	auto_connect.connect_name = true;
 
-	/* Schedule the k_work to act as a timeout */
-	(void)k_work_reschedule(&active_scan_timeout_work, K_SECONDS(DEFAULT_SCAN_TIMEOUT_SEC));
-
 	return 0;
 }
 #endif /* CONFIG_BT_CENTRAL */

From d817b036aba3efa805665de88fb8dfaf35dbf5a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:37 +0100
Subject: [PATCH 1566/2913] Revert "[nrf fromtree] bluetooth: host: fix
 formatter warnings"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit dce4981851d3c18cefdbff157971ce11d2e05d6b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/host/adv.c   | 2 +-
 subsys/bluetooth/host/buf.c   | 2 +-
 subsys/bluetooth/host/conn.c  | 4 ++--
 subsys/bluetooth/host/l2cap.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/subsys/bluetooth/host/adv.c b/subsys/bluetooth/host/adv.c
index 2191effefba..8420daea603 100644
--- a/subsys/bluetooth/host/adv.c
+++ b/subsys/bluetooth/host/adv.c
@@ -662,7 +662,7 @@ static int hci_set_ad_ext(struct bt_le_ext_adv *adv, uint16_t hci_op,
 	}
 
 	if (total_len_bytes > bt_dev.le.max_adv_data_len) {
-		LOG_WRN("adv or scan rsp data too large (%zu > max %u)", total_len_bytes,
+		LOG_WRN("adv or scan rsp data too large (%d > max %d)", total_len_bytes,
 			bt_dev.le.max_adv_data_len);
 		return -EDOM;
 	}
diff --git a/subsys/bluetooth/host/buf.c b/subsys/bluetooth/host/buf.c
index 2ce2477ff05..2e639488481 100644
--- a/subsys/bluetooth/host/buf.c
+++ b/subsys/bluetooth/host/buf.c
@@ -158,7 +158,7 @@ struct net_buf *bt_buf_make_view(struct net_buf *view,
 
 	__ASSERT_NO_MSG(!bt_buf_has_view(parent));
 
-	LOG_DBG("make-view %p viewsize %zu meta %p", view, len, meta);
+	LOG_DBG("make-view %p viewsize %u meta %p", view, len, meta);
 
 	net_buf_simple_clone(&parent->b, &view->b);
 	view->size = net_buf_headroom(parent) + len;
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 8a2a05d8d72..40f7d7906cc 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -160,7 +160,7 @@ static struct net_buf *get_data_frag(struct net_buf *outside, size_t winsize)
 	window = bt_buf_make_view(window, outside,
 				  winsize, &get_frag_md(window)->view_meta);
 
-	LOG_DBG("get-acl-frag: outside %p window %p size %zu", outside, window, winsize);
+	LOG_DBG("get-acl-frag: outside %p window %p size %d", outside, window, winsize);
 
 	return window;
 }
@@ -665,7 +665,7 @@ static int send_buf(struct bt_conn *conn, struct net_buf *buf,
 		return -EIO;
 	}
 
-	LOG_DBG("conn %p buf %p len %zu buf->len %u cb %p ud %p",
+	LOG_DBG("conn %p buf %p len %u buf->len %u cb %p ud %p",
 		conn, buf, len, buf->len, cb, ud);
 
 	/* Acquire the right to send 1 packet to the controller */
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index b6ca2f3ea00..1b25f838fa3 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -933,7 +933,7 @@ struct net_buf *l2cap_data_pull(struct bt_conn *conn,
 		struct bt_l2cap_hdr *hdr;
 		uint16_t pdu_len = get_pdu_len(lechan, pdu);
 
-		LOG_DBG("Adding L2CAP PDU header: buf %p chan %p len %u / %u",
+		LOG_DBG("Adding L2CAP PDU header: buf %p chan %p len %zu / %zu",
 			pdu, lechan, pdu_len, pdu->len);
 
 		LOG_HEXDUMP_DBG(pdu->data, pdu->len, "PDU payload");

From 1b2314ad0f9a6525ac0dd7fe09969e07cb9883d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:37 +0100
Subject: [PATCH 1567/2913] Revert "[nrf fromtree] Bluetooth: Host: Set scan
 option type to uint8_t"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 886c21075774647816bf2a311a95799d8d45c4cf.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/bluetooth.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/zephyr/bluetooth/bluetooth.h b/include/zephyr/bluetooth/bluetooth.h
index bc5b7b0731c..6f565bd400f 100644
--- a/include/zephyr/bluetooth/bluetooth.h
+++ b/include/zephyr/bluetooth/bluetooth.h
@@ -2065,7 +2065,7 @@ struct bt_le_scan_param {
 	uint8_t  type;
 
 	/** Bit-field of scanning options. */
-	uint8_t options;
+	uint32_t options;
 
 	/** Scan interval (N * 0.625 ms).
 	 *

From ee1e5f7b485e4b69bc3580a90b0e319792f3e04d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:37 +0100
Subject: [PATCH 1568/2913] Revert "[nrf fromtree]
 tests/bsim/bluetooth/host/adv/encrypted: Enable RealEncryption"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d8b297896726361cdd7a36146557175e6c0aca79.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../host/adv/encrypted/ead_sample/test_scripts/ead_sample.sh  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/bsim/bluetooth/host/adv/encrypted/ead_sample/test_scripts/ead_sample.sh b/tests/bsim/bluetooth/host/adv/encrypted/ead_sample/test_scripts/ead_sample.sh
index adbe2b19b78..ae3b7d53f00 100755
--- a/tests/bsim/bluetooth/host/adv/encrypted/ead_sample/test_scripts/ead_sample.sh
+++ b/tests/bsim/bluetooth/host/adv/encrypted/ead_sample/test_scripts/ead_sample.sh
@@ -10,10 +10,10 @@ verbosity_level=2
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_encrypted_ead_sample_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_encrypted_ead_sample_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=60e6 $@

From b0cba6c240b69e79886890a459af7f6b0546e8b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:37 +0100
Subject: [PATCH 1569/2913] Revert "[nrf fromtree]
 tests/bsim/bluetooth/host/security: Enable RealEncryption"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 86ab7ad2305bfa5c0ed5df8bd8718fb1d9734cbf.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../security/ccc_update/test_scripts/ccc_update.sh   | 12 ++++++------
 .../security/ccc_update/test_scripts/ccc_update_2.sh | 12 ++++++------
 .../test_scripts/security_changed_callback.sh        | 10 ++++------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update.sh b/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update.sh
index bb4aab2b0dc..d577ad974ef 100755
--- a/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update.sh
+++ b/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update.sh
@@ -14,19 +14,19 @@ cd ${BSIM_OUT_PATH}/bin
 if [ "${1}" != 'debug0' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
-    -flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1
+    -flash="${simulation_id}_client.log.bin" -flash_rm
 fi
 
 if [ "${1}" != 'debug1' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=bad_central \
-    -flash="${simulation_id}_bad_client.log.bin" -flash_rm -RealEncryption=1
+    -flash="${simulation_id}_bad_client.log.bin" -flash_rm
 fi
 
 if [ "${1}" != 'debug2' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=2 -testid=peripheral \
-    -flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1
+    -flash="${simulation_id}_server.log.bin" -flash_rm
 fi
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
@@ -35,19 +35,19 @@ Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
 if [ "${1}" == 'debug0' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
-    -flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1
+    -flash="${simulation_id}_client.log.bin" -flash_rm
 fi
 
 if [ "${1}" == 'debug1' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=bad_central \
-    -flash="${simulation_id}_bad_client.log.bin" -flash_rm -RealEncryption=1
+    -flash="${simulation_id}_bad_client.log.bin" -flash_rm
 fi
 
 if [ "${1}" == 'debug2' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=2 -testid=peripheral \
-    -flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1
+    -flash="${simulation_id}_server.log.bin" -flash_rm
 fi
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update_2.sh b/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update_2.sh
index eb165fa85f0..49a27c4524e 100755
--- a/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update_2.sh
+++ b/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update_2.sh
@@ -14,19 +14,19 @@ cd ${BSIM_OUT_PATH}/bin
 if [ "${1}" != 'debug0' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
-    -flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1
+    -flash="${simulation_id}_client.log.bin" -flash_rm
 fi
 
 if [ "${1}" != 'debug1' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=bad_central \
-    -flash="${simulation_id}_bad_client.log.bin" -flash_rm -RealEncryption=1
+    -flash="${simulation_id}_bad_client.log.bin" -flash_rm
 fi
 
 if [ "${1}" != 'debug2' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=2 -testid=peripheral \
-    -flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1
+    -flash="${simulation_id}_server.log.bin" -flash_rm
 fi
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
@@ -35,19 +35,19 @@ Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
 if [ "${1}" == 'debug0' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
-    -flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1
+    -flash="${simulation_id}_client.log.bin" -flash_rm
 fi
 
 if [ "${1}" == 'debug1' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=bad_central \
-    -flash="${simulation_id}_bad_client.log.bin" -flash_rm -RealEncryption=1
+    -flash="${simulation_id}_bad_client.log.bin" -flash_rm
 fi
 
 if [ "${1}" == 'debug2' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=2 -testid=peripheral \
-    -flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1
+    -flash="${simulation_id}_server.log.bin" -flash_rm
 fi
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/security/security_changed_callback/test_scripts/security_changed_callback.sh b/tests/bsim/bluetooth/host/security/security_changed_callback/test_scripts/security_changed_callback.sh
index 287eeeee152..5abb7bef444 100755
--- a/tests/bsim/bluetooth/host/security/security_changed_callback/test_scripts/security_changed_callback.sh
+++ b/tests/bsim/bluetooth/host/security/security_changed_callback/test_scripts/security_changed_callback.sh
@@ -12,11 +12,10 @@ verbosity_level=2
 cd ${BSIM_OUT_PATH}/bin
 
 Execute "./${test_exe}" \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central
 
 Execute "./${test_exe}" \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_disconnect_in_sec_cb \
-  -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_disconnect_in_sec_cb
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=60e6
@@ -24,11 +23,10 @@ Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
 wait_for_background_jobs
 
 Execute "./${test_exe}" \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central  -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central
 
 Execute "./${test_exe}" \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_unpair_in_sec_cb \
-  -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_unpair_in_sec_cb
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=60e6

From 3ee8fc99be8400b179dbf98359610e58b130464c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:37 +0100
Subject: [PATCH 1570/2913] Revert "[nrf fromtree]
 tests/bsim/bluetooth/host/gatt: Enable RealEncryption"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit db6cea41a2d4bcbb40019c82627be095cece42b6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../bluetooth/host/gatt/caching/test_scripts/_run_test.sh | 4 ++--
 .../host/gatt/ccc_store/test_scripts/ccc_store.sh         | 8 ++++----
 .../host/gatt/ccc_store/test_scripts/ccc_store_2.sh       | 8 ++++----
 .../bsim/bluetooth/host/gatt/general/test_scripts/gatt.sh | 4 ++--
 .../bluetooth/host/gatt/notify/test_scripts/_run_test.sh  | 4 ++--
 .../host/gatt/notify_multiple/test_scripts/notify.sh      | 4 ++--
 .../host/gatt/sc_indicate/test_scripts/sc_indicate.sh     | 4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/tests/bsim/bluetooth/host/gatt/caching/test_scripts/_run_test.sh b/tests/bsim/bluetooth/host/gatt/caching/test_scripts/_run_test.sh
index 5ba9e92e66f..ed7876abe8b 100755
--- a/tests/bsim/bluetooth/host/gatt/caching/test_scripts/_run_test.sh
+++ b/tests/bsim/bluetooth/host/gatt/caching/test_scripts/_run_test.sh
@@ -11,10 +11,10 @@ BIN_SUFFIX=${bin_suffix:-}
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_caching_prj_conf${BIN_SUFFIX} \
-    -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=${client_id} -RealEncryption=1
+    -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=${client_id}
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_caching_prj_conf${BIN_SUFFIX} \
-    -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=${server_id} -RealEncryption=1
+    -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=${server_id}
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
     -D=2 -sim_length=60e6 $@
diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store.sh b/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store.sh
index c1bc4469739..108ce0ba219 100755
--- a/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store.sh
+++ b/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store.sh
@@ -13,13 +13,13 @@ cd ${BSIM_OUT_PATH}/bin
 if [ "${1}" != 'debug0' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
-    -flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1 -argstest 10
+    -flash="${simulation_id}_client.log.bin" -flash_rm -argstest 10
 fi
 
 if [ "${1}" != 'debug1' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral \
-    -flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1 -argstest 10
+    -flash="${simulation_id}_server.log.bin" -flash_rm -argstest 10
 fi
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
@@ -28,13 +28,13 @@ Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
 if [ "${1}" == 'debug0' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
-    -flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1 -argstest 10
+    -flash="${simulation_id}_client.log.bin" -flash_rm -argstest 10
 fi
 
 if [ "${1}" == 'debug1' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral \
-    -flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1 -argstest 10
+    -flash="${simulation_id}_server.log.bin" -flash_rm -argstest 10
 fi
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store_2.sh b/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store_2.sh
index 5eb1219913d..5907d7f1f66 100755
--- a/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store_2.sh
+++ b/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store_2.sh
@@ -13,13 +13,13 @@ cd ${BSIM_OUT_PATH}/bin
 if [ "${1}" != 'debug0' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
-    -flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1 -argstest 10
+    -flash="${simulation_id}_client.log.bin" -flash_rm -argstest 10
 fi
 
 if [ "${1}" != 'debug1' ]; then
   Execute "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral \
-    -flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1 -argstest 10
+    -flash="${simulation_id}_server.log.bin" -flash_rm -argstest 10
 fi
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
@@ -28,13 +28,13 @@ Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
 if [ "${1}" == 'debug0' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
-    -flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1 -argstest 10
+    -flash="${simulation_id}_client.log.bin" -flash_rm -argstest 10
 fi
 
 if [ "${1}" == 'debug1' ]; then
   gdb --args "./${test_exe}" \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral \
-    -flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1 -argstest 10
+    -flash="${simulation_id}_server.log.bin" -flash_rm -argstest 10
 fi
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/gatt/general/test_scripts/gatt.sh b/tests/bsim/bluetooth/host/gatt/general/test_scripts/gatt.sh
index df41707e832..4cae0b21812 100755
--- a/tests/bsim/bluetooth/host/gatt/general/test_scripts/gatt.sh
+++ b/tests/bsim/bluetooth/host/gatt/general/test_scripts/gatt.sh
@@ -15,10 +15,10 @@ EXECUTE_TIMEOUT=120
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_general_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=gatt_client -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=gatt_client
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_general_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=gatt_server -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=gatt_server
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=60e6 $@
diff --git a/tests/bsim/bluetooth/host/gatt/notify/test_scripts/_run_test.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/_run_test.sh
index faa4199dd04..0ed274c7b5d 100755
--- a/tests/bsim/bluetooth/host/gatt/notify/test_scripts/_run_test.sh
+++ b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/_run_test.sh
@@ -10,10 +10,10 @@ verbosity_level=2
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_notify_prj_conf \
-    -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=${client_id} -RealEncryption=1
+    -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=${client_id}
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_notify_prj_conf \
-    -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=${server_id} -RealEncryption=1
+    -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=${server_id}
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
     -D=2 -sim_length=60e6 $@
diff --git a/tests/bsim/bluetooth/host/gatt/notify_multiple/test_scripts/notify.sh b/tests/bsim/bluetooth/host/gatt/notify_multiple/test_scripts/notify.sh
index d89a5701fd9..11e85961622 100755
--- a/tests/bsim/bluetooth/host/gatt/notify_multiple/test_scripts/notify.sh
+++ b/tests/bsim/bluetooth/host/gatt/notify_multiple/test_scripts/notify.sh
@@ -12,10 +12,10 @@ EXECUTE_TIMEOUT=120
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_notify_multiple_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=gatt_client -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=gatt_client
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_notify_multiple_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=gatt_server -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=gatt_server
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=60e6 $@
diff --git a/tests/bsim/bluetooth/host/gatt/sc_indicate/test_scripts/sc_indicate.sh b/tests/bsim/bluetooth/host/gatt/sc_indicate/test_scripts/sc_indicate.sh
index 73ec66146ae..4bd2dabdc5a 100755
--- a/tests/bsim/bluetooth/host/gatt/sc_indicate/test_scripts/sc_indicate.sh
+++ b/tests/bsim/bluetooth/host/gatt/sc_indicate/test_scripts/sc_indicate.sh
@@ -12,10 +12,10 @@ verbosity_level=2
 cd ${BSIM_OUT_PATH}/bin
 
 Execute "./${test_exe}" \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central
 
 Execute "./${test_exe}" \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=60e6

From aac85d0b340d9b321fa79cf94ba2f0dcd0478bab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:37 +0100
Subject: [PATCH 1571/2913] Revert "[nrf fromtree]
 tests/bsim/bluetooth/host/att: Enable RealEncryption"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6f01f10490806ea3c3e1c4d6f434106cd454051d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../bsim/bluetooth/host/att/eatt/tests_scripts/autoconnect.sh | 4 ++--
 tests/bsim/bluetooth/host/att/eatt/tests_scripts/collision.sh | 4 ++--
 tests/bsim/bluetooth/host/att/eatt/tests_scripts/lowres.sh    | 4 ++--
 .../bluetooth/host/att/eatt/tests_scripts/multiple_conn.sh    | 4 ++--
 .../bsim/bluetooth/host/att/eatt/tests_scripts/reconfigure.sh | 4 ++--
 .../bluetooth/host/att/eatt_notif/test_scripts/eatt_notif.sh  | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/autoconnect.sh b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/autoconnect.sh
index 057e76f1813..2d22d4b817e 100755
--- a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/autoconnect.sh
+++ b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/autoconnect.sh
@@ -11,10 +11,10 @@ EXECUTE_TIMEOUT=120
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central_autoconnect -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central_autoconnect
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_autoconnect -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_autoconnect
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=200e6 $@
diff --git a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/collision.sh b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/collision.sh
index c89bab27548..d824a4b6895 100755
--- a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/collision.sh
+++ b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/collision.sh
@@ -11,10 +11,10 @@ EXECUTE_TIMEOUT=120
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_collision_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_collision_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=200e6 $@
diff --git a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/lowres.sh b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/lowres.sh
index 0d988761adf..36ff66d8ade 100755
--- a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/lowres.sh
+++ b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/lowres.sh
@@ -10,10 +10,10 @@ verbosity_level=2
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central_lowres -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central_lowres
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_lowres_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_lowres -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_lowres
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=200e6 $@
diff --git a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/multiple_conn.sh b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/multiple_conn.sh
index e3919eb4a26..962c10d5631 100755
--- a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/multiple_conn.sh
+++ b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/multiple_conn.sh
@@ -11,10 +11,10 @@ EXECUTE_TIMEOUT=120
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_multiple_conn_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_multiple_conn_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=200e6 $@
diff --git a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/reconfigure.sh b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/reconfigure.sh
index d2a51f29098..e95468a522f 100755
--- a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/reconfigure.sh
+++ b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/reconfigure.sh
@@ -11,10 +11,10 @@ EXECUTE_TIMEOUT=120
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central_reconfigure -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central_reconfigure
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_reconfigure -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_reconfigure
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=60e6 $@
diff --git a/tests/bsim/bluetooth/host/att/eatt_notif/test_scripts/eatt_notif.sh b/tests/bsim/bluetooth/host/att/eatt_notif/test_scripts/eatt_notif.sh
index 39000efbc74..d2df9216cf7 100755
--- a/tests/bsim/bluetooth/host/att/eatt_notif/test_scripts/eatt_notif.sh
+++ b/tests/bsim/bluetooth/host/att/eatt_notif/test_scripts/eatt_notif.sh
@@ -13,10 +13,10 @@ EXECUTE_TIMEOUT=120
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_notif_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=client -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=client
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_notif_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=server -RealEncryption=1
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=server
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=60e6 $@

From 65ebd5f8e7ba522b25baf59ace3fe46a3fc59449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:37 +0100
Subject: [PATCH 1572/2913] Revert "[nrf fromlist] soc: nordic: nrf54l: fix
 configuration of DCDC regulator"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8735cb14b266a1f257afada5dc0207004adbb865.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54l/soc.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index 840d767f798..f70675517b8 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -153,11 +153,6 @@ static int nordicsemi_nrf54l_init(void)
 	}
 
 #if (DT_PROP(DT_NODELABEL(vregmain), regulator_initial_mode) == NRF5X_REG_MODE_DCDC)
-#if defined(__CORTEX_M) && !defined(NRF_TRUSTZONE_NONSECURE) && defined(__ARM_FEATURE_CMSE)
-	if (*(uint32_t *)0x00FFC334 <= 0x180A1D00) {
-		*(uint32_t *)0x50120640 = 0x1FAAE85C;
-	}
-#endif
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);
 #endif
 

From d8b7108b3e405815c20acc3019e69a31a81e31ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:38 +0100
Subject: [PATCH 1573/2913] Revert "[nrf fromtree] tests: drivers: adc: add
 adc_error_cases tests."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f4c8e3b6b40ea5f5266deb0162fd59401fe0000f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../adc/adc_error_cases/CMakeLists.txt        |   9 -
 .../boards/nrf52840dk_nrf52840.overlay        |  11 -
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  11 -
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |  11 -
 tests/drivers/adc/adc_error_cases/prj.conf    |   3 -
 .../adc/adc_error_cases/src/adc_error_cases.c | 220 ------------------
 .../drivers/adc/adc_error_cases/testcase.yaml |   7 -
 7 files changed, 272 deletions(-)
 delete mode 100644 tests/drivers/adc/adc_error_cases/CMakeLists.txt
 delete mode 100644 tests/drivers/adc/adc_error_cases/boards/nrf52840dk_nrf52840.overlay
 delete mode 100644 tests/drivers/adc/adc_error_cases/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 delete mode 100644 tests/drivers/adc/adc_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 delete mode 100644 tests/drivers/adc/adc_error_cases/prj.conf
 delete mode 100644 tests/drivers/adc/adc_error_cases/src/adc_error_cases.c
 delete mode 100644 tests/drivers/adc/adc_error_cases/testcase.yaml

diff --git a/tests/drivers/adc/adc_error_cases/CMakeLists.txt b/tests/drivers/adc/adc_error_cases/CMakeLists.txt
deleted file mode 100644
index 7b240573c84..00000000000
--- a/tests/drivers/adc/adc_error_cases/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(adc_error_cases)
-
-FILE(GLOB app_sources src/*.c)
-target_sources(app PRIVATE ${app_sources})
diff --git a/tests/drivers/adc/adc_error_cases/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/adc/adc_error_cases/boards/nrf52840dk_nrf52840.overlay
deleted file mode 100644
index 18e74f72ee2..00000000000
--- a/tests/drivers/adc/adc_error_cases/boards/nrf52840dk_nrf52840.overlay
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (c) 2024 Nordic Semiconductor ASA
- */
-
-/ {
-	aliases {
-		adc = &adc;
-	};
-};
diff --git a/tests/drivers/adc/adc_error_cases/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/adc/adc_error_cases/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index 18e74f72ee2..00000000000
--- a/tests/drivers/adc/adc_error_cases/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (c) 2024 Nordic Semiconductor ASA
- */
-
-/ {
-	aliases {
-		adc = &adc;
-	};
-};
diff --git a/tests/drivers/adc/adc_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/adc/adc_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 18e74f72ee2..00000000000
--- a/tests/drivers/adc/adc_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (c) 2024 Nordic Semiconductor ASA
- */
-
-/ {
-	aliases {
-		adc = &adc;
-	};
-};
diff --git a/tests/drivers/adc/adc_error_cases/prj.conf b/tests/drivers/adc/adc_error_cases/prj.conf
deleted file mode 100644
index 40f19db980d..00000000000
--- a/tests/drivers/adc/adc_error_cases/prj.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_ZTEST=y
-
-CONFIG_ADC=y
diff --git a/tests/drivers/adc/adc_error_cases/src/adc_error_cases.c b/tests/drivers/adc/adc_error_cases/src/adc_error_cases.c
deleted file mode 100644
index 0cfdf890d7b..00000000000
--- a/tests/drivers/adc/adc_error_cases/src/adc_error_cases.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/device.h>
-#include <zephyr/ztest.h>
-#include <zephyr/drivers/adc.h>
-
-static const struct device *dev_adc = DEVICE_DT_GET(DT_ALIAS(adc));
-#define BUFFER_LEN 8
-static uint16_t m_sample_buffer[BUFFER_LEN];
-
-static const struct adc_channel_cfg valid_channel_cfg = {
-	.gain = ADC_GAIN_1,
-	.channel_id = 0,
-	.reference = ADC_REF_INTERNAL,
-	.acquisition_time = ADC_ACQ_TIME_DEFAULT,
-	.differential = false,
-	#ifdef CONFIG_ADC_CONFIGURABLE_INPUTS
-	.input_positive = 1,
-	#endif
-};
-
-static const struct adc_sequence valid_seq = {
-	.buffer = m_sample_buffer,
-	.buffer_size = BUFFER_LEN * sizeof(m_sample_buffer),
-	.options = NULL,
-	.resolution = 10,
-	.oversampling = 0,
-	.channels = 1,
-};
-
-/**
- * @brief test adc_read() with invalid oversampling value
- *
- * function should return -EINVAL
- */
-
-ZTEST(adc_error_cases, test_adc_read_invalid_oversampling)
-{
-	int ret;
-
-	adc_channel_setup(dev_adc, &valid_channel_cfg);
-
-	struct adc_sequence invalid_seq = valid_seq;
-	/* Set oversampling to invalid value */
-	invalid_seq.oversampling = 99;
-
-	ret = adc_read(dev_adc, &invalid_seq);
-
-	zassert_true(
-		ret == -EINVAL,
-		"adc_read() should return -EINVAL,"
-		" got unexpected value of %d",
-		ret
-	);
-}
-
-/**
- * @brief test adc_read() with invalid resolution value
- *
- * function should return -EINVAL
- */
-
-ZTEST(adc_error_cases, test_adc_read_invalid_resolution)
-{
-	int ret;
-
-	adc_channel_setup(dev_adc, &valid_channel_cfg);
-
-	struct adc_sequence invalid_seq = valid_seq;
-	/* Set resolution to invalid value */
-	invalid_seq.resolution = 99;
-
-	ret = adc_read(dev_adc, &invalid_seq);
-
-	zassert_true(
-		ret == -EINVAL,
-		"adc_read() should return -EINVAL,"
-		" got unexpected value of %d",
-		ret
-	);
-}
-
-/**
- * @brief test adc_read() with invalid channels value
- *
- * function should return -EINVAL
- */
-
-ZTEST(adc_error_cases, test_adc_read_invalid_channels)
-{
-	int ret;
-
-	adc_channel_setup(dev_adc, &valid_channel_cfg);
-
-	struct adc_sequence invalid_seq = valid_seq;
-	/* Set channels configuration to invalid value */
-	invalid_seq.channels = 0;
-
-	ret = adc_read(dev_adc, &invalid_seq);
-
-	zassert_true(
-		ret == -EINVAL,
-		"adc_read() should return -EINVAL,"
-		" got unexpected value of %d",
-		ret
-	);
-}
-
-/**
- * @brief test adc_read() with not configured channel
- *
- * function should return -EINVAL
- */
-
-ZTEST(adc_error_cases, test_adc_read_not_configured_channel)
-{
-	int ret;
-
-	adc_channel_setup(dev_adc, &valid_channel_cfg);
-
-	struct adc_sequence invalid_seq = valid_seq;
-	/* Set channels configuration to use not configured channel */
-	invalid_seq.channels = BIT(1);
-
-	ret = adc_read(dev_adc, &invalid_seq);
-
-	zassert_true(
-		ret == -EINVAL,
-		"adc_read() should return -EINVAL,"
-		" got unexpected value of %d",
-		ret
-	);
-}
-
-/**
- * @brief test adc_read() with invalid buffer length
- *
- * function should return -ENOMEM
- */
-
-ZTEST(adc_error_cases, test_adc_read_invalid_buffer)
-{
-	int ret;
-
-	adc_channel_setup(dev_adc, &valid_channel_cfg);
-
-	struct adc_sequence invalid_seq = valid_seq;
-	/* set buffer size to 0 bytes */
-	invalid_seq.buffer_size = 0;
-
-	ret = adc_read(dev_adc, &invalid_seq);
-
-	zassert_true(
-		ret == -ENOMEM,
-		"adc_read() should return -ENOMEM,"
-		" got unexpected value of %d",
-		ret
-	);
-}
-
-/**
- * @brief test adc_channel_setup() with invalid reference value
- *
- * function should return -EINVAL
- */
-
-ZTEST(adc_error_cases, test_adc_setup_invalid_reference)
-{
-	int ret;
-
-	struct adc_channel_cfg invalid_channel_cfg = valid_channel_cfg;
-	/* set invalid reference */
-	invalid_channel_cfg.reference = 99;
-
-	ret = adc_channel_setup(dev_adc, &invalid_channel_cfg);
-
-	zassert_true(
-		ret == -EINVAL,
-		"adc_channel_setup() should return -EINVAL,"
-		" got unexpected value of %d",
-		ret
-	);
-}
-
-/**
- * @brief test adc_read() with invalid gain value
- *
- * function should return -EINVAL
- */
-
-ZTEST(adc_error_cases, test_adc_setup_invalid_gain)
-{
-	int ret;
-
-	struct adc_channel_cfg invalid_channel_cfg = valid_channel_cfg;
-	/* set invalid gain value */
-	invalid_channel_cfg.gain = 99;
-	ret = adc_channel_setup(dev_adc, &invalid_channel_cfg);
-	zassert_true(
-		ret == -EINVAL,
-		"adc_channel_setup() should return -EINVAL,"
-		" got unexpected value of %d",
-		ret
-	);
-}
-
-static void *suite_setup(void)
-{
-	TC_PRINT("Test executed on %s\n", CONFIG_BOARD_TARGET);
-	TC_PRINT("===================================================================\n");
-
-	return NULL;
-}
-
-ZTEST_SUITE(adc_error_cases, NULL, suite_setup, NULL, NULL, NULL);
diff --git a/tests/drivers/adc/adc_error_cases/testcase.yaml b/tests/drivers/adc/adc_error_cases/testcase.yaml
deleted file mode 100644
index 039be590b38..00000000000
--- a/tests/drivers/adc/adc_error_cases/testcase.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tests:
-  drivers.adc_error_cases:
-    depends_on: adc
-    platform_allow:
-      - nrf52840dk/nrf52840
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54h20dk/nrf54h20/cpuapp

From 059696c0560397bff53c7abd2eba03eaae331f93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:38 +0100
Subject: [PATCH 1574/2913] Revert "[nrf fromlist] bluetooth: audio: bap: fix
 Doxygen issue"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3eaf51080bf36393d40a579141973fa9b4fa73c2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/audio/bap.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/zephyr/bluetooth/audio/bap.h b/include/zephyr/bluetooth/audio/bap.h
index 9f13cd2fdee..83159bed43f 100644
--- a/include/zephyr/bluetooth/audio/bap.h
+++ b/include/zephyr/bluetooth/audio/bap.h
@@ -640,13 +640,13 @@ struct bt_bap_unicast_server_register_param {
 	/**
 	 * @brief Sink Count to register.
 	 *
-	 * Should be in range 0 to @kconfig{CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT}
+	 * Should be in range [0, @kconfig{CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT}]
 	 */
 	uint8_t snk_cnt;
 
 	/** @brief Source Count to register.
 	 *
-	 * Should be in range 0 to @kconfig{CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT}
+	 * Should be in range [0, @kconfig{CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT}]
 	 */
 	uint8_t src_cnt;
 };

From af031129993c10ae23033bffd2279bf1b408c770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:38 +0100
Subject: [PATCH 1575/2913] Revert "[nrf fromlist] doc: doxygen: remove rst
 utilities"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 44d4a7013a329aaf1595839d9fb158ab7da4929f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/zephyr.doxyfile.in             |  18 +-
 include/zephyr/net/socket.h        | 284 +++++++++++++++++------------
 include/zephyr/net/socket_select.h |  52 +++---
 3 files changed, 211 insertions(+), 143 deletions(-)

diff --git a/doc/zephyr.doxyfile.in b/doc/zephyr.doxyfile.in
index 9245f598925..05b541c517d 100644
--- a/doc/zephyr.doxyfile.in
+++ b/doc/zephyr.doxyfile.in
@@ -279,7 +279,9 @@ TAB_SIZE               = 8
 # with the commands \{ and \} for these it is advised to use the version @{ and
 # @} or use a double escape (\\{ and \\})
 
-ALIASES                = "kconfig{1}=\verbatim \1 \endverbatim" \
+ALIASES                = "rst=\verbatim embed:rst:leading-asterisk" \
+                         endrst=\endverbatim \
+                         "kconfig{1}=\htmlonly <code>\1</code> \endhtmlonly \xmlonly <verbatim>embed:rst:inline :kconfig:option:`\1`</verbatim> \endxmlonly" \
                          "req{1}=\ref ZEPH_\1 \"ZEPH-\1\"" \
                          "satisfy{1}=\xrefitem satisfy \"Satisfies requirement\" \"Requirement Implementation\" \1" \
                          "verify{1}=\xrefitem verify \"Verifies requirement\" \"Requirement Verification\" \1" \
@@ -287,14 +289,14 @@ ALIASES                = "kconfig{1}=\verbatim \1 \endverbatim" \
                          "kconfig_dep{2}=\attention Available only when the following Kconfig options are enabled: \kconfig{\1}, \kconfig{\2}." \
                          "kconfig_dep{3}=\attention Available only when the following Kconfig options are enabled: \kconfig{\1}, \kconfig{\2}, \kconfig{\3}." \
                          "funcprops=\par \"Function properties (list may not be complete)\"" \
-                         "reschedule=\qualifier reschedule" \
-                         "sleep=\qualifier sleep" \
-                         "no_wait=\qualifier no-wait" \
-                         "isr_ok=\qualifier isr-ok" \
-                         "pre_kernel_ok=\qualifier pre-kernel-ok" \
-                         "async=\qualifier async" \
+                         "reschedule=\htmlonly reschedule \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_reschedule`</verbatim> \endxmlonly" \
+                         "sleep=\htmlonly sleep \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_sleep`</verbatim> \endxmlonly" \
+                         "no_wait=\htmlonly no-wait \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_no-wait`</verbatim> \endxmlonly" \
+                         "isr_ok=\htmlonly isr-ok \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_isr-ok`</verbatim> \endxmlonly" \
+                         "pre_kernel_ok=\htmlonly pre-kernel-ok \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_pre-kernel-ok`</verbatim> \endxmlonly" \
+                         "async=\htmlonly async \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_async`</verbatim> \endxmlonly" \
                          "atomic_api=As for all atomic APIs, includes a full/sequentially-consistent memory barrier (where applicable)." \
-                         "supervisor=\qualifier supervisor"
+                         "supervisor=\htmlonly supervisor \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_supervisor`</verbatim> \endxmlonly"
 
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
diff --git a/include/zephyr/net/socket.h b/include/zephyr/net/socket.h
index 05351c8cef0..34211d83759 100644
--- a/include/zephyr/net/socket.h
+++ b/include/zephyr/net/socket.h
@@ -333,11 +333,13 @@ __syscall void *zsock_get_context_object(int sock);
  * @brief Create a network socket
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/socket.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/socket.html>`__
  * for normative description.
- * This function is also exposed as `socket()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``socket()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  *
  * If CONFIG_USERSPACE is enabled, the caller will be granted access to the
  * context object associated with the returned file descriptor.
@@ -350,11 +352,13 @@ __syscall int zsock_socket(int family, int type, int proto);
  * @brief Create an unnamed pair of connected sockets
  *
  * @details
- * See POSIX.1-2017 article
- * https://pubs.opengroup.org/onlinepubs/009695399/functions/socketpair.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <https://pubs.opengroup.org/onlinepubs/009695399/functions/socketpair.html>`__
  * for normative description.
- * This function is also exposed as `socketpair()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``socketpair()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 __syscall int zsock_socketpair(int family, int type, int proto, int *sv);
 
@@ -362,10 +366,12 @@ __syscall int zsock_socketpair(int family, int type, int proto, int *sv);
  * @brief Close a network socket
  *
  * @details
+ * @rst
  * Close a network socket.
- * This function is also exposed as `close()`
- * if @kconfig{CONFIG_POSIX_API} is defined (in which case it
- * may conflict with generic POSIX `close()` function).
+ * This function is also exposed as ``close()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined (in which case it
+ * may conflict with generic POSIX ``close()`` function).
+ * @endrst
  */
 __syscall int zsock_close(int sock);
 
@@ -373,12 +379,14 @@ __syscall int zsock_close(int sock);
  * @brief Shutdown socket send/receive operations
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/shutdown.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/shutdown.html>`__
  * for normative description, but currently this function has no effect in
  * Zephyr and provided solely for compatibility with existing code.
- * This function is also exposed as `shutdown()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``shutdown()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 __syscall int zsock_shutdown(int sock, int how);
 
@@ -386,11 +394,13 @@ __syscall int zsock_shutdown(int sock, int how);
  * @brief Bind a socket to a local network address
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html>`__
  * for normative description.
- * This function is also exposed as `bind()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``bind()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 __syscall int zsock_bind(int sock, const struct sockaddr *addr,
 			 socklen_t addrlen);
@@ -399,11 +409,13 @@ __syscall int zsock_bind(int sock, const struct sockaddr *addr,
  * @brief Connect a socket to a peer network address
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/connect.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/connect.html>`__
  * for normative description.
- * This function is also exposed as `connect()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``connect()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 __syscall int zsock_connect(int sock, const struct sockaddr *addr,
 			    socklen_t addrlen);
@@ -412,11 +424,13 @@ __syscall int zsock_connect(int sock, const struct sockaddr *addr,
  * @brief Set up a STREAM socket to accept peer connections
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/listen.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/listen.html>`__
  * for normative description.
- * This function is also exposed as `listen()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``listen()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 __syscall int zsock_listen(int sock, int backlog);
 
@@ -424,11 +438,13 @@ __syscall int zsock_listen(int sock, int backlog);
  * @brief Accept a connection on listening socket
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/accept.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/accept.html>`__
  * for normative description.
- * This function is also exposed as `accept()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``accept()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 __syscall int zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen);
 
@@ -436,11 +452,13 @@ __syscall int zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen);
  * @brief Send data to an arbitrary network address
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/sendto.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/sendto.html>`__
  * for normative description.
- * This function is also exposed as `sendto()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``sendto()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 __syscall ssize_t zsock_sendto(int sock, const void *buf, size_t len,
 			       int flags, const struct sockaddr *dest_addr,
@@ -450,11 +468,13 @@ __syscall ssize_t zsock_sendto(int sock, const void *buf, size_t len,
  * @brief Send data to a connected peer
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/send.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/send.html>`__
  * for normative description.
- * This function is also exposed as `send()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``send()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 static inline ssize_t zsock_send(int sock, const void *buf, size_t len,
 				 int flags)
@@ -466,11 +486,13 @@ static inline ssize_t zsock_send(int sock, const void *buf, size_t len,
  * @brief Send data to an arbitrary network address
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/sendmsg.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/sendmsg.html>`__
  * for normative description.
- * This function is also exposed as `sendmsg()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``sendmsg()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 __syscall ssize_t zsock_sendmsg(int sock, const struct msghdr *msg,
 				int flags);
@@ -479,11 +501,13 @@ __syscall ssize_t zsock_sendmsg(int sock, const struct msghdr *msg,
  * @brief Receive data from an arbitrary network address
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/recvfrom.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/recvfrom.html>`__
  * for normative description.
- * This function is also exposed as `recvfrom()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``recvfrom()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 __syscall ssize_t zsock_recvfrom(int sock, void *buf, size_t max_len,
 				 int flags, struct sockaddr *src_addr,
@@ -493,11 +517,13 @@ __syscall ssize_t zsock_recvfrom(int sock, void *buf, size_t max_len,
  * @brief Receive a message from an arbitrary network address
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/recvmsg.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/recvmsg.html>`__
  * for normative description.
- * This function is also exposed as `recvmsg()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``recvmsg()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 __syscall ssize_t zsock_recvmsg(int sock, struct msghdr *msg, int flags);
 
@@ -505,11 +531,13 @@ __syscall ssize_t zsock_recvmsg(int sock, struct msghdr *msg, int flags);
  * @brief Receive data from a connected peer
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/recv.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/recv.html>`__
  * for normative description.
- * This function is also exposed as `recv()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``recv()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 static inline ssize_t zsock_recv(int sock, void *buf, size_t max_len,
 				 int flags)
@@ -521,11 +549,13 @@ static inline ssize_t zsock_recv(int sock, void *buf, size_t max_len,
  * @brief Control blocking/non-blocking mode of a socket
  *
  * @details
+ * @rst
  * This functions allow to (only) configure a socket for blocking or
  * non-blocking operation (O_NONBLOCK).
- * This function is also exposed as `fcntl()`
- * if @kconfig{CONFIG_POSIX_API} is defined (in which case
- * it may conflict with generic POSIX `fcntl()` function).
+ * This function is also exposed as ``fcntl()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined (in which case
+ * it may conflict with generic POSIX ``fcntl()`` function).
+ * @endrst
  */
 __syscall int zsock_fcntl_impl(int sock, int cmd, int flags);
 
@@ -554,16 +584,18 @@ static inline int zsock_fcntl_wrapper(int sock, int cmd, ...)
  * @brief Control underlying socket parameters
  *
  * @details
- * See POSIX.1-2017 article
- * https://pubs.opengroup.org/onlinepubs/9699919799/functions/ioctl.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <https://pubs.opengroup.org/onlinepubs/9699919799/functions/ioctl.html>`__
  * for normative description.
  * This function enables querying or manipulating underlying socket parameters.
- * Currently supported @p request values include `ZFD_IOCTL_FIONBIO`, and
- * `ZFD_IOCTL_FIONREAD`, to set non-blocking mode, and query the number of
+ * Currently supported @p request values include ``ZFD_IOCTL_FIONBIO``, and
+ * ``ZFD_IOCTL_FIONREAD``, to set non-blocking mode, and query the number of
  * bytes available to read, respectively.
- * This function is also exposed as `ioctl()`
- * if @kconfig{CONFIG_POSIX_API} is defined (in which case
- * it may conflict with generic POSIX `ioctl()` function).
+ * This function is also exposed as ``ioctl()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined (in which case
+ * it may conflict with generic POSIX ``ioctl()`` function).
+ * @endrst
  */
 __syscall int zsock_ioctl_impl(int sock, unsigned long request, va_list ap);
 
@@ -589,12 +621,14 @@ static inline int zsock_ioctl_wrapper(int sock, unsigned long request, ...)
  * @brief Efficiently poll multiple sockets for events
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/poll.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/poll.html>`__
  * for normative description.
- * This function is also exposed as `poll()`
- * if @kconfig{CONFIG_POSIX_API} is defined (in which case
- * it may conflict with generic POSIX `poll()` function).
+ * This function is also exposed as ``poll()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined (in which case
+ * it may conflict with generic POSIX ``poll()`` function).
+ * @endrst
  */
 __syscall int zsock_poll(struct zsock_pollfd *fds, int nfds, int timeout);
 
@@ -602,14 +636,16 @@ __syscall int zsock_poll(struct zsock_pollfd *fds, int nfds, int timeout);
  * @brief Get various socket options
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockopt.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockopt.html>`__
  * for normative description. In Zephyr this function supports a subset of
  * socket options described by POSIX, but also some additional options
  * available in Linux (some options are dummy and provided to ease porting
  * of existing code).
- * This function is also exposed as `getsockopt()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``getsockopt()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 __syscall int zsock_getsockopt(int sock, int level, int optname,
 			       void *optval, socklen_t *optlen);
@@ -618,14 +654,16 @@ __syscall int zsock_getsockopt(int sock, int level, int optname,
  * @brief Set various socket options
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/setsockopt.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/setsockopt.html>`__
  * for normative description. In Zephyr this function supports a subset of
  * socket options described by POSIX, but also some additional options
  * available in Linux (some options are dummy and provided to ease porting
  * of existing code).
- * This function is also exposed as `setsockopt()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``setsockopt()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 __syscall int zsock_setsockopt(int sock, int level, int optname,
 			       const void *optval, socklen_t optlen);
@@ -634,11 +672,13 @@ __syscall int zsock_setsockopt(int sock, int level, int optname,
  * @brief Get peer name
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/getpeername.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/getpeername.html>`__
  * for normative description.
- * This function is also exposed as `getpeername()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``getpeername()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 __syscall int zsock_getpeername(int sock, struct sockaddr *addr,
 				socklen_t *addrlen);
@@ -647,11 +687,13 @@ __syscall int zsock_getpeername(int sock, struct sockaddr *addr,
  * @brief Get socket name
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockname.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockname.html>`__
  * for normative description.
- * This function is also exposed as `getsockname()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``getsockname()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 __syscall int zsock_getsockname(int sock, struct sockaddr *addr,
 				socklen_t *addrlen);
@@ -660,11 +702,13 @@ __syscall int zsock_getsockname(int sock, struct sockaddr *addr,
  * @brief Get local host name
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/gethostname.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/gethostname.html>`__
  * for normative description.
- * This function is also exposed as `gethostname()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``gethostname()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 __syscall int zsock_gethostname(char *buf, size_t len);
 
@@ -672,11 +716,13 @@ __syscall int zsock_gethostname(char *buf, size_t len);
  * @brief Convert network address from internal to numeric ASCII form
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/inet_ntop.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/inet_ntop.html>`__
  * for normative description.
- * This function is also exposed as `inet_ntop()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``inet_ntop()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 static inline char *zsock_inet_ntop(sa_family_t family, const void *src,
 				    char *dst, size_t size)
@@ -688,11 +734,13 @@ static inline char *zsock_inet_ntop(sa_family_t family, const void *src,
  * @brief Convert network address from numeric ASCII form to internal representation
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/inet_pton.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/inet_pton.html>`__
  * for normative description.
- * This function is also exposed as `inet_pton()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``inet_pton()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 __syscall int zsock_inet_pton(sa_family_t family, const char *src, void *dst);
 
@@ -731,11 +779,13 @@ __syscall int z_zsock_getaddrinfo_internal(const char *host,
  * @brief Resolve a domain name to one or more network addresses
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/getaddrinfo.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/getaddrinfo.html>`__
  * for normative description.
- * This function is also exposed as `getaddrinfo()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``getaddrinfo()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 int zsock_getaddrinfo(const char *host, const char *service,
 		      const struct zsock_addrinfo *hints,
@@ -745,11 +795,13 @@ int zsock_getaddrinfo(const char *host, const char *service,
  * @brief Free results returned by zsock_getaddrinfo()
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/freeaddrinfo.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/freeaddrinfo.html>`__
  * for normative description.
- * This function is also exposed as `freeaddrinfo()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``freeaddrinfo()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 void zsock_freeaddrinfo(struct zsock_addrinfo *ai);
 
@@ -757,11 +809,13 @@ void zsock_freeaddrinfo(struct zsock_addrinfo *ai);
  * @brief Convert zsock_getaddrinfo() error code to textual message
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/gai_strerror.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/gai_strerror.html>`__
  * for normative description.
- * This function is also exposed as `gai_strerror()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``gai_strerror()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 const char *zsock_gai_strerror(int errcode);
 
@@ -792,11 +846,13 @@ const char *zsock_gai_strerror(int errcode);
  * @brief Resolve a network address to a domain name or ASCII address
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/getnameinfo.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/getnameinfo.html>`__
  * for normative description.
- * This function is also exposed as `getnameinfo()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``getnameinfo()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 int zsock_getnameinfo(const struct sockaddr *addr, socklen_t addrlen,
 		      char *host, socklen_t hostlen,
diff --git a/include/zephyr/net/socket_select.h b/include/zephyr/net/socket_select.h
index b0754d5fc86..5fca2950d6a 100644
--- a/include/zephyr/net/socket_select.h
+++ b/include/zephyr/net/socket_select.h
@@ -35,15 +35,17 @@ typedef struct zsock_fd_set {
  * @brief Legacy function to poll multiple sockets for events
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html>`__
  * for normative description. This function is provided to ease porting of
  * existing code and not recommended for usage due to its inefficiency,
  * use zsock_poll() instead. In Zephyr this function works only with
  * sockets, not arbitrary file descriptors.
- * This function is also exposed as `select()`
- * if @kconfig{CONFIG_POSIX_API} is defined (in which case
- * it may conflict with generic POSIX `select()` function).
+ * This function is also exposed as ``select()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined (in which case
+ * it may conflict with generic POSIX ``select()`` function).
+ * @endrst
  */
 __syscall int zsock_select(int nfds, zsock_fd_set *readfds,
 			   zsock_fd_set *writefds,
@@ -57,11 +59,13 @@ __syscall int zsock_select(int nfds, zsock_fd_set *readfds,
  * @brief Initialize (clear) fd_set
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html>`__
  * for normative description.
- * This function is also exposed as `FD_ZERO()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``FD_ZERO()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 void ZSOCK_FD_ZERO(zsock_fd_set *set);
 
@@ -69,11 +73,13 @@ void ZSOCK_FD_ZERO(zsock_fd_set *set);
  * @brief Check whether socket is a member of fd_set
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html>`__
  * for normative description.
- * This function is also exposed as `FD_ISSET()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``FD_ISSET()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 int ZSOCK_FD_ISSET(int fd, zsock_fd_set *set);
 
@@ -81,11 +87,13 @@ int ZSOCK_FD_ISSET(int fd, zsock_fd_set *set);
  * @brief Remove socket from fd_set
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html>`__
  * for normative description.
- * This function is also exposed as `FD_CLR()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``FD_CLR()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 void ZSOCK_FD_CLR(int fd, zsock_fd_set *set);
 
@@ -93,11 +101,13 @@ void ZSOCK_FD_CLR(int fd, zsock_fd_set *set);
  * @brief Add socket to fd_set
  *
  * @details
- * See POSIX.1-2017 article
- * http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html
+ * @rst
+ * See `POSIX.1-2017 article
+ * <http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html>`__
  * for normative description.
- * This function is also exposed as `FD_SET()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * This function is also exposed as ``FD_SET()``
+ * if :kconfig:option:`CONFIG_POSIX_API` is defined.
+ * @endrst
  */
 void ZSOCK_FD_SET(int fd, zsock_fd_set *set);
 

From dd0e4e22aa518c8e6894c1e026234d865cf91176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:38 +0100
Subject: [PATCH 1576/2913] Revert "[nrf fromlist] samples: sensor: qdec:
 change pins used for qdec nrf54h20dk"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 73f8c9072074ebbcb7111d80d5436954cb4679b4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay  | 14 +++++++++-----
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay  | 18 +++++++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/samples/sensor/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/sensor/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index 654e778af97..c4f6fc7876a 100644
--- a/samples/sensor/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/samples/sensor/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -13,10 +13,10 @@
 	encoder-emulate {
 		compatible = "gpio-leds";
 		phase_a: phase_a {
-			gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio7 2 GPIO_ACTIVE_HIGH>;
 		};
 		phase_b: phase_b {
-			gpios = <&gpio2 11 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
@@ -24,13 +24,17 @@
 &pinctrl {
 	qdec_pinctrl: qdec_pinctrl {
 		group1 {
-			psels = <NRF_PSEL(QDEC_A, 2, 8)>,
-				<NRF_PSEL(QDEC_B, 2, 10)>;
+			psels = <NRF_PSEL(QDEC_A, 1, 0)>,
+				<NRF_PSEL(QDEC_B, 1, 2)>;
 		};
 	};
 };
 
-&gpio2 {
+&gpio1 {
+	status = "okay";
+};
+
+&gpio7 {
 	status = "okay";
 };
 
diff --git a/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index 7e6da5a3458..0e552906a00 100644
--- a/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -13,10 +13,10 @@
 	encoder-emulate {
 		compatible = "gpio-leds";
 		phase_a: phase_a {
-			gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio7 2 GPIO_ACTIVE_HIGH>;
 		};
 		phase_b: phase_b {
-			gpios = <&gpio2 11 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
@@ -24,21 +24,25 @@
 &pinctrl {
 	qdec_pinctrl: qdec_pinctrl {
 		group1 {
-			psels = <NRF_PSEL(QDEC_A, 2, 8)>,
-				<NRF_PSEL(QDEC_B, 2, 10)>;
+			psels = <NRF_PSEL(QDEC_A, 1, 0)>,
+				<NRF_PSEL(QDEC_B, 1, 2)>;
 		};
 	};
 
 	qdec_sleep_pinctrl: qdec_sleep_pinctrl {
 		group1 {
-			psels = <NRF_PSEL(QDEC_A, 2, 8)>,
-				<NRF_PSEL(QDEC_B, 2, 10)>;
+			psels = <NRF_PSEL(QDEC_A, 1, 0)>,
+				<NRF_PSEL(QDEC_B, 1, 2)>;
 			low-power-enable;
 		};
 	};
 };
 
-&gpio2 {
+&gpio1 {
+	status = "okay";
+};
+
+&gpio7 {
 	status = "okay";
 };
 

From e55756f8fa482099cdd0addeb90efdfd65141b12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:38 +0100
Subject: [PATCH 1577/2913] Revert "[nrf fromtree] samples: boards: nordic:
 system_off: Update README."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 54473b498a01ea9d43ee7682c9aa6f7b154d6ea3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/boards/nordic/system_off/README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/boards/nordic/system_off/README.rst b/samples/boards/nordic/system_off/README.rst
index 7c98a4e8336..7cf546d901d 100644
--- a/samples/boards/nordic/system_off/README.rst
+++ b/samples/boards/nordic/system_off/README.rst
@@ -22,7 +22,7 @@ RAM is configured to keep the containing section powered while in system-off mod
 Requirements
 ************
 
-This application uses nRF51 DK, nRF52 DK or nRF54L15 DK board for the demo.
+This application uses nRF51 DK, nRF52 DK or nRF54L15 PDK board for the demo.
 
 Sample Output
 =============

From 30c07754874dd4b6914ef9ea0c29e5a0e092a34f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:38 +0100
Subject: [PATCH 1578/2913] Revert "[nrf fromtree] tests: drivers: comparator:
 shell: use platform_allow"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 97b7c024d121418d6d9362807414bdb6d6be4eed.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/drivers/comparator/shell/testcase.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/drivers/comparator/shell/testcase.yaml b/tests/drivers/comparator/shell/testcase.yaml
index 26d1fc169c3..9fa6249c833 100644
--- a/tests/drivers/comparator/shell/testcase.yaml
+++ b/tests/drivers/comparator/shell/testcase.yaml
@@ -3,7 +3,7 @@
 
 tests:
   drivers.comparator.shell:
-    platform_allow:
+    integration_platforms:
       - native_sim
       - native_sim/native/64
     tags:

From 69f5de5975f00a16acf6d4e8325ff15e33212185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:38 +0100
Subject: [PATCH 1579/2913] Revert "[nrf fromtree] tests: drivers: comparator:
 add gpio_loopback test suite"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8e5e35e4740e6841dd2cdab2e41465bc77b2a980.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../comparator/gpio_loopback/CMakeLists.txt   |   8 --
 .../gpio_loopback/boards/frdm_ke15z.overlay   |  50 --------
 .../boards/nrf5340dk_nrf5340_cpuapp.overlay   |  25 ----
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  35 ------
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |  25 ----
 .../drivers/comparator/gpio_loopback/prj.conf |   6 -
 .../boards/nrf5340dk_nrf5340_cpuapp.overlay   |  16 ---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  16 ---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |  16 ---
 .../snippets/nrf_comp/snippet.yml             |  15 ---
 .../boards/nrf5340dk_nrf5340_cpuapp.overlay   |  12 --
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  12 --
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |  12 --
 .../snippets/nrf_lpcomp/snippet.yml           |  15 ---
 .../comparator/gpio_loopback/src/test.c       | 119 ------------------
 .../comparator/gpio_loopback/testcase.yaml    |  27 ----
 16 files changed, 409 deletions(-)
 delete mode 100644 tests/drivers/comparator/gpio_loopback/CMakeLists.txt
 delete mode 100644 tests/drivers/comparator/gpio_loopback/boards/frdm_ke15z.overlay
 delete mode 100644 tests/drivers/comparator/gpio_loopback/boards/nrf5340dk_nrf5340_cpuapp.overlay
 delete mode 100644 tests/drivers/comparator/gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 delete mode 100644 tests/drivers/comparator/gpio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 delete mode 100644 tests/drivers/comparator/gpio_loopback/prj.conf
 delete mode 100644 tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf5340dk_nrf5340_cpuapp.overlay
 delete mode 100644 tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 delete mode 100644 tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 delete mode 100644 tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/snippet.yml
 delete mode 100644 tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf5340dk_nrf5340_cpuapp.overlay
 delete mode 100644 tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 delete mode 100644 tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 delete mode 100644 tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/snippet.yml
 delete mode 100644 tests/drivers/comparator/gpio_loopback/src/test.c
 delete mode 100644 tests/drivers/comparator/gpio_loopback/testcase.yaml

diff --git a/tests/drivers/comparator/gpio_loopback/CMakeLists.txt b/tests/drivers/comparator/gpio_loopback/CMakeLists.txt
deleted file mode 100644
index 43c6821adab..00000000000
--- a/tests/drivers/comparator/gpio_loopback/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(comparator_gpio_loopback)
-
-target_sources(app PRIVATE src/test.c)
diff --git a/tests/drivers/comparator/gpio_loopback/boards/frdm_ke15z.overlay b/tests/drivers/comparator/gpio_loopback/boards/frdm_ke15z.overlay
deleted file mode 100644
index 531275ceb63..00000000000
--- a/tests/drivers/comparator/gpio_loopback/boards/frdm_ke15z.overlay
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <nxp/kinetis/MKE17Z256VLL7-pinctrl.h>
-#include <zephyr/dt-bindings/gpio/gpio.h>
-
-/*
- * PTA1 looped back to PTA0
- */
-
-/ {
-	aliases {
-		test-comp = &cmp0;
-	};
-
-	zephyr,user {
-		test-gpios = <&gpioa 1 GPIO_ACTIVE_HIGH>;
-	};
-};
-
-&gpioa {
-	status = "okay";
-};
-
-&pinctrl {
-	cmp0_default: cmp0_default {
-		group0 {
-			pinmux = <ACMP0_IN0_PTA0>;
-			drive-strength = "high";
-		};
-	};
-};
-
-&cmp0 {
-	pinctrl-0 = <&cmp0_default>;
-	pinctrl-names = "default";
-	status = "okay";
-
-	positive-mux-input = "IN0";
-	positive-port-input = "MUX";
-	negative-mux-input = "IN0";
-	negative-port-input = "DAC";
-
-	dac-vref-source = "VIN1";
-	dac-value = <128>;
-	dac-enable;
-};
diff --git a/tests/drivers/comparator/gpio_loopback/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/boards/nrf5340dk_nrf5340_cpuapp.overlay
deleted file mode 100644
index a837527e342..00000000000
--- a/tests/drivers/comparator/gpio_loopback/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/gpio/gpio.h>
-
-/*
- * P0.05 looped back to P0.04
- */
-
-/ {
-	aliases {
-		test-comp = &comp;
-	};
-
-	zephyr,user {
-		test-gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
-	};
-};
-
-&gpio0{
-	status = "okay";
-};
diff --git a/tests/drivers/comparator/gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index aa39ab60e9e..00000000000
--- a/tests/drivers/comparator/gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/gpio/gpio.h>
-
-/*
- * P1.03 looped back to P1.02
- */
-
-/ {
-	aliases {
-		test-comp = &comp;
-	};
-
-	zephyr,user {
-		test-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
-	};
-};
-
-&gpio1 {
-	status = "okay";
-};
-
-/* Temporary workaround to reserve P1.03 for cpuapp */
-&led1 {
-	gpios = < &gpio1 0x3 0x0 >;
-};
-
-/* Temporary workaround to reserve P1.02 for cpuapp */
-&led2 {
-	gpios = < &gpio1 0x2 0x0 >;
-};
diff --git a/tests/drivers/comparator/gpio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 768965e7c58..00000000000
--- a/tests/drivers/comparator/gpio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/gpio/gpio.h>
-
-/*
- * P1.10 looped back to P1.11
- */
-
-/ {
-	aliases {
-		test-comp = &comp;
-	};
-
-	zephyr,user {
-		test-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
-	};
-};
-
-&gpio1 {
-	status = "okay";
-};
diff --git a/tests/drivers/comparator/gpio_loopback/prj.conf b/tests/drivers/comparator/gpio_loopback/prj.conf
deleted file mode 100644
index 5ca57533d76..00000000000
--- a/tests/drivers/comparator/gpio_loopback/prj.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_ZTEST=y
-CONFIG_GPIO=y
-CONFIG_COMPARATOR=y
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf5340dk_nrf5340_cpuapp.overlay
deleted file mode 100644
index e11bdcd3173..00000000000
--- a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&comp {
-	main-mode = "SE";
-	psel = "AIN0"; /* P0.04 */
-	refsel = "VDD";
-	sp-mode = "HIGH";
-	th-up = <34>;
-	th-down = <30>;
-	isource = "DISABLED";
-	status = "okay";
-};
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index f90c2051255..00000000000
--- a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&comp {
-	main-mode = "SE";
-	psel = "AIN2"; /* P1.02 */
-	refsel = "INT_1V2";
-	sp-mode = "HIGH";
-	th-up = <63>;
-	th-down = <59>;
-	isource = "DISABLED";
-	status = "okay";
-};
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 3a7a8f0ef81..00000000000
--- a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&comp {
-	main-mode = "SE";
-	psel = "AIN4"; /* P1.11 */
-	refsel = "INT_1V2";
-	sp-mode = "HIGH";
-	th-up = <63>;
-	th-down = <59>;
-	isource = "DISABLED";
-	status = "okay";
-};
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/snippet.yml b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/snippet.yml
deleted file mode 100644
index e030c0e5543..00000000000
--- a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/snippet.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-name: gpio_loopback_nrf_comp
-
-boards:
-  nrf54h20dk/nrf54h20/cpuapp:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20dk_nrf54h20_cpuapp.overlay
-  nrf54l15dk/nrf54l15/cpuapp:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay
-  nrf5340dk/nrf5340/cpuapp:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf5340dk_nrf5340_cpuapp.overlay
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf5340dk_nrf5340_cpuapp.overlay
deleted file mode 100644
index d35a20dfc22..00000000000
--- a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&comp {
-	compatible = "nordic,nrf-lpcomp";
-	psel = "AIN0"; /* P0.04 */
-	refsel = "VDD_4_8";
-	status = "okay";
-};
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index 349cd7051f9..00000000000
--- a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&comp {
-	compatible = "nordic,nrf-lpcomp";
-	psel = "AIN2"; /* P1.02 */
-	refsel = "VDD_4_8";
-	status = "okay";
-};
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index ebb652bdd87..00000000000
--- a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&comp {
-	compatible = "nordic,nrf-lpcomp";
-	psel = "AIN4"; /* P1.11 */
-	refsel = "VDD_4_8";
-	status = "okay";
-};
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/snippet.yml b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/snippet.yml
deleted file mode 100644
index 70ff2a7e314..00000000000
--- a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/snippet.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-name: gpio_loopback_nrf_lpcomp
-
-boards:
-  nrf54h20dk/nrf54h20/cpuapp:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20dk_nrf54h20_cpuapp.overlay
-  nrf54l15dk/nrf54l15/cpuapp:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay
-  nrf5340dk/nrf5340/cpuapp:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf5340dk_nrf5340_cpuapp.overlay
diff --git a/tests/drivers/comparator/gpio_loopback/src/test.c b/tests/drivers/comparator/gpio_loopback/src/test.c
deleted file mode 100644
index 930422b1a65..00000000000
--- a/tests/drivers/comparator/gpio_loopback/src/test.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/drivers/comparator.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/kernel.h>
-#include <zephyr/ztest.h>
-
-static const struct device *test_dev = DEVICE_DT_GET(DT_ALIAS(test_comp));
-static const struct gpio_dt_spec test_pin = GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), test_gpios);
-static K_SEM_DEFINE(test_sem, 0, 1);
-
-static void test_callback(const struct device *dev, void *user_data)
-{
-	zassert_equal(&test_sem, user_data);
-	k_sem_give(&test_sem);
-}
-
-static void *test_setup(void)
-{
-	zassert_ok(gpio_pin_configure_dt(&test_pin, GPIO_OUTPUT_INACTIVE));
-	return NULL;
-}
-
-static void test_before(void *f)
-{
-	ARG_UNUSED(f);
-
-	k_sem_reset(&test_sem);
-	zassert_ok(gpio_pin_set_dt(&test_pin, 0));
-	zassert_ok(comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_NONE));
-	zassert_ok(comparator_set_trigger_callback(test_dev, NULL, NULL));
-	zassert_between_inclusive(comparator_trigger_is_pending(test_dev), 0, 1);
-}
-
-ZTEST_SUITE(comparator_gpio_loopback, NULL, test_setup, test_before, NULL, NULL);
-
-ZTEST(comparator_gpio_loopback, test_get_output)
-{
-	zassert_equal(comparator_get_output(test_dev), 0);
-	k_msleep(1);
-	zassert_ok(gpio_pin_set_dt(&test_pin, 1));
-	k_msleep(1);
-	zassert_equal(comparator_get_output(test_dev), 1);
-	k_msleep(1);
-	zassert_ok(gpio_pin_set_dt(&test_pin, 0));
-	k_msleep(1);
-	zassert_equal(comparator_get_output(test_dev), 0);
-}
-
-ZTEST(comparator_gpio_loopback, test_no_trigger_no_pending)
-{
-	zassert_ok(gpio_pin_set_dt(&test_pin, 1));
-	k_msleep(1);
-	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
-	zassert_ok(gpio_pin_set_dt(&test_pin, 0));
-	k_msleep(1);
-	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
-}
-
-ZTEST(comparator_gpio_loopback, test_trigger_rising_edge_pending)
-{
-	zassert_ok(comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_RISING_EDGE));
-	k_msleep(1);
-	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
-	zassert_ok(gpio_pin_set_dt(&test_pin, 1));
-	k_msleep(1);
-	zassert_equal(comparator_trigger_is_pending(test_dev), 1);
-	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
-	zassert_ok(gpio_pin_set_dt(&test_pin, 0));
-	k_msleep(1);
-	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
-}
-
-ZTEST(comparator_gpio_loopback, test_trigger_falling_edge_pending)
-{
-	zassert_ok(comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_FALLING_EDGE));
-	k_msleep(1);
-	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
-	zassert_ok(gpio_pin_set_dt(&test_pin, 1));
-	k_msleep(1);
-	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
-	zassert_ok(gpio_pin_set_dt(&test_pin, 0));
-	k_msleep(1);
-	zassert_equal(comparator_trigger_is_pending(test_dev), 1);
-	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
-}
-
-ZTEST(comparator_gpio_loopback, test_trigger_both_edges_pending)
-{
-	zassert_ok(comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_BOTH_EDGES));
-	k_msleep(1);
-	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
-	zassert_ok(gpio_pin_set_dt(&test_pin, 1));
-	k_msleep(1);
-	zassert_equal(comparator_trigger_is_pending(test_dev), 1);
-	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
-	zassert_ok(gpio_pin_set_dt(&test_pin, 0));
-	k_msleep(1);
-	zassert_equal(comparator_trigger_is_pending(test_dev), 1);
-	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
-}
-
-ZTEST(comparator_gpio_loopback, test_trigger_callback)
-{
-	zassert_ok(comparator_set_trigger_callback(test_dev, test_callback, &test_sem));
-	k_msleep(1);
-	zassert_equal(k_sem_take(&test_sem, K_NO_WAIT), -EBUSY);
-	zassert_ok(comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_RISING_EDGE));
-	k_msleep(1);
-	zassert_equal(k_sem_take(&test_sem, K_NO_WAIT), -EBUSY);
-	zassert_ok(gpio_pin_set_dt(&test_pin, 1));
-	k_msleep(1);
-	zassert_ok(k_sem_take(&test_sem, K_NO_WAIT));
-	zassert_equal(comparator_trigger_is_pending(test_dev), 0);
-}
diff --git a/tests/drivers/comparator/gpio_loopback/testcase.yaml b/tests/drivers/comparator/gpio_loopback/testcase.yaml
deleted file mode 100644
index beb5cd39276..00000000000
--- a/tests/drivers/comparator/gpio_loopback/testcase.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor
-# SPDX-License-Identifier: Apache-2.0
-
-common:
-  harness_config:
-    fixture: gpio_loopback
-  tags:
-    - drivers
-    - comparator
-tests:
-  drivers.comparator.gpio_loopback.mcux_acmp:
-    platform_allow:
-      - frdm_ke15z
-  drivers.comparator.gpio_loopback.nrf_comp:
-    extra_args:
-      - SNIPPET="gpio_loopback_nrf_comp"
-    platform_allow:
-      - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf5340dk/nrf5340/cpuapp
-  drivers.comparator.gpio_loopback.nrf_lpcomp:
-    extra_args:
-      - SNIPPET="gpio_loopback_nrf_lpcomp"
-    platform_allow:
-      - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf5340dk/nrf5340/cpuapp

From d7a387e9d0e194125cf5f3f432b344c028ddc168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:38 +0100
Subject: [PATCH 1580/2913] Revert "[nrf fromtree] MAINTAINERS.yml: patch
 comparator drivers area"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7cd02815d71c5697870390ae8c12e6bfb112b8b2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 MAINTAINERS.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index a77bbf643c0..ad9c9bfde27 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -1165,6 +1165,8 @@ Release Notes:
     - dts/bindings/comparator/
     - include/zephyr/drivers/comparator.h
     - include/zephyr/drivers/comparator/
+    - include/zephyr/drivers/comparator/
+    - include/zephyr/dt-bindings/clock/
     - tests/drivers/build_all/comparator/
     - tests/drivers/comparator/
     - doc/hardware/peripherals/comparator.rst

From a740182dc014a94e72eba27a421ad35c9ff65b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:38 +0100
Subject: [PATCH 1581/2913] Revert "[nrf fromtree] MAINTAINERS: add entry for
 comparator drivers"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1dd44b1f93ad7ed647c270f1363e72a5779eca54.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 MAINTAINERS.yml | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index ad9c9bfde27..cc7cb9a1411 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -1156,25 +1156,6 @@ Release Notes:
   tests:
     - drivers.clock
 
-"Drivers: Comparator":
-  status: maintained
-  maintainers:
-    - bjarki-andreasen
-  files:
-    - drivers/comparator/
-    - dts/bindings/comparator/
-    - include/zephyr/drivers/comparator.h
-    - include/zephyr/drivers/comparator/
-    - include/zephyr/drivers/comparator/
-    - include/zephyr/dt-bindings/clock/
-    - tests/drivers/build_all/comparator/
-    - tests/drivers/comparator/
-    - doc/hardware/peripherals/comparator.rst
-  labels:
-    - "area: Comparator"
-  tests:
-    - drivers.comparator
-
 "Drivers: Console":
   status: odd fixes
   files:

From db8c1c6365bf1da067e67d2f28bcec8a89d5ecc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:38 +0100
Subject: [PATCH 1582/2913] Revert "[nrf fromtree] doc: release notes: added
 comparator release notes"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9e8b20d39338732fe902453843b384c5383b341f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/releases/release-notes-4.0.rst | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/doc/releases/release-notes-4.0.rst b/doc/releases/release-notes-4.0.rst
index 85c2523ab00..70ed64dd770 100644
--- a/doc/releases/release-notes-4.0.rst
+++ b/doc/releases/release-notes-4.0.rst
@@ -145,14 +145,6 @@ Drivers and Sensors
 
 * Clock control
 
-* Comparator
-
-  * Introduced comparator device driver subsystem selected with :kconfig:option:`CONFIG_COMPARATOR`
-  * Introduced comparator shell commands selected with :kconfig:option:`CONFIG_COMPARATOR_SHELL`
-  * Added support for Nordic nRF COMP (:dtcompatible:`nordic,nrf-comp`)
-  * Added support for Nordic nRF LPCOMP (:dtcompatible:`nordic,nrf-lpcomp`)
-  * Added support for NXP Kinetis ACMP (:dtcompatible:`nxp,kinetis-acmp`)
-
 * Counter
 
 * DAC

From db2eda668b1546917655bd6d49f7613d55e55b8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:38 +0100
Subject: [PATCH 1583/2913] Revert "[nrf fromtree] docs: hardware: peripherals:
 add comparator docs"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b631ff3818cac38b76a8cd184d2a976155f2f916.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/hardware/peripherals/comparator.rst | 69 -------------------------
 doc/hardware/peripherals/index.rst      |  1 -
 2 files changed, 70 deletions(-)
 delete mode 100644 doc/hardware/peripherals/comparator.rst

diff --git a/doc/hardware/peripherals/comparator.rst b/doc/hardware/peripherals/comparator.rst
deleted file mode 100644
index e0e63407661..00000000000
--- a/doc/hardware/peripherals/comparator.rst
+++ /dev/null
@@ -1,69 +0,0 @@
-.. _comparator_api:
-
-Comparator
-##########
-
-Overview
-********
-
-An analog comparator compares the voltages of two analog signals connected to its negative and
-positive inputs. If the voltage at the positive input is higher than the negative input, the
-comparator's output will be high, otherwise, it will be low.
-
-Comparators can typically set a trigger which triggers on output changes. This trigger can
-either invoke a callback, or its status can be polled.
-
-Related configuration options:
-
-* :kconfig:option:`CONFIG_COMPARATOR`
-
-Configuration
-*************
-
-Embedded comparators can typically be configured at runtime. When enabled, an initial
-configuration must be provided using the devicetree. At runtime, comparators can have their
-configuration updated using device driver specific APIs. The configuration will be applied
-when the comparator is resumed.
-
-Power management
-****************
-
-Comparators are enabled using power management. When resumed, the comparator will actively
-compare its inputs, producing an output and detecting edges. When suspended, the comparator
-will be inactive.
-
-Comparator shell
-****************
-
-The comparator shell provides the ``comp`` command with a set of subcommands for the
-:ref:`shell <shell_api>` module.
-
-The ``comp`` shell command provides the following subcommands:
-
-* ``get_output`` See :c:func:`comparator_get_output`
-* ``set_trigger`` See :c:func:`comparator_set_trigger`
-* ``await_trigger`` Awaits trigger using the following flow:
-  * Set trigger callback using :c:func:`comparator_set_trigger_callback`
-  * Await callback or time out after default or optionally provided timeout
-  * Clear trigger callback using :c:func:`comparator_set_trigger_callback`
-* ``trigger_is_pending`` See :c:func:`comparator_trigger_is_pending`
-
-Related configuration options:
-
-* :kconfig:option:`CONFIG_SHELL`
-* :kconfig:option:`CONFIG_COMPARATOR_SHELL`
-* :kconfig:option:`CONFIG_COMPARATOR_SHELL_AWAIT_TRIGGER_DEFAULT_TIMEOUT`
-* :kconfig:option:`CONFIG_COMPARATOR_SHELL_AWAIT_TRIGGER_MAX_TIMEOUT`
-
-.. note::
-   The power management shell can optionally be enabled alongside the comparator shell.
-
-   Related configuration options:
-
-   * :kconfig:option:`CONFIG_PM_DEVICE`
-   * :kconfig:option:`CONFIG_PM_DEVICE_SHELL`
-
-API Reference
-*************
-
-.. doxygengroup:: comparator_interface
diff --git a/doc/hardware/peripherals/index.rst b/doc/hardware/peripherals/index.rst
index 2a7405aced2..e2574e75993 100644
--- a/doc/hardware/peripherals/index.rst
+++ b/doc/hardware/peripherals/index.rst
@@ -18,7 +18,6 @@ Peripherals
    clock_control.rst
    can/index.rst
    charger.rst
-   comparator.rst
    coredump.rst
    counter.rst
    dac.rst

From af09b5cdc0d7e06543d1888e54a274303a872dd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:38 +0100
Subject: [PATCH 1584/2913] Revert "[nrf fromtree] tests: drivers: comparator:
 add shell test suite"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 305afdd52c6bec523f463325bea863492d876965.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/drivers/comparator/shell/CMakeLists.txt |   8 -
 tests/drivers/comparator/shell/app.overlay    |  12 -
 tests/drivers/comparator/shell/prj.conf       |  10 -
 tests/drivers/comparator/shell/src/test.c     | 357 ------------------
 tests/drivers/comparator/shell/testcase.yaml  |  12 -
 5 files changed, 399 deletions(-)
 delete mode 100644 tests/drivers/comparator/shell/CMakeLists.txt
 delete mode 100644 tests/drivers/comparator/shell/app.overlay
 delete mode 100644 tests/drivers/comparator/shell/prj.conf
 delete mode 100644 tests/drivers/comparator/shell/src/test.c
 delete mode 100644 tests/drivers/comparator/shell/testcase.yaml

diff --git a/tests/drivers/comparator/shell/CMakeLists.txt b/tests/drivers/comparator/shell/CMakeLists.txt
deleted file mode 100644
index c2f34f71e68..00000000000
--- a/tests/drivers/comparator/shell/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(comparator_shell)
-
-target_sources(app PRIVATE src/test.c)
diff --git a/tests/drivers/comparator/shell/app.overlay b/tests/drivers/comparator/shell/app.overlay
deleted file mode 100644
index 3bb03b5a569..00000000000
--- a/tests/drivers/comparator/shell/app.overlay
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/{
-	fake_comp: fake_comp {
-		compatible = "zephyr,fake-comp";
-		status = "okay";
-	};
-};
diff --git a/tests/drivers/comparator/shell/prj.conf b/tests/drivers/comparator/shell/prj.conf
deleted file mode 100644
index a1eb4324cee..00000000000
--- a/tests/drivers/comparator/shell/prj.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_SHELL=y
-CONFIG_SHELL_BACKEND_SERIAL=n
-CONFIG_SHELL_VT100_COMMANDS=n
-CONFIG_SHELL_BACKEND_DUMMY=y
-CONFIG_COMPARATOR=y
-CONFIG_COMPARATOR_SHELL=y
-CONFIG_ZTEST=y
diff --git a/tests/drivers/comparator/shell/src/test.c b/tests/drivers/comparator/shell/src/test.c
deleted file mode 100644
index dacefc9311a..00000000000
--- a/tests/drivers/comparator/shell/src/test.c
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/drivers/comparator.h>
-#include <zephyr/drivers/comparator/fake_comp.h>
-#include <zephyr/fff.h>
-#include <zephyr/kernel.h>
-#include <zephyr/shell/shell.h>
-#include <zephyr/shell/shell_dummy.h>
-#include <zephyr/ztest.h>
-
-DEFINE_FFF_GLOBALS;
-
-#define FAKE_COMP_NODE DT_NODELABEL(fake_comp)
-#define FAKE_COMP_NAME DEVICE_DT_NAME(FAKE_COMP_NODE)
-
-#define TEST_TRIGGER_DELAY K_SECONDS(1)
-
-#define TEST_AWAIT_TRIGGER_TIMEOUT_BELOW_MIN_CMD \
-	("comp await_trigger " FAKE_COMP_NAME " 0")
-
-#define TEST_AWAIT_TRIGGER_TIMEOUT_ABOVE_MAX_CMD						\
-	("comp await_trigger " FAKE_COMP_NAME " "						\
-	 STRINGIFY(CONFIG_COMPARATOR_SHELL_AWAIT_TRIGGER_MAX_TIMEOUT + 1))
-
-#define TEST_AWAIT_TRIGGER_TIMEOUT_BROKEN_CMD \
-	("comp await_trigger " FAKE_COMP_NAME " d")
-
-static const struct shell *test_sh;
-static const struct device *test_dev = DEVICE_DT_GET(FAKE_COMP_NODE);
-static comparator_callback_t test_callback;
-static void *test_callback_user_data;
-static struct k_spinlock test_callback_spinlock;
-static struct k_work_delayable test_trigger_dwork;
-
-static int test_get_output_stub_1(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	return 1;
-}
-
-static int test_get_output_stub_0(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	return 0;
-}
-
-static int test_get_output_stub_eio(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	return -EIO;
-}
-
-static int test_set_trigger_stub_ok(const struct device *dev, enum comparator_trigger trigger)
-{
-	ARG_UNUSED(dev);
-	ARG_UNUSED(trigger);
-
-	return 0;
-}
-
-static int test_set_trigger_stub_eio(const struct device *dev, enum comparator_trigger trigger)
-{
-	ARG_UNUSED(dev);
-	ARG_UNUSED(trigger);
-
-	return -EIO;
-}
-
-static int test_set_trigger_callback_mock_0(const struct device *dev,
-					    comparator_callback_t callback,
-					    void *user_data)
-{
-	ARG_UNUSED(dev);
-
-	K_SPINLOCK(&test_callback_spinlock) {
-		test_callback = callback;
-		test_callback_user_data = user_data;
-	}
-
-	return 0;
-}
-
-static int test_set_trigger_callback_stub_0(const struct device *dev,
-					    comparator_callback_t callback,
-					    void *user_data)
-{
-	ARG_UNUSED(dev);
-	ARG_UNUSED(callback);
-	ARG_UNUSED(user_data);
-
-	return 0;
-}
-
-static int test_set_trigger_callback_stub_eio(const struct device *dev,
-					      comparator_callback_t callback,
-					      void *user_data)
-{
-	ARG_UNUSED(dev);
-	ARG_UNUSED(callback);
-	ARG_UNUSED(user_data);
-
-	return -EIO;
-}
-
-static int test_trigger_is_pending_stub_1(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	return 1;
-}
-
-static int test_trigger_is_pending_stub_0(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	return 0;
-}
-
-static int test_trigger_is_pending_stub_eio(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	return -EIO;
-}
-
-
-static void test_trigger_handler(struct k_work *work)
-{
-	ARG_UNUSED(work);
-
-	test_callback(test_dev, test_callback_user_data);
-}
-
-static void test_schedule_trigger(void)
-{
-	k_work_schedule(&test_trigger_dwork, TEST_TRIGGER_DELAY);
-}
-
-static void test_cancel_trigger(void)
-{
-	struct k_work_sync sync;
-
-	k_work_cancel_delayable_sync(&test_trigger_dwork, &sync);
-}
-
-static void *test_setup(void)
-{
-	k_work_init_delayable(&test_trigger_dwork, test_trigger_handler);
-	test_sh = shell_backend_dummy_get_ptr();
-	WAIT_FOR(shell_ready(test_sh), 20000, k_msleep(1));
-	zassert_true(shell_ready(test_sh), "timed out waiting for dummy shell backend");
-	return NULL;
-}
-
-static void test_after(void *f)
-{
-	ARG_UNUSED(f);
-
-	test_cancel_trigger();
-}
-
-ZTEST(comparator_shell, test_get_output)
-{
-	int ret;
-	const char *out;
-	size_t out_size;
-
-	shell_backend_dummy_clear_output(test_sh);
-	comp_fake_comp_get_output_fake.custom_fake = test_get_output_stub_1;
-	ret = shell_execute_cmd(test_sh, "comp get_output " FAKE_COMP_NAME);
-	zassert_ok(ret);
-	zassert_equal(comp_fake_comp_get_output_fake.call_count, 1);
-	zassert_equal(comp_fake_comp_get_output_fake.arg0_val, test_dev);
-	out = shell_backend_dummy_get_output(test_sh, &out_size);
-	zassert_str_equal(out, "\r\n1\r\n");
-
-	comp_fake_comp_get_output_fake.custom_fake = test_get_output_stub_0;
-	ret = shell_execute_cmd(test_sh, "comp get_output " FAKE_COMP_NAME);
-	zassert_ok(ret);
-	zassert_equal(comp_fake_comp_get_output_fake.call_count, 2);
-	zassert_equal(comp_fake_comp_get_output_fake.arg0_val, test_dev);
-	out = shell_backend_dummy_get_output(test_sh, &out_size);
-	zassert_str_equal(out, "\r\n0\r\n");
-
-	comp_fake_comp_get_output_fake.custom_fake = test_get_output_stub_eio;
-	ret = shell_execute_cmd(test_sh, "comp get_output " FAKE_COMP_NAME);
-	zassert_equal(ret, -EIO);
-	zassert_equal(comp_fake_comp_get_output_fake.call_count, 3);
-	zassert_equal(comp_fake_comp_get_output_fake.arg0_val, test_dev);
-	out = shell_backend_dummy_get_output(test_sh, &out_size);
-	zassert_str_equal(out, "\r\nfailed to get output\r\n");
-}
-
-ZTEST(comparator_shell, test_set_trigger)
-{
-	int ret;
-	const char *out;
-	size_t out_size;
-
-	comp_fake_comp_set_trigger_fake.custom_fake = test_set_trigger_stub_ok;
-
-	ret = shell_execute_cmd(test_sh, "comp set_trigger " FAKE_COMP_NAME " NONE");
-	zassert_ok(ret);
-	zassert_equal(comp_fake_comp_set_trigger_fake.call_count, 1);
-	zassert_equal(comp_fake_comp_set_trigger_fake.arg0_val, test_dev);
-	zassert_equal(comp_fake_comp_set_trigger_fake.arg1_val, COMPARATOR_TRIGGER_NONE);
-
-	ret = shell_execute_cmd(test_sh, "comp set_trigger " FAKE_COMP_NAME " RISING_EDGE");
-	zassert_ok(ret);
-	zassert_equal(comp_fake_comp_set_trigger_fake.call_count, 2);
-	zassert_equal(comp_fake_comp_set_trigger_fake.arg0_val, test_dev);
-	zassert_equal(comp_fake_comp_set_trigger_fake.arg1_val, COMPARATOR_TRIGGER_RISING_EDGE);
-
-	ret = shell_execute_cmd(test_sh, "comp set_trigger " FAKE_COMP_NAME " FALLING_EDGE");
-	zassert_ok(ret);
-	zassert_equal(comp_fake_comp_set_trigger_fake.call_count, 3);
-	zassert_equal(comp_fake_comp_set_trigger_fake.arg0_val, test_dev);
-	zassert_equal(comp_fake_comp_set_trigger_fake.arg1_val, COMPARATOR_TRIGGER_FALLING_EDGE);
-
-	ret = shell_execute_cmd(test_sh, "comp set_trigger " FAKE_COMP_NAME " BOTH_EDGES");
-	zassert_ok(ret);
-	zassert_equal(comp_fake_comp_set_trigger_fake.call_count, 4);
-	zassert_equal(comp_fake_comp_set_trigger_fake.arg0_val, test_dev);
-	zassert_equal(comp_fake_comp_set_trigger_fake.arg1_val, COMPARATOR_TRIGGER_BOTH_EDGES);
-
-	ret = shell_execute_cmd(test_sh, "comp set_trigger " FAKE_COMP_NAME " INVALID");
-	zassert_equal(ret, -EINVAL);
-	zassert_equal(comp_fake_comp_set_trigger_fake.call_count, 4);
-
-	comp_fake_comp_set_trigger_fake.custom_fake = test_set_trigger_stub_eio;
-
-	shell_backend_dummy_clear_output(test_sh);
-	ret = shell_execute_cmd(test_sh, "comp set_trigger " FAKE_COMP_NAME " BOTH_EDGES");
-	zassert_equal(ret, -EIO);
-	zassert_equal(comp_fake_comp_set_trigger_fake.call_count, 5);
-	zassert_equal(comp_fake_comp_set_trigger_fake.arg0_val, test_dev);
-	zassert_equal(comp_fake_comp_set_trigger_fake.arg1_val, COMPARATOR_TRIGGER_BOTH_EDGES);
-	out = shell_backend_dummy_get_output(test_sh, &out_size);
-	zassert_str_equal(out, "\r\nfailed to set trigger\r\n");
-}
-
-ZTEST(comparator_shell, test_await_trigger_set_callback_fail)
-{
-	int ret;
-	const char *out;
-	size_t out_size;
-
-	shell_backend_dummy_clear_output(test_sh);
-	comp_fake_comp_set_trigger_callback_fake.custom_fake = test_set_trigger_callback_stub_eio;
-	ret = shell_execute_cmd(test_sh, "comp await_trigger " FAKE_COMP_NAME);
-	zassert_ok(0);
-	zassert_equal(comp_fake_comp_set_trigger_callback_fake.call_count, 1);
-	zassert_equal(comp_fake_comp_set_trigger_callback_fake.return_val, 0);
-	out = shell_backend_dummy_get_output(test_sh, &out_size);
-	zassert_str_equal(out, "\r\nfailed to set trigger callback\r\n");
-}
-
-ZTEST(comparator_shell, test_await_trigger_timeout)
-{
-	int ret;
-	const char *out;
-	size_t out_size;
-
-	shell_backend_dummy_clear_output(test_sh);
-	comp_fake_comp_set_trigger_callback_fake.custom_fake = test_set_trigger_callback_stub_0;
-	ret = shell_execute_cmd(test_sh, "comp await_trigger " FAKE_COMP_NAME);
-	zassert_ok(0);
-	zassert_equal(comp_fake_comp_set_trigger_callback_fake.call_count, 2);
-	zassert_equal(comp_fake_comp_set_trigger_callback_fake.return_val_history[0], 0);
-	zassert_equal(comp_fake_comp_set_trigger_callback_fake.return_val_history[1], 0);
-	out = shell_backend_dummy_get_output(test_sh, &out_size);
-	zassert_str_equal(out, "\r\ntimed out\r\n");
-}
-
-ZTEST(comparator_shell, test_await_trigger_invalid_timeout_arg)
-{
-	int ret;
-
-	ret = shell_execute_cmd(test_sh, TEST_AWAIT_TRIGGER_TIMEOUT_BELOW_MIN_CMD);
-	zassert_not_ok(ret);
-	zassert_equal(comp_fake_comp_set_trigger_callback_fake.call_count, 0);
-
-	ret = shell_execute_cmd(test_sh, TEST_AWAIT_TRIGGER_TIMEOUT_ABOVE_MAX_CMD);
-	zassert_not_ok(ret);
-	zassert_equal(comp_fake_comp_set_trigger_callback_fake.call_count, 0);
-
-	ret = shell_execute_cmd(test_sh, TEST_AWAIT_TRIGGER_TIMEOUT_BROKEN_CMD);
-	zassert_not_ok(ret);
-	zassert_equal(comp_fake_comp_set_trigger_callback_fake.call_count, 0);
-}
-
-ZTEST(comparator_shell, test_await_trigger)
-{
-	int ret;
-	const char *out;
-	size_t out_size;
-	comparator_api_set_trigger_callback seq[2];
-
-	shell_backend_dummy_clear_output(test_sh);
-	seq[0] = test_set_trigger_callback_mock_0;
-	seq[1] = test_set_trigger_callback_stub_0;
-	comp_fake_comp_set_trigger_callback_fake.custom_fake_seq = seq;
-	comp_fake_comp_set_trigger_callback_fake.custom_fake_seq_len = ARRAY_SIZE(seq);
-	test_schedule_trigger();
-	ret = shell_execute_cmd(test_sh, "comp await_trigger " FAKE_COMP_NAME);
-	zassert_ok(0);
-	zassert_equal(comp_fake_comp_set_trigger_callback_fake.call_count, 2);
-	zassert_equal(comp_fake_comp_set_trigger_callback_fake.arg0_history[0], test_dev);
-	zassert_not_equal(comp_fake_comp_set_trigger_callback_fake.arg1_history[0], NULL);
-	zassert_equal(comp_fake_comp_set_trigger_callback_fake.return_val_history[0], 0);
-	zassert_equal(comp_fake_comp_set_trigger_callback_fake.arg0_history[1], test_dev);
-	zassert_equal(comp_fake_comp_set_trigger_callback_fake.arg1_history[1], NULL);
-	zassert_equal(comp_fake_comp_set_trigger_callback_fake.return_val_history[1], 0);
-	out = shell_backend_dummy_get_output(test_sh, &out_size);
-	zassert_str_equal(out, "\r\ntriggered\r\n");
-}
-
-ZTEST(comparator_shell, test_trigger_is_pending)
-{
-	int ret;
-	const char *out;
-	size_t out_size;
-
-	shell_backend_dummy_clear_output(test_sh);
-	comp_fake_comp_trigger_is_pending_fake.custom_fake = test_trigger_is_pending_stub_1;
-	ret = shell_execute_cmd(test_sh, "comp trigger_is_pending " FAKE_COMP_NAME);
-	zassert_ok(ret);
-	zassert_equal(comp_fake_comp_trigger_is_pending_fake.call_count, 1);
-	zassert_equal(comp_fake_comp_trigger_is_pending_fake.arg0_val, test_dev);
-	out = shell_backend_dummy_get_output(test_sh, &out_size);
-	zassert_str_equal(out, "\r\n1\r\n");
-
-	comp_fake_comp_trigger_is_pending_fake.custom_fake = test_trigger_is_pending_stub_0;
-	ret = shell_execute_cmd(test_sh, "comp trigger_is_pending " FAKE_COMP_NAME);
-	zassert_ok(ret);
-	zassert_equal(comp_fake_comp_trigger_is_pending_fake.call_count, 2);
-	zassert_equal(comp_fake_comp_trigger_is_pending_fake.arg0_val, test_dev);
-	out = shell_backend_dummy_get_output(test_sh, &out_size);
-	zassert_str_equal(out, "\r\n0\r\n");
-
-	comp_fake_comp_trigger_is_pending_fake.custom_fake = test_trigger_is_pending_stub_eio;
-	ret = shell_execute_cmd(test_sh, "comp trigger_is_pending " FAKE_COMP_NAME);
-	zassert_equal(ret, -EIO);
-	zassert_equal(comp_fake_comp_trigger_is_pending_fake.call_count, 3);
-	zassert_equal(comp_fake_comp_trigger_is_pending_fake.arg0_val, test_dev);
-	out = shell_backend_dummy_get_output(test_sh, &out_size);
-	zassert_str_equal(out, "\r\nfailed to get trigger status\r\n");
-}
-
-ZTEST_SUITE(comparator_shell, NULL, test_setup, test_after, NULL, NULL);
diff --git a/tests/drivers/comparator/shell/testcase.yaml b/tests/drivers/comparator/shell/testcase.yaml
deleted file mode 100644
index 9fa6249c833..00000000000
--- a/tests/drivers/comparator/shell/testcase.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor
-# SPDX-License-Identifier: Apache-2.0
-
-tests:
-  drivers.comparator.shell:
-    integration_platforms:
-      - native_sim
-      - native_sim/native/64
-    tags:
-      - drivers
-      - comparator
-      - shell

From 79d115264dab91477c8ed7c9585802e23e70e08e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:38 +0100
Subject: [PATCH 1585/2913] Revert "[nrf fromtree] drivers: comparator: add
 fake comparator"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f88377ae2a11b1c5d0a2d69912b3ac60625a92bf.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/comparator/CMakeLists.txt             |  1 -
 drivers/comparator/Kconfig                    |  1 -
 drivers/comparator/Kconfig.fake_comp          |  8 ---
 drivers/comparator/comparator_fake_comp.c     | 65 -------------------
 dts/bindings/comparator/zephyr,comp-fake.yaml |  8 ---
 include/zephyr/drivers/comparator/fake_comp.h | 40 ------------
 6 files changed, 123 deletions(-)
 delete mode 100644 drivers/comparator/Kconfig.fake_comp
 delete mode 100644 drivers/comparator/comparator_fake_comp.c
 delete mode 100644 dts/bindings/comparator/zephyr,comp-fake.yaml
 delete mode 100644 include/zephyr/drivers/comparator/fake_comp.h

diff --git a/drivers/comparator/CMakeLists.txt b/drivers/comparator/CMakeLists.txt
index 43462d64288..f4378c76a77 100644
--- a/drivers/comparator/CMakeLists.txt
+++ b/drivers/comparator/CMakeLists.txt
@@ -6,7 +6,6 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/comparator.h)
 zephyr_library()
 
 zephyr_library_sources_ifdef(CONFIG_USERSPACE comparator_handlers.c)
-zephyr_library_sources_ifdef(CONFIG_COMPARATOR_FAKE_COMP comparator_fake_comp.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_MCUX_ACMP comparator_mcux_acmp.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_COMP comparator_nrf_comp.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_LPCOMP comparator_nrf_lpcomp.c)
diff --git a/drivers/comparator/Kconfig b/drivers/comparator/Kconfig
index 978adc03251..f49ff182562 100644
--- a/drivers/comparator/Kconfig
+++ b/drivers/comparator/Kconfig
@@ -18,7 +18,6 @@ config COMPARATOR_INIT_PRIORITY
 	help
 	  Comparator device driver initialization priority.
 
-rsource "Kconfig.fake_comp"
 rsource "Kconfig.mcux_acmp"
 rsource "Kconfig.nrf_comp"
 rsource "Kconfig.nrf_lpcomp"
diff --git a/drivers/comparator/Kconfig.fake_comp b/drivers/comparator/Kconfig.fake_comp
deleted file mode 100644
index 5fca8db1878..00000000000
--- a/drivers/comparator/Kconfig.fake_comp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config COMPARATOR_FAKE_COMP
-	bool "Fake comparator driver"
-	default y
-	depends on DT_HAS_ZEPHYR_FAKE_COMP_ENABLED
-	depends on ZTEST
diff --git a/drivers/comparator/comparator_fake_comp.c b/drivers/comparator/comparator_fake_comp.c
deleted file mode 100644
index 85abbad2174..00000000000
--- a/drivers/comparator/comparator_fake_comp.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/drivers/comparator/fake_comp.h>
-
-#ifdef CONFIG_ZTEST
-#include <zephyr/ztest.h>
-#endif
-
-#define DT_DRV_COMPAT zephyr_fake_comp
-
-DEFINE_FAKE_VALUE_FUNC(int,
-		       comp_fake_comp_get_output,
-		       const struct device *);
-
-DEFINE_FAKE_VALUE_FUNC(int,
-		       comp_fake_comp_set_trigger,
-		       const struct device *,
-		       enum comparator_trigger);
-
-DEFINE_FAKE_VALUE_FUNC(int,
-		       comp_fake_comp_set_trigger_callback,
-		       const struct device *,
-		       comparator_callback_t,
-		       void *);
-
-DEFINE_FAKE_VALUE_FUNC(int,
-		       comp_fake_comp_trigger_is_pending,
-		       const struct device *);
-
-static const struct comparator_driver_api fake_comp_api = {
-	.get_output = comp_fake_comp_get_output,
-	.set_trigger = comp_fake_comp_set_trigger,
-	.set_trigger_callback = comp_fake_comp_set_trigger_callback,
-	.trigger_is_pending = comp_fake_comp_trigger_is_pending,
-};
-
-#ifdef CONFIG_ZTEST
-static void fake_comp_reset_rule_before(const struct ztest_unit_test *test, void *fixture)
-{
-	ARG_UNUSED(test);
-	ARG_UNUSED(fixture);
-
-	RESET_FAKE(comp_fake_comp_get_output);
-	RESET_FAKE(comp_fake_comp_set_trigger);
-	RESET_FAKE(comp_fake_comp_set_trigger_callback);
-	RESET_FAKE(comp_fake_comp_trigger_is_pending);
-}
-
-ZTEST_RULE(comp_fake_comp_reset_rule, fake_comp_reset_rule_before, NULL);
-#endif
-
-DEVICE_DT_INST_DEFINE(
-	0,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	POST_KERNEL,
-	CONFIG_COMPARATOR_INIT_PRIORITY,
-	&fake_comp_api
-);
diff --git a/dts/bindings/comparator/zephyr,comp-fake.yaml b/dts/bindings/comparator/zephyr,comp-fake.yaml
deleted file mode 100644
index ac344f4639c..00000000000
--- a/dts/bindings/comparator/zephyr,comp-fake.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: Fake comparator device used as stub or mock for testing
-
-compatible: "zephyr,fake-comp"
-
-include: base.yaml
diff --git a/include/zephyr/drivers/comparator/fake_comp.h b/include/zephyr/drivers/comparator/fake_comp.h
deleted file mode 100644
index c24858c1997..00000000000
--- a/include/zephyr/drivers/comparator/fake_comp.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_DRIVERS_COMPARATOR_FAKE_H_
-#define ZEPHYR_INCLUDE_DRIVERS_COMPARATOR_FAKE_H_
-
-#include <zephyr/drivers/comparator.h>
-#include <zephyr/fff.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-DECLARE_FAKE_VALUE_FUNC(int,
-			comp_fake_comp_get_output,
-			const struct device *);
-
-DECLARE_FAKE_VALUE_FUNC(int,
-			comp_fake_comp_set_trigger,
-			const struct device *,
-			enum comparator_trigger);
-
-DECLARE_FAKE_VALUE_FUNC(int,
-			comp_fake_comp_set_trigger_callback,
-			const struct device *,
-			comparator_callback_t,
-			void *);
-
-DECLARE_FAKE_VALUE_FUNC(int,
-			comp_fake_comp_trigger_is_pending,
-			const struct device *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZEPHYR_INCLUDE_DRIVERS_COMPARATOR_FAKE_H_ */

From 6ac9d269eb4e96933ac894d0efde8b375c0fc0de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:39 +0100
Subject: [PATCH 1586/2913] Revert "[nrf fromtree] drivers: comparator: add
 shell"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 39413b2822f26c0fa45f297a81d21b946449020a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/comparator/CMakeLists.txt     |   1 -
 drivers/comparator/Kconfig            |   1 -
 drivers/comparator/Kconfig.shell      |  21 --
 drivers/comparator/comparator_shell.c | 279 --------------------------
 4 files changed, 302 deletions(-)
 delete mode 100644 drivers/comparator/Kconfig.shell
 delete mode 100644 drivers/comparator/comparator_shell.c

diff --git a/drivers/comparator/CMakeLists.txt b/drivers/comparator/CMakeLists.txt
index f4378c76a77..b5fe633a333 100644
--- a/drivers/comparator/CMakeLists.txt
+++ b/drivers/comparator/CMakeLists.txt
@@ -9,4 +9,3 @@ zephyr_library_sources_ifdef(CONFIG_USERSPACE comparator_handlers.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_MCUX_ACMP comparator_mcux_acmp.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_COMP comparator_nrf_comp.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_LPCOMP comparator_nrf_lpcomp.c)
-zephyr_library_sources_ifdef(CONFIG_COMPARATOR_SHELL comparator_shell.c)
diff --git a/drivers/comparator/Kconfig b/drivers/comparator/Kconfig
index f49ff182562..871ee5d9ed6 100644
--- a/drivers/comparator/Kconfig
+++ b/drivers/comparator/Kconfig
@@ -21,6 +21,5 @@ config COMPARATOR_INIT_PRIORITY
 rsource "Kconfig.mcux_acmp"
 rsource "Kconfig.nrf_comp"
 rsource "Kconfig.nrf_lpcomp"
-rsource "Kconfig.shell"
 
 endif # COMPARATOR
diff --git a/drivers/comparator/Kconfig.shell b/drivers/comparator/Kconfig.shell
deleted file mode 100644
index de244619be3..00000000000
--- a/drivers/comparator/Kconfig.shell
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config COMPARATOR_SHELL
-	bool "Comparator shell"
-	default y
-	depends on SHELL
-	help
-	  Comparator device driver shell.
-
-if COMPARATOR_SHELL
-
-config COMPARATOR_SHELL_AWAIT_TRIGGER_DEFAULT_TIMEOUT
-	int "Default timeout for await_trigger command in seconds"
-	default 10
-
-config COMPARATOR_SHELL_AWAIT_TRIGGER_MAX_TIMEOUT
-	int "Max timeout for await_trigger command in seconds"
-	default 60
-
-endif # COMPARATOR_SHELL
diff --git a/drivers/comparator/comparator_shell.c b/drivers/comparator/comparator_shell.c
deleted file mode 100644
index 2d747530871..00000000000
--- a/drivers/comparator/comparator_shell.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/drivers/comparator.h>
-#include <zephyr/shell/shell.h>
-#include <zephyr/kernel.h>
-
-#include <stdlib.h>
-
-#define AWAIT_TRIGGER_DEFAULT_TIMEOUT \
-	CONFIG_COMPARATOR_SHELL_AWAIT_TRIGGER_DEFAULT_TIMEOUT
-
-#define AWAIT_TRIGGER_MAX_TIMEOUT \
-	CONFIG_COMPARATOR_SHELL_AWAIT_TRIGGER_MAX_TIMEOUT
-
-/* Mapped 1-1 to enum comparator_trigger */
-static const char *const trigger_lookup[] = {
-	"NONE",
-	"RISING_EDGE",
-	"FALLING_EDGE",
-	"BOTH_EDGES",
-};
-
-static K_SEM_DEFINE(triggered_sem, 0, 1);
-
-static int get_device_from_str(const struct shell *sh,
-			       const char *dev_str,
-			       const struct device **dev)
-{
-	*dev = device_get_binding(dev_str);
-
-	if (*dev == NULL) {
-		shell_error(sh, "%s not %s", dev_str, "found");
-		return -ENODEV;
-	}
-
-	if (!device_is_ready(*dev)) {
-		shell_error(sh, "%s not %s", dev_str, "ready");
-		return -ENODEV;
-	}
-
-	return 0;
-}
-
-static int cmd_get_output(const struct shell *sh, size_t argc, char **argv)
-{
-	int ret;
-	const char *dev_str;
-	const struct device *dev;
-
-	ARG_UNUSED(argc);
-
-	dev_str = argv[1];
-	ret = get_device_from_str(sh, dev_str, &dev);
-	if (ret < 0) {
-		return ret;
-	}
-
-	ret = comparator_get_output(dev);
-	if (ret < 0) {
-		shell_error(sh, "failed to %s %s", "get", "output");
-		return -EIO;
-	}
-
-	shell_print(sh, "%i", ret);
-	return 0;
-}
-
-static int get_trigger_from_str(const struct shell *sh,
-				const char *trigger_str,
-				enum comparator_trigger *trigger)
-{
-	ARRAY_FOR_EACH(trigger_lookup, i) {
-		if (strcmp(trigger_lookup[i], trigger_str) == 0) {
-			*trigger = (enum comparator_trigger)i;
-			return 0;
-		}
-	}
-
-	shell_error(sh, "%s not %s", trigger_str, "valid");
-	return -EINVAL;
-}
-
-static int cmd_set_trigger(const struct shell *sh, size_t argc, char **argv)
-{
-	const char *dev_str;
-	const char *trigger_str;
-	int ret;
-	const struct device *dev;
-	enum comparator_trigger trigger;
-
-	ARG_UNUSED(argc);
-
-	dev_str = argv[1];
-	ret = get_device_from_str(sh, dev_str, &dev);
-	if (ret < 0) {
-		return ret;
-	}
-
-	trigger_str = argv[2];
-	ret = get_trigger_from_str(sh, trigger_str, &trigger);
-	if (ret < 0) {
-		return ret;
-	}
-
-	ret = comparator_set_trigger(dev, trigger);
-	if (ret < 0) {
-		shell_error(sh, "failed to %s %s", "set", "trigger");
-		return -EIO;
-	}
-
-	return 0;
-}
-
-static int get_timeout_from_str(const struct shell *sh,
-				const char *timeout_str,
-				k_timeout_t *timeout)
-{
-	long seconds;
-	char *end;
-
-	seconds = strtol(timeout_str, &end, 10);
-	if ((*end != '\0') ||
-	    (seconds < 1) ||
-	    (seconds > AWAIT_TRIGGER_MAX_TIMEOUT)) {
-		shell_error(sh, "%s not %s", timeout_str, "valid");
-		return -EINVAL;
-	}
-
-	*timeout = K_SECONDS(seconds);
-	return 0;
-}
-
-static void trigger_cb(const struct device *dev, void *user_data)
-{
-	ARG_UNUSED(dev);
-	ARG_UNUSED(user_data);
-
-	k_sem_give(&triggered_sem);
-}
-
-static int cmd_await_trigger(const struct shell *sh, size_t argc, char **argv)
-{
-	const char *dev_str;
-	const char *timeout_str;
-	int ret;
-	const struct device *dev;
-	k_timeout_t timeout;
-
-	dev_str = argv[1];
-	ret = get_device_from_str(sh, dev_str, &dev);
-	if (ret < 0) {
-		return ret;
-	}
-
-	if (argc == 3) {
-		timeout_str = argv[2];
-		ret = get_timeout_from_str(sh, timeout_str, &timeout);
-		if (ret < 0) {
-			return ret;
-		}
-	} else {
-		timeout = K_SECONDS(AWAIT_TRIGGER_DEFAULT_TIMEOUT);
-	}
-
-	k_sem_reset(&triggered_sem);
-
-	ret = comparator_set_trigger_callback(dev, trigger_cb, NULL);
-	if (ret < 0) {
-		shell_error(sh, "failed to %s %s", "set", "trigger callback");
-		return -EIO;
-	}
-
-	ret = k_sem_take(&triggered_sem, timeout);
-	if (ret == 0) {
-		shell_print(sh, "triggered");
-	} else if (ret == -EAGAIN) {
-		shell_print(sh, "timed out");
-	} else {
-		shell_error(sh, "internal error");
-	}
-
-	ret = comparator_set_trigger_callback(dev, NULL, NULL);
-	if (ret < 0) {
-		shell_error(sh, "failed to %s %s", "clear", "trigger callback");
-		return -EIO;
-	}
-
-	return 0;
-}
-
-static int cmd_trigger_is_pending(const struct shell *sh, size_t argc, char **argv)
-{
-	int ret;
-	const char *dev_str;
-	const struct device *dev;
-
-	ARG_UNUSED(argc);
-
-	dev_str = argv[1];
-	ret = get_device_from_str(sh, dev_str, &dev);
-	if (ret < 0) {
-		return ret;
-	}
-
-	ret = comparator_trigger_is_pending(dev);
-	if (ret < 0) {
-		shell_error(sh, "failed to %s %s", "get", "trigger status");
-		return -EIO;
-	}
-
-	shell_print(sh, "%i", ret);
-	return 0;
-}
-
-static void dsub_set_trigger_lookup_1(size_t idx, struct shell_static_entry *entry)
-{
-	entry->syntax = (idx < ARRAY_SIZE(trigger_lookup)) ? trigger_lookup[idx] : NULL;
-	entry->handler = NULL;
-	entry->help = NULL;
-	entry->subcmd = NULL;
-}
-
-SHELL_DYNAMIC_CMD_CREATE(dsub_set_trigger_1, dsub_set_trigger_lookup_1);
-
-static void dsub_set_trigger_lookup_0(size_t idx, struct shell_static_entry *entry)
-{
-	const struct device *dev = shell_device_lookup(idx, NULL);
-
-	entry->syntax = dev != NULL ? dev->name : NULL;
-	entry->handler = NULL;
-	entry->help = NULL;
-	entry->subcmd = &dsub_set_trigger_1;
-}
-
-SHELL_DYNAMIC_CMD_CREATE(dsub_set_trigger_0, dsub_set_trigger_lookup_0);
-
-static void dsub_device_lookup_0(size_t idx, struct shell_static_entry *entry)
-{
-	const struct device *dev = shell_device_lookup(idx, NULL);
-
-	entry->syntax = (dev != NULL) ? dev->name : NULL;
-	entry->handler = NULL;
-	entry->help = NULL;
-	entry->subcmd = NULL;
-}
-
-SHELL_DYNAMIC_CMD_CREATE(dsub_device_0, dsub_device_lookup_0);
-
-#define GET_OUTPUT_HELP \
-	("comp get_output <device>")
-
-#define SET_TRIGGER_HELP \
-	("comp set_trigger <device> <NONE | RISING_EDGE | FALLING_EDGE | BOTH_EDGES>")
-
-#define AWAIT_TRIGGER_HELP								\
-	("comp await_trigger <device> [timeout] (default "				\
-	 STRINGIFY(AWAIT_TRIGGER_DEFAULT_TIMEOUT)					\
-	 "s, max "									\
-	 STRINGIFY(AWAIT_TRIGGER_MAX_TIMEOUT)						\
-	 "s)")
-
-#define TRIGGER_PENDING_HELP \
-	("comp trigger_is_pending <device>")
-
-SHELL_STATIC_SUBCMD_SET_CREATE(
-	sub_comp,
-	SHELL_CMD_ARG(get_output, &dsub_device_0, GET_OUTPUT_HELP, cmd_get_output, 2, 0),
-	SHELL_CMD_ARG(set_trigger, &dsub_set_trigger_0, SET_TRIGGER_HELP, cmd_set_trigger, 3, 0),
-	SHELL_CMD_ARG(await_trigger, &dsub_device_0, AWAIT_TRIGGER_HELP, cmd_await_trigger, 2, 1),
-	SHELL_CMD_ARG(trigger_is_pending, &dsub_device_0, TRIGGER_PENDING_HELP,
-		      cmd_trigger_is_pending, 2, 1),
-	SHELL_SUBCMD_SET_END
-);
-
-SHELL_CMD_REGISTER(comp, &sub_comp, "Comparator device commands", NULL);

From a0484785ab7ed4f1b055a9d00e22d5cedeed469e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:39 +0100
Subject: [PATCH 1587/2913] Revert "[nrf fromtree] tests: drivers: build_all:
 comparator: add mcux_acmp"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6ec7d9e47e07ae19c352bf6db2a2696b0139d2ba.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../mcux_acmp/mimxrt1176_mux_dac.dts          | 46 -------------------
 .../mcux_acmp/mimxrt1176_mux_mux.dts          | 26 -----------
 .../comparator/mcux_acmp/mke15z7_mux_dac.dts  | 22 ---------
 .../comparator/mcux_acmp/mke15z7_mux_mux.dts  | 16 -------
 .../comparator/mcux_acmp/mke15z7_pinctrl.dtsi | 20 --------
 .../build_all/comparator/testcase.yaml        | 22 ---------
 6 files changed, 152 deletions(-)
 delete mode 100644 tests/drivers/build_all/comparator/mcux_acmp/mimxrt1176_mux_dac.dts
 delete mode 100644 tests/drivers/build_all/comparator/mcux_acmp/mimxrt1176_mux_mux.dts
 delete mode 100644 tests/drivers/build_all/comparator/mcux_acmp/mke15z7_mux_dac.dts
 delete mode 100644 tests/drivers/build_all/comparator/mcux_acmp/mke15z7_mux_mux.dts
 delete mode 100644 tests/drivers/build_all/comparator/mcux_acmp/mke15z7_pinctrl.dtsi

diff --git a/tests/drivers/build_all/comparator/mcux_acmp/mimxrt1176_mux_dac.dts b/tests/drivers/build_all/comparator/mcux_acmp/mimxrt1176_mux_dac.dts
deleted file mode 100644
index 86ee224d74c..00000000000
--- a/tests/drivers/build_all/comparator/mcux_acmp/mimxrt1176_mux_dac.dts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&pinctrl {
-	acmp1_default: acmp1_default {
-		group0 {
-			pinmux = <&iomuxc_gpio_ad_01_acmp1_in2>;
-			drive-strength = "high";
-			bias-pull-up;
-			slew-rate = "fast";
-		};
-	};
-};
-
-&acmp1 {
-	status = "okay";
-	pinctrl-0 = <&acmp1_default>;
-	pinctrl-names = "default";
-
-	positive-mux-input = "IN2";
-	positive-port-input = "MUX";
-	negative-mux-input = "IN2";
-	negative-port-input = "DAC";
-
-	dac-vref-source = "VIN1";
-	dac-value = <128>;
-	dac-enable;
-
-	offset-mode = "LEVEL0";
-	hysteresis-mode = "LEVEL0";
-	enable-high-speed-mode;
-
-	filter-enable-sample;
-	filter-count = <4>;
-	filter-period = <32>;
-
-	discrete-mode-enable-positive-channel;
-	discrete-mode-enable-resistor-divider;
-	discrete-mode-clock-source = "FAST";
-	discrete-mode-sample-time = "T1";
-	discrete-mode-phase1-time = "ALT4";
-	discrete-mode-phase2-time = "ALT7";
-};
diff --git a/tests/drivers/build_all/comparator/mcux_acmp/mimxrt1176_mux_mux.dts b/tests/drivers/build_all/comparator/mcux_acmp/mimxrt1176_mux_mux.dts
deleted file mode 100644
index a240e8ce4fb..00000000000
--- a/tests/drivers/build_all/comparator/mcux_acmp/mimxrt1176_mux_mux.dts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&pinctrl {
-	acmp1_default: acmp1_default {
-		group0 {
-			pinmux = <&iomuxc_gpio_ad_00_acmp1_in1>,
-				 <&iomuxc_gpio_ad_01_acmp1_in2>;
-			drive-strength = "high";
-			bias-pull-up;
-			slew-rate = "fast";
-		};
-	};
-};
-
-&acmp1 {
-	status = "okay";
-	pinctrl-0 = <&acmp1_default>;
-	pinctrl-names = "default";
-
-	positive-mux-input = "IN1";
-	negative-mux-input = "IN2";
-};
diff --git a/tests/drivers/build_all/comparator/mcux_acmp/mke15z7_mux_dac.dts b/tests/drivers/build_all/comparator/mcux_acmp/mke15z7_mux_dac.dts
deleted file mode 100644
index 23f8bb7c4fd..00000000000
--- a/tests/drivers/build_all/comparator/mcux_acmp/mke15z7_mux_dac.dts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "mke15z7_pinctrl.dtsi"
-
-&cmp0 {
-	pinctrl-0 = <&cmp0_default>;
-	pinctrl-names = "default";
-	status = "okay";
-
-	positive-mux-input = "IN0";
-	positive-port-input = "MUX";
-	negative-mux-input = "IN0";
-	negative-port-input = "DAC";
-
-	dac-vref-source = "VIN1";
-	dac-value = <128>;
-	dac-enable;
-};
diff --git a/tests/drivers/build_all/comparator/mcux_acmp/mke15z7_mux_mux.dts b/tests/drivers/build_all/comparator/mcux_acmp/mke15z7_mux_mux.dts
deleted file mode 100644
index 61e0353d5db..00000000000
--- a/tests/drivers/build_all/comparator/mcux_acmp/mke15z7_mux_mux.dts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "mke15z7_pinctrl.dtsi"
-
-&cmp0 {
-	pinctrl-0 = <&cmp0_default>;
-	pinctrl-names = "default";
-	status = "okay";
-
-	positive-mux-input = "IN0";
-	negative-mux-input = "IN1";
-};
diff --git a/tests/drivers/build_all/comparator/mcux_acmp/mke15z7_pinctrl.dtsi b/tests/drivers/build_all/comparator/mcux_acmp/mke15z7_pinctrl.dtsi
deleted file mode 100644
index 62bddf7b924..00000000000
--- a/tests/drivers/build_all/comparator/mcux_acmp/mke15z7_pinctrl.dtsi
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <nxp/kinetis/MKE17Z256VLL7-pinctrl.h>
-
-&pinctrl {
-	cmp0_default: cmp0_default {
-		group0 {
-			pinmux = <ACMP0_IN0_PTA0>,
-				 <ACMP0_IN1_PTA1>,
-				 <ACMP0_OUT_PTA4>,
-				 <ACMP0_IN5_PTC2>;
-
-			drive-strength = "high";
-		};
-	};
-};
diff --git a/tests/drivers/build_all/comparator/testcase.yaml b/tests/drivers/build_all/comparator/testcase.yaml
index a0578daa9ff..8dbc9dfb32a 100644
--- a/tests/drivers/build_all/comparator/testcase.yaml
+++ b/tests/drivers/build_all/comparator/testcase.yaml
@@ -66,25 +66,3 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf9280pdk/nrf9280/cpuapp
-  drivers.build_all.comparator.mcux_acmp.mimxrt1176_mux_dac:
-    extra_args:
-      - DTC_OVERLAY_FILE="mcux_acmp/mimxrt1176_mux_dac.dts"
-    platform_allow:
-      - mimxrt1170_evk/mimxrt1176/cm4
-      - mimxrt1170_evk/mimxrt1176/cm7
-  drivers.build_all.comparator.mcux_acmp.mimxrt1176_mux_mux:
-    extra_args:
-      - DTC_OVERLAY_FILE="mcux_acmp/mimxrt1176_mux_mux.dts"
-    platform_allow:
-      - mimxrt1170_evk/mimxrt1176/cm4
-      - mimxrt1170_evk/mimxrt1176/cm7
-  drivers.build_all.comparator.mcux_acmp.mke15z7_mux_dac:
-    extra_args:
-      - DTC_OVERLAY_FILE="mcux_acmp/mke15z7_mux_dac.dts"
-    platform_allow:
-      - frdm_ke15z
-  drivers.build_all.comparator.mcux_acmp.mke15z7_mux_mux:
-    extra_args:
-      - DTC_OVERLAY_FILE="mcux_acmp/mke15z7_mux_mux.dts"
-    platform_allow:
-      - frdm_ke15z

From 186a08679130a6139bc6d8189c78be0d660405fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:39 +0100
Subject: [PATCH 1588/2913] Revert "[nrf fromtree] drivers: comparator: add
 mcux acmp device driver"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 36eceeff4a4f548af4cd060a7a7041a21d4e5f19.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/comparator/CMakeLists.txt             |   1 -
 drivers/comparator/Kconfig                    |   1 -
 drivers/comparator/Kconfig.mcux_acmp          |   9 -
 drivers/comparator/comparator_mcux_acmp.c     | 651 ------------------
 dts/bindings/comparator/nxp,kinetis-acmp.yaml |  34 +-
 include/zephyr/drivers/comparator/mcux_acmp.h | 136 ----
 6 files changed, 1 insertion(+), 831 deletions(-)
 delete mode 100644 drivers/comparator/Kconfig.mcux_acmp
 delete mode 100644 drivers/comparator/comparator_mcux_acmp.c
 delete mode 100644 include/zephyr/drivers/comparator/mcux_acmp.h

diff --git a/drivers/comparator/CMakeLists.txt b/drivers/comparator/CMakeLists.txt
index b5fe633a333..d0dc726bf58 100644
--- a/drivers/comparator/CMakeLists.txt
+++ b/drivers/comparator/CMakeLists.txt
@@ -6,6 +6,5 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/comparator.h)
 zephyr_library()
 
 zephyr_library_sources_ifdef(CONFIG_USERSPACE comparator_handlers.c)
-zephyr_library_sources_ifdef(CONFIG_COMPARATOR_MCUX_ACMP comparator_mcux_acmp.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_COMP comparator_nrf_comp.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_LPCOMP comparator_nrf_lpcomp.c)
diff --git a/drivers/comparator/Kconfig b/drivers/comparator/Kconfig
index 871ee5d9ed6..819936024b9 100644
--- a/drivers/comparator/Kconfig
+++ b/drivers/comparator/Kconfig
@@ -18,7 +18,6 @@ config COMPARATOR_INIT_PRIORITY
 	help
 	  Comparator device driver initialization priority.
 
-rsource "Kconfig.mcux_acmp"
 rsource "Kconfig.nrf_comp"
 rsource "Kconfig.nrf_lpcomp"
 
diff --git a/drivers/comparator/Kconfig.mcux_acmp b/drivers/comparator/Kconfig.mcux_acmp
deleted file mode 100644
index 8109cb1cdd2..00000000000
--- a/drivers/comparator/Kconfig.mcux_acmp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config COMPARATOR_MCUX_ACMP
-	bool "NXP MCUX ACMP comparator driver"
-	default y
-	depends on DT_HAS_NXP_KINETIS_ACMP_ENABLED
-	select PINCTRL
-	select MCUX_ACMP
diff --git a/drivers/comparator/comparator_mcux_acmp.c b/drivers/comparator/comparator_mcux_acmp.c
deleted file mode 100644
index 4d76f105e34..00000000000
--- a/drivers/comparator/comparator_mcux_acmp.c
+++ /dev/null
@@ -1,651 +0,0 @@
-/*
- * Copyright (c) 2020 Vestas Wind Systems A/S
- * Copyright (c) 2022 NXP
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <fsl_acmp.h>
-
-#include <zephyr/kernel.h>
-#include <zephyr/pm/device.h>
-#include <zephyr/drivers/comparator.h>
-#include <zephyr/drivers/comparator/mcux_acmp.h>
-#include <zephyr/drivers/pinctrl.h>
-#include <zephyr/irq.h>
-
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(nxp_kinetis_acmp, CONFIG_COMPARATOR_LOG_LEVEL);
-
-#define DT_DRV_COMPAT nxp_kinetis_acmp
-
-/*
- * DAC is a register defined in the MCUX HAL. We don't need it here and it conflicts
- * with the COMP_MCUX_ACMP_PORT_INPUT_DAC definition so undef it here.
- */
-#ifdef DAC
-#undef DAC
-#endif
-
-#if defined(FSL_FEATURE_ACMP_HAS_C0_OFFSET_BIT) && (FSL_FEATURE_ACMP_HAS_C0_OFFSET_BIT == 1U)
-#define COMP_MCUX_ACMP_HAS_OFFSET 1
-#else
-#define COMP_MCUX_ACMP_HAS_OFFSET 0
-#endif
-
-#if defined(FSL_FEATURE_ACMP_HAS_C0_HYSTCTR_BIT) && (FSL_FEATURE_ACMP_HAS_C0_HYSTCTR_BIT == 1U)
-#define COMP_MCUX_ACMP_HAS_HYSTERESIS 1
-#else
-#define COMP_MCUX_ACMP_HAS_HYSTERESIS 0
-#endif
-
-#if defined(FSL_FEATURE_ACMP_HAS_C1_INPSEL_BIT) && (FSL_FEATURE_ACMP_HAS_C1_INPSEL_BIT == 1U)
-#define COMP_MCUX_ACMP_HAS_INPSEL 1
-#else
-#define COMP_MCUX_ACMP_HAS_INPSEL 0
-#endif
-
-#if defined(FSL_FEATURE_ACMP_HAS_C1_INNSEL_BIT) && (FSL_FEATURE_ACMP_HAS_C1_INNSEL_BIT == 1U)
-#define COMP_MCUX_ACMP_HAS_INNSEL 1
-#else
-#define COMP_MCUX_ACMP_HAS_INNSEL 0
-#endif
-
-#if defined(FSL_FEATURE_ACMP_HAS_C1_DACOE_BIT) && (FSL_FEATURE_ACMP_HAS_C1_DACOE_BIT == 1U)
-#define COMP_MCUX_ACMP_HAS_DAC_OUT_ENABLE 1
-#else
-#define COMP_MCUX_ACMP_HAS_DAC_OUT_ENABLE 0
-#endif
-
-#if defined(FSL_FEATURE_ACMP_HAS_C1_DMODE_BIT) && (FSL_FEATURE_ACMP_HAS_C1_DMODE_BIT == 1U)
-#define COMP_MCUX_ACMP_HAS_DAC_WORK_MODE 1
-#else
-#define COMP_MCUX_ACMP_HAS_DAC_WORK_MODE 0
-#endif
-
-#if defined(FSL_FEATURE_ACMP_HAS_C3_REG) && (FSL_FEATURE_ACMP_HAS_C3_REG != 0U)
-#define COMP_MCUX_ACMP_HAS_DISCRETE_MODE 1
-#else
-#define COMP_MCUX_ACMP_HAS_DISCRETE_MODE 0
-#endif
-
-#if !(defined(FSL_FEATURE_ACMP_HAS_NO_WINDOW_MODE) && (FSL_FEATURE_ACMP_HAS_NO_WINDOW_MODE == 1U))
-#define COMP_MCUX_ACMP_HAS_WINDOW_MODE 1
-#else
-#define COMP_MCUX_ACMP_HAS_WINDOW_MODE 0
-#endif
-
-#define MCUX_ACMP_ENUM(name, value) \
-	_CONCAT_4(COMP_MCUX_ACMP_, name, _, value)
-
-#define MCUX_ACMP_DT_INST_ENUM(inst, name, prop) \
-	MCUX_ACMP_ENUM(name, DT_INST_STRING_TOKEN(inst, prop))
-
-#define MCUX_ACMP_DT_INST_ENUM_OR(inst, name, prop, or)						\
-	COND_CODE_1(DT_INST_NODE_HAS_PROP(inst, prop),						\
-		    (MCUX_ACMP_DT_INST_ENUM(inst, name, prop)),					\
-		    (MCUX_ACMP_ENUM(name, or)))
-
-#define MCUX_ACMP_DT_INST_OFFSET_MODE(inst) \
-	MCUX_ACMP_DT_INST_ENUM_OR(inst, OFFSET_MODE, offset_mode, LEVEL0)
-
-#define MCUX_ACMP_DT_INST_HYST_MODE(inst) \
-	MCUX_ACMP_DT_INST_ENUM_OR(inst, HYSTERESIS_MODE, hysteresis_mode, LEVEL0)
-
-#define MCUX_ACMP_DT_INST_EN_HS_MODE(inst) \
-	DT_INST_PROP(inst, enable_high_speed_mode)
-
-#define MCUX_ACMP_DT_INST_INV_OUT(inst) \
-	DT_INST_PROP(inst, invert_output)
-
-#define MCUX_ACMP_DT_INST_USE_UNFILTERED_OUT(inst) \
-	DT_INST_PROP(inst, use_unfiltered_output)
-
-#define MCUX_ACMP_DT_INST_EN_PIN_OUT(inst) \
-	DT_INST_PROP(inst, enable_pin_out)
-
-#define MCUX_ACMP_DT_INST_MODE_CONFIG_INIT(inst)						\
-	{											\
-		.offset_mode = MCUX_ACMP_DT_INST_OFFSET_MODE(inst),				\
-		.hysteresis_mode = MCUX_ACMP_DT_INST_HYST_MODE(inst),				\
-		.enable_high_speed_mode = MCUX_ACMP_DT_INST_EN_HS_MODE(inst),			\
-		.invert_output = MCUX_ACMP_DT_INST_INV_OUT(inst),				\
-		.use_unfiltered_output = MCUX_ACMP_DT_INST_USE_UNFILTERED_OUT(inst),		\
-		.enable_pin_output = MCUX_ACMP_DT_INST_EN_PIN_OUT(inst),			\
-	}
-
-#define MCUX_ACMP_DT_INST_P_MUX_IN(inst) \
-	MCUX_ACMP_DT_INST_ENUM(inst, MUX_INPUT, positive_mux_input)
-
-#define MCUX_ACMP_DT_INST_N_MUX_IN(inst) \
-	MCUX_ACMP_DT_INST_ENUM(inst, MUX_INPUT, negative_mux_input)
-
-#define MCUX_ACMP_DT_INST_P_PORT_IN(inst) \
-	MCUX_ACMP_DT_INST_ENUM_OR(inst, PORT_INPUT, positive_port_input, MUX)
-
-#define MCUX_ACMP_DT_INST_N_PORT_IN(inst) \
-	MCUX_ACMP_DT_INST_ENUM_OR(inst, PORT_INPUT, negative_port_input, MUX)
-
-#define MCUX_ACMP_DT_INST_INPUT_CONFIG_INIT(inst)						\
-	{											\
-		.positive_mux_input = MCUX_ACMP_DT_INST_P_MUX_IN(inst),				\
-		.negative_mux_input = MCUX_ACMP_DT_INST_N_MUX_IN(inst),				\
-		.positive_port_input = MCUX_ACMP_DT_INST_P_PORT_IN(inst),			\
-		.negative_port_input = MCUX_ACMP_DT_INST_N_PORT_IN(inst),			\
-	}
-
-#define MCUX_ACMP_DT_INST_FILTER_EN_SAMPLE(inst) \
-	DT_INST_PROP(inst, filter_enable_sample)
-
-#define MCUX_ACMP_DT_INST_FILTER_COUNT(inst) \
-	DT_INST_PROP_OR(inst, filter_count, 0)
-
-#define MCUX_ACMP_DT_INST_FILTER_PERIOD(inst) \
-	DT_INST_PROP_OR(inst, filter_period, 0)
-
-#define MCUX_ACMP_DT_INST_FILTER_CONFIG_INIT(inst)						\
-	{											\
-		.enable_sample = MCUX_ACMP_DT_INST_FILTER_EN_SAMPLE(inst),			\
-		.filter_count = MCUX_ACMP_DT_INST_FILTER_COUNT(inst),				\
-		.filter_period = MCUX_ACMP_DT_INST_FILTER_PERIOD(inst),				\
-	}
-
-#define MCUX_ACMP_DT_INST_DAC_VREF_SOURCE(inst) \
-	MCUX_ACMP_DT_INST_ENUM_OR(inst, DAC_VREF_SOURCE, dac_vref_source, VIN1)
-
-#define MCUX_ACMP_DT_INST_DAC_VALUE(inst) \
-	DT_INST_PROP_OR(inst, dac_value, 0)
-
-#define MCUX_ACMP_DT_INST_DAC_EN(inst) \
-	DT_INST_PROP(inst, dac_enable)
-
-#define MCUX_ACMP_DT_INST_DAC_EN_HS(inst) \
-	DT_INST_PROP(inst, dac_enable_high_speed)
-
-#define MCUX_ACMP_DT_INST_DAC_CONFIG_INIT(inst)							\
-	{											\
-		.vref_source = MCUX_ACMP_DT_INST_DAC_VREF_SOURCE(inst),				\
-		.value = MCUX_ACMP_DT_INST_DAC_VALUE(inst),					\
-		.enable_output = MCUX_ACMP_DT_INST_DAC_EN(inst),				\
-		.enable_high_speed_mode = MCUX_ACMP_DT_INST_DAC_EN_HS(inst),			\
-	}
-
-#define MCUX_ACMP_DT_INST_DM_EN_P_CH(inst) \
-	DT_INST_PROP(inst, discrete_mode_enable_positive_channel)
-
-#define MCUX_ACMP_DT_INST_DM_EN_N_CH(inst) \
-	DT_INST_PROP(inst, discrete_mode_enable_negative_channel)
-
-#define MCUX_ACMP_DT_INST_DM_EN_RES_DIV(inst) \
-	DT_INST_PROP(inst, discrete_mode_enable_resistor_divider)
-
-#define MCUX_ACMP_DT_INST_DM_CLOCK_SOURCE(inst) \
-	MCUX_ACMP_DT_INST_ENUM_OR(inst, DM_CLOCK, discrete_mode_clock_source, SLOW)
-
-#define MCUX_ACMP_DT_INST_DM_SAMPLE_TIME(inst) \
-	MCUX_ACMP_DT_INST_ENUM_OR(inst, DM_SAMPLE_TIME, discrete_mode_sample_time, T1)
-
-#define MCUX_ACMP_DT_INST_DM_PHASE1_TIME(inst) \
-	MCUX_ACMP_DT_INST_ENUM_OR(inst, DM_PHASE_TIME, discrete_mode_phase1_time, ALT0)
-
-#define MCUX_ACMP_DT_INST_DM_PHASE2_TIME(inst) \
-	MCUX_ACMP_DT_INST_ENUM_OR(inst, DM_PHASE_TIME, discrete_mode_phase2_time, ALT0)
-
-#define MCUX_ACMP_DT_INST_DM_CONFIG_INIT(inst)							\
-	{											\
-		.enable_positive_channel = MCUX_ACMP_DT_INST_DM_EN_P_CH(inst),			\
-		.enable_negative_channel = MCUX_ACMP_DT_INST_DM_EN_N_CH(inst),			\
-		.enable_resistor_divider = MCUX_ACMP_DT_INST_DM_EN_RES_DIV(inst),		\
-		.clock_source = MCUX_ACMP_DT_INST_DM_CLOCK_SOURCE(inst),			\
-		.sample_time = MCUX_ACMP_DT_INST_DM_SAMPLE_TIME(inst),				\
-		.phase1_time = MCUX_ACMP_DT_INST_DM_PHASE1_TIME(inst),				\
-		.phase2_time = MCUX_ACMP_DT_INST_DM_PHASE2_TIME(inst),				\
-	}
-
-#define MCUX_ACMP_DT_INST_EN_WINDOW_MODE(inst) \
-	DT_INST_PROP(inst, enable_window_mode)
-
-struct mcux_acmp_config {
-	CMP_Type *base;
-	const struct pinctrl_dev_config *pincfg;
-	void (*irq_init)(void);
-	const struct comp_mcux_acmp_mode_config mode_config;
-	const struct comp_mcux_acmp_input_config input_config;
-	const struct comp_mcux_acmp_filter_config filter_config;
-	const struct comp_mcux_acmp_dac_config dac_config;
-#if COMP_MCUX_ACMP_HAS_DISCRETE_MODE
-	const struct comp_mcux_acmp_dm_config dm_config;
-#endif
-#if COMP_MCUX_ACMP_HAS_WINDOW_MODE
-	bool enable_window_mode;
-#endif
-};
-
-#if MCUX_ACMP_HAS_OFFSET
-BUILD_ASSERT((int)kACMP_OffsetLevel0 == (int)COMP_MCUX_ACMP_OFFSET_MODE_LEVEL0);
-BUILD_ASSERT((int)kACMP_OffsetLevel1 == (int)COMP_MCUX_ACMP_OFFSET_MODE_LEVEL1);
-#endif
-
-#if COMP_MCUX_ACMP_HAS_HYSTERESIS
-BUILD_ASSERT((int)kACMP_HysteresisLevel0 == (int)COMP_MCUX_ACMP_HYSTERESIS_MODE_LEVEL0);
-BUILD_ASSERT((int)kACMP_HysteresisLevel1 == (int)COMP_MCUX_ACMP_HYSTERESIS_MODE_LEVEL1);
-BUILD_ASSERT((int)kACMP_HysteresisLevel2 == (int)COMP_MCUX_ACMP_HYSTERESIS_MODE_LEVEL2);
-BUILD_ASSERT((int)kACMP_HysteresisLevel3 == (int)COMP_MCUX_ACMP_HYSTERESIS_MODE_LEVEL3);
-#endif
-
-BUILD_ASSERT((int)kACMP_VrefSourceVin1 == (int)COMP_MCUX_ACMP_DAC_VREF_SOURCE_VIN1);
-BUILD_ASSERT((int)kACMP_VrefSourceVin2 == (int)COMP_MCUX_ACMP_DAC_VREF_SOURCE_VIN2);
-
-#if MCUX_ACMP_HAS_INPSEL || MCUX_ACMP_HAS_INNSEL
-BUILD_ASSERT((int)kACMP_PortInputFromDAC == (int)COMP_MCUX_ACMP_PORT_INPUT_DAC);
-BUILD_ASSERT((int)kACMP_PortInputFromMux == (int)COMP_MCUX_ACMP_PORT_INPUT_MUX);
-#endif
-
-#if COMP_MCUX_ACMP_HAS_DISCRETE_MODE
-BUILD_ASSERT((int)kACMP_DiscreteClockSlow == (int)COMP_MCUX_ACMP_DM_CLOCK_SLOW);
-BUILD_ASSERT((int)kACMP_DiscreteClockFast == (int)COMP_MCUX_ACMP_DM_CLOCK_FAST);
-
-BUILD_ASSERT((int)kACMP_DiscreteSampleTimeAs1T == (int)COMP_MCUX_ACMP_DM_SAMPLE_TIME_T1);
-BUILD_ASSERT((int)kACMP_DiscreteSampleTimeAs2T == (int)COMP_MCUX_ACMP_DM_SAMPLE_TIME_T2);
-BUILD_ASSERT((int)kACMP_DiscreteSampleTimeAs4T == (int)COMP_MCUX_ACMP_DM_SAMPLE_TIME_T4);
-BUILD_ASSERT((int)kACMP_DiscreteSampleTimeAs8T == (int)COMP_MCUX_ACMP_DM_SAMPLE_TIME_T8);
-BUILD_ASSERT((int)kACMP_DiscreteSampleTimeAs16T == (int)COMP_MCUX_ACMP_DM_SAMPLE_TIME_T16);
-BUILD_ASSERT((int)kACMP_DiscreteSampleTimeAs32T == (int)COMP_MCUX_ACMP_DM_SAMPLE_TIME_T32);
-BUILD_ASSERT((int)kACMP_DiscreteSampleTimeAs64T == (int)COMP_MCUX_ACMP_DM_SAMPLE_TIME_T64);
-BUILD_ASSERT((int)kACMP_DiscreteSampleTimeAs256T == (int)COMP_MCUX_ACMP_DM_SAMPLE_TIME_T256);
-
-BUILD_ASSERT((int)kACMP_DiscretePhaseTimeAlt0 == (int)COMP_MCUX_ACMP_DM_PHASE_TIME_ALT0);
-BUILD_ASSERT((int)kACMP_DiscretePhaseTimeAlt1 == (int)COMP_MCUX_ACMP_DM_PHASE_TIME_ALT1);
-BUILD_ASSERT((int)kACMP_DiscretePhaseTimeAlt2 == (int)COMP_MCUX_ACMP_DM_PHASE_TIME_ALT2);
-BUILD_ASSERT((int)kACMP_DiscretePhaseTimeAlt3 == (int)COMP_MCUX_ACMP_DM_PHASE_TIME_ALT3);
-BUILD_ASSERT((int)kACMP_DiscretePhaseTimeAlt4 == (int)COMP_MCUX_ACMP_DM_PHASE_TIME_ALT4);
-BUILD_ASSERT((int)kACMP_DiscretePhaseTimeAlt5 == (int)COMP_MCUX_ACMP_DM_PHASE_TIME_ALT5);
-BUILD_ASSERT((int)kACMP_DiscretePhaseTimeAlt6 == (int)COMP_MCUX_ACMP_DM_PHASE_TIME_ALT6);
-BUILD_ASSERT((int)kACMP_DiscretePhaseTimeAlt7 == (int)COMP_MCUX_ACMP_DM_PHASE_TIME_ALT7);
-#endif
-
-struct mcux_acmp_data {
-	uint32_t interrupt_mask;
-	comparator_callback_t callback;
-	void *user_data;
-};
-
-#if CONFIG_PM_DEVICE
-static bool mcux_acmp_is_resumed(const struct device *dev)
-{
-	enum pm_device_state state;
-
-	(void)pm_device_state_get(dev, &state);
-	return state == PM_DEVICE_STATE_ACTIVE;
-}
-#else
-static bool mcux_acmp_is_resumed(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-	return true;
-}
-#endif
-
-static int mcux_acmp_get_output(const struct device *dev)
-{
-	const struct mcux_acmp_config *config = dev->config;
-	uint32_t status;
-
-	status = ACMP_GetStatusFlags(config->base);
-	return (status & kACMP_OutputAssertEventFlag) ? 1 : 0;
-}
-
-static int mcux_acmp_set_trigger(const struct device *dev,
-				 enum comparator_trigger trigger)
-{
-	const struct mcux_acmp_config *config = dev->config;
-	struct mcux_acmp_data *data = dev->data;
-
-	ACMP_DisableInterrupts(config->base, UINT32_MAX);
-
-	switch (trigger) {
-	case COMPARATOR_TRIGGER_NONE:
-		data->interrupt_mask = 0;
-		break;
-
-	case COMPARATOR_TRIGGER_RISING_EDGE:
-		data->interrupt_mask = kACMP_OutputRisingInterruptEnable;
-		break;
-
-	case COMPARATOR_TRIGGER_FALLING_EDGE:
-		data->interrupt_mask = kACMP_OutputFallingInterruptEnable;
-		break;
-
-	case COMPARATOR_TRIGGER_BOTH_EDGES:
-		data->interrupt_mask = kACMP_OutputFallingInterruptEnable |
-				       kACMP_OutputRisingInterruptEnable;
-		break;
-	}
-
-	if (data->interrupt_mask && data->callback != NULL) {
-		ACMP_EnableInterrupts(config->base, data->interrupt_mask);
-	}
-
-	return 0;
-}
-
-static int mcux_acmp_set_trigger_callback(const struct device *dev,
-					  comparator_callback_t callback,
-					  void *user_data)
-{
-	const struct mcux_acmp_config *config = dev->config;
-	struct mcux_acmp_data *data = dev->data;
-
-	ACMP_DisableInterrupts(config->base, UINT32_MAX);
-
-	data->callback = callback;
-	data->user_data = user_data;
-
-	if (data->callback == NULL) {
-		return 0;
-	}
-
-	if (data->interrupt_mask) {
-		ACMP_EnableInterrupts(config->base, data->interrupt_mask);
-	}
-
-	return 0;
-}
-
-static int mcux_acmp_trigger_is_pending(const struct device *dev)
-{
-	const struct mcux_acmp_config *config = dev->config;
-	struct mcux_acmp_data *data = dev->data;
-	uint32_t status_flags;
-
-	status_flags = ACMP_GetStatusFlags(config->base);
-	ACMP_ClearStatusFlags(config->base, UINT32_MAX);
-
-	if ((data->interrupt_mask & kACMP_OutputRisingInterruptEnable) &&
-	    (status_flags & kACMP_OutputRisingEventFlag)) {
-		return 1;
-	}
-
-	if ((data->interrupt_mask & kACMP_OutputFallingInterruptEnable) &&
-	    (status_flags & kACMP_OutputFallingEventFlag)) {
-		return 1;
-	}
-
-	return 0;
-}
-
-static const struct comparator_driver_api mcux_acmp_comp_api = {
-	.get_output = mcux_acmp_get_output,
-	.set_trigger = mcux_acmp_set_trigger,
-	.set_trigger_callback = mcux_acmp_set_trigger_callback,
-	.trigger_is_pending = mcux_acmp_trigger_is_pending,
-};
-
-static void comp_mcux_acmp_init_mode_config(const struct device *dev,
-					    const struct comp_mcux_acmp_mode_config *config)
-{
-	const struct mcux_acmp_config *dev_config = dev->config;
-	acmp_config_t acmp_config;
-
-#if COMP_MCUX_ACMP_HAS_OFFSET
-	acmp_config.offsetMode = (acmp_offset_mode_t)config->offset_mode;
-#endif
-
-#if COMP_MCUX_ACMP_HAS_HYSTERESIS
-	acmp_config.hysteresisMode = (acmp_hysteresis_mode_t)config->hysteresis_mode;
-#endif
-
-	acmp_config.enableHighSpeed = config->enable_high_speed_mode;
-	acmp_config.enableInvertOutput = config->invert_output;
-	acmp_config.useUnfilteredOutput = config->use_unfiltered_output;
-	acmp_config.enablePinOut = config->enable_pin_output;
-
-	ACMP_Init(dev_config->base, &acmp_config);
-}
-
-int comp_mcux_acmp_set_mode_config(const struct device *dev,
-				   const struct comp_mcux_acmp_mode_config *config)
-{
-	const struct mcux_acmp_config *dev_config = dev->config;
-
-	comp_mcux_acmp_init_mode_config(dev, config);
-
-	if (mcux_acmp_is_resumed(dev)) {
-		ACMP_Enable(dev_config->base, true);
-	}
-
-	return 0;
-}
-
-int comp_mcux_acmp_set_input_config(const struct device *dev,
-				    const struct comp_mcux_acmp_input_config *config)
-{
-	const struct mcux_acmp_config *dev_config = dev->config;
-	acmp_channel_config_t acmp_channel_config;
-
-#if COMP_MCUX_ACMP_HAS_INPSEL
-	acmp_channel_config.positivePortInput = (acmp_port_input_t)config->positive_port_input;
-#endif
-
-	acmp_channel_config.plusMuxInput = (uint32_t)config->positive_mux_input;
-
-#if COMP_MCUX_ACMP_HAS_INNSEL
-	acmp_channel_config.negativePortInput = (acmp_port_input_t)config->negative_port_input;
-#endif
-
-	acmp_channel_config.minusMuxInput = (uint32_t)config->negative_mux_input;
-
-	ACMP_SetChannelConfig(dev_config->base, &acmp_channel_config);
-	return 0;
-}
-
-int comp_mcux_acmp_set_filter_config(const struct device *dev,
-				     const struct comp_mcux_acmp_filter_config *config)
-{
-	const struct mcux_acmp_config *dev_config = dev->config;
-	acmp_filter_config_t acmp_filter_config;
-
-	if (config->enable_sample && config->filter_count == 0) {
-		return -EINVAL;
-	}
-
-	if (config->filter_count > 7) {
-		return -EINVAL;
-	}
-
-	acmp_filter_config.enableSample = config->enable_sample;
-	acmp_filter_config.filterCount = config->filter_count;
-	acmp_filter_config.filterPeriod = config->filter_period;
-
-	ACMP_SetFilterConfig(dev_config->base, &acmp_filter_config);
-	return 0;
-}
-
-int comp_mcux_acmp_set_dac_config(const struct device *dev,
-				  const struct comp_mcux_acmp_dac_config *config)
-{
-	const struct mcux_acmp_config *dev_config = dev->config;
-	acmp_dac_config_t acmp_dac_config;
-
-	acmp_dac_config.referenceVoltageSource =
-		(acmp_reference_voltage_source_t)config->vref_source;
-
-	acmp_dac_config.DACValue = config->value;
-
-#if COMP_MCUX_ACMP_HAS_DAC_OUT_ENABLE
-	acmp_dac_config.enableOutput = config->enable_output;
-#endif
-
-#if COMP_MCUX_ACMP_HAS_DAC_WORK_MODE
-	acmp_dac_config.workMode = config->enable_high_speed_mode
-				 ? kACMP_DACWorkHighSpeedMode
-				 : kACMP_DACWorkLowSpeedMode;
-#endif
-
-	ACMP_SetDACConfig(dev_config->base, &acmp_dac_config);
-	return 0;
-}
-
-#if COMP_MCUX_ACMP_HAS_DISCRETE_MODE
-int comp_mcux_acmp_set_dm_config(const struct device *dev,
-				 const struct comp_mcux_acmp_dm_config *config)
-{
-	const struct mcux_acmp_config *dev_config = dev->config;
-	acmp_discrete_mode_config_t acmp_dm_config;
-
-	acmp_dm_config.enablePositiveChannelDiscreteMode = config->enable_positive_channel;
-	acmp_dm_config.enableNegativeChannelDiscreteMode = config->enable_negative_channel;
-	acmp_dm_config.enableResistorDivider = config->enable_resistor_divider;
-	acmp_dm_config.clockSource = (acmp_discrete_clock_source_t)config->clock_source;
-	acmp_dm_config.sampleTime = (acmp_discrete_sample_time_t)config->sample_time;
-	acmp_dm_config.phase1Time = (acmp_discrete_phase_time_t)config->phase1_time;
-	acmp_dm_config.phase2Time = (acmp_discrete_phase_time_t)config->phase2_time;
-
-	ACMP_SetDiscreteModeConfig(dev_config->base, &acmp_dm_config);
-	return 0;
-}
-#endif
-
-#if COMP_MCUX_ACMP_HAS_WINDOW_MODE
-int comp_mcux_acmp_set_window_mode(const struct device *dev, bool enable)
-{
-	const struct mcux_acmp_config *config = dev->config;
-
-	ACMP_EnableWindowMode(config->base, enable);
-	return 0;
-}
-#endif
-
-static int mcux_acmp_pm_callback(const struct device *dev, enum pm_device_action action)
-{
-	const struct mcux_acmp_config *config = dev->config;
-
-	if (action == PM_DEVICE_ACTION_RESUME) {
-		ACMP_Enable(config->base, true);
-	}
-
-#if CONFIG_PM_DEVICE
-	if (action == PM_DEVICE_ACTION_SUSPEND) {
-		ACMP_Enable(config->base, false);
-	}
-#endif
-
-	return 0;
-}
-
-static void mcux_acmp_irq_handler(const struct device *dev)
-{
-	const struct mcux_acmp_config *config = dev->config;
-	struct mcux_acmp_data *data = dev->data;
-
-	ACMP_ClearStatusFlags(config->base, UINT32_MAX);
-
-	if (data->callback == NULL) {
-		return;
-	}
-
-	data->callback(dev, data->user_data);
-}
-
-static int mcux_acmp_init(const struct device *dev)
-{
-	const struct mcux_acmp_config *config = dev->config;
-	int ret;
-
-	ret = pinctrl_apply_state(config->pincfg, PINCTRL_STATE_DEFAULT);
-	if (ret) {
-		LOG_ERR("failed to set %s", "pincfg");
-		return ret;
-	}
-
-	comp_mcux_acmp_init_mode_config(dev, &config->mode_config);
-
-	ret = comp_mcux_acmp_set_input_config(dev, &config->input_config);
-	if (ret) {
-		LOG_ERR("failed to set %s", "input config");
-		return ret;
-	}
-
-	ret = comp_mcux_acmp_set_filter_config(dev, &config->filter_config);
-	if (ret) {
-		LOG_ERR("failed to set %s", "filter config");
-		return ret;
-	}
-
-	ret = comp_mcux_acmp_set_dac_config(dev, &config->dac_config);
-	if (ret) {
-		LOG_ERR("failed to set %s", "dac config");
-		return ret;
-	}
-
-#if COMP_MCUX_ACMP_HAS_DISCRETE_MODE
-	ret = comp_mcux_acmp_set_dm_config(dev, &config->dm_config);
-	if (ret) {
-		LOG_ERR("failed to set %s", "discrete mode config");
-		return ret;
-	}
-#endif
-
-#if COMP_MCUX_ACMP_HAS_WINDOW_MODE
-	ret = comp_mcux_acmp_set_window_mode(dev, config->enable_window_mode);
-	if (ret) {
-		LOG_ERR("failed to set %s", "window mode");
-		return ret;
-	}
-#endif
-
-	ACMP_DisableInterrupts(config->base, UINT32_MAX);
-	config->irq_init();
-
-	return pm_device_driver_init(dev, mcux_acmp_pm_callback);
-}
-
-#define MCUX_ACMP_IRQ_HANDLER_SYM(inst) \
-	_CONCAT(mcux_acmp_irq_init, inst)
-
-#define MCUX_ACMP_IRQ_HANDLER_DEFINE(inst)							\
-	static void MCUX_ACMP_IRQ_HANDLER_SYM(inst)(void)					\
-	{											\
-		IRQ_CONNECT(DT_INST_IRQN(inst),							\
-			    DT_INST_IRQ(inst, priority),					\
-			    mcux_acmp_irq_handler,						\
-			    DEVICE_DT_INST_GET(inst),						\
-			    0);									\
-												\
-		irq_enable(DT_INST_IRQN(inst));							\
-	}
-
-#define MCUX_ACMP_DEVICE(inst)									\
-	PINCTRL_DT_INST_DEFINE(inst);								\
-												\
-	static struct mcux_acmp_data _CONCAT(data, inst);					\
-												\
-	MCUX_ACMP_IRQ_HANDLER_DEFINE(inst)							\
-												\
-	static const struct mcux_acmp_config _CONCAT(config, inst) = {				\
-		.base = (CMP_Type *)DT_INST_REG_ADDR(inst),					\
-		.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),					\
-		.irq_init = MCUX_ACMP_IRQ_HANDLER_SYM(inst),					\
-		.mode_config = MCUX_ACMP_DT_INST_MODE_CONFIG_INIT(inst),			\
-		.input_config = MCUX_ACMP_DT_INST_INPUT_CONFIG_INIT(inst),			\
-		.filter_config = MCUX_ACMP_DT_INST_FILTER_CONFIG_INIT(inst),			\
-		.dac_config = MCUX_ACMP_DT_INST_DAC_CONFIG_INIT(inst),				\
-		IF_ENABLED(COMP_MCUX_ACMP_HAS_DISCRETE_MODE,					\
-			   (.dm_config = MCUX_ACMP_DT_INST_DM_CONFIG_INIT(inst),))		\
-		IF_ENABLED(COMP_MCUX_ACMP_HAS_WINDOW_MODE,					\
-			   (.enable_window_mode = MCUX_ACMP_DT_INST_EN_WINDOW_MODE(inst),))	\
-	};											\
-												\
-	PM_DEVICE_DT_INST_DEFINE(inst, mcux_acmp_pm_callback);					\
-												\
-	DEVICE_DT_INST_DEFINE(inst,								\
-			      mcux_acmp_init,							\
-			      PM_DEVICE_DT_INST_GET(inst),					\
-			      &_CONCAT(data, inst),						\
-			      &_CONCAT(config, inst),						\
-			      POST_KERNEL,							\
-			      CONFIG_COMPARATOR_INIT_PRIORITY,					\
-			      &mcux_acmp_comp_api);
-
-DT_INST_FOREACH_STATUS_OKAY(MCUX_ACMP_DEVICE)
diff --git a/dts/bindings/comparator/nxp,kinetis-acmp.yaml b/dts/bindings/comparator/nxp,kinetis-acmp.yaml
index 21db936c2bf..76ce24b5bba 100644
--- a/dts/bindings/comparator/nxp,kinetis-acmp.yaml
+++ b/dts/bindings/comparator/nxp,kinetis-acmp.yaml
@@ -2,39 +2,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-description: |
-  NXP Kinetis ACMP (Analog CoMParator)
-
-  The following example displays the minimum node layout:
-
-    acmp0: acmp@deadbeef {
-            compatible = "nxp,kinetis-acmp";
-            reg = <0xdeadbeef 0x1000>;
-            interrupts = <0 0>;
-            clocks = <&scg KINETIS_SCG_BUS_CLK>;
-            status = "disabled";
-    };
-
-  Enabling the comparator node requires setting the minimum default
-  configuration of the comparator. This includes selecting the
-  positive and negative inputs, and routing them using pinctrl:
-
-    &pinctrl {
-            acmp0_default: acmp0_default {
-                    group0 {
-                            ...
-                    };
-            };
-    };
-
-    &acmp0 {
-            status = "okay";
-            pinctrl-0 = <&acmp0_default>;
-            pinctrl-names = "default";
-
-            positive-mux-input = "IN0";
-            negative-mux-input = "IN1";
-    };
+description: NXP Kinetis ACMP (Analog CoMParator)
 
 compatible: "nxp,kinetis-acmp"
 
diff --git a/include/zephyr/drivers/comparator/mcux_acmp.h b/include/zephyr/drivers/comparator/mcux_acmp.h
deleted file mode 100644
index 3d06644f0e8..00000000000
--- a/include/zephyr/drivers/comparator/mcux_acmp.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_DRIVERS_COMP_MCUX_ACMP_H_
-#define ZEPHYR_INCLUDE_DRIVERS_COMP_MCUX_ACMP_H_
-
-#include <zephyr/drivers/comparator.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum comp_mcux_acmp_offset_mode {
-	COMP_MCUX_ACMP_OFFSET_MODE_LEVEL0 = 0,
-	COMP_MCUX_ACMP_OFFSET_MODE_LEVEL1,
-};
-
-enum comp_mcux_acmp_hysteresis_mode {
-	COMP_MCUX_ACMP_HYSTERESIS_MODE_LEVEL0 = 0,
-	COMP_MCUX_ACMP_HYSTERESIS_MODE_LEVEL1,
-	COMP_MCUX_ACMP_HYSTERESIS_MODE_LEVEL2,
-	COMP_MCUX_ACMP_HYSTERESIS_MODE_LEVEL3,
-};
-
-struct comp_mcux_acmp_mode_config {
-	enum comp_mcux_acmp_offset_mode offset_mode;
-	enum comp_mcux_acmp_hysteresis_mode hysteresis_mode;
-	bool enable_high_speed_mode;
-	bool invert_output;
-	bool use_unfiltered_output;
-	bool enable_pin_output;
-};
-
-enum comp_mcux_acmp_mux_input {
-	COMP_MCUX_ACMP_MUX_INPUT_IN0 = 0,
-	COMP_MCUX_ACMP_MUX_INPUT_IN1,
-	COMP_MCUX_ACMP_MUX_INPUT_IN2,
-	COMP_MCUX_ACMP_MUX_INPUT_IN3,
-	COMP_MCUX_ACMP_MUX_INPUT_IN4,
-	COMP_MCUX_ACMP_MUX_INPUT_IN5,
-	COMP_MCUX_ACMP_MUX_INPUT_IN6,
-	COMP_MCUX_ACMP_MUX_INPUT_IN7,
-};
-
-enum comp_mcux_acmp_port_input {
-	COMP_MCUX_ACMP_PORT_INPUT_DAC = 0,
-	COMP_MCUX_ACMP_PORT_INPUT_MUX,
-};
-
-struct comp_mcux_acmp_input_config {
-	enum comp_mcux_acmp_mux_input positive_mux_input;
-	enum comp_mcux_acmp_mux_input negative_mux_input;
-	enum comp_mcux_acmp_port_input positive_port_input;
-	enum comp_mcux_acmp_port_input negative_port_input;
-};
-
-struct comp_mcux_acmp_filter_config {
-	bool enable_sample;
-	uint8_t filter_count;
-	uint8_t filter_period;
-};
-
-enum comp_mcux_acmp_dac_vref_source {
-	COMP_MCUX_ACMP_DAC_VREF_SOURCE_VIN1 = 0,
-	COMP_MCUX_ACMP_DAC_VREF_SOURCE_VIN2,
-};
-
-struct comp_mcux_acmp_dac_config {
-	enum comp_mcux_acmp_dac_vref_source vref_source;
-	uint8_t value;
-	bool enable_output;
-	bool enable_high_speed_mode;
-};
-
-enum comp_mcux_acmp_dm_clock {
-	COMP_MCUX_ACMP_DM_CLOCK_SLOW = 0,
-	COMP_MCUX_ACMP_DM_CLOCK_FAST,
-};
-
-enum comp_mcux_acmp_dm_sample_time {
-	COMP_MCUX_ACMP_DM_SAMPLE_TIME_T1 = 0,
-	COMP_MCUX_ACMP_DM_SAMPLE_TIME_T2,
-	COMP_MCUX_ACMP_DM_SAMPLE_TIME_T4,
-	COMP_MCUX_ACMP_DM_SAMPLE_TIME_T8,
-	COMP_MCUX_ACMP_DM_SAMPLE_TIME_T16,
-	COMP_MCUX_ACMP_DM_SAMPLE_TIME_T32,
-	COMP_MCUX_ACMP_DM_SAMPLE_TIME_T64,
-	COMP_MCUX_ACMP_DM_SAMPLE_TIME_T256,
-};
-
-enum comp_mcux_acmp_dm_phase_time {
-	COMP_MCUX_ACMP_DM_PHASE_TIME_ALT0 = 0,
-	COMP_MCUX_ACMP_DM_PHASE_TIME_ALT1,
-	COMP_MCUX_ACMP_DM_PHASE_TIME_ALT2,
-	COMP_MCUX_ACMP_DM_PHASE_TIME_ALT3,
-	COMP_MCUX_ACMP_DM_PHASE_TIME_ALT4,
-	COMP_MCUX_ACMP_DM_PHASE_TIME_ALT5,
-	COMP_MCUX_ACMP_DM_PHASE_TIME_ALT6,
-	COMP_MCUX_ACMP_DM_PHASE_TIME_ALT7,
-};
-
-struct comp_mcux_acmp_dm_config {
-	bool enable_positive_channel;
-	bool enable_negative_channel;
-	bool enable_resistor_divider;
-	enum comp_mcux_acmp_dm_clock clock_source;
-	enum comp_mcux_acmp_dm_sample_time sample_time;
-	enum comp_mcux_acmp_dm_phase_time phase1_time;
-	enum comp_mcux_acmp_dm_phase_time phase2_time;
-};
-
-int comp_mcux_acmp_set_mode_config(const struct device *dev,
-				   const struct comp_mcux_acmp_mode_config *config);
-
-int comp_mcux_acmp_set_input_config(const struct device *dev,
-				    const struct comp_mcux_acmp_input_config *config);
-
-int comp_mcux_acmp_set_filter_config(const struct device *dev,
-				     const struct comp_mcux_acmp_filter_config *config);
-
-int comp_mcux_acmp_set_dac_config(const struct device *dev,
-				  const struct comp_mcux_acmp_dac_config *config);
-
-int comp_mcux_acmp_set_dm_config(const struct device *dev,
-				 const struct comp_mcux_acmp_dm_config *config);
-
-int comp_mcux_acmp_set_window_mode(const struct device *dev, bool enable);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZEPHYR_INCLUDE_DRIVERS_COMP_MCUX_ACMP_H_ */

From 36ca6d9f2ac405c94be09ce44b042d1dae9d56a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:39 +0100
Subject: [PATCH 1589/2913] Revert "[nrf fromtree] doc: releases:
 migration-guide: deprecated nxp,kinetis-acmp props"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 55b01ab7478798a401399a18f3446281d9b939e7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/releases/migration-guide-4.0.rst | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/doc/releases/migration-guide-4.0.rst b/doc/releases/migration-guide-4.0.rst
index 3581625f830..3699a7fedcb 100644
--- a/doc/releases/migration-guide-4.0.rst
+++ b/doc/releases/migration-guide-4.0.rst
@@ -150,11 +150,6 @@ Sensors
   to support all JEDEC JC 42.4 compatible temperature sensors. It now uses the
   :dtcompatible:`jedec,jc-42.4-temp` compatible string instead to the ``microchip,mcp9808`` string.
 
-* The ``nxp,`` prefixed properties in :dtcompatible:`nxp,kinetis-acmp` have been deprecated in favor
-  of properties without the prefix. The sensor based driver for the :dtcompatible:`nxp,kinetis-acmp`
-  has been updated to support both the new and deprecated property names. Uses of the deprecated
-  property names should be updated to the new property names.
-
 Serial
 ======
 

From 8e2e840beef667fffba934ad780ab22b48056f7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:39 +0100
Subject: [PATCH 1590/2913] Revert "[nrf fromtree] drivers: sensor: mcux_acmp:
 update dts binding and adapt driver"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8591383f08744958cc554bad4f688d580441b20a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/sensor/nxp/mcux_acmp/mcux_acmp.c      |  59 +-----
 dts/arm/nxp/nxp_ke1xf.dtsi                    |   3 +
 dts/arm/nxp/nxp_ke1xz.dtsi                    |   1 +
 dts/arm/nxp/nxp_rt118x.dtsi                   |   4 +
 dts/arm/nxp/nxp_rt11xx.dtsi                   |   4 +
 dts/bindings/comparator/nxp,kinetis-acmp.yaml | 195 ------------------
 dts/bindings/sensor/nxp,kinetis-acmp.yaml     |  58 ++++++
 7 files changed, 78 insertions(+), 246 deletions(-)
 delete mode 100644 dts/bindings/comparator/nxp,kinetis-acmp.yaml
 create mode 100644 dts/bindings/sensor/nxp,kinetis-acmp.yaml

diff --git a/drivers/sensor/nxp/mcux_acmp/mcux_acmp.c b/drivers/sensor/nxp/mcux_acmp/mcux_acmp.c
index 90dde17e83c..69c01c3a5ff 100644
--- a/drivers/sensor/nxp/mcux_acmp/mcux_acmp.c
+++ b/drivers/sensor/nxp/mcux_acmp/mcux_acmp.c
@@ -41,49 +41,6 @@ BUILD_ASSERT(kACMP_PortInputFromDAC == 0);
 BUILD_ASSERT(kACMP_PortInputFromMux == 1);
 #endif /* MCUX_ACMP_HAS_INPSEL || MCUX_ACMP_HAS_INNSEL */
 
-/*
- * prop New property name
- * depr Deprecated property name
- */
-#define MCUX_ACMP_DT_INST_PROP(inst, prop, depr)						\
-	COND_CODE_1(										\
-		DT_INST_NODE_HAS_PROP(inst, prop),						\
-		(DT_INST_PROP(inst, prop)),							\
-		(DT_INST_PROP(inst, depr))							\
-	)
-
-/*
- * prop New property name
- * depr Deprecated property name
- */
-#define MCUX_ACMP_DT_INST_PROP_OR(inst, prop, depr, default_value)				\
-	COND_CODE_1(										\
-		DT_INST_NODE_HAS_PROP(inst, prop) || DT_INST_NODE_HAS_PROP(inst, depr),		\
-		(MCUX_ACMP_DT_INST_PROP(inst, prop, depr)),					\
-		(default_value)									\
-	)
-
-#define MCUX_ACMP_DT_INST_ENABLE_SAMPLE(inst) \
-	MCUX_ACMP_DT_INST_PROP(inst, filter_enable_sample, nxp_enable_sample)
-
-#define MCUX_ACMP_DT_INST_FILTER_COUNT(inst) \
-	MCUX_ACMP_DT_INST_PROP_OR(inst, filter_count, nxp_filter_count, 0)
-
-#define MCUX_ACMP_DT_INST_FILTER_PERIOD(inst) \
-	MCUX_ACMP_DT_INST_PROP_OR(inst, filter_period, nxp_filter_period, 0)
-
-#define MCUX_ACMP_DT_INST_HIGH_SPEED(inst) \
-	MCUX_ACMP_DT_INST_PROP(inst, enable_high_speed_mode, nxp_high_speed_mode)
-
-#define MCUX_ACMP_DT_INST_USE_UNFILTERED_MODE(inst) \
-	MCUX_ACMP_DT_INST_PROP(inst, use_unfiltered_output, nxp_use_unfiltered_output)
-
-#define MCUX_ACMP_DT_INST_USE_ENABLE_PIN_OUT(inst) \
-	MCUX_ACMP_DT_INST_PROP(inst, enable_pin_out, nxp_enable_output_pin)
-
-#define MCUX_ACMP_DT_INST_ENABLE_WINDOW_MODE(inst) \
-	MCUX_ACMP_DT_INST_PROP(inst, enable_window_mode, nxp_window_mode)
-
 struct mcux_acmp_config {
 	CMP_Type *base;
 	acmp_filter_config_t filter;
@@ -530,18 +487,18 @@ static const struct sensor_driver_api mcux_acmp_driver_api = {
 	.channel_get = mcux_acmp_channel_get,
 };
 
-#define MCUX_ACMP_DECLARE_CONFIG(n, config_func_init)			\
+#define MCUX_ACMP_DECLARE_CONFIG(n, config_func_init)	\
 static const struct mcux_acmp_config mcux_acmp_config_##n = {		\
 	.base = (CMP_Type *)DT_INST_REG_ADDR(n),			\
 	.filter = {							\
-		.enableSample = MCUX_ACMP_DT_INST_ENABLE_SAMPLE(n),	\
-		.filterCount = MCUX_ACMP_DT_INST_FILTER_COUNT(n),	\
-		.filterPeriod = MCUX_ACMP_DT_INST_FILTER_PERIOD(n),	\
+		.enableSample = DT_INST_PROP(n, nxp_enable_sample),	\
+		.filterCount = DT_INST_PROP_OR(n, nxp_filter_count, 0), \
+		.filterPeriod = DT_INST_PROP_OR(n, nxp_filter_period, 0), \
 	},								\
-	.high_speed = MCUX_ACMP_DT_INST_HIGH_SPEED(n),			\
-	.unfiltered = MCUX_ACMP_DT_INST_USE_UNFILTERED_MODE(n),		\
-	.output = MCUX_ACMP_DT_INST_USE_ENABLE_PIN_OUT(n),		\
-	.window = MCUX_ACMP_DT_INST_ENABLE_WINDOW_MODE(n),		\
+	.high_speed = DT_INST_PROP(n, nxp_high_speed_mode),		\
+	.unfiltered = DT_INST_PROP(n, nxp_use_unfiltered_output),	\
+	.output = DT_INST_PROP(n, nxp_enable_output_pin),		\
+	.window = DT_INST_PROP(n, nxp_window_mode),			\
 	.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),			\
 	config_func_init						\
 }
diff --git a/dts/arm/nxp/nxp_ke1xf.dtsi b/dts/arm/nxp/nxp_ke1xf.dtsi
index 8c880c06daf..6aff4315889 100644
--- a/dts/arm/nxp/nxp_ke1xf.dtsi
+++ b/dts/arm/nxp/nxp_ke1xf.dtsi
@@ -575,6 +575,7 @@
 			interrupts = <40 0>;
 			clocks = <&scg KINETIS_SCG_BUS_CLK>;
 			status = "disabled";
+			#io-channel-cells = <2>;
 		};
 
 		cmp1: cmp@40074000 {
@@ -583,6 +584,7 @@
 			interrupts = <41 0>;
 			clocks = <&scg KINETIS_SCG_BUS_CLK>;
 			status = "disabled";
+			#io-channel-cells = <2>;
 		};
 
 		cmp2: cmp@40075000 {
@@ -591,6 +593,7 @@
 			interrupts = <70 0>;
 			clocks = <&scg KINETIS_SCG_BUS_CLK>;
 			status = "disabled";
+			#io-channel-cells = <2>;
 		};
 
 		flexio1: flexio@4005a000 {
diff --git a/dts/arm/nxp/nxp_ke1xz.dtsi b/dts/arm/nxp/nxp_ke1xz.dtsi
index 8e34d564845..577f0e894fe 100644
--- a/dts/arm/nxp/nxp_ke1xz.dtsi
+++ b/dts/arm/nxp/nxp_ke1xz.dtsi
@@ -419,6 +419,7 @@
 			interrupts = <16 0>;
 			clocks = <&scg KINETIS_SCG_BUS_CLK>;
 			status = "disabled";
+			#io-channel-cells = <2>;
 		};
 
 		lpspi0: spi@4002c000 {
diff --git a/dts/arm/nxp/nxp_rt118x.dtsi b/dts/arm/nxp/nxp_rt118x.dtsi
index 4bb645e8979..b0f7c5e078a 100644
--- a/dts/arm/nxp/nxp_rt118x.dtsi
+++ b/dts/arm/nxp/nxp_rt118x.dtsi
@@ -299,6 +299,7 @@
 		reg = <0x2dc0000 0x4000>;
 		interrupts = <200 0>;
 		status = "disabled";
+		#io-channel-cells = <2>;
 	};
 
 	acmp2: cmp@2dd0000 {
@@ -306,6 +307,7 @@
 		reg = <0x2dd0000 0x4000>;
 		interrupts = <201 0>;
 		status = "disabled";
+		#io-channel-cells = <2>;
 	};
 
 	acmp3: cmp@2de0000 {
@@ -313,6 +315,7 @@
 		reg = <0x2de0000 0x4000>;
 		interrupts = <202 0>;
 		status = "disabled";
+		#io-channel-cells = <2>;
 	};
 
 	acmp4: cmp@2df0000 {
@@ -320,6 +323,7 @@
 		reg = <0x2df0000 0x4000>;
 		interrupts = <203 0>;
 		status = "disabled";
+		#io-channel-cells = <2>;
 	};
 };
 
diff --git a/dts/arm/nxp/nxp_rt11xx.dtsi b/dts/arm/nxp/nxp_rt11xx.dtsi
index 5dd41ed398b..6e3644f58fa 100644
--- a/dts/arm/nxp/nxp_rt11xx.dtsi
+++ b/dts/arm/nxp/nxp_rt11xx.dtsi
@@ -1011,6 +1011,7 @@
 			reg = <0x401a4000 0x4000>;
 			interrupts = <157 0>;
 			status = "disabled";
+			#io-channel-cells = <2>;
 		};
 
 		acmp2: cmp@401a8000 {
@@ -1018,6 +1019,7 @@
 			reg = <0x401a8000 0x4000>;
 			interrupts = <158 0>;
 			status = "disabled";
+			#io-channel-cells = <2>;
 		};
 
 		acmp3: cmp@401ac000 {
@@ -1025,6 +1027,7 @@
 			reg = <0x401ac000 0x4000>;
 			interrupts = <159 0>;
 			status = "disabled";
+			#io-channel-cells = <2>;
 		};
 
 		acmp4: cmp@401b0000 {
@@ -1032,6 +1035,7 @@
 			reg = <0x401b0000 0x4000>;
 			interrupts = <160 0>;
 			status = "disabled";
+			#io-channel-cells = <2>;
 		};
 
 		anatop: anatop@40c84000 {
diff --git a/dts/bindings/comparator/nxp,kinetis-acmp.yaml b/dts/bindings/comparator/nxp,kinetis-acmp.yaml
deleted file mode 100644
index 76ce24b5bba..00000000000
--- a/dts/bindings/comparator/nxp,kinetis-acmp.yaml
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright (c) 2020 Vestas Wind Systems A/S
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: NXP Kinetis ACMP (Analog CoMParator)
-
-compatible: "nxp,kinetis-acmp"
-
-include:
-  - base.yaml
-  - pinctrl-device.yaml
-
-properties:
-  interrupts:
-    required: true
-
-  reg:
-    required: true
-
-  nxp,enable-output-pin:
-    type: boolean
-    deprecated: true
-    description: Deprecated. Please use enable-pin-out instead
-
-  nxp,use-unfiltered-output:
-    type: boolean
-    deprecated: true
-    description: Deprecated. Please use use-unfiltered-output instead
-
-  nxp,high-speed-mode:
-    type: boolean
-    deprecated: true
-    description: Deprecated. Please use enable-high-speed-mode instead
-
-  nxp,enable-sample:
-    type: boolean
-    deprecated: true
-    description: Deprecated. Please use filter-enable-sample instead
-
-  nxp,filter-count:
-    type: int
-    deprecated: true
-    description: Deprecated. Please use filter-count instead
-
-  nxp,filter-period:
-    type: int
-    deprecated: true
-    description: Deprecated. Please use filter-period instead
-
-  nxp,window-mode:
-    type: boolean
-    deprecated: true
-    description: Deprecated. Please use enable-window-mode instead
-
-  offset-mode:
-    type: string
-    enum:
-      - "LEVEL0"
-      - "LEVEL1"
-
-  hysteresis-mode:
-    type: string
-    enum:
-      - "LEVEL0"
-      - "LEVEL1"
-      - "LEVEL2"
-      - "LEVEL3"
-
-  enable-high-speed-mode:
-    type: boolean
-
-  invert-output:
-    type: boolean
-
-  use-unfiltered-output:
-    type: boolean
-
-  enable-pin-out:
-    type: boolean
-
-  enable-window-mode:
-    type: boolean
-
-  positive-mux-input:
-    type: string
-    enum:
-      - IN0
-      - IN1
-      - IN2
-      - IN3
-      - IN4
-      - IN5
-      - IN6
-      - IN7
-
-  negative-mux-input:
-    type: string
-    enum:
-      - IN0
-      - IN1
-      - IN2
-      - IN3
-      - IN4
-      - IN5
-      - IN6
-      - IN7
-
-  positive-port-input:
-    type: string
-    enum:
-      - DAC
-      - MUX
-
-  negative-port-input:
-    type: string
-    enum:
-      - DAC
-      - MUX
-
-  filter-enable-sample:
-    type: boolean
-
-  filter-count:
-    type: int
-    description: Filter sample count (0 to 7).
-
-  filter-period:
-    type: int
-    description: Filter sample period in bus clock cycles (0 to 255).
-
-  dac-vref-source:
-    type: string
-    enum:
-      - "VIN1"
-      - "VIN2"
-
-  dac-value:
-    type: int
-
-  dac-enable:
-    type: boolean
-
-  dac-enable-high-speed:
-    type: boolean
-
-  discrete-mode-enable-positive-channel:
-    type: boolean
-
-  discrete-mode-enable-negative-channel:
-    type: boolean
-
-  discrete-mode-enable-resistor-divider:
-    type: boolean
-
-  discrete-mode-clock-source:
-    type: string
-    enum:
-      - "SLOW"
-      - "FAST"
-
-  discrete-mode-sample-time:
-    type: string
-    enum:
-      - "T1"
-      - "T2"
-      - "T4"
-      - "T8"
-      - "T16"
-      - "T32"
-      - "T64"
-      - "T256"
-
-  discrete-mode-phase1-time:
-    type: string
-    enum:
-      - "ALT0"
-      - "ALT1"
-      - "ALT2"
-      - "ALT3"
-      - "ALT4"
-      - "ALT5"
-      - "ALT6"
-      - "ALT7"
-
-  discrete-mode-phase2-time:
-    type: string
-    enum:
-      - "ALT0"
-      - "ALT1"
-      - "ALT2"
-      - "ALT3"
-      - "ALT4"
-      - "ALT5"
-      - "ALT6"
-      - "ALT7"
diff --git a/dts/bindings/sensor/nxp,kinetis-acmp.yaml b/dts/bindings/sensor/nxp,kinetis-acmp.yaml
new file mode 100644
index 00000000000..9608f9305c9
--- /dev/null
+++ b/dts/bindings/sensor/nxp,kinetis-acmp.yaml
@@ -0,0 +1,58 @@
+# Copyright (c) 2020 Vestas Wind Systems A/S
+# SPDX-License-Identifier: Apache-2.0
+
+description: NXP Kinetis Analog Comparator (ACMP)
+
+compatible: "nxp,kinetis-acmp"
+
+include: [sensor-device.yaml, pinctrl-device.yaml]
+
+properties:
+  interrupts:
+    required: true
+
+  reg:
+    required: true
+
+  nxp,enable-output-pin:
+    type: boolean
+    description: |
+      Make the comparator output (CMP0) available on a packaged pin.
+
+  nxp,use-unfiltered-output:
+    type: boolean
+    description: |
+      Use the unfiltered comparator output for CMP0.
+
+  nxp,high-speed-mode:
+    type: boolean
+    description: |
+      Enable high speed comparison mode.
+
+  nxp,enable-sample:
+    type: boolean
+    description: |
+      Enable external sample signal as clock input.
+
+  nxp,filter-count:
+    type: int
+    description: |
+      Filter sample count (0 to 7).
+
+  nxp,filter-period:
+    type: int
+    description: |
+      Filter sample period in bus clock cycles (0 to 255).
+
+  nxp,window-mode:
+    type: boolean
+    description: |
+      Enable windowing mode.
+
+  "#io-channel-cells":
+    type: int
+    const: 2
+
+io-channel-cells:
+  - positive
+  - negative

From f16604bc8354c00ad557587b1287657723ed3e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:39 +0100
Subject: [PATCH 1591/2913] Revert "[nrf fromtree] sensor: mcux_acmp: namespace
 driver and kconfigs"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4eff80882c0abe8c8b81831e0a76b55c11c370d7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/sensor/nxp/CMakeLists.txt        |  2 +-
 drivers/sensor/nxp/mcux_acmp/Kconfig     |  7 +++----
 drivers/sensor/nxp/mcux_acmp/mcux_acmp.c | 26 ++++++++++++------------
 modules/hal_nxp/Kconfig                  |  3 +--
 samples/sensor/mcux_acmp/prj.conf        |  2 +-
 samples/sensor/mcux_acmp/sample.yaml     |  2 +-
 6 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/drivers/sensor/nxp/CMakeLists.txt b/drivers/sensor/nxp/CMakeLists.txt
index 36e39e002bf..73dc2cb274b 100644
--- a/drivers/sensor/nxp/CMakeLists.txt
+++ b/drivers/sensor/nxp/CMakeLists.txt
@@ -5,10 +5,10 @@
 add_subdirectory_ifdef(CONFIG_FXAS21002 fxas21002)
 add_subdirectory_ifdef(CONFIG_FXLS8974 fxls8974)
 add_subdirectory_ifdef(CONFIG_FXOS8700 fxos8700)
+add_subdirectory_ifdef(CONFIG_MCUX_ACMP mcux_acmp)
 add_subdirectory_ifdef(CONFIG_MCUX_LPCMP mcux_lpcmp)
 add_subdirectory_ifdef(CONFIG_NXP_TEMPMON nxp_tempmon)
 add_subdirectory_ifdef(CONFIG_QDEC_MCUX qdec_mcux)
 add_subdirectory_ifdef(CONFIG_QDEC_NXP_S32 qdec_nxp_s32)
-add_subdirectory_ifdef(CONFIG_SENSOR_MCUX_ACMP mcux_acmp)
 add_subdirectory_ifdef(CONFIG_TEMP_KINETIS nxp_kinetis_temp)
 # zephyr-keep-sorted-stop
diff --git a/drivers/sensor/nxp/mcux_acmp/Kconfig b/drivers/sensor/nxp/mcux_acmp/Kconfig
index 1934e4d93f7..0f976c65e21 100644
--- a/drivers/sensor/nxp/mcux_acmp/Kconfig
+++ b/drivers/sensor/nxp/mcux_acmp/Kconfig
@@ -4,18 +4,17 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-config SENSOR_MCUX_ACMP
+config MCUX_ACMP
 	bool "NXP MCUX Analog Comparator (ACMP)"
 	default y
 	depends on DT_HAS_NXP_KINETIS_ACMP_ENABLED
 	select PINCTRL
-	select MCUX_ACMP
 	help
 	  Enable driver for the NXP MCUX Analog Comparator (ACMP).
 
-config SENSOR_MCUX_ACMP_TRIGGER
+config MCUX_ACMP_TRIGGER
 	bool "Trigger support"
-	depends on SENSOR_MCUX_ACMP
+	depends on MCUX_ACMP
 	help
 	  Enable trigger support for the NXP MCUX Analog Comparator
 	  (ACMP).
diff --git a/drivers/sensor/nxp/mcux_acmp/mcux_acmp.c b/drivers/sensor/nxp/mcux_acmp/mcux_acmp.c
index 69c01c3a5ff..30339f3e48d 100644
--- a/drivers/sensor/nxp/mcux_acmp/mcux_acmp.c
+++ b/drivers/sensor/nxp/mcux_acmp/mcux_acmp.c
@@ -45,9 +45,9 @@ struct mcux_acmp_config {
 	CMP_Type *base;
 	acmp_filter_config_t filter;
 	const struct pinctrl_dev_config *pincfg;
-#ifdef CONFIG_SENSOR_MCUX_ACMP_TRIGGER
+#ifdef CONFIG_MCUX_ACMP_TRIGGER
 	void (*irq_config_func)(const struct device *dev);
-#endif /* CONFIG_SENSOR_MCUX_ACMP_TRIGGER */
+#endif /* CONFIG_MCUX_ACMP_TRIGGER */
 	bool high_speed : 1;
 	bool unfiltered : 1;
 	bool output : 1;
@@ -61,7 +61,7 @@ struct mcux_acmp_data {
 #if MCUX_ACMP_HAS_DISCRETE_MODE
 	acmp_discrete_mode_config_t discrete_config;
 #endif
-#ifdef CONFIG_SENSOR_MCUX_ACMP_TRIGGER
+#ifdef CONFIG_MCUX_ACMP_TRIGGER
 	const struct device *dev;
 	sensor_trigger_handler_t rising_handler;
 	const struct sensor_trigger *rising_trigger;
@@ -69,7 +69,7 @@ struct mcux_acmp_data {
 	const struct sensor_trigger *falling_trigger;
 	struct k_work work;
 	volatile uint32_t status;
-#endif /* CONFIG_SENSOR_MCUX_ACMP_TRIGGER */
+#endif /* CONFIG_MCUX_ACMP_TRIGGER */
 	bool cout;
 };
 
@@ -370,7 +370,7 @@ static int mcux_acmp_channel_get(const struct device *dev,
 	return 0;
 }
 
-#ifdef CONFIG_SENSOR_MCUX_ACMP_TRIGGER
+#ifdef CONFIG_MCUX_ACMP_TRIGGER
 static int mcux_acmp_trigger_set(const struct device *dev,
 				 const struct sensor_trigger *trig,
 				 sensor_trigger_handler_t handler)
@@ -431,7 +431,7 @@ static void mcux_acmp_isr(const struct device *dev)
 
 	k_work_submit(&data->work);
 }
-#endif /* CONFIG_SENSOR_MCUX_ACMP_TRIGGER */
+#endif /* CONFIG_MCUX_ACMP_TRIGGER */
 
 static int mcux_acmp_init(const struct device *dev)
 {
@@ -462,7 +462,7 @@ static int mcux_acmp_init(const struct device *dev)
 	/* Disable DAC */
 	ACMP_SetDACConfig(config->base, NULL);
 
-#ifdef CONFIG_SENSOR_MCUX_ACMP_TRIGGER
+#ifdef CONFIG_MCUX_ACMP_TRIGGER
 	data->dev = dev;
 	k_work_init(&data->work, mcux_acmp_trigger_work_handler);
 
@@ -470,7 +470,7 @@ static int mcux_acmp_init(const struct device *dev)
 	ACMP_EnableInterrupts(config->base,
 			      kACMP_OutputRisingInterruptEnable |
 			      kACMP_OutputFallingInterruptEnable);
-#endif /* CONFIG_SENSOR_MCUX_ACMP_TRIGGER */
+#endif /* CONFIG_MCUX_ACMP_TRIGGER */
 
 	ACMP_Enable(config->base, true);
 
@@ -480,9 +480,9 @@ static int mcux_acmp_init(const struct device *dev)
 static const struct sensor_driver_api mcux_acmp_driver_api = {
 	.attr_set = mcux_acmp_attr_set,
 	.attr_get = mcux_acmp_attr_get,
-#ifdef CONFIG_SENSOR_MCUX_ACMP_TRIGGER
+#ifdef CONFIG_MCUX_ACMP_TRIGGER
 	.trigger_set = mcux_acmp_trigger_set,
-#endif /* CONFIG_SENSOR_MCUX_ACMP_TRIGGER */
+#endif /* CONFIG_MCUX_ACMP_TRIGGER */
 	.sample_fetch = mcux_acmp_sample_fetch,
 	.channel_get = mcux_acmp_channel_get,
 };
@@ -503,7 +503,7 @@ static const struct mcux_acmp_config mcux_acmp_config_##n = {		\
 	config_func_init						\
 }
 
-#ifdef CONFIG_SENSOR_MCUX_ACMP_TRIGGER
+#ifdef CONFIG_MCUX_ACMP_TRIGGER
 #define MCUX_ACMP_CONFIG_FUNC(n)					\
 	static void mcux_acmp_config_func_##n(const struct device *dev) \
 	{								\
@@ -517,12 +517,12 @@ static const struct mcux_acmp_config mcux_acmp_config_##n = {		\
 	.irq_config_func = mcux_acmp_config_func_##n
 #define MCUX_ACMP_INIT_CONFIG(n)					\
 	MCUX_ACMP_DECLARE_CONFIG(n, MCUX_ACMP_CONFIG_FUNC_INIT(n))
-#else /* !CONFIG_SENSOR_MCUX_ACMP_TRIGGER */
+#else /* !CONFIG_MCUX_ACMP_TRIGGER */
 #define MCUX_ACMP_CONFIG_FUNC(n)
 #define MCUX_ACMP_CONFIG_FUNC_INIT
 #define MCUX_ACMP_INIT_CONFIG(n)					\
 	MCUX_ACMP_DECLARE_CONFIG(n, MCUX_ACMP_CONFIG_FUNC_INIT)
-#endif /* !CONFIG_SENSOR_MCUX_ACMP_TRIGGER */
+#endif /* !CONFIG_MCUX_ACMP_TRIGGER */
 
 #define MCUX_ACMP_INIT(n)						\
 	static struct mcux_acmp_data mcux_acmp_data_##n;		\
diff --git a/modules/hal_nxp/Kconfig b/modules/hal_nxp/Kconfig
index 4f055faa07d..aaec4e84aba 100644
--- a/modules/hal_nxp/Kconfig
+++ b/modules/hal_nxp/Kconfig
@@ -4,5 +4,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-config MCUX_ACMP
-	bool "Include ACMP driver from MCUX SDK"
+# file is empty and kept as a place holder if/when Kconfig is needed
diff --git a/samples/sensor/mcux_acmp/prj.conf b/samples/sensor/mcux_acmp/prj.conf
index 202fe6b8564..8b70c7ae30b 100644
--- a/samples/sensor/mcux_acmp/prj.conf
+++ b/samples/sensor/mcux_acmp/prj.conf
@@ -1,2 +1,2 @@
 CONFIG_SENSOR=y
-CONFIG_SENSOR_MCUX_ACMP_TRIGGER=y
+CONFIG_MCUX_ACMP_TRIGGER=y
diff --git a/samples/sensor/mcux_acmp/sample.yaml b/samples/sensor/mcux_acmp/sample.yaml
index a00773fdbb6..fa7782d896d 100644
--- a/samples/sensor/mcux_acmp/sample.yaml
+++ b/samples/sensor/mcux_acmp/sample.yaml
@@ -27,4 +27,4 @@ tests:
   sample.sensor.mcux_acmp.no_trigger:
     build_only: true
     extra_configs:
-      - CONFIG_SENSOR_MCUX_ACMP_TRIGGER=n
+      - CONFIG_MCUX_ACMP_TRIGGER=n

From d67ab88fcd9ddaed52bac44dd60a539f898042f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:39 +0100
Subject: [PATCH 1592/2913] Revert "[nrf fromtree] tests: drivers: build_all:
 comparator: add nrf_lpcomp"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ffb82a2d7b8742b18fcb13dda5208cb6882e36f2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../comparator/nrf_lpcomp/ext_ref.overlay     | 12 -----------
 .../comparator/nrf_lpcomp/int_ref.overlay     | 13 ------------
 .../build_all/comparator/testcase.yaml        | 20 -------------------
 3 files changed, 45 deletions(-)
 delete mode 100644 tests/drivers/build_all/comparator/nrf_lpcomp/ext_ref.overlay
 delete mode 100644 tests/drivers/build_all/comparator/nrf_lpcomp/int_ref.overlay

diff --git a/tests/drivers/build_all/comparator/nrf_lpcomp/ext_ref.overlay b/tests/drivers/build_all/comparator/nrf_lpcomp/ext_ref.overlay
deleted file mode 100644
index 95e44fbed3d..00000000000
--- a/tests/drivers/build_all/comparator/nrf_lpcomp/ext_ref.overlay
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&comp {
-	compatible = "nordic,nrf-lpcomp";
-	psel = "AIN0";
-	refsel = "VDD_4_8";
-	status = "okay";
-};
diff --git a/tests/drivers/build_all/comparator/nrf_lpcomp/int_ref.overlay b/tests/drivers/build_all/comparator/nrf_lpcomp/int_ref.overlay
deleted file mode 100644
index 7aadd8b3fae..00000000000
--- a/tests/drivers/build_all/comparator/nrf_lpcomp/int_ref.overlay
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&comp {
-	compatible = "nordic,nrf-lpcomp";
-	psel = "AIN0";
-	refsel = "AREF";
-	extrefsel = "AIN1";
-	status = "okay";
-};
diff --git a/tests/drivers/build_all/comparator/testcase.yaml b/tests/drivers/build_all/comparator/testcase.yaml
index 8dbc9dfb32a..9c94ef9a69e 100644
--- a/tests/drivers/build_all/comparator/testcase.yaml
+++ b/tests/drivers/build_all/comparator/testcase.yaml
@@ -46,23 +46,3 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf9280pdk/nrf9280/cpuapp
-  drivers.build_all.comparator.nrf_lpcomp.ext_ref:
-    extra_args:
-      - DTC_OVERLAY_FILE="nrf_lpcomp/ext_ref.overlay"
-    platform_allow:
-      - nrf51dk/nrf51822
-      - nrf52dk/nrf52832
-      - nrf5340dk/nrf5340/cpuapp
-      - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf9280pdk/nrf9280/cpuapp
-  drivers.build_all.comparator.nrf_lpcomp.int_ref:
-    extra_args:
-      - DTC_OVERLAY_FILE="nrf_lpcomp/int_ref.overlay"
-    platform_allow:
-      - nrf51dk/nrf51822
-      - nrf52dk/nrf52832
-      - nrf5340dk/nrf5340/cpuapp
-      - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf9280pdk/nrf9280/cpuapp

From 929b8a399941de8fead1585a1c63637bbdc5a314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:39 +0100
Subject: [PATCH 1593/2913] Revert "[nrf fromtree] drivers: comparator: add nRF
 LPCOMP device driver"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 22939094a7f7a95f87651894e2204223aaab53f0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/comparator/CMakeLists.txt             |   1 -
 drivers/comparator/Kconfig                    |   1 -
 drivers/comparator/Kconfig.nrf_lpcomp         |   8 -
 drivers/comparator/comparator_nrf_lpcomp.c    | 491 ------------------
 .../comparator/nordic,nrf-lpcomp.yaml         |  83 ---
 dts/bindings/sensor/nordic,nrf-lpcomp.yaml    |  23 +
 .../zephyr/drivers/comparator/nrf_lpcomp.h    | 112 ----
 7 files changed, 23 insertions(+), 696 deletions(-)
 delete mode 100644 drivers/comparator/Kconfig.nrf_lpcomp
 delete mode 100644 drivers/comparator/comparator_nrf_lpcomp.c
 delete mode 100644 dts/bindings/comparator/nordic,nrf-lpcomp.yaml
 create mode 100644 dts/bindings/sensor/nordic,nrf-lpcomp.yaml
 delete mode 100644 include/zephyr/drivers/comparator/nrf_lpcomp.h

diff --git a/drivers/comparator/CMakeLists.txt b/drivers/comparator/CMakeLists.txt
index d0dc726bf58..20aa301af7d 100644
--- a/drivers/comparator/CMakeLists.txt
+++ b/drivers/comparator/CMakeLists.txt
@@ -7,4 +7,3 @@ zephyr_library()
 
 zephyr_library_sources_ifdef(CONFIG_USERSPACE comparator_handlers.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_COMP comparator_nrf_comp.c)
-zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_LPCOMP comparator_nrf_lpcomp.c)
diff --git a/drivers/comparator/Kconfig b/drivers/comparator/Kconfig
index 819936024b9..84ea5c74baa 100644
--- a/drivers/comparator/Kconfig
+++ b/drivers/comparator/Kconfig
@@ -19,6 +19,5 @@ config COMPARATOR_INIT_PRIORITY
 	  Comparator device driver initialization priority.
 
 rsource "Kconfig.nrf_comp"
-rsource "Kconfig.nrf_lpcomp"
 
 endif # COMPARATOR
diff --git a/drivers/comparator/Kconfig.nrf_lpcomp b/drivers/comparator/Kconfig.nrf_lpcomp
deleted file mode 100644
index f33de46f15d..00000000000
--- a/drivers/comparator/Kconfig.nrf_lpcomp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config COMPARATOR_NRF_LPCOMP
-	bool "Nordic LPCOMP comparator driver"
-	default y
-	depends on DT_HAS_NORDIC_NRF_LPCOMP_ENABLED
-	select NRFX_LPCOMP
diff --git a/drivers/comparator/comparator_nrf_lpcomp.c b/drivers/comparator/comparator_nrf_lpcomp.c
deleted file mode 100644
index 6c6710d337d..00000000000
--- a/drivers/comparator/comparator_nrf_lpcomp.c
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <nrfx_lpcomp.h>
-
-#include <zephyr/drivers/comparator/nrf_lpcomp.h>
-#include <zephyr/kernel.h>
-#include <zephyr/pm/device.h>
-
-#include <string.h>
-
-#define DT_DRV_COMPAT nordic_nrf_lpcomp
-
-#define SHIM_NRF_LPCOMP_DT_INST_REFSEL(inst) \
-	_CONCAT(COMP_NRF_LPCOMP_REFSEL_, DT_INST_STRING_TOKEN(inst, refsel))
-
-#define SHIM_NRF_LPCOMP_DT_INST_REFSEL_IS_AREF(inst) \
-	DT_INST_ENUM_HAS_VALUE(inst, refsel, AREF)
-
-#define SHIM_NRF_LPCOMP_DT_INST_EXTREFSEL(inst) \
-	_CONCAT(COMP_NRF_LPCOMP_EXTREFSEL_, DT_INST_STRING_TOKEN(inst, extrefsel))
-
-#define SHIM_NRF_LPCOMP_DT_INST_ENABLE_HYST(inst) \
-	DT_INST_PROP(inst, enable_hyst)
-
-#define SHIM_NRF_LPCOMP_DT_INST_PSEL(inst) \
-	_CONCAT(COMP_NRF_LPCOMP_PSEL_, DT_INST_STRING_TOKEN(inst, psel))
-
-struct shim_nrf_lpcomp_data {
-	nrfx_lpcomp_config_t config;
-	uint32_t event_mask;
-	bool started;
-	atomic_t triggered;
-	comparator_callback_t callback;
-	void *user_data;
-};
-
-#if (NRF_LPCOMP_HAS_AIN_AS_PIN)
-static const uint32_t shim_nrf_lpcomp_ain_map[] = {
-#if defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280)
-	NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(1U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(2U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(3U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
-#elif defined(CONFIG_SOC_NRF54L15)
-	NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(11U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(12U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(13U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(14U, 1),
-#endif
-};
-#endif
-
-#if (NRF_LPCOMP_HAS_AIN_AS_PIN)
-BUILD_ASSERT(COMP_NRF_LPCOMP_PSEL_AIN0 == 0);
-BUILD_ASSERT(COMP_NRF_LPCOMP_PSEL_AIN7 == 7);
-BUILD_ASSERT(COMP_NRF_LPCOMP_EXTREFSEL_AIN0 == 0);
-BUILD_ASSERT(COMP_NRF_LPCOMP_EXTREFSEL_AIN1 == 1);
-#endif
-
-#if (LPCOMP_REFSEL_RESOLUTION == 8)
-BUILD_ASSERT((SHIM_NRF_LPCOMP_DT_INST_REFSEL(0) < COMP_NRF_LPCOMP_REFSEL_VDD_1_16) ||
-	     (SHIM_NRF_LPCOMP_DT_INST_REFSEL(0) > COMP_NRF_LPCOMP_REFSEL_VDD_15_16));
-#endif
-
-#if SHIM_NRF_LPCOMP_DT_INST_ENABLE_HYST(0)
-BUILD_ASSERT(NRF_LPCOMP_HAS_HYST);
-#endif
-
-static struct shim_nrf_lpcomp_data shim_nrf_lpcomp_data0;
-
-static const struct comp_nrf_lpcomp_config shim_nrf_lpcomp_config0 = {
-	.psel = SHIM_NRF_LPCOMP_DT_INST_PSEL(0),
-#if SHIM_NRF_LPCOMP_DT_INST_REFSEL_IS_AREF(0)
-	.extrefsel = SHIM_NRF_LPCOMP_DT_INST_EXTREFSEL(0),
-#endif
-	.refsel = SHIM_NRF_LPCOMP_DT_INST_REFSEL(0),
-	.enable_hyst = SHIM_NRF_LPCOMP_DT_INST_ENABLE_HYST(0),
-};
-
-#if CONFIG_PM_DEVICE
-static bool shim_nrf_lpcomp_is_resumed(void)
-{
-	enum pm_device_state state;
-
-	(void)pm_device_state_get(DEVICE_DT_INST_GET(0), &state);
-	return state == PM_DEVICE_STATE_ACTIVE;
-}
-#else
-static bool shim_nrf_lpcomp_is_resumed(void)
-{
-	return true;
-}
-#endif
-
-static void shim_nrf_lpcomp_start(void)
-{
-	if (shim_nrf_lpcomp_data0.started) {
-		return;
-	}
-
-	nrfx_lpcomp_start(shim_nrf_lpcomp_data0.event_mask, 0);
-	shim_nrf_lpcomp_data0.started = true;
-}
-
-static void shim_nrf_lpcomp_stop(void)
-{
-	if (!shim_nrf_lpcomp_data0.started) {
-		return;
-	}
-
-	nrfx_lpcomp_stop();
-	shim_nrf_lpcomp_data0.started = false;
-}
-
-static int shim_nrf_lpcomp_pm_callback(const struct device *dev, enum pm_device_action action)
-{
-	ARG_UNUSED(dev);
-
-	ARG_UNUSED(dev);
-
-	switch (action) {
-	case PM_DEVICE_ACTION_RESUME:
-		shim_nrf_lpcomp_start();
-		break;
-
-#if CONFIG_PM_DEVICE
-	case PM_DEVICE_ACTION_SUSPEND:
-		shim_nrf_lpcomp_stop();
-		break;
-#endif
-
-	default:
-		return -ENOTSUP;
-	}
-
-	return 0;
-}
-
-#if (NRF_LPCOMP_HAS_AIN_AS_PIN)
-static int shim_nrf_lpcomp_psel_to_nrf(enum comp_nrf_lpcomp_psel shim,
-				       nrf_lpcomp_input_t *nrf)
-{
-	if (shim >= ARRAY_SIZE(shim_nrf_lpcomp_ain_map)) {
-		return -EINVAL;
-	}
-
-	*nrf = shim_nrf_lpcomp_ain_map[(uint32_t)shim];
-	return 0;
-}
-#else
-static int shim_nrf_lpcomp_psel_to_nrf(enum comp_nrf_lpcomp_psel shim,
-				       nrf_lpcomp_input_t *nrf)
-{
-	switch (shim) {
-	case COMP_NRF_LPCOMP_PSEL_AIN0:
-		*nrf = NRF_LPCOMP_INPUT_0;
-		break;
-
-	case COMP_NRF_LPCOMP_PSEL_AIN1:
-		*nrf = NRF_LPCOMP_INPUT_1;
-		break;
-
-	case COMP_NRF_LPCOMP_PSEL_AIN2:
-		*nrf = NRF_LPCOMP_INPUT_2;
-		break;
-
-	case COMP_NRF_LPCOMP_PSEL_AIN3:
-		*nrf = NRF_LPCOMP_INPUT_3;
-		break;
-
-	case COMP_NRF_LPCOMP_PSEL_AIN4:
-		*nrf = NRF_LPCOMP_INPUT_4;
-		break;
-
-	case COMP_NRF_LPCOMP_PSEL_AIN5:
-		*nrf = NRF_LPCOMP_INPUT_5;
-		break;
-
-	case COMP_NRF_LPCOMP_PSEL_AIN6:
-		*nrf = NRF_LPCOMP_INPUT_6;
-		break;
-
-	case COMP_NRF_LPCOMP_PSEL_AIN7:
-		*nrf = NRF_LPCOMP_INPUT_7;
-		break;
-
-	default:
-		return -EINVAL;
-	}
-
-	return 0;
-}
-#endif
-
-#if (NRF_LPCOMP_HAS_AIN_AS_PIN)
-static int shim_nrf_lpcomp_extrefsel_to_nrf(enum comp_nrf_lpcomp_extrefsel shim,
-					    nrf_lpcomp_ext_ref_t *nrf)
-{
-	if (shim >= ARRAY_SIZE(shim_nrf_lpcomp_ain_map)) {
-		return -EINVAL;
-	}
-
-	*nrf = shim_nrf_lpcomp_ain_map[shim];
-	return 0;
-}
-#else
-static int shim_nrf_lpcomp_extrefsel_to_nrf(enum comp_nrf_lpcomp_extrefsel shim,
-					    nrf_lpcomp_ext_ref_t *nrf)
-{
-	switch (shim) {
-	case COMP_NRF_LPCOMP_EXTREFSEL_AIN0:
-		*nrf = NRF_LPCOMP_EXT_REF_REF0;
-		break;
-
-	case COMP_NRF_LPCOMP_EXTREFSEL_AIN1:
-		*nrf = NRF_LPCOMP_EXT_REF_REF1;
-		break;
-
-	default:
-		return -EINVAL;
-	}
-
-	return 0;
-}
-#endif
-
-static int shim_nrf_lpcomp_refsel_to_nrf(enum comp_nrf_lpcomp_refsel shim,
-					 nrf_lpcomp_ref_t *nrf)
-{
-	switch (shim) {
-	case COMP_NRF_LPCOMP_REFSEL_VDD_1_8:
-		*nrf = NRF_LPCOMP_REF_SUPPLY_1_8;
-		break;
-
-	case COMP_NRF_LPCOMP_REFSEL_VDD_2_8:
-		*nrf = NRF_LPCOMP_REF_SUPPLY_2_8;
-		break;
-
-	case COMP_NRF_LPCOMP_REFSEL_VDD_3_8:
-		*nrf = NRF_LPCOMP_REF_SUPPLY_3_8;
-		break;
-
-	case COMP_NRF_LPCOMP_REFSEL_VDD_4_8:
-		*nrf = NRF_LPCOMP_REF_SUPPLY_4_8;
-		break;
-
-	case COMP_NRF_LPCOMP_REFSEL_VDD_5_8:
-		*nrf = NRF_LPCOMP_REF_SUPPLY_5_8;
-		break;
-
-	case COMP_NRF_LPCOMP_REFSEL_VDD_6_8:
-		*nrf = NRF_LPCOMP_REF_SUPPLY_6_8;
-		break;
-
-	case COMP_NRF_LPCOMP_REFSEL_VDD_7_8:
-		*nrf = NRF_LPCOMP_REF_SUPPLY_7_8;
-		break;
-
-#if (LPCOMP_REFSEL_RESOLUTION == 16)
-	case COMP_NRF_LPCOMP_REFSEL_VDD_1_16:
-		*nrf = NRF_LPCOMP_REF_SUPPLY_1_16;
-		break;
-
-	case COMP_NRF_LPCOMP_REFSEL_VDD_3_16:
-		*nrf = NRF_LPCOMP_REF_SUPPLY_3_16;
-		break;
-
-	case COMP_NRF_LPCOMP_REFSEL_VDD_5_16:
-		*nrf = NRF_LPCOMP_REF_SUPPLY_5_16;
-		break;
-
-	case COMP_NRF_LPCOMP_REFSEL_VDD_7_16:
-		*nrf = NRF_LPCOMP_REF_SUPPLY_7_16;
-		break;
-
-	case COMP_NRF_LPCOMP_REFSEL_VDD_9_16:
-		*nrf = NRF_LPCOMP_REF_SUPPLY_9_16;
-		break;
-
-	case COMP_NRF_LPCOMP_REFSEL_VDD_11_16:
-		*nrf = NRF_LPCOMP_REF_SUPPLY_11_16;
-		break;
-
-	case COMP_NRF_LPCOMP_REFSEL_VDD_13_16:
-		*nrf = NRF_LPCOMP_REF_SUPPLY_13_16;
-		break;
-
-	case COMP_NRF_LPCOMP_REFSEL_VDD_15_16:
-		*nrf = NRF_LPCOMP_REF_SUPPLY_15_16;
-		break;
-#endif
-
-	case COMP_NRF_LPCOMP_REFSEL_AREF:
-		*nrf = NRF_LPCOMP_REF_EXT_REF;
-		break;
-
-	default:
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-static int shim_nrf_lpcomp_config_to_nrf(const struct comp_nrf_lpcomp_config *shim,
-					 nrfx_lpcomp_config_t *nrf)
-{
-	if (shim_nrf_lpcomp_refsel_to_nrf(shim->refsel, &nrf->reference)) {
-		return -EINVAL;
-	}
-
-	if (shim_nrf_lpcomp_extrefsel_to_nrf(shim->extrefsel, &nrf->ext_ref)) {
-		return -EINVAL;
-	}
-
-#if NRF_LPCOMP_HAS_HYST
-	if (shim->enable_hyst) {
-		nrf->hyst = NRF_LPCOMP_HYST_ENABLED;
-	} else {
-		nrf->hyst = NRF_LPCOMP_HYST_NOHYST;
-	}
-#else
-	if (shim->enable_hyst) {
-		return -EINVAL;
-	}
-#endif
-
-	if (shim_nrf_lpcomp_psel_to_nrf(shim->psel, &nrf->input)) {
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-static void shim_nrf_lpcomp_reconfigure(void)
-{
-	(void)nrfx_lpcomp_reconfigure(&shim_nrf_lpcomp_data0.config);
-}
-
-static int shim_nrf_lpcomp_get_output(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	return nrfx_lpcomp_sample();
-}
-
-static int shim_nrf_lpcomp_set_trigger(const struct device *dev,
-				       enum comparator_trigger trigger)
-{
-	shim_nrf_lpcomp_stop();
-
-	switch (trigger) {
-	case COMPARATOR_TRIGGER_NONE:
-		shim_nrf_lpcomp_data0.event_mask = 0;
-		shim_nrf_lpcomp_data0.config.detection = NRF_LPCOMP_DETECT_CROSS;
-		break;
-
-	case COMPARATOR_TRIGGER_RISING_EDGE:
-		shim_nrf_lpcomp_data0.event_mask = NRF_LPCOMP_INT_UP_MASK;
-		shim_nrf_lpcomp_data0.config.detection = NRF_LPCOMP_DETECT_UP;
-		break;
-
-	case COMPARATOR_TRIGGER_FALLING_EDGE:
-		shim_nrf_lpcomp_data0.event_mask = NRF_LPCOMP_INT_DOWN_MASK;
-		shim_nrf_lpcomp_data0.config.detection = NRF_LPCOMP_DETECT_DOWN;
-		break;
-
-	case COMPARATOR_TRIGGER_BOTH_EDGES:
-		shim_nrf_lpcomp_data0.event_mask = NRF_LPCOMP_INT_CROSS_MASK;
-		shim_nrf_lpcomp_data0.config.detection = NRF_LPCOMP_DETECT_CROSS;
-		break;
-	}
-
-	shim_nrf_lpcomp_reconfigure();
-
-	if (shim_nrf_lpcomp_is_resumed()) {
-		shim_nrf_lpcomp_start();
-	}
-
-	return 0;
-}
-
-static int shim_nrf_lpcomp_set_trigger_callback(const struct device *dev,
-						comparator_callback_t callback,
-						void *user_data)
-{
-	shim_nrf_lpcomp_stop();
-
-	shim_nrf_lpcomp_data0.callback = callback;
-	shim_nrf_lpcomp_data0.user_data = user_data;
-
-	if (callback != NULL && atomic_test_and_clear_bit(&shim_nrf_lpcomp_data0.triggered, 0)) {
-		callback(dev, user_data);
-	}
-
-	if (shim_nrf_lpcomp_is_resumed()) {
-		shim_nrf_lpcomp_start();
-	}
-
-	return 0;
-}
-
-static int shim_nrf_lpcomp_trigger_is_pending(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	return atomic_test_and_clear_bit(&shim_nrf_lpcomp_data0.triggered, 0);
-}
-
-static const struct comparator_driver_api shim_nrf_lpcomp_api = {
-	.get_output = shim_nrf_lpcomp_get_output,
-	.set_trigger = shim_nrf_lpcomp_set_trigger,
-	.set_trigger_callback = shim_nrf_lpcomp_set_trigger_callback,
-	.trigger_is_pending = shim_nrf_lpcomp_trigger_is_pending,
-};
-
-int comp_nrf_lpcomp_configure(const struct device *dev,
-			      const struct comp_nrf_lpcomp_config *config)
-{
-	nrfx_lpcomp_config_t nrf = {};
-
-	if (shim_nrf_lpcomp_config_to_nrf(config, &nrf)) {
-		return -EINVAL;
-	}
-
-	memcpy(&shim_nrf_lpcomp_data0.config, &nrf, sizeof(shim_nrf_lpcomp_data0.config));
-
-	shim_nrf_lpcomp_stop();
-	shim_nrf_lpcomp_reconfigure();
-	if (shim_nrf_lpcomp_is_resumed()) {
-		shim_nrf_lpcomp_start();
-	}
-
-	return 0;
-}
-
-static void shim_nrf_lpcomp_event_handler(nrf_lpcomp_event_t event)
-{
-	ARG_UNUSED(event);
-
-	if (shim_nrf_lpcomp_data0.callback == NULL) {
-		atomic_set_bit(&shim_nrf_lpcomp_data0.triggered, 0);
-		return;
-	}
-
-	shim_nrf_lpcomp_data0.callback(DEVICE_DT_INST_GET(0), shim_nrf_lpcomp_data0.user_data);
-	atomic_clear_bit(&shim_nrf_lpcomp_data0.triggered, 0);
-}
-
-static int shim_nrf_lpcomp_init(const struct device *dev)
-{
-	IRQ_CONNECT(DT_INST_IRQN(0),
-		    DT_INST_IRQ(0, priority),
-		    nrfx_isr,
-		    nrfx_lpcomp_irq_handler,
-		    0);
-
-	irq_enable(DT_INST_IRQN(0));
-
-	(void)shim_nrf_lpcomp_config_to_nrf(&shim_nrf_lpcomp_config0,
-					    &shim_nrf_lpcomp_data0.config);
-
-	if (nrfx_lpcomp_init(&shim_nrf_lpcomp_data0.config,
-			     shim_nrf_lpcomp_event_handler) != NRFX_SUCCESS) {
-		return -ENODEV;
-	}
-
-	return pm_device_driver_init(dev, shim_nrf_lpcomp_pm_callback);
-}
-
-PM_DEVICE_DT_INST_DEFINE(0, shim_nrf_lpcomp_pm_callback);
-
-DEVICE_DT_INST_DEFINE(0,
-		      shim_nrf_lpcomp_init,
-		      PM_DEVICE_DT_INST_GET(0),
-		      NULL,
-		      NULL,
-		      POST_KERNEL,
-		      CONFIG_COMPARATOR_INIT_PRIORITY,
-		      &shim_nrf_lpcomp_api);
diff --git a/dts/bindings/comparator/nordic,nrf-lpcomp.yaml b/dts/bindings/comparator/nordic,nrf-lpcomp.yaml
deleted file mode 100644
index 8f9cd91a6b7..00000000000
--- a/dts/bindings/comparator/nordic,nrf-lpcomp.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: |
-  Nordic nRF LPCOMP (analog Low-Power COMParator)
-
-  The following example displays the minimum node layout:
-
-    comp: comp@deadbeef {
-            compatible = "nordic,nrf-lpcomp";
-            reg = <0xdeadbeef 0x1000>;
-            interrupts = <0 NRF_DEFAULT_IRQ_PRIORITY>;
-            status = "disabled";
-    };
-
-  Enabling the comparator node requires setting the default
-  configuration of the comparator.
-
-  The following example displays enabling the comparator
-  using an internal reference:
-
-    &comp {
-            status = "okay";
-            psel = "AIN0";
-            refsel = "VDD_4_8";
-            hyst = "ENABLED";
-    };
-
-  To select an external reference, select the "AREF"
-  reference and add the external reference:
-
-    &comp {
-            ...
-            refsel = "AREF";
-            extrefsel = "AIN1";
-            ...
-    };
-
-compatible: "nordic,nrf-lpcomp"
-
-include: base.yaml
-
-properties:
-  psel:
-    type: string
-    enum:
-      - "AIN0"
-      - "AIN1"
-      - "AIN2"
-      - "AIN3"
-      - "AIN4"
-      - "AIN5"
-      - "AIN6"
-      - "AIN7"
-
-  extrefsel:
-    type: string
-    enum:
-      - "AIN0"
-      - "AIN1"
-
-  refsel:
-    type: string
-    enum:
-      - "VDD_1_8"
-      - "VDD_2_8"
-      - "VDD_3_8"
-      - "VDD_4_8"
-      - "VDD_5_8"
-      - "VDD_6_8"
-      - "VDD_7_8"
-      - "VDD_1_16"
-      - "VDD_3_16"
-      - "VDD_5_16"
-      - "VDD_7_16"
-      - "VDD_9_16"
-      - "VDD_11_16"
-      - "VDD_13_16"
-      - "VDD_15_16"
-      - "AREF"
-
-  enable-hyst:
-    type: boolean
diff --git a/dts/bindings/sensor/nordic,nrf-lpcomp.yaml b/dts/bindings/sensor/nordic,nrf-lpcomp.yaml
new file mode 100644
index 00000000000..132b0980ac5
--- /dev/null
+++ b/dts/bindings/sensor/nordic,nrf-lpcomp.yaml
@@ -0,0 +1,23 @@
+# Copyright (c) 2022, Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Nordic nRF family LPCOMP (Low-power Comparator)
+
+compatible: "nordic,nrf-lpcomp"
+
+include: base.yaml
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  "#io-channel-cells":
+    type: int
+    const: 1
+    required: true
+
+io-channel-cells:
+  - input
diff --git a/include/zephyr/drivers/comparator/nrf_lpcomp.h b/include/zephyr/drivers/comparator/nrf_lpcomp.h
deleted file mode 100644
index e1f2343a8de..00000000000
--- a/include/zephyr/drivers/comparator/nrf_lpcomp.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_DRIVERS_COMP_NRF_LPCOMP_H_
-#define ZEPHYR_INCLUDE_DRIVERS_COMP_NRF_LPCOMP_H_
-
-#include <zephyr/drivers/comparator.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Positive input selection */
-enum comp_nrf_lpcomp_psel {
-	/** AIN0 external input */
-	COMP_NRF_LPCOMP_PSEL_AIN0,
-	/** AIN1 external input */
-	COMP_NRF_LPCOMP_PSEL_AIN1,
-	/** AIN2 external input */
-	COMP_NRF_LPCOMP_PSEL_AIN2,
-	/** AIN3 external input */
-	COMP_NRF_LPCOMP_PSEL_AIN3,
-	/** AIN4 external input */
-	COMP_NRF_LPCOMP_PSEL_AIN4,
-	/** AIN5 external input */
-	COMP_NRF_LPCOMP_PSEL_AIN5,
-	/** AIN6 external input */
-	COMP_NRF_LPCOMP_PSEL_AIN6,
-	/** AIN7 external input */
-	COMP_NRF_LPCOMP_PSEL_AIN7,
-};
-
-/** External reference selection */
-enum comp_nrf_lpcomp_extrefsel {
-	/** AIN0 external input */
-	COMP_NRF_LPCOMP_EXTREFSEL_AIN0,
-	/** AIN1 external input */
-	COMP_NRF_LPCOMP_EXTREFSEL_AIN1,
-};
-
-/** Reference selection */
-enum comp_nrf_lpcomp_refsel {
-	/** Use (VDD * (1/8)) as reference */
-	COMP_NRF_LPCOMP_REFSEL_VDD_1_8,
-	/** Use (VDD * (2/8)) as reference */
-	COMP_NRF_LPCOMP_REFSEL_VDD_2_8,
-	/** Use (VDD * (3/8)) as reference */
-	COMP_NRF_LPCOMP_REFSEL_VDD_3_8,
-	/** Use (VDD * (4/8)) as reference */
-	COMP_NRF_LPCOMP_REFSEL_VDD_4_8,
-	/** Use (VDD * (5/8)) as reference */
-	COMP_NRF_LPCOMP_REFSEL_VDD_5_8,
-	/** Use (VDD * (6/8)) as reference */
-	COMP_NRF_LPCOMP_REFSEL_VDD_6_8,
-	/** Use (VDD * (7/8)) as reference */
-	COMP_NRF_LPCOMP_REFSEL_VDD_7_8,
-	/** Use (VDD * (1/16)) as reference */
-	COMP_NRF_LPCOMP_REFSEL_VDD_1_16,
-	/** Use (VDD * (3/16)) as reference */
-	COMP_NRF_LPCOMP_REFSEL_VDD_3_16,
-	/** Use (VDD * (5/16)) as reference */
-	COMP_NRF_LPCOMP_REFSEL_VDD_5_16,
-	/** Use (VDD * (7/16)) as reference */
-	COMP_NRF_LPCOMP_REFSEL_VDD_7_16,
-	/** Use (VDD * (9/16)) as reference */
-	COMP_NRF_LPCOMP_REFSEL_VDD_9_16,
-	/** Use (VDD * (11/16)) as reference */
-	COMP_NRF_LPCOMP_REFSEL_VDD_11_16,
-	/** Use (VDD * (13/16)) as reference */
-	COMP_NRF_LPCOMP_REFSEL_VDD_13_16,
-	/** Use (VDD * (15/16)) as reference */
-	COMP_NRF_LPCOMP_REFSEL_VDD_15_16,
-	/** Use external analog reference */
-	COMP_NRF_LPCOMP_REFSEL_AREF,
-};
-
-/**
- * @brief Configuration structure
- *
- * @note extrefsel is only used if refsel == COMP_NRF_LPCOMP_REFSEL_AREF
- */
-struct comp_nrf_lpcomp_config {
-	/** Positive input selection */
-	enum comp_nrf_lpcomp_psel psel;
-	/** External reference selection */
-	enum comp_nrf_lpcomp_extrefsel extrefsel;
-	/** Reference selection */
-	enum comp_nrf_lpcomp_refsel refsel;
-	/** Hysteresis configuration */
-	bool enable_hyst;
-};
-
-/**
- * @brief Configure comparator
- *
- * @param dev Comparator device instance
- * @param config Configuration
- *
- * @retval 0 if successful
- * @retval negative errno-code otherwise
- */
-int comp_nrf_lpcomp_configure(const struct device *dev,
-			      const struct comp_nrf_lpcomp_config *config);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZEPHYR_INCLUDE_DRIVERS_COMP_NRF_LPCOMP_H_ */

From 6a09daa99b9c12d673ca658ea8fa1a05b7cbe684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:39 +0100
Subject: [PATCH 1594/2913] Revert "[nrf fromtree] tests: drivers: build_all:
 add comparator test suite"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3a077555f59cd51357a7bbed4833ffd6974e4fa8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../build_all/comparator/CMakeLists.txt       |  8 ----
 .../comparator/nrf_comp/diff.overlay          | 14 ------
 .../build_all/comparator/nrf_comp/se.overlay  | 16 -------
 .../comparator/nrf_comp/se_aref.overlay       | 17 -------
 tests/drivers/build_all/comparator/prj.conf   |  6 ---
 tests/drivers/build_all/comparator/src/main.c | 10 ----
 .../build_all/comparator/testcase.yaml        | 48 -------------------
 7 files changed, 119 deletions(-)
 delete mode 100644 tests/drivers/build_all/comparator/CMakeLists.txt
 delete mode 100644 tests/drivers/build_all/comparator/nrf_comp/diff.overlay
 delete mode 100644 tests/drivers/build_all/comparator/nrf_comp/se.overlay
 delete mode 100644 tests/drivers/build_all/comparator/nrf_comp/se_aref.overlay
 delete mode 100644 tests/drivers/build_all/comparator/prj.conf
 delete mode 100644 tests/drivers/build_all/comparator/src/main.c
 delete mode 100644 tests/drivers/build_all/comparator/testcase.yaml

diff --git a/tests/drivers/build_all/comparator/CMakeLists.txt b/tests/drivers/build_all/comparator/CMakeLists.txt
deleted file mode 100644
index edb50bd78e5..00000000000
--- a/tests/drivers/build_all/comparator/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(build_all_comparator)
-
-target_sources(app PRIVATE src/main.c)
diff --git a/tests/drivers/build_all/comparator/nrf_comp/diff.overlay b/tests/drivers/build_all/comparator/nrf_comp/diff.overlay
deleted file mode 100644
index 8b8e9a02c2b..00000000000
--- a/tests/drivers/build_all/comparator/nrf_comp/diff.overlay
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&comp {
-	main-mode = "DIFF";
-	psel = "AIN0";
-	extrefsel = "AIN1";
-	sp-mode = "HIGH";
-	isource = "DISABLED";
-	status = "okay";
-};
diff --git a/tests/drivers/build_all/comparator/nrf_comp/se.overlay b/tests/drivers/build_all/comparator/nrf_comp/se.overlay
deleted file mode 100644
index e4eb56f61a9..00000000000
--- a/tests/drivers/build_all/comparator/nrf_comp/se.overlay
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&comp {
-	main-mode = "SE";
-	psel = "AIN0";
-	refsel = "INT_1V2";
-	sp-mode = "HIGH";
-	th-up = <36>;
-	th-down = <28>;
-	isource = "DISABLED";
-	status = "okay";
-};
diff --git a/tests/drivers/build_all/comparator/nrf_comp/se_aref.overlay b/tests/drivers/build_all/comparator/nrf_comp/se_aref.overlay
deleted file mode 100644
index 0d36a3e40b4..00000000000
--- a/tests/drivers/build_all/comparator/nrf_comp/se_aref.overlay
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&comp {
-	main-mode = "SE";
-	psel = "AIN0";
-	extrefsel = "AIN1";
-	refsel = "AREF";
-	sp-mode = "HIGH";
-	th-up = <36>;
-	th-down = <28>;
-	isource = "DISABLED";
-	status = "okay";
-};
diff --git a/tests/drivers/build_all/comparator/prj.conf b/tests/drivers/build_all/comparator/prj.conf
deleted file mode 100644
index 9e78e0bbe53..00000000000
--- a/tests/drivers/build_all/comparator/prj.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_TEST=y
-CONFIG_TEST_USERSPACE=y
-CONFIG_COMPARATOR=y
diff --git a/tests/drivers/build_all/comparator/src/main.c b/tests/drivers/build_all/comparator/src/main.c
deleted file mode 100644
index a05ee591430..00000000000
--- a/tests/drivers/build_all/comparator/src/main.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-int main(void)
-{
-	return 0;
-}
diff --git a/tests/drivers/build_all/comparator/testcase.yaml b/tests/drivers/build_all/comparator/testcase.yaml
deleted file mode 100644
index 9c94ef9a69e..00000000000
--- a/tests/drivers/build_all/comparator/testcase.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-common:
-  build_only: true
-  tags:
-    - drivers
-    - comparator
-tests:
-  drivers.build_all.comparator.nrf_comp.diff:
-    extra_args:
-      - DTC_OVERLAY_FILE="nrf_comp/diff.overlay"
-    platform_allow:
-      - nrf52dk/nrf52810
-      - nrf52dk/nrf52832
-      - nrf52833dk/nrf52820
-      - nrf52833dk/nrf52833
-      - nrf52840dk/nrf52811
-      - nrf52840dk/nrf52840
-      - nrf5340dk/nrf5340/cpuapp
-      - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf9280pdk/nrf9280/cpuapp
-  drivers.build_all.comparator.nrf_comp.se_aref:
-    extra_args:
-      - DTC_OVERLAY_FILE="nrf_comp/se_aref.overlay"
-    platform_allow:
-      - nrf52dk/nrf52810
-      - nrf52dk/nrf52832
-      - nrf52833dk/nrf52820
-      - nrf52833dk/nrf52833
-      - nrf52840dk/nrf52811
-      - nrf52840dk/nrf52840
-      - nrf5340dk/nrf5340/cpuapp
-      - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf9280pdk/nrf9280/cpuapp
-  drivers.build_all.comparator.nrf_comp.se:
-    extra_args:
-      - DTC_OVERLAY_FILE="nrf_comp/se.overlay"
-    platform_allow:
-      - nrf52dk/nrf52810
-      - nrf52dk/nrf52832
-      - nrf52833dk/nrf52820
-      - nrf52833dk/nrf52833
-      - nrf52840dk/nrf52811
-      - nrf52840dk/nrf52840
-      - nrf5340dk/nrf5340/cpuapp
-      - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf9280pdk/nrf9280/cpuapp

From 0530bcaf83d087c8616e4362ccf6135688d0ebfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:39 +0100
Subject: [PATCH 1595/2913] Revert "[nrf fromtree] drivers: comparator: Add nRF
 COMP device driver"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 981a79f2435c34a276336de0898a5a9f72e9b3ef.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/comparator/CMakeLists.txt            |   1 -
 drivers/comparator/Kconfig                   |   2 -
 drivers/comparator/Kconfig.nrf_comp          |   8 -
 drivers/comparator/comparator_nrf_comp.c     | 764 -------------------
 dts/bindings/comparator/nordic,nrf-comp.yaml | 128 ----
 dts/bindings/sensor/nordic,nrf-comp.yaml     |  23 +
 include/zephyr/drivers/comparator/nrf_comp.h | 164 ----
 7 files changed, 23 insertions(+), 1067 deletions(-)
 delete mode 100644 drivers/comparator/Kconfig.nrf_comp
 delete mode 100644 drivers/comparator/comparator_nrf_comp.c
 delete mode 100644 dts/bindings/comparator/nordic,nrf-comp.yaml
 create mode 100644 dts/bindings/sensor/nordic,nrf-comp.yaml
 delete mode 100644 include/zephyr/drivers/comparator/nrf_comp.h

diff --git a/drivers/comparator/CMakeLists.txt b/drivers/comparator/CMakeLists.txt
index 20aa301af7d..5f61892829d 100644
--- a/drivers/comparator/CMakeLists.txt
+++ b/drivers/comparator/CMakeLists.txt
@@ -6,4 +6,3 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/comparator.h)
 zephyr_library()
 
 zephyr_library_sources_ifdef(CONFIG_USERSPACE comparator_handlers.c)
-zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_COMP comparator_nrf_comp.c)
diff --git a/drivers/comparator/Kconfig b/drivers/comparator/Kconfig
index 84ea5c74baa..333fe6671a5 100644
--- a/drivers/comparator/Kconfig
+++ b/drivers/comparator/Kconfig
@@ -18,6 +18,4 @@ config COMPARATOR_INIT_PRIORITY
 	help
 	  Comparator device driver initialization priority.
 
-rsource "Kconfig.nrf_comp"
-
 endif # COMPARATOR
diff --git a/drivers/comparator/Kconfig.nrf_comp b/drivers/comparator/Kconfig.nrf_comp
deleted file mode 100644
index 0e0c889f3ee..00000000000
--- a/drivers/comparator/Kconfig.nrf_comp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config COMPARATOR_NRF_COMP
-	bool "Nordic COMP comparator driver"
-	default y
-	depends on DT_HAS_NORDIC_NRF_COMP_ENABLED
-	select NRFX_COMP
diff --git a/drivers/comparator/comparator_nrf_comp.c b/drivers/comparator/comparator_nrf_comp.c
deleted file mode 100644
index 339d24f8dcd..00000000000
--- a/drivers/comparator/comparator_nrf_comp.c
+++ /dev/null
@@ -1,764 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <nrfx_comp.h>
-
-#include <zephyr/drivers/comparator/nrf_comp.h>
-#include <zephyr/kernel.h>
-#include <zephyr/pm/device.h>
-
-#define DT_DRV_COMPAT nordic_nrf_comp
-
-#define SHIM_NRF_COMP_DT_INST_REFSEL(inst) \
-	_CONCAT(COMP_NRF_COMP_REFSEL_, DT_INST_STRING_TOKEN(inst, refsel))
-
-#define SHIM_NRF_COMP_DT_INST_REFSEL_IS_AREF(inst) \
-	DT_INST_ENUM_HAS_VALUE(inst, refsel, AREF)
-
-#define SHIM_NRF_COMP_DT_INST_EXTREFSEL(inst) \
-	_CONCAT(COMP_NRF_COMP_EXTREFSEL_, DT_INST_STRING_TOKEN(inst, extrefsel))
-
-#define SHIM_NRF_COMP_DT_INST_MAIN_MODE_IS_SE(inst) \
-	DT_INST_ENUM_HAS_VALUE(inst, main_mode, SE)
-
-#define SHIM_NRF_COMP_DT_INST_MAIN_MODE_IS_DIFF(inst) \
-	DT_INST_ENUM_HAS_VALUE(inst, main_mode, DIFF)
-
-#define SHIM_NRF_COMP_DT_INST_TH_DOWN(inst) \
-	DT_INST_PROP(inst, th_down)
-
-#define SHIM_NRF_COMP_DT_INST_TH_UP(inst) \
-	DT_INST_PROP(inst, th_up)
-
-#define SHIM_NRF_COMP_DT_INST_SP_MODE(inst) \
-	_CONCAT(COMP_NRF_COMP_SP_MODE_, DT_INST_STRING_TOKEN(inst, sp_mode))
-
-#define SHIM_NRF_COMP_DT_INST_ENABLE_HYST(inst) \
-	DT_INST_PROP(inst, enable_hyst)
-
-#define SHIM_NRF_COMP_DT_INST_ISOURCE(inst) \
-	_CONCAT(COMP_NRF_COMP_ISOURCE_, DT_INST_STRING_TOKEN(inst, isource))
-
-#define SHIM_NRF_COMP_DT_INST_PSEL(inst) \
-	_CONCAT(COMP_NRF_COMP_PSEL_, DT_INST_STRING_TOKEN(inst, psel))
-
-#if defined(COMP_HYST_HYST_Hyst40mV)
-#define NRF_COMP_HYST_ENABLED NRF_COMP_HYST_40MV
-#elif defined(COMP_HYST_HYST_Hyst50mV)
-#define NRF_COMP_HYST_ENABLED NRF_COMP_HYST_50MV
-#endif
-
-#define NRF_COMP_HYST_DISABLED NRF_COMP_HYST_NO_HYST
-
-#if defined(NRF_COMP_HYST_ENABLED)
-#define NRF_COMP_HAS_HYST 1
-#else
-#define NRF_COMP_HAS_HYST 0
-#endif
-
-struct shim_nrf_comp_data {
-	uint32_t event_mask;
-	bool started;
-	atomic_t triggered;
-	comparator_callback_t callback;
-	void *user_data;
-};
-
-#if (NRF_COMP_HAS_AIN_AS_PIN)
-static const uint32_t shim_nrf_comp_ain_map[] = {
-#if defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280)
-	NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(1U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(2U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(3U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
-#elif defined(CONFIG_SOC_NRF54L15)
-	NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(11U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(12U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(13U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(14U, 1),
-#endif
-};
-#endif
-
-#if SHIM_NRF_COMP_DT_INST_MAIN_MODE_IS_SE(0)
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_TH_DOWN(0) < 64);
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_TH_UP(0) < 64);
-#endif
-
-#if NRF_COMP_HAS_AIN_AS_PIN
-BUILD_ASSERT((COMP_NRF_COMP_PSEL_AIN0 == 0));
-BUILD_ASSERT((COMP_NRF_COMP_PSEL_AIN7 == 7));
-BUILD_ASSERT((COMP_NRF_COMP_EXTREFSEL_AIN0 == 0));
-BUILD_ASSERT((COMP_NRF_COMP_EXTREFSEL_AIN7 == 7));
-#else
-#ifndef COMP_PSEL_PSEL_AnalogInput4
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_PSEL(0) != COMP_NRF_COMP_PSEL_AIN4);
-#endif
-
-#ifndef COMP_PSEL_PSEL_AnalogInput5
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_PSEL(0) != COMP_NRF_COMP_PSEL_AIN5);
-#endif
-
-#ifndef COMP_PSEL_PSEL_AnalogInput6
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_PSEL(0) != COMP_NRF_COMP_PSEL_AIN6);
-#endif
-
-#ifndef COMP_PSEL_PSEL_AnalogInput7
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_PSEL(0) != COMP_NRF_COMP_PSEL_AIN7);
-#endif
-#endif
-
-#ifndef COMP_PSEL_PSEL_VddDiv2
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_PSEL(0) != COMP_NRF_COMP_PSEL_VDD_DIV2);
-#endif
-
-#ifndef COMP_PSEL_PSEL_VddhDiv5
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_PSEL(0) != COMP_NRF_COMP_PSEL_VDDH_DIV5);
-#endif
-
-#ifndef COMP_MODE_SP_Normal
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_SP_MODE(0) != COMP_NRF_COMP_SP_MODE_NORMAL);
-#endif
-
-#if NRF_COMP_HAS_ISOURCE
-#ifndef COMP_ISOURCE_ISOURCE_Ien2uA5
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_ISOURCE(0) != COMP_NRF_COMP_ISOURCE_2UA5);
-#endif
-
-#ifndef COMP_ISOURCE_ISOURCE_Ien5uA
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_ISOURCE(0) != COMP_NRF_COMP_ISOURCE_5UA);
-#endif
-
-#ifndef COMP_ISOURCE_ISOURCE_Ien10uA
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_ISOURCE(0) != COMP_NRF_COMP_ISOURCE_10UA);
-#endif
-#endif
-
-#if SHIM_NRF_COMP_DT_INST_REFSEL_IS_AREF(0)
-#ifndef COMP_EXTREFSEL_EXTREFSEL_AnalogReference4
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_EXTREFSEL(0) != COMP_NRF_COMP_EXTREFSEL_AIN4);
-#endif
-
-#ifndef COMP_EXTREFSEL_EXTREFSEL_AnalogReference5
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_EXTREFSEL(0) != COMP_NRF_COMP_EXTREFSEL_AIN5);
-#endif
-
-#ifndef COMP_EXTREFSEL_EXTREFSEL_AnalogReference6
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_EXTREFSEL(0) != COMP_NRF_COMP_EXTREFSEL_AIN6);
-#endif
-
-#ifndef COMP_EXTREFSEL_EXTREFSEL_AnalogReference7
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_EXTREFSEL(0) != COMP_NRF_COMP_EXTREFSEL_AIN7);
-#endif
-#endif
-
-#if SHIM_NRF_COMP_DT_INST_MAIN_MODE_IS_SE(0)
-#ifndef COMP_REFSEL_REFSEL_Int1V8
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_REFSEL(0) != COMP_NRF_COMP_REFSEL_INT_1V8);
-#endif
-
-#ifndef COMP_REFSEL_REFSEL_Int2V4
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_REFSEL(0) != COMP_NRF_COMP_REFSEL_INT_2V4);
-#endif
-
-#ifndef COMP_REFSEL_REFSEL_AVDDAO1V8
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_REFSEL(0) != COMP_NRF_COMP_REFSEL_AVDDAO1V8);
-#endif
-
-#ifndef COMP_REFSEL_REFSEL_VDD
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_REFSEL(0) != COMP_NRF_COMP_REFSEL_VDD);
-#endif
-#endif
-
-#if SHIM_NRF_COMP_DT_INST_MAIN_MODE_IS_DIFF(0)
-#if SHIM_NRF_COMP_DT_INST_ENABLE_HYST(0)
-BUILD_ASSERT(NRF_COMP_HAS_HYST);
-#endif
-#endif
-
-#if SHIM_NRF_COMP_DT_INST_MAIN_MODE_IS_SE(0)
-static const struct comp_nrf_comp_se_config shim_nrf_comp_config0 = {
-	.psel = SHIM_NRF_COMP_DT_INST_PSEL(0),
-	.sp_mode = SHIM_NRF_COMP_DT_INST_SP_MODE(0),
-	.isource = SHIM_NRF_COMP_DT_INST_ISOURCE(0),
-#if SHIM_NRF_COMP_DT_INST_REFSEL_IS_AREF(0)
-	.extrefsel = SHIM_NRF_COMP_DT_INST_EXTREFSEL(0),
-#endif
-	.refsel = SHIM_NRF_COMP_DT_INST_REFSEL(0),
-	.th_down = SHIM_NRF_COMP_DT_INST_TH_DOWN(0),
-	.th_up = SHIM_NRF_COMP_DT_INST_TH_UP(0),
-};
-#else
-static const struct comp_nrf_comp_diff_config shim_nrf_comp_config0 = {
-	.psel = SHIM_NRF_COMP_DT_INST_PSEL(0),
-	.sp_mode = SHIM_NRF_COMP_DT_INST_SP_MODE(0),
-	.isource = SHIM_NRF_COMP_DT_INST_ISOURCE(0),
-	.extrefsel = SHIM_NRF_COMP_DT_INST_EXTREFSEL(0),
-	.enable_hyst = SHIM_NRF_COMP_DT_INST_ENABLE_HYST(0),
-};
-#endif
-
-static struct shim_nrf_comp_data shim_nrf_comp_data0;
-
-#if CONFIG_PM_DEVICE
-static bool shim_nrf_comp_is_resumed(void)
-{
-	enum pm_device_state state;
-
-	(void)pm_device_state_get(DEVICE_DT_INST_GET(0), &state);
-	return state == PM_DEVICE_STATE_ACTIVE;
-}
-#else
-static bool shim_nrf_comp_is_resumed(void)
-{
-	return true;
-}
-#endif
-
-static void shim_nrf_comp_start(void)
-{
-	if (shim_nrf_comp_data0.started) {
-		return;
-	}
-
-	nrfx_comp_start(shim_nrf_comp_data0.event_mask, 0);
-	shim_nrf_comp_data0.started = true;
-}
-
-static void shim_nrf_comp_stop(void)
-{
-	if (!shim_nrf_comp_data0.started) {
-		return;
-	}
-
-	nrfx_comp_stop();
-	shim_nrf_comp_data0.started = false;
-}
-
-static int shim_nrf_comp_pm_callback(const struct device *dev, enum pm_device_action action)
-{
-	ARG_UNUSED(dev);
-
-	switch (action) {
-	case PM_DEVICE_ACTION_RESUME:
-		shim_nrf_comp_start();
-		break;
-
-#if CONFIG_PM_DEVICE
-	case PM_DEVICE_ACTION_SUSPEND:
-		shim_nrf_comp_stop();
-		break;
-#endif
-
-	default:
-		return -ENOTSUP;
-	}
-
-	return 0;
-}
-
-#if (NRF_COMP_HAS_AIN_AS_PIN)
-static int shim_nrf_comp_psel_to_nrf(enum comp_nrf_comp_psel shim,
-				     nrf_comp_input_t *nrf)
-{
-	if (shim >= ARRAY_SIZE(shim_nrf_comp_ain_map)) {
-		return -EINVAL;
-	}
-
-	*nrf = shim_nrf_comp_ain_map[(uint32_t)shim];
-	return 0;
-}
-#else
-static int shim_nrf_comp_psel_to_nrf(enum comp_nrf_comp_psel shim,
-				     nrf_comp_input_t *nrf)
-{
-	switch (shim) {
-	case COMP_NRF_COMP_PSEL_AIN0:
-		*nrf = NRF_COMP_INPUT_0;
-		break;
-
-	case COMP_NRF_COMP_PSEL_AIN1:
-		*nrf = NRF_COMP_INPUT_1;
-		break;
-
-	case COMP_NRF_COMP_PSEL_AIN2:
-		*nrf = NRF_COMP_INPUT_2;
-		break;
-
-	case COMP_NRF_COMP_PSEL_AIN3:
-		*nrf = NRF_COMP_INPUT_3;
-		break;
-
-#if defined(COMP_PSEL_PSEL_AnalogInput4)
-	case COMP_NRF_COMP_PSEL_AIN4:
-		*nrf = NRF_COMP_INPUT_4;
-		break;
-#endif
-
-#if defined(COMP_PSEL_PSEL_AnalogInput5)
-	case COMP_NRF_COMP_PSEL_AIN5:
-		*nrf = NRF_COMP_INPUT_5;
-		break;
-#endif
-
-#if defined(COMP_PSEL_PSEL_AnalogInput6)
-	case COMP_NRF_COMP_PSEL_AIN6:
-		*nrf = NRF_COMP_INPUT_6;
-		break;
-#endif
-
-#if defined(COMP_PSEL_PSEL_AnalogInput7)
-	case COMP_NRF_COMP_PSEL_AIN7:
-		*nrf = NRF_COMP_INPUT_7;
-		break;
-#endif
-
-#if defined(COMP_PSEL_PSEL_VddDiv2)
-	case COMP_NRF_COMP_PSEL_VDD_DIV2:
-		*nrf = NRF_COMP_VDD_DIV2;
-		break;
-#endif
-
-#if defined(COMP_PSEL_PSEL_VddhDiv5)
-	case COMP_NRF_COMP_PSEL_VDDH_DIV5:
-		*nrf = NRF_COMP_VDDH_DIV5;
-		break;
-#endif
-
-	default:
-		return -EINVAL;
-	}
-
-	return 0;
-}
-#endif
-
-static int shim_nrf_comp_sp_mode_to_nrf(enum comp_nrf_comp_sp_mode shim,
-					nrf_comp_sp_mode_t *nrf)
-{
-	switch (shim) {
-	case COMP_NRF_COMP_SP_MODE_LOW:
-		*nrf = NRF_COMP_SP_MODE_LOW;
-		break;
-
-#if defined(COMP_MODE_SP_Normal)
-	case COMP_NRF_COMP_SP_MODE_NORMAL:
-		*nrf = NRF_COMP_SP_MODE_NORMAL;
-		break;
-#endif
-
-	case COMP_NRF_COMP_SP_MODE_HIGH:
-		*nrf = NRF_COMP_SP_MODE_HIGH;
-		break;
-
-	default:
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-#if NRF_COMP_HAS_ISOURCE
-static int shim_nrf_comp_isource_to_nrf(enum comp_nrf_comp_isource shim,
-					nrf_isource_t *nrf)
-{
-	switch (shim) {
-	case COMP_NRF_COMP_ISOURCE_DISABLED:
-		*nrf = NRF_COMP_ISOURCE_OFF;
-		break;
-
-#if defined(COMP_ISOURCE_ISOURCE_Ien2uA5)
-	case COMP_NRF_COMP_ISOURCE_2UA5:
-		*nrf = NRF_COMP_ISOURCE_IEN_2UA5;
-		break;
-#endif
-
-#if defined(COMP_ISOURCE_ISOURCE_Ien5uA)
-	case COMP_NRF_COMP_ISOURCE_5UA:
-		*nrf = NRF_COMP_ISOURCE_IEN_5UA;
-		break;
-#endif
-
-#if defined(COMP_ISOURCE_ISOURCE_Ien10uA)
-	case COMP_NRF_COMP_ISOURCE_10UA:
-		*nrf = NRF_COMP_ISOURCE_IEN_10UA;
-		break;
-#endif
-
-	default:
-		return -EINVAL;
-	}
-
-	return 0;
-}
-#endif
-
-#if (NRF_COMP_HAS_AIN_AS_PIN)
-static int shim_nrf_comp_extrefsel_to_nrf(enum comp_nrf_comp_extrefsel shim,
-					  nrf_comp_ext_ref_t *nrf)
-{
-	if (shim >= ARRAY_SIZE(shim_nrf_comp_ain_map)) {
-		return -EINVAL;
-	}
-
-	*nrf = shim_nrf_comp_ain_map[(uint32_t)shim];
-	return 0;
-}
-#else
-static int shim_nrf_comp_extrefsel_to_nrf(enum comp_nrf_comp_extrefsel shim,
-					  nrf_comp_ext_ref_t *nrf)
-{
-	switch (shim) {
-	case COMP_NRF_COMP_EXTREFSEL_AIN0:
-		*nrf = NRF_COMP_EXT_REF_0;
-		break;
-
-	case COMP_NRF_COMP_EXTREFSEL_AIN1:
-		*nrf = NRF_COMP_EXT_REF_1;
-		break;
-
-	case COMP_NRF_COMP_EXTREFSEL_AIN2:
-		*nrf = NRF_COMP_EXT_REF_2;
-		break;
-
-	case COMP_NRF_COMP_EXTREFSEL_AIN3:
-		*nrf = NRF_COMP_EXT_REF_3;
-		break;
-
-#if defined(COMP_EXTREFSEL_EXTREFSEL_AnalogReference4)
-	case COMP_NRF_COMP_EXTREFSEL_AIN4:
-		*nrf = NRF_COMP_EXT_REF_4;
-		break;
-#endif
-
-#if defined(COMP_EXTREFSEL_EXTREFSEL_AnalogReference5)
-	case COMP_NRF_COMP_EXTREFSEL_AIN5:
-		*nrf = NRF_COMP_EXT_REF_5;
-		break;
-#endif
-
-#if defined(COMP_EXTREFSEL_EXTREFSEL_AnalogReference6)
-	case COMP_NRF_COMP_EXTREFSEL_AIN6:
-		*nrf = NRF_COMP_EXT_REF_6;
-		break;
-#endif
-
-#if defined(COMP_EXTREFSEL_EXTREFSEL_AnalogReference7)
-	case COMP_NRF_COMP_EXTREFSEL_AIN7:
-		*nrf = NRF_COMP_EXT_REF_7;
-		break;
-#endif
-
-	default:
-		return -EINVAL;
-	}
-
-	return 0;
-}
-#endif
-
-static int shim_nrf_comp_refsel_to_nrf(enum comp_nrf_comp_refsel shim,
-				       nrf_comp_ref_t *nrf)
-{
-	switch (shim) {
-	case COMP_NRF_COMP_REFSEL_INT_1V2:
-		*nrf = NRF_COMP_REF_INT_1V2;
-		break;
-
-#if defined(COMP_REFSEL_REFSEL_Int1V8)
-	case COMP_NRF_COMP_REFSEL_INT_1V8:
-		*nrf = NRF_COMP_REF_INT_1V8;
-		break;
-#endif
-
-#if defined(COMP_REFSEL_REFSEL_Int2V4)
-	case COMP_NRF_COMP_REFSEL_INT_2V4:
-		*nrf = NRF_COMP_REF_INT_2V4;
-		break;
-#endif
-
-#if defined(COMP_REFSEL_REFSEL_AVDDAO1V8)
-	case COMP_NRF_COMP_REFSEL_AVDDAO1V8:
-		*nrf = NRF_COMP_REF_AVDDAO1V8;
-		break;
-#endif
-
-#if defined(COMP_REFSEL_REFSEL_VDD)
-	case COMP_NRF_COMP_REFSEL_VDD:
-		*nrf = NRF_COMP_REF_VDD;
-		break;
-#endif
-
-	case COMP_NRF_COMP_REFSEL_AREF:
-		*nrf = NRF_COMP_REF_AREF;
-		break;
-
-	default:
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-static int shim_nrf_comp_se_config_to_nrf(const struct comp_nrf_comp_se_config *shim,
-					  nrfx_comp_config_t *nrf)
-{
-	if (shim_nrf_comp_refsel_to_nrf(shim->refsel, &nrf->reference)) {
-		return -EINVAL;
-	}
-
-	if (shim_nrf_comp_extrefsel_to_nrf(shim->extrefsel, &nrf->ext_ref)) {
-		return -EINVAL;
-	}
-
-	nrf->main_mode = NRF_COMP_MAIN_MODE_SE;
-
-	if (shim->th_down > 63 || shim->th_up > 63) {
-		return -EINVAL;
-	}
-
-	nrf->threshold.th_down = shim->th_down;
-	nrf->threshold.th_up = shim->th_up;
-
-	if (shim_nrf_comp_sp_mode_to_nrf(shim->sp_mode, &nrf->speed_mode)) {
-		return -EINVAL;
-	}
-
-	nrf->hyst = NRF_COMP_HYST_NO_HYST;
-
-#if NRF_COMP_HAS_ISOURCE
-	if (shim_nrf_comp_isource_to_nrf(shim->isource, &nrf->isource)) {
-		return -EINVAL;
-	}
-#else
-	if (shim->isource != COMP_NRF_COMP_ISOURCE_DISABLED) {
-		return -EINVAL;
-	}
-#endif
-
-	if (shim_nrf_comp_psel_to_nrf(shim->psel, &nrf->input)) {
-		return -EINVAL;
-	}
-
-	nrf->interrupt_priority = 0;
-	return 0;
-}
-
-static int shim_nrf_comp_diff_config_to_nrf(const struct comp_nrf_comp_diff_config *shim,
-					    nrfx_comp_config_t *nrf)
-{
-	nrf->reference = NRF_COMP_REF_AREF;
-
-	if (shim_nrf_comp_extrefsel_to_nrf(shim->extrefsel, &nrf->ext_ref)) {
-		return -EINVAL;
-	}
-
-	nrf->main_mode = NRF_COMP_MAIN_MODE_DIFF;
-	nrf->threshold.th_down = 0;
-	nrf->threshold.th_up = 0;
-
-	if (shim_nrf_comp_sp_mode_to_nrf(shim->sp_mode, &nrf->speed_mode)) {
-		return -EINVAL;
-	}
-
-#if NRF_COMP_HAS_HYST
-	if (shim->enable_hyst) {
-		nrf->hyst = NRF_COMP_HYST_ENABLED;
-	} else {
-		nrf->hyst = NRF_COMP_HYST_DISABLED;
-	}
-#else
-	if (shim->enable_hyst) {
-		return -EINVAL;
-	}
-#endif
-
-#if NRF_COMP_HAS_ISOURCE
-	if (shim_nrf_comp_isource_to_nrf(shim->isource, &nrf->isource)) {
-		return -EINVAL;
-	}
-#else
-	if (shim->isource != COMP_NRF_COMP_ISOURCE_DISABLED) {
-		return -EINVAL;
-	}
-#endif
-
-	if (shim_nrf_comp_psel_to_nrf(shim->psel, &nrf->input)) {
-		return -EINVAL;
-	}
-
-	nrf->interrupt_priority = 0;
-	return 0;
-}
-
-static int shim_nrf_comp_get_output(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	return nrfx_comp_sample();
-}
-
-static int shim_nrf_comp_set_trigger(const struct device *dev,
-				     enum comparator_trigger trigger)
-{
-	shim_nrf_comp_stop();
-
-	switch (trigger) {
-	case COMPARATOR_TRIGGER_NONE:
-		shim_nrf_comp_data0.event_mask = 0;
-		break;
-
-	case COMPARATOR_TRIGGER_RISING_EDGE:
-		shim_nrf_comp_data0.event_mask = NRF_COMP_INT_UP_MASK;
-		break;
-
-	case COMPARATOR_TRIGGER_FALLING_EDGE:
-		shim_nrf_comp_data0.event_mask = NRF_COMP_INT_DOWN_MASK;
-		break;
-
-	case COMPARATOR_TRIGGER_BOTH_EDGES:
-		shim_nrf_comp_data0.event_mask = NRF_COMP_INT_CROSS_MASK;
-		break;
-	}
-
-	if (shim_nrf_comp_is_resumed()) {
-		shim_nrf_comp_start();
-	}
-
-	return 0;
-}
-
-static int shim_nrf_comp_set_trigger_callback(const struct device *dev,
-					      comparator_callback_t callback,
-					      void *user_data)
-{
-	shim_nrf_comp_stop();
-
-	shim_nrf_comp_data0.callback = callback;
-	shim_nrf_comp_data0.user_data = user_data;
-
-	if (callback != NULL && atomic_test_and_clear_bit(&shim_nrf_comp_data0.triggered, 0)) {
-		callback(dev, user_data);
-	}
-
-	if (shim_nrf_comp_is_resumed()) {
-		shim_nrf_comp_start();
-	}
-
-	return 0;
-}
-
-static int shim_nrf_comp_trigger_is_pending(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	return atomic_test_and_clear_bit(&shim_nrf_comp_data0.triggered, 0);
-}
-
-static const struct comparator_driver_api shim_nrf_comp_api = {
-	.get_output = shim_nrf_comp_get_output,
-	.set_trigger = shim_nrf_comp_set_trigger,
-	.set_trigger_callback = shim_nrf_comp_set_trigger_callback,
-	.trigger_is_pending = shim_nrf_comp_trigger_is_pending,
-};
-
-static int shim_nrf_comp_reconfigure(const nrfx_comp_config_t *nrf)
-{
-	shim_nrf_comp_stop();
-
-	(void)nrfx_comp_reconfigure(nrf);
-
-	if (shim_nrf_comp_is_resumed()) {
-		shim_nrf_comp_start();
-	}
-
-	return 0;
-}
-
-int comp_nrf_comp_configure_se(const struct device *dev,
-			       const struct comp_nrf_comp_se_config *config)
-{
-	nrfx_comp_config_t nrf = {};
-
-	ARG_UNUSED(dev);
-
-	if (shim_nrf_comp_se_config_to_nrf(config, &nrf)) {
-		return -EINVAL;
-	}
-
-	return shim_nrf_comp_reconfigure(&nrf);
-}
-
-int comp_nrf_comp_configure_diff(const struct device *dev,
-				 const struct comp_nrf_comp_diff_config *config)
-{
-	nrfx_comp_config_t nrf = {};
-
-	ARG_UNUSED(dev);
-
-	if (shim_nrf_comp_diff_config_to_nrf(config, &nrf)) {
-		return -EINVAL;
-	}
-
-	return shim_nrf_comp_reconfigure(&nrf);
-}
-
-static void shim_nrf_comp_event_handler(nrf_comp_event_t event)
-{
-	ARG_UNUSED(event);
-
-	if (shim_nrf_comp_data0.callback == NULL) {
-		atomic_set_bit(&shim_nrf_comp_data0.triggered, 0);
-		return;
-	}
-
-	shim_nrf_comp_data0.callback(DEVICE_DT_INST_GET(0), shim_nrf_comp_data0.user_data);
-	atomic_clear_bit(&shim_nrf_comp_data0.triggered, 0);
-}
-
-static int shim_nrf_comp_init(const struct device *dev)
-{
-	nrfx_comp_config_t nrf = {};
-
-	IRQ_CONNECT(DT_INST_IRQN(0),
-		    DT_INST_IRQ(0, priority),
-		    nrfx_isr,
-		    nrfx_comp_irq_handler,
-		    0);
-
-	irq_enable(DT_INST_IRQN(0));
-
-#if SHIM_NRF_COMP_DT_INST_MAIN_MODE_IS_SE(0)
-	(void)shim_nrf_comp_se_config_to_nrf(&shim_nrf_comp_config0, &nrf);
-#else
-	(void)shim_nrf_comp_diff_config_to_nrf(&shim_nrf_comp_config0, &nrf);
-#endif
-
-	if (nrfx_comp_init(&nrf, shim_nrf_comp_event_handler) != NRFX_SUCCESS) {
-		return -ENODEV;
-	}
-
-	return pm_device_driver_init(dev, shim_nrf_comp_pm_callback);
-}
-
-PM_DEVICE_DT_INST_DEFINE(0, shim_nrf_comp_pm_callback);
-
-DEVICE_DT_INST_DEFINE(0,
-		      shim_nrf_comp_init,
-		      PM_DEVICE_DT_INST_GET(0),
-		      NULL,
-		      NULL,
-		      POST_KERNEL,
-		      CONFIG_COMPARATOR_INIT_PRIORITY,
-		      &shim_nrf_comp_api);
diff --git a/dts/bindings/comparator/nordic,nrf-comp.yaml b/dts/bindings/comparator/nordic,nrf-comp.yaml
deleted file mode 100644
index a6f7f32db5f..00000000000
--- a/dts/bindings/comparator/nordic,nrf-comp.yaml
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: |
-  Nordic nRF COMP (analog COMParator)
-
-  This comparator has varying configurations which require varying
-  properties be set in the devicetree.
-
-  The following example displays the minimum node layout:
-
-    comp: comp@deadbeef {
-            compatible = "nordic,nrf-comp";
-            reg = <0xdeadbeef 0x1000>;
-            interrupts = <0 NRF_DEFAULT_IRQ_PRIORITY>;
-            status = "disabled";
-    };
-
-  Enabling the comparator node requires setting the default
-  configuration of the comparator.
-
-  The following example displays enabling the comparator in
-  single-ended mode, selecting an internal reference:
-
-    &comp {
-            status = "okay";
-            main-mode = "SE";
-            psel = "AIN0";
-            refsel = "INT_1V2";
-            sp-mode = "NORMAL";
-            th-up = <36>;
-            th-down = <30>;
-            isource = "OFF";
-    };
-
-  To select an external reference, select the "AREF"
-  reference and add the external reference:
-
-    &comp {
-            ...
-            refsel = "AREF";
-            extrefsel = "AIN1";
-            ...
-    };
-
-  The following example displays enabling the comparator
-  in differential mode:
-
-    &comp {
-            status = "okay";
-            main-mode = "DIFF";
-            psel = "AIN0";
-            extrefsel = "AIN1";
-            sp-mode = "NORMAL";
-            hyst = "50MV";
-            isource = "OFF";
-    };
-
-compatible: "nordic,nrf-comp"
-
-include: base.yaml
-
-properties:
-  main-mode:
-    type: string
-    enum:
-      - "SE"
-      - "DIFF"
-
-  psel:
-    type: string
-    enum:
-      - "AIN0"
-      - "AIN1"
-      - "AIN2"
-      - "AIN3"
-      - "AIN4"
-      - "AIN5"
-      - "AIN6"
-      - "AIN7"
-      - "VDD_DIV2"
-      - "VDDH_DIV5"
-
-  extrefsel:
-    type: string
-    enum:
-      - "AIN0"
-      - "AIN1"
-      - "AIN2"
-      - "AIN3"
-      - "AIN4"
-      - "AIN5"
-      - "AIN6"
-      - "AIN7"
-
-  refsel:
-    type: string
-    enum:
-      - "INT_1V2"
-      - "INT_1V8"
-      - "INT_2V4"
-      - "AVDDAO1V8"
-      - "VDD"
-      - "AREF"
-
-  enable-hyst:
-    type: boolean
-
-  sp-mode:
-    type: string
-    enum:
-      - "LOW"
-      - "NORMAL"
-      - "HIGH"
-
-  th-up:
-    type: int
-
-  th-down:
-    type: int
-
-  isource:
-    type: string
-    enum:
-      - "DISABLED"
-      - "2UA5"
-      - "5UA"
-      - "10UA"
diff --git a/dts/bindings/sensor/nordic,nrf-comp.yaml b/dts/bindings/sensor/nordic,nrf-comp.yaml
new file mode 100644
index 00000000000..cc964015ba1
--- /dev/null
+++ b/dts/bindings/sensor/nordic,nrf-comp.yaml
@@ -0,0 +1,23 @@
+# Copyright (c) 2022, Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Nordic nRF family COMP (Comparator)
+
+compatible: "nordic,nrf-comp"
+
+include: base.yaml
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  "#io-channel-cells":
+    type: int
+    const: 1
+    required: true
+
+io-channel-cells:
+  - input
diff --git a/include/zephyr/drivers/comparator/nrf_comp.h b/include/zephyr/drivers/comparator/nrf_comp.h
deleted file mode 100644
index 59e1cbbb3ce..00000000000
--- a/include/zephyr/drivers/comparator/nrf_comp.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_DRIVERS_COMP_NRF_COMP_H_
-#define ZEPHYR_INCLUDE_DRIVERS_COMP_NRF_COMP_H_
-
-#include <zephyr/drivers/comparator.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Positive input selection */
-enum comp_nrf_comp_psel {
-	/** AIN0 external input */
-	COMP_NRF_COMP_PSEL_AIN0,
-	/** AIN1 external input */
-	COMP_NRF_COMP_PSEL_AIN1,
-	/** AIN2 external input */
-	COMP_NRF_COMP_PSEL_AIN2,
-	/** AIN3 external input */
-	COMP_NRF_COMP_PSEL_AIN3,
-	/** AIN4 external input */
-	COMP_NRF_COMP_PSEL_AIN4,
-	/** AIN5 external input */
-	COMP_NRF_COMP_PSEL_AIN5,
-	/** AIN6 external input */
-	COMP_NRF_COMP_PSEL_AIN6,
-	/** AIN7 external input */
-	COMP_NRF_COMP_PSEL_AIN7,
-	/** VDD / 2 */
-	COMP_NRF_COMP_PSEL_VDD_DIV2,
-	/** VDDH / 5 */
-	COMP_NRF_COMP_PSEL_VDDH_DIV5,
-};
-
-/** External reference selection */
-enum comp_nrf_comp_extrefsel {
-	/** AIN0 external input */
-	COMP_NRF_COMP_EXTREFSEL_AIN0,
-	/** AIN1 external input */
-	COMP_NRF_COMP_EXTREFSEL_AIN1,
-	/** AIN2 external input */
-	COMP_NRF_COMP_EXTREFSEL_AIN2,
-	/** AIN3 external input */
-	COMP_NRF_COMP_EXTREFSEL_AIN3,
-	/** AIN4 external input */
-	COMP_NRF_COMP_EXTREFSEL_AIN4,
-	/** AIN5 external input */
-	COMP_NRF_COMP_EXTREFSEL_AIN5,
-	/** AIN6 external input */
-	COMP_NRF_COMP_EXTREFSEL_AIN6,
-	/** AIN7 external input */
-	COMP_NRF_COMP_EXTREFSEL_AIN7,
-};
-
-/** Reference selection */
-enum comp_nrf_comp_refsel {
-	/** Internal 1.2V reference */
-	COMP_NRF_COMP_REFSEL_INT_1V2,
-	/** Internal 1.8V reference */
-	COMP_NRF_COMP_REFSEL_INT_1V8,
-	/** Internal 2.4V reference */
-	COMP_NRF_COMP_REFSEL_INT_2V4,
-	/** AVDD 1.8V reference */
-	COMP_NRF_COMP_REFSEL_AVDDAO1V8,
-	/** VDD reference */
-	COMP_NRF_COMP_REFSEL_VDD,
-	/** Use external analog reference */
-	COMP_NRF_COMP_REFSEL_AREF,
-};
-
-/** Speed mode selection */
-enum comp_nrf_comp_sp_mode {
-	/** Low-power mode */
-	COMP_NRF_COMP_SP_MODE_LOW,
-	/** Normal mode */
-	COMP_NRF_COMP_SP_MODE_NORMAL,
-	/** High-speed mode */
-	COMP_NRF_COMP_SP_MODE_HIGH,
-};
-
-/** Current source configuration */
-enum comp_nrf_comp_isource {
-	/** Current source disabled */
-	COMP_NRF_COMP_ISOURCE_DISABLED,
-	/** 2.5uA current source enabled */
-	COMP_NRF_COMP_ISOURCE_2UA5,
-	/** 5uA current source enabled */
-	COMP_NRF_COMP_ISOURCE_5UA,
-	/** 10uA current source enabled */
-	COMP_NRF_COMP_ISOURCE_10UA,
-};
-
-/**
- * @brief Single-ended mode configuration structure
- *
- * @note extrefsel is only used if refsel == COMP_NRF_COMP_REFSEL_AREF
- * @note Hysteresis down in volts = ((th_down + 1) / 64) * ref
- * @note Hysteresis up in volts = ((th_up + 1) / 64) * ref
- */
-struct comp_nrf_comp_se_config {
-	/** Positive input selection */
-	enum comp_nrf_comp_psel psel;
-	/** Speed mode selection */
-	enum comp_nrf_comp_sp_mode sp_mode;
-	/** Current source configuration */
-	enum comp_nrf_comp_isource isource;
-	/** External reference selection */
-	enum comp_nrf_comp_extrefsel extrefsel;
-	/** Reference selection */
-	enum comp_nrf_comp_refsel refsel;
-	/** Hysteresis down threshold configuration */
-	uint8_t th_down;
-	/** Hysteresis up threshold configuration */
-	uint8_t th_up;
-};
-
-/**
- * @brief Configure comparator in single-ended mode
- *
- * @param dev Comparator device instance
- * @param config Single-ended mode configuration
- *
- * @retval 0 if successful
- * @retval negative errno-code otherwise
- */
-int comp_nrf_comp_configure_se(const struct device *dev,
-			       const struct comp_nrf_comp_se_config *config);
-
-/** Differential mode configuration structure */
-struct comp_nrf_comp_diff_config {
-	/** Positive input selection */
-	enum comp_nrf_comp_psel psel;
-	/** Speed mode selection */
-	enum comp_nrf_comp_sp_mode sp_mode;
-	/** Current source configuration */
-	enum comp_nrf_comp_isource isource;
-	/** Negative input selection */
-	enum comp_nrf_comp_extrefsel extrefsel;
-	/** Hysteresis configuration */
-	bool enable_hyst;
-};
-
-/**
- * @brief Configure comparator in differential mode
- *
- * @param dev Comparator device instance
- * @param config Differential mode configuration
- *
- * @retval 0 if successful
- * @retval negative errno-code otherwise
- */
-int comp_nrf_comp_configure_diff(const struct device *dev,
-				 const struct comp_nrf_comp_diff_config *config);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZEPHYR_INCLUDE_DRIVERS_COMP_NRF_COMP_H_ */

From 75d479f6758746e9e1f377ccc8344b0c89f5e6c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:39 +0100
Subject: [PATCH 1596/2913] Revert "[nrf fromtree] dts: common: nordic: adjust
 comparator nodes"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1cd07dd748ef5ce64c08ec6a5b16e70227201477.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/arm/nordic/nrf52810.dtsi                   |  1 +
 dts/arm/nordic/nrf52811.dtsi                   |  1 +
 dts/arm/nordic/nrf52820.dtsi                   |  1 +
 dts/arm/nordic/nrf52832.dtsi                   |  7 +++++--
 dts/arm/nordic/nrf52833.dtsi                   |  7 +++++--
 dts/arm/nordic/nrf52840.dtsi                   |  7 +++++--
 dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi |  7 +++++--
 dts/common/nordic/nrf54h20.dtsi                |  5 +----
 dts/common/nordic/nrf54l15.dtsi                | 11 -----------
 dts/common/nordic/nrf9280.dtsi                 |  5 +----
 10 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
index df3e7ab9fa6..7cdca229120 100644
--- a/dts/arm/nordic/nrf52810.dtsi
+++ b/dts/arm/nordic/nrf52810.dtsi
@@ -268,6 +268,7 @@
 			reg = <0x40013000 0x1000>;
 			interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
+			#io-channel-cells = <1>;
 		};
 
 		egu0: swi0: egu@40014000 {
diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi
index 415ece78612..99815337203 100644
--- a/dts/arm/nordic/nrf52811.dtsi
+++ b/dts/arm/nordic/nrf52811.dtsi
@@ -300,6 +300,7 @@
 			reg = <0x40013000 0x1000>;
 			interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
+			#io-channel-cells = <1>;
 		};
 
 		egu0: swi0: egu@40014000 {
diff --git a/dts/arm/nordic/nrf52820.dtsi b/dts/arm/nordic/nrf52820.dtsi
index 4ddecb86a85..1553a6481d2 100644
--- a/dts/arm/nordic/nrf52820.dtsi
+++ b/dts/arm/nordic/nrf52820.dtsi
@@ -312,6 +312,7 @@
 			reg = <0x40013000 0x1000>;
 			interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
+			#io-channel-cells = <1>;
 		};
 
 		egu0: swi0: egu@40014000 {
diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
index cd2115028ca..d40d48eb947 100644
--- a/dts/arm/nordic/nrf52832.dtsi
+++ b/dts/arm/nordic/nrf52832.dtsi
@@ -309,13 +309,16 @@
 
 		comp: comparator@40013000 {
 			/*
-			 * Use compatible "nordic,nrf-comp" to configure as COMP
-			 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
+			 * This comparator node can be COMP or LPCOMP,
+			 * for the user to pick:
+			 * compatible = "nordic,nrf-comp" or
+			 *              "nordic,nrf-lpcomp".
 			 */
 			compatible = "nordic,nrf-comp";
 			reg = <0x40013000 0x1000>;
 			interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
+			#io-channel-cells = <1>;
 		};
 
 		egu0: swi0: egu@40014000 {
diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi
index 60291420be9..b3661a2ebe0 100644
--- a/dts/arm/nordic/nrf52833.dtsi
+++ b/dts/arm/nordic/nrf52833.dtsi
@@ -324,13 +324,16 @@
 
 		comp: comparator@40013000 {
 			/*
-			 * Use compatible "nordic,nrf-comp" to configure as COMP
-			 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
+			 * This comparator node can be COMP or LPCOMP,
+			 * for the user to pick:
+			 * compatible = "nordic,nrf-comp" or
+			 *              "nordic,nrf-lpcomp".
 			 */
 			compatible = "nordic,nrf-comp";
 			reg = <0x40013000 0x1000>;
 			interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
+			#io-channel-cells = <1>;
 		};
 
 		egu0: swi0: egu@40014000 {
diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index b9c1655a614..85520958568 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -311,13 +311,16 @@
 
 		comp: comparator@40013000 {
 			/*
-			 * Use compatible "nordic,nrf-comp" to configure as COMP
-			 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
+			 * This comparator node can be COMP or LPCOMP,
+			 * for the user to pick:
+			 * compatible = "nordic,nrf-comp" or
+			 *              "nordic,nrf-lpcomp".
 			 */
 			compatible = "nordic,nrf-comp";
 			reg = <0x40013000 0x1000>;
 			interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
+			#io-channel-cells = <1>;
 		};
 
 		egu0: swi0: egu@40014000 {
diff --git a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
index 50842fb3801..7d79b227be2 100644
--- a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
@@ -350,13 +350,16 @@ wdt1: watchdog@19000 {
 
 comp: comparator@1a000 {
 	/*
-	 * Use compatible "nordic,nrf-comp" to configure as COMP
-	 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
+	 * This comparator node can be COMP or LPCOMP,
+	 * for the user to pick:
+	 * compatible = "nordic,nrf-comp" or
+	 *              "nordic,nrf-lpcomp".
 	 */
 	compatible = "nordic,nrf-comp";
 	reg = <0x1a000 0x1000>;
 	interrupts = <26 NRF_DEFAULT_IRQ_PRIORITY>;
 	status = "disabled";
+	#io-channel-cells = <1>;
 };
 
 egu0: egu@1b000 {
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index a4b8f0d5530..6e1a57f4485 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -824,14 +824,11 @@
 			};
 
 			comp: comparator@983000 {
-				/*
-				 * Use compatible "nordic,nrf-comp" to configure as COMP
-				 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
-				 */
 				compatible = "nordic,nrf-comp";
 				reg = <0x983000 0x1000>;
 				status = "disabled";
 				interrupts = <387 NRF_DEFAULT_IRQ_PRIORITY>;
+				#io-channel-cells = <1>;
 			};
 
 			temp: temperature-sensor@984000 {
diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index 75fea0e22b0..3098aa7f29b 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -562,17 +562,6 @@
 				frame-timeout-supported;
 			};
 
-			comp: comparator@106000 {
-				/*
-				 * Use compatible "nordic,nrf-comp" to configure as COMP
-				 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
-				 */
-				compatible = "nordic,nrf-comp";
-				reg = <0x106000 0x1000>;
-				status = "disabled";
-				interrupts = <262 NRF_DEFAULT_IRQ_PRIORITY>;
-			};
-
 #ifdef USE_NON_SECURE_ADDRESS_MAP
 			/* intentionally empty because WDT30 is hardware fixed to Secure */
 #else
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 45b05f9262e..ae3ffc904d2 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -727,14 +727,11 @@
 			};
 
 			comp: comparator@983000 {
-				/*
-				 * Use compatible "nordic,nrf-comp" to configure as COMP
-				 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
-				 */
 				compatible = "nordic,nrf-comp";
 				reg = <0x983000 0x1000>;
 				status = "disabled";
 				interrupts = <387 NRF_DEFAULT_IRQ_PRIORITY>;
+				#io-channel-cells = <1>;
 			};
 
 			temp: temperature-sensor@984000 {

From 608ccc1104cb06d9d79b14e70feb9ee9ac646099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:39 +0100
Subject: [PATCH 1597/2913] Revert "[nrf fromtree] drivers: comparator: Add
 initial files"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a94590357d0abe7e3f842902a96ea3a63212e7fe.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/CMakeLists.txt                   |  1 -
 drivers/Kconfig                          |  1 -
 drivers/comparator/CMakeLists.txt        |  8 -------
 drivers/comparator/Kconfig               | 21 -----------------
 drivers/comparator/comparator_handlers.c | 30 ------------------------
 5 files changed, 61 deletions(-)
 delete mode 100644 drivers/comparator/CMakeLists.txt
 delete mode 100644 drivers/comparator/Kconfig
 delete mode 100644 drivers/comparator/comparator_handlers.c

diff --git a/drivers/CMakeLists.txt b/drivers/CMakeLists.txt
index 05be8c3fd01..acf20d2867c 100644
--- a/drivers/CMakeLists.txt
+++ b/drivers/CMakeLists.txt
@@ -24,7 +24,6 @@ add_subdirectory_ifdef(CONFIG_CACHE_MANAGEMENT cache)
 add_subdirectory_ifdef(CONFIG_CAN can)
 add_subdirectory_ifdef(CONFIG_CHARGER charger)
 add_subdirectory_ifdef(CONFIG_CLOCK_CONTROL clock_control)
-add_subdirectory_ifdef(CONFIG_COMPARATOR comparator)
 add_subdirectory_ifdef(CONFIG_CONSOLE console)
 add_subdirectory_ifdef(CONFIG_COREDUMP_DEVICE coredump)
 add_subdirectory_ifdef(CONFIG_COUNTER counter)
diff --git a/drivers/Kconfig b/drivers/Kconfig
index db80ba39a66..ec9e0c77b6d 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -15,7 +15,6 @@ source "drivers/cache/Kconfig"
 source "drivers/can/Kconfig"
 source "drivers/charger/Kconfig"
 source "drivers/clock_control/Kconfig"
-source "drivers/comparator/Kconfig"
 source "drivers/console/Kconfig"
 source "drivers/coredump/Kconfig"
 source "drivers/counter/Kconfig"
diff --git a/drivers/comparator/CMakeLists.txt b/drivers/comparator/CMakeLists.txt
deleted file mode 100644
index 5f61892829d..00000000000
--- a/drivers/comparator/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/comparator.h)
-
-zephyr_library()
-
-zephyr_library_sources_ifdef(CONFIG_USERSPACE comparator_handlers.c)
diff --git a/drivers/comparator/Kconfig b/drivers/comparator/Kconfig
deleted file mode 100644
index 333fe6671a5..00000000000
--- a/drivers/comparator/Kconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-menuconfig COMPARATOR
-	bool "Comparator drivers"
-	help
-	  Enable comparator driver configuration.
-
-if COMPARATOR
-
-module = COMPARATOR
-module-str = comparator
-source "subsys/logging/Kconfig.template.log_config"
-
-config COMPARATOR_INIT_PRIORITY
-	int "COMPARATOR init priority"
-	default KERNEL_INIT_PRIORITY_DEVICE
-	help
-	  Comparator device driver initialization priority.
-
-endif # COMPARATOR
diff --git a/drivers/comparator/comparator_handlers.c b/drivers/comparator/comparator_handlers.c
deleted file mode 100644
index fba43a9ce8e..00000000000
--- a/drivers/comparator/comparator_handlers.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/drivers/comparator.h>
-#include <zephyr/internal/syscall_handler.h>
-
-static inline int z_vrfy_comparator_get_output(const struct device *dev)
-{
-	K_OOPS(K_SYSCALL_DRIVER_COMPARATOR(dev, get_output));
-	return z_impl_comparator_get_output(dev);
-}
-#include <zephyr/syscalls/comparator_get_output_mrsh.c>
-
-static inline int z_vrfy_comparator_set_trigger(const struct device *dev,
-						enum comparator_trigger trigger)
-{
-	K_OOPS(K_SYSCALL_DRIVER_COMPARATOR(dev, set_trigger));
-	return z_impl_comparator_set_trigger(dev, trigger);
-}
-#include <zephyr/syscalls/comparator_set_trigger_mrsh.c>
-
-static inline int z_vrfy_comparator_trigger_is_pending(const struct device *dev)
-{
-	K_OOPS(K_SYSCALL_DRIVER_COMPARATOR(dev, trigger_is_pending));
-	return z_impl_comparator_trigger_is_pending(dev);
-}
-#include <zephyr/syscalls/comparator_trigger_is_pending_mrsh.c>

From 32a2792b10164502c5c77f21f6dd44191d371f15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:39 +0100
Subject: [PATCH 1598/2913] Revert "[nrf fromtree] drivers: Add comparator API"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fbfb655d72d72e4ca25dca5e03bf6567e72060bf.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/drivers/comparator.h | 150 ----------------------------
 1 file changed, 150 deletions(-)
 delete mode 100644 include/zephyr/drivers/comparator.h

diff --git a/include/zephyr/drivers/comparator.h b/include/zephyr/drivers/comparator.h
deleted file mode 100644
index 3d246fea5ff..00000000000
--- a/include/zephyr/drivers/comparator.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_DRIVERS_COMPARATOR_H_
-#define ZEPHYR_INCLUDE_DRIVERS_COMPARATOR_H_
-
-/**
- * @brief Comparator Interface
- * @defgroup comparator_interface Comparator Interface
- * @since 3.7
- * @version 0.1.0
- * @ingroup io_interfaces
- * @{
- */
-
-#include <zephyr/device.h>
-#include <errno.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Comparator trigger enumerations */
-enum comparator_trigger {
-	/** No trigger */
-	COMPARATOR_TRIGGER_NONE = 0,
-	/** Trigger on rising edge of comparator output */
-	COMPARATOR_TRIGGER_RISING_EDGE,
-	/** Trigger on falling edge of comparator output */
-	COMPARATOR_TRIGGER_FALLING_EDGE,
-	/** Trigger on both edges of comparator output */
-	COMPARATOR_TRIGGER_BOTH_EDGES
-};
-
-/** Comparator callback template */
-typedef void (*comparator_callback_t)(const struct device *dev, void *user_data);
-
-/** @cond INTERNAL_HIDDEN */
-
-typedef int (*comparator_api_get_output)(const struct device *dev);
-typedef int (*comparator_api_set_trigger)(const struct device *dev,
-					  enum comparator_trigger trigger);
-typedef int (*comparator_api_set_trigger_callback)(const struct device *dev,
-						   comparator_callback_t callback,
-						   void *user_data);
-typedef int (*comparator_api_trigger_is_pending)(const struct device *dev);
-
-__subsystem struct comparator_driver_api {
-	comparator_api_get_output get_output;
-	comparator_api_set_trigger set_trigger;
-	comparator_api_set_trigger_callback set_trigger_callback;
-	comparator_api_trigger_is_pending trigger_is_pending;
-};
-
-/** @endcond */
-
-/**
- * @brief Get comparator's output state
- *
- * @param dev Comparator device
- *
- * @retval 1 Output state is high
- * @retval 0 Output state is low
- * @retval -errno code Failure
- */
-__syscall int comparator_get_output(const struct device *dev);
-
-static inline int z_impl_comparator_get_output(const struct device *dev)
-{
-	const struct comparator_driver_api *api =
-		(const struct comparator_driver_api *)dev->api;
-
-	return api->get_output(dev);
-}
-
-/**
- * @brief Set comparator's trigger
- *
- * @param dev Comparator device
- * @param trigger Trigger for signal and callback
- *
- * @retval 0 Successful
- * @retval -errno code Failure
- */
-__syscall int comparator_set_trigger(const struct device *dev,
-				     enum comparator_trigger trigger);
-
-static inline int z_impl_comparator_set_trigger(const struct device *dev,
-						enum comparator_trigger trigger)
-{
-	const struct comparator_driver_api *api =
-		(const struct comparator_driver_api *)dev->api;
-
-	return api->set_trigger(dev, trigger);
-}
-
-/**
- * @brief Set comparator's trigger callback
- *
- * @param dev Comparator device
- * @param callback Trigger callback
- * @param user_data User data passed to callback
- *
- * @retval 0 Successful
- * @retval -errno code Failure
- *
- * @note Set callback to NULL to disable callback
- * @note Callback is called immediately if trigger is pending
- */
-static inline int comparator_set_trigger_callback(const struct device *dev,
-						  comparator_callback_t callback,
-						  void *user_data)
-{
-	const struct comparator_driver_api *api =
-		(const struct comparator_driver_api *)dev->api;
-
-	return api->set_trigger_callback(dev, callback, user_data);
-}
-
-/**
- * @brief Check if comparator's trigger is pending and clear it
- *
- * @param dev Comparator device
- *
- * @retval 1 Trigger was pending
- * @retval 0 Trigger was cleared
- * @retval -errno code Failure
- */
-__syscall int comparator_trigger_is_pending(const struct device *dev);
-
-static inline int z_impl_comparator_trigger_is_pending(const struct device *dev)
-{
-	const struct comparator_driver_api *api =
-		(const struct comparator_driver_api *)dev->api;
-
-	return api->trigger_is_pending(dev);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-/** @} */
-
-#include <zephyr/syscalls/comparator.h>
-
-#endif /* ZEPHYR_INCLUDE_DRIVERS_COMPARATOR_H_ */

From fe0dfbcaaf42e98deba17b0f76622376d214a769 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:39 +0100
Subject: [PATCH 1599/2913] Revert "[nrf fromtree] net: lib: capture: Fix build
 error"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 610808650925034c3a69ba62a532d4ecf44cd547.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/capture/capture.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/subsys/net/lib/capture/capture.c b/subsys/net/lib/capture/capture.c
index 122096c96fc..7b7f135c251 100644
--- a/subsys/net/lib/capture/capture.c
+++ b/subsys/net/lib/capture/capture.c
@@ -42,8 +42,7 @@ NET_PKT_SLAB_DEFINE(capture_pkts, CONFIG_NET_CAPTURE_PKT_COUNT);
 NET_BUF_POOL_FIXED_DEFINE(capture_bufs, CONFIG_NET_CAPTURE_BUF_COUNT,
 			  CONFIG_NET_BUF_DATA_SIZE, 4, NULL);
 #else
-#define DATA_POOL_SIZE MAX(CONFIG_NET_PKT_BUF_RX_DATA_POOL_SIZE, \
-			   CONFIG_NET_PKT_BUF_TX_DATA_POOL_SIZE)
+#define DATA_POOL_SIZE MAX(NET_PKT_BUF_RX_DATA_POOL_SIZE, NET_PKT_BUF_TX_DATA_POOL_SIZE)
 
 NET_BUF_POOL_VAR_DEFINE(capture_bufs, CONFIG_NET_CAPTURE_BUF_COUNT,
 			DATA_POOL_SIZE, 4, NULL);

From 0455e9db4baa9e57dbe8867b7d62d8d8cc307183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:39 +0100
Subject: [PATCH 1600/2913] Revert "[nrf fromlist] drivers: nrfwifi: Fix memory
 leak in TX path"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1b78473e46faa2e5ba33439acc4247b1d7d81146.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/net_if.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
index a4404cfb1a7..b8ca8915ff4 100644
--- a/drivers/wifi/nrfwifi/src/net_if.c
+++ b/drivers/wifi/nrfwifi/src/net_if.c
@@ -389,7 +389,7 @@ int nrf_wifi_if_send(const struct device *dev,
 #ifdef CONFIG_NRF70_RAW_DATA_TX
 	if ((*(unsigned int *)pkt->frags->data) == NRF_WIFI_MAGIC_NUM_RAWTX) {
 		if (vif_ctx_zep->if_carr_state != NRF_WIFI_FMAC_IF_CARR_STATE_ON) {
-			goto drop;
+			goto unlock;
 		}
 
 		ret = nrf_wifi_fmac_start_rawpkt_xmit(rpu_ctx_zep->rpu_ctx,
@@ -399,7 +399,7 @@ int nrf_wifi_if_send(const struct device *dev,
 #endif /* CONFIG_NRF70_RAW_DATA_TX */
 		if ((vif_ctx_zep->if_carr_state != NRF_WIFI_FMAC_IF_CARR_STATE_ON) ||
 		    (!vif_ctx_zep->authorized && !is_eapol(pkt))) {
-			goto drop;
+			goto unlock;
 		}
 
 		ret = nrf_wifi_fmac_start_xmit(rpu_ctx_zep->rpu_ctx,
@@ -408,10 +408,6 @@ int nrf_wifi_if_send(const struct device *dev,
 #ifdef CONFIG_NRF70_RAW_DATA_TX
 	}
 #endif /* CONFIG_NRF70_RAW_DATA_TX */
-	goto unlock;
-drop:
-	host_stats->total_tx_drop_pkts++;
-	nrf_wifi_osal_nbuf_free(nbuf);
 unlock:
 	k_mutex_unlock(&vif_ctx_zep->vif_lock);
 #else

From 5da36f3fcfa827d2bdc419098a8f8aeb0bd20e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:40 +0100
Subject: [PATCH 1601/2913] Revert "[nrf fromlist] shields: nrf7002eb: Add
 missing SR RF switch GPIO"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a345b82e631e62b90f63abf5c948a57bbd8564bd.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/shields/nrf7002eb/nrf7002eb.overlay | 1 -
 1 file changed, 1 deletion(-)

diff --git a/boards/shields/nrf7002eb/nrf7002eb.overlay b/boards/shields/nrf7002eb/nrf7002eb.overlay
index 7f9074da9d0..d580a2efb8c 100644
--- a/boards/shields/nrf7002eb/nrf7002eb.overlay
+++ b/boards/shields/nrf7002eb/nrf7002eb.overlay
@@ -24,7 +24,6 @@
 		bucken-gpios = <&edge_connector 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
 		iovdd-ctrl-gpios = <&edge_connector 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
 		host-irq-gpios = <&edge_connector 19 GPIO_ACTIVE_HIGH>;
-		srrf-switch-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
 
 		wlan0: wlan0 {
 			compatible = "nordic,wlan";

From 93ce750079588184af9544e9b55d09e4e25b6a5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:40 +0100
Subject: [PATCH 1602/2913] Revert "[nrf fromlist] boards: nordic: Fix the
 label for nRF70 SR co-existence"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f4d056034391cfa31270a7fccd05de5eab9ea887.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts | 2 +-
 boards/shields/nrf7002eb/nrf7002eb_coex.overlay      | 2 +-
 boards/shields/nrf7002ek/nrf7002ek_coex.overlay      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts
index faea5ee69e3..8e36e678581 100644
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts
@@ -82,7 +82,7 @@
 			   <21 0 &gpio1 3 0>;	/* D15 */
 	};
 
-	nrf_radio_coex: coex {
+	nrf70: coex {
 		status = "okay";
 		compatible = "nordic,nrf7002-coex";
 
diff --git a/boards/shields/nrf7002eb/nrf7002eb_coex.overlay b/boards/shields/nrf7002eb/nrf7002eb_coex.overlay
index 09bfb6e1906..59007ebe58e 100644
--- a/boards/shields/nrf7002eb/nrf7002eb_coex.overlay
+++ b/boards/shields/nrf7002eb/nrf7002eb_coex.overlay
@@ -5,7 +5,7 @@
  */
 
 / {
-	nrf_radio_coex: coex {
+	nrf70: coex {
 		compatible = "nordic,nrf7002-coex";
 		status = "okay";
 
diff --git a/boards/shields/nrf7002ek/nrf7002ek_coex.overlay b/boards/shields/nrf7002ek/nrf7002ek_coex.overlay
index 60ff3ca6ea4..4b592acbfb2 100644
--- a/boards/shields/nrf7002ek/nrf7002ek_coex.overlay
+++ b/boards/shields/nrf7002ek/nrf7002ek_coex.overlay
@@ -5,7 +5,7 @@
  */
 
 / {
-	nrf_radio_coex: coex {
+	nrf70: coex {
 		compatible = "nordic,nrf7002-coex";
 		status = "okay";
 

From 7c5a274c4cc8c410724d6d51bfb5eb60f0c2b0b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:40 +0100
Subject: [PATCH 1603/2913] Revert "[nrf fromlist] drivers: nrfwifi: Remove
 passing unused flag"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5f17168c0a51373ba00d86239013c7e53fe1cfff.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index ad665916ceb..70223f739ef 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -307,6 +307,7 @@ zephyr_compile_definitions(
   -DNRF70_RX_MAX_DATA_SIZE=${CONFIG_NRF70_RX_MAX_DATA_SIZE}
   -DNRF70_MAX_TX_PENDING_QLEN=${CONFIG_NRF70_MAX_TX_PENDING_QLEN}
   -DNRF70_RPU_PS_IDLE_TIMEOUT_MS=${CONFIG_NRF70_RPU_PS_IDLE_TIMEOUT_MS}
+  -DNRF70_REG_DOMAIN=${CONFIG_NRF70_REG_DOMAIN}
   -DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS}
   -DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT}
   -DNRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE}

From 57a6670b340e963dba62e4b75916a8db5e3b8a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:40 +0100
Subject: [PATCH 1604/2913] Revert "[nrf fromlist] drivers: wifi: Fix deinit
 for offloaded raw tx API"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b2fef8081d5b7c3c24cf82ec1b146ee1c2aa9a0e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c b/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
index 155c8a5cd5e..520814865d6 100644
--- a/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
+++ b/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
@@ -279,6 +279,7 @@ void nrf70_off_raw_tx_deinit(void)
 	}
 
 	nrf_wifi_fmac_off_raw_tx_deinit(off_raw_tx_drv_priv.fmac_priv);
+	nrf_wifi_osal_deinit();
 
 	k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
 }

From bd6c7ffe89874940ccf29f23a3937d5a2b11b45b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:40 +0100
Subject: [PATCH 1605/2913] Revert "[nrf fromtree] tests: drivers: can: api:
 Add negative test for can_send()"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 46f9b14342e882d50b83f84326cc72967250c0fe.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/drivers/can/api/src/canfd.c   | 39 -----------------------------
 tests/drivers/can/api/src/classic.c | 27 --------------------
 2 files changed, 66 deletions(-)

diff --git a/tests/drivers/can/api/src/canfd.c b/tests/drivers/can/api/src/canfd.c
index 50e5d43add8..38f7cc7346d 100644
--- a/tests/drivers/can/api/src/canfd.c
+++ b/tests/drivers/can/api/src/canfd.c
@@ -238,45 +238,6 @@ ZTEST(canfd, test_canfd_get_capabilities)
 			  "CAN FD loopback mode not supported");
 }
 
-/**
- * @brief Test sending CAN FD frame with too big payload.
- */
-ZTEST(canfd, test_send_fd_dlc_out_of_range)
-{
-	struct can_frame frame = {
-		.flags = CAN_FRAME_FDF | CAN_FRAME_BRS,
-		.id = TEST_CAN_STD_ID_1,
-		.dlc = CANFD_MAX_DLC + 1U,
-	};
-	int err;
-
-	Z_TEST_SKIP_IFNDEF(CONFIG_RUNTIME_ERROR_CHECKS);
-
-	err = can_send(can_dev, &frame, TEST_SEND_TIMEOUT, NULL, NULL);
-	zassert_equal(err, -EINVAL, "wrong error on sending invalid frame (err %d)", err);
-}
-
-/**
- * @brief Test error when CAN FD Error State Indicator (ESI) is send without FD format flag (FDF).
- *
- * CAN FD Error State Indicator (ESI) indicates that the transmitting node is
- * in error-passive state. Only valid in combination with CAN_FRAME_FDF.
- */
-ZTEST(canfd, test_send_fd_incorrect_esi)
-{
-	struct can_frame frame = {
-		.flags = CAN_FRAME_ESI,
-		.id = TEST_CAN_STD_ID_1,
-		.dlc = 0,
-	};
-	int err;
-
-	Z_TEST_SKIP_IFNDEF(CONFIG_RUNTIME_ERROR_CHECKS);
-
-	err = can_send(can_dev, &frame, TEST_SEND_TIMEOUT, NULL, NULL);
-	zassert_equal(err, -ENOTSUP, "wrong error on sending invalid frame (err %d)", err);
-}
-
 /**
  * @brief Test send/receive with standard (11-bit) CAN IDs and classic CAN frames.
  */
diff --git a/tests/drivers/can/api/src/classic.c b/tests/drivers/can/api/src/classic.c
index 9192d6612bc..cf852487aa9 100644
--- a/tests/drivers/can/api/src/classic.c
+++ b/tests/drivers/can/api/src/classic.c
@@ -856,33 +856,6 @@ ZTEST(can_classic, test_send_ext_id_out_of_range)
 	send_invalid_frame(can_dev, &frame);
 }
 
-/**
- * @brief Test sending standard (11-bit ID) CAN frame with too big payload.
- */
-ZTEST(can_classic, test_send_std_id_dlc_of_range)
-{
-	struct can_frame frame = {
-		.id = TEST_CAN_STD_ID_1,
-		.dlc = CAN_MAX_DLC + 1U,
-	};
-
-	send_invalid_frame(can_dev, &frame);
-}
-
-/**
- * @brief Test sending extended (29-bit ID) CAN frame with too big payload.
- */
-ZTEST(can_classic, test_send_ext_id_dlc_of_range)
-{
-	struct can_frame frame = {
-		.flags = CAN_FRAME_IDE,
-		.id = TEST_CAN_EXT_ID_1,
-		.dlc = CAN_MAX_DLC + 1U,
-	};
-
-	send_invalid_frame(can_dev, &frame);
-}
-
 /**
  * @brief Test send/receive with standard (11-bit) CAN IDs.
  */

From ff42d54d79ad2fd6110517fa410913389383666d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:40 +0100
Subject: [PATCH 1606/2913] Revert "[nrf fromtree] tests: drivers: can: api:
 Add negative test for can_set_bitrate_data()"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit acb9eed5f32fc6746a66168a1a8d07a46697fe19.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/drivers/can/api/src/canfd.c | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/tests/drivers/can/api/src/canfd.c b/tests/drivers/can/api/src/canfd.c
index 38f7cc7346d..80703655d1f 100644
--- a/tests/drivers/can/api/src/canfd.c
+++ b/tests/drivers/can/api/src/canfd.c
@@ -395,31 +395,6 @@ ZTEST_USER(canfd, test_set_timing_data_min)
 	zassert_equal(err, 0, "failed to start CAN controller (err %d)", err);
 }
 
-/**
- * @brief Test setting a too low data phase bitrate.
- */
-ZTEST_USER(canfd, test_set_bitrate_data_too_low)
-{
-	uint32_t min = can_get_bitrate_min(can_dev);
-	int err;
-
-	if (min == 0) {
-		ztest_test_skip();
-	}
-
-	err = can_stop(can_dev);
-	zassert_equal(err, 0, "failed to stop CAN controller (err %d)", err);
-
-	err = can_set_bitrate_data(can_dev, min - 1);
-	zassert_equal(err, -ENOTSUP, "too low data phase bitrate accepted");
-
-	err = can_set_bitrate_data(can_dev, CONFIG_CAN_DEFAULT_BITRATE_DATA);
-	zassert_equal(err, 0, "failed to restore default data bitrate");
-
-	err = can_start(can_dev);
-	zassert_equal(err, 0, "failed to start CAN controller (err %d)", err);
-}
-
 /**
  * @brief Test setting a too high data phase bitrate.
  */

From 4888cbc5699b94c92ce6243f9598f10649470bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:40 +0100
Subject: [PATCH 1607/2913] Revert "[nrf fromtree] tests: drivers: can: api:
 Add negative test for can_set_bitrate()"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2219261a209b537006aebdb36adbd85bc63ca080.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/drivers/can/api/src/classic.c | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/tests/drivers/can/api/src/classic.c b/tests/drivers/can/api/src/classic.c
index cf852487aa9..c3e85015a65 100644
--- a/tests/drivers/can/api/src/classic.c
+++ b/tests/drivers/can/api/src/classic.c
@@ -486,31 +486,6 @@ ZTEST_USER(can_classic, test_bitrate_limits)
 	zassert_true(min <= max, "min bitrate must be lower or equal to max bitrate");
 }
 
-/**
- * @brief Test setting a too low bitrate.
- */
-ZTEST_USER(can_classic, test_set_bitrate_too_low)
-{
-	uint32_t min = can_get_bitrate_min(can_dev);
-	int err;
-
-	if (min == 0) {
-		ztest_test_skip();
-	}
-
-	err = can_stop(can_dev);
-	zassert_equal(err, 0, "failed to stop CAN controller (err %d)", err);
-
-	err = can_set_bitrate(can_dev, min - 1);
-	zassert_equal(err, -ENOTSUP, "too low bitrate accepted");
-
-	err = can_set_bitrate(can_dev, CONFIG_CAN_DEFAULT_BITRATE);
-	zassert_equal(err, 0, "failed to restore default bitrate");
-
-	err = can_start(can_dev);
-	zassert_equal(err, 0, "failed to start CAN controller (err %d)", err);
-}
-
 /**
  * @brief Test setting a too high bitrate.
  */

From 83c21751fad0cda8642203015a82cf00d394aeed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:40 +0100
Subject: [PATCH 1608/2913] Revert "[nrf fromtree] tests: drivers: can: api:
 Add negative test for can_add_rx_filter()"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit acdcf9e065da6149edc0e75ab1bf53e56c3cd602.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/drivers/can/api/src/classic.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/tests/drivers/can/api/src/classic.c b/tests/drivers/can/api/src/classic.c
index c3e85015a65..b762137f8cd 100644
--- a/tests/drivers/can/api/src/classic.c
+++ b/tests/drivers/can/api/src/classic.c
@@ -615,19 +615,6 @@ ZTEST(can_classic, test_add_filter)
 	can_remove_rx_filter(can_dev, filter_id);
 }
 
-/**
- * @brief Test adding filter without callback.
- */
-ZTEST(can_classic, test_add_filter_without_callback)
-{
-	int err;
-
-	Z_TEST_SKIP_IFNDEF(CONFIG_RUNTIME_ERROR_CHECKS);
-
-	err = can_add_rx_filter(can_dev, NULL, NULL, &test_std_filter_1);
-	zassert_equal(err, -EINVAL, "added filter with NULL callback");
-}
-
 /**
  * @brief Test adding an invalid CAN RX filter.
  *

From c2e3d7960214f8c138f655b2e28eca8ff7e3c304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:40 +0100
Subject: [PATCH 1609/2913] Revert "[nrf fromtree] modules: hal_nordic: Require
 nrf-regtool 7.0.0"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 44d86af4ea9c08859df50a1627736c341f9d3de4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt
index 3bed5a033b5..eb85fd58f5e 100644
--- a/modules/hal_nordic/CMakeLists.txt
+++ b/modules/hal_nordic/CMakeLists.txt
@@ -15,7 +15,7 @@ if(CONFIG_NRF_REGTOOL_GENERATE_BICR)
   list(APPEND nrf_regtool_components GENERATE:BICR)
 endif()
 if(DEFINED nrf_regtool_components)
-  find_package(nrf-regtool 7.0.0 REQUIRED
+  find_package(nrf-regtool 5.6.0 REQUIRED
     COMPONENTS ${nrf_regtool_components}
     PATHS ${CMAKE_CURRENT_LIST_DIR}/nrf-regtool
     NO_CMAKE_PATH

From b2a3810bbdc61d6a4df7f9363f396a551b180df4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:40 +0100
Subject: [PATCH 1610/2913] Revert "[nrf fromtree] dts: update memory map and
 remove ext-uicr"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a41277b8cd45a38be1b6d92df732f5d16d31a62f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi     | 15 ---------------
 .../nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay      |  7 -------
 .../nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay     |  7 -------
 .../nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay      |  7 -------
 .../nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay      |  7 -------
 dts/bindings/arm/nordic,nrf-uicr-v2.yaml          |  7 +++++++
 dts/common/nordic/nrf54h20.dtsi                   | 14 ++++++++++++--
 dts/common/nordic/nrf9280.dtsi                    | 10 ++++++++++
 8 files changed, 29 insertions(+), 45 deletions(-)
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi
deleted file mode 100644
index 940ac4d2391..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/delete-node/ &suit_storage_partition;
-
-/ {
-	reserved-memory {
-		suit_storage_partition: memory@e1eb000 {
-			reg = <0xe1eb000 DT_SIZE_K(24)>;
-		};
-	};
-};
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay
deleted file mode 100644
index dfee18c5b6f..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay
deleted file mode 100644
index dfee18c5b6f..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay
deleted file mode 100644
index dfee18c5b6f..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay
deleted file mode 100644
index dfee18c5b6f..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/dts/bindings/arm/nordic,nrf-uicr-v2.yaml b/dts/bindings/arm/nordic,nrf-uicr-v2.yaml
index 9000cce94c5..f509fdf4061 100644
--- a/dts/bindings/arm/nordic,nrf-uicr-v2.yaml
+++ b/dts/bindings/arm/nordic,nrf-uicr-v2.yaml
@@ -17,3 +17,10 @@ properties:
     description: |
       Domain ID of the domain associated with this UICR instance. Must be unique
       across all UICR instances in the system.
+
+  ptr-ext-uicr:
+    type: phandle
+    required: true
+    description: |
+      Handle of a memory region reserved to contain an Extended UICR instance.
+      The address of that node will be stored in the UICR.PTREXTUICR register.
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 6e1a57f4485..1b3a8b02fe7 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -145,8 +145,16 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		suit_storage_partition: memory@e1ed000 {
-			reg = <0xe1ed000 DT_SIZE_K(20)>;
+		suit_storage_partition: memory@e1eb000 {
+			reg = <0xe1eb000 DT_SIZE_K(24)>;
+		};
+
+		cpurad_uicr_ext: memory@e1ff000 {
+			reg = <0xe1ff000 DT_SIZE_K(2)>;
+		};
+
+		cpuapp_uicr_ext: memory@e1ff800 {
+			reg = <0xe1ff800 DT_SIZE_K(2)>;
 		};
 	};
 
@@ -209,12 +217,14 @@
 			compatible = "nordic,nrf-uicr-v2";
 			reg = <0xfff8000 DT_SIZE_K(2)>;
 			domain = <2>;
+			ptr-ext-uicr = <&cpuapp_uicr_ext>;
 		};
 
 		cpurad_uicr: uicr@fffa000 {
 			compatible = "nordic,nrf-uicr-v2";
 			reg = <0xfffa000 DT_SIZE_K(2)>;
 			domain = <3>;
+			ptr-ext-uicr = <&cpurad_uicr_ext>;
 		};
 
 		ficr: ficr@fffe000 {
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index ae3ffc904d2..9949f6c9f1c 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -74,6 +74,14 @@
 	reserved-memory {
 		#address-cells = <1>;
 		#size-cells = <1>;
+
+		cpurad_uicr_ext: memory@e401000 {
+			reg = <0xe401000 DT_SIZE_K(2)>;
+		};
+
+		cpuapp_uicr_ext: memory@e401800 {
+			reg = <0xe401800 DT_SIZE_K(2)>;
+		};
 	};
 
 	clocks {
@@ -105,12 +113,14 @@
 			compatible = "nordic,nrf-uicr-v2";
 			reg = <0xfff8000 DT_SIZE_K(2)>;
 			domain = <2>;
+			ptr-ext-uicr = <&cpuapp_uicr_ext>;
 		};
 
 		cpurad_uicr: uicr@fffa000 {
 			compatible = "nordic,nrf-uicr-v2";
 			reg = <0xfffa000 DT_SIZE_K(2)>;
 			domain = <3>;
+			ptr-ext-uicr = <&cpurad_uicr_ext>;
 		};
 
 		ficr: ficr@fffe000 {

From f8ff113bc3484f9a3c4101c76db72a85d1508490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:40 +0100
Subject: [PATCH 1611/2913] Revert "[nrf fromtree] drivers: adc: nrfx_saadc:
 Use CONFIG_NRF_PLATFORM_HALTIUM"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6275dadf44e91eaaa414e727cfd346c7af0afe87.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/adc/adc_nrfx_saadc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index b8782d02454..e4c37a1f736 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -66,9 +66,9 @@ BUILD_ASSERT((NRF_SAADC_AIN0 == NRF_SAADC_INPUT_AIN0) &&
 	     "Definitions from nrf-adc.h do not match those from nrf_saadc.h");
 #endif
 
-#if defined(CONFIG_NRF_PLATFORM_HALTIUM)
+#if defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280)
 
-/* Haltium devices always use bounce buffers in RAM */
+/* nRF54H20 and nRF9280 always use bounce buffers in RAM */
 
 #define SAADC_MEMORY_SECTION					                     \
 	COND_CODE_1(DT_NODE_HAS_PROP(DT_NODELABEL(adc), memory_regions), \
@@ -80,7 +80,7 @@ static uint16_t adc_samples_buffer[SAADC_CH_NUM] SAADC_MEMORY_SECTION;
 
 #define ADC_BUFFER_IN_RAM
 
-#endif /* defined(CONFIG_NRF_PLATFORM_HALTIUM) */
+#endif /* defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280) */
 
 struct driver_data {
 	struct adc_context ctx;
@@ -669,7 +669,7 @@ static const struct adc_driver_api adc_nrfx_driver_api = {
 #endif
 #if defined(CONFIG_SOC_NRF54L15)
 	.ref_internal  = 900,
-#elif defined(CONFIG_NRF_PLATFORM_HALTIUM)
+#elif defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280)
 	.ref_internal  = 1024,
 #else
 	.ref_internal  = 600,

From 25b0ae19319e6e739e06d39ffb93db6bcf7914bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:40 +0100
Subject: [PATCH 1612/2913] Revert "[nrf fromtree] logging: stmesp: Do not
 append strings on nRF54H20 EngB VPRs"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8df3edada2bc0d41c41d98763784c27b130ee1c2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/logging/frontends/Kconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/subsys/logging/frontends/Kconfig b/subsys/logging/frontends/Kconfig
index 4d6d85e3e88..c232eb7354a 100644
--- a/subsys/logging/frontends/Kconfig
+++ b/subsys/logging/frontends/Kconfig
@@ -46,9 +46,8 @@ config LOG_FRONTEND_STMESP_DICT
 
 config LOG_FRONTEND_STMESP_FSC
 	bool "Send fully self-contained messages"
-	select LOG_MSG_APPEND_RO_STRING_LOC if !(NRF_ETR || \
-			SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR || \
-			SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR)
+	select LOG_MSG_APPEND_RO_STRING_LOC if (!NRF_ETR && !SOC_NRF54H20_CPUPPR && \
+			!SOC_NRF54H20_CPUFLPR)
 
 config LOG_FRONTEND_STMESP_FLUSH_COUNT
 	int "Number of flushing words"

From 3840f78c4899703585bd10cf1b35479da2dec107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:40 +0100
Subject: [PATCH 1613/2913] Revert "[nrf fromtree] modules: hal_nordic: nrfs:
 Enable DVFS service on nRF54H20 EngB"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a48f5a2fa8a8162255ed8bc1e4c3680e950d947e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/nrfs/Kconfig        | 2 +-
 modules/hal_nordic/nrfs/dvfs/ld_dvfs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig
index eafe0616764..7245b728757 100644
--- a/modules/hal_nordic/nrfs/Kconfig
+++ b/modules/hal_nordic/nrfs/Kconfig
@@ -103,7 +103,7 @@ config NRFS_PMIC_SERVICE_ENABLED
 config NRFS_DVFS_SERVICE_ENABLED
 	bool "DVFS service"
 	depends on NRFS_HAS_DVFS_SERVICE
-	default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || SOC_NRF9280_CPUAPP
+	default y if SOC_NRF54H20_CPUAPP || SOC_NRF9280_CPUAPP
 
 config NRFS_DIAG_SERVICE_ENABLED
 	bool "System Diagnostics service (only for development purposes)"
diff --git a/modules/hal_nordic/nrfs/dvfs/ld_dvfs.c b/modules/hal_nordic/nrfs/dvfs/ld_dvfs.c
index 57ee0bdc375..1faffbdb3c2 100644
--- a/modules/hal_nordic/nrfs/dvfs/ld_dvfs.c
+++ b/modules/hal_nordic/nrfs/dvfs/ld_dvfs.c
@@ -269,7 +269,7 @@ int32_t ld_dvfs_configure_hsfll(enum dvfs_frequency_setting oppoint)
 		freq_trim = 2;
 	}
 
-#if defined(NRF_APPLICATION)
+#if defined(CONFIG_SOC_NRF54H20_CPUAPP) || defined(CONFIG_SOC_NRF9280_CPUAPP)
 	hsfll_trim.vsup	  = NRF_FICR->TRIM.APPLICATION.HSFLL.TRIM.VSUP;
 	hsfll_trim.coarse = NRF_FICR->TRIM.APPLICATION.HSFLL.TRIM.COARSE[freq_trim];
 	hsfll_trim.fine	  = NRF_FICR->TRIM.APPLICATION.HSFLL.TRIM.FINE[freq_trim];

From 7c964d1d95c4d72516984e0a78fb68aa22343232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:40 +0100
Subject: [PATCH 1614/2913] Revert "[nrf fromtree] modules: hal_nordic: Disable
 802.15.4 temp update on nRF54H20 EngB"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a3ce4dbeb6096ad1d7fd4f9e6a28bf7c25c9e2d9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/Kconfig b/modules/hal_nordic/Kconfig
index 9d54c15d715..dd4e0a0859b 100644
--- a/modules/hal_nordic/Kconfig
+++ b/modules/hal_nordic/Kconfig
@@ -55,7 +55,7 @@ endchoice
 
 config NRF_802154_TEMPERATURE_UPDATE
 	bool "nRF 802.15.4 temperature update"
-	default y if !SOC_NRF54H20 && !SOC_NRF54H20_ENGB
+	default y if !SOC_NRF54H20
 	help
 	  Enable temperature update for nRF 802.15.4 driver
 

From f2256839f1ba5934ad0641f640e1ab3fa0e4c2dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:40 +0100
Subject: [PATCH 1615/2913] Revert "[nrf fromtree] drivers: cache: Enable
 LINEADDR workaround on nRF54H20 EngB"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 53e36012f715ed830c69f9a1103e245f84ef3e1c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/cache/Kconfig.nrf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/cache/Kconfig.nrf b/drivers/cache/Kconfig.nrf
index ffcbfe66d19..c1cfc2c8c58 100644
--- a/drivers/cache/Kconfig.nrf
+++ b/drivers/cache/Kconfig.nrf
@@ -10,6 +10,6 @@ config CACHE_NRF_CACHE
 
 config CACHE_NRF_PATCH_LINEADDR
 	bool "Patch lineaddr"
-	default y if SOC_NRF54H20 || SOC_NRF54H20_ENGB
+	default y if SOC_NRF54H20
 	help
 	  Manually set 28th bit in the LINEADDR in Trustzone Secure build.

From 123736876b25e96620bf90a8b72958e73259df1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:40 +0100
Subject: [PATCH 1616/2913] Revert "[nrf fromtree] boards: nordic: ipc node
 added dcache alignement"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a45e8eb2157ac9a2bd98af330a279f1061466bf0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi | 6 ------
 boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi  | 5 -----
 2 files changed, 11 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi
index 94cda5e8ee2..fdc93408dd3 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi
@@ -9,7 +9,6 @@
 		cpusec_cpuapp_ipc: ipc-1-2 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
-			dcache-alignment = <32>;
 			mboxes = <&cpusec_bellboard 12>,
 				 <&cpuapp_bellboard 0>;
 		};
@@ -17,7 +16,6 @@
 		cpusec_cpurad_ipc: ipc-1-3 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
-			dcache-alignment = <32>;
 			mboxes = <&cpusec_bellboard 18>,
 				 <&cpurad_bellboard 0>;
 		};
@@ -33,7 +31,6 @@
 		cpuapp_cpusys_ipc: ipc-2-12 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
-			dcache-alignment = <32>;
 			mboxes = <&cpuapp_bellboard 6>,
 				 <&cpusys_vevif 12>;
 		};
@@ -41,7 +38,6 @@
 		cpuapp_cpuppr_ipc: ipc-2-13 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
-			dcache-alignment = <32>;
 			mboxes = <&cpuapp_bellboard 13>,
 				 <&cpuppr_vevif 12>;
 		};
@@ -49,7 +45,6 @@
 		cpuapp_cpuflpr_ipc: ipc-2-14 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
-			dcache-alignment = <32>;
 			mboxes = <&cpuapp_bellboard 14>,
 				 <&cpuflpr_vevif 16>;
 		};
@@ -57,7 +52,6 @@
 		cpurad_cpusys_ipc: ipc-3-12 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
-			dcache-alignment = <32>;
 			mboxes = <&cpurad_bellboard 6>,
 				 <&cpusys_vevif 18>;
 		};
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi
index 0588e8d0801..906342f6f3d 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi
@@ -9,7 +9,6 @@
 		cpusec_cpuapp_ipc: ipc-1-2 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
-			dcache-alignment = <32>;
 			mboxes = <&cpusec_bellboard 12>,
 				 <&cpuapp_bellboard 0>;
 		};
@@ -17,7 +16,6 @@
 		cpusec_cpurad_ipc: ipc-1-3 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
-			dcache-alignment = <32>;
 			mboxes = <&cpusec_bellboard 18>,
 				 <&cpurad_bellboard 0>;
 		};
@@ -33,7 +31,6 @@
 		cpuapp_cpusys_ipc: ipc-2-12 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
-			dcache-alignment = <32>;
 			mboxes = <&cpuapp_bellboard 6>,
 				 <&cpusys_vevif 12>;
 		};
@@ -41,7 +38,6 @@
 		cpuapp_cpuppr_ipc: ipc-2-13 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
-			dcache-alignment = <32>;
 			mboxes = <&cpuapp_bellboard 13>,
 				 <&cpuppr_vevif 12>;
 		};
@@ -49,7 +45,6 @@
 		cpurad_cpusys_ipc: ipc-3-12 {
 			compatible = "zephyr,ipc-icmsg";
 			status = "disabled";
-			dcache-alignment = <32>;
 			mboxes = <&cpurad_bellboard 6>,
 				 <&cpusys_vevif 18>;
 		};

From 95aea1b7d3508ce60d067956c19a3fa8273f1162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:41 +0100
Subject: [PATCH 1617/2913] Revert "[nrf fromlist] samples: boards: nordic: add
 nrf_sys_event sample"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5b6fcf3d80f8136b2b9057ad4a9d0253d139e5e7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nordic/nrf_sys_event/CMakeLists.txt       |  9 ----
 samples/boards/nordic/nrf_sys_event/prj.conf  |  4 --
 .../boards/nordic/nrf_sys_event/sample.yaml   | 28 -------------
 .../boards/nordic/nrf_sys_event/src/main.c    | 41 -------------------
 4 files changed, 82 deletions(-)
 delete mode 100644 samples/boards/nordic/nrf_sys_event/CMakeLists.txt
 delete mode 100644 samples/boards/nordic/nrf_sys_event/prj.conf
 delete mode 100644 samples/boards/nordic/nrf_sys_event/sample.yaml
 delete mode 100644 samples/boards/nordic/nrf_sys_event/src/main.c

diff --git a/samples/boards/nordic/nrf_sys_event/CMakeLists.txt b/samples/boards/nordic/nrf_sys_event/CMakeLists.txt
deleted file mode 100644
index 5f7335b260e..00000000000
--- a/samples/boards/nordic/nrf_sys_event/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(soc_sys_event)
-
-FILE(GLOB app_sources src/*.c)
-target_sources(app PRIVATE ${app_sources})
diff --git a/samples/boards/nordic/nrf_sys_event/prj.conf b/samples/boards/nordic/nrf_sys_event/prj.conf
deleted file mode 100644
index 28f655a7e24..00000000000
--- a/samples/boards/nordic/nrf_sys_event/prj.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_NRF_SYS_EVENT=y
diff --git a/samples/boards/nordic/nrf_sys_event/sample.yaml b/samples/boards/nordic/nrf_sys_event/sample.yaml
deleted file mode 100644
index c5ea3d8a23d..00000000000
--- a/samples/boards/nordic/nrf_sys_event/sample.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-sample:
-  name: nRF System events
-tests:
-  sample.boards.nordic.nrf_sys_event:
-    harness: console
-    harness_config:
-      type: one_line
-      regex:
-        - "constant latency mode disabled"
-    platform_allow:
-      - nrf52dk/nrf52810
-      - nrf52dk/nrf52832
-      - nrf52833dk/nrf52820
-      - nrf52833dk/nrf52833
-      - nrf52840dk/nrf52811
-      - nrf52840dk/nrf52840
-      - nrf5340dk/nrf5340/cpuapp
-      - nrf5340dk/nrf5340/cpunet
-      - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54h20dk/nrf54h20/cpurad
-      - nrf54l15dk/nrf54l15/cpuapp
-    integration_platforms:
-      - nrf52840dk/nrf52840
-      - nrf5340dk/nrf5340/cpuapp
-      - nrf5340dk/nrf5340/cpunet
-      - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54h20dk/nrf54h20/cpurad
-      - nrf54l15dk/nrf54l15/cpuapp
diff --git a/samples/boards/nordic/nrf_sys_event/src/main.c b/samples/boards/nordic/nrf_sys_event/src/main.c
deleted file mode 100644
index e97d3c821f7..00000000000
--- a/samples/boards/nordic/nrf_sys_event/src/main.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <nrf_sys_event.h>
-#include <stdio.h>
-
-int main(void)
-{
-	printf("request global constant latency mode\n");
-	if (nrf_sys_event_request_global_constlat()) {
-		printf("failed to request global constant latency mode\n");
-		return 0;
-	}
-	printf("constant latency mode enabled\n");
-
-	printf("request global constant latency mode again\n");
-	if (nrf_sys_event_request_global_constlat()) {
-		printf("failed to request global constant latency mode\n");
-		return 0;
-	}
-
-	printf("release global constant latency mode\n");
-	printf("constant latency mode will remain enabled\n");
-	if (nrf_sys_event_release_global_constlat()) {
-		printf("failed to release global constant latency mode\n");
-		return 0;
-	}
-
-	printf("release global constant latency mode again\n");
-	printf("constant latency mode will be disabled\n");
-	if (nrf_sys_event_release_global_constlat()) {
-		printf("failed to release global constant latency mode\n");
-		return 0;
-	}
-
-	printf("constant latency mode disabled\n");
-	return 0;
-}

From 35f51ffaecf04008b84925ebd0d6c2cd119ea35d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:41 +0100
Subject: [PATCH 1618/2913] Revert "[nrf fromlist] soc: nordic: add fn for
 setting constlat mode"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 435b75c005fff8dfc17c543a36307dbd1803b5cc.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/common/CMakeLists.txt  |  2 -
 soc/nordic/common/Kconfig         |  4 --
 soc/nordic/common/nrf_sys_event.c | 95 -------------------------------
 soc/nordic/common/nrf_sys_event.h | 30 ----------
 4 files changed, 131 deletions(-)
 delete mode 100644 soc/nordic/common/nrf_sys_event.c
 delete mode 100644 soc/nordic/common/nrf_sys_event.h

diff --git a/soc/nordic/common/CMakeLists.txt b/soc/nordic/common/CMakeLists.txt
index 1a4e17c20d1..38c55c614e9 100644
--- a/soc/nordic/common/CMakeLists.txt
+++ b/soc/nordic/common/CMakeLists.txt
@@ -29,5 +29,3 @@ if(CONFIG_TFM_PARTITION_PLATFORM)
     $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
   )
 endif()
-
-zephyr_library_sources_ifdef(CONFIG_NRF_SYS_EVENT nrf_sys_event.c)
diff --git a/soc/nordic/common/Kconfig b/soc/nordic/common/Kconfig
index ef32e7403c1..8de20c37dd4 100644
--- a/soc/nordic/common/Kconfig
+++ b/soc/nordic/common/Kconfig
@@ -4,8 +4,4 @@
 config HAS_NORDIC_DMM
 	bool
 
-config NRF_SYS_EVENT
-	bool "nRF system event support"
-	select NRFX_POWER if !NRF_PLATFORM_HALTIUM
-
 rsource "vpr/Kconfig"
diff --git a/soc/nordic/common/nrf_sys_event.c b/soc/nordic/common/nrf_sys_event.c
deleted file mode 100644
index 47c02eadb96..00000000000
--- a/soc/nordic/common/nrf_sys_event.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <nrf_sys_event.h>
-
-#if CONFIG_SOC_SERIES_NRF54HX
-
-/*
- * The 54HX is not yet supported by an nrfx driver nor the system controller so
- * we implement an ISR and concurrent access safe reference counting implementation
- * here using the nrfx hal.
- */
-
-#include <hal/nrf_lrcconf.h>
-
-static struct k_spinlock global_constlat_lock;
-static uint16_t global_constlat_count;
-
-int nrf_sys_event_request_global_constlat(void)
-{
-	K_SPINLOCK(&global_constlat_lock) {
-		if (global_constlat_count == 0) {
-#if CONFIG_SOC_NRF54H20_CPUAPP
-			nrf_lrcconf_task_trigger(NRF_LRCCONF010,
-						 NRF_LRCCONF_TASK_CONSTLAT_ENABLE);
-#elif CONFIG_SOC_NRF54H20_CPURAD
-			nrf_lrcconf_task_trigger(NRF_LRCCONF000,
-						 NRF_LRCCONF_TASK_CONSTLAT_ENABLE);
-			nrf_lrcconf_task_trigger(NRF_LRCCONF020,
-						 NRF_LRCCONF_TASK_CONSTLAT_ENABLE);
-#else
-#error "unsupported"
-#endif
-		}
-
-		global_constlat_count++;
-	}
-
-	return 0;
-}
-
-int nrf_sys_event_release_global_constlat(void)
-{
-	K_SPINLOCK(&global_constlat_lock) {
-		if (global_constlat_count == 1) {
-#if CONFIG_SOC_NRF54H20_CPUAPP
-			nrf_lrcconf_task_trigger(NRF_LRCCONF010,
-						 NRF_LRCCONF_TASK_CONSTLAT_DISABLE);
-#elif CONFIG_SOC_NRF54H20_CPURAD
-			nrf_lrcconf_task_trigger(NRF_LRCCONF000,
-						 NRF_LRCCONF_TASK_CONSTLAT_DISABLE);
-			nrf_lrcconf_task_trigger(NRF_LRCCONF020,
-						 NRF_LRCCONF_TASK_CONSTLAT_DISABLE);
-#else
-#error "unsupported"
-#endif
-		}
-
-		global_constlat_count--;
-	}
-
-	return 0;
-}
-
-#else
-
-/*
- * The nrfx power driver already contains an ISR and concurrent access safe reference
- * counting API so we just use it directly when available.
- */
-
-#include <nrfx_power.h>
-
-int nrf_sys_event_request_global_constlat(void)
-{
-	nrfx_err_t err;
-
-	err = nrfx_power_constlat_mode_request();
-
-	return (err == NRFX_SUCCESS || err == NRFX_ERROR_ALREADY) ? 0 : -EAGAIN;
-}
-
-int nrf_sys_event_release_global_constlat(void)
-{
-	nrfx_err_t err;
-
-	err = nrfx_power_constlat_mode_free();
-
-	return (err == NRFX_SUCCESS || err == NRFX_ERROR_BUSY) ? 0 : -EAGAIN;
-}
-
-#endif
diff --git a/soc/nordic/common/nrf_sys_event.h b/soc/nordic/common/nrf_sys_event.h
deleted file mode 100644
index a4d6d8050f0..00000000000
--- a/soc/nordic/common/nrf_sys_event.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-
-/**
- * @brief Request lowest latency for system events
- *
- * @details System will be configured for lowest latency after first
- * call to nrf_sys_event_request_global_constlat() and will remain
- * configured for lowest latency until matching number of calls to
- * nrf_sys_event_release_global_constlat() occur.
- *
- * @retval 0 if successful
- * @retval -errno code otherwise
- */
-int nrf_sys_event_request_global_constlat(void);
-
-/**
- * @brief Release low latency request
- *
- * @see nrf_sys_event_request_global_constlat()
- *
- * @retval 0 if successful
- * @retval -errno code otherwise
- */
-int nrf_sys_event_release_global_constlat(void);

From ea89d6c78a93309c98c8baae87042dbcb5481a8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:41 +0100
Subject: [PATCH 1619/2913] Revert "[nrf fromlist] dts: common: nordic:
 nrf54l15: add power peripheral"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c192cac1317f41f0a7de3bc7c82bc78b4dfd1a56.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/common/nordic/nrf54l15.dtsi | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index 3098aa7f29b..f322d03b329 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -605,32 +605,6 @@
 				status = "disabled";
 			};
 
-			power: power@10e000 {
-				compatible = "nordic,nrf-power";
-				reg = <0x10e000 0x1000>;
-				ranges = <0x0 0x10e000 0x1000>;
-				interrupts = <270 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				gpregret1: gpregret1@51c {
-					#address-cells = <1>;
-					#size-cells = <1>;
-					compatible = "nordic,nrf-gpregret";
-					reg = <0x51c 0x1>;
-					status = "disabled";
-				};
-
-				gpregret2: gpregret2@520 {
-					#address-cells = <1>;
-					#size-cells = <1>;
-					compatible = "nordic,nrf-gpregret";
-					reg = <0x520 0x1>;
-					status = "disabled";
-				};
-			};
-
 			regulators: regulator@120000 {
 				compatible = "nordic,nrf54l-regulators";
 				reg = <0x120000 0x1000>;

From a4d2842c27f7d9f98a2c6ad4f6c0456041683ef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:41 +0100
Subject: [PATCH 1620/2913] Revert "[nrf fromtree] drivers:
 clock_control_nrf2_hsfll: Fix checking if DVFS is available"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c6a13549da00c0ba8424b95caf0cf0fe8369aa1a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/clock_control/clock_control_nrf2_hsfll.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/clock_control/clock_control_nrf2_hsfll.c b/drivers/clock_control/clock_control_nrf2_hsfll.c
index 026edf9abbd..90cd56318dd 100644
--- a/drivers/clock_control/clock_control_nrf2_hsfll.c
+++ b/drivers/clock_control/clock_control_nrf2_hsfll.c
@@ -17,7 +17,7 @@ LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
 BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
 	     "multiple instances not supported");
 
-#ifdef CONFIG_NRFS_DVFS_LOCAL_DOMAIN
+#ifdef CONFIG_NRFS_HAS_DVFS_SERVICE
 #include <ld_dvfs_handler.h>
 
 #define FLAG_FREQ_CHANGE_CB_EXPECTED BIT(FLAGS_COMMON_BITS)
@@ -131,13 +131,13 @@ static struct onoff_manager *hsfll_find_mgr(const struct device *dev,
 	LOG_ERR("invalid frequency");
 	return NULL;
 }
-#endif /* CONFIG_NRFS_DVFS_LOCAL_DOMAIN */
+#endif /* CONFIG_NRFS_HAS_DVFS_SERVICE */
 
 static int api_request_hsfll(const struct device *dev,
 			     const struct nrf_clock_spec *spec,
 			     struct onoff_client *cli)
 {
-#ifdef CONFIG_NRFS_DVFS_LOCAL_DOMAIN
+#ifdef CONFIG_NRFS_HAS_DVFS_SERVICE
 	struct onoff_manager *mgr = hsfll_find_mgr(dev, spec);
 
 	if (mgr) {
@@ -153,7 +153,7 @@ static int api_request_hsfll(const struct device *dev,
 static int api_release_hsfll(const struct device *dev,
 			     const struct nrf_clock_spec *spec)
 {
-#ifdef CONFIG_NRFS_DVFS_LOCAL_DOMAIN
+#ifdef CONFIG_NRFS_HAS_DVFS_SERVICE
 	struct onoff_manager *mgr = hsfll_find_mgr(dev, spec);
 
 	if (mgr) {
@@ -170,7 +170,7 @@ static int api_cancel_or_release_hsfll(const struct device *dev,
 				       const struct nrf_clock_spec *spec,
 				       struct onoff_client *cli)
 {
-#ifdef CONFIG_NRFS_DVFS_LOCAL_DOMAIN
+#ifdef CONFIG_NRFS_HAS_DVFS_SERVICE
 	struct onoff_manager *mgr = hsfll_find_mgr(dev, spec);
 
 	if (mgr) {
@@ -197,7 +197,7 @@ static int api_get_rate_hsfll(const struct device *dev,
 
 static int hsfll_init(const struct device *dev)
 {
-#ifdef CONFIG_NRFS_DVFS_LOCAL_DOMAIN
+#ifdef CONFIG_NRFS_HAS_DVFS_SERVICE
 	struct hsfll_dev_data *dev_data = dev->data;
 	int rc;
 
@@ -228,12 +228,12 @@ static struct nrf_clock_control_driver_api hsfll_drv_api = {
 	.cancel_or_release = api_cancel_or_release_hsfll,
 };
 
-#ifdef CONFIG_NRFS_DVFS_LOCAL_DOMAIN
+#ifdef CONFIG_NRFS_HAS_DVFS_SERVICE
 static struct hsfll_dev_data hsfll_data;
 #endif
 
 DEVICE_DT_INST_DEFINE(0, hsfll_init, NULL,
-		      COND_CODE_1(CONFIG_NRFS_DVFS_LOCAL_DOMAIN,
+		      COND_CODE_1(CONFIG_NRFS_HAS_DVFS_SERVICE,
 				  (&hsfll_data),
 				  (NULL)),
 		      NULL,

From 0f2176849210ebfd918b3360b78c7d8787e94e0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:41 +0100
Subject: [PATCH 1621/2913] Revert "[nrf fromtree] soc: nordic: Fix the way of
 enabling clock control for nRF54H Series"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 93a848474ed0013d47d48e0f106fb9eac610af5d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/clock_control/Kconfig.nrf                      |  1 -
 .../nordic/clock_control/configs/cpuapp_hsfll.conf     |  2 +-
 .../boards/nordic/clock_control/configs/fll16m.conf    |  2 +-
 samples/boards/nordic/clock_control/configs/lfclk.conf |  2 +-
 .../boards/nordic/clock_control/configs/uart135.conf   |  2 +-
 soc/nordic/Kconfig.defconfig                           | 10 ++++++----
 tests/drivers/clock_control/nrf_clock_control/prj.conf |  2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/drivers/clock_control/Kconfig.nrf b/drivers/clock_control/Kconfig.nrf
index f7b0de3db09..8c806119fd6 100644
--- a/drivers/clock_control/Kconfig.nrf
+++ b/drivers/clock_control/Kconfig.nrf
@@ -175,7 +175,6 @@ endif # CLOCK_CONTROL_NRF
 
 config CLOCK_CONTROL_NRF2
 	bool "nRF clock control support"
-	default y
 	depends on SOC_SERIES_NRF54HX && !RISCV_CORE_NORDIC_VPR
 	select ONOFF
 	select NRFS if HAS_NRFS
diff --git a/samples/boards/nordic/clock_control/configs/cpuapp_hsfll.conf b/samples/boards/nordic/clock_control/configs/cpuapp_hsfll.conf
index 53eebac30be..5c1bad08a80 100644
--- a/samples/boards/nordic/clock_control/configs/cpuapp_hsfll.conf
+++ b/samples/boards/nordic/clock_control/configs/cpuapp_hsfll.conf
@@ -1,6 +1,6 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CLOCK_CONTROL=y
+CONFIG_CLOCK_CONTROL_NRF2=y
 
 CONFIG_SAMPLE_CLOCK_FREQUENCY_HZ=320000000
diff --git a/samples/boards/nordic/clock_control/configs/fll16m.conf b/samples/boards/nordic/clock_control/configs/fll16m.conf
index c5d3a84f661..de9942857b9 100644
--- a/samples/boards/nordic/clock_control/configs/fll16m.conf
+++ b/samples/boards/nordic/clock_control/configs/fll16m.conf
@@ -1,6 +1,6 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CLOCK_CONTROL=y
+CONFIG_CLOCK_CONTROL_NRF2=y
 
 CONFIG_SAMPLE_CLOCK_ACCURACY_PPM=30
diff --git a/samples/boards/nordic/clock_control/configs/lfclk.conf b/samples/boards/nordic/clock_control/configs/lfclk.conf
index b866d3d81d1..6cf09f0e4c7 100644
--- a/samples/boards/nordic/clock_control/configs/lfclk.conf
+++ b/samples/boards/nordic/clock_control/configs/lfclk.conf
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CLOCK_CONTROL=y
+CONFIG_CLOCK_CONTROL_NRF2=y
 
 CONFIG_SAMPLE_CLOCK_ACCURACY_PPM=20
 CONFIG_SAMPLE_CLOCK_PRECISION=1
diff --git a/samples/boards/nordic/clock_control/configs/uart135.conf b/samples/boards/nordic/clock_control/configs/uart135.conf
index c5d3a84f661..de9942857b9 100644
--- a/samples/boards/nordic/clock_control/configs/uart135.conf
+++ b/samples/boards/nordic/clock_control/configs/uart135.conf
@@ -1,6 +1,6 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CLOCK_CONTROL=y
+CONFIG_CLOCK_CONTROL_NRF2=y
 
 CONFIG_SAMPLE_CLOCK_ACCURACY_PPM=30
diff --git a/soc/nordic/Kconfig.defconfig b/soc/nordic/Kconfig.defconfig
index efa122aa5b5..c912861cc4b 100644
--- a/soc/nordic/Kconfig.defconfig
+++ b/soc/nordic/Kconfig.defconfig
@@ -7,11 +7,13 @@ if SOC_FAMILY_NORDIC_NRF
 
 rsource "*/Kconfig.defconfig"
 
-# If the kernel has timer support, enable clock control, except for SoCs
-# based on the Haltium platform SoCs where clock control is not needed
-# for the system timer
+# If the kernel has timer support, enable clock control
+if SYS_CLOCK_EXISTS
+
 config CLOCK_CONTROL
-	default y if SYS_CLOCK_EXISTS && !NRF_PLATFORM_HALTIUM
+	default y if !SOC_SERIES_NRF92X
+
+endif # SYS_CLOCK_EXISTS
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 1000000 if NRF_GRTC_TIMER
diff --git a/tests/drivers/clock_control/nrf_clock_control/prj.conf b/tests/drivers/clock_control/nrf_clock_control/prj.conf
index d11c2f125a0..84145cf96a4 100644
--- a/tests/drivers/clock_control/nrf_clock_control/prj.conf
+++ b/tests/drivers/clock_control/nrf_clock_control/prj.conf
@@ -1,6 +1,6 @@
 CONFIG_ZTEST=y
 
-CONFIG_CLOCK_CONTROL=y
+CONFIG_CLOCK_CONTROL_NRF2=y
 CONFIG_LOG=y
 CONFIG_CLOCK_CONTROL_LOG_LEVEL_DBG=y
 CONFIG_LOCAL_DOMAIN_DVFS_LIB_LOG_LEVEL_DBG=y

From a802e1efc0d58bed128527cfd6f6d15715cabaa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:41 +0100
Subject: [PATCH 1622/2913] Revert "[nrf fromtree] boards: nordic: ipc: added
 dcache alignement"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cd410de7c15904e5c8a0d11bb0a03f377572db6f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi       |  1 -
 .../nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi |  1 -
 .../ipc/ipc_service/backends/ipc_service_icbmsg.rst    | 10 ----------
 .../ipc/ipc_service/backends/ipc_service_icmsg.rst     | 10 ----------
 dts/bindings/ipc/zephyr,ipc-icmsg.yaml                 |  2 +-
 .../icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay    |  1 -
 .../boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay   |  1 -
 .../remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay  |  1 -
 .../boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay  |  1 -
 subsys/ipc/ipc_service/backends/ipc_icbmsg.c           |  4 ++--
 10 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi
index fdc93408dd3..a17889fe0b0 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi
@@ -22,7 +22,6 @@
 
 		cpuapp_cpurad_ipc: ipc-2-3 {
 			compatible = "zephyr,ipc-icbmsg";
-			dcache-alignment = <32>;
 			status = "disabled";
 			mboxes = <&cpuapp_bellboard 18>,
 				 <&cpurad_bellboard 12>;
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi
index 906342f6f3d..944dd7fb6ab 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi
@@ -22,7 +22,6 @@
 
 		cpuapp_cpurad_ipc: ipc-2-3 {
 			compatible = "zephyr,ipc-icbmsg";
-			dcache-alignment = <32>;
 			status = "disabled";
 			mboxes = <&cpuapp_bellboard 18>,
 				 <&cpurad_bellboard 12>;
diff --git a/doc/services/ipc/ipc_service/backends/ipc_service_icbmsg.rst b/doc/services/ipc/ipc_service/backends/ipc_service_icbmsg.rst
index b1f13d7566a..f570766b0bd 100644
--- a/doc/services/ipc/ipc_service/backends/ipc_service_icbmsg.rst
+++ b/doc/services/ipc/ipc_service/backends/ipc_service_icbmsg.rst
@@ -40,21 +40,12 @@ Configuration
 The backend is configured using Kconfig and devicetree.
 When configuring the backend, do the following:
 
-* If at least one of the cores uses data cache on shared memory, set the ``dcache-alignment`` value.
-  This must be the largest value of the invalidation or the write-back size for both sides of the communication.
-  You can skip it if none of the communication sides is using data cache on shared memory.
 * Define two memory regions and assign them to ``tx-region`` and ``rx-region`` of an instance.
   Ensure that the memory regions used for data exchange are unique (not overlapping any other region) and accessible by both domains (or CPUs).
 * Define the number of allocable blocks for each region with ``tx-blocks`` and ``rx-blocks``.
 * Define MBOX devices for sending a signal that informs the other domain (or CPU) of the written data.
   Ensure that the other domain (or CPU) can receive the signal.
 
-.. caution::
-
-    Make sure that you set correct value of the ``dcache-alignment``.
-    At first, wrong value may not show any signs, which may give a false impression that everything works.
-    Unstable behavior will appear sooner or later.
-
 See the following configuration example for one of the instances:
 
 .. code-block:: devicetree
@@ -72,7 +63,6 @@ See the following configuration example for one of the instances:
    ipc {
       ipc0: ipc0 {
          compatible = "zephyr,ipc-icbmsg";
-         dcache-alignment = <32>;
          tx-region = <&tx>;
          rx-region = <&rx>;
          tx-blocks = <16>;
diff --git a/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst b/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst
index 251a332027a..56f618b442d 100644
--- a/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst
+++ b/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst
@@ -24,9 +24,6 @@ Configuration
 The  backend is configured via Kconfig and devicetree.
 When configuring the backend, do the following:
 
-* If at least one of the cores uses data cache on shared memory, set the ``dcache-alignment`` value.
-  This must be the largest value of the invalidation or the write-back size for both sides of the communication.
-  You can skip it if none of the communication sides is using data cache on shared memory.
 * Define two memory regions and assign them to ``tx-region`` and ``rx-region``
   of an instance. Ensure that the memory regions used for data exchange are
   unique (not overlapping any other region) and accessible by both domains
@@ -35,12 +32,6 @@ When configuring the backend, do the following:
   domain (or CPU) that data has been written. Ensure that the other domain
   (or CPU) is able to receive the signal.
 
-.. caution::
-
-    Make sure that you set correct value of the ``dcache-alignment``.
-    At first, wrong value may not show any signs, which may give a false impression that everything works.
-    Unstable behavior will appear sooner or later.
-
 See the following configuration example for one of the instances:
 
 .. code-block:: devicetree
@@ -58,7 +49,6 @@ See the following configuration example for one of the instances:
       ipc {
          ipc0: ipc0 {
             compatible = "zephyr,ipc-icmsg";
-            dcache-alignment = <32>;
             tx-region = <&tx>;
             rx-region = <&rx>;
             mboxes = <&mbox 0>, <&mbox 1>;
diff --git a/dts/bindings/ipc/zephyr,ipc-icmsg.yaml b/dts/bindings/ipc/zephyr,ipc-icmsg.yaml
index 13a9e2b84b6..41793005373 100644
--- a/dts/bindings/ipc/zephyr,ipc-icmsg.yaml
+++ b/dts/bindings/ipc/zephyr,ipc-icmsg.yaml
@@ -32,7 +32,7 @@ properties:
       For example:
         Side A: no data cache
         Side B: 32 Bytes write-back size, 16 Bytes invalidation size
-        dcache-alignment = <32>; for both
+        dcache-alignment = 32; for both
 
   mboxes:
     description: phandle to the MBOX controller (TX and RX are required)
diff --git a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 56b3ae097d8..b6f20acc42a 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -23,7 +23,6 @@
 	ipc {
 		ipc0: ipc0 {
 			compatible = "zephyr,ipc-icmsg";
-			dcache-alignment = <32>;
 			tx-region = <&sram_tx>;
 			rx-region = <&sram_rx>;
 			mboxes = <&cpuapp_vevif_rx 20>, <&cpuapp_vevif_tx 21>;
diff --git a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay
index 639ad5e844b..a3f853c6e3d 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay
+++ b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay
@@ -23,7 +23,6 @@
 	ipc {
 		ipc0: ipc0 {
 			compatible = "zephyr,ipc-icbmsg";
-			dcache-alignment = <32>;
 			tx-region = <&sram_tx>;
 			rx-region = <&sram_rx>;
 			tx-blocks = <16>;
diff --git a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
index b3e86e96361..c6e59f2b131 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
+++ b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
@@ -23,7 +23,6 @@
 	ipc {
 		ipc0: ipc0 {
 			compatible = "zephyr,ipc-icmsg";
-			dcache-alignment = <32>;
 			tx-region = <&sram_tx>;
 			rx-region = <&sram_rx>;
 			mboxes = <&cpuflpr_vevif_rx 21>, <&cpuflpr_vevif_tx 20>;
diff --git a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay
index 7fe78a71653..0033e622107 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay
+++ b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay
@@ -23,7 +23,6 @@
 	ipc {
 		ipc0: ipc0 {
 			compatible = "zephyr,ipc-icbmsg";
-			dcache-alignment = <32>;
 			tx-region = <&sram_tx>;
 			rx-region = <&sram_rx>;
 			tx-blocks = <18>;
diff --git a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
index 927950dd50a..9fd7752999f 100644
--- a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
+++ b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
@@ -1434,11 +1434,11 @@ const static struct ipc_service_backend backend_ops = {
 	};										\
 	BUILD_ASSERT(IS_POWER_OF_TWO(GET_CACHE_ALIGNMENT(i)),				\
 		     "This module supports only power of two cache alignment");		\
-	BUILD_ASSERT((GET_BLOCK_SIZE_INST(i, tx, rx) >= GET_CACHE_ALIGNMENT(i)) &&	\
+	BUILD_ASSERT((GET_BLOCK_SIZE_INST(i, tx, rx) > GET_CACHE_ALIGNMENT(i)) &&	\
 		     (GET_BLOCK_SIZE_INST(i, tx, rx) <					\
 		      GET_MEM_SIZE_INST(i, tx)),					\
 		     "TX region is too small for provided number of blocks");		\
-	BUILD_ASSERT((GET_BLOCK_SIZE_INST(i, rx, tx) >= GET_CACHE_ALIGNMENT(i)) &&	\
+	BUILD_ASSERT((GET_BLOCK_SIZE_INST(i, rx, tx) > GET_CACHE_ALIGNMENT(i)) &&	\
 		     (GET_BLOCK_SIZE_INST(i, rx, tx) <					\
 		      GET_MEM_SIZE_INST(i, rx)),					\
 		     "RX region is too small for provided number of blocks");		\

From ddbff74d4021b0c1853040d56163d3ea17ab6e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:41 +0100
Subject: [PATCH 1623/2913] Revert "[nrf fromtree] tests: drivers: i2s: Add
 overlay to support nRF54L15 DK"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0a7925e539776d124e778f0d7a7f29bec63436be.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 30 -------------------
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 30 -------------------
 2 files changed, 60 deletions(-)
 delete mode 100644 tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 delete mode 100644 tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 8b82825a0f2..00000000000
--- a/tests/drivers/i2s/i2s_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/* i2s-node0 is the transmitter/receiver */
-
-/ {
-	aliases {
-		i2s-node0 = &i2s20;
-	};
-};
-
-&pinctrl {
-	i2s20_default_alt: i2s20_default_alt {
-		group1 {
-			psels = <NRF_PSEL(I2S_SCK_M, 1, 11)>,
-				<NRF_PSEL(I2S_LRCK_M, 1, 12)>,
-				<NRF_PSEL(I2S_SDOUT, 1, 8)>,
-				<NRF_PSEL(I2S_SDIN, 1, 9)>;
-		};
-	};
-};
-
-&i2s20 {
-	status = "okay";
-	pinctrl-0 = <&i2s20_default_alt>;
-	pinctrl-names = "default";
-};
diff --git a/tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 8b82825a0f2..00000000000
--- a/tests/drivers/i2s/i2s_speed/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/* i2s-node0 is the transmitter/receiver */
-
-/ {
-	aliases {
-		i2s-node0 = &i2s20;
-	};
-};
-
-&pinctrl {
-	i2s20_default_alt: i2s20_default_alt {
-		group1 {
-			psels = <NRF_PSEL(I2S_SCK_M, 1, 11)>,
-				<NRF_PSEL(I2S_LRCK_M, 1, 12)>,
-				<NRF_PSEL(I2S_SDOUT, 1, 8)>,
-				<NRF_PSEL(I2S_SDIN, 1, 9)>;
-		};
-	};
-};
-
-&i2s20 {
-	status = "okay";
-	pinctrl-0 = <&i2s20_default_alt>;
-	pinctrl-names = "default";
-};

From a67b048d64ef3aa6b76d9a3ae8196a892494ea5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:41 +0100
Subject: [PATCH 1624/2913] Revert "[nrf fromtree] cmake: support PATH argument
 in build_info()"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 558396cba201bc0a88a6f0ea0e84dcf2e694c566.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/modules/extensions.cmake | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index 23c30789b73..066e0422e49 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -3596,8 +3596,7 @@ function(topological_sort)
 endfunction()
 
 # Usage:
-#   build_info(<tag>... VALUE <value>... )
-#   build_info(<tag>... PATH  <path>... )
+#   build_info(<tag>... VALUE <value>...)
 #
 # This function populates updates the build_info.yml info file with exchangable build information
 # related to the current build.
@@ -3614,20 +3613,11 @@ endfunction()
 # <tag>...: One of the pre-defined valid CMake keys supported by build info or vendor-specific.
 #           See 'scripts/schemas/build-schema.yml' CMake section for valid tags.
 # VALUE <value>... : value(s) to place in the build_info.yml file.
-# PATH  <path>... : path(s) to place in the build_info.yml file. All paths are converted to CMake
-#                   style. If no conversion is required, for example when paths are already
-#                   guaranteed to be CMake style, then VALUE can also be used.
 function(build_info)
-  set(convert_path FALSE)
   set(arg_list ${ARGV})
   list(FIND arg_list VALUE index)
   if(index EQUAL -1)
-    list(FIND arg_list PATH index)
-    set(convert_path TRUE)
-  endif()
-
-  if(index EQUAL -1)
-    message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION}(...) missing a required argument: VALUE or PATH")
+    message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION}(...) missing a required argument: VALUE")
   endif()
 
   yaml_context(EXISTS NAME build_info result)
@@ -3645,15 +3635,6 @@ function(build_info)
   list(SUBLIST arg_list ${index} -1 values)
   list(POP_FRONT values)
 
-  if(convert_path)
-    set(converted_values)
-    foreach(val ${values})
-      cmake_path(SET cmake_path "${val}")
-      list(APPEND converted_values "${cmake_path}")
-    endforeach()
-    set(values "${converted_values}")
-  endif()
-
   if(ARGV0 STREQUAL "vendor-specific")
     set(type VALUE)
   else()

From 2df4ff24521a9c7b7f3af9e836ca57cab39b1469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:41 +0100
Subject: [PATCH 1625/2913] Revert "[nrf fromlist] drivers: modem_cellular: fix
 handling of `+C*REG` answers"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b45ca4a1e949d99fe56a749e09f60b7c09329c32.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/modem/modem_cellular.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/modem/modem_cellular.c b/drivers/modem/modem_cellular.c
index eb59319ac24..65f03cba43d 100644
--- a/drivers/modem/modem_cellular.c
+++ b/drivers/modem/modem_cellular.c
@@ -454,15 +454,10 @@ static void modem_cellular_chat_on_cxreg(struct modem_chat *chat, char **argv, u
 	struct modem_cellular_data *data = (struct modem_cellular_data *)user_data;
 	enum cellular_registration_status registration_status = 0;
 
-	/* This receives both +C*REG? read command answers and unsolicited notifications.
-	 * Their syntax differs in that the former has one more parameter, <n>, which is first.
-	 */
-	if (argc >= 3 && argv[2][0] != '"') {
-		/* +CEREG: <n>,<stat>[,<tac>[...]] */
-		registration_status = atoi(argv[2]);
-	} else if (argc >= 2) {
-		/* +CEREG: <stat>[,<tac>[...]] */
+	if (argc == 2) {
 		registration_status = atoi(argv[1]);
+	} else if (argc == 3 || argc == 6) {
+		registration_status = atoi(argv[2]);
 	} else {
 		return;
 	}
@@ -471,7 +466,7 @@ static void modem_cellular_chat_on_cxreg(struct modem_chat *chat, char **argv, u
 		data->registration_status_gsm = registration_status;
 	} else if (strcmp(argv[0], "+CGREG: ") == 0) {
 		data->registration_status_gprs = registration_status;
-	} else { /* CEREG */
+	} else {
 		data->registration_status_lte = registration_status;
 	}
 

From 77ba3fcd6d37c89af01929e99014f1afd25f1a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:41 +0100
Subject: [PATCH 1626/2913] Revert "[nrf fromlist] fs: zms: multiple fixes from
 previous PR review"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f73e4775b8e9d093369cdd8dcbcbf3bf78fd6889.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/services/storage/zms/zms.rst |  84 +++++-----------
 include/zephyr/fs/zms.h          | 108 +++++++++++----------
 samples/subsys/fs/zms/src/main.c |  18 +---
 subsys/fs/zms/Kconfig            |  16 +--
 subsys/fs/zms/zms.c              | 162 +++++++++++--------------------
 subsys/fs/zms/zms_priv.h         |  13 ++-
 tests/subsys/fs/zms/src/main.c   |  53 +++++-----
 7 files changed, 181 insertions(+), 273 deletions(-)

diff --git a/doc/services/storage/zms/zms.rst b/doc/services/storage/zms/zms.rst
index 02fed3cf77c..d1125e0505d 100644
--- a/doc/services/storage/zms/zms.rst
+++ b/doc/services/storage/zms/zms.rst
@@ -201,9 +201,9 @@ An entry has 16 bytes divided between these variables :
 
 	struct zms_ate {
 		uint8_t crc8;      /* crc8 check of the entry */
-		uint8_t cycle_cnt; /* cycle counter for non-erasable devices */
-		uint16_t len;      /* data len within sector */
+		uint8_t cycle_cnt; /* cycle counter for non erasable devices */
 		uint32_t id;       /* data id */
+		uint16_t len;      /* data len within sector */
 		union {
 			uint8_t data[8]; /* used to store small size data */
 			struct {
@@ -218,22 +218,21 @@ An entry has 16 bytes divided between these variables :
 		};
 	} __packed;
 
-.. note:: The CRC of the data is checked only when the whole the element is read.
-   The CRC of the data is not checked for a partial read, as it is computed for the whole element.
+.. note:: The data CRC is checked only when the whole data of the element is read.
+   The data CRC is not checked for a partial read, as it is computed for the complete set of data.
 
-.. note:: Enabling the CRC feature on previously existing ZMS content without CRC enabled
-   will make all existing data invalid.
+.. note:: Enabling the data CRC feature on a previously existing ZMS content without
+   data CRC will make all existing data invalid.
 
 .. _free-space:
 
 Available space for user data (key-value pairs)
 ***********************************************
 
-For both scenarios ZMS should always have an empty sector to be able to perform the
-garbage collection (GC).
-So, if we suppose that 4 sectors exist in a partition, ZMS will only use 3 sectors to store
-Key-value pairs and keep one sector empty to be able to launch GC.
-The empty sector will rotate between the 4 sectors in the partition.
+For both scenarios ZMS should have always an empty sector to be able to perform the garbage
+collection.
+So if we suppose that 4 sectors exist in a partition, ZMS will only use 3 sectors to store
+Key-value pairs and keep always one (rotating sector) empty to be able to launch GC.
 
 .. note:: The maximum single data length that could be written at once in a sector is 64K
    (This could change in future versions of ZMS)
@@ -241,8 +240,8 @@ The empty sector will rotate between the 4 sectors in the partition.
 Small data values
 =================
 
-Values smaller than 8 bytes will be stored within the entry (ATE) itself, without writing data
-at the top of the sector.
+For small data values (<= 8 bytes), the data is stored within the entry (ATE) itself and no data
+is written at the top of the sector.
 ZMS has an entry size of 16 bytes which means that the maximum available space in a partition to
 store data is computed in this scenario as :
 
@@ -266,7 +265,7 @@ Large data values
 =================
 
 Large data values ( > 8 bytes) are stored separately at the top of the sector.
-In this case, it is hard to estimate the free available space, as this depends on the size of
+In this case it is hard to estimate the free available space as this depends on the size of
 the data. But we can take into account that for N bytes of data (N > 8 bytes) an additional
 16 bytes of ATE must be added at the bottom of the sector.
 
@@ -287,17 +286,17 @@ This storage system is optimized for devices that do not require an erase.
 Using storage systems that rely on an erase-value (NVS as an example) will need to emulate the
 erase with write operations. This will cause a significant decrease in the life expectancy of
 these devices and will cause more delays for write operations and for initialization.
-ZMS uses a cycle count mechanism that avoids emulating erase operation for these devices.
+ZMS introduces a cycle count mechanism that avoids emulating erase operation for these devices.
 It also guarantees that every memory location is written only once for each cycle of sector write.
 
-As an example, to erase a 4096 bytes sector on a non-erasable device using NVS, 256 flash writes
+As an example, to erase a 4096 bytes sector on a non erasable device using NVS, 256 flash writes
 must be performed (supposing that write-block-size=16 bytes), while using ZMS only 1 write of
 16 bytes is needed. This operation is 256 times faster in this case.
 
 Garbage collection operation is also adding some writes to the memory cell life expectancy as it
 is moving some blocks from one sector to another.
 To make the garbage collector not affect the life expectancy of the device it is recommended
-to correctly dimension the partition size. Its size should be the double of the maximum size of
+to dimension correctly the partition size. Its size should be the double of the maximum size of
 data (including extra headers) that could be written in the storage.
 
 See :ref:`free-space`.
@@ -308,10 +307,10 @@ Device lifetime calculation
 Storage devices whether they are classical Flash or new technologies like RRAM/MRAM has a limited
 life expectancy which is determined by the number of times memory cells can be erased/written.
 Flash devices are erased one page at a time as part of their functional behavior (otherwise
-memory cells cannot be overwritten) and for non-erasable storage devices memory cells can be
+memory cells cannot be overwritten) and for non erasable storage devices memory cells can be
 overwritten directly.
 
-A typical scenario is shown here to calculate the life expectancy of a device:
+A typical scenario is shown here to calculate the life expectancy of a device.
 Let's suppose that we store an 8 bytes variable using the same ID but its content changes every
 minute. The partition has 4 sectors with 1024 bytes each.
 Each write of the variable requires 16 bytes of storage.
@@ -362,9 +361,9 @@ Existing features
 =================
 Version1
 --------
-- Supports non-erasable devices (only one write operation to erase a sector)
+- Supports non erasable devices (only one write operation to erase a sector)
 - Supports large partition size and sector size (64 bits address space)
-- Supports 32-bit IDs to store ID/Value pairs
+- Supports large IDs width (32 bits) to store ID/Value pairs
 - Small sized data ( <= 8 bytes) are stored in the ATE itself
 - Built-in Data CRC32 (included in the ATE)
 - Versionning of ZMS (to handle future evolution)
@@ -376,7 +375,7 @@ Future features
 - Add multiple format ATE support to be able to use ZMS with different ATE formats that satisfies
   requirements from application
 - Add the possibility to skip garbage collector for some application usage where ID/value pairs
-  are written periodically and do not exceed half of the partition size (there is always an old
+  are written periodically and do not exceed half of the partition size (ther is always an old
   entry with the same ID).
 - Divide IDs into namespaces and allocate IDs on demand from application to handle collisions
   between IDs used by different subsystems or samples.
@@ -395,9 +394,9 @@ functionality: :ref:`NVS <nvs_api>` and :ref:`FCB <fcb_api>`.
 Which one to use in your application will depend on your needs and the hardware you are using,
 and this section provides information to help make a choice.
 
-- If you are using a non-erasable technology device like RRAM or MRAM, :ref:`ZMS <zms_api>` is definitely the
-  best fit for your storage subsystem as it is designed to avoid emulating erase operation using
-  large block writes for these devices and replaces it with a single write call.
+- If you are using a non erasable technology device like RRAM or MRAM, :ref:`ZMS <zms_api>` is definitely the
+  best fit for your storage subsystem as it is designed very well to avoid emulating erase for
+  these devices and replace it by a single write call.
 - For devices with large write_block_size and/or needs a sector size that is different than the
   classical flash page size (equal to erase_block_size), :ref:`ZMS <zms_api>` is also the best fit as there is
   the possibility to customize these parameters and add the support of these devices in ZMS.
@@ -415,41 +414,6 @@ verified to make sure that the application could work with one subsystem or the
 both solutions could be implemented, the best choice should be based on the calculations of the
 life expectancy of the device described in this section: :ref:`wear-leveling`.
 
-Recommendations to increase performance
-***************************************
-
-Sector size and count
-=====================
-
-- The total size of the storage partition should be well dimensioned to achieve the best
-  performance for ZMS.
-  All the information regarding the effectively available free space in ZMS can be found
-  in the documentation. See :ref:`free-space`.
-  We recommend choosing a storage partition that can hold double the size of the key-value pairs
-  that will be written in the storage.
-- The size of a sector needs to be dimensioned to hold the maximum data length that will be stored.
-  Increasing the size of a sector will slow down the garbage collection operation which will
-  occur less frequently.
-  Decreasing its size, in the opposite, will make the garbage collection operation faster
-  which will occur more frequently.
-- For some subsystems like :ref:`Settings <settings_api>`, all path-value pairs are split into two ZMS entries (ATEs).
-  The header needed by the two entries should be accounted when computing the needed storage space.
-- Using small data to store in the ZMS entries can increase the performance, as this data is
-  written within the entry header.
-  For example, for the :ref:`Settings <settings_api>` subsystem, choosing a path name that is
-  less than or equal to 8 bytes can make reads and writes faster.
-
-Dimensioning cache
-==================
-
-- When using ZMS API directly, the recommended cache size should be, at least, equal to
-  the number of different entries that will be written in the storage.
-- Each additional cache entry will add 8 bytes to your RAM usage. Cache size should be carefully
-  chosen.
-- If you use ZMS through :ref:`Settings <settings_api>`, you have to take into account that each Settings entry is
-  divided into two ZMS entries. The recommended cache size should be, at least, twice the number
-  of Settings entries.
-
 Sample
 ******
 
diff --git a/include/zephyr/fs/zms.h b/include/zephyr/fs/zms.h
index 0f0fbb82cc9..1155319d792 100644
--- a/include/zephyr/fs/zms.h
+++ b/include/zephyr/fs/zms.h
@@ -1,14 +1,14 @@
-/* Copyright (c) 2024 BayLibre SAS
+/*  ZMS: Zephyr Memory Storage
  *
- * SPDX-License-Identifier: Apache-2.0
+ * Copyright (c) 2024 BayLibre SAS
  *
- * ZMS: Zephyr Memory Storage
+ * SPDX-License-Identifier: Apache-2.0
  */
 #ifndef ZEPHYR_INCLUDE_FS_ZMS_H_
 #define ZEPHYR_INCLUDE_FS_ZMS_H_
 
-#include <sys/types.h>
 #include <zephyr/drivers/flash.h>
+#include <sys/types.h>
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/toolchain.h>
@@ -18,6 +18,7 @@ extern "C" {
 #endif
 
 /**
+ * @brief Zephyr Memory Storage (ZMS)
  * @defgroup zms Zephyr Memory Storage (ZMS)
  * @ingroup file_system_storage
  * @{
@@ -25,34 +26,37 @@ extern "C" {
  */
 
 /**
- * @defgroup zms_data_structures ZMS data structures
+ * @brief Zephyr Memory Storage Data Structures
+ * @defgroup zms_data_structures Zephyr Memory Storage Data Structures
  * @ingroup zms
  * @{
  */
 
-/** Zephyr Memory Storage file system structure */
+/**
+ * @brief Zephyr Memory Storage File system structure
+ */
 struct zms_fs {
-	/** File system offset in flash */
+	/** File system offset in flash **/
 	off_t offset;
-	/** Allocation Table Entry (ATE) write address.
-	 * Addresses are stored as `uint64_t`:
+	/** Allocation table entry write address.
+	 * Addresses are stored as uint64_t:
 	 * - high 4 bytes correspond to the sector
 	 * - low 4 bytes are the offset in the sector
 	 */
 	uint64_t ate_wra;
 	/** Data write address */
 	uint64_t data_wra;
-	/** Storage system is split into sectors. The sector size must be a multiple of
-	 *  `erase-block-size` if the device has erase capabilities
+	/** Storage system is split into sectors, each sector size must be multiple of erase-blocks
+	 *  if the device has erase capabilities
 	 */
 	uint32_t sector_size;
 	/** Number of sectors in the file system */
 	uint32_t sector_count;
-	/** Current cycle counter of the active sector (pointed to by `ate_wra`) */
+	/** Current cycle counter of the active sector (pointed by ate_wra)*/
 	uint8_t sector_cycle;
 	/** Flag indicating if the file system is initialized */
 	bool ready;
-	/** Mutex used to lock flash writes */
+	/** Mutex */
 	struct k_mutex zms_lock;
 	/** Flash device runtime structure */
 	const struct device *flash_device;
@@ -61,7 +65,7 @@ struct zms_fs {
 	/** Size of an Allocation Table Entry */
 	size_t ate_size;
 #if CONFIG_ZMS_LOOKUP_CACHE
-	/** Lookup table used to cache ATE addresses of written IDs */
+	/** Lookup table used to cache ATE address of a written ID */
 	uint64_t lookup_cache[CONFIG_ZMS_LOOKUP_CACHE_SIZE];
 #endif
 };
@@ -71,77 +75,78 @@ struct zms_fs {
  */
 
 /**
- * @defgroup zms_high_level_api ZMS API
+ * @brief Zephyr Memory Storage APIs
+ * @defgroup zms_high_level_api Zephyr Memory Storage APIs
  * @ingroup zms
  * @{
  */
 
 /**
- * @brief Mount a ZMS file system onto the device specified in `fs`.
+ * @brief Mount a ZMS file system onto the device specified in @p fs.
  *
- * @param fs Pointer to the file system.
+ * @param fs Pointer to file system
  * @retval 0 Success
- * @retval -ERRNO Negative errno code on error
+ * @retval -ERRNO errno code if error
  */
 int zms_mount(struct zms_fs *fs);
 
 /**
  * @brief Clear the ZMS file system from device.
  *
- * @param fs Pointer to the file system.
+ * @param fs Pointer to file system
  * @retval 0 Success
- * @retval -ERRNO Negative errno code on error
+ * @retval -ERRNO errno code if error
  */
 int zms_clear(struct zms_fs *fs);
 
 /**
  * @brief Write an entry to the file system.
  *
- * @note  When the `len` parameter is equal to `0` the entry is effectively removed (it is
- * equivalent to calling @ref zms_delete()). It is not possible to distinguish between a deleted
+ * @note  When @p len parameter is equal to @p 0 then entry is effectively removed (it is
+ * equivalent to calling of zms_delete). It is not possible to distinguish between a deleted
  * entry and an entry with data of length 0.
  *
- * @param fs Pointer to the file system.
- * @param id ID of the entry to be written
+ * @param fs Pointer to file system
+ * @param id Id of the entry to be written
  * @param data Pointer to the data to be written
- * @param len Number of bytes to be written (maximum 64 KiB)
+ * @param len Number of bytes to be written (maximum 64 KB)
  *
  * @return Number of bytes written. On success, it will be equal to the number of bytes requested
- * to be written or 0.
- * When a rewrite of the same data already stored is attempted, nothing is written to flash,
- * thus 0 is returned. On error, returns negative value of error codes defined in `errno.h`.
+ * to be written. When a rewrite of the same data already stored is attempted, nothing is written
+ * to flash, thus 0 is returned. On error, returns negative value of errno.h defined error codes.
  */
 ssize_t zms_write(struct zms_fs *fs, uint32_t id, const void *data, size_t len);
 
 /**
  * @brief Delete an entry from the file system
  *
- * @param fs Pointer to the file system.
- * @param id ID of the entry to be deleted
+ * @param fs Pointer to file system
+ * @param id Id of the entry to be deleted
  * @retval 0 Success
- * @retval -ERRNO Negative errno code on error
+ * @retval -ERRNO errno code if error
  */
 int zms_delete(struct zms_fs *fs, uint32_t id);
 
 /**
  * @brief Read an entry from the file system.
  *
- * @param fs Pointer to the file system.
- * @param id ID of the entry to be read
+ * @param fs Pointer to file system
+ * @param id Id of the entry to be read
  * @param data Pointer to data buffer
- * @param len Number of bytes to read at most
+ * @param len Number of bytes to be read (or size of the allocated read buffer)
  *
  * @return Number of bytes read. On success, it will be equal to the number of bytes requested
- * to be read or less than that if the stored data has a smaller size than the requested one.
- * On error, returns negative value of error codes defined in `errno.h`.
+ * to be read. When the return value is less than the number of bytes requested to read this
+ * indicates that ATE contain less data than requested. On error, returns negative value of
+ * errno.h defined error codes.
  */
 ssize_t zms_read(struct zms_fs *fs, uint32_t id, void *data, size_t len);
 
 /**
  * @brief Read a history entry from the file system.
  *
- * @param fs Pointer to the file system.
- * @param id ID of the entry to be read
+ * @param fs Pointer to file system
+ * @param id Id of the entry to be read
  * @param data Pointer to data buffer
  * @param len Number of bytes to be read
  * @param cnt History counter: 0: latest entry, 1: one before latest ...
@@ -149,41 +154,40 @@ ssize_t zms_read(struct zms_fs *fs, uint32_t id, void *data, size_t len);
  * @return Number of bytes read. On success, it will be equal to the number of bytes requested
  * to be read. When the return value is larger than the number of bytes requested to read this
  * indicates not all bytes were read, and more data is available. On error, returns negative
- * value of error codes defined in `errno.h`.
+ * value of errno.h defined error codes.
  */
 ssize_t zms_read_hist(struct zms_fs *fs, uint32_t id, void *data, size_t len, uint32_t cnt);
 
 /**
- * @brief Gets the length of the data that is stored in an entry with a given ID
+ * @brief Gets the data size that is stored in an entry with a given id
  *
- * @param fs Pointer to the file system.
- * @param id ID of the entry whose data length to retrieve.
+ * @param fs Pointer to file system
+ * @param id Id of the entry that we want to get its data length
  *
  * @return Data length contained in the ATE. On success, it will be equal to the number of bytes
- * in the ATE. On error, returns negative value of error codes defined in `errno.h`.
+ * in the ATE. On error, returns negative value of errno.h defined error codes.
  */
 ssize_t zms_get_data_length(struct zms_fs *fs, uint32_t id);
-
 /**
  * @brief Calculate the available free space in the file system.
  *
- * @param fs Pointer to the file system.
+ * @param fs Pointer to file system
  *
- * @return Number of free bytes. On success, it will be equal to the number of bytes that can
+ * @return Number of bytes free. On success, it will be equal to the number of bytes that can
  * still be written to the file system.
- * Calculating the free space is a time-consuming operation, especially on SPI flash.
- * On error, returns negative value of error codes defined in `errno.h`.
+ * Calculating the free space is a time consuming operation, especially on spi flash.
+ * On error, returns negative value of errno.h defined error codes.
  */
 ssize_t zms_calc_free_space(struct zms_fs *fs);
 
 /**
- * @brief Tell how much contiguous free space remains in the currently active ZMS sector.
+ * @brief Tell how many contiguous free space remains in the currently active ZMS sector.
  *
  * @param fs Pointer to the file system.
  *
  * @return Number of free bytes.
  */
-size_t zms_active_sector_free_space(struct zms_fs *fs);
+size_t zms_sector_max_data_size(struct zms_fs *fs);
 
 /**
  * @brief Close the currently active sector and switch to the next one.
@@ -191,12 +195,12 @@ size_t zms_active_sector_free_space(struct zms_fs *fs);
  * @note The garbage collector is called on the new sector.
  *
  * @warning This routine is made available for specific use cases.
- * It collides with ZMS's goal of avoiding any unnecessary flash erase operations.
+ * It collides with the ZMS goal of avoiding any unnecessary flash erase operations.
  * Using this routine extensively can result in premature failure of the flash device.
  *
  * @param fs Pointer to the file system.
  *
- * @return 0 on success. On error, returns negative value of error codes defined in `errno.h`.
+ * @return 0 on success. On error, returns negative value of errno.h defined error codes.
  */
 int zms_sector_use_next(struct zms_fs *fs);
 
diff --git a/samples/subsys/fs/zms/src/main.c b/samples/subsys/fs/zms/src/main.c
index 959d5ac5f3e..a2166392724 100644
--- a/samples/subsys/fs/zms/src/main.c
+++ b/samples/subsys/fs/zms/src/main.c
@@ -83,8 +83,7 @@ int main(void)
 	int rc = 0;
 	char buf[16];
 	uint8_t key[8] = {0xDE, 0xAD, 0xBE, 0xEF, 0xDE, 0xAD, 0xBE, 0xEF}, longarray[128];
-	uint32_t i_cnt = 0U;
-	uint32_t i;
+	uint32_t i_cnt = 0U, i;
 	uint32_t id = 0;
 	ssize_t free_space = 0;
 	struct flash_pages_info info;
@@ -145,7 +144,7 @@ int main(void)
 		rc = zms_read(&fs, KEY_VALUE_ID, &key, sizeof(key));
 		if (rc > 0) { /* item was found, show it */
 			printk("Id: %x, Key: ", KEY_VALUE_ID);
-			for (uint8_t n = 0; n < 8; n++) {
+			for (int n = 0; n < 8; n++) {
 				printk("%x ", key[n]);
 			}
 			printk("\n");
@@ -182,7 +181,7 @@ int main(void)
 		if (rc > 0) {
 			/* item was found, show it */
 			printk("Id: %d, Longarray: ", LONG_DATA_ID);
-			for (uint16_t n = 0; n < sizeof(longarray); n++) {
+			for (int n = 0; n < sizeof(longarray); n++) {
 				printk("%x ", longarray[n]);
 			}
 			printk("\n");
@@ -205,7 +204,7 @@ int main(void)
 	}
 
 	if (i != MAX_ITERATIONS) {
-		printk("Error: Something went wrong at iteration %u rc=%d\n", i, rc);
+		printk("Error: Something went wrong at iteration %u rc=%d\n", i - 1, rc);
 		return 0;
 	}
 
@@ -250,7 +249,7 @@ int main(void)
 	 * Let's compute free space in storage. But before doing that let's Garbage collect
 	 * all sectors where we deleted all entries and then compute the free space
 	 */
-	for (i = 0; i < fs.sector_count; i++) {
+	for (uint32_t i = 0; i < fs.sector_count; i++) {
 		rc = zms_sector_use_next(&fs);
 		if (rc) {
 			printk("Error while changing sector rc=%d\n", rc);
@@ -262,13 +261,6 @@ int main(void)
 		return 0;
 	}
 	printk("Free space in storage is %u bytes\n", free_space);
-
-	/* Let's clean the storage now */
-	rc = zms_clear(&fs);
-	if (rc < 0) {
-		printk("Error while cleaning the storage, rc=%d\n", rc);
-	}
-
 	printk("Sample code finished Successfully\n");
 
 	return 0;
diff --git a/subsys/fs/zms/Kconfig b/subsys/fs/zms/Kconfig
index a2b060dfb4b..42f23905e09 100644
--- a/subsys/fs/zms/Kconfig
+++ b/subsys/fs/zms/Kconfig
@@ -1,9 +1,9 @@
+#Zephyr Memory Storage ZMS
+
 #Copyright (c) 2024 BayLibre SAS
 
 #SPDX-License-Identifier: Apache-2.0
 
-#Zephyr Memory Storage ZMS
-
 config ZMS
 	bool "Zephyr Memory Storage"
 	select CRC
@@ -34,19 +34,19 @@ config ZMS_DATA_CRC
 	help
 	  Enables DATA CRC
 
-config ZMS_CUSTOMIZE_BLOCK_SIZE
-	bool "Customize the size of the buffer used internally for reads and writes"
+config ZMS_CUSTOM_BLOCK_SIZE
+	bool "Custom buffer size used by ZMS for reads and writes"
 	help
-	  ZMS uses an internal buffer to read/write and compare stored data.
-	  Increasing the size of this buffer should be done carefully in order to not
+	  ZMS uses internal buffers to read/write and compare stored data.
+	  Increasing the size of these buffers should be done carefully in order to not
 	  overflow the stack.
 	  Increasing this buffer means as well that ZMS could work with storage devices
 	  that have larger write-block-size which decreases ZMS performance
 
-config ZMS_CUSTOM_BLOCK_SIZE
+config ZMS_MAX_BLOCK_SIZE
 	int "ZMS internal buffer size"
 	default 32
-	depends on ZMS_CUSTOMIZE_BLOCK_SIZE
+	depends on ZMS_CUSTOM_BLOCK_SIZE
 	help
 	  Changes the internal buffer size of ZMS
 
diff --git a/subsys/fs/zms/zms.c b/subsys/fs/zms/zms.c
index f0f22c59735..814a08a8839 100644
--- a/subsys/fs/zms/zms.c
+++ b/subsys/fs/zms/zms.c
@@ -1,8 +1,8 @@
-/* Copyright (c) 2024 BayLibre SAS
+/*  ZMS: Zephyr Memory Storage
  *
- * SPDX-License-Identifier: Apache-2.0
+ * Copyright (c) 2024 BayLibre SAS
  *
- * ZMS: Zephyr Memory Storage
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <string.h>
@@ -87,10 +87,8 @@ static inline size_t zms_lookup_cache_pos(uint32_t id)
 
 static int zms_lookup_cache_rebuild(struct zms_fs *fs)
 {
-	int rc;
-	int previous_sector_num = ZMS_INVALID_SECTOR_NUM;
-	uint64_t addr;
-	uint64_t ate_addr;
+	int rc, previous_sector_num = ZMS_INVALID_SECTOR_NUM;
+	uint64_t addr, ate_addr;
 	uint64_t *cache_entry;
 	uint8_t current_cycle;
 	struct zms_ate ate;
@@ -157,19 +155,6 @@ static inline off_t zms_addr_to_offset(struct zms_fs *fs, uint64_t addr)
 	return fs->offset + (fs->sector_size * SECTOR_NUM(addr)) + SECTOR_OFFSET(addr);
 }
 
-/* Helper to round down len to the closest multiple of write_block_size  */
-static inline size_t zms_round_down_write_block_size(struct zms_fs *fs, size_t len)
-{
-	return len & ~(fs->flash_parameters->write_block_size - 1U);
-}
-
-/* Helper to round up len to multiple of write_block_size */
-static inline size_t zms_round_up_write_block_size(struct zms_fs *fs, size_t len)
-{
-	return (len + (fs->flash_parameters->write_block_size - 1U)) &
-	       ~(fs->flash_parameters->write_block_size - 1U);
-}
-
 /* zms_al_size returns size aligned to fs->write_block_size */
 static inline size_t zms_al_size(struct zms_fs *fs, size_t len)
 {
@@ -178,8 +163,7 @@ static inline size_t zms_al_size(struct zms_fs *fs, size_t len)
 	if (write_block_size <= 1U) {
 		return len;
 	}
-
-	return zms_round_up_write_block_size(fs, len);
+	return (len + (write_block_size - 1U)) & ~(write_block_size - 1U);
 }
 
 /* Helper to get empty ATE address */
@@ -210,7 +194,7 @@ static int zms_flash_al_wrt(struct zms_fs *fs, uint64_t addr, const void *data,
 
 	offset = zms_addr_to_offset(fs, addr);
 
-	blen = zms_round_down_write_block_size(fs, len);
+	blen = len & ~(fs->flash_parameters->write_block_size - 1U);
 	if (blen > 0) {
 		rc = flash_write(fs->flash_device, offset, data8, blen);
 		if (rc) {
@@ -292,11 +276,10 @@ static int zms_flash_block_cmp(struct zms_fs *fs, uint64_t addr, const void *dat
 {
 	const uint8_t *data8 = (const uint8_t *)data;
 	int rc;
-	size_t bytes_to_cmp;
-	size_t block_size;
+	size_t bytes_to_cmp, block_size;
 	uint8_t buf[ZMS_BLOCK_SIZE];
 
-	block_size = zms_round_down_write_block_size(fs, ZMS_BLOCK_SIZE);
+	block_size = ZMS_BLOCK_SIZE & ~(fs->flash_parameters->write_block_size - 1U);
 
 	while (len) {
 		bytes_to_cmp = MIN(block_size, len);
@@ -322,11 +305,10 @@ static int zms_flash_block_cmp(struct zms_fs *fs, uint64_t addr, const void *dat
 static int zms_flash_cmp_const(struct zms_fs *fs, uint64_t addr, uint8_t value, size_t len)
 {
 	int rc;
-	size_t bytes_to_cmp;
-	size_t block_size;
+	size_t bytes_to_cmp, block_size;
 	uint8_t cmp[ZMS_BLOCK_SIZE];
 
-	block_size = zms_round_down_write_block_size(fs, ZMS_BLOCK_SIZE);
+	block_size = ZMS_BLOCK_SIZE & ~(fs->flash_parameters->write_block_size - 1U);
 
 	(void)memset(cmp, value, block_size);
 	while (len) {
@@ -347,11 +329,10 @@ static int zms_flash_cmp_const(struct zms_fs *fs, uint64_t addr, uint8_t value,
 static int zms_flash_block_move(struct zms_fs *fs, uint64_t addr, size_t len)
 {
 	int rc;
-	size_t bytes_to_copy;
-	size_t block_size;
+	size_t bytes_to_copy, block_size;
 	uint8_t buf[ZMS_BLOCK_SIZE];
 
-	block_size = zms_round_down_write_block_size(fs, ZMS_BLOCK_SIZE);
+	block_size = ZMS_BLOCK_SIZE & ~(fs->flash_parameters->write_block_size - 1U);
 
 	while (len) {
 		bytes_to_copy = MIN(block_size, len);
@@ -435,17 +416,17 @@ static int zms_ate_crc8_check(const struct zms_ate *entry)
 	return 1;
 }
 
-/* zms_ate_valid validates an ate in the current sector by checking if the ate crc is valid
- * and its cycle cnt matches the cycle cnt of the active sector
- *
- * return 1 if ATE is valid,
- *        0 otherwise
- *
- * see: zms_ate_valid_different_sector
+/* zms_ate_valid validates an ate:
+ *     return 1 if crc8 and cycle_cnt valid,
+ *            0 otherwise
  */
 static int zms_ate_valid(struct zms_fs *fs, const struct zms_ate *entry)
 {
-	return zms_ate_valid_different_sector(fs, entry, fs->sector_cycle);
+	if ((fs->sector_cycle != entry->cycle_cnt) || zms_ate_crc8_check(entry)) {
+		return 0;
+	}
+
+	return 1;
 }
 
 /* zms_ate_valid_different_sector validates an ate that is in a different
@@ -486,11 +467,10 @@ static inline int zms_get_cycle_on_sector_change(struct zms_fs *fs, uint64_t add
 	return 0;
 }
 
-/* zms_close_ate_valid validates a sector close ate.
- * A valid sector close ate should be:
- * - a valid ate
- * - with len = 0 and id = ZMS_HEAD_ID
- * - and offset points to location at ate multiple from sector size
+/* zms_close_ate_valid validates an sector close ate: a valid sector close ate:
+ * - valid ate
+ * - len = 0 and id = ZMS_HEAD_ID
+ * - offset points to location at ate multiple from sector size
  * return true if valid, false otherwise
  */
 static bool zms_close_ate_valid(struct zms_fs *fs, const struct zms_ate *entry)
@@ -499,10 +479,9 @@ static bool zms_close_ate_valid(struct zms_fs *fs, const struct zms_ate *entry)
 		(entry->id == ZMS_HEAD_ID) && !((fs->sector_size - entry->offset) % fs->ate_size));
 }
 
-/* zms_empty_ate_valid validates an sector empty ate.
- * A valid sector empty ate should be:
- * - a valid ate
- * - with len = 0xffff and id = 0xffffffff
+/* zms_empty_ate_valid validates an sector empty ate: a valid sector empty ate:
+ * - valid ate
+ * - len = 0xffff and id = 0xffffffff
  * return true if valid, false otherwise
  */
 static bool zms_empty_ate_valid(struct zms_fs *fs, const struct zms_ate *entry)
@@ -597,8 +576,7 @@ static int zms_flash_write_entry(struct zms_fs *fs, uint32_t id, const void *dat
  */
 static int zms_recover_last_ate(struct zms_fs *fs, uint64_t *addr, uint64_t *data_wra)
 {
-	uint64_t data_end_addr;
-	uint64_t ate_end_addr;
+	uint64_t data_end_addr, ate_end_addr;
 	struct zms_ate end_ate;
 	int rc;
 
@@ -636,8 +614,7 @@ static int zms_recover_last_ate(struct zms_fs *fs, uint64_t *addr, uint64_t *dat
 static int zms_compute_prev_addr(struct zms_fs *fs, uint64_t *addr)
 {
 	int sec_closed;
-	struct zms_ate empty_ate;
-	struct zms_ate close_ate;
+	struct zms_ate empty_ate, close_ate;
 
 	*addr += fs->ate_size;
 	if ((SECTOR_OFFSET(*addr)) != (fs->sector_size - 2 * fs->ate_size)) {
@@ -700,8 +677,7 @@ static void zms_sector_advance(struct zms_fs *fs, uint64_t *addr)
 static int zms_sector_close(struct zms_fs *fs)
 {
 	int rc;
-	struct zms_ate close_ate;
-	struct zms_ate garbage_ate;
+	struct zms_ate close_ate, garbage_ate;
 
 	close_ate.id = ZMS_HEAD_ID;
 	close_ate.len = 0U;
@@ -875,8 +851,7 @@ static int zms_find_ate_with_id(struct zms_fs *fs, uint32_t id, uint64_t start_a
 {
 	int rc;
 	int previous_sector_num = ZMS_INVALID_SECTOR_NUM;
-	uint64_t wlk_prev_addr;
-	uint64_t wlk_addr;
+	uint64_t wlk_prev_addr, wlk_addr;
 	int prev_found = 0;
 	struct zms_ate wlk_ate;
 	uint8_t current_cycle;
@@ -918,19 +893,9 @@ static int zms_find_ate_with_id(struct zms_fs *fs, uint32_t id, uint64_t start_a
  */
 static int zms_gc(struct zms_fs *fs)
 {
-	int rc;
-	int sec_closed;
-	struct zms_ate close_ate;
-	struct zms_ate gc_ate;
-	struct zms_ate wlk_ate;
-	struct zms_ate empty_ate;
-	uint64_t sec_addr;
-	uint64_t gc_addr;
-	uint64_t gc_prev_addr;
-	uint64_t wlk_addr;
-	uint64_t wlk_prev_addr;
-	uint64_t data_addr;
-	uint64_t stop_addr;
+	int rc, sec_closed;
+	struct zms_ate close_ate, gc_ate, wlk_ate, empty_ate;
+	uint64_t sec_addr, gc_addr, gc_prev_addr, wlk_addr, wlk_prev_addr, data_addr, stop_addr;
 	uint8_t previous_cycle = 0;
 
 	rc = zms_get_sector_cycle(fs, fs->ate_wra, &fs->sector_cycle);
@@ -1107,16 +1072,14 @@ int zms_clear(struct zms_fs *fs)
 
 static int zms_init(struct zms_fs *fs)
 {
-	int rc;
-	int sec_closed;
-	struct zms_ate last_ate;
-	struct zms_ate first_ate;
-	struct zms_ate close_ate;
-	struct zms_ate empty_ate;
-	uint64_t addr = 0U;
-	uint64_t data_wra = 0U;
-	uint32_t i;
-	uint32_t closed_sectors = 0;
+	int rc, sec_closed;
+	struct zms_ate last_ate, first_ate, close_ate, empty_ate;
+	/* Initialize addr to 0 for the case fs->sector_count == 0. This
+	 * should never happen as this is verified in zms_mount() but both
+	 * Coverity and GCC believe the contrary.
+	 */
+	uint64_t addr = 0U, data_wra = 0U;
+	uint32_t i, closed_sectors = 0;
 	bool zms_magic_exist = false;
 
 	k_mutex_lock(&fs->zms_lock, K_FOREVER);
@@ -1367,6 +1330,7 @@ static int zms_init(struct zms_fs *fs)
 
 int zms_mount(struct zms_fs *fs)
 {
+
 	int rc;
 	struct flash_pages_info info;
 	size_t write_block_size;
@@ -1380,7 +1344,7 @@ int zms_mount(struct zms_fs *fs)
 	}
 
 	fs->ate_size = zms_al_size(fs, sizeof(struct zms_ate));
-	write_block_size = fs->flash_parameters->write_block_size;
+	write_block_size = flash_get_write_block_size(fs->flash_device);
 
 	/* check that the write block size is supported */
 	if (write_block_size > ZMS_BLOCK_SIZE || write_block_size == 0) {
@@ -1438,10 +1402,8 @@ ssize_t zms_write(struct zms_fs *fs, uint32_t id, const void *data, size_t len)
 	int rc;
 	size_t data_size;
 	struct zms_ate wlk_ate;
-	uint64_t wlk_addr;
-	uint64_t rd_addr;
-	uint32_t gc_count;
-	uint32_t required_space = 0U; /* no space, appropriate for delete ate */
+	uint64_t wlk_addr, rd_addr;
+	uint32_t gc_count, required_space = 0U; /* no space, appropriate for delete ate */
 	int prev_found = 0;
 
 	if (!fs->ready) {
@@ -1581,11 +1543,8 @@ int zms_delete(struct zms_fs *fs, uint32_t id)
 
 ssize_t zms_read_hist(struct zms_fs *fs, uint32_t id, void *data, size_t len, uint32_t cnt)
 {
-	int rc;
-	int prev_found = 0;
-	uint64_t wlk_addr;
-	uint64_t rd_addr = 0;
-	uint64_t wlk_prev_addr = 0;
+	int rc, prev_found = 0;
+	uint64_t wlk_addr, rd_addr = 0, wlk_prev_addr = 0;
 	uint32_t cnt_his;
 	struct zms_ate wlk_ate;
 #ifdef CONFIG_ZMS_DATA_CRC
@@ -1700,22 +1659,12 @@ ssize_t zms_get_data_length(struct zms_fs *fs, uint32_t id)
 
 ssize_t zms_calc_free_space(struct zms_fs *fs)
 {
-	int rc;
-	int previous_sector_num = ZMS_INVALID_SECTOR_NUM;
-	int prev_found = 0;
-	int sec_closed;
-	struct zms_ate step_ate;
-	struct zms_ate wlk_ate;
-	struct zms_ate empty_ate;
-	struct zms_ate close_ate;
-	uint64_t step_addr;
-	uint64_t wlk_addr;
-	uint64_t step_prev_addr;
-	uint64_t wlk_prev_addr;
-	uint64_t data_wra = 0U;
+
+	int rc, previous_sector_num = ZMS_INVALID_SECTOR_NUM, prev_found = 0, sec_closed;
+	struct zms_ate step_ate, wlk_ate, empty_ate, close_ate;
+	uint64_t step_addr, wlk_addr, step_prev_addr, wlk_prev_addr, data_wra = 0U;
 	uint8_t current_cycle;
 	ssize_t free_space = 0;
-	const uint32_t second_to_last_offset = (2 * fs->ate_size);
 
 	if (!fs->ready) {
 		LOG_ERR("zms not initialized");
@@ -1779,8 +1728,9 @@ ssize_t zms_calc_free_space(struct zms_fs *fs)
 	/* Let's look now for special cases where some sectors have only ATEs with
 	 * small data size.
 	 */
+	const uint32_t second_to_last_offset = (2 * fs->ate_size);
 
-	for (int i = 0; i < fs->sector_count; i++) {
+	for (uint32_t i = 0; i < fs->sector_count; i++) {
 		step_addr = zms_close_ate_addr(fs, ((uint64_t)i << ADDR_SECT_SHIFT));
 
 		/* verify if the sector is closed */
@@ -1813,7 +1763,7 @@ ssize_t zms_calc_free_space(struct zms_fs *fs)
 	return free_space;
 }
 
-size_t zms_active_sector_free_space(struct zms_fs *fs)
+size_t zms_sector_max_data_size(struct zms_fs *fs)
 {
 	if (!fs->ready) {
 		LOG_ERR("ZMS not initialized");
diff --git a/subsys/fs/zms/zms_priv.h b/subsys/fs/zms/zms_priv.h
index 428ff6babca..6594048ea0f 100644
--- a/subsys/fs/zms/zms_priv.h
+++ b/subsys/fs/zms/zms_priv.h
@@ -1,10 +1,9 @@
-/* Copyright (c) 2024 BayLibre SAS
+/*  ZMS: Zephyr Memory Storage
  *
- * SPDX-License-Identifier: Apache-2.0
+ * Copyright (c) 2024 BayLibre SAS
  *
- * ZMS: Zephyr Memory Storage
+ * SPDX-License-Identifier: Apache-2.0
  */
-
 #ifndef __ZMS_PRIV_H_
 #define __ZMS_PRIV_H_
 
@@ -24,8 +23,8 @@ extern "C" {
 #define SECTOR_NUM(x)    FIELD_GET(ADDR_SECT_MASK, x)
 #define SECTOR_OFFSET(x) FIELD_GET(ADDR_OFFS_MASK, x)
 
-#if defined(CONFIG_ZMS_CUSTOMIZE_BLOCK_SIZE)
-#define ZMS_BLOCK_SIZE CONFIG_ZMS_CUSTOM_BLOCK_SIZE
+#if defined(CONFIG_ZMS_CUSTOM_BLOCK_SIZE)
+#define ZMS_BLOCK_SIZE CONFIG_ZMS_MAX_BLOCK_SIZE
 #else
 #define ZMS_BLOCK_SIZE 32
 #endif
@@ -47,8 +46,8 @@ extern "C" {
 struct zms_ate {
 	uint8_t crc8;      /* crc8 check of the entry */
 	uint8_t cycle_cnt; /* cycle counter for non erasable devices */
-	uint16_t len;      /* data len within sector */
 	uint32_t id;       /* data id */
+	uint16_t len;      /* data len within sector */
 	union {
 		uint8_t data[8]; /* used to store small size data */
 		struct {
diff --git a/tests/subsys/fs/zms/src/main.c b/tests/subsys/fs/zms/src/main.c
index bd4e21dd745..80866687dba 100644
--- a/tests/subsys/fs/zms/src/main.c
+++ b/tests/subsys/fs/zms/src/main.c
@@ -233,7 +233,8 @@ ZTEST_F(zms, test_zms_gc)
 	int len;
 	uint8_t buf[32];
 	uint8_t rd_buf[32];
-	const uint8_t max_id = 10;
+
+	const uint16_t max_id = 10;
 	/* 21st write will trigger GC. */
 	const uint16_t max_writes = 21;
 
@@ -242,7 +243,7 @@ ZTEST_F(zms, test_zms_gc)
 	err = zms_mount(&fixture->fs);
 	zassert_true(err == 0, "zms_mount call failure: %d", err);
 
-	for (int i = 0; i < max_writes; i++) {
+	for (uint32_t i = 0; i < max_writes; i++) {
 		uint8_t id = (i % max_id);
 		uint8_t id_data = id + max_id * (i / max_id);
 
@@ -252,11 +253,11 @@ ZTEST_F(zms, test_zms_gc)
 		zassert_true(len == sizeof(buf), "zms_write failed: %d", len);
 	}
 
-	for (int id = 0; id < max_id; id++) {
+	for (uint32_t id = 0; id < max_id; id++) {
 		len = zms_read(&fixture->fs, id, rd_buf, sizeof(buf));
 		zassert_true(len == sizeof(rd_buf), "zms_read unexpected failure: %d", len);
 
-		for (int i = 0; i < sizeof(rd_buf); i++) {
+		for (uint16_t i = 0; i < sizeof(rd_buf); i++) {
 			rd_buf[i] = rd_buf[i] % max_id;
 			buf[i] = id;
 		}
@@ -267,11 +268,11 @@ ZTEST_F(zms, test_zms_gc)
 	err = zms_mount(&fixture->fs);
 	zassert_true(err == 0, "zms_mount call failure: %d", err);
 
-	for (int id = 0; id < max_id; id++) {
+	for (uint32_t id = 0; id < max_id; id++) {
 		len = zms_read(&fixture->fs, id, rd_buf, sizeof(buf));
 		zassert_true(len == sizeof(rd_buf), "zms_read unexpected failure: %d", len);
 
-		for (int i = 0; i < sizeof(rd_buf); i++) {
+		for (uint16_t i = 0; i < sizeof(rd_buf); i++) {
 			rd_buf[i] = rd_buf[i] % max_id;
 			buf[i] = id;
 		}
@@ -285,7 +286,7 @@ static void write_content(uint32_t max_id, uint32_t begin, uint32_t end, struct
 	uint8_t buf[32];
 	ssize_t len;
 
-	for (int i = begin; i < end; i++) {
+	for (uint32_t i = begin; i < end; i++) {
 		uint8_t id = (i % max_id);
 		uint8_t id_data = id + max_id * (i / max_id);
 
@@ -302,11 +303,11 @@ static void check_content(uint32_t max_id, struct zms_fs *fs)
 	uint8_t buf[32];
 	ssize_t len;
 
-	for (int id = 0; id < max_id; id++) {
+	for (uint32_t id = 0; id < max_id; id++) {
 		len = zms_read(fs, id, rd_buf, sizeof(buf));
 		zassert_true(len == sizeof(rd_buf), "zms_read unexpected failure: %d", len);
 
-		for (int i = 0; i < ARRAY_SIZE(rd_buf); i++) {
+		for (uint16_t i = 0; i < ARRAY_SIZE(rd_buf); i++) {
 			rd_buf[i] = rd_buf[i] % max_id;
 			buf[i] = id;
 		}
@@ -321,6 +322,7 @@ static void check_content(uint32_t max_id, struct zms_fs *fs)
 ZTEST_F(zms, test_zms_gc_3sectors)
 {
 	int err;
+
 	const uint16_t max_id = 10;
 	/* 41st write will trigger 1st GC. */
 	const uint16_t max_writes = 41;
@@ -408,6 +410,7 @@ ZTEST_F(zms, test_zms_corrupted_sector_close_operation)
 	uint32_t *flash_write_stat;
 	uint32_t *flash_max_write_calls;
 	uint32_t *flash_max_len;
+
 	const uint16_t max_id = 10;
 	/* 21st write will trigger GC. */
 	const uint16_t max_writes = 21;
@@ -420,7 +423,7 @@ ZTEST_F(zms, test_zms_corrupted_sector_close_operation)
 	err = zms_mount(&fixture->fs);
 	zassert_true(err == 0, "zms_mount call failure: %d", err);
 
-	for (int i = 0; i < max_writes; i++) {
+	for (uint32_t i = 0; i < max_writes; i++) {
 		uint8_t id = (i % max_id);
 		uint8_t id_data = id + max_id * (i / max_id);
 
@@ -462,7 +465,7 @@ ZTEST_F(zms, test_zms_full_sector)
 	int err;
 	ssize_t len;
 	uint32_t filling_id = 0;
-	uint32_t data_read;
+	uint32_t i, data_read;
 
 	fixture->fs.sector_count = 3;
 
@@ -490,7 +493,7 @@ ZTEST_F(zms, test_zms_full_sector)
 	zassert_true(len == sizeof(filling_id), "zms_write failed: %d", len);
 
 	/* sanitycheck on ZMS content */
-	for (int i = 0; i <= filling_id; i++) {
+	for (i = 0; i <= filling_id; i++) {
 		len = zms_read(&fixture->fs, i, &data_read, sizeof(data_read));
 		if (i == 1) {
 			zassert_true(len == -ENOENT, "zms_read shouldn't found the entry: %d", len);
@@ -508,10 +511,8 @@ ZTEST_F(zms, test_delete)
 {
 	int err;
 	ssize_t len;
-	uint32_t filling_id;
-	uint32_t data_read;
-	uint32_t ate_wra;
-	uint32_t data_wra;
+	uint32_t filling_id, data_read;
+	uint32_t ate_wra, data_wra;
 
 	fixture->fs.sector_count = 3;
 
@@ -569,9 +570,7 @@ ZTEST_F(zms, test_delete)
  */
 ZTEST_F(zms, test_zms_gc_corrupt_close_ate)
 {
-	struct zms_ate ate;
-	struct zms_ate close_ate;
-	struct zms_ate empty_ate;
+	struct zms_ate ate, close_ate, empty_ate;
 	uint32_t data;
 	ssize_t len;
 	int err;
@@ -643,8 +642,7 @@ ZTEST_F(zms, test_zms_gc_corrupt_close_ate)
  */
 ZTEST_F(zms, test_zms_gc_corrupt_ate)
 {
-	struct zms_ate corrupt_ate;
-	struct zms_ate close_ate;
+	struct zms_ate corrupt_ate, close_ate;
 	int err;
 
 	close_ate.id = 0xffffffff;
@@ -687,10 +685,10 @@ ZTEST_F(zms, test_zms_gc_corrupt_ate)
 #ifdef CONFIG_ZMS_LOOKUP_CACHE
 static size_t num_matching_cache_entries(uint64_t addr, bool compare_sector_only, struct zms_fs *fs)
 {
-	size_t num = 0;
+	size_t i, num = 0;
 	uint64_t mask = compare_sector_only ? ADDR_SECT_MASK : UINT64_MAX;
 
-	for (int i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
+	for (i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
 		if ((fs->lookup_cache[i] & mask) == addr) {
 			num++;
 		}
@@ -761,19 +759,20 @@ ZTEST_F(zms, test_zms_cache_collission)
 {
 #ifdef CONFIG_ZMS_LOOKUP_CACHE
 	int err;
+	uint32_t id;
 	uint16_t data;
 
 	fixture->fs.sector_count = 4;
 	err = zms_mount(&fixture->fs);
 	zassert_true(err == 0, "zms_mount call failure: %d", err);
 
-	for (int id = 0; id < CONFIG_ZMS_LOOKUP_CACHE_SIZE + 1; id++) {
+	for (id = 0; id < CONFIG_ZMS_LOOKUP_CACHE_SIZE + 1; id++) {
 		data = id;
 		err = zms_write(&fixture->fs, id, &data, sizeof(data));
 		zassert_equal(err, sizeof(data), "zms_write call failure: %d", err);
 	}
 
-	for (int id = 0; id < CONFIG_ZMS_LOOKUP_CACHE_SIZE + 1; id++) {
+	for (id = 0; id < CONFIG_ZMS_LOOKUP_CACHE_SIZE + 1; id++) {
 		err = zms_read(&fixture->fs, id, &data, sizeof(data));
 		zassert_equal(err, sizeof(data), "zms_read call failure: %d", err);
 		zassert_equal(data, id, "incorrect data read");
@@ -847,7 +846,7 @@ ZTEST_F(zms, test_zms_cache_hash_quality)
 
 	/* Write ZMS IDs from 0 to CONFIG_ZMS_LOOKUP_CACHE_SIZE - 1 */
 
-	for (int i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
+	for (uint16_t i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
 		id = i;
 		data = 0;
 
@@ -870,7 +869,7 @@ ZTEST_F(zms, test_zms_cache_hash_quality)
 
 	/* Write CONFIG_ZMS_LOOKUP_CACHE_SIZE ZMS IDs that form the following series: 0, 4, 8... */
 
-	for (int i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
+	for (uint16_t i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
 		id = i * 4;
 		data = 0;
 

From de9f681f36c70c23c5d3f79a40c0b1d64ee644a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:41 +0100
Subject: [PATCH 1627/2913] Revert "[nrf noup] settings: zms: use dedicated
 lookup cache hash function"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 031c3c0bec0931ae011c78d36637a57c5cdfd3aa.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/fs/zms/Kconfig |  9 ---------
 subsys/fs/zms/zms.c   | 45 -------------------------------------------
 2 files changed, 54 deletions(-)

diff --git a/subsys/fs/zms/Kconfig b/subsys/fs/zms/Kconfig
index 42f23905e09..330ef11155c 100644
--- a/subsys/fs/zms/Kconfig
+++ b/subsys/fs/zms/Kconfig
@@ -50,15 +50,6 @@ config ZMS_MAX_BLOCK_SIZE
 	help
 	  Changes the internal buffer size of ZMS
 
-config ZMS_LOOKUP_CACHE_FOR_SETTINGS
-	bool "ZMS Storage lookup cache optimized for settings"
-	depends on ZMS_LOOKUP_CACHE
-	help
-	  Use the lookup cache hash function that results in the least number of
-	  collissions and, in turn, the best ZMS performance provided that the ZMS
-	  is used as the settings backend only. This option should NOT be enabled
-	  if the ZMS is also written to directly, outside the settings layer.
-
 module = ZMS
 module-str = zms
 source "subsys/logging/Kconfig.template.log_config"
diff --git a/subsys/fs/zms/zms.c b/subsys/fs/zms/zms.c
index 814a08a8839..21930313109 100644
--- a/subsys/fs/zms/zms.c
+++ b/subsys/fs/zms/zms.c
@@ -11,10 +11,6 @@
 #include <zephyr/fs/zms.h>
 #include <zephyr/sys/crc.h>
 #include "zms_priv.h"
-#ifdef CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS
-#include <zephyr/sys/util.h>
-#include <settings/settings_zms.h>
-#endif
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(fs_zms, CONFIG_ZMS_LOG_LEVEL);
@@ -29,45 +25,6 @@ static int zms_ate_valid_different_sector(struct zms_fs *fs, const struct zms_at
 
 #ifdef CONFIG_ZMS_LOOKUP_CACHE
 
-#ifdef CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS
-
-static inline size_t zms_lookup_cache_pos(uint32_t id)
-{
-	/*
-	 * 1. The ZMS settings backend uses up to (ZMS_NAME_ID_OFFSET - 1) ZMS IDs to
-	      store keys and equal number of ZMS IDs to store values.
-	 * 2. For each key-value pair, the value is stored at ZMS ID greater by exactly
-	 *    ZMS_NAME_ID_OFFSET than ZMS ID that holds the key.
-	 * 3. The backend tries to minimize the range of ZMS IDs used to store keys.
-	 *    That is, ZMS IDs are allocated sequentially, and freed ZMS IDs are reused
-	 *    before allocating new ones.
-	 *
-	 * Therefore, to assure the least number of collisions in the lookup cache,
-	 * the least significant bit of the hash indicates whether the given ZMS ID
-	 * represents a key or a value, and remaining bits of the hash are set to
-	 * the ordinal number of the key-value pair. Consequently, the hash function
-	 * provides the following mapping:
-	 *
-	 * 1st settings key   => hash 0
-	 * 1st settings value => hash 1
-	 * 2nd settings key   => hash 2
-	 * 2nd settings value => hash 3
-	 * ...
-	 */
-	BUILD_ASSERT(IS_POWER_OF_TWO(ZMS_NAMECNT_ID), "ZMS_NAMECNT_ID is not power of 2");
-	BUILD_ASSERT(IS_POWER_OF_TWO(ZMS_NAME_ID_OFFSET), "ZMS_NAME_ID_OFFSET is not power of 2");
-
-	uint32_t key_value_bit;
-	uint32_t key_value_ord;
-
-	key_value_bit = (id >> LOG2(ZMS_NAME_ID_OFFSET)) & 1;
-	key_value_ord = id & (ZMS_NAME_ID_OFFSET - 1);
-
-	return ((key_value_ord << 1) | key_value_bit) % CONFIG_ZMS_LOOKUP_CACHE_SIZE;
-}
-
-#else /* CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS */
-
 static inline size_t zms_lookup_cache_pos(uint32_t id)
 {
 	uint32_t hash;
@@ -83,8 +40,6 @@ static inline size_t zms_lookup_cache_pos(uint32_t id)
 	return hash % CONFIG_ZMS_LOOKUP_CACHE_SIZE;
 }
 
-#endif /* CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS */
-
 static int zms_lookup_cache_rebuild(struct zms_fs *fs)
 {
 	int rc, previous_sector_num = ZMS_INVALID_SECTOR_NUM;

From 0c4f5601377b37cde7b2dcd7e6eaff7036f3df36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:41 +0100
Subject: [PATCH 1628/2913] Revert "[nrf fromtree] doc: zms: add documentation
 for ZMS"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 509ec379cffaf53ac81846ad90ee1e5e4539fc60.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/services/storage/index.rst   |   1 -
 doc/services/storage/zms/zms.rst | 432 -------------------------------
 2 files changed, 433 deletions(-)
 delete mode 100644 doc/services/storage/zms/zms.rst

diff --git a/doc/services/storage/index.rst b/doc/services/storage/index.rst
index f6e069ecf2a..8d3dd3da50c 100644
--- a/doc/services/storage/index.rst
+++ b/doc/services/storage/index.rst
@@ -7,7 +7,6 @@ Storage
    :maxdepth: 1
 
    nvs/nvs.rst
-   zms/zms.rst
    disk/access.rst
    flash_map/flash_map.rst
    fcb/fcb.rst
diff --git a/doc/services/storage/zms/zms.rst b/doc/services/storage/zms/zms.rst
deleted file mode 100644
index d1125e0505d..00000000000
--- a/doc/services/storage/zms/zms.rst
+++ /dev/null
@@ -1,432 +0,0 @@
-.. _zms_api:
-
-Zephyr Memory Storage (ZMS)
-###########################
-Zephyr Memory Storage is a new key-value storage system that is designed to work with all types
-of non-volatile storage technologies. It supports classical on-chip NOR flash as well as new
-technologies like RRAM and MRAM that do not require a separate erase operation at all, that is,
-data on these types of devices can be overwritten directly at any time.
-
-General behavior
-****************
-ZMS divides the memory space into sectors (minimum 2), and each sector is filled with key-value
-pairs until it is full.
-
-The key-value pair is divided into two parts:
-
-- The key part is written in an ATE (Allocation Table Entry) called "ID-ATE" which is stored
-  starting from the bottom of the sector
-- The value part is defined as "DATA" and is stored raw starting from the top of the sector
-
-Additionally, for each sector we store at the last positions Header-ATEs which are ATEs that
-are needed for the sector to describe its status (closed, open) and the current version of ZMS.
-
-When the current sector is full we verify first that the following sector is empty, we garbage
-collect the N+2 sector (where N is the current sector number) by moving the valid ATEs to the
-N+1 empty sector, we erase the garbage collected sector and then we close the current sector by
-writing a garbage_collect_done ATE and the close ATE (one of the header entries).
-Afterwards we move forward to the next sector and start writing entries again.
-
-This behavior is repeated until it reaches the end of the partition. Then it starts again from
-the first sector after garbage collecting it and erasing its content.
-
-Composition of a sector
-=======================
-A sector is organized in this form (example with 3 sectors):
-
-.. list-table::
-   :widths: 25 25 25
-   :header-rows: 1
-
-   * - Sector 0 (closed)
-     - Sector 1 (open)
-     - Sector 2 (empty)
-   * - Data_a0
-     - Data_b0
-     - Data_c0
-   * - Data_a1
-     - Data_b1
-     - Data_c1
-   * - Data_a2
-     - Data_b2
-     - Data_c2
-   * - GC_done
-     -    .
-     -    .
-   * -    .
-     -    .
-     -    .
-   * -    .
-     -    .
-     -    .
-   * -    .
-     - ATE_b2
-     - ATE_c2
-   * - ATE_a2
-     - ATE_b1
-     - ATE_c1
-   * - ATE_a1
-     - ATE_b0
-     - ATE_c0
-   * - ATE_a0
-     - GC_done
-     - GC_done
-   * - Close (cyc=1)
-     - Close (cyc=1)
-     - Close (cyc=1)
-   * - Empty (cyc=1)
-     - Empty (cyc=2)
-     - Empty (cyc=2)
-
-Definition of each element in the sector
-========================================
-
-``Empty ATE:`` is written when erasing a sector (last position of the sector).
-
-``Close ATE:`` is written when closing a sector (second to last position of the sector).
-
-``GC_done ATE:`` is written to indicate that the next sector has been already garbage
-collected. This ATE could be in any position of the sector.
-
-``ID-ATE:`` are entries that contain a 32 bits Key and describe where the data is stored, its
-size and its crc32
-
-``Data:`` is the actual value associated to the ID-ATE
-
-How does ZMS work?
-******************
-
-Mounting the Storage system
-===========================
-
-Mounting the storage starts by getting the flash parameters, checking that the file system
-properties are correct (sector_size, sector_count ...) then calling the zms_init function to
-make the storage ready.
-
-To mount the filesystem some elements in the zms_fs structure must be initialized.
-
-.. code-block:: c
-
-	struct zms_fs {
-		/** File system offset in flash **/
-		off_t offset;
-
-		/** Storage system is split into sectors, each sector size must be multiple of
-		 * erase-blocks if the device has erase capabilities
-		 */
-		uint32_t sector_size;
-		/** Number of sectors in the file system */
-		uint32_t sector_count;
-
-		/** Flash device runtime structure */
-		const struct device *flash_device;
-	};
-
-Initialization
-==============
-
-As ZMS has a fast-forward write mechanism, we must find the last sector and the last pointer of
-the entry where it stopped the last time.
-It must look for a closed sector followed by an open one, then within the open sector, it finds
-(recover) the last written ATE (Allocation Table Entry).
-After that, it checks that the sector after this one is empty, or it will erase it.
-
-ZMS ID-Data write
-===================
-
-To avoid rewriting the same data with the same ID again, it must look in all the sectors if the
-same ID exist then compares its data, if the data is identical no write is performed.
-If we must perform a write, then an ATE and Data (if not a delete) are written in the sector.
-If the sector is full (cannot hold the current data + ATE) we have to move to the next sector,
-garbage collect the sector after the newly opened one then erase it.
-Data size that is smaller or equal to 8 bytes are written within the ATE.
-
-ZMS ID/data read (with history)
-===============================
-
-By default it looks for the last data with the same ID by browsing through all stored ATEs from
-the most recent ones to the oldest ones. If it finds a valid ATE with a matching ID it retrieves
-its data and returns the number of bytes that were read.
-If history count is provided that is different than 0, older data with same ID is retrieved.
-
-ZMS free space calculation
-==========================
-
-ZMS can also return the free space remaining in the partition.
-However, this operation is very time consuming and needs to browse all valid ATEs in all sectors
-of the partition and for each valid ATE try to find if an older one exist.
-It is not recommended for application to use this function often, as it is time consuming and
-could slow down the calling thread.
-
-The cycle counter
-=================
-
-Each sector has a lead cycle counter which is a uin8_t that is used to validate all the other
-ATEs.
-The lead cycle counter is stored in the empty ATE.
-To become valid, an ATE must have the same cycle counter as the one stored in the empty ATE.
-Each time an ATE is moved from a sector to another it must get the cycle counter of the
-destination sector.
-To erase a sector, the cycle counter of the empty ATE is incremented and a single write of the
-empty ATE is done.
-All the ATEs in that sector become invalid.
-
-Closing sectors
-===============
-
-To close a sector a close ATE is added at the end of the sector and it must have the same cycle
-counter as the empty ATE.
-When closing a sector, all the remaining space that has not been used is filled with garbage data
-to avoid having old ATEs with a valid cycle counter.
-
-Triggering Garbage collection
-=============================
-
-Some applications need to make sure that storage writes have a maximum defined latency.
-When calling a ZMS write, the current sector could be almost full and we need to trigger the GC
-to switch to the next sector.
-This operation is time consuming and it will cause some applications to not meet their real time
-constraints.
-ZMS adds an API for the application to get the current remaining free space in a sector.
-The application could then decide when needed to switch to the next sector if the current one is
-almost full and of course it will trigger the garbage collection on the next sector.
-This will guarantee the application that the next write won't trigger the garbage collection.
-
-ATE (Allocation Table Entry) structure
-======================================
-
-An entry has 16 bytes divided between these variables :
-
-.. code-block:: c
-
-	struct zms_ate {
-		uint8_t crc8;      /* crc8 check of the entry */
-		uint8_t cycle_cnt; /* cycle counter for non erasable devices */
-		uint32_t id;       /* data id */
-		uint16_t len;      /* data len within sector */
-		union {
-			uint8_t data[8]; /* used to store small size data */
-			struct {
-				uint32_t offset; /* data offset within sector */
-				union {
-					uint32_t data_crc; /* crc for data */
-					uint32_t metadata; /* Used to store metadata information
-							    * such as storage version.
-							    */
-				};
-			};
-		};
-	} __packed;
-
-.. note:: The data CRC is checked only when the whole data of the element is read.
-   The data CRC is not checked for a partial read, as it is computed for the complete set of data.
-
-.. note:: Enabling the data CRC feature on a previously existing ZMS content without
-   data CRC will make all existing data invalid.
-
-.. _free-space:
-
-Available space for user data (key-value pairs)
-***********************************************
-
-For both scenarios ZMS should have always an empty sector to be able to perform the garbage
-collection.
-So if we suppose that 4 sectors exist in a partition, ZMS will only use 3 sectors to store
-Key-value pairs and keep always one (rotating sector) empty to be able to launch GC.
-
-.. note:: The maximum single data length that could be written at once in a sector is 64K
-   (This could change in future versions of ZMS)
-
-Small data values
-=================
-
-For small data values (<= 8 bytes), the data is stored within the entry (ATE) itself and no data
-is written at the top of the sector.
-ZMS has an entry size of 16 bytes which means that the maximum available space in a partition to
-store data is computed in this scenario as :
-
-.. math::
-
-   \small\frac{(NUM\_SECTORS - 1) \times (SECTOR\_SIZE - (5 \times ATE\_SIZE))}{2}
-
-Where:
-
-``NUM_SECTOR:`` Total number of sectors
-
-``SECTOR_SIZE:`` Size of the sector
-
-``ATE_SIZE:`` 16 bytes
-
-``(5 * ATE_SIZE):`` Reserved ATEs for header and delete items
-
-For example for 4 sectors of 1024 bytes, free space for data is :math:`\frac{3 \times 944}{2} = 1416 \, \text{ bytes}`.
-
-Large data values
-=================
-
-Large data values ( > 8 bytes) are stored separately at the top of the sector.
-In this case it is hard to estimate the free available space as this depends on the size of
-the data. But we can take into account that for N bytes of data (N > 8 bytes) an additional
-16 bytes of ATE must be added at the bottom of the sector.
-
-Let's take an example:
-
-For a partition that has 4 sectors of 1024 bytes and for data size of 64 bytes.
-Only 3 sectors are available for writes with a capacity of 944 bytes each.
-Each Key-value pair needs an extra 16 bytes for ATE which makes it possible to store 11 pairs
-in each sectors (:math:`\frac{944}{80}`).
-Total data that could be stored in this partition for this case is :math:`11 \times 3 \times 64 = 2112 \text{ bytes}`
-
-.. _wear-leveling:
-
-Wear leveling
-*************
-
-This storage system is optimized for devices that do not require an erase.
-Using storage systems that rely on an erase-value (NVS as an example) will need to emulate the
-erase with write operations. This will cause a significant decrease in the life expectancy of
-these devices and will cause more delays for write operations and for initialization.
-ZMS introduces a cycle count mechanism that avoids emulating erase operation for these devices.
-It also guarantees that every memory location is written only once for each cycle of sector write.
-
-As an example, to erase a 4096 bytes sector on a non erasable device using NVS, 256 flash writes
-must be performed (supposing that write-block-size=16 bytes), while using ZMS only 1 write of
-16 bytes is needed. This operation is 256 times faster in this case.
-
-Garbage collection operation is also adding some writes to the memory cell life expectancy as it
-is moving some blocks from one sector to another.
-To make the garbage collector not affect the life expectancy of the device it is recommended
-to dimension correctly the partition size. Its size should be the double of the maximum size of
-data (including extra headers) that could be written in the storage.
-
-See :ref:`free-space`.
-
-Device lifetime calculation
-===========================
-
-Storage devices whether they are classical Flash or new technologies like RRAM/MRAM has a limited
-life expectancy which is determined by the number of times memory cells can be erased/written.
-Flash devices are erased one page at a time as part of their functional behavior (otherwise
-memory cells cannot be overwritten) and for non erasable storage devices memory cells can be
-overwritten directly.
-
-A typical scenario is shown here to calculate the life expectancy of a device.
-Let's suppose that we store an 8 bytes variable using the same ID but its content changes every
-minute. The partition has 4 sectors with 1024 bytes each.
-Each write of the variable requires 16 bytes of storage.
-As we have 944 bytes available for ATEs for each sector, and because ZMS is a fast-forward
-storage system, we are going to rewrite the first location of the first sector after
-:math:`\frac{(944 \times 4)}{16} = 236 \text{ minutes}`.
-
-In addition to the normal writes, garbage collector will move the still valid data from old
-sectors to new ones.
-As we are using the same ID and a big partition size, no data will be moved by the garbage
-collector in this case.
-For storage devices that could be written 20000 times, the storage will last about
-4.720.000 minutes (~9 years).
-
-To make a more general formula we must first compute the effective used size in ZMS by our
-typical set of data.
-For id/data pair with data <= 8 bytes, effective_size is 16 bytes
-For id/data pair with data > 8 bytes, effective_size is 16 bytes + sizeof(data)
-Let's suppose that total_effective_size is the total size of the set of data that is written in
-the storage and that the partition is well dimensioned (double of the effective size) to avoid
-having the garbage collector moving blocks all the time.
-
-The expected life of the device in minutes is computed as :
-
-.. math::
-
-   \small\frac{(SECTOR\_EFFECTIVE\_SIZE \times SECTOR\_NUMBER \times MAX\_NUM\_WRITES)}{(TOTAL\_EFFECTIVE\_SIZE \times WR\_MIN)}
-
-Where:
-
-``SECTOR_EFFECTIVE_SIZE``: is the size sector - header_size(80 bytes)
-
-``SECTOR_NUMBER``: is the number of sectors
-
-``MAX_NUM_WRITES``: is the life expectancy of the storage device in number of writes
-
-``TOTAL_EFFECTIVE_SIZE``: Total effective size of the set of written data
-
-``WR_MIN``: Number of writes of the set of data per minute
-
-Features
-********
-ZMS has introduced many features compared to existing storage system like NVS and will evolve
-from its initial version to include more features that satisfies new technologies requirements
-such as low latency and bigger storage space.
-
-Existing features
-=================
-Version1
---------
-- Supports non erasable devices (only one write operation to erase a sector)
-- Supports large partition size and sector size (64 bits address space)
-- Supports large IDs width (32 bits) to store ID/Value pairs
-- Small sized data ( <= 8 bytes) are stored in the ATE itself
-- Built-in Data CRC32 (included in the ATE)
-- Versionning of ZMS (to handle future evolution)
-- Supports large write-block-size (Only for platforms that need this)
-
-Future features
-===============
-
-- Add multiple format ATE support to be able to use ZMS with different ATE formats that satisfies
-  requirements from application
-- Add the possibility to skip garbage collector for some application usage where ID/value pairs
-  are written periodically and do not exceed half of the partition size (ther is always an old
-  entry with the same ID).
-- Divide IDs into namespaces and allocate IDs on demand from application to handle collisions
-  between IDs used by different subsystems or samples.
-- Add the possibility to retrieve the wear out value of the device based on the cycle count value
-- Add a recovery function that can recover a storage partition if something went wrong
-- Add a library/application to allow migration from NVS entries to ZMS entries
-- Add the possibility to force formatting the storage partition to the ZMS format if something
-  went wrong when mounting the storage.
-
-ZMS and other storage systems in Zephyr
-=======================================
-This section describes ZMS in the wider context of storage systems in Zephyr (not full filesystems,
-but simpler, non-hierarchical ones).
-Today Zephyr includes at least two other systems that are somewhat comparable in scope and
-functionality: :ref:`NVS <nvs_api>` and :ref:`FCB <fcb_api>`.
-Which one to use in your application will depend on your needs and the hardware you are using,
-and this section provides information to help make a choice.
-
-- If you are using a non erasable technology device like RRAM or MRAM, :ref:`ZMS <zms_api>` is definitely the
-  best fit for your storage subsystem as it is designed very well to avoid emulating erase for
-  these devices and replace it by a single write call.
-- For devices with large write_block_size and/or needs a sector size that is different than the
-  classical flash page size (equal to erase_block_size), :ref:`ZMS <zms_api>` is also the best fit as there is
-  the possibility to customize these parameters and add the support of these devices in ZMS.
-- For classical flash technology devices, :ref:`NVS <nvs_api>` is recommended as it has low footprint (smaller
-  ATEs and smaller header ATEs). Erasing flash in NVS is also very fast and do not require an
-  additional write operation compared to ZMS.
-  For these devices, NVS reads/writes will be faster as well than ZMS as it has smaller ATE size.
-- If your application needs more than 64K IDs for storage, :ref:`ZMS <zms_api>` is recommended here as it
-  has a 32-bit ID field.
-- If your application is working in a FIFO mode (First-in First-out) then :ref:`FCB <fcb_api>` is
-  the best storage solution for this use case.
-
-More generally to make the right choice between NVS and ZMS, all the blockers should be first
-verified to make sure that the application could work with one subsystem or the other, then if
-both solutions could be implemented, the best choice should be based on the calculations of the
-life expectancy of the device described in this section: :ref:`wear-leveling`.
-
-Sample
-******
-
-A sample of how ZMS can be used is supplied in :zephyr:code-sample:`zms`.
-
-API Reference
-*************
-
-The ZMS subsystem APIs are provided by ``zms.h``:
-
-.. doxygengroup:: zms_data_structures
-
-.. doxygengroup:: zms_high_level_api
-
-.. comment
-   not documenting .. doxygengroup:: zms

From f93d0e1fbc943554c8ee87a4dfb96dff4d3103e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:41 +0100
Subject: [PATCH 1629/2913] Revert "[nrf fromtree] samples: fs: zms: add a
 sample app for ZMS storage system"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3af7f058f6d9eb619a1e6bdee0b9823ffec4bd89.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/subsys/fs/zms/CMakeLists.txt |  10 -
 samples/subsys/fs/zms/README.rst     |  96 ----------
 samples/subsys/fs/zms/prj.conf       |   5 -
 samples/subsys/fs/zms/sample.yaml    |  10 -
 samples/subsys/fs/zms/src/main.c     | 267 ---------------------------
 5 files changed, 388 deletions(-)
 delete mode 100644 samples/subsys/fs/zms/CMakeLists.txt
 delete mode 100644 samples/subsys/fs/zms/README.rst
 delete mode 100644 samples/subsys/fs/zms/prj.conf
 delete mode 100644 samples/subsys/fs/zms/sample.yaml
 delete mode 100644 samples/subsys/fs/zms/src/main.c

diff --git a/samples/subsys/fs/zms/CMakeLists.txt b/samples/subsys/fs/zms/CMakeLists.txt
deleted file mode 100644
index 33644e1d903..00000000000
--- a/samples/subsys/fs/zms/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(zms)
-
-
-target_sources(app PRIVATE src/main.c)
-target_include_directories(app PRIVATE ${ZEPHYR_BASE}/subsys/fs/zms)
diff --git a/samples/subsys/fs/zms/README.rst b/samples/subsys/fs/zms/README.rst
deleted file mode 100644
index f05d1fa0838..00000000000
--- a/samples/subsys/fs/zms/README.rst
+++ /dev/null
@@ -1,96 +0,0 @@
-.. zephyr:code-sample:: zms
-   :name: Zephyr Memory Storage (ZMS)
-   :relevant-api: zms_high_level_api
-
-   Store and retrieve data from storage using the ZMS API.
-
-Overview
-********
- The sample shows how to use ZMS to store ID/VALUE pairs and reads them back.
- Deleting an ID/VALUE pair is also shown in this sample.
-
- The sample stores the following items:
-
- #. A string representing an IP address: stored at id=1, data="192.168.1.1"
- #. A binary blob representing a key/value pair: stored at id=0xbeefdead,
-    data={0xDE, 0xAD, 0xBE, 0xEF, 0xDE, 0xAD, 0xBE, 0xEF}
- #. A variable (32bit): stored at id=2, data=cnt
- #. A long set of data (128 bytes)
-
- A loop is executed where we mount the storage system, and then write all set
- of data.
-
- Each DELETE_ITERATION period, we delete all set of data and verify that it has been deleted.
- We generate as well incremented ID/value pairs, we store them until storage is full, then we
- delete them and verify that storage is empty.
-
-Requirements
-************
-
-* A board with flash support or native_sim target
-
-Building and Running
-********************
-
-This sample can be found under :zephyr_file:`samples/subsys/fs/zms` in the Zephyr tree.
-
-The sample can be built for several platforms, but for the moment it has been tested only
-on native_sim target
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/subsys/fs/zms
-   :goals: build
-   :compact:
-
-After running the generated image on a native_sim target, the output on the console shows the
-multiple Iterations of read/write/delete exectuted.
-
-Sample Output
-=============
-
-.. code-block:: console
-
-   *** Booting Zephyr OS build v3.7.0-2383-g624f75400242 ***
-   [00:00:00.000,000] <inf> fs_zms: 3 Sectors of 4096 bytes
-   [00:00:00.000,000] <inf> fs_zms: alloc wra: 0, fc0
-   [00:00:00.000,000] <inf> fs_zms: data wra: 0, 0
-   ITERATION: 0
-   Adding IP_ADDRESS 172.16.254.1 at id 1
-   Adding key/value at id beefdead
-   Adding counter at id 2
-   Adding Longarray at id 3
-   [00:00:00.000,000] <inf> fs_zms: 3 Sectors of 4096 bytes
-   [00:00:00.000,000] <inf> fs_zms: alloc wra: 0, f80
-   [00:00:00.000,000] <inf> fs_zms: data wra: 0, 8c
-   ITERATION: 1
-   ID: 1, IP Address: 172.16.254.1
-   Adding IP_ADDRESS 172.16.254.1 at id 1
-   Id: beefdead, Key: de ad be ef de ad be ef
-   Adding key/value at id beefdead
-   Id: 2, loop_cnt: 0
-   Adding counter at id 2
-   Id: 3, Longarray: 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 5
-   4 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f
-   Adding Longarray at id 3
-   .
-   .
-   .
-   .
-   .
-   .
-   [00:00:00.000,000] <inf> fs_zms: 3 Sectors of 4096 bytes
-   [00:00:00.000,000] <inf> fs_zms: alloc wra: 0, f40
-   [00:00:00.000,000] <inf> fs_zms: data wra: 0, 80
-   ITERATION: 299
-   ID: 1, IP Address: 172.16.254.1
-   Adding IP_ADDRESS 172.16.254.1 at id 1
-   Id: beefdead, Key: de ad be ef de ad be ef
-   Adding key/value at id beefdead
-   Id: 2, loop_cnt: 298
-   Adding counter at id 2
-   Id: 3, Longarray: 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 5
-   4 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f
-   Adding Longarray at id 3
-   Memory is full let's delete all items
-   Free space in storage is 8064 bytes
-   Sample code finished Successfully
diff --git a/samples/subsys/fs/zms/prj.conf b/samples/subsys/fs/zms/prj.conf
deleted file mode 100644
index 343c5021899..00000000000
--- a/samples/subsys/fs/zms/prj.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_FLASH=y
-CONFIG_FLASH_MAP=y
-
-CONFIG_ZMS=y
-CONFIG_LOG=y
diff --git a/samples/subsys/fs/zms/sample.yaml b/samples/subsys/fs/zms/sample.yaml
deleted file mode 100644
index 802dabcf0f1..00000000000
--- a/samples/subsys/fs/zms/sample.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-sample:
-  name: ZMS Sample
-
-tests:
-  sample.zms.basic:
-    tags: zms
-    depends_on: zms
-    platform_allow:
-      - qemu_x86
-      - native_posix
diff --git a/samples/subsys/fs/zms/src/main.c b/samples/subsys/fs/zms/src/main.c
deleted file mode 100644
index a2166392724..00000000000
--- a/samples/subsys/fs/zms/src/main.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright (c) 2024 BayLibre SAS
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * ZMS Sample for Zephyr using high level API.
- *
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/sys/reboot.h>
-#include <zephyr/device.h>
-#include <string.h>
-#include <zephyr/drivers/flash.h>
-#include <zephyr/storage/flash_map.h>
-#include <zephyr/fs/zms.h>
-
-static struct zms_fs fs;
-
-#define ZMS_PARTITION        storage_partition
-#define ZMS_PARTITION_DEVICE FIXED_PARTITION_DEVICE(ZMS_PARTITION)
-#define ZMS_PARTITION_OFFSET FIXED_PARTITION_OFFSET(ZMS_PARTITION)
-
-#define IP_ADDRESS_ID 1
-#define KEY_VALUE_ID  0xbeefdead
-#define CNT_ID        2
-#define LONG_DATA_ID  3
-
-#define MAX_ITERATIONS   300
-#define DELETE_ITERATION 10
-
-static int delete_and_verify_items(struct zms_fs *fs, uint32_t id)
-{
-	int rc = 0;
-
-	rc = zms_delete(fs, id);
-	if (rc) {
-		goto error1;
-	}
-	rc = zms_get_data_length(fs, id);
-	if (rc > 0) {
-		goto error2;
-	}
-
-	return 0;
-error1:
-	printk("Error while deleting item rc=%d\n", rc);
-	return rc;
-error2:
-	printk("Error, Delete failed item should not be present\n");
-	return -1;
-}
-
-static int delete_basic_items(struct zms_fs *fs)
-{
-	int rc = 0;
-
-	rc = delete_and_verify_items(fs, IP_ADDRESS_ID);
-	if (rc) {
-		printk("Error while deleting item %x rc=%d\n", IP_ADDRESS_ID, rc);
-		return rc;
-	}
-	rc = delete_and_verify_items(fs, KEY_VALUE_ID);
-	if (rc) {
-		printk("Error while deleting item %x rc=%d\n", KEY_VALUE_ID, rc);
-		return rc;
-	}
-	rc = delete_and_verify_items(fs, CNT_ID);
-	if (rc) {
-		printk("Error while deleting item %x rc=%d\n", CNT_ID, rc);
-		return rc;
-	}
-	rc = delete_and_verify_items(fs, LONG_DATA_ID);
-	if (rc) {
-		printk("Error while deleting item %x rc=%d\n", LONG_DATA_ID, rc);
-	}
-
-	return rc;
-}
-
-int main(void)
-{
-	int rc = 0;
-	char buf[16];
-	uint8_t key[8] = {0xDE, 0xAD, 0xBE, 0xEF, 0xDE, 0xAD, 0xBE, 0xEF}, longarray[128];
-	uint32_t i_cnt = 0U, i;
-	uint32_t id = 0;
-	ssize_t free_space = 0;
-	struct flash_pages_info info;
-
-	for (int n = 0; n < sizeof(longarray); n++) {
-		longarray[n] = n;
-	}
-
-	/* define the zms file system by settings with:
-	 *	sector_size equal to the pagesize,
-	 *	3 sectors
-	 *	starting at ZMS_PARTITION_OFFSET
-	 */
-	fs.flash_device = ZMS_PARTITION_DEVICE;
-	if (!device_is_ready(fs.flash_device)) {
-		printk("Storage device %s is not ready\n", fs.flash_device->name);
-		return 0;
-	}
-	fs.offset = ZMS_PARTITION_OFFSET;
-	rc = flash_get_page_info_by_offs(fs.flash_device, fs.offset, &info);
-	if (rc) {
-		printk("Unable to get page info, rc=%d\n", rc);
-		return 0;
-	}
-	fs.sector_size = info.size;
-	fs.sector_count = 3U;
-
-	for (i = 0; i < MAX_ITERATIONS; i++) {
-		rc = zms_mount(&fs);
-		if (rc) {
-			printk("Storage Init failed, rc=%d\n", rc);
-			return 0;
-		}
-
-		printk("ITERATION: %u\n", i);
-		/* IP_ADDRESS_ID is used to store an address, lets see if we can
-		 * read it from flash, since we don't know the size read the
-		 * maximum possible
-		 */
-		rc = zms_read(&fs, IP_ADDRESS_ID, &buf, sizeof(buf));
-		if (rc > 0) {
-			/* item was found, show it */
-			buf[rc] = '\0';
-			printk("ID: %u, IP Address: %s\n", IP_ADDRESS_ID, buf);
-		}
-		/* Rewriting ADDRESS IP even if we found it */
-		strncpy(buf, "172.16.254.1", sizeof(buf) - 1);
-		printk("Adding IP_ADDRESS %s at id %u\n", buf, IP_ADDRESS_ID);
-		rc = zms_write(&fs, IP_ADDRESS_ID, &buf, strlen(buf));
-		if (rc < 0) {
-			printk("Error while writing Entry rc=%d\n", rc);
-			break;
-		}
-
-		/* KEY_VALUE_ID is used to store a key/value pair , lets see if we can read
-		 * it from storage.
-		 */
-		rc = zms_read(&fs, KEY_VALUE_ID, &key, sizeof(key));
-		if (rc > 0) { /* item was found, show it */
-			printk("Id: %x, Key: ", KEY_VALUE_ID);
-			for (int n = 0; n < 8; n++) {
-				printk("%x ", key[n]);
-			}
-			printk("\n");
-		}
-		/* Rewriting KEY_VALUE even if we found it */
-		printk("Adding key/value at id %x\n", KEY_VALUE_ID);
-		rc = zms_write(&fs, KEY_VALUE_ID, &key, sizeof(key));
-		if (rc < 0) {
-			printk("Error while writing Entry rc=%d\n", rc);
-			break;
-		}
-
-		/* CNT_ID is used to store the loop counter, lets see
-		 * if we can read it from storage
-		 */
-		rc = zms_read(&fs, CNT_ID, &i_cnt, sizeof(i_cnt));
-		if (rc > 0) { /* item was found, show it */
-			printk("Id: %d, loop_cnt: %u\n", CNT_ID, i_cnt);
-			if (i_cnt != (i - 1)) {
-				break;
-			}
-		}
-		printk("Adding counter at id %u\n", CNT_ID);
-		rc = zms_write(&fs, CNT_ID, &i, sizeof(i));
-		if (rc < 0) {
-			printk("Error while writing Entry rc=%d\n", rc);
-			break;
-		}
-
-		/* LONG_DATA_ID is used to store a larger dataset ,lets see if we can read
-		 * it from flash
-		 */
-		rc = zms_read(&fs, LONG_DATA_ID, &longarray, sizeof(longarray));
-		if (rc > 0) {
-			/* item was found, show it */
-			printk("Id: %d, Longarray: ", LONG_DATA_ID);
-			for (int n = 0; n < sizeof(longarray); n++) {
-				printk("%x ", longarray[n]);
-			}
-			printk("\n");
-		}
-		/* Rewrite the entry even if we found it */
-		printk("Adding Longarray at id %d\n", LONG_DATA_ID);
-		rc = zms_write(&fs, LONG_DATA_ID, &longarray, sizeof(longarray));
-		if (rc < 0) {
-			printk("Error while writing Entry rc=%d\n", rc);
-			break;
-		}
-
-		/* Each DELETE_ITERATION delete all basic items */
-		if (!(i % DELETE_ITERATION) && (i)) {
-			rc = delete_basic_items(&fs);
-			if (rc) {
-				break;
-			}
-		}
-	}
-
-	if (i != MAX_ITERATIONS) {
-		printk("Error: Something went wrong at iteration %u rc=%d\n", i - 1, rc);
-		return 0;
-	}
-
-	while (1) {
-		/* fill all storage */
-		rc = zms_write(&fs, id, &id, sizeof(uint32_t));
-		if (rc < 0) {
-			break;
-		}
-		id++;
-	}
-
-	if (rc == -ENOSPC) {
-		/* Calculate free space and verify that it is 0 */
-		free_space = zms_calc_free_space(&fs);
-		if (free_space < 0) {
-			printk("Error while computing free space, rc=%d\n", free_space);
-			return 0;
-		}
-		if (free_space > 0) {
-			printk("Error: free_space should be 0, computed %u\n", free_space);
-			return 0;
-		}
-		printk("Memory is full let's delete all items\n");
-
-		/* Now delete all previously written items */
-		for (uint32_t n = 0; n < id; n++) {
-			rc = delete_and_verify_items(&fs, n);
-			if (rc) {
-				printk("Error deleting at id %u\n", n);
-				return 0;
-			}
-		}
-		rc = delete_basic_items(&fs);
-		if (rc) {
-			printk("Error deleting basic items\n");
-			return 0;
-		}
-	}
-
-	/*
-	 * Let's compute free space in storage. But before doing that let's Garbage collect
-	 * all sectors where we deleted all entries and then compute the free space
-	 */
-	for (uint32_t i = 0; i < fs.sector_count; i++) {
-		rc = zms_sector_use_next(&fs);
-		if (rc) {
-			printk("Error while changing sector rc=%d\n", rc);
-		}
-	}
-	free_space = zms_calc_free_space(&fs);
-	if (free_space < 0) {
-		printk("Error while computing free space, rc=%d\n", free_space);
-		return 0;
-	}
-	printk("Free space in storage is %u bytes\n", free_space);
-	printk("Sample code finished Successfully\n");
-
-	return 0;
-}

From 75f6b03652ae3f6fa64fa28bd5445577c2ee9d71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:41 +0100
Subject: [PATCH 1630/2913] Revert "[nrf fromtree] tests: fs: zms: add
 testsuite for ZMS storage"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 98b2be49e8604e83ff81b04bdf9e55c3bbbfd3f5.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/subsys/fs/zms/CMakeLists.txt            |   9 -
 tests/subsys/fs/zms/boards/native_sim.overlay |   9 -
 .../fs/zms/boards/qemu_x86_ev_0x00.overlay    |   9 -
 tests/subsys/fs/zms/prj.conf                  |   9 -
 tests/subsys/fs/zms/src/main.c                | 888 ------------------
 tests/subsys/fs/zms/testcase.yaml             |  28 -
 6 files changed, 952 deletions(-)
 delete mode 100644 tests/subsys/fs/zms/CMakeLists.txt
 delete mode 100644 tests/subsys/fs/zms/boards/native_sim.overlay
 delete mode 100644 tests/subsys/fs/zms/boards/qemu_x86_ev_0x00.overlay
 delete mode 100644 tests/subsys/fs/zms/prj.conf
 delete mode 100644 tests/subsys/fs/zms/src/main.c
 delete mode 100644 tests/subsys/fs/zms/testcase.yaml

diff --git a/tests/subsys/fs/zms/CMakeLists.txt b/tests/subsys/fs/zms/CMakeLists.txt
deleted file mode 100644
index 66d9c91a520..00000000000
--- a/tests/subsys/fs/zms/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(fs_zms)
-
-FILE(GLOB app_sources src/*.c)
-target_sources(app PRIVATE ${app_sources})
-target_include_directories(app PRIVATE ${ZEPHYR_BASE}/subsys/fs/zms)
diff --git a/tests/subsys/fs/zms/boards/native_sim.overlay b/tests/subsys/fs/zms/boards/native_sim.overlay
deleted file mode 100644
index 0f330fd7b17..00000000000
--- a/tests/subsys/fs/zms/boards/native_sim.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&flash0 {
-	erase-block-size = <0x400>;
-};
diff --git a/tests/subsys/fs/zms/boards/qemu_x86_ev_0x00.overlay b/tests/subsys/fs/zms/boards/qemu_x86_ev_0x00.overlay
deleted file mode 100644
index ffc3bc97aac..00000000000
--- a/tests/subsys/fs/zms/boards/qemu_x86_ev_0x00.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&sim_flash {
-	erase-value = < 0x00 >;
-};
diff --git a/tests/subsys/fs/zms/prj.conf b/tests/subsys/fs/zms/prj.conf
deleted file mode 100644
index 5d84f6e17fd..00000000000
--- a/tests/subsys/fs/zms/prj.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG_ZTEST=y
-CONFIG_ZTEST_STACK_SIZE=4096
-
-CONFIG_FLASH=y
-CONFIG_FLASH_MAP=y
-
-CONFIG_ZMS=y
-CONFIG_LOG=y
-CONFIG_ZMS_LOG_LEVEL_DBG=y
diff --git a/tests/subsys/fs/zms/src/main.c b/tests/subsys/fs/zms/src/main.c
deleted file mode 100644
index 80866687dba..00000000000
--- a/tests/subsys/fs/zms/src/main.c
+++ /dev/null
@@ -1,888 +0,0 @@
-/*
- * Copyright (c) 2024 BayLibre SAS
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * This test is designed to be run using flash-simulator which provide
- * functionality for flash property customization and emulating errors in
- * flash operation in parallel to regular flash API.
- * Test should be run on qemu_x86 or native_sim target.
- */
-
-#if !defined(CONFIG_BOARD_QEMU_X86) && !defined(CONFIG_ARCH_POSIX)
-#error "Run only on qemu_x86 or a posix architecture based target (for ex. native_sim)"
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <zephyr/ztest.h>
-
-#include <zephyr/drivers/flash.h>
-#include <zephyr/fs/zms.h>
-#include <zephyr/stats/stats.h>
-#include <zephyr/storage/flash_map.h>
-#include <zephyr/sys/crc.h>
-#include "zms_priv.h"
-
-#define TEST_ZMS_AREA        storage_partition
-#define TEST_ZMS_AREA_OFFSET FIXED_PARTITION_OFFSET(TEST_ZMS_AREA)
-#define TEST_ZMS_AREA_ID     FIXED_PARTITION_ID(TEST_ZMS_AREA)
-#define TEST_ZMS_AREA_DEV    DEVICE_DT_GET(DT_MTD_FROM_FIXED_PARTITION(DT_NODELABEL(TEST_ZMS_AREA)))
-#define TEST_DATA_ID         1
-#define TEST_SECTOR_COUNT    5U
-
-static const struct device *const flash_dev = TEST_ZMS_AREA_DEV;
-
-struct zms_fixture {
-	struct zms_fs fs;
-	struct stats_hdr *sim_stats;
-	struct stats_hdr *sim_thresholds;
-};
-
-static void *setup(void)
-{
-	int err;
-	const struct flash_area *fa;
-	struct flash_pages_info info;
-	static struct zms_fixture fixture;
-
-	__ASSERT_NO_MSG(device_is_ready(flash_dev));
-
-	err = flash_area_open(TEST_ZMS_AREA_ID, &fa);
-	zassert_true(err == 0, "flash_area_open() fail: %d", err);
-
-	fixture.fs.offset = TEST_ZMS_AREA_OFFSET;
-	err = flash_get_page_info_by_offs(flash_area_get_device(fa), fixture.fs.offset, &info);
-	zassert_true(err == 0, "Unable to get page info: %d", err);
-
-	fixture.fs.sector_size = info.size;
-	fixture.fs.sector_count = TEST_SECTOR_COUNT;
-	fixture.fs.flash_device = flash_area_get_device(fa);
-
-	return &fixture;
-}
-
-static void before(void *data)
-{
-	struct zms_fixture *fixture = (struct zms_fixture *)data;
-
-	fixture->sim_stats = stats_group_find("flash_sim_stats");
-	fixture->sim_thresholds = stats_group_find("flash_sim_thresholds");
-}
-
-static void after(void *data)
-{
-	struct zms_fixture *fixture = (struct zms_fixture *)data;
-
-	if (fixture->sim_stats) {
-		stats_reset(fixture->sim_stats);
-	}
-	if (fixture->sim_thresholds) {
-		stats_reset(fixture->sim_thresholds);
-	}
-
-	/* Clear ZMS */
-	if (fixture->fs.ready) {
-		int err;
-
-		err = zms_clear(&fixture->fs);
-		zassert_true(err == 0, "zms_clear call failure: %d", err);
-	}
-
-	fixture->fs.sector_count = TEST_SECTOR_COUNT;
-}
-
-ZTEST_SUITE(zms, NULL, setup, before, after, NULL);
-
-ZTEST_F(zms, test_zms_mount)
-{
-	int err;
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-}
-
-static void execute_long_pattern_write(uint32_t id, struct zms_fs *fs)
-{
-	char rd_buf[512];
-	char wr_buf[512];
-	char pattern[] = {0xDE, 0xAD, 0xBE, 0xEF};
-	size_t len;
-
-	len = zms_read(fs, id, rd_buf, sizeof(rd_buf));
-	zassert_true(len == -ENOENT, "zms_read unexpected failure: %d", len);
-
-	BUILD_ASSERT((sizeof(wr_buf) % sizeof(pattern)) == 0);
-	for (int i = 0; i < sizeof(wr_buf); i += sizeof(pattern)) {
-		memcpy(wr_buf + i, pattern, sizeof(pattern));
-	}
-
-	len = zms_write(fs, id, wr_buf, sizeof(wr_buf));
-	zassert_true(len == sizeof(wr_buf), "zms_write failed: %d", len);
-
-	len = zms_read(fs, id, rd_buf, sizeof(rd_buf));
-	zassert_true(len == sizeof(rd_buf), "zms_read unexpected failure: %d", len);
-	zassert_mem_equal(wr_buf, rd_buf, sizeof(rd_buf), "RD buff should be equal to the WR buff");
-}
-
-ZTEST_F(zms, test_zms_write)
-{
-	int err;
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	execute_long_pattern_write(TEST_DATA_ID, &fixture->fs);
-}
-
-static int flash_sim_write_calls_find(struct stats_hdr *hdr, void *arg, const char *name,
-				      uint16_t off)
-{
-	if (!strcmp(name, "flash_write_calls")) {
-		uint32_t **flash_write_stat = (uint32_t **)arg;
-		*flash_write_stat = (uint32_t *)((uint8_t *)hdr + off);
-	}
-
-	return 0;
-}
-
-static int flash_sim_max_write_calls_find(struct stats_hdr *hdr, void *arg, const char *name,
-					  uint16_t off)
-{
-	if (!strcmp(name, "max_write_calls")) {
-		uint32_t **max_write_calls = (uint32_t **)arg;
-		*max_write_calls = (uint32_t *)((uint8_t *)hdr + off);
-	}
-
-	return 0;
-}
-
-ZTEST_F(zms, test_zms_corrupted_write)
-{
-	int err;
-	size_t len;
-	char rd_buf[512];
-	char wr_buf_1[512];
-	char wr_buf_2[512];
-	char pattern_1[] = {0xDE, 0xAD, 0xBE, 0xEF};
-	char pattern_2[] = {0x03, 0xAA, 0x85, 0x6F};
-	uint32_t *flash_write_stat;
-	uint32_t *flash_max_write_calls;
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	err = zms_read(&fixture->fs, TEST_DATA_ID, rd_buf, sizeof(rd_buf));
-	zassert_true(err == -ENOENT, "zms_read unexpected failure: %d", err);
-
-	BUILD_ASSERT((sizeof(wr_buf_1) % sizeof(pattern_1)) == 0);
-	for (int i = 0; i < sizeof(wr_buf_1); i += sizeof(pattern_1)) {
-		memcpy(wr_buf_1 + i, pattern_1, sizeof(pattern_1));
-	}
-
-	len = zms_write(&fixture->fs, TEST_DATA_ID, wr_buf_1, sizeof(wr_buf_1));
-	zassert_true(len == sizeof(wr_buf_1), "zms_write failed: %d", len);
-
-	len = zms_read(&fixture->fs, TEST_DATA_ID, rd_buf, sizeof(rd_buf));
-	zassert_true(len == sizeof(rd_buf), "zms_read unexpected failure: %d", len);
-	zassert_mem_equal(wr_buf_1, rd_buf, sizeof(rd_buf),
-			  "RD buff should be equal to the first WR buff");
-
-	BUILD_ASSERT((sizeof(wr_buf_2) % sizeof(pattern_2)) == 0);
-	for (int i = 0; i < sizeof(wr_buf_2); i += sizeof(pattern_2)) {
-		memcpy(wr_buf_2 + i, pattern_2, sizeof(pattern_2));
-	}
-
-	/* Set the maximum number of writes that the flash simulator can
-	 * execute.
-	 */
-	stats_walk(fixture->sim_thresholds, flash_sim_max_write_calls_find, &flash_max_write_calls);
-	stats_walk(fixture->sim_stats, flash_sim_write_calls_find, &flash_write_stat);
-
-	*flash_max_write_calls = *flash_write_stat - 1;
-	*flash_write_stat = 0;
-
-	/* Flash simulator will lose part of the data at the end of this write.
-	 * This should simulate power down during flash write. The written data
-	 * are corrupted at this point and should be discarded by the ZMS.
-	 */
-	len = zms_write(&fixture->fs, TEST_DATA_ID, wr_buf_2, sizeof(wr_buf_2));
-	zassert_true(len == sizeof(wr_buf_2), "zms_write failed: %d", len);
-
-	/* Reinitialize the ZMS. */
-	memset(&fixture->fs, 0, sizeof(fixture->fs));
-	(void)setup();
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	len = zms_read(&fixture->fs, TEST_DATA_ID, rd_buf, sizeof(rd_buf));
-	zassert_true(len == sizeof(rd_buf), "zms_read unexpected failure: %d", len);
-	zassert_true(memcmp(wr_buf_2, rd_buf, sizeof(rd_buf)) != 0,
-		     "RD buff should not be equal to the second WR buff because of "
-		     "corrupted write operation");
-	zassert_mem_equal(wr_buf_1, rd_buf, sizeof(rd_buf),
-			  "RD buff should be equal to the first WR buff because subsequent "
-			  "write operation has failed");
-}
-
-ZTEST_F(zms, test_zms_gc)
-{
-	int err;
-	int len;
-	uint8_t buf[32];
-	uint8_t rd_buf[32];
-
-	const uint16_t max_id = 10;
-	/* 21st write will trigger GC. */
-	const uint16_t max_writes = 21;
-
-	fixture->fs.sector_count = 2;
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	for (uint32_t i = 0; i < max_writes; i++) {
-		uint8_t id = (i % max_id);
-		uint8_t id_data = id + max_id * (i / max_id);
-
-		memset(buf, id_data, sizeof(buf));
-
-		len = zms_write(&fixture->fs, id, buf, sizeof(buf));
-		zassert_true(len == sizeof(buf), "zms_write failed: %d", len);
-	}
-
-	for (uint32_t id = 0; id < max_id; id++) {
-		len = zms_read(&fixture->fs, id, rd_buf, sizeof(buf));
-		zassert_true(len == sizeof(rd_buf), "zms_read unexpected failure: %d", len);
-
-		for (uint16_t i = 0; i < sizeof(rd_buf); i++) {
-			rd_buf[i] = rd_buf[i] % max_id;
-			buf[i] = id;
-		}
-		zassert_mem_equal(buf, rd_buf, sizeof(rd_buf),
-				  "RD buff should be equal to the WR buff");
-	}
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	for (uint32_t id = 0; id < max_id; id++) {
-		len = zms_read(&fixture->fs, id, rd_buf, sizeof(buf));
-		zassert_true(len == sizeof(rd_buf), "zms_read unexpected failure: %d", len);
-
-		for (uint16_t i = 0; i < sizeof(rd_buf); i++) {
-			rd_buf[i] = rd_buf[i] % max_id;
-			buf[i] = id;
-		}
-		zassert_mem_equal(buf, rd_buf, sizeof(rd_buf),
-				  "RD buff should be equal to the WR buff");
-	}
-}
-
-static void write_content(uint32_t max_id, uint32_t begin, uint32_t end, struct zms_fs *fs)
-{
-	uint8_t buf[32];
-	ssize_t len;
-
-	for (uint32_t i = begin; i < end; i++) {
-		uint8_t id = (i % max_id);
-		uint8_t id_data = id + max_id * (i / max_id);
-
-		memset(buf, id_data, sizeof(buf));
-
-		len = zms_write(fs, id, buf, sizeof(buf));
-		zassert_true(len == sizeof(buf), "zms_write failed: %d", len);
-	}
-}
-
-static void check_content(uint32_t max_id, struct zms_fs *fs)
-{
-	uint8_t rd_buf[32];
-	uint8_t buf[32];
-	ssize_t len;
-
-	for (uint32_t id = 0; id < max_id; id++) {
-		len = zms_read(fs, id, rd_buf, sizeof(buf));
-		zassert_true(len == sizeof(rd_buf), "zms_read unexpected failure: %d", len);
-
-		for (uint16_t i = 0; i < ARRAY_SIZE(rd_buf); i++) {
-			rd_buf[i] = rd_buf[i] % max_id;
-			buf[i] = id;
-		}
-		zassert_mem_equal(buf, rd_buf, sizeof(rd_buf),
-				  "RD buff should be equal to the WR buff");
-	}
-}
-
-/**
- * Full round of GC over 3 sectors
- */
-ZTEST_F(zms, test_zms_gc_3sectors)
-{
-	int err;
-
-	const uint16_t max_id = 10;
-	/* 41st write will trigger 1st GC. */
-	const uint16_t max_writes = 41;
-	/* 61st write will trigger 2nd GC. */
-	const uint16_t max_writes_2 = 41 + 20;
-	/* 81st write will trigger 3rd GC. */
-	const uint16_t max_writes_3 = 41 + 20 + 20;
-	/* 101st write will trigger 4th GC. */
-	const uint16_t max_writes_4 = 41 + 20 + 20 + 20;
-
-	fixture->fs.sector_count = 3;
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 0, "unexpected write sector");
-
-	/* Trigger 1st GC */
-	write_content(max_id, 0, max_writes, &fixture->fs);
-
-	/* sector sequence: empty,closed, write */
-	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 2, "unexpected write sector");
-	check_content(max_id, &fixture->fs);
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 2, "unexpected write sector");
-	check_content(max_id, &fixture->fs);
-
-	/* Trigger 2nd GC */
-	write_content(max_id, max_writes, max_writes_2, &fixture->fs);
-
-	/* sector sequence: write, empty, closed */
-	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 0, "unexpected write sector");
-	check_content(max_id, &fixture->fs);
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 0, "unexpected write sector");
-	check_content(max_id, &fixture->fs);
-
-	/* Trigger 3rd GC */
-	write_content(max_id, max_writes_2, max_writes_3, &fixture->fs);
-
-	/* sector sequence: closed, write, empty */
-	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 1, "unexpected write sector");
-	check_content(max_id, &fixture->fs);
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 1, "unexpected write sector");
-	check_content(max_id, &fixture->fs);
-
-	/* Trigger 4th GC */
-	write_content(max_id, max_writes_3, max_writes_4, &fixture->fs);
-
-	/* sector sequence: empty,closed, write */
-	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 2, "unexpected write sector");
-	check_content(max_id, &fixture->fs);
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 2, "unexpected write sector");
-	check_content(max_id, &fixture->fs);
-}
-
-static int flash_sim_max_len_find(struct stats_hdr *hdr, void *arg, const char *name, uint16_t off)
-{
-	if (!strcmp(name, "max_len")) {
-		uint32_t **max_len = (uint32_t **)arg;
-		*max_len = (uint32_t *)((uint8_t *)hdr + off);
-	}
-
-	return 0;
-}
-
-ZTEST_F(zms, test_zms_corrupted_sector_close_operation)
-{
-	int err;
-	int len;
-	uint8_t buf[32];
-	uint32_t *flash_write_stat;
-	uint32_t *flash_max_write_calls;
-	uint32_t *flash_max_len;
-
-	const uint16_t max_id = 10;
-	/* 21st write will trigger GC. */
-	const uint16_t max_writes = 21;
-
-	/* Get the address of simulator parameters. */
-	stats_walk(fixture->sim_thresholds, flash_sim_max_write_calls_find, &flash_max_write_calls);
-	stats_walk(fixture->sim_thresholds, flash_sim_max_len_find, &flash_max_len);
-	stats_walk(fixture->sim_stats, flash_sim_write_calls_find, &flash_write_stat);
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	for (uint32_t i = 0; i < max_writes; i++) {
-		uint8_t id = (i % max_id);
-		uint8_t id_data = id + max_id * (i / max_id);
-
-		memset(buf, id_data, sizeof(buf));
-
-		if (i == max_writes - 1) {
-			/* Reset stats. */
-			*flash_write_stat = 0;
-
-			/* Block write calls and simulate power down during
-			 * sector closing operation, so only a part of a ZMS
-			 * closing ate will be written.
-			 */
-			*flash_max_write_calls = 1;
-			*flash_max_len = 4;
-		}
-		len = zms_write(&fixture->fs, id, buf, sizeof(buf));
-		zassert_true(len == sizeof(buf), "zms_write failed: %d", len);
-	}
-
-	/* Make the flash simulator functional again. */
-	*flash_max_write_calls = 0;
-	*flash_max_len = 0;
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	check_content(max_id, &fixture->fs);
-
-	/* Ensure that the ZMS is able to store new content. */
-	execute_long_pattern_write(max_id, &fixture->fs);
-}
-
-/**
- * @brief Test case when storage become full, so only deletion is possible.
- */
-ZTEST_F(zms, test_zms_full_sector)
-{
-	int err;
-	ssize_t len;
-	uint32_t filling_id = 0;
-	uint32_t i, data_read;
-
-	fixture->fs.sector_count = 3;
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	while (1) {
-		len = zms_write(&fixture->fs, filling_id, &filling_id, sizeof(filling_id));
-		if (len == -ENOSPC) {
-			break;
-		}
-		zassert_true(len == sizeof(filling_id), "zms_write failed: %d", len);
-		filling_id++;
-	}
-
-	/* check whether can delete whatever from full storage */
-	err = zms_delete(&fixture->fs, 1);
-	zassert_true(err == 0, "zms_delete call failure: %d", err);
-
-	/* the last sector is full now, test re-initialization */
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	len = zms_write(&fixture->fs, filling_id, &filling_id, sizeof(filling_id));
-	zassert_true(len == sizeof(filling_id), "zms_write failed: %d", len);
-
-	/* sanitycheck on ZMS content */
-	for (i = 0; i <= filling_id; i++) {
-		len = zms_read(&fixture->fs, i, &data_read, sizeof(data_read));
-		if (i == 1) {
-			zassert_true(len == -ENOENT, "zms_read shouldn't found the entry: %d", len);
-		} else {
-			zassert_true(len == sizeof(data_read),
-				     "zms_read #%d failed: len is %zd instead of %zu", i, len,
-				     sizeof(data_read));
-			zassert_equal(data_read, i, "read unexpected data: %d instead of %d",
-				      data_read, i);
-		}
-	}
-}
-
-ZTEST_F(zms, test_delete)
-{
-	int err;
-	ssize_t len;
-	uint32_t filling_id, data_read;
-	uint32_t ate_wra, data_wra;
-
-	fixture->fs.sector_count = 3;
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	for (filling_id = 0; filling_id < 10; filling_id++) {
-		len = zms_write(&fixture->fs, filling_id, &filling_id, sizeof(filling_id));
-
-		zassert_true(len == sizeof(filling_id), "zms_write failed: %d", len);
-
-		if (filling_id != 0) {
-			continue;
-		}
-
-		/* delete the first entry while it is the most recent one */
-		err = zms_delete(&fixture->fs, filling_id);
-		zassert_true(err == 0, "zms_delete call failure: %d", err);
-
-		len = zms_read(&fixture->fs, filling_id, &data_read, sizeof(data_read));
-		zassert_true(len == -ENOENT, "zms_read shouldn't found the entry: %d", len);
-	}
-
-	/* delete existing entry */
-	err = zms_delete(&fixture->fs, 1);
-	zassert_true(err == 0, "zms_delete call failure: %d", err);
-
-	len = zms_read(&fixture->fs, 1, &data_read, sizeof(data_read));
-	zassert_true(len == -ENOENT, "zms_read shouldn't found the entry: %d", len);
-
-	ate_wra = fixture->fs.ate_wra;
-	data_wra = fixture->fs.data_wra;
-
-	/* delete already deleted entry */
-	err = zms_delete(&fixture->fs, 1);
-	zassert_true(err == 0, "zms_delete call failure: %d", err);
-	zassert_true(ate_wra == fixture->fs.ate_wra && data_wra == fixture->fs.data_wra,
-		     "delete already deleted entry should not make"
-		     " any footprint in the storage");
-
-	/* delete nonexisting entry */
-	err = zms_delete(&fixture->fs, filling_id);
-	zassert_true(err == 0, "zms_delete call failure: %d", err);
-	zassert_true(ate_wra == fixture->fs.ate_wra && data_wra == fixture->fs.data_wra,
-		     "delete nonexistent entry should not make"
-		     " any footprint in the storage");
-}
-
-/*
- * Test that garbage-collection can recover all ate's even when the last ate,
- * ie close_ate, is corrupt. In this test the close_ate is set to point to the
- * last ate at -5. A valid ate is however present at -6. Since the close_ate
- * has an invalid crc8, the offset should not be used and a recover of the
- * last ate should be done instead.
- */
-ZTEST_F(zms, test_zms_gc_corrupt_close_ate)
-{
-	struct zms_ate ate, close_ate, empty_ate;
-	uint32_t data;
-	ssize_t len;
-	int err;
-
-	Z_TEST_SKIP_IFNDEF(CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES);
-	close_ate.id = 0xffffffff;
-	close_ate.offset = fixture->fs.sector_size - sizeof(struct zms_ate) * 5;
-	close_ate.len = 0;
-	close_ate.metadata = 0xffffffff;
-	close_ate.cycle_cnt = 1;
-	close_ate.crc8 = 0xff; /* Incorrect crc8 */
-
-	empty_ate.id = 0xffffffff;
-	empty_ate.offset = 0;
-	empty_ate.len = 0xffff;
-	empty_ate.metadata = 0x4201;
-	empty_ate.cycle_cnt = 1;
-	empty_ate.crc8 =
-		crc8_ccitt(0xff, (uint8_t *)&empty_ate + SIZEOF_FIELD(struct zms_ate, crc8),
-			   sizeof(struct zms_ate) - SIZEOF_FIELD(struct zms_ate, crc8));
-
-	memset(&ate, 0, sizeof(struct zms_ate));
-	ate.id = 0x1;
-	ate.len = sizeof(data);
-	ate.cycle_cnt = 1;
-	data = 0xaa55aa55;
-	memcpy(&ate.data, &data, sizeof(data));
-	ate.crc8 = crc8_ccitt(0xff, (uint8_t *)&ate + SIZEOF_FIELD(struct zms_ate, crc8),
-			      sizeof(struct zms_ate) - SIZEOF_FIELD(struct zms_ate, crc8));
-
-	/* Add empty ATE */
-	err = flash_write(fixture->fs.flash_device,
-			  fixture->fs.offset + fixture->fs.sector_size - sizeof(struct zms_ate),
-			  &empty_ate, sizeof(empty_ate));
-	zassert_true(err == 0, "flash_write failed: %d", err);
-
-	/* Mark sector 0 as closed */
-	err = flash_write(fixture->fs.flash_device,
-			  fixture->fs.offset + fixture->fs.sector_size - 2 * sizeof(struct zms_ate),
-			  &close_ate, sizeof(close_ate));
-	zassert_true(err == 0, "flash_write failed: %d", err);
-
-	/* Write valid ate at -6 */
-	err = flash_write(fixture->fs.flash_device,
-			  fixture->fs.offset + fixture->fs.sector_size - 6 * sizeof(struct zms_ate),
-			  &ate, sizeof(ate));
-	zassert_true(err == 0, "flash_write failed: %d", err);
-
-	/* Mark sector 1 as closed */
-	err = flash_write(fixture->fs.flash_device,
-			  fixture->fs.offset + (2 * fixture->fs.sector_size) -
-				  2 * sizeof(struct zms_ate),
-			  &close_ate, sizeof(close_ate));
-	zassert_true(err == 0, "flash_write failed: %d", err);
-
-	fixture->fs.sector_count = 3;
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	data = 0;
-	len = zms_read(&fixture->fs, 1, &data, sizeof(data));
-	zassert_true(len == sizeof(data), "zms_read should have read %d bytes", sizeof(data));
-	zassert_true(data == 0xaa55aa55, "unexpected value %d", data);
-}
-
-/*
- * Test that garbage-collection correctly handles corrupt ate's.
- */
-ZTEST_F(zms, test_zms_gc_corrupt_ate)
-{
-	struct zms_ate corrupt_ate, close_ate;
-	int err;
-
-	close_ate.id = 0xffffffff;
-	close_ate.offset = fixture->fs.sector_size / 2;
-	close_ate.len = 0;
-	close_ate.crc8 =
-		crc8_ccitt(0xff, (uint8_t *)&close_ate + SIZEOF_FIELD(struct zms_ate, crc8),
-			   sizeof(struct zms_ate) - SIZEOF_FIELD(struct zms_ate, crc8));
-
-	corrupt_ate.id = 0xdeadbeef;
-	corrupt_ate.offset = 0;
-	corrupt_ate.len = 20;
-	corrupt_ate.crc8 = 0xff; /* Incorrect crc8 */
-
-	/* Mark sector 0 as closed */
-	err = flash_write(fixture->fs.flash_device,
-			  fixture->fs.offset + fixture->fs.sector_size - 2 * sizeof(struct zms_ate),
-			  &close_ate, sizeof(close_ate));
-	zassert_true(err == 0, "flash_write failed: %d", err);
-
-	/* Write a corrupt ate */
-	err = flash_write(fixture->fs.flash_device,
-			  fixture->fs.offset + (fixture->fs.sector_size / 2), &corrupt_ate,
-			  sizeof(corrupt_ate));
-	zassert_true(err == 0, "flash_write failed: %d", err);
-
-	/* Mark sector 1 as closed */
-	err = flash_write(fixture->fs.flash_device,
-			  fixture->fs.offset + (2 * fixture->fs.sector_size) -
-				  2 * sizeof(struct zms_ate),
-			  &close_ate, sizeof(close_ate));
-	zassert_true(err == 0, "flash_write failed: %d", err);
-
-	fixture->fs.sector_count = 3;
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-}
-
-#ifdef CONFIG_ZMS_LOOKUP_CACHE
-static size_t num_matching_cache_entries(uint64_t addr, bool compare_sector_only, struct zms_fs *fs)
-{
-	size_t i, num = 0;
-	uint64_t mask = compare_sector_only ? ADDR_SECT_MASK : UINT64_MAX;
-
-	for (i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
-		if ((fs->lookup_cache[i] & mask) == addr) {
-			num++;
-		}
-	}
-
-	return num;
-}
-
-static size_t num_occupied_cache_entries(struct zms_fs *fs)
-{
-	return CONFIG_ZMS_LOOKUP_CACHE_SIZE -
-	       num_matching_cache_entries(ZMS_LOOKUP_CACHE_NO_ADDR, false, fs);
-}
-#endif
-
-/*
- * Test that ZMS lookup cache is properly rebuilt on zms_mount(), or initialized
- * to ZMS_LOOKUP_CACHE_NO_ADDR if the store is empty.
- */
-ZTEST_F(zms, test_zms_cache_init)
-{
-#ifdef CONFIG_ZMS_LOOKUP_CACHE
-	int err;
-	size_t num;
-	uint64_t ate_addr;
-	uint8_t data = 0;
-
-	/* Test cache initialization when the store is empty */
-
-	fixture->fs.sector_count = 3;
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	num = num_occupied_cache_entries(&fixture->fs);
-	zassert_equal(num, 0, "uninitialized cache");
-
-	/* Test cache update after zms_write() */
-
-	ate_addr = fixture->fs.ate_wra;
-	err = zms_write(&fixture->fs, 1, &data, sizeof(data));
-	zassert_equal(err, sizeof(data), "zms_write call failure: %d", err);
-
-	num = num_occupied_cache_entries(&fixture->fs);
-	zassert_equal(num, 1, "cache not updated after write");
-
-	num = num_matching_cache_entries(ate_addr, false, &fixture->fs);
-	zassert_equal(num, 1, "invalid cache entry after write");
-
-	/* Test cache initialization when the store is non-empty */
-
-	memset(fixture->fs.lookup_cache, 0xAA, sizeof(fixture->fs.lookup_cache));
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	num = num_occupied_cache_entries(&fixture->fs);
-	zassert_equal(num, 1, "uninitialized cache after restart");
-
-	num = num_matching_cache_entries(ate_addr, false, &fixture->fs);
-	zassert_equal(num, 1, "invalid cache entry after restart");
-#endif
-}
-
-/*
- * Test that even after writing more ZMS IDs than the number of ZMS lookup cache
- * entries they all can be read correctly.
- */
-ZTEST_F(zms, test_zms_cache_collission)
-{
-#ifdef CONFIG_ZMS_LOOKUP_CACHE
-	int err;
-	uint32_t id;
-	uint16_t data;
-
-	fixture->fs.sector_count = 4;
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	for (id = 0; id < CONFIG_ZMS_LOOKUP_CACHE_SIZE + 1; id++) {
-		data = id;
-		err = zms_write(&fixture->fs, id, &data, sizeof(data));
-		zassert_equal(err, sizeof(data), "zms_write call failure: %d", err);
-	}
-
-	for (id = 0; id < CONFIG_ZMS_LOOKUP_CACHE_SIZE + 1; id++) {
-		err = zms_read(&fixture->fs, id, &data, sizeof(data));
-		zassert_equal(err, sizeof(data), "zms_read call failure: %d", err);
-		zassert_equal(data, id, "incorrect data read");
-	}
-#endif
-}
-
-/*
- * Test that ZMS lookup cache does not contain any address from gc-ed sector
- */
-ZTEST_F(zms, test_zms_cache_gc)
-{
-#ifdef CONFIG_ZMS_LOOKUP_CACHE
-	int err;
-	size_t num;
-	uint16_t data = 0;
-
-	fixture->fs.sector_count = 3;
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	/* Fill the first sector with writes of ID 1 */
-
-	while (fixture->fs.data_wra + sizeof(data) + sizeof(struct zms_ate) <=
-	       fixture->fs.ate_wra) {
-		++data;
-		err = zms_write(&fixture->fs, 1, &data, sizeof(data));
-		zassert_equal(err, sizeof(data), "zms_write call failure: %d", err);
-	}
-
-	/* Verify that cache contains a single entry for sector 0 */
-
-	num = num_matching_cache_entries(0ULL << ADDR_SECT_SHIFT, true, &fixture->fs);
-	zassert_equal(num, 1, "invalid cache content after filling sector 0");
-
-	/* Fill the second sector with writes of ID 2 */
-
-	while ((fixture->fs.ate_wra >> ADDR_SECT_SHIFT) != 2) {
-		++data;
-		err = zms_write(&fixture->fs, 2, &data, sizeof(data));
-		zassert_equal(err, sizeof(data), "zms_write call failure: %d", err);
-	}
-
-	/*
-	 * At this point sector 0 should have been gc-ed. Verify that action is
-	 * reflected by the cache content.
-	 */
-
-	num = num_matching_cache_entries(0ULL << ADDR_SECT_SHIFT, true, &fixture->fs);
-	zassert_equal(num, 0, "not invalidated cache entries aftetr gc");
-
-	num = num_matching_cache_entries(2ULL << ADDR_SECT_SHIFT, true, &fixture->fs);
-	zassert_equal(num, 2, "invalid cache content after gc");
-#endif
-}
-
-/*
- * Test ZMS lookup cache hash quality.
- */
-ZTEST_F(zms, test_zms_cache_hash_quality)
-{
-#ifdef CONFIG_ZMS_LOOKUP_CACHE
-	const size_t MIN_CACHE_OCCUPANCY = CONFIG_ZMS_LOOKUP_CACHE_SIZE * 6 / 10;
-	int err;
-	size_t num;
-	uint32_t id;
-	uint16_t data;
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	/* Write ZMS IDs from 0 to CONFIG_ZMS_LOOKUP_CACHE_SIZE - 1 */
-
-	for (uint16_t i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
-		id = i;
-		data = 0;
-
-		err = zms_write(&fixture->fs, id, &data, sizeof(data));
-		zassert_equal(err, sizeof(data), "zms_write call failure: %d", err);
-	}
-
-	/* Verify that at least 60% cache entries are occupied */
-
-	num = num_occupied_cache_entries(&fixture->fs);
-	TC_PRINT("Cache occupancy: %u\n", (unsigned int)num);
-	zassert_between_inclusive(num, MIN_CACHE_OCCUPANCY, CONFIG_ZMS_LOOKUP_CACHE_SIZE,
-				  "too low cache occupancy - poor hash quality");
-
-	err = zms_clear(&fixture->fs);
-	zassert_true(err == 0, "zms_clear call failure: %d", err);
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	/* Write CONFIG_ZMS_LOOKUP_CACHE_SIZE ZMS IDs that form the following series: 0, 4, 8... */
-
-	for (uint16_t i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
-		id = i * 4;
-		data = 0;
-
-		err = zms_write(&fixture->fs, id, &data, sizeof(data));
-		zassert_equal(err, sizeof(data), "zms_write call failure: %d", err);
-	}
-
-	/* Verify that at least 60% cache entries are occupied */
-
-	num = num_occupied_cache_entries(&fixture->fs);
-	TC_PRINT("Cache occupancy: %u\n", (unsigned int)num);
-	zassert_between_inclusive(num, MIN_CACHE_OCCUPANCY, CONFIG_ZMS_LOOKUP_CACHE_SIZE,
-				  "too low cache occupancy - poor hash quality");
-
-#endif
-}
diff --git a/tests/subsys/fs/zms/testcase.yaml b/tests/subsys/fs/zms/testcase.yaml
deleted file mode 100644
index bdee4529f2a..00000000000
--- a/tests/subsys/fs/zms/testcase.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-common:
-  tags: zms
-tests:
-  filesystem.zms:
-    platform_allow:
-      - qemu_x86
-  filesystem.zms.0x00:
-    extra_args: DTC_OVERLAY_FILE=boards/qemu_x86_ev_0x00.overlay
-    platform_allow: qemu_x86
-  filesystem.zms.sim.no_erase:
-    extra_args: CONFIG_FLASH_SIMULATOR_EXPLICIT_ERASE=n
-    platform_allow: qemu_x86
-  filesystem.zms.sim.corrupt_close:
-    extra_args:
-      - CONFIG_FLASH_SIMULATOR_EXPLICIT_ERASE=y
-      - CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y
-    platform_allow: qemu_x86
-  filesystem.zms.cache:
-    extra_args:
-      - CONFIG_ZMS_LOOKUP_CACHE=y
-      - CONFIG_ZMS_LOOKUP_CACHE_SIZE=64
-    platform_allow: native_sim
-  filesystem.zms.data_crc:
-    extra_args:
-      - CONFIG_ZMS_DATA_CRC=y
-    platform_allow:
-      - native_sim
-      - qemu_x86

From 9adc63214673be7c21d845ccb04058727dbc695e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:41 +0100
Subject: [PATCH 1631/2913] Revert "[nrf fromtree] fs: introduce ZMS a new
 Memory storage system"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1a10e62204e0c71bffc64b0faee456f2b4d8a413.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/fs/zms.h      |  215 -----
 subsys/fs/CMakeLists.txt     |    1 -
 subsys/fs/Kconfig            |    1 -
 subsys/fs/zms/CMakeLists.txt |    3 -
 subsys/fs/zms/Kconfig        |   57 --
 subsys/fs/zms/zms.c          | 1752 ----------------------------------
 subsys/fs/zms/zms_priv.h     |   76 --
 7 files changed, 2105 deletions(-)
 delete mode 100644 include/zephyr/fs/zms.h
 delete mode 100644 subsys/fs/zms/CMakeLists.txt
 delete mode 100644 subsys/fs/zms/Kconfig
 delete mode 100644 subsys/fs/zms/zms.c
 delete mode 100644 subsys/fs/zms/zms_priv.h

diff --git a/include/zephyr/fs/zms.h b/include/zephyr/fs/zms.h
deleted file mode 100644
index 1155319d792..00000000000
--- a/include/zephyr/fs/zms.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/*  ZMS: Zephyr Memory Storage
- *
- * Copyright (c) 2024 BayLibre SAS
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#ifndef ZEPHYR_INCLUDE_FS_ZMS_H_
-#define ZEPHYR_INCLUDE_FS_ZMS_H_
-
-#include <zephyr/drivers/flash.h>
-#include <sys/types.h>
-#include <zephyr/kernel.h>
-#include <zephyr/device.h>
-#include <zephyr/toolchain.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @brief Zephyr Memory Storage (ZMS)
- * @defgroup zms Zephyr Memory Storage (ZMS)
- * @ingroup file_system_storage
- * @{
- * @}
- */
-
-/**
- * @brief Zephyr Memory Storage Data Structures
- * @defgroup zms_data_structures Zephyr Memory Storage Data Structures
- * @ingroup zms
- * @{
- */
-
-/**
- * @brief Zephyr Memory Storage File system structure
- */
-struct zms_fs {
-	/** File system offset in flash **/
-	off_t offset;
-	/** Allocation table entry write address.
-	 * Addresses are stored as uint64_t:
-	 * - high 4 bytes correspond to the sector
-	 * - low 4 bytes are the offset in the sector
-	 */
-	uint64_t ate_wra;
-	/** Data write address */
-	uint64_t data_wra;
-	/** Storage system is split into sectors, each sector size must be multiple of erase-blocks
-	 *  if the device has erase capabilities
-	 */
-	uint32_t sector_size;
-	/** Number of sectors in the file system */
-	uint32_t sector_count;
-	/** Current cycle counter of the active sector (pointed by ate_wra)*/
-	uint8_t sector_cycle;
-	/** Flag indicating if the file system is initialized */
-	bool ready;
-	/** Mutex */
-	struct k_mutex zms_lock;
-	/** Flash device runtime structure */
-	const struct device *flash_device;
-	/** Flash memory parameters structure */
-	const struct flash_parameters *flash_parameters;
-	/** Size of an Allocation Table Entry */
-	size_t ate_size;
-#if CONFIG_ZMS_LOOKUP_CACHE
-	/** Lookup table used to cache ATE address of a written ID */
-	uint64_t lookup_cache[CONFIG_ZMS_LOOKUP_CACHE_SIZE];
-#endif
-};
-
-/**
- * @}
- */
-
-/**
- * @brief Zephyr Memory Storage APIs
- * @defgroup zms_high_level_api Zephyr Memory Storage APIs
- * @ingroup zms
- * @{
- */
-
-/**
- * @brief Mount a ZMS file system onto the device specified in @p fs.
- *
- * @param fs Pointer to file system
- * @retval 0 Success
- * @retval -ERRNO errno code if error
- */
-int zms_mount(struct zms_fs *fs);
-
-/**
- * @brief Clear the ZMS file system from device.
- *
- * @param fs Pointer to file system
- * @retval 0 Success
- * @retval -ERRNO errno code if error
- */
-int zms_clear(struct zms_fs *fs);
-
-/**
- * @brief Write an entry to the file system.
- *
- * @note  When @p len parameter is equal to @p 0 then entry is effectively removed (it is
- * equivalent to calling of zms_delete). It is not possible to distinguish between a deleted
- * entry and an entry with data of length 0.
- *
- * @param fs Pointer to file system
- * @param id Id of the entry to be written
- * @param data Pointer to the data to be written
- * @param len Number of bytes to be written (maximum 64 KB)
- *
- * @return Number of bytes written. On success, it will be equal to the number of bytes requested
- * to be written. When a rewrite of the same data already stored is attempted, nothing is written
- * to flash, thus 0 is returned. On error, returns negative value of errno.h defined error codes.
- */
-ssize_t zms_write(struct zms_fs *fs, uint32_t id, const void *data, size_t len);
-
-/**
- * @brief Delete an entry from the file system
- *
- * @param fs Pointer to file system
- * @param id Id of the entry to be deleted
- * @retval 0 Success
- * @retval -ERRNO errno code if error
- */
-int zms_delete(struct zms_fs *fs, uint32_t id);
-
-/**
- * @brief Read an entry from the file system.
- *
- * @param fs Pointer to file system
- * @param id Id of the entry to be read
- * @param data Pointer to data buffer
- * @param len Number of bytes to be read (or size of the allocated read buffer)
- *
- * @return Number of bytes read. On success, it will be equal to the number of bytes requested
- * to be read. When the return value is less than the number of bytes requested to read this
- * indicates that ATE contain less data than requested. On error, returns negative value of
- * errno.h defined error codes.
- */
-ssize_t zms_read(struct zms_fs *fs, uint32_t id, void *data, size_t len);
-
-/**
- * @brief Read a history entry from the file system.
- *
- * @param fs Pointer to file system
- * @param id Id of the entry to be read
- * @param data Pointer to data buffer
- * @param len Number of bytes to be read
- * @param cnt History counter: 0: latest entry, 1: one before latest ...
- *
- * @return Number of bytes read. On success, it will be equal to the number of bytes requested
- * to be read. When the return value is larger than the number of bytes requested to read this
- * indicates not all bytes were read, and more data is available. On error, returns negative
- * value of errno.h defined error codes.
- */
-ssize_t zms_read_hist(struct zms_fs *fs, uint32_t id, void *data, size_t len, uint32_t cnt);
-
-/**
- * @brief Gets the data size that is stored in an entry with a given id
- *
- * @param fs Pointer to file system
- * @param id Id of the entry that we want to get its data length
- *
- * @return Data length contained in the ATE. On success, it will be equal to the number of bytes
- * in the ATE. On error, returns negative value of errno.h defined error codes.
- */
-ssize_t zms_get_data_length(struct zms_fs *fs, uint32_t id);
-/**
- * @brief Calculate the available free space in the file system.
- *
- * @param fs Pointer to file system
- *
- * @return Number of bytes free. On success, it will be equal to the number of bytes that can
- * still be written to the file system.
- * Calculating the free space is a time consuming operation, especially on spi flash.
- * On error, returns negative value of errno.h defined error codes.
- */
-ssize_t zms_calc_free_space(struct zms_fs *fs);
-
-/**
- * @brief Tell how many contiguous free space remains in the currently active ZMS sector.
- *
- * @param fs Pointer to the file system.
- *
- * @return Number of free bytes.
- */
-size_t zms_sector_max_data_size(struct zms_fs *fs);
-
-/**
- * @brief Close the currently active sector and switch to the next one.
- *
- * @note The garbage collector is called on the new sector.
- *
- * @warning This routine is made available for specific use cases.
- * It collides with the ZMS goal of avoiding any unnecessary flash erase operations.
- * Using this routine extensively can result in premature failure of the flash device.
- *
- * @param fs Pointer to the file system.
- *
- * @return 0 on success. On error, returns negative value of errno.h defined error codes.
- */
-int zms_sector_use_next(struct zms_fs *fs);
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZEPHYR_INCLUDE_FS_ZMS_H_ */
diff --git a/subsys/fs/CMakeLists.txt b/subsys/fs/CMakeLists.txt
index 825b8356381..fb774711543 100644
--- a/subsys/fs/CMakeLists.txt
+++ b/subsys/fs/CMakeLists.txt
@@ -25,7 +25,6 @@ endif()
 
 add_subdirectory_ifdef(CONFIG_FCB  ./fcb)
 add_subdirectory_ifdef(CONFIG_NVS  ./nvs)
-add_subdirectory_ifdef(CONFIG_ZMS  ./zms)
 
 if(CONFIG_FUSE_FS_ACCESS)
   zephyr_library_named(FS_FUSE)
diff --git a/subsys/fs/Kconfig b/subsys/fs/Kconfig
index 7029f84f5fd..0a20aea7ee8 100644
--- a/subsys/fs/Kconfig
+++ b/subsys/fs/Kconfig
@@ -99,6 +99,5 @@ endif # FILE_SYSTEM
 
 rsource "fcb/Kconfig"
 rsource "nvs/Kconfig"
-rsource "zms/Kconfig"
 
 endmenu
diff --git a/subsys/fs/zms/CMakeLists.txt b/subsys/fs/zms/CMakeLists.txt
deleted file mode 100644
index b6db8a3f57f..00000000000
--- a/subsys/fs/zms/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-#SPDX-License-Identifier: Apache-2.0
-
-zephyr_sources(zms.c)
diff --git a/subsys/fs/zms/Kconfig b/subsys/fs/zms/Kconfig
deleted file mode 100644
index 330ef11155c..00000000000
--- a/subsys/fs/zms/Kconfig
+++ /dev/null
@@ -1,57 +0,0 @@
-#Zephyr Memory Storage ZMS
-
-#Copyright (c) 2024 BayLibre SAS
-
-#SPDX-License-Identifier: Apache-2.0
-
-config ZMS
-	bool "Zephyr Memory Storage"
-	select CRC
-	help
-	  Enable support of Zephyr Memory Storage.
-
-if ZMS
-
-config ZMS_LOOKUP_CACHE
-	bool "ZMS lookup cache"
-	help
-	  Enable ZMS cache to reduce the ZMS data lookup time.
-	  Each cache entry holds an address of the most recent allocation
-	  table entry (ATE) for all ZMS IDs that fall into that cache position.
-
-config ZMS_LOOKUP_CACHE_SIZE
-	int "ZMS Storage lookup cache size"
-	default 128
-	range 1 65536
-	depends on ZMS_LOOKUP_CACHE
-	help
-	  Number of entries in ZMS lookup cache.
-	  It is recommended that it should be a power of 2.
-	  Every additional entry in cache will add 8 bytes in RAM
-
-config ZMS_DATA_CRC
-	bool "ZMS DATA CRC"
-	help
-	  Enables DATA CRC
-
-config ZMS_CUSTOM_BLOCK_SIZE
-	bool "Custom buffer size used by ZMS for reads and writes"
-	help
-	  ZMS uses internal buffers to read/write and compare stored data.
-	  Increasing the size of these buffers should be done carefully in order to not
-	  overflow the stack.
-	  Increasing this buffer means as well that ZMS could work with storage devices
-	  that have larger write-block-size which decreases ZMS performance
-
-config ZMS_MAX_BLOCK_SIZE
-	int "ZMS internal buffer size"
-	default 32
-	depends on ZMS_CUSTOM_BLOCK_SIZE
-	help
-	  Changes the internal buffer size of ZMS
-
-module = ZMS
-module-str = zms
-source "subsys/logging/Kconfig.template.log_config"
-
-endif # ZMS
diff --git a/subsys/fs/zms/zms.c b/subsys/fs/zms/zms.c
deleted file mode 100644
index 21930313109..00000000000
--- a/subsys/fs/zms/zms.c
+++ /dev/null
@@ -1,1752 +0,0 @@
-/*  ZMS: Zephyr Memory Storage
- *
- * Copyright (c) 2024 BayLibre SAS
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <string.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <zephyr/fs/zms.h>
-#include <zephyr/sys/crc.h>
-#include "zms_priv.h"
-
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(fs_zms, CONFIG_ZMS_LOG_LEVEL);
-
-static int zms_prev_ate(struct zms_fs *fs, uint64_t *addr, struct zms_ate *ate);
-static int zms_ate_valid(struct zms_fs *fs, const struct zms_ate *entry);
-static int zms_get_sector_cycle(struct zms_fs *fs, uint64_t addr, uint8_t *cycle_cnt);
-static int zms_get_sector_header(struct zms_fs *fs, uint64_t addr, struct zms_ate *empty_ate,
-				 struct zms_ate *close_ate);
-static int zms_ate_valid_different_sector(struct zms_fs *fs, const struct zms_ate *entry,
-					  uint8_t cycle_cnt);
-
-#ifdef CONFIG_ZMS_LOOKUP_CACHE
-
-static inline size_t zms_lookup_cache_pos(uint32_t id)
-{
-	uint32_t hash;
-
-	/* 32-bit integer hash function found by https://github.com/skeeto/hash-prospector. */
-	hash = id;
-	hash ^= hash >> 16;
-	hash *= 0x7feb352dU;
-	hash ^= hash >> 15;
-	hash *= 0x846ca68bU;
-	hash ^= hash >> 16;
-
-	return hash % CONFIG_ZMS_LOOKUP_CACHE_SIZE;
-}
-
-static int zms_lookup_cache_rebuild(struct zms_fs *fs)
-{
-	int rc, previous_sector_num = ZMS_INVALID_SECTOR_NUM;
-	uint64_t addr, ate_addr;
-	uint64_t *cache_entry;
-	uint8_t current_cycle;
-	struct zms_ate ate;
-
-	memset(fs->lookup_cache, 0xff, sizeof(fs->lookup_cache));
-	addr = fs->ate_wra;
-
-	while (true) {
-		/* Make a copy of 'addr' as it will be advanced by zms_prev_ate() */
-		ate_addr = addr;
-		rc = zms_prev_ate(fs, &addr, &ate);
-
-		if (rc) {
-			return rc;
-		}
-
-		cache_entry = &fs->lookup_cache[zms_lookup_cache_pos(ate.id)];
-
-		if (ate.id != ZMS_HEAD_ID && *cache_entry == ZMS_LOOKUP_CACHE_NO_ADDR) {
-			/* read the ate cycle only when we change the sector
-			 * or if it is the first read
-			 */
-			if (SECTOR_NUM(ate_addr) != previous_sector_num) {
-				rc = zms_get_sector_cycle(fs, ate_addr, &current_cycle);
-				if (rc == -ENOENT) {
-					/* sector never used */
-					current_cycle = 0;
-				} else if (rc) {
-					/* bad flash read */
-					return rc;
-				}
-			}
-			if (zms_ate_valid_different_sector(fs, &ate, current_cycle)) {
-				*cache_entry = ate_addr;
-			}
-			previous_sector_num = SECTOR_NUM(ate_addr);
-		}
-
-		if (addr == fs->ate_wra) {
-			break;
-		}
-	}
-
-	return 0;
-}
-
-static void zms_lookup_cache_invalidate(struct zms_fs *fs, uint32_t sector)
-{
-	uint64_t *cache_entry = fs->lookup_cache;
-	uint64_t *const cache_end = &fs->lookup_cache[CONFIG_ZMS_LOOKUP_CACHE_SIZE];
-
-	for (; cache_entry < cache_end; ++cache_entry) {
-		if (SECTOR_NUM(*cache_entry) == sector) {
-			*cache_entry = ZMS_LOOKUP_CACHE_NO_ADDR;
-		}
-	}
-}
-
-#endif /* CONFIG_ZMS_LOOKUP_CACHE */
-
-/* Helper to compute offset given the address */
-static inline off_t zms_addr_to_offset(struct zms_fs *fs, uint64_t addr)
-{
-	return fs->offset + (fs->sector_size * SECTOR_NUM(addr)) + SECTOR_OFFSET(addr);
-}
-
-/* zms_al_size returns size aligned to fs->write_block_size */
-static inline size_t zms_al_size(struct zms_fs *fs, size_t len)
-{
-	size_t write_block_size = fs->flash_parameters->write_block_size;
-
-	if (write_block_size <= 1U) {
-		return len;
-	}
-	return (len + (write_block_size - 1U)) & ~(write_block_size - 1U);
-}
-
-/* Helper to get empty ATE address */
-static inline uint64_t zms_empty_ate_addr(struct zms_fs *fs, uint64_t addr)
-{
-	return (addr & ADDR_SECT_MASK) + fs->sector_size - fs->ate_size;
-}
-
-/* Helper to get close ATE address */
-static inline uint64_t zms_close_ate_addr(struct zms_fs *fs, uint64_t addr)
-{
-	return (addr & ADDR_SECT_MASK) + fs->sector_size - 2 * fs->ate_size;
-}
-
-/* Aligned memory write */
-static int zms_flash_al_wrt(struct zms_fs *fs, uint64_t addr, const void *data, size_t len)
-{
-	const uint8_t *data8 = (const uint8_t *)data;
-	int rc = 0;
-	off_t offset;
-	size_t blen;
-	uint8_t buf[ZMS_BLOCK_SIZE];
-
-	if (!len) {
-		/* Nothing to write, avoid changing the flash protection */
-		return 0;
-	}
-
-	offset = zms_addr_to_offset(fs, addr);
-
-	blen = len & ~(fs->flash_parameters->write_block_size - 1U);
-	if (blen > 0) {
-		rc = flash_write(fs->flash_device, offset, data8, blen);
-		if (rc) {
-			/* flash write error */
-			goto end;
-		}
-		len -= blen;
-		offset += blen;
-		data8 += blen;
-	}
-	if (len) {
-		memcpy(buf, data8, len);
-		(void)memset(buf + len, fs->flash_parameters->erase_value,
-			     fs->flash_parameters->write_block_size - len);
-
-		rc = flash_write(fs->flash_device, offset, buf,
-				 fs->flash_parameters->write_block_size);
-	}
-
-end:
-	return rc;
-}
-
-/* basic flash read from zms address */
-static int zms_flash_rd(struct zms_fs *fs, uint64_t addr, void *data, size_t len)
-{
-	off_t offset;
-
-	offset = zms_addr_to_offset(fs, addr);
-
-	return flash_read(fs->flash_device, offset, data, len);
-}
-
-/* allocation entry write */
-static int zms_flash_ate_wrt(struct zms_fs *fs, const struct zms_ate *entry)
-{
-	int rc;
-
-	rc = zms_flash_al_wrt(fs, fs->ate_wra, entry, sizeof(struct zms_ate));
-	if (rc) {
-		goto end;
-	}
-#ifdef CONFIG_ZMS_LOOKUP_CACHE
-	/* 0xFFFFFFFF is a special-purpose identifier. Exclude it from the cache */
-	if (entry->id != ZMS_HEAD_ID) {
-		fs->lookup_cache[zms_lookup_cache_pos(entry->id)] = fs->ate_wra;
-	}
-#endif
-	fs->ate_wra -= zms_al_size(fs, sizeof(struct zms_ate));
-end:
-	return rc;
-}
-
-/* data write */
-static int zms_flash_data_wrt(struct zms_fs *fs, const void *data, size_t len)
-{
-	int rc;
-
-	rc = zms_flash_al_wrt(fs, fs->data_wra, data, len);
-	if (rc < 0) {
-		return rc;
-	}
-	fs->data_wra += zms_al_size(fs, len);
-
-	return 0;
-}
-
-/* flash ate read */
-static int zms_flash_ate_rd(struct zms_fs *fs, uint64_t addr, struct zms_ate *entry)
-{
-	return zms_flash_rd(fs, addr, entry, sizeof(struct zms_ate));
-}
-
-/* zms_flash_block_cmp compares the data in flash at addr to data
- * in blocks of size ZMS_BLOCK_SIZE aligned to fs->write_block_size
- * returns 0 if equal, 1 if not equal, errcode if error
- */
-static int zms_flash_block_cmp(struct zms_fs *fs, uint64_t addr, const void *data, size_t len)
-{
-	const uint8_t *data8 = (const uint8_t *)data;
-	int rc;
-	size_t bytes_to_cmp, block_size;
-	uint8_t buf[ZMS_BLOCK_SIZE];
-
-	block_size = ZMS_BLOCK_SIZE & ~(fs->flash_parameters->write_block_size - 1U);
-
-	while (len) {
-		bytes_to_cmp = MIN(block_size, len);
-		rc = zms_flash_rd(fs, addr, buf, bytes_to_cmp);
-		if (rc) {
-			return rc;
-		}
-		rc = memcmp(data8, buf, bytes_to_cmp);
-		if (rc) {
-			return 1;
-		}
-		len -= bytes_to_cmp;
-		addr += bytes_to_cmp;
-		data8 += bytes_to_cmp;
-	}
-	return 0;
-}
-
-/* zms_flash_cmp_const compares the data in flash at addr to a constant
- * value. returns 0 if all data in flash is equal to value, 1 if not equal,
- * errcode if error
- */
-static int zms_flash_cmp_const(struct zms_fs *fs, uint64_t addr, uint8_t value, size_t len)
-{
-	int rc;
-	size_t bytes_to_cmp, block_size;
-	uint8_t cmp[ZMS_BLOCK_SIZE];
-
-	block_size = ZMS_BLOCK_SIZE & ~(fs->flash_parameters->write_block_size - 1U);
-
-	(void)memset(cmp, value, block_size);
-	while (len) {
-		bytes_to_cmp = MIN(block_size, len);
-		rc = zms_flash_block_cmp(fs, addr, cmp, bytes_to_cmp);
-		if (rc) {
-			return rc;
-		}
-		len -= bytes_to_cmp;
-		addr += bytes_to_cmp;
-	}
-	return 0;
-}
-
-/* flash block move: move a block at addr to the current data write location
- * and updates the data write location.
- */
-static int zms_flash_block_move(struct zms_fs *fs, uint64_t addr, size_t len)
-{
-	int rc;
-	size_t bytes_to_copy, block_size;
-	uint8_t buf[ZMS_BLOCK_SIZE];
-
-	block_size = ZMS_BLOCK_SIZE & ~(fs->flash_parameters->write_block_size - 1U);
-
-	while (len) {
-		bytes_to_copy = MIN(block_size, len);
-		rc = zms_flash_rd(fs, addr, buf, bytes_to_copy);
-		if (rc) {
-			return rc;
-		}
-		rc = zms_flash_data_wrt(fs, buf, bytes_to_copy);
-		if (rc) {
-			return rc;
-		}
-		len -= bytes_to_copy;
-		addr += bytes_to_copy;
-	}
-	return 0;
-}
-
-/* erase a sector and verify erase was OK.
- * return 0 if OK, errorcode on error.
- */
-static int zms_flash_erase_sector(struct zms_fs *fs, uint64_t addr)
-{
-	int rc;
-	off_t offset;
-	bool ebw_required =
-		flash_params_get_erase_cap(fs->flash_parameters) & FLASH_ERASE_C_EXPLICIT;
-
-	if (!ebw_required) {
-		/* Do nothing for devices that do not have erase capability */
-		return 0;
-	}
-
-	addr &= ADDR_SECT_MASK;
-	offset = zms_addr_to_offset(fs, addr);
-
-	LOG_DBG("Erasing flash at offset 0x%lx ( 0x%llx ), len %u", (long)offset, addr,
-		fs->sector_size);
-
-#ifdef CONFIG_ZMS_LOOKUP_CACHE
-	zms_lookup_cache_invalidate(fs, SECTOR_NUM(addr));
-#endif
-	rc = flash_erase(fs->flash_device, offset, fs->sector_size);
-
-	if (rc) {
-		return rc;
-	}
-
-	if (zms_flash_cmp_const(fs, addr, fs->flash_parameters->erase_value, fs->sector_size)) {
-		LOG_ERR("Failure while erasing the sector at offset 0x%lx", (long)offset);
-		rc = -ENXIO;
-	}
-
-	return rc;
-}
-
-/* crc update on allocation entry */
-static void zms_ate_crc8_update(struct zms_ate *entry)
-{
-	uint8_t crc8;
-
-	/* crc8 field is the first element of the structure, do not include it */
-	crc8 = crc8_ccitt(0xff, (uint8_t *)entry + SIZEOF_FIELD(struct zms_ate, crc8),
-			  sizeof(struct zms_ate) - SIZEOF_FIELD(struct zms_ate, crc8));
-	entry->crc8 = crc8;
-}
-
-/* crc check on allocation entry
- * returns 0 if OK, 1 on crc fail
- */
-static int zms_ate_crc8_check(const struct zms_ate *entry)
-{
-	uint8_t crc8;
-
-	/* crc8 field is the first element of the structure, do not include it */
-	crc8 = crc8_ccitt(0xff, (uint8_t *)entry + SIZEOF_FIELD(struct zms_ate, crc8),
-			  sizeof(struct zms_ate) - SIZEOF_FIELD(struct zms_ate, crc8));
-	if (crc8 == entry->crc8) {
-		return 0;
-	}
-
-	return 1;
-}
-
-/* zms_ate_valid validates an ate:
- *     return 1 if crc8 and cycle_cnt valid,
- *            0 otherwise
- */
-static int zms_ate_valid(struct zms_fs *fs, const struct zms_ate *entry)
-{
-	if ((fs->sector_cycle != entry->cycle_cnt) || zms_ate_crc8_check(entry)) {
-		return 0;
-	}
-
-	return 1;
-}
-
-/* zms_ate_valid_different_sector validates an ate that is in a different
- * sector than the active one. It takes as argument the cycle_cnt of the
- * sector where the ATE to be validated is stored
- *     return 1 if crc8 and cycle_cnt are valid,
- *            0 otherwise
- */
-static int zms_ate_valid_different_sector(struct zms_fs *fs, const struct zms_ate *entry,
-					  uint8_t cycle_cnt)
-{
-	if ((cycle_cnt != entry->cycle_cnt) || zms_ate_crc8_check(entry)) {
-		return 0;
-	}
-
-	return 1;
-}
-
-static inline int zms_get_cycle_on_sector_change(struct zms_fs *fs, uint64_t addr,
-						 int previous_sector_num, uint8_t *cycle_cnt)
-{
-	int rc;
-
-	/* read the ate cycle only when we change the sector
-	 * or if it is the first read
-	 */
-	if (SECTOR_NUM(addr) != previous_sector_num) {
-		rc = zms_get_sector_cycle(fs, addr, cycle_cnt);
-		if (rc == -ENOENT) {
-			/* sector never used */
-			*cycle_cnt = 0;
-		} else if (rc) {
-			/* bad flash read */
-			return rc;
-		}
-	}
-
-	return 0;
-}
-
-/* zms_close_ate_valid validates an sector close ate: a valid sector close ate:
- * - valid ate
- * - len = 0 and id = ZMS_HEAD_ID
- * - offset points to location at ate multiple from sector size
- * return true if valid, false otherwise
- */
-static bool zms_close_ate_valid(struct zms_fs *fs, const struct zms_ate *entry)
-{
-	return (zms_ate_valid_different_sector(fs, entry, entry->cycle_cnt) && (!entry->len) &&
-		(entry->id == ZMS_HEAD_ID) && !((fs->sector_size - entry->offset) % fs->ate_size));
-}
-
-/* zms_empty_ate_valid validates an sector empty ate: a valid sector empty ate:
- * - valid ate
- * - len = 0xffff and id = 0xffffffff
- * return true if valid, false otherwise
- */
-static bool zms_empty_ate_valid(struct zms_fs *fs, const struct zms_ate *entry)
-{
-	return (zms_ate_valid_different_sector(fs, entry, entry->cycle_cnt) &&
-		(entry->len == 0xffff) && (entry->id == ZMS_HEAD_ID));
-}
-
-/* zms_gc_done_ate_valid validates a garbage collector done ATE
- * Valid gc_done_ate:
- * - valid ate
- * - len = 0
- * - id = 0xffffffff
- * return true if valid, false otherwise
- */
-static bool zms_gc_done_ate_valid(struct zms_fs *fs, const struct zms_ate *entry)
-{
-	return (zms_ate_valid_different_sector(fs, entry, entry->cycle_cnt) && (!entry->len) &&
-		(entry->id == ZMS_HEAD_ID));
-}
-
-/* Read empty and close ATE of the sector where belongs address "addr" and
- * validates that the sector is closed.
- * retval: 0 if sector is not close
- * retval: 1 is sector is closed
- * retval: < 0 if read of the header failed.
- */
-static int zms_validate_closed_sector(struct zms_fs *fs, uint64_t addr, struct zms_ate *empty_ate,
-				      struct zms_ate *close_ate)
-{
-	int rc;
-
-	/* read the header ATEs */
-	rc = zms_get_sector_header(fs, addr, empty_ate, close_ate);
-	if (rc) {
-		return rc;
-	}
-
-	if (zms_empty_ate_valid(fs, empty_ate) && zms_close_ate_valid(fs, close_ate) &&
-	    (empty_ate->cycle_cnt == close_ate->cycle_cnt)) {
-		/* Closed sector validated */
-		return 1;
-	}
-
-	return 0;
-}
-
-/* store an entry in flash */
-static int zms_flash_write_entry(struct zms_fs *fs, uint32_t id, const void *data, size_t len)
-{
-	int rc;
-	struct zms_ate entry;
-
-	/* Initialize all members to 0 */
-	memset(&entry, 0, sizeof(struct zms_ate));
-
-	entry.id = id;
-	entry.len = (uint16_t)len;
-	entry.cycle_cnt = fs->sector_cycle;
-
-	if (len > ZMS_DATA_IN_ATE_SIZE) {
-		/* only compute CRC if len is greater than 8 bytes */
-		if (IS_ENABLED(CONFIG_ZMS_DATA_CRC)) {
-			entry.data_crc = crc32_ieee(data, len);
-		}
-		entry.offset = (uint32_t)SECTOR_OFFSET(fs->data_wra);
-	} else if ((len > 0) && (len <= ZMS_DATA_IN_ATE_SIZE)) {
-		/* Copy data into entry for small data ( < 8B) */
-		memcpy(&entry.data, data, len);
-	}
-
-	zms_ate_crc8_update(&entry);
-
-	if (len > ZMS_DATA_IN_ATE_SIZE) {
-		rc = zms_flash_data_wrt(fs, data, len);
-		if (rc) {
-			return rc;
-		}
-	}
-
-	rc = zms_flash_ate_wrt(fs, &entry);
-	if (rc) {
-		return rc;
-	}
-
-	return 0;
-}
-
-/* end of flash routines */
-
-/* Search for the last valid ATE written in a sector and also update data write address
- */
-static int zms_recover_last_ate(struct zms_fs *fs, uint64_t *addr, uint64_t *data_wra)
-{
-	uint64_t data_end_addr, ate_end_addr;
-	struct zms_ate end_ate;
-	int rc;
-
-	LOG_DBG("Recovering last ate from sector %llu", SECTOR_NUM(*addr));
-
-	/* skip close and empty ATE */
-	*addr -= 2 * fs->ate_size;
-
-	ate_end_addr = *addr;
-	data_end_addr = *addr & ADDR_SECT_MASK;
-	/* Initialize the data_wra to the first address of the sector */
-	*data_wra = data_end_addr;
-
-	while (ate_end_addr > data_end_addr) {
-		rc = zms_flash_ate_rd(fs, ate_end_addr, &end_ate);
-		if (rc) {
-			return rc;
-		}
-		if (zms_ate_valid(fs, &end_ate)) {
-			/* found a valid ate, update data_end_addr and *addr */
-			data_end_addr &= ADDR_SECT_MASK;
-			if (end_ate.len > ZMS_DATA_IN_ATE_SIZE) {
-				data_end_addr += end_ate.offset + zms_al_size(fs, end_ate.len);
-				*data_wra = data_end_addr;
-			}
-			*addr = ate_end_addr;
-		}
-		ate_end_addr -= fs->ate_size;
-	}
-
-	return 0;
-}
-
-/* compute previous addr of ATE */
-static int zms_compute_prev_addr(struct zms_fs *fs, uint64_t *addr)
-{
-	int sec_closed;
-	struct zms_ate empty_ate, close_ate;
-
-	*addr += fs->ate_size;
-	if ((SECTOR_OFFSET(*addr)) != (fs->sector_size - 2 * fs->ate_size)) {
-		return 0;
-	}
-
-	/* last ate in sector, do jump to previous sector */
-	if (SECTOR_NUM(*addr) == 0U) {
-		*addr += ((uint64_t)(fs->sector_count - 1) << ADDR_SECT_SHIFT);
-	} else {
-		*addr -= (1ULL << ADDR_SECT_SHIFT);
-	}
-
-	/* verify if the sector is closed */
-	sec_closed = zms_validate_closed_sector(fs, *addr, &empty_ate, &close_ate);
-	if (sec_closed < 0) {
-		return sec_closed;
-	}
-
-	/* Non Closed Sector */
-	if (!sec_closed) {
-		/* at the end of filesystem */
-		*addr = fs->ate_wra;
-		return 0;
-	}
-
-	/* Update the address here because the header ATEs are valid.*/
-	(*addr) &= ADDR_SECT_MASK;
-	(*addr) += close_ate.offset;
-
-	return 0;
-}
-
-/* walking through allocation entry list, from newest to oldest entries
- * read ate from addr, modify addr to the previous ate
- */
-static int zms_prev_ate(struct zms_fs *fs, uint64_t *addr, struct zms_ate *ate)
-{
-	int rc;
-
-	rc = zms_flash_ate_rd(fs, *addr, ate);
-	if (rc) {
-		return rc;
-	}
-
-	return zms_compute_prev_addr(fs, addr);
-}
-
-static void zms_sector_advance(struct zms_fs *fs, uint64_t *addr)
-{
-	*addr += (1ULL << ADDR_SECT_SHIFT);
-	if ((*addr >> ADDR_SECT_SHIFT) == fs->sector_count) {
-		*addr -= ((uint64_t)fs->sector_count << ADDR_SECT_SHIFT);
-	}
-}
-
-/* allocation entry close (this closes the current sector) by writing offset
- * of last ate to the sector end.
- */
-static int zms_sector_close(struct zms_fs *fs)
-{
-	int rc;
-	struct zms_ate close_ate, garbage_ate;
-
-	close_ate.id = ZMS_HEAD_ID;
-	close_ate.len = 0U;
-	close_ate.offset = (uint32_t)SECTOR_OFFSET(fs->ate_wra + fs->ate_size);
-	close_ate.metadata = 0xffffffff;
-	close_ate.cycle_cnt = fs->sector_cycle;
-
-	/* When we close the sector, we must write all non used ATE with
-	 * a non valid (Junk) ATE.
-	 * This is needed to avoid some corner cases where some ATEs are
-	 * not overwritten and become valid when the cycle counter wrap again
-	 * to the same cycle counter of the old ATE.
-	 * Example :
-	 * - An ATE.cycl_cnt == 0 is written as last ATE of the sector
-	   - This ATE was never overwritten in the next 255 cycles because of
-	     large data size
-	   - Next 256th cycle the leading cycle_cnt is 0, this ATE becomes
-	     valid even if it is not the case.
-	 */
-	memset(&garbage_ate, fs->flash_parameters->erase_value, sizeof(garbage_ate));
-	while (SECTOR_OFFSET(fs->ate_wra) && (fs->ate_wra >= fs->data_wra)) {
-		rc = zms_flash_ate_wrt(fs, &garbage_ate);
-		if (rc) {
-			return rc;
-		}
-	}
-
-	fs->ate_wra = zms_close_ate_addr(fs, fs->ate_wra);
-
-	zms_ate_crc8_update(&close_ate);
-
-	(void)zms_flash_ate_wrt(fs, &close_ate);
-
-	zms_sector_advance(fs, &fs->ate_wra);
-
-	rc = zms_get_sector_cycle(fs, fs->ate_wra, &fs->sector_cycle);
-	if (rc == -ENOENT) {
-		/* sector never used */
-		fs->sector_cycle = 0;
-	} else if (rc) {
-		/* bad flash read */
-		return rc;
-	}
-
-	fs->data_wra = fs->ate_wra & ADDR_SECT_MASK;
-
-	return 0;
-}
-
-static int zms_add_gc_done_ate(struct zms_fs *fs)
-{
-	struct zms_ate gc_done_ate;
-
-	LOG_DBG("Adding gc done ate at %llx", fs->ate_wra);
-	gc_done_ate.id = ZMS_HEAD_ID;
-	gc_done_ate.len = 0U;
-	gc_done_ate.offset = (uint32_t)SECTOR_OFFSET(fs->data_wra);
-	gc_done_ate.metadata = 0xffffffff;
-	gc_done_ate.cycle_cnt = fs->sector_cycle;
-
-	zms_ate_crc8_update(&gc_done_ate);
-
-	return zms_flash_ate_wrt(fs, &gc_done_ate);
-}
-
-static int zms_add_empty_ate(struct zms_fs *fs, uint64_t addr)
-{
-	struct zms_ate empty_ate;
-	uint8_t cycle_cnt;
-	int rc = 0;
-	uint64_t previous_ate_wra;
-
-	addr &= ADDR_SECT_MASK;
-
-	LOG_DBG("Adding empty ate at %llx", (uint64_t)(addr + fs->sector_size - fs->ate_size));
-	empty_ate.id = ZMS_HEAD_ID;
-	empty_ate.len = 0xffff;
-	empty_ate.offset = 0U;
-	empty_ate.metadata =
-		FIELD_PREP(ZMS_MAGIC_NUMBER_MASK, ZMS_MAGIC_NUMBER) | ZMS_DEFAULT_VERSION;
-
-	rc = zms_get_sector_cycle(fs, addr, &cycle_cnt);
-	if (rc == -ENOENT) {
-		/* sector never used */
-		cycle_cnt = 0;
-	} else if (rc) {
-		/* bad flash read */
-		return rc;
-	}
-
-	/* increase cycle counter */
-	empty_ate.cycle_cnt = (cycle_cnt + 1) % BIT(8);
-	zms_ate_crc8_update(&empty_ate);
-
-	/* Adding empty ate to this sector changes fs->ate_wra value
-	 * Restore the ate_wra of the current sector after this
-	 */
-	previous_ate_wra = fs->ate_wra;
-	fs->ate_wra = zms_empty_ate_addr(fs, addr);
-	rc = zms_flash_ate_wrt(fs, &empty_ate);
-	if (rc) {
-		return rc;
-	}
-	fs->ate_wra = previous_ate_wra;
-
-	return 0;
-}
-
-static int zms_get_sector_cycle(struct zms_fs *fs, uint64_t addr, uint8_t *cycle_cnt)
-{
-	int rc;
-	struct zms_ate empty_ate;
-	uint64_t empty_addr;
-
-	empty_addr = zms_empty_ate_addr(fs, addr);
-
-	/* read the cycle counter of the current sector */
-	rc = zms_flash_ate_rd(fs, empty_addr, &empty_ate);
-	if (rc < 0) {
-		/* flash error */
-		return rc;
-	}
-
-	if (zms_empty_ate_valid(fs, &empty_ate)) {
-		*cycle_cnt = empty_ate.cycle_cnt;
-		return 0;
-	}
-
-	/* there is no empty ATE in this sector */
-	return -ENOENT;
-}
-
-static int zms_get_sector_header(struct zms_fs *fs, uint64_t addr, struct zms_ate *empty_ate,
-				 struct zms_ate *close_ate)
-{
-	int rc;
-	uint64_t close_addr;
-
-	close_addr = zms_close_ate_addr(fs, addr);
-	/* read the second ate in the sector to get the close ATE */
-	rc = zms_flash_ate_rd(fs, close_addr, close_ate);
-	if (rc) {
-		return rc;
-	}
-
-	/* read the first ate in the sector to get the empty ATE */
-	rc = zms_flash_ate_rd(fs, close_addr + fs->ate_size, empty_ate);
-	if (rc) {
-		return rc;
-	}
-
-	return 0;
-}
-
-/**
- * @brief Helper to find an ATE using its ID
- *
- * @param fs Pointer to file system
- * @param id Id of the entry to be found
- * @param start_addr Address from where the search will start
- * @param end_addr Address where the search will stop
- * @param ate pointer to the found ATE if it exists
- * @param ate_addr Pointer to the address of the found ATE
- *
- * @retval 0 No ATE is found
- * @retval 1 valid ATE with same ID found
- * @retval < 0 An error happened
- */
-static int zms_find_ate_with_id(struct zms_fs *fs, uint32_t id, uint64_t start_addr,
-				uint64_t end_addr, struct zms_ate *ate, uint64_t *ate_addr)
-{
-	int rc;
-	int previous_sector_num = ZMS_INVALID_SECTOR_NUM;
-	uint64_t wlk_prev_addr, wlk_addr;
-	int prev_found = 0;
-	struct zms_ate wlk_ate;
-	uint8_t current_cycle;
-
-	wlk_addr = start_addr;
-
-	do {
-		wlk_prev_addr = wlk_addr;
-		rc = zms_prev_ate(fs, &wlk_addr, &wlk_ate);
-		if (rc) {
-			return rc;
-		}
-		if (wlk_ate.id == id) {
-			/* read the ate cycle only when we change the sector or if it is
-			 * the first read ( previous_sector_num == ZMS_INVALID_SECTOR_NUM).
-			 */
-			rc = zms_get_cycle_on_sector_change(fs, wlk_prev_addr, previous_sector_num,
-							    &current_cycle);
-			if (rc) {
-				return rc;
-			}
-			if (zms_ate_valid_different_sector(fs, &wlk_ate, current_cycle)) {
-				prev_found = 1;
-				break;
-			}
-			previous_sector_num = SECTOR_NUM(wlk_prev_addr);
-		}
-	} while (wlk_addr != end_addr);
-
-	*ate = wlk_ate;
-	*ate_addr = wlk_prev_addr;
-
-	return prev_found;
-}
-
-/* garbage collection: the address ate_wra has been updated to the new sector
- * that has just been started. The data to gc is in the sector after this new
- * sector.
- */
-static int zms_gc(struct zms_fs *fs)
-{
-	int rc, sec_closed;
-	struct zms_ate close_ate, gc_ate, wlk_ate, empty_ate;
-	uint64_t sec_addr, gc_addr, gc_prev_addr, wlk_addr, wlk_prev_addr, data_addr, stop_addr;
-	uint8_t previous_cycle = 0;
-
-	rc = zms_get_sector_cycle(fs, fs->ate_wra, &fs->sector_cycle);
-	if (rc == -ENOENT) {
-		/* Erase this new unused sector if needed */
-		rc = zms_flash_erase_sector(fs, fs->ate_wra);
-		if (rc) {
-			return rc;
-		}
-		/* sector never used */
-		rc = zms_add_empty_ate(fs, fs->ate_wra);
-		if (rc) {
-			return rc;
-		}
-		/* At this step we are sure that empty ATE exist.
-		 * If not, then there is an I/O problem.
-		 */
-		rc = zms_get_sector_cycle(fs, fs->ate_wra, &fs->sector_cycle);
-		if (rc) {
-			return rc;
-		}
-	} else if (rc) {
-		/* bad flash read */
-		return rc;
-	}
-	previous_cycle = fs->sector_cycle;
-
-	sec_addr = (fs->ate_wra & ADDR_SECT_MASK);
-	zms_sector_advance(fs, &sec_addr);
-	gc_addr = sec_addr + fs->sector_size - fs->ate_size;
-
-	/* verify if the sector is closed */
-	sec_closed = zms_validate_closed_sector(fs, gc_addr, &empty_ate, &close_ate);
-	if (sec_closed < 0) {
-		return sec_closed;
-	}
-
-	/* if the sector is not closed don't do gc */
-	if (!sec_closed) {
-		goto gc_done;
-	}
-
-	/* update sector_cycle */
-	fs->sector_cycle = empty_ate.cycle_cnt;
-
-	/* stop_addr points to the first ATE before the header ATEs */
-	stop_addr = gc_addr - 2 * fs->ate_size;
-	/* At this step empty & close ATEs are valid.
-	 * let's start the GC
-	 */
-	gc_addr &= ADDR_SECT_MASK;
-	gc_addr += close_ate.offset;
-
-	do {
-		gc_prev_addr = gc_addr;
-		rc = zms_prev_ate(fs, &gc_addr, &gc_ate);
-		if (rc) {
-			return rc;
-		}
-
-		if (!zms_ate_valid(fs, &gc_ate) || !gc_ate.len) {
-			continue;
-		}
-
-#ifdef CONFIG_ZMS_LOOKUP_CACHE
-		wlk_addr = fs->lookup_cache[zms_lookup_cache_pos(gc_ate.id)];
-
-		if (wlk_addr == ZMS_LOOKUP_CACHE_NO_ADDR) {
-			wlk_addr = fs->ate_wra;
-		}
-#else
-		wlk_addr = fs->ate_wra;
-#endif
-
-		/* Initialize the wlk_prev_addr as if no previous ID will be found */
-		wlk_prev_addr = gc_prev_addr;
-		/* Search for a previous valid ATE with the same ID. If it doesn't exist
-		 * then wlk_prev_addr will be equal to gc_prev_addr.
-		 */
-		rc = zms_find_ate_with_id(fs, gc_ate.id, wlk_addr, fs->ate_wra, &wlk_ate,
-					  &wlk_prev_addr);
-		if (rc < 0) {
-			return rc;
-		}
-
-		/* if walk_addr has reached the same address as gc_addr, a copy is
-		 * needed unless it is a deleted item.
-		 */
-		if (wlk_prev_addr == gc_prev_addr) {
-			/* copy needed */
-			LOG_DBG("Moving %d, len %d", gc_ate.id, gc_ate.len);
-
-			if (gc_ate.len > ZMS_DATA_IN_ATE_SIZE) {
-				/* Copy Data only when len > 8
-				 * Otherwise, Data is already inside ATE
-				 */
-				data_addr = (gc_prev_addr & ADDR_SECT_MASK);
-				data_addr += gc_ate.offset;
-				gc_ate.offset = (uint32_t)SECTOR_OFFSET(fs->data_wra);
-
-				rc = zms_flash_block_move(fs, data_addr, gc_ate.len);
-				if (rc) {
-					return rc;
-				}
-			}
-
-			gc_ate.cycle_cnt = previous_cycle;
-			zms_ate_crc8_update(&gc_ate);
-			rc = zms_flash_ate_wrt(fs, &gc_ate);
-			if (rc) {
-				return rc;
-			}
-		}
-	} while (gc_prev_addr != stop_addr);
-
-gc_done:
-
-	/* restore the previous sector_cycle */
-	fs->sector_cycle = previous_cycle;
-
-	/* Write a GC_done ATE to mark the end of this operation
-	 */
-
-	rc = zms_add_gc_done_ate(fs);
-	if (rc) {
-		return rc;
-	}
-
-	/* Erase the GC'ed sector when needed */
-	rc = zms_flash_erase_sector(fs, sec_addr);
-	if (rc) {
-		return rc;
-	}
-
-#ifdef CONFIG_ZMS_LOOKUP_CACHE
-	zms_lookup_cache_invalidate(fs, sec_addr >> ADDR_SECT_SHIFT);
-#endif
-	rc = zms_add_empty_ate(fs, sec_addr);
-
-	return rc;
-}
-
-int zms_clear(struct zms_fs *fs)
-{
-	int rc;
-	uint64_t addr;
-
-	if (!fs->ready) {
-		LOG_ERR("zms not initialized");
-		return -EACCES;
-	}
-
-	k_mutex_lock(&fs->zms_lock, K_FOREVER);
-	for (uint32_t i = 0; i < fs->sector_count; i++) {
-		addr = (uint64_t)i << ADDR_SECT_SHIFT;
-		rc = zms_flash_erase_sector(fs, addr);
-		if (rc) {
-			goto end;
-		}
-		rc = zms_add_empty_ate(fs, addr);
-		if (rc) {
-			goto end;
-		}
-	}
-
-	/* zms needs to be reinitialized after clearing */
-	fs->ready = false;
-
-end:
-	k_mutex_unlock(&fs->zms_lock);
-
-	return 0;
-}
-
-static int zms_init(struct zms_fs *fs)
-{
-	int rc, sec_closed;
-	struct zms_ate last_ate, first_ate, close_ate, empty_ate;
-	/* Initialize addr to 0 for the case fs->sector_count == 0. This
-	 * should never happen as this is verified in zms_mount() but both
-	 * Coverity and GCC believe the contrary.
-	 */
-	uint64_t addr = 0U, data_wra = 0U;
-	uint32_t i, closed_sectors = 0;
-	bool zms_magic_exist = false;
-
-	k_mutex_lock(&fs->zms_lock, K_FOREVER);
-
-	/* step through the sectors to find a open sector following
-	 * a closed sector, this is where zms can write.
-	 */
-
-	for (i = 0; i < fs->sector_count; i++) {
-		addr = zms_close_ate_addr(fs, ((uint64_t)i << ADDR_SECT_SHIFT));
-
-		/* verify if the sector is closed */
-		sec_closed = zms_validate_closed_sector(fs, addr, &empty_ate, &close_ate);
-		if (sec_closed < 0) {
-			rc = sec_closed;
-			goto end;
-		}
-		/* update cycle count */
-		fs->sector_cycle = empty_ate.cycle_cnt;
-
-		if (sec_closed == 1) {
-			/* closed sector */
-			closed_sectors++;
-			/* Let's verify that this is a ZMS storage system */
-			if (ZMS_GET_MAGIC_NUMBER(empty_ate.metadata) == ZMS_MAGIC_NUMBER) {
-				zms_magic_exist = true;
-				/* Let's check that we support this ZMS version */
-				if (ZMS_GET_VERSION(empty_ate.metadata) != ZMS_DEFAULT_VERSION) {
-					LOG_ERR("ZMS Version is not supported");
-					rc = -ENOEXEC;
-					goto end;
-				}
-			}
-
-			zms_sector_advance(fs, &addr);
-			/* addr is pointing to the close ATE */
-			/* verify if the sector is Open */
-			sec_closed = zms_validate_closed_sector(fs, addr, &empty_ate, &close_ate);
-			if (sec_closed < 0) {
-				rc = sec_closed;
-				goto end;
-			}
-			/* update cycle count */
-			fs->sector_cycle = empty_ate.cycle_cnt;
-
-			if (!sec_closed) {
-				/* We found an Open sector following a closed one */
-				break;
-			}
-		}
-	}
-	/* all sectors are closed, and zms magic number not found. This is not a zms fs */
-	if ((closed_sectors == fs->sector_count) && !zms_magic_exist) {
-		rc = -EDEADLK;
-		goto end;
-	}
-	/* TODO: add a recovery mechanism here if the ZMS magic number exist but all
-	 * sectors are closed
-	 */
-
-	if (i == fs->sector_count) {
-		/* none of the sectors were closed, which means that the first
-		 * sector is the one in use, except if there are only 2 sectors.
-		 * Let's check if the last sector has valid ATEs otherwise set
-		 * the open sector to the first one.
-		 */
-		rc = zms_flash_ate_rd(fs, addr - fs->ate_size, &first_ate);
-		if (rc) {
-			goto end;
-		}
-		if (!zms_ate_valid(fs, &first_ate)) {
-			zms_sector_advance(fs, &addr);
-		}
-		rc = zms_get_sector_header(fs, addr, &empty_ate, &close_ate);
-		if (rc) {
-			goto end;
-		}
-
-		if (zms_empty_ate_valid(fs, &empty_ate)) {
-			/* Empty ATE is valid, let's verify that this is a ZMS storage system */
-			if (ZMS_GET_MAGIC_NUMBER(empty_ate.metadata) == ZMS_MAGIC_NUMBER) {
-				zms_magic_exist = true;
-				/* Let's check the version */
-				if (ZMS_GET_VERSION(empty_ate.metadata) != ZMS_DEFAULT_VERSION) {
-					LOG_ERR("ZMS Version is not supported");
-					rc = -ENOEXEC;
-					goto end;
-				}
-			}
-		} else {
-			rc = zms_flash_erase_sector(fs, addr);
-			if (rc) {
-				goto end;
-			}
-			rc = zms_add_empty_ate(fs, addr);
-			if (rc) {
-				goto end;
-			}
-		}
-		rc = zms_get_sector_cycle(fs, addr, &fs->sector_cycle);
-		if (rc == -ENOENT) {
-			/* sector never used */
-			fs->sector_cycle = 0;
-		} else if (rc) {
-			/* bad flash read */
-			goto end;
-		}
-	}
-
-	/* addr contains address of closing ate in the most recent sector,
-	 * search for the last valid ate using the recover_last_ate routine
-	 * and also update the data_wra
-	 */
-	rc = zms_recover_last_ate(fs, &addr, &data_wra);
-	if (rc) {
-		goto end;
-	}
-
-	/* addr contains address of the last valid ate in the most recent sector
-	 * data_wra contains the data write address of the current sector
-	 */
-	fs->ate_wra = addr;
-	fs->data_wra = data_wra;
-
-	/* fs->ate_wra should point to the next available entry. This is normally
-	 * the next position after the one found by the recovery function.
-	 * Let's verify that it doesn't contain any valid ATE, otherwise search for
-	 * an empty position
-	 */
-	while (fs->ate_wra >= fs->data_wra) {
-		rc = zms_flash_ate_rd(fs, fs->ate_wra, &last_ate);
-		if (rc) {
-			goto end;
-		}
-		if (!zms_ate_valid(fs, &last_ate)) {
-			/* found empty location */
-			break;
-		}
-
-		/* ate on the last position within the sector is
-		 * reserved for deletion an entry
-		 */
-		if ((fs->ate_wra == fs->data_wra) && last_ate.len) {
-			/* not a delete ate */
-			rc = -ESPIPE;
-			goto end;
-		}
-
-		fs->ate_wra -= fs->ate_size;
-	}
-
-	/* The sector after the write sector is either empty with a valid empty ATE (regular case)
-	 * or it has never been used or it is a closed sector (GC didn't finish)
-	 * If it is a closed sector we must look for a valid GC done ATE in the current write
-	 * sector, if it is missing, we need to restart gc because it has been interrupted.
-	 * If no valid empty ATE is found then it has never been used. Just erase it by adding
-	 * a valid empty ATE.
-	 * When gc needs to be restarted, first erase the sector by adding an empty
-	 * ATE otherwise the data might not fit into the sector.
-	 */
-	addr = zms_close_ate_addr(fs, fs->ate_wra);
-	zms_sector_advance(fs, &addr);
-
-	/* verify if the sector is closed */
-	sec_closed = zms_validate_closed_sector(fs, addr, &empty_ate, &close_ate);
-	if (sec_closed < 0) {
-		rc = sec_closed;
-		goto end;
-	}
-
-	if (sec_closed == 1) {
-		/* The sector after fs->ate_wrt is closed.
-		 * Look for a marker (gc_done_ate) that indicates that gc was finished.
-		 */
-		bool gc_done_marker = false;
-		struct zms_ate gc_done_ate;
-
-		fs->sector_cycle = empty_ate.cycle_cnt;
-		addr = fs->ate_wra + fs->ate_size;
-		while (SECTOR_OFFSET(addr) < (fs->sector_size - 2 * fs->ate_size)) {
-			rc = zms_flash_ate_rd(fs, addr, &gc_done_ate);
-			if (rc) {
-				goto end;
-			}
-
-			if (zms_gc_done_ate_valid(fs, &gc_done_ate)) {
-				break;
-			}
-			addr += fs->ate_size;
-		}
-
-		if (gc_done_marker) {
-			/* erase the next sector */
-			LOG_INF("GC Done marker found");
-			addr = fs->ate_wra & ADDR_SECT_MASK;
-			zms_sector_advance(fs, &addr);
-			rc = zms_flash_erase_sector(fs, addr);
-			if (rc < 0) {
-				goto end;
-			}
-			rc = zms_add_empty_ate(fs, addr);
-			goto end;
-		}
-		LOG_INF("No GC Done marker found: restarting gc");
-		rc = zms_flash_erase_sector(fs, fs->ate_wra);
-		if (rc) {
-			goto end;
-		}
-		rc = zms_add_empty_ate(fs, fs->ate_wra);
-		if (rc) {
-			goto end;
-		}
-
-		/* Let's point to the first writable position */
-		fs->ate_wra &= ADDR_SECT_MASK;
-		fs->ate_wra += (fs->sector_size - 3 * fs->ate_size);
-		fs->data_wra = (fs->ate_wra & ADDR_SECT_MASK);
-#ifdef CONFIG_ZMS_LOOKUP_CACHE
-		/**
-		 * At this point, the lookup cache wasn't built but the gc function need to use it.
-		 * So, temporarily, we set the lookup cache to the end of the fs.
-		 * The cache will be rebuilt afterwards
-		 **/
-		for (i = 0; i < CONFIG_ZMS_LOOKUP_CACHE_SIZE; i++) {
-			fs->lookup_cache[i] = fs->ate_wra;
-		}
-#endif
-		rc = zms_gc(fs);
-		goto end;
-	}
-
-end:
-#ifdef CONFIG_ZMS_LOOKUP_CACHE
-	if (!rc) {
-		rc = zms_lookup_cache_rebuild(fs);
-	}
-#endif
-	/* If the sector is empty add a gc done ate to avoid having insufficient
-	 * space when doing gc.
-	 */
-	if ((!rc) && (SECTOR_OFFSET(fs->ate_wra) == (fs->sector_size - 3 * fs->ate_size))) {
-		rc = zms_add_gc_done_ate(fs);
-	}
-	k_mutex_unlock(&fs->zms_lock);
-
-	return rc;
-}
-
-int zms_mount(struct zms_fs *fs)
-{
-
-	int rc;
-	struct flash_pages_info info;
-	size_t write_block_size;
-
-	k_mutex_init(&fs->zms_lock);
-
-	fs->flash_parameters = flash_get_parameters(fs->flash_device);
-	if (fs->flash_parameters == NULL) {
-		LOG_ERR("Could not obtain flash parameters");
-		return -EINVAL;
-	}
-
-	fs->ate_size = zms_al_size(fs, sizeof(struct zms_ate));
-	write_block_size = flash_get_write_block_size(fs->flash_device);
-
-	/* check that the write block size is supported */
-	if (write_block_size > ZMS_BLOCK_SIZE || write_block_size == 0) {
-		LOG_ERR("Unsupported write block size");
-		return -EINVAL;
-	}
-
-	/* When the device need erase operations before write let's check that
-	 * sector size is a multiple of pagesize
-	 */
-	if (flash_params_get_erase_cap(fs->flash_parameters) & FLASH_ERASE_C_EXPLICIT) {
-		rc = flash_get_page_info_by_offs(fs->flash_device, fs->offset, &info);
-		if (rc) {
-			LOG_ERR("Unable to get page info");
-			return -EINVAL;
-		}
-		if (!fs->sector_size || fs->sector_size % info.size) {
-			LOG_ERR("Invalid sector size");
-			return -EINVAL;
-		}
-	}
-
-	/* we need at least 5 aligned ATEs size as the minimum sector size
-	 * 1 close ATE, 1 empty ATE, 1 GC done ATE, 1 Delete ATE, 1 ID/Value ATE
-	 */
-	if (fs->sector_size < ZMS_MIN_ATE_NUM * fs->ate_size) {
-		LOG_ERR("Invalid sector size, should be at least %u",
-			ZMS_MIN_ATE_NUM * fs->ate_size);
-	}
-
-	/* check the number of sectors, it should be at least 2 */
-	if (fs->sector_count < 2) {
-		LOG_ERR("Configuration error - sector count below minimum requirement (2)");
-		return -EINVAL;
-	}
-
-	rc = zms_init(fs);
-
-	if (rc) {
-		return rc;
-	}
-
-	/* zms is ready for use */
-	fs->ready = true;
-
-	LOG_INF("%u Sectors of %u bytes", fs->sector_count, fs->sector_size);
-	LOG_INF("alloc wra: %llu, %llx", SECTOR_NUM(fs->ate_wra), SECTOR_OFFSET(fs->ate_wra));
-	LOG_INF("data wra: %llu, %llx", SECTOR_NUM(fs->data_wra), SECTOR_OFFSET(fs->data_wra));
-
-	return 0;
-}
-
-ssize_t zms_write(struct zms_fs *fs, uint32_t id, const void *data, size_t len)
-{
-	int rc;
-	size_t data_size;
-	struct zms_ate wlk_ate;
-	uint64_t wlk_addr, rd_addr;
-	uint32_t gc_count, required_space = 0U; /* no space, appropriate for delete ate */
-	int prev_found = 0;
-
-	if (!fs->ready) {
-		LOG_ERR("zms not initialized");
-		return -EACCES;
-	}
-
-	data_size = zms_al_size(fs, len);
-
-	/* The maximum data size is sector size - 5 ate
-	 * where: 1 ate for data, 1 ate for sector close, 1 ate for empty,
-	 * 1 ate for gc done, and 1 ate to always allow a delete.
-	 * We cannot also store more than 64 KB of data
-	 */
-	if ((len > (fs->sector_size - 5 * fs->ate_size)) || (len > UINT16_MAX) ||
-	    ((len > 0) && (data == NULL))) {
-		return -EINVAL;
-	}
-
-	/* find latest entry with same id */
-#ifdef CONFIG_ZMS_LOOKUP_CACHE
-	wlk_addr = fs->lookup_cache[zms_lookup_cache_pos(id)];
-
-	if (wlk_addr == ZMS_LOOKUP_CACHE_NO_ADDR) {
-		goto no_cached_entry;
-	}
-#else
-	wlk_addr = fs->ate_wra;
-#endif
-	rd_addr = wlk_addr;
-
-	/* Search for a previous valid ATE with the same ID */
-	prev_found = zms_find_ate_with_id(fs, id, wlk_addr, fs->ate_wra, &wlk_ate, &rd_addr);
-	if (prev_found < 0) {
-		return prev_found;
-	}
-
-#ifdef CONFIG_ZMS_LOOKUP_CACHE
-no_cached_entry:
-#endif
-	if (prev_found) {
-		/* previous entry found */
-		if (len > ZMS_DATA_IN_ATE_SIZE) {
-			rd_addr &= ADDR_SECT_MASK;
-			rd_addr += wlk_ate.offset;
-		}
-
-		if (len == 0) {
-			/* do not try to compare with empty data */
-			if (wlk_ate.len == 0U) {
-				/* skip delete entry as it is already the
-				 * last one
-				 */
-				return 0;
-			}
-		} else if (len == wlk_ate.len) {
-			/* do not try to compare if lengths are not equal */
-			/* compare the data and if equal return 0 */
-			if (len <= ZMS_DATA_IN_ATE_SIZE) {
-				rc = memcmp(&wlk_ate.data, data, len);
-				if (!rc) {
-					return 0;
-				}
-			} else {
-				rc = zms_flash_block_cmp(fs, rd_addr, data, len);
-				if (rc <= 0) {
-					return rc;
-				}
-			}
-		}
-	} else {
-		/* skip delete entry for non-existing entry */
-		if (len == 0) {
-			return 0;
-		}
-	}
-
-	/* calculate required space if the entry contains data */
-	if (data_size) {
-		/* Leave space for delete ate */
-		if (len > ZMS_DATA_IN_ATE_SIZE) {
-			required_space = data_size + fs->ate_size;
-		} else {
-			required_space = fs->ate_size;
-		}
-	}
-
-	k_mutex_lock(&fs->zms_lock, K_FOREVER);
-
-	gc_count = 0;
-	while (1) {
-		if (gc_count == fs->sector_count) {
-			/* gc'ed all sectors, no extra space will be created
-			 * by extra gc.
-			 */
-			rc = -ENOSPC;
-			goto end;
-		}
-
-		/* We need to make sure that we leave the ATE at address 0x0 of the sector
-		 * empty (even for delete ATE). Otherwise, the fs->ate_wra will be decremented
-		 * after this write by ate_size and it will underflow.
-		 * So the first position of a sector (fs->ate_wra = 0x0) is forbidden for ATEs
-		 * and the second position could be written only be a delete ATE.
-		 */
-		if ((SECTOR_OFFSET(fs->ate_wra)) &&
-		    (fs->ate_wra >= (fs->data_wra + required_space)) &&
-		    (SECTOR_OFFSET(fs->ate_wra - fs->ate_size) || !len)) {
-			rc = zms_flash_write_entry(fs, id, data, len);
-			if (rc) {
-				goto end;
-			}
-			break;
-		}
-		rc = zms_sector_close(fs);
-		if (rc) {
-			LOG_ERR("Failed to close the sector, returned = %d", rc);
-			goto end;
-		}
-		rc = zms_gc(fs);
-		if (rc) {
-			LOG_ERR("Garbage collection failed, returned = %d", rc);
-			goto end;
-		}
-		gc_count++;
-	}
-	rc = len;
-end:
-	k_mutex_unlock(&fs->zms_lock);
-	return rc;
-}
-
-int zms_delete(struct zms_fs *fs, uint32_t id)
-{
-	return zms_write(fs, id, NULL, 0);
-}
-
-ssize_t zms_read_hist(struct zms_fs *fs, uint32_t id, void *data, size_t len, uint32_t cnt)
-{
-	int rc, prev_found = 0;
-	uint64_t wlk_addr, rd_addr = 0, wlk_prev_addr = 0;
-	uint32_t cnt_his;
-	struct zms_ate wlk_ate;
-#ifdef CONFIG_ZMS_DATA_CRC
-	uint32_t computed_data_crc;
-#endif
-
-	if (!fs->ready) {
-		LOG_ERR("zms not initialized");
-		return -EACCES;
-	}
-
-	cnt_his = 0U;
-
-#ifdef CONFIG_ZMS_LOOKUP_CACHE
-	wlk_addr = fs->lookup_cache[zms_lookup_cache_pos(id)];
-
-	if (wlk_addr == ZMS_LOOKUP_CACHE_NO_ADDR) {
-		rc = -ENOENT;
-		goto err;
-	}
-#else
-	wlk_addr = fs->ate_wra;
-#endif
-
-	while (cnt_his <= cnt) {
-		wlk_prev_addr = wlk_addr;
-		/* Search for a previous valid ATE with the same ID */
-		prev_found = zms_find_ate_with_id(fs, id, wlk_addr, fs->ate_wra, &wlk_ate,
-						  &wlk_prev_addr);
-		if (prev_found < 0) {
-			return prev_found;
-		}
-		if (prev_found) {
-			cnt_his++;
-			/* wlk_prev_addr contain the ATE address of the previous found ATE. */
-			rd_addr = wlk_prev_addr;
-			/*
-			 * compute the previous ATE address in case we need to start
-			 * the research again.
-			 */
-			rc = zms_compute_prev_addr(fs, &wlk_prev_addr);
-			if (rc) {
-				return rc;
-			}
-			/* wlk_addr will be the start research address in the next loop */
-			wlk_addr = wlk_prev_addr;
-		} else {
-			break;
-		}
-	}
-
-	if (((!prev_found) || (wlk_ate.id != id)) || (wlk_ate.len == 0U) || (cnt_his < cnt)) {
-		return -ENOENT;
-	}
-
-	if (wlk_ate.len <= ZMS_DATA_IN_ATE_SIZE) {
-		/* data is stored in the ATE */
-		if (data) {
-			memcpy(data, &wlk_ate.data, MIN(len, wlk_ate.len));
-		}
-	} else {
-		rd_addr &= ADDR_SECT_MASK;
-		rd_addr += wlk_ate.offset;
-		/* do not read or copy data if pointer is NULL */
-		if (data) {
-			rc = zms_flash_rd(fs, rd_addr, data, MIN(len, wlk_ate.len));
-			if (rc) {
-				goto err;
-			}
-		}
-#ifdef CONFIG_ZMS_DATA_CRC
-		/* Do not compute CRC for partial reads as CRC won't match */
-		if (len >= wlk_ate.len) {
-			computed_data_crc = crc32_ieee(data, wlk_ate.len);
-			if (computed_data_crc != wlk_ate.data_crc) {
-				LOG_ERR("Invalid data CRC: ATE_CRC=0x%08X, "
-					"computed_data_crc=0x%08X",
-					wlk_ate.data_crc, computed_data_crc);
-				return -EIO;
-			}
-		}
-#endif
-	}
-
-	return wlk_ate.len;
-
-err:
-	return rc;
-}
-
-ssize_t zms_read(struct zms_fs *fs, uint32_t id, void *data, size_t len)
-{
-	int rc;
-
-	rc = zms_read_hist(fs, id, data, len, 0);
-	if (rc < 0) {
-		return rc;
-	}
-
-	/* returns the minimum between ATE data length and requested length */
-	return MIN(rc, len);
-}
-
-ssize_t zms_get_data_length(struct zms_fs *fs, uint32_t id)
-{
-	int rc;
-
-	rc = zms_read_hist(fs, id, NULL, 0, 0);
-
-	return rc;
-}
-
-ssize_t zms_calc_free_space(struct zms_fs *fs)
-{
-
-	int rc, previous_sector_num = ZMS_INVALID_SECTOR_NUM, prev_found = 0, sec_closed;
-	struct zms_ate step_ate, wlk_ate, empty_ate, close_ate;
-	uint64_t step_addr, wlk_addr, step_prev_addr, wlk_prev_addr, data_wra = 0U;
-	uint8_t current_cycle;
-	ssize_t free_space = 0;
-
-	if (!fs->ready) {
-		LOG_ERR("zms not initialized");
-		return -EACCES;
-	}
-
-	/*
-	 * There is always a closing ATE , an empty ATE, a GC_done ATE and a reserved ATE for
-	 * deletion in each sector.
-	 * And there is always one reserved Sector for garbage collection operations
-	 */
-	free_space = (fs->sector_count - 1) * (fs->sector_size - 4 * fs->ate_size);
-
-	step_addr = fs->ate_wra;
-
-	do {
-		step_prev_addr = step_addr;
-		rc = zms_prev_ate(fs, &step_addr, &step_ate);
-		if (rc) {
-			return rc;
-		}
-
-		/* When changing the sector let's get the new cycle counter */
-		rc = zms_get_cycle_on_sector_change(fs, step_prev_addr, previous_sector_num,
-						    &current_cycle);
-		if (rc) {
-			return rc;
-		}
-		previous_sector_num = SECTOR_NUM(step_prev_addr);
-
-		/* Invalid and deleted ATEs are free spaces.
-		 * Header ATEs are already retrieved from free space
-		 */
-		if (!zms_ate_valid_different_sector(fs, &step_ate, current_cycle) ||
-		    (step_ate.id == ZMS_HEAD_ID) || (step_ate.len == 0)) {
-			continue;
-		}
-
-		wlk_addr = step_addr;
-		/* Try to find if there is a previous valid ATE with same ID */
-		prev_found = zms_find_ate_with_id(fs, step_ate.id, wlk_addr, step_addr, &wlk_ate,
-						  &wlk_prev_addr);
-		if (prev_found < 0) {
-			return prev_found;
-		}
-
-		/* If no previous ATE is found, then this is a valid ATE that cannot be
-		 * Garbage Collected
-		 */
-		if (!prev_found || (wlk_prev_addr == step_prev_addr)) {
-			if (step_ate.len > ZMS_DATA_IN_ATE_SIZE) {
-				free_space -= zms_al_size(fs, step_ate.len);
-			}
-			free_space -= fs->ate_size;
-		}
-	} while (step_addr != fs->ate_wra);
-
-	/* we must keep the sector_cycle before we start looking into special cases */
-	current_cycle = fs->sector_cycle;
-
-	/* Let's look now for special cases where some sectors have only ATEs with
-	 * small data size.
-	 */
-	const uint32_t second_to_last_offset = (2 * fs->ate_size);
-
-	for (uint32_t i = 0; i < fs->sector_count; i++) {
-		step_addr = zms_close_ate_addr(fs, ((uint64_t)i << ADDR_SECT_SHIFT));
-
-		/* verify if the sector is closed */
-		sec_closed = zms_validate_closed_sector(fs, step_addr, &empty_ate, &close_ate);
-		if (sec_closed < 0) {
-			return sec_closed;
-		}
-
-		/* If the sector is closed and its offset is pointing to a position less than the
-		 * 3rd to last ATE position in a sector, it means that we need to leave the second
-		 * to last ATE empty.
-		 */
-		if ((sec_closed == 1) && (close_ate.offset <= second_to_last_offset)) {
-			free_space -= fs->ate_size;
-		} else if (!sec_closed) {
-			/* sector is open, let's recover the last ATE */
-			fs->sector_cycle = empty_ate.cycle_cnt;
-			rc = zms_recover_last_ate(fs, &step_addr, &data_wra);
-			if (rc) {
-				return rc;
-			}
-			if (SECTOR_OFFSET(step_addr) <= second_to_last_offset) {
-				free_space -= fs->ate_size;
-			}
-		}
-	}
-	/* restore sector cycle */
-	fs->sector_cycle = current_cycle;
-
-	return free_space;
-}
-
-size_t zms_sector_max_data_size(struct zms_fs *fs)
-{
-	if (!fs->ready) {
-		LOG_ERR("ZMS not initialized");
-		return -EACCES;
-	}
-
-	return fs->ate_wra - fs->data_wra - fs->ate_size;
-}
-
-int zms_sector_use_next(struct zms_fs *fs)
-{
-	int ret;
-
-	if (!fs->ready) {
-		LOG_ERR("ZMS not initialized");
-		return -EACCES;
-	}
-
-	k_mutex_lock(&fs->zms_lock, K_FOREVER);
-
-	ret = zms_sector_close(fs);
-	if (ret != 0) {
-		goto end;
-	}
-
-	ret = zms_gc(fs);
-
-end:
-	k_mutex_unlock(&fs->zms_lock);
-	return ret;
-}
diff --git a/subsys/fs/zms/zms_priv.h b/subsys/fs/zms/zms_priv.h
deleted file mode 100644
index 6594048ea0f..00000000000
--- a/subsys/fs/zms/zms_priv.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*  ZMS: Zephyr Memory Storage
- *
- * Copyright (c) 2024 BayLibre SAS
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#ifndef __ZMS_PRIV_H_
-#define __ZMS_PRIV_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * MASKS AND SHIFT FOR ADDRESSES
- * an address in zms is an uint64_t where:
- *   high 4 bytes represent the sector number
- *   low 4 bytes represent the offset in a sector
- */
-#define ADDR_SECT_MASK   GENMASK64(63, 32)
-#define ADDR_SECT_SHIFT  32
-#define ADDR_OFFS_MASK   GENMASK64(31, 0)
-#define SECTOR_NUM(x)    FIELD_GET(ADDR_SECT_MASK, x)
-#define SECTOR_OFFSET(x) FIELD_GET(ADDR_OFFS_MASK, x)
-
-#if defined(CONFIG_ZMS_CUSTOM_BLOCK_SIZE)
-#define ZMS_BLOCK_SIZE CONFIG_ZMS_MAX_BLOCK_SIZE
-#else
-#define ZMS_BLOCK_SIZE 32
-#endif
-
-#define ZMS_LOOKUP_CACHE_NO_ADDR GENMASK64(63, 0)
-#define ZMS_HEAD_ID              GENMASK(31, 0)
-
-#define ZMS_VERSION_MASK        GENMASK(7, 0)
-#define ZMS_GET_VERSION(x)      FIELD_GET(ZMS_VERSION_MASK, x)
-#define ZMS_DEFAULT_VERSION     1
-#define ZMS_MAGIC_NUMBER        0x42 /* murmur3a hash of "ZMS" (MSB) */
-#define ZMS_MAGIC_NUMBER_MASK   GENMASK(15, 8)
-#define ZMS_GET_MAGIC_NUMBER(x) FIELD_GET(ZMS_MAGIC_NUMBER_MASK, x)
-#define ZMS_MIN_ATE_NUM         5
-
-#define ZMS_INVALID_SECTOR_NUM -1
-#define ZMS_DATA_IN_ATE_SIZE   8
-
-struct zms_ate {
-	uint8_t crc8;      /* crc8 check of the entry */
-	uint8_t cycle_cnt; /* cycle counter for non erasable devices */
-	uint32_t id;       /* data id */
-	uint16_t len;      /* data len within sector */
-	union {
-		uint8_t data[8]; /* used to store small size data */
-		struct {
-			uint32_t offset; /* data offset within sector */
-			union {
-				uint32_t data_crc; /*
-						    * crc for data: The data CRC is checked only
-						    * when the whole data of the element is read.
-						    * The data CRC is not checked for a partial
-						    * read, as it is computed for the complete
-						    * set of data.
-						    */
-				uint32_t metadata; /*
-						    * Used to store metadata information
-						    * such as storage version.
-						    */
-			};
-		};
-	};
-} __packed;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __ZMS_PRIV_H_ */

From 1b672e2291f686d475dd1185d683b79faa63f6a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:41 +0100
Subject: [PATCH 1632/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Minor code size optimization"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 55aaf1469caf12c62fa82b775dc6ee83f8f0ca7b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/uart_nrfx_uarte.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 5c19485946c..6bc211a5351 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -219,7 +219,6 @@ struct uarte_nrfx_data {
 
 #define UARTE_FLAG_LOW_POWER_TX BIT(0)
 #define UARTE_FLAG_LOW_POWER_RX BIT(1)
-#define UARTE_FLAG_LOW_POWER (UARTE_FLAG_LOW_POWER_TX | UARTE_FLAG_LOW_POWER_RX)
 #define UARTE_FLAG_TRIG_RXTO BIT(2)
 #define UARTE_FLAG_POLL_OUT BIT(3)
 
@@ -618,13 +617,11 @@ static void uarte_periph_enable(const struct device *dev)
 	}
 }
 
-static void uarte_enable_locked(const struct device *dev, uint32_t act_mask)
+static void uarte_enable(const struct device *dev, uint32_t act_mask, uint32_t sec_mask)
 {
 	struct uarte_nrfx_data *data = dev->data;
-	bool already_active = (data->flags & UARTE_FLAG_LOW_POWER) != 0;
 
-	data->flags |= act_mask;
-	if (already_active) {
+	if (atomic_or(&data->flags, act_mask) & sec_mask) {
 		/* Second direction already enabled so UARTE is enabled. */
 		return;
 	}
@@ -660,7 +657,7 @@ static void tx_start(const struct device *dev, const uint8_t *buf, size_t len)
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_TXSTOPPED);
 
 	if (LOW_POWER_ENABLED(config)) {
-		uarte_enable_locked(dev, UARTE_FLAG_LOW_POWER_TX);
+		uarte_enable(dev, UARTE_FLAG_LOW_POWER_TX, UARTE_FLAG_LOW_POWER_RX);
 	}
 
 	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTTX);
@@ -676,13 +673,14 @@ static void tx_start(const struct device *dev, const uint8_t *buf, size_t len)
  * here.
  * @param dev Device.
  * @param dis_mask Mask of direction (RX or TX) which now longer uses the UARTE instance.
+ * @param sec_mask Mask of second direction which is used to check if it uses the UARTE.
  */
-static void uarte_disable_locked(const struct device *dev, uint32_t dis_mask)
+static void uarte_disable_locked(const struct device *dev, uint32_t dis_mask, uint32_t sec_mask)
 {
 	struct uarte_nrfx_data *data = dev->data;
 
 	data->flags &= ~dis_mask;
-	if (data->flags & UARTE_FLAG_LOW_POWER) {
+	if (data->flags & sec_mask) {
 		return;
 	}
 
@@ -1058,7 +1056,7 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	} else if (LOW_POWER_ENABLED(cfg)) {
 		unsigned int key = irq_lock();
 
-		uarte_enable_locked(dev, UARTE_FLAG_LOW_POWER_RX);
+		uarte_enable(dev, UARTE_FLAG_LOW_POWER_RX, UARTE_FLAG_LOW_POWER_TX);
 		irq_unlock(key);
 	}
 
@@ -1533,7 +1531,7 @@ static void rxto_isr(const struct device *dev)
 	} else if (LOW_POWER_ENABLED(config)) {
 		uint32_t key = irq_lock();
 
-		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_RX);
+		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_RX, UARTE_FLAG_LOW_POWER_TX);
 		irq_unlock(key);
 	}
 
@@ -1560,7 +1558,7 @@ static void txstopped_isr(const struct device *dev)
 		}
 	} else if (LOW_POWER_ENABLED(config)) {
 		nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
-		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_TX);
+		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_TX, UARTE_FLAG_LOW_POWER_RX);
 	}
 
 	irq_unlock(key);

From 1d0ea024d452a72a2b917e16d97909b233b1f6a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:42 +0100
Subject: [PATCH 1633/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Use legacy shim by default"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cd31752dc9bd8f47363846f4a8b96ff99365d755.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/Kconfig.nrfx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx
index 650404fceec..ae790980f42 100644
--- a/drivers/serial/Kconfig.nrfx
+++ b/drivers/serial/Kconfig.nrfx
@@ -31,6 +31,8 @@ config UART_NRFX_UARTE
 config UART_NRFX_UARTE_LEGACY_SHIM
 	bool "Legacy UARTE shim"
 	depends on UART_NRFX_UARTE
+	depends on !SOC_SERIES_NRF54HX || RISCV
+	depends on !SOC_SERIES_NRF92X || RISCV
 	default y
 
 config UART_NRFX_UARTE_ENHANCED_RX

From 656cc8fa5ada6a018b03fa9fb551c5587f867408 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:42 +0100
Subject: [PATCH 1634/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Improve RX FIFO flushing workaround"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cae16c3003aadc1915b374fdeb8ff4626d104393.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/Kconfig.nrfx      | 10 ++++
 drivers/serial/uart_nrfx_uarte.c | 88 ++++++++++++++++++++++++--------
 2 files changed, 76 insertions(+), 22 deletions(-)

diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx
index ae790980f42..6bd4b2d4591 100644
--- a/drivers/serial/Kconfig.nrfx
+++ b/drivers/serial/Kconfig.nrfx
@@ -57,6 +57,16 @@ config UART_ASYNC_TX_CACHE_SIZE
 	  in RAM, because EasyDMA in UARTE peripherals can only transfer data
 	  from RAM.
 
+config UART_NRFX_UARTE_RX_FLUSH_MAGIC_BYTE
+	hex "Byte used for RX FIFO flush workaround"
+	default 0xAA
+	range 0x00 0xFF
+	help
+	  Byte used to fill the buffer before RX FIFO is flushed into it. Due to the
+	  HW anomaly a workaround need to be applied which checks if content of the
+	  buffer changed. There are cases when specific value of the magic byte is
+	  used if it is known that certain bytes are less likely to occur.
+
 if HAS_HW_NRF_UART0 || HAS_HW_NRF_UARTE0
 nrfx_uart_num = 0
 rsource "Kconfig.nrfx_uart_instance"
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 6bc211a5351..b22c50af096 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -25,9 +25,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 
-#if !defined(CONFIG_ARCH_POSIX)
 #define RX_FLUSH_WORKAROUND 1
-#endif
 
 #define UARTE(idx)                DT_NODELABEL(uart##idx)
 #define UARTE_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(UARTE(idx), prop)
@@ -697,6 +695,9 @@ static void uarte_disable_locked(const struct device *dev, uint32_t dis_mask, ui
 
 	nrf_uarte_disable(get_uarte_instance(dev));
 }
+#endif
+
+#ifdef UARTE_ANY_ASYNC
 
 static void rx_timeout(struct k_timer *timer);
 static void tx_timeout(struct k_timer *timer);
@@ -1436,45 +1437,85 @@ static void endrx_isr(const struct device *dev)
 #endif
 }
 
-/** @brief RX FIFO flushing
+/* Function for flushing internal RX fifo. Function can be called in case
+ * flushed data is discarded or when data is valid and needs to be retrieved.
  *
- * Due to the HW bug which does not update RX.AMOUNT register when FIFO was empty
- * a workaround is applied which checks RXSTARTED event. If that event is set it
- * means that FIFO was not empty.
+ * However, UARTE does not update RXAMOUNT register if fifo is empty. Old value
+ * remains. In certain cases it makes it impossible to distinguish between
+ * case when fifo was empty and not. Function is trying to minimize chances of
+ * error with following measures:
+ * - RXAMOUNT is read before flushing and compared against value after flushing
+ *   if they differ it indicates that data was flushed
+ * - user buffer is dirtied and if RXAMOUNT did not changed it is checked if
+ *   it is still dirty. If not then it indicates that data was flushed
+ *
+ * In other cases function indicates that fifo was empty. It means that if
+ * number of bytes in the fifo equal last rx transfer length and data is equal
+ * to dirty marker it will be discarded.
  *
  * @param dev Device.
+ * @param buf Buffer for flushed data, null indicates that flushed data can be
+ *	      dropped but we still want to get amount of data flushed.
+ * @param len Buffer size, not used if @p buf is null.
  *
  * @return number of bytes flushed from the fifo.
  */
-static uint8_t rx_flush(const struct device *dev)
+
+static uint8_t rx_flush(const struct device *dev, uint8_t *buf)
 {
+	/* Flushing RX fifo requires buffer bigger than 4 bytes to empty fifo*/
+	static const uint8_t dirty = CONFIG_UART_NRFX_UARTE_RX_FLUSH_MAGIC_BYTE;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	const struct uarte_nrfx_config *config = dev->config;
+	uint32_t prev_rx_amount;
 	uint32_t rx_amount;
 
-	nrf_uarte_rx_buffer_set(uarte, config->rx_flush_buf, UARTE_HW_RX_FIFO_SIZE);
+	if (IS_ENABLED(RX_FLUSH_WORKAROUND)) {
+		memset(buf, dirty, UARTE_HW_RX_FIFO_SIZE);
+		if (IS_ENABLED(UARTE_ANY_CACHE) && (config->flags & UARTE_CFG_FLAG_CACHEABLE)) {
+			sys_cache_data_flush_range(buf, UARTE_HW_RX_FIFO_SIZE);
+		}
+		prev_rx_amount = nrf_uarte_rx_amount_get(uarte);
+	} else {
+		prev_rx_amount = 0;
+	}
+
+	nrf_uarte_rx_buffer_set(uarte, buf, UARTE_HW_RX_FIFO_SIZE);
+	/* Final part of handling RXTO event is in ENDRX interrupt
+	 * handler. ENDRX is generated as a result of FLUSHRX task.
+	 */
+	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
 	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_FLUSHRX);
 	while (!nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ENDRX)) {
 		/* empty */
 	}
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
+	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 
-	if (!IS_ENABLED(RX_FLUSH_WORKAROUND)) {
-		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
-		rx_amount = nrf_uarte_rx_amount_get(uarte);
-	} else if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXSTARTED)) {
-		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
-		rx_amount = nrf_uarte_rx_amount_get(uarte);
-	} else {
-		rx_amount = 0;
+	rx_amount = nrf_uarte_rx_amount_get(uarte);
+	if (!buf || !IS_ENABLED(RX_FLUSH_WORKAROUND)) {
+		return rx_amount;
+	}
+
+	if (rx_amount != prev_rx_amount) {
+		return rx_amount;
+	}
+
+	if (rx_amount > UARTE_HW_RX_FIFO_SIZE) {
+		return 0;
 	}
 
-	if (IS_ENABLED(UARTE_ANY_CACHE) && (config->flags & UARTE_CFG_FLAG_CACHEABLE) &&
-	    rx_amount) {
-		sys_cache_data_invd_range(config->rx_flush_buf, rx_amount);
+	if (IS_ENABLED(UARTE_ANY_CACHE) && (config->flags & UARTE_CFG_FLAG_CACHEABLE)) {
+		sys_cache_data_invd_range(buf, UARTE_HW_RX_FIFO_SIZE);
 	}
 
-	return rx_amount;
+	for (int i = 0; i < rx_amount; i++) {
+		if (buf[i] != dirty) {
+			return rx_amount;
+		}
+	}
+
+	return 0;
 }
 
 /* This handler is called when the receiver is stopped. If rx was aborted
@@ -1508,14 +1549,17 @@ static void rxto_isr(const struct device *dev)
 		async_rx->discard_fifo = false;
 #if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
 		if (HW_RX_COUNTING_ENABLED(config)) {
+			uint8_t buf[UARTE_HW_RX_FIFO_SIZE];
+
 			/* It need to be included because TIMER+PPI got RXDRDY events
 			 * and counted those flushed bytes.
 			 */
-			async_rx->total_user_byte_cnt += rx_flush(dev);
+			async_rx->total_user_byte_cnt += rx_flush(dev, buf);
+			(void)buf;
 		}
 #endif
 	} else {
-		async_rx->flush_cnt = rx_flush(dev);
+		async_rx->flush_cnt = rx_flush(dev, config->rx_flush_buf);
 	}
 
 #ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX

From 261b0dda328286b7ebbe86a7a5a2623c79271c1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:42 +0100
Subject: [PATCH 1635/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Add runtime PM"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7120fada0f6234519bb48c823c8ac5bd27676966.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/Kconfig.nrfx_uart_instance |   5 +-
 drivers/serial/uart_nrfx_uarte.c          | 463 ++++++++++------------
 2 files changed, 214 insertions(+), 254 deletions(-)

diff --git a/drivers/serial/Kconfig.nrfx_uart_instance b/drivers/serial/Kconfig.nrfx_uart_instance
index d44c1ab7e02..4ea1393a2c1 100644
--- a/drivers/serial/Kconfig.nrfx_uart_instance
+++ b/drivers/serial/Kconfig.nrfx_uart_instance
@@ -68,14 +68,11 @@ config UART_$(nrfx_uart_num)_NRF_ASYNC_LOW_POWER
 	depends on HAS_HW_NRF_UARTE$(nrfx_uart_num)
 	depends on UART_ASYNC_API
 	depends on UART_NRFX_UARTE_LEGACY_SHIM
-	default y if !PM_DEVICE
+	default y
 	help
 	  When enabled, UARTE is enabled before each TX or RX usage and disabled
 	  when not used. Disabling UARTE while in idle allows to achieve lowest
 	  power consumption. It is only feasible if receiver is not always on.
-	  This option is irrelevant when device power management (PM) is enabled
-	  because then device state is controlled by the PM actions.
-
 
 config UART_$(nrfx_uart_num)_NRF_HW_ASYNC_TIMER
 	int "Timer instance"
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index b22c50af096..efef52102c5 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -11,7 +11,6 @@
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/pm/device.h>
-#include <zephyr/pm/device_runtime.h>
 #include <hal/nrf_uarte.h>
 #include <nrfx_timer.h>
 #include <zephyr/sys/util.h>
@@ -99,12 +98,6 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #define UARTE_ANY_CACHE 1
 #endif
 
-#define IS_LOW_POWER(unused, prefix, i, _) IS_ENABLED(CONFIG_UART_##prefix##i##_NRF_ASYNC_LOW_POWER)
-
-#if UARTE_FOR_EACH_INSTANCE(IS_LOW_POWER, (||), (0))
-#define UARTE_ANY_LOW_POWER 1
-#endif
-
 #ifdef UARTE_ANY_CACHE
 /* uart120 instance does not retain BAUDRATE register when ENABLE=0. When this instance
  * is used then baudrate must be set after enabling the peripheral and not before.
@@ -218,7 +211,6 @@ struct uarte_nrfx_data {
 #define UARTE_FLAG_LOW_POWER_TX BIT(0)
 #define UARTE_FLAG_LOW_POWER_RX BIT(1)
 #define UARTE_FLAG_TRIG_RXTO BIT(2)
-#define UARTE_FLAG_POLL_OUT BIT(3)
 
 /* If enabled then ENDTX is PPI'ed to TXSTOP */
 #define UARTE_CFG_FLAG_PPI_ENDTX   BIT(0)
@@ -259,10 +251,6 @@ struct uarte_nrfx_data {
 	(baudrate) == 921600 ? NRF_UARTE_BAUDRATE_921600 :	\
 	(baudrate) == 1000000 ? NRF_UARTE_BAUDRATE_1000000 : 0)
 
-#define LOW_POWER_ENABLED(_config) \
-	(IS_ENABLED(UARTE_ANY_LOW_POWER) && \
-	 !IS_ENABLED(CONFIG_PM_DEVICE) && \
-	 (_config->flags & UARTE_CFG_FLAG_LOW_POWER))
 /**
  * @brief Structure for UARTE configuration.
  */
@@ -328,7 +316,6 @@ static void uarte_nrfx_isr_int(const void *arg)
 {
 	const struct device *dev = arg;
 	const struct uarte_nrfx_config *config = dev->config;
-	struct uarte_nrfx_data *data = dev->data;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
 	/* If interrupt driven and asynchronous APIs are disabled then UART
@@ -340,35 +327,34 @@ static void uarte_nrfx_isr_int(const void *arg)
 		endtx_isr(dev);
 	}
 
-	bool txstopped = nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_TXSTOPPED);
-
-	if (txstopped && (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || LOW_POWER_ENABLED(config))) {
+	if (config->flags & UARTE_CFG_FLAG_LOW_POWER) {
 		unsigned int key = irq_lock();
 
-		if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) &&
-		    (data->flags & UARTE_FLAG_POLL_OUT)) {
-			data->flags &= ~UARTE_FLAG_POLL_OUT;
-			pm_device_runtime_put(dev);
-		} else {
+		if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_TXSTOPPED)) {
 			nrf_uarte_disable(uarte);
 		}
 
 #ifdef UARTE_INTERRUPT_DRIVEN
+		struct uarte_nrfx_data *data = dev->data;
+
 		if (!data->int_driven || data->int_driven->fifo_fill_lock == 0)
 #endif
 		{
-			nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
+			nrf_uarte_int_disable(uarte,
+					      NRF_UARTE_INT_TXSTOPPED_MASK);
 		}
 
 		irq_unlock(key);
 	}
 
 #ifdef UARTE_INTERRUPT_DRIVEN
+	struct uarte_nrfx_data *data = dev->data;
+
 	if (!data->int_driven) {
 		return;
 	}
 
-	if (txstopped) {
+	if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_TXSTOPPED)) {
 		data->int_driven->fifo_fill_lock = 0;
 		if (data->int_driven->disable_tx_irq) {
 			nrf_uarte_int_disable(uarte,
@@ -567,6 +553,8 @@ static int wait_tx_ready(const struct device *dev)
 	return key;
 }
 
+#ifdef UARTE_ANY_ASYNC
+
 /* Using Macro instead of static inline function to handle NO_OPTIMIZATIONS case
  * where static inline fails on linking.
  */
@@ -574,22 +562,21 @@ static int wait_tx_ready(const struct device *dev)
 	(IS_ENABLED(UARTE_ANY_HW_ASYNC) ? \
 	 (config->flags & UARTE_CFG_FLAG_HW_BYTE_COUNTING) : false)
 
-static void uarte_periph_enable(const struct device *dev)
+#endif /* UARTE_ANY_ASYNC */
+
+static void uarte_enable(const struct device *dev, uint32_t act_mask, uint32_t sec_mask)
 {
-	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-	const struct uarte_nrfx_config *config = dev->config;
 	struct uarte_nrfx_data *data = dev->data;
 
-	(void)data;
-	nrf_uarte_enable(uarte);
-#if UARTE_BAUDRATE_RETENTION_WORKAROUND
-	nrf_uarte_baudrate_set(uarte,
-		COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,
-			(data->nrf_baudrate), (config->nrf_baudrate)));
-#endif
+	if (atomic_or(&data->flags, act_mask) & sec_mask) {
+		/* Second direction already enabled so UARTE is enabled. */
+		return;
+	}
 
 #ifdef UARTE_ANY_ASYNC
 	if (data->async) {
+		const struct uarte_nrfx_config *config = dev->config;
+
 		if (HW_RX_COUNTING_ENABLED(config)) {
 			const nrfx_timer_t *timer = &config->timer;
 
@@ -599,32 +586,16 @@ static void uarte_periph_enable(const struct device *dev)
 				nrfx_timer_increment(timer);
 			}
 		}
-		return;
 	}
 #endif
+	nrf_uarte_enable(get_uarte_instance(dev));
+#if UARTE_BAUDRATE_RETENTION_WORKAROUND
+	nrf_uarte_baudrate_t baudrate = COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,
+			(data->nrf_baudrate),
+			(((const struct uarte_nrfx_config *)dev->config)->nrf_baudrate));
 
-	if (IS_ENABLED(UARTE_ANY_NONE_ASYNC) && !config->disable_rx) {
-		nrf_uarte_rx_buffer_set(uarte, config->poll_in_byte, 1);
-		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
-		nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTRX);
-#if defined(UARTE_INTERRUPT_DRIVEN) && defined(CONFIG_PM_DEVICE)
-		if (data->int_driven && data->int_driven->rx_irq_enabled) {
-			nrf_uarte_int_enable(uarte, NRF_UARTE_INT_ENDRX_MASK);
-		}
+	nrf_uarte_baudrate_set(get_uarte_instance(dev), baudrate);
 #endif
-	}
-}
-
-static void uarte_enable(const struct device *dev, uint32_t act_mask, uint32_t sec_mask)
-{
-	struct uarte_nrfx_data *data = dev->data;
-
-	if (atomic_or(&data->flags, act_mask) & sec_mask) {
-		/* Second direction already enabled so UARTE is enabled. */
-		return;
-	}
-
-	uarte_periph_enable(dev);
 }
 
 /* At this point we should have irq locked and any previous transfer completed.
@@ -635,7 +606,7 @@ static void tx_start(const struct device *dev, const uint8_t *buf, size_t len)
 	const struct uarte_nrfx_config *config = dev->config;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
-#if defined(CONFIG_PM_DEVICE) && !defined(CONFIG_PM_DEVICE_RUNTIME)
+#ifdef CONFIG_PM_DEVICE
 	enum pm_device_state state;
 
 	(void)pm_device_state_get(dev, &state);
@@ -649,19 +620,18 @@ static void tx_start(const struct device *dev, const uint8_t *buf, size_t len)
 	}
 
 	nrf_uarte_tx_buffer_set(uarte, buf, len);
-	if (!IS_ENABLED(UARTE_HAS_ENDTX_STOPTX_SHORT)) {
-		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDTX);
-	}
+	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDTX);
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_TXSTOPPED);
 
-	if (LOW_POWER_ENABLED(config)) {
+	if (config->flags & UARTE_CFG_FLAG_LOW_POWER) {
 		uarte_enable(dev, UARTE_FLAG_LOW_POWER_TX, UARTE_FLAG_LOW_POWER_RX);
+		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
 	}
 
 	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTTX);
 }
 
-#if defined(UARTE_ANY_ASYNC)
+#if defined(UARTE_ANY_ASYNC) || defined(CONFIG_PM_DEVICE)
 /** @brief Disable UARTE peripheral is not used by RX or TX.
  *
  * It must be called with interrupts locked so that deciding if no direction is
@@ -682,7 +652,7 @@ static void uarte_disable_locked(const struct device *dev, uint32_t dis_mask, ui
 		return;
 	}
 
-#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
+#if defined(UARTE_ANY_ASYNC) && !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
 	const struct uarte_nrfx_config *config = dev->config;
 
 	if (data->async && HW_RX_COUNTING_ENABLED(config)) {
@@ -747,7 +717,7 @@ static int uarte_nrfx_rx_counting_init(const struct device *dev)
 }
 #endif /* !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX) */
 
-static int uarte_async_init(const struct device *dev)
+static int uarte_nrfx_init(const struct device *dev)
 {
 	struct uarte_nrfx_data *data = dev->data;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
@@ -768,6 +738,7 @@ static int uarte_async_init(const struct device *dev)
 #endif
 
 	nrf_uarte_int_enable(uarte, rx_int_mask);
+	nrf_uarte_enable(uarte);
 
 	k_timer_init(&data->async->rx.timer, rx_timeout, NULL);
 	k_timer_user_data_set(&data->async->rx.timer, (void *)dev);
@@ -783,7 +754,6 @@ static int uarte_async_init(const struct device *dev)
  */
 static void start_tx_locked(const struct device *dev, struct uarte_nrfx_data *data)
 {
-	nrf_uarte_int_enable(get_uarte_instance(dev), NRF_UARTE_INT_TXSTOPPED_MASK);
 	if (!is_tx_ready(dev)) {
 		/* Active poll out, postpone until it is completed. */
 		data->async->tx.pending = true;
@@ -847,6 +817,7 @@ static int uarte_nrfx_tx(const struct device *dev, const uint8_t *buf,
 
 	data->async->tx.len = len;
 	data->async->tx.buf = buf;
+	nrf_uarte_int_enable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
 
 	if (nrf_dma_accessible_check(uarte, buf)) {
 		data->async->tx.xfer_buf = buf;
@@ -856,10 +827,6 @@ static int uarte_nrfx_tx(const struct device *dev, const uint8_t *buf,
 		(void)setup_tx_cache(dev);
 	}
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_get(dev);
-	}
-
 	start_tx_locked(dev, data);
 
 	irq_unlock(key);
@@ -999,7 +966,7 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	async_rx->next_buf = NULL;
 	async_rx->next_buf_len = 0;
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || LOW_POWER_ENABLED(cfg)) {
+	if (cfg->flags & UARTE_CFG_FLAG_LOW_POWER) {
 		if (async_rx->flush_cnt) {
 			int cpy_len = MIN(len, async_rx->flush_cnt);
 
@@ -1051,10 +1018,7 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 
 	async_rx->enabled = true;
-
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_get(dev);
-	} else if (LOW_POWER_ENABLED(cfg)) {
+	if (cfg->flags & UARTE_CFG_FLAG_LOW_POWER) {
 		unsigned int key = irq_lock();
 
 		uarte_enable(dev, UARTE_FLAG_LOW_POWER_RX, UARTE_FLAG_LOW_POWER_TX);
@@ -1570,9 +1534,7 @@ static void rxto_isr(const struct device *dev)
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXDRDY);
 #endif
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_put(dev);
-	} else if (LOW_POWER_ENABLED(config)) {
+	if (config->flags & UARTE_CFG_FLAG_LOW_POWER) {
 		uint32_t key = irq_lock();
 
 		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_RX, UARTE_FLAG_LOW_POWER_TX);
@@ -1589,28 +1551,27 @@ static void txstopped_isr(const struct device *dev)
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	unsigned int key;
 
-	key = irq_lock();
-
-	size_t amount = (data->async->tx.amount >= 0) ?
-			data->async->tx.amount : nrf_uarte_tx_amount_get(uarte);
-
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
-		if (data->flags & UARTE_FLAG_POLL_OUT) {
-			pm_device_runtime_put(dev);
-			data->flags &= ~UARTE_FLAG_POLL_OUT;
-		}
-	} else if (LOW_POWER_ENABLED(config)) {
+	if (config->flags & UARTE_CFG_FLAG_LOW_POWER) {
 		nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
+		key = irq_lock();
 		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_TX, UARTE_FLAG_LOW_POWER_RX);
-	}
+		irq_unlock(key);
 
-	irq_unlock(key);
+		if (!data->async->tx.len) {
+			return;
+		}
+	}
 
 	if (!data->async->tx.buf) {
 		return;
 	}
 
+	key = irq_lock();
+	size_t amount = (data->async->tx.amount >= 0) ?
+			data->async->tx.amount : nrf_uarte_tx_amount_get(uarte);
+
+	irq_unlock(key);
+
 	/* If there is a pending tx request, it means that uart_tx()
 	 * was called when there was ongoing uart_poll_out. Handling
 	 * TXSTOPPED interrupt means that uart_poll_out has completed.
@@ -1660,10 +1621,6 @@ static void txstopped_isr(const struct device *dev)
 	data->async->tx.buf = NULL;
 	data->async->tx.len = 0;
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_put(dev);
-	}
-
 	user_callback(dev, &evt);
 }
 
@@ -1826,8 +1783,6 @@ static void uarte_nrfx_poll_out(const struct device *dev, unsigned char c)
 {
 	const struct uarte_nrfx_config *config = dev->config;
 	bool isr_mode = k_is_in_isr() || k_is_pre_kernel();
-	struct uarte_nrfx_data *data = dev->data;
-	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	unsigned int key;
 
 	if (isr_mode) {
@@ -1835,6 +1790,9 @@ static void uarte_nrfx_poll_out(const struct device *dev, unsigned char c)
 			key = irq_lock();
 			if (is_tx_ready(dev)) {
 #if UARTE_ANY_ASYNC
+				NRF_UARTE_Type *uarte = get_uarte_instance(dev);
+				struct uarte_nrfx_data *data = dev->data;
+
 				if (data->async && data->async->tx.len &&
 					data->async->tx.amount < 0) {
 					data->async->tx.amount = nrf_uarte_tx_amount_get(uarte);
@@ -1850,17 +1808,6 @@ static void uarte_nrfx_poll_out(const struct device *dev, unsigned char c)
 		key = wait_tx_ready(dev);
 	}
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		if (!(data->flags & UARTE_FLAG_POLL_OUT)) {
-			data->flags |= UARTE_FLAG_POLL_OUT;
-			pm_device_runtime_get(dev);
-		}
-	}
-
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || LOW_POWER_ENABLED(config)) {
-		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
-	}
-
 	*config->poll_out_byte = c;
 	tx_start(dev, config->poll_out_byte, 1);
 
@@ -2094,6 +2041,84 @@ static int endtx_stoptx_ppi_init(NRF_UARTE_Type *uarte,
 }
 #endif /* UARTE_ENHANCED_POLL_OUT */
 
+static int uarte_instance_init(const struct device *dev,
+			       uint8_t interrupts_active)
+{
+	int err;
+	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
+	const struct uarte_nrfx_config *cfg = dev->config;
+
+#if	defined(CONFIG_UART_USE_RUNTIME_CONFIGURE) || defined(UARTE_ENHANCED_POLL_OUT) || \
+	defined(UARTE_ANY_ASYNC)
+	struct uarte_nrfx_data *data = dev->data;
+#endif
+
+	nrf_uarte_disable(uarte);
+
+#ifdef CONFIG_ARCH_POSIX
+	/* For simulation the DT provided peripheral address needs to be corrected */
+	((struct pinctrl_dev_config *)cfg->pcfg)->reg = (uintptr_t)cfg->uarte_regs;
+#endif
+
+	err = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
+	if (err < 0) {
+		return err;
+	}
+
+#ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
+	err = uarte_nrfx_configure(dev, &data->uart_config);
+	if (err) {
+		return err;
+	}
+#else
+	nrf_uarte_baudrate_set(uarte, cfg->nrf_baudrate);
+	nrf_uarte_configure(uarte, &cfg->hw_config);
+#endif
+
+#ifdef UARTE_HAS_ENDTX_STOPTX_SHORT
+	nrf_uarte_shorts_enable(uarte, NRF_UARTE_SHORT_ENDTX_STOPTX);
+#elif defined(UARTE_ENHANCED_POLL_OUT)
+	if (cfg->flags & UARTE_CFG_FLAG_PPI_ENDTX) {
+		err = endtx_stoptx_ppi_init(uarte, data);
+		if (err < 0) {
+			return err;
+		}
+	}
+#endif
+#ifdef UARTE_ANY_ASYNC
+	if (data->async) {
+		err = uarte_nrfx_init(dev);
+		if (err < 0) {
+			return err;
+		}
+	} else
+#endif
+	{
+		/* Enable receiver and transmitter */
+		nrf_uarte_enable(uarte);
+
+		if (!cfg->disable_rx) {
+			nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
+
+			nrf_uarte_rx_buffer_set(uarte, cfg->poll_in_byte, 1);
+			nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTRX);
+		}
+	}
+
+	if (!IS_ENABLED(UARTE_HAS_ENDTX_STOPTX_SHORT) && !(cfg->flags & UARTE_CFG_FLAG_PPI_ENDTX)) {
+		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_ENDTX_MASK);
+	}
+
+	/* Set TXSTOPPED event by requesting fake (zero-length) transfer.
+	 * Pointer to RAM variable (data->tx_buffer) is set because otherwise
+	 * such operation may result in HardFault or RAM corruption.
+	 */
+	tx_start(dev, cfg->poll_out_byte, 0);
+
+	return 0;
+}
+
+#ifdef CONFIG_PM_DEVICE
 /** @brief Pend until TX is stopped.
  *
  * There are 2 configurations that must be handled:
@@ -2117,9 +2142,7 @@ static void wait_for_tx_stopped(const struct device *dev)
 		nrf_uarte_int_disable(uarte, NRF_UARTE_INT_ENDTX_MASK);
 		NRFX_WAIT_FOR(is_tx_ready(dev), 1000, 1, res);
 		if (!nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_TXSTOPPED)) {
-			if (!IS_ENABLED(UARTE_HAS_ENDTX_STOPTX_SHORT)) {
-				nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDTX);
-			}
+			nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDTX);
 			nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPTX);
 		}
 	}
@@ -2132,59 +2155,93 @@ static void wait_for_tx_stopped(const struct device *dev)
 	}
 }
 
-static void uarte_pm_resume(const struct device *dev)
+
+static int uarte_nrfx_pm_action(const struct device *dev,
+				enum pm_device_action action)
 {
+	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
+#if defined(UARTE_ANY_ASYNC) || defined(UARTE_INTERRUPT_DRIVEN)
+	struct uarte_nrfx_data *data = dev->data;
+#endif
 	const struct uarte_nrfx_config *cfg = dev->config;
+	int ret;
 
-	(void)pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
-
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || !LOW_POWER_ENABLED(cfg)) {
-		uarte_periph_enable(dev);
+#ifdef UARTE_ANY_ASYNC
+	/* If low power mode for asynchronous mode is used then there is nothing to do here.
+	 * In low power mode UARTE is turned off whenever there is no activity.
+	 */
+	if (data->async && (cfg->flags & UARTE_CFG_FLAG_LOW_POWER)) {
+		return 0;
 	}
-}
+#endif
 
-static void uarte_pm_suspend(const struct device *dev)
-{
-	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-	const struct uarte_nrfx_config *cfg = dev->config;
-	struct uarte_nrfx_data *data = dev->data;
+	switch (action) {
+	case PM_DEVICE_ACTION_RESUME:
+		ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
+		if (ret < 0) {
+			return ret;
+		}
+
+		nrf_uarte_enable(uarte);
+#if UARTE_BAUDRATE_RETENTION_WORKAROUND
+		nrf_uarte_baudrate_set(get_uarte_instance(dev),
+			COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,
+				(data->nrf_baudrate), (cfg->nrf_baudrate)));
+#endif
 
-	(void)data;
 #ifdef UARTE_ANY_ASYNC
-	if (data->async) {
-		/* Entering inactive state requires device to be no
-		 * active asynchronous calls.
-		 */
-		__ASSERT_NO_MSG(!data->async->rx.enabled);
-		__ASSERT_NO_MSG(!data->async->tx.len);
-		if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-			/* If runtime PM is enabled then reference counting ensures that
-			 * suspend will not occur when TX is active.
-			 */
-			__ASSERT_NO_MSG(nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_TXSTOPPED));
-		} else {
-			wait_for_tx_stopped(dev);
+		if (data->async) {
+			if (HW_RX_COUNTING_ENABLED(cfg)) {
+				nrfx_timer_enable(&cfg->timer);
+			}
+
+			return 0;
 		}
+#endif
+		if (!cfg->disable_rx) {
 
-#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
-		if (data->async && HW_RX_COUNTING_ENABLED(cfg)) {
-			nrfx_timer_disable(&cfg->timer);
-			/* Timer/counter value is reset when disabled. */
-			data->async->rx.total_byte_cnt = 0;
-			data->async->rx.total_user_byte_cnt = 0;
+			nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
+			nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTRX);
+#ifdef UARTE_INTERRUPT_DRIVEN
+			if (data->int_driven &&
+			    data->int_driven->rx_irq_enabled) {
+				nrf_uarte_int_enable(uarte,
+						     NRF_UARTE_INT_ENDRX_MASK);
+			}
+#endif
 		}
+		break;
+	case PM_DEVICE_ACTION_SUSPEND:
+		/* Disabling UART requires stopping RX, but stop RX event is
+		 * only sent after each RX if async UART API is used.
+		 */
+#ifdef UARTE_ANY_ASYNC
+		if (data->async) {
+			/* Entering inactive state requires device to be no
+			 * active asynchronous calls.
+			 */
+			__ASSERT_NO_MSG(!data->async->rx.enabled);
+			__ASSERT_NO_MSG(!data->async->tx.len);
+#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
+			if (data->async && HW_RX_COUNTING_ENABLED(cfg)) {
+				nrfx_timer_disable(&cfg->timer);
+				/* Timer/counter value is reset when disabled. */
+				data->async->rx.total_byte_cnt = 0;
+				data->async->rx.total_user_byte_cnt = 0;
+			}
 #endif
-	} else if (IS_ENABLED(UARTE_ANY_NONE_ASYNC))
+
+		}
 #endif
-	{
 		if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXSTARTED)) {
-#if defined(UARTE_INTERRUPT_DRIVEN) && defined(CONFIG_PM_DEVICE)
+#ifdef UARTE_INTERRUPT_DRIVEN
 			if (data->int_driven) {
 				data->int_driven->rx_irq_enabled =
-						nrf_uarte_int_enable_check(uarte,
-							NRF_UARTE_INT_ENDRX_MASK);
+					nrf_uarte_int_enable_check(uarte,
+						NRF_UARTE_INT_ENDRX_MASK);
 				if (data->int_driven->rx_irq_enabled) {
-					nrf_uarte_int_disable(uarte, NRF_UARTE_INT_ENDRX_MASK);
+					nrf_uarte_int_disable(uarte,
+						NRF_UARTE_INT_ENDRX_MASK);
 				}
 			}
 #endif
@@ -2200,114 +2257,21 @@ static void uarte_pm_suspend(const struct device *dev)
 		}
 
 		wait_for_tx_stopped(dev);
-	}
-
-	nrf_uarte_disable(uarte);
-
-	(void)pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_SLEEP);
-}
-
-static int uarte_nrfx_pm_action(const struct device *dev, enum pm_device_action action)
-{
-	if (action == PM_DEVICE_ACTION_RESUME) {
-		uarte_pm_resume(dev);
-	} else if (IS_ENABLED(CONFIG_PM_DEVICE) && (action == PM_DEVICE_ACTION_SUSPEND)) {
-		uarte_pm_suspend(dev);
-	} else {
-		return -ENOTSUP;
-	}
+		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_TX | UARTE_FLAG_LOW_POWER_RX, 0);
 
-	return 0;
-}
-
-static int uarte_tx_path_init(const struct device *dev)
-{
-	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-	const struct uarte_nrfx_config *cfg = dev->config;
-	bool auto_endtx = false;
-
-#ifdef UARTE_HAS_ENDTX_STOPTX_SHORT
-	nrf_uarte_shorts_enable(uarte, NRF_UARTE_SHORT_ENDTX_STOPTX);
-	auto_endtx = true;
-#elif defined(UARTE_ENHANCED_POLL_OUT)
-	if (cfg->flags & UARTE_CFG_FLAG_PPI_ENDTX) {
-		struct uarte_nrfx_data *data = dev->data;
-		int err;
-
-		err = endtx_stoptx_ppi_init(uarte, data);
-		if (err < 0) {
-			return err;
+		ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_SLEEP);
+		if (ret < 0) {
+			return ret;
 		}
-		auto_endtx = true;
-	}
-#endif
 
-	/* Get to the point where TXSTOPPED event is set but TXSTOPPED interrupt is
-	 * disabled. This trick is later on used to handle TX path and determine
-	 * using HW if TX is active (TXSTOPPED event set means TX is inactive).
-	 *
-	 * Set TXSTOPPED event by requesting fake (zero-length) transfer.
-	 * Pointer to RAM variable is set because otherwise such operation may
-	 * result in HardFault or RAM corruption.
-	 */
-	nrf_uarte_enable(uarte);
-	nrf_uarte_tx_buffer_set(uarte, cfg->poll_out_byte, 0);
-	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTTX);
-	if (!auto_endtx) {
-		while (!nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ENDTX)) {
-		}
-		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDTX);
-		nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPTX);
-		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_ENDTX_MASK);
-	}
-	while (!nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_TXSTOPPED)) {
+		break;
+	default:
+		return -ENOTSUP;
 	}
-	nrf_uarte_disable(uarte);
 
 	return 0;
 }
-
-static int uarte_instance_init(const struct device *dev,
-			       uint8_t interrupts_active)
-{
-	int err;
-	const struct uarte_nrfx_config *cfg = dev->config;
-
-	if (IS_ENABLED(CONFIG_ARCH_POSIX)) {
-		/* For simulation the DT provided peripheral address needs to be corrected */
-		((struct pinctrl_dev_config *)cfg->pcfg)->reg = (uintptr_t)cfg->uarte_regs;
-	}
-
-#ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
-	err = uarte_nrfx_configure(dev, &((struct uarte_nrfx_data *)dev->data)->uart_config);
-	if (err) {
-		return err;
-	}
-#else
-	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-
-	nrf_uarte_baudrate_set(uarte, cfg->nrf_baudrate);
-	nrf_uarte_configure(uarte, &cfg->hw_config);
-#endif
-
-#ifdef UARTE_ANY_ASYNC
-	struct uarte_nrfx_data *data = dev->data;
-
-	if (data->async) {
-		err = uarte_async_init(dev);
-		if (err < 0) {
-			return err;
-		}
-	}
-#endif
-
-	err = uarte_tx_path_init(dev);
-	if (err) {
-		return err;
-	}
-
-	return pm_device_driver_init(dev, uarte_nrfx_pm_action);
-}
+#endif /* CONFIG_PM_DEVICE */
 
 #define UARTE_IRQ_CONFIGURE(idx, isr_handler)				       \
 	do {								       \
@@ -2434,8 +2398,7 @@ static int uarte_instance_init(const struct device *dev,
 			IS_ENABLED(CONFIG_UART_##idx##_INTERRUPT_DRIVEN));     \
 	}								       \
 									       \
-	PM_DEVICE_DT_DEFINE(UARTE(idx), uarte_nrfx_pm_action,		       \
-			    PM_DEVICE_ISR_SAFE);			       \
+	PM_DEVICE_DT_DEFINE(UARTE(idx), uarte_nrfx_pm_action);		       \
 									       \
 	DEVICE_DT_DEFINE(UARTE(idx),					       \
 		      uarte_##idx##_init,				       \

From dac39e2776880d4e246d5b2fde79598fe4949e64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:42 +0100
Subject: [PATCH 1636/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Remove unused element from a structure"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 63ff46f256a861ed4478a8b3a6469003dd3fad13.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/uart_nrfx_uarte.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index efef52102c5..27a8b23e2c0 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -162,6 +162,7 @@ struct uarte_async_rx {
 	uint8_t flush_cnt;
 	volatile bool enabled;
 	volatile bool discard_fifo;
+	volatile bool aborted;
 };
 
 struct uarte_async_cb {

From 5b644f0ac391f2e3c2707d77e3d683024fec09d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:42 +0100
Subject: [PATCH 1637/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Add missing closing bracket"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 55b6fd92a20f9d998dfa20b14635d33ae48760d6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/uart_nrfx_uarte.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 27a8b23e2c0..d308bef4f13 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -2187,7 +2187,7 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 #if UARTE_BAUDRATE_RETENTION_WORKAROUND
 		nrf_uarte_baudrate_set(get_uarte_instance(dev),
 			COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,
-				(data->nrf_baudrate), (cfg->nrf_baudrate)));
+				(data->nrf_baudrate), (cfg->nrf_baudrate));
 #endif
 
 #ifdef UARTE_ANY_ASYNC

From d132a7ac578b5b9f48411bffc1ebef6fbfe42ed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:42 +0100
Subject: [PATCH 1638/2913] Revert "[nrf fromtree] tests: drivers: uart:
 uart_async_api: Add nrf54l15dk//cpuapp overlay"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 411d92965b2a8f83c6be367e12ac6754b9b1047c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index ed4a2de1891..00000000000
--- a/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,26 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-
-&pinctrl {
-	uart21_default_alt: uart21_default_alt {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 1, 10)>,
-				<NRF_PSEL(UART_RX, 1, 11)>;
-		};
-	};
-
-	uart21_sleep_alt: uart21_sleep_alt {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 1, 10)>,
-				<NRF_PSEL(UART_RX, 1, 11)>;
-			low-power-enable;
-		};
-	};
-};
-
-dut: &uart21 {
-	status = "okay";
-	pinctrl-0 = <&uart21_default_alt>;
-	pinctrl-1 = <&uart21_sleep_alt>;
-	pinctrl-names = "default", "sleep";
-	current-speed = <115200>;
-};

From 589376e3e6cf4fb06d63bed30b192d47fee27337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:42 +0100
Subject: [PATCH 1639/2913] Revert "[nrf fromtree] tests: drivers: uart:
 async_api: Use custom long buffer for nrf54h20"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 04f2415927a4db8daf9211ee72f889cf86248384.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpurad.conf   | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpurad.conf

diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpurad.conf
deleted file mode 100644
index 0eebd15e8a9..00000000000
--- a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpurad.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TEST_LONG_BUFFER_SIZE=128

From 29d09b3cf5f13af2ce0472d25ee8bf95171c8ce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:42 +0100
Subject: [PATCH 1640/2913] Revert "[nrf fromtree] tests: drivers: uart:
 async_api: Make long buffer configurable"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5995252e622a16c5a41191a0b1247f9ebc92aacc.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/drivers/uart/uart_async_api/Kconfig     |  4 --
 .../uart/uart_async_api/src/test_uart_async.c | 38 ++++++++-----------
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/tests/drivers/uart/uart_async_api/Kconfig b/tests/drivers/uart/uart_async_api/Kconfig
index b7ec969a5f5..6883eb23509 100644
--- a/tests/drivers/uart/uart_async_api/Kconfig
+++ b/tests/drivers/uart/uart_async_api/Kconfig
@@ -19,7 +19,3 @@ config DT_DEFINED_NOCACHE_NAME
 endif # DT_DEFINED_NOCACHE
 
 endif # DCACHE
-
-config TEST_LONG_BUFFER_SIZE
-	int "Long buffer size"
-	default 1024
diff --git a/tests/drivers/uart/uart_async_api/src/test_uart_async.c b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
index 2feb201d94c..15b4b6fba41 100644
--- a/tests/drivers/uart/uart_async_api/src/test_uart_async.c
+++ b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
@@ -850,17 +850,14 @@ ZTEST_USER(uart_async_chain_write, test_chained_write)
 		      "RX_DISABLED timeout");
 }
 
-#define RX_LONG_BUFFER CONFIG_TEST_LONG_BUFFER_SIZE
-#define TX_LONG_BUFFER (CONFIG_TEST_LONG_BUFFER_SIZE - 8)
-
 #if NOCACHE_MEM
-static __aligned(32) uint8_t long_rx_buf[RX_LONG_BUFFER] __used __NOCACHE;
-static __aligned(32) uint8_t long_rx_buf2[RX_LONG_BUFFER] __used __NOCACHE;
-static __aligned(32) uint8_t long_tx_buf[TX_LONG_BUFFER] __used __NOCACHE;
+static __aligned(32) uint8_t long_rx_buf[1024] __used __NOCACHE;
+static __aligned(32) uint8_t long_rx_buf2[1024] __used __NOCACHE;
+static __aligned(32) uint8_t long_tx_buf[1000] __used __NOCACHE;
 #else
-ZTEST_BMEM uint8_t long_rx_buf[RX_LONG_BUFFER];
-ZTEST_BMEM uint8_t long_rx_buf2[RX_LONG_BUFFER];
-ZTEST_BMEM uint8_t long_tx_buf[TX_LONG_BUFFER];
+ZTEST_BMEM uint8_t long_rx_buf[1024];
+ZTEST_BMEM uint8_t long_rx_buf2[1024];
+ZTEST_BMEM uint8_t long_tx_buf[1000];
 #endif /* NOCACHE_MEM */
 ZTEST_BMEM volatile uint8_t evt_num;
 ZTEST_BMEM size_t long_received[2];
@@ -890,7 +887,7 @@ static void test_long_buffers_callback(const struct device *dev,
 		k_sem_give(&rx_disabled);
 		break;
 	case UART_RX_BUF_REQUEST:
-		uart_rx_buf_rsp(dev, next_buffer, RX_LONG_BUFFER);
+		uart_rx_buf_rsp(dev, next_buffer, 1024);
 		next_buffer = (next_buffer == long_rx_buf2) ? long_rx_buf : long_rx_buf2;
 		break;
 	default:
@@ -909,19 +906,16 @@ static void *long_buffers_setup(void)
 
 ZTEST_USER(uart_async_long_buf, test_long_buffers)
 {
-	size_t tx_len1 = TX_LONG_BUFFER / 2;
-	size_t tx_len2 = TX_LONG_BUFFER;
-
 	memset(long_rx_buf, 0, sizeof(long_rx_buf));
 	memset(long_tx_buf, 1, sizeof(long_tx_buf));
 
 	uart_rx_enable(uart_dev, long_rx_buf, sizeof(long_rx_buf), 10 * USEC_PER_MSEC);
 
-	uart_tx(uart_dev, long_tx_buf, tx_len1, 200 * USEC_PER_MSEC);
+	uart_tx(uart_dev, long_tx_buf, 500, 200 * USEC_PER_MSEC);
 	zassert_equal(k_sem_take(&tx_done, K_MSEC(200)), 0, "TX_DONE timeout");
 	zassert_equal(k_sem_take(&rx_rdy, K_MSEC(200)), 0, "RX_RDY timeout");
-	zassert_equal(long_received[0], tx_len1, "Wrong number of bytes received.");
-	zassert_equal(memcmp(long_tx_buf, long_rx_buf, tx_len1),
+	zassert_equal(long_received[0], 500, "Wrong number of bytes received.");
+	zassert_equal(memcmp(long_tx_buf, long_rx_buf, 500),
 		      0,
 		      "Buffers not equal");
 	k_msleep(10);
@@ -929,21 +923,19 @@ ZTEST_USER(uart_async_long_buf, test_long_buffers)
 	bool release_on_timeout = k_sem_take(&rx_buf_released, K_NO_WAIT) == 0;
 
 	evt_num = 0;
-	uart_tx(uart_dev, long_tx_buf, tx_len2, 200 * USEC_PER_MSEC);
+	uart_tx(uart_dev, long_tx_buf, 1000, 200 * USEC_PER_MSEC);
 	zassert_equal(k_sem_take(&tx_done, K_MSEC(200)), 0, "TX_DONE timeout");
 	zassert_equal(k_sem_take(&rx_rdy, K_MSEC(200)), 0, "RX_RDY timeout");
 
 	if (release_on_timeout) {
-		zassert_equal(long_received[0], tx_len2, "Wrong number of bytes received.");
+		zassert_equal(long_received[0], 1000, "Wrong number of bytes received.");
 		zassert_equal(memcmp(long_tx_buf, long_rx_buf2, long_received[0]), 0,
 			      "Buffers not equal");
 	} else {
 		zassert_equal(k_sem_take(&rx_rdy, K_MSEC(200)), 0, "RX_RDY timeout");
-		zassert_equal(long_received[0], RX_LONG_BUFFER - tx_len1,
-				"Wrong number of bytes received.");
-		zassert_equal(long_received[1], tx_len2 - (RX_LONG_BUFFER - tx_len1),
-				"Wrong number of bytes received.");
-		zassert_equal(memcmp(long_tx_buf, long_rx_buf + tx_len1, long_received[0]), 0,
+		zassert_equal(long_received[0], 524, "Wrong number of bytes received.");
+		zassert_equal(long_received[1], 476, "Wrong number of bytes received.");
+		zassert_equal(memcmp(long_tx_buf, long_rx_buf + 500, long_received[0]), 0,
 			      "Buffers not equal");
 		zassert_equal(memcmp(long_tx_buf, long_rx_buf2, long_received[1]), 0,
 			      "Buffers not equal");

From 7098814f5f46ddab786e64c8f7e8face5355b6cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:42 +0100
Subject: [PATCH 1641/2913] Revert "[nrf fromtree] boards: native: nrf_bsim:
 Add include path to common"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 35ce7d76c8f42ec4b5ee496671af9ea747f53159.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/native/nrf_bsim/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/boards/native/nrf_bsim/CMakeLists.txt b/boards/native/nrf_bsim/CMakeLists.txt
index 244133c1bd6..6aeb3f01634 100644
--- a/boards/native/nrf_bsim/CMakeLists.txt
+++ b/boards/native/nrf_bsim/CMakeLists.txt
@@ -56,7 +56,6 @@ zephyr_include_directories(
   common
   common/cmsis
   ${NSI_DIR}/common/src/include
-  ${ZEPHYR_BASE}/soc/nordic/common
 )
 
 zephyr_library_include_directories(

From 2618db395a2c180320f409d55a696b1295fda092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:42 +0100
Subject: [PATCH 1642/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Add lock to uart_rx_disable"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f2e6cf4a9d03aedc97739777cb2604c4fafb378d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/uart_nrfx_uarte.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index d308bef4f13..51a4b365a96 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -1099,26 +1099,20 @@ static int uarte_nrfx_rx_disable(const struct device *dev)
 	struct uarte_nrfx_data *data = dev->data;
 	struct uarte_async_rx *async_rx = &data->async->rx;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-	int key;
 
 	if (async_rx->buf == NULL) {
 		return -EFAULT;
 	}
-
-	k_timer_stop(&async_rx->timer);
-
-	key = irq_lock();
-
 	if (async_rx->next_buf != NULL) {
 		nrf_uarte_shorts_disable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 	}
 
+	k_timer_stop(&async_rx->timer);
 	async_rx->enabled = false;
 	async_rx->discard_fifo = true;
 
 	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPRX);
-	irq_unlock(key);
 
 	return 0;
 }

From ae2cb1369259612cf6e979c3eca90ec5bf7d52c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:42 +0100
Subject: [PATCH 1643/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Add workaround for BAUDRATE register"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 88c2c5a29534836e20e9e3b73b71e0d62a5d13c9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/uart_nrfx_uarte.c | 34 ++------------------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 51a4b365a96..4043ab4a6ec 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -98,16 +98,6 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #define UARTE_ANY_CACHE 1
 #endif
 
-#ifdef UARTE_ANY_CACHE
-/* uart120 instance does not retain BAUDRATE register when ENABLE=0. When this instance
- * is used then baudrate must be set after enabling the peripheral and not before.
- * This approach works for all instances so can be generally applied when uart120 is used.
- * It is not default for all because it costs some resources. Since currently only uart120
- * needs cache, that is used to determine if workaround shall be applied.
- */
-#define UARTE_BAUDRATE_RETENTION_WORKAROUND 1
-#endif
-
 /*
  * RX timeout is divided into time slabs, this define tells how many divisions
  * should be made. More divisions - higher timeout accuracy and processor usage.
@@ -192,9 +182,6 @@ struct uarte_nrfx_int_driven {
 struct uarte_nrfx_data {
 #ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
 	struct uart_config uart_config;
-#ifdef UARTE_BAUDRATE_RETENTION_WORKAROUND
-	nrf_uarte_baudrate_t nrf_baudrate;
-#endif
 #endif
 #ifdef UARTE_INTERRUPT_DRIVEN
 	struct uarte_nrfx_int_driven *int_driven;
@@ -394,6 +381,7 @@ static int baudrate_set(const struct device *dev, uint32_t baudrate)
 	const struct uarte_nrfx_config *config = dev->config;
 	/* calculated baudrate divisor */
 	nrf_uarte_baudrate_t nrf_baudrate = NRF_BAUDRATE(baudrate);
+	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
 	if (nrf_baudrate == 0) {
 		return -EINVAL;
@@ -404,13 +392,7 @@ static int baudrate_set(const struct device *dev, uint32_t baudrate)
 		nrf_baudrate /= config->clock_freq / NRF_UARTE_BASE_FREQUENCY_16MHZ;
 	}
 
-#ifdef UARTE_BAUDRATE_RETENTION_WORKAROUND
-	struct uarte_nrfx_data *data = dev->data;
-
-	data->nrf_baudrate = nrf_baudrate;
-#else
-	nrf_uarte_baudrate_set(get_uarte_instance(dev), nrf_baudrate);
-#endif
+	nrf_uarte_baudrate_set(uarte, nrf_baudrate);
 
 	return 0;
 }
@@ -590,13 +572,6 @@ static void uarte_enable(const struct device *dev, uint32_t act_mask, uint32_t s
 	}
 #endif
 	nrf_uarte_enable(get_uarte_instance(dev));
-#if UARTE_BAUDRATE_RETENTION_WORKAROUND
-	nrf_uarte_baudrate_t baudrate = COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,
-			(data->nrf_baudrate),
-			(((const struct uarte_nrfx_config *)dev->config)->nrf_baudrate));
-
-	nrf_uarte_baudrate_set(get_uarte_instance(dev), baudrate);
-#endif
 }
 
 /* At this point we should have irq locked and any previous transfer completed.
@@ -2178,11 +2153,6 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		}
 
 		nrf_uarte_enable(uarte);
-#if UARTE_BAUDRATE_RETENTION_WORKAROUND
-		nrf_uarte_baudrate_set(get_uarte_instance(dev),
-			COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,
-				(data->nrf_baudrate), (cfg->nrf_baudrate));
-#endif
 
 #ifdef UARTE_ANY_ASYNC
 		if (data->async) {

From 4a55759897b54df343a05fafddeabafdd29fce2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:42 +0100
Subject: [PATCH 1644/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Improve RX FIFO flush workaround"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 884bf85382b48f7d45d6233979eb29306aca231e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/Kconfig.nrfx      | 10 ----------
 drivers/serial/uart_nrfx_uarte.c |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx
index 6bd4b2d4591..ae790980f42 100644
--- a/drivers/serial/Kconfig.nrfx
+++ b/drivers/serial/Kconfig.nrfx
@@ -57,16 +57,6 @@ config UART_ASYNC_TX_CACHE_SIZE
 	  in RAM, because EasyDMA in UARTE peripherals can only transfer data
 	  from RAM.
 
-config UART_NRFX_UARTE_RX_FLUSH_MAGIC_BYTE
-	hex "Byte used for RX FIFO flush workaround"
-	default 0xAA
-	range 0x00 0xFF
-	help
-	  Byte used to fill the buffer before RX FIFO is flushed into it. Due to the
-	  HW anomaly a workaround need to be applied which checks if content of the
-	  buffer changed. There are cases when specific value of the magic byte is
-	  used if it is known that certain bytes are less likely to occur.
-
 if HAS_HW_NRF_UART0 || HAS_HW_NRF_UARTE0
 nrfx_uart_num = 0
 rsource "Kconfig.nrfx_uart_instance"
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 4043ab4a6ec..3fc63bc28d7 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -1398,7 +1398,7 @@ static void endrx_isr(const struct device *dev)
 static uint8_t rx_flush(const struct device *dev, uint8_t *buf)
 {
 	/* Flushing RX fifo requires buffer bigger than 4 bytes to empty fifo*/
-	static const uint8_t dirty = CONFIG_UART_NRFX_UARTE_RX_FLUSH_MAGIC_BYTE;
+	static const uint8_t dirty = 0xAA;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	const struct uarte_nrfx_config *config = dev->config;
 	uint32_t prev_rx_amount;

From e0b1af8b56a564e459f252235f63058660b7c4c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:42 +0100
Subject: [PATCH 1645/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Add support for DMM and cache"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f576625466f8a0ddc93a1d101c39c9e30fc0a4ac.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/uart_nrfx_uarte.c | 126 +++----------------------------
 1 file changed, 11 insertions(+), 115 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 3fc63bc28d7..5c106011a57 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -15,9 +15,7 @@
 #include <nrfx_timer.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/kernel.h>
-#include <zephyr/cache.h>
 #include <soc.h>
-#include <dmm.h>
 #include <helpers/nrfx_gppi.h>
 #include <zephyr/linker/devicetree_regions.h>
 #include <zephyr/irq.h>
@@ -30,8 +28,6 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #define UARTE_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(UARTE(idx), prop)
 #define UARTE_PROP(idx, prop)     DT_PROP(UARTE(idx), prop)
 
-#define UARTE_IS_CACHEABLE(idx) DMM_IS_REG_CACHEABLE(DT_PHANDLE(UARTE(idx), memory_regions))
-
 /* Execute macro f(x) for all instances. */
 #define UARTE_FOR_EACH_INSTANCE(f, sep, off_code, ...)                                             \
 	NRFX_FOREACH_PRESENT(UARTE, f, sep, off_code, __VA_ARGS__)
@@ -92,12 +88,6 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #define UARTE_HAS_FRAME_TIMEOUT 1
 #endif
 
-#define INSTANCE_NEEDS_CACHE_MGMT(unused, prefix, i, prop) UARTE_IS_CACHEABLE(prefix##i)
-
-#if UARTE_FOR_EACH_INSTANCE(INSTANCE_NEEDS_CACHE_MGMT, (+), (0), _)
-#define UARTE_ANY_CACHE 1
-#endif
-
 /*
  * RX timeout is divided into time slabs, this define tells how many divisions
  * should be made. More divisions - higher timeout accuracy and processor usage.
@@ -122,10 +112,6 @@ struct uarte_async_tx {
 
 struct uarte_async_rx {
 	struct k_timer timer;
-#ifdef CONFIG_HAS_NORDIC_DMM
-	uint8_t *usr_buf;
-	uint8_t *next_usr_buf;
-#endif
 	uint8_t *buf;
 	size_t buf_len;
 	size_t offset;
@@ -211,9 +197,6 @@ struct uarte_nrfx_data {
  */
 #define UARTE_CFG_FLAG_LOW_POWER   BIT(2)
 
-/* If enabled then UARTE peripheral is using memory which is cacheable. */
-#define UARTE_CFG_FLAG_CACHEABLE BIT(3)
-
 /* Macro for converting numerical baudrate to register value. It is convenient
  * to use this approach because for constant input it can calculate nrf setting
  * at compile time.
@@ -247,9 +230,6 @@ struct uarte_nrfx_config {
 	uint32_t flags;
 	bool disable_rx;
 	const struct pinctrl_dev_config *pcfg;
-#ifdef CONFIG_HAS_NORDIC_DMM
-	void *mem_reg;
-#endif
 #ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
 	/* None-zero in case of high speed instances. Baudrate is adjusted by that ratio. */
 	uint32_t clock_freq;
@@ -591,10 +571,6 @@ static void tx_start(const struct device *dev, const uint8_t *buf, size_t len)
 	}
 #endif
 
-	if (IS_ENABLED(UARTE_ANY_CACHE) && (config->flags & UARTE_CFG_FLAG_CACHEABLE)) {
-		sys_cache_data_flush_range((void *)buf, len);
-	}
-
 	nrf_uarte_tx_buffer_set(uarte, buf, len);
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDTX);
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_TXSTOPPED);
@@ -901,19 +877,6 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 		return -EBUSY;
 	}
 
-#ifdef CONFIG_HAS_NORDIC_DMM
-	uint8_t *dma_buf;
-	int ret = 0;
-
-	ret = dmm_buffer_in_prepare(cfg->mem_reg, buf, len, (void **)&dma_buf);
-	if (ret < 0) {
-		return ret;
-	}
-
-	async_rx->usr_buf = buf;
-	buf = dma_buf;
-#endif
-
 #ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
 #ifdef UARTE_HAS_FRAME_TIMEOUT
 	if (timeout != SYS_FOREVER_US) {
@@ -946,18 +909,8 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 		if (async_rx->flush_cnt) {
 			int cpy_len = MIN(len, async_rx->flush_cnt);
 
-			if (IS_ENABLED(UARTE_ANY_CACHE) &&
-			    (cfg->flags & UARTE_CFG_FLAG_CACHEABLE)) {
-				sys_cache_data_invd_range(cfg->rx_flush_buf, cpy_len);
-			}
-
 			memcpy(buf, cfg->rx_flush_buf, cpy_len);
 
-			if (IS_ENABLED(UARTE_ANY_CACHE) &&
-			    (cfg->flags & UARTE_CFG_FLAG_CACHEABLE)) {
-				sys_cache_data_flush_range(buf, cpy_len);
-			}
-
 			buf += cpy_len;
 			len -= cpy_len;
 
@@ -968,11 +921,6 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 				async_rx->flush_cnt -= cpy_len;
 				memmove(cfg->rx_flush_buf, &cfg->rx_flush_buf[cpy_len],
 						async_rx->flush_cnt);
-				if (IS_ENABLED(UARTE_ANY_CACHE) &&
-				    (cfg->flags & UARTE_CFG_FLAG_CACHEABLE)) {
-					sys_cache_data_flush_range(cfg->rx_flush_buf,
-								   async_rx->flush_cnt);
-				}
 				atomic_or(&data->flags, UARTE_FLAG_TRIG_RXTO);
 				NRFX_IRQ_PENDING_SET(nrfx_get_irq_number(uarte));
 				return 0;
@@ -1018,17 +966,6 @@ static int uarte_nrfx_rx_buf_rsp(const struct device *dev, uint8_t *buf,
 	if (async_rx->buf == NULL) {
 		err = -EACCES;
 	} else if (async_rx->next_buf == NULL) {
-#ifdef CONFIG_HAS_NORDIC_DMM
-		uint8_t *dma_buf;
-		const struct uarte_nrfx_config *config = dev->config;
-
-		err = dmm_buffer_in_prepare(config->mem_reg, buf, len, (void **)&dma_buf);
-		if (err < 0) {
-			return err;
-		}
-		async_rx->next_usr_buf = buf;
-		buf = dma_buf;
-#endif
 		async_rx->next_buf = buf;
 		async_rx->next_buf_len = len;
 		nrf_uarte_rx_buffer_set(uarte, buf, len);
@@ -1298,15 +1235,6 @@ static void endrx_isr(const struct device *dev)
 	 */
 	const int rx_amount = nrf_uarte_rx_amount_get(uarte) + async_rx->flush_cnt;
 
-#ifdef CONFIG_HAS_NORDIC_DMM
-	const struct uarte_nrfx_config *config = dev->config;
-	int err =
-		dmm_buffer_in_release(config->mem_reg, async_rx->usr_buf, rx_amount, async_rx->buf);
-
-	(void)err;
-	__ASSERT_NO_MSG(err == 0);
-	async_rx->buf = async_rx->usr_buf;
-#endif
 	async_rx->flush_cnt = 0;
 
 	/* The 'rx_offset' can be bigger than 'rx_amount', so it the length
@@ -1334,9 +1262,6 @@ static void endrx_isr(const struct device *dev)
 	rx_buf_release(dev, async_rx->buf);
 	async_rx->buf = async_rx->next_buf;
 	async_rx->buf_len = async_rx->next_buf_len;
-#ifdef CONFIG_HAS_NORDIC_DMM
-	async_rx->usr_buf = async_rx->next_usr_buf;
-#endif
 	async_rx->next_buf = NULL;
 	async_rx->next_buf_len = 0;
 	async_rx->offset = 0;
@@ -1400,15 +1325,11 @@ static uint8_t rx_flush(const struct device *dev, uint8_t *buf)
 	/* Flushing RX fifo requires buffer bigger than 4 bytes to empty fifo*/
 	static const uint8_t dirty = 0xAA;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-	const struct uarte_nrfx_config *config = dev->config;
 	uint32_t prev_rx_amount;
 	uint32_t rx_amount;
 
 	if (IS_ENABLED(RX_FLUSH_WORKAROUND)) {
 		memset(buf, dirty, UARTE_HW_RX_FIFO_SIZE);
-		if (IS_ENABLED(UARTE_ANY_CACHE) && (config->flags & UARTE_CFG_FLAG_CACHEABLE)) {
-			sys_cache_data_flush_range(buf, UARTE_HW_RX_FIFO_SIZE);
-		}
 		prev_rx_amount = nrf_uarte_rx_amount_get(uarte);
 	} else {
 		prev_rx_amount = 0;
@@ -1439,10 +1360,6 @@ static uint8_t rx_flush(const struct device *dev, uint8_t *buf)
 		return 0;
 	}
 
-	if (IS_ENABLED(UARTE_ANY_CACHE) && (config->flags & UARTE_CFG_FLAG_CACHEABLE)) {
-		sys_cache_data_invd_range(buf, UARTE_HW_RX_FIFO_SIZE);
-	}
-
 	for (int i = 0; i < rx_amount; i++) {
 		if (buf[i] != dirty) {
 			return rx_amount;
@@ -1462,10 +1379,6 @@ static void rxto_isr(const struct device *dev)
 	struct uarte_async_rx *async_rx = &data->async->rx;
 
 	if (async_rx->buf) {
-#ifdef CONFIG_HAS_NORDIC_DMM
-		(void)dmm_buffer_in_release(config->mem_reg, async_rx->usr_buf, 0, async_rx->buf);
-		async_rx->buf = async_rx->usr_buf;
-#endif
 		rx_buf_release(dev, async_rx->buf);
 		async_rx->buf = NULL;
 	}
@@ -1685,16 +1598,6 @@ static void uarte_nrfx_isr_async(const void *arg)
 	}
 
 	if (atomic_and(&data->flags, ~UARTE_FLAG_TRIG_RXTO) & UARTE_FLAG_TRIG_RXTO) {
-#ifdef CONFIG_HAS_NORDIC_DMM
-		int ret;
-
-		ret = dmm_buffer_in_release(config->mem_reg, async_rx->usr_buf, async_rx->buf_len,
-					    async_rx->buf);
-
-		(void)ret;
-		__ASSERT_NO_MSG(ret == 0);
-		async_rx->buf = async_rx->usr_buf;
-#endif
 		notify_uart_rx_rdy(dev, async_rx->buf_len);
 		rx_buf_release(dev, async_rx->buf);
 		async_rx->buf_len = 0;
@@ -1730,10 +1633,6 @@ static int uarte_nrfx_poll_in(const struct device *dev, unsigned char *c)
 		return -1;
 	}
 
-	if (IS_ENABLED(UARTE_ANY_CACHE) && (config->flags & UARTE_CFG_FLAG_CACHEABLE)) {
-		sys_cache_data_invd_range(config->poll_in_byte, 1);
-	}
-
 	*c = *config->poll_in_byte;
 
 	/* clear the interrupt */
@@ -1828,10 +1727,6 @@ static int uarte_nrfx_fifo_read(const struct device *dev,
 		/* Clear the interrupt */
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
 
-		if (IS_ENABLED(UARTE_ANY_CACHE) && (config->flags & UARTE_CFG_FLAG_CACHEABLE)) {
-			sys_cache_data_invd_range(config->poll_in_byte, 1);
-		}
-
 		/* Receive a character */
 		rx_data[num_rx++] = *config->poll_in_byte;
 
@@ -2305,12 +2200,12 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 	IF_ENABLED(CONFIG_UART_##idx##_ASYNC, (				       \
 		static uint8_t						       \
 			uarte##idx##_tx_cache[CONFIG_UART_ASYNC_TX_CACHE_SIZE] \
-			DMM_MEMORY_SECTION(UARTE(idx));			       \
+			UARTE_MEMORY_SECTION(idx);			       \
 		static uint8_t uarte##idx##_flush_buf[UARTE_HW_RX_FIFO_SIZE]   \
-			DMM_MEMORY_SECTION(UARTE(idx));			       \
+			UARTE_MEMORY_SECTION(idx);			       \
 		struct uarte_async_cb uarte##idx##_async;))		       \
-	static uint8_t uarte##idx##_poll_out_byte DMM_MEMORY_SECTION(UARTE(idx));\
-	static uint8_t uarte##idx##_poll_in_byte DMM_MEMORY_SECTION(UARTE(idx)); \
+	static uint8_t uarte##idx##_poll_out_byte UARTE_MEMORY_SECTION(idx);   \
+	static uint8_t uarte##idx##_poll_in_byte UARTE_MEMORY_SECTION(idx);    \
 	static struct uarte_nrfx_data uarte_##idx##_data = {		       \
 		IF_ENABLED(CONFIG_UART_USE_RUNTIME_CONFIGURE,		       \
 				(.uart_config = UARTE_CONFIG(idx),))	       \
@@ -2332,16 +2227,11 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		     .hw_config = UARTE_NRF_CONFIG(idx),))		       \
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(UARTE(idx)),		       \
 		.uarte_regs = _CONCAT(NRF_UARTE, idx),                         \
-		IF_ENABLED(CONFIG_HAS_NORDIC_DMM,			       \
-				(.mem_reg = DMM_DEV_TO_REG(UARTE(idx)),))      \
 		.flags =						       \
 			(IS_ENABLED(CONFIG_UART_##idx##_ENHANCED_POLL_OUT) ?   \
 				UARTE_CFG_FLAG_PPI_ENDTX : 0) |		       \
 			(IS_ENABLED(CONFIG_UART_##idx##_NRF_HW_ASYNC) ?        \
 				UARTE_CFG_FLAG_HW_BYTE_COUNTING : 0) |	       \
-			(!IS_ENABLED(CONFIG_HAS_NORDIC_DMM) ? 0 :	       \
-			  (UARTE_IS_CACHEABLE(idx) ?			       \
-				UARTE_CFG_FLAG_CACHEABLE : 0)) |	       \
 			USE_LOW_POWER(idx),				       \
 		UARTE_DISABLE_RX_INIT(UARTE(idx)),			       \
 		.poll_out_byte = &uarte##idx##_poll_out_byte,		       \
@@ -2379,13 +2269,19 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		(static uint8_t uarte##idx##_tx_buffer			       \
 			[MIN(CONFIG_UART_##idx##_NRF_TX_BUFFER_SIZE,	       \
 			     BIT_MASK(UARTE##idx##_EASYDMA_MAXCNT_SIZE))]      \
-			DMM_MEMORY_SECTION(UARTE(idx));			       \
+			UARTE_MEMORY_SECTION(idx);			       \
 		 static struct uarte_nrfx_int_driven			       \
 			uarte##idx##_int_driven = {			       \
 				.tx_buffer = uarte##idx##_tx_buffer,	       \
 				.tx_buff_size = sizeof(uarte##idx##_tx_buffer),\
 			};))
 
+#define UARTE_MEMORY_SECTION(idx)					       \
+	COND_CODE_1(UARTE_HAS_PROP(idx, memory_regions),		       \
+		(__attribute__((__section__(LINKER_DT_NODE_REGION_NAME(	       \
+			DT_PHANDLE(UARTE(idx), memory_regions)))))),	       \
+		())
+
 #define COND_UART_NRF_UARTE_DEVICE(unused, prefix, i, _) \
 	IF_ENABLED(CONFIG_HAS_HW_NRF_UARTE##prefix##i, (UART_NRF_UARTE_DEVICE(prefix##i);))
 

From 676af7016c20fc928e2f642627f5dc944a5d6dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:42 +0100
Subject: [PATCH 1646/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Add support for frame timeout"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d7cb52ca9e408f27a51dab8c356c3408d035b3e8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/Kconfig.nrfx      |  2 +
 drivers/serial/uart_nrfx_uarte.c | 67 ++++----------------------------
 2 files changed, 10 insertions(+), 59 deletions(-)

diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx
index ae790980f42..16f667eaa50 100644
--- a/drivers/serial/Kconfig.nrfx
+++ b/drivers/serial/Kconfig.nrfx
@@ -31,8 +31,10 @@ config UART_NRFX_UARTE
 config UART_NRFX_UARTE_LEGACY_SHIM
 	bool "Legacy UARTE shim"
 	depends on UART_NRFX_UARTE
+	depends on !SOC_SERIES_NRF54LX
 	depends on !SOC_SERIES_NRF54HX || RISCV
 	depends on !SOC_SERIES_NRF92X || RISCV
+	# New shim takes more ROM. Until it is fixed use legacy shim.
 	default y
 
 config UART_NRFX_UARTE_ENHANCED_RX
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 5c106011a57..6708143b704 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -83,11 +83,6 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #define UARTE_HAS_ENDTX_STOPTX_SHORT 1
 #endif
 
-#if	(UARTE_FOR_EACH_INSTANCE(INSTANCE_PROP, (+), (0), frame_timeout_supported)) == \
-	(UARTE_FOR_EACH_INSTANCE(INSTANCE_PRESENT, (+), (0), frame_timeout_supported))
-#define UARTE_HAS_FRAME_TIMEOUT 1
-#endif
-
 /*
  * RX timeout is divided into time slabs, this define tells how many divisions
  * should be made. More divisions - higher timeout accuracy and processor usage.
@@ -118,9 +113,7 @@ struct uarte_async_rx {
 	uint8_t *next_buf;
 	size_t next_buf_len;
 #ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
-#if !defined(UARTE_HAS_FRAME_TIMEOUT)
 	uint32_t idle_cnt;
-#endif
 	k_timeout_t timeout;
 #else
 	uint32_t total_byte_cnt; /* Total number of bytes received */
@@ -234,9 +227,6 @@ struct uarte_nrfx_config {
 	/* None-zero in case of high speed instances. Baudrate is adjusted by that ratio. */
 	uint32_t clock_freq;
 #else
-#ifdef UARTE_HAS_FRAME_TIMEOUT
-	uint32_t baudrate;
-#endif
 	nrf_uarte_baudrate_t nrf_baudrate;
 	nrf_uarte_config_t hw_config;
 #endif /* CONFIG_UART_USE_RUNTIME_CONFIGURE */
@@ -383,6 +373,10 @@ static int uarte_nrfx_configure(const struct device *dev,
 	struct uarte_nrfx_data *data = dev->data;
 	nrf_uarte_config_t uarte_cfg;
 
+#if NRF_UARTE_HAS_FRAME_TIMEOUT
+	uarte_cfg.frame_timeout = NRF_UARTE_FRAME_TIMEOUT_DIS;
+#endif
+
 #if defined(UARTE_CONFIG_STOP_Msk)
 	switch (cfg->stop_bits) {
 	case UART_CFG_STOP_BITS_1:
@@ -439,9 +433,6 @@ static int uarte_nrfx_configure(const struct device *dev,
 		return -ENOTSUP;
 	}
 
-#ifdef UARTE_HAS_FRAME_TIMEOUT
-	uarte_cfg.frame_timeout = NRF_UARTE_FRAME_TIMEOUT_EN;
-#endif
 	nrf_uarte_configure(get_uarte_instance(dev), &uarte_cfg);
 
 	data->uart_config = *cfg;
@@ -678,8 +669,7 @@ static int uarte_nrfx_init(const struct device *dev)
 		NRF_UARTE_INT_RXSTARTED_MASK |
 		NRF_UARTE_INT_ERROR_MASK |
 		NRF_UARTE_INT_RXTO_MASK |
-		((IS_ENABLED(CONFIG_UART_NRFX_UARTE_ENHANCED_RX) &&
-		  !IS_ENABLED(UARTE_HAS_FRAME_TIMEOUT)) ? NRF_UARTE_INT_RXDRDY_MASK : 0);
+		(IS_ENABLED(CONFIG_UART_NRFX_UARTE_ENHANCED_RX) ? NRF_UARTE_INT_RXDRDY_MASK : 0);
 
 #if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
 	int ret = uarte_nrfx_rx_counting_init(dev);
@@ -846,15 +836,6 @@ static void notify_rx_disable(const struct device *dev)
 	user_callback(dev, (struct uart_event *)&evt);
 }
 
-#ifdef UARTE_HAS_FRAME_TIMEOUT
-static uint32_t us_to_bauds(uint32_t baudrate, int32_t timeout)
-{
-	uint64_t bauds = (uint64_t)baudrate * timeout / 1000000;
-
-	return MIN((uint32_t)bauds, UARTE_FRAMETIMEOUT_COUNTERTOP_Msk);
-}
-#endif
-
 static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 				size_t len,
 				int32_t timeout)
@@ -878,22 +859,9 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	}
 
 #ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
-#ifdef UARTE_HAS_FRAME_TIMEOUT
-	if (timeout != SYS_FOREVER_US) {
-		uint32_t baudrate = COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,
-			(data->uart_config.baudrate), (cfg->baudrate));
-
-		async_rx->timeout = K_USEC(timeout);
-		nrf_uarte_frame_timeout_set(uarte, us_to_bauds(baudrate, timeout));
-		nrf_uarte_shorts_enable(uarte, NRF_UARTE_SHORT_FRAME_TIMEOUT_STOPRX);
-	} else {
-		async_rx->timeout = K_NO_WAIT;
-	}
-#else
 	async_rx->timeout = (timeout == SYS_FOREVER_US) ?
 		K_NO_WAIT : K_USEC(timeout / RX_TIMEOUT_DIV);
 	async_rx->idle_cnt = 0;
-#endif /* UARTE_HAS_FRAME_TIMEOUT */
 #else
 	async_rx->timeout_us = timeout;
 	async_rx->timeout_slab = timeout / RX_TIMEOUT_DIV;
@@ -1050,12 +1018,6 @@ static void rx_timeout(struct k_timer *timer)
 #if  CONFIG_UART_NRFX_UARTE_ENHANCED_RX
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
-#ifdef UARTE_HAS_FRAME_TIMEOUT
-	if (!nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXDRDY)) {
-		nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPRX);
-	}
-	return;
-#else /* UARTE_HAS_FRAME_TIMEOUT */
 	struct uarte_nrfx_data *data = dev->data;
 	struct uarte_async_rx *async_rx = &data->async->rx;
 
@@ -1079,7 +1041,6 @@ static void rx_timeout(struct k_timer *timer)
 	}
 
 	k_timer_start(&async_rx->timer, async_rx->timeout, K_NO_WAIT);
-#endif /* UARTE_HAS_FRAME_TIMEOUT */
 #else /* CONFIG_UART_NRFX_UARTE_ENHANCED_RX */
 	const struct uarte_nrfx_config *cfg = dev->config;
 	struct uarte_nrfx_data *data = dev->data;
@@ -1193,7 +1154,6 @@ static void rxstarted_isr(const struct device *dev)
 		.type = UART_RX_BUF_REQUEST,
 	};
 
-#ifndef UARTE_HAS_FRAME_TIMEOUT
 	struct uarte_nrfx_data *data = dev->data;
 	struct uarte_async_rx *async_rx = &data->async->rx;
 
@@ -1211,7 +1171,6 @@ static void rxstarted_isr(const struct device *dev)
 		k_timer_start(&async_rx->timer, timeout, timeout);
 	}
 #endif /* CONFIG_UART_NRFX_UARTE_ENHANCED_RX */
-#endif /* !UARTE_HAS_FRAME_TIMEOUT */
 	user_callback(dev, &evt);
 }
 
@@ -1411,9 +1370,7 @@ static void rxto_isr(const struct device *dev)
 
 #ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-#ifdef UARTE_HAS_FRAME_TIMEOUT
-	nrf_uarte_shorts_disable(uarte, NRF_UARTE_SHORT_FRAME_TIMEOUT_STOPRX);
-#endif
+
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXDRDY);
 #endif
 
@@ -1509,9 +1466,6 @@ static void txstopped_isr(const struct device *dev)
 
 static void rxdrdy_isr(const struct device *dev)
 {
-#if !defined(UARTE_HAS_FRAME_TIMEOUT)
-	struct uarte_nrfx_data *data = dev->data;
-
 #if defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
@@ -1521,7 +1475,6 @@ static void rxdrdy_isr(const struct device *dev)
 #else
 	data->async->rx.cnt.cnt++;
 #endif
-#endif /* !UARTE_HAS_FRAME_TIMEOUT */
 }
 
 static bool event_check_clear(NRF_UARTE_Type *uarte, nrf_uarte_event_t event,
@@ -1544,7 +1497,7 @@ static void uarte_nrfx_isr_async(const void *arg)
 	struct uarte_async_rx *async_rx = &data->async->rx;
 	uint32_t imask = nrf_uarte_int_enable_check(uarte, UINT32_MAX);
 
-	if (!(HW_RX_COUNTING_ENABLED(config) || IS_ENABLED(UARTE_HAS_FRAME_TIMEOUT))
+	if (!HW_RX_COUNTING_ENABLED(config)
 	    && event_check_clear(uarte, NRF_UARTE_EVENT_RXDRDY, NRF_UARTE_INT_RXDRDY_MASK, imask)) {
 		rxdrdy_isr(dev);
 
@@ -2176,8 +2129,6 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		IF_ENABLED(UARTE_HAS_STOP_CONFIG, (.stop = NRF_UARTE_STOP_ONE,))\
 		IF_ENABLED(UARTE_ODD_PARITY_ALLOWED,				\
 			(.paritytype = NRF_UARTE_PARITYTYPE_EVEN,))		\
-		IF_ENABLED(UARTE_HAS_FRAME_TIMEOUT,				\
-			(.frame_timeout = NRF_UARTE_FRAME_TIMEOUT_EN,))		\
 	}
 
 /* Macro for setting zephyr specific configuration structures. */
@@ -2221,9 +2172,7 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,		       \
 		    (IF_ENABLED(DT_CLOCKS_HAS_IDX(UARTE(idx), 0),	       \
 			   (.clock_freq = UARTE_GET_FREQ(idx),))),	       \
-		    (IF_ENABLED(UARTE_HAS_FRAME_TIMEOUT,		       \
-			(.baudrate = UARTE_PROP(idx, current_speed),))	       \
-		     .nrf_baudrate = UARTE_GET_BAUDRATE(idx),		       \
+		     (.nrf_baudrate = UARTE_GET_BAUDRATE(idx),		       \
 		     .hw_config = UARTE_NRF_CONFIG(idx),))		       \
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(UARTE(idx)),		       \
 		.uarte_regs = _CONCAT(NRF_UARTE, idx),                         \

From 6b61d7d0b3ad2ef6c2d5eca6b2b1a606211a4612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:42 +0100
Subject: [PATCH 1647/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Rework driver to support new features"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cca947e77d9a3d2744974e3386ee78bca045a1a9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/Kconfig.nrfx               |  12 -
 drivers/serial/Kconfig.nrfx_uart_instance |   1 -
 drivers/serial/uart_nrfx_uarte.c          | 575 ++++++++--------------
 3 files changed, 219 insertions(+), 369 deletions(-)

diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx
index 16f667eaa50..daf185cd7e8 100644
--- a/drivers/serial/Kconfig.nrfx
+++ b/drivers/serial/Kconfig.nrfx
@@ -37,18 +37,6 @@ config UART_NRFX_UARTE_LEGACY_SHIM
 	# New shim takes more ROM. Until it is fixed use legacy shim.
 	default y
 
-config UART_NRFX_UARTE_ENHANCED_RX
-	bool "Enhanced RX handling"
-	depends on UART_ASYNC_API
-	depends on UART_NRFX_UARTE_LEGACY_SHIM
-	default y if !(UART_0_NRF_HW_ASYNC || UART_1_NRF_HW_ASYNC || UART_2_NRF_HW_ASYNC)
-	help
-	  Enable RX handling mode which is switching buffers on timeout. This is an
-	  enhancement compared to other two modes (default and hardware assisted).
-	  Default mode could miscount bytes when interrupt was not handled on time
-	  and hardware assisted required TIMER peripheral instance and PPI channel
-	  for accurate byte counting.
-
 config UART_ASYNC_TX_CACHE_SIZE
 	int "TX cache buffer size"
 	depends on UART_ASYNC_API
diff --git a/drivers/serial/Kconfig.nrfx_uart_instance b/drivers/serial/Kconfig.nrfx_uart_instance
index 4ea1393a2c1..ed4c011da51 100644
--- a/drivers/serial/Kconfig.nrfx_uart_instance
+++ b/drivers/serial/Kconfig.nrfx_uart_instance
@@ -68,7 +68,6 @@ config UART_$(nrfx_uart_num)_NRF_ASYNC_LOW_POWER
 	depends on HAS_HW_NRF_UARTE$(nrfx_uart_num)
 	depends on UART_ASYNC_API
 	depends on UART_NRFX_UARTE_LEGACY_SHIM
-	default y
 	help
 	  When enabled, UARTE is enabled before each TX or RX usage and disabled
 	  when not used. Disabling UARTE while in idle allows to achieve lowest
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 6708143b704..bb473fa6e65 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -9,7 +9,6 @@
  */
 
 #include <zephyr/drivers/uart.h>
-#include <zephyr/drivers/pinctrl.h>
 #include <zephyr/pm/device.h>
 #include <hal/nrf_uarte.h>
 #include <nrfx_timer.h>
@@ -19,10 +18,11 @@
 #include <helpers/nrfx_gppi.h>
 #include <zephyr/linker/devicetree_regions.h>
 #include <zephyr/irq.h>
+
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 
-#define RX_FLUSH_WORKAROUND 1
+#include <zephyr/drivers/pinctrl.h>
 
 #define UARTE(idx)                DT_NODELABEL(uart##idx)
 #define UARTE_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(UARTE(idx), prop)
@@ -63,7 +63,7 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #define IS_HW_ASYNC(unused, prefix, i, _) IS_ENABLED(CONFIG_UART_##prefix##i##_NRF_HW_ASYNC)
 
 #if UARTE_FOR_EACH_INSTANCE(IS_HW_ASYNC, (||), (0))
-#define UARTE_ANY_HW_ASYNC 1
+#define UARTE_HW_ASYNC 1
 #endif
 
 /* Determine if any instance is using enhanced poll_out feature. */
@@ -112,13 +112,9 @@ struct uarte_async_rx {
 	size_t offset;
 	uint8_t *next_buf;
 	size_t next_buf_len;
-#ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
-	uint32_t idle_cnt;
-	k_timeout_t timeout;
-#else
 	uint32_t total_byte_cnt; /* Total number of bytes received */
 	uint32_t total_user_byte_cnt; /* Total number of bytes passed to user */
-	int32_t timeout_us; /* Timeout set by user */
+	int32_t timeout; /* Timeout set by user */
 	int32_t timeout_slab; /* rx_timeout divided by RX_TIMEOUT_DIV */
 	int32_t timeout_left; /* Current time left until user callback */
 	union {
@@ -127,7 +123,7 @@ struct uarte_async_rx {
 	} cnt;
 	/* Flag to ensure that RX timeout won't be executed during ENDRX ISR */
 	volatile bool is_in_irq;
-#endif /* CONFIG_UART_NRFX_UARTE_ENHANCED_RX */
+	uint8_t flush_buffer[UARTE_HW_RX_FIFO_SIZE];
 	uint8_t flush_cnt;
 	volatile bool enabled;
 	volatile bool discard_fifo;
@@ -137,9 +133,11 @@ struct uarte_async_rx {
 struct uarte_async_cb {
 	uart_callback_t user_callback;
 	void *user_data;
+	atomic_t low_power_mask;
 	struct uarte_async_rx rx;
 	struct uarte_async_tx tx;
 };
+
 #endif /* UARTE_ANY_ASYNC */
 
 #ifdef UARTE_INTERRUPT_DRIVEN
@@ -159,6 +157,7 @@ struct uarte_nrfx_int_driven {
 
 /* Device data structure */
 struct uarte_nrfx_data {
+	const struct device *dev;
 #ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
 	struct uart_config uart_config;
 #endif
@@ -169,15 +168,13 @@ struct uarte_nrfx_data {
 	struct uarte_async_cb *async;
 #endif
 	atomic_val_t poll_out_lock;
-	atomic_t flags;
-#ifdef UARTE_ENHANCED_POLL_OUT
+	uint8_t *char_out;
+	uint8_t *rx_data;
 	uint8_t ppi_ch_endtx;
-#endif
 };
 
-#define UARTE_FLAG_LOW_POWER_TX BIT(0)
-#define UARTE_FLAG_LOW_POWER_RX BIT(1)
-#define UARTE_FLAG_TRIG_RXTO BIT(2)
+#define UARTE_LOW_POWER_TX BIT(0)
+#define UARTE_LOW_POWER_RX BIT(1)
 
 /* If enabled then ENDTX is PPI'ed to TXSTOP */
 #define UARTE_CFG_FLAG_PPI_ENDTX   BIT(0)
@@ -220,24 +217,18 @@ struct uarte_nrfx_data {
  */
 struct uarte_nrfx_config {
 	NRF_UARTE_Type *uarte_regs; /* Instance address */
+	uint32_t clock_freq;
 	uint32_t flags;
 	bool disable_rx;
 	const struct pinctrl_dev_config *pcfg;
-#ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
-	/* None-zero in case of high speed instances. Baudrate is adjusted by that ratio. */
-	uint32_t clock_freq;
-#else
-	nrf_uarte_baudrate_t nrf_baudrate;
+#ifndef CONFIG_UART_USE_RUNTIME_CONFIGURE
+	nrf_uarte_baudrate_t baudrate;
 	nrf_uarte_config_t hw_config;
-#endif /* CONFIG_UART_USE_RUNTIME_CONFIGURE */
-
+#endif
 #ifdef UARTE_ANY_ASYNC
 	nrfx_timer_t timer;
 	uint8_t *tx_cache;
-	uint8_t *rx_flush_buf;
 #endif
-	uint8_t *poll_out_byte;
-	uint8_t *poll_in_byte;
 };
 
 static inline NRF_UARTE_Type *get_uarte_instance(const struct device *dev)
@@ -512,26 +503,28 @@ static int wait_tx_ready(const struct device *dev)
 /* Using Macro instead of static inline function to handle NO_OPTIMIZATIONS case
  * where static inline fails on linking.
  */
-#define HW_RX_COUNTING_ENABLED(config)    \
-	(IS_ENABLED(UARTE_ANY_HW_ASYNC) ? \
-	 (config->flags & UARTE_CFG_FLAG_HW_BYTE_COUNTING) : false)
+#define HW_RX_COUNTING_ENABLED(config) \
+	(IS_ENABLED(UARTE_HW_ASYNC) ? (config->flags & UARTE_CFG_FLAG_HW_BYTE_COUNTING) : false)
 
 #endif /* UARTE_ANY_ASYNC */
 
-static void uarte_enable(const struct device *dev, uint32_t act_mask, uint32_t sec_mask)
+static int uarte_enable(const struct device *dev, uint32_t mask)
 {
+#ifdef UARTE_ANY_ASYNC
+	const struct uarte_nrfx_config *config = dev->config;
 	struct uarte_nrfx_data *data = dev->data;
 
-	if (atomic_or(&data->flags, act_mask) & sec_mask) {
-		/* Second direction already enabled so UARTE is enabled. */
-		return;
-	}
-
-#ifdef UARTE_ANY_ASYNC
 	if (data->async) {
-		const struct uarte_nrfx_config *config = dev->config;
+		bool disabled = data->async->low_power_mask == 0;
+		int ret;
 
-		if (HW_RX_COUNTING_ENABLED(config)) {
+		data->async->low_power_mask |= mask;
+		ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+		if (ret < 0) {
+			return ret;
+		}
+
+		if (HW_RX_COUNTING_ENABLED(config) && disabled) {
 			const nrfx_timer_t *timer = &config->timer;
 
 			nrfx_timer_enable(timer);
@@ -543,6 +536,8 @@ static void uarte_enable(const struct device *dev, uint32_t act_mask, uint32_t s
 	}
 #endif
 	nrf_uarte_enable(get_uarte_instance(dev));
+
+	return 0;
 }
 
 /* At this point we should have irq locked and any previous transfer completed.
@@ -561,13 +556,12 @@ static void tx_start(const struct device *dev, const uint8_t *buf, size_t len)
 		return;
 	}
 #endif
-
 	nrf_uarte_tx_buffer_set(uarte, buf, len);
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDTX);
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_TXSTOPPED);
 
 	if (config->flags & UARTE_CFG_FLAG_LOW_POWER) {
-		uarte_enable(dev, UARTE_FLAG_LOW_POWER_TX, UARTE_FLAG_LOW_POWER_RX);
+		(void)uarte_enable(dev, UARTE_LOW_POWER_TX);
 		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
 	}
 
@@ -575,28 +569,11 @@ static void tx_start(const struct device *dev, const uint8_t *buf, size_t len)
 }
 
 #if defined(UARTE_ANY_ASYNC) || defined(CONFIG_PM_DEVICE)
-/** @brief Disable UARTE peripheral is not used by RX or TX.
- *
- * It must be called with interrupts locked so that deciding if no direction is
- * using the UARTE is atomically performed with UARTE peripheral disabling. Otherwise
- * it would be possible that after clearing flags we get preempted and UARTE is
- * enabled from the higher priority context and when we come back UARTE is disabled
- * here.
- * @param dev Device.
- * @param dis_mask Mask of direction (RX or TX) which now longer uses the UARTE instance.
- * @param sec_mask Mask of second direction which is used to check if it uses the UARTE.
- */
-static void uarte_disable_locked(const struct device *dev, uint32_t dis_mask, uint32_t sec_mask)
+static void uart_disable(const struct device *dev)
 {
-	struct uarte_nrfx_data *data = dev->data;
-
-	data->flags &= ~dis_mask;
-	if (data->flags & sec_mask) {
-		return;
-	}
-
-#if defined(UARTE_ANY_ASYNC) && !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
+#ifdef UARTE_ANY_ASYNC
 	const struct uarte_nrfx_config *config = dev->config;
+	struct uarte_nrfx_data *data = dev->data;
 
 	if (data->async && HW_RX_COUNTING_ENABLED(config)) {
 		nrfx_timer_disable(&config->timer);
@@ -612,12 +589,10 @@ static void uarte_disable_locked(const struct device *dev, uint32_t dis_mask, ui
 
 #ifdef UARTE_ANY_ASYNC
 
+static void timer_handler(nrf_timer_event_t event_type, void *p_context) { }
 static void rx_timeout(struct k_timer *timer);
 static void tx_timeout(struct k_timer *timer);
 
-#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
-static void timer_handler(nrf_timer_event_t event_type, void *p_context) { }
-
 static int uarte_nrfx_rx_counting_init(const struct device *dev)
 {
 	struct uarte_nrfx_data *data = dev->data;
@@ -640,6 +615,7 @@ static int uarte_nrfx_rx_counting_init(const struct device *dev)
 			LOG_ERR("Timer already initialized");
 			return -EINVAL;
 		} else {
+			nrfx_timer_enable(&cfg->timer);
 			nrfx_timer_clear(&cfg->timer);
 		}
 
@@ -658,34 +634,30 @@ static int uarte_nrfx_rx_counting_init(const struct device *dev)
 
 	return 0;
 }
-#endif /* !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX) */
 
 static int uarte_nrfx_init(const struct device *dev)
 {
 	struct uarte_nrfx_data *data = dev->data;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-	static const uint32_t rx_int_mask =
-		NRF_UARTE_INT_ENDRX_MASK |
-		NRF_UARTE_INT_RXSTARTED_MASK |
-		NRF_UARTE_INT_ERROR_MASK |
-		NRF_UARTE_INT_RXTO_MASK |
-		(IS_ENABLED(CONFIG_UART_NRFX_UARTE_ENHANCED_RX) ? NRF_UARTE_INT_RXDRDY_MASK : 0);
-
-#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
+
 	int ret = uarte_nrfx_rx_counting_init(dev);
 
 	if (ret != 0) {
 		return ret;
 	}
-#endif
 
-	nrf_uarte_int_enable(uarte, rx_int_mask);
+	data->async->low_power_mask = UARTE_LOW_POWER_TX;
+	nrf_uarte_int_enable(uarte,
+			     NRF_UARTE_INT_ENDRX_MASK |
+			     NRF_UARTE_INT_RXSTARTED_MASK |
+			     NRF_UARTE_INT_ERROR_MASK |
+			     NRF_UARTE_INT_RXTO_MASK);
 	nrf_uarte_enable(uarte);
 
 	k_timer_init(&data->async->rx.timer, rx_timeout, NULL);
-	k_timer_user_data_set(&data->async->rx.timer, (void *)dev);
+	k_timer_user_data_set(&data->async->rx.timer, data);
 	k_timer_init(&data->async->tx.timer, tx_timeout, NULL);
-	k_timer_user_data_set(&data->async->tx.timer, (void *)dev);
+	k_timer_user_data_set(&data->async->tx.timer, data);
 
 	return 0;
 }
@@ -761,7 +733,7 @@ static int uarte_nrfx_tx(const struct device *dev, const uint8_t *buf,
 	data->async->tx.buf = buf;
 	nrf_uarte_int_enable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
 
-	if (nrf_dma_accessible_check(uarte, buf)) {
+	if (nrfx_is_in_ram(buf)) {
 		data->async->tx.xfer_buf = buf;
 		data->async->tx.xfer_len = len;
 	} else {
@@ -817,14 +789,17 @@ static void notify_uart_rx_rdy(const struct device *dev, size_t len)
 	user_callback(dev, &evt);
 }
 
-static void rx_buf_release(const struct device *dev, uint8_t *buf)
+static void rx_buf_release(const struct device *dev, uint8_t **buf)
 {
-	struct uart_event evt = {
-		.type = UART_RX_BUF_RELEASED,
-		.data.rx_buf.buf = buf,
-	};
+	if (*buf) {
+		struct uart_event evt = {
+			.type = UART_RX_BUF_RELEASED,
+			.data.rx_buf.buf = *buf,
+		};
 
-	user_callback(dev, &evt);
+		user_callback(dev, &evt);
+		*buf = NULL;
+	}
 }
 
 static void notify_rx_disable(const struct device *dev)
@@ -844,6 +819,7 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	struct uarte_async_rx *async_rx = &data->async->rx;
 	const struct uarte_nrfx_config *cfg = dev->config;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
+	int ret = 0;
 
 	if (cfg->disable_rx) {
 		__ASSERT(false, "TX only UARTE instance");
@@ -858,14 +834,8 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 		return -EBUSY;
 	}
 
-#ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
-	async_rx->timeout = (timeout == SYS_FOREVER_US) ?
-		K_NO_WAIT : K_USEC(timeout / RX_TIMEOUT_DIV);
-	async_rx->idle_cnt = 0;
-#else
-	async_rx->timeout_us = timeout;
+	async_rx->timeout = timeout;
 	async_rx->timeout_slab = timeout / RX_TIMEOUT_DIV;
-#endif
 
 	async_rx->buf = buf;
 	async_rx->buf_len = len;
@@ -877,29 +847,19 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 		if (async_rx->flush_cnt) {
 			int cpy_len = MIN(len, async_rx->flush_cnt);
 
-			memcpy(buf, cfg->rx_flush_buf, cpy_len);
-
+			memcpy(buf, async_rx->flush_buffer, cpy_len);
 			buf += cpy_len;
 			len -= cpy_len;
 
-			/* If flush content filled whole new buffer trigger interrupt
-			 * to notify about received data and disabled RX from there.
+			/* If flush content filled whole new buffer complete the
+			 * request and indicate rx being disabled.
 			 */
 			if (!len) {
 				async_rx->flush_cnt -= cpy_len;
-				memmove(cfg->rx_flush_buf, &cfg->rx_flush_buf[cpy_len],
-						async_rx->flush_cnt);
-				atomic_or(&data->flags, UARTE_FLAG_TRIG_RXTO);
-				NRFX_IRQ_PENDING_SET(nrfx_get_irq_number(uarte));
+				notify_uart_rx_rdy(dev, cpy_len);
+				rx_buf_release(dev, &async_rx->buf);
+				notify_rx_disable(dev);
 				return 0;
-			} else {
-#ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
-				if (!K_TIMEOUT_EQ(async_rx->timeout, K_NO_WAIT)) {
-					nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXDRDY);
-					k_timer_start(&async_rx->timer, async_rx->timeout,
-							K_NO_WAIT);
-				}
-#endif
 			}
 		}
 	}
@@ -913,7 +873,7 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	if (cfg->flags & UARTE_CFG_FLAG_LOW_POWER) {
 		unsigned int key = irq_lock();
 
-		uarte_enable(dev, UARTE_FLAG_LOW_POWER_RX, UARTE_FLAG_LOW_POWER_TX);
+		ret = uarte_enable(dev, UARTE_LOW_POWER_RX);
 		irq_unlock(key);
 	}
 
@@ -937,17 +897,7 @@ static int uarte_nrfx_rx_buf_rsp(const struct device *dev, uint8_t *buf,
 		async_rx->next_buf = buf;
 		async_rx->next_buf_len = len;
 		nrf_uarte_rx_buffer_set(uarte, buf, len);
-		/* If buffer is shorter than RX FIFO then there is a risk that due
-		 * to interrupt handling latency ENDRX event is not handled on time
-		 * and due to ENDRX_STARTRX short data will start to be overwritten.
-		 * In that case short is not enabled and ENDRX event handler will
-		 * manually start RX for that buffer. Thanks to RX FIFO there is
-		 * 5 byte time for doing that. If interrupt latency is higher and
-		 * there is no HWFC in both cases data will be lost or corrupted.
-		 */
-		if (len >= UARTE_HW_RX_FIFO_SIZE) {
-			nrf_uarte_shorts_enable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
-		}
+		nrf_uarte_shorts_enable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
 		err = 0;
 	} else {
 		err = -EBUSY;
@@ -999,8 +949,8 @@ static int uarte_nrfx_rx_disable(const struct device *dev)
 
 static void tx_timeout(struct k_timer *timer)
 {
-	const struct device *dev = k_timer_user_data_get(timer);
-	(void) uarte_nrfx_tx_abort(dev);
+	struct uarte_nrfx_data *data = k_timer_user_data_get(timer);
+	(void) uarte_nrfx_tx_abort(data->dev);
 }
 
 /**
@@ -1013,38 +963,10 @@ static void tx_timeout(struct k_timer *timer)
  */
 static void rx_timeout(struct k_timer *timer)
 {
-	const struct device *dev = k_timer_user_data_get(timer);
-
-#if  CONFIG_UART_NRFX_UARTE_ENHANCED_RX
-	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-
-	struct uarte_nrfx_data *data = dev->data;
+	struct uarte_nrfx_data *data = k_timer_user_data_get(timer);
 	struct uarte_async_rx *async_rx = &data->async->rx;
-
-	if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXDRDY)) {
-		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXDRDY);
-		async_rx->idle_cnt = 0;
-	} else {
-		async_rx->idle_cnt++;
-		/* We compare against RX_TIMEOUT_DIV - 1 to get rather earlier timeout
-		 * than late. idle_cnt is reset when last RX activity (RXDRDY event) is
-		 * detected. It may happen that it happens when RX is inactive for whole
-		 * RX timeout period (and it is the case when transmission is short compared
-		 * to the timeout, for example timeout is 50 ms and transmission of few bytes
-		 * takes less than 1ms). In that case if we compare against RX_TIMEOUT_DIV
-		 * then RX notification would come after (RX_TIMEOUT_DIV + 1) * timeout.
-		 */
-		if (async_rx->idle_cnt == (RX_TIMEOUT_DIV - 1)) {
-			nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPRX);
-			return;
-		}
-	}
-
-	k_timer_start(&async_rx->timer, async_rx->timeout, K_NO_WAIT);
-#else /* CONFIG_UART_NRFX_UARTE_ENHANCED_RX */
+	const struct device *dev = data->dev;
 	const struct uarte_nrfx_config *cfg = dev->config;
-	struct uarte_nrfx_data *data = dev->data;
-	struct uarte_async_rx *async_rx = &data->async->rx;
 	uint32_t read;
 
 	if (async_rx->is_in_irq) {
@@ -1066,7 +988,7 @@ static void rx_timeout(struct k_timer *timer)
 	/* Check if data was received since last function call */
 	if (read != async_rx->total_byte_cnt) {
 		async_rx->total_byte_cnt = read;
-		async_rx->timeout_left = async_rx->timeout_us;
+		async_rx->timeout_left = async_rx->timeout;
 	}
 
 	/* Check if there is data that was not sent to user yet
@@ -1121,7 +1043,7 @@ static void rx_timeout(struct k_timer *timer)
 
 	nrf_uarte_int_enable(get_uarte_instance(dev),
 			     NRF_UARTE_INT_ENDRX_MASK);
-#endif /* CONFIG_UART_NRFX_UARTE_ENHANCED_RX */
+
 }
 
 #define UARTE_ERROR_FROM_MASK(mask)					\
@@ -1134,44 +1056,28 @@ static void rx_timeout(struct k_timer *timer)
 static void error_isr(const struct device *dev)
 {
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-	uint32_t err = nrf_uarte_errorsrc_get(uarte);
+	uint32_t err = nrf_uarte_errorsrc_get_and_clear(uarte);
 	struct uart_event evt = {
 		.type = UART_RX_STOPPED,
 		.data.rx_stop.reason = UARTE_ERROR_FROM_MASK(err),
 	};
-
-	/* For VPR cores read and write may be reordered - barrier needed. */
-	nrf_barrier_r();
-	nrf_uarte_errorsrc_clear(uarte, err);
-
 	user_callback(dev, &evt);
 	(void) uarte_nrfx_rx_disable(dev);
 }
 
 static void rxstarted_isr(const struct device *dev)
 {
+	struct uarte_nrfx_data *data = dev->data;
 	struct uart_event evt = {
 		.type = UART_RX_BUF_REQUEST,
 	};
-
-	struct uarte_nrfx_data *data = dev->data;
-	struct uarte_async_rx *async_rx = &data->async->rx;
-
-#ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
-	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-
-	if (!K_TIMEOUT_EQ(async_rx->timeout, K_NO_WAIT)) {
-		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_RXDRDY_MASK);
-	}
-#else
-	if (async_rx->timeout_us != SYS_FOREVER_US) {
-		k_timeout_t timeout = K_USEC(async_rx->timeout_slab);
-
-		async_rx->timeout_left = async_rx->timeout_us;
-		k_timer_start(&async_rx->timer, timeout, timeout);
-	}
-#endif /* CONFIG_UART_NRFX_UARTE_ENHANCED_RX */
 	user_callback(dev, &evt);
+	if (data->async->rx.timeout != SYS_FOREVER_US) {
+		data->async->rx.timeout_left = data->async->rx.timeout;
+		k_timer_start(&data->async->rx.timer,
+			      K_USEC(data->async->rx.timeout_slab),
+			      K_USEC(data->async->rx.timeout_slab));
+	}
 }
 
 static void endrx_isr(const struct device *dev)
@@ -1180,9 +1086,7 @@ static void endrx_isr(const struct device *dev)
 	struct uarte_async_rx *async_rx = &data->async->rx;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
-#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
 	async_rx->is_in_irq = true;
-#endif
 
 	/* ensure rx timer is stopped - it will be restarted in RXSTARTED
 	 * handler if needed
@@ -1192,7 +1096,8 @@ static void endrx_isr(const struct device *dev)
 	/* this is the amount that the EasyDMA controller has copied into the
 	 * buffer
 	 */
-	const int rx_amount = nrf_uarte_rx_amount_get(uarte) + async_rx->flush_cnt;
+	const int rx_amount = nrf_uarte_rx_amount_get(uarte) +
+				async_rx->flush_cnt;
 
 	async_rx->flush_cnt = 0;
 
@@ -1209,50 +1114,50 @@ static void endrx_isr(const struct device *dev)
 		rx_len = 0;
 	}
 
-#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
 	async_rx->total_user_byte_cnt += rx_len;
-#endif
 
 	/* Only send the RX_RDY event if there is something to send */
 	if (rx_len > 0) {
 		notify_uart_rx_rdy(dev, rx_len);
 	}
 
-	rx_buf_release(dev, async_rx->buf);
-	async_rx->buf = async_rx->next_buf;
-	async_rx->buf_len = async_rx->next_buf_len;
-	async_rx->next_buf = NULL;
-	async_rx->next_buf_len = 0;
-	async_rx->offset = 0;
+	if (!async_rx->enabled) {
+		async_rx->is_in_irq = false;
+		return;
+	}
 
-	if (async_rx->enabled) {
-		/* If there is a next buffer, then STARTRX will have already been
-		 * invoked by the short (the next buffer will be filling up already)
-		 * and here we just do the swap of which buffer the driver is following,
-		 * the next rx_timeout() will update the rx_offset.
-		 */
-		unsigned int key = irq_lock();
+	rx_buf_release(dev, &async_rx->buf);
 
-		if (async_rx->buf) {
-			/* Check is based on assumption that ISR handler handles
-			 * ENDRX before RXSTARTED so if short was set on time, RXSTARTED
-			 * event will be set.
-			 */
-			if (!nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXSTARTED)) {
-				nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTRX);
-			}
-			/* Remove the short until the subsequent next buffer is setup */
-			nrf_uarte_shorts_disable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
-		} else {
-			nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPRX);
-		}
+	/* If there is a next buffer, then STARTRX will have already been
+	 * invoked by the short (the next buffer will be filling up already)
+	 * and here we just do the swap of which buffer the driver is following,
+	 * the next rx_timeout() will update the rx_offset.
+	 */
+	unsigned int key = irq_lock();
 
-		irq_unlock(key);
+	if (async_rx->next_buf) {
+		async_rx->buf = async_rx->next_buf;
+		async_rx->buf_len = async_rx->next_buf_len;
+		async_rx->next_buf = NULL;
+		async_rx->next_buf_len = 0;
+
+		async_rx->offset = 0;
+		/* Check is based on assumption that ISR handler handles
+		 * ENDRX before RXSTARTED so if short was set on time, RXSTARTED
+		 * event will be set.
+		 */
+		if (!nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXSTARTED)) {
+			nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTRX);
+		}
+		/* Remove the short until the subsequent next buffer is setup */
+		nrf_uarte_shorts_disable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
+	} else {
+		nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPRX);
 	}
 
-#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
+	irq_unlock(key);
+
 	async_rx->is_in_irq = false;
-#endif
 }
 
 /* Function for flushing internal RX fifo. Function can be called in case
@@ -1278,23 +1183,26 @@ static void endrx_isr(const struct device *dev)
  *
  * @return number of bytes flushed from the fifo.
  */
-
-static uint8_t rx_flush(const struct device *dev, uint8_t *buf)
+static uint8_t rx_flush(const struct device *dev, uint8_t *buf, uint32_t len)
 {
 	/* Flushing RX fifo requires buffer bigger than 4 bytes to empty fifo*/
-	static const uint8_t dirty = 0xAA;
+	static const uint8_t dirty;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-	uint32_t prev_rx_amount;
-	uint32_t rx_amount;
-
-	if (IS_ENABLED(RX_FLUSH_WORKAROUND)) {
-		memset(buf, dirty, UARTE_HW_RX_FIFO_SIZE);
-		prev_rx_amount = nrf_uarte_rx_amount_get(uarte);
+	uint32_t prev_rx_amount = nrf_uarte_rx_amount_get(uarte);
+	uint8_t tmp_buf[UARTE_HW_RX_FIFO_SIZE];
+	uint8_t *flush_buf = buf ? buf : tmp_buf;
+	size_t flush_len = buf ? len : sizeof(tmp_buf);
+
+	if (buf) {
+		flush_buf = buf;
+		flush_len = len;
 	} else {
-		prev_rx_amount = 0;
+		flush_buf = tmp_buf;
+		flush_len = sizeof(tmp_buf);
 	}
 
-	nrf_uarte_rx_buffer_set(uarte, buf, UARTE_HW_RX_FIFO_SIZE);
+	memset(flush_buf, dirty, flush_len);
+	nrf_uarte_rx_buffer_set(uarte, flush_buf, flush_len);
 	/* Final part of handling RXTO event is in ENDRX interrupt
 	 * handler. ENDRX is generated as a result of FLUSHRX task.
 	 */
@@ -1304,23 +1212,15 @@ static uint8_t rx_flush(const struct device *dev, uint8_t *buf)
 		/* empty */
 	}
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
-	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 
-	rx_amount = nrf_uarte_rx_amount_get(uarte);
-	if (!buf || !IS_ENABLED(RX_FLUSH_WORKAROUND)) {
-		return rx_amount;
-	}
+	uint32_t rx_amount = nrf_uarte_rx_amount_get(uarte);
 
 	if (rx_amount != prev_rx_amount) {
 		return rx_amount;
 	}
 
-	if (rx_amount > UARTE_HW_RX_FIFO_SIZE) {
-		return 0;
-	}
-
-	for (int i = 0; i < rx_amount; i++) {
-		if (buf[i] != dirty) {
+	for (int i = 0; i < flush_len; i++) {
+		if (flush_buf[i] != dirty) {
 			return rx_amount;
 		}
 	}
@@ -1328,6 +1228,25 @@ static uint8_t rx_flush(const struct device *dev, uint8_t *buf)
 	return 0;
 }
 
+static void async_uart_release(const struct device *dev, uint32_t dir_mask)
+{
+	struct uarte_nrfx_data *data = dev->data;
+	unsigned int key = irq_lock();
+
+	data->async->low_power_mask &= ~dir_mask;
+	if (!data->async->low_power_mask) {
+		if (dir_mask == UARTE_LOW_POWER_RX) {
+			data->async->rx.flush_cnt =
+				rx_flush(dev, data->async->rx.flush_buffer,
+					 sizeof(data->async->rx.flush_buffer));
+		}
+
+		uart_disable(dev);
+	}
+
+	irq_unlock(key);
+}
+
 /* This handler is called when the receiver is stopped. If rx was aborted
  * data from fifo is flushed.
  */
@@ -1337,10 +1256,8 @@ static void rxto_isr(const struct device *dev)
 	struct uarte_nrfx_data *data = dev->data;
 	struct uarte_async_rx *async_rx = &data->async->rx;
 
-	if (async_rx->buf) {
-		rx_buf_release(dev, async_rx->buf);
-		async_rx->buf = NULL;
-	}
+	rx_buf_release(dev, &async_rx->buf);
+	rx_buf_release(dev, &async_rx->next_buf);
 
 	/* This point can be reached in two cases:
 	 * 1. RX is disabled because all provided RX buffers have been filled.
@@ -1352,33 +1269,20 @@ static void rxto_isr(const struct device *dev)
 	 */
 	async_rx->enabled = false;
 	if (async_rx->discard_fifo) {
+		uint8_t flushed;
+
 		async_rx->discard_fifo = false;
-#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
+		flushed = rx_flush(dev, NULL, 0);
 		if (HW_RX_COUNTING_ENABLED(config)) {
-			uint8_t buf[UARTE_HW_RX_FIFO_SIZE];
-
 			/* It need to be included because TIMER+PPI got RXDRDY events
 			 * and counted those flushed bytes.
 			 */
-			async_rx->total_user_byte_cnt += rx_flush(dev, buf);
-			(void)buf;
+			async_rx->total_user_byte_cnt += flushed;
 		}
-#endif
-	} else {
-		async_rx->flush_cnt = rx_flush(dev, config->rx_flush_buf);
 	}
 
-#ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
-	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-
-	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXDRDY);
-#endif
-
 	if (config->flags & UARTE_CFG_FLAG_LOW_POWER) {
-		uint32_t key = irq_lock();
-
-		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_RX, UARTE_FLAG_LOW_POWER_TX);
-		irq_unlock(key);
+		async_uart_release(dev, UARTE_LOW_POWER_RX);
 	}
 
 	notify_rx_disable(dev);
@@ -1393,9 +1297,7 @@ static void txstopped_isr(const struct device *dev)
 
 	if (config->flags & UARTE_CFG_FLAG_LOW_POWER) {
 		nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
-		key = irq_lock();
-		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_TX, UARTE_FLAG_LOW_POWER_RX);
-		irq_unlock(key);
+		async_uart_release(dev, UARTE_LOW_POWER_TX);
 
 		if (!data->async->tx.len) {
 			return;
@@ -1437,10 +1339,10 @@ static void txstopped_isr(const struct device *dev)
 				return;
 			}
 
-			/* Amount is already included in cache_offset. */
+			/* Amount is already included in tx_cache_offset. */
 			amount = data->async->tx.cache_offset;
 		} else {
-			/* TX was aborted, include cache_offset in amount. */
+			/* TX was aborted, include tx_cache_offset in amount. */
 			amount += data->async->tx.cache_offset;
 		}
 	}
@@ -1464,50 +1366,28 @@ static void txstopped_isr(const struct device *dev)
 	user_callback(dev, &evt);
 }
 
-static void rxdrdy_isr(const struct device *dev)
-{
-#if defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
-	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-
-	data->async->rx.idle_cnt = 0;
-	k_timer_start(&data->async->rx.timer, data->async->rx.timeout, K_NO_WAIT);
-	nrf_uarte_int_disable(uarte, NRF_UARTE_INT_RXDRDY_MASK);
-#else
-	data->async->rx.cnt.cnt++;
-#endif
-}
-
-static bool event_check_clear(NRF_UARTE_Type *uarte, nrf_uarte_event_t event,
-				uint32_t int_mask, uint32_t int_en_mask)
-{
-	if (nrf_uarte_event_check(uarte, event) && (int_mask & int_en_mask)) {
-		nrf_uarte_event_clear(uarte, event);
-		return true;
-	}
-
-	return false;
-}
-
 static void uarte_nrfx_isr_async(const void *arg)
 {
 	const struct device *dev = arg;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	const struct uarte_nrfx_config *config = dev->config;
-	struct uarte_nrfx_data *data = dev->data;
-	struct uarte_async_rx *async_rx = &data->async->rx;
-	uint32_t imask = nrf_uarte_int_enable_check(uarte, UINT32_MAX);
 
 	if (!HW_RX_COUNTING_ENABLED(config)
-	    && event_check_clear(uarte, NRF_UARTE_EVENT_RXDRDY, NRF_UARTE_INT_RXDRDY_MASK, imask)) {
-		rxdrdy_isr(dev);
+	    && nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXDRDY)) {
+		struct uarte_nrfx_data *data = dev->data;
 
+		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXDRDY);
+		data->async->rx.cnt.cnt++;
+		return;
 	}
 
-	if (event_check_clear(uarte, NRF_UARTE_EVENT_ERROR, NRF_UARTE_INT_ERROR_MASK, imask)) {
+	if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ERROR)) {
+		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ERROR);
 		error_isr(dev);
 	}
 
-	if (event_check_clear(uarte, NRF_UARTE_EVENT_ENDRX, NRF_UARTE_INT_ENDRX_MASK, imask)) {
+	if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ENDRX)
+	    && nrf_uarte_int_enable_check(uarte, NRF_UARTE_INT_ENDRX_MASK)) {
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
 		endrx_isr(dev);
 	}
@@ -1519,8 +1399,7 @@ static void uarte_nrfx_isr_async(const void *arg)
 	 * UARTE interrupt got preempted. Events are not cleared
 	 * and isr will be called again. ENDRX will be handled first.
 	 */
-	if ((imask & NRF_UARTE_INT_RXSTARTED_MASK) &&
-	    nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXSTARTED) &&
+	if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXSTARTED) &&
 	    !nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ENDRX)) {
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 		rxstarted_isr(dev);
@@ -1532,31 +1411,22 @@ static void uarte_nrfx_isr_async(const void *arg)
 	 * UARTE interrupt got preempted. Events are not cleared
 	 * and isr will be called again. ENDRX will be handled first.
 	 */
-	if ((imask & NRF_UARTE_INT_RXTO_MASK) &&
-	    nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXTO) &&
+	if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXTO) &&
 	    !nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ENDRX)) {
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXTO);
 		rxto_isr(dev);
 	}
 
 	if (!IS_ENABLED(UARTE_HAS_ENDTX_STOPTX_SHORT) &&
-	    (imask & NRF_UARTE_INT_ENDTX_MASK) &&
-	    nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ENDTX)) {
+	    (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ENDTX) &&
+	     nrf_uarte_int_enable_check(uarte, NRF_UARTE_INT_ENDTX_MASK))) {
 		endtx_isr(dev);
 	}
 
-	if ((imask & NRF_UARTE_INT_TXSTOPPED_MASK) &&
-	    nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_TXSTOPPED)) {
+	if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_TXSTOPPED) &&
+	    nrf_uarte_int_enable_check(uarte, NRF_UARTE_INT_TXSTOPPED_MASK)) {
 		txstopped_isr(dev);
 	}
-
-	if (atomic_and(&data->flags, ~UARTE_FLAG_TRIG_RXTO) & UARTE_FLAG_TRIG_RXTO) {
-		notify_uart_rx_rdy(dev, async_rx->buf_len);
-		rx_buf_release(dev, async_rx->buf);
-		async_rx->buf_len = 0;
-		async_rx->buf = NULL;
-		notify_rx_disable(dev);
-	}
 }
 
 #endif /* UARTE_ANY_ASYNC */
@@ -1571,12 +1441,11 @@ static void uarte_nrfx_isr_async(const void *arg)
  */
 static int uarte_nrfx_poll_in(const struct device *dev, unsigned char *c)
 {
-	const struct uarte_nrfx_config *config = dev->config;
+
+	const struct uarte_nrfx_data *data = dev->data;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
 #ifdef UARTE_ANY_ASYNC
-	struct uarte_nrfx_data *data = dev->data;
-
 	if (data->async) {
 		return -ENOTSUP;
 	}
@@ -1586,7 +1455,7 @@ static int uarte_nrfx_poll_in(const struct device *dev, unsigned char *c)
 		return -1;
 	}
 
-	*c = *config->poll_in_byte;
+	*c = *data->rx_data;
 
 	/* clear the interrupt */
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
@@ -1603,7 +1472,7 @@ static int uarte_nrfx_poll_in(const struct device *dev, unsigned char *c)
  */
 static void uarte_nrfx_poll_out(const struct device *dev, unsigned char c)
 {
-	const struct uarte_nrfx_config *config = dev->config;
+	struct uarte_nrfx_data *data = dev->data;
 	bool isr_mode = k_is_in_isr() || k_is_pre_kernel();
 	unsigned int key;
 
@@ -1612,12 +1481,11 @@ static void uarte_nrfx_poll_out(const struct device *dev, unsigned char c)
 			key = irq_lock();
 			if (is_tx_ready(dev)) {
 #if UARTE_ANY_ASYNC
-				NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-				struct uarte_nrfx_data *data = dev->data;
-
 				if (data->async && data->async->tx.len &&
 					data->async->tx.amount < 0) {
-					data->async->tx.amount = nrf_uarte_tx_amount_get(uarte);
+					data->async->tx.amount =
+						nrf_uarte_tx_amount_get(
+						      get_uarte_instance(dev));
 				}
 #endif
 				break;
@@ -1630,8 +1498,8 @@ static void uarte_nrfx_poll_out(const struct device *dev, unsigned char c)
 		key = wait_tx_ready(dev);
 	}
 
-	*config->poll_out_byte = c;
-	tx_start(dev, config->poll_out_byte, 1);
+	*data->char_out = c;
+	tx_start(dev, data->char_out, 1);
 
 	irq_unlock(key);
 }
@@ -1674,14 +1542,14 @@ static int uarte_nrfx_fifo_read(const struct device *dev,
 {
 	int num_rx = 0;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-	const struct uarte_nrfx_config *config = dev->config;
+	const struct uarte_nrfx_data *data = dev->data;
 
 	if (size > 0 && nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ENDRX)) {
 		/* Clear the interrupt */
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
 
 		/* Receive a character */
-		rx_data[num_rx++] = *config->poll_in_byte;
+		rx_data[num_rx++] = *data->rx_data;
 
 		nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTRX);
 	}
@@ -1864,15 +1732,13 @@ static int uarte_instance_init(const struct device *dev,
 {
 	int err;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-	const struct uarte_nrfx_config *cfg = dev->config;
-
-#if	defined(CONFIG_UART_USE_RUNTIME_CONFIGURE) || defined(UARTE_ENHANCED_POLL_OUT) || \
-	defined(UARTE_ANY_ASYNC)
 	struct uarte_nrfx_data *data = dev->data;
-#endif
+	const struct uarte_nrfx_config *cfg = dev->config;
 
 	nrf_uarte_disable(uarte);
 
+	data->dev = dev;
+
 #ifdef CONFIG_ARCH_POSIX
 	/* For simulation the DT provided peripheral address needs to be corrected */
 	((struct pinctrl_dev_config *)cfg->pcfg)->reg = (uintptr_t)cfg->uarte_regs;
@@ -1889,7 +1755,7 @@ static int uarte_instance_init(const struct device *dev,
 		return err;
 	}
 #else
-	nrf_uarte_baudrate_set(uarte, cfg->nrf_baudrate);
+	nrf_uarte_baudrate_set(uarte, cfg->baudrate);
 	nrf_uarte_configure(uarte, &cfg->hw_config);
 #endif
 
@@ -1903,6 +1769,7 @@ static int uarte_instance_init(const struct device *dev,
 		}
 	}
 #endif
+
 #ifdef UARTE_ANY_ASYNC
 	if (data->async) {
 		err = uarte_nrfx_init(dev);
@@ -1918,7 +1785,7 @@ static int uarte_instance_init(const struct device *dev,
 		if (!cfg->disable_rx) {
 			nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
 
-			nrf_uarte_rx_buffer_set(uarte, cfg->poll_in_byte, 1);
+			nrf_uarte_rx_buffer_set(uarte, data->rx_data, 1);
 			nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTRX);
 		}
 	}
@@ -1927,11 +1794,19 @@ static int uarte_instance_init(const struct device *dev,
 		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_ENDTX_MASK);
 	}
 
+	if (cfg->flags & UARTE_CFG_FLAG_LOW_POWER) {
+		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
+	}
+
 	/* Set TXSTOPPED event by requesting fake (zero-length) transfer.
 	 * Pointer to RAM variable (data->tx_buffer) is set because otherwise
 	 * such operation may result in HardFault or RAM corruption.
 	 */
-	tx_start(dev, cfg->poll_out_byte, 0);
+	nrf_uarte_tx_buffer_set(uarte, data->char_out, 0);
+	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTTX);
+
+	/* switch off transmitter to save an energy */
+	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPTX);
 
 	return 0;
 }
@@ -2035,14 +1910,6 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 			 */
 			__ASSERT_NO_MSG(!data->async->rx.enabled);
 			__ASSERT_NO_MSG(!data->async->tx.len);
-#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
-			if (data->async && HW_RX_COUNTING_ENABLED(cfg)) {
-				nrfx_timer_disable(&cfg->timer);
-				/* Timer/counter value is reset when disabled. */
-				data->async->rx.total_byte_cnt = 0;
-				data->async->rx.total_user_byte_cnt = 0;
-			}
-#endif
 
 		}
 #endif
@@ -2070,7 +1937,7 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		}
 
 		wait_for_tx_stopped(dev);
-		uarte_disable_locked(dev, UARTE_FLAG_LOW_POWER_TX | UARTE_FLAG_LOW_POWER_RX, 0);
+		uart_disable(dev);
 
 		ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_SLEEP);
 		if (ret < 0) {
@@ -2096,12 +1963,11 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 /* Low power mode is used when disable_rx is not defined or in async mode if
  * kconfig option is enabled.
  */
-#define USE_LOW_POWER(idx)						       \
-	COND_CODE_1(CONFIG_PM_DEVICE, (0),				       \
-		(((!UARTE_PROP(idx, disable_rx) &&			       \
-		COND_CODE_1(CONFIG_UART_##idx##_ASYNC,			       \
-			(!IS_ENABLED(CONFIG_UART_##idx##_NRF_ASYNC_LOW_POWER)),\
-			(1))) ? 0 : UARTE_CFG_FLAG_LOW_POWER)))
+#define USE_LOW_POWER(idx) \
+	((!UARTE_PROP(idx, disable_rx) &&				       \
+	COND_CODE_1(CONFIG_UART_##idx##_ASYNC,				       \
+		(!IS_ENABLED(CONFIG_UART_##idx##_NRF_ASYNC_LOW_POWER)),	       \
+		(1))) ? 0 : UARTE_CFG_FLAG_LOW_POWER)
 
 #define UARTE_DISABLE_RX_INIT(node_id) \
 	.disable_rx = DT_PROP(node_id, disable_rx)
@@ -2112,13 +1978,12 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 	COND_CODE_1(DT_CLOCKS_HAS_IDX(UARTE(idx), 0),				\
 		   ((UARTE_GET_FREQ(idx) / NRF_UARTE_BASE_FREQUENCY_16MHZ)), (1))
 
-/* When calculating baudrate we need to take into account that high speed instances
- * must have baudrate adjust to the ratio between UARTE clocking frequency and 16 MHz.
+/* When calculating baudrate we need to take into account that some instances
+ * must have baudrate adjusted to the ratio between UARTE clocking frequency and 16 MHz.
  */
 #define UARTE_GET_BAUDRATE(idx) \
 	(NRF_BAUDRATE(UARTE_PROP(idx, current_speed)) / UARTE_GET_BAUDRATE_DIV(idx))
 
-
 /* Macro for setting nRF specific configuration structures. */
 #define UARTE_NRF_CONFIG(idx) {							\
 		.hwfc = (UARTE_PROP(idx, hw_flow_control) ==			\
@@ -2152,12 +2017,12 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		static uint8_t						       \
 			uarte##idx##_tx_cache[CONFIG_UART_ASYNC_TX_CACHE_SIZE] \
 			UARTE_MEMORY_SECTION(idx);			       \
-		static uint8_t uarte##idx##_flush_buf[UARTE_HW_RX_FIFO_SIZE]   \
-			UARTE_MEMORY_SECTION(idx);			       \
 		struct uarte_async_cb uarte##idx##_async;))		       \
-	static uint8_t uarte##idx##_poll_out_byte UARTE_MEMORY_SECTION(idx);   \
-	static uint8_t uarte##idx##_poll_in_byte UARTE_MEMORY_SECTION(idx);    \
+	static uint8_t uarte##idx##_char_out UARTE_MEMORY_SECTION(idx);	       \
+	static uint8_t uarte##idx##_rx_data UARTE_MEMORY_SECTION(idx);	       \
 	static struct uarte_nrfx_data uarte_##idx##_data = {		       \
+		.char_out = &uarte##idx##_char_out,			       \
+		.rx_data = &uarte##idx##_rx_data,			       \
 		IF_ENABLED(CONFIG_UART_USE_RUNTIME_CONFIGURE,		       \
 				(.uart_config = UARTE_CONFIG(idx),))	       \
 		IF_ENABLED(CONFIG_UART_##idx##_ASYNC,			       \
@@ -2169,10 +2034,8 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		(BUILD_ASSERT(NRF_BAUDRATE(UARTE_PROP(idx, current_speed)) > 0,\
 			  "Unsupported baudrate");))			       \
 	static const struct uarte_nrfx_config uarte_##idx##z_config = {	       \
-		COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,		       \
-		    (IF_ENABLED(DT_CLOCKS_HAS_IDX(UARTE(idx), 0),	       \
-			   (.clock_freq = UARTE_GET_FREQ(idx),))),	       \
-		     (.nrf_baudrate = UARTE_GET_BAUDRATE(idx),		       \
+		COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE, (),	       \
+		    (.baudrate = UARTE_GET_BAUDRATE(idx),		       \
 		     .hw_config = UARTE_NRF_CONFIG(idx),))		       \
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(UARTE(idx)),		       \
 		.uarte_regs = _CONCAT(NRF_UARTE, idx),                         \
@@ -2183,14 +2046,14 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 				UARTE_CFG_FLAG_HW_BYTE_COUNTING : 0) |	       \
 			USE_LOW_POWER(idx),				       \
 		UARTE_DISABLE_RX_INIT(UARTE(idx)),			       \
-		.poll_out_byte = &uarte##idx##_poll_out_byte,		       \
-		.poll_in_byte = &uarte##idx##_poll_in_byte,		       \
 		IF_ENABLED(CONFIG_UART_##idx##_ASYNC,			       \
-				(.tx_cache = uarte##idx##_tx_cache,	       \
-				 .rx_flush_buf = uarte##idx##_flush_buf,))     \
+				(.tx_cache = uarte##idx##_tx_cache,))	       \
 		IF_ENABLED(CONFIG_UART_##idx##_NRF_HW_ASYNC,		       \
 			(.timer = NRFX_TIMER_INSTANCE(			       \
 				CONFIG_UART_##idx##_NRF_HW_ASYNC_TIMER),))     \
+		IF_ENABLED(DT_CLOCKS_HAS_IDX(UARTE(idx), 0),		       \
+			   (.clock_freq = DT_PROP(DT_CLOCKS_CTLR(UARTE(idx)),  \
+						  clock_frequency),))	       \
 	};								       \
 	static int uarte_##idx##_init(const struct device *dev)		       \
 	{								       \

From 29ddee63ca0741a5c43df8bf5c48696574db48e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:43 +0100
Subject: [PATCH 1648/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Refactor to use RX async struct pointer"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit aa096eb9efc346591f7255a6e77d759c8a065f21.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/uart_nrfx_uarte.c | 130 +++++++++++++++----------------
 1 file changed, 64 insertions(+), 66 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index bb473fa6e65..72791f23374 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -816,7 +816,6 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 				int32_t timeout)
 {
 	struct uarte_nrfx_data *data = dev->data;
-	struct uarte_async_rx *async_rx = &data->async->rx;
 	const struct uarte_nrfx_config *cfg = dev->config;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	int ret = 0;
@@ -830,24 +829,24 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	 * for the RXTO event after a call to uart_rx_disable() to discard
 	 * data from the UARTE internal RX FIFO.
 	 */
-	if (async_rx->enabled || async_rx->discard_fifo) {
+	if (data->async->rx.enabled || data->async->rx.discard_fifo) {
 		return -EBUSY;
 	}
 
-	async_rx->timeout = timeout;
-	async_rx->timeout_slab = timeout / RX_TIMEOUT_DIV;
+	data->async->rx.timeout = timeout;
+	data->async->rx.timeout_slab = timeout / RX_TIMEOUT_DIV;
 
-	async_rx->buf = buf;
-	async_rx->buf_len = len;
-	async_rx->offset = 0;
-	async_rx->next_buf = NULL;
-	async_rx->next_buf_len = 0;
+	data->async->rx.buf = buf;
+	data->async->rx.buf_len = len;
+	data->async->rx.offset = 0;
+	data->async->rx.next_buf = NULL;
+	data->async->rx.next_buf_len = 0;
 
 	if (cfg->flags & UARTE_CFG_FLAG_LOW_POWER) {
-		if (async_rx->flush_cnt) {
-			int cpy_len = MIN(len, async_rx->flush_cnt);
+		if (data->async->rx.flush_cnt) {
+			int cpy_len = MIN(len, data->async->rx.flush_cnt);
 
-			memcpy(buf, async_rx->flush_buffer, cpy_len);
+			memcpy(buf, data->async->rx.flush_buffer, cpy_len);
 			buf += cpy_len;
 			len -= cpy_len;
 
@@ -855,9 +854,9 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 			 * request and indicate rx being disabled.
 			 */
 			if (!len) {
-				async_rx->flush_cnt -= cpy_len;
+				data->async->rx.flush_cnt -= cpy_len;
 				notify_uart_rx_rdy(dev, cpy_len);
-				rx_buf_release(dev, &async_rx->buf);
+				rx_buf_release(dev, &data->async->rx.buf);
 				notify_rx_disable(dev);
 				return 0;
 			}
@@ -869,7 +868,7 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 
-	async_rx->enabled = true;
+	data->async->rx.enabled = true;
 	if (cfg->flags & UARTE_CFG_FLAG_LOW_POWER) {
 		unsigned int key = irq_lock();
 
@@ -886,16 +885,15 @@ static int uarte_nrfx_rx_buf_rsp(const struct device *dev, uint8_t *buf,
 				 size_t len)
 {
 	struct uarte_nrfx_data *data = dev->data;
-	struct uarte_async_rx *async_rx = &data->async->rx;
 	int err;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	unsigned int key = irq_lock();
 
-	if (async_rx->buf == NULL) {
+	if (data->async->rx.buf == NULL) {
 		err = -EACCES;
-	} else if (async_rx->next_buf == NULL) {
-		async_rx->next_buf = buf;
-		async_rx->next_buf_len = len;
+	} else if (data->async->rx.next_buf == NULL) {
+		data->async->rx.next_buf = buf;
+		data->async->rx.next_buf_len = len;
 		nrf_uarte_rx_buffer_set(uarte, buf, len);
 		nrf_uarte_shorts_enable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
 		err = 0;
@@ -927,20 +925,19 @@ static int uarte_nrfx_callback_set(const struct device *dev,
 static int uarte_nrfx_rx_disable(const struct device *dev)
 {
 	struct uarte_nrfx_data *data = dev->data;
-	struct uarte_async_rx *async_rx = &data->async->rx;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
-	if (async_rx->buf == NULL) {
+	if (data->async->rx.buf == NULL) {
 		return -EFAULT;
 	}
-	if (async_rx->next_buf != NULL) {
+	if (data->async->rx.next_buf != NULL) {
 		nrf_uarte_shorts_disable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 	}
 
-	k_timer_stop(&async_rx->timer);
-	async_rx->enabled = false;
-	async_rx->discard_fifo = true;
+	k_timer_stop(&data->async->rx.timer);
+	data->async->rx.enabled = false;
+	data->async->rx.discard_fifo = true;
 
 	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPRX);
 
@@ -964,12 +961,11 @@ static void tx_timeout(struct k_timer *timer)
 static void rx_timeout(struct k_timer *timer)
 {
 	struct uarte_nrfx_data *data = k_timer_user_data_get(timer);
-	struct uarte_async_rx *async_rx = &data->async->rx;
 	const struct device *dev = data->dev;
 	const struct uarte_nrfx_config *cfg = dev->config;
 	uint32_t read;
 
-	if (async_rx->is_in_irq) {
+	if (data->async->rx.is_in_irq) {
 		return;
 	}
 
@@ -982,20 +978,21 @@ static void rx_timeout(struct k_timer *timer)
 	if (HW_RX_COUNTING_ENABLED(cfg)) {
 		read = nrfx_timer_capture(&cfg->timer, 0);
 	} else {
-		read = async_rx->cnt.cnt;
+		read = data->async->rx.cnt.cnt;
 	}
 
 	/* Check if data was received since last function call */
-	if (read != async_rx->total_byte_cnt) {
-		async_rx->total_byte_cnt = read;
-		async_rx->timeout_left = async_rx->timeout;
+	if (read != data->async->rx.total_byte_cnt) {
+		data->async->rx.total_byte_cnt = read;
+		data->async->rx.timeout_left = data->async->rx.timeout;
 	}
 
 	/* Check if there is data that was not sent to user yet
 	 * Note though that 'len' is a count of data bytes received, but not
 	 * necessarily the amount available in the current buffer
 	 */
-	int32_t len = async_rx->total_byte_cnt - async_rx->total_user_byte_cnt;
+	int32_t len = data->async->rx.total_byte_cnt
+		    - data->async->rx.total_user_byte_cnt;
 
 	if (!HW_RX_COUNTING_ENABLED(cfg) &&
 	    (len < 0)) {
@@ -1004,7 +1001,7 @@ static void rx_timeout(struct k_timer *timer)
 		 * At this point, the number of received bytes is at least
 		 * equal to what was reported to the user.
 		 */
-		async_rx->cnt.cnt = async_rx->total_user_byte_cnt;
+		data->async->rx.cnt.cnt = data->async->rx.total_user_byte_cnt;
 		len = 0;
 	}
 
@@ -1016,28 +1013,31 @@ static void rx_timeout(struct k_timer *timer)
 	 */
 	bool clipped = false;
 
-	if (len + async_rx->offset > async_rx->buf_len) {
-		len = async_rx->buf_len - async_rx->offset;
+	if (len + data->async->rx.offset > data->async->rx.buf_len) {
+		len = data->async->rx.buf_len - data->async->rx.offset;
 		clipped = true;
 	}
 
 	if (len > 0) {
-		if (clipped || (async_rx->timeout_left < async_rx->timeout_slab)) {
+		if (clipped ||
+			(data->async->rx.timeout_left
+				< data->async->rx.timeout_slab)) {
 			/* rx_timeout us elapsed since last receiving */
-			if (async_rx->buf != NULL) {
+			if (data->async->rx.buf != NULL) {
 				notify_uart_rx_rdy(dev, len);
-				async_rx->offset += len;
-				async_rx->total_user_byte_cnt += len;
+				data->async->rx.offset += len;
+				data->async->rx.total_user_byte_cnt += len;
 			}
 		} else {
-			async_rx->timeout_left -= async_rx->timeout_slab;
+			data->async->rx.timeout_left -=
+				data->async->rx.timeout_slab;
 		}
 
 		/* If there's nothing left to report until the buffers are
 		 * switched then the timer can be stopped
 		 */
 		if (clipped) {
-			k_timer_stop(&async_rx->timer);
+			k_timer_stop(&data->async->rx.timer);
 		}
 	}
 
@@ -1083,23 +1083,22 @@ static void rxstarted_isr(const struct device *dev)
 static void endrx_isr(const struct device *dev)
 {
 	struct uarte_nrfx_data *data = dev->data;
-	struct uarte_async_rx *async_rx = &data->async->rx;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
-	async_rx->is_in_irq = true;
+	data->async->rx.is_in_irq = true;
 
 	/* ensure rx timer is stopped - it will be restarted in RXSTARTED
 	 * handler if needed
 	 */
-	k_timer_stop(&async_rx->timer);
+	k_timer_stop(&data->async->rx.timer);
 
 	/* this is the amount that the EasyDMA controller has copied into the
 	 * buffer
 	 */
 	const int rx_amount = nrf_uarte_rx_amount_get(uarte) +
-				async_rx->flush_cnt;
+				data->async->rx.flush_cnt;
 
-	async_rx->flush_cnt = 0;
+	data->async->rx.flush_cnt = 0;
 
 	/* The 'rx_offset' can be bigger than 'rx_amount', so it the length
 	 * of data we report back the user may need to be clipped.
@@ -1108,25 +1107,25 @@ static void endrx_isr(const struct device *dev)
 	 * here to handle this buffer. (The next buffer is now already active
 	 * because of the ENDRX_STARTRX shortcut)
 	 */
-	int rx_len = rx_amount - async_rx->offset;
+	int rx_len = rx_amount - data->async->rx.offset;
 
 	if (rx_len < 0) {
 		rx_len = 0;
 	}
 
-	async_rx->total_user_byte_cnt += rx_len;
+	data->async->rx.total_user_byte_cnt += rx_len;
 
 	/* Only send the RX_RDY event if there is something to send */
 	if (rx_len > 0) {
 		notify_uart_rx_rdy(dev, rx_len);
 	}
 
-	if (!async_rx->enabled) {
-		async_rx->is_in_irq = false;
+	if (!data->async->rx.enabled) {
+		data->async->rx.is_in_irq = false;
 		return;
 	}
 
-	rx_buf_release(dev, &async_rx->buf);
+	rx_buf_release(dev, &data->async->rx.buf);
 
 	/* If there is a next buffer, then STARTRX will have already been
 	 * invoked by the short (the next buffer will be filling up already)
@@ -1135,13 +1134,13 @@ static void endrx_isr(const struct device *dev)
 	 */
 	unsigned int key = irq_lock();
 
-	if (async_rx->next_buf) {
-		async_rx->buf = async_rx->next_buf;
-		async_rx->buf_len = async_rx->next_buf_len;
-		async_rx->next_buf = NULL;
-		async_rx->next_buf_len = 0;
+	if (data->async->rx.next_buf) {
+		data->async->rx.buf = data->async->rx.next_buf;
+		data->async->rx.buf_len = data->async->rx.next_buf_len;
+		data->async->rx.next_buf = NULL;
+		data->async->rx.next_buf_len = 0;
 
-		async_rx->offset = 0;
+		data->async->rx.offset = 0;
 		/* Check is based on assumption that ISR handler handles
 		 * ENDRX before RXSTARTED so if short was set on time, RXSTARTED
 		 * event will be set.
@@ -1157,7 +1156,7 @@ static void endrx_isr(const struct device *dev)
 
 	irq_unlock(key);
 
-	async_rx->is_in_irq = false;
+	data->async->rx.is_in_irq = false;
 }
 
 /* Function for flushing internal RX fifo. Function can be called in case
@@ -1254,10 +1253,9 @@ static void rxto_isr(const struct device *dev)
 {
 	const struct uarte_nrfx_config *config = dev->config;
 	struct uarte_nrfx_data *data = dev->data;
-	struct uarte_async_rx *async_rx = &data->async->rx;
 
-	rx_buf_release(dev, &async_rx->buf);
-	rx_buf_release(dev, &async_rx->next_buf);
+	rx_buf_release(dev, &data->async->rx.buf);
+	rx_buf_release(dev, &data->async->rx.next_buf);
 
 	/* This point can be reached in two cases:
 	 * 1. RX is disabled because all provided RX buffers have been filled.
@@ -1267,17 +1265,17 @@ static void rxto_isr(const struct device *dev)
 	 * In the second case, additionally, data from the UARTE internal RX
 	 * FIFO need to be discarded.
 	 */
-	async_rx->enabled = false;
-	if (async_rx->discard_fifo) {
+	data->async->rx.enabled = false;
+	if (data->async->rx.discard_fifo) {
 		uint8_t flushed;
 
-		async_rx->discard_fifo = false;
+		data->async->rx.discard_fifo = false;
 		flushed = rx_flush(dev, NULL, 0);
 		if (HW_RX_COUNTING_ENABLED(config)) {
 			/* It need to be included because TIMER+PPI got RXDRDY events
 			 * and counted those flushed bytes.
 			 */
-			async_rx->total_user_byte_cnt += flushed;
+			data->async->rx.total_user_byte_cnt += flushed;
 		}
 	}
 

From 8e7a14e2ea58fa5c4084de34e265cd9e31c91ecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:43 +0100
Subject: [PATCH 1649/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Use nrfx_gppi helper"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7d402a5d6e8ddea5ce8b9b29f9a1e28fb78f3edb.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/uart_nrfx_uarte.c | 49 +++++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 72791f23374..aa65103132d 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -24,6 +24,21 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 
 #include <zephyr/drivers/pinctrl.h>
 
+/* Generalize PPI or DPPI channel management */
+#if defined(PPI_PRESENT)
+#include <nrfx_ppi.h>
+#define gppi_channel_t nrf_ppi_channel_t
+#define gppi_channel_alloc nrfx_ppi_channel_alloc
+#define gppi_channel_enable nrfx_ppi_channel_enable
+#elif defined(DPPI_PRESENT)
+#include <nrfx_dppi.h>
+#define gppi_channel_t uint8_t
+#define gppi_channel_alloc nrfx_dppi_channel_alloc
+#define gppi_channel_enable nrfx_dppi_channel_enable
+#else
+#error "No PPI or DPPI"
+#endif
+
 #define UARTE(idx)                DT_NODELABEL(uart##idx)
 #define UARTE_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(UARTE(idx), prop)
 #define UARTE_PROP(idx, prop)     DT_PROP(UARTE(idx), prop)
@@ -170,7 +185,7 @@ struct uarte_nrfx_data {
 	atomic_val_t poll_out_lock;
 	uint8_t *char_out;
 	uint8_t *rx_data;
-	uint8_t ppi_ch_endtx;
+	gppi_channel_t ppi_ch_endtx;
 };
 
 #define UARTE_LOW_POWER_TX BIT(0)
@@ -603,8 +618,6 @@ static int uarte_nrfx_rx_counting_init(const struct device *dev)
 	if (HW_RX_COUNTING_ENABLED(cfg)) {
 		nrfx_timer_config_t tmr_config = NRFX_TIMER_DEFAULT_CONFIG(
 						NRF_TIMER_BASE_FREQUENCY_GET(cfg->timer.p_reg));
-		uint32_t evt_addr = nrf_uarte_event_address_get(uarte, NRF_UARTE_EVENT_RXDRDY);
-		uint32_t tsk_addr = nrfx_timer_task_address_get(&cfg->timer, NRF_TIMER_TASK_COUNT);
 
 		tmr_config.mode = NRF_TIMER_MODE_COUNTER;
 		tmr_config.bit_width = NRF_TIMER_BIT_WIDTH_32;
@@ -619,15 +632,37 @@ static int uarte_nrfx_rx_counting_init(const struct device *dev)
 			nrfx_timer_clear(&cfg->timer);
 		}
 
-		ret = nrfx_gppi_channel_alloc(&data->async->rx.cnt.ppi);
+		ret = gppi_channel_alloc(&data->async->rx.cnt.ppi);
 		if (ret != NRFX_SUCCESS) {
 			LOG_ERR("Failed to allocate PPI Channel");
 			nrfx_timer_uninit(&cfg->timer);
 			return -EINVAL;
 		}
 
-		nrfx_gppi_channel_endpoints_setup(data->async->rx.cnt.ppi, evt_addr, tsk_addr);
-		nrfx_gppi_channels_enable(BIT(data->async->rx.cnt.ppi));
+#if CONFIG_HAS_HW_NRF_PPI
+		ret = nrfx_ppi_channel_assign(
+			data->async->rx.cnt.ppi,
+			nrf_uarte_event_address_get(uarte,
+						    NRF_UARTE_EVENT_RXDRDY),
+			nrfx_timer_task_address_get(&cfg->timer,
+						    NRF_TIMER_TASK_COUNT));
+
+		if (ret != NRFX_SUCCESS) {
+			return -EIO;
+		}
+#else
+		nrf_uarte_publish_set(uarte,
+				      NRF_UARTE_EVENT_RXDRDY,
+				      data->async->rx.cnt.ppi);
+		nrf_timer_subscribe_set(cfg->timer.p_reg,
+					NRF_TIMER_TASK_COUNT,
+					data->async->rx.cnt.ppi);
+
+#endif
+		ret = gppi_channel_enable(data->async->rx.cnt.ppi);
+		if (ret != NRFX_SUCCESS) {
+			return -EIO;
+		}
 	} else {
 		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_RXDRDY_MASK);
 	}
@@ -1710,7 +1745,7 @@ static int endtx_stoptx_ppi_init(NRF_UARTE_Type *uarte,
 {
 	nrfx_err_t ret;
 
-	ret = nrfx_gppi_channel_alloc(&data->ppi_ch_endtx);
+	ret = gppi_channel_alloc(&data->ppi_ch_endtx);
 	if (ret != NRFX_SUCCESS) {
 		LOG_ERR("Failed to allocate PPI Channel");
 		return -EIO;

From 5498e481b2bd02f9a2d441facd5d2e2de0d93bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:43 +0100
Subject: [PATCH 1650/2913] Revert "[nrf fromtree] doc: releases: Add not about
 CONFIG_UART_n_GPIO_MANAGEMENT removal"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2ba3f1e3b43004d1080d04d34f41f4db5b502167.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/releases/release-notes-4.0.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/releases/release-notes-4.0.rst b/doc/releases/release-notes-4.0.rst
index 70ed64dd770..a6964e8a3c3 100644
--- a/doc/releases/release-notes-4.0.rst
+++ b/doc/releases/release-notes-4.0.rst
@@ -228,8 +228,6 @@ Drivers and Sensors
 * Serial
 
   * LiteX: Renamed the ``compatible`` from ``litex,uart0`` to :dtcompatible:`litex,uart`.
-  * Nordic: Removed ``CONFIG_UART_n_GPIO_MANAGEMENT`` Kconfig options (where n is an instance
-    index) which had no use after pinctrl driver was introduced.
 
 * SPI
 

From 55f806bc0c52ce9fff52e4e6814e4192a51e03c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:43 +0100
Subject: [PATCH 1651/2913] Revert "[nrf fromtree] drivers: serial:
 nrfx_uarte2: Remove CONFIG_UART_n_GPIO_MANAGEMENT"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e42295ec0ade5d6f4e4f674723a8d0509837fb27.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/uart_nrfx_uarte2.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte2.c b/drivers/serial/uart_nrfx_uarte2.c
index ae25334f03f..594f5a79b55 100644
--- a/drivers/serial/uart_nrfx_uarte2.c
+++ b/drivers/serial/uart_nrfx_uarte2.c
@@ -141,11 +141,14 @@ struct uarte_nrfx_data {
 };
 BUILD_ASSERT(offsetof(struct uarte_nrfx_data, a2i_data) == 0);
 
+/* If set then pins are managed when going to low power mode. */
+#define UARTE_CFG_FLAG_GPIO_MGMT		BIT(0)
+
 /* If set then receiver is not used. */
-#define UARTE_CFG_FLAG_NO_RX			BIT(0)
+#define UARTE_CFG_FLAG_NO_RX			BIT(1)
 
 /* If set then instance is using interrupt driven API. */
-#define UARTE_CFG_FLAG_INTERRUPT_DRIVEN_API	BIT(1)
+#define UARTE_CFG_FLAG_INTERRUPT_DRIVEN_API	BIT(2)
 
 /**
  * @brief Structure for UARTE configuration.
@@ -914,9 +917,11 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 
 	switch (action) {
 	case PM_DEVICE_ACTION_RESUME:
-		ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
-		if (ret < 0) {
-			return ret;
+		if (cfg->flags & UARTE_CFG_FLAG_GPIO_MGMT) {
+			ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
+			if (ret < 0) {
+				return ret;
+			}
 		}
 		if (!IS_ASYNC_API(dev) && !(cfg->flags & UARTE_CFG_FLAG_NO_RX)) {
 			return start_rx(dev);
@@ -928,9 +933,11 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 			stop_rx(dev);
 		}
 
-		ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_SLEEP);
-		if (ret < 0) {
-			return ret;
+		if (cfg->flags & UARTE_CFG_FLAG_GPIO_MGMT) {
+			ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_SLEEP);
+			if (ret < 0) {
+				return ret;
+			}
 		}
 
 		break;
@@ -1025,6 +1032,8 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		},										\
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(UARTE(idx)),					\
 		.flags = (UARTE_PROP(idx, disable_rx) ? UARTE_CFG_FLAG_NO_RX : 0) |		\
+			(IS_ENABLED(CONFIG_UART_##idx##_GPIO_MANAGEMENT) ?			\
+				UARTE_CFG_FLAG_GPIO_MGMT : 0) |					\
 			(IS_ENABLED(CONFIG_UART_##idx##_INTERRUPT_DRIVEN) ?			\
 				UARTE_CFG_FLAG_INTERRUPT_DRIVEN_API : 0),			\
 		LOG_INSTANCE_PTR_INIT(log, LOG_MODULE_NAME, idx)				\

From 8253765630305e4cd68cffa663ff4c18621b5dfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:43 +0100
Subject: [PATCH 1652/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Remove CONFIG_UART_n_GPIO_MANAGEMENT"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f4335c024e47f63972508898402dc1e92b635410.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/Kconfig.nrfx_uart_instance |  9 ++++++
 drivers/serial/uart_nrfx_uart.c           | 19 ++++++++----
 drivers/serial/uart_nrfx_uarte.c          | 36 +++++++++++++++++++----
 3 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/drivers/serial/Kconfig.nrfx_uart_instance b/drivers/serial/Kconfig.nrfx_uart_instance
index ed4c011da51..0840cad7760 100644
--- a/drivers/serial/Kconfig.nrfx_uart_instance
+++ b/drivers/serial/Kconfig.nrfx_uart_instance
@@ -119,3 +119,12 @@ config UART_$(nrfx_uart_num)_A2I_RX_BUF_COUNT
 	default 0
 	help
 	  Number of chunks into RX space is divided.
+
+config UART_$(nrfx_uart_num)_GPIO_MANAGEMENT
+	bool "GPIO management on port $(nrfx_uart_num)"
+	depends on PM_DEVICE
+	default y
+	help
+	  If enabled, the driver will configure the GPIOs used by the uart to
+	  their default configuration when device is powered down. The GPIOs
+	  will be configured back to correct state when UART is powered up.
diff --git a/drivers/serial/uart_nrfx_uart.c b/drivers/serial/uart_nrfx_uart.c
index 1e0da0f882f..9fa634fe01f 100644
--- a/drivers/serial/uart_nrfx_uart.c
+++ b/drivers/serial/uart_nrfx_uart.c
@@ -1087,9 +1087,12 @@ static int uart_nrfx_pm_action(const struct device *dev,
 
 	switch (action) {
 	case PM_DEVICE_ACTION_RESUME:
-		ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
-		if (ret < 0) {
-			return ret;
+		if (IS_ENABLED(CONFIG_UART_0_GPIO_MANAGEMENT)) {
+			ret = pinctrl_apply_state(config->pcfg,
+						  PINCTRL_STATE_DEFAULT);
+			if (ret < 0) {
+				return ret;
+			}
 		}
 
 		nrf_uart_enable(uart0_addr);
@@ -1100,9 +1103,13 @@ static int uart_nrfx_pm_action(const struct device *dev,
 		break;
 	case PM_DEVICE_ACTION_SUSPEND:
 		nrf_uart_disable(uart0_addr);
-		ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
-		if (ret < 0) {
-			return ret;
+
+		if (IS_ENABLED(CONFIG_UART_0_GPIO_MANAGEMENT)) {
+			ret = pinctrl_apply_state(config->pcfg,
+						  PINCTRL_STATE_SLEEP);
+			if (ret < 0) {
+				return ret;
+			}
 		}
 		break;
 	default:
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index aa65103132d..c4b136bf1f4 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -191,16 +191,19 @@ struct uarte_nrfx_data {
 #define UARTE_LOW_POWER_TX BIT(0)
 #define UARTE_LOW_POWER_RX BIT(1)
 
+/* If enabled, pins are managed when going to low power mode. */
+#define UARTE_CFG_FLAG_GPIO_MGMT   BIT(0)
+
 /* If enabled then ENDTX is PPI'ed to TXSTOP */
-#define UARTE_CFG_FLAG_PPI_ENDTX   BIT(0)
+#define UARTE_CFG_FLAG_PPI_ENDTX   BIT(1)
 
 /* If enabled then TIMER and PPI is used for byte counting. */
-#define UARTE_CFG_FLAG_HW_BYTE_COUNTING   BIT(1)
+#define UARTE_CFG_FLAG_HW_BYTE_COUNTING   BIT(2)
 
 /* If enabled then UARTE peripheral is disabled when not used. This allows
  * to achieve lowest power consumption in idle.
  */
-#define UARTE_CFG_FLAG_LOW_POWER   BIT(2)
+#define UARTE_CFG_FLAG_LOW_POWER   BIT(4)
 
 /* Macro for converting numerical baudrate to register value. It is convenient
  * to use this approach because for constant input it can calculate nrf setting
@@ -513,6 +516,20 @@ static int wait_tx_ready(const struct device *dev)
 	return key;
 }
 
+#if defined(UARTE_ANY_ASYNC) || defined(CONFIG_PM_DEVICE)
+static int pins_state_change(const struct device *dev, bool on)
+{
+	const struct uarte_nrfx_config *config = dev->config;
+
+	if (config->flags & UARTE_CFG_FLAG_GPIO_MGMT) {
+		return pinctrl_apply_state(config->pcfg,
+				on ? PINCTRL_STATE_DEFAULT : PINCTRL_STATE_SLEEP);
+	}
+
+	return 0;
+}
+#endif
+
 #ifdef UARTE_ANY_ASYNC
 
 /* Using Macro instead of static inline function to handle NO_OPTIMIZATIONS case
@@ -534,7 +551,7 @@ static int uarte_enable(const struct device *dev, uint32_t mask)
 		int ret;
 
 		data->async->low_power_mask |= mask;
-		ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+		ret = pins_state_change(dev, true);
 		if (ret < 0) {
 			return ret;
 		}
@@ -1276,6 +1293,10 @@ static void async_uart_release(const struct device *dev, uint32_t dir_mask)
 		}
 
 		uart_disable(dev);
+		int err = pins_state_change(dev, false);
+
+		(void)err;
+		__ASSERT_NO_MSG(err == 0);
 	}
 
 	irq_unlock(key);
@@ -1903,7 +1924,8 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 
 	switch (action) {
 	case PM_DEVICE_ACTION_RESUME:
-		ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
+
+		ret = pins_state_change(dev, true);
 		if (ret < 0) {
 			return ret;
 		}
@@ -1972,7 +1994,7 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		wait_for_tx_stopped(dev);
 		uart_disable(dev);
 
-		ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_SLEEP);
+		ret = pins_state_change(dev, false);
 		if (ret < 0) {
 			return ret;
 		}
@@ -2073,6 +2095,8 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(UARTE(idx)),		       \
 		.uarte_regs = _CONCAT(NRF_UARTE, idx),                         \
 		.flags =						       \
+			(IS_ENABLED(CONFIG_UART_##idx##_GPIO_MANAGEMENT) ?     \
+				UARTE_CFG_FLAG_GPIO_MGMT : 0) |		       \
 			(IS_ENABLED(CONFIG_UART_##idx##_ENHANCED_POLL_OUT) ?   \
 				UARTE_CFG_FLAG_PPI_ENDTX : 0) |		       \
 			(IS_ENABLED(CONFIG_UART_##idx##_NRF_HW_ASYNC) ?        \

From 2a75b080c1f5ec18e3143a414a29f43d6e7b9f98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:43 +0100
Subject: [PATCH 1653/2913] Revert "[nrf fromtree] dts: nordic: nrf-uarte: Add
 frame-timeout-supported property"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e4ec1b503c23db64b1c033097dbd40f606533be0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/bindings/serial/nordic,nrf-uarte.yaml | 5 -----
 dts/common/nordic/nrf54h20.dtsi           | 9 ---------
 dts/common/nordic/nrf54l15.dtsi           | 5 -----
 dts/common/nordic/nrf54l20.dtsi           | 5 -----
 dts/common/nordic/nrf9280.dtsi            | 9 ---------
 5 files changed, 33 deletions(-)

diff --git a/dts/bindings/serial/nordic,nrf-uarte.yaml b/dts/bindings/serial/nordic,nrf-uarte.yaml
index e6ba4c0b214..c1361d54e1b 100644
--- a/dts/bindings/serial/nordic,nrf-uarte.yaml
+++ b/dts/bindings/serial/nordic,nrf-uarte.yaml
@@ -9,8 +9,3 @@ properties:
     type: boolean
     description: |
       UARTE has ENDTX_STOPTX HW short.
-
-  frame-timeout-supported:
-    type: boolean
-    description: |
-      UARTE has RX frame timeout HW feature.
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 1b3a8b02fe7..76ad507b4f5 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -653,7 +653,6 @@
 				interrupts = <230 NRF_DEFAULT_IRQ_PRIORITY>;
 				clocks = <&hsfll120>;
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			spi121: spi@8e7000 {
@@ -963,7 +962,6 @@
 				clocks = <&fll16m>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			i2c131: i2c@9a6000 {
@@ -1005,7 +1003,6 @@
 				clocks = <&fll16m>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			dppic134: dppic@9b1000 {
@@ -1084,7 +1081,6 @@
 				clocks = <&fll16m>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			i2c133: i2c@9b6000 {
@@ -1126,7 +1122,6 @@
 				clocks = <&fll16m>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			dppic135: dppic@9c1000 {
@@ -1205,7 +1200,6 @@
 				clocks = <&fll16m>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			i2c135: i2c@9c6000 {
@@ -1247,7 +1241,6 @@
 				clocks = <&fll16m>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			dppic136: dppic@9d1000 {
@@ -1326,7 +1319,6 @@
 				clocks = <&fll16m>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			i2c137: i2c@9d6000 {
@@ -1368,7 +1360,6 @@
 				clocks = <&fll16m>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 		};
 	};
diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index f322d03b329..737c1d5a199 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -138,7 +138,6 @@
 				interrupts = <74 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			cpuflpr_vpr: vpr@4c000 {
@@ -271,7 +270,6 @@
 				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			i2c21: i2c@c7000 {
@@ -310,7 +308,6 @@
 				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			i2c22: i2c@c8000 {
@@ -349,7 +346,6 @@
 				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			egu20: egu@c9000 {
@@ -559,7 +555,6 @@
 				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 #ifdef USE_NON_SECURE_ADDRESS_MAP
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index dfe8d7b4531..17d871d2bfc 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -107,7 +107,6 @@
 				interrupts = <77 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			gpio2: gpio@50400 {
@@ -222,7 +221,6 @@
 				interrupts = <198 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			i2c21: i2c@c7000 {
@@ -261,7 +259,6 @@
 				interrupts = <199 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			i2c22: i2c@c8000 {
@@ -300,7 +297,6 @@
 				interrupts = <200 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			egu20: egu@c9000 {
@@ -501,7 +497,6 @@
 				interrupts = <260 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			wdt30: watchdog@108000 {
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 9949f6c9f1c..dc688a89f25 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -517,7 +517,6 @@
 				status = "disabled";
 				interrupts = <230 NRF_DEFAULT_IRQ_PRIORITY>;
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			spi121: spi@8e7000 {
@@ -848,7 +847,6 @@
 				interrupts = <421 NRF_DEFAULT_IRQ_PRIORITY>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			i2c131: i2c@9a6000 {
@@ -887,7 +885,6 @@
 				interrupts = <422 NRF_DEFAULT_IRQ_PRIORITY>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			dppic134: dppic@9b1000 {
@@ -960,7 +957,6 @@
 				interrupts = <437 NRF_DEFAULT_IRQ_PRIORITY>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			i2c133: i2c@9b6000 {
@@ -999,7 +995,6 @@
 				interrupts = <438 NRF_DEFAULT_IRQ_PRIORITY>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			dppic135: dppic@9c1000 {
@@ -1072,7 +1067,6 @@
 				interrupts = <453 NRF_DEFAULT_IRQ_PRIORITY>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			i2c135: i2c@9c6000 {
@@ -1111,7 +1105,6 @@
 				interrupts = <454 NRF_DEFAULT_IRQ_PRIORITY>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			dppic136: dppic@9d1000 {
@@ -1184,7 +1177,6 @@
 				interrupts = <469 NRF_DEFAULT_IRQ_PRIORITY>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 
 			i2c137: i2c@9d6000 {
@@ -1223,7 +1215,6 @@
 				interrupts = <470 NRF_DEFAULT_IRQ_PRIORITY>;
 				nordic,clockpin-enable = <NRF_FUN_UART_TX>;
 				endtx-stoptx-supported;
-				frame-timeout-supported;
 			};
 		};
 	};

From 603eff44f10447b5d9c4bcfea8afad907462fd3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:43 +0100
Subject: [PATCH 1654/2913] Revert "[nrf fromtree] drivers: serial: nrfx_uarte:
 Split async control block structure"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0c3d03772d103ef5225f43e3690e969b7b0559c7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/uart_nrfx_uarte.c | 314 +++++++++++++++----------------
 1 file changed, 154 insertions(+), 160 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index c4b136bf1f4..00225464f37 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -108,51 +108,45 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #define UARTE_HW_RX_FIFO_SIZE 5
 
 #ifdef UARTE_ANY_ASYNC
+struct uarte_async_cb {
+	uart_callback_t user_callback;
+	void *user_data;
 
-struct uarte_async_tx {
-	struct k_timer timer;
-	const uint8_t *buf;
-	volatile size_t len;
+	const uint8_t *tx_buf;
+	volatile size_t tx_size;
 	const uint8_t *xfer_buf;
 	size_t xfer_len;
-	size_t cache_offset;
-	volatile int amount;
-	bool pending;
-};
 
-struct uarte_async_rx {
-	struct k_timer timer;
-	uint8_t *buf;
-	size_t buf_len;
-	size_t offset;
-	uint8_t *next_buf;
-	size_t next_buf_len;
-	uint32_t total_byte_cnt; /* Total number of bytes received */
-	uint32_t total_user_byte_cnt; /* Total number of bytes passed to user */
-	int32_t timeout; /* Timeout set by user */
-	int32_t timeout_slab; /* rx_timeout divided by RX_TIMEOUT_DIV */
-	int32_t timeout_left; /* Current time left until user callback */
+	size_t tx_cache_offset;
+
+	struct k_timer tx_timeout_timer;
+
+	uint8_t *rx_buf;
+	size_t rx_buf_len;
+	size_t rx_offset;
+	uint8_t *rx_next_buf;
+	size_t rx_next_buf_len;
+	uint32_t rx_total_byte_cnt; /* Total number of bytes received */
+	uint32_t rx_total_user_byte_cnt; /* Total number of bytes passed to user */
+	int32_t rx_timeout; /* Timeout set by user */
+	int32_t rx_timeout_slab; /* rx_timeout divided by RX_TIMEOUT_DIV */
+	int32_t rx_timeout_left; /* Current time left until user callback */
+	struct k_timer rx_timeout_timer;
 	union {
-		uint8_t ppi;
+		gppi_channel_t ppi;
 		uint32_t cnt;
-	} cnt;
-	/* Flag to ensure that RX timeout won't be executed during ENDRX ISR */
-	volatile bool is_in_irq;
-	uint8_t flush_buffer[UARTE_HW_RX_FIFO_SIZE];
-	uint8_t flush_cnt;
-	volatile bool enabled;
-	volatile bool discard_fifo;
-	volatile bool aborted;
-};
+	} rx_cnt;
+	volatile int tx_amount;
 
-struct uarte_async_cb {
-	uart_callback_t user_callback;
-	void *user_data;
 	atomic_t low_power_mask;
-	struct uarte_async_rx rx;
-	struct uarte_async_tx tx;
+	uint8_t rx_flush_buffer[UARTE_HW_RX_FIFO_SIZE];
+	uint8_t rx_flush_cnt;
+	volatile bool rx_enabled;
+	volatile bool discard_rx_fifo;
+	bool pending_tx;
+	/* Flag to ensure that RX timeout won't be executed during ENDRX ISR */
+	volatile bool is_in_irq;
 };
-
 #endif /* UARTE_ANY_ASYNC */
 
 #ifdef UARTE_INTERRUPT_DRIVEN
@@ -561,7 +555,7 @@ static int uarte_enable(const struct device *dev, uint32_t mask)
 
 			nrfx_timer_enable(timer);
 
-			for (int i = 0; i < data->async->rx.flush_cnt; i++) {
+			for (int i = 0; i < data->async->rx_flush_cnt; i++) {
 				nrfx_timer_increment(timer);
 			}
 		}
@@ -610,8 +604,8 @@ static void uart_disable(const struct device *dev)
 	if (data->async && HW_RX_COUNTING_ENABLED(config)) {
 		nrfx_timer_disable(&config->timer);
 		/* Timer/counter value is reset when disabled. */
-		data->async->rx.total_byte_cnt = 0;
-		data->async->rx.total_user_byte_cnt = 0;
+		data->async->rx_total_byte_cnt = 0;
+		data->async->rx_total_user_byte_cnt = 0;
 	}
 #endif
 
@@ -649,7 +643,7 @@ static int uarte_nrfx_rx_counting_init(const struct device *dev)
 			nrfx_timer_clear(&cfg->timer);
 		}
 
-		ret = gppi_channel_alloc(&data->async->rx.cnt.ppi);
+		ret = gppi_channel_alloc(&data->async->rx_cnt.ppi);
 		if (ret != NRFX_SUCCESS) {
 			LOG_ERR("Failed to allocate PPI Channel");
 			nrfx_timer_uninit(&cfg->timer);
@@ -658,7 +652,7 @@ static int uarte_nrfx_rx_counting_init(const struct device *dev)
 
 #if CONFIG_HAS_HW_NRF_PPI
 		ret = nrfx_ppi_channel_assign(
-			data->async->rx.cnt.ppi,
+			data->async->rx_cnt.ppi,
 			nrf_uarte_event_address_get(uarte,
 						    NRF_UARTE_EVENT_RXDRDY),
 			nrfx_timer_task_address_get(&cfg->timer,
@@ -670,13 +664,13 @@ static int uarte_nrfx_rx_counting_init(const struct device *dev)
 #else
 		nrf_uarte_publish_set(uarte,
 				      NRF_UARTE_EVENT_RXDRDY,
-				      data->async->rx.cnt.ppi);
+				      data->async->rx_cnt.ppi);
 		nrf_timer_subscribe_set(cfg->timer.p_reg,
 					NRF_TIMER_TASK_COUNT,
-					data->async->rx.cnt.ppi);
+					data->async->rx_cnt.ppi);
 
 #endif
-		ret = gppi_channel_enable(data->async->rx.cnt.ppi);
+		ret = gppi_channel_enable(data->async->rx_cnt.ppi);
 		if (ret != NRFX_SUCCESS) {
 			return -EIO;
 		}
@@ -706,10 +700,10 @@ static int uarte_nrfx_init(const struct device *dev)
 			     NRF_UARTE_INT_RXTO_MASK);
 	nrf_uarte_enable(uarte);
 
-	k_timer_init(&data->async->rx.timer, rx_timeout, NULL);
-	k_timer_user_data_set(&data->async->rx.timer, data);
-	k_timer_init(&data->async->tx.timer, tx_timeout, NULL);
-	k_timer_user_data_set(&data->async->tx.timer, data);
+	k_timer_init(&data->async->rx_timeout_timer, rx_timeout, NULL);
+	k_timer_user_data_set(&data->async->rx_timeout_timer, data);
+	k_timer_init(&data->async->tx_timeout_timer, tx_timeout, NULL);
+	k_timer_user_data_set(&data->async->tx_timeout_timer, data);
 
 	return 0;
 }
@@ -722,11 +716,11 @@ static void start_tx_locked(const struct device *dev, struct uarte_nrfx_data *da
 {
 	if (!is_tx_ready(dev)) {
 		/* Active poll out, postpone until it is completed. */
-		data->async->tx.pending = true;
+		data->async->pending_tx = true;
 	} else {
-		data->async->tx.pending = false;
-		data->async->tx.amount = -1;
-		tx_start(dev, data->async->tx.xfer_buf, data->async->tx.xfer_len);
+		data->async->pending_tx = false;
+		data->async->tx_amount = -1;
+		tx_start(dev, data->async->xfer_buf, data->async->xfer_len);
 	}
 }
 
@@ -739,7 +733,7 @@ static bool setup_tx_cache(const struct device *dev)
 {
 	struct uarte_nrfx_data *data = dev->data;
 	const struct uarte_nrfx_config *config = dev->config;
-	size_t remaining = data->async->tx.len - data->async->tx.cache_offset;
+	size_t remaining = data->async->tx_size - data->async->tx_cache_offset;
 
 	if (!remaining) {
 		return false;
@@ -747,9 +741,9 @@ static bool setup_tx_cache(const struct device *dev)
 
 	size_t len = MIN(remaining, CONFIG_UART_ASYNC_TX_CACHE_SIZE);
 
-	data->async->tx.xfer_len = len;
-	data->async->tx.xfer_buf = config->tx_cache;
-	memcpy(config->tx_cache, &data->async->tx.buf[data->async->tx.cache_offset], len);
+	data->async->xfer_len = len;
+	data->async->xfer_buf = config->tx_cache;
+	memcpy(config->tx_cache, &data->async->tx_buf[data->async->tx_cache_offset], len);
 
 	return true;
 }
@@ -776,20 +770,20 @@ static int uarte_nrfx_tx(const struct device *dev, const uint8_t *buf,
 
 	unsigned int key = irq_lock();
 
-	if (data->async->tx.len) {
+	if (data->async->tx_size) {
 		irq_unlock(key);
 		return -EBUSY;
 	}
 
-	data->async->tx.len = len;
-	data->async->tx.buf = buf;
+	data->async->tx_size = len;
+	data->async->tx_buf = buf;
 	nrf_uarte_int_enable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
 
 	if (nrfx_is_in_ram(buf)) {
-		data->async->tx.xfer_buf = buf;
-		data->async->tx.xfer_len = len;
+		data->async->xfer_buf = buf;
+		data->async->xfer_len = len;
 	} else {
-		data->async->tx.cache_offset = 0;
+		data->async->tx_cache_offset = 0;
 		(void)setup_tx_cache(dev);
 	}
 
@@ -798,7 +792,7 @@ static int uarte_nrfx_tx(const struct device *dev, const uint8_t *buf,
 	irq_unlock(key);
 
 	if (has_hwfc(dev) && timeout != SYS_FOREVER_US) {
-		k_timer_start(&data->async->tx.timer, K_USEC(timeout), K_NO_WAIT);
+		k_timer_start(&data->async->tx_timeout_timer, K_USEC(timeout), K_NO_WAIT);
 	}
 	return 0;
 }
@@ -808,12 +802,12 @@ static int uarte_nrfx_tx_abort(const struct device *dev)
 	struct uarte_nrfx_data *data = dev->data;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
-	if (data->async->tx.buf == NULL) {
+	if (data->async->tx_buf == NULL) {
 		return -EFAULT;
 	}
 
-	data->async->tx.pending = false;
-	k_timer_stop(&data->async->tx.timer);
+	data->async->pending_tx = false;
+	k_timer_stop(&data->async->tx_timeout_timer);
 	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPTX);
 
 	return 0;
@@ -833,9 +827,9 @@ static void notify_uart_rx_rdy(const struct device *dev, size_t len)
 	struct uarte_nrfx_data *data = dev->data;
 	struct uart_event evt = {
 		.type = UART_RX_RDY,
-		.data.rx.buf = data->async->rx.buf,
+		.data.rx.buf = data->async->rx_buf,
 		.data.rx.len = len,
-		.data.rx.offset = data->async->rx.offset
+		.data.rx.offset = data->async->rx_offset
 	};
 
 	user_callback(dev, &evt);
@@ -881,24 +875,24 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	 * for the RXTO event after a call to uart_rx_disable() to discard
 	 * data from the UARTE internal RX FIFO.
 	 */
-	if (data->async->rx.enabled || data->async->rx.discard_fifo) {
+	if (data->async->rx_enabled || data->async->discard_rx_fifo) {
 		return -EBUSY;
 	}
 
-	data->async->rx.timeout = timeout;
-	data->async->rx.timeout_slab = timeout / RX_TIMEOUT_DIV;
+	data->async->rx_timeout = timeout;
+	data->async->rx_timeout_slab = timeout / RX_TIMEOUT_DIV;
 
-	data->async->rx.buf = buf;
-	data->async->rx.buf_len = len;
-	data->async->rx.offset = 0;
-	data->async->rx.next_buf = NULL;
-	data->async->rx.next_buf_len = 0;
+	data->async->rx_buf = buf;
+	data->async->rx_buf_len = len;
+	data->async->rx_offset = 0;
+	data->async->rx_next_buf = NULL;
+	data->async->rx_next_buf_len = 0;
 
 	if (cfg->flags & UARTE_CFG_FLAG_LOW_POWER) {
-		if (data->async->rx.flush_cnt) {
-			int cpy_len = MIN(len, data->async->rx.flush_cnt);
+		if (data->async->rx_flush_cnt) {
+			int cpy_len = MIN(len, data->async->rx_flush_cnt);
 
-			memcpy(buf, data->async->rx.flush_buffer, cpy_len);
+			memcpy(buf, data->async->rx_flush_buffer, cpy_len);
 			buf += cpy_len;
 			len -= cpy_len;
 
@@ -906,9 +900,9 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 			 * request and indicate rx being disabled.
 			 */
 			if (!len) {
-				data->async->rx.flush_cnt -= cpy_len;
+				data->async->rx_flush_cnt -= cpy_len;
 				notify_uart_rx_rdy(dev, cpy_len);
-				rx_buf_release(dev, &data->async->rx.buf);
+				rx_buf_release(dev, &data->async->rx_buf);
 				notify_rx_disable(dev);
 				return 0;
 			}
@@ -920,7 +914,7 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 
-	data->async->rx.enabled = true;
+	data->async->rx_enabled = true;
 	if (cfg->flags & UARTE_CFG_FLAG_LOW_POWER) {
 		unsigned int key = irq_lock();
 
@@ -941,11 +935,11 @@ static int uarte_nrfx_rx_buf_rsp(const struct device *dev, uint8_t *buf,
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	unsigned int key = irq_lock();
 
-	if (data->async->rx.buf == NULL) {
+	if (data->async->rx_buf == NULL) {
 		err = -EACCES;
-	} else if (data->async->rx.next_buf == NULL) {
-		data->async->rx.next_buf = buf;
-		data->async->rx.next_buf_len = len;
+	} else if (data->async->rx_next_buf == NULL) {
+		data->async->rx_next_buf = buf;
+		data->async->rx_next_buf_len = len;
 		nrf_uarte_rx_buffer_set(uarte, buf, len);
 		nrf_uarte_shorts_enable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
 		err = 0;
@@ -979,17 +973,17 @@ static int uarte_nrfx_rx_disable(const struct device *dev)
 	struct uarte_nrfx_data *data = dev->data;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
-	if (data->async->rx.buf == NULL) {
+	if (data->async->rx_buf == NULL) {
 		return -EFAULT;
 	}
-	if (data->async->rx.next_buf != NULL) {
+	if (data->async->rx_next_buf != NULL) {
 		nrf_uarte_shorts_disable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 	}
 
-	k_timer_stop(&data->async->rx.timer);
-	data->async->rx.enabled = false;
-	data->async->rx.discard_fifo = true;
+	k_timer_stop(&data->async->rx_timeout_timer);
+	data->async->rx_enabled = false;
+	data->async->discard_rx_fifo = true;
 
 	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPRX);
 
@@ -1017,7 +1011,7 @@ static void rx_timeout(struct k_timer *timer)
 	const struct uarte_nrfx_config *cfg = dev->config;
 	uint32_t read;
 
-	if (data->async->rx.is_in_irq) {
+	if (data->async->is_in_irq) {
 		return;
 	}
 
@@ -1030,21 +1024,21 @@ static void rx_timeout(struct k_timer *timer)
 	if (HW_RX_COUNTING_ENABLED(cfg)) {
 		read = nrfx_timer_capture(&cfg->timer, 0);
 	} else {
-		read = data->async->rx.cnt.cnt;
+		read = data->async->rx_cnt.cnt;
 	}
 
 	/* Check if data was received since last function call */
-	if (read != data->async->rx.total_byte_cnt) {
-		data->async->rx.total_byte_cnt = read;
-		data->async->rx.timeout_left = data->async->rx.timeout;
+	if (read != data->async->rx_total_byte_cnt) {
+		data->async->rx_total_byte_cnt = read;
+		data->async->rx_timeout_left = data->async->rx_timeout;
 	}
 
 	/* Check if there is data that was not sent to user yet
 	 * Note though that 'len' is a count of data bytes received, but not
 	 * necessarily the amount available in the current buffer
 	 */
-	int32_t len = data->async->rx.total_byte_cnt
-		    - data->async->rx.total_user_byte_cnt;
+	int32_t len = data->async->rx_total_byte_cnt
+		    - data->async->rx_total_user_byte_cnt;
 
 	if (!HW_RX_COUNTING_ENABLED(cfg) &&
 	    (len < 0)) {
@@ -1053,7 +1047,7 @@ static void rx_timeout(struct k_timer *timer)
 		 * At this point, the number of received bytes is at least
 		 * equal to what was reported to the user.
 		 */
-		data->async->rx.cnt.cnt = data->async->rx.total_user_byte_cnt;
+		data->async->rx_cnt.cnt = data->async->rx_total_user_byte_cnt;
 		len = 0;
 	}
 
@@ -1065,31 +1059,31 @@ static void rx_timeout(struct k_timer *timer)
 	 */
 	bool clipped = false;
 
-	if (len + data->async->rx.offset > data->async->rx.buf_len) {
-		len = data->async->rx.buf_len - data->async->rx.offset;
+	if (len + data->async->rx_offset > data->async->rx_buf_len) {
+		len = data->async->rx_buf_len - data->async->rx_offset;
 		clipped = true;
 	}
 
 	if (len > 0) {
 		if (clipped ||
-			(data->async->rx.timeout_left
-				< data->async->rx.timeout_slab)) {
+			(data->async->rx_timeout_left
+				< data->async->rx_timeout_slab)) {
 			/* rx_timeout us elapsed since last receiving */
-			if (data->async->rx.buf != NULL) {
+			if (data->async->rx_buf != NULL) {
 				notify_uart_rx_rdy(dev, len);
-				data->async->rx.offset += len;
-				data->async->rx.total_user_byte_cnt += len;
+				data->async->rx_offset += len;
+				data->async->rx_total_user_byte_cnt += len;
 			}
 		} else {
-			data->async->rx.timeout_left -=
-				data->async->rx.timeout_slab;
+			data->async->rx_timeout_left -=
+				data->async->rx_timeout_slab;
 		}
 
 		/* If there's nothing left to report until the buffers are
 		 * switched then the timer can be stopped
 		 */
 		if (clipped) {
-			k_timer_stop(&data->async->rx.timer);
+			k_timer_stop(&data->async->rx_timeout_timer);
 		}
 	}
 
@@ -1124,11 +1118,11 @@ static void rxstarted_isr(const struct device *dev)
 		.type = UART_RX_BUF_REQUEST,
 	};
 	user_callback(dev, &evt);
-	if (data->async->rx.timeout != SYS_FOREVER_US) {
-		data->async->rx.timeout_left = data->async->rx.timeout;
-		k_timer_start(&data->async->rx.timer,
-			      K_USEC(data->async->rx.timeout_slab),
-			      K_USEC(data->async->rx.timeout_slab));
+	if (data->async->rx_timeout != SYS_FOREVER_US) {
+		data->async->rx_timeout_left = data->async->rx_timeout;
+		k_timer_start(&data->async->rx_timeout_timer,
+			      K_USEC(data->async->rx_timeout_slab),
+			      K_USEC(data->async->rx_timeout_slab));
 	}
 }
 
@@ -1137,20 +1131,20 @@ static void endrx_isr(const struct device *dev)
 	struct uarte_nrfx_data *data = dev->data;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
-	data->async->rx.is_in_irq = true;
+	data->async->is_in_irq = true;
 
 	/* ensure rx timer is stopped - it will be restarted in RXSTARTED
 	 * handler if needed
 	 */
-	k_timer_stop(&data->async->rx.timer);
+	k_timer_stop(&data->async->rx_timeout_timer);
 
 	/* this is the amount that the EasyDMA controller has copied into the
 	 * buffer
 	 */
 	const int rx_amount = nrf_uarte_rx_amount_get(uarte) +
-				data->async->rx.flush_cnt;
+				data->async->rx_flush_cnt;
 
-	data->async->rx.flush_cnt = 0;
+	data->async->rx_flush_cnt = 0;
 
 	/* The 'rx_offset' can be bigger than 'rx_amount', so it the length
 	 * of data we report back the user may need to be clipped.
@@ -1159,25 +1153,25 @@ static void endrx_isr(const struct device *dev)
 	 * here to handle this buffer. (The next buffer is now already active
 	 * because of the ENDRX_STARTRX shortcut)
 	 */
-	int rx_len = rx_amount - data->async->rx.offset;
+	int rx_len = rx_amount - data->async->rx_offset;
 
 	if (rx_len < 0) {
 		rx_len = 0;
 	}
 
-	data->async->rx.total_user_byte_cnt += rx_len;
+	data->async->rx_total_user_byte_cnt += rx_len;
 
 	/* Only send the RX_RDY event if there is something to send */
 	if (rx_len > 0) {
 		notify_uart_rx_rdy(dev, rx_len);
 	}
 
-	if (!data->async->rx.enabled) {
-		data->async->rx.is_in_irq = false;
+	if (!data->async->rx_enabled) {
+		data->async->is_in_irq = false;
 		return;
 	}
 
-	rx_buf_release(dev, &data->async->rx.buf);
+	rx_buf_release(dev, &data->async->rx_buf);
 
 	/* If there is a next buffer, then STARTRX will have already been
 	 * invoked by the short (the next buffer will be filling up already)
@@ -1186,13 +1180,13 @@ static void endrx_isr(const struct device *dev)
 	 */
 	unsigned int key = irq_lock();
 
-	if (data->async->rx.next_buf) {
-		data->async->rx.buf = data->async->rx.next_buf;
-		data->async->rx.buf_len = data->async->rx.next_buf_len;
-		data->async->rx.next_buf = NULL;
-		data->async->rx.next_buf_len = 0;
+	if (data->async->rx_next_buf) {
+		data->async->rx_buf = data->async->rx_next_buf;
+		data->async->rx_buf_len = data->async->rx_next_buf_len;
+		data->async->rx_next_buf = NULL;
+		data->async->rx_next_buf_len = 0;
 
-		data->async->rx.offset = 0;
+		data->async->rx_offset = 0;
 		/* Check is based on assumption that ISR handler handles
 		 * ENDRX before RXSTARTED so if short was set on time, RXSTARTED
 		 * event will be set.
@@ -1208,7 +1202,7 @@ static void endrx_isr(const struct device *dev)
 
 	irq_unlock(key);
 
-	data->async->rx.is_in_irq = false;
+	data->async->is_in_irq = false;
 }
 
 /* Function for flushing internal RX fifo. Function can be called in case
@@ -1287,9 +1281,9 @@ static void async_uart_release(const struct device *dev, uint32_t dir_mask)
 	data->async->low_power_mask &= ~dir_mask;
 	if (!data->async->low_power_mask) {
 		if (dir_mask == UARTE_LOW_POWER_RX) {
-			data->async->rx.flush_cnt =
-				rx_flush(dev, data->async->rx.flush_buffer,
-					 sizeof(data->async->rx.flush_buffer));
+			data->async->rx_flush_cnt =
+				rx_flush(dev, data->async->rx_flush_buffer,
+					 sizeof(data->async->rx_flush_buffer));
 		}
 
 		uart_disable(dev);
@@ -1310,8 +1304,8 @@ static void rxto_isr(const struct device *dev)
 	const struct uarte_nrfx_config *config = dev->config;
 	struct uarte_nrfx_data *data = dev->data;
 
-	rx_buf_release(dev, &data->async->rx.buf);
-	rx_buf_release(dev, &data->async->rx.next_buf);
+	rx_buf_release(dev, &data->async->rx_buf);
+	rx_buf_release(dev, &data->async->rx_next_buf);
 
 	/* This point can be reached in two cases:
 	 * 1. RX is disabled because all provided RX buffers have been filled.
@@ -1321,17 +1315,17 @@ static void rxto_isr(const struct device *dev)
 	 * In the second case, additionally, data from the UARTE internal RX
 	 * FIFO need to be discarded.
 	 */
-	data->async->rx.enabled = false;
-	if (data->async->rx.discard_fifo) {
+	data->async->rx_enabled = false;
+	if (data->async->discard_rx_fifo) {
 		uint8_t flushed;
 
-		data->async->rx.discard_fifo = false;
+		data->async->discard_rx_fifo = false;
 		flushed = rx_flush(dev, NULL, 0);
 		if (HW_RX_COUNTING_ENABLED(config)) {
 			/* It need to be included because TIMER+PPI got RXDRDY events
 			 * and counted those flushed bytes.
 			 */
-			data->async->rx.total_user_byte_cnt += flushed;
+			data->async->rx_total_user_byte_cnt += flushed;
 		}
 	}
 
@@ -1353,18 +1347,18 @@ static void txstopped_isr(const struct device *dev)
 		nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
 		async_uart_release(dev, UARTE_LOW_POWER_TX);
 
-		if (!data->async->tx.len) {
+		if (!data->async->tx_size) {
 			return;
 		}
 	}
 
-	if (!data->async->tx.buf) {
+	if (!data->async->tx_buf) {
 		return;
 	}
 
 	key = irq_lock();
-	size_t amount = (data->async->tx.amount >= 0) ?
-			data->async->tx.amount : nrf_uarte_tx_amount_get(uarte);
+	size_t amount = (data->async->tx_amount >= 0) ?
+			data->async->tx_amount : nrf_uarte_tx_amount_get(uarte);
 
 	irq_unlock(key);
 
@@ -1372,7 +1366,7 @@ static void txstopped_isr(const struct device *dev)
 	 * was called when there was ongoing uart_poll_out. Handling
 	 * TXSTOPPED interrupt means that uart_poll_out has completed.
 	 */
-	if (data->async->tx.pending) {
+	if (data->async->pending_tx) {
 		key = irq_lock();
 		start_tx_locked(dev, data);
 		irq_unlock(key);
@@ -1380,12 +1374,12 @@ static void txstopped_isr(const struct device *dev)
 	}
 
 	/* Cache buffer is used because tx_buf wasn't in RAM. */
-	if (data->async->tx.buf != data->async->tx.xfer_buf) {
+	if (data->async->tx_buf != data->async->xfer_buf) {
 		/* In that case setup next chunk. If that was the last chunk
 		 * fall back to reporting TX_DONE.
 		 */
-		if (amount == data->async->tx.xfer_len) {
-			data->async->tx.cache_offset += amount;
+		if (amount == data->async->xfer_len) {
+			data->async->tx_cache_offset += amount;
 			if (setup_tx_cache(dev)) {
 				key = irq_lock();
 				start_tx_locked(dev, data);
@@ -1394,28 +1388,28 @@ static void txstopped_isr(const struct device *dev)
 			}
 
 			/* Amount is already included in tx_cache_offset. */
-			amount = data->async->tx.cache_offset;
+			amount = data->async->tx_cache_offset;
 		} else {
 			/* TX was aborted, include tx_cache_offset in amount. */
-			amount += data->async->tx.cache_offset;
+			amount += data->async->tx_cache_offset;
 		}
 	}
 
-	k_timer_stop(&data->async->tx.timer);
+	k_timer_stop(&data->async->tx_timeout_timer);
 
 	struct uart_event evt = {
-		.data.tx.buf = data->async->tx.buf,
+		.data.tx.buf = data->async->tx_buf,
 		.data.tx.len = amount,
 	};
-	if (amount == data->async->tx.len) {
+	if (amount == data->async->tx_size) {
 		evt.type = UART_TX_DONE;
 	} else {
 		evt.type = UART_TX_ABORTED;
 	}
 
 	nrf_uarte_int_disable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
-	data->async->tx.buf = NULL;
-	data->async->tx.len = 0;
+	data->async->tx_buf = NULL;
+	data->async->tx_size = 0;
 
 	user_callback(dev, &evt);
 }
@@ -1431,7 +1425,7 @@ static void uarte_nrfx_isr_async(const void *arg)
 		struct uarte_nrfx_data *data = dev->data;
 
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXDRDY);
-		data->async->rx.cnt.cnt++;
+		data->async->rx_cnt.cnt++;
 		return;
 	}
 
@@ -1535,9 +1529,9 @@ static void uarte_nrfx_poll_out(const struct device *dev, unsigned char c)
 			key = irq_lock();
 			if (is_tx_ready(dev)) {
 #if UARTE_ANY_ASYNC
-				if (data->async && data->async->tx.len &&
-					data->async->tx.amount < 0) {
-					data->async->tx.amount =
+				if (data->async && data->async->tx_size &&
+					data->async->tx_amount < 0) {
+					data->async->tx_amount =
 						nrf_uarte_tx_amount_get(
 						      get_uarte_instance(dev));
 				}
@@ -1963,8 +1957,8 @@ static int uarte_nrfx_pm_action(const struct device *dev,
 			/* Entering inactive state requires device to be no
 			 * active asynchronous calls.
 			 */
-			__ASSERT_NO_MSG(!data->async->rx.enabled);
-			__ASSERT_NO_MSG(!data->async->tx.len);
+			__ASSERT_NO_MSG(!data->async->rx_enabled);
+			__ASSERT_NO_MSG(!data->async->tx_size);
 
 		}
 #endif

From 913c061f83a0310d3fb16c49a305efa824d582c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:43 +0100
Subject: [PATCH 1655/2913] Revert "[nrf fromtree] doc: ipc: Add detailed
 protocol specs for ICMsg backend"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 50b7c97380e6a5f4a631f48952dc106c7cb699b3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../backends/ipc_service_icmsg.rst            | 108 ------------------
 1 file changed, 108 deletions(-)

diff --git a/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst b/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst
index 56f618b442d..1b1298df49b 100644
--- a/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst
+++ b/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst
@@ -84,111 +84,3 @@ Samples
 =======
 
  - :zephyr:code-sample:`ipc-icmsg`
-
-Detailed Protocol Specification
-===============================
-
-The ICMsg uses two shared memory regions and two MBOX channels.
-The region and channel pair are used to transfer messages in one direction.
-The other pair is symmetric and transfers messages in the opposite direction.
-For this reason, the specification below focuses on one such pair.
-The other pair is identical.
-
-The ICMsg provides just one endpoint per instance.
-
-Shared Memory Region Organization
----------------------------------
-
-If data caching is enabled, the shared memory region provided to ICMsg must be aligned according to the cache requirement.
-If cache is not enabled, the required alignment is 4 bytes.
-
-The shared memory region is entirely used by a single FIFO.
-It contains read and write indexes followed by the data buffer.
-The detailed structure is contained in the following table:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Field name
-     - Size (bytes)
-     - Byte order
-     - Description
-   * - ``rd_idx``
-     - 4
-     - little‑endian
-     - Index of the first incoming byte in the ``data`` field.
-   * - ``padding``
-     - depends on cache alignment
-     - n/a
-     - Padding added to align ``wr_idx`` to the cache alignment.
-   * - ``wr_idx``
-     - 4
-     - little‑endian
-     - Index of the byte after the last incoming byte in the ``data`` field.
-   * - ``data``
-     - everything to the end of the region
-     - n/a
-     - Circular buffer containing actual bytes to transfer.
-
-This is usual FIFO with a circular buffer:
-
-* The Indexes (``rd_idx`` and ``wr_idx``) are wrapped around when they reach the end of the ``data`` buffer.
-* The FIFO is empty if ``rd_idx == wr_idx``.
-* The FIFO has one byte less capacity than the ``data`` buffer length.
-
-Packets
--------
-
-Packets are sent over the FIFO described in the above section.
-One packet can be wrapped around if it occurs at the end of the FIFO buffer.
-
-The following is the packet structure:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Field name
-     - Size (bytes)
-     - Byte order
-     - Description
-   * - ``len``
-     - 2
-     - big‑endian
-     - Length of the ``data`` field.
-   * - ``reserved``
-     - 2
-     - n/a
-     - Reserved for the future use.
-       It must be 0 for the current protocol version.
-   * - ``data``
-     - ``len``
-     - n/a
-     - Packet data.
-   * - ``padding``
-     - 0‑3
-     - n/a
-     - Padding is added to align the total packet size to 4 bytes.
-
-The packet send procedure is the following:
-
-#. Check if the packet fits into the buffer.
-#. Write the packet to ``data`` FIFO buffer starting at ``wr_idx``.
-   Wrap it if needed.
-#. Write a new value of the ``wr_idx``.
-#. Notify the receiver over the MBOX channel.
-
-Initialization
---------------
-
-The initialization sequence is the following:
-
-#. Set the ``wr_idx`` and ``rd_idx`` to zero.
-#. Push a single packet to FIFO containing magic data: ``45 6d 31 6c 31 4b 30 72 6e 33 6c 69 34``.
-   The MBOX is not used yet.
-#. Initialize the MBOX.
-#. Repeat the notification over the MBOX channel using some interval, for example, 1 ms.
-#. Wait for an incoming packet containing the magic data.
-   It will arrive over the other pair (shared memory region and MBOX).
-#. Stop repeating the MBOX notification.
-
-After this, the ICMsg is bound, and it is ready to transfer packets.

From 812261f1576334b5a903c6822fd34742df0a458b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:43 +0100
Subject: [PATCH 1656/2913] Revert "[nrf fromtree] doc: ipc: Add detailed
 protocol specs for ICBMsg backend"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ea82ec041dc5e1129ed5b6eb22c0badee88c0e1e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../ipc/ipc_service/backends/icbmsg_flows.svg | 520 ------------------
 .../ipc_service/backends/icbmsg_memory.svg    | 266 ---------
 .../ipc_service/backends/icbmsg_message.svg   | 209 -------
 .../backends/ipc_service_icbmsg.rst           | 297 ----------
 4 files changed, 1292 deletions(-)
 delete mode 100644 doc/services/ipc/ipc_service/backends/icbmsg_flows.svg
 delete mode 100644 doc/services/ipc/ipc_service/backends/icbmsg_memory.svg
 delete mode 100644 doc/services/ipc/ipc_service/backends/icbmsg_message.svg

diff --git a/doc/services/ipc/ipc_service/backends/icbmsg_flows.svg b/doc/services/ipc/ipc_service/backends/icbmsg_flows.svg
deleted file mode 100644
index f0ecb633a22..00000000000
--- a/doc/services/ipc/ipc_service/backends/icbmsg_flows.svg
+++ /dev/null
@@ -1,520 +0,0 @@
-<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="632px" height="662px" viewBox="-0.5 -0.5 632 662" content="&lt;mxfile&gt;&lt;diagram id=&quot;9mlln88F-3eijnHMO-SS&quot; name=&quot;Page-1&quot;&gt;7Vxtk6I4EP41fpwteXP0ozovu1U7d1vnXt3ep6sMRE1tIF6Io+6vv0SCSILAIQI6M1u1kzShiU8/6XQ3cXrW1N8+U7BavhAP4p7Z97Y966FnmiPL5P8LwU4KnH4kWFDkRSIjEczQLyiF8bA18mCYGsgIwQyt0kKXBAF0WUoGKCWb9LA5wemnrsBCPrGfCGYuwFAb9hfy2DKSDs37RP4ZosUyfrIxGEVXfBAPlorDJfDI5khkPfasKSWERS1/O4VYYBfjEt33dOLqYWIUBqzMDdIQbwCv5Wf7Mp28hIueOcBcweSV8tZCtJC/wtDnagFDJJCzZ7sYEkrWgQeF1j4fvFkiBmcr4IqrG84BLlsyH/OewZv6LOXE3yBlcHskkrN+hsSHjO74kPjqQCIoKRQDuknsYcSy5ZEt4tuApMDioDlBiTckUNmg2dcKmtUiaE5p0NYhpBpUfKGsRHPt47HLCOXjxOdGfFF+Ba8QfyMh2mNsPbwSxoh/NGCM0UJcYESBlKwZRgGcHtxEvyacnSKYrQuhPHhHKDv3rcE81GDWoISBNxZbDe8FJODCiQfC5X6xG2l8QkbJTw4PFnjzW63R/icPJOgtYC5ERxg4GRjEMgox90xv6W0tCxj5hG8E8ZkkPDfT/mRgKdiGZE1dKO863oYKFN2ZiiIG6AIyTdHeToePXcp0I32FBJzTQLBdtSEnIsuzlTTsHGGsiIBcDC63HKQZq8RHnicek+n10/vCnARsJid16EcxkVnTUjIU+K2spZTBI9XeVdaSoccgTwRjssnwT+/GIJbdpkWsKu7tyCgqIBwHuvsh0PrkxN2/5dh952EroYx6u6JNInIHqRC2Iy7RrMsl2kM1VruYSzT0gPY8e3d933JqspGix7jcrmXo4fONm2hUl41GzRlJj7477DftTtnbrs1vGqNPzrCf/Nhp81/Qjd5r5qdwgUIRb3CcA28VPUTNxPjvf9ei4DOBWyAKBkYiyeOPi0EYIvckhXhgJeIjQFl8B+FTi2VPCBdWFgq5cTrzas57G2pCV5Yp6latKTpBjURRPJDM5yE8mz56Uvkye/5n8vufv/H2VOdNAHzYE58hjz5TMU3PozAMeau/7RtnU+rK6FJo5tKepWN80TPZd+Ju7hr2N0oEoUXiVQlUNqS/EIHi2SgO54/Hr4/j2WOO4ynvT3JDHJ0wCcVUznCdsnde8NoJD2TadRFIVdQwgeKyRkKgV1Eo4SIXYPwK3J955JDuoU5y1ONejHbdy62wwzyLHc2EIg3bujZP4HTL1HriWy0UMa8tFGk187Hqynw0RQ3TR0+cq2U+Zm7mY7bvbtqNOyrzRd1Z2uaLnim/E3fTcuZzeE17NoFKFmEvRSA9da6Q+eT6k4/MJ8sD2XURSFPULIHi4vRH5lOne7kZdpyXF7+LzKeyrZ1umVpPcr8vRWyKkkNF/f2qFZvGHNGQaabv0KGWI4ItCUW/uAwUbj3lT7WoBfSSJ/a0QnuVQy2WfqglstT8cNjow1AnDGUOSxpqWIehKp1GOXW4UkULbhH7IYES7cPrdN5O3qaLTvwyvcLxzMiXpT1EV96z9xXTVn2ZMTjFkfpfrFuVDr80yIjJ/l9pRlidYsSdcvjTrlqTVBlhl6wSVGGEXnAM4T7A8gAD/Jf4soWavCWFgYLKUWOVAIUBGczpSB6nBF2OUZEi6saiKWo4essuPD6Mv4/PTP//Rwx/NSQoNF7VdK1tFmSVE9maBiIQpMRPpW0qJfYBvnQ6HF8IQngdDqTlUqJzXxd5VEUNkye/lBi5ksJY5TJlwjPY0W5x4FbIEUdSR+SQrqJMHair3Gi5Sngr245tauR4iMjh8xhDfANd5cZV1R+0YkMpimXXHw6ZRFH9wVEsWunb3ZW+/dRetlm8ktPpZ8S7rmSbh9V9brY5KLmai1cq7yZ/gCEanvwVC+vxPw==&lt;/diagram&gt;&lt;/mxfile&gt;">
-    <defs/>
-    <g>
-        <rect x="150" y="50" width="120" height="60" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 80px; margin-left: 151px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                ICBMsg
-                                <br/>
-                                implementation
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="210" y="84" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    ICBMsg...
-                </text>
-            </switch>
-        </g>
-        <rect x="350" y="50" width="120" height="60" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 80px; margin-left: 351px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                ICBMsg
-                                <br/>
-                                implementation
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="410" y="84" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    ICBMsg...
-                </text>
-            </switch>
-        </g>
-        <ellipse cx="40" cy="57.5" rx="7.5" ry="7.5" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
-        <path d="M 40 65 L 40 90 M 40 70 L 25 70 M 40 70 L 55 70 M 40 90 L 25 110 M 40 90 L 55 110" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 117px; margin-left: 40px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
-                                ICBMsg
-                                <br/>
-                                user
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="40" y="129" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    ICBMs...
-                </text>
-            </switch>
-        </g>
-        <ellipse cx="580" cy="57.5" rx="7.5" ry="7.5" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
-        <path d="M 580 65 L 580 90 M 580 70 L 565 70 M 580 70 L 595 70 M 580 90 L 565 110 M 580 90 L 595 110" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 117px; margin-left: 580px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
-                                ICBMsg
-                                <br/>
-                                user
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="580" y="129" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    ICBMs...
-                </text>
-            </switch>
-        </g>
-        <path d="M 310 660 L 310 10" fill="none" stroke="#999999" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
-        <rect x="0" y="0" width="300" height="30" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 298px; height: 1px; padding-top: 15px; margin-left: 1px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 20px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                Initiator
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="150" y="21" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="20px" text-anchor="middle">
-                    Initiator
-                </text>
-            </switch>
-        </g>
-        <rect x="330" y="0" width="300" height="30" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 298px; height: 1px; padding-top: 15px; margin-left: 331px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 20px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                Follower
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="480" y="21" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="20px" text-anchor="middle">
-                    Follower
-                </text>
-            </switch>
-        </g>
-        <path d="M 210 660 L 210 110" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 40 660 L 40 150" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 580 660 L 580 150" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 410 660 L 410 110" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 43 190 L 203.63 190" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <ellipse cx="40" cy="190" rx="3" ry="3" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
-        <path d="M 208.88 190 L 201.88 193.5 L 203.63 190 L 201.88 186.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 170px; margin-left: 125px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                register endpoint
-                                <br/>
-                                "example1"
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="125" y="174" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    register...
-                </text>
-            </switch>
-        </g>
-        <path d="M 210 190 L 403.63 190" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 408.88 190 L 401.88 193.5 L 403.63 190 L 401.88 186.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 170px; margin-left: 310px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                MSG_BOUND,
-                                <br/>
-                                name "example1", address 0x01
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="310" y="174" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    MSG_BOUND...
-                </text>
-            </switch>
-        </g>
-        <path d="M 577 230 L 416.37 230" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <ellipse cx="580" cy="230" rx="3" ry="3" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
-        <path d="M 411.12 230 L 418.12 226.5 L 416.37 230 L 418.12 233.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 210px; margin-left: 495px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                register endpoint
-                                <br/>
-                                "example1"
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="495" y="214" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    register...
-                </text>
-            </switch>
-        </g>
-        <path d="M 216.37 270 L 410 270" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 211.12 270 L 218.12 266.5 L 216.37 270 L 218.12 273.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 250px; margin-left: 310px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                MSG_RELEASE_BOUND,
-                                <br/>
-                                address 0x01
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="310" y="254" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    MSG_RELEA...
-                </text>
-            </switch>
-        </g>
-        <path d="M 573.63 270 L 413 270" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 578.88 270 L 571.88 273.5 L 573.63 270 L 571.88 266.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <ellipse cx="410" cy="270" rx="3" ry="3" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 260px; margin-left: 495px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                bound callback
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="495" y="264" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    bound cal...
-                </text>
-            </switch>
-        </g>
-        <path d="M 210 270 L 46.37 270" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 41.12 270 L 48.12 266.5 L 46.37 270 L 48.12 273.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 260px; margin-left: 125px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                bound callback
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="125" y="264" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    bound cal...
-                </text>
-            </switch>
-        </g>
-        <path d="M 43 390 L 203.63 390" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <ellipse cx="40" cy="390" rx="3" ry="3" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
-        <path d="M 208.88 390 L 201.88 393.5 L 203.63 390 L 201.88 386.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 370px; margin-left: 125px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                register endpoint
-                                <br/>
-                                "example2"
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="125" y="374" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    register...
-                </text>
-            </switch>
-        </g>
-        <path d="M 210 390 L 403.63 390" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 408.88 390 L 401.88 393.5 L 403.63 390 L 401.88 386.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 370px; margin-left: 310px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                MSG_BOUND,
-                                <br/>
-                                name "example2", address 0x02
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="310" y="374" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    MSG_BOUND...
-                </text>
-            </switch>
-        </g>
-        <path d="M 577 350 L 416.37 350" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <ellipse cx="580" cy="350" rx="3" ry="3" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
-        <path d="M 411.12 350 L 418.12 346.5 L 416.37 350 L 418.12 353.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 330px; margin-left: 495px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                register endpoint
-                                <br/>
-                                "example2"
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="495" y="334" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    register...
-                </text>
-            </switch>
-        </g>
-        <path d="M 216.37 450 L 410 450" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 211.12 450 L 218.12 446.5 L 216.37 450 L 218.12 453.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 430px; margin-left: 310px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                MSG_RELEASE_BOUND,
-                                <br/>
-                                address 0x02
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="310" y="434" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    MSG_RELEA...
-                </text>
-            </switch>
-        </g>
-        <path d="M 573.63 450 L 413 450" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 578.88 450 L 571.88 453.5 L 573.63 450 L 571.88 446.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <ellipse cx="410" cy="450" rx="3" ry="3" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 440px; margin-left: 495px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                bound callback
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="495" y="444" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    bound cal...
-                </text>
-            </switch>
-        </g>
-        <path d="M 210 450 L 46.37 450" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 41.12 450 L 48.12 446.5 L 46.37 450 L 48.12 453.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 440px; margin-left: 125px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                bound callback
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="125" y="444" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    bound cal...
-                </text>
-            </switch>
-        </g>
-        <rect x="10" y="150" width="30" height="160" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)rotate(-90 24.999999999999886 230)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 158px; height: 1px; padding-top: 230px; margin-left: -54px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                The initiator starts first
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="25" y="234" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    The initiator starts first
-                </text>
-            </switch>
-        </g>
-        <rect x="10" y="310" width="30" height="180" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)rotate(-90 24.999999999999886 400)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 178px; height: 1px; padding-top: 400px; margin-left: -64px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                The follower starts first
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="25" y="404" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    The follower starts first
-                </text>
-            </switch>
-        </g>
-        <path d="M 10 310 L 610 310" fill="none" stroke="#999999" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
-        <path d="M 10 490 L 610 490" fill="none" stroke="#b3b3b3" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
-        <path d="M 43 540 L 203.63 540" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <ellipse cx="40" cy="540" rx="3" ry="3" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
-        <path d="M 208.88 540 L 201.88 543.5 L 203.63 540 L 201.88 536.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 520px; margin-left: 125px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                send data on
-                                <br/>
-                                endpoint "example2"
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="125" y="524" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    send data...
-                </text>
-            </switch>
-        </g>
-        <path d="M 210 540 L 403.63 540" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 408.88 540 L 401.88 543.5 L 403.63 540 L 401.88 536.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 520px; margin-left: 310px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                MSG_DATA,
-                                <br/>
-                                address 0x02
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="310" y="524" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    MSG_DATA,...
-                </text>
-            </switch>
-        </g>
-        <path d="M 577 600 L 416.37 600" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <ellipse cx="580" cy="600" rx="3" ry="3" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
-        <path d="M 411.12 600 L 418.12 596.5 L 416.37 600 L 418.12 603.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 580px; margin-left: 495px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                return from callback
-                                <br/>
-                                or data release
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="495" y="584" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    return fr...
-                </text>
-            </switch>
-        </g>
-        <path d="M 216.37 600 L 410 600" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 211.12 600 L 218.12 596.5 L 216.37 600 L 218.12 603.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 590px; margin-left: 310px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                MSG_RELEASE_DATA
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="310" y="594" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    MSG_RELEA...
-                </text>
-            </switch>
-        </g>
-        <path d="M 573.63 540 L 410 540" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 578.88 540 L 571.88 543.5 L 573.63 540 L 571.88 536.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 530px; margin-left: 495px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                data callback
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="495" y="534" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    data call...
-                </text>
-            </switch>
-        </g>
-        <rect x="10" y="490" width="30" height="150" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)rotate(-90 24.999999999999886 565)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 565px; margin-left: -49px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                Data message
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="25" y="569" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    Data message
-                </text>
-            </switch>
-        </g>
-        <path d="M 10 640 L 610 640" fill="none" stroke="#b3b3b3" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
-    </g>
-    <switch>
-        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
-        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
-            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
-                Text is not SVG - cannot display
-            </text>
-        </a>
-    </switch>
-</svg>
\ No newline at end of file
diff --git a/doc/services/ipc/ipc_service/backends/icbmsg_memory.svg b/doc/services/ipc/ipc_service/backends/icbmsg_memory.svg
deleted file mode 100644
index 09fcfe2a6f9..00000000000
--- a/doc/services/ipc/ipc_service/backends/icbmsg_memory.svg
+++ /dev/null
@@ -1,266 +0,0 @@
-<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="649px" height="263px" viewBox="-0.5 -0.5 649 263" content="&lt;mxfile&gt;&lt;diagram name=&quot;Page-1&quot; id=&quot;aVFX6VjFinrp-ASp4lZ8&quot;&gt;5Vpbk6MoFP41eeyuILk+TqfnslU7W13VW7sz85IiSiLVKlkkk2R+/YKCF9BcbO0kPXlRDkLkOx/nhj04C3efGVr7X6mHg57T93Y9+NhzHABAX1ykZJ9KpoNJKlgx4qWifi54Jr+wGqmlG+LhWMlSEac04GRdFro0irDLSzLEGN2WH1vSwCsJ1miFS68hBc8uCrD12L/E475e12iad3zBZOWrv54447QjRPphNXHsI49uCyL4sQdnjFKe3oW7GQ4keGVcPtX0Zi/GcMRPGTCG4Xj5MqWP/+3/gbsf4WKLf9ypWX6iYKMW/Mfsa7xKwMNIvTjfazQY3UQelhP2e/Bh6xOOn9fIlb1boX8h83kYiBYQt0sa8Wc1NmmTIJjRgDLRjmgkxA8xZ/QFa2HPgf3kJ3rs1elXxYzjXUGkVvsZ0xBzthePqN6BAl4xb6Ka24IatW78ggb1MKSYs8omzsEVNwrfM7B2LKwfAuq+xO8CbDA6irbTf0u0YTXavewtbhXpSRloUIH05C2BHtQCDW4baJPSF0d6WIu0c9tIm6b64kiPapH+6+7GWT24NqzHFtYWwDjyPshYLoeoAGgZfQEM238rNr6r55LG467Y9bjXrR3h3wr33wv3+RDZ0CMsHU2T3yEdxXTDXHzcZXHEVpgfDySwp0PXGo0XNDqs0KiWMRwgTn6WA94qNat/eKJErCwj1NAwkxAaTEnXrUYVA1RjohEoT5TRUE+UAmNNlLAuW3ZzIk67ISJoQkRwUSKO3gcRnbaIOH5bIoL62BXetvPJVHIB52OnX2x3x/CK0Oi2QQX9Mqh3AxvUznIvm6r8faA6cC6Iqp1T/a4xka75FVzRdXmdqeErQEOnA8aGaTTDqPacjp1HvopdZ4cszUKjLtjlXDu7YE1Z7Vx2ZZaqgxDG9quJ+Z8vxCWao4CsIkEWk2HCDPPjXiAZLe4DvJRPS/NNXBR8UOKQeJ6csINysWObe1ClaDPIbGLuJxaEi6QyPJd14TnyPIbjuCGCtZBpaF0BGWad1CYrXGZWVGsbQzt7SzCcx/JI6XXkyxDqkn5WDawCvKrQuA3stM+y97DwA6/cwUf5x9K1tIKhc3wPD7rC0D5KO+RV3QDFMXHLWFWGXPfj4UFvepr3uyqvZlXWzQT7VLdWc8TXvpMDdvbYXLv3w4J+wUHlVofueXBUHSqdRAnldG6syGNSZ9SQOWA4vR/At2KPnSU3Zg84xzZUR9qt0Ef7jBvjDxyW+TNtbHmqQ50OyHNCuhb7aC1v3Q0L9g8MuS/4BNec53GyFaAFDp5oTLis3Vgh959Gd60fr3X4jHKkBk/bOjisS5pLRRqbTOZWb+Tw7UPCQ5tapdEeiv0M8oIupPwJcRFnRolElnp1zqs/PHIaVWVatgFXso/N/QeaZsa156Ed7ORGR51dMObEoOOs+sytMcaK+psyxpqoRcbYlYG/fSwZg0J5oWyFIvIrNavJCwiY8vq7mL+/2MhXl1lw8qFZ5EmZOk1yhQOQvSGSaljIGT2yXGKpwnuLmo3L932jfN9z4Kfkd7CqV+J9C77CVFvVF2pVyWEb9XzQ0dnydRf0QUWKAa/KJrQUDALjwNg8A2jPIGhT83vV7q+fSHDcDpNgV0wSzfxT8/Tx/IN9+PF/&lt;/diagram&gt;&lt;/mxfile&gt;">
-    <defs/>
-    <g>
-        <rect x="7" y="120" width="120" height="40" fill="none" stroke="#000000" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 140px; margin-left: 8px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                ICMsg area
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="67" y="144" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    ICMsg area
-                </text>
-            </switch>
-        </g>
-        <rect x="127" y="120" width="200" height="40" fill="none" stroke="#000000" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 198px; height: 1px; padding-top: 140px; margin-left: 128px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                Blocks area
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="227" y="144" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    Blocks area
-                </text>
-            </switch>
-        </g>
-        <rect x="47" y="220" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 240px; margin-left: 48px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                Block 0
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="87" y="244" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    Block 0
-                </text>
-            </switch>
-        </g>
-        <rect x="127" y="220" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 240px; margin-left: 128px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                Block 1
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="167" y="244" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    Block 1
-                </text>
-            </switch>
-        </g>
-        <rect x="207" y="220" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 240px; margin-left: 208px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                Block 2
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="247" y="244" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    Block 2
-                </text>
-            </switch>
-        </g>
-        <rect x="407" y="220" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 240px; margin-left: 408px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                Block N-1
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="447" y="244" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    Block N-1
-                </text>
-            </switch>
-        </g>
-        <path d="M 47 220 L 127 160" fill="none" stroke="#999999" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 487 220 L 327 160" fill="none" stroke="#999999" stroke-miterlimit="10" pointer-events="stroke"/>
-        <rect x="287" y="220" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 240px; margin-left: 288px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                Block 3
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="327" y="244" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    Block 3
-                </text>
-            </switch>
-        </g>
-        <rect x="67" y="0" width="200" height="40" fill="none" stroke="#000000" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 198px; height: 1px; padding-top: 20px; margin-left: 68px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                rx-region
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="167" y="24" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    rx-region
-                </text>
-            </switch>
-        </g>
-        <rect x="387" y="0" width="200" height="40" fill="none" stroke="#000000" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 198px; height: 1px; padding-top: 20px; margin-left: 388px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                tx-region
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="487" y="24" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    tx-region
-                </text>
-            </switch>
-        </g>
-        <path d="M 7 120 L 67 40" fill="none" stroke="#999999" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 327 120 L 267 40" fill="none" stroke="#999999" stroke-miterlimit="10" pointer-events="stroke"/>
-        <rect x="7" y="60" width="150" height="20" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 148px; height: 1px; padding-top: 70px; margin-left: 9px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                region_begin_aligned
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="9" y="74" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">
-                    region_begin_aligned
-                </text>
-            </switch>
-        </g>
-        <rect x="47" y="80" width="160" height="20" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 158px; height: 1px; padding-top: 90px; margin-left: 48px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                blocks_area_address
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="127" y="94" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    blocks_area_address
-                </text>
-            </switch>
-        </g>
-        <rect x="207" y="180" width="80" height="20" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 190px; margin-left: 208px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                block_size
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="247" y="194" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    block_size
-                </text>
-            </switch>
-        </g>
-        <rect x="187" y="60" width="140" height="20" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 138px; height: 1px; padding-top: 70px; margin-left: 187px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                region_end_aligned
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="325" y="74" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">
-                    region_end_aligned
-                </text>
-            </switch>
-        </g>
-        <path d="M 7 75 L 7 113.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 7 118.88 L 3.5 111.88 L 7 113.63 L 10.5 111.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 127 100 L 127 113.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 127 118.88 L 123.5 111.88 L 127 113.63 L 130.5 111.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 327 75 L 327 113.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 327 118.88 L 323.5 111.88 L 327 113.63 L 330.5 111.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 257 170 L 252 170 Q 247 170 247 180 L 247 200 Q 247 210 242 210 L 239.5 210 Q 237 210 242 210 L 244.5 210 Q 247 210 247 220 L 247 240 Q 247 250 252 250 L 257 250" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(90,247,210)" pointer-events="all"/>
-        <path d="M 367 220 L 407 220" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-miterlimit="10" stroke-dasharray="2 6" pointer-events="stroke"/>
-        <path d="M 367 260 L 407 260" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-miterlimit="10" stroke-dasharray="2 6" pointer-events="stroke"/>
-        <rect x="407" y="120" width="240" height="40" fill="#ffffff" stroke="#999999" stroke-dasharray="3 3" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 238px; height: 1px; padding-top: 140px; margin-left: 408px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                The same organization as rx-region, but sizes and block count may be different.
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="527" y="144" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    The same organization as rx-region, but...
-                </text>
-            </switch>
-        </g>
-        <path d="M 407 120 L 387 40" fill="none" stroke="#999999" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 647 120 L 587 40" fill="none" stroke="#999999" stroke-miterlimit="10" pointer-events="stroke"/>
-    </g>
-    <switch>
-        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
-        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
-            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
-                Text is not SVG - cannot display
-            </text>
-        </a>
-    </switch>
-</svg>
\ No newline at end of file
diff --git a/doc/services/ipc/ipc_service/backends/icbmsg_message.svg b/doc/services/ipc/ipc_service/backends/icbmsg_message.svg
deleted file mode 100644
index 0252501480b..00000000000
--- a/doc/services/ipc/ipc_service/backends/icbmsg_message.svg
+++ /dev/null
@@ -1,209 +0,0 @@
-<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="561px" height="182px" viewBox="-0.5 -0.5 561 182" content="&lt;mxfile&gt;&lt;diagram name=&quot;Page-1&quot; id=&quot;aVFX6VjFinrp-ASp4lZ8&quot;&gt;3Vldb5swFP01SNtDJcDk63FJu+5hmypF2tq+OeAEKwZnxmnIfv1ssPkwkKZp1pL2ofI9ti/43OtjX2KBWZTeMrgJf9AAEcu1g9QC15bret5I/JfAPgfcoZcDK4aDHHJKYI7/IgXaCt3iACW1gZxSwvGmDvo0jpHPaxhkjO7qw5aU1J+6gSv1RLsE5j4kqDHsNw54qFBnOCk7viG8CtWjx65acAT1YOU4CWFAdxUI3FhgxijleStKZ4hI7jQv+byvHb3FizEU82MmjEA0Wq4n9PrP/hdIH6PFDj1egdzLEyRbteApof5aQPqt+V5Tweg2DpD0ZltgugsxR/MN9GXvTsReYCGPiLAc0VzSmM/V3MzGhMwooUzYMY0FPE04o2ukQcsFdvYneppLU6t9QoyjtAKppd4iGiHO9mKI6h2r91dp52h7VwZRQ2ElfJ7CoEqbVeG4ZFY0FLkvINrrJNq5bKKdYc+YHnQy7V420wVlfWF62Mn0z6sLz2qvb1zr87BCdohggJjlDol4+HQhWyvZ+pTIU9S16VKeu5DDz5cdC0PK3XcPhdMIhWT5skk2ZbyN5WLM29DsNmjexttEEHrRRAO3b+ncfQcEH4vq9xfx5i2wwTCKgy+ybik5qjBapx+lmN9X2g+V9nVaNfbaiMUy7qvGg/KcGeWkzNKzGkGaZH+HgpTQLfPREecZh2yF+IGBijIU6DqtI+aVmA5aYqoxhgjk+Kle3bUFWj3hjmKxtCKlBkZKAdvIlXzhala1GjMcuSNDBoDhKCem4SjLu2LZr0jF5jX5Val4UmLpBHaOTuD/korukamolbIvuQgMeZucmIvAdOS8cS6O2k+gRL4CQ82bldB/Xs9GSPAqFm2ClrJHnhHYh+SLgiMcBHJy64lVz+QznDuDvpXEzrhB8E0Kow0pygTBsR2hJJFfw4RFBP2Qy6uWWVzQWPQvyk8XNoyD1tK65zEyC7y2a1jxEezcQWpJ+CPEN4BJmFHg1HmV+B3kHLE4Q+S9TSul/mbpdlwXnINqW6i68xJV74xOT3TTs43QuyfqZiOHTEfn082WHezJjbjnKOnaes/czvV29EWYEDu0Ic+w3YwaHnjHKaJJ6EmbbfL8ZktCuJFNf8vIfsqgv0ZHMFiKkrQIXCByRxPMMW2Rue9Gd8GujgPLl90dBkY5VJOvJucq+x0jhSdtMtgMzPgMgdF+P7IKGpLXEq2+qKBjhvRUFWw4OlkFhVn+PJYPL39jBDf/AA==&lt;/diagram&gt;&lt;/mxfile&gt;">
-    <defs/>
-    <g>
-        <rect x="0" y="1" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 21px; margin-left: 1px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                Block 0
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="40" y="25" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    Block 0
-                </text>
-            </switch>
-        </g>
-        <rect x="80" y="1" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 21px; margin-left: 81px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                Block 1
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="120" y="25" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    Block 1
-                </text>
-            </switch>
-        </g>
-        <rect x="160" y="1" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 21px; margin-left: 161px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                Block 2
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="200" y="25" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    Block 2
-                </text>
-            </switch>
-        </g>
-        <rect x="360" y="1" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 21px; margin-left: 361px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                Block N-1
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="400" y="25" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    Block N-1
-                </text>
-            </switch>
-        </g>
-        <rect x="0" y="101" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 121px; margin-left: 1px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                header
-                                <br/>
-                                (size of data)
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="40" y="125" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    header...
-                </text>
-            </switch>
-        </g>
-        <rect x="80" y="101" width="160" height="40" fill="none" stroke="#000000" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 158px; height: 1px; padding-top: 121px; margin-left: 81px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                data
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="160" y="125" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    data
-                </text>
-            </switch>
-        </g>
-        <rect x="240" y="101" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 121px; margin-left: 241px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                unused
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="280" y="125" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    unused
-                </text>
-            </switch>
-        </g>
-        <rect x="240" y="1" width="80" height="40" fill="none" stroke="#000000" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 21px; margin-left: 241px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                Block 3
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="280" y="25" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    Block 3
-                </text>
-            </switch>
-        </g>
-        <path d="M 0 101 L 80 41" fill="none" stroke="#999999" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 320 101 L 240 41" fill="none" stroke="#999999" stroke-miterlimit="10" pointer-events="stroke"/>
-        <rect x="480" y="1" width="80" height="40" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 78px; height: 1px; padding-top: 21px; margin-left: 482px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                Blocks area
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="482" y="25" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">
-                    Blocks area
-                </text>
-            </switch>
-        </g>
-        <rect x="360" y="101" width="200" height="40" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 198px; height: 1px; padding-top: 121px; margin-left: 362px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                Example of a message allocated
-                                <br/>
-                                on block 1 and 2
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="362" y="125" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">
-                    Example of a message allocated...
-                </text>
-            </switch>
-        </g>
-        <path d="M 320 41 L 360 41" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-miterlimit="10" stroke-dasharray="2 6" pointer-events="stroke"/>
-        <rect x="0" y="161" width="80" height="20" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 171px; margin-left: 1px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                4 bytes
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="40" y="175" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    4 bytes
-                </text>
-            </switch>
-        </g>
-        <path d="M 50 111 L 45 111 Q 40 111 40 121 L 40 141 Q 40 151 35 151 L 32.5 151 Q 30 151 35 151 L 37.5 151 Q 40 151 40 161 L 40 181 Q 40 191 45 191 L 50 191" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(-90,40,151)" pointer-events="all"/>
-        <path d="M 320 1 L 360 1" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-miterlimit="10" stroke-dasharray="2 6" pointer-events="stroke"/>
-    </g>
-    <switch>
-        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
-        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
-            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
-                Text is not SVG - cannot display
-            </text>
-        </a>
-    </switch>
-</svg>
\ No newline at end of file
diff --git a/doc/services/ipc/ipc_service/backends/ipc_service_icbmsg.rst b/doc/services/ipc/ipc_service/backends/ipc_service_icbmsg.rst
index f570766b0bd..f06f7587df6 100644
--- a/doc/services/ipc/ipc_service/backends/ipc_service_icbmsg.rst
+++ b/doc/services/ipc/ipc_service/backends/ipc_service_icbmsg.rst
@@ -81,300 +81,3 @@ Samples
 =======
 
 * :zephyr:code-sample:`ipc_multi_endpoint`
-
-Detailed Protocol Specification
-===============================
-
-The ICBMsg protocol transfers messages using dynamically allocated blocks of shared memory.
-Internally, it uses ICMsg for control messages.
-
-Shared Memory Organization
---------------------------
-
-The ICBMsg uses two shared memory regions, ``rx-region`` for message receiving, and ``tx-region`` for message transmission.
-The regions do not need to be next to each other, placed in any specific order, or be of the same size.
-Those regions are interchanged on each core.
-
-Each shared memory region is divided into following two parts:
-
-* **ICMsg area** - An area reserved by ICMsg instance and used to transfer the control messages.
-* **Blocks area** - An area containing allocatable blocks carrying the content of the messages.
-  This area is divided into even-sized blocks aligned to cache boundaries.
-
-The location of each area is calculated to fulfill cache boundary requirements and allow optimal region usage.
-It is calculated using the following algorithm:
-
-Inputs:
-
-* ``region_begin``, ``region_end`` - Boundaries of the region.
-* ``local_blocks`` - Number of blocks in this region.
-* ``remote_blocks`` - Number of blocks in the opposite region.
-* ``alignment`` - Memory cache alignment.
-
-The algorithm:
-
-#. Align region boundaries to cache:
-
-   * ``region_begin_aligned = ROUND_UP(region_begin, alignment)``
-   * ``region_end_aligned = ROUND_DOWN(region_end, alignment)``
-   * ``region_size_aligned = region_end_aligned - region_begin_aligned``
-
-#. Calculate the minimum size required for ICMsg area ``icmsg_min_size``, which is a sum of:
-
-   * ICMsg header size (refer to the ICMsg specification)
-   * ICMsg message size for 4 bytes of content (refer to the ICMsg specification) multiplied by ``local_blocks + remote_blocks + 2``
-
-#. Calculate available size for block area. Note that the actual size may be smaller because of block alignment:
-
-   ``blocks_area_available_size = region_size_aligned - icmsg_min_size``
-
-#. Calculate single block size:
-
-   ``block_size = ROUND_DOWN(blocks_area_available_size / local_blocks, alignment)``
-
-#. Calculate actual block area size:
-
-   ``blocks_area_size = block_size * local_blocks``
-
-#. Calculate block area start address:
-
-   ``blocks_area_begin = region_end_aligned - blocks_area_size``
-
-The result:
-
-* ``region_begin_aligned`` - The start of ICMsg area.
-* ``blocks_area_begin`` - End of ICMsg area and the start of block area.
-* ``block_size`` - Single block size.
-* ``region_end_aligned`` - End of blocks area.
-
-.. image:: icbmsg_memory.svg
-   :align: center
-
-|
-
-Message Transfer
-----------------
-
-The ICBMsg uses following two types of messages:
-
-* **Binding message** - Message exchanged during endpoint binding process (described below).
-* **Data message** - Message carrying actual data from a user.
-
-They serve different purposes, but their lifetime and flow are the same.
-The following steps describe it:
-
-#. The sender wants to send a message that contains ``K`` bytes.
-#. The sender reserves blocks from his ``tx-region`` blocks area that can hold at least ``K + 4`` bytes.
-   The additional ``+ 4`` bytes are reserved for the header, which contains the exact size of the message.
-   The blocks must be continuous (one after another).
-   The sender is responsible for block allocation management.
-   It is up to the implementation to decide what to do if no blocks are available.
-#. The sender fills the header with a 32-bit integer value, ``K`` (little-endian).
-#. The sender fills the remaining part of the blocks with his data.
-   Unused space is ignored.
-#. The sender sends an ``MSG_DATA`` or ``MSG_BOUND`` control message over ICMsg that contains starting block number (where the header is located).
-   Details about the control message are in the next section.
-#. The control message travels to the receiver.
-#. The receiver reads message size and data from his ``rx-region`` starting from the block number received in the control message.
-#. The receiver processes the message.
-#. The receiver sends ``MSG_RELEASE_DATA`` or ``MSG_RELEASE_BOUND`` control message over ICMsg containing the starting block number
-   (the same as inside received control message).
-#. The control message travels back to the sender.
-#. The sender releases the blocks starting from the block number provided in the control message.
-   The number of blocks to release can be calculated using a size from the header.
-
-.. image:: icbmsg_message.svg
-   :align: center
-
-|
-
-Control Messages
-----------------
-
-The control messages are transmitted over ICMsg.
-Each control message contains three bytes.
-The first byte tells what kind of message it is.
-
-The allocated size for ICMsg ensures that the maximum possible number of control messages will fit into its ring buffer,
-so sending over the ICMsg will never fail because of buffer overflow.
-
-MSG_DATA
-^^^^^^^^
-
-.. list-table::
-   :header-rows: 1
-
-   * - byte 0
-     - byte 1
-     - byte 2
-   * - MSG_DATA
-     - endpoint address
-     - block number
-   * - 0x00
-     - 0x00 ÷ 0xFD
-     - 0x00 ÷ N-1
-
-The ``MSG_DATA`` control message indicates that a new data message was sent.
-The data message starts with a header inside ``block number``.
-The data message was sent over the endpoint specified in ``endpoint address``.
-The endpoint binding procedure must be finished before sending this control message.
-
-MSG_RELEASE_DATA
-^^^^^^^^^^^^^^^^
-
-.. list-table::
-   :header-rows: 1
-
-   * - byte 0
-     - byte 1
-     - byte 2
-   * - MSG_RELEASE_DATA
-     - unused
-     - block number
-   * - 0x01
-     -
-     - 0x00 ÷ N-1
-
-The ``MSG_RELEASE_DATA`` control message is sent in response to ``MSG_DATA``.
-It informs us that the data message starting with ``block number`` was received and is no longer needed.
-When this control message is received, the blocks containing the message must be released.
-
-MSG_BOUND
-^^^^^^^^^
-
-.. list-table::
-   :header-rows: 1
-
-   * - byte 0
-     - byte 1
-     - byte 2
-   * - MSG_BOUND
-     - endpoint address
-     - block number
-   * - 0x02
-     - 0x00 ÷ 0xFD
-     - 0x00 ÷ N-1
-
-The ``MSG_BOUND`` control message is similar to the ``MSG_DATA`` except the blocks carry binding information.
-See the next section for details on the binding procedure.
-
-MSG_RELEASE_BOUND
-^^^^^^^^^^^^^^^^^
-
-.. list-table::
-   :header-rows: 1
-
-   * - byte 0
-     - byte 1
-     - byte 2
-   * - MSG_RELEASE_BOUND
-     - endpoint address
-     - block number
-   * - 0x03
-     - 0x00 ÷ 0xFD
-     - 0x00 ÷ N-1
-
-The ``MSG_RELEASE_BOUND`` control message is sent in response to ``MSG_BOUND``.
-It is similar to the ``MSG_RELEASE_DATA`` except the ``endpoint address`` is required.
-See the next section for details on the binding procedure.
-
-Initialization
---------------
-
-The ICBMsg initialization calls ICMsg to initialize.
-When it is done, no further initialization is required.
-Blocks can be left uninitialized.
-
-After ICBMsg initialization, you are ready for the endpoint binding procedure.
-
-Endpoint Binding
------------------
-
-So far, the protocol is symmetrical.
-Each side of the connection was the same.
-The binding process is not symmetrical.
-There are following two roles:
-
-* **Initiator** - It assigns endpoint addresses and sends binding messages.
-* **Follower** - It waits for a binding message.
-
-The roles are determined based on the addresses of the ``rx-region`` and ``tx-region``.
-
-* If ``address of rx-region < address of tx-region``, then it is initiator.
-* If ``address of rx-region > address of tx-region``, then it is follower.
-
-The binding process needs an endpoint name and is responsible for following two things:
-
-* To establish a common endpoint address,
-* To make sure that two sides are ready to exchange messages over that endpoint.
-
-After ICMsg is initialized, both sides can start the endpoint binding.
-There are no restrictions on the order in which the sides start the endpoint binding.
-
-Initiator Binding Procedure
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The initiator sends a binding message.
-It contains a single null-terminated string with an endpoint name.
-As usual, it is preceded by a message header containing the message size (including null-terminator).
-
-Example of the binding message for ``example`` endpoint name:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Header
-     - Endpoint name
-     - Null-terminator
-   * - bytes 0-3
-     - bytes 4-10
-     - byte 11
-   * - 0x00000008
-     - ``example``
-     - 0x00
-
-The binding message is sent using the ``MSG_BOUND`` control message and released with the ``MSG_RELEASE_BOUND`` control message.
-
-The endpoint binding procedure from the initiator's point of view is the following:
-
-#. The initiator assigns an endpoint address to this endpoint.
-#. The initiator sends a binding message containing the endpoint name and address.
-#. The initiator waits for any message from the follower using this endpoint address.
-   Usually, it will be ``MSG_RELEASE_BOUND``, but ``MSG_DATA`` is also allowed.
-#. The initiator is bound to an endpoint, and it can send data messages using this endpoint.
-
-Follower Binding Procedure
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If the follower receives a binding message before it starts the binding procedure on that endpoint, it should store the message for later.
-It should not send the ``MSG_RELEASE_BOUND`` yet.
-
-The endpoint binding procedure from the follower's point of view is the following:
-
-#. The follower waits for a binding message containing its endpoint name.
-   The message may be a newly received message or a message stored before the binding procedure started.
-#. The follower stores the endpoint address assigned to this endpoint by the initiator.
-#. The follower sends the ``MSG_RELEASE_BOUND`` control message.
-#. The follower is bound to an endpoint, and it can send data messages using this endpoint.
-
-Example sequence diagrams
--------------------------
-
-The following diagram shows a few examples of how the messages flow between two ends.
-There is a binding of two endpoints and one fully processed data message exchange.
-
-.. image:: icbmsg_flows.svg
-   :align: center
-
-|
-
-Protocol Versioning
--------------------
-
-The protocol allows improvements in future versions.
-The newer implementations should be able to work with older ones in backward compatible mode.
-To allow it, the current protocol version has the following restrictions:
-
-* If the receiver receives a longer control message, it should use only the first three bytes and ignore the remaining.
-* If the receiver receives a control message starting with a byte that does not match any of the messages described here, it should ignore it.
-* If the receiver receives a binding message with additional bytes at the end, it should ignore the additional bytes.

From 2b67ded22eb549d4b45ca57beabb1a7d0fef7868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:43 +0100
Subject: [PATCH 1657/2913] Revert "[nrf noup] samples: net: wifi: Update
 certificates"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0113fd656f235a627194c1dcd280d341e7716685.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/net/wifi/test_certs/ca.pem          | 45 ++++++-----
 samples/net/wifi/test_certs/ca2.pem         | 24 ------
 samples/net/wifi/test_certs/client-key.pem  | 56 +++++++-------
 samples/net/wifi/test_certs/client-key2.pem | 30 -------
 samples/net/wifi/test_certs/client.pem      | 82 +++++++++++++++-----
 samples/net/wifi/test_certs/client2.pem     | 22 ------
 samples/net/wifi/test_certs/server-key.pem  | 56 +++++++-------
 samples/net/wifi/test_certs/server-key2.pem | 30 -------
 samples/net/wifi/test_certs/server.pem      | 86 ++++++++++++++++-----
 samples/net/wifi/test_certs/server2.pem     | 22 ------
 10 files changed, 209 insertions(+), 244 deletions(-)
 delete mode 100644 samples/net/wifi/test_certs/ca2.pem
 delete mode 100644 samples/net/wifi/test_certs/client-key2.pem
 delete mode 100644 samples/net/wifi/test_certs/client2.pem
 delete mode 100644 samples/net/wifi/test_certs/server-key2.pem
 delete mode 100644 samples/net/wifi/test_certs/server2.pem

diff --git a/samples/net/wifi/test_certs/ca.pem b/samples/net/wifi/test_certs/ca.pem
index 2b872d2e30d..70a234dfdc3 100644
--- a/samples/net/wifi/test_certs/ca.pem
+++ b/samples/net/wifi/test_certs/ca.pem
@@ -1,24 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIIEBzCCAu+gAwIBAgIUK8+d+8IOzeX+DP3VSvdF3lHiCdcwDQYJKoZIhvcNAQEL
+MIIE9zCCA9+gAwIBAgIUNX/wAWvB0xblUUghlsoear4f6kkwDQYJKoZIhvcNAQEL
 BQAwgZIxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIDAZSYWRpdXMxEjAQBgNVBAcMCVNv
-bWV3aGVyZTEUMBIGA1UECgwLRXhhbXBsZSBJbmMxJjAkBgNVBAMMHUV4YW1wbGUg
-Q2VydGlmaWNhdGUgQXV0aG9yaXR5MSAwHgYJKoZIhvcNAQkBFhFhZG1pbkBleGFt
-cGxlLm9yZzAeFw0yNDEwMDgxMDI0MDZaFw0zNDEwMDYxMDI0MDZaMIGSMQswCQYD
+bWV3aGVyZTEUMBIGA1UECgwLRXhhbXBsZSBJbmMxIDAeBgkqhkiG9w0BCQEWEWFk
+bWluQGV4YW1wbGUub3JnMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRlIEF1
+dGhvcml0eTAeFw0yNDA4MDcxODQzMDZaFw0yNDEwMDYxODQzMDZaMIGSMQswCQYD
 VQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hlcmUxFDAS
-BgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRl
-IEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5vcmcwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWKIwjdRIp9IrpZELN/ZsN13Xj
-qQI6n086PNJ7BZfLi0+tD164rmxFk2eukNNksFCPhvMkqUxouGhc4mJjeivvrZxR
-oT3cblOQIkkdEci6iTKC2E1a20W/Ur7cTXoIsnKwjiUjXk+cujkrZu4fcHX+O4vy
-wTd5tEbhmifT/4u5nN8U2vBcEZqkGHOCp30VZSxtlGwqp4lc+tVziF3uFViW9MXk
-3bVt+s1E7ztwG7+WBgVlLYe3CNSWkMxfyYBafH/l7iep6AFjoTn1z3AAjYi7IUNN
-0JkW8MTgafRQIu4QsV5luq/Tiar2vwAm/GNgUJdSzUKARsfQzb/XTIgnLQqtAgMB
-AAGjUzBRMB0GA1UdDgQWBBSijSC03/Thi6EOdM91V33zsbQpgzAfBgNVHSMEGDAW
-gBSijSC03/Thi6EOdM91V33zsbQpgzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
-DQEBCwUAA4IBAQAvKEfmCDoMTKC6bfP6DSs+MSAGc5tCr6w6cz2AKNJ2fOMhkq55
-JF47oBBGm9SdTB6Jqo6c109Ps69/+LMtEEGwvzL0RL0WAuTYGo6sudm9hj/jDHZh
-pAqi/2BQQeVgTa6oW0jtNPFe+/cobXo9TJ7wECGrhvVbmfl5ZPc0YVOIjjR0/LhL
-q7lqPAlJ5vx0WvsX+QReN97we8vD0x1D3mCySJTi3Irh+grE0yJOSN2fa7cyqi9+
-vSiNUB1eUgQwrO+S8ZazYNvAZXC2Xf4WB4SOifJD73pYPAdwOejc0FA+zfEKa/6/
-vTUs8cIhlmDWO+BEoc9wygMKMmhT5s7/T5Bv
+BgNVBAoMC0V4YW1wbGUgSW5jMSAwHgYJKoZIhvcNAQkBFhFhZG1pbkBleGFtcGxl
+Lm9yZzEmMCQGA1UEAwwdRXhhbXBsZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzR3RL3+70yN+1Nx0bAXT60qqf
+AxCk/NXphq5cxUT5skXc97KUUnIQ1SaLAin8WHRS8Idajywlo0ULpCeoOj35aPI/
+kTUu4P2Rx5p1DYgquTGjW6fS4p5c65y75BWoukng5DQp/kVpo4OcRMUncexGxBET
+1IkpuXGlvQyEKB5I+TgYe4eEXpdn+0A2Nytw9kpSzrd26JofWOO2ZtVCgISnj7ID
+B7ErVzStuHg+rMKVI2SU966CH78lNuIIQFKrg8NoWRQI1zMMouU7hj6EL7cZcvA/
+MW9SIFpzkfC4xq0EnOMzg/D3p4k8ah6MikHf8FqDdBBfPUcYU0rG9+zpQdb3AgMB
+AAGjggFBMIIBPTAdBgNVHQ4EFgQUQl34Jn7xx5zTXckus4k09ScmfUYwgdIGA1Ud
+IwSByjCBx4AUQl34Jn7xx5zTXckus4k09ScmfUahgZikgZUwgZIxCzAJBgNVBAYT
+AkZSMQ8wDQYDVQQIDAZSYWRpdXMxEjAQBgNVBAcMCVNvbWV3aGVyZTEUMBIGA1UE
+CgwLRXhhbXBsZSBJbmMxIDAeBgkqhkiG9w0BCQEWEWFkbWluQGV4YW1wbGUub3Jn
+MSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRlIEF1dGhvcml0eYIUNX/wAWvB
+0xblUUghlsoear4f6kkwDwYDVR0TAQH/BAUwAwEB/zA2BgNVHR8ELzAtMCugKaAn
+hiVodHRwOi8vd3d3LmV4YW1wbGUuY29tL2V4YW1wbGVfY2EuY3JsMA0GCSqGSIb3
+DQEBCwUAA4IBAQCP4qUyKkYD6hXaozV29opSo1sOdQ+voCe9lCTMnFEaCvCO22IX
+ViyvNyR6cDt/wa2eeXCRzhOr8vXLyxUOZg0gMDuOxhMBWhdJUNowNrk5jLw2RdFG
+OOB53m2JW2E7JNVsheRzKa+98xW7BFjkZKjrowFptZFDrtPFbGg1ETy+mPY74RVj
+T+ebESqd/Q/hQUQYfvLUgbcVUF28nXzQ3EWxSL64wpheFDbYEdE97h3Z4tJX7MYi
+nOdw+Hn8jss8xCjijk99MgI08GYqgYqCZP7Xka9tyOmD7FYFVnderU+aTCxEYbK3
+9/R7Y+PEaqamKZKXhYh8isjZz/EOiHYz2YjU
 -----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/ca2.pem b/samples/net/wifi/test_certs/ca2.pem
deleted file mode 100644
index 2b872d2e30d..00000000000
--- a/samples/net/wifi/test_certs/ca2.pem
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEBzCCAu+gAwIBAgIUK8+d+8IOzeX+DP3VSvdF3lHiCdcwDQYJKoZIhvcNAQEL
-BQAwgZIxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIDAZSYWRpdXMxEjAQBgNVBAcMCVNv
-bWV3aGVyZTEUMBIGA1UECgwLRXhhbXBsZSBJbmMxJjAkBgNVBAMMHUV4YW1wbGUg
-Q2VydGlmaWNhdGUgQXV0aG9yaXR5MSAwHgYJKoZIhvcNAQkBFhFhZG1pbkBleGFt
-cGxlLm9yZzAeFw0yNDEwMDgxMDI0MDZaFw0zNDEwMDYxMDI0MDZaMIGSMQswCQYD
-VQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hlcmUxFDAS
-BgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRl
-IEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5vcmcwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWKIwjdRIp9IrpZELN/ZsN13Xj
-qQI6n086PNJ7BZfLi0+tD164rmxFk2eukNNksFCPhvMkqUxouGhc4mJjeivvrZxR
-oT3cblOQIkkdEci6iTKC2E1a20W/Ur7cTXoIsnKwjiUjXk+cujkrZu4fcHX+O4vy
-wTd5tEbhmifT/4u5nN8U2vBcEZqkGHOCp30VZSxtlGwqp4lc+tVziF3uFViW9MXk
-3bVt+s1E7ztwG7+WBgVlLYe3CNSWkMxfyYBafH/l7iep6AFjoTn1z3AAjYi7IUNN
-0JkW8MTgafRQIu4QsV5luq/Tiar2vwAm/GNgUJdSzUKARsfQzb/XTIgnLQqtAgMB
-AAGjUzBRMB0GA1UdDgQWBBSijSC03/Thi6EOdM91V33zsbQpgzAfBgNVHSMEGDAW
-gBSijSC03/Thi6EOdM91V33zsbQpgzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
-DQEBCwUAA4IBAQAvKEfmCDoMTKC6bfP6DSs+MSAGc5tCr6w6cz2AKNJ2fOMhkq55
-JF47oBBGm9SdTB6Jqo6c109Ps69/+LMtEEGwvzL0RL0WAuTYGo6sudm9hj/jDHZh
-pAqi/2BQQeVgTa6oW0jtNPFe+/cobXo9TJ7wECGrhvVbmfl5ZPc0YVOIjjR0/LhL
-q7lqPAlJ5vx0WvsX+QReN97we8vD0x1D3mCySJTi3Irh+grE0yJOSN2fa7cyqi9+
-vSiNUB1eUgQwrO+S8ZazYNvAZXC2Xf4WB4SOifJD73pYPAdwOejc0FA+zfEKa/6/
-vTUs8cIhlmDWO+BEoc9wygMKMmhT5s7/T5Bv
------END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/client-key.pem b/samples/net/wifi/test_certs/client-key.pem
index 6ab70da2452..20ca0796572 100644
--- a/samples/net/wifi/test_certs/client-key.pem
+++ b/samples/net/wifi/test_certs/client-key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQILVdWyEWhWU0CAggA
-MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDMFReIusCg7gSkoUQZV2flBIIE
-0BIFQH7+0dc7wHIQQ1y0ao90rrK3ExtCABH6xp4OAHUNPR1549zSEak/9Ba6WLBp
-YE0m/lpLz4oUJE4Kd3rg4ekSZk4mapZoW7g5ax4qAEblmM6rqmyjiU0Q6tsAb8n1
-x+RyjUILlgTH1HDmeNA53QNMCw++xIMIJPN29SvFN6vkU2Fd2f74/TuZRSaCEPLO
-LKtNMwWCMTrlv0UewEryOvZegPQuEF/Ewmmw/9l5VfkPp6zAtZKzWsfk4jUo5tv2
-5dPoHR+RKjNNVwetnCq59QYMS2My6KLqX4Vzqnbu8K1nlbm85ZHnvLGi8cDn8EB7
-QtRL+Ev5IwcwYJgV5AMojouJLQdR655jeITWI1Gsohz28YG8c1qYX4ZN6albSd1G
-fd1tMOWkeu4uEzJ7ijLDfnCzrklnLuAZx8yLzyrOa7i9AwwJmdgUEdbWWsru3L6C
-zDJ45rpA0FobdlTem4kpoE9yiyHkIhf3wmI3X+0aodC11pdbHP260KIC8E1K9FUh
-s/IoEQCYrBp8UltNTlezwq/E5uOuIu4EpfjEgH1Z3+hSDbnmMAXNX4DbL234x7iy
-3Y256DtOeHSElnRz3kDnZVNtM1Kd5fgEYJ1ptYRPYaWyJka7/hC/0UObuM9w+QeO
-OlG0QgumQFloyhDa9anPBK4sYJp4g1fK8golUDW4AdpFPNOJvvgOvQUzhPpHjr+N
-lpZ75Y6I3JSSKJ/UMlSCOqjak8oZtMtJNMfbx1lgwwDtgjDSJvSdl735gI9VmXXH
-qnlGEtyiQ7k1Z1a4HxiY2/CiDHvkymClir/Ik8gt+wmyT9c/9BcehLRf6PxMsDVy
-PCkty1LlzN+5tSZJtJnOiTlgsRn/w49Ohp74ITheSdb30/6PnFI+o8rcJHmrjN4d
-t3z/bCyWAeC8mS7m0wtXlyBeG9xvdyT8dDHAFOnqxX30dEwEbjNj58kWGAgRf9i3
-HlOAP8yRy7LAV7A4HEPnEzXBxYpsROUw/8d3Jtmr2nAp2hfKP339DYZPHZpRLjJr
-WQlJasHHLxHKKjSsuM06WsCO+Tt2FTSgGJuU6nFVK75fssmmJYzj9qMHVM6YSjfY
-sT0ZIWRgO9NLFx5O3QxY1wgMLhhv1FREy9NVnMU0W3A1u0F7dwHywZGha2IqEXgu
-+UyWIJnePMvluV/s66AN/OpIxKU48c0B4l7XzXkHHd43tDUG3ztfRuPbWCHipuRO
-eo+vHGD01iBLSE1ZhrYLHKQhJvIKx/PIEaqJHP/Vy35AD/2/GH09TiIBHzX9aXie
-TiKFs30FQv7SpLNHNE7jUxsYGNUbYa70S/Vgn3wkKATcXpCc749XQV4OUbFoqkDm
-vuZOjkIOlm/OtZkUuDWmk96mgoVG/gWSEJPynJHUpmWdu/BCdYOgxBk/bmPa1leS
-Z5NbO0fGMnNhDMXYA5rqmVzABcNSYhgYw5aciWpBlgYHEYrPxZvCxWftIyb24oEk
-wdHEaFbIYbOoVZqo7Ym2hrvVrJb8Qdukf1BmUgfSSSc7BFoSrBUO4SNFtZI55NOB
-OM4rnkqfoYR0IpnxzPIpxpsWljG9QsgnTaffStDgIGXiAtBWJFy+44f1IS4EoC6B
-+we1Q6atPwYSyPtG8mn4Ce0BNxLDUoFDLMQ7Bt8QBMeX
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIKh6bYnzze8sCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNtt6KHyCgBPBIIEyPOdtbZFuRkf
+NoEhloVT9ZbxSfYUOoD86w6OUgLW9I9zgH7v1lZ+Q6YnZ6lPxi+NthUvZZNd0M4f
+rEAkJMeVqCImk9C5DYUdsEyVxxbWCiBKuO+j14S8RaetKvTVlYZjdkdbwW4chwLs
+joPtKUtRMhWdQ5XF9qtVhmKjqHHTEFhOXP/VMCd6bNOkjzneuUDlLj+EOl8K1NVZ
+tpZUi6D2p0tksrMokgl3n0Esee4W6XKemJ8KyLkA34QGG/c2MQyQnBzqo+9FnLvr
+uX5DmApiichLMYDMssQjfyVUsDTz1bolTCWZcY2gz7zoHSJ3Twa4uf0D/Syi/pU5
+c4m1DvfY+BDt7GPG9S6eQHEIp/7m6jCKX90jYi297nEcJjYkXVUDe4Nx7a+oZkc4
+OIKP7VTVnhuUSjbN5h0UB1yNMA9t65IsXLPVVtn4b+eC/4RZyJAYuzJD8xpb9u4r
+bXl0qMW1bPyU2qdC5oheM2oLIvuSBKuRf2vvqKt7c5mahTWIUxNckkNeSQghJxw5
+uEgG/ji+ggL9YfPQiMt8Ps4754/mtOfzXGX3UTniuSpo7ddonqDQpHBvNiRdy6Dl
+pQTJczykNOe5HaMsfa/hyu22AVVKWQDLacFLvRqqps5JiH2A1dzBfU/GVeGYcl84
+BZUVO56tGMY64t/StqADVrW7AxTLB0tV90uNSg16oRQkRDIx5R5/Q9xlILCSPdvN
+i8qR6jY0wLgEot5hweCnbYjQ79n7H8NKAHe52TNbYts/S6jjqdWNu19JpNHV8Z7v
+aGlf5Puk4U+A8MhyjTVgWoOW+GNmyEiMXOTz66nrhtDFy3nzPjwQcMQtj3yTzHnS
+0P80cdY/k2tfBPT4BTbIoKbuuuXLXKQ0jZ0AETu1Z12Q7G6C5f0fOJ5m97qLOvbE
+dMgYPeeulbLr6Gw7CYfTE1wSj795z2d4SpbRSVNyN+iFccFD4tXhWk+lf8ym4/A2
+hsI2SS9TxBR93Fje6oTdeAlC0DIpY8117W4GhU+IZm9HqpD+DVcnLOAzRIl7urlW
+jqpEkZXce+CV9L614hdAjUHQZOj43P3Q/zXEr/ZcVP6+yuLFCf+JbRXUglUgpdQh
+McGVV09tL+Qbb/28yEygiw2m8HFAoUgMc2st4IkkO7XKX3Q8WVDSgqE4olAVE74g
+1OB8w2R96+conCWYJfLCGM5lwsGeB1z8Q/NncKToulnqTKft7Rg8SFyMxVlzygPr
+P9AMhS+wqXHbzhYb+dwD+DsbAtKl0Urp1ZjHSQrOrVtctDCnEX1Bx5ek+AgNExNp
+tv2yBnsBcCLXy5UZYw9rAH+m7t8dAjGOYV3he4GotjCjyq+VcZgpzG2iWCHOhfob
+1xtm030/Xuc4TfX76rWithXggSeKEhuqL2ERa/+OOC/JjE4omdmL9GVrr4vxt37U
+MeJpxymYEP05QfRxcbvJB1L+cGv4Tgy3XgikK8ClUQqKvPntXIoX4cga8O5FE5KB
+5H714hGK/JplhbCDDomi/hRHZHxae2MLnHgq4Rj7JWZ+iTUvLncfMdBBFdHF4qkr
+ZbhwJ3KIAbCcSvXFoYJy1oOOitYhgoAKksyVNrzOMiYMfQ3YKc+6sF6lHOFllawD
+RYTUnfN5ztaxB8OpKaPtig==
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/client-key2.pem b/samples/net/wifi/test_certs/client-key2.pem
deleted file mode 100644
index 6ab70da2452..00000000000
--- a/samples/net/wifi/test_certs/client-key2.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQILVdWyEWhWU0CAggA
-MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDMFReIusCg7gSkoUQZV2flBIIE
-0BIFQH7+0dc7wHIQQ1y0ao90rrK3ExtCABH6xp4OAHUNPR1549zSEak/9Ba6WLBp
-YE0m/lpLz4oUJE4Kd3rg4ekSZk4mapZoW7g5ax4qAEblmM6rqmyjiU0Q6tsAb8n1
-x+RyjUILlgTH1HDmeNA53QNMCw++xIMIJPN29SvFN6vkU2Fd2f74/TuZRSaCEPLO
-LKtNMwWCMTrlv0UewEryOvZegPQuEF/Ewmmw/9l5VfkPp6zAtZKzWsfk4jUo5tv2
-5dPoHR+RKjNNVwetnCq59QYMS2My6KLqX4Vzqnbu8K1nlbm85ZHnvLGi8cDn8EB7
-QtRL+Ev5IwcwYJgV5AMojouJLQdR655jeITWI1Gsohz28YG8c1qYX4ZN6albSd1G
-fd1tMOWkeu4uEzJ7ijLDfnCzrklnLuAZx8yLzyrOa7i9AwwJmdgUEdbWWsru3L6C
-zDJ45rpA0FobdlTem4kpoE9yiyHkIhf3wmI3X+0aodC11pdbHP260KIC8E1K9FUh
-s/IoEQCYrBp8UltNTlezwq/E5uOuIu4EpfjEgH1Z3+hSDbnmMAXNX4DbL234x7iy
-3Y256DtOeHSElnRz3kDnZVNtM1Kd5fgEYJ1ptYRPYaWyJka7/hC/0UObuM9w+QeO
-OlG0QgumQFloyhDa9anPBK4sYJp4g1fK8golUDW4AdpFPNOJvvgOvQUzhPpHjr+N
-lpZ75Y6I3JSSKJ/UMlSCOqjak8oZtMtJNMfbx1lgwwDtgjDSJvSdl735gI9VmXXH
-qnlGEtyiQ7k1Z1a4HxiY2/CiDHvkymClir/Ik8gt+wmyT9c/9BcehLRf6PxMsDVy
-PCkty1LlzN+5tSZJtJnOiTlgsRn/w49Ohp74ITheSdb30/6PnFI+o8rcJHmrjN4d
-t3z/bCyWAeC8mS7m0wtXlyBeG9xvdyT8dDHAFOnqxX30dEwEbjNj58kWGAgRf9i3
-HlOAP8yRy7LAV7A4HEPnEzXBxYpsROUw/8d3Jtmr2nAp2hfKP339DYZPHZpRLjJr
-WQlJasHHLxHKKjSsuM06WsCO+Tt2FTSgGJuU6nFVK75fssmmJYzj9qMHVM6YSjfY
-sT0ZIWRgO9NLFx5O3QxY1wgMLhhv1FREy9NVnMU0W3A1u0F7dwHywZGha2IqEXgu
-+UyWIJnePMvluV/s66AN/OpIxKU48c0B4l7XzXkHHd43tDUG3ztfRuPbWCHipuRO
-eo+vHGD01iBLSE1ZhrYLHKQhJvIKx/PIEaqJHP/Vy35AD/2/GH09TiIBHzX9aXie
-TiKFs30FQv7SpLNHNE7jUxsYGNUbYa70S/Vgn3wkKATcXpCc749XQV4OUbFoqkDm
-vuZOjkIOlm/OtZkUuDWmk96mgoVG/gWSEJPynJHUpmWdu/BCdYOgxBk/bmPa1leS
-Z5NbO0fGMnNhDMXYA5rqmVzABcNSYhgYw5aciWpBlgYHEYrPxZvCxWftIyb24oEk
-wdHEaFbIYbOoVZqo7Ym2hrvVrJb8Qdukf1BmUgfSSSc7BFoSrBUO4SNFtZI55NOB
-OM4rnkqfoYR0IpnxzPIpxpsWljG9QsgnTaffStDgIGXiAtBWJFy+44f1IS4EoC6B
-+we1Q6atPwYSyPtG8mn4Ce0BNxLDUoFDLMQ7Bt8QBMeX
------END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/client.pem b/samples/net/wifi/test_certs/client.pem
index 9e815474cd8..0de5748bf03 100644
--- a/samples/net/wifi/test_certs/client.pem
+++ b/samples/net/wifi/test_certs/client.pem
@@ -1,22 +1,64 @@
+Bag Attributes
+	localKeyID: DF 33 79 D4 52 3A 61 87 BF DD 0C BC BB 90 F5 1D 8C D0 02 1E
+subject=C = FR, ST = Radius, O = Example Inc, CN = Example user, emailAddress = user.example@example.org
+issuer=C = FR, ST = Radius, L = Somewhere, O = Example Inc, emailAddress = admin@example.org, CN = Example Certificate Authority
 -----BEGIN CERTIFICATE-----
-MIIDojCCAooCFGZ4UJXBKG70aewILFtsy4mbvaYZMA0GCSqGSIb3DQEBCwUAMIGS
-MQswCQYDVQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hl
-cmUxFDASBgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRp
-ZmljYXRlIEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
-cmcwHhcNMjQxMDA4MTAyNjI1WhcNMzQxMDA2MTAyNjI1WjCBhzELMAkGA1UEBhMC
-RlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQK
-DAtFeGFtcGxlIEluYzEbMBkGA1UEAwwSY2xpZW50LmV4YW1wbGUub3JnMSAwHgYJ
-KoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMu3HXJvi2Q4hQnLL4v/sCyEr5x+ZtBcSi2yETMViaf2EStW
-UOs1A1pmCQbO7nadLQcWaX4tzefQCRrs1X4hIQuDIqRPNi6h6G1g5HEtqBWZhvwu
-hDbmFiX8/Vtw/P0/9sox2DzyLG0mjJUAYAbKtyC1kQalybVBtrSaazyyAyh6oOuU
-chAb7SmmNDsRB959TWM/mp+6yCcFGzCDKNBwlwthB6Uw92d3SfOyXEnZm8rPf0hV
-4ICL5iB+xEYBv1LKmznFK/4UAyKpxAygc5fxKVWwlSsq8MrES5ak0n6H71wViaXK
-BrH5yh9jEkK9XSeaUwg8C9eOOexyx/5JDY3TTE8CAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEAUNddNiRUlJH0acJJv8ztXNWjNewd17tAk1BBHp6yyGAD8b52p6QbDAdS
-xO3WsSc2bqSy599jp4GshO27TMQsBRMfoggCG21Aj6sIs0Hd4shTE4T0GUBEBxC2
-/HReuD+cGIzzKMYlvK8RPSaGLPvPw5SryvmOnjD368V0KCHwT04Z14i4sMxlkd5q
-wB7fxTkVla9MR4uWObX62mJykmqT86chScJpldtBpRh8wrEa3Gt9FZoi/eqP0De8
-oCxmCZDrozGTZ4IIaNzchx3Ensh1RQwvvxd6ATerYdUjq4V2TlTksDRdCXtj+uNJ
-FnB32sUHiIouxudAsqDf8UL9/99RCw==
+MIIEgTCCA2mgAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBkjELMAkGA1UEBhMCRlIx
+DzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQKDAtF
+eGFtcGxlIEluYzEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5vcmcxJjAk
+BgNVBAMMHUV4YW1wbGUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTI0MDgwNzE4
+NDMwN1oXDTI0MTAwNjE4NDMwN1owdDELMAkGA1UEBhMCRlIxDzANBgNVBAgMBlJh
+ZGl1czEUMBIGA1UECgwLRXhhbXBsZSBJbmMxFTATBgNVBAMMDEV4YW1wbGUgdXNl
+cjEnMCUGCSqGSIb3DQEJARYYdXNlci5leGFtcGxlQGV4YW1wbGUub3JnMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz6mI+213GsAcquAlq0/MMUDbbpjz
+PxurB+9NoQ6xNpoUzK8x8hhC8tORkXi2stCbZbIFISMdtuDzshZ7BBLA32lX5/q0
+YNCS6czcuxnkbFgunfaA6VupK/dx+9GULTMKa7TVNyIhid9NQBowz2BB8n4lHQjS
+g3fkZgR771e3xqZ8xaEKlA8+/lCRHUtjiUtzSFMbQDBA+Liu9cRpb+4xk93CNOk6
+WmHI7reGzJrC8YPc3ngFRvp1ujw0BHlp+AYfwnPPTn7mWYBgJQwfrkECzt/vTIhS
+CJgsvM2bMI/HK30EvCLJb3NheSfZFo5fzkmWk8NK8B1p/d6/SPoul8L2QQIDAQAB
+o4H+MIH7MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMBMGA1UdJQQMMAoGCCsGAQUF
+BwMCMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly93d3cuZXhhbXBsZS5jb20vZXhh
+bXBsZV9jYS5jcmwwNwYIKwYBBQUHAQEEKzApMCcGCCsGAQUFBzABhhtodHRwOi8v
+d3d3LmV4YW1wbGUub3JnL29jc3AwGwYDVR0RBBQwEoEQdXNlckBleGFtcGxlLm9y
+ZzAdBgNVHQ4EFgQUpBSja2rvRXhlulUyZ8ZEDLS0j4AwHwYDVR0jBBgwFoAUQl34
+Jn7xx5zTXckus4k09ScmfUYwDQYJKoZIhvcNAQELBQADggEBAENOA88x6RMfT73L
+hBQBT45qqvLK4GRGhqXDcj/E4hiZ0fX39r5PSUA+rbVbWjlJzW+gnsHWIdDASg4H
+ZlMSYCgU6PN7hhJ1gmc0736V1t1vS63x6502fzNG7TMEvyWP3iadVjkn+sH8Q83d
+AHwJjaKEq0SQYQof4QZZcxaBVLwh0buck4QLpeBYKeGpEiRK+AWireJMNFmBRHpG
+R2E0I/B/duICWoL/8E/PCK7Ys7fUcGtIekEOCToDPW39uoU79mTjXrv+F3NO6Z6p
+CwY9WqlHV0jLrfpdEMQuN2Pl0Qi8N2R0vJLrXRxbSrIkQbZtKyUG11XQBPgl5ZPz
+KbHL9JU=
 -----END CERTIFICATE-----
+Bag Attributes
+	localKeyID: DF 33 79 D4 52 3A 61 87 BF DD 0C BC BB 90 F5 1D 8C D0 02 1E
+Key Attributes: <No Attributes>
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIj62qIYenEeYCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBD+aD/Nfhvs8bsr44gG36xRBIIE
+0OA3BuJdNL3yo5SOVFXMbWeMj13B5yvQwqLRCPJmDesNSy6I2OLVQKr571IiuwBf
+xNytF8MNfZ/OAI7FcMDqf/so9s9zQZlgR5jZKzoR8c0d6NiXboW7HHlO1tk7PhwW
+T2dSFBcmfI0N4zug5vTYGVnOBtwk9F0BlFs8HZwa/5wXfdLnJVXT4l8enIU45Ssb
+MJXrLNZ8SRMSjnsatrPqPhRMtLharGhOAItj4uQ770WbjdMgPejeZOMQ6NAEl1CL
+NPeikRKZQzeBCBYnbAfOSTPNy0i2q28vKzc5e0gHPzqWg6r41/XsCGiKi/4pkwxE
+ZDhbBCLeGdlB7KX4cv6KTp5PtBKMrh4BxGsWrAALqOdt/nsNl8oPBe8j6/iSWDDw
+xJbemI8nFXAI6jAiz4RZS516eHJQT9uEpYdPUfluT17PPOotmjwkL2XuaMDjYOjD
+LOFSIX1Y8L7DPhayViY7hGyBWFDgozIl+us7H7q27SIJQAtoG4gS6w2qTE6UmDbG
+xqxluuQadfnrhtenpVJMwRQzf24txRsuHDTB/6EY3lqZhOvGZzwUV4RqJgg7G5Ix
+YUCiRrNrWGgbViTGpR87GkhBc84pXlTdIVb/bxl1myJ4QFya2oG4PjMK+wxlGJ3q
+8Ght0sz3xvDXLzoh3NYBBhqOj1zKHcUoVMLmxd+GinAy4FENc3cbZjAaTDprPbze
+1368MvGQkcwgxHmqhPIRaz+GPtLhxjPO/SDIkZdzwAGvy8AKS5HTAGcSvbcjcjXE
+3cY4DObY19MwUfsedXYcDzyEKS6OTgNSbfXPStBhijKA+joOzUKf36xEipV3J9fa
+9YtXf5MALkUcLqGKCa4OybAktvN/VBnZfieOyCM3vcTHimmyDhuyjxzJptMTjiH3
+BaBxgZpm0FJVKjTJ3+xkmIeMA8p475Aocs8F7aHqIO/MEMHDB5MuCui3h+Mzccha
+eR2e4Ldv5v8yFR+3Q+MIq8rELtIeNgG/ANldJEWt7paLsRXMXzNah1rdHb6oaDLa
+iou8ZcOKI6kBxj6GxcGN2HicWbqAXgoHAVN59siVOSUGI2rmCxxj1v38oY61IahZ
+k9nde23oAhTnO02ovRXkVNArBE3cEQPbBqwv09rrO/HQqHXRVNu/qFuA/oEopzjI
+lZFUel4IjUQJgk7+1pY/OQzJQR9wfEXMOW4fXG+tL90sIypv115CbYXiUy3tOFcs
+XX5QhDnrSo69Be4ZJQBBY9JEtOPlZCA9C+6Q0zxpNctfj091N7e8nWg2a+DHzpFz
+Vdoa+xGCUMkJZopsnjEStfSTYqgCuPRSRIf8a1i9U2QnLXOFjmu2YUfa06JuQIXK
+lpJxyMmUmd07KiTH3Da0/3V9W++zSlVpT4hHD6zvZ/OzpPKL74cGgtNFMOVkFCjr
+KUcrg7JCxrVb1zZ/Y6CIdpRMFv5/94M67D8hX7aSiPgzGXwwuUzZlygbOZa97s3U
+nKc7ZgVqiNCR6HH2Vhc2A2fuu9aErdnqr6tcbxiWTVORSQxIHCchX/+5+4XtKrHm
+EOPmhwehDEsyFqHwBd/T8xdz/wb8ct+ce1HbzRe8UXjeGsTSPQVuMF4wjHP1MvEl
+0BTRDQlqETtBvtxzZJ7cABWpZqdrZEUtrdD90jd6ZQrF
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/client2.pem b/samples/net/wifi/test_certs/client2.pem
deleted file mode 100644
index 9e815474cd8..00000000000
--- a/samples/net/wifi/test_certs/client2.pem
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDojCCAooCFGZ4UJXBKG70aewILFtsy4mbvaYZMA0GCSqGSIb3DQEBCwUAMIGS
-MQswCQYDVQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hl
-cmUxFDASBgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRp
-ZmljYXRlIEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
-cmcwHhcNMjQxMDA4MTAyNjI1WhcNMzQxMDA2MTAyNjI1WjCBhzELMAkGA1UEBhMC
-RlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQK
-DAtFeGFtcGxlIEluYzEbMBkGA1UEAwwSY2xpZW50LmV4YW1wbGUub3JnMSAwHgYJ
-KoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMu3HXJvi2Q4hQnLL4v/sCyEr5x+ZtBcSi2yETMViaf2EStW
-UOs1A1pmCQbO7nadLQcWaX4tzefQCRrs1X4hIQuDIqRPNi6h6G1g5HEtqBWZhvwu
-hDbmFiX8/Vtw/P0/9sox2DzyLG0mjJUAYAbKtyC1kQalybVBtrSaazyyAyh6oOuU
-chAb7SmmNDsRB959TWM/mp+6yCcFGzCDKNBwlwthB6Uw92d3SfOyXEnZm8rPf0hV
-4ICL5iB+xEYBv1LKmznFK/4UAyKpxAygc5fxKVWwlSsq8MrES5ak0n6H71wViaXK
-BrH5yh9jEkK9XSeaUwg8C9eOOexyx/5JDY3TTE8CAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEAUNddNiRUlJH0acJJv8ztXNWjNewd17tAk1BBHp6yyGAD8b52p6QbDAdS
-xO3WsSc2bqSy599jp4GshO27TMQsBRMfoggCG21Aj6sIs0Hd4shTE4T0GUBEBxC2
-/HReuD+cGIzzKMYlvK8RPSaGLPvPw5SryvmOnjD368V0KCHwT04Z14i4sMxlkd5q
-wB7fxTkVla9MR4uWObX62mJykmqT86chScJpldtBpRh8wrEa3Gt9FZoi/eqP0De8
-oCxmCZDrozGTZ4IIaNzchx3Ensh1RQwvvxd6ATerYdUjq4V2TlTksDRdCXtj+uNJ
-FnB32sUHiIouxudAsqDf8UL9/99RCw==
------END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/server-key.pem b/samples/net/wifi/test_certs/server-key.pem
index 5f032cad701..c9defa1229b 100644
--- a/samples/net/wifi/test_certs/server-key.pem
+++ b/samples/net/wifi/test_certs/server-key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIjI78fcZSH7oCAggA
-MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDfF676hRrL290F0MgMDZiuBIIE
-0Hkz7skRV8Ox0SoX5N8GsOPfN4PS1cLyHgokY6dUhJPU5vUzOn9iSiGQSEzSguQ7
-11mssjRC2T45wB/95VK2EPtRw1f/6VOUR6RJnnGb0PV1Rydp/x5TZ6vzcXpakqly
-eljJR/20fIJClsZzhw0iu5la9fkF6G8WYFEkqex5jALSiN4qVLvkiqcTnh5+amem
-8+OCKgvgooKD2ids4/0GGfJRQSC6DFf3kuxNl+MMvmDXmz/vrD85ONnyXzKXDA3N
-3vRgL/YT6GzwIXb+7/c/tIMpnacxPAdbNOs3DY5ss4xcK68L5PwpM2BljzBa5dGw
-Smgf2VRaYRVzmrte5j280QjfrlHRU2cHaxm0GCu2AOTGwMXcSNYMXfDNuxc57oQJ
-vHXMeZD4K5lACbhYdZ5lJNFvv29YI7dZ7QOGu6nXlAuhZfbdc/cgT0som7eG8xpT
-pERllhQ5ych9sP9nAccN6VUsWgmlF73lbSptBek1ccYkp9LIYCteJUPl2qPcz6zl
-A7zrZ54f3Lg0fOm2pCtg+qKBiw1nd3MR/YbRCgyvudyZE2cCN/ZspWqxsavbGYOz
-JOfIFNnyAcOYtEv1n1BGLfMa1THW2bDV8XmHVHUtM0k4z250QAmLygWLY2166iUF
-qotBkvctKKdulzGdT4nVer1UEKTqcxhDf0dRiHN5spZtFrOee0uGIoQWHt2oecaK
-pJovW+i0qO/1DG5spfU2m1bz6jR2u6nxi340oRrMSoe1ELVg3l1/wmM8yzh07GuK
-pshzxwqAG/FnaKCvcKGUG2EfnAvOcbMgSa2w3GvyRkcDPn00arvX9nuXj0gkRDBi
-eoVMkKKTeeYSGQ4ik+ja3xkgHcxh5W8aoezLvBbmUq206cmhLwfnYMhnvFTs6EBK
-E0ENpCHwF/qoVBIzRCijG/eeCuf3a1YkJsWlvEeVrPeOmDFeDft3SSGOzHxE2A/7
-HWmHbWTm7dPOfgsU4zf+HglnBjN3kYU7StyM0EGxmB4lfB2BiWiL/3R13ERHQZfa
-oOqa4/hOFXOXfTQk6ufXtBx8L9BemBqh36zbs2xVvIizJKeRMruoRblWZkHhUKR8
-K5GA7FYkU9ZPPP0UPKsO94xzwfbevi+7nWeUZoqcqAUy8Jt5aD2QpvFVbPBBOz17
-PGaubeVn/Ry8swPvkpddtmJ4mgF+3SVctmzY+EE/oN1XS8wa+XeuaThzk89Lvrfa
-606nRWrNw3PSKjYoEEtRLhPeJCi9uOVenbOjtclio9mV5Sugwurolczvq8DAGpMG
-W4WgALgOWDjQAudiNH5dtcMGkBONbYywkJc7cT2OZFmzkCbchPPWlKGopuaFGAoU
-SPj7C9SenHmOWAFRX5jJrOZAuVqkdKN3ShWZUL+cDkOCCQlZ0E31u0m9yozY1MeO
-Sx42GtZaSGff37FGYeMZM2ztlutw2zmv2B1g52SBHTjCqQU/ud2Q6/U0kUzjbsdF
-/0KQY9wgZRdOvbnA2lBirN1rXzLWPdduOZ5QImfHfvToN+oOlEqVvvWG12DdA4e5
-y4Dumx00lfKEsGutjF3oKgE6jsjwqAwCoYEAFHTtsvA0hKPisQwNHZmpjGARvR56
-yMEmXynKvgyVGvVP2a9VdqBXSpstL24HfDIu+nlyEWGQ
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIU44Xbg9l+1kCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBx6SOeZLPFiBIIEyBbU4bj1/Sq0
+W5O13hWtq34nTHG+HtgOG61u8659V+0Txbd6E6gBlMTUDtczKCb2BS7D2uugSwTR
+Xj1CeLha1qfsWT3IEe38KB/r+TXA1CESblkHBeYjHYOhOoRSNjg8e+QddFim4uuN
+6eCqgia4jJjC4jT7gLhoUgMtLKxGiw/iVsLme//p1czB2sNNy441Cp2smwvP6GqC
+rymGKgmmEa3pqFm72jO77kev71gUYxPJLXg6bGJ3HBBD0iN79rlCgMTru4s/C/G6
+VoTLCxJrYNiRGsCNu1PM4DtZgQtL32il+u/thZzE6cmh6Yqzkv9G8JXRIakoZctN
+JOwOgbyQLwbAV/0OpZcX0rWKGbO2AO1RmayEJrTBp98qbOW1SrJf2HVAqzevaxOy
+ZqyLbq80x+6wH1sg200tnfwGO/2nz1U7yDTJ4tMuMeJYvAHB5luXYOBrL7AmUJjZ
+CLY/BaN90amz3h1/ZeooMslB1ldjNznLYfrmYc7E1UKWUd5CRjbh6f+k/iYp1wuw
+W2O9qW/aatQyrcWMLboJLTs9XarTFXYSA66bvhPfP/lP4BPm4eQM1xCS7qSjbJMK
+OuTX9J++ZzNIiUJjFTAWW4cIEKkJ+PpljTgdcfnwUCGUcxuqJaVbWVrPstc2tyjJ
+8Ravtr5Fp79dYsD5xSB31ATiAVehp0Zn7lorwmFZ1fhZNMOaFjDk0e3GJPrWgTGY
+DUyeN2Ec/lY76+nTKLqpCPmP/aM3uOEsKEXmtuiYONnz1ZcRSXqAfZKW0Sv9iEQA
+IK31lNuU6CULXM6aUn0lwdoYKZ1S7SPwK6UmqSimBb/5FF5zaZPgzHKhClsnd6EN
+ToMDw18YD1rY6jaAxZdXiaI70i7V9S3RkfjlYkiaLEmjO44yg6Ae7xL0KbOut8iB
+ZCyMHRjobFCLWPTdplQux0xzPD0FXrl8GgJBmiY8SkiFh9NKDNyB6SodjVKXsIhe
+BPsdmh9E66XfHkI16LkkoK5eKgtVDpXVAJBAI2wURIwfIzfzOJ6SExQd3capXqfr
+HpC+sJJjAPy0hHTkv3RnzX1NHqYK5gHq/WCSda/4cl8ZepF5eoyJ8h+9TJzlTDJX
+REyt5iUvKbFT3bQ3WYwWUW6lEei16KK9Cm8ivZsEQqbeG0kP6lO3pG+WNsAYRXlE
+aXg8wgFLJRS/7llaB8xiZHZ0mMsj9UAwZd7gUkp1EjDt7A6f1KlYEtIXtQ9TVXhS
+kegWYMvJOpzJoOTcZ2Yu/wNUEAnnOnXzCrr5EAD3aHUwaSHfj75y44uHrYtEKEyO
+Q1bhRhSC5rFcEEomHofy7PlJqoynxMxOd6VZdSpMr2fSDKO36aY8bGD7ST0hpHrs
+6NNbywy23G68YX6QREwcuT4EDzIQOQsl7GCSx8KVibubsYcGSuXSVlBMI9sLOtsA
+AwSAXOyGoVrmms79ekp4O4Pzq4vqE61KEh8K0/h5qDJ8+c2kqQl5eeDkDwtBYwjD
+oYKRlmCkKzoo7qW4uIeVy4ZeQIuzWcCWnSZumtBa2mLlo4w9njmwgPR0wtDU8daW
++0CL828/eNfIN3awo0VeAJ8nbZlKL2ioyND9KNXjJ2fJNuwyrWv9c5fz/NeWgv9O
+Z2S6ZI0xPgZJNQ6rLcPigA==
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/server-key2.pem b/samples/net/wifi/test_certs/server-key2.pem
deleted file mode 100644
index 5f032cad701..00000000000
--- a/samples/net/wifi/test_certs/server-key2.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIjI78fcZSH7oCAggA
-MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDfF676hRrL290F0MgMDZiuBIIE
-0Hkz7skRV8Ox0SoX5N8GsOPfN4PS1cLyHgokY6dUhJPU5vUzOn9iSiGQSEzSguQ7
-11mssjRC2T45wB/95VK2EPtRw1f/6VOUR6RJnnGb0PV1Rydp/x5TZ6vzcXpakqly
-eljJR/20fIJClsZzhw0iu5la9fkF6G8WYFEkqex5jALSiN4qVLvkiqcTnh5+amem
-8+OCKgvgooKD2ids4/0GGfJRQSC6DFf3kuxNl+MMvmDXmz/vrD85ONnyXzKXDA3N
-3vRgL/YT6GzwIXb+7/c/tIMpnacxPAdbNOs3DY5ss4xcK68L5PwpM2BljzBa5dGw
-Smgf2VRaYRVzmrte5j280QjfrlHRU2cHaxm0GCu2AOTGwMXcSNYMXfDNuxc57oQJ
-vHXMeZD4K5lACbhYdZ5lJNFvv29YI7dZ7QOGu6nXlAuhZfbdc/cgT0som7eG8xpT
-pERllhQ5ych9sP9nAccN6VUsWgmlF73lbSptBek1ccYkp9LIYCteJUPl2qPcz6zl
-A7zrZ54f3Lg0fOm2pCtg+qKBiw1nd3MR/YbRCgyvudyZE2cCN/ZspWqxsavbGYOz
-JOfIFNnyAcOYtEv1n1BGLfMa1THW2bDV8XmHVHUtM0k4z250QAmLygWLY2166iUF
-qotBkvctKKdulzGdT4nVer1UEKTqcxhDf0dRiHN5spZtFrOee0uGIoQWHt2oecaK
-pJovW+i0qO/1DG5spfU2m1bz6jR2u6nxi340oRrMSoe1ELVg3l1/wmM8yzh07GuK
-pshzxwqAG/FnaKCvcKGUG2EfnAvOcbMgSa2w3GvyRkcDPn00arvX9nuXj0gkRDBi
-eoVMkKKTeeYSGQ4ik+ja3xkgHcxh5W8aoezLvBbmUq206cmhLwfnYMhnvFTs6EBK
-E0ENpCHwF/qoVBIzRCijG/eeCuf3a1YkJsWlvEeVrPeOmDFeDft3SSGOzHxE2A/7
-HWmHbWTm7dPOfgsU4zf+HglnBjN3kYU7StyM0EGxmB4lfB2BiWiL/3R13ERHQZfa
-oOqa4/hOFXOXfTQk6ufXtBx8L9BemBqh36zbs2xVvIizJKeRMruoRblWZkHhUKR8
-K5GA7FYkU9ZPPP0UPKsO94xzwfbevi+7nWeUZoqcqAUy8Jt5aD2QpvFVbPBBOz17
-PGaubeVn/Ry8swPvkpddtmJ4mgF+3SVctmzY+EE/oN1XS8wa+XeuaThzk89Lvrfa
-606nRWrNw3PSKjYoEEtRLhPeJCi9uOVenbOjtclio9mV5Sugwurolczvq8DAGpMG
-W4WgALgOWDjQAudiNH5dtcMGkBONbYywkJc7cT2OZFmzkCbchPPWlKGopuaFGAoU
-SPj7C9SenHmOWAFRX5jJrOZAuVqkdKN3ShWZUL+cDkOCCQlZ0E31u0m9yozY1MeO
-Sx42GtZaSGff37FGYeMZM2ztlutw2zmv2B1g52SBHTjCqQU/ud2Q6/U0kUzjbsdF
-/0KQY9wgZRdOvbnA2lBirN1rXzLWPdduOZ5QImfHfvToN+oOlEqVvvWG12DdA4e5
-y4Dumx00lfKEsGutjF3oKgE6jsjwqAwCoYEAFHTtsvA0hKPisQwNHZmpjGARvR56
-yMEmXynKvgyVGvVP2a9VdqBXSpstL24HfDIu+nlyEWGQ
------END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/server.pem b/samples/net/wifi/test_certs/server.pem
index d8f82faf6dd..12b9a5458bd 100644
--- a/samples/net/wifi/test_certs/server.pem
+++ b/samples/net/wifi/test_certs/server.pem
@@ -1,22 +1,68 @@
+Bag Attributes
+	localKeyID: 70 E4 1E 20 0B 8A 3E 65 06 98 99 29 C2 A4 26 33 38 D8 94 23
+subject=C = FR, ST = Radius, O = Example Inc, CN = Example Server Certificate, emailAddress = admin@example.org
+issuer=C = FR, ST = Radius, L = Somewhere, O = Example Inc, emailAddress = admin@example.org, CN = Example Certificate Authority
 -----BEGIN CERTIFICATE-----
-MIIDojCCAooCFCPQcj7ej5jhr6/mLlAoLYgfgsYcMA0GCSqGSIb3DQEBCwUAMIGS
-MQswCQYDVQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hl
-cmUxFDASBgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRp
-ZmljYXRlIEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
-cmcwHhcNMjQxMDA4MTAyNTI5WhcNMzQxMDA2MTAyNTI5WjCBhzELMAkGA1UEBhMC
-RlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQK
-DAtFeGFtcGxlIEluYzEbMBkGA1UEAwwSc2VydmVyLmV4YW1wbGUub3JnMSAwHgYJ
-KoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBANcE/OPHQK/y1b6UsIktNK7WIZB528HECY7Bz18EGba0uHod
-91RbzHSJ1qI3iQyldI1UW/kY5oYjBW3lhLH0BkD/EsqvNYCV+3YzAM3ITtdOdEU9
-CqjgXttehQHfXvc7jQlF8Q2gYPUz2dDLo/gcTkz1d+mCr6nQUjT8Kq/nG54T0NnD
-k8udchjUlNaQsvx/WVs3TUYxMbWzQRtpJIbv99rAWq7YgQbkNZnSYC1VgrU/BiuQ
-0KrP6rfkxvBCGwIh2JXIL3FV4N8AsgGZvjXQ3zXKXwuPhxWdSmjKWlioVM3mha2A
-/1e1gX6nFY/uk46D60XWxcJ6tHGHoafU7EtN3zMCAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEAWwdTMphD0jxLtYO0iq/+fMtq2R96ZUN9wprZ7qg1evUNQjqLR4jKX306
-ZJX5uw+6r5Ve/k368qvcSF/sSfvBm8yd3JcegTl5t8T2/Aks8o3sfyuS0uyJC1rS
-zTrd7FmJG9YMosU1BqYobda64MXq7g+6MyrQoZ6fVdPvC6Sox3+a4fl9xjdm4CTY
-MsWqBJMe26LptvRIJ01/B6PjVTvsn/fxxj7rHmnJ/j63AIiBntm0vV/85cwYy/4o
-HlPH/Qjvn3hZjUlBcveiYat998F+s9gH2usvCkG3kly/n1/667LLCymmCHxtH8ka
-7tF3siO1EANureFY8qj6ZvlKeTkZ6g==
+MIIFZzCCBE+gAwIBAgIBATANBgkqhkiG9w0BAQsFADCBkjELMAkGA1UEBhMCRlIx
+DzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQKDAtF
+eGFtcGxlIEluYzEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5vcmcxJjAk
+BgNVBAMMHUV4YW1wbGUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTI0MDgwNzE4
+NDMwNloXDTI0MTAwNjE4NDMwNlowezELMAkGA1UEBhMCRlIxDzANBgNVBAgMBlJh
+ZGl1czEUMBIGA1UECgwLRXhhbXBsZSBJbmMxIzAhBgNVBAMMGkV4YW1wbGUgU2Vy
+dmVyIENlcnRpZmljYXRlMSAwHgYJKoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLm9y
+ZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtkktsya+B8p8x5/P7t
+IDIVcc0E6PPUklUmrcAzBuLNdnHH0FCbzqqsE+28L36gyriNv+l0EOvvnV3LJJdc
+RO/6Ee4NHjO/GKcmTCDOC1KSl7yP+IaPog/f86UJ1rTOQpnpCi/uB3Gd3ZocZ+s+
+5fnPCVFdAaRfLs8fVbJ3Lt79E/FiVhXXjG4/wFMGHg/6P3fsq5B+VqUww8xUjfZ9
+MUuo+MYP5CPYJHfhuIwNHsunGKsmjMtQ4nR84huTOKy9+YVsKr+GRzGy4aC3ElCb
+HTU+axLVcVPRgpsdCaFzXLAg5L//rufgWI7NKIV16t+6q/3euFWPHYW3lqdAWMD4
+yssCAwEAAaOCAdwwggHYMB0GA1UdDgQWBBT5kdLsBRD8WBlzoAmLWRMZf6PvOjCB
+0gYDVR0jBIHKMIHHgBRCXfgmfvHHnNNdyS6ziTT1JyZ9RqGBmKSBlTCBkjELMAkG
+A1UEBhMCRlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQw
+EgYDVQQKDAtFeGFtcGxlIEluYzEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBs
+ZS5vcmcxJjAkBgNVBAMMHUV4YW1wbGUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5ghQ1
+f/ABa8HTFuVRSCGWyh5qvh/qSTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAw4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0
+cDovL3d3dy5leGFtcGxlLmNvbS9leGFtcGxlX2NhLmNybDA3BggrBgEFBQcBAQQr
+MCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly93d3cuZXhhbXBsZS5vcmcvb2NzcDA6BgNV
+HREEMzAxghJyYWRpdXMuZXhhbXBsZS5vcmegGwYIKwYBBQUHCAigDwwNKi5leGFt
+cGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAX5O3aUlupNs8C0blKzGJosqKoEP1
+D0/RUESK6443TlK2hAImSE/qz9JGQ4tMSO1bfnYUS9Mnk4hStlG4gg6F/B4nV1eZ
+qbHEFWCyhCAlUUeDF+8Lz2G6wYXrw9pPe1GpQSFdHLTV2WKVK0IaRaote8bCQHBm
+bgNbfZVXK4JJKX0Wg+ECNQv8bGA/WwZ+QKOcjemaa1kxwi9PFRNOIOdFfk1zKXHz
+D6Ex0hFzl2dt+aSpmb93Fo4wDz1rtCJ7HGo1TtUbDdDwDoZv8SKsAI7XtDmrqqP/
+MZa+lI5xVXCsSBDppGZb6BVkl3AfUIIhbCDqj1MT9vXqjtaWsyG4F3iHuw==
 -----END CERTIFICATE-----
+Bag Attributes
+	localKeyID: 70 E4 1E 20 0B 8A 3E 65 06 98 99 29 C2 A4 26 33 38 D8 94 23
+Key Attributes: <No Attributes>
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQI0/IqoquZd2sCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBA3/HwadBWDheQI/8p1u6j+BIIE
+0N7R2UwLzLVPv/QR/hfYtK56iUtq0j5dqW/1Yos5IpkmUhOdXa149OGmzUkM6JQ/
+GaYQ5TbCn0+/HZx0k1nLIHL0fOUlorW/6i/pfw+KMR0bZrPUoZJyukG7iFIcD5yB
+Pq6Q/QXVIH0qzB2lTTEa6TNSzM4PtcGd24Ivt7GwX8vz/bbW+gPCnAEbFKTrn1aP
+Dr5LRIn9MOStPox/PmCEysdrdgJ8W9BD9J7iviUOmfJckl7hc10j87SvqHDYuPIP
+a5QZnGanbsdOfYRCtg6jkLPiR7f3kS+aeITGx1iKdm+wqpcp1JelYmg3b9a0mSGk
+fLgOS8z0hmdPrPT4yZtU1MvjxPpbVcpP+S5idWWD30bit2c7lqW3shXjan+voA4R
+gYbJewXiJbjFCElj/EnvX5dFaJyBdeRcaIZcKhEwsTGJ/GI6S7nFdDNao4dXUESX
+CWgVQNcdqiK/OJ8blQR6+1vxajJNLqx5GwbLJdMbN7d+o8m0O7O+lygF3BiDYpp0
+niLrB+qTM2H5jGRe2Vwhs5HxU1b0uN85xqUHRppeFmNB4mEcpT0XZ0a5kZZhuCQg
+P48ONl46i1DAAKOAQ+WSiSQUBO+AmMlzNquCNstkSrEis4szfDOT/RQmlMwLEyb9
+3aXZwsHzZREi7gojsyEHyadeKhsblBITSD79MmVpPBhym6sok8QWgk4R4+Xsckll
+cxqhsczmGv/tSz71/Soqql6KXmtk7YUAWDM1YtF1K2pb4zF9q0/mp3MgUB7sjcfm
+HMFDD3KSMFGfP9ex4MTUlEFXoBS0jM1rC+L0OtSDsBs23BOJvgi3JArZD2WPUPeR
+1dxcrtqYFy1DGkCMZ8+24GmqXbaL+iG/vgyAyhjcgWet2Xk8BHpuYPWSoGlnmJTP
+tqLC13jU0to8S8H7vsrbUP5m+XN/sVXkYE86AOsMO+/g+1fcqQOu0fSdSOvNvw5c
+/56yHA/+bJJfcQyqoEpPrpR2npazcG0cop3FOP9eTvNERRO6ayXJjrq1Tl9Ok39v
+DRQy/TLt6tQtHjiTFDgiZI+PI7FVzSudCGa2oMKTyf8qDWUN65825oSL7e7jggFM
+8VFf1MBXb1lCIFIrukNnXuXnYMWtQYjvHS/vN3jP/BGnVW+rEupj/hq4gtv1J2Pu
+B5Qn8Q+szCz8ha6ziA9+iVt57SRakK87bZ7qEIIy4XTJBnCGHTVjQOn+aMHJ/76H
+wiw8CPgKKQMwx0JyySMfZih+LgxlibPpk76zNIw0eYLM4DQEwmx9LGXZ4TIPCyAg
+GiWeKYn4zD0ub634DBFRTmX5XGQhqmKSkCIKOs4/8yzmX3649vess85RJN4DjjGN
+njzxuInblVxVg0YvzlGQHXwwCJuG48yoTa3UPvqft67kOoBLh8Kky1kMPPtPm8yR
+ZT8E8VdYSg2ssyCpyfaV3RCnxsMpnFUER+JU0g6IxTpDqxA4zK5XS6Wt/KsdnU+1
+locA7O1+lcsDXf2FyDFtwPwNZIjchV1UDXSYr/fKyn10TDoSMeRTZsC0vwm2/9bW
+peH+nk/x93j29VZVzGk6hlpLC9MBRq/qGhNqIwklxtfIKLr0l5oMcWwm4h4dAVBR
+HUC0MTfbSTrC8mAsOglVa87dF9v1gnA2FVlRZEHJCGwe
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/server2.pem b/samples/net/wifi/test_certs/server2.pem
deleted file mode 100644
index d8f82faf6dd..00000000000
--- a/samples/net/wifi/test_certs/server2.pem
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDojCCAooCFCPQcj7ej5jhr6/mLlAoLYgfgsYcMA0GCSqGSIb3DQEBCwUAMIGS
-MQswCQYDVQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hl
-cmUxFDASBgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRp
-ZmljYXRlIEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
-cmcwHhcNMjQxMDA4MTAyNTI5WhcNMzQxMDA2MTAyNTI5WjCBhzELMAkGA1UEBhMC
-RlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQK
-DAtFeGFtcGxlIEluYzEbMBkGA1UEAwwSc2VydmVyLmV4YW1wbGUub3JnMSAwHgYJ
-KoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBANcE/OPHQK/y1b6UsIktNK7WIZB528HECY7Bz18EGba0uHod
-91RbzHSJ1qI3iQyldI1UW/kY5oYjBW3lhLH0BkD/EsqvNYCV+3YzAM3ITtdOdEU9
-CqjgXttehQHfXvc7jQlF8Q2gYPUz2dDLo/gcTkz1d+mCr6nQUjT8Kq/nG54T0NnD
-k8udchjUlNaQsvx/WVs3TUYxMbWzQRtpJIbv99rAWq7YgQbkNZnSYC1VgrU/BiuQ
-0KrP6rfkxvBCGwIh2JXIL3FV4N8AsgGZvjXQ3zXKXwuPhxWdSmjKWlioVM3mha2A
-/1e1gX6nFY/uk46D60XWxcJ6tHGHoafU7EtN3zMCAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEAWwdTMphD0jxLtYO0iq/+fMtq2R96ZUN9wprZ7qg1evUNQjqLR4jKX306
-ZJX5uw+6r5Ve/k368qvcSF/sSfvBm8yd3JcegTl5t8T2/Aks8o3sfyuS0uyJC1rS
-zTrd7FmJG9YMosU1BqYobda64MXq7g+6MyrQoZ6fVdPvC6Sox3+a4fl9xjdm4CTY
-MsWqBJMe26LptvRIJ01/B6PjVTvsn/fxxj7rHmnJ/j63AIiBntm0vV/85cwYy/4o
-HlPH/Qjvn3hZjUlBcveiYat998F+s9gH2usvCkG3kly/n1/667LLCymmCHxtH8ka
-7tF3siO1EANureFY8qj6ZvlKeTkZ6g==
------END CERTIFICATE-----

From 1ab141cea7ac4b29119d80b2a49f378fd41a9673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:43 +0100
Subject: [PATCH 1658/2913] Revert "[nrf noup] boards: nordic: 7002dk_ns: Fix
 missing co-ex"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 59ed8524c7d18e9c7cd267c9fd84ac9f852ba93c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts | 1 +
 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
index 5ff28accf3f..cbbd46dff8b 100644
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
@@ -35,5 +35,6 @@
 		qspi-quad-mode;
 
 		#include "nrf70_common.dtsi"
+		#include "nrf70_common_coex.dtsi"
 	};
 };
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
index 0deb8ccc1bf..ed219384795 100644
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
@@ -35,6 +35,7 @@
 		qspi-quad-mode;
 
 		#include "nrf70_common.dtsi"
+		#include "nrf70_common_coex.dtsi"
 		#include "nrf70_common_5g.dtsi"
 	};
 };

From b54fcc01c623dc2cc63be07d1f0c6abe00d1909e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:43 +0100
Subject: [PATCH 1659/2913] Revert "[nrf noup] samples: net: wifi: Enable Wi-Fi
 driver in sysbuild builds"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 74aa39df52e40b8342ca7feff8ff0847df74365c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/net/wifi/Kconfig.sysbuild | 13 -------------
 samples/net/wifi/sample.yaml      |  2 --
 2 files changed, 15 deletions(-)
 delete mode 100644 samples/net/wifi/Kconfig.sysbuild

diff --git a/samples/net/wifi/Kconfig.sysbuild b/samples/net/wifi/Kconfig.sysbuild
deleted file mode 100644
index 158551060c5..00000000000
--- a/samples/net/wifi/Kconfig.sysbuild
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config WIFI_NRF70
-	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/wifi/sample.yaml b/samples/net/wifi/sample.yaml
index c5234753a78..f2f5207f354 100644
--- a/samples/net/wifi/sample.yaml
+++ b/samples/net/wifi/sample.yaml
@@ -53,7 +53,6 @@ tests:
       - nrf7002dk/nrf5340/cpuapp/nrf7001
   sample.net.wifi.nrf7002ek:
     extra_args:
-      - SB_CONFIG_WIFI_NRF70=y
       - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
       - SHIELD=nrf7002ek
     platform_allow:
@@ -66,7 +65,6 @@ tests:
   sample.net.wifi.nrf7002eb:
     extra_args:
       - CONFIG_NRF70_UTIL=y
-      - SB_CONFIG_WIFI_NRF70=y
       - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
       - SHIELD=nrf7002eb
     platform_allow:

From 605c442557d7d26c1894c632fe77e678737f09eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:43 +0100
Subject: [PATCH 1660/2913] Revert "[nrf noup] samples: net: wifi: Changes for
 EAP-TLS support"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 387e246f63699a40a504cc58fb6bb0810129bf0c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/net/wifi/overlay-enterprise.conf | 2 +-
 samples/net/wifi/prj.conf                | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/samples/net/wifi/overlay-enterprise.conf b/samples/net/wifi/overlay-enterprise.conf
index ba6d958f9a5..34416282811 100644
--- a/samples/net/wifi/overlay-enterprise.conf
+++ b/samples/net/wifi/overlay-enterprise.conf
@@ -7,4 +7,4 @@ CONFIG_NET_BUF_RX_COUNT=36
 # For TLS and X.509 processing MbedTLS needs large heap size and using separate heap
 # for MbedTLS gives us more control over the heap size.
 CONFIG_MBEDTLS_ENABLE_HEAP=y
-CONFIG_MBEDTLS_HEAP_SIZE=70000
+CONFIG_MBEDTLS_HEAP_SIZE=55000
diff --git a/samples/net/wifi/prj.conf b/samples/net/wifi/prj.conf
index ab3d718f06b..e1a1b40a409 100644
--- a/samples/net/wifi/prj.conf
+++ b/samples/net/wifi/prj.conf
@@ -31,10 +31,6 @@ CONFIG_NET_STATISTICS_PERIODIC_OUTPUT=n
 CONFIG_WIFI=y
 CONFIG_WIFI_LOG_LEVEL_ERR=y
 CONFIG_NET_L2_WIFI_SHELL=y
-
-CONFIG_MBEDTLS_ENABLE_HEAP=y
-CONFIG_MBEDTLS_HEAP_SIZE=70000
-
 # printing of scan results puts pressure on queues in new locking
 # design in net_mgmt. So, use a higher timeout for a crowded
 # environment.

From fba0ccdc390e2a16fccb67291657c33b158ec854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:43 +0100
Subject: [PATCH 1661/2913] Revert "[nrf fromlist] manifest: hostap: Pull fix
 for build error"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c55d898c5a69085444dfae395a17696b10fcff05.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index f2a65b025c9..e46ee9e3d0f 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: 44285310338f423021cc7df2c1056256882a00cc
+      revision: e481fe559e17052ec8ea04388a934f3d30816737
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From bcb2d73012a51d11ba2c67d0167acb465d9d9fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:43 +0100
Subject: [PATCH 1662/2913] Revert "[nrf fromtree] samples: wifi: Fix missing
 CONFIG for the option"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit da5179a404d0b10e023d0ef9c2b66e160f62d000.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/net/wifi/sample.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/net/wifi/sample.yaml b/samples/net/wifi/sample.yaml
index f2f5207f354..e7ca553ecaf 100644
--- a/samples/net/wifi/sample.yaml
+++ b/samples/net/wifi/sample.yaml
@@ -64,7 +64,7 @@ tests:
       - nucleo_h723zg
   sample.net.wifi.nrf7002eb:
     extra_args:
-      - CONFIG_NRF70_UTIL=y
+      - NRF70_UTIL=y
       - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
       - SHIELD=nrf7002eb
     platform_allow:

From 026ab9bb4dc415993f3a17302fb69b6cfb08789d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:44 +0100
Subject: [PATCH 1663/2913] Revert "[nrf fromtree] drivers: nrfwifi: Fix a
 build error"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 632004f3762089eede0be7f9a3cf293f6c1a47e6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 70223f739ef..0cd45829318 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -343,5 +343,4 @@ zephyr_compile_definitions(
   -DNRF70_ANT_GAIN_5G_BAND2=${CONFIG_NRF70_ANT_GAIN_5G_BAND2}
   -DNRF70_ANT_GAIN_5G_BAND3=${CONFIG_NRF70_ANT_GAIN_5G_BAND3}
   -DNRF_WIFI_PS_INT_PS=${CONFIG_NRF_WIFI_PS_INT_PS}
-  -DNRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS=${CONFIG_NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS}
 )

From e7323930195812820ec18a08409f04c1a056d2f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:44 +0100
Subject: [PATCH 1664/2913] Revert "[nrf fromtree] manifest: hal_nordic: Pull
 fix for build errors"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 630e679c1cad25a905b9dac47dcffae9465a250e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index e46ee9e3d0f..f500d7e1b59 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: cb7600a1be4c8b177867e6d463729c07dd3f6d73
+      revision: 957d1a803d0663330e870af2985503ba0cdbb152
       path: modules/hal/nordic
       groups:
         - hal

From e06eb648b092d73b58401228d42528bec10adc32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:44 +0100
Subject: [PATCH 1665/2913] Revert "[nrf fromlist] net: l2: wifi: Add checks
 for cert header creation"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3fd8f640984e72bfe8a7a1108131817d32aad754.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/l2/wifi/CMakeLists.txt | 76 +++++++++++++++----------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/subsys/net/l2/wifi/CMakeLists.txt b/subsys/net/l2/wifi/CMakeLists.txt
index fc844e37ca2..eb22a54cf77 100644
--- a/subsys/net/l2/wifi/CMakeLists.txt
+++ b/subsys/net/l2/wifi/CMakeLists.txt
@@ -23,49 +23,47 @@ if (CONFIG_WIFI_NM)
 zephyr_iterable_section(NAME wifi_nm_instance GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
-if(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE)
-  # Wi-Fi Enterprise test certificates handling
-  set(gen_inc_dir ${ZEPHYR_BINARY_DIR}/misc/generated)
-  set(gen_dir ${gen_inc_dir}/wifi_enterprise_test_certs)
-  # Create output directory for test certs
-  file(MAKE_DIRECTORY ${gen_dir})
+# Wi-Fi Enterprise test certificates handling
+set(gen_inc_dir ${ZEPHYR_BINARY_DIR}/misc/generated)
+set(gen_dir ${gen_inc_dir}/wifi_enterprise_test_certs)
+# Create output directory for test certs
+file(MAKE_DIRECTORY ${gen_dir})
 
-  # convert .pem files to array data at build time
-  zephyr_include_directories(${gen_inc_dir})
+# convert .pem files to array data at build time
+zephyr_include_directories(${gen_inc_dir})
 
-  generate_inc_file_for_target(
-      app
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client.pem
-      ${gen_dir}/client.pem.inc
-      )
+generate_inc_file_for_target(
+    app
+    ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client.pem
+    ${gen_dir}/client.pem.inc
+    )
 
-  generate_inc_file_for_target(
-      app
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client-key.pem
-      ${gen_dir}/client-key.pem.inc
-      )
+generate_inc_file_for_target(
+    app
+    ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client-key.pem
+    ${gen_dir}/client-key.pem.inc
+    )
 
-  generate_inc_file_for_target(
-      app
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/ca.pem
-      ${gen_dir}/ca.pem.inc
-      )
+generate_inc_file_for_target(
+    app
+    ${ZEPHYR_BASE}/samples/net/wifi/test_certs/ca.pem
+    ${gen_dir}/ca.pem.inc
+    )
 
-  generate_inc_file_for_target(
-      app
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client2.pem
-      ${gen_dir}/client2.pem.inc
-      )
+generate_inc_file_for_target(
+    app
+    ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client2.pem
+    ${gen_dir}/client2.pem.inc
+    )
 
-  generate_inc_file_for_target(
-      app
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client-key2.pem
-      ${gen_dir}/client-key2.pem.inc
-      )
+generate_inc_file_for_target(
+    app
+    ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client-key2.pem
+    ${gen_dir}/client-key2.pem.inc
+    )
 
-  generate_inc_file_for_target(
-      app
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/ca2.pem
-      ${gen_dir}/ca2.pem.inc
-      )
-endif()
+generate_inc_file_for_target(
+    app
+    ${ZEPHYR_BASE}/samples/net/wifi/test_certs/ca2.pem
+    ${gen_dir}/ca2.pem.inc
+    )

From caafa1704d847bb522db2a4422c9d437a70bffb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:44 +0100
Subject: [PATCH 1666/2913] Revert "[nrf fromtree] modules: hostap: Add a
 config option for WPA control timeout"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c270e07b9cff53855be699b04a7db7df5fe9ac4f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/Kconfig | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index e22059f00f0..1a82af8233d 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -543,11 +543,4 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_TEST
 	bool
 	depends on WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA
 
-config WIFI_NM_WPA_CTRL_RESP_TIMEOUT_S
-	int "WPA supplicant control interface response timeout in seconds"
-	default 15
-	help
-	  Timeout for the control interface commands to get a response from the
-	  supplicant.
-
 endif # WIFI_NM_WPA_SUPPLICANT

From 9eaf4eb0924a9c7829326e72ec26b7ad03a2478a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:44 +0100
Subject: [PATCH 1667/2913] Revert "[nrf fromtree] manifest: hostap: Pull
 compile error fixes"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit df045030e0b35b8f35bf48741bdaec53dabfd339.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index f500d7e1b59..31a525b6eaf 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: e481fe559e17052ec8ea04388a934f3d30816737
+      revision: ac59d28778b20cd68702f55dad2a27d648e3d571
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From a55a74109bf083e126b95b75b56a1651d006b7da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:44 +0100
Subject: [PATCH 1668/2913] Revert "[nrf fromtree] tests: net: wifi: Add build
 test for various config combinations"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a008aee9be1d0adc2792e20b67e5c4b61dccbc43.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/wifi/configs/CMakeLists.txt |  8 ----
 tests/net/wifi/configs/prj.conf       | 33 --------------
 tests/net/wifi/configs/src/main.c     | 10 ----
 tests/net/wifi/configs/testcase.yaml  | 66 ---------------------------
 4 files changed, 117 deletions(-)
 delete mode 100644 tests/net/wifi/configs/CMakeLists.txt
 delete mode 100644 tests/net/wifi/configs/prj.conf
 delete mode 100644 tests/net/wifi/configs/src/main.c
 delete mode 100644 tests/net/wifi/configs/testcase.yaml

diff --git a/tests/net/wifi/configs/CMakeLists.txt b/tests/net/wifi/configs/CMakeLists.txt
deleted file mode 100644
index 518596a02f7..00000000000
--- a/tests/net/wifi/configs/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(build_all)
-
-FILE(GLOB app_sources src/*.c)
-target_sources(app PRIVATE ${app_sources})
diff --git a/tests/net/wifi/configs/prj.conf b/tests/net/wifi/configs/prj.conf
deleted file mode 100644
index 2a2f4d2cf6b..00000000000
--- a/tests/net/wifi/configs/prj.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-CONFIG_TEST=y
-CONFIG_TEST_USERSPACE=y
-CONFIG_NET_TEST=y
-
-CONFIG_NETWORKING=y
-CONFIG_NET_IPV4=y
-CONFIG_NET_IPV6=y
-CONFIG_NET_CONFIG_SETTINGS=n
-
-CONFIG_WIFI=y
-CONFIG_WIFI_NM=y
-
-CONFIG_SHELL=y
-CONFIG_NET_SHELL=y
-CONFIG_NET_L2_WIFI_SHELL=y
-CONFIG_NET_L2_WIFI_MGMT=y
-
-CONFIG_WIFI_SHELL_MAX_AP_STA=2
-CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS=y
-CONFIG_WIFI_MGMT_FORCED_PASSIVE_SCAN=y
-CONFIG_WIFI_MGMT_SCAN_SSID_FILT_MAX=3
-CONFIG_WIFI_MGMT_SCAN_CHAN_MAX_MANUAL=10
-CONFIG_WIFI_NM_MAX_MANAGED_INTERFACES=2
-CONFIG_WIFI_MGMT_AP_STA_SKIP_INACTIVITY_POLL=y
-CONFIG_WIFI_MGMT_AP_MAX_NUM_STA=10
-
-CONFIG_WIFI_NM_WPA_SUPPLICANT=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=0
-CONFIG_WIFI_NM_WPA_SUPPLICANT_WEP=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_ADVANCED_FEATURES=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_AP=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_CLI=y
-CONFIG_WPA_CLI=y
diff --git a/tests/net/wifi/configs/src/main.c b/tests/net/wifi/configs/src/main.c
deleted file mode 100644
index a05ee591430..00000000000
--- a/tests/net/wifi/configs/src/main.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-int main(void)
-{
-	return 0;
-}
diff --git a/tests/net/wifi/configs/testcase.yaml b/tests/net/wifi/configs/testcase.yaml
deleted file mode 100644
index 017407bc846..00000000000
--- a/tests/net/wifi/configs/testcase.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-common:
-  build_only: true
-  tags:
-    - drivers
-    - wifi
-    - net
-  platform_allow:
-    - native_sim
-    - native_sim/native/64
-tests:
-  wifi.build.crypto_default:
-    extra_configs:
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO=y
-  wifi.build.crypto_alt:
-    extra_configs:
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT=y
-  wifi.build.crypto_none:
-    extra_configs:
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE=y
-  # FIXME: The psa crypto does not work atm so commented out
-  #        the build test temporarily.
-  # wifi.build.crypto_psa:
-  #  extra_configs:
-  #    - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA=y
-  wifi.build.crypto_enterprise:
-    extra_configs:
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT=y
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE=y
-      - CONFIG_MBEDTLS_TLS_VERSION_1_2=y
-      - CONFIG_EAP_TLS=y
-      - CONFIG_EAP_TTLS=y
-      - CONFIG_EAP_PEAP=y
-      - CONFIG_EAP_MD5=y
-      - CONFIG_EAP_MSCHAPV2=y
-      - CONFIG_EAP_LEAP=y
-      - CONFIG_EAP_PSK=y
-      - CONFIG_EAP_PAX=y
-      - CONFIG_EAP_SAKE=y
-      - CONFIG_EAP_GPSK=y
-      - CONFIG_EAP_PWD=y
-      - CONFIG_EAP_EKE=y
-      - CONFIG_EAP_IKEV2=y
-      - CONFIG_EAP_SIM=y
-      - CONFIG_EAP_AKA=y
-  wifi.build.wpa3:
-    extra_configs:
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT_WPA3=y
-      - CONFIG_MBEDTLS_TLS_VERSION_1_2=y
-  wifi.build.wps:
-    extra_configs:
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT_WPS=y
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT_EAPOL=y
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO=y
-  wifi.build.p2p:
-    extra_configs:
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT_P2P=y
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO=y
-  wifi.build.hostapd_ap:
-    extra_configs:
-      - CONFIG_WIFI_NM_HOSTAPD_AP=y
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT_INF_MON=n
-  wifi.build.dpp:
-    extra_configs:
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT=y
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE=y
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP=y

From dfb2cedba5d7862de8d13e428d08afef2d545e2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:44 +0100
Subject: [PATCH 1669/2913] Revert "[nrf fromtree] hostap: Avoid warning of
 different enum mapping"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ede83366d1ede14c478b09ed88cfc7de51fa5bdf.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_api.c | 47 +++--------------------------------
 1 file changed, 4 insertions(+), 43 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 52772b4becf..fd6449e98a9 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1116,45 +1116,6 @@ int supplicant_disconnect(const struct device *dev)
 	return wpas_disconnect_network(dev, WPAS_MODE_INFRA);
 }
 
-static enum wifi_mfp_options get_mfp(enum mfp_options supp_mfp_option)
-{
-	switch (supp_mfp_option) {
-	case NO_MGMT_FRAME_PROTECTION:
-		return WIFI_MFP_DISABLE;
-	case MGMT_FRAME_PROTECTION_OPTIONAL:
-		return WIFI_MFP_OPTIONAL;
-	case MGMT_FRAME_PROTECTION_REQUIRED:
-		return WIFI_MFP_REQUIRED;
-	default:
-		wpa_printf(MSG_ERROR, "Invalid mfp mapping %d", supp_mfp_option);
-		break;
-	}
-
-	return WIFI_MFP_DISABLE;
-}
-
-static enum wifi_iface_mode get_iface_mode(enum wpas_mode supp_mode)
-{
-	switch (supp_mode) {
-	case WPAS_MODE_INFRA:
-		return WIFI_MODE_INFRA;
-	case WPAS_MODE_IBSS:
-		return WIFI_MODE_IBSS;
-	case WPAS_MODE_AP:
-		return WIFI_MODE_AP;
-	case WPAS_MODE_P2P_GO:
-		return WIFI_MODE_P2P_GO;
-	case WPAS_MODE_P2P_GROUP_FORMATION:
-		return WIFI_MODE_P2P_GROUP_FORMATION;
-	case WPAS_MODE_MESH:
-		return WIFI_MODE_MESH;
-	default:
-		break;
-	}
-
-	return WIFI_MODE_UNKNOWN;
-}
-
 int supplicant_status(const struct device *dev, struct wifi_iface_status *status)
 {
 	struct net_if *iface = net_if_lookup_by_dev(dev);
@@ -1208,7 +1169,7 @@ int supplicant_status(const struct device *dev, struct wifi_iface_status *status
 		os_memcpy(status->bssid, wpa_s->bssid, WIFI_MAC_ADDR_LEN);
 		status->band = wpas_band_to_zephyr(wpas_freq_to_band(wpa_s->assoc_freq));
 		status->security = wpas_key_mgmt_to_zephyr(key_mgmt, proto);
-		status->mfp = get_mfp(ssid->ieee80211w);
+		status->mfp = ssid->ieee80211w; /* Same mapping */
 		ieee80211_freq_to_chan(wpa_s->assoc_freq, &channel);
 		status->channel = channel;
 
@@ -1226,7 +1187,7 @@ int supplicant_status(const struct device *dev, struct wifi_iface_status *status
 
 		os_memcpy(status->ssid, _ssid, ssid_len);
 		status->ssid_len = ssid_len;
-		status->iface_mode = get_iface_mode(ssid->mode);
+		status->iface_mode = ssid->mode;
 
 		if (wpa_s->connection_set == 1) {
 			status->link_mode = wpa_s->connection_he ? WIFI_6 :
@@ -1933,12 +1894,12 @@ int supplicant_ap_status(const struct device *dev, struct wifi_iface_status *sta
 	ssid = &bss->ssid;
 
 	os_memcpy(status->bssid, hapd->own_addr, WIFI_MAC_ADDR_LEN);
-	status->iface_mode = WIFI_MODE_AP;
+	status->iface_mode = WPAS_MODE_AP;
 	status->band = wpas_band_to_zephyr(wpas_freq_to_band(iface->freq));
 	key_mgmt = bss->wpa_key_mgmt;
 	proto = bss->wpa;
 	status->security = wpas_key_mgmt_to_zephyr(key_mgmt, proto);
-	status->mfp = get_mfp(bss->ieee80211w);
+	status->mfp = bss->ieee80211w;
 	status->channel = conf->channel;
 	os_memcpy(status->ssid, ssid->ssid, ssid->ssid_len);
 

From f55a9077e8f3def2a4c76329f7ebcb740883f86d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:44 +0100
Subject: [PATCH 1670/2913] Revert "[nrf fromtree] hostap: Add needed include
 files to fix compilation"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b5d92faf4fb5c6c90616aa685cd2b5e345ad0be3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_main.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/hostap/src/supp_main.h b/modules/hostap/src/supp_main.h
index 981bdf66958..b28869c2bd3 100644
--- a/modules/hostap/src/supp_main.h
+++ b/modules/hostap/src/supp_main.h
@@ -52,17 +52,12 @@ static inline void net_dhcpv4_stop(struct net_if *iface)
 
 struct wpa_global *zephyr_get_default_supplicant_context(void);
 struct wpa_supplicant *zephyr_get_handle_by_ifname(const char *ifname);
-
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-#include "common.h"
-#include "wpa_debug_zephyr.h"
-
 struct hostapd_iface *zephyr_get_hapd_handle_by_ifname(const char *ifname);
 void wpa_supplicant_msg_send(void *ctx, int level, enum wpa_msg_type type, const char *txt,
 			     size_t len);
 void hostapd_msg_send(void *ctx, int level, enum wpa_msg_type type, const char *buf, size_t len);
 #endif
-
 struct wpa_supplicant_event_msg {
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 	int hostapd;

From 0586db430fba17848e91ed64362b37d0f39cf7ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:44 +0100
Subject: [PATCH 1671/2913] Revert "[nrf fromtree] hostap: Remove not found
 hostapd functions"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0c8dcad418d522d8b232e6a9a3dccfa503e25960.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index 826e15e9d8d..b47b322e2aa 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -94,9 +94,11 @@ DEFINE_WIFI_NM_INSTANCE(wifi_supplicant, &mgmt_ops);
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 static const struct wifi_mgmt_ops mgmt_ap_ops = {
+	.set_btwt = supplicant_set_btwt,
 	.ap_enable = supplicant_ap_enable,
 	.ap_disable = supplicant_ap_disable,
 	.ap_sta_disconnect = supplicant_ap_sta_disconnect,
+	.ap_bandwidth = supplicant_ap_bandwidth,
 	.iface_status = supplicant_ap_status,
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	.dpp_dispatch = hapd_dpp_dispatch,

From 5783fa222688e9e02801a6c24c0f82b27e3aae43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:44 +0100
Subject: [PATCH 1672/2913] Revert "[nrf fromtree] hostap: Fix crypto=none
 compilation"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 199d1a7a90c30b6a2272f835369373f2a3d8c938.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/CMakeLists.txt | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index e1bd8c6c232..b6f55f694d6 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -243,27 +243,6 @@ zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_HOSTAPD_AP
 zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
 	${HOSTAP_SRC_BASE}/crypto/crypto_none.c
 	${HOSTAP_SRC_BASE}/crypto/tls_none.c
-
-	# FIXME: why do we need these when crypto is not selected?
-	${HOSTAP_SRC_BASE}/crypto/aes-wrap.c
-	${HOSTAP_SRC_BASE}/crypto/aes-internal.c
-	${HOSTAP_SRC_BASE}/crypto/aes-internal-enc.c
-	${HOSTAP_SRC_BASE}/crypto/aes-omac1.c
-	${HOSTAP_SRC_BASE}/crypto/md5.c
-	${HOSTAP_SRC_BASE}/crypto/md5-internal.c
-	${HOSTAP_SRC_BASE}/crypto/sha1.c
-	${HOSTAP_SRC_BASE}/crypto/sha1-internal.c
-	${HOSTAP_SRC_BASE}/crypto/sha1-pbkdf2.c
-	${HOSTAP_SRC_BASE}/crypto/sha1-prf.c
-	${HOSTAP_SRC_BASE}/crypto/sha256.c
-	${HOSTAP_SRC_BASE}/crypto/sha256-internal.c
-	${HOSTAP_SRC_BASE}/crypto/sha256-prf.c
-	${HOSTAP_SRC_BASE}/crypto/sha384.c
-	${HOSTAP_SRC_BASE}/crypto/sha384-internal.c
-	${HOSTAP_SRC_BASE}/crypto/sha384-prf.c
-	${HOSTAP_SRC_BASE}/crypto/sha512.c
-	${HOSTAP_SRC_BASE}/crypto/sha512-internal.c
-	${HOSTAP_SRC_BASE}/crypto/rc4.c
 )
 
 zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE

From b9d8570ea4d5e4a80d4686aa1a48055e0e46aba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:44 +0100
Subject: [PATCH 1673/2913] Revert "[nrf fromtree] hostap: Enterprise mode
 needs sha1-internal.c"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 846b3c81f43f7a8ae3cc5abce891e91177621577.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index b6f55f694d6..69ff4c4fe1d 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -609,7 +609,6 @@ zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	${HOSTAP_SRC_BASE}/crypto/ms_funcs.c
 	${HOSTAP_SRC_BASE}/crypto/aes-eax.c
 	${HOSTAP_SRC_BASE}/crypto/md4-internal.c
-	${HOSTAP_SRC_BASE}/crypto/sha1-internal.c
 	${HOSTAP_SRC_BASE}/crypto/fips_prf_internal.c
 	${HOSTAP_SRC_BASE}/crypto/milenage.c
 )

From 632969e3515b0bf63c6940a991f971c9cabf3662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:44 +0100
Subject: [PATCH 1674/2913] Revert "[nrf fromtree] hostap: Fix compilation
 error when enterprise support is enabled"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6d59a86e47fbad02bda12736694dbe43aa6ee33b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_main.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hostap/src/supp_main.h b/modules/hostap/src/supp_main.h
index b28869c2bd3..e80ced03431 100644
--- a/modules/hostap/src/supp_main.h
+++ b/modules/hostap/src/supp_main.h
@@ -15,7 +15,7 @@
 	!defined(CONFIG_EAP_PSK) && !defined(CONFIG_EAP_PAX) && \
 	!defined(CONFIG_EAP_SAKE) && !defined(CONFIG_EAP_GPSK) && \
 	!defined(CONFIG_EAP_PWD) && !defined(CONFIG_EAP_EKE) && \
-	!defined(CONFIG_EAP_IKEV2) && !defined(CONFIG_EAP_GTC)
+	!defined(CONFIG_EAP_IKEV2 && !defined(CONFIG_EAP_GTC)
 #error "At least one of the following EAP methods need to be defined    \
 	CONFIG_EAP_TLS    \
 	CONFIG_EAP_TTLS   \

From b826df86e3a7f1bee66bbb7eaf9599bdc8321a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:44 +0100
Subject: [PATCH 1675/2913] Revert "[nrf fromtree] hostap: P2P needs EAPOL to
 select it"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6cc7cfa906cb375fe30da58772bfd42ee0d0ba7c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index 1a82af8233d..5ed4fb8c559 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -247,7 +247,6 @@ config WIFI_NM_WPA_SUPPLICANT_P2P
 	bool "P2P mode support"
 	select WIFI_NM_WPA_SUPPLICANT_AP
 	select WIFI_NM_WPA_SUPPLICANT_WPS
-	select WIFI_NM_WPA_SUPPLICANT_EAPOL
 
 config WIFI_NM_WPA_SUPPLICANT_EAPOL
 	bool "EAPoL supplicant"

From f215ab2af77a091cbdbed59ea8dea8b49a7a9d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:44 +0100
Subject: [PATCH 1676/2913] Revert "[nrf fromtree] hostap: Add ip-addr.c
 compilation to the build"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6487af5285d14110400eb71bc58139a971ed328a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index 69ff4c4fe1d..8a89329b10c 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -206,7 +206,6 @@ zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_AP
 	${HOSTAP_SRC_BASE}/ap/mbo_ap.c
 	${HOSTAP_SRC_BASE}/ap/ctrl_iface_ap.c
 	${HOSTAP_SRC_BASE}/utils/crc32.c
-	${HOSTAP_SRC_BASE}/utils/ip_addr.c
 )
 
 zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_AP
@@ -227,6 +226,7 @@ zephyr_include_directories_ifdef(CONFIG_WIFI_NM_HOSTAPD_AP
 
 zephyr_library_sources_ifdef(CONFIG_WIFI_NM_HOSTAPD_AP
 	${HOSTAP_SRC_BASE}/ap/acs.c
+	${HOSTAP_SRC_BASE}/utils/ip_addr.c
 	${WIFI_NM_HOSTAPD_BASE}/config_file.c
 	${WIFI_NM_HOSTAPD_BASE}/ctrl_iface.c
 	${WIFI_NM_HOSTAPD_BASE}/ctrl_iface_zephyr.c

From 2ac0eebce81c54c7823ec6688db9f79a0c24e826 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:44 +0100
Subject: [PATCH 1677/2913] Revert "[nrf fromtree] hostap: Fix hostapd AP
 compilation error"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ec45c1a524769036157613693d0fb2a5c9d9b72e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_api.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index fd6449e98a9..24561086f38 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1847,6 +1847,7 @@ int supplicant_ap_config_params(const struct device *dev, struct wifi_ap_config_
 
 	return ret;
 }
+#endif
 
 int supplicant_ap_status(const struct device *dev, struct wifi_iface_status *status)
 {
@@ -1921,7 +1922,6 @@ int supplicant_ap_status(const struct device *dev, struct wifi_iface_status *sta
 	k_mutex_unlock(&wpa_supplicant_mutex);
 	return ret;
 }
-#endif /* CONFIG_WIFI_NM_HOSTAPD_AP */
 
 int supplicant_ap_enable(const struct device *dev,
 			 struct wifi_connect_req_params *params)

From ab74da7b77d8b33ea6063ffc999efe328969a47a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:44 +0100
Subject: [PATCH 1678/2913] Revert "[nrf fromtree] hostap: Remove extra
 IEEE8021X_EAPOL as it was mentioned twice"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit da9c7d7cc71eaebfd94dfeca8d59172f2625d155.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/Kconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index 5ed4fb8c559..09a43d7d07e 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -439,6 +439,9 @@ config EAP_EKE
 config EAP_IKEv2
 	bool
 
+config IEEE8021X_EAPOL
+	bool
+
 config CRYPTO_INTERNAL
 	bool
 

From 640986281d53ad5a3471d51de60abd5410031f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:45 +0100
Subject: [PATCH 1679/2913] Revert "[nrf fromtree] net: wifi: shell: add
 enterprise support for station"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6d75db5444ac20d079a781281ed680912a42c99b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/connectivity/networking/api/wifi.rst  |   9 +-
 include/zephyr/net/wifi.h                 |  95 ----------
 include/zephyr/net/wifi_mgmt.h            |  36 +---
 modules/hostap/CMakeLists.txt             |   9 -
 modules/hostap/Kconfig                    |   6 -
 modules/hostap/src/supp_api.c             | 221 +---------------------
 modules/hostap/src/supp_main.h            |   3 +-
 samples/net/wifi/boards/rd_rw612_bga.conf |   1 -
 subsys/net/l2/wifi/CMakeLists.txt         |  18 --
 subsys/net/l2/wifi/wifi_shell.c           | 115 +----------
 10 files changed, 25 insertions(+), 488 deletions(-)

diff --git a/doc/connectivity/networking/api/wifi.rst b/doc/connectivity/networking/api/wifi.rst
index 1499f1c75ab..84c407cd4a8 100644
--- a/doc/connectivity/networking/api/wifi.rst
+++ b/doc/connectivity/networking/api/wifi.rst
@@ -38,9 +38,6 @@ module.
     $ cp client.pem samples/net/wifi/test_certs/
     $ cp client-key.pem samples/net/wifi/test_certs/
     $ cp ca.pem samples/net/wifi/test_certs/
-    $ cp client2.pem samples/net/wifi/test_certs/
-    $ cp client-key2.pem samples/net/wifi/test_certs/
-    $ cp ca2.pem samples/net/wifi/test_certs/
     $ west build -p -b <board> samples/net/wifi -- -DEXTRA_CONF_FILE=overlay-enterprise.conf
 
 For using variable size network buffer, the following overlay file can be used:
@@ -55,11 +52,15 @@ To initiate Wi-Fi connection, the following command can be used:
 
 .. code-block:: console
 
-    uart:~$ wifi connect -s <SSID> -c 149 -k 17 -w 2 -a client1 --key1-pwd whatever --key2-pwd whatever --eap-id1 id1 --eap-pwd1 pwd1
+    uart:~$ wifi connect -s <SSID> -k 7 -a anon -K whatever
 
 Server certificate is also provided in the same directory for testing purposes.
 Any AAA server can be used for testing purposes, for example, ``FreeRADIUS`` or ``hostapd``.
 
+.. important::
+
+    The passphrase for the :file:`client-key.pem`` and the :file:`server-key.pem` is ``whatever``.
+
 .. note::
 
     The certificates are for testing purposes only and should not be used in production.
diff --git a/include/zephyr/net/wifi.h b/include/zephyr/net/wifi.h
index 36a62f02cad..4612fe2b0b1 100644
--- a/include/zephyr/net/wifi.h
+++ b/include/zephyr/net/wifi.h
@@ -68,16 +68,6 @@ enum wifi_security_type {
 	WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL,
 	/** DPP security */
 	WIFI_SECURITY_TYPE_DPP,
-	/** EAP PEAP MSCHAPV2 security - Enterprise. */
-	WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2,
-	/** EAP PEAP GTC security - Enterprise. */
-	WIFI_SECURITY_TYPE_EAP_PEAP_GTC,
-	/** EAP TTLS MSCHAPV2 security - Enterprise. */
-	WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2,
-	/** EAP PEAP security - Enterprise. */
-	WIFI_SECURITY_TYPE_EAP_PEAP_TLS,
-	/** EAP TLS SHA256 security - Enterprise. */
-	WIFI_SECURITY_TYPE_EAP_TLS_SHA256,
 
 	/** @cond INTERNAL_HIDDEN */
 	__WIFI_SECURITY_TYPE_AFTER_LAST,
@@ -86,91 +76,6 @@ enum wifi_security_type {
 	/** @endcond */
 };
 
-/** @brief EPA method Types. */
-enum wifi_eap_type {
-	/** No EPA  security. */
-	WIFI_EAP_TYPE_NONE = 0,
-	/** EPA GTC security, refer to rfc3748 chapter 5. */
-	WIFI_EAP_TYPE_GTC = 6,
-	/** EPA TLS security, refer to rfc5216. */
-	WIFI_EAP_TYPE_TLS = 13,
-	/** EPA TTLS security, refer to rfc5281. */
-	WIFI_EAP_TYPE_TTLS = 21,
-	/** EPA PEAP security, refer to draft-josefsson-pppext-eap-tls-eap-06.txt. */
-	WIFI_EAP_TYPE_PEAP = 25,
-	/** EPA MSCHAPV2 security, refer to draft-kamath-pppext-eap-mschapv2-00.txt. */
-	WIFI_EAP_TYPE_MSCHAPV2 = 26,
-};
-
-/** @brief Enterprise security WPA3 suiteb types. */
-enum wifi_suiteb_type {
-	/** suiteb. */
-	WIFI_SUITEB = 1,
-	/** suiteb-192. */
-	WIFI_SUITEB_192,
-};
-
-/** @brief Group cipher and pairwise cipher types. */
-enum wifi_cipher_type {
-	/** AES in counter mode with CBC-MAC (CCMP-128). */
-	WPA_CAPA_ENC_CCMP,
-	/** 128-bit Galois/Counter Mode Protocol. */
-	WPA_CAPA_ENC_GCMP,
-	/** 256-bit Galois/Counter Mode Protocol. */
-	WPA_CAPA_ENC_GCMP_256,
-};
-
-/** @brief group mgmt cipher types. */
-enum wifi_group_mgmt_cipher_type {
-	/** 128-bit Broadcast/Multicast Integrity Protocol
-	 * Cipher-based Message Authentication Code .
-	 */
-	WPA_CAPA_ENC_BIP,
-	/** 128-bit Broadcast/Multicast Integrity Protocol
-	 * Galois Message Authentication Code .
-	 */
-	WPA_CAPA_ENC_BIP_GMAC_128,
-	/** 256-bit Broadcast/Multicast Integrity Protocol
-	 * Galois Message Authentication Code .
-	 */
-	WPA_CAPA_ENC_BIP_GMAC_256,
-};
-
-struct wifi_cipher_desc {
-	/** Cipher capability. */
-	unsigned int capa;
-	/** Cipher name string. */
-	char *name;
-};
-
-struct wifi_eap_cipher_config {
-	/** Key management type string. */
-	char *key_mgmt;
-	/** OpenSSL cipher string. */
-	char *openssl_ciphers;
-	/** Group cipher cipher string. */
-	char *group_cipher;
-	/** Pairwise_cipher cipher string. */
-	char *pairwise_cipher;
-	/** Group management cipher string. */
-	char *group_mgmt_cipher;
-	/** Used to confiure TLS features. */
-	char *tls_flags;
-};
-
-struct wifi_eap_config {
-	/**  Security type. */
-	unsigned int type;
-	/** EPA method type of phase1. */
-	enum wifi_eap_type eap_type_phase1;
-	/** EPA method type of phase2. */
-	enum wifi_eap_type eap_type_phase2;
-	/** EPA method string. */
-	char *method;
-	/** Phase2 setting string. */
-	char *phase2;
-};
-
 /** Helper function to get user-friendly security type name. */
 const char *wifi_security_txt(enum wifi_security_type security);
 
diff --git a/include/zephyr/net/wifi_mgmt.h b/include/zephyr/net/wifi_mgmt.h
index c67cab30a0e..c0c9643602a 100644
--- a/include/zephyr/net/wifi_mgmt.h
+++ b/include/zephyr/net/wifi_mgmt.h
@@ -466,28 +466,12 @@ struct wifi_connect_req_params {
 	int timeout;
 	/** anonymous identity */
 	const uint8_t *anon_id;
-	/** anon_id length, max 64 */
-	uint8_t aid_length;
+	/** anon_id length */
+	uint8_t aid_length; /* Max 64 */
 	/** Private key passwd for enterprise mode */
 	const uint8_t *key_passwd;
-	/** Private key passwd length, max 128 */
-	uint8_t key_passwd_length;
-	/** private key2 passwd */
-	const uint8_t *key2_passwd;
-	/** key2 passwd length, max 128 */
-	uint8_t key2_passwd_length;
-	/** suiteb or suiteb-192 */
-	uint8_t suiteb_type;
-	/** eap version */
-	uint8_t eap_ver;
-	/** Identity for EAP */
-	const uint8_t *eap_identity;
-	/** eap identity length, max 64 */
-	uint8_t eap_id_length;
-	/** Password string for EAP. */
-	const uint8_t *eap_password;
-	/** eap passwd length, max 128 */
-	uint8_t eap_passwd_length;
+	/** Private key passwd length */
+	uint8_t key_passwd_length; /* Max 128 */
 };
 
 /** @brief Wi-Fi connect result codes. To be overlaid on top of \ref wifi_status
@@ -727,18 +711,6 @@ struct wifi_enterprise_creds_params {
 	uint8_t *client_key;
 	/** Client key length */
 	uint32_t client_key_len;
-	/** CA certification of phase2*/
-	uint8_t *ca_cert2;
-	/** Phase2 CA certification length */
-	uint32_t ca_cert2_len;
-	/** Client certification of phase2*/
-	uint8_t *client_cert2;
-	/** Phase2 Client certification length */
-	uint32_t client_cert2_len;
-	/** Client key of phase2*/
-	uint8_t *client_key2;
-	/** Phase2 Client key length */
-	uint32_t client_key2_len;
 };
 
 /** @brief Wi-Fi power save configuration */
diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index 8a89329b10c..7512152eb14 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -46,7 +46,6 @@ zephyr_library_compile_definitions(
 	CONFIG_SHA512
 	CONFIG_CTRL_IFACE_ZEPHYR
 	CONFIG_SUITEB192
-	CONFIG_SUITEB
 )
 
 
@@ -367,14 +366,6 @@ zephyr_library_compile_definitions_ifdef(CONFIG_EAP_MD5
         EAP_MD5
 )
 
-zephyr_library_sources_ifdef(CONFIG_EAP_GTC
-	${HOSTAP_SRC_BASE}/eap_peer/eap_gtc.c
-)
-
-zephyr_library_compile_definitions_ifdef(CONFIG_EAP_GTC
-        EAP_GTC
-)
-
 zephyr_library_sources_ifdef(CONFIG_EAP_MSCHAPV2
 	${HOSTAP_SRC_BASE}/eap_peer/eap_mschapv2.c
 	${HOSTAP_SRC_BASE}/eap_peer/mschapv2.c
diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index 09a43d7d07e..01574cfc60c 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -190,9 +190,6 @@ config EAP_PEAP
 config EAP_MD5
 	bool "EAP-MD5 support"
 
-config EAP_GTC
-	bool "EAP-GTC support"
-
 config EAP_MSCHAPV2
 	bool "EAP-MSCHAPv2 support"
 
@@ -469,9 +466,6 @@ config SHA512
 config SUITEB192
 	bool
 
-config SUITEB
-	bool
-
 config WEP
 	bool
 	default y if WIFI_NM_WPA_SUPPLICANT_WEP
diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 24561086f38..e62fbfca0be 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -438,100 +438,6 @@ static int wpas_config_process_blob(struct wpa_config *config, char *name, uint8
 
 	return 0;
 }
-
-static const struct wifi_cipher_desc ciphers[] = {
-	{WPA_CAPA_ENC_GCMP_256, "GCMP-256"},
-	{WPA_CAPA_ENC_CCMP, "CCMP"},
-	{WPA_CAPA_ENC_GCMP, "GCMP"},
-};
-
-static const struct wifi_cipher_desc ciphers_group_mgmt[] = {
-	{WPA_CAPA_ENC_BIP, "AES-128-CMAC"},
-	{WPA_CAPA_ENC_BIP_GMAC_128, "BIP-GMAC-128"},
-	{WPA_CAPA_ENC_BIP_GMAC_256, "BIP-GMAC-256"},
-};
-
-static struct wifi_eap_config eap_config[] = {
-	{WIFI_SECURITY_TYPE_EAP_TLS, WIFI_EAP_TYPE_TLS, WIFI_EAP_TYPE_NONE, "TLS", NULL},
-	{WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2, WIFI_EAP_TYPE_PEAP, WIFI_EAP_TYPE_MSCHAPV2, "PEAP",
-	 "auth=MSCHAPV2"},
-	{WIFI_SECURITY_TYPE_EAP_PEAP_GTC, WIFI_EAP_TYPE_PEAP, WIFI_EAP_TYPE_GTC, "PEAP",
-	 "auth=GTC"},
-	{WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2, WIFI_EAP_TYPE_TTLS, WIFI_EAP_TYPE_NONE, "TTLS",
-	 "auth=MSCHAPV2"},
-	{WIFI_SECURITY_TYPE_EAP_PEAP_TLS, WIFI_EAP_TYPE_PEAP, WIFI_EAP_TYPE_TLS, "PEAP",
-	 "auth=TLS"},
-	{WIFI_SECURITY_TYPE_EAP_TLS_SHA256, WIFI_EAP_TYPE_TLS, WIFI_EAP_TYPE_NONE, "TLS", NULL},
-};
-
-int process_cipher_config(struct wifi_connect_req_params *params,
-			  struct wifi_eap_cipher_config *cipher_config)
-{
-	unsigned int cipher_capa;
-	unsigned int gropu_mgmt_cipher_capa;
-	unsigned int index;
-
-	if (params->suiteb_type == WIFI_SUITEB) {
-		cipher_capa = WPA_CAPA_ENC_GCMP;
-		gropu_mgmt_cipher_capa = WPA_CAPA_ENC_BIP_GMAC_128;
-		cipher_config->key_mgmt = "WPA-EAP-SUITE-B";
-		cipher_config->openssl_ciphers = "SUITEB128";
-		cipher_config->tls_flags = "[SUITEB]";
-	} else if (params->suiteb_type == WIFI_SUITEB_192) {
-		cipher_capa = WPA_CAPA_ENC_GCMP_256;
-		gropu_mgmt_cipher_capa = WPA_CAPA_ENC_BIP_GMAC_256;
-		cipher_config->key_mgmt = "WPA-EAP-SUITE-B-192";
-		cipher_config->openssl_ciphers = "SUITEB192";
-		cipher_config->tls_flags = "[SUITEB]";
-	} else {
-		cipher_capa = WPA_CAPA_ENC_CCMP;
-		gropu_mgmt_cipher_capa = WPA_CAPA_ENC_BIP;
-		cipher_config->key_mgmt = "WPA-EAP";
-	}
-
-	if (params->security == WIFI_SECURITY_TYPE_EAP_TLS_SHA256) {
-		cipher_config->key_mgmt = "WPA-EAP-SHA256";
-	}
-
-	for (index = 0; index < ARRAY_SIZE(ciphers); index++) {
-		if (cipher_capa == ciphers[index].capa) {
-			cipher_config->group_cipher = ciphers[index].name;
-			cipher_config->pairwise_cipher = ciphers[index].name;
-			break;
-		}
-	}
-
-	if (index == ARRAY_SIZE(ciphers)) {
-		wpa_printf(MSG_ERROR, "Get ciphers error");
-		goto out;
-	}
-
-	for (index = 0; index < ARRAY_SIZE(ciphers_group_mgmt); index++) {
-		if (gropu_mgmt_cipher_capa == ciphers_group_mgmt[index].capa) {
-			cipher_config->group_mgmt_cipher = ciphers_group_mgmt[index].name;
-			break;
-		}
-	}
-
-	if (index == ARRAY_SIZE(ciphers_group_mgmt)) {
-		wpa_printf(MSG_ERROR, "Get group mgmt ciphers error");
-		goto out;
-	}
-
-	return 0;
-out:
-	return -EINVAL;
-}
-
-static int is_eap_valid_security(int security)
-{
-	return (security == WIFI_SECURITY_TYPE_EAP_TLS ||
-		    security == WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2 ||
-		    security == WIFI_SECURITY_TYPE_EAP_PEAP_GTC ||
-		    security == WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2 ||
-		    security == WIFI_SECURITY_TYPE_EAP_PEAP_TLS ||
-		    security == WIFI_SECURITY_TYPE_EAP_TLS_SHA256);
-}
 #endif
 
 static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
@@ -545,14 +451,6 @@ static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
 	uint8_t ssid_null_terminated[WIFI_SSID_MAX_LEN + 1];
 	uint8_t psk_null_terminated[WIFI_PSK_MAX_LEN + 1];
 	uint8_t sae_null_terminated[WIFI_SAE_PSWD_MAX_LEN + 1];
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
-	struct wifi_eap_cipher_config cipher_config = {NULL,   "DEFAULT:!EXP:!LOW", "CCMP",
-						       "CCMP", "AES-128-CMAC",      NULL};
-	char *method;
-	char phase1[128] = {0};
-	char *phase2 = NULL;
-	unsigned int index;
-#endif
 
 	if (!wpa_cli_cmd_v("remove_network all")) {
 		goto out;
@@ -736,47 +634,9 @@ static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
 				goto out;
 			}
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
-		} else if (is_eap_valid_security(params->security)) {
-			if (process_cipher_config(params, &cipher_config)) {
-				goto out;
-			}
-
-			for (index = 0; index < ARRAY_SIZE(eap_config); index++) {
-				if (params->security == eap_config[index].type) {
-					method = eap_config[index].method;
-					phase2 = eap_config[index].phase2;
-					break;
-				}
-			}
-
-			if (index == ARRAY_SIZE(eap_config)) {
-				wpa_printf(MSG_ERROR, "Get eap method error with security type: %d",
-					   params->security);
-				goto out;
-			}
-
-			if (!wpa_cli_cmd_v("set_network %d key_mgmt %s", resp.network_id,
-					   cipher_config.key_mgmt)) {
-				goto out;
-			}
-
-			if (!wpa_cli_cmd_v("set openssl_ciphers \"%s\"",
-					   cipher_config.openssl_ciphers)) {
-				goto out;
-			}
-
-			if (!wpa_cli_cmd_v("set_network %d group %s", resp.network_id,
-					   cipher_config.group_cipher)) {
-				goto out;
-			}
-
-			if (!wpa_cli_cmd_v("set_network %d pairwise %s", resp.network_id,
-					   cipher_config.pairwise_cipher)) {
-				goto out;
-			}
-
-			if (!wpa_cli_cmd_v("set_network %d group_mgmt %s", resp.network_id,
-					   cipher_config.group_mgmt_cipher)) {
+		} else if (params->security == WIFI_SECURITY_TYPE_EAP_TLS) {
+			if (!wpa_cli_cmd_v("set_network %d key_mgmt WPA-EAP",
+					   resp.network_id)) {
 				goto out;
 			}
 
@@ -785,44 +645,11 @@ static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
 				goto out;
 			}
 
-			if (!wpa_cli_cmd_v("set_network %d eap %s", resp.network_id, method)) {
+			if (!wpa_cli_cmd_v("set_network %d eap TLS",
+					   resp.network_id)) {
 				goto out;
 			}
 
-			if (params->security == WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2 ||
-			    params->security == WIFI_SECURITY_TYPE_EAP_PEAP_GTC ||
-			    params->security == WIFI_SECURITY_TYPE_EAP_PEAP_TLS) {
-				snprintk(phase1, sizeof(phase1),
-					 "peapver=%d peaplabel=0 crypto_binding=0",
-					 params->eap_ver);
-
-				if (!wpa_cli_cmd_v("set_network %d phase1 \"%s\"", resp.network_id,
-						   &phase1[0])) {
-					goto out;
-				}
-			}
-
-			if (phase2 != NULL) {
-				if (!wpa_cli_cmd_v("set_network %d phase2 \"%s\"", resp.network_id,
-						   phase2)) {
-					goto out;
-				}
-			}
-
-			if (params->eap_id_length > 0) {
-				if (!wpa_cli_cmd_v("set_network %d identity \"%s\"",
-						   resp.network_id, params->eap_identity)) {
-					goto out;
-				}
-			}
-
-			if (params->eap_passwd_length > 0) {
-				if (!wpa_cli_cmd_v("set_network %d password \"%s\"",
-						   resp.network_id, params->eap_password)) {
-					goto out;
-				}
-			}
-
 			if (!wpa_cli_cmd_v("set_network %d anonymous_identity \"%s\"",
 					   resp.network_id, params->anon_id)) {
 				goto out;
@@ -865,44 +692,6 @@ static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
 					   resp.network_id, params->key_passwd)) {
 				goto out;
 			}
-
-			if (wpas_config_process_blob(wpa_s->conf, "ca_cert2",
-						     enterprise_creds.ca_cert2,
-						     enterprise_creds.ca_cert2_len)) {
-				goto out;
-			}
-
-			if (!wpa_cli_cmd_v("set_network %d ca_cert2 \"blob://ca_cert2\"",
-					   resp.network_id)) {
-				goto out;
-			}
-
-			if (wpas_config_process_blob(wpa_s->conf, "client_cert2",
-						     enterprise_creds.client_cert2,
-						     enterprise_creds.client_cert2_len)) {
-				goto out;
-			}
-
-			if (!wpa_cli_cmd_v("set_network %d client_cert2 \"blob://client_cert2\"",
-					   resp.network_id)) {
-				goto out;
-			}
-
-			if (wpas_config_process_blob(wpa_s->conf, "private_key2",
-						     enterprise_creds.client_key2,
-						     enterprise_creds.client_key2_len)) {
-				goto out;
-			}
-
-			if (!wpa_cli_cmd_v("set_network %d private_key2 \"blob://private_key2\"",
-					   resp.network_id)) {
-				goto out;
-			}
-
-			if (!wpa_cli_cmd_v("set_network %d private_key2_passwd \"%s\"",
-					   resp.network_id, params->key2_passwd)) {
-				goto out;
-			}
 #endif
 		} else {
 			ret = -1;
diff --git a/modules/hostap/src/supp_main.h b/modules/hostap/src/supp_main.h
index e80ced03431..7137d281929 100644
--- a/modules/hostap/src/supp_main.h
+++ b/modules/hostap/src/supp_main.h
@@ -15,7 +15,7 @@
 	!defined(CONFIG_EAP_PSK) && !defined(CONFIG_EAP_PAX) && \
 	!defined(CONFIG_EAP_SAKE) && !defined(CONFIG_EAP_GPSK) && \
 	!defined(CONFIG_EAP_PWD) && !defined(CONFIG_EAP_EKE) && \
-	!defined(CONFIG_EAP_IKEV2 && !defined(CONFIG_EAP_GTC)
+	!defined(CONFIG_EAP_IKEV2)
 #error "At least one of the following EAP methods need to be defined    \
 	CONFIG_EAP_TLS    \
 	CONFIG_EAP_TTLS   \
@@ -32,7 +32,6 @@
 	CONFIG_EAP_IKEV2   \
 	CONFIG_EAP_SIM   \
 	CONFIG_EAP_AKA   \
-	CONFIG_EAP_GTC   \
 	CONFIG_EAP_ALL "
 #endif /* EAP METHODS */
 #endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
diff --git a/samples/net/wifi/boards/rd_rw612_bga.conf b/samples/net/wifi/boards/rd_rw612_bga.conf
index d6435e874b7..a916ff131ad 100644
--- a/samples/net/wifi/boards/rd_rw612_bga.conf
+++ b/samples/net/wifi/boards/rd_rw612_bga.conf
@@ -28,7 +28,6 @@ CONFIG_ZVFS_OPEN_MAX=30
 CONFIG_SHELL_ARGC_MAX=48
 CONFIG_WIFI_SHELL_MAX_AP_STA=8
 CONFIG_WIFI_MGMT_AP_MAX_NUM_STA=8
-CONFIG_SHELL_CMD_BUFF_SIZE=512
 
 # net
 CONFIG_NET_L2_ETHERNET=y
diff --git a/subsys/net/l2/wifi/CMakeLists.txt b/subsys/net/l2/wifi/CMakeLists.txt
index eb22a54cf77..9f190dda307 100644
--- a/subsys/net/l2/wifi/CMakeLists.txt
+++ b/subsys/net/l2/wifi/CMakeLists.txt
@@ -49,21 +49,3 @@ generate_inc_file_for_target(
     ${ZEPHYR_BASE}/samples/net/wifi/test_certs/ca.pem
     ${gen_dir}/ca.pem.inc
     )
-
-generate_inc_file_for_target(
-    app
-    ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client2.pem
-    ${gen_dir}/client2.pem.inc
-    )
-
-generate_inc_file_for_target(
-    app
-    ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client-key2.pem
-    ${gen_dir}/client-key2.pem.inc
-    )
-
-generate_inc_file_for_target(
-    app
-    ${ZEPHYR_BASE}/samples/net/wifi/test_certs/ca2.pem
-    ${gen_dir}/ca2.pem.inc
-    )
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index d422abb5024..ac37a64a346 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -44,18 +44,6 @@ static const char client_key_test[] = {
 	#include <wifi_enterprise_test_certs/client-key.pem.inc>
 	'\0'
 };
-
-static const char ca_cert2_test[] = {
-	#include <wifi_enterprise_test_certs/ca2.pem.inc>
-	'\0'};
-
-static const char client_cert2_test[] = {
-	#include <wifi_enterprise_test_certs/client2.pem.inc>
-	'\0'};
-
-static const char client_key2_test[] = {
-	#include <wifi_enterprise_test_certs/client-key2.pem.inc>
-	'\0'};
 #endif
 
 #define WIFI_SHELL_MODULE "wifi"
@@ -115,12 +103,6 @@ static int cmd_wifi_set_enterprise_creds(const struct shell *sh, struct net_if *
 	params.client_cert_len = ARRAY_SIZE(client_cert_test);
 	params.client_key = (uint8_t *)client_key_test;
 	params.client_key_len = ARRAY_SIZE(client_key_test);
-	params.ca_cert2 = (uint8_t *)ca_cert2_test;
-	params.ca_cert2_len = ARRAY_SIZE(ca_cert2_test);
-	params.client_cert2 = (uint8_t *)client_cert2_test;
-	params.client_cert2_len = ARRAY_SIZE(client_cert2_test);
-	params.client_key2 = (uint8_t *)client_key2_test;
-	params.client_key2_len = ARRAY_SIZE(client_key2_test);
 
 	if (net_mgmt(NET_REQUEST_WIFI_ENTERPRISE_CREDS, iface, &params, sizeof(params))) {
 		PR_WARNING("Set enterprise credentials failed\n");
@@ -521,26 +503,7 @@ static int __wifi_args_to_params(const struct shell *sh, size_t argc, char *argv
 		{"channel", required_argument, 0, 'c'},
 		{"timeout", required_argument, 0, 't'},
 		{"anon-id", required_argument, 0, 'a'},
-		{"key1-pwd", required_argument, 0, 'K'},
-		{"key2-pwd", required_argument, 0, 'K'},
-		{"suiteb-type", required_argument, 0, 'S'},
-		{"eap-version", required_argument, 0, 'V'},
-		{"eap-id1", required_argument, 0, 'I'},
-		{"eap-id2", required_argument, 0, 'I'},
-		{"eap-id3", required_argument, 0, 'I'},
-		{"eap-id4", required_argument, 0, 'I'},
-		{"eap-id5", required_argument, 0, 'I'},
-		{"eap-id6", required_argument, 0, 'I'},
-		{"eap-id7", required_argument, 0, 'I'},
-		{"eap-id8", required_argument, 0, 'I'},
-		{"eap-pwd1", required_argument, 0, 'P'},
-		{"eap-pwd2", required_argument, 0, 'P'},
-		{"eap-pwd3", required_argument, 0, 'P'},
-		{"eap-pwd4", required_argument, 0, 'P'},
-		{"eap-pwd5", required_argument, 0, 'P'},
-		{"eap-pwd6", required_argument, 0, 'P'},
-		{"eap-pwd7", required_argument, 0, 'P'},
-		{"eap-pwd8", required_argument, 0, 'P'},
+		{"key-passwd", required_argument, 0, 'K'},
 		{"help", no_argument, 0, 'h'},
 		{0, 0, 0, 0}};
 	char *endptr;
@@ -556,16 +519,14 @@ static int __wifi_args_to_params(const struct shell *sh, size_t argc, char *argv
 	char bands_str[MAX_BANDS_STR_LEN] = {0};
 	size_t offset = 0;
 	long channel;
-	int key_passwd_cnt = 0;
 
 	/* Defaults */
 	params->band = WIFI_FREQ_BAND_UNKNOWN;
 	params->channel = WIFI_CHANNEL_ANY;
 	params->security = WIFI_SECURITY_TYPE_NONE;
 	params->mfp = WIFI_MFP_OPTIONAL;
-	params->eap_ver = 1;
 
-	while ((opt = getopt_long(argc, argv, "s:p:k:e:w:b:c:m:t:a:K:S:V:I:P:h",
+	while ((opt = getopt_long(argc, argv, "s:p:k:w:b:c:m:t:a:K:h",
 				  long_options, &opt_index)) != -1) {
 		state = getopt_state_get();
 		switch (opt) {
@@ -679,54 +640,10 @@ static int __wifi_args_to_params(const struct shell *sh, size_t argc, char *argv
 			}
 			break;
 		case 'K':
-			if (key_passwd_cnt >= 2) {
-				PR_WARNING("too many key_passwd (max 2 key_passwd)\n");
-				return -EINVAL;
-			}
-
-			if (key_passwd_cnt == 0) {
-				params->key_passwd = optarg;
-				params->key_passwd_length = strlen(params->key_passwd);
-				if (params->key_passwd_length > WIFI_ENT_PSWD_MAX_LEN) {
-					PR_WARNING("key_passwd too long (max %d characters)\n",
-							WIFI_ENT_PSWD_MAX_LEN);
-					return -EINVAL;
-				}
-			} else if (key_passwd_cnt == 1) {
-				params->key2_passwd = optarg;
-				params->key2_passwd_length = strlen(params->key2_passwd);
-				if (params->key2_passwd_length > WIFI_ENT_PSWD_MAX_LEN) {
-					PR_WARNING("key2_passwd too long (max %d characters)\n",
-							WIFI_ENT_PSWD_MAX_LEN);
-					return -EINVAL;
-				}
-			}
-			key_passwd_cnt++;
-			break;
-		case 'S':
-			params->suiteb_type = atoi(optarg);
-			break;
-		case 'V':
-			params->eap_ver = atoi(optarg);
-			if (params->eap_ver != 0U && params->eap_ver != 1U) {
-				PR_WARNING("eap_ver error %d\n", params->eap_ver);
-				return -EINVAL;
-			}
-			break;
-		case 'I':
-			params->eap_identity = optarg;
-			params->eap_id_length = strlen(params->eap_identity);
-			if (params->eap_id_length > WIFI_ENT_IDENTITY_MAX_LEN) {
-				PR_WARNING("eap identity too long (max %d characters)\n",
-					    WIFI_ENT_IDENTITY_MAX_LEN);
-				return -EINVAL;
-			}
-			break;
-		case 'P':
-			params->eap_password = optarg;
-			params->eap_passwd_length = strlen(params->eap_password);
-			if (params->eap_passwd_length > WIFI_ENT_PSWD_MAX_LEN) {
-				PR_WARNING("eap password length too long (max %d characters)\n",
+			params->key_passwd = optarg;
+			params->key_passwd_length = strlen(params->key_passwd);
+			if (params->key_passwd_length > WIFI_ENT_PSWD_MAX_LEN) {
+				PR_WARNING("key_passwd too long (max %d characters)\n",
 					    WIFI_ENT_PSWD_MAX_LEN);
 				return -EINVAL;
 			}
@@ -793,12 +710,7 @@ static int cmd_wifi_connect(const struct shell *sh, size_t argc,
 
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	/* Load the enterprise credentials if needed */
-	if (cnx_params.security == WIFI_SECURITY_TYPE_EAP_TLS ||
-	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2 ||
-	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_GTC ||
-	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2 ||
-	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_TLS ||
-	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_TLS_SHA256) {
+	if (cnx_params.security == WIFI_SECURITY_TYPE_EAP_TLS) {
 		cmd_wifi_set_enterprise_creds(sh, iface);
 	}
 #endif
@@ -3085,23 +2997,16 @@ SHELL_SUBCMD_ADD((wifi), connect, &wifi_commands,
 		  "[-p, --psk]: Passphrase (valid only for secure SSIDs)\n"
 		  "[-k, --key-mgmt]: Key Management type (valid only for secure SSIDs)\n"
 		  "0:None, 1:WPA2-PSK, 2:WPA2-PSK-256, 3:SAE-HNP, 4:SAE-H2E, 5:SAE-AUTO, 6:WAPI,"
-		  "7:EAP-TLS, 8:WEP, 9: WPA-PSK, 10: WPA-Auto-Personal, 11: DPP\n"
-		  "12: EAP-PEAP-MSCHAPv2, 13: EAP-PEAP-GTC, 14: EAP-TTLS-MSCHAPv2, 15: EAP-PEAP-TLS\n"
+		  " 7:EAP-TLS, 8:WEP, 9: WPA-PSK, 10: WPA-Auto-Personal, 11: DPP\n"
 		  "[-w, --ieee-80211w]: MFP (optional: needs security type to be specified)\n"
 		  ": 0:Disable, 1:Optional, 2:Required.\n"
 		  "[-m, --bssid]: MAC address of the AP (BSSID).\n"
 		  "[-t, --timeout]: Timeout for the connection attempt (in seconds).\n"
 		  "[-a, --anon-id]: Anonymous identity for enterprise mode.\n"
-		  "[-K, --key1-pwd for eap phase1 or --key2-pwd for eap phase2]:\n"
-		  "Private key passwd for enterprise mode. Default no password for private key.\n"
-		  "[-S, --suiteb-type]: 1:suiteb, 2:suiteb-192. Default 0: not suiteb mode.\n"
-		  "[-V, --eap-version]: 0 or 1. Default 1: eap version 1.\n"
-		  "[-I, --eap-id1]: Client Identity. Default no eap identity.\n"
-		  "[-P, --eap-pwd1]: Client Password.\n"
-		  "Default no password for eap user.\n"
+		  "[-K, --key-passwd]: Private key passwd for enterprise mode.\n"
 		  "[-h, --help]: Print out the help for the connect command.\n",
 		  cmd_wifi_connect,
-		 2, 19);
+		 2, 13);
 
 SHELL_SUBCMD_ADD((wifi), disconnect, &wifi_commands,
 		 "Disconnect from the Wi-Fi AP.\n",

From dc492af13b3b543245296d9cb4bdeceb8ff75a20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:45 +0100
Subject: [PATCH 1680/2913] Revert "[nrf fromtree] wifi: Refactor wifi-shell to
 allow external subcommands"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 32448277851d7dd4b5c50196ea92a788ac4ae95e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/l2/wifi/wifi_shell.c | 322 +++++++++++++-------------------
 1 file changed, 135 insertions(+), 187 deletions(-)

diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index ac37a64a346..93005936f09 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -2844,11 +2844,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 	SHELL_CMD_ARG(status, NULL, "Status of Wi-Fi SAP\n", cmd_wifi_ap_status, 1, 0),
 	SHELL_SUBCMD_SET_END);
 
-SHELL_SUBCMD_ADD((wifi), ap, &wifi_cmd_ap,
-		 "Access Point mode commands.",
-		 NULL,
-		 0, 0);
-
 SHELL_STATIC_SUBCMD_SET_CREATE(wifi_twt_ops,
 	SHELL_CMD_ARG(quick_setup, NULL, " Start a TWT flow with defaults:\n"
 		"<twt_wake_interval: 1-262144us> <twt_interval: 1us-2^31us>.\n",
@@ -2874,11 +2869,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_twt_ops,
 	SHELL_SUBCMD_SET_END
 );
 
-SHELL_SUBCMD_ADD((wifi), twt, &wifi_twt_ops,
-		 "Manage TWT flows.",
-		 NULL,
-		 0, 0);
-
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	wifi_cmd_dpp,
@@ -2956,43 +2946,17 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      cmd_wifi_dpp_reconfig, 2, 0),
 	SHELL_SUBCMD_SET_END
 );
-
-SHELL_SUBCMD_ADD((wifi), dpp, &wifi_cmd_dpp,
-		 "DPP actions.",
-		 NULL,
-		 0, 0);
 #endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
-SHELL_SUBCMD_SET_CREATE(wifi_commands, (wifi));
-
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_WNM
-SHELL_SUBCMD_ADD((wifi), 11v_btm_query, &wifi_commands,
-		 "<query_reason: The reason code for a BSS transition management query>.\n",
-		 cmd_wifi_btm_query,
-		 2, 0);
-#endif
-
-SHELL_SUBCMD_ADD((wifi), channel, &wifi_commands,
-		 "wifi channel setting\n"
-		 "This command is used to set the channel when\n"
-		 "monitor or TX-Injection mode is enabled\n"
-		 "Currently 20 MHz is only supported and no BW parameter is provided\n"
-		 "[-i, --if-index <idx>] : Interface index\n"
-		 "[-c, --channel <chan>] : Set a specific channel number to the lower layer\n"
-		 "[-g, --get] : Get current set channel number from the lower layer\n"
-		 "[-h, --help] : Help\n"
-		 "Usage: Get operation example for interface index 1\n"
-		 "wifi channel -g -i1\n"
-		 "Set operation example for interface index 1 (setting channel 5)\n"
-		 "wifi -i1 -c5.\n",
-		 cmd_wifi_channel,
-		 2, 4);
-
-SHELL_SUBCMD_ADD((wifi), connect, &wifi_commands,
+SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
+	SHELL_CMD_ARG(version, NULL, "Print Wi-Fi Driver and Firmware versions\n",
+		  cmd_wifi_version,
+		  1, 0),
+	SHELL_CMD(ap, &wifi_cmd_ap, "Access Point mode commands.\n", NULL),
+	SHELL_CMD_ARG(connect, NULL,
 		  "Connect to a Wi-Fi AP\n"
 		  "<-s --ssid \"<SSID>\">: SSID.\n"
-		  "[-c --channel]: Channel that needs to be scanned for connection. "
-		 "0:any channel.\n"
+		  "[-c --channel]: Channel that needs to be scanned for connection. 0:any channel.\n"
 		  "[-b, --band] 0: any band (2:2.4GHz, 5:5GHz, 6:6GHz]\n"
 		  "[-p, --psk]: Passphrase (valid only for secure SSIDs)\n"
 		  "[-k, --key-mgmt]: Key Management type (valid only for secure SSIDs)\n"
@@ -3006,150 +2970,134 @@ SHELL_SUBCMD_ADD((wifi), connect, &wifi_commands,
 		  "[-K, --key-passwd]: Private key passwd for enterprise mode.\n"
 		  "[-h, --help]: Print out the help for the connect command.\n",
 		  cmd_wifi_connect,
-		 2, 13);
-
-SHELL_SUBCMD_ADD((wifi), disconnect, &wifi_commands,
-		 "Disconnect from the Wi-Fi AP.\n",
-		 cmd_wifi_disconnect,
-		 1, 0);
-
-SHELL_SUBCMD_ADD((wifi), mode, &wifi_commands,
-		 "mode operational setting\n"
-		 "This command may be used to set the Wi-Fi device into a specific "
-		 "mode of operation\n"
-		 "[-i, --if-index <idx>] : Interface index\n"
-		 "[-s, --sta] : Station mode\n"
-		 "[-m, --monitor] : Monitor mode\n"
-		 "[-a, --ap] : AP mode\n"
-		 "[-k, --softap] : Softap mode\n"
-		 "[-h, --help] : Help\n"
-		 "[-g, --get] : Get current mode for a specific interface index\n"
-		 "Usage: Get operation example for interface index 1\n"
-		 "wifi mode -g -i1\n"
-		 "Set operation example for interface index 1 - set station+promiscuous\n"
-		 "wifi mode -i1 -sp.\n",
-		 cmd_wifi_mode,
-		 1, 9);
-
-SHELL_SUBCMD_ADD((wifi), packet_filter, &wifi_commands,
-		 "mode filter setting\n"
-		 "This command is used to set packet filter setting when\n"
-		 "monitor, TX-Injection and promiscuous mode is enabled\n"
-		 "The different packet filter modes are control, management, "
-		 "data and enable all filters\n"
-		 "[-i, --if-index <idx>] : Interface index\n"
-		 "[-a, --all] : Enable all packet filter modes\n"
-		 "[-m, --mgmt] : Enable management packets to allowed up the stack\n"
-		 "[-c, --ctrl] : Enable control packets to be allowed up the stack\n"
-		 "[-d, --data] : Enable Data packets to be allowed up the stack\n"
-		 "[-g, --get] : Get current filter settings for a specific interface index\n"
-		 "[-b, --capture-len <len>] : Capture length buffer size for each packet "
-		 "to be captured\n"
-		 "[-h, --help] : Help\n"
-		 "Usage: Get operation example for interface index 1\n"
-		 "wifi packet_filter -g -i1\n"
-		 "Set operation example for interface index 1 - set data+management frame filter\n"
-		 "wifi packet_filter -i1 -md.\n",
-		 cmd_wifi_packet_filter,
-		 2, 8);
-
-SHELL_SUBCMD_ADD((wifi), pmksa_flush, &wifi_commands,
-		 "Flush PMKSA cache entries.\n",
-		 cmd_wifi_pmksa_flush,
-		 1, 0);
-
-SHELL_SUBCMD_ADD((wifi), ps, &wifi_commands,
-		 "Configure or display Wi-Fi power save state.\n[on/off]\n",
-		 cmd_wifi_ps,
-		 1, 1);
-
-SHELL_SUBCMD_ADD((wifi), ps_listen_interval, &wifi_commands,
-		 "<val> - Listen interval in the range of <0-65535>.\n",
-		 cmd_wifi_listen_interval,
-		 2, 0);
-
-SHELL_SUBCMD_ADD((wifi), ps_mode, &wifi_commands,
-		 "<mode: legacy/WMM>.\n",
-		 cmd_wifi_ps_mode,
-		 2, 0);
-
-SHELL_SUBCMD_ADD((wifi), ps_timeout, &wifi_commands,
-		 "<val> - PS inactivity timer(in ms).\n",
-		 cmd_wifi_ps_timeout,
-		 2, 0);
-
-SHELL_SUBCMD_ADD((wifi), ps_wakeup_mode, &wifi_commands,
-		 "<wakeup_mode: DTIM/Listen Interval>.\n",
-		 cmd_wifi_ps_wakeup_mode,
-		 2, 0);
-
-SHELL_SUBCMD_ADD((wifi), reg_domain, &wifi_commands,
-		 "Set or Get Wi-Fi regulatory domain\n"
-		 "[ISO/IEC 3166-1 alpha2]: Regulatory domain\n"
-		 "[-f]: Force to use this regulatory hint over any other regulatory hints\n"
-		 "Note: This may cause regulatory compliance issues, use it at your own risk.\n",
-		 cmd_wifi_reg_domain,
-		 1, 2);
-
-SHELL_SUBCMD_ADD((wifi), rts_threshold, &wifi_commands,
-		 "<rts_threshold: rts threshold/off>.\n",
-		 cmd_wifi_set_rts_threshold,
-		 1, 1);
-
-SHELL_SUBCMD_ADD((wifi), scan, &wifi_commands,
-		 "Scan for Wi-Fi APs\n"
-		 "[-t, --type <active/passive>] : Preferred mode of scan. "
-		 "The actual mode of scan can depend on factors such as the Wi-Fi chip "
-		 "implementation, regulatory domain restrictions. Default type is active\n"
-		 "[-b, --bands <Comma separated list of band values (2/5/6)>] : "
-		 "Bands to be scanned where 2: 2.4 GHz, 5: 5 GHz, 6: 6 GHz\n"
-		 "[-a, --dwell_time_active <val_in_ms>] : "
-		 "Active scan dwell time (in ms) on a channel. Range 5 ms to 1000 ms\n"
-		 "[-p, --dwell_time_passive <val_in_ms>] : "
-		 "Passive scan dwell time (in ms) on a channel. Range 10 ms to 1000 ms\n"
-		 "[-s, --ssid] : SSID to scan for. Can be provided multiple times\n"
-		 "[-m, --max_bss <val>] : Maximum BSSes to scan for. Range 1 - 65535\n"
-		 "[-c, --chans <Comma separated list of channel ranges>] : "
-		 "Channels to be scanned. The channels must be specified in the form "
-		 "band1:chan1,chan2_band2:chan3,..etc. band1, band2 must be valid band "
-		 "values and chan1, chan2, chan3 must be specified as a list of comma "
-		 "separated values where each value is either a single channel or a "
-		 "channel range specified as chan_start-chan_end. Each band channel "
-		 "set has to be separated by a _. For example, a valid channel "
-		 "specification can be 2:1,6_5:36 or 2:1,6-11,14_5:36,163-177,52. "
-		 "Care should be taken to ensure that configured channels don't exceed "
-		 "CONFIG_WIFI_MGMT_SCAN_CHAN_MAX_MANUAL\n"
-		 "[-h, --help] : Print out the help for the scan command.\n",
-		 cmd_wifi_scan,
-		 1, 8);
-
-SHELL_SUBCMD_ADD((wifi), statistics, &wifi_commands,
-		 "Wi-Fi interface statistics.\n"
-		 "[reset] : Reset Wi-Fi interface statistics\n"
-		 "[help] :  Print out the help for the statistics command.",
-		 cmd_wifi_stats,
-		 1, 1);
-
-SHELL_SUBCMD_ADD((wifi), status, &wifi_commands,
-		 "Status of the Wi-Fi interface.\n",
-		 cmd_wifi_status,
-		 1, 0);
-
-SHELL_SUBCMD_ADD((wifi), version, &wifi_commands,
-		 "Print Wi-Fi Driver and Firmware versions\n",
-		 cmd_wifi_version,
-		 1, 0);
-
-SHELL_SUBCMD_ADD((wifi), wps_pbc, &wifi_commands,
-		 "Start a WPS PBC connection.\n",
-		 cmd_wifi_wps_pbc,
-		 1, 0);
-
-SHELL_SUBCMD_ADD((wifi), wps_pin, &wifi_commands,
-		 "Set and get WPS pin.\n"
-		 "[pin] Only applicable for set.\n",
-		 cmd_wifi_wps_pin,
-		 1, 1);
+		  2, 13),
+	SHELL_CMD_ARG(disconnect, NULL, "Disconnect from the Wi-Fi AP.\n",
+		  cmd_wifi_disconnect,
+		  1, 0),
+	SHELL_CMD_ARG(ps, NULL, "Configure or display Wi-Fi power save state.\n"
+		  "[on/off]\n",
+		  cmd_wifi_ps,
+		  1, 1),
+	SHELL_CMD_ARG(ps_mode,
+		      NULL,
+		      "<mode: legacy/WMM>.\n",
+		      cmd_wifi_ps_mode,
+		      2, 0),
+	SHELL_CMD_ARG(scan, NULL,
+		  "Scan for Wi-Fi APs\n"
+		    "[-t, --type <active/passive>] : Preferred mode of scan. The actual mode of scan can depend on factors such as the Wi-Fi chip implementation, regulatory domain restrictions. Default type is active\n"
+		    "[-b, --bands <Comma separated list of band values (2/5/6)>] : Bands to be scanned where 2: 2.4 GHz, 5: 5 GHz, 6: 6 GHz\n"
+		    "[-a, --dwell_time_active <val_in_ms>] : Active scan dwell time (in ms) on a channel. Range 5 ms to 1000 ms\n"
+		    "[-p, --dwell_time_passive <val_in_ms>] : Passive scan dwell time (in ms) on a channel. Range 10 ms to 1000 ms\n"
+		    "[-s, --ssid] : SSID to scan for. Can be provided multiple times\n"
+		    "[-m, --max_bss <val>] : Maximum BSSes to scan for. Range 1 - 65535\n"
+		    "[-c, --chans <Comma separated list of channel ranges>] : Channels to be scanned. The channels must be specified in the form band1:chan1,chan2_band2:chan3,..etc. band1, band2 must be valid band values and chan1, chan2, chan3 must be specified as a list of comma separated values where each value is either a single channel or a channel range specified as chan_start-chan_end. Each band channel set has to be separated by a _. For example, a valid channel specification can be 2:1,6_5:36 or 2:1,6-11,14_5:36,163-177,52. Care should be taken to ensure that configured channels don't exceed CONFIG_WIFI_MGMT_SCAN_CHAN_MAX_MANUAL\n"
+		    "[-h, --help] : Print out the help for the scan command.\n",
+		  cmd_wifi_scan,
+		  1, 8),
+	SHELL_CMD_ARG(statistics, NULL, "Wi-Fi interface statistics.\n"
+					"[reset] : Reset Wi-Fi interface statistics\n"
+					"[help] :  Print out the help for the statistics command.",
+					cmd_wifi_stats,
+					1, 1),
+	SHELL_CMD_ARG(status, NULL, "Status of the Wi-Fi interface.\n", cmd_wifi_status, 1, 0),
+	SHELL_CMD(twt, &wifi_twt_ops, "Manage TWT flows.\n", NULL),
+	SHELL_CMD_ARG(reg_domain, NULL,
+		"Set or Get Wi-Fi regulatory domain\n"
+		"[ISO/IEC 3166-1 alpha2]: Regulatory domain\n"
+		"[-f]: Force to use this regulatory hint over any other regulatory hints\n"
+		"Note: This may cause regulatory compliance issues, use it at your own risk.\n",
+		cmd_wifi_reg_domain,
+		1, 2),
+	SHELL_CMD_ARG(mode, NULL, "mode operational setting\n"
+		"This command may be used to set the Wi-Fi device into a specific mode of operation\n"
+		"[-i, --if-index <idx>] : Interface index\n"
+		"[-s, --sta] : Station mode\n"
+		"[-m, --monitor] : Monitor mode\n"
+		"[-a, --ap] : AP mode\n"
+		"[-k, --softap] : Softap mode\n"
+		"[-h, --help] : Help\n"
+		"[-g, --get] : Get current mode for a specific interface index\n"
+		"Usage: Get operation example for interface index 1\n"
+		"wifi mode -g -i1\n"
+		"Set operation example for interface index 1 - set station+promiscuous\n"
+		"wifi mode -i1 -sp.\n",
+		cmd_wifi_mode,
+		1, 9),
+	SHELL_CMD_ARG(packet_filter, NULL, "mode filter setting\n"
+		"This command is used to set packet filter setting when\n"
+		"monitor, TX-Injection and promiscuous mode is enabled\n"
+		"The different packet filter modes are control, management, data and enable all filters\n"
+		"[-i, --if-index <idx>] : Interface index\n"
+		"[-a, --all] : Enable all packet filter modes\n"
+		"[-m, --mgmt] : Enable management packets to allowed up the stack\n"
+		"[-c, --ctrl] : Enable control packets to be allowed up the stack\n"
+		"[-d, --data] : Enable Data packets to be allowed up the stack\n"
+		"[-g, --get] : Get current filter settings for a specific interface index\n"
+		"[-b, --capture-len <len>] : Capture length buffer size for each packet to be captured\n"
+		"[-h, --help] : Help\n"
+		"Usage: Get operation example for interface index 1\n"
+		"wifi packet_filter -g -i1\n"
+		"Set operation example for interface index 1 - set data+management frame filter\n"
+		"wifi packet_filter -i1 -md.\n",
+		cmd_wifi_packet_filter,
+		2, 8),
+	SHELL_CMD_ARG(channel, NULL, "wifi channel setting\n"
+		"This command is used to set the channel when\n"
+		"monitor or TX-Injection mode is enabled\n"
+		"Currently 20 MHz is only supported and no BW parameter is provided\n"
+		"[-i, --if-index <idx>] : Interface index\n"
+		"[-c, --channel <chan>] : Set a specific channel number to the lower layer\n"
+		"[-g, --get] : Get current set channel number from the lower layer\n"
+		"[-h, --help] : Help\n"
+		"Usage: Get operation example for interface index 1\n"
+		"wifi channel -g -i1\n"
+		"Set operation example for interface index 1 (setting channel 5)\n"
+		"wifi -i1 -c5.\n",
+		cmd_wifi_channel,
+		2, 4),
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_WNM
+	SHELL_CMD_ARG(11v_btm_query,
+		NULL,
+		"<query_reason: The reason code for a BSS transition management query>.\n",
+		cmd_wifi_btm_query,
+		2, 0),
+#endif
+	SHELL_CMD_ARG(wps_pbc, NULL,
+		"Start a WPS PBC connection.\n",
+		cmd_wifi_wps_pbc, 1, 0),
+	SHELL_CMD_ARG(wps_pin, NULL,
+		"Set and get WPS pin.\n"
+		"[pin] Only applicable for set.\n",
+		cmd_wifi_wps_pin, 1, 1),
+	SHELL_CMD_ARG(ps_timeout,
+		      NULL,
+		      "<val> - PS inactivity timer(in ms).\n",
+		      cmd_wifi_ps_timeout,
+		      2, 0),
+	SHELL_CMD_ARG(ps_listen_interval,
+		      NULL,
+		      "<val> - Listen interval in the range of <0-65535>.\n",
+		      cmd_wifi_listen_interval,
+		      2, 0),
+	SHELL_CMD_ARG(ps_wakeup_mode,
+		      NULL,
+		      "<wakeup_mode: DTIM/Listen Interval>.\n",
+		      cmd_wifi_ps_wakeup_mode,
+		      2, 0),
+	SHELL_CMD_ARG(rts_threshold,
+		      NULL,
+		      "<rts_threshold: rts threshold/off>.\n",
+		      cmd_wifi_set_rts_threshold,
+		      1, 1),
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
+	SHELL_CMD(dpp, &wifi_cmd_dpp, "DPP actions\n", NULL),
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
+	SHELL_CMD_ARG(pmksa_flush, NULL,
+		     "Flush PMKSA cache entries.\n",
+		     cmd_wifi_pmksa_flush, 1, 0),
+	SHELL_SUBCMD_SET_END
+);
 
 SHELL_SUBCMD_ADD((wifi), ps_exit_strategy, &wifi_commands,
 		 "<tim> : Set PS exit strategy to Every TIM\n"

From 6433e0a8891f48b0a3a839bc9e5aa92805915ce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:45 +0100
Subject: [PATCH 1681/2913] Revert "[nrf fromtree] hostapd: add ap status in l2
 wifi"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ba2c044811331d6275439907deb51775c1c6c11a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/wifi_mgmt.h  |  12 ----
 modules/hostap/src/supp_api.c   |  80 +--------------------
 modules/hostap/src/supp_api.h   |   9 ---
 modules/hostap/src/supp_main.c  |   1 -
 subsys/net/l2/wifi/wifi_mgmt.c  |   2 -
 subsys/net/l2/wifi/wifi_shell.c | 120 +++++++++-----------------------
 6 files changed, 36 insertions(+), 188 deletions(-)

diff --git a/include/zephyr/net/wifi_mgmt.h b/include/zephyr/net/wifi_mgmt.h
index c0c9643602a..4927bc1c9c5 100644
--- a/include/zephyr/net/wifi_mgmt.h
+++ b/include/zephyr/net/wifi_mgmt.h
@@ -1074,18 +1074,6 @@ struct wifi_wps_config_params {
 	char pin[WIFI_WPS_PIN_MAX_LEN + 1];
 };
 
-/** Wi-Fi AP status
- */
-enum wifi_hostapd_iface_state {
-	WIFI_HAPD_IFACE_UNINITIALIZED,
-	WIFI_HAPD_IFACE_DISABLED,
-	WIFI_HAPD_IFACE_COUNTRY_UPDATE,
-	WIFI_HAPD_IFACE_ACS,
-	WIFI_HAPD_IFACE_HT_SCAN,
-	WIFI_HAPD_IFACE_DFS,
-	WIFI_HAPD_IFACE_ENABLED
-};
-
 #include <zephyr/net/net_if.h>
 
 /** Scan result callback
diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index e62fbfca0be..087b70644bd 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -378,8 +378,6 @@ static inline enum wifi_security_type wpas_key_mgmt_to_zephyr(int key_mgmt, int
 		return WIFI_SECURITY_TYPE_PSK_SHA256;
 	case WPA_KEY_MGMT_SAE:
 		return WIFI_SECURITY_TYPE_SAE;
-	case WPA_KEY_MGMT_SAE | WPA_KEY_MGMT_PSK:
-		return WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL;
 	default:
 		return WIFI_SECURITY_TYPE_UNKNOWN;
 	}
@@ -1576,7 +1574,7 @@ int hapd_config_network(struct hostapd_iface *iface,
 		if (!hostapd_cli_cmd_v("set wpa 0")) {
 			goto out;
 		}
-		iface->bss[0]->conf->wpa_key_mgmt = WPA_KEY_MGMT_NONE;
+		iface->bss[0]->conf->wpa_key_mgmt = 0;
 	}
 
 	if (!hostapd_cli_cmd_v("set ieee80211w %d", params->mfp)) {
@@ -1638,80 +1636,6 @@ int supplicant_ap_config_params(const struct device *dev, struct wifi_ap_config_
 }
 #endif
 
-int supplicant_ap_status(const struct device *dev, struct wifi_iface_status *status)
-{
-	int ret = 0;
-	struct hostapd_iface *iface;
-	struct hostapd_config *conf;
-	struct hostapd_data *hapd;
-	struct hostapd_bss_config *bss;
-	struct hostapd_ssid *ssid;
-	struct hostapd_hw_modes *hw_mode;
-	int proto;    /* Wi-Fi secure protocol */
-	int key_mgmt; /*  Wi-Fi key management */
-
-	k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
-
-	iface = get_hostapd_handle(dev);
-	if (!iface) {
-		ret = -1;
-		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
-		goto out;
-	}
-
-	conf = iface->conf;
-	if (!conf) {
-		ret = -1;
-		wpa_printf(MSG_ERROR, "Conf %s not found", dev->name);
-		goto out;
-	}
-
-	bss = conf->bss[0];
-	if (!bss) {
-		ret = -1;
-		wpa_printf(MSG_ERROR, "Bss_conf %s not found", dev->name);
-		goto out;
-	}
-
-	hapd = iface->bss[0];
-	if (!hapd) {
-		ret = -1;
-		wpa_printf(MSG_ERROR, "Bss %s not found", dev->name);
-		goto out;
-	}
-
-	status->state = iface->state;
-	ssid = &bss->ssid;
-
-	os_memcpy(status->bssid, hapd->own_addr, WIFI_MAC_ADDR_LEN);
-	status->iface_mode = WPAS_MODE_AP;
-	status->band = wpas_band_to_zephyr(wpas_freq_to_band(iface->freq));
-	key_mgmt = bss->wpa_key_mgmt;
-	proto = bss->wpa;
-	status->security = wpas_key_mgmt_to_zephyr(key_mgmt, proto);
-	status->mfp = bss->ieee80211w;
-	status->channel = conf->channel;
-	os_memcpy(status->ssid, ssid->ssid, ssid->ssid_len);
-
-	status->dtim_period = bss->dtim_period;
-	status->beacon_interval = conf->beacon_int;
-
-	hw_mode = iface->current_mode;
-
-	status->link_mode = conf->ieee80211ax                          ? WIFI_6
-			    : conf->ieee80211ac                        ? WIFI_5
-			    : conf->ieee80211n                         ? WIFI_4
-			    : hw_mode->mode == HOSTAPD_MODE_IEEE80211G ? WIFI_3
-			    : hw_mode->mode == HOSTAPD_MODE_IEEE80211A ? WIFI_2
-			    : hw_mode->mode == HOSTAPD_MODE_IEEE80211B ? WIFI_1
-								       : WIFI_0;
-	status->twt_capable = (hw_mode->he_capab[IEEE80211_MODE_AP].mac_cap[0] & 0x04);
-
-out:
-	k_mutex_unlock(&wpa_supplicant_mutex);
-	return ret;
-}
-
 int supplicant_ap_enable(const struct device *dev,
 			 struct wifi_connect_req_params *params)
 {
@@ -1793,7 +1717,7 @@ int supplicant_ap_enable(const struct device *dev,
 		goto out;
 	}
 
-	/* No need to check for existing network to join for SoftAP */
+	/* No need to check for existing network to join for SoftAP*/
 	wpa_s->conf->ap_scan = 2;
 	/* Set BSS parameter max_num_sta to default configured value */
 	wpa_s->conf->max_num_sta = CONFIG_WIFI_MGMT_AP_MAX_NUM_STA;
diff --git a/modules/hostap/src/supp_api.h b/modules/hostap/src/supp_api.h
index f6584d86126..3cd4ccac113 100644
--- a/modules/hostap/src/supp_api.h
+++ b/modules/hostap/src/supp_api.h
@@ -250,15 +250,6 @@ static inline int hapd_state(const struct device *dev, int *state)
 }
 #endif
 
-/**
- * @brief Get Wi-Fi SAP status
- *
- * @param dev Wi-Fi device
- * @param status SAP status
- * @return 0 for OK; -1 for ERROR
- */
-int supplicant_ap_status(const struct device *dev, struct wifi_iface_status *status);
-
 /**
  * @brief Set Wi-Fi AP configuration
  *
diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index b47b322e2aa..380c32dfc16 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -99,7 +99,6 @@ static const struct wifi_mgmt_ops mgmt_ap_ops = {
 	.ap_disable = supplicant_ap_disable,
 	.ap_sta_disconnect = supplicant_ap_sta_disconnect,
 	.ap_bandwidth = supplicant_ap_bandwidth,
-	.iface_status = supplicant_ap_status,
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	.dpp_dispatch = hapd_dpp_dispatch,
 #endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
diff --git a/subsys/net/l2/wifi/wifi_mgmt.c b/subsys/net/l2/wifi/wifi_mgmt.c
index 5974cde6a1a..f0d25d864d0 100644
--- a/subsys/net/l2/wifi/wifi_mgmt.c
+++ b/subsys/net/l2/wifi/wifi_mgmt.c
@@ -41,8 +41,6 @@ const char *wifi_security_txt(enum wifi_security_type security)
 		return "WAPI";
 	case WIFI_SECURITY_TYPE_EAP_TLS:
 		return "EAP";
-	case WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL:
-		return "WPA/WPA2/WPA3 PSK";
 	case WIFI_SECURITY_TYPE_UNKNOWN:
 	default:
 		return "UNKNOWN";
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index 93005936f09..a7085ee3760 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -954,65 +954,6 @@ static int cmd_wifi_status(const struct shell *sh, size_t argc, char *argv[])
 	return 0;
 }
 
-static int cmd_wifi_ap_status(const struct shell *sh, size_t argc, char *argv[])
-{
-	struct net_if *iface = net_if_get_wifi_sap();
-	struct wifi_iface_status status = {0};
-	uint8_t mac_string_buf[sizeof("xx:xx:xx:xx:xx:xx")];
-
-	context.sh = sh;
-
-	if (net_mgmt(NET_REQUEST_WIFI_IFACE_STATUS, iface, &status,
-		     sizeof(struct wifi_iface_status))) {
-		PR_WARNING("Status request failed\n");
-
-		return -ENOEXEC;
-	}
-
-	switch (status.state) {
-	case WIFI_HAPD_IFACE_UNINITIALIZED:
-		PR("State: %s\n", "HAPD_IFACE_UNINITIALIZED");
-		return 0;
-	case WIFI_HAPD_IFACE_DISABLED:
-		PR("State: %s\n", "HAPD_IFACE_DISABLED");
-		return 0;
-	case WIFI_HAPD_IFACE_COUNTRY_UPDATE:
-		PR("State: %s\n", "HAPD_IFACE_DISABLED");
-		return 0;
-	case WIFI_HAPD_IFACE_ACS:
-		PR("State: %s\n", "HAPD_IFACE_DISABLED");
-		return 0;
-	case WIFI_HAPD_IFACE_HT_SCAN:
-		PR("State: %s\n", "HAPD_IFACE_DISABLED");
-		return 0;
-	case WIFI_HAPD_IFACE_DFS:
-		PR("State: %s\n", "HAPD_IFACE_DISABLED");
-		break;
-	case WIFI_HAPD_IFACE_ENABLED:
-		break;
-	default:
-		return 0;
-	}
-
-	PR("Interface Mode: %s\n", wifi_mode_txt(status.iface_mode));
-	PR("Link Mode: %s\n", wifi_link_mode_txt(status.link_mode));
-	PR("SSID: %.32s\n", status.ssid);
-	PR("BSSID: %s\n", net_sprint_ll_addr_buf(status.bssid, WIFI_MAC_ADDR_LEN, mac_string_buf,
-						 sizeof(mac_string_buf)));
-	PR("Band: %s\n", wifi_band_txt(status.band));
-	PR("Channel: %d\n", status.channel);
-	PR("Security: %s\n", wifi_security_txt(status.security));
-	PR("MFP: %s\n", wifi_mfp_txt(status.mfp));
-	if (status.iface_mode == WIFI_MODE_INFRA) {
-		PR("RSSI: %d\n", status.rssi);
-	}
-	PR("Beacon Interval: %d\n", status.beacon_interval);
-	PR("DTIM: %d\n", status.dtim_period);
-	PR("TWT: %s\n", status.twt_capable ? "Supported" : "Not supported");
-
-	return 0;
-}
-
 #if defined(CONFIG_NET_STATISTICS_WIFI) && \
 					defined(CONFIG_NET_STATISTICS_USER_API)
 static void print_wifi_stats(struct net_if *iface, struct net_stats_wifi *data,
@@ -2813,36 +2754,43 @@ static int cmd_wifi_pmksa_flush(const struct shell *sh, size_t argc, char *argv[
 	return 0;
 }
 
-SHELL_STATIC_SUBCMD_SET_CREATE(
-	wifi_cmd_ap,
-	SHELL_CMD_ARG(disable, NULL, "Disable Access Point mode.\n", cmd_wifi_ap_disable, 1, 0),
+SHELL_STATIC_SUBCMD_SET_CREATE(wifi_cmd_ap,
+	SHELL_CMD_ARG(disable, NULL,
+		  "Disable Access Point mode.\n",
+		  cmd_wifi_ap_disable,
+		  1, 0),
 	SHELL_CMD_ARG(enable, NULL,
-		      "-s --ssid=<SSID>\n"
-		      "-c --channel=<channel number>\n"
-		      "-p --passphrase=<PSK> (valid only for secure SSIDs)\n"
-		      "-k --key-mgmt=<Security type> (valid only for secure SSIDs)\n"
-		      "0:None, 1:WPA2-PSK, 2:WPA2-PSK-256, 3:SAE, 4:WAPI, 5:EAP-TLS, 6:WEP\n"
-		      "7: WPA-PSK, 11: DPP\n"
-		      "-w --ieee-80211w=<MFP> (optional: needs security type to be specified)\n"
-		      "0:Disable, 1:Optional, 2:Required\n"
-		      "-b --band=<band> (2 -2.6GHz, 5 - 5Ghz, 6 - 6GHz)\n"
-		      "-m --bssid=<BSSID>\n"
-		      "-h --help (prints help)",
-		      cmd_wifi_ap_enable, 2, 13),
-	SHELL_CMD_ARG(stations, NULL, "List stations connected to the AP", cmd_wifi_ap_stations, 1,
-		      0),
+		  "-s --ssid=<SSID>\n"
+		  "-c --channel=<channel number>\n"
+		  "-p --passphrase=<PSK> (valid only for secure SSIDs)\n"
+		  "-k --key-mgmt=<Security type> (valid only for secure SSIDs)\n"
+		  "0:None, 1:WPA2-PSK, 2:WPA2-PSK-256, 3:SAE, 4:WAPI, 5:EAP-TLS, 6:WEP\n"
+		  "7: WPA-PSK, 11: DPP\n"
+		  "-w --ieee-80211w=<MFP> (optional: needs security type to be specified)\n"
+		  "0:Disable, 1:Optional, 2:Required\n"
+		  "-b --band=<band> (2 -2.6GHz, 5 - 5Ghz, 6 - 6GHz)\n"
+		  "-m --bssid=<BSSID>\n"
+		  "-h --help (prints help)",
+		  cmd_wifi_ap_enable,
+		  2, 13),
+	SHELL_CMD_ARG(stations, NULL,
+		  "List stations connected to the AP",
+		  cmd_wifi_ap_stations,
+		  1, 0),
 	SHELL_CMD_ARG(disconnect, NULL,
-		      "Disconnect a station from the AP\n"
-		      "<MAC address of the station>\n",
-		      cmd_wifi_ap_sta_disconnect, 2, 0),
+		  "Disconnect a station from the AP\n"
+		  "<MAC address of the station>\n",
+		  cmd_wifi_ap_sta_disconnect,
+		  2, 0),
 	SHELL_CMD_ARG(config, NULL,
-		      "Configure AP parameters.\n"
-		      "-i --max_inactivity=<time duration (in seconds)>\n"
-		      "-s --max_num_sta=<maximum number of stations>\n"
-		      "-h --help (prints help)",
-		      cmd_wifi_ap_config_params, 2, 5),
-	SHELL_CMD_ARG(status, NULL, "Status of Wi-Fi SAP\n", cmd_wifi_ap_status, 1, 0),
-	SHELL_SUBCMD_SET_END);
+		  "Configure AP parameters.\n"
+		  "-i --max_inactivity=<time duration (in seconds)>\n"
+		  "-s --max_num_sta=<maximum number of stations>\n"
+		  "-h --help (prints help)",
+		  cmd_wifi_ap_config_params,
+		  2, 5),
+	SHELL_SUBCMD_SET_END
+);
 
 SHELL_STATIC_SUBCMD_SET_CREATE(wifi_twt_ops,
 	SHELL_CMD_ARG(quick_setup, NULL, " Start a TWT flow with defaults:\n"

From 990d344d83e4bf9da52b25308031ccec6d99ab63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:45 +0100
Subject: [PATCH 1682/2913] Revert "[nrf fromtree] net: fix build error in DPP
 struct"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2c89d340c090b68106f29ad356c3c73b684bc983.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/wifi_mgmt.h | 134 ++++++++++++++-------------------
 1 file changed, 58 insertions(+), 76 deletions(-)

diff --git a/include/zephyr/net/wifi_mgmt.h b/include/zephyr/net/wifi_mgmt.h
index 4927bc1c9c5..8e4b00b31a9 100644
--- a/include/zephyr/net/wifi_mgmt.h
+++ b/include/zephyr/net/wifi_mgmt.h
@@ -949,76 +949,6 @@ enum wifi_dpp_bootstrap_type {
 	WIFI_DPP_BOOTSTRAP_TYPE_NFC_URI
 };
 
-/** Params to add DPP configurator */
-struct wifi_dpp_configurator_add_params {
-	/** ECP curves for private key */
-	int curve;
-	/** ECP curves for net access key */
-	int net_access_key_curve;
-};
-
-/** Params to initiate a DPP auth procedure */
-struct wifi_dpp_auth_init_params {
-	/** Peer bootstrap id */
-	int peer;
-	/** Configuration parameter id */
-	int configurator;
-	/** Role configurator or enrollee */
-	int role;
-	/** Security type */
-	int conf;
-	/** SSID in string */
-	char ssid[WIFI_SSID_MAX_LEN + 1];
-};
-
-/** Params to do DPP chirp */
-struct wifi_dpp_chirp_params {
-	/** Own bootstrap id */
-	int id;
-	/** Chirp on frequency */
-	int freq;
-};
-
-/** Params to do DPP listen */
-struct wifi_dpp_listen_params {
-	/** Listen on frequency */
-	int freq;
-	/** Role configurator or enrollee */
-	int role;
-};
-
-/** Params to generate a DPP bootstrap */
-struct wifi_dpp_bootstrap_gen_params {
-	/** Bootstrap type */
-	int type;
-	/** Own operating class */
-	int op_class;
-	/** Own working channel */
-	int chan;
-	/** ECP curves */
-	int curve;
-	/** Own mac address */
-	uint8_t mac[WIFI_MAC_ADDR_LEN];
-};
-
-/** Params to set specific DPP configurator */
-struct wifi_dpp_configurator_set_params {
-	/** Peer bootstrap id */
-	int peer;
-	/** Configuration parameter id */
-	int configurator;
-	/** Role configurator or enrollee */
-	int role;
-	/** Security type */
-	int conf;
-	/** ECP curves for private key */
-	int curve;
-	/** ECP curves for net access key */
-	int net_access_key_curve;
-	/** Own mac address */
-	char ssid[WIFI_SSID_MAX_LEN + 1];
-};
-
 /** Wi-Fi DPP params for various operations
  */
 struct wifi_dpp_params {
@@ -1026,17 +956,69 @@ struct wifi_dpp_params {
 	int action;
 	union {
 		/** Params to add DPP configurator */
-		struct wifi_dpp_configurator_add_params configurator_add;
+		struct wifi_dpp_configurator_add_params {
+			/** ECP curves for private key */
+			int curve;
+			/** ECP curves for net access key */
+			int net_access_key_curve;
+		} configurator_add;
 		/** Params to initiate a DPP auth procedure */
-		struct wifi_dpp_auth_init_params auth_init;
+		struct wifi_dpp_auth_init_params {
+			/** Peer bootstrap id */
+			int peer;
+			/** Configuration parameter id */
+			int configurator;
+			/** Role configurator or enrollee */
+			int role;
+			/** Security type */
+			int conf;
+			/** SSID in string */
+			char ssid[WIFI_SSID_MAX_LEN + 1];
+		} auth_init;
 		/** Params to do DPP chirp */
-		struct wifi_dpp_chirp_params chirp;
+		struct wifi_dpp_chirp_params {
+			/** Own bootstrap id */
+			int id;
+			/** Chirp on frequency */
+			int freq;
+		} chirp;
 		/** Params to do DPP listen */
-		struct wifi_dpp_listen_params listen;
+		struct wifi_dpp_listen_params {
+			/** Listen on frequency */
+			int freq;
+			/** Role configurator or enrollee */
+			int role;
+		} listen;
 		/** Params to generate a DPP bootstrap */
-		struct wifi_dpp_bootstrap_gen_params bootstrap_gen;
+		struct wifi_dpp_bootstrap_gen_params {
+			/** Bootstrap type */
+			int type;
+			/** Own operating class */
+			int op_class;
+			/** Own working channel */
+			int chan;
+			/** ECP curves */
+			int curve;
+			/** Own mac address */
+			uint8_t mac[WIFI_MAC_ADDR_LEN];
+		} bootstrap_gen;
 		/** Params to set specific DPP configurator */
-		struct wifi_dpp_configurator_set_params configurator_set;
+		struct wifi_dpp_configurator_set_params {
+			/** Peer bootstrap id */
+			int peer;
+			/** Configuration parameter id */
+			int configurator;
+			/** Role configurator or enrollee */
+			int role;
+			/** Security type */
+			int conf;
+			/** ECP curves for private key */
+			int curve;
+			/** ECP curves for net access key */
+			int net_access_key_curve;
+			/** Own mac address */
+			char ssid[WIFI_SSID_MAX_LEN + 1];
+		} configurator_set;
 		/** Bootstrap get uri id */
 		int id;
 		/** Timeout for DPP frame response rx */

From 1cf24c29535745fe303cf9f50c2c6878f3a663ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:45 +0100
Subject: [PATCH 1683/2913] Revert "[nrf fromtree] net: wifi: shell: add wps
 support"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 185fa70fba41dfb7e7fefcbbf87276f8611a69ed.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/wifi_mgmt.h            | 36 +--------
 modules/hostap/src/supp_api.c             | 89 +----------------------
 modules/hostap/src/supp_api.h             |  9 ---
 modules/hostap/src/supp_main.c            |  1 -
 samples/net/wifi/boards/rd_rw612_bga.conf |  1 -
 subsys/net/l2/wifi/wifi_mgmt.c            | 15 ----
 subsys/net/l2/wifi/wifi_shell.c           | 58 ---------------
 7 files changed, 2 insertions(+), 207 deletions(-)

diff --git a/include/zephyr/net/wifi_mgmt.h b/include/zephyr/net/wifi_mgmt.h
index 8e4b00b31a9..528e72dffe9 100644
--- a/include/zephyr/net/wifi_mgmt.h
+++ b/include/zephyr/net/wifi_mgmt.h
@@ -106,9 +106,7 @@ enum net_request_wifi_cmd {
 	NET_REQUEST_WIFI_CMD_ENTERPRISE_CREDS,
 	/** Get RTS threshold */
 	NET_REQUEST_WIFI_CMD_RTS_THRESHOLD_CONFIG,
-	/** WPS config */
-	NET_REQUEST_WIFI_CMD_WPS_CONFIG,
-	/** @cond INTERNAL_HIDDEN */
+/** @cond INTERNAL_HIDDEN */
 	NET_REQUEST_WIFI_CMD_MAX
 /** @endcond */
 };
@@ -254,10 +252,6 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_ENTERPRISE_CREDS);
 
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_RTS_THRESHOLD_CONFIG);
 
-#define NET_REQUEST_WIFI_WPS_CONFIG (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_WPS_CONFIG)
-
-NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_WPS_CONFIG);
-
 /** @brief Wi-Fi management events */
 enum net_event_wifi_cmd {
 	/** Scan results available */
@@ -1036,26 +1030,6 @@ struct wifi_dpp_params {
 };
 #endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
-#define WIFI_WPS_PIN_MAX_LEN 8
-
-/** Operation for WPS */
-enum wifi_wps_op {
-	/** WPS pbc */
-	WIFI_WPS_PBC = 0,
-	/** Get WPS pin number */
-	WIFI_WPS_PIN_GET = 1,
-	/** Set WPS pin number */
-	WIFI_WPS_PIN_SET = 2,
-};
-
-/** Wi-Fi wps setup */
-struct wifi_wps_config_params {
-	/** wps operation */
-	enum wifi_wps_op oper;
-	/** pin value*/
-	char pin[WIFI_WPS_PIN_MAX_LEN + 1];
-};
-
 #include <zephyr/net/net_if.h>
 
 /** Scan result callback
@@ -1299,14 +1273,6 @@ struct wifi_mgmt_ops {
 	 * @return 0 if ok, < 0 if error
 	 */
 	int (*get_rts_threshold)(const struct device *dev, unsigned int *rts_threshold);
-	/** Start a WPS PBC/PIN connection
-	 *
-	 * @param dev Pointer to the device structure for the driver instance
-	 * @param params wps operarion parameters
-	 *
-	 * @return 0 if ok, < 0 if error
-	 */
-	int (*wps_config)(const struct device *dev, struct wifi_wps_config_params *params);
 };
 
 /** Wi-Fi management offload API */
diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 087b70644bd..a29bc1c8296 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -35,9 +35,7 @@ static struct wifi_connect_req_params last_wifi_conn_params;
 
 enum requested_ops {
 	CONNECT = 0,
-	DISCONNECT,
-	WPS_PBC,
-	WPS_PIN,
+	DISCONNECT
 };
 
 enum status_thread_state {
@@ -1322,91 +1320,6 @@ int supplicant_get_wifi_conn_params(const struct device *dev,
 	return ret;
 }
 
-static int supplicant_wps_pbc(const struct device *dev)
-{
-	struct wpa_supplicant *wpa_s;
-	int ret = -1;
-
-	k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
-
-	wpa_s = get_wpa_s_handle(dev);
-	if (!wpa_s) {
-		ret = -1;
-		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
-		goto out;
-	}
-
-	if (!wpa_cli_cmd_v("wps_pbc")) {
-		goto out;
-	}
-
-	wpas_api_ctrl.dev = dev;
-	wpas_api_ctrl.requested_op = WPS_PBC;
-
-	ret = 0;
-
-out:
-	k_mutex_unlock(&wpa_supplicant_mutex);
-
-	return ret;
-}
-
-static int supplicant_wps_pin(const struct device *dev, struct wifi_wps_config_params *params)
-{
-	struct wpa_supplicant *wpa_s;
-	char *get_pin_cmd = "WPS_PIN get";
-	int ret = -1;
-
-	k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
-
-	wpa_s = get_wpa_s_handle(dev);
-	if (!wpa_s) {
-		ret = -1;
-		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
-		goto out;
-	}
-
-	if (params->oper == WIFI_WPS_PIN_GET) {
-		if (zephyr_wpa_cli_cmd_resp(get_pin_cmd, params->pin)) {
-			goto out;
-		}
-	} else if (params->oper == WIFI_WPS_PIN_SET) {
-		if (!wpa_cli_cmd_v("wps_check_pin %s", params->pin)) {
-			goto out;
-		}
-
-		if (!wpa_cli_cmd_v("wps_pin any %s", params->pin)) {
-			goto out;
-		}
-
-		wpas_api_ctrl.dev = dev;
-		wpas_api_ctrl.requested_op = WPS_PIN;
-	} else {
-		wpa_printf(MSG_ERROR, "Error wps pin operation : %d", params->oper);
-		goto out;
-	}
-
-	ret = 0;
-
-out:
-	k_mutex_unlock(&wpa_supplicant_mutex);
-
-	return ret;
-}
-
-int supplicant_wps_config(const struct device *dev, struct wifi_wps_config_params *params)
-{
-	int ret = 0;
-
-	if (params->oper == WIFI_WPS_PBC) {
-		ret = supplicant_wps_pbc(dev);
-	} else if (params->oper == WIFI_WPS_PIN_GET || params->oper == WIFI_WPS_PIN_SET) {
-		ret = supplicant_wps_pin(dev, params);
-	}
-
-	return ret;
-}
-
 #ifdef CONFIG_AP
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 int hapd_state(const struct device *dev, int *state)
diff --git a/modules/hostap/src/supp_api.h b/modules/hostap/src/supp_api.h
index 3cd4ccac113..d5edce626de 100644
--- a/modules/hostap/src/supp_api.h
+++ b/modules/hostap/src/supp_api.h
@@ -215,15 +215,6 @@ int supplicant_btm_query(const struct device *dev, uint8_t reason);
 int supplicant_get_wifi_conn_params(const struct device *dev,
 			 struct wifi_connect_req_params *params);
 
-/** Start a WPS PBC/PIN connection
- *
- * @param dev Pointer to the device structure for the driver instance
- * @param params wps operarion parameters
- *
- * @return 0 if ok, < 0 if error
- */
-int supplicant_wps_config(const struct device *dev, struct wifi_wps_config_params *params);
-
 #ifdef CONFIG_AP
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 /**
diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index 380c32dfc16..b111f43a4e8 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -75,7 +75,6 @@ static const struct wifi_mgmt_ops mgmt_ops = {
 	.btm_query = supplicant_btm_query,
 #endif
 	.get_conn_params = supplicant_get_wifi_conn_params,
-	.wps_config = supplicant_wps_config,
 #ifdef CONFIG_AP
 	.ap_enable = supplicant_ap_enable,
 	.ap_disable = supplicant_ap_disable,
diff --git a/samples/net/wifi/boards/rd_rw612_bga.conf b/samples/net/wifi/boards/rd_rw612_bga.conf
index a916ff131ad..d20b5af0b3e 100644
--- a/samples/net/wifi/boards/rd_rw612_bga.conf
+++ b/samples/net/wifi/boards/rd_rw612_bga.conf
@@ -85,7 +85,6 @@ CONFIG_WIFI_NM_WPA_SUPPLICANT_INF_MON=n
 CONFIG_WIFI_NM_MAX_MANAGED_INTERFACES=2
 CONFIG_SAE_PWE_EARLY_EXIT=y
 CONFIG_WIFI_NM_HOSTAPD_AP=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_WPS=y
 
 # Enable mbedtls
 CONFIG_MBEDTLS=y
diff --git a/subsys/net/l2/wifi/wifi_mgmt.c b/subsys/net/l2/wifi/wifi_mgmt.c
index f0d25d864d0..3cea624b6e3 100644
--- a/subsys/net/l2/wifi/wifi_mgmt.c
+++ b/subsys/net/l2/wifi/wifi_mgmt.c
@@ -832,21 +832,6 @@ static int wifi_get_connection_params(uint32_t mgmt_request, struct net_if *ifac
 
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_CONN_PARAMS, wifi_get_connection_params);
 
-static int wifi_wps_config(uint32_t mgmt_request, struct net_if *iface, void *data, size_t len)
-{
-	const struct device *dev = net_if_get_device(iface);
-	const struct wifi_mgmt_ops *const wifi_mgmt_api = get_wifi_api(iface);
-	struct wifi_wps_config_params *params = data;
-
-	if (wifi_mgmt_api == NULL || wifi_mgmt_api->wps_config == NULL) {
-		return -ENOTSUP;
-	}
-
-	return wifi_mgmt_api->wps_config(dev, params);
-}
-
-NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_WPS_CONFIG, wifi_wps_config);
-
 static int wifi_set_rts_threshold(uint32_t mgmt_request, struct net_if *iface,
 				  void *data, size_t len)
 {
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index a7085ee3760..22e3f0e83e7 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -1700,57 +1700,6 @@ static int cmd_wifi_btm_query(const struct shell *sh, size_t argc, char *argv[])
 }
 #endif
 
-static int cmd_wifi_wps_pbc(const struct shell *sh, size_t argc, char *argv[])
-{
-	struct net_if *iface = net_if_get_first_wifi();
-	struct wifi_wps_config_params params = {0};
-
-	context.sh = sh;
-
-	if (argc == 1) {
-		params.oper = WIFI_WPS_PBC;
-	} else {
-		shell_help(sh);
-		return -ENOEXEC;
-	}
-
-	if (net_mgmt(NET_REQUEST_WIFI_WPS_CONFIG, iface, &params, sizeof(params))) {
-		PR_WARNING("Start wps pbc connection failed\n");
-		return -ENOEXEC;
-	}
-
-	return 0;
-}
-
-static int cmd_wifi_wps_pin(const struct shell *sh, size_t argc, char *argv[])
-{
-	struct net_if *iface = net_if_get_first_wifi();
-	struct wifi_wps_config_params params = {0};
-
-	context.sh = sh;
-
-	if (argc == 1) {
-		params.oper = WIFI_WPS_PIN_GET;
-	} else if (argc == 2) {
-		params.oper = WIFI_WPS_PIN_SET;
-		strncpy(params.pin, argv[1], WIFI_WPS_PIN_MAX_LEN);
-	} else {
-		shell_help(sh);
-		return -ENOEXEC;
-	}
-
-	if (net_mgmt(NET_REQUEST_WIFI_WPS_CONFIG, iface, &params, sizeof(params))) {
-		PR_WARNING("Start wps pin connection failed\n");
-		return -ENOEXEC;
-	}
-
-	if (params.oper == WIFI_WPS_PIN_GET) {
-		PR("WPS PIN is: %s\n", params.pin);
-	}
-
-	return 0;
-}
-
 static int cmd_wifi_ps_wakeup_mode(const struct shell *sh, size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_first_wifi();
@@ -3011,13 +2960,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
 		cmd_wifi_btm_query,
 		2, 0),
 #endif
-	SHELL_CMD_ARG(wps_pbc, NULL,
-		"Start a WPS PBC connection.\n",
-		cmd_wifi_wps_pbc, 1, 0),
-	SHELL_CMD_ARG(wps_pin, NULL,
-		"Set and get WPS pin.\n"
-		"[pin] Only applicable for set.\n",
-		cmd_wifi_wps_pin, 1, 1),
 	SHELL_CMD_ARG(ps_timeout,
 		      NULL,
 		      "<val> - PS inactivity timer(in ms).\n",

From 0053f584e9b3aeade36f6b7ccbea75960017d19b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:45 +0100
Subject: [PATCH 1684/2913] Revert "[nrf fromtree] modules: hostap: fix DPP
 build error"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ab4cba58b7dc5ca4d6e898145781946f9cfa03af.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_api.c | 1 +
 modules/hostap/src/supp_api.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index a29bc1c8296..ea4afcbcbf4 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -2061,6 +2061,7 @@ int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *pa
 	os_free(cmd);
 	return 0;
 }
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 int hapd_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params)
diff --git a/modules/hostap/src/supp_api.h b/modules/hostap/src/supp_api.h
index d5edce626de..1abcd2166c9 100644
--- a/modules/hostap/src/supp_api.h
+++ b/modules/hostap/src/supp_api.h
@@ -278,6 +278,7 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
  * @return 0 for OK; -1 for ERROR
  */
 int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params);
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 /**

From f6cd5a02ceeee86189aa1a6eb089badb1235e5f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:45 +0100
Subject: [PATCH 1685/2913] Revert "[nrf fromtree] manifest: update hal_nordic
 revision for regularity domain"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2096d9ff26512795ccc1cabaf7c342148af24942.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 31a525b6eaf..31647ae878c 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 957d1a803d0663330e870af2985503ba0cdbb152
+      revision: 5f1210074cb8bb7ec66317af294596a97ac48815
       path: modules/hal/nordic
       groups:
         - hal

From 4f3cc4ffd356f71ddc293e3792fc1a4a942f666d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:45 +0100
Subject: [PATCH 1686/2913] Revert "[nrf fromtree] drivers: wifi: Add changes
 for regulatory domain"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1fc850a01f00b9379f1fddbe07f1a6bf627de9f2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c        | 5 ++---
 drivers/wifi/nrfwifi/src/fmac_main.c                        | 6 ++----
 .../zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h | 6 ++----
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c b/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
index 520814865d6..3b1dd0bb093 100644
--- a/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
+++ b/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
@@ -128,7 +128,7 @@ static int bytes_from_str(uint8_t *buf, int buf_len, const char *src)
 }
 #endif /* CONFIG_WIFI_FIXED_MAC_ADDRESS_ENABLED */
 
-int nrf70_off_raw_tx_init(uint8_t *mac_addr, unsigned char *country_code)
+int nrf70_off_raw_tx_init(uint8_t *mac_addr)
 {
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
@@ -206,8 +206,7 @@ int nrf70_off_raw_tx_init(uint8_t *mac_addr, unsigned char *country_code)
 						   IS_ENABLED(CONFIG_NRF_WIFI_BEAMFORMING),
 						   &ctrl_params,
 						   &ceil_params,
-						   &board_params,
-						   country_code);
+						   &board_params);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nRF70 firmware initialization failed", __func__);
 		goto err;
diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c
index f2f7ba41340..82ea0f99267 100644
--- a/drivers/wifi/nrfwifi/src/fmac_main.c
+++ b/drivers/wifi/nrfwifi/src/fmac_main.c
@@ -644,8 +644,7 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv
 					IS_ENABLED(CONFIG_NRF_WIFI_BEAMFORMING),
 					&tx_pwr_ctrl_params,
 					&tx_pwr_ceil_params,
-					&board_params,
-					STRINGIFY(CONFIG_NRF70_REG_DOMAIN));
+					&board_params);
 #else
 	status = nrf_wifi_fmac_dev_init(rpu_ctx_zep->rpu_ctx,
 #ifdef CONFIG_NRF_WIFI_LOW_POWER
@@ -656,8 +655,7 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv
 					IS_ENABLED(CONFIG_NRF_WIFI_BEAMFORMING),
 					&tx_pwr_ctrl_params,
 					&tx_pwr_ceil_params,
-					&board_params,
-					STRINGIFY(CONFIG_NRF70_REG_DOMAIN));
+					&board_params);
 #endif /* CONFIG_NRF70_RADIO_TEST */
 
 
diff --git a/include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h b/include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h
index b14ae39488d..b8ff50cd390 100644
--- a/include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h
+++ b/include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h
@@ -22,8 +22,7 @@
 #define NRF_WIFI_OFF_RAW_TX_FRAME_SIZE_MIN 26
 /*  Maximum frame size for raw packet transmission */
 #define NRF_WIFI_OFF_RAW_TX_FRAME_SIZE_MAX 600
-/* Maximum length of country code*/
-#define NRF_WIFI_COUNTRY_CODE_LEN 2
+
 /**
  * @brief- Transmission rates
  * Rate to be used for transmitting a packet.
@@ -168,7 +167,6 @@ struct nrf_wifi_off_raw_tx_conf {
 /**
  * @brief Initialize the nRF70 for operating in the offloaded raw TX mode.
  * @param mac_addr MAC address to be used for the nRF70 device.
- * @param country_code Country code to be set for regularity domain.
  *
  * This function is initializes the nRF70 device for offloaded raw TX mode by:
  *  - Powering it up,
@@ -186,7 +184,7 @@ struct nrf_wifi_off_raw_tx_conf {
  * @retval 0 If the operation was successful.
  * @retval -1 If the operation failed.
  */
-int nrf70_off_raw_tx_init(uint8_t *mac_addr, unsigned char *country_code);
+int nrf70_off_raw_tx_init(uint8_t *mac_addr);
 
 /**
  * @brief Initialize the nRF70 for operating in the offloaded raw TX mode.

From cd37e88bdbb5e8fd180d902dfb49ae22fc6a1693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:45 +0100
Subject: [PATCH 1687/2913] Revert "[nrf fromtree] drivers: nrfwifi: Allow
 scan-only for all platforms"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3c85c2cefbfe3c2f97d70090ee53ea52d22474b7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 36935ed8ba1..b0c5e6cb63e 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -62,6 +62,7 @@ config NRF70_SYSTEM_MODE
 
 config NRF70_SCAN_ONLY
 	bool "nRF70 scan only mode"
+	depends on WIFI_NRF7000
 	help
 	  Select this option to enable scan only mode of the nRF70 driver
 

From 76ed373174f2cc910d1177bb89061b39123e51dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:45 +0100
Subject: [PATCH 1688/2913] Revert "[nrf fromtree] drivers: wifi: Add Kconfig
 option for passive scan"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 346f21e901d5eb98d74f2c461e168a87086dd44b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi      | 7 -------
 drivers/wifi/nrfwifi/src/wifi_mgmt_scan.c | 4 ----
 2 files changed, 11 deletions(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index b0c5e6cb63e..a5a12a03e26 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -821,11 +821,4 @@ config NRF_WIFI_PS_INT_PS
 	  whether to stay in PS (for lower amount of buffered data) or exit PS (for higher
 	  amount of buffered data).
 endchoice
-
-config NRF70_PASSIVE_SCAN_ONLY
-	bool "Forced Passive scan"
-	depends on NRF70_SCAN_ONLY
-	help
-	  Enable this configuration to force passive scan on all channels.
-	  This will override application specified scan type.
 endif # WIFI_NRF70
diff --git a/drivers/wifi/nrfwifi/src/wifi_mgmt_scan.c b/drivers/wifi/nrfwifi/src/wifi_mgmt_scan.c
index e30f572aeb3..c5c6f18804e 100644
--- a/drivers/wifi/nrfwifi/src/wifi_mgmt_scan.c
+++ b/drivers/wifi/nrfwifi/src/wifi_mgmt_scan.c
@@ -206,10 +206,6 @@ int nrf_wifi_disp_scan_zep(const struct device *dev, struct wifi_scan_params *pa
 
 	vif_ctx_zep->scan_res_cnt = 0;
 
-#ifdef CONFIG_NRF70_PASSIVE_SCAN_ONLY
-	scan_info->scan_params.passive_scan = 1;
-#endif /* CONFIG_NRF70_PASSIVE_SCAN_ONLY */
-
 	status = nrf_wifi_fmac_scan(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, scan_info);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {

From bb533c0e78564dacfceb9de2798b19b4f80a888f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:45 +0100
Subject: [PATCH 1689/2913] Revert "[nrf fromlist] boards: shields: nrf7002ek:
 align with nrf700x split interface"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 85ed407a9a71cccac3e1ff3b21fce6e5a5e43c36.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/shields/nrf7002ek/Kconfig.shield       |  3 ---
 boards/shields/nrf7002ek/doc/index.rst        | 13 ++++++------
 .../shields/nrf7002ek/nrf7002ek_coex.overlay  | 21 -------------------
 .../shields/nrf7002ek/nrf7002ek_common.dtsi   |  9 +++++++-
 4 files changed, 14 insertions(+), 32 deletions(-)
 delete mode 100644 boards/shields/nrf7002ek/nrf7002ek_coex.overlay

diff --git a/boards/shields/nrf7002ek/Kconfig.shield b/boards/shields/nrf7002ek/Kconfig.shield
index 5b52d5710f2..7627ff96dbd 100644
--- a/boards/shields/nrf7002ek/Kconfig.shield
+++ b/boards/shields/nrf7002ek/Kconfig.shield
@@ -9,6 +9,3 @@ config SHIELD_NRF7002EK_NRF7001
 
 config SHIELD_NRF7002EK_NRF7000
 	def_bool $(shields_list_contains,nrf7002ek_nrf7000)
-
-config SHIELD_NRF7002EK_COEX
-	def_bool $(shields_list_contains,nrf7002ek_coex)
diff --git a/boards/shields/nrf7002ek/doc/index.rst b/boards/shields/nrf7002ek/doc/index.rst
index cfe08750f57..9f247be3501 100644
--- a/boards/shields/nrf7002ek/doc/index.rst
+++ b/boards/shields/nrf7002ek/doc/index.rst
@@ -47,25 +47,24 @@ SR Co-existence
 ###############
 
 The nRF7002 EK supports SR co-existence provided the host board supports it. The SR co-existence
-pins are connected to the host board's GPIO pins. The interface is selected by setting
-``--shield nrf7002ek_coex`` when invoking ``west build``.
+pins are connected to the host board's GPIO pins.
 
 Two Kconfig options are available to enable SR co-existence:
 
-- :kconfig:option:`CONFIG_NRF70_SR_COEX`: Enables SR co-existence driver.
+- :kconfig:option:`CONFIG_NRF70_SR_COEX`: Enables SR co-existence.
 - :kconfig:option:`CONFIG_NRF70_SR_COEX_RF_SWITCH`: Control SR side RF switch.
 
 Shield Variants
 ###############
 
-The nRF7002 EK is available in four variants:
+The nRF7002 EK is available in three variants:
 
 - ``nrf7002ek``: The default variant.
 - ``nrf7002ek_nrf7001``: Variant for the nRF7001 SoC or nRF7002 SoC emulating nRF7001
-  that supports only 2.4GHz Wi-Fi.
+   that supports only 2.4GHz Wi-Fi.
 - ``nrf7002ek_nrf7000``: Variant for the nRF7000 SoC or nRF7002 SoC emulating nRF7000
-  that supports only 2.4GHz Wi-Fi.
-- ``nrf7002ek_coex``: Variant for the SR co-existence interface
+   that supports only 2.4GHz Wi-Fi.
+
 
 References
 **********
diff --git a/boards/shields/nrf7002ek/nrf7002ek_coex.overlay b/boards/shields/nrf7002ek/nrf7002ek_coex.overlay
deleted file mode 100644
index 4b592acbfb2..00000000000
--- a/boards/shields/nrf7002ek/nrf7002ek_coex.overlay
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	nrf70: coex {
-		compatible = "nordic,nrf7002-coex";
-		status = "okay";
-
-		/* D2 */
-		status0-gpios = <&arduino_header 8 GPIO_ACTIVE_HIGH>;
-		/* D3 */
-		req-gpios = <&arduino_header 9 GPIO_ACTIVE_HIGH>;
-		/* D4 */
-		grant-gpios = <&arduino_header 10 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
-		/* D6 */
-		swctrl1-gpios = <&arduino_header 12 GPIO_ACTIVE_HIGH>;
-	};
-};
diff --git a/boards/shields/nrf7002ek/nrf7002ek_common.dtsi b/boards/shields/nrf7002ek/nrf7002ek_common.dtsi
index c9bbbde4b92..102e0078d5f 100644
--- a/boards/shields/nrf7002ek/nrf7002ek_common.dtsi
+++ b/boards/shields/nrf7002ek/nrf7002ek_common.dtsi
@@ -12,8 +12,15 @@ iovdd-ctrl-gpios = <&arduino_header 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
 bucken-gpios = <&arduino_header 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
 /* D7 */
 host-irq-gpios = <&arduino_header 13 GPIO_ACTIVE_HIGH>;
-
 /* Short-range (SR) co-existence */
+/* D2 */
+status0-gpios = <&arduino_header 8 GPIO_ACTIVE_HIGH>;
+/* D3 */
+req-gpios = <&arduino_header 9 GPIO_ACTIVE_HIGH>;
+/* D4 */
+grant-gpios = <&arduino_header 10 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
+/* D6 */
+swctrl1-gpios = <&arduino_header 12 GPIO_ACTIVE_HIGH>;
 /* D8 */
 srrf-switch-gpios = <&arduino_header 14 GPIO_ACTIVE_HIGH>;
 

From 51fc7ca0461bd14e3b2e3102744f03ca8e691bbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:45 +0100
Subject: [PATCH 1690/2913] Revert "[nrf fromlist] boards: shields: nrf7002eb:
 align with nrf700x split interface"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f2a7cbb12c78bcc13a155b97231970ce96c4755c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/shields/nrf7002eb/nrf7002eb_coex.overlay | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/boards/shields/nrf7002eb/nrf7002eb_coex.overlay b/boards/shields/nrf7002eb/nrf7002eb_coex.overlay
index 59007ebe58e..a8925c25567 100644
--- a/boards/shields/nrf7002eb/nrf7002eb_coex.overlay
+++ b/boards/shields/nrf7002eb/nrf7002eb_coex.overlay
@@ -4,13 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/ {
-	nrf70: coex {
-		compatible = "nordic,nrf7002-coex";
-		status = "okay";
+#include "nrf7002eb.overlay"
 
-		status0-gpios = <&edge_connector 5 GPIO_ACTIVE_HIGH>;
-		req-gpios = <&edge_connector 6 GPIO_ACTIVE_HIGH>;
-		grant-gpios = <&edge_connector 15 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
-	};
+&nrf70 {
+	status0-gpios = <&edge_connector 5 GPIO_ACTIVE_HIGH>;
+	req-gpios = <&edge_connector 6 GPIO_ACTIVE_HIGH>;
+	grant-gpios = <&edge_connector 15 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
 };

From d1613d42351ceb8340705e08ef7402ff7314482e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:45 +0100
Subject: [PATCH 1691/2913] Revert "[nrf fromlist] boards: nordic: nrf7002dk:
 align with nrf700x split interface"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a219a6a36976936735e2339ed2a56ca9dae3b099.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp.dts  |  1 +
 .../nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001.dts    |  1 +
 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts  |  7 ++-----
 boards/nordic/nrf7002dk/nrf70_common.dtsi             |  1 -
 boards/nordic/nrf7002dk/nrf70_common_coex.dtsi        | 11 +++++++++++
 5 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 boards/nordic/nrf7002dk/nrf70_common_coex.dtsi

diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp.dts
index 9b62eafea17..fbe74a82224 100644
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp.dts
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp.dts
@@ -32,6 +32,7 @@
 		qspi-quad-mode;
 
 		#include "nrf70_common.dtsi"
+		#include "nrf70_common_coex.dtsi"
 		#include "nrf70_common_5g.dtsi"
 	};
 };
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001.dts
index 8d955c67fc7..1d78dddbe68 100644
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001.dts
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001.dts
@@ -32,5 +32,6 @@
 		qspi-quad-mode;
 
 		#include "nrf70_common.dtsi"
+		#include "nrf70_common_coex.dtsi"
 	};
 };
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts
index 8e36e678581..823c9fafacb 100644
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts
@@ -84,12 +84,9 @@
 
 	nrf70: coex {
 		status = "okay";
-		compatible = "nordic,nrf7002-coex";
+		compatible = "nordic,nrf70-coex";
 
-		req-gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
-		status0-gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
-		grant-gpios = <&gpio0 24 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
-		swctrl1-gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
+		#include "nrf70_common_coex.dtsi"
 	};
 
 	/* These aliases are provided for compatibility with samples */
diff --git a/boards/nordic/nrf7002dk/nrf70_common.dtsi b/boards/nordic/nrf7002dk/nrf70_common.dtsi
index cd9cd23bb89..f40f8ad9bb7 100644
--- a/boards/nordic/nrf7002dk/nrf70_common.dtsi
+++ b/boards/nordic/nrf7002dk/nrf70_common.dtsi
@@ -7,7 +7,6 @@
 iovdd-ctrl-gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;
 bucken-gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
 host-irq-gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>;
-srrf-switch-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
 
 wifi-max-tx-pwr-2g-dsss = <21>;
 wifi-max-tx-pwr-2g-mcs0 = <16>;
diff --git a/boards/nordic/nrf7002dk/nrf70_common_coex.dtsi b/boards/nordic/nrf7002dk/nrf70_common_coex.dtsi
new file mode 100644
index 00000000000..03f22c3edba
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf70_common_coex.dtsi
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+req-gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
+status0-gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
+grant-gpios = <&gpio0 24 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
+swctrl1-gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
+srrf-switch-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;

From c0dfed4bc2d752907d7fccd0e30a58e04aa5591f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:45 +0100
Subject: [PATCH 1692/2913] Revert "[nrf fromlist] dts: bindings: wifi: split
 nrf700x coex and wifi models"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3224db5f5a1e81f1d66875432c3f4d95ae5a2522.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/bindings/wifi/nordic,nrf70-coex.yaml   | 6 ++++++
 dts/bindings/wifi/nordic,nrf70.yaml        | 9 +++------
 dts/bindings/wifi/nordic,nrf7000-coex.yaml | 9 ---------
 dts/bindings/wifi/nordic,nrf7001-coex.yaml | 9 ---------
 dts/bindings/wifi/nordic,nrf7002-coex.yaml | 9 ---------
 5 files changed, 9 insertions(+), 33 deletions(-)
 delete mode 100644 dts/bindings/wifi/nordic,nrf7000-coex.yaml
 delete mode 100644 dts/bindings/wifi/nordic,nrf7001-coex.yaml
 delete mode 100644 dts/bindings/wifi/nordic,nrf7002-coex.yaml

diff --git a/dts/bindings/wifi/nordic,nrf70-coex.yaml b/dts/bindings/wifi/nordic,nrf70-coex.yaml
index 0a9c12f587e..208657f3fb5 100644
--- a/dts/bindings/wifi/nordic,nrf70-coex.yaml
+++ b/dts/bindings/wifi/nordic,nrf70-coex.yaml
@@ -27,3 +27,9 @@ properties:
     description: |
       GPIO of the SOC controlling the Priority (STATUS1) pin (in 4-wire
       coex case) of the nRF7002
+
+  srrf-switch-gpios:
+    type: phandle-array
+    description: |
+      GPIO of the RF Switch to control SR RF output to either SR Antenna
+      or shared Antenna with Wi-Fi
diff --git a/dts/bindings/wifi/nordic,nrf70.yaml b/dts/bindings/wifi/nordic,nrf70.yaml
index abdc7ec2cb0..ff9021739ac 100644
--- a/dts/bindings/wifi/nordic,nrf70.yaml
+++ b/dts/bindings/wifi/nordic,nrf70.yaml
@@ -1,6 +1,9 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
+# GPIO lines for controlling the nRF70 Series Wi-Fi chip.
+include: nordic,nrf70-coex.yaml
+
 properties:
   iovdd-ctrl-gpios:
     type: phandle-array
@@ -16,9 +19,3 @@ properties:
     type: phandle-array
     required: true
     description: GPIO of the SoC controlling the HOST_IRQ pin of the nRF70
-
-  srrf-switch-gpios:
-    type: phandle-array
-    description: |
-      GPIO of the RF Switch to control SR RF output to either SR Antenna
-      or shared Antenna with Wi-Fi
diff --git a/dts/bindings/wifi/nordic,nrf7000-coex.yaml b/dts/bindings/wifi/nordic,nrf7000-coex.yaml
deleted file mode 100644
index 94dcc2181d3..00000000000
--- a/dts/bindings/wifi/nordic,nrf7000-coex.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: This is a representation of the nRF7000 Wi-Fi chip with COEX interface.
-
-compatible: nordic,nrf7000-coex
-
-include:
-  - "nordic,nrf70-coex.yaml"
diff --git a/dts/bindings/wifi/nordic,nrf7001-coex.yaml b/dts/bindings/wifi/nordic,nrf7001-coex.yaml
deleted file mode 100644
index d58afe7d44c..00000000000
--- a/dts/bindings/wifi/nordic,nrf7001-coex.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: This is a representation of the nRF7001 Wi-Fi chip with COEX interface.
-
-compatible: nordic,nrf7001-coex
-
-include:
-  - "nordic,nrf70-coex.yaml"
diff --git a/dts/bindings/wifi/nordic,nrf7002-coex.yaml b/dts/bindings/wifi/nordic,nrf7002-coex.yaml
deleted file mode 100644
index 1df61d0bf98..00000000000
--- a/dts/bindings/wifi/nordic,nrf7002-coex.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: This is a representation of the nRF7002 Wi-Fi chip with COEX interface.
-
-compatible: nordic,nrf7002-coex
-
-include:
-  - "nordic,nrf70-coex.yaml"

From b60c9581607a0d7cfa80ffaa7cc98924e69f099d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:46 +0100
Subject: [PATCH 1693/2913] Revert "[nrf fromlist] drivers: wifi: nrfwifi:
 Enable variable network configurations"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b96fbf3fe87af55e9da3ba622fab123a2d7cd1c3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index a5a12a03e26..b409261b614 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -570,12 +570,6 @@ config NET_TC_TX_COUNT
 
 endif # NETWORKING
 
-# nRF70 now uses variable buffers as default to optimize RAM usage. Default pool sizes are used, samples/apps can override
-# for higher performance.
-choice NET_PKT_DATA_ALLOC_TYPE
-	default NET_BUF_VARIABLE_DATA_SIZE
-endchoice
-
 config MAIN_STACK_SIZE
 	default 4096
 

From 2bc7991ac6247795aec19f79f3ade1a644c94717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:46 +0100
Subject: [PATCH 1694/2913] Revert "[nrf fromlist] net: ip: Add a name to
 existing Kconfig choice"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8dbbf5cf79db62bf157645cc18fed6f7641774cb.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/ip/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/net/ip/Kconfig b/subsys/net/ip/Kconfig
index f8c215b4fc3..cb08b3846ca 100644
--- a/subsys/net/ip/Kconfig
+++ b/subsys/net/ip/Kconfig
@@ -663,7 +663,7 @@ config NET_BUF_TX_COUNT
 	  Each data buffer will occupy CONFIG_NET_BUF_DATA_SIZE + smallish
 	  header (sizeof(struct net_buf)) amount of data.
 
-choice NET_PKT_DATA_ALLOC_TYPE
+choice
 	prompt "Network packet data allocator type"
 	default NET_BUF_FIXED_DATA_SIZE
 	help

From 0f911bc7b42a538cd765221c82905008681e35f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:46 +0100
Subject: [PATCH 1695/2913] Revert "[nrf fromtree] drivers: nrfwifi: Remove
 non-existing member"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9aa90fa0c3d3b22ab93bacd5a2032faff0e535b0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/shim.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/wifi/nrfwifi/src/shim.h b/drivers/wifi/nrfwifi/src/shim.h
index be26fd6355e..a4162bf8931 100644
--- a/drivers/wifi/nrfwifi/src/shim.h
+++ b/drivers/wifi/nrfwifi/src/shim.h
@@ -19,6 +19,7 @@
 /**
  * struct zep_shim_bus_qspi_priv - Structure to hold context information for the Linux OS
  *                        shim.
+ * @opriv: Pointer to OSAL context.
  * @pcie_callbk_data: Callback data to be passed to the PCIe callback functions.
  * @pcie_prb_callbk: The callback function to be called when a PCIe device
  *                   has been probed.

From 9c9f739499e0f006890f9a028fd177256cc3b9c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:46 +0100
Subject: [PATCH 1696/2913] Revert "[nrf fromtree] drivers: wifi: Clean up exit
 path"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7c149c7648f4f7e61f56e3966079d6245c76a900.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/net_if.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
index b8ca8915ff4..81369186533 100644
--- a/drivers/wifi/nrfwifi/src/net_if.c
+++ b/drivers/wifi/nrfwifi/src/net_if.c
@@ -440,7 +440,7 @@ static void ip_maddr_event_handler(struct net_if *iface,
 	ret = k_mutex_lock(&vif_ctx_zep->vif_lock, K_FOREVER);
 	if (ret != 0) {
 		LOG_ERR("%s: Failed to lock vif_lock", __func__);
-		return;
+		goto out;
 	}
 
 	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
@@ -455,7 +455,7 @@ static void ip_maddr_event_handler(struct net_if *iface,
 	if (!mcast_info) {
 		LOG_ERR("%s: Unable to allocate memory of size %d "
 			"for mcast_info", __func__, sizeof(*mcast_info));
-		goto unlock;
+		return;
 	}
 
 	switch (addr->family) {
@@ -492,8 +492,9 @@ static void ip_maddr_event_handler(struct net_if *iface,
 					       sizeof(mac_string_buf)));
 	}
 unlock:
-	k_free(mcast_info);
 	k_mutex_unlock(&vif_ctx_zep->vif_lock);
+out:
+	k_free(mcast_info);
 }
 #endif /* CONFIG_NRF70_STA_MODE */
 

From 3ff992c4b559a8eab71bec52eca5a3cc51fa6002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:46 +0100
Subject: [PATCH 1697/2913] Revert "[nrf fromtree] drivers: wifi: Fix memory
 leak in regulatory processing"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7247161afaed2986a4d9f07ad2705836f0c09ba5.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/fmac_main.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c
index 82ea0f99267..30bd150e811 100644
--- a/drivers/wifi/nrfwifi/src/fmac_main.c
+++ b/drivers/wifi/nrfwifi/src/fmac_main.c
@@ -474,12 +474,6 @@ void reg_change_callbk_fn(void *vif_ctx,
 		return;
 	}
 
-	if (!fmac_dev_ctx->waiting_for_reg_event) {
-		LOG_DBG("%s: Unsolicited regulatory change event", __func__);
-		/* TODO: Handle unsolicited regulatory change event */
-		return;
-	}
-
 	fmac_dev_ctx->reg_change = k_malloc(sizeof(struct nrf_wifi_event_regulatory_change));
 	if (!fmac_dev_ctx->reg_change) {
 		LOG_ERR("%s: Failed to allocate memory for reg_change", __func__);

From cdb67a9baaca22d26b1455f11673fb6447157412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:46 +0100
Subject: [PATCH 1698/2913] Revert "[nrf fromtree] manifest: hal_nordic: Pull
 the flag to identify unsolicited reg event"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1981f89544fe3229fe1e232fc08e310a99ebb418.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 31647ae878c..126048a0a1c 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 5f1210074cb8bb7ec66317af294596a97ac48815
+      revision: af91488c6edc4cebaf8b072c8bb258122a055cdb
       path: modules/hal/nordic
       groups:
         - hal

From 1396e61edbf8f695f2fbb261b864bc0154448db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:46 +0100
Subject: [PATCH 1699/2913] Revert "[nrf fromtree] drivers: wifi: Add
 regulatory debug log"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3f687841cae07f7834f02fa53b37e1aaeaa38ef1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/fmac_main.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c
index 30bd150e811..fce5da67722 100644
--- a/drivers/wifi/nrfwifi/src/fmac_main.c
+++ b/drivers/wifi/nrfwifi/src/fmac_main.c
@@ -453,8 +453,6 @@ void reg_change_callbk_fn(void *vif_ctx,
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
 
-	LOG_DBG("%s: Regulatory change event received", __func__);
-
 	vif_ctx_zep = vif_ctx;
 
 	if (!vif_ctx_zep) {

From 68ca56814263d2e8eedd7c08c1b911afb36b32d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:46 +0100
Subject: [PATCH 1700/2913] Revert "[nrf fromtree] drivers: wifi: nrfwifi: Add
 promiscuous mode support functions"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ad515c6c7ba901a23e51a8c9b141b4919430728a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 0cd45829318..41611af08a1 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -128,10 +128,6 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
 )
 
-zephyr_library_sources_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_promisc.c
-)
-
 zephyr_library_sources_ifdef(CONFIG_NRF70_ON_QSPI
   src/qspi/src/qspi_if.c
 )

From 8da58b1fb9fa5d276313ee4c87aa1819f497f193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:46 +0100
Subject: [PATCH 1701/2913] Revert "[nrf fromtree] drivers: wifi: nrfwifi:
 Promiscuous mode filtering support in driver"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5bf28de990cea3c8814b10e1b6296701b36adbd8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/fmac_main.c |  2 +-
 drivers/wifi/nrfwifi/src/wifi_mgmt.c | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c
index fce5da67722..4778111579e 100644
--- a/drivers/wifi/nrfwifi/src/fmac_main.c
+++ b/drivers/wifi/nrfwifi/src/fmac_main.c
@@ -715,7 +715,7 @@ static int nrf_wifi_drv_main_zep(const struct device *dev)
 	callbk_fns.if_carr_state_chg_callbk_fn = nrf_wifi_if_carr_state_chg;
 	callbk_fns.rx_frm_callbk_fn = nrf_wifi_if_rx_frm;
 #if defined(CONFIG_NRF70_RAW_DATA_RX) || defined(CONFIG_NRF70_PROMISC_DATA_RX)
-	callbk_fns.sniffer_callbk_fn = nrf_wifi_if_sniffer_rx_frm;
+	callbk_fns.rx_sniffer_frm_callbk_fn = nrf_wifi_if_sniffer_rx_frm;
 #endif /* CONFIG_NRF70_RAW_DATA_RX || CONFIG_NRF70_PROMISC_DATA_RX */
 #endif
 	rx_buf_pools[0].num_bufs = rx1_num_bufs;
diff --git a/drivers/wifi/nrfwifi/src/wifi_mgmt.c b/drivers/wifi/nrfwifi/src/wifi_mgmt.c
index 5effb759fa4..65f6c217bfe 100644
--- a/drivers/wifi/nrfwifi/src/wifi_mgmt.c
+++ b/drivers/wifi/nrfwifi/src/wifi_mgmt.c
@@ -935,21 +935,6 @@ int nrf_wifi_filter(const struct device *dev,
 	def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
 
 	if (filter->oper == WIFI_MGMT_SET) {
-		/**
-		 * If promiscuous mode is enabled, filter settings
-		 * cannot be plumbed to the lower layers as that might
-		 * affect connectivity. Save the filter settings in the
-		 * driver and filter packet type on packet receive by
-		 * checking the 802.11 header in the packet
-		 */
-		if (((def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) &
-		    (NRF_WIFI_PROMISCUOUS_MODE)) == NRF_WIFI_PROMISCUOUS_MODE) {
-			def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->packet_filter =
-				filter->filter;
-			ret = 0;
-			goto out;
-		}
-
 		/**
 		 * In case a user sets data + management + ctrl bits
 		 * or all the filter bits. Map it to bit 0 set to

From cfeaca26cfe614c19e12475188a7796696bf3ab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:46 +0100
Subject: [PATCH 1702/2913] Revert "[nrf fromtree] manifest: Pull promiscuous
 mode filtering support in driver"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f8264954bcfbed742f3ac333b606d9778c5e14b3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 126048a0a1c..58c40f7b327 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: af91488c6edc4cebaf8b072c8bb258122a055cdb
+      revision: 1abc0519d768c203eb27d19a0fa26dbae07e2b71
       path: modules/hal/nordic
       groups:
         - hal

From 4fc4a25f89d745ee6d9a957c81c1439c5f3df1a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:46 +0100
Subject: [PATCH 1703/2913] Revert "[nrf fromtree] manifest: hal_nordic:
 include lpcomp-int-dis-on-stop patch"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9e6041426216c22cce627dc0936f351118172eaf.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 58c40f7b327..cb4a1de93b2 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 1abc0519d768c203eb27d19a0fa26dbae07e2b71
+      revision: d5c70305b2389641b0a166d0714775a1b13319a2
       path: modules/hal/nordic
       groups:
         - hal

From a12c5d8513ec96c0cb2fc92a1e76166830c9a0dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:46 +0100
Subject: [PATCH 1704/2913] Revert "[nrf fromtree] manifest: hostap: Pull fix
 for WPA3 connection"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 78c7983b1ec953671c83294f467b36eb1f08d69f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index cb4a1de93b2..e87e6405424 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: ac59d28778b20cd68702f55dad2a27d648e3d571
+      revision: 7c32520564908e1220976b6c185dec296b6d4a80
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From 92b12bed821aa969a53f355cc2ad61fd1498180d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:46 +0100
Subject: [PATCH 1705/2913] Revert "[nrf fromtree] modules: hostap: Fix memory
 leak of network"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f42f401aabd5a1af3e21f4d49c4c8e60384deff9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_api.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index ea4afcbcbf4..f1a3017b70d 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -840,10 +840,6 @@ static int wpas_disconnect_network(const struct device *dev, int cur_mode)
 		wifi_mgmt_raise_disconnect_complete_event(iface, ret);
 	}
 
-	if (!wpa_cli_cmd_v("remove_network all")) {
-		wpa_printf(MSG_ERROR, "Failed to remove all networks");
-	}
-
 	return ret;
 }
 

From 86783b42c03d983dc8f75a2bde348784be8384e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:46 +0100
Subject: [PATCH 1706/2913] Revert "[nrf fromtree] net: l2: wifi: fix AP sets
 band failed with channel 0"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f543ebe2d7b098e89ac1029bbcb4ac9e1cb3e714.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/l2/wifi/wifi_shell.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index 22e3f0e83e7..c40edab2fd7 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -587,8 +587,7 @@ static int __wifi_args_to_params(const struct shell *sh, size_t argc, char *argv
 			params->channel = channel;
 			break;
 		case 'b':
-			if (iface_mode == WIFI_MODE_INFRA ||
-				iface_mode == WIFI_MODE_AP) {
+			if (iface_mode == WIFI_MODE_INFRA) {
 				switch (atoi(state->optarg)) {
 				case 2:
 					params->band = WIFI_FREQ_BAND_2_4_GHZ;

From 616fa2c72fe1361053714ee5c9fc98e46f9313ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:46 +0100
Subject: [PATCH 1707/2913] Revert "[nrf fromtree] net: wifi: Fix PEM
 certificate parsing errors"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 91cc73b92fdc7c77b84820c1b910959c336478d7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/l2/wifi/wifi_shell.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index c40edab2fd7..576de45a437 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -32,17 +32,14 @@ LOG_MODULE_REGISTER(net_wifi_shell, LOG_LEVEL_INF);
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 static const char ca_cert_test[] = {
 	#include <wifi_enterprise_test_certs/ca.pem.inc>
-	'\0'
 };
 
 static const char client_cert_test[] = {
 	#include <wifi_enterprise_test_certs/client.pem.inc>
-	'\0'
 };
 
 static const char client_key_test[] = {
 	#include <wifi_enterprise_test_certs/client-key.pem.inc>
-	'\0'
 };
 #endif
 

From cf899ecbc61c1964be341b7b720df7ca3a326e08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:46 +0100
Subject: [PATCH 1708/2913] Revert "[nrf fromtree] wifi: shell: btm_query: Fix
 invalid pointer cast"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ab47d7ee753b11a81919373e3bba4e592fcbd1b8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/l2/wifi/wifi_shell.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index 576de45a437..ac5240a918d 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -1674,19 +1674,16 @@ static int cmd_wifi_btm_query(const struct shell *sh, size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_first_wifi();
 	uint8_t query_reason = 0;
-	long tmp = 0;
 
 	context.sh = sh;
 
-	if (!parse_number(sh, &tmp, argv[1], NULL,
+	if (!parse_number(sh, (long *)&query_reason, argv[1], NULL,
 			  WIFI_BTM_QUERY_REASON_UNSPECIFIED, WIFI_BTM_QUERY_REASON_LEAVING_ESS)) {
 		return -EINVAL;
 	}
 
-	query_reason = tmp;
-
 	if (net_mgmt(NET_REQUEST_WIFI_BTM_QUERY, iface, &query_reason, sizeof(query_reason))) {
-		PR_WARNING("Setting BTM query Reason failed. Reason : %d\n", query_reason);
+		PR_WARNING("Setting BTM query Reason failed..Reason :%d\n", query_reason);
 		return -ENOEXEC;
 	}
 

From 6978bace73b9620dfdfd07923ba893656e9f5bb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:47 +0100
Subject: [PATCH 1709/2913] Revert "[nrf fromtree] wifi: shell: Add missing
 newlines when printing error"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e924488c851a51889d9dc82ea9848e18b29561e2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/l2/wifi/wifi_shell.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index ac5240a918d..70a4e9a8e59 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -125,16 +125,16 @@ static bool parse_number(const struct shell *sh, long *param, char *str,
 	}
 
 	if (*endptr != '\0') {
-		PR_ERROR("Invalid number: %s\n", str_tmp);
+		PR_ERROR("Invalid number: %s", str_tmp);
 		return false;
 	}
 
 	if ((num) < (min) || (num) > (max)) {
 		if (pname) {
-			PR_WARNING("%s value out of range: %s, (%ld-%ld)\n",
+			PR_WARNING("%s value out of range: %s, (%ld-%ld)",
 				   pname, str_tmp, min, max);
 		} else {
-			PR_WARNING("Value out of range: %s, (%ld-%ld)\n",
+			PR_WARNING("Value out of range: %s, (%ld-%ld)",
 				   str_tmp, min, max);
 		}
 		return false;

From 8c5b4f21b0589bbe43f4e1a27cb922dfc0a6d2f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:47 +0100
Subject: [PATCH 1710/2913] Revert "[nrf fromtree] net: wifi: Fix DPP disabled
 build"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4ef325b48f68aea95f34f8be1351f05584fedb85.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/wifi_mgmt.h  | 7 -------
 modules/hostap/src/supp_api.c   | 2 --
 modules/hostap/src/supp_api.h   | 2 --
 modules/hostap/src/supp_main.c  | 2 --
 subsys/net/l2/wifi/wifi_mgmt.c  | 3 ---
 subsys/net/l2/wifi/wifi_shell.c | 6 ------
 6 files changed, 22 deletions(-)

diff --git a/include/zephyr/net/wifi_mgmt.h b/include/zephyr/net/wifi_mgmt.h
index 528e72dffe9..dcf6e7001d0 100644
--- a/include/zephyr/net/wifi_mgmt.h
+++ b/include/zephyr/net/wifi_mgmt.h
@@ -219,13 +219,11 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_RTS_THRESHOLD);
 
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_AP_CONFIG_PARAM);
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 /** Request a Wi-Fi DPP operation */
 #define NET_REQUEST_WIFI_DPP			\
 	(_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_DPP)
 
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_DPP);
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_WNM
 /** Request a Wi-Fi BTM query */
@@ -852,7 +850,6 @@ struct wifi_ap_config_params {
 	uint32_t max_num_sta;
 };
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 /** @brief Wi-Fi DPP configuration parameter */
 /** Wi-Fi DPP QR-CODE in string max len for SHA512 */
 #define WIFI_DPP_QRCODE_MAX_LEN 255
@@ -1028,7 +1025,6 @@ struct wifi_dpp_params {
 		char resp[WIFI_DPP_QRCODE_MAX_LEN + 1];
 	};
 };
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #include <zephyr/net/net_if.h>
 
@@ -1236,8 +1232,6 @@ struct wifi_mgmt_ops {
 	 * @return 0 if ok, < 0 if error
 	 */
 	int (*ap_config_params)(const struct device *dev, struct wifi_ap_config_params *params);
-
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	/** Dispatch DPP operations by action enum, with or without arguments in string format
 	 *
 	 * @param dev Pointer to the device structure for the driver instance
@@ -1246,7 +1240,6 @@ struct wifi_mgmt_ops {
 	 * @return 0 if ok, < 0 if error
 	 */
 	int (*dpp_dispatch)(const struct device *dev, struct wifi_dpp_params *params);
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 	/** Flush PMKSA cache entries
 	 *
 	 * @param dev Pointer to the device structure for the driver instance.
diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index f1a3017b70d..af3df3c6278 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1767,7 +1767,6 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
 }
 #endif /* CONFIG_AP */
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 static const char *dpp_params_to_args_curve(int curve)
 {
 	switch (curve) {
@@ -2057,7 +2056,6 @@ int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *pa
 	os_free(cmd);
 	return 0;
 }
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 int hapd_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params)
diff --git a/modules/hostap/src/supp_api.h b/modules/hostap/src/supp_api.h
index 1abcd2166c9..12298ad6544 100644
--- a/modules/hostap/src/supp_api.h
+++ b/modules/hostap/src/supp_api.h
@@ -269,7 +269,6 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
 
 #endif /* CONFIG_AP */
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 /**
  * @brief Dispatch DPP operations for STA
  *
@@ -278,7 +277,6 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
  * @return 0 for OK; -1 for ERROR
  */
 int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params);
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 /**
diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index b111f43a4e8..ce91c1a6e8e 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -80,9 +80,7 @@ static const struct wifi_mgmt_ops mgmt_ops = {
 	.ap_disable = supplicant_ap_disable,
 	.ap_sta_disconnect = supplicant_ap_sta_disconnect,
 #endif /* CONFIG_AP */
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	.dpp_dispatch = supplicant_dpp_dispatch,
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 	.pmksa_flush = supplicant_pmksa_flush,
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	.enterprise_creds = supplicant_add_enterprise_creds,
diff --git a/subsys/net/l2/wifi/wifi_mgmt.c b/subsys/net/l2/wifi/wifi_mgmt.c
index 3cea624b6e3..6e0de6f42b8 100644
--- a/subsys/net/l2/wifi/wifi_mgmt.c
+++ b/subsys/net/l2/wifi/wifi_mgmt.c
@@ -852,7 +852,6 @@ static int wifi_set_rts_threshold(uint32_t mgmt_request, struct net_if *iface,
 
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_RTS_THRESHOLD, wifi_set_rts_threshold);
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 static int wifi_dpp(uint32_t mgmt_request, struct net_if *iface,
 		    void *data, size_t len)
 {
@@ -869,8 +868,6 @@ static int wifi_dpp(uint32_t mgmt_request, struct net_if *iface,
 
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_DPP, wifi_dpp);
 
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
-
 static int wifi_pmksa_flush(uint32_t mgmt_request, struct net_if *iface,
 					   void *data, size_t len)
 {
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index 70a4e9a8e59..4adbf48c8c8 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -2143,7 +2143,6 @@ static int cmd_wifi_version(const struct shell *sh, size_t argc, char *argv[])
 	return 0;
 }
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 static int parse_dpp_args_auth_init(const struct shell *sh, size_t argc, char *argv[],
 				    struct wifi_dpp_params *params)
 {
@@ -2681,7 +2680,6 @@ static int cmd_wifi_dpp_reconfig(const struct shell *sh, size_t argc, char *argv
 	return 0;
 }
 
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 static int cmd_wifi_pmksa_flush(const struct shell *sh, size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_wifi_sta();
@@ -2759,7 +2757,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_twt_ops,
 	SHELL_SUBCMD_SET_END
 );
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	wifi_cmd_dpp,
 	SHELL_CMD_ARG(configurator_add, NULL,
@@ -2836,7 +2833,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      cmd_wifi_dpp_reconfig, 2, 0),
 	SHELL_SUBCMD_SET_END
 );
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
 	SHELL_CMD_ARG(version, NULL, "Print Wi-Fi Driver and Firmware versions\n",
@@ -2973,9 +2969,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
 		      "<rts_threshold: rts threshold/off>.\n",
 		      cmd_wifi_set_rts_threshold,
 		      1, 1),
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	SHELL_CMD(dpp, &wifi_cmd_dpp, "DPP actions\n", NULL),
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 	SHELL_CMD_ARG(pmksa_flush, NULL,
 		     "Flush PMKSA cache entries.\n",
 		     cmd_wifi_pmksa_flush, 1, 0),

From 7a4a158e781469609700f682fc63cddc82a493b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:47 +0100
Subject: [PATCH 1711/2913] Revert "[nrf fromtree] net: wifi: shell: enhance
 consistency in `cmd_wifi_dpp_ap_auth_init`"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit eaa545a167aca270720d2165f40c6c1d16727dc2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/l2/wifi/wifi_shell.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index 4adbf48c8c8..fb35d11806d 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -2616,27 +2616,24 @@ static int cmd_wifi_dpp_ap_qr_code(const struct shell *sh, size_t argc, char *ar
 
 static int cmd_wifi_dpp_ap_auth_init(const struct shell *sh, size_t argc, char *argv[])
 {
-	int opt;
-	int opt_index = 0;
-	struct getopt_state *state;
-	static const struct option long_options[] = {
-		{"peer", required_argument, 0, 'p'},
-		{0, 0, 0, 0}};
 	int ret = 0;
 	struct net_if *iface = net_if_get_wifi_sap();
 	struct wifi_dpp_params params = {0};
+	int opt;
+	int opt_index = 0;
+	struct getopt_state *state;
+	static struct option long_options[] = {{"peer", required_argument, 0, 'p'}, {0, 0, 0, 0}};
 
 	params.action = WIFI_DPP_AUTH_INIT;
 
-	while ((opt = getopt_long(argc, argv, "p:",
-				  long_options, &opt_index)) != -1) {
+	while ((opt = getopt_long(argc, argv, "p:", long_options, &opt_index)) != -1) {
 		state = getopt_state_get();
 		switch (opt) {
 		case 'p':
-			params.auth_init.peer = shell_strtol(state->optarg, 10, &ret);
+			params.auth_init.peer = shell_strtol(optarg, 10, &ret);
 			break;
 		default:
-			PR_ERROR("Invalid option %c\n", state->optopt);
+			PR_ERROR("Invalid option %c\n", optopt);
 			return -EINVAL;
 		}
 

From 139600ac38db80b11f9faecf7a365dc014cef7c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:47 +0100
Subject: [PATCH 1712/2913] Revert "[nrf fromtree] net: l2: wifi: ensure
 certificates directory is created"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e07af9554f73276a3c795dd0de452a720f787bcb.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/l2/wifi/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/subsys/net/l2/wifi/CMakeLists.txt b/subsys/net/l2/wifi/CMakeLists.txt
index 9f190dda307..bab445e8262 100644
--- a/subsys/net/l2/wifi/CMakeLists.txt
+++ b/subsys/net/l2/wifi/CMakeLists.txt
@@ -26,8 +26,6 @@ endif()
 # Wi-Fi Enterprise test certificates handling
 set(gen_inc_dir ${ZEPHYR_BINARY_DIR}/misc/generated)
 set(gen_dir ${gen_inc_dir}/wifi_enterprise_test_certs)
-# Create output directory for test certs
-file(MAKE_DIRECTORY ${gen_dir})
 
 # convert .pem files to array data at build time
 zephyr_include_directories(${gen_inc_dir})

From 3d53ef9aa99b767490d85891c48484af5924524c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:47 +0100
Subject: [PATCH 1713/2913] Revert "[nrf fromtree] samples: wifi: Add overlays
 for Enterprise mode"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 10590084e4d381eeaebc66ae78fa2c2cd8706d88.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/net/wifi/overlay-enterprise-variable-bufs.conf |  9 ---------
 samples/net/wifi/overlay-enterprise.conf               | 10 ----------
 2 files changed, 19 deletions(-)
 delete mode 100644 samples/net/wifi/overlay-enterprise-variable-bufs.conf
 delete mode 100644 samples/net/wifi/overlay-enterprise.conf

diff --git a/samples/net/wifi/overlay-enterprise-variable-bufs.conf b/samples/net/wifi/overlay-enterprise-variable-bufs.conf
deleted file mode 100644
index 627d77a9247..00000000000
--- a/samples/net/wifi/overlay-enterprise-variable-bufs.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE=y
-# EAP frames are ~1100 bytes, so, for efficiency, we set the data size to 1100
-CONFIG_NET_BUF_DATA_SIZE=1100
-# Use variable data size to reduce memory usage for small data packets
-CONFIG_NET_BUF_VARIABLE_DATA_SIZE=y
-# For TLS and X.509 processing MbedTLS needs large heap size and using separate heap
-# for MbedTLS gives us more control over the heap size.
-CONFIG_MBEDTLS_ENABLE_HEAP=y
-CONFIG_MBEDTLS_HEAP_SIZE=55000
diff --git a/samples/net/wifi/overlay-enterprise.conf b/samples/net/wifi/overlay-enterprise.conf
deleted file mode 100644
index 34416282811..00000000000
--- a/samples/net/wifi/overlay-enterprise.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE=y
-# EAP frames are ~1100 bytes, so, need higher packet counts as default packet size is 128
-CONFIG_NET_PKT_TX_COUNT=36
-CONFIG_NET_PKT_RX_COUNT=36
-CONFIG_NET_BUF_TX_COUNT=72
-CONFIG_NET_BUF_RX_COUNT=36
-# For TLS and X.509 processing MbedTLS needs large heap size and using separate heap
-# for MbedTLS gives us more control over the heap size.
-CONFIG_MBEDTLS_ENABLE_HEAP=y
-CONFIG_MBEDTLS_HEAP_SIZE=55000

From 69d9a48bc769a1d80635c7ca93d58feebe8ddc7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:47 +0100
Subject: [PATCH 1714/2913] Revert "[nrf fromtree] samples: net: wifi: enable
 time checking for mbedtls cert files"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 009a7213fa98ee2eda4604ee1d1b5eaba3cda5db.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/net/wifi/boards/rd_rw612_bga.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/samples/net/wifi/boards/rd_rw612_bga.conf b/samples/net/wifi/boards/rd_rw612_bga.conf
index d20b5af0b3e..1df1baa0be7 100644
--- a/samples/net/wifi/boards/rd_rw612_bga.conf
+++ b/samples/net/wifi/boards/rd_rw612_bga.conf
@@ -91,7 +91,6 @@ CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_BUILTIN=y
 CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y
 CONFIG_MBEDTLS_USER_CONFIG_FILE="wpa_supp_els_pkc_mbedtls_config.h"
-CONFIG_MBEDTLS_HAVE_TIME_DATE=y
 
 # Include els_pkc in build
 CONFIG_ENTROPY_GENERATOR=y

From 6c561d3e044500871ff039ca843aedfda3497a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:47 +0100
Subject: [PATCH 1715/2913] Revert "[nrf fromtree] doc: wifi: Update build
 command for Enterprise mode"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 76df149e549dc1e8858a1302d371eef1cc1b99c0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/connectivity/networking/api/wifi.rst | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/doc/connectivity/networking/api/wifi.rst b/doc/connectivity/networking/api/wifi.rst
index 84c407cd4a8..f1bc744a831 100644
--- a/doc/connectivity/networking/api/wifi.rst
+++ b/doc/connectivity/networking/api/wifi.rst
@@ -38,15 +38,7 @@ module.
     $ cp client.pem samples/net/wifi/test_certs/
     $ cp client-key.pem samples/net/wifi/test_certs/
     $ cp ca.pem samples/net/wifi/test_certs/
-    $ west build -p -b <board> samples/net/wifi -- -DEXTRA_CONF_FILE=overlay-enterprise.conf
-
-For using variable size network buffer, the following overlay file can be used:
-
-.. code-block:: bash
-
-    $ west build -p -b <board> samples/net/wifi -- -DEXTRA_CONF_FILE=overlay-enterprise-variable-bufs.conf
-
-
+    $ west build -p -b <board> samples/net/wifi
 
 To initiate Wi-Fi connection, the following command can be used:
 

From 1a829414c3c841ac955db780cd8a3a096bd0a1ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:47 +0100
Subject: [PATCH 1716/2913] Revert "[nrf fromtree] doc: wifi: Update
 enumeration for EAP-TLS"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 785cbfe94e63b11433cc514700891dbd86e86e3d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/connectivity/networking/api/wifi.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/connectivity/networking/api/wifi.rst b/doc/connectivity/networking/api/wifi.rst
index f1bc744a831..7803a456055 100644
--- a/doc/connectivity/networking/api/wifi.rst
+++ b/doc/connectivity/networking/api/wifi.rst
@@ -44,7 +44,7 @@ To initiate Wi-Fi connection, the following command can be used:
 
 .. code-block:: console
 
-    uart:~$ wifi connect -s <SSID> -k 7 -a anon -K whatever
+    uart:~$ wifi connect -s <SSID> -k 5 -a anon -K whatever
 
 Server certificate is also provided in the same directory for testing purposes.
 Any AAA server can be used for testing purposes, for example, ``FreeRADIUS`` or ``hostapd``.

From 245faecee9c9bdb05f7e287c83ccaa758149ce85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:47 +0100
Subject: [PATCH 1717/2913] Revert "[nrf fromtree] modules: hostap: fix DPP
 build error"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 89442c5f06bc500e7e3a4db707396fb508af0140.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_api.c | 2 +-
 modules/hostap/src/supp_api.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index af3df3c6278..21a830bd0b1 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -2056,6 +2056,7 @@ int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *pa
 	os_free(cmd);
 	return 0;
 }
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 int hapd_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params)
@@ -2089,4 +2090,3 @@ int hapd_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params)
 	return 0;
 }
 #endif /* CONFIG_WIFI_NM_HOSTAPD_AP */
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
diff --git a/modules/hostap/src/supp_api.h b/modules/hostap/src/supp_api.h
index 12298ad6544..37eb8e52bc4 100644
--- a/modules/hostap/src/supp_api.h
+++ b/modules/hostap/src/supp_api.h
@@ -277,6 +277,7 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
  * @return 0 for OK; -1 for ERROR
  */
 int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params);
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 /**
@@ -288,5 +289,4 @@ int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *pa
  */
 int hapd_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params);
 #endif /* CONFIG_WIFI_NM_HOSTAPD_AP */
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 #endif /* ZEPHYR_SUPP_MGMT_H */

From a7142ab05c02dfca49b0c736e93b57f2885cd0b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:47 +0100
Subject: [PATCH 1718/2913] Revert "[nrf fromtree] drivers: nrfwifi: Fix build
 error"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1b80c5c1250661f618d8946e477e118997419494.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/inc/fmac_main.h | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/wifi/nrfwifi/inc/fmac_main.h b/drivers/wifi/nrfwifi/inc/fmac_main.h
index 57d4b8b9df5..9eb98baa518 100644
--- a/drivers/wifi/nrfwifi/inc/fmac_main.h
+++ b/drivers/wifi/nrfwifi/inc/fmac_main.h
@@ -133,13 +133,7 @@ void set_tx_pwr_ceil_default(struct nrf_wifi_tx_pwr_ceil_params *pwr_ceil_params
 const char *nrf_wifi_get_drv_version(void);
 enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep);
 enum nrf_wifi_status nrf_wifi_fmac_dev_rem_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep);
-struct nrf_wifi_vif_ctx_zep *nrf_wifi_get_vif_ctx(struct net_if *iface);
-#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
-void nrf_wifi_rpu_recovery_cb(void *vif_ctx,
-		void *event_data,
-		unsigned int event_len);
-#endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
-#endif /* !CONFIG_NRF70_OFFLOADED_RAW_TX */
+#endif /* !CONFIG_NRF_WIFI_BUILD_ONLY_MODE */
 #ifdef CONFIG_NRF_WIFI_BUILD_ONLY_MODE
 inline enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx)
 {
@@ -150,4 +144,11 @@ inline enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx)
 #else
 enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx);
 #endif /* CONFIG_NRF_WIFI_BUILD_ONLY_MODE */
+#ifndef CONFIG_NRF70_OFFLOADED_RAW_TX
+struct nrf_wifi_vif_ctx_zep *nrf_wifi_get_vif_ctx(struct net_if *iface);
+#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
+void nrf_wifi_rpu_recovery_cb(void *vif_ctx,
+		void *event_data,
+		unsigned int event_len);
+#endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 #endif /* __ZEPHYR_FMAC_MAIN_H__ */

From c61018a17afb2865846e0f87d24011cd250dd423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:47 +0100
Subject: [PATCH 1719/2913] Revert "[nrf fromtree] samples: net: wifi: Enable
 nRF70 Util in nRF70 build"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6c01e7ecd5d6d849abcacc404cded25c653ce30b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/net/wifi/sample.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/samples/net/wifi/sample.yaml b/samples/net/wifi/sample.yaml
index e7ca553ecaf..1c106e4897a 100644
--- a/samples/net/wifi/sample.yaml
+++ b/samples/net/wifi/sample.yaml
@@ -64,7 +64,6 @@ tests:
       - nucleo_h723zg
   sample.net.wifi.nrf7002eb:
     extra_args:
-      - NRF70_UTIL=y
       - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
       - SHIELD=nrf7002eb
     platform_allow:

From 09b4d8d0ac7f9ae072ab82edb83ab382bf8b7a16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:47 +0100
Subject: [PATCH 1720/2913] Revert "[nrf fromtree] drivers: nrfwifi: Fix build
 errors when Util is enabled"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 461d6de02550932e960d073495cc4636167a6d5a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/wifi_util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/wifi_util.c b/drivers/wifi/nrfwifi/src/wifi_util.c
index 528c41fa184..cad5662f483 100644
--- a/drivers/wifi/nrfwifi/src/wifi_util.c
+++ b/drivers/wifi/nrfwifi/src/wifi_util.c
@@ -287,7 +287,7 @@ static int nrf_wifi_util_tx_stats(const struct shell *sh,
 
 	k_mutex_lock(&ctx->rpu_lock, K_FOREVER);
 	if (!ctx->rpu_ctx) {
-		shell_fprintf(sh,
+		shell_fprintf(shell,
 			      SHELL_ERROR,
 			      "RPU context not initialized\n");
 		ret = -ENOEXEC;
@@ -482,7 +482,7 @@ static int nrf_wifi_util_dump_rpu_stats(const struct shell *sh,
 
 	k_mutex_lock(&ctx->rpu_lock, K_FOREVER);
 	if (!ctx->rpu_ctx) {
-		shell_fprintf(sh,
+		shell_fprintf(shell,
 			      SHELL_ERROR,
 			      "RPU context not initialized\n");
 		ret = -ENOEXEC;

From 9f6bd00be6a0ae94494ac616cfec1fb872a2ff24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:47 +0100
Subject: [PATCH 1721/2913] Revert "[nrf fromtree] wifi_mgmt: Add support for
 configuring PS exit strategy"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6895c1287e305e29ca634ee545fa41519b54ee30.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/wifi.h       | 22 -----------------
 include/zephyr/net/wifi_mgmt.h  |  2 --
 subsys/net/l2/wifi/wifi_mgmt.c  | 19 ---------------
 subsys/net/l2/wifi/wifi_shell.c | 43 ---------------------------------
 4 files changed, 86 deletions(-)

diff --git a/include/zephyr/net/wifi.h b/include/zephyr/net/wifi.h
index 4612fe2b0b1..f8a2645f558 100644
--- a/include/zephyr/net/wifi.h
+++ b/include/zephyr/net/wifi.h
@@ -450,8 +450,6 @@ enum wifi_ps_param_type {
 	WIFI_PS_PARAM_WAKEUP_MODE,
 	/** Power save mode. */
 	WIFI_PS_PARAM_MODE,
-	/** Power save exit strategy. */
-	WIFI_PS_PARAM_EXIT_STRATEGY,
 	/** Power save timeout. */
 	WIFI_PS_PARAM_TIMEOUT,
 };
@@ -467,24 +465,6 @@ enum wifi_ps_wakeup_mode {
 /** Helper function to get user-friendly ps wakeup mode name. */
 const char *wifi_ps_wakeup_mode_txt(enum wifi_ps_wakeup_mode ps_wakeup_mode);
 
-/**
- * @brief Wi-Fi power save exit strategy
- */
-enum wifi_ps_exit_strategy {
-	/** PS-Poll frame based */
-	WIFI_PS_EXIT_CUSTOM_ALGO = 0,
-	/** QoS NULL frame based */
-	WIFI_PS_EXIT_EVERY_TIM,
-
-/** @cond INTERNAL_HIDDEN */
-	WIFI_PS_EXIT_LAST,
-	WIFI_PS_EXIT_MAX = WIFI_PS_EXIT_LAST - 1,
-/** @endcond */
-};
-
-/** Helper function to get user-friendly ps exit strategy name. */
-const char * const wifi_ps_exit_strategy_txt(enum wifi_ps_exit_strategy ps_exit_strategy);
-
 /** @brief Wi-Fi power save error codes. */
 enum wifi_config_ps_param_fail_reason {
 	/** Unspecified error */
@@ -501,8 +481,6 @@ enum wifi_config_ps_param_fail_reason {
 	WIFI_PS_PARAM_FAIL_DEVICE_CONNECTED,
 	/** Listen interval out of range */
 	WIFI_PS_PARAM_LISTEN_INTERVAL_RANGE_INVALID,
-	/** Invalid exit strategy */
-	WIFI_PS_PARAM_FAIL_INVALID_EXIT_STRATEGY,
 };
 
 /** @cond INTERNAL_HIDDEN */
diff --git a/include/zephyr/net/wifi_mgmt.h b/include/zephyr/net/wifi_mgmt.h
index dcf6e7001d0..467880c56ec 100644
--- a/include/zephyr/net/wifi_mgmt.h
+++ b/include/zephyr/net/wifi_mgmt.h
@@ -602,8 +602,6 @@ struct wifi_ps_params {
 	enum wifi_ps_param_type type;
 	/** Wi-Fi power save fail reason */
 	enum wifi_config_ps_param_fail_reason fail_reason;
-	/** Wi-Fi power save exit strategy */
-	enum wifi_ps_exit_strategy exit_strategy;
 };
 
 /** @brief Wi-Fi TWT parameters */
diff --git a/subsys/net/l2/wifi/wifi_mgmt.c b/subsys/net/l2/wifi/wifi_mgmt.c
index 6e0de6f42b8..1580d2f8486 100644
--- a/subsys/net/l2/wifi/wifi_mgmt.c
+++ b/subsys/net/l2/wifi/wifi_mgmt.c
@@ -240,18 +240,6 @@ const char *wifi_ps_wakeup_mode_txt(enum wifi_ps_wakeup_mode ps_wakeup_mode)
 	}
 }
 
-const char * const wifi_ps_exit_strategy_txt(enum wifi_ps_exit_strategy ps_exit_strategy)
-{
-	switch (ps_exit_strategy) {
-	case WIFI_PS_EXIT_EVERY_TIM:
-		return "Every TIM";
-	case WIFI_PS_EXIT_CUSTOM_ALGO:
-		return "Custom algorithm";
-	default:
-		return "UNKNOWN";
-	}
-}
-
 static const struct wifi_mgmt_ops *const get_wifi_api(struct net_if *iface)
 {
 	const struct device *dev = net_if_get_device(iface);
@@ -582,13 +570,6 @@ static int wifi_set_power_save(uint32_t mgmt_request, struct net_if *iface,
 	case WIFI_PS_PARAM_WAKEUP_MODE:
 	case WIFI_PS_PARAM_TIMEOUT:
 		break;
-	case WIFI_PS_PARAM_EXIT_STRATEGY:
-		if (ps_params->exit_strategy > WIFI_PS_EXIT_MAX) {
-			ps_params->fail_reason =
-				WIFI_PS_PARAM_FAIL_INVALID_EXIT_STRATEGY;
-			return -EINVAL;
-		}
-	break;
 	default:
 		ps_params->fail_reason =
 			WIFI_PS_PARAM_FAIL_OPERATION_NOT_SUPPORTED;
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index fb35d11806d..64bee4035ae 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -1062,9 +1062,6 @@ static int cmd_wifi_ps(const struct shell *sh, size_t argc, char *argv[])
 			PR("PS timeout: disabled\n");
 		}
 
-		shell_fprintf(sh, SHELL_NORMAL, "PS exit strategy: %s\n",
-				wifi_ps_exit_strategy_txt(config.ps_params.exit_strategy));
-
 		if (config.num_twt_flows == 0) {
 			PR("No TWT flows\n");
 		} else {
@@ -1780,40 +1777,6 @@ static int cmd_wifi_set_rts_threshold(const struct shell *sh, size_t argc, char
 	return 0;
 }
 
-static int cmd_wifi_ps_exit_strategy(const struct shell *sh, size_t argc,
-			    char *argv[])
-{
-	struct net_if *iface = net_if_get_first_wifi();
-	struct wifi_ps_params params = { 0 };
-
-	context.sh = sh;
-
-	if (!strncmp(argv[1], "tim", 3)) {
-		params.exit_strategy = WIFI_PS_EXIT_EVERY_TIM;
-	} else if (!strncmp(argv[1], "custom", 6)) {
-		params.exit_strategy = WIFI_PS_EXIT_CUSTOM_ALGO;
-	} else {
-		shell_fprintf(sh, SHELL_WARNING, "Invalid argument\n");
-		shell_fprintf(sh, SHELL_INFO, "Valid argument : <tim> / <custom>\n");
-		return -ENOEXEC;
-	}
-
-	params.type = WIFI_PS_PARAM_EXIT_STRATEGY;
-
-	if (net_mgmt(NET_REQUEST_WIFI_PS, iface, &params, sizeof(params))) {
-		shell_fprintf(sh, SHELL_WARNING,
-			      "Setting PS exit strategy to %s failed..Reason :%s\n",
-			      wifi_ps_exit_strategy_txt(params.exit_strategy),
-			      wifi_ps_get_config_err_code_str(params.fail_reason));
-		return -ENOEXEC;
-	}
-
-	shell_fprintf(sh, SHELL_NORMAL, "%s\n",
-		      wifi_ps_exit_strategy_txt(params.exit_strategy));
-
-	return 0;
-}
-
 void parse_mode_args_to_params(const struct shell *sh, int argc,
 			       char *argv[], struct wifi_mode_info *mode,
 			       bool *do_mode_oper)
@@ -2973,12 +2936,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
 	SHELL_SUBCMD_SET_END
 );
 
-SHELL_SUBCMD_ADD((wifi), ps_exit_strategy, &wifi_commands,
-		 "<tim> : Set PS exit strategy to Every TIM\n"
-		 "<custom> : Set PS exit strategy to Custom",
-		 cmd_wifi_ps_exit_strategy,
-		 2, 0);
-
 SHELL_CMD_REGISTER(wifi, &wifi_commands, "Wi-Fi commands", NULL);
 
 static int wifi_shell_init(void)

From 4bb83ad3ef76b8fb92456eaac19a838a91a2c5d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:47 +0100
Subject: [PATCH 1722/2913] Revert "[nrf fromtree] drivers: wifi: Fix mutex
 re-initialization"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6a05274420601096f1fd6c7340fa88d1d6980b98.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/fmac_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c
index 4778111579e..ca5782a1ee7 100644
--- a/drivers/wifi/nrfwifi/src/fmac_main.c
+++ b/drivers/wifi/nrfwifi/src/fmac_main.c
@@ -656,6 +656,8 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv
 		goto err;
 	}
 
+	k_mutex_init(&rpu_ctx_zep->rpu_lock);
+
 	return status;
 err:
 	if (rpu_ctx) {
@@ -814,7 +816,6 @@ static int nrf_wifi_drv_main_zep(const struct device *dev)
 			      nrf_wifi_scan_timeout_work);
 #endif /* CONFIG_NRF70_RADIO_TEST */
 
-	k_mutex_init(&rpu_drv_priv_zep.rpu_ctx_zep.rpu_lock);
 	return 0;
 #ifdef CONFIG_NRF70_RADIO_TEST
 fmac_deinit:

From 46c997bce9c1b861165d2b767caaacb528325321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:48 +0100
Subject: [PATCH 1723/2913] Revert "[nrf fromtree] drivers: wifi: Fix missing
 unlock for stats"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9e94331db41bd4265f2cf19a3c1fabb6be3bbeb0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/wifi_util.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/src/wifi_util.c b/drivers/wifi/nrfwifi/src/wifi_util.c
index cad5662f483..2e514ea6719 100644
--- a/drivers/wifi/nrfwifi/src/wifi_util.c
+++ b/drivers/wifi/nrfwifi/src/wifi_util.c
@@ -873,7 +873,6 @@ static int nrf_wifi_util_dump_rpu_stats(const struct shell *sh,
 
 	ret = 0;
 unlock:
-	k_mutex_unlock(&ctx->rpu_lock);
 	return ret;
 }
 #endif /* !CONFIG_NRF70_RADIO_TEST && !CONFIG_NRF70_OFFLOADED_RAW_TX */

From e5482c6dec7a62f1cd22bafc8d4a63518d54a8c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:48 +0100
Subject: [PATCH 1724/2913] Revert "[nrf fromtree] drivers: wifi: Fix crash
 when recovery is triggered"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a3a0742a91d059f6f70d76bf9dc7124f0c72ce8c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/wifi_util.c | 42 ++++------------------------
 1 file changed, 5 insertions(+), 37 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/wifi_util.c b/drivers/wifi/nrfwifi/src/wifi_util.c
index 2e514ea6719..c5e2a8dedfa 100644
--- a/drivers/wifi/nrfwifi/src/wifi_util.c
+++ b/drivers/wifi/nrfwifi/src/wifi_util.c
@@ -273,7 +273,6 @@ static int nrf_wifi_util_tx_stats(const struct shell *sh,
 	void *queue = NULL;
 	unsigned int tx_pending_pkts = 0;
 	struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
-	int ret;
 
 	vif_index = atoi(argv[1]);
 	if ((vif_index < 0) || (vif_index >= max_vif_index)) {
@@ -285,15 +284,6 @@ static int nrf_wifi_util_tx_stats(const struct shell *sh,
 		return -ENOEXEC;
 	}
 
-	k_mutex_lock(&ctx->rpu_lock, K_FOREVER);
-	if (!ctx->rpu_ctx) {
-		shell_fprintf(shell,
-			      SHELL_ERROR,
-			      "RPU context not initialized\n");
-		ret = -ENOEXEC;
-		goto unlock;
-	}
-
 	fmac_dev_ctx = ctx->rpu_ctx;
 	def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
 
@@ -316,11 +306,7 @@ static int nrf_wifi_util_tx_stats(const struct shell *sh,
 			tx_pending_pkts);
 	}
 
-	ret = 0;
-
-unlock:
-	k_mutex_unlock(&ctx->rpu_lock);
-	return ret;
+	return 0;
 }
 #endif /* CONFIG_NRF70_STA_MODE */
 
@@ -458,7 +444,6 @@ static int nrf_wifi_util_dump_rpu_stats(const struct shell *sh,
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
 	struct rpu_op_stats stats;
 	enum rpu_stats_type stats_type = RPU_STATS_TYPE_ALL;
-	int ret;
 
 	if (argc == 2) {
 		const char *type  = argv[1];
@@ -480,14 +465,6 @@ static int nrf_wifi_util_dump_rpu_stats(const struct shell *sh,
 		}
 	}
 
-	k_mutex_lock(&ctx->rpu_lock, K_FOREVER);
-	if (!ctx->rpu_ctx) {
-		shell_fprintf(shell,
-			      SHELL_ERROR,
-			      "RPU context not initialized\n");
-		ret = -ENOEXEC;
-		goto unlock;
-	}
 	fmac_dev_ctx = ctx->rpu_ctx;
 
 	memset(&stats, 0, sizeof(struct rpu_op_stats));
@@ -497,8 +474,7 @@ static int nrf_wifi_util_dump_rpu_stats(const struct shell *sh,
 		shell_fprintf(sh,
 			      SHELL_ERROR,
 			      "Failed to get stats\n");
-		ret = -ENOEXEC;
-		goto unlock;
+		return -ENOEXEC;
 	}
 
 	if (stats_type == RPU_STATS_TYPE_UMAC || stats_type == RPU_STATS_TYPE_ALL) {
@@ -871,9 +847,7 @@ static int nrf_wifi_util_dump_rpu_stats(const struct shell *sh,
 				  phy->dsss_crc32_fail_cnt);
 	}
 
-	ret = 0;
-unlock:
-	return ret;
+	return 0;
 }
 #endif /* !CONFIG_NRF70_RADIO_TEST && !CONFIG_NRF70_OFFLOADED_RAW_TX */
 
@@ -884,15 +858,12 @@ static int nrf_wifi_util_trigger_rpu_recovery(const struct shell *sh,
 {
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
-	int ret;
 
-	k_mutex_lock(&ctx->rpu_lock, K_FOREVER);
 	if (!ctx || !ctx->rpu_ctx) {
 		shell_fprintf(sh,
 			      SHELL_ERROR,
 			      "RPU context not initialized\n");
-		ret = -ENOEXEC;
-		goto unlock;
+		return -ENOEXEC;
 	}
 
 	fmac_dev_ctx = ctx->rpu_ctx;
@@ -909,10 +880,7 @@ static int nrf_wifi_util_trigger_rpu_recovery(const struct shell *sh,
 		      SHELL_INFO,
 		      "RPU recovery triggered\n");
 
-	ret = 0;
-unlock:
-	k_mutex_unlock(&ctx->rpu_lock);
-	return ret;
+	return 0;
 }
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 

From a5697c1ec033fddba6d40b0932fd9622dfe5ed18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:48 +0100
Subject: [PATCH 1725/2913] Revert "[nrf fromtree] drivers: wifi: Add PS exit
 strategy runtime configuration"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit efb4c8f076fa6fa89d9c527e8e9c01be79c7a150.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/CMakeLists.txt  |  1 -
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 20 --------------------
 drivers/wifi/nrfwifi/src/wifi_mgmt.c | 23 -----------------------
 3 files changed, 44 deletions(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 41611af08a1..14f3080d1a4 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -338,5 +338,4 @@ zephyr_compile_definitions(
   -DNRF70_ANT_GAIN_5G_BAND1=${CONFIG_NRF70_ANT_GAIN_5G_BAND1}
   -DNRF70_ANT_GAIN_5G_BAND2=${CONFIG_NRF70_ANT_GAIN_5G_BAND2}
   -DNRF70_ANT_GAIN_5G_BAND3=${CONFIG_NRF70_ANT_GAIN_5G_BAND3}
-  -DNRF_WIFI_PS_INT_PS=${CONFIG_NRF_WIFI_PS_INT_PS}
 )
diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index b409261b614..c4b619315b3 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -795,24 +795,4 @@ config NRF_WIFI_KEEPALIVE_PERIOD_S
 	  Keepalive period in seconds to send keepalive packets to the AP.
 endif
 
-choice NRF_WIFI_PS_EXIT_STRATEGY
-	prompt "Power save exit strategy"
-	default NRF_WIFI_PS_INT_PS
-	help
-	  Select the power save exit strategy to retrieve buffered data from AP.
-
-config NRF_WIFI_PS_EXIT_EVERY_TIM
-	bool "Exit power save every time to retrieve buffered data from AP"
-	help
-	  Exit power save every time to retrieve buffered data from AP. Entering back to
-	  power save mode might take some time and power.
-
-config NRF_WIFI_PS_INT_PS
-	bool "Exit power save based on an intelligent algorithm"
-	help
-	  Exit power save based on an intelligent algorithm to retrieve buffered data from AP.
-	  The algorithm tracks the buffered data at the AP and then dynamically decides
-	  whether to stay in PS (for lower amount of buffered data) or exit PS (for higher
-	  amount of buffered data).
-endchoice
 endif # WIFI_NRF70
diff --git a/drivers/wifi/nrfwifi/src/wifi_mgmt.c b/drivers/wifi/nrfwifi/src/wifi_mgmt.c
index 65f6c217bfe..6232ad245cd 100644
--- a/drivers/wifi/nrfwifi/src/wifi_mgmt.c
+++ b/drivers/wifi/nrfwifi/src/wifi_mgmt.c
@@ -115,24 +115,6 @@ int nrf_wifi_set_power_save(const struct device *dev,
 							vif_ctx_zep->vif_idx,
 							params->wakeup_mode);
 	break;
-	case WIFI_PS_PARAM_EXIT_STRATEGY:
-		unsigned int exit_strategy;
-
-		if (params->exit_strategy == WIFI_PS_EXIT_EVERY_TIM) {
-			exit_strategy = EVERY_TIM;
-		} else if (params->exit_strategy == WIFI_PS_EXIT_CUSTOM_ALGO) {
-			exit_strategy = INT_PS;
-		} else {
-			params->fail_reason =
-				WIFI_PS_PARAM_FAIL_INVALID_EXIT_STRATEGY;
-			return -EINVAL;
-		}
-
-		status = nrf_wifi_fmac_set_ps_exit_strategy(
-							rpu_ctx_zep->rpu_ctx,
-							vif_ctx_zep->vif_idx,
-							exit_strategy);
-	break;
 	default:
 		params->fail_reason =
 			WIFI_PS_PARAM_FAIL_CMD_EXEC_FAIL;
@@ -397,11 +379,6 @@ void nrf_wifi_event_proc_get_power_save_info(void *vif_ctx,
 	vif_ctx_zep->ps_info->ps_params.timeout_ms = ps_info->ps_timeout;
 	vif_ctx_zep->ps_info->ps_params.listen_interval = ps_info->listen_interval;
 	vif_ctx_zep->ps_info->ps_params.wakeup_mode = ps_info->extended_ps;
-	if (ps_info->ps_exit_strategy == EVERY_TIM) {
-		vif_ctx_zep->ps_info->ps_params.exit_strategy = WIFI_PS_EXIT_EVERY_TIM;
-	} else if (ps_info->ps_exit_strategy == INT_PS) {
-		vif_ctx_zep->ps_info->ps_params.exit_strategy = WIFI_PS_EXIT_CUSTOM_ALGO;
-	}
 
 	for (int i = 0; i < ps_info->num_twt_flows; i++) {
 		struct twt_interval_float twt_interval_fp;

From 99706539426820989e751dbfbd8a396dedafcf93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:48 +0100
Subject: [PATCH 1726/2913] Revert "[nrf fromtree] drivers: wifi: Use mutex for
 spinlock"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 01f3e58db73b5ab7664c61998b9346c42ba10856.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/shim.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/shim.c b/drivers/wifi/nrfwifi/src/shim.c
index 93cafa905c2..9c6c117ddfb 100644
--- a/drivers/wifi/nrfwifi/src/shim.c
+++ b/drivers/wifi/nrfwifi/src/shim.c
@@ -116,7 +116,7 @@ static void zep_shim_qspi_cpy_to(void *priv, unsigned long addr, const void *src
 
 static void *zep_shim_spinlock_alloc(void)
 {
-	struct k_mutex *lock = NULL;
+	struct k_sem *lock = NULL;
 
 	lock = k_malloc(sizeof(*lock));
 
@@ -134,29 +134,27 @@ static void zep_shim_spinlock_free(void *lock)
 
 static void zep_shim_spinlock_init(void *lock)
 {
-	k_mutex_init(lock);
+	k_sem_init(lock, 1, 1);
 }
 
 static void zep_shim_spinlock_take(void *lock)
 {
-	k_mutex_lock(lock, K_FOREVER);
+	k_sem_take(lock, K_FOREVER);
 }
 
 static void zep_shim_spinlock_rel(void *lock)
 {
-	k_mutex_unlock(lock);
+	k_sem_give(lock);
 }
 
 static void zep_shim_spinlock_irq_take(void *lock, unsigned long *flags)
 {
-	ARG_UNUSED(flags);
-	k_mutex_lock(lock, K_FOREVER);
+	k_sem_take(lock, K_FOREVER);
 }
 
 static void zep_shim_spinlock_irq_rel(void *lock, unsigned long *flags)
 {
-	ARG_UNUSED(flags);
-	k_mutex_unlock(lock);
+	k_sem_give(lock);
 }
 
 static int zep_shim_pr_dbg(const char *fmt, va_list args)

From 66230e74d027117b0813b437355b6473c48647f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:48 +0100
Subject: [PATCH 1727/2913] Revert "[nrf fromtree] drivers: wifi: Fix shell
 hang"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 618fb597401791eb55f6a16edfdb3d411967231e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/shim.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/shim.c b/drivers/wifi/nrfwifi/src/shim.c
index 9c6c117ddfb..d0379a6d1f5 100644
--- a/drivers/wifi/nrfwifi/src/shim.c
+++ b/drivers/wifi/nrfwifi/src/shim.c
@@ -751,11 +751,6 @@ static void irq_work_handler(struct k_work *work)
 {
 	int ret = 0;
 
-	if (!intr_priv || !intr_priv->callbk_fn || !intr_priv->callbk_data) {
-		LOG_ERR("%s: Invalid intr_priv handler", __func__);
-		return;
-	}
-
 	ret = intr_priv->callbk_fn(intr_priv->callbk_data);
 
 	if (ret) {
@@ -771,11 +766,6 @@ static void zep_shim_irq_handler(const struct device *dev, struct gpio_callback
 	ARG_UNUSED(cb);
 	ARG_UNUSED(pins);
 
-	if (!(intr_priv && intr_priv->callbk_fn && intr_priv->callbk_data)) {
-		LOG_ERR("%s: Invalid intr_priv", __func__);
-		return;
-	}
-
 	k_work_schedule_for_queue(&zep_wifi_intr_q, &intr_priv->work, K_NO_WAIT);
 }
 

From 14cc2380a76e2c8d00dc38756a4914dc228abc07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:48 +0100
Subject: [PATCH 1728/2913] Revert "[nrf fromtree] drivers: wifi: Add support
 for keepalive"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 02fc26cb0caa7b8023bbc08c55fd5b953c3087fe.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/CMakeLists.txt  |  8 --------
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 18 ------------------
 2 files changed, 26 deletions(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 14f3080d1a4..933be3603a5 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -289,14 +289,6 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_MGMT_BUFF_OFFLOAD
   -DNRF_WIFI_MGMT_BUFF_OFFLOAD
 )
 
-zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_FEAT_KEEPALIVE
-  -DNRF_WIFI_FEAT_KEEPALIVE
-)
-
-zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_FEAT_KEEPALIVE
-  -DNRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}
-)
-
 zephyr_compile_definitions(
   -DNRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
   -DNRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}
diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index c4b619315b3..5814548cb20 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -777,22 +777,4 @@ config NRF_WIFI_MGMT_BUFF_OFFLOAD
 	  having to exchange commands and events for every management packet even if it is
 	  consumed by UMAC.
 
-config NRF_WIFI_FEAT_KEEPALIVE
-	bool "Wi-Fi keepalive feature for connection maintenance"
-	depends on NRF70_STA_MODE
-	help
-	  Enable Wi-Fi keepalive feature to keep the connection alive by sending
-	  keepalive packets to the AP. Primarily intended to interoperate with APs
-	  that disconnect idle clients without any explicit checks. Slightly increases
-	  power consumption.
-
-if NRF_WIFI_FEAT_KEEPALIVE
-config NRF_WIFI_KEEPALIVE_PERIOD_S
-	int "Keepalive period in seconds"
-	range 30 3600
-	default 60
-	help
-	  Keepalive period in seconds to send keepalive packets to the AP.
-endif
-
 endif # WIFI_NRF70

From 719b2348985e5a427218a048f79e08cbdf614ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:48 +0100
Subject: [PATCH 1729/2913] Revert "[nrf fromtree] drivers: wifi: Increase
 default PS active timeout interval"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f0e8cea70ba7037f95f6a6eb42ba6336d07820e6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 5814548cb20..5403ecdf83f 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -690,7 +690,7 @@ config NRF_WIFI_RPU_RECOVERY_PROPAGATION_DELAY_MS
 
 config NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS
 	int "RPU recovery power save active timeout in milliseconds"
-	default 50000
+	default 10000
 	help
 	  Power save active timeout in milliseconds after which RPU recovery
 	  mechanism will be triggered. This timeout is used to ensure that the

From ce85a46bc3a462cbb00a5bbe6fe5174812a368f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:48 +0100
Subject: [PATCH 1730/2913] Revert "[nrf fromtree] drivers: wifi: Enable
 management buffers offload"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit aacbb8ca6ba8533518043d92e21abcab352a3c2e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/CMakeLists.txt  | 4 ----
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 8 --------
 2 files changed, 12 deletions(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 933be3603a5..5ea9da5825e 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -285,10 +285,6 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF70_AP_MODE
   -DNRF70_AP_MODE
 )
 
-zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_MGMT_BUFF_OFFLOAD
-  -DNRF_WIFI_MGMT_BUFF_OFFLOAD
-)
-
 zephyr_compile_definitions(
   -DNRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
   -DNRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}
diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 5403ecdf83f..edf1049a0e8 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -769,12 +769,4 @@ config NRF_WIFI_QOS_NULL_BASED_RETRIEVAL
 
 endchoice
 
-config NRF_WIFI_MGMT_BUFF_OFFLOAD
-	bool "management buffer offload"
-	default y
-	help
-	  This option offloads the refilling of management buffers to UMAC, saves host
-	  having to exchange commands and events for every management packet even if it is
-	  consumed by UMAC.
-
 endif # WIFI_NRF70

From 57c6c142c4d23ce026dd02763fd973928a3379e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:48 +0100
Subject: [PATCH 1731/2913] Revert "[nrf fromtree] drivers: wifi: Add PS state
 debugs"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a1daf4a3e7ee024c09f7e18aa7621f8594f37f77.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index edf1049a0e8..07b286ebdf0 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -731,13 +731,6 @@ config NRF_WIFI_RPU_RECOVERY_RETRY_WINDOW_S
 	  retries are counted. If the number of consecutive RPU recovery retries
 	  exceeds NRF_WIFI_RPU_RECOVERY_MAX_RETRIES within this window, the system
 	  will be reset.
-
-config NRF_WIFI_RPU_RECOVERY_PS_STATE_DEBUG
-	bool "RPU recovery power save state debug logs"
-	help
-	  Enable RPU recovery power save state debug logs to help debug RPU recovery mechanism.
-
-
 endif # NRF_WIFI_RPU_RECOVERY
 
 config NRF_WIFI_FEAT_WMM

From 8079d3abc9e52bf6403f8b371579cafade4cd63b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:48 +0100
Subject: [PATCH 1732/2913] Revert "[nrf fromtree] drivers: wifi: Fix TX
 buffers leak"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d097420afa6d18a17890b5864105a8746cf7bcae.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/shim.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/shim.c b/drivers/wifi/nrfwifi/src/shim.c
index d0379a6d1f5..9f8b065ead0 100644
--- a/drivers/wifi/nrfwifi/src/shim.c
+++ b/drivers/wifi/nrfwifi/src/shim.c
@@ -235,10 +235,6 @@ static void *zep_shim_nbuf_alloc(unsigned int size)
 
 static void zep_shim_nbuf_free(void *nbuf)
 {
-	if (!nbuf) {
-		return;
-	}
-
 	k_free(((struct nwb *)nbuf)->priv);
 	k_free(nbuf);
 }

From 729180cbc6dde3f1ed53a81c02b429d7293c526d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:48 +0100
Subject: [PATCH 1733/2913] Revert "[nrf fromtree] drivers: wifi: Fix RPU
 recovery disabled build failures"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3e55f425ed27ea86abfaead57b419b4ab38c5f95.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 1 -
 drivers/wifi/nrfwifi/inc/fmac_main.h | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 07b286ebdf0..003123bdbad 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -655,7 +655,6 @@ config NRF_WIFI_AP_DEAD_DETECT_TIMEOUT
 
 config NRF_WIFI_RPU_RECOVERY
 	bool "RPU recovery mechanism"
-	depends on NRF_WIFI_LOW_POWER
 	select EXPERIMENTAL
 	help
 		Enable RPU recovery mechanism to recover from RPU (nRF70) hang.
diff --git a/drivers/wifi/nrfwifi/inc/fmac_main.h b/drivers/wifi/nrfwifi/inc/fmac_main.h
index 9eb98baa518..24453a4c34f 100644
--- a/drivers/wifi/nrfwifi/inc/fmac_main.h
+++ b/drivers/wifi/nrfwifi/inc/fmac_main.h
@@ -146,9 +146,8 @@ enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx);
 #endif /* CONFIG_NRF_WIFI_BUILD_ONLY_MODE */
 #ifndef CONFIG_NRF70_OFFLOADED_RAW_TX
 struct nrf_wifi_vif_ctx_zep *nrf_wifi_get_vif_ctx(struct net_if *iface);
-#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
 void nrf_wifi_rpu_recovery_cb(void *vif_ctx,
 		void *event_data,
 		unsigned int event_len);
-#endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
+#endif /* !CONFIG_NRF_WIFI_BUILD_ONLY_MODE */
 #endif /* __ZEPHYR_FMAC_MAIN_H__ */

From 0ad00b2557b567758efc926e2559c5732d64ef39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:48 +0100
Subject: [PATCH 1734/2913] Revert "[nrf fromtree] drivers: wifi: Add RPU
 recovery retry mechanism"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e2292255ff1505f60db4ec486256b0675a3a6564.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 16 ----------------
 drivers/wifi/nrfwifi/inc/fmac_main.h |  1 -
 drivers/wifi/nrfwifi/src/net_if.c    | 18 +-----------------
 3 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 003123bdbad..e5c5e77c8f8 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -714,22 +714,6 @@ config NRF_WIFI_RPU_RECOVERY_QUIET_PERIOD_MS
 	help
 	  Quiet period in milliseconds after RPU recovery is triggered. During
 	  this period, no new RPU recovery will be triggered.
-
-config NRF_WIFI_RPU_RECOVERY_MAX_RETRIES
-	int "Maximum number of consecutive RPU recovery retries, 0 to disable"
-	default 0
-	help
-	  Maximum number of consecutive RPU recovery retries before giving up
-	  and resetting the system. Set to 0 to keep retrying indefinitely.
-
-config NRF_WIFI_RPU_RECOVERY_RETRY_WINDOW_S
-	int "RPU recovery retry window in seconds"
-	default 900
-	help
-	  Window in seconds during which the number of consecutive RPU recovery
-	  retries are counted. If the number of consecutive RPU recovery retries
-	  exceeds NRF_WIFI_RPU_RECOVERY_MAX_RETRIES within this window, the system
-	  will be reset.
 endif # NRF_WIFI_RPU_RECOVERY
 
 config NRF_WIFI_FEAT_WMM
diff --git a/drivers/wifi/nrfwifi/inc/fmac_main.h b/drivers/wifi/nrfwifi/inc/fmac_main.h
index 24453a4c34f..bcdae7161e7 100644
--- a/drivers/wifi/nrfwifi/inc/fmac_main.h
+++ b/drivers/wifi/nrfwifi/inc/fmac_main.h
@@ -112,7 +112,6 @@ struct nrf_wifi_ctx_zep {
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
 	bool rpu_recovery_in_progress;
 	unsigned long last_rpu_recovery_time_ms;
-	unsigned int rpu_recovery_retries;
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 };
 
diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
index 81369186533..9bcd772d903 100644
--- a/drivers/wifi/nrfwifi/src/net_if.c
+++ b/drivers/wifi/nrfwifi/src/net_if.c
@@ -18,8 +18,6 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 
-#include <zephyr/sys/reboot.h>
-
 #include "net_private.h"
 
 #include "util.h"
@@ -113,27 +111,13 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 		return;
 	}
 
+
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 	LOG_ERR("%s: Starting RPU recovery", __func__);
 #else
 	LOG_DBG("%s: Starting RPU recovery", __func__);
 #endif
 	k_mutex_lock(&rpu_ctx_zep->rpu_lock, K_FOREVER);
-#if CONFIG_NRF_WIFI_RPU_RECOVERY_MAX_RETRIES > 0
-	if (!rpu_ctx_zep->last_rpu_recovery_time_ms ||
-		(k_uptime_get() - rpu_ctx_zep->last_rpu_recovery_time_ms) <
-	    CONFIG_NRF_WIFI_RPU_RECOVERY_RETRY_WINDOW_S * MSEC_PER_SEC) {
-		if (rpu_ctx_zep->rpu_recovery_retries >=
-		    CONFIG_NRF_WIFI_RPU_RECOVERY_MAX_RETRIES) {
-			LOG_ERR("%s: Maximum recovery retries reached, rebooting system",
-				__func__);
-			sys_reboot(SYS_REBOOT_COLD);
-		}
-		rpu_ctx_zep->rpu_recovery_retries++;
-	} else {
-		rpu_ctx_zep->rpu_recovery_retries = 0;
-	}
-#endif
 	rpu_ctx_zep->rpu_recovery_in_progress = true;
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 	LOG_ERR("%s: Bringing the interface down", __func__);

From 03c162148b5ac23a2fa93cd232c0a8e1e0b97fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:48 +0100
Subject: [PATCH 1735/2913] Revert "[nrf fromtree] drivers: wifi: Fix the NULL
 check"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8e804e14b21df3395c7791106eb49d882a866616.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/fmac_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c
index ca5782a1ee7..5c0e4f336e6 100644
--- a/drivers/wifi/nrfwifi/src/fmac_main.c
+++ b/drivers/wifi/nrfwifi/src/fmac_main.c
@@ -252,7 +252,7 @@ static void nrf_wifi_process_rssi_from_rx(void *vif_ctx,
 
 	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
 
-	if (!(rpu_ctx_zep && rpu_ctx_zep->rpu_ctx)) {
+	if (!rpu_ctx_zep) {
 		LOG_ERR("%s: rpu_ctx_zep is NULL", __func__);
 		return;
 	}

From 04df8a70775976e3f84f3fa869764409da1ec44d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:48 +0100
Subject: [PATCH 1736/2913] Revert "[nrf fromtree] drivers: wifi: Add quiet
 period for RPU recovery"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f896425368e97d3ee25ad4553a6d6fc3a5c06010.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi |  6 ------
 drivers/wifi/nrfwifi/inc/fmac_main.h |  1 -
 drivers/wifi/nrfwifi/src/net_if.c    | 15 ---------------
 3 files changed, 22 deletions(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index e5c5e77c8f8..8906a22a5e8 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -708,12 +708,6 @@ config NRF_WIFI_RPU_RECOVERY_DEBUG
 	help
 		Enable RPU recovery debug logs to help debug RPU recovery mechanism.
 
-config NRF_WIFI_RPU_RECOVERY_QUIET_PERIOD_MS
-	int "RPU recovery quiet period in milliseconds"
-	default 5000
-	help
-	  Quiet period in milliseconds after RPU recovery is triggered. During
-	  this period, no new RPU recovery will be triggered.
 endif # NRF_WIFI_RPU_RECOVERY
 
 config NRF_WIFI_FEAT_WMM
diff --git a/drivers/wifi/nrfwifi/inc/fmac_main.h b/drivers/wifi/nrfwifi/inc/fmac_main.h
index bcdae7161e7..88dbd960044 100644
--- a/drivers/wifi/nrfwifi/inc/fmac_main.h
+++ b/drivers/wifi/nrfwifi/inc/fmac_main.h
@@ -111,7 +111,6 @@ struct nrf_wifi_ctx_zep {
 	struct k_mutex rpu_lock;
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
 	bool rpu_recovery_in_progress;
-	unsigned long last_rpu_recovery_time_ms;
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 };
 
diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
index 9bcd772d903..b4e5748dda9 100644
--- a/drivers/wifi/nrfwifi/src/net_if.c
+++ b/drivers/wifi/nrfwifi/src/net_if.c
@@ -98,20 +98,6 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 		return;
 	}
 
-	if (rpu_ctx_zep->last_rpu_recovery_time_ms &&
-		((k_uptime_get() - rpu_ctx_zep->last_rpu_recovery_time_ms) <
-	    CONFIG_NRF_WIFI_RPU_RECOVERY_QUIET_PERIOD_MS)) {
-#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
-		LOG_ERR("%s: In quiet period (last_rpu_recovery_time_ms=%ld), ignoring",
-			__func__, rpu_ctx_zep->last_rpu_recovery_time_ms);
-#else
-		LOG_DBG("%s: In quiet period (last_rpu_recovery_time_ms=%ld), ignoring",
-			__func__, rpu_ctx_zep->last_rpu_recovery_time_ms);
-#endif
-		return;
-	}
-
-
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 	LOG_ERR("%s: Starting RPU recovery", __func__);
 #else
@@ -141,7 +127,6 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 		LOG_ERR("%s: net_if_up failed: %d", __func__, ret);
 	}
 	rpu_ctx_zep->rpu_recovery_in_progress = false;
-	rpu_ctx_zep->last_rpu_recovery_time_ms = k_uptime_get();
 	k_mutex_unlock(&rpu_ctx_zep->rpu_lock);
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 	LOG_ERR("%s: RPU recovery done", __func__);

From e4ec801b99cd5fe413f4616c38d5166473cb16ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:49 +0100
Subject: [PATCH 1737/2913] Revert "[nrf fromtree] drivers: wifi: Ignore
 parallel recovery requests"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c2a13fa32b05506af486e5ed32e8ee34e02be497.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/inc/fmac_main.h |  3 ---
 drivers/wifi/nrfwifi/src/net_if.c    | 11 -----------
 2 files changed, 14 deletions(-)

diff --git a/drivers/wifi/nrfwifi/inc/fmac_main.h b/drivers/wifi/nrfwifi/inc/fmac_main.h
index 88dbd960044..c11d32c487a 100644
--- a/drivers/wifi/nrfwifi/inc/fmac_main.h
+++ b/drivers/wifi/nrfwifi/inc/fmac_main.h
@@ -109,9 +109,6 @@ struct nrf_wifi_ctx_zep {
 	unsigned char *extended_capa, *extended_capa_mask;
 	unsigned int extended_capa_len;
 	struct k_mutex rpu_lock;
-#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
-	bool rpu_recovery_in_progress;
-#endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 };
 
 struct nrf_wifi_drv_priv_zep {
diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
index b4e5748dda9..3170b67b975 100644
--- a/drivers/wifi/nrfwifi/src/net_if.c
+++ b/drivers/wifi/nrfwifi/src/net_if.c
@@ -89,22 +89,12 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 		return;
 	}
 
-	if (rpu_ctx_zep->rpu_recovery_in_progress) {
-#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
-		LOG_ERR("%s: RPU recovery already in progress", __func__);
-#else
-		LOG_DBG("%s: RPU recovery already in progress", __func__);
-#endif
-		return;
-	}
-
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 	LOG_ERR("%s: Starting RPU recovery", __func__);
 #else
 	LOG_DBG("%s: Starting RPU recovery", __func__);
 #endif
 	k_mutex_lock(&rpu_ctx_zep->rpu_lock, K_FOREVER);
-	rpu_ctx_zep->rpu_recovery_in_progress = true;
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 	LOG_ERR("%s: Bringing the interface down", __func__);
 #else
@@ -126,7 +116,6 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 	if (ret) {
 		LOG_ERR("%s: net_if_up failed: %d", __func__, ret);
 	}
-	rpu_ctx_zep->rpu_recovery_in_progress = false;
 	k_mutex_unlock(&rpu_ctx_zep->rpu_lock);
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
 	LOG_ERR("%s: RPU recovery done", __func__);

From f2c50651856aadb3da993fa0ce2b25aac3e1f0b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:49 +0100
Subject: [PATCH 1738/2913] Revert "[nrf fromtree] drivers: wifi: Increase the
 propogation delay"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 224f0b5f511d899416a3d444496eda838066f5cb.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 8906a22a5e8..a3f42a32198 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -667,7 +667,7 @@ if NRF_WIFI_RPU_RECOVERY
 
 config NRF_WIFI_RPU_RECOVERY_PROPAGATION_DELAY_MS
 	int "RPU recovery propagation delay in milliseconds"
-	default 2000
+	default 10
 	help
 		Propagation delay in milliseconds to wait after RPU is powered down
 		before powering it up. This delay is required to ensure that the recovery

From dfc81b0689d357a17f8d63f4dfaa153695dcebe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:49 +0100
Subject: [PATCH 1739/2913] Revert "[nrf fromtree] drivers: wifi: Add support
 for separate debugs for RPU recovery"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 510ddb4ea6b35f17963d1cb29a11e719394fea45.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi |  5 -----
 drivers/wifi/nrfwifi/src/net_if.c    | 30 ++--------------------------
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index a3f42a32198..9d8fad2daaa 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -703,11 +703,6 @@ config NRF_WIFI_RPU_MIN_TIME_TO_ENTER_SLEEP_MS
 	  Minimum time the host should de-assert WAKEUP_NOW and let RPU enter
 	  sleep mode, assuming there is no activity.
 
-config NRF_WIFI_RPU_RECOVERY_DEBUG
-	bool "RPU recovery debug logs"
-	help
-		Enable RPU recovery debug logs to help debug RPU recovery mechanism.
-
 endif # NRF_WIFI_RPU_RECOVERY
 
 config NRF_WIFI_FEAT_WMM
diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
index 3170b67b975..899e9a87105 100644
--- a/drivers/wifi/nrfwifi/src/net_if.c
+++ b/drivers/wifi/nrfwifi/src/net_if.c
@@ -71,7 +71,6 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 								struct nrf_wifi_vif_ctx_zep,
 								nrf_wifi_rpu_recovery_work);
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
-	int ret;
 
 	if (!vif_ctx_zep) {
 		LOG_ERR("%s: vif_ctx_zep is NULL", __func__);
@@ -89,39 +88,14 @@ static void nrf_wifi_rpu_recovery_work_handler(struct k_work *work)
 		return;
 	}
 
-#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
-	LOG_ERR("%s: Starting RPU recovery", __func__);
-#else
-	LOG_DBG("%s: Starting RPU recovery", __func__);
-#endif
 	k_mutex_lock(&rpu_ctx_zep->rpu_lock, K_FOREVER);
-#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
-	LOG_ERR("%s: Bringing the interface down", __func__);
-#else
 	LOG_DBG("%s: Bringing the interface down", __func__);
-#endif
 	/* This indirectly does a cold-boot of RPU */
-	ret = net_if_down(vif_ctx_zep->zep_net_if_ctx);
-	if (ret) {
-		LOG_ERR("%s: net_if_down failed: %d", __func__, ret);
-		/* Continue with the recovery */
-	}
+	net_if_down(vif_ctx_zep->zep_net_if_ctx);
 	k_msleep(CONFIG_NRF_WIFI_RPU_RECOVERY_PROPAGATION_DELAY_MS);
-#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
-	LOG_ERR("%s: Bringing the interface up", __func__);
-#else
 	LOG_DBG("%s: Bringing the interface up", __func__);
-#endif
-	ret = net_if_up(vif_ctx_zep->zep_net_if_ctx);
-	if (ret) {
-		LOG_ERR("%s: net_if_up failed: %d", __func__, ret);
-	}
+	net_if_up(vif_ctx_zep->zep_net_if_ctx);
 	k_mutex_unlock(&rpu_ctx_zep->rpu_lock);
-#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY_DEBUG
-	LOG_ERR("%s: RPU recovery done", __func__);
-#else
-	LOG_DBG("%s: RPU recovery done", __func__);
-#endif
 }
 
 void nrf_wifi_rpu_recovery_cb(void *vif_ctx_handle,

From b9ae7af717116e2f0d34f2ca16e6f21f3e426cad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:49 +0100
Subject: [PATCH 1740/2913] Revert "[nrf fromtree] drivers: wifi: Add a sanity
 check for RPU comms"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fa55b4e0765eb2a04241ec3db8d23e573675685c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c | 30 -------------------
 1 file changed, 30 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c b/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c
index 6fac7412362..c5f909b4c3a 100644
--- a/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c
+++ b/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c
@@ -405,31 +405,6 @@ int rpu_clks_on(void)
 	return 0;
 }
 
-#define RPU_EXP_SIG 0x42000020
-/* Read a known value from RPU memory to validate RPU communication */
-int rpu_validate_comms(void)
-{
-	uint32_t rpu_test;
-	int ret;
-
-	/* UCCP_SOC_FAB_MST_READ_IDLE - HW reset value */
-	ret = rpu_read(0x0005C, &rpu_test, 4);
-	if (ret) {
-		LOG_ERR("Error: RPU comms test: read failed\n");
-		return ret;
-	}
-
-	if (rpu_test != RPU_EXP_SIG) {
-		LOG_ERR("Error: RPU comms test: sig failed: expected 0x%x, got 0x%x\n",
-			RPU_EXP_SIG, rpu_test);
-		return -1;
-	}
-
-	LOG_DBG("RPU comms test passed\n");
-
-	return 0;
-}
-
 int rpu_init(void)
 {
 	int ret;
@@ -483,11 +458,6 @@ int rpu_enable(void)
 		goto rpu_pwroff;
 	}
 
-	ret = rpu_validate_comms();
-	if (ret) {
-		goto rpu_pwroff;
-	}
-
 	return 0;
 rpu_pwroff:
 	rpu_pwroff();

From 9236af66f506fd14473ec66add89a9c1877db58a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:49 +0100
Subject: [PATCH 1741/2913] Revert "[nrf fromtree] drivers: wifi: nrf700x:
 Ignore all failures in iface down"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4c4aeeef1e7c0bcf186f7e3a1df2fc1726194ba9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/src/net_if.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/wifi/nrfwifi/src/net_if.c b/drivers/wifi/nrfwifi/src/net_if.c
index 899e9a87105..4d4125e8c8a 100644
--- a/drivers/wifi/nrfwifi/src/net_if.c
+++ b/drivers/wifi/nrfwifi/src/net_if.c
@@ -802,14 +802,14 @@ int nrf_wifi_if_stop_zep(const struct device *dev)
 	ret = k_mutex_lock(&vif_ctx_zep->vif_lock, K_FOREVER);
 	if (ret != 0) {
 		LOG_ERR("%s: Failed to lock vif_lock", __func__);
-		goto unlock;
+		goto out;
 	}
 
 	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
 	if (!rpu_ctx_zep) {
 		LOG_ERR("%s: rpu_ctx_zep is NULL",
 			__func__);
-		goto unlock;
+		goto out;
 	}
 
 #ifdef CONFIG_NRF70_STA_MODE
@@ -821,6 +821,7 @@ int nrf_wifi_if_stop_zep(const struct device *dev)
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nrf_wifi_fmac_set_power_save failed",
 			__func__);
+		goto unlock;
 	}
 #endif /* CONFIG_NRF_WIFI_LOW_POWER */
 #endif /* CONFIG_NRF70_STA_MODE */
@@ -839,6 +840,7 @@ int nrf_wifi_if_stop_zep(const struct device *dev)
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nrf_wifi_fmac_chg_vif_state failed",
 			__func__);
+		goto unlock;
 	}
 
 	status = nrf_wifi_fmac_del_vif(rpu_ctx_zep->rpu_ctx,
@@ -847,8 +849,11 @@ int nrf_wifi_if_stop_zep(const struct device *dev)
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nrf_wifi_fmac_del_vif failed",
 			__func__);
+		goto unlock;
 	}
 
+	vif_ctx_zep->if_op_state = NRF_WIFI_FMAC_IF_OP_STATE_DOWN;
+
 	if (nrf_wifi_fmac_get_num_vifs(rpu_ctx_zep->rpu_ctx) == 0) {
 		nrf_wifi_fmac_dev_rem_zep(&rpu_drv_priv_zep);
 	}

From 446736a5bd3b00db6b0b55e38025ad7f4b92f19c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:49 +0100
Subject: [PATCH 1742/2913] Revert "[nrf fromtree] drivers: wifi: Fix RPU
 recovery not being triggered"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d8f2e13c31e33d80f5d40763c6aa6847dc358d6b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 26 --------------------------
 drivers/wifi/nrfwifi/src/shim.c      | 16 ----------------
 2 files changed, 42 deletions(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 9d8fad2daaa..ce7e0b753f8 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -677,32 +677,6 @@ config NRF_WIFI_RPU_RECOVERY_PROPAGATION_DELAY_MS
 config NET_MGMT_EVENT_QUEUE_SIZE
 	# Doing interface down and up even with delay puts a lot of events in the queue
 	default 16
-
-config NRF_WIFI_RPU_RECOVERY_PROPAGATION_DELAY_MS
-	int "RPU recovery propagation delay in milliseconds"
-	default 10
-	help
-	  Propagation delay in milliseconds to wait after RPU is powered down
-	  before powering it up. This delay is required to ensure that the recovery
-	  is propagated to all the applications and stack and have enough time to
-	  clean up the resources.
-
-config NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS
-	int "RPU recovery power save active timeout in milliseconds"
-	default 10000
-	help
-	  Power save active timeout in milliseconds after which RPU recovery
-	  mechanism will be triggered. This timeout is used to ensure that the
-	  RPU attempts to enter power save mode in case of inactivity.
-
-config NRF_WIFI_RPU_MIN_TIME_TO_ENTER_SLEEP_MS
-	int "Minimum idle time to enter sleep in milliseconds"
-	range 100 5000
-	default 1000
-	help
-	  Minimum time the host should de-assert WAKEUP_NOW and let RPU enter
-	  sleep mode, assuming there is no activity.
-
 endif # NRF_WIFI_RPU_RECOVERY
 
 config NRF_WIFI_FEAT_WMM
diff --git a/drivers/wifi/nrfwifi/src/shim.c b/drivers/wifi/nrfwifi/src/shim.c
index 9f8b065ead0..19660f727e7 100644
--- a/drivers/wifi/nrfwifi/src/shim.c
+++ b/drivers/wifi/nrfwifi/src/shim.c
@@ -618,20 +618,6 @@ static unsigned int zep_shim_time_elapsed_us(unsigned long start_time_us)
 	return curr_time_us - start_time_us;
 }
 
-static unsigned long zep_shim_time_get_curr_ms(void)
-{
-	return k_uptime_get();
-}
-
-static unsigned int zep_shim_time_elapsed_ms(unsigned long start_time_ms)
-{
-	unsigned long curr_time_ms = 0;
-
-	curr_time_ms = zep_shim_time_get_curr_ms();
-
-	return curr_time_ms - start_time_ms;
-}
-
 static enum nrf_wifi_status zep_shim_bus_qspi_dev_init(void *os_qspi_dev_ctx)
 {
 	ARG_UNUSED(os_qspi_dev_ctx);
@@ -952,8 +938,6 @@ const struct nrf_wifi_osal_ops nrf_wifi_os_zep_ops = {
 	.delay_us = k_usleep,
 	.time_get_curr_us = zep_shim_time_get_curr_us,
 	.time_elapsed_us = zep_shim_time_elapsed_us,
-	.time_get_curr_ms = zep_shim_time_get_curr_ms,
-	.time_elapsed_ms = zep_shim_time_elapsed_ms,
 
 	.bus_qspi_init = zep_shim_bus_qspi_init,
 	.bus_qspi_deinit = zep_shim_bus_qspi_deinit,

From ce87ab75094ee1340452d2591b157974cdbeec82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:49 +0100
Subject: [PATCH 1743/2913] Revert "[nrf fromtree] drivers: nrfwifi: Use Zephyr
 tooling to load nRF70 FW file"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e74e84ddf118a78a6c8fc3b16405d4526bcaaf20.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/CMakeLists.txt | 11 ++-----
 drivers/wifi/nrfwifi/src/fw_load.c  | 49 ++++++++++++++++++++++++++---
 2 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 5ea9da5825e..da458d13a9a 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-zephyr_library_named(nrfwifi)
+zephyr_library()
 
 set(OS_AGNOSTIC_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/drivers/nrf_wifi)
 set(FW_BINS_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
@@ -184,13 +184,8 @@ elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
       ------------------------------------------------------------------------")
   endif()
 
-  set(gen_inc_dir ${ZEPHYR_BINARY_DIR}/misc/generated)
-  zephyr_include_directories(${gen_inc_dir})
-  set(gen_dir ${gen_inc_dir}/nrf70_fw_patch)
-  generate_inc_file_for_target(
-    nrfwifi
-    ${NRF70_PATCH}
-    ${gen_dir}/nrf70.bin.inc
+  zephyr_compile_definitions(
+    -DCONFIG_NRF_WIFI_FW_BIN=${NRF70_PATCH}
   )
 endif()
 
diff --git a/drivers/wifi/nrfwifi/src/fw_load.c b/drivers/wifi/nrfwifi/src/fw_load.c
index 9204d295d30..6bf4c85193f 100644
--- a/drivers/wifi/nrfwifi/src/fw_load.c
+++ b/drivers/wifi/nrfwifi/src/fw_load.c
@@ -17,16 +17,57 @@
 LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 
 #include <fmac_main.h>
-static const char fw_patch[] = {
-	#include <nrf70_fw_patch/nrf70.bin.inc>
-};
+
+/* INCBIN macro Taken from https://gist.github.com/mmozeiko/ed9655cf50341553d282 */
+#define STR2(x) #x
+#define STR(x) STR2(x)
+
+#ifdef __APPLE__
+#define USTR(x) "_" STR(x)
+#else
+#define USTR(x) STR(x)
+#endif
+
+#ifdef _WIN32
+#define INCBIN_SECTION ".rdata, \"dr\""
+#elif defined __APPLE__
+#define INCBIN_SECTION "__TEXT,__const"
+#else
+#define INCBIN_SECTION ".rodata.*"
+#endif
+
+/* this aligns start address to 16 and terminates byte array with explicit 0
+ * which is not really needed, feel free to change it to whatever you want/need
+ */
+#define INCBIN(prefix, name, file) \
+	__asm__(".section " INCBIN_SECTION "\n" \
+			".global " USTR(prefix) "_" STR(name) "_start\n" \
+			".balign 16\n" \
+			USTR(prefix) "_" STR(name) "_start:\n" \
+			".incbin \"" file "\"\n" \
+			\
+			".global " STR(prefix) "_" STR(name) "_end\n" \
+			".balign 1\n" \
+			USTR(prefix) "_" STR(name) "_end:\n" \
+			".byte 0\n" \
+	); \
+	extern __aligned(16)    const char prefix ## _ ## name ## _start[]; \
+	extern                  const char prefix ## _ ## name ## _end[];
+
+INCBIN(_bin, nrf70_fw, STR(CONFIG_NRF_WIFI_FW_BIN));
 
 enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx)
 {
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
 	struct nrf_wifi_fmac_fw_info fw_info = { 0 };
+	uint8_t *fw_start;
+	uint8_t *fw_end;
+
+	fw_start = (uint8_t *)_bin_nrf70_fw_start;
+	fw_end = (uint8_t *)_bin_nrf70_fw_end;
 
-	status = nrf_wifi_fmac_fw_parse(rpu_ctx, fw_patch, sizeof(fw_patch), &fw_info);
+	status = nrf_wifi_fmac_fw_parse(rpu_ctx, fw_start, fw_end - fw_start,
+					&fw_info);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nrf_wifi_fmac_fw_parse failed", __func__);
 		return status;

From 4d3b609e737fb25fda9abfef099c0b65e8f8c807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:49 +0100
Subject: [PATCH 1744/2913] Revert "[nrf fromtree] Revert "drivers: nrfwifi:
 Fix rebuilding when FW blobs are changes""
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1afba7cc56bfb0f3c0c9dfd03961774b2733f5c4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/CMakeLists.txt | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index da458d13a9a..04d8d7f2bb4 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-zephyr_library()
+zephyr_library_named(nrfwifi)
 
 set(OS_AGNOSTIC_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/drivers/nrf_wifi)
 set(FW_BINS_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
@@ -187,6 +187,22 @@ elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
   zephyr_compile_definitions(
     -DCONFIG_NRF_WIFI_FW_BIN=${NRF70_PATCH}
   )
+
+  # Rebuild fw_load.c whenever the firmware binary changes
+  # a bit crude way to do it, but it works
+  add_custom_command(
+    OUTPUT ${CMAKE_SOURCE_DIR}/src/fw_load.c
+    COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_SOURCE_DIR}/src/fw_load.c
+    DEPENDS ${NRF70_PATCH}
+    COMMENT "Checking firmware blobs ${NRF70_PATCH}"
+  )
+
+  add_custom_target(
+    check_firmware_blobs ALL
+    DEPENDS ${CMAKE_SOURCE_DIR}/src/fw_load.c
+  )
+
+  add_dependencies(nrfwifi check_firmware_blobs)
 endif()
 
 

From bb79f0edf083aa16f8fdfb55c4e01161475f6ece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:49 +0100
Subject: [PATCH 1745/2913] Revert "[nrf fromtree] drivers: nrfwifi: Fix
 rebuilding when FW blobs are changes"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7363d93f67c33c43055f6f2419f58775f19d1e2f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/CMakeLists.txt | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 04d8d7f2bb4..da458d13a9a 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-zephyr_library_named(nrfwifi)
+zephyr_library()
 
 set(OS_AGNOSTIC_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/drivers/nrf_wifi)
 set(FW_BINS_BASE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/zephyr/blobs/wifi_fw_bins)
@@ -187,22 +187,6 @@ elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
   zephyr_compile_definitions(
     -DCONFIG_NRF_WIFI_FW_BIN=${NRF70_PATCH}
   )
-
-  # Rebuild fw_load.c whenever the firmware binary changes
-  # a bit crude way to do it, but it works
-  add_custom_command(
-    OUTPUT ${CMAKE_SOURCE_DIR}/src/fw_load.c
-    COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_SOURCE_DIR}/src/fw_load.c
-    DEPENDS ${NRF70_PATCH}
-    COMMENT "Checking firmware blobs ${NRF70_PATCH}"
-  )
-
-  add_custom_target(
-    check_firmware_blobs ALL
-    DEPENDS ${CMAKE_SOURCE_DIR}/src/fw_load.c
-  )
-
-  add_dependencies(nrfwifi check_firmware_blobs)
 endif()
 
 

From 9293ab129be5a18eb149d83f0843d7529b89cdd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:49 +0100
Subject: [PATCH 1746/2913] Revert "[nrf fromtree] wifi: Add wrapper APIs for
 offloaded raw TX feature"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ddcf4cd7a0ade74c36058d369c03b3d73f89789d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/CMakeLists.txt           |  21 +-
 .../wifi/nrfwifi/off_raw_tx/inc/off_raw_tx.h  |  28 -
 .../nrfwifi/off_raw_tx/src/off_raw_tx_api.c   | 482 ------------------
 .../wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h  | 260 ----------
 4 files changed, 3 insertions(+), 788 deletions(-)
 delete mode 100644 drivers/wifi/nrfwifi/off_raw_tx/inc/off_raw_tx.h
 delete mode 100644 drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
 delete mode 100644 include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index da458d13a9a..0d8c6f615c0 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -29,15 +29,10 @@ zephyr_include_directories_ifdef(CONFIG_NRF70_RADIO_TEST
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/radio_test
 )
 
-zephyr_include_directories_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/offload_raw_tx
-  off_raw_tx/inc
+zephyr_include_directories_ifndef(CONFIG_NRF70_RADIO_TEST
+  {OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/default
 )
 
-if(NOT CONFIG_NRF70_RADIO_TEST AND NOT CONFIG_NRF70_OFFLOADED_RAW_TX)
-  zephyr_include_directories(${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/default)
-endif()
-
 zephyr_library_sources_ifdef(CONFIG_NRF70_SR_COEX
   src/coex.c
 )
@@ -75,15 +70,13 @@ zephyr_library_sources_ifdef(CONFIG_NRF_WIFI_PATCHES_BUILTIN
   src/fw_load.c
 )
 
-if(NOT CONFIG_NRF70_RADIO_TEST AND NOT CONFIG_NRF70_OFFLOADED_RAW_TX)
-  zephyr_library_sources(
+zephyr_library_sources_ifndef(CONFIG_NRF70_RADIO_TEST
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/rx.c
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_vif.c
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
   src/net_if.c
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/default/fmac_api.c
 )
-endif()
 
 zephyr_library_sources_ifdef(CONFIG_NET_L2_WIFI_MGMT
   src/wifi_mgmt_scan.c
@@ -98,12 +91,6 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_RADIO_TEST
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
 )
 
-zephyr_library_sources_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/offload_raw_tx/fmac_api.c
-  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_util.c
-  off_raw_tx/src/off_raw_tx_api.c
-)
-
 zephyr_library_sources_ifdef(CONFIG_NRF70_DATA_TX
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/tx.c
   ${OS_AGNOSTIC_BASE}/fw_if/umac_if/src/fmac_peer.c
@@ -168,8 +155,6 @@ elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
     set(NRF70_PATCH ${FW_BINS_BASE}/scan_only/nrf70.bin)
   elseif (CONFIG_NRF70_SYSTEM_WITH_RAW_MODES)
     set(NRF70_PATCH ${FW_BINS_BASE}/system_with_raw/nrf70.bin)
-  elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
-    set(NRF70_PATCH ${FW_BINS_BASE}/offloaded_raw_tx/nrf70.bin)
   else()
     # Error
     message(FATAL_ERROR "Unsupported nRF70 patch configuration")
diff --git a/drivers/wifi/nrfwifi/off_raw_tx/inc/off_raw_tx.h b/drivers/wifi/nrfwifi/off_raw_tx/inc/off_raw_tx.h
deleted file mode 100644
index 1cb6e258462..00000000000
--- a/drivers/wifi/nrfwifi/off_raw_tx/inc/off_raw_tx.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @brief File containing internal structures for the offloaded raw TX feature in the driver.
- */
-
-#include "fmac_structs_common.h"
-#include "osal_api.h"
-
-struct nrf_wifi_ctx_zep {
-	void *drv_priv_zep;
-	void *rpu_ctx;
-	uint8_t mac_addr[6];
-};
-
-
-struct nrf_wifi_off_raw_tx_drv_priv {
-	struct nrf_wifi_fmac_priv *fmac_priv;
-	/* TODO: Replace with a linked list to handle unlimited RPUs */
-	struct nrf_wifi_ctx_zep rpu_ctx_zep;
-	struct k_spinlock lock;
-};
-
-enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx);
diff --git a/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c b/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
deleted file mode 100644
index 3b1dd0bb093..00000000000
--- a/drivers/wifi/nrfwifi/off_raw_tx/src/off_raw_tx_api.c
+++ /dev/null
@@ -1,482 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @brief File containing API definitions for the Offloaded raw TX feature.
- */
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <zephyr/kernel.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h>
-#include <off_raw_tx.h>
-#include <fmac_api.h>
-
-#define DT_DRV_COMPAT nordic_wlan
-LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
-
-struct nrf_wifi_off_raw_tx_drv_priv off_raw_tx_drv_priv;
-extern const struct nrf_wifi_osal_ops nrf_wifi_os_zep_ops;
-
-static const int valid_data_rates[] = { 1, 2, 55, 11, 6, 9, 12, 18, 24, 36, 48, 54,
-				  0, 1, 2, 3, 4, 5, 6, 7, -1 };
-
-/* DTS uses 1dBm as the unit for TX power, while the RPU uses 0.25dBm */
-#define MAX_TX_PWR(label) DT_PROP(DT_NODELABEL(nrf70), label) * 4
-static void configure_tx_pwr_settings(struct nrf_wifi_tx_pwr_ctrl_params *ctrl_params,
-				      struct nrf_wifi_tx_pwr_ceil_params *ceil_params)
-{
-	ctrl_params->ant_gain_2g = CONFIG_NRF70_ANT_GAIN_2G;
-	ctrl_params->ant_gain_5g_band1 = CONFIG_NRF70_ANT_GAIN_5G_BAND1;
-	ctrl_params->ant_gain_5g_band2 = CONFIG_NRF70_ANT_GAIN_5G_BAND2;
-	ctrl_params->ant_gain_5g_band3 = CONFIG_NRF70_ANT_GAIN_5G_BAND3;
-	ctrl_params->band_edge_2g_lo_dss = CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS;
-	ctrl_params->band_edge_2g_lo_ht = CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT;
-	ctrl_params->band_edge_2g_lo_he = CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE;
-	ctrl_params->band_edge_2g_hi_dsss = CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS;
-	ctrl_params->band_edge_2g_hi_ht = CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT;
-	ctrl_params->band_edge_2g_hi_he = CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE;
-	ctrl_params->band_edge_5g_unii_1_lo_ht =
-		CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT;
-	ctrl_params->band_edge_5g_unii_1_lo_he =
-		CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE;
-	ctrl_params->band_edge_5g_unii_1_hi_ht =
-		CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT;
-	ctrl_params->band_edge_5g_unii_1_hi_he =
-		CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE;
-	ctrl_params->band_edge_5g_unii_2a_lo_ht =
-		CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT;
-	ctrl_params->band_edge_5g_unii_2a_lo_he =
-		CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE;
-	ctrl_params->band_edge_5g_unii_2a_hi_ht =
-		CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT;
-	ctrl_params->band_edge_5g_unii_2a_hi_he =
-		CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE;
-	ctrl_params->band_edge_5g_unii_2c_lo_ht =
-		CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT;
-	ctrl_params->band_edge_5g_unii_2c_lo_he =
-		CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE;
-	ctrl_params->band_edge_5g_unii_2c_hi_ht =
-		CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT;
-	ctrl_params->band_edge_5g_unii_2c_hi_he =
-		CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE;
-	ctrl_params->band_edge_5g_unii_3_lo_ht =
-		CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT;
-	ctrl_params->band_edge_5g_unii_3_lo_he =
-		CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE;
-	ctrl_params->band_edge_5g_unii_3_hi_ht =
-		CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT;
-	ctrl_params->band_edge_5g_unii_3_hi_he =
-		CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE;
-	ctrl_params->band_edge_5g_unii_4_lo_ht =
-		CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT;
-	ctrl_params->band_edge_5g_unii_4_lo_he =
-		CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE;
-	ctrl_params->band_edge_5g_unii_4_hi_ht =
-		CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT;
-	ctrl_params->band_edge_5g_unii_4_hi_he =
-		CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE;
-	ceil_params->max_pwr_2g_dsss = MAX_TX_PWR(wifi_max_tx_pwr_2g_dsss);
-	ceil_params->max_pwr_2g_mcs7 = MAX_TX_PWR(wifi_max_tx_pwr_2g_mcs7);
-	ceil_params->max_pwr_2g_mcs0 = MAX_TX_PWR(wifi_max_tx_pwr_2g_mcs0);
-#ifndef CONFIG_NRF70_2_4G_ONLY
-	ceil_params->max_pwr_5g_low_mcs7 = MAX_TX_PWR(wifi_max_tx_pwr_5g_low_mcs7);
-	ceil_params->max_pwr_5g_mid_mcs7 = MAX_TX_PWR(wifi_max_tx_pwr_5g_mid_mcs7);
-	ceil_params->max_pwr_5g_high_mcs7 = MAX_TX_PWR(wifi_max_tx_pwr_5g_high_mcs7);
-	ceil_params->max_pwr_5g_low_mcs0 = MAX_TX_PWR(wifi_max_tx_pwr_5g_low_mcs0);
-	ceil_params->max_pwr_5g_mid_mcs0 = MAX_TX_PWR(wifi_max_tx_pwr_5g_mid_mcs0);
-	ceil_params->max_pwr_5g_high_mcs0 = MAX_TX_PWR(wifi_max_tx_pwr_5g_high_mcs0);
-#endif /* CONFIG_NRF70_2_4G_ONLY */
-}
-
-static void configure_board_dep_params(struct nrf_wifi_board_params *board_params)
-{
-	board_params->pcb_loss_2g = CONFIG_NRF70_PCB_LOSS_2G;
-#ifndef CONFIG_NRF70_2_4G_ONLY
-	board_params->pcb_loss_5g_band1 = CONFIG_NRF70_PCB_LOSS_5G_BAND1;
-	board_params->pcb_loss_5g_band2 = CONFIG_NRF70_PCB_LOSS_5G_BAND2;
-	board_params->pcb_loss_5g_band3 = CONFIG_NRF70_PCB_LOSS_5G_BAND3;
-#endif /* CONFIG_NRF70_2_4G_ONLY */
-}
-
-#ifdef CONFIG_WIFI_FIXED_MAC_ADDRESS_ENABLED
-static int bytes_from_str(uint8_t *buf, int buf_len, const char *src)
-{
-	size_t i;
-	size_t src_len = strlen(src);
-	char *endptr;
-
-	for (i = 0U; i < src_len; i++) {
-		if (!isxdigit((unsigned char)src[i]) &&
-		    src[i] != ':') {
-			return -EINVAL;
-		}
-	}
-
-	(void)memset(buf, 0, buf_len);
-
-	for (i = 0U; i < (size_t)buf_len; i++) {
-		buf[i] = (uint8_t)strtol(src, &endptr, 16);
-		src = ++endptr;
-	}
-
-	return 0;
-}
-#endif /* CONFIG_WIFI_FIXED_MAC_ADDRESS_ENABLED */
-
-int nrf70_off_raw_tx_init(uint8_t *mac_addr)
-{
-	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
-	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
-	void *rpu_ctx = NULL;
-	struct nrf_wifi_tx_pwr_ctrl_params ctrl_params;
-	struct nrf_wifi_tx_pwr_ceil_params ceil_params;
-	struct nrf_wifi_board_params board_params;
-	unsigned int fw_ver = 0;
-	k_spinlock_key_t key;
-
-	/* The OSAL layer needs to be initialized before any other initialization
-	 * so that other layers (like FW IF,HW IF etc) have access to OS ops
-	 */
-	nrf_wifi_osal_init(&nrf_wifi_os_zep_ops);
-
-	key = k_spin_lock(&off_raw_tx_drv_priv.lock);
-
-	off_raw_tx_drv_priv.fmac_priv = nrf_wifi_fmac_off_raw_tx_init();
-
-	if (off_raw_tx_drv_priv.fmac_priv == NULL) {
-		LOG_ERR("%s: Failed to initialize nRF70 driver",
-			__func__);
-		goto err;
-	}
-
-	rpu_ctx_zep = &off_raw_tx_drv_priv.rpu_ctx_zep;
-
-	rpu_ctx_zep->drv_priv_zep = &off_raw_tx_drv_priv;
-
-	rpu_ctx = nrf_wifi_fmac_dev_add(off_raw_tx_drv_priv.fmac_priv,
-					rpu_ctx_zep);
-	if (!rpu_ctx) {
-		LOG_ERR("%s: Failed to add nRF70 device", __func__);
-		rpu_ctx_zep = NULL;
-		goto err;
-	}
-
-	rpu_ctx_zep->rpu_ctx = rpu_ctx;
-
-	status = nrf_wifi_fw_load(rpu_ctx);
-	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: Failed to load the nRF70 firmware patch", __func__);
-		goto err;
-	}
-
-	status = nrf_wifi_fmac_ver_get(rpu_ctx,
-				       &fw_ver);
-	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: Failed to read the nRF70 firmware version", __func__);
-		goto err;
-	}
-
-	LOG_DBG("nRF70 firmware (v%d.%d.%d.%d) booted successfully",
-		NRF_WIFI_UMAC_VER(fw_ver),
-		NRF_WIFI_UMAC_VER_MAJ(fw_ver),
-		NRF_WIFI_UMAC_VER_MIN(fw_ver),
-		NRF_WIFI_UMAC_VER_EXTRA(fw_ver));
-
-	memset(&ctrl_params, 0, sizeof(ctrl_params));
-	memset(&ceil_params, 0, sizeof(ceil_params));
-
-	configure_tx_pwr_settings(&ctrl_params,
-				  &ceil_params);
-
-	memset(&board_params, 0, sizeof(board_params));
-
-	configure_board_dep_params(&board_params);
-
-	status = nrf_wifi_fmac_off_raw_tx_dev_init(rpu_ctx_zep->rpu_ctx,
-#ifdef CONFIG_NRF_WIFI_LOW_POWER
-						   HW_SLEEP_ENABLE,
-#endif /* CONFIG_NRF_WIFI_LOW_POWER */
-						   NRF_WIFI_DEF_PHY_CALIB,
-						   CONFIG_NRF_WIFI_OP_BAND,
-						   IS_ENABLED(CONFIG_NRF_WIFI_BEAMFORMING),
-						   &ctrl_params,
-						   &ceil_params,
-						   &board_params);
-	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nRF70 firmware initialization failed", __func__);
-		goto err;
-	}
-
-	if (mac_addr) {
-		memcpy(rpu_ctx_zep->mac_addr, mac_addr, 6);
-	} else {
-#ifdef CONFIG_WIFI_FIXED_MAC_ADDRESS_ENABLED
-		int ret = -1;
-
-		ret = bytes_from_str(rpu_ctx_zep->mac_addr,
-				     6,
-				     CONFIG_WIFI_FIXED_MAC_ADDRESS);
-		if (ret < 0) {
-			LOG_ERR("%s: Failed to parse MAC address: %s",
-				__func__,
-				CONFIG_WIFI_FIXED_MAC_ADDRESS);
-			goto err;
-		}
-#elif CONFIG_WIFI_OTP_MAC_ADDRESS
-		status = nrf_wifi_fmac_otp_mac_addr_get(off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx,
-							0,
-							rpu_ctx_zep->mac_addr);
-		if (status != NRF_WIFI_STATUS_SUCCESS) {
-			LOG_ERR("%s: Fetching of MAC address from OTP failed",
-				__func__);
-			goto err;
-		}
-#endif /* CONFIG_WIFI_FIXED_MAC_ADDRESS_ENABLED */
-
-		if (!nrf_wifi_utils_is_mac_addr_valid(rpu_ctx_zep->mac_addr)) {
-			LOG_ERR("%s: Invalid MAC address: %02X:%02X:%02X:%02X:%02X:%02X",
-				__func__,
-				rpu_ctx_zep->mac_addr[0],
-				rpu_ctx_zep->mac_addr[1],
-				rpu_ctx_zep->mac_addr[2],
-				rpu_ctx_zep->mac_addr[3],
-				rpu_ctx_zep->mac_addr[4],
-				rpu_ctx_zep->mac_addr[5]);
-			goto err;
-		}
-	}
-
-	k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
-
-	return 0;
-err:
-	if (rpu_ctx) {
-		nrf_wifi_fmac_off_raw_tx_dev_rem(rpu_ctx);
-		rpu_ctx_zep->rpu_ctx = NULL;
-	}
-
-	k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
-	nrf70_off_raw_tx_deinit();
-	return -1;
-}
-
-
-void nrf70_off_raw_tx_deinit(void)
-{
-	k_spinlock_key_t key;
-
-	key = k_spin_lock(&off_raw_tx_drv_priv.lock);
-
-	if (!off_raw_tx_drv_priv.fmac_priv) {
-		k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
-		return;
-	}
-
-	nrf_wifi_fmac_off_raw_tx_deinit(off_raw_tx_drv_priv.fmac_priv);
-	nrf_wifi_osal_deinit();
-
-	k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
-}
-
-static bool validate_rate(enum nrf_wifi_off_raw_tx_tput_mode tput_mode,
-			enum nrf_wifi_off_raw_tx_rate rate)
-{
-	if (tput_mode == TPUT_MODE_LEGACY) {
-		if (rate > RATE_54M) {
-			return false;
-		}
-	} else {
-		if (rate <= RATE_54M) {
-			return false;
-		}
-	}
-
-	return true;
-}
-
-int nrf70_off_raw_tx_conf_update(struct nrf_wifi_off_raw_tx_conf *conf)
-{
-	int ret = -1;
-	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
-	struct nrf_wifi_offload_ctrl_params *off_ctrl_params = NULL;
-	struct nrf_wifi_offload_tx_ctrl *off_tx_params = NULL;
-	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
-	k_spinlock_key_t key;
-
-	if (!conf) {
-		LOG_ERR("%s: Config params is NULL", __func__);
-		goto out;
-	}
-
-	off_ctrl_params = nrf_wifi_osal_mem_zalloc(sizeof(*off_ctrl_params));
-	if (!off_ctrl_params) {
-		LOG_ERR("%s: Failed to allocate memory for off_ctrl_params", __func__);
-		goto out;
-	}
-
-	key = k_spin_lock(&off_raw_tx_drv_priv.lock);
-
-	fmac_dev_ctx = off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx;
-
-	if (!fmac_dev_ctx) {
-		LOG_ERR("%s: FMAC device context is NULL", __func__);
-		goto out;
-	}
-
-	off_tx_params = nrf_wifi_osal_mem_zalloc(sizeof(*off_tx_params));
-	if (!off_tx_params) {
-		LOG_ERR("%s Failed to allocate memory for off_tx_params: ", __func__);
-		goto out;
-	}
-
-	if (!validate_rate(conf->tput_mode, conf->rate)) {
-		LOG_ERR("%s Invalid rate. Throughput mode: %d, rate: %d\n", __func__,
-				      conf->tput_mode, conf->rate);
-		goto out;
-	}
-
-	off_ctrl_params->channel_no = conf->chan;
-	off_ctrl_params->period_in_us = conf->period_us;
-	off_ctrl_params->tx_pwr = conf->tx_pwr;
-	off_tx_params->he_gi_type = conf->he_gi;
-	off_tx_params->he_ltf = conf->he_ltf;
-	off_tx_params->pkt_ram_ptr = RPU_MEM_PKT_BASE;
-	off_tx_params->pkt_length = conf->pkt_len;
-	off_tx_params->rate_flags = conf->tput_mode;
-	off_tx_params->rate = valid_data_rates[conf->rate];
-	off_tx_params->rate_preamble_type = conf->short_preamble;
-	off_tx_params->rate_retries = conf->num_retries;
-
-	status = hal_rpu_mem_write(fmac_dev_ctx->hal_dev_ctx,
-				   RPU_MEM_PKT_BASE,
-				   conf->pkt,
-				   conf->pkt_len);
-	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: hal_rpu_mem_write failed", __func__);
-		goto out;
-	}
-
-	status = nrf_wifi_fmac_off_raw_tx_conf(fmac_dev_ctx,
-					       off_ctrl_params,
-					       off_tx_params);
-	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nRF70 offloaded raw TX configuration failed",
-				      __func__);
-		goto out;
-	}
-
-	ret = 0;
-out:
-	nrf_wifi_osal_mem_free(off_ctrl_params);
-	nrf_wifi_osal_mem_free(off_tx_params);
-	k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
-	return ret;
-}
-
-
-int nrf70_off_raw_tx_start(struct nrf_wifi_off_raw_tx_conf *conf)
-{
-	int ret = -1;
-	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
-	k_spinlock_key_t key;
-
-	status = nrf70_off_raw_tx_conf_update(conf);
-	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nRF70 offloaded raw TX configuration failed",
-				      __func__);
-		goto out;
-	}
-
-	key = k_spin_lock(&off_raw_tx_drv_priv.lock);
-	if (!off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx) {
-		LOG_ERR("%s: FMAC device context is NULL", __func__);
-		goto out;
-	}
-
-	status = nrf_wifi_fmac_off_raw_tx_start(off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx);
-	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nRF70 offloaded raw TX start failed",
-				      __func__);
-		goto out;
-	}
-
-	ret = 0;
-out:
-	k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
-	return ret;
-}
-
-
-int nrf70_off_raw_tx_stop(void)
-{
-	int ret = -1;
-	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
-	k_spinlock_key_t key;
-
-	key = k_spin_lock(&off_raw_tx_drv_priv.lock);
-
-	if (!off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx) {
-		LOG_ERR("%s: FMAC device context is NULL", __func__);
-		goto out;
-	}
-
-	status = nrf_wifi_fmac_off_raw_tx_stop(off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx);
-	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nRF70 offloaded raw TX stop failed",
-				      __func__);
-		goto out;
-	}
-
-	ret = 0;
-out:
-	k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
-	return ret;
-}
-
-
-int nrf70_off_raw_tx_mac_addr_get(uint8_t *mac_addr)
-{
-	if (!mac_addr) {
-		LOG_ERR("%s: Invalid param", __func__);
-		return -EINVAL;
-	}
-
-	memcpy(mac_addr, off_raw_tx_drv_priv.rpu_ctx_zep.mac_addr, 6);
-	return 0;
-}
-
-int nrf70_off_raw_tx_stats(struct nrf_wifi_off_raw_tx_stats *off_raw_tx_stats)
-{
-	int ret = -1;
-	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
-	struct rpu_op_stats stats;
-	k_spinlock_key_t key;
-
-	memset(&stats, 0, sizeof(struct rpu_op_stats));
-
-	key = k_spin_lock(&off_raw_tx_drv_priv.lock);
-
-	if (!off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx) {
-		LOG_ERR("%s: FMAC device context is NULL", __func__);
-		goto out;
-	}
-
-	status = nrf_wifi_fmac_stats_get(off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx, 0, &stats);
-	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nRF70 offloaded raw TX stats failed",
-				      __func__);
-		goto out;
-	}
-
-	off_raw_tx_stats->off_raw_tx_pkt_sent = stats.fw.offloaded_raw_tx.offload_raw_tx_cnt;
-
-	ret = 0;
-out:
-	k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
-	return ret;
-}
diff --git a/include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h b/include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h
deleted file mode 100644
index b8ff50cd390..00000000000
--- a/include/zephyr/drivers/wifi/nrfwifi/off_raw_tx/off_raw_tx_api.h
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-/** @file
- *
- * @addtogroup nrf70_off_raw_tx_api nRF70 Offloaded raw TX API
- * @{
- *
- * @brief File containing API's for the Offloaded raw TX feature.
- */
-
-#ifndef INCLUDE_ZEPHYR_DRIVERS_OFF_RAW_TX_API_H_
-#define INCLUDE_ZEPHYR_DRIVERS_OFF_RAW_TX_API_H_
-
-#include <stdbool.h>
-#include <stdint.h>
-#include "osal_api.h"
-
-/*  Minimum frame size for raw packet transmission */
-#define NRF_WIFI_OFF_RAW_TX_FRAME_SIZE_MIN 26
-/*  Maximum frame size for raw packet transmission */
-#define NRF_WIFI_OFF_RAW_TX_FRAME_SIZE_MAX 600
-
-/**
- * @brief- Transmission rates
- * Rate to be used for transmitting a packet.
- */
-enum nrf_wifi_off_raw_tx_rate {
-	/** 1 Mbps */
-	RATE_1M,
-	/** 2 Mbps */
-	RATE_2M,
-	/** 5.5 Mbps */
-	RATE_5_5M,
-	/** 11 Mbps */
-	RATE_11M,
-	/** 6 Mbps */
-	RATE_6M,
-	/** 9 Mbps */
-	RATE_9M,
-	/** 12 Mbps */
-	RATE_12M,
-	/** 18 Mbps */
-	RATE_18M,
-	/** 24 Mbps */
-	RATE_24M,
-	/** 36 Mbps */
-	RATE_36M,
-	/** 48 Mbps */
-	RATE_48M,
-	/** 54 Mbps */
-	RATE_54M,
-	/** MCS 0 */
-	RATE_MCS0,
-	/** MCS 1 */
-	RATE_MCS1,
-	/** MCS 2 */
-	RATE_MCS2,
-	/** MCS 3 */
-	RATE_MCS3,
-	/** MCS 4 */
-	RATE_MCS4,
-	/** MCS 5 */
-	RATE_MCS5,
-	/** MCS 6 */
-	RATE_MCS6,
-	/** MCS 7 */
-	RATE_MCS7,
-	/** Invalid rate */
-	RATE_MAX
-};
-
-
-/**
- * @brief- HE guard interval value
- * Value of the guard interval to be used between symbols when transmitting using HE.
- */
-enum nrf_wifi_off_raw_tx_he_gi {
-	/** 800 ns */
-	HE_GI_800NS,
-	/** 1600 ns */
-	HE_GI_1600NS,
-	/** 3200 ns */
-	HE_GI_3200NS,
-	/** Invalid value */
-	HE_GI_MAX
-};
-
-
-/**
- * @brief- HE long training field duration
- * Value of the long training field duration to be used when transmitting using HE.
- */
-enum nrf_wifi_off_raw_tx_he_ltf {
-	/** 3.2us */
-	HE_LTF_3200NS,
-	/** 6.4us */
-	HE_LTF_6400NS,
-	/** 12.8us */
-	HE_LTF_12800NS,
-	/** Invalid value */
-	HE_LTF_MAX
-};
-
-/**
- * @brief- Throughput mode
- * Throughput mode to be used for transmitting the packet.
- */
-enum nrf_wifi_off_raw_tx_tput_mode {
-	/** Legacy mode */
-	TPUT_MODE_LEGACY,
-	/** High Throughput mode (11n) */
-	TPUT_MODE_HT,
-	/** Very high throughput mode (11ac) */
-	TPUT_MODE_VHT,
-	/** HE SU mode */
-	TPUT_MODE_HE_SU,
-	/** HE ER SU mode */
-	TPUT_MODE_HE_ER_SU,
-	/** HE TB mode */
-	TPUT_MODE_HE_TB,
-	/** Highest throughput mode currently defined */
-	TPUT_MODE_MAX
-};
-
-/**
- * @brief This structure defines the Offloaded raw tx debug statistics.
- *
- */
-struct nrf_wifi_off_raw_tx_stats {
-	/** Number of packets sent */
-	unsigned int off_raw_tx_pkt_sent;
-};
-
-/**
- * @brief- Configuration parameters for offloaded raw TX
- * Parameters which can be used to configure the offloaded raw TX operation.
- */
-struct nrf_wifi_off_raw_tx_conf {
-	/** Time interval (in microseconds) between transmissions */
-	unsigned int period_us;
-	/** Transmit power in dBm (0 to 20) */
-	unsigned int tx_pwr;
-	/** Channel number on which to transmit */
-	unsigned int chan;
-	/** Set to TRUE to use short preamble for FALSE to disable short preamble */
-	bool short_preamble;
-	/* Number of times a packet should be retried at each possible rate */
-	unsigned int num_retries;
-	/** Throughput mode for packet transmittion. Refer &enum nrf_wifi_off_raw_tx_tput_mode */
-	enum nrf_wifi_off_raw_tx_tput_mode tput_mode;
-	/* Rate at which packet needs to be transmitted. Refer &enum nrf_wifi_off_raw_tx_rate */
-	enum nrf_wifi_off_raw_tx_rate rate;
-	/** HE GI. Refer &enum nrf_wifi_off_raw_tx_he_gi */
-	enum nrf_wifi_off_raw_tx_he_gi he_gi;
-	/** HE GI. Refer &enum nrf_wifi_off_raw_tx_he_ltf */
-	enum nrf_wifi_off_raw_tx_he_ltf he_ltf;
-	/* Pointer to packet to be transmitted */
-	void *pkt;
-	/** Packet length of the frame to be transmitted, (min 26 bytes and max 600 bytes) */
-	unsigned int pkt_len;
-};
-
-
-/**
- * @brief Initialize the nRF70 for operating in the offloaded raw TX mode.
- * @param mac_addr MAC address to be used for the nRF70 device.
- *
- * This function is initializes the nRF70 device for offloaded raw TX mode by:
- *  - Powering it up,
- *  - Downloading a firmware patch (if any).
- *  - Initializing the firmware to accept further commands
- *
- * The mac_addr parameter is used to set the MAC address of the nRF70 device.
- * This address can be used to override the MAC addresses programmed in the OTP and
- * the value configured (if any) in CONFIG_WIFI_FIXED_MAC_ADDRESS.
- * The priority order in which the MAC address values for the nRF70 device are used is:
- * - If mac_addr is provided, the MAC address is set to the value provided.
- * - If CONFIG_WIFI_FIXED_MAC_ADDRESS is enabled, the MAC address uses the Kconfig value.
- * - If none of the above are provided, the MAC address is set to the value programmed in the OTP.
- *
- * @retval 0 If the operation was successful.
- * @retval -1 If the operation failed.
- */
-int nrf70_off_raw_tx_init(uint8_t *mac_addr);
-
-/**
- * @brief Initialize the nRF70 for operating in the offloaded raw TX mode.
- *
- * This function is deinitializes the nRF70 device.
- *
- */
-void nrf70_off_raw_tx_deinit(void);
-
-/**
- * @brief Update the configured offloaded raw TX parameters.
- * @param conf Configuration parameters to be updated for the offloaded raw TX operation.
- *
- * This function is used to update configured parameters for offloaded raw TX operation.
- * This function should be used to when the parameters need to be updated during an ongoing
- * raw TX operation without having to stop it.
- *
- * @retval 0 If the operation was successful.
- * @retval -1 If the operation failed.
- */
-int nrf70_off_raw_tx_conf_update(struct nrf_wifi_off_raw_tx_conf *conf);
-
-/**
- * @brief Start the offloaded raw TX.
- * @param conf Configuration parameters necessary for the offloaded raw TX operation.
- *
- * This function is used to start offloaded raw TX operation. When this function is invoked
- * the nRF70 device will start transmitting frames as per the configuration specified by @p conf.
- *
- * @retval 0 If the operation was successful.
- * @retval -1 If the operation failed.
- */
-int nrf70_off_raw_tx_start(struct nrf_wifi_off_raw_tx_conf *conf);
-
-/**
- * @brief Stop the offloaded raw TX.
- *
- * This function is used to stop offloaded raw TX operation. When this function is invoked
- * the nRF70 device will stop transmitting frames.
- *
- * @retval 0 If the operation was successful.
- * @retval -1 If the operation failed.
- */
-int nrf70_off_raw_tx_stop(void);
-
-/**
- * @brief Get the MAC address of the nRF70 device.
- * @param mac_addr Buffer to store the MAC address.
- *
- * This function is used to get the MAC address of the nRF70 device.
- * The MAC address is stored in the buffer pointed by mac_addr.
- * The MAC address is expected to be a 6 byte value.
- *
- * @retval 0 If the operation was successful.
- * @retval -1 If the operation failed.
- */
-int nrf70_off_raw_tx_mac_addr_get(uint8_t *mac_addr);
-
-/**
- * @brief Get statistics of the offloaded raw TX.
- * @param off_raw_tx_stats Statistics of the offloaded raw TX operation.
- *
- * This function is used to get statistics of offloaded raw TX operation. When this function
- * is invoked the nRF70 device will show statistics.
- *
- * @retval 0 If the operation was successful.
- * @retval -1 If the operation failed.
- */
-int nrf70_off_raw_tx_stats(struct nrf_wifi_off_raw_tx_stats *off_raw_tx_stats);
-/**
- * @}
- */
-#endif /* INCLUDE_ZEPHYR_DRIVERS_OFF_RAW_TX_API_H_ */

From 97504c0d9b3b674139597dbeb55434aa2cfdf714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:49 +0100
Subject: [PATCH 1747/2913] Revert "[nrf fromtree] drivers: nrfwifi: Create
 separate offloaded raw tx mode"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 83be9686b16029a67c05744aaf68ffe4e8d01326.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/CMakeLists.txt  | 11 ++---------
 drivers/wifi/nrfwifi/Kconfig.nrfwifi |  5 +----
 drivers/wifi/nrfwifi/inc/fmac_main.h |  6 +-----
 drivers/wifi/nrfwifi/src/wifi_util.c |  8 ++++----
 4 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 0d8c6f615c0..a2773efbc06 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -30,7 +30,7 @@ zephyr_include_directories_ifdef(CONFIG_NRF70_RADIO_TEST
 )
 
 zephyr_include_directories_ifndef(CONFIG_NRF70_RADIO_TEST
-  {OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/default
+  ${OS_AGNOSTIC_BASE}/fw_if/umac_if/inc/default
 )
 
 zephyr_library_sources_ifdef(CONFIG_NRF70_SR_COEX
@@ -57,15 +57,12 @@ zephyr_library_sources(
   src/shim.c
   src/work.c
   src/timer.c
+  src/fmac_main.c
   src/qspi/src/device.c
   src/qspi/src/rpu_hw_if.c
   src/qspi/src/ficr_prog.c
 )
 
-zephyr_library_sources_ifndef(CONFIG_NRF70_OFFLOADED_RAW_TX
-  src/fmac_main.c
-)
-
 zephyr_library_sources_ifdef(CONFIG_NRF_WIFI_PATCHES_BUILTIN
   src/fw_load.c
 )
@@ -229,10 +226,6 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF70_RADIO_TEST
   -DNRF70_RADIO_TEST
 )
 
-zephyr_compile_definitions_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
-  -DNRF70_OFFLOADED_RAW_TX
-)
-
 zephyr_compile_definitions_ifdef(CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD
   -DNRF70_TCP_IP_CHECKSUM_OFFLOAD
 )
diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index ce7e0b753f8..5f2e645e575 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -69,9 +69,6 @@ config NRF70_SCAN_ONLY
 config NRF70_RADIO_TEST
 	bool "Radio test mode of the nRF70 driver"
 
-config NRF70_OFFLOADED_RAW_TX
-	bool "Offloaded raw Tx mode of the nRF70 driver"
-
 config NRF70_SYSTEM_WITH_RAW_MODES
 	bool "nRF70 system mode with raw modes"
 	depends on WIFI_NRF7002 || WIFI_NRF7001
@@ -86,7 +83,7 @@ config NRF70_SYSTEM_MODE_COMMON
 	default y if NRF70_SYSTEM_MODE || NRF70_SYSTEM_WITH_RAW_MODES
 
 config NET_L2_ETHERNET
-	default y if (!NRF70_RADIO_TEST && !NRF70_OFFLOADED_RAW_TX)
+	default y if !NRF70_RADIO_TEST
 
 config HEAP_MEM_POOL_ADD_SIZE_NRF70
 	# Use a maximum that works for typical usecases and boards, each sample/app can override
diff --git a/drivers/wifi/nrfwifi/inc/fmac_main.h b/drivers/wifi/nrfwifi/inc/fmac_main.h
index c11d32c487a..92bc2ac28f8 100644
--- a/drivers/wifi/nrfwifi/inc/fmac_main.h
+++ b/drivers/wifi/nrfwifi/inc/fmac_main.h
@@ -34,7 +34,6 @@
 
 #define NRF70_DRIVER_VERSION "1."KERNEL_VERSION_STRING
 
-#ifndef CONFIG_NRF70_OFFLOADED_RAW_TX
 #ifndef CONFIG_NRF70_RADIO_TEST
 struct nrf_wifi_vif_ctx_zep {
 	const struct device *zep_dev_ctx;
@@ -120,7 +119,6 @@ struct nrf_wifi_drv_priv_zep {
 extern struct nrf_wifi_drv_priv_zep rpu_drv_priv_zep;
 
 void nrf_wifi_scan_timeout_work(struct k_work *work);
-
 void configure_tx_pwr_settings(struct nrf_wifi_tx_pwr_ctrl_params *tx_pwr_ctrl_params,
 				struct nrf_wifi_tx_pwr_ceil_params *tx_pwr_ceil_params);
 void configure_board_dep_params(struct nrf_wifi_board_params *board_params);
@@ -128,7 +126,6 @@ void set_tx_pwr_ceil_default(struct nrf_wifi_tx_pwr_ceil_params *pwr_ceil_params
 const char *nrf_wifi_get_drv_version(void);
 enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep);
 enum nrf_wifi_status nrf_wifi_fmac_dev_rem_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep);
-#endif /* !CONFIG_NRF_WIFI_BUILD_ONLY_MODE */
 #ifdef CONFIG_NRF_WIFI_BUILD_ONLY_MODE
 inline enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx)
 {
@@ -139,10 +136,9 @@ inline enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx)
 #else
 enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx);
 #endif /* CONFIG_NRF_WIFI_BUILD_ONLY_MODE */
-#ifndef CONFIG_NRF70_OFFLOADED_RAW_TX
 struct nrf_wifi_vif_ctx_zep *nrf_wifi_get_vif_ctx(struct net_if *iface);
 void nrf_wifi_rpu_recovery_cb(void *vif_ctx,
 		void *event_data,
 		unsigned int event_len);
-#endif /* !CONFIG_NRF_WIFI_BUILD_ONLY_MODE */
+
 #endif /* __ZEPHYR_FMAC_MAIN_H__ */
diff --git a/drivers/wifi/nrfwifi/src/wifi_util.c b/drivers/wifi/nrfwifi/src/wifi_util.c
index c5e2a8dedfa..43c527a4b7d 100644
--- a/drivers/wifi/nrfwifi/src/wifi_util.c
+++ b/drivers/wifi/nrfwifi/src/wifi_util.c
@@ -435,7 +435,7 @@ static int nrf_wifi_util_show_vers(const struct shell *sh,
 	return status;
 }
 
-#if !defined(CONFIG_NRF70_RADIO_TEST) && !defined(CONFIG_NRF70_OFFLOADED_RAW_TX)
+#ifndef CONFIG_NRF70_RADIO_TEST
 static int nrf_wifi_util_dump_rpu_stats(const struct shell *sh,
 					size_t argc,
 					const char *argv[])
@@ -849,7 +849,7 @@ static int nrf_wifi_util_dump_rpu_stats(const struct shell *sh,
 
 	return 0;
 }
-#endif /* !CONFIG_NRF70_RADIO_TEST && !CONFIG_NRF70_OFFLOADED_RAW_TX */
+#endif /* CONFIG_NRF70_RADIO_TEST */
 
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
 static int nrf_wifi_util_trigger_rpu_recovery(const struct shell *sh,
@@ -964,7 +964,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      nrf_wifi_util_show_vers,
 		      1,
 		      0),
-#if !defined(CONFIG_NRF70_RADIO_TEST) && !defined(CONFIG_NRF70_OFFLOADED_RAW_TX)
+#ifndef CONFIG_NRF70_RADIO_TEST
 	SHELL_CMD_ARG(rpu_stats,
 		      NULL,
 		      "Display RPU stats "
@@ -972,7 +972,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      nrf_wifi_util_dump_rpu_stats,
 		      1,
 		      1),
-#endif /* !CONFIG_NRF70_RADIO_TEST && !CONFIG_NRF70_OFFLOADED_RAW_TX*/
+#endif /* CONFIG_NRF70_RADIO_TEST */
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
 	SHELL_CMD_ARG(rpu_recovery_test,
 		      NULL,

From a18f6988fb3771826afec02fd9b6f6b593ded95f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:49 +0100
Subject: [PATCH 1748/2913] Revert "[nrf fromtree] manifest: Update hostap to
 fix build error"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 40ce9acd0c88245e1af351c7e4d65b8699ef309e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index e87e6405424..bd588eaaea0 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: 7c32520564908e1220976b6c185dec296b6d4a80
+      revision: 0fd0276b5b65de4d2f7cd0552789a74d3a129441
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From d0e58d6b7bd5392297079ed4171f6ee392a676fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:49 +0100
Subject: [PATCH 1749/2913] Revert "[nrf fromtree] manifest: update hal_nordic
 revision for offloaded raw tx mode"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8c27d921fed640ee746f86a693836f8decdda731.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index bd588eaaea0..239ac8d20d4 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: d5c70305b2389641b0a166d0714775a1b13319a2
+      revision: 4a3ba8eaca8f5255f550db7bc54dc3e23212da64
       path: modules/hal/nordic
       groups:
         - hal

From 974c05ca1b402f538a63364ab258651f5f18fb74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:49 +0100
Subject: [PATCH 1750/2913] Revert "[nrf fromtree] modules: hal_nordic: Add
 global domain power request service"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 86a85397b361f2d9bb6b1f5508af15de42776f39.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/nrfs/CMakeLists.txt | 1 -
 modules/hal_nordic/nrfs/Kconfig        | 9 ---------
 modules/hal_nordic/nrfs/nrfs_config.h  | 4 ----
 soc/nordic/nrf54h/Kconfig              | 2 --
 soc/nordic/nrf92/Kconfig               | 2 --
 west.yml                               | 2 +-
 6 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/modules/hal_nordic/nrfs/CMakeLists.txt b/modules/hal_nordic/nrfs/CMakeLists.txt
index f470eea00e9..c601b8a4233 100644
--- a/modules/hal_nordic/nrfs/CMakeLists.txt
+++ b/modules/hal_nordic/nrfs/CMakeLists.txt
@@ -25,7 +25,6 @@ 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_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)
diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig
index 7245b728757..96d4c7f45cd 100644
--- a/modules/hal_nordic/nrfs/Kconfig
+++ b/modules/hal_nordic/nrfs/Kconfig
@@ -19,9 +19,6 @@ config NRFS_HAS_DIAG_SERVICE
 config NRFS_HAS_DVFS_SERVICE
 	bool
 
-config NRFS_HAS_GDPWR_SERVICE
-	bool
-
 config NRFS_HAS_MRAM_SERVICE
 	bool
 
@@ -113,12 +110,6 @@ config NRFS_CLOCK_SERVICE_ENABLED
 	bool "Clock service"
 	depends on NRFS_HAS_CLOCK_SERVICE
 	default y
-
-config NRFS_GDPWR_SERVICE_ENABLED
-	bool "Global domain power request service"
-	depends on NRFS_HAS_GDPWR_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 a092adb7850..20cf6cece0e 100644
--- a/modules/hal_nordic/nrfs/nrfs_config.h
+++ b/modules/hal_nordic/nrfs/nrfs_config.h
@@ -40,10 +40,6 @@
 #define NRFS_CLOCK_SERVICE_ENABLED
 #endif
 
-#ifdef CONFIG_NRFS_GDPWR_SERVICE_ENABLED
-#define NRFS_GDPWR_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 9132ca8458b..51dc4e07480 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -24,7 +24,6 @@ config SOC_NRF54H20_CPUAPP_COMMON
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select NRFS_HAS_CLOCK_SERVICE
 	select NRFS_HAS_DVFS_SERVICE
-	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
 	select NRFS_HAS_VBUS_DETECTOR_SERVICE
@@ -50,7 +49,6 @@ config SOC_NRF54H20_CPURAD_COMMON
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select NRFS_HAS_CLOCK_SERVICE
-	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
 	select NRFS_HAS_VBUS_DETECTOR_SERVICE
diff --git a/soc/nordic/nrf92/Kconfig b/soc/nordic/nrf92/Kconfig
index 1f60b944b76..f6efecb6ad0 100644
--- a/soc/nordic/nrf92/Kconfig
+++ b/soc/nordic/nrf92/Kconfig
@@ -22,7 +22,6 @@ config SOC_NRF9230_ENGB_CPUAPP
 	select HAS_NORDIC_DMM
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select NRFS_HAS_CLOCK_SERVICE
-	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
 	select NRFS_HAS_PMIC_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
@@ -41,7 +40,6 @@ config SOC_NRF9230_ENGB_CPURAD
 	select HAS_NORDIC_DMM
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select NRFS_HAS_CLOCK_SERVICE
-	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
 	select NRFS_HAS_PMIC_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
diff --git a/west.yml b/west.yml
index 239ac8d20d4..d7fd027b924 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 4a3ba8eaca8f5255f550db7bc54dc3e23212da64
+      revision: bc25c094a8cf3064f4f9c1e8060b46e1989edf95
       path: modules/hal/nordic
       groups:
         - hal

From daf2fcb10f728c70cc117b21e2d13642ac58eb7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:50 +0100
Subject: [PATCH 1751/2913] Revert "[nrf fromtree] manifest: hostap: Pull fix
 for duplicate AP enable event"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ff26bc06f8debf13dd2311213d0fd401b562bdb7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index d7fd027b924..2f749eba0f3 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: 0fd0276b5b65de4d2f7cd0552789a74d3a129441
+      revision: cdc0782c6ec76d75456e637bff78004c2c6eae87
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From 984f3b21dd7f3612087d0a1be3335ef8a24d6bcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:50 +0100
Subject: [PATCH 1752/2913] Revert "[nrf fromtree] manifest: hostap: Pull fixes
 from NCS"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ff40678fac59e098e589fd45aca2a097956382e2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 2f749eba0f3..40707c2c58b 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: cdc0782c6ec76d75456e637bff78004c2c6eae87
+      revision: d84b1ea174407f9a501976fb294e39c40c348645
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From e63433acc780209ba640166bfe995db1f3615dc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:50 +0100
Subject: [PATCH 1753/2913] Revert "[nrf fromtree] west.yml: update hostap
 revision"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b5455bd5223a700d8190f9075d89c2a239e588a1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 40707c2c58b..dc77e581c4a 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: d84b1ea174407f9a501976fb294e39c40c348645
+      revision: f6792cb45d848df5d562dd9255dfc6acf62be164
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From 3d420b016585516375bfb121cc3a923087a5145b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:50 +0100
Subject: [PATCH 1754/2913] Revert "[nrf fromtree] west.yml: update hostap
 revision"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b61a09f313305cec7835df2ed553bc70967459cd.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index dc77e581c4a..1265f9cca33 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: f6792cb45d848df5d562dd9255dfc6acf62be164
+      revision: 9896a2ea803ec62e0998c0e569f12af88537d647
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From 98e3714f1421f9fc0ebc7f5685d1bea20b853bbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:50 +0100
Subject: [PATCH 1755/2913] Revert "[nrf fromtree] drivers: nrfwifi: Fix random
 MAC address setting"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2506b9cf4dd65777f832c94e464cb1c20fcea4e0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 5f2e645e575..bccb48b8576 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -511,8 +511,8 @@ config WIFI_FIXED_MAC_ADDRESS
 
 choice
 	prompt "Wi-Fi MAC address type"
+	default WIFI_OTP_MAC_ADDRESS if WIFI_FIXED_MAC_ADDRESS = ""
 	default WIFI_FIXED_MAC_ADDRESS_ENABLED if WIFI_FIXED_MAC_ADDRESS != ""
-	default WIFI_OTP_MAC_ADDRESS
 	help
 	  Select the type of MAC address to be used by the Wi-Fi driver
 

From 794ddfd53af39fff1e433bf907e7e9f1dd89e910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:50 +0100
Subject: [PATCH 1756/2913] Revert "[nrf fromtree] hostap: fix DUT hang when
 start SAP on wrong channel"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ad53702cb8d31624b96385e9d4fe46e8423beaf7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_api.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 21a830bd0b1..f7483e65084 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1574,8 +1574,6 @@ int supplicant_ap_enable(const struct device *dev,
 		goto out;
 	}
 
-	iface->owner = iface;
-
 	if (iface->state == HAPD_IFACE_ENABLED) {
 		ret = -EBUSY;
 		wpa_printf(MSG_ERROR, "Interface %s is not in disable state", dev->name);

From 9bdd484fec8ce4e7aa13e8e9a44fb90abef29632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:50 +0100
Subject: [PATCH 1757/2913] Revert "[nrf fromtree] modules: hostap: Fix checks
 for Enterprise security"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3fe3436d91eceec27759af8ffbae4225ed7445d4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_api.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index f7483e65084..37db2dc22a7 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -509,7 +509,17 @@ static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
 	}
 
 	if (params->security != WIFI_SECURITY_TYPE_NONE) {
-		if (params->psk) {
+		if (params->sae_password) {
+			if ((params->sae_password_length < WIFI_PSK_MIN_LEN) ||
+			    (params->sae_password_length > WIFI_SAE_PSWD_MAX_LEN)) {
+				wpa_printf(MSG_ERROR,
+					   "Passphrase should be in range (%d-%d) characters",
+					   WIFI_PSK_MIN_LEN, WIFI_SAE_PSWD_MAX_LEN);
+				goto out;
+			}
+			strncpy(sae_null_terminated, params->sae_password, WIFI_SAE_PSWD_MAX_LEN);
+			sae_null_terminated[params->sae_password_length] = '\0';
+		} else {
 			if ((params->psk_length < WIFI_PSK_MIN_LEN) ||
 			    (params->psk_length > WIFI_PSK_MAX_LEN)) {
 				wpa_printf(MSG_ERROR,
@@ -541,16 +551,6 @@ static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
 		    params->security == WIFI_SECURITY_TYPE_SAE_H2E ||
 		    params->security == WIFI_SECURITY_TYPE_SAE_AUTO) {
 			if (params->sae_password) {
-				if ((params->sae_password_length < WIFI_PSK_MIN_LEN) ||
-				    (params->sae_password_length > WIFI_SAE_PSWD_MAX_LEN)) {
-					wpa_printf(MSG_ERROR,
-						"Passphrase should be in range (%d-%d) characters",
-						WIFI_PSK_MIN_LEN, WIFI_SAE_PSWD_MAX_LEN);
-					goto out;
-				}
-				strncpy(sae_null_terminated, params->sae_password,
-					WIFI_SAE_PSWD_MAX_LEN);
-				sae_null_terminated[params->sae_password_length] = '\0';
 				if (!wpa_cli_cmd_v("set_network %d sae_password \"%s\"",
 						   resp.network_id, sae_null_terminated)) {
 					goto out;

From b3bdafd0bb92f7bfa03e10431aee492b497bcdc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:50 +0100
Subject: [PATCH 1758/2913] Revert "[nrf fromtree] modules: hostap: Add
 separate config for EAP-FAST"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 39529697afde9c13b35cb67741ab90f98ce209d5.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/CMakeLists.txt | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index 7512152eb14..7369e1ba620 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -477,17 +477,6 @@ zephyr_library_compile_definitions_ifdef(CONFIG_EAP_FAST
   EAP_FAST
 )
 
-# Needs TLS1.3 and SESSION_TICKETS
-zephyr_library_sources_ifdef(CONFIG_EAP_FAST
-  ${HOSTAP_SRC_BASE}/eap_peer/eap_fast.c
-  ${HOSTAP_SRC_BASE}/eap_peer/eap_fast_pac.c
-  ${HOSTAP_SRC_BASE}/eap_common/eap_fast_common.c
-)
-
-zephyr_library_compile_definitions_ifdef(CONFIG_EAP_FAST
-  EAP_FAST
-)
-
 zephyr_library_compile_definitions_ifndef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	CONFIG_NO_CONFIG_BLOBS
 )

From 4da5ee3d7dce130305019bbec8bdc919163a0188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:50 +0100
Subject: [PATCH 1759/2913] Revert "[nrf fromtree] modules: hostap: Add config
 options for EAP types"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6441e79117b3bceda1f3fa470b6572e6d21cdce9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/CMakeLists.txt  | 133 ++++++---------------------------
 modules/hostap/Kconfig         |  50 -------------
 modules/hostap/src/supp_main.h |  30 --------
 3 files changed, 22 insertions(+), 191 deletions(-)

diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index 7369e1ba620..6b6875d9a8f 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -324,157 +324,68 @@ zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_WPS
 )
 
 zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
-	${HOSTAP_SRC_BASE}/eap_common/eap_common.c
-)
-
-zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
-	IEEE8021X_EAPOL
-	EAP_IKEv2
-)
-
-zephyr_library_sources_ifdef(CONFIG_EAP_TLS
 	${HOSTAP_SRC_BASE}/eap_peer/eap_tls.c
 	${HOSTAP_SRC_BASE}/eap_peer/eap_tls_common.c
-)
-
-zephyr_library_compile_definitions_ifdef(CONFIG_EAP_TLS
-	EAP_TLS
-)
-
-zephyr_library_sources_ifdef(CONFIG_EAP_TTLS
-	${HOSTAP_SRC_BASE}/eap_peer/eap_ttls.c
-)
-
-zephyr_library_compile_definitions_ifdef(CONFIG_EAP_TTLS
-        EAP_TTLS
-)
+	${HOSTAP_SRC_BASE}/eap_common/eap_common.c
 
-zephyr_library_sources_ifdef(CONFIG_EAP_PEAP
 	${HOSTAP_SRC_BASE}/eap_peer/eap_peap.c
 	${HOSTAP_SRC_BASE}/eap_common/eap_peap_common.c
-)
-
-zephyr_library_compile_definitions_ifdef(CONFIG_EAP_PEAP
-        EAP_PEAP
-)
-
-zephyr_library_sources_ifdef(CONFIG_EAP_MD5
+	${HOSTAP_SRC_BASE}/eap_peer/eap_ttls.c
 	${HOSTAP_SRC_BASE}/eap_peer/eap_md5.c
-)
-
-zephyr_library_compile_definitions_ifdef(CONFIG_EAP_MD5
-        EAP_MD5
-)
-
-zephyr_library_sources_ifdef(CONFIG_EAP_MSCHAPV2
 	${HOSTAP_SRC_BASE}/eap_peer/eap_mschapv2.c
-	${HOSTAP_SRC_BASE}/eap_peer/mschapv2.c
 	${HOSTAP_SRC_BASE}/eap_common/chap.c
-)
-
-zephyr_library_compile_definitions_ifdef(CONFIG_EAP_MSCHAPV2
-        EAP_MSCHAPv2
-)
-
-zephyr_library_sources_ifdef(CONFIG_EAP_LEAP
+	${HOSTAP_SRC_BASE}/eap_peer/mschapv2.c
 	${HOSTAP_SRC_BASE}/eap_peer/eap_leap.c
-)
 
-zephyr_library_compile_definitions_ifdef(CONFIG_EAP_LEAP
-        EAP_LEAP
-)
-
-zephyr_library_sources_ifdef(CONFIG_EAP_PSK
 	${HOSTAP_SRC_BASE}/eap_peer/eap_psk.c
 	${HOSTAP_SRC_BASE}/eap_common/eap_psk_common.c
-)
 
-zephyr_library_compile_definitions_ifdef(CONFIG_EAP_PSK
-        EAP_PSK
-)
+	${HOSTAP_SRC_BASE}/eap_peer/eap_fast.c
+	${HOSTAP_SRC_BASE}/eap_peer/eap_fast_pac.c
+	${HOSTAP_SRC_BASE}/eap_common/eap_fast_common.c
 
-zephyr_library_sources_ifdef(CONFIG_EAP_PAX
 	${HOSTAP_SRC_BASE}/eap_peer/eap_pax.c
 	${HOSTAP_SRC_BASE}/eap_common/eap_pax_common.c
-)
 
-zephyr_library_compile_definitions_ifdef(CONFIG_EAP_PAX
-        EAP_PAX
-)
-
-zephyr_library_sources_ifdef(CONFIG_EAP_SAKE
 	${HOSTAP_SRC_BASE}/eap_peer/eap_sake.c
 	${HOSTAP_SRC_BASE}/eap_common/eap_sake_common.c
-)
 
-zephyr_library_compile_definitions_ifdef(CONFIG_EAP_SAKE
-        EAP_SAKE
-)
-
-zephyr_library_sources_ifdef(CONFIG_EAP_GPSK
 	${HOSTAP_SRC_BASE}/eap_peer/eap_gpsk.c
 	${HOSTAP_SRC_BASE}/eap_common/eap_gpsk_common.c
-)
-
-zephyr_library_compile_definitions_ifdef(CONFIG_EAP_GPSK
-        EAP_GPSK
-)
 
-zephyr_library_sources_ifdef(CONFIG_EAP_PWD
 	${HOSTAP_SRC_BASE}/eap_peer/eap_pwd.c
 	${HOSTAP_SRC_BASE}/eap_common/eap_pwd_common.c
-)
-
-zephyr_library_compile_definitions_ifdef(CONFIG_EAP_PWD
-        EAP_PWD
-)
 
-zephyr_library_sources_ifdef(CONFIG_EAP_EKE
 	${HOSTAP_SRC_BASE}/eap_peer/eap_eke.c
 	${HOSTAP_SRC_BASE}/eap_common/eap_eke_common.c
-)
 
-zephyr_library_compile_definitions_ifdef(CONFIG_EAP_EKE
-        EAP_EKE
-)
-
-zephyr_library_sources_ifdef(CONFIG_EAP_IKEV2
 	${HOSTAP_SRC_BASE}/eap_peer/eap_ikev2.c
 	${HOSTAP_SRC_BASE}/eap_peer/ikev2.c
 	${HOSTAP_SRC_BASE}/eap_common/eap_ikev2_common.c
 	${HOSTAP_SRC_BASE}/eap_common/ikev2_common.c
-)
-
-zephyr_library_compile_definitions_ifdef(CONFIG_EAP_IKEV2
-        EAP_IKEV2
-)
 
-zephyr_library_sources_ifdef(CONFIG_EAP_SIM
 	${HOSTAP_SRC_BASE}/eap_peer/eap_sim.c
 	${HOSTAP_SRC_BASE}/eap_common/eap_sim_common.c
-)
-
-zephyr_library_compile_definitions_ifdef(CONFIG_EAP_SIM
-        EAP_SIM
-)
 
-zephyr_library_sources_ifdef(CONFIG_EAP_AKA
 	${HOSTAP_SRC_BASE}/eap_peer/eap_aka.c
 )
 
-zephyr_library_compile_definitions_ifdef(CONFIG_EAP_AKA
-        EAP_AKA
-)
-
-# Needs TLS1.3 and SESSION_TICKETS
-zephyr_library_sources_ifdef(CONFIG_EAP_FAST
-  ${HOSTAP_SRC_BASE}/eap_peer/eap_fast.c
-  ${HOSTAP_SRC_BASE}/eap_peer/eap_fast_pac.c
-  ${HOSTAP_SRC_BASE}/eap_common/eap_fast_common.c
-)
-
-zephyr_library_compile_definitions_ifdef(CONFIG_EAP_FAST
-  EAP_FAST
+zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+	EAP_TLS
+	IEEE8021X_EAPOL
+	EAP_PEAP
+	EAP_TTLS
+	EAP_MD5
+	EAP_MSCHAPv2
+	EAP_LEAP
+	EAP_PSK
+	EAP_FAST
+	EAP_PAX
+	EAP_SAKE
+	EAP_GPSK
+	EAP_PWD
+	EAP_EKE
+	EAP_IKEv2
 )
 
 zephyr_library_compile_definitions_ifndef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index 01574cfc60c..e1417e14e02 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -178,56 +178,6 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	select MBEDTLS_PEM_CERTIFICATE_FORMAT
 	depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
 
-config EAP_TLS
-	bool "EAP-TLS support"
-
-config EAP_TTLS
-	bool "EAP-TTLS support"
-
-config EAP_PEAP
-	bool "EAP-PEAP support"
-
-config EAP_MD5
-	bool "EAP-MD5 support"
-
-config EAP_MSCHAPV2
-	bool "EAP-MSCHAPv2 support"
-
-config EAP_LEAP
-	bool "EAP-LEAP support"
-
-config EAP_PSK
-	bool "EAP-PSK support"
-
-config EAP_PAX
-	bool "EAP-PAX support"
-
-config EAP_SAKE
-	bool "EAP-SAKE support"
-
-config EAP_GPSK
-	bool "EAP-GPSK support"
-
-config EAP_PWD
-	bool "EAP-PWD support"
-
-config EAP_EKE
-	bool "EAP-EKE support"
-
-config EAP_IKEV2
-	bool "EAP-IKEv2 support"
-
-config EAP_SIM
-	bool "EAP-SIM support"
-
-config EAP_AKA
-	bool "EAP-AKA support"
-
-config EAP_ALL
-	bool "All EAP methods support"
-	select EAP_TLS
-	default y if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
-
 config WIFI_NM_WPA_SUPPLICANT_WPA3
 	bool "WPA3 support"
 	depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
diff --git a/modules/hostap/src/supp_main.h b/modules/hostap/src/supp_main.h
index 7137d281929..03f7461555e 100644
--- a/modules/hostap/src/supp_main.h
+++ b/modules/hostap/src/supp_main.h
@@ -6,36 +6,6 @@
 #ifndef __SUPP_MAIN_H_
 #define __SUPP_MAIN_H_
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
-/* At least one of the EAP methods need to be enabled in enterprise mode */
-#if !defined(CONFIG_EAP_TLS) && !defined(CONFIG_EAP_TTLS) && \
-	!defined(CONFIG_EAP_PEAP) && !defined(CONFIG_EAP_FAST) && \
-	!defined(CONFIG_EAP_SIM) && !defined(CONFIG_EAP_AKA) && \
-	!defined(CONFIG_EAP_MD5) && !defined(CONFIG_EAP_MSCHAPV2) && \
-	!defined(CONFIG_EAP_PSK) && !defined(CONFIG_EAP_PAX) && \
-	!defined(CONFIG_EAP_SAKE) && !defined(CONFIG_EAP_GPSK) && \
-	!defined(CONFIG_EAP_PWD) && !defined(CONFIG_EAP_EKE) && \
-	!defined(CONFIG_EAP_IKEV2)
-#error "At least one of the following EAP methods need to be defined    \
-	CONFIG_EAP_TLS    \
-	CONFIG_EAP_TTLS   \
-	CONFIG_EAP_PEAP   \
-	CONFIG_EAP_MD5        \
-	CONFIG_EAP_MSCHAPV2    \
-	CONFIG_EAP_LEAP    \
-	CONFIG_EAP_PSK   \
-	CONFIG_EAP_PAX   \
-	CONFIG_EAP_SAKE   \
-	CONFIG_EAP_GPSK   \
-	CONFIG_EAP_PWD   \
-	CONFIG_EAP_EKE   \
-	CONFIG_EAP_IKEV2   \
-	CONFIG_EAP_SIM   \
-	CONFIG_EAP_AKA   \
-	CONFIG_EAP_ALL "
-#endif /* EAP METHODS */
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
-
 #if !defined(CONFIG_NET_DHCPV4)
 static inline void net_dhcpv4_start(struct net_if *iface)
 {

From b521fe9c13e3b85ae1c4ce21ad976176c9b7c703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:50 +0100
Subject: [PATCH 1760/2913] Revert "[nrf fromtree] hostap: add
 WPA-Auto-Personal(WPA2/WPA3 mixed) support"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3e8fb90a4ca096865c6b5c684858b97611a6a7c2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_api.c | 53 +----------------------------------
 1 file changed, 1 insertion(+), 52 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 37db2dc22a7..2d0b1b38b05 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -603,32 +603,6 @@ static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
 					goto out;
 				}
 			}
-		} else if (params->security == WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL) {
-			if (!wpa_cli_cmd_v("set_network %d psk \"%s\"", resp.network_id,
-					   psk_null_terminated)) {
-				goto out;
-			}
-
-			if (params->sae_password) {
-				if (!wpa_cli_cmd_v("set_network %d sae_password \"%s\"",
-						   resp.network_id, sae_null_terminated)) {
-					goto out;
-				}
-			} else {
-				if (!wpa_cli_cmd_v("set_network %d sae_password \"%s\"",
-						   resp.network_id, psk_null_terminated)) {
-					goto out;
-				}
-			}
-
-			if (!wpa_cli_cmd_v("set sae_pwe 2")) {
-				goto out;
-			}
-
-			if (!wpa_cli_cmd_v("set_network %d key_mgmt WPA-PSK SAE",
-					   resp.network_id)) {
-				goto out;
-			}
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 		} else if (params->security == WIFI_SECURITY_TYPE_EAP_TLS) {
 			if (!wpa_cli_cmd_v("set_network %d key_mgmt WPA-EAP",
@@ -1433,32 +1407,7 @@ int hapd_config_network(struct hostapd_iface *iface,
 			if (!hostapd_cli_cmd_v("set sae_pwe 2")) {
 				goto out;
 			}
-		} else if (params->security == WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL) {
-			if (!hostapd_cli_cmd_v("set wpa 2")) {
-				goto out;
-			}
-
-			if (!hostapd_cli_cmd_v("set wpa_key_mgmt WPA-PSK SAE")) {
-				goto out;
-			}
-
-			if (!hostapd_cli_cmd_v("set wpa_passphrase \"%s\"", params->psk)) {
-				goto out;
-			}
-
-			if (!hostapd_cli_cmd_v("set sae_password \"%s\"",
-					       params->sae_password ? params->sae_password
-								    : params->psk)) {
-				goto out;
-			}
-
-			if (!hostapd_cli_cmd_v("set rsn_pairwise CCMP")) {
-				goto out;
-			}
-
-			if (!hostapd_cli_cmd_v("set sae_pwe 2")) {
-				goto out;
-			}
+			iface->bss[0]->conf->sae_pwe = 2;
 		} else if (params->security == WIFI_SECURITY_TYPE_DPP) {
 			if (!hostapd_cli_cmd_v("set wpa 2")) {
 				goto out;

From 2adcc379fafb6ad6b77f69b5f6dfd02fdc7afa14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:50 +0100
Subject: [PATCH 1761/2913] Revert "[nrf fromtree] hostap: fix other STA failed
 to connect to SAP"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cfc1427785547a9e199973d0f1d66e4770827c38.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_api.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 2d0b1b38b05..722fd03e828 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1357,7 +1357,7 @@ int hapd_config_network(struct hostapd_iface *iface,
 			if (!hostapd_cli_cmd_v("set wpa_key_mgmt WPA-PSK")) {
 				goto out;
 			}
-			if (!hostapd_cli_cmd_v("set wpa_passphrase %s", params->psk)) {
+			if (!hostapd_cli_cmd_v("set wpa_passphrase \"%s\"", params->psk)) {
 				goto out;
 			}
 			if (!hostapd_cli_cmd_v("set wpa_pairwise CCMP")) {
@@ -1370,7 +1370,7 @@ int hapd_config_network(struct hostapd_iface *iface,
 			if (!hostapd_cli_cmd_v("set wpa_key_mgmt WPA-PSK")) {
 				goto out;
 			}
-			if (!hostapd_cli_cmd_v("set wpa_passphrase %s", params->psk)) {
+			if (!hostapd_cli_cmd_v("set wpa_passphrase \"%s\"", params->psk)) {
 				goto out;
 			}
 			if (!hostapd_cli_cmd_v("set rsn_pairwise CCMP")) {
@@ -1383,7 +1383,7 @@ int hapd_config_network(struct hostapd_iface *iface,
 			if (!hostapd_cli_cmd_v("set wpa_key_mgmt WPA-PSK-SHA256")) {
 				goto out;
 			}
-			if (!hostapd_cli_cmd_v("set wpa_passphrase %s", params->psk)) {
+			if (!hostapd_cli_cmd_v("set wpa_passphrase \"%s\"", params->psk)) {
 				goto out;
 			}
 			if (!hostapd_cli_cmd_v("set rsn_pairwise CCMP")) {
@@ -1396,7 +1396,7 @@ int hapd_config_network(struct hostapd_iface *iface,
 			if (!hostapd_cli_cmd_v("set wpa_key_mgmt SAE")) {
 				goto out;
 			}
-			if (!hostapd_cli_cmd_v("set sae_password %s",
+			if (!hostapd_cli_cmd_v("set sae_password \"%s\"",
 					       params->sae_password ? params->sae_password :
 					       params->psk)) {
 				goto out;

From e78d1e39349fdebfc3029dfde7f2c09fb6691a7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:50 +0100
Subject: [PATCH 1762/2913] Revert "[nrf fromtree] modules: hostap: Use the
 build time flag"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d6107710ba046088fdabf3a8d46c242d97a5010a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index ce91c1a6e8e..89a3b194c36 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -871,7 +871,7 @@ struct hostapd_config *hostapd_config_read2(const char *fname)
 
 	bss                 = conf->last_bss;
 	bss->start_disabled = 1;
-	bss->max_num_sta    = CONFIG_WIFI_MGMT_AP_MAX_NUM_STA;
+	bss->max_num_sta    = 8;
 	bss->dtim_period    = 1;
 	os_strlcpy(conf->bss[0]->iface, ifname, sizeof(conf->bss[0]->iface));
 	bss->logger_stdout_level = HOSTAPD_LEVEL_INFO;

From ca4ab3d5db848b4a78b47c17f3f7e42e21369d44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:50 +0100
Subject: [PATCH 1763/2913] Revert "[nrf fromtree] modules: hostap: Add missing
 default for max STAs in AP mode"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 939749ed39292a6f44f8cc591d8c9c8100a5035b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_api.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 722fd03e828..b52a55d222b 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1575,8 +1575,6 @@ int supplicant_ap_enable(const struct device *dev,
 
 	/* No need to check for existing network to join for SoftAP*/
 	wpa_s->conf->ap_scan = 2;
-	/* Set BSS parameter max_num_sta to default configured value */
-	wpa_s->conf->max_num_sta = CONFIG_WIFI_MGMT_AP_MAX_NUM_STA;
 
 	ret = wpas_add_and_config_network(wpa_s, params, true);
 	if (ret) {

From df4e7f910991397f4bb222305257d2bf40c880fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:50 +0100
Subject: [PATCH 1764/2913] Revert "[nrf fromtree] modules: hostap: Fix heap
 pool allocation"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6abc047bbaf336526f107f60344caef8bd57205f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/Kconfig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index e1417e14e02..4350b054e13 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -23,13 +23,13 @@ config WIFI_NM_WPA_SUPPLICANT
 
 if WIFI_NM_WPA_SUPPLICANT
 
-config HEAP_MEM_POOL_ADD_SIZE_HOSTAP
-	def_int 85000 if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE && !MBEDTLS_ENABLE_HEAP
-	def_int 40000 if WIFI_NM_WPA_SUPPLICANT_AP
+config COMMON_LIBC_MALLOC_ARENA_SIZE
+	default 85000 if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE && !MBEDTLS_ENABLE_HEAP
+	default 40000 if WIFI_NM_WPA_SUPPLICANT_AP
 	# 8192 for MbedTLS heap
-	def_int 21808 if MBEDTLS_ENABLE_HEAP
+	default 21808 if MBEDTLS_ENABLE_HEAP
 	# 30K is mandatory, but might need more for long duration use cases
-	def_int 30000
+	default 30000
 
 config WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE
 	int "Stack size for wpa_supplicant thread"

From 1fd65a7c70c9c615045a841ea76b3de3c5a8064a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:50 +0100
Subject: [PATCH 1765/2913] Revert "[nrf fromtree] modules: hostap: Use OS
 primitive even in native code"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9c998e0466efe869c69bda691293ea3534d415d1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_api.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index b52a55d222b..36c808a0f0f 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -269,7 +269,7 @@ static int wpa_supp_supported_channels(struct wpa_supplicant *wpa_s, uint8_t ban
 	}
 
 	size = ((mode->num_channels) * CHAN_NUM_LEN) + 1;
-	_chan_list = os_malloc(size);
+	_chan_list = k_malloc(size);
 	if (!_chan_list) {
 		wpa_printf(MSG_ERROR, "Mem alloc failed for channel list");
 		return -ENOMEM;
@@ -500,11 +500,11 @@ static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
 		if (chan_list) {
 			if (!wpa_cli_cmd_v("set_network %d scan_freq%s", resp.network_id,
 					   chan_list)) {
-				os_free(chan_list);
+				k_free(chan_list);
 				goto out;
 			}
 
-			os_free(chan_list);
+			k_free(chan_list);
 		}
 	}
 

From f088506e1e39304a8bc80c1a3d28f6f0d0745533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:51 +0100
Subject: [PATCH 1766/2913] Revert "[nrf fromtree] hostap: add crypto module
 test kconfig option"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 29aca670905ba5526b9c58e503a42b59f336c7f0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/CMakeLists.txt | 7 -------
 modules/hostap/Kconfig        | 4 ----
 2 files changed, 11 deletions(-)

diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index 6b6875d9a8f..1f30ee34416 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -503,13 +503,6 @@ zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	${HOSTAP_SRC_BASE}/crypto/fips_prf_internal.c
 	${HOSTAP_SRC_BASE}/crypto/milenage.c
 )
-
-zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_TEST
-	${HOSTAP_SRC_BASE}/crypto/crypto_module_tests.c
-	${HOSTAP_SRC_BASE}/crypto/fips_prf_internal.c
-	${HOSTAP_SRC_BASE}/crypto/sha1-internal.c
-	${HOSTAP_SRC_BASE}/crypto/sha1-tlsprf.c
-)
 endif()
 
 zephyr_library_link_libraries_ifndef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index 4350b054e13..c49cee46973 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -485,8 +485,4 @@ config SAE_PWE_EARLY_EXIT
 	  this can be intensive, so, add an option to exit early.
 	  Note that this is highly insecure and shouldn't be used in production
 
-config WIFI_NM_WPA_SUPPLICANT_CRYPTO_TEST
-	bool
-	depends on WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA
-
 endif # WIFI_NM_WPA_SUPPLICANT

From 516706bfd024b373420b6d4842570fd77f24eb43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:51 +0100
Subject: [PATCH 1767/2913] Revert "[nrf fromtree] hostap: Use proper value
 when generating supplicant event"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 83b66a55f6a6e49a5a3c8caf2fb0b52f5b7b7556.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/wifi_mgmt.h   | 2 --
 modules/hostap/src/supp_events.c | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/zephyr/net/wifi_mgmt.h b/include/zephyr/net/wifi_mgmt.h
index 467880c56ec..db90f27500d 100644
--- a/include/zephyr/net/wifi_mgmt.h
+++ b/include/zephyr/net/wifi_mgmt.h
@@ -280,8 +280,6 @@ enum net_event_wifi_cmd {
 	NET_EVENT_WIFI_CMD_AP_STA_CONNECTED,
 	/** STA disconnected from AP */
 	NET_EVENT_WIFI_CMD_AP_STA_DISCONNECTED,
-	/** Supplicant specific event */
-	NET_EVENT_WIFI_CMD_SUPPLICANT,
 };
 
 /** Event emitted for Wi-Fi scan result */
diff --git a/modules/hostap/src/supp_events.c b/modules/hostap/src/supp_events.c
index 9ac472b6bdb..617779b4d44 100644
--- a/modules/hostap/src/supp_events.c
+++ b/modules/hostap/src/supp_events.c
@@ -386,7 +386,7 @@ int supplicant_send_wifi_mgmt_event(const char *ifname, enum net_event_wifi_cmd
 				(struct wifi_ap_sta_info *)supplicant_status);
 		break;
 #endif /* CONFIG_AP */
-	case NET_EVENT_WIFI_CMD_SUPPLICANT:
+	case NET_EVENT_SUPPLICANT_CMD_INT_EVENT:
 		event_data.data = &data;
 		if (supplicant_process_status(&event_data, (char *)supplicant_status) > 0) {
 			net_mgmt_event_notify_with_info(NET_EVENT_SUPPLICANT_INT_EVENT,

From 94f13d2f0f9f2a8b21d0fc5e8272aa45a261e9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:51 +0100
Subject: [PATCH 1768/2913] Revert "[nrf fromtree] net: wifi: shell: add reg
 domain support"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c05b4ebbc31859de1300dbc444a127106d1360d3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_api.c | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 36c808a0f0f..93a9a9b5dff 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1141,44 +1141,13 @@ int supplicant_reg_domain(const struct device *dev,
 			  struct wifi_reg_domain *reg_domain)
 {
 	const struct wifi_mgmt_ops *const wifi_mgmt_api = get_wifi_mgmt_api(dev);
-	struct wpa_supplicant *wpa_s;
-	int ret = -1;
 
 	if (!wifi_mgmt_api || !wifi_mgmt_api->reg_domain) {
 		wpa_printf(MSG_ERROR, "Regulatory domain not supported");
 		return -ENOTSUP;
 	}
 
-	if (reg_domain->oper == WIFI_MGMT_GET) {
-		return wifi_mgmt_api->reg_domain(dev, reg_domain);
-	}
-
-	if (reg_domain->oper == WIFI_MGMT_SET) {
-		k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
-
-		wpa_s = get_wpa_s_handle(dev);
-		if (!wpa_s) {
-			wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
-			goto out;
-		}
-
-		if (!wpa_cli_cmd_v("set country %s", reg_domain->country_code)) {
-			goto out;
-		}
-
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-		if (!hostapd_cli_cmd_v("set country_code %s", reg_domain->country_code)) {
-			goto out;
-		}
-#endif
-
-		ret = 0;
-
-out:
-		k_mutex_unlock(&wpa_supplicant_mutex);
-	}
-
-	return ret;
+	return wifi_mgmt_api->reg_domain(dev, reg_domain);
 }
 
 int supplicant_mode(const struct device *dev, struct wifi_mode_info *mode)

From 071e56e49b65fd42f8e3395382652e2de51e8275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:51 +0100
Subject: [PATCH 1769/2913] Revert "[nrf fromtree] hostap: The security keys
 were checked in wrong function"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d48b43dd08d0086593545ea0ea6fdfbe87dcf58f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_api.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 93a9a9b5dff..20980f74210 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -348,6 +348,10 @@ static inline int chan_to_freq(int chan)
 static inline enum wifi_frequency_bands wpas_band_to_zephyr(enum wpa_radio_work_band band)
 {
 	switch (band) {
+	case WPA_KEY_MGMT_IEEE8021X:
+	case WPA_KEY_MGMT_IEEE8021X_SUITE_B:
+	case WPA_KEY_MGMT_IEEE8021X_SUITE_B_192:
+		return WIFI_SECURITY_TYPE_EAP_TLS;
 	case BAND_2_4_GHZ:
 		return WIFI_FREQ_BAND_2_4_GHZ;
 	case BAND_5_GHZ:
@@ -360,10 +364,6 @@ static inline enum wifi_frequency_bands wpas_band_to_zephyr(enum wpa_radio_work_
 static inline enum wifi_security_type wpas_key_mgmt_to_zephyr(int key_mgmt, int proto)
 {
 	switch (key_mgmt) {
-	case WPA_KEY_MGMT_IEEE8021X:
-	case WPA_KEY_MGMT_IEEE8021X_SUITE_B:
-	case WPA_KEY_MGMT_IEEE8021X_SUITE_B_192:
-		return WIFI_SECURITY_TYPE_EAP_TLS;
 	case WPA_KEY_MGMT_NONE:
 		return WIFI_SECURITY_TYPE_NONE;
 	case WPA_KEY_MGMT_PSK:

From 59144ce68eb32043a9a2a235ed04f9c0633880a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:51 +0100
Subject: [PATCH 1770/2913] Revert "[nrf fromtree] hostap: add AP configuration
 cmd support"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6108eddf50dc659107e27581facd41e02ca75844.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_api.c  | 51 ----------------------------------
 modules/hostap/src/supp_api.h  |  9 ------
 modules/hostap/src/supp_main.c |  1 -
 3 files changed, 61 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 20980f74210..f2f8cadc7d8 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1410,57 +1410,6 @@ int hapd_config_network(struct hostapd_iface *iface,
 out:
 	return ret;
 }
-
-int supplicant_ap_config_params(const struct device *dev, struct wifi_ap_config_params *params)
-{
-	struct hostapd_iface *iface;
-	const struct wifi_mgmt_ops *const wifi_mgmt_api = get_wifi_mgmt_api(dev);
-	int ret = 0;
-
-	if (params->type & WIFI_AP_CONFIG_PARAM_MAX_INACTIVITY) {
-		if (!wifi_mgmt_api || !wifi_mgmt_api->ap_config_params) {
-			wpa_printf(MSG_ERROR, "ap_config_params not supported");
-			return -ENOTSUP;
-		}
-
-		ret = wifi_mgmt_api->ap_config_params(dev, params);
-		if (ret) {
-			wpa_printf(MSG_ERROR,
-				   "Failed to set maximum inactivity duration for stations");
-		} else {
-			wpa_printf(MSG_INFO, "Set maximum inactivity duration for stations: %d (s)",
-				   params->max_inactivity);
-		}
-	}
-	if (params->type & WIFI_AP_CONFIG_PARAM_MAX_NUM_STA) {
-		k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
-
-		iface = get_hostapd_handle(dev);
-		if (!iface) {
-			ret = -ENOENT;
-			wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
-			goto out;
-		}
-
-		if (iface->state > HAPD_IFACE_DISABLED) {
-			ret = -EBUSY;
-			wpa_printf(MSG_ERROR, "Interface %s is not in disable state", dev->name);
-			goto out;
-		}
-
-		if (!hostapd_cli_cmd_v("set max_num_sta %d", params->max_num_sta)) {
-			ret = -EINVAL;
-			wpa_printf(MSG_ERROR, "Failed to set maximum number of stations");
-			goto out;
-		}
-		wpa_printf(MSG_INFO, "Set maximum number of stations: %d", params->max_num_sta);
-
-out:
-		k_mutex_unlock(&wpa_supplicant_mutex);
-	}
-
-	return ret;
-}
 #endif
 
 int supplicant_ap_enable(const struct device *dev,
diff --git a/modules/hostap/src/supp_api.h b/modules/hostap/src/supp_api.h
index 37eb8e52bc4..0bd1461a117 100644
--- a/modules/hostap/src/supp_api.h
+++ b/modules/hostap/src/supp_api.h
@@ -225,15 +225,6 @@ int supplicant_get_wifi_conn_params(const struct device *dev,
  * @return 0 for OK; -1 for ERROR
  */
 int hapd_state(const struct device *dev, int *state);
-
-/**
- * @brief Wi-Fi AP configuration parameter.
- *
- * @param dev Wi-Fi device
- * @param params AP parameters
- * @return 0 for OK; -1 for ERROR
- */
-int supplicant_ap_config_params(const struct device *dev, struct wifi_ap_config_params *params);
 #else
 static inline int hapd_state(const struct device *dev, int *state)
 {
diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index 89a3b194c36..04ddbb8267a 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -99,7 +99,6 @@ static const struct wifi_mgmt_ops mgmt_ap_ops = {
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	.dpp_dispatch = hapd_dpp_dispatch,
 #endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
-	.ap_config_params = supplicant_ap_config_params,
 };
 
 DEFINE_WIFI_NM_INSTANCE(hostapd, &mgmt_ap_ops);

From 73ba0d98e3a6281928e0644b8f787537a673d6b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:51 +0100
Subject: [PATCH 1771/2913] Revert "[nrf fromtree] zephyr: hostap: fix eap
 secure mode print UNKNOWN"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 725a9f1de4fc3abdb4759db3b28e9f48403af9fd.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_api.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index f2f8cadc7d8..96852e1e6e7 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -348,10 +348,6 @@ static inline int chan_to_freq(int chan)
 static inline enum wifi_frequency_bands wpas_band_to_zephyr(enum wpa_radio_work_band band)
 {
 	switch (band) {
-	case WPA_KEY_MGMT_IEEE8021X:
-	case WPA_KEY_MGMT_IEEE8021X_SUITE_B:
-	case WPA_KEY_MGMT_IEEE8021X_SUITE_B_192:
-		return WIFI_SECURITY_TYPE_EAP_TLS;
 	case BAND_2_4_GHZ:
 		return WIFI_FREQ_BAND_2_4_GHZ;
 	case BAND_5_GHZ:

From 0905c01798690f53dae208e362b220b64e7b3172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:51 +0100
Subject: [PATCH 1772/2913] Revert "[nrf fromtree] hostap: only add STA
 interface when hostapd enabled"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 554c61a02662de46e5c02e4fc19bae2bbd90e463.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_main.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index 04ddbb8267a..ca64c321e3b 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -506,12 +506,6 @@ static void iface_cb(struct net_if *iface, void *user_data)
 		return;
 	}
 
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-	if (wifi_nm_iface_is_sap(iface)) {
-		return;
-	}
-#endif
-
 	if (!net_if_is_admin_up(iface)) {
 		return;
 	}

From a31031b2370888c54f15ce2dfd2525fd229c05f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:51 +0100
Subject: [PATCH 1773/2913] Revert "[nrf noup] net: lib: coap: Make use of
 ZSOCK_MSG_TRUNC configurable"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 00faf4479c36edfe3349bf2594114e7de5abe008.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/Kconfig       |  5 -----
 subsys/net/lib/coap/coap_client.c | 15 ++-------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/subsys/net/lib/coap/Kconfig b/subsys/net/lib/coap/Kconfig
index e41e80ef1d8..61a5d2ab785 100644
--- a/subsys/net/lib/coap/Kconfig
+++ b/subsys/net/lib/coap/Kconfig
@@ -152,11 +152,6 @@ config COAP_CLIENT_MAX_REQUESTS
 	help
 	  Maximum number of CoAP requests a single client can handle at a time
 
-config COAP_CLIENT_TRUNCATE_MSGS
-	bool "Truncate blocks larger than the buffer size"
-	help
-	  Include ZSOCK_MSG_TRUNC in flags passed to zsock_recvfrom()
-
 endif # COAP_CLIENT
 
 config COAP_SERVER
diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index 7c49a90981b..c99a612cc88 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -552,21 +552,14 @@ static int recv_response(struct coap_client *client, struct coap_packet *respons
 	int total_len;
 	int available_len;
 	int ret;
-	int flags = ZSOCK_MSG_DONTWAIT;
-
-	if (IS_ENABLED(CONFIG_COAP_CLIENT_TRUNCATE_MSGS)) {
-		flags |= ZSOCK_MSG_TRUNC;
-	}
 
 	memset(client->recv_buf, 0, sizeof(client->recv_buf));
 	total_len = receive(client->fd, client->recv_buf, sizeof(client->recv_buf),
-			    flags, &client->address, &client->socklen);
+			    ZSOCK_MSG_DONTWAIT | ZSOCK_MSG_TRUNC, &client->address,
+			    &client->socklen);
 
 	if (total_len < 0) {
 		LOG_ERR("Error reading response: %d", errno);
-		if (errno == EOPNOTSUPP) {
-			return -errno;
-		}
 		return -EINVAL;
 	} else if (total_len == 0) {
 		LOG_ERR("Zero length recv");
@@ -903,10 +896,6 @@ static void coap_client_recv(void *coap_cl, void *a, void *b)
 					LOG_ERR("Error receiving response");
 					clients[i]->response_ready = false;
 					k_mutex_unlock(&clients[i]->lock);
-					if (ret == -EOPNOTSUPP) {
-						LOG_ERR("Socket misconfigured.");
-						goto idle;
-					}
 					continue;
 				}
 

From 049dc1e1508244a61cd07d7de263d6bc4da8e067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:51 +0100
Subject: [PATCH 1774/2913] Revert "[nrf noup] dts: Add bt-ll-sw-split snippet"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 73127457dd15b87fd4a7757df0c4e10dfeb5dd4e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/bluetooth/bap_broadcast_sink/sysbuild.cmake | 4 ----
 samples/bluetooth/cap_acceptor/sample.yaml          | 4 +---
 samples/bluetooth/cap_acceptor/sysbuild.cmake       | 4 ----
 samples/bluetooth/cap_initiator/sample.yaml         | 4 +---
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/samples/bluetooth/bap_broadcast_sink/sysbuild.cmake b/samples/bluetooth/bap_broadcast_sink/sysbuild.cmake
index d5d260789ff..2523aac8ea7 100644
--- a/samples/bluetooth/bap_broadcast_sink/sysbuild.cmake
+++ b/samples/bluetooth/bap_broadcast_sink/sysbuild.cmake
@@ -18,10 +18,6 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
-	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
-	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
-	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
-
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/cap_acceptor/sample.yaml b/samples/bluetooth/cap_acceptor/sample.yaml
index 99de826eb6f..6be99aab183 100644
--- a/samples/bluetooth/cap_acceptor/sample.yaml
+++ b/samples/bluetooth/cap_acceptor/sample.yaml
@@ -26,7 +26,5 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52840dk/nrf52840
       - nrf52840dongle/nrf52840
-    extra_args:
-      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/cap_acceptor/sysbuild.cmake b/samples/bluetooth/cap_acceptor/sysbuild.cmake
index d5d260789ff..2523aac8ea7 100644
--- a/samples/bluetooth/cap_acceptor/sysbuild.cmake
+++ b/samples/bluetooth/cap_acceptor/sysbuild.cmake
@@ -18,10 +18,6 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
-	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
-	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
-	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
-
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/cap_initiator/sample.yaml b/samples/bluetooth/cap_initiator/sample.yaml
index 865c3f5e11e..12a6022bcd7 100644
--- a/samples/bluetooth/cap_initiator/sample.yaml
+++ b/samples/bluetooth/cap_initiator/sample.yaml
@@ -26,7 +26,5 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52840dk/nrf52840
       - nrf52840dongle/nrf52840
-    extra_args:
-      - OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
-      - SNIPPET="bt-ll-sw-split"
+    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
     tags: bluetooth

From a39aae69d94d8c7834b5ae1812714b48297ee46b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:51 +0100
Subject: [PATCH 1775/2913] Revert "[nrf noup] net: tests: crypto: Adding
 legacy Crypto support ipv6 tests"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1a5bfcdc8771ca6ebc26dd0c9f7f0bcbc79cd44f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/ipv6/prj.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/net/ipv6/prj.conf b/tests/net/ipv6/prj.conf
index c8dda772895..51cfa883727 100644
--- a/tests/net/ipv6/prj.conf
+++ b/tests/net/ipv6/prj.conf
@@ -33,7 +33,6 @@ CONFIG_NET_IF_MAX_IPV6_COUNT=2
 CONFIG_NET_IPV6_PE=y
 CONFIG_NET_IPV6_PE_FILTER_PREFIX_COUNT=2
 CONFIG_NET_IPV6_PE_PREFER_PUBLIC_ADDRESSES=n
-CONFIG_MBEDTLS_LEGACY_CRYPTO_C=y
 
 # Increase the stack a bit for mps2/an385
 CONFIG_NET_RX_STACK_SIZE=1700

From 3010cce42ea793ad59831dee7c9b38d5177ed231 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:51 +0100
Subject: [PATCH 1776/2913] Revert "[nrf noup] net: tests: Add legacy crypto
 API support for big_http_download"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e38e10f814c596e02320253c17b948a692f1374e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/net/sockets/big_http_download/prj.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/samples/net/sockets/big_http_download/prj.conf b/samples/net/sockets/big_http_download/prj.conf
index 8677e7113e4..a406f314dfb 100644
--- a/samples/net/sockets/big_http_download/prj.conf
+++ b/samples/net/sockets/big_http_download/prj.conf
@@ -3,7 +3,6 @@ CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_ENABLE_HEAP=y
 CONFIG_MBEDTLS_MD=y
-CONFIG_MBEDTLS_LEGACY_CRYPTO_C=y
 CONFIG_MAIN_STACK_SIZE=2536
 
 # Networking config

From af00ed1cfda18e8e4ca2697490913d03a9ea3cc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:51 +0100
Subject: [PATCH 1777/2913] Revert "[nrf noup] mbedtls: Don't enable
 auto-generation of Mbed TLS files"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 59f4768d7c0cb16cbf6385a7fe5e3b8e02394a5c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/crypto/mbedtls/CMakeLists.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/crypto/mbedtls/CMakeLists.txt b/tests/crypto/mbedtls/CMakeLists.txt
index 47670bead01..7ebdc9d76a9 100644
--- a/tests/crypto/mbedtls/CMakeLists.txt
+++ b/tests/crypto/mbedtls/CMakeLists.txt
@@ -6,5 +6,15 @@ project(mbedtls)
 
 set(output_file ${PROJECT_BINARY_DIR}/mbedtls-check.timestamp)
 
+add_custom_command(
+    COMMENT "Check Mbed TLS auto-generated files"
+    COMMAND
+        ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/modules/mbedtls/create_psa_files.py --check
+    OUTPUT
+        ${output_file}
+)
+
+add_custom_target(check_mbedtls_auto_generated_files ALL DEPENDS ${output_file})
+
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})

From 1ab6a45166b6ae4e4b560746e43bbc235c9e4c6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:51 +0100
Subject: [PATCH 1778/2913] Revert "[nrf noup] dts: Select SoftDevice
 Controller DTS binding as default"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b22e695a722ce2aae31b0c1f9549d1bb61ec1ce3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi | 4 ++--
 dts/common/nordic/nrf54l20.dtsi                       | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
index ed9d76a6b19..cdf6d62a30a 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
@@ -18,7 +18,7 @@
 		zephyr,bt-c2h-uart = &uart20;
 		zephyr,flash-controller = &rram_controller;
 		zephyr,flash = &cpuapp_rram;
-		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,bt-hci = &bt_hci_controller;
 		zephyr,ieee802154 = &ieee802154;
 	};
 };
@@ -108,7 +108,7 @@
 	status = "okay";
 };
 
-&bt_hci_sdc {
+&bt_hci_controller {
 	status = "okay";
 };
 
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 17d871d2bfc..56adf8fef46 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -169,10 +169,9 @@
 					status = "disabled";
 				};
 
-				bt_hci_sdc: bt_hci_sdc {
-					compatible = "nordic,bt-hci-sdc";
-					status = "disabled";
-				};
+				/* Note: In the nRF Connect SDK the SoftDevice Controller
+				 * is added and set as the default Bluetooth Controller.
+				 */
 				bt_hci_controller: bt_hci_controller {
 					compatible = "zephyr,bt-hci-ll-sw-split";
 					status = "disabled";

From 62373c07dc66064a79f1448b31c2aef4f514d0c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:51 +0100
Subject: [PATCH 1779/2913] Revert "[nrf noup] samples: net: Enable Wi-Fi
 driver in sysbuild builds"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5eec5ca2ac59038194a91b7086edc50949ed83c9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/net/dns_resolve/Kconfig.sysbuild         | 13 -------------
 samples/net/ipv4_autoconf/Kconfig.sysbuild       | 13 -------------
 samples/net/lwm2m_client/Kconfig.sysbuild        | 13 -------------
 samples/net/mdns_responder/Kconfig.sysbuild      | 13 -------------
 samples/net/mqtt_publisher/Kconfig.sysbuild      | 13 -------------
 samples/net/mqtt_sn_publisher/Kconfig.sysbuild   | 13 -------------
 samples/net/sockets/coap_server/Kconfig.sysbuild | 13 -------------
 samples/net/sockets/echo_async/Kconfig.sysbuild  | 13 -------------
 samples/net/sockets/echo_client/Kconfig.sysbuild | 13 -------------
 samples/net/sockets/echo_server/Kconfig.sysbuild | 13 -------------
 samples/net/sockets/http_get/Kconfig.sysbuild    | 13 -------------
 samples/net/sockets/sntp_client/Kconfig.sysbuild | 13 -------------
 samples/net/syslog_net/Kconfig.sysbuild          | 13 -------------
 samples/net/telnet/Kconfig.sysbuild              | 13 -------------
 14 files changed, 182 deletions(-)
 delete mode 100644 samples/net/dns_resolve/Kconfig.sysbuild
 delete mode 100644 samples/net/ipv4_autoconf/Kconfig.sysbuild
 delete mode 100644 samples/net/lwm2m_client/Kconfig.sysbuild
 delete mode 100644 samples/net/mdns_responder/Kconfig.sysbuild
 delete mode 100644 samples/net/mqtt_publisher/Kconfig.sysbuild
 delete mode 100644 samples/net/mqtt_sn_publisher/Kconfig.sysbuild
 delete mode 100644 samples/net/sockets/coap_server/Kconfig.sysbuild
 delete mode 100644 samples/net/sockets/echo_async/Kconfig.sysbuild
 delete mode 100644 samples/net/sockets/echo_client/Kconfig.sysbuild
 delete mode 100644 samples/net/sockets/echo_server/Kconfig.sysbuild
 delete mode 100644 samples/net/sockets/http_get/Kconfig.sysbuild
 delete mode 100644 samples/net/sockets/sntp_client/Kconfig.sysbuild
 delete mode 100644 samples/net/syslog_net/Kconfig.sysbuild
 delete mode 100644 samples/net/telnet/Kconfig.sysbuild

diff --git a/samples/net/dns_resolve/Kconfig.sysbuild b/samples/net/dns_resolve/Kconfig.sysbuild
deleted file mode 100644
index 158551060c5..00000000000
--- a/samples/net/dns_resolve/Kconfig.sysbuild
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config WIFI_NRF70
-	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/ipv4_autoconf/Kconfig.sysbuild b/samples/net/ipv4_autoconf/Kconfig.sysbuild
deleted file mode 100644
index 158551060c5..00000000000
--- a/samples/net/ipv4_autoconf/Kconfig.sysbuild
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config WIFI_NRF70
-	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/lwm2m_client/Kconfig.sysbuild b/samples/net/lwm2m_client/Kconfig.sysbuild
deleted file mode 100644
index 158551060c5..00000000000
--- a/samples/net/lwm2m_client/Kconfig.sysbuild
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config WIFI_NRF70
-	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/mdns_responder/Kconfig.sysbuild b/samples/net/mdns_responder/Kconfig.sysbuild
deleted file mode 100644
index 158551060c5..00000000000
--- a/samples/net/mdns_responder/Kconfig.sysbuild
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config WIFI_NRF70
-	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/mqtt_publisher/Kconfig.sysbuild b/samples/net/mqtt_publisher/Kconfig.sysbuild
deleted file mode 100644
index 158551060c5..00000000000
--- a/samples/net/mqtt_publisher/Kconfig.sysbuild
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config WIFI_NRF70
-	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/mqtt_sn_publisher/Kconfig.sysbuild b/samples/net/mqtt_sn_publisher/Kconfig.sysbuild
deleted file mode 100644
index 158551060c5..00000000000
--- a/samples/net/mqtt_sn_publisher/Kconfig.sysbuild
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config WIFI_NRF70
-	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/coap_server/Kconfig.sysbuild b/samples/net/sockets/coap_server/Kconfig.sysbuild
deleted file mode 100644
index 158551060c5..00000000000
--- a/samples/net/sockets/coap_server/Kconfig.sysbuild
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config WIFI_NRF70
-	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/echo_async/Kconfig.sysbuild b/samples/net/sockets/echo_async/Kconfig.sysbuild
deleted file mode 100644
index 158551060c5..00000000000
--- a/samples/net/sockets/echo_async/Kconfig.sysbuild
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config WIFI_NRF70
-	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/echo_client/Kconfig.sysbuild b/samples/net/sockets/echo_client/Kconfig.sysbuild
deleted file mode 100644
index 158551060c5..00000000000
--- a/samples/net/sockets/echo_client/Kconfig.sysbuild
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config WIFI_NRF70
-	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/echo_server/Kconfig.sysbuild b/samples/net/sockets/echo_server/Kconfig.sysbuild
deleted file mode 100644
index 158551060c5..00000000000
--- a/samples/net/sockets/echo_server/Kconfig.sysbuild
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config WIFI_NRF70
-	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/http_get/Kconfig.sysbuild b/samples/net/sockets/http_get/Kconfig.sysbuild
deleted file mode 100644
index 158551060c5..00000000000
--- a/samples/net/sockets/http_get/Kconfig.sysbuild
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config WIFI_NRF70
-	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/sntp_client/Kconfig.sysbuild b/samples/net/sockets/sntp_client/Kconfig.sysbuild
deleted file mode 100644
index 158551060c5..00000000000
--- a/samples/net/sockets/sntp_client/Kconfig.sysbuild
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config WIFI_NRF70
-	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/syslog_net/Kconfig.sysbuild b/samples/net/syslog_net/Kconfig.sysbuild
deleted file mode 100644
index 158551060c5..00000000000
--- a/samples/net/syslog_net/Kconfig.sysbuild
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config WIFI_NRF70
-	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/telnet/Kconfig.sysbuild b/samples/net/telnet/Kconfig.sysbuild
deleted file mode 100644
index 158551060c5..00000000000
--- a/samples/net/telnet/Kconfig.sysbuild
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config WIFI_NRF70
-	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"

From 912d1a3993ba6d6da49964a2272e39715b47e3d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:51 +0100
Subject: [PATCH 1780/2913] Revert "[nrf noup] samples: lwm2m_client: Add
 support for nRF91x"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 427ba759b72bb9fa6ea5002f9301fd1ab942606f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/net/lwm2m_client/overlay-nrf91x.conf | 53 --------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 samples/net/lwm2m_client/overlay-nrf91x.conf

diff --git a/samples/net/lwm2m_client/overlay-nrf91x.conf b/samples/net/lwm2m_client/overlay-nrf91x.conf
deleted file mode 100644
index 9597791c10e..00000000000
--- a/samples/net/lwm2m_client/overlay-nrf91x.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-# Configuration file for nRF91x
-# This file is merged with prj.conf in the application folder, and options
-# set here will take precedence if they are present in both files.
-
-# General
-CONFIG_MAIN_STACK_SIZE=4096
-
-CONFIG_NET_SOCKETS=y
-CONFIG_NET_NATIVE=y
-CONFIG_NET_SOCKETS_OFFLOAD=y
-
-CONFIG_NET_CONFIG_MY_IPV6_ADDR=""
-CONFIG_NET_CONFIG_PEER_IPV6_ADDR=""
-CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
-CONFIG_NET_CONFIG_MY_IPV4_GW=""
-
-CONFIG_NET_CONFIG_NEED_IPV6=n
-CONFIG_NET_CONFIG_NEED_IPV4=n
-CONFIG_NET_CONFIG_AUTO_INIT=n
-
-# Modem related configurations
-CONFIG_NRF_MODEM_LIB_NET_IF=y
-CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_DOWN=n
-CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_CONNECT=n
-CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_START=n
-CONFIG_NRF_MODEM_LIB_ON_FAULT_APPLICATION_SPECIFIC=y
-
-CONFIG_LTE_LINK_CONTROL_LOG_LEVEL_DBG=n
-CONFIG_NRF_MODEM_LIB_NET_IF_LOG_LEVEL_DBG=n
-
-# Disable Duplicate Address Detection (DAD)
-# due to not being properly implemented for offloaded interfaces.
-CONFIG_NET_IPV6_NBR_CACHE=n
-CONFIG_NET_IPV6_MLD=n
-
-# Zephyr NET Connection Manager and Connectivity layer.
-CONFIG_NET_CONNECTION_MANAGER=y
-CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE=1024
-
-CONFIG_LWM2M_APP_ID="nrf91x"
-CONFIG_LWM2M_APP_SERVER="coaps://leshan.eclipseprojects.io:5684"
-CONFIG_LWM2M_DNS_SUPPORT=y
-
-## Enable DTLS support
-CONFIG_LWM2M_DTLS_SUPPORT=y
-CONFIG_LWM2M_TLS_SESSION_CACHING=y
-CONFIG_LWM2M_DTLS_CID=y
-CONFIG_TLS_CREDENTIALS=y
-
-## Crypto
-CONFIG_OBERON_BACKEND=y
-CONFIG_NORDIC_SECURITY_BACKEND=y
-CONFIG_MBEDTLS_SHA256_C=y

From 7aeb2178e4faab807aabd81e4470c4836100eb90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:52 +0100
Subject: [PATCH 1781/2913] Revert "[nrf noup] dts: nordic: Add support for
 BICR generation"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 13eda60b561985c70e7c8c2dc3b9b7a63d5a5ee4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf54h20dk/nrf54h20dk_bicr.dtsi |  54 --------
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts |   1 -
 dts/bindings/gpio/nordic,nrf-gpio.yaml        |   2 +-
 .../gpio/nordic,nrf-port-configs.yaml         |  35 ------
 dts/bindings/misc/nordic,nrf-bicr.yaml        | 118 ------------------
 modules/hal_nordic/CMakeLists.txt             |   3 -
 modules/hal_nordic/Kconfig.nrf_regtool        |   7 --
 .../nrf-regtool/nrf-regtoolConfig.cmake       |   2 -
 .../nrf54h/Kconfig.defconfig.nrf54h20_cpuapp  |   3 -
 9 files changed, 1 insertion(+), 224 deletions(-)
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_bicr.dtsi
 delete mode 100644 dts/bindings/gpio/nordic,nrf-port-configs.yaml
 delete mode 100644 dts/bindings/misc/nordic,nrf-bicr.yaml

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_bicr.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_bicr.dtsi
deleted file mode 100644
index 34652755564..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_bicr.dtsi
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
- */
-
-/ {
-	bicr: bicr@fff87b0 {
-		compatible = "nordic,nrf-bicr";
-		reg = <0xfff87b0 0x48>;
-
-		power-vddao5v0 = "external";
-		power-vddao1v8 = "internal";
-		power-vdd1v0 = "internal";
-		power-vddrf1v0 = "shorted";
-		power-vddao0v8 = "internal";
-		power-vddvs0v8 = "internal";
-
-		inductor-present;
-
-		ioport-power-rails = <&gpio1 2>, <&gpio2 2>, <&gpio6 2>, <&gpio7 2>, <&gpio9 4>;
-		ioport-drivectrls = <&gpio6 50>, <&gpio7 50>;
-
-		lfosc-mode = "crystal";
-		lfosc-loadcap = <15>;
-
-		lfrc-autocalibration = <20 40 3>;
-
-		hfxo-mode = "crystal";
-		hfxo-loadcap = <56>;
-	};
-};
-
-&gpio1 {
-	#ioport-power-rail-cells = <1>;
-};
-
-&gpio2 {
-	#ioport-power-rail-cells = <1>;
-};
-
-&gpio6 {
-	#ioport-power-rail-cells = <1>;
-	#ioport-drivectrl-cells = <1>;
-};
-
-&gpio7 {
-	#ioport-power-rail-cells = <1>;
-	#ioport-drivectrl-cells = <1>;
-};
-
-&gpio9 {
-	#ioport-power-rail-cells = <1>;
-};
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 9c3556b27c4..1868ba8c331 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -8,7 +8,6 @@
 
 #include <nordic/nrf54h20_cpuapp.dtsi>
 #include "nrf54h20dk_nrf54h20-common.dtsi"
-#include "nrf54h20dk_bicr.dtsi"
 
 /delete-node/ &cpurad_cpusys_ipc;
 /delete-node/ &cpusec_cpurad_ipc;
diff --git a/dts/bindings/gpio/nordic,nrf-gpio.yaml b/dts/bindings/gpio/nordic,nrf-gpio.yaml
index 0ba8a14e132..097a99d8fa9 100644
--- a/dts/bindings/gpio/nordic,nrf-gpio.yaml
+++ b/dts/bindings/gpio/nordic,nrf-gpio.yaml
@@ -5,7 +5,7 @@ description: NRF5 GPIO node
 
 compatible: "nordic,nrf-gpio"
 
-include: [gpio-controller.yaml, base.yaml, "nordic,nrf-port-configs.yaml"]
+include: [gpio-controller.yaml, base.yaml]
 
 properties:
   reg:
diff --git a/dts/bindings/gpio/nordic,nrf-port-configs.yaml b/dts/bindings/gpio/nordic,nrf-port-configs.yaml
deleted file mode 100644
index fd6754e53a0..00000000000
--- a/dts/bindings/gpio/nordic,nrf-port-configs.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
-
-description: |
-  Nordic Port Configs
-
-  Hardware configurations that apply to IO ports.
-
-properties:
-  ioport-power-rails:
-    type: phandle-array
-    description: |
-      Power supply configurations for GPIO ports. The configuration is board-
-      specific and stored in BICR.
-      The property is encoded as <&phandle rail>, where:
-
-      - phandle is the phandle of the associated GPIO port
-      - rail is the 8-bit power rail configuration to apply to the port
-
-  ioport-drivectrls:
-    type: phandle-array
-    description: |
-      Drive control settings for GPIO ports. The configuration is board-specific
-      and stored in BICR.
-      The property is encoded as <&phandle resistance>, where:
-
-      - phandle is the phandle of the associated GPIO port
-      - resistance is the resistance in ohms to adjust in the port's drive
-      control, and can be one of the following: [33, 40, 50, 66, 100].
-
-ioport-power-rail-cells:
-  - rail
-
-ioport-drivectrl-cells:
-  - resistance
diff --git a/dts/bindings/misc/nordic,nrf-bicr.yaml b/dts/bindings/misc/nordic,nrf-bicr.yaml
deleted file mode 100644
index 60894ee2e1d..00000000000
--- a/dts/bindings/misc/nordic,nrf-bicr.yaml
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
-
-description: |
-  Nordic Board Information Configuration Registers (BICR)
-
-compatible: "nordic,nrf-bicr"
-
-include: [base.yaml, "nordic,nrf-port-configs.yaml"]
-
-properties:
-  power-vddao5v0:
-    type: string
-    description: VDD_AO_5V0 power rail configuration.
-    enum:
-      - "external"
-      - "shorted"
-
-  power-vddao1v8:
-    type: string
-    description: VDD_AO_1V8 power rail configuration.
-    enum:
-      - "internal"
-      - "external"
-
-  power-vdd1v0:
-    type: string
-    description: VDD_1V0 power rail configuration.
-    enum:
-      - "internal"
-      - "external"
-
-  power-vddrf1v0:
-    type: string
-    description: VDD_RF_1V0 power rail configuration.
-    enum:
-      - "external"
-      - "shorted"
-
-  power-vddao0v8:
-    type: string
-    description: VDD_AO_0V8 power rail configuration.
-    enum:
-      - "internal"
-      - "external"
-
-  power-vddvs0v8:
-    type: string
-    description: VDD_VS_0V8 power rail configuration.
-    enum:
-      - "internal"
-      - "external"
-
-  inductor-present:
-    type: boolean
-    description: DC/DC inductor present.
-
-  lfosc-accuracy:
-    type: int
-    description: LFXO crystal or external signal accuracy in ppm.
-    enum:
-      - 500
-      - 250
-      - 150
-      - 100
-      - 75
-      - 50
-      - 30
-      - 20
-
-  lfosc-mode:
-    type: string
-    description: |
-      LFXO operational mode.
-    enum:
-      - "crystal"
-      - "external-sine"
-      - "external-square"
-      - "disabled"
-
-  lfosc-loadcap:
-    type: int
-    description: |
-      Built-in load capacitors selection in 1pF steps, up to 25pF max. If 0,
-      only external capacitors will be used.
-
-  lfosc-startup:
-    type: int
-    description: LFXO startup time in milliseconds.
-
-  lfrc-autocalibration:
-    type: array
-    description: |
-      A list of values pertaining to LFRC autocalibration settings. The prop
-      is encoded as <temp-interval temp-delta interval-max-count>, where:
-      - temp-interval is the temperature measurement interval in 0.25s steps
-      - temp-delta is the temperature delta that should trigger a calibration
-        in 0.25 degree steps
-      - interval-max-count are the max number of temp-interval periods in
-        between calibrations, independent of temperature changes.
-
-  hfxo-mode:
-    type: string
-    description: |
-      HFXO operational mode.
-    enum:
-      - "crystal"
-      - "external-square"
-
-  hfxo-loadcap:
-    type: int
-    description: |
-      Built-in load capacitors selection in 0.25 pF steps, up to 25.75 pF max.
-      If 0, only external capacitors will be used.
-
-  hfxo-startup:
-    type: int
-    description: HFXO startup time in milliseconds.
diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt
index eb85fd58f5e..a9384a03633 100644
--- a/modules/hal_nordic/CMakeLists.txt
+++ b/modules/hal_nordic/CMakeLists.txt
@@ -11,9 +11,6 @@ add_subdirectory_ifdef(CONFIG_HAS_NRFS nrfs)
 if(CONFIG_NRF_REGTOOL_GENERATE_UICR)
   list(APPEND nrf_regtool_components GENERATE:UICR)
 endif()
-if(CONFIG_NRF_REGTOOL_GENERATE_BICR)
-  list(APPEND nrf_regtool_components GENERATE:BICR)
-endif()
 if(DEFINED nrf_regtool_components)
   find_package(nrf-regtool 5.6.0 REQUIRED
     COMPONENTS ${nrf_regtool_components}
diff --git a/modules/hal_nordic/Kconfig.nrf_regtool b/modules/hal_nordic/Kconfig.nrf_regtool
index b057133aaf5..396ec2050a0 100644
--- a/modules/hal_nordic/Kconfig.nrf_regtool
+++ b/modules/hal_nordic/Kconfig.nrf_regtool
@@ -11,13 +11,6 @@ config NRF_REGTOOL_GENERATE_UICR
 	  CPU domains that require UICR allocation aren't bootable without it
 	  being programmed alongside the firmware.
 
-config NRF_REGTOOL_GENERATE_BICR
-	bool "Generate BICR"
-	help
-	  Generate a BICR hex based on devicetree contents using nrf-regtool.
-	  If not already present, the BICR must be included alongside
-	  any firmware programmed to the board for the first time.
-
 config NRF_REGTOOL_VERBOSITY
 	int "Verbosity level of console output"
 	range 0 3
diff --git a/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake b/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake
index 8e93a35adc8..6bcaa453cce 100644
--- a/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake
+++ b/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake
@@ -58,8 +58,6 @@ foreach(component IN LISTS ${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS)
     )
     set_property(TARGET runners_yaml_props_target PROPERTY hex_file ${merged_hex_file})
 
-  elseif(component STREQUAL "GENERATE:BICR")
-    nrf_regtool_generate_peripheral(BICR ${PROJECT_BINARY_DIR}/bicr.hex)
   else()
     message(FATAL_ERROR "Unrecognized package component: \"${component}\"")
   endif()
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
index 597f7fbea22..2a04f58f672 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
@@ -11,7 +11,4 @@ config NUM_IRQS
 config NRF_REGTOOL_GENERATE_UICR
 	default y
 
-config NRF_REGTOOL_GENERATE_BICR
-	default y
-
 endif # SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP

From 64504166055ab86e37bc2394b02a878c4ade8a59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:52 +0100
Subject: [PATCH 1782/2913] Revert "[nrf noup] lib: os: zvfs: Remove
 EXPERIMENTAL from ZVFS"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4b9357e2cfee37f90b170b5fba7ae4da6dabcfb3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 lib/os/zvfs/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/os/zvfs/Kconfig b/lib/os/zvfs/Kconfig
index 64808b7ce36..7f50ff52bef 100644
--- a/lib/os/zvfs/Kconfig
+++ b/lib/os/zvfs/Kconfig
@@ -6,6 +6,7 @@
 menuconfig ZVFS
 	bool "Zephyr virtual filesystem (ZVFS) support [EXPERIMENTAL]"
 	select FDTABLE
+	select EXPERIMENTAL
 	help
 	  ZVFS is a central, Zephyr-native library that provides a common interoperable API for all
 	  types of file descriptors such as those from the non-virtual FS, sockets, eventfds, FILE *'s

From 1891e46f8287d2356ea802db73d24a6ba5dbc123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:52 +0100
Subject: [PATCH 1783/2913] Revert "[nrf noup] kernel: banner: Make function
 weak"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 683421718ef6344b399ab0f9fce05cedc32b4d94.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 kernel/banner.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/banner.c b/kernel/banner.c
index a16784cb975..5cadda0a5e9 100644
--- a/kernel/banner.c
+++ b/kernel/banner.c
@@ -24,7 +24,7 @@
 #endif /* BUILD_VERSION */
 #endif /* !BANNER_VERSION */
 
-__weak void boot_banner(void)
+void boot_banner(void)
 {
 #if defined(CONFIG_BOOT_DELAY) && (CONFIG_BOOT_DELAY > 0)
 #ifdef CONFIG_BOOT_BANNER

From a430b72e96eee335a1b47a4f9479e03b928a0655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:52 +0100
Subject: [PATCH 1784/2913] Revert "[nrf noup] mbedtls: Don't select
 PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a1456789b749c1ad52a6c68df42544500456f37d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/mbedtls/Kconfig.tls-generic | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/mbedtls/Kconfig.tls-generic b/modules/mbedtls/Kconfig.tls-generic
index 4300b0f03e6..65989b9c756 100644
--- a/modules/mbedtls/Kconfig.tls-generic
+++ b/modules/mbedtls/Kconfig.tls-generic
@@ -96,7 +96,6 @@ config MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
 	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT if PSA_CRYPTO_CLIENT
 	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT if PSA_CRYPTO_CLIENT
 	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE if PSA_CRYPTO_CLIENT
-	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE if PSA_CRYPTO_CLIENT
 
 config MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
 	bool "DHE-RSA based ciphersuite modes"

From b95a39c9ff3733414cf01acd4607aa686d196e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:52 +0100
Subject: [PATCH 1785/2913] Revert "[nrf noup] mbedtls: Non-selectable
 PSA_WANT_KEY_TYPE_XXXX_KEY_PAIR_BASIC"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3ec22b60972e84264c3fc857e3bbd6bb9ce05aea.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/mbedtls/Kconfig.psa | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/mbedtls/Kconfig.psa b/modules/mbedtls/Kconfig.psa
index ff3c488e212..70f98622038 100644
--- a/modules/mbedtls/Kconfig.psa
+++ b/modules/mbedtls/Kconfig.psa
@@ -264,8 +264,8 @@ config PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC
-	bool
-	default y
+	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
 	depends on PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 	|| \
 		   PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 	|| \
 		   PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE	|| \
@@ -292,9 +292,9 @@ config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
-	bool
-	default y
-	depends on PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT 	|| \
+	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT	|| \
 		   PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT 	|| \
 		   PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE	|| \
 		   PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE

From 031858dafe4d074551b94ef203aad4a82f9940ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:52 +0100
Subject: [PATCH 1786/2913] Revert "[nrf noup] mbedtls: Adding missing
 configuration for RSA key type derive"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 75ac1943bc904f20b342c89bb9919130cfe2ef65.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/mbedtls/Kconfig.psa | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/mbedtls/Kconfig.psa b/modules/mbedtls/Kconfig.psa
index 70f98622038..4b4d5018743 100644
--- a/modules/mbedtls/Kconfig.psa
+++ b/modules/mbedtls/Kconfig.psa
@@ -313,10 +313,6 @@ config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE" if !MBEDTLS_PROMPTLESS
 	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE
-	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE" if !MBEDTLS_PROMPTLESS
-	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 endif # PSA_CRYPTO_CLIENT

From 20ec697d94a70cb58a0af2bb9af4169199485364 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:52 +0100
Subject: [PATCH 1787/2913] Revert "[nrf noup] mbedtls: Adding helptext
 warnings for weak crypto"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8f6a02426f35fe5405bf4413b753b2c225201587.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/mbedtls/Kconfig.psa | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/mbedtls/Kconfig.psa b/modules/mbedtls/Kconfig.psa
index 4b4d5018743..2e860ebad85 100644
--- a/modules/mbedtls/Kconfig.psa
+++ b/modules/mbedtls/Kconfig.psa
@@ -88,9 +88,7 @@ config PSA_WANT_ALG_HMAC
 config PSA_WANT_ALG_MD5
 	bool "PSA_WANT_ALG_MD5" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-	help
-	  Warning: The MD5 hash is weak and deprecated and is only recommended
-	  for use in legacy protocols.
+
 
 config PSA_WANT_ALG_PBKDF2_HMAC
 	bool "PSA_WANT_ALG_PBKDF2_HMAC" if !MBEDTLS_PROMPTLESS
@@ -121,9 +119,6 @@ config PSA_WANT_ALG_RSA_PSS
 config PSA_WANT_ALG_SHA_1
 	bool "PSA_WANT_ALG_SHA_1" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-	help
-	  Warning: The SHA-1 hash is weak and deprecated and is only recommended
-	  for use in legacy protocols.
 
 config PSA_WANT_ALG_SHA_224
 	bool "PSA_WANT_ALG_SHA_224" if !MBEDTLS_PROMPTLESS

From 9a699d7a4ffd0e5bd1666bb4aa04c92de5eee664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:52 +0100
Subject: [PATCH 1788/2913] Revert "[nrf noup] mbedtls: Add dependency logic
 for PSA crypto configurations"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3e925032d3bef4a68ee4383cd35f71581ee4f880.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/mbedtls/Kconfig.psa | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/modules/mbedtls/Kconfig.psa b/modules/mbedtls/Kconfig.psa
index 2e860ebad85..77b4566ec27 100644
--- a/modules/mbedtls/Kconfig.psa
+++ b/modules/mbedtls/Kconfig.psa
@@ -71,7 +71,6 @@ config PSA_WANT_ALG_GCM
 config PSA_WANT_ALG_HKDF
 	bool "PSA_WANT_ALG_HKDF" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-	depends on PSA_WANT_ALG_HMAC
 
 config PSA_WANT_ALG_HKDF_EXTRACT
 	bool "PSA_WANT_ALG_HKDF_EXTRACT" if !MBEDTLS_PROMPTLESS
@@ -93,12 +92,11 @@ config PSA_WANT_ALG_MD5
 config PSA_WANT_ALG_PBKDF2_HMAC
 	bool "PSA_WANT_ALG_PBKDF2_HMAC" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-	depends on PSA_WANT_ALG_HMAC
 
 config PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
 	bool "PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-	depends on PSA_WANT_ALG_CMAC
+
 
 config PSA_WANT_ALG_RSA_OAEP
 	bool "PSA_WANT_ALG_RSA_OAEP" if !MBEDTLS_PROMPTLESS
@@ -155,22 +153,18 @@ config PSA_WANT_ALG_SHA3_512
 config PSA_WANT_ALG_STREAM_CIPHER
 	bool "PSA_WANT_ALG_STREAM_CIPHER" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-	select PSA_WANT_KEY_TYPE_CHACHA20
 
 config PSA_WANT_ALG_TLS12_PRF
 	bool "PSA_WANT_ALG_TLS12_PRF" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-	depends on PSA_WANT_ALG_HMAC
 
 config PSA_WANT_ALG_TLS12_PSK_TO_MS
 	bool "PSA_WANT_ALG_TLS12_PSK_TO_MS" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-	depends on PSA_WANT_ALG_HMAC
 
 config PSA_WANT_ALG_TLS12_ECJPAKE_TO_PMS
 	bool "PSA_WANT_ALG_TLS12_ECJPAKE_TO_PMS" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-	depends on PSA_WANT_ALG_SHA_256
 
 config PSA_WANT_ECC_BRAINPOOL_P_R1_256
 	bool "PSA_WANT_ECC_BRAINPOOL_P_R1_256" if !MBEDTLS_PROMPTLESS
@@ -243,8 +237,7 @@ config PSA_WANT_KEY_TYPE_AES
 config PSA_WANT_KEY_TYPE_CHACHA20
 	bool "PSA_WANT_KEY_TYPE_CHACHA20" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-	depends on PSA_WANT_ALG_CHACHA20_POLY1305 || \
-		   PSA_WANT_ALG_STREAM_CIPHER
+
 
 config PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	bool "PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY" if !MBEDTLS_PROMPTLESS
@@ -261,53 +254,37 @@ config PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC
 	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-	depends on PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 	|| \
-		   PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 	|| \
-		   PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE	|| \
-		   PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
 
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT
 	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT" if !MBEDTLS_PROMPTLESS
-	select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT
 	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT" if !MBEDTLS_PROMPTLESS
-	select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE
 	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE" if !MBEDTLS_PROMPTLESS
-	select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
 	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE" if !MBEDTLS_PROMPTLESS
-	select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-	depends on PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT	|| \
-		   PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT 	|| \
-		   PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE	|| \
-		   PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE
 
 config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT" if !MBEDTLS_PROMPTLESS
-	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT" if !MBEDTLS_PROMPTLESS
-	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE" if !MBEDTLS_PROMPTLESS
-	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
-	default y if PSA_CRYPTO_ENABLE_ALL
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 endif # PSA_CRYPTO_CLIENT

From 3eba1af48557a2c0b72b721be221cfbc2936ce45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:52 +0100
Subject: [PATCH 1789/2913] Revert "[nrf noup] mbedtls: Remove unsupported
 algorithms in PSA crypto"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1147b11bb1585f9ba3e9163d9ad6fcfd7845a32f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/mbedtls/Kconfig.psa | 65 +++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/modules/mbedtls/Kconfig.psa b/modules/mbedtls/Kconfig.psa
index 77b4566ec27..7562032bf3d 100644
--- a/modules/mbedtls/Kconfig.psa
+++ b/modules/mbedtls/Kconfig.psa
@@ -36,6 +36,10 @@ config PSA_WANT_ALG_CMAC
 	bool "PSA_WANT_ALG_CMAC" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
+config PSA_WANT_ALG_CFB
+	bool "PSA_WANT_ALG_CFB" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
+
 config PSA_WANT_ALG_CHACHA20_POLY1305
 	bool "PSA_WANT_ALG_CHACHA20_POLY1305" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
@@ -56,6 +60,10 @@ config PSA_WANT_ALG_ECDH
 	bool "PSA_WANT_ALG_ECDH" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
+config PSA_WANT_ALG_FFDH
+	bool "PSA_WANT_ALG_FFDH" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
+
 config PSA_WANT_ALG_ECDSA
 	bool "PSA_WANT_ALG_ECDSA" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
@@ -88,6 +96,9 @@ config PSA_WANT_ALG_MD5
 	bool "PSA_WANT_ALG_MD5" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
+config PSA_WANT_ALG_OFB
+	bool "PSA_WANT_ALG_OFB" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_ALG_PBKDF2_HMAC
 	bool "PSA_WANT_ALG_PBKDF2_HMAC" if !MBEDTLS_PROMPTLESS
@@ -97,6 +108,9 @@ config PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
 	bool "PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
+config PSA_WANT_ALG_RIPEMD160
+	bool "PSA_WANT_ALG_RIPEMD160" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_ALG_RSA_OAEP
 	bool "PSA_WANT_ALG_RSA_OAEP" if !MBEDTLS_PROMPTLESS
@@ -214,6 +228,26 @@ config PSA_WANT_ECC_SECP_R1_521
 	bool "PSA_WANT_ECC_SECP_R1_521" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
+config PSA_WANT_DH_RFC7919_2048
+	bool "PSA_WANT_DH_RFC7919_2048" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
+
+config PSA_WANT_DH_RFC7919_3072
+	bool "PSA_WANT_DH_RFC7919_3072" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
+
+config PSA_WANT_DH_RFC7919_4096
+	bool "PSA_WANT_DH_RFC7919_4096" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
+
+config PSA_WANT_DH_RFC7919_6144
+	bool "PSA_WANT_DH_RFC7919_6144" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
+
+config PSA_WANT_DH_RFC7919_8192
+	bool "PSA_WANT_DH_RFC7919_8192" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
+
 config PSA_WANT_KEY_TYPE_DERIVE
 	bool "PSA_WANT_KEY_TYPE_DERIVE" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
@@ -234,15 +268,30 @@ config PSA_WANT_KEY_TYPE_AES
 	bool "PSA_WANT_KEY_TYPE_AES" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
+config PSA_WANT_KEY_TYPE_ARIA
+	bool "PSA_WANT_KEY_TYPE_ARIA" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
+
+config PSA_WANT_KEY_TYPE_CAMELLIA
+	bool "PSA_WANT_KEY_TYPE_CAMELLIA" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
+
 config PSA_WANT_KEY_TYPE_CHACHA20
 	bool "PSA_WANT_KEY_TYPE_CHACHA20" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
+config PSA_WANT_KEY_TYPE_DES
+	bool "PSA_WANT_KEY_TYPE_DES" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	bool "PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
+config PSA_WANT_KEY_TYPE_DH_PUBLIC_KEY
+	bool "PSA_WANT_KEY_TYPE_DH_PUBLIC_KEY" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
+
 config PSA_WANT_KEY_TYPE_RAW_DATA
 	bool "PSA_WANT_KEY_TYPE_RAW_DATA" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
@@ -287,4 +336,20 @@ config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
+config PSA_WANT_KEY_TYPE_DH_KEY_PAIR_BASIC
+	bool "PSA_WANT_KEY_TYPE_DH_KEY_PAIR_BASIC" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
+
+config PSA_WANT_KEY_TYPE_DH_KEY_PAIR_IMPORT
+	bool "PSA_WANT_KEY_TYPE_DH_KEY_PAIR_IMPORT" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
+
+config PSA_WANT_KEY_TYPE_DH_KEY_PAIR_EXPORT
+	bool "PSA_WANT_KEY_TYPE_DH_KEY_PAIR_EXPORT" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
+
+config PSA_WANT_KEY_TYPE_DH_KEY_PAIR_GENERATE
+	bool "PSA_WANT_KEY_TYPE_DH_KEY_PAIR_GENERATE" if !MBEDTLS_PROMPTLESS
+	default y if PSA_CRYPTO_ENABLE_ALL
+
 endif # PSA_CRYPTO_CLIENT

From 0b8e753b7725f033b3db9793b1aeadcc8cadfa0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:52 +0100
Subject: [PATCH 1790/2913] Revert "[nrf noup] mbedtls: Enable
 PSA_WANT_GENERATE_RANDOM for PSA RNG"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3b697befa1dc2407f3f62a422ac534c3e089e65f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/entropy/Kconfig.psa_crypto | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/entropy/Kconfig.psa_crypto b/drivers/entropy/Kconfig.psa_crypto
index 18514a071d1..d06001225b0 100644
--- a/drivers/entropy/Kconfig.psa_crypto
+++ b/drivers/entropy/Kconfig.psa_crypto
@@ -7,7 +7,6 @@ config ENTROPY_PSA_CRYPTO_RNG
 	bool "PSA Crypto Random source Entropy driver"
 	depends on DT_HAS_ZEPHYR_PSA_CRYPTO_RNG_ENABLED
 	select ENTROPY_HAS_DRIVER
-	select PSA_WANT_GENERATE_RANDOM
 	default y
 	help
 	  Enable the PSA Crypto source Entropy driver.

From e7ea392e4cc87c58605e1d8e86edbed304cf6d9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:52 +0100
Subject: [PATCH 1791/2913] Revert "[nrf noup] modules: mbedtls: Disable
 configurations in Kconfig.tls-generic"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 728983fe1906c18007bdd44ebc2e00e06e9d3139.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/mbedtls/Kconfig.tls-generic | 32 -----------------------------
 1 file changed, 32 deletions(-)

diff --git a/modules/mbedtls/Kconfig.tls-generic b/modules/mbedtls/Kconfig.tls-generic
index 65989b9c756..3ea0a49dd34 100644
--- a/modules/mbedtls/Kconfig.tls-generic
+++ b/modules/mbedtls/Kconfig.tls-generic
@@ -7,8 +7,6 @@
 menu "Mbed TLS configuration"
 	depends on MBEDTLS_BUILTIN && MBEDTLS_CFG_FILE = "config-tls-generic.h"
 
-if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 menu "TLS"
 
 config MBEDTLS_TLS_VERSION_1_2
@@ -42,14 +40,10 @@ endif # MBEDTLS_TLS_VERSION_1_2 || MBEDTLS_TLS_VERSION_1_3
 
 endmenu # TLS
 
-endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 menu "Ciphersuite configuration"
 
 comment "Supported key exchange modes"
 
-if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_KEY_EXCHANGE_ALL_ENABLED
 	bool "All available ciphersuite modes"
 	select MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
@@ -77,8 +71,6 @@ config MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
 config MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
 	bool "RSA-PSK based ciphersuite modes"
 
-endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_PSK_MAX_LEN
 	int "Max size of TLS pre-shared keys"
 	default 32
@@ -86,8 +78,6 @@ config MBEDTLS_PSK_MAX_LEN
 	  Max size of TLS pre-shared keys, in bytes. It has no effect if no
 	  PSK key exchange is used.
 
-if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
 	bool "RSA-only based ciphersuite modes"
 	default y if UOSCORE || UEDHOC
@@ -224,12 +214,8 @@ config MBEDTLS_ECP_NIST_OPTIM
 
 endif
 
-endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 comment "Supported ciphers and cipher modes"
 
-if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_CIPHER_ALL_ENABLED
 	bool "All available ciphers and modes"
 	select MBEDTLS_CIPHER_AES_ENABLED
@@ -320,12 +306,8 @@ config MBEDTLS_CMAC
 	bool "CMAC (Cipher-based Message Authentication Code) mode for block ciphers."
 	depends on MBEDTLS_CIPHER_AES_ENABLED || MBEDTLS_CIPHER_DES_ENABLED
 
-endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 comment "Supported hash algorithms"
 
-if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_HASH_ALL_ENABLED
 	bool "All available MAC methods"
 	select MBEDTLS_MD5
@@ -366,14 +348,10 @@ config MBEDTLS_SHA512
 config MBEDTLS_POLY1305
 	bool "Poly1305 hash family"
 
-endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 endmenu
 
 comment "Random number generators"
 
-if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_CTR_DRBG_ENABLED
 	bool "CTR_DRBG AES-256-based random generator"
 	depends on MBEDTLS_CIPHER_AES_ENABLED
@@ -383,21 +361,15 @@ config MBEDTLS_HMAC_DRBG_ENABLED
 	bool "HMAC_DRBG random generator"
 	select MBEDTLS_MD
 
-endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 comment "Other configurations"
 
 config MBEDTLS_CIPHER
 	bool "generic cipher layer."
 	default y if PSA_WANT_ALG_CMAC
 
-if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_MD
 	bool "generic message digest layer."
 
-endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_GENPRIME_ENABLED
 	bool "prime-number generation code."
 
@@ -415,8 +387,6 @@ config MBEDTLS_HAVE_ASM
 	  of asymmetric cryptography, however this might have an impact on the
 	  code size.
 
-if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_ENTROPY_C
 	bool "Mbed TLS entropy accumulator"
 	depends on MBEDTLS_SHA256 || MBEDTLS_SHA384 || MBEDTLS_SHA512
@@ -425,8 +395,6 @@ config MBEDTLS_ENTROPY_C
 	  mostly used in conjunction with CTR_DRBG or HMAC_DRBG to create
 	  a deterministic random number generator.
 
-endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_ENTROPY_POLL_ZEPHYR
 	bool "Provide entropy data to Mbed TLS through entropy driver or random generator"
 	depends on MBEDTLS_ENTROPY_C

From a067ed70ed8fadf23ea45668a302bd52360f1627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:52 +0100
Subject: [PATCH 1792/2913] Revert "[nrf noup] samples: basic: blinky: add
 eGPIO tests configuration"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 26b8d92f84c6f6358467b80a4a833657d7726d1c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay      | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay

diff --git a/samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay b/samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay
deleted file mode 100644
index d165fc44b4b..00000000000
--- a/samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
- */
-
-&led0 {
-	gpios = <&egpio 9 GPIO_ACTIVE_HIGH>;
-};

From ec02e14c465c6f0f543e944d35aac4bf6f9a8263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:52 +0100
Subject: [PATCH 1793/2913] Revert "[nrf noup] boards/nordic/nrf54l15dk: Set
 ROM offset by PM"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 620b4df913d415a19b326629612a401658f3961b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf54l15dk/Kconfig.defconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/boards/nordic/nrf54l15dk/Kconfig.defconfig b/boards/nordic/nrf54l15dk/Kconfig.defconfig
index 06a426bd8ed..2b753df3515 100644
--- a/boards/nordic/nrf54l15dk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l15dk/Kconfig.defconfig
@@ -7,7 +7,6 @@ config BT_CTLR
 	default BT
 
 config ROM_START_OFFSET
-	default 0 if PARTITION_MANAGER_ENABLED
 	default 0x800 if BOOTLOADER_MCUBOOT
 
 endif # BOARD_NRF54L15DK_NRF54L15_CPUAPP

From f4e0e23a37cabc5a97c3f1cd13c48529c5b85ec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:52 +0100
Subject: [PATCH 1794/2913] Revert "[nrf noup] mgmt: mcumgr: grp: img_mgmt: Add
 handling for QSPI XIP"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a83be5d3b0f9545f7efe044e5eb1789dbcec4e8d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig        | 8 --------
 subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c | 6 ------
 2 files changed, 14 deletions(-)

diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig b/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
index 5e6da1e0ba7..56030a1cd5c 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
@@ -201,14 +201,6 @@ config MCUMGR_GRP_IMG_IMAGE_SLOT_STATE_STATES
 	  The value does not affect memory allocation, it is used by zcbor
 	  to figure out how to encode map depending on its predicted size.
 
-config MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE
-	bool "QSPI XIP Split image mode"
-	depends on MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP
-	help
-	  This option should not be selected by users and should automatically be selected by
-	  sysbuild if needed. This enables selecting the correct slot when running a QSPI XIP
-	  split image application in DirectXIP mode.
-
 module = MCUMGR_GRP_IMG
 module-str = mcumgr_grp_img
 source "subsys/logging/Kconfig.template.log_config"
diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
index e10953a155a..28fca251ac8 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
@@ -159,12 +159,6 @@ int img_mgmt_active_slot(int image)
 	/* Multi image does not support DirectXIP currently */
 #if CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER > 1
 	slot = (image << 1);
-
-#if CONFIG_MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE
-	if (FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot1_partition)) {
-		slot += 1;
-	}
-#endif
 #else
 	/* This covers single image, including DirectXiP */
 	if (FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot1_partition)) {

From 9c234b459f511cb1ec595a66b7cfa876090ef6f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:53 +0100
Subject: [PATCH 1795/2913] Revert "[nrf noup] snippets: Add snippet for the
 Zephyr Bluetooth Controller"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 324f8ae1d82cb5edd3fb9eb8763965baed12dda4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 snippets/bt-ll-sw-split/README.rst            | 21 -------------------
 snippets/bt-ll-sw-split/bt-ll-sw-split.conf   |  3 ---
 .../bt-ll-sw-split/bt-ll-sw-split.overlay     | 13 ------------
 snippets/bt-ll-sw-split/snippet.yml           |  4 ----
 4 files changed, 41 deletions(-)
 delete mode 100644 snippets/bt-ll-sw-split/README.rst
 delete mode 100644 snippets/bt-ll-sw-split/bt-ll-sw-split.conf
 delete mode 100644 snippets/bt-ll-sw-split/bt-ll-sw-split.overlay
 delete mode 100644 snippets/bt-ll-sw-split/snippet.yml

diff --git a/snippets/bt-ll-sw-split/README.rst b/snippets/bt-ll-sw-split/README.rst
deleted file mode 100644
index 490d45be36c..00000000000
--- a/snippets/bt-ll-sw-split/README.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. _snippet-bt-ll-sw-split:
-
-Zephyr Bluetooth LE Controller (bt-ll-sw-split)
-###############################################
-
-.. code-block:: console
-
-   west build -S bt-ll-sw-split [...]
-
-Overview
-********
-
-This snippet changes the default Bluetooth controller to the Zephyr Bluetooth LE Controller.
-
-Requirements
-************
-
-Hardware support for:
-
-- :kconfig:option:`CONFIG_BT`
-- :kconfig:option:`CONFIG_BT_CTLR`
diff --git a/snippets/bt-ll-sw-split/bt-ll-sw-split.conf b/snippets/bt-ll-sw-split/bt-ll-sw-split.conf
deleted file mode 100644
index f2dd622901b..00000000000
--- a/snippets/bt-ll-sw-split/bt-ll-sw-split.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_BT=y
-CONFIG_BT_CTLR=y
-CONFIG_BT_LL_SW_SPLIT=y
diff --git a/snippets/bt-ll-sw-split/bt-ll-sw-split.overlay b/snippets/bt-ll-sw-split/bt-ll-sw-split.overlay
deleted file mode 100644
index a57a0e82ba6..00000000000
--- a/snippets/bt-ll-sw-split/bt-ll-sw-split.overlay
+++ /dev/null
@@ -1,13 +0,0 @@
-&bt_hci_controller {
-	status = "okay";
-};
-
-&bt_hci_sdc {
-	status = "disabled";
-};
-
-/ {
-	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
-	};
-};
diff --git a/snippets/bt-ll-sw-split/snippet.yml b/snippets/bt-ll-sw-split/snippet.yml
deleted file mode 100644
index 27a7325dc7e..00000000000
--- a/snippets/bt-ll-sw-split/snippet.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-name: bt-ll-sw-split
-append:
-  EXTRA_CONF_FILE: bt-ll-sw-split.conf
-  EXTRA_DTC_OVERLAY_FILE: bt-ll-sw-split.overlay

From 3e432c092f6b91ce368f8a9e3cbefb73e18f7dbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:53 +0100
Subject: [PATCH 1796/2913] Revert "[nrf noup] board: nordic_ thingy53: Enable
 QSPI by default"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 88307ffd820675f23d265483bdb19e6008250b6b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/thingy53/Kconfig.defconfig | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/boards/nordic/thingy53/Kconfig.defconfig b/boards/nordic/thingy53/Kconfig.defconfig
index 31ac0093ba2..c2e13fad0ab 100644
--- a/boards/nordic/thingy53/Kconfig.defconfig
+++ b/boards/nordic/thingy53/Kconfig.defconfig
@@ -145,9 +145,6 @@ config MCUBOOT_USB_SUPPORT
 	bool
 	default n
 
-config NORDIC_QSPI_NOR
-	default y
-
 endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
 
 if BOARD_THINGY53_NRF5340_CPUNET

From 04bd31140d558cfb5eaee820dfefa9e5b8c2593c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:53 +0100
Subject: [PATCH 1797/2913] Revert "[nrf noup] bluetooth: att: Allow ATT sent
 callback after data TX is done"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 26fcb4f0c4427912619cda058f7777d8f6625d03.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/host/Kconfig.gatt | 17 -----------------
 subsys/bluetooth/host/att.c        | 17 +----------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/subsys/bluetooth/host/Kconfig.gatt b/subsys/bluetooth/host/Kconfig.gatt
index c3751359512..77bf0191740 100644
--- a/subsys/bluetooth/host/Kconfig.gatt
+++ b/subsys/bluetooth/host/Kconfig.gatt
@@ -38,23 +38,6 @@ config BT_ATT_RETRY_ON_SEC_ERR
 	  If an ATT request fails due to insufficient security, the host will
 	  try to elevate the security level and retry the ATT request.
 
-config BT_ATT_SENT_CB_AFTER_TX
-	bool "Delay ATT sent callback until data transmission is done by controller [EXPERIMENTAL]"
-	select EXPERIMENTAL
-	help
-	  By default, the BLE stack calls sent callback for ATT data when the
-	  data is passed to BLE controller for transmission. Enabling this
-	  Kconfig option delays calling the sent callback until data
-	  transmission is finished by BLE controller (the callback is called
-	  upon receiving the Number of Completed Packets HCI Event).
-
-	  The feature is not available in Zephyr RTOS (it's specific to NCS
-	  Zephyr fork). It is a temporary solution allowing to control flow of
-	  GATT notifications with HID reports for HID use-case.
-
-	  Enabling this option may require increasing CONFIG_BT_CONN_TX_MAX in
-	  configuration, because ATT would use additional TX contexts.
-
 config BT_EATT
 	bool "Enhanced ATT Bearers support [EXPERIMENTAL]"
 	depends on BT_L2CAP_ECRED
diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c
index 7af47a6a3b8..5ecb86ce7ef 100644
--- a/subsys/bluetooth/host/att.c
+++ b/subsys/bluetooth/host/att.c
@@ -316,13 +316,6 @@ static void att_sent(void *user_data)
 	bt_att_sent(chan);
 }
 
-static void chan_sent_cb(struct bt_conn *conn, void *user_data, int err)
-{
-	struct net_buf *nb = user_data;
-
-	net_buf_unref(nb);
-}
-
 /* In case of success the ownership of the buffer is transferred to the stack
  * which takes care of releasing it when it completes transmitting to the
  * controller.
@@ -416,15 +409,7 @@ static int chan_send(struct bt_att_chan *chan, struct net_buf *buf)
 
 	data->att_chan = chan;
 
-	if (IS_ENABLED(CONFIG_BT_ATT_SENT_CB_AFTER_TX)) {
-		err = bt_l2cap_send_pdu(&chan->chan, buf, chan_sent_cb, net_buf_ref(buf));
-		if (err) {
-			net_buf_unref(buf);
-		}
-	} else {
-		err = bt_l2cap_send_pdu(&chan->chan, buf, NULL, NULL);
-	}
-
+	err = bt_l2cap_send_pdu(&chan->chan, buf, NULL, NULL);
 	if (err) {
 		if (err == -ENOBUFS) {
 			LOG_ERR("Ran out of TX buffers or contexts.");

From 8928698fca393e16c9a982274b4ad528bd7e2ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:53 +0100
Subject: [PATCH 1798/2913] Revert "[nrf noup] dts: Add Bluetooth Controller to
 nRF54H20"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f47a9b8666778709e9e031854511566d55ce3ad4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/arm/nordic/nrf54h20_cpurad.dtsi | 8 --------
 dts/common/nordic/nrf54h20.dtsi     | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/dts/arm/nordic/nrf54h20_cpurad.dtsi b/dts/arm/nordic/nrf54h20_cpurad.dtsi
index 2cfda47afc5..2d2fdee8d27 100644
--- a/dts/arm/nordic/nrf54h20_cpurad.dtsi
+++ b/dts/arm/nordic/nrf54h20_cpurad.dtsi
@@ -23,10 +23,6 @@ wdt011: &cpurad_wdt011 {};
 /delete-node/ &cpuflpr;
 
 / {
-	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
-	};
-
 	soc {
 		compatible = "simple-bus";
 		interrupt-parent = <&cpurad_nvic>;
@@ -103,7 +99,3 @@ wdt011: &cpurad_wdt011 {};
 &dppic020 {
 	status = "okay";
 };
-
-&bt_hci_controller {
-	status = "okay";
-};
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 76ad507b4f5..c0de788ad9b 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -427,14 +427,6 @@
 					compatible = "nordic,nrf-ieee802154";
 					status = "disabled";
 				};
-
-				/* Note: In the nRF Connect SDK the SoftDevice Controller
-				 * is added and set as the default Bluetooth Controller.
-				 */
-				bt_hci_controller: bt_hci_controller {
-					compatible = "zephyr,bt-hci-ll-sw-split";
-					status = "disabled";
-				};
 			};
 
 			ccm030: ccm@3a000 {

From 6654f9872fc74062b21edc227c14b75f8ef500f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:53 +0100
Subject: [PATCH 1799/2913] Revert "[nrf noup] drivers: flash: kconfig:
 nrf_rram region resolution"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 22ab87b0f9928a688de6c7c07a7ac667819ae9a0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/flash/Kconfig.nrf_rram | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/flash/Kconfig.nrf_rram b/drivers/flash/Kconfig.nrf_rram
index 8c45f8b36bb..6251f2e90b4 100644
--- a/drivers/flash/Kconfig.nrf_rram
+++ b/drivers/flash/Kconfig.nrf_rram
@@ -70,14 +70,14 @@ config SOC_FLASH_NRF_TIMEOUT_MULTIPLIER
 
 config NRF_RRAM_REGION_ADDRESS_RESOLUTION
 	hex
-	default 0x1000
+	default 0x400
 	help
 	  RRAMC's region protection address resolution.
 	  Applies to region with configurable start address.
 
 config NRF_RRAM_REGION_SIZE_UNIT
 	hex
-	default 0x1000
+	default 0x400
 	help
 	  Base unit for the size of RRAMC's region protection.
 

From f8391dfce8e75f70413d399052f98e68ad3b0c52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:53 +0100
Subject: [PATCH 1800/2913] Revert "[nrf noup] ci: Enable action-manifest-pr"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4605159c7d01e4c79dc86b690ad884427a8778df.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .github/workflows/manifest-PR.yml | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 .github/workflows/manifest-PR.yml

diff --git a/.github/workflows/manifest-PR.yml b/.github/workflows/manifest-PR.yml
deleted file mode 100644
index a871aa381de..00000000000
--- a/.github/workflows/manifest-PR.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: handle manifest PR
-on:
-  pull_request_target:
-    types: [opened, synchronize, closed]
-    branches:
-      - main
-
-
-jobs:
-  call-manifest-pr-action:
-    runs-on: ubuntu-latest
-    steps:
-      - name: handle manifest PR
-        uses: nrfconnect/action-manifest-pr@main
-        with:
-          token: ${{ secrets.NCS_GITHUB_TOKEN }}
-          manifest-pr-title-details: ${{ github.event.pull_request.title }}

From 8be55a845902fdb8652befba3787bcd4e28020bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:53 +0100
Subject: [PATCH 1801/2913] Revert "[nrf noup] soc: nordic: nrf54l: Skip clock
 configuration from ns"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a2ca5957e9657ce3a1eb09b493c110c3f5319be3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54l/Kconfig | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index 8c670b9355e..0ad48f7c9c1 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -51,18 +51,10 @@ config SOC_NRF54L15_CPUFLPR
 if SOC_SERIES_NRF54LX
 
 config SOC_NRF54LX_SKIP_CLOCK_CONFIG
-	bool
-	prompt "Skip clock frequency configuration in system initialization" if TRUSTED_EXECUTION_SECURE
-	default y if TRUSTED_EXECUTION_NONSECURE
+	bool "Skip clock frequency configuration in system initialization"
 	help
-	  With this option, the CPU clock frequency is not set during this
-	  Zephyr image's system initialization. The CPU runs with either
-	  the HW reset values, or with the configuration set by an image
-	  earlier in the boot chain.
-
-	  Note that for security reasons it is not supported to configure
-	  the clock peripheral (NRF_OSCILLATORS) from the non-secure
-	  domain.
+	  With this option, the CPU clock frequency is not set during system initialization.
+	  The CPU runs with the default, hardware-selected frequency.
 
 config SOC_NRF54LX_DISABLE_FICR_TRIMCNF
 	bool "Disable trimming of the device"

From 8e4da33d6d39dac520930f28ea9ad277f3d898c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:53 +0100
Subject: [PATCH 1802/2913] Revert "[nrf noup] entropy: Add fake entropy nRF
 PRNG driver"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0d8345e043b78b9cbea34abfe508eff0ae5fd7b1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts |   6 --
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts |   5 -
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts  |   6 --
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts  |   5 -
 drivers/entropy/CMakeLists.txt                |   7 --
 drivers/entropy/Kconfig                       |   1 -
 drivers/entropy/Kconfig.nrf_prng              |  19 ----
 drivers/entropy/fake_entropy_nrf_prng.c       | 101 ------------------
 dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi      |   9 --
 dts/bindings/rng/nordic,nrf-prng.yaml         |   8 --
 10 files changed, 167 deletions(-)
 delete mode 100644 drivers/entropy/Kconfig.nrf_prng
 delete mode 100644 drivers/entropy/fake_entropy_nrf_prng.c
 delete mode 100644 dts/bindings/rng/nordic,nrf-prng.yaml

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 1868ba8c331..c85b911302f 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -26,7 +26,6 @@
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,canbus = &can120;
-		zephyr,entropy = &prng;
 	};
 
 	aliases {
@@ -107,11 +106,6 @@
 			pwms = <&pwm130 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
 		};
 	};
-
-	prng: prng {
-		compatible = "nordic,entropy-prng";
-		status = "okay";
-	};
 };
 
 &cpuapp_ram0x_region {
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
index 049617e6dc6..cb8fb9e1a02 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
@@ -27,11 +27,6 @@
 		zephyr,ieee802154 = &cpurad_ieee802154;
 		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
-		zephyr,entropy = &prng;
-	};
-	prng: prng {
-		compatible = "nordic,entropy-prng";
-		status = "okay";
 	};
 	aliases {
 		ipc-to-cpusys = &cpurad_cpusys_ipc;
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index 2ce9b912269..aff2a15e6c1 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -28,7 +28,6 @@
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,canbus = &can120;
-		zephyr,entropy = &prng;
 	};
 
 	aliases {
@@ -109,11 +108,6 @@
 			pwms = <&pwm130 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
 		};
 	};
-
-	prng: prng {
-		compatible = "nordic,entropy-prng";
-		status = "okay";
-	};
 };
 
 &cpuapp_ram0x_region {
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
index f1f3af54132..f9bfae09897 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
@@ -28,11 +28,6 @@
 		zephyr,ieee802154 = &cpurad_ieee802154;
 		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
-		zephyr,entropy = &prng;
-	};
-	prng: prng {
-		compatible = "nordic,entropy-prng";
-		status = "okay";
 	};
 	aliases {
 		ipc-to-cpusys = &cpurad_cpusys_ipc;
diff --git a/drivers/entropy/CMakeLists.txt b/drivers/entropy/CMakeLists.txt
index ea5e9fb8683..8a67fc3a03e 100644
--- a/drivers/entropy/CMakeLists.txt
+++ b/drivers/entropy/CMakeLists.txt
@@ -36,11 +36,4 @@ zephyr_library_sources_ifdef(CONFIG_ENTROPY_NPCX_DRBG                 entropy_np
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_MAX32_TRNG                entropy_max32.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_RENESAS_RA_RSIP_E51A_TRNG entropy_renesas_ra.c)
 
-if (CONFIG_FAKE_ENTROPY_NRF_PRNG)
-  zephyr_library_sources(fake_entropy_nrf_prng.c)
-
-  message(WARNING "\nA nRF PRNG is used, which does not produce real random bits."
-  "This is not secure and should therefore never be used in a product.")
-endif()
-
 zephyr_library_link_libraries_ifdef(CONFIG_BUILD_WITH_TFM tfm_api)
diff --git a/drivers/entropy/Kconfig b/drivers/entropy/Kconfig
index 40571df47f1..debd0f8d7a1 100644
--- a/drivers/entropy/Kconfig
+++ b/drivers/entropy/Kconfig
@@ -38,7 +38,6 @@ source "drivers/entropy/Kconfig.psa_crypto"
 source "drivers/entropy/Kconfig.npcx"
 source "drivers/entropy/Kconfig.max32"
 source "drivers/entropy/Kconfig.renesas_ra"
-source "drivers/entropy/Kconfig.nrf_prng"
 
 config ENTROPY_HAS_DRIVER
 	bool
diff --git a/drivers/entropy/Kconfig.nrf_prng b/drivers/entropy/Kconfig.nrf_prng
deleted file mode 100644
index e81db4de4b1..00000000000
--- a/drivers/entropy/Kconfig.nrf_prng
+++ /dev/null
@@ -1,19 +0,0 @@
-# nRF fake entropy prng generator driver configuration
-
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if ENTROPY_GENERATOR
-
-config FAKE_ENTROPY_NRF_PRNG
-	bool "A fake nRF entropy driver"
-	default y
-	depends on DT_HAS_NORDIC_ENTROPY_PRNG_ENABLED
-	depends on (SOC_SERIES_NRF54HX || SOC_SERIES_NRF92X || SOC_SERIES_NRF54LX)
-	select ENTROPY_HAS_DRIVER
-	help
-	  This is a super simple PRNG driver that can be used on nRF platforms that
-	  do not have an entropy source.
-	  This is NOT SAFE to use for cryptographic operations!
-
-endif
diff --git a/drivers/entropy/fake_entropy_nrf_prng.c b/drivers/entropy/fake_entropy_nrf_prng.c
deleted file mode 100644
index 8624c844405..00000000000
--- a/drivers/entropy/fake_entropy_nrf_prng.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/init.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <zephyr/drivers/entropy.h>
-
-#define DT_DRV_COMPAT nordic_entropy_prng
-
-/* This file implements a pseudo-RNG
- * https://vigna.di.unimi.it/xorshift/xoshiro128plus.c
- */
-
-static uint32_t s[4];
-
-static inline uint32_t rotl(const uint32_t x, int k)
-{
-	return (x << k) | (x >> (32 - k));
-}
-
-static uint32_t rng_next(void)
-{
-	const uint32_t result = rotl(s[0] + s[3], 7) + s[0];
-
-	const uint32_t t = s[1] << 9;
-
-	s[2] ^= s[0];
-	s[3] ^= s[1];
-	s[1] ^= s[2];
-	s[0] ^= s[3];
-
-	s[2] ^= t;
-
-	s[3] = rotl(s[3], 11);
-
-	return result;
-}
-
-static int entropy_prng_get_entropy(const struct device *dev, uint8_t *buffer, uint16_t length)
-{
-	ARG_UNUSED(dev);
-
-	while (length) {
-		/*
-		 * Note that only 1 thread (Zephyr thread or HW models), runs at
-		 * a time, therefore there is no need to use random_r()
-		 */
-		uint32_t value = rng_next();
-
-		size_t to_copy = MIN(length, sizeof(long));
-
-		memcpy(buffer, &value, to_copy);
-		buffer += to_copy;
-		length -= to_copy;
-	}
-
-	return 0;
-}
-
-static int entropy_prng_get_entropy_isr(const struct device *dev, uint8_t *buf, uint16_t len,
-					uint32_t flags)
-{
-	ARG_UNUSED(flags);
-
-	int err;
-
-	/*
-	 * entropy_prng_get_entropy() is also safe for ISRs
-	 * and always produces data.
-	 */
-	err = entropy_prng_get_entropy(dev, buf, len);
-	if (err < 0) {
-		return err;
-	} else {
-		return len;
-	}
-}
-
-static int entropy_prng_init(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	/* Picked some arbitrary initial seed. */
-	s[0] = 0xAF568BC0;
-	s[1] = 0xAC34307E;
-	s[2] = 0x9B7F6DD1;
-	s[3] = 0xD84319FC;
-	return 0;
-}
-
-static const struct entropy_driver_api entropy_prng_api_funcs = {
-	.get_entropy = entropy_prng_get_entropy, .get_entropy_isr = entropy_prng_get_entropy_isr};
-
-DEVICE_DT_INST_DEFINE(0, entropy_prng_init, NULL, NULL, NULL, PRE_KERNEL_1,
-		      CONFIG_ENTROPY_INIT_PRIORITY, &entropy_prng_api_funcs);
diff --git a/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi b/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
index d8fffc93808..8a331371f1c 100644
--- a/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
@@ -11,10 +11,6 @@ systick: &cpuapp_systick {};
 nvic: &cpuapp_nvic {};
 
 / {
-	chosen {
-		zephyr,entropy = &prng;
-	};
-
 	soc {
 		compatible = "simple-bus";
 		interrupt-parent = <&cpuapp_nvic>;
@@ -25,11 +21,6 @@ nvic: &cpuapp_nvic {};
 		compatible = "zephyr,psa-crypto-rng";
 		status = "disabled";
 	};
-
-	prng: prng {
-		compatible = "nordic,entropy-prng";
-		status = "okay";
-	};
 };
 
 &cpuapp_ppb {
diff --git a/dts/bindings/rng/nordic,nrf-prng.yaml b/dts/bindings/rng/nordic,nrf-prng.yaml
deleted file mode 100644
index 8936393a0b6..00000000000
--- a/dts/bindings/rng/nordic,nrf-prng.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
-
-description: This is a super simple PRNG
-
-compatible: "nordic,entropy-prng"
-
-include: base.yaml

From 372b7f03c0c16d015ddfcbfb2b6132ccb72db6f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:53 +0100
Subject: [PATCH 1803/2913] Revert "[nrf noup] settings: nvs: use dedicated
 lookup cache hash function"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit aa850001cd2334aa9a0e74fcdba8e639e6edd30b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/fs/nvs/Kconfig |  9 ---------
 subsys/fs/nvs/nvs.c   | 46 -------------------------------------------
 2 files changed, 55 deletions(-)

diff --git a/subsys/fs/nvs/Kconfig b/subsys/fs/nvs/Kconfig
index b3bd46c5b76..8b7dfdbab40 100644
--- a/subsys/fs/nvs/Kconfig
+++ b/subsys/fs/nvs/Kconfig
@@ -29,15 +29,6 @@ config NVS_LOOKUP_CACHE_SIZE
 	  Number of entries in Non-volatile Storage lookup cache.
 	  It is recommended that it be a power of 2.
 
-config NVS_LOOKUP_CACHE_FOR_SETTINGS
-	bool "Non-volatile Storage lookup cache optimized for settings"
-	depends on NVS_LOOKUP_CACHE
-	help
-	  Use the lookup cache hash function that results in the least number of
-	  collissions and, in turn, the best NVS performance provided that the NVS
-	  is used as the settings backend only. This option should NOT be enabled
-	  if the NVS is also written to directly, outside the settings layer.
-
 config NVS_DATA_CRC
 	bool "Non-volatile Storage CRC protection on the data"
 	help
diff --git a/subsys/fs/nvs/nvs.c b/subsys/fs/nvs/nvs.c
index 28bd5655c14..9e6578a5576 100644
--- a/subsys/fs/nvs/nvs.c
+++ b/subsys/fs/nvs/nvs.c
@@ -13,11 +13,6 @@
 #include <zephyr/sys/crc.h>
 #include "nvs_priv.h"
 
-#ifdef CONFIG_NVS_LOOKUP_CACHE_FOR_SETTINGS
-#include <zephyr/sys/util.h>
-#include <settings/settings_nvs.h>
-#endif
-
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(fs_nvs, CONFIG_NVS_LOG_LEVEL);
 
@@ -26,45 +21,6 @@ static int nvs_ate_valid(struct nvs_fs *fs, const struct nvs_ate *entry);
 
 #ifdef CONFIG_NVS_LOOKUP_CACHE
 
-#ifdef CONFIG_NVS_LOOKUP_CACHE_FOR_SETTINGS
-
-static inline size_t nvs_lookup_cache_pos(uint16_t id)
-{
-	/*
-	 * 1. The NVS settings backend uses up to (NVS_NAME_ID_OFFSET - 1) NVS IDs to
-	      store keys and equal number of NVS IDs to store values.
-	 * 2. For each key-value pair, the value is stored at NVS ID greater by exactly
-	 *    NVS_NAME_ID_OFFSET than NVS ID that holds the key.
-	 * 3. The backend tries to minimize the range of NVS IDs used to store keys.
-	 *    That is, NVS IDs are allocated sequentially, and freed NVS IDs are reused
-	 *    before allocating new ones.
-	 *
-	 * Therefore, to assure the least number of collisions in the lookup cache,
-	 * the least significant bit of the hash indicates whether the given NVS ID
-	 * represents a key or a value, and remaining bits of the hash are set to
-	 * the ordinal number of the key-value pair. Consequently, the hash function
-	 * provides the following mapping:
-	 *
-	 * 1st settings key   => hash 0
-	 * 1st settings value => hash 1
-	 * 2nd settings key   => hash 2
-	 * 2nd settings value => hash 3
-	 * ...
-	 */
-	BUILD_ASSERT(IS_POWER_OF_TWO(NVS_NAMECNT_ID), "NVS_NAMECNT_ID is not power of 2");
-	BUILD_ASSERT(IS_POWER_OF_TWO(NVS_NAME_ID_OFFSET), "NVS_NAME_ID_OFFSET is not power of 2");
-
-	uint16_t key_value_bit;
-	uint16_t key_value_ord;
-
-	key_value_bit = (id >> LOG2(NVS_NAME_ID_OFFSET)) & 1;
-	key_value_ord = id & (NVS_NAME_ID_OFFSET - 1);
-
-	return ((key_value_ord << 1) | key_value_bit) % CONFIG_NVS_LOOKUP_CACHE_SIZE;
-}
-
-#else /* CONFIG_NVS_LOOKUP_CACHE_FOR_SETTINGS */
-
 static inline size_t nvs_lookup_cache_pos(uint16_t id)
 {
 	uint16_t hash;
@@ -80,8 +36,6 @@ static inline size_t nvs_lookup_cache_pos(uint16_t id)
 	return hash % CONFIG_NVS_LOOKUP_CACHE_SIZE;
 }
 
-#endif /* CONFIG_NVS_LOOKUP_CACHE_FOR_SETTINGS */
-
 static int nvs_lookup_cache_rebuild(struct nvs_fs *fs)
 {
 	int rc;

From 2dfa8d4ce275d2e8bd160ad447c126e0a7e1efb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:53 +0100
Subject: [PATCH 1804/2913] Revert "[nrf noup] samples: sysbuild: hello_world:
 support PM on nRF53"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 29b2233c624721668927f692d7a67b1430068249.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/sysbuild/hello_world/sysbuild.cmake | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/samples/sysbuild/hello_world/sysbuild.cmake b/samples/sysbuild/hello_world/sysbuild.cmake
index 8f8fc49dbff..c7c2615c665 100644
--- a/samples/sysbuild/hello_world/sysbuild.cmake
+++ b/samples/sysbuild/hello_world/sysbuild.cmake
@@ -11,17 +11,5 @@ ExternalZephyrProject_Add(
   BOARD ${SB_CONFIG_REMOTE_BOARD}
 )
 
-if(SB_CONFIG_SOC_SERIES_NRF53X)
-  set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUNET)
-  set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES remote)
-  set_property(GLOBAL PROPERTY DOMAIN_APP_CPUNET remote)
-  set(CPUNET_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "")
-else(SB_CONFIG_SOC_SERIES_NRF54LX)
-  set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUFLPR)
-  set_property(GLOBAL APPEND PROPERTY PM_CPUFLPR_IMAGES remote)
-  set_property(GLOBAL PROPERTY DOMAIN_APP_CPUFLPR remote)
-  set(CPUFLPR_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "")
-endif()
-
 add_dependencies(${DEFAULT_IMAGE} remote)
 sysbuild_add_dependencies(FLASH ${DEFAULT_IMAGE} remote)

From 7d0cd8dd836a31411e656e283d4ce5ba31d24677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:53 +0100
Subject: [PATCH 1805/2913] Revert "[nrf noup] samples/../smp_svr: fix
 nrf54l15pdk ext flash dts overlay"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a283f6b726973c4ee4688aa37750cf80bb5cbaf6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
index ddbd39f4bde..76b648903a0 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
@@ -13,8 +13,7 @@
 
 /delete-node/ &storage_partition;
 
-&cpuapp_rram {
-	reg = < 0x0 DT_SIZE_K(1524) >;
+&rram0 {
 	partitions {
 		boot_partition: partition@0 {
 			label = "mcuboot";

From 49d74ae068384404311a00e1726c1e5b4e086cf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:53 +0100
Subject: [PATCH 1806/2913] Revert "[nrf noup] board: nordic: thingy53: Default
 to update only MCUboot type"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 35df9f232ff779aa117e5f440d556d4903f17142.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/thingy53/Kconfig.sysbuild | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/boards/nordic/thingy53/Kconfig.sysbuild b/boards/nordic/thingy53/Kconfig.sysbuild
index df489c1dd54..c03d191b370 100644
--- a/boards/nordic/thingy53/Kconfig.sysbuild
+++ b/boards/nordic/thingy53/Kconfig.sysbuild
@@ -7,10 +7,6 @@ choice BOOTLOADER
 	default BOOTLOADER_MCUBOOT
 endchoice
 
-choice MCUBOOT_MODE
-	default MCUBOOT_MODE_OVERWRITE_ONLY
-endchoice
-
 config SECURE_BOOT_NETCORE
 	default y
 
@@ -20,9 +16,6 @@ config NETCORE_APP_UPDATE
 config NRF_DEFAULT_EMPTY
 	default y if SECURE_BOOT_NETCORE
 
-config MCUBOOT_USE_ALL_AVAILABLE_RAM
-	default y if BOARD_THINGY53_NRF5340_CPUAPP_NS && BOOTLOADER_MCUBOOT
-
 endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
 
 config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY

From be93d82cd8ae5f737949365f5d59537065a2f9f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:53 +0100
Subject: [PATCH 1807/2913] =?UTF-8?q?Revert=20"[nrf=20noup]=C2=A0Bluetooth?=
 =?UTF-8?q?:=20Mesh:=20remove=20legacy=20adv=20support"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 710ffc1ae64aa5bb6807baecd79bb143acc9fda8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/mesh/Kconfig | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 3c362ce2641..7eced10bd07 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -59,16 +59,12 @@ choice BT_MESH_ADV
 
 menuconfig BT_MESH_ADV_LEGACY
 	bool "Legacy advertising"
-	depends on BT_LL_SW_SPLIT
 	help
 	  Use legacy advertising commands for mesh sending. Legacy
-	  advertising is significantly slower than the extended advertising.
+	  advertising is significantly slower than the extended advertising, but
+	  is supported by all controllers.
 
-	  WARNING: This feature is not supported in NCS. The legacy advertiser will not work
-	  with SDC, as attempting to start an advertisement during the scanner duty cycle
-	  will result in an error. The Zephyr Link Layer can be used experimentally as an
-	  alternative.
-	  The legacy advertiser can occasionally do more message
+	  WARNING: The legacy advertiser can occasionally do more message
 	  retransmissions than requested because of limitations of HCI
 	  interface API.
 

From bc0b36c884ebb979e10bcb0e3763f4e6d008170c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:53 +0100
Subject: [PATCH 1808/2913] Revert "[nrf noup] kernel: Disable boot banner if
 NCS_BOOT_BANNER is enabled"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2afff479b2ef3ed56afbd540e0fa3e7e53a3a0c4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 kernel/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kernel/Kconfig b/kernel/Kconfig
index e826de402b1..54e0ccf1f2d 100644
--- a/kernel/Kconfig
+++ b/kernel/Kconfig
@@ -441,7 +441,6 @@ config SKIP_BSS_CLEAR
 config BOOT_BANNER
 	bool "Boot banner"
 	default y
-	depends on !NCS_BOOT_BANNER
 	select PRINTK
 	select EARLY_CONSOLE
 	help

From fb1f3299dfbc1100da9585bdc6d4175b6177e6e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:53 +0100
Subject: [PATCH 1809/2913] Revert "[nrf noup] tree-wide: support NCS Partition
 Manager (PM) definitions"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e56959d1eb4c3d21aa9335f8d642f047b2afb7db.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 arch/arm/core/mpu/arm_mpu_regions.c           | 13 -----
 cmake/linker/ld/target.cmake                  |  1 -
 cmake/modules/kernel.cmake                    |  4 --
 drivers/flash/soc_flash_nrf.c                 | 11 ----
 .../arch/arm/cortex_m/scripts/linker.ld       | 50 -------------------
 include/zephyr/storage/flash_map.h            |  6 ---
 lib/heap/Kconfig                              |  2 +-
 lib/libc/common/source/stdlib/malloc.c        | 18 +------
 subsys/dfu/boot/mcuboot_shell.c               | 40 ---------------
 subsys/fs/littlefs_fs.c                       |  7 +--
 subsys/ipc/rpmsg_service/rpmsg_backend.h      | 27 ----------
 11 files changed, 4 insertions(+), 175 deletions(-)

diff --git a/arch/arm/core/mpu/arm_mpu_regions.c b/arch/arm/core/mpu/arm_mpu_regions.c
index cfe1230c907..6af62f84078 100644
--- a/arch/arm/core/mpu/arm_mpu_regions.c
+++ b/arch/arm/core/mpu/arm_mpu_regions.c
@@ -8,9 +8,6 @@
 #include <zephyr/arch/arm/mpu/arm_mpu.h>
 
 #include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
-#if USE_PARTITION_MANAGER
-#include <pm_config.h>
-#endif
 
 static const struct arm_mpu_region mpu_regions[] = {
 	/* Region 0 */
@@ -24,14 +21,6 @@ static const struct arm_mpu_region mpu_regions[] = {
 #endif
 	/* Region 1 */
 	MPU_REGION_ENTRY("SRAM_0",
-#if USE_PARTITION_MANAGER
-			 PM_SRAM_ADDRESS,
-#if defined(CONFIG_ARMV8_M_BASELINE) || defined(CONFIG_ARMV8_M_MAINLINE)
-			 REGION_RAM_ATTR(PM_SRAM_ADDRESS, PM_SRAM_SIZE)),
-#else
-			 REGION_RAM_ATTR(REGION_SRAM_SIZE)),
-#endif
-#else
 			 CONFIG_SRAM_BASE_ADDRESS,
 #if defined(CONFIG_ARMV8_M_BASELINE) || defined(CONFIG_ARMV8_M_MAINLINE)
 			 REGION_RAM_ATTR(CONFIG_SRAM_BASE_ADDRESS, \
@@ -39,8 +28,6 @@ static const struct arm_mpu_region mpu_regions[] = {
 #else
 			 REGION_RAM_ATTR(REGION_SRAM_SIZE)),
 #endif
-
-#endif /* USE_PARTITION_MANAGER */
 };
 
 const struct arm_mpu_config mpu_config = {
diff --git a/cmake/linker/ld/target.cmake b/cmake/linker/ld/target.cmake
index ed29e88aa16..8c18fce0e9a 100644
--- a/cmake/linker/ld/target.cmake
+++ b/cmake/linker/ld/target.cmake
@@ -80,7 +80,6 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
       ${current_includes}
       ${soc_linker_script_includes}
       ${template_script_defines}
-      -DUSE_PARTITION_MANAGER=$<OR:$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>,$<BOOL:${IMAGE_NAME}>,$<TARGET_EXISTS:partition_manager>>
       -E ${LINKER_SCRIPT}
       -P # Prevent generation of debug `#line' directives.
       -o ${linker_script_gen}
diff --git a/cmake/modules/kernel.cmake b/cmake/modules/kernel.cmake
index db07a04b921..6a1a48b172d 100644
--- a/cmake/modules/kernel.cmake
+++ b/cmake/modules/kernel.cmake
@@ -250,7 +250,3 @@ if("${CMAKE_EXTRA_GENERATOR}" STREQUAL "Eclipse CDT4")
   include(${ZEPHYR_BASE}/cmake/ide/eclipse_cdt4_generator_amendment.cmake)
   eclipse_cdt4_generator_amendment(1)
 endif()
-
-if(ZEPHYR_NRF_MODULE_DIR)
-  include(${ZEPHYR_NRF_MODULE_DIR}/cmake/partition_manager.cmake)
-endif()
diff --git a/drivers/flash/soc_flash_nrf.c b/drivers/flash/soc_flash_nrf.c
index 16ab00b9660..c15722082a3 100644
--- a/drivers/flash/soc_flash_nrf.c
+++ b/drivers/flash/soc_flash_nrf.c
@@ -37,11 +37,6 @@ LOG_MODULE_REGISTER(flash_nrf);
 
 #define SOC_NV_FLASH_NODE DT_INST(0, soc_nv_flash)
 
-#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER
-#include <soc_secure.h>
-#include <pm_config.h>
-#endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER */
-
 #ifndef CONFIG_SOC_FLASH_NRF_RADIO_SYNC_NONE
 #define FLASH_SLOT_WRITE     7500
 #if defined(CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE)
@@ -171,12 +166,6 @@ static int flash_nrf_read(const struct device *dev, off_t addr,
 	}
 #endif
 
-#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER && PM_APP_ADDRESS
-	if (addr < PM_APP_ADDRESS) {
-		return soc_secure_mem_read(data, (void *)addr, len);
-	}
-#endif
-
 	nrf_nvmc_buffer_read(data, (uint32_t)addr, len);
 
 	return 0;
diff --git a/include/zephyr/arch/arm/cortex_m/scripts/linker.ld b/include/zephyr/arch/arm/cortex_m/scripts/linker.ld
index d6f7a54eb29..fb26e91cf61 100644
--- a/include/zephyr/arch/arm/cortex_m/scripts/linker.ld
+++ b/include/zephyr/arch/arm/cortex_m/scripts/linker.ld
@@ -34,39 +34,6 @@
 #define ROMSTART_REGION ROMABLE_REGION
 #endif
 
-#if USE_PARTITION_MANAGER
-
-#include <pm_config.h>
-
-#if CONFIG_NCS_IS_VARIANT_IMAGE && defined(PM_S0_ID)
-/* We are linking against S1, create symbol containing the flash ID of S0.
- * This is used when writing code operating on the "other" slot.
- */
-_image_1_primary_slot_id = PM_S0_ID;
-
-#else /* ! CONFIG_NCS_IS_VARIANT_IMAGE */
-
-#ifdef PM_S1_ID
-/* We are linking against S0, create symbol containing the flash ID of S1.
- * This is used when writing code operating on the "other" slot.
- */
-_image_1_primary_slot_id = PM_S1_ID;
-#endif /* PM_S1_ID */
-
-#endif /* CONFIG_NCS_IS_VARIANT_IMAGE */
-
-#define ROM_ADDR PM_ADDRESS
-#define ROM_SIZE PM_SIZE
-
-#if defined(CONFIG_PM_USE_CONFIG_SRAM_SIZE)
-#define RAM_SIZE CONFIG_PM_SRAM_SIZE
-#else
-#define RAM_SIZE PM_SRAM_SIZE
-#endif
-#define RAM_ADDR PM_SRAM_ADDRESS
-
-#else /* ! USE_PARTITION_MANAGER */
-
 #if !defined(CONFIG_XIP) && (CONFIG_FLASH_SIZE == 0)
 #define ROM_ADDR RAM_ADDR
 #else
@@ -99,23 +66,6 @@ _image_1_primary_slot_id = PM_S1_ID;
 #define RAM_ADDR CONFIG_SRAM_BASE_ADDRESS
 #endif
 
-#endif /* USE_PARTITION_MANAGER */
-
-#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_ccm), okay)
-#define CCM_SIZE DT_REG_SIZE(DT_CHOSEN(zephyr_ccm))
-#define CCM_ADDR DT_REG_ADDR(DT_CHOSEN(zephyr_ccm))
-#endif
-
-#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_itcm), okay)
-#define ITCM_SIZE DT_REG_SIZE(DT_CHOSEN(zephyr_itcm))
-#define ITCM_ADDR DT_REG_ADDR(DT_CHOSEN(zephyr_itcm))
-#endif
-
-#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
-#define DTCM_SIZE DT_REG_SIZE(DT_CHOSEN(zephyr_dtcm))
-#define DTCM_ADDR DT_REG_ADDR(DT_CHOSEN(zephyr_dtcm))
-#endif
-
 #if defined(CONFIG_CUSTOM_SECTION_ALIGN)
 _region_min_align = CONFIG_CUSTOM_SECTION_MIN_ALIGN_SIZE;
 #else
diff --git a/include/zephyr/storage/flash_map.h b/include/zephyr/storage/flash_map.h
index 8943d082861..937e242830a 100644
--- a/include/zephyr/storage/flash_map.h
+++ b/include/zephyr/storage/flash_map.h
@@ -296,10 +296,6 @@ const char *flash_area_label(const struct flash_area *fa);
  */
 uint8_t flash_area_erased_val(const struct flash_area *fa);
 
-#if USE_PARTITION_MANAGER
-#include <flash_map_pm.h>
-#else
-
 /**
  * Returns non-0 value if fixed-partition of given DTS node label exists.
  *
@@ -385,8 +381,6 @@ uint8_t flash_area_erased_val(const struct flash_area *fa);
 #define FIXED_PARTITION_NODE_DEVICE(node) \
 	DEVICE_DT_GET(DT_MTD_FROM_FIXED_PARTITION(node))
 
-#endif /* USE_PARTITION_MANAGER */
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/heap/Kconfig b/lib/heap/Kconfig
index 147659f96a9..89ede278006 100644
--- a/lib/heap/Kconfig
+++ b/lib/heap/Kconfig
@@ -69,7 +69,7 @@ config HEAP_LISTENER
 choice
 	prompt "Supported heap sizes"
 	depends on !64BIT
-	default SYS_HEAP_SMALL_ONLY if (SRAM_SIZE <= 256) && !PARTITION_MANAGER_ENABLED
+	default SYS_HEAP_SMALL_ONLY if (SRAM_SIZE <= 256)
 	default SYS_HEAP_AUTO
 	help
 	  Heaps using reduced-size chunk headers can accommodate so called
diff --git a/lib/libc/common/source/stdlib/malloc.c b/lib/libc/common/source/stdlib/malloc.c
index 505bd50bad0..a75b028000d 100644
--- a/lib/libc/common/source/stdlib/malloc.c
+++ b/lib/libc/common/source/stdlib/malloc.c
@@ -25,20 +25,6 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
-#if USE_PARTITION_MANAGER
-
-#include <pm_config.h>
-
-#define RAM_SIZE PM_SRAM_SIZE
-#define RAM_ADDR PM_SRAM_ADDRESS
-
-#else /* ! USE_PARTITION_MANAGER */
-
-#define RAM_SIZE (KB((size_t) CONFIG_SRAM_SIZE))
-#define RAM_ADDR CONFIG_SRAM_BASE_ADDRESS
-
-#endif /* USE_PARTITION_MANAGER */
-
 #ifdef CONFIG_COMMON_LIBC_MALLOC
 
 #if (CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE != 0)
@@ -120,8 +106,8 @@ static POOL_SECTION unsigned char __aligned(HEAP_ALIGN) malloc_arena[HEAP_SIZE];
 extern char _heap_sentry[];
 #    define HEAP_SIZE  ROUND_DOWN((POINTER_TO_UINT(_heap_sentry) - HEAP_BASE), HEAP_ALIGN)
 #   else
-#    define HEAP_SIZE	ROUND_DOWN((RAM_SIZE -	\
-		((size_t) HEAP_BASE - (size_t) RAM_ADDR)), HEAP_ALIGN)
+#    define HEAP_SIZE	ROUND_DOWN((KB((size_t) CONFIG_SRAM_SIZE) -	\
+		((size_t) HEAP_BASE - (size_t) CONFIG_SRAM_BASE_ADDRESS)), HEAP_ALIGN)
 #   endif /* else CONFIG_XTENSA */
 
 #  endif /* else CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE > 0 */
diff --git a/subsys/dfu/boot/mcuboot_shell.c b/subsys/dfu/boot/mcuboot_shell.c
index e167bc1e39b..be4e558713f 100644
--- a/subsys/dfu/boot/mcuboot_shell.c
+++ b/subsys/dfu/boot/mcuboot_shell.c
@@ -20,16 +20,6 @@
 #endif
 #endif
 
-#if USE_PARTITION_MANAGER
-#include <flash_map_pm.h>
-
-#ifdef CONFIG_NCS_IS_VARIANT_IMAGE
-#define ACTIVE_IMAGE_ID PM_MCUBOOT_SECONDARY_ID
-#else
-#define ACTIVE_IMAGE_ID PM_MCUBOOT_PRIMARY_ID
-#endif
-#endif
-
 struct area_desc {
 	const char *name;
 	unsigned int id;
@@ -103,35 +93,6 @@ static int cmd_mcuboot_erase(const struct shell *sh, size_t argc,
 	id = strtoul(argv[1], NULL, 0);
 
 	/* Check if this is the parent (MCUboot) or own slot and if so, deny the request */
-#if USE_PARTITION_MANAGER
-#ifdef PM_MCUBOOT_ID
-	if (id == PM_MCUBOOT_ID || id == PM_MCUBOOT_PAD_ID) {
-		shell_error(sh, "Cannot erase boot partition");
-		return -EACCES;
-	}
-#endif
-
-#ifdef PM_APP_ID
-	if (id == PM_APP_ID) {
-		shell_error(sh, "Cannot erase this area");
-		return -EACCES;
-	}
-#endif
-
-#ifdef PM_MCUBOOT_PRIMARY_APP_ID
-	if (id == PM_MCUBOOT_PRIMARY_APP_ID) {
-		shell_error(sh, "Cannot erase this area");
-		return -EACCES;
-	}
-#endif
-
-#ifdef ACTIVE_IMAGE_ID
-	if (id == ACTIVE_IMAGE_ID) {
-		shell_error(sh, "Cannot erase active partitions");
-		return -EACCES;
-	}
-#endif
-#else
 #if FIXED_PARTITION_EXISTS(boot_partition)
 	if (id == FIXED_PARTITION_ID(boot_partition)) {
 		shell_error(sh, "Cannot erase boot partition");
@@ -144,7 +105,6 @@ static int cmd_mcuboot_erase(const struct shell *sh, size_t argc,
 		shell_error(sh, "Cannot erase active partitions");
 		return -EACCES;
 	}
-#endif
 #endif
 
 	err = boot_erase_img_bank(id);
diff --git a/subsys/fs/littlefs_fs.c b/subsys/fs/littlefs_fs.c
index 3d0c71e2367..5989f856ac1 100644
--- a/subsys/fs/littlefs_fs.c
+++ b/subsys/fs/littlefs_fs.c
@@ -1070,12 +1070,7 @@ struct fs_mount_t FS_FSTAB_ENTRY(DT_DRV_INST(inst)) = { \
 	.type = FS_LITTLEFS, \
 	.mnt_point = DT_INST_PROP(inst, mount_point), \
 	.fs_data = &fs_data_##inst, \
-	.storage_dev = (void *) \
-		COND_CODE_1(USE_PARTITION_MANAGER, \
-			    (COND_CODE_1(FIXED_PARTITION_EXISTS(littlefs_storage), \
-					 (FIXED_PARTITION_ID(littlefs_storage)), \
-					 (FIXED_PARTITION_ID(storage)))), \
-			    (DT_FIXED_PARTITION_ID(FS_PARTITION(inst)))), \
+	.storage_dev = (void *)DT_FIXED_PARTITION_ID(FS_PARTITION(inst)), \
 	.flags = FSTAB_ENTRY_DT_MOUNT_FLAGS(DT_DRV_INST(inst)), \
 };
 
diff --git a/subsys/ipc/rpmsg_service/rpmsg_backend.h b/subsys/ipc/rpmsg_service/rpmsg_backend.h
index 9996e1d74d9..a74e46b8520 100644
--- a/subsys/ipc/rpmsg_service/rpmsg_backend.h
+++ b/subsys/ipc/rpmsg_service/rpmsg_backend.h
@@ -13,35 +13,8 @@
 extern "C" {
 #endif
 
-#if CONFIG_PARTITION_MANAGER_ENABLED
-
-#include "pm_config.h"
-
-#if defined(PM_RPMSG_NRF53_SRAM_ADDRESS) || defined(PM__RPMSG_NRF53_SRAM_ADDRESS)
-
-#if defined(PM_RPMSG_NRF53_SRAM_ADDRESS)
-#define VDEV_START_ADDR PM_RPMSG_NRF53_SRAM_ADDRESS
-#define VDEV_SIZE PM_RPMSG_NRF53_SRAM_SIZE
-#else
-/* The current image is a child image in a different domain than the image
- * which defined the required values. To reach the values of the parent domain
- * we use the 'PM__' variant of the define.
- */
-#define VDEV_START_ADDR PM__RPMSG_NRF53_SRAM_ADDRESS
-#define VDEV_SIZE PM__RPMSG_NRF53_SRAM_SIZE
-#endif /* defined(PM_RPMSG_NRF53_SRAM_ADDRESS) */
-
-#else
 #define VDEV_START_ADDR		DT_REG_ADDR(DT_CHOSEN(zephyr_ipc_shm))
 #define VDEV_SIZE		DT_REG_SIZE(DT_CHOSEN(zephyr_ipc_shm))
-#endif /* defined(PM_RPMSG_NRF53_SRAM_ADDRESS) || defined(PM__RPMSG_NRF53_SRAM_ADDRESS) */
-
-#else
-
-#define VDEV_START_ADDR		DT_REG_ADDR(DT_CHOSEN(zephyr_ipc_shm))
-#define VDEV_SIZE		DT_REG_SIZE(DT_CHOSEN(zephyr_ipc_shm))
-
-#endif /* CONFIG_PARTITION_MANAGER_ENABLED */
 
 #define VDEV_STATUS_ADDR	VDEV_START_ADDR
 #define VDEV_STATUS_SIZE	0x400

From 9d70df8c021c490c820427920dc9123972914356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:53 +0100
Subject: [PATCH 1810/2913] Revert "[nrf noup] include: net: add NCS
 extensions"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit eab09f631472554b4a1cd9df6b67a587ecd7d634.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/socket.h     |   1 -
 include/zephyr/net/socket_ncs.h | 170 --------------------------------
 2 files changed, 171 deletions(-)
 delete mode 100644 include/zephyr/net/socket_ncs.h

diff --git a/include/zephyr/net/socket.h b/include/zephyr/net/socket.h
index 34211d83759..d62b12719ab 100644
--- a/include/zephyr/net/socket.h
+++ b/include/zephyr/net/socket.h
@@ -34,7 +34,6 @@
 #include <zephyr/sys/iterable_sections.h>
 #include <zephyr/sys/fdtable.h>
 #include <zephyr/net/dns_resolve.h>
-#include <zephyr/net/socket_ncs.h>
 #include <stdlib.h>
 
 #ifdef __cplusplus
diff --git a/include/zephyr/net/socket_ncs.h b/include/zephyr/net/socket_ncs.h
deleted file mode 100644
index 4a198b5992b..00000000000
--- a/include/zephyr/net/socket_ncs.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2021 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_NET_SOCKET_NCS_H_
-#define ZEPHYR_INCLUDE_NET_SOCKET_NCS_H_
-
-/**
- * @file
- * @brief NCS specific additions to the BSD sockets API definitions
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* When CONFIG_NET_SOCKETS_OFFLOAD is enabled, offloaded sockets take precedence
- * when creating a new socket. Combine this flag with a socket type when
- * creating a socket, to enforce native socket creation (e. g. SOCK_STREAM | SOCK_NATIVE).
- * If it's desired to create a native TLS socket, but still offload the
- * underlying TCP/UDP socket, use e. g. SOCK_STREAM | SOCK_NATIVE_TLS.
- */
-#define SOCK_NATIVE 0x80000000
-#define SOCK_NATIVE_TLS 0x40000000
-
-/* NCS specific TLS level socket options */
-
-/** Socket option to set DTLS handshake timeout, specifically for nRF sockets.
- *  The option accepts an integer, indicating the total handshake timeout,
- *  including retransmissions, in seconds.
- *  Accepted values for the option are: 1, 3, 7, 15, 31, 63, 123.
- */
-#define TLS_DTLS_HANDSHAKE_TIMEO 18
-
-/** Socket option to save DTLS connection, specifically for nRF sockets.
- */
-#define TLS_DTLS_CONN_SAVE 19
-
-/** Socket option to load DTLS connection, specifically for nRF sockets.
- */
-#define TLS_DTLS_CONN_LOAD 20
-
-/** Socket option to get result of latest TLS/DTLS completed handshakes end status,
- *  specifically for nRF sockets.
- *  The option accepts an integer, indicating the setting.
- *  Accepted vaules for the option are: 0 and 1.
- */
-#define TLS_DTLS_HANDSHAKE_STATUS 21
-
-/* Valid values for TLS_SESSION_CACHE option */
-#define TLS_SESSION_CACHE_DISABLED 0 /**< Disable TLS session caching. */
-#define TLS_SESSION_CACHE_ENABLED 1 /**< Enable TLS session caching. */
-
-/* Valid values for TLS_DTLS_HANDSHAKE_TIMEO option */
-#define TLS_DTLS_HANDSHAKE_TIMEO_NONE 0 /**< No timeout */
-#define TLS_DTLS_HANDSHAKE_TIMEO_1S 1 /**< 1 second */
-#define TLS_DTLS_HANDSHAKE_TIMEO_3S 3 /**< 1s + 2s */
-#define TLS_DTLS_HANDSHAKE_TIMEO_7S 7 /**< 1s + 2s + 4s */
-#define TLS_DTLS_HANDSHAKE_TIMEO_15S 15 /**< 1s + 2s + 4s + 8s */
-#define TLS_DTLS_HANDSHAKE_TIMEO_31S 31 /**< 1s + 2s + 4s + 8s + 16s */
-#define TLS_DTLS_HANDSHAKE_TIMEO_63S 63 /**< 1s + 2s + 4s + 8s + 16s + 32s */
-#define TLS_DTLS_HANDSHAKE_TIMEO_123S 123 /**< 1s + 2s + 4s + 8s + 16s + 32s + 60s */
-
-/* Valid values for TLS_DTLS_HANDSHAKE_STATUS option */
-#define TLS_DTLS_HANDSHAKE_STATUS_FULL		0
-#define TLS_DTLS_HANDSHAKE_STATUS_CACHED	1
-
-/* NCS specific socket options */
-
-/** sockopt: enable sending data as part of exceptional events */
-#define SO_EXCEPTIONAL_DATA 33
-/** sockopt: Keep socket open when its PDN connection is lost
- *           or the device is put into flight mode.
- */
-#define SO_KEEPOPEN 34
-/** sockopt: bind to PDN */
-#define SO_BINDTOPDN 40
-
-/** sockopt: Release assistance indication (RAI).
- *  The option accepts an integer, indicating the type of RAI.
- *  Accepted values for the option are: @ref RAI_NO_DATA, @ref RAI_LAST, @ref RAI_ONE_RESP,
- *  @ref RAI_ONGOING, @ref RAI_WAIT_MORE.
- */
-#define SO_RAI 61
-
-/** Release assistance indication (RAI).
- *  Indicate that the application does not intend to send more data.
- *  This applies immediately and lets the modem exit connected mode more
- *  quickly.
- *
- *  @note This requires the socket to be connected.
- */
-#define RAI_NO_DATA 1
-/** Release assistance indication (RAI).
- *  Indicate that the application does not intend to send more data
- *  after the next call to send() or sendto().
- *  This lets the modem exit connected mode more quickly after sending the data.
- */
-#define RAI_LAST 2
-/** Release assistance indication (RAI).
- *  Indicate that the application is expecting to receive just one data packet
- *  after the next call to send() or sendto().
- *  This lets the modem exit connected mode more quickly after having received the data.
- */
-#define RAI_ONE_RESP 3
-/** Release assistance indication (RAI).
- *  Indicate that the socket is in active use by a client application.
- *  This lets the modem stay in connected mode longer.
- */
-#define RAI_ONGOING 4
-/** Release assistance indication (RAI).
- *  Indicate that the socket is in active use by a server application.
- *  This lets the modem stay in connected mode longer.
- */
-#define RAI_WAIT_MORE 5
-
-/* NCS specific IPPROTO_ALL level socket options */
-
-/** IPv4 and IPv6 protocol level (pseudo-val) for nRF sockets. */
-#define IPPROTO_ALL 512
-/** sockopt: disable all replies to unexpected traffics */
-#define SO_SILENCE_ALL 30
-
-/* NCS specific IPPROTO_IP level socket options */
-
-/** sockopt: enable IPv4 ICMP replies */
-#define SO_IP_ECHO_REPLY 31
-
-/* NCS specific IPPROTO_IPV6 level socket options */
-
-/** sockopt: enable IPv6 ICMP replies */
-#define SO_IPV6_ECHO_REPLY 32
-
-/** sockopt: Delay IPv6 address refresh during power saving mode  */
-#define SO_IPV6_DELAYED_ADDR_REFRESH 62
-
-/* NCS specific TCP level socket options */
-
-/** sockopt: Configurable TCP server session timeout in minutes.
- * Range is 0 to 135. 0 is no timeout and 135 is 2 h 15 min. Default is 0 (no timeout).
- */
-#define SO_TCP_SRV_SESSTIMEO 55
-
-/* NCS specific gettaddrinfo() flags */
-
-/** Assume `service` contains a Packet Data Network (PDN) ID.
- *  When specified together with the AI_NUMERICSERV flag,
- *  `service` shall be formatted as follows: "port:pdn_id"
- *  where "port" is the port number and "pdn_id" is the PDN ID.
- *  Example: "8080:1", port 8080 PDN ID 1.
- *  Example: "42:0", port 42 PDN ID 0.
- */
-#define AI_PDNSERV 0x1000
-
-/* NCS specific send() and sendto() flags */
-
-/** Request a blocking send operation until the request is acknowledged.
- *  When used in send() or sendto(), the request will not return until the
- *  send operation is completed by lower layers, or until the timeout, given by the SO_SNDTIMEO
- *  socket option, is reached. Valid timeout values are 1 to 600 seconds.
- */
-#define MSG_WAITACK 0x200
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZEPHYR_INCLUDE_NET_SOCKET_NCS_H_ */

From f7189ec40914dae268ed34fda297663d6b87b701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:54 +0100
Subject: [PATCH 1811/2913] Revert "[nrf noup] samples/**/smp_svr: fix
 SB_CONFIG_PARTITION_MANAGER injection"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4101af67a14edb655c33fa08e778bd44ef52cff2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 3aa3ca449e5..00182054eba 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -122,6 +122,7 @@ tests:
       - DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
       - mcuboot_CONF_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.conf"
       - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
+    extra_configs:
       - SB_CONFIG_PARTITION_MANAGER=n
     platform_allow:
       - nrf54l15pdk/nrf54l15/cpuapp

From 0d80aa66019e0bd81c2e78164308ee432a10be99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:54 +0100
Subject: [PATCH 1812/2913] Revert "[nrf noup] board: nordic: thingy53: Enable
 default images for sysbuild"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ab305add763a56b6671c3b1b5828a6c7d6d88105.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/thingy53/Kconfig.sysbuild | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/boards/nordic/thingy53/Kconfig.sysbuild b/boards/nordic/thingy53/Kconfig.sysbuild
index c03d191b370..2110f226e6b 100644
--- a/boards/nordic/thingy53/Kconfig.sysbuild
+++ b/boards/nordic/thingy53/Kconfig.sysbuild
@@ -1,22 +1,5 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
-
-choice BOOTLOADER
-	default BOOTLOADER_MCUBOOT
-endchoice
-
-config SECURE_BOOT_NETCORE
-	default y
-
-config NETCORE_APP_UPDATE
-	default y if SECURE_BOOT_NETCORE
-
-config NRF_DEFAULT_EMPTY
-	default y if SECURE_BOOT_NETCORE
-
-endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
-
 config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
 	default y if BOOTLOADER_MCUBOOT

From 210c3873f1bd8b1bc00de891cee82855411ff846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:54 +0100
Subject: [PATCH 1813/2913] Revert "[nrf noup] scripts: west: build: Use
 sysbuild by default if in NCS dir"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f7060745b31b1d26e57a3280cd3f0dc6660682ec.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/west_commands/build.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/scripts/west_commands/build.py b/scripts/west_commands/build.py
index 260945483cf..459d9aedf0b 100644
--- a/scripts/west_commands/build.py
+++ b/scripts/west_commands/build.py
@@ -595,12 +595,7 @@ def _run_cmake(self, board, origin, cmake_opts):
         if user_args:
             cmake_opts.extend(shlex.split(user_args))
 
-        config_sysbuild = config_getboolean('sysbuild', None)
-
-        if config_sysbuild is None:
-            # If no option is set, then enable sysbuild globally
-            config_sysbuild = True
-
+        config_sysbuild = config_getboolean('sysbuild', False)
         if self.args.sysbuild or (config_sysbuild and not self.args.no_sysbuild):
             cmake_opts.extend(['-S{}'.format(SYSBUILD_PROJ_DIR),
                                '-DAPP_DIR:PATH={}'.format(self.source_dir)])

From d64e719b24c261a2fd2f690058c5ed0be20c51f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:54 +0100
Subject: [PATCH 1814/2913] Revert "[nrf noup] boards: nordic: thingy53: Add
 sysbuild Kconfig file"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 031b51365d27df2bc012be3e1775164f0ee925d2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/thingy53/Kconfig.sysbuild | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 boards/nordic/thingy53/Kconfig.sysbuild

diff --git a/boards/nordic/thingy53/Kconfig.sysbuild b/boards/nordic/thingy53/Kconfig.sysbuild
deleted file mode 100644
index 2110f226e6b..00000000000
--- a/boards/nordic/thingy53/Kconfig.sysbuild
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
-	default y if BOOTLOADER_MCUBOOT

From 6e4a97f3d1b44babd7c13cc9102ce9cdf5e0f8f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:54 +0100
Subject: [PATCH 1815/2913] Revert "[nrf noup] samples/**/smp_svr: testcase of
 nrf54l15pdk with ext-flash DT"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 08368a1040105dc596829aacd8aa6ccf80465c97.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 00182054eba..81b06ca5634 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -116,15 +116,3 @@ tests:
       - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15pdk/nrf54l15/cpuapp
-  sample.mcumgr.smp_svr.bt.nrf54l15pdk.ext_flash.pure_dts:
-    extra_args:
-      - OVERLAY_CONFIG="overlay-bt.conf"
-      - DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
-      - mcuboot_CONF_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.conf"
-      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
-    extra_configs:
-      - SB_CONFIG_PARTITION_MANAGER=n
-    platform_allow:
-      - nrf54l15pdk/nrf54l15/cpuapp
-    integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp

From 7a5d241b232cb62b863f361c5f7ee583882a6131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:54 +0100
Subject: [PATCH 1816/2913] Revert "[nrf noup] samples/smp_svr: nrf54l15pdk
 ext-flash partition"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7edd93c1edb7701c8e7a67591df2c32c19c3374d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 ...54l15pdk_nrf54l15_cpuapp_ext_flash.overlay | 36 -------------------
 1 file changed, 36 deletions(-)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
index 76b648903a0..410388bfa6d 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
@@ -4,42 +4,6 @@
 	};
 };
 
-/delete-node/ &boot_partition;
-/delete-node/ &slot0_partition;
-/delete-node/ &slot1_partition;
-
-/delete-node/ &slot0_ns_partition;
-/delete-node/ &slot1_ns_partition;
-
-/delete-node/ &storage_partition;
-
-&rram0 {
-	partitions {
-		boot_partition: partition@0 {
-			label = "mcuboot";
-			reg = <0x000000000 0x00014000>;
-		};
-		slot0_partition: partition@14000 {
-			label = "image-0";
-			reg = <0x000014000 0x0015A000>;
-		};
-		storage_partition: partition@16E000 {
-			label = "storage";
-			reg = < 0x16E000 0x9000 >;
-		};
-	};
-};
-
 &mx25r64 {
 	status = "okay";
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		slot1_partition: partition@0 {
-			label = "image-1";
-			reg = <0x000000000 0x0015A000>;
-		};
-	};
 };

From 992ff07345e3bef2c15aba47e48bf8df4d096aa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:54 +0100
Subject: [PATCH 1817/2913] Revert "[nrf noup] samples: psa_crypto: Remove
 support for Nordic boards"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 124e72c6d8c85f195acf1379f2c95a32d1229f08.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/tfm_integration/psa_crypto/sample.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/samples/tfm_integration/psa_crypto/sample.yaml b/samples/tfm_integration/psa_crypto/sample.yaml
index 9f067c7be0d..37a6aeaf234 100644
--- a/samples/tfm_integration/psa_crypto/sample.yaml
+++ b/samples/tfm_integration/psa_crypto/sample.yaml
@@ -16,6 +16,8 @@ tests:
     platform_allow:
       - mps2/an521/cpu0/ns
       - v2m_musca_s1/musca_s1/ns
+      - nrf5340dk/nrf5340/cpuapp/ns
+      - nrf9160dk/nrf9160/ns
       - stm32l562e_dk/stm32l562xx/ns
       - bl5340_dvk/nrf5340/cpuapp/ns
     harness: console

From 97e7d783401917a345b36b309d15d7f58a88090e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:54 +0100
Subject: [PATCH 1818/2913] Revert "[nrf noup] samples/**/smp_svr: testcase of
 nrf54l15pdk with ext-flash"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b4f2813c71c6308c0b65d5a0fa39aaf043731fbf.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 81b06ca5634..04e19dfb48e 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -104,15 +104,3 @@ tests:
       - mg100
     integration_platforms:
       - nrf52840dk/nrf52840
-  sample.mcumgr.smp_svr.bt.nrf54l15pdk.ext_flash:
-    extra_args:
-      - OVERLAY_CONFIG="overlay-bt.conf"
-      - DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
-      - mcuboot_CONF_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.conf"
-      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
-    extra_configs:
-      - CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
-    platform_allow:
-      - nrf54l15pdk/nrf54l15/cpuapp
-    integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp

From a700719cf0326cd4820e4e05c7d5920b97303b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:54 +0100
Subject: [PATCH 1819/2913] Revert "[nrf noup] samples: smp_svr: configuration
 for nrf54l15"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0b39a49df9468bdcdda450731d6b02ddebba14bb.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 04e19dfb48e..6a3669b2438 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -12,11 +12,9 @@ tests:
       - nrf52840dk/nrf52840
       - pinnacle_100_dvk
       - mg100
-      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
-      - nrf54l15pdk/nrf54l15/cpuapp
   sample.mcumgr.smp_svr.bt_static_svc:
     extra_args: OVERLAY_CONFIG="overlay-bt.conf"
     extra_configs:

From ba66edad6a26c36e5f4029aa3a9adc2bab734198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:54 +0100
Subject: [PATCH 1820/2913] Revert "[nrf noup] boards: arm: nrf9131ek: enable
 tfm"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f4efefb975d3e0b54aee51be89bd830ccd04c67b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf9131ek/Kconfig.defconfig | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/boards/nordic/nrf9131ek/Kconfig.defconfig b/boards/nordic/nrf9131ek/Kconfig.defconfig
index 8e0e1d02d1d..b63e7ef8d34 100644
--- a/boards/nordic/nrf9131ek/Kconfig.defconfig
+++ b/boards/nordic/nrf9131ek/Kconfig.defconfig
@@ -5,21 +5,6 @@
 
 if BOARD_NRF9131EK_NRF9131 || BOARD_NRF9131EK_NRF9131_NS
 
-# By default, if we build for a Non-Secure version of the board,
-# enable building with TF-M as the Secure Execution Environment.
-config BUILD_WITH_TFM
-	default y if BOARD_NRF9131EK_NRF9131_NS
-
-if BUILD_WITH_TFM
-
-# By default, if we build with TF-M, instruct build system to
-# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
-config TFM_FLASH_MERGED_BINARY
-	bool
-	default y
-
-endif # BUILD_WITH_TFM
-
 # For the secure version of the board the firmware is linked at the beginning
 # of the flash, or into the code-partition defined in DT if it is intended to
 # be loaded by MCUboot. If the secure firmware is to be combined with a non-

From f641269ff908d39fa9082e000037b73405d14287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:54 +0100
Subject: [PATCH 1821/2913] Revert "[nrf noup] boards: thingy53_nrf5340: Enable
 MCUboot by default"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1e7e8edd624db75044326f201ecd02880298e493.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/thingy53/Kconfig.defconfig            | 6 ------
 boards/nordic/thingy53/thingy53_nrf5340_common.dtsi | 1 -
 2 files changed, 7 deletions(-)

diff --git a/boards/nordic/thingy53/Kconfig.defconfig b/boards/nordic/thingy53/Kconfig.defconfig
index c2e13fad0ab..fc259cbd429 100644
--- a/boards/nordic/thingy53/Kconfig.defconfig
+++ b/boards/nordic/thingy53/Kconfig.defconfig
@@ -5,12 +5,6 @@
 
 if BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
 
-config BOOTLOADER_MCUBOOT
-	default y if !MCUBOOT
-
-config BOARD_ENABLE_CPUNET
-	default y if !MCUBOOT
-
 # Code Partition:
 #
 # For the secure version of the board the firmware is linked at the beginning
diff --git a/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi b/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
index e4028edfc94..12b7cf6c13b 100644
--- a/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
+++ b/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
@@ -18,7 +18,6 @@
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,ieee802154 = &ieee802154;
-		nordic,pm-ext-flash = &mx25r64;
 	};
 
 	buttons {

From 92ba1a4297c4b2bced1ea7b9d27ffb3450e7d3a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:54 +0100
Subject: [PATCH 1822/2913] Revert "[nrf noup] boards: arm: thingy53: Disable
 USB CDC added by MCUBoot"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f01f4727d70b4ed20bbaf0fb8c1f022e16fb3064.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/thingy53/Kconfig.defconfig | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/boards/nordic/thingy53/Kconfig.defconfig b/boards/nordic/thingy53/Kconfig.defconfig
index fc259cbd429..92eac11503d 100644
--- a/boards/nordic/thingy53/Kconfig.defconfig
+++ b/boards/nordic/thingy53/Kconfig.defconfig
@@ -132,13 +132,6 @@ endif # LOG
 
 endif # BOARD_SERIAL_BACKEND_CDC_ACM
 
-# By default, a USB CDC ACM instance is already enabled in the board's DTS.
-# It is not necessary for nRF Connect SDK to add another instance if MCUBoot
-# bootloader is built as a child image.
-config MCUBOOT_USB_SUPPORT
-	bool
-	default n
-
 endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
 
 if BOARD_THINGY53_NRF5340_CPUNET

From a8c593843f4335078d681d19669d21a4cdfd9969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:54 +0100
Subject: [PATCH 1823/2913] Revert "[nrf noup] boards: thingy53_nrf5340: Add
 common partition map"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4f1f83b81edf0c7502344736130ab66e03b25bee.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../pm_static_thingy53_nrf5340_cpuapp.yml     | 55 --------------
 .../pm_static_thingy53_nrf5340_cpuapp_ns.yml  | 73 -------------------
 2 files changed, 128 deletions(-)
 delete mode 100644 boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp.yml
 delete mode 100644 boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp_ns.yml

diff --git a/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp.yml b/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp.yml
deleted file mode 100644
index 7a48d51ec33..00000000000
--- a/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-app:
-  address: 0x10200
-  region: flash_primary
-  size: 0xdfe00
-mcuboot:
-  address: 0x0
-  region: flash_primary
-  size: 0x10000
-mcuboot_pad:
-  address: 0x10000
-  region: flash_primary
-  size: 0x200
-mcuboot_primary:
-  address: 0x10000
-  orig_span: &id001
-  - mcuboot_pad
-  - app
-  region: flash_primary
-  size: 0xe0000
-  span: *id001
-mcuboot_primary_app:
-  address: 0x10200
-  orig_span: &id002
-  - app
-  region: flash_primary
-  size: 0xdfe00
-  span: *id002
-settings_storage:
-  address: 0xf0000
-  region: flash_primary
-  size: 0x10000
-mcuboot_primary_1:
-  address: 0x0
-  size: 0x40000
-  device: flash_ctrl
-  region: ram_flash
-mcuboot_secondary:
-  address: 0x00000
-  size: 0xe0000
-  device: MX25R64
-  region: external_flash
-mcuboot_secondary_1:
-  address: 0xe0000
-  size: 0x40000
-  device: MX25R64
-  region: external_flash
-external_flash:
-  address: 0x120000
-  size: 0x6e0000
-  device: MX25R64
-  region: external_flash
-pcd_sram:
-  address: 0x20000000
-  size: 0x2000
-  region: sram_primary
diff --git a/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp_ns.yml b/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp_ns.yml
deleted file mode 100644
index 70ffe6d9c12..00000000000
--- a/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp_ns.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-mcuboot:
-  address: 0x0
-  region: flash_primary
-  size: 0x10000
-mcuboot_pad:
-  address: 0x10000
-  region: flash_primary
-  size: 0x200
-tfm_secure:
-  address: 0x10000
-  size: 0xc000
-  span: [mcuboot_pad, tfm]
-tfm_nonsecure:
-  address: 0x1c000
-  size: 0xd4000
-  span: [app]
-tfm:
-  address: 0x10200
-  region: flash_primary
-  size: 0xbe00
-app:
-  address: 0x1c000
-  region: flash_primary
-  size: 0xd4000
-mcuboot_primary:
-  address: 0x10000
-  orig_span: &id001
-  - mcuboot_pad
-  - tfm
-  - app
-  region: flash_primary
-  size: 0xe0000
-  span: *id001
-mcuboot_primary_app:
-  address: 0x10200
-  orig_span: &id002
-  - tfm
-  - app
-  region: flash_primary
-  size: 0xdfe00
-  span: *id002
-nonsecure_storage:
-  address: 0xf0000
-  size: 0x10000
-  span: [settings_storage]
-settings_storage:
-  address: 0xf0000
-  region: flash_primary
-  size: 0x10000
-mcuboot_primary_1:
-  address: 0x0
-  size: 0x40000
-  device: flash_ctrl
-  region: ram_flash
-mcuboot_secondary:
-  address: 0x00000
-  size: 0xe0000
-  device: MX25R64
-  region: external_flash
-mcuboot_secondary_1:
-  address: 0xe0000
-  size: 0x40000
-  device: MX25R64
-  region: external_flash
-external_flash:
-  address: 0x120000
-  size: 0x6e0000
-  device: MX25R64
-  region: external_flash
-pcd_sram:
-  address: 0x20000000
-  size: 0x2000
-  region: sram_primary

From e439d1810077b2a9018ec6011e5a81e2a7db9336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:54 +0100
Subject: [PATCH 1824/2913] Revert "[nrf noup] soc: arm: nRF91: Add SPU
 Flash/RAM alignment"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0107d28417da899552a1ffae3814a4a5be2feb6b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf53/Kconfig | 22 ++++++++--------------
 soc/nordic/nrf91/Kconfig | 20 --------------------
 2 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/soc/nordic/nrf53/Kconfig b/soc/nordic/nrf53/Kconfig
index 6527509a1f8..ab282f56523 100644
--- a/soc/nordic/nrf53/Kconfig
+++ b/soc/nordic/nrf53/Kconfig
@@ -156,15 +156,12 @@ config NRF_SPU_FLASH_REGION_SIZE
 	help
 	  FLASH region size for the NRF_SPU peripheral
 
-config  NRF_TRUSTZONE_FLASH_REGION_SIZE
+config NRF_SPU_FLASH_REGION_ALIGNMENT
 	hex
-	default NRF_SPU_FLASH_REGION_SIZE
+	default 0x4000
 	help
-	  Define the flash region size from a TrustZone perspective.
-	  This is used when we set the security attributes(S/NSC/NS) of a region
-	  in TrustZone enabled devices.
-	  In practice this option defines the granularity of the security attributes,
-	  i.e. the smallest region that can be set to secure or non-secure.
+	  FLASH regions must be aligned to this value due to SPU HW
+	  limitations.
 
 config NRF_SPU_RAM_REGION_SIZE
 	hex
@@ -172,15 +169,12 @@ config NRF_SPU_RAM_REGION_SIZE
 	help
 	  RAM region size for the NRF_SPU peripheral
 
-config  NRF_TRUSTZONE_RAM_REGION_SIZE
+config NRF_SPU_RAM_REGION_ALIGNMENT
 	hex
-	default NRF_SPU_RAM_REGION_SIZE
+	default 0x2000
 	help
-	  Define the RAM region size from a TrustZone perspective.
-	  This is used when we set the security attributes(S/NSC/NS) of a region
-	  in TrustZone enabled devices.
-	  In practice this option defines the granularity of the security attributes,
-	  i.e. the smallest region that can be set to secure or non-secure.
+	  RAM regions must be aligned to this value due to SPU HW
+	  limitations.
 
 config SOC_NRF_GPIO_FORWARDER_FOR_NRF5340
 	bool "Forward GPIO pins to network core"
diff --git a/soc/nordic/nrf91/Kconfig b/soc/nordic/nrf91/Kconfig
index 9f55cdd77ed..ed38eff73a2 100644
--- a/soc/nordic/nrf91/Kconfig
+++ b/soc/nordic/nrf91/Kconfig
@@ -24,16 +24,6 @@ config NRF_SPU_FLASH_REGION_SIZE
 	help
 	  FLASH region size for the NRF_SPU peripheral
 
-config  NRF_TRUSTZONE_FLASH_REGION_SIZE
-	hex
-	default NRF_SPU_FLASH_REGION_SIZE
-	help
-	  Define the flash region size from a TrustZone perspective.
-	  This is used when we set the security attributes(S/NSC/NS) of a region
-	  in TrustZone enabled devices.
-	  In practice this option defines the granularity of the security attributes,
-	  i.e. the smallest region that can be set to secure or non-secure.
-
 config NRF_SPU_RAM_REGION_SIZE
 	hex
 	default 0x2000
@@ -44,14 +34,4 @@ config NRF_ENABLE_ICACHE
 	bool "Instruction cache (I-Cache)"
 	default y
 
-config  NRF_TRUSTZONE_RAM_REGION_SIZE
-	hex
-	default NRF_SPU_RAM_REGION_SIZE
-	help
-	  Define the RAM region size from a TrustZone perspective.
-	  This is used when we set the security attributes(S/NSC/NS) of a region
-	  in TrustZone enabled devices.
-	  In practice this option defines the granularity of the security attributes,
-	  i.e. the smallest region that can be set to secure or non-secure.
-
 endif # SOC_SERIES_NRF91X

From e65e5e6ba167756f396234903a93d0058a8f450f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:54 +0100
Subject: [PATCH 1825/2913] Revert "[nrf noup] soc: arm: nRF53: Add SPU
 Flash/RAM alignment"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8315b87957b9ca4805759ef0b2cef76eedc70318.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf53/Kconfig | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/soc/nordic/nrf53/Kconfig b/soc/nordic/nrf53/Kconfig
index ab282f56523..3a30a666d20 100644
--- a/soc/nordic/nrf53/Kconfig
+++ b/soc/nordic/nrf53/Kconfig
@@ -156,26 +156,12 @@ config NRF_SPU_FLASH_REGION_SIZE
 	help
 	  FLASH region size for the NRF_SPU peripheral
 
-config NRF_SPU_FLASH_REGION_ALIGNMENT
-	hex
-	default 0x4000
-	help
-	  FLASH regions must be aligned to this value due to SPU HW
-	  limitations.
-
 config NRF_SPU_RAM_REGION_SIZE
 	hex
 	default 0x2000
 	help
 	  RAM region size for the NRF_SPU peripheral
 
-config NRF_SPU_RAM_REGION_ALIGNMENT
-	hex
-	default 0x2000
-	help
-	  RAM regions must be aligned to this value due to SPU HW
-	  limitations.
-
 config SOC_NRF_GPIO_FORWARDER_FOR_NRF5340
 	bool "Forward GPIO pins to network core"
 	depends on NRF_SOC_SECURE_SUPPORTED

From 30f88196fb7cf52fef2f8adcbb896ef5022923b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:54 +0100
Subject: [PATCH 1826/2913] Revert "[nrf noup] net: mqtt: add native TLS
 support"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 640fd0cd087fd83efd2d83fd173930cb188e3a26.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/connectivity/networking/api/mqtt.rst        | 3 ---
 include/zephyr/net/mqtt.h                       | 3 ---
 subsys/net/lib/mqtt/mqtt_transport_socket_tls.c | 7 +------
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/doc/connectivity/networking/api/mqtt.rst b/doc/connectivity/networking/api/mqtt.rst
index 79da5abe57b..b232f125333 100644
--- a/doc/connectivity/networking/api/mqtt.rst
+++ b/doc/connectivity/networking/api/mqtt.rst
@@ -150,7 +150,6 @@ additional configuration information:
    tls_config->sec_tag_list = m_sec_tags;
    tls_config->sec_tag_count = ARRAY_SIZE(m_sec_tags);
    tls_config->hostname = MQTT_BROKER_HOSTNAME;
-   tls_config->set_native_tls = true;
 
 In this sample code, the ``m_sec_tags`` array holds a list of tags, referencing TLS
 credentials that the MQTT library should use for authentication. We do not specify
@@ -163,8 +162,6 @@ Note, that TLS credentials referenced by the ``m_sec_tags`` array must be
 registered in the system first. For more information on how to do that, refer
 to :ref:`secure sockets documentation <secure_sockets_interface>`.
 
-Finally, ``set_native_tls`` can be optionally set to enable native TLS support instead of offloading TLS operations to the modem.
-
 An example of how to use TLS with MQTT is also present in
 :zephyr:code-sample:`mqtt-publisher` sample application.
 
diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index 9c09069b107..5da175fe065 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -382,9 +382,6 @@ struct mqtt_sec_config {
 
 	/** Indicates the preference for copying certificates to the heap. */
 	int cert_nocopy;
-
-	/** Set socket to native TLS */
-	bool set_native_tls;
 };
 
 /** @brief MQTT transport type. */
diff --git a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
index c3816e5949f..445f45c95df 100644
--- a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
+++ b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
@@ -22,15 +22,10 @@ int mqtt_client_tls_connect(struct mqtt_client *client)
 {
 	const struct sockaddr *broker = client->broker;
 	struct mqtt_sec_config *tls_config = &client->transport.tls.config;
-	int type = SOCK_STREAM;
 	int ret;
 
-	if (tls_config->set_native_tls) {
-		type |= SOCK_NATIVE_TLS;
-	}
-
 	client->transport.tls.sock = zsock_socket(broker->sa_family,
-						  type, IPPROTO_TLS_1_2);
+						  SOCK_STREAM, IPPROTO_TLS_1_2);
 	if (client->transport.tls.sock < 0) {
 		return -errno;
 	}

From 878bf9c58415e3b774aa0f61759ab351a6856398 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:55 +0100
Subject: [PATCH 1827/2913] Revert "[nrf noup] net: mqtt: Provide option to
 enable TLS session caching"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 327226912eecb79b1cca2c96ef99dc904b08ed19.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/mqtt.h                       |  3 ---
 subsys/net/lib/mqtt/mqtt_transport_socket_tls.c | 10 ----------
 2 files changed, 13 deletions(-)

diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index 5da175fe065..2514fc709c2 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -372,9 +372,6 @@ struct mqtt_sec_config {
 	uint32_t alpn_protocol_name_count;
 #endif
 
-	/** Indicates the preference for enabling TLS session caching. */
-	int session_cache;
-
 	/** Peer hostname for ceritificate verification.
 	 *  May be NULL to skip hostname verification.
 	 */
diff --git a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
index 445f45c95df..a33cee5aecf 100644
--- a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
+++ b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
@@ -91,16 +91,6 @@ int mqtt_client_tls_connect(struct mqtt_client *client)
 		}
 	}
 
-	if (tls_config->session_cache == TLS_SESSION_CACHE_ENABLED) {
-		ret = zsock_setsockopt(client->transport.tls.sock, SOL_TLS,
-				       TLS_SESSION_CACHE,
-				       &tls_config->session_cache,
-				       sizeof(tls_config->session_cache));
-		if (ret < 0) {
-			goto error;
-		}
-	}
-
 	if (tls_config->cert_nocopy != TLS_CERT_NOCOPY_NONE) {
 		ret = zsock_setsockopt(client->transport.tls.sock, SOL_TLS,
 				       TLS_CERT_NOCOPY, &tls_config->cert_nocopy,

From f76baacc406bedf63b06b787bd426f8392b9ed23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:55 +0100
Subject: [PATCH 1828/2913] Revert "[nrf noup] test: schedule_api: Use Minimal
 C library"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1fb551a83cd9763170f35f74e7dfaa8a6984d4a7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/kernel/sched/schedule_api/prj.conf        | 1 -
 tests/kernel/sched/schedule_api/prj_dumb.conf   | 1 -
 tests/kernel/sched/schedule_api/prj_multiq.conf | 1 -
 3 files changed, 3 deletions(-)

diff --git a/tests/kernel/sched/schedule_api/prj.conf b/tests/kernel/sched/schedule_api/prj.conf
index 785e9a3987b..fe5125047e3 100644
--- a/tests/kernel/sched/schedule_api/prj.conf
+++ b/tests/kernel/sched/schedule_api/prj.conf
@@ -7,4 +7,3 @@ CONFIG_MAX_THREAD_BYTES=5
 CONFIG_TEST_USERSPACE=y
 CONFIG_MP_MAX_NUM_CPUS=1
 CONFIG_ZTEST_FATAL_HOOK=y
-CONFIG_MINIMAL_LIBC=y
diff --git a/tests/kernel/sched/schedule_api/prj_dumb.conf b/tests/kernel/sched/schedule_api/prj_dumb.conf
index a1d0cf6dced..c0ddfbd7c3f 100644
--- a/tests/kernel/sched/schedule_api/prj_dumb.conf
+++ b/tests/kernel/sched/schedule_api/prj_dumb.conf
@@ -5,4 +5,3 @@ CONFIG_SCHED_DUMB=y
 CONFIG_MAX_THREAD_BYTES=5
 CONFIG_MP_MAX_NUM_CPUS=1
 CONFIG_ZTEST_FATAL_HOOK=y
-CONFIG_MINIMAL_LIBC=y
diff --git a/tests/kernel/sched/schedule_api/prj_multiq.conf b/tests/kernel/sched/schedule_api/prj_multiq.conf
index cfe09fbce47..6b28a1f39b2 100644
--- a/tests/kernel/sched/schedule_api/prj_multiq.conf
+++ b/tests/kernel/sched/schedule_api/prj_multiq.conf
@@ -7,4 +7,3 @@ CONFIG_MP_MAX_NUM_CPUS=1
 CONFIG_ZTEST_FATAL_HOOK=y
 CONFIG_NUM_COOP_PRIORITIES=30
 CONFIG_NUM_PREEMPT_PRIORITIES=40
-CONFIG_MINIMAL_LIBC=y

From 7d10e6f914e7c7e481ff5c5bc3f9ada3a71c8037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:55 +0100
Subject: [PATCH 1829/2913] Revert "[nrf noup] ci: NCS-specific CI tweaks"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ef75b3e9cc4d05bef72ec6fcce1f3bec5add5d23.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .github/workflows/commit-tags.yml      | 28 --------------------------
 .github/workflows/compliance.yml       |  8 ++++----
 Jenkinsfile                            |  5 -----
 scripts/gitlint/zephyr_commit_rules.py |  4 ++--
 4 files changed, 6 insertions(+), 39 deletions(-)
 delete mode 100644 .github/workflows/commit-tags.yml
 delete mode 100644 Jenkinsfile

diff --git a/.github/workflows/commit-tags.yml b/.github/workflows/commit-tags.yml
deleted file mode 100644
index 828f0297167..00000000000
--- a/.github/workflows/commit-tags.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Commit tags
-
-on:
-  pull_request:
-    types: [synchronize, opened, reopened, edited, labeled, unlabeled,
-            milestoned, demilestoned, assigned, unassigned, ready_for_review,
-            review_requested]
-
-jobs:
-  commit_tags:
-    runs-on: ubuntu-22.04
-    name: Run commit tags checks on patch series (PR)
-    steps:
-    - name: Update PATH for west
-      run: |
-        echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-    - name: Checkout the code
-      uses: actions/checkout@v3
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-        fetch-depth: 0
-
-    - name: Run the commit tags
-      uses: nrfconnect/action-commit-tags@main
-      with:
-        target: .
-        upstream: zephyrproject-rtos/zephyr/main
diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml
index c8ffedcb77b..39815d8baa3 100644
--- a/.github/workflows/compliance.yml
+++ b/.github/workflows/compliance.yml
@@ -49,8 +49,8 @@ jobs:
         git config --global user.name "Your Name"
         git remote -v
         # Ensure there's no merge commits in the PR
-        #[[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
-        #(echo "::error ::Merge commits not allowed, rebase instead";false)
+        [[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
+        (echo "::error ::Merge commits not allowed, rebase instead";false)
         git rebase origin/${BASE_REF}
         # debug
         git log  --pretty=oneline | head -n 10
@@ -78,8 +78,8 @@ jobs:
         git log  --pretty=oneline | head -n 10
         # Increase rename limit to allow for large PRs
         git config diff.renameLimit 10000
-        ./scripts/ci/check_compliance.py --annotate -e KconfigBasic -e Kconfig \
-        -e KconfigBasicNoModules -e ModulesMaintainers -c origin/${BASE_REF}..
+        ./scripts/ci/check_compliance.py --annotate -e KconfigBasic \
+        -c origin/${BASE_REF}..
 
     - name: upload-results
       uses: actions/upload-artifact@v4
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 3b9cf002239..00000000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,5 +0,0 @@
-@Library("CI_LIB") _
-
-def pipeline = new ncs.sdk_zephyr.Main()
-
-pipeline.run(JOB_NAME)
diff --git a/scripts/gitlint/zephyr_commit_rules.py b/scripts/gitlint/zephyr_commit_rules.py
index ef317e22684..a2c9cd3cb7f 100644
--- a/scripts/gitlint/zephyr_commit_rules.py
+++ b/scripts/gitlint/zephyr_commit_rules.py
@@ -78,7 +78,7 @@ class TitleMaxLengthRevert(LineRule):
     name = "title-max-length-no-revert"
     id = "UC5"
     target = CommitMessageTitle
-    options_spec = [IntOption('line-length', 120, "Max line length")]
+    options_spec = [IntOption('line-length', 75, "Max line length")]
     violation_message = "Commit title exceeds max length ({0}>{1})"
 
     def validate(self, line, _commit):
@@ -103,7 +103,7 @@ class MaxLineLengthExceptions(LineRule):
     name = "max-line-length-with-exceptions"
     id = "UC4"
     target = CommitMessageBody
-    options_spec = [IntOption('line-length', 120, "Max line length")]
+    options_spec = [IntOption('line-length', 75, "Max line length")]
     violation_message = "Commit message body line exceeds max length ({0}>{1})"
 
     def validate(self, line, _commit):

From c28297724da59fa7697de3b63eb8a0229b75d6e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:55 +0100
Subject: [PATCH 1830/2913] Revert "[nrf noup] sample/**/smp_svr: nrf54l15pdk
 external memory dts overlay"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f8b30ba1b3d7b505e702ad8b5348346c672b2da0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
deleted file mode 100644
index 410388bfa6d..00000000000
--- a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/ {
-	chosen {
-		nordic,pm-ext-flash = &mx25r64;
-	};
-};
-
-&mx25r64 {
-	status = "okay";
-};

From 13ab1d8e1a2706b146e63494d8ff8f9c741e6a2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:55 +0100
Subject: [PATCH 1831/2913] Revert "[nrf noup] modules: mbedtls: Use help for
 DISABLE_MBEDTLS_BUILTIN info"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2bff40a5046fafdc45109cdd9942c461c709b9bd.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/mbedtls/Kconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/mbedtls/Kconfig b/modules/mbedtls/Kconfig
index 3761ff6a02f..546bcd66dd2 100644
--- a/modules/mbedtls/Kconfig
+++ b/modules/mbedtls/Kconfig
@@ -42,11 +42,10 @@ config MBEDTLS_LIBRARY
 
 endchoice
 
+# subsystems cannot deselect MBEDTLS_BUILTIN, but they can select
+# DISABLE_MBEDTLS_BUILTIN.
 config DISABLE_MBEDTLS_BUILTIN
 	bool
-	help
-	  Subsystems cannot deselect MBEDTLS_BUILTIN, but they can select
-	  DISABLE_MBEDTLS_BUILTIN.
 
 config CUSTOM_MBEDTLS_CFG_FILE
 	bool "Custom mbed TLS configuration file"

From e1c5685c4d33c7bfbf3d7269181319587d9df5ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:55 +0100
Subject: [PATCH 1832/2913] Revert "[nrf noup] dfu/boot/mcuboot: fix
 confirmation in case of USE_PARTITION_MANAGER"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a7b53d1f6fb34219d6be11f40188c86e1f3be317.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/dfu/boot/mcuboot.c | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/subsys/dfu/boot/mcuboot.c b/subsys/dfu/boot/mcuboot.c
index a6e05700ac7..20015349dbc 100644
--- a/subsys/dfu/boot/mcuboot.c
+++ b/subsys/dfu/boot/mcuboot.c
@@ -34,34 +34,8 @@
 #define BOOT_HEADER_MAGIC_V1 0x96f3b83d
 #define BOOT_HEADER_SIZE_V1 32
 
-#if USE_PARTITION_MANAGER
-#include <pm_config.h>
-
-#if CONFIG_BUILD_WITH_TFM
-	#define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE + PM_TFM_SIZE)
-#else
-	#define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE)
-#endif
-
-#ifdef CONFIG_MCUBOOT
-	/* lib is part of MCUboot -> operate on the primart application slot */
-	#define ACTIVE_SLOT_ID		PM_MCUBOOT_PRIMARY_ID
-#else
-	/* lib is part of the App -> operate on active slot */
-#if (PM_ADDRESS - PM_ADDRESS_OFFSET) == PM_MCUBOOT_PRIMARY_ADDRESS
-	#define ACTIVE_SLOT_ID		PM_MCUBOOT_PRIMARY_ID
-#elif (PM_ADDRESS - PM_ADDRESS_OFFSET) == PM_MCUBOOT_SECONDARY_ADDRESS
-	#define ACTIVE_SLOT_ID		PM_MCUBOOT_SECONDARY_ID
-#else
-	#error Missing partition definitions.
-#endif
-#endif /* CONFIG_MCUBOOT */
-
-#define ACTIVE_SLOT_FLASH_AREA_ID ACTIVE_SLOT_ID
-#else
 /* Get active partition. zephyr,code-partition chosen node must be defined */
 #define ACTIVE_SLOT_FLASH_AREA_ID DT_FIXED_PARTITION_ID(DT_CHOSEN(zephyr_code_partition))
-#endif /* USE_PARTITION_MANAGER */
 
 /*
  * Raw (on-flash) representation of the v1 image header.

From 0820d68913fc7b9bd1389585a118463120e2b1d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:55 +0100
Subject: [PATCH 1833/2913] Revert "[nrf noup] Bluetooth: Mesh: Fix adv
 randomness bug"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8709818e88c4bf34c80da3918f428c28b3bfd98f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/mesh/adv_ext.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index 0dcdab9adf8..330dcd86305 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -522,10 +522,8 @@ int bt_mesh_adv_enable(void)
 			return err;
 		}
 
-		if (IS_ENABLED(CONFIG_BT_LL_SOFTDEVICE) &&
-		    IS_ENABLED(CONFIG_BT_MESH_ADV_EXT_FRIEND_SEPARATE) &&
-		    advs[i].tags == BT_MESH_ADV_TAG_BIT_FRIEND) {
-			err = set_adv_randomness(advs[i].instance->handle, 0);
+		if (IS_ENABLED(CONFIG_BT_LL_SOFTDEVICE) && adv->tag & BT_MESH_FRIEND_ADV) {
+			err = set_adv_randomness(adv->instance->handle, 0);
 			if (err) {
 				LOG_ERR("Failed to set zero randomness: %d", err);
 			}

From 58580b36e640de91867976e7ba8ed475636c2bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:55 +0100
Subject: [PATCH 1834/2913] Revert "[nrf noup] Bluetooth: Mesh: zero
 randomization for friend's adv"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6d826614fb100e3b4ba01955000ed4ab68e67ce1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/mesh/Kconfig   |  2 +-
 subsys/bluetooth/mesh/adv_ext.c | 32 --------------------------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 7eced10bd07..384033f7908 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -1642,7 +1642,7 @@ config BT_MESH_LPN_INIT_POLL_TIMEOUT
 config BT_MESH_LPN_SCAN_LATENCY
 	int "Latency for enabling scanning"
 	range 0 50
-	default 2
+	default 15
 	help
 	  Latency in milliseconds that it takes to enable scanning. This
 	  is in practice how much time in advance before the Receive Window
diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index 330dcd86305..b206b81b743 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -13,9 +13,6 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/mesh.h>
-#if defined(CONFIG_BT_LL_SOFTDEVICE)
-#include <sdc_hci_vs.h>
-#endif
 
 #include "common/bt_str.h"
 
@@ -139,28 +136,6 @@ static inline struct bt_mesh_ext_adv *gatt_adv_get(void)
 	}
 }
 
-static int set_adv_randomness(uint8_t handle, int rand_us)
-{
-#if defined(CONFIG_BT_LL_SOFTDEVICE)
-	struct net_buf *buf;
-	sdc_hci_cmd_vs_set_adv_randomness_t *cmd_params;
-
-	buf = bt_hci_cmd_create(SDC_HCI_OPCODE_CMD_VS_SET_ADV_RANDOMNESS, sizeof(*cmd_params));
-	if (!buf) {
-		LOG_ERR("Could not allocate command buffer");
-		return -ENOMEM;
-	}
-
-	cmd_params = net_buf_add(buf, sizeof(*cmd_params));
-	cmd_params->adv_handle = handle;
-	cmd_params->rand_us = rand_us;
-
-	return bt_hci_cmd_send_sync(SDC_HCI_OPCODE_CMD_VS_SET_ADV_RANDOMNESS, buf, NULL);
-#else
-	return 0;
-#endif /* defined(CONFIG_BT_LL_SOFTDEVICE) */
-}
-
 static int adv_start(struct bt_mesh_ext_adv *ext_adv,
 		     const struct bt_le_adv_param *param,
 		     struct bt_le_ext_adv_start_param *start,
@@ -521,13 +496,6 @@ int bt_mesh_adv_enable(void)
 		if (err) {
 			return err;
 		}
-
-		if (IS_ENABLED(CONFIG_BT_LL_SOFTDEVICE) && adv->tag & BT_MESH_FRIEND_ADV) {
-			err = set_adv_randomness(adv->instance->handle, 0);
-			if (err) {
-				LOG_ERR("Failed to set zero randomness: %d", err);
-			}
-		}
 	}
 
 	return 0;

From e0dad477d0294f840aa850d98f9ace1bd11ff9b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:55 +0100
Subject: [PATCH 1835/2913] Revert "[nrf noup] modules: tfm: Add Kconfig for
 CRYPTO_PAKE_MODULE_ENABLED"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit eb58994e4696b18909c35406d47d0ff5a5baa781.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/trusted-firmware-m/Kconfig.tfm.crypto_modules | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules b/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
index 9604319ca01..02d3580c22f 100644
--- a/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
+++ b/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
@@ -88,17 +88,6 @@ config TFM_CRYPTO_KEY_DERIVATION_MODULE_ENABLED
 	  is not used.
 	  Note that key agreement is under key derivation in the current implementation.
 
-config TFM_CRYPTO_PAKE_MODULE_ENABLED
-	bool "PAKE crypto module"
-	default y
-	depends on PSA_HAS_PAKE_SUPPORT
-	depends on NRF_SECURITY
-	depends on PSA_CRYPTO_DRIVER_OBERON || PSA_CRYPTO_DRIVER_CRACEN
-	help
-	  Enables the PAKE crypto module within the crypto partition.
-	  Unset this option if the functionality provided by 'crypto_pake.c'
-	  is not used.
-
 endif # TFM_PARTITION_CRYPTO
 
 endif # BUILD_WITH_TFM

From 5d2718da18eb28de67fce8a581325ed3f09c02ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:55 +0100
Subject: [PATCH 1836/2913] Revert "[nrf noup] samples/tests: Disable PM for
 some sysbuild builds"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cd344abd45cc7647e691b1ced0214a4ba3dfb6f1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/boards/nordic/nrf53_sync_rtc/sysbuild.conf          | 1 -
 samples/drivers/mbox/sysbuild.conf                          | 1 -
 samples/subsys/ipc/ipc_service/icmsg/sysbuild.conf          | 1 -
 samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.conf | 1 -
 samples/subsys/ipc/ipc_service/static_vrings/sysbuild.conf  | 1 -
 samples/subsys/logging/multidomain/sysbuild.conf            | 1 -
 tests/boot/mcuboot_recovery_retention/sysbuild.conf         | 1 -
 tests/boot/test_mcuboot/sysbuild.conf                       | 1 -
 tests/drivers/flash/common/sysbuild.conf                    | 1 -
 tests/drivers/flash/negative_tests/sysbuild.conf            | 1 -
 tests/subsys/fs/fcb/sysbuild.conf                           | 1 -
 tests/subsys/fs/littlefs/sysbuild.conf                      | 1 -
 12 files changed, 12 deletions(-)
 delete mode 100644 samples/boards/nordic/nrf53_sync_rtc/sysbuild.conf
 delete mode 100644 samples/drivers/mbox/sysbuild.conf
 delete mode 100644 samples/subsys/ipc/ipc_service/icmsg/sysbuild.conf
 delete mode 100644 samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.conf
 delete mode 100644 samples/subsys/ipc/ipc_service/static_vrings/sysbuild.conf
 delete mode 100644 samples/subsys/logging/multidomain/sysbuild.conf
 delete mode 100644 tests/drivers/flash/common/sysbuild.conf
 delete mode 100644 tests/drivers/flash/negative_tests/sysbuild.conf
 delete mode 100644 tests/subsys/fs/fcb/sysbuild.conf
 delete mode 100644 tests/subsys/fs/littlefs/sysbuild.conf

diff --git a/samples/boards/nordic/nrf53_sync_rtc/sysbuild.conf b/samples/boards/nordic/nrf53_sync_rtc/sysbuild.conf
deleted file mode 100644
index 6408669a847..00000000000
--- a/samples/boards/nordic/nrf53_sync_rtc/sysbuild.conf
+++ /dev/null
@@ -1 +0,0 @@
-SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/drivers/mbox/sysbuild.conf b/samples/drivers/mbox/sysbuild.conf
deleted file mode 100644
index 6408669a847..00000000000
--- a/samples/drivers/mbox/sysbuild.conf
+++ /dev/null
@@ -1 +0,0 @@
-SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/subsys/ipc/ipc_service/icmsg/sysbuild.conf b/samples/subsys/ipc/ipc_service/icmsg/sysbuild.conf
deleted file mode 100644
index 6408669a847..00000000000
--- a/samples/subsys/ipc/ipc_service/icmsg/sysbuild.conf
+++ /dev/null
@@ -1 +0,0 @@
-SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.conf b/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.conf
deleted file mode 100644
index 6408669a847..00000000000
--- a/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.conf
+++ /dev/null
@@ -1 +0,0 @@
-SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.conf b/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.conf
deleted file mode 100644
index 6408669a847..00000000000
--- a/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.conf
+++ /dev/null
@@ -1 +0,0 @@
-SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/subsys/logging/multidomain/sysbuild.conf b/samples/subsys/logging/multidomain/sysbuild.conf
deleted file mode 100644
index 6408669a847..00000000000
--- a/samples/subsys/logging/multidomain/sysbuild.conf
+++ /dev/null
@@ -1 +0,0 @@
-SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/boot/mcuboot_recovery_retention/sysbuild.conf b/tests/boot/mcuboot_recovery_retention/sysbuild.conf
index 3b5b3c96380..47f00ff3cff 100644
--- a/tests/boot/mcuboot_recovery_retention/sysbuild.conf
+++ b/tests/boot/mcuboot_recovery_retention/sysbuild.conf
@@ -1,2 +1 @@
 SB_CONFIG_BOOTLOADER_MCUBOOT=y
-SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/boot/test_mcuboot/sysbuild.conf b/tests/boot/test_mcuboot/sysbuild.conf
index 3b5b3c96380..47f00ff3cff 100644
--- a/tests/boot/test_mcuboot/sysbuild.conf
+++ b/tests/boot/test_mcuboot/sysbuild.conf
@@ -1,2 +1 @@
 SB_CONFIG_BOOTLOADER_MCUBOOT=y
-SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/drivers/flash/common/sysbuild.conf b/tests/drivers/flash/common/sysbuild.conf
deleted file mode 100644
index 6408669a847..00000000000
--- a/tests/drivers/flash/common/sysbuild.conf
+++ /dev/null
@@ -1 +0,0 @@
-SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/drivers/flash/negative_tests/sysbuild.conf b/tests/drivers/flash/negative_tests/sysbuild.conf
deleted file mode 100644
index 6408669a847..00000000000
--- a/tests/drivers/flash/negative_tests/sysbuild.conf
+++ /dev/null
@@ -1 +0,0 @@
-SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/subsys/fs/fcb/sysbuild.conf b/tests/subsys/fs/fcb/sysbuild.conf
deleted file mode 100644
index 6408669a847..00000000000
--- a/tests/subsys/fs/fcb/sysbuild.conf
+++ /dev/null
@@ -1 +0,0 @@
-SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/subsys/fs/littlefs/sysbuild.conf b/tests/subsys/fs/littlefs/sysbuild.conf
deleted file mode 100644
index 6408669a847..00000000000
--- a/tests/subsys/fs/littlefs/sysbuild.conf
+++ /dev/null
@@ -1 +0,0 @@
-SB_CONFIG_PARTITION_MANAGER=n

From 3a1cf3c0d61357663fa76466e953ff07311034e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:55 +0100
Subject: [PATCH 1837/2913] Revert "[nrf noup] samples&tests: Restore a few
 CONFIG_NEWLIB_LIBC_NANO=n"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cb05ba516e75d6656be0368375c210374158430e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/lib/newlib/heap_listener/prj.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/lib/newlib/heap_listener/prj.conf b/tests/lib/newlib/heap_listener/prj.conf
index 7282777ff1c..e5a5dc6df4c 100644
--- a/tests/lib/newlib/heap_listener/prj.conf
+++ b/tests/lib/newlib/heap_listener/prj.conf
@@ -1,4 +1,3 @@
 CONFIG_ZTEST=y
 CONFIG_NEWLIB_LIBC=y
-CONFIG_NEWLIB_LIBC_NANO=n
 CONFIG_NEWLIB_LIBC_HEAP_LISTENER=y

From 3c3ac6f3cbea7e75da5452873238adff2f1349ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:56 +0100
Subject: [PATCH 1838/2913] Revert "[nrf noup] samples: mgmt: mcumgr smp_svr:
 Migrate child image config"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6199743d6366ea6a00201890322d1790945f034d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../subsys/mgmt/mcumgr/smp_svr/sysbuild/hci_rpmsg.conf | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 samples/subsys/mgmt/mcumgr/smp_svr/sysbuild/hci_rpmsg.conf

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild/hci_rpmsg.conf b/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild/hci_rpmsg.conf
deleted file mode 100644
index 98260877332..00000000000
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild/hci_rpmsg.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (c) 2022 Nordic Semiconductor
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_BT_MAX_CONN=2
-CONFIG_BT_BUF_ACL_RX_SIZE=502
-CONFIG_BT_BUF_ACL_TX_SIZE=502
-CONFIG_BT_CTLR_DATA_LENGTH_MAX=251

From 03d446a681449e89508cb90589572a6bc1958fc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:56 +0100
Subject: [PATCH 1839/2913] Revert "[nrf noup] samples: bluetooth:
 hci_pow_ctrl: Migrate child image config"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit beecaaabbbacce1b6f278a6a7e77e54a73ab9f02.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/bluetooth/hci_pwr_ctrl/sysbuild/hci_rpmsg.conf | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 samples/bluetooth/hci_pwr_ctrl/sysbuild/hci_rpmsg.conf

diff --git a/samples/bluetooth/hci_pwr_ctrl/sysbuild/hci_rpmsg.conf b/samples/bluetooth/hci_pwr_ctrl/sysbuild/hci_rpmsg.conf
deleted file mode 100644
index e6749ae6399..00000000000
--- a/samples/bluetooth/hci_pwr_ctrl/sysbuild/hci_rpmsg.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y

From 444810863fc869561ff2d832900b43d5297e47b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:56 +0100
Subject: [PATCH 1840/2913] Revert "[nrf noup] mgmt/MCUmgr/grp/img: Move out
 label to make compiler happy"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 44b6e2cd62a01054017716bbec17b4b332bfd59e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
index 6a4a0aeeea3..a580d7af6c3 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
@@ -285,14 +285,13 @@ int img_mgmt_get_next_boot_slot(int image, enum img_mgmt_next_boot_type *type)
 			return_slot = other_slot;
 		}
 	}
-out:
-
 #else
 	if (rcs == 0 && rca == 0 && img_mgmt_vercmp(&aver, &over) < 0) {
 		return_slot = other_slot;
 	}
 #endif /* defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT) */
 
+out:
 	if (type != NULL) {
 		*type = lt;
 	}

From 9c91977cd43de49eb43e5a0fdbb6e1937bb4c6c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:56 +0100
Subject: [PATCH 1841/2913] Revert "[nrf noup] mgmt/mcumgr: Bootutil hooks to
 handle image-1"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7b33eafddebfebbadeb213581466af5eee52ad3b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/mgmt/mcumgr/CMakeLists.txt             |  8 -----
 subsys/mgmt/mcumgr/Kconfig                    |  1 -
 .../mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c  | 35 -------------------
 3 files changed, 44 deletions(-)
 delete mode 100644 subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c

diff --git a/subsys/mgmt/mcumgr/CMakeLists.txt b/subsys/mgmt/mcumgr/CMakeLists.txt
index ad088eca067..39d4a4ca8ce 100644
--- a/subsys/mgmt/mcumgr/CMakeLists.txt
+++ b/subsys/mgmt/mcumgr/CMakeLists.txt
@@ -16,11 +16,3 @@ add_subdirectory(transport)
 add_subdirectory_ifdef(CONFIG_SMP_CLIENT    smp_client)
 
 zephyr_library_link_libraries(mgmt_mcumgr)
-
-if (CONFIG_BOOT_IMAGE_ACCESS_HOOKS)
-    zephyr_include_directories(
-        ${ZEPHYR_MCUBOOT_MODULE_DIR}/boot/bootutil/include
-        ${ZEPHYR_MCUBOOT_MODULE_DIR}/boot/zephyr/include
-    )
-    zephyr_library_sources(bootutil_hooks/nrf53_hooks.c)
-endif()
diff --git a/subsys/mgmt/mcumgr/Kconfig b/subsys/mgmt/mcumgr/Kconfig
index 1c6a3a2a516..49bd17f4669 100644
--- a/subsys/mgmt/mcumgr/Kconfig
+++ b/subsys/mgmt/mcumgr/Kconfig
@@ -6,7 +6,6 @@ menuconfig MCUMGR
 	bool "mcumgr Support"
 	depends on NET_BUF
 	depends on ZCBOR
-	imply BOOT_IMAGE_ACCESS_HOOKS if (SOC_NRF5340_CPUAPP_QKAA && MCUMGR_GRP_IMG)
 	help
 	  This option enables the mcumgr management library.
 
diff --git a/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c b/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c
deleted file mode 100644
index f1ac8a168e6..00000000000
--- a/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/device.h>
-#include "bootutil/bootutil_public.h"
-
-#if CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER != -1
-/* Sysbuild */
-#define NET_CORE_IMAGE CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER
-#else
-/* Legacy child/parent */
-#define NET_CORE_IMAGE 1
-#endif
-
-int boot_read_swap_state_primary_slot_hook(int image_index,
-		struct boot_swap_state *state)
-{
-	if (image_index == NET_CORE_IMAGE) {
-		/* Pretend that primary slot of image 1 unpopulated */
-		state->magic = BOOT_MAGIC_UNSET;
-		state->swap_type = BOOT_SWAP_TYPE_NONE;
-		state->image_num = image_index;
-		state->copy_done = BOOT_FLAG_UNSET;
-		state->image_ok = BOOT_FLAG_UNSET;
-
-		/* Prevent bootutil from trying to obtain true info */
-		return 0;
-	}
-
-	return BOOT_HOOK_REGULAR;
-}

From 9ed88e6c2ad92d28074b86f3cca849164cb7e284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:56 +0100
Subject: [PATCH 1842/2913] Revert "[nrf noup] mcumgr: img_mgmt: Fix check for
 chosen code partition"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 763a1886246f5caa4aac5fc5cc5bce6682a3115f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
index 28fca251ac8..467eb03bced 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
@@ -33,23 +33,6 @@
 #include <zephyr/mgmt/mcumgr/mgmt/callbacks.h>
 #endif
 
-#if USE_PARTITION_MANAGER
-#include <flash_map_pm.h>
-
-#ifdef PM_MCUBOOT_SECONDARY_PAD_SIZE
-BUILD_ASSERT(PM_MCUBOOT_PAD_SIZE == PM_MCUBOOT_SECONDARY_PAD_SIZE);
-#endif
-
-#if CONFIG_BUILD_WITH_TFM
-  #define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE + PM_TFM_SIZE)
-#else
-  #define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE)
-#endif
-
-#define FIXED_PARTITION_IS_RUNNING_APP_PARTITION(label)	\
-	(FIXED_PARTITION_OFFSET(label) == (PM_ADDRESS - PM_ADDRESS_OFFSET))
-
-#else /* ! USE_PARTITION_MANAGER */
 #ifndef CONFIG_FLASH_LOAD_OFFSET
 #error MCUmgr requires application to be built with CONFIG_FLASH_LOAD_OFFSET set \
 	to be able to figure out application running slot.
@@ -57,7 +40,6 @@ BUILD_ASSERT(PM_MCUBOOT_PAD_SIZE == PM_MCUBOOT_SECONDARY_PAD_SIZE);
 
 #define FIXED_PARTITION_IS_RUNNING_APP_PARTITION(label)	\
 	 (FIXED_PARTITION_OFFSET(label) == CONFIG_FLASH_LOAD_OFFSET)
-#endif /* USE_PARTITION_MANAGER */
 
 BUILD_ASSERT(sizeof(struct image_header) == IMAGE_HEADER_SIZE,
 	     "struct image_header not required size");

From c9f4af284443c0b1a25043b5c3b4952ea0740454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:56 +0100
Subject: [PATCH 1843/2913] Revert "[nrf noup] drivers/flashdisk: Add support
 for Partition Manager"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1601992b029b1a917feb8990102cb7504db274af.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/disk/flashdisk.c | 78 ----------------------------------------
 1 file changed, 78 deletions(-)

diff --git a/drivers/disk/flashdisk.c b/drivers/disk/flashdisk.c
index 4d8e3f1eee0..1ac3d15ba62 100644
--- a/drivers/disk/flashdisk.c
+++ b/drivers/disk/flashdisk.c
@@ -469,8 +469,6 @@ static const struct disk_operations flash_disk_ops = {
 	.ioctl = disk_flash_access_ioctl,
 };
 
-#ifndef USE_PARTITION_MANAGER
-/* The non-Partition manager, DTS based generators below */
 #define DT_DRV_COMPAT zephyr_flash_disk
 
 #define PARTITION_PHANDLE(n) DT_PHANDLE_BY_IDX(DT_DRV_INST(n), partition, 0)
@@ -512,82 +510,6 @@ DT_INST_FOREACH_STATUS_OKAY(VERIFY_CACHE_SIZE_IS_NOT_ZERO_IF_NOT_READ_ONLY)
 		"Devicetree node " DT_NODE_PATH(DT_DRV_INST(n))				\
 		" has cache size which is not a multiple of its sector size");
 DT_INST_FOREACH_STATUS_OKAY(VERIFY_CACHE_SIZE_IS_MULTIPLY_OF_SECTOR_SIZE)
-#else /* ifndef USE_PARTITION_MANAGER */
-/* Partition Manager based generators below */
-
-/* Gets the PM_..._EXTRA_PARAM_##param value */
-#define PM_FLASH_DISK_ENTRY_EXTRA_PARAM(name, param) PM_##name##_EXTRA_PARAM_disk_##param
-
-/* Gets the PM_..._NAME value which is originally cased, as in yaml, partition name */
-#define PM_FLASH_DISK_ENTRY_PARTITION_NAME(name) PM_##name##_NAME
-
-/* Generates flashdiskN_cache variable name, where N is partition ID */
-#define PM_FLASH_DISK_CACHE_VARIABLE(n) UTIL_CAT(flashdisk, UTIL_CAT(FIXED_PARTITION_ID(n), _cache))
-
-/* Generate cache buffers */
-#define CACHE_SIZE(n) (COND_CODE_1(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, read_only), (0), (1)) * \
-		       PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, cache_size))
-#define DEFINE_FLASHDISKS_CACHE(n) \
-	static uint8_t __aligned(4) PM_FLASH_DISK_CACHE_VARIABLE(n)[CACHE_SIZE(n)];
-
-PM_FOREACH_AFFILIATED_TO_disk(DEFINE_FLASHDISKS_CACHE)
-
-/* Generated single Flash Disk device data from Partition Manager partition.
- * Partition is required to have type set to disk in partition definitions:
- *  type: disk
- * and following extra params can be provided:
- *  extra_params: {
- *	name = "<name>",
- *	cache_size = <size>,
- *	sector_size = <ssize>,
- *	read_only = <ro>
- *  }
- * where:
- *  <name> is mandatory device name that will be used by Disk Access and FAT FS to mount device;
- *  <cache_size> is cache r/w cache size, which is mandatory if read_only = 0 or not present,
- *  and should be multiple of <ssize>;
- *  <ssize> is mandatory device sector size information, usually should be erase page size,
- *  for flash devices, for example 4096 bytes;
- *  read_only is optional, if not present then assumed false; <ro> can be 0(false) or 1(true).
- */
-#define DEFINE_FLASHDISKS_DEVICE(n)						\
-{										\
-	.info = {								\
-		.ops = &flash_disk_ops,						\
-		.name = STRINGIFY(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, name)),		\
-	},									\
-	.area_id = FIXED_PARTITION_ID(n),					\
-	.offset = FIXED_PARTITION_OFFSET(n),					\
-	.cache = PM_FLASH_DISK_CACHE_VARIABLE(n),				\
-	.cache_size = sizeof(PM_FLASH_DISK_CACHE_VARIABLE(n)),			\
-	.size = FIXED_PARTITION_SIZE(n),					\
-	.sector_size = PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, sector_size),		\
-},
-
-/* The bellow used PM_FOREACH_TYPE_disk is generated by Partition Manager foreach
- * loop macro. The lower case _disk is type name for which the macro has been generated;
- * partition entry can have multiple types set and foreach macro will be generated
- * for every type found across partition definitions.
- */
-static struct flashdisk_data flash_disks[] = {
-	PM_FOREACH_AFFILIATED_TO_disk(DEFINE_FLASHDISKS_DEVICE)
-};
-
-#define VERIFY_CACHE_SIZE_IS_NOT_ZERO_IF_NOT_READ_ONLY(n)				\
-	COND_CODE_1(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, read_only),			\
-		(/* cache-size is not used for read-only disks */),			\
-		(BUILD_ASSERT(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, cache_size) != 0,	\
-		"Flash disk partition " STRINGIFY(PM_FLASH_DISK_ENTRY_PARTITION_NAME(n))\
-		" must have non-zero cache-size");))
-PM_FOREACH_AFFILIATED_TO_disk(VERIFY_CACHE_SIZE_IS_NOT_ZERO_IF_NOT_READ_ONLY)
-
-#define VERIFY_CACHE_SIZE_IS_MULTIPLY_OF_SECTOR_SIZE(n)					\
-	BUILD_ASSERT(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, cache_size) %			\
-		     PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, sector_size) == 0,		\
-		"Devicetree node " STRINGIFY(PM_FLASH_DISK_ENTRY_PARTITION_NAME(n))	\
-		" has cache size which is not a multiple of its sector size");
-PM_FOREACH_AFFILIATED_TO_disk(VERIFY_CACHE_SIZE_IS_MULTIPLY_OF_SECTOR_SIZE)
-#endif /* USE_PARTITION_MANAGER */
 
 static int disk_flash_init(void)
 {

From 6b61dc0b888f383ce8cf24e1607f80bb6063b6c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:56 +0100
Subject: [PATCH 1844/2913] Revert "[nrf noup] Bluetooth: update experimental
 for qualification"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e92e87d7790ce93101dc6038b4831e660757501e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/controller/Kconfig | 4 +---
 subsys/bluetooth/host/Kconfig.l2cap | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
index a62b8c404a3..25f480788e1 100644
--- a/subsys/bluetooth/controller/Kconfig
+++ b/subsys/bluetooth/controller/Kconfig
@@ -137,9 +137,7 @@ choice BT_LL_CHOICE
 	  and set as the default Bluetooth Controller.
 
 config BT_LL_SW_SPLIT
-	bool "Software-based BLE Link Layer [EXPERIMENTAL]"
-	select EXPERIMENTAL
-	select ENTROPY_GENERATOR
+	bool "Software-based BLE Link Layer"
 	help
 	  Use Zephyr software BLE Link Layer ULL LLL split implementation.
 
diff --git a/subsys/bluetooth/host/Kconfig.l2cap b/subsys/bluetooth/host/Kconfig.l2cap
index ed1428aade7..6499fbb19a8 100644
--- a/subsys/bluetooth/host/Kconfig.l2cap
+++ b/subsys/bluetooth/host/Kconfig.l2cap
@@ -52,7 +52,7 @@ config BT_L2CAP_DYNAMIC_CHANNEL
 	  allowing the creation of dynamic L2CAP Channels.
 
 config BT_L2CAP_ECRED
-	bool "L2CAP Enhanced Credit Based Flow Control support [EXPERIMENTAL]"
+	bool "L2CAP Enhanced Credit Based Flow Control support"
 	depends on BT_L2CAP_DYNAMIC_CHANNEL
 	help
 	  This option enables support for LE Connection oriented Channels with

From c68081fe4aaefd90573eef1c41bb84c33abbf476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:56 +0100
Subject: [PATCH 1845/2913] Revert "[nrf noup] modules: mbedtls: Add include
 folders"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 801154a9986d2a4c48d51f881973c8ba72ae5b40.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/mbedtls/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/mbedtls/CMakeLists.txt b/modules/mbedtls/CMakeLists.txt
index 1bde8df4dee..aab4ad5316c 100644
--- a/modules/mbedtls/CMakeLists.txt
+++ b/modules/mbedtls/CMakeLists.txt
@@ -39,8 +39,6 @@ zephyr_interface_library_named(mbedTLS)
     # Add regular includes
     target_include_directories(mbedTLS INTERFACE
         ${ZEPHYR_CURRENT_MODULE_DIR}/include
-        ${ZEPHYR_CURRENT_MODULE_DIR}/include/library
-        ${ZEPHYR_CURRENT_MODULE_DIR}/library
         configs
         include
     )

From 42ab54649d7688353e0d98206d863da349c2a956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:56 +0100
Subject: [PATCH 1846/2913] Revert "[nrf noup] modules: mbedtls: Allow
 MBEDTLS_BUILTIN to be deselected"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5a62fe9cc2ade67040d97c207ed444a58c22397f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/mbedtls/Kconfig | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/modules/mbedtls/Kconfig b/modules/mbedtls/Kconfig
index 546bcd66dd2..d15c420f507 100644
--- a/modules/mbedtls/Kconfig
+++ b/modules/mbedtls/Kconfig
@@ -28,7 +28,6 @@ choice MBEDTLS_IMPLEMENTATION
 
 config MBEDTLS_BUILTIN
 	bool "Use Zephyr in-tree mbedTLS version"
-	depends on ! DISABLE_MBEDTLS_BUILTIN
 	help
 	  Link with mbedTLS sources included with Zephyr distribution.
 	  Included mbedTLS version is well integrated with and supported
@@ -42,11 +41,6 @@ config MBEDTLS_LIBRARY
 
 endchoice
 
-# subsystems cannot deselect MBEDTLS_BUILTIN, but they can select
-# DISABLE_MBEDTLS_BUILTIN.
-config DISABLE_MBEDTLS_BUILTIN
-	bool
-
 config CUSTOM_MBEDTLS_CFG_FILE
 	bool "Custom mbed TLS configuration file"
 	help

From 84d2c70ab19b7e2f285c581631a84d654e38fb6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:56 +0100
Subject: [PATCH 1847/2913] Revert "[nrf noup] modules: tf-m: use of
 PSA_HAS_XXXX_SUPPORT"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 676d548b558daea46043f239dcf414c4cffacde0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/trusted-firmware-m/Kconfig.tfm.crypto_modules | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules b/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
index 02d3580c22f..1d70a2c44d2 100644
--- a/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
+++ b/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
@@ -10,7 +10,6 @@ if TFM_PARTITION_CRYPTO
 config TFM_CRYPTO_RNG_MODULE_ENABLED
 	bool "Random number generator crypto module"
 	default y
-	depends on PSA_WANT_GENERATE_RANDOM && NRF_SECURITY
 	help
 	  Enables the random number generator  module within the crypto partition.
 	  Unset this option if 'psa_generate_random' is not used.
@@ -18,7 +17,6 @@ config TFM_CRYPTO_RNG_MODULE_ENABLED
 config TFM_CRYPTO_KEY_MODULE_ENABLED
 	bool "KEY crypto module"
 	default y
-	depends on PSA_HAS_KEY_SUPPORT && NRF_SECURITY
 	help
 	  Enables the KEY crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_key_management.c'
@@ -27,7 +25,6 @@ config TFM_CRYPTO_KEY_MODULE_ENABLED
 config TFM_CRYPTO_AEAD_MODULE_ENABLED
 	bool "AEAD crypto module"
 	default y
-	depends on PSA_HAS_AEAD_SUPPORT && NRF_SECURITY
 	help
 	  Enables the AEAD crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_aead.c'
@@ -36,7 +33,6 @@ config TFM_CRYPTO_AEAD_MODULE_ENABLED
 config TFM_CRYPTO_MAC_MODULE_ENABLED
 	bool "MAC crypto module"
 	default y
-	depends on PSA_HAS_MAC_SUPPORT && NRF_SECURITY
 	help
 	  Enables the MAC crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_mac.c'
@@ -45,7 +41,6 @@ config TFM_CRYPTO_MAC_MODULE_ENABLED
 config TFM_CRYPTO_HASH_MODULE_ENABLED
 	bool "HASH crypto module"
 	default y
-	depends on PSA_HAS_HASH_SUPPORT && NRF_SECURITY
 	help
 	  Enables the HASH crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_hash.c'
@@ -54,7 +49,6 @@ config TFM_CRYPTO_HASH_MODULE_ENABLED
 config TFM_CRYPTO_CIPHER_MODULE_ENABLED
 	bool "CIPHER crypto module"
 	default y
-	depends on PSA_HAS_CIPHER_SUPPORT && NRF_SECURITY
 	help
 	  Enables the CIPHER crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_cipher.c'
@@ -63,7 +57,6 @@ config TFM_CRYPTO_CIPHER_MODULE_ENABLED
 config TFM_CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED
 	bool "ASYM ENCRYPT crypto module"
 	default y
-	depends on PSA_HAS_ASYM_ENCRYPT_SUPPORT && NRF_SECURITY
 	help
 	  Enables the ASYM ENCRYPT crypto module within the crypto partition.
 	  Unset this option if the encrypt functionality provided by 'crypto_asymmetric.c'
@@ -72,7 +65,6 @@ config TFM_CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED
 config TFM_CRYPTO_ASYM_SIGN_MODULE_ENABLED
 	bool "ASYM SIGN crypto module"
 	default y
-	depends on PSA_HAS_ASYM_SIGN_SUPPORT && NRF_SECURITY
 	help
 	  Enables the ASYM SIGN crypto module within the crypto partition.
 	  Unset this option if the sign functionality provided by 'crypto_asymmetric.c'
@@ -81,12 +73,10 @@ config TFM_CRYPTO_ASYM_SIGN_MODULE_ENABLED
 config TFM_CRYPTO_KEY_DERIVATION_MODULE_ENABLED
 	bool "KEY DERIVATION crypto module"
 	default y
-	depends on (PSA_HAS_KEY_DERIVATION || PSA_HAS_KEY_AGREEMENT) && NRF_SECURITY
 	help
 	  Enables the KEY_DERIVATION crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_key_derivation.c'
 	  is not used.
-	  Note that key agreement is under key derivation in the current implementation.
 
 endif # TFM_PARTITION_CRYPTO
 

From bc95e1d3162a179c0a23727b262ffe247c896476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:56 +0100
Subject: [PATCH 1848/2913] Revert "[nrf noup] doc: remove Kconfig search"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3fe805d25ad4858aa4cea4d326ef1652f52c23d3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 MAINTAINERS.yml                   | 1 +
 doc/build/kconfig/setting.rst     | 6 ++++--
 doc/develop/application/index.rst | 5 +++--
 doc/kconfig.rst                   | 8 ++++++++
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 doc/kconfig.rst

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index cc7cb9a1411..b4bf261ec29 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -975,6 +975,7 @@ Documentation:
     - doc/images/Zephyr-Kite-in-tree.png
     - doc/index-tex.rst
     - doc/index.rst
+    - doc/kconfig.rst
     - doc/templates/sample.tmpl
     - doc/templates/board.tmpl
     - boards/index.rst
diff --git a/doc/build/kconfig/setting.rst b/doc/build/kconfig/setting.rst
index 85ae9f4c745..05308589d53 100644
--- a/doc/build/kconfig/setting.rst
+++ b/doc/build/kconfig/setting.rst
@@ -7,7 +7,8 @@ The :ref:`menuconfig and guiconfig interfaces <menuconfig>` can be used to test
 out configurations during application development. This page explains how to
 make settings permanent.
 
-All Kconfig options can be searched in the Kconfig search page.
+All Kconfig options can be searched in the :ref:`Kconfig search page
+<kconfig-search>`.
 
 .. note::
 
@@ -114,7 +115,8 @@ Assignments in configuration files are only respected if the dependencies for
 the symbol are satisfied. A warning is printed otherwise. To figure out what
 the dependencies of a symbol are, use one of the :ref:`interactive
 configuration interfaces <menuconfig>` (you can jump directly to a symbol with
-:kbd:`/`), or look up the symbol in the Kconfig search page.
+:kbd:`/`), or look up the symbol in the :ref:`Kconfig search page
+<kconfig-search>`.
 
 
 .. _initial-conf:
diff --git a/doc/develop/application/index.rst b/doc/develop/application/index.rst
index bcad2900b88..64d99dc0bcc 100644
--- a/doc/develop/application/index.rst
+++ b/doc/develop/application/index.rst
@@ -648,8 +648,9 @@ started.
 
 See :ref:`setting_configuration_values` for detailed documentation on setting
 Kconfig configuration values. The :ref:`initial-conf` section on the same page
-explains how the initial configuration is derived. See :ref:`hardening` for
-security information related with Kconfig options.
+explains how the initial configuration is derived. See :ref:`kconfig-search`
+for a complete list of configuration options.
+See :ref:`hardening` for security information related with Kconfig options.
 
 The other pages in the :ref:`Kconfig section of the manual <kconfig>` are also
 worth going through, especially if you planning to add new configuration
diff --git a/doc/kconfig.rst b/doc/kconfig.rst
new file mode 100644
index 00000000000..1123de2adbd
--- /dev/null
+++ b/doc/kconfig.rst
@@ -0,0 +1,8 @@
+:orphan:
+
+.. _kconfig-search:
+
+Kconfig Search
+==============
+
+.. kconfig:search::

From f30a40ea7396e33c73a8d8fc83cf3fed03890673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:56 +0100
Subject: [PATCH 1849/2913] Revert "[nrf noup] Revert "twister: Use natural
 sort when generating hardware map""
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 374374bd72782f93412ea12d1713d543d4080ffb.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/pylib/twister/twisterlib/hardwaremap.py | 3 ++-
 scripts/requirements-run-test.txt               | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/pylib/twister/twisterlib/hardwaremap.py b/scripts/pylib/twister/twisterlib/hardwaremap.py
index 6ca6dbcdb7d..61653800280 100644
--- a/scripts/pylib/twister/twisterlib/hardwaremap.py
+++ b/scripts/pylib/twister/twisterlib/hardwaremap.py
@@ -13,6 +13,7 @@
 import scl
 import logging
 from pathlib import Path
+from natsort import natsorted
 
 from twisterlib.environment import ZEPHYR_BASE
 
@@ -357,7 +358,7 @@ def readlink(link):
 
     def save(self, hwm_file):
         # use existing map
-        self.detected.sort(key=lambda x: x.serial or '')
+        self.detected = natsorted(self.detected, key=lambda x: x.serial or '')
         if os.path.exists(hwm_file):
             with open(hwm_file, 'r') as yaml_file:
                 hwm = yaml.load(yaml_file, Loader=SafeLoader)
diff --git a/scripts/requirements-run-test.txt b/scripts/requirements-run-test.txt
index 551ec9d6990..8b1d01afb09 100644
--- a/scripts/requirements-run-test.txt
+++ b/scripts/requirements-run-test.txt
@@ -7,6 +7,7 @@ pyocd>=0.35.0
 
 # used by twister for board/hardware map
 tabulate
+natsort
 
 # used by mcuboot
 cbor>=1.0.0

From 591c4c1a1a06ab27e50ddde3f9ec6025690414ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:56 +0100
Subject: [PATCH 1850/2913] Revert "[nrf noup] tests: drivers: build_all:
 regulator: use old schema"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d1ded336a6e34041e9de4fa4f52cc3669c9aa17f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/drivers/build_all/regulator/testcase.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/drivers/build_all/regulator/testcase.yaml b/tests/drivers/build_all/regulator/testcase.yaml
index 8214a2ca33a..58fc0851981 100644
--- a/tests/drivers/build_all/regulator/testcase.yaml
+++ b/tests/drivers/build_all/regulator/testcase.yaml
@@ -3,7 +3,9 @@
 
 tests:
   drivers.regulator.build:
-    tags: drivers regulator
+    tags:
+      - drivers
+      - regulator
     build_only: true
     platform_allow:
       - native_posix

From 80775f074a494f546d54bb2132e83f43e97968ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:57 +0100
Subject: [PATCH 1851/2913] Revert "[nrf noup] ci: add .github/test-spec.yml"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 98762a9ff01147afb8fa5fcbd7d5772b58311900.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .github/test-spec.yml | 406 ------------------------------------------
 CODEOWNERS            |   1 -
 2 files changed, 407 deletions(-)
 delete mode 100644 .github/test-spec.yml

diff --git a/.github/test-spec.yml b/.github/test-spec.yml
deleted file mode 100644
index 63a29824c11..00000000000
--- a/.github/test-spec.yml
+++ /dev/null
@@ -1,406 +0,0 @@
-# This is the Jenkins ci variant of the .github/labler.yaml
-
-"CI-run-zephyr-twister":
-  - any:
-      - "!.github/**/*"
-      - "!doc/**/*"
-      - "!CODEOWNERS"
-      - "!LICENSE"
-      - "!**/*.rst"
-      - "!VERSION"
-      - "!submanifests/**/*"
-      - "!MAINTAINERS.yml"
-      - "!version.h.in"
-      - "!Jenkinsfile"
-      - "!**/*.md"
-
-"CI-iot-zephyr-lwm2m-test":
-  - "drivers/console/**/*"
-  - "drivers/flash/**/*"
-  - "subsys/dfu/boot/**/*"
-  - "subsys/net/ip/**/*"
-  - "subsys/net/lib/http/**/*"
-  - "subsys/net/lib/lwm2m//**/*"
-  - "subsys/net/**/*"
-
-"CI-iot-samples-test":
-  - "boards/nordic/nrf9160dk/**/*"
-  - "dts/arm/nordic/nrf9160*"
-  - "include/net/**/*"
-  - "subsys/net/lib/**/*"
-
-"CI-iot-libraries-test":
-  - "boards/nordic/nrf9160dk/**/*"
-  - "dts/arm/nordic/nrf9160*"
-  - "include/net/socket_ncs.h"
-  - "subsys/testsuite/ztest/**/*"
-
-"CI-lwm2m-test": null
-# Not necessary to run tests on changes to this repo.
-
-"CI-boot-test":
-  - "subsys/mgmt/mcumgr/**/*"
-  - "subsys/dfu/**/*"
-  - "include/mgmt/mcumgr/**/*"
-  - "include/dfu/**/*"
-  - "samples/subsys/mgmt/mcumgr/smp_svr/**/*"
-  - "tests/boot/**/*"
-  - "tests/subsys/dfu/**/*"
-  - "tests/subsys/mgmt/mcumgr/**/*"
-
-"CI-tfm-test":
-  - "boards/nordic/nrf5340dk/**/*"
-  - "boards/nordic/nrf9160dk/**/*"
-  - "drivers/entropy/*"
-  - "dts/arm/nordic/nrf5340*"
-  - "dts/arm/nordic/nrf9160*"
-  - "modules/trusted-firmware-m/**/*"
-  - "samples/tfm_integration/**/*"
-
-"CI-ble-test":
-  - any:
-      - "drivers/bluetooth/**/*"
-  - any:
-      - "dts/arm/nordic/nrf5*"
-  - any:
-      - "subsys/bluetooth/**/*"
-      - "!subsys/bluetooth/mesh/**/*"
-      - "!subsys/bluetooth/audio/**/*"
-  - any:
-      - "include/zephyr/bluetooth/**/*"
-      - "!include/zephyr/bluetooth/mesh/**/*"
-  - "samples/bluetooth/hci_ipc/**/*"
-
-"CI-ble-samples-test":
-  - any:
-      - "drivers/bluetooth/**/*"
-  - any:
-      - "dts/arm/nordic/nrf5*"
-  - any:
-      - "subsys/bluetooth/**/*"
-      - "!subsys/bluetooth/mesh/**/*"
-      - "!subsys/bluetooth/audio/**/*"
-  - any:
-      - "include/zephyr/bluetooth/**/*"
-      - "!include/zephyr/bluetooth/mesh/**/*"
-  - "samples/bluetooth/**/*"
-
-"CI-mesh-test":
-  - "subsys/bluetooth/mesh/**/*"
-  - "include/zephyr/bluetooth/mesh/**/*"
-  - "samples/bluetooth/mesh/**/*"
-  - "samples/bluetooth/mesh_demo/**/*"
-  - "samples/bluetooth/mesh_provisioner/**/*"
-  - "tests/bluetooth/mesh/**/*"
-  - "tests/bluetooth/mesh_shell/**/*"
-
-"CI-zigbee-test":
-  - "subsys/mgmt/mcumgr/**/*"
-  - "subsys/dfu/**/*"
-  - "include/mgmt/mcumgr/**/*"
-  - "include/dfu/**/*"
-
-"CI-thingy91-test":
-  - "boards/nordic/nrf9160dk/**/*"
-  - "arch/x86/core/**/*"
-  - "arch/x86/include/**/*"
-  - "drivers/console/**/*"
-  - "drivers/ethernet/**/*"
-  - "drivers/flash/**/*"
-  - "drivers/hwinfo/**/*"
-  - "drivers/interrupt_controller/**/*"
-  - "drivers/net/**/*"
-  - "drivers/serial/**/*"
-  - "drivers/timer/**/*"
-  - "include/**/*"
-  - "kernel/**/*"
-  - "lib/libc/common/source/stdlib/**/*"
-  - "lib/libc/newlib/**/*"
-  - "lib/libc/picolibc/**/*"
-  - "lib/os/**/*"
-  - "lib/posix/**/*"
-  - "misc/**/*"
-  - "modules/mbedtls/**/*"
-  - "soc/x86/ia32/**/*"
-  - "subsys/fs/fcb/**/*"
-  - "subsys/logging/**/*"
-  - "subsys/net/**/*"
-  - "subsys/random/**/*"
-  - "subsys/settings/include/**/*"
-  - "subsys/settings/src/**/*"
-  - "subsys/stats/**/*"
-  - "subsys/storage/flash_map/**/*"
-  - "subsys/storage/stream/**/*"
-  - "subsys/tracing/**/*"
-
-"CI-desktop-test":
-  - "drivers/bluetooth/*"
-  - "subsys/bluetooth/*"
-  - "include/zephyr/bluetooth/*"
-
-"CI-crypto-test":
-  - "boards/nordic/nrf52840dk/**/*"
-  - "boards/nordic/nrf5340dk/**/*"
-  - "boards/nordic/nrf9160dk/**/*"
-  - "drivers/entropy/*"
-  - "drivers/serial/**/*"
-  - "dts/arm/nordic/nrf52840*"
-  - "dts/arm/nordic/nrf5340*"
-  - "dts/arm/nordic/nrf9160*"
-  - "include/drivers/serial/**/*"
-  - "modules/mbedtls/**/*"
-
-"CI-fem-test":
-  - "boards/nordic/**/*"
-  - "drivers/bluetooth/hci/**/*"
-  - "drivers/entropy/**/*"
-  - "dts/bindings/**/*"
-  - "include/zephyr/net/**/*"
-  - "include/zephyr/arch/**/*"
-  - "lib/libc/**/*"
-  - "lib/open-amp/**/*"
-  - "modules/hal_nordic/**/*"
-  - "modules/mbedtls/**/*"
-  - "modules/openthread/**/*"
-  - "modules/trusted-firmware-m/**/*"
-  - "samples/net/sockets/echo_*/**/*"
-  - "share/**/*"
-  - "soc/nordic/**/*"
-  - "subsys/net/**/*"
-  - "subsys/settings/**/*"
-  - "subsys/bluetooth/shell/**/*"
-  - "subsys/ipc/**/*"
-  - "Kconfig"
-  - "CMakeLists.txt"
-
-"CI-rs-test":
-  - "boards/nordic/**/*"
-  - "drivers/bluetooth/hci/**/*"
-  - "drivers/entropy/**/*"
-  - "dts/bindings/**/*"
-  - "include/zephyr/net/**/*"
-  - "include/zephyr/arch/**/*"
-  - "lib/libc/**/*"
-  - "lib/open-amp/**/*"
-  - "modules/hal_nordic/**/*"
-  - "modules/mbedtls/**/*"
-  - "modules/openthread/**/*"
-  - "modules/trusted-firmware-m/**/*"
-  - "samples/net/sockets/echo_*/**/*"
-  - "share/**/*"
-  - "soc/nordic/**/*"
-  - "subsys/net/**/*"
-  - "subsys/settings/**/*"
-  - "subsys/bluetooth/shell/**/*"
-  - "subsys/ipc/**/*"
-  - "Kconfig"
-  - "CMakeLists.txt"
-
-"CI-thread-test":
-  - "include/zephyr/net/**/*"
-  - "modules/mbedtls/**/*"
-  - "modules/openthread/**/*"
-  - "samples/net/openthread/**/*"
-  - "soc/nordic/**/*"
-  - "subsys/net/**/*"
-  - "subsys/settings/**/*"
-
-"CI-nfc-test":
-  - "drivers/bluetooth/hci/**/*"
-  - "drivers/entropy/**/*"
-  - "drivers/flash/**/*"
-  - "drivers/mbox/**/*"
-  - "drivers/spi/**/*"
-  - "lib/crc/**/*"
-  - "modules/hal_nordic/**/*"
-  - "soc/nordic/**/*"
-  - "subsys/bluetooth/**/*"
-  - "subsys/ipc/ipc_service/**/*"
-  - "subsys/fs/**/*"
-  - "subsys/mem_mgmt/**/*"
-  - "subsys/net/**/*"
-  - "subsys/random/**/*"
-  - "subsys/settings/**/*"
-  - "subsys/shell/**/*"
-  - "subsys/storage/**/*"
-
-"CI-matter-test":
-  - "include/dfu/**/*"
-  - "include/mgmt/mcumgr/**/*"
-  - "soc/nordic/**/*"
-  - "subsys/dfu/**/*"
-  - "subsys/settings/**/*"
-  - "subsys/net/**/*"
-  - "subsys/mgmt/mcumgr/**/*"
-  - "drivers/net/**/*"
-  - "samples/bluetooth/hci_ipc/**/*"
-  - any:
-      - "subsys/bluetooth/**/*"
-      - "!subsys/bluetooth/mesh/**/*"
-      - "!subsys/bluetooth/audio/**/*"
-
-"CI-find-my-test":
-  - "boards/nordic/**/*"
-  - "drivers/bluetooth/**/*"
-  - "drivers/entropy/**/*"
-  - "drivers/flash/**/*"
-  - "drivers/usb/**/*"
-  - "drivers/regulator/**/*"
-  - "soc/nordic/**/*"
-  - "subsys/bluetooth/**/*"
-  - "subsys/dfu/**/*"
-  - "subsys/fs/**/*"
-  - "subsys/ipc/**/*"
-  - "subsys/net/**/*"
-  - "subsys/random/**/*"
-  - "subsys/settings/**/*"
-  - "subsys/storage/**/*"
-  - "subsys/tracing/**/*"
-  - "subsys/usb/device/**/*"
-
-"CI-rpc-test":
-  - "subsys/ipc/ipc_service/**/*"
-  - "subsys/random/**/*"
-  - "soc/nordic/nrf53/**/*"
-
-"CI-modemshell-test":
-  - "include/net/**/*"
-  - "include/posix/**/*"
-  - "include/shell/**/*"
-  - "drivers/net/**/*"
-  - "drivers/serial/**/*"
-  - "drivers/wifi/**/*"
-  - "subsys/shell/**/*"
-  - "subsys/net/**/*"
-  - "subsys/settings/**/*"
-
-"CI-positioning-test":
-  - "include/net/**/*"
-  - "include/posix/**/*"
-  - "drivers/net/**/*"
-  - "drivers/wifi/**/*"
-  - "subsys/net/**/*"
-  - "subsys/settings/**/*"
-
-"CI-cloud-test":
-  - "include/zephyr/dfu/**/*"
-  - "include/zephyr/net/**/*"
-  - "include/zephyr/posix/**/*"
-  - "include/zephyr/settings/**/*"
-  - "drivers/led/**/*"
-  - "drivers/net/**/*"
-  - "drivers/sensor/**/*"
-  - "drivers/serial/**/*"
-  - "drivers/wifi/**/*"
-  - "lib/posix/**/*"
-  - "soc/nordic/**/*"
-  - "subsys/dfu/**/*"
-  - "subsys/net/**/*"
-  - "subsys/settings/**/*"
-
-"CI-wifi":
-  - "subsys/net/l2/wifi/**/*"
-  - "subsys/net/l2/ethernet/**/*"
-
-"CI-sidewalk-test":
-  - "include/dfu/**/*"
-  - "include/mgmt/mcumgr/**/*"
-  - "soc/nordic/**/*"
-  - "subsys/dfu/**/*"
-  - "subsys/settings/**/*"
-  - "subsys/mgmt/mcumgr/**/*"
-  - "samples/bluetooth/hci_ipc/**/*"
-  - any:
-      - "subsys/bluetooth/**/*"
-      - "!subsys/bluetooth/mesh/**/*"
-      - "!subsys/bluetooth/audio/**/*"
-
-"CI-audio-test":
-  - "boards/nordic/nrf5340_audio_dk/**/*"
-  - "drivers/flash/**/*"
-  - "drivers/spi/**/*"
-  - "drivers/gpio/**/*"
-  - "drivers/i2c/**/*"
-  - "drivers/watchdog/**/*"
-  - "include/dfu/**/*"
-  - "include/mgmt/mcumgr/**/*"
-  - "samples/bluetooth/hci_ipc/**/*"
-  - "soc/nordic/**/*"
-  - "subsys/bluetooth/audio/**/*"
-  - "subsys/bluetooth/host/**/*"
-  - "subsys/dfu/**/*"
-  - "subsys/fs/**/*"
-  - "subsys/mgmt/mcumgr/**/*"
-  - "subsys/sd/**/*"
-  - "subsys/storage/**/*"
-  - "subsys/task_wdt/**/*"
-  - "subsys/usb/**/*"
-  - "subsys/zbus/**/*"
-
-"CI-pmic-samples-test":
-  - "samples/shields/npm1300_ek/**/*"
-  - "boards/shields/npm1300_ek/**/*"
-  - "**/**npm1300**/**"
-  - "drivers/regulator/regulator_common.c"
-  - "drivers/regulator/regulator_shell.c"
-  - "drivers/gpio/gpio_shell.c"
-  - "drivers/sensor/sensor_shell.c"
-
-"CI-test-low-level":
-  - "arch/**/*"
-  - "boards/nordic/nrf54*/**/*"
-  - "drivers/**/*"
-  - "dts/**/*"
-  - "include/zephyr/**/*"
-  - "kernel/**/*"
-  - "modules/hal_nordic/**/*"
-  - "samples/basic/blinky_pwm/**/*"
-  - "samples/basic/fade_led/**/*"
-  - "samples/boards/nrf/**/*"
-  - "samples/boards/nordic/**/*"
-  - "samples/drivers/adc/**/*"
-  - "samples/drivers/jesd216/**/*"
-  - "samples/drivers/mbox/**/*"
-  - "samples/drivers/soc_flash_nrf/**/*"
-  - "samples/drivers/spi_flash/**/*"
-  - "samples/drivers/watchdog/**/*"
-  - "samples/hello_world/**/*"
-  - "samples/sensor/**/*"
-  - "samples/subsys/ipc/**/*"
-  - "samples/subsys/logging/**/*"
-  - "samples/subsys/settings/**/*"
-  - "samples/subsys/usb/cdc_acm/**/*"
-  - "samples/subsys/usb/mass/**/*"
-  - "samples/synchronization/**/*"
-  - "subsys/logging/**/*"
-  - "subsys/settings/**/*"
-  - "tests/arch/**/*"
-  - "tests/boards/nrf/**/*"
-  - "tests/boards/nordic/**/*"
-  - "tests/drivers/**/*"
-  - "tests/kernel/**/*"
-
-"CI-suit-dfu-test":
-  - "subsys/mgmt/mcumgr/**/*"
-  - "include/mgmt/mcumgr/**/*"
-  - "samples/subsys/mgmt/mcumgr/smp_svr/**/*"
-  - "subsys/bluetooth/**/*"
-  - "drivers/bluetooth/**/*"
-  - "drivers/flash/**/*"
-  - "drivers/spi/**/*"
-  - "drivers/mbox/**/*"
-  - "drivers/serial/**/*"
-  - "drivers/console/**/*"
-  - "dts/common/nordic/*"
-  - "dts/arm/nordic/nrf54h*"
-  - "dts/riscv/nordic/nrf54h*"
-  - "boards/nordic/nrf54h*"
-  - "soc/nordic/nrf54h/**/*"
-  - "include/zephyr/**/*"
-  - "subsys/logging/**/*"
-  - "subsys/tracing/**/*"
-  - "scripts/west_commands/build.py"
-  - "scripts/west_commands/flash.py"
-  - "scripts/west_commands/runners/nrfutil.py"
-  - "scripts/west_commands/runners/core.py"
-  - "scripts/west_commands/runners/nrf_common.py"
diff --git a/CODEOWNERS b/CODEOWNERS
index 8ba6e3c5b78..4c737dc9642 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -18,7 +18,6 @@
 # component or code. This file is going to be deprecated and currently only had
 # entries that are not covered by the MAINTAINERS file.
 
-/.github/test-spec.yml                    @nrfconnect/ncs-test-leads
 /soc/arm/aspeed/                          @aspeeddylan
 /soc/atmel/                               @nandojve
 /soc/arm/bcm*/                            @sbranden

From 32f62c3ac849f43ba65881454e3494013044f374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:57 +0100
Subject: [PATCH 1852/2913] Revert "[nrf noup] ci: scripts: add quarantine
 file"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 980e3ca8c6ac4b98bcf05de1582403da03b4cb08.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/quarantine.yaml | 88 -----------------------------------------
 1 file changed, 88 deletions(-)
 delete mode 100644 scripts/quarantine.yaml

diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml
deleted file mode 100644
index 20c4f9248ea..00000000000
--- a/scripts/quarantine.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
-# The configurations resulting as a product of scenarios and platforms
-# will be skipped if quarantine is used. More details here:
-# https://docs.zephyrproject.org/latest/guides/test/twister.html#quarantine
-
-- scenarios:
-    - testing.ztest.busy_sim
-    - testing.ztest.busy_sim_nrf52840dk_pin
-  platforms:
-    - nrf52840dk_nrf52840
-
-# Already reported, but will not be fixed (look at the discussion):
-# https://github.com/zephyrproject-rtos/zephyr/issues/44947
-- scenarios:
-    - libraries.cmsis_dsp.matrix.unary_f64
-  platforms:
-    - nrf5340dk_nrf5340_cpunet
-    - qemu_cortex_m3
-  comment: "Flash overflows"
-
-# Already reported, but will not be fixed (look at the discussion):
-# https://github.com/zephyrproject-rtos/zephyr/issues/44947
-- scenarios:
-    - libraries.cmsis_dsp.matrix.binary_f16
-    - libraries.cmsis_dsp.matrix.binary_f16.fpu
-  platforms:
-    - nrf5340dk_nrf5340_cpuapp_ns
-  comment: "Flash overflows"
-
-# Already reported, but will not be fixed (look at the discussion):
-# https://github.com/zephyrproject-rtos/zephyr/issues/44947
-- scenarios:
-    - libraries.cmsis_dsp.matrix.binary_q15
-    - libraries.cmsis_dsp.matrix.binary_q15.fpu
-    - libraries.cmsis_dsp.matrix.unary_f32
-    - libraries.cmsis_dsp.matrix.unary_f32.fpu
-    - libraries.cmsis_dsp.matrix.unary_f64
-    - libraries.cmsis_dsp.matrix.unary_f64.fpu
-  platforms:
-    - nrf5340dk_nrf5340_cpuapp_ns
-    - nrf9160dk_nrf9160_ns
-  comment: "Flash overflows"
-
-# libsdl2-dev package should be added into docker image
-- scenarios:
-    - sample.boards.nrf.nrf_led_matrix
-    - sample.display.lvgl.gui
-  platforms:
-    - native_posix
-  comment: "libsdl2-dev package not available"
-
-- scenarios:
-    - sample.net.sockets.echo_server.usbnet
-    - sample.net.sockets.echo_server.usbnet_composite
-  platforms:
-    - nrf5340dk_nrf5340_cpuapp_ns
-  comment: "Ram/flash overflows, also in the upstream"
-
-- scenarios:
-    - sample.net.zperf.netusb_ecm
-    - sample.net.zperf.netusb_eem
-    - sample.net.zperf.netusb_rndis
-  platforms:
-    - nrf52833dk_nrf52833
-    - nrf5340dk_nrf5340_cpuapp_ns
-  comment: "Ram/flash overflows, also in the upstream"
-
-- scenarios:
-    - net.mqtt.tls
-  platforms:
-    - nrf5340dk_nrf5340_cpuapp_ns
-    - nrf9160dk_nrf9160_ns
-  comment: "Ram/flash overflows, also in the upstream"
-
-- scenarios:
-    - kernel.common.picolibc
-    - libraries.picolibc
-    - libraries.libc.picolibc.mem_alloc
-    - libraries.picolibc.sprintf_new
-  platforms:
-    - nrf52dk_nrf52832
-  comment: "Ram overflows, also in the upstream"
-
-- scenarios:
-    - sample.psa_crypto
-  platforms:
-    - nrf5340dk_nrf5340_cpuapp_ns
-    - nrf9160dk_nrf9160_ns
-  comment: "Due to using sdk-zephyr manifest instead of nrf. Should be fixed after the change"

From 68616327dc7b299f539a5a12f341bbd37ce09c65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:57 +0100
Subject: [PATCH 1853/2913] Revert "[nrf noup] ci: set
 `ZEPHYR_<MODULE_NAME>_KCONFIG` for NCS modules"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit df94528234c7fe2e5f5a1bd7f732b39ff378a773.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/ci/check_compliance.py | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/scripts/ci/check_compliance.py b/scripts/ci/check_compliance.py
index 3b9439a6d96..3a6ddfdb717 100755
--- a/scripts/ci/check_compliance.py
+++ b/scripts/ci/check_compliance.py
@@ -408,13 +408,6 @@ def get_modules(self, modules_file, settings_file):
         modules = [name for name in os.listdir(modules_dir) if
                    os.path.exists(os.path.join(modules_dir, name, 'Kconfig'))]
 
-        nrf_modules_dir = ZEPHYR_BASE + '/../nrf/modules'
-        nrf_modules = []
-        if os.path.exists(nrf_modules_dir):
-            nrf_modules = [name for name in os.listdir(nrf_modules_dir) if
-                           os.path.exists(os.path.join(nrf_modules_dir, name,
-                                                       'Kconfig'))]
-
         with open(modules_file, 'r') as fp_module_file:
             content = fp_module_file.read()
 
@@ -424,15 +417,6 @@ def get_modules(self, modules_file, settings_file):
                     re.sub('[^a-zA-Z0-9]', '_', module).upper(),
                     modules_dir + '/' + module + '/Kconfig'
                 ))
-            for module in nrf_modules:
-                fp_module_file.write("ZEPHYR_{}_KCONFIG = {}\n".format(
-                    re.sub('[^a-zA-Z0-9]', '_', module).upper(),
-                    nrf_modules_dir + '/' + module + '/Kconfig'
-                ))
-                fp_module_file.write("NCS_{}_KCONFIG = {}\n".format(
-                    re.sub('[^a-zA-Z0-9]', '_', module).upper(),
-                    modules_dir + '/' + module + '/Kconfig'
-                ))
             fp_module_file.write(content)
 
     def get_module_setting_root(self, root, settings_file):

From 7a70ed4608609fd6232b6c54e12d9bebd802839e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:57 +0100
Subject: [PATCH 1854/2913] Revert "[nrf fromtree] west: support build info
 file for west build"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7a18ca13818360d6f814e0ef1c9fc2ee775f78a6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/schemas/build-schema.yml |  2 --
 scripts/west_commands/build.py   | 20 --------------------
 2 files changed, 22 deletions(-)

diff --git a/scripts/schemas/build-schema.yml b/scripts/schemas/build-schema.yml
index 5086afbb25b..b4435a032d7 100644
--- a/scripts/schemas/build-schema.yml
+++ b/scripts/schemas/build-schema.yml
@@ -104,5 +104,3 @@ mapping:
         type: str
       topdir:
         type: str
-      version:
-        type: str
diff --git a/scripts/west_commands/build.py b/scripts/west_commands/build.py
index 459d9aedf0b..6bedd61937f 100644
--- a/scripts/west_commands/build.py
+++ b/scripts/west_commands/build.py
@@ -11,8 +11,6 @@
 
 from west import log
 from west.configuration import config
-from west.util import west_topdir
-from west.version import __version__
 from zcmake import DEFAULT_CMAKE_GENERATOR, run_cmake, run_build, CMakeCache
 from build_helpers import is_zephyr_build, find_build_dir, load_domains, \
     FIND_BUILD_DIR_DESCRIPTION
@@ -24,8 +22,6 @@
 SYSBUILD_PROJ_DIR = pathlib.Path(__file__).resolve().parent.parent.parent \
                     / pathlib.Path('share/sysbuild')
 
-BUILD_INFO_LOG = 'build_info.yml'
-
 BUILD_USAGE = '''\
 west build [-h] [-b BOARD[@REV]]] [-d BUILD_DIR]
            [-S SNIPPET] [--shield SHIELD]
@@ -231,25 +227,9 @@ def do_run(self, args, remainder):
                     self.run_cmake = True
         else:
             self.run_cmake = True
-
         self.source_dir = self._find_source_dir()
         self._sanity_check()
 
-        build_info_path = self.build_dir
-        build_info_file = os.path.join(build_info_path, BUILD_INFO_LOG)
-        west_workspace = west_topdir(self.source_dir)
-        if not os.path.exists(build_info_path):
-            os.makedirs(build_info_path)
-        if not os.path.exists(build_info_file):
-            build_command = {'west': {'command': ' '.join(sys.argv[:]),
-                                     'topdir': str(west_workspace),
-                                     'version': str(__version__)}}
-            try:
-                with open(build_info_file, "w") as f:
-                    yaml.dump(build_command, f, default_flow_style=False)
-            except Exception as e:
-                log.wrn(f'Failed to create info file: {build_info_file},', e)
-
         board, origin = self._find_board()
         self._run_cmake(board, origin, self.args.cmake_opts)
         if args.cmake_only:

From 607930d63f6d83ce2eb070a662353f97b2ba956c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:57 +0100
Subject: [PATCH 1855/2913] Revert "[nrf fromtree] cmake: introduce build_info
 function"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3732cd3567862efcc7fd3a690dc5f64f7e7eeb16.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/modules/extensions.cmake   |  70 --------------------
 cmake/modules/unittest.cmake     |   1 -
 scripts/schemas/build-schema.yml | 106 -------------------------------
 3 files changed, 177 deletions(-)
 delete mode 100644 scripts/schemas/build-schema.yml

diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index 066e0422e49..5c45f5d4d8c 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -3595,67 +3595,6 @@ function(topological_sort)
   set(${TS_RESULT} "${sorted_targets}" PARENT_SCOPE)
 endfunction()
 
-# Usage:
-#   build_info(<tag>... VALUE <value>...)
-#
-# This function populates updates the build_info.yml info file with exchangable build information
-# related to the current build.
-#
-# Example:
-#   build_info(devicetree files VALUE file1.dts file2.dts file3.dts)
-# Will update the 'devicetree files' key in the build info yaml with the list
-# of files, file1.dts file2.dts file3.dts.
-#
-#   build_info(vendor-specific foo VALUE bar)
-# Will place the vendor specific key 'foo' with value 'bar' in the vendor specific section
-# of the build info file.
-#
-# <tag>...: One of the pre-defined valid CMake keys supported by build info or vendor-specific.
-#           See 'scripts/schemas/build-schema.yml' CMake section for valid tags.
-# VALUE <value>... : value(s) to place in the build_info.yml file.
-function(build_info)
-  set(arg_list ${ARGV})
-  list(FIND arg_list VALUE index)
-  if(index EQUAL -1)
-    message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION}(...) missing a required argument: VALUE")
-  endif()
-
-  yaml_context(EXISTS NAME build_info result)
-  if(NOT result)
-    yaml_load(FILE ${ZEPHYR_BASE}/scripts/schemas/build-schema.yml NAME build_info_schema)
-    if(EXISTS ${CMAKE_BINARY_DIR}/build_info.yml)
-      yaml_load(FILE ${CMAKE_BINARY_DIR}/build_info.yml NAME build_info)
-    else()
-      yaml_create(FILE ${CMAKE_BINARY_DIR}/build_info.yml NAME build_info)
-    endif()
-    yaml_set(NAME build_info KEY version VALUE "0.1.0")
-  endif()
-
-  list(SUBLIST arg_list 0 ${index} keys)
-  list(SUBLIST arg_list ${index} -1 values)
-  list(POP_FRONT values)
-
-  if(ARGV0 STREQUAL "vendor-specific")
-    set(type VALUE)
-  else()
-    set(schema_check ${keys})
-    list(TRANSFORM schema_check PREPEND "mapping;")
-    yaml_get(check NAME build_info_schema KEY mapping cmake ${schema_check})
-    if(check MATCHES ".*-NOTFOUND")
-      message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION}(...) called with invalid tag: ${keys}")
-    endif()
-
-    yaml_get(type NAME build_info_schema KEY mapping cmake ${schema_check} type)
-    if(type MATCHES "seq|sequence")
-      set(type LIST)
-    else()
-      set(type VALUE)
-    endif()
-  endif()
-
-  yaml_set(NAME build_info KEY cmake ${keys} ${type} "${values}")
-endfunction()
-
 ########################################################
 # 4. Devicetree extensions
 ########################################################
@@ -5840,13 +5779,4 @@ if(CMAKE_SCRIPT_MODE_FILE)
   function(zephyr_set variable)
     # This silence the error: zephyr_set(...  SCOPE <scope>) doesn't exists.
   endfunction()
-
-  # Build info creates a custom target for handling of build info.
-  # build_info is not needed in script mode but still called by Zephyr CMake
-  # modules. Therefore disable build_info(...) in when including
-  # extensions.cmake in script mode.
-  function(build_info)
-    # This silence the error: 'YAML context 'build_info' does not exist.'
-    #                         'Remember to create a YAML context'
-  endfunction()
 endif()
diff --git a/cmake/modules/unittest.cmake b/cmake/modules/unittest.cmake
index 6565e89aec5..9598bf8b84a 100644
--- a/cmake/modules/unittest.cmake
+++ b/cmake/modules/unittest.cmake
@@ -4,7 +4,6 @@ cmake_minimum_required(VERSION 3.20.0)
 
 include(extensions)
 include(west)
-include(yaml)
 include(root)
 include(zephyr_module)
 include(boards)
diff --git a/scripts/schemas/build-schema.yml b/scripts/schemas/build-schema.yml
deleted file mode 100644
index b4435a032d7..00000000000
--- a/scripts/schemas/build-schema.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright (c) 2024, Nordic Semiconductor ASA
-
-# A pykwalify schema for basic validation of the Zephyr build info YAML file.
-
-type: map
-mapping:
-  version:
-    required: true
-    type: str
-  cmake:
-    type: map
-    mapping:
-      application:
-        type: map
-        mapping:
-          source-dir:
-            type: str
-          configuration-dir:
-            type: str
-      board:
-        type: map
-        mapping:
-          name:
-            required: true
-            type: str
-          qualifiers:
-            type: str
-          revision:
-            type: str
-          path:
-            type: seq
-            sequence:
-              - type: str
-      devicetree:
-        type: map
-        mapping:
-          files:
-            type: seq
-            sequence:
-              - type: str
-          user-files:
-            type: seq
-            sequence:
-              - type: str
-          extra-user-files:
-            type: seq
-            sequence:
-              - type: str
-          include-dirs:
-            type: seq
-            sequence:
-              - type: str
-          bindings-dirs:
-            type: seq
-            sequence:
-              - type: str
-      kconfig:
-        type: map
-        mapping:
-          files:
-            type: seq
-            sequence:
-              - type: str
-          user-files:
-            type: seq
-            sequence:
-              - type: str
-          extra-user-files:
-            type: seq
-            sequence:
-              - type: str
-      sysbuild:
-        type: bool
-      toolchain:
-        type: map
-        mapping:
-          name:
-            type: str
-          version:
-            type: str
-          path:
-            type: str
-      zephyr:
-        type: map
-        mapping:
-          zephyr-base:
-            type: str
-          version:
-            type: str
-      vendor-specific:
-        type: map
-        mapping:
-          regex;(.*):
-            type: map
-            mapping:
-              regex;(.*):
-                type: str
-  west:
-    type: map
-    mapping:
-      command:
-        type: str
-      topdir:
-        type: str

From faaeeac378a8ef67c05233b88e3131fec6b2e461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:57 +0100
Subject: [PATCH 1856/2913] Revert "[nrf fromtree] cmake: move script mode
 handling from package helper to extensions.cmake"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a4b31d83d2f8e9fb7c99cdd316e31f5ae04d6fdc.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/modules/extensions.cmake | 36 ----------------------------------
 cmake/package_helper.cmake     | 25 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index 5c45f5d4d8c..b9812d84379 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -38,7 +38,6 @@ include(CheckCXXCompilerFlag)
 # 7.1 llext_* configuration functions
 # 7.2 add_llext_* build control functions
 # 7.3 llext helper functions
-# 8. Script mode handling
 
 ########################################################
 # 1. Zephyr-aware extensions
@@ -5745,38 +5744,3 @@ function(llext_filter_zephyr_flags filter flags outvar)
 
   set(${outvar} ${zephyr_filtered_flags} PARENT_SCOPE)
 endfunction()
-
-########################################################
-# 8. Script mode handling
-########################################################
-#
-# Certain features are not available when CMake is used in script mode.
-# For example custom targets, and thus features related to custom targets, such
-# as target properties are not available in script mode.
-#
-# This section defines behavior for functions whose default implementation does
-# not work correctly in script mode.
-#
-# The script mode function can be a simple stub or a more complex solution
-# depending on the exact use of the function in script mode.
-#
-# Current Zephyr CMake scripts which includes `extensions.cmake` in script mode
-# are: package_helper.cmake, verify-toolchain.cmake
-#
-
-if(CMAKE_SCRIPT_MODE_FILE)
-  # add_custom_target and set_target_properties are not supported in script mode.
-  # However, Zephyr CMake functions like `zephyr_get()`, `zephyr_create_scope()`,
-  # llext functions creates or relies on custom CMake targets.
-  function(add_custom_target)
-    # This silence the error: 'add_custom_target command is not scriptable'
-  endfunction()
-
-  function(set_target_properties)
-    # This silence the error: 'set_target_properties command is not scriptable'
-  endfunction()
-
-  function(zephyr_set variable)
-    # This silence the error: zephyr_set(...  SCOPE <scope>) doesn't exists.
-  endfunction()
-endif()
diff --git a/cmake/package_helper.cmake b/cmake/package_helper.cmake
index 886dbfff71d..55412b94110 100644
--- a/cmake/package_helper.cmake
+++ b/cmake/package_helper.cmake
@@ -44,6 +44,20 @@
 
 cmake_minimum_required(VERSION 3.20.5)
 
+# add_custom_target and set_target_properties are not supported in script mode.
+# However, several Zephyr CMake modules create custom target for user convenience
+# like menuconfig, boards, shields, etc.
+# As we are not generating a build system with this tool, only running part of
+# the modules, then we simply override those functions to allow running those
+# modules.
+function(add_custom_target)
+  # This silence the error: 'add_custom_target command is not scriptable'
+endfunction()
+
+function(set_target_properties)
+  # This silence the error: 'set_target_properties command is not scriptable'
+endfunction()
+
 # Find last `-B` and `-S` instances.
 foreach(i RANGE ${CMAKE_ARGC})
   if(CMAKE_ARGV${i} MATCHES "^-B(.*)")
@@ -97,5 +111,16 @@ if(NOT DEFINED MODULES)
   )
 endif()
 
+# Loading Zephyr CMake extension commands, which allows us to overload Zephyr
+# scoping rules.
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS extensions)
+
+# Zephyr scoping creates custom targets for handling of properties.
+# However, custom targets cannot be used in CMake script mode.
+# Therefore disable zephyr_set(... SCOPE ...) in package helper as it is not needed.
+function(zephyr_set variable)
+  # This silence the error: zephyr_set(...  SCOPE <scope>) doesn't exists.
+endfunction()
+
 string(REPLACE ";" "," MODULES "${MODULES}")
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS zephyr_default:${MODULES})

From d5ffbdfc15fb10bf8228932ec4642e3a3a239932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:57 +0100
Subject: [PATCH 1857/2913] Revert "[nrf fromtree] cmake: define
 ZEPHYR_TOOLCHAIN_PATH"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8f9818dec4bdeeb9763032960a4a0137d0419882.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/modules/FindZephyr-sdk.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmake/modules/FindZephyr-sdk.cmake b/cmake/modules/FindZephyr-sdk.cmake
index 1b56379ec66..b1c1c8cf02b 100644
--- a/cmake/modules/FindZephyr-sdk.cmake
+++ b/cmake/modules/FindZephyr-sdk.cmake
@@ -175,4 +175,3 @@ if(LOAD IN_LIST Zephyr-sdk_FIND_COMPONENTS)
     endif()
   endif()
 endif()
-set(ZEPHYR_TOOLCHAIN_PATH ${ZEPHYR_SDK_INSTALL_DIR})

From 6b75b86f43cce3a91f46ee71685d262b4f2a03c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:57 +0100
Subject: [PATCH 1858/2913] Revert "[nrf fromtree] tests: bluetooth: tester:
 Add nrf54l15dk and remove nrf54l15pdk"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 084193a761bea757adaea97b32459b9f2d9aabbf.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 ...15dk_nrf54l15_cpuapp.conf => nrf54l15pdk_nrf54l15_cpuapp.conf} | 0
 ...rf54l15_cpuapp.overlay => nrf54l15pdk_nrf54l15_cpuapp.overlay} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/bluetooth/tester/boards/{nrf54l15dk_nrf54l15_cpuapp.conf => nrf54l15pdk_nrf54l15_cpuapp.conf} (100%)
 rename tests/bluetooth/tester/boards/{nrf54l15dk_nrf54l15_cpuapp.overlay => nrf54l15pdk_nrf54l15_cpuapp.overlay} (100%)

diff --git a/tests/bluetooth/tester/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/tests/bluetooth/tester/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
similarity index 100%
rename from tests/bluetooth/tester/boards/nrf54l15dk_nrf54l15_cpuapp.conf
rename to tests/bluetooth/tester/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
diff --git a/tests/bluetooth/tester/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/bluetooth/tester/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/bluetooth/tester/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to tests/bluetooth/tester/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay

From d858f53a72153bc84b6b2af2f7502db35a632064 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:57 +0100
Subject: [PATCH 1859/2913] Revert "[nrf fromtree] Bluetooth: Mesh: Fixes after
 proxy advertising unable to send messages"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit bf0a988a229dd32579a5dc76fd5bd7894f7c09bf.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/mesh/adv_ext.c | 43 +++++++++++++++------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index b206b81b743..b437e6d91ef 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -241,28 +241,6 @@ static const char * const adv_tag_to_str[] = {
 	[BT_MESH_ADV_TAG_PROV]   = "prov adv",
 };
 
-static bool schedule_send_with_mask(struct bt_mesh_ext_adv *ext_adv, int ignore_mask)
-{
-	if (atomic_test_and_clear_bit(ext_adv->flags, ADV_FLAG_PROXY)) {
-		atomic_clear_bit(ext_adv->flags, ADV_FLAG_PROXY_START);
-		(void)bt_le_ext_adv_stop(ext_adv->instance);
-
-		atomic_clear_bit(ext_adv->flags, ADV_FLAG_ACTIVE);
-	}
-
-	if (atomic_test_bit(ext_adv->flags, ADV_FLAG_ACTIVE)) {
-		atomic_set_bit(ext_adv->flags, ADV_FLAG_SCHEDULE_PENDING);
-		return false;
-	} else if ((~ignore_mask) & k_work_busy_get(&ext_adv->work)) {
-		return false;
-	}
-
-	atomic_clear_bit(ext_adv->flags, ADV_FLAG_SCHEDULE_PENDING);
-	k_work_submit(&ext_adv->work);
-
-	return true;
-}
-
 static void send_pending_adv(struct k_work *work)
 {
 	struct bt_mesh_ext_adv *ext_adv;
@@ -336,13 +314,30 @@ static void send_pending_adv(struct k_work *work)
 	}
 
 	if (atomic_test_and_clear_bit(ext_adv->flags, ADV_FLAG_SCHEDULE_PENDING)) {
-		schedule_send_with_mask(ext_adv, K_WORK_RUNNING);
+		schedule_send(ext_adv);
 	}
 }
 
 static bool schedule_send(struct bt_mesh_ext_adv *ext_adv)
 {
-	return schedule_send_with_mask(ext_adv, 0);
+	if (atomic_test_and_clear_bit(ext_adv->flags, ADV_FLAG_PROXY)) {
+		atomic_clear_bit(ext_adv->flags, ADV_FLAG_PROXY_START);
+		(void)bt_le_ext_adv_stop(ext_adv->instance);
+
+		atomic_clear_bit(ext_adv->flags, ADV_FLAG_ACTIVE);
+	}
+
+	if (atomic_test_bit(ext_adv->flags, ADV_FLAG_ACTIVE)) {
+		atomic_set_bit(ext_adv->flags, ADV_FLAG_SCHEDULE_PENDING);
+		return false;
+	} else if (k_work_is_pending(&ext_adv->work)) {
+		return false;
+	}
+
+	atomic_clear_bit(ext_adv->flags, ADV_FLAG_SCHEDULE_PENDING);
+	k_work_submit(&ext_adv->work);
+
+	return true;
 }
 
 void bt_mesh_adv_gatt_update(void)

From a0e6284ebc48c6e8e2f1d0972da3397b3498e06e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:57 +0100
Subject: [PATCH 1860/2913] Revert "[nrf fromtree] Bluetooth: Mesh: Refine Mesh
 store logic"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7930901ea2d20d53d5eae3d6f724ad7b7256b25d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/mesh/rpl.c      |   5 --
 subsys/bluetooth/mesh/rpl.h      |   1 -
 subsys/bluetooth/mesh/settings.c | 116 +++++++++++++++++++++----------
 3 files changed, 79 insertions(+), 43 deletions(-)

diff --git a/subsys/bluetooth/mesh/rpl.c b/subsys/bluetooth/mesh/rpl.c
index 581c94771c8..213ed7d4479 100644
--- a/subsys/bluetooth/mesh/rpl.c
+++ b/subsys/bluetooth/mesh/rpl.c
@@ -404,8 +404,3 @@ void bt_mesh_rpl_pending_store(uint16_t addr)
 		(void)memset(&replay_list[last - shift + 1], 0, sizeof(struct bt_mesh_rpl) * shift);
 	}
 }
-
-void bt_mesh_rpl_pending_store_all_nodes(void)
-{
-	bt_mesh_rpl_pending_store(BT_MESH_ADDR_ALL_NODES);
-}
diff --git a/subsys/bluetooth/mesh/rpl.h b/subsys/bluetooth/mesh/rpl.h
index 6dbe4796033..39395bb25d1 100644
--- a/subsys/bluetooth/mesh/rpl.h
+++ b/subsys/bluetooth/mesh/rpl.h
@@ -26,4 +26,3 @@ bool bt_mesh_rpl_check(struct bt_mesh_net_rx *rx, struct bt_mesh_rpl **match, bo
 void bt_mesh_rpl_clear(void);
 void bt_mesh_rpl_update(struct bt_mesh_rpl *rpl,
 			struct bt_mesh_net_rx *rx);
-void bt_mesh_rpl_pending_store_all_nodes(void);
diff --git a/subsys/bluetooth/mesh/settings.c b/subsys/bluetooth/mesh/settings.c
index 6bd651c7493..5c9e03693bc 100644
--- a/subsys/bluetooth/mesh/settings.c
+++ b/subsys/bluetooth/mesh/settings.c
@@ -184,44 +184,86 @@ static void store_pending(struct k_work *work)
 {
 	LOG_DBG("");
 
-	static const struct {
-		void (*handler)(void);
-	} handlers[BT_MESH_SETTINGS_FLAG_COUNT] = {
-		[BT_MESH_SETTINGS_RPL_PENDING]      = { bt_mesh_rpl_pending_store_all_nodes },
-		[BT_MESH_SETTINGS_NET_KEYS_PENDING] = { bt_mesh_subnet_pending_store },
-		[BT_MESH_SETTINGS_APP_KEYS_PENDING] = { bt_mesh_app_key_pending_store },
-		[BT_MESH_SETTINGS_NET_PENDING]	    = { bt_mesh_net_pending_net_store },
-		[BT_MESH_SETTINGS_IV_PENDING]	    = { bt_mesh_net_pending_iv_store },
-		[BT_MESH_SETTINGS_SEQ_PENDING]	    = { bt_mesh_net_pending_seq_store },
-		[BT_MESH_SETTINGS_DEV_KEY_CAND_PENDING] = {
-			bt_mesh_net_pending_dev_key_cand_store },
-		[BT_MESH_SETTINGS_HB_PUB_PENDING]   = { bt_mesh_hb_pub_pending_store },
-		[BT_MESH_SETTINGS_CFG_PENDING]	    = { bt_mesh_cfg_pending_store },
-		[BT_MESH_SETTINGS_COMP_PENDING]	    = { bt_mesh_comp_data_pending_clear },
-		[BT_MESH_SETTINGS_MOD_PENDING]	    = { bt_mesh_model_pending_store },
-		[BT_MESH_SETTINGS_VA_PENDING]	    = { bt_mesh_va_pending_store },
-		[BT_MESH_SETTINGS_CDB_PENDING]	    = {
-			IS_ENABLED(CONFIG_BT_MESH_CDB) ?
-				bt_mesh_cdb_pending_store : NULL },
-		[BT_MESH_SETTINGS_SRPL_PENDING]     = {
-			IS_ENABLED(CONFIG_BT_MESH_OD_PRIV_PROXY_SRV) ?
-				bt_mesh_srpl_pending_store : NULL },
-		[BT_MESH_SETTINGS_SSEQ_PENDING]     = {
-			IS_ENABLED(CONFIG_BT_MESH_PROXY_SOLICITATION) ?
-				bt_mesh_sseq_pending_store : NULL },
-		[BT_MESH_SETTINGS_BRG_PENDING]      = {
-			IS_ENABLED(CONFIG_BT_MESH_BRG_CFG_SRV) ?
-				bt_mesh_brg_cfg_pending_store : NULL },
-	};
-
-	for (int i = 0; i < ARRAY_SIZE(handlers); i++) {
-		if (!handlers[i].handler) {
-			continue;
-		}
+	if (atomic_test_and_clear_bit(pending_flags, BT_MESH_SETTINGS_RPL_PENDING)) {
+		bt_mesh_rpl_pending_store(BT_MESH_ADDR_ALL_NODES);
+	}
 
-		if (atomic_test_and_clear_bit(pending_flags, i)) {
-			handlers[i].handler();
-		}
+	if (atomic_test_and_clear_bit(pending_flags,
+				      BT_MESH_SETTINGS_NET_KEYS_PENDING)) {
+		bt_mesh_subnet_pending_store();
+	}
+
+	if (atomic_test_and_clear_bit(pending_flags,
+				      BT_MESH_SETTINGS_APP_KEYS_PENDING)) {
+		bt_mesh_app_key_pending_store();
+	}
+
+	if (atomic_test_and_clear_bit(pending_flags,
+				      BT_MESH_SETTINGS_NET_PENDING)) {
+		bt_mesh_net_pending_net_store();
+	}
+
+	if (atomic_test_and_clear_bit(pending_flags,
+				      BT_MESH_SETTINGS_IV_PENDING)) {
+		bt_mesh_net_pending_iv_store();
+	}
+
+	if (atomic_test_and_clear_bit(pending_flags,
+				      BT_MESH_SETTINGS_SEQ_PENDING)) {
+		bt_mesh_net_pending_seq_store();
+	}
+
+	if (atomic_test_and_clear_bit(pending_flags,
+				      BT_MESH_SETTINGS_DEV_KEY_CAND_PENDING)) {
+		bt_mesh_net_pending_dev_key_cand_store();
+	}
+
+	if (atomic_test_and_clear_bit(pending_flags,
+				      BT_MESH_SETTINGS_HB_PUB_PENDING)) {
+		bt_mesh_hb_pub_pending_store();
+	}
+
+	if (atomic_test_and_clear_bit(pending_flags,
+				      BT_MESH_SETTINGS_CFG_PENDING)) {
+		bt_mesh_cfg_pending_store();
+	}
+
+	if (atomic_test_and_clear_bit(pending_flags,
+				      BT_MESH_SETTINGS_COMP_PENDING)) {
+		bt_mesh_comp_data_pending_clear();
+	}
+
+	if (atomic_test_and_clear_bit(pending_flags,
+				      BT_MESH_SETTINGS_MOD_PENDING)) {
+		bt_mesh_model_pending_store();
+	}
+
+	if (atomic_test_and_clear_bit(pending_flags,
+				      BT_MESH_SETTINGS_VA_PENDING)) {
+		bt_mesh_va_pending_store();
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_CDB) &&
+	    atomic_test_and_clear_bit(pending_flags,
+				      BT_MESH_SETTINGS_CDB_PENDING)) {
+		bt_mesh_cdb_pending_store();
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_OD_PRIV_PROXY_SRV) &&
+		atomic_test_and_clear_bit(pending_flags,
+					  BT_MESH_SETTINGS_SRPL_PENDING)) {
+		bt_mesh_srpl_pending_store();
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_PROXY_SOLICITATION) &&
+		atomic_test_and_clear_bit(pending_flags,
+					  BT_MESH_SETTINGS_SSEQ_PENDING)) {
+		bt_mesh_sseq_pending_store();
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_BRG_CFG_SRV) &&
+	    atomic_test_and_clear_bit(pending_flags, BT_MESH_SETTINGS_BRG_PENDING)) {
+		bt_mesh_brg_cfg_pending_store();
 	}
 }
 

From d00f9a3f50d0c5ea2db7440dc7d0e3ceda97086d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:57 +0100
Subject: [PATCH 1861/2913] Revert "[nrf fromtree] Bluetooth: Mesh: Fix out of
 bounds write"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 08ca95384a942e64872f381e5ffd8a268d61e0c1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/mesh/brg_cfg.c     |  72 ++++++++-----------
 tests/bluetooth/mesh/brg/src/main.c | 105 ----------------------------
 2 files changed, 30 insertions(+), 147 deletions(-)

diff --git a/subsys/bluetooth/mesh/brg_cfg.c b/subsys/bluetooth/mesh/brg_cfg.c
index 58d1aada550..112d2fe0a3e 100644
--- a/subsys/bluetooth/mesh/brg_cfg.c
+++ b/subsys/bluetooth/mesh/brg_cfg.c
@@ -33,18 +33,18 @@ enum {
 };
 static ATOMIC_DEFINE(brg_cfg_flags, BRG_CFG_FLAGS_COUNT);
 
-/* Compact the bridge table for all removed entries, input is first removed entry */
-static void brg_tbl_compact(int j)
+static void brg_tbl_compact(void)
 {
-	for (int k = j; k < bt_mesh_brg_cfg_row_cnt; k++) {
+	int j = 0;
+
+	for (int k = 0; k < bt_mesh_brg_cfg_row_cnt; k++) {
 		if (brg_tbl[k].direction != 0) {
 			brg_tbl[j] = brg_tbl[k];
 			j++;
 		}
 	}
-
-	memset(&brg_tbl[j], 0, sizeof(brg_tbl[j]) * (bt_mesh_brg_cfg_row_cnt - j));
-	bt_mesh_brg_cfg_row_cnt = j;
+	memset(&brg_tbl[j], 0, sizeof(brg_tbl[j]));
+	bt_mesh_brg_cfg_row_cnt--;
 }
 
 /* Set function for initializing bridging enable state from value stored in settings. */
@@ -167,30 +167,21 @@ void bt_mesh_brg_cfg_pending_store(void)
  */
 static void brg_tbl_netkey_removed_evt(struct bt_mesh_subnet *sub, enum bt_mesh_key_evt evt)
 {
-	int first_removed = -1;
-
 	if (evt != BT_MESH_KEY_DELETED) {
 		return;
 	}
 
-	for (int i = 0; i < bt_mesh_brg_cfg_row_cnt; i++) {
-		if (brg_tbl[i].net_idx1 == sub->net_idx || brg_tbl[i].net_idx2 == sub->net_idx) {
-			/* Setting direction to 0, entry will be cleared in brg_tbl_compact. */
-			brg_tbl[i].direction = 0;
-			if (first_removed == -1) {
-				first_removed = i;
-			}
+	for (int i = 0; i < CONFIG_BT_MESH_BRG_TABLE_ITEMS_MAX; i++) {
+		if (brg_tbl[i].direction &&
+		    (brg_tbl[i].net_idx1 == sub->net_idx || brg_tbl[i].net_idx2 == sub->net_idx)) {
+			memset(&brg_tbl[i], 0, sizeof(brg_tbl[i]));
+			brg_tbl_compact();
 		}
 	}
 
-	if (first_removed != -1) {
-		/* Compact when all rows have been deleted. */
-		brg_tbl_compact(first_removed);
-
-		if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-			atomic_set_bit(brg_cfg_flags, TABLE_UPDATED);
-			bt_mesh_settings_store_schedule(BT_MESH_SETTINGS_BRG_PENDING);
-		}
+	if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
+		atomic_set_bit(brg_cfg_flags, TABLE_UPDATED);
+		bt_mesh_settings_store_schedule(BT_MESH_SETTINGS_BRG_PENDING);
 	}
 }
 
@@ -272,7 +263,7 @@ int bt_mesh_brg_cfg_tbl_add(uint8_t direction, uint16_t net_idx1, uint16_t net_i
 	}
 
 	/* Empty element, is the current table row counter */
-	if (bt_mesh_brg_cfg_row_cnt >= CONFIG_BT_MESH_BRG_TABLE_ITEMS_MAX) {
+	if (bt_mesh_brg_cfg_row_cnt == CONFIG_BT_MESH_BRG_TABLE_ITEMS_MAX) {
 		*status = STATUS_INSUFF_RESOURCES;
 		return 0;
 	}
@@ -315,7 +306,7 @@ void bt_mesh_brg_cfg_tbl_foreach_subnet(uint16_t src, uint16_t dst, uint16_t net
 int bt_mesh_brg_cfg_tbl_remove(uint16_t net_idx1, uint16_t net_idx2, uint16_t addr1, uint16_t addr2,
 			       uint8_t *status)
 {
-	int first_removed = -1;
+	bool store = false;
 
 	/* Sanity checks */
 	if ((!BT_MESH_ADDR_IS_UNICAST(addr1) && addr1 != BT_MESH_ADDR_UNASSIGNED) ||
@@ -343,29 +334,26 @@ int bt_mesh_brg_cfg_tbl_remove(uint16_t net_idx1, uint16_t net_idx2, uint16_t ad
 
 	for (int i = 0; i < bt_mesh_brg_cfg_row_cnt; i++) {
 		/* Match according to remove behavior in Section 4.4.9.2.2 of MshPRT_v1.1 */
-		if (!(brg_tbl[i].net_idx1 == net_idx1 && brg_tbl[i].net_idx2 == net_idx2)) {
-			continue;
-		}
+		if (brg_tbl[i].direction) {
+			if (!(brg_tbl[i].net_idx1 == net_idx1 && brg_tbl[i].net_idx2 == net_idx2)) {
+				continue;
+			}
 
-		if ((brg_tbl[i].addr1 == addr1 && brg_tbl[i].addr2 == addr2) ||
-		    (addr2 == BT_MESH_ADDR_UNASSIGNED && brg_tbl[i].addr1 == addr1) ||
-		    (addr1 == BT_MESH_ADDR_UNASSIGNED && brg_tbl[i].addr2 == addr2)) {
-			/* Setting direction to 0, entry will be cleared in brg_tbl_compact. */
-			brg_tbl[i].direction = 0;
-			if (first_removed == -1) {
-				first_removed = i;
+			if ((brg_tbl[i].addr1 == addr1 && brg_tbl[i].addr2 == addr2) ||
+			    (addr2 == BT_MESH_ADDR_UNASSIGNED && brg_tbl[i].addr1 == addr1) ||
+			    (addr1 == BT_MESH_ADDR_UNASSIGNED && brg_tbl[i].addr2 == addr2)) {
+				memset(&brg_tbl[i], 0, sizeof(brg_tbl[i]));
+				store = true;
 			}
 		}
 	}
 
-	if (first_removed != -1) {
-		/* Compact when all rows have been deleted. */
-		brg_tbl_compact(first_removed);
+	/* Compact when all rows have been deleted. */
+	brg_tbl_compact();
 
-		if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-			atomic_set_bit(brg_cfg_flags, TABLE_UPDATED);
-			bt_mesh_settings_store_schedule(BT_MESH_SETTINGS_BRG_PENDING);
-		}
+	if (IS_ENABLED(CONFIG_BT_SETTINGS) && store) {
+		atomic_set_bit(brg_cfg_flags, TABLE_UPDATED);
+		bt_mesh_settings_store_schedule(BT_MESH_SETTINGS_BRG_PENDING);
 	}
 
 	*status = STATUS_SUCCESS;
diff --git a/tests/bluetooth/mesh/brg/src/main.c b/tests/bluetooth/mesh/brg/src/main.c
index e9ae46fff7f..2b98722e402 100644
--- a/tests/bluetooth/mesh/brg/src/main.c
+++ b/tests/bluetooth/mesh/brg/src/main.c
@@ -218,111 +218,6 @@ ZTEST(bt_mesh_brg_cfg, test_basic_functionality_storage)
 	}
 }
 
-static void check_bt_mesh_brg_cfg_tbl_multiple_delete(int expect_left)
-{
-	uint8_t status;
-	int err;
-	int n;
-	const struct bt_mesh_brg_cfg_row *brg_tbl;
-
-	n = bt_mesh_brg_cfg_tbl_get(&brg_tbl);
-	zassert_equal(n, TEST_VECT_SZ - 1);
-
-	ztest_expect_value(bt_mesh_settings_store_schedule, flag, BT_MESH_SETTINGS_BRG_PENDING);
-	err = bt_mesh_brg_cfg_tbl_remove(test_vector[1].net_idx1, test_vector[1].net_idx2,
-					 test_vector[1].addr1, BT_MESH_ADDR_UNASSIGNED, &status);
-	zassert_equal(err, 0);
-
-	n = bt_mesh_brg_cfg_tbl_get(&brg_tbl);
-	zassert_equal(n, expect_left);
-
-	for (int i = 0; i < n; i++) {
-		zassert_true(brg_tbl[i].net_idx1 == test_vector[0].net_idx1);
-		zassert_true(brg_tbl[i].net_idx2 == test_vector[0].net_idx2);
-		zassert_true(brg_tbl[i].addr1 == test_vector[0].addr1);
-		zassert_true(brg_tbl[i].addr2 == test_vector[i * 2].addr2);
-	}
-}
-
-ZTEST(bt_mesh_brg_cfg, test_removal_multiple_entries)
-{
-	check_bt_mesh_brg_cfg_tbl_reset();
-
-	uint8_t status;
-	int err;
-
-	/* Test removal of every second entry */
-	for (int i = 0; i < TEST_VECT_SZ - 1; i++) {
-		ztest_expect_value(bt_mesh_settings_store_schedule, flag,
-				   BT_MESH_SETTINGS_BRG_PENDING);
-		err = bt_mesh_brg_cfg_tbl_add(test_vector[i].direction, test_vector[i % 2].net_idx1,
-					      test_vector[i % 2].net_idx2, test_vector[i % 2].addr1,
-					      test_vector[i].addr2, &status);
-		zassert_equal(err, 0);
-		zassert_equal(status, STATUS_SUCCESS);
-	}
-
-	check_bt_mesh_brg_cfg_tbl_multiple_delete((TEST_VECT_SZ - 1) / 2);
-	check_bt_mesh_brg_cfg_tbl_reset();
-
-	/* Test removal of all entries, except first */
-	for (int i = 0; i < TEST_VECT_SZ - 1; i++) {
-		ztest_expect_value(bt_mesh_settings_store_schedule, flag,
-				   BT_MESH_SETTINGS_BRG_PENDING);
-		if (i == 0) {
-			err = bt_mesh_brg_cfg_tbl_add(test_vector[i].direction,
-						      test_vector[i].net_idx1,
-						      test_vector[i].net_idx2, test_vector[i].addr1,
-						      test_vector[i].addr2, &status);
-		} else {
-			err = bt_mesh_brg_cfg_tbl_add(test_vector[i].direction,
-						      test_vector[1].net_idx1,
-						      test_vector[1].net_idx2, test_vector[1].addr1,
-						      test_vector[i].addr2, &status);
-		}
-		zassert_equal(err, 0);
-		zassert_equal(status, STATUS_SUCCESS);
-	}
-
-	check_bt_mesh_brg_cfg_tbl_multiple_delete(1);
-	check_bt_mesh_brg_cfg_tbl_reset();
-
-	/* Test removal of all entries, except last */
-	for (int i = TEST_VECT_SZ - 2; i >= 0; i--) {
-		ztest_expect_value(bt_mesh_settings_store_schedule, flag,
-				   BT_MESH_SETTINGS_BRG_PENDING);
-		if (i == 0) {
-			err = bt_mesh_brg_cfg_tbl_add(test_vector[i].direction,
-						      test_vector[i].net_idx1,
-						      test_vector[i].net_idx2, test_vector[i].addr1,
-						      test_vector[i].addr2, &status);
-		} else {
-			err = bt_mesh_brg_cfg_tbl_add(test_vector[i].direction,
-						      test_vector[1].net_idx1,
-						      test_vector[1].net_idx2, test_vector[1].addr1,
-						      test_vector[i].addr2, &status);
-		}
-		zassert_equal(err, 0);
-		zassert_equal(status, STATUS_SUCCESS);
-	}
-
-	check_bt_mesh_brg_cfg_tbl_multiple_delete(1);
-	check_bt_mesh_brg_cfg_tbl_reset();
-
-	/* Test removal of all entries */
-	for (int i = 0; i < TEST_VECT_SZ - 1; i++) {
-		ztest_expect_value(bt_mesh_settings_store_schedule, flag,
-				   BT_MESH_SETTINGS_BRG_PENDING);
-		err = bt_mesh_brg_cfg_tbl_add(test_vector[i].direction, test_vector[1].net_idx1,
-					      test_vector[1].net_idx2, test_vector[1].addr1,
-					      test_vector[i].addr2, &status);
-		zassert_equal(err, 0);
-		zassert_equal(status, STATUS_SUCCESS);
-	}
-
-	check_bt_mesh_brg_cfg_tbl_multiple_delete(0);
-}
-
 static void pending_store_enable_create_expectations(bool *enable_val)
 {
 	if (*enable_val) {

From f2d2a0cdee5e1093b3afcff547a7e50db2236b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:57 +0100
Subject: [PATCH 1862/2913] Revert "[nrf fromtree] Bluetooth: Mesh: Remove
 duplicate brg declaration"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1087efe401c12cec15a1aa2314ae65445f176912.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/mesh/brg_cfg.h |  4 ++--
 subsys/bluetooth/mesh/brg_cfg.c         |  4 ++--
 subsys/bluetooth/mesh/brg_cfg.h         | 15 +++++++++++++--
 tests/bluetooth/mesh/brg/src/main.c     |  5 -----
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/include/zephyr/bluetooth/mesh/brg_cfg.h b/include/zephyr/bluetooth/mesh/brg_cfg.h
index 754ecc9e3e4..a488fed09c5 100644
--- a/include/zephyr/bluetooth/mesh/brg_cfg.h
+++ b/include/zephyr/bluetooth/mesh/brg_cfg.h
@@ -28,9 +28,9 @@ enum bt_mesh_brg_cfg_state {
 	BT_MESH_BRG_CFG_ENABLED,
 };
 
-/* Bridging from Addr1 to Addr2. */
+/* Briding from Addr1 to Addr2. */
 #define BT_MESH_BRG_CFG_DIR_ONEWAY 1
-/* Bidirectional bridging between Addr1 and Addr2. */
+/* Bidirectional briging between Addr1 and Addr2. */
 #define BT_MESH_BRG_CFG_DIR_TWOWAY 2
 
 /** Bridging Table state entry corresponding to a entry in the Bridging Table. */
diff --git a/subsys/bluetooth/mesh/brg_cfg.c b/subsys/bluetooth/mesh/brg_cfg.c
index 112d2fe0a3e..9c90773faef 100644
--- a/subsys/bluetooth/mesh/brg_cfg.c
+++ b/subsys/bluetooth/mesh/brg_cfg.c
@@ -224,8 +224,8 @@ static bool netkey_check(uint16_t net_idx1, uint16_t net_idx2)
 	return bt_mesh_subnet_get(net_idx1) && bt_mesh_subnet_get(net_idx2);
 }
 
-int bt_mesh_brg_cfg_tbl_add(uint8_t direction, uint16_t net_idx1, uint16_t net_idx2, uint16_t addr1,
-			    uint16_t addr2, uint8_t *status)
+int bt_mesh_brg_cfg_tbl_add(enum bt_mesh_brg_cfg_dir direction, uint16_t net_idx1,
+			    uint16_t net_idx2, uint16_t addr1, uint16_t addr2, uint8_t *status)
 {
 	/* Sanity checks */
 	if (!BT_MESH_ADDR_IS_UNICAST(addr1) || net_idx1 == net_idx2 || addr1 == addr2 ||
diff --git a/subsys/bluetooth/mesh/brg_cfg.h b/subsys/bluetooth/mesh/brg_cfg.h
index 4deddd05c1b..af8cc5adc0f 100644
--- a/subsys/bluetooth/mesh/brg_cfg.h
+++ b/subsys/bluetooth/mesh/brg_cfg.h
@@ -13,6 +13,17 @@
 
 #define BT_MESH_BRG_CFG_NKEY_PRHB_FLT_MASK 0x000C
 
+enum bt_mesh_brg_cfg_dir {
+	/* Value is prohibited. */
+	BT_MESH_BRG_CFG_DIR_PROHIBITED = 0,
+	/* Briging from Addr1 to Addr2. */
+	BT_MESH_BRG_CFG_DIR_ONEWAY = 1,
+	/* Briging to/from Addr1 from/to Addr2. */
+	BT_MESH_BRG_CFG_DIR_TWOWAY = 2,
+	/* Values above these are prohibited. */
+	BT_MESH_BRG_CFG_DIR_MAX = 3,
+};
+
 #define BT_MESH_BRG_CFG_NETIDX_NOMATCH 0xFFFF
 
 /* One row of the bridging table */
@@ -39,8 +50,8 @@ int bt_mesh_brg_cfg_tbl_reset(void);
 
 int bt_mesh_brg_cfg_tbl_get(const struct bt_mesh_brg_cfg_row **rows);
 
-int bt_mesh_brg_cfg_tbl_add(uint8_t direction, uint16_t net_idx1, uint16_t net_idx2, uint16_t addr1,
-			    uint16_t addr2, uint8_t *status);
+int bt_mesh_brg_cfg_tbl_add(enum bt_mesh_brg_cfg_dir direction, uint16_t net_idx1,
+			    uint16_t net_idx2, uint16_t addr1, uint16_t addr2, uint8_t *status);
 
 int bt_mesh_brg_cfg_tbl_remove(uint16_t net_idx1, uint16_t net_idx2, uint16_t addr1, uint16_t addr2,
 			       uint8_t *status);
diff --git a/tests/bluetooth/mesh/brg/src/main.c b/tests/bluetooth/mesh/brg/src/main.c
index 2b98722e402..65cf5424012 100644
--- a/tests/bluetooth/mesh/brg/src/main.c
+++ b/tests/bluetooth/mesh/brg/src/main.c
@@ -293,11 +293,6 @@ ZTEST(bt_mesh_brg_cfg, test_brg_tbl_pending_store)
 	bt_mesh_brg_cfg_pending_store();
 }
 
-/* Value is prohibited. */
-#define BT_MESH_BRG_CFG_DIR_PROHIBITED 0
-/* Values above and including this is prohibited. */
-#define BT_MESH_BRG_CFG_DIR_MAX 3
-
 /* Test if invalid entries are not added to the table. */
 ZTEST(bt_mesh_brg_cfg, test_tbl_add_invalid_ip)
 {

From dad303414210b173cb3000edca70b3fffb9da37d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:57 +0100
Subject: [PATCH 1863/2913] Revert "[nrf fromtree] Bluetooth: Mesh: Add prefix
 to Subnet Bridge API"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit bf70215e395edab94716e006f30f09add2b89f00.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../bluetooth/api/mesh/brg_cfg.rst            |  15 +-
 include/zephyr/bluetooth/mesh/brg_cfg.h       |  24 ++--
 include/zephyr/bluetooth/mesh/brg_cfg_cli.h   |  76 ++++++-----
 subsys/bluetooth/mesh/brg_cfg_cli.c           | 102 +++++++-------
 subsys/bluetooth/mesh/brg_cfg_srv.c           |  10 +-
 subsys/bluetooth/mesh/shell/brg_cfg.c         |  58 ++++----
 tests/bluetooth/tester/src/btp_mesh.c         |  35 ++---
 tests/bsim/bluetooth/mesh/src/test_brg.c      | 129 +++++++++---------
 8 files changed, 234 insertions(+), 215 deletions(-)

diff --git a/doc/connectivity/bluetooth/api/mesh/brg_cfg.rst b/doc/connectivity/bluetooth/api/mesh/brg_cfg.rst
index d6e7462c546..b118116f620 100644
--- a/doc/connectivity/bluetooth/api/mesh/brg_cfg.rst
+++ b/doc/connectivity/bluetooth/api/mesh/brg_cfg.rst
@@ -69,15 +69,15 @@ Enabling or disabling the Subnet Bridge feature
 
 The Bridge Configuration Client (or Configuration Manager) can enable or disable the Subnet Bridge
 feature on a node by sending a **Subnet Bridge Set** message to the Bridge Configuration
-Server model on the target node, using the :c:func:`bt_mesh_brg_cfg_cli_set` function.
+Server model on the target node, using the :c:func:`bt_mesh_brg_cfg_cli_subnet_bridge_set` function.
 
 Adding or removing subnets
 **************************
 
 The Bridge Configuration Client can add or remove an entry from the Bridging Table by sending a
 **Bridging Table Add** or **Bridging Table Remove** message to the Bridge Configuration
-Server model on the target node, calling the :c:func:`bt_mesh_brg_cfg_cli_table_add` or
-:c:func:`bt_mesh_brg_cfg_cli_table_remove` functions.
+Server model on the target node, calling the :c:func:`bt_mesh_brg_cfg_cli_bridging_table_add` or
+:c:func:`bt_mesh_brg_cfg_cli_bridging_table_remove` functions.
 
 .. _bluetooth_mesh_brg_cfg_states:
 
@@ -89,19 +89,20 @@ The Subnet Bridge has the following states:
 - *Subnet Bridge*: This state indicates whether the Subnet Bridge feature is enabled or disabled on
   the node.
   The Bridge Configuration Client can retrieve this information by sending a **Subnet Bridge Get**
-  message to the Bridge Configuration Server using the :c:func:`bt_mesh_brg_cfg_cli_get` function.
+  message to the Bridge Configuration Server using the
+  :c:func:`bt_mesh_brg_cfg_cli_subnet_bridge_get` function.
 
 - *Bridging Table*: This state holds the bridging table. The Client can request a list of
   entries from a Bridging Table by sending a **Bridging Table Get** message to the target node using
-  the :c:func:`bt_mesh_brg_cfg_cli_table_get` function.
+  the :c:func:`bt_mesh_brg_cfg_cli_bridging_table_get` function.
 
   The Client can get a list of subnets currently bridged by a Subnet Bridge by sending a
   **Bridged Subnets Get** message to the target Server by calling the
-  :c:func:`bt_mesh_brg_cfg_cli_subnets_get` function.
+  :c:func:`bt_mesh_brg_cfg_cli_bridged_subnets_get` function.
 
 - *Bridging Table Size*: This state reports the maximum number of entries the Bridging Table can
   store. The Client can retrieve this information by sending a **Bridging Table Size Get** message
-  using the :c:func:`bt_mesh_brg_cfg_cli_table_size_get` function.
+  using the :c:func:`bt_mesh_brg_cfg_cli_bridging_table_size_get` function.
   This is a read-only state.
 
 Subnet bridging and replay protection
diff --git a/include/zephyr/bluetooth/mesh/brg_cfg.h b/include/zephyr/bluetooth/mesh/brg_cfg.h
index a488fed09c5..906a2e0bb38 100644
--- a/include/zephyr/bluetooth/mesh/brg_cfg.h
+++ b/include/zephyr/bluetooth/mesh/brg_cfg.h
@@ -21,20 +21,20 @@ extern "C" {
  */
 
 /** Subnet Bridge states */
-enum bt_mesh_brg_cfg_state {
+enum bt_mesh_subnet_bridge_state {
 	/** Subnet bridge functionality is disabled. */
-	BT_MESH_BRG_CFG_DISABLED,
+	BT_MESH_SUBNET_BRIDGE_DISABLED,
 	/** Subnet bridge state functionality is enabled. */
-	BT_MESH_BRG_CFG_ENABLED,
+	BT_MESH_SUBNET_BRIDGE_ENABLED,
 };
 
 /* Briding from Addr1 to Addr2. */
-#define BT_MESH_BRG_CFG_DIR_ONEWAY 1
+#define BT_MESH_SUBNET_BRIDGE_DIR_ONEWAY 1
 /* Bidirectional briging between Addr1 and Addr2. */
-#define BT_MESH_BRG_CFG_DIR_TWOWAY 2
+#define BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY 2
 
 /** Bridging Table state entry corresponding to a entry in the Bridging Table. */
-struct bt_mesh_brg_cfg_table_entry {
+struct bt_mesh_bridging_table_entry {
 	/** Allowed directions for the bridged traffic (or bridged traffic not allowed) */
 	uint8_t directions;
 	/** NetKey Index of the first subnet */
@@ -48,24 +48,24 @@ struct bt_mesh_brg_cfg_table_entry {
 };
 
 /** Bridging Table Status response */
-struct bt_mesh_brg_cfg_table_status {
+struct bt_mesh_bridging_table_status {
 	/** Status Code of the requesting message */
 	uint8_t status;
 	/** Requested Bridging Table entry */
-	struct bt_mesh_brg_cfg_table_entry entry;
+	struct bt_mesh_bridging_table_entry entry;
 };
 
 /** Used to filter set of pairs of NetKey Indexes from the Bridging Table */
-struct bt_mesh_brg_cfg_filter_netkey {
+struct bt_mesh_filter_netkey {
 	uint16_t filter: 2,    /* Filter applied to the set of pairs of NetKey Indexes */
 		prohibited: 2, /* Prohibited */
 		net_idx: 12;   /* NetKey Index used for filtering or ignored */
 };
 
 /** Bridged Subnets List response */
-struct bt_mesh_brg_cfg_subnets_list {
+struct bt_mesh_bridged_subnets_list {
 	/** Filter applied NetKey Indexes, and NetKey Index used for filtering. */
-	struct bt_mesh_brg_cfg_filter_netkey net_idx_filter;
+	struct bt_mesh_filter_netkey net_idx_filter;
 	/** Start offset in units of bridges */
 	uint8_t start_idx;
 	/** Pointer to allocated buffer for storing filtered of NetKey Indexes */
@@ -73,7 +73,7 @@ struct bt_mesh_brg_cfg_subnets_list {
 };
 
 /** Bridging Table List response */
-struct bt_mesh_brg_cfg_table_list {
+struct bt_mesh_bridging_table_list {
 	/** Status Code of the requesting message */
 	uint8_t status;
 	/** NetKey Index of the first subnet */
diff --git a/include/zephyr/bluetooth/mesh/brg_cfg_cli.h b/include/zephyr/bluetooth/mesh/brg_cfg_cli.h
index 37666ac6dcd..c29650a5df9 100644
--- a/include/zephyr/bluetooth/mesh/brg_cfg_cli.h
+++ b/include/zephyr/bluetooth/mesh/brg_cfg_cli.h
@@ -42,8 +42,8 @@ struct bt_mesh_brg_cfg_cli_cb {
 	 *  @param addr     Address of the sender.
 	 *  @param status   Status received from the server.
 	 */
-	void (*bridge_status)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr,
-			      enum bt_mesh_brg_cfg_state status);
+	void (*subnet_bridge_status)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr,
+				     enum bt_mesh_subnet_bridge_state status);
 
 	/** @brief Optional callback for Bridging Table Size Status message.
 	 *
@@ -54,7 +54,8 @@ struct bt_mesh_brg_cfg_cli_cb {
 	 *  @param addr     Address of the sender.
 	 *  @param size     Size received from the server.
 	 */
-	void (*table_size_status)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr, uint16_t size);
+	void (*bridging_table_size_status)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr,
+					   uint16_t size);
 
 	/** @brief Optional callback for Bridging Table Status message.
 	 *
@@ -65,8 +66,8 @@ struct bt_mesh_brg_cfg_cli_cb {
 	 *  @param addr     Address of the sender.
 	 *  @param rsp      Response received from the Bridging Configuration Server.
 	 */
-	void (*table_status)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr,
-			     struct bt_mesh_brg_cfg_table_status *rsp);
+	void (*bridging_table_status)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr,
+				      struct bt_mesh_bridging_table_status *rsp);
 
 	/** @brief Optional callback for Bridged Subnets List message.
 	 *
@@ -77,8 +78,8 @@ struct bt_mesh_brg_cfg_cli_cb {
 	 *  @param addr     Address of the sender.
 	 *  @param rsp      Response received from the Bridging Configuration Server.
 	 */
-	void (*subnets_list)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr,
-			     struct bt_mesh_brg_cfg_subnets_list *rsp);
+	void (*bridged_subnets_list)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr,
+				     struct bt_mesh_bridged_subnets_list *rsp);
 
 	/** @brief Optional callback for Bridging Table List message.
 	 *
@@ -89,8 +90,8 @@ struct bt_mesh_brg_cfg_cli_cb {
 	 *  @param addr     Address of the sender.
 	 *  @param rsp      Response received from the Bridging Configuration Server.
 	 */
-	void (*table_list)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr,
-			   struct bt_mesh_brg_cfg_table_list *rsp);
+	void (*bridging_table_list)(struct bt_mesh_brg_cfg_cli *cli, uint16_t addr,
+				    struct bt_mesh_bridging_table_list *rsp);
 };
 
 /** Bridge Configuration Client Model Context */
@@ -120,12 +121,13 @@ struct bt_mesh_brg_cfg_cli {
  *  @param net_idx Network index to encrypt the message with.
  *  @param addr    Target node address.
  *  @param status  Status response parameter, returns one of
- *                 @ref BT_MESH_BRG_CFG_DISABLED or
- *                 @ref BT_MESH_BRG_CFG_ENABLED on success.
+ *                 @ref BT_MESH_SUBNET_BRIDGE_DISABLED or
+ *                 @ref BT_MESH_SUBNET_BRIDGE_ENABLED on success.
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_brg_cfg_cli_get(uint16_t net_idx, uint16_t addr, enum bt_mesh_brg_cfg_state *status);
+int bt_mesh_brg_cfg_cli_subnet_bridge_get(uint16_t net_idx, uint16_t addr,
+					  enum bt_mesh_subnet_bridge_state *status);
 
 /** @brief Sends a Subnet Bridge Set message to the given destination address
  *  with the given parameters
@@ -143,16 +145,17 @@ int bt_mesh_brg_cfg_cli_get(uint16_t net_idx, uint16_t addr, enum bt_mesh_brg_cf
  *  @param net_idx Network index to encrypt the message with.
  *  @param addr    Target node address.
  *  @param val     Value to set the Subnet Bridge state to. Must be one of
- *                 @ref BT_MESH_BRG_CFG_DISABLED or
- *                 @ref BT_MESH_BRG_CFG_ENABLED.
+ *                 @ref BT_MESH_SUBNET_BRIDGE_DISABLED or
+ *                 @ref BT_MESH_SUBNET_BRIDGE_ENABLED.
  *  @param status  Status response parameter, returns one of
- *                 @ref BT_MESH_BRG_CFG_DISABLED or
- *                 @ref BT_MESH_BRG_CFG_ENABLED on success.
+ *                 @ref BT_MESH_SUBNET_BRIDGE_DISABLED or
+ *                 @ref BT_MESH_SUBNET_BRIDGE_ENABLED on success.
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_brg_cfg_cli_set(uint16_t net_idx, uint16_t addr, enum bt_mesh_brg_cfg_state val,
-			    enum bt_mesh_brg_cfg_state *status);
+int bt_mesh_brg_cfg_cli_subnet_bridge_set(uint16_t net_idx, uint16_t addr,
+					  enum bt_mesh_subnet_bridge_state val,
+					  enum bt_mesh_subnet_bridge_state *status);
 
 /** @brief Sends a Bridging Table Size Get message to the given destination
  *  address with the given parameters
@@ -173,7 +176,7 @@ int bt_mesh_brg_cfg_cli_set(uint16_t net_idx, uint16_t addr, enum bt_mesh_brg_cf
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_brg_cfg_cli_table_size_get(uint16_t net_idx, uint16_t addr, uint16_t *size);
+int bt_mesh_brg_cfg_cli_bridging_table_size_get(uint16_t net_idx, uint16_t addr, uint16_t *size);
 
 /** @brief Sends a Bridging Table Add message to the given destination address
  *  with the given parameters
@@ -195,9 +198,9 @@ int bt_mesh_brg_cfg_cli_table_size_get(uint16_t net_idx, uint16_t addr, uint16_t
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_brg_cfg_cli_table_add(uint16_t net_idx, uint16_t addr,
-				  struct bt_mesh_brg_cfg_table_entry *entry,
-				  struct bt_mesh_brg_cfg_table_status *rsp);
+int bt_mesh_brg_cfg_cli_bridging_table_add(uint16_t net_idx, uint16_t addr,
+					   struct bt_mesh_bridging_table_entry *entry,
+					   struct bt_mesh_bridging_table_status *rsp);
 
 /** @brief Sends a Bridging Table Remove message to the given destination
  *  address with the given parameters
@@ -223,9 +226,9 @@ int bt_mesh_brg_cfg_cli_table_add(uint16_t net_idx, uint16_t addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_brg_cfg_cli_table_remove(uint16_t net_idx, uint16_t addr, uint16_t net_idx1,
-				     uint16_t net_idx2, uint16_t addr1, uint16_t addr2,
-				     struct bt_mesh_brg_cfg_table_status *rsp);
+int bt_mesh_brg_cfg_cli_bridging_table_remove(uint16_t net_idx, uint16_t addr, uint16_t net_idx1,
+					      uint16_t net_idx2, uint16_t addr1, uint16_t addr2,
+					      struct bt_mesh_bridging_table_status *rsp);
 
 /** @brief Sends a Bridged Subnets Get message to the given destination address
  *  with the given parameters
@@ -241,7 +244,7 @@ int bt_mesh_brg_cfg_cli_table_remove(uint16_t net_idx, uint16_t addr, uint16_t n
  *
  *  When @c rsp is set, the user is responsible for providing a buffer for the
  *  filtered set of N pairs of NetKey Indexes in
- *  @ref bt_mesh_brg_cfg_subnets_list::list. If a buffer is not provided, the
+ *  @ref bt_mesh_bridged_subnets_list::list. If a buffer is not provided, the
  *  bridged subnets won't be copied.
 
  *  @param net_idx          Network index to encrypt the message with.
@@ -253,9 +256,10 @@ int bt_mesh_brg_cfg_cli_table_remove(uint16_t net_idx, uint16_t addr, uint16_t n
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_brg_cfg_cli_subnets_get(uint16_t net_idx, uint16_t addr,
-				    struct bt_mesh_brg_cfg_filter_netkey filter_net_idx,
-				    uint8_t start_idx, struct bt_mesh_brg_cfg_subnets_list *rsp);
+int bt_mesh_brg_cfg_cli_bridged_subnets_get(uint16_t net_idx, uint16_t addr,
+					    struct bt_mesh_filter_netkey filter_net_idx,
+					    uint8_t start_idx,
+					    struct bt_mesh_bridged_subnets_list *rsp);
 
 /** @brief Sends a Bridging Table Get message to the given destination address
  *  with the given parameters
@@ -272,10 +276,10 @@ int bt_mesh_brg_cfg_cli_subnets_get(uint16_t net_idx, uint16_t addr,
  *
  *  When @c rsp is set, the user is responsible for providing a buffer for the
  *   filtered set of N pairs of NetKey Indexes in
- *  @ref bt_mesh_brg_cfg_table_list::list. If a buffer is not provided,
- *  the bridged addresses won't be copied. If a buffer size is shorter than
- *  received list, only those many entries that fit in the buffer will be copied
- *  from the list, and rest will be discarded.
+ *  @ref bt_mesh_bridging_table_list::list. If a buffer is not provided, the
+ *  bridged addresses won't be copied. If a buffer size is shorter than received
+ *  list, only those many entries that fit in the buffer will be copied from the
+ *  list, and rest will be discarded.
  *
  *  @param net_idx   Network index to encrypt the message with.
  *  @param addr      Target node address.
@@ -287,9 +291,9 @@ int bt_mesh_brg_cfg_cli_subnets_get(uint16_t net_idx, uint16_t addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_brg_cfg_cli_table_get(uint16_t net_idx, uint16_t addr, uint16_t net_idx1,
-				  uint16_t net_idx2, uint16_t start_idx,
-				  struct bt_mesh_brg_cfg_table_list *rsp);
+int bt_mesh_brg_cfg_cli_bridging_table_get(uint16_t net_idx, uint16_t addr, uint16_t net_idx1,
+					   uint16_t net_idx2, uint16_t start_idx,
+					   struct bt_mesh_bridging_table_list *rsp);
 
 /** @brief Get the current transmission timeout value.
  *
diff --git a/subsys/bluetooth/mesh/brg_cfg_cli.c b/subsys/bluetooth/mesh/brg_cfg_cli.c
index 3f398408708..229b0b6f892 100644
--- a/subsys/bluetooth/mesh/brg_cfg_cli.c
+++ b/subsys/bluetooth/mesh/brg_cfg_cli.c
@@ -17,11 +17,12 @@ static int32_t msg_timeout;
 
 static struct bt_mesh_brg_cfg_cli *cli;
 
-static int bridge_status(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
-			 struct net_buf_simple *buf)
+static int subnet_bridge_status(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
+				struct net_buf_simple *buf)
 {
-	enum bt_mesh_brg_cfg_state status = (enum bt_mesh_brg_cfg_state)net_buf_simple_pull_u8(buf);
-	enum bt_mesh_brg_cfg_state *rsp;
+	enum bt_mesh_subnet_bridge_state status =
+		(enum bt_mesh_subnet_bridge_state)net_buf_simple_pull_u8(buf);
+	enum bt_mesh_subnet_bridge_state *rsp;
 
 	if (bt_mesh_msg_ack_ctx_match(&cli->ack_ctx, OP_SUBNET_BRIDGE_STATUS, ctx->addr,
 				      (void **)&rsp)) {
@@ -29,17 +30,17 @@ static int bridge_status(const struct bt_mesh_model *model, struct bt_mesh_msg_c
 		bt_mesh_msg_ack_ctx_rx(&cli->ack_ctx);
 	}
 
-	if (cli->cb && cli->cb->bridge_status) {
-		cli->cb->bridge_status(cli, ctx->addr, status);
+	if (cli->cb && cli->cb->subnet_bridge_status) {
+		cli->cb->subnet_bridge_status(cli, ctx->addr, status);
 	}
 	return 0;
 }
 
-static int table_status(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
-			struct net_buf_simple *buf)
+static int bridging_table_status(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
+				 struct net_buf_simple *buf)
 {
-	struct bt_mesh_brg_cfg_table_status table_status;
-	struct bt_mesh_brg_cfg_table_status *rsp;
+	struct bt_mesh_bridging_table_status table_status;
+	struct bt_mesh_bridging_table_status *rsp;
 
 	table_status.status = net_buf_simple_pull_u8(buf);
 	table_status.entry.directions = net_buf_simple_pull_u8(buf);
@@ -62,17 +63,17 @@ static int table_status(const struct bt_mesh_model *model, struct bt_mesh_msg_ct
 		bt_mesh_msg_ack_ctx_rx(&cli->ack_ctx);
 	}
 
-	if (cli->cb && cli->cb->table_status) {
-		cli->cb->table_status(cli, ctx->addr, &table_status);
+	if (cli->cb && cli->cb->bridging_table_status) {
+		cli->cb->bridging_table_status(cli, ctx->addr, &table_status);
 	}
 	return 0;
 }
 
-static int subnets_list(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
-			struct net_buf_simple *buf)
+static int bridged_subnets_list(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
+				struct net_buf_simple *buf)
 {
-	struct bt_mesh_brg_cfg_subnets_list subnets_list;
-	struct bt_mesh_brg_cfg_subnets_list *rsp;
+	struct bt_mesh_bridged_subnets_list subnets_list;
+	struct bt_mesh_bridged_subnets_list *rsp;
 	uint16_t net_idx_filter;
 
 	net_idx_filter = net_buf_simple_pull_le16(buf);
@@ -101,17 +102,17 @@ static int subnets_list(const struct bt_mesh_model *model, struct bt_mesh_msg_ct
 		bt_mesh_msg_ack_ctx_rx(&cli->ack_ctx);
 	}
 
-	if (cli->cb && cli->cb->subnets_list) {
-		cli->cb->subnets_list(cli, ctx->addr, &subnets_list);
+	if (cli->cb && cli->cb->bridged_subnets_list) {
+		cli->cb->bridged_subnets_list(cli, ctx->addr, &subnets_list);
 	}
 	return 0;
 }
 
-static int table_list(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
-		      struct net_buf_simple *buf)
+static int bridging_table_list(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
+			       struct net_buf_simple *buf)
 {
-	struct bt_mesh_brg_cfg_table_list table_list;
-	struct bt_mesh_brg_cfg_table_list *rsp;
+	struct bt_mesh_bridging_table_list table_list;
+	struct bt_mesh_bridging_table_list *rsp;
 
 	table_list.status = net_buf_simple_pull_u8(buf);
 	key_idx_unpack_pair(buf, &table_list.net_idx1, &table_list.net_idx2);
@@ -140,14 +141,14 @@ static int table_list(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx
 		bt_mesh_msg_ack_ctx_rx(&cli->ack_ctx);
 	}
 
-	if (cli->cb && cli->cb->table_list) {
-		cli->cb->table_list(cli, ctx->addr, &table_list);
+	if (cli->cb && cli->cb->bridging_table_list) {
+		cli->cb->bridging_table_list(cli, ctx->addr, &table_list);
 	}
 	return 0;
 }
 
-static int table_size_status(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
-			     struct net_buf_simple *buf)
+static int bridging_table_size_status(const struct bt_mesh_model *model,
+				      struct bt_mesh_msg_ctx *ctx, struct net_buf_simple *buf)
 {
 	uint16_t size = net_buf_simple_pull_le16(buf);
 	uint16_t *rsp;
@@ -158,18 +159,18 @@ static int table_size_status(const struct bt_mesh_model *model, struct bt_mesh_m
 		bt_mesh_msg_ack_ctx_rx(&cli->ack_ctx);
 	}
 
-	if (cli->cb && cli->cb->table_size_status) {
-		cli->cb->table_size_status(cli, ctx->addr, size);
+	if (cli->cb && cli->cb->bridging_table_size_status) {
+		cli->cb->bridging_table_size_status(cli, ctx->addr, size);
 	}
 	return 0;
 }
 
 const struct bt_mesh_model_op _bt_mesh_brg_cfg_cli_op[] = {
-	{OP_SUBNET_BRIDGE_STATUS, BT_MESH_LEN_EXACT(1), bridge_status},
-	{OP_BRIDGING_TABLE_STATUS, BT_MESH_LEN_EXACT(9), table_status},
-	{OP_BRIDGED_SUBNETS_LIST, BT_MESH_LEN_MIN(3), subnets_list},
-	{OP_BRIDGING_TABLE_LIST, BT_MESH_LEN_MIN(6), table_list},
-	{OP_BRIDGING_TABLE_SIZE_STATUS, BT_MESH_LEN_EXACT(2), table_size_status},
+	{OP_SUBNET_BRIDGE_STATUS, BT_MESH_LEN_EXACT(1), subnet_bridge_status},
+	{OP_BRIDGING_TABLE_STATUS, BT_MESH_LEN_EXACT(9), bridging_table_status},
+	{OP_BRIDGED_SUBNETS_LIST, BT_MESH_LEN_MIN(3), bridged_subnets_list},
+	{OP_BRIDGING_TABLE_LIST, BT_MESH_LEN_MIN(6), bridging_table_list},
+	{OP_BRIDGING_TABLE_SIZE_STATUS, BT_MESH_LEN_EXACT(2), bridging_table_size_status},
 	BT_MESH_MODEL_OP_END,
 };
 
@@ -201,7 +202,8 @@ const struct bt_mesh_model_cb _bt_mesh_brg_cfg_cli_cb = {
 	.init = brg_cfg_cli_init,
 };
 
-int bt_mesh_brg_cfg_cli_get(uint16_t net_idx, uint16_t addr, enum bt_mesh_brg_cfg_state *status)
+int bt_mesh_brg_cfg_cli_subnet_bridge_get(uint16_t net_idx, uint16_t addr,
+					  enum bt_mesh_subnet_bridge_state *status)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_SUBNET_BRIDGE_GET, 0);
 	struct bt_mesh_msg_ctx ctx = BT_MESH_MSG_CTX_INIT_DEV(net_idx, addr);
@@ -217,8 +219,9 @@ int bt_mesh_brg_cfg_cli_get(uint16_t net_idx, uint16_t addr, enum bt_mesh_brg_cf
 	return bt_mesh_msg_ackd_send(cli->model, &ctx, &msg, !status ? NULL : &rsp_ctx);
 }
 
-int bt_mesh_brg_cfg_cli_set(uint16_t net_idx, uint16_t addr, enum bt_mesh_brg_cfg_state val,
-			    enum bt_mesh_brg_cfg_state *status)
+int bt_mesh_brg_cfg_cli_subnet_bridge_set(uint16_t net_idx, uint16_t addr,
+					  enum bt_mesh_subnet_bridge_state val,
+					  enum bt_mesh_subnet_bridge_state *status)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_SUBNET_BRIDGE_SET, 1);
 	struct bt_mesh_msg_ctx ctx = BT_MESH_MSG_CTX_INIT_DEV(net_idx, addr);
@@ -235,7 +238,7 @@ int bt_mesh_brg_cfg_cli_set(uint16_t net_idx, uint16_t addr, enum bt_mesh_brg_cf
 	return bt_mesh_msg_ackd_send(cli->model, &ctx, &msg, !status ? NULL : &rsp_ctx);
 }
 
-int bt_mesh_brg_cfg_cli_table_size_get(uint16_t net_idx, uint16_t addr, uint16_t *size)
+int bt_mesh_brg_cfg_cli_bridging_table_size_get(uint16_t net_idx, uint16_t addr, uint16_t *size)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_BRIDGING_TABLE_SIZE_GET, 0);
 	struct bt_mesh_msg_ctx ctx = BT_MESH_MSG_CTX_INIT_DEV(net_idx, addr);
@@ -251,9 +254,9 @@ int bt_mesh_brg_cfg_cli_table_size_get(uint16_t net_idx, uint16_t addr, uint16_t
 	return bt_mesh_msg_ackd_send(cli->model, &ctx, &msg, !size ? NULL : &rsp_ctx);
 }
 
-int bt_mesh_brg_cfg_cli_table_add(uint16_t net_idx, uint16_t addr,
-				  struct bt_mesh_brg_cfg_table_entry *entry,
-				  struct bt_mesh_brg_cfg_table_status *rsp)
+int bt_mesh_brg_cfg_cli_bridging_table_add(uint16_t net_idx, uint16_t addr,
+					   struct bt_mesh_bridging_table_entry *entry,
+					   struct bt_mesh_bridging_table_status *rsp)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_BRIDGING_TABLE_ADD, 8);
 	struct bt_mesh_msg_ctx ctx = BT_MESH_MSG_CTX_INIT_DEV(net_idx, addr);
@@ -289,9 +292,9 @@ int bt_mesh_brg_cfg_cli_table_add(uint16_t net_idx, uint16_t addr,
 	return bt_mesh_msg_ackd_send(cli->model, &ctx, &msg, !rsp ? NULL : &rsp_ctx);
 }
 
-int bt_mesh_brg_cfg_cli_table_remove(uint16_t net_idx, uint16_t addr, uint16_t net_idx1,
-				     uint16_t net_idx2, uint16_t addr1, uint16_t addr2,
-				     struct bt_mesh_brg_cfg_table_status *rsp)
+int bt_mesh_brg_cfg_cli_bridging_table_remove(uint16_t net_idx, uint16_t addr, uint16_t net_idx1,
+					      uint16_t net_idx2, uint16_t addr1, uint16_t addr2,
+					      struct bt_mesh_bridging_table_status *rsp)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_BRIDGING_TABLE_REMOVE, 7);
 	struct bt_mesh_msg_ctx ctx = BT_MESH_MSG_CTX_INIT_DEV(net_idx, addr);
@@ -318,9 +321,10 @@ int bt_mesh_brg_cfg_cli_table_remove(uint16_t net_idx, uint16_t addr, uint16_t n
 	return bt_mesh_msg_ackd_send(cli->model, &ctx, &msg, !rsp ? NULL : &rsp_ctx);
 }
 
-int bt_mesh_brg_cfg_cli_subnets_get(uint16_t net_idx, uint16_t addr,
-				    struct bt_mesh_brg_cfg_filter_netkey filter_net_idx,
-				    uint8_t start_idx, struct bt_mesh_brg_cfg_subnets_list *rsp)
+int bt_mesh_brg_cfg_cli_bridged_subnets_get(uint16_t net_idx, uint16_t addr,
+					    struct bt_mesh_filter_netkey filter_net_idx,
+					    uint8_t start_idx,
+					    struct bt_mesh_bridged_subnets_list *rsp)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_BRIDGED_SUBNETS_GET, 3);
 	struct bt_mesh_msg_ctx ctx = BT_MESH_MSG_CTX_INIT_DEV(net_idx, addr);
@@ -338,9 +342,9 @@ int bt_mesh_brg_cfg_cli_subnets_get(uint16_t net_idx, uint16_t addr,
 	return bt_mesh_msg_ackd_send(cli->model, &ctx, &msg, !rsp ? NULL : &rsp_ctx);
 }
 
-int bt_mesh_brg_cfg_cli_table_get(uint16_t net_idx, uint16_t addr, uint16_t net_idx1,
-				  uint16_t net_idx2, uint16_t start_idx,
-				  struct bt_mesh_brg_cfg_table_list *rsp)
+int bt_mesh_brg_cfg_cli_bridging_table_get(uint16_t net_idx, uint16_t addr, uint16_t net_idx1,
+					   uint16_t net_idx2, uint16_t start_idx,
+					   struct bt_mesh_bridging_table_list *rsp)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_BRIDGING_TABLE_GET, 5);
 	struct bt_mesh_msg_ctx ctx = BT_MESH_MSG_CTX_INIT_DEV(net_idx, addr);
diff --git a/subsys/bluetooth/mesh/brg_cfg_srv.c b/subsys/bluetooth/mesh/brg_cfg_srv.c
index d622ebf48a2..7492caf3771 100644
--- a/subsys/bluetooth/mesh/brg_cfg_srv.c
+++ b/subsys/bluetooth/mesh/brg_cfg_srv.c
@@ -40,7 +40,7 @@ static int subnet_bridge_set(const struct bt_mesh_model *model, struct bt_mesh_m
 {
 	uint8_t enable = net_buf_simple_pull_u8(buf);
 
-	if (enable > BT_MESH_BRG_CFG_ENABLED) {
+	if (enable > BT_MESH_SUBNET_BRIDGE_ENABLED) {
 		return -EINVAL;
 	}
 
@@ -52,7 +52,7 @@ static int subnet_bridge_set(const struct bt_mesh_model *model, struct bt_mesh_m
 
 static void bridging_table_status_send(const struct bt_mesh_model *model,
 				       struct bt_mesh_msg_ctx *ctx, uint8_t status,
-				       struct bt_mesh_brg_cfg_table_entry *entry)
+				       struct bt_mesh_bridging_table_entry *entry)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_BRIDGING_TABLE_STATUS, 9);
 
@@ -76,7 +76,7 @@ static bool netkey_check(uint16_t net_idx1, uint16_t net_idx2)
 static int bridging_table_add(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
 			      struct net_buf_simple *buf)
 {
-	struct bt_mesh_brg_cfg_table_entry entry;
+	struct bt_mesh_bridging_table_entry entry;
 	uint8_t status = STATUS_SUCCESS;
 	int err;
 
@@ -99,7 +99,7 @@ static int bridging_table_add(const struct bt_mesh_model *model, struct bt_mesh_
 static int bridging_table_remove(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
 				 struct net_buf_simple *buf)
 {
-	struct bt_mesh_brg_cfg_table_entry entry;
+	struct bt_mesh_bridging_table_entry entry;
 	uint8_t status = STATUS_SUCCESS;
 	int err;
 
@@ -135,7 +135,7 @@ static int bridged_subnets_get(const struct bt_mesh_model *model, struct bt_mesh
 		return -EINVAL;
 	}
 
-	struct bt_mesh_brg_cfg_filter_netkey filter_net_idx;
+	struct bt_mesh_filter_netkey filter_net_idx;
 
 	filter_net_idx.filter = net_idx_filter & BIT_MASK(2);
 	filter_net_idx.net_idx = (net_idx_filter >> 4) & BIT_MASK(12);
diff --git a/subsys/bluetooth/mesh/shell/brg_cfg.c b/subsys/bluetooth/mesh/shell/brg_cfg.c
index cefaaa47035..43ab3e0b157 100644
--- a/subsys/bluetooth/mesh/shell/brg_cfg.c
+++ b/subsys/bluetooth/mesh/shell/brg_cfg.c
@@ -14,43 +14,43 @@
 
 static int cmd_subnet_bridge_get(const struct shell *sh, size_t argc, char *argv[])
 {
-	enum bt_mesh_brg_cfg_state rsp;
+	enum bt_mesh_subnet_bridge_state rsp;
 	int err;
 
-	err = bt_mesh_brg_cfg_cli_get(bt_mesh_shell_target_ctx.net_idx,
-				      bt_mesh_shell_target_ctx.dst, &rsp);
+	err = bt_mesh_brg_cfg_cli_subnet_bridge_get(bt_mesh_shell_target_ctx.net_idx,
+						    bt_mesh_shell_target_ctx.dst, &rsp);
 	if (err) {
 		shell_error(sh, "Failed to send Subnet Bridge Get (err %d)", err);
 		return -ENOEXEC;
 	}
 
 	shell_print(sh, "Subnet Bridge State: %s",
-		    (rsp == BT_MESH_BRG_CFG_ENABLED) ? "Enabled" : "Disabled");
+		    (rsp == BT_MESH_SUBNET_BRIDGE_ENABLED) ? "Enabled" : "Disabled");
 	return 0;
 }
 
 static int cmd_subnet_bridge_set(const struct shell *sh, size_t argc, char *argv[])
 {
-	enum bt_mesh_brg_cfg_state set, rsp;
+	enum bt_mesh_subnet_bridge_state set, rsp;
 	int err = 0;
 
-	set = shell_strtobool(argv[1], 0, &err) ? BT_MESH_BRG_CFG_ENABLED
-						: BT_MESH_BRG_CFG_DISABLED;
+	set = shell_strtobool(argv[1], 0, &err) ? BT_MESH_SUBNET_BRIDGE_ENABLED
+						: BT_MESH_SUBNET_BRIDGE_DISABLED;
 
 	if (err) {
 		shell_warn(sh, "Unable to parse input string argument");
 		return err;
 	}
 
-	err = bt_mesh_brg_cfg_cli_set(bt_mesh_shell_target_ctx.net_idx,
-				      bt_mesh_shell_target_ctx.dst, set, &rsp);
+	err = bt_mesh_brg_cfg_cli_subnet_bridge_set(bt_mesh_shell_target_ctx.net_idx,
+						    bt_mesh_shell_target_ctx.dst, set, &rsp);
 	if (err) {
 		shell_error(sh, "Failed to send Subnet Bridge Set (err %d)", err);
 		return -ENOEXEC;
 	}
 
 	shell_print(sh, "Subnet Bridge State: %s",
-		    (rsp == BT_MESH_BRG_CFG_ENABLED) ? "Enabled" : "Disabled");
+		    (rsp == BT_MESH_SUBNET_BRIDGE_ENABLED) ? "Enabled" : "Disabled");
 	return 0;
 }
 
@@ -59,8 +59,8 @@ static int cmd_bridging_table_size_get(const struct shell *sh, size_t argc, char
 	uint16_t rsp;
 	int err;
 
-	err = bt_mesh_brg_cfg_cli_table_size_get(bt_mesh_shell_target_ctx.net_idx,
-						 bt_mesh_shell_target_ctx.dst, &rsp);
+	err = bt_mesh_brg_cfg_cli_bridging_table_size_get(bt_mesh_shell_target_ctx.net_idx,
+							  bt_mesh_shell_target_ctx.dst, &rsp);
 	if (err) {
 		shell_error(sh, "Failed to send Bridging Table Size Get (err %d)", err);
 		return -ENOEXEC;
@@ -72,8 +72,8 @@ static int cmd_bridging_table_size_get(const struct shell *sh, size_t argc, char
 
 static int cmd_bridging_table_add(const struct shell *sh, size_t argc, char *argv[])
 {
-	struct bt_mesh_brg_cfg_table_entry entry;
-	struct bt_mesh_brg_cfg_table_status rsp;
+	struct bt_mesh_bridging_table_entry entry;
+	struct bt_mesh_bridging_table_status rsp;
 	int err = 0;
 
 	entry.directions = shell_strtoul(argv[1], 0, &err);
@@ -86,8 +86,8 @@ static int cmd_bridging_table_add(const struct shell *sh, size_t argc, char *arg
 		return err;
 	}
 
-	err = bt_mesh_brg_cfg_cli_table_add(bt_mesh_shell_target_ctx.net_idx,
-					    bt_mesh_shell_target_ctx.dst, &entry, &rsp);
+	err = bt_mesh_brg_cfg_cli_bridging_table_add(bt_mesh_shell_target_ctx.net_idx,
+						     bt_mesh_shell_target_ctx.dst, &entry, &rsp);
 	if (err) {
 		shell_error(sh, "Failed to send Bridging Table Add (err %d)", err);
 		return -ENOEXEC;
@@ -104,7 +104,7 @@ static int cmd_bridging_table_add(const struct shell *sh, size_t argc, char *arg
 static int cmd_bridging_table_remove(const struct shell *sh, size_t argc, char *argv[])
 {
 	uint16_t net_idx1, net_idx2, addr1, addr2;
-	struct bt_mesh_brg_cfg_table_status rsp;
+	struct bt_mesh_bridging_table_status rsp;
 	int err = 0;
 
 	net_idx1 = shell_strtoul(argv[1], 0, &err);
@@ -116,9 +116,9 @@ static int cmd_bridging_table_remove(const struct shell *sh, size_t argc, char *
 		return err;
 	}
 
-	err = bt_mesh_brg_cfg_cli_table_remove(bt_mesh_shell_target_ctx.net_idx,
-					       bt_mesh_shell_target_ctx.dst, net_idx1, net_idx2,
-					       addr1, addr2, &rsp);
+	err = bt_mesh_brg_cfg_cli_bridging_table_remove(bt_mesh_shell_target_ctx.net_idx,
+							bt_mesh_shell_target_ctx.dst, net_idx1,
+							net_idx2, addr1, addr2, &rsp);
 	if (err) {
 		shell_error(sh, "Failed to send Bridging Table Remove (err %d)", err);
 		return -ENOEXEC;
@@ -134,9 +134,9 @@ static int cmd_bridging_table_remove(const struct shell *sh, size_t argc, char *
 
 static int cmd_bridged_subnets_get(const struct shell *sh, size_t argc, char *argv[])
 {
-	struct bt_mesh_brg_cfg_filter_netkey filter_net_idx;
+	struct bt_mesh_filter_netkey filter_net_idx;
 	uint8_t start_idx;
-	struct bt_mesh_brg_cfg_subnets_list rsp = {
+	struct bt_mesh_bridged_subnets_list rsp = {
 		.list = NET_BUF_SIMPLE(CONFIG_BT_MESH_BRG_TABLE_ITEMS_MAX * 3),
 	};
 	int err = 0;
@@ -151,9 +151,9 @@ static int cmd_bridged_subnets_get(const struct shell *sh, size_t argc, char *ar
 		return err;
 	}
 
-	err = bt_mesh_brg_cfg_cli_subnets_get(bt_mesh_shell_target_ctx.net_idx,
-					      bt_mesh_shell_target_ctx.dst, filter_net_idx,
-					      start_idx, &rsp);
+	err = bt_mesh_brg_cfg_cli_bridged_subnets_get(bt_mesh_shell_target_ctx.net_idx,
+						      bt_mesh_shell_target_ctx.dst, filter_net_idx,
+						      start_idx, &rsp);
 	if (err) {
 		shell_error(sh, "Failed to send Bridged Subnets Get (err %d)", err);
 		return -ENOEXEC;
@@ -180,7 +180,7 @@ static int cmd_bridged_subnets_get(const struct shell *sh, size_t argc, char *ar
 static int cmd_bridging_table_get(const struct shell *sh, size_t argc, char *argv[])
 {
 	uint16_t net_idx1, net_idx2, start_idx;
-	struct bt_mesh_brg_cfg_table_list rsp = {
+	struct bt_mesh_bridging_table_list rsp = {
 		.list = NET_BUF_SIMPLE(CONFIG_BT_MESH_BRG_TABLE_ITEMS_MAX * 5),
 	};
 	int err = 0;
@@ -195,9 +195,9 @@ static int cmd_bridging_table_get(const struct shell *sh, size_t argc, char *arg
 		return err;
 	}
 
-	err = bt_mesh_brg_cfg_cli_table_get(bt_mesh_shell_target_ctx.net_idx,
-					    bt_mesh_shell_target_ctx.dst, net_idx1, net_idx2,
-					    start_idx, &rsp);
+	err = bt_mesh_brg_cfg_cli_bridging_table_get(bt_mesh_shell_target_ctx.net_idx,
+						     bt_mesh_shell_target_ctx.dst, net_idx1,
+						     net_idx2, start_idx, &rsp);
 	if (err) {
 		shell_error(sh, "Failed to send Bridging Table Get (err %d)", err);
 		return -ENOEXEC;
diff --git a/tests/bluetooth/tester/src/btp_mesh.c b/tests/bluetooth/tester/src/btp_mesh.c
index 2830d52556b..efd1d4c3584 100644
--- a/tests/bluetooth/tester/src/btp_mesh.c
+++ b/tests/bluetooth/tester/src/btp_mesh.c
@@ -2086,10 +2086,10 @@ static uint8_t models_metadata_get(const void *cmd, uint16_t cmd_len,
 static uint8_t subnet_bridge_get(const void *cmd, uint16_t cmd_len, void *rsp, uint16_t *rsp_len)
 {
 	const struct btp_mesh_subnet_bridge_get_cmd *cp = cmd;
-	enum bt_mesh_brg_cfg_state state;
+	enum bt_mesh_subnet_bridge_state state;
 	int err;
 
-	err = bt_mesh_brg_cfg_cli_get(net.net_idx, sys_le16_to_cpu(cp->addr), &state);
+	err = bt_mesh_brg_cfg_cli_subnet_bridge_get(net.net_idx, sys_le16_to_cpu(cp->addr), &state);
 	if (err) {
 		LOG_ERR("err=%d", err);
 		return BTP_STATUS_FAILED;
@@ -2103,12 +2103,13 @@ static uint8_t subnet_bridge_get(const void *cmd, uint16_t cmd_len, void *rsp, u
 static uint8_t subnet_bridge_set(const void *cmd, uint16_t cmd_len, void *rsp, uint16_t *rsp_len)
 {
 	const struct btp_mesh_subnet_bridge_set_cmd *cp = cmd;
-	enum bt_mesh_brg_cfg_state state;
+	enum bt_mesh_subnet_bridge_state state;
 	int err;
 
 	state = cp->val;
 
-	err = bt_mesh_brg_cfg_cli_set(net.net_idx, sys_le16_to_cpu(cp->addr), state, &state);
+	err = bt_mesh_brg_cfg_cli_subnet_bridge_set(net.net_idx, sys_le16_to_cpu(cp->addr), state,
+						    &state);
 	if (err) {
 		LOG_ERR("err=%d", err);
 		return BTP_STATUS_FAILED;
@@ -2122,8 +2123,8 @@ static uint8_t subnet_bridge_set(const void *cmd, uint16_t cmd_len, void *rsp, u
 static uint8_t bridging_table_add(const void *cmd, uint16_t cmd_len, void *rsp, uint16_t *rsp_len)
 {
 	const struct btp_mesh_bridging_table_add_cmd *cp = cmd;
-	struct bt_mesh_brg_cfg_table_entry entry;
-	struct bt_mesh_brg_cfg_table_status rp;
+	struct bt_mesh_bridging_table_entry entry;
+	struct bt_mesh_bridging_table_status rp;
 	int err;
 
 	LOG_DBG("");
@@ -2134,7 +2135,8 @@ static uint8_t bridging_table_add(const void *cmd, uint16_t cmd_len, void *rsp,
 	entry.addr1 = sys_le16_to_cpu(cp->addr1);
 	entry.addr2 = sys_le16_to_cpu(cp->addr2);
 
-	err = bt_mesh_brg_cfg_cli_table_add(net_key_idx, sys_le16_to_cpu(cp->addr), &entry, &rp);
+	err = bt_mesh_brg_cfg_cli_bridging_table_add(net_key_idx, sys_le16_to_cpu(cp->addr), &entry,
+						     &rp);
 	if (err) {
 		LOG_ERR("err=%d", err);
 		return BTP_STATUS_FAILED;
@@ -2147,12 +2149,12 @@ static uint8_t bridging_table_remove(const void *cmd, uint16_t cmd_len, void *rs
 				     uint16_t *rsp_len)
 {
 	const struct btp_mesh_bridging_table_remove_cmd *cp = cmd;
-	struct bt_mesh_brg_cfg_table_status rp;
+	struct bt_mesh_bridging_table_status rp;
 	int err;
 
 	LOG_DBG("");
 
-	err = bt_mesh_brg_cfg_cli_table_remove(
+	err = bt_mesh_brg_cfg_cli_bridging_table_remove(
 		net_key_idx, sys_le16_to_cpu(cp->addr), sys_le16_to_cpu(cp->net_idx1),
 		sys_le16_to_cpu(cp->net_idx2), sys_le16_to_cpu(cp->addr1),
 		sys_le16_to_cpu(cp->addr2), &rp);
@@ -2168,8 +2170,8 @@ static uint8_t bridging_table_remove(const void *cmd, uint16_t cmd_len, void *rs
 static uint8_t bridged_subnets_get(const void *cmd, uint16_t cmd_len, void *rsp, uint16_t *rsp_len)
 {
 	const struct btp_mesh_bridged_subnets_get_cmd *cp = cmd;
-	struct bt_mesh_brg_cfg_filter_netkey filter_net_idx;
-	struct bt_mesh_brg_cfg_subnets_list rp;
+	struct bt_mesh_filter_netkey filter_net_idx;
+	struct bt_mesh_bridged_subnets_list rp;
 	int err;
 
 	LOG_DBG("");
@@ -2182,8 +2184,8 @@ static uint8_t bridged_subnets_get(const void *cmd, uint16_t cmd_len, void *rsp,
 	filter_net_idx.filter = cp->filter;
 	filter_net_idx.net_idx = sys_le16_to_cpu(cp->net_idx);
 
-	err = bt_mesh_brg_cfg_cli_subnets_get(net_key_idx, sys_le16_to_cpu(cp->addr),
-					      filter_net_idx, cp->start_idx, &rp);
+	err = bt_mesh_brg_cfg_cli_bridged_subnets_get(net_key_idx, sys_le16_to_cpu(cp->addr),
+						      filter_net_idx, cp->start_idx, &rp);
 	if (err) {
 		LOG_ERR("err=%d", err);
 		return BTP_STATUS_FAILED;
@@ -2195,7 +2197,7 @@ static uint8_t bridged_subnets_get(const void *cmd, uint16_t cmd_len, void *rsp,
 static uint8_t bridging_table_get(const void *cmd, uint16_t cmd_len, void *rsp, uint16_t *rsp_len)
 {
 	const struct btp_mesh_bridging_table_get_cmd *cp = cmd;
-	struct bt_mesh_brg_cfg_table_list rp;
+	struct bt_mesh_bridging_table_list rp;
 	int err;
 
 	LOG_DBG("");
@@ -2205,7 +2207,7 @@ static uint8_t bridging_table_get(const void *cmd, uint16_t cmd_len, void *rsp,
 	 */
 	rp.list = NULL;
 
-	err = bt_mesh_brg_cfg_cli_table_get(
+	err = bt_mesh_brg_cfg_cli_bridging_table_get(
 		net_key_idx, sys_le16_to_cpu(cp->addr), sys_le16_to_cpu(cp->net_idx1),
 		sys_le16_to_cpu(cp->net_idx2), sys_le16_to_cpu(cp->start_idx), &rp);
 	if (err) {
@@ -2225,7 +2227,8 @@ static uint8_t bridging_table_size_get(const void *cmd, uint16_t cmd_len, void *
 
 	LOG_DBG("");
 
-	err = bt_mesh_brg_cfg_cli_table_size_get(net_key_idx, sys_le16_to_cpu(cp->addr), &size);
+	err = bt_mesh_brg_cfg_cli_bridging_table_size_get(net_key_idx, sys_le16_to_cpu(cp->addr),
+							  &size);
 	if (err) {
 		LOG_ERR("err=%d", err);
 		return BTP_STATUS_FAILED;
diff --git a/tests/bsim/bluetooth/mesh/src/test_brg.c b/tests/bsim/bluetooth/mesh/src/test_brg.c
index 5c82c4dce74..279bed1767b 100644
--- a/tests/bsim/bluetooth/mesh/src/test_brg.c
+++ b/tests/bsim/bluetooth/mesh/src/test_brg.c
@@ -202,8 +202,8 @@ static void tester_setup(void)
 static void bridge_entry_add(uint16_t src, uint16_t dst, uint16_t net_idx1, uint16_t net_idx2,
 			     uint8_t dir)
 {
-	struct bt_mesh_brg_cfg_table_entry entry;
-	struct bt_mesh_brg_cfg_table_status rsp;
+	struct bt_mesh_bridging_table_entry entry;
+	struct bt_mesh_bridging_table_status rsp;
 	int err;
 
 	entry.directions = dir;
@@ -212,7 +212,7 @@ static void bridge_entry_add(uint16_t src, uint16_t dst, uint16_t net_idx1, uint
 	entry.addr1 = src;
 	entry.addr2 = dst;
 
-	err = bt_mesh_brg_cfg_cli_table_add(0, BRIDGE_ADDR, &entry, &rsp);
+	err = bt_mesh_brg_cfg_cli_bridging_table_add(0, BRIDGE_ADDR, &entry, &rsp);
 	if (err || rsp.status || rsp.entry.directions != dir || rsp.entry.net_idx1 != net_idx1 ||
 	    rsp.entry.net_idx2 != net_idx2 || rsp.entry.addr1 != src || rsp.entry.addr2 != dst) {
 		FAIL("Bridging table add failed (err %d) (status %u)", err, rsp.status);
@@ -222,10 +222,10 @@ static void bridge_entry_add(uint16_t src, uint16_t dst, uint16_t net_idx1, uint
 
 static void bridge_entry_remove(uint16_t src, uint16_t dst, uint16_t net_idx1, uint16_t net_idx2)
 {
-	struct bt_mesh_brg_cfg_table_status rsp;
+	struct bt_mesh_bridging_table_status rsp;
 
-	ASSERT_OK(bt_mesh_brg_cfg_cli_table_remove(0, BRIDGE_ADDR, net_idx1, net_idx2, src, dst,
-						   &rsp));
+	ASSERT_OK(bt_mesh_brg_cfg_cli_bridging_table_remove(0, BRIDGE_ADDR, net_idx1, net_idx2, src,
+							    dst, &rsp));
 	if (rsp.status) {
 		FAIL("Bridging table remove failed (status %u)", rsp.status);
 		return;
@@ -247,8 +247,9 @@ static void tester_bridge_configure(int subnets)
 		}
 	}
 
-	ASSERT_OK(bt_mesh_brg_cfg_cli_set(0, BRIDGE_ADDR, BT_MESH_BRG_CFG_ENABLED, &status));
-	if (status != BT_MESH_BRG_CFG_ENABLED) {
+	ASSERT_OK(bt_mesh_brg_cfg_cli_subnet_bridge_set(0, BRIDGE_ADDR,
+							BT_MESH_SUBNET_BRIDGE_ENABLED, &status));
+	if (status != BT_MESH_SUBNET_BRIDGE_ENABLED) {
 		FAIL("Subnet bridge set failed (status %u)", status);
 		return;
 	}
@@ -332,14 +333,14 @@ struct bridged_addresses_entry {
 static void bridge_table_verify(uint16_t net_idx1, uint16_t net_idx2, uint16_t start_idx,
 				struct bridged_addresses_entry *list, size_t list_len)
 {
-	struct bt_mesh_brg_cfg_table_list rsp = {
+	struct bt_mesh_bridging_table_list rsp = {
 		.list = NET_BUF_SIMPLE(BT_MESH_RX_SDU_MAX),
 	};
 
 	net_buf_simple_init(rsp.list, 0);
 
-	ASSERT_OK(
-		bt_mesh_brg_cfg_cli_table_get(0, BRIDGE_ADDR, net_idx1, net_idx2, start_idx, &rsp));
+	ASSERT_OK(bt_mesh_brg_cfg_cli_bridging_table_get(0, BRIDGE_ADDR, net_idx1, net_idx2,
+							 start_idx, &rsp));
 	ASSERT_EQUAL(rsp.status, 0);
 	ASSERT_EQUAL(rsp.net_idx1, net_idx1);
 	ASSERT_EQUAL(rsp.net_idx2, net_idx2);
@@ -471,7 +472,7 @@ static void test_tester_simple(void)
 	/* Adding devices to bridge table */
 	for (int i = 0; i < REMOTE_NODES; i++) {
 		bridge_entry_add(PROV_ADDR, DEVICE_ADDR_START + i, 0, i + 1,
-				 BT_MESH_BRG_CFG_DIR_TWOWAY);
+				 BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY);
 	}
 
 	for (int i = 0; i < REMOTE_NODES; i++) {
@@ -488,8 +489,9 @@ static void test_tester_simple(void)
 
 	LOG_INF("Step 2: Disabling bridging...");
 
-	err = bt_mesh_brg_cfg_cli_set(0, BRIDGE_ADDR, BT_MESH_BRG_CFG_DISABLED, &status);
-	if (err || status != BT_MESH_BRG_CFG_DISABLED) {
+	err = bt_mesh_brg_cfg_cli_subnet_bridge_set(0, BRIDGE_ADDR, BT_MESH_SUBNET_BRIDGE_DISABLED,
+						    &status);
+	if (err || status != BT_MESH_SUBNET_BRIDGE_DISABLED) {
 		FAIL("Subnet bridge set failed (err %d) (status %u)", err, status);
 		return;
 	}
@@ -504,8 +506,9 @@ static void test_tester_simple(void)
 	}
 
 	LOG_INF("Step3: Enabling bridging...");
-	err = bt_mesh_brg_cfg_cli_set(0, BRIDGE_ADDR, BT_MESH_BRG_CFG_ENABLED, &status);
-	if (err || status != BT_MESH_BRG_CFG_ENABLED) {
+	err = bt_mesh_brg_cfg_cli_subnet_bridge_set(0, BRIDGE_ADDR, BT_MESH_SUBNET_BRIDGE_ENABLED,
+						    &status);
+	if (err || status != BT_MESH_SUBNET_BRIDGE_ENABLED) {
 		FAIL("Subnet bridge set failed (err %d) (status %u)", err, status);
 		return;
 	}
@@ -551,7 +554,7 @@ static void test_tester_table_state_change(void)
 	ASSERT_EQUAL(err, -EAGAIN);
 
 	/* DATA and GET messages should reach Device 1, but STATUS message won't be received. */
-	bridge_entry_add(PROV_ADDR, DEVICE_ADDR_START, 0, 1, BT_MESH_BRG_CFG_DIR_ONEWAY);
+	bridge_entry_add(PROV_ADDR, DEVICE_ADDR_START, 0, 1, BT_MESH_SUBNET_BRIDGE_DIR_ONEWAY);
 
 	ASSERT_OK(send_data(DEVICE_ADDR_START, 0xAA));
 
@@ -566,17 +569,19 @@ static void test_tester_table_state_change(void)
 	/* Adding a reverse entry. This should be added to the bridge table as a separate entry as
 	 * the addresses and net keys indexs are provided in the opposite order.
 	 */
-	bridge_entry_add(DEVICE_ADDR_START, PROV_ADDR, 1, 0, BT_MESH_BRG_CFG_DIR_ONEWAY);
-	bridge_table_verify(0, 1, 0,
-			    (struct bridged_addresses_entry[]){
-				    {PROV_ADDR, DEVICE_ADDR_START, BT_MESH_BRG_CFG_DIR_ONEWAY},
-			    },
-			    1);
-	bridge_table_verify(1, 0, 0,
-			    (struct bridged_addresses_entry[]){
-				    {DEVICE_ADDR_START, PROV_ADDR, BT_MESH_BRG_CFG_DIR_ONEWAY},
-			    },
-			    1);
+	bridge_entry_add(DEVICE_ADDR_START, PROV_ADDR, 1, 0, BT_MESH_SUBNET_BRIDGE_DIR_ONEWAY);
+	bridge_table_verify(
+		0, 1, 0,
+		(struct bridged_addresses_entry[]){
+			{PROV_ADDR, DEVICE_ADDR_START, BT_MESH_SUBNET_BRIDGE_DIR_ONEWAY},
+		},
+		1);
+	bridge_table_verify(
+		1, 0, 0,
+		(struct bridged_addresses_entry[]){
+			{DEVICE_ADDR_START, PROV_ADDR, BT_MESH_SUBNET_BRIDGE_DIR_ONEWAY},
+		},
+		1);
 
 	k_sleep(K_SECONDS(1));
 
@@ -591,12 +596,13 @@ static void test_tester_table_state_change(void)
 	 * tester should still receive STATUS message.
 	 */
 	bridge_entry_remove(DEVICE_ADDR_START, PROV_ADDR, 1, 0);
-	bridge_entry_add(PROV_ADDR, DEVICE_ADDR_START, 0, 1, BT_MESH_BRG_CFG_DIR_TWOWAY);
-	bridge_table_verify(0, 1, 0,
-			    (struct bridged_addresses_entry[]){
-				    {PROV_ADDR, DEVICE_ADDR_START, BT_MESH_BRG_CFG_DIR_TWOWAY},
-			    },
-			    1);
+	bridge_entry_add(PROV_ADDR, DEVICE_ADDR_START, 0, 1, BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY);
+	bridge_table_verify(
+		0, 1, 0,
+		(struct bridged_addresses_entry[]){
+			{PROV_ADDR, DEVICE_ADDR_START, BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY},
+		},
+		1);
 	bridge_table_verify(1, 0, 0, NULL, 0);
 
 	ASSERT_OK(send_get(DEVICE_ADDR_START));
@@ -645,7 +651,7 @@ static void test_tester_net_key_remove(void)
 	/* Adding devices to bridge table */
 	for (int i = 0; i < REMOTE_NODES; i++) {
 		bridge_entry_add(PROV_ADDR, DEVICE_ADDR_START + i, 0, i + 1,
-				 BT_MESH_BRG_CFG_DIR_TWOWAY);
+				 BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY);
 	}
 
 	ASSERT_OK(send_data(DEVICE_ADDR_START, 0xAA));
@@ -661,20 +667,21 @@ static void test_tester_net_key_remove(void)
 	err = k_sem_take(&status_msg_recvd_sem, K_SECONDS(5));
 	ASSERT_EQUAL(err, -EAGAIN);
 
-	bridge_table_verify(0, 2, 0,
-			    (struct bridged_addresses_entry[]){
-				    {PROV_ADDR, DEVICE_ADDR_START + 1, BT_MESH_BRG_CFG_DIR_TWOWAY},
-			    },
-			    1);
+	bridge_table_verify(
+		0, 2, 0,
+		(struct bridged_addresses_entry[]){
+			{PROV_ADDR, DEVICE_ADDR_START + 1, BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY},
+		},
+		1);
 
 	/* Bridging Table Get message will return Invalid NetKey Index error because Subnet 1 is
 	 * removed.
 	 */
-	struct bt_mesh_brg_cfg_table_list rsp = {
+	struct bt_mesh_bridging_table_list rsp = {
 		.list = NULL,
 	};
 
-	ASSERT_OK(bt_mesh_brg_cfg_cli_table_get(0, BRIDGE_ADDR, 0, 1, 0, &rsp));
+	ASSERT_OK(bt_mesh_brg_cfg_cli_bridging_table_get(0, BRIDGE_ADDR, 0, 1, 0, &rsp));
 	ASSERT_EQUAL(rsp.status, 4);
 
 	PASS();
@@ -692,8 +699,8 @@ static void test_tester_persistence(void)
 
 		LOG_INF("Already provisioned, skipping provisioning");
 
-		ASSERT_OK(bt_mesh_brg_cfg_cli_get(0, BRIDGE_ADDR, &status));
-		if (status != BT_MESH_BRG_CFG_ENABLED) {
+		ASSERT_OK(bt_mesh_brg_cfg_cli_subnet_bridge_get(0, BRIDGE_ADDR, &status));
+		if (status != BT_MESH_SUBNET_BRIDGE_ENABLED) {
 			FAIL("Subnet bridge set failed (status %u)", status);
 			return;
 		}
@@ -701,30 +708,30 @@ static void test_tester_persistence(void)
 		bridge_table_verify(
 			0, 1, 0,
 			(struct bridged_addresses_entry[]){
-				{PROV_ADDR, DEVICE_ADDR_START, BT_MESH_BRG_CFG_DIR_TWOWAY},
+				{PROV_ADDR, DEVICE_ADDR_START, BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY},
 			},
 			1);
 
-		bridge_table_verify(
-			0, 2, 0,
-			(struct bridged_addresses_entry[]){
-				{PROV_ADDR, DEVICE_ADDR_START + 1, BT_MESH_BRG_CFG_DIR_TWOWAY},
-			},
-			1);
+		bridge_table_verify(0, 2, 0,
+				    (struct bridged_addresses_entry[]){
+					    {PROV_ADDR, DEVICE_ADDR_START + 1,
+					     BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY},
+				    },
+				    1);
 
 		bridge_table_verify(
 			1, 0, 0,
 			(struct bridged_addresses_entry[]){
-				{DEVICE_ADDR_START, PROV_ADDR, BT_MESH_BRG_CFG_DIR_ONEWAY},
+				{DEVICE_ADDR_START, PROV_ADDR, BT_MESH_SUBNET_BRIDGE_DIR_ONEWAY},
 			},
 			1);
 
-		bridge_table_verify(
-			2, 0, 0,
-			(struct bridged_addresses_entry[]){
-				{DEVICE_ADDR_START + 1, PROV_ADDR, BT_MESH_BRG_CFG_DIR_ONEWAY},
-			},
-			1);
+		bridge_table_verify(2, 0, 0,
+				    (struct bridged_addresses_entry[]){
+					    {DEVICE_ADDR_START + 1, PROV_ADDR,
+					     BT_MESH_SUBNET_BRIDGE_DIR_ONEWAY},
+				    },
+				    1);
 	} else {
 		tester_setup();
 
@@ -737,9 +744,9 @@ static void test_tester_persistence(void)
 		/* Adding devices to bridge table */
 		for (int i = 0; i < REMOTE_NODES; i++) {
 			bridge_entry_add(PROV_ADDR, DEVICE_ADDR_START + i, 0, i + 1,
-					 BT_MESH_BRG_CFG_DIR_TWOWAY);
+					 BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY);
 			bridge_entry_add(DEVICE_ADDR_START + i, PROV_ADDR, i + 1, 0,
-					 BT_MESH_BRG_CFG_DIR_ONEWAY);
+					 BT_MESH_SUBNET_BRIDGE_DIR_ONEWAY);
 		}
 
 		k_sleep(K_SECONDS(CONFIG_BT_MESH_STORE_TIMEOUT));
@@ -832,7 +839,7 @@ static void test_tester_ivu(void)
 	/* Adding devices to bridge table */
 	for (int i = 0; i < REMOTE_NODES; i++) {
 		bridge_entry_add(PROV_ADDR, DEVICE_ADDR_START + i, 0, i + 1,
-				 BT_MESH_BRG_CFG_DIR_TWOWAY);
+				 BT_MESH_SUBNET_BRIDGE_DIR_TWOWAY);
 	}
 
 	for (int i = 0; i < REMOTE_NODES; i++) {

From 786114e8c53607cdd296609ad8bc543cf7f32d0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:58 +0100
Subject: [PATCH 1864/2913] Revert "[nrf fromtree] Tests: Bluetooth: Tester:
 Increase the number of max mesh tx segments"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fddbc575139c96a41849a310752b5e1dc0f263f9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/bluetooth/tester/overlay-mesh.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/bluetooth/tester/overlay-mesh.conf b/tests/bluetooth/tester/overlay-mesh.conf
index 1e488bad00b..a9e96686da8 100644
--- a/tests/bluetooth/tester/overlay-mesh.conf
+++ b/tests/bluetooth/tester/overlay-mesh.conf
@@ -15,7 +15,6 @@ CONFIG_BT_MESH_HEALTH_CLI=y
 CONFIG_BT_MESH_FRIEND=y
 CONFIG_BT_MESH_FRIEND_QUEUE_SIZE=32
 CONFIG_BT_MESH_RX_SEG_MAX=13
-CONFIG_BT_MESH_TX_SEG_MAX=7
 CONFIG_BT_MESH_TX_SEG_MSG_COUNT=3
 CONFIG_BT_MESH_LPN_POLL_TIMEOUT=100
 CONFIG_BT_MESH_PROVISIONER=y

From 671757282ce7dc2fba9d3d46df21eb42dbe39dd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:58 +0100
Subject: [PATCH 1865/2913] Revert "[nrf fromtree] Bluetooth: Mesh: Use
 dfd_phase_set() in dfu_suspended()"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0e7c05ad8e727f611b9e908e5bc2e685ff2371be.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/mesh/dfd_srv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/bluetooth/mesh/dfd_srv.c b/subsys/bluetooth/mesh/dfd_srv.c
index 4a395a175bd..e765f2d5d7b 100644
--- a/subsys/bluetooth/mesh/dfd_srv.c
+++ b/subsys/bluetooth/mesh/dfd_srv.c
@@ -801,7 +801,7 @@ static void dfu_suspended(struct bt_mesh_dfu_cli *cli)
 	struct bt_mesh_dfd_srv *srv =
 		CONTAINER_OF(cli, struct bt_mesh_dfd_srv, dfu);
 
-	dfd_phase_set(srv, BT_MESH_DFD_PHASE_TRANSFER_SUSPENDED);
+	srv->phase = BT_MESH_DFD_PHASE_TRANSFER_SUSPENDED;
 }
 
 static void dfu_ended(struct bt_mesh_dfu_cli *cli,

From e739e63db31cc30e430995c3459993c4e393aca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:58 +0100
Subject: [PATCH 1866/2913] Revert "[nrf fromtree] samples: drivers: audio:
 dmic: Add nRF54L15 to the sample"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 611eb7baae9cead2615acd0613e826e49dd2fd39.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 21 -------------------
 samples/drivers/audio/dmic/sample.yaml        |  1 -
 2 files changed, 22 deletions(-)
 delete mode 100644 samples/drivers/audio/dmic/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/samples/drivers/audio/dmic/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/drivers/audio/dmic/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 6131d6d7193..00000000000
--- a/samples/drivers/audio/dmic/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&pinctrl {
-	pdm20_default_alt: pdm20_default_alt {
-		group1 {
-			psels = <NRF_PSEL(PDM_CLK, 1, 12)>,
-				<NRF_PSEL(PDM_DIN, 1, 13)>;
-		};
-	};
-};
-
-dmic_dev: &pdm20 {
-	status = "okay";
-	pinctrl-0 = <&pdm20_default_alt>;
-	pinctrl-names = "default";
-	clock-source = "PCLK32M";
-};
diff --git a/samples/drivers/audio/dmic/sample.yaml b/samples/drivers/audio/dmic/sample.yaml
index 3f8dc0b1610..8cc5464b781 100644
--- a/samples/drivers/audio/dmic/sample.yaml
+++ b/samples/drivers/audio/dmic/sample.yaml
@@ -7,7 +7,6 @@ tests:
     integration_platforms:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
     harness: console
     harness_config:
       type: multi_line

From daef1b0f0360fef47a09ccadd7560cb4cd20de4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:58 +0100
Subject: [PATCH 1867/2913] Revert "[nrf fromtree] drivers: audio: dmic: Add
 support for multiple nrf PDM instances"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8291fe441fc239632175eba83ea7198787e2ad8b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/audio/Kconfig.dmic_pdm_nrfx          |  2 -
 drivers/audio/dmic_nrfx_pdm.c                | 96 ++++----------------
 modules/hal_nordic/nrfx/nrfx_config_common.h |  2 +-
 3 files changed, 17 insertions(+), 83 deletions(-)

diff --git a/drivers/audio/Kconfig.dmic_pdm_nrfx b/drivers/audio/Kconfig.dmic_pdm_nrfx
index 51a56bebb54..dfbda8259f2 100644
--- a/drivers/audio/Kconfig.dmic_pdm_nrfx
+++ b/drivers/audio/Kconfig.dmic_pdm_nrfx
@@ -6,8 +6,6 @@ config AUDIO_DMIC_NRFX_PDM
 	default y
 	depends on DT_HAS_NORDIC_NRF_PDM_ENABLED
 	select NRFX_PDM0 if HAS_HW_NRF_PDM0
-	select NRFX_PDM20 if HAS_HW_NRF_PDM20
-	select NRFX_PDM21 if HAS_HW_NRF_PDM21
 	select PINCTRL
 	help
 	  Enable support for nrfx PDM driver for nRF MCU series.
diff --git a/drivers/audio/dmic_nrfx_pdm.c b/drivers/audio/dmic_nrfx_pdm.c
index 971fd902665..c663aa177b2 100644
--- a/drivers/audio/dmic_nrfx_pdm.c
+++ b/drivers/audio/dmic_nrfx_pdm.c
@@ -15,7 +15,6 @@
 LOG_MODULE_REGISTER(dmic_nrfx_pdm, CONFIG_AUDIO_DMIC_LOG_LEVEL);
 
 struct dmic_nrfx_pdm_drv_data {
-	const nrfx_pdm_t *pdm;
 	struct onoff_manager *clk_mgr;
 	struct onoff_client clk_cli;
 	struct k_mem_slab *mem_slab;
@@ -59,7 +58,8 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 			LOG_ERR("Failed to allocate buffer: %d", ret);
 			stop = true;
 		} else {
-			err = nrfx_pdm_buffer_set(drv_data->pdm, buffer, drv_data->block_size / 2);
+			err = nrfx_pdm_buffer_set(buffer,
+						  drv_data->block_size / 2);
 			if (err != NRFX_SUCCESS) {
 				LOG_ERR("Failed to set buffer: 0x%08x", err);
 				stop = true;
@@ -94,15 +94,10 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 
 	if (stop) {
 		drv_data->stopping = true;
-		nrfx_pdm_stop(drv_data->pdm);
+		nrfx_pdm_stop();
 	}
 }
 
-static bool is_in_freq_range(uint32_t freq, const struct dmic_cfg *pdm_cfg)
-{
-	return freq >= pdm_cfg->io.min_pdm_clk_freq && freq <= pdm_cfg->io.max_pdm_clk_freq;
-}
-
 static bool is_better(uint32_t freq,
 		      uint8_t ratio,
 		      uint32_t req_rate,
@@ -137,37 +132,6 @@ static bool check_pdm_frequencies(const struct dmic_nrfx_pdm_drv_cfg *drv_cfg,
 	uint32_t req_rate = pdm_cfg->streams[0].pcm_rate;
 	bool better_found = false;
 
-#if NRF_PDM_HAS_PRESCALER
-	uint32_t src_freq = 32 * 1000 * 1000UL;
-	uint32_t req_freq = req_rate * ratio;
-	uint32_t prescaler = src_freq / req_freq;
-	uint32_t act_freq = src_freq / prescaler;
-
-	if (is_in_freq_range(act_freq, pdm_cfg) &&
-	    is_better(act_freq, ratio, req_rate, best_diff, best_rate, best_freq)) {
-		config->prescaler = prescaler;
-
-		better_found = true;
-	}
-
-	/* Stop if an exact rate match is found. */
-	if (*best_diff == 0) {
-		return true;
-	}
-
-	/* Prescaler value is rounded down by default,
-	 * thus value rounded up should be checked as well.
-	 */
-	prescaler += 1;
-	act_freq  = src_freq / prescaler;
-
-	if (is_in_freq_range(act_freq, pdm_cfg) &&
-	    is_better(act_freq, ratio, req_rate, best_diff, best_rate, best_freq)) {
-		config->prescaler = prescaler;
-
-		better_found = true;
-	}
-#else
 	if (IS_ENABLED(CONFIG_SOC_SERIES_NRF53X)) {
 		const uint32_t src_freq =
 			(NRF_PDM_HAS_MCLKCONFIG && drv_cfg->clk_src == ACLK)
@@ -194,8 +158,10 @@ static bool check_pdm_frequencies(const struct dmic_nrfx_pdm_drv_cfg *drv_cfg,
 						 (src_freq + req_freq / 2));
 		uint32_t act_freq = src_freq / (1048576 / clk_factor);
 
-		if (is_in_freq_range(act_freq, pdm_cfg) &&
-		    is_better(act_freq, ratio, req_rate, best_diff, best_rate, best_freq)) {
+		if (act_freq >= pdm_cfg->io.min_pdm_clk_freq &&
+		    act_freq <= pdm_cfg->io.max_pdm_clk_freq &&
+		    is_better(act_freq, ratio, req_rate,
+			      best_diff, best_rate, best_freq)) {
 			config->clock_freq = clk_factor * 4096;
 
 			better_found = true;
@@ -250,7 +216,6 @@ static bool check_pdm_frequencies(const struct dmic_nrfx_pdm_drv_cfg *drv_cfg,
 			}
 		}
 	}
-#endif /* NRF_PDM_HAS_PRESCALER */
 
 	return better_found;
 }
@@ -271,26 +236,8 @@ static bool find_suitable_clock(const struct dmic_nrfx_pdm_drv_cfg *drv_cfg,
 		uint8_t         ratio_val;
 		nrf_pdm_ratio_t ratio_enum;
 	} ratios[] = {
-#if defined(PDM_RATIO_RATIO_Ratio32)
-		{ 32, NRF_PDM_RATIO_32X },
-#endif
-#if defined(PDM_RATIO_RATIO_Ratio48)
-		{ 48, NRF_PDM_RATIO_48X },
-#endif
-#if defined(PDM_RATIO_RATIO_Ratio50)
-		{ 50, NRF_PDM_RATIO_50X },
-#endif
-		{ 64, NRF_PDM_RATIO_64X },
-		{ 80, NRF_PDM_RATIO_80X },
-#if defined(PDM_RATIO_RATIO_Ratio96)
-		{ 96, NRF_PDM_RATIO_96X },
-#endif
-#if defined(PDM_RATIO_RATIO_Ratio100)
-		{ 100, NRF_PDM_RATIO_100X },
-#endif
-#if defined(PDM_RATIO_RATIO_Ratio128)
-		{ 128, NRF_PDM_RATIO_128X }
-#endif
+		{  64, NRF_PDM_RATIO_64X },
+		{  80, NRF_PDM_RATIO_80X }
 	};
 
 	for (int r = 0; best_diff != 0 && r < ARRAY_SIZE(ratios); ++r) {
@@ -380,7 +327,7 @@ static int dmic_nrfx_pdm_configure(const struct device *dev,
 	/* If either rate or width is 0, the stream is to be disabled. */
 	if (stream->pcm_rate == 0 || stream->pcm_width == 0) {
 		if (drv_data->configured) {
-			nrfx_pdm_uninit(drv_data->pdm);
+			nrfx_pdm_uninit();
 			drv_data->configured = false;
 		}
 
@@ -410,11 +357,11 @@ static int dmic_nrfx_pdm_configure(const struct device *dev,
 	}
 
 	if (drv_data->configured) {
-		nrfx_pdm_uninit(drv_data->pdm);
+		nrfx_pdm_uninit();
 		drv_data->configured = false;
 	}
 
-	err = nrfx_pdm_init(drv_data->pdm, &nrfx_cfg, drv_cfg->event_handler);
+	err = nrfx_pdm_init(&nrfx_cfg, drv_cfg->event_handler);
 	if (err != NRFX_SUCCESS) {
 		LOG_ERR("Failed to initialize PDM: 0x%08x", err);
 		return -EIO;
@@ -438,7 +385,7 @@ static int start_transfer(struct dmic_nrfx_pdm_drv_data *drv_data)
 	nrfx_err_t err;
 	int ret;
 
-	err = nrfx_pdm_start(drv_data->pdm);
+	err = nrfx_pdm_start();
 	if (err == NRFX_SUCCESS) {
 		return 0;
 	}
@@ -513,7 +460,7 @@ static int dmic_nrfx_pdm_trigger(const struct device *dev,
 	case DMIC_TRIGGER_STOP:
 		if (drv_data->active) {
 			drv_data->stopping = true;
-			nrfx_pdm_stop(drv_data->pdm);
+			nrfx_pdm_stop();
 		}
 		break;
 
@@ -594,18 +541,16 @@ static const struct _dmic_ops dmic_ops = {
 #define PDM_NRFX_DEVICE(idx)						     \
 	static void *rx_msgs##idx[DT_PROP(PDM(idx), queue_size)];	     \
 	static struct dmic_nrfx_pdm_drv_data dmic_nrfx_pdm_data##idx;	     \
-	static const nrfx_pdm_t dmic_nrfx_pdm##idx = NRFX_PDM_INSTANCE(idx); \
 	static int pdm_nrfx_init##idx(const struct device *dev)		     \
 	{								     \
 		IRQ_CONNECT(DT_IRQN(PDM(idx)), DT_IRQ(PDM(idx), priority),   \
-			    nrfx_isr, nrfx_pdm_##idx##_irq_handler, 0);      \
+			    nrfx_isr, nrfx_pdm_irq_handler, 0);		     \
 		const struct dmic_nrfx_pdm_drv_cfg *drv_cfg = dev->config;   \
 		int err = pinctrl_apply_state(drv_cfg->pcfg,		     \
 					      PINCTRL_STATE_DEFAULT);	     \
 		if (err < 0) {						     \
 			return err;					     \
 		}							     \
-		dmic_nrfx_pdm_data##idx.pdm = &dmic_nrfx_pdm##idx;	     \
 		k_msgq_init(&dmic_nrfx_pdm_data##idx.rx_queue,		     \
 			    (char *)rx_msgs##idx, sizeof(void *),	     \
 			    ARRAY_SIZE(rx_msgs##idx));			     \
@@ -637,14 +582,5 @@ static const struct _dmic_ops dmic_ops = {
 			 POST_KERNEL, CONFIG_AUDIO_DMIC_INIT_PRIORITY,	     \
 			 &dmic_ops);
 
-#ifdef CONFIG_HAS_HW_NRF_PDM0
+/* Existing SoCs only have one PDM instance. */
 PDM_NRFX_DEVICE(0);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_PDM20
-PDM_NRFX_DEVICE(20);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_PDM21
-PDM_NRFX_DEVICE(21);
-#endif
diff --git a/modules/hal_nordic/nrfx/nrfx_config_common.h b/modules/hal_nordic/nrfx/nrfx_config_common.h
index e04a11c6df8..f156c21777f 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_common.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_common.h
@@ -18,7 +18,7 @@
 
 /** @brief Symbol specifying minor version of the nrfx API to be used. */
 #ifndef NRFX_CONFIG_API_VER_MINOR
-#define NRFX_CONFIG_API_VER_MINOR 7
+#define NRFX_CONFIG_API_VER_MINOR 6
 #endif
 
 /** @brief Symbol specifying micro version of the nrfx API to be used. */

From 12e3b7d2ca55830c5b623a51f4051c2a39064a05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:58 +0100
Subject: [PATCH 1868/2913] Revert "[nrf fromtree] modules: hal_nordic: Add new
 PDM instances"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 390960f29b59ac589ac4cfd74f983dd344a09b98.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/nrfx/Kconfig                        | 10 ----------
 modules/hal_nordic/nrfx/nrfx_config.h                  | 10 ++--------
 .../hal_nordic/nrfx/nrfx_config_nrf5340_application.h  |  9 ---------
 soc/nordic/common/Kconfig.peripherals                  |  6 ------
 soc/nordic/validate_base_addresses.c                   |  2 --
 5 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 83ce3f157cc..65894d48712 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -169,16 +169,6 @@ config NRFX_PDM0
 	depends on $(dt_nodelabel_has_compat,pdm0,$(DT_COMPAT_NORDIC_NRF_PDM))
 	select NRFX_PDM
 
-config NRFX_PDM20
-	bool "PDM20 driver instance"
-	depends on $(dt_nodelabel_has_compat,pdm20,$(DT_COMPAT_NORDIC_NRF_PDM))
-	select NRFX_PDM
-
-config NRFX_PDM21
-	bool "PDM21 driver instance"
-	depends on $(dt_nodelabel_has_compat,pdm21,$(DT_COMPAT_NORDIC_NRF_PDM))
-	select NRFX_PDM
-
 config NRFX_POWER
 	bool "POWER driver"
 	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_POWER))
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index c7a7f169c01..a7632a8cc43 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -209,17 +209,11 @@
 #ifdef CONFIG_NRFX_PDM
 #define NRFX_PDM_ENABLED 1
 #endif
-#ifdef CONFIG_NRFX_PDM_LOG
-#define NRFX_PDM_CONFIG_LOG_ENABLED 1
-#endif
 #ifdef CONFIG_NRFX_PDM0
 #define NRFX_PDM0_ENABLED 1
 #endif
-#ifdef CONFIG_NRFX_PDM20
-#define NRFX_PDM20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PDM21
-#define NRFX_PDM21_ENABLED 1
+#ifdef CONFIG_NRFX_PDM_LOG
+#define NRFX_PDM_CONFIG_LOG_ENABLED 1
 #endif
 
 #ifdef CONFIG_NRFX_POWER
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf5340_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf5340_application.h
index ab04db03f15..a5dbcaa3db8 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf5340_application.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf5340_application.h
@@ -596,15 +596,6 @@
 #define NRFX_PDM_CONFIG_LOG_LEVEL 3
 #endif
 
-/**
- * @brief NRFX_PDM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM0_ENABLED
-#define NRFX_PDM0_ENABLED 0
-#endif
-
 /**
  * @brief NRFX_POWER_ENABLED
  *
diff --git a/soc/nordic/common/Kconfig.peripherals b/soc/nordic/common/Kconfig.peripherals
index 8ba97b225b9..57c90b05ef7 100644
--- a/soc/nordic/common/Kconfig.peripherals
+++ b/soc/nordic/common/Kconfig.peripherals
@@ -129,12 +129,6 @@ config HAS_HW_NRF_OSCILLATORS
 config HAS_HW_NRF_PDM0
 	def_bool $(dt_nodelabel_enabled_with_compat,pdm0,$(DT_COMPAT_NORDIC_NRF_PDM))
 
-config HAS_HW_NRF_PDM20
-	def_bool $(dt_nodelabel_enabled_with_compat,pdm20,$(DT_COMPAT_NORDIC_NRF_PDM))
-
-config HAS_HW_NRF_PDM21
-	def_bool $(dt_nodelabel_enabled_with_compat,pdm21,$(DT_COMPAT_NORDIC_NRF_PDM))
-
 config HAS_HW_NRF_POWER
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_POWER))
 
diff --git a/soc/nordic/validate_base_addresses.c b/soc/nordic/validate_base_addresses.c
index 07ae94a233b..84d773159bc 100644
--- a/soc/nordic/validate_base_addresses.c
+++ b/soc/nordic/validate_base_addresses.c
@@ -222,8 +222,6 @@ CHECK_DT_REG(nfct, NRF_NFCT);
 CHECK_DT_REG(nrf_mpu, NRF_MPU);
 CHECK_DT_REG(oscillators, NRF_OSCILLATORS);
 CHECK_DT_REG(pdm0, NRF_PDM0);
-CHECK_DT_REG(pdm20, NRF_PDM20);
-CHECK_DT_REG(pdm21, NRF_PDM21);
 CHECK_DT_REG(power, NRF_POWER);
 CHECK_DT_REG(ppi, NRF_PPI);
 CHECK_DT_REG(pwm0, NRF_PWM0);

From d0c27ed35b15d05d572c5548f3ded3e18b3f4bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:58 +0100
Subject: [PATCH 1869/2913] Revert "[nrf fromtree] susbys/dfu/img_util: refined
 ERASE PROGRESSIVELY implementation"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 901b3ac3355fec4cd91cf2cb598152d134c85047.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/dfu/Kconfig              |  3 +-
 subsys/dfu/img_util/flash_img.c | 72 +++++----------------------------
 2 files changed, 12 insertions(+), 63 deletions(-)

diff --git a/subsys/dfu/Kconfig b/subsys/dfu/Kconfig
index a72960acf3b..5977764016d 100644
--- a/subsys/dfu/Kconfig
+++ b/subsys/dfu/Kconfig
@@ -68,7 +68,8 @@ config IMG_BLOCK_BUF_SIZE
 
 config IMG_ERASE_PROGRESSIVELY
 	bool "Erase flash progressively when receiving new firmware"
-	select STREAM_FLASH_ERASE if FLASH_HAS_EXPLICIT_ERASE
+	select STREAM_FLASH_ERASE
+	depends on FLASH_HAS_EXPLICIT_ERASE
 	help
 	  If enabled, flash is erased as necessary when receiving new firmware,
 	  instead of erasing the whole image slot at once. This is necessary
diff --git a/subsys/dfu/img_util/flash_img.c b/subsys/dfu/img_util/flash_img.c
index 69fa559f0e3..9de47250670 100644
--- a/subsys/dfu/img_util/flash_img.c
+++ b/subsys/dfu/img_util/flash_img.c
@@ -43,78 +43,26 @@ BUILD_ASSERT((CONFIG_IMG_BLOCK_BUF_SIZE % FLASH_WRITE_BLOCK_SIZE == 0),
 	     "FLASH_WRITE_BLOCK_SIZE");
 #endif
 
-static int scramble_mcuboot_trailer(struct flash_img_context *ctx)
-{
-	int rc = 0;
-
-#ifdef CONFIG_IMG_ERASE_PROGRESSIVELY
-	if (stream_flash_bytes_written(&ctx->stream) == 0) {
-		off_t toff = boot_get_trailer_status_offset(ctx->flash_area->fa_size);
-		off_t offset;
-		size_t size;
-		const struct flash_parameters *fparams =
-			flash_get_parameters(flash_area_get_device(ctx->flash_area));
-#ifdef CONFIG_STREAM_FLASH_ERASE
-		/* for erasable devices prgressive-erase works only along with
-		 * CONFIG_STREAM_FLASH_ERASE option.
-		 */
-		if (flash_params_get_erase_cap(fparams) & FLASH_ERASE_C_EXPLICIT) {
-			/* On devices with explicit erase we are aligning to page
-			 * layout.
-			 */
-			struct flash_pages_info info;
-
-			rc = flash_get_page_info_by_offs(flash_area_get_device(ctx->flash_area),
-							 toff, &info);
-			if (rc != 0) {
-				return rc;
-			}
-			offset = info.start_offset;
-			size = info.size;
-
-		} else
-#endif
-		{
-			/* On devices with no erase, we are aligning to write block
-			 * size.
-			 */
-			offset = (toff + fparams->write_block_size - 1) &
-				 ~(fparams->write_block_size - 1);
-			/* No alignment correction needed here, offset is corrected already
-			 * and, size should be aligned.
-			 */
-			size = ctx->flash_area->fa_size - offset;
-		}
-
-		rc = flash_area_flatten(ctx->flash_area, offset, size);
-	}
-#endif
-
-	return rc;
-}
-
-
 int flash_img_buffered_write(struct flash_img_context *ctx, const uint8_t *data,
 			     size_t len, bool flush)
 {
 	int rc;
 
-	/* If there is a need to erase the trailer, that should happen before any
-	 * write is done to partition.
-	 */
-	rc = scramble_mcuboot_trailer(ctx);
-	if (rc != 0) {
+	rc = stream_flash_buffered_write(&ctx->stream, data, len, flush);
+	if (!flush) {
 		return rc;
 	}
 
-
-	/* if CONFIG_IMG_ERASE_PROGRESSIVELY is enabled the enabled CONFIG_STREAM_FLASH_ERASE
-	 * ensures that stream_flash erases flash progresively.
-	 */
-	rc = stream_flash_buffered_write(&ctx->stream, data, len, flush);
-	if (!flush) {
+#ifdef CONFIG_IMG_ERASE_PROGRESSIVELY
+	ssize_t status_offset = boot_get_trailer_status_offset(
+		ctx->flash_area->fa_size);
+	rc = stream_flash_erase_page(&ctx->stream,
+				ctx->flash_area->fa_off +
+				status_offset);
+	if (rc) {
 		return rc;
 	}
+#endif
 
 	flash_area_close(ctx->flash_area);
 	ctx->flash_area = NULL;

From 6ce8abea39c069b733dab7059706075d1aa09bef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:58 +0100
Subject: [PATCH 1870/2913] Revert "[nrf fromlist] tests: boards: nrf: qdec:
 Fix failing drivers.sensor.qdec.pm_runtime"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d934be9c661ab8eabaf35383d5bdca6600b87ecd.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/boards/nrf/qdec/src/main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/boards/nrf/qdec/src/main.c b/tests/boards/nrf/qdec/src/main.c
index d87feb22f42..2ad847796e8 100644
--- a/tests/boards/nrf/qdec/src/main.c
+++ b/tests/boards/nrf/qdec/src/main.c
@@ -308,12 +308,12 @@ ZTEST(qdec_sensor, test_sensor_channel_get_empty)
 		pm_device_runtime_get(qdec_dev);
 	}
 
-	/* wait for potential new readings */
-	k_msleep(100);
-
 	rc = sensor_sample_fetch(qdec_dev);
 	zassert_true(rc == 0, "Failed to fetch sample (%d)", rc);
 
+	/* wait for potential new readings */
+	k_msleep(100);
+
 	/* get readings but ignore them, as they may include reading from time
 	 * when emulation was still working (i.e. during previous test)
 	 */

From 1f53e001dd43c17b98d0a5ac91ec4f4e2345ede9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:58 +0100
Subject: [PATCH 1871/2913] Revert "[nrf fromtree] tests: boards: nrf: qdec:
 Add device runtime PM configuration"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit bbd0fa11d406b1408dca863b3b647b3ef3d52ab7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../qdec/boards/nrf52840dk_nrf52840.overlay   | 17 +----
 .../boards/nrf5340dk_nrf5340_cpuapp.overlay   | 17 +----
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 17 +----
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |  5 --
 .../nrf54l15dk_nrf54l15_cpuflpr.overlay       |  5 --
 .../boards/nrf54l15pdk_nrf54l15_common.dtsi   | 12 +--
 tests/boards/nrf/qdec/src/main.c              | 76 -------------------
 tests/boards/nrf/qdec/testcase.yaml           | 40 ++++------
 8 files changed, 19 insertions(+), 170 deletions(-)

diff --git a/tests/boards/nrf/qdec/boards/nrf52840dk_nrf52840.overlay b/tests/boards/nrf/qdec/boards/nrf52840dk_nrf52840.overlay
index f227fb95c38..4f8ea8ad31b 100644
--- a/tests/boards/nrf/qdec/boards/nrf52840dk_nrf52840.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf52840dk_nrf52840.overlay
@@ -31,27 +31,12 @@
 				<NRF_PSEL(QDEC_B, 1, 3)>;   /* Arduino D2 */
 		};
 	};
-
-	qdec_sleep_pinctrl: qdec_sleep_pinctrl {
-		group1 {
-			psels = <NRF_PSEL(QDEC_A, 1, 1)>,   /* Ardiuno D0 */
-				<NRF_PSEL(QDEC_B, 1, 3)>;   /* Arduino D2 */
-			low-power-enable;
-		};
-	};
 };
 
 &qdec0 {
 	status = "okay";
 	pinctrl-0 = <&qdec_pinctrl>;
-	pinctrl-1 = <&qdec_sleep_pinctrl>;
-	pinctrl-names = "default", "sleep";
+	pinctrl-names = "default";
 	steps = < 127 >;
 	led-pre = < 500 >;
-	zephyr,pm-device-runtime-auto;
-};
-
-/* To prevent enabling console receiver. */
-&uart0 {
-	disable-rx;
 };
diff --git a/tests/boards/nrf/qdec/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/boards/nrf/qdec/boards/nrf5340dk_nrf5340_cpuapp.overlay
index ed6a5587f5b..7f4a13f3602 100644
--- a/tests/boards/nrf/qdec/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -30,27 +30,12 @@
 				<NRF_PSEL(QDEC_B, 0, 6)>;   /* Arduino A2 */
 		};
 	};
-
-	qdec_sleep_pinctrl: qdec_sleep_pinctrl {
-		group1 {
-			psels = <NRF_PSEL(QDEC_A, 0, 4)>,
-				<NRF_PSEL(QDEC_B, 0, 6)>;
-			low-power-enable;
-		};
-	};
 };
 
 &qdec1 {
 	status = "okay";
 	pinctrl-0 = <&qdec_pinctrl>;
-	pinctrl-1 = <&qdec_sleep_pinctrl>;
-	pinctrl-names = "default", "sleep";
+	pinctrl-names = "default";
 	steps = < 127 >;
 	led-pre = < 500 >;
-	zephyr,pm-device-runtime-auto;
-};
-
-/* To prevent enabling console receiver. */
-&uart0 {
-	disable-rx;
 };
diff --git a/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index 0e552906a00..6b0db6ad6a8 100644
--- a/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -28,14 +28,6 @@
 				<NRF_PSEL(QDEC_B, 1, 2)>;
 		};
 	};
-
-	qdec_sleep_pinctrl: qdec_sleep_pinctrl {
-		group1 {
-			psels = <NRF_PSEL(QDEC_A, 1, 0)>,
-				<NRF_PSEL(QDEC_B, 1, 2)>;
-			low-power-enable;
-		};
-	};
 };
 
 &gpio1 {
@@ -49,14 +41,7 @@
 &qdec130 {
 	status = "okay";
 	pinctrl-0 = <&qdec_pinctrl>;
-	pinctrl-1 = <&qdec_sleep_pinctrl>;
-	pinctrl-names = "default", "sleep";
+	pinctrl-names = "default";
 	steps = <127>;
 	led-pre = <500>;
-	zephyr,pm-device-runtime-auto;
-};
-
-/* To prevent enabling console receiver. */
-&uart136 {
-	disable-rx;
 };
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index dc39be6deb3..63276a93656 100644
--- a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -4,8 +4,3 @@
  */
 
 #include "nrf54l15pdk_nrf54l15_common.dtsi"
-
-/* To prevent enabling console receiver. */
-&uart20 {
-	disable-rx;
-};
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
index 059222c801b..63276a93656 100644
--- a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
@@ -4,8 +4,3 @@
  */
 
 #include "nrf54l15pdk_nrf54l15_common.dtsi"
-
-/* To prevent enabling console receiver. */
-&uart30 {
-	disable-rx;
-};
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi b/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi
index 3fa426569b8..538106b38b1 100644
--- a/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi
+++ b/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi
@@ -28,14 +28,6 @@
 				<NRF_PSEL(QDEC_B, 1, 10)>;
 		};
 	};
-
-	qdec_sleep_pinctrl: qdec_sleep_pinctrl {
-		group1 {
-			psels = <NRF_PSEL(QDEC_A, 1, 8)>,
-				<NRF_PSEL(QDEC_B, 1, 10)>;
-			low-power-enable;
-		};
-	};
 };
 
 &gpio1 {
@@ -45,9 +37,7 @@
 &qdec20 {
 	status = "okay";
 	pinctrl-0 = <&qdec_pinctrl>;
-	pinctrl-1 = <&qdec_sleep_pinctrl>;
-	pinctrl-names = "default", "sleep";
+	pinctrl-names = "default";
 	steps = <127>;
 	led-pre = <500>;
-	zephyr,pm-device-runtime-auto;
 };
diff --git a/tests/boards/nrf/qdec/src/main.c b/tests/boards/nrf/qdec/src/main.c
index 2ad847796e8..cccd92c3293 100644
--- a/tests/boards/nrf/qdec/src/main.c
+++ b/tests/boards/nrf/qdec/src/main.c
@@ -9,7 +9,6 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/pm/device_runtime.h>
 
 static K_SEM_DEFINE(sem, 0, 1);
 static const struct gpio_dt_spec phase_a = GPIO_DT_SPEC_GET(DT_ALIAS(qenca), gpios);
@@ -145,10 +144,6 @@ ZTEST(qdec_sensor, test_sensor_trigger_set_and_disable)
 {
 	int rc;
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_get(qdec_dev);
-	}
-
 	qdec_trigger.type = SENSOR_TRIG_DATA_READY;
 	qdec_trigger.chan = SENSOR_CHAN_ALL;
 	rc = sensor_trigger_set(qdec_dev, &qdec_trigger, qdec_trigger_handler);
@@ -167,18 +162,10 @@ ZTEST(qdec_sensor, test_sensor_trigger_set_and_disable)
 	/* emulation not working, but there maybe old trigger, ignore */
 	rc = k_sem_take(&sem, K_MSEC(200));
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_put(qdec_dev);
-	}
-
 	/* there should be no triggers now*/
 	rc = k_sem_take(&sem, K_MSEC(200));
 	zassert_true(rc == -EAGAIN, "qdec handler should not be triggered (%d)", rc);
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_get(qdec_dev);
-	}
-
 	/* register empty trigger - disable trigger */
 	rc = sensor_trigger_set(qdec_dev, &qdec_trigger, NULL);
 	zassert_true(rc == 0, "sensor_trigger_set failed: %d", rc);
@@ -188,10 +175,6 @@ ZTEST(qdec_sensor, test_sensor_trigger_set_and_disable)
 	/* emulation working, but handler not set, thus should not be called */
 	rc = k_sem_take(&sem, K_MSEC(200));
 	zassert_true(rc == -EAGAIN, "qdec handler should not be triggered (%d)", rc);
-
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_put(qdec_dev);
-	}
 }
 
 /**
@@ -205,10 +188,6 @@ ZTEST(qdec_sensor, test_sensor_trigger_set)
 	int rc;
 	struct sensor_value val = {0};
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_get(qdec_dev);
-	}
-
 	qdec_trigger.type = SENSOR_TRIG_DATA_READY;
 	qdec_trigger.chan = SENSOR_CHAN_ROTATION;
 	rc = sensor_trigger_set(qdec_dev, &qdec_trigger, qdec_trigger_handler);
@@ -230,10 +209,6 @@ ZTEST(qdec_sensor, test_sensor_trigger_set)
 
 	TC_PRINT("QDEC reading: %d\n", val.val1);
 	zassert_true(val.val1 != 0, "No readings from QDEC");
-
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_put(qdec_dev);
-	}
 }
 
 /**
@@ -246,10 +221,6 @@ ZTEST(qdec_sensor, test_sensor_trigger_set_negative)
 {
 	int rc;
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_get(qdec_dev);
-	}
-
 	rc = sensor_trigger_set(qdec_dev, &qdec_trigger, qdec_trigger_handler);
 	zassume_true(rc != -ENOSYS, "sensor_trigger_set not supported");
 
@@ -264,10 +235,6 @@ ZTEST(qdec_sensor, test_sensor_trigger_set_negative)
 
 	rc = sensor_trigger_set(qdec_dev, &qdec_trigger, qdec_trigger_handler);
 	zassume_true(rc < 0, "sensor_trigger_set should fail due to invalid channel");
-
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_put(qdec_dev);
-	}
 }
 
 /**
@@ -278,19 +245,11 @@ ZTEST(qdec_sensor, test_sensor_trigger_set_negative)
  */
 ZTEST(qdec_sensor, test_qdec_readings)
 {
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_get(qdec_dev);
-	}
-
 	qenc_emulate_verify_reading(10, 100, true, false);
 	qenc_emulate_verify_reading(2, 500, true, false);
 	qenc_emulate_verify_reading(10, 200, false, false);
 	qenc_emulate_verify_reading(1, 1000, false, true);
 	qenc_emulate_verify_reading(1, 1000, true, true);
-
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_put(qdec_dev);
-	}
 }
 
 /**
@@ -304,16 +263,9 @@ ZTEST(qdec_sensor, test_sensor_channel_get_empty)
 	int rc;
 	struct sensor_value val = {0};
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_get(qdec_dev);
-	}
-
 	rc = sensor_sample_fetch(qdec_dev);
 	zassert_true(rc == 0, "Failed to fetch sample (%d)", rc);
 
-	/* wait for potential new readings */
-	k_msleep(100);
-
 	/* get readings but ignore them, as they may include reading from time
 	 * when emulation was still working (i.e. during previous test)
 	 */
@@ -331,10 +283,6 @@ ZTEST(qdec_sensor, test_sensor_channel_get_empty)
 	zassert_true(rc == 0, "Failed to get sample (%d)", rc);
 	zassert_true(val.val1 == 0, "Expected no readings but got: %d", val.val1);
 	zassert_true(val.val2 == 0, "Expected no readings but got: %d", val.val2);
-
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_put(qdec_dev);
-	}
 }
 
 /**
@@ -349,10 +297,6 @@ ZTEST(qdec_sensor, test_sensor_channel_get)
 	struct sensor_value val_first = {0};
 	struct sensor_value val_second = {0};
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_get(qdec_dev);
-	}
-
 	qenc_emulate_start(K_MSEC(10), true);
 
 	/* wait for some readings*/
@@ -384,10 +328,6 @@ ZTEST(qdec_sensor, test_sensor_channel_get)
 		     "Expected the same readings: %d vs %d",
 		     val_first.val2,
 		     val_second.val2);
-
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_put(qdec_dev);
-	}
 }
 
 /**
@@ -401,10 +341,6 @@ ZTEST(qdec_sensor, test_sensor_channel_get_negative)
 	int rc;
 	struct sensor_value val = {0};
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_get(qdec_dev);
-	}
-
 	qenc_emulate_start(K_MSEC(10), true);
 
 	/* wait for some readings*/
@@ -417,10 +353,6 @@ ZTEST(qdec_sensor, test_sensor_channel_get_negative)
 	zassert_true(rc < 0, "Should failed to get sample (%d)", rc);
 	zassert_true(val.val1 == 0, "Some readings from QDEC: %d", val.val1);
 	zassert_true(val.val2 == 0, "Some readings from QDEC: %d", val.val2);
-
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_put(qdec_dev);
-	}
 }
 
 /**
@@ -433,10 +365,6 @@ ZTEST(qdec_sensor, test_sensor_sample_fetch)
 {
 	int rc;
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_get(qdec_dev);
-	}
-
 	rc = sensor_sample_fetch(qdec_dev);
 	zassert_true(rc == 0, "Failed to fetch sample (%d)", rc);
 
@@ -445,10 +373,6 @@ ZTEST(qdec_sensor, test_sensor_sample_fetch)
 
 	rc = sensor_sample_fetch_chan(qdec_dev, SENSOR_CHAN_MAX);
 	zassert_true(rc < 0, "Should fail to fetch sample from invalid channel (%d)", rc);
-
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_put(qdec_dev);
-	}
 }
 
 static void *setup(void)
diff --git a/tests/boards/nrf/qdec/testcase.yaml b/tests/boards/nrf/qdec/testcase.yaml
index 26cfd9901a5..4bc634412db 100644
--- a/tests/boards/nrf/qdec/testcase.yaml
+++ b/tests/boards/nrf/qdec/testcase.yaml
@@ -1,31 +1,21 @@
-common:
-  platform_allow:
-    - nrf52840dk/nrf52840
-    - nrf5340dk/nrf5340/cpuapp
-    - nrf54l15dk/nrf54l15/cpuapp
-    - nrf54l15dk/nrf54l15/cpuflpr
-    - nrf54h20dk/nrf54h20/cpuapp
-  integration_platforms:
-    - nrf52840dk/nrf52840
-    - nrf5340dk/nrf5340/cpuapp
-    - nrf54l15dk/nrf54l15/cpuapp
-    - nrf54l15dk/nrf54l15/cpuflpr
-    - nrf54h20dk/nrf54h20/cpuapp
-  harness: ztest
-  harness_config:
-    fixture: gpio_loopback
 tests:
   drivers.sensor.qdec:
     tags:
       - drivers
       - sensors
       - qdec
-  drivers.sensor.qdec.pm_runtime:
-    tags:
-      - drivers
-      - sensors
-      - qdec
-      - pm
-    extra_configs:
-      - CONFIG_PM_DEVICE=y
-      - CONFIG_PM_DEVICE_RUNTIME=y
+    platform_allow:
+      - nrf52840dk/nrf52840
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuflpr
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf52840dk/nrf52840
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuflpr
+      - nrf54h20dk/nrf54h20/cpuapp
+    harness: ztest
+    harness_config:
+      fixture: gpio_loopback

From 808b217f071438f3446e0c8175045c0485dfa254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:58 +0100
Subject: [PATCH 1872/2913] Revert "[nrf fromtree] tests: boards: nrf: qdec:
 Add common configuration for nrf54l"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c3d8f6f7223ce8833a70e09c138330cf6ea52f2b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 39 ++++++++++++++++-
 .../nrf54l15dk_nrf54l15_cpuflpr.overlay       | 39 ++++++++++++++++-
 .../boards/nrf54l15pdk_nrf54l15_common.dtsi   | 43 -------------------
 3 files changed, 76 insertions(+), 45 deletions(-)
 delete mode 100644 tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi

diff --git a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 63276a93656..538106b38b1 100644
--- a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -3,4 +3,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "nrf54l15pdk_nrf54l15_common.dtsi"
+/ {
+	aliases {
+		qdec0 = &qdec20;
+		qenca = &phase_a;
+		qencb = &phase_b;
+	};
+
+	encoder-emulate {
+		compatible = "gpio-leds";
+		phase_a: phase_a {
+			gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+		};
+		phase_b: phase_b {
+			gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
+		};
+	};
+};
+
+&pinctrl {
+	qdec_pinctrl: qdec_pinctrl {
+		group1 {
+			psels = <NRF_PSEL(QDEC_A, 1, 8)>,
+				<NRF_PSEL(QDEC_B, 1, 10)>;
+		};
+	};
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&qdec20 {
+	status = "okay";
+	pinctrl-0 = <&qdec_pinctrl>;
+	pinctrl-names = "default";
+	steps = <127>;
+	led-pre = <500>;
+};
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
index 63276a93656..538106b38b1 100644
--- a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
@@ -3,4 +3,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "nrf54l15pdk_nrf54l15_common.dtsi"
+/ {
+	aliases {
+		qdec0 = &qdec20;
+		qenca = &phase_a;
+		qencb = &phase_b;
+	};
+
+	encoder-emulate {
+		compatible = "gpio-leds";
+		phase_a: phase_a {
+			gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+		};
+		phase_b: phase_b {
+			gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
+		};
+	};
+};
+
+&pinctrl {
+	qdec_pinctrl: qdec_pinctrl {
+		group1 {
+			psels = <NRF_PSEL(QDEC_A, 1, 8)>,
+				<NRF_PSEL(QDEC_B, 1, 10)>;
+		};
+	};
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&qdec20 {
+	status = "okay";
+	pinctrl-0 = <&qdec_pinctrl>;
+	pinctrl-names = "default";
+	steps = <127>;
+	led-pre = <500>;
+};
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi b/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi
deleted file mode 100644
index 538106b38b1..00000000000
--- a/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_common.dtsi
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	aliases {
-		qdec0 = &qdec20;
-		qenca = &phase_a;
-		qencb = &phase_b;
-	};
-
-	encoder-emulate {
-		compatible = "gpio-leds";
-		phase_a: phase_a {
-			gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-		};
-		phase_b: phase_b {
-			gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&pinctrl {
-	qdec_pinctrl: qdec_pinctrl {
-		group1 {
-			psels = <NRF_PSEL(QDEC_A, 1, 8)>,
-				<NRF_PSEL(QDEC_B, 1, 10)>;
-		};
-	};
-};
-
-&gpio1 {
-	status = "okay";
-};
-
-&qdec20 {
-	status = "okay";
-	pinctrl-0 = <&qdec_pinctrl>;
-	pinctrl-names = "default";
-	steps = <127>;
-	led-pre = <500>;
-};

From d89b92a8f2224df133f5c2c3db848ed1262d3002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:58 +0100
Subject: [PATCH 1873/2913] Revert "[nrf fromtree] drivers: sensor: nordic:
 qdec: Add runtime PM"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1253af0a47cdc539971e91df67aef3e9fc94a870.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c | 87 ++++++++++++---------
 1 file changed, 52 insertions(+), 35 deletions(-)

diff --git a/drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c b/drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c
index e7f014de0d0..dc70c27d417 100644
--- a/drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c
+++ b/drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c
@@ -192,64 +192,81 @@ static const struct sensor_driver_api qdec_nrfx_driver_api = {
 	.trigger_set  = qdec_nrfx_trigger_set,
 };
 
-static void qdec_pm_suspend(const struct device *dev)
+#ifdef CONFIG_PM_DEVICE
+static int qdec_nrfx_pm_action(const struct device *dev,
+			       enum pm_device_action action)
 {
 	const struct qdec_nrfx_config *config = dev->config;
+	int ret = 0;
 
-	nrfx_qdec_disable(&config->qdec);
-	qdec_nrfx_gpio_ctrl(dev, false);
-
-	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
-}
-
-static void qdec_pm_resume(const struct device *dev)
-{
-	const struct qdec_nrfx_config *config = dev->config;
-
-	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
-	qdec_nrfx_gpio_ctrl(dev, true);
-	nrfx_qdec_enable(&config->qdec);
-}
-
-static int qdec_nrfx_pm_action(const struct device *dev, enum pm_device_action action)
-{
 	switch (action) {
 	case PM_DEVICE_ACTION_RESUME:
-		qdec_pm_resume(dev);
+		ret = pinctrl_apply_state(config->pcfg,
+					  PINCTRL_STATE_DEFAULT);
+		if (ret < 0) {
+			return ret;
+		}
+		qdec_nrfx_gpio_ctrl(dev, true);
+		nrfx_qdec_enable(&config->qdec);
+		break;
+
+	case PM_DEVICE_ACTION_TURN_OFF:
+		/* device must be uninitialized */
+		nrfx_qdec_uninit(&config->qdec);
+		ret = pinctrl_apply_state(config->pcfg,
+					  PINCTRL_STATE_SLEEP);
+		if (ret < 0) {
+			return ret;
+		}
 		break;
 
 	case PM_DEVICE_ACTION_SUSPEND:
-		if (IS_ENABLED(CONFIG_PM_DEVICE)) {
-			qdec_pm_suspend(dev);
+		/* device must be suspended */
+		nrfx_qdec_disable(&config->qdec);
+		qdec_nrfx_gpio_ctrl(dev, false);
+		ret = pinctrl_apply_state(config->pcfg,
+					  PINCTRL_STATE_SLEEP);
+		if (ret < 0) {
+			return ret;
 		}
 		break;
 	default:
 		return -ENOTSUP;
-		break;
 	}
 
-	return 0;
+	return ret;
 }
+#endif /* CONFIG_PM_DEVICE */
 
 static int qdec_nrfx_init(const struct device *dev)
 {
-	const struct qdec_nrfx_config *config = dev->config;
-	nrfx_err_t nerr;
+	const struct qdec_nrfx_config *dev_config = dev->config;
+
+	dev_config->irq_connect();
 
-	config->irq_connect();
+	int err = pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_DEFAULT);
 
-	nerr = nrfx_qdec_init(&config->qdec, &config->config, qdec_nrfx_event_handler, (void *)dev);
-	if (nerr != NRFX_SUCCESS) {
-		return (nerr == NRFX_ERROR_INVALID_STATE) ? -EBUSY : -EFAULT;
+	if (err < 0) {
+		return err;
 	}
 
-	/* End up in suspend state. */
-	qdec_nrfx_gpio_ctrl(dev, false);
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
+	nrfx_err_t nerr = nrfx_qdec_init(&dev_config->qdec,
+					 &dev_config->config,
+					 qdec_nrfx_event_handler,
+					 (void *)dev);
+
+	if (nerr == NRFX_ERROR_INVALID_STATE) {
+		LOG_ERR("qdec already in use");
+		return -EBUSY;
+	} else if (nerr != NRFX_SUCCESS) {
+		LOG_ERR("failed to initialize qdec");
+		return -EFAULT;
 	}
 
-	return pm_device_driver_init(dev, qdec_nrfx_pm_action);
+	qdec_nrfx_gpio_ctrl(dev, true);
+	nrfx_qdec_enable(&dev_config->qdec);
+
+	return 0;
 }
 
 #define QDEC(idx)			DT_NODELABEL(qdec##idx)
@@ -284,7 +301,7 @@ static int qdec_nrfx_init(const struct device *dev)
 		.enable_pin = DT_PROP_OR(QDEC(idx), enable_pin, NRF_QDEC_PIN_NOT_CONNECTED), \
 		.steps = QDEC_PROP(idx, steps),						     \
 	};										     \
-	PM_DEVICE_DT_DEFINE(QDEC(idx), qdec_nrfx_pm_action, PM_DEVICE_ISR_SAFE);	     \
+	PM_DEVICE_DT_DEFINE(QDEC(idx), qdec_nrfx_pm_action);				     \
 	SENSOR_DEVICE_DT_DEFINE(QDEC(idx),						     \
 				qdec_nrfx_init,						     \
 				PM_DEVICE_DT_GET(QDEC(idx)),				     \

From a61eda859d81658b39c5d7a6be5751be5a69206b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:58 +0100
Subject: [PATCH 1874/2913] Revert "[nrf fromtree] bluetooth: host: CS support
 for various HCI commands"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit bbb8a72983c150b37d0b40be1f0fdc50c097bf20.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/conn.h       | 101 -------
 include/zephyr/bluetooth/cs.h         | 244 ++++-------------
 include/zephyr/bluetooth/hci_types.h  | 171 ++----------
 subsys/bluetooth/host/conn.c          |  35 ---
 subsys/bluetooth/host/conn_internal.h |   5 -
 subsys/bluetooth/host/cs.c            | 372 --------------------------
 subsys/bluetooth/host/hci_core.c      |   8 -
 subsys/bluetooth/host/hci_core.h      |   2 -
 subsys/bluetooth/shell/cs.c           | 270 +------------------
 9 files changed, 81 insertions(+), 1127 deletions(-)

diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index 23dd9fb89f8..f81ca8b3ce8 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -1518,86 +1518,6 @@ enum bt_security_err {
 	BT_SECURITY_ERR_UNSPECIFIED,
 };
 
-enum bt_conn_le_cs_procedure_enable_state {
-	BT_CONN_LE_CS_PROCEDURES_DISABLED = BT_HCI_OP_LE_CS_PROCEDURES_DISABLED,
-	BT_CONN_LE_CS_PROCEDURES_ENABLED = BT_HCI_OP_LE_CS_PROCEDURES_ENABLED,
-};
-
-/** CS Test Tone Antennna Config Selection.
- *
- *  These enum values are indices in the following table, where N_AP is the maximum
- *  number of antenna paths (in the range [1, 4]).
- *
- * +--------------+-------------+-------------------+-------------------+--------+
- * | Config Index | Total Paths | Dev A: # Antennas | Dev B: # Antennas | Config |
- * +--------------+-------------+-------------------+-------------------+--------+
- * |            0 |           1 |                 1 |                 1 | 1:1    |
- * |            1 |           2 |                 2 |                 1 | N_AP:1 |
- * |            2 |           3 |                 3 |                 1 | N_AP:1 |
- * |            3 |           4 |                 4 |                 1 | N_AP:1 |
- * |            4 |           2 |                 1 |                 2 | 1:N_AP |
- * |            5 |           3 |                 1 |                 3 | 1:N_AP |
- * |            6 |           4 |                 1 |                 4 | 1:N_AP |
- * |            7 |           4 |                 2 |                 2 | 2:2    |
- * +--------------+-------------+-------------------+-------------------+--------+
- *
- *  There are therefore four groups of possible antenna configurations:
- *
- *  - 1:1 configuration, where both A and B support 1 antenna each
- *  - 1:N_AP configuration, where A supports 1 antenna, B supports N_AP antennas, and
- *    N_AP is a value in the range [2, 4]
- *  - N_AP:1 configuration, where A supports N_AP antennas, B supports 1 antenna, and
- *    N_AP is a value in the range [2, 4]
- *  - 2:2 configuration, where both A and B support 2 antennas and N_AP = 4
- */
-enum bt_conn_le_cs_tone_antenna_config_selection {
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE = BT_HCI_OP_LE_CS_ACI_0,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_TWO = BT_HCI_OP_LE_CS_ACI_1,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_THREE = BT_HCI_OP_LE_CS_ACI_2,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_FOUR = BT_HCI_OP_LE_CS_ACI_3,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_FIVE = BT_HCI_OP_LE_CS_ACI_4,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_SIX = BT_HCI_OP_LE_CS_ACI_5,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_SEVEN = BT_HCI_OP_LE_CS_ACI_6,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_EIGHT = BT_HCI_OP_LE_CS_ACI_7,
-};
-
-struct bt_conn_le_cs_procedure_enable_complete {
-	/* The ID associated with the desired configuration (0 to 3) */
-	uint8_t config_id;
-
-	/* State of the CS procedure */
-	enum bt_conn_le_cs_procedure_enable_state state;
-
-	/* Antenna configuration index */
-	enum bt_conn_le_cs_tone_antenna_config_selection tone_antenna_config_selection;
-
-	/* Transmit power level used for CS procedures (-127 to 20 dB; 0x7F if unavailable) */
-	int8_t selected_tx_power;
-
-	/* Duration of each CS subevent in microseconds (1250 us to 4 s) */
-	uint32_t subevent_len;
-
-	/* Number of CS subevents anchored off the same ACL connection event (0x01 to 0x20) */
-	uint8_t subevents_per_event;
-
-	/* Time between consecutive CS subevents anchored off the same ACL connection event in
-	 * units of 0.625 ms
-	 */
-	uint16_t subevent_interval;
-
-	/* Number of ACL connection events between consecutive CS event anchor points */
-	uint16_t event_interval;
-
-	/* Number of ACL connection events between consecutive CS procedure anchor points */
-	uint16_t procedure_interval;
-
-	/* Number of CS procedures to be scheduled (0 if procedures to continue until disabled) */
-	uint16_t procedure_count;
-
-	/* Maximum duration for each procedure in units of 0.625 ms (0x0001 to 0xFFFF) */
-	uint16_t max_procedure_len;
-};
-
 /** @brief Connection callback structure.
  *
  *  This structure is used for tracking the state of a connection.
@@ -1890,27 +1810,6 @@ struct bt_conn_cb {
 	 */
 	void (*le_cs_subevent_data_available)(struct bt_conn *conn,
 					      struct bt_conn_le_cs_subevent_result *result);
-
-	/** @brief LE CS Security Enabled.
-	 *
-	 *  This callback notifies the application that a Channel Sounding
-	 *  Security Enable procedure has completed
-	 *
-	 *  @param conn Connection object.
-	 */
-	void (*le_cs_security_enabled)(struct bt_conn *conn);
-
-	/** @brief LE CS Procedure Enabled.
-	 *
-	 *  This callback notifies the application that a Channel Sounding
-	 *  Procedure Enable procedure has completed
-	 *
-	 *  @param conn Connection object.
-	 *  @param params CS Procedure Enable parameters
-	 */
-	void (*le_cs_procedure_enabled)(
-		struct bt_conn *conn, struct bt_conn_le_cs_procedure_enable_complete *params);
-
 #endif
 
 	/** @internal Internally used field for list handling */
diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index d5d34039d27..5ba452667aa 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -88,24 +88,62 @@ enum bt_le_cs_test_cs_sync_antenna_selection {
 	BT_LE_CS_TEST_CS_SYNC_ANTENNA_SELECTION_FOUR = BT_HCI_OP_LE_CS_ANTENNA_SEL_FOUR,
 };
 
+/** CS Test Tone Antennna Config Selection.
+ *
+ *  These enum values are indices in the following table, where N_AP is the maximum
+ *  number of antenna paths (in the range [1, 4]).
+ *
+ * +--------------+-------------+-------------------+-------------------+--------+
+ * | Config Index | Total Paths | Dev A: # Antennas | Dev B: # Antennas | Config |
+ * +--------------+-------------+-------------------+-------------------+--------+
+ * |            0 |           1 |                 1 |                 1 | 1:1    |
+ * |            1 |           2 |                 2 |                 1 | N_AP:1 |
+ * |            2 |           3 |                 3 |                 1 | N_AP:1 |
+ * |            3 |           4 |                 4 |                 1 | N_AP:1 |
+ * |            4 |           2 |                 1 |                 2 | 1:N_AP |
+ * |            5 |           3 |                 1 |                 3 | 1:N_AP |
+ * |            6 |           4 |                 1 |                 4 | 1:N_AP |
+ * |            7 |           4 |                 2 |                 2 | 2:2    |
+ * +--------------+-------------+-------------------+-------------------+--------+
+ *
+ *  There are therefore four groups of possible antenna configurations:
+ *
+ *  - 1:1 configuration, where both A and B support 1 antenna each
+ *  - 1:N_AP configuration, where A supports 1 antenna, B supports N_AP antennas, and
+ *    N_AP is a value in the range [2, 4]
+ *  - N_AP:1 configuration, where A supports N_AP antennas, B supports 1 antenna, and
+ *    N_AP is a value in the range [2, 4]
+ *  - 2:2 configuration, where both A and B support 2 antennas and N_AP = 4
+ */
+enum bt_le_cs_test_tone_antenna_config_selection {
+	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_ONE = BT_HCI_OP_LE_CS_TEST_ACI_0,
+	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_TWO = BT_HCI_OP_LE_CS_TEST_ACI_1,
+	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_THREE = BT_HCI_OP_LE_CS_TEST_ACI_2,
+	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_FOUR = BT_HCI_OP_LE_CS_TEST_ACI_3,
+	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_FIVE = BT_HCI_OP_LE_CS_TEST_ACI_4,
+	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_SIX = BT_HCI_OP_LE_CS_TEST_ACI_5,
+	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_SEVEN = BT_HCI_OP_LE_CS_TEST_ACI_6,
+	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_EIGHT = BT_HCI_OP_LE_CS_TEST_ACI_7,
+};
+
 /** CS Test Initiator SNR control options */
-enum bt_le_cs_initiator_snr_control {
-	BT_LE_CS_INITIATOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_18,
-	BT_LE_CS_INITIATOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_21,
-	BT_LE_CS_INITIATOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_24,
-	BT_LE_CS_INITIATOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_27,
-	BT_LE_CS_INITIATOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_30,
-	BT_LE_CS_INITIATOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_INITIATOR_SNR_NOT_USED,
+enum bt_le_cs_test_initiator_snr_control {
+	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_18,
+	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_21,
+	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_24,
+	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_27,
+	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_30,
+	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_NOT_USED,
 };
 
 /** CS Test Reflector SNR control options */
-enum bt_le_cs_reflector_snr_control {
-	BT_LE_CS_REFLECTOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_18,
-	BT_LE_CS_REFLECTOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_21,
-	BT_LE_CS_REFLECTOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_24,
-	BT_LE_CS_REFLECTOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_27,
-	BT_LE_CS_REFLECTOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_30,
-	BT_LE_CS_REFLECTOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_REFLECTOR_SNR_NOT_USED,
+enum bt_le_cs_test_reflector_snr_control {
+	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_18,
+	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_21,
+	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_24,
+	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_27,
+	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_30,
+	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_NOT_USED,
 };
 
 /** CS Test Override 3 T_PM Tone Extension */
@@ -362,11 +400,11 @@ struct bt_le_cs_test_param {
 	/** Antenna Configuration Index used during antenna switching during
 	 *  the tone phases of CS steps.
 	 */
-	enum bt_conn_le_cs_tone_antenna_config_selection tone_antenna_config_selection;
+	enum bt_le_cs_test_tone_antenna_config_selection tone_antenna_config_selection;
 	/** Initiator SNR control options */
-	enum bt_le_cs_initiator_snr_control initiator_snr_control;
+	enum bt_le_cs_test_initiator_snr_control initiator_snr_control;
 	/** Reflector SNR control options */
-	enum bt_le_cs_reflector_snr_control reflector_snr_control;
+	enum bt_le_cs_test_reflector_snr_control reflector_snr_control;
 	/** Determines octets 14 and 15 of the initial value of the DRBG nonce. */
 	uint16_t drbg_nonce;
 
@@ -698,178 +736,6 @@ void bt_le_cs_step_data_parse(struct net_buf_simple *step_data_buf,
 			      bool (*func)(struct bt_le_cs_subevent_step *step, void *user_data),
 			      void *user_data);
 
-/** @brief CS Security Enable
- *
- * This commmand is used to start or restart the Channel Sounding Security
- * Start procedure in the local Controller for the ACL connection identified
- * in the conn parameter.
- *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
- *
- * @param conn   Connection Object.
- *
- * @return Zero on success or (negative) error code on failure.
- */
-int bt_le_cs_security_enable(struct bt_conn *conn);
-
-struct bt_le_cs_procedure_enable_param {
-	uint8_t config_id;
-	enum bt_conn_le_cs_procedure_enable_state enable;
-};
-
-/** @brief CS Procedure Enable
- *
- *  This command is used to enable or disable the scheduling of CS procedures
- *  by the local Controller, with the remote device identified in the conn
- *  parameter.
- *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
- *
- * @param conn   Connection Object.
- * @param params Parameters for the CS Procedure Enable command.
- *
- * @return Zero on success or (negative) error code on failure.
- */
-int bt_le_cs_procedure_enable(struct bt_conn *conn,
-			      const struct bt_le_cs_procedure_enable_param *params);
-
-enum bt_le_cs_procedure_phy {
-	BT_LE_CS_PROCEDURE_PHY_1M = BT_HCI_OP_LE_CS_PROCEDURE_PHY_1M,
-	BT_LE_CS_PROCEUDRE_PHY_2M = BT_HCI_OP_LE_CS_PROCEDURE_PHY_2M,
-	BT_LE_CS_PROCEDURE_PHY_CODED_S8 = BT_HCI_OP_LE_CS_PROCEDURE_PHY_CODED_S8,
-	BT_LE_CS_PROCEDURE_PHY_CODED_S2 = BT_HCI_OP_LE_CS_PROCEDURE_PHY_CODED_S2,
-};
-
-#define BT_LE_CS_PROCEDURE_PREFERRED_PEER_ANTENNA_1 BIT(0)
-#define BT_LE_CS_PROCEDURE_PREFERRED_PEER_ANTENNA_2 BIT(1)
-#define BT_LE_CS_PROCEDURE_PREFERRED_PEER_ANTENNA_3 BIT(2)
-#define BT_LE_CS_PROCEDURE_PREFERRED_PEER_ANTENNA_4 BIT(3)
-
-struct bt_le_cs_set_procedure_parameters_param {
-	/* The ID associated with the desired configuration (0 to 3) */
-	uint8_t config_id;
-
-	/* Max. duration for each CS procedure, where T = N * 0.625 ms (0x0001 to 0xFFFF) */
-	uint16_t max_procedure_len;
-
-	/* Min. number of connection events between consecutive CS procedures (0x0001 to 0xFFFF) */
-	uint16_t min_procedure_interval;
-
-	/* Max. number of connection events between consecutive CS procedures (0x0001 to 0xFFFF) */
-	uint16_t max_procedure_interval;
-
-	/* Max. number of procedures to be scheduled (0x0000 for no limit; otherwise 0x0001
-	 * to 0xFFFF)
-	 */
-	uint16_t max_procedure_count;
-
-	/* Min. suggested duration for each CS subevent in microseconds (1250 us to 4 s) */
-	uint32_t min_subevent_len;
-
-	/* Max. suggested duration for each CS subevent in microseconds (1250 us to 4 s) */
-	uint32_t max_subevent_len;
-
-	/* Antenna configuration index */
-	enum bt_conn_le_cs_tone_antenna_config_selection tone_antenna_config_selection;
-
-	/* Phy */
-	enum bt_le_cs_procedure_phy phy;
-
-	/* Transmit power delta, in signed dB, to indicate the recommended difference between the
-	 * remote device's power level for the CS tones and RTT packets and the existing power
-	 * level for the Phy indicated by the Phy parameter (0x80 for no recommendation)
-	 */
-	int8_t tx_power_delta;
-
-	/* Preferred peer antenna (Bitmask of BT_LE_CS_PROCEDURE_PREFERRED_PEER_ANTENNA_*) */
-	uint8_t preferred_peer_antenna;
-
-	/* Initiator SNR control adjustment */
-	enum bt_le_cs_initiator_snr_control snr_control_initiator;
-
-	/* Reflector SNR control adjustment */
-	enum bt_le_cs_reflector_snr_control snr_control_reflector;
-};
-
-/** @brief CS Set Procedure Parameters
- *
- * This command is used to set the parameters for the scheduling of one
- * or more CS procedures by the local controller.
- *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
- *
- * @param conn Connection Object.
- * @param params Parameters for the CS Set Procedure Parameters command.
- *
- * @return Zero on success or (negative) error code on failure.
- */
-int bt_le_cs_set_procedure_parameters(struct bt_conn *conn,
-				      const struct bt_le_cs_set_procedure_parameters_param *params);
-
-/** @brief CS Set Channel Classification
- *
- * This command is used to update the channel classification based on
- * its local information.
- *
- * The nth bitfield (in the range 0 to 78) contains the value for the CS
- * channel index n. Channel Enabled = 1; Channel Disabled = 0.
- *
- * Channels n = 0, 1, 23, 24, 25, 77, and 78 shall be reserved for future
- * use and shall be set to zero. At least 15 channels shall be enabled.
- *
- * The most significant bit (bit 79) is reserved for future use.
- *
- * @note To use this API, @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
- *
- * @param channel_classification Bit fields
- *
- * @return Zero on success or (negative) error code on failure.
- */
-int bt_le_cs_set_channel_classification(uint8_t channel_classification[10]);
-
-/** @brief CS Read Local Supported Capabilities
- *
- *  This command is used to read the CS capabilities that are supported
- *  by the local Controller.
- *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
- *
- * @param ret Return values for the CS Procedure Enable command.
- *
- * @return Zero on success or (negative) error code on failure.
- */
-int bt_le_cs_read_local_supported_capabilities(struct bt_conn_le_cs_capabilities *ret);
-
-/** @brief CS Write Cached Remote Supported Capabilities
- *
- *  This command is used to write the cached copy of the CS capabilities
- *  that are supported by the remote Controller for the connection
- *  identified.
- *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
- *
- * @param conn   Connection Object.
- * @param params Parameters for the CS Write Cached Remote Supported Capabilities command.
- *
- * @return Zero on success or (negative) error code on failure.
- */
-int bt_le_cs_write_cached_remote_supported_capabilities(
-	struct bt_conn *conn, const struct bt_conn_le_cs_capabilities *params);
-
-/** @brief CS Write Cached Remote FAE Table
- *
- *  This command is used to write a cached copy of the per-channel mode-0
- *  Frequency Actuation Error table of the remote device in the local Controller.
- *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
- *
- * @param conn   Connection Object.
- * @param remote_fae_table Per-channel mode-0 FAE table of the local Controller
- *
- * @return Zero on success or (negative) error code on failure.
- */
-int bt_le_cs_write_cached_remote_fae_table(struct bt_conn *conn, uint8_t remote_fae_table[72]);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 1b22e172fcc..61f4747a7a8 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -2402,71 +2402,12 @@ struct bt_hci_cp_le_tx_test_v4_tx_power {
 	int8_t tx_power;
 } __packed;
 
-#define BT_HCI_OP_LE_CS_READ_LOCAL_SUPPORTED_CAPABILITIES BT_OP(BT_OGF_LE, 0x0089) /* 0x2089 */
-
-struct bt_hci_rp_le_read_local_supported_capabilities {
-	uint8_t status;
-	uint8_t num_config_supported;
-	uint16_t max_consecutive_procedures_supported;
-	uint8_t num_antennas_supported;
-	uint8_t max_antenna_paths_supported;
-	uint8_t roles_supported;
-	uint8_t modes_supported;
-	uint8_t rtt_capability;
-	uint8_t rtt_aa_only_n;
-	uint8_t rtt_sounding_n;
-	uint8_t rtt_random_payload_n;
-	uint16_t nadm_sounding_capability;
-	uint16_t nadm_random_capability;
-	uint8_t cs_sync_phys_supported;
-	uint16_t subfeatures_supported;
-	uint16_t t_ip1_times_supported;
-	uint16_t t_ip2_times_supported;
-	uint16_t t_fcs_times_supported;
-	uint16_t t_pm_times_supported;
-	uint8_t t_sw_time_supported;
-	uint8_t tx_snr_capability;
-} __packed;
-
 #define BT_HCI_OP_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES BT_OP(BT_OGF_LE, 0x008A) /* 0x208A */
 
 struct bt_hci_cp_le_read_remote_supported_capabilities {
 	uint16_t handle;
 } __packed;
 
-#define BT_HCI_OP_LE_CS_WRITE_CACHED_REMOTE_SUPPORTED_CAPABILITIES \
-	BT_OP(BT_OGF_LE, 0x008B) /* 0x208B */
-
-struct bt_hci_cp_le_write_cached_remote_supported_capabilities {
-	uint16_t handle;
-	uint8_t num_config_supported;
-	uint16_t max_consecutive_procedures_supported;
-	uint8_t num_antennas_supported;
-	uint8_t max_antenna_paths_supported;
-	uint8_t roles_supported;
-	uint8_t modes_supported;
-	uint8_t rtt_capability;
-	uint8_t rtt_aa_only_n;
-	uint8_t rtt_sounding_n;
-	uint8_t rtt_random_payload_n;
-	uint16_t nadm_sounding_capability;
-	uint16_t nadm_random_capability;
-	uint8_t cs_sync_phys_supported;
-	uint16_t subfeatures_supported;
-	uint16_t t_ip1_times_supported;
-	uint16_t t_ip2_times_supported;
-	uint16_t t_fcs_times_supported;
-	uint16_t t_pm_times_supported;
-	uint8_t t_sw_time_supported;
-	uint8_t tx_snr_capability;
-} __packed;
-
-#define BT_HCI_OP_LE_CS_SECURITY_ENABLE BT_OP(BT_OGF_LE, 0x008C) /* 0x208C */
-
-struct bt_hci_cp_le_security_enable {
-	uint16_t handle;
-} __packed;
-
 #define BT_HCI_OP_LE_CS_SET_DEFAULT_SETTINGS BT_OP(BT_OGF_LE, 0x008D) /* 0x208D */
 
 #define BT_HCI_OP_LE_CS_INITIATOR_ROLE_MASK BIT(0)
@@ -2495,49 +2436,6 @@ struct bt_hci_cp_le_read_remote_fae_table {
 	uint16_t handle;
 } __packed;
 
-#define BT_HCI_OP_LE_CS_WRITE_CACHED_REMOTE_FAE_TABLE BT_OP(BT_OGF_LE, 0x008F) /* 0x208F */
-
-struct bt_hci_cp_le_write_cached_remote_fae_table {
-	uint16_t handle;
-	uint8_t remote_fae_table[72];
-} __packed;
-
-#define BT_HCI_OP_LE_CS_SET_CHANNEL_CLASSIFICATION BT_OP(BT_OGF_LE, 0x0092) /* 0x2092 */
-
-#define BT_HCI_OP_LE_CS_SET_PROCEDURE_PARAMETERS BT_OP(BT_OGF_LE, 0x0093) /* 0x2093 */
-
-#define BT_HCI_OP_LE_CS_PROCEDURE_PHY_1M       0x01
-#define BT_HCI_OP_LE_CS_PROCEDURE_PHY_2M       0x02
-#define BT_HCI_OP_LE_CS_PROCEDURE_PHY_CODED_S8 0x03
-#define BT_HCI_OP_LE_CS_PROCEDURE_PHY_CODED_S2 0x04
-
-struct bt_hci_cp_le_set_procedure_parameters {
-	uint16_t handle;
-	uint8_t config_id;
-	uint16_t max_procedure_len;
-	uint16_t min_procedure_interval;
-	uint16_t max_procedure_interval;
-	uint16_t max_procedure_count;
-	uint8_t min_subevent_len[3];
-	uint8_t max_subevent_len[3];
-	uint8_t tone_antenna_config_selection;
-	uint8_t phy;
-	uint8_t tx_power_delta;
-	uint8_t preferred_peer_antenna;
-	uint8_t snr_control_initiator;
-	uint8_t snr_control_reflector;
-} __packed;
-
-#define BT_HCI_OP_LE_CS_PROCEDURE_ENABLE BT_OP(BT_OGF_LE, 0x0094) /* 0x2094 */
-
-#define BT_HCI_OP_LE_CS_PROCEDURES_DISABLED 0x00
-#define BT_HCI_OP_LE_CS_PROCEDURES_ENABLED  0x01
-
-struct bt_hci_cp_le_procedure_enable {
-	uint16_t handle;
-	uint8_t config_id;
-	uint8_t enable;
-} __packed;
 
 #define BT_HCI_OP_LE_CS_TEST BT_OP(BT_OGF_LE, 0x0095) /* 0x2095 */
 
@@ -2568,28 +2466,28 @@ struct bt_hci_cp_le_procedure_enable {
 #define BT_HCI_OP_LE_CS_TEST_MINIMIZE_TX_POWER 0x7E
 #define BT_HCI_OP_LE_CS_TEST_MAXIMIZE_TX_POWER 0x7F
 
-#define BT_HCI_OP_LE_CS_ACI_0 0x0
-#define BT_HCI_OP_LE_CS_ACI_1 0x1
-#define BT_HCI_OP_LE_CS_ACI_2 0x2
-#define BT_HCI_OP_LE_CS_ACI_3 0x3
-#define BT_HCI_OP_LE_CS_ACI_4 0x4
-#define BT_HCI_OP_LE_CS_ACI_5 0x5
-#define BT_HCI_OP_LE_CS_ACI_6 0x6
-#define BT_HCI_OP_LE_CS_ACI_7 0x7
-
-#define BT_HCI_OP_LE_CS_INITIATOR_SNR_18 0x0
-#define BT_HCI_OP_LE_CS_INITIATOR_SNR_21 0x1
-#define BT_HCI_OP_LE_CS_INITIATOR_SNR_24 0x2
-#define BT_HCI_OP_LE_CS_INITIATOR_SNR_27 0x3
-#define BT_HCI_OP_LE_CS_INITIATOR_SNR_30 0x4
-#define BT_HCI_OP_LE_CS_INITIATOR_SNR_NOT_USED 0xFF
-
-#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_18 0x0
-#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_21 0x1
-#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_24 0x2
-#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_27 0x3
-#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_30 0x4
-#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_NOT_USED 0xFF
+#define BT_HCI_OP_LE_CS_TEST_ACI_0 0x0
+#define BT_HCI_OP_LE_CS_TEST_ACI_1 0x1
+#define BT_HCI_OP_LE_CS_TEST_ACI_2 0x2
+#define BT_HCI_OP_LE_CS_TEST_ACI_3 0x3
+#define BT_HCI_OP_LE_CS_TEST_ACI_4 0x4
+#define BT_HCI_OP_LE_CS_TEST_ACI_5 0x5
+#define BT_HCI_OP_LE_CS_TEST_ACI_6 0x6
+#define BT_HCI_OP_LE_CS_TEST_ACI_7 0x7
+
+#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_18 0x0
+#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_21 0x1
+#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_24 0x2
+#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_27 0x3
+#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_30 0x4
+#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_NOT_USED 0xFF
+
+#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_18 0x0
+#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_21 0x1
+#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_24 0x2
+#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_27 0x3
+#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_30 0x4
+#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_NOT_USED 0xFF
 
 #define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_0_MASK BIT(0)
 #define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_2_MASK BIT(2)
@@ -3540,12 +3438,6 @@ struct bt_hci_evt_le_cs_read_remote_fae_table_complete {
 #define BT_HCI_LE_CS_CONFIG_ACTION_REMOVED 0x00
 #define BT_HCI_LE_CS_CONFIG_ACTION_CREATED 0x01
 
-#define BT_HCI_EVT_LE_CS_SECURITY_ENABLE_COMPLETE 0x2E
-struct bt_hci_evt_le_cs_security_enable_complete {
-	uint8_t status;
-	uint16_t handle;
-} __packed;
-
 #define BT_HCI_EVT_LE_CS_CONFIG_COMPLETE 0x2F
 struct bt_hci_evt_le_cs_config_complete {
 	uint8_t status;
@@ -3814,23 +3706,6 @@ struct bt_hci_evt_le_cs_test_end_complete {
 	uint8_t status;
 } __packed;
 
-#define BT_HCI_EVT_LE_CS_PROCEDURE_ENABLE_COMPLETE 0x30
-struct bt_hci_evt_le_cs_procedure_enable_complete {
-	uint8_t status;
-	uint16_t handle;
-	uint8_t config_id;
-	uint8_t state;
-	uint8_t tone_antenna_config_selection;
-	uint8_t selected_tx_power;
-	uint8_t subevent_len[3];
-	uint8_t subevents_per_event;
-	uint16_t subevent_interval;
-	uint16_t event_interval;
-	uint16_t procedure_interval;
-	uint16_t procedure_count;
-	uint16_t max_procedure_len;
-} __packed;
-
 /* Event mask bits */
 
 #define BT_EVT_BIT(n) (1ULL << (n))
@@ -3922,9 +3797,7 @@ struct bt_hci_evt_le_cs_procedure_enable_complete {
 
 #define BT_EVT_MASK_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE BT_EVT_BIT(43)
 #define BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE              BT_EVT_BIT(44)
-#define BT_EVT_MASK_LE_CS_SECURITY_ENABLE_COMPLETE                    BT_EVT_BIT(45)
 #define BT_EVT_MASK_LE_CS_CONFIG_COMPLETE                             BT_EVT_BIT(46)
-#define BT_EVT_MASK_LE_CS_PROCEDURE_ENABLE_COMPLETE                   BT_EVT_BIT(47)
 #define BT_EVT_MASK_LE_CS_SUBEVENT_RESULT                             BT_EVT_BIT(48)
 #define BT_EVT_MASK_LE_CS_SUBEVENT_RESULT_CONTINUE                    BT_EVT_BIT(49)
 #define BT_EVT_MASK_LE_CS_TEST_END_COMPLETE                           BT_EVT_BIT(50)
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 40f7d7906cc..bfb29b31cd9 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -3400,41 +3400,6 @@ void notify_cs_config_removed(struct bt_conn *conn, uint8_t config_id)
 	}
 }
 
-void notify_cs_security_enable_available(struct bt_conn *conn)
-{
-	struct bt_conn_cb *callback;
-
-	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->le_cs_security_enabled) {
-			callback->le_cs_security_enabled(conn);
-		}
-	}
-
-	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->le_cs_security_enabled) {
-			cb->le_cs_security_enabled(conn);
-		}
-	}
-}
-
-void notify_cs_procedure_enable_available(struct bt_conn *conn,
-					  struct bt_conn_le_cs_procedure_enable_complete *params)
-{
-	struct bt_conn_cb *callback;
-
-	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->le_cs_procedure_enabled) {
-			callback->le_cs_procedure_enabled(conn, params);
-		}
-	}
-
-	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->le_cs_procedure_enabled) {
-			cb->le_cs_procedure_enabled(conn, params);
-		}
-	}
-}
-
 void notify_cs_subevent_result(struct bt_conn *conn, struct bt_conn_le_cs_subevent_result *result)
 {
 	struct bt_conn_cb *callback;
diff --git a/subsys/bluetooth/host/conn_internal.h b/subsys/bluetooth/host/conn_internal.h
index 6b6c97b1902..ac2141c1aad 100644
--- a/subsys/bluetooth/host/conn_internal.h
+++ b/subsys/bluetooth/host/conn_internal.h
@@ -506,11 +506,6 @@ void notify_cs_config_removed(struct bt_conn *conn, uint8_t config_id);
 
 void notify_cs_subevent_result(struct bt_conn *conn, struct bt_conn_le_cs_subevent_result *result);
 
-void notify_cs_security_enable_available(struct bt_conn *conn);
-
-void notify_cs_procedure_enable_available(struct bt_conn *conn,
-					  struct bt_conn_le_cs_procedure_enable_complete *params);
-
 #if defined(CONFIG_BT_SMP)
 /* If role specific LTK is present */
 bool bt_conn_ltk_present(const struct bt_conn *conn);
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index b22877d31b8..5a09c017261 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -877,378 +877,6 @@ int bt_le_cs_remove_config(struct bt_conn *conn, uint8_t config_id)
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_REMOVE_CONFIG, buf, NULL);
 }
 
-int bt_le_cs_security_enable(struct bt_conn *conn)
-{
-	struct bt_hci_cp_le_security_enable *cp;
-	struct net_buf *buf;
-
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_SECURITY_ENABLE, sizeof(*cp));
-	if (!buf) {
-		return -ENOBUFS;
-	}
-
-	cp = net_buf_add(buf, sizeof(*cp));
-	cp->handle = sys_cpu_to_le16(conn->handle);
-
-	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_SECURITY_ENABLE, buf, NULL);
-}
-
-int bt_le_cs_procedure_enable(struct bt_conn *conn,
-			      const struct bt_le_cs_procedure_enable_param *params)
-{
-	struct bt_hci_cp_le_procedure_enable *cp;
-	struct net_buf *buf;
-
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_PROCEDURE_ENABLE, sizeof(*cp));
-	if (!buf) {
-		return -ENOBUFS;
-	}
-
-	cp = net_buf_add(buf, sizeof(*cp));
-	cp->handle = sys_cpu_to_le16(conn->handle);
-	cp->config_id = params->config_id;
-	cp->enable = params->enable;
-
-	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_PROCEDURE_ENABLE, buf, NULL);
-}
-
-int bt_le_cs_set_procedure_parameters(struct bt_conn *conn,
-				      const struct bt_le_cs_set_procedure_parameters_param *params)
-{
-	struct bt_hci_cp_le_set_procedure_parameters *cp;
-	struct net_buf *buf;
-
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_SET_PROCEDURE_PARAMETERS, sizeof(*cp));
-	if (!buf) {
-		return -ENOBUFS;
-	}
-
-	cp = net_buf_add(buf, sizeof(*cp));
-	cp->handle = sys_cpu_to_le16(conn->handle);
-	cp->config_id = params->config_id;
-	cp->max_procedure_len = sys_cpu_to_le16(params->max_procedure_len);
-	cp->min_procedure_interval = sys_cpu_to_le16(params->min_procedure_interval);
-	cp->max_procedure_interval = sys_cpu_to_le16(params->max_procedure_interval);
-	cp->max_procedure_count = sys_cpu_to_le16(params->max_procedure_count);
-	sys_put_le24(params->min_subevent_len, cp->min_subevent_len);
-	sys_put_le24(params->max_subevent_len, cp->max_subevent_len);
-	cp->tone_antenna_config_selection = params->tone_antenna_config_selection;
-	cp->phy = params->phy;
-	cp->tx_power_delta = params->tx_power_delta;
-	cp->preferred_peer_antenna = params->preferred_peer_antenna;
-	cp->snr_control_initiator = params->snr_control_initiator;
-	cp->snr_control_reflector = params->snr_control_reflector;
-
-	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_SET_PROCEDURE_PARAMETERS, buf, NULL);
-}
-
-int bt_le_cs_set_channel_classification(uint8_t channel_classification[10])
-{
-	uint8_t *cp;
-	struct net_buf *buf;
-
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_SET_CHANNEL_CLASSIFICATION, 10);
-	if (!buf) {
-		return -ENOBUFS;
-	}
-
-	cp = net_buf_add(buf, 10);
-	memcpy(cp, channel_classification, 10);
-
-	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_SET_CHANNEL_CLASSIFICATION, buf, NULL);
-}
-
-int bt_le_cs_read_local_supported_capabilities(struct bt_conn_le_cs_capabilities *ret)
-{
-	struct bt_hci_rp_le_read_local_supported_capabilities *rp;
-	struct net_buf *rsp;
-
-	int err =
-		bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_READ_LOCAL_SUPPORTED_CAPABILITIES, NULL, &rsp);
-
-	if (err) {
-		return err;
-	}
-
-	rp = (void *)rsp->data;
-
-	uint8_t status = rp->status;
-
-	ret->num_config_supported = rp->num_config_supported;
-	ret->max_consecutive_procedures_supported =
-		sys_le16_to_cpu(rp->max_consecutive_procedures_supported);
-	ret->num_antennas_supported = rp->num_antennas_supported;
-	ret->max_antenna_paths_supported = rp->max_antenna_paths_supported;
-
-	ret->initiator_supported = rp->roles_supported & BT_HCI_LE_CS_INITIATOR_ROLE_MASK;
-	ret->reflector_supported = rp->roles_supported & BT_HCI_LE_CS_REFLECTOR_ROLE_MASK;
-	ret->mode_3_supported = rp->modes_supported & BT_HCI_LE_CS_MODES_SUPPORTED_MODE_3_MASK;
-
-	ret->rtt_aa_only_n = rp->rtt_aa_only_n;
-	ret->rtt_sounding_n = rp->rtt_sounding_n;
-	ret->rtt_random_payload_n = rp->rtt_random_payload_n;
-
-	if (rp->rtt_aa_only_n) {
-		if (rp->rtt_capability & BT_HCI_LE_CS_RTT_AA_ONLY_N_10NS_MASK) {
-			ret->rtt_aa_only_precision = BT_CONN_LE_CS_RTT_AA_ONLY_10NS;
-		} else {
-			ret->rtt_aa_only_precision = BT_CONN_LE_CS_RTT_AA_ONLY_150NS;
-		}
-	} else {
-		ret->rtt_aa_only_precision = BT_CONN_LE_CS_RTT_AA_ONLY_NOT_SUPP;
-	}
-
-	if (rp->rtt_sounding_n) {
-		if (rp->rtt_capability & BT_HCI_LE_CS_RTT_SOUNDING_N_10NS_MASK) {
-			ret->rtt_sounding_precision = BT_CONN_LE_CS_RTT_SOUNDING_10NS;
-		} else {
-			ret->rtt_sounding_precision = BT_CONN_LE_CS_RTT_SOUNDING_150NS;
-		}
-	} else {
-		ret->rtt_sounding_precision = BT_CONN_LE_CS_RTT_SOUNDING_NOT_SUPP;
-	}
-
-	if (rp->rtt_random_payload_n) {
-		if (rp->rtt_capability & BT_HCI_LE_CS_RTT_RANDOM_PAYLOAD_N_10NS_MASK) {
-			ret->rtt_random_payload_precision = BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_10NS;
-		} else {
-			ret->rtt_random_payload_precision = BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_150NS;
-		}
-	} else {
-		ret->rtt_random_payload_precision = BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_NOT_SUPP;
-	}
-
-	ret->phase_based_nadm_sounding_supported =
-		sys_le16_to_cpu(rp->nadm_sounding_capability) &
-		BT_HCI_LE_CS_NADM_SOUNDING_CAPABILITY_PHASE_BASED_MASK;
-
-	ret->phase_based_nadm_random_supported =
-		sys_le16_to_cpu(rp->nadm_random_capability) &
-		BT_HCI_LE_CS_NADM_RANDOM_CAPABILITY_PHASE_BASED_MASK;
-
-	ret->cs_sync_2m_phy_supported = rp->cs_sync_phys_supported & BT_HCI_LE_CS_SYNC_PHYS_2M_MASK;
-
-	ret->cs_sync_2m_2bt_phy_supported =
-		rp->cs_sync_phys_supported & BT_HCI_LE_CS_SYNC_PHYS_2M_2BT_MASK;
-
-	ret->cs_without_fae_supported =
-		sys_le16_to_cpu(rp->subfeatures_supported) & BT_HCI_LE_CS_SUBFEATURE_NO_TX_FAE_MASK;
-
-	ret->chsel_alg_3c_supported = sys_le16_to_cpu(rp->subfeatures_supported) &
-				      BT_HCI_LE_CS_SUBFEATURE_CHSEL_ALG_3C_MASK;
-
-	ret->pbr_from_rtt_sounding_seq_supported =
-		sys_le16_to_cpu(rp->subfeatures_supported) &
-		BT_HCI_LE_CS_SUBFEATURE_PBR_FROM_RTT_SOUNDING_SEQ_MASK;
-
-	ret->t_ip1_times_supported = sys_le16_to_cpu(rp->t_ip1_times_supported);
-	ret->t_ip2_times_supported = sys_le16_to_cpu(rp->t_ip2_times_supported);
-	ret->t_fcs_times_supported = sys_le16_to_cpu(rp->t_fcs_times_supported);
-	ret->t_pm_times_supported = sys_le16_to_cpu(rp->t_pm_times_supported);
-
-	ret->t_sw_time = rp->t_sw_time_supported;
-	ret->tx_snr_capability = rp->tx_snr_capability;
-
-	net_buf_unref(rsp);
-	return status;
-}
-
-int bt_le_cs_write_cached_remote_supported_capabilities(
-	struct bt_conn *conn, const struct bt_conn_le_cs_capabilities *params)
-{
-	struct bt_hci_cp_le_write_cached_remote_supported_capabilities *cp;
-	struct net_buf *buf;
-
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_WRITE_CACHED_REMOTE_SUPPORTED_CAPABILITIES,
-				sizeof(*cp));
-
-	if (!buf) {
-		return -ENOBUFS;
-	}
-
-	cp = net_buf_add(buf, sizeof(*cp));
-
-	cp->handle = sys_cpu_to_le16(conn->handle);
-
-	cp->num_config_supported = params->num_config_supported;
-
-	cp->max_consecutive_procedures_supported =
-		sys_cpu_to_le16(params->max_consecutive_procedures_supported);
-
-	cp->num_antennas_supported = params->num_antennas_supported;
-	cp->max_antenna_paths_supported = params->max_antenna_paths_supported;
-
-	cp->roles_supported = 0;
-	if (params->initiator_supported) {
-		cp->roles_supported |= BT_HCI_LE_CS_INITIATOR_ROLE_MASK;
-	}
-	if (params->reflector_supported) {
-		cp->roles_supported |= BT_HCI_LE_CS_REFLECTOR_ROLE_MASK;
-	}
-
-	cp->modes_supported = 0;
-	if (params->mode_3_supported) {
-		cp->modes_supported |= BT_HCI_LE_CS_MODES_SUPPORTED_MODE_3_MASK;
-	}
-
-	cp->rtt_aa_only_n = params->rtt_aa_only_n;
-	cp->rtt_sounding_n = params->rtt_sounding_n;
-	cp->rtt_random_payload_n = params->rtt_random_payload_n;
-
-	cp->rtt_capability = 0;
-	if (params->rtt_aa_only_precision == BT_CONN_LE_CS_RTT_AA_ONLY_10NS) {
-		cp->rtt_capability |= BT_HCI_LE_CS_RTT_AA_ONLY_N_10NS_MASK;
-	}
-
-	if (params->rtt_sounding_precision == BT_CONN_LE_CS_RTT_SOUNDING_10NS) {
-		cp->rtt_capability |= BT_HCI_LE_CS_RTT_SOUNDING_N_10NS_MASK;
-	}
-
-	if (params->rtt_random_payload_precision == BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_10NS) {
-		cp->rtt_capability |= BT_HCI_LE_CS_RTT_RANDOM_PAYLOAD_N_10NS_MASK;
-	}
-
-	cp->nadm_sounding_capability = 0;
-	if (params->phase_based_nadm_sounding_supported) {
-		cp->nadm_sounding_capability |=
-			sys_cpu_to_le16(BT_HCI_LE_CS_NADM_SOUNDING_CAPABILITY_PHASE_BASED_MASK);
-	}
-
-	cp->nadm_random_capability = 0;
-	if (params->phase_based_nadm_random_supported) {
-		cp->nadm_random_capability |=
-			sys_cpu_to_le16(BT_HCI_LE_CS_NADM_RANDOM_CAPABILITY_PHASE_BASED_MASK);
-	}
-
-	cp->cs_sync_phys_supported = 0;
-	if (params->cs_sync_2m_phy_supported) {
-		cp->cs_sync_phys_supported |= BT_HCI_LE_CS_SYNC_PHYS_2M_MASK;
-	}
-	if (params->cs_sync_2m_2bt_phy_supported) {
-		cp->cs_sync_phys_supported |= BT_HCI_LE_CS_SYNC_PHYS_2M_2BT_MASK;
-	}
-
-	cp->subfeatures_supported = 0;
-	if (params->cs_without_fae_supported) {
-		cp->subfeatures_supported |=
-			sys_cpu_to_le16(BT_HCI_LE_CS_SUBFEATURE_NO_TX_FAE_MASK);
-	}
-	if (params->chsel_alg_3c_supported) {
-		cp->subfeatures_supported |=
-			sys_cpu_to_le16(BT_HCI_LE_CS_SUBFEATURE_CHSEL_ALG_3C_MASK);
-	}
-	if (params->pbr_from_rtt_sounding_seq_supported) {
-		cp->subfeatures_supported |=
-			sys_cpu_to_le16(BT_HCI_LE_CS_SUBFEATURE_PBR_FROM_RTT_SOUNDING_SEQ_MASK);
-	}
-
-	cp->t_ip1_times_supported = sys_cpu_to_le16(params->t_ip1_times_supported);
-	cp->t_ip2_times_supported = sys_cpu_to_le16(params->t_ip2_times_supported);
-	cp->t_fcs_times_supported = sys_cpu_to_le16(params->t_fcs_times_supported);
-	cp->t_pm_times_supported = sys_cpu_to_le16(params->t_pm_times_supported);
-	cp->t_sw_time_supported = params->t_sw_time;
-	cp->tx_snr_capability = params->tx_snr_capability;
-
-	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_WRITE_CACHED_REMOTE_SUPPORTED_CAPABILITIES, buf,
-				    NULL);
-}
-
-int bt_le_cs_write_cached_remote_fae_table(struct bt_conn *conn, uint8_t remote_fae_table[72])
-{
-	struct bt_hci_cp_le_write_cached_remote_fae_table *cp;
-	struct net_buf *buf;
-
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_WRITE_CACHED_REMOTE_FAE_TABLE, sizeof(*cp));
-	if (!buf) {
-		return -ENOBUFS;
-	}
-
-	cp = net_buf_add(buf, sizeof(*cp));
-
-	cp->handle = sys_cpu_to_le16(conn->handle);
-	memcpy(cp->remote_fae_table, remote_fae_table, sizeof(cp->remote_fae_table));
-
-	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_WRITE_CACHED_REMOTE_FAE_TABLE, buf, NULL);
-}
-
-void bt_hci_le_cs_security_enable_complete(struct net_buf *buf)
-{
-	struct bt_conn *conn;
-
-	struct bt_hci_evt_le_cs_security_enable_complete *evt;
-
-	if (buf->len < sizeof(*evt)) {
-		LOG_ERR("Unexpected end of buffer");
-		return;
-	}
-
-	evt = net_buf_pull_mem(buf, sizeof(*evt));
-	if (evt->status) {
-		LOG_INF("Security Enable failed with status 0x%02X", evt->status);
-		return;
-	}
-
-	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->handle), BT_CONN_TYPE_LE);
-	if (!conn) {
-		LOG_ERR("Can't lookup conn handle when reading Security Enable Complete event");
-		return;
-	}
-
-	notify_cs_security_enable_available(conn);
-
-	bt_conn_unref(conn);
-}
-
-void bt_hci_le_cs_procedure_enable_complete(struct net_buf *buf)
-{
-	struct bt_conn *conn;
-
-	struct bt_hci_evt_le_cs_procedure_enable_complete *evt;
-	struct bt_conn_le_cs_procedure_enable_complete params;
-
-	if (buf->len < sizeof(*evt)) {
-		LOG_ERR("Unexpected end of buffer");
-		return;
-	}
-
-	evt = net_buf_pull_mem(buf, sizeof(*evt));
-	if (evt->status) {
-		LOG_INF("Procedure Enable failed with status 0x%02X", evt->status);
-		return;
-	}
-
-	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->handle), BT_CONN_TYPE_LE);
-	if (!conn) {
-		LOG_ERR("Can't lookup conn handle when reading Procedure Enable Complete event");
-		return;
-	}
-
-	if (evt->state == BT_HCI_OP_LE_CS_PROCEDURES_DISABLED) {
-		struct net_buf *reassembly_buf = get_reassembly_buf(conn->handle, false);
-
-		if (reassembly_buf) {
-			LOG_WRN("De-allocating a dangling reassembly buffer");
-			free_reassembly_buf(&reassembly_buf);
-		}
-	}
-
-	params.config_id = evt->config_id;
-	params.state = evt->state;
-	params.tone_antenna_config_selection = evt->tone_antenna_config_selection;
-	params.selected_tx_power = evt->selected_tx_power;
-	params.subevent_len = sys_get_le24(evt->subevent_len);
-	params.subevents_per_event = evt->subevents_per_event;
-	params.subevent_interval = sys_le16_to_cpu(evt->subevent_interval);
-	params.event_interval = sys_le16_to_cpu(evt->event_interval);
-	params.procedure_interval = sys_le16_to_cpu(evt->procedure_interval);
-	params.procedure_count = sys_le16_to_cpu(evt->procedure_count);
-	params.max_procedure_len = sys_le16_to_cpu(evt->max_procedure_len);
-
-	notify_cs_procedure_enable_available(conn, &params);
-
-	bt_conn_unref(conn);
-}
-
 #if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 int bt_le_cs_stop_test(void)
 {
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index 2db727fb6eb..0d0b5a9c60b 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -2830,12 +2830,6 @@ static const struct event_handler meta_events[] = {
 		      sizeof(struct bt_hci_evt_le_cs_read_remote_fae_table_complete)),
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_CONFIG_COMPLETE, bt_hci_le_cs_config_complete_event,
 		      sizeof(struct bt_hci_evt_le_cs_config_complete)),
-	EVENT_HANDLER(BT_HCI_EVT_LE_CS_SECURITY_ENABLE_COMPLETE,
-			  bt_hci_le_cs_security_enable_complete,
-			  sizeof(struct bt_hci_evt_le_cs_security_enable_complete)),
-	EVENT_HANDLER(BT_HCI_EVT_LE_CS_PROCEDURE_ENABLE_COMPLETE,
-			  bt_hci_le_cs_procedure_enable_complete,
-			  sizeof(struct bt_hci_evt_le_cs_procedure_enable_complete)),
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_SUBEVENT_RESULT,
 		      bt_hci_le_cs_subevent_result,
 		      sizeof(struct bt_hci_evt_le_cs_subevent_result)),
@@ -3424,8 +3418,6 @@ static int le_set_event_mask(void)
 		mask |= BT_EVT_MASK_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE;
 		mask |= BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE;
 		mask |= BT_EVT_MASK_LE_CS_CONFIG_COMPLETE;
-		mask |= BT_EVT_MASK_LE_CS_SECURITY_ENABLE_COMPLETE;
-		mask |= BT_EVT_MASK_LE_CS_PROCEDURE_ENABLE_COMPLETE;
 		mask |= BT_EVT_MASK_LE_CS_SUBEVENT_RESULT;
 		mask |= BT_EVT_MASK_LE_CS_SUBEVENT_RESULT_CONTINUE;
 		mask |= BT_EVT_MASK_LE_CS_TEST_END_COMPLETE;
diff --git a/subsys/bluetooth/host/hci_core.h b/subsys/bluetooth/host/hci_core.h
index fb7a69539fd..458576e74f7 100644
--- a/subsys/bluetooth/host/hci_core.h
+++ b/subsys/bluetooth/host/hci_core.h
@@ -542,8 +542,6 @@ void bt_hci_le_past_received_v2(struct net_buf *buf);
 void bt_hci_le_cs_read_remote_supported_capabilities_complete(struct net_buf *buf);
 void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf);
 void bt_hci_le_cs_config_complete_event(struct net_buf *buf);
-void bt_hci_le_cs_security_enable_complete(struct net_buf *buf);
-void bt_hci_le_cs_procedure_enable_complete(struct net_buf *buf);
 void bt_hci_le_cs_subevent_result(struct net_buf *buf);
 void bt_hci_le_cs_subevent_result_continue(struct net_buf *buf);
 void bt_hci_le_cs_test_end_complete(struct net_buf *buf);
diff --git a/subsys/bluetooth/shell/cs.c b/subsys/bluetooth/shell/cs.c
index b1f6f18aceb..fbc55623b14 100644
--- a/subsys/bluetooth/shell/cs.c
+++ b/subsys/bluetooth/shell/cs.c
@@ -219,9 +219,9 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	params.t_fcs_time = 120;
 	params.t_pm_time = 20;
 	params.t_sw_time = 0;
-	params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
-	params.initiator_snr_control = BT_LE_CS_INITIATOR_SNR_CONTROL_NOT_USED;
-	params.reflector_snr_control = BT_LE_CS_REFLECTOR_SNR_CONTROL_NOT_USED;
+	params.tone_antenna_config_selection = BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
+	params.initiator_snr_control = BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_NOT_USED;
+	params.reflector_snr_control = BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_NOT_USED;
 	params.drbg_nonce = 0x1234;
 	params.override_config = 0;
 	params.override_config_0.channel_map_repetition = 1;
@@ -442,255 +442,6 @@ static int cmd_cs_stop_test(const struct shell *sh, size_t argc, char *argv[])
 	return 0;
 }
 
-static int cmd_read_local_supported_capabilities(const struct shell *sh, size_t argc, char *argv[])
-{
-	int err = 0;
-
-	struct bt_conn_le_cs_capabilities params;
-
-	err = bt_le_cs_read_local_supported_capabilities(&params);
-
-	if (err) {
-		shell_error(sh, "bt_le_cs_read_local_supported_capabilities returned error %d",
-			    err);
-
-		return -ENOEXEC;
-	}
-
-	shell_print(
-		sh,
-		"Local channel sounding supported capabilities:\n"
-		"- Num CS configurations: %d\n"
-		"- Max consecutive CS procedures: %d\n"
-		"- Num antennas supported: %d\n"
-		"- Max antenna paths supported: %d\n"
-		"- Initiator role supported: %s\n"
-		"- Reflector role supported: %s\n"
-		"- Mode 3 supported: %s\n"
-		"- RTT AA only supported: %s\n"
-		"- RTT AA only is 10ns precise: %s\n"
-		"- RTT AA only N: %d\n"
-		"- RTT sounding supported: %s\n"
-		"- RTT sounding is 10ns precise: %s\n"
-		"- RTT sounding N: %d\n"
-		"- RTT random payload supported: %s\n"
-		"- RTT random payload is 10ns precise: %s\n"
-		"- RTT random payload N: %d\n"
-		"- Phase-based NADM with sounding sequences supported: %s\n"
-		"- Phase-based NADM with random sequences supported: %s\n"
-		"- CS Sync 2M PHY supported: %s\n"
-		"- CS Sync 2M 2BT PHY supported: %s\n"
-		"- CS without transmitter FAE supported: %s\n"
-		"- Channel selection algorithm #3c supported: %s\n"
-		"- Phase-based ranging from RTT sounding sequence supported: %s\n"
-		"- T_IP1 times supported: 0x%04x\n"
-		"- T_IP2 times supported: 0x%04x\n"
-		"- T_FCS times supported: 0x%04x\n"
-		"- T_PM times supported: 0x%04x\n"
-		"- T_SW time supported: %d us\n"
-		"- TX SNR capability: 0x%02x",
-		params.num_config_supported, params.max_consecutive_procedures_supported,
-		params.num_antennas_supported, params.max_antenna_paths_supported,
-		params.initiator_supported ? "Yes" : "No",
-		params.reflector_supported ? "Yes" : "No", params.mode_3_supported ? "Yes" : "No",
-		params.rtt_aa_only_precision == BT_CONN_LE_CS_RTT_AA_ONLY_NOT_SUPP ? "No" : "Yes",
-		params.rtt_aa_only_precision == BT_CONN_LE_CS_RTT_AA_ONLY_10NS ? "Yes" : "No",
-		params.rtt_aa_only_n,
-		params.rtt_sounding_precision == BT_CONN_LE_CS_RTT_SOUNDING_NOT_SUPP ? "No" : "Yes",
-		params.rtt_sounding_precision == BT_CONN_LE_CS_RTT_SOUNDING_10NS ? "Yes" : "No",
-		params.rtt_sounding_n,
-		params.rtt_random_payload_precision == BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_NOT_SUPP
-			? "No"
-			: "Yes",
-		params.rtt_random_payload_precision == BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_10NS ? "Yes"
-											     : "No",
-		params.rtt_random_payload_n,
-		params.phase_based_nadm_sounding_supported ? "Yes" : "No",
-		params.phase_based_nadm_random_supported ? "Yes" : "No",
-		params.cs_sync_2m_phy_supported ? "Yes" : "No",
-		params.cs_sync_2m_2bt_phy_supported ? "Yes" : "No",
-		params.cs_without_fae_supported ? "Yes" : "No",
-		params.chsel_alg_3c_supported ? "Yes" : "No",
-		params.pbr_from_rtt_sounding_seq_supported ? "Yes" : "No",
-		params.t_ip1_times_supported, params.t_ip2_times_supported,
-		params.t_fcs_times_supported, params.t_pm_times_supported, params.t_sw_time,
-		params.tx_snr_capability);
-
-	return 0;
-}
-
-static int cmd_write_cached_remote_supported_capabilities(const struct shell *sh, size_t argc,
-							  char *argv[])
-{
-	int err = 0;
-
-	if (default_conn == NULL) {
-		shell_error(sh, "Conn handle error, at least one connection is required.");
-		return -ENOEXEC;
-	}
-
-	struct bt_conn_le_cs_capabilities params;
-
-	params.num_config_supported = 1;
-	params.max_consecutive_procedures_supported = 0;
-	params.num_antennas_supported = 1;
-	params.max_antenna_paths_supported = 1;
-	params.initiator_supported = true;
-	params.reflector_supported = true;
-	params.mode_3_supported = true;
-	params.rtt_aa_only_precision = BT_CONN_LE_CS_RTT_AA_ONLY_10NS;
-	params.rtt_sounding_precision = BT_CONN_LE_CS_RTT_SOUNDING_10NS;
-	params.rtt_random_payload_precision = BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_10NS;
-	params.rtt_aa_only_n = 5;
-	params.rtt_sounding_n = 6;
-	params.rtt_random_payload_n = 7;
-	params.phase_based_nadm_sounding_supported = true;
-	params.phase_based_nadm_random_supported = true;
-	params.cs_sync_2m_phy_supported = true;
-	params.cs_sync_2m_2bt_phy_supported = true;
-	params.chsel_alg_3c_supported = true;
-	params.cs_without_fae_supported = true;
-	params.pbr_from_rtt_sounding_seq_supported = false;
-	params.t_ip1_times_supported = BT_HCI_LE_CS_T_IP1_TIME_10US_MASK;
-	params.t_ip2_times_supported = BT_HCI_LE_CS_T_IP2_TIME_10US_MASK;
-	params.t_fcs_times_supported = BT_HCI_LE_CS_T_FCS_TIME_100US_MASK;
-	params.t_sw_time = 0x04;
-	params.tx_snr_capability = BT_HCI_LE_CS_TX_SNR_CAPABILITY_18DB_MASK;
-
-	err = bt_le_cs_write_cached_remote_supported_capabilities(default_conn, &params);
-
-	if (err) {
-		shell_error(sh, "bt_le_cs_set_channel_classification returned error %d", err);
-		return -ENOEXEC;
-	}
-
-	return 0;
-}
-
-static int cmd_security_enable(const struct shell *sh, size_t argc, char *argv[])
-{
-	int err = 0;
-
-	if (default_conn == NULL) {
-		shell_error(sh, "Conn handle error, at least one connection is required.");
-		return -ENOEXEC;
-	}
-
-	err = bt_le_cs_security_enable(default_conn);
-
-	if (err) {
-		shell_error(sh, "bt_le_cs_security_enable returned error %d", err);
-		return -ENOEXEC;
-	}
-
-	return 0;
-}
-
-static int cmd_set_channel_classification(const struct shell *sh, size_t argc, char *argv[])
-{
-	int err = 0;
-
-	if (default_conn == NULL) {
-		shell_error(sh, "Conn handle error, at least one connection is required.");
-		return -ENOEXEC;
-	}
-
-	uint8_t channel_classification[10];
-
-	for (int i = 0; i < 10; i++) {
-		channel_classification[i] = shell_strtoul(argv[1 + i], 16, &err);
-
-		if (err) {
-			shell_help(sh);
-			shell_error(sh, "Could not parse input %d, Channel Classification[%d]", i,
-				    i);
-
-			return SHELL_CMD_HELP_PRINTED;
-		}
-	}
-
-	err = bt_le_cs_set_channel_classification(channel_classification);
-
-	if (err) {
-		shell_error(sh, "bt_le_cs_set_channel_classification returned error %d", err);
-		return -ENOEXEC;
-	}
-
-	return 0;
-}
-
-static int cmd_set_procedure_parameters(const struct shell *sh, size_t argc, char *argv[])
-{
-	int err = 0;
-
-	if (default_conn == NULL) {
-		shell_error(sh, "Conn handle error, at least one connection is required.");
-		return -ENOEXEC;
-	}
-
-	struct bt_le_cs_set_procedure_parameters_param params;
-
-	params.config_id = 0;
-	params.max_procedure_len = 1000;
-	params.min_procedure_interval = 5;
-	params.max_procedure_interval = 5000;
-	params.max_procedure_count = 1;
-	params.min_subevent_len = 5000;
-	params.max_subevent_len = 4000000;
-	params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
-	params.phy = 0x01;
-	params.tx_power_delta = 0x80;
-	params.preferred_peer_antenna = 1;
-	params.snr_control_initiator = BT_LE_CS_INITIATOR_SNR_CONTROL_18dB;
-	params.snr_control_reflector = BT_HCI_OP_LE_CS_REFLECTOR_SNR_18;
-
-	err = bt_le_cs_set_procedure_parameters(default_conn, &params);
-
-	if (err) {
-		shell_error(sh, "bt_le_cs_set_procedure_parameters returned error %d", err);
-		return -ENOEXEC;
-	}
-
-	return 0;
-}
-
-static int cmd_procedure_enable(const struct shell *sh, size_t argc, char *argv[])
-{
-	int err = 0;
-
-	if (default_conn == NULL) {
-		shell_error(sh, "Conn handle error, at least one connection is required.");
-		return -ENOEXEC;
-	}
-
-	struct bt_le_cs_procedure_enable_param params;
-
-	params.config_id = shell_strtoul(argv[1], 16, &err);
-
-	if (err) {
-		shell_help(sh);
-		shell_error(sh, "Could not parse input 1, Config ID");
-		return SHELL_CMD_HELP_PRINTED;
-	}
-
-	params.enable = shell_strtoul(argv[2], 16, &err);
-
-	if (err) {
-		shell_help(sh);
-		shell_error(sh, "Could not parse input 2, Enable");
-		return SHELL_CMD_HELP_PRINTED;
-	}
-
-	err = bt_le_cs_procedure_enable(default_conn, &params);
-
-	if (err) {
-		shell_error(sh, "bt_le_cs_procedure_enable returned error %d", err);
-		return -ENOEXEC;
-	}
-
-	return 0;
-}
-
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	cs_cmds,
 	SHELL_CMD_ARG(read_remote_supported_capabilities, NULL, "<None>",
@@ -712,20 +463,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		"128b-rand] [phy-1m, phy-2m, phy-2m-2b] [chmap-rep <rep>] [hat-shape, x-shape] "
 		"[ch3c-jump <jump>] [chmap <XXXXXXXXXXXXXXXX>] (78-0) [chsel-3b, chsel-3c]",
 		cmd_create_config, 4, 15),
-	SHELL_CMD_ARG(remove_config, NULL, "<id>", cmd_remove_config, 2, 0),
-	SHELL_CMD_ARG(read_local_supported_capabilities, NULL, "<None>",
-		      cmd_read_local_supported_capabilities, 1, 0),
-	SHELL_CMD_ARG(write_cached_remote_supported_capabilities, NULL, "<None>",
-		      cmd_write_cached_remote_supported_capabilities, 1, 0),
-	SHELL_CMD_ARG(security_enable, NULL, "<None>", cmd_security_enable, 1, 0),
-	SHELL_CMD_ARG(set_channel_classification, NULL,
-		      "<Byte 0> <Byte 1> <Byte 2> <Byte 3> "
-		      "<Byte 4> <Byte 5> <Byte 6> <Byte 7> <Byte 8> <Byte 9>",
-		      cmd_set_channel_classification, 11, 0),
-	SHELL_CMD_ARG(set_procedure_parameters, NULL, "<None>", cmd_set_procedure_parameters, 1, 0),
-	SHELL_CMD_ARG(procedure_enable, NULL, "<Config ID: 0 to 3> <Enable: 0, 1>",
-		      cmd_procedure_enable, 3, 0),
-	SHELL_SUBCMD_SET_END);
+	SHELL_CMD_ARG(remove_config, NULL, "<id>", cmd_remove_config, 2, 0), SHELL_SUBCMD_SET_END);
 
 static int cmd_cs(const struct shell *sh, size_t argc, char **argv)
 {

From d3172193eee050dcd7fe7aefab7b8eef39603b67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:58 +0100
Subject: [PATCH 1875/2913] Revert "[nrf fromtree] bluetooth: host: minor doc
 correction for bt_le_cs_step_data_parse()"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f9b0224ad414aa053850eab9b012acbc77b1b9ab.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/cs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index 5ba452667aa..aa145b65f5c 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -718,7 +718,7 @@ int bt_le_cs_remove_config(struct bt_conn *conn, uint8_t config_id);
  */
 int bt_le_cs_stop_test(void);
 
-/** @brief Parse CS Subevent Step Data
+/** @brief Parse CS Test Subevent Results
  *
  * A helper for parsing HCI-formatted step data found in channel sounding subevent results.
  *

From b563b130398e4505498689bb5c3872726fa84721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:58 +0100
Subject: [PATCH 1876/2913] Revert "[nrf fromtree] bluetooth: host: Add defines
 for mode 1 packet quality and RSSI"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2667542a69d19eeda47f38f5253c15d2a9c9e93a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/hci_types.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 61f4747a7a8..eb05e53b72c 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -3521,12 +3521,6 @@ struct bt_hci_evt_le_cs_config_complete {
 #define BT_HCI_LE_CS_PACKET_NADM_ATTACK_EXT_LIKELY    0x06
 #define BT_HCI_LE_CS_PACKET_NADM_UNKNOWN              0xFF
 
-#define BT_HCI_LE_CS_PACKET_QUALITY_AA_CHECK_SUCCESSFUL	      0x0
-#define BT_HCI_LE_CS_PACKET_QUALITY_AA_CHECK_BIT_ERRORS_FOUND 0x1
-#define BT_HCI_LE_CS_PACKET_QUALITY_AA_CHECK_AA_NOT_FOUND     0x2
-
-#define BT_HCI_LE_CS_PACKET_RSSI_NOT_AVAILABLE 0x7F
-
 #define BT_HCI_EVT_LE_CS_SUBEVENT_RESULT 0x31
 /** Subevent result step data format: Mode 0 Initiator  */
 struct bt_hci_le_cs_step_data_mode_0_initiator {

From aabb233449b93de5ad15b3ac8dd3e46c65fd96c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:58 +0100
Subject: [PATCH 1877/2913] Revert "[nrf fromtree] bluetooth: host: uint16_t ->
 int16_t mode 1 deltas"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c165c4e75cbd49063a81c0ba939d9920991929fb.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/hci_types.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index eb05e53b72c..83956de7d4a 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -3561,8 +3561,8 @@ struct bt_hci_le_cs_step_data_mode_1 {
 	uint8_t packet_nadm;
 	uint8_t packet_rssi;
 	union {
-		int16_t toa_tod_initiator;
-		int16_t tod_toa_reflector;
+		uint16_t toa_tod_initiator;
+		uint16_t tod_toa_reflector;
 	};
 	uint8_t packet_antenna;
 } __packed;
@@ -3579,8 +3579,8 @@ struct bt_hci_le_cs_step_data_mode_1_ss_rtt {
 	uint8_t packet_nadm;
 	uint8_t packet_rssi;
 	union {
-		int16_t toa_tod_initiator;
-		int16_t tod_toa_reflector;
+		uint16_t toa_tod_initiator;
+		uint16_t tod_toa_reflector;
 	};
 	uint8_t packet_antenna;
 	uint8_t packet_pct1[4];
@@ -3618,8 +3618,8 @@ struct bt_hci_le_cs_step_data_mode_3 {
 	uint8_t packet_nadm;
 	uint8_t packet_rssi;
 	union {
-		int16_t toa_tod_initiator;
-		int16_t tod_toa_reflector;
+		uint16_t toa_tod_initiator;
+		uint16_t tod_toa_reflector;
 	};
 	uint8_t packet_antenna;
 	uint8_t antenna_permutation_index;
@@ -3638,8 +3638,8 @@ struct bt_hci_le_cs_step_data_mode_3_ss_rtt {
 	uint8_t packet_nadm;
 	uint8_t packet_rssi;
 	union {
-		int16_t toa_tod_initiator;
-		int16_t tod_toa_reflector;
+		uint16_t toa_tod_initiator;
+		uint16_t tod_toa_reflector;
 	};
 	uint8_t packet_antenna;
 	uint8_t packet_pct1[4];

From 086579979c02756dc5c0604e97dd6bd7282e1ef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:58 +0100
Subject: [PATCH 1878/2913] Revert "[nrf fromtree] bluetooth: host: Add docs
 for t_XX times in CS Test"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3ead2ba0de1b59ec1548dcfa7f9797be70ba68db.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/cs.h | 59 +++--------------------------------
 1 file changed, 5 insertions(+), 54 deletions(-)

diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index aa145b65f5c..fa362083180 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -338,64 +338,15 @@ struct bt_le_cs_test_param {
 	 *      it should use as low a transmit power as possible
 	 */
 	uint8_t transmit_power_level;
-	/** Interlude time in microseconds between the RTT packets.
-	 *
-	 *  Valid options are:
-	 *    - 10 us
-	 *    - 20 us
-	 *    - 30 us
-	 *    - 40 us
-	 *    - 50 us
-	 *    - 60 us
-	 *    - 80 us
-	 *    - 145 us
-	 */
+	/** Interlude time in microseconds between the RTT packets. */
 	uint8_t t_ip1_time;
-	/** Interlude time in microseconds between the CS tones.
-	 *
-	 *  Valid options are:
-	 *    - 10 us
-	 *    - 20 us
-	 *    - 30 us
-	 *    - 40 us
-	 *    - 50 us
-	 *    - 60 us
-	 *    - 80 us
-	 *    - 145 us
-	 */
+	/** Interlude time in microseconds between the CS tones. */
 	uint8_t t_ip2_time;
-	/** Time in microseconds for frequency changes.
-	 *
-	 *  Valid options are:
-	 *    - 15 us
-	 *    - 20 us
-	 *    - 30 us
-	 *    - 40 us
-	 *    - 50 us
-	 *    - 60 us
-	 *    - 80 us
-	 *    - 100 us
-	 *    - 120 us
-	 *    - 150 us
-	 */
+	/** Time in microseconds for frequency changes. */
 	uint8_t t_fcs_time;
-	/** Time in microseconds for the phase measurement period of the CS tones.
-	 *
-	 *  Valid options are:
-	 *    - 10 us
-	 *    - 20 us
-	 *    - 40 us
-	 */
+	/** Time in microseconds for the phase measurement period of the CS tones. */
 	uint8_t t_pm_time;
-	/** Time in microseconds for the antenna switch period of the CS tones.
-	 *
-	 *  Valid options are:
-	 *    - 0 us
-	 *    - 1 us
-	 *    - 2 us
-	 *    - 4 us
-	 *    - 10 us
-	 */
+	/** Time in microseconds for the antenna switch period of the CS tones. */
 	uint8_t t_sw_time;
 	/** Antenna Configuration Index used during antenna switching during
 	 *  the tone phases of CS steps.

From 69d86bf28f9c25c798722908eb7e7b0efb7df8f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:59 +0100
Subject: [PATCH 1879/2913] Revert "[nrf fromtree] bluetooth: host: Fix values
 for minimizing/maximizing TX power"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit afefccc290c2fbbb55325b02e4904993504217a3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/hci_types.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 83956de7d4a..a620097acaf 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -2463,8 +2463,8 @@ struct bt_hci_cp_le_read_remote_fae_table {
 #define BT_HCI_OP_LE_CS_CS_SYNC_2M     0x2
 #define BT_HCI_OP_LE_CS_CS_SYNC_2M_2BT 0x3
 
-#define BT_HCI_OP_LE_CS_TEST_MINIMIZE_TX_POWER 0x7E
-#define BT_HCI_OP_LE_CS_TEST_MAXIMIZE_TX_POWER 0x7F
+#define BT_HCI_OP_LE_CS_TEST_MAXIMIZE_TX_POWER 0x7E
+#define BT_HCI_OP_LE_CS_TEST_MINIMIZE_TX_POWER 0x7F
 
 #define BT_HCI_OP_LE_CS_TEST_ACI_0 0x0
 #define BT_HCI_OP_LE_CS_TEST_ACI_1 0x1

From fcb9de009dd7f44d7fb112fc7667be2192e85242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:59 +0100
Subject: [PATCH 1880/2913] Revert "[nrf fromtree] bluetooth: host Accommodate
 platform endianness for CS types"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ea45b52b818301ab3a5adbcd2d7702e38a08bc01.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/hci_types.h | 40 ----------------------------
 1 file changed, 40 deletions(-)

diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index a620097acaf..cc3ea00afd1 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -3524,13 +3524,8 @@ struct bt_hci_evt_le_cs_config_complete {
 #define BT_HCI_EVT_LE_CS_SUBEVENT_RESULT 0x31
 /** Subevent result step data format: Mode 0 Initiator  */
 struct bt_hci_le_cs_step_data_mode_0_initiator {
-#ifdef CONFIG_LITTLE_ENDIAN
 	uint8_t packet_quality_aa_check: 4;
 	uint8_t packet_quality_bit_errors: 4;
-#else
-	uint8_t packet_quality_bit_errors: 4;
-	uint8_t packet_quality_aa_check: 4;
-#endif /* CONFIG_LITTLE_ENDIAN */
 	uint8_t packet_rssi;
 	uint8_t packet_antenna;
 	uint16_t measured_freq_offset;
@@ -3538,26 +3533,16 @@ struct bt_hci_le_cs_step_data_mode_0_initiator {
 
 /** Subevent result step data format: Mode 0 Reflector  */
 struct bt_hci_le_cs_step_data_mode_0_reflector {
-#ifdef CONFIG_LITTLE_ENDIAN
 	uint8_t packet_quality_aa_check: 4;
 	uint8_t packet_quality_bit_errors: 4;
-#else
-	uint8_t packet_quality_bit_errors: 4;
-	uint8_t packet_quality_aa_check: 4;
-#endif /* CONFIG_LITTLE_ENDIAN */
 	uint8_t packet_rssi;
 	uint8_t packet_antenna;
 } __packed;
 
 /** Subevent result step data format: Mode 1  */
 struct bt_hci_le_cs_step_data_mode_1 {
-#ifdef CONFIG_LITTLE_ENDIAN
 	uint8_t packet_quality_aa_check: 4;
 	uint8_t packet_quality_bit_errors: 4;
-#else
-	uint8_t packet_quality_bit_errors: 4;
-	uint8_t packet_quality_aa_check: 4;
-#endif /* CONFIG_LITTLE_ENDIAN */
 	uint8_t packet_nadm;
 	uint8_t packet_rssi;
 	union {
@@ -3569,13 +3554,8 @@ struct bt_hci_le_cs_step_data_mode_1 {
 
 /** Subevent result step data format: Mode 1 with sounding sequence RTT support */
 struct bt_hci_le_cs_step_data_mode_1_ss_rtt {
-#ifdef CONFIG_LITTLE_ENDIAN
 	uint8_t packet_quality_aa_check: 4;
 	uint8_t packet_quality_bit_errors: 4;
-#else
-	uint8_t packet_quality_bit_errors: 4;
-	uint8_t packet_quality_aa_check: 4;
-#endif /* CONFIG_LITTLE_ENDIAN */
 	uint8_t packet_nadm;
 	uint8_t packet_rssi;
 	union {
@@ -3591,13 +3571,8 @@ struct bt_hci_le_cs_step_data_mode_1_ss_rtt {
 /** Format for per-antenna path step data in modes 2 and 3 */
 struct bt_hci_le_cs_step_data_tone_info {
 	uint8_t phase_correction_term[3];
-#ifdef CONFIG_LITTLE_ENDIAN
 	uint8_t quality_indicator: 4;
 	uint8_t extension_indicator: 4;
-#else
-	uint8_t extension_indicator: 4;
-	uint8_t quality_indicator: 4;
-#endif /* CONFIG_LITTLE_ENDIAN */
 } __packed;
 
 /** Subevent result step data format: Mode 2 */
@@ -3608,13 +3583,8 @@ struct bt_hci_le_cs_step_data_mode_2 {
 
 /** Subevent result step data format: Mode 3 */
 struct bt_hci_le_cs_step_data_mode_3 {
-#ifdef CONFIG_LITTLE_ENDIAN
 	uint8_t packet_quality_aa_check: 4;
 	uint8_t packet_quality_bit_errors: 4;
-#else
-	uint8_t packet_quality_bit_errors: 4;
-	uint8_t packet_quality_aa_check: 4;
-#endif /* CONFIG_LITTLE_ENDIAN */
 	uint8_t packet_nadm;
 	uint8_t packet_rssi;
 	union {
@@ -3628,13 +3598,8 @@ struct bt_hci_le_cs_step_data_mode_3 {
 
 /** Subevent result step data format: Mode 3 with sounding sequence RTT support */
 struct bt_hci_le_cs_step_data_mode_3_ss_rtt {
-#ifdef CONFIG_LITTLE_ENDIAN
 	uint8_t packet_quality_aa_check: 4;
 	uint8_t packet_quality_bit_errors: 4;
-#else
-	uint8_t packet_quality_bit_errors: 4;
-	uint8_t packet_quality_aa_check: 4;
-#endif /* CONFIG_LITTLE_ENDIAN */
 	uint8_t packet_nadm;
 	uint8_t packet_rssi;
 	union {
@@ -3664,13 +3629,8 @@ struct bt_hci_evt_le_cs_subevent_result {
 	uint8_t reference_power_level;
 	uint8_t procedure_done_status;
 	uint8_t subevent_done_status;
-#ifdef CONFIG_LITTLE_ENDIAN
 	uint8_t procedure_abort_reason: 4;
 	uint8_t subevent_abort_reason: 4;
-#else
-	uint8_t subevent_abort_reason: 4;
-	uint8_t procedure_abort_reason: 4;
-#endif /* CONFIG_LITTLE_ENDIAN */
 	uint8_t num_antenna_paths;
 	uint8_t num_steps_reported;
 	uint8_t steps[];

From 2d3564166377ba023f1dffe830351d963cdcf0c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:59 +0100
Subject: [PATCH 1881/2913] Revert "[nrf fromtree] bluetooth: host: LE CS
 subevent result reassembly"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f71108a0273d15df6d67fa7442a4ee432719aa95.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/conn.h      |  20 +-
 include/zephyr/bluetooth/hci_types.h |  20 --
 subsys/bluetooth/Kconfig             |  20 --
 subsys/bluetooth/host/cs.c           | 415 +++------------------------
 subsys/bluetooth/host/hci_core.c     |   4 -
 subsys/bluetooth/host/hci_core.h     |   1 -
 6 files changed, 34 insertions(+), 446 deletions(-)

diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index f81ca8b3ce8..55bb48c6934 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -548,6 +548,7 @@ enum bt_conn_le_cs_procedure_done_status {
 /** Subevent done status */
 enum bt_conn_le_cs_subevent_done_status {
 	BT_CONN_LE_CS_SUBEVENT_COMPLETE = BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_COMPLETE,
+	BT_CONN_LE_CS_SUBEVENT_INCOMPLETE = BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL,
 	BT_CONN_LE_CS_SUBEVENT_ABORTED = BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_ABORTED,
 };
 
@@ -617,19 +618,7 @@ struct bt_conn_le_cs_subevent_result {
 		int8_t reference_power_level;
 		/** Procedure status. */
 		enum bt_conn_le_cs_procedure_done_status procedure_done_status;
-		/** Subevent status
-		 *
-		 *  For aborted subevents, this will be set to @ref BT_CONN_LE_CS_SUBEVENT_ABORTED
-		 *  and abort_step will contain the step number on which the subevent was aborted.
-		 *  Consider the following example:
-		 *
-		 *  subevent_done_status = @ref BT_CONN_LE_CS_SUBEVENT_ABORTED
-		 *  num_steps_reported = 160
-		 *  abort_step = 100
-		 *
-		 *  this would mean that steps from 0 to 99 are complete and steps from 100 to 159
-		 *  are aborted.
-		 */
+		/** Subevent status. */
 		enum bt_conn_le_cs_subevent_done_status subevent_done_status;
 		/** Abort reason.
 		 *
@@ -651,11 +640,6 @@ struct bt_conn_le_cs_subevent_result {
 		/** Number of CS steps in the subevent.
 		 */
 		uint8_t num_steps_reported;
-		/** Step number, on which the subevent was aborted
-		 *  if subevent_done_status is @ref BT_CONN_LE_CS_SUBEVENT_COMPLETE
-		 *  then abort_step will be unused and set to 255
-		 */
-		uint8_t abort_step;
 	} header;
 	struct net_buf_simple *step_data_buf;
 };
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index cc3ea00afd1..131b81134c1 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -3636,25 +3636,6 @@ struct bt_hci_evt_le_cs_subevent_result {
 	uint8_t steps[];
 } __packed;
 
-#define BT_HCI_EVT_LE_CS_SUBEVENT_RESULT_CONTINUE 0x32
-
-struct bt_hci_evt_le_cs_subevent_result_continue {
-	uint16_t conn_handle;
-	uint8_t config_id;
-	uint8_t procedure_done_status;
-	uint8_t subevent_done_status;
-#ifdef CONFIG_LITTLE_ENDIAN
-	uint8_t procedure_abort_reason: 4;
-	uint8_t subevent_abort_reason: 4;
-#else
-	uint8_t subevent_abort_reason: 4;
-	uint8_t procedure_abort_reason: 4;
-#endif /* CONFIG_LITTLE_ENDIAN */
-	uint8_t num_antenna_paths;
-	uint8_t num_steps_reported;
-	uint8_t steps[];
-} __packed;
-
 #define BT_HCI_EVT_LE_CS_TEST_END_COMPLETE 0x33
 struct bt_hci_evt_le_cs_test_end_complete {
 	uint8_t status;
@@ -3753,7 +3734,6 @@ struct bt_hci_evt_le_cs_test_end_complete {
 #define BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE              BT_EVT_BIT(44)
 #define BT_EVT_MASK_LE_CS_CONFIG_COMPLETE                             BT_EVT_BIT(46)
 #define BT_EVT_MASK_LE_CS_SUBEVENT_RESULT                             BT_EVT_BIT(48)
-#define BT_EVT_MASK_LE_CS_SUBEVENT_RESULT_CONTINUE                    BT_EVT_BIT(49)
 #define BT_EVT_MASK_LE_CS_TEST_END_COMPLETE                           BT_EVT_BIT(50)
 
 /** HCI Error Codes, BT Core Spec v5.4 [Vol 1, Part F]. */
diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig
index dbb8214a136..bf6feff37eb 100644
--- a/subsys/bluetooth/Kconfig
+++ b/subsys/bluetooth/Kconfig
@@ -203,26 +203,6 @@ config BT_CHANNEL_SOUNDING_TEST
 	help
 	  Enable support for Channel Sounding test mode.
 
-config BT_CHANNEL_SOUNDING_REASSEMBLY_BUFFER_SIZE
-	int "Subevent result reassembly buffer size"
-	depends on BT_CHANNEL_SOUNDING
-	range 239 5600
-	default 5600
-	help
-	  When the results for a CS subevent cannot fit into a single HCI event,
-	  it will be split up into multiple events and consequently, reassembled into a
-	  full CS subevent. This config sets the size of the reassembly buffer.
-
-config BT_CHANNEL_SOUNDING_REASSEMBLY_BUFFER_CNT
-	int "Subevent result reassembly buffer count"
-	depends on BT_CHANNEL_SOUNDING
-	range 1 BT_MAX_CONN
-	default 1
-	help
-	  Controls the number of the reassembly buffers for CS subevent
-	  results. Each running CS procedure is allocated one buffer and the
-	  number of concurrent CS procedures is limited by this value.
-
 endif # BT_CONN
 
 rsource "Kconfig.iso"
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index 5a09c017261..75d5f21cf2c 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -22,224 +22,6 @@ LOG_MODULE_REGISTER(bt_cs);
 static struct bt_le_cs_test_cb cs_test_callbacks;
 #endif
 
-struct reassembly_buf_meta_data {
-	uint16_t conn_handle;
-};
-
-static void clear_on_disconnect(struct bt_conn *conn, uint8_t reason);
-
-NET_BUF_POOL_FIXED_DEFINE(reassembly_buf_pool, CONFIG_BT_CHANNEL_SOUNDING_REASSEMBLY_BUFFER_CNT,
-			  CONFIG_BT_CHANNEL_SOUNDING_REASSEMBLY_BUFFER_SIZE,
-			  sizeof(struct reassembly_buf_meta_data), NULL);
-
-static sys_slist_t reassembly_bufs = SYS_SLIST_STATIC_INIT(&reassembly_bufs);
-
-struct bt_conn_le_cs_subevent_result reassembled_result;
-
-BT_CONN_CB_DEFINE(cs_conn_callbacks) = {
-	.disconnected = clear_on_disconnect,
-};
-
-/** @brief Allocates new reassembly buffer identified by the connection handle
- *
- * @param conn_handle Connection handle
- * @return struct net_buf* Reassembly buffer, NULL if allocation fails
- */
-static struct net_buf *alloc_reassembly_buf(uint16_t conn_handle)
-{
-	struct net_buf *buf = net_buf_alloc(&reassembly_buf_pool, K_NO_WAIT);
-
-	if (!buf) {
-		LOG_ERR("Failed to allocate new reassembly buffer");
-		return NULL;
-	}
-
-	struct reassembly_buf_meta_data *buf_meta_data =
-		(struct reassembly_buf_meta_data *)buf->user_data;
-
-	buf_meta_data->conn_handle = conn_handle;
-	net_buf_slist_put(&reassembly_bufs, buf);
-
-	LOG_DBG("Allocated new reassembly buffer for conn handle %d", conn_handle);
-	return buf;
-}
-
-/** @brief Frees a reassembly buffer
- *
- * @note Takes the ownership of the pointer and sets it to NULL
- *
- * @param buf Double pointer to reassembly buffer
- */
-static void free_reassembly_buf(struct net_buf **buf)
-{
-	if (!buf) {
-		LOG_ERR("NULL double pointer was passed when attempting to free reassembly buffer");
-		return;
-	}
-
-	if (!(*buf)) {
-		LOG_WRN("Attempted double free on reassembly buffer");
-		return;
-	}
-
-	struct reassembly_buf_meta_data *buf_meta_data =
-		(struct reassembly_buf_meta_data *)((*buf)->user_data);
-
-	LOG_DBG("De-allocating reassembly buffer for conn handle %d", buf_meta_data->conn_handle);
-	if (!sys_slist_find_and_remove(&reassembly_bufs, &(*buf)->node)) {
-		LOG_WRN("The buffer was not in the list");
-	}
-
-	net_buf_unref(*buf);
-	*buf = NULL;
-}
-
-/** @brief Gets the reassembly buffer identified by the connection handle
- *
- * @param conn_handle Connection handle
- * @param allocate Allocates a new reassembly buffer if it's not allocated already
- * @return struct net_buf* Reassembly buffer, NULL if it doesn't exist or failed when allocating new
- */
-static struct net_buf *get_reassembly_buf(uint16_t conn_handle, bool allocate)
-{
-	sys_snode_t *node;
-
-	SYS_SLIST_FOR_EACH_NODE(&reassembly_bufs, node) {
-		struct net_buf *buf = CONTAINER_OF(node, struct net_buf, node);
-		struct reassembly_buf_meta_data *buf_meta_data =
-			(struct reassembly_buf_meta_data *)(buf->user_data);
-
-		if (buf_meta_data->conn_handle == conn_handle) {
-			return buf;
-		}
-	}
-
-	return allocate ? alloc_reassembly_buf(conn_handle) : NULL;
-}
-
-/** @brief Adds step data to a reassembly buffer
- *
- * @param reassembly_buf Reassembly buffer
- * @param data Step data
- * @param data_len Step data length
- * @return true if successful, false if there is insufficient space
- */
-static bool add_reassembly_data(struct net_buf *reassembly_buf, const uint8_t *data,
-				uint16_t data_len)
-{
-	if (data_len > net_buf_tailroom(reassembly_buf)) {
-		LOG_ERR("Not enough reassembly buffer space for subevent result");
-		return false;
-	}
-
-	net_buf_add_mem(reassembly_buf, data, data_len);
-	return true;
-}
-
-/** @brief Initializes a reassembly buffer from partial step data
- *
- * @note Upon first call, this function also registers the disconnection callback
- *       to ensure any dangling reassembly buffer is freed
- *
- * @param conn_handle Connection handle
- * @param steps Step data
- * @param step_data_len Step data length
- * @return struct net_buf* Pointer to reassembly buffer, NULL if fails to allocate or insert data
- */
-static struct net_buf *start_reassembly(uint16_t conn_handle, const uint8_t *steps,
-					uint16_t step_data_len)
-{
-	struct net_buf *reassembly_buf = get_reassembly_buf(conn_handle, true);
-
-	if (!reassembly_buf) {
-		LOG_ERR("No buffer allocated for the result reassembly");
-		return NULL;
-	}
-
-	if (reassembly_buf->len) {
-		LOG_WRN("Over-written incomplete CS subevent results");
-	}
-
-	net_buf_reset(reassembly_buf);
-
-	bool success = add_reassembly_data(reassembly_buf, steps, step_data_len);
-
-	return success ? reassembly_buf : NULL;
-}
-
-/** @brief Adds more step data to reassembly buffer identified by the connection handle
- *
- * @param conn_handle Connection handle
- * @param steps Step data
- * @param step_data_len Step data length
- * @return struct net_buf* Pointer to reassembly buffer, NULL if fails to insert data
- */
-static struct net_buf *continue_reassembly(uint16_t conn_handle, const uint8_t *steps,
-					   uint16_t step_data_len)
-{
-	struct net_buf *reassembly_buf = get_reassembly_buf(conn_handle, false);
-
-	if (!reassembly_buf) {
-		LOG_ERR("No reassembly buffer was allocated for this CS procedure, possibly due to "
-			"an out-of-order subevent result continue event");
-		return NULL;
-	}
-
-	if (!reassembly_buf->len) {
-		LOG_WRN("Discarded out-of-order partial CS subevent results");
-		return NULL;
-	}
-
-	if (!step_data_len) {
-		return reassembly_buf;
-	}
-
-	bool success = add_reassembly_data(reassembly_buf, steps, step_data_len);
-
-	return success ? reassembly_buf : NULL;
-}
-
-/**
- * @brief Disconnect callback to clear any dangling reassembly buffer
- *
- * @param conn Connection
- * @param reason Reason
- */
-static void clear_on_disconnect(struct bt_conn *conn, uint8_t reason)
-{
-	struct net_buf *buf = get_reassembly_buf(conn->handle, false);
-
-	if (buf) {
-		free_reassembly_buf(&buf);
-	}
-}
-
-/** @brief Invokes user callback for new subevent results
- *
- * @param conn Connection context, NULL for CS Test subevent results
- * @param p_result Pointer to subevent results
- */
-static void invoke_subevent_result_callback(struct bt_conn *conn,
-					    struct bt_conn_le_cs_subevent_result *p_result)
-{
-#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
-	if (!conn) {
-		cs_test_callbacks.le_cs_test_subevent_data_available(p_result);
-	} else
-#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
-	{
-		notify_cs_subevent_result(conn, p_result);
-	}
-}
-
-/** @brief Resets reassembly results
- *
- */
-static void reset_reassembly_results(void)
-{
-	memset(&reassembled_result, 0, sizeof(struct bt_conn_le_cs_subevent_result));
-}
-
 void bt_le_cs_set_valid_chmap_bits(uint8_t channel_map[10])
 {
 	memset(channel_map, 0xFF, 10);
@@ -578,9 +360,7 @@ void bt_hci_le_cs_subevent_result(struct net_buf *buf)
 	struct bt_conn *conn = NULL;
 	struct bt_hci_evt_le_cs_subevent_result *evt;
 	struct bt_conn_le_cs_subevent_result result;
-	struct bt_conn_le_cs_subevent_result *p_result = &result;
 	struct net_buf_simple step_data_buf;
-	struct net_buf *reassembly_buf = NULL;
 
 	if (buf->len < sizeof(*evt)) {
 		LOG_ERR("Unexpected end of buffer");
@@ -588,10 +368,14 @@ void bt_hci_le_cs_subevent_result(struct net_buf *buf)
 	}
 
 	evt = net_buf_pull_mem(buf, sizeof(*evt));
-	uint16_t conn_handle = sys_le16_to_cpu(evt->conn_handle);
+
+	if (evt->subevent_done_status == BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL) {
+		LOG_WRN("Discarded incomplete CS subevent results.");
+		return;
+	}
 
 #if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
-	if (conn_handle == BT_HCI_LE_CS_TEST_CONN_HANDLE) {
+	if (sys_le16_to_cpu(evt->conn_handle) == BT_HCI_LE_CS_TEST_CONN_HANDLE) {
 		if (!cs_test_callbacks.le_cs_test_subevent_data_available) {
 			LOG_WRN("No callback registered. Discarded subevent results from CS Test.");
 			return;
@@ -599,177 +383,49 @@ void bt_hci_le_cs_subevent_result(struct net_buf *buf)
 	} else
 #endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
 	{
-		conn = bt_conn_lookup_handle(conn_handle, BT_CONN_TYPE_LE);
+		conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->conn_handle), BT_CONN_TYPE_LE);
 		if (!conn) {
 			LOG_ERR("Unknown connection handle when processing subevent results");
 			return;
 		}
 	}
 
-	if (evt->subevent_done_status != BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL) {
-		p_result->step_data_buf = NULL;
-		if (evt->num_steps_reported) {
-			net_buf_simple_init_with_data(&step_data_buf, evt->steps, buf->len);
-			p_result->step_data_buf = &step_data_buf;
-		}
+	result.header.procedure_counter = sys_le16_to_cpu(evt->procedure_counter);
+	result.header.frequency_compensation = sys_le16_to_cpu(evt->frequency_compensation);
+	result.header.procedure_done_status = evt->procedure_done_status;
+	result.header.subevent_done_status = evt->subevent_done_status;
+	result.header.procedure_abort_reason = evt->procedure_abort_reason;
+	result.header.subevent_abort_reason = evt->subevent_abort_reason;
+	result.header.reference_power_level = evt->reference_power_level;
+	result.header.num_antenna_paths = evt->num_antenna_paths;
+	result.header.num_steps_reported = evt->num_steps_reported;
+
+	if (evt->num_steps_reported) {
+		net_buf_simple_init_with_data(&step_data_buf,
+					      evt->steps,
+					      buf->len);
+		result.step_data_buf = &step_data_buf;
 	} else {
-		if (evt->procedure_done_status != BT_HCI_LE_CS_PROCEDURE_DONE_STATUS_PARTIAL) {
-			LOG_WRN("Procedure status is inconsistent with subevent status. Discarding "
-				"subevent results");
-			goto abort;
-		}
-
-		if (!evt->num_steps_reported) {
-			LOG_WRN("Discarding partial results without step data");
-			goto abort;
-		}
-
-		reassembly_buf = start_reassembly(conn_handle, evt->steps, buf->len);
-		if (!reassembly_buf) {
-			goto abort;
-		}
-
-		p_result = &reassembled_result;
-		p_result->step_data_buf = (struct net_buf_simple *)&reassembly_buf->data;
-	}
-
-	p_result->header.procedure_counter = sys_le16_to_cpu(evt->procedure_counter);
-	p_result->header.frequency_compensation = sys_le16_to_cpu(evt->frequency_compensation);
-	p_result->header.procedure_done_status = evt->procedure_done_status;
-	p_result->header.subevent_done_status = evt->subevent_done_status;
-	p_result->header.procedure_abort_reason = evt->procedure_abort_reason;
-	p_result->header.subevent_abort_reason = evt->subevent_abort_reason;
-	p_result->header.reference_power_level = evt->reference_power_level;
-	p_result->header.num_antenna_paths = evt->num_antenna_paths;
-	p_result->header.num_steps_reported = evt->num_steps_reported;
-	p_result->header.abort_step =
-		evt->subevent_done_status == BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_ABORTED ? 0 : 255;
-
-	p_result->header.config_id = 0;
-	p_result->header.start_acl_conn_event = 0;
-	if (conn) {
-		p_result->header.config_id = evt->config_id;
-		p_result->header.start_acl_conn_event =
-			sys_le16_to_cpu(evt->start_acl_conn_event_counter);
+		result.step_data_buf = NULL;
 	}
 
-	if (evt->subevent_done_status != BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL) {
-		invoke_subevent_result_callback(conn, p_result);
-	}
-
-	if (evt->procedure_done_status != BT_CONN_LE_CS_PROCEDURE_INCOMPLETE) {
-		/* We can now clear the any reassembly buffer allocated for this procedure,
-		 * to avoid code duplication, we're using the abort label to do so
-		 */
-		goto abort;
-	}
-
-	if (conn) {
-		bt_conn_unref(conn);
-		conn = NULL;
-	}
-
-	return;
-
-abort:
-	if (conn) {
-		bt_conn_unref(conn);
-		conn = NULL;
-	}
-
-	reassembly_buf = get_reassembly_buf(conn_handle, false);
-	if (reassembly_buf) {
-		free_reassembly_buf(&reassembly_buf);
-	}
-}
-
-void bt_hci_le_cs_subevent_result_continue(struct net_buf *buf)
-{
-	struct bt_conn *conn = NULL;
-	struct bt_hci_evt_le_cs_subevent_result_continue *evt;
-	struct net_buf *reassembly_buf = NULL;
-	uint16_t conn_handle;
+#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
+	if (sys_le16_to_cpu(evt->conn_handle) == BT_HCI_LE_CS_TEST_CONN_HANDLE) {
+		result.header.config_id = 0;
+		result.header.start_acl_conn_event = 0;
 
-	if (buf->len < sizeof(*evt)) {
-		LOG_ERR("Unexpected end of buffer");
-		return;
-	}
+		cs_test_callbacks.le_cs_test_subevent_data_available(&result);
 
-	evt = net_buf_pull_mem(buf, sizeof(*evt));
-	conn_handle = sys_le16_to_cpu(evt->conn_handle);
-
-#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
-	if (conn_handle == BT_HCI_LE_CS_TEST_CONN_HANDLE) {
-		if (!cs_test_callbacks.le_cs_test_subevent_data_available) {
-			LOG_WRN("No callback registered. Discarded subevent results from CS Test.");
-			return;
-		}
 	} else
 #endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
 	{
-		conn = bt_conn_lookup_handle(conn_handle, BT_CONN_TYPE_LE);
-		if (!conn) {
-			LOG_ERR("Unknown connection handle when processing subevent results");
-			return;
-		}
-	}
-
-	uint16_t step_data_len = evt->num_steps_reported ? buf->len : 0;
-
-	reassembly_buf = continue_reassembly(conn_handle, evt->steps, step_data_len);
-	if (!reassembly_buf) {
-		goto abort;
-	}
-
-	reassembled_result.header.procedure_done_status = evt->procedure_done_status;
-	reassembled_result.header.subevent_done_status = evt->subevent_done_status;
-	reassembled_result.header.procedure_abort_reason = evt->procedure_abort_reason;
-	reassembled_result.header.subevent_abort_reason = evt->subevent_abort_reason;
-
-	if (evt->num_antenna_paths != reassembled_result.header.num_antenna_paths) {
-		LOG_WRN("Received inconsistent number of antenna paths from the controller: %d, "
-			"previous number was: %d",
-			evt->num_antenna_paths, reassembled_result.header.num_antenna_paths);
-	}
-
-	if (evt->subevent_done_status == BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_ABORTED &&
-	    reassembled_result.header.num_steps_reported < reassembled_result.header.abort_step) {
-		reassembled_result.header.abort_step = reassembled_result.header.num_steps_reported;
-	}
-
-	reassembled_result.header.num_steps_reported += evt->num_steps_reported;
-
-	if (evt->subevent_done_status != BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL) {
-		invoke_subevent_result_callback(conn, &reassembled_result);
-		net_buf_reset(reassembly_buf);
-		reset_reassembly_results();
-	}
-
-	if (evt->procedure_done_status != BT_HCI_LE_CS_PROCEDURE_DONE_STATUS_PARTIAL) {
-		if (evt->subevent_done_status == BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL) {
-			LOG_WRN("Procedure status is inconsistent with subevent status. Discarding "
-				"subevent results");
-			goto abort;
-		}
-
-		free_reassembly_buf(&reassembly_buf);
-	}
-
-	if (conn) {
-		bt_conn_unref(conn);
-		conn = NULL;
-	}
+		result.header.config_id = evt->config_id;
+		result.header.start_acl_conn_event =
+			sys_le16_to_cpu(evt->start_acl_conn_event_counter);
 
-	return;
+		notify_cs_subevent_result(conn, &result);
 
-abort:
-	if (conn) {
 		bt_conn_unref(conn);
-		conn = NULL;
-	}
-
-	if (reassembly_buf) {
-		free_reassembly_buf(&reassembly_buf);
 	}
 }
 
@@ -905,13 +561,6 @@ void bt_hci_le_cs_test_end_complete(struct net_buf *buf)
 		return;
 	}
 
-	struct net_buf *reassembly_buf = get_reassembly_buf(BT_HCI_LE_CS_TEST_CONN_HANDLE, false);
-
-	if (reassembly_buf) {
-		LOG_WRN("De-allocating a dangling reassembly buffer");
-		free_reassembly_buf(&reassembly_buf);
-	}
-
 	if (cs_test_callbacks.le_cs_test_end_complete) {
 		cs_test_callbacks.le_cs_test_end_complete();
 	}
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index 0d0b5a9c60b..6d0670502c1 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -2833,9 +2833,6 @@ static const struct event_handler meta_events[] = {
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_SUBEVENT_RESULT,
 		      bt_hci_le_cs_subevent_result,
 		      sizeof(struct bt_hci_evt_le_cs_subevent_result)),
-	EVENT_HANDLER(BT_HCI_EVT_LE_CS_SUBEVENT_RESULT_CONTINUE,
-		      bt_hci_le_cs_subevent_result_continue,
-		      sizeof(struct bt_hci_evt_le_cs_subevent_result_continue)),
 #if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_TEST_END_COMPLETE,
 		      bt_hci_le_cs_test_end_complete,
@@ -3419,7 +3416,6 @@ static int le_set_event_mask(void)
 		mask |= BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE;
 		mask |= BT_EVT_MASK_LE_CS_CONFIG_COMPLETE;
 		mask |= BT_EVT_MASK_LE_CS_SUBEVENT_RESULT;
-		mask |= BT_EVT_MASK_LE_CS_SUBEVENT_RESULT_CONTINUE;
 		mask |= BT_EVT_MASK_LE_CS_TEST_END_COMPLETE;
 	}
 
diff --git a/subsys/bluetooth/host/hci_core.h b/subsys/bluetooth/host/hci_core.h
index 458576e74f7..27387c9c53f 100644
--- a/subsys/bluetooth/host/hci_core.h
+++ b/subsys/bluetooth/host/hci_core.h
@@ -543,7 +543,6 @@ void bt_hci_le_cs_read_remote_supported_capabilities_complete(struct net_buf *bu
 void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf);
 void bt_hci_le_cs_config_complete_event(struct net_buf *buf);
 void bt_hci_le_cs_subevent_result(struct net_buf *buf);
-void bt_hci_le_cs_subevent_result_continue(struct net_buf *buf);
 void bt_hci_le_cs_test_end_complete(struct net_buf *buf);
 
 /* Adv HCI event handlers */

From bdca6cb1cfb0fbd74cdc4b904cc55cc2c1389ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:59 +0100
Subject: [PATCH 1882/2913] Revert "[nrf fromtree] samples: icbmsg: Change
 regex for no_multithreading test"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fffeaf2cb035fe5843f3afca2853cdc79574cfc4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/subsys/ipc/ipc_service/icmsg/sample.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/samples/subsys/ipc/ipc_service/icmsg/sample.yaml b/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
index 27a2a8b6d8d..9305aa61a03 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
+++ b/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
@@ -133,12 +133,12 @@ tests:
       type: multi_line
       ordered: false
       regex:
-        - "I: IPC-service HOST demo started"
-        - "I: Ep bounded"
-        - "I: Perform sends for"
-        - "I: Sent"
-        - "I: Received"
-        - "I: IPC-service HOST demo ended"
+        - "host: IPC-service HOST demo started"
+        - "host: Ep bounded"
+        - "host: Perform sends for"
+        - "host: Sent"
+        - "host: Received"
+        - "host: IPC-service HOST demo ended"
 
   sample.ipc.icbmsg.nrf54l15_remote_no_multithreading:
     platform_allow: nrf54l15dk/nrf54l15/cpuapp

From 7c5b380b0d0c1c2cd3f571ca169a4d6e22b69ca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:59 +0100
Subject: [PATCH 1883/2913] Revert "[nrf fromtree] boards: nordic: Do not
 enable hw-flow-control on console"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2a818c30f67744a729b961b31a3170659fbd2cbc.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts    | 1 +
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr.dts    | 1 +
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts    | 1 +
 boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi       | 1 +
 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts   | 1 +
 boards/nordic/nrf54l15pdk/nrf54l15_cpuapp_common.dtsi      | 1 +
 boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.dts | 1 +
 boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts     | 1 +
 boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuppr.dts     | 1 +
 boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts     | 1 +
 10 files changed, 10 insertions(+)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index c85b911302f..eacc510ce8a 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -248,6 +248,7 @@ ipc0: &cpuapp_cpurad_ipc {
 	pinctrl-0 = <&uart136_default>;
 	pinctrl-1 = <&uart136_sleep>;
 	pinctrl-names = "default", "sleep";
+	hw-flow-control;
 };
 
 &gpio6 {
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr.dts
index 59b53aafcb2..2143823239c 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr.dts
@@ -48,6 +48,7 @@
 	pinctrl-0 = <&uart135_default>;
 	pinctrl-1 = <&uart135_sleep>;
 	pinctrl-names = "default", "sleep";
+	hw-flow-control;
 };
 
 &uart136 {
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
index cb8fb9e1a02..77e69aa463c 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
@@ -95,6 +95,7 @@ ipc0: &cpuapp_cpurad_ipc {
 	pinctrl-0 = <&uart135_default>;
 	pinctrl-1 = <&uart135_sleep>;
 	pinctrl-names = "default", "sleep";
+	hw-flow-control;
 };
 
 &uart136 {
diff --git a/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi b/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi
index 191babb632f..4292e9a1523 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi
@@ -87,6 +87,7 @@
 
 &uart20 {
 	status = "okay";
+	hw-flow-control;
 };
 
 &gpio0 {
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts
index 472e3f2b8d3..a608941514e 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuflpr.dts
@@ -48,6 +48,7 @@
 
 &uart30 {
 	status = "okay";
+	hw-flow-control;
 };
 
 &gpio0 {
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15_cpuapp_common.dtsi b/boards/nordic/nrf54l15pdk/nrf54l15_cpuapp_common.dtsi
index 474874d110c..1327d48f5bd 100644
--- a/boards/nordic/nrf54l15pdk/nrf54l15_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l15pdk/nrf54l15_cpuapp_common.dtsi
@@ -87,6 +87,7 @@
 
 &uart20 {
 	status = "okay";
+	hw-flow-control;
 };
 
 &gpio0 {
diff --git a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.dts b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.dts
index c8ed4abb79f..2b80a45c4e1 100644
--- a/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.dts
+++ b/boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuflpr.dts
@@ -48,6 +48,7 @@
 
 &uart30 {
 	status = "okay";
+	hw-flow-control;
 };
 
 &gpio0 {
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index aff2a15e6c1..17715ee0087 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -240,6 +240,7 @@ ipc0: &cpuapp_cpurad_ipc {
 	pinctrl-0 = <&uart136_default>;
 	pinctrl-1 = <&uart136_sleep>;
 	pinctrl-names = "default", "sleep";
+	hw-flow-control;
 };
 
 &gpio6 {
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuppr.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuppr.dts
index 10942796ff3..5da976ef70d 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuppr.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuppr.dts
@@ -49,6 +49,7 @@
 	pinctrl-0 = <&uart135_default>;
 	pinctrl-1 = <&uart135_sleep>;
 	pinctrl-names = "default", "sleep";
+	hw-flow-control;
 };
 
 &uart136 {
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
index f9bfae09897..ddda9eb5871 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
@@ -100,6 +100,7 @@ ipc0: &cpuapp_cpurad_ipc {
 	pinctrl-0 = <&uart135_default>;
 	pinctrl-1 = <&uart135_sleep>;
 	pinctrl-names = "default", "sleep";
+	hw-flow-control;
 };
 
 &uart136 {

From 20c79d60fa14bb5aa372f115911f3b7f5d445c57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:59 +0100
Subject: [PATCH 1884/2913] Revert "[nrf fromtree] drivers: pwm: nrfx: Improve
 runtime PM"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 07e38a764518d653dc563f966bc2a96d2b0049dd.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/pwm/pwm_nrfx.c | 75 +++++++++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 30 deletions(-)

diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index 420a9078c59..9ceb2f53302 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -257,12 +257,19 @@ static const struct pwm_driver_api pwm_nrfx_drv_api_funcs = {
 	.get_cycles_per_sec = pwm_nrfx_get_cycles_per_sec,
 };
 
-static void pwm_resume(const struct device *dev)
+static int pwm_nrfx_init(const struct device *dev)
 {
 	const struct pwm_nrfx_config *config = dev->config;
 	uint8_t initially_inverted = 0;
+	nrfx_err_t result;
+
+	int ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+
+	ANOMALY_109_EGU_IRQ_CONNECT(NRFX_PWM_NRF52_ANOMALY_109_EGU_INSTANCE);
 
-	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+	if (ret < 0) {
+		return ret;
+	}
 
 	for (size_t i = 0; i < NRF_PWM_CHANNEL_COUNT; i++) {
 		uint32_t psel;
@@ -282,53 +289,61 @@ static void pwm_resume(const struct device *dev)
 
 		seq_values_ptr_get(dev)[i] = PWM_NRFX_CH_VALUE(0, inverted);
 	}
+
+	result = nrfx_pwm_init(&config->pwm, &config->initial_config, pwm_handler, dev->data);
+	if (result != NRFX_SUCCESS) {
+		LOG_ERR("Failed to initialize device: %s", dev->name);
+		return -EBUSY;
+	}
+
+	return 0;
 }
 
-static void pwm_suspend(const struct device *dev)
+#ifdef CONFIG_PM_DEVICE
+static void pwm_nrfx_uninit(const struct device *dev)
 {
 	const struct pwm_nrfx_config *config = dev->config;
 
-	nrfx_pwm_stop(&config->pwm, false);
-	while (!nrfx_pwm_stopped_check(&config->pwm)) {
-	}
+	nrfx_pwm_uninit(&config->pwm);
 
 	memset(dev->data, 0, sizeof(struct pwm_nrfx_data));
-	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
 }
 
 static int pwm_nrfx_pm_action(const struct device *dev,
 			      enum pm_device_action action)
-{
-	if (action == PM_DEVICE_ACTION_RESUME) {
-		pwm_resume(dev);
-	} else if (IS_ENABLED(CONFIG_PM_DEVICE) && (action == PM_DEVICE_ACTION_SUSPEND)) {
-		pwm_suspend(dev);
-	} else {
-		return -ENOTSUP;
-	}
-
-	return 0;
-}
-
-static int pwm_nrfx_init(const struct device *dev)
 {
 	const struct pwm_nrfx_config *config = dev->config;
-	nrfx_err_t err;
+	int ret = 0;
 
-	ANOMALY_109_EGU_IRQ_CONNECT(NRFX_PWM_NRF52_ANOMALY_109_EGU_INSTANCE);
+	switch (action) {
+	case PM_DEVICE_ACTION_RESUME:
+		ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+		if (ret < 0) {
+			return ret;
+		}
+		ret = pwm_nrfx_init(dev);
+		break;
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
-	}
+	case PM_DEVICE_ACTION_SUSPEND:
+		pwm_nrfx_uninit(dev);
 
-	err = nrfx_pwm_init(&config->pwm, &config->initial_config, pwm_handler, dev->data);
-	if (err != NRFX_SUCCESS) {
-		LOG_ERR("Failed to initialize device: %s", dev->name);
-		return -EBUSY;
+		ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
+		if (ret < 0) {
+			return ret;
+		}
+		break;
+
+	default:
+		return -ENOTSUP;
 	}
 
-	return pm_device_driver_init(dev, pwm_nrfx_pm_action);
+	return ret;
 }
+#else
+
+#define pwm_nrfx_pm_action NULL
+
+#endif /* CONFIG_PM_DEVICE */
 
 #define PWM(dev_idx) DT_NODELABEL(pwm##dev_idx)
 #define PWM_PROP(dev_idx, prop) DT_PROP(PWM(dev_idx), prop)

From 2134bf7e2665f96d2f56219cb821254c5ff83249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:59 +0100
Subject: [PATCH 1885/2913] Revert "[nrf fromtree] drivers: pwm: nrfx: Disable
 PWM peripheral when not used"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6fe25620465757428f55769a7f791514c04345d0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/pwm/pwm_nrfx.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index 9ceb2f53302..a1ee27fc702 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -20,6 +20,7 @@ LOG_MODULE_REGISTER(pwm_nrfx, CONFIG_PWM_LOG_LEVEL);
  * to 0 or 1, hence the use of #if IS_ENABLED().
  */
 #if IS_ENABLED(NRFX_PWM_NRF52_ANOMALY_109_WORKAROUND_ENABLED)
+#define ANOMALY_109_IRQ_CONNECT(...) IRQ_CONNECT(__VA_ARGS__)
 #define ANOMALY_109_EGU_IRQ_CONNECT(idx) _EGU_IRQ_CONNECT(idx)
 #define _EGU_IRQ_CONNECT(idx) \
 	extern void nrfx_egu_##idx##_irq_handler(void); \
@@ -27,6 +28,7 @@ LOG_MODULE_REGISTER(pwm_nrfx, CONFIG_PWM_LOG_LEVEL);
 		    DT_IRQ(DT_NODELABEL(egu##idx), priority), \
 		    nrfx_isr, nrfx_egu_##idx##_irq_handler, 0)
 #else
+#define ANOMALY_109_IRQ_CONNECT(...)
 #define ANOMALY_109_EGU_IRQ_CONNECT(idx)
 #endif
 
@@ -61,12 +63,6 @@ static uint16_t *seq_values_ptr_get(const struct device *dev)
 	return (uint16_t *)config->seq.values.p_raw;
 }
 
-static void pwm_handler(nrfx_pwm_evt_type_t event_type, void *p_context)
-{
-	ARG_UNUSED(event_type);
-	ARG_UNUSED(p_context);
-}
-
 static bool pwm_period_check_and_set(const struct device *dev,
 				     uint32_t channel, uint32_t period_cycles)
 {
@@ -233,8 +229,7 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 		 * until another playback is requested (new values will be
 		 * loaded then) or the PWM peripheral is stopped.
 		 */
-		nrfx_pwm_simple_playback(&config->pwm, &config->seq, 1,
-					 NRFX_PWM_FLAG_NO_EVT_FINISHED);
+		nrfx_pwm_simple_playback(&config->pwm, &config->seq, 1, 0);
 	}
 
 	return 0;
@@ -261,7 +256,6 @@ static int pwm_nrfx_init(const struct device *dev)
 {
 	const struct pwm_nrfx_config *config = dev->config;
 	uint8_t initially_inverted = 0;
-	nrfx_err_t result;
 
 	int ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
 
@@ -290,7 +284,10 @@ static int pwm_nrfx_init(const struct device *dev)
 		seq_values_ptr_get(dev)[i] = PWM_NRFX_CH_VALUE(0, inverted);
 	}
 
-	result = nrfx_pwm_init(&config->pwm, &config->initial_config, pwm_handler, dev->data);
+	nrfx_err_t result = nrfx_pwm_init(&config->pwm,
+					  &config->initial_config,
+					  NULL,
+					  NULL);
 	if (result != NRFX_SUCCESS) {
 		LOG_ERR("Failed to initialize device: %s", dev->name);
 		return -EBUSY;
@@ -380,8 +377,9 @@ static int pwm_nrfx_pm_action(const struct device *dev,
 	};								      \
 	static int pwm_nrfx_init##idx(const struct device *dev)		      \
 	{								      \
-		IRQ_CONNECT(DT_IRQN(PWM(idx)), DT_IRQ(PWM(idx), priority),    \
-			    nrfx_isr, nrfx_pwm_##idx##_irq_handler, 0);	      \
+		ANOMALY_109_IRQ_CONNECT(				      \
+			DT_IRQN(PWM(idx)), DT_IRQ(PWM(idx), priority),	      \
+			nrfx_isr, nrfx_pwm_##idx##_irq_handler, 0);	      \
 		return pwm_nrfx_init(dev);				      \
 	};								      \
 	PM_DEVICE_DT_DEFINE(PWM(idx), pwm_nrfx_pm_action);		      \

From 5774b5c9a5b098b70bdf415d4093846483440a2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:59 +0100
Subject: [PATCH 1886/2913] Revert "[nrf fromtree] drivers: pwm: nrfx: Improve
 device generation macros"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7f1e48338a93047781b6f2ceff34dc8a7ad5c1b0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/pwm/pwm_nrfx.c | 49 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index a1ee27fc702..f6312535c7e 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -390,7 +390,50 @@ static int pwm_nrfx_pm_action(const struct device *dev,
 			 POST_KERNEL, CONFIG_PWM_INIT_PRIORITY,		      \
 			 &pwm_nrfx_drv_api_funcs)
 
-#define COND_PWM_NRFX_DEVICE(unused, prefix, i, _) \
-	IF_ENABLED(CONFIG_HAS_HW_NRF_PWM##prefix##i, (PWM_NRFX_DEVICE(prefix##i);))
+#ifdef CONFIG_HAS_HW_NRF_PWM0
+PWM_NRFX_DEVICE(0);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_PWM1
+PWM_NRFX_DEVICE(1);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_PWM2
+PWM_NRFX_DEVICE(2);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_PWM3
+PWM_NRFX_DEVICE(3);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_PWM20
+PWM_NRFX_DEVICE(20);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_PWM21
+PWM_NRFX_DEVICE(21);
+#endif
 
-NRFX_FOREACH_PRESENT(PWM, COND_PWM_NRFX_DEVICE, (), (), _)
+#ifdef CONFIG_HAS_HW_NRF_PWM22
+PWM_NRFX_DEVICE(22);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_PWM120
+PWM_NRFX_DEVICE(120);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_PWM130
+PWM_NRFX_DEVICE(130);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_PWM131
+PWM_NRFX_DEVICE(131);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_PWM132
+PWM_NRFX_DEVICE(132);
+#endif
+
+#ifdef CONFIG_HAS_HW_NRF_PWM133
+PWM_NRFX_DEVICE(133);
+#endif

From 5e650f7dc4cf3eb140e0037a6bc7cb6ffea1ce8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:59 +0100
Subject: [PATCH 1887/2913] Revert "[nrf fromtree] pm: device: allow optional
 support of TURN_ON action"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7b8b2beed601da5a5dda95337bc48bfc6a4ecc2b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/pm/device.h | 5 ++---
 subsys/pm/device.c         | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/zephyr/pm/device.h b/include/zephyr/pm/device.h
index a6e2ef032c0..26e4a803774 100644
--- a/include/zephyr/pm/device.h
+++ b/include/zephyr/pm/device.h
@@ -625,8 +625,7 @@ bool pm_device_is_powered(const struct device *dev);
  * This helper function is intended to be called at the end of a driver
  * init function to automatically setup the device into the lowest power
  * mode. It assumes that the device has been configured as if it is in
- * @ref PM_DEVICE_STATE_OFF, or @ref PM_DEVICE_STATE_SUSPENDED if device can
- * never be powered off.
+ * @ref PM_DEVICE_STATE_OFF.
  *
  * @param dev Device instance.
  * @param action_cb Device PM control callback function.
@@ -719,7 +718,7 @@ static inline int pm_device_driver_init(const struct device *dev, pm_device_acti
 
 	/* When power management is not enabled, all drivers should initialise to active state */
 	rc = action_cb(dev, PM_DEVICE_ACTION_TURN_ON);
-	if ((rc < 0) && (rc != -ENOTSUP)) {
+	if (rc < 0) {
 		return rc;
 	}
 
diff --git a/subsys/pm/device.c b/subsys/pm/device.c
index 518e20a8630..f272a2a8e28 100644
--- a/subsys/pm/device.c
+++ b/subsys/pm/device.c
@@ -370,7 +370,7 @@ int pm_device_driver_init(const struct device *dev,
 
 	/* Run power-up logic */
 	rc = action_cb(dev, PM_DEVICE_ACTION_TURN_ON);
-	if ((rc < 0) && (rc != -ENOTSUP)) {
+	if (rc != 0) {
 		return rc;
 	}
 

From d46b50b6185ae99607f06c0117e76a45a98adca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:59 +0100
Subject: [PATCH 1888/2913] Revert "[nrf fromtree] bluetooth: conn: Use a
 separate workqueue for connection TX notify"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2ffc67d08d682ca70f7f2d0ba217bded613c9ef2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/host/Kconfig         |  29 --------
 subsys/bluetooth/host/conn.c          | 103 +++++++++-----------------
 subsys/bluetooth/host/conn_internal.h |   2 -
 subsys/bluetooth/host/hci_core.c      |   2 +-
 4 files changed, 37 insertions(+), 99 deletions(-)

diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index 4710f24e90c..233c916408f 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -129,35 +129,6 @@ config BT_DRIVER_RX_HIGH_PRIO
 	int
 	default 6
 
-config BT_CONN_TX_NOTIFY_WQ
-	bool "Use a separate workqueue for connection TX notify processing [EXPERIMENTAL]"
-	depends on BT_CONN_TX
-	select EXPERIMENTAL
-	help
-	  Use a separate workqueue instead of system workqueue for
-	  bt_conn_tx_notify processing. The option can be used to make Bluetooth
-	  stack more independent from the system workqueue.
-
-if BT_CONN_TX_NOTIFY_WQ
-
-config BT_CONN_TX_NOTIFY_WQ_STACK_SIZE
-	int "Stack size of workqueue for connection TX notify processing"
-	default SYSTEM_WORKQUEUE_STACK_SIZE
-
-config BT_CONN_TX_NOTIFY_WQ_PRIO
-	int "Cooperative priority of workqueue for connection TX notify processing"
-	default 8
-
-config BT_CONN_TX_NOTIFY_WQ_INIT_PRIORITY
-	int "Init priority of workqueue for connection TX notify processing"
-	default 50
-	help
-	  The connection TX notify processing workqueue is initialized during
-	  system initialization (at POST_KERNEL level). The Kconfig option
-	  controls the initialization priority within level.
-
-endif # BT_CONN_TX_NOTIFY_WQ
-
 menu "Bluetooth Host"
 
 if BT_HCI_HOST
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index bfb29b31cd9..01c3bcbe04a 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -52,11 +52,6 @@ LOG_MODULE_REGISTER(bt_conn);
 
 K_FIFO_DEFINE(free_tx);
 
-#if defined(CONFIG_BT_CONN_TX_NOTIFY_WQ)
-static struct k_work_q conn_tx_workq;
-static K_KERNEL_STACK_DEFINE(conn_tx_workq_thread_stack, CONFIG_BT_CONN_TX_NOTIFY_WQ_STACK_SIZE);
-#endif /* CONFIG_BT_CONN_TX_NOTIFY_WQ */
-
 static void tx_free(struct bt_conn_tx *tx);
 
 static void conn_tx_destroy(struct bt_conn *conn, struct bt_conn_tx *tx)
@@ -259,21 +254,12 @@ static void tx_free(struct bt_conn_tx *tx)
 }
 
 #if defined(CONFIG_BT_CONN_TX)
-static struct k_work_q *tx_notify_workqueue_get(void)
+static void tx_notify(struct bt_conn *conn)
 {
-#if defined(CONFIG_BT_CONN_TX_NOTIFY_WQ)
-	return &conn_tx_workq;
-#else
-	return &k_sys_work_q;
-#endif /* CONFIG_BT_CONN_TX_NOTIFY_WQ */
-}
+	__ASSERT_NO_MSG(k_current_get() ==
+			k_work_queue_thread_get(&k_sys_work_q));
 
-static void tx_notify_process(struct bt_conn *conn)
-{
-	/* TX notify processing is done only from a single thread. */
-	__ASSERT_NO_MSG(k_current_get() == k_work_queue_thread_get(tx_notify_workqueue_get()));
-
-	LOG_DBG("conn %p", (void *)conn);
+	LOG_DBG("conn %p", conn);
 
 	while (1) {
 		struct bt_conn_tx *tx = NULL;
@@ -314,30 +300,7 @@ static void tx_notify_process(struct bt_conn *conn)
 		bt_tx_irq_raise();
 	}
 }
-#endif /* CONFIG_BT_CONN_TX */
-
-void bt_conn_tx_notify(struct bt_conn *conn, bool wait_for_completion)
-{
-#if defined(CONFIG_BT_CONN_TX)
-	/* Ensure that function is called only from a single context. */
-	if (k_current_get() == k_work_queue_thread_get(tx_notify_workqueue_get())) {
-		tx_notify_process(conn);
-	} else {
-		struct k_work_sync sync;
-		int err;
-
-		err = k_work_submit_to_queue(tx_notify_workqueue_get(), &conn->tx_complete_work);
-		__ASSERT(err >= 0, "couldn't submit (err %d)", err);
-
-		if (wait_for_completion) {
-			(void)k_work_flush(&conn->tx_complete_work, &sync);
-		}
-	}
-#else
-	ARG_UNUSED(conn);
-	ARG_UNUSED(wait_for_completion);
-#endif /* CONFIG_BT_CONN_TX */
-}
+#endif	/* CONFIG_BT_CONN_TX */
 
 struct bt_conn *bt_conn_new(struct bt_conn *conns, size_t size)
 {
@@ -476,15 +439,38 @@ static void bt_acl_recv(struct bt_conn *conn, struct net_buf *buf, uint8_t flags
 	bt_l2cap_recv(conn, buf, true);
 }
 
+static void wait_for_tx_work(struct bt_conn *conn)
+{
+#if defined(CONFIG_BT_CONN_TX)
+	LOG_DBG("conn %p", conn);
+
+	if (IS_ENABLED(CONFIG_BT_RECV_WORKQ_SYS) ||
+	    k_current_get() == k_work_queue_thread_get(&k_sys_work_q)) {
+		tx_notify(conn);
+	} else {
+		struct k_work_sync sync;
+		int err;
+
+		err = k_work_submit(&conn->tx_complete_work);
+		__ASSERT(err >= 0, "couldn't submit (err %d)", err);
+
+		k_work_flush(&conn->tx_complete_work, &sync);
+	}
+	LOG_DBG("done");
+#else
+	ARG_UNUSED(conn);
+#endif	/* CONFIG_BT_CONN_TX */
+}
+
 void bt_conn_recv(struct bt_conn *conn, struct net_buf *buf, uint8_t flags)
 {
 	/* Make sure we notify any pending TX callbacks before processing
 	 * new data for this connection.
 	 *
 	 * Always do so from the same context for sanity. In this case that will
-	 * be either a dedicated Bluetooth connection TX workqueue or system workqueue.
+	 * be the system workqueue.
 	 */
-	bt_conn_tx_notify(conn, true);
+	wait_for_tx_work(conn);
 
 	LOG_DBG("handle %u len %u flags %02x", conn->handle, buf->len, flags);
 
@@ -1254,7 +1240,7 @@ void bt_conn_set_state(struct bt_conn *conn, bt_conn_state_t state)
 		 */
 		switch (old_state) {
 		case BT_CONN_DISCONNECT_COMPLETE:
-			bt_conn_tx_notify(conn, true);
+			wait_for_tx_work(conn);
 
 			bt_conn_reset_rx_state(conn);
 
@@ -1645,9 +1631,12 @@ struct net_buf *bt_conn_create_pdu_timeout(struct net_buf_pool *pool,
 #if defined(CONFIG_BT_CONN_TX)
 static void tx_complete_work(struct k_work *work)
 {
-	struct bt_conn *conn = CONTAINER_OF(work, struct bt_conn, tx_complete_work);
+	struct bt_conn *conn = CONTAINER_OF(work, struct bt_conn,
+					    tx_complete_work);
 
-	tx_notify_process(conn);
+	LOG_DBG("conn %p", conn);
+
+	tx_notify(conn);
 }
 #endif /* CONFIG_BT_CONN_TX */
 
@@ -4172,23 +4161,3 @@ void bt_hci_le_df_cte_req_failed(struct net_buf *buf)
 #endif /* CONFIG_BT_DF_CONNECTION_CTE_REQ */
 
 #endif /* CONFIG_BT_CONN */
-
-#if defined(CONFIG_BT_CONN_TX_NOTIFY_WQ)
-static int bt_conn_tx_workq_init(void)
-{
-	const struct k_work_queue_config cfg = {
-		.name = "BT CONN TX WQ",
-		.no_yield = false,
-		.essential = false,
-	};
-
-	k_work_queue_init(&conn_tx_workq);
-	k_work_queue_start(&conn_tx_workq, conn_tx_workq_thread_stack,
-			   K_THREAD_STACK_SIZEOF(conn_tx_workq_thread_stack),
-			   K_PRIO_COOP(CONFIG_BT_CONN_TX_NOTIFY_WQ_PRIO), &cfg);
-
-	return 0;
-}
-
-SYS_INIT(bt_conn_tx_workq_init, POST_KERNEL, CONFIG_BT_CONN_TX_NOTIFY_WQ_INIT_PRIORITY);
-#endif /* CONFIG_BT_CONN_TX_NOTIFY_WQ */
diff --git a/subsys/bluetooth/host/conn_internal.h b/subsys/bluetooth/host/conn_internal.h
index ac2141c1aad..37e49afa964 100644
--- a/subsys/bluetooth/host/conn_internal.h
+++ b/subsys/bluetooth/host/conn_internal.h
@@ -358,8 +358,6 @@ static inline void *closure_data(void *storage)
 	return ((struct closure *)storage)->data;
 }
 
-void bt_conn_tx_notify(struct bt_conn *conn, bool wait_for_completion);
-
 void bt_conn_reset_rx_state(struct bt_conn *conn);
 
 /* Process incoming data for a connection */
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index 6d0670502c1..f2f6c10601a 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -605,7 +605,7 @@ static void hci_num_completed_packets(struct net_buf *buf)
 			atomic_dec(&conn->in_ll);
 
 			/* TX context free + callback happens in there */
-			bt_conn_tx_notify(conn, false);
+			k_work_submit(&conn->tx_complete_work);
 		}
 
 		bt_conn_unref(conn);

From c53d3d3cff3ed4ac5fdfeb2354eacbfd8202f251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:28:59 +0100
Subject: [PATCH 1889/2913] Revert "[nrf fromtree] dp: swdp_bitbang: fix unused
 variable build error"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0668211f6a110be1757a7cdf894696c8ab727964.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/dp/swdp_bitbang.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/dp/swdp_bitbang.c b/drivers/dp/swdp_bitbang.c
index 7822315ab8e..a1d28386209 100644
--- a/drivers/dp/swdp_bitbang.c
+++ b/drivers/dp/swdp_bitbang.c
@@ -677,6 +677,7 @@ static int sw_port_off(const struct device *dev)
 
 static int sw_gpio_init(const struct device *dev)
 {
+	const struct sw_config *config = dev->config;
 	struct sw_cfg_data *sw_data = dev->data;
 	int ret;
 

From 2a40b052eba9a5927b53a2af57b8f93f46c0005d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:00 +0100
Subject: [PATCH 1890/2913] Revert "[nrf fromtree] drivers: dp: swdp_bitbang:
 Update SWD clock calculation"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 027bc9c090988bef705e58a8db090b8683c31b51.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/dp/swdp_bitbang.c | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/drivers/dp/swdp_bitbang.c b/drivers/dp/swdp_bitbang.c
index a1d28386209..dabf6d34a02 100644
--- a/drivers/dp/swdp_bitbang.c
+++ b/drivers/dp/swdp_bitbang.c
@@ -26,8 +26,8 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(swdp, CONFIG_DP_DRIVER_LOG_LEVEL);
 
-#define MAX_SWJ_CLOCK(delay_cycles, port_write_cycles) \
-	((CPU_CLOCK / 2U) / (port_write_cycles + delay_cycles))
+#define CLOCK_DELAY(swclk_freq, port_write_cycles) \
+	((CPU_CLOCK / 2 / swclk_freq) - port_write_cycles)
 
 /*
  * Default SWCLK frequency in Hz.
@@ -35,7 +35,6 @@ LOG_MODULE_REGISTER(swdp, CONFIG_DP_DRIVER_LOG_LEVEL);
  */
 #define SWDP_DEFAULT_SWCLK_FREQUENCY	1000000U
 
-#define DELAY_FAST_CYCLES		2U
 #define DELAY_SLOW_CYCLES		3U
 
 struct sw_config {
@@ -529,19 +528,14 @@ static int sw_set_clock(const struct device *dev, const uint32_t clock)
 	struct sw_cfg_data *sw_data = dev->data;
 	uint32_t delay;
 
-	if (clock >= MAX_SWJ_CLOCK(DELAY_FAST_CYCLES, config->port_write_cycles)) {
-		sw_data->fast_clock = true;
-		delay = 1U;
-	} else {
-		sw_data->fast_clock = false;
+	sw_data->fast_clock = false;
+	delay = ((CPU_CLOCK / 2U) + (clock - 1U)) / clock;
 
-		delay = ((CPU_CLOCK / 2U) + (clock - 1U)) / clock;
-		if (delay > config->port_write_cycles) {
-			delay -= config->port_write_cycles;
-			delay = (delay + (DELAY_SLOW_CYCLES - 1U)) / DELAY_SLOW_CYCLES;
-		} else {
-			delay = 1U;
-		}
+	if (delay > config->port_write_cycles) {
+		delay -= config->port_write_cycles;
+		delay = (delay + (DELAY_SLOW_CYCLES - 1U)) / DELAY_SLOW_CYCLES;
+	} else {
+		delay = 1U;
 	}
 
 	sw_data->clock_delay = delay;
@@ -690,7 +684,8 @@ static int sw_gpio_init(const struct device *dev)
 	sw_data->turnaround = 1U;
 	sw_data->data_phase = false;
 	sw_data->fast_clock = false;
-	sw_set_clock(dev, SWDP_DEFAULT_SWCLK_FREQUENCY);
+	sw_data->clock_delay = CLOCK_DELAY(SWDP_DEFAULT_SWCLK_FREQUENCY,
+					   config->port_write_cycles);
 
 	return 0;
 }

From 8066658737b9451cb259eae023796277dc301ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:00 +0100
Subject: [PATCH 1891/2913] Revert "[nrf fromtree] drivers: dp: swdp_bitbang:
 hardcode nRF53 SYSCLK"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 94454bdf9e6e1e1ab156bec7708d1bb5370f1f13.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/dp/swdp_ll_pin.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/dp/swdp_ll_pin.h b/drivers/dp/swdp_ll_pin.h
index 48b4ea14cb3..3044931a228 100644
--- a/drivers/dp/swdp_ll_pin.h
+++ b/drivers/dp/swdp_ll_pin.h
@@ -6,9 +6,8 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
-#include <soc.h>
 
-#if defined(CONFIG_SOC_SERIES_NRF52X) || defined(CONFIG_SOC_SERIES_NRF53X)
+#if defined(CONFIG_SOC_SERIES_NRF52X)
 #define CPU_CLOCK		64000000U
 #else
 #define CPU_CLOCK		CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC

From 17b202fb146f4f156dd06f23853cb2715dee58f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:00 +0100
Subject: [PATCH 1892/2913] Revert "[nrf fromtree] drivers: dp: swdp_bitbang:
 power optimization"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 81a69fd2fea9fc78761eb16f20853c7f1469a578.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/dp/swdp_bitbang.c | 118 ++++++++++++++++----------------------
 1 file changed, 50 insertions(+), 68 deletions(-)

diff --git a/drivers/dp/swdp_bitbang.c b/drivers/dp/swdp_bitbang.c
index dabf6d34a02..ba46c629604 100644
--- a/drivers/dp/swdp_bitbang.c
+++ b/drivers/dp/swdp_bitbang.c
@@ -562,125 +562,107 @@ static int sw_configure(const struct device *dev,
 static int sw_port_on(const struct device *dev)
 {
 	const struct sw_config *config = dev->config;
-	int ret;
+
+	gpio_pin_set_dt(&config->clk, 1);
 
 	if (config->dnoe.port) {
-		ret = gpio_pin_configure_dt(&config->dnoe, GPIO_OUTPUT_ACTIVE);
-		if (ret) {
-			return ret;
-		}
+		gpio_pin_set_dt(&config->dnoe, 1);
 	}
 
 	if (config->dout.port) {
-		ret = gpio_pin_configure_dt(&config->dout, GPIO_OUTPUT_ACTIVE);
+		gpio_pin_set_dt(&config->dout, 1);
+	} else {
+		int ret;
+
+		ret = gpio_pin_configure_dt(&config->dio, GPIO_OUTPUT_ACTIVE);
 		if (ret) {
 			return ret;
 		}
 	}
 
-	ret = gpio_pin_configure_dt(&config->dio, GPIO_INPUT);
-	if (ret) {
-		return ret;
+	if (config->noe.port) {
+		gpio_pin_set_dt(&config->noe, 1);
+	}
+	if (config->reset.port) {
+		gpio_pin_set_dt(&config->reset, 1);
 	}
 
-	if (config->noe.port) {
-		ret = gpio_pin_configure_dt(&config->noe, GPIO_OUTPUT_ACTIVE);
+	return 0;
+}
+
+static int sw_port_off(const struct device *dev)
+{
+	const struct sw_config *config = dev->config;
+
+	if (config->dnoe.port) {
+		gpio_pin_set_dt(&config->dnoe, 0);
+	}
+
+	if (config->dout.port) {
+		gpio_pin_set_dt(&config->dout, 0);
+	} else {
+		int ret;
+
+		ret = gpio_pin_configure_dt(&config->dio, GPIO_INPUT);
 		if (ret) {
 			return ret;
 		}
 	}
 
-	ret = gpio_pin_configure_dt(&config->clk, GPIO_OUTPUT_ACTIVE);
-	if (ret) {
-		return ret;
+	if (config->noe.port) {
+		gpio_pin_set_dt(&config->noe, 0);
 	}
-
-	ret = gpio_pin_configure_dt(&config->reset, GPIO_OUTPUT_ACTIVE);
-	if (ret) {
-		return ret;
+	if (config->reset.port) {
+		gpio_pin_set_dt(&config->reset, 1);
 	}
 
 	return 0;
 }
 
-static int sw_port_off(const struct device *dev)
+static int sw_gpio_init(const struct device *dev)
 {
 	const struct sw_config *config = dev->config;
+	struct sw_cfg_data *sw_data = dev->data;
 	int ret;
 
-	/* If there is a transceiver connected to IO, pins should always be driven. */
-	if (config->dnoe.port) {
-		ret = gpio_pin_configure_dt(&config->dnoe, GPIO_OUTPUT_INACTIVE);
-		if (ret) {
-			return ret;
-		}
+	ret = gpio_pin_configure_dt(&config->clk, GPIO_OUTPUT_ACTIVE);
+	if (ret) {
+		return ret;
+	}
 
-		if (config->dout.port) {
-			ret = gpio_pin_configure_dt(&config->dout, GPIO_OUTPUT_ACTIVE);
-			if (ret) {
-				return ret;
-			}
-		}
+	ret = gpio_pin_configure_dt(&config->dio, GPIO_INPUT);
+	if (ret) {
+		return ret;
+	}
 
-		ret = gpio_pin_configure_dt(&config->dio, GPIO_INPUT);
+	if (config->dout.port) {
+		ret = gpio_pin_configure_dt(&config->dout, GPIO_OUTPUT_ACTIVE);
 		if (ret) {
 			return ret;
 		}
-	} else {
-		if (config->dout.port) {
-			ret = gpio_pin_configure_dt(&config->dout, GPIO_DISCONNECTED);
-			if (ret) {
-				return ret;
-			}
-		}
+	}
 
-		ret = gpio_pin_configure_dt(&config->dio, GPIO_DISCONNECTED);
+	if (config->dnoe.port) {
+		ret = gpio_pin_configure_dt(&config->dnoe, GPIO_OUTPUT_INACTIVE);
 		if (ret) {
 			return ret;
 		}
 	}
 
-	/* If there is a transceiver connected to CLK, pins should always be driven. */
 	if (config->noe.port) {
 		ret = gpio_pin_configure_dt(&config->noe, GPIO_OUTPUT_INACTIVE);
 		if (ret) {
 			return ret;
 		}
-
-		ret = gpio_pin_configure_dt(&config->clk, GPIO_OUTPUT_ACTIVE);
-		if (ret) {
-			return ret;
-		}
-
-	} else {
-		ret = gpio_pin_configure_dt(&config->clk, GPIO_DISCONNECTED);
-		if (ret) {
-			return ret;
-		}
 	}
 
 	if (config->reset.port) {
-		ret = gpio_pin_configure_dt(&config->reset, GPIO_DISCONNECTED);
+		ret = gpio_pin_configure_dt(&config->reset, GPIO_OUTPUT_ACTIVE);
 		if (ret) {
 			return ret;
 		}
 	}
 
-	return 0;
-}
-
-static int sw_gpio_init(const struct device *dev)
-{
-	const struct sw_config *config = dev->config;
-	struct sw_cfg_data *sw_data = dev->data;
-	int ret;
-
-	/* start with the port turned off */
-	ret = sw_port_off(dev);
-	if (ret) {
-		return ret;
-	}
-
 	sw_data->turnaround = 1U;
 	sw_data->data_phase = false;
 	sw_data->fast_clock = false;

From f677435acd5bdcd31bcdb43b41908e8fff56c72e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:00 +0100
Subject: [PATCH 1893/2913] Revert "[nrf fromlist] samples: boards: nordic:
 system_off: Add GRTC wakeup"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 03c2143fb70a7d12086c5e83d91097c9f91a4932.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/boards/nordic/system_off/Kconfig     |  6 ------
 samples/boards/nordic/system_off/sample.yaml |  6 ------
 samples/boards/nordic/system_off/src/main.c  | 15 ---------------
 3 files changed, 27 deletions(-)

diff --git a/samples/boards/nordic/system_off/Kconfig b/samples/boards/nordic/system_off/Kconfig
index c5a0f492d90..5d26d75ecdf 100644
--- a/samples/boards/nordic/system_off/Kconfig
+++ b/samples/boards/nordic/system_off/Kconfig
@@ -21,10 +21,4 @@ config APP_USE_RETAINED_MEM
 
 endchoice
 
-config GRTC_WAKEUP_ENABLE
-	bool "Use GRTC to wake up device from system off"
-	default n
-	help
-	  Switch wake up source from pressing sw0 button to GRTC
-
 source "Kconfig.zephyr"
diff --git a/samples/boards/nordic/system_off/sample.yaml b/samples/boards/nordic/system_off/sample.yaml
index ab6a12aeb16..0503867b191 100644
--- a/samples/boards/nordic/system_off/sample.yaml
+++ b/samples/boards/nordic/system_off/sample.yaml
@@ -29,9 +29,3 @@ tests:
     extra_configs:
       - CONFIG_APP_USE_RETAINED_MEM=y
       - CONFIG_RETAINED_MEM=y
-  sample.boards.nrf.system_off.grtc_wakeup:
-    build_only: true
-    platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
-    extra_configs:
-      - CONFIG_GRTC_WAKEUP_ENABLE=y
diff --git a/samples/boards/nordic/system_off/src/main.c b/samples/boards/nordic/system_off/src/main.c
index b40b1ea26da..6e1683c4cd6 100644
--- a/samples/boards/nordic/system_off/src/main.c
+++ b/samples/boards/nordic/system_off/src/main.c
@@ -16,12 +16,7 @@
 #include <zephyr/sys/poweroff.h>
 #include <zephyr/sys/util.h>
 
-#if IS_ENABLED(CONFIG_GRTC_WAKEUP_ENABLE)
-#include <zephyr/drivers/timer/nrf_grtc_timer.h>
-#define DEEP_SLEEP_TIME_S 2
-#else
 static const struct gpio_dt_spec sw0 = GPIO_DT_SPEC_GET(DT_ALIAS(sw0), gpios);
-#endif
 
 int main(void)
 {
@@ -50,15 +45,6 @@ int main(void)
 		printf("Retained data not supported\n");
 	}
 
-#if IS_ENABLED(CONFIG_GRTC_WAKEUP_ENABLE)
-	int err = z_nrf_grtc_wakeup_prepare(DEEP_SLEEP_TIME_S * USEC_PER_SEC);
-
-	if (err < 0) {
-		printk("Unable to prepare GRTC as a wake up source (err = %d).\n", err);
-	} else {
-		printk("Entering system off; wait %u seconds to restart\n", DEEP_SLEEP_TIME_S);
-	}
-#else
 	/* configure sw0 as input, interrupt as level active to allow wake-up */
 	rc = gpio_pin_configure_dt(&sw0, GPIO_INPUT);
 	if (rc < 0) {
@@ -73,7 +59,6 @@ int main(void)
 	}
 
 	printf("Entering system off; press sw0 to restart\n");
-#endif
 
 	rc = pm_device_action_run(cons, PM_DEVICE_ACTION_SUSPEND);
 	if (rc < 0) {

From dca4b5de435661f221e511d8a7365c073ccfe35e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:00 +0100
Subject: [PATCH 1894/2913] Revert "[nrf fromtree] dts: common: nordic:
 nrf54l20: Adjust RAM size to 511k"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c438cf465761cf86495c970e34da250ee874a4bc.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/common/nordic/nrf54l20.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 56adf8fef46..43c749f8c64 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -65,10 +65,10 @@
 
 		cpuapp_sram: memory@20000000 {
 			compatible = "mmio-sram";
-			reg = <0x20000000 DT_SIZE_K(511)>;
+			reg = <0x20000000 DT_SIZE_K(512)>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0x0 0x20000000 0x7fc00>;
+			ranges = <0x0 0x20000000 0x2f000>;
 		};
 
 		global_peripherals: peripheral@50000000 {

From 647b30c20b8e35ff37be119340e4e6c1d6946542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:00 +0100
Subject: [PATCH 1895/2913] Revert "[nrf fromtree] boards: nordic: nrf54hl: add
 retained_mem to supported features"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0118105e02c58c74dd3b6bc41a20a3fce613114b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf54h20dk/doc/index.rst                       | 5 -----
 .../nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml  | 1 -
 .../nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml  | 1 -
 boards/nordic/nrf54l15dk/doc/index.rst                       | 3 ---
 boards/nordic/nrf54l15pdk/doc/index.rst                      | 3 ---
 5 files changed, 13 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/doc/index.rst b/boards/nordic/nrf54h20dk/doc/index.rst
index c8e95e39875..41306357fe4 100644
--- a/boards/nordic/nrf54h20dk/doc/index.rst
+++ b/boards/nordic/nrf54h20dk/doc/index.rst
@@ -39,7 +39,6 @@ nRF54H20 SoC provides support for the following devices:
 * :abbr:`GPIO (General Purpose Input Output)`
 * :abbr:`GRTC (Global real-time counter)`
 * :abbr:`I2C (Inter-Integrated Circuit)`
-* MEMCONF
 * MRAM
 * :abbr:`PWM (Pulse Width Modulation)`
 * RADIO (Bluetooth Low Energy and 802.15.4)
@@ -71,8 +70,6 @@ hardware features:
 +-----------+------------+----------------------+
 | I2C(M)    | on-chip    | i2c                  |
 +-----------+------------+----------------------+
-| MEMCONF   | on-chip    | retained_mem         |
-+-----------+------------+----------------------+
 | SPI(M/S)  | on-chip    | spi                  |
 +-----------+------------+----------------------+
 | UART      | on-chip    | serial               |
@@ -92,8 +89,6 @@ hardware features:
 +-----------+------------+----------------------+
 | I2C(M)    | on-chip    | i2c                  |
 +-----------+------------+----------------------+
-| MEMCONF   | on-chip    | retained_mem         |
-+-----------+------------+----------------------+
 | SPI(M/S)  | on-chip    | spi                  |
 +-----------+------------+----------------------+
 | UART      | on-chip    | serial               |
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
index a64f8cf6398..89b85746540 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
@@ -19,7 +19,6 @@ supported:
   - gpio
   - i2c
   - pwm
-  - retained_mem
   - spi
   - watchdog
   - usbd
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml
index 568f6fcc18e..818a8d74b79 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml
@@ -16,5 +16,4 @@ supported:
   - counter
   - gpio
   - pwm
-  - retained_mem
   - spi
diff --git a/boards/nordic/nrf54l15dk/doc/index.rst b/boards/nordic/nrf54l15dk/doc/index.rst
index f7b927bdc86..7d450912661 100644
--- a/boards/nordic/nrf54l15dk/doc/index.rst
+++ b/boards/nordic/nrf54l15dk/doc/index.rst
@@ -19,7 +19,6 @@ nRF54L15 Arm Cortex-M33 CPU and the following devices:
 * RRAM
 * :abbr:`GPIO (General Purpose Input Output)`
 * :abbr:`TWIM (I2C-compatible two-wire interface master with EasyDMA)`
-* MEMCONF
 * :abbr:`MPU (Memory Protection Unit)`
 * :abbr:`NVIC (Nested Vectored Interrupt Controller)`
 * :abbr:`PWM (Pulse Width Modulation)`
@@ -61,8 +60,6 @@ hardware features:
 +-----------+------------+----------------------+
 | GRTC      | on-chip    | counter              |
 +-----------+------------+----------------------+
-| MEMCONF   | on-chip    | retained_mem         |
-+-----------+------------+----------------------+
 | MPU       | on-chip    | arch/arm             |
 +-----------+------------+----------------------+
 | NVIC      | on-chip    | arch/arm             |
diff --git a/boards/nordic/nrf54l15pdk/doc/index.rst b/boards/nordic/nrf54l15pdk/doc/index.rst
index 3fae82b713c..dc6e69b65e5 100644
--- a/boards/nordic/nrf54l15pdk/doc/index.rst
+++ b/boards/nordic/nrf54l15pdk/doc/index.rst
@@ -20,7 +20,6 @@ the following devices:
 * RRAM
 * :abbr:`GPIO (General Purpose Input Output)`
 * :abbr:`TWIM (I2C-compatible two-wire interface master with EasyDMA)`
-* MEMCONF
 * :abbr:`MPU (Memory Protection Unit)`
 * :abbr:`NVIC (Nested Vectored Interrupt Controller)`
 * :abbr:`PWM (Pulse Width Modulation)`
@@ -66,8 +65,6 @@ hardware features:
 +-----------+------------+----------------------+
 | TWIM      | on-chip    | i2c                  |
 +-----------+------------+----------------------+
-| MEMCONF   | on-chip    | retained_mem         |
-+-----------+------------+----------------------+
 | MPU       | on-chip    | arch/arm             |
 +-----------+------------+----------------------+
 | NVIC      | on-chip    | arch/arm             |

From 86dbde31c5573c15b8254b1ad1e148f106b5c00c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:00 +0100
Subject: [PATCH 1896/2913] Revert "[nrf fromtree] tests: drivers:
 retained_mem: api: add support for nrf54h20"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 70ca604d9e33a135c10739d8ea0b7e070cb6654c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.conf    |  1 -
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 22 -------------------
 .../boards/nrf54h20dk_nrf54h20_cpurad.conf    |  1 -
 .../boards/nrf54h20dk_nrf54h20_cpurad.overlay | 22 -------------------
 .../boards/nrf54l15dk_nrf54l15_cpuapp.conf    |  1 -
 tests/drivers/retained_mem/api/testcase.yaml  |  6 +----
 6 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 delete mode 100644 tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 delete mode 100644 tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpurad.conf
 delete mode 100644 tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpurad.overlay
 delete mode 100644 tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l15_cpuapp.conf

diff --git a/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpuapp.conf
deleted file mode 100644
index c15ba3ed96d..00000000000
--- a/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_POWEROFF=y
diff --git a/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index 672a49379e7..00000000000
--- a/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,22 +0,0 @@
-/ {
-	cpuapp_ram0_ret@22004000 {
-		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x22004000 DT_SIZE_K(16)>;
-		zephyr,memory-region = "RetainedMem";
-		status = "okay";
-
-		retainedmem0: retainedmem {
-			compatible = "zephyr,retained-ram";
-			status = "okay";
-		};
-	};
-
-	aliases {
-		retainedmemtestdevice = &retainedmem0;
-	};
-};
-
-&cpuapp_ram0 {
-	reg = <0x22000000 DT_SIZE_K(16)>;
-	ranges = <0x0 0x22000000 0x4000>;
-};
diff --git a/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpurad.conf
deleted file mode 100644
index c15ba3ed96d..00000000000
--- a/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpurad.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_POWEROFF=y
diff --git a/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpurad.overlay
deleted file mode 100644
index c824df8b74e..00000000000
--- a/tests/drivers/retained_mem/api/boards/nrf54h20dk_nrf54h20_cpurad.overlay
+++ /dev/null
@@ -1,22 +0,0 @@
-/ {
-	cpurad_ram0_ret@2302c000 {
-		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x2302c000 DT_SIZE_K(16)>;
-		zephyr,memory-region = "RetainedMem";
-		status = "okay";
-
-		retainedmem0: retainedmem {
-			compatible = "zephyr,retained-ram";
-			status = "okay";
-		};
-	};
-
-	aliases {
-		retainedmemtestdevice = &retainedmem0;
-	};
-};
-
-&cpurad_ram0 {
-	reg = <0x23000000 DT_SIZE_K(176)>;
-	ranges = <0x0 0x23000000 0x2c000>;
-};
diff --git a/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l15_cpuapp.conf
deleted file mode 100644
index c15ba3ed96d..00000000000
--- a/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l15_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_POWEROFF=y
diff --git a/tests/drivers/retained_mem/api/testcase.yaml b/tests/drivers/retained_mem/api/testcase.yaml
index 02f7c7c8b27..2979607296c 100644
--- a/tests/drivers/retained_mem/api/testcase.yaml
+++ b/tests/drivers/retained_mem/api/testcase.yaml
@@ -5,11 +5,7 @@ tests:
       - drivers
       - retained_mem
   drivers.retained_mem.api.ram:
-    platform_allow:
-      - qemu_cortex_m3
-      - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54h20dk/nrf54h20/cpurad
-      - nrf54l15dk/nrf54l15/cpuapp
+    platform_allow: qemu_cortex_m3 nrf54l15dk/nrf54l15/cpuapp
     tags:
       - drivers
       - retained_mem

From f1c0859a62baed1ff507e8b88c0d39fd2dd0f8c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:00 +0100
Subject: [PATCH 1897/2913] Revert "[nrf fromtree] drivers: retained_mem: nrf:
 align dependencies to nrf54h20"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c79d767a89ceffe4308165733f44da132603a29c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/retained_mem/Kconfig.nrf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/retained_mem/Kconfig.nrf b/drivers/retained_mem/Kconfig.nrf
index 348361e5f6f..3590249fcbe 100644
--- a/drivers/retained_mem/Kconfig.nrf
+++ b/drivers/retained_mem/Kconfig.nrf
@@ -13,6 +13,6 @@ config RETAINED_MEM_NRF_RAM_CTRL
 	bool "nRF RAM retention driver"
 	default y
 	depends on DT_HAS_ZEPHYR_RETAINED_RAM_ENABLED && RETAINED_MEM_ZEPHYR_RAM && POWEROFF
-	depends on SOC_FAMILY_NORDIC_NRF
+	depends on SOC_SERIES_NRF52X || SOC_SERIES_NRF53X || SOC_SERIES_NRF54LX || SOC_SERIES_NRF91X
 	help
 	  Enable driver for Nordic RAM retention.

From 82309b5ffb97fdca35e34851040285ebcf0a1aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:00 +0100
Subject: [PATCH 1898/2913] Revert "[nrf fromtree] samples: drivers: adc: add
 support for internal nRF54L SAADC inputs"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 534fdbb41aa9eacf66db211e8ad2d5ca142ae3b0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../adc_dt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 12 +-----------
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay        | 12 +-----------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/samples/drivers/adc/adc_dt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/drivers/adc/adc_dt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 6273756c993..f185624f9b9 100644
--- a/samples/drivers/adc/adc_dt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/samples/drivers/adc/adc_dt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -6,7 +6,7 @@
 
 / {
 	zephyr,user {
-		io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 7>;
+		io-channels = <&adc 0>, <&adc 1>, <&adc 7>;
 	};
 };
 
@@ -33,16 +33,6 @@
 		zephyr,oversampling = <8>;
 	};
 
-	channel@2 {
-		reg = <2>;
-		zephyr,gain = "ADC_GAIN_1";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,input-positive = <NRF_SAADC_VDD>;
-		zephyr,resolution = <12>;
-		zephyr,oversampling = <8>;
-	};
-
 	channel@7 {
 		reg = <7>;
 		zephyr,gain = "ADC_GAIN_1";
diff --git a/samples/drivers/adc/adc_sequence/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/drivers/adc/adc_sequence/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 7fedbe52ad2..a0639a405c4 100644
--- a/samples/drivers/adc/adc_sequence/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/samples/drivers/adc/adc_sequence/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -6,7 +6,7 @@
 
 / {
 	zephyr,user {
-		io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 7>;
+		io-channels = <&adc 0>, <&adc 1>, <&adc 7>;
 	};
 };
 
@@ -39,16 +39,6 @@
 		zephyr,oversampling = <8>;
 	};
 
-	channel@2 {
-		reg = <2>;
-		zephyr,gain = "ADC_GAIN_1";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,input-positive = <NRF_SAADC_DVDD>; /* 0.9 V internal */
-		zephyr,resolution = <12>;
-		zephyr,oversampling = <8>;
-	};
-
 	channel@7 {
 		reg = <7>;
 		zephyr,gain = "ADC_GAIN_1";

From a6ac230c9f6648b5cca9dd70b12447d8f1975d37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:00 +0100
Subject: [PATCH 1899/2913] Revert "[nrf fromtree] drivers: adc: nrf: add
 support for nrf54l internal SAADC inputs"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a2308eca1072ac85e67ad1e757f06f61f0064e0d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/adc/adc_nrfx_saadc.c | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index e4c37a1f736..ba4d3e8364f 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -32,7 +32,7 @@ static const uint8_t saadc_psels[NRF_SAADC_AIN7 + 1] = {
 	[NRF_SAADC_AIN7] = NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
 };
 #elif defined(CONFIG_SOC_NRF54L15)
-static const uint32_t saadc_psels[NRF_SAADC_DVDD + 1] = {
+static const uint8_t saadc_psels[NRF_SAADC_AIN7 + 1] = {
 	[NRF_SAADC_AIN0] = NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
 	[NRF_SAADC_AIN1] = NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
 	[NRF_SAADC_AIN2] = NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
@@ -41,9 +41,6 @@ static const uint32_t saadc_psels[NRF_SAADC_DVDD + 1] = {
 	[NRF_SAADC_AIN5] = NRF_PIN_PORT_TO_PIN_NUMBER(12U, 1),
 	[NRF_SAADC_AIN6] = NRF_PIN_PORT_TO_PIN_NUMBER(13U, 1),
 	[NRF_SAADC_AIN7] = NRF_PIN_PORT_TO_PIN_NUMBER(14U, 1),
-	[NRF_SAADC_VDD]  = NRF_SAADC_INPUT_VDD,
-	[NRF_SAADC_AVDD] = NRF_SAADC_INPUT_AVDD,
-	[NRF_SAADC_DVDD] = NRF_SAADC_INPUT_DVDD,
 };
 #endif
 
@@ -277,8 +274,13 @@ static int adc_nrfx_channel_setup(const struct device *dev,
 		m_data.single_ended_channels |= BIT(channel_cfg->channel_id);
 	}
 
+	/* Keep the channel disabled in hardware (set positive input to
+	 * NRF_SAADC_INPUT_DISABLED) until it is selected to be included
+	 * in a sampling sequence.
+	 */
+
 #if (NRF_SAADC_HAS_AIN_AS_PIN)
-	if ((channel_cfg->input_positive >= ARRAY_SIZE(saadc_psels)) ||
+	if ((channel_cfg->input_positive > NRF_SAADC_AIN7) ||
 	    (channel_cfg->input_positive < NRF_SAADC_AIN0)) {
 		return -EINVAL;
 	}
@@ -293,18 +295,17 @@ static int adc_nrfx_channel_setup(const struct device *dev,
 	} else {
 		input_negative = NRF_SAADC_INPUT_DISABLED;
 	}
-#endif
+
 	/* Store the positive input selection in a dedicated array,
 	 * to get it later when the channel is selected for a sampling
 	 * and to mark the channel as configured (ready to be selected).
 	 */
+	m_data.positive_inputs[channel_id] = saadc_psels[channel_cfg->input_positive];
+#else
 	m_data.positive_inputs[channel_id] = channel_cfg->input_positive;
+#endif
 
 	nrf_saadc_channel_init(NRF_SAADC, channel_id, &config);
-	/* Keep the channel disabled in hardware (set positive input to
-	 * NRF_SAADC_INPUT_DISABLED) until it is selected to be included
-	 * in a sampling sequence.
-	 */
 	nrf_saadc_channel_input_set(NRF_SAADC,
 				    channel_id,
 				    NRF_SAADC_INPUT_DISABLED,
@@ -531,12 +532,7 @@ static int start_read(const struct device *dev,
 			nrf_saadc_channel_pos_input_set(
 				NRF_SAADC,
 				channel_id,
-#if NRF_SAADC_HAS_AIN_AS_PIN
-				saadc_psels[m_data.positive_inputs[channel_id]]
-#else
-				m_data.positive_inputs[channel_id]
-#endif
-				);
+				m_data.positive_inputs[channel_id]);
 			++active_channels;
 		} else {
 			nrf_saadc_burst_set(

From 6969283884000543b0dbd5b6c2dfe92e0828508b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:00 +0100
Subject: [PATCH 1900/2913] Revert "[nrf fromtree] dts: nordic: refactor
 bindings helper symbols for SAADC"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 86d577797f6329f7cd528365af3996e6acd774af.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/adc/adc_nrfx_saadc.c                  |  3 +--
 dts/arm/nordic/nrf51822.dtsi                  |  1 -
 dts/arm/nordic/nrf52805.dtsi                  |  1 -
 dts/arm/nordic/nrf52810.dtsi                  |  1 -
 dts/arm/nordic/nrf52811.dtsi                  |  1 -
 dts/arm/nordic/nrf52832.dtsi                  |  1 -
 dts/arm/nordic/nrf52833.dtsi                  |  1 -
 dts/arm/nordic/nrf52840.dtsi                  |  1 -
 dts/arm/nordic/nrf5340_cpuapp.dtsi            |  1 -
 dts/arm/nordic/nrf5340_cpuappns.dtsi          |  1 -
 dts/arm/nordic/nrf91.dtsi                     |  1 -
 dts/arm/nordic/nrf91ns.dtsi                   |  1 -
 dts/common/nordic/nrf54h20.dtsi               |  1 -
 dts/common/nordic/nrf54l15.dtsi               |  1 -
 dts/common/nordic/nrf54l20.dtsi               |  1 -
 dts/common/nordic/nrf9280.dtsi                |  2 +-
 dts/common/nordic/nrf_common.dtsi             |  1 +
 include/zephyr/dt-bindings/adc/nrf-adc.h      | 11 +++++++++++
 .../zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h | 15 ---------------
 include/zephyr/dt-bindings/adc/nrf-saadc-v2.h | 14 --------------
 include/zephyr/dt-bindings/adc/nrf-saadc-v3.h | 14 --------------
 include/zephyr/dt-bindings/adc/nrf-saadc.h    | 19 -------------------
 22 files changed, 14 insertions(+), 79 deletions(-)
 delete mode 100644 include/zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h
 delete mode 100644 include/zephyr/dt-bindings/adc/nrf-saadc-v2.h
 delete mode 100644 include/zephyr/dt-bindings/adc/nrf-saadc-v3.h
 delete mode 100644 include/zephyr/dt-bindings/adc/nrf-saadc.h

diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index ba4d3e8364f..132e8e78c3e 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -7,8 +7,7 @@
 #define ADC_CONTEXT_USES_KERNEL_TIMER
 #include "adc_context.h"
 #include <haly/nrfy_saadc.h>
-#include <zephyr/dt-bindings/adc/nrf-saadc-v3.h>
-#include <zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h>
+#include <zephyr/dt-bindings/adc/nrf-adc.h>
 #include <zephyr/linker/devicetree_regions.h>
 
 #define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
diff --git a/dts/arm/nordic/nrf51822.dtsi b/dts/arm/nordic/nrf51822.dtsi
index a11677ad934..11cc9eff2f9 100644
--- a/dts/arm/nordic/nrf51822.dtsi
+++ b/dts/arm/nordic/nrf51822.dtsi
@@ -2,7 +2,6 @@
 
 #include <arm/armv6-m.dtsi>
 #include <nordic/nrf_common.dtsi>
-#include <zephyr/dt-bindings/adc/nrf-adc.h>
 
 / {
 	chosen {
diff --git a/dts/arm/nordic/nrf52805.dtsi b/dts/arm/nordic/nrf52805.dtsi
index bd768ca85fe..07f3e8ed7d3 100644
--- a/dts/arm/nordic/nrf52805.dtsi
+++ b/dts/arm/nordic/nrf52805.dtsi
@@ -6,7 +6,6 @@
 
 #include <arm/armv7-m.dtsi>
 #include <nordic/nrf_common.dtsi>
-#include <zephyr/dt-bindings/adc/nrf-saadc-v2.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 / {
diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
index 7cdca229120..3acbf81c56c 100644
--- a/dts/arm/nordic/nrf52810.dtsi
+++ b/dts/arm/nordic/nrf52810.dtsi
@@ -2,7 +2,6 @@
 
 #include <arm/armv7-m.dtsi>
 #include <nordic/nrf_common.dtsi>
-#include <zephyr/dt-bindings/adc/nrf-saadc-v2.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 / {
diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi
index 99815337203..2f1660c052e 100644
--- a/dts/arm/nordic/nrf52811.dtsi
+++ b/dts/arm/nordic/nrf52811.dtsi
@@ -6,7 +6,6 @@
 
 #include <arm/armv7-m.dtsi>
 #include <nordic/nrf_common.dtsi>
-#include <zephyr/dt-bindings/adc/nrf-saadc-v2.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 / {
diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
index d40d48eb947..ccd8bda3ab3 100644
--- a/dts/arm/nordic/nrf52832.dtsi
+++ b/dts/arm/nordic/nrf52832.dtsi
@@ -2,7 +2,6 @@
 
 #include <arm/armv7-m.dtsi>
 #include <nordic/nrf_common.dtsi>
-#include <zephyr/dt-bindings/adc/nrf-saadc-v2.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 / {
diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi
index b3661a2ebe0..1029d2a4239 100644
--- a/dts/arm/nordic/nrf52833.dtsi
+++ b/dts/arm/nordic/nrf52833.dtsi
@@ -6,7 +6,6 @@
 
 #include <arm/armv7-m.dtsi>
 #include <nordic/nrf_common.dtsi>
-#include <zephyr/dt-bindings/adc/nrf-saadc-v3.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 / {
diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index 85520958568..718f8a562b7 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -2,7 +2,6 @@
 
 #include <arm/armv7-m.dtsi>
 #include <nordic/nrf_common.dtsi>
-#include <zephyr/dt-bindings/adc/nrf-saadc-v3.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 / {
diff --git a/dts/arm/nordic/nrf5340_cpuapp.dtsi b/dts/arm/nordic/nrf5340_cpuapp.dtsi
index c02f939a7fa..e40f6241d91 100644
--- a/dts/arm/nordic/nrf5340_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuapp.dtsi
@@ -6,7 +6,6 @@
 
 #include <arm/armv8-m.dtsi>
 #include <nordic/nrf_common.dtsi>
-#include <zephyr/dt-bindings/adc/nrf-saadc-v3.h>
 
 / {
 	cpus {
diff --git a/dts/arm/nordic/nrf5340_cpuappns.dtsi b/dts/arm/nordic/nrf5340_cpuappns.dtsi
index a65b24ac818..6df1be54b34 100644
--- a/dts/arm/nordic/nrf5340_cpuappns.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuappns.dtsi
@@ -8,7 +8,6 @@
 
 #include <arm/armv8-m.dtsi>
 #include <nordic/nrf_common.dtsi>
-#include <zephyr/dt-bindings/adc/nrf-saadc-v3.h>
 
 / {
 	cpus {
diff --git a/dts/arm/nordic/nrf91.dtsi b/dts/arm/nordic/nrf91.dtsi
index 9a64ed92229..78502d3f086 100644
--- a/dts/arm/nordic/nrf91.dtsi
+++ b/dts/arm/nordic/nrf91.dtsi
@@ -6,7 +6,6 @@
 
 #include <arm/armv8-m.dtsi>
 #include <nordic/nrf_common.dtsi>
-#include <zephyr/dt-bindings/adc/nrf-saadc-v2.h>
 
 / {
 	cpus {
diff --git a/dts/arm/nordic/nrf91ns.dtsi b/dts/arm/nordic/nrf91ns.dtsi
index e44bbcde0a4..13a82c442e0 100644
--- a/dts/arm/nordic/nrf91ns.dtsi
+++ b/dts/arm/nordic/nrf91ns.dtsi
@@ -6,7 +6,6 @@
 
 #include <arm/armv8-m.dtsi>
 #include <nordic/nrf_common.dtsi>
-#include <zephyr/dt-bindings/adc/nrf-saadc-v2.h>
 
 / {
 	cpus {
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index c0de788ad9b..1aae058b70e 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -7,7 +7,6 @@
 #include <mem.h>
 #include <nordic/nrf_common.dtsi>
 
-#include <zephyr/dt-bindings/adc/nrf-saadc.h>
 #include <zephyr/dt-bindings/misc/nordic-nrf-ficr-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-domain-id-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-owner-id-nrf54h20.h>
diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index 737c1d5a199..60b22599314 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -6,7 +6,6 @@
 
 #include <mem.h>
 #include <nordic/nrf_common.dtsi>
-#include <zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 /delete-node/ &sw_pwm;
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 43c749f8c64..6338f497adf 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -6,7 +6,6 @@
 
 #include <mem.h>
 #include <nordic/nrf_common.dtsi>
-#include <zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 /delete-node/ &sw_pwm;
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index dc688a89f25..08223449076 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -6,7 +6,7 @@
 
 #include <mem.h>
 #include <nordic/nrf_common.dtsi>
-#include <zephyr/dt-bindings/adc/nrf-saadc.h>
+
 #include <zephyr/dt-bindings/misc/nordic-nrf-ficr-nrf9230-engb.h>
 #include <zephyr/dt-bindings/misc/nordic-domain-id-nrf9230.h>
 #include <zephyr/dt-bindings/misc/nordic-owner-id-nrf9230.h>
diff --git a/dts/common/nordic/nrf_common.dtsi b/dts/common/nordic/nrf_common.dtsi
index 6293a82ed97..cb2df6bcccd 100644
--- a/dts/common/nordic/nrf_common.dtsi
+++ b/dts/common/nordic/nrf_common.dtsi
@@ -5,6 +5,7 @@
  */
 
 #include <zephyr/dt-bindings/adc/adc.h>
+#include <zephyr/dt-bindings/adc/nrf-adc.h>
 #include <zephyr/dt-bindings/gpio/gpio.h>
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
diff --git a/include/zephyr/dt-bindings/adc/nrf-adc.h b/include/zephyr/dt-bindings/adc/nrf-adc.h
index 62d9b7cc33f..1d875b8eb35 100644
--- a/include/zephyr/dt-bindings/adc/nrf-adc.h
+++ b/include/zephyr/dt-bindings/adc/nrf-adc.h
@@ -18,4 +18,15 @@
 #define NRF_ADC_AIN6 BIT(6)
 #define NRF_ADC_AIN7 BIT(7)
 
+#define NRF_SAADC_AIN0     1
+#define NRF_SAADC_AIN1     2
+#define NRF_SAADC_AIN2     3
+#define NRF_SAADC_AIN3     4
+#define NRF_SAADC_AIN4     5
+#define NRF_SAADC_AIN5     6
+#define NRF_SAADC_AIN6     7
+#define NRF_SAADC_AIN7     8
+#define NRF_SAADC_VDD      9
+#define NRF_SAADC_VDDHDIV5 13
+
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_ADC_H_ */
diff --git a/include/zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h b/include/zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h
deleted file mode 100644
index 19da4ff6020..00000000000
--- a/include/zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (c) 2024 Nordic Semiconductor ASA
- */
-
-#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_NRF54L_H_
-#define ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_NRF54L_H_
-
-#include <zephyr/dt-bindings/adc/nrf-saadc-v2.h>
-
-#define NRF_SAADC_AVDD 10
-#define NRF_SAADC_DVDD 11
-
-#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_NRF54L_H_ */
diff --git a/include/zephyr/dt-bindings/adc/nrf-saadc-v2.h b/include/zephyr/dt-bindings/adc/nrf-saadc-v2.h
deleted file mode 100644
index f5f72bec829..00000000000
--- a/include/zephyr/dt-bindings/adc/nrf-saadc-v2.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (c) 2024 Nordic Semiconductor ASA
- */
-
-#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_V2_H_
-#define ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_V2_H_
-
-#include <zephyr/dt-bindings/adc/nrf-saadc.h>
-
-#define NRF_SAADC_VDD 9
-
-#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_V2_H_ */
diff --git a/include/zephyr/dt-bindings/adc/nrf-saadc-v3.h b/include/zephyr/dt-bindings/adc/nrf-saadc-v3.h
deleted file mode 100644
index c51bab1a91e..00000000000
--- a/include/zephyr/dt-bindings/adc/nrf-saadc-v3.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (c) 2024 Nordic Semiconductor ASA
- */
-
-#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_V3_H_
-#define ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_V3_H_
-
-#include <zephyr/dt-bindings/adc/nrf-saadc-v2.h>
-
-#define NRF_SAADC_VDDHDIV5 13
-
-#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_V3_H_ */
diff --git a/include/zephyr/dt-bindings/adc/nrf-saadc.h b/include/zephyr/dt-bindings/adc/nrf-saadc.h
deleted file mode 100644
index 4a3deb95cff..00000000000
--- a/include/zephyr/dt-bindings/adc/nrf-saadc.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (c) 2024 Nordic Semiconductor ASA
- */
-
-#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_H_
-#define ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_H_
-
-#define NRF_SAADC_AIN0 1
-#define NRF_SAADC_AIN1 2
-#define NRF_SAADC_AIN2 3
-#define NRF_SAADC_AIN3 4
-#define NRF_SAADC_AIN4 5
-#define NRF_SAADC_AIN5 6
-#define NRF_SAADC_AIN6 7
-#define NRF_SAADC_AIN7 8
-
-#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_H_ */

From 8478dc30ce191dd2a1bdfebfa833e48a38796abf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:00 +0100
Subject: [PATCH 1901/2913] Revert "[nrf fromtree] soc: nordic: nrf54l: remove
 normal voltage mode"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3bb9b8888fbeda815e21b8502cd17ee1357f6d7b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54l/Kconfig | 3 +++
 soc/nordic/nrf54l/soc.c   | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index 0ad48f7c9c1..eeb12fbfab0 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -79,6 +79,9 @@ config SOC_NRF_FORCE_CONSTLAT
 	  of base resources on while in sleep. The advantage of having a constant
 	  and predictable latency will be at the cost of having increased power consumption.
 
+config SOC_NRF54L_NORMAL_VOLTAGE_MODE
+	bool "NRF54L Normal Voltage Mode."
+
 if NRF_GRTC_TIMER
 
 config ELV_GRTC_LFXO_ALLOWED
diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index f70675517b8..b1e8667a9f1 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -156,6 +156,10 @@ static int nordicsemi_nrf54l_init(void)
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);
 #endif
 
+	if (IS_ENABLED(CONFIG_SOC_NRF54L_NORMAL_VOLTAGE_MODE)) {
+		nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MEDIUM, false);
+	}
+
 #if defined(CONFIG_ELV_GRTC_LFXO_ALLOWED)
 	nrf_regulators_elv_mode_allow_set(NRF_REGULATORS, NRF_REGULATORS_ELV_ELVGRTCLFXO_MASK);
 #endif /* CONFIG_ELV_GRTC_LFXO_ALLOWED */

From c10715cc3511e34ccbce2d50f9fe15b8652eeb8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:01 +0100
Subject: [PATCH 1902/2913] Revert "[nrf fromtree] net: silence no sources
 cmake warning"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 18db89b124bf36fa24d2bb970a56e66c71adb8ed.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/subsys/net/CMakeLists.txt b/subsys/net/CMakeLists.txt
index 4bdcdabe2d3..e99b26f5fb6 100644
--- a/subsys/net/CMakeLists.txt
+++ b/subsys/net/CMakeLists.txt
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_library()
-zephyr_library_property(ALLOW_EMPTY TRUE)
 zephyr_library_sources_ifdef(CONFIG_NET_HOSTNAME_ENABLE hostname.c)
 
 if(CONFIG_NETWORKING)

From 1cdf6005fade09674907e6eea109865930bdaa71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:01 +0100
Subject: [PATCH 1903/2913] Revert "[nrf fromtree] tests: boards: nrf: qdec:
 modify QDEC tests to match new api"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7aab55d3b7cb52dae800309bd82b28a91a27f736.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/boards/nrf/qdec/src/main.c | 37 +++++++++++++++-----------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/tests/boards/nrf/qdec/src/main.c b/tests/boards/nrf/qdec/src/main.c
index cccd92c3293..639e92f8510 100644
--- a/tests/boards/nrf/qdec/src/main.c
+++ b/tests/boards/nrf/qdec/src/main.c
@@ -89,7 +89,7 @@ static void qenc_emulate_stop(void)
 }
 
 static void qenc_emulate_verify_reading(int emulator_period_ms, int emulation_duration_ms,
-					bool forward, bool overflow_expected)
+					bool forward, bool overflow_possible)
 {
 	int rc;
 	struct sensor_value val = {0};
@@ -107,17 +107,13 @@ static void qenc_emulate_verify_reading(int emulator_period_ms, int emulation_du
 	k_msleep(emulation_duration_ms);
 
 	rc = sensor_sample_fetch(qdec_dev);
-
-	if (!overflow_expected) {
-		zassert_true(rc == 0, "Failed to fetch sample (%d)", rc);
-	} else {
-		zassert_true(rc == -EOVERFLOW, "Failed to detect overflow");
-	}
+	zassert_true(rc == 0, "Failed to fetch sample (%d)", rc);
 
 	rc = sensor_channel_get(qdec_dev, SENSOR_CHAN_ROTATION, &val);
 	zassert_true(rc == 0, "Failed to get sample (%d)", rc);
 
-	if (!overflow_expected) {
+	TC_PRINT("QDEC reading: %d\n", val.val1);
+	if (!overflow_possible) {
 		zassert_within(val.val1, expected_reading, delta,
 			       "Expected reading: %d,  but got: %d", expected_reading, val.val1);
 	}
@@ -201,9 +197,6 @@ ZTEST(qdec_sensor, test_sensor_trigger_set)
 	rc = k_sem_take(&sem, K_MSEC(200));
 	zassert_true(rc == 0, "qdec handler should be triggered (%d)", rc);
 
-	rc = sensor_sample_fetch(qdec_dev);
-	zassert_true(rc == 0, "Failed to fetch sample (%d)", rc);
-
 	rc = sensor_channel_get(qdec_dev, SENSOR_CHAN_ROTATION, &val);
 	zassert_true(rc == 0, "Failed to fetch sample (%d)", rc);
 
@@ -248,6 +241,7 @@ ZTEST(qdec_sensor, test_qdec_readings)
 	qenc_emulate_verify_reading(10, 100, true, false);
 	qenc_emulate_verify_reading(2, 500, true, false);
 	qenc_emulate_verify_reading(10, 200, false, false);
+	/* may lead to overflows but currently driver does not detects that */
 	qenc_emulate_verify_reading(1, 1000, false, true);
 	qenc_emulate_verify_reading(1, 1000, true, true);
 }
@@ -319,15 +313,18 @@ ZTEST(qdec_sensor, test_sensor_channel_get)
 	/* subsequent calls of sensor_channel_get without calling sensor_sample_fetch
 	 * should yield the same value
 	 */
-	zassert_true(val_first.val1 == val_second.val1,
-		     "Expected the same readings: %d vs %d",
-		     val_first.val1,
-		     val_second.val1);
-
-	zassert_true(val_first.val2 == val_second.val2,
-		     "Expected the same readings: %d vs %d",
-		     val_first.val2,
-		     val_second.val2);
+	/* zassert_true(val_first.val1 == val_second.val1,
+	 *				"Expected the same readings: %d vs %d",
+	 *				val_first.val1,
+	 *				val_second.val1);
+	 */
+	TC_PRINT("Expected the same readings: %d vs %d - ignore!\n", val_first.val1,
+		 val_second.val1);
+	/* zassert_true(val_first.val2 == val_second.val2, "Expected the same readings: %d vs %d",
+	 *	     val_first.val2, val_second.val2);
+	 */
+	TC_PRINT("Expected the same readings: %d vs %d - ignore!\n", val_first.val2,
+		 val_second.val2);
 }
 
 /**

From 114ada6a7e3524e6859a65bf62f65767f1e61c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:01 +0100
Subject: [PATCH 1904/2913] Revert "[nrf fromtree] drivers: sensor: qdec: fix
 QDEC overflow handling"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d3347cac78c2239265b5dbaf52dbbf1f5fc82ae5.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c | 23 ++-------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c b/drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c
index dc70c27d417..10035e0a103 100644
--- a/drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c
+++ b/drivers/sensor/nordic/qdec_nrfx/qdec_nrfx.c
@@ -26,9 +26,7 @@ LOG_MODULE_REGISTER(qdec_nrfx, CONFIG_SENSOR_LOG_LEVEL);
 
 
 struct qdec_nrfx_data {
-	int32_t fetched_acc;
 	int32_t acc;
-	bool overflow;
 	sensor_trigger_handler_t data_ready_handler;
 	const struct sensor_trigger *data_ready_trigger;
 };
@@ -51,8 +49,6 @@ static void accumulate(struct qdec_nrfx_data *data, int32_t acc)
 
 	if (!overflow) {
 		data->acc += acc;
-	} else {
-		data->overflow = true;
 	}
 
 	irq_unlock(key);
@@ -74,18 +70,6 @@ static int qdec_nrfx_sample_fetch(const struct device *dev,
 
 	accumulate(data, acc);
 
-	unsigned int key = irq_lock();
-
-	data->fetched_acc = data->acc;
-	data->acc = 0;
-
-	irq_unlock(key);
-
-	if (data->overflow) {
-		data->overflow = false;
-		return -EOVERFLOW;
-	}
-
 	return 0;
 }
 
@@ -103,7 +87,8 @@ static int qdec_nrfx_channel_get(const struct device *dev,
 	}
 
 	key = irq_lock();
-	acc = data->fetched_acc;
+	acc = data->acc;
+	data->acc = 0;
 	irq_unlock(key);
 
 	val->val1 = (acc * FULL_ANGLE) / config->steps;
@@ -163,10 +148,6 @@ static void qdec_nrfx_event_handler(nrfx_qdec_event_t event, void *p_context)
 		}
 		break;
 
-	case NRF_QDEC_EVENT_ACCOF:
-		dev_data->overflow = true;
-		break;
-
 	default:
 		LOG_ERR("unhandled event (0x%x)", event.type);
 		break;

From 8e391c210f23141af995f7a99db2ef6c56ee7140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:01 +0100
Subject: [PATCH 1905/2913] Revert "[nrf fromtree] drivers: nrfwifi: Add
 provision to handle FW blobs externally"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 08f95bacf3b4bc902faada0c3611046d9fea20f0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/CMakeLists.txt  |  2 +-
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 26 +++++++++-----------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index a2773efbc06..3c912419a9c 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -142,7 +142,7 @@ if (CONFIG_NRF_WIFI_BUILD_ONLY_MODE)
   This is only for building (CI) purposes and will not work on a real device.
   ------------------------------------------------------------------------
   ")
-elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
+else()
   # RPU FW patch binaries based on the selected configuration
   if(CONFIG_NRF70_SYSTEM_MODE)
     set(NRF70_PATCH ${FW_BINS_BASE}/default/nrf70.bin)
diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index bccb48b8576..3096dd7c76e 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -128,29 +128,14 @@ config NRF_WIFI_IF_AUTO_START
 	bool "Wi-Fi interface auto start on boot"
 	default y
 
-choice NRF_WIFI_FW_BLOB_HANDLING
-	prompt "nRF70 Firmware blob handling"
-	default NRF_WIFI_PATCHES_BUILTIN
-
-config NRF_WIFI_BUILD_ONLY_MODE
-	bool "Build only mode"
-	help
-	  Enable this option to build the driver without firmware loading, removes
-	  dependency on firmware binary and patches.
-	  This is useful to check the build and link errors.
-
 config NRF_WIFI_PATCHES_BUILTIN
 	bool "Store nRF70 FW patches as part of the driver"
+	default y
+	depends on !NRF_WIFI_BUILD_ONLY_MODE
 	help
 	  Select this option to store nRF70 FW patches as part of the driver.
 	  This option impacts the code memory footprint of the driver.
 
-config NRF_WIFI_PATCHES_EXTERNAL
-	bool "Load nRF70 FW patches from external binary"
-	help
-	  Select this option to load nRF70 FW patches from an external tooling.
-endchoice
-
 config NRF_WIFI_LOW_POWER
 	bool "low power mode in nRF Wi-Fi chipsets"
 	default y
@@ -705,4 +690,11 @@ config NRF_WIFI_QOS_NULL_BASED_RETRIEVAL
 
 endchoice
 
+config NRF_WIFI_BUILD_ONLY_MODE
+	bool "Build only mode"
+	help
+	  Enable this option to build the driver without firmware loading, removes
+	  dependency on firmware binary and patches.
+	  This is useful to check the build and link errors.
+
 endif # WIFI_NRF70

From ab2b484755adf63b2ae1827135ff085b351427cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:01 +0100
Subject: [PATCH 1906/2913] Revert "[nrf fromtree] drivers: wifi: nrf: Remove
 unused linker script"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3ad88eef115661d3196f1c299e1d62287016e070.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi   |  4 ++
 drivers/wifi/nrfwifi/rpu_fw_patches.ld | 51 ++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 drivers/wifi/nrfwifi/rpu_fw_patches.ld

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index 3096dd7c76e..d4b796fef35 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -136,6 +136,10 @@ config NRF_WIFI_PATCHES_BUILTIN
 	  Select this option to store nRF70 FW patches as part of the driver.
 	  This option impacts the code memory footprint of the driver.
 
+config CUSTOM_LINKER_SCRIPT
+	string "Custom linker script for nRF70 FW patches"
+	default "${ZEPHYR_BASE}/../nrf/drivers/wifi/nrf70/rpu_fw_patches.ld"
+
 config NRF_WIFI_LOW_POWER
 	bool "low power mode in nRF Wi-Fi chipsets"
 	default y
diff --git a/drivers/wifi/nrfwifi/rpu_fw_patches.ld b/drivers/wifi/nrfwifi/rpu_fw_patches.ld
new file mode 100644
index 00000000000..4ecbaedb096
--- /dev/null
+++ b/drivers/wifi/nrfwifi/rpu_fw_patches.ld
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief Custom Linker command/script file
+ *
+ * Custom Linker script for the Cortex-M platforms.
+ */
+
+#include <zephyr/linker/sections.h>
+#include <zephyr/devicetree.h>
+
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/linker/linker-tool.h>
+
+#if CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP || CONFIG_BOARD_NRF52840DK_NRF52840
+/*
+ * nRF53/52 series ship an external flash that can be used for XIP using QSPI/SPI.
+ *
+ * Note: In nRF7002 external flash using is accessible only using SPI but there is no
+ *       support for XIP, so, relocation cannot be used.
+ */
+#if CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP
+#define EXTFLASH_BASE_ADDR 0x10000000
+#define EXTFLASH_SIZE 0x800000
+#elif CONFIG_BOARD_NRF52840DK_NRF52840
+#define EXTFLASH_BASE_ADDR 0x12000000
+#define EXTFLASH_SIZE 0x800000
+#endif /* CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP */
+
+#if USE_PARTITION_MANAGER && PM_EXTERNAL_FLASH_ADDRESS
+#include <pm_config.h>
+#define EXTFLASH_ADDRESS (EXTFLASH_BASE_ADDR + PM_EXTERNAL_FLASH_ADDRESS)
+#undef EXTFLASH_SIZE
+#define EXTFLASH_SIZE (PM_EXTERNAL_FLASH_SIZE)
+#else
+#define EXTFLASH_ADDRESS (EXTFLASH_BASE_ADDR)
+#endif /* USE_PARTITION_MANAGER && PM_EXTERNAL_FLASH_ADDRESS */
+
+MEMORY
+{
+     EXTFLASH (wx) : ORIGIN = EXTFLASH_ADDRESS, LENGTH = EXTFLASH_SIZE
+}
+
+#endif /* CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP || CONFIG_BOARD_NRF52840DK_NRF52840 */
+
+#include <zephyr/arch/arm/cortex_m/scripts/linker.ld>

From bf5441274551c383d28ebddb0c404d5325180da9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:01 +0100
Subject: [PATCH 1907/2913] Revert "[nrf fromtree] drivers: wifi: Add support
 to override FW load"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cb1ce639a283d48c7330b3371282c1a6f25838a4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/CMakeLists.txt  | 2 +-
 drivers/wifi/nrfwifi/Kconfig.nrfwifi | 1 -
 drivers/wifi/nrfwifi/src/fw_load.c   | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 3c912419a9c..4055384aac7 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -63,7 +63,7 @@ zephyr_library_sources(
   src/qspi/src/ficr_prog.c
 )
 
-zephyr_library_sources_ifdef(CONFIG_NRF_WIFI_PATCHES_BUILTIN
+zephyr_library_sources_ifndef(CONFIG_NRF_WIFI_BUILD_ONLY_MODE
   src/fw_load.c
 )
 
diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index d4b796fef35..d8cae0f38c8 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -131,7 +131,6 @@ config NRF_WIFI_IF_AUTO_START
 config NRF_WIFI_PATCHES_BUILTIN
 	bool "Store nRF70 FW patches as part of the driver"
 	default y
-	depends on !NRF_WIFI_BUILD_ONLY_MODE
 	help
 	  Select this option to store nRF70 FW patches as part of the driver.
 	  This option impacts the code memory footprint of the driver.
diff --git a/drivers/wifi/nrfwifi/src/fw_load.c b/drivers/wifi/nrfwifi/src/fw_load.c
index 6bf4c85193f..14087a7d35c 100644
--- a/drivers/wifi/nrfwifi/src/fw_load.c
+++ b/drivers/wifi/nrfwifi/src/fw_load.c
@@ -18,6 +18,7 @@ LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 
 #include <fmac_main.h>
 
+#ifdef CONFIG_NRF_WIFI_PATCHES_BUILTIN
 /* INCBIN macro Taken from https://gist.github.com/mmozeiko/ed9655cf50341553d282 */
 #define STR2(x) #x
 #define STR(x) STR2(x)
@@ -55,6 +56,7 @@ LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 	extern                  const char prefix ## _ ## name ## _end[];
 
 INCBIN(_bin, nrf70_fw, STR(CONFIG_NRF_WIFI_FW_BIN));
+#endif /* CONFIG_NRF_WIFI_PATCHES_BUILTIN */
 
 enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx)
 {

From fd3593c2ab78d701b352d7ef8822635326e0a8d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:01 +0100
Subject: [PATCH 1908/2913] Revert "[nrf fromtree] drivers: nrfwifi: Fix the
 indentation"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ee69262018163ae450684fd57dac358141c73fa9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/CMakeLists.txt | 64 ++++++++++++++---------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index 4055384aac7..91818f65582 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -136,39 +136,39 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF70_ON_QSPI
 )
 
 if (CONFIG_NRF_WIFI_BUILD_ONLY_MODE)
-  message(WARNING "
-  ------------------------------------------------------------------------
-  Building only the nRF70 driver, skipping firmware patch.
-  This is only for building (CI) purposes and will not work on a real device.
-  ------------------------------------------------------------------------
-  ")
+message(WARNING "
+------------------------------------------------------------------------
+Building only the nRF70 driver, skipping firmware patch.
+This is only for building (CI) purposes and will not work on a real device.
+------------------------------------------------------------------------
+")
 else()
-  # RPU FW patch binaries based on the selected configuration
-  if(CONFIG_NRF70_SYSTEM_MODE)
-    set(NRF70_PATCH ${FW_BINS_BASE}/default/nrf70.bin)
-  elseif(CONFIG_NRF70_RADIO_TEST)
-    set(NRF70_PATCH ${FW_BINS_BASE}/radio_test/nrf70.bin)
-  elseif(CONFIG_NRF70_SCAN_ONLY)
-    set(NRF70_PATCH ${FW_BINS_BASE}/scan_only/nrf70.bin)
-  elseif (CONFIG_NRF70_SYSTEM_WITH_RAW_MODES)
-    set(NRF70_PATCH ${FW_BINS_BASE}/system_with_raw/nrf70.bin)
-  else()
-    # Error
-    message(FATAL_ERROR "Unsupported nRF70 patch configuration")
-  endif()
-
-  if(NOT EXISTS ${NRF70_PATCH})
-    message(FATAL_ERROR "
-      ------------------------------------------------------------------------
-      Missing blobs for nRF70 device driver, please install by running:
-          $ west update
-          $ west blobs fetch hal_nordic
-      ------------------------------------------------------------------------")
-  endif()
-
-  zephyr_compile_definitions(
-    -DCONFIG_NRF_WIFI_FW_BIN=${NRF70_PATCH}
-  )
+# RPU FW patch binaries based on the selected configuration
+if(CONFIG_NRF70_SYSTEM_MODE)
+  set(NRF70_PATCH ${FW_BINS_BASE}/default/nrf70.bin)
+elseif(CONFIG_NRF70_RADIO_TEST)
+  set(NRF70_PATCH ${FW_BINS_BASE}/radio_test/nrf70.bin)
+elseif(CONFIG_NRF70_SCAN_ONLY)
+  set(NRF70_PATCH ${FW_BINS_BASE}/scan_only/nrf70.bin)
+elseif (CONFIG_NRF70_SYSTEM_WITH_RAW_MODES)
+  set(NRF70_PATCH ${FW_BINS_BASE}/system_with_raw/nrf70.bin)
+else()
+  # Error
+  message(FATAL_ERROR "Unsupported nRF70 patch configuration")
+endif()
+
+if(NOT EXISTS ${NRF70_PATCH})
+  message(FATAL_ERROR "
+    ------------------------------------------------------------------------
+    Missing blobs for nRF70 device driver, please install by running:
+        $ west update
+        $ west blobs fetch hal_nordic
+    ------------------------------------------------------------------------")
+endif()
+
+zephyr_compile_definitions(
+  -DCONFIG_NRF_WIFI_FW_BIN=${NRF70_PATCH}
+)
 endif()
 
 

From 204052a2c321092540163f7d858ded1fa503ad18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:01 +0100
Subject: [PATCH 1909/2913] Revert "[nrf fromtree] usb: dwc2: Allow for
 enabling USB if the cable is disconnected"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a5245119eb40efc613cbf24fc8d6b1a091bcbfd9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/Kconfig.dwc2             | 10 ----------
 drivers/usb/udc/udc_dwc2_vendor_quirks.h | 14 ++------------
 include/zephyr/drivers/usb/udc.h         |  1 -
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/drivers/usb/udc/Kconfig.dwc2 b/drivers/usb/udc/Kconfig.dwc2
index 2f40c8f71a2..4c023cfb04d 100644
--- a/drivers/usb/udc/Kconfig.dwc2
+++ b/drivers/usb/udc/Kconfig.dwc2
@@ -38,13 +38,3 @@ config UDC_DWC2_THREAD_PRIORITY
 	default 8
 	help
 	  DWC2 driver thread priority.
-
-config UDC_DWC2_USBHS_VBUS_READY_TIMEOUT
-	int "UDC DWC2 USBHS VBUS ready event timeout in ms"
-	depends on UDC_DWC2
-	depends on NRFS_HAS_VBUS_DETECTOR_SERVICE
-	default 0
-	help
-	  UDC DWC2 USBHS VBUS ready event timeout. If the VBUS is not ready
-	  and the Nordic USBHS controller is used, the udc_enable() is
-	  blocked for this amount of time. Set it to zero to wait forever.
diff --git a/drivers/usb/udc/udc_dwc2_vendor_quirks.h b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
index d12d64ef848..84d912f9fdb 100644
--- a/drivers/usb/udc/udc_dwc2_vendor_quirks.h
+++ b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
@@ -121,8 +121,7 @@ DT_INST_FOREACH_STATUS_OKAY(QUIRK_STM32F4_FSOTG_DEFINE)
  * On USBHS, we cannot access the DWC2 register until VBUS is detected and
  * valid. If the user tries to force usbd_enable() and the corresponding
  * udc_enable() without a "VBUS ready" notification, the event wait will block
- * until a valid VBUS signal is detected or until the
- * CONFIG_UDC_DWC2_USBHS_VBUS_READY_TIMEOUT timeout expires.
+ * until a valid VBUS signal is detected.
  */
 static K_EVENT_DEFINE(usbhs_events);
 #define USBHS_VBUS_READY	BIT(0)
@@ -183,19 +182,10 @@ static inline int usbhs_enable_nrfs_service(const struct device *dev)
 static inline int usbhs_enable_core(const struct device *dev)
 {
 	NRF_USBHS_Type *wrapper = USBHS_DT_WRAPPER_REG_ADDR(0);
-	k_timeout_t timeout = K_FOREVER;
-
-	#if CONFIG_NRFS_HAS_VBUS_DETECTOR_SERVICE
-	if (CONFIG_UDC_DWC2_USBHS_VBUS_READY_TIMEOUT) {
-		timeout = K_MSEC(CONFIG_UDC_DWC2_USBHS_VBUS_READY_TIMEOUT);
-	}
-	#endif
 
 	if (!k_event_wait(&usbhs_events, USBHS_VBUS_READY, false, K_NO_WAIT)) {
 		LOG_WRN("VBUS is not ready, block udc_enable()");
-		if (!k_event_wait(&usbhs_events, USBHS_VBUS_READY, false, timeout)) {
-			return -ETIMEDOUT;
-		}
+		k_event_wait(&usbhs_events, USBHS_VBUS_READY, false, K_FOREVER);
 	}
 
 	wrapper->ENABLE = USBHS_ENABLE_PHY_Msk | USBHS_ENABLE_CORE_Msk;
diff --git a/include/zephyr/drivers/usb/udc.h b/include/zephyr/drivers/usb/udc.h
index 15b99cf5251..7910d8cfd8f 100644
--- a/include/zephyr/drivers/usb/udc.h
+++ b/include/zephyr/drivers/usb/udc.h
@@ -371,7 +371,6 @@ int udc_init(const struct device *dev,
  * @return 0 on success, all other values should be treated as error.
  * @retval -EPERM controller is not initialized
  * @retval -EALREADY already enabled
- * @retval -ETIMEDOUT enable operation timed out
  */
 int udc_enable(const struct device *dev);
 

From 0afb29c2819b058b13fff0d7463f865a52ea16b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:01 +0100
Subject: [PATCH 1910/2913] Revert "[nrf fromlist] modules: hal_nordic:
 Integrate nrf-regtool 7.0.0"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c81e72de0ad2f56e11ae653e091fb7a44236a90f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/Kconfig.nrf_regtool        |  7 +++
 .../nrf-regtool/nrf-regtoolConfig.cmake       | 52 +++++++------------
 .../nrf-regtoolConfigVersion.cmake            |  1 -
 3 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/modules/hal_nordic/Kconfig.nrf_regtool b/modules/hal_nordic/Kconfig.nrf_regtool
index 396ec2050a0..791971452fe 100644
--- a/modules/hal_nordic/Kconfig.nrf_regtool
+++ b/modules/hal_nordic/Kconfig.nrf_regtool
@@ -26,4 +26,11 @@ config NRF_REGTOOL_VERBOSITY
 	  3. Print even more details, which are typically only useful for
 	     nrf-regtool developers.
 
+config NRF_REGTOOL_EXTRA_GENERATE_ARGS
+	string "Extra arguments to 'nrf-regtool generate'"
+	help
+	  List of additional arguments to every nrf-regtool invocation used for
+	  generating hex files. Example value: "--fill all --fill-byte 0xff".
+	  Run "nrf-regtool generate -h" to see all of the available options.
+
 endmenu
diff --git a/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake b/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake
index 6bcaa453cce..0ff0a8ba6dd 100644
--- a/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake
+++ b/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake
@@ -1,26 +1,16 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-function(nrf_regtool_generate_uicr generated_hex_file)
-  string(REPEAT "-v;" ${CONFIG_NRF_REGTOOL_VERBOSITY} verbosity)
-  execute_process(
-    COMMAND
-    ${CMAKE_COMMAND} -E env PYTHONPATH=${ZEPHYR_BASE}/scripts/dts/python-devicetree/src
-    ${NRF_REGTOOL} ${verbosity} uicr-compile
-    --edt-pickle-file ${EDT_PICKLE}
-    --product-name ${CONFIG_SOC}
-    --output-file ${generated_hex_file}
-    WORKING_DIRECTORY ${APPLICATION_SOURCE_DIR}
-    COMMAND_ERROR_IS_FATAL ANY
-  )
-  message(STATUS "Generated UICR hex file: ${generated_hex_file}")
-endfunction()
+function(nrf_regtool_generate_hex_from_dts peripheral)
+  string(TOLOWER "${peripheral}.hex" generated_hex_name)
+  string(TOLOWER "${peripheral}_merged.hex" merged_hex_name)
 
-function(nrf_regtool_generate_peripheral peripheral generated_hex_file)
   # Prepare common argument sub-lists.
   string(REPEAT "-v;" ${CONFIG_NRF_REGTOOL_VERBOSITY} verbosity)
   list(TRANSFORM CACHED_DTS_ROOT_BINDINGS PREPEND "--bindings-dir;" OUTPUT_VARIABLE bindings_dirs)
+  separate_arguments(extra_args UNIX_COMMAND "${CONFIG_NRF_REGTOOL_EXTRA_GENERATE_ARGS}")
 
+  set(generated_hex_file ${PROJECT_BINARY_DIR}/${generated_hex_name})
   execute_process(
     COMMAND
     ${CMAKE_COMMAND} -E env PYTHONPATH=${ZEPHYR_BASE}/scripts/dts/python-devicetree/src
@@ -35,29 +25,25 @@ function(nrf_regtool_generate_peripheral peripheral generated_hex_file)
     COMMAND_ERROR_IS_FATAL ANY
   )
   message(STATUS "Generated ${peripheral} hex file: ${generated_hex_file}")
+
+  set(merged_hex_file ${PROJECT_BINARY_DIR}/${merged_hex_name})
+  set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+    COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/mergehex.py
+    -o ${merged_hex_file}
+    ${generated_hex_file}
+    ${PROJECT_BINARY_DIR}/${KERNEL_HEX_NAME}
+  )
+  set_property(TARGET runners_yaml_props_target PROPERTY hex_file ${merged_hex_file})
 endfunction()
 
-get_property(version GLOBAL PROPERTY nrf_regtool_version)
 
 foreach(component IN LISTS ${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS)
-  if(component STREQUAL "GENERATE:UICR")
-    set(generated_hex_file ${PROJECT_BINARY_DIR}/uicr.hex)
-    if(version VERSION_GREATER_EQUAL 7.0.0)
-      nrf_regtool_generate_uicr(${generated_hex_file})
-    else()
-      nrf_regtool_generate_peripheral(UICR ${generated_hex_file})
-    endif()
-
-    # UICR must be flashed together with the Zephyr binary.
-    set(merged_hex_file ${PROJECT_BINARY_DIR}/uicr_merged.hex)
-    set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-      COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/mergehex.py
-      -o ${merged_hex_file}
-      ${generated_hex_file}
-      ${PROJECT_BINARY_DIR}/${KERNEL_HEX_NAME}
-    )
-    set_property(TARGET runners_yaml_props_target PROPERTY hex_file ${merged_hex_file})
+  string(REGEX MATCH "(^.*):(.*$)" match ${component})
+  set(operation  "${CMAKE_MATCH_1}")
+  set(peripheral "${CMAKE_MATCH_2}")
 
+  if(operation STREQUAL "GENERATE")
+    nrf_regtool_generate_hex_from_dts(${peripheral})
   else()
     message(FATAL_ERROR "Unrecognized package component: \"${component}\"")
   endif()
diff --git a/modules/hal_nordic/nrf-regtool/nrf-regtoolConfigVersion.cmake b/modules/hal_nordic/nrf-regtool/nrf-regtoolConfigVersion.cmake
index 81345c1ae50..e147d1b0532 100644
--- a/modules/hal_nordic/nrf-regtool/nrf-regtoolConfigVersion.cmake
+++ b/modules/hal_nordic/nrf-regtool/nrf-regtoolConfigVersion.cmake
@@ -22,7 +22,6 @@ if(NRF_REGTOOL)
         "Found nrf-regtool (found suitable version \"${PACKAGE_VERSION}\", "
         "minimum required is \"${PACKAGE_FIND_VERSION}\")"
       )
-      set_property(GLOBAL PROPERTY nrf_regtool_version ${PACKAGE_VERSION})
       return()
     endif()
   endif()

From 8627f9dcbec2d517aa31978f2b2cbcfe5092495b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:01 +0100
Subject: [PATCH 1911/2913] Revert "[nrf fromtree] boards: nordic: Flatten
 shared_ramxx_region nodes"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit edfe1ee48e99822e49252c3b46645a50309b8038.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf54h20dk_nrf54h20-memory_map.dtsi       | 70 +++++++++++--------
 .../nrf9280pdk_nrf9280-memory_map.dtsi        | 70 +++++++++++--------
 ...rf54h20dk_nrf54h20_cpuppr_launcher.overlay |  4 ++
 3 files changed, 88 insertions(+), 56 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index 2b2473f92b5..e26afaaa637 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -81,20 +81,27 @@
 			};
 		};
 
-		cpuapp_cpusys_ipc_shm: memory@2f88fce0 {
-			reg = <0x2f88fce0 0x80>;
-		};
+		shared_ram20_region: memory@2f88f000 {
+			reg = <0x2f88f000 DT_SIZE_K(4)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x2f88f000 0x1000>;
 
-		cpusys_cpuapp_ipc_shm: memory@2f88fd60 {
-			reg = <0x2f88fd60 0x80>;
-		};
+			cpuapp_cpusys_ipc_shm: memory@ce0 {
+				reg = <0xce0 0x80>;
+			};
 
-		cpurad_cpusys_ipc_shm: memory@2f88fe00 {
-			reg = <0x2f88fe00 0x80>;
-		};
+			cpusys_cpuapp_ipc_shm: memory@d60 {
+				reg = <0xd60 0x80>;
+			};
+
+			cpurad_cpusys_ipc_shm: memory@e00 {
+				reg = <0xe00 0x80>;
+			};
 
-		cpusys_cpurad_ipc_shm: memory@2f88fe80 {
-			reg = <0x2f88fe80 0x80>;
+			cpusys_cpurad_ipc_shm: memory@e80 {
+				reg = <0xe80 0x80>;
+			};
 		};
 
 		/*
@@ -155,24 +162,31 @@
 			};
 		};
 
-		cpuapp_dma_region: memory@2fc12000 {
-			compatible = "nordic,owned-memory", "zephyr,memory-region";
-			reg = <0x2fc12000 DT_SIZE_K(4)>;
-			status = "disabled";
-			#memory-region-cells = <0>;
-			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
-			zephyr,memory-region = "DMA_RAM3x_APP";
-			zephyr,memory-attr = <( DT_MEM_DMA )>;
-		};
+		shared_ram3x_region: memory@2fc12000 {
+			reg = <0x2fc12000 DT_SIZE_K(8)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x2fc12000 0x2000>;
 
-		cpurad_dma_region: memory@2fc13000 {
-			compatible = "nordic,owned-memory", "zephyr,memory-region";
-			reg = <0x2fc13000 DT_SIZE_K(1)>;
-			status = "disabled";
-			#memory-region-cells = <0>;
-			nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
-			zephyr,memory-region = "DMA_RAM3x_RAD";
-			zephyr,memory-attr = <( DT_MEM_DMA )>;
+			cpuapp_dma_region: memory@0 {
+				compatible = "nordic,owned-memory", "zephyr,memory-region";
+				reg = <0x0 DT_SIZE_K(4)>;
+				status = "disabled";
+				#memory-region-cells = <0>;
+				nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
+				zephyr,memory-region = "DMA_RAM3x_APP";
+				zephyr,memory-attr = <( DT_MEM_DMA )>;
+			};
+
+			cpurad_dma_region: memory@1000 {
+				compatible = "nordic,owned-memory", "zephyr,memory-region";
+				reg = <0x1000 DT_SIZE_K(1)>;
+				status = "disabled";
+				#memory-region-cells = <0>;
+				nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
+				zephyr,memory-region = "DMA_RAM3x_RAD";
+				zephyr,memory-attr = <( DT_MEM_DMA )>;
+			};
 		};
 	};
 };
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi
index 0127998509e..957fde61212 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi
@@ -98,20 +98,27 @@
 			};
 		};
 
-		cpuapp_cpusys_ipc_shm: memory@2f88fce0 {
-			reg = <0x2f88fce0 0x80>;
-		};
+		shared_ram20_region: memory@2f88f000 {
+			reg = <0x2f88f000 DT_SIZE_K(4)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x2f88f000 0x1000>;
 
-		cpusys_cpuapp_ipc_shm: memory@2f88fd60 {
-			reg = <0x2f88fd60 0x80>;
-		};
+			cpuapp_cpusys_ipc_shm: memory@ce0 {
+				reg = <0xce0 0x80>;
+			};
 
-		cpurad_cpusys_ipc_shm: memory@2f88fe00 {
-			reg = <0x2f88fe00 0x80>;
-		};
+			cpusys_cpuapp_ipc_shm: memory@d60 {
+				reg = <0xd60 0x80>;
+			};
+
+			cpurad_cpusys_ipc_shm: memory@e00 {
+				reg = <0xe00 0x80>;
+			};
 
-		cpusys_cpurad_ipc_shm: memory@2f88fe80 {
-			reg = <0x2f88fe80 0x80>;
+			cpusys_cpurad_ipc_shm: memory@e80 {
+				reg = <0xe80 0x80>;
+			};
 		};
 
 		ram21_region: memory@2f890000 {
@@ -155,24 +162,31 @@
 			};
 		};
 
-		cpuapp_dma_region: memory@2fc06000 {
-			compatible = "nordic,owned-memory", "zephyr,memory-region";
-			reg = <0x2fc06000 DT_SIZE_K(4)>;
-			status = "disabled";
-			#memory-region-cells = <0>;
-			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
-			zephyr,memory-region = "DMA_RAM3x_APP";
-			zephyr,memory-attr = <( DT_MEM_DMA )>;
-		};
+		shared_ram3x_region: memory@2fc06000 {
+			reg = <0x2fc06000 DT_SIZE_K(8)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x2fc06000 0x4000>;
 
-		cpurad_dma_region: memory@2fc07000 {
-			compatible = "nordic,owned-memory", "zephyr,memory-region";
-			reg = <0x2fc07000 DT_SIZE_K(1)>;
-			status = "disabled";
-			#memory-region-cells = <0>;
-			nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
-			zephyr,memory-region = "DMA_RAM3x_RAD";
-			zephyr,memory-attr = <( DT_MEM_DMA )>;
+			cpuapp_dma_region: memory@0 {
+				compatible = "nordic,owned-memory", "zephyr,memory-region";
+				reg = <0x0 DT_SIZE_K(4)>;
+				status = "disabled";
+				#memory-region-cells = <0>;
+				nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
+				zephyr,memory-region = "DMA_RAM3x_APP";
+				zephyr,memory-attr = <( DT_MEM_DMA )>;
+			};
+
+			cpurad_dma_region: memory@1000 {
+				compatible = "nordic,owned-memory", "zephyr,memory-region";
+				reg = <0x1000 DT_SIZE_K(1)>;
+				status = "disabled";
+				#memory-region-cells = <0>;
+				nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
+				zephyr,memory-region = "DMA_RAM3x_RAD";
+				zephyr,memory-attr = <( DT_MEM_DMA )>;
+			};
 		};
 	};
 };
diff --git a/tests/drivers/spi/spi_error_cases/boards/nrf54h20dk_nrf54h20_cpuppr_launcher.overlay b/tests/drivers/spi/spi_error_cases/boards/nrf54h20dk_nrf54h20_cpuppr_launcher.overlay
index facf592d94c..6e30d173155 100644
--- a/tests/drivers/spi/spi_error_cases/boards/nrf54h20dk_nrf54h20_cpuppr_launcher.overlay
+++ b/tests/drivers/spi/spi_error_cases/boards/nrf54h20dk_nrf54h20_cpuppr_launcher.overlay
@@ -14,6 +14,10 @@
 	interrupt-parent = <&cpuppr_clic>;
 };
 
+&shared_ram3x_region {
+	status = "okay";
+};
+
 &gpio0 {
 	status = "reserved";
 };

From 310cf3aa404c568542246a2b2778958213ff2189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:01 +0100
Subject: [PATCH 1912/2913] Revert "[nrf fromtree] boards: nordic: Align with
 updated Nordic owned memory bindings"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3711cfab2250084f70ba50271488dcb9acb0e19b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf54h20dk_nrf54h20-memory_map.dtsi       | 59 +++++++++------
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts |  8 +++
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts |  4 ++
 .../nrf9280pdk_nrf9280-memory_map.dtsi        | 72 ++++++++++++++-----
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts  | 14 +++-
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts  |  4 ++
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  2 +-
 .../boards/nrf54h20dk_nrf54h20_cpurad.overlay |  5 ++
 .../boards/nrf54h20dk_nrf54h20_cpurad.overlay |  5 ++
 9 files changed, 133 insertions(+), 40 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index e26afaaa637..f001678cb1f 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -11,7 +11,9 @@
 			compatible = "nordic,owned-memory";
 			reg = <0x2f010000 DT_SIZE_K(260)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
+			perm-read;
+			perm-write;
+			perm-secure;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f010000 0x41000>;
@@ -33,7 +35,9 @@
 			compatible = "nordic,owned-memory";
 			reg = <0x2f051000 DT_SIZE_K(4)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RWS>;
+			perm-read;
+			perm-write;
+			perm-secure;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f051000 0x1000>;
@@ -51,7 +55,9 @@
 			compatible = "nordic,owned-memory";
 			reg = <0x2f0be000 DT_SIZE_K(4)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
+			perm-read;
+			perm-write;
+			perm-secure;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f0be000 0x1000>;
@@ -66,8 +72,8 @@
 			compatible = "nordic,owned-memory";
 			reg = <0x2f0bf000 DT_SIZE_K(4)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>,
-					<NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
+			perm-read;
+			perm-write;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f0bf000 0x1000>;
@@ -105,15 +111,16 @@
 		};
 
 		/*
-		 * NOTE: FLPR has a direct bridge with RAM21 that bypasses MPC.
-		 * This means that when this region is marked as non-executable,
-		 * only FLPR can execute code from it.
+		 * NOTE: perm-execute is not required as FLPR has a direct
+		 * bridge with RAM21, bypassing MPC.
 		 */
 		ram21_region: memory@2f890000 {
 			compatible = "nordic,owned-memory";
 			status = "disabled";
 			reg = <0x2f890000 DT_SIZE_K(64)>;
-			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
+			perm-read;
+			perm-write;
+			perm-secure;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f890000 0x10000>;
@@ -144,7 +151,9 @@
 			compatible = "nordic,owned-memory";
 			reg = <0x2fc00000 DT_SIZE_K(64)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWX>;
+			perm-read;
+			perm-write;
+			perm-execute;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2fc00000 0x10000>;
@@ -163,27 +172,29 @@
 		};
 
 		shared_ram3x_region: memory@2fc12000 {
+			compatible = "nordic,owned-memory";
 			reg = <0x2fc12000 DT_SIZE_K(8)>;
+			status = "disabled";
+			perm-read;
+			perm-write;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2fc12000 0x2000>;
 
-			cpuapp_dma_region: memory@0 {
-				compatible = "nordic,owned-memory", "zephyr,memory-region";
-				reg = <0x0 DT_SIZE_K(4)>;
+			cpuapp_dma_region: memory@e80 {
+				compatible = "zephyr,memory-region";
+				reg = <0xe80 DT_SIZE_K(3)>;
 				status = "disabled";
 				#memory-region-cells = <0>;
-				nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
 				zephyr,memory-region = "DMA_RAM3x_APP";
 				zephyr,memory-attr = <( DT_MEM_DMA )>;
 			};
 
-			cpurad_dma_region: memory@1000 {
-				compatible = "nordic,owned-memory", "zephyr,memory-region";
-				reg = <0x1000 DT_SIZE_K(1)>;
+			cpurad_dma_region: memory@1a80 {
+				compatible = "zephyr,memory-region";
+				reg = <0x1a80 0x480>;
 				status = "disabled";
 				#memory-region-cells = <0>;
-				nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
 				zephyr,memory-region = "DMA_RAM3x_RAD";
 				zephyr,memory-attr = <( DT_MEM_DMA )>;
 			};
@@ -195,7 +206,9 @@
 	cpurad_rx_partitions: cpurad-rx-partitions {
 		compatible = "nordic,owned-partitions", "fixed-partitions";
 		status = "disabled";
-		nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RXS>;
+		perm-read;
+		perm-execute;
+		perm-secure;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
@@ -207,7 +220,9 @@
 	cpuapp_rx_partitions: cpuapp-rx-partitions {
 		compatible = "nordic,owned-partitions", "fixed-partitions";
 		status = "disabled";
-		nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RXS>;
+		perm-read;
+		perm-execute;
+		perm-secure;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
@@ -227,7 +242,9 @@
 	cpuapp_rw_partitions: cpuapp-rw-partitions {
 		compatible = "nordic,owned-partitions", "fixed-partitions";
 		status = "disabled";
-		nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
+		perm-read;
+		perm-write;
+		perm-secure;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index eacc510ce8a..517b6ed853c 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -116,6 +116,14 @@
 	status = "okay";
 };
 
+&cpuapp_cpurad_ram0x_region {
+	status = "okay";
+};
+
+&shared_ram3x_region {
+	status = "okay";
+};
+
 &ram21_region {
 	status = "okay";
 };
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
index 77e69aa463c..31827405f5f 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
@@ -34,6 +34,10 @@
 	};
 };
 
+&shared_ram3x_region {
+	status = "okay";
+};
+
 &cpuapp_cpurad_ram0x_region {
 	status = "okay";
 };
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi
index 957fde61212..78e3be8825f 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi
@@ -15,7 +15,9 @@
 			compatible = "nordic,owned-memory";
 			reg = <0x2f011000 DT_SIZE_K(4)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RWS>;
+			perm-read;
+			perm-write;
+			perm-secure;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f011000 0x1000>;
@@ -33,7 +35,9 @@
 			compatible = "nordic,owned-memory";
 			reg = <0x2f012000 DT_SIZE_K(516)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
+			perm-read;
+			perm-write;
+			perm-secure;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f012000 0x81000>;
@@ -55,8 +59,8 @@
 			compatible = "nordic,owned-memory";
 			reg = <0x2f0cf000 DT_SIZE_K(4)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>,
-					<NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
+			perm-read;
+			perm-write;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f0cf000 0x1000>;
@@ -71,11 +75,8 @@
 		};
 
 		cpuapp_cpucell_ram0x_region: memory@2f0d0000 {
-			compatible = "nordic,owned-memory";
 			reg = <0x2f0d0000 DT_SIZE_K(36)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>,
-					<NRF_OWNER_ID_CELL NRF_PERM_RW>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f0d0000 0x9000>;
@@ -98,6 +99,31 @@
 			};
 		};
 
+		/* Shared memory ownership.
+		 * TODO:
+		 * remove these two after https://github.com/zephyrproject-rtos/zephyr/pull/72273
+		 * and let cpuapp_cpucell_ram0x_region use the `access` binding to describe
+		 * the shared memory ownership.
+		 */
+
+		cpuapp_cpucell_ipc_shm: memory@2 {
+			compatible = "nordic,owned-memory";
+			reg = <0x2f0d0000 DT_SIZE_K(36)>;
+			owner-id = <2>;
+			perm-read;
+			perm-write;
+			status = "disabled";
+		};
+
+		cpucell_cpuapp_ipc_shm: memory@4 {
+			compatible = "nordic,owned-memory";
+			reg = <0x2f0d0000 DT_SIZE_K(36)>;
+			owner-id = <4>;
+			perm-read;
+			perm-write;
+			status = "disabled";
+		};
+
 		shared_ram20_region: memory@2f88f000 {
 			reg = <0x2f88f000 DT_SIZE_K(4)>;
 			#address-cells = <1>;
@@ -125,7 +151,9 @@
 			compatible = "nordic,owned-memory";
 			status = "disabled";
 			reg = <0x2f890000 DT_SIZE_K(32)>;
-			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
+			perm-read;
+			perm-write;
+			perm-secure;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2f890000 0x8000>;
@@ -144,7 +172,9 @@
 			compatible = "nordic,owned-memory";
 			reg = <0x2fc00000 DT_SIZE_K(24)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWX>;
+			perm-read;
+			perm-write;
+			perm-execute;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2fc00000 0x6000>;
@@ -163,27 +193,29 @@
 		};
 
 		shared_ram3x_region: memory@2fc06000 {
+			compatible = "nordic,owned-memory";
 			reg = <0x2fc06000 DT_SIZE_K(8)>;
+			status = "disabled";
+			perm-read;
+			perm-write;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x2fc06000 0x4000>;
 
 			cpuapp_dma_region: memory@0 {
-				compatible = "nordic,owned-memory", "zephyr,memory-region";
+				compatible = "zephyr,memory-region";
 				reg = <0x0 DT_SIZE_K(4)>;
 				status = "disabled";
 				#memory-region-cells = <0>;
-				nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
 				zephyr,memory-region = "DMA_RAM3x_APP";
 				zephyr,memory-attr = <( DT_MEM_DMA )>;
 			};
 
 			cpurad_dma_region: memory@1000 {
-				compatible = "nordic,owned-memory", "zephyr,memory-region";
-				reg = <0x1000 DT_SIZE_K(1)>;
+				compatible = "zephyr,memory-region";
+				reg = <0x1000 0x80>;
 				status = "disabled";
 				#memory-region-cells = <0>;
-				nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
 				zephyr,memory-region = "DMA_RAM3x_RAD";
 				zephyr,memory-attr = <( DT_MEM_DMA )>;
 			};
@@ -195,7 +227,9 @@
 	cpurad_rx_partitions: cpurad-rx-partitions {
 		compatible = "nordic,owned-partitions", "fixed-partitions";
 		status = "disabled";
-		nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RXS>;
+		perm-read;
+		perm-execute;
+		perm-secure;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
@@ -207,7 +241,9 @@
 	cpuapp_rx_partitions: cpuapp-rx-partitions {
 		compatible = "nordic,owned-partitions", "fixed-partitions";
 		status = "disabled";
-		nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RXS>;
+		perm-read;
+		perm-execute;
+		perm-secure;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
@@ -223,7 +259,9 @@
 	cpuapp_rw_partitions: cpuapp-rw-partitions {
 		compatible = "nordic,owned-partitions", "fixed-partitions";
 		status = "disabled";
-		nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
+		perm-read;
+		perm-write;
+		perm-secure;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index 17715ee0087..ceb4ddc3ff1 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -114,7 +114,19 @@
 	status = "okay";
 };
 
-&cpuapp_cpucell_ram0x_region {
+&cpuapp_cpurad_ram0x_region {
+	status = "okay";
+};
+
+&cpuapp_cpucell_ipc_shm {
+	status = "okay";
+};
+
+&cpucell_cpuapp_ipc_shm {
+	status = "okay";
+};
+
+&shared_ram3x_region {
 	status = "okay";
 };
 
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
index ddda9eb5871..1235f53df2b 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
@@ -35,6 +35,10 @@
 	};
 };
 
+&shared_ram3x_region {
+	status = "okay";
+};
+
 &cpuapp_cpurad_ram0x_region {
 	status = "okay";
 };
diff --git a/tests/arch/common/ramfunc/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/arch/common/ramfunc/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index ad84324a3e9..2deb6756009 100644
--- a/tests/arch/common/ramfunc/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/arch/common/ramfunc/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -4,5 +4,5 @@
  */
 
 &cpuapp_ram0x_region {
-	nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWXS>;
+	perm-execute;
 };
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpurad.overlay
index 84edfb2b6f1..73ec4c1dc08 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpurad.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpurad.overlay
@@ -5,6 +5,11 @@
  */
 #include "nrf54h20dk_nrf54h20_common.dtsi"
 
+/* Increase dma region to fit dmm heap. */
+&cpurad_dma_region {
+	reg = <0x1e80 0x100>;
+};
+
 &spi130 {
 	memory-regions = <&cpurad_dma_region>;
 };
diff --git a/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54h20dk_nrf54h20_cpurad.overlay
index 0ded983c2af..2bde29c9fc5 100644
--- a/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54h20dk_nrf54h20_cpurad.overlay
+++ b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54h20dk_nrf54h20_cpurad.overlay
@@ -2,6 +2,11 @@
 
 #include "nrf54h20dk_nrf54h20_common.dtsi"
 
+&cpurad_dma_region {
+	/* Default space is not enough. */
+	reg = <0x1e80 0x100>;
+};
+
 &dut {
 	memory-regions = <&cpurad_dma_region>;
 };

From 77ac6a146287b18914f27ac7c1644f96c3f3c6de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:01 +0100
Subject: [PATCH 1913/2913] Revert "[nrf fromtree] dts: bindings: Update Nordic
 owned memory bindings"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2b2dd1bd365786a30b1f270e09a2d44a73156aad.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/bindings/mtd/nordic,owned-partitions.yaml |  6 +-
 .../reserved-memory/nordic,owned-memory.yaml  | 74 ++-----------------
 dts/common/nordic/nrf54h20.dtsi               |  1 -
 dts/common/nordic/nrf9280.dtsi                |  1 -
 .../reserved-memory/nordic-owned-memory.h     | 53 -------------
 5 files changed, 10 insertions(+), 125 deletions(-)
 delete mode 100644 include/zephyr/dt-bindings/reserved-memory/nordic-owned-memory.h

diff --git a/dts/bindings/mtd/nordic,owned-partitions.yaml b/dts/bindings/mtd/nordic,owned-partitions.yaml
index 6dd300ecb98..bf42c13346a 100644
--- a/dts/bindings/mtd/nordic,owned-partitions.yaml
+++ b/dts/bindings/mtd/nordic,owned-partitions.yaml
@@ -24,7 +24,8 @@ description: |
 
         rx-partitions {
             compatible = "nordic,owned-partitions";
-            nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RX>;
+            perm-read;
+            perm-execute;
             #address-cells = <1>;
             #size-cells = <1>;
 
@@ -36,7 +37,8 @@ description: |
 
         rw-partitions {
             compatible = "nordic,owned-partitions";
-            nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
+            perm-read;
+            perm-write;
             #address-cells = <1>;
             #size-cells = <1>;
 
diff --git a/dts/bindings/reserved-memory/nordic,owned-memory.yaml b/dts/bindings/reserved-memory/nordic,owned-memory.yaml
index 69f3e4f9f7b..9b13c965ac8 100644
--- a/dts/bindings/reserved-memory/nordic,owned-memory.yaml
+++ b/dts/bindings/reserved-memory/nordic,owned-memory.yaml
@@ -8,64 +8,17 @@ description: |
   will be recorded in the UICR of the compiled domain. Memory ownership and
   access is then configured for the domain at boot time, based on the UICR.
 
-  Example:
-
-    reserved-memory {
-        memory@2fc00000 {
-            compatible = "nordic,owned-memory";
-            reg = <0x2fc00000 0x1000>;
-            status = "okay";
-            nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_R>,
-                            <NRF_OWNER_ID_RADIOCORE NRF_PERM_W>;
-        };
-    };
-
-  A single local domain can request a memory region to be reserved on behalf of
-  multiple access owners. A single memory region shall be reserved by at most
-  one domain, by setting status "okay" on the associated node. For example, if
-  the region defined above is enabled by Application on behalf of Radiocore,
-  then the Radiocore's devicetree must set status "disabled" on that node.
-
-  Each of the different owners may have a different set of permissions granted,
-  as also shown above.
-
-  Note: one domain can also reserve memory for another domain and not itself.
-  Whichever domain has status "okay" set on the node does not need to be listed
-  as one of the access owners.
-
 compatible: "nordic,owned-memory"
 
-include: [base.yaml, "zephyr,memory-common.yaml"]
+include: base.yaml
 
 properties:
   reg:
     required: true
 
-  nordic,access:
-    type: array
-    description: |
-      Array of (owner-id, permission-flags) pairs, where:
-
-      - Owner ID represents the domain that will have access to this memory.
-        Valid values can be found in dts/common/nordic/<soc>.dtsi,
-        where they are defined as NRF_OWNER_ID_*
-
-      - Permissions are encoded as a 32-bit bitfield, using the flags found in
-        include/zephyr/dt-bindings/reserved-memory/nordic-owned-memory.h,
-        where they are defined as NRF_PERM_*
-
-        The same file defines all possible permission flag combinations.
-        For example, one can use:
-          <NRF_OWNER_ID_APPLICATION NRF_PERM_RWX>
-
-        as a shorthand for:
-          <NRF_OWNER_ID_APPLICATION (NRF_PERM_R | NRF_PERM_W | NRF_PERM_X)>
-
   owner-id:
     type: int
-    deprecated: true
     description: |
-      Deprecated, applies only if 'nordic,access' is not defined.
       Owner ID of the domain that will own this memory region. If not defined,
       the ownership will default to the domain being compiled.
 
@@ -74,35 +27,20 @@ properties:
 
   perm-read:
     type: boolean
-    deprecated: true
-    description: |
-      Deprecated, applies only if 'nordic,access' is not defined.
-      Owner has read access to the region.
+    description: Owner has read access to the region.
 
   perm-write:
     type: boolean
-    deprecated: true
-    description: |
-      Deprecated, applies only if 'nordic,access' is not defined.
-      Owner has write access to the region.
+    description: Owner has write access to the region.
 
   perm-execute:
     type: boolean
-    deprecated: true
-    description: |
-      Deprecated, applies only if 'nordic,access' is not defined.
-      Owner can execute code from the region.
+    description: Owner can execute code from the region.
 
   perm-secure:
     type: boolean
-    deprecated: true
-    description: |
-      Deprecated, applies only if 'nordic,access' is not defined.
-      Owner has secure-only access to the region.
+    description: Owner has secure-only access to the region.
 
   non-secure-callable:
     type: boolean
-    deprecated: true
-    description: |
-      Deprecated, applies only if 'nordic,access' is not defined.
-      Memory region is used for non-secure-callable code.
+    description: Memory region is used for non-secure-callable code.
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 1aae058b70e..7c8e9a3eec3 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -11,7 +11,6 @@
 #include <zephyr/dt-bindings/misc/nordic-domain-id-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-owner-id-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-tddconf.h>
-#include <zephyr/dt-bindings/reserved-memory/nordic-owned-memory.h>
 
 /delete-node/ &sw_pwm;
 
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 08223449076..59f450aba1d 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -10,7 +10,6 @@
 #include <zephyr/dt-bindings/misc/nordic-nrf-ficr-nrf9230-engb.h>
 #include <zephyr/dt-bindings/misc/nordic-domain-id-nrf9230.h>
 #include <zephyr/dt-bindings/misc/nordic-owner-id-nrf9230.h>
-#include <zephyr/dt-bindings/reserved-memory/nordic-owned-memory.h>
 
 /delete-node/ &sw_pwm;
 
diff --git a/include/zephyr/dt-bindings/reserved-memory/nordic-owned-memory.h b/include/zephyr/dt-bindings/reserved-memory/nordic-owned-memory.h
deleted file mode 100644
index 90f43379372..00000000000
--- a/include/zephyr/dt-bindings/reserved-memory/nordic-owned-memory.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_RESERVED_MEMORY_NORDIC_OWNED_MEMORY_H_
-#define ZEPHYR_INCLUDE_DT_BINDINGS_RESERVED_MEMORY_NORDIC_OWNED_MEMORY_H_
-
-#include <zephyr/dt-bindings/dt-util.h>
-
-/**
- * @name Basic memory permission flags.
- * @{
- */
-
-/** Readable. */
-#define NRF_PERM_R BIT(0)
-/** Writable. */
-#define NRF_PERM_W BIT(1)
-/** Executable. */
-#define NRF_PERM_X BIT(2)
-/** Secure-only. */
-#define NRF_PERM_S BIT(3)
-/** Non-secure-callable. */
-#define NRF_PERM_NSC BIT(4)
-
-/**
- * @}
- */
-
-/**
- * @name Memory permission flag combinations.
- * @note NRF_PERM_NSC overrides all other flags, so it is not included here.
- * @{
- */
-
-#define NRF_PERM_RW   (NRF_PERM_R | NRF_PERM_W)
-#define NRF_PERM_RX   (NRF_PERM_R | NRF_PERM_X)
-#define NRF_PERM_RS   (NRF_PERM_R | NRF_PERM_S)
-#define NRF_PERM_WX   (NRF_PERM_W | NRF_PERM_X)
-#define NRF_PERM_WS   (NRF_PERM_W | NRF_PERM_S)
-#define NRF_PERM_XS   (NRF_PERM_X | NRF_PERM_S)
-#define NRF_PERM_RWX  (NRF_PERM_R | NRF_PERM_W | NRF_PERM_X)
-#define NRF_PERM_RWS  (NRF_PERM_R | NRF_PERM_W | NRF_PERM_S)
-#define NRF_PERM_RXS  (NRF_PERM_R | NRF_PERM_X | NRF_PERM_S)
-#define NRF_PERM_WXS  (NRF_PERM_W | NRF_PERM_X | NRF_PERM_S)
-#define NRF_PERM_RWXS (NRF_PERM_R | NRF_PERM_W | NRF_PERM_X | NRF_PERM_S)
-
-/**
- * @}
- */
-
-#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_RESERVED_MEMORY_NORDIC_OWNED_MEMORY_H_ */

From d32f5ce01f65503201e98cad46f593cb5cb8b183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:01 +0100
Subject: [PATCH 1914/2913] Revert "[nrf fromtree] boards: nordic: nrf54h20dk:
 make RAM3x DMA region larger for cpurad"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e60e1f237b85f293585d862c5d4a6ac9e416fc84.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index f001678cb1f..bf96741de22 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -183,16 +183,16 @@
 
 			cpuapp_dma_region: memory@e80 {
 				compatible = "zephyr,memory-region";
-				reg = <0xe80 DT_SIZE_K(3)>;
+				reg = <0xe80 DT_SIZE_K(4)>;
 				status = "disabled";
 				#memory-region-cells = <0>;
 				zephyr,memory-region = "DMA_RAM3x_APP";
 				zephyr,memory-attr = <( DT_MEM_DMA )>;
 			};
 
-			cpurad_dma_region: memory@1a80 {
+			cpurad_dma_region: memory@1e80 {
 				compatible = "zephyr,memory-region";
-				reg = <0x1a80 0x480>;
+				reg = <0x1e80 0x80>;
 				status = "disabled";
 				#memory-region-cells = <0>;
 				zephyr,memory-region = "DMA_RAM3x_RAD";

From 73d39a7c36bd0d780b609ec22263e48a7cb5e8fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:01 +0100
Subject: [PATCH 1915/2913] Revert "[nrf fromtree] boards: nordic: update
 custom JLink reset scheme for ADACv2"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 08882cb5488b0a16e012248d359d8e1a8356d1fd.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../support/nrf54h20_cpuapp.JLinkScript       | 259 ++---------------
 .../support/nrf54h20_cpurad.JLinkScript       | 262 ++----------------
 .../support/nrf9280_cpuapp.JLinkScript        | 259 ++---------------
 .../support/nrf9280_cpurad.JLinkScript        | 262 ++----------------
 4 files changed, 82 insertions(+), 960 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/support/nrf54h20_cpuapp.JLinkScript b/boards/nordic/nrf54h20dk/support/nrf54h20_cpuapp.JLinkScript
index 28010addbf1..ffa1beed1ed 100644
--- a/boards/nordic/nrf54h20dk/support/nrf54h20_cpuapp.JLinkScript
+++ b/boards/nordic/nrf54h20dk/support/nrf54h20_cpuapp.JLinkScript
@@ -1,248 +1,29 @@
-// Constants specific to the application core
-__constant U32 _CPUCONF_ADDR = 0x52011000;
-__constant U32 _PROCESSOR_ID = 2;
-__constant U32 _DOMAIN_ID = 2;
-__constant U32 _NUM_OTHER_PROCESSORS = 1;
-const U32 _OTHER_PROCESSOR_IDS[1] = {3};
-
 // Debug Halting Control and Status Register
-__constant U32 _DHCSR_ADDR = 0xE000EDF0;
-__constant U32 _DHCSR_DBGKEY = (0xA05F << 16);
-__constant U32 _DHCSR_C_DEBUGEN = (1 << 0);
-__constant U32 _DHCSR_C_HALT = (1 << 1);
+__constant U32 _DHCSR_ADDR      = 0xE000EDF0;
+__constant U32 _DHCSR_DBGKEY    = (0xA05F << 16);
+__constant U32 _DHCSR_C_DEBUGEN = (1 <<  0);
+__constant U32 _DHCSR_C_HALT    = (1 <<  1);
 
 // Debug Exception and Monitor Control Register
-__constant U32 _DEMCR_ADDR = 0xE000EDFC;
-__constant U32 _DEMCR_VC_CORERESET = (1 << 0);
-__constant U32 _DEMCR_TRCENA = (1 << 24);
+__constant U32 _DEMCR_ADDR         = 0xE000EDFC;
+__constant U32 _DEMCR_VC_CORERESET = (1 <<  0);
+__constant U32 _DEMCR_TRCENA       = (1 << 24);
 
 // CPU wait enable register
-__constant U32 _CPUCONF_CPUWAIT_OFFSET = 0x50C;
-
-// CTRL-AP
-__constant U32 _CTRLAP_ID = 4;
-__constant U32 _CTRLAP_READY_BANK = 0;
-__constant U32 _CTRLAP_READY_OFFSET = 1;
-__constant U32 _CTRLAP_READY = 0;
-__constant U32 _CTRLAP_MAILBOX_BANK = 1;
-__constant U32 _CTRLAP_MAILBOX_TXDATA_OFFSET = 0;
-__constant U32 _CTRLAP_MAILBOX_TXSTATUS_OFFSET = 1;
-__constant U32 _CTRLAP_MAILBOX_RXDATA_OFFSET = 2;
-__constant U32 _CTRLAP_MAILBOX_RXSTATUS_OFFSET = 3;
-__constant U32 _CTRLAP_MAILBOX_NO_DATA_PENDING = 0;
-__constant U32 _CTRLAP_MAILBOX_DATA_PENDING = 1;
-__constant int _CTRLAP_TIMEOUT_MS = 500;
-
-// ADAC transaction buffers
-static U32 _adacTx[20];
-static U32 _adacRx[20];
-
-// Failed to send to the CTRL-AP MAILBOX
-__constant int _ERR_TX = -1;
-// Failed to receive from the CTRL-AP MAILBOX
-__constant int _ERR_RX = -2;
-// ADAC command returned an error
-__constant int _ERR_REPLY = -3;
-
-// Wait for an AP register read to return the expected value.
-int _WaitForDataStatus(U32 regOffset, int expectedStatus)
-{
-	int status;
-	int ret;
-	int start;
-	int elapsed;
-
-	status = 0;
-	start = JLINK_GetTime();
-	elapsed = 0;
-
-	do {
-		ret = JLINK_CORESIGHT_ReadDAP(regOffset, 1, &status);
-		elapsed = JLINK_GetTime() - start;
-	} while ((ret < 0 || status != expectedStatus) && (elapsed < _CTRLAP_TIMEOUT_MS));
-
-	if (ret < 0) {
-		return ret;
-	}
-
-	return status;
-}
-
-// Continuously read from the CTRL-AP MAILBOX until there is no more pending data.
-void _DrainMailbox(void)
-{
-	int ret;
-	int status;
-	int data;
-
-	ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
-	while (ret >= 0 && status == _CTRLAP_MAILBOX_DATA_PENDING) {
-		JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
-		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
-	}
-}
-
-// Perform an ADAC transaction by:
-// * writing the given sequence of words to MAILBOX.TXDATATA, waiting for MAILBOX.TXSTATUS
-//   readiness before each write.
-// * reading a sequence of words from MAILBOX.RXDATA, waiting for MAILBOX.RXSTATUS readiness before
-//   each read.
-//
-// The message to send is read from _adacTx and the reply is written to _adacRx.
-// Optionally checks if a single data word is returned and returns an error if it is non-zero.
-//
-// Assumes that the correct AP and AP bank for CTRL-AP MAILBOX has been selected in the DP.
-int _DoAdacTransaction(int checkReplyStatus)
-{
-	int numWords;
-	int ret;
-	int data;
-	int i;
-
-	i = 0;
-	numWords = 2 + (_adacTx[1] >> 2); // Length based on the length field of the message
-
-	while (i < numWords) {
-		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_TXSTATUS_OFFSET,
-					 _CTRLAP_MAILBOX_NO_DATA_PENDING);
-		if (ret != _CTRLAP_MAILBOX_NO_DATA_PENDING) {
-			JLINK_SYS_Report1("Timed out waiting for CTRL-AP TX readiness - result: ",
-					  ret);
-			return _ERR_TX;
-		}
-
-		ret = JLINK_CORESIGHT_WriteDAP(_CTRLAP_MAILBOX_TXDATA_OFFSET, 1, _adacTx[i]);
-		if (ret < 0) {
-			JLINK_SYS_Report1("Failed to write CTRL-AP TX data - result: ", ret);
-			return _ERR_TX;
-		}
-
-		i += 1;
-	}
-
-	i = 0;
-	numWords = 2; // Minimum message length
-
-	while (i < numWords) {
-		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_RXSTATUS_OFFSET,
-					 _CTRLAP_MAILBOX_DATA_PENDING);
-		if (ret != _CTRLAP_MAILBOX_DATA_PENDING) {
-			JLINK_SYS_Report1("Timed out waiting for CTRL-AP RX data - result: ", ret);
-			return _ERR_RX;
-		}
-
-		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
-		if (ret < 0) {
-			JLINK_SYS_Report1("Failed to read CTRL-AP RX data - result: ", ret);
-			return _ERR_RX;
-		}
-
-		if (i == 1) {
-			// Update total length based on the message length field
-			numWords = 2 + (data >> 2);
-		}
-
-		_adacRx[i] = data;
-		i += 1;
-	}
-
-	if (checkReplyStatus && _adacRx[1] == 4 && _adacRx[2] != 0) {
-		JLINK_SYS_Report1("ADAC command failed with status: ", _adacRx[2]);
-		return _ERR_REPLY;
-	}
-
-	return 0;
-}
-
-int ResetTarget(void)
-{
-	int err;
-	U32 adacMajorVersion;
-	U32 i;
-
-	// Select CTRL-AP bank 0, used for the READY register
-	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
-				 (_CTRLAP_ID << 24) | (_CTRLAP_READY_BANK << 4));
-
-	// Wait for the READY register to indicate that the AP can be used.
-	err = _WaitForDataStatus(_CTRLAP_READY_OFFSET, _CTRLAP_READY);
-	if (err < 0) {
-		JLINK_SYS_Report1("Timed out waiting for CTRL-AP readiness - result: ", err);
-		return -1;
-	}
-
-	// Select CTRL-AP bank 1, used for the MAILBOX registers for ADAC communication
-	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
-				 (_CTRLAP_ID << 24) | (_CTRLAP_MAILBOX_BANK << 4));
-
-	// Extract any pre-existing data from the mailbox in case there was previously
-	// an aborted transaction.
-	_DrainMailbox();
-
-	// Read the ADAC version
-	_adacTx[0] = 0xA3000000; // Command VERSION
-	_adacTx[1] = 0x00000004; // Data length 4 bytes
-	_adacTx[2] = 0x00000000; // Type 0 (ADAC version)
-	err = _DoAdacTransaction(0);
-	if (err < 0) {
-		return -1;
-	}
-
-	adacMajorVersion = (_adacRx[2] >> 24) & 0xff;
-	JLINK_SYS_Report1("ADAC major version: ", adacMajorVersion);
-
-	if (adacMajorVersion >= 2) {
-		// There is a very small chance that this command fails if the domain reset itself
-		// at the exact same time the command was issued. Therefore we retry a few times.
-		i = 0;
-		while (i < 3) {
-			// Reset non-essential domains
-			_adacTx[0] = 0xA30A0000; // Command RESET
-			_adacTx[1] = 0x00000004; // Data length 4 bytes
-			_adacTx[2] = 0x00000000; // (reserved)
-			err = _DoAdacTransaction(1);
-			if (err >= 0) {
-				break;
-			} else if (err != _ERR_REPLY) {
-				return -1;
-			}
-
-			i = i + 1;
-		}
-
-		// Start the core in halted mode
-		_adacTx[0] = 0xA3090000;                         // Command START
-		_adacTx[1] = 0x00000004;                         // Data length 4 bytes
-		_adacTx[2] = 0x01000000 | (_PROCESSOR_ID << 16); // Own processor, Flags HALT
-		err = _DoAdacTransaction(1);
-		if (err < 0) {
-			return -1;
-		}
+__constant U32 _CPUCONF_CPUWAIT_ADDR = 0x5201150C;
 
-		// Start other cores normally (will fail silently if no firmware is present)
-		i = 0;
-		while (i < _NUM_OTHER_PROCESSORS) {
-			_adacTx[0] = 0xA3090000; // Command START
-			_adacTx[1] = 0x00000004; // Data length 4 bytes
-			_adacTx[2] = 0x00000000 |
-				     (_OTHER_PROCESSOR_IDS[i] << 16); // Other processor, No flags
-			err = _DoAdacTransaction(0);
-			if (err < 0 && err != _ERR_REPLY) {
-				return -1;
-			}
+int ResetTarget(void) {
+	// ADAC reset
+	JLINK_CORESIGHT_WriteDP(2, 0x04000010);
+	JLINK_CORESIGHT_WriteAP(0, 0xA3030000);
+	JLINK_CORESIGHT_WriteAP(0, 0x00000004);
+	JLINK_CORESIGHT_WriteAP(0, 0x01020000);
 
-			i = i + 1;
-		}
-	} else {
-		// Reset single domain via legacy implementation
-		_adacTx[0] = 0xA3030000;                      // Command RESET
-		_adacTx[1] = 0x00000004;                      // Data length 4 bytes
-		_adacTx[2] = 0x01000000 | (_DOMAIN_ID << 16); // Own domain, Mode HALT
-		err = _DoAdacTransaction(1);
-		if (err < 0) {
-			return -1;
-		}
-	}
+	JLINK_SYS_Sleep(100);
+	JLINK_CORESIGHT_ReadAP(2);
+	JLINK_CORESIGHT_ReadAP(2);
+	JLINK_CORESIGHT_ReadAP(2);
+	JLINK_CORESIGHT_ReadAP(2);
 
 	// Halt the CPU
 	JLINK_MEM_WriteU32(_DHCSR_ADDR, (_DHCSR_DBGKEY | _DHCSR_C_HALT | _DHCSR_C_DEBUGEN));
@@ -251,7 +32,7 @@ int ResetTarget(void)
 	JLINK_MEM_WriteU32(_DEMCR_ADDR, (_DEMCR_VC_CORERESET | _DEMCR_TRCENA));
 
 	// Disable CPU wait
-	JLINK_MEM_WriteU32(_CPUCONF_ADDR + _CPUCONF_CPUWAIT_OFFSET, 0);
+	JLINK_MEM_WriteU32(_CPUCONF_CPUWAIT_ADDR, 0);
 
 	// Clear vector catch stuff
 	JLINK_MEM_WriteU32(_DEMCR_ADDR, _DEMCR_TRCENA);
diff --git a/boards/nordic/nrf54h20dk/support/nrf54h20_cpurad.JLinkScript b/boards/nordic/nrf54h20dk/support/nrf54h20_cpurad.JLinkScript
index 5c2065307ff..2f1802801c1 100644
--- a/boards/nordic/nrf54h20dk/support/nrf54h20_cpurad.JLinkScript
+++ b/boards/nordic/nrf54h20dk/support/nrf54h20_cpurad.JLinkScript
@@ -1,256 +1,36 @@
-// Constants specific to the radio core
-__constant U32 _CPUCONF_ADDR = 0x53011000;
-__constant U32 _PROCESSOR_ID = 3;
-__constant U32 _DOMAIN_ID = 3;
-__constant U32 _NUM_OTHER_PROCESSORS = 1;
-const U32 _OTHER_PROCESSOR_IDS[1] = {2};
-
 // Debug Halting Control and Status Register
-__constant U32 _DHCSR_ADDR = 0xE000EDF0;
-__constant U32 _DHCSR_DBGKEY = (0xA05F << 16);
-__constant U32 _DHCSR_C_DEBUGEN = (1 << 0);
-__constant U32 _DHCSR_C_HALT = (1 << 1);
+__constant U32 _DHCSR_ADDR      = 0xE000EDF0;
+__constant U32 _DHCSR_DBGKEY    = (0xA05F << 16);
+__constant U32 _DHCSR_C_DEBUGEN = (1 <<  0);
+__constant U32 _DHCSR_C_HALT    = (1 <<  1);
 
 // Debug Exception and Monitor Control Register
-__constant U32 _DEMCR_ADDR = 0xE000EDFC;
-__constant U32 _DEMCR_VC_CORERESET = (1 << 0);
-__constant U32 _DEMCR_TRCENA = (1 << 24);
+__constant U32 _DEMCR_ADDR         = 0xE000EDFC;
+__constant U32 _DEMCR_VC_CORERESET = (1 <<  0);
+__constant U32 _DEMCR_TRCENA       = (1 << 24);
 
 // CPU wait enable register
-__constant U32 _CPUCONF_CPUWAIT_OFFSET = 0x50C;
-
-// CTRL-AP
-__constant U32 _CTRLAP_ID = 4;
-__constant U32 _CTRLAP_READY_BANK = 0;
-__constant U32 _CTRLAP_READY_OFFSET = 1;
-__constant U32 _CTRLAP_READY = 0;
-__constant U32 _CTRLAP_MAILBOX_BANK = 1;
-__constant U32 _CTRLAP_MAILBOX_TXDATA_OFFSET = 0;
-__constant U32 _CTRLAP_MAILBOX_TXSTATUS_OFFSET = 1;
-__constant U32 _CTRLAP_MAILBOX_RXDATA_OFFSET = 2;
-__constant U32 _CTRLAP_MAILBOX_RXSTATUS_OFFSET = 3;
-__constant U32 _CTRLAP_MAILBOX_NO_DATA_PENDING = 0;
-__constant U32 _CTRLAP_MAILBOX_DATA_PENDING = 1;
-__constant int _CTRLAP_TIMEOUT_MS = 500;
-
-// ADAC transaction buffers
-static U32 _adacTx[20];
-static U32 _adacRx[20];
-
-// Failed to send to the CTRL-AP MAILBOX
-__constant int _ERR_TX = -1;
-// Failed to receive from the CTRL-AP MAILBOX
-__constant int _ERR_RX = -2;
-// ADAC command returned an error
-__constant int _ERR_REPLY = -3;
-
-// Wait for an AP register read to return the expected value.
-int _WaitForDataStatus(U32 regOffset, int expectedStatus)
-{
-	int status;
-	int ret;
-	int start;
-	int elapsed;
-
-	status = 0;
-	start = JLINK_GetTime();
-	elapsed = 0;
-
-	do {
-		ret = JLINK_CORESIGHT_ReadDAP(regOffset, 1, &status);
-		elapsed = JLINK_GetTime() - start;
-	} while ((ret < 0 || status != expectedStatus) && (elapsed < _CTRLAP_TIMEOUT_MS));
-
-	if (ret < 0) {
-		return ret;
-	}
-
-	return status;
-}
-
-// Continuously read from the CTRL-AP MAILBOX until there is no more pending data.
-void _DrainMailbox(void)
-{
-	int ret;
-	int status;
-	int data;
-
-	ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
-	while (ret >= 0 && status == _CTRLAP_MAILBOX_DATA_PENDING) {
-		JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
-		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
-	}
-}
-
-// Perform an ADAC transaction by:
-// * writing the given sequence of words to MAILBOX.TXDATATA, waiting for MAILBOX.TXSTATUS
-//   readiness before each write.
-// * reading a sequence of words from MAILBOX.RXDATA, waiting for MAILBOX.RXSTATUS readiness before
-//   each read.
-//
-// The message to send is read from _adacTx and the reply is written to _adacRx.
-// Optionally checks if a single data word is returned and returns an error if it is non-zero.
-//
-// Assumes that the correct AP and AP bank for CTRL-AP MAILBOX has been selected in the DP.
-int _DoAdacTransaction(int checkReplyStatus)
-{
-	int numWords;
-	int ret;
-	int data;
-	int i;
-
-	i = 0;
-	numWords = 2 + (_adacTx[1] >> 2); // Length based on the length field of the message
-
-	while (i < numWords) {
-		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_TXSTATUS_OFFSET,
-					 _CTRLAP_MAILBOX_NO_DATA_PENDING);
-		if (ret != _CTRLAP_MAILBOX_NO_DATA_PENDING) {
-			JLINK_SYS_Report1("Timed out waiting for CTRL-AP TX readiness - result: ",
-					  ret);
-			return _ERR_TX;
-		}
-
-		ret = JLINK_CORESIGHT_WriteDAP(_CTRLAP_MAILBOX_TXDATA_OFFSET, 1, _adacTx[i]);
-		if (ret < 0) {
-			JLINK_SYS_Report1("Failed to write CTRL-AP TX data - result: ", ret);
-			return _ERR_TX;
-		}
-
-		i += 1;
-	}
-
-	i = 0;
-	numWords = 2; // Minimum message length
+__constant U32 _CPUCONF_CPUWAIT_ADDR = 0x5301150C;
 
-	while (i < numWords) {
-		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_RXSTATUS_OFFSET,
-					 _CTRLAP_MAILBOX_DATA_PENDING);
-		if (ret != _CTRLAP_MAILBOX_DATA_PENDING) {
-			JLINK_SYS_Report1("Timed out waiting for CTRL-AP RX data - result: ", ret);
-			return _ERR_RX;
-		}
-
-		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
-		if (ret < 0) {
-			JLINK_SYS_Report1("Failed to read CTRL-AP RX data - result: ", ret);
-			return _ERR_RX;
-		}
-
-		if (i == 1) {
-			// Update total length based on the message length field
-			numWords = 2 + (data >> 2);
-		}
-
-		_adacRx[i] = data;
-		i += 1;
-	}
-
-	if (checkReplyStatus && _adacRx[1] == 4 && _adacRx[2] != 0) {
-		JLINK_SYS_Report1("ADAC command failed with status: ", _adacRx[2]);
-		return _ERR_REPLY;
-	}
-
-	return 0;
-}
-
-int ConfigTargetSettings(void)
-{
+int ConfigTargetSettings(void) {
 	JLINK_ExecCommand("CORESIGHT_AddAP = Index=1 Type=AHB-AP");
 	CORESIGHT_IndexAHBAPToUse = 1;
 
 	return 0;
 }
 
-int ResetTarget(void)
-{
-	int err;
-	U32 adacMajorVersion;
-	U32 i;
-
-	// Select CTRL-AP bank 0, used for the READY register
-	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
-				 (_CTRLAP_ID << 24) | (_CTRLAP_READY_BANK << 4));
-
-	// Wait for the READY register to indicate that the AP can be used.
-	err = _WaitForDataStatus(_CTRLAP_READY_OFFSET, _CTRLAP_READY);
-	if (err < 0) {
-		JLINK_SYS_Report1("Timed out waiting for CTRL-AP readiness - result: ", err);
-		return -1;
-	}
-
-	// Select CTRL-AP bank 1, used for the MAILBOX registers for ADAC communication
-	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
-				 (_CTRLAP_ID << 24) | (_CTRLAP_MAILBOX_BANK << 4));
-
-	// Extract any pre-existing data from the mailbox in case there was previously
-	// an aborted transaction.
-	_DrainMailbox();
-
-	// Read the ADAC version
-	_adacTx[0] = 0xA3000000; // Command VERSION
-	_adacTx[1] = 0x00000004; // Data length 4 bytes
-	_adacTx[2] = 0x00000000; // Type 0 (ADAC version)
-	err = _DoAdacTransaction(0);
-	if (err < 0) {
-		return -1;
-	}
-
-	adacMajorVersion = (_adacRx[2] >> 24) & 0xff;
-	JLINK_SYS_Report1("ADAC major version: ", adacMajorVersion);
-
-	if (adacMajorVersion >= 2) {
-		// There is a very small chance that this command fails if the domain reset itself
-		// at the exact same time the command was issued. Therefore we retry a few times.
-		i = 0;
-		while (i < 3) {
-			// Reset non-essential domains
-			_adacTx[0] = 0xA30A0000; // Command RESET
-			_adacTx[1] = 0x00000004; // Data length 4 bytes
-			_adacTx[2] = 0x00000000; // (reserved)
-			err = _DoAdacTransaction(1);
-			if (err >= 0) {
-				break;
-			} else if (err != _ERR_REPLY) {
-				return -1;
-			}
-
-			i = i + 1;
-		}
-
-		// Start the core in halted mode
-		_adacTx[0] = 0xA3090000;                         // Command START
-		_adacTx[1] = 0x00000004;                         // Data length 4 bytes
-		_adacTx[2] = 0x01000000 | (_PROCESSOR_ID << 16); // Own processor, Flags HALT
-		err = _DoAdacTransaction(1);
-		if (err < 0) {
-			return -1;
-		}
-
-		// Start other cores normally (will fail silently if no firmware is present)
-		i = 0;
-		while (i < _NUM_OTHER_PROCESSORS) {
-			_adacTx[0] = 0xA3090000; // Command START
-			_adacTx[1] = 0x00000004; // Data length 4 bytes
-			_adacTx[2] = 0x00000000 |
-				     (_OTHER_PROCESSOR_IDS[i] << 16); // Other processor, No flags
-			err = _DoAdacTransaction(0);
-			if (err < 0 && err != _ERR_REPLY) {
-				return -1;
-			}
+int ResetTarget(void) {
+	// ADAC reset
+	JLINK_CORESIGHT_WriteDP(2, 0x04000010);
+	JLINK_CORESIGHT_WriteAP(0, 0xA3030000);
+	JLINK_CORESIGHT_WriteAP(0, 0x00000004);
+	JLINK_CORESIGHT_WriteAP(0, 0x01030000);
 
-			i = i + 1;
-		}
-	} else {
-		// Reset single domain via legacy implementation
-		_adacTx[0] = 0xA3030000;                      // Command RESET
-		_adacTx[1] = 0x00000004;                      // Data length 4 bytes
-		_adacTx[2] = 0x01000000 | (_DOMAIN_ID << 16); // Own domain, Mode HALT
-		err = _DoAdacTransaction(1);
-		if (err < 0) {
-			return -1;
-		}
-	}
+	JLINK_SYS_Sleep(100);
+	JLINK_CORESIGHT_ReadAP(2);
+	JLINK_CORESIGHT_ReadAP(2);
+	JLINK_CORESIGHT_ReadAP(2);
+	JLINK_CORESIGHT_ReadAP(2);
 
 	// Halt the CPU
 	JLINK_MEM_WriteU32(_DHCSR_ADDR, (_DHCSR_DBGKEY | _DHCSR_C_HALT | _DHCSR_C_DEBUGEN));
@@ -259,7 +39,7 @@ int ResetTarget(void)
 	JLINK_MEM_WriteU32(_DEMCR_ADDR, (_DEMCR_VC_CORERESET | _DEMCR_TRCENA));
 
 	// Disable CPU wait
-	JLINK_MEM_WriteU32(_CPUCONF_ADDR + _CPUCONF_CPUWAIT_OFFSET, 0);
+	JLINK_MEM_WriteU32(_CPUCONF_CPUWAIT_ADDR, 0);
 
 	// Clear vector catch stuff
 	JLINK_MEM_WriteU32(_DEMCR_ADDR, _DEMCR_TRCENA);
diff --git a/boards/nordic/nrf9280pdk/support/nrf9280_cpuapp.JLinkScript b/boards/nordic/nrf9280pdk/support/nrf9280_cpuapp.JLinkScript
index 5791a7bed9b..ffa1beed1ed 100644
--- a/boards/nordic/nrf9280pdk/support/nrf9280_cpuapp.JLinkScript
+++ b/boards/nordic/nrf9280pdk/support/nrf9280_cpuapp.JLinkScript
@@ -1,248 +1,29 @@
-// Constants specific to the application core
-__constant U32 _CPUCONF_ADDR = 0x52011000;
-__constant U32 _PROCESSOR_ID = 2;
-__constant U32 _DOMAIN_ID = 2;
-__constant U32 _NUM_OTHER_PROCESSORS = 2;
-const U32 _OTHER_PROCESSOR_IDS[2] = {4, 3};
-
 // Debug Halting Control and Status Register
-__constant U32 _DHCSR_ADDR = 0xE000EDF0;
-__constant U32 _DHCSR_DBGKEY = (0xA05F << 16);
-__constant U32 _DHCSR_C_DEBUGEN = (1 << 0);
-__constant U32 _DHCSR_C_HALT = (1 << 1);
+__constant U32 _DHCSR_ADDR      = 0xE000EDF0;
+__constant U32 _DHCSR_DBGKEY    = (0xA05F << 16);
+__constant U32 _DHCSR_C_DEBUGEN = (1 <<  0);
+__constant U32 _DHCSR_C_HALT    = (1 <<  1);
 
 // Debug Exception and Monitor Control Register
-__constant U32 _DEMCR_ADDR = 0xE000EDFC;
-__constant U32 _DEMCR_VC_CORERESET = (1 << 0);
-__constant U32 _DEMCR_TRCENA = (1 << 24);
+__constant U32 _DEMCR_ADDR         = 0xE000EDFC;
+__constant U32 _DEMCR_VC_CORERESET = (1 <<  0);
+__constant U32 _DEMCR_TRCENA       = (1 << 24);
 
 // CPU wait enable register
-__constant U32 _CPUCONF_CPUWAIT_OFFSET = 0x50C;
-
-// CTRL-AP
-__constant U32 _CTRLAP_ID = 4;
-__constant U32 _CTRLAP_READY_BANK = 0;
-__constant U32 _CTRLAP_READY_OFFSET = 1;
-__constant U32 _CTRLAP_READY = 0;
-__constant U32 _CTRLAP_MAILBOX_BANK = 1;
-__constant U32 _CTRLAP_MAILBOX_TXDATA_OFFSET = 0;
-__constant U32 _CTRLAP_MAILBOX_TXSTATUS_OFFSET = 1;
-__constant U32 _CTRLAP_MAILBOX_RXDATA_OFFSET = 2;
-__constant U32 _CTRLAP_MAILBOX_RXSTATUS_OFFSET = 3;
-__constant U32 _CTRLAP_MAILBOX_NO_DATA_PENDING = 0;
-__constant U32 _CTRLAP_MAILBOX_DATA_PENDING = 1;
-__constant int _CTRLAP_TIMEOUT_MS = 500;
-
-// ADAC transaction buffers
-static U32 _adacTx[20];
-static U32 _adacRx[20];
-
-// Failed to send to the CTRL-AP MAILBOX
-__constant int _ERR_TX = -1;
-// Failed to receive from the CTRL-AP MAILBOX
-__constant int _ERR_RX = -2;
-// ADAC command returned an error
-__constant int _ERR_REPLY = -3;
-
-// Wait for an AP register read to return the expected value.
-int _WaitForDataStatus(U32 regOffset, int expectedStatus)
-{
-	int status;
-	int ret;
-	int start;
-	int elapsed;
-
-	status = 0;
-	start = JLINK_GetTime();
-	elapsed = 0;
-
-	do {
-		ret = JLINK_CORESIGHT_ReadDAP(regOffset, 1, &status);
-		elapsed = JLINK_GetTime() - start;
-	} while ((ret < 0 || status != expectedStatus) && (elapsed < _CTRLAP_TIMEOUT_MS));
-
-	if (ret < 0) {
-		return ret;
-	}
-
-	return status;
-}
-
-// Continuously read from the CTRL-AP MAILBOX until there is no more pending data.
-void _DrainMailbox(void)
-{
-	int ret;
-	int status;
-	int data;
-
-	ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
-	while (ret >= 0 && status == _CTRLAP_MAILBOX_DATA_PENDING) {
-		JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
-		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
-	}
-}
-
-// Perform an ADAC transaction by:
-// * writing the given sequence of words to MAILBOX.TXDATATA, waiting for MAILBOX.TXSTATUS
-//   readiness before each write.
-// * reading a sequence of words from MAILBOX.RXDATA, waiting for MAILBOX.RXSTATUS readiness before
-//   each read.
-//
-// The message to send is read from _adacTx and the reply is written to _adacRx.
-// Optionally checks if a single data word is returned and returns an error if it is non-zero.
-//
-// Assumes that the correct AP and AP bank for CTRL-AP MAILBOX has been selected in the DP.
-int _DoAdacTransaction(int checkReplyStatus)
-{
-	int numWords;
-	int ret;
-	int data;
-	int i;
-
-	i = 0;
-	numWords = 2 + (_adacTx[1] >> 2); // Length based on the length field of the message
-
-	while (i < numWords) {
-		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_TXSTATUS_OFFSET,
-					 _CTRLAP_MAILBOX_NO_DATA_PENDING);
-		if (ret != _CTRLAP_MAILBOX_NO_DATA_PENDING) {
-			JLINK_SYS_Report1("Timed out waiting for CTRL-AP TX readiness - result: ",
-					  ret);
-			return _ERR_TX;
-		}
-
-		ret = JLINK_CORESIGHT_WriteDAP(_CTRLAP_MAILBOX_TXDATA_OFFSET, 1, _adacTx[i]);
-		if (ret < 0) {
-			JLINK_SYS_Report1("Failed to write CTRL-AP TX data - result: ", ret);
-			return _ERR_TX;
-		}
-
-		i += 1;
-	}
-
-	i = 0;
-	numWords = 2; // Minimum message length
-
-	while (i < numWords) {
-		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_RXSTATUS_OFFSET,
-					 _CTRLAP_MAILBOX_DATA_PENDING);
-		if (ret != _CTRLAP_MAILBOX_DATA_PENDING) {
-			JLINK_SYS_Report1("Timed out waiting for CTRL-AP RX data - result: ", ret);
-			return _ERR_RX;
-		}
-
-		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
-		if (ret < 0) {
-			JLINK_SYS_Report1("Failed to read CTRL-AP RX data - result: ", ret);
-			return _ERR_RX;
-		}
-
-		if (i == 1) {
-			// Update total length based on the message length field
-			numWords = 2 + (data >> 2);
-		}
-
-		_adacRx[i] = data;
-		i += 1;
-	}
-
-	if (checkReplyStatus && _adacRx[1] == 4 && _adacRx[2] != 0) {
-		JLINK_SYS_Report1("ADAC command failed with status: ", _adacRx[2]);
-		return _ERR_REPLY;
-	}
-
-	return 0;
-}
-
-int ResetTarget(void)
-{
-	int err;
-	U32 adacMajorVersion;
-	U32 i;
-
-	// Select CTRL-AP bank 0, used for the READY register
-	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
-				 (_CTRLAP_ID << 24) | (_CTRLAP_READY_BANK << 4));
-
-	// Wait for the READY register to indicate that the AP can be used.
-	err = _WaitForDataStatus(_CTRLAP_READY_OFFSET, _CTRLAP_READY);
-	if (err < 0) {
-		JLINK_SYS_Report1("Timed out waiting for CTRL-AP readiness - result: ", err);
-		return -1;
-	}
-
-	// Select CTRL-AP bank 1, used for the MAILBOX registers for ADAC communication
-	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
-				 (_CTRLAP_ID << 24) | (_CTRLAP_MAILBOX_BANK << 4));
-
-	// Extract any pre-existing data from the mailbox in case there was previously
-	// an aborted transaction.
-	_DrainMailbox();
-
-	// Read the ADAC version
-	_adacTx[0] = 0xA3000000; // Command VERSION
-	_adacTx[1] = 0x00000004; // Data length 4 bytes
-	_adacTx[2] = 0x00000000; // Type 0 (ADAC version)
-	err = _DoAdacTransaction(0);
-	if (err < 0) {
-		return -1;
-	}
-
-	adacMajorVersion = (_adacRx[2] >> 24) & 0xff;
-	JLINK_SYS_Report1("ADAC major version: ", adacMajorVersion);
-
-	if (adacMajorVersion >= 2) {
-		// There is a very small chance that this command fails if the domain reset itself
-		// at the exact same time the command was issued. Therefore we retry a few times.
-		i = 0;
-		while (i < 3) {
-			// Reset non-essential domains
-			_adacTx[0] = 0xA30A0000; // Command RESET
-			_adacTx[1] = 0x00000004; // Data length 4 bytes
-			_adacTx[2] = 0x00000000; // (reserved)
-			err = _DoAdacTransaction(1);
-			if (err >= 0) {
-				break;
-			} else if (err != _ERR_REPLY) {
-				return -1;
-			}
-
-			i = i + 1;
-		}
-
-		// Start the core in halted mode
-		_adacTx[0] = 0xA3090000;                         // Command START
-		_adacTx[1] = 0x00000004;                         // Data length 4 bytes
-		_adacTx[2] = 0x01000000 | (_PROCESSOR_ID << 16); // Own processor, Flags HALT
-		err = _DoAdacTransaction(1);
-		if (err < 0) {
-			return -1;
-		}
+__constant U32 _CPUCONF_CPUWAIT_ADDR = 0x5201150C;
 
-		// Start other cores normally (will fail silently if no firmware is present)
-		i = 0;
-		while (i < _NUM_OTHER_PROCESSORS) {
-			_adacTx[0] = 0xA3090000; // Command START
-			_adacTx[1] = 0x00000004; // Data length 4 bytes
-			_adacTx[2] = 0x00000000 |
-				     (_OTHER_PROCESSOR_IDS[i] << 16); // Other processor, No flags
-			err = _DoAdacTransaction(0);
-			if (err < 0 && err != _ERR_REPLY) {
-				return -1;
-			}
+int ResetTarget(void) {
+	// ADAC reset
+	JLINK_CORESIGHT_WriteDP(2, 0x04000010);
+	JLINK_CORESIGHT_WriteAP(0, 0xA3030000);
+	JLINK_CORESIGHT_WriteAP(0, 0x00000004);
+	JLINK_CORESIGHT_WriteAP(0, 0x01020000);
 
-			i = i + 1;
-		}
-	} else {
-		// Reset single domain via legacy implementation
-		_adacTx[0] = 0xA3030000;                      // Command RESET
-		_adacTx[1] = 0x00000004;                      // Data length 4 bytes
-		_adacTx[2] = 0x01000000 | (_DOMAIN_ID << 16); // Own domain, Mode HALT
-		err = _DoAdacTransaction(1);
-		if (err < 0) {
-			return -1;
-		}
-	}
+	JLINK_SYS_Sleep(100);
+	JLINK_CORESIGHT_ReadAP(2);
+	JLINK_CORESIGHT_ReadAP(2);
+	JLINK_CORESIGHT_ReadAP(2);
+	JLINK_CORESIGHT_ReadAP(2);
 
 	// Halt the CPU
 	JLINK_MEM_WriteU32(_DHCSR_ADDR, (_DHCSR_DBGKEY | _DHCSR_C_HALT | _DHCSR_C_DEBUGEN));
@@ -251,7 +32,7 @@ int ResetTarget(void)
 	JLINK_MEM_WriteU32(_DEMCR_ADDR, (_DEMCR_VC_CORERESET | _DEMCR_TRCENA));
 
 	// Disable CPU wait
-	JLINK_MEM_WriteU32(_CPUCONF_ADDR + _CPUCONF_CPUWAIT_OFFSET, 0);
+	JLINK_MEM_WriteU32(_CPUCONF_CPUWAIT_ADDR, 0);
 
 	// Clear vector catch stuff
 	JLINK_MEM_WriteU32(_DEMCR_ADDR, _DEMCR_TRCENA);
diff --git a/boards/nordic/nrf9280pdk/support/nrf9280_cpurad.JLinkScript b/boards/nordic/nrf9280pdk/support/nrf9280_cpurad.JLinkScript
index 02b84dcc970..2f1802801c1 100644
--- a/boards/nordic/nrf9280pdk/support/nrf9280_cpurad.JLinkScript
+++ b/boards/nordic/nrf9280pdk/support/nrf9280_cpurad.JLinkScript
@@ -1,256 +1,36 @@
-// Constants specific to the radio core
-__constant U32 _CPUCONF_ADDR = 0x53011000;
-__constant U32 _PROCESSOR_ID = 3;
-__constant U32 _DOMAIN_ID = 3;
-__constant U32 _NUM_OTHER_PROCESSORS = 2;
-const U32 _OTHER_PROCESSOR_IDS[2] = {4, 2};
-
 // Debug Halting Control and Status Register
-__constant U32 _DHCSR_ADDR = 0xE000EDF0;
-__constant U32 _DHCSR_DBGKEY = (0xA05F << 16);
-__constant U32 _DHCSR_C_DEBUGEN = (1 << 0);
-__constant U32 _DHCSR_C_HALT = (1 << 1);
+__constant U32 _DHCSR_ADDR      = 0xE000EDF0;
+__constant U32 _DHCSR_DBGKEY    = (0xA05F << 16);
+__constant U32 _DHCSR_C_DEBUGEN = (1 <<  0);
+__constant U32 _DHCSR_C_HALT    = (1 <<  1);
 
 // Debug Exception and Monitor Control Register
-__constant U32 _DEMCR_ADDR = 0xE000EDFC;
-__constant U32 _DEMCR_VC_CORERESET = (1 << 0);
-__constant U32 _DEMCR_TRCENA = (1 << 24);
+__constant U32 _DEMCR_ADDR         = 0xE000EDFC;
+__constant U32 _DEMCR_VC_CORERESET = (1 <<  0);
+__constant U32 _DEMCR_TRCENA       = (1 << 24);
 
 // CPU wait enable register
-__constant U32 _CPUCONF_CPUWAIT_OFFSET = 0x50C;
-
-// CTRL-AP
-__constant U32 _CTRLAP_ID = 4;
-__constant U32 _CTRLAP_READY_BANK = 0;
-__constant U32 _CTRLAP_READY_OFFSET = 1;
-__constant U32 _CTRLAP_READY = 0;
-__constant U32 _CTRLAP_MAILBOX_BANK = 1;
-__constant U32 _CTRLAP_MAILBOX_TXDATA_OFFSET = 0;
-__constant U32 _CTRLAP_MAILBOX_TXSTATUS_OFFSET = 1;
-__constant U32 _CTRLAP_MAILBOX_RXDATA_OFFSET = 2;
-__constant U32 _CTRLAP_MAILBOX_RXSTATUS_OFFSET = 3;
-__constant U32 _CTRLAP_MAILBOX_NO_DATA_PENDING = 0;
-__constant U32 _CTRLAP_MAILBOX_DATA_PENDING = 1;
-__constant int _CTRLAP_TIMEOUT_MS = 500;
-
-// ADAC transaction buffers
-static U32 _adacTx[20];
-static U32 _adacRx[20];
-
-// Failed to send to the CTRL-AP MAILBOX
-__constant int _ERR_TX = -1;
-// Failed to receive from the CTRL-AP MAILBOX
-__constant int _ERR_RX = -2;
-// ADAC command returned an error
-__constant int _ERR_REPLY = -3;
-
-// Wait for an AP register read to return the expected value.
-int _WaitForDataStatus(U32 regOffset, int expectedStatus)
-{
-	int status;
-	int ret;
-	int start;
-	int elapsed;
-
-	status = 0;
-	start = JLINK_GetTime();
-	elapsed = 0;
-
-	do {
-		ret = JLINK_CORESIGHT_ReadDAP(regOffset, 1, &status);
-		elapsed = JLINK_GetTime() - start;
-	} while ((ret < 0 || status != expectedStatus) && (elapsed < _CTRLAP_TIMEOUT_MS));
-
-	if (ret < 0) {
-		return ret;
-	}
-
-	return status;
-}
-
-// Continuously read from the CTRL-AP MAILBOX until there is no more pending data.
-void _DrainMailbox(void)
-{
-	int ret;
-	int status;
-	int data;
-
-	ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
-	while (ret >= 0 && status == _CTRLAP_MAILBOX_DATA_PENDING) {
-		JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
-		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXSTATUS_OFFSET, 1, &status);
-	}
-}
-
-// Perform an ADAC transaction by:
-// * writing the given sequence of words to MAILBOX.TXDATATA, waiting for MAILBOX.TXSTATUS
-//   readiness before each write.
-// * reading a sequence of words from MAILBOX.RXDATA, waiting for MAILBOX.RXSTATUS readiness before
-//   each read.
-//
-// The message to send is read from _adacTx and the reply is written to _adacRx.
-// Optionally checks if a single data word is returned and returns an error if it is non-zero.
-//
-// Assumes that the correct AP and AP bank for CTRL-AP MAILBOX has been selected in the DP.
-int _DoAdacTransaction(int checkReplyStatus)
-{
-	int numWords;
-	int ret;
-	int data;
-	int i;
-
-	i = 0;
-	numWords = 2 + (_adacTx[1] >> 2); // Length based on the length field of the message
-
-	while (i < numWords) {
-		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_TXSTATUS_OFFSET,
-					 _CTRLAP_MAILBOX_NO_DATA_PENDING);
-		if (ret != _CTRLAP_MAILBOX_NO_DATA_PENDING) {
-			JLINK_SYS_Report1("Timed out waiting for CTRL-AP TX readiness - result: ",
-					  ret);
-			return _ERR_TX;
-		}
-
-		ret = JLINK_CORESIGHT_WriteDAP(_CTRLAP_MAILBOX_TXDATA_OFFSET, 1, _adacTx[i]);
-		if (ret < 0) {
-			JLINK_SYS_Report1("Failed to write CTRL-AP TX data - result: ", ret);
-			return _ERR_TX;
-		}
-
-		i += 1;
-	}
-
-	i = 0;
-	numWords = 2; // Minimum message length
+__constant U32 _CPUCONF_CPUWAIT_ADDR = 0x5301150C;
 
-	while (i < numWords) {
-		ret = _WaitForDataStatus(_CTRLAP_MAILBOX_RXSTATUS_OFFSET,
-					 _CTRLAP_MAILBOX_DATA_PENDING);
-		if (ret != _CTRLAP_MAILBOX_DATA_PENDING) {
-			JLINK_SYS_Report1("Timed out waiting for CTRL-AP RX data - result: ", ret);
-			return _ERR_RX;
-		}
-
-		ret = JLINK_CORESIGHT_ReadDAP(_CTRLAP_MAILBOX_RXDATA_OFFSET, 1, &data);
-		if (ret < 0) {
-			JLINK_SYS_Report1("Failed to read CTRL-AP RX data - result: ", ret);
-			return _ERR_RX;
-		}
-
-		if (i == 1) {
-			// Update total length based on the message length field
-			numWords = 2 + (data >> 2);
-		}
-
-		_adacRx[i] = data;
-		i += 1;
-	}
-
-	if (checkReplyStatus && _adacRx[1] == 4 && _adacRx[2] != 0) {
-		JLINK_SYS_Report1("ADAC command failed with status: ", _adacRx[2]);
-		return _ERR_REPLY;
-	}
-
-	return 0;
-}
-
-int ConfigTargetSettings(void)
-{
+int ConfigTargetSettings(void) {
 	JLINK_ExecCommand("CORESIGHT_AddAP = Index=1 Type=AHB-AP");
 	CORESIGHT_IndexAHBAPToUse = 1;
 
 	return 0;
 }
 
-int ResetTarget(void)
-{
-	int err;
-	U32 adacMajorVersion;
-	U32 i;
-
-	// Select CTRL-AP bank 0, used for the READY register
-	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
-				 (_CTRLAP_ID << 24) | (_CTRLAP_READY_BANK << 4));
-
-	// Wait for the READY register to indicate that the AP can be used.
-	err = _WaitForDataStatus(_CTRLAP_READY_OFFSET, _CTRLAP_READY);
-	if (err < 0) {
-		JLINK_SYS_Report1("Timed out waiting for CTRL-AP readiness - result: ", err);
-		return -1;
-	}
-
-	// Select CTRL-AP bank 1, used for the MAILBOX registers for ADAC communication
-	JLINK_CORESIGHT_WriteDAP(JLINK_CORESIGHT_DP_REG_SELECT, 0,
-				 (_CTRLAP_ID << 24) | (_CTRLAP_MAILBOX_BANK << 4));
-
-	// Extract any pre-existing data from the mailbox in case there was previously
-	// an aborted transaction.
-	_DrainMailbox();
-
-	// Read the ADAC version
-	_adacTx[0] = 0xA3000000; // Command VERSION
-	_adacTx[1] = 0x00000004; // Data length 4 bytes
-	_adacTx[2] = 0x00000000; // Type 0 (ADAC version)
-	err = _DoAdacTransaction(0);
-	if (err < 0) {
-		return -1;
-	}
-
-	adacMajorVersion = (_adacRx[2] >> 24) & 0xff;
-	JLINK_SYS_Report1("ADAC major version: ", adacMajorVersion);
-
-	if (adacMajorVersion >= 2) {
-		// There is a very small chance that this command fails if the domain reset itself
-		// at the exact same time the command was issued. Therefore we retry a few times.
-		i = 0;
-		while (i < 3) {
-			// Reset non-essential domains
-			_adacTx[0] = 0xA30A0000; // Command RESET
-			_adacTx[1] = 0x00000004; // Data length 4 bytes
-			_adacTx[2] = 0x00000000; // (reserved)
-			err = _DoAdacTransaction(1);
-			if (err >= 0) {
-				break;
-			} else if (err != _ERR_REPLY) {
-				return -1;
-			}
-
-			i = i + 1;
-		}
-
-		// Start the core in halted mode
-		_adacTx[0] = 0xA3090000;                         // Command START
-		_adacTx[1] = 0x00000004;                         // Data length 4 bytes
-		_adacTx[2] = 0x01000000 | (_PROCESSOR_ID << 16); // Own processor, Flags HALT
-		err = _DoAdacTransaction(1);
-		if (err < 0) {
-			return -1;
-		}
-
-		// Start other cores normally (will fail silently if no firmware is present)
-		i = 0;
-		while (i < _NUM_OTHER_PROCESSORS) {
-			_adacTx[0] = 0xA3090000; // Command START
-			_adacTx[1] = 0x00000004; // Data length 4 bytes
-			_adacTx[2] = 0x00000000 |
-				     (_OTHER_PROCESSOR_IDS[i] << 16); // Other processor, No flags
-			err = _DoAdacTransaction(0);
-			if (err < 0 && err != _ERR_REPLY) {
-				return -1;
-			}
+int ResetTarget(void) {
+	// ADAC reset
+	JLINK_CORESIGHT_WriteDP(2, 0x04000010);
+	JLINK_CORESIGHT_WriteAP(0, 0xA3030000);
+	JLINK_CORESIGHT_WriteAP(0, 0x00000004);
+	JLINK_CORESIGHT_WriteAP(0, 0x01030000);
 
-			i = i + 1;
-		}
-	} else {
-		// Reset single domain via legacy implementation
-		_adacTx[0] = 0xA3030000;                      // Command RESET
-		_adacTx[1] = 0x00000004;                      // Data length 4 bytes
-		_adacTx[2] = 0x01000000 | (_DOMAIN_ID << 16); // Own domain, Mode HALT
-		err = _DoAdacTransaction(1);
-		if (err < 0) {
-			return -1;
-		}
-	}
+	JLINK_SYS_Sleep(100);
+	JLINK_CORESIGHT_ReadAP(2);
+	JLINK_CORESIGHT_ReadAP(2);
+	JLINK_CORESIGHT_ReadAP(2);
+	JLINK_CORESIGHT_ReadAP(2);
 
 	// Halt the CPU
 	JLINK_MEM_WriteU32(_DHCSR_ADDR, (_DHCSR_DBGKEY | _DHCSR_C_HALT | _DHCSR_C_DEBUGEN));
@@ -259,7 +39,7 @@ int ResetTarget(void)
 	JLINK_MEM_WriteU32(_DEMCR_ADDR, (_DEMCR_VC_CORERESET | _DEMCR_TRCENA));
 
 	// Disable CPU wait
-	JLINK_MEM_WriteU32(_CPUCONF_ADDR + _CPUCONF_CPUWAIT_OFFSET, 0);
+	JLINK_MEM_WriteU32(_CPUCONF_CPUWAIT_ADDR, 0);
 
 	// Clear vector catch stuff
 	JLINK_MEM_WriteU32(_DEMCR_ADDR, _DEMCR_TRCENA);

From 406e6abc65bb7ae8e5df4db80f40461bf83f7f89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:01 +0100
Subject: [PATCH 1916/2913] Revert "[nrf fromtree] samples: Align tests yaml
 and overlays to nrf54l15dk"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7e6ab077753c418bde6f6468a2dcaea84681d73c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/drivers/mbox/sample.yaml              | 15 ++++++----
 ...rf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay} |  2 +-
 .../nrf54l15dk_nrf54l15_cpuflpr.overlay       |  4 ---
 .../nrf54l15pdk_nrf54l15_cpuflpr.overlay      |  4 ---
 ...f54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay} |  2 +-
 .../subsys/ipc/ipc_service/icmsg/sample.yaml  | 30 +++++++++----------
 6 files changed, 26 insertions(+), 31 deletions(-)
 rename samples/subsys/ipc/ipc_service/icmsg/boards/{nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay => nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay} (91%)
 rename samples/subsys/ipc/ipc_service/icmsg/remote/boards/{nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay => nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay} (91%)

diff --git a/samples/drivers/mbox/sample.yaml b/samples/drivers/mbox/sample.yaml
index 1cede323899..40664dac736 100644
--- a/samples/drivers/mbox/sample.yaml
+++ b/samples/drivers/mbox/sample.yaml
@@ -86,6 +86,7 @@ tests:
   sample.drivers.mbox.nrf54l15:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     extra_args:
@@ -96,12 +97,13 @@ tests:
       type: multi_line
       ordered: false
       regex:
-        - "Ping \\(on channel 21\\)"
-        - "Pong \\(on channel 20\\)"
+        - "Ping \\(on channel 16\\)"
+        - "Pong \\(on channel 15\\)"
 
   sample.drivers.mbox.nrf54l15_no_multithreading:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     extra_args:
@@ -114,12 +116,13 @@ tests:
       type: multi_line
       ordered: false
       regex:
-        - "Ping \\(on channel 21\\)"
-        - "Pong \\(on channel 20\\)"
+        - "Ping \\(on channel 16\\)"
+        - "Pong \\(on channel 15\\)"
 
   sample.drivers.mbox.nrf54l15_remote_no_multithreading:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     extra_args:
@@ -131,5 +134,5 @@ tests:
       type: multi_line
       ordered: false
       regex:
-        - "Ping \\(on channel 21\\)"
-        - "Pong \\(on channel 20\\)"
+        - "Ping \\(on channel 16\\)"
+        - "Pong \\(on channel 15\\)"
diff --git a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay
similarity index 91%
rename from samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay
rename to samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay
index a3f853c6e3d..74bdf07915b 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay
+++ b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay
@@ -27,7 +27,7 @@
 			rx-region = <&sram_rx>;
 			tx-blocks = <16>;
 			rx-blocks = <18>;
-			mboxes = <&cpuapp_vevif_rx 20>, <&cpuapp_vevif_tx 21>;
+			mboxes = <&cpuapp_vevif_rx 15>, <&cpuapp_vevif_tx 16>;
 			mbox-names = "rx", "tx";
 			status = "okay";
 		};
diff --git a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
index c6e59f2b131..e1dbd1eaa01 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
+++ b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
@@ -39,7 +39,3 @@
 &cpuflpr_vevif_tx {
 	status = "okay";
 };
-
-&uart30 {
-	/delete-property/ hw-flow-control;
-};
diff --git a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
index b0e1f0d5034..2219b7b78fa 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
+++ b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
@@ -39,7 +39,3 @@
 &cpuflpr_vevif_tx {
 	status = "okay";
 };
-
-&uart30 {
-	/delete-property/ hw-flow-control;
-};
diff --git a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay
similarity index 91%
rename from samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay
rename to samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay
index 0033e622107..56ea0e6a5e4 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay
+++ b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay
@@ -27,7 +27,7 @@
 			rx-region = <&sram_rx>;
 			tx-blocks = <18>;
 			rx-blocks = <16>;
-			mboxes = <&cpuflpr_vevif_rx 21>, <&cpuflpr_vevif_tx 20>;
+			mboxes = <&cpuflpr_vevif_rx 16>, <&cpuflpr_vevif_tx 15>;
 			mbox-names = "rx", "tx";
 			status = "okay";
 		};
diff --git a/samples/subsys/ipc/ipc_service/icmsg/sample.yaml b/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
index 9305aa61a03..b1fc001a45b 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
+++ b/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
@@ -23,7 +23,7 @@ tests:
         - "host: IPC-service HOST demo ended"
 
   sample.ipc.icmsg.nrf54l15:
-    platform_allow: nrf54l15dk/nrf54l15/cpuapp
+    platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     tags: ipc
@@ -43,7 +43,7 @@ tests:
         - "host: IPC-service HOST demo ended"
 
   sample.ipc.icmsg.nrf54l15_no_multithreading:
-    platform_allow: nrf54l15dk/nrf54l15/cpuapp
+    platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     tags: ipc
@@ -67,7 +67,7 @@ tests:
         - "I: IPC-service HOST demo ended"
 
   sample.ipc.icmsg.nrf54l15_remote_no_multithreading:
-    platform_allow: nrf54l15dk/nrf54l15/cpuapp
+    platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     tags: ipc
@@ -89,16 +89,16 @@ tests:
         - "host: IPC-service HOST demo ended"
 
   sample.ipc.icbmsg.nrf54l15:
-    platform_allow: nrf54l15dk/nrf54l15/cpuapp
+    platform_allow: nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     tags: ipc
     extra_args:
       icmsg_SNIPPET=nordic-flpr
       icmsg_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
-      icmsg_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay"
+      icmsg_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay"
       remote_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
-      remote_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay"
+      remote_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay"
     sysbuild: true
     harness: console
     harness_config:
@@ -113,18 +113,18 @@ tests:
         - "host: IPC-service HOST demo ended"
 
   sample.ipc.icbmsg.nrf54l15_no_multithreading:
-    platform_allow: nrf54l15dk/nrf54l15/cpuapp
+    platform_allow: nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     tags: ipc
     extra_args:
       icmsg_SNIPPET=nordic-flpr
       icmsg_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
-      icmsg_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay"
+      icmsg_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay"
       icmsg_CONFIG_MULTITHREADING=n
       icmsg_CONFIG_LOG_MODE_MINIMAL=y
       remote_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
-      remote_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay"
+      remote_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay"
       remote_CONFIG_MULTITHREADING=n
       remote_CONFIG_LOG_MODE_MINIMAL=y
     sysbuild: true
@@ -141,16 +141,16 @@ tests:
         - "host: IPC-service HOST demo ended"
 
   sample.ipc.icbmsg.nrf54l15_remote_no_multithreading:
-    platform_allow: nrf54l15dk/nrf54l15/cpuapp
+    platform_allow: nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     tags: ipc
     extra_args:
       icmsg_SNIPPET=nordic-flpr
       icmsg_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
-      icmsg_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay"
+      icmsg_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay"
       remote_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
-      remote_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay"
+      remote_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay"
       remote_CONFIG_MULTITHREADING=n
       remote_CONFIG_LOG_MODE_MINIMAL=y
     sysbuild: true

From 06029a228ac052b599dadb50e5a29e20b95fd887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:02 +0100
Subject: [PATCH 1917/2913] Revert "[nrf fromtree] samples: tests: Add support
 to tests on nrf54l15 DK"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5a4fc1954fe8811660acbd98decd324781b816af.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/bluetooth/beacon/sample.yaml          |  3 +-
 .../nrf54l15dk_nrf54l15_cpuapp_df.overlay     | 33 ------------
 samples/bluetooth/hci_uart/sample.yaml        | 11 ----
 samples/bluetooth/peripheral_hr/sample.yaml   |  3 +-
 ...5pdk_nrf54l15_cpuapp_retained_mem.overlay} |  0
 samples/boards/nordic/system_off/sample.yaml  |  6 +--
 ...ay => nrf54l15pdk_nrf54l15_cpuapp.overlay} |  0
 samples/drivers/adc/adc_dt/sample.yaml        |  2 +-
 ...ay => nrf54l15pdk_nrf54l15_cpuapp.overlay} |  0
 samples/drivers/adc/adc_sequence/sample.yaml  |  2 +-
 .../nrf54l15dk_nrf54l15_cpuflpr_xip.overlay   | 24 ---------
 samples/drivers/mbox/sample.yaml              |  9 ++--
 ...ay => nrf54l15pdk_nrf54l15_cpuapp.overlay} |  0
 samples/sensor/qdec/sample.yaml               |  4 +-
 .../boards/nrf54l15dk_nrf54l15_cpuapp.conf    | 12 -----
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 45 ----------------
 samples/subsys/fs/fs_sample/sample.yaml       |  3 --
 samples/subsys/fs/littlefs/sample.yaml        |  1 -
 .../ipc/ipc_service/icmsg/CMakeLists.txt      |  1 -
 .../ipc/ipc_service/icmsg/Kconfig.sysbuild    |  1 -
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 41 --------------
 .../nrf54l15dk_nrf54l15_cpuflpr.overlay       | 41 --------------
 .../subsys/ipc/ipc_service/icmsg/sample.yaml  | 12 ++---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.conf    |  2 -
 samples/subsys/settings/sample.yaml           |  1 -
 samples/sysbuild/hello_world/sample.yaml      |  9 ----
 .../sysbuild/nrf54l15dk_nrf54l15_cpuflpr.conf |  1 -
 ....conf => nrf54l15pdk_nrf54l15_cpuapp.conf} |  0
 ...ay => nrf54l15pdk_nrf54l15_cpuapp.overlay} |  3 +-
 tests/boards/nrf/i2c/i2c_slave/testcase.yaml  |  4 +-
 ...ay => nrf54l15pdk_nrf54l15_cpuapp.overlay} |  0
 ...y => nrf54l15pdk_nrf54l15_cpuflpr.overlay} |  0
 tests/boards/nrf/qdec/testcase.yaml           |  8 +--
 tests/boot/with_mcumgr/testcase.yaml          |  1 -
 .../clock_control_api/testcase.yaml           |  4 +-
 .../nrf_clock_calibration/testcase.yaml       |  2 +-
 .../nrf_lf_clock_start/testcase.yaml          | 18 +++----
 .../drivers/clock_control/onoff/testcase.yaml |  2 +-
 tests/drivers/flash/common/testcase.yaml      |  2 +-
 tests/drivers/flash/negative_tests/prj.conf   |  1 -
 .../flash/negative_tests/testcase.yaml        |  2 +-
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 23 --------
 .../drivers/mbox/mbox_error_cases/sample.yaml |  3 +-
 ...ay => nrf54l15pdk_nrf54l15_cpuapp.overlay} |  0
 tests/drivers/retained_mem/api/testcase.yaml  |  2 +-
 ...ay => nrf54l15pdk_nrf54l15_cpuapp.overlay} |  0
 .../spi_controller_peripheral/testcase.yaml   |  6 +--
 ...ay => nrf54l15pdk_nrf54l15_cpuapp.overlay} |  0
 .../drivers/spi/spi_error_cases/testcase.yaml |  2 +-
 ...ay => nrf54l15pdk_nrf54l15_cpuapp.overlay} |  0
 .../timer/nrf_grtc_timer/testcase.yaml        |  4 +-
 ...ay => nrf54l15pdk_nrf54l15_cpuapp.overlay} |  0
 ...4l15pdk_nrf54l15_cpuapp_dual_uart.overlay} |  0
 ...y => nrf54l15pdk_nrf54l15_cpuflpr.overlay} |  0
 ...l15pdk_nrf54l15_cpuflpr_dual_uart.overlay} |  0
 .../uart/uart_elementary/testcase.yaml        | 20 +++----
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 54 -------------------
 tests/drivers/uart/uart_errors/testcase.yaml  |  4 +-
 ...ay => nrf54l15pdk_nrf54l15_cpuapp.overlay} |  0
 .../uart/uart_mix_fifo_poll/testcase.yaml     |  8 +--
 ...ay => nrf54l15pdk_nrf54l15_cpuapp.overlay} |  0
 tests/drivers/uart/uart_pm/testcase.yaml      | 10 ++--
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay}      |  0
 .../nrf54l15pdk_nrf54l15_cpuflpr.overlay      |  8 +++
 .../nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay  |  8 +++
 .../nrf54l15pdk_nrf54l15_cpuapp.overlay       |  5 +-
 .../watchdog/wdt_error_cases/testcase.yaml    |  4 +-
 tests/subsys/fs/fcb/testcase.yaml             |  1 -
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 22 --------
 tests/subsys/fs/littlefs/testcase.yaml        |  2 +-
 .../storage/stream/stream_flash/testcase.yaml |  1 -
 71 files changed, 89 insertions(+), 412 deletions(-)
 delete mode 100644 samples/bluetooth/hci_uart/boards/nrf54l15dk_nrf54l15_cpuapp_df.overlay
 rename samples/boards/nordic/system_off/boards/{nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay => nrf54l15pdk_nrf54l15_cpuapp_retained_mem.overlay} (100%)
 rename samples/drivers/adc/adc_dt/boards/{nrf54l15dk_nrf54l15_cpuapp.overlay => nrf54l15pdk_nrf54l15_cpuapp.overlay} (100%)
 rename samples/drivers/adc/adc_sequence/boards/{nrf54l15dk_nrf54l15_cpuapp.overlay => nrf54l15pdk_nrf54l15_cpuapp.overlay} (100%)
 delete mode 100644 samples/drivers/mbox/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay
 rename samples/sensor/qdec/boards/{nrf54l15dk_nrf54l15_cpuapp.overlay => nrf54l15pdk_nrf54l15_cpuapp.overlay} (100%)
 delete mode 100644 samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.conf
 delete mode 100644 samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 delete mode 100644 samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 delete mode 100644 samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
 delete mode 100644 samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf
 delete mode 100644 samples/sysbuild/hello_world/sysbuild/nrf54l15dk_nrf54l15_cpuflpr.conf
 rename tests/boards/nrf/i2c/i2c_slave/boards/{nrf54l15dk_nrf54l15_cpuapp.conf => nrf54l15pdk_nrf54l15_cpuapp.conf} (100%)
 rename tests/boards/nrf/i2c/i2c_slave/boards/{nrf54l15dk_nrf54l15_cpuapp.overlay => nrf54l15pdk_nrf54l15_cpuapp.overlay} (95%)
 rename tests/boards/nrf/qdec/boards/{nrf54l15dk_nrf54l15_cpuapp.overlay => nrf54l15pdk_nrf54l15_cpuapp.overlay} (100%)
 rename tests/boards/nrf/qdec/boards/{nrf54l15dk_nrf54l15_cpuflpr.overlay => nrf54l15pdk_nrf54l15_cpuflpr.overlay} (100%)
 delete mode 100644 tests/drivers/mbox/mbox_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 rename tests/drivers/retained_mem/api/boards/{nrf54l15dk_nrf54l15_cpuapp.overlay => nrf54l15pdk_nrf54l15_cpuapp.overlay} (100%)
 rename tests/drivers/spi/spi_controller_peripheral/boards/{nrf54l15dk_nrf54l15_cpuapp.overlay => nrf54l15pdk_nrf54l15_cpuapp.overlay} (100%)
 rename tests/drivers/spi/spi_error_cases/boards/{nrf54l15dk_nrf54l15_cpuapp.overlay => nrf54l15pdk_nrf54l15_cpuapp.overlay} (100%)
 rename tests/drivers/spi/spi_loopback/boards/{nrf54l15dk_nrf54l15_cpuapp.overlay => nrf54l15pdk_nrf54l15_cpuapp.overlay} (100%)
 rename tests/drivers/uart/uart_elementary/boards/{nrf54l15dk_nrf54l15_cpuapp.overlay => nrf54l15pdk_nrf54l15_cpuapp.overlay} (100%)
 rename tests/drivers/uart/uart_elementary/boards/{nrf54l15dk_nrf54l15_cpuapp_dual_uart.overlay => nrf54l15pdk_nrf54l15_cpuapp_dual_uart.overlay} (100%)
 rename tests/drivers/uart/uart_elementary/boards/{nrf54l15dk_nrf54l15_cpuflpr.overlay => nrf54l15pdk_nrf54l15_cpuflpr.overlay} (100%)
 rename tests/drivers/uart/uart_elementary/boards/{nrf54l15dk_nrf54l15_cpuflpr_dual_uart.overlay => nrf54l15pdk_nrf54l15_cpuflpr_dual_uart.overlay} (100%)
 delete mode 100644 tests/drivers/uart/uart_errors/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 rename tests/drivers/uart/uart_mix_fifo_poll/boards/{nrf54l15dk_nrf54l15_cpuapp.overlay => nrf54l15pdk_nrf54l15_cpuapp.overlay} (100%)
 rename tests/drivers/uart/uart_pm/boards/{nrf54l15dk_nrf54l15_cpuapp.overlay => nrf54l15pdk_nrf54l15_cpuapp.overlay} (100%)
 rename tests/drivers/watchdog/{wdt_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay => wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay} (100%)
 create mode 100644 tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
 create mode 100644 tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
 rename samples/bluetooth/hci_uart/boards/nrf54l15dk_nrf54l15_cpuapp.overlay => tests/drivers/watchdog/wdt_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay (56%)
 delete mode 100644 tests/subsys/fs/littlefs/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/samples/bluetooth/beacon/sample.yaml b/samples/bluetooth/beacon/sample.yaml
index 6952be223ec..d76a16eb566 100644
--- a/samples/bluetooth/beacon/sample.yaml
+++ b/samples/bluetooth/beacon/sample.yaml
@@ -8,14 +8,13 @@ tests:
       - qemu_x86
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
-      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
     tags: bluetooth
     integration_platforms:
       - qemu_cortex_m3
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
   sample.bluetooth.beacon-coex:
     extra_args: CONF_FILE="prj-coex.conf"
     harness: bluetooth
diff --git a/samples/bluetooth/hci_uart/boards/nrf54l15dk_nrf54l15_cpuapp_df.overlay b/samples/bluetooth/hci_uart/boards/nrf54l15dk_nrf54l15_cpuapp_df.overlay
deleted file mode 100644
index 470bfdaa8c5..00000000000
--- a/samples/bluetooth/hci_uart/boards/nrf54l15dk_nrf54l15_cpuapp_df.overlay
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&uart20 {
-	compatible = "nordic,nrf-uarte";
-	current-speed = <1000000>;
-	status = "okay";
-	hw-flow-control;
-};
-
-&radio {
-	status = "okay";
-	/* This is an example number of antennas that may be available
-	 * on antenna matrix board.
-	 */
-	dfe-antenna-num = <10>;
-	/* This is an example switch pattern that will be used to set an
-	 * antenna for Tx PDU (period before start of Tx CTE).
-	 */
-	dfe-pdu-antenna = <0x0>;
-
-	/* These are example GPIO pin numbers that are provided to
-	 * Radio peripheral. The pins will be acquired by Radio to
-	 * drive antenna switching when AoD is enabled.
-	 */
-	dfegpio0-gpios = <&gpio1 4 0>;
-	dfegpio1-gpios = <&gpio1 5 0>;
-	dfegpio2-gpios = <&gpio1 6 0>;
-	dfegpio3-gpios = <&gpio1 7 0>;
-};
diff --git a/samples/bluetooth/hci_uart/sample.yaml b/samples/bluetooth/hci_uart/sample.yaml
index 6c87e6edede..96a3b446add 100644
--- a/samples/bluetooth/hci_uart/sample.yaml
+++ b/samples/bluetooth/hci_uart/sample.yaml
@@ -59,17 +59,6 @@ tests:
       - uart
       - bluetooth
   sample.bluetooth.hci_uart.nrf54l15.all:
-    harness: bluetooth
-    platform_allow: nrf54l15dk/nrf54l15/cpuapp
-    integration_platforms:
-      - nrf54l15dk/nrf54l15/cpuapp
-    extra_args:
-      - OVERLAY_CONFIG=overlay-all-bt_ll_sw_split.conf
-      - DTC_OVERLAY_FILE=./boards/nrf54l15dk_nrf54l15_cpuapp_df.overlay
-    tags:
-      - uart
-      - bluetooth
-  sample.bluetooth.hci_uart.nrf54l15pdk.all:
     harness: bluetooth
     platform_allow: nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
diff --git a/samples/bluetooth/peripheral_hr/sample.yaml b/samples/bluetooth/peripheral_hr/sample.yaml
index c0af932a3ea..6a4f2edead0 100644
--- a/samples/bluetooth/peripheral_hr/sample.yaml
+++ b/samples/bluetooth/peripheral_hr/sample.yaml
@@ -13,7 +13,6 @@ tests:
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - qemu_cortex_m3
@@ -23,7 +22,7 @@ tests:
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     tags: bluetooth
   sample.bluetooth.peripheral_hr.minimal:
     harness: bluetooth
diff --git a/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay b/samples/boards/nordic/system_off/boards/nrf54l15pdk_nrf54l15_cpuapp_retained_mem.overlay
similarity index 100%
rename from samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay
rename to samples/boards/nordic/system_off/boards/nrf54l15pdk_nrf54l15_cpuapp_retained_mem.overlay
diff --git a/samples/boards/nordic/system_off/sample.yaml b/samples/boards/nordic/system_off/sample.yaml
index 0503867b191..da000dc3188 100644
--- a/samples/boards/nordic/system_off/sample.yaml
+++ b/samples/boards/nordic/system_off/sample.yaml
@@ -8,7 +8,7 @@ tests:
     integration_platforms:
       - nrf52840dk/nrf52840
     platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
@@ -22,10 +22,10 @@ tests:
     extra_configs:
       - CONFIG_APP_USE_NRF_RETENTION=y
   sample.boards.nrf.system_off.retained_mem:
-    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay"
+    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_retained_mem.overlay"
     build_only: true
     platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     extra_configs:
       - CONFIG_APP_USE_RETAINED_MEM=y
       - CONFIG_RETAINED_MEM=y
diff --git a/samples/drivers/adc/adc_dt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/drivers/adc/adc_dt/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from samples/drivers/adc/adc_dt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to samples/drivers/adc/adc_dt/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
diff --git a/samples/drivers/adc/adc_dt/sample.yaml b/samples/drivers/adc/adc_dt/sample.yaml
index 7957f01f70a..d7a9487d89d 100644
--- a/samples/drivers/adc/adc_dt/sample.yaml
+++ b/samples/drivers/adc/adc_dt/sample.yaml
@@ -15,7 +15,7 @@ tests:
       - stm32h735g_disco
       - nrf51dk/nrf51822
       - nrf52840dk/nrf52840
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - mec172xevb_assy6906
       - gd32f350r_eval
diff --git a/samples/drivers/adc/adc_sequence/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/drivers/adc/adc_sequence/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from samples/drivers/adc/adc_sequence/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to samples/drivers/adc/adc_sequence/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
diff --git a/samples/drivers/adc/adc_sequence/sample.yaml b/samples/drivers/adc/adc_sequence/sample.yaml
index 1516184a50d..639a41dfff0 100644
--- a/samples/drivers/adc/adc_sequence/sample.yaml
+++ b/samples/drivers/adc/adc_sequence/sample.yaml
@@ -9,7 +9,7 @@ tests:
       - cy8cproto_063_ble
       - cy8cproto_062_4343w
       - nrf52840dk/nrf52840
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - ucans32k1sic
     integration_platforms:
diff --git a/samples/drivers/mbox/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay b/samples/drivers/mbox/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay
deleted file mode 100644
index e2bf5bbe06c..00000000000
--- a/samples/drivers/mbox/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	mbox-consumer {
-		compatible = "vnd,mbox-consumer";
-		mboxes = <&cpuflpr_vevif_rx 21>, <&cpuflpr_vevif_tx 20>;
-		mbox-names = "rx", "tx";
-	};
-};
-
-&cpuflpr_vevif_rx {
-	status = "okay";
-};
-
-&cpuflpr_vevif_tx {
-	status = "okay";
-};
-
-&uart30 {
-	/delete-property/ hw-flow-control;
-};
diff --git a/samples/drivers/mbox/sample.yaml b/samples/drivers/mbox/sample.yaml
index 40664dac736..637027e0551 100644
--- a/samples/drivers/mbox/sample.yaml
+++ b/samples/drivers/mbox/sample.yaml
@@ -85,10 +85,9 @@ tests:
 
   sample.drivers.mbox.nrf54l15:
     platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     extra_args:
       mbox_SNIPPET=nordic-flpr
     sysbuild: true
@@ -102,10 +101,9 @@ tests:
 
   sample.drivers.mbox.nrf54l15_no_multithreading:
     platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     extra_args:
       mbox_SNIPPET=nordic-flpr
       mbox_CONFIG_MULTITHREADING=n
@@ -121,10 +119,9 @@ tests:
 
   sample.drivers.mbox.nrf54l15_remote_no_multithreading:
     platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     extra_args:
       mbox_SNIPPET=nordic-flpr
       remote_CONFIG_MULTITHREADING=n
diff --git a/samples/sensor/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/sensor/qdec/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from samples/sensor/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to samples/sensor/qdec/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
diff --git a/samples/sensor/qdec/sample.yaml b/samples/sensor/qdec/sample.yaml
index d4d685c43fb..0100a19cfa6 100644
--- a/samples/sensor/qdec/sample.yaml
+++ b/samples/sensor/qdec/sample.yaml
@@ -41,12 +41,12 @@ tests:
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
     integration_platforms:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
     harness_config:
       fixture: gpio_loopback
diff --git a/samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.conf
deleted file mode 100644
index 949237fd4ba..00000000000
--- a/samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_DISK_DRIVERS=y
-CONFIG_DISK_DRIVER_FLASH=y
-# There may be no files on internal SoC flash, so this Kconfig
-# options has ben enabled to create some if listing does not
-# find in the first place.
-CONFIG_FS_SAMPLE_CREATE_SOME_ENTRIES=y
diff --git a/samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 391afea75a4..00000000000
--- a/samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/* Because FAT FS needs at least 64kiB partition and default
- * storage_partition is 36kiB for this board, we need to reorganize
- * partitions to get at least 64KiB.
- */
-/delete-node/ &slot0_partition;
-/delete-node/ &slot1_partition;
-/delete-node/ &slot0_ns_partition;
-/delete-node/ &slot1_ns_partition;
-/delete-node/ &storage_partition;
-
-&cpuapp_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		slot0_partition: parition@10000 {
-			reg = <0x00010000 DT_SIZE_K(300)>;
-		};
-		slot1_partition: partition@5b000 {
-			reg = <0x0005b000 DT_SIZE_K(300)>;
-		};
-
-		storage_partition: partition@a6000 {
-			label = "storage";
-			reg = <0x000a6000 DT_SIZE_K(128)>;
-		};
-	};
-};
-
-/ {
-	msc_disk0 {
-		status="okay";
-		compatible = "zephyr,flash-disk";
-		partition = <&storage_partition>;
-		disk-name = "SD";
-		cache-size = <512>;
-	};
-};
diff --git a/samples/subsys/fs/fs_sample/sample.yaml b/samples/subsys/fs/fs_sample/sample.yaml
index d54960c7589..83895f21529 100644
--- a/samples/subsys/fs/fs_sample/sample.yaml
+++ b/samples/subsys/fs/fs_sample/sample.yaml
@@ -58,9 +58,6 @@ tests:
   sample.filesystem.fat_fs.nrf54l15pdk:
     build_only: true
     platform_allow: nrf54l15pdk/nrf54l15/cpuapp
-  sample.filesystem.fat_fs.nrf54l15dk:
-    build_only: true
-    platform_allow: nrf54l15dk/nrf54l15/cpuapp
   sample.filesystem.fat_fs.nrf52840dk_nrf52840.qspi:
     build_only: true
     platform_allow: nrf52840dk/nrf52840
diff --git a/samples/subsys/fs/littlefs/sample.yaml b/samples/subsys/fs/littlefs/sample.yaml
index 2d78141c9db..4a92d6e339c 100644
--- a/samples/subsys/fs/littlefs/sample.yaml
+++ b/samples/subsys/fs/littlefs/sample.yaml
@@ -24,7 +24,6 @@ tests:
       - stm32f746g_disco
       - stm32h747i_disco/stm32h747xx/m7
       - stm32h750b_dk
-      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
       - frdm_ke17z
       - frdm_ke17z512
diff --git a/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt b/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt
index 21d9bafeab0..e9e246b02fa 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt
+++ b/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt
@@ -11,7 +11,6 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 if(NOT CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP AND
     NOT CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUAPP AND
     NOT CONFIG_BOARD_STM32H747I_DISCO AND
-    NOT CONFIG_BOARD_NRF54L15DK_NRF54L15_CPUAPP AND
     NOT CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUAPP)
   message(FATAL_ERROR "${BOARD} is not supported for this sample")
 endif()
diff --git a/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild b/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild
index ef6f7df968b..41b892aba6a 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild
+++ b/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild
@@ -9,5 +9,4 @@ string
 	default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk"
 	default "nrf5340bsim/nrf5340/cpunet" if $(BOARD) = "nrf5340bsim"
 	default "nrf54l15pdk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15pdk"
-	default "nrf54l15dk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15dk"
 	default "stm32h747i_disco/stm32h747xx/m4" if $(BOARD) = "stm32h747i_disco"
diff --git a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index b6f20acc42a..00000000000
--- a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	soc {
-		reserved-memory {
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			sram_rx: memory@20018000 {
-				reg = <0x20018000 0x0800>;
-			};
-
-			sram_tx: memory@20020000 {
-				reg = <0x20020000 0x0800>;
-			};
-		};
-	};
-
-	ipc {
-		ipc0: ipc0 {
-			compatible = "zephyr,ipc-icmsg";
-			tx-region = <&sram_tx>;
-			rx-region = <&sram_rx>;
-			mboxes = <&cpuapp_vevif_rx 20>, <&cpuapp_vevif_tx 21>;
-			mbox-names = "rx", "tx";
-			status = "okay";
-		};
-	};
-};
-
-&cpuapp_vevif_rx {
-	status = "okay";
-};
-
-&cpuapp_vevif_tx {
-	status = "okay";
-};
diff --git a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
deleted file mode 100644
index e1dbd1eaa01..00000000000
--- a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	soc {
-		reserved-memory {
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			sram_tx: memory@20018000 {
-				reg = <0x20018000 0x0800>;
-			};
-
-			sram_rx: memory@20020000 {
-				reg = <0x20020000 0x0800>;
-			};
-		};
-	};
-
-	ipc {
-		ipc0: ipc0 {
-			compatible = "zephyr,ipc-icmsg";
-			tx-region = <&sram_tx>;
-			rx-region = <&sram_rx>;
-			mboxes = <&cpuflpr_vevif_rx 21>, <&cpuflpr_vevif_tx 20>;
-			mbox-names = "rx", "tx";
-			status = "okay";
-		};
-	};
-};
-
-&cpuflpr_vevif_rx {
-	status = "okay";
-};
-
-&cpuflpr_vevif_tx {
-	status = "okay";
-};
diff --git a/samples/subsys/ipc/ipc_service/icmsg/sample.yaml b/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
index b1fc001a45b..321ed3398ed 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
+++ b/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
@@ -23,9 +23,9 @@ tests:
         - "host: IPC-service HOST demo ended"
 
   sample.ipc.icmsg.nrf54l15:
-    platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
+    platform_allow: nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     tags: ipc
     extra_args:
       icmsg_SNIPPET=nordic-flpr
@@ -43,9 +43,9 @@ tests:
         - "host: IPC-service HOST demo ended"
 
   sample.ipc.icmsg.nrf54l15_no_multithreading:
-    platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
+    platform_allow: nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     tags: ipc
     extra_args:
       icmsg_SNIPPET=nordic-flpr
@@ -67,9 +67,9 @@ tests:
         - "I: IPC-service HOST demo ended"
 
   sample.ipc.icmsg.nrf54l15_remote_no_multithreading:
-    platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
+    platform_allow: nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     tags: ipc
     extra_args:
       icmsg_SNIPPET=nordic-flpr
diff --git a/samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf
deleted file mode 100644
index 3746c13c741..00000000000
--- a/samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/sample.yaml b/samples/subsys/settings/sample.yaml
index db06905ac90..e4a9e148c5a 100644
--- a/samples/subsys/settings/sample.yaml
+++ b/samples/subsys/settings/sample.yaml
@@ -12,7 +12,6 @@ tests:
       - native_sim
       - native_sim/native/64
       - mr_canhubk3
-      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
     integration_platforms:
diff --git a/samples/sysbuild/hello_world/sample.yaml b/samples/sysbuild/hello_world/sample.yaml
index 444410f46a3..40a1425497e 100644
--- a/samples/sysbuild/hello_world/sample.yaml
+++ b/samples/sysbuild/hello_world/sample.yaml
@@ -56,15 +56,6 @@ tests:
       SB_CONF_FILE=sysbuild/nrf54l15pdk_nrf54l15_cpuflpr.conf
       hello_world_SNIPPET=nordic-flpr
 
-  sample.sysbuild.hello_world.nrf54l15dk_nrf54l15_cpuflpr:
-    platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
-    integration_platforms:
-      - nrf54l15dk/nrf54l15/cpuapp
-    extra_args:
-      SB_CONF_FILE=sysbuild/nrf54l15dk_nrf54l15_cpuflpr.conf
-      hello_world_SNIPPET=nordic-flpr
-
   sample.sysbuild.hello_world.nrf54h20dk_cpuapp_cpuflpr:
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
diff --git a/samples/sysbuild/hello_world/sysbuild/nrf54l15dk_nrf54l15_cpuflpr.conf b/samples/sysbuild/hello_world/sysbuild/nrf54l15dk_nrf54l15_cpuflpr.conf
deleted file mode 100644
index 203dc628f47..00000000000
--- a/samples/sysbuild/hello_world/sysbuild/nrf54l15dk_nrf54l15_cpuflpr.conf
+++ /dev/null
@@ -1 +0,0 @@
-SB_CONFIG_REMOTE_BOARD="nrf54l15dk/nrf54l15/cpuflpr"
diff --git a/tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
similarity index 100%
rename from tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15dk_nrf54l15_cpuapp.conf
rename to tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
diff --git a/tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
similarity index 95%
rename from tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
index 2a26aacce05..d60e42659ee 100644
--- a/tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/boards/nrf/i2c/i2c_slave/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -23,8 +23,7 @@
 	i2c22_default_alt: i2c22_default_alt {
 		group1 {
 /* Temporary workaround as it is currently not possible
- * to configure pins for TWIS with pinctrl.
- */
+ * to configure pins for TWIS with pinctrl. */
 			psels = <NRF_PSEL(TWIM_SDA, 1, 9)>,
 				<NRF_PSEL(TWIM_SCL, 1, 13)>;
 			bias-pull-up;
diff --git a/tests/boards/nrf/i2c/i2c_slave/testcase.yaml b/tests/boards/nrf/i2c/i2c_slave/testcase.yaml
index ad3b34058c7..818502b6890 100644
--- a/tests/boards/nrf/i2c/i2c_slave/testcase.yaml
+++ b/tests/boards/nrf/i2c/i2c_slave/testcase.yaml
@@ -8,10 +8,10 @@ tests:
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
     integration_platforms:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
diff --git a/tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
similarity index 100%
rename from tests/boards/nrf/qdec/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
rename to tests/boards/nrf/qdec/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
diff --git a/tests/boards/nrf/qdec/testcase.yaml b/tests/boards/nrf/qdec/testcase.yaml
index 4bc634412db..f8d5f0c7a60 100644
--- a/tests/boards/nrf/qdec/testcase.yaml
+++ b/tests/boards/nrf/qdec/testcase.yaml
@@ -7,14 +7,14 @@ tests:
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15dk/nrf54l15/cpuflpr
+      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuflpr
       - nrf54h20dk/nrf54h20/cpuapp
     integration_platforms:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15dk/nrf54l15/cpuflpr
+      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuflpr
       - nrf54h20dk/nrf54h20/cpuapp
     harness: ztest
     harness_config:
diff --git a/tests/boot/with_mcumgr/testcase.yaml b/tests/boot/with_mcumgr/testcase.yaml
index 37e7d91ffaf..1e3a250d10e 100644
--- a/tests/boot/with_mcumgr/testcase.yaml
+++ b/tests/boot/with_mcumgr/testcase.yaml
@@ -3,7 +3,6 @@ common:
   platform_allow:
     - nrf52840dk/nrf52840
     - nrf5340dk/nrf5340/cpuapp
-    - nrf54l15dk/nrf54l15/cpuapp
     - nrf54l15pdk/nrf54l15/cpuapp
     - nrf9160dk/nrf9160
     - nucleo_wba55cg
diff --git a/tests/drivers/clock_control/clock_control_api/testcase.yaml b/tests/drivers/clock_control/clock_control_api/testcase.yaml
index ece53e013d7..f14e57971ab 100644
--- a/tests/drivers/clock_control/clock_control_api/testcase.yaml
+++ b/tests/drivers/clock_control/clock_control_api/testcase.yaml
@@ -16,7 +16,7 @@ tests:
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
       - nrf9160dk/nrf9160
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
   drivers.clock.clock_control_nrf5_lfclk_rc:
@@ -24,7 +24,7 @@ tests:
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_args: CONF_FILE="nrf_lfclk_rc.conf"
diff --git a/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml b/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml
index fc90cc792ab..e5f1248f5ec 100644
--- a/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml
+++ b/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml
@@ -7,6 +7,6 @@ tests:
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
diff --git a/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml b/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml
index c17f6b6cd48..c35d4529722 100644
--- a/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml
+++ b/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml
@@ -13,7 +13,7 @@ tests:
       - nrf9160dk/nrf9160
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     extra_configs:
       - CONFIG_SYSTEM_CLOCK_WAIT_FOR_STABILITY=y
       - CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
@@ -28,7 +28,7 @@ tests:
       - nrf9160dk/nrf9160
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     extra_configs:
       - CONFIG_SYSTEM_CLOCK_WAIT_FOR_AVAILABILITY=y
       - CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
@@ -43,7 +43,7 @@ tests:
       - nrf9160dk/nrf9160
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
@@ -57,7 +57,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
@@ -71,7 +71,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
@@ -85,7 +85,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
@@ -99,7 +99,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
@@ -113,7 +113,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
@@ -127,7 +127,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
diff --git a/tests/drivers/clock_control/onoff/testcase.yaml b/tests/drivers/clock_control/onoff/testcase.yaml
index 3e57daea83a..867ae2dce40 100644
--- a/tests/drivers/clock_control/onoff/testcase.yaml
+++ b/tests/drivers/clock_control/onoff/testcase.yaml
@@ -7,7 +7,7 @@ tests:
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf9160dk/nrf9160
     integration_platforms:
       - nrf51dk/nrf51822
diff --git a/tests/drivers/flash/common/testcase.yaml b/tests/drivers/flash/common/testcase.yaml
index 977fea9d0ed..487c8cd97fe 100644
--- a/tests/drivers/flash/common/testcase.yaml
+++ b/tests/drivers/flash/common/testcase.yaml
@@ -38,7 +38,7 @@ tests:
       - mimxrt1060_evk
   drivers.flash.common.no_explicit_erase:
     platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
   drivers.flash.common.tfm_ns:
     build_only: true
diff --git a/tests/drivers/flash/negative_tests/prj.conf b/tests/drivers/flash/negative_tests/prj.conf
index e00f27ad9e1..2496d765165 100644
--- a/tests/drivers/flash/negative_tests/prj.conf
+++ b/tests/drivers/flash/negative_tests/prj.conf
@@ -3,4 +3,3 @@ CONFIG_ZTEST=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_MAIN_STACK_SIZE=2048
-CONFIG_SPI_NOR=n
diff --git a/tests/drivers/flash/negative_tests/testcase.yaml b/tests/drivers/flash/negative_tests/testcase.yaml
index cea837a8f0d..75c60a9b7f8 100644
--- a/tests/drivers/flash/negative_tests/testcase.yaml
+++ b/tests/drivers/flash/negative_tests/testcase.yaml
@@ -5,5 +5,5 @@ common:
 tests:
   drivers.flash.negative_tests:
     platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
diff --git a/tests/drivers/mbox/mbox_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/mbox/mbox_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index f7fd310c974..00000000000
--- a/tests/drivers/mbox/mbox_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	mbox-consumer {
-		compatible = "vnd,mbox-consumer";
-		mboxes = <&cpuapp_vevif_tx 21>, <&cpuapp_vevif_tx 32>,
-				 <&cpuapp_vevif_rx 20>, <&cpuapp_vevif_rx 32>;
-		mbox-names = "remote_valid", "remote_incorrect",
-					 "local_valid", "local_incorrect";
-
-	};
-};
-
-&cpuapp_vevif_rx {
-	status = "okay";
-};
-
-&cpuapp_vevif_tx {
-	status = "okay";
-};
diff --git a/tests/drivers/mbox/mbox_error_cases/sample.yaml b/tests/drivers/mbox/mbox_error_cases/sample.yaml
index c6183d32d4f..9f61af5e1d2 100644
--- a/tests/drivers/mbox/mbox_error_cases/sample.yaml
+++ b/tests/drivers/mbox/mbox_error_cases/sample.yaml
@@ -14,8 +14,7 @@ tests:
 
   tests.drivers.mbox_error_cases.nrf54l:
     platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
     extra_args: SNIPPET=nordic-flpr
diff --git a/tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/retained_mem/api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to tests/drivers/retained_mem/api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/retained_mem/api/testcase.yaml b/tests/drivers/retained_mem/api/testcase.yaml
index 2979607296c..7b23fd3b6e8 100644
--- a/tests/drivers/retained_mem/api/testcase.yaml
+++ b/tests/drivers/retained_mem/api/testcase.yaml
@@ -5,7 +5,7 @@ tests:
       - drivers
       - retained_mem
   drivers.retained_mem.api.ram:
-    platform_allow: qemu_cortex_m3 nrf54l15dk/nrf54l15/cpuapp
+    platform_allow: qemu_cortex_m3 nrf54l15pdk/nrf54l15/cpuapp
     tags:
       - drivers
       - retained_mem
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
index 675259a4dd0..18dfb9db1cd 100644
--- a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
+++ b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
@@ -5,8 +5,8 @@ common:
   harness_config:
     fixture: gpio_spi_loopback
   platform_allow: |
-    nrf52840dk/nrf52840 nrf54l15dk/nrf54l15/cpuapp
-    nrf54h20dk/nrf54h20/cpuapp nrf54h20dk/nrf54h20/cpurad
+    nrf52840dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp
+    nrf54h20dk/nrf54h20/cpurad
 
 tests:
   drivers.spi.spi_mode0:
@@ -55,5 +55,5 @@ tests:
     extra_args: DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
     platform_exclude:
       - nrf52840dk/nrf52840
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
diff --git a/tests/drivers/spi/spi_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/drivers/spi/spi_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to tests/drivers/spi/spi_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/spi/spi_error_cases/testcase.yaml b/tests/drivers/spi/spi_error_cases/testcase.yaml
index b00c73c2ef9..ba046ee0292 100644
--- a/tests/drivers/spi/spi_error_cases/testcase.yaml
+++ b/tests/drivers/spi/spi_error_cases/testcase.yaml
@@ -8,7 +8,7 @@ tests:
   drivers.spi.spi_error_cases:
     platform_allow:
       - nrf52840dk/nrf52840
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
     integration_platforms:
       - nrf52840dk/nrf52840
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to tests/drivers/spi/spi_loopback/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/timer/nrf_grtc_timer/testcase.yaml b/tests/drivers/timer/nrf_grtc_timer/testcase.yaml
index 8d7b2f8d86e..6f7c1cd769f 100644
--- a/tests/drivers/timer/nrf_grtc_timer/testcase.yaml
+++ b/tests/drivers/timer/nrf_grtc_timer/testcase.yaml
@@ -2,8 +2,8 @@ tests:
   drivers.timer.nrf_grtc_timer:
     tags: drivers
     platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15dk/nrf54l15/cpuflpr
+      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuflpr
       - nrf54l15bsim/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
diff --git a/tests/drivers/uart/uart_elementary/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_elementary/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/drivers/uart/uart_elementary/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to tests/drivers/uart/uart_elementary/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/uart/uart_elementary/boards/nrf54l15dk_nrf54l15_cpuapp_dual_uart.overlay b/tests/drivers/uart/uart_elementary/boards/nrf54l15pdk_nrf54l15_cpuapp_dual_uart.overlay
similarity index 100%
rename from tests/drivers/uart/uart_elementary/boards/nrf54l15dk_nrf54l15_cpuapp_dual_uart.overlay
rename to tests/drivers/uart/uart_elementary/boards/nrf54l15pdk_nrf54l15_cpuapp_dual_uart.overlay
diff --git a/tests/drivers/uart/uart_elementary/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/tests/drivers/uart/uart_elementary/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
similarity index 100%
rename from tests/drivers/uart/uart_elementary/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
rename to tests/drivers/uart/uart_elementary/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
diff --git a/tests/drivers/uart/uart_elementary/boards/nrf54l15dk_nrf54l15_cpuflpr_dual_uart.overlay b/tests/drivers/uart/uart_elementary/boards/nrf54l15pdk_nrf54l15_cpuflpr_dual_uart.overlay
similarity index 100%
rename from tests/drivers/uart/uart_elementary/boards/nrf54l15dk_nrf54l15_cpuflpr_dual_uart.overlay
rename to tests/drivers/uart/uart_elementary/boards/nrf54l15pdk_nrf54l15_cpuflpr_dual_uart.overlay
diff --git a/tests/drivers/uart/uart_elementary/testcase.yaml b/tests/drivers/uart/uart_elementary/testcase.yaml
index e1ea05cddc1..e8f0184eff3 100644
--- a/tests/drivers/uart/uart_elementary/testcase.yaml
+++ b/tests/drivers/uart/uart_elementary/testcase.yaml
@@ -9,8 +9,8 @@ tests:
     filter: CONFIG_SERIAL_SUPPORT_INTERRUPT
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l15dk/nrf54l15/cpuflpr
+      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuflpr
       - nrf5340dk/nrf5340/cpuapp
   drivers.uart.uart_elementary_dual_nrf54h:
     filter: CONFIG_SERIAL_SUPPORT_INTERRUPT
@@ -30,30 +30,30 @@ tests:
   drivers.uart.uart_elementary_dual_nrf54l:
     filter: CONFIG_SERIAL_SUPPORT_INTERRUPT
     platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
-    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_dual_uart.overlay"
+      - nrf54l15pdk/nrf54l15/cpuapp
+    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_dual_uart.overlay"
     extra_configs:
       - CONFIG_DUAL_UART_TEST=y
   drivers.uart.uart_elementary_dual_setup_mismatch_nrf54l:
     filter: CONFIG_SERIAL_SUPPORT_INTERRUPT
     platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
-    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_dual_uart.overlay"
+      - nrf54l15pdk/nrf54l15/cpuapp
+    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_dual_uart.overlay"
     extra_configs:
       - CONFIG_DUAL_UART_TEST=y
       - CONFIG_SETUP_MISMATCH_TEST=y
   drivers.uart.uart_elementary_dual_nrf54l_cpuflpr:
     filter: CONFIG_SERIAL_SUPPORT_INTERRUPT
     platform_allow:
-      - nrf54l15dk/nrf54l15/cpuflpr
-    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_dual_uart.overlay"
+      - nrf54l15pdk/nrf54l15/cpuflpr
+    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuflpr_dual_uart.overlay"
     extra_configs:
       - CONFIG_DUAL_UART_TEST=y
   drivers.uart.uart_elementary_dual_setup_mismatch_nrf54l_cpuflpr:
     filter: CONFIG_SERIAL_SUPPORT_INTERRUPT
     platform_allow:
-      - nrf54l15dk/nrf54l15/cpuflpr
-    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_dual_uart.overlay"
+      - nrf54l15pdk/nrf54l15/cpuflpr
+    extra_args: DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuflpr_dual_uart.overlay"
     extra_configs:
       - CONFIG_DUAL_UART_TEST=y
       - CONFIG_SETUP_MISMATCH_TEST=y
diff --git a/tests/drivers/uart/uart_errors/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_errors/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index babbc740133..00000000000
--- a/tests/drivers/uart/uart_errors/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,54 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-
-&pinctrl {
-	uart21_default: uart21_default {
-		group1 {
-			psels = <NRF_PSEL(UART_RX, 1, 8)>,
-				<NRF_PSEL(UART_RTS, 1, 10)>;
-		};
-	};
-
-	uart21_sleep: uart21_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_RX, 1, 8)>,
-				<NRF_PSEL(UART_RTS, 1, 10)>;
-			low-power-enable;
-		};
-	};
-
-	uart22_default: uart22_default {
-		group1 {
-			psels =
-				<NRF_PSEL(UART_CTS, 1, 11)>;
-				bias-pull-up;
-		};
-		group2 {
-			psels = <NRF_PSEL(UART_TX, 1, 9)>;
-		};
-	};
-
-	uart22_sleep: uart22_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 1, 9)>,
-				<NRF_PSEL(UART_CTS, 1, 11)>;
-			low-power-enable;
-		};
-	};
-};
-
-dut: &uart21 {
-	status = "okay";
-	current-speed = <115200>;
-	pinctrl-0 = <&uart21_default>;
-	pinctrl-1 = <&uart21_sleep>;
-	pinctrl-names = "default", "sleep";
-};
-
-dut_aux: &uart22 {
-	status = "okay";
-	current-speed = <115200>;
-	pinctrl-0 = <&uart22_default>;
-	pinctrl-1 = <&uart22_sleep>;
-	pinctrl-names = "default", "sleep";
-	disable-rx;
-};
diff --git a/tests/drivers/uart/uart_errors/testcase.yaml b/tests/drivers/uart/uart_errors/testcase.yaml
index b049b10333c..9ce1e989c67 100644
--- a/tests/drivers/uart/uart_errors/testcase.yaml
+++ b/tests/drivers/uart/uart_errors/testcase.yaml
@@ -9,13 +9,13 @@ tests:
     filter: CONFIG_SERIAL_SUPPORT_INTERRUPT
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf5340dk/nrf5340/cpuapp
   drivers.uart.uart_errors.async:
     filter: CONFIG_SERIAL_SUPPORT_ASYNC
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf5340dk/nrf5340/cpuapp
     extra_configs:
       - CONFIG_UART_ASYNC_API=y
diff --git a/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml b/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
index 1b13bc57166..8be2429492e 100644
--- a/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
+++ b/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
@@ -8,7 +8,7 @@ common:
     - nrf52840dk/nrf52840
     - nrf9160dk/nrf9160
     - nrf5340dk/nrf5340/cpuapp
-    - nrf54l15dk/nrf54l15/cpuapp
+    - nrf54l15pdk/nrf54l15/cpuapp
     - nrf54h20dk/nrf54h20/cpuapp
     - nrf54h20dk/nrf54h20/cpurad
     - nrf52_bsim
@@ -82,7 +82,7 @@ tests:
       - CONFIG_UART_0_ENHANCED_POLL_OUT=n
       - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     platform_exclude:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
 
@@ -93,7 +93,7 @@ tests:
       - CONFIG_UART_0_ENHANCED_POLL_OUT=n
       - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     platform_exclude:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
 
@@ -108,6 +108,6 @@ tests:
       - CONFIG_NRFX_TIMER2=y
       - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     platform_exclude:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
diff --git a/tests/drivers/uart/uart_pm/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_pm/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/drivers/uart/uart_pm/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to tests/drivers/uart/uart_pm/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/uart/uart_pm/testcase.yaml b/tests/drivers/uart/uart_pm/testcase.yaml
index 9a7729c8236..c7c7b803442 100644
--- a/tests/drivers/uart/uart_pm/testcase.yaml
+++ b/tests/drivers/uart/uart_pm/testcase.yaml
@@ -5,7 +5,7 @@ common:
   harness: ztest
   platform_allow:
     - nrf52840dk/nrf52840
-    - nrf54l15dk/nrf54l15/cpuapp
+    - nrf54l15pdk/nrf54l15/cpuapp
     - nrf54h20dk/nrf54h20/cpuapp
     - nrf52_bsim
   harness_config:
@@ -27,7 +27,7 @@ tests:
       - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     extra_args: DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840.overlay;nrf_rx_disable.overlay"
     platform_exclude:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
 
   drivers.uart.pm.enhanced_poll:
@@ -37,7 +37,7 @@ tests:
       - CONFIG_UART_0_ENHANCED_POLL_OUT=y
       - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     platform_exclude:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
 
   drivers.uart.pm.int_driven:
@@ -56,7 +56,7 @@ tests:
       - CONFIG_UART_0_ENHANCED_POLL_OUT=y
       - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     platform_exclude:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
 
   drivers.uart.pm.async:
@@ -81,5 +81,5 @@ tests:
       - CONFIG_UART_0_ENHANCED_POLL_OUT=y
       - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     platform_exclude:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
diff --git a/tests/drivers/watchdog/wdt_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
similarity index 100%
rename from tests/drivers/watchdog/wdt_error_cases/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
new file mode 100644
index 00000000000..5c765a8a896
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
new file mode 100644
index 00000000000..5c765a8a896
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l15pdk_nrf54l15_cpuflpr_xip.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/samples/bluetooth/hci_uart/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/watchdog/wdt_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
similarity index 56%
rename from samples/bluetooth/hci_uart/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to tests/drivers/watchdog/wdt_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
index 7613ab836ba..8d3dce3b380 100644
--- a/samples/bluetooth/hci_uart/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/watchdog/wdt_error_cases/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-&uart20 {
-	compatible = "nordic,nrf-uarte";
-	current-speed = <1000000>;
+&wdt31 {
 	status = "okay";
-	hw-flow-control;
 };
diff --git a/tests/drivers/watchdog/wdt_error_cases/testcase.yaml b/tests/drivers/watchdog/wdt_error_cases/testcase.yaml
index 3a3dbf94358..738008c754e 100644
--- a/tests/drivers/watchdog/wdt_error_cases/testcase.yaml
+++ b/tests/drivers/watchdog/wdt_error_cases/testcase.yaml
@@ -8,10 +8,10 @@ common:
 tests:
   drivers.watchdog.wdt_error_cases:
     platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
       - nrf9280pdk/nrf9280/cpuapp
       - nrf9280pdk/nrf9280/cpurad
     integration_platforms:
-      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp
diff --git a/tests/subsys/fs/fcb/testcase.yaml b/tests/subsys/fs/fcb/testcase.yaml
index 5ec3bbf2a19..19e47e33a1b 100644
--- a/tests/subsys/fs/fcb/testcase.yaml
+++ b/tests/subsys/fs/fcb/testcase.yaml
@@ -14,7 +14,6 @@ tests:
       - nrf52840dk/nrf52840
   filesystem.fcb.no_erase:
     platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
   filesystem.fcb.native_sim.no_erase:
     extra_args: CONFIG_FLASH_SIMULATOR_EXPLICIT_ERASE=n
diff --git a/tests/subsys/fs/littlefs/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/subsys/fs/littlefs/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 292e98c96a0..00000000000
--- a/tests/subsys/fs/littlefs/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/delete-node/ &slot0_ns_partition;
-/delete-node/ &slot1_partition;
-/delete-node/ &slot1_ns_partition;
-
-&cpuapp_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		small_partition: partition@67000 {
-			label = "small";
-			reg = <0x00067000 0x00010000>;
-		};
-	};
-};
diff --git a/tests/subsys/fs/littlefs/testcase.yaml b/tests/subsys/fs/littlefs/testcase.yaml
index 49f19492ab4..e934ac5b9d8 100644
--- a/tests/subsys/fs/littlefs/testcase.yaml
+++ b/tests/subsys/fs/littlefs/testcase.yaml
@@ -15,7 +15,7 @@ common:
 tests:
   filesystem.littlefs.default:
     timeout: 60
-    platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
+    platform_allow: nrf54l15pdk/nrf54l15/cpuapp
   filesystem.littlefs.custom:
     timeout: 180
     extra_configs:
diff --git a/tests/subsys/storage/stream/stream_flash/testcase.yaml b/tests/subsys/storage/stream/stream_flash/testcase.yaml
index 9d42d9c3182..60408fceaba 100644
--- a/tests/subsys/storage/stream/stream_flash/testcase.yaml
+++ b/tests/subsys/storage/stream/stream_flash/testcase.yaml
@@ -21,7 +21,6 @@ tests:
     tags: stream_flash
   storage.stream_flash.no_explicit_erase:
     platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
   storage.stream_flash.dword_wbs:
     extra_args: DTC_OVERLAY_FILE=unaligned_flush.overlay

From 6d723c5be2e194b16816fa9cbc43f76859325529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:02 +0100
Subject: [PATCH 1918/2913] Revert "[nrf fromtree] manifest: Update nRF hw
 models to latest"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0cd71d808f8a34d09e1d4efc95ea6c1af9218829.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 1265f9cca33..78533e8b51f 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: eeed2591d38e5e9bf89658df67555f2777249fc0
+      revision: bf8e45bd1f870e49cc15392e045c28d54ea12285
       path: modules/bsim_hw_models/nrf_hw_models
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719

From b98a1eea16b40a5e76a48549664844c8ac948c33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:02 +0100
Subject: [PATCH 1919/2913] Revert "[nrf fromtree] usb: device_next: USB reset
 clears remote wakeup permission"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fb127b2cdc4d0fc6ed53089dee0cdb9579d68fd4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/usb/device_next/usbd_core.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/subsys/usb/device_next/usbd_core.c b/subsys/usb/device_next/usbd_core.c
index 2502357bf8c..e6f1cf1faee 100644
--- a/subsys/usb/device_next/usbd_core.c
+++ b/subsys/usb/device_next/usbd_core.c
@@ -127,8 +127,6 @@ static int event_handler_bus_reset(struct usbd_context *const uds_ctx)
 
 	uds_ctx->ch9_data.state = USBD_STATE_DEFAULT;
 
-	uds_ctx->status.rwup = false;
-
 	return 0;
 }
 

From d57d9713d1acd9528cb460a33887dc0248673d63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:02 +0100
Subject: [PATCH 1920/2913] Revert "[nrf fromtree] usb: device_next: use
 delayable work for TX FIFO in CDC ACM"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0eff7178460de727baf47aa826a5f9486ef86a93.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/usb/device_next/class/usbd_cdc_acm.c | 25 ++++++---------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/subsys/usb/device_next/class/usbd_cdc_acm.c b/subsys/usb/device_next/class/usbd_cdc_acm.c
index 80f4a858386..1d683fa3cc4 100644
--- a/subsys/usb/device_next/class/usbd_cdc_acm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_acm.c
@@ -109,7 +109,7 @@ struct cdc_acm_uart_data {
 	 */
 	bool flow_ctrl;
 	/* USBD CDC ACM TX fifo work */
-	struct k_work_delayable tx_fifo_work;
+	struct k_work tx_fifo_work;
 	/* USBD CDC ACM RX fifo work */
 	struct k_work rx_fifo_work;
 	atomic_t state;
@@ -140,12 +140,6 @@ static ALWAYS_INLINE int cdc_acm_work_submit(struct k_work *work)
 	return k_work_submit_to_queue(&cdc_acm_work_q, work);
 }
 
-static ALWAYS_INLINE int cdc_acm_work_schedule(struct k_work_delayable *work,
-					       k_timeout_t delay)
-{
-	return k_work_schedule_for_queue(&cdc_acm_work_q, work, delay);
-}
-
 static ALWAYS_INLINE bool check_wq_ctx(const struct device *dev)
 {
 	return k_current_get() == k_work_queue_thread_get(&cdc_acm_work_q);
@@ -283,7 +277,7 @@ static void usbd_cdc_acm_enable(struct usbd_class_data *const c_data)
 			cdc_acm_work_submit(&data->irq_cb_work);
 		} else {
 			/* Queue pending TX data on IN endpoint */
-			cdc_acm_work_schedule(&data->tx_fifo_work, K_NO_WAIT);
+			cdc_acm_work_submit(&data->tx_fifo_work);
 		}
 	}
 }
@@ -526,14 +520,13 @@ static int cdc_acm_send_notification(const struct device *dev,
  */
 static void cdc_acm_tx_fifo_handler(struct k_work *work)
 {
-	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
 	struct cdc_acm_uart_data *data;
 	struct usbd_class_data *c_data;
 	struct net_buf *buf;
 	size_t len;
 	int ret;
 
-	data = CONTAINER_OF(dwork, struct cdc_acm_uart_data, tx_fifo_work);
+	data = CONTAINER_OF(work, struct cdc_acm_uart_data, tx_fifo_work);
 	c_data = data->c_data;
 
 	if (!atomic_test_bit(&data->state, CDC_ACM_CLASS_ENABLED)) {
@@ -548,7 +541,7 @@ static void cdc_acm_tx_fifo_handler(struct k_work *work)
 
 	buf = cdc_acm_buf_alloc(cdc_acm_get_bulk_in(c_data));
 	if (buf == NULL) {
-		cdc_acm_work_schedule(&data->tx_fifo_work, K_MSEC(1));
+		cdc_acm_work_submit(&data->tx_fifo_work);
 		return;
 	}
 
@@ -826,7 +819,7 @@ static void cdc_acm_irq_cb_handler(struct k_work *work)
 
 	if (data->tx_fifo.altered) {
 		LOG_DBG("tx fifo altered, submit work");
-		cdc_acm_work_schedule(&data->tx_fifo_work, K_NO_WAIT);
+		cdc_acm_work_submit(&data->tx_fifo_work);
 	}
 
 	if (atomic_test_bit(&data->state, CDC_ACM_IRQ_RX_ENABLED) &&
@@ -894,11 +887,7 @@ static void cdc_acm_poll_out(const struct device *dev, const unsigned char c)
 		k_msleep(1);
 	}
 
-	/* Schedule with minimal timeout to make it possible to send more than
-	 * one byte per USB transfer. The latency increase is negligible while
-	 * the increased throughput and reduced CPU usage is easily observable.
-	 */
-	cdc_acm_work_schedule(&data->tx_fifo_work, K_MSEC(1));
+	cdc_acm_work_submit(&data->tx_fifo_work);
 }
 
 #ifdef CONFIG_UART_LINE_CTRL
@@ -1017,7 +1006,7 @@ static int usbd_cdc_acm_preinit(const struct device *dev)
 
 	k_thread_name_set(&cdc_acm_work_q.thread, "cdc_acm_work_q");
 
-	k_work_init_delayable(&data->tx_fifo_work, cdc_acm_tx_fifo_handler);
+	k_work_init(&data->tx_fifo_work, cdc_acm_tx_fifo_handler);
 	k_work_init(&data->rx_fifo_work, cdc_acm_rx_fifo_handler);
 	k_work_init(&data->irq_cb_work, cdc_acm_irq_cb_handler);
 

From da11a00d64c433909e7136a650756d93ec94309c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:02 +0100
Subject: [PATCH 1921/2913] Revert "[nrf fromtree] usb: device_next: limit CDC
 ACM OUT transfer size to the current MPS"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2a864794f5067e04c5886fc4c706348f66a2495d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/usb/device_next/class/usbd_cdc_acm.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/subsys/usb/device_next/class/usbd_cdc_acm.c b/subsys/usb/device_next/class/usbd_cdc_acm.c
index 1d683fa3cc4..e67b27ad037 100644
--- a/subsys/usb/device_next/class/usbd_cdc_acm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_acm.c
@@ -596,9 +596,6 @@ static void cdc_acm_rx_fifo_handler(struct k_work *work)
 		return;
 	}
 
-	/* Shrink the buffer size if operating on a full speed bus */
-	buf->size = MIN(cdc_acm_get_bulk_mps(c_data), buf->size);
-
 	ret = usbd_ep_enqueue(c_data, buf);
 	if (ret) {
 		LOG_ERR("Failed to enqueue net_buf for 0x%02x", ep);

From 8198f14ed8898225b0a1d153c118a0033a1160a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:02 +0100
Subject: [PATCH 1922/2913] Revert "[nrf fromtree] doc: usb: add note about CDC
 ACM virtual UART polling API behavior"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ca795aa72d7165613118b69aa38c114cad90f436.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/connectivity/usb/device_next/usb_device.rst | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/doc/connectivity/usb/device_next/usb_device.rst b/doc/connectivity/usb/device_next/usb_device.rst
index 7e7762997a0..d658c75180a 100644
--- a/doc/connectivity/usb/device_next/usb_device.rst
+++ b/doc/connectivity/usb/device_next/usb_device.rst
@@ -282,10 +282,3 @@ connected to the host. If there is space in the TX FIFO, and the TX interrupt
 is enabled, :c:func:`uart_irq_tx_ready()` will succeed. If there is data in the
 RX FIFO, and the RX interrupt is enabled, :c:func:`uart_irq_rx_ready()` will
 succeed. Function :c:func:`uart_irq_tx_complete()` is not implemented yet.
-
-Polling UART API
-----------------
-
-The CDC ACM poll out implementation follows :ref:`uart_polling_api` and
-blocks when the TX FIFO is full only if the hw-flow-control property is enabled
-and called from a non-ISR context.

From ed40e6961030dec759a055c6ea16bf3b39556c3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:02 +0100
Subject: [PATCH 1923/2913] Revert "[nrf fromtree] usb: device_next: allow
 fifo_fill and poll_out be used simultaneously"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e824e3bb66c811ff53958fd84c90c12d6fffa543.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/usb/device_next/class/usbd_cdc_acm.c | 39 +++++++++++++++++----
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/subsys/usb/device_next/class/usbd_cdc_acm.c b/subsys/usb/device_next/class/usbd_cdc_acm.c
index e67b27ad037..36154e16313 100644
--- a/subsys/usb/device_next/class/usbd_cdc_acm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_acm.c
@@ -47,6 +47,7 @@ UDC_BUF_POOL_DEFINE(cdc_acm_ep_pool,
 #define CDC_ACM_IRQ_RX_ENABLED		2
 #define CDC_ACM_IRQ_TX_ENABLED		3
 #define CDC_ACM_RX_FIFO_BUSY		4
+#define CDC_ACM_LOCK			5
 
 static struct k_work_q cdc_acm_work_q;
 static K_KERNEL_STACK_DEFINE(cdc_acm_stack,
@@ -539,10 +540,15 @@ static void cdc_acm_tx_fifo_handler(struct k_work *work)
 		return;
 	}
 
+	if (atomic_test_and_set_bit(&data->state, CDC_ACM_LOCK)) {
+		cdc_acm_work_submit(&data->tx_fifo_work);
+		return;
+	}
+
 	buf = cdc_acm_buf_alloc(cdc_acm_get_bulk_in(c_data));
 	if (buf == NULL) {
 		cdc_acm_work_submit(&data->tx_fifo_work);
-		return;
+		goto tx_fifo_handler_exit;
 	}
 
 	len = ring_buf_get(data->tx_fifo.rb, buf->data, buf->size);
@@ -553,6 +559,9 @@ static void cdc_acm_tx_fifo_handler(struct k_work *work)
 		LOG_ERR("Failed to enqueue");
 		net_buf_unref(buf);
 	}
+
+tx_fifo_handler_exit:
+	atomic_clear_bit(&data->state, CDC_ACM_LOCK);
 }
 
 /*
@@ -799,6 +808,12 @@ static void cdc_acm_irq_cb_handler(struct k_work *work)
 		return;
 	}
 
+	if (atomic_test_and_set_bit(&data->state, CDC_ACM_LOCK)) {
+		LOG_ERR("Polling is in progress");
+		cdc_acm_work_submit(&data->irq_cb_work);
+		return;
+	}
+
 	data->tx_fifo.altered = false;
 	data->rx_fifo.altered = false;
 	data->rx_fifo.irq = false;
@@ -830,6 +845,8 @@ static void cdc_acm_irq_cb_handler(struct k_work *work)
 		LOG_DBG("tx irq pending, submit irq_cb_work");
 		cdc_acm_work_submit(&data->irq_cb_work);
 	}
+
+	atomic_clear_bit(&data->state, CDC_ACM_LOCK);
 }
 
 static void cdc_acm_irq_callback_set(const struct device *dev,
@@ -848,8 +865,13 @@ static int cdc_acm_poll_in(const struct device *dev, unsigned char *const c)
 	uint32_t len;
 	int ret = -1;
 
+	if (atomic_test_and_set_bit(&data->state, CDC_ACM_LOCK)) {
+		LOG_ERR("IRQ callback is used");
+		return -1;
+	}
+
 	if (ring_buf_is_empty(data->rx_fifo.rb)) {
-		return ret;
+		goto poll_in_exit;
 	}
 
 	len = ring_buf_get(data->rx_fifo.rb, c, 1);
@@ -858,20 +880,24 @@ static int cdc_acm_poll_in(const struct device *dev, unsigned char *const c)
 		ret = 0;
 	}
 
+poll_in_exit:
+	atomic_clear_bit(&data->state, CDC_ACM_LOCK);
+
 	return ret;
 }
 
 static void cdc_acm_poll_out(const struct device *dev, const unsigned char c)
 {
 	struct cdc_acm_uart_data *const data = dev->data;
-	unsigned int lock;
 	uint32_t wrote;
 
+	if (atomic_test_and_set_bit(&data->state, CDC_ACM_LOCK)) {
+		LOG_ERR("IRQ callback is used");
+		return;
+	}
+
 	while (true) {
-		lock = irq_lock();
 		wrote = ring_buf_put(data->tx_fifo.rb, &c, 1);
-		irq_unlock(lock);
-
 		if (wrote == 1) {
 			break;
 		}
@@ -884,6 +910,7 @@ static void cdc_acm_poll_out(const struct device *dev, const unsigned char c)
 		k_msleep(1);
 	}
 
+	atomic_clear_bit(&data->state, CDC_ACM_LOCK);
 	cdc_acm_work_submit(&data->tx_fifo_work);
 }
 

From 629e57484627ecd5361c72f30dcb2b8a825e5f59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:02 +0100
Subject: [PATCH 1924/2913] Revert "[nrf fromtree] usb: device_next: align CDC
 ACM UART poll_out with legacy implementation"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit eb97a970c70308acc98444f3c64de2aa160c66a8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/usb/device_next/class/usbd_cdc_acm.c | 52 +++++++++------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/subsys/usb/device_next/class/usbd_cdc_acm.c b/subsys/usb/device_next/class/usbd_cdc_acm.c
index 36154e16313..83735e202a6 100644
--- a/subsys/usb/device_next/class/usbd_cdc_acm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_acm.c
@@ -105,10 +105,6 @@ struct cdc_acm_uart_data {
 	struct k_work irq_cb_work;
 	struct cdc_acm_uart_fifo rx_fifo;
 	struct cdc_acm_uart_fifo tx_fifo;
-	/* When flow_ctrl is set, poll out is blocked when the buffer is full,
-	 * roughly emulating flow control.
-	 */
-	bool flow_ctrl;
 	/* USBD CDC ACM TX fifo work */
 	struct k_work tx_fifo_work;
 	/* USBD CDC ACM RX fifo work */
@@ -377,8 +373,7 @@ static void cdc_acm_update_uart_cfg(struct cdc_acm_uart_data *const data)
 		break;
 	};
 
-	cfg->flow_ctrl = data->flow_ctrl ? UART_CFG_FLOW_CTRL_RTS_CTS :
-					   UART_CFG_FLOW_CTRL_NONE;
+	cfg->flow_ctrl = UART_CFG_FLOW_CTRL_NONE;
 }
 
 static void cdc_acm_update_linestate(struct cdc_acm_uart_data *const data)
@@ -889,27 +884,24 @@ static int cdc_acm_poll_in(const struct device *dev, unsigned char *const c)
 static void cdc_acm_poll_out(const struct device *dev, const unsigned char c)
 {
 	struct cdc_acm_uart_data *const data = dev->data;
-	uint32_t wrote;
 
 	if (atomic_test_and_set_bit(&data->state, CDC_ACM_LOCK)) {
 		LOG_ERR("IRQ callback is used");
 		return;
 	}
 
-	while (true) {
-		wrote = ring_buf_put(data->tx_fifo.rb, &c, 1);
-		if (wrote == 1) {
-			break;
-		}
-
-		if (k_is_in_isr() || !data->flow_ctrl) {
-			LOG_WRN_ONCE("Ring buffer full, discard data");
-			break;
-		}
+	if (ring_buf_put(data->tx_fifo.rb, &c, 1)) {
+		goto poll_out_exit;
+	}
 
-		k_msleep(1);
+	LOG_DBG("Ring buffer full, drain buffer");
+	if (!ring_buf_get(data->tx_fifo.rb, NULL, 1) ||
+	    !ring_buf_put(data->tx_fifo.rb, &c, 1)) {
+		LOG_ERR("Failed to drain buffer");
+		__ASSERT_NO_MSG(false);
 	}
 
+poll_out_exit:
 	atomic_clear_bit(&data->state, CDC_ACM_LOCK);
 	cdc_acm_work_submit(&data->tx_fifo_work);
 }
@@ -984,18 +976,17 @@ static int cdc_acm_line_ctrl_get(const struct device *dev,
 static int cdc_acm_configure(const struct device *dev,
 			     const struct uart_config *const cfg)
 {
-	struct cdc_acm_uart_data *const data = dev->data;
-
-	switch (cfg->flow_ctrl) {
-	case UART_CFG_FLOW_CTRL_NONE:
-		data->flow_ctrl = false;
-		break;
-	case UART_CFG_FLOW_CTRL_RTS_CTS:
-		data->flow_ctrl = true;
-		break;
-	default:
-		return -ENOTSUP;
-	}
+	ARG_UNUSED(dev);
+	ARG_UNUSED(cfg);
+	/*
+	 * We cannot implement configure API because there is
+	 * no notification of configuration changes provided
+	 * for the Abstract Control Model and the UART controller
+	 * is only emulated.
+	 * However, it allows us to use CDC ACM UART together with
+	 * subsystems like Modbus which require configure API for
+	 * real controllers.
+	 */
 
 	return 0;
 }
@@ -1249,7 +1240,6 @@ const static struct usb_desc_header *cdc_acm_hs_desc_##n[] = {			\
 		.c_data = &cdc_acm_##n,						\
 		.rx_fifo.rb = &cdc_acm_rb_rx_##n,				\
 		.tx_fifo.rb = &cdc_acm_rb_tx_##n,				\
-		.flow_ctrl = DT_INST_PROP(n, hw_flow_control),			\
 		.notif_sem = Z_SEM_INITIALIZER(uart_data_##n.notif_sem, 0, 1),	\
 		.desc = &cdc_acm_desc_##n,					\
 		.fs_desc = cdc_acm_fs_desc_##n,					\

From a824c1dfedfb7c18c75e502ba6cdf2898c90a4f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:02 +0100
Subject: [PATCH 1925/2913] Revert "[nrf fromtree] doc: usb: describe CDC ACM
 virtual UART IRQ API behavior"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 55236602c6973f11f7cbdc1c56bccd70cdd2cea9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../usb/device_next/usb_device.rst            | 59 -------------------
 1 file changed, 59 deletions(-)

diff --git a/doc/connectivity/usb/device_next/usb_device.rst b/doc/connectivity/usb/device_next/usb_device.rst
index d658c75180a..ea6eb69324c 100644
--- a/doc/connectivity/usb/device_next/usb_device.rst
+++ b/doc/connectivity/usb/device_next/usb_device.rst
@@ -223,62 +223,3 @@ instance (``n``) and is used as an argument to the :c:func:`usbd_register_class`
 +-----------------------------------+-------------------------+-------------------------+
 | Bluetooth HCI USB transport layer | :ref:`bt_hci_raw`       | :samp:`bt_hci_{n}`      |
 +-----------------------------------+-------------------------+-------------------------+
-
-CDC ACM UART
-============
-
-CDC ACM implements a virtual UART controller and provides Interrupt-driven UART
-API and Polling UART API.
-
-Interrupt-driven UART API
--------------------------
-
-Internally the implementation uses two ringbuffers, these take over the
-function of the TX/RX FIFOs (TX/RX buffers) from the :ref:`uart_interrupt_api`.
-
-As described in the :ref:`uart_interrupt_api`, the functions
-:c:func:`uart_irq_update()`, :c:func:`uart_irq_is_pending`,
-:c:func:`uart_irq_rx_ready()`, :c:func:`uart_irq_tx_ready()`
-:c:func:`uart_fifo_read()`, and :c:func:`uart_fifo_fill()`
-should be called from the interrupt handler, see
-:c:func:`uart_irq_callback_user_data_set()`. To prevent undefined behaviour,
-the implementation of these functions checks in what context they are called
-and fails if it is not an interrupt handler.
-
-Also, as described in the UART API, :c:func:`uart_irq_is_pending`
-:c:func:`uart_irq_rx_ready()`, and :c:func:`uart_irq_tx_ready()`
-can only be called after :c:func:`uart_irq_update()`.
-
-Simplified, the interrupt handler should look something like:
-
-.. code-block:: c
-
-   static void interrupt_handler(const struct device *dev, void *user_data)
-   {
-      while (uart_irq_update(dev) && uart_irq_is_pending(dev)) {
-         if (uart_irq_rx_ready(dev)) {
-            int len;
-            int n;
-
-            /* ... */
-            n = uart_fifo_read(dev, buffer, len);
-            /* ... */
-         }
-
-         if (uart_irq_tx_ready(dev)) {
-            int len;
-            int n;
-
-            /* ... */
-            n = uart_fifo_fill(dev, buffer, len);
-           /* ... */
-         }
-   }
-
-All these functions are not directly dependent on the status of the USB device.
-Filling the TX FIFO does not mean that data is being sent to the host. And
-successfully reading the RX FIFO does not mean that the device is still
-connected to the host. If there is space in the TX FIFO, and the TX interrupt
-is enabled, :c:func:`uart_irq_tx_ready()` will succeed. If there is data in the
-RX FIFO, and the RX interrupt is enabled, :c:func:`uart_irq_rx_ready()` will
-succeed. Function :c:func:`uart_irq_tx_complete()` is not implemented yet.

From fd3422462d233eb0011c78d10e90bc2df80a50c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:02 +0100
Subject: [PATCH 1926/2913] Revert "[nrf fromtree] usb: device_next: align CDC
 ACM UART with Interrupt-driven UART API"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e827f9ad147821874bfdb7801336ee1d8a6b518a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/usb/device_next/class/usbd_cdc_acm.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/subsys/usb/device_next/class/usbd_cdc_acm.c b/subsys/usb/device_next/class/usbd_cdc_acm.c
index 83735e202a6..acb17ed446f 100644
--- a/subsys/usb/device_next/class/usbd_cdc_acm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_acm.c
@@ -269,7 +269,7 @@ static void usbd_cdc_acm_enable(struct usbd_class_data *const c_data)
 	}
 
 	if (atomic_test_bit(&data->state, CDC_ACM_IRQ_TX_ENABLED)) {
-		if (ring_buf_space_get(data->tx_fifo.rb)) {
+		if (ring_buf_is_empty(data->tx_fifo.rb)) {
 			/* Raise TX ready interrupt */
 			cdc_acm_work_submit(&data->irq_cb_work);
 		} else {
@@ -613,7 +613,7 @@ static void cdc_acm_irq_tx_enable(const struct device *dev)
 
 	atomic_set_bit(&data->state, CDC_ACM_IRQ_TX_ENABLED);
 
-	if (ring_buf_space_get(data->tx_fifo.rb)) {
+	if (ring_buf_is_empty(data->tx_fifo.rb)) {
 		LOG_INF("tx_en: trigger irq_cb_work");
 		cdc_acm_work_submit(&data->irq_cb_work);
 	}
@@ -707,9 +707,7 @@ static int cdc_acm_irq_tx_ready(const struct device *dev)
 	struct cdc_acm_uart_data *const data = dev->data;
 
 	if (check_wq_ctx(dev)) {
-		if (data->tx_fifo.irq) {
-			return ring_buf_space_get(data->tx_fifo.rb);
-		}
+		return ring_buf_space_get(data->tx_fifo.rb);
 	} else {
 		LOG_WRN("Invoked by inappropriate context");
 		__ASSERT_NO_MSG(false);
@@ -723,7 +721,7 @@ static int cdc_acm_irq_rx_ready(const struct device *dev)
 	struct cdc_acm_uart_data *const data = dev->data;
 
 	if (check_wq_ctx(dev)) {
-		if (data->rx_fifo.irq) {
+		if (!ring_buf_is_empty(data->rx_fifo.rb)) {
 			return 1;
 		}
 	} else {
@@ -769,7 +767,7 @@ static int cdc_acm_irq_update(const struct device *dev)
 	}
 
 	if (atomic_test_bit(&data->state, CDC_ACM_IRQ_TX_ENABLED) &&
-	    ring_buf_space_get(data->tx_fifo.rb)) {
+	    ring_buf_is_empty(data->tx_fifo.rb)) {
 		data->tx_fifo.irq = true;
 	} else {
 		data->tx_fifo.irq = false;
@@ -836,7 +834,7 @@ static void cdc_acm_irq_cb_handler(struct k_work *work)
 	}
 
 	if (atomic_test_bit(&data->state, CDC_ACM_IRQ_TX_ENABLED) &&
-	    ring_buf_space_get(data->tx_fifo.rb)) {
+	    ring_buf_is_empty(data->tx_fifo.rb)) {
 		LOG_DBG("tx irq pending, submit irq_cb_work");
 		cdc_acm_work_submit(&data->irq_cb_work);
 	}

From 62d6c059c612143416fb7835971b90a5bb2011e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:02 +0100
Subject: [PATCH 1927/2913] Revert "[nrf fromtree] doc: usb: move "Built-in
 functions" down  and increase the heading"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0f18858011a0ea2f5a9f4a869757695bc6bd8ae9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../usb/device_next/usb_device.rst            | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/doc/connectivity/usb/device_next/usb_device.rst b/doc/connectivity/usb/device_next/usb_device.rst
index ea6eb69324c..1213c85fb51 100644
--- a/doc/connectivity/usb/device_next/usb_device.rst
+++ b/doc/connectivity/usb/device_next/usb_device.rst
@@ -23,6 +23,31 @@ classes and provides an API to implement custom USB functions.
 The new USB device support is considered experimental and will replace
 :ref:`usb_device_stack`.
 
+Built-in functions
+==================
+
+The USB device stack has built-in USB functions. Some can be used directly in
+the user application through a special API, such as HID or Audio class devices,
+while others use a general Zephyr RTOS driver API, such as MSC and CDC class
+implementations. The *Identification string* identifies a class or function
+instance (``n``) and is used as an argument to the :c:func:`usbd_register_class`.
+
++-----------------------------------+-------------------------+-------------------------+
+| Class or function                 | User API (if any)       | Identification string   |
++===================================+=========================+=========================+
+| USB Audio 2 class                 | :ref:`uac2_device`      | :samp:`uac2_{n}`        |
++-----------------------------------+-------------------------+-------------------------+
+| USB CDC ACM class                 | :ref:`uart_api`         | :samp:`cdc_acm_{n}`     |
++-----------------------------------+-------------------------+-------------------------+
+| USB CDC ECM class                 | Ethernet device         | :samp:`cdc_ecm_{n}`     |
++-----------------------------------+-------------------------+-------------------------+
+| USB Mass Storage Class (MSC)      | :ref:`usbd_msc_device`  | :samp:`msc_{n}`         |
++-----------------------------------+-------------------------+-------------------------+
+| USB Human Interface Devices (HID) | :ref:`usbd_hid_device`  | :samp:`hid_{n}`         |
++-----------------------------------+-------------------------+-------------------------+
+| Bluetooth HCI USB transport layer | :ref:`bt_hci_raw`       | :samp:`bt_hci_{n}`      |
++-----------------------------------+-------------------------+-------------------------+
+
 Samples
 =======
 
@@ -198,28 +223,3 @@ for this capability.
    :dedent:
    :start-after: doc device msg-cb start
    :end-before: doc device msg-cb end
-
-Built-in functions
-******************
-
-The USB device stack has built-in USB functions. Some can be used directly in
-the user application through a special API, such as HID or Audio class devices,
-while others use a general Zephyr RTOS driver API, such as MSC and CDC class
-implementations. The *Identification string* identifies a class or function
-instance (``n``) and is used as an argument to the :c:func:`usbd_register_class`.
-
-+-----------------------------------+-------------------------+-------------------------+
-| Class or function                 | User API (if any)       | Identification string   |
-+===================================+=========================+=========================+
-| USB Audio 2 class                 | :ref:`uac2_device`      | :samp:`uac2_{n}`        |
-+-----------------------------------+-------------------------+-------------------------+
-| USB CDC ACM class                 | :ref:`uart_api`         | :samp:`cdc_acm_{n}`     |
-+-----------------------------------+-------------------------+-------------------------+
-| USB CDC ECM class                 | Ethernet device         | :samp:`cdc_ecm_{n}`     |
-+-----------------------------------+-------------------------+-------------------------+
-| USB Mass Storage Class (MSC)      | :ref:`usbd_msc_device`  | :samp:`msc_{n}`         |
-+-----------------------------------+-------------------------+-------------------------+
-| USB Human Interface Devices (HID) | :ref:`usbd_hid_device`  | :samp:`hid_{n}`         |
-+-----------------------------------+-------------------------+-------------------------+
-| Bluetooth HCI USB transport layer | :ref:`bt_hci_raw`       | :samp:`bt_hci_{n}`      |
-+-----------------------------------+-------------------------+-------------------------+

From 122d314987f0dc5a69ebb47f509ceed598d1f5fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:02 +0100
Subject: [PATCH 1928/2913] Revert "[nrf fromtree] serial: uart_nrfx_*: update
 `tx_ready` return codes"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6f66b837a5e940b45236644023222e7fd55bfb97.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/uart_nrfx_uart.c  | 9 ++++-----
 drivers/serial/uart_nrfx_uarte.c | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uart.c b/drivers/serial/uart_nrfx_uart.c
index 9fa634fe01f..25dab17ea74 100644
--- a/drivers/serial/uart_nrfx_uart.c
+++ b/drivers/serial/uart_nrfx_uart.c
@@ -878,11 +878,10 @@ static int uart_nrfx_irq_tx_ready_complete(const struct device *dev)
 	 * called after the TX interrupt is requested to be disabled but before
 	 * the disabling is actually performed (in the IRQ handler).
 	 */
-	bool ready = nrf_uart_int_enable_check(uart0_addr,
-					       NRF_UART_INT_MASK_TXDRDY) &&
-		     !disable_tx_irq &&
-		     event_txdrdy_check();
-	return ready ? 1 : 0;
+	return nrf_uart_int_enable_check(uart0_addr,
+					 NRF_UART_INT_MASK_TXDRDY) &&
+	       !disable_tx_irq &&
+	       event_txdrdy_check();
 }
 
 /** Interrupt driven receiver ready function */
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 00225464f37..97edddbf278 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -1646,7 +1646,7 @@ static int uarte_nrfx_irq_tx_ready_complete(const struct device *dev)
 		data->int_driven->fifo_fill_lock = 0;
 	}
 
-	return ready ? data->int_driven->tx_buff_size : 0;
+	return ready;
 }
 
 static int uarte_nrfx_irq_rx_ready(const struct device *dev)

From 7297e09a11e9572362075f71c7e4d54c21ae67d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:02 +0100
Subject: [PATCH 1929/2913] Revert "[nrf fromtree] serial: async_to_irq: update
 `tx_ready` return"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 52f9d7771e0f6724121dfd06c594cf1d97ea8192.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/uart_async_to_irq.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/serial/uart_async_to_irq.c b/drivers/serial/uart_async_to_irq.c
index b67dd6505aa..897ff50fcb5 100644
--- a/drivers/serial/uart_async_to_irq.c
+++ b/drivers/serial/uart_async_to_irq.c
@@ -263,10 +263,8 @@ void z_uart_async_to_irq_irq_tx_disable(const struct device *dev)
 int z_uart_async_to_irq_irq_tx_ready(const struct device *dev)
 {
 	struct uart_async_to_irq_data *data = get_data(dev);
-	bool ready = (data->flags & A2I_TX_IRQ_ENABLED) && !(data->flags & A2I_TX_BUSY);
 
-	/* async API handles arbitrary sizes */
-	return ready ? data->tx.len : 0;
+	return (data->flags & A2I_TX_IRQ_ENABLED) && !(data->flags & A2I_TX_BUSY);
 }
 
 /** Interrupt driven receiver enabling function */

From d205ca8813f4a61a728bd12bb1b6ae28f7a8b622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:02 +0100
Subject: [PATCH 1930/2913] Revert "[nrf fromtree] serial/usb: update `struct
 ring_buf` users"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 14559ece2402c6c709530e1fe3aedf6f24441bd4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/serial/serial_test.c                | 6 +++---
 drivers/serial/uart_emul.c                  | 6 +++---
 subsys/usb/device/class/cdc_acm.c           | 2 +-
 subsys/usb/device_next/class/usbd_cdc_acm.c | 4 +++-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/serial/serial_test.c b/drivers/serial/serial_test.c
index f04f5eee702..b1bb46228be 100644
--- a/drivers/serial/serial_test.c
+++ b/drivers/serial/serial_test.c
@@ -130,10 +130,10 @@ static void irq_tx_disable(const struct device *dev)
 static int irq_tx_ready(const struct device *dev)
 {
 	struct serial_vnd_data *data = dev->data;
-	int available = ring_buf_space_get(data->written);
+	bool ready = (ring_buf_space_get(data->written) != 0);
 
-	LOG_DBG("tx ready: %d", available);
-	return available;
+	LOG_DBG("tx ready: %d", ready);
+	return ready;
 }
 
 static void irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb,
diff --git a/drivers/serial/uart_emul.c b/drivers/serial/uart_emul.c
index a00f10486b1..f0207377737 100644
--- a/drivers/serial/uart_emul.c
+++ b/drivers/serial/uart_emul.c
@@ -231,7 +231,7 @@ static int uart_emul_fifo_read(const struct device *dev, uint8_t *rx_data, int s
 
 static int uart_emul_irq_tx_ready(const struct device *dev)
 {
-	int available = 0;
+	bool ready = false;
 	struct uart_emul_data *data = dev->data;
 
 	K_SPINLOCK(&data->tx_lock) {
@@ -239,10 +239,10 @@ static int uart_emul_irq_tx_ready(const struct device *dev)
 			K_SPINLOCK_BREAK;
 		}
 
-		available = ring_buf_space_get(data->tx_rb);
+		ready = ring_buf_space_get(data->tx_rb) > 0;
 	}
 
-	return available;
+	return ready;
 }
 
 static int uart_emul_irq_rx_ready(const struct device *dev)
diff --git a/subsys/usb/device/class/cdc_acm.c b/subsys/usb/device/class/cdc_acm.c
index 5cc73f7bae9..130e571b0f6 100644
--- a/subsys/usb/device/class/cdc_acm.c
+++ b/subsys/usb/device/class/cdc_acm.c
@@ -622,7 +622,7 @@ static int cdc_acm_irq_tx_ready(const struct device *dev)
 	struct cdc_acm_dev_data_t * const dev_data = dev->data;
 
 	if (dev_data->tx_irq_ena && dev_data->tx_ready) {
-		return ring_buf_space_get(dev_data->tx_ringbuf);
+		return 1;
 	}
 
 	return 0;
diff --git a/subsys/usb/device_next/class/usbd_cdc_acm.c b/subsys/usb/device_next/class/usbd_cdc_acm.c
index acb17ed446f..eb0abb803ce 100644
--- a/subsys/usb/device_next/class/usbd_cdc_acm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_acm.c
@@ -707,7 +707,9 @@ static int cdc_acm_irq_tx_ready(const struct device *dev)
 	struct cdc_acm_uart_data *const data = dev->data;
 
 	if (check_wq_ctx(dev)) {
-		return ring_buf_space_get(data->tx_fifo.rb);
+		if (ring_buf_space_get(data->tx_fifo.rb)) {
+			return 1;
+		}
 	} else {
 		LOG_WRN("Invoked by inappropriate context");
 		__ASSERT_NO_MSG(false);

From 0d8c9881b02dd4d806a25f2740dc0d968da57f51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:02 +0100
Subject: [PATCH 1931/2913] Revert "[nrf fromtree] uart: update meaning of
 `uart_irq_tx_ready` return code"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 38b4e79d9ac76c6c74c7944b119850ada052b93c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/releases/migration-guide-4.0.rst |  4 ----
 include/zephyr/drivers/uart.h        | 10 ++++------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/doc/releases/migration-guide-4.0.rst b/doc/releases/migration-guide-4.0.rst
index 3699a7fedcb..f8a47907859 100644
--- a/doc/releases/migration-guide-4.0.rst
+++ b/doc/releases/migration-guide-4.0.rst
@@ -153,10 +153,6 @@ Sensors
 Serial
 ======
 
- * Users of :c:func:`uart_irq_tx_ready` now need to check for ``ret > 0`` to ensure that the FIFO
-   can accept data bytes, instead of ``ret == 1``. The function now returns a lower bound on the
-   number of bytes that can be provided to :c:func:`uart_fifo_fill` without truncation.
-
 Regulator
 =========
 
diff --git a/include/zephyr/drivers/uart.h b/include/zephyr/drivers/uart.h
index 7d56a78b056..845949ea964 100644
--- a/include/zephyr/drivers/uart.h
+++ b/include/zephyr/drivers/uart.h
@@ -902,9 +902,9 @@ static inline void z_impl_uart_irq_tx_disable(const struct device *dev)
 }
 
 /**
- * @brief Check if UART TX buffer can accept bytes
+ * @brief Check if UART TX buffer can accept a new char
  *
- * @details Check if UART TX buffer can accept more bytes
+ * @details Check if UART TX buffer can accept at least one character
  * for transmission (i.e. uart_fifo_fill() will succeed and return
  * non-zero). This function must be called in a UART interrupt
  * handler, or its result is undefined. Before calling this function
@@ -913,11 +913,9 @@ static inline void z_impl_uart_irq_tx_disable(const struct device *dev)
  *
  * @param dev UART device instance.
  *
+ * @retval 1 If TX interrupt is enabled and at least one char can be
+ *           written to UART.
  * @retval 0 If device is not ready to write a new byte.
- * @retval >0 Minimum number of bytes that can be written in a single call to
- *            @ref uart_fifo_fill. It may be possible to write more bytes, but
- *            the actual number written must be checked in the return code from
- *            @ref uart_fifo_fill.
  * @retval -ENOSYS If this function is not implemented.
  * @retval -ENOTSUP If API is not enabled.
  */

From db391c43179d2a74cb173543e7233e32c965c995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:02 +0100
Subject: [PATCH 1932/2913] Revert "[nrf fromtree] drivers: udc_dwc2: Change
 hibernation exit on bus reset"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ed7f64c9b689c813486acca99c84d1edf3902656.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 917910ad26d..91cbaba8f53 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -904,7 +904,7 @@ static void dwc2_backup_registers(const struct device *dev)
 }
 
 static void dwc2_restore_essential_registers(const struct device *dev,
-					     bool rwup, bool bus_reset)
+					     bool rwup)
 {
 	const struct udc_dwc2_config *const config = dev->config;
 	struct usb_dwc2_reg *const base = config->base;
@@ -925,10 +925,6 @@ static void dwc2_restore_essential_registers(const struct device *dev,
 	sys_write32(backup->gusbcfg, (mem_addr_t)&base->gusbcfg);
 	sys_write32(backup->dcfg, (mem_addr_t)&base->dcfg);
 
-	if (bus_reset) {
-		sys_write32(backup->dcfg, (mem_addr_t)&base->dcfg);
-	}
-
 	if (!rwup) {
 		pcgcctl |= USB_DWC2_PCGCCTL_RESTOREMODE | USB_DWC2_PCGCCTL_RSTPDWNMODULE;
 	}
@@ -1030,8 +1026,7 @@ static void dwc2_enter_hibernation(const struct device *dev)
 	LOG_DBG("Hibernated");
 }
 
-static void dwc2_exit_hibernation(const struct device *dev,
-				  bool rwup, bool bus_reset)
+static void dwc2_exit_hibernation(const struct device *dev, bool rwup)
 {
 	const struct udc_dwc2_config *const config = dev->config;
 	struct usb_dwc2_reg *const base = config->base;
@@ -1071,15 +1066,13 @@ static void dwc2_exit_hibernation(const struct device *dev,
 	/* Disable PMU interrupt */
 	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUINTSEL);
 
-	dwc2_restore_essential_registers(dev, rwup, bus_reset);
+	dwc2_restore_essential_registers(dev, rwup);
 
 	/* Note: in Remote Wakeup case 15 ms max signaling time starts now */
 
 	/* Wait for Restore Done Interrupt */
 	dwc2_wait_for_bit(dev, (mem_addr_t)&base->gintsts, USB_DWC2_GINTSTS_RSTRDONEINT);
-	if (!bus_reset) {
-		sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
-	}
+	sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
 
 	/* Disable restore from PMU */
 	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_RESTORE);
@@ -2034,7 +2027,7 @@ static int udc_dwc2_disable(const struct device *dev)
 	config->irq_disable_func(dev);
 
 	if (priv->hibernated) {
-		dwc2_exit_hibernation(dev, false, true);
+		dwc2_exit_hibernation(dev, false);
 		priv->hibernated = 0;
 	}
 
@@ -2751,7 +2744,7 @@ static void dwc2_handle_hibernation_exit(const struct device *dev,
 	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
 
-	dwc2_exit_hibernation(dev, rwup, bus_reset);
+	dwc2_exit_hibernation(dev, rwup);
 	dwc2_restore_device_registers(dev, rwup);
 
 	priv->hibernated = 0;

From f54f613df70c886042b25cc6778f53ea4fba5c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:03 +0100
Subject: [PATCH 1933/2913] Revert "[nrf fromtree] drivers: udc_dwc2: Suspend
 if connected to suspended bus"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d1d06f97325ffde3cd934c2f02234532aa68af37.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 91cbaba8f53..0283b4a1b71 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -2727,6 +2727,11 @@ static void udc_dwc2_isr_handler(const struct device *dev)
 			/* Clear USB Suspend interrupt. */
 			sys_write32(USB_DWC2_GINTSTS_USBSUSP, gintsts_reg);
 
+			if (!priv->enumdone) {
+				/* Ignore stale suspend interrupt */
+				continue;
+			}
+
 			/* Notify the stack */
 			udc_set_suspended(dev, true);
 			udc_submit_event(dev, UDC_EVT_SUSPEND, 0);

From 62ef83046cc6eb63c57743a0a6508cc32c024a64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:03 +0100
Subject: [PATCH 1934/2913] Revert "[nrf fromtree] log: net: Fix build warning
 with IPv6 disabled"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1b77c92ddaff3eedc661c54722852cca3e660470.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/logging/backends/log_backend_net.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/subsys/logging/backends/log_backend_net.c b/subsys/logging/backends/log_backend_net.c
index f968a6cf4f6..3f49e0a4088 100644
--- a/subsys/logging/backends/log_backend_net.c
+++ b/subsys/logging/backends/log_backend_net.c
@@ -99,14 +99,12 @@ static int do_net_init(struct log_backend_net_ctx *ctx)
 	if (IS_ENABLED(CONFIG_NET_IPV4) && server_addr.sa_family == AF_INET) {
 		local_addr = (struct sockaddr *)&local_addr4;
 		server_addr_len = sizeof(struct sockaddr_in);
-		local_addr4.sin_family = AF_INET;
 		local_addr4.sin_port = 0U;
 	}
 
 	if (IS_ENABLED(CONFIG_NET_IPV6) && server_addr.sa_family == AF_INET6) {
 		local_addr = (struct sockaddr *)&local_addr6;
 		server_addr_len = sizeof(struct sockaddr_in6);
-		local_addr6.sin6_family = AF_INET6;
 		local_addr6.sin6_port = 0U;
 	}
 
@@ -115,6 +113,8 @@ static int do_net_init(struct log_backend_net_ctx *ctx)
 		return -EINVAL;
 	}
 
+	local_addr->sa_family = server_addr.sa_family;
+
 	if (ctx->is_tcp) {
 		proto = IPPROTO_TCP;
 		type = SOCK_STREAM;

From c89e251b29ab5f81046bd324795e761abaa4086a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:03 +0100
Subject: [PATCH 1935/2913] Revert "[nrf fromtree] samples: net: telnet: Remove
 redundant code"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cd986bcde1f08a35fc2c85ad68b7676277d93e11.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/net/telnet/src/telnet.c | 112 +++++++++++++++++++++++++++++++-
 1 file changed, 109 insertions(+), 3 deletions(-)

diff --git a/samples/net/telnet/src/telnet.c b/samples/net/telnet/src/telnet.c
index f8df416e39a..6ad77c4f7d3 100644
--- a/samples/net/telnet/src/telnet.c
+++ b/samples/net/telnet/src/telnet.c
@@ -18,13 +18,111 @@ LOG_MODULE_REGISTER(net_telnet_sample, LOG_LEVEL_DBG);
 
 #include "net_sample_common.h"
 
+#if defined(CONFIG_NET_DHCPV4)
+static struct net_mgmt_event_callback mgmt_cb;
+
+static void ipv4_addr_add_handler(struct net_mgmt_event_callback *cb,
+				  uint32_t mgmt_event,
+				  struct net_if *iface)
+{
+	char hr_addr[NET_IPV4_ADDR_LEN];
+	int i = 0;
+
+	if (mgmt_event != NET_EVENT_IPV4_ADDR_ADD) {
+		/* Spurious callback. */
+		return;
+	}
+
+	for (i = 0; i < NET_IF_MAX_IPV4_ADDR; i++) {
+		struct net_if_addr *if_addr =
+			&iface->config.ip.ipv4->unicast[i];
+
+		if (if_addr->addr_type != NET_ADDR_DHCP || !if_addr->is_used) {
+			continue;
+		}
+
+		LOG_INF("IPv4 address: %s",
+			net_addr_ntop(AF_INET,
+				      &if_addr->address.in_addr,
+				      hr_addr, NET_IPV4_ADDR_LEN));
+		LOG_INF("Lease time: %u seconds",
+			 iface->config.dhcpv4.lease_time);
+		LOG_INF("Subnet: %s",
+			net_addr_ntop(AF_INET,
+				      &iface->config.ip.ipv4->netmask,
+				      hr_addr, NET_IPV4_ADDR_LEN));
+		LOG_INF("Router: %s",
+			net_addr_ntop(AF_INET,
+				      &iface->config.ip.ipv4->gw,
+				      hr_addr, NET_IPV4_ADDR_LEN));
+		break;
+	}
+}
+
+static void setup_dhcpv4(struct net_if *iface)
+{
+	LOG_INF("Running dhcpv4 client...");
+
+	net_mgmt_init_event_callback(&mgmt_cb, ipv4_addr_add_handler,
+				     NET_EVENT_IPV4_ADDR_ADD);
+	net_mgmt_add_event_callback(&mgmt_cb);
+
+	net_dhcpv4_start(iface);
+}
+
+#else
+#define setup_dhcpv4(...)
+#endif /* CONFIG_NET_DHCPV4 */
+
+#if defined(CONFIG_NET_IPV4) && !defined(CONFIG_NET_DHCPV4)
+
+#if !defined(CONFIG_NET_CONFIG_MY_IPV4_ADDR)
+#error "You need to define an IPv4 Address or enable DHCPv4!"
+#endif
+
+static void setup_ipv4(struct net_if *iface)
+{
+	char hr_addr[NET_IPV4_ADDR_LEN];
+	struct in_addr addr;
+
+	if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &addr)) {
+		LOG_ERR("Invalid address: %s", CONFIG_NET_CONFIG_MY_IPV4_ADDR);
+		return;
+	}
+
+	net_if_ipv4_addr_add(iface, &addr, NET_ADDR_MANUAL, 0);
+
+	LOG_INF("IPv4 address: %s",
+		net_addr_ntop(AF_INET, &addr, hr_addr,
+			      NET_IPV4_ADDR_LEN));
+}
+
+#else
+#define setup_ipv4(...)
+#endif /* CONFIG_NET_IPV4 && !CONFIG_NET_DHCPV4 */
+
 #if defined(CONFIG_NET_IPV6)
+
 #define MCAST_IP6ADDR "ff84::2"
 
-static void setup_ipv6(void)
+#ifndef CONFIG_NET_CONFIG_MY_IPV6_ADDR
+#error "You need to define an IPv6 Address!"
+#endif
+
+static void setup_ipv6(struct net_if *iface)
 {
+	char hr_addr[NET_IPV6_ADDR_LEN];
 	struct in6_addr addr;
-	struct net_if *iface = net_if_get_default();
+
+	if (net_addr_pton(AF_INET6, CONFIG_NET_CONFIG_MY_IPV6_ADDR, &addr)) {
+		LOG_ERR("Invalid address: %s", CONFIG_NET_CONFIG_MY_IPV6_ADDR);
+		return;
+	}
+
+	net_if_ipv6_addr_add(iface, &addr, NET_ADDR_MANUAL, 0);
+
+	LOG_INF("IPv6 address: %s",
+		net_addr_ntop(AF_INET6, &addr, hr_addr, NET_IPV6_ADDR_LEN));
 
 	if (net_addr_pton(AF_INET6, MCAST_IP6ADDR, &addr)) {
 		LOG_ERR("Invalid address: %s", MCAST_IP6ADDR);
@@ -33,15 +131,23 @@ static void setup_ipv6(void)
 
 	net_if_ipv6_maddr_add(iface, &addr);
 }
+
 #else
 #define setup_ipv6(...)
 #endif /* CONFIG_NET_IPV6 */
 
 int main(void)
 {
+	struct net_if *iface = net_if_get_default();
+
 	LOG_INF("Starting Telnet sample");
 
 	wait_for_network();
-	setup_ipv6();
+
+	setup_ipv4(iface);
+
+	setup_dhcpv4(iface);
+
+	setup_ipv6(iface);
 	return 0;
 }

From 02ae5b902831b0dedc01e07fe77f76477e991f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:03 +0100
Subject: [PATCH 1936/2913] Revert "[nrf fromtree] net: dns: dispatcher: Don't
 use uninitialized entries"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b5c4e13237a99901ee1767bb405b3b6cf2c8f6d2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/dns/dispatcher.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/subsys/net/lib/dns/dispatcher.c b/subsys/net/lib/dns/dispatcher.c
index 3adde74cf44..08672b78e7a 100644
--- a/subsys/net/lib/dns/dispatcher.c
+++ b/subsys/net/lib/dns/dispatcher.c
@@ -240,10 +240,6 @@ int dns_dispatcher_register(struct dns_socket_dispatcher *ctx)
 				goto out;
 			}
 
-			if (ctx->fds[i].fd < 0) {
-				continue;
-			}
-
 			if (dispatch_table[ctx->fds[i].fd].ctx == NULL) {
 				dispatch_table[ctx->fds[i].fd].ctx = ctx;
 			}
@@ -281,10 +277,6 @@ int dns_dispatcher_register(struct dns_socket_dispatcher *ctx)
 			goto out;
 		}
 
-		if (ctx->fds[i].fd < 0) {
-			continue;
-		}
-
 		if (dispatch_table[ctx->fds[i].fd].ctx == NULL) {
 			dispatch_table[ctx->fds[i].fd].ctx = ctx;
 		}

From 6618d043d230325343c5ce516785fc3f9b754b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:03 +0100
Subject: [PATCH 1937/2913] Revert "[nrf fromtree] samples: net: echo_client:
 Fix 'Tag name should be unique' error"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5ab06af1a2138221dd44fbc954db5caa3d9d0bab.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/net/sockets/echo_client/src/common.h |  6 +++---
 samples/net/sockets/echo_client/src/tcp.c    |  8 ++++----
 samples/net/sockets/echo_client/src/udp.c    | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/samples/net/sockets/echo_client/src/common.h b/samples/net/sockets/echo_client/src/common.h
index 76bbc5604de..d7a8b6c69e5 100644
--- a/samples/net/sockets/echo_client/src/common.h
+++ b/samples/net/sockets/echo_client/src/common.h
@@ -42,7 +42,7 @@ struct udp_control {
 	struct k_timer rx_timer;
 };
 
-struct sample_data {
+struct data {
 	const char *proto;
 
 	struct {
@@ -62,8 +62,8 @@ struct sample_data {
 };
 
 struct configs {
-	struct sample_data ipv4;
-	struct sample_data ipv6;
+	struct data ipv4;
+	struct data ipv6;
 };
 
 #if !defined(CONFIG_NET_CONFIG_PEER_IPV4_ADDR)
diff --git a/samples/net/sockets/echo_client/src/tcp.c b/samples/net/sockets/echo_client/src/tcp.c
index 32019849d8f..b8abce4036b 100644
--- a/samples/net/sockets/echo_client/src/tcp.c
+++ b/samples/net/sockets/echo_client/src/tcp.c
@@ -47,7 +47,7 @@ static ssize_t sendall(int sock, const void *buf, size_t len)
 	return 0;
 }
 
-static int send_tcp_data(struct sample_data *data)
+static int send_tcp_data(struct data *data)
 {
 	int ret;
 
@@ -72,7 +72,7 @@ static int send_tcp_data(struct sample_data *data)
 	return ret;
 }
 
-static int compare_tcp_data(struct sample_data *data, const char *buf, uint32_t received)
+static int compare_tcp_data(struct data *data, const char *buf, uint32_t received)
 {
 	if (data->tcp.received + received > data->tcp.expecting) {
 		LOG_ERR("Too much data received: TCP %s", data->proto);
@@ -87,7 +87,7 @@ static int compare_tcp_data(struct sample_data *data, const char *buf, uint32_t
 	return 0;
 }
 
-static int start_tcp_proto(struct sample_data *data, sa_family_t family,
+static int start_tcp_proto(struct data *data, sa_family_t family,
 			   struct sockaddr *addr, socklen_t addrlen)
 {
 	int optval;
@@ -180,7 +180,7 @@ static int start_tcp_proto(struct sample_data *data, sa_family_t family,
 	return ret;
 }
 
-static int process_tcp_proto(struct sample_data *data)
+static int process_tcp_proto(struct data *data)
 {
 	int ret, received;
 	char buf[RECV_BUF_SIZE];
diff --git a/samples/net/sockets/echo_client/src/udp.c b/samples/net/sockets/echo_client/src/udp.c
index 49b6c14b8f1..1fe92e88899 100644
--- a/samples/net/sockets/echo_client/src/udp.c
+++ b/samples/net/sockets/echo_client/src/udp.c
@@ -36,7 +36,7 @@ static struct k_thread udp_tx_thread;
 static struct udp_control udp4_ctrl, udp6_ctrl;
 static struct k_poll_signal udp_kill;
 
-static int send_udp_data(struct sample_data *data);
+static int send_udp_data(struct data *data);
 static void wait_reply(struct k_timer *timer);
 static void wait_transmit(struct k_timer *timer);
 
@@ -136,7 +136,7 @@ void init_udp(void)
 	}
 }
 
-static int send_udp_data(struct sample_data *data)
+static int send_udp_data(struct data *data)
 {
 	int ret;
 
@@ -156,7 +156,7 @@ static int send_udp_data(struct sample_data *data)
 	return ret < 0 ? -EIO : 0;
 }
 
-static int compare_udp_data(struct sample_data *data, const char *buf, uint32_t received)
+static int compare_udp_data(struct data *data, const char *buf, uint32_t received)
 {
 	if (received != data->udp.expecting) {
 		LOG_ERR("Invalid amount of data received: UDP %s", data->proto);
@@ -175,7 +175,7 @@ static void wait_reply(struct k_timer *timer)
 {
 	/* This means that we did not receive response in time. */
 	struct udp_control *ctrl = CONTAINER_OF(timer, struct udp_control, rx_timer);
-	struct sample_data *data = (ctrl == conf.ipv4.udp.ctrl) ? &conf.ipv4 : &conf.ipv6;
+	struct data *data = (ctrl == conf.ipv4.udp.ctrl) ? &conf.ipv4 : &conf.ipv6;
 
 	LOG_ERR("UDP %s: Data packet not received", data->proto);
 
@@ -190,7 +190,7 @@ static void wait_transmit(struct k_timer *timer)
 	k_poll_signal_raise(&ctrl->tx_signal, 0);
 }
 
-static int start_udp_proto(struct sample_data *data, sa_family_t family,
+static int start_udp_proto(struct data *data, sa_family_t family,
 			   struct sockaddr *addr, socklen_t addrlen)
 {
 	int optval;
@@ -251,7 +251,7 @@ static int start_udp_proto(struct sample_data *data, sa_family_t family,
 	return ret;
 }
 
-static int process_udp_proto(struct sample_data *data)
+static int process_udp_proto(struct data *data)
 {
 	int ret, received;
 

From 876377b9e0ef6ab9cbceaa6412962c37e82c7e63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:03 +0100
Subject: [PATCH 1938/2913] Revert "[nrf fromtree] samples: net: echo_client:
 Fix build warning with IPv6 disabled"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 781e9126c5f12b7a4f762a4e49aa5f8166e6d18e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/net/sockets/echo_client/src/tcp.c | 19 +++++++++----------
 samples/net/sockets/echo_client/src/udp.c | 15 +++++++--------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/samples/net/sockets/echo_client/src/tcp.c b/samples/net/sockets/echo_client/src/tcp.c
index b8abce4036b..eee8994425c 100644
--- a/samples/net/sockets/echo_client/src/tcp.c
+++ b/samples/net/sockets/echo_client/src/tcp.c
@@ -87,16 +87,16 @@ static int compare_tcp_data(struct data *data, const char *buf, uint32_t receive
 	return 0;
 }
 
-static int start_tcp_proto(struct data *data, sa_family_t family,
-			   struct sockaddr *addr, socklen_t addrlen)
+static int start_tcp_proto(struct data *data, struct sockaddr *addr,
+			   socklen_t addrlen)
 {
 	int optval;
 	int ret;
 
 #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS)
-	data->tcp.sock = socket(family, SOCK_STREAM, IPPROTO_TLS_1_2);
+	data->tcp.sock = socket(addr->sa_family, SOCK_STREAM, IPPROTO_TLS_1_2);
 #else
-	data->tcp.sock = socket(family, SOCK_STREAM, IPPROTO_TCP);
+	data->tcp.sock = socket(addr->sa_family, SOCK_STREAM, IPPROTO_TCP);
 #endif
 	if (data->tcp.sock < 0) {
 		LOG_ERR("Failed to create TCP socket (%s): %d", data->proto,
@@ -108,7 +108,7 @@ static int start_tcp_proto(struct data *data, sa_family_t family,
 		struct sockaddr proxy_addr;
 		socklen_t proxy_addrlen;
 
-		if (family == AF_INET) {
+		if (addr->sa_family == AF_INET) {
 			struct sockaddr_in *proxy4 =
 				(struct sockaddr_in *)&proxy_addr;
 
@@ -117,7 +117,7 @@ static int start_tcp_proto(struct data *data, sa_family_t family,
 			inet_pton(AF_INET, SOCKS5_PROXY_V4_ADDR,
 				  &proxy4->sin_addr);
 			proxy_addrlen = sizeof(struct sockaddr_in);
-		} else if (family == AF_INET6) {
+		} else if (addr->sa_family == AF_INET6) {
 			struct sockaddr_in6 *proxy6 =
 				(struct sockaddr_in6 *)&proxy_addr;
 
@@ -163,7 +163,7 @@ static int start_tcp_proto(struct data *data, sa_family_t family,
 #endif
 
 	/* Prefer IPv6 temporary addresses */
-	if (family == AF_INET6) {
+	if (addr->sa_family == AF_INET6) {
 		optval = IPV6_PREFER_SRC_TMP;
 		(void)setsockopt(data->tcp.sock, IPPROTO_IPV6,
 				 IPV6_ADDR_PREFERENCES,
@@ -242,7 +242,7 @@ int start_tcp(void)
 		inet_pton(AF_INET6, CONFIG_NET_CONFIG_PEER_IPV6_ADDR,
 			  &addr6.sin6_addr);
 
-		ret = start_tcp_proto(&conf.ipv6, AF_INET6,
+		ret = start_tcp_proto(&conf.ipv6,
 				      (struct sockaddr *)&addr6,
 				      sizeof(addr6));
 		if (ret < 0) {
@@ -256,8 +256,7 @@ int start_tcp(void)
 		inet_pton(AF_INET, CONFIG_NET_CONFIG_PEER_IPV4_ADDR,
 			  &addr4.sin_addr);
 
-		ret = start_tcp_proto(&conf.ipv4, AF_INET,
-				      (struct sockaddr *)&addr4,
+		ret = start_tcp_proto(&conf.ipv4, (struct sockaddr *)&addr4,
 				      sizeof(addr4));
 		if (ret < 0) {
 			return ret;
diff --git a/samples/net/sockets/echo_client/src/udp.c b/samples/net/sockets/echo_client/src/udp.c
index 1fe92e88899..3055c2d03f2 100644
--- a/samples/net/sockets/echo_client/src/udp.c
+++ b/samples/net/sockets/echo_client/src/udp.c
@@ -190,16 +190,16 @@ static void wait_transmit(struct k_timer *timer)
 	k_poll_signal_raise(&ctrl->tx_signal, 0);
 }
 
-static int start_udp_proto(struct data *data, sa_family_t family,
-			   struct sockaddr *addr, socklen_t addrlen)
+static int start_udp_proto(struct data *data, struct sockaddr *addr,
+			   socklen_t addrlen)
 {
 	int optval;
 	int ret;
 
 #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS)
-	data->udp.sock = socket(family, SOCK_DGRAM, IPPROTO_DTLS_1_2);
+	data->udp.sock = socket(addr->sa_family, SOCK_DGRAM, IPPROTO_DTLS_1_2);
 #else
-	data->udp.sock = socket(family, SOCK_DGRAM, IPPROTO_UDP);
+	data->udp.sock = socket(addr->sa_family, SOCK_DGRAM, IPPROTO_UDP);
 #endif
 	if (data->udp.sock < 0) {
 		LOG_ERR("Failed to create UDP socket (%s): %d", data->proto,
@@ -233,7 +233,7 @@ static int start_udp_proto(struct data *data, sa_family_t family,
 #endif
 
 	/* Prefer IPv6 temporary addresses */
-	if (family == AF_INET6) {
+	if (addr->sa_family == AF_INET6) {
 		optval = IPV6_PREFER_SRC_TMP;
 		(void)setsockopt(data->udp.sock, IPPROTO_IPV6,
 				 IPV6_ADDR_PREFERENCES,
@@ -312,7 +312,7 @@ int start_udp(void)
 		inet_pton(AF_INET6, CONFIG_NET_CONFIG_PEER_IPV6_ADDR,
 			  &addr6.sin6_addr);
 
-		ret = start_udp_proto(&conf.ipv6, AF_INET6,
+		ret = start_udp_proto(&conf.ipv6,
 				      (struct sockaddr *)&addr6,
 				      sizeof(addr6));
 		if (ret < 0) {
@@ -326,8 +326,7 @@ int start_udp(void)
 		inet_pton(AF_INET, CONFIG_NET_CONFIG_PEER_IPV4_ADDR,
 			  &addr4.sin_addr);
 
-		ret = start_udp_proto(&conf.ipv4, AF_INET,
-				      (struct sockaddr *)&addr4,
+		ret = start_udp_proto(&conf.ipv4, (struct sockaddr *)&addr4,
 				      sizeof(addr4));
 		if (ret < 0) {
 			return ret;

From f8547e04584df175d7884621658b62b4ee2cb676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:03 +0100
Subject: [PATCH 1939/2913] Revert "[nrf fromtree] samples: net: Add Wi-Fi
 snippet support for networking samples"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cd5a8695556b7cf4f35a506d9b80dab8cb3b71ad.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/net/common/common.cmake               |  3 --
 samples/net/common/net_sample_common.c        | 42 -------------------
 samples/net/common/net_sample_common.h        | 11 -----
 samples/net/dns_resolve/CMakeLists.txt        |  2 -
 samples/net/dns_resolve/README.rst            |  6 ---
 samples/net/dns_resolve/sample.yaml           |  6 ---
 samples/net/dns_resolve/src/main.c            |  4 --
 samples/net/ipv4_autoconf/CMakeLists.txt      |  2 -
 samples/net/ipv4_autoconf/README.rst          |  6 ---
 samples/net/ipv4_autoconf/sample.yaml         | 20 ++++-----
 samples/net/ipv4_autoconf/src/main.c          |  4 --
 samples/net/lwm2m_client/Kconfig              |  2 -
 samples/net/lwm2m_client/src/lwm2m-client.c   |  9 ++--
 samples/net/mdns_responder/README.rst         |  6 ---
 samples/net/mdns_responder/sample.yaml        | 15 ++-----
 samples/net/mdns_responder/src/main.c         |  4 --
 samples/net/mqtt_publisher/CMakeLists.txt     |  2 -
 samples/net/mqtt_publisher/README.rst         |  6 ---
 samples/net/mqtt_publisher/sample.yaml        |  6 ---
 samples/net/mqtt_publisher/src/main.c         |  3 --
 .../net/sockets/coap_server/CMakeLists.txt    |  2 -
 samples/net/sockets/coap_server/README.rst    |  6 ---
 samples/net/sockets/coap_server/prj.conf      |  2 -
 samples/net/sockets/coap_server/sample.yaml   | 14 ++-----
 samples/net/sockets/coap_server/src/main.c    |  6 ---
 samples/net/sockets/echo_async/README.rst     |  6 ---
 samples/net/sockets/echo_async/sample.yaml    |  6 ---
 .../net/sockets/echo_async/src/socket_echo.c  |  4 --
 samples/net/sockets/http_get/README.rst       |  6 ---
 samples/net/sockets/http_get/sample.yaml      |  6 ---
 samples/net/sockets/http_get/src/http_get.c   |  4 --
 .../net/sockets/sntp_client/CMakeLists.txt    |  2 -
 samples/net/sockets/sntp_client/README.rst    |  6 ---
 samples/net/sockets/sntp_client/sample.yaml   |  6 ---
 samples/net/sockets/sntp_client/src/main.c    |  3 --
 samples/net/syslog_net/CMakeLists.txt         |  2 -
 samples/net/syslog_net/README.rst             |  6 ---
 samples/net/syslog_net/sample.yaml            |  6 ---
 samples/net/syslog_net/src/main.c             |  4 --
 samples/net/telnet/CMakeLists.txt             |  2 -
 samples/net/telnet/README.rst                 |  6 ---
 samples/net/telnet/sample.yaml                | 17 +++-----
 samples/net/telnet/src/telnet.c               |  4 --
 43 files changed, 26 insertions(+), 259 deletions(-)
 delete mode 100644 samples/net/common/net_sample_common.c
 delete mode 100644 samples/net/common/net_sample_common.h

diff --git a/samples/net/common/common.cmake b/samples/net/common/common.cmake
index c0e0e511179..b17d6493819 100644
--- a/samples/net/common/common.cmake
+++ b/samples/net/common/common.cmake
@@ -1,6 +1,3 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Common routines used in net samples
-
-target_include_directories(app PRIVATE ${ZEPHYR_BASE}/samples/net/common/)
-target_sources(app PRIVATE $ENV{ZEPHYR_BASE}/samples/net/common/net_sample_common.c)
diff --git a/samples/net/common/net_sample_common.c b/samples/net/common/net_sample_common.c
deleted file mode 100644
index 1e744f178b5..00000000000
--- a/samples/net/common/net_sample_common.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(net_samples_common, LOG_LEVEL_DBG);
-
-#include <zephyr/net/conn_mgr_connectivity.h>
-
-#if defined(CONFIG_NET_CONNECTION_MANAGER)
-#define L4_EVENT_MASK (NET_EVENT_L4_CONNECTED | NET_EVENT_L4_DISCONNECTED)
-
-static struct net_mgmt_event_callback l4_cb;
-static K_SEM_DEFINE(network_connected, 0, 1);
-
-static void l4_event_handler(struct net_mgmt_event_callback *cb, uint32_t event,
-			     struct net_if *iface)
-{
-	switch (event) {
-	case NET_EVENT_L4_CONNECTED:
-		LOG_INF("Network connectivity established and IP address assigned");
-		k_sem_give(&network_connected);
-		break;
-	case NET_EVENT_L4_DISCONNECTED:
-		break;
-	default:
-		break;
-	}
-}
-
-void wait_for_network(void)
-{
-	net_mgmt_init_event_callback(&l4_cb, l4_event_handler, L4_EVENT_MASK);
-	net_mgmt_add_event_callback(&l4_cb);
-
-	LOG_INF("Waiting for network...");
-
-	k_sem_take(&network_connected, K_FOREVER);
-}
-#endif /* CONFIG_NET_CONNECTION_MANAGER */
diff --git a/samples/net/common/net_sample_common.h b/samples/net/common/net_sample_common.h
deleted file mode 100644
index f44e852a0da..00000000000
--- a/samples/net/common/net_sample_common.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#if defined(CONFIG_NET_CONNECTION_MANAGER)
-void wait_for_network(void);
-#else
-static inline void wait_for_network(void) { }
-#endif /* CONFIG_NET_CONNECTION_MANAGER */
diff --git a/samples/net/dns_resolve/CMakeLists.txt b/samples/net/dns_resolve/CMakeLists.txt
index 1a863388264..1ac07c37fd2 100644
--- a/samples/net/dns_resolve/CMakeLists.txt
+++ b/samples/net/dns_resolve/CMakeLists.txt
@@ -6,5 +6,3 @@ project(dns_resolve)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
-
-include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/dns_resolve/README.rst b/samples/net/dns_resolve/README.rst
index b741b827ac9..e566fa44bd1 100644
--- a/samples/net/dns_resolve/README.rst
+++ b/samples/net/dns_resolve/README.rst
@@ -155,9 +155,3 @@ Open a terminal window and type:
 Use 'dmesg' to find the right USB device.
 
 Once the binary is loaded into the FRDM board, press the RESET button.
-
-Wi-Fi
-=====
-
-The IPv4 Wi-Fi support can be enabled in the sample with
-:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/dns_resolve/sample.yaml b/samples/net/dns_resolve/sample.yaml
index 7cf510d0ba4..cafc9beac83 100644
--- a/samples/net/dns_resolve/sample.yaml
+++ b/samples/net/dns_resolve/sample.yaml
@@ -23,9 +23,3 @@ tests:
       - CONFIG_LLMNR_RESOLVER=y
       - CONFIG_NET_DHCPV4=y
     tags: llmnr
-  sample.net.dns_resolve.wifi.nrf70dk:
-    extra_args:
-      - SNIPPET=wifi-ipv4
-      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
-    platform_allow:
-      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/dns_resolve/src/main.c b/samples/net/dns_resolve/src/main.c
index 23e5645d0b4..5eec113ead3 100644
--- a/samples/net/dns_resolve/src/main.c
+++ b/samples/net/dns_resolve/src/main.c
@@ -17,8 +17,6 @@ LOG_MODULE_REGISTER(net_dns_resolve_client_sample, LOG_LEVEL_DBG);
 #include <zephyr/net/net_mgmt.h>
 #include <zephyr/net/dns_resolve.h>
 
-#include "net_sample_common.h"
-
 #if defined(CONFIG_MDNS_RESOLVER)
 #if defined(CONFIG_NET_IPV4)
 static struct k_work_delayable mdns_ipv4_timer;
@@ -397,8 +395,6 @@ int main(void)
 
 	LOG_INF("Starting DNS resolve sample");
 
-	wait_for_network();
-
 	setup_ipv4(iface);
 
 	setup_dhcpv4(iface);
diff --git a/samples/net/ipv4_autoconf/CMakeLists.txt b/samples/net/ipv4_autoconf/CMakeLists.txt
index 8bcf3bfd244..cb0f8e1b9c6 100644
--- a/samples/net/ipv4_autoconf/CMakeLists.txt
+++ b/samples/net/ipv4_autoconf/CMakeLists.txt
@@ -6,5 +6,3 @@ project(ipv4_autoconf)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
-
-include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/ipv4_autoconf/README.rst b/samples/net/ipv4_autoconf/README.rst
index f9a8f63363b..614f2c64047 100644
--- a/samples/net/ipv4_autoconf/README.rst
+++ b/samples/net/ipv4_autoconf/README.rst
@@ -69,9 +69,3 @@ type:
 .. code-block:: console
 
    $ ping -I eth1 169.254.218.128
-
-Wi-Fi
-=====
-
-The IPv4 Wi-Fi support can be enabled in the sample with
-:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/ipv4_autoconf/sample.yaml b/samples/net/ipv4_autoconf/sample.yaml
index eb9c06ae18e..88e39ec2356 100644
--- a/samples/net/ipv4_autoconf/sample.yaml
+++ b/samples/net/ipv4_autoconf/sample.yaml
@@ -1,23 +1,17 @@
 common:
   harness: net
-  depends_on: netif
   tags:
     - net
     - ipv4_autoconf
+  platform_allow:
+    - qemu_x86
+    - native_sim
+    - native_sim/native/64
+  integration_platforms:
+    - native_sim
 sample:
   description: Test IPv4 autoconf functionality
   name: IPv4 autoconf sample app
 tests:
   sample.net.ipv4_autoconf:
-    platform_allow:
-      - qemu_x86
-      - native_sim
-      - native_sim/native/64
-    integration_platforms:
-      - native_sim
-  sample.net.ipv4_autoconf.wifi.nrf70dk:
-    extra_args:
-      - SNIPPET=wifi-ipv4
-      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
-    platform_allow:
-      - nrf7002dk/nrf5340/cpuapp
+    depends_on: netif
diff --git a/samples/net/ipv4_autoconf/src/main.c b/samples/net/ipv4_autoconf/src/main.c
index c4e93105cf7..b9f9c00379d 100644
--- a/samples/net/ipv4_autoconf/src/main.c
+++ b/samples/net/ipv4_autoconf/src/main.c
@@ -20,8 +20,6 @@ LOG_MODULE_REGISTER(net_ipv4_autoconf_sample, LOG_LEVEL_DBG);
 #include <zephyr/net/net_context.h>
 #include <zephyr/net/net_mgmt.h>
 
-#include "net_sample_common.h"
-
 static struct net_mgmt_event_callback mgmt_cb;
 
 static void handler(struct net_mgmt_event_callback *cb,
@@ -62,8 +60,6 @@ int main(void)
 {
 	LOG_INF("Run ipv4 autoconf client");
 
-	wait_for_network();
-
 	net_mgmt_init_event_callback(&mgmt_cb, handler,
 				     NET_EVENT_IPV4_ADDR_ADD);
 	net_mgmt_add_event_callback(&mgmt_cb);
diff --git a/samples/net/lwm2m_client/Kconfig b/samples/net/lwm2m_client/Kconfig
index 1bc4b6c49b0..2037d281ce0 100644
--- a/samples/net/lwm2m_client/Kconfig
+++ b/samples/net/lwm2m_client/Kconfig
@@ -29,8 +29,6 @@ endif
 
 config LWM2M_APP_SERVER
 	string "LwM2M server address"
-	default "coap://leshan.eclipseprojects.io:5683" if (WIFI && !LWM2M_DTLS_SUPPORT)
-	default "coaps://leshan.eclipseprojects.io:5684" if (WIFI && LWM2M_DTLS_SUPPORT)
 	default "coap://192.0.2.2:5683" if !LWM2M_DTLS_SUPPORT
 	default "coaps://192.0.2.2:5684" if (LWM2M_DTLS_SUPPORT && !LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP)
 	default "coaps://192.0.2.2:5784" if (LWM2M_DTLS_SUPPORT && LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP)
diff --git a/samples/net/lwm2m_client/src/lwm2m-client.c b/samples/net/lwm2m_client/src/lwm2m-client.c
index e59b4e9482a..cea4f92ce8c 100644
--- a/samples/net/lwm2m_client/src/lwm2m-client.c
+++ b/samples/net/lwm2m_client/src/lwm2m-client.c
@@ -385,9 +385,12 @@ int main(void)
 			return ret;
 		}
 
-		(void)conn_mgr_if_connect(net_if_get_default());
-
-		k_sem_take(&network_connected_sem, K_FOREVER);
+		ret = conn_mgr_if_connect(net_if_get_default());
+		/* Ignore errors from interfaces not requiring connectivity */
+		if (ret == 0) {
+			LOG_INF("Connecting to network");
+			k_sem_take(&network_connected_sem, K_FOREVER);
+		}
 	}
 
 	ret = lwm2m_setup();
diff --git a/samples/net/mdns_responder/README.rst b/samples/net/mdns_responder/README.rst
index bdb65259282..015f6c8b444 100644
--- a/samples/net/mdns_responder/README.rst
+++ b/samples/net/mdns_responder/README.rst
@@ -74,9 +74,3 @@ If the query is successful, then the following information is printed:
        address = [192.0.2.1]
        port = [4242]
        txt = []
-
-Wi-Fi
-=====
-
-The IPv4 Wi-Fi support can be enabled in the sample with
-:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/mdns_responder/sample.yaml b/samples/net/mdns_responder/sample.yaml
index 31b12260d0f..dff79845d75 100644
--- a/samples/net/mdns_responder/sample.yaml
+++ b/samples/net/mdns_responder/sample.yaml
@@ -1,20 +1,13 @@
-common:
-  harness: net
-  tags:
-    - net
-    - mdns
 sample:
   name: mDNS responder
 tests:
   sample.net.mdns_responder:
+    harness: net
     platform_allow:
       - qemu_x86
       - qemu_cortex_m3
     integration_platforms:
       - qemu_x86
-  sample.net.mdns_responder.wifi.nrf70dk:
-    extra_args:
-      - SNIPPET=wifi-ipv4
-      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
-    platform_allow:
-      - nrf7002dk/nrf5340/cpuapp
+    tags:
+      - net
+      - mdns
diff --git a/samples/net/mdns_responder/src/main.c b/samples/net/mdns_responder/src/main.c
index d6eea7c8337..112f9e93931 100644
--- a/samples/net/mdns_responder/src/main.c
+++ b/samples/net/mdns_responder/src/main.c
@@ -12,8 +12,6 @@ LOG_MODULE_REGISTER(net_mdns_responder_sample, LOG_LEVEL_DBG);
 #include <zephyr/kernel.h>
 #include <zephyr/net/net_core.h>
 
-#include "net_sample_common.h"
-
 extern void service(void);
 
 #if defined(CONFIG_NET_VLAN)
@@ -36,8 +34,6 @@ static inline int init_vlan(void)
  */
 int main(void)
 {
-	wait_for_network();
-
 	LOG_INF("Waiting mDNS queries...");
 	init_vlan();
 	service();
diff --git a/samples/net/mqtt_publisher/CMakeLists.txt b/samples/net/mqtt_publisher/CMakeLists.txt
index df650107905..4c6e3c0ef0c 100644
--- a/samples/net/mqtt_publisher/CMakeLists.txt
+++ b/samples/net/mqtt_publisher/CMakeLists.txt
@@ -7,5 +7,3 @@ project(mqtt_publisher)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
-
-include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/mqtt_publisher/README.rst b/samples/net/mqtt_publisher/README.rst
index 081d3a32625..6c75f2f2d7e 100644
--- a/samples/net/mqtt_publisher/README.rst
+++ b/samples/net/mqtt_publisher/README.rst
@@ -372,9 +372,3 @@ This is the output from the MQTT broker:
 	1485663807: Received PUBREL from zephyr_publisher (Mid: 49829)
 	1485663807: Sending PUBCOMP to zephyr_publisher (Mid: 49829)
 	1485663808: Received DISCONNECT from zephyr_publisher
-
-Wi-Fi
-=====
-
-The IPv4 Wi-Fi support can be enabled in the sample with
-:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/mqtt_publisher/sample.yaml b/samples/net/mqtt_publisher/sample.yaml
index 8d3662fe0bf..5d29a7e46a8 100644
--- a/samples/net/mqtt_publisher/sample.yaml
+++ b/samples/net/mqtt_publisher/sample.yaml
@@ -28,9 +28,3 @@ tests:
       - net
       - mqtt
       - bluetooth
-  sample.net.mqtt_publisher.wifi.nrf70dk:
-    extra_args:
-      - SNIPPET=wifi-ipv4
-      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
-    platform_allow:
-      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/mqtt_publisher/src/main.c b/samples/net/mqtt_publisher/src/main.c
index faa96e33b5c..231c9c2b2f3 100644
--- a/samples/net/mqtt_publisher/src/main.c
+++ b/samples/net/mqtt_publisher/src/main.c
@@ -16,7 +16,6 @@ LOG_MODULE_REGISTER(net_mqtt_publisher_sample, LOG_LEVEL_DBG);
 #include <errno.h>
 
 #include "config.h"
-#include "net_sample_common.h"
 
 #if defined(CONFIG_USERSPACE)
 #include <zephyr/app_memory/app_memdomain.h>
@@ -517,8 +516,6 @@ static K_HEAP_DEFINE(app_mem_pool, 1024 * 2);
 
 int main(void)
 {
-	wait_for_network();
-
 #if defined(CONFIG_MQTT_LIB_TLS)
 	int rc;
 
diff --git a/samples/net/sockets/coap_server/CMakeLists.txt b/samples/net/sockets/coap_server/CMakeLists.txt
index 5b9a0beeb19..418e31e7d2f 100644
--- a/samples/net/sockets/coap_server/CMakeLists.txt
+++ b/samples/net/sockets/coap_server/CMakeLists.txt
@@ -16,5 +16,3 @@ zephyr_iterable_section(
   NAME coap_resource_coap_server
   GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT}
   SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-
-include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/sockets/coap_server/README.rst b/samples/net/sockets/coap_server/README.rst
index 64bb1a687dc..9aadbea5fc5 100644
--- a/samples/net/sockets/coap_server/README.rst
+++ b/samples/net/sockets/coap_server/README.rst
@@ -60,9 +60,3 @@ prj_cc2520.conf configuration file enabling IEEE 802.15.4.
 .. _`net-tools`: https://github.com/zephyrproject-rtos/net-tools
 
 .. _`libcoap`: https://github.com/obgm/libcoap
-
-Wi-Fi
-=====
-
-The IPv4 Wi-Fi support can be enabled in the sample with
-:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/sockets/coap_server/prj.conf b/samples/net/sockets/coap_server/prj.conf
index 94ac1abd5cf..470caa6b448 100644
--- a/samples/net/sockets/coap_server/prj.conf
+++ b/samples/net/sockets/coap_server/prj.conf
@@ -13,8 +13,6 @@ CONFIG_COAP=y
 CONFIG_COAP_SERVER=y
 CONFIG_COAP_SERVER_WELL_KNOWN_CORE=y
 CONFIG_COAP_WELL_KNOWN_BLOCK_WISE=n
-CONFIG_COAP_EXTENDED_OPTIONS_LEN=y
-CONFIG_COAP_EXTENDED_OPTIONS_LEN_VALUE=40
 
 # Kernel options
 CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/net/sockets/coap_server/sample.yaml b/samples/net/sockets/coap_server/sample.yaml
index 9f7d5de78d7..2fcf9b63287 100644
--- a/samples/net/sockets/coap_server/sample.yaml
+++ b/samples/net/sockets/coap_server/sample.yaml
@@ -1,20 +1,14 @@
 common:
-  harness: net
-  tags:
-    - net
-    - socket
   filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
 sample:
   description: BSD Sockets API CoAP server example
   name: socket_coap_server
 tests:
   sample.net.sockets.coap_server:
+    harness: net
+    tags:
+      - net
+      - socket
     platform_allow:
       - native_sim
       - qemu_x86
-  sample.net.sockets.coap_server.wifi.nrf70dk:
-    extra_args:
-      - SNIPPET=wifi-ipv4
-      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
-    platform_allow:
-      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/sockets/coap_server/src/main.c b/samples/net/sockets/coap_server/src/main.c
index 19890c1f3d3..60dd32a000b 100644
--- a/samples/net/sockets/coap_server/src/main.c
+++ b/samples/net/sockets/coap_server/src/main.c
@@ -15,8 +15,6 @@ LOG_MODULE_REGISTER(net_coap_service_sample, LOG_LEVEL_DBG);
 #include "ipv6.h"
 #endif
 
-#include "net_sample_common.h"
-
 static const uint16_t coap_port = 5683;
 
 #ifdef CONFIG_NET_IPV6
@@ -73,8 +71,6 @@ static int join_coap_multicast_group(void)
 
 int main(void)
 {
-	wait_for_network();
-
 	return join_coap_multicast_group();
 }
 
@@ -82,8 +78,6 @@ int main(void)
 
 int main(void)
 {
-	wait_for_network();
-
 	return 0;
 }
 
diff --git a/samples/net/sockets/echo_async/README.rst b/samples/net/sockets/echo_async/README.rst
index 1b9beccdbcb..826b3ffbda5 100644
--- a/samples/net/sockets/echo_async/README.rst
+++ b/samples/net/sockets/echo_async/README.rst
@@ -49,12 +49,6 @@ another terminal window and run the same telnet command as above.
 The sample supports up to three connected clients, but this can be adjusted
 by changing ``NUM_FDS`` defined in the source code.
 
-Wi-Fi
-=====
-
-The IPv4 Wi-Fi support can be enabled in the sample with
-:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
-
 Running application on POSIX Host
 =================================
 
diff --git a/samples/net/sockets/echo_async/sample.yaml b/samples/net/sockets/echo_async/sample.yaml
index 811f2115c57..39b33bd3165 100644
--- a/samples/net/sockets/echo_async/sample.yaml
+++ b/samples/net/sockets/echo_async/sample.yaml
@@ -12,9 +12,3 @@ tests:
   sample.net.sockets.echo_async:
     extra_configs:
       - CONFIG_POSIX_API=y
-  sample.net.sockets.echo_async.wifi.nrf70dk:
-    extra_args:
-      - SNIPPET=wifi-ipv4
-      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
-    platform_allow:
-      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/sockets/echo_async/src/socket_echo.c b/samples/net/sockets/echo_async/src/socket_echo.c
index b38eb62c001..33dadfbf9e7 100644
--- a/samples/net/sockets/echo_async/src/socket_echo.c
+++ b/samples/net/sockets/echo_async/src/socket_echo.c
@@ -26,8 +26,6 @@
 #include <zephyr/net/socket.h>
 #include <zephyr/kernel.h>
 
-#include "net_sample_common.h"
-
 #ifdef CONFIG_NET_IPV6
 #define USE_IPV6
 #endif
@@ -130,8 +128,6 @@ int main(void)
 	};
 #endif
 
-	wait_for_network();
-
 #if !defined(USE_IPV6) || !(CONFIG_SOC_SERIES_CC32XX)
 	serv4 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 	if (serv4 < 0) {
diff --git a/samples/net/sockets/http_get/README.rst b/samples/net/sockets/http_get/README.rst
index bf2f058eb4d..09bfb2050d1 100644
--- a/samples/net/sockets/http_get/README.rst
+++ b/samples/net/sockets/http_get/README.rst
@@ -69,12 +69,6 @@ Note, that TLS support in the sample depends on non-posix, TLS socket
 functionality. Therefore, it is only possible to run TLS in this sample
 on Zephyr.
 
-Wi-Fi
-=====
-
-The IPv4 Wi-Fi support can be enabled in the sample with
-:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
-
 Running application on POSIX Host
 =================================
 
diff --git a/samples/net/sockets/http_get/sample.yaml b/samples/net/sockets/http_get/sample.yaml
index 292058bfce9..2aba5c7d60d 100644
--- a/samples/net/sockets/http_get/sample.yaml
+++ b/samples/net/sockets/http_get/sample.yaml
@@ -57,9 +57,3 @@ tests:
       - native_sim
       - native_sim/native/64
     extra_args: OVERLAY_CONFIG="overlay-nsos.conf;overlay-tls.conf"
-  sample.net.sockets.http_get.wifi.nrf70dk:
-    extra_args:
-      - SNIPPET=wifi-ipv4
-      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
-    platform_allow:
-      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/sockets/http_get/src/http_get.c b/samples/net/sockets/http_get/src/http_get.c
index b4ad0ff8410..c6d16b53461 100644
--- a/samples/net/sockets/http_get/src/http_get.c
+++ b/samples/net/sockets/http_get/src/http_get.c
@@ -25,8 +25,6 @@
 #include "ca_certificate.h"
 #endif
 
-#include "net_sample_common.h"
-
 #endif
 
 /* HTTP server to connect to */
@@ -63,8 +61,6 @@ int main(void)
 	struct addrinfo *res;
 	int st, sock;
 
-	wait_for_network();
-
 #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS)
 	tls_credential_add(CA_CERTIFICATE_TAG, TLS_CREDENTIAL_CA_CERTIFICATE,
 			   ca_certificate, sizeof(ca_certificate));
diff --git a/samples/net/sockets/sntp_client/CMakeLists.txt b/samples/net/sockets/sntp_client/CMakeLists.txt
index b42a3549dd6..3d23993968b 100644
--- a/samples/net/sockets/sntp_client/CMakeLists.txt
+++ b/samples/net/sockets/sntp_client/CMakeLists.txt
@@ -6,5 +6,3 @@ project(sntp_client)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
-
-include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/sockets/sntp_client/README.rst b/samples/net/sockets/sntp_client/README.rst
index 72c06877848..f9a1aacd4b8 100644
--- a/samples/net/sockets/sntp_client/README.rst
+++ b/samples/net/sockets/sntp_client/README.rst
@@ -28,9 +28,3 @@ This sample can be built and executed on QEMU or native_sim board as
 described in :ref:`networking_with_qemu`.
 
 .. _`net-tools`: https://github.com/zephyrproject-rtos/net-tools
-
-Wi-Fi
-=====
-
-The IPv4 Wi-Fi support can be enabled in the sample with
-:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/sockets/sntp_client/sample.yaml b/samples/net/sockets/sntp_client/sample.yaml
index 762da6d0000..aba249df18a 100644
--- a/samples/net/sockets/sntp_client/sample.yaml
+++ b/samples/net/sockets/sntp_client/sample.yaml
@@ -9,9 +9,3 @@ tests:
     platform_allow:
       - qemu_x86
       - native_sim
-  sample.net.sockets.sntp_client.wifi.nrf70dk:
-    extra_args:
-      - SNIPPET=wifi-ipv4
-      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
-    platform_allow:
-      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/sockets/sntp_client/src/main.c b/samples/net/sockets/sntp_client/src/main.c
index 66cf8a759e8..585ce1d1b43 100644
--- a/samples/net/sockets/sntp_client/src/main.c
+++ b/samples/net/sockets/sntp_client/src/main.c
@@ -12,7 +12,6 @@ LOG_MODULE_REGISTER(net_sntp_client_sample, LOG_LEVEL_DBG);
 #include <arpa/inet.h>
 
 #include "config.h"
-#include "net_sample_common.h"
 
 #define SNTP_PORT 123
 
@@ -26,8 +25,6 @@ int main(void)
 	struct sntp_time sntp_time;
 	int rv;
 
-	wait_for_network();
-
 	/* ipv4 */
 	memset(&addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;
diff --git a/samples/net/syslog_net/CMakeLists.txt b/samples/net/syslog_net/CMakeLists.txt
index 99c7d474c3b..c6c052e8a90 100644
--- a/samples/net/syslog_net/CMakeLists.txt
+++ b/samples/net/syslog_net/CMakeLists.txt
@@ -7,5 +7,3 @@ project(syslog_net)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
-
-include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/syslog_net/README.rst b/samples/net/syslog_net/README.rst
index acc27ff0582..dd5908714b9 100644
--- a/samples/net/syslog_net/README.rst
+++ b/samples/net/syslog_net/README.rst
@@ -51,9 +51,3 @@ Build syslog_net sample application like this:
    :conf: <config file to use>
    :goals: build
    :compact:
-
-Wi-Fi
-=====
-
-The IPv4 Wi-Fi support can be enabled in the sample with
-:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/syslog_net/sample.yaml b/samples/net/syslog_net/sample.yaml
index 7770f1ea80b..4fe99e593ff 100644
--- a/samples/net/syslog_net/sample.yaml
+++ b/samples/net/syslog_net/sample.yaml
@@ -37,9 +37,3 @@ tests:
       - CONFIG_LOG_BACKEND_NET_AUTOSTART=n
       - CONFIG_LOG_BACKEND_NET_SERVER=""
       - CONFIG_NET_SAMPLE_SERVER_RUNTIME="192.0.2.2:514"
-  sample.net.syslog.wifi.nrf70dk:
-    extra_args:
-      - SNIPPET=wifi-ipv4
-      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
-    platform_allow:
-      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/syslog_net/src/main.c b/samples/net/syslog_net/src/main.c
index da499fec741..f0362648f05 100644
--- a/samples/net/syslog_net/src/main.c
+++ b/samples/net/syslog_net/src/main.c
@@ -15,8 +15,6 @@ LOG_MODULE_REGISTER(net_syslog, LOG_LEVEL_DBG);
 
 #include <stdlib.h>
 
-#include "net_sample_common.h"
-
 BUILD_ASSERT(IS_ENABLED(CONFIG_LOG_BACKEND_NET), "syslog backend not enabled");
 
 #define SLEEP_BETWEEN_PRINTS 3
@@ -27,8 +25,6 @@ int main(void)
 
 	LOG_DBG("Starting");
 
-	wait_for_network();
-
 	if (!IS_ENABLED(CONFIG_LOG_BACKEND_NET_AUTOSTART)) {
 		/* Example how to start the backend if autostart is disabled.
 		 * This is useful if the application needs to wait the network
diff --git a/samples/net/telnet/CMakeLists.txt b/samples/net/telnet/CMakeLists.txt
index 6dfd6ba8ef9..342f2dbee48 100644
--- a/samples/net/telnet/CMakeLists.txt
+++ b/samples/net/telnet/CMakeLists.txt
@@ -6,5 +6,3 @@ project(telnet)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
-
-include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/telnet/README.rst b/samples/net/telnet/README.rst
index 7eb82cd9dda..1c648e2e970 100644
--- a/samples/net/telnet/README.rst
+++ b/samples/net/telnet/README.rst
@@ -128,9 +128,3 @@ On your linux host:
 
 You are now connected, and as for the UART console, you can type in
 your commands and get the output through your telnet client.
-
-Wi-Fi
-=====
-
-The IPv4 Wi-Fi support can be enabled in the sample with
-:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/telnet/sample.yaml b/samples/net/telnet/sample.yaml
index 508b76fe4f6..c3987d33634 100644
--- a/samples/net/telnet/sample.yaml
+++ b/samples/net/telnet/sample.yaml
@@ -1,19 +1,12 @@
-common:
-  harness: net
-  depends_on: netif
-  tags:
-    - net
-    - telnet
 sample:
   name: Telnet Server
 tests:
   sample.net.telnet:
+    harness: net
+    depends_on: netif
+    tags:
+      - net
+      - telnet
     platform_exclude:
       - native_posix
       - native_posix/native/64
-  sample.net.telnet.wifi.nrf70dk:
-    extra_args:
-      - SNIPPET=wifi-ipv4
-      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
-    platform_allow:
-      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/telnet/src/telnet.c b/samples/net/telnet/src/telnet.c
index 6ad77c4f7d3..e1cc53095a4 100644
--- a/samples/net/telnet/src/telnet.c
+++ b/samples/net/telnet/src/telnet.c
@@ -16,8 +16,6 @@ LOG_MODULE_REGISTER(net_telnet_sample, LOG_LEVEL_DBG);
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/net_mgmt.h>
 
-#include "net_sample_common.h"
-
 #if defined(CONFIG_NET_DHCPV4)
 static struct net_mgmt_event_callback mgmt_cb;
 
@@ -142,8 +140,6 @@ int main(void)
 
 	LOG_INF("Starting Telnet sample");
 
-	wait_for_network();
-
 	setup_ipv4(iface);
 
 	setup_dhcpv4(iface);

From 1441d8a2512eb4f96053ee22e9875daadfcfca64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:03 +0100
Subject: [PATCH 1940/2913] Revert "[nrf fromtree] snippets: Add Wi-Fi IPv4
 snippet"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0739495eb3cad2c7198a3a50b558e4ad61563043.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 snippets/wifi-ipv4/README.rst     | 28 ----------------------------
 snippets/wifi-ipv4/snippet.yml    |  3 ---
 snippets/wifi-ipv4/wifi-ipv4.conf | 31 -------------------------------
 3 files changed, 62 deletions(-)
 delete mode 100644 snippets/wifi-ipv4/README.rst
 delete mode 100644 snippets/wifi-ipv4/snippet.yml
 delete mode 100644 snippets/wifi-ipv4/wifi-ipv4.conf

diff --git a/snippets/wifi-ipv4/README.rst b/snippets/wifi-ipv4/README.rst
deleted file mode 100644
index 89139c56d79..00000000000
--- a/snippets/wifi-ipv4/README.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-.. _snippet-wifi-ipv4:
-
-Wi-Fi IPv4 Snippet (wifi-ipv4)
-##############################
-
-.. code-block:: console
-
-   west build -S wifi-ipv4 [...]
-
-Overview
-********
-
-This snippet enables IPv4 Wi-Fi support in supported networking samples.
-The sample execution is postponed until Wi-Fi connectivity is established.
-
-Use Wi-Fi shell to connect to the Wi-Fi network:
-
-.. code-block:: console
-
-   wifi connect -s <SSID> -k <key_management> -p <passphrase>
-
-Requirements
-************
-
-Hardware support for:
-
-- :kconfig:option:`CONFIG_WIFI`
-- :kconfig:option:`CONFIG_WIFI_USE_NATIVE_NETWORKING`
diff --git a/snippets/wifi-ipv4/snippet.yml b/snippets/wifi-ipv4/snippet.yml
deleted file mode 100644
index cde1bb348d8..00000000000
--- a/snippets/wifi-ipv4/snippet.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-name: wifi-ipv4
-append:
-  EXTRA_CONF_FILE: wifi-ipv4.conf
diff --git a/snippets/wifi-ipv4/wifi-ipv4.conf b/snippets/wifi-ipv4/wifi-ipv4.conf
deleted file mode 100644
index 59f4eafc222..00000000000
--- a/snippets/wifi-ipv4/wifi-ipv4.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# Wi-Fi
-CONFIG_WIFI=y
-CONFIG_NET_L2_ETHERNET=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT=y
-
-# Make sure there is enough resources for supplicant and most of the samples
-CONFIG_MAIN_STACK_SIZE=2048
-CONFIG_ZVFS_OPEN_MAX=24
-CONFIG_NET_MAX_CONN=10
-CONFIG_NET_SOCKETS_POLL_MAX=9
-
-# IPv4 only for now
-CONFIG_NET_IPV6=n
-CONFIG_NET_CONFIG_NEED_IPV6=n
-CONFIG_NET_IPV4=y
-
-# DHCPv4
-CONFIG_NET_DHCPV4=y
-CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
-CONFIG_NET_CONFIG_INIT_TIMEOUT=0
-
-# DNS
-CONFIG_DNS_RESOLVER=y
-
-# Connection manager
-CONFIG_NET_CONNECTION_MANAGER=y
-
-# Wi-Fi shell
-CONFIG_NET_SHELL=y
-CONFIG_NET_L2_WIFI_SHELL=y
-CONFIG_SHELL_STACK_SIZE=5200

From afc054d071734564ac1cf42016954348961d14d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:03 +0100
Subject: [PATCH 1941/2913] Revert "[nrf fromtree] samples/net: Don't test on
 native_posix"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cd2db18b942c7589d8b57d831f304a770327a0e2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/net/gptp/boards/native_posix.conf | 8 ++++++++
 samples/net/gptp/sample.yaml              | 2 ++
 samples/net/ipv4_autoconf/sample.yaml     | 2 ++
 samples/net/lldp/sample.yaml              | 2 ++
 4 files changed, 14 insertions(+)
 create mode 100644 samples/net/gptp/boards/native_posix.conf

diff --git a/samples/net/gptp/boards/native_posix.conf b/samples/net/gptp/boards/native_posix.conf
new file mode 100644
index 00000000000..c514520186c
--- /dev/null
+++ b/samples/net/gptp/boards/native_posix.conf
@@ -0,0 +1,8 @@
+# Settings for native_posix ethernet driver
+CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK=y
+
+#CONFIG_ETH_NATIVE_POSIX_RANDOM_MAC=y
+CONFIG_ETH_NATIVE_POSIX_MAC_ADDR="00:00:5e:00:53:2a"
+
+# Assume 1 ms accuracy for native_posix simulated clock
+CONFIG_NET_GPTP_CLOCK_ACCURACY_1MS=y
diff --git a/samples/net/gptp/sample.yaml b/samples/net/gptp/sample.yaml
index c2698bae1aa..44bf695d628 100644
--- a/samples/net/gptp/sample.yaml
+++ b/samples/net/gptp/sample.yaml
@@ -11,6 +11,8 @@ tests:
     platform_allow:
       - frdm_k64f
       - sam_e70_xplained/same70q21
+      - native_posix
+      - native_posix/native/64
       - native_sim
       - native_sim/native/64
       - nucleo_f767zi
diff --git a/samples/net/ipv4_autoconf/sample.yaml b/samples/net/ipv4_autoconf/sample.yaml
index 88e39ec2356..0322a31ad75 100644
--- a/samples/net/ipv4_autoconf/sample.yaml
+++ b/samples/net/ipv4_autoconf/sample.yaml
@@ -5,6 +5,8 @@ common:
     - ipv4_autoconf
   platform_allow:
     - qemu_x86
+    - native_posix
+    - native_posix/native/64
     - native_sim
     - native_sim/native/64
   integration_platforms:
diff --git a/samples/net/lldp/sample.yaml b/samples/net/lldp/sample.yaml
index 27f26d18590..ee465be7883 100644
--- a/samples/net/lldp/sample.yaml
+++ b/samples/net/lldp/sample.yaml
@@ -9,6 +9,8 @@ sample:
 tests:
   sample.net.lldp:
     platform_allow:
+      - native_posix
+      - native_posix/native/64
       - native_sim
       - native_sim/native/64
     integration_platforms:

From af5417791ef77a70b8a7c7369748f2ad79e11df4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:03 +0100
Subject: [PATCH 1942/2913] Revert "[nrf fromtree] cmake: linker: evaluate
 CONFIG_LINKER_ITERABLE_SUBALIGN in CMake"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 96e5f03cf6be73ab91cf4db221b405a58993fbb6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/linker_script/common/common-ram.cmake   | 80 ++++++++---------
 cmake/linker_script/common/common-rom.cmake   | 90 +++++++++----------
 .../net/sockets/coap_server/CMakeLists.txt    |  2 +-
 subsys/net/conn_mgr/CMakeLists.txt            |  2 +-
 subsys/net/l2/wifi/CMakeLists.txt             |  2 +-
 tests/misc/iterable_sections/CMakeLists.txt   | 20 ++---
 .../net/lib/http_server/common/CMakeLists.txt |  4 +-
 tests/net/lib/http_server/core/CMakeLists.txt |  2 +-
 .../net/lib/http_server/crime/CMakeLists.txt  |  2 +-
 tests/net/lib/http_server/tls/CMakeLists.txt  |  2 +-
 10 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/cmake/linker_script/common/common-ram.cmake b/cmake/linker_script/common/common-ram.cmake
index 48e0c6010aa..091da6ff541 100644
--- a/cmake/linker_script/common/common-ram.cmake
+++ b/cmake/linker_script/common/common-ram.cmake
@@ -18,10 +18,10 @@ zephyr_linker_section_configure(SECTION device_states
 )
 
 if(CONFIG_PM_DEVICE)
-  zephyr_iterable_section(NAME pm_device_slots GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME pm_device_slots GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
-zephyr_iterable_section(NAME log_dynamic GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME log_dynamic GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 
 if(CONFIG_USERSPACE)
   # All kernel objects within are assumed to be either completely
@@ -32,35 +32,35 @@ if(CONFIG_USERSPACE)
   #   _static_kernel_objects_begin = .;
 endif()
 
-zephyr_iterable_section(NAME k_timer GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_mem_slab GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_heap GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_mutex GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_stack GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_msgq GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_mbox GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_pipe GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_sem GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_queue GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_condvar GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_event GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_fifo GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_timer GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME k_mem_slab GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME k_heap GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME k_mutex GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME k_stack GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME k_msgq GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME k_mbox GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME k_pipe GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME k_sem GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME k_queue GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME k_condvar GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME k_event GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME k_fifo GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 
-zephyr_iterable_section(NAME net_buf_pool GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME net_buf_pool GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 
 if(CONFIG_NETWORKING)
-  zephyr_iterable_section(NAME net_if     GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME net_if_dev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME net_l2     GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME eth_bridge GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME net_if     GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME net_if_dev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME net_l2     GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME eth_bridge GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_ARM_SCMI)
-  zephyr_iterable_section(NAME scmi_protocol GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME scmi_protocol GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_SENSING)
-  zephyr_iterable_section(NAME sensing_sensor GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME sensing_sensor GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_USB_DEVICE_STACK)
@@ -83,8 +83,8 @@ if(CONFIG_USB_DEVICE_BOS)
 endif()
 
 if(CONFIG_RTIO)
-  zephyr_iterable_section(NAME rtio GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME rtio_iodev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME rtio GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME rtio_iodev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 #if(CONFIG_USERSPACE)
@@ -93,11 +93,11 @@ endif()
 #
 
 if(CONFIG_ZTEST)
-  zephyr_iterable_section(NAME ztest_suite_node GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME ztest_suite_stats GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME ztest_unit_test GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME ztest_test_rule GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME ztest_expected_result_entry GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME ztest_suite_node GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME ztest_suite_stats GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME ztest_unit_test GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME ztest_test_rule GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME ztest_expected_result_entry GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_ZBUS)
@@ -105,31 +105,31 @@ if(CONFIG_ZBUS)
 endif()
 
 if(CONFIG_UVB)
-  zephyr_iterable_section(NAME uvb_node GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME uvb_node GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 
 if(CONFIG_LOG)
-  zephyr_iterable_section(NAME log_mpsc_pbuf GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME log_msg_ptr GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME log_mpsc_pbuf GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME log_msg_ptr GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_PCIE)
-  zephyr_iterable_section(NAME pcie_dev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME pcie_dev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_USB_DEVICE_STACK OR CONFIG_USB_DEVICE_STACK_NEXT)
-  zephyr_iterable_section(NAME usb_cfg_data GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME usbd_context GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME usbd_class_fs GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME usbd_class_hs GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME usb_cfg_data GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME usbd_context GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME usbd_class_fs GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME usbd_class_hs GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_USB_HOST_STACK)
-  zephyr_iterable_section(NAME usbh_contex GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME usbh_class_data GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME usbh_contex GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME usbh_class_data GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_DEVICE_MUTABLE)
-  zephyr_iterable_section(NAME device_mutable GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME device_mutable GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
diff --git a/cmake/linker_script/common/common-rom.cmake b/cmake/linker_script/common/common-rom.cmake
index 868e9f382d9..2fd4fcedb47 100644
--- a/cmake/linker_script/common/common-rom.cmake
+++ b/cmake/linker_script/common/common-rom.cmake
@@ -11,7 +11,7 @@ zephyr_linker_section_obj_level(SECTION init LEVEL SMP)
 zephyr_linker_section(NAME deferred_init_list KVMA RAM_REGION GROUP RODATA_REGION)
 zephyr_linker_section_configure(SECTION deferred_init_list INPUT ".z_deferred_init*" KEEP SORT NAME)
 
-zephyr_iterable_section(NAME device NUMERIC KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME device NUMERIC KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 
 if(CONFIG_GEN_SW_ISR_TABLE AND NOT CONFIG_DYNAMIC_INTERRUPTS)
   # ld align has been changed to subalign to provide identical behavior scatter vs. ld.
@@ -92,98 +92,98 @@ zephyr_linker_section_configure(
 )
 
 if(CONFIG_NET_SOCKETS)
-  zephyr_iterable_section(NAME net_socket_register KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME net_socket_register KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 
 if(CONFIG_NET_L2_PPP)
-  zephyr_iterable_section(NAME ppp_protocol_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME ppp_protocol_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
-zephyr_iterable_section(NAME bt_l2cap_fixed_chan KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME bt_l2cap_fixed_chan KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 
 if(CONFIG_BT_CLASSIC)
-  zephyr_iterable_section(NAME bt_l2cap_br_fixed_chan KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME bt_l2cap_br_fixed_chan KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_BT_CONN)
-  zephyr_iterable_section(NAME bt_conn_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME bt_conn_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
-zephyr_iterable_section(NAME bt_gatt_service_static KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME bt_gatt_service_static KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 
 if(CONFIG_BT_MESH)
-  zephyr_iterable_section(NAME bt_mesh_subnet_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME bt_mesh_app_key_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME bt_mesh_subnet_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME bt_mesh_app_key_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 
-  zephyr_iterable_section(NAME bt_mesh_hb_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME bt_mesh_hb_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_BT_MESH_FRIEND)
-  zephyr_iterable_section(NAME bt_mesh_friend_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME bt_mesh_friend_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_BT_MESH_LOW_POWER)
-  zephyr_iterable_section(NAME bt_mesh_lpn_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME bt_mesh_lpn_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_BT_MESH_PROXY)
-  zephyr_iterable_section(NAME bt_mesh_proxy_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME bt_mesh_proxy_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_EC_HOST_CMD)
-  zephyr_iterable_section(NAME ec_host_cmd_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME ec_host_cmd_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_SETTINGS)
-  zephyr_iterable_section(NAME settings_handler_static KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME settings_handler_static KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_SENSING)
-  zephyr_iterable_section(NAME sensing_sensor_info KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME sensing_sensor_info KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_SENSOR_INFO)
-  zephyr_iterable_section(NAME sensor_info KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME sensor_info KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_SENSOR_ASYNC_API)
-  zephyr_iterable_section(NAME sensor_decoder_api KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME sensor_decoder_api KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_MCUMGR)
-  zephyr_iterable_section(NAME mcumgr_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME mcumgr_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
-zephyr_iterable_section(NAME k_p4wq_initparam KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_p4wq_initparam KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 
 if(CONFIG_EMUL)
-  zephyr_iterable_section(NAME emul KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME emul KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_DNS_SD)
-  zephyr_iterable_section(NAME dns_sd_rec KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME dns_sd_rec KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_PCIE)
-  zephyr_iterable_section(NAME irq_alloc KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME irq_alloc KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
-zephyr_iterable_section(NAME log_strings KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME log_strings KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 
-zephyr_iterable_section(NAME log_const KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME log_const KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 
-zephyr_iterable_section(NAME shell KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME shell KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 
-zephyr_iterable_section(NAME shell_root_cmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME shell_root_cmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 
-zephyr_iterable_section(NAME shell_subcmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME shell_subcmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 
-zephyr_iterable_section(NAME shell_dynamic_subcmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME shell_dynamic_subcmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 
-zephyr_iterable_section(NAME cfb_font KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME cfb_font KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 
-zephyr_iterable_section(NAME tracing_backend KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME tracing_backend KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 
 zephyr_linker_section(NAME zephyr_dbg_info KVMA RAM_REGION GROUP RODATA_REGION NOINPUT ${XIP_ALIGN_WITH_INPUT})
 zephyr_linker_section_configure(SECTION zephyr_dbg_info INPUT ".zephyr_dbg_info" KEEP)
@@ -199,15 +199,15 @@ if (CONFIG_DEVICE_DEPS)
   zephyr_linker_section_configure(SECTION device_deps INPUT .__device_deps_pass2* KEEP SORT NAME PASS NOT LINKER_DEVICE_DEPS_PASS1)
 endif()
 
-zephyr_iterable_section(NAME _static_thread_data KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME _static_thread_data KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 
 if (CONFIG_BT_IAS)
-  zephyr_iterable_section(NAME bt_ias_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME bt_ias_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if (CONFIG_LOG)
-  zephyr_iterable_section(NAME log_link KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME log_backend KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME log_link KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME log_backend KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if (CONFIG_MULTI_LEVEL_INTERRUPTS)
@@ -215,35 +215,35 @@ if (CONFIG_MULTI_LEVEL_INTERRUPTS)
 endif()
 
 if (CONFIG_HTTP_SERVER)
-  zephyr_iterable_section(NAME http_service_desc KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME http_service_desc KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if (CONFIG_COAP_SERVER)
-  zephyr_iterable_section(NAME coap_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME coap_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if (CONFIG_NET_MGMT)
-  zephyr_iterable_section(NAME net_mgmt_event_static_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME net_mgmt_event_static_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_INPUT)
-  zephyr_iterable_section(NAME input_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME input_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_USBD_MSC_CLASS)
-  zephyr_iterable_section(NAME usbd_msc_lun KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME usbd_msc_lun KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_ZBUS)
-  zephyr_iterable_section(NAME zbus_channel KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME zbus_observer KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME zbus_channel_observation KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME zbus_channel KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME zbus_observer KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME zbus_channel_observation KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_GNSS)
-  zephyr_iterable_section(NAME gnss_data_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME gnss_data_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 if(CONFIG_GNSS_SATELLITES)
-  zephyr_iterable_section(NAME gnss_satellites_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME gnss_satellites_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
diff --git a/samples/net/sockets/coap_server/CMakeLists.txt b/samples/net/sockets/coap_server/CMakeLists.txt
index 418e31e7d2f..932e3cfdeeb 100644
--- a/samples/net/sockets/coap_server/CMakeLists.txt
+++ b/samples/net/sockets/coap_server/CMakeLists.txt
@@ -15,4 +15,4 @@ zephyr_linker_sources(DATA_SECTIONS sections-ram.ld)
 zephyr_iterable_section(
   NAME coap_resource_coap_server
   GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT}
-  SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
diff --git a/subsys/net/conn_mgr/CMakeLists.txt b/subsys/net/conn_mgr/CMakeLists.txt
index d9a6cd30c0c..68ca0f1388f 100644
--- a/subsys/net/conn_mgr/CMakeLists.txt
+++ b/subsys/net/conn_mgr/CMakeLists.txt
@@ -10,4 +10,4 @@ zephyr_library_sources(
 	)
 
 zephyr_linker_sources(DATA_SECTIONS conn_mgr.ld)
-zephyr_iterable_section(NAME conn_mgr_conn_binding GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME conn_mgr_conn_binding GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
diff --git a/subsys/net/l2/wifi/CMakeLists.txt b/subsys/net/l2/wifi/CMakeLists.txt
index bab445e8262..6548e814bc3 100644
--- a/subsys/net/l2/wifi/CMakeLists.txt
+++ b/subsys/net/l2/wifi/CMakeLists.txt
@@ -20,7 +20,7 @@ zephyr_library_sources_ifdef(CONFIG_NET_L2_WIFI_UTILS wifi_utils.c)
 # Linker section placement for wifi_nm_instance iterable structure
 zephyr_linker_sources_ifdef(CONFIG_WIFI_NM DATA_SECTIONS wifi_nm.ld)
 if (CONFIG_WIFI_NM)
-zephyr_iterable_section(NAME wifi_nm_instance GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME wifi_nm_instance GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 endif()
 
 # Wi-Fi Enterprise test certificates handling
diff --git a/tests/misc/iterable_sections/CMakeLists.txt b/tests/misc/iterable_sections/CMakeLists.txt
index 2519c45a5c3..350c2a5ca0e 100644
--- a/tests/misc/iterable_sections/CMakeLists.txt
+++ b/tests/misc/iterable_sections/CMakeLists.txt
@@ -8,15 +8,15 @@ FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
 
 zephyr_linker_sources(DATA_SECTIONS sections-ram.ld)
-zephyr_iterable_section(NAME test_ram GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME test_ram2 GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME test_ram_named GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME test_ram_numeric NUMERIC GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME ramn_alt GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME test_ram GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME test_ram2 GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME test_ram_named GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME test_ram_numeric NUMERIC GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME ramn_alt GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
 
 zephyr_linker_sources(SECTIONS sections-rom.ld)
-zephyr_iterable_section(NAME test_rom KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME test_rom2 KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME test_rom_named KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME test_rom_numeric NUMERIC KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME romn_alt KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME test_rom KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME test_rom2 KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME test_rom_named KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME test_rom_numeric NUMERIC KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME romn_alt KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
diff --git a/tests/net/lib/http_server/common/CMakeLists.txt b/tests/net/lib/http_server/common/CMakeLists.txt
index a2e5b499808..add7abe2de3 100644
--- a/tests/net/lib/http_server/common/CMakeLists.txt
+++ b/tests/net/lib/http_server/common/CMakeLists.txt
@@ -8,5 +8,5 @@ FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
 
 zephyr_linker_sources(SECTIONS sections-rom.ld)
-zephyr_iterable_section(NAME http_resource_desc_service_A KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME http_resource_desc_service_B KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME http_resource_desc_service_A KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME http_resource_desc_service_B KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
diff --git a/tests/net/lib/http_server/core/CMakeLists.txt b/tests/net/lib/http_server/core/CMakeLists.txt
index 7d47b3be9e2..aa64e0bcf6e 100644
--- a/tests/net/lib/http_server/core/CMakeLists.txt
+++ b/tests/net/lib/http_server/core/CMakeLists.txt
@@ -15,4 +15,4 @@ set(gen_dir ${ZEPHYR_BINARY_DIR}/include/generated/)
 target_link_libraries(app PRIVATE zephyr_interface zephyr)
 
 zephyr_linker_sources(SECTIONS sections-rom.ld)
-zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
diff --git a/tests/net/lib/http_server/crime/CMakeLists.txt b/tests/net/lib/http_server/crime/CMakeLists.txt
index 0e930e194d7..d991ae1d3f6 100644
--- a/tests/net/lib/http_server/crime/CMakeLists.txt
+++ b/tests/net/lib/http_server/crime/CMakeLists.txt
@@ -21,4 +21,4 @@ generate_inc_file_for_target(app ${source_file_not_found} ${gen_dir}/not_found_p
 generate_inc_file_for_target(app ${source_file_not_found} ${gen_dir}/not_found_page.html.gz.inc --gzip)
 
 zephyr_linker_sources(SECTIONS sections-rom.ld)
-zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
diff --git a/tests/net/lib/http_server/tls/CMakeLists.txt b/tests/net/lib/http_server/tls/CMakeLists.txt
index f277bc750b2..35f1805f63e 100644
--- a/tests/net/lib/http_server/tls/CMakeLists.txt
+++ b/tests/net/lib/http_server/tls/CMakeLists.txt
@@ -51,4 +51,4 @@ FILE(GLOB app_sources src/main.c)
 target_sources(app PRIVATE ${app_sources})
 
 zephyr_linker_sources(SECTIONS sections-rom.ld)
-zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)

From e90e1f7a87514931c43b95e37aa9df9646c05976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:03 +0100
Subject: [PATCH 1943/2913] Revert "[nrf fromtree] drivers: nrf_qspi_nor: Check
 poll period before sleep"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit edc4776c91baf7a6fa93b8a18be81a61127635a7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/flash/nrf_qspi_nor.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/flash/nrf_qspi_nor.c b/drivers/flash/nrf_qspi_nor.c
index 73213a1ce30..44fcc6b7629 100644
--- a/drivers/flash/nrf_qspi_nor.c
+++ b/drivers/flash/nrf_qspi_nor.c
@@ -488,9 +488,7 @@ static int qspi_wait_while_writing(const struct device *dev, k_timeout_t poll_pe
 
 	do {
 #ifdef CONFIG_MULTITHREADING
-		if (!K_TIMEOUT_EQ(poll_period, K_NO_WAIT)) {
-			k_sleep(poll_period);
-		}
+		k_sleep(poll_period);
 #endif
 		rc = qspi_rdsr(dev, 1);
 	} while ((rc >= 0)

From 1f91fa4518c0ec177e53d4e7dadfe7996bba5ca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:03 +0100
Subject: [PATCH 1944/2913] Revert "[nrf fromtree] drivers: nrf_qspi_nor: Fix
 build without multithreading"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7745607684110ad7dc60526f1844b6c6bee5359e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/flash/nrf_qspi_nor.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/flash/nrf_qspi_nor.c b/drivers/flash/nrf_qspi_nor.c
index 44fcc6b7629..0c4faf99dff 100644
--- a/drivers/flash/nrf_qspi_nor.c
+++ b/drivers/flash/nrf_qspi_nor.c
@@ -487,9 +487,7 @@ static int qspi_wait_while_writing(const struct device *dev, k_timeout_t poll_pe
 	int rc;
 
 	do {
-#ifdef CONFIG_MULTITHREADING
 		k_sleep(poll_period);
-#endif
 		rc = qspi_rdsr(dev, 1);
 	} while ((rc >= 0)
 		 && ((rc & SPI_NOR_WIP_BIT) != 0U));

From 02f5b602b2b78c7f203c04e0e3279d0872a634e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:03 +0100
Subject: [PATCH 1945/2913] Revert "[nrf fromtree] net: sockets: Move
 msghdr_non_empty_iov_count() to common file"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7bfcd5bcb4798f2bd1b47aafaa48c6ccb81eb1fb.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/sockets/sockets.c      | 13 -------------
 subsys/net/lib/sockets/sockets_inet.c | 13 +++++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/subsys/net/lib/sockets/sockets.c b/subsys/net/lib/sockets/sockets.c
index be7ba5ad967..8b420cc9e68 100644
--- a/subsys/net/lib/sockets/sockets.c
+++ b/subsys/net/lib/sockets/sockets.c
@@ -74,19 +74,6 @@ static inline void *get_sock_vtable(int sock,
 	return ctx;
 }
 
-size_t msghdr_non_empty_iov_count(const struct msghdr *msg)
-{
-	size_t non_empty_iov_count = 0;
-
-	for (size_t i = 0; i < msg->msg_iovlen; i++) {
-		if (msg->msg_iov[i].iov_len) {
-			non_empty_iov_count++;
-		}
-	}
-
-	return non_empty_iov_count;
-}
-
 void *z_impl_zsock_get_context_object(int sock)
 {
 	const struct socket_op_vtable *ignored;
diff --git a/subsys/net/lib/sockets/sockets_inet.c b/subsys/net/lib/sockets/sockets_inet.c
index 88e4e47bfe4..10de541fc8f 100644
--- a/subsys/net/lib/sockets/sockets_inet.c
+++ b/subsys/net/lib/sockets/sockets_inet.c
@@ -640,6 +640,19 @@ ssize_t zsock_sendto_ctx(struct net_context *ctx, const void *buf, size_t len,
 	return status;
 }
 
+size_t msghdr_non_empty_iov_count(const struct msghdr *msg)
+{
+	size_t non_empty_iov_count = 0;
+
+	for (size_t i = 0; i < msg->msg_iovlen; i++) {
+		if (msg->msg_iov[i].iov_len) {
+			non_empty_iov_count++;
+		}
+	}
+
+	return non_empty_iov_count;
+}
+
 ssize_t zsock_sendmsg_ctx(struct net_context *ctx, const struct msghdr *msg,
 			  int flags)
 {

From 2b944cc99072365fae0cb1ad697c22de0cd86d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:03 +0100
Subject: [PATCH 1946/2913] Revert "[nrf fromtree] net: if: Don't require
 native IP stack support for IPv6 lookups"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9a63323f0d009a23dd1ae2f5d95e0fc608a43d51.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/net_if.h | 6 +++---
 subsys/net/ip/net_if.c      | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/include/zephyr/net/net_if.h b/include/zephyr/net/net_if.h
index 7795f565976..0e0e619a831 100644
--- a/include/zephyr/net/net_if.h
+++ b/include/zephyr/net/net_if.h
@@ -2038,7 +2038,7 @@ static inline uint32_t net_if_ipv6_get_retrans_timer(struct net_if *iface)
  * @return Pointer to IPv6 address to use, NULL if no IPv6 address
  * could be found.
  */
-#if defined(CONFIG_NET_IPV6)
+#if defined(CONFIG_NET_NATIVE_IPV6)
 const struct in6_addr *net_if_ipv6_select_src_addr(struct net_if *iface,
 						   const struct in6_addr *dst);
 #else
@@ -2065,7 +2065,7 @@ static inline const struct in6_addr *net_if_ipv6_select_src_addr(
  * @return Pointer to IPv6 address to use, NULL if no IPv6 address
  * could be found.
  */
-#if defined(CONFIG_NET_IPV6)
+#if defined(CONFIG_NET_NATIVE_IPV6)
 const struct in6_addr *net_if_ipv6_select_src_addr_hint(struct net_if *iface,
 							const struct in6_addr *dst,
 							int flags);
@@ -2090,7 +2090,7 @@ static inline const struct in6_addr *net_if_ipv6_select_src_addr_hint(
  * @return Pointer to network interface to use, NULL if no suitable interface
  * could be found.
  */
-#if defined(CONFIG_NET_IPV6)
+#if defined(CONFIG_NET_NATIVE_IPV6)
 struct net_if *net_if_ipv6_select_src_iface(const struct in6_addr *dst);
 #else
 static inline struct net_if *net_if_ipv6_select_src_iface(
diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c
index 8bceee7a29d..0652b8c75d3 100644
--- a/subsys/net/ip/net_if.c
+++ b/subsys/net/ip/net_if.c
@@ -2983,8 +2983,6 @@ void net_if_ipv6_set_hop_limit(struct net_if *iface, uint8_t hop_limit)
 	net_if_unlock(iface);
 }
 
-#endif /* CONFIG_NET_NATIVE_IPV6 */
-
 static uint8_t get_diff_ipv6(const struct in6_addr *src,
 			  const struct in6_addr *dst)
 {
@@ -3210,8 +3208,6 @@ struct net_if *net_if_ipv6_select_src_iface(const struct in6_addr *dst)
 	return iface;
 }
 
-#if defined(CONFIG_NET_NATIVE_IPV6)
-
 uint32_t net_if_ipv6_calc_reachable_time(struct net_if_ipv6 *ipv6)
 {
 	uint32_t min_reachable, max_reachable;

From cb8f30a6eb1cf6dbae0835758c861e58223f49cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:03 +0100
Subject: [PATCH 1947/2913] Revert "[nrf fromtree] net: ipv6: Make Multicast
 Listener Discovery API public"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0c4568949e0b42465a393106d95b83ec2436b112.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/mld.h                   | 84 ----------------------
 samples/net/sockets/coap_server/src/main.c |  1 -
 subsys/net/ip/ipv6.h                       | 42 +++++++++++
 subsys/net/ip/ipv6_mld.c                   |  1 -
 subsys/net/ip/net_if.c                     |  1 -
 subsys/net/lib/dns/llmnr_responder.c       |  1 -
 subsys/net/lib/dns/mdns_responder.c        |  1 -
 subsys/net/lib/shell/ipv6.c                |  2 -
 subsys/net/lib/sockets/sockets_inet.c      |  1 -
 subsys/net/lib/zperf/zperf_udp_receiver.c  |  1 -
 tests/net/ipv6/src/main.c                  |  1 -
 tests/net/mld/src/main.c                   |  1 -
 12 files changed, 42 insertions(+), 95 deletions(-)
 delete mode 100644 include/zephyr/net/mld.h

diff --git a/include/zephyr/net/mld.h b/include/zephyr/net/mld.h
deleted file mode 100644
index 031eb03c931..00000000000
--- a/include/zephyr/net/mld.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2016 Intel Corporation
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/** @file
- * @brief Multicast Listener Discovery API
- */
-
-#ifndef ZEPHYR_INCLUDE_NET_MLD_H_
-#define ZEPHYR_INCLUDE_NET_MLD_H_
-
-/**
- * @brief MLD (Multicast Listener Discovery)
- * @defgroup mld Multicast Listener Discovery API
- * @since 1.8
- * @version 0.8.0
- * @ingroup networking
- * @{
- */
-
-#include <errno.h>
-
-#include <zephyr/net/net_if.h>
-#include <zephyr/net/net_ip.h>
-#include <zephyr/toolchain.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @brief Join a given multicast group.
- *
- * @param iface Network interface where join message is sent
- * @param addr Multicast group to join
- *
- * @return 0 if joining was done, <0 otherwise.
- */
-#if defined(CONFIG_NET_IPV6_MLD)
-int net_ipv6_mld_join(struct net_if *iface, const struct in6_addr *addr);
-#else
-static inline int
-net_ipv6_mld_join(struct net_if *iface, const struct in6_addr *addr)
-{
-	ARG_UNUSED(addr);
-	ARG_UNUSED(iface);
-
-	return -ENOTSUP;
-}
-#endif /* CONFIG_NET_IPV6_MLD */
-
-/**
- * @brief Leave a given multicast group.
- *
- * @param iface Network interface where leave message is sent
- * @param addr Multicast group to leave
- *
- * @return 0 if leaving is done, <0 otherwise.
- */
-#if defined(CONFIG_NET_IPV6_MLD)
-int net_ipv6_mld_leave(struct net_if *iface, const struct in6_addr *addr);
-#else
-static inline int
-net_ipv6_mld_leave(struct net_if *iface, const struct in6_addr *addr)
-{
-	ARG_UNUSED(iface);
-	ARG_UNUSED(addr);
-
-	return -ENOTSUP;
-}
-#endif /* CONFIG_NET_IPV6_MLD */
-
-#ifdef __cplusplus
-}
-#endif
-
-/**
- * @}
- */
-
-#endif /* ZEPHYR_INCLUDE_NET_MLD_H_ */
diff --git a/samples/net/sockets/coap_server/src/main.c b/samples/net/sockets/coap_server/src/main.c
index 60dd32a000b..4f476511b2c 100644
--- a/samples/net/sockets/coap_server/src/main.c
+++ b/samples/net/sockets/coap_server/src/main.c
@@ -8,7 +8,6 @@
 LOG_MODULE_REGISTER(net_coap_service_sample, LOG_LEVEL_DBG);
 
 #include <zephyr/net/coap_service.h>
-#include <zephyr/net/mld.h>
 
 #ifdef CONFIG_NET_IPV6
 #include "net_private.h"
diff --git a/subsys/net/ip/ipv6.h b/subsys/net/ip/ipv6.h
index 68115f818c2..2dbd1189a6a 100644
--- a/subsys/net/ip/ipv6.h
+++ b/subsys/net/ip/ipv6.h
@@ -198,6 +198,48 @@ static inline int net_ipv6_finalize(struct net_pkt *pkt,
 }
 #endif
 
+/**
+ * @brief Join a given multicast group.
+ *
+ * @param iface Network interface where join message is sent
+ * @param addr Multicast group to join
+ *
+ * @return Return 0 if joining was done, <0 otherwise.
+ */
+#if defined(CONFIG_NET_IPV6_MLD)
+int net_ipv6_mld_join(struct net_if *iface, const struct in6_addr *addr);
+#else
+static inline int
+net_ipv6_mld_join(struct net_if *iface, const struct in6_addr *addr)
+{
+	ARG_UNUSED(iface);
+	ARG_UNUSED(addr);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_NET_IPV6_MLD */
+
+/**
+ * @brief Leave a given multicast group.
+ *
+ * @param iface Network interface where leave message is sent
+ * @param addr Multicast group to leave
+ *
+ * @return Return 0 if leaving is done, <0 otherwise.
+ */
+#if defined(CONFIG_NET_IPV6_MLD)
+int net_ipv6_mld_leave(struct net_if *iface, const struct in6_addr *addr);
+#else
+static inline int
+net_ipv6_mld_leave(struct net_if *iface, const struct in6_addr *addr)
+{
+	ARG_UNUSED(iface);
+	ARG_UNUSED(addr);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_NET_IPV6_MLD */
+
 /**
  * @brief Send MLDv2 report message with a single entry.
  *
diff --git a/subsys/net/ip/ipv6_mld.c b/subsys/net/ip/ipv6_mld.c
index 66166fd1d3b..75644c2ca58 100644
--- a/subsys/net/ip/ipv6_mld.c
+++ b/subsys/net/ip/ipv6_mld.c
@@ -12,7 +12,6 @@
 LOG_MODULE_DECLARE(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL);
 
 #include <errno.h>
-#include <zephyr/net/mld.h>
 #include <zephyr/net/net_core.h>
 #include <zephyr/net/net_pkt.h>
 #include <zephyr/net/net_stats.h>
diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c
index 0652b8c75d3..c03ec771481 100644
--- a/subsys/net/ip/net_if.c
+++ b/subsys/net/ip/net_if.c
@@ -17,7 +17,6 @@ LOG_MODULE_REGISTER(net_if, CONFIG_NET_IF_LOG_LEVEL);
 #include <string.h>
 #include <zephyr/net/igmp.h>
 #include <zephyr/net/ipv4_autoconf.h>
-#include <zephyr/net/mld.h>
 #include <zephyr/net/net_core.h>
 #include <zephyr/net/net_event.h>
 #include <zephyr/net/net_pkt.h>
diff --git a/subsys/net/lib/dns/llmnr_responder.c b/subsys/net/lib/dns/llmnr_responder.c
index 133fce7ba60..21832efdf67 100644
--- a/subsys/net/lib/dns/llmnr_responder.c
+++ b/subsys/net/lib/dns/llmnr_responder.c
@@ -21,7 +21,6 @@ LOG_MODULE_REGISTER(net_llmnr_responder, CONFIG_LLMNR_RESPONDER_LOG_LEVEL);
 #include <errno.h>
 #include <stdlib.h>
 
-#include <zephyr/net/mld.h>
 #include <zephyr/net/net_ip.h>
 #include <zephyr/net/net_pkt.h>
 #include <zephyr/net/dns_resolve.h>
diff --git a/subsys/net/lib/dns/mdns_responder.c b/subsys/net/lib/dns/mdns_responder.c
index 93b62016090..43b07d694c5 100644
--- a/subsys/net/lib/dns/mdns_responder.c
+++ b/subsys/net/lib/dns/mdns_responder.c
@@ -22,7 +22,6 @@ LOG_MODULE_REGISTER(net_mdns_responder, CONFIG_MDNS_RESPONDER_LOG_LEVEL);
 #include <errno.h>
 #include <stdlib.h>
 
-#include <zephyr/net/mld.h>
 #include <zephyr/net/net_core.h>
 #include <zephyr/net/net_ip.h>
 #include <zephyr/net/net_pkt.h>
diff --git a/subsys/net/lib/shell/ipv6.c b/subsys/net/lib/shell/ipv6.c
index eb65185c03c..d13b6803e65 100644
--- a/subsys/net/lib/shell/ipv6.c
+++ b/subsys/net/lib/shell/ipv6.c
@@ -8,8 +8,6 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_shell);
 
-#include <zephyr/net/mld.h>
-
 #include "net_shell_private.h"
 #include "../ip/ipv6.h"
 
diff --git a/subsys/net/lib/sockets/sockets_inet.c b/subsys/net/lib/sockets/sockets_inet.c
index 10de541fc8f..4a51fd3f0dc 100644
--- a/subsys/net/lib/sockets/sockets_inet.c
+++ b/subsys/net/lib/sockets/sockets_inet.c
@@ -11,7 +11,6 @@
 LOG_MODULE_DECLARE(net_sock, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <zephyr/kernel.h>
-#include <zephyr/net/mld.h>
 #include <zephyr/net/net_context.h>
 #include <zephyr/net/net_pkt.h>
 #include <zephyr/tracing/tracing.h>
diff --git a/subsys/net/lib/zperf/zperf_udp_receiver.c b/subsys/net/lib/zperf/zperf_udp_receiver.c
index 2f0d292f7ad..0f7e1e4f077 100644
--- a/subsys/net/lib/zperf/zperf_udp_receiver.c
+++ b/subsys/net/lib/zperf/zperf_udp_receiver.c
@@ -12,7 +12,6 @@ LOG_MODULE_DECLARE(net_zperf, CONFIG_NET_ZPERF_LOG_LEVEL);
 
 #include <zephyr/kernel.h>
 
-#include <zephyr/net/mld.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/socket_service.h>
 #include <zephyr/net/zperf.h>
diff --git a/tests/net/ipv6/src/main.c b/tests/net/ipv6/src/main.c
index 1dd40afcde8..02df9ac650c 100644
--- a/tests/net/ipv6/src/main.c
+++ b/tests/net/ipv6/src/main.c
@@ -19,7 +19,6 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 
 #include <zephyr/ztest.h>
 
-#include <zephyr/net/mld.h>
 #include <zephyr/net/net_core.h>
 #include <zephyr/net/net_pkt.h>
 #include <zephyr/net/net_ip.h>
diff --git a/tests/net/mld/src/main.c b/tests/net/mld/src/main.c
index 1c95fe5409d..e1bcce056cf 100644
--- a/tests/net/mld/src/main.c
+++ b/tests/net/mld/src/main.c
@@ -18,7 +18,6 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 
 #include <zephyr/ztest.h>
 
-#include <zephyr/net/mld.h>
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/net_pkt.h>
 #include <zephyr/net/net_ip.h>

From 01469f8678183c92c0e7b92dbe56b4e85a53671c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:03 +0100
Subject: [PATCH 1948/2913] Revert "[nrf fromtree] net: sockets: Remove
 SET_ERRNO() macro"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e36666a23c2b488ff8169455f4cdf45326db79e6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/sockets/sockets_inet.c | 184 ++++++++------------------
 1 file changed, 54 insertions(+), 130 deletions(-)

diff --git a/subsys/net/lib/sockets/sockets_inet.c b/subsys/net/lib/sockets/sockets_inet.c
index 4a51fd3f0dc..9403cdd152a 100644
--- a/subsys/net/lib/sockets/sockets_inet.c
+++ b/subsys/net/lib/sockets/sockets_inet.c
@@ -34,6 +34,9 @@ LOG_MODULE_DECLARE(net_sock, CONFIG_NET_SOCKETS_LOG_LEVEL);
 #include "../../ip/tcp_internal.h"
 #include "../../ip/net_private.h"
 
+#define SET_ERRNO(x) \
+	{ int _err = x; if (_err < 0) { errno = -_err; return -1; } }
+
 const struct socket_op_vtable sock_fd_op_vtable;
 
 static void zsock_received_cb(struct net_context *ctx,
@@ -138,8 +141,6 @@ static int zsock_socket_internal(int family, int type, int proto)
 
 int zsock_close_ctx(struct net_context *ctx)
 {
-	int ret;
-
 	/* Reset callbacks to avoid any race conditions while
 	 * flushing queues. No need to check return values here,
 	 * as these are fail-free operations and we're closing
@@ -156,11 +157,7 @@ int zsock_close_ctx(struct net_context *ctx)
 
 	zsock_flush_queue(ctx);
 
-	ret = net_context_put(ctx);
-	if (ret < 0) {
-		errno = -ret;
-		return -1;
-	}
+	SET_ERRNO(net_context_put(ctx));
 
 	return 0;
 }
@@ -253,61 +250,36 @@ static void zsock_received_cb(struct net_context *ctx,
 
 int zsock_shutdown_ctx(struct net_context *ctx, int how)
 {
-	int ret;
-
 	if (how == ZSOCK_SHUT_RD) {
 		if (net_context_get_state(ctx) == NET_CONTEXT_LISTENING) {
-			ret = net_context_accept(ctx, NULL, K_NO_WAIT, NULL);
-			if (ret < 0) {
-				errno = -ret;
-				return -1;
-			}
+			SET_ERRNO(net_context_accept(ctx, NULL, K_NO_WAIT, NULL));
 		} else {
-			ret = net_context_recv(ctx, NULL, K_NO_WAIT, NULL);
-			if (ret < 0) {
-				errno = -ret;
-				return -1;
-			}
+			SET_ERRNO(net_context_recv(ctx, NULL, K_NO_WAIT, NULL));
 		}
 
 		sock_set_eof(ctx);
 
 		zsock_flush_queue(ctx);
-
-		return 0;
-	}
-
-	if (how == ZSOCK_SHUT_WR || how == ZSOCK_SHUT_RDWR) {
-		errno = ENOTSUP;
-		return -1;
+	} else if (how == ZSOCK_SHUT_WR || how == ZSOCK_SHUT_RDWR) {
+		SET_ERRNO(-ENOTSUP);
+	} else {
+		SET_ERRNO(-EINVAL);
 	}
 
-	errno = EINVAL;
-	return -1;
+	return 0;
 }
 
 int zsock_bind_ctx(struct net_context *ctx, const struct sockaddr *addr,
 		   socklen_t addrlen)
 {
-	int ret;
-
-	ret = net_context_bind(ctx, addr, addrlen);
-	if (ret < 0) {
-		errno = -ret;
-		return -1;
-	}
-
+	SET_ERRNO(net_context_bind(ctx, addr, addrlen));
 	/* For DGRAM socket, we expect to receive packets after call to
 	 * bind(), but for STREAM socket, next expected operation is
 	 * listen(), which doesn't work if recv callback is set.
 	 */
 	if (net_context_get_type(ctx) == SOCK_DGRAM) {
-		ret = net_context_recv(ctx, zsock_received_cb, K_NO_WAIT,
-				       ctx->user_data);
-		if (ret < 0) {
-			errno = -ret;
-			return -1;
-		}
+		SET_ERRNO(net_context_recv(ctx, zsock_received_cb, K_NO_WAIT,
+					   ctx->user_data));
 	}
 
 	return 0;
@@ -324,75 +296,47 @@ static void zsock_connected_cb(struct net_context *ctx, int status, void *user_d
 int zsock_connect_ctx(struct net_context *ctx, const struct sockaddr *addr,
 		      socklen_t addrlen)
 {
-	k_timeout_t timeout = K_MSEC(CONFIG_NET_SOCKETS_CONNECT_TIMEOUT);
-	net_context_connect_cb_t cb = NULL;
-	int ret;
 
 #if defined(CONFIG_SOCKS)
 	if (net_context_is_proxy_enabled(ctx)) {
-		ret = net_socks5_connect(ctx, addr, addrlen);
-		if (ret < 0) {
-			errno = -ret;
-			return -1;
-		}
-		ret = net_context_recv(ctx, zsock_received_cb,
-				       K_NO_WAIT, ctx->user_data);
-		if (ret < 0) {
-			errno = -ret;
-			return -1;
-		}
+		SET_ERRNO(net_socks5_connect(ctx, addr, addrlen));
+		SET_ERRNO(net_context_recv(ctx, zsock_received_cb,
+					   K_NO_WAIT, ctx->user_data));
 		return 0;
 	}
 #endif
 	if (net_context_get_state(ctx) == NET_CONTEXT_CONNECTED) {
 		return 0;
-	}
-
-	if (net_context_get_state(ctx) == NET_CONTEXT_CONNECTING) {
+	} else if (net_context_get_state(ctx) == NET_CONTEXT_CONNECTING) {
 		if (sock_is_error(ctx)) {
-			errno = POINTER_TO_INT(ctx->user_data);
-			return -1;
-		}
-
-		errno = EALREADY;
-		return -1;
-	}
-
-	if (sock_is_nonblock(ctx)) {
-		timeout = K_NO_WAIT;
-		cb = zsock_connected_cb;
-	}
-
-	if (net_context_get_type(ctx) == SOCK_STREAM) {
-		/* For STREAM sockets net_context_recv() only installs
-		 * recv callback w/o side effects, and it has to be done
-		 * first to avoid race condition, when TCP stream data
-		 * arrives right after connect.
-		 */
-		ret = net_context_recv(ctx, zsock_received_cb,
-					K_NO_WAIT, ctx->user_data);
-		if (ret < 0) {
-			errno = -ret;
-			return -1;
-		}
-		ret = net_context_connect(ctx, addr, addrlen, cb,
-						timeout, ctx->user_data);
-		if (ret < 0) {
-			errno = -ret;
-			return -1;
+			SET_ERRNO(-POINTER_TO_INT(ctx->user_data));
+		} else {
+			SET_ERRNO(-EALREADY);
 		}
 	} else {
-		ret = net_context_connect(ctx, addr, addrlen, cb,
-						timeout, ctx->user_data);
-		if (ret < 0) {
-			errno = -ret;
-			return -1;
+		k_timeout_t timeout = K_MSEC(CONFIG_NET_SOCKETS_CONNECT_TIMEOUT);
+		net_context_connect_cb_t cb = NULL;
+
+		if (sock_is_nonblock(ctx)) {
+			timeout = K_NO_WAIT;
+			cb = zsock_connected_cb;
 		}
-		ret = net_context_recv(ctx, zsock_received_cb,
-					K_NO_WAIT, ctx->user_data);
-		if (ret < 0) {
-			errno = -ret;
-			return -1;
+
+		if (net_context_get_type(ctx) == SOCK_STREAM) {
+			/* For STREAM sockets net_context_recv() only installs
+			 * recv callback w/o side effects, and it has to be done
+			 * first to avoid race condition, when TCP stream data
+			 * arrives right after connect.
+			 */
+			SET_ERRNO(net_context_recv(ctx, zsock_received_cb,
+						   K_NO_WAIT, ctx->user_data));
+			SET_ERRNO(net_context_connect(ctx, addr, addrlen, cb,
+						      timeout, ctx->user_data));
+		} else {
+			SET_ERRNO(net_context_connect(ctx, addr, addrlen, cb,
+						      timeout, ctx->user_data));
+			SET_ERRNO(net_context_recv(ctx, zsock_received_cb,
+						   K_NO_WAIT, ctx->user_data));
 		}
 	}
 
@@ -401,19 +345,8 @@ int zsock_connect_ctx(struct net_context *ctx, const struct sockaddr *addr,
 
 int zsock_listen_ctx(struct net_context *ctx, int backlog)
 {
-	int ret;
-
-	ret = net_context_listen(ctx, backlog);
-	if (ret < 0) {
-		errno = -ret;
-		return -1;
-	}
-
-	ret = net_context_accept(ctx, zsock_accepted_cb, K_NO_WAIT, ctx);
-	if (ret < 0) {
-		errno = -ret;
-		return -1;
-	}
+	SET_ERRNO(net_context_listen(ctx, backlog));
+	SET_ERRNO(net_context_accept(ctx, zsock_accepted_cb, K_NO_WAIT, ctx));
 
 	return 0;
 }
@@ -2527,19 +2460,16 @@ int zsock_getpeername_ctx(struct net_context *ctx, struct sockaddr *addr,
 	socklen_t newlen = 0;
 
 	if (addr == NULL || addrlen == NULL) {
-		errno = EINVAL;
-		return -1;
+		SET_ERRNO(-EINVAL);
 	}
 
 	if (!(ctx->flags & NET_CONTEXT_REMOTE_ADDR_SET)) {
-		errno = ENOTCONN;
-		return -1;
+		SET_ERRNO(-ENOTCONN);
 	}
 
 	if (net_context_get_type(ctx) == SOCK_STREAM &&
 	    net_context_get_state(ctx) != NET_CONTEXT_CONNECTED) {
-		errno = ENOTCONN;
-		return -1;
+		SET_ERRNO(-ENOTCONN);
 	}
 
 	if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->remote.sa_family == AF_INET) {
@@ -2564,8 +2494,7 @@ int zsock_getpeername_ctx(struct net_context *ctx, struct sockaddr *addr,
 
 		memcpy(addr, &addr6, MIN(*addrlen, newlen));
 	} else {
-		errno = EINVAL;
-		return -1;
+		SET_ERRNO(-EINVAL);
 	}
 
 	*addrlen = newlen;
@@ -2583,8 +2512,7 @@ int zsock_getsockname_ctx(struct net_context *ctx, struct sockaddr *addr,
 		struct sockaddr_in addr4 = { 0 };
 
 		if (net_sin_ptr(&ctx->local)->sin_addr == NULL) {
-			errno = EINVAL;
-			return -1;
+			SET_ERRNO(-EINVAL);
 		}
 
 		newlen = sizeof(struct sockaddr_in);
@@ -2593,8 +2521,7 @@ int zsock_getsockname_ctx(struct net_context *ctx, struct sockaddr *addr,
 						 (struct sockaddr *)&addr4,
 						 &newlen);
 		if (ret < 0) {
-			errno = -ret;
-			return -1;
+			SET_ERRNO(-ret);
 		}
 
 		memcpy(addr, &addr4, MIN(*addrlen, newlen));
@@ -2603,8 +2530,7 @@ int zsock_getsockname_ctx(struct net_context *ctx, struct sockaddr *addr,
 		struct sockaddr_in6 addr6 = { 0 };
 
 		if (net_sin6_ptr(&ctx->local)->sin6_addr == NULL) {
-			errno = EINVAL;
-			return -1;
+			SET_ERRNO(-EINVAL);
 		}
 
 		newlen = sizeof(struct sockaddr_in6);
@@ -2613,14 +2539,12 @@ int zsock_getsockname_ctx(struct net_context *ctx, struct sockaddr *addr,
 						 (struct sockaddr *)&addr6,
 						 &newlen);
 		if (ret < 0) {
-			errno = -ret;
-			return -1;
+			SET_ERRNO(-ret);
 		}
 
 		memcpy(addr, &addr6, MIN(*addrlen, newlen));
 	} else {
-		errno = EINVAL;
-		return -1;
+		SET_ERRNO(-EINVAL);
 	}
 
 	*addrlen = newlen;

From 4aa10d4819660a73433f18193520224728ee6df6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:04 +0100
Subject: [PATCH 1949/2913] Revert "[nrf fromtree] net: offload: Do not need to
 enable TC threads for NET_OFFLOAD"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c15765ae714881bbcbc77aac719eb95574a61f69.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/ip/CMakeLists.txt | 2 +-
 subsys/net/ip/net_private.h  | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/subsys/net/ip/CMakeLists.txt b/subsys/net/ip/CMakeLists.txt
index 0189d748f6a..11509d804d7 100644
--- a/subsys/net/ip/CMakeLists.txt
+++ b/subsys/net/ip/CMakeLists.txt
@@ -19,7 +19,7 @@ zephyr_library_sources(
   )
 
 if(CONFIG_NET_OFFLOAD)
-zephyr_library_sources(net_context.c net_pkt.c)
+zephyr_library_sources(net_context.c net_pkt.c net_tc.c)
 endif()
 
 zephyr_library_sources_ifdef(CONFIG_NET_MGMT_EVENT   net_mgmt.c)
diff --git a/subsys/net/ip/net_private.h b/subsys/net/ip/net_private.h
index 04c3205f5ae..0bbcbb23164 100644
--- a/subsys/net/ip/net_private.h
+++ b/subsys/net/ip/net_private.h
@@ -86,12 +86,16 @@ extern bool net_context_is_v6only_set(struct net_context *context);
 extern bool net_context_is_recv_pktinfo_set(struct net_context *context);
 extern bool net_context_is_timestamping_set(struct net_context *context);
 extern void net_pkt_init(void);
+extern void net_tc_tx_init(void);
+extern void net_tc_rx_init(void);
 int net_context_get_local_addr(struct net_context *context,
 			       struct sockaddr *addr,
 			       socklen_t *addrlen);
 #else
 static inline void net_context_init(void) { }
 static inline void net_pkt_init(void) { }
+static inline void net_tc_tx_init(void) { }
+static inline void net_tc_rx_init(void) { }
 static inline const char *net_context_state(struct net_context *context)
 {
 	ARG_UNUSED(context);
@@ -145,8 +149,6 @@ static inline void mdns_init_responder(void) { }
 #if defined(CONFIG_NET_NATIVE)
 enum net_verdict net_ipv4_input(struct net_pkt *pkt, bool is_loopback);
 enum net_verdict net_ipv6_input(struct net_pkt *pkt, bool is_loopback);
-extern void net_tc_tx_init(void);
-extern void net_tc_rx_init(void);
 #else
 static inline enum net_verdict net_ipv4_input(struct net_pkt *pkt,
 					      bool is_loopback)
@@ -165,9 +167,6 @@ static inline enum net_verdict net_ipv6_input(struct net_pkt *pkt,
 
 	return NET_CONTINUE;
 }
-
-static inline void net_tc_tx_init(void) { }
-static inline void net_tc_rx_init(void) { }
 #endif
 extern bool net_tc_submit_to_tx_queue(uint8_t tc, struct net_pkt *pkt);
 extern void net_tc_submit_to_rx_queue(uint8_t tc, struct net_pkt *pkt);

From cac84ac14ec8abf91e178f1d5d1f6dd6e3e1c2b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:04 +0100
Subject: [PATCH 1950/2913] Revert "[nrf fromtree] net: Avoid compiling native
 network stack parts w/o NET_NATIVE"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f6d0a4ab92120da9367b6dba2c4feb704628c968.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/net_if.h | 36 --------------------------
 subsys/net/ip/net_context.c |  4 +--
 subsys/net/ip/net_core.c    | 50 ++++++++++++-------------------------
 subsys/net/ip/net_if.c      |  4 ---
 subsys/net/ip/utils.c       |  6 ++---
 5 files changed, 21 insertions(+), 79 deletions(-)

diff --git a/include/zephyr/net/net_if.h b/include/zephyr/net/net_if.h
index 0e0e619a831..4e08aa50ba5 100644
--- a/include/zephyr/net/net_if.h
+++ b/include/zephyr/net/net_if.h
@@ -1827,16 +1827,7 @@ bool net_if_ipv6_router_rm(struct net_if_router *router);
  *
  * @return Hop limit
  */
-#if defined(CONFIG_NET_NATIVE_IPV6)
 uint8_t net_if_ipv6_get_hop_limit(struct net_if *iface);
-#else
-static inline uint8_t net_if_ipv6_get_hop_limit(struct net_if *iface)
-{
-	ARG_UNUSED(iface);
-
-	return 0;
-}
-#endif /* CONFIG_NET_NATIVE_IPV6 */
 
 /**
  * @brief Set the default IPv6 hop limit of a given interface.
@@ -1844,16 +1835,7 @@ static inline uint8_t net_if_ipv6_get_hop_limit(struct net_if *iface)
  * @param iface Network interface
  * @param hop_limit New hop limit
  */
-#if defined(CONFIG_NET_NATIVE_IPV6)
 void net_if_ipv6_set_hop_limit(struct net_if *iface, uint8_t hop_limit);
-#else
-static inline void net_if_ipv6_set_hop_limit(struct net_if *iface,
-					     uint8_t hop_limit)
-{
-	ARG_UNUSED(iface);
-	ARG_UNUSED(hop_limit);
-}
-#endif /* CONFIG_NET_NATIVE_IPV6 */
 
 /** @cond INTERNAL_HIDDEN */
 
@@ -1878,16 +1860,7 @@ static inline void net_ipv6_set_hop_limit(struct net_if *iface,
  *
  * @return Hop limit
  */
-#if defined(CONFIG_NET_NATIVE_IPV6)
 uint8_t net_if_ipv6_get_mcast_hop_limit(struct net_if *iface);
-#else
-static inline uint8_t net_if_ipv6_get_mcast_hop_limit(struct net_if *iface)
-{
-	ARG_UNUSED(iface);
-
-	return 0;
-}
-#endif /* CONFIG_NET_NATIVE_IPV6 */
 
 /**
  * @brief Set the default IPv6 multicast hop limit of a given interface.
@@ -1895,16 +1868,7 @@ static inline uint8_t net_if_ipv6_get_mcast_hop_limit(struct net_if *iface)
  * @param iface Network interface
  * @param hop_limit New hop limit
  */
-#if defined(CONFIG_NET_NATIVE_IPV6)
 void net_if_ipv6_set_mcast_hop_limit(struct net_if *iface, uint8_t hop_limit);
-#else
-static inline void net_if_ipv6_set_mcast_hop_limit(struct net_if *iface,
-						   uint8_t hop_limit)
-{
-	ARG_UNUSED(iface);
-	ARG_UNUSED(hop_limit);
-}
-#endif /* CONFIG_NET_NATIVE_IPV6 */
 
 /**
  * @brief Set IPv6 reachable time for a given interface
diff --git a/subsys/net/ip/net_context.c b/subsys/net/ip/net_context.c
index e6a13874bde..af434e950f1 100644
--- a/subsys/net/ip/net_context.c
+++ b/subsys/net/ip/net_context.c
@@ -2456,7 +2456,7 @@ enum net_verdict net_context_packet_received(struct net_conn *conn,
 	return verdict;
 }
 
-#if defined(CONFIG_NET_NATIVE_UDP)
+#if defined(CONFIG_NET_UDP)
 static int recv_udp(struct net_context *context,
 		    net_context_recv_cb_t cb,
 		    k_timeout_t timeout,
@@ -2538,7 +2538,7 @@ static int recv_udp(struct net_context *context,
 }
 #else
 #define recv_udp(...) 0
-#endif /* CONFIG_NET_NATIVE_UDP */
+#endif /* CONFIG_NET_UDP */
 
 static enum net_verdict net_context_raw_packet_received(
 					struct net_conn *conn,
diff --git a/subsys/net/ip/net_core.c b/subsys/net/ip/net_core.c
index 5259f9c6e6d..8ab2fb93a3c 100644
--- a/subsys/net/ip/net_core.c
+++ b/subsys/net/ip/net_core.c
@@ -60,7 +60,6 @@ LOG_MODULE_REGISTER(net_core, CONFIG_NET_CORE_LOG_LEVEL);
 
 #include "net_stats.h"
 
-#if defined(CONFIG_NET_NATIVE)
 static inline enum net_verdict process_data(struct net_pkt *pkt,
 					    bool is_loopback)
 {
@@ -189,6 +188,22 @@ static void net_post_init(void)
 #endif
 }
 
+static void init_rx_queues(void)
+{
+	/* Starting TX side. The ordering is important here and the TX
+	 * can only be started when RX side is ready to receive packets.
+	 */
+	net_if_init();
+
+	net_tc_rx_init();
+
+	/* This will take the interface up and start everything. */
+	net_if_post_init();
+
+	/* Things to init after network interface is working */
+	net_post_init();
+}
+
 static inline void copy_ll_addr(struct net_pkt *pkt)
 {
 	memcpy(net_pkt_lladdr_src(pkt), net_pkt_lladdr_if(pkt),
@@ -556,39 +571,6 @@ static inline void l3_init(void)
 
 	NET_DBG("Network L3 init done");
 }
-#else /* CONFIG_NET_NATIVE */
-#define l3_init(...)
-#define net_post_init(...)
-int net_send_data(struct net_pkt *pkt)
-{
-	ARG_UNUSED(pkt);
-
-	return -ENOTSUP;
-}
-int net_recv_data(struct net_if *iface, struct net_pkt *pkt)
-{
-	ARG_UNUSED(iface);
-	ARG_UNUSED(pkt);
-
-	return -ENOTSUP;
-}
-#endif /* CONFIG_NET_NATIVE */
-
-static void init_rx_queues(void)
-{
-	/* Starting TX side. The ordering is important here and the TX
-	 * can only be started when RX side is ready to receive packets.
-	 */
-	net_if_init();
-
-	net_tc_rx_init();
-
-	/* This will take the interface up and start everything. */
-	net_if_post_init();
-
-	/* Things to init after network interface is working */
-	net_post_init();
-}
 
 static inline int services_init(void)
 {
diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c
index c03ec771481..ea3f4a2dbd8 100644
--- a/subsys/net/ip/net_if.c
+++ b/subsys/net/ip/net_if.c
@@ -174,7 +174,6 @@ struct net_if *z_vrfy_net_if_get_by_index(int index)
 #include <zephyr/syscalls/net_if_get_by_index_mrsh.c>
 #endif
 
-#if defined(CONFIG_NET_NATIVE)
 static inline void net_context_send_cb(struct net_context *context,
 				       int status)
 {
@@ -383,7 +382,6 @@ void net_if_queue_tx(struct net_if *iface, struct net_pkt *pkt)
 			;
 	}
 }
-#endif /* CONFIG_NET_NATIVE */
 
 void net_if_stats_reset(struct net_if *iface)
 {
@@ -447,7 +445,6 @@ static inline void init_iface(struct net_if *iface)
 	net_ipv6_pe_init(iface);
 }
 
-#if defined(CONFIG_NET_NATIVE)
 enum net_verdict net_if_send_data(struct net_if *iface, struct net_pkt *pkt)
 {
 	const struct net_l2 *l2;
@@ -554,7 +551,6 @@ enum net_verdict net_if_send_data(struct net_if *iface, struct net_pkt *pkt)
 
 	return verdict;
 }
-#endif /* CONFIG_NET_NATIVE */
 
 int net_if_set_link_addr_locked(struct net_if *iface,
 				uint8_t *addr, uint8_t len,
diff --git a/subsys/net/ip/utils.c b/subsys/net/ip/utils.c
index f130a184bcb..e8b6b99b073 100644
--- a/subsys/net/ip/utils.c
+++ b/subsys/net/ip/utils.c
@@ -634,7 +634,7 @@ static inline uint16_t pkt_calc_chksum(struct net_pkt *pkt, uint16_t sum)
 	return sum;
 }
 
-#if defined(CONFIG_NET_NATIVE_IP)
+#if defined(CONFIG_NET_IP)
 uint16_t net_calc_chksum(struct net_pkt *pkt, uint8_t proto)
 {
 	size_t len = 0U;
@@ -684,7 +684,7 @@ uint16_t net_calc_chksum(struct net_pkt *pkt, uint8_t proto)
 }
 #endif
 
-#if defined(CONFIG_NET_NATIVE_IPV4)
+#if defined(CONFIG_NET_IPV4)
 uint16_t net_calc_chksum_ipv4(struct net_pkt *pkt)
 {
 	uint16_t sum;
@@ -697,7 +697,7 @@ uint16_t net_calc_chksum_ipv4(struct net_pkt *pkt)
 
 	return ~sum;
 }
-#endif /* CONFIG_NET_NATIVE_IPV4 */
+#endif /* CONFIG_NET_IPV4 */
 
 #if defined(CONFIG_NET_IPV4_IGMP)
 uint16_t net_calc_chksum_igmp(struct net_pkt *pkt)

From ce84de5e30abdf27a0e45857e40a9fd0f67f7436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:04 +0100
Subject: [PATCH 1951/2913] Revert "[nrf fromtree] net: sockets: Split native
 IP socket implementation from syscalls"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6d479d2865030886d77869e63ce602deccc7f6a3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/sockets/CMakeLists.txt |    1 -
 subsys/net/lib/sockets/sockets.c      | 3667 ++++++++++++++++++++++---
 subsys/net/lib/sockets/sockets_inet.c | 2758 -------------------
 3 files changed, 3209 insertions(+), 3217 deletions(-)
 delete mode 100644 subsys/net/lib/sockets/sockets_inet.c

diff --git a/subsys/net/lib/sockets/CMakeLists.txt b/subsys/net/lib/sockets/CMakeLists.txt
index 28b76df4a7a..253cb4a182f 100644
--- a/subsys/net/lib/sockets/CMakeLists.txt
+++ b/subsys/net/lib/sockets/CMakeLists.txt
@@ -20,7 +20,6 @@ zephyr_library_sources(
   )
 endif()
 
-zephyr_library_sources_ifdef(CONFIG_NET_NATIVE                     sockets_inet.c)
 zephyr_library_sources_ifdef(CONFIG_NET_SOCKETS_CAN                sockets_can.c)
 zephyr_library_sources_ifdef(CONFIG_NET_SOCKETS_PACKET             sockets_packet.c)
 zephyr_library_sources_ifdef(CONFIG_NET_SOCKETS_SOCKOPT_TLS        sockets_tls.c)
diff --git a/subsys/net/lib/sockets/sockets.c b/subsys/net/lib/sockets/sockets.c
index 8b420cc9e68..12fbce5c6c5 100644
--- a/subsys/net/lib/sockets/sockets.c
+++ b/subsys/net/lib/sockets/sockets.c
@@ -11,11 +11,32 @@
 LOG_MODULE_REGISTER(net_sock, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <zephyr/kernel.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_pkt.h>
 #include <zephyr/tracing/tracing.h>
 #include <zephyr/net/socket.h>
+#include <zephyr/net/socket_types.h>
+#include <zephyr/posix/fcntl.h>
 #include <zephyr/internal/syscall_handler.h>
+#include <zephyr/sys/fdtable.h>
+#include <zephyr/sys/math_extras.h>
+#include <zephyr/sys/iterable_sections.h>
+
+#if defined(CONFIG_SOCKS)
+#include "socks.h"
+#endif
+
+#include <zephyr/net/igmp.h>
+#include "../../ip/ipv6.h"
+
+#include "../../ip/net_stats.h"
 
 #include "sockets_internal.h"
+#include "../../ip/tcp_internal.h"
+#include "../../ip/net_private.h"
+
+#define SET_ERRNO(x) \
+	{ int _err = x; if (_err < 0) { errno = -_err; return -1; } }
 
 #define VTABLE_CALL(fn, sock, ...)			     \
 	({						     \
@@ -44,6 +65,8 @@ LOG_MODULE_REGISTER(net_sock, CONFIG_NET_SOCKETS_LOG_LEVEL);
 		retval;					     \
 	})
 
+const struct socket_op_vtable sock_fd_op_vtable;
+
 static inline void *get_sock_vtable(int sock,
 				    const struct socket_op_vtable **vtable,
 				    struct k_mutex **lock)
@@ -91,6 +114,108 @@ void *z_vrfy_zsock_get_context_object(int sock)
 #include <zephyr/syscalls/zsock_get_context_object_mrsh.c>
 #endif
 
+static void zsock_received_cb(struct net_context *ctx,
+			      struct net_pkt *pkt,
+			      union net_ip_header *ip_hdr,
+			      union net_proto_header *proto_hdr,
+			      int status,
+			      void *user_data);
+
+static int fifo_wait_non_empty(struct k_fifo *fifo, k_timeout_t timeout)
+{
+	struct k_poll_event events[] = {
+		K_POLL_EVENT_INITIALIZER(K_POLL_TYPE_FIFO_DATA_AVAILABLE,
+					 K_POLL_MODE_NOTIFY_ONLY, fifo),
+	};
+
+	return k_poll(events, ARRAY_SIZE(events), timeout);
+}
+
+static void zsock_flush_queue(struct net_context *ctx)
+{
+	bool is_listen = net_context_get_state(ctx) == NET_CONTEXT_LISTENING;
+	void *p;
+
+	/* recv_q and accept_q are shared via a union */
+	while ((p = k_fifo_get(&ctx->recv_q, K_NO_WAIT)) != NULL) {
+		if (is_listen) {
+			NET_DBG("discarding ctx %p", p);
+			net_context_put(p);
+		} else {
+			NET_DBG("discarding pkt %p", p);
+			net_pkt_unref(p);
+		}
+	}
+
+	/* Some threads might be waiting on recv, cancel the wait */
+	k_fifo_cancel_wait(&ctx->recv_q);
+
+	/* Wake reader if it was sleeping */
+	(void)k_condvar_signal(&ctx->cond.recv);
+}
+
+#if defined(CONFIG_NET_NATIVE)
+static int zsock_socket_internal(int family, int type, int proto)
+{
+	int fd = zvfs_reserve_fd();
+	struct net_context *ctx;
+	int res;
+
+	if (fd < 0) {
+		return -1;
+	}
+
+	if (proto == 0) {
+		if (family == AF_INET || family == AF_INET6) {
+			if (type == SOCK_DGRAM) {
+				proto = IPPROTO_UDP;
+			} else if (type == SOCK_STREAM) {
+				proto = IPPROTO_TCP;
+			}
+		}
+	}
+
+	res = net_context_get(family, type, proto, &ctx);
+	if (res < 0) {
+		zvfs_free_fd(fd);
+		errno = -res;
+		return -1;
+	}
+
+	/* Initialize user_data, all other calls will preserve it */
+	ctx->user_data = NULL;
+
+	/* The socket flags are stored here */
+	ctx->socket_data = NULL;
+
+	/* recv_q and accept_q are in union */
+	k_fifo_init(&ctx->recv_q);
+
+	/* Condition variable is used to avoid keeping lock for a long time
+	 * when waiting data to be received
+	 */
+	k_condvar_init(&ctx->cond.recv);
+
+	/* TCP context is effectively owned by both application
+	 * and the stack: stack may detect that peer closed/aborted
+	 * connection, but it must not dispose of the context behind
+	 * the application back. Likewise, when application "closes"
+	 * context, it's not disposed of immediately - there's yet
+	 * closing handshake for stack to perform.
+	 */
+	if (proto == IPPROTO_TCP) {
+		net_context_ref(ctx);
+	}
+
+	zvfs_finalize_typed_fd(fd, ctx, (const struct fd_op_vtable *)&sock_fd_op_vtable,
+			    ZVFS_MODE_IFSOCK);
+
+	NET_DBG("socket: ctx=%p, fd=%d", ctx, fd);
+
+	return fd;
+}
+#endif /* CONFIG_NET_NATIVE */
+
 int z_impl_zsock_socket(int family, int type, int proto)
 {
 	STRUCT_SECTION_FOREACH(net_socket_register, sock_family) {
@@ -134,6 +259,29 @@ static inline int z_vrfy_zsock_socket(int family, int type, int proto)
 #include <zephyr/syscalls/zsock_socket_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
+int zsock_close_ctx(struct net_context *ctx)
+{
+	/* Reset callbacks to avoid any race conditions while
+	 * flushing queues. No need to check return values here,
+	 * as these are fail-free operations and we're closing
+	 * socket anyway.
+	 */
+	if (net_context_get_state(ctx) == NET_CONTEXT_LISTENING) {
+		(void)net_context_accept(ctx, NULL, K_NO_WAIT, NULL);
+	} else {
+		(void)net_context_recv(ctx, NULL, K_NO_WAIT, NULL);
+	}
+
+	ctx->user_data = INT_TO_POINTER(EINTR);
+	sock_set_error(ctx);
+
+	zsock_flush_queue(ctx);
+
+	SET_ERRNO(net_context_put(ctx));
+
+	return 0;
+}
+
 int z_impl_zsock_close(int sock)
 {
 	const struct socket_op_vtable *vtable;
@@ -218,6 +366,128 @@ static inline int z_vrfy_zsock_shutdown(int sock, int how)
 #include <zephyr/syscalls/zsock_shutdown_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
+static void zsock_accepted_cb(struct net_context *new_ctx,
+			      struct sockaddr *addr, socklen_t addrlen,
+			      int status, void *user_data) {
+	struct net_context *parent = user_data;
+
+	NET_DBG("parent=%p, ctx=%p, st=%d", parent, new_ctx, status);
+
+	if (status == 0) {
+		/* This just installs a callback, so cannot fail. */
+		(void)net_context_recv(new_ctx, zsock_received_cb, K_NO_WAIT,
+				       NULL);
+		k_fifo_init(&new_ctx->recv_q);
+		k_condvar_init(&new_ctx->cond.recv);
+
+		k_fifo_put(&parent->accept_q, new_ctx);
+
+		/* TCP context is effectively owned by both application
+		 * and the stack: stack may detect that peer closed/aborted
+		 * connection, but it must not dispose of the context behind
+		 * the application back. Likewise, when application "closes"
+		 * context, it's not disposed of immediately - there's yet
+		 * closing handshake for stack to perform.
+		 */
+		net_context_ref(new_ctx);
+
+		(void)k_condvar_signal(&parent->cond.recv);
+	}
+
+}
+
+static void zsock_received_cb(struct net_context *ctx,
+			      struct net_pkt *pkt,
+			      union net_ip_header *ip_hdr,
+			      union net_proto_header *proto_hdr,
+			      int status,
+			      void *user_data)
+{
+	if (ctx->cond.lock) {
+		(void)k_mutex_lock(ctx->cond.lock, K_FOREVER);
+	}
+
+	NET_DBG("ctx=%p, pkt=%p, st=%d, user_data=%p", ctx, pkt, status,
+		user_data);
+
+	if (status < 0) {
+		ctx->user_data = INT_TO_POINTER(-status);
+		sock_set_error(ctx);
+	}
+
+	/* if pkt is NULL, EOF */
+	if (!pkt) {
+		struct net_pkt *last_pkt = k_fifo_peek_tail(&ctx->recv_q);
+
+		if (!last_pkt) {
+			/* If there're no packets in the queue, recv() may
+			 * be blocked waiting on it to become non-empty,
+			 * so cancel that wait.
+			 */
+			sock_set_eof(ctx);
+			k_fifo_cancel_wait(&ctx->recv_q);
+			NET_DBG("Marked socket %p as peer-closed", ctx);
+		} else {
+			net_pkt_set_eof(last_pkt, true);
+			NET_DBG("Set EOF flag on pkt %p", last_pkt);
+		}
+
+		goto unlock;
+	}
+
+	/* Normal packet */
+	net_pkt_set_eof(pkt, false);
+
+	net_pkt_set_rx_stats_tick(pkt, k_cycle_get_32());
+
+	k_fifo_put(&ctx->recv_q, pkt);
+
+unlock:
+	/* Wake reader if it was sleeping */
+	(void)k_condvar_signal(&ctx->cond.recv);
+
+	if (ctx->cond.lock) {
+		(void)k_mutex_unlock(ctx->cond.lock);
+	}
+}
+
+int zsock_shutdown_ctx(struct net_context *ctx, int how)
+{
+	if (how == ZSOCK_SHUT_RD) {
+		if (net_context_get_state(ctx) == NET_CONTEXT_LISTENING) {
+			SET_ERRNO(net_context_accept(ctx, NULL, K_NO_WAIT, NULL));
+		} else {
+			SET_ERRNO(net_context_recv(ctx, NULL, K_NO_WAIT, NULL));
+		}
+
+		sock_set_eof(ctx);
+
+		zsock_flush_queue(ctx);
+	} else if (how == ZSOCK_SHUT_WR || how == ZSOCK_SHUT_RDWR) {
+		SET_ERRNO(-ENOTSUP);
+	} else {
+		SET_ERRNO(-EINVAL);
+	}
+
+	return 0;
+}
+
+int zsock_bind_ctx(struct net_context *ctx, const struct sockaddr *addr,
+		   socklen_t addrlen)
+{
+	SET_ERRNO(net_context_bind(ctx, addr, addrlen));
+	/* For DGRAM socket, we expect to receive packets after call to
+	 * bind(), but for STREAM socket, next expected operation is
+	 * listen(), which doesn't work if recv callback is set.
+	 */
+	if (net_context_get_type(ctx) == SOCK_DGRAM) {
+		SET_ERRNO(net_context_recv(ctx, zsock_received_cb, K_NO_WAIT,
+					   ctx->user_data));
+	}
+
+	return 0;
+}
+
 int z_impl_zsock_bind(int sock, const struct sockaddr *addr, socklen_t addrlen)
 {
 	int ret;
@@ -246,6 +516,64 @@ static inline int z_vrfy_zsock_bind(int sock, const struct sockaddr *addr,
 #include <zephyr/syscalls/zsock_bind_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
+static void zsock_connected_cb(struct net_context *ctx, int status, void *user_data)
+{
+	if (status < 0) {
+		ctx->user_data = INT_TO_POINTER(-status);
+		sock_set_error(ctx);
+	}
+}
+
+int zsock_connect_ctx(struct net_context *ctx, const struct sockaddr *addr,
+		      socklen_t addrlen)
+{
+
+#if defined(CONFIG_SOCKS)
+	if (net_context_is_proxy_enabled(ctx)) {
+		SET_ERRNO(net_socks5_connect(ctx, addr, addrlen));
+		SET_ERRNO(net_context_recv(ctx, zsock_received_cb,
+					   K_NO_WAIT, ctx->user_data));
+		return 0;
+	}
+#endif
+	if (net_context_get_state(ctx) == NET_CONTEXT_CONNECTED) {
+		return 0;
+	} else if (net_context_get_state(ctx) == NET_CONTEXT_CONNECTING) {
+		if (sock_is_error(ctx)) {
+			SET_ERRNO(-POINTER_TO_INT(ctx->user_data));
+		} else {
+			SET_ERRNO(-EALREADY);
+		}
+	} else {
+		k_timeout_t timeout = K_MSEC(CONFIG_NET_SOCKETS_CONNECT_TIMEOUT);
+		net_context_connect_cb_t cb = NULL;
+
+		if (sock_is_nonblock(ctx)) {
+			timeout = K_NO_WAIT;
+			cb = zsock_connected_cb;
+		}
+
+		if (net_context_get_type(ctx) == SOCK_STREAM) {
+			/* For STREAM sockets net_context_recv() only installs
+			 * recv callback w/o side effects, and it has to be done
+			 * first to avoid race condition, when TCP stream data
+			 * arrives right after connect.
+			 */
+			SET_ERRNO(net_context_recv(ctx, zsock_received_cb,
+						   K_NO_WAIT, ctx->user_data));
+			SET_ERRNO(net_context_connect(ctx, addr, addrlen, cb,
+						      timeout, ctx->user_data));
+		} else {
+			SET_ERRNO(net_context_connect(ctx, addr, addrlen, cb,
+						      timeout, ctx->user_data));
+			SET_ERRNO(net_context_recv(ctx, zsock_received_cb,
+						   K_NO_WAIT, ctx->user_data));
+		}
+	}
+
+	return 0;
+}
+
 int z_impl_zsock_connect(int sock, const struct sockaddr *addr,
 			socklen_t addrlen)
 {
@@ -275,6 +603,14 @@ int z_vrfy_zsock_connect(int sock, const struct sockaddr *addr,
 #include <zephyr/syscalls/zsock_connect_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
+int zsock_listen_ctx(struct net_context *ctx, int backlog)
+{
+	SET_ERRNO(net_context_listen(ctx, backlog));
+	SET_ERRNO(net_context_accept(ctx, zsock_accepted_cb, K_NO_WAIT, ctx));
+
+	return 0;
+}
+
 int z_impl_zsock_listen(int sock, int backlog)
 {
 	int ret;
@@ -296,6 +632,91 @@ static inline int z_vrfy_zsock_listen(int sock, int backlog)
 #include <zephyr/syscalls/zsock_listen_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
+int zsock_accept_ctx(struct net_context *parent, struct sockaddr *addr,
+		     socklen_t *addrlen)
+{
+	struct net_context *ctx;
+	struct net_pkt *last_pkt;
+	int fd, ret;
+
+	if (!sock_is_nonblock(parent)) {
+		k_timeout_t timeout = K_FOREVER;
+
+		/* accept() can reuse zsock_wait_data(), as underneath it's
+		 * monitoring the same queue (accept_q is an alias for recv_q).
+		 */
+		ret = zsock_wait_data(parent, &timeout);
+		if (ret < 0) {
+			errno = -ret;
+			return -1;
+		}
+	}
+
+	ctx = k_fifo_get(&parent->accept_q, K_NO_WAIT);
+	if (ctx == NULL) {
+		errno = EAGAIN;
+		return -1;
+	}
+
+	fd = zvfs_reserve_fd();
+	if (fd < 0) {
+		zsock_flush_queue(ctx);
+		net_context_put(ctx);
+		return -1;
+	}
+
+	/* Check if the connection is already disconnected */
+	last_pkt = k_fifo_peek_tail(&ctx->recv_q);
+	if (last_pkt) {
+		if (net_pkt_eof(last_pkt)) {
+			sock_set_eof(ctx);
+			zvfs_free_fd(fd);
+			zsock_flush_queue(ctx);
+			net_context_put(ctx);
+			errno = ECONNABORTED;
+			return -1;
+		}
+	}
+
+	if (net_context_is_closing(ctx)) {
+		errno = ECONNABORTED;
+		zvfs_free_fd(fd);
+		zsock_flush_queue(ctx);
+		net_context_put(ctx);
+		return -1;
+	}
+
+	net_context_set_accepting(ctx, false);
+
+
+	if (addr != NULL && addrlen != NULL) {
+		int len = MIN(*addrlen, sizeof(ctx->remote));
+
+		memcpy(addr, &ctx->remote, len);
+		/* addrlen is a value-result argument, set to actual
+		 * size of source address
+		 */
+		if (ctx->remote.sa_family == AF_INET) {
+			*addrlen = sizeof(struct sockaddr_in);
+		} else if (ctx->remote.sa_family == AF_INET6) {
+			*addrlen = sizeof(struct sockaddr_in6);
+		} else {
+			zvfs_free_fd(fd);
+			errno = ENOTSUP;
+			zsock_flush_queue(ctx);
+			net_context_put(ctx);
+			return -1;
+		}
+	}
+
+	NET_DBG("accept: ctx=%p, fd=%d", ctx, fd);
+
+	zvfs_finalize_typed_fd(fd, ctx, (const struct fd_op_vtable *)&sock_fd_op_vtable,
+			    ZVFS_MODE_IFSOCK);
+
+	return fd;
+}
+
 int z_impl_zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen)
 {
 	int new_sock;
@@ -334,6 +755,142 @@ static inline int z_vrfy_zsock_accept(int sock, struct sockaddr *addr,
 #include <zephyr/syscalls/zsock_accept_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
+#define WAIT_BUFS_INITIAL_MS 10
+#define WAIT_BUFS_MAX_MS 100
+#define MAX_WAIT_BUFS K_MSEC(CONFIG_NET_SOCKET_MAX_SEND_WAIT)
+
+static int send_check_and_wait(struct net_context *ctx, int status,
+			       k_timepoint_t buf_timeout, k_timeout_t timeout,
+			       uint32_t *retry_timeout)
+{
+	if (K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
+		goto out;
+	}
+
+	if (status != -ENOBUFS && status != -EAGAIN) {
+		goto out;
+	}
+
+	/* If we cannot get any buffers in reasonable
+	 * amount of time, then do not wait forever as
+	 * there might be some bigger issue.
+	 * If we get -EAGAIN and cannot recover, then
+	 * it means that the sending window is blocked
+	 * and we just cannot send anything.
+	 */
+	if (sys_timepoint_expired(buf_timeout)) {
+		if (status == -ENOBUFS) {
+			status = -ENOMEM;
+		} else {
+			status = -ENOBUFS;
+		}
+
+		goto out;
+	}
+
+	if (!K_TIMEOUT_EQ(timeout, K_FOREVER)) {
+		*retry_timeout =
+			MIN(*retry_timeout, k_ticks_to_ms_floor32(timeout.ticks));
+	}
+
+	if (ctx->cond.lock) {
+		(void)k_mutex_unlock(ctx->cond.lock);
+	}
+
+	if (status == -ENOBUFS) {
+		/* We can monitor net_pkt/net_buf availability, so just wait. */
+		k_sleep(K_MSEC(*retry_timeout));
+	}
+
+	if (status == -EAGAIN) {
+		if (IS_ENABLED(CONFIG_NET_NATIVE_TCP) &&
+		    net_context_get_type(ctx) == SOCK_STREAM &&
+		    !net_if_is_ip_offloaded(net_context_get_iface(ctx))) {
+			struct k_poll_event event;
+
+			k_poll_event_init(&event,
+					  K_POLL_TYPE_SEM_AVAILABLE,
+					  K_POLL_MODE_NOTIFY_ONLY,
+					  net_tcp_tx_sem_get(ctx));
+
+			k_poll(&event, 1, K_MSEC(*retry_timeout));
+		} else {
+			k_sleep(K_MSEC(*retry_timeout));
+		}
+	}
+	/* Exponentially increase the retry timeout
+	 * Cap the value to WAIT_BUFS_MAX_MS
+	 */
+	*retry_timeout = MIN(WAIT_BUFS_MAX_MS, *retry_timeout << 1);
+
+	if (ctx->cond.lock) {
+		(void)k_mutex_lock(ctx->cond.lock, K_FOREVER);
+	}
+
+	return 0;
+
+out:
+	errno = -status;
+	return -1;
+}
+
+ssize_t zsock_sendto_ctx(struct net_context *ctx, const void *buf, size_t len,
+			 int flags,
+			 const struct sockaddr *dest_addr, socklen_t addrlen)
+{
+	k_timeout_t timeout = K_FOREVER;
+	uint32_t retry_timeout = WAIT_BUFS_INITIAL_MS;
+	k_timepoint_t buf_timeout, end;
+	int status;
+
+	if ((flags & ZSOCK_MSG_DONTWAIT) || sock_is_nonblock(ctx)) {
+		timeout = K_NO_WAIT;
+		buf_timeout = sys_timepoint_calc(K_NO_WAIT);
+	} else {
+		net_context_get_option(ctx, NET_OPT_SNDTIMEO, &timeout, NULL);
+		buf_timeout = sys_timepoint_calc(MAX_WAIT_BUFS);
+	}
+	end = sys_timepoint_calc(timeout);
+
+	/* Register the callback before sending in order to receive the response
+	 * from the peer.
+	 */
+	status = net_context_recv(ctx, zsock_received_cb,
+				  K_NO_WAIT, ctx->user_data);
+	if (status < 0) {
+		errno = -status;
+		return -1;
+	}
+
+	while (1) {
+		if (dest_addr) {
+			status = net_context_sendto(ctx, buf, len, dest_addr,
+						    addrlen, NULL, timeout,
+						    ctx->user_data);
+		} else {
+			status = net_context_send(ctx, buf, len, NULL, timeout,
+						  ctx->user_data);
+		}
+
+		if (status < 0) {
+			status = send_check_and_wait(ctx, status, buf_timeout,
+						     timeout, &retry_timeout);
+			if (status < 0) {
+				return status;
+			}
+
+			/* Update the timeout value in case loop is repeated. */
+			timeout = sys_timepoint_timeout(end);
+
+			continue;
+		}
+
+		break;
+	}
+
+	return status;
+}
+
 ssize_t z_impl_zsock_sendto(int sock, const void *buf, size_t len, int flags,
 			   const struct sockaddr *dest_addr, socklen_t addrlen)
 {
@@ -372,6 +929,58 @@ ssize_t z_vrfy_zsock_sendto(int sock, const void *buf, size_t len, int flags,
 #include <zephyr/syscalls/zsock_sendto_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
+size_t msghdr_non_empty_iov_count(const struct msghdr *msg)
+{
+	size_t non_empty_iov_count = 0;
+
+	for (size_t i = 0; i < msg->msg_iovlen; i++) {
+		if (msg->msg_iov[i].iov_len) {
+			non_empty_iov_count++;
+		}
+	}
+
+	return non_empty_iov_count;
+}
+
+ssize_t zsock_sendmsg_ctx(struct net_context *ctx, const struct msghdr *msg,
+			  int flags)
+{
+	k_timeout_t timeout = K_FOREVER;
+	uint32_t retry_timeout = WAIT_BUFS_INITIAL_MS;
+	k_timepoint_t buf_timeout, end;
+	int status;
+
+	if ((flags & ZSOCK_MSG_DONTWAIT) || sock_is_nonblock(ctx)) {
+		timeout = K_NO_WAIT;
+		buf_timeout = sys_timepoint_calc(K_NO_WAIT);
+	} else {
+		net_context_get_option(ctx, NET_OPT_SNDTIMEO, &timeout, NULL);
+		buf_timeout = sys_timepoint_calc(MAX_WAIT_BUFS);
+	}
+	end = sys_timepoint_calc(timeout);
+
+	while (1) {
+		status = net_context_sendmsg(ctx, msg, flags, NULL, timeout, NULL);
+		if (status < 0) {
+			status = send_check_and_wait(ctx, status,
+						     buf_timeout,
+						     timeout, &retry_timeout);
+			if (status < 0) {
+				return status;
+			}
+
+			/* Update the timeout value in case loop is repeated. */
+			timeout = sys_timepoint_timeout(end);
+
+			continue;
+		}
+
+		break;
+	}
+
+	return status;
+}
+
 ssize_t z_impl_zsock_sendmsg(int sock, const struct msghdr *msg, int flags)
 {
 	int bytes_sent;
@@ -477,631 +1086,2468 @@ static inline ssize_t z_vrfy_zsock_sendmsg(int sock,
 #include <zephyr/syscalls/zsock_sendmsg_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
-ssize_t z_impl_zsock_recvfrom(int sock, void *buf, size_t max_len, int flags,
-			     struct sockaddr *src_addr, socklen_t *addrlen)
+static int sock_get_pkt_src_addr(struct net_pkt *pkt,
+				 enum net_ip_protocol proto,
+				 struct sockaddr *addr,
+				 socklen_t addrlen)
 {
-	int bytes_received;
+	int ret = 0;
+	struct net_pkt_cursor backup;
+	uint16_t *port;
 
-	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, recvfrom, sock, max_len, flags, src_addr, addrlen);
+	if (!addr || !pkt) {
+		return -EINVAL;
+	}
 
-	bytes_received = VTABLE_CALL(recvfrom, sock, buf, max_len, flags, src_addr, addrlen);
+	net_pkt_cursor_backup(pkt, &backup);
+	net_pkt_cursor_init(pkt);
 
-	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, recvfrom, sock,
-				       src_addr, addrlen,
-				       bytes_received < 0 ? -errno : bytes_received);
+	addr->sa_family = net_pkt_family(pkt);
 
-	sock_obj_core_update_recv_stats(sock, bytes_received);
+	if (IS_ENABLED(CONFIG_NET_IPV4) &&
+	    net_pkt_family(pkt) == AF_INET) {
+		NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv4_access,
+						      struct net_ipv4_hdr);
+		struct sockaddr_in *addr4 = net_sin(addr);
+		struct net_ipv4_hdr *ipv4_hdr;
 
-	return bytes_received;
-}
+		if (addrlen < sizeof(struct sockaddr_in)) {
+			ret = -EINVAL;
+			goto error;
+		}
 
-#ifdef CONFIG_USERSPACE
-ssize_t z_vrfy_zsock_recvfrom(int sock, void *buf, size_t max_len, int flags,
-			      struct sockaddr *src_addr, socklen_t *addrlen)
-{
-	socklen_t addrlen_copy;
-	ssize_t ret;
+		ipv4_hdr = (struct net_ipv4_hdr *)net_pkt_get_data(
+							pkt, &ipv4_access);
+		if (!ipv4_hdr ||
+		    net_pkt_acknowledge_data(pkt, &ipv4_access) ||
+		    net_pkt_skip(pkt, net_pkt_ipv4_opts_len(pkt))) {
+			ret = -ENOBUFS;
+			goto error;
+		}
 
-	if (K_SYSCALL_MEMORY_WRITE(buf, max_len)) {
-		errno = EFAULT;
-		return -1;
-	}
+		net_ipv4_addr_copy_raw((uint8_t *)&addr4->sin_addr, ipv4_hdr->src);
+		port = &addr4->sin_port;
+	} else if (IS_ENABLED(CONFIG_NET_IPV6) &&
+		   net_pkt_family(pkt) == AF_INET6) {
+		NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv6_access,
+						      struct net_ipv6_hdr);
+		struct sockaddr_in6 *addr6 = net_sin6(addr);
+		struct net_ipv6_hdr *ipv6_hdr;
+
+		if (addrlen < sizeof(struct sockaddr_in6)) {
+			ret = -EINVAL;
+			goto error;
+		}
 
-	if (addrlen) {
-		K_OOPS(k_usermode_from_copy(&addrlen_copy, addrlen,
-					sizeof(socklen_t)));
+		ipv6_hdr = (struct net_ipv6_hdr *)net_pkt_get_data(
+							pkt, &ipv6_access);
+		if (!ipv6_hdr ||
+		    net_pkt_acknowledge_data(pkt, &ipv6_access) ||
+		    net_pkt_skip(pkt, net_pkt_ipv6_ext_len(pkt))) {
+			ret = -ENOBUFS;
+			goto error;
+		}
+
+		net_ipv6_addr_copy_raw((uint8_t *)&addr6->sin6_addr, ipv6_hdr->src);
+		port = &addr6->sin6_port;
+	} else {
+		ret = -ENOTSUP;
+		goto error;
 	}
-	K_OOPS(src_addr && K_SYSCALL_MEMORY_WRITE(src_addr, addrlen_copy));
 
-	ret = z_impl_zsock_recvfrom(sock, (void *)buf, max_len, flags,
-				   (struct sockaddr *)src_addr,
-				   addrlen ? &addrlen_copy : NULL);
+	if (IS_ENABLED(CONFIG_NET_UDP) && proto == IPPROTO_UDP) {
+		NET_PKT_DATA_ACCESS_DEFINE(udp_access, struct net_udp_hdr);
+		struct net_udp_hdr *udp_hdr;
 
-	if (addrlen) {
-		K_OOPS(k_usermode_to_copy(addrlen, &addrlen_copy,
-				      sizeof(socklen_t)));
+		udp_hdr = (struct net_udp_hdr *)net_pkt_get_data(pkt,
+								 &udp_access);
+		if (!udp_hdr) {
+			ret = -ENOBUFS;
+			goto error;
+		}
+
+		*port = udp_hdr->src_port;
+	} else if (IS_ENABLED(CONFIG_NET_TCP) && proto == IPPROTO_TCP) {
+		NET_PKT_DATA_ACCESS_DEFINE(tcp_access, struct net_tcp_hdr);
+		struct net_tcp_hdr *tcp_hdr;
+
+		tcp_hdr = (struct net_tcp_hdr *)net_pkt_get_data(pkt,
+								 &tcp_access);
+		if (!tcp_hdr) {
+			ret = -ENOBUFS;
+			goto error;
+		}
+
+		*port = tcp_hdr->src_port;
+	} else {
+		ret = -ENOTSUP;
 	}
 
+error:
+	net_pkt_cursor_restore(pkt, &backup);
+
 	return ret;
 }
-#include <zephyr/syscalls/zsock_recvfrom_mrsh.c>
-#endif /* CONFIG_USERSPACE */
 
-ssize_t z_impl_zsock_recvmsg(int sock, struct msghdr *msg, int flags)
+#if defined(CONFIG_NET_OFFLOAD)
+static bool net_pkt_remote_addr_is_unspecified(struct net_pkt *pkt)
 {
-	int bytes_received;
-
-	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, recvmsg, sock, msg, flags);
-
-	bytes_received = VTABLE_CALL(recvmsg, sock, msg, flags);
-
-	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, recvmsg, sock, msg,
-				       bytes_received < 0 ? -errno : bytes_received);
+	bool ret = true;
 
-	sock_obj_core_update_recv_stats(sock, bytes_received);
+	if (net_pkt_family(pkt) == AF_INET) {
+		ret = net_ipv4_is_addr_unspecified(&net_sin(&pkt->remote)->sin_addr);
+	} else if (net_pkt_family(pkt) == AF_INET6) {
+		ret = net_ipv6_is_addr_unspecified(&net_sin6(&pkt->remote)->sin6_addr);
+	}
 
-	return bytes_received;
+	return ret;
 }
 
-#ifdef CONFIG_USERSPACE
-ssize_t z_vrfy_zsock_recvmsg(int sock, struct msghdr *msg, int flags)
+static int sock_get_offload_pkt_src_addr(struct net_pkt *pkt,
+					 struct net_context *ctx,
+					 struct sockaddr *addr,
+					 socklen_t addrlen)
 {
-	struct msghdr msg_copy;
-	size_t iovlen;
-	size_t i;
-	int ret;
+	int ret = 0;
 
-	if (msg == NULL) {
-		errno = EINVAL;
-		return -1;
+	if (!addr || !pkt) {
+		return -EINVAL;
 	}
 
-	if (msg->msg_iov == NULL) {
-		errno = ENOMEM;
-		return -1;
+	if (!net_pkt_remote_addr_is_unspecified(pkt)) {
+		if (IS_ENABLED(CONFIG_NET_IPV4) &&
+		    net_pkt_family(pkt) == AF_INET) {
+			if (addrlen < sizeof(struct sockaddr_in)) {
+				ret = -EINVAL;
+				goto error;
+			}
+
+			memcpy(addr, &pkt->remote, sizeof(struct sockaddr_in));
+		} else if (IS_ENABLED(CONFIG_NET_IPV6) &&
+			   net_pkt_family(pkt) == AF_INET6) {
+			if (addrlen < sizeof(struct sockaddr_in6)) {
+				ret = -EINVAL;
+				goto error;
+			}
+
+			memcpy(addr, &pkt->remote, sizeof(struct sockaddr_in6));
+		}
+	} else if (ctx->flags & NET_CONTEXT_REMOTE_ADDR_SET) {
+		memcpy(addr, &ctx->remote, MIN(addrlen, sizeof(ctx->remote)));
+	} else {
+		ret = -ENOTSUP;
 	}
 
-	K_OOPS(k_usermode_from_copy(&msg_copy, (void *)msg, sizeof(msg_copy)));
+error:
+	return ret;
+}
+#else
+static int sock_get_offload_pkt_src_addr(struct net_pkt *pkt,
+					 struct net_context *ctx,
+					 struct sockaddr *addr,
+					 socklen_t addrlen)
+{
+	ARG_UNUSED(pkt);
+	ARG_UNUSED(ctx);
+	ARG_UNUSED(addr);
+	ARG_UNUSED(addrlen);
 
-	k_usermode_from_copy(&iovlen, &msg->msg_iovlen, sizeof(iovlen));
+	return 0;
+}
+#endif /* CONFIG_NET_OFFLOAD */
 
-	msg_copy.msg_name = NULL;
-	msg_copy.msg_control = NULL;
+void net_socket_update_tc_rx_time(struct net_pkt *pkt, uint32_t end_tick)
+{
+	net_pkt_set_rx_stats_tick(pkt, end_tick);
 
-	msg_copy.msg_iov = k_usermode_alloc_from_copy(msg->msg_iov,
-				       msg->msg_iovlen * sizeof(struct iovec));
-	if (!msg_copy.msg_iov) {
-		errno = ENOMEM;
-		goto fail;
-	}
+	net_stats_update_tc_rx_time(net_pkt_iface(pkt),
+				    net_pkt_priority(pkt),
+				    net_pkt_create_time(pkt),
+				    end_tick);
 
-	/* Clear the pointers in the copy so that if the allocation in the
-	 * next loop fails, we do not try to free non allocated memory
-	 * in fail branch.
-	 */
-	memset(msg_copy.msg_iov, 0, msg->msg_iovlen * sizeof(struct iovec));
+	SYS_PORT_TRACING_FUNC(net, rx_time, pkt, end_tick);
 
-	for (i = 0; i < iovlen; i++) {
-		/* TODO: In practice we do not need to copy the actual data
-		 * in msghdr when receiving data but currently there is no
-		 * ready made function to do just that (unless we want to call
-		 * relevant malloc function here ourselves). So just use
-		 * the copying variant for now.
-		 */
-		msg_copy.msg_iov[i].iov_base =
-			k_usermode_alloc_from_copy(msg->msg_iov[i].iov_base,
-						   msg->msg_iov[i].iov_len);
-		if (!msg_copy.msg_iov[i].iov_base) {
-			errno = ENOMEM;
-			goto fail;
-		}
+	if (IS_ENABLED(CONFIG_NET_PKT_RXTIME_STATS_DETAIL)) {
+		uint32_t val, prev = net_pkt_create_time(pkt);
+		int i;
 
-		msg_copy.msg_iov[i].iov_len = msg->msg_iov[i].iov_len;
-	}
+		for (i = 0; i < net_pkt_stats_tick_count(pkt); i++) {
+			if (!net_pkt_stats_tick(pkt)[i]) {
+				break;
+			}
 
-	if (msg->msg_namelen > 0) {
-		if (msg->msg_name == NULL) {
-			errno = EINVAL;
-			goto fail;
+			val = net_pkt_stats_tick(pkt)[i] - prev;
+			prev = net_pkt_stats_tick(pkt)[i];
+			net_pkt_stats_tick(pkt)[i] = val;
 		}
 
-		msg_copy.msg_name = k_usermode_alloc_from_copy(msg->msg_name,
-							   msg->msg_namelen);
-		if (msg_copy.msg_name == NULL) {
-			errno = ENOMEM;
-			goto fail;
-		}
+		net_stats_update_tc_rx_time_detail(
+			net_pkt_iface(pkt),
+			net_pkt_priority(pkt),
+			net_pkt_stats_tick(pkt));
 	}
+}
 
-	if (msg->msg_controllen > 0) {
-		if (msg->msg_control == NULL) {
-			errno = EINVAL;
-			goto fail;
-		}
+int zsock_wait_data(struct net_context *ctx, k_timeout_t *timeout)
+{
+	int ret;
 
-		msg_copy.msg_control =
-			k_usermode_alloc_from_copy(msg->msg_control,
-						   msg->msg_controllen);
-		if (msg_copy.msg_control == NULL) {
-			errno = ENOMEM;
-			goto fail;
-		}
+	if (ctx->cond.lock == NULL) {
+		/* For some reason the lock pointer is not set properly
+		 * when called by fdtable.c:zvfs_finalize_fd()
+		 * It is not practical to try to figure out the fdtable
+		 * lock at this point so skip it.
+		 */
+		NET_WARN("No lock pointer set for context %p", ctx);
+		return -EINVAL;
 	}
 
-	ret = z_impl_zsock_recvmsg(sock, &msg_copy, flags);
-
-	/* Do not copy anything back if there was an error or nothing was
-	 * received.
-	 */
-	if (ret > 0) {
-		if (msg->msg_namelen > 0 && msg->msg_name != NULL) {
-			K_OOPS(k_usermode_to_copy(msg->msg_name,
-						  msg_copy.msg_name,
-						  msg_copy.msg_namelen));
+	if (k_fifo_is_empty(&ctx->recv_q)) {
+		/* Wait for the data to arrive but without holding a lock */
+		ret = k_condvar_wait(&ctx->cond.recv, ctx->cond.lock,
+				     *timeout);
+		if (ret < 0) {
+			return ret;
 		}
 
-		if (msg->msg_controllen > 0 &&
-		    msg->msg_control != NULL) {
-			K_OOPS(k_usermode_to_copy(msg->msg_control,
-						  msg_copy.msg_control,
-						  msg_copy.msg_controllen));
-
-			msg->msg_controllen = msg_copy.msg_controllen;
-		} else {
-			msg->msg_controllen = 0U;
+		if (sock_is_error(ctx)) {
+			return -POINTER_TO_INT(ctx->user_data);
 		}
+	}
 
-		k_usermode_to_copy(&msg->msg_iovlen,
-				   &msg_copy.msg_iovlen,
-				   sizeof(msg->msg_iovlen));
-
-		/* The new iovlen cannot be bigger than the original one */
-		NET_ASSERT(msg_copy.msg_iovlen <= iovlen);
+	return 0;
+}
 
-		for (i = 0; i < iovlen; i++) {
-			if (i < msg_copy.msg_iovlen) {
-				K_OOPS(k_usermode_to_copy(msg->msg_iov[i].iov_base,
-							  msg_copy.msg_iov[i].iov_base,
-							  msg_copy.msg_iov[i].iov_len));
-				K_OOPS(k_usermode_to_copy(&msg->msg_iov[i].iov_len,
-							  &msg_copy.msg_iov[i].iov_len,
-							  sizeof(msg->msg_iov[i].iov_len)));
-			} else {
-				/* Clear out those vectors that we could not populate */
-				msg->msg_iov[i].iov_len = 0;
-			}
-		}
+static int insert_pktinfo(struct msghdr *msg, int level, int type,
+			  void *pktinfo, size_t pktinfo_len)
+{
+	struct cmsghdr *cmsg;
 
-		k_usermode_to_copy(&msg->msg_flags,
-				   &msg_copy.msg_flags,
-				   sizeof(msg->msg_flags));
+	if (msg->msg_controllen < pktinfo_len) {
+		return -EINVAL;
 	}
 
-	k_free(msg_copy.msg_name);
-	k_free(msg_copy.msg_control);
+	for (cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) {
+		if (cmsg->cmsg_len == 0) {
+			break;
+		}
+	}
 
-	/* Note that we need to free according to original iovlen */
-	for (i = 0; i < iovlen; i++) {
-		k_free(msg_copy.msg_iov[i].iov_base);
+	if (cmsg == NULL) {
+		return -EINVAL;
 	}
 
-	k_free(msg_copy.msg_iov);
+	cmsg->cmsg_len = CMSG_LEN(pktinfo_len);
+	cmsg->cmsg_level = level;
+	cmsg->cmsg_type = type;
 
-	return ret;
+	memcpy(CMSG_DATA(cmsg), pktinfo, pktinfo_len);
 
-fail:
-	if (msg_copy.msg_name) {
-		k_free(msg_copy.msg_name);
-	}
+	return 0;
+}
 
-	if (msg_copy.msg_control) {
-		k_free(msg_copy.msg_control);
-	}
+static int add_timestamping(struct net_context *ctx,
+			    struct net_pkt *pkt,
+			    struct msghdr *msg)
+{
+	uint8_t timestamping = 0;
 
-	if (msg_copy.msg_iov) {
-		for (i = 0; i < msg_copy.msg_iovlen; i++) {
-			if (msg_copy.msg_iov[i].iov_base) {
-				k_free(msg_copy.msg_iov[i].iov_base);
-			}
-		}
+	net_context_get_option(ctx, NET_OPT_TIMESTAMPING, &timestamping, NULL);
 
-		k_free(msg_copy.msg_iov);
+	if (timestamping) {
+		return insert_pktinfo(msg, SOL_SOCKET, SO_TIMESTAMPING,
+				      net_pkt_timestamp(pkt), sizeof(struct net_ptp_time));
 	}
 
-	return -1;
+	return -ENOTSUP;
 }
-#include <zephyr/syscalls/zsock_recvmsg_mrsh.c>
-#endif /* CONFIG_USERSPACE */
 
-/* As this is limited function, we don't follow POSIX signature, with
- * "..." instead of last arg.
- */
-int z_impl_zsock_fcntl_impl(int sock, int cmd, int flags)
+static int add_pktinfo(struct net_context *ctx,
+			struct net_pkt *pkt,
+			struct msghdr *msg)
 {
-	const struct socket_op_vtable *vtable;
-	struct k_mutex *lock;
-	void *obj;
-	int ret;
+	int ret = -ENOTSUP;
+	struct net_pkt_cursor backup;
+
+	net_pkt_cursor_backup(pkt, &backup);
+	net_pkt_cursor_init(pkt);
+
+	if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET) {
+		NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv4_access,
+						      struct net_ipv4_hdr);
+		struct in_pktinfo info;
+		struct net_ipv4_hdr *ipv4_hdr;
+
+		ipv4_hdr = (struct net_ipv4_hdr *)net_pkt_get_data(
+							pkt, &ipv4_access);
+		if (ipv4_hdr == NULL ||
+		    net_pkt_acknowledge_data(pkt, &ipv4_access) ||
+		    net_pkt_skip(pkt, net_pkt_ipv4_opts_len(pkt))) {
+			ret = -ENOBUFS;
+			goto out;
+		}
 
-	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, fcntl, sock, cmd, flags);
+		net_ipv4_addr_copy_raw((uint8_t *)&info.ipi_addr, ipv4_hdr->dst);
+		net_ipv4_addr_copy_raw((uint8_t *)&info.ipi_spec_dst,
+				       (uint8_t *)net_sin_ptr(&ctx->local)->sin_addr);
+		info.ipi_ifindex = ctx->iface;
 
-	obj = get_sock_vtable(sock, &vtable, &lock);
-	if (obj == NULL) {
-		errno = EBADF;
-		SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, fcntl, sock, -errno);
-		return -1;
+		ret = insert_pktinfo(msg, IPPROTO_IP, IP_PKTINFO,
+				     &info, sizeof(info));
+
+		goto out;
 	}
 
-	(void)k_mutex_lock(lock, K_FOREVER);
+	if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == AF_INET6) {
+		NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv6_access,
+						      struct net_ipv6_hdr);
+		struct in6_pktinfo info;
+		struct net_ipv6_hdr *ipv6_hdr;
+
+		ipv6_hdr = (struct net_ipv6_hdr *)net_pkt_get_data(
+							pkt, &ipv6_access);
+		if (ipv6_hdr == NULL ||
+		    net_pkt_acknowledge_data(pkt, &ipv6_access) ||
+		    net_pkt_skip(pkt, net_pkt_ipv6_ext_len(pkt))) {
+			ret = -ENOBUFS;
+			goto out;
+		}
 
-	ret = zvfs_fdtable_call_ioctl((const struct fd_op_vtable *)vtable,
-				   obj, cmd, flags);
+		net_ipv6_addr_copy_raw((uint8_t *)&info.ipi6_addr, ipv6_hdr->dst);
+		info.ipi6_ifindex = ctx->iface;
 
-	k_mutex_unlock(lock);
+		ret = insert_pktinfo(msg, IPPROTO_IPV6, IPV6_RECVPKTINFO,
+				     &info, sizeof(info));
+
+		goto out;
+	}
+
+out:
+	net_pkt_cursor_restore(pkt, &backup);
 
-	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, fcntl, sock,
-				       ret < 0 ? -errno : ret);
 	return ret;
 }
 
-#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_zsock_fcntl_impl(int sock, int cmd, int flags)
+static int update_msg_controllen(struct msghdr *msg)
 {
-	return z_impl_zsock_fcntl_impl(sock, cmd, flags);
+	struct cmsghdr *cmsg;
+	size_t cmsg_space = 0;
+
+	for (cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) {
+		if (cmsg->cmsg_len == 0) {
+			break;
+		}
+		cmsg_space += cmsg->cmsg_len;
+	}
+	msg->msg_controllen = cmsg_space;
+
+	return 0;
 }
-#include <zephyr/syscalls/zsock_fcntl_impl_mrsh.c>
-#endif
 
-int z_impl_zsock_ioctl_impl(int sock, unsigned long request, va_list args)
+static inline ssize_t zsock_recv_dgram(struct net_context *ctx,
+				       struct msghdr *msg,
+				       void *buf,
+				       size_t max_len,
+				       int flags,
+				       struct sockaddr *src_addr,
+				       socklen_t *addrlen)
 {
-	const struct socket_op_vtable *vtable;
-	struct k_mutex *lock;
-	void *ctx;
-	int ret;
+	k_timeout_t timeout = K_FOREVER;
+	size_t recv_len = 0;
+	size_t read_len;
+	struct net_pkt_cursor backup;
+	struct net_pkt *pkt;
+
+	if ((flags & ZSOCK_MSG_DONTWAIT) || sock_is_nonblock(ctx)) {
+		timeout = K_NO_WAIT;
+	} else {
+		int ret;
 
-	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, ioctl, sock, request);
+		net_context_get_option(ctx, NET_OPT_RCVTIMEO, &timeout, NULL);
 
-	ctx = get_sock_vtable(sock, &vtable, &lock);
-	if (ctx == NULL) {
-		errno = EBADF;
-		SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, ioctl, sock, -errno);
-		return -1;
+		ret = zsock_wait_data(ctx, &timeout);
+		if (ret < 0) {
+			errno = -ret;
+			return -1;
+		}
 	}
 
-	(void)k_mutex_lock(lock, K_FOREVER);
+	if (flags & ZSOCK_MSG_PEEK) {
+		int res;
 
-	NET_DBG("ioctl: ctx=%p, fd=%d, request=%lu", ctx, sock, request);
+		res = fifo_wait_non_empty(&ctx->recv_q, timeout);
+		/* EAGAIN when timeout expired, EINTR when cancelled */
+		if (res && res != -EAGAIN && res != -EINTR) {
+			errno = -res;
+			return -1;
+		}
+
+		pkt = k_fifo_peek_head(&ctx->recv_q);
+	} else {
+		pkt = k_fifo_get(&ctx->recv_q, timeout);
+	}
+
+	if (!pkt) {
+		errno = EAGAIN;
+		return -1;
+	}
+
+	net_pkt_cursor_backup(pkt, &backup);
+
+	if (src_addr && addrlen) {
+		if (IS_ENABLED(CONFIG_NET_OFFLOAD) &&
+		    net_if_is_ip_offloaded(net_context_get_iface(ctx))) {
+			int ret;
+
+			ret  = sock_get_offload_pkt_src_addr(pkt, ctx, src_addr,
+								*addrlen);
+			if (ret < 0) {
+				errno = -ret;
+				NET_DBG("sock_get_offload_pkt_src_addr %d", ret);
+				goto fail;
+			}
+		} else {
+			int ret;
+
+			ret = sock_get_pkt_src_addr(pkt, net_context_get_proto(ctx),
+						   src_addr, *addrlen);
+			if (ret < 0) {
+				errno = -ret;
+				NET_DBG("sock_get_pkt_src_addr %d", ret);
+				goto fail;
+			}
+		}
+
+		/* addrlen is a value-result argument, set to actual
+		 * size of source address
+		 */
+		if (src_addr->sa_family == AF_INET) {
+			*addrlen = sizeof(struct sockaddr_in);
+		} else if (src_addr->sa_family == AF_INET6) {
+			*addrlen = sizeof(struct sockaddr_in6);
+		} else {
+			errno = ENOTSUP;
+			goto fail;
+		}
+	}
+
+	if (msg != NULL) {
+		int iovec = 0;
+		size_t tmp_read_len;
+
+		if (msg->msg_iovlen < 1 || msg->msg_iov == NULL) {
+			errno = ENOMEM;
+			return -1;
+		}
+
+		recv_len = net_pkt_remaining_data(pkt);
+		tmp_read_len = read_len = MIN(recv_len, max_len);
+
+		while (tmp_read_len > 0) {
+			size_t len;
+
+			buf = msg->msg_iov[iovec].iov_base;
+			if (buf == NULL) {
+				errno = EINVAL;
+				return -1;
+			}
+
+			len = MIN(tmp_read_len, msg->msg_iov[iovec].iov_len);
+
+			if (net_pkt_read(pkt, buf, len)) {
+				errno = ENOBUFS;
+				goto fail;
+			}
+
+			if (len <= tmp_read_len) {
+				tmp_read_len -= len;
+				msg->msg_iov[iovec].iov_len = len;
+				iovec++;
+			} else {
+				errno = EINVAL;
+				return -1;
+			}
+		}
+
+		msg->msg_iovlen = iovec;
+
+		if (recv_len != read_len) {
+			msg->msg_flags |= ZSOCK_MSG_TRUNC;
+		}
+
+	} else {
+		recv_len = net_pkt_remaining_data(pkt);
+		read_len = MIN(recv_len, max_len);
+
+		if (net_pkt_read(pkt, buf, read_len)) {
+			errno = ENOBUFS;
+			goto fail;
+		}
+	}
+
+	if (msg != NULL) {
+		if (msg->msg_control != NULL) {
+			if (msg->msg_controllen > 0) {
+				if (IS_ENABLED(CONFIG_NET_CONTEXT_TIMESTAMPING) &&
+				    net_context_is_timestamping_set(ctx)) {
+					if (add_timestamping(ctx, pkt, msg) < 0) {
+						msg->msg_flags |= ZSOCK_MSG_CTRUNC;
+					}
+				}
+
+				if (IS_ENABLED(CONFIG_NET_CONTEXT_RECV_PKTINFO) &&
+				    net_context_is_recv_pktinfo_set(ctx)) {
+					if (add_pktinfo(ctx, pkt, msg) < 0) {
+						msg->msg_flags |= ZSOCK_MSG_CTRUNC;
+					}
+				}
+
+				/* msg_controllen must be updated to reflect the total length of all
+				 * control messages in the buffer. If there are no control data,
+				 * msg_controllen will be cleared as expected It will also take into
+				 * account pre-existing control data
+				 */
+				update_msg_controllen(msg);
+			}
+		} else {
+			msg->msg_controllen = 0U;
+		}
+	}
+
+	if ((IS_ENABLED(CONFIG_NET_PKT_RXTIME_STATS) ||
+	     IS_ENABLED(CONFIG_TRACING_NET_CORE)) &&
+	    !(flags & ZSOCK_MSG_PEEK)) {
+		net_socket_update_tc_rx_time(pkt, k_cycle_get_32());
+	}
+
+	if (!(flags & ZSOCK_MSG_PEEK)) {
+		net_pkt_unref(pkt);
+	} else {
+		net_pkt_cursor_restore(pkt, &backup);
+	}
+
+	return (flags & ZSOCK_MSG_TRUNC) ? recv_len : read_len;
+
+fail:
+	if (!(flags & ZSOCK_MSG_PEEK)) {
+		net_pkt_unref(pkt);
+	}
+
+	return -1;
+}
+
+static size_t zsock_recv_stream_immediate(struct net_context *ctx, uint8_t **buf, size_t *max_len,
+					  int flags)
+{
+	size_t len;
+	size_t pkt_len;
+	size_t recv_len = 0;
+	struct net_pkt *pkt;
+	struct net_pkt_cursor backup;
+	struct net_pkt *origin = NULL;
+	const bool do_recv = !(buf == NULL || max_len == NULL);
+	size_t _max_len = (max_len == NULL) ? SIZE_MAX : *max_len;
+	const bool peek = (flags & ZSOCK_MSG_PEEK) == ZSOCK_MSG_PEEK;
+
+	while (_max_len > 0) {
+		/* only peek until we know we can dequeue and / or requeue buffer */
+		pkt = k_fifo_peek_head(&ctx->recv_q);
+		if (pkt == NULL || pkt == origin) {
+			break;
+		}
+
+		if (origin == NULL) {
+			/* mark first pkt to avoid cycles when observing */
+			origin = pkt;
+		}
+
+		pkt_len = net_pkt_remaining_data(pkt);
+		len = MIN(_max_len, pkt_len);
+		recv_len += len;
+		_max_len -= len;
+
+		if (do_recv && len > 0) {
+			if (peek) {
+				net_pkt_cursor_backup(pkt, &backup);
+			}
+
+			net_pkt_read(pkt, *buf, len);
+			/* update buffer position for caller */
+			*buf += len;
+
+			if (peek) {
+				net_pkt_cursor_restore(pkt, &backup);
+			}
+		}
+
+		if (do_recv && !peek) {
+			if (len == pkt_len) {
+				/* dequeue empty packets when not observing */
+				pkt = k_fifo_get(&ctx->recv_q, K_NO_WAIT);
+				if (net_pkt_eof(pkt)) {
+					sock_set_eof(ctx);
+				}
+
+				if (IS_ENABLED(CONFIG_NET_PKT_RXTIME_STATS) ||
+				    IS_ENABLED(CONFIG_TRACING_NET_CORE)) {
+					net_socket_update_tc_rx_time(pkt, k_cycle_get_32());
+				}
+
+				net_pkt_unref(pkt);
+			}
+		} else if (!do_recv || peek) {
+			/* requeue packets when observing */
+			k_fifo_put(&ctx->recv_q, k_fifo_get(&ctx->recv_q, K_NO_WAIT));
+		}
+	}
+
+	if (do_recv) {
+		/* convey remaining buffer size back to caller */
+		*max_len = _max_len;
+	}
+
+	return recv_len;
+}
+
+static int zsock_fionread_ctx(struct net_context *ctx)
+{
+	size_t ret = zsock_recv_stream_immediate(ctx, NULL, NULL, 0);
+
+	return MIN(ret, INT_MAX);
+}
+
+static ssize_t zsock_recv_stream_timed(struct net_context *ctx, struct msghdr *msg,
+				       uint8_t *buf, size_t max_len,
+				       int flags, k_timeout_t timeout)
+{
+	int res;
+	k_timepoint_t end;
+	size_t recv_len = 0, iovec = 0, available_len, max_iovlen = 0;
+	const bool waitall = (flags & ZSOCK_MSG_WAITALL) == ZSOCK_MSG_WAITALL;
+
+	if (msg != NULL && buf == NULL) {
+		if (msg->msg_iovlen < 1) {
+			return -EINVAL;
+		}
+
+		buf = msg->msg_iov[iovec].iov_base;
+		available_len = msg->msg_iov[iovec].iov_len;
+		msg->msg_iov[iovec].iov_len = 0;
+		max_iovlen = msg->msg_iovlen;
+	}
+
+	for (end = sys_timepoint_calc(timeout); max_len > 0; timeout = sys_timepoint_timeout(end)) {
+
+		if (sock_is_error(ctx)) {
+			return -POINTER_TO_INT(ctx->user_data);
+		}
+
+		if (sock_is_eof(ctx)) {
+			return 0;
+		}
+
+		if (!K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
+			res = zsock_wait_data(ctx, &timeout);
+			if (res < 0) {
+				return res;
+			}
+		}
+
+		if (msg != NULL) {
+again:
+			res = zsock_recv_stream_immediate(ctx, &buf, &available_len, flags);
+			recv_len += res;
+
+			if (res == 0 && recv_len == 0 && K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
+				return -EAGAIN;
+			}
+
+			msg->msg_iov[iovec].iov_len += res;
+			buf = (uint8_t *)(msg->msg_iov[iovec].iov_base) + res;
+			max_len -= res;
+
+			if (available_len == 0) {
+				/* All data to this iovec was written */
+				iovec++;
+
+				if (iovec == max_iovlen) {
+					break;
+				}
+
+				msg->msg_iovlen = iovec;
+				buf = msg->msg_iov[iovec].iov_base;
+				available_len = msg->msg_iov[iovec].iov_len;
+				msg->msg_iov[iovec].iov_len = 0;
+
+				/* If there is more data, read it now and do not wait */
+				if (buf != NULL && available_len > 0) {
+					goto again;
+				}
+
+				continue;
+			}
+
+		} else {
+			res = zsock_recv_stream_immediate(ctx, &buf, &max_len, flags);
+			recv_len += res;
+
+			if (res == 0) {
+				if (recv_len == 0 && K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
+					return -EAGAIN;
+				}
+			}
+		}
+
+		if (!waitall) {
+			break;
+		}
+	}
+
+	return recv_len;
+}
+
+static ssize_t zsock_recv_stream(struct net_context *ctx, struct msghdr *msg,
+				 void *buf, size_t max_len, int flags)
+{
+	ssize_t res;
+	size_t recv_len = 0;
+	k_timeout_t timeout = K_FOREVER;
+
+	if (!net_context_is_used(ctx)) {
+		errno = EBADF;
+		return -1;
+	}
+
+	if (net_context_get_state(ctx) != NET_CONTEXT_CONNECTED) {
+		errno = ENOTCONN;
+		return -1;
+	}
+
+	if ((flags & ZSOCK_MSG_DONTWAIT) || sock_is_nonblock(ctx)) {
+		timeout = K_NO_WAIT;
+	} else if (!sock_is_eof(ctx) && !sock_is_error(ctx)) {
+		net_context_get_option(ctx, NET_OPT_RCVTIMEO, &timeout, NULL);
+	}
+
+	if (max_len == 0) {
+		/* no bytes requested - done! */
+		return 0;
+	}
+
+	res = zsock_recv_stream_timed(ctx, msg, buf, max_len, flags, timeout);
+	recv_len += MAX(0, res);
+
+	if (res < 0) {
+		errno = -res;
+		return -1;
+	}
+
+	if (!(flags & ZSOCK_MSG_PEEK)) {
+		net_context_update_recv_wnd(ctx, recv_len);
+	}
+
+	return recv_len;
+}
+
+ssize_t zsock_recvfrom_ctx(struct net_context *ctx, void *buf, size_t max_len,
+			   int flags,
+			   struct sockaddr *src_addr, socklen_t *addrlen)
+{
+	enum net_sock_type sock_type = net_context_get_type(ctx);
+
+	if (max_len == 0) {
+		return 0;
+	}
+
+	if (sock_type == SOCK_DGRAM) {
+		return zsock_recv_dgram(ctx, NULL, buf, max_len, flags, src_addr, addrlen);
+	} else if (sock_type == SOCK_STREAM) {
+		return zsock_recv_stream(ctx, NULL, buf, max_len, flags);
+	}
+
+	__ASSERT(0, "Unknown socket type");
+
+	errno = ENOTSUP;
+
+	return -1;
+}
+
+ssize_t z_impl_zsock_recvfrom(int sock, void *buf, size_t max_len, int flags,
+			     struct sockaddr *src_addr, socklen_t *addrlen)
+{
+	int bytes_received;
+
+	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, recvfrom, sock, max_len, flags, src_addr, addrlen);
+
+	bytes_received = VTABLE_CALL(recvfrom, sock, buf, max_len, flags, src_addr, addrlen);
+
+	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, recvfrom, sock,
+				       src_addr, addrlen,
+				       bytes_received < 0 ? -errno : bytes_received);
+
+	sock_obj_core_update_recv_stats(sock, bytes_received);
+
+	return bytes_received;
+}
+
+#ifdef CONFIG_USERSPACE
+ssize_t z_vrfy_zsock_recvfrom(int sock, void *buf, size_t max_len, int flags,
+			      struct sockaddr *src_addr, socklen_t *addrlen)
+{
+	socklen_t addrlen_copy;
+	ssize_t ret;
+
+	if (K_SYSCALL_MEMORY_WRITE(buf, max_len)) {
+		errno = EFAULT;
+		return -1;
+	}
+
+	if (addrlen) {
+		K_OOPS(k_usermode_from_copy(&addrlen_copy, addrlen,
+					sizeof(socklen_t)));
+	}
+	K_OOPS(src_addr && K_SYSCALL_MEMORY_WRITE(src_addr, addrlen_copy));
+
+	ret = z_impl_zsock_recvfrom(sock, (void *)buf, max_len, flags,
+				   (struct sockaddr *)src_addr,
+				   addrlen ? &addrlen_copy : NULL);
+
+	if (addrlen) {
+		K_OOPS(k_usermode_to_copy(addrlen, &addrlen_copy,
+				      sizeof(socklen_t)));
+	}
+
+	return ret;
+}
+#include <zephyr/syscalls/zsock_recvfrom_mrsh.c>
+#endif /* CONFIG_USERSPACE */
+
+ssize_t zsock_recvmsg_ctx(struct net_context *ctx, struct msghdr *msg,
+			  int flags)
+{
+	enum net_sock_type sock_type = net_context_get_type(ctx);
+	size_t i, max_len = 0;
+
+	if (msg == NULL) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	if (msg->msg_iov == NULL) {
+		errno = ENOMEM;
+		return -1;
+	}
+
+	for (i = 0; i < msg->msg_iovlen; i++) {
+		max_len += msg->msg_iov[i].iov_len;
+	}
+
+	if (sock_type == SOCK_DGRAM) {
+		return zsock_recv_dgram(ctx, msg, NULL, max_len, flags,
+					msg->msg_name, &msg->msg_namelen);
+	} else if (sock_type == SOCK_STREAM) {
+		return zsock_recv_stream(ctx, msg, NULL, max_len, flags);
+	}
+
+	__ASSERT(0, "Unknown socket type");
+
+	errno = ENOTSUP;
+
+	return -1;
+}
+
+ssize_t z_impl_zsock_recvmsg(int sock, struct msghdr *msg, int flags)
+{
+	int bytes_received;
+
+	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, recvmsg, sock, msg, flags);
+
+	bytes_received = VTABLE_CALL(recvmsg, sock, msg, flags);
+
+	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, recvmsg, sock, msg,
+				       bytes_received < 0 ? -errno : bytes_received);
+
+	sock_obj_core_update_recv_stats(sock, bytes_received);
+
+	return bytes_received;
+}
+
+#ifdef CONFIG_USERSPACE
+ssize_t z_vrfy_zsock_recvmsg(int sock, struct msghdr *msg, int flags)
+{
+	struct msghdr msg_copy;
+	size_t iovlen;
+	size_t i;
+	int ret;
+
+	if (msg == NULL) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	if (msg->msg_iov == NULL) {
+		errno = ENOMEM;
+		return -1;
+	}
+
+	K_OOPS(k_usermode_from_copy(&msg_copy, (void *)msg, sizeof(msg_copy)));
+
+	k_usermode_from_copy(&iovlen, &msg->msg_iovlen, sizeof(iovlen));
+
+	msg_copy.msg_name = NULL;
+	msg_copy.msg_control = NULL;
+
+	msg_copy.msg_iov = k_usermode_alloc_from_copy(msg->msg_iov,
+				       msg->msg_iovlen * sizeof(struct iovec));
+	if (!msg_copy.msg_iov) {
+		errno = ENOMEM;
+		goto fail;
+	}
+
+	/* Clear the pointers in the copy so that if the allocation in the
+	 * next loop fails, we do not try to free non allocated memory
+	 * in fail branch.
+	 */
+	memset(msg_copy.msg_iov, 0, msg->msg_iovlen * sizeof(struct iovec));
+
+	for (i = 0; i < iovlen; i++) {
+		/* TODO: In practice we do not need to copy the actual data
+		 * in msghdr when receiving data but currently there is no
+		 * ready made function to do just that (unless we want to call
+		 * relevant malloc function here ourselves). So just use
+		 * the copying variant for now.
+		 */
+		msg_copy.msg_iov[i].iov_base =
+			k_usermode_alloc_from_copy(msg->msg_iov[i].iov_base,
+						   msg->msg_iov[i].iov_len);
+		if (!msg_copy.msg_iov[i].iov_base) {
+			errno = ENOMEM;
+			goto fail;
+		}
+
+		msg_copy.msg_iov[i].iov_len = msg->msg_iov[i].iov_len;
+	}
+
+	if (msg->msg_namelen > 0) {
+		if (msg->msg_name == NULL) {
+			errno = EINVAL;
+			goto fail;
+		}
+
+		msg_copy.msg_name = k_usermode_alloc_from_copy(msg->msg_name,
+							   msg->msg_namelen);
+		if (msg_copy.msg_name == NULL) {
+			errno = ENOMEM;
+			goto fail;
+		}
+	}
+
+	if (msg->msg_controllen > 0) {
+		if (msg->msg_control == NULL) {
+			errno = EINVAL;
+			goto fail;
+		}
+
+		msg_copy.msg_control =
+			k_usermode_alloc_from_copy(msg->msg_control,
+						   msg->msg_controllen);
+		if (msg_copy.msg_control == NULL) {
+			errno = ENOMEM;
+			goto fail;
+		}
+	}
+
+	ret = z_impl_zsock_recvmsg(sock, &msg_copy, flags);
+
+	/* Do not copy anything back if there was an error or nothing was
+	 * received.
+	 */
+	if (ret > 0) {
+		if (msg->msg_namelen > 0 && msg->msg_name != NULL) {
+			K_OOPS(k_usermode_to_copy(msg->msg_name,
+						  msg_copy.msg_name,
+						  msg_copy.msg_namelen));
+		}
+
+		if (msg->msg_controllen > 0 &&
+		    msg->msg_control != NULL) {
+			K_OOPS(k_usermode_to_copy(msg->msg_control,
+						  msg_copy.msg_control,
+						  msg_copy.msg_controllen));
+
+			msg->msg_controllen = msg_copy.msg_controllen;
+		} else {
+			msg->msg_controllen = 0U;
+		}
+
+		k_usermode_to_copy(&msg->msg_iovlen,
+				   &msg_copy.msg_iovlen,
+				   sizeof(msg->msg_iovlen));
+
+		/* The new iovlen cannot be bigger than the original one */
+		NET_ASSERT(msg_copy.msg_iovlen <= iovlen);
+
+		for (i = 0; i < iovlen; i++) {
+			if (i < msg_copy.msg_iovlen) {
+				K_OOPS(k_usermode_to_copy(msg->msg_iov[i].iov_base,
+							  msg_copy.msg_iov[i].iov_base,
+							  msg_copy.msg_iov[i].iov_len));
+				K_OOPS(k_usermode_to_copy(&msg->msg_iov[i].iov_len,
+							  &msg_copy.msg_iov[i].iov_len,
+							  sizeof(msg->msg_iov[i].iov_len)));
+			} else {
+				/* Clear out those vectors that we could not populate */
+				msg->msg_iov[i].iov_len = 0;
+			}
+		}
+
+		k_usermode_to_copy(&msg->msg_flags,
+				   &msg_copy.msg_flags,
+				   sizeof(msg->msg_flags));
+	}
+
+	k_free(msg_copy.msg_name);
+	k_free(msg_copy.msg_control);
+
+	/* Note that we need to free according to original iovlen */
+	for (i = 0; i < iovlen; i++) {
+		k_free(msg_copy.msg_iov[i].iov_base);
+	}
+
+	k_free(msg_copy.msg_iov);
+
+	return ret;
+
+fail:
+	if (msg_copy.msg_name) {
+		k_free(msg_copy.msg_name);
+	}
+
+	if (msg_copy.msg_control) {
+		k_free(msg_copy.msg_control);
+	}
+
+	if (msg_copy.msg_iov) {
+		for (i = 0; i < msg_copy.msg_iovlen; i++) {
+			if (msg_copy.msg_iov[i].iov_base) {
+				k_free(msg_copy.msg_iov[i].iov_base);
+			}
+		}
+
+		k_free(msg_copy.msg_iov);
+	}
+
+	return -1;
+}
+#include <zephyr/syscalls/zsock_recvmsg_mrsh.c>
+#endif /* CONFIG_USERSPACE */
+
+/* As this is limited function, we don't follow POSIX signature, with
+ * "..." instead of last arg.
+ */
+int z_impl_zsock_fcntl_impl(int sock, int cmd, int flags)
+{
+	const struct socket_op_vtable *vtable;
+	struct k_mutex *lock;
+	void *obj;
+	int ret;
+
+	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, fcntl, sock, cmd, flags);
+
+	obj = get_sock_vtable(sock, &vtable, &lock);
+	if (obj == NULL) {
+		errno = EBADF;
+		SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, fcntl, sock, -errno);
+		return -1;
+	}
+
+	(void)k_mutex_lock(lock, K_FOREVER);
+
+	ret = zvfs_fdtable_call_ioctl((const struct fd_op_vtable *)vtable,
+				   obj, cmd, flags);
+
+	k_mutex_unlock(lock);
+
+	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, fcntl, sock,
+				       ret < 0 ? -errno : ret);
+	return ret;
+}
+
+#ifdef CONFIG_USERSPACE
+static inline int z_vrfy_zsock_fcntl_impl(int sock, int cmd, int flags)
+{
+	return z_impl_zsock_fcntl_impl(sock, cmd, flags);
+}
+#include <zephyr/syscalls/zsock_fcntl_impl_mrsh.c>
+#endif
+
+int z_impl_zsock_ioctl_impl(int sock, unsigned long request, va_list args)
+{
+	const struct socket_op_vtable *vtable;
+	struct k_mutex *lock;
+	void *ctx;
+	int ret;
+
+	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, ioctl, sock, request);
+
+	ctx = get_sock_vtable(sock, &vtable, &lock);
+	if (ctx == NULL) {
+		errno = EBADF;
+		SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, ioctl, sock, -errno);
+		return -1;
+	}
+
+	(void)k_mutex_lock(lock, K_FOREVER);
+
+	NET_DBG("ioctl: ctx=%p, fd=%d, request=%lu", ctx, sock, request);
 
 	ret = vtable->fd_vtable.ioctl(ctx, request, args);
 
-	k_mutex_unlock(lock);
+	k_mutex_unlock(lock);
+
+	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, ioctl, sock,
+				       ret < 0 ? -errno : ret);
+	return ret;
+
+}
+
+#ifdef CONFIG_USERSPACE
+static inline int z_vrfy_zsock_ioctl_impl(int sock, unsigned long request, va_list args)
+{
+	switch (request) {
+	case ZFD_IOCTL_FIONBIO:
+		break;
+
+	case ZFD_IOCTL_FIONREAD: {
+		int *avail;
+
+		avail = va_arg(args, int *);
+		K_OOPS(K_SYSCALL_MEMORY_WRITE(avail, sizeof(*avail)));
+
+		break;
+	}
+
+	default:
+		errno = EOPNOTSUPP;
+		return -1;
+	}
+
+	return z_impl_zsock_ioctl_impl(sock, request, args);
+}
+#include <zephyr/syscalls/zsock_ioctl_impl_mrsh.c>
+#endif
+
+static int zsock_poll_prepare_ctx(struct net_context *ctx,
+				  struct zsock_pollfd *pfd,
+				  struct k_poll_event **pev,
+				  struct k_poll_event *pev_end)
+{
+	if (pfd->events & ZSOCK_POLLIN) {
+		if (*pev == pev_end) {
+			return -ENOMEM;
+		}
+
+		(*pev)->obj = &ctx->recv_q;
+		(*pev)->type = K_POLL_TYPE_FIFO_DATA_AVAILABLE;
+		(*pev)->mode = K_POLL_MODE_NOTIFY_ONLY;
+		(*pev)->state = K_POLL_STATE_NOT_READY;
+		(*pev)++;
+	}
+
+	if (pfd->events & ZSOCK_POLLOUT) {
+		if (IS_ENABLED(CONFIG_NET_NATIVE_TCP) &&
+		    net_context_get_type(ctx) == SOCK_STREAM &&
+		    !net_if_is_ip_offloaded(net_context_get_iface(ctx))) {
+			if (*pev == pev_end) {
+				return -ENOMEM;
+			}
+
+			if (net_context_get_state(ctx) == NET_CONTEXT_CONNECTING) {
+				(*pev)->obj = net_tcp_conn_sem_get(ctx);
+			} else {
+				(*pev)->obj = net_tcp_tx_sem_get(ctx);
+			}
+
+			(*pev)->type = K_POLL_TYPE_SEM_AVAILABLE;
+			(*pev)->mode = K_POLL_MODE_NOTIFY_ONLY;
+			(*pev)->state = K_POLL_STATE_NOT_READY;
+			(*pev)++;
+		} else {
+			return -EALREADY;
+		}
+
+	}
+
+	/* If socket is already in EOF or error, it can be reported
+	 * immediately, so we tell poll() to short-circuit wait.
+	 */
+	if (sock_is_eof(ctx) || sock_is_error(ctx)) {
+		return -EALREADY;
+	}
+
+	return 0;
+}
+
+static int zsock_poll_update_ctx(struct net_context *ctx,
+				 struct zsock_pollfd *pfd,
+				 struct k_poll_event **pev)
+{
+	ARG_UNUSED(ctx);
+
+	if (pfd->events & ZSOCK_POLLIN) {
+		if ((*pev)->state != K_POLL_STATE_NOT_READY || sock_is_eof(ctx)) {
+			pfd->revents |= ZSOCK_POLLIN;
+		}
+		(*pev)++;
+	}
+	if (pfd->events & ZSOCK_POLLOUT) {
+		if (IS_ENABLED(CONFIG_NET_NATIVE_TCP) &&
+		    net_context_get_type(ctx) == SOCK_STREAM &&
+		    !net_if_is_ip_offloaded(net_context_get_iface(ctx))) {
+			if ((*pev)->state != K_POLL_STATE_NOT_READY &&
+			    !sock_is_eof(ctx) &&
+			    (net_context_get_state(ctx) == NET_CONTEXT_CONNECTED)) {
+				pfd->revents |= ZSOCK_POLLOUT;
+			}
+			(*pev)++;
+		} else {
+			pfd->revents |= ZSOCK_POLLOUT;
+		}
+	}
+
+	if (sock_is_error(ctx)) {
+		pfd->revents |= ZSOCK_POLLERR;
+	}
+
+	if (sock_is_eof(ctx)) {
+		pfd->revents |= ZSOCK_POLLHUP;
+	}
+
+	return 0;
+}
+
+static inline int time_left(uint32_t start, uint32_t timeout)
+{
+	uint32_t elapsed = k_uptime_get_32() - start;
+
+	return timeout - elapsed;
+}
+
+int zsock_poll_internal(struct zsock_pollfd *fds, int nfds, k_timeout_t timeout)
+{
+	bool retry;
+	int ret = 0;
+	int i;
+	struct zsock_pollfd *pfd;
+	struct k_poll_event poll_events[CONFIG_NET_SOCKETS_POLL_MAX];
+	struct k_poll_event *pev;
+	struct k_poll_event *pev_end = poll_events + ARRAY_SIZE(poll_events);
+	const struct fd_op_vtable *vtable;
+	struct k_mutex *lock;
+	k_timepoint_t end;
+	bool offload = false;
+	const struct fd_op_vtable *offl_vtable = NULL;
+	void *offl_ctx = NULL;
+
+	end = sys_timepoint_calc(timeout);
+
+	pev = poll_events;
+	for (pfd = fds, i = nfds; i--; pfd++) {
+		void *ctx;
+		int result;
+
+		/* Per POSIX, negative fd's are just ignored */
+		if (pfd->fd < 0) {
+			continue;
+		}
+
+		ctx = get_sock_vtable(pfd->fd,
+				      (const struct socket_op_vtable **)&vtable,
+				      &lock);
+		if (ctx == NULL) {
+			/* Will set POLLNVAL in return loop */
+			continue;
+		}
+
+		(void)k_mutex_lock(lock, K_FOREVER);
+
+		result = zvfs_fdtable_call_ioctl(vtable, ctx,
+					      ZFD_IOCTL_POLL_PREPARE,
+					      pfd, &pev, pev_end);
+		if (result == -EALREADY) {
+			/* If POLL_PREPARE returned with EALREADY, it means
+			 * it already detected that some socket is ready. In
+			 * this case, we still perform a k_poll to pick up
+			 * as many events as possible, but without any wait.
+			 */
+			timeout = K_NO_WAIT;
+			end = sys_timepoint_calc(timeout);
+			result = 0;
+		} else if (result == -EXDEV) {
+			/* If POLL_PREPARE returned EXDEV, it means
+			 * it detected an offloaded socket.
+			 * If offloaded socket is used with native TLS, the TLS
+			 * wrapper for the offloaded poll will be used.
+			 * In case the fds array contains a mixup of offloaded
+			 * and non-offloaded sockets, the offloaded poll handler
+			 * shall return an error.
+			 */
+			offload = true;
+			if (offl_vtable == NULL || net_socket_is_tls(ctx)) {
+				offl_vtable = vtable;
+				offl_ctx = ctx;
+			}
+
+			result = 0;
+		}
+
+		k_mutex_unlock(lock);
+
+		if (result < 0) {
+			errno = -result;
+			return -1;
+		}
+	}
+
+	if (offload) {
+		int poll_timeout;
+
+		if (K_TIMEOUT_EQ(timeout, K_FOREVER)) {
+			poll_timeout = SYS_FOREVER_MS;
+		} else {
+			poll_timeout = k_ticks_to_ms_floor32(timeout.ticks);
+		}
+
+		return zvfs_fdtable_call_ioctl(offl_vtable, offl_ctx,
+					    ZFD_IOCTL_POLL_OFFLOAD,
+					    fds, nfds, poll_timeout);
+	}
+
+	timeout = sys_timepoint_timeout(end);
+
+	do {
+		ret = k_poll(poll_events, pev - poll_events, timeout);
+		/* EAGAIN when timeout expired, EINTR when cancelled (i.e. EOF) */
+		if (ret != 0 && ret != -EAGAIN && ret != -EINTR) {
+			errno = -ret;
+			return -1;
+		}
+
+		retry = false;
+		ret = 0;
+
+		pev = poll_events;
+		for (pfd = fds, i = nfds; i--; pfd++) {
+			void *ctx;
+			int result;
+
+			pfd->revents = 0;
+
+			if (pfd->fd < 0) {
+				continue;
+			}
+
+			ctx = get_sock_vtable(
+				pfd->fd,
+				(const struct socket_op_vtable **)&vtable,
+				&lock);
+			if (ctx == NULL) {
+				pfd->revents = ZSOCK_POLLNVAL;
+				ret++;
+				continue;
+			}
+
+			(void)k_mutex_lock(lock, K_FOREVER);
+
+			result = zvfs_fdtable_call_ioctl(vtable, ctx,
+						      ZFD_IOCTL_POLL_UPDATE,
+						      pfd, &pev);
+			k_mutex_unlock(lock);
+
+			if (result == -EAGAIN) {
+				retry = true;
+				continue;
+			} else if (result != 0) {
+				errno = -result;
+				return -1;
+			}
+
+			if (pfd->revents != 0) {
+				ret++;
+			}
+		}
+
+		if (retry) {
+			if (ret > 0) {
+				break;
+			}
+
+			timeout = sys_timepoint_timeout(end);
+
+			if (K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
+				break;
+			}
+		}
+	} while (retry);
+
+	return ret;
+}
+
+int z_impl_zsock_poll(struct zsock_pollfd *fds, int nfds, int poll_timeout)
+{
+	k_timeout_t timeout;
+	int ret;
+
+	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, poll, fds, nfds, poll_timeout);
+
+	if (poll_timeout < 0) {
+		timeout = K_FOREVER;
+	} else {
+		timeout = K_MSEC(poll_timeout);
+	}
+
+	ret = zsock_poll_internal(fds, nfds, timeout);
+
+	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, poll, fds, nfds,
+				       ret < 0 ? -errno : ret);
+	return ret;
+}
+
+#ifdef CONFIG_USERSPACE
+static inline int z_vrfy_zsock_poll(struct zsock_pollfd *fds,
+				    int nfds, int timeout)
+{
+	struct zsock_pollfd *fds_copy;
+	size_t fds_size;
+	int ret;
+
+	/* Copy fds array from user mode */
+	if (size_mul_overflow(nfds, sizeof(struct zsock_pollfd), &fds_size)) {
+		errno = EFAULT;
+		return -1;
+	}
+	fds_copy = k_usermode_alloc_from_copy((void *)fds, fds_size);
+	if (!fds_copy) {
+		errno = ENOMEM;
+		return -1;
+	}
+
+	ret = z_impl_zsock_poll(fds_copy, nfds, timeout);
+
+	if (ret >= 0) {
+		k_usermode_to_copy((void *)fds, fds_copy, fds_size);
+	}
+	k_free(fds_copy);
+
+	return ret;
+}
+#include <zephyr/syscalls/zsock_poll_mrsh.c>
+#endif
+
+int z_impl_zsock_inet_pton(sa_family_t family, const char *src, void *dst)
+{
+	if (net_addr_pton(family, src, dst) == 0) {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+#ifdef CONFIG_USERSPACE
+static inline int z_vrfy_zsock_inet_pton(sa_family_t family,
+					 const char *src, void *dst)
+{
+	int dst_size;
+	char src_copy[NET_IPV6_ADDR_LEN];
+	char dst_copy[sizeof(struct in6_addr)];
+	int ret;
+
+	switch (family) {
+	case AF_INET:
+		dst_size = sizeof(struct in_addr);
+		break;
+	case AF_INET6:
+		dst_size = sizeof(struct in6_addr);
+		break;
+	default:
+		errno = EAFNOSUPPORT;
+		return -1;
+	}
+
+	K_OOPS(k_usermode_string_copy(src_copy, (char *)src, sizeof(src_copy)));
+	ret = z_impl_zsock_inet_pton(family, src_copy, dst_copy);
+	K_OOPS(k_usermode_to_copy(dst, dst_copy, dst_size));
+
+	return ret;
+}
+#include <zephyr/syscalls/zsock_inet_pton_mrsh.c>
+#endif
+
+static enum tcp_conn_option get_tcp_option(int optname)
+{
+	switch (optname) {
+	case TCP_KEEPIDLE:
+		return TCP_OPT_KEEPIDLE;
+	case TCP_KEEPINTVL:
+		return TCP_OPT_KEEPINTVL;
+	case TCP_KEEPCNT:
+		return TCP_OPT_KEEPCNT;
+	}
+
+	return -EINVAL;
+}
+
+int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname,
+			 void *optval, socklen_t *optlen)
+{
+	int ret;
+
+	switch (level) {
+	case SOL_SOCKET:
+		switch (optname) {
+		case SO_ERROR: {
+			if (*optlen != sizeof(int)) {
+				errno = EINVAL;
+				return -1;
+			}
+
+			*(int *)optval = POINTER_TO_INT(ctx->user_data);
+
+			return 0;
+		}
+
+		case SO_TYPE: {
+			int type = (int)net_context_get_type(ctx);
+
+			if (*optlen != sizeof(type)) {
+				errno = EINVAL;
+				return -1;
+			}
+
+			*(int *)optval = type;
+
+			return 0;
+		}
+
+		case SO_TXTIME:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_TXTIME)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_TXTIME,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+			break;
+
+		case SO_PROTOCOL: {
+			int proto = (int)net_context_get_proto(ctx);
+
+			if (*optlen != sizeof(proto)) {
+				errno = EINVAL;
+				return -1;
+			}
+
+			*(int *)optval = proto;
+
+			return 0;
+		}
+
+		case SO_DOMAIN: {
+			if (*optlen != sizeof(int)) {
+				errno = EINVAL;
+				return -1;
+			}
+
+			*(int *)optval = net_context_get_family(ctx);
+
+			return 0;
+		}
+
+		break;
+
+		case SO_RCVBUF:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_RCVBUF)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_RCVBUF,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+			break;
+
+		case SO_SNDBUF:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_SNDBUF)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_SNDBUF,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+			break;
+
+		case SO_REUSEADDR:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEADDR)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_REUSEADDR,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+			break;
+
+		case SO_REUSEPORT:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEPORT)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_REUSEPORT,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+			break;
+
+		case SO_KEEPALIVE:
+			if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE) &&
+			    net_context_get_proto(ctx) == IPPROTO_TCP) {
+				ret = net_tcp_get_option(ctx,
+							 TCP_OPT_KEEPALIVE,
+							 optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case SO_TIMESTAMPING:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_TIMESTAMPING)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_TIMESTAMPING,
+							     optval, optlen);
+
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+		}
+
+		break;
+
+	case IPPROTO_TCP:
+		switch (optname) {
+		case TCP_NODELAY:
+			ret = net_tcp_get_option(ctx, TCP_OPT_NODELAY, optval, optlen);
+			return ret;
+
+		case TCP_KEEPIDLE:
+			__fallthrough;
+		case TCP_KEEPINTVL:
+			__fallthrough;
+		case TCP_KEEPCNT:
+			if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE)) {
+				ret = net_tcp_get_option(ctx,
+							 get_tcp_option(optname),
+							 optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+		}
+
+		break;
+
+	case IPPROTO_IP:
+		switch (optname) {
+		case IP_TOS:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_DSCP_ECN,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case IP_TTL:
+			ret = net_context_get_option(ctx, NET_OPT_TTL,
+						     optval, optlen);
+			if (ret < 0) {
+				errno  = -ret;
+				return -1;
+			}
+
+			return 0;
+
+		case IP_MULTICAST_TTL:
+			ret = net_context_get_option(ctx, NET_OPT_MCAST_TTL,
+						     optval, optlen);
+			if (ret < 0) {
+				errno  = -ret;
+				return -1;
+			}
+
+			return 0;
+		}
+
+		break;
+
+	case IPPROTO_IPV6:
+		switch (optname) {
+		case IPV6_V6ONLY:
+			if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_IPV6_V6ONLY,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case IPV6_ADDR_PREFERENCES:
+			if (IS_ENABLED(CONFIG_NET_IPV6)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_ADDR_PREFERENCES,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case IPV6_TCLASS:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) {
+				ret = net_context_get_option(ctx,
+							     NET_OPT_DSCP_ECN,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case IPV6_UNICAST_HOPS:
+			ret = net_context_get_option(ctx,
+						     NET_OPT_UNICAST_HOP_LIMIT,
+						     optval, optlen);
+			if (ret < 0) {
+				errno  = -ret;
+				return -1;
+			}
+
+			return 0;
+
+		case IPV6_MULTICAST_HOPS:
+			ret = net_context_get_option(ctx,
+						     NET_OPT_MCAST_HOP_LIMIT,
+						     optval, optlen);
+			if (ret < 0) {
+				errno  = -ret;
+				return -1;
+			}
+
+			return 0;
+		}
+
+		break;
+	}
+
+	errno = ENOPROTOOPT;
+	return -1;
+}
+
+int z_impl_zsock_getsockopt(int sock, int level, int optname,
+			    void *optval, socklen_t *optlen)
+{
+	int ret;
+
+	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, getsockopt, sock, level, optname);
+
+	ret = VTABLE_CALL(getsockopt, sock, level, optname, optval, optlen);
+
+	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, getsockopt, sock, level, optname,
+				       optval, *optlen, ret < 0 ? -errno : ret);
+	return ret;
+}
+
+#ifdef CONFIG_USERSPACE
+int z_vrfy_zsock_getsockopt(int sock, int level, int optname,
+			    void *optval, socklen_t *optlen)
+{
+	socklen_t kernel_optlen = *(socklen_t *)optlen;
+	void *kernel_optval;
+	int ret;
+
+	if (K_SYSCALL_MEMORY_WRITE(optval, kernel_optlen)) {
+		errno = -EPERM;
+		return -1;
+	}
+
+	kernel_optval = k_usermode_alloc_from_copy((const void *)optval,
+					       kernel_optlen);
+	K_OOPS(!kernel_optval);
 
-	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, ioctl, sock,
-				       ret < 0 ? -errno : ret);
-	return ret;
+	ret = z_impl_zsock_getsockopt(sock, level, optname,
+				      kernel_optval, &kernel_optlen);
+
+	K_OOPS(k_usermode_to_copy((void *)optval, kernel_optval, kernel_optlen));
+	K_OOPS(k_usermode_to_copy((void *)optlen, &kernel_optlen,
+			      sizeof(socklen_t)));
+
+	k_free(kernel_optval);
 
+	return ret;
 }
+#include <zephyr/syscalls/zsock_getsockopt_mrsh.c>
+#endif /* CONFIG_USERSPACE */
 
-#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_zsock_ioctl_impl(int sock, unsigned long request, va_list args)
+static int ipv4_multicast_group(struct net_context *ctx, const void *optval,
+				socklen_t optlen, bool do_join)
 {
-	switch (request) {
-	case ZFD_IOCTL_FIONBIO:
-		break;
+	struct ip_mreqn *mreqn;
+	struct net_if *iface;
+	int ifindex, ret;
 
-	case ZFD_IOCTL_FIONREAD: {
-		int *avail;
+	if (optval == NULL || optlen != sizeof(struct ip_mreqn)) {
+		errno = EINVAL;
+		return -1;
+	}
 
-		avail = va_arg(args, int *);
-		K_OOPS(K_SYSCALL_MEMORY_WRITE(avail, sizeof(*avail)));
+	mreqn = (struct ip_mreqn *)optval;
 
-		break;
+	if (mreqn->imr_multiaddr.s_addr == INADDR_ANY) {
+		errno = EINVAL;
+		return -1;
 	}
 
-	default:
-		errno = EOPNOTSUPP;
+	if (mreqn->imr_ifindex != 0) {
+		iface = net_if_get_by_index(mreqn->imr_ifindex);
+	} else {
+		ifindex = net_if_ipv4_addr_lookup_by_index(&mreqn->imr_address);
+		iface = net_if_get_by_index(ifindex);
+	}
+
+	if (iface == NULL) {
+		/* Check if ctx has already an interface and if not,
+		 * then select the default interface.
+		 */
+		if (ctx->iface <= 0) {
+			iface = net_if_get_default();
+		} else {
+			iface = net_if_get_by_index(ctx->iface);
+		}
+
+		if (iface == NULL) {
+			errno = EINVAL;
+			return -1;
+		}
+	}
+
+	if (do_join) {
+		ret = net_ipv4_igmp_join(iface, &mreqn->imr_multiaddr, NULL);
+	} else {
+		ret = net_ipv4_igmp_leave(iface, &mreqn->imr_multiaddr);
+	}
+
+	if (ret < 0) {
+		errno  = -ret;
 		return -1;
 	}
 
-	return z_impl_zsock_ioctl_impl(sock, request, args);
+	return 0;
 }
-#include <zephyr/syscalls/zsock_ioctl_impl_mrsh.c>
-#endif
 
-int zsock_poll_internal(struct zsock_pollfd *fds, int nfds, k_timeout_t timeout)
+static int ipv6_multicast_group(struct net_context *ctx, const void *optval,
+				socklen_t optlen, bool do_join)
 {
-	bool retry;
-	int ret = 0;
-	int i;
-	struct zsock_pollfd *pfd;
-	struct k_poll_event poll_events[CONFIG_NET_SOCKETS_POLL_MAX];
-	struct k_poll_event *pev;
-	struct k_poll_event *pev_end = poll_events + ARRAY_SIZE(poll_events);
-	const struct fd_op_vtable *vtable;
-	struct k_mutex *lock;
-	k_timepoint_t end;
-	bool offload = false;
-	const struct fd_op_vtable *offl_vtable = NULL;
-	void *offl_ctx = NULL;
+	struct ipv6_mreq *mreq;
+	struct net_if *iface;
+	int ret;
 
-	end = sys_timepoint_calc(timeout);
+	if (optval == NULL || optlen != sizeof(struct ipv6_mreq)) {
+		errno = EINVAL;
+		return -1;
+	}
 
-	pev = poll_events;
-	for (pfd = fds, i = nfds; i--; pfd++) {
-		void *ctx;
-		int result;
+	mreq = (struct ipv6_mreq *)optval;
 
-		/* Per POSIX, negative fd's are just ignored */
-		if (pfd->fd < 0) {
-			continue;
+	if (memcmp(&mreq->ipv6mr_multiaddr,
+		   net_ipv6_unspecified_address(),
+		   sizeof(mreq->ipv6mr_multiaddr)) == 0) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	iface = net_if_get_by_index(mreq->ipv6mr_ifindex);
+	if (iface == NULL) {
+		/* Check if ctx has already an interface and if not,
+		 * then select the default interface.
+		 */
+		if (ctx->iface <= 0) {
+			iface = net_if_get_default();
+		} else {
+			iface = net_if_get_by_index(ctx->iface);
 		}
 
-		ctx = get_sock_vtable(pfd->fd,
-				      (const struct socket_op_vtable **)&vtable,
-				      &lock);
-		if (ctx == NULL) {
-			/* Will set POLLNVAL in return loop */
-			continue;
+		if (iface == NULL) {
+			errno = ENOENT;
+			return -1;
 		}
+	}
 
-		(void)k_mutex_lock(lock, K_FOREVER);
+	if (do_join) {
+		ret = net_ipv6_mld_join(iface, &mreq->ipv6mr_multiaddr);
+	} else {
+		ret = net_ipv6_mld_leave(iface, &mreq->ipv6mr_multiaddr);
+	}
 
-		result = zvfs_fdtable_call_ioctl(vtable, ctx,
-					      ZFD_IOCTL_POLL_PREPARE,
-					      pfd, &pev, pev_end);
-		if (result == -EALREADY) {
-			/* If POLL_PREPARE returned with EALREADY, it means
-			 * it already detected that some socket is ready. In
-			 * this case, we still perform a k_poll to pick up
-			 * as many events as possible, but without any wait.
-			 */
-			timeout = K_NO_WAIT;
-			end = sys_timepoint_calc(timeout);
-			result = 0;
-		} else if (result == -EXDEV) {
-			/* If POLL_PREPARE returned EXDEV, it means
-			 * it detected an offloaded socket.
-			 * If offloaded socket is used with native TLS, the TLS
-			 * wrapper for the offloaded poll will be used.
-			 * In case the fds array contains a mixup of offloaded
-			 * and non-offloaded sockets, the offloaded poll handler
-			 * shall return an error.
-			 */
-			offload = true;
-			if (offl_vtable == NULL || net_socket_is_tls(ctx)) {
-				offl_vtable = vtable;
-				offl_ctx = ctx;
+	if (ret < 0) {
+		errno  = -ret;
+		return -1;
+	}
+
+	return 0;
+}
+
+int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname,
+			 const void *optval, socklen_t optlen)
+{
+	int ret;
+
+	switch (level) {
+	case SOL_SOCKET:
+		switch (optname) {
+		case SO_RCVBUF:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_RCVBUF)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_RCVBUF,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
 			}
 
-			result = 0;
-		}
+			break;
 
-		k_mutex_unlock(lock);
+		case SO_SNDBUF:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_SNDBUF)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_SNDBUF,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
 
-		if (result < 0) {
-			errno = -result;
-			return -1;
-		}
-	}
+				return 0;
+			}
 
-	if (offload) {
-		int poll_timeout;
+			break;
 
-		if (K_TIMEOUT_EQ(timeout, K_FOREVER)) {
-			poll_timeout = SYS_FOREVER_MS;
-		} else {
-			poll_timeout = k_ticks_to_ms_floor32(timeout.ticks);
-		}
+		case SO_REUSEADDR:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEADDR)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_REUSEADDR,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
 
-		return zvfs_fdtable_call_ioctl(offl_vtable, offl_ctx,
-					    ZFD_IOCTL_POLL_OFFLOAD,
-					    fds, nfds, poll_timeout);
-	}
+				return 0;
+			}
 
-	timeout = sys_timepoint_timeout(end);
+			break;
 
-	do {
-		ret = k_poll(poll_events, pev - poll_events, timeout);
-		/* EAGAIN when timeout expired, EINTR when cancelled (i.e. EOF) */
-		if (ret != 0 && ret != -EAGAIN && ret != -EINTR) {
-			errno = -ret;
-			return -1;
-		}
+		case SO_REUSEPORT:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEPORT)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_REUSEPORT,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
 
-		retry = false;
-		ret = 0;
+				return 0;
+			}
 
-		pev = poll_events;
-		for (pfd = fds, i = nfds; i--; pfd++) {
-			void *ctx;
-			int result;
+			break;
 
-			pfd->revents = 0;
+		case SO_PRIORITY:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_PRIORITY)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_PRIORITY,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
 
-			if (pfd->fd < 0) {
-				continue;
+				return 0;
 			}
 
-			ctx = get_sock_vtable(
-				pfd->fd,
-				(const struct socket_op_vtable **)&vtable,
-				&lock);
-			if (ctx == NULL) {
-				pfd->revents = ZSOCK_POLLNVAL;
-				ret++;
-				continue;
+			break;
+
+		case SO_RCVTIMEO:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_RCVTIMEO)) {
+				const struct zsock_timeval *tv = optval;
+				k_timeout_t timeout;
+
+				if (optlen != sizeof(struct zsock_timeval)) {
+					errno = EINVAL;
+					return -1;
+				}
+
+				if (tv->tv_sec == 0 && tv->tv_usec == 0) {
+					timeout = K_FOREVER;
+				} else {
+					timeout = K_USEC(tv->tv_sec * 1000000ULL
+							 + tv->tv_usec);
+				}
+
+				ret = net_context_set_option(ctx,
+							     NET_OPT_RCVTIMEO,
+							     &timeout,
+							     sizeof(timeout));
+
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
 			}
 
-			(void)k_mutex_lock(lock, K_FOREVER);
+			break;
+
+		case SO_SNDTIMEO:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_SNDTIMEO)) {
+				const struct zsock_timeval *tv = optval;
+				k_timeout_t timeout;
+
+				if (optlen != sizeof(struct zsock_timeval)) {
+					errno = EINVAL;
+					return -1;
+				}
+
+				if (tv->tv_sec == 0 && tv->tv_usec == 0) {
+					timeout = K_FOREVER;
+				} else {
+					timeout = K_USEC(tv->tv_sec * 1000000ULL
+							 + tv->tv_usec);
+				}
+
+				ret = net_context_set_option(ctx,
+							     NET_OPT_SNDTIMEO,
+							     &timeout,
+							     sizeof(timeout));
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
 
-			result = zvfs_fdtable_call_ioctl(vtable, ctx,
-						      ZFD_IOCTL_POLL_UPDATE,
-						      pfd, &pev);
-			k_mutex_unlock(lock);
+			break;
 
-			if (result == -EAGAIN) {
-				retry = true;
-				continue;
-			} else if (result != 0) {
-				errno = -result;
+		case SO_TXTIME:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_TXTIME)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_TXTIME,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case SO_SOCKS5:
+			if (IS_ENABLED(CONFIG_SOCKS)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_SOCKS5,
+							     optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				net_context_set_proxy_enabled(ctx, true);
+
+				return 0;
+			}
+
+			break;
+
+		case SO_BINDTODEVICE: {
+			struct net_if *iface;
+			const struct ifreq *ifreq = optval;
+
+			if (net_context_get_family(ctx) != AF_INET &&
+			    net_context_get_family(ctx) != AF_INET6) {
+				errno = EAFNOSUPPORT;
 				return -1;
 			}
 
-			if (pfd->revents != 0) {
-				ret++;
+			/* optlen equal to 0 or empty interface name should
+			 * remove the binding.
+			 */
+			if ((optlen == 0) || (ifreq != NULL &&
+					      strlen(ifreq->ifr_name) == 0)) {
+				ctx->flags &= ~NET_CONTEXT_BOUND_TO_IFACE;
+				return 0;
+			}
+
+			if ((ifreq == NULL) || (optlen != sizeof(*ifreq))) {
+				errno = EINVAL;
+				return -1;
+			}
+
+			if (IS_ENABLED(CONFIG_NET_INTERFACE_NAME)) {
+				ret = net_if_get_by_name(ifreq->ifr_name);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				iface = net_if_get_by_index(ret);
+				if (iface == NULL) {
+					errno = ENODEV;
+					return -1;
+				}
+			} else {
+				const struct device *dev;
+
+				dev = device_get_binding(ifreq->ifr_name);
+				if (dev == NULL) {
+					errno = ENODEV;
+					return -1;
+				}
+
+				iface = net_if_lookup_by_dev(dev);
+				if (iface == NULL) {
+					errno = ENODEV;
+					return -1;
+				}
 			}
+
+			net_context_bind_iface(ctx, iface);
+
+			return 0;
 		}
 
-		if (retry) {
-			if (ret > 0) {
-				break;
+		case SO_LINGER:
+			/* ignored. for compatibility purposes only */
+			return 0;
+
+		case SO_KEEPALIVE:
+			if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE) &&
+			    net_context_get_proto(ctx) == IPPROTO_TCP) {
+				ret = net_tcp_set_option(ctx,
+							 TCP_OPT_KEEPALIVE,
+							 optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
 			}
 
-			timeout = sys_timepoint_timeout(end);
+			break;
 
-			if (K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
-				break;
+		case SO_TIMESTAMPING:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_TIMESTAMPING)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_TIMESTAMPING,
+							     optval, optlen);
+
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
 			}
+
+			break;
 		}
-	} while (retry);
 
-	return ret;
-}
+		break;
 
-int z_impl_zsock_poll(struct zsock_pollfd *fds, int nfds, int poll_timeout)
-{
-	k_timeout_t timeout;
-	int ret;
+	case IPPROTO_TCP:
+		switch (optname) {
+		case TCP_NODELAY:
+			ret = net_tcp_set_option(ctx,
+						 TCP_OPT_NODELAY, optval, optlen);
+			return ret;
+
+		case TCP_KEEPIDLE:
+			__fallthrough;
+		case TCP_KEEPINTVL:
+			__fallthrough;
+		case TCP_KEEPCNT:
+			if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE)) {
+				ret = net_tcp_set_option(ctx,
+							 get_tcp_option(optname),
+							 optval, optlen);
+				if (ret < 0) {
+					errno = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
 
-	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, poll, fds, nfds, poll_timeout);
+			break;
+		}
+		break;
 
-	if (poll_timeout < 0) {
-		timeout = K_FOREVER;
-	} else {
-		timeout = K_MSEC(poll_timeout);
-	}
+	case IPPROTO_IP:
+		switch (optname) {
+		case IP_TOS:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_DSCP_ECN,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case IP_PKTINFO:
+			if (IS_ENABLED(CONFIG_NET_IPV4) &&
+			    IS_ENABLED(CONFIG_NET_CONTEXT_RECV_PKTINFO)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_RECV_PKTINFO,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
+
+			break;
+
+		case IP_MULTICAST_TTL:
+			ret = net_context_set_option(ctx, NET_OPT_MCAST_TTL,
+						     optval, optlen);
+			if (ret < 0) {
+				errno  = -ret;
+				return -1;
+			}
+
+			return 0;
+
+		case IP_TTL:
+			ret = net_context_set_option(ctx, NET_OPT_TTL,
+						     optval, optlen);
+			if (ret < 0) {
+				errno  = -ret;
+				return -1;
+			}
+
+			return 0;
 
-	ret = zsock_poll_internal(fds, nfds, timeout);
+		case IP_ADD_MEMBERSHIP:
+			if (IS_ENABLED(CONFIG_NET_IPV4)) {
+				return ipv4_multicast_group(ctx, optval,
+							    optlen, true);
+			}
 
-	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, poll, fds, nfds,
-				       ret < 0 ? -errno : ret);
-	return ret;
-}
+			break;
 
-#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_zsock_poll(struct zsock_pollfd *fds,
-				    int nfds, int timeout)
-{
-	struct zsock_pollfd *fds_copy;
-	size_t fds_size;
-	int ret;
+		case IP_DROP_MEMBERSHIP:
+			if (IS_ENABLED(CONFIG_NET_IPV4)) {
+				return ipv4_multicast_group(ctx, optval,
+							    optlen, false);
+			}
 
-	/* Copy fds array from user mode */
-	if (size_mul_overflow(nfds, sizeof(struct zsock_pollfd), &fds_size)) {
-		errno = EFAULT;
-		return -1;
-	}
-	fds_copy = k_usermode_alloc_from_copy((void *)fds, fds_size);
-	if (!fds_copy) {
-		errno = ENOMEM;
-		return -1;
-	}
+			break;
+		}
 
-	ret = z_impl_zsock_poll(fds_copy, nfds, timeout);
+		break;
 
-	if (ret >= 0) {
-		k_usermode_to_copy((void *)fds, fds_copy, fds_size);
-	}
-	k_free(fds_copy);
+	case IPPROTO_IPV6:
+		switch (optname) {
+		case IPV6_V6ONLY:
+			if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_IPV6_V6ONLY,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
+			}
 
-	return ret;
-}
-#include <zephyr/syscalls/zsock_poll_mrsh.c>
-#endif
+			return 0;
+
+		case IPV6_RECVPKTINFO:
+			if (IS_ENABLED(CONFIG_NET_IPV6) &&
+			    IS_ENABLED(CONFIG_NET_CONTEXT_RECV_PKTINFO)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_RECV_PKTINFO,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
+
+				return 0;
+			}
 
-int z_impl_zsock_inet_pton(sa_family_t family, const char *src, void *dst)
-{
-	if (net_addr_pton(family, src, dst) == 0) {
-		return 1;
-	} else {
-		return 0;
-	}
-}
+			break;
 
-#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_zsock_inet_pton(sa_family_t family,
-					 const char *src, void *dst)
-{
-	int dst_size;
-	char src_copy[NET_IPV6_ADDR_LEN];
-	char dst_copy[sizeof(struct in6_addr)];
-	int ret;
+		case IPV6_ADDR_PREFERENCES:
+			if (IS_ENABLED(CONFIG_NET_IPV6)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_ADDR_PREFERENCES,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
 
-	switch (family) {
-	case AF_INET:
-		dst_size = sizeof(struct in_addr);
-		break;
-	case AF_INET6:
-		dst_size = sizeof(struct in6_addr);
-		break;
-	default:
-		errno = EAFNOSUPPORT;
-		return -1;
-	}
+				return 0;
+			}
 
-	K_OOPS(k_usermode_string_copy(src_copy, (char *)src, sizeof(src_copy)));
-	ret = z_impl_zsock_inet_pton(family, src_copy, dst_copy);
-	K_OOPS(k_usermode_to_copy(dst, dst_copy, dst_size));
+			break;
 
-	return ret;
-}
-#include <zephyr/syscalls/zsock_inet_pton_mrsh.c>
-#endif
+		case IPV6_TCLASS:
+			if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) {
+				ret = net_context_set_option(ctx,
+							     NET_OPT_DSCP_ECN,
+							     optval,
+							     optlen);
+				if (ret < 0) {
+					errno  = -ret;
+					return -1;
+				}
 
-int z_impl_zsock_getsockopt(int sock, int level, int optname,
-			    void *optval, socklen_t *optlen)
-{
-	int ret;
+				return 0;
+			}
 
-	SYS_PORT_TRACING_OBJ_FUNC_ENTER(socket, getsockopt, sock, level, optname);
+			break;
 
-	ret = VTABLE_CALL(getsockopt, sock, level, optname, optval, optlen);
+		case IPV6_UNICAST_HOPS:
+			ret = net_context_set_option(ctx,
+						     NET_OPT_UNICAST_HOP_LIMIT,
+						     optval, optlen);
+			if (ret < 0) {
+				errno  = -ret;
+				return -1;
+			}
 
-	SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, getsockopt, sock, level, optname,
-				       optval, *optlen, ret < 0 ? -errno : ret);
-	return ret;
-}
+			return 0;
 
-#ifdef CONFIG_USERSPACE
-int z_vrfy_zsock_getsockopt(int sock, int level, int optname,
-			    void *optval, socklen_t *optlen)
-{
-	socklen_t kernel_optlen = *(socklen_t *)optlen;
-	void *kernel_optval;
-	int ret;
+		case IPV6_MULTICAST_HOPS:
+			ret = net_context_set_option(ctx,
+						     NET_OPT_MCAST_HOP_LIMIT,
+						     optval, optlen);
+			if (ret < 0) {
+				errno  = -ret;
+				return -1;
+			}
 
-	if (K_SYSCALL_MEMORY_WRITE(optval, kernel_optlen)) {
-		errno = -EPERM;
-		return -1;
-	}
+			return 0;
 
-	kernel_optval = k_usermode_alloc_from_copy((const void *)optval,
-					       kernel_optlen);
-	K_OOPS(!kernel_optval);
+		case IPV6_ADD_MEMBERSHIP:
+			if (IS_ENABLED(CONFIG_NET_IPV6)) {
+				return ipv6_multicast_group(ctx, optval,
+							    optlen, true);
+			}
 
-	ret = z_impl_zsock_getsockopt(sock, level, optname,
-				      kernel_optval, &kernel_optlen);
+			break;
 
-	K_OOPS(k_usermode_to_copy((void *)optval, kernel_optval, kernel_optlen));
-	K_OOPS(k_usermode_to_copy((void *)optlen, &kernel_optlen,
-			      sizeof(socklen_t)));
+		case IPV6_DROP_MEMBERSHIP:
+			if (IS_ENABLED(CONFIG_NET_IPV6)) {
+				return ipv6_multicast_group(ctx, optval,
+							    optlen, false);
+			}
 
-	k_free(kernel_optval);
+			break;
+		}
 
-	return ret;
+		break;
+	}
+
+	errno = ENOPROTOOPT;
+	return -1;
 }
-#include <zephyr/syscalls/zsock_getsockopt_mrsh.c>
-#endif /* CONFIG_USERSPACE */
 
 int z_impl_zsock_setsockopt(int sock, int level, int optname,
 			    const void *optval, socklen_t optlen)
@@ -1138,6 +3584,54 @@ int z_vrfy_zsock_setsockopt(int sock, int level, int optname,
 #include <zephyr/syscalls/zsock_setsockopt_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
+int zsock_getpeername_ctx(struct net_context *ctx, struct sockaddr *addr,
+			  socklen_t *addrlen)
+{
+	socklen_t newlen = 0;
+
+	if (addr == NULL || addrlen == NULL) {
+		SET_ERRNO(-EINVAL);
+	}
+
+	if (!(ctx->flags & NET_CONTEXT_REMOTE_ADDR_SET)) {
+		SET_ERRNO(-ENOTCONN);
+	}
+
+	if (net_context_get_type(ctx) == SOCK_STREAM &&
+	    net_context_get_state(ctx) != NET_CONTEXT_CONNECTED) {
+		SET_ERRNO(-ENOTCONN);
+	}
+
+	if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->remote.sa_family == AF_INET) {
+		struct sockaddr_in addr4 = { 0 };
+
+		addr4.sin_family = AF_INET;
+		addr4.sin_port = net_sin(&ctx->remote)->sin_port;
+		memcpy(&addr4.sin_addr, &net_sin(&ctx->remote)->sin_addr,
+		       sizeof(struct in_addr));
+		newlen = sizeof(struct sockaddr_in);
+
+		memcpy(addr, &addr4, MIN(*addrlen, newlen));
+	} else if (IS_ENABLED(CONFIG_NET_IPV6) &&
+		   ctx->remote.sa_family == AF_INET6) {
+		struct sockaddr_in6 addr6 = { 0 };
+
+		addr6.sin6_family = AF_INET6;
+		addr6.sin6_port = net_sin6(&ctx->remote)->sin6_port;
+		memcpy(&addr6.sin6_addr, &net_sin6(&ctx->remote)->sin6_addr,
+		       sizeof(struct in6_addr));
+		newlen = sizeof(struct sockaddr_in6);
+
+		memcpy(addr, &addr6, MIN(*addrlen, newlen));
+	} else {
+		SET_ERRNO(-EINVAL);
+	}
+
+	*addrlen = newlen;
+
+	return 0;
+}
+
 int z_impl_zsock_getpeername(int sock, struct sockaddr *addr,
 			     socklen_t *addrlen)
 {
@@ -1183,6 +3677,56 @@ static inline int z_vrfy_zsock_getpeername(int sock, struct sockaddr *addr,
 #include <zephyr/syscalls/zsock_getpeername_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
+int zsock_getsockname_ctx(struct net_context *ctx, struct sockaddr *addr,
+			  socklen_t *addrlen)
+{
+	socklen_t newlen = 0;
+	int ret;
+
+	if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->local.family == AF_INET) {
+		struct sockaddr_in addr4 = { 0 };
+
+		if (net_sin_ptr(&ctx->local)->sin_addr == NULL) {
+			SET_ERRNO(-EINVAL);
+		}
+
+		newlen = sizeof(struct sockaddr_in);
+
+		ret = net_context_get_local_addr(ctx,
+						 (struct sockaddr *)&addr4,
+						 &newlen);
+		if (ret < 0) {
+			SET_ERRNO(-ret);
+		}
+
+		memcpy(addr, &addr4, MIN(*addrlen, newlen));
+
+	} else if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->local.family == AF_INET6) {
+		struct sockaddr_in6 addr6 = { 0 };
+
+		if (net_sin6_ptr(&ctx->local)->sin6_addr == NULL) {
+			SET_ERRNO(-EINVAL);
+		}
+
+		newlen = sizeof(struct sockaddr_in6);
+
+		ret = net_context_get_local_addr(ctx,
+						 (struct sockaddr *)&addr6,
+						 &newlen);
+		if (ret < 0) {
+			SET_ERRNO(-ret);
+		}
+
+		memcpy(addr, &addr6, MIN(*addrlen, newlen));
+	} else {
+		SET_ERRNO(-EINVAL);
+	}
+
+	*addrlen = newlen;
+
+	return 0;
+}
+
 int z_impl_zsock_getsockname(int sock, struct sockaddr *addr,
 			     socklen_t *addrlen)
 {
@@ -1227,3 +3771,210 @@ static inline int z_vrfy_zsock_getsockname(int sock, struct sockaddr *addr,
 }
 #include <zephyr/syscalls/zsock_getsockname_mrsh.c>
 #endif /* CONFIG_USERSPACE */
+
+static ssize_t sock_read_vmeth(void *obj, void *buffer, size_t count)
+{
+	return zsock_recvfrom_ctx(obj, buffer, count, 0, NULL, 0);
+}
+
+static ssize_t sock_write_vmeth(void *obj, const void *buffer, size_t count)
+{
+	return zsock_sendto_ctx(obj, buffer, count, 0, NULL, 0);
+}
+
+static void zsock_ctx_set_lock(struct net_context *ctx, struct k_mutex *lock)
+{
+	ctx->cond.lock = lock;
+}
+
+static int sock_ioctl_vmeth(void *obj, unsigned int request, va_list args)
+{
+	switch (request) {
+
+	/* In Zephyr, fcntl() is just an alias of ioctl(). */
+	case F_GETFL:
+		if (sock_is_nonblock(obj)) {
+		    return O_NONBLOCK;
+		}
+
+		return 0;
+
+	case F_SETFL: {
+		int flags;
+
+		flags = va_arg(args, int);
+
+		if (flags & O_NONBLOCK) {
+			sock_set_flag(obj, SOCK_NONBLOCK, SOCK_NONBLOCK);
+		} else {
+			sock_set_flag(obj, SOCK_NONBLOCK, 0);
+		}
+
+		return 0;
+	}
+
+	case ZFD_IOCTL_POLL_PREPARE: {
+		struct zsock_pollfd *pfd;
+		struct k_poll_event **pev;
+		struct k_poll_event *pev_end;
+
+		pfd = va_arg(args, struct zsock_pollfd *);
+		pev = va_arg(args, struct k_poll_event **);
+		pev_end = va_arg(args, struct k_poll_event *);
+
+		return zsock_poll_prepare_ctx(obj, pfd, pev, pev_end);
+	}
+
+	case ZFD_IOCTL_POLL_UPDATE: {
+		struct zsock_pollfd *pfd;
+		struct k_poll_event **pev;
+
+		pfd = va_arg(args, struct zsock_pollfd *);
+		pev = va_arg(args, struct k_poll_event **);
+
+		return zsock_poll_update_ctx(obj, pfd, pev);
+	}
+
+	case ZFD_IOCTL_SET_LOCK: {
+		struct k_mutex *lock;
+
+		lock = va_arg(args, struct k_mutex *);
+
+		zsock_ctx_set_lock(obj, lock);
+		return 0;
+	}
+
+	case ZFD_IOCTL_FIONBIO:
+		sock_set_flag(obj, SOCK_NONBLOCK, SOCK_NONBLOCK);
+		return 0;
+
+	case ZFD_IOCTL_FIONREAD: {
+		int *avail = va_arg(args, int *);
+
+		*avail = zsock_fionread_ctx(obj);
+		return 0;
+	}
+
+	default:
+		errno = EOPNOTSUPP;
+		return -1;
+	}
+}
+
+static int sock_shutdown_vmeth(void *obj, int how)
+{
+	return zsock_shutdown_ctx(obj, how);
+}
+
+static int sock_bind_vmeth(void *obj, const struct sockaddr *addr,
+			   socklen_t addrlen)
+{
+	return zsock_bind_ctx(obj, addr, addrlen);
+}
+
+static int sock_connect_vmeth(void *obj, const struct sockaddr *addr,
+			      socklen_t addrlen)
+{
+	return zsock_connect_ctx(obj, addr, addrlen);
+}
+
+static int sock_listen_vmeth(void *obj, int backlog)
+{
+	return zsock_listen_ctx(obj, backlog);
+}
+
+static int sock_accept_vmeth(void *obj, struct sockaddr *addr,
+			     socklen_t *addrlen)
+{
+	return zsock_accept_ctx(obj, addr, addrlen);
+}
+
+static ssize_t sock_sendto_vmeth(void *obj, const void *buf, size_t len,
+				 int flags, const struct sockaddr *dest_addr,
+				 socklen_t addrlen)
+{
+	return zsock_sendto_ctx(obj, buf, len, flags, dest_addr, addrlen);
+}
+
+static ssize_t sock_sendmsg_vmeth(void *obj, const struct msghdr *msg,
+				  int flags)
+{
+	return zsock_sendmsg_ctx(obj, msg, flags);
+}
+
+static ssize_t sock_recvmsg_vmeth(void *obj, struct msghdr *msg, int flags)
+{
+	return zsock_recvmsg_ctx(obj, msg, flags);
+}
+
+static ssize_t sock_recvfrom_vmeth(void *obj, void *buf, size_t max_len,
+				   int flags, struct sockaddr *src_addr,
+				   socklen_t *addrlen)
+{
+	return zsock_recvfrom_ctx(obj, buf, max_len, flags,
+				  src_addr, addrlen);
+}
+
+static int sock_getsockopt_vmeth(void *obj, int level, int optname,
+				 void *optval, socklen_t *optlen)
+{
+	return zsock_getsockopt_ctx(obj, level, optname, optval, optlen);
+}
+
+static int sock_setsockopt_vmeth(void *obj, int level, int optname,
+				 const void *optval, socklen_t optlen)
+{
+	return zsock_setsockopt_ctx(obj, level, optname, optval, optlen);
+}
+
+static int sock_close_vmeth(void *obj)
+{
+	return zsock_close_ctx(obj);
+}
+static int sock_getpeername_vmeth(void *obj, struct sockaddr *addr,
+				  socklen_t *addrlen)
+{
+	return zsock_getpeername_ctx(obj, addr, addrlen);
+}
+
+static int sock_getsockname_vmeth(void *obj, struct sockaddr *addr,
+				  socklen_t *addrlen)
+{
+	return zsock_getsockname_ctx(obj, addr, addrlen);
+}
+
+const struct socket_op_vtable sock_fd_op_vtable = {
+	.fd_vtable = {
+		.read = sock_read_vmeth,
+		.write = sock_write_vmeth,
+		.close = sock_close_vmeth,
+		.ioctl = sock_ioctl_vmeth,
+	},
+	.shutdown = sock_shutdown_vmeth,
+	.bind = sock_bind_vmeth,
+	.connect = sock_connect_vmeth,
+	.listen = sock_listen_vmeth,
+	.accept = sock_accept_vmeth,
+	.sendto = sock_sendto_vmeth,
+	.sendmsg = sock_sendmsg_vmeth,
+	.recvmsg = sock_recvmsg_vmeth,
+	.recvfrom = sock_recvfrom_vmeth,
+	.getsockopt = sock_getsockopt_vmeth,
+	.setsockopt = sock_setsockopt_vmeth,
+	.getpeername = sock_getpeername_vmeth,
+	.getsockname = sock_getsockname_vmeth,
+};
+
+#if defined(CONFIG_NET_NATIVE)
+static bool inet_is_supported(int family, int type, int proto)
+{
+	if (family != AF_INET && family != AF_INET6) {
+		return false;
+	}
+
+	return true;
+}
+
+NET_SOCKET_REGISTER(af_inet46, NET_SOCKET_DEFAULT_PRIO, AF_UNSPEC,
+		    inet_is_supported, zsock_socket_internal);
+#endif /* CONFIG_NET_NATIVE */
diff --git a/subsys/net/lib/sockets/sockets_inet.c b/subsys/net/lib/sockets/sockets_inet.c
deleted file mode 100644
index 9403cdd152a..00000000000
--- a/subsys/net/lib/sockets/sockets_inet.c
+++ /dev/null
@@ -1,2758 +0,0 @@
-/*
- * Copyright (c) 2017 Linaro Limited
- * Copyright (c) 2021 Nordic Semiconductor
- * Copyright (c) 2023 Arm Limited (or its affiliates). All rights reserved.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/* Zephyr headers */
-#include <zephyr/logging/log.h>
-LOG_MODULE_DECLARE(net_sock, CONFIG_NET_SOCKETS_LOG_LEVEL);
-
-#include <zephyr/kernel.h>
-#include <zephyr/net/net_context.h>
-#include <zephyr/net/net_pkt.h>
-#include <zephyr/tracing/tracing.h>
-#include <zephyr/net/socket.h>
-#include <zephyr/net/socket_types.h>
-#include <zephyr/posix/fcntl.h>
-#include <zephyr/sys/fdtable.h>
-#include <zephyr/sys/math_extras.h>
-#include <zephyr/sys/iterable_sections.h>
-
-#if defined(CONFIG_SOCKS)
-#include "socks.h"
-#endif
-
-#include <zephyr/net/igmp.h>
-#include "../../ip/ipv6.h"
-
-#include "../../ip/net_stats.h"
-
-#include "sockets_internal.h"
-#include "../../ip/tcp_internal.h"
-#include "../../ip/net_private.h"
-
-#define SET_ERRNO(x) \
-	{ int _err = x; if (_err < 0) { errno = -_err; return -1; } }
-
-const struct socket_op_vtable sock_fd_op_vtable;
-
-static void zsock_received_cb(struct net_context *ctx,
-			      struct net_pkt *pkt,
-			      union net_ip_header *ip_hdr,
-			      union net_proto_header *proto_hdr,
-			      int status,
-			      void *user_data);
-
-static int fifo_wait_non_empty(struct k_fifo *fifo, k_timeout_t timeout)
-{
-	struct k_poll_event events[] = {
-		K_POLL_EVENT_INITIALIZER(K_POLL_TYPE_FIFO_DATA_AVAILABLE,
-					 K_POLL_MODE_NOTIFY_ONLY, fifo),
-	};
-
-	return k_poll(events, ARRAY_SIZE(events), timeout);
-}
-
-static void zsock_flush_queue(struct net_context *ctx)
-{
-	bool is_listen = net_context_get_state(ctx) == NET_CONTEXT_LISTENING;
-	void *p;
-
-	/* recv_q and accept_q are shared via a union */
-	while ((p = k_fifo_get(&ctx->recv_q, K_NO_WAIT)) != NULL) {
-		if (is_listen) {
-			NET_DBG("discarding ctx %p", p);
-			net_context_put(p);
-		} else {
-			NET_DBG("discarding pkt %p", p);
-			net_pkt_unref(p);
-		}
-	}
-
-	/* Some threads might be waiting on recv, cancel the wait */
-	k_fifo_cancel_wait(&ctx->recv_q);
-
-	/* Wake reader if it was sleeping */
-	(void)k_condvar_signal(&ctx->cond.recv);
-}
-
-static int zsock_socket_internal(int family, int type, int proto)
-{
-	int fd = zvfs_reserve_fd();
-	struct net_context *ctx;
-	int res;
-
-	if (fd < 0) {
-		return -1;
-	}
-
-	if (proto == 0) {
-		if (family == AF_INET || family == AF_INET6) {
-			if (type == SOCK_DGRAM) {
-				proto = IPPROTO_UDP;
-			} else if (type == SOCK_STREAM) {
-				proto = IPPROTO_TCP;
-			}
-		}
-	}
-
-	res = net_context_get(family, type, proto, &ctx);
-	if (res < 0) {
-		zvfs_free_fd(fd);
-		errno = -res;
-		return -1;
-	}
-
-	/* Initialize user_data, all other calls will preserve it */
-	ctx->user_data = NULL;
-
-	/* The socket flags are stored here */
-	ctx->socket_data = NULL;
-
-	/* recv_q and accept_q are in union */
-	k_fifo_init(&ctx->recv_q);
-
-	/* Condition variable is used to avoid keeping lock for a long time
-	 * when waiting data to be received
-	 */
-	k_condvar_init(&ctx->cond.recv);
-
-	/* TCP context is effectively owned by both application
-	 * and the stack: stack may detect that peer closed/aborted
-	 * connection, but it must not dispose of the context behind
-	 * the application back. Likewise, when application "closes"
-	 * context, it's not disposed of immediately - there's yet
-	 * closing handshake for stack to perform.
-	 */
-	if (proto == IPPROTO_TCP) {
-		net_context_ref(ctx);
-	}
-
-	zvfs_finalize_typed_fd(fd, ctx, (const struct fd_op_vtable *)&sock_fd_op_vtable,
-			    ZVFS_MODE_IFSOCK);
-
-	NET_DBG("socket: ctx=%p, fd=%d", ctx, fd);
-
-	return fd;
-}
-
-int zsock_close_ctx(struct net_context *ctx)
-{
-	/* Reset callbacks to avoid any race conditions while
-	 * flushing queues. No need to check return values here,
-	 * as these are fail-free operations and we're closing
-	 * socket anyway.
-	 */
-	if (net_context_get_state(ctx) == NET_CONTEXT_LISTENING) {
-		(void)net_context_accept(ctx, NULL, K_NO_WAIT, NULL);
-	} else {
-		(void)net_context_recv(ctx, NULL, K_NO_WAIT, NULL);
-	}
-
-	ctx->user_data = INT_TO_POINTER(EINTR);
-	sock_set_error(ctx);
-
-	zsock_flush_queue(ctx);
-
-	SET_ERRNO(net_context_put(ctx));
-
-	return 0;
-}
-
-static void zsock_accepted_cb(struct net_context *new_ctx,
-			      struct sockaddr *addr, socklen_t addrlen,
-			      int status, void *user_data)
-{
-	struct net_context *parent = user_data;
-
-	NET_DBG("parent=%p, ctx=%p, st=%d", parent, new_ctx, status);
-
-	if (status == 0) {
-		/* This just installs a callback, so cannot fail. */
-		(void)net_context_recv(new_ctx, zsock_received_cb, K_NO_WAIT,
-				       NULL);
-		k_fifo_init(&new_ctx->recv_q);
-		k_condvar_init(&new_ctx->cond.recv);
-
-		k_fifo_put(&parent->accept_q, new_ctx);
-
-		/* TCP context is effectively owned by both application
-		 * and the stack: stack may detect that peer closed/aborted
-		 * connection, but it must not dispose of the context behind
-		 * the application back. Likewise, when application "closes"
-		 * context, it's not disposed of immediately - there's yet
-		 * closing handshake for stack to perform.
-		 */
-		net_context_ref(new_ctx);
-
-		(void)k_condvar_signal(&parent->cond.recv);
-	}
-
-}
-
-static void zsock_received_cb(struct net_context *ctx,
-			      struct net_pkt *pkt,
-			      union net_ip_header *ip_hdr,
-			      union net_proto_header *proto_hdr,
-			      int status,
-			      void *user_data)
-{
-	if (ctx->cond.lock) {
-		(void)k_mutex_lock(ctx->cond.lock, K_FOREVER);
-	}
-
-	NET_DBG("ctx=%p, pkt=%p, st=%d, user_data=%p", ctx, pkt, status,
-		user_data);
-
-	if (status < 0) {
-		ctx->user_data = INT_TO_POINTER(-status);
-		sock_set_error(ctx);
-	}
-
-	/* if pkt is NULL, EOF */
-	if (!pkt) {
-		struct net_pkt *last_pkt = k_fifo_peek_tail(&ctx->recv_q);
-
-		if (!last_pkt) {
-			/* If there're no packets in the queue, recv() may
-			 * be blocked waiting on it to become non-empty,
-			 * so cancel that wait.
-			 */
-			sock_set_eof(ctx);
-			k_fifo_cancel_wait(&ctx->recv_q);
-			NET_DBG("Marked socket %p as peer-closed", ctx);
-		} else {
-			net_pkt_set_eof(last_pkt, true);
-			NET_DBG("Set EOF flag on pkt %p", last_pkt);
-		}
-
-		goto unlock;
-	}
-
-	/* Normal packet */
-	net_pkt_set_eof(pkt, false);
-
-	net_pkt_set_rx_stats_tick(pkt, k_cycle_get_32());
-
-	k_fifo_put(&ctx->recv_q, pkt);
-
-unlock:
-	/* Wake reader if it was sleeping */
-	(void)k_condvar_signal(&ctx->cond.recv);
-
-	if (ctx->cond.lock) {
-		(void)k_mutex_unlock(ctx->cond.lock);
-	}
-}
-
-int zsock_shutdown_ctx(struct net_context *ctx, int how)
-{
-	if (how == ZSOCK_SHUT_RD) {
-		if (net_context_get_state(ctx) == NET_CONTEXT_LISTENING) {
-			SET_ERRNO(net_context_accept(ctx, NULL, K_NO_WAIT, NULL));
-		} else {
-			SET_ERRNO(net_context_recv(ctx, NULL, K_NO_WAIT, NULL));
-		}
-
-		sock_set_eof(ctx);
-
-		zsock_flush_queue(ctx);
-	} else if (how == ZSOCK_SHUT_WR || how == ZSOCK_SHUT_RDWR) {
-		SET_ERRNO(-ENOTSUP);
-	} else {
-		SET_ERRNO(-EINVAL);
-	}
-
-	return 0;
-}
-
-int zsock_bind_ctx(struct net_context *ctx, const struct sockaddr *addr,
-		   socklen_t addrlen)
-{
-	SET_ERRNO(net_context_bind(ctx, addr, addrlen));
-	/* For DGRAM socket, we expect to receive packets after call to
-	 * bind(), but for STREAM socket, next expected operation is
-	 * listen(), which doesn't work if recv callback is set.
-	 */
-	if (net_context_get_type(ctx) == SOCK_DGRAM) {
-		SET_ERRNO(net_context_recv(ctx, zsock_received_cb, K_NO_WAIT,
-					   ctx->user_data));
-	}
-
-	return 0;
-}
-
-static void zsock_connected_cb(struct net_context *ctx, int status, void *user_data)
-{
-	if (status < 0) {
-		ctx->user_data = INT_TO_POINTER(-status);
-		sock_set_error(ctx);
-	}
-}
-
-int zsock_connect_ctx(struct net_context *ctx, const struct sockaddr *addr,
-		      socklen_t addrlen)
-{
-
-#if defined(CONFIG_SOCKS)
-	if (net_context_is_proxy_enabled(ctx)) {
-		SET_ERRNO(net_socks5_connect(ctx, addr, addrlen));
-		SET_ERRNO(net_context_recv(ctx, zsock_received_cb,
-					   K_NO_WAIT, ctx->user_data));
-		return 0;
-	}
-#endif
-	if (net_context_get_state(ctx) == NET_CONTEXT_CONNECTED) {
-		return 0;
-	} else if (net_context_get_state(ctx) == NET_CONTEXT_CONNECTING) {
-		if (sock_is_error(ctx)) {
-			SET_ERRNO(-POINTER_TO_INT(ctx->user_data));
-		} else {
-			SET_ERRNO(-EALREADY);
-		}
-	} else {
-		k_timeout_t timeout = K_MSEC(CONFIG_NET_SOCKETS_CONNECT_TIMEOUT);
-		net_context_connect_cb_t cb = NULL;
-
-		if (sock_is_nonblock(ctx)) {
-			timeout = K_NO_WAIT;
-			cb = zsock_connected_cb;
-		}
-
-		if (net_context_get_type(ctx) == SOCK_STREAM) {
-			/* For STREAM sockets net_context_recv() only installs
-			 * recv callback w/o side effects, and it has to be done
-			 * first to avoid race condition, when TCP stream data
-			 * arrives right after connect.
-			 */
-			SET_ERRNO(net_context_recv(ctx, zsock_received_cb,
-						   K_NO_WAIT, ctx->user_data));
-			SET_ERRNO(net_context_connect(ctx, addr, addrlen, cb,
-						      timeout, ctx->user_data));
-		} else {
-			SET_ERRNO(net_context_connect(ctx, addr, addrlen, cb,
-						      timeout, ctx->user_data));
-			SET_ERRNO(net_context_recv(ctx, zsock_received_cb,
-						   K_NO_WAIT, ctx->user_data));
-		}
-	}
-
-	return 0;
-}
-
-int zsock_listen_ctx(struct net_context *ctx, int backlog)
-{
-	SET_ERRNO(net_context_listen(ctx, backlog));
-	SET_ERRNO(net_context_accept(ctx, zsock_accepted_cb, K_NO_WAIT, ctx));
-
-	return 0;
-}
-
-int zsock_accept_ctx(struct net_context *parent, struct sockaddr *addr,
-		     socklen_t *addrlen)
-{
-	struct net_context *ctx;
-	struct net_pkt *last_pkt;
-	int fd, ret;
-
-	if (!sock_is_nonblock(parent)) {
-		k_timeout_t timeout = K_FOREVER;
-
-		/* accept() can reuse zsock_wait_data(), as underneath it's
-		 * monitoring the same queue (accept_q is an alias for recv_q).
-		 */
-		ret = zsock_wait_data(parent, &timeout);
-		if (ret < 0) {
-			errno = -ret;
-			return -1;
-		}
-	}
-
-	ctx = k_fifo_get(&parent->accept_q, K_NO_WAIT);
-	if (ctx == NULL) {
-		errno = EAGAIN;
-		return -1;
-	}
-
-	fd = zvfs_reserve_fd();
-	if (fd < 0) {
-		zsock_flush_queue(ctx);
-		net_context_put(ctx);
-		return -1;
-	}
-
-	/* Check if the connection is already disconnected */
-	last_pkt = k_fifo_peek_tail(&ctx->recv_q);
-	if (last_pkt) {
-		if (net_pkt_eof(last_pkt)) {
-			sock_set_eof(ctx);
-			zvfs_free_fd(fd);
-			zsock_flush_queue(ctx);
-			net_context_put(ctx);
-			errno = ECONNABORTED;
-			return -1;
-		}
-	}
-
-	if (net_context_is_closing(ctx)) {
-		errno = ECONNABORTED;
-		zvfs_free_fd(fd);
-		zsock_flush_queue(ctx);
-		net_context_put(ctx);
-		return -1;
-	}
-
-	net_context_set_accepting(ctx, false);
-
-
-	if (addr != NULL && addrlen != NULL) {
-		int len = MIN(*addrlen, sizeof(ctx->remote));
-
-		memcpy(addr, &ctx->remote, len);
-		/* addrlen is a value-result argument, set to actual
-		 * size of source address
-		 */
-		if (ctx->remote.sa_family == AF_INET) {
-			*addrlen = sizeof(struct sockaddr_in);
-		} else if (ctx->remote.sa_family == AF_INET6) {
-			*addrlen = sizeof(struct sockaddr_in6);
-		} else {
-			zvfs_free_fd(fd);
-			errno = ENOTSUP;
-			zsock_flush_queue(ctx);
-			net_context_put(ctx);
-			return -1;
-		}
-	}
-
-	NET_DBG("accept: ctx=%p, fd=%d", ctx, fd);
-
-	zvfs_finalize_typed_fd(fd, ctx, (const struct fd_op_vtable *)&sock_fd_op_vtable,
-			    ZVFS_MODE_IFSOCK);
-
-	return fd;
-}
-
-#define WAIT_BUFS_INITIAL_MS 10
-#define WAIT_BUFS_MAX_MS 100
-#define MAX_WAIT_BUFS K_MSEC(CONFIG_NET_SOCKET_MAX_SEND_WAIT)
-
-static int send_check_and_wait(struct net_context *ctx, int status,
-			       k_timepoint_t buf_timeout, k_timeout_t timeout,
-			       uint32_t *retry_timeout)
-{
-	if (K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
-		goto out;
-	}
-
-	if (status != -ENOBUFS && status != -EAGAIN) {
-		goto out;
-	}
-
-	/* If we cannot get any buffers in reasonable
-	 * amount of time, then do not wait forever as
-	 * there might be some bigger issue.
-	 * If we get -EAGAIN and cannot recover, then
-	 * it means that the sending window is blocked
-	 * and we just cannot send anything.
-	 */
-	if (sys_timepoint_expired(buf_timeout)) {
-		if (status == -ENOBUFS) {
-			status = -ENOMEM;
-		} else {
-			status = -ENOBUFS;
-		}
-
-		goto out;
-	}
-
-	if (!K_TIMEOUT_EQ(timeout, K_FOREVER)) {
-		*retry_timeout =
-			MIN(*retry_timeout, k_ticks_to_ms_floor32(timeout.ticks));
-	}
-
-	if (ctx->cond.lock) {
-		(void)k_mutex_unlock(ctx->cond.lock);
-	}
-
-	if (status == -ENOBUFS) {
-		/* We can monitor net_pkt/net_buf availability, so just wait. */
-		k_sleep(K_MSEC(*retry_timeout));
-	}
-
-	if (status == -EAGAIN) {
-		if (IS_ENABLED(CONFIG_NET_NATIVE_TCP) &&
-		    net_context_get_type(ctx) == SOCK_STREAM &&
-		    !net_if_is_ip_offloaded(net_context_get_iface(ctx))) {
-			struct k_poll_event event;
-
-			k_poll_event_init(&event,
-					  K_POLL_TYPE_SEM_AVAILABLE,
-					  K_POLL_MODE_NOTIFY_ONLY,
-					  net_tcp_tx_sem_get(ctx));
-
-			k_poll(&event, 1, K_MSEC(*retry_timeout));
-		} else {
-			k_sleep(K_MSEC(*retry_timeout));
-		}
-	}
-	/* Exponentially increase the retry timeout
-	 * Cap the value to WAIT_BUFS_MAX_MS
-	 */
-	*retry_timeout = MIN(WAIT_BUFS_MAX_MS, *retry_timeout << 1);
-
-	if (ctx->cond.lock) {
-		(void)k_mutex_lock(ctx->cond.lock, K_FOREVER);
-	}
-
-	return 0;
-
-out:
-	errno = -status;
-	return -1;
-}
-
-ssize_t zsock_sendto_ctx(struct net_context *ctx, const void *buf, size_t len,
-			 int flags,
-			 const struct sockaddr *dest_addr, socklen_t addrlen)
-{
-	k_timeout_t timeout = K_FOREVER;
-	uint32_t retry_timeout = WAIT_BUFS_INITIAL_MS;
-	k_timepoint_t buf_timeout, end;
-	int status;
-
-	if ((flags & ZSOCK_MSG_DONTWAIT) || sock_is_nonblock(ctx)) {
-		timeout = K_NO_WAIT;
-		buf_timeout = sys_timepoint_calc(K_NO_WAIT);
-	} else {
-		net_context_get_option(ctx, NET_OPT_SNDTIMEO, &timeout, NULL);
-		buf_timeout = sys_timepoint_calc(MAX_WAIT_BUFS);
-	}
-	end = sys_timepoint_calc(timeout);
-
-	/* Register the callback before sending in order to receive the response
-	 * from the peer.
-	 */
-	status = net_context_recv(ctx, zsock_received_cb,
-				  K_NO_WAIT, ctx->user_data);
-	if (status < 0) {
-		errno = -status;
-		return -1;
-	}
-
-	while (1) {
-		if (dest_addr) {
-			status = net_context_sendto(ctx, buf, len, dest_addr,
-						    addrlen, NULL, timeout,
-						    ctx->user_data);
-		} else {
-			status = net_context_send(ctx, buf, len, NULL, timeout,
-						  ctx->user_data);
-		}
-
-		if (status < 0) {
-			status = send_check_and_wait(ctx, status, buf_timeout,
-						     timeout, &retry_timeout);
-			if (status < 0) {
-				return status;
-			}
-
-			/* Update the timeout value in case loop is repeated. */
-			timeout = sys_timepoint_timeout(end);
-
-			continue;
-		}
-
-		break;
-	}
-
-	return status;
-}
-
-size_t msghdr_non_empty_iov_count(const struct msghdr *msg)
-{
-	size_t non_empty_iov_count = 0;
-
-	for (size_t i = 0; i < msg->msg_iovlen; i++) {
-		if (msg->msg_iov[i].iov_len) {
-			non_empty_iov_count++;
-		}
-	}
-
-	return non_empty_iov_count;
-}
-
-ssize_t zsock_sendmsg_ctx(struct net_context *ctx, const struct msghdr *msg,
-			  int flags)
-{
-	k_timeout_t timeout = K_FOREVER;
-	uint32_t retry_timeout = WAIT_BUFS_INITIAL_MS;
-	k_timepoint_t buf_timeout, end;
-	int status;
-
-	if ((flags & ZSOCK_MSG_DONTWAIT) || sock_is_nonblock(ctx)) {
-		timeout = K_NO_WAIT;
-		buf_timeout = sys_timepoint_calc(K_NO_WAIT);
-	} else {
-		net_context_get_option(ctx, NET_OPT_SNDTIMEO, &timeout, NULL);
-		buf_timeout = sys_timepoint_calc(MAX_WAIT_BUFS);
-	}
-	end = sys_timepoint_calc(timeout);
-
-	while (1) {
-		status = net_context_sendmsg(ctx, msg, flags, NULL, timeout, NULL);
-		if (status < 0) {
-			status = send_check_and_wait(ctx, status,
-						     buf_timeout,
-						     timeout, &retry_timeout);
-			if (status < 0) {
-				return status;
-			}
-
-			/* Update the timeout value in case loop is repeated. */
-			timeout = sys_timepoint_timeout(end);
-
-			continue;
-		}
-
-		break;
-	}
-
-	return status;
-}
-
-static int sock_get_pkt_src_addr(struct net_pkt *pkt,
-				 enum net_ip_protocol proto,
-				 struct sockaddr *addr,
-				 socklen_t addrlen)
-{
-	int ret = 0;
-	struct net_pkt_cursor backup;
-	uint16_t *port;
-
-	if (!addr || !pkt) {
-		return -EINVAL;
-	}
-
-	net_pkt_cursor_backup(pkt, &backup);
-	net_pkt_cursor_init(pkt);
-
-	addr->sa_family = net_pkt_family(pkt);
-
-	if (IS_ENABLED(CONFIG_NET_IPV4) &&
-	    net_pkt_family(pkt) == AF_INET) {
-		NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv4_access,
-						      struct net_ipv4_hdr);
-		struct sockaddr_in *addr4 = net_sin(addr);
-		struct net_ipv4_hdr *ipv4_hdr;
-
-		if (addrlen < sizeof(struct sockaddr_in)) {
-			ret = -EINVAL;
-			goto error;
-		}
-
-		ipv4_hdr = (struct net_ipv4_hdr *)net_pkt_get_data(
-							pkt, &ipv4_access);
-		if (!ipv4_hdr ||
-		    net_pkt_acknowledge_data(pkt, &ipv4_access) ||
-		    net_pkt_skip(pkt, net_pkt_ipv4_opts_len(pkt))) {
-			ret = -ENOBUFS;
-			goto error;
-		}
-
-		net_ipv4_addr_copy_raw((uint8_t *)&addr4->sin_addr, ipv4_hdr->src);
-		port = &addr4->sin_port;
-	} else if (IS_ENABLED(CONFIG_NET_IPV6) &&
-		   net_pkt_family(pkt) == AF_INET6) {
-		NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv6_access,
-						      struct net_ipv6_hdr);
-		struct sockaddr_in6 *addr6 = net_sin6(addr);
-		struct net_ipv6_hdr *ipv6_hdr;
-
-		if (addrlen < sizeof(struct sockaddr_in6)) {
-			ret = -EINVAL;
-			goto error;
-		}
-
-		ipv6_hdr = (struct net_ipv6_hdr *)net_pkt_get_data(
-							pkt, &ipv6_access);
-		if (!ipv6_hdr ||
-		    net_pkt_acknowledge_data(pkt, &ipv6_access) ||
-		    net_pkt_skip(pkt, net_pkt_ipv6_ext_len(pkt))) {
-			ret = -ENOBUFS;
-			goto error;
-		}
-
-		net_ipv6_addr_copy_raw((uint8_t *)&addr6->sin6_addr, ipv6_hdr->src);
-		port = &addr6->sin6_port;
-	} else {
-		ret = -ENOTSUP;
-		goto error;
-	}
-
-	if (IS_ENABLED(CONFIG_NET_UDP) && proto == IPPROTO_UDP) {
-		NET_PKT_DATA_ACCESS_DEFINE(udp_access, struct net_udp_hdr);
-		struct net_udp_hdr *udp_hdr;
-
-		udp_hdr = (struct net_udp_hdr *)net_pkt_get_data(pkt,
-								 &udp_access);
-		if (!udp_hdr) {
-			ret = -ENOBUFS;
-			goto error;
-		}
-
-		*port = udp_hdr->src_port;
-	} else if (IS_ENABLED(CONFIG_NET_TCP) && proto == IPPROTO_TCP) {
-		NET_PKT_DATA_ACCESS_DEFINE(tcp_access, struct net_tcp_hdr);
-		struct net_tcp_hdr *tcp_hdr;
-
-		tcp_hdr = (struct net_tcp_hdr *)net_pkt_get_data(pkt,
-								 &tcp_access);
-		if (!tcp_hdr) {
-			ret = -ENOBUFS;
-			goto error;
-		}
-
-		*port = tcp_hdr->src_port;
-	} else {
-		ret = -ENOTSUP;
-	}
-
-error:
-	net_pkt_cursor_restore(pkt, &backup);
-
-	return ret;
-}
-
-#if defined(CONFIG_NET_OFFLOAD)
-static bool net_pkt_remote_addr_is_unspecified(struct net_pkt *pkt)
-{
-	bool ret = true;
-
-	if (net_pkt_family(pkt) == AF_INET) {
-		ret = net_ipv4_is_addr_unspecified(&net_sin(&pkt->remote)->sin_addr);
-	} else if (net_pkt_family(pkt) == AF_INET6) {
-		ret = net_ipv6_is_addr_unspecified(&net_sin6(&pkt->remote)->sin6_addr);
-	}
-
-	return ret;
-}
-
-static int sock_get_offload_pkt_src_addr(struct net_pkt *pkt,
-					 struct net_context *ctx,
-					 struct sockaddr *addr,
-					 socklen_t addrlen)
-{
-	int ret = 0;
-
-	if (!addr || !pkt) {
-		return -EINVAL;
-	}
-
-	if (!net_pkt_remote_addr_is_unspecified(pkt)) {
-		if (IS_ENABLED(CONFIG_NET_IPV4) &&
-		    net_pkt_family(pkt) == AF_INET) {
-			if (addrlen < sizeof(struct sockaddr_in)) {
-				ret = -EINVAL;
-				goto error;
-			}
-
-			memcpy(addr, &pkt->remote, sizeof(struct sockaddr_in));
-		} else if (IS_ENABLED(CONFIG_NET_IPV6) &&
-			   net_pkt_family(pkt) == AF_INET6) {
-			if (addrlen < sizeof(struct sockaddr_in6)) {
-				ret = -EINVAL;
-				goto error;
-			}
-
-			memcpy(addr, &pkt->remote, sizeof(struct sockaddr_in6));
-		}
-	} else if (ctx->flags & NET_CONTEXT_REMOTE_ADDR_SET) {
-		memcpy(addr, &ctx->remote, MIN(addrlen, sizeof(ctx->remote)));
-	} else {
-		ret = -ENOTSUP;
-	}
-
-error:
-	return ret;
-}
-#else
-static int sock_get_offload_pkt_src_addr(struct net_pkt *pkt,
-					 struct net_context *ctx,
-					 struct sockaddr *addr,
-					 socklen_t addrlen)
-{
-	ARG_UNUSED(pkt);
-	ARG_UNUSED(ctx);
-	ARG_UNUSED(addr);
-	ARG_UNUSED(addrlen);
-
-	return 0;
-}
-#endif /* CONFIG_NET_OFFLOAD */
-
-void net_socket_update_tc_rx_time(struct net_pkt *pkt, uint32_t end_tick)
-{
-	net_pkt_set_rx_stats_tick(pkt, end_tick);
-
-	net_stats_update_tc_rx_time(net_pkt_iface(pkt),
-				    net_pkt_priority(pkt),
-				    net_pkt_create_time(pkt),
-				    end_tick);
-
-	SYS_PORT_TRACING_FUNC(net, rx_time, pkt, end_tick);
-
-	if (IS_ENABLED(CONFIG_NET_PKT_RXTIME_STATS_DETAIL)) {
-		uint32_t val, prev = net_pkt_create_time(pkt);
-		int i;
-
-		for (i = 0; i < net_pkt_stats_tick_count(pkt); i++) {
-			if (!net_pkt_stats_tick(pkt)[i]) {
-				break;
-			}
-
-			val = net_pkt_stats_tick(pkt)[i] - prev;
-			prev = net_pkt_stats_tick(pkt)[i];
-			net_pkt_stats_tick(pkt)[i] = val;
-		}
-
-		net_stats_update_tc_rx_time_detail(
-			net_pkt_iface(pkt),
-			net_pkt_priority(pkt),
-			net_pkt_stats_tick(pkt));
-	}
-}
-
-int zsock_wait_data(struct net_context *ctx, k_timeout_t *timeout)
-{
-	int ret;
-
-	if (ctx->cond.lock == NULL) {
-		/* For some reason the lock pointer is not set properly
-		 * when called by fdtable.c:zvfs_finalize_fd()
-		 * It is not practical to try to figure out the fdtable
-		 * lock at this point so skip it.
-		 */
-		NET_WARN("No lock pointer set for context %p", ctx);
-		return -EINVAL;
-	}
-
-	if (k_fifo_is_empty(&ctx->recv_q)) {
-		/* Wait for the data to arrive but without holding a lock */
-		ret = k_condvar_wait(&ctx->cond.recv, ctx->cond.lock,
-				     *timeout);
-		if (ret < 0) {
-			return ret;
-		}
-
-		if (sock_is_error(ctx)) {
-			return -POINTER_TO_INT(ctx->user_data);
-		}
-	}
-
-	return 0;
-}
-
-static int insert_pktinfo(struct msghdr *msg, int level, int type,
-			  void *pktinfo, size_t pktinfo_len)
-{
-	struct cmsghdr *cmsg;
-
-	if (msg->msg_controllen < pktinfo_len) {
-		return -EINVAL;
-	}
-
-	for (cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) {
-		if (cmsg->cmsg_len == 0) {
-			break;
-		}
-	}
-
-	if (cmsg == NULL) {
-		return -EINVAL;
-	}
-
-	cmsg->cmsg_len = CMSG_LEN(pktinfo_len);
-	cmsg->cmsg_level = level;
-	cmsg->cmsg_type = type;
-
-	memcpy(CMSG_DATA(cmsg), pktinfo, pktinfo_len);
-
-	return 0;
-}
-
-static int add_timestamping(struct net_context *ctx,
-			    struct net_pkt *pkt,
-			    struct msghdr *msg)
-{
-	uint8_t timestamping = 0;
-
-	net_context_get_option(ctx, NET_OPT_TIMESTAMPING, &timestamping, NULL);
-
-	if (timestamping) {
-		return insert_pktinfo(msg, SOL_SOCKET, SO_TIMESTAMPING,
-				      net_pkt_timestamp(pkt), sizeof(struct net_ptp_time));
-	}
-
-	return -ENOTSUP;
-}
-
-static int add_pktinfo(struct net_context *ctx,
-			struct net_pkt *pkt,
-			struct msghdr *msg)
-{
-	int ret = -ENOTSUP;
-	struct net_pkt_cursor backup;
-
-	net_pkt_cursor_backup(pkt, &backup);
-	net_pkt_cursor_init(pkt);
-
-	if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET) {
-		NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv4_access,
-						      struct net_ipv4_hdr);
-		struct in_pktinfo info;
-		struct net_ipv4_hdr *ipv4_hdr;
-
-		ipv4_hdr = (struct net_ipv4_hdr *)net_pkt_get_data(
-							pkt, &ipv4_access);
-		if (ipv4_hdr == NULL ||
-		    net_pkt_acknowledge_data(pkt, &ipv4_access) ||
-		    net_pkt_skip(pkt, net_pkt_ipv4_opts_len(pkt))) {
-			ret = -ENOBUFS;
-			goto out;
-		}
-
-		net_ipv4_addr_copy_raw((uint8_t *)&info.ipi_addr, ipv4_hdr->dst);
-		net_ipv4_addr_copy_raw((uint8_t *)&info.ipi_spec_dst,
-				       (uint8_t *)net_sin_ptr(&ctx->local)->sin_addr);
-		info.ipi_ifindex = ctx->iface;
-
-		ret = insert_pktinfo(msg, IPPROTO_IP, IP_PKTINFO,
-				     &info, sizeof(info));
-
-		goto out;
-	}
-
-	if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == AF_INET6) {
-		NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv6_access,
-						      struct net_ipv6_hdr);
-		struct in6_pktinfo info;
-		struct net_ipv6_hdr *ipv6_hdr;
-
-		ipv6_hdr = (struct net_ipv6_hdr *)net_pkt_get_data(
-							pkt, &ipv6_access);
-		if (ipv6_hdr == NULL ||
-		    net_pkt_acknowledge_data(pkt, &ipv6_access) ||
-		    net_pkt_skip(pkt, net_pkt_ipv6_ext_len(pkt))) {
-			ret = -ENOBUFS;
-			goto out;
-		}
-
-		net_ipv6_addr_copy_raw((uint8_t *)&info.ipi6_addr, ipv6_hdr->dst);
-		info.ipi6_ifindex = ctx->iface;
-
-		ret = insert_pktinfo(msg, IPPROTO_IPV6, IPV6_RECVPKTINFO,
-				     &info, sizeof(info));
-
-		goto out;
-	}
-
-out:
-	net_pkt_cursor_restore(pkt, &backup);
-
-	return ret;
-}
-
-static int update_msg_controllen(struct msghdr *msg)
-{
-	struct cmsghdr *cmsg;
-	size_t cmsg_space = 0;
-
-	for (cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) {
-		if (cmsg->cmsg_len == 0) {
-			break;
-		}
-		cmsg_space += cmsg->cmsg_len;
-	}
-	msg->msg_controllen = cmsg_space;
-
-	return 0;
-}
-
-static inline ssize_t zsock_recv_dgram(struct net_context *ctx,
-				       struct msghdr *msg,
-				       void *buf,
-				       size_t max_len,
-				       int flags,
-				       struct sockaddr *src_addr,
-				       socklen_t *addrlen)
-{
-	k_timeout_t timeout = K_FOREVER;
-	size_t recv_len = 0;
-	size_t read_len;
-	struct net_pkt_cursor backup;
-	struct net_pkt *pkt;
-
-	if ((flags & ZSOCK_MSG_DONTWAIT) || sock_is_nonblock(ctx)) {
-		timeout = K_NO_WAIT;
-	} else {
-		int ret;
-
-		net_context_get_option(ctx, NET_OPT_RCVTIMEO, &timeout, NULL);
-
-		ret = zsock_wait_data(ctx, &timeout);
-		if (ret < 0) {
-			errno = -ret;
-			return -1;
-		}
-	}
-
-	if (flags & ZSOCK_MSG_PEEK) {
-		int res;
-
-		res = fifo_wait_non_empty(&ctx->recv_q, timeout);
-		/* EAGAIN when timeout expired, EINTR when cancelled */
-		if (res && res != -EAGAIN && res != -EINTR) {
-			errno = -res;
-			return -1;
-		}
-
-		pkt = k_fifo_peek_head(&ctx->recv_q);
-	} else {
-		pkt = k_fifo_get(&ctx->recv_q, timeout);
-	}
-
-	if (!pkt) {
-		errno = EAGAIN;
-		return -1;
-	}
-
-	net_pkt_cursor_backup(pkt, &backup);
-
-	if (src_addr && addrlen) {
-		if (IS_ENABLED(CONFIG_NET_OFFLOAD) &&
-		    net_if_is_ip_offloaded(net_context_get_iface(ctx))) {
-			int ret;
-
-			ret  = sock_get_offload_pkt_src_addr(pkt, ctx, src_addr,
-								*addrlen);
-			if (ret < 0) {
-				errno = -ret;
-				NET_DBG("sock_get_offload_pkt_src_addr %d", ret);
-				goto fail;
-			}
-		} else {
-			int ret;
-
-			ret = sock_get_pkt_src_addr(pkt, net_context_get_proto(ctx),
-						   src_addr, *addrlen);
-			if (ret < 0) {
-				errno = -ret;
-				NET_DBG("sock_get_pkt_src_addr %d", ret);
-				goto fail;
-			}
-		}
-
-		/* addrlen is a value-result argument, set to actual
-		 * size of source address
-		 */
-		if (src_addr->sa_family == AF_INET) {
-			*addrlen = sizeof(struct sockaddr_in);
-		} else if (src_addr->sa_family == AF_INET6) {
-			*addrlen = sizeof(struct sockaddr_in6);
-		} else {
-			errno = ENOTSUP;
-			goto fail;
-		}
-	}
-
-	if (msg != NULL) {
-		int iovec = 0;
-		size_t tmp_read_len;
-
-		if (msg->msg_iovlen < 1 || msg->msg_iov == NULL) {
-			errno = ENOMEM;
-			return -1;
-		}
-
-		recv_len = net_pkt_remaining_data(pkt);
-		tmp_read_len = read_len = MIN(recv_len, max_len);
-
-		while (tmp_read_len > 0) {
-			size_t len;
-
-			buf = msg->msg_iov[iovec].iov_base;
-			if (buf == NULL) {
-				errno = EINVAL;
-				return -1;
-			}
-
-			len = MIN(tmp_read_len, msg->msg_iov[iovec].iov_len);
-
-			if (net_pkt_read(pkt, buf, len)) {
-				errno = ENOBUFS;
-				goto fail;
-			}
-
-			if (len <= tmp_read_len) {
-				tmp_read_len -= len;
-				msg->msg_iov[iovec].iov_len = len;
-				iovec++;
-			} else {
-				errno = EINVAL;
-				return -1;
-			}
-		}
-
-		msg->msg_iovlen = iovec;
-
-		if (recv_len != read_len) {
-			msg->msg_flags |= ZSOCK_MSG_TRUNC;
-		}
-
-	} else {
-		recv_len = net_pkt_remaining_data(pkt);
-		read_len = MIN(recv_len, max_len);
-
-		if (net_pkt_read(pkt, buf, read_len)) {
-			errno = ENOBUFS;
-			goto fail;
-		}
-	}
-
-	if (msg != NULL) {
-		if (msg->msg_control != NULL) {
-			if (msg->msg_controllen > 0) {
-				if (IS_ENABLED(CONFIG_NET_CONTEXT_TIMESTAMPING) &&
-				    net_context_is_timestamping_set(ctx)) {
-					if (add_timestamping(ctx, pkt, msg) < 0) {
-						msg->msg_flags |= ZSOCK_MSG_CTRUNC;
-					}
-				}
-
-				if (IS_ENABLED(CONFIG_NET_CONTEXT_RECV_PKTINFO) &&
-				    net_context_is_recv_pktinfo_set(ctx)) {
-					if (add_pktinfo(ctx, pkt, msg) < 0) {
-						msg->msg_flags |= ZSOCK_MSG_CTRUNC;
-					}
-				}
-
-				/* msg_controllen must be updated to reflect the total length of all
-				 * control messages in the buffer. If there are no control data,
-				 * msg_controllen will be cleared as expected It will also take into
-				 * account pre-existing control data
-				 */
-				update_msg_controllen(msg);
-			}
-		} else {
-			msg->msg_controllen = 0U;
-		}
-	}
-
-	if ((IS_ENABLED(CONFIG_NET_PKT_RXTIME_STATS) ||
-	     IS_ENABLED(CONFIG_TRACING_NET_CORE)) &&
-	    !(flags & ZSOCK_MSG_PEEK)) {
-		net_socket_update_tc_rx_time(pkt, k_cycle_get_32());
-	}
-
-	if (!(flags & ZSOCK_MSG_PEEK)) {
-		net_pkt_unref(pkt);
-	} else {
-		net_pkt_cursor_restore(pkt, &backup);
-	}
-
-	return (flags & ZSOCK_MSG_TRUNC) ? recv_len : read_len;
-
-fail:
-	if (!(flags & ZSOCK_MSG_PEEK)) {
-		net_pkt_unref(pkt);
-	}
-
-	return -1;
-}
-
-static size_t zsock_recv_stream_immediate(struct net_context *ctx, uint8_t **buf, size_t *max_len,
-					  int flags)
-{
-	size_t len;
-	size_t pkt_len;
-	size_t recv_len = 0;
-	struct net_pkt *pkt;
-	struct net_pkt_cursor backup;
-	struct net_pkt *origin = NULL;
-	const bool do_recv = !(buf == NULL || max_len == NULL);
-	size_t _max_len = (max_len == NULL) ? SIZE_MAX : *max_len;
-	const bool peek = (flags & ZSOCK_MSG_PEEK) == ZSOCK_MSG_PEEK;
-
-	while (_max_len > 0) {
-		/* only peek until we know we can dequeue and / or requeue buffer */
-		pkt = k_fifo_peek_head(&ctx->recv_q);
-		if (pkt == NULL || pkt == origin) {
-			break;
-		}
-
-		if (origin == NULL) {
-			/* mark first pkt to avoid cycles when observing */
-			origin = pkt;
-		}
-
-		pkt_len = net_pkt_remaining_data(pkt);
-		len = MIN(_max_len, pkt_len);
-		recv_len += len;
-		_max_len -= len;
-
-		if (do_recv && len > 0) {
-			if (peek) {
-				net_pkt_cursor_backup(pkt, &backup);
-			}
-
-			net_pkt_read(pkt, *buf, len);
-			/* update buffer position for caller */
-			*buf += len;
-
-			if (peek) {
-				net_pkt_cursor_restore(pkt, &backup);
-			}
-		}
-
-		if (do_recv && !peek) {
-			if (len == pkt_len) {
-				/* dequeue empty packets when not observing */
-				pkt = k_fifo_get(&ctx->recv_q, K_NO_WAIT);
-				if (net_pkt_eof(pkt)) {
-					sock_set_eof(ctx);
-				}
-
-				if (IS_ENABLED(CONFIG_NET_PKT_RXTIME_STATS) ||
-				    IS_ENABLED(CONFIG_TRACING_NET_CORE)) {
-					net_socket_update_tc_rx_time(pkt, k_cycle_get_32());
-				}
-
-				net_pkt_unref(pkt);
-			}
-		} else if (!do_recv || peek) {
-			/* requeue packets when observing */
-			k_fifo_put(&ctx->recv_q, k_fifo_get(&ctx->recv_q, K_NO_WAIT));
-		}
-	}
-
-	if (do_recv) {
-		/* convey remaining buffer size back to caller */
-		*max_len = _max_len;
-	}
-
-	return recv_len;
-}
-
-static int zsock_fionread_ctx(struct net_context *ctx)
-{
-	size_t ret = zsock_recv_stream_immediate(ctx, NULL, NULL, 0);
-
-	return MIN(ret, INT_MAX);
-}
-
-static ssize_t zsock_recv_stream_timed(struct net_context *ctx, struct msghdr *msg,
-				       uint8_t *buf, size_t max_len,
-				       int flags, k_timeout_t timeout)
-{
-	int res;
-	k_timepoint_t end;
-	size_t recv_len = 0, iovec = 0, available_len, max_iovlen = 0;
-	const bool waitall = (flags & ZSOCK_MSG_WAITALL) == ZSOCK_MSG_WAITALL;
-
-	if (msg != NULL && buf == NULL) {
-		if (msg->msg_iovlen < 1) {
-			return -EINVAL;
-		}
-
-		buf = msg->msg_iov[iovec].iov_base;
-		available_len = msg->msg_iov[iovec].iov_len;
-		msg->msg_iov[iovec].iov_len = 0;
-		max_iovlen = msg->msg_iovlen;
-	}
-
-	for (end = sys_timepoint_calc(timeout); max_len > 0; timeout = sys_timepoint_timeout(end)) {
-
-		if (sock_is_error(ctx)) {
-			return -POINTER_TO_INT(ctx->user_data);
-		}
-
-		if (sock_is_eof(ctx)) {
-			return 0;
-		}
-
-		if (!K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
-			res = zsock_wait_data(ctx, &timeout);
-			if (res < 0) {
-				return res;
-			}
-		}
-
-		if (msg != NULL) {
-again:
-			res = zsock_recv_stream_immediate(ctx, &buf, &available_len, flags);
-			recv_len += res;
-
-			if (res == 0 && recv_len == 0 && K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
-				return -EAGAIN;
-			}
-
-			msg->msg_iov[iovec].iov_len += res;
-			buf = (uint8_t *)(msg->msg_iov[iovec].iov_base) + res;
-			max_len -= res;
-
-			if (available_len == 0) {
-				/* All data to this iovec was written */
-				iovec++;
-
-				if (iovec == max_iovlen) {
-					break;
-				}
-
-				msg->msg_iovlen = iovec;
-				buf = msg->msg_iov[iovec].iov_base;
-				available_len = msg->msg_iov[iovec].iov_len;
-				msg->msg_iov[iovec].iov_len = 0;
-
-				/* If there is more data, read it now and do not wait */
-				if (buf != NULL && available_len > 0) {
-					goto again;
-				}
-
-				continue;
-			}
-
-		} else {
-			res = zsock_recv_stream_immediate(ctx, &buf, &max_len, flags);
-			recv_len += res;
-
-			if (res == 0) {
-				if (recv_len == 0 && K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
-					return -EAGAIN;
-				}
-			}
-		}
-
-		if (!waitall) {
-			break;
-		}
-	}
-
-	return recv_len;
-}
-
-static ssize_t zsock_recv_stream(struct net_context *ctx, struct msghdr *msg,
-				 void *buf, size_t max_len, int flags)
-{
-	ssize_t res;
-	size_t recv_len = 0;
-	k_timeout_t timeout = K_FOREVER;
-
-	if (!net_context_is_used(ctx)) {
-		errno = EBADF;
-		return -1;
-	}
-
-	if (net_context_get_state(ctx) != NET_CONTEXT_CONNECTED) {
-		errno = ENOTCONN;
-		return -1;
-	}
-
-	if ((flags & ZSOCK_MSG_DONTWAIT) || sock_is_nonblock(ctx)) {
-		timeout = K_NO_WAIT;
-	} else if (!sock_is_eof(ctx) && !sock_is_error(ctx)) {
-		net_context_get_option(ctx, NET_OPT_RCVTIMEO, &timeout, NULL);
-	}
-
-	if (max_len == 0) {
-		/* no bytes requested - done! */
-		return 0;
-	}
-
-	res = zsock_recv_stream_timed(ctx, msg, buf, max_len, flags, timeout);
-	recv_len += MAX(0, res);
-
-	if (res < 0) {
-		errno = -res;
-		return -1;
-	}
-
-	if (!(flags & ZSOCK_MSG_PEEK)) {
-		net_context_update_recv_wnd(ctx, recv_len);
-	}
-
-	return recv_len;
-}
-
-ssize_t zsock_recvfrom_ctx(struct net_context *ctx, void *buf, size_t max_len,
-			   int flags,
-			   struct sockaddr *src_addr, socklen_t *addrlen)
-{
-	enum net_sock_type sock_type = net_context_get_type(ctx);
-
-	if (max_len == 0) {
-		return 0;
-	}
-
-	if (sock_type == SOCK_DGRAM) {
-		return zsock_recv_dgram(ctx, NULL, buf, max_len, flags, src_addr, addrlen);
-	} else if (sock_type == SOCK_STREAM) {
-		return zsock_recv_stream(ctx, NULL, buf, max_len, flags);
-	}
-
-	__ASSERT(0, "Unknown socket type");
-
-	errno = ENOTSUP;
-
-	return -1;
-}
-
-ssize_t zsock_recvmsg_ctx(struct net_context *ctx, struct msghdr *msg,
-			  int flags)
-{
-	enum net_sock_type sock_type = net_context_get_type(ctx);
-	size_t i, max_len = 0;
-
-	if (msg == NULL) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	if (msg->msg_iov == NULL) {
-		errno = ENOMEM;
-		return -1;
-	}
-
-	for (i = 0; i < msg->msg_iovlen; i++) {
-		max_len += msg->msg_iov[i].iov_len;
-	}
-
-	if (sock_type == SOCK_DGRAM) {
-		return zsock_recv_dgram(ctx, msg, NULL, max_len, flags,
-					msg->msg_name, &msg->msg_namelen);
-	} else if (sock_type == SOCK_STREAM) {
-		return zsock_recv_stream(ctx, msg, NULL, max_len, flags);
-	}
-
-	__ASSERT(0, "Unknown socket type");
-
-	errno = ENOTSUP;
-
-	return -1;
-}
-
-static int zsock_poll_prepare_ctx(struct net_context *ctx,
-				  struct zsock_pollfd *pfd,
-				  struct k_poll_event **pev,
-				  struct k_poll_event *pev_end)
-{
-	if (pfd->events & ZSOCK_POLLIN) {
-		if (*pev == pev_end) {
-			return -ENOMEM;
-		}
-
-		(*pev)->obj = &ctx->recv_q;
-		(*pev)->type = K_POLL_TYPE_FIFO_DATA_AVAILABLE;
-		(*pev)->mode = K_POLL_MODE_NOTIFY_ONLY;
-		(*pev)->state = K_POLL_STATE_NOT_READY;
-		(*pev)++;
-	}
-
-	if (pfd->events & ZSOCK_POLLOUT) {
-		if (IS_ENABLED(CONFIG_NET_NATIVE_TCP) &&
-		    net_context_get_type(ctx) == SOCK_STREAM &&
-		    !net_if_is_ip_offloaded(net_context_get_iface(ctx))) {
-			if (*pev == pev_end) {
-				return -ENOMEM;
-			}
-
-			if (net_context_get_state(ctx) == NET_CONTEXT_CONNECTING) {
-				(*pev)->obj = net_tcp_conn_sem_get(ctx);
-			} else {
-				(*pev)->obj = net_tcp_tx_sem_get(ctx);
-			}
-
-			(*pev)->type = K_POLL_TYPE_SEM_AVAILABLE;
-			(*pev)->mode = K_POLL_MODE_NOTIFY_ONLY;
-			(*pev)->state = K_POLL_STATE_NOT_READY;
-			(*pev)++;
-		} else {
-			return -EALREADY;
-		}
-
-	}
-
-	/* If socket is already in EOF or error, it can be reported
-	 * immediately, so we tell poll() to short-circuit wait.
-	 */
-	if (sock_is_eof(ctx) || sock_is_error(ctx)) {
-		return -EALREADY;
-	}
-
-	return 0;
-}
-
-static int zsock_poll_update_ctx(struct net_context *ctx,
-				 struct zsock_pollfd *pfd,
-				 struct k_poll_event **pev)
-{
-	ARG_UNUSED(ctx);
-
-	if (pfd->events & ZSOCK_POLLIN) {
-		if ((*pev)->state != K_POLL_STATE_NOT_READY || sock_is_eof(ctx)) {
-			pfd->revents |= ZSOCK_POLLIN;
-		}
-		(*pev)++;
-	}
-	if (pfd->events & ZSOCK_POLLOUT) {
-		if (IS_ENABLED(CONFIG_NET_NATIVE_TCP) &&
-		    net_context_get_type(ctx) == SOCK_STREAM &&
-		    !net_if_is_ip_offloaded(net_context_get_iface(ctx))) {
-			if ((*pev)->state != K_POLL_STATE_NOT_READY &&
-			    !sock_is_eof(ctx) &&
-			    (net_context_get_state(ctx) == NET_CONTEXT_CONNECTED)) {
-				pfd->revents |= ZSOCK_POLLOUT;
-			}
-			(*pev)++;
-		} else {
-			pfd->revents |= ZSOCK_POLLOUT;
-		}
-	}
-
-	if (sock_is_error(ctx)) {
-		pfd->revents |= ZSOCK_POLLERR;
-	}
-
-	if (sock_is_eof(ctx)) {
-		pfd->revents |= ZSOCK_POLLHUP;
-	}
-
-	return 0;
-}
-
-static enum tcp_conn_option get_tcp_option(int optname)
-{
-	switch (optname) {
-	case TCP_KEEPIDLE:
-		return TCP_OPT_KEEPIDLE;
-	case TCP_KEEPINTVL:
-		return TCP_OPT_KEEPINTVL;
-	case TCP_KEEPCNT:
-		return TCP_OPT_KEEPCNT;
-	}
-
-	return -EINVAL;
-}
-
-int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname,
-			 void *optval, socklen_t *optlen)
-{
-	int ret;
-
-	switch (level) {
-	case SOL_SOCKET:
-		switch (optname) {
-		case SO_ERROR: {
-			if (*optlen != sizeof(int)) {
-				errno = EINVAL;
-				return -1;
-			}
-
-			*(int *)optval = POINTER_TO_INT(ctx->user_data);
-
-			return 0;
-		}
-
-		case SO_TYPE: {
-			int type = (int)net_context_get_type(ctx);
-
-			if (*optlen != sizeof(type)) {
-				errno = EINVAL;
-				return -1;
-			}
-
-			*(int *)optval = type;
-
-			return 0;
-		}
-
-		case SO_TXTIME:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_TXTIME)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_TXTIME,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-			break;
-
-		case SO_PROTOCOL: {
-			int proto = (int)net_context_get_proto(ctx);
-
-			if (*optlen != sizeof(proto)) {
-				errno = EINVAL;
-				return -1;
-			}
-
-			*(int *)optval = proto;
-
-			return 0;
-		}
-
-		case SO_DOMAIN: {
-			if (*optlen != sizeof(int)) {
-				errno = EINVAL;
-				return -1;
-			}
-
-			*(int *)optval = net_context_get_family(ctx);
-
-			return 0;
-		}
-
-		break;
-
-		case SO_RCVBUF:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_RCVBUF)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_RCVBUF,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-			break;
-
-		case SO_SNDBUF:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_SNDBUF)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_SNDBUF,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-			break;
-
-		case SO_REUSEADDR:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEADDR)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_REUSEADDR,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-			break;
-
-		case SO_REUSEPORT:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEPORT)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_REUSEPORT,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-			break;
-
-		case SO_KEEPALIVE:
-			if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE) &&
-			    net_context_get_proto(ctx) == IPPROTO_TCP) {
-				ret = net_tcp_get_option(ctx,
-							 TCP_OPT_KEEPALIVE,
-							 optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case SO_TIMESTAMPING:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_TIMESTAMPING)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_TIMESTAMPING,
-							     optval, optlen);
-
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-		}
-
-		break;
-
-	case IPPROTO_TCP:
-		switch (optname) {
-		case TCP_NODELAY:
-			ret = net_tcp_get_option(ctx, TCP_OPT_NODELAY, optval, optlen);
-			return ret;
-
-		case TCP_KEEPIDLE:
-			__fallthrough;
-		case TCP_KEEPINTVL:
-			__fallthrough;
-		case TCP_KEEPCNT:
-			if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE)) {
-				ret = net_tcp_get_option(ctx,
-							 get_tcp_option(optname),
-							 optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-		}
-
-		break;
-
-	case IPPROTO_IP:
-		switch (optname) {
-		case IP_TOS:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_DSCP_ECN,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case IP_TTL:
-			ret = net_context_get_option(ctx, NET_OPT_TTL,
-						     optval, optlen);
-			if (ret < 0) {
-				errno  = -ret;
-				return -1;
-			}
-
-			return 0;
-
-		case IP_MULTICAST_TTL:
-			ret = net_context_get_option(ctx, NET_OPT_MCAST_TTL,
-						     optval, optlen);
-			if (ret < 0) {
-				errno  = -ret;
-				return -1;
-			}
-
-			return 0;
-		}
-
-		break;
-
-	case IPPROTO_IPV6:
-		switch (optname) {
-		case IPV6_V6ONLY:
-			if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_IPV6_V6ONLY,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case IPV6_ADDR_PREFERENCES:
-			if (IS_ENABLED(CONFIG_NET_IPV6)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_ADDR_PREFERENCES,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case IPV6_TCLASS:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) {
-				ret = net_context_get_option(ctx,
-							     NET_OPT_DSCP_ECN,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case IPV6_UNICAST_HOPS:
-			ret = net_context_get_option(ctx,
-						     NET_OPT_UNICAST_HOP_LIMIT,
-						     optval, optlen);
-			if (ret < 0) {
-				errno  = -ret;
-				return -1;
-			}
-
-			return 0;
-
-		case IPV6_MULTICAST_HOPS:
-			ret = net_context_get_option(ctx,
-						     NET_OPT_MCAST_HOP_LIMIT,
-						     optval, optlen);
-			if (ret < 0) {
-				errno  = -ret;
-				return -1;
-			}
-
-			return 0;
-		}
-
-		break;
-	}
-
-	errno = ENOPROTOOPT;
-	return -1;
-}
-
-static int ipv4_multicast_group(struct net_context *ctx, const void *optval,
-				socklen_t optlen, bool do_join)
-{
-	struct ip_mreqn *mreqn;
-	struct net_if *iface;
-	int ifindex, ret;
-
-	if (optval == NULL || optlen != sizeof(struct ip_mreqn)) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	mreqn = (struct ip_mreqn *)optval;
-
-	if (mreqn->imr_multiaddr.s_addr == INADDR_ANY) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	if (mreqn->imr_ifindex != 0) {
-		iface = net_if_get_by_index(mreqn->imr_ifindex);
-	} else {
-		ifindex = net_if_ipv4_addr_lookup_by_index(&mreqn->imr_address);
-		iface = net_if_get_by_index(ifindex);
-	}
-
-	if (iface == NULL) {
-		/* Check if ctx has already an interface and if not,
-		 * then select the default interface.
-		 */
-		if (ctx->iface <= 0) {
-			iface = net_if_get_default();
-		} else {
-			iface = net_if_get_by_index(ctx->iface);
-		}
-
-		if (iface == NULL) {
-			errno = EINVAL;
-			return -1;
-		}
-	}
-
-	if (do_join) {
-		ret = net_ipv4_igmp_join(iface, &mreqn->imr_multiaddr, NULL);
-	} else {
-		ret = net_ipv4_igmp_leave(iface, &mreqn->imr_multiaddr);
-	}
-
-	if (ret < 0) {
-		errno  = -ret;
-		return -1;
-	}
-
-	return 0;
-}
-
-static int ipv6_multicast_group(struct net_context *ctx, const void *optval,
-				socklen_t optlen, bool do_join)
-{
-	struct ipv6_mreq *mreq;
-	struct net_if *iface;
-	int ret;
-
-	if (optval == NULL || optlen != sizeof(struct ipv6_mreq)) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	mreq = (struct ipv6_mreq *)optval;
-
-	if (memcmp(&mreq->ipv6mr_multiaddr,
-		   net_ipv6_unspecified_address(),
-		   sizeof(mreq->ipv6mr_multiaddr)) == 0) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	iface = net_if_get_by_index(mreq->ipv6mr_ifindex);
-	if (iface == NULL) {
-		/* Check if ctx has already an interface and if not,
-		 * then select the default interface.
-		 */
-		if (ctx->iface <= 0) {
-			iface = net_if_get_default();
-		} else {
-			iface = net_if_get_by_index(ctx->iface);
-		}
-
-		if (iface == NULL) {
-			errno = ENOENT;
-			return -1;
-		}
-	}
-
-	if (do_join) {
-		ret = net_ipv6_mld_join(iface, &mreq->ipv6mr_multiaddr);
-	} else {
-		ret = net_ipv6_mld_leave(iface, &mreq->ipv6mr_multiaddr);
-	}
-
-	if (ret < 0) {
-		errno  = -ret;
-		return -1;
-	}
-
-	return 0;
-}
-
-int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname,
-			 const void *optval, socklen_t optlen)
-{
-	int ret;
-
-	switch (level) {
-	case SOL_SOCKET:
-		switch (optname) {
-		case SO_RCVBUF:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_RCVBUF)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_RCVBUF,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case SO_SNDBUF:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_SNDBUF)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_SNDBUF,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case SO_REUSEADDR:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEADDR)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_REUSEADDR,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case SO_REUSEPORT:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEPORT)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_REUSEPORT,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case SO_PRIORITY:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_PRIORITY)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_PRIORITY,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case SO_RCVTIMEO:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_RCVTIMEO)) {
-				const struct zsock_timeval *tv = optval;
-				k_timeout_t timeout;
-
-				if (optlen != sizeof(struct zsock_timeval)) {
-					errno = EINVAL;
-					return -1;
-				}
-
-				if (tv->tv_sec == 0 && tv->tv_usec == 0) {
-					timeout = K_FOREVER;
-				} else {
-					timeout = K_USEC(tv->tv_sec * 1000000ULL
-							 + tv->tv_usec);
-				}
-
-				ret = net_context_set_option(ctx,
-							     NET_OPT_RCVTIMEO,
-							     &timeout,
-							     sizeof(timeout));
-
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case SO_SNDTIMEO:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_SNDTIMEO)) {
-				const struct zsock_timeval *tv = optval;
-				k_timeout_t timeout;
-
-				if (optlen != sizeof(struct zsock_timeval)) {
-					errno = EINVAL;
-					return -1;
-				}
-
-				if (tv->tv_sec == 0 && tv->tv_usec == 0) {
-					timeout = K_FOREVER;
-				} else {
-					timeout = K_USEC(tv->tv_sec * 1000000ULL
-							 + tv->tv_usec);
-				}
-
-				ret = net_context_set_option(ctx,
-							     NET_OPT_SNDTIMEO,
-							     &timeout,
-							     sizeof(timeout));
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case SO_TXTIME:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_TXTIME)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_TXTIME,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case SO_SOCKS5:
-			if (IS_ENABLED(CONFIG_SOCKS)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_SOCKS5,
-							     optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				net_context_set_proxy_enabled(ctx, true);
-
-				return 0;
-			}
-
-			break;
-
-		case SO_BINDTODEVICE: {
-			struct net_if *iface;
-			const struct ifreq *ifreq = optval;
-
-			if (net_context_get_family(ctx) != AF_INET &&
-			    net_context_get_family(ctx) != AF_INET6) {
-				errno = EAFNOSUPPORT;
-				return -1;
-			}
-
-			/* optlen equal to 0 or empty interface name should
-			 * remove the binding.
-			 */
-			if ((optlen == 0) || (ifreq != NULL &&
-					      strlen(ifreq->ifr_name) == 0)) {
-				ctx->flags &= ~NET_CONTEXT_BOUND_TO_IFACE;
-				return 0;
-			}
-
-			if ((ifreq == NULL) || (optlen != sizeof(*ifreq))) {
-				errno = EINVAL;
-				return -1;
-			}
-
-			if (IS_ENABLED(CONFIG_NET_INTERFACE_NAME)) {
-				ret = net_if_get_by_name(ifreq->ifr_name);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				iface = net_if_get_by_index(ret);
-				if (iface == NULL) {
-					errno = ENODEV;
-					return -1;
-				}
-			} else {
-				const struct device *dev;
-
-				dev = device_get_binding(ifreq->ifr_name);
-				if (dev == NULL) {
-					errno = ENODEV;
-					return -1;
-				}
-
-				iface = net_if_lookup_by_dev(dev);
-				if (iface == NULL) {
-					errno = ENODEV;
-					return -1;
-				}
-			}
-
-			net_context_bind_iface(ctx, iface);
-
-			return 0;
-		}
-
-		case SO_LINGER:
-			/* ignored. for compatibility purposes only */
-			return 0;
-
-		case SO_KEEPALIVE:
-			if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE) &&
-			    net_context_get_proto(ctx) == IPPROTO_TCP) {
-				ret = net_tcp_set_option(ctx,
-							 TCP_OPT_KEEPALIVE,
-							 optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case SO_TIMESTAMPING:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_TIMESTAMPING)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_TIMESTAMPING,
-							     optval, optlen);
-
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-		}
-
-		break;
-
-	case IPPROTO_TCP:
-		switch (optname) {
-		case TCP_NODELAY:
-			ret = net_tcp_set_option(ctx,
-						 TCP_OPT_NODELAY, optval, optlen);
-			return ret;
-
-		case TCP_KEEPIDLE:
-			__fallthrough;
-		case TCP_KEEPINTVL:
-			__fallthrough;
-		case TCP_KEEPCNT:
-			if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE)) {
-				ret = net_tcp_set_option(ctx,
-							 get_tcp_option(optname),
-							 optval, optlen);
-				if (ret < 0) {
-					errno = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-		}
-		break;
-
-	case IPPROTO_IP:
-		switch (optname) {
-		case IP_TOS:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_DSCP_ECN,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case IP_PKTINFO:
-			if (IS_ENABLED(CONFIG_NET_IPV4) &&
-			    IS_ENABLED(CONFIG_NET_CONTEXT_RECV_PKTINFO)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_RECV_PKTINFO,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case IP_MULTICAST_TTL:
-			ret = net_context_set_option(ctx, NET_OPT_MCAST_TTL,
-						     optval, optlen);
-			if (ret < 0) {
-				errno  = -ret;
-				return -1;
-			}
-
-			return 0;
-
-		case IP_TTL:
-			ret = net_context_set_option(ctx, NET_OPT_TTL,
-						     optval, optlen);
-			if (ret < 0) {
-				errno  = -ret;
-				return -1;
-			}
-
-			return 0;
-
-		case IP_ADD_MEMBERSHIP:
-			if (IS_ENABLED(CONFIG_NET_IPV4)) {
-				return ipv4_multicast_group(ctx, optval,
-							    optlen, true);
-			}
-
-			break;
-
-		case IP_DROP_MEMBERSHIP:
-			if (IS_ENABLED(CONFIG_NET_IPV4)) {
-				return ipv4_multicast_group(ctx, optval,
-							    optlen, false);
-			}
-
-			break;
-		}
-
-		break;
-
-	case IPPROTO_IPV6:
-		switch (optname) {
-		case IPV6_V6ONLY:
-			if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_IPV6_V6ONLY,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
-			}
-
-			return 0;
-
-		case IPV6_RECVPKTINFO:
-			if (IS_ENABLED(CONFIG_NET_IPV6) &&
-			    IS_ENABLED(CONFIG_NET_CONTEXT_RECV_PKTINFO)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_RECV_PKTINFO,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case IPV6_ADDR_PREFERENCES:
-			if (IS_ENABLED(CONFIG_NET_IPV6)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_ADDR_PREFERENCES,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case IPV6_TCLASS:
-			if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) {
-				ret = net_context_set_option(ctx,
-							     NET_OPT_DSCP_ECN,
-							     optval,
-							     optlen);
-				if (ret < 0) {
-					errno  = -ret;
-					return -1;
-				}
-
-				return 0;
-			}
-
-			break;
-
-		case IPV6_UNICAST_HOPS:
-			ret = net_context_set_option(ctx,
-						     NET_OPT_UNICAST_HOP_LIMIT,
-						     optval, optlen);
-			if (ret < 0) {
-				errno  = -ret;
-				return -1;
-			}
-
-			return 0;
-
-		case IPV6_MULTICAST_HOPS:
-			ret = net_context_set_option(ctx,
-						     NET_OPT_MCAST_HOP_LIMIT,
-						     optval, optlen);
-			if (ret < 0) {
-				errno  = -ret;
-				return -1;
-			}
-
-			return 0;
-
-		case IPV6_ADD_MEMBERSHIP:
-			if (IS_ENABLED(CONFIG_NET_IPV6)) {
-				return ipv6_multicast_group(ctx, optval,
-							    optlen, true);
-			}
-
-			break;
-
-		case IPV6_DROP_MEMBERSHIP:
-			if (IS_ENABLED(CONFIG_NET_IPV6)) {
-				return ipv6_multicast_group(ctx, optval,
-							    optlen, false);
-			}
-
-			break;
-		}
-
-		break;
-	}
-
-	errno = ENOPROTOOPT;
-	return -1;
-}
-
-int zsock_getpeername_ctx(struct net_context *ctx, struct sockaddr *addr,
-			  socklen_t *addrlen)
-{
-	socklen_t newlen = 0;
-
-	if (addr == NULL || addrlen == NULL) {
-		SET_ERRNO(-EINVAL);
-	}
-
-	if (!(ctx->flags & NET_CONTEXT_REMOTE_ADDR_SET)) {
-		SET_ERRNO(-ENOTCONN);
-	}
-
-	if (net_context_get_type(ctx) == SOCK_STREAM &&
-	    net_context_get_state(ctx) != NET_CONTEXT_CONNECTED) {
-		SET_ERRNO(-ENOTCONN);
-	}
-
-	if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->remote.sa_family == AF_INET) {
-		struct sockaddr_in addr4 = { 0 };
-
-		addr4.sin_family = AF_INET;
-		addr4.sin_port = net_sin(&ctx->remote)->sin_port;
-		memcpy(&addr4.sin_addr, &net_sin(&ctx->remote)->sin_addr,
-		       sizeof(struct in_addr));
-		newlen = sizeof(struct sockaddr_in);
-
-		memcpy(addr, &addr4, MIN(*addrlen, newlen));
-	} else if (IS_ENABLED(CONFIG_NET_IPV6) &&
-		   ctx->remote.sa_family == AF_INET6) {
-		struct sockaddr_in6 addr6 = { 0 };
-
-		addr6.sin6_family = AF_INET6;
-		addr6.sin6_port = net_sin6(&ctx->remote)->sin6_port;
-		memcpy(&addr6.sin6_addr, &net_sin6(&ctx->remote)->sin6_addr,
-		       sizeof(struct in6_addr));
-		newlen = sizeof(struct sockaddr_in6);
-
-		memcpy(addr, &addr6, MIN(*addrlen, newlen));
-	} else {
-		SET_ERRNO(-EINVAL);
-	}
-
-	*addrlen = newlen;
-
-	return 0;
-}
-
-int zsock_getsockname_ctx(struct net_context *ctx, struct sockaddr *addr,
-			  socklen_t *addrlen)
-{
-	socklen_t newlen = 0;
-	int ret;
-
-	if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->local.family == AF_INET) {
-		struct sockaddr_in addr4 = { 0 };
-
-		if (net_sin_ptr(&ctx->local)->sin_addr == NULL) {
-			SET_ERRNO(-EINVAL);
-		}
-
-		newlen = sizeof(struct sockaddr_in);
-
-		ret = net_context_get_local_addr(ctx,
-						 (struct sockaddr *)&addr4,
-						 &newlen);
-		if (ret < 0) {
-			SET_ERRNO(-ret);
-		}
-
-		memcpy(addr, &addr4, MIN(*addrlen, newlen));
-
-	} else if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->local.family == AF_INET6) {
-		struct sockaddr_in6 addr6 = { 0 };
-
-		if (net_sin6_ptr(&ctx->local)->sin6_addr == NULL) {
-			SET_ERRNO(-EINVAL);
-		}
-
-		newlen = sizeof(struct sockaddr_in6);
-
-		ret = net_context_get_local_addr(ctx,
-						 (struct sockaddr *)&addr6,
-						 &newlen);
-		if (ret < 0) {
-			SET_ERRNO(-ret);
-		}
-
-		memcpy(addr, &addr6, MIN(*addrlen, newlen));
-	} else {
-		SET_ERRNO(-EINVAL);
-	}
-
-	*addrlen = newlen;
-
-	return 0;
-}
-
-static ssize_t sock_read_vmeth(void *obj, void *buffer, size_t count)
-{
-	return zsock_recvfrom_ctx(obj, buffer, count, 0, NULL, 0);
-}
-
-static ssize_t sock_write_vmeth(void *obj, const void *buffer, size_t count)
-{
-	return zsock_sendto_ctx(obj, buffer, count, 0, NULL, 0);
-}
-
-static void zsock_ctx_set_lock(struct net_context *ctx, struct k_mutex *lock)
-{
-	ctx->cond.lock = lock;
-}
-
-static int sock_ioctl_vmeth(void *obj, unsigned int request, va_list args)
-{
-	switch (request) {
-
-	/* In Zephyr, fcntl() is just an alias of ioctl(). */
-	case F_GETFL:
-		if (sock_is_nonblock(obj)) {
-			return O_NONBLOCK;
-		}
-
-		return 0;
-
-	case F_SETFL: {
-		int flags;
-
-		flags = va_arg(args, int);
-
-		if (flags & O_NONBLOCK) {
-			sock_set_flag(obj, SOCK_NONBLOCK, SOCK_NONBLOCK);
-		} else {
-			sock_set_flag(obj, SOCK_NONBLOCK, 0);
-		}
-
-		return 0;
-	}
-
-	case ZFD_IOCTL_POLL_PREPARE: {
-		struct zsock_pollfd *pfd;
-		struct k_poll_event **pev;
-		struct k_poll_event *pev_end;
-
-		pfd = va_arg(args, struct zsock_pollfd *);
-		pev = va_arg(args, struct k_poll_event **);
-		pev_end = va_arg(args, struct k_poll_event *);
-
-		return zsock_poll_prepare_ctx(obj, pfd, pev, pev_end);
-	}
-
-	case ZFD_IOCTL_POLL_UPDATE: {
-		struct zsock_pollfd *pfd;
-		struct k_poll_event **pev;
-
-		pfd = va_arg(args, struct zsock_pollfd *);
-		pev = va_arg(args, struct k_poll_event **);
-
-		return zsock_poll_update_ctx(obj, pfd, pev);
-	}
-
-	case ZFD_IOCTL_SET_LOCK: {
-		struct k_mutex *lock;
-
-		lock = va_arg(args, struct k_mutex *);
-
-		zsock_ctx_set_lock(obj, lock);
-		return 0;
-	}
-
-	case ZFD_IOCTL_FIONBIO:
-		sock_set_flag(obj, SOCK_NONBLOCK, SOCK_NONBLOCK);
-		return 0;
-
-	case ZFD_IOCTL_FIONREAD: {
-		int *avail = va_arg(args, int *);
-
-		*avail = zsock_fionread_ctx(obj);
-		return 0;
-	}
-
-	default:
-		errno = EOPNOTSUPP;
-		return -1;
-	}
-}
-
-static int sock_shutdown_vmeth(void *obj, int how)
-{
-	return zsock_shutdown_ctx(obj, how);
-}
-
-static int sock_bind_vmeth(void *obj, const struct sockaddr *addr,
-			   socklen_t addrlen)
-{
-	return zsock_bind_ctx(obj, addr, addrlen);
-}
-
-static int sock_connect_vmeth(void *obj, const struct sockaddr *addr,
-			      socklen_t addrlen)
-{
-	return zsock_connect_ctx(obj, addr, addrlen);
-}
-
-static int sock_listen_vmeth(void *obj, int backlog)
-{
-	return zsock_listen_ctx(obj, backlog);
-}
-
-static int sock_accept_vmeth(void *obj, struct sockaddr *addr,
-			     socklen_t *addrlen)
-{
-	return zsock_accept_ctx(obj, addr, addrlen);
-}
-
-static ssize_t sock_sendto_vmeth(void *obj, const void *buf, size_t len,
-				 int flags, const struct sockaddr *dest_addr,
-				 socklen_t addrlen)
-{
-	return zsock_sendto_ctx(obj, buf, len, flags, dest_addr, addrlen);
-}
-
-static ssize_t sock_sendmsg_vmeth(void *obj, const struct msghdr *msg,
-				  int flags)
-{
-	return zsock_sendmsg_ctx(obj, msg, flags);
-}
-
-static ssize_t sock_recvmsg_vmeth(void *obj, struct msghdr *msg, int flags)
-{
-	return zsock_recvmsg_ctx(obj, msg, flags);
-}
-
-static ssize_t sock_recvfrom_vmeth(void *obj, void *buf, size_t max_len,
-				   int flags, struct sockaddr *src_addr,
-				   socklen_t *addrlen)
-{
-	return zsock_recvfrom_ctx(obj, buf, max_len, flags,
-				  src_addr, addrlen);
-}
-
-static int sock_getsockopt_vmeth(void *obj, int level, int optname,
-				 void *optval, socklen_t *optlen)
-{
-	return zsock_getsockopt_ctx(obj, level, optname, optval, optlen);
-}
-
-static int sock_setsockopt_vmeth(void *obj, int level, int optname,
-				 const void *optval, socklen_t optlen)
-{
-	return zsock_setsockopt_ctx(obj, level, optname, optval, optlen);
-}
-
-static int sock_close_vmeth(void *obj)
-{
-	return zsock_close_ctx(obj);
-}
-static int sock_getpeername_vmeth(void *obj, struct sockaddr *addr,
-				  socklen_t *addrlen)
-{
-	return zsock_getpeername_ctx(obj, addr, addrlen);
-}
-
-static int sock_getsockname_vmeth(void *obj, struct sockaddr *addr,
-				  socklen_t *addrlen)
-{
-	return zsock_getsockname_ctx(obj, addr, addrlen);
-}
-
-const struct socket_op_vtable sock_fd_op_vtable = {
-	.fd_vtable = {
-		.read = sock_read_vmeth,
-		.write = sock_write_vmeth,
-		.close = sock_close_vmeth,
-		.ioctl = sock_ioctl_vmeth,
-	},
-	.shutdown = sock_shutdown_vmeth,
-	.bind = sock_bind_vmeth,
-	.connect = sock_connect_vmeth,
-	.listen = sock_listen_vmeth,
-	.accept = sock_accept_vmeth,
-	.sendto = sock_sendto_vmeth,
-	.sendmsg = sock_sendmsg_vmeth,
-	.recvmsg = sock_recvmsg_vmeth,
-	.recvfrom = sock_recvfrom_vmeth,
-	.getsockopt = sock_getsockopt_vmeth,
-	.setsockopt = sock_setsockopt_vmeth,
-	.getpeername = sock_getpeername_vmeth,
-	.getsockname = sock_getsockname_vmeth,
-};
-
-static bool inet_is_supported(int family, int type, int proto)
-{
-	if (family != AF_INET && family != AF_INET6) {
-		return false;
-	}
-
-	return true;
-}
-
-NET_SOCKET_REGISTER(af_inet46, NET_SOCKET_DEFAULT_PRIO, AF_UNSPEC,
-		    inet_is_supported, zsock_socket_internal);

From f140312e777403b46ed586481a764ff791edb195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:04 +0100
Subject: [PATCH 1952/2913] Revert "[nrf fromtree] net: shell: Enable IPv4/6
 and iface commands if NET_NATIVE is disabled"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 496253fe2292e44daf1d2ced661e1848cf0c305c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/shell/iface.c | 15 ++++++++----
 subsys/net/lib/shell/ipv4.c  | 40 +++++++++++++++---------------
 subsys/net/lib/shell/ipv6.c  | 47 ++++++++++++++++++------------------
 3 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/subsys/net/lib/shell/iface.c b/subsys/net/lib/shell/iface.c
index c3a3428a546..7aa03c75730 100644
--- a/subsys/net/lib/shell/iface.c
+++ b/subsys/net/lib/shell/iface.c
@@ -91,6 +91,7 @@ static void print_phy_link_state(const struct shell *sh, const struct device *ph
 }
 #endif
 
+#if defined(CONFIG_NET_NATIVE)
 static const char *iface_flags2str(struct net_if *iface)
 {
 	static char str[sizeof("POINTOPOINT") + sizeof("PROMISC") +
@@ -147,17 +148,17 @@ static const char *iface_flags2str(struct net_if *iface)
 
 	return str;
 }
+#endif
 
 static void iface_cb(struct net_if *iface, void *user_data)
 {
+#if defined(CONFIG_NET_NATIVE)
 	struct net_shell_user_data *data = user_data;
 	const struct shell *sh = data->sh;
 
-#if defined(CONFIG_NET_NATIVE_IPV6)
+#if defined(CONFIG_NET_IPV6)
 	struct net_if_ipv6_prefix *prefix;
 	struct net_if_router *router;
-#endif
-#if defined(CONFIG_NET_IPV6)
 	struct net_if_ipv6 *ipv6;
 #endif
 #if defined(CONFIG_NET_IPV4)
@@ -392,7 +393,6 @@ static void iface_cb(struct net_if *iface, void *user_data)
 		PR("\t<none>\n");
 	}
 
-#if defined(CONFIG_NET_NATIVE_IPV6)
 	count = 0;
 
 	PR("IPv6 prefixes (max %d):\n", NET_IF_MAX_IPV6_PREFIX);
@@ -421,7 +421,6 @@ static void iface_cb(struct net_if *iface, void *user_data)
 		   net_sprint_ipv6_addr(&router->address.in6_addr),
 		   router->is_infinite ? " infinite" : "");
 	}
-#endif /* CONFIG_NET_NATIVE_IPV6 */
 
 skip_ipv6:
 
@@ -533,6 +532,12 @@ static void iface_cb(struct net_if *iface, void *user_data)
 		   iface->config.dhcpv4.attempts);
 	}
 #endif /* CONFIG_NET_DHCPV4 */
+
+#else
+	ARG_UNUSED(iface);
+	ARG_UNUSED(user_data);
+
+#endif /* CONFIG_NET_NATIVE */
 }
 
 static int cmd_net_set_mac(const struct shell *sh, size_t argc, char *argv[])
diff --git a/subsys/net/lib/shell/ipv4.c b/subsys/net/lib/shell/ipv4.c
index d70dc786828..74afea9a54a 100644
--- a/subsys/net/lib/shell/ipv4.c
+++ b/subsys/net/lib/shell/ipv4.c
@@ -13,7 +13,7 @@ LOG_MODULE_DECLARE(net_shell);
 #include "net_shell_private.h"
 #include "../ip/ipv4.h"
 
-#if defined(CONFIG_NET_IPV4)
+#if defined(CONFIG_NET_NATIVE_IPV4)
 static void ip_address_lifetime_cb(struct net_if *iface, void *user_data)
 {
 	struct net_shell_user_data *data = user_data;
@@ -50,7 +50,7 @@ static void ip_address_lifetime_cb(struct net_if *iface, void *user_data)
 			   &ipv4->unicast[i].netmask));
 	}
 }
-#endif /* CONFIG_NET_IPV4 */
+#endif /* CONFIG_NET_NATIVE_IPV4 */
 
 static int cmd_net_ipv4(const struct shell *sh, size_t argc, char *argv[])
 {
@@ -62,17 +62,14 @@ static int cmd_net_ipv4(const struct shell *sh, size_t argc, char *argv[])
 	}
 
 #if defined(CONFIG_NET_NATIVE_IPV4)
+	struct net_shell_user_data user_data;
+
 	PR("IPv4 fragmentation support                : %s\n",
 	   IS_ENABLED(CONFIG_NET_IPV4_FRAGMENT) ? "enabled" :
 	   "disabled");
 	PR("IPv4 conflict detection support           : %s\n",
 	   IS_ENABLED(CONFIG_NET_IPV4_ACD) ? "enabled" :
 	   "disabled");
-#endif /* CONFIG_NET_NATIVE_IPV4 */
-
-#if defined(CONFIG_NET_IPV4)
-	struct net_shell_user_data user_data;
-
 	PR("Max number of IPv4 network interfaces "
 	   "in the system          : %d\n",
 	   CONFIG_NET_IF_MAX_IPV4_COUNT);
@@ -88,14 +85,14 @@ static int cmd_net_ipv4(const struct shell *sh, size_t argc, char *argv[])
 
 	/* Print information about address lifetime */
 	net_if_foreach(ip_address_lifetime_cb, &user_data);
-#endif /* CONFIG_NET_IPV4 */
+#endif
 
 	return 0;
 }
 
 static int cmd_net_ip_add(const struct shell *sh, size_t argc, char *argv[])
 {
-#if defined(CONFIG_NET_IPV4)
+#if defined(CONFIG_NET_NATIVE_IPV4)
 	struct net_if *iface = NULL;
 	int idx;
 	struct in_addr addr;
@@ -154,15 +151,16 @@ static int cmd_net_ip_add(const struct shell *sh, size_t argc, char *argv[])
 		net_if_ipv4_set_netmask_by_addr(iface, &addr, &netmask);
 	}
 
-#else /* CONFIG_NET_IPV4 */
-	PR_INFO("Set %s to enable %s support.\n", "CONFIG_NET_IPV4", "IPv4");
-#endif /* CONFIG_NET_IPV4 */
+#else /* CONFIG_NET_NATIVE_IPV4 */
+	PR_INFO("Set %s and %s to enable native %s support.\n",
+			"CONFIG_NET_NATIVE", "CONFIG_NET_IPV4", "IPv4");
+#endif /* CONFIG_NET_NATIVE_IPV4 */
 	return 0;
 }
 
 static int cmd_net_ip_del(const struct shell *sh, size_t argc, char *argv[])
 {
-#if defined(CONFIG_NET_IPV4)
+#if defined(CONFIG_NET_NATIVE_IPV4)
 	struct net_if *iface = NULL;
 	int idx;
 	struct in_addr addr;
@@ -203,15 +201,16 @@ static int cmd_net_ip_del(const struct shell *sh, size_t argc, char *argv[])
 			return -ENOEXEC;
 		}
 	}
-#else /* CONFIG_NET_IPV4 */
-	PR_INFO("Set %s to enable %s support.\n", "CONFIG_NET_IPV4", "IPv4");
-#endif /* CONFIG_NET_IPV4 */
+#else /* CONFIG_NET_NATIVE_IPV4 */
+	PR_INFO("Set %s and %s to enable native %s support.\n",
+			"CONFIG_NET_NATIVE", "CONFIG_NET_IPV4", "IPv4");
+#endif /* CONFIG_NET_NATIVE_IPV4 */
 	return 0;
 }
 
 static int cmd_net_ip_gateway(const struct shell *sh, size_t argc, char *argv[])
 {
-#if defined(CONFIG_NET_IPV4)
+#if defined(CONFIG_NET_NATIVE_IPV4)
 	struct net_if *iface;
 	int idx;
 	struct in_addr addr;
@@ -239,9 +238,10 @@ static int cmd_net_ip_gateway(const struct shell *sh, size_t argc, char *argv[])
 
 	net_if_ipv4_set_gw(iface, &addr);
 
-#else /* CONFIG_NET_IPV4 */
-	PR_INFO("Set %s to enable %s support.\n", "CONFIG_NET_IPV4", "IPv4");
-#endif /* CONFIG_NET_IPV4 */
+#else /* CONFIG_NET_NATIVE_IPV4 */
+	PR_INFO("Set %s and %s to enable native %s support.\n",
+			"CONFIG_NET_NATIVE", "CONFIG_NET_IPV4", "IPv4");
+#endif /* CONFIG_NET_NATIVE_IPV4 */
 	return 0;
 }
 
diff --git a/subsys/net/lib/shell/ipv6.c b/subsys/net/lib/shell/ipv6.c
index d13b6803e65..b9a9252f1ac 100644
--- a/subsys/net/lib/shell/ipv6.c
+++ b/subsys/net/lib/shell/ipv6.c
@@ -54,6 +54,8 @@ void ipv6_frag_cb(struct net_ipv6_reassembly *reass, void *user_data)
 }
 #endif /* CONFIG_NET_IPV6_FRAGMENT */
 
+#if defined(CONFIG_NET_NATIVE_IPV6)
+
 #if defined(CONFIG_NET_IPV6_PE)
 static void ipv6_pe_filter_cb(struct in6_addr *prefix, bool is_denylist,
 			      void *user_data)
@@ -76,7 +78,6 @@ static void ipv6_pe_filter_cb(struct in6_addr *prefix, bool is_denylist,
 }
 #endif /* CONFIG_NET_IPV6_PE */
 
-#if defined(CONFIG_NET_IPV6)
 static void address_lifetime_cb(struct net_if *iface, void *user_data)
 {
 	struct net_shell_user_data *data = user_data;
@@ -98,18 +99,16 @@ static void address_lifetime_cb(struct net_if *iface, void *user_data)
 	PR("Type      \tState    \tLifetime (sec)\tRef\tAddress\n");
 
 	ARRAY_FOR_EACH(ipv6->unicast, i) {
+		struct net_if_ipv6_prefix *prefix;
 		char remaining_str[sizeof("01234567890")];
-		uint8_t prefix_len = 128U;
+		uint32_t remaining;
+		uint8_t prefix_len;
 
 		if (!ipv6->unicast[i].is_used ||
 		    ipv6->unicast[i].address.family != AF_INET6) {
 			continue;
 		}
 
-#if defined(CONFIG_NET_NATIVE_IPV6)
-		struct net_if_ipv6_prefix *prefix;
-		uint32_t remaining;
-
 		remaining = net_timeout_remaining(&ipv6->unicast[i].lifetime,
 						  k_uptime_get_32());
 
@@ -117,6 +116,8 @@ static void address_lifetime_cb(struct net_if *iface, void *user_data)
 					   &ipv6->unicast[i].address.in6_addr);
 		if (prefix) {
 			prefix_len = prefix->len;
+		} else {
+			prefix_len = 128U;
 		}
 
 		if (ipv6->unicast[i].is_infinite) {
@@ -126,9 +127,6 @@ static void address_lifetime_cb(struct net_if *iface, void *user_data)
 			snprintk(remaining_str, sizeof(remaining_str) - 1,
 				 "%u", remaining);
 		}
-#else
-	snprintk(remaining_str, sizeof(remaining_str) - 1, "infinite");
-#endif /* CONFIG_NET_NATIVE_IPV6 */
 
 		PR("%s  \t%s\t%14s\t%ld\t%s/%d%s\n",
 		   addrtype2str(ipv6->unicast[i].addr_type),
@@ -139,13 +137,13 @@ static void address_lifetime_cb(struct net_if *iface, void *user_data)
 		   ipv6->unicast[i].is_temporary ? " (temporary)" : "");
 	}
 }
-#endif /* CONFIG_NET_IPV6 */
+#endif /* CONFIG_NET_NATIVE_IPV6 */
 
 static int cmd_net_ipv6(const struct shell *sh, size_t argc, char *argv[])
 {
-#if defined(CONFIG_NET_IPV6)
+#if defined(CONFIG_NET_NATIVE_IPV6)
 	struct net_shell_user_data user_data;
-#endif /* CONFIG_NET_IPV6 */
+#endif
 
 	PR("IPv6 support                              : %s\n",
 	   IS_ENABLED(CONFIG_NET_IPV6) ?
@@ -191,10 +189,8 @@ static int cmd_net_ipv6(const struct shell *sh, size_t argc, char *argv[])
 	PR("Max number of IPv6 privacy extension filters "
 	   "                : %d\n",
 	   CONFIG_NET_IPV6_PE_FILTER_PREFIX_COUNT);
-#endif /* CONFIG_NET_IPV6_PE */
-#endif /* CONFIG_NET_NATIVE_IPV6 */
+#endif
 
-#if defined(CONFIG_NET_IPV6)
 	PR("Max number of IPv6 network interfaces "
 	   "in the system          : %d\n",
 	   CONFIG_NET_IF_MAX_IPV6_COUNT);
@@ -213,14 +209,15 @@ static int cmd_net_ipv6(const struct shell *sh, size_t argc, char *argv[])
 
 	/* Print information about address lifetime */
 	net_if_foreach(address_lifetime_cb, &user_data);
-#endif /* CONFIG_NET_IPV6 */
+
+#endif /* CONFIG_NET_NATIVE_IPV6 */
 
 	return 0;
 }
 
 static int cmd_net_ip6_add(const struct shell *sh, size_t argc, char *argv[])
 {
-#if defined(CONFIG_NET_IPV6)
+#if defined(CONFIG_NET_NATIVE_IPV6)
 	struct net_if *iface = NULL;
 	int idx;
 	struct in6_addr addr;
@@ -265,15 +262,16 @@ static int cmd_net_ip6_add(const struct shell *sh, size_t argc, char *argv[])
 		}
 	}
 
-#else /* CONFIG_NET_IPV6 */
-	PR_INFO("Set %s to enable %s support.\n", "CONFIG_NET_IPV6", "IPv6");
-#endif /* CONFIG_NET_IPV6 */
+#else /* CONFIG_NET_NATIVE_IPV6 */
+	PR_INFO("Set %s and %s to enable native %s support.\n",
+			"CONFIG_NET_NATIVE", "CONFIG_NET_IPV6", "IPv6");
+#endif /* CONFIG_NET_NATIVE_IPV6 */
 	return 0;
 }
 
 static int cmd_net_ip6_del(const struct shell *sh, size_t argc, char *argv[])
 {
-#if defined(CONFIG_NET_IPV6)
+#if defined(CONFIG_NET_NATIVE_IPV6)
 	struct net_if *iface = NULL;
 	int idx;
 	struct in6_addr addr;
@@ -319,9 +317,10 @@ static int cmd_net_ip6_del(const struct shell *sh, size_t argc, char *argv[])
 		}
 	}
 
-#else /* CONFIG_NET_IPV6 */
-	PR_INFO("Set %s to enable %s support.\n", "CONFIG_NET_IPV6", "IPv6");
-#endif /* CONFIG_NET_IPV6 */
+#else /* CONFIG_NET_NATIVE_IPV6 */
+	PR_INFO("Set %s and %s to enable native %s support.\n",
+			"CONFIG_NET_NATIVE", "CONFIG_NET_IPV6", "IPv6");
+#endif /* CONFIG_NET_NATIVE_IPV6 */
 	return 0;
 }
 

From 2971b38d5fcc0c57996544b53cc8d5ee83888ffa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:04 +0100
Subject: [PATCH 1953/2913] Revert "[nrf fromtree] test: net: offloaded_netdev:
 Add tests for IPv4/6 address registration"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 945b374a60a92b71813008de8ad3019fb127fa4a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/offloaded_netdev/prj.conf      |  6 ---
 tests/net/offloaded_netdev/src/main.c    | 62 ------------------------
 tests/net/offloaded_netdev/testcase.yaml | 13 ++---
 3 files changed, 5 insertions(+), 76 deletions(-)

diff --git a/tests/net/offloaded_netdev/prj.conf b/tests/net/offloaded_netdev/prj.conf
index 3a670f327d3..ad92b9bec28 100644
--- a/tests/net/offloaded_netdev/prj.conf
+++ b/tests/net/offloaded_netdev/prj.conf
@@ -7,9 +7,3 @@ CONFIG_ZTEST=y
 CONFIG_TEST_USERSPACE=y
 CONFIG_NET_OFFLOAD=y
 CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_NET_IPV4=y
-CONFIG_NET_IPV6=y
-CONFIG_NET_IPV6_NBR_CACHE=n
-CONFIG_NET_IPV6_MLD=n
-CONFIG_NET_IF_MAX_IPV4_COUNT=4
-CONFIG_NET_IF_MAX_IPV6_COUNT=4
diff --git a/tests/net/offloaded_netdev/src/main.c b/tests/net/offloaded_netdev/src/main.c
index becc0488102..dfe8f8fbb14 100644
--- a/tests/net/offloaded_netdev/src/main.c
+++ b/tests/net/offloaded_netdev/src/main.c
@@ -19,11 +19,6 @@
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/net_l2.h>
 
-static struct in_addr test_addr_ipv4 = { { { 192, 0, 2, 1 } } };
-static struct in6_addr test_addr_ipv6 = { { {
-	0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1
-} } };
-
 /* Dummy socket creator for socket-offloaded ifaces */
 int offload_socket(int family, int type, int proto)
 {
@@ -41,8 +36,6 @@ static void sock_offload_l2_iface_init(struct net_if *iface)
 	 */
 	net_if_socket_offload_set(iface, offload_socket);
 	net_if_flag_set(iface, NET_IF_NO_AUTO_START);
-	net_if_flag_set(iface, NET_IF_IPV4);
-	net_if_flag_set(iface, NET_IF_IPV6);
 }
 
 /* Dummy init function for net-offloaded ifaces */
@@ -53,8 +46,6 @@ static void net_offload_l2_iface_init(struct net_if *iface)
 	 */
 	iface->if_dev->offload = &net_offload_api;
 	net_if_flag_set(iface, NET_IF_NO_AUTO_START);
-	net_if_flag_set(iface, NET_IF_IPV4);
-	net_if_flag_set(iface, NET_IF_IPV6);
 }
 
 /* Tracks the total number of ifaces that are up (theoretically). */
@@ -336,58 +327,5 @@ ZTEST(net_offloaded_netdev, test_up_down_sock_off_impl_fail_down)
 			"Iface under test should have failed to go up");
 }
 
-static void test_addr_add_common(struct net_if *test_iface, const char *off_type)
-{
-	struct net_if *lookup_iface;
-	struct net_if_addr *ipv4_addr;
-	struct net_if_addr *ipv6_addr;
-
-	/* Bring iface up before test */
-	(void)net_if_up(test_iface);
-
-	ipv4_addr = net_if_ipv4_addr_add(test_iface, &test_addr_ipv4,
-					 NET_ADDR_MANUAL, 0);
-	zassert_not_null(ipv4_addr,
-			"Failed to add IPv4 address to a %s offloaded interface",
-			off_type);
-	ipv6_addr = net_if_ipv6_addr_add(test_iface, &test_addr_ipv6,
-					 NET_ADDR_MANUAL, 0);
-	zassert_not_null(ipv6_addr,
-			 "Failed to add IPv6 address to a socket %s interface",
-			 off_type);
-
-	lookup_iface = NULL;
-	zassert_equal_ptr(net_if_ipv4_addr_lookup(&test_addr_ipv4, &lookup_iface),
-			  ipv4_addr,
-			  "Failed to find IPv4 address on a %s offloaded interface");
-	zassert_equal_ptr(lookup_iface, test_iface, "Wrong interface");
-
-	lookup_iface = NULL;
-	zassert_equal_ptr(net_if_ipv6_addr_lookup(&test_addr_ipv6, &lookup_iface),
-			  ipv6_addr,
-			  "Failed to find IPv6 address on a %s offloaded interface");
-	zassert_equal_ptr(lookup_iface, test_iface, "Wrong interface");
-
-	zassert_true(net_if_ipv4_addr_rm(test_iface, &test_addr_ipv4),
-		     "Failed to remove IPv4 address from a %s offloaded interface",
-		     off_type);
-	zassert_true(net_if_ipv6_addr_rm(test_iface, &test_addr_ipv6),
-		     "Failed to remove IPv4 address from a %s offloaded interface",
-		     off_type);
-}
-
-ZTEST(net_offloaded_netdev, test_addr_add_sock_off_impl)
-{
-	struct net_if *test_iface = NET_IF_GET(sock_offload_test_impl, 0);
-
-	test_addr_add_common(test_iface, "offloaded");
-}
-
-ZTEST(net_offloaded_netdev, test_addr_add_net_off_impl)
-{
-	struct net_if *test_iface = NET_IF_GET(net_offload_test_impl, 0);
-
-	test_addr_add_common(test_iface, "net");
-}
 
 ZTEST_SUITE(net_offloaded_netdev, NULL, NULL, net_offloaded_netdev_before, NULL, NULL);
diff --git a/tests/net/offloaded_netdev/testcase.yaml b/tests/net/offloaded_netdev/testcase.yaml
index d51590043f9..5893d4f12c5 100644
--- a/tests/net/offloaded_netdev/testcase.yaml
+++ b/tests/net/offloaded_netdev/testcase.yaml
@@ -1,12 +1,9 @@
 common:
   min_ram: 16
   depends_on: netif
-  tags:
-    - net
-    - iface
-    - userspace
 tests:
-  net.offloaded_netdev: {}
-  net.offloaded_netdev.no_native:
-    extra_configs:
-      - CONFIG_NET_NATIVE=n
+  net.offloaded_netdev:
+    tags:
+      - net
+      - iface
+      - userspace

From 1a8444bf704f27a7f2e4de816482192a51adbb1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:04 +0100
Subject: [PATCH 1954/2913] Revert "[nrf fromtree] net: iface: Don't require
 native networking to register IP address"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f5b417b07eb9e28de1be60a6ff83d1b8a0071cf7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/net/net_if.h |  12 +-
 subsys/net/ip/net_if.c      | 741 +++++++++++++++++-------------------
 2 files changed, 364 insertions(+), 389 deletions(-)

diff --git a/include/zephyr/net/net_if.h b/include/zephyr/net/net_if.h
index 4e08aa50ba5..c94d6644314 100644
--- a/include/zephyr/net/net_if.h
+++ b/include/zephyr/net/net_if.h
@@ -300,7 +300,7 @@ struct net_offload;
 #endif /* CONFIG_NET_OFFLOAD */
 
 /** @cond INTERNAL_HIDDEN */
-#if defined(CONFIG_NET_IPV6)
+#if defined(CONFIG_NET_NATIVE_IPV6)
 #define NET_IF_MAX_IPV6_ADDR CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT
 #define NET_IF_MAX_IPV6_MADDR CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT
 #define NET_IF_MAX_IPV6_PREFIX CONFIG_NET_IF_IPV6_PREFIX_COUNT
@@ -422,7 +422,7 @@ struct net_if_dhcpv6 {
 #endif /* defined(CONFIG_NET_DHCPV6) && defined(CONFIG_NET_NATIVE_IPV6) */
 
 /** @cond INTERNAL_HIDDEN */
-#if defined(CONFIG_NET_IPV4)
+#if defined(CONFIG_NET_NATIVE_IPV4)
 #define NET_IF_MAX_IPV4_ADDR CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT
 #define NET_IF_MAX_IPV4_MADDR CONFIG_NET_IF_MCAST_IPV4_ADDR_COUNT
 #else
@@ -542,11 +542,11 @@ struct net_if_ipv4_autoconf {
  * @brief Network interface IP address configuration.
  */
 struct net_if_ip {
-#if defined(CONFIG_NET_IPV6)
+#if defined(CONFIG_NET_NATIVE_IPV6)
 	struct net_if_ipv6 *ipv6;
 #endif /* CONFIG_NET_IPV6 */
 
-#if defined(CONFIG_NET_IPV4)
+#if defined(CONFIG_NET_NATIVE_IPV4)
 	struct net_if_ipv4 *ipv4;
 #endif /* CONFIG_NET_IPV4 */
 };
@@ -2431,7 +2431,7 @@ bool net_if_ipv4_is_addr_bcast(struct net_if *iface,
  * @return Pointer to network interface to use, NULL if no suitable interface
  * could be found.
  */
-#if defined(CONFIG_NET_IPV4)
+#if defined(CONFIG_NET_NATIVE_IPV4)
 struct net_if *net_if_ipv4_select_src_iface(const struct in_addr *dst);
 #else
 static inline struct net_if *net_if_ipv4_select_src_iface(
@@ -2454,7 +2454,7 @@ static inline struct net_if *net_if_ipv4_select_src_iface(
  * @return Pointer to IPv4 address to use, NULL if no IPv4 address
  * could be found.
  */
-#if defined(CONFIG_NET_IPV4)
+#if defined(CONFIG_NET_NATIVE_IPV4)
 const struct in_addr *net_if_ipv4_select_src_addr(struct net_if *iface,
 						  const struct in_addr *dst);
 #else
diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c
index ea3f4a2dbd8..54c4f24f368 100644
--- a/subsys/net/ip/net_if.c
+++ b/subsys/net/ip/net_if.c
@@ -84,16 +84,14 @@ static sys_slist_t active_dad_timers;
 static struct k_work_delayable rs_timer;
 static sys_slist_t active_rs_timers;
 #endif
-#endif /* CONFIG_NET_NATIVE_IPV6 */
 
-#if defined(CONFIG_NET_IPV6)
 static struct {
 	struct net_if_ipv6 ipv6;
 	struct net_if *iface;
 } ipv6_addresses[CONFIG_NET_IF_MAX_IPV6_COUNT];
 #endif /* CONFIG_NET_NATIVE_IPV6 */
 
-#if defined(CONFIG_NET_IPV4)
+#if defined(CONFIG_NET_NATIVE_IPV4)
 static struct {
 	struct net_if_ipv4 ipv4;
 	struct net_if *iface;
@@ -676,7 +674,7 @@ static enum net_l2_flags l2_flags_get(struct net_if *iface)
 	return flags;
 }
 
-#if defined(CONFIG_NET_IP)
+#if defined(CONFIG_NET_NATIVE_IPV4) || defined(CONFIG_NET_NATIVE_IPV6)
 /* Return how many bits are shared between two IP addresses */
 static uint8_t get_ipaddr_diff(const uint8_t *src, const uint8_t *dst, int addr_len)
 {
@@ -702,9 +700,7 @@ static uint8_t get_ipaddr_diff(const uint8_t *src, const uint8_t *dst, int addr_
 
 	return len;
 }
-#endif /* CONFIG_NET_IP */
 
-#if defined(CONFIG_NET_NATIVE_IPV4) || defined(CONFIG_NET_NATIVE_IPV6)
 static struct net_if_router *iface_router_lookup(struct net_if *iface,
 						 uint8_t family, void *addr)
 {
@@ -1034,7 +1030,7 @@ void net_if_mcast_monitor(struct net_if *iface,
 #define net_if_mcast_monitor(...)
 #endif /* CONFIG_NET_NATIVE_IPV4 || CONFIG_NET_NATIVE_IPV6 */
 
-#if defined(CONFIG_NET_IPV6)
+#if defined(CONFIG_NET_NATIVE_IPV6)
 int net_if_config_ipv6_get(struct net_if *iface, struct net_if_ipv6 **ipv6)
 {
 	int ret = 0;
@@ -1122,7 +1118,6 @@ int net_if_config_ipv6_put(struct net_if *iface)
 	return ret;
 }
 
-#if defined(CONFIG_NET_NATIVE_IPV6)
 #if defined(CONFIG_NET_IPV6_MLD)
 static void join_mcast_allnodes(struct net_if *iface)
 {
@@ -1584,6 +1579,110 @@ void net_if_nbr_reachability_hint(struct net_if *iface, const struct in6_addr *i
 
 #endif
 
+struct net_if_addr *net_if_ipv6_addr_lookup(const struct in6_addr *addr,
+					    struct net_if **ret)
+{
+	struct net_if_addr *ifaddr = NULL;
+
+	STRUCT_SECTION_FOREACH(net_if, iface) {
+		struct net_if_ipv6 *ipv6;
+
+		net_if_lock(iface);
+
+		ipv6 = iface->config.ip.ipv6;
+		if (!ipv6) {
+			net_if_unlock(iface);
+			continue;
+		}
+
+		ARRAY_FOR_EACH(ipv6->unicast, i) {
+			if (!ipv6->unicast[i].is_used ||
+			    ipv6->unicast[i].address.family != AF_INET6) {
+				continue;
+			}
+
+			if (net_ipv6_is_prefix(
+				    addr->s6_addr,
+				    ipv6->unicast[i].address.in6_addr.s6_addr,
+				    128)) {
+
+				if (ret) {
+					*ret = iface;
+				}
+
+				ifaddr = &ipv6->unicast[i];
+				net_if_unlock(iface);
+				goto out;
+			}
+		}
+
+		net_if_unlock(iface);
+	}
+
+out:
+	return ifaddr;
+}
+
+struct net_if_addr *net_if_ipv6_addr_lookup_by_iface(struct net_if *iface,
+						     struct in6_addr *addr)
+{
+	struct net_if_addr *ifaddr = NULL;
+	struct net_if_ipv6 *ipv6;
+
+	net_if_lock(iface);
+
+	ipv6 = iface->config.ip.ipv6;
+	if (!ipv6) {
+		goto out;
+	}
+
+	ARRAY_FOR_EACH(ipv6->unicast, i) {
+		if (!ipv6->unicast[i].is_used ||
+		    ipv6->unicast[i].address.family != AF_INET6) {
+			continue;
+		}
+
+		if (net_ipv6_is_prefix(
+			    addr->s6_addr,
+			    ipv6->unicast[i].address.in6_addr.s6_addr,
+			    128)) {
+			ifaddr = &ipv6->unicast[i];
+			goto out;
+		}
+	}
+
+out:
+	net_if_unlock(iface);
+
+	return ifaddr;
+}
+
+int z_impl_net_if_ipv6_addr_lookup_by_index(const struct in6_addr *addr)
+{
+	struct net_if *iface = NULL;
+	struct net_if_addr *if_addr;
+
+	if_addr = net_if_ipv6_addr_lookup(addr, &iface);
+	if (!if_addr) {
+		return 0;
+	}
+
+	return net_if_get_by_iface(iface);
+}
+
+#ifdef CONFIG_USERSPACE
+static inline int z_vrfy_net_if_ipv6_addr_lookup_by_index(
+					  const struct in6_addr *addr)
+{
+	struct in6_addr addr_v6;
+
+	K_OOPS(k_usermode_from_copy(&addr_v6, (void *)addr, sizeof(addr_v6)));
+
+	return z_impl_net_if_ipv6_addr_lookup_by_index(&addr_v6);
+}
+#include <zephyr/syscalls/net_if_ipv6_addr_lookup_by_index_mrsh.c>
+#endif
+
 /* To be called when interface comes up so that all the non-joined multicast
  * groups are joined.
  */
@@ -1746,119 +1845,6 @@ static void address_start_timer(struct net_if_addr *ifaddr, uint32_t vlifetime)
 	net_timeout_set(&ifaddr->lifetime, vlifetime, k_uptime_get_32());
 	k_work_reschedule(&address_lifetime_timer, K_NO_WAIT);
 }
-#else /* CONFIG_NET_NATIVE_IPV6 */
-#define address_start_timer(...)
-static inline void net_if_ipv6_start_dad(struct net_if *iface,
-					 struct net_if_addr *ifaddr)
-{
-	ifaddr->addr_state = NET_ADDR_PREFERRED;
-}
-#define join_mcast_nodes(...)
-#endif /* CONFIG_NET_NATIVE_IPV6 */
-
-struct net_if_addr *net_if_ipv6_addr_lookup(const struct in6_addr *addr,
-					    struct net_if **ret)
-{
-	struct net_if_addr *ifaddr = NULL;
-
-	STRUCT_SECTION_FOREACH(net_if, iface) {
-		struct net_if_ipv6 *ipv6;
-
-		net_if_lock(iface);
-
-		ipv6 = iface->config.ip.ipv6;
-		if (!ipv6) {
-			net_if_unlock(iface);
-			continue;
-		}
-
-		ARRAY_FOR_EACH(ipv6->unicast, i) {
-			if (!ipv6->unicast[i].is_used ||
-			    ipv6->unicast[i].address.family != AF_INET6) {
-				continue;
-			}
-
-			if (net_ipv6_is_prefix(
-				    addr->s6_addr,
-				    ipv6->unicast[i].address.in6_addr.s6_addr,
-				    128)) {
-
-				if (ret) {
-					*ret = iface;
-				}
-
-				ifaddr = &ipv6->unicast[i];
-				net_if_unlock(iface);
-				goto out;
-			}
-		}
-
-		net_if_unlock(iface);
-	}
-
-out:
-	return ifaddr;
-}
-
-struct net_if_addr *net_if_ipv6_addr_lookup_by_iface(struct net_if *iface,
-						     struct in6_addr *addr)
-{
-	struct net_if_addr *ifaddr = NULL;
-	struct net_if_ipv6 *ipv6;
-
-	net_if_lock(iface);
-
-	ipv6 = iface->config.ip.ipv6;
-	if (!ipv6) {
-		goto out;
-	}
-
-	ARRAY_FOR_EACH(ipv6->unicast, i) {
-		if (!ipv6->unicast[i].is_used ||
-		    ipv6->unicast[i].address.family != AF_INET6) {
-			continue;
-		}
-
-		if (net_ipv6_is_prefix(
-			    addr->s6_addr,
-			    ipv6->unicast[i].address.in6_addr.s6_addr,
-			    128)) {
-			ifaddr = &ipv6->unicast[i];
-			goto out;
-		}
-	}
-
-out:
-	net_if_unlock(iface);
-
-	return ifaddr;
-}
-
-int z_impl_net_if_ipv6_addr_lookup_by_index(const struct in6_addr *addr)
-{
-	struct net_if *iface = NULL;
-	struct net_if_addr *if_addr;
-
-	if_addr = net_if_ipv6_addr_lookup(addr, &iface);
-	if (!if_addr) {
-		return 0;
-	}
-
-	return net_if_get_by_iface(iface);
-}
-
-#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_net_if_ipv6_addr_lookup_by_index(
-					  const struct in6_addr *addr)
-{
-	struct in6_addr addr_v6;
-
-	K_OOPS(k_usermode_from_copy(&addr_v6, (void *)addr, sizeof(addr_v6)));
-
-	return z_impl_net_if_ipv6_addr_lookup_by_index(&addr_v6);
-}
-#include <zephyr/syscalls/net_if_ipv6_addr_lookup_by_index_mrsh.c>
-#endif
 
 void net_if_ipv6_addr_update_lifetime(struct net_if_addr *ifaddr,
 				      uint32_t vlifetime)
@@ -2321,139 +2307,27 @@ void net_if_ipv6_maddr_join(struct net_if *iface, struct net_if_mcast_addr *addr
 	net_if_unlock(iface);
 }
 
-struct in6_addr *net_if_ipv6_get_ll(struct net_if *iface,
-				    enum net_addr_state addr_state)
+static void remove_prefix_addresses(struct net_if *iface,
+				    struct net_if_ipv6 *ipv6,
+				    struct in6_addr *addr,
+				    uint8_t len)
 {
-	struct in6_addr *addr = NULL;
-	struct net_if_ipv6 *ipv6;
-
-	net_if_lock(iface);
-
-	ipv6 = iface->config.ip.ipv6;
-	if (!ipv6) {
-		goto out;
-	}
-
 	ARRAY_FOR_EACH(ipv6->unicast, i) {
 		if (!ipv6->unicast[i].is_used ||
-		    (addr_state != NET_ADDR_ANY_STATE &&
-		     ipv6->unicast[i].addr_state != addr_state) ||
-		    ipv6->unicast[i].address.family != AF_INET6) {
+		    ipv6->unicast[i].address.family != AF_INET6 ||
+		    ipv6->unicast[i].addr_type != NET_ADDR_AUTOCONF) {
 			continue;
 		}
 
-		if (net_ipv6_is_ll_addr(&ipv6->unicast[i].address.in6_addr)) {
-			addr = &ipv6->unicast[i].address.in6_addr;
-			goto out;
+		if (net_ipv6_is_prefix(
+				addr->s6_addr,
+				ipv6->unicast[i].address.in6_addr.s6_addr,
+				len)) {
+			net_if_ipv6_addr_rm(iface,
+					    &ipv6->unicast[i].address.in6_addr);
 		}
 	}
-
-out:
-	net_if_unlock(iface);
-
-	return addr;
-}
-
-struct in6_addr *net_if_ipv6_get_ll_addr(enum net_addr_state state,
-					 struct net_if **iface)
-{
-	struct in6_addr *addr = NULL;
-
-	STRUCT_SECTION_FOREACH(net_if, tmp) {
-		net_if_lock(tmp);
-
-		addr = net_if_ipv6_get_ll(tmp, state);
-		if (addr) {
-			if (iface) {
-				*iface = tmp;
-			}
-
-			net_if_unlock(tmp);
-			goto out;
-		}
-
-		net_if_unlock(tmp);
-	}
-
-out:
-	return addr;
-}
-
-static inline struct in6_addr *check_global_addr(struct net_if *iface,
-						 enum net_addr_state state)
-{
-	struct net_if_ipv6 *ipv6 = iface->config.ip.ipv6;
-
-	if (!ipv6) {
-		return NULL;
-	}
-
-	ARRAY_FOR_EACH(ipv6->unicast, i) {
-		if (!ipv6->unicast[i].is_used ||
-		    (ipv6->unicast[i].addr_state != state) ||
-		    ipv6->unicast[i].address.family != AF_INET6) {
-			continue;
-		}
-
-		if (!net_ipv6_is_ll_addr(&ipv6->unicast[i].address.in6_addr)) {
-			return &ipv6->unicast[i].address.in6_addr;
-		}
-	}
-
-	return NULL;
-}
-
-struct in6_addr *net_if_ipv6_get_global_addr(enum net_addr_state state,
-					     struct net_if **iface)
-{
-	struct in6_addr *addr = NULL;
-
-	STRUCT_SECTION_FOREACH(net_if, tmp) {
-		if (iface && *iface && tmp != *iface) {
-			continue;
-		}
-
-		net_if_lock(tmp);
-		addr = check_global_addr(tmp, state);
-		if (addr) {
-			if (iface) {
-				*iface = tmp;
-			}
-
-			net_if_unlock(tmp);
-			goto out;
-		}
-
-		net_if_unlock(tmp);
-	}
-
-out:
-
-	return addr;
-}
-
-#if defined(CONFIG_NET_NATIVE_IPV6)
-static void remove_prefix_addresses(struct net_if *iface,
-				    struct net_if_ipv6 *ipv6,
-				    struct in6_addr *addr,
-				    uint8_t len)
-{
-	ARRAY_FOR_EACH(ipv6->unicast, i) {
-		if (!ipv6->unicast[i].is_used ||
-		    ipv6->unicast[i].address.family != AF_INET6 ||
-		    ipv6->unicast[i].addr_type != NET_ADDR_AUTOCONF) {
-			continue;
-		}
-
-		if (net_ipv6_is_prefix(
-				addr->s6_addr,
-				ipv6->unicast[i].address.in6_addr.s6_addr,
-				len)) {
-			net_if_ipv6_addr_rm(iface,
-					    &ipv6->unicast[i].address.in6_addr);
-		}
-	}
-}
+}
 
 static void prefix_lifetime_expired(struct net_if_ipv6_prefix *ifprefix)
 {
@@ -2978,6 +2852,117 @@ void net_if_ipv6_set_hop_limit(struct net_if *iface, uint8_t hop_limit)
 	net_if_unlock(iface);
 }
 
+struct in6_addr *net_if_ipv6_get_ll(struct net_if *iface,
+				    enum net_addr_state addr_state)
+{
+	struct in6_addr *addr = NULL;
+	struct net_if_ipv6 *ipv6;
+
+	net_if_lock(iface);
+
+	ipv6 = iface->config.ip.ipv6;
+	if (!ipv6) {
+		goto out;
+	}
+
+	ARRAY_FOR_EACH(ipv6->unicast, i) {
+		if (!ipv6->unicast[i].is_used ||
+		    (addr_state != NET_ADDR_ANY_STATE &&
+		     ipv6->unicast[i].addr_state != addr_state) ||
+		    ipv6->unicast[i].address.family != AF_INET6) {
+			continue;
+		}
+
+		if (net_ipv6_is_ll_addr(&ipv6->unicast[i].address.in6_addr)) {
+			addr = &ipv6->unicast[i].address.in6_addr;
+			goto out;
+		}
+	}
+
+out:
+	net_if_unlock(iface);
+
+	return addr;
+}
+
+struct in6_addr *net_if_ipv6_get_ll_addr(enum net_addr_state state,
+					 struct net_if **iface)
+{
+	struct in6_addr *addr = NULL;
+
+	STRUCT_SECTION_FOREACH(net_if, tmp) {
+		net_if_lock(tmp);
+
+		addr = net_if_ipv6_get_ll(tmp, state);
+		if (addr) {
+			if (iface) {
+				*iface = tmp;
+			}
+
+			net_if_unlock(tmp);
+			goto out;
+		}
+
+		net_if_unlock(tmp);
+	}
+
+out:
+	return addr;
+}
+
+static inline struct in6_addr *check_global_addr(struct net_if *iface,
+						 enum net_addr_state state)
+{
+	struct net_if_ipv6 *ipv6 = iface->config.ip.ipv6;
+
+	if (!ipv6) {
+		return NULL;
+	}
+
+	ARRAY_FOR_EACH(ipv6->unicast, i) {
+		if (!ipv6->unicast[i].is_used ||
+		    (ipv6->unicast[i].addr_state != state) ||
+		    ipv6->unicast[i].address.family != AF_INET6) {
+			continue;
+		}
+
+		if (!net_ipv6_is_ll_addr(&ipv6->unicast[i].address.in6_addr)) {
+			return &ipv6->unicast[i].address.in6_addr;
+		}
+	}
+
+	return NULL;
+}
+
+struct in6_addr *net_if_ipv6_get_global_addr(enum net_addr_state state,
+					     struct net_if **iface)
+{
+	struct in6_addr *addr = NULL;
+
+	STRUCT_SECTION_FOREACH(net_if, tmp) {
+		if (iface && *iface && tmp != *iface) {
+			continue;
+		}
+
+		net_if_lock(tmp);
+		addr = check_global_addr(tmp, state);
+		if (addr) {
+			if (iface) {
+				*iface = tmp;
+			}
+
+			net_if_unlock(tmp);
+			goto out;
+		}
+
+		net_if_unlock(tmp);
+	}
+
+out:
+
+	return addr;
+}
+
 static uint8_t get_diff_ipv6(const struct in6_addr *src,
 			  const struct in6_addr *dst)
 {
@@ -3279,8 +3264,17 @@ static void iface_ipv6_init(int if_count)
 		net_if_ipv6_set_reachable_time(&ipv6_addresses[i].ipv6);
 	}
 }
-#endif /* CONFIG_NET_NATIVE_IPV6 */
-#else /* CONFIG_NET_IPV6 */
+
+#else /* CONFIG_NET_NATIVE_IPV6 */
+#define join_mcast_allnodes(...)
+#define join_mcast_solicit_node(...)
+#define leave_mcast_all(...)
+#define clear_joined_ipv6_mcast_groups(...)
+#define join_mcast_nodes(...)
+#define iface_ipv6_start(...)
+#define iface_ipv6_stop(...)
+#define iface_ipv6_init(...)
+
 struct net_if_mcast_addr *net_if_ipv6_maddr_lookup(const struct in6_addr *addr,
 						   struct net_if **iface)
 {
@@ -3307,18 +3301,9 @@ struct in6_addr *net_if_ipv6_get_global_addr(enum net_addr_state state,
 
 	return NULL;
 }
-#endif /* CONFIG_NET_IPV6 */
-
-#if !defined(CONFIG_NET_NATIVE_IPV6)
-#define join_mcast_allnodes(...)
-#define leave_mcast_all(...)
-#define clear_joined_ipv6_mcast_groups(...)
-#define iface_ipv6_start(...)
-#define iface_ipv6_stop(...)
-#define iface_ipv6_init(...)
-#endif /* !CONFIG_NET_NATIVE_IPV4 */
+#endif /* CONFIG_NET_NATIVE_IPV6 */
 
-#if defined(CONFIG_NET_IPV4)
+#if defined(CONFIG_NET_NATIVE_IPV4)
 int net_if_config_ipv4_get(struct net_if *iface, struct net_if_ipv4 **ipv4)
 {
 	int ret = 0;
@@ -3404,6 +3389,107 @@ int net_if_config_ipv4_put(struct net_if *iface)
 	return ret;
 }
 
+uint8_t net_if_ipv4_get_ttl(struct net_if *iface)
+{
+	int ret = 0;
+
+	net_if_lock(iface);
+
+	if (net_if_config_ipv4_get(iface, NULL) < 0) {
+		goto out;
+	}
+
+	if (!iface->config.ip.ipv4) {
+		goto out;
+	}
+
+	ret = iface->config.ip.ipv4->ttl;
+out:
+	net_if_unlock(iface);
+
+	return ret;
+}
+
+void net_if_ipv4_set_ttl(struct net_if *iface, uint8_t ttl)
+{
+	net_if_lock(iface);
+
+	if (net_if_config_ipv4_get(iface, NULL) < 0) {
+		goto out;
+	}
+
+	if (!iface->config.ip.ipv4) {
+		goto out;
+	}
+
+	iface->config.ip.ipv4->ttl = ttl;
+out:
+	net_if_unlock(iface);
+}
+
+uint8_t net_if_ipv4_get_mcast_ttl(struct net_if *iface)
+{
+	int ret = 0;
+
+	net_if_lock(iface);
+
+	if (net_if_config_ipv4_get(iface, NULL) < 0) {
+		goto out;
+	}
+
+	if (!iface->config.ip.ipv4) {
+		goto out;
+	}
+
+	ret = iface->config.ip.ipv4->mcast_ttl;
+out:
+	net_if_unlock(iface);
+
+	return ret;
+}
+
+void net_if_ipv4_set_mcast_ttl(struct net_if *iface, uint8_t ttl)
+{
+	net_if_lock(iface);
+
+	if (net_if_config_ipv4_get(iface, NULL) < 0) {
+		goto out;
+	}
+
+	if (!iface->config.ip.ipv4) {
+		goto out;
+	}
+
+	iface->config.ip.ipv4->mcast_ttl = ttl;
+out:
+	net_if_unlock(iface);
+}
+
+struct net_if_router *net_if_ipv4_router_lookup(struct net_if *iface,
+						struct in_addr *addr)
+{
+	return iface_router_lookup(iface, AF_INET, addr);
+}
+
+struct net_if_router *net_if_ipv4_router_find_default(struct net_if *iface,
+						      struct in_addr *addr)
+{
+	return iface_router_find_default(iface, AF_INET, addr);
+}
+
+struct net_if_router *net_if_ipv4_router_add(struct net_if *iface,
+					     struct in_addr *addr,
+					     bool is_default,
+					     uint16_t lifetime)
+{
+	return iface_router_add(iface, AF_INET, addr, is_default, lifetime);
+}
+
+bool net_if_ipv4_router_rm(struct net_if_router *router)
+{
+	return iface_router_rm(router);
+}
+
 bool net_if_ipv4_addr_mask_cmp(struct net_if *iface,
 			       const struct in_addr *addr)
 {
@@ -4593,109 +4679,6 @@ void net_if_ipv4_maddr_join(struct net_if *iface, struct net_if_mcast_addr *addr
 	net_if_unlock(iface);
 }
 
-#if defined(CONFIG_NET_NATIVE_IPV4)
-uint8_t net_if_ipv4_get_ttl(struct net_if *iface)
-{
-	int ret = 0;
-
-	net_if_lock(iface);
-
-	if (net_if_config_ipv4_get(iface, NULL) < 0) {
-		goto out;
-	}
-
-	if (!iface->config.ip.ipv4) {
-		goto out;
-	}
-
-	ret = iface->config.ip.ipv4->ttl;
-out:
-	net_if_unlock(iface);
-
-	return ret;
-}
-
-void net_if_ipv4_set_ttl(struct net_if *iface, uint8_t ttl)
-{
-	net_if_lock(iface);
-
-	if (net_if_config_ipv4_get(iface, NULL) < 0) {
-		goto out;
-	}
-
-	if (!iface->config.ip.ipv4) {
-		goto out;
-	}
-
-	iface->config.ip.ipv4->ttl = ttl;
-out:
-	net_if_unlock(iface);
-}
-
-uint8_t net_if_ipv4_get_mcast_ttl(struct net_if *iface)
-{
-	int ret = 0;
-
-	net_if_lock(iface);
-
-	if (net_if_config_ipv4_get(iface, NULL) < 0) {
-		goto out;
-	}
-
-	if (!iface->config.ip.ipv4) {
-		goto out;
-	}
-
-	ret = iface->config.ip.ipv4->mcast_ttl;
-out:
-	net_if_unlock(iface);
-
-	return ret;
-}
-
-void net_if_ipv4_set_mcast_ttl(struct net_if *iface, uint8_t ttl)
-{
-	net_if_lock(iface);
-
-	if (net_if_config_ipv4_get(iface, NULL) < 0) {
-		goto out;
-	}
-
-	if (!iface->config.ip.ipv4) {
-		goto out;
-	}
-
-	iface->config.ip.ipv4->mcast_ttl = ttl;
-out:
-	net_if_unlock(iface);
-}
-
-struct net_if_router *net_if_ipv4_router_lookup(struct net_if *iface,
-						struct in_addr *addr)
-{
-	return iface_router_lookup(iface, AF_INET, addr);
-}
-
-struct net_if_router *net_if_ipv4_router_find_default(struct net_if *iface,
-						      struct in_addr *addr)
-{
-	return iface_router_find_default(iface, AF_INET, addr);
-}
-
-struct net_if_router *net_if_ipv4_router_add(struct net_if *iface,
-					     struct in_addr *addr,
-					     bool is_default,
-					     uint16_t lifetime)
-{
-	return iface_router_add(iface, AF_INET, addr, is_default, lifetime);
-}
-
-bool net_if_ipv4_router_rm(struct net_if_router *router)
-{
-	return iface_router_rm(router);
-}
-
-
 static void iface_ipv4_init(int if_count)
 {
 	int i;
@@ -4742,8 +4725,13 @@ static void iface_ipv4_start(struct net_if *iface)
 		net_if_start_acd(iface);
 	}
 }
-#endif /* CONFIG_NET_NATIVE_IPV4 */
-#else  /* CONFIG_NET_IPV4 */
+
+
+#else /* CONFIG_NET_NATIVE_IPV4 */
+#define leave_ipv4_mcast_all(...)
+#define iface_ipv4_init(...)
+#define iface_ipv4_start(...)
+
 struct net_if_mcast_addr *net_if_ipv4_maddr_lookup(const struct in_addr *addr,
 						   struct net_if **iface)
 {
@@ -4770,13 +4758,7 @@ struct in_addr *net_if_ipv4_get_global_addr(struct net_if *iface,
 
 	return NULL;
 }
-#endif /* CONFIG_NET_IPV4 */
-
-#if !defined(CONFIG_NET_NATIVE_IPV4)
-#define leave_ipv4_mcast_all(...)
-#define iface_ipv4_init(...)
-#define iface_ipv4_start(...)
-#endif /* !CONFIG_NET_NATIVE_IPV4 */
+#endif /* CONFIG_NET_NATIVE_IPV4 */
 
 struct net_if *net_if_select_src_iface(const struct sockaddr *dst)
 {
@@ -4815,15 +4797,12 @@ static struct net_if_addr *get_ifaddr(struct net_if *iface,
 
 	if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) {
 		struct net_if_ipv6 *ipv6 =
-			COND_CODE_1(CONFIG_NET_IPV6, (iface->config.ip.ipv6), (NULL));
+			COND_CODE_1(CONFIG_NET_NATIVE_IPV6, (iface->config.ip.ipv6), (NULL));
+
 		struct in6_addr maddr;
 		unsigned int maddr_count = 0;
 		int found = -1;
 
-		if (ipv6 == NULL) {
-			goto out;
-		}
-
 		net_ipv6_addr_create_solicited_node((struct in6_addr *)addr,
 						    &maddr);
 
@@ -4865,11 +4844,7 @@ static struct net_if_addr *get_ifaddr(struct net_if *iface,
 
 	if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) {
 		struct net_if_ipv4 *ipv4 =
-			COND_CODE_1(CONFIG_NET_IPV4, (iface->config.ip.ipv4), (NULL));
-
-		if (ipv4 == NULL) {
-			goto out;
-		}
+			COND_CODE_1(CONFIG_NET_NATIVE_IPV4, (iface->config.ip.ipv4), (NULL));
 
 		ARRAY_FOR_EACH(ipv4->unicast, i) {
 			if (!ipv4->unicast[i].ipv4.is_used) {
@@ -4901,7 +4876,7 @@ static void remove_ipv6_ifaddr(struct net_if *iface,
 
 	net_if_lock(iface);
 
-	ipv6 = COND_CODE_1(CONFIG_NET_IPV6, (iface->config.ip.ipv6), (NULL));
+	ipv6 = COND_CODE_1(CONFIG_NET_NATIVE_IPV6, (iface->config.ip.ipv6), (NULL));
 	if (!ipv6) {
 		goto out;
 	}
@@ -4959,7 +4934,7 @@ static void remove_ipv4_ifaddr(struct net_if *iface,
 
 	net_if_lock(iface);
 
-	ipv4 = COND_CODE_1(CONFIG_NET_IPV4, (iface->config.ip.ipv4), (NULL));
+	ipv4 = COND_CODE_1(CONFIG_NET_NATIVE_IPV4, (iface->config.ip.ipv4), (NULL));
 	if (!ipv4) {
 		goto out;
 	}

From e173424de4485a86d3c8637c913c6853bafa7cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:04 +0100
Subject: [PATCH 1955/2913] Revert "[nrf fromtree] net: ipv4: Make native IPv4
 options dependent on NET_NATIVE_IPV4"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 40fca325dada70156515863dcefa06713c382a91.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/ip/Kconfig      |  2 +-
 subsys/net/ip/Kconfig.ipv4 | 43 ++++++++++++++++++--------------------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/subsys/net/ip/Kconfig b/subsys/net/ip/Kconfig
index cb08b3846ca..8e525d5ecc5 100644
--- a/subsys/net/ip/Kconfig
+++ b/subsys/net/ip/Kconfig
@@ -168,7 +168,7 @@ config NET_IPV4_MAPPING_TO_IPV6
 config NET_SHELL
 	bool "Network shell utilities"
 	select SHELL
-	select NET_IPV4_IGMP if NET_NATIVE_IPV4
+	select NET_IPV4_IGMP if NET_IPV4
 	select REQUIRES_FLOAT_PRINTF
 	help
 	  Activate shell module that provides network commands like
diff --git a/subsys/net/ip/Kconfig.ipv4 b/subsys/net/ip/Kconfig.ipv4
index 77c29c8966c..a108a015fbe 100644
--- a/subsys/net/ip/Kconfig.ipv4
+++ b/subsys/net/ip/Kconfig.ipv4
@@ -11,28 +11,6 @@ menuconfig NET_IPV4
 
 if NET_IPV4
 
-config NET_IF_MAX_IPV4_COUNT
-	int "Max number of IPv4 network interfaces in the system"
-	default NET_VLAN_COUNT if NET_VLAN
-	default 2 if NET_LOOPBACK
-	default 1
-	help
-	  This tells how many network interfaces there will be in the system
-	  that will have IPv4 enabled.
-
-config NET_IF_UNICAST_IPV4_ADDR_COUNT
-	int "Max number of unicast IPv4 addresses per network interface"
-	default 2 if NET_IPV4_AUTO
-	default 2 if NET_LOOPBACK
-	default 1
-
-config NET_IF_MCAST_IPV4_ADDR_COUNT
-	int "Max number of multicast IPv4 addresses per network interface"
-	default 2 if NET_IPV4_IGMP
-	default 1
-
-if NET_NATIVE_IPV4
-
 config NET_INITIAL_TTL
 	int "Initial IPv4 time to live value for unicast packets"
 	default 64
@@ -56,6 +34,26 @@ config NET_INITIAL_MCAST_TTL
 	  don't leave the local network unless the application explicitly
 	  requests it.
 
+config NET_IF_MAX_IPV4_COUNT
+	int "Max number of IPv4 network interfaces in the system"
+	default NET_VLAN_COUNT if NET_VLAN
+	default 2 if NET_LOOPBACK
+	default 1
+	help
+	  This tells how many network interfaces there will be in the system
+	  that will have IPv4 enabled.
+
+config NET_IF_UNICAST_IPV4_ADDR_COUNT
+	int "Max number of unicast IPv4 addresses per network interface"
+	default 2 if NET_IPV4_AUTO
+	default 2 if NET_LOOPBACK
+	default 1
+
+config NET_IF_MCAST_IPV4_ADDR_COUNT
+	int "Max number of multicast IPv4 addresses per network interface"
+	default 2 if NET_IPV4_IGMP
+	default 1
+
 config NET_IF_MCAST_IPV4_SOURCE_COUNT
 	int "Max number of IPv4 sources per mcast address to be included or excluded"
 	default 1
@@ -179,5 +177,4 @@ module-help = Enable debug diagnostic from IPv4 autoconf client.
 source "subsys/net/Kconfig.template.log_config.net"
 endif # NET_IPV4_AUTO
 
-endif # NET_NATIVE_IPV4
 endif # NET_IPV4

From 09e87d8b6a53d6c69f05a4520a3d536031845eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:04 +0100
Subject: [PATCH 1956/2913] Revert "[nrf fromtree] Bluetooth: Host: Fix issue
 where uninitialized value was used"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9f305076fc328cb702295ac96e9c288a37a70b66.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/host/id.c                          | 13 ++++++-------
 .../src/test_suite_invalid_inputs.c                 |  3 +++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/subsys/bluetooth/host/id.c b/subsys/bluetooth/host/id.c
index 7f2f154a08e..6261e1fabb7 100644
--- a/subsys/bluetooth/host/id.c
+++ b/subsys/bluetooth/host/id.c
@@ -1785,13 +1785,6 @@ int bt_id_set_scan_own_addr(bool active_scan, uint8_t *own_addr_type)
 	}
 
 	if (IS_ENABLED(CONFIG_BT_PRIVACY)) {
-
-		if (BT_FEAT_LE_PRIVACY(bt_dev.le.features)) {
-			*own_addr_type = BT_HCI_OWN_ADDR_RPA_OR_RANDOM;
-		} else {
-			*own_addr_type = BT_ADDR_LE_RANDOM;
-		}
-
 		err = bt_id_set_private_addr(BT_ID_DEFAULT);
 		if (err == -EACCES && (atomic_test_bit(bt_dev.flags, BT_DEV_SCANNING) ||
 				       atomic_test_bit(bt_dev.flags, BT_DEV_INITIATING))) {
@@ -1801,6 +1794,12 @@ int bt_id_set_scan_own_addr(bool active_scan, uint8_t *own_addr_type)
 		} else if (err) {
 			return err;
 		}
+
+		if (BT_FEAT_LE_PRIVACY(bt_dev.le.features)) {
+			*own_addr_type = BT_HCI_OWN_ADDR_RPA_OR_RANDOM;
+		} else {
+			*own_addr_type = BT_ADDR_LE_RANDOM;
+		}
 	} else {
 		*own_addr_type = bt_dev.id_addr[0].type;
 
diff --git a/tests/bluetooth/host/id/bt_id_set_scan_own_addr/src/test_suite_invalid_inputs.c b/tests/bluetooth/host/id/bt_id_set_scan_own_addr/src/test_suite_invalid_inputs.c
index 367cf3296a3..4a31b946f46 100644
--- a/tests/bluetooth/host/id/bt_id_set_scan_own_addr/src/test_suite_invalid_inputs.c
+++ b/tests/bluetooth/host/id/bt_id_set_scan_own_addr/src/test_suite_invalid_inputs.c
@@ -110,6 +110,7 @@ ZTEST(bt_id_set_scan_own_addr_invalid_inputs, test_set_random_address_fails)
  *  Expected behaviour:
  *   - bt_id_set_scan_own_addr() fails and returns the same error code returned by
  *     bt_id_set_private_addr()
+ *   - Address type reference isn't set
  */
 ZTEST(bt_id_set_scan_own_addr_invalid_inputs, test_bt_id_set_private_addr_fails_privacy_enabled)
 {
@@ -130,4 +131,6 @@ ZTEST(bt_id_set_scan_own_addr_invalid_inputs, test_bt_id_set_private_addr_fails_
 #endif
 
 	zassert_true(err < 0, "Unexpected error code '%d' was returned", err);
+	zassert_true(own_addr_type == BT_ADDR_LE_ANONYMOUS,
+		     "Address type reference was unexpectedly modified");
 }

From b6db6f51ef0436f27f0e069830b7a4983163c213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:04 +0100
Subject: [PATCH 1957/2913] Revert "[nrf fromtree] manifest: Fix compilation
 warnings in hostap"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f287d2d7f4c7e8c444246119b8c8473e1c13d7e3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 78533e8b51f..4637fb5fcdc 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: 9896a2ea803ec62e0998c0e569f12af88537d647
+      revision: 291e1cd0dfad83ec02826adf48dd6db69c3471ca
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From 73d010120e1fb82ba5c47ceb87275b9342f55e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:04 +0100
Subject: [PATCH 1958/2913] Revert "[nrf fromtree] manifest: Pull PRF-256 PSA
 based wrapper API for supplicant"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b19fb2f24f0a637669ee9be33bf6a3bcea09dabc.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 4637fb5fcdc..df5abf02595 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: 291e1cd0dfad83ec02826adf48dd6db69c3471ca
+      revision: f801840e246f47c9e895c540d0784f09726136c4
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From e414ecb429e581c498c9e4294dc0f32cfaa0480c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:04 +0100
Subject: [PATCH 1959/2913] Revert "[nrf fromtree] west: hostap: update hostap
 revision to PR"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 70a55ee64ddcdd70550eb22ee48a727b7dfe7a76.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index df5abf02595..241102be58f 100644
--- a/west.yml
+++ b/west.yml
@@ -259,7 +259,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: f801840e246f47c9e895c540d0784f09726136c4
+      revision: cbae0170437dbe196d436b2b53d7aefb97044b0c
     - name: libmetal
       revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b
       path: modules/hal/libmetal

From fc143ccdf38581ccaad212a22f92fcd86f518793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:04 +0100
Subject: [PATCH 1960/2913] Revert "[nrf fromtree] logging: Fix LOG_OUTPUT
 dependency"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ea1b04e7f7e2c4cb9db05410d0d4e972b2230d1d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/logging/Kconfig.template.log_format_config | 1 -
 subsys/logging/backends/Kconfig.adsp              | 1 +
 subsys/logging/backends/Kconfig.adsp_mtrace       | 1 +
 subsys/logging/backends/Kconfig.ble               | 1 +
 subsys/logging/backends/Kconfig.efi_console       | 1 +
 subsys/logging/backends/Kconfig.fs                | 1 +
 subsys/logging/backends/Kconfig.native_posix      | 1 +
 subsys/logging/backends/Kconfig.net               | 1 +
 subsys/logging/backends/Kconfig.rtt               | 1 +
 subsys/logging/backends/Kconfig.semihost          | 1 +
 subsys/logging/backends/Kconfig.spinel            | 1 +
 subsys/logging/backends/Kconfig.swo               | 1 +
 subsys/logging/backends/Kconfig.uart              | 1 +
 subsys/logging/backends/Kconfig.xtensa_sim        | 1 +
 14 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/subsys/logging/Kconfig.template.log_format_config b/subsys/logging/Kconfig.template.log_format_config
index 3a5a97c948f..14e112e4879 100644
--- a/subsys/logging/Kconfig.template.log_format_config
+++ b/subsys/logging/Kconfig.template.log_format_config
@@ -7,7 +7,6 @@ choice "LOG_BACKEND_$(backend)_OUTPUT"
 
 config LOG_BACKEND_$(backend)_OUTPUT_TEXT
 	bool "Text"
-	select LOG_OUTPUT
 	help
 	  Output in text.
 
diff --git a/subsys/logging/backends/Kconfig.adsp b/subsys/logging/backends/Kconfig.adsp
index 97856827c8a..67b37856ec5 100644
--- a/subsys/logging/backends/Kconfig.adsp
+++ b/subsys/logging/backends/Kconfig.adsp
@@ -4,6 +4,7 @@
 config LOG_BACKEND_ADSP
 	bool "Intel ADSP buffer backend"
 	depends on SOC_FAMILY_INTEL_ADSP
+	select LOG_OUTPUT
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
 	  Enable backend for the host trace protocol of the Intel ADSP
diff --git a/subsys/logging/backends/Kconfig.adsp_mtrace b/subsys/logging/backends/Kconfig.adsp_mtrace
index 98a63b62100..18d570c9a8d 100644
--- a/subsys/logging/backends/Kconfig.adsp_mtrace
+++ b/subsys/logging/backends/Kconfig.adsp_mtrace
@@ -4,6 +4,7 @@
 config LOG_BACKEND_ADSP_MTRACE
 	bool "Intel ADSP mtrace backend"
 	depends on SOC_FAMILY_INTEL_ADSP
+	select LOG_OUTPUT
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
 	  Provide a logging backend which writes to SRAM window
diff --git a/subsys/logging/backends/Kconfig.ble b/subsys/logging/backends/Kconfig.ble
index 378577891f7..016573c0f7b 100644
--- a/subsys/logging/backends/Kconfig.ble
+++ b/subsys/logging/backends/Kconfig.ble
@@ -5,6 +5,7 @@ config LOG_BACKEND_BLE
 	bool "Bluetooth Low Energy (BLE) backend"
 	depends on BT
 	depends on LOG_PROCESS_THREAD_STACK_SIZE>=2048
+	select LOG_OUTPUT
 	select EXPERIMENTAL
 	help
 	  Backend that sends log messages over Bluetooth LE Notifications. This
diff --git a/subsys/logging/backends/Kconfig.efi_console b/subsys/logging/backends/Kconfig.efi_console
index ddace16ae8c..13d873dfc8e 100644
--- a/subsys/logging/backends/Kconfig.efi_console
+++ b/subsys/logging/backends/Kconfig.efi_console
@@ -4,6 +4,7 @@
 config LOG_BACKEND_EFI_CONSOLE
 	bool "EFI_CONSOLE backend"
 	depends on X86_EFI_CONSOLE
+	select LOG_OUTPUT
 	default y if !UART_CONSOLE
 	help
 	  When enabled backend is using EFI CONSOLE to output logs.
diff --git a/subsys/logging/backends/Kconfig.fs b/subsys/logging/backends/Kconfig.fs
index 185014283cc..d424f781ab1 100644
--- a/subsys/logging/backends/Kconfig.fs
+++ b/subsys/logging/backends/Kconfig.fs
@@ -4,6 +4,7 @@
 config LOG_BACKEND_FS
 	bool "File system backend"
 	depends on FILE_SYSTEM
+	select LOG_OUTPUT
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
 	  When enabled, backend is using the configured file system to output logs.
diff --git a/subsys/logging/backends/Kconfig.native_posix b/subsys/logging/backends/Kconfig.native_posix
index 776e9ce54ad..8d566124f81 100644
--- a/subsys/logging/backends/Kconfig.native_posix
+++ b/subsys/logging/backends/Kconfig.native_posix
@@ -5,6 +5,7 @@ config LOG_BACKEND_NATIVE_POSIX
 	bool "Native backend"
 	depends on ARCH_POSIX
 	default y
+	select LOG_OUTPUT
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
 	  Enable backend in native_posix
diff --git a/subsys/logging/backends/Kconfig.net b/subsys/logging/backends/Kconfig.net
index 5d7c8a4d919..5c91b68b166 100644
--- a/subsys/logging/backends/Kconfig.net
+++ b/subsys/logging/backends/Kconfig.net
@@ -6,6 +6,7 @@
 config LOG_BACKEND_NET
 	bool "Networking backend"
 	depends on NETWORKING && (NET_UDP || NET_TCP) && !LOG_MODE_IMMEDIATE
+	select LOG_OUTPUT
 	help
 	  Send syslog messages to network server.
 	  See RFC 5424 (syslog protocol) and RFC 5426 (syslog over UDP) and
diff --git a/subsys/logging/backends/Kconfig.rtt b/subsys/logging/backends/Kconfig.rtt
index e275f9b18f2..87e8f46a0de 100644
--- a/subsys/logging/backends/Kconfig.rtt
+++ b/subsys/logging/backends/Kconfig.rtt
@@ -6,6 +6,7 @@ config LOG_BACKEND_RTT
 	depends on USE_SEGGER_RTT
 	default y if !SHELL_BACKEND_RTT
 	select SEGGER_RTT_CUSTOM_LOCKING
+	select LOG_OUTPUT
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
 	  When enabled, backend will use RTT for logging. This backend works on a per
diff --git a/subsys/logging/backends/Kconfig.semihost b/subsys/logging/backends/Kconfig.semihost
index 7861fce8a63..10a6da8f2e7 100644
--- a/subsys/logging/backends/Kconfig.semihost
+++ b/subsys/logging/backends/Kconfig.semihost
@@ -4,6 +4,7 @@
 config LOG_BACKEND_SEMIHOST
 	bool "Semihost as backend"
 	depends on SEMIHOST
+	select LOG_OUTPUT
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
 	  Enable backend in semihost (using host stdout)
diff --git a/subsys/logging/backends/Kconfig.spinel b/subsys/logging/backends/Kconfig.spinel
index d2d29370aa3..6174abb6122 100644
--- a/subsys/logging/backends/Kconfig.spinel
+++ b/subsys/logging/backends/Kconfig.spinel
@@ -5,6 +5,7 @@ config LOG_BACKEND_SPINEL
 	bool "OpenThread dedicated Spinel protocol backend"
 	depends on !LOG_BACKEND_UART
 	depends on NET_L2_OPENTHREAD
+	select LOG_OUTPUT
 	help
 	  When enabled, backend will use OpenThread dedicated SPINEL protocol for logging.
 	  This protocol is byte oriented and wraps given messages into serial frames.
diff --git a/subsys/logging/backends/Kconfig.swo b/subsys/logging/backends/Kconfig.swo
index 5fabe50b62e..dc38041fead 100644
--- a/subsys/logging/backends/Kconfig.swo
+++ b/subsys/logging/backends/Kconfig.swo
@@ -4,6 +4,7 @@
 config LOG_BACKEND_SWO
 	bool "Serial Wire Output (SWO) backend"
 	depends on HAS_SWO
+	select LOG_OUTPUT
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
 	  When enabled, backend will use SWO for logging.
diff --git a/subsys/logging/backends/Kconfig.uart b/subsys/logging/backends/Kconfig.uart
index e7325c633e8..954168d93ed 100644
--- a/subsys/logging/backends/Kconfig.uart
+++ b/subsys/logging/backends/Kconfig.uart
@@ -5,6 +5,7 @@ config LOG_BACKEND_UART
 	bool "UART backend"
 	depends on UART_CONSOLE
 	default y if !SHELL_BACKEND_SERIAL && !SHELL_BACKEND_RTT
+	select LOG_OUTPUT
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
 	  When enabled backend is using UART to output logs.
diff --git a/subsys/logging/backends/Kconfig.xtensa_sim b/subsys/logging/backends/Kconfig.xtensa_sim
index 6b81914cf2d..cdf1526f00b 100644
--- a/subsys/logging/backends/Kconfig.xtensa_sim
+++ b/subsys/logging/backends/Kconfig.xtensa_sim
@@ -5,6 +5,7 @@ config LOG_BACKEND_XTENSA_SIM
 	bool "Xtensa simulator backend"
 	depends on SOC_XTENSA_SAMPLE_CONTROLLER || SOC_XTENSA_DC233C || SOC_FAMILY_INTEL_ADSP
 	default y if SOC_XTENSA_SAMPLE_CONTROLLER || SOC_XTENSA_DC233C
+	select LOG_OUTPUT
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
 	  Enable backend in xtensa simulator

From b8d9d7ce925b182881806930e92c341a900e8cd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:04 +0100
Subject: [PATCH 1961/2913] Revert "[nrf fromtree] logging: log_output: Move
 flushing and writing to the header"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3e5c5ff4cb0d2347f6f2e3e2ed3c9723b3c50f0c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/logging/log_output.h | 25 +-----------------------
 subsys/logging/log_output.c         | 30 ++++++++++++++++++++++++++---
 subsys/logging/log_output_dict.c    | 24 +++++++++++++++++------
 3 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/include/zephyr/logging/log_output.h b/include/zephyr/logging/log_output.h
index 46b59520a68..0ef3fe9a2f2 100644
--- a/include/zephyr/logging/log_output.h
+++ b/include/zephyr/logging/log_output.h
@@ -190,34 +190,11 @@ void log_output_msg_syst_process(const struct log_output *log_output,
  */
 void log_output_dropped_process(const struct log_output *output, uint32_t cnt);
 
-/** @brief Write to the output buffer.
- *
- * @param outf Output function.
- * @param buf  Buffer.
- * @param len  Buffer length.
- * @param ctx  Context passed to the %p outf.
- */
-static inline void log_output_write(log_output_func_t outf, uint8_t *buf, size_t len, void *ctx)
-{
-	int processed;
-
-	while (len != 0) {
-		processed = outf(buf, len, ctx);
-		len -= processed;
-		buf += processed;
-	}
-}
-
 /** @brief Flush output buffer.
  *
  * @param output Pointer to the log output instance.
  */
-static inline void log_output_flush(const struct log_output *output)
-{
-	log_output_write(output->func, output->buf, output->control_block->offset,
-			 output->control_block->ctx);
-	output->control_block->offset = 0;
-}
+void log_output_flush(const struct log_output *output);
 
 /** @brief Function for setting user context passed to the output function.
  *
diff --git a/subsys/logging/log_output.c b/subsys/logging/log_output.c
index 187277d0493..1a2fb4f72c7 100644
--- a/subsys/logging/log_output.c
+++ b/subsys/logging/log_output.c
@@ -148,6 +148,28 @@ static int print_formatted(const struct log_output *output,
 	return length;
 }
 
+static void buffer_write(log_output_func_t outf, uint8_t *buf, size_t len,
+			 void *ctx)
+{
+	int processed;
+
+	while (len != 0) {
+		processed = outf(buf, len, ctx);
+		len -= processed;
+		buf += processed;
+	}
+}
+
+
+void log_output_flush(const struct log_output *output)
+{
+	buffer_write(output->func, output->buf,
+		     output->control_block->offset,
+		     output->control_block->ctx);
+
+	output->control_block->offset = 0;
+}
+
 static inline bool is_leap_year(uint32_t year)
 {
 	return (((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0));
@@ -719,9 +741,11 @@ void log_output_dropped_process(const struct log_output *output, uint32_t cnt)
 	cnt = MIN(cnt, 9999);
 	len = snprintk(buf, sizeof(buf), "%d", cnt);
 
-	log_output_write(outf, (uint8_t *)prefix, sizeof(prefix) - 1, output->control_block->ctx);
-	log_output_write(outf, buf, len, output->control_block->ctx);
-	log_output_write(outf, (uint8_t *)postfix, sizeof(postfix) - 1, output->control_block->ctx);
+	buffer_write(outf, (uint8_t *)prefix, sizeof(prefix) - 1,
+		     output->control_block->ctx);
+	buffer_write(outf, buf, len, output->control_block->ctx);
+	buffer_write(outf, (uint8_t *)postfix, sizeof(postfix) - 1,
+		     output->control_block->ctx);
 }
 
 void log_output_timestamp_freq_set(uint32_t frequency)
diff --git a/subsys/logging/log_output_dict.c b/subsys/logging/log_output_dict.c
index 897484af74e..79b99b3b15e 100644
--- a/subsys/logging/log_output_dict.c
+++ b/subsys/logging/log_output_dict.c
@@ -12,6 +12,18 @@
 #include <zephyr/sys/__assert.h>
 #include <zephyr/sys/util.h>
 
+static void buffer_write(log_output_func_t outf, uint8_t *buf, size_t len,
+			 void *ctx)
+{
+	int processed;
+
+	do {
+		processed = outf(buf, len, ctx);
+		len -= processed;
+		buf += processed;
+	} while (len != 0);
+}
+
 void log_dict_output_msg_process(const struct log_output *output,
 				 struct log_msg *msg, uint32_t flags)
 {
@@ -32,19 +44,19 @@ void log_dict_output_msg_process(const struct log_output *output,
 					log_const_source_id(source)) :
 				0U;
 
-	log_output_write(output->func, (uint8_t *)&output_hdr, sizeof(output_hdr),
-			 (void *)output->control_block->ctx);
+	buffer_write(output->func, (uint8_t *)&output_hdr, sizeof(output_hdr),
+		     (void *)output->control_block->ctx);
 
 	size_t len;
 	uint8_t *data = log_msg_get_package(msg, &len);
 
 	if (len > 0U) {
-		log_output_write(output->func, data, len, (void *)output->control_block->ctx);
+		buffer_write(output->func, data, len, (void *)output->control_block->ctx);
 	}
 
 	data = log_msg_get_data(msg, &len);
 	if (len > 0U) {
-		log_output_write(output->func, data, len, (void *)output->control_block->ctx);
+		buffer_write(output->func, data, len, (void *)output->control_block->ctx);
 	}
 
 	log_output_flush(output);
@@ -57,6 +69,6 @@ void log_dict_output_dropped_process(const struct log_output *output, uint32_t c
 	msg.type = MSG_DROPPED_MSG;
 	msg.num_dropped_messages = MIN(cnt, 9999);
 
-	log_output_write(output->func, (uint8_t *)&msg, sizeof(msg),
-			 (void *)output->control_block->ctx);
+	buffer_write(output->func, (uint8_t *)&msg, sizeof(msg),
+		     (void *)output->control_block->ctx);
 }

From 012d73da7723280390361e32253317e07ea714a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:04 +0100
Subject: [PATCH 1962/2913] Revert "[nrf fromtree] logging: backend: add
 semihosting"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ccd6e0214bff6d52f9583793fab3e8236db54edd.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/logging/backends/CMakeLists.txt        |  5 --
 subsys/logging/backends/Kconfig               |  1 -
 subsys/logging/backends/Kconfig.semihost      | 30 --------
 .../logging/backends/log_backend_semihost.c   | 71 -------------------
 4 files changed, 107 deletions(-)
 delete mode 100644 subsys/logging/backends/Kconfig.semihost
 delete mode 100644 subsys/logging/backends/log_backend_semihost.c

diff --git a/subsys/logging/backends/CMakeLists.txt b/subsys/logging/backends/CMakeLists.txt
index 7ab40c8cb30..5c631ca524f 100644
--- a/subsys/logging/backends/CMakeLists.txt
+++ b/subsys/logging/backends/CMakeLists.txt
@@ -74,8 +74,3 @@ zephyr_sources_ifdef(
   CONFIG_LOG_BACKEND_IPC_SERVICE
   log_backend_ipc_service.c
 )
-
-zephyr_sources_ifdef(
-  CONFIG_LOG_BACKEND_SEMIHOST
-  log_backend_semihost.c
-)
diff --git a/subsys/logging/backends/Kconfig b/subsys/logging/backends/Kconfig
index 960aeb20c2a..545847d103f 100644
--- a/subsys/logging/backends/Kconfig
+++ b/subsys/logging/backends/Kconfig
@@ -16,6 +16,5 @@ rsource "Kconfig.swo"
 rsource "Kconfig.uart"
 rsource "Kconfig.xtensa_sim"
 rsource "Kconfig.multidomain"
-rsource "Kconfig.semihost"
 
 endmenu
diff --git a/subsys/logging/backends/Kconfig.semihost b/subsys/logging/backends/Kconfig.semihost
deleted file mode 100644
index 10a6da8f2e7..00000000000
--- a/subsys/logging/backends/Kconfig.semihost
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2024 Contributors to the logging subsystem.
-# SPDX-License-Identifier: Apache-2.0
-
-config LOG_BACKEND_SEMIHOST
-	bool "Semihost as backend"
-	depends on SEMIHOST
-	select LOG_OUTPUT
-	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
-	help
-	  Enable backend in semihost (using host stdout)
-
-if LOG_BACKEND_SEMIHOST
-
-config LOG_BACKEND_SEMIHOST_BUFFER_SIZE
-	int "Size of reserved up-buffer for logger output."
-	default 256
-	help
-	  Specify reserved size of up-buffer used for logger output.
-
-config LOG_BACKEND_SEMIHOST_AUTOSTART
-	bool "Autostart semihost backend"
-	default y
-	help
-	  Enable semihost backend to start automatically.
-
-backend = SEMIHOST
-backend-str = semihost
-source "subsys/logging/Kconfig.template.log_format_config"
-
-endif # LOG_BACKEND_SEMIHOST
diff --git a/subsys/logging/backends/log_backend_semihost.c b/subsys/logging/backends/log_backend_semihost.c
deleted file mode 100644
index 8bada8051c1..00000000000
--- a/subsys/logging/backends/log_backend_semihost.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright (c) 2024 Contributors to the logging subsystem.
- * SPDX-License-Identifier: Apache-2.0
- */
-#include <stdio.h>
-#include <stddef.h>
-#include <zephyr/logging/log_backend.h>
-#include <zephyr/logging/log_backend_std.h>
-#include <zephyr/logging/log_core.h>
-#include <zephyr/logging/log_output.h>
-#include <zephyr/arch/common/semihost.h>
-
-static uint8_t buf[CONFIG_LOG_BACKEND_SEMIHOST_BUFFER_SIZE];
-static uint32_t log_format_current = CONFIG_LOG_BACKEND_SEMIHOST_OUTPUT_DEFAULT;
-
-static int char_out(uint8_t *data, size_t length, void *ctx)
-{
-	ARG_UNUSED(ctx);
-#define SEMIHOST_STDOUT (1)
-	int ret = semihost_write(SEMIHOST_STDOUT, data, length);
-
-	if (ret) {
-		return ret;
-	}
-
-	return length;
-}
-
-LOG_OUTPUT_DEFINE(log_output_semihost, char_out, buf, sizeof(buf));
-
-static void panic(struct log_backend const *const backend)
-{
-	ARG_UNUSED(backend);
-
-	log_output_flush(&log_output_semihost);
-}
-
-static void dropped(const struct log_backend *const backend, uint32_t cnt)
-{
-	ARG_UNUSED(backend);
-
-	log_output_dropped_process(&log_output_semihost, cnt);
-}
-
-static void process(const struct log_backend *const backend, union log_msg_generic *msg)
-{
-	ARG_UNUSED(backend);
-
-	uint32_t flags = log_backend_std_get_flags();
-
-	log_format_func_t log_output_func = log_format_func_t_get(log_format_current);
-
-	log_output_func(&log_output_semihost, &msg->log, flags);
-}
-
-static int format_set(const struct log_backend *const backend, uint32_t log_type)
-{
-	ARG_UNUSED(backend);
-
-	log_format_current = log_type;
-	return 0;
-}
-
-const struct log_backend_api log_backend_semihost_api = {
-	.process = process,
-	.panic = panic,
-	.dropped = IS_ENABLED(CONFIG_LOG_MODE_IMMEDIATE) ? NULL : dropped,
-	.format_set = format_set,
-};
-
-LOG_BACKEND_DEFINE(log_backend_semihost, log_backend_semihost_api,
-		   IS_ENABLED(CONFIG_LOG_BACKEND_SEMIHOST_AUTOSTART));

From 81b72ce44b079d21652c4d38e658e0455164e7ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:04 +0100
Subject: [PATCH 1963/2913] Revert "[nrf fromtree] debug: mipi_stp_decoder:
 Avoid potential 64bit unaligned access"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ac0c34135f7773c9889ea2aefa35957bd8b1a1bb.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/debug/mipi_stp_decoder.c | 35 ++++++++++++++-------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/subsys/debug/mipi_stp_decoder.c b/subsys/debug/mipi_stp_decoder.c
index 89ae7a8e0aa..ce2478350e4 100644
--- a/subsys/debug/mipi_stp_decoder.c
+++ b/subsys/debug/mipi_stp_decoder.c
@@ -461,41 +461,36 @@ static inline void get_nibbles64(const uint8_t *src, size_t src_noff, uint8_t *d
 {
 	bool src_ba = (src_noff & 0x1UL) == 0;
 	bool dst_ba = (dst_noff & 0x1UL) == 0;
-	uint32_t *src32 = (uint32_t *)&src[src_noff / 2];
-	uint32_t *dst32 = (uint32_t *)&dst[dst_noff / 2];
+	uint64_t *src64 = (uint64_t *)&src[src_noff / 2];
+	uint64_t *dst64 = (uint64_t *)&dst[dst_noff / 2];
 
 	if (nlen == 16) {
 		/* dst must be aligned. */
 		if (src_ba) {
-			dst32[0] = src32[0];
-			dst32[1] = src32[1];
+			uint32_t *s32 = (uint32_t *)src64;
+			uint32_t *d32 = (uint32_t *)dst64;
+
+			d32[0] = s32[0];
+			d32[1] = s32[1];
 		} else {
-			uint64_t src0 = src32[0] | ((uint64_t)src32[1] << 32);
-			uint64_t src1 = src32[2] | ((uint64_t)src32[3] << 32);
-			uint64_t part_a = src0 >> 4;
-			uint64_t part_b = src1 << 60;
-			uint64_t out = part_a | part_b;
-
-			dst32[0] = (uint32_t)out;
-			dst32[1] = (uint32_t)(out >> 32);
+			uint64_t part_a = src64[0] >> 4;
+			uint64_t part_b = src64[1] << 60;
+
+			dst64[0] = part_a | part_b;
 		}
 		return;
 	}
 
-	uint64_t src0 = src32[0] | ((uint64_t)src32[1] << 32);
 	uint64_t mask = BIT64_MASK(nlen * 4) << (src_ba ? 0 : 4);
-	uint64_t src_d = src0 & mask;
+	uint64_t src_d = src64[0] & mask;
 
 	if (((src_noff ^ dst_noff) & 0x1UL) == 0) {
-		/* nothing */
+		dst64[0] |= src_d;
 	} else if (dst_ba) {
-		src_d >>= 4;
+		dst64[0] |= (src_d >> 4);
 	} else {
-		src_d <<= 4;
+		dst64[0] |= (src_d << 4);
 	}
-
-	dst32[0] |= (uint32_t)src_d;
-	dst32[1] |= (uint32_t)(src_d >> 32);
 }
 
 /* Function performs getting nibbles in less efficient way but does not use unaligned

From 09d3fdf744c0e662078fc42d3e9c2cd0d8288b79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:05 +0100
Subject: [PATCH 1964/2913] Revert "[nrf fromtree] drivers: mbox:
 nrf_vevif_task_rx: align to direct IRQs"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8652e86b6c4d42a5aacf3bad9ad7b492be29f98a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/mbox/mbox_nrf_vevif_task_rx.c | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/drivers/mbox/mbox_nrf_vevif_task_rx.c b/drivers/mbox/mbox_nrf_vevif_task_rx.c
index a489d4d3717..8a4d81e0e6e 100644
--- a/drivers/mbox/mbox_nrf_vevif_task_rx.c
+++ b/drivers/mbox/mbox_nrf_vevif_task_rx.c
@@ -116,25 +116,9 @@ static const struct mbox_driver_api vevif_task_rx_driver_api = {
 	.set_enabled = vevif_task_rx_set_enabled,
 };
 
-#if defined(CONFIG_GEN_SW_ISR_TABLE)
 #define VEVIF_IRQ_CONNECT(idx, _)                                                                  \
 	IRQ_CONNECT(DT_INST_IRQ_BY_IDX(0, idx, irq), DT_INST_IRQ_BY_IDX(0, idx, priority),         \
 		    vevif_task_rx_isr, &vevif_irqs[idx], 0)
-#else
-
-#define VEVIF_IRQ_FUN(idx, _)                 \
-ISR_DIRECT_DECLARE(vevif_task_##idx##_rx_isr) \
-{                                             \
-	vevif_task_rx_isr(&vevif_irqs[idx]);  \
-	return 1;                             \
-}
-
-LISTIFY(DT_NUM_IRQS(DT_DRV_INST(0)), VEVIF_IRQ_FUN, ())
-
-#define VEVIF_IRQ_CONNECT(idx, _)                                                                 \
-	IRQ_DIRECT_CONNECT(DT_INST_IRQ_BY_IDX(0, idx, irq), DT_INST_IRQ_BY_IDX(0, idx, priority), \
-		    vevif_task_##idx##_rx_isr, 0)
-#endif
 
 static int vevif_task_rx_init(const struct device *dev)
 {

From 1a155172ef1b28c0d38e137640b5277263ef7078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:05 +0100
Subject: [PATCH 1965/2913] Revert "[nrf fromtree] scripts: logging:
 dictionary: Add uart support"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 08bc3889776f37bc3f36b05ffb8086937514bc67.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/logging/dictionary/log_parser.py      | 32 ++++++++--
 scripts/logging/dictionary/log_parser_uart.py | 64 -------------------
 scripts/logging/dictionary/parserlib.py       | 50 ---------------
 3 files changed, 28 insertions(+), 118 deletions(-)
 delete mode 100755 scripts/logging/dictionary/log_parser_uart.py
 delete mode 100755 scripts/logging/dictionary/parserlib.py

diff --git a/scripts/logging/dictionary/log_parser.py b/scripts/logging/dictionary/log_parser.py
index 3d4d8253faf..c2b20b0fda9 100755
--- a/scripts/logging/dictionary/log_parser.py
+++ b/scripts/logging/dictionary/log_parser.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 #
 # Copyright (c) 2021 Intel Corporation
-# Copyright (c) 2024 Nordic Semiconductor ASA
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -18,7 +17,8 @@
 import sys
 
 import dictionary_parser
-import parserlib
+from dictionary_parser.log_database import LogDatabase
+
 
 LOGGER_FORMAT = "%(message)s"
 logger = logging.getLogger("parser")
@@ -47,7 +47,6 @@ def read_log_file(args):
     Read the log from file
     """
     logdata = None
-    hexdata = ''
 
     # Open log data file for reading
     if args.hex:
@@ -101,6 +100,7 @@ def read_log_file(args):
 
     return logdata
 
+
 def main():
     """Main function of log parser"""
     args = parse_args()
@@ -112,12 +112,36 @@ def main():
     else:
         logger.setLevel(logging.INFO)
 
+    # Read from database file
+    database = LogDatabase.read_json_database(args.dbfile)
+    if database is None:
+        logger.error("ERROR: Cannot open database file: %s, exiting...", args.dbfile)
+        sys.exit(1)
+
     logdata = read_log_file(args)
     if logdata is None:
         logger.error("ERROR: cannot read log from file: %s, exiting...", args.logfile)
         sys.exit(1)
 
-    parserlib.parser(logdata, args.dbfile, logger)
+    log_parser = dictionary_parser.get_parser(database)
+    if log_parser is not None:
+        logger.debug("# Build ID: %s", database.get_build_id())
+        logger.debug("# Target: %s, %d-bit", database.get_arch(), database.get_tgt_bits())
+        if database.is_tgt_little_endian():
+            logger.debug("# Endianness: Little")
+        else:
+            logger.debug("# Endianness: Big")
+
+        logger.debug("# Database version: %d", database.get_version())
+
+        ret = log_parser.parse_log_data(logdata, debug=args.debug)
+        if not ret:
+            logger.error("ERROR: there were error(s) parsing log data")
+            sys.exit(1)
+    else:
+        logger.error("ERROR: Cannot find a suitable parser matching database version!")
+        sys.exit(1)
+
 
 if __name__ == "__main__":
     main()
diff --git a/scripts/logging/dictionary/log_parser_uart.py b/scripts/logging/dictionary/log_parser_uart.py
deleted file mode 100755
index 6426644096b..00000000000
--- a/scripts/logging/dictionary/log_parser_uart.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-
-"""
-Log Parser for Dictionary-based Logging
-
-This uses the JSON database file to decode the binary
-log data taken directly from input serialport and print
-the log messages.
-"""
-
-import serial
-import time
-import argparse
-import logging
-import sys
-
-import parserlib
-
-LOGGER_FORMAT = "%(message)s"
-logger = logging.getLogger("parser")
-
-def parse_args():
-    """Parse command line arguments"""
-    argparser = argparse.ArgumentParser(allow_abbrev=False)
-
-    argparser.add_argument("dbfile", help="Dictionary Logging Database file")
-    argparser.add_argument("serialPort", help="Port where the logs are generated")
-    argparser.add_argument("baudrate", help="Serial Port baud rate")
-    argparser.add_argument("--debug", action="store_true",
-                           help="Print extra debugging information")
-
-    return argparser.parse_args()
-
-def main():
-    """function of serial parser"""
-    args = parse_args()
-
-    if args.dbfile is None or '.json' not in args.dbfile:
-        logger.error("ERROR: invalid log database path: %s, exiting...", args.dbfile)
-        sys.exit(1)
-
-    logging.basicConfig(format=LOGGER_FORMAT)
-
-    if args.debug:
-        logger.setLevel(logging.DEBUG)
-    else:
-        logger.setLevel(logging.INFO)
-
-    # Parse the log every second from serial port
-    with serial.Serial(args.serialPort, args.baudrate) as ser:
-        ser.timeout = 2
-        while True:
-            size = ser.inWaiting()
-            if size:
-                data = ser.read(size)
-                parserlib.parser(data, args.dbfile, logger)
-            time.sleep(1)
-
-if __name__ == "__main__":
-    main()
diff --git a/scripts/logging/dictionary/parserlib.py b/scripts/logging/dictionary/parserlib.py
deleted file mode 100755
index 7e1d0a33b7d..00000000000
--- a/scripts/logging/dictionary/parserlib.py
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) 2021 Intel Corporation
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-
-"""
-Parser library for Dictionary-based Logging
-
-This library along with dictionary_parser converts the
-input binary data to the log using log database.
-"""
-import sys
-import logging
-
-import dictionary_parser
-from dictionary_parser.log_database import LogDatabase
-
-def parser(logdata, dbfile, logger):
-    """function of serial parser"""
-    # Read from database file
-    database = LogDatabase.read_json_database(dbfile)
-
-    if not isinstance(logger, logging.Logger):
-        raise ValueError("Invalid logger instance. Please configure the logger!")
-
-    if database is None:
-        logger.error("ERROR: Cannot open database file:  exiting...")
-        sys.exit(1)
-
-    if logdata is None:
-        logger.error("ERROR: cannot read log from file:  exiting...")
-        sys.exit(1)
-
-    log_parser = dictionary_parser.get_parser(database)
-    if log_parser is not None:
-        logger.debug("# Build ID: %s", database.get_build_id())
-        logger.debug("# Target: %s, %d-bit", database.get_arch(), database.get_tgt_bits())
-        if database.is_tgt_little_endian():
-            logger.debug("# Endianness: Little")
-        else:
-            logger.debug("# Endianness: Big")
-
-        ret = log_parser.parse_log_data(logdata)
-        if not ret:
-            logger.error("ERROR: there were error(s) parsing log data")
-            sys.exit(1)
-    else:
-        logger.error("ERROR: Cannot find a suitable parser matching database version!")

From 60af4252ca6a744af31f6e3c714663588fcdeb5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:05 +0100
Subject: [PATCH 1966/2913] Revert "[nrf fromlist] settings: ZMS: add a backend
 for ZMS (Zephyr Memory Storage)"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8ed9b80c546d794239c3fa1c9f9d090b8746ead4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/settings/Kconfig                       |  41 --
 .../settings/include/settings/settings_zms.h  |  64 ---
 subsys/settings/src/CMakeLists.txt            |   1 -
 subsys/settings/src/settings_zms.c            | 432 ------------------
 tests/subsys/settings/zms/CMakeLists.txt      |   7 -
 tests/subsys/settings/zms/prj.conf            |   8 -
 tests/subsys/settings/zms/src/CMakeLists.txt  |  12 -
 tests/subsys/settings/zms/src/settings_test.h |  42 --
 .../settings/zms/src/settings_test_zms.c      | 125 -----
 tests/subsys/settings/zms/testcase.yaml       |   7 -
 10 files changed, 739 deletions(-)
 delete mode 100644 subsys/settings/include/settings/settings_zms.h
 delete mode 100644 subsys/settings/src/settings_zms.c
 delete mode 100644 tests/subsys/settings/zms/CMakeLists.txt
 delete mode 100644 tests/subsys/settings/zms/prj.conf
 delete mode 100644 tests/subsys/settings/zms/src/CMakeLists.txt
 delete mode 100644 tests/subsys/settings/zms/src/settings_test.h
 delete mode 100644 tests/subsys/settings/zms/src/settings_test_zms.c
 delete mode 100644 tests/subsys/settings/zms/testcase.yaml

diff --git a/subsys/settings/Kconfig b/subsys/settings/Kconfig
index 48eacf82a8c..bc015cde9c7 100644
--- a/subsys/settings/Kconfig
+++ b/subsys/settings/Kconfig
@@ -32,7 +32,6 @@ config SETTINGS_ENCODE_LEN
 
 choice SETTINGS_BACKEND
 	prompt "Storage back-end"
-	default SETTINGS_ZMS if ZMS
 	default SETTINGS_NVS if NVS
 	default SETTINGS_FCB if FCB
 	default SETTINGS_FILE if FILE_SYSTEM
@@ -40,31 +39,6 @@ choice SETTINGS_BACKEND
 	help
 	  Storage back-end to be used by the settings subsystem.
 
-config SETTINGS_ZMS
-	bool "ZMS (Zephyr Memory Storage)"
-	depends on ZMS
-	help
-	  Use ZMS as settings storage backend.
-
-if SETTINGS_ZMS
-
-config SETTINGS_ZMS_NAME_CACHE
-	bool "ZMS name lookup cache"
-	select SYS_HASH_FUNC32
-	help
-	  Enable ZMS name lookup cache, used to reduce the Settings name
-	  lookup time.
-
-config SETTINGS_ZMS_NAME_CACHE_SIZE
-	int "ZMS name lookup cache size"
-	default 128
-	range 1 $(UINT32_MAX)
-	depends on SETTINGS_ZMS_NAME_CACHE
-	help
-	  Number of entries in Settings ZMS name cache.
-
-endif # SETTINGS_ZMS
-
 config SETTINGS_FCB
 	bool "FCB"
 	depends on FCB
@@ -158,21 +132,6 @@ config SETTINGS_NVS_SECTOR_COUNT
 	help
 	  Number of sectors used for the NVS settings area
 
-config SETTINGS_ZMS_SECTOR_SIZE_MULT
-	int "Sector size of the ZMS settings area"
-	default 1
-	depends on SETTINGS_ZMS
-	help
-	  The sector size to use for the ZMS settings area as a multiple of
-	  FLASH_ERASE_BLOCK_SIZE.
-
-config SETTINGS_ZMS_SECTOR_COUNT
-	int "Sector count of the ZMS settings area"
-	default 8
-	depends on SETTINGS_ZMS
-	help
-	  Number of sectors used for the ZMS settings area
-
 config SETTINGS_SHELL
 	bool "Settings shell"
 	depends on SHELL
diff --git a/subsys/settings/include/settings/settings_zms.h b/subsys/settings/include/settings/settings_zms.h
deleted file mode 100644
index dd9fb3aba12..00000000000
--- a/subsys/settings/include/settings/settings_zms.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2024 BayLibre SAS
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef __SETTINGS_ZMS_H_
-#define __SETTINGS_ZMS_H_
-
-#include <zephyr/fs/zms.h>
-#include <zephyr/settings/settings.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* In the ZMS backend, each setting is stored in two ZMS entries:
- *	1. setting's name
- *	2. setting's value
- *
- * The ZMS entry ID for the setting's value is determined implicitly based on
- * the ID of the ZMS entry for the setting's name, once that is found. The
- * difference between name and value ID is constant and equal to
- * ZMS_NAME_ID_OFFSET.
- *
- * Setting's name entries start from ZMS_NAMECNT_ID + 1.
- * The entry with ID == ZMS_NAMECNT_ID is used to store the largest name ID in use.
- *
- * Deleted records will not be found, only the last record will be read.
- */
-#define ZMS_NAMECNT_ID     0x80000000
-#define ZMS_NAME_ID_OFFSET 0x40000000
-
-struct settings_zms {
-	struct settings_store cf_store;
-	struct zms_fs cf_zms;
-	uint32_t last_name_id;
-	const struct device *flash_dev;
-#if CONFIG_SETTINGS_ZMS_NAME_CACHE
-	struct {
-		uint32_t name_hash;
-		uint32_t name_id;
-	} cache[CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE];
-
-	uint32_t cache_next;
-	uint32_t cache_total;
-	bool loaded;
-#endif
-};
-
-/* register zms to be a source of settings */
-int settings_zms_src(struct settings_zms *cf);
-
-/* register zms to be the destination of settings */
-int settings_zms_dst(struct settings_zms *cf);
-
-/* Initialize a zms backend. */
-int settings_zms_backend_init(struct settings_zms *cf);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __SETTINGS_ZMS_H_ */
diff --git a/subsys/settings/src/CMakeLists.txt b/subsys/settings/src/CMakeLists.txt
index 4aa797fbb35..d4ec6e76142 100644
--- a/subsys/settings/src/CMakeLists.txt
+++ b/subsys/settings/src/CMakeLists.txt
@@ -13,4 +13,3 @@ zephyr_sources_ifdef(CONFIG_SETTINGS_FCB settings_fcb.c)
 zephyr_sources_ifdef(CONFIG_SETTINGS_NVS settings_nvs.c)
 zephyr_sources_ifdef(CONFIG_SETTINGS_NONE settings_none.c)
 zephyr_sources_ifdef(CONFIG_SETTINGS_SHELL settings_shell.c)
-zephyr_sources_ifdef(CONFIG_SETTINGS_ZMS settings_zms.c)
diff --git a/subsys/settings/src/settings_zms.c b/subsys/settings/src/settings_zms.c
deleted file mode 100644
index 0f1164e4ea1..00000000000
--- a/subsys/settings/src/settings_zms.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- * Copyright (c) 2024 BayLibre SAS
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <errno.h>
-#include <string.h>
-
-#include "settings/settings_zms.h"
-#include "settings_priv.h"
-
-#include <zephyr/settings/settings.h>
-#include <zephyr/sys/hash_function.h>
-#include <zephyr/storage/flash_map.h>
-#include <zephyr/logging/log.h>
-LOG_MODULE_DECLARE(settings, CONFIG_SETTINGS_LOG_LEVEL);
-
-#if DT_HAS_CHOSEN(zephyr_settings_partition)
-#define SETTINGS_PARTITION DT_FIXED_PARTITION_ID(DT_CHOSEN(zephyr_settings_partition))
-#else
-#define SETTINGS_PARTITION FIXED_PARTITION_ID(storage_partition)
-#endif
-
-struct settings_zms_read_fn_arg {
-	struct zms_fs *fs;
-	uint32_t id;
-};
-
-static int settings_zms_load(struct settings_store *cs, const struct settings_load_arg *arg);
-static int settings_zms_save(struct settings_store *cs, const char *name, const char *value,
-			     size_t val_len);
-static void *settings_zms_storage_get(struct settings_store *cs);
-
-static struct settings_store_itf settings_zms_itf = {.csi_load = settings_zms_load,
-						     .csi_save = settings_zms_save,
-						     .csi_storage_get = settings_zms_storage_get};
-
-static ssize_t settings_zms_read_fn(void *back_end, void *data, size_t len)
-{
-	struct settings_zms_read_fn_arg *rd_fn_arg;
-
-	rd_fn_arg = (struct settings_zms_read_fn_arg *)back_end;
-
-	return zms_read(rd_fn_arg->fs, rd_fn_arg->id, data, len);
-}
-
-int settings_zms_src(struct settings_zms *cf)
-{
-	cf->cf_store.cs_itf = &settings_zms_itf;
-	settings_src_register(&cf->cf_store);
-
-	return 0;
-}
-
-int settings_zms_dst(struct settings_zms *cf)
-{
-	cf->cf_store.cs_itf = &settings_zms_itf;
-	settings_dst_register(&cf->cf_store);
-
-	return 0;
-}
-
-#if CONFIG_SETTINGS_ZMS_NAME_CACHE
-#define SETTINGS_ZMS_CACHE_OVFL(cf) ((cf)->cache_total > ARRAY_SIZE((cf)->cache))
-
-static void settings_zms_cache_add(struct settings_zms *cf, const char *name, uint32_t name_id)
-{
-	uint32_t name_hash = sys_hash32(name, strlen(name));
-
-	cf->cache[cf->cache_next].name_hash = name_hash;
-	cf->cache[cf->cache_next++].name_id = name_id;
-
-	cf->cache_next %= CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE;
-}
-
-static uint32_t settings_zms_cache_match(struct settings_zms *cf, const char *name, char *rdname,
-					 size_t len)
-{
-	uint32_t name_hash = sys_hash32(name, strlen(name));
-	int rc;
-
-	for (int i = 0; i < CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE; i++) {
-		if (cf->cache[i].name_hash != name_hash) {
-			continue;
-		}
-
-		if (cf->cache[i].name_id <= ZMS_NAMECNT_ID) {
-			continue;
-		}
-
-		rc = zms_read(&cf->cf_zms, cf->cache[i].name_id, rdname, len);
-		if (rc < 0) {
-			continue;
-		}
-
-		rdname[rc] = '\0';
-
-		if (strcmp(name, rdname)) {
-			continue;
-		}
-
-		return cf->cache[i].name_id;
-	}
-
-	return ZMS_NAMECNT_ID;
-}
-#endif /* CONFIG_SETTINGS_ZMS_NAME_CACHE */
-
-static int settings_zms_load(struct settings_store *cs, const struct settings_load_arg *arg)
-{
-	int ret = 0;
-	struct settings_zms *cf = CONTAINER_OF(cs, struct settings_zms, cf_store);
-	struct settings_zms_read_fn_arg read_fn_arg;
-	char name[SETTINGS_MAX_NAME_LEN + SETTINGS_EXTRA_LEN + 1];
-	ssize_t rc1, rc2;
-	uint32_t name_id = ZMS_NAMECNT_ID;
-
-#if CONFIG_SETTINGS_ZMS_NAME_CACHE
-	uint32_t cached = 0;
-
-	cf->loaded = false;
-#endif
-
-	name_id = cf->last_name_id + 1;
-
-	while (1) {
-
-		name_id--;
-		if (name_id == ZMS_NAMECNT_ID) {
-#if CONFIG_SETTINGS_ZMS_NAME_CACHE
-			cf->loaded = true;
-			cf->cache_total = cached;
-#endif
-			break;
-		}
-
-		/* In the ZMS backend, each setting item is stored in two ZMS
-		 * entries one for the setting's name and one with the
-		 * setting's value.
-		 */
-		rc1 = zms_read(&cf->cf_zms, name_id, &name, sizeof(name));
-		/* get the length of data and verify that it exists */
-		rc2 = zms_get_data_length(&cf->cf_zms, name_id + ZMS_NAME_ID_OFFSET);
-
-		if ((rc1 <= 0) && (rc2 <= 0)) {
-			/* Settings largest ID in use is invalid due to
-			 * reset, power failure or partition overflow.
-			 * Decrement it and check the next ID in subsequent
-			 * iteration.
-			 */
-			if (name_id == cf->last_name_id) {
-				cf->last_name_id--;
-				zms_write(&cf->cf_zms, ZMS_NAMECNT_ID, &cf->last_name_id,
-					  sizeof(uint32_t));
-			}
-
-			continue;
-		}
-
-		if ((rc1 <= 0) || (rc2 <= 0)) {
-			/* Settings item is not stored correctly in the ZMS.
-			 * ZMS entry for its name or value is either missing
-			 * or deleted. Clean dirty entries to make space for
-			 * future settings item.
-			 */
-			zms_delete(&cf->cf_zms, name_id);
-			zms_delete(&cf->cf_zms, name_id + ZMS_NAME_ID_OFFSET);
-
-			if (name_id == cf->last_name_id) {
-				cf->last_name_id--;
-				zms_write(&cf->cf_zms, ZMS_NAMECNT_ID, &cf->last_name_id,
-					  sizeof(uint32_t));
-			}
-
-			continue;
-		}
-
-		/* Found a name, this might not include a trailing \0 */
-		name[rc1] = '\0';
-		read_fn_arg.fs = &cf->cf_zms;
-		read_fn_arg.id = name_id + ZMS_NAME_ID_OFFSET;
-
-#if CONFIG_SETTINGS_ZMS_NAME_CACHE
-		settings_zms_cache_add(cf, name, name_id);
-		cached++;
-#endif
-
-		ret = settings_call_set_handler(name, rc2, settings_zms_read_fn, &read_fn_arg,
-						(void *)arg);
-		if (ret) {
-			break;
-		}
-	}
-	return ret;
-}
-
-static int settings_zms_save(struct settings_store *cs, const char *name, const char *value,
-			     size_t val_len)
-{
-	struct settings_zms *cf = CONTAINER_OF(cs, struct settings_zms, cf_store);
-	char rdname[SETTINGS_MAX_NAME_LEN + SETTINGS_EXTRA_LEN + 1];
-	uint32_t name_id, write_name_id;
-	bool delete, write_name;
-	int rc = 0;
-
-	if (!name) {
-		return -EINVAL;
-	}
-
-	/* Find out if we are doing a delete */
-	delete = ((value == NULL) || (val_len == 0));
-
-#if CONFIG_SETTINGS_ZMS_NAME_CACHE
-	bool name_in_cache = false;
-
-	name_id = settings_zms_cache_match(cf, name, rdname, sizeof(rdname));
-	if (name_id != ZMS_NAMECNT_ID) {
-		write_name_id = name_id;
-		write_name = false;
-		name_in_cache = true;
-		goto found;
-	}
-#endif
-
-	/* No entry with "name" is in cache, let's find if it exists in the storage */
-	name_id = cf->last_name_id + 1;
-	write_name_id = cf->last_name_id + 1;
-	write_name = true;
-
-#if CONFIG_SETTINGS_ZMS_NAME_CACHE
-	/* We can skip reading ZMS if we know that the cache wasn't overflowed. */
-	if (cf->loaded && !SETTINGS_ZMS_CACHE_OVFL(cf)) {
-		goto found;
-	}
-#endif
-
-	/* Let's find if we already have an ID within storage */
-	while (1) {
-		name_id--;
-		if (name_id == ZMS_NAMECNT_ID) {
-			break;
-		}
-
-		rc = zms_read(&cf->cf_zms, name_id, &rdname, sizeof(rdname));
-
-		if (rc < 0) {
-			/* Error or entry not found */
-			if (rc == -ENOENT) {
-				/* This is a free ID let's keep it */
-				write_name_id = name_id;
-			}
-			continue;
-		}
-
-		rdname[rc] = '\0';
-
-		if (strcmp(name, rdname)) {
-			/* ID exists but the name is different, that's not the ID
-			 * we are looking for.
-			 */
-			continue;
-		}
-
-		/* At this step we found the ID that corresponds to name */
-		if (!delete) {
-			write_name_id = name_id;
-			write_name = false;
-		}
-
-		goto found;
-	}
-
-found:
-	if (delete) {
-		if (name_id == ZMS_NAMECNT_ID) {
-			return 0;
-		}
-
-		rc = zms_delete(&cf->cf_zms, name_id);
-		if (rc >= 0) {
-			rc = zms_delete(&cf->cf_zms, name_id + ZMS_NAME_ID_OFFSET);
-		}
-
-		if (rc < 0) {
-			return rc;
-		}
-
-		if (name_id == cf->last_name_id) {
-			cf->last_name_id--;
-			rc = zms_write(&cf->cf_zms, ZMS_NAMECNT_ID, &cf->last_name_id,
-				       sizeof(uint32_t));
-			if (rc < 0) {
-				/* Error: can't to store
-				 * the largest name ID in use.
-				 */
-				return rc;
-			}
-		}
-
-		return 0;
-	}
-
-	/* No free IDs left. */
-	if (write_name_id == ZMS_NAMECNT_ID + ZMS_NAME_ID_OFFSET - 1) {
-		return -ENOMEM;
-	}
-
-	/* update the last_name_id and write to flash if required*/
-	if (write_name_id > cf->last_name_id) {
-		cf->last_name_id = write_name_id;
-		rc = zms_write(&cf->cf_zms, ZMS_NAMECNT_ID, &cf->last_name_id, sizeof(uint32_t));
-		if (rc < 0) {
-			return rc;
-		}
-	}
-
-	/* write the value */
-	rc = zms_write(&cf->cf_zms, write_name_id + ZMS_NAME_ID_OFFSET, value, val_len);
-	if (rc < 0) {
-		return rc;
-	}
-
-	/* write the name if required */
-	if (write_name) {
-		rc = zms_write(&cf->cf_zms, write_name_id, name, strlen(name));
-		if (rc < 0) {
-			return rc;
-		}
-	}
-
-#if CONFIG_SETTINGS_ZMS_NAME_CACHE
-	if (!name_in_cache) {
-		settings_zms_cache_add(cf, name, write_name_id);
-		if (cf->loaded && !SETTINGS_ZMS_CACHE_OVFL(cf)) {
-			cf->cache_total++;
-		}
-	}
-#endif
-
-	return 0;
-}
-
-/* Initialize the zms backend. */
-int settings_zms_backend_init(struct settings_zms *cf)
-{
-	int rc;
-	uint32_t last_name_id;
-
-	cf->cf_zms.flash_device = cf->flash_dev;
-	if (cf->cf_zms.flash_device == NULL) {
-		return -ENODEV;
-	}
-
-	rc = zms_mount(&cf->cf_zms);
-	if (rc) {
-		return rc;
-	}
-
-	rc = zms_read(&cf->cf_zms, ZMS_NAMECNT_ID, &last_name_id, sizeof(last_name_id));
-	if (rc < 0) {
-		cf->last_name_id = ZMS_NAMECNT_ID;
-	} else {
-		cf->last_name_id = last_name_id;
-	}
-
-	LOG_DBG("Initialized");
-	return 0;
-}
-
-int settings_backend_init(void)
-{
-	static struct settings_zms default_settings_zms;
-	int rc;
-	uint32_t cnt = 0;
-	size_t zms_sector_size, zms_size = 0;
-	const struct flash_area *fa;
-	struct flash_sector hw_flash_sector;
-	uint32_t sector_cnt = 1;
-
-	rc = flash_area_open(SETTINGS_PARTITION, &fa);
-	if (rc) {
-		return rc;
-	}
-
-	rc = flash_area_get_sectors(SETTINGS_PARTITION, &sector_cnt, &hw_flash_sector);
-	if (rc != 0 && rc != -ENOMEM) {
-		return rc;
-	}
-
-	zms_sector_size = CONFIG_SETTINGS_ZMS_SECTOR_SIZE_MULT * hw_flash_sector.fs_size;
-
-	if (zms_sector_size > UINT32_MAX) {
-		return -EDOM;
-	}
-
-	while (cnt < CONFIG_SETTINGS_ZMS_SECTOR_COUNT) {
-		zms_size += zms_sector_size;
-		if (zms_size > fa->fa_size) {
-			break;
-		}
-		cnt++;
-	}
-
-	/* define the zms file system using the page_info */
-	default_settings_zms.cf_zms.sector_size = zms_sector_size;
-	default_settings_zms.cf_zms.sector_count = cnt;
-	default_settings_zms.cf_zms.offset = fa->fa_off;
-	default_settings_zms.flash_dev = fa->fa_dev;
-
-	rc = settings_zms_backend_init(&default_settings_zms);
-	if (rc) {
-		return rc;
-	}
-
-	rc = settings_zms_src(&default_settings_zms);
-
-	if (rc) {
-		return rc;
-	}
-
-	rc = settings_zms_dst(&default_settings_zms);
-
-	return rc;
-}
-
-static void *settings_zms_storage_get(struct settings_store *cs)
-{
-	struct settings_zms *cf = CONTAINER_OF(cs, struct settings_zms, cf_store);
-
-	return &cf->cf_zms;
-}
diff --git a/tests/subsys/settings/zms/CMakeLists.txt b/tests/subsys/settings/zms/CMakeLists.txt
deleted file mode 100644
index 218451c840e..00000000000
--- a/tests/subsys/settings/zms/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(test_settings_zms_raw)
-
-add_subdirectory(./src zms_test_bindir)
diff --git a/tests/subsys/settings/zms/prj.conf b/tests/subsys/settings/zms/prj.conf
deleted file mode 100644
index 3de961c7c72..00000000000
--- a/tests/subsys/settings/zms/prj.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-CONFIG_ZTEST=y
-CONFIG_FLASH=y
-CONFIG_FLASH_MAP=y
-CONFIG_ZMS=y
-
-CONFIG_SETTINGS=y
-CONFIG_SETTINGS_RUNTIME=y
-CONFIG_SETTINGS_ZMS=y
diff --git a/tests/subsys/settings/zms/src/CMakeLists.txt b/tests/subsys/settings/zms/src/CMakeLists.txt
deleted file mode 100644
index 220a42849a8..00000000000
--- a/tests/subsys/settings/zms/src/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-# Copyright (c) 2024 BayLibre SAS
-
-zephyr_include_directories(
-	${ZEPHYR_BASE}/subsys/settings/include
-	${ZEPHYR_BASE}/subsys/settings/src
-	${ZEPHYR_BASE}/tests/subsys/settings/zms/src
-	)
-
-target_sources(app PRIVATE settings_test_zms.c)
-
-add_subdirectory(../../src settings_test_bindir)
diff --git a/tests/subsys/settings/zms/src/settings_test.h b/tests/subsys/settings/zms/src/settings_test.h
deleted file mode 100644
index 472ff71f59b..00000000000
--- a/tests/subsys/settings/zms/src/settings_test.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2024 BayLibre SAS
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef _SETTINGS_TEST_ZMS_H
-#define _SETTINGS_TEST_ZMS_H
-
-#include <stdio.h>
-#include <string.h>
-#include <zephyr/ztest.h>
-
-#include <zephyr/settings/settings.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern uint8_t val8;
-extern uint8_t val8_un;
-extern uint32_t val32;
-extern uint64_t val64;
-
-extern int test_get_called;
-extern int test_set_called;
-extern int test_commit_called;
-extern int test_export_block;
-
-extern struct settings_handler c_test_handlers[];
-
-void ctest_clear_call_state(void);
-int ctest_get_call_state(void);
-
-void config_wipe_srcs(void);
-void *settings_config_setup(void);
-void settings_config_teardown(void *fixture);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _SETTINGS_TEST_ZMS_H */
diff --git a/tests/subsys/settings/zms/src/settings_test_zms.c b/tests/subsys/settings/zms/src/settings_test_zms.c
deleted file mode 100644
index 17a5ccd56fe..00000000000
--- a/tests/subsys/settings/zms/src/settings_test_zms.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2024 BayLibre SAS
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include <stdlib.h>
-#include <string.h>
-
-#include "settings_priv.h"
-#include "settings_test.h"
-
-uint8_t val8;
-uint8_t val8_un;
-uint32_t val32;
-uint64_t val64;
-
-int test_get_called;
-int test_set_called;
-int test_commit_called;
-int test_export_block;
-
-int c1_handle_get(const char *name, char *val, int val_len_max);
-int c1_handle_set(const char *name, size_t len, settings_read_cb read_cb, void *cb_arg);
-int c1_handle_commit(void);
-int c1_handle_export(int (*cb)(const char *name, const void *value, size_t val_len));
-
-struct settings_handler c_test_handlers[] = {
-	{.name = "myfoo",
-	 .h_get = c1_handle_get,
-	 .h_set = c1_handle_set,
-	 .h_commit = c1_handle_commit,
-	 .h_export = c1_handle_export},
-};
-
-int c1_handle_get(const char *name, char *val, int val_len_max)
-{
-	const char *next;
-
-	test_get_called = 1;
-
-	if (settings_name_steq(name, "mybar", &next) && !next) {
-		val_len_max = MIN(val_len_max, sizeof(val8));
-		memcpy(val, &val8, MIN(val_len_max, sizeof(val8)));
-		return val_len_max;
-	}
-
-	if (settings_name_steq(name, "mybar64", &next) && !next) {
-		val_len_max = MIN(val_len_max, sizeof(val64));
-		memcpy(val, &val64, MIN(val_len_max, sizeof(val64)));
-		return val_len_max;
-	}
-
-	return -ENOENT;
-}
-
-int c1_handle_set(const char *name, size_t len, settings_read_cb read_cb, void *cb_arg)
-{
-	size_t val_len;
-	int rc;
-	const char *next;
-
-	test_set_called = 1;
-	if (settings_name_steq(name, "mybar", &next) && !next) {
-		rc = read_cb(cb_arg, &val8, sizeof(val8));
-		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
-		return 0;
-	}
-
-	if (settings_name_steq(name, "mybar64", &next) && !next) {
-		rc = read_cb(cb_arg, &val64, sizeof(val64));
-		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
-		return 0;
-	}
-
-	if (settings_name_steq(name, "unaligned", &next) && !next) {
-		val_len = len;
-		zassert_equal(val_len, sizeof(val8_un), "value length: %d, ought equal 1", val_len);
-		rc = read_cb(cb_arg, &val8_un, sizeof(val8_un));
-		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
-		return 0;
-	}
-
-	return -ENOENT;
-}
-
-int c1_handle_commit(void)
-{
-	test_commit_called = 1;
-	return 0;
-}
-
-int c1_handle_export(int (*cb)(const char *name, const void *value, size_t val_len))
-{
-	if (test_export_block) {
-		return 0;
-	}
-
-	(void)cb("myfoo/mybar", &val8, sizeof(val8));
-
-	(void)cb("myfoo/mybar64", &val64, sizeof(val64));
-
-	(void)cb("myfoo/unaligned", &val8_un, sizeof(val8_un));
-
-	return 0;
-}
-
-void ctest_clear_call_state(void)
-{
-	test_get_called = 0;
-	test_set_called = 0;
-	test_commit_called = 0;
-}
-
-int ctest_get_call_state(void)
-{
-	return test_get_called + test_set_called + test_commit_called;
-}
-
-void config_wipe_srcs(void)
-{
-	sys_slist_init(&settings_load_srcs);
-	settings_save_dst = NULL;
-}
-
-ZTEST_SUITE(settings_config, NULL, settings_config_setup, NULL, NULL, settings_config_teardown);
diff --git a/tests/subsys/settings/zms/testcase.yaml b/tests/subsys/settings/zms/testcase.yaml
deleted file mode 100644
index 2234fd4cd78..00000000000
--- a/tests/subsys/settings/zms/testcase.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tests:
-  settings.zms:
-    depends_on: zms
-    min_ram: 32
-    tags:
-      - settings
-      - zms

From 07341b0730088f38fe721ef08e3a76c8a2f093a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:05 +0100
Subject: [PATCH 1967/2913] Revert "[nrf fromlist] ipc: icmsg: increase stack
 size of RX work queue thread"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9062af0c6fd9eedffb7b871da2a2f23ef75a541e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/ipc/ipc_service/lib/Kconfig.icmsg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/ipc/ipc_service/lib/Kconfig.icmsg b/subsys/ipc/ipc_service/lib/Kconfig.icmsg
index bc15d9a5999..93427404dca 100644
--- a/subsys/ipc/ipc_service/lib/Kconfig.icmsg
+++ b/subsys/ipc/ipc_service/lib/Kconfig.icmsg
@@ -51,7 +51,7 @@ if IPC_SERVICE_BACKEND_ICMSG_WQ_ENABLE
 
 config IPC_SERVICE_BACKEND_ICMSG_WQ_STACK_SIZE
 	int "Size of RX work queue stack"
-	default 1280
+	default 1024
 	help
 	  Size of stack used by work queue RX thread. This work queue is
 	  created to prevent notifying service users about received data

From f704745961e5a9d9eb622a2f6f38b4d92a130016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:05 +0100
Subject: [PATCH 1968/2913] Revert "[nrf fromtree] samples
 ipc_service/static_vrings: Enable for nrf5340bsim"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 086003eea70b8e3678f8fe4656b25702ad0aa772.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../subsys/ipc/ipc_service/static_vrings/CMakeLists.txt    | 1 -
 .../subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild  | 1 -
 .../boards/nrf5340bsim_nrf5340_cpuapp.overlay              | 7 -------
 .../remote/boards/nrf5340bsim_nrf5340_cpunet.overlay       | 7 -------
 samples/subsys/ipc/ipc_service/static_vrings/sample.yaml   | 2 --
 .../subsys/ipc/ipc_service/static_vrings/sysbuild.cmake    | 3 ---
 6 files changed, 21 deletions(-)
 delete mode 100644 samples/subsys/ipc/ipc_service/static_vrings/boards/nrf5340bsim_nrf5340_cpuapp.overlay
 delete mode 100644 samples/subsys/ipc/ipc_service/static_vrings/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay

diff --git a/samples/subsys/ipc/ipc_service/static_vrings/CMakeLists.txt b/samples/subsys/ipc/ipc_service/static_vrings/CMakeLists.txt
index 588bfe71dd0..4deb07c4789 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/CMakeLists.txt
+++ b/samples/subsys/ipc/ipc_service/static_vrings/CMakeLists.txt
@@ -12,7 +12,6 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../remote/zephyr)
 
 if(NOT (CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR
-        CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUAPP OR
         CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0 OR
         CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7 OR
         CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM7
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild b/samples/subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild
index 4f9caa82501..a1214db3284 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild
+++ b/samples/subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild
@@ -8,7 +8,6 @@ source "share/sysbuild/Kconfig"
 config NET_CORE_BOARD
 string
 	default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk"
-	default "nrf5340bsim/nrf5340/cpunet" if $(BOARD) = "nrf5340bsim"
 	default "lpcxpresso55s69/lpc55s69/cpu1" if $(BOARD) = "lpcxpresso55s69"
 	default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk"
 	default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk"
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/samples/subsys/ipc/ipc_service/static_vrings/boards/nrf5340bsim_nrf5340_cpuapp.overlay
deleted file mode 100644
index 53c9b68afe7..00000000000
--- a/samples/subsys/ipc/ipc_service/static_vrings/boards/nrf5340bsim_nrf5340_cpuapp.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf5340dk_nrf5340_cpuapp.overlay"
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay b/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay
deleted file mode 100644
index 57176705564..00000000000
--- a/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf5340dk_nrf5340_cpunet.overlay"
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/sample.yaml b/samples/subsys/ipc/ipc_service/static_vrings/sample.yaml
index d15df7b803e..911b3624e44 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/sample.yaml
+++ b/samples/subsys/ipc/ipc_service/static_vrings/sample.yaml
@@ -4,14 +4,12 @@ tests:
   sample.ipc.static_vrings:
     platform_allow:
       - nrf5340dk/nrf5340/cpuapp
-      - nrf5340bsim/nrf5340/cpuapp
       - lpcxpresso55s69/lpc55s69/cpu0
       - mimxrt1160_evk/mimxrt1166/cm7
       - mimxrt1170_evk/mimxrt1176/cm7
       - mimxrt1170_evk@B/mimxrt1176/cm7
     integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
-      - nrf5340bsim/nrf5340/cpuapp
     tags: ipc
     sysbuild: true
     harness: console
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.cmake b/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.cmake
index cf5de9dd941..2e99a95d3c3 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.cmake
+++ b/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.cmake
@@ -21,6 +21,3 @@ ExternalZephyrProject_Add(
 # remote core's build, such as the output image's LMA
 add_dependencies(${DEFAULT_IMAGE} ${REMOTE_APP})
 sysbuild_add_dependencies(CONFIGURE ${DEFAULT_IMAGE} ${REMOTE_APP})
-
-native_simulator_set_child_images(${DEFAULT_IMAGE} remote)
-native_simulator_set_final_executable(${DEFAULT_IMAGE})

From d9eb65349536790fed49e19af71177f5424d81af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:05 +0100
Subject: [PATCH 1969/2913] Revert "[nrf fromtree] samples ipc_service/icmsg:
 Enable for nrf5340bsim"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a26d26064d00b8a6b4929cdc0d5f1a74be2ff6d7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt        | 1 -
 samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild      | 1 -
 .../icmsg/boards/nrf5340bsim_nrf5340_cpuapp.overlay        | 7 -------
 .../icmsg/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay | 7 -------
 samples/subsys/ipc/ipc_service/icmsg/sample.yaml           | 5 +----
 samples/subsys/ipc/ipc_service/icmsg/sysbuild.cmake        | 3 ---
 6 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 samples/subsys/ipc/ipc_service/icmsg/boards/nrf5340bsim_nrf5340_cpuapp.overlay
 delete mode 100644 samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay

diff --git a/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt b/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt
index e9e246b02fa..725fd707174 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt
+++ b/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt
@@ -9,7 +9,6 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 if(NOT CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP AND
-    NOT CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUAPP AND
     NOT CONFIG_BOARD_STM32H747I_DISCO AND
     NOT CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUAPP)
   message(FATAL_ERROR "${BOARD} is not supported for this sample")
diff --git a/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild b/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild
index 41b892aba6a..9a2c85d065d 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild
+++ b/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild
@@ -7,6 +7,5 @@ source "share/sysbuild/Kconfig"
 config REMOTE_BOARD
 string
 	default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk"
-	default "nrf5340bsim/nrf5340/cpunet" if $(BOARD) = "nrf5340bsim"
 	default "nrf54l15pdk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15pdk"
 	default "stm32h747i_disco/stm32h747xx/m4" if $(BOARD) = "stm32h747i_disco"
diff --git a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf5340bsim_nrf5340_cpuapp.overlay
deleted file mode 100644
index 53c9b68afe7..00000000000
--- a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf5340bsim_nrf5340_cpuapp.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf5340dk_nrf5340_cpuapp.overlay"
diff --git a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay
deleted file mode 100644
index c5194cf93cd..00000000000
--- a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf5340dk_nrf5340_cpunet.overlay"
diff --git a/samples/subsys/ipc/ipc_service/icmsg/sample.yaml b/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
index 321ed3398ed..b981c1b8215 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
+++ b/samples/subsys/ipc/ipc_service/icmsg/sample.yaml
@@ -2,12 +2,9 @@ sample:
   name: IPC Service example integration (icmsg backend)
 tests:
   sample.ipc.icmsg:
-    platform_allow:
-      - nrf5340dk/nrf5340/cpuapp
-      - nrf5340bsim/nrf5340/cpuapp
+    platform_allow: nrf5340dk/nrf5340/cpuapp
     integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
-      - nrf5340bsim/nrf5340/cpuapp
     tags: ipc
     sysbuild: true
     harness: console
diff --git a/samples/subsys/ipc/ipc_service/icmsg/sysbuild.cmake b/samples/subsys/ipc/ipc_service/icmsg/sysbuild.cmake
index 305c85cc3eb..b1f0947aff7 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/sysbuild.cmake
+++ b/samples/subsys/ipc/ipc_service/icmsg/sysbuild.cmake
@@ -12,6 +12,3 @@ ExternalZephyrProject_Add(
 	SOURCE_DIR  ${APP_DIR}/remote
 	BOARD       ${SB_CONFIG_REMOTE_BOARD}
 )
-
-native_simulator_set_child_images(${DEFAULT_IMAGE} remote)
-native_simulator_set_final_executable(${DEFAULT_IMAGE})

From cbe7460f6e5ffc025df4683219c451ac8f3ea595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:05 +0100
Subject: [PATCH 1970/2913] Revert "[nrf fromtree] samples
 ipc_service/multi_endpoint: Enable for nrf5340bsim"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d5d8de1c2707fd1a35f665f81ecf9563132ab996.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../ipc/ipc_service/multi_endpoint/CMakeLists.txt      |  3 +--
 .../ipc/ipc_service/multi_endpoint/Kconfig.sysbuild    |  1 -
 .../boards/nrf5340bsim_nrf5340_cpuapp.overlay          |  7 -------
 .../remote/boards/nrf5340bsim_nrf5340_cpunet.overlay   |  7 -------
 .../subsys/ipc/ipc_service/multi_endpoint/sample.yaml  | 10 ++--------
 .../ipc/ipc_service/multi_endpoint/sysbuild.cmake      |  3 ---
 6 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 samples/subsys/ipc/ipc_service/multi_endpoint/boards/nrf5340bsim_nrf5340_cpuapp.overlay
 delete mode 100644 samples/subsys/ipc/ipc_service/multi_endpoint/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay

diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/CMakeLists.txt b/samples/subsys/ipc/ipc_service/multi_endpoint/CMakeLists.txt
index fca156d9fe2..c167dd5375b 100644
--- a/samples/subsys/ipc/ipc_service/multi_endpoint/CMakeLists.txt
+++ b/samples/subsys/ipc/ipc_service/multi_endpoint/CMakeLists.txt
@@ -8,8 +8,7 @@ cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
-if(NOT CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP AND
-    NOT CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUAPP )
+if(NOT CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP)
   message(FATAL_ERROR "${BOARD} is not supported for this sample")
 endif()
 
diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/Kconfig.sysbuild b/samples/subsys/ipc/ipc_service/multi_endpoint/Kconfig.sysbuild
index 5e4c6d497cf..d0849e37dde 100644
--- a/samples/subsys/ipc/ipc_service/multi_endpoint/Kconfig.sysbuild
+++ b/samples/subsys/ipc/ipc_service/multi_endpoint/Kconfig.sysbuild
@@ -7,4 +7,3 @@ source "share/sysbuild/Kconfig"
 config NET_CORE_BOARD
 string
 	default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk"
-	default "nrf5340bsim/nrf5340/cpunet" if $(BOARD) = "nrf5340bsim"
diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/samples/subsys/ipc/ipc_service/multi_endpoint/boards/nrf5340bsim_nrf5340_cpuapp.overlay
deleted file mode 100644
index 53c9b68afe7..00000000000
--- a/samples/subsys/ipc/ipc_service/multi_endpoint/boards/nrf5340bsim_nrf5340_cpuapp.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf5340dk_nrf5340_cpuapp.overlay"
diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay b/samples/subsys/ipc/ipc_service/multi_endpoint/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay
deleted file mode 100644
index c5194cf93cd..00000000000
--- a/samples/subsys/ipc/ipc_service/multi_endpoint/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf5340dk_nrf5340_cpunet.overlay"
diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/sample.yaml b/samples/subsys/ipc/ipc_service/multi_endpoint/sample.yaml
index f808c95252e..b05c8f001f2 100644
--- a/samples/subsys/ipc/ipc_service/multi_endpoint/sample.yaml
+++ b/samples/subsys/ipc/ipc_service/multi_endpoint/sample.yaml
@@ -14,21 +14,15 @@ common:
       - "IPC-service HOST \\[INST 1\\] demo ended\\."
 tests:
   sample.ipc.multi_endpoint:
-    platform_allow:
-      - nrf5340dk/nrf5340/cpuapp
-      - nrf5340bsim/nrf5340/cpuapp
+    platform_allow: nrf5340dk/nrf5340/cpuapp
     integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
-      - nrf5340bsim/nrf5340/cpuapp
     tags: ipc
     sysbuild: true
   sample.ipc.multi_endpoint.icbmsg:
-    platform_allow:
-      - nrf5340dk/nrf5340/cpuapp
-      - nrf5340bsim/nrf5340/cpuapp
+    platform_allow: nrf5340dk/nrf5340/cpuapp
     integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
-      - nrf5340bsim/nrf5340/cpuapp
     tags: ipc
     sysbuild: true
     extra_args:
diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.cmake b/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.cmake
index 9117870be8a..d0d79b8f240 100644
--- a/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.cmake
+++ b/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.cmake
@@ -12,6 +12,3 @@ ExternalZephyrProject_Add(
 	SOURCE_DIR  ${APP_DIR}/remote
 	BOARD       ${SB_CONFIG_NET_CORE_BOARD}
 )
-
-native_simulator_set_child_images(${DEFAULT_IMAGE} remote)
-native_simulator_set_final_executable(${DEFAULT_IMAGE})

From d29badf3cd847553a0991b97d7806a436fab2222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:05 +0100
Subject: [PATCH 1971/2913] Revert "[nrf fromtree] ipc: icmsg & icbmsg: Add
 support for POSIX arch targets"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 91fa9101cc11dbcb9d8b4cf7759cd6cf3ab087d7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/ipc/pbuf.h                    | 16 +++++-----------
 subsys/ipc/ipc_service/backends/ipc_icbmsg.c | 16 ++--------------
 subsys/ipc/ipc_service/lib/pbuf.c            | 20 --------------------
 tests/subsys/ipc/pbuf/src/main.c             | 10 +++++-----
 4 files changed, 12 insertions(+), 50 deletions(-)

diff --git a/include/zephyr/ipc/pbuf.h b/include/zephyr/ipc/pbuf.h
index 8783cdbbf14..983a0687dbb 100644
--- a/include/zephyr/ipc/pbuf.h
+++ b/include/zephyr/ipc/pbuf.h
@@ -35,13 +35,6 @@ extern "C" {
  */
 #define _PBUF_MIN_DATA_LEN ROUND_UP(PBUF_PACKET_LEN_SZ + 1 + _PBUF_IDX_SIZE, _PBUF_IDX_SIZE)
 
-#if defined(CONFIG_ARCH_POSIX)
-/* For the native simulated boards we need to modify some pointers at init */
-#define PBUF_MAYBE_CONST
-#else
-#define PBUF_MAYBE_CONST const
-#endif
-
 /** @brief Control block of packet buffer.
  *
  * The structure contains configuration data.
@@ -94,9 +87,9 @@ struct pbuf_data {
  * written in a way to protect the data from being corrupted.
  */
 struct pbuf {
-	PBUF_MAYBE_CONST struct pbuf_cfg *const cfg; /* Configuration of the
-						      * buffer.
-						      */
+	const struct pbuf_cfg *const cfg;	/* Configuration of the
+						 * buffer.
+						 */
 	struct pbuf_data data;			/* Data used to read and write
 						 * to the buffer
 						 */
@@ -151,7 +144,8 @@ struct pbuf {
 			"Misaligned memory.");						\
 	BUILD_ASSERT(size >= (MAX(dcache_align, _PBUF_IDX_SIZE) + _PBUF_IDX_SIZE +	\
 			_PBUF_MIN_DATA_LEN), "Insufficient size.");			\
-	static PBUF_MAYBE_CONST struct pbuf_cfg cfg_##name =				\
+											\
+	static const struct pbuf_cfg cfg_##name =					\
 			PBUF_CFG_INIT(mem_addr, size, dcache_align);			\
 	static struct pbuf name = {							\
 		.cfg = &cfg_##name,							\
diff --git a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
index 9fd7752999f..70c4c4c362f 100644
--- a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
+++ b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
@@ -87,13 +87,6 @@
 #include <zephyr/ipc/ipc_service_backend.h>
 #include <zephyr/cache.h>
 
-#if defined(CONFIG_ARCH_POSIX)
-#include <soc.h>
-#define MAYBE_CONST
-#else
-#define MAYBE_CONST const
-#endif
-
 LOG_MODULE_REGISTER(ipc_icbmsg,
 		    CONFIG_IPC_SERVICE_BACKEND_ICBMSG_LOG_LEVEL);
 
@@ -1245,17 +1238,12 @@ static int release_rx_buffer(const struct device *instance, void *token, void *d
  */
 static int backend_init(const struct device *instance)
 {
-	MAYBE_CONST struct icbmsg_config *conf = (struct icbmsg_config *)instance->config;
+	const struct icbmsg_config *conf = instance->config;
 	struct backend_data *dev_data = instance->data;
 #ifdef CONFIG_MULTITHREADING
 	static K_THREAD_STACK_DEFINE(ep_bound_work_q_stack, EP_BOUND_WORK_Q_STACK_SIZE);
 	static bool is_work_q_started;
 
-#if defined(CONFIG_ARCH_POSIX)
-	native_emb_addr_remap((void **)&conf->tx.blocks_ptr);
-	native_emb_addr_remap((void **)&conf->rx.blocks_ptr);
-#endif
-
 	if (!is_work_q_started) {
 		k_work_queue_init(&ep_bound_work_q);
 		k_work_queue_start(&ep_bound_work_q, ep_bound_work_q_stack,
@@ -1413,7 +1401,7 @@ const static struct ipc_service_backend backend_ops = {
 			.rx_pb = &rx_icbmsg_pb_##i,					\
 		}									\
 	};										\
-	static MAYBE_CONST struct icbmsg_config backend_config_##i =			\
+	static const struct icbmsg_config backend_config_##i =				\
 	{										\
 		.control_config = {							\
 			.mbox_tx = MBOX_DT_SPEC_INST_GET(i, tx),			\
diff --git a/subsys/ipc/ipc_service/lib/pbuf.c b/subsys/ipc/ipc_service/lib/pbuf.c
index c744946f4ca..19ac2525c28 100644
--- a/subsys/ipc/ipc_service/lib/pbuf.c
+++ b/subsys/ipc/ipc_service/lib/pbuf.c
@@ -11,10 +11,6 @@
 #include <zephyr/ipc/pbuf.h>
 #include <zephyr/sys/byteorder.h>
 
-#if defined(CONFIG_ARCH_POSIX)
-#include <soc.h>
-#endif
-
 /* Helper funciton for getting numer of bytes being written to the bufer. */
 static uint32_t idx_occupied(uint32_t len, uint32_t wr_idx, uint32_t rd_idx)
 {
@@ -58,23 +54,11 @@ static int validate_cfg(const struct pbuf_cfg *cfg)
 	return 0;
 }
 
-#if defined(CONFIG_ARCH_POSIX)
-void pbuf_native_addr_remap(struct pbuf *pb)
-{
-	native_emb_addr_remap((void **)&pb->cfg->rd_idx_loc);
-	native_emb_addr_remap((void **)&pb->cfg->wr_idx_loc);
-	native_emb_addr_remap((void **)&pb->cfg->data_loc);
-}
-#endif
-
 int pbuf_tx_init(struct pbuf *pb)
 {
 	if (validate_cfg(pb->cfg) != 0) {
 		return -EINVAL;
 	}
-#if defined(CONFIG_ARCH_POSIX)
-	pbuf_native_addr_remap(pb);
-#endif
 
 	/* Initialize local copy of indexes. */
 	pb->data.wr_idx = 0;
@@ -98,10 +82,6 @@ int pbuf_rx_init(struct pbuf *pb)
 	if (validate_cfg(pb->cfg) != 0) {
 		return -EINVAL;
 	}
-#if defined(CONFIG_ARCH_POSIX)
-	pbuf_native_addr_remap(pb);
-#endif
-
 	/* Initialize local copy of indexes. */
 	pb->data.wr_idx = 0;
 	pb->data.rd_idx = 0;
diff --git a/tests/subsys/ipc/pbuf/src/main.c b/tests/subsys/ipc/pbuf/src/main.c
index 4af9da68c47..9eb26695c08 100644
--- a/tests/subsys/ipc/pbuf/src/main.c
+++ b/tests/subsys/ipc/pbuf/src/main.c
@@ -48,7 +48,7 @@ ZTEST(test_pbuf, test_rw)
 	 * order to avoid clang complains about memory_area not being constant
 	 * expression.
 	 */
-	static PBUF_MAYBE_CONST struct pbuf_cfg cfg = PBUF_CFG_INIT(memory_area, MEM_AREA_SZ, 0);
+	static const struct pbuf_cfg cfg = PBUF_CFG_INIT(memory_area, MEM_AREA_SZ, 0);
 
 	static struct pbuf pb = {
 		.cfg = &cfg,
@@ -115,9 +115,9 @@ ZTEST(test_pbuf, test_retcodes)
 	 * order to avoid clang complains about memory_area not being constant
 	 * expression.
 	 */
-	static PBUF_MAYBE_CONST struct pbuf_cfg cfg0 = PBUF_CFG_INIT(memory_area, MEM_AREA_SZ, 32);
-	static PBUF_MAYBE_CONST struct pbuf_cfg cfg1 = PBUF_CFG_INIT(memory_area, MEM_AREA_SZ, 0);
-	static PBUF_MAYBE_CONST struct pbuf_cfg cfg2 = PBUF_CFG_INIT(memory_area, 20, 4);
+	static const struct pbuf_cfg cfg0 = PBUF_CFG_INIT(memory_area, MEM_AREA_SZ, 32);
+	static const struct pbuf_cfg cfg1 = PBUF_CFG_INIT(memory_area, MEM_AREA_SZ, 0);
+	static const struct pbuf_cfg cfg2 = PBUF_CFG_INIT(memory_area, 20, 4);
 
 	static struct pbuf pb0 = {
 		.cfg = &cfg0,
@@ -268,7 +268,7 @@ ZTEST(test_pbuf, test_stress)
 	 * order to avoid clang complains about buffer not being constant
 	 * expression.
 	 */
-	static PBUF_MAYBE_CONST struct pbuf_cfg cfg = PBUF_CFG_INIT(buffer, MEM_AREA_SZ, 4);
+	static const struct pbuf_cfg cfg = PBUF_CFG_INIT(buffer, MEM_AREA_SZ, 4);
 
 	static struct pbuf pb = {
 		.cfg = &cfg,

From 10e08dd75de0176f609879b49bc895c65fe9a819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:05 +0100
Subject: [PATCH 1972/2913] Revert "[nrf fromtree] ipc: pbuf: Provide function
 for Rx side initialization"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2f7d3eb15ce780d972aba42cd50a977ab02ab54b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/ipc/pbuf.h          | 22 +++-------------------
 subsys/ipc/ipc_service/lib/icmsg.c |  6 ++++--
 subsys/ipc/ipc_service/lib/pbuf.c  | 14 +-------------
 tests/subsys/ipc/pbuf/src/main.c   | 10 +++++-----
 4 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/include/zephyr/ipc/pbuf.h b/include/zephyr/ipc/pbuf.h
index 983a0687dbb..0be5bd5185c 100644
--- a/include/zephyr/ipc/pbuf.h
+++ b/include/zephyr/ipc/pbuf.h
@@ -152,9 +152,9 @@ struct pbuf {
 	}
 
 /**
- * @brief Initialize the Tx packet buffer.
+ * @brief Initialize the packet buffer.
  *
- * This function initializes the Tx packet buffer based on provided configuration.
+ * This function initializes the packet buffer based on provided configuration.
  * If the configuration is incorrect, the function will return error.
  *
  * It is recommended to use PBUF_DEFINE macro for build time initialization.
@@ -165,23 +165,7 @@ struct pbuf {
  * @retval 0 on success.
  * @retval -EINVAL when the input parameter is incorrect.
  */
-int pbuf_tx_init(struct pbuf *pb);
-
-/**
- * @brief Initialize the Rx packet buffer.
- *
- * This function initializes the Rx packet buffer.
- * If the configuration is incorrect, the function will return error.
- *
- * It is recommended to use PBUF_DEFINE macro for build time initialization.
- *
- * @param pb	Pointer to the packed buffer containing
- *		configuration and data. Configuration has to be
- *		fixed before the initialization.
- * @retval 0 on success.
- * @retval -EINVAL when the input parameter is incorrect.
- */
-int pbuf_rx_init(struct pbuf *pb);
+int pbuf_init(struct pbuf *pb);
 
 /**
  * @brief Write specified amount of data to the packet buffer.
diff --git a/subsys/ipc/ipc_service/lib/icmsg.c b/subsys/ipc/ipc_service/lib/icmsg.c
index 9de8a99ad58..e73bdaaa723 100644
--- a/subsys/ipc/ipc_service/lib/icmsg.c
+++ b/subsys/ipc/ipc_service/lib/icmsg.c
@@ -270,14 +270,16 @@ int icmsg_open(const struct icmsg_config_t *conf,
 	k_mutex_init(&dev_data->tx_lock);
 #endif
 
-	int ret = pbuf_tx_init(dev_data->tx_pb);
+	int ret = pbuf_init(dev_data->tx_pb);
 
 	if (ret < 0) {
 		__ASSERT(false, "Incorrect configuration");
 		return ret;
 	}
 
-	(void)pbuf_rx_init(dev_data->rx_pb);
+	/* Initialize local copies of rx_pb. */
+	dev_data->rx_pb->data.wr_idx = 0;
+	dev_data->rx_pb->data.rd_idx = 0;
 
 	ret = pbuf_write(dev_data->tx_pb, magic, sizeof(magic));
 
diff --git a/subsys/ipc/ipc_service/lib/pbuf.c b/subsys/ipc/ipc_service/lib/pbuf.c
index 19ac2525c28..1164f814ca0 100644
--- a/subsys/ipc/ipc_service/lib/pbuf.c
+++ b/subsys/ipc/ipc_service/lib/pbuf.c
@@ -54,7 +54,7 @@ static int validate_cfg(const struct pbuf_cfg *cfg)
 	return 0;
 }
 
-int pbuf_tx_init(struct pbuf *pb)
+int pbuf_init(struct pbuf *pb)
 {
 	if (validate_cfg(pb->cfg) != 0) {
 		return -EINVAL;
@@ -77,18 +77,6 @@ int pbuf_tx_init(struct pbuf *pb)
 	return 0;
 }
 
-int pbuf_rx_init(struct pbuf *pb)
-{
-	if (validate_cfg(pb->cfg) != 0) {
-		return -EINVAL;
-	}
-	/* Initialize local copy of indexes. */
-	pb->data.wr_idx = 0;
-	pb->data.rd_idx = 0;
-
-	return 0;
-}
-
 int pbuf_write(struct pbuf *pb, const char *data, uint16_t len)
 {
 	if (pb == NULL || len == 0 || data == NULL) {
diff --git a/tests/subsys/ipc/pbuf/src/main.c b/tests/subsys/ipc/pbuf/src/main.c
index 9eb26695c08..d4bbb9db4fe 100644
--- a/tests/subsys/ipc/pbuf/src/main.c
+++ b/tests/subsys/ipc/pbuf/src/main.c
@@ -58,7 +58,7 @@ ZTEST(test_pbuf, test_rw)
 		write_buf[i] = i+1;
 	}
 
-	zassert_equal(pbuf_tx_init(&pb), 0);
+	zassert_equal(pbuf_init(&pb), 0);
 
 	/* Write MSGA_SZ bytes packet. */
 	ret = pbuf_write(&pb, write_buf, MSGA_SZ);
@@ -132,9 +132,9 @@ ZTEST(test_pbuf, test_retcodes)
 	};
 
 	/* Initialize buffers. */
-	zassert_equal(pbuf_tx_init(&pb0), 0);
-	zassert_equal(pbuf_tx_init(&pb1), 0);
-	zassert_equal(pbuf_tx_init(&pb2), 0);
+	zassert_equal(pbuf_init(&pb0), 0);
+	zassert_equal(pbuf_init(&pb1), 0);
+	zassert_equal(pbuf_init(&pb2), 0);
 
 	print_pbuf_info(&pb0);
 	print_pbuf_info(&pb1);
@@ -274,7 +274,7 @@ ZTEST(test_pbuf, test_stress)
 		.cfg = &cfg,
 	};
 
-	zassert_equal(pbuf_tx_init(&pb), 0);
+	zassert_equal(pbuf_init(&pb), 0);
 	ctx.pbuf = &pb;
 	ctx.wr_cnt = 0;
 	ctx.rd_cnt = 0;

From a8ade12ac243feb7bfdc1ccbad66adbfccefbe0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:05 +0100
Subject: [PATCH 1973/2913] Revert "[nrf fromtree] boards native: Add function
 to remap embedded address"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ddc4224f2f4a7fc7144b1d4b1a4544e39180ac3b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/native/nrf_bsim/CMakeLists.txt |  1 -
 boards/native/nrf_bsim/native_remap.c | 12 ------------
 soc/native/inf_clock/CMakeLists.txt   |  1 -
 soc/native/inf_clock/native_remap.c   | 16 ----------------
 soc/native/inf_clock/soc.h            | 15 ---------------
 5 files changed, 45 deletions(-)
 delete mode 100644 boards/native/nrf_bsim/native_remap.c
 delete mode 100644 soc/native/inf_clock/native_remap.c

diff --git a/boards/native/nrf_bsim/CMakeLists.txt b/boards/native/nrf_bsim/CMakeLists.txt
index 6aeb3f01634..d55a52e1a53 100644
--- a/boards/native/nrf_bsim/CMakeLists.txt
+++ b/boards/native/nrf_bsim/CMakeLists.txt
@@ -24,7 +24,6 @@ zephyr_library_sources(
 	cpu_wait.c
 	argparse.c
 	nsi_if.c
-	native_remap.c
 	soc/nrfx_coredep.c
 	common/bstests_entry.c
 	common/cmsis/cmsis.c
diff --git a/boards/native/nrf_bsim/native_remap.c b/boards/native/nrf_bsim/native_remap.c
deleted file mode 100644
index d8b756a9576..00000000000
--- a/boards/native/nrf_bsim/native_remap.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include <stdbool.h>
-#include "NHW_misc.h"
-
-bool native_emb_addr_remap(void **addr)
-{
-	return nhw_convert_RAM_addr(addr);
-}
diff --git a/soc/native/inf_clock/CMakeLists.txt b/soc/native/inf_clock/CMakeLists.txt
index 494ea4de774..7f9d09b2c34 100644
--- a/soc/native/inf_clock/CMakeLists.txt
+++ b/soc/native/inf_clock/CMakeLists.txt
@@ -8,7 +8,6 @@ zephyr_library_compile_definitions(NO_POSIX_CHEATS)
 zephyr_library_sources(
 	soc.c
 	native_tasks.c
-	native_remap.c
 	)
 
 zephyr_library_include_directories(
diff --git a/soc/native/inf_clock/native_remap.c b/soc/native/inf_clock/native_remap.c
deleted file mode 100644
index 4aa6bd1129e..00000000000
--- a/soc/native/inf_clock/native_remap.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include <stdbool.h>
-#include <zephyr/toolchain.h>
-
-/**
- * Dummy version which does nothing
- * Boards which do not have a better implementation can use this
- */
-__weak bool native_emb_addr_remap(void **addr)
-{
-	return false;
-}
diff --git a/soc/native/inf_clock/soc.h b/soc/native/inf_clock/soc.h
index c7de6c22802..36d54ac3f72 100644
--- a/soc/native/inf_clock/soc.h
+++ b/soc/native/inf_clock/soc.h
@@ -7,7 +7,6 @@
 #ifndef _POSIX_SOC_INF_CLOCK_SOC_H
 #define _POSIX_SOC_INF_CLOCK_SOC_H
 
-#include <stdbool.h>
 #include <zephyr/toolchain.h>
 #include "board_soc.h"
 #include "posix_soc.h"
@@ -19,20 +18,6 @@ extern "C" {
 
 void posix_soc_clean_up(void);
 
-/**
- * Remap an embedded device address, into an address which can be used in the simulated native
- * board.
- *
- * If the provided address is not in a range known to this function it will not be modified and the
- * function will return false.
- * Otherwise the provided address pointer will be modified, and true returned.
- *
- * Note: The SOC provides a dummy version of this function which does nothing,
- * so all boards will have an implementation.
- * It is optional for boards to provide one if desired.
- */
-bool native_emb_addr_remap(void **addr);
-
 #ifdef __cplusplus
 }
 #endif

From 9412f380c0056493fc000612ce1218dd03761908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:05 +0100
Subject: [PATCH 1974/2913] Revert "[nrf fromtree] manifest: Update nRF hw
 models to latest"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 87eac82389dff474cbf87680b6d4bebe3f4f660a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 241102be58f..a51048b6857 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: bf8e45bd1f870e49cc15392e045c28d54ea12285
+      revision: 85944c64f224406e4d781aa382c5f1f71ed307fd
       path: modules/bsim_hw_models/nrf_hw_models
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719

From c117f2ddd4c918a751ab150ac27dcd8198cc41f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:05 +0100
Subject: [PATCH 1975/2913] Revert "[nrf fromtree] subsys/ipc icmsg_me.c: Fix
 ssize_t build error for some libCs"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit adeae59ecca964035196a3890e90f7b4451375b2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/ipc/ipc_service/lib/icmsg_me.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/subsys/ipc/ipc_service/lib/icmsg_me.c b/subsys/ipc/ipc_service/lib/icmsg_me.c
index 8606b56161e..b4d384e6bb0 100644
--- a/subsys/ipc/ipc_service/lib/icmsg_me.c
+++ b/subsys/ipc/ipc_service/lib/icmsg_me.c
@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#undef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200809L
-
 #include <zephyr/ipc/icmsg_me.h>
 #include <zephyr/sys/math_extras.h>
 

From 020407291840735f9ed005fbd8fd64c5d4071d34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:05 +0100
Subject: [PATCH 1976/2913] Revert "[nrf fromtree] manifest: Update nRF hw
 models to latest"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6a817e873b4473c91a794f33d41e5a21b454a043.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index a51048b6857..35a33b0efc6 100644
--- a/west.yml
+++ b/west.yml
@@ -300,7 +300,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: 85944c64f224406e4d781aa382c5f1f71ed307fd
+      revision: d2a119a9c7600ce06033a794de042e0ad9a38702
       path: modules/bsim_hw_models/nrf_hw_models
     - name: open-amp
       revision: b735edbc739ad59156eb55bb8ce2583d74537719

From 0a9bba5079d9d76fca4b558d5065830454d65288 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:05 +0100
Subject: [PATCH 1977/2913] Revert "[nrf fromtree] tests: lib: cpp: cxx: ignore
 nRF54H20 DK 0.8.0"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c3e879549d27c91dff147cf2367266da08a5ddfe.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/lib/cpp/cxx/testcase.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/lib/cpp/cxx/testcase.yaml b/tests/lib/cpp/cxx/testcase.yaml
index 642a2ed984d..5601886b150 100644
--- a/tests/lib/cpp/cxx/testcase.yaml
+++ b/tests/lib/cpp/cxx/testcase.yaml
@@ -42,8 +42,6 @@ tests:
       - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
-      - nrf54h20dk@0.8.0/nrf54h20/cpuapp
-      - nrf54h20dk@0.8.0/nrf54h20/cpurad
       - nrf9280pdk/nrf9280/cpuapp
       - nrf9280pdk/nrf9280/cpurad
     filter: not CONFIG_HAS_RENESAS_RA_FSP

From 85b267737b6187882255d87c6357c44c9d8d1121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:05 +0100
Subject: [PATCH 1978/2913] Revert "[nrf fromtree] boards: nrf54h20dk: add
 board revision 0.9.0"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ed2899ae54e8f3b97cd5386e77256a97c589729c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk   |  6 -----
 boards/nordic/nrf54h20dk/board.yml            |  3 +--
 .../nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml     | 24 -------------------
 .../nrf54h20dk_nrf54h20_cpuflpr_0_9_0.yaml    | 18 --------------
 ...nrf54h20dk_nrf54h20_cpuflpr_xip_0_9_0.yaml | 14 -----------
 .../nrf54h20dk_nrf54h20_cpuppr_0_9_0.yaml     | 18 --------------
 .../nrf54h20dk_nrf54h20_cpuppr_xip_0_9_0.yaml | 14 -----------
 .../nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml     | 19 ---------------
 8 files changed, 1 insertion(+), 115 deletions(-)
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_9_0.yaml
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_9_0.yaml
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_9_0.yaml
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_9_0.yaml
 delete mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml

diff --git a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
index af29072fbd5..aa8c8edbe2d 100644
--- a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
+++ b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
@@ -8,9 +8,3 @@ config BOARD_NRF54H20DK
 				       BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP) && BOARD_REVISION = "0.8.0"
 	select SOC_NRF54H20_ENGB_CPUFLPR if (BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
 				        BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP) && BOARD_REVISION = "0.8.0"
-	select SOC_NRF54H20_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP && BOARD_REVISION = "0.9.0"
-	select SOC_NRF54H20_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD && BOARD_REVISION = "0.9.0"
-	select SOC_NRF54H20_CPUPPR if (BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
-				       BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP) && BOARD_REVISION = "0.9.0"
-	select SOC_NRF54H20_CPUFLPR if (BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
-				        BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP) && BOARD_REVISION = "0.9.0"
diff --git a/boards/nordic/nrf54h20dk/board.yml b/boards/nordic/nrf54h20dk/board.yml
index 7d57b61cd53..29f1d78c436 100644
--- a/boards/nordic/nrf54h20dk/board.yml
+++ b/boards/nordic/nrf54h20dk/board.yml
@@ -10,7 +10,6 @@ board:
       cpucluster: cpuflpr
   revision:
     format: major.minor.patch
-    default: "0.9.0"
+    default: "0.8.0"
     revisions:
     - name: "0.8.0"
-    - name: "0.9.0"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
deleted file mode 100644
index 89b85746540..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54h20dk/nrf54h20/cpuapp
-name: nRF54H20-DK-nRF54H20-Application (revision 0.9.0)
-type: mcu
-arch: arm
-toolchain:
-  - gnuarmemb
-  - xtools
-  - zephyr
-sysbuild: true
-ram: 256
-flash: 296
-supported:
-  - adc
-  - can
-  - counter
-  - gpio
-  - i2c
-  - pwm
-  - spi
-  - watchdog
-  - usbd
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_9_0.yaml
deleted file mode 100644
index ff9513fd593..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_9_0.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54h20dk/nrf54h20/cpuflpr
-name: nRF54H20-DK-nRF54H20-FLPR (revision 0.9.0)
-type: mcu
-arch: riscv
-toolchain:
-  - zephyr
-sysbuild: true
-ram: 46
-flash: 46
-supported:
-  - counter
-  - gpio
-  - i2c
-  - pwm
-  - spi
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_9_0.yaml
deleted file mode 100644
index e2880af9be3..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_9_0.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54h20dk/nrf54h20/cpuflpr/xip
-name: nRF54H20-DK-nRF54H20-FLPR (MRAM XIP) (revision 0.9.0)
-type: mcu
-arch: riscv
-toolchain:
-  - zephyr
-sysbuild: true
-ram: 46
-flash: 48
-supported:
-  - gpio
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_9_0.yaml
deleted file mode 100644
index 60f22350504..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_9_0.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54h20dk/nrf54h20/cpuppr
-name: nRF54H20-DK-nRF54H20-PPR (revision 0.9.0)
-type: mcu
-arch: riscv
-toolchain:
-  - zephyr
-sysbuild: true
-ram: 62
-flash: 62
-supported:
-  - counter
-  - gpio
-  - i2c
-  - pwm
-  - spi
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_9_0.yaml
deleted file mode 100644
index 7198a379a9c..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_9_0.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54h20dk/nrf54h20/cpuppr/xip
-name: nRF54H20-DK-nRF54H20-PPR (MRAM XIP) (revision 0.9.0)
-type: mcu
-arch: riscv
-toolchain:
-  - zephyr
-sysbuild: true
-ram: 62
-flash: 64
-supported:
-  - gpio
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml
deleted file mode 100644
index 818a8d74b79..00000000000
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54h20dk/nrf54h20/cpurad
-name: nRF54H20-DK-nRF54H20-Radio (revision 0.9.0)
-type: mcu
-arch: arm
-toolchain:
-  - gnuarmemb
-  - xtools
-  - zephyr
-sysbuild: true
-ram: 192
-flash: 256
-supported:
-  - counter
-  - gpio
-  - pwm
-  - spi

From 435167021a2289f21c29e9e0eefb61a8cedce7c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:05 +0100
Subject: [PATCH 1979/2913] Revert "[nrf fromtree] boards: nrf54h20dk:
 introduce revision 0.8.0 (current)"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4d4f72121b5e22338d5dd44d5820635c9063fb40.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk          | 12 ++++++------
 boards/nordic/nrf54h20dk/board.yml                   |  5 -----
 ...pp_0_8_0.yaml => nrf54h20dk_nrf54h20_cpuapp.yaml} |  4 ++--
 ...r_0_8_0.yaml => nrf54h20dk_nrf54h20_cpuflpr.yaml} |  4 ++--
 ...8_0.yaml => nrf54h20dk_nrf54h20_cpuflpr_xip.yaml} |  4 ++--
 ...pr_0_8_0.yaml => nrf54h20dk_nrf54h20_cpuppr.yaml} |  4 ++--
 ..._8_0.yaml => nrf54h20dk_nrf54h20_cpuppr_xip.yaml} |  4 ++--
 ...ad_0_8_0.yaml => nrf54h20dk_nrf54h20_cpurad.yaml} |  4 ++--
 8 files changed, 18 insertions(+), 23 deletions(-)
 rename boards/nordic/nrf54h20dk/{nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml => nrf54h20dk_nrf54h20_cpuapp.yaml} (73%)
 rename boards/nordic/nrf54h20dk/{nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml => nrf54h20dk_nrf54h20_cpuflpr.yaml} (69%)
 rename boards/nordic/nrf54h20dk/{nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml => nrf54h20dk_nrf54h20_cpuflpr_xip.yaml} (62%)
 rename boards/nordic/nrf54h20dk/{nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml => nrf54h20dk_nrf54h20_cpuppr.yaml} (70%)
 rename boards/nordic/nrf54h20dk/{nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml => nrf54h20dk_nrf54h20_cpuppr_xip.yaml} (62%)
 rename boards/nordic/nrf54h20dk/{nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml => nrf54h20dk_nrf54h20_cpurad.yaml} (71%)

diff --git a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
index aa8c8edbe2d..9a260be4868 100644
--- a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
+++ b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF54H20DK
-	select SOC_NRF54H20_ENGB_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP && BOARD_REVISION = "0.8.0"
-	select SOC_NRF54H20_ENGB_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD && BOARD_REVISION = "0.8.0"
-	select SOC_NRF54H20_ENGB_CPUPPR if (BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
-				       BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP) && BOARD_REVISION = "0.8.0"
-	select SOC_NRF54H20_ENGB_CPUFLPR if (BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
-				        BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP) && BOARD_REVISION = "0.8.0"
+	select SOC_NRF54H20_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP
+	select SOC_NRF54H20_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD
+	select SOC_NRF54H20_CPUPPR if BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
+				      BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP
+	select SOC_NRF54H20_CPUFLPR if BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
+				       BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP
diff --git a/boards/nordic/nrf54h20dk/board.yml b/boards/nordic/nrf54h20dk/board.yml
index 29f1d78c436..61690145d9f 100644
--- a/boards/nordic/nrf54h20dk/board.yml
+++ b/boards/nordic/nrf54h20dk/board.yml
@@ -8,8 +8,3 @@ board:
       cpucluster: cpuppr
     - name: xip
       cpucluster: cpuflpr
-  revision:
-    format: major.minor.patch
-    default: "0.8.0"
-    revisions:
-    - name: "0.8.0"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.yaml
similarity index 73%
rename from boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml
rename to boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.yaml
index 01c44b51577..1fb5a039875 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.yaml
@@ -1,8 +1,8 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-identifier: nrf54h20dk@0.8.0/nrf54h20/cpuapp
-name: nRF54H20-DK-nRF54H20-Application (revision 0.8.0)
+identifier: nrf54h20dk/nrf54h20/cpuapp
+name: nRF54H20-DK-nRF54H20-Application
 type: mcu
 arch: arm
 toolchain:
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr.yaml
similarity index 69%
rename from boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml
rename to boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr.yaml
index bd60b8d2af3..ba7d9a93382 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr.yaml
@@ -1,8 +1,8 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-identifier: nrf54h20dk@0.8.0/nrf54h20/cpuflpr
-name: nRF54H20-DK-nRF54H20-FLPR (revision 0.8.0)
+identifier: nrf54h20dk/nrf54h20/cpuflpr
+name: nRF54H20-DK-nRF54H20-FLPR
 type: mcu
 arch: riscv
 toolchain:
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip.yaml
similarity index 62%
rename from boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml
rename to boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip.yaml
index 7deaf20135f..63c771688b4 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip.yaml
@@ -1,8 +1,8 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-identifier: nrf54h20dk@0.8.0/nrf54h20/cpuflpr/xip
-name: nRF54H20-DK-nRF54H20-FLPR (MRAM XIP) (revision 0.8.0)
+identifier: nrf54h20dk/nrf54h20/cpuflpr/xip
+name: nRF54H20-DK-nRF54H20-FLPR (MRAM XIP)
 type: mcu
 arch: riscv
 toolchain:
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr.yaml
similarity index 70%
rename from boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml
rename to boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr.yaml
index 26412657070..db1bf4fbefe 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr.yaml
@@ -1,8 +1,8 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-identifier: nrf54h20dk@0.8.0/nrf54h20/cpuppr
-name: nRF54H20-DK-nRF54H20-PPR (revision 0.8.0)
+identifier: nrf54h20dk/nrf54h20/cpuppr
+name: nRF54H20-DK-nRF54H20-PPR
 type: mcu
 arch: riscv
 toolchain:
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip.yaml
similarity index 62%
rename from boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml
rename to boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip.yaml
index 0ce1718cb60..8cfc343647f 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip.yaml
@@ -1,8 +1,8 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-identifier: nrf54h20dk@0.8.0/nrf54h20/cpuppr/xip
-name: nRF54H20-DK-nRF54H20-PPR (MRAM XIP) (revision 0.8.0)
+identifier: nrf54h20dk/nrf54h20/cpuppr/xip
+name: nRF54H20-DK-nRF54H20-PPR (MRAM XIP)
 type: mcu
 arch: riscv
 toolchain:
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.yaml
similarity index 71%
rename from boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml
rename to boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.yaml
index 26df539a803..36c0fc01dce 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.yaml
@@ -1,8 +1,8 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-identifier: nrf54h20dk@0.8.0/nrf54h20/cpurad
-name: nRF54H20-DK-nRF54H20-Radio (revision 0.8.0)
+identifier: nrf54h20dk/nrf54h20/cpurad
+name: nRF54H20-DK-nRF54H20-Radio
 type: mcu
 arch: arm
 toolchain:

From b5a7a142b887509921456e2fac74d90ba94f60f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:06 +0100
Subject: [PATCH 1980/2913] Revert "[nrf fromtree] scripts: west_commands:
 runners: nrf: add support for nRF54H20 EngB"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6d24ecb6dffd9074bb369d863e26e6184bf583a1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/west_commands/runners/nrf_common.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index 6423253233c..35f1f53b07f 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -259,16 +259,8 @@ def program_hex(self):
         if self.family in ('NRF54H_FAMILY', 'NRF92_FAMILY'):
             erase_arg = 'ERASE_NONE'
 
-            cpuapp = (
-                self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPUAPP') or
-                self.build_conf.getboolean('CONFIG_SOC_NRF54H20_ENGB_CPUAPP') or
-                self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPUAPP')
-            )
-            cpurad = (
-                self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPURAD') or
-                self.build_conf.getboolean('CONFIG_SOC_NRF54H20_ENGB_CPURAD') or
-                self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPURAD')
-            )
+            cpuapp = self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPUAPP') or self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPUAPP')
+            cpurad = self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPURAD') or self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPURAD')
 
             if self.erase:
                 self.exec_op('erase', core='NRFDL_DEVICE_CORE_APPLICATION')

From 7b23925085a32716da867c634e310219b6b3027a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:06 +0100
Subject: [PATCH 1981/2913] Revert "[nrf fromtree] drivers: adc: nrfx_saadc:
 use CONFIG_NRF_PLATFORM_HALTIUM"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit dd771a886d0b2161ae69359cc3eb19f49813faa7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/adc/adc_nrfx_saadc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index 132e8e78c3e..052eab45b6c 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(adc_nrfx_saadc);
 
 #if (NRF_SAADC_HAS_AIN_AS_PIN)
 
-#if defined(CONFIG_NRF_PLATFORM_HALTIUM)
+#if defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280)
 static const uint8_t saadc_psels[NRF_SAADC_AIN7 + 1] = {
 	[NRF_SAADC_AIN0] = NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
 	[NRF_SAADC_AIN1] = NRF_PIN_PORT_TO_PIN_NUMBER(1U, 1),

From 40245afd056b783b7458b7964640981c5e10f2fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:06 +0100
Subject: [PATCH 1982/2913] Revert "[nrf fromtree] modules: hal_nordic: nrfs:
 add support for nRF54H20 EngB"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9892f3b7a5470209fed995c21bf5558ade1e8174.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/nrfs/Kconfig | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig
index 96d4c7f45cd..b027febd2a5 100644
--- a/modules/hal_nordic/nrfs/Kconfig
+++ b/modules/hal_nordic/nrfs/Kconfig
@@ -36,12 +36,7 @@ config NRFS_HAS_VBUS_DETECTOR_SERVICE
 
 config NRFS
 	bool "nRF Services Support"
-	select NRFS_LOCAL_DOMAIN if SOC_NRF54H20_CPUAPP || \
-				    SOC_NRF54H20_ENGB_CPUAPP || \
-				    SOC_NRF54H20_CPURAD || \
-				    SOC_NRF54H20_ENGB_CPURAD || \
-				    SOC_NRF9280_CPUAPP || \
-				    SOC_NRF9280_CPURAD
+	select NRFS_LOCAL_DOMAIN if (SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD || SOC_NRF9280_CPUAPP || SOC_NRF9280_CPURAD)
 	depends on HAS_NRFS
 	help
 	  This option enables the nRF Services library.

From c88ea572178c9262e38a4b33ab3ad2900a20569d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:06 +0100
Subject: [PATCH 1983/2913] Revert "[nrf fromtree] modules: hal_nordic: add
 support for nRF54H20 EngB"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3e3f3a6b92ba40d31933f5352a4357e879bbea01.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/nrfx/CMakeLists.txt        | 12 --------
 modules/hal_nordic/nrfx/nrfx_config.h         |  8 +++---
 .../nrfx/nrfx_config_nrf54h20_application.h   | 19 ++++++-------
 .../nrfx/nrfx_config_nrf54h20_flpr.h          | 27 ++++++------------
 .../nrfx/nrfx_config_nrf54h20_ppr.h           | 28 ++++++-------------
 .../nrfx/nrfx_config_nrf54h20_radiocore.h     | 18 ++++++------
 6 files changed, 40 insertions(+), 72 deletions(-)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 8d7adc114d7..cc1731b1e50 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -44,14 +44,6 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUPPR     NRF54H20_XXAA
                                                                 NRF_PPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR    NRF54H20_XXAA
                                                                 NRF_FLPR)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP NRF54H20_ENGB_XXAA
-                                                                 NRF_APPLICATION)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD NRF54H20_ENGB_XXAA
-                                                                 NRF_RADIOCORE)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR NRF54H20_ENGB_XXAA
-                                                                 NRF_PPR)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR NRF54H20_ENGB_XXAA
-                                                                  NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA       NRF54L15_ENGA_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUAPP NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR NRF_FLPR)
@@ -229,10 +221,6 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUAPP      nrf54h20_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUPPR      nrf54h20_ppr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR     nrf54h20_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPURAD      nrf54h20_radiocore.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP  nrf54h20_engb_application.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR  nrf54h20_engb_ppr.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR nrf54h20_engb_flpr.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD  nrf54h20_engb_radiocore.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUAPP nrf54l15_enga_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR nrf54l15_enga_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP      nrf54l15_application.svd)
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index a7632a8cc43..609c066338e 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -1042,13 +1042,13 @@
     #include <nrfx_config_nrf5340_application.h>
 #elif defined(NRF5340_XXAA_NETWORK)
     #include <nrfx_config_nrf5340_network.h>
-#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_APPLICATION)
+#elif defined(NRF54H20_XXAA) && defined(NRF_APPLICATION)
     #include <nrfx_config_nrf54h20_application.h>
-#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_RADIOCORE)
+#elif defined(NRF54H20_XXAA) && defined(NRF_RADIOCORE)
     #include <nrfx_config_nrf54h20_radiocore.h>
-#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_PPR)
+#elif defined(NRF54H20_XXAA) && defined(NRF_PPR)
     #include <nrfx_config_nrf54h20_ppr.h>
-#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_FLPR)
+#elif defined(NRF54H20_XXAA) && defined(NRF_FLPR)
     #include <nrfx_config_nrf54h20_flpr.h>
 #elif (defined(NRF54L15_XXAA) || defined(NRF54L15_ENGA_XXAA)) && defined(NRF_APPLICATION)
     #include <nrfx_config_nrf54l15_enga_application.h>
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_application.h
index 3caed86c48b..7f5d4d30ce9 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_application.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_application.h
@@ -11,7 +11,6 @@
 #error "This file should not be included directly. Include nrfx_config.h instead."
 #endif
 
-
 /**
  * @brief NRFX_DEFAULT_IRQ_PRIORITY
  *
@@ -359,30 +358,30 @@
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
+ * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
+#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 0
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 0
 #endif
 
 /**
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_flpr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_flpr.h
index f5689f79a96..77f5c3c9fc5 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_flpr.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_flpr.h
@@ -254,30 +254,30 @@
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
+ * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
+#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 0
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 0
 #endif
 
 /**
@@ -1619,15 +1619,6 @@
 #define NRFX_UARTE_CONFIG_RX_CACHE_ENABLED 1
 #endif
 
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
 /**
  * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
  *
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_ppr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_ppr.h
index 35716978f28..d274abb5b88 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_ppr.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_ppr.h
@@ -11,7 +11,6 @@
 #error "This file should not be included directly. Include nrfx_config.h instead."
 #endif
 
-
 /**
  * @brief NRFX_DEFAULT_IRQ_PRIORITY
  *
@@ -63,15 +62,6 @@
 #define NRFX_COMP_CONFIG_LOG_LEVEL 3
 #endif
 
-/**
- * @brief NRFX_COREDEP_VPR_LEGACY
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COREDEP_VPR_LEGACY
-#define NRFX_COREDEP_VPR_LEGACY 0
-#endif
-
 /**
  * @brief NRFX_DPPI_ENABLED
  *
@@ -314,30 +304,30 @@
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
+ * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
+#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 0
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 0
 #endif
 
 /**
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_radiocore.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_radiocore.h
index 5847cace47e..3a6cde96126 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_radiocore.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_radiocore.h
@@ -395,30 +395,30 @@
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
+ * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
+#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 0
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 0
 #endif
 
 /**

From a5f826b7a661a56dd0e0e71566d2b633ddcf07e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:06 +0100
Subject: [PATCH 1984/2913] Revert "[nrf fromtree] soc: nordic: nrf54h20: add
 support for nRF54H20 EngB"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d750d7e3e357c72d0376e4bfbbdaae8c36d1748b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54h/Kconfig                     | 24 ++------------
 .../nrf54h/Kconfig.defconfig.nrf54h20_cpuapp  |  4 +--
 .../nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr |  4 +--
 .../nrf54h/Kconfig.defconfig.nrf54h20_cpuppr  |  4 +--
 .../nrf54h/Kconfig.defconfig.nrf54h20_cpurad  |  4 +--
 soc/nordic/nrf54h/Kconfig.soc                 | 32 +------------------
 soc/nordic/nrf54h/soc.h                       |  4 +--
 7 files changed, 13 insertions(+), 63 deletions(-)

diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
index 51dc4e07480..dd647174b14 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -9,8 +9,7 @@ config SOC_SERIES_NRF54HX
 	select HAS_NORDIC_DRIVERS
 	select NRF_PLATFORM_HALTIUM
 
-config SOC_NRF54H20_CPUAPP_COMMON
-	bool
+config SOC_NRF54H20_CPUAPP
 	select ARM
 	select ARMV8_M_DSP
 	select CPU_CORTEX_M33
@@ -30,14 +29,7 @@ config SOC_NRF54H20_CPUAPP_COMMON
 	select HAS_PM
 	select HAS_POWEROFF
 
-config SOC_NRF54H20_CPUAPP
-	select SOC_NRF54H20_CPUAPP_COMMON
-
-config SOC_NRF54H20_ENGB_CPUAPP
-	select SOC_NRF54H20_CPUAPP_COMMON
-
-config SOC_NRF54H20_CPURAD_COMMON
-	bool
+config SOC_NRF54H20_CPURAD
 	select ARM
 	select ARMV8_M_DSP
 	select CPU_CORTEX_M33
@@ -56,20 +48,8 @@ config SOC_NRF54H20_CPURAD_COMMON
 	select HAS_PM
 	select HAS_POWEROFF
 
-config SOC_NRF54H20_CPURAD
-	select SOC_NRF54H20_CPURAD_COMMON
-
-config SOC_NRF54H20_ENGB_CPURAD
-	select SOC_NRF54H20_CPURAD_COMMON
-
 config SOC_NRF54H20_CPUPPR
 	depends on RISCV_CORE_NORDIC_VPR
 
-config SOC_NRF54H20_ENGB_CPUPPR
-	depends on RISCV_CORE_NORDIC_VPR
-
 config SOC_NRF54H20_CPUFLPR
 	depends on RISCV_CORE_NORDIC_VPR
-
-config SOC_NRF54H20_ENGB_CPUFLPR
-	depends on RISCV_CORE_NORDIC_VPR
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
index 2a04f58f672..1a53fb5ff32 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
@@ -3,7 +3,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
+if SOC_NRF54H20_CPUAPP
 
 config NUM_IRQS
 	default 471
@@ -11,4 +11,4 @@ config NUM_IRQS
 config NRF_REGTOOL_GENERATE_UICR
 	default y
 
-endif # SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
+endif # SOC_NRF54H20_CPUAPP
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
index 97b1e89a9c1..2b792e9f1b9 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR
+if SOC_NRF54H20_CPUFLPR
 
 config NUM_IRQS
 	default 496
@@ -10,4 +10,4 @@ config NUM_IRQS
 config ASSERT
 	default n
 
-endif # SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR
+endif # SOC_NRF54H20_CPUFLPR
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
index 02649146ad7..bf7c12a3a69 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR
+if SOC_NRF54H20_CPUPPR
 
 config NUM_IRQS
 	default 496
@@ -13,4 +13,4 @@ config SYS_CLOCK_TICKS_PER_SEC
 config ASSERT
 	default n
 
-endif # SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR
+endif # SOC_NRF54H20_CPUPPR
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad
index 9ad0b30e1c8..4437e7aadc4 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad
@@ -3,7 +3,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
+if SOC_NRF54H20_CPURAD
 
 config NUM_IRQS
 	default 471
@@ -11,4 +11,4 @@ config NUM_IRQS
 config NRF_REGTOOL_GENERATE_UICR
 	default y
 
-endif # SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
+endif # SOC_NRF54H20_CPURAD
diff --git a/soc/nordic/nrf54h/Kconfig.soc b/soc/nordic/nrf54h/Kconfig.soc
index 852e92bb138..459854e13b2 100644
--- a/soc/nordic/nrf54h/Kconfig.soc
+++ b/soc/nordic/nrf54h/Kconfig.soc
@@ -9,59 +9,29 @@ config SOC_NRF54H20
 	help
 	  nRF54H20
 
-config SOC_NRF54H20_ENGB
-	bool
-	select SOC_SERIES_NRF54HX
-	help
-	  nRF54H20 (EngB)
-
 config SOC_NRF54H20_CPUAPP
 	bool
 	select SOC_NRF54H20
 	help
 	  nRF54H20 CPUAPP
 
-config SOC_NRF54H20_ENGB_CPUAPP
-	bool
-	select SOC_NRF54H20_ENGB
-	help
-	  nRF54H20 (EngB) CPUAPP
-
 config SOC_NRF54H20_CPURAD
 	bool
 	select SOC_NRF54H20
 	help
 	  nRF54H20 CPURAD
 
-config SOC_NRF54H20_ENGB_CPURAD
-	bool
-	select SOC_NRF54H20_ENGB
-	help
-	  nRF54H20 (EngB) CPURAD
-
 config SOC_NRF54H20_CPUPPR
 	bool
 	select SOC_NRF54H20
 	help
 	  nRF54H20 CPUPPR
 
-config SOC_NRF54H20_ENGB_CPUPPR
-	bool
-	select SOC_NRF54H20_ENGB
-	help
-	  nRF54H20 (EngB) CPUPPR
-
 config SOC_NRF54H20_CPUFLPR
 	bool
 	select SOC_NRF54H20
 	help
 	  nRF54H20 CPUFLPR
 
-config SOC_NRF54H20_ENGB_CPUFLPR
-	bool
-	select SOC_NRF54H20_ENGB
-	help
-	  nRF54H20 (EngB) CPUFLPR
-
 config SOC
-	default "nrf54h20" if SOC_NRF54H20 || SOC_NRF54H20_ENGB
+	default "nrf54h20" if SOC_NRF54H20
diff --git a/soc/nordic/nrf54h/soc.h b/soc/nordic/nrf54h/soc.h
index db79e2c8c72..566c07a8c2c 100644
--- a/soc/nordic/nrf54h/soc.h
+++ b/soc/nordic/nrf54h/soc.h
@@ -9,7 +9,7 @@
 
 #include <soc_nrf_common.h>
 
-#if defined(CONFIG_SOC_NRF54H20_CPUAPP) || defined(CONFIG_SOC_NRF54H20_ENGB_CPUAPP)
+#if defined(CONFIG_SOC_NRF54H20_CPUAPP)
 #define RAMBLOCK_CONTROL_BIT_ICACHE MEMCONF_POWER_CONTROL_MEM1_Pos
 #define RAMBLOCK_CONTROL_BIT_DCACHE MEMCONF_POWER_CONTROL_MEM2_Pos
 #define RAMBLOCK_POWER_ID           0
@@ -17,7 +17,7 @@
 #define RAMBLOCK_RET_MASK           (MEMCONF_POWER_RET_MEM0_Msk)
 #define RAMBLOCK_RET_BIT_ICACHE     MEMCONF_POWER_RET_MEM1_Pos
 #define RAMBLOCK_RET_BIT_DCACHE     MEMCONF_POWER_RET_MEM2_Pos
-#elif defined(CONFIG_SOC_NRF54H20_CPURAD) || defined(CONFIG_SOC_NRF54H20_ENGB_CPURAD)
+#elif defined(CONFIG_SOC_NRF54H20_CPURAD)
 #define RAMBLOCK_CONTROL_BIT_ICACHE MEMCONF_POWER_CONTROL_MEM6_Pos
 #define RAMBLOCK_CONTROL_BIT_DCACHE MEMCONF_POWER_CONTROL_MEM7_Pos
 #define RAMBLOCK_POWER_ID           0

From eabef2d59e015e5a0291671d65a906e933176ff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:06 +0100
Subject: [PATCH 1985/2913] Revert "[nrf fromtree] drivers: timer:
 nrf_grtc_timer: Align Zephyr to new AUTOEN read manner"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6e6844185d4839904250bd7c59914ccfbc3586dc.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/timer/Kconfig.nrf_grtc                      |  9 +++++----
 drivers/timer/nrf_grtc_timer.c                      | 13 ++++++++-----
 modules/hal_nordic/nrfx/nrfx_config.h               |  3 +++
 .../nrfx/nrfx_config_nrf54l15_enga_application.h    |  9 +++++++++
 .../nrfx/nrfx_config_nrf54l15_enga_flpr.h           |  9 +++++++++
 .../nrfx/nrfx_config_nrf9230_engb_application.h     |  9 +++++++++
 .../hal_nordic/nrfx/nrfx_config_nrf9230_engb_ppr.h  |  9 +++++++++
 .../nrfx/nrfx_config_nrf9230_engb_radiocore.h       |  9 +++++++++
 soc/nordic/nrf54l/Kconfig                           |  2 +-
 9 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/drivers/timer/Kconfig.nrf_grtc b/drivers/timer/Kconfig.nrf_grtc
index 082c15333dc..b136f654252 100644
--- a/drivers/timer/Kconfig.nrf_grtc
+++ b/drivers/timer/Kconfig.nrf_grtc
@@ -15,10 +15,11 @@ menuconfig NRF_GRTC_TIMER
 
 if NRF_GRTC_TIMER
 
-config NRF_GRTC_ALWAYS_ON
-	bool
+config NRF_GRTC_SLEEP_ALLOWED
+	def_bool y
+	depends on POWEROFF
 	help
-	  Always keep the SYSCOUNTER active even if the CPU is in sleep mode.
+	  This feature allows GRTC SYSCOUNTER to go to sleep state.
 
 config NRF_GRTC_TIMER_APP_DEFINED_INIT
 	bool "Application defines GRTC initialization"
@@ -43,7 +44,7 @@ config NRF_GRTC_TIMER_CLOCK_MANAGEMENT
 config NRF_GRTC_SYSCOUNTER_SLEEP_MINIMUM_LATENCY
 	int
 	default 1000
-	depends on POWEROFF
+	depends on NRF_GRTC_SLEEP_ALLOWED
 	help
 	  The value (in us) ensures that the wakeup event will not fire
 	  too early. In other words, applying SYSCOUNTER sleep state for less than
diff --git a/drivers/timer/nrf_grtc_timer.c b/drivers/timer/nrf_grtc_timer.c
index 07d58e402c9..187c7e12326 100644
--- a/drivers/timer/nrf_grtc_timer.c
+++ b/drivers/timer/nrf_grtc_timer.c
@@ -367,7 +367,7 @@ int z_nrf_grtc_timer_capture_read(int32_t chan, uint64_t *captured_time)
 	return 0;
 }
 
-#if defined(CONFIG_POWEROFF) && defined(CONFIG_NRF_GRTC_START_SYSCOUNTER)
+#if defined(CONFIG_NRF_GRTC_SLEEP_ALLOWED) && defined(CONFIG_NRF_GRTC_START_SYSCOUNTER)
 int z_nrf_grtc_wakeup_prepare(uint64_t wake_time_us)
 {
 	nrfx_err_t err_code;
@@ -432,7 +432,7 @@ int z_nrf_grtc_wakeup_prepare(uint64_t wake_time_us)
 	k_spin_unlock(&lock, key);
 	return 0;
 }
-#endif /* CONFIG_POWEROFF */
+#endif /* CONFIG_NRF_GRTC_SLEEP_ALLOWED */
 
 uint32_t sys_clock_cycle_get_32(void)
 {
@@ -465,6 +465,12 @@ static int sys_clock_driver_init(void)
 {
 	nrfx_err_t err_code;
 
+#if defined(CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT) &&                                             \
+	(defined(NRF_GRTC_HAS_CLKSEL) && (NRF_GRTC_HAS_CLKSEL == 1))
+	/* Use System LFCLK as the low-frequency clock source during initialization. */
+	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFCLK);
+#endif
+
 	IRQ_CONNECT(DT_IRQN(GRTC_NODE), DT_IRQ(GRTC_NODE, priority), nrfx_isr,
 		    nrfx_grtc_irq_handler, 0);
 
@@ -507,9 +513,6 @@ static int sys_clock_driver_init(void)
 	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFXO);
 #endif
 
-#if defined(CONFIG_NRF_GRTC_ALWAYS_ON)
-	nrfx_grtc_active_request_set(true);
-#endif
 	return 0;
 }
 
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index 609c066338e..9971f39b7af 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -132,6 +132,9 @@
 #ifdef CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT
 #define NRF_GRTC_HAS_EXTENDED 1
 #endif
+#ifdef CONFIG_NRF_GRTC_SLEEP_ALLOWED
+#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 1
+#endif
 #ifdef CONFIG_NRF_GRTC_TIMER_AUTO_KEEP_ALIVE
 #define NRFX_GRTC_CONFIG_AUTOEN 1
 #endif
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_application.h
index aa23f93c9e3..eeea811aeff 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_application.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_application.h
@@ -283,6 +283,15 @@
 #define NRFX_GRTC_ENABLED 0
 #endif
 
+/**
+ * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
+#endif
+
 /**
  * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_flpr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_flpr.h
index 568790051a3..7f3c5a80c2c 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_flpr.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_enga_flpr.h
@@ -283,6 +283,15 @@
 #define NRFX_GRTC_ENABLED 0
 #endif
 
+/**
+ * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
+#endif
+
 /**
  * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_application.h
index 38ce6226468..a7905c199d2 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_application.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_application.h
@@ -367,6 +367,15 @@
 #define NRFX_GRTC_ENABLED 0
 #endif
 
+/**
+ * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
+#endif
+
 /**
  * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_ppr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_ppr.h
index 9ae53d739e9..ae1f931e3da 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_ppr.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_ppr.h
@@ -322,6 +322,15 @@
 #define NRFX_GRTC_ENABLED 0
 #endif
 
+/**
+ * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
+#endif
+
 /**
  * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_radiocore.h b/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_radiocore.h
index 98d71e6b385..84a0a7558e6 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_radiocore.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_radiocore.h
@@ -407,6 +407,15 @@
 #define NRFX_GRTC_ENABLED 0
 #endif
 
+/**
+ * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
+#endif
+
 /**
  * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index eeb12fbfab0..df17dc35d3e 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -86,7 +86,7 @@ if NRF_GRTC_TIMER
 
 config ELV_GRTC_LFXO_ALLOWED
 	bool
-	depends on POWEROFF
+	depends on NRF_GRTC_SLEEP_ALLOWED
 	select EXPERIMENTAL
 	help
 	  This feature allows using ELV mode when GRTC operates with the LFXO as

From 206d735699e361952b0574e243a4031feab31f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:06 +0100
Subject: [PATCH 1986/2913] Revert "[nrf fromtree] bluetooth: controller:
 ll_sw: nordic: align to nrfx 3.7.0"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 01dd1143596f023ee34ef6ba4afe4cfd45dc5f8f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../controller/ll_sw/nordic/hal/nrf5/radio/radio.c        | 4 ++--
 .../ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h           | 8 --------
 .../ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h         | 6 +++---
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
index 9d3a312f51f..8ec0e62fa50 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
@@ -2107,7 +2107,7 @@ static void *radio_ccm_ext_rx_pkt_set(struct ccm *cnf, uint8_t phy, uint8_t pdu_
 	NRF_CCM->SCRATCHPTR = (uint32_t)_ccm_scratch;
 	NRF_CCM->SHORTS = 0;
 	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ENDKSGEN);
-	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_END);
+	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ENDCRYPT);
 	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ERROR);
 
 	nrf_ccm_task_trigger(NRF_CCM, NRF_CCM_TASK_KSGEN);
@@ -2182,7 +2182,7 @@ static void *radio_ccm_ext_tx_pkt_set(struct ccm *cnf, uint8_t pdu_type, void *p
 	NRF_CCM->SCRATCHPTR = (uint32_t)_ccm_scratch;
 	NRF_CCM->SHORTS = CCM_SHORTS_ENDKSGEN_CRYPT_Msk;
 	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ENDKSGEN);
-	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_END);
+	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ENDCRYPT);
 	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ERROR);
 
 	nrf_ccm_task_trigger(NRF_CCM, NRF_CCM_TASK_KSGEN);
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h
index bc0cc2993c5..b0d3948aefb 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h
@@ -633,17 +633,9 @@ static inline uint32_t hal_radio_tx_power_value(int8_t tx_power_lvl)
 		return RADIO_TXPOWER_TXPOWER_Neg20dBm;
 	}
 
-#if defined(RADIO_TXPOWER_TXPOWER_Neg26dBm)
 	if (tx_power_lvl >= -26) {
 		return RADIO_TXPOWER_TXPOWER_Neg26dBm;
 	}
-#endif
-
-#if defined(RADIO_TXPOWER_TXPOWER_Neg28dBm)
-	if (tx_power_lvl >= -28) {
-		return RADIO_TXPOWER_TXPOWER_Neg28dBm;
-	}
-#endif
 
 	if (tx_power_lvl >= -40) {
 		return RADIO_TXPOWER_TXPOWER_Neg40dBm;
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
index 1ddf9af1ccf..770cb70d8cc 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
@@ -149,7 +149,7 @@ static inline void hal_trigger_crypt_ppi_config(void)
 {
 	nrf_radio_publish_set(NRF_RADIO,
 			      NRF_RADIO_EVENT_ADDRESS, HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
-	nrf_ccm_subscribe_set(NRF_CCM, NRF_CCM_TASK_START, HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
+	nrf_ccm_subscribe_set(NRF_CCM, NRF_CCM_TASK_CRYPT, HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
 }
 
 /*******************************************************************************
@@ -157,7 +157,7 @@ static inline void hal_trigger_crypt_ppi_config(void)
  */
 static inline void hal_trigger_crypt_ppi_disable(void)
 {
-	nrf_ccm_subscribe_clear(NRF_CCM, NRF_CCM_TASK_START);
+	nrf_ccm_subscribe_clear(NRF_CCM, NRF_CCM_TASK_CRYPT);
 }
 
 /*******************************************************************************
@@ -207,7 +207,7 @@ static inline void hal_trigger_crypt_by_bcmatch_ppi_config(void)
 	 */
 	nrf_radio_publish_set(NRF_RADIO,
 			      NRF_RADIO_EVENT_BCMATCH, HAL_TRIGGER_CRYPT_DELAY_PPI);
-	nrf_ccm_subscribe_set(NRF_CCM, NRF_CCM_TASK_START, HAL_TRIGGER_CRYPT_DELAY_PPI);
+	nrf_ccm_subscribe_set(NRF_CCM, NRF_CCM_TASK_CRYPT, HAL_TRIGGER_CRYPT_DELAY_PPI);
 }
 #endif /* CONFIG_BT_CTLR_DF_CONN_CTE_RX */
 #endif /* CONFIG_BT_CTLR_LE_ENC || CONFIG_BT_CTLR_BROADCAST_ISO_ENC */

From 7ac97f3426daaf3fdff69605b2de532b54462e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:06 +0100
Subject: [PATCH 1987/2913] Revert "[nrf fromtree] modules: hal_nordic: add
 nrf54l system sources to bsim build"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7fcf48eac7bdcaed8a79d7f46662af9d0f0b5651.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/nrfx/CMakeLists.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index cc1731b1e50..2e8e0cc1eb5 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -95,9 +95,7 @@ zephyr_library_sources_ifdef(CONFIG_SOC_NRF52840       ${MDK_DIR}/system_nrf5284
 zephyr_library_sources_ifdef(CONFIG_SOC_NRF5340_CPUAPP ${MDK_DIR}/system_nrf5340_application.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_NRF5340_CPUNET ${MDK_DIR}/system_nrf5340_network.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF54HX ${MDK_DIR}/system_nrf54h.c)
-if(CONFIG_SOC_SERIES_NRF54LX OR CONFIG_SOC_SERIES_BSIM_NRF54LX)
-  zephyr_library_sources(${MDK_DIR}/system_nrf54l.c)
-endif()
+zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF54LX ${MDK_DIR}/system_nrf54l.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF91X  ${MDK_DIR}/system_nrf91.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF92X  ${MDK_DIR}/system_nrf92.c)
 

From e6fcb8bc8f6eefe1593e6a0c2bbde8255376b9c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:06 +0100
Subject: [PATCH 1988/2913] Revert "[nrf fromtree] modules: hal_nordic: align
 PDM configuration"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8cb1d89449034dd15614eef6e7e4ed374f850f55.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/audio/Kconfig.dmic_pdm_nrfx   | 2 +-
 modules/hal_nordic/nrfx/Kconfig       | 8 ++------
 modules/hal_nordic/nrfx/nrfx_config.h | 3 ---
 soc/nordic/common/Kconfig.peripherals | 4 ++--
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/drivers/audio/Kconfig.dmic_pdm_nrfx b/drivers/audio/Kconfig.dmic_pdm_nrfx
index dfbda8259f2..9f45144effa 100644
--- a/drivers/audio/Kconfig.dmic_pdm_nrfx
+++ b/drivers/audio/Kconfig.dmic_pdm_nrfx
@@ -5,7 +5,7 @@ config AUDIO_DMIC_NRFX_PDM
 	bool "nRF PDM nrfx driver"
 	default y
 	depends on DT_HAS_NORDIC_NRF_PDM_ENABLED
-	select NRFX_PDM0 if HAS_HW_NRF_PDM0
+	select NRFX_PDM
 	select PINCTRL
 	help
 	  Enable support for nrfx PDM driver for nRF MCU series.
diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 65894d48712..3313e033c7c 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -162,12 +162,8 @@ config NRFX_NVMC
 		|| $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF91_FLASH_CONTROLLER))
 
 config NRFX_PDM
-	bool
-
-config NRFX_PDM0
-	bool "PDM0 driver instance"
-	depends on $(dt_nodelabel_has_compat,pdm0,$(DT_COMPAT_NORDIC_NRF_PDM))
-	select NRFX_PDM
+	bool "PDM driver"
+	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_PDM))
 
 config NRFX_POWER
 	bool "POWER driver"
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index 9971f39b7af..b0c27bb2fe8 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -212,9 +212,6 @@
 #ifdef CONFIG_NRFX_PDM
 #define NRFX_PDM_ENABLED 1
 #endif
-#ifdef CONFIG_NRFX_PDM0
-#define NRFX_PDM0_ENABLED 1
-#endif
 #ifdef CONFIG_NRFX_PDM_LOG
 #define NRFX_PDM_CONFIG_LOG_ENABLED 1
 #endif
diff --git a/soc/nordic/common/Kconfig.peripherals b/soc/nordic/common/Kconfig.peripherals
index 57c90b05ef7..5b1afd66d3f 100644
--- a/soc/nordic/common/Kconfig.peripherals
+++ b/soc/nordic/common/Kconfig.peripherals
@@ -126,8 +126,8 @@ config HAS_HW_NRF_NVMC_PE
 config HAS_HW_NRF_OSCILLATORS
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_OSCILLATORS))
 
-config HAS_HW_NRF_PDM0
-	def_bool $(dt_nodelabel_enabled_with_compat,pdm0,$(DT_COMPAT_NORDIC_NRF_PDM))
+config HAS_HW_NRF_PDM
+	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_PDM))
 
 config HAS_HW_NRF_POWER
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_POWER))

From 67daa6502faffa6f3046fa595c03fdf370972127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:06 +0100
Subject: [PATCH 1989/2913] Revert "[nrf fromtree] manifest: modules: hal:
 nordic: Pull in fix for country code"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 74f640464d08f7f25c762593803afc1075ea297d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 35a33b0efc6..b508fe6633f 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: bc25c094a8cf3064f4f9c1e8060b46e1989edf95
+      revision: ee6213b6cfcd7fdc10f7ec3a4f7f37f35dfa5343
       path: modules/hal/nordic
       groups:
         - hal

From 85f4cc30fc8d3ede93d58200722bc7adc9063b6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:06 +0100
Subject: [PATCH 1990/2913] Revert "[nrf fromtree] manifest: update hal_nordic
 revision to have nrfx 3.7.0"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 18fefddca0f9c4b98afd04cd62dde59c4962a87a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index b508fe6633f..7bd0bf2d99f 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: ee6213b6cfcd7fdc10f7ec3a4f7f37f35dfa5343
+      revision: 6d4acb8dbd9e92c7c5d6e18724197e3f007ae45e
       path: modules/hal/nordic
       groups:
         - hal

From 40f21b9c18ab01783aa4bbffbcc2ed8648845f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:06 +0100
Subject: [PATCH 1991/2913] Revert "[nrf fromtree] manifest: update hal_nordic
 revision"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 322be594e1faeb693c57191bd1a8f48866638d62.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 7bd0bf2d99f..07aedbea3a2 100644
--- a/west.yml
+++ b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 6d4acb8dbd9e92c7c5d6e18724197e3f007ae45e
+      revision: af7b21c4f875bea26689307daa8e52e9a8e8323c
       path: modules/hal/nordic
       groups:
         - hal

From aa6c6b51545b8923ff40603aa020081406eb93df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:06 +0100
Subject: [PATCH 1992/2913] Revert "[nrf fromtree] scripts: ci:
 check_compliance: add BOARD_REVISION in Kconfig.board.v2"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 864db58d79a506823fb32b46d75890b46a66173c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/ci/Kconfig.board.v2 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/ci/Kconfig.board.v2 b/scripts/ci/Kconfig.board.v2
index 3058e8e46bb..e1335cafe39 100644
--- a/scripts/ci/Kconfig.board.v2
+++ b/scripts/ci/Kconfig.board.v2
@@ -6,8 +6,5 @@
 
 mainmenu "Zephyr board / SoC v2 Configuration"
 
-config BOARD_REVISION
-	def_string "$(BOARD_REVISION)"
-
 source "boards/Kconfig.v2"
 source "soc/Kconfig.v2"

From 4067bf9be0c64b6a6b6175778bd1be8e975166b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:06 +0100
Subject: [PATCH 1993/2913] Revert "[nrf fromtree] drivers: misc: coresight:
 nrf_etr: Imply UART asynchronous API"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2d2704ebac82fa3366e70c0b1d77d7c1e5dd9184.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/misc/coresight/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/misc/coresight/Kconfig b/drivers/misc/coresight/Kconfig
index a31d6e3d3f6..f32abe80dab 100644
--- a/drivers/misc/coresight/Kconfig
+++ b/drivers/misc/coresight/Kconfig
@@ -7,7 +7,6 @@ config NRF_ETR
 	bool "Coresight ETR handler (with Nordic TBM)"
 	depends on $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_TBM))
 	select NRFX_TBM
-	imply UART_ASYNC_API
 	default y
 	help
 	  Module handles data stored in the ETR circular buffer (e.g. STM logging

From 2557713245a8c3da5304264aa3c6be2ae419e373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:06 +0100
Subject: [PATCH 1994/2913] Revert "[nrf fromtree] snippets: nordic-log-stm: Do
 no enforce UART Asynchronous API"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fbf6702771192f972af65e4fb0be6b77556d2da1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.conf | 1 +
 snippets/nordic-log-stm-dict/snippet.yml                 | 1 +
 snippets/nordic-log-stm/boards/nrf54h20_cpuapp.conf      | 1 +
 snippets/nordic-log-stm/snippet.yml                      | 1 +
 4 files changed, 4 insertions(+)
 create mode 100644 snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.conf
 create mode 100644 snippets/nordic-log-stm/boards/nrf54h20_cpuapp.conf

diff --git a/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.conf b/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..b4d9d63f77c
--- /dev/null
+++ b/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_UART_ASYNC_API=y
diff --git a/snippets/nordic-log-stm-dict/snippet.yml b/snippets/nordic-log-stm-dict/snippet.yml
index 6e4f1c6d23e..a482498d1e9 100644
--- a/snippets/nordic-log-stm-dict/snippet.yml
+++ b/snippets/nordic-log-stm-dict/snippet.yml
@@ -5,6 +5,7 @@ boards:
   /.*/nrf54h20/cpuapp/:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpuapp.overlay
+      EXTRA_CONF_FILE: boards/nrf54h20_cpuapp.conf
   /.*/nrf54h20/cpurad/:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpurad.overlay
diff --git a/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.conf b/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..b4d9d63f77c
--- /dev/null
+++ b/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_UART_ASYNC_API=y
diff --git a/snippets/nordic-log-stm/snippet.yml b/snippets/nordic-log-stm/snippet.yml
index 0a984a8312c..e2ff7b6f8a1 100644
--- a/snippets/nordic-log-stm/snippet.yml
+++ b/snippets/nordic-log-stm/snippet.yml
@@ -5,6 +5,7 @@ boards:
   /.*/nrf54h20/cpuapp/:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpuapp.overlay
+      EXTRA_CONF_FILE: boards/nrf54h20_cpuapp.conf
   /.*/nrf54h20/cpurad/:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpurad.overlay

From ff1575f8862279e163e7a5c845f31aa9dbc9f370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:07 +0100
Subject: [PATCH 1995/2913] Revert "[nrf fromtree] soc: nordic: Disable asserts
 on ppr and flpr"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 570158a84153d713ceb53c2496ffecc951498fd5.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr      | 4 ----
 soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr       | 4 ----
 soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuflpr      | 4 ----
 soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuflpr | 3 ---
 soc/nordic/nrf92/Kconfig.defconfig.nrf9280_cpuppr         | 4 ----
 5 files changed, 19 deletions(-)

diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
index 2b792e9f1b9..68acc00f79b 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
@@ -6,8 +6,4 @@ if SOC_NRF54H20_CPUFLPR
 config NUM_IRQS
 	default 496
 
-# As FLPR has limited memory most of tests does not fit with asserts enabled.
-config ASSERT
-	default n
-
 endif # SOC_NRF54H20_CPUFLPR
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
index bf7c12a3a69..ae05e5e89d4 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
+++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
@@ -8,9 +8,5 @@ config NUM_IRQS
 
 config SYS_CLOCK_TICKS_PER_SEC
 	default 1000
-#
-# As PPR has limited memory most of tests does not fit with asserts enabled.
-config ASSERT
-	default n
 
 endif # SOC_NRF54H20_CPUPPR
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuflpr b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuflpr
index 7c653d14b93..eabd1844c90 100644
--- a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuflpr
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_cpuflpr
@@ -8,8 +8,4 @@ if SOC_NRF54L15_CPUFLPR
 config NUM_IRQS
 	default 287
 
-# As FLPR has limited memory most of tests does not fit with asserts enabled.
-config ASSERT
-	default n
-
 endif # SOC_NRF54L15_CPUFLPR
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuflpr b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuflpr
index 86c80d08fc2..de1a8519225 100644
--- a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuflpr
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l15_enga_cpuflpr
@@ -11,8 +11,5 @@ config RISCV_HAS_CPU_IDLE
 config NUM_IRQS
 	int
 	default 287
-# As FLPR has limited memory most of tests does not fit with asserts enabled.
-config ASSERT
-	default n
 
 endif # SOC_NRF54L15_ENGA_CPUFLPR
diff --git a/soc/nordic/nrf92/Kconfig.defconfig.nrf9280_cpuppr b/soc/nordic/nrf92/Kconfig.defconfig.nrf9280_cpuppr
index 8e52b3611aa..1bef8de61ca 100644
--- a/soc/nordic/nrf92/Kconfig.defconfig.nrf9280_cpuppr
+++ b/soc/nordic/nrf92/Kconfig.defconfig.nrf9280_cpuppr
@@ -12,8 +12,4 @@ config SYS_CLOCK_TICKS_PER_SEC
 config RV_BOOT_HART
 	default 13 if SOC_NRF9230_ENGB
 
-# As FLPR has limited memory most of tests does not fit with asserts enabled.
-config ASSERT
-	default n
-
 endif # SOC_NRF9280_CPUPPR

From 4cd2d4ab4a81947c8453e1bf9bb476daf0460879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:07 +0100
Subject: [PATCH 1996/2913] Revert "[nrf fromtree] samples: boards: nordic:
 coresight_stm: Add flpr and ppr support"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ab41cd0ecb692509b607f4775fe41e98ef21c3d1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nordic/coresight_stm/Kconfig.sysbuild     |  8 ++---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 16 ----------
 .../nordic/coresight_stm/remote/prj.conf      |  5 ---
 .../boards/nordic/coresight_stm/sample.yaml   |  6 ----
 .../boards/nordic/coresight_stm/src/main.c    |  5 ++-
 .../nordic/coresight_stm/sysbuild.cmake       | 32 ++++++-------------
 6 files changed, 15 insertions(+), 57 deletions(-)
 delete mode 100644 samples/boards/nordic/coresight_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/samples/boards/nordic/coresight_stm/Kconfig.sysbuild b/samples/boards/nordic/coresight_stm/Kconfig.sysbuild
index 3e4ddeaa515..ae4c8048615 100644
--- a/samples/boards/nordic/coresight_stm/Kconfig.sysbuild
+++ b/samples/boards/nordic/coresight_stm/Kconfig.sysbuild
@@ -4,8 +4,6 @@
 
 source "share/sysbuild/Kconfig"
 
-config APP_CPUPPR_RUN
-	bool "Use PPR"
-
-config APP_CPUFLPR_RUN
-	bool "Use FLPR"
+config RAD_CORE_BOARD
+string
+	default "nrf54h20dk/nrf54h20/cpurad" if $(BOARD) = "nrf54h20dk"
diff --git a/samples/boards/nordic/coresight_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/boards/nordic/coresight_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index bf5ba18d204..00000000000
--- a/samples/boards/nordic/coresight_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&cpuppr_vpr {
-	status = "okay";
-};
-
-&cpuppr_ram3x_region {
-	status = "okay";
-};
-
-&cpuflpr_vpr {
-	status = "okay";
-};
diff --git a/samples/boards/nordic/coresight_stm/remote/prj.conf b/samples/boards/nordic/coresight_stm/remote/prj.conf
index 5bea9f4760e..1e935e973c7 100644
--- a/samples/boards/nordic/coresight_stm/remote/prj.conf
+++ b/samples/boards/nordic/coresight_stm/remote/prj.conf
@@ -1,6 +1 @@
 CONFIG_LOG=y
-CONFIG_CONSOLE=n
-CONFIG_UART_CONSOLE=n
-CONFIG_SERIAL=n
-CONFIG_BOOT_BANNER=n
-CONFIG_PRINTK=n
diff --git a/samples/boards/nordic/coresight_stm/sample.yaml b/samples/boards/nordic/coresight_stm/sample.yaml
index eb3971a2f4e..2bf3f0695e8 100644
--- a/samples/boards/nordic/coresight_stm/sample.yaml
+++ b/samples/boards/nordic/coresight_stm/sample.yaml
@@ -11,9 +11,6 @@ tests:
     build_only: true
     required_snippets:
       - nordic-log-stm-dict
-    extra_args:
-      - SB_CONFIG_APP_CPUPPR_RUN=y
-      - SB_CONFIG_APP_CPUFLPR_RUN=y
   sample.boards.nrf.coresight_stm:
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
@@ -29,9 +26,6 @@ tests:
         - "Timing for log message with 2 arguments:"
         - "Timing for log message with 3 arguments:"
         - "Timing for log_message with string:"
-    extra_args:
-      - SB_CONFIG_APP_CPUPPR_RUN=y
-      - SB_CONFIG_APP_CPUFLPR_RUN=y
     required_snippets:
       - nordic-log-stm
   sample.boards.nrf.coresight_stm.local_uart:
diff --git a/samples/boards/nordic/coresight_stm/src/main.c b/samples/boards/nordic/coresight_stm/src/main.c
index 221633d8638..01d3d14035c 100644
--- a/samples/boards/nordic/coresight_stm/src/main.c
+++ b/samples/boards/nordic/coresight_stm/src/main.c
@@ -5,6 +5,7 @@
  */
 
 #include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
 #include <zephyr/logging/log.h>
 
 #ifdef CONFIG_LOG_FRONTEND_STMESP
@@ -36,8 +37,6 @@ static void get_core_name(void)
 		core_name = "rad";
 	} else if (strstr(CONFIG_BOARD_TARGET, "cpuppr")) {
 		core_name = "ppr";
-	} else if (strstr(CONFIG_BOARD_TARGET, "cpuflpr")) {
-		core_name = "flpr";
 	}
 }
 
@@ -50,7 +49,7 @@ static void timing_report(uint32_t t, uint32_t rpt, const char *str)
 {
 	uint32_t ns = t_to_ns(t, rpt, CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC);
 
-	LOG_RAW("%s: Timing for %s: %d.%dus\n", core_name, str, ns / 1000, (ns % 1000) / 10);
+	printk("%s: Timing for %s: %d.%dus\n", core_name, str, ns / 1000, (ns % 1000) / 10);
 }
 
 int main(void)
diff --git a/samples/boards/nordic/coresight_stm/sysbuild.cmake b/samples/boards/nordic/coresight_stm/sysbuild.cmake
index 89ccbcf1343..c2eaeeaa20f 100644
--- a/samples/boards/nordic/coresight_stm/sysbuild.cmake
+++ b/samples/boards/nordic/coresight_stm/sysbuild.cmake
@@ -1,28 +1,16 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-set(REMOTE_APP remote)
+if("${SB_CONFIG_RAD_CORE_BOARD}" STREQUAL "")
+	message(FATAL_ERROR
+	"Target ${BOARD} not supported for this sample. "
+	"There is no remote board selected in Kconfig.sysbuild")
+endif()
+
+set(RAD_APP remote)
 
 ExternalZephyrProject_Add(
-	APPLICATION ${REMOTE_APP}_rad
-	SOURCE_DIR  ${APP_DIR}/${REMOTE_APP}
-	BOARD ${SB_CONFIG_BOARD}/${SB_CONFIG_SOC}/cpurad
+	APPLICATION ${RAD_APP}
+	SOURCE_DIR  ${APP_DIR}/${RAD_APP}
+	BOARD       ${SB_CONFIG_RAD_CORE_BOARD}
 )
-
-# There are sample configurations which do not use PPR.
-if(SB_CONFIG_APP_CPUPPR_RUN)
-	ExternalZephyrProject_Add(
-		APPLICATION ${REMOTE_APP}_ppr
-		SOURCE_DIR  ${APP_DIR}/${REMOTE_APP}
-		BOARD ${SB_CONFIG_BOARD}/${SB_CONFIG_SOC}/cpuppr
-	)
-endif()
-
-# There are sample configurations which do not use FLPR.
-if(SB_CONFIG_APP_CPUFLPR_RUN)
-	ExternalZephyrProject_Add(
-		APPLICATION ${REMOTE_APP}_flpr
-		SOURCE_DIR  ${APP_DIR}/${REMOTE_APP}
-		BOARD ${SB_CONFIG_BOARD}/${SB_CONFIG_SOC}/cpuflpr
-	)
-endif()

From 02f88c9c537683a19f1f307a75b30ef22f5717d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:07 +0100
Subject: [PATCH 1997/2913] Revert "[nrf fromtree] samples: boards: nordic:
 coresight_stm: Improve benchmark"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5a573c9f6212834ddb77a0f3f86c87bcdb8743b3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/boards/nordic/coresight_stm/src/main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/samples/boards/nordic/coresight_stm/src/main.c b/samples/boards/nordic/coresight_stm/src/main.c
index 01d3d14035c..c5bf328678b 100644
--- a/samples/boards/nordic/coresight_stm/src/main.c
+++ b/samples/boards/nordic/coresight_stm/src/main.c
@@ -16,14 +16,12 @@ LOG_MODULE_REGISTER(app);
 
 #define TEST_LOG(rpt, item)                                                                        \
 	({                                                                                         \
-		uint32_t key = irq_lock();                                                         \
 		uint32_t t = k_cycle_get_32();                                                     \
 		for (uint32_t i = 0; i < rpt; i++) {                                               \
 			__DEBRACKET item;                                                          \
 		}                                                                                  \
 		t = k_cycle_get_32() - t;                                                          \
-		irq_unlock(key);                                                                   \
-		k_msleep(400);                                                                     \
+		k_msleep(200);                                                                     \
 		t;                                                                                 \
 	})
 

From 62103310f6bba31409656703e519d6dff242e987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:07 +0100
Subject: [PATCH 1998/2913] Revert "[nrf fromtree] logging: frontend: stmesp:
 Do not append strings when not needed"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cf790873b7d0a5281de8137bbc3946482e9daaa8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/logging/frontends/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/subsys/logging/frontends/Kconfig b/subsys/logging/frontends/Kconfig
index c232eb7354a..9d4b7a43797 100644
--- a/subsys/logging/frontends/Kconfig
+++ b/subsys/logging/frontends/Kconfig
@@ -46,8 +46,7 @@ config LOG_FRONTEND_STMESP_DICT
 
 config LOG_FRONTEND_STMESP_FSC
 	bool "Send fully self-contained messages"
-	select LOG_MSG_APPEND_RO_STRING_LOC if (!NRF_ETR && !SOC_NRF54H20_CPUPPR && \
-			!SOC_NRF54H20_CPUFLPR)
+	select LOG_MSG_APPEND_RO_STRING_LOC if !NRF_ETR
 
 config LOG_FRONTEND_STMESP_FLUSH_COUNT
 	int "Number of flushing words"

From 648d73ae7bdfce86a53fc715fd5c2ba69cd4aa7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:07 +0100
Subject: [PATCH 1999/2913] Revert "[nrf fromtree] dts: riscv: nordic:
 nrf54h20_cpuflpr: Add stmesp node"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7e4842ccccb52337ce6203c419b1f4f753cdfd55.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/riscv/nordic/nrf54h20_cpuflpr.dtsi | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/dts/riscv/nordic/nrf54h20_cpuflpr.dtsi b/dts/riscv/nordic/nrf54h20_cpuflpr.dtsi
index 11baac5239b..173897b9e66 100644
--- a/dts/riscv/nordic/nrf54h20_cpuflpr.dtsi
+++ b/dts/riscv/nordic/nrf54h20_cpuflpr.dtsi
@@ -27,11 +27,6 @@ cpusys_vevif: &cpusys_vevif_tx {};
 		compatible = "simple-bus";
 		interrupt-parent = <&cpuflpr_clic>;
 		ranges;
-
-		stmesp: memory@ad000000 {
-			compatible = "arm,stmesp";
-			reg = <0xad000000 0x1000000>;
-		};
 	};
 };
 

From a2bd7de9fa35228c4e60b049c813ee9efc6dda59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:07 +0100
Subject: [PATCH 2000/2913] Revert "[nrf fromtree] mgmt: mcumgr: Add SMP SVC
 and CHR UUIDs to header"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1bf7e2d24cf280e66f72519357869209ffe7a35a.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/mgmt/mcumgr/transport/smp_bt.h | 19 -------------------
 subsys/mgmt/mcumgr/transport/src/smp_bt.c     | 16 ++++++++++++++--
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/include/zephyr/mgmt/mcumgr/transport/smp_bt.h b/include/zephyr/mgmt/mcumgr/transport/smp_bt.h
index 501cd65885a..0aff0510ecd 100644
--- a/include/zephyr/mgmt/mcumgr/transport/smp_bt.h
+++ b/include/zephyr/mgmt/mcumgr/transport/smp_bt.h
@@ -11,7 +11,6 @@
 #ifndef ZEPHYR_INCLUDE_MGMT_SMP_BT_H_
 #define ZEPHYR_INCLUDE_MGMT_SMP_BT_H_
 
-#include <zephyr/bluetooth/uuid.h>
 #include <zephyr/types.h>
 struct bt_conn;
 
@@ -19,24 +18,6 @@ struct bt_conn;
 extern "C" {
 #endif
 
-/** SMP service UUID value. */
-#define SMP_BT_SVC_UUID_VAL \
-	BT_UUID_128_ENCODE(0x8d53dc1d, 0x1db7, 0x4cd3, 0x868b, 0x8a527460aa84)
-
-/** SMP service UUID. */
-#define SMP_BT_SVC_UUID \
-	BT_UUID_DECLARE_128(SMP_BT_SVC_UUID_VAL)
-
-/** SMP characteristic UUID value. */
-#define SMP_BT_CHR_UUID_VAL \
-	BT_UUID_128_ENCODE(0xda2e7828, 0xfbce, 0x4e01, 0xae9e, 0x261174997c48)
-
-/** SMP characteristic UUID
- *  Used for both requests and responses.
- */
-#define SMP_BT_CHR_UUID \
-	BT_UUID_DECLARE_128(SMP_BT_CHR_UUID_VAL)
-
 /**
  * @brief	Registers the SMP Bluetooth service. Should only be called if the Bluetooth
  *		transport has been unregistered by calling smp_bt_unregister().
diff --git a/subsys/mgmt/mcumgr/transport/src/smp_bt.c b/subsys/mgmt/mcumgr/transport/src/smp_bt.c
index b2486a5d51c..a72c8468647 100644
--- a/subsys/mgmt/mcumgr/transport/src/smp_bt.c
+++ b/subsys/mgmt/mcumgr/transport/src/smp_bt.c
@@ -109,6 +109,18 @@ static uint8_t next_id;
 static struct smp_transport smp_bt_transport;
 static struct conn_param_data conn_data[CONFIG_BT_MAX_CONN];
 
+/* SMP service.
+ * {8D53DC1D-1DB7-4CD3-868B-8A527460AA84}
+ */
+static const struct bt_uuid_128 smp_bt_svc_uuid = BT_UUID_INIT_128(
+	BT_UUID_128_ENCODE(0x8d53dc1d, 0x1db7, 0x4cd3, 0x868b, 0x8a527460aa84));
+
+/* SMP characteristic; used for both requests and responses.
+ * {DA2E7828-FBCE-4E01-AE9E-261174997C48}
+ */
+static const struct bt_uuid_128 smp_bt_chr_uuid = BT_UUID_INIT_128(
+	BT_UUID_128_ENCODE(0xda2e7828, 0xfbce, 0x4e01, 0xae9e, 0x261174997c48));
+
 static void connected(struct bt_conn *conn, uint8_t err);
 static void disconnected(struct bt_conn *conn, uint8_t reason);
 
@@ -363,8 +375,8 @@ static void smp_bt_ccc_changed(const struct bt_gatt_attr *attr, uint16_t value)
 }
 
 #define SMP_BT_ATTRS									\
-	BT_GATT_PRIMARY_SERVICE(SMP_BT_SVC_UUID),					\
-	BT_GATT_CHARACTERISTIC(SMP_BT_CHR_UUID,						\
+	BT_GATT_PRIMARY_SERVICE(&smp_bt_svc_uuid),					\
+	BT_GATT_CHARACTERISTIC(&smp_bt_chr_uuid.uuid,					\
 			       BT_GATT_CHRC_WRITE_WITHOUT_RESP |			\
 			       BT_GATT_CHRC_NOTIFY,					\
 			       SMP_GATT_PERM & SMP_GATT_PERM_WRITE_MASK,		\

From e98b69de801133faf30d7867e6ef6cb22b90d6ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:07 +0100
Subject: [PATCH 2001/2913] Revert "[nrf fromtree] bluetooth: host: Update text
 for BT_CHANNEL_SOUNDING kconfig"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0d1c18f433379d4ef5e2f42962ddf3b1a537d453.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig
index bf6feff37eb..6fb49dcd66d 100644
--- a/subsys/bluetooth/Kconfig
+++ b/subsys/bluetooth/Kconfig
@@ -190,7 +190,7 @@ config BT_SUBRATING
 	  Bluetooth Core specification, Version 5.4 | Vol 6, Part B, Section 4.6.35.
 
 config BT_CHANNEL_SOUNDING
-	bool "Channel Sounding [EXPERIMENTAL]"
+	bool "Channel Sounding support"
 	select EXPERIMENTAL
 	depends on !BT_CTLR || BT_CTLR_CHANNEL_SOUNDING_SUPPORT
 	help

From d895800d6a00bd27e69e91834f75121761df9aaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:07 +0100
Subject: [PATCH 2002/2913] Revert "[nrf fromtree] bluetooth: host: Add
 CONFIG_BT_CHANNEL_SOUNDING_TEST"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3777d8417946e1a5d407aa3e4e03a9d09fce4fe2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/cs.h       |  6 ++----
 subsys/bluetooth/Kconfig            |  7 -------
 subsys/bluetooth/host/cs.c          | 16 ++--------------
 subsys/bluetooth/host/hci_core.c    |  2 --
 tests/bluetooth/shell/testcase.yaml |  1 -
 5 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index fa362083180..ffb839a9d15 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -595,8 +595,6 @@ int bt_le_cs_read_remote_fae_table(struct bt_conn *conn);
  * Existing callbacks can be unregistered by providing NULL function
  * pointers.
  *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING_TEST} must be set.
- *
  * @param cs_test_cb Set of callbacks to be used with CS Test
  *
  * @return Zero on success or (negative) error code on failure.
@@ -617,7 +615,7 @@ int bt_le_cs_test_cb_register(struct bt_le_cs_test_cb cs_test_cb);
  * parameters of this command describe the required transmit and receive behavior
  * for the CS test.
  *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING_TEST} must be set.
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
  *
  * @param params CS Test parameters
  *
@@ -663,7 +661,7 @@ int bt_le_cs_remove_config(struct bt_conn *conn, uint8_t config_id);
  * The controller is expected to finish reporting any subevent results
  * before completing this termination.
  *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING_TEST} must be set.
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
  *
  * @return Zero on success or (negative) error code on failure.
  */
diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig
index 6fb49dcd66d..e8c7d9676d7 100644
--- a/subsys/bluetooth/Kconfig
+++ b/subsys/bluetooth/Kconfig
@@ -196,13 +196,6 @@ config BT_CHANNEL_SOUNDING
 	help
 	  Enable support for Bluetooth 6.0 Channel Sounding feature.
 
-config BT_CHANNEL_SOUNDING_TEST
-	bool "Channel Sounding Test [EXPERIMENTAL]"
-	select EXPERIMENTAL
-	depends on BT_CHANNEL_SOUNDING
-	help
-	  Enable support for Channel Sounding test mode.
-
 endif # BT_CONN
 
 rsource "Kconfig.iso"
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index 75d5f21cf2c..05ab7a90504 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -18,9 +18,7 @@
 LOG_MODULE_REGISTER(bt_cs);
 
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
-#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 static struct bt_le_cs_test_cb cs_test_callbacks;
-#endif
 
 void bt_le_cs_set_valid_chmap_bits(uint8_t channel_map[10])
 {
@@ -244,7 +242,6 @@ void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf)
 	bt_conn_unref(conn);
 }
 
-#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 int bt_le_cs_test_cb_register(struct bt_le_cs_test_cb cb)
 {
 	cs_test_callbacks = cb;
@@ -353,7 +350,6 @@ int bt_le_cs_start_test(const struct bt_le_cs_test_param *params)
 
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_TEST, buf, NULL);
 }
-#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
 
 void bt_hci_le_cs_subevent_result(struct net_buf *buf)
 {
@@ -374,15 +370,12 @@ void bt_hci_le_cs_subevent_result(struct net_buf *buf)
 		return;
 	}
 
-#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 	if (sys_le16_to_cpu(evt->conn_handle) == BT_HCI_LE_CS_TEST_CONN_HANDLE) {
 		if (!cs_test_callbacks.le_cs_test_subevent_data_available) {
 			LOG_WRN("No callback registered. Discarded subevent results from CS Test.");
 			return;
 		}
-	} else
-#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
-	{
+	} else {
 		conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->conn_handle), BT_CONN_TYPE_LE);
 		if (!conn) {
 			LOG_ERR("Unknown connection handle when processing subevent results");
@@ -409,16 +402,13 @@ void bt_hci_le_cs_subevent_result(struct net_buf *buf)
 		result.step_data_buf = NULL;
 	}
 
-#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 	if (sys_le16_to_cpu(evt->conn_handle) == BT_HCI_LE_CS_TEST_CONN_HANDLE) {
 		result.header.config_id = 0;
 		result.header.start_acl_conn_event = 0;
 
 		cs_test_callbacks.le_cs_test_subevent_data_available(&result);
 
-	} else
-#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
-	{
+	} else {
 		result.header.config_id = evt->config_id;
 		result.header.start_acl_conn_event =
 			sys_le16_to_cpu(evt->start_acl_conn_event_counter);
@@ -533,7 +523,6 @@ int bt_le_cs_remove_config(struct bt_conn *conn, uint8_t config_id)
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_REMOVE_CONFIG, buf, NULL);
 }
 
-#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 int bt_le_cs_stop_test(void)
 {
 	struct net_buf *buf;
@@ -565,7 +554,6 @@ void bt_hci_le_cs_test_end_complete(struct net_buf *buf)
 		cs_test_callbacks.le_cs_test_end_complete();
 	}
 }
-#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
 
 void bt_le_cs_step_data_parse(struct net_buf_simple *step_data_buf,
 			      bool (*func)(struct bt_le_cs_subevent_step *step, void *user_data),
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index f2f6c10601a..a6329eecc23 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -2833,11 +2833,9 @@ static const struct event_handler meta_events[] = {
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_SUBEVENT_RESULT,
 		      bt_hci_le_cs_subevent_result,
 		      sizeof(struct bt_hci_evt_le_cs_subevent_result)),
-#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_TEST_END_COMPLETE,
 		      bt_hci_le_cs_test_end_complete,
 		      sizeof(struct bt_hci_evt_le_cs_test_end_complete)),
-#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
 
 };
diff --git a/tests/bluetooth/shell/testcase.yaml b/tests/bluetooth/shell/testcase.yaml
index cec0a9d0046..a19dfa3f456 100644
--- a/tests/bluetooth/shell/testcase.yaml
+++ b/tests/bluetooth/shell/testcase.yaml
@@ -46,7 +46,6 @@ tests:
   bluetooth.shell.channel_sounding:
     extra_configs:
       - CONFIG_BT_CHANNEL_SOUNDING=y
-      - CONFIG_BT_CHANNEL_SOUNDING_TEST=y
       - CONFIG_BT_CTLR=n
     platform_allow:
       - native_sim

From b13204905a3ed652084a9c6dfc8d94933598b252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:07 +0100
Subject: [PATCH 2003/2913] Revert "[nrf fromtree] bluetooth: host: Add support
 for processing CS subevent results"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 03daab703e11f78f65d45fb04f6112f12dfd0475.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/conn.h       | 117 -----------------
 include/zephyr/bluetooth/cs.h         |  65 ----------
 include/zephyr/bluetooth/hci_types.h  | 180 --------------------------
 subsys/bluetooth/host/conn.c          |  17 ---
 subsys/bluetooth/host/conn_internal.h |   2 -
 subsys/bluetooth/host/cs.c            | 139 --------------------
 subsys/bluetooth/host/hci_core.c      |   8 --
 subsys/bluetooth/host/hci_core.h      |   2 -
 subsys/bluetooth/shell/cs.c           |  81 +-----------
 9 files changed, 4 insertions(+), 607 deletions(-)

diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index 55bb48c6934..1538c36a218 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -538,112 +538,6 @@ struct bt_conn_le_cs_config {
 	uint8_t channel_map[10];
 };
 
-/** Procedure done status */
-enum bt_conn_le_cs_procedure_done_status {
-	BT_CONN_LE_CS_PROCEDURE_COMPLETE = BT_HCI_LE_CS_PROCEDURE_DONE_STATUS_COMPLETE,
-	BT_CONN_LE_CS_PROCEDURE_INCOMPLETE = BT_HCI_LE_CS_PROCEDURE_DONE_STATUS_PARTIAL,
-	BT_CONN_LE_CS_PROCEDURE_ABORTED = BT_HCI_LE_CS_PROCEDURE_DONE_STATUS_ABORTED,
-};
-
-/** Subevent done status */
-enum bt_conn_le_cs_subevent_done_status {
-	BT_CONN_LE_CS_SUBEVENT_COMPLETE = BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_COMPLETE,
-	BT_CONN_LE_CS_SUBEVENT_INCOMPLETE = BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL,
-	BT_CONN_LE_CS_SUBEVENT_ABORTED = BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_ABORTED,
-};
-
-/** Procedure abort reason */
-enum bt_conn_le_cs_procedure_abort_reason {
-	BT_CONN_LE_CS_PROCEDURE_NOT_ABORTED = BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_NO_ABORT,
-	BT_CONN_LE_CS_PROCEDURE_ABORT_REQUESTED =
-		BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_LOCAL_HOST_OR_REMOTE_REQUEST,
-	BT_CONN_LE_CS_PROCEDURE_ABORT_TOO_FEW_CHANNELS =
-		BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_TOO_FEW_CHANNELS,
-	BT_CONN_LE_CS_PROCEDURE_ABORT_CHMAP_INSTANT_PASSED =
-		BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_CHMAP_INSTANT_PASSED,
-	BT_CONN_LE_CS_PROCEDURE_ABORT_UNSPECIFIED = BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_UNSPECIFIED,
-};
-
-/** Subevent abort reason */
-enum bt_conn_le_cs_subevent_abort_reason {
-	BT_CONN_LE_CS_SUBEVENT_NOT_ABORTED = BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_NO_ABORT,
-	BT_CONN_LE_CS_SUBEVENT_ABORT_REQUESTED =
-		BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_LOCAL_HOST_OR_REMOTE_REQUEST,
-	BT_CONN_LE_CS_SUBEVENT_ABORT_NO_CS_SYNC =
-		BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_NO_CS_SYNC_RECEIVED,
-	BT_CONN_LE_CS_SUBEVENT_ABORT_SCHED_CONFLICT =
-		BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_SCHED_CONFLICT,
-	BT_CONN_LE_CS_SUBEVENT_ABORT_UNSPECIFIED = BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_UNSPECIFIED,
-};
-
-/** Subevent data for LE connections supporting CS */
-struct bt_conn_le_cs_subevent_result {
-	struct {
-		/** CS configuration identifier.
-		 *
-		 *  Range: 0 to 3
-		 *
-		 *  If these results were generated by a CS Test,
-		 *  this value will be set to 0 and has no meaning.
-		 */
-		uint8_t config_id;
-		/** Starting ACL connection event counter.
-		 *
-		 *  If these results were generated by a CS Test,
-		 *  this value will be set to 0 and has no meaning.
-		 */
-		uint16_t start_acl_conn_event;
-		/** CS procedure count associated with these results.
-		 *
-		 *  This is the CS procedure count since the completion of
-		 *  the Channel Sounding Security Start procedure.
-		 */
-		uint16_t procedure_counter;
-		/** Frequency compensation value in units of 0.01 ppm.
-		 *
-		 *  This is a 15-bit signed integer in the range [-100, 100] ppm.
-		 *
-		 *  A value of @ref BT_HCI_LE_CS_SUBEVENT_RESULT_FREQ_COMPENSATION_NOT_AVAILABLE
-		 *  indicates that the role is not the initiator, or that the
-		 *  frequency compensation value is unavailable.
-		 */
-		uint16_t frequency_compensation;
-		/** Reference power level in dBm.
-		 *
-		 *  Range: -127 to 20
-		 *
-		 *  A value of @ref BT_HCI_LE_CS_REF_POWER_LEVEL_UNAVAILABLE indicates
-		 *  that the reference power level was not available during a subevent.
-		 */
-		int8_t reference_power_level;
-		/** Procedure status. */
-		enum bt_conn_le_cs_procedure_done_status procedure_done_status;
-		/** Subevent status. */
-		enum bt_conn_le_cs_subevent_done_status subevent_done_status;
-		/** Abort reason.
-		 *
-		 *  If the procedure status is
-		 *  @ref BT_CONN_LE_CS_PROCEDURE_ABORTED, this field will
-		 *  specify the reason for the abortion.
-		 */
-		enum bt_conn_le_cs_procedure_abort_reason procedure_abort_reason;
-		/** Abort reason.
-		 *
-		 *  If the subevent status is
-		 *  @ref BT_CONN_LE_CS_SUBEVENT_ABORTED, this field will
-		 *  specify the reason for the abortion.
-		 */
-		enum bt_conn_le_cs_subevent_abort_reason subevent_abort_reason;
-		/** Number of antenna paths used during the phase measurement stage.
-		 */
-		uint8_t num_antenna_paths;
-		/** Number of CS steps in the subevent.
-		 */
-		uint8_t num_steps_reported;
-	} header;
-	struct net_buf_simple *step_data_buf;
-};
-
 /** @brief Increment a connection's reference count.
  *
  *  Increment the reference count of a connection object.
@@ -1783,17 +1677,6 @@ struct bt_conn_cb {
 	 *  @param config_id ID of the CS configuration that was removed.
 	 */
 	void (*le_cs_config_removed)(struct bt_conn *conn, uint8_t config_id);
-
-	/** @brief Subevent Results from a CS procedure are available.
-	 *
-	 * This callback notifies the user that CS subevent results are
-	 * available for the given connection object.
-	 *
-	 * @param conn Connection objects.
-	 * @param result Subevent results
-	 */
-	void (*le_cs_subevent_data_available)(struct bt_conn *conn,
-					      struct bt_conn_le_cs_subevent_result *result);
 #endif
 
 	/** @internal Internally used field for list handling */
diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index ffb839a9d15..c04fb3a9270 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -517,29 +517,6 @@ struct bt_le_cs_create_config_params {
 	uint8_t channel_map[10];
 };
 
-/** Callbacks for CS Test */
-struct bt_le_cs_test_cb {
-	/**@brief CS Test Subevent data.
-	 *
-	 * @param[in] Subevent results.
-	 */
-	void (*le_cs_test_subevent_data_available)(struct bt_conn_le_cs_subevent_result *data);
-	/**@brief CS Test End Complete. */
-	void (*le_cs_test_end_complete)(void);
-};
-
-/** Subevent result step */
-struct bt_le_cs_subevent_step {
-	/** CS step mode. */
-	uint8_t mode;
-	/** CS step channel index. */
-	uint8_t channel;
-	/** Length of role- and mode-specific information being reported. */
-	uint8_t data_len;
-	/** Pointer to role- and mode-specific information. */
-	const uint8_t *data;
-};
-
 /** @brief Set all valid channel map bits
  *
  * This command is used to enable all valid channels in a
@@ -590,17 +567,6 @@ int bt_le_cs_set_default_settings(struct bt_conn *conn,
  */
 int bt_le_cs_read_remote_fae_table(struct bt_conn *conn);
 
-/** @brief Register callbacks for the CS Test mode.
- *
- * Existing callbacks can be unregistered by providing NULL function
- * pointers.
- *
- * @param cs_test_cb Set of callbacks to be used with CS Test
- *
- * @return Zero on success or (negative) error code on failure.
- */
-int bt_le_cs_test_cb_register(struct bt_le_cs_test_cb cs_test_cb);
-
 /** @brief Start a CS test
  *
  * This command is used to start a CS test where the IUT is placed in the role
@@ -654,37 +620,6 @@ int bt_le_cs_create_config(struct bt_conn *conn, struct bt_le_cs_create_config_p
  */
 int bt_le_cs_remove_config(struct bt_conn *conn, uint8_t config_id);
 
-/** @brief Stop ongoing CS Test
- *
- * This command is used to stop any CS test that is in progress.
- *
- * The controller is expected to finish reporting any subevent results
- * before completing this termination.
- *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
- *
- * @return Zero on success or (negative) error code on failure.
- */
-int bt_le_cs_stop_test(void);
-
-/** @brief Parse CS Test Subevent Results
- *
- * A helper for parsing HCI-formatted step data found in channel sounding subevent results.
- *
- * A typical use-case is filtering out data which does not meet certain packet quality or NADM
- * requirements.
- *
- * @warning This function will consume the data when parsing.
- *
- * @param step_data_buf Pointer to a buffer containing the step data.
- * @param func Callback function which will be called for each step data found.
- *             The callback should return true to continue parsing, or false to stop.
- * @param user_data User data to be passed to the callback.
- */
-void bt_le_cs_step_data_parse(struct net_buf_simple *step_data_buf,
-			      bool (*func)(struct bt_le_cs_subevent_step *step, void *user_data),
-			      void *user_data);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 131b81134c1..efc231efaef 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -2612,8 +2612,6 @@ struct bt_hci_cp_le_cs_remove_config {
 	uint8_t config_id;
 } __packed;
 
-#define BT_HCI_OP_LE_CS_TEST_END BT_OP(BT_OGF_LE, 0x0096) /* 0x2096 */
-
 /* Event definitions */
 
 #define BT_HCI_EVT_UNKNOWN                      0x00
@@ -3465,182 +3463,6 @@ struct bt_hci_evt_le_cs_config_complete {
 	uint8_t t_pm_time;
 } __packed;
 
-#define BT_HCI_LE_CS_TEST_CONN_HANDLE 0x0FFF
-
-#define BT_HCI_LE_CS_PROCEDURE_DONE_STATUS_COMPLETE 0x0
-#define BT_HCI_LE_CS_PROCEDURE_DONE_STATUS_PARTIAL  0x1
-#define BT_HCI_LE_CS_PROCEDURE_DONE_STATUS_ABORTED  0xF
-
-#define BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_COMPLETE 0x0
-#define BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL  0x1
-#define BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_ABORTED  0xF
-
-#define BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_NO_ABORT                     0x0
-#define BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_LOCAL_HOST_OR_REMOTE_REQUEST 0x1
-#define BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_TOO_FEW_CHANNELS             0x2
-#define BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_CHMAP_INSTANT_PASSED         0x3
-#define BT_HCI_LE_CS_PROCEDURE_ABORT_REASON_UNSPECIFIED                  0xF
-
-#define BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_NO_ABORT                     0x0
-#define BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_LOCAL_HOST_OR_REMOTE_REQUEST 0x1
-#define BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_NO_CS_SYNC_RECEIVED          0x2
-#define BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_SCHED_CONFLICT               0x3
-#define BT_HCI_LE_CS_SUBEVENT_ABORT_REASON_UNSPECIFIED                  0xF
-
-#define BT_HCI_LE_CS_SUBEVENT_RESULT_N_AP_IGNORED 0x00
-#define BT_HCI_LE_CS_SUBEVENT_RESULT_N_AP_1       0x01
-#define BT_HCI_LE_CS_SUBEVENT_RESULT_N_AP_2       0x02
-#define BT_HCI_LE_CS_SUBEVENT_RESULT_N_AP_3       0x03
-#define BT_HCI_LE_CS_SUBEVENT_RESULT_N_AP_4       0x04
-
-#define BT_HCI_LE_CS_SUBEVENT_RESULT_FREQ_COMPENSATION_NOT_AVAILABLE 0xC000
-
-#define BT_HCI_LE_CS_SUBEVENT_RESULT_PCT_NOT_AVAILABLE 0xFFFFFFFF
-
-#define BT_HCI_LE_CS_REF_POWER_LEVEL_UNAVAILABLE 0x7F
-
-#define BT_HCI_LE_CS_PCT_MASK 0xFFF
-
-#define BT_HCI_LE_CS_TONE_QUALITY_HIGH        0x0
-#define BT_HCI_LE_CS_TONE_QUALITY_MED         0x1
-#define BT_HCI_LE_CS_TONE_QUALITY_LOW         0x2
-#define BT_HCI_LE_CS_TONE_QUALITY_UNAVAILABLE 0x3
-
-#define BT_HCI_LE_CS_NOT_TONE_EXT_SLOT              0x0
-#define BT_HCI_LE_CS_TONE_EXT_SLOT_EXT_NOT_EXPECTED 0x1
-#define BT_HCI_LE_CS_TONE_EXT_SLOT_EXT_EXPECTED     0x2
-
-#define BT_HCI_LE_CS_TIME_DIFFERENCE_NOT_AVAILABLE 0x8000
-
-#define BT_HCI_LE_CS_PACKET_NADM_ATTACK_EXT_UNLIKELY  0x00
-#define BT_HCI_LE_CS_PACKET_NADM_ATTACK_VERY_UNLIKELY 0x01
-#define BT_HCI_LE_CS_PACKET_NADM_ATTACK_UNLIKELY      0x02
-#define BT_HCI_LE_CS_PACKET_NADM_ATTACK_POSSIBLE      0x03
-#define BT_HCI_LE_CS_PACKET_NADM_ATTACK_LIKELY        0x04
-#define BT_HCI_LE_CS_PACKET_NADM_ATTACK_VERY_LIKELY   0x05
-#define BT_HCI_LE_CS_PACKET_NADM_ATTACK_EXT_LIKELY    0x06
-#define BT_HCI_LE_CS_PACKET_NADM_UNKNOWN              0xFF
-
-#define BT_HCI_EVT_LE_CS_SUBEVENT_RESULT 0x31
-/** Subevent result step data format: Mode 0 Initiator  */
-struct bt_hci_le_cs_step_data_mode_0_initiator {
-	uint8_t packet_quality_aa_check: 4;
-	uint8_t packet_quality_bit_errors: 4;
-	uint8_t packet_rssi;
-	uint8_t packet_antenna;
-	uint16_t measured_freq_offset;
-} __packed;
-
-/** Subevent result step data format: Mode 0 Reflector  */
-struct bt_hci_le_cs_step_data_mode_0_reflector {
-	uint8_t packet_quality_aa_check: 4;
-	uint8_t packet_quality_bit_errors: 4;
-	uint8_t packet_rssi;
-	uint8_t packet_antenna;
-} __packed;
-
-/** Subevent result step data format: Mode 1  */
-struct bt_hci_le_cs_step_data_mode_1 {
-	uint8_t packet_quality_aa_check: 4;
-	uint8_t packet_quality_bit_errors: 4;
-	uint8_t packet_nadm;
-	uint8_t packet_rssi;
-	union {
-		uint16_t toa_tod_initiator;
-		uint16_t tod_toa_reflector;
-	};
-	uint8_t packet_antenna;
-} __packed;
-
-/** Subevent result step data format: Mode 1 with sounding sequence RTT support */
-struct bt_hci_le_cs_step_data_mode_1_ss_rtt {
-	uint8_t packet_quality_aa_check: 4;
-	uint8_t packet_quality_bit_errors: 4;
-	uint8_t packet_nadm;
-	uint8_t packet_rssi;
-	union {
-		uint16_t toa_tod_initiator;
-		uint16_t tod_toa_reflector;
-	};
-	uint8_t packet_antenna;
-	uint8_t packet_pct1[4];
-	uint8_t packet_pct2[4];
-} __packed;
-
-
-/** Format for per-antenna path step data in modes 2 and 3 */
-struct bt_hci_le_cs_step_data_tone_info {
-	uint8_t phase_correction_term[3];
-	uint8_t quality_indicator: 4;
-	uint8_t extension_indicator: 4;
-} __packed;
-
-/** Subevent result step data format: Mode 2 */
-struct bt_hci_le_cs_step_data_mode_2 {
-	uint8_t antenna_permutation_index;
-	struct bt_hci_le_cs_step_data_tone_info tone_info[];
-} __packed;
-
-/** Subevent result step data format: Mode 3 */
-struct bt_hci_le_cs_step_data_mode_3 {
-	uint8_t packet_quality_aa_check: 4;
-	uint8_t packet_quality_bit_errors: 4;
-	uint8_t packet_nadm;
-	uint8_t packet_rssi;
-	union {
-		uint16_t toa_tod_initiator;
-		uint16_t tod_toa_reflector;
-	};
-	uint8_t packet_antenna;
-	uint8_t antenna_permutation_index;
-	struct bt_hci_le_cs_step_data_tone_info tone_info[];
-} __packed;
-
-/** Subevent result step data format: Mode 3 with sounding sequence RTT support */
-struct bt_hci_le_cs_step_data_mode_3_ss_rtt {
-	uint8_t packet_quality_aa_check: 4;
-	uint8_t packet_quality_bit_errors: 4;
-	uint8_t packet_nadm;
-	uint8_t packet_rssi;
-	union {
-		uint16_t toa_tod_initiator;
-		uint16_t tod_toa_reflector;
-	};
-	uint8_t packet_antenna;
-	uint8_t packet_pct1[4];
-	uint8_t packet_pct2[4];
-	uint8_t antenna_permutation_index;
-	struct bt_hci_le_cs_step_data_tone_info tone_info[];
-} __packed;
-
-struct bt_hci_evt_le_cs_subevent_result_step {
-	uint8_t step_mode;
-	uint8_t step_channel;
-	uint8_t step_data_length;
-	uint8_t step_data[];
-} __packed;
-
-struct bt_hci_evt_le_cs_subevent_result {
-	uint16_t conn_handle;
-	uint8_t config_id;
-	uint16_t start_acl_conn_event_counter;
-	uint16_t procedure_counter;
-	uint16_t frequency_compensation;
-	uint8_t reference_power_level;
-	uint8_t procedure_done_status;
-	uint8_t subevent_done_status;
-	uint8_t procedure_abort_reason: 4;
-	uint8_t subevent_abort_reason: 4;
-	uint8_t num_antenna_paths;
-	uint8_t num_steps_reported;
-	uint8_t steps[];
-} __packed;
-
-#define BT_HCI_EVT_LE_CS_TEST_END_COMPLETE 0x33
-struct bt_hci_evt_le_cs_test_end_complete {
-	uint8_t status;
-} __packed;
-
 /* Event mask bits */
 
 #define BT_EVT_BIT(n) (1ULL << (n))
@@ -3733,8 +3555,6 @@ struct bt_hci_evt_le_cs_test_end_complete {
 #define BT_EVT_MASK_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE BT_EVT_BIT(43)
 #define BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE              BT_EVT_BIT(44)
 #define BT_EVT_MASK_LE_CS_CONFIG_COMPLETE                             BT_EVT_BIT(46)
-#define BT_EVT_MASK_LE_CS_SUBEVENT_RESULT                             BT_EVT_BIT(48)
-#define BT_EVT_MASK_LE_CS_TEST_END_COMPLETE                           BT_EVT_BIT(50)
 
 /** HCI Error Codes, BT Core Spec v5.4 [Vol 1, Part F]. */
 #define BT_HCI_ERR_SUCCESS                      0x00
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 01c3bcbe04a..20ea9e447f6 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -3388,23 +3388,6 @@ void notify_cs_config_removed(struct bt_conn *conn, uint8_t config_id)
 		}
 	}
 }
-
-void notify_cs_subevent_result(struct bt_conn *conn, struct bt_conn_le_cs_subevent_result *result)
-{
-	struct bt_conn_cb *callback;
-
-	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->le_cs_subevent_data_available) {
-			callback->le_cs_subevent_data_available(conn, result);
-		}
-	}
-
-	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->le_cs_subevent_data_available) {
-			cb->le_cs_subevent_data_available(conn, result);
-		}
-	}
-}
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
 
 int bt_conn_le_param_update(struct bt_conn *conn,
diff --git a/subsys/bluetooth/host/conn_internal.h b/subsys/bluetooth/host/conn_internal.h
index 37e49afa964..0c334bc7cbe 100644
--- a/subsys/bluetooth/host/conn_internal.h
+++ b/subsys/bluetooth/host/conn_internal.h
@@ -502,8 +502,6 @@ void notify_cs_config_created(struct bt_conn *conn, struct bt_conn_le_cs_config
 
 void notify_cs_config_removed(struct bt_conn *conn, uint8_t config_id);
 
-void notify_cs_subevent_result(struct bt_conn *conn, struct bt_conn_le_cs_subevent_result *result);
-
 #if defined(CONFIG_BT_SMP)
 /* If role specific LTK is present */
 bool bt_conn_ltk_present(const struct bt_conn *conn);
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index 05ab7a90504..8341e9f9364 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -18,7 +18,6 @@
 LOG_MODULE_REGISTER(bt_cs);
 
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
-static struct bt_le_cs_test_cb cs_test_callbacks;
 
 void bt_le_cs_set_valid_chmap_bits(uint8_t channel_map[10])
 {
@@ -242,12 +241,6 @@ void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf)
 	bt_conn_unref(conn);
 }
 
-int bt_le_cs_test_cb_register(struct bt_le_cs_test_cb cb)
-{
-	cs_test_callbacks = cb;
-	return 0;
-}
-
 int bt_le_cs_start_test(const struct bt_le_cs_test_param *params)
 {
 	struct bt_hci_op_le_cs_test *cp;
@@ -351,74 +344,6 @@ int bt_le_cs_start_test(const struct bt_le_cs_test_param *params)
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_TEST, buf, NULL);
 }
 
-void bt_hci_le_cs_subevent_result(struct net_buf *buf)
-{
-	struct bt_conn *conn = NULL;
-	struct bt_hci_evt_le_cs_subevent_result *evt;
-	struct bt_conn_le_cs_subevent_result result;
-	struct net_buf_simple step_data_buf;
-
-	if (buf->len < sizeof(*evt)) {
-		LOG_ERR("Unexpected end of buffer");
-		return;
-	}
-
-	evt = net_buf_pull_mem(buf, sizeof(*evt));
-
-	if (evt->subevent_done_status == BT_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL) {
-		LOG_WRN("Discarded incomplete CS subevent results.");
-		return;
-	}
-
-	if (sys_le16_to_cpu(evt->conn_handle) == BT_HCI_LE_CS_TEST_CONN_HANDLE) {
-		if (!cs_test_callbacks.le_cs_test_subevent_data_available) {
-			LOG_WRN("No callback registered. Discarded subevent results from CS Test.");
-			return;
-		}
-	} else {
-		conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->conn_handle), BT_CONN_TYPE_LE);
-		if (!conn) {
-			LOG_ERR("Unknown connection handle when processing subevent results");
-			return;
-		}
-	}
-
-	result.header.procedure_counter = sys_le16_to_cpu(evt->procedure_counter);
-	result.header.frequency_compensation = sys_le16_to_cpu(evt->frequency_compensation);
-	result.header.procedure_done_status = evt->procedure_done_status;
-	result.header.subevent_done_status = evt->subevent_done_status;
-	result.header.procedure_abort_reason = evt->procedure_abort_reason;
-	result.header.subevent_abort_reason = evt->subevent_abort_reason;
-	result.header.reference_power_level = evt->reference_power_level;
-	result.header.num_antenna_paths = evt->num_antenna_paths;
-	result.header.num_steps_reported = evt->num_steps_reported;
-
-	if (evt->num_steps_reported) {
-		net_buf_simple_init_with_data(&step_data_buf,
-					      evt->steps,
-					      buf->len);
-		result.step_data_buf = &step_data_buf;
-	} else {
-		result.step_data_buf = NULL;
-	}
-
-	if (sys_le16_to_cpu(evt->conn_handle) == BT_HCI_LE_CS_TEST_CONN_HANDLE) {
-		result.header.config_id = 0;
-		result.header.start_acl_conn_event = 0;
-
-		cs_test_callbacks.le_cs_test_subevent_data_available(&result);
-
-	} else {
-		result.header.config_id = evt->config_id;
-		result.header.start_acl_conn_event =
-			sys_le16_to_cpu(evt->start_acl_conn_event_counter);
-
-		notify_cs_subevent_result(conn, &result);
-
-		bt_conn_unref(conn);
-	}
-}
-
 void bt_hci_le_cs_config_complete_event(struct net_buf *buf)
 {
 	struct bt_hci_evt_le_cs_config_complete *evt;
@@ -522,68 +447,4 @@ int bt_le_cs_remove_config(struct bt_conn *conn, uint8_t config_id)
 
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_REMOVE_CONFIG, buf, NULL);
 }
-
-int bt_le_cs_stop_test(void)
-{
-	struct net_buf *buf;
-
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_TEST_END, 0);
-	if (!buf) {
-		return -ENOBUFS;
-	}
-
-	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_TEST_END, buf, NULL);
-}
-
-void bt_hci_le_cs_test_end_complete(struct net_buf *buf)
-{
-	struct bt_hci_evt_le_cs_test_end_complete *evt;
-
-	if (buf->len < sizeof(*evt)) {
-		LOG_ERR("Unexpected end of buffer");
-		return;
-	}
-
-	evt = net_buf_pull_mem(buf, sizeof(*evt));
-	if (evt->status) {
-		LOG_INF("CS Test End failed with status 0x%02X", evt->status);
-		return;
-	}
-
-	if (cs_test_callbacks.le_cs_test_end_complete) {
-		cs_test_callbacks.le_cs_test_end_complete();
-	}
-}
-
-void bt_le_cs_step_data_parse(struct net_buf_simple *step_data_buf,
-			      bool (*func)(struct bt_le_cs_subevent_step *step, void *user_data),
-			      void *user_data)
-{
-	if (!step_data_buf) {
-		LOG_INF("Tried to parse empty step data.");
-		return;
-	}
-
-	while (step_data_buf->len > 1) {
-		struct bt_le_cs_subevent_step step;
-
-		step.mode = net_buf_simple_pull_u8(step_data_buf);
-		step.channel = net_buf_simple_pull_u8(step_data_buf);
-		step.data_len = net_buf_simple_pull_u8(step_data_buf);
-
-		if (step.data_len == 0) {
-			LOG_WRN("Encountered zero-length step data.");
-			return;
-		}
-
-		step.data = step_data_buf->data;
-
-		if (!func(&step, user_data)) {
-			return;
-		}
-
-		net_buf_simple_pull(step_data_buf, step.data_len);
-	}
-}
-
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index a6329eecc23..39fe50643a7 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -2830,12 +2830,6 @@ static const struct event_handler meta_events[] = {
 		      sizeof(struct bt_hci_evt_le_cs_read_remote_fae_table_complete)),
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_CONFIG_COMPLETE, bt_hci_le_cs_config_complete_event,
 		      sizeof(struct bt_hci_evt_le_cs_config_complete)),
-	EVENT_HANDLER(BT_HCI_EVT_LE_CS_SUBEVENT_RESULT,
-		      bt_hci_le_cs_subevent_result,
-		      sizeof(struct bt_hci_evt_le_cs_subevent_result)),
-	EVENT_HANDLER(BT_HCI_EVT_LE_CS_TEST_END_COMPLETE,
-		      bt_hci_le_cs_test_end_complete,
-		      sizeof(struct bt_hci_evt_le_cs_test_end_complete)),
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
 
 };
@@ -3413,8 +3407,6 @@ static int le_set_event_mask(void)
 		mask |= BT_EVT_MASK_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE;
 		mask |= BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE;
 		mask |= BT_EVT_MASK_LE_CS_CONFIG_COMPLETE;
-		mask |= BT_EVT_MASK_LE_CS_SUBEVENT_RESULT;
-		mask |= BT_EVT_MASK_LE_CS_TEST_END_COMPLETE;
 	}
 
 	sys_put_le64(mask, cp_mask->events);
diff --git a/subsys/bluetooth/host/hci_core.h b/subsys/bluetooth/host/hci_core.h
index 27387c9c53f..a50b534f1b7 100644
--- a/subsys/bluetooth/host/hci_core.h
+++ b/subsys/bluetooth/host/hci_core.h
@@ -542,8 +542,6 @@ void bt_hci_le_past_received_v2(struct net_buf *buf);
 void bt_hci_le_cs_read_remote_supported_capabilities_complete(struct net_buf *buf);
 void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf);
 void bt_hci_le_cs_config_complete_event(struct net_buf *buf);
-void bt_hci_le_cs_subevent_result(struct net_buf *buf);
-void bt_hci_le_cs_test_end_complete(struct net_buf *buf);
 
 /* Adv HCI event handlers */
 void bt_hci_le_adv_set_terminated(struct net_buf *buf);
diff --git a/subsys/bluetooth/shell/cs.c b/subsys/bluetooth/shell/cs.c
index fbc55623b14..c5bc228f35c 100644
--- a/subsys/bluetooth/shell/cs.c
+++ b/subsys/bluetooth/shell/cs.c
@@ -136,52 +136,6 @@ static int cmd_read_remote_fae_table(const struct shell *sh, size_t argc, char *
 	return 0;
 }
 
-static bool process_step_data(struct bt_le_cs_subevent_step *step, void *user_data)
-{
-	shell_print(ctx_shell, "Subevent results contained step data: ");
-	shell_print(ctx_shell, "- Step mode %d\n"
-		"- Step channel %d\n"
-		"- Step data hexdump:",
-		step->mode,
-		step->channel);
-	shell_hexdump(ctx_shell, step->data, step->data_len);
-
-	return true;
-}
-
-static void cs_test_subevent_data_cb(struct bt_conn_le_cs_subevent_result *result)
-{
-	shell_print(ctx_shell, "Received subevent results.");
-	shell_print(ctx_shell, "Subevent Header:\n"
-		"- Procedure Counter: %d\n"
-		"- Frequency Compensation: 0x%04x\n"
-		"- Reference Power Level: %d\n"
-		"- Procedure Done Status: 0x%02x\n"
-		"- Subevent Done Status: 0x%02x\n"
-		"- Procedure Abort Reason: 0x%02x\n"
-		"- Subevent Abort Reason: 0x%02x\n"
-		"- Number of Antenna Paths: %d\n"
-		"- Number of Steps Reported: %d",
-		result->header.procedure_counter,
-		result->header.frequency_compensation,
-		result->header.reference_power_level,
-		result->header.procedure_done_status,
-		result->header.subevent_done_status,
-		result->header.procedure_abort_reason,
-		result->header.subevent_abort_reason,
-		result->header.num_antenna_paths,
-		result->header.num_steps_reported);
-
-	if (result->step_data_buf) {
-		bt_le_cs_step_data_parse(result->step_data_buf, process_step_data, NULL);
-	}
-}
-
-static void cs_test_end_complete_cb(void)
-{
-	shell_print(ctx_shell, "CS Test End Complete.");
-}
-
 static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 {
 	int err = 0;
@@ -190,7 +144,7 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	params.main_mode = BT_CONN_LE_CS_MAIN_MODE_1;
 	params.sub_mode = BT_CONN_LE_CS_SUB_MODE_UNUSED;
 	params.main_mode_repetition = 0;
-	params.mode_0_steps = 2;
+	params.mode_0_steps = 0x1;
 
 	params.role = shell_strtoul(argv[1], 16, &err);
 
@@ -210,9 +164,9 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_AA_ONLY;
 	params.cs_sync_phy = BT_CONN_LE_CS_SYNC_1M_PHY;
 	params.cs_sync_antenna_selection = BT_LE_CS_TEST_CS_SYNC_ANTENNA_SELECTION_ONE;
-	params.subevent_len = 3000;
-	params.subevent_interval = 1;
-	params.max_num_subevents = 1;
+	params.subevent_len = 10000;
+	params.subevent_interval = 0;
+	params.max_num_subevents = 0;
 	params.transmit_power_level = BT_HCI_OP_LE_CS_TEST_MAXIMIZE_TX_POWER;
 	params.t_ip1_time = 80;
 	params.t_ip2_time = 80;
@@ -228,23 +182,10 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	memset(params.override_config_0.not_set.channel_map, 0,
 	       sizeof(params.override_config_0.not_set.channel_map));
 	params.override_config_0.not_set.channel_map[1] = 0xFF;
-	params.override_config_0.not_set.channel_map[7] = 0xFF;
-	params.override_config_0.not_set.channel_map[8] = 0xFF;
 	params.override_config_0.not_set.channel_selection_type = BT_CONN_LE_CS_CHSEL_TYPE_3B;
 	params.override_config_0.not_set.ch3c_shape = BT_CONN_LE_CS_CH3C_SHAPE_HAT;
 	params.override_config_0.not_set.ch3c_jump = 0x2;
 
-	struct bt_le_cs_test_cb cs_test_cb = {
-		.le_cs_test_subevent_data_available = cs_test_subevent_data_cb,
-		.le_cs_test_end_complete = cs_test_end_complete_cb,
-	};
-
-	err = bt_le_cs_test_cb_register(cs_test_cb);
-	if (err) {
-		shell_error(sh, "bt_le_cs_test_cb_register returned error %d", err);
-		return -ENOEXEC;
-	}
-
 	err = bt_le_cs_start_test(&params);
 	if (err) {
 		shell_error(sh, "bt_le_cs_start_test returned error %d", err);
@@ -429,19 +370,6 @@ static int cmd_create_config(const struct shell *sh, size_t argc, char *argv[])
 	return 0;
 }
 
-static int cmd_cs_stop_test(const struct shell *sh, size_t argc, char *argv[])
-{
-	int err = 0;
-
-	err = bt_le_cs_stop_test();
-	if (err) {
-		shell_error(sh, "bt_cs_stop_test returned error %d", err);
-		return -ENOEXEC;
-	}
-
-	return 0;
-}
-
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	cs_cmds,
 	SHELL_CMD_ARG(read_remote_supported_capabilities, NULL, "<None>",
@@ -454,7 +382,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 	SHELL_CMD_ARG(read_remote_fae_table, NULL, "<None>", cmd_read_remote_fae_table, 1, 0),
 	SHELL_CMD_ARG(start_simple_cs_test, NULL, "<Role selection (initiator, reflector): 0, 1>",
 		      cmd_cs_test_simple, 2, 0),
-	SHELL_CMD_ARG(stop_cs_test, NULL, "<None>", cmd_cs_stop_test, 1, 0),
 	SHELL_CMD_ARG(
 		create_config, NULL,
 		"<id> <context: local-only, local-remote> <role: initiator, reflector> "

From d0844cfc7fbaa52147169b8193897423b0cd99f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:07 +0100
Subject: [PATCH 2004/2913] Revert "[nrf fromtree] bluetooth: host: Use
 consistent API naming for CS"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8ac8463b7a166427325d5cf5b9e1253a58ba016b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/conn.h |   8 +-
 include/zephyr/bluetooth/cs.h   | 210 ++++++++++++++++----------------
 subsys/bluetooth/host/conn.c    |  16 +--
 subsys/bluetooth/host/cs.c      |  10 +-
 subsys/bluetooth/shell/bt.c     |   4 +-
 subsys/bluetooth/shell/cs.c     |  44 ++++---
 6 files changed, 144 insertions(+), 148 deletions(-)

diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index 1538c36a218..e4030c265f9 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -1644,8 +1644,8 @@ struct bt_conn_cb {
 	 *  @param conn Connection object.
 	 *  @param remote_cs_capabilities Remote Channel Sounding Capabilities.
 	 */
-	void (*le_cs_remote_capabilities_available)(struct bt_conn *conn,
-						    struct bt_conn_le_cs_capabilities *params);
+	void (*remote_cs_capabilities_available)(struct bt_conn *conn,
+						 struct bt_conn_le_cs_capabilities *params);
 
 	/** @brief LE CS Read Remote FAE Table Complete event.
 	 *
@@ -1655,8 +1655,8 @@ struct bt_conn_cb {
 	 *  @param conn Connection object.
 	 *  @param params FAE Table.
 	 */
-	void (*le_cs_remote_fae_table_available)(struct bt_conn *conn,
-						 struct bt_conn_le_cs_fae_table *params);
+	void (*remote_cs_fae_table_available)(struct bt_conn *conn,
+					      struct bt_conn_le_cs_fae_table *params);
 
 	/** @brief LE CS Config created.
 	 *
diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index c04fb3a9270..f836dfd3f4b 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -11,8 +11,8 @@
 #define ZEPHYR_INCLUDE_BLUETOOTH_CS_H_
 
 /**
- * @brief LE Channel Sounding (CS)
- * @defgroup bt_le_cs Channel Sounding (CS)
+ * @brief Channel Sounding (CS)
+ * @defgroup bt_cs Channel Sounding (CS)
  * @ingroup bluetooth
  * @{
  */
@@ -47,30 +47,30 @@ extern "C" {
 #define BT_LE_CS_CHANNEL_BIT_SET_VAL(chmap, bit, val)                                              \
 	((chmap)[(bit) / 8] = ((chmap)[(bit) / 8] & ~BIT((bit) % 8)) | ((val) << ((bit) % 8)))
 
-enum bt_le_cs_sync_antenna_selection_opt {
+enum bt_cs_sync_antenna_selection_opt {
 	/** Use antenna identifier 1 for CS_SYNC packets. */
-	BT_LE_CS_ANTENNA_SELECTION_OPT_ONE = BT_HCI_OP_LE_CS_ANTENNA_SEL_ONE,
+	BT_CS_ANTENNA_SELECTION_OPT_ONE = BT_HCI_OP_LE_CS_ANTENNA_SEL_ONE,
 	/** Use antenna identifier 2 for CS_SYNC packets. */
-	BT_LE_CS_ANTENNA_SELECTION_OPT_TWO = BT_HCI_OP_LE_CS_ANTENNA_SEL_TWO,
+	BT_CS_ANTENNA_SELECTION_OPT_TWO = BT_HCI_OP_LE_CS_ANTENNA_SEL_TWO,
 	/** Use antenna identifier 3 for CS_SYNC packets. */
-	BT_LE_CS_ANTENNA_SELECTION_OPT_THREE = BT_HCI_OP_LE_CS_ANTENNA_SEL_THREE,
+	BT_CS_ANTENNA_SELECTION_OPT_THREE = BT_HCI_OP_LE_CS_ANTENNA_SEL_THREE,
 	/** Use antenna identifier 4 for CS_SYNC packets. */
-	BT_LE_CS_ANTENNA_SELECTION_OPT_FOUR = BT_HCI_OP_LE_CS_ANTENNA_SEL_FOUR,
+	BT_CS_ANTENNA_SELECTION_OPT_FOUR = BT_HCI_OP_LE_CS_ANTENNA_SEL_FOUR,
 	/** Use antennas in repetitive order from 1 to 4 for CS_SYNC packets. */
-	BT_LE_CS_ANTENNA_SELECTION_OPT_REPETITIVE = BT_HCI_OP_LE_CS_ANTENNA_SEL_REP,
+	BT_CS_ANTENNA_SELECTION_OPT_REPETITIVE = BT_HCI_OP_LE_CS_ANTENNA_SEL_REP,
 	/** No recommendation for local controller antenna selection. */
-	BT_LE_CS_ANTENNA_SELECTION_OPT_NO_RECOMMENDATION = BT_HCI_OP_LE_CS_ANTENNA_SEL_NONE,
+	BT_CS_ANTENNA_SELECTION_OPT_NO_RECOMMENDATION = BT_HCI_OP_LE_CS_ANTENNA_SEL_NONE,
 };
 
 /** Default CS settings in the local Controller */
-struct bt_le_cs_set_default_settings_param {
+struct bt_cs_set_default_settings_param {
 	/** Enable CS initiator role. */
 	bool enable_initiator_role;
 	/** Enable CS reflector role. */
 	bool enable_reflector_role;
 	/** Antenna identifier to be used for CS_SYNC packets by the local controller.
 	 */
-	enum bt_le_cs_sync_antenna_selection_opt cs_sync_antenna_selection;
+	enum bt_cs_sync_antenna_selection_opt cs_sync_antenna_selection;
 	/** Maximum output power (Effective Isotropic Radiated Power) to be used
 	 *  for all CS transmissions.
 	 *
@@ -81,11 +81,11 @@ struct bt_le_cs_set_default_settings_param {
 };
 
 /** CS Test CS_SYNC Antenna Identifier */
-enum bt_le_cs_test_cs_sync_antenna_selection {
-	BT_LE_CS_TEST_CS_SYNC_ANTENNA_SELECTION_ONE = BT_HCI_OP_LE_CS_ANTENNA_SEL_ONE,
-	BT_LE_CS_TEST_CS_SYNC_ANTENNA_SELECTION_TWO = BT_HCI_OP_LE_CS_ANTENNA_SEL_TWO,
-	BT_LE_CS_TEST_CS_SYNC_ANTENNA_SELECTION_THREE = BT_HCI_OP_LE_CS_ANTENNA_SEL_THREE,
-	BT_LE_CS_TEST_CS_SYNC_ANTENNA_SELECTION_FOUR = BT_HCI_OP_LE_CS_ANTENNA_SEL_FOUR,
+enum bt_cs_test_cs_sync_antenna_selection {
+	BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_ONE = BT_HCI_OP_LE_CS_ANTENNA_SEL_ONE,
+	BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_TWO = BT_HCI_OP_LE_CS_ANTENNA_SEL_TWO,
+	BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_THREE = BT_HCI_OP_LE_CS_ANTENNA_SEL_THREE,
+	BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_FOUR = BT_HCI_OP_LE_CS_ANTENNA_SEL_FOUR,
 };
 
 /** CS Test Tone Antennna Config Selection.
@@ -115,57 +115,56 @@ enum bt_le_cs_test_cs_sync_antenna_selection {
  *    N_AP is a value in the range [2, 4]
  *  - 2:2 configuration, where both A and B support 2 antennas and N_AP = 4
  */
-enum bt_le_cs_test_tone_antenna_config_selection {
-	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_ONE = BT_HCI_OP_LE_CS_TEST_ACI_0,
-	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_TWO = BT_HCI_OP_LE_CS_TEST_ACI_1,
-	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_THREE = BT_HCI_OP_LE_CS_TEST_ACI_2,
-	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_FOUR = BT_HCI_OP_LE_CS_TEST_ACI_3,
-	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_FIVE = BT_HCI_OP_LE_CS_TEST_ACI_4,
-	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_SIX = BT_HCI_OP_LE_CS_TEST_ACI_5,
-	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_SEVEN = BT_HCI_OP_LE_CS_TEST_ACI_6,
-	BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_EIGHT = BT_HCI_OP_LE_CS_TEST_ACI_7,
+enum bt_cs_test_tone_antenna_config_selection {
+	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_ONE = BT_HCI_OP_LE_CS_TEST_ACI_0,
+	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_TWO = BT_HCI_OP_LE_CS_TEST_ACI_1,
+	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_THREE = BT_HCI_OP_LE_CS_TEST_ACI_2,
+	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_FOUR = BT_HCI_OP_LE_CS_TEST_ACI_3,
+	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_FIVE = BT_HCI_OP_LE_CS_TEST_ACI_4,
+	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_SIX = BT_HCI_OP_LE_CS_TEST_ACI_5,
+	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_SEVEN = BT_HCI_OP_LE_CS_TEST_ACI_6,
+	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_EIGHT = BT_HCI_OP_LE_CS_TEST_ACI_7,
 };
 
 /** CS Test Initiator SNR control options */
-enum bt_le_cs_test_initiator_snr_control {
-	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_18,
-	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_21,
-	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_24,
-	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_27,
-	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_30,
-	BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_NOT_USED,
+enum bt_cs_test_initiator_snr_control {
+	BT_CS_TEST_INITIATOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_18,
+	BT_CS_TEST_INITIATOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_21,
+	BT_CS_TEST_INITIATOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_24,
+	BT_CS_TEST_INITIATOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_27,
+	BT_CS_TEST_INITIATOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_30,
+	BT_CS_TEST_INITIATOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_NOT_USED,
 };
 
 /** CS Test Reflector SNR control options */
-enum bt_le_cs_test_reflector_snr_control {
-	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_18,
-	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_21,
-	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_24,
-	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_27,
-	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_30,
-	BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_NOT_USED,
+enum bt_cs_test_reflector_snr_control {
+	BT_CS_TEST_REFLECTOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_18,
+	BT_CS_TEST_REFLECTOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_21,
+	BT_CS_TEST_REFLECTOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_24,
+	BT_CS_TEST_REFLECTOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_27,
+	BT_CS_TEST_REFLECTOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_30,
+	BT_CS_TEST_REFLECTOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_NOT_USED,
 };
 
 /** CS Test Override 3 T_PM Tone Extension */
-enum bt_le_cs_test_override_3_pm_tone_ext {
+enum bt_cs_test_override_3_pm_tone_ext {
 	/** Initiator and reflector tones sent without tone extension */
-	BT_LE_CS_TEST_OVERRIDE_3_NO_TONE_EXT = BT_HCI_OP_LE_CS_TEST_TONE_EXT_NONE,
+	BT_CS_TEST_OVERRIDE_3_NO_TONE_EXT = BT_HCI_OP_LE_CS_TEST_TONE_EXT_NONE,
 	/** Initiator tone sent with extension, reflector tone sent without tone extension */
-	BT_LE_CS_TEST_OVERRIDE_3_INITIATOR_TONE_EXT_ONLY = BT_HCI_OP_LE_CS_TEST_TONE_EXT_INIT,
+	BT_CS_TEST_OVERRIDE_3_INITIATOR_TONE_EXT_ONLY = BT_HCI_OP_LE_CS_TEST_TONE_EXT_INIT,
 	/** Initiator tone sent without extension, reflector tone sent with tone extension */
-	BT_LE_CS_TEST_OVERRIDE_3_REFLECTOR_TONE_EXT_ONLY = BT_HCI_OP_LE_CS_TEST_TONE_EXT_REFL,
+	BT_CS_TEST_OVERRIDE_3_REFLECTOR_TONE_EXT_ONLY = BT_HCI_OP_LE_CS_TEST_TONE_EXT_REFL,
 	/** Initiator and reflector tones sent with tone extension */
-	BT_LE_CS_TEST_OVERRIDE_3_INITIATOR_AND_REFLECTOR_TONE_EXT =
-		BT_HCI_OP_LE_CS_TEST_TONE_EXT_BOTH,
+	BT_CS_TEST_OVERRIDE_3_INITIATOR_AND_REFLECTOR_TONE_EXT = BT_HCI_OP_LE_CS_TEST_TONE_EXT_BOTH,
 	/** Applicable for mode-2 and mode-3 only:
 	 *
 	 *  Loop through:
-	 *   - @ref BT_LE_CS_TEST_OVERRIDE_3_NO_TONE_EXT
-	 *   - @ref BT_LE_CS_TEST_OVERRIDE_3_INITIATOR_TONE_EXT_ONLY
-	 *   - @ref BT_LE_CS_TEST_OVERRIDE_3_REFLECTOR_TONE_EXT_ONLY
-	 *   - @ref BT_LE_CS_TEST_OVERRIDE_3_INITIATOR_AND_REFLECTOR_TONE_EXT
+	 *   - @ref BT_CS_TEST_OVERRIDE_3_NO_TONE_EXT
+	 *   - @ref BT_CS_TEST_OVERRIDE_3_INITIATOR_TONE_EXT_ONLY
+	 *   - @ref BT_CS_TEST_OVERRIDE_3_REFLECTOR_TONE_EXT_ONLY
+	 *   - @ref BT_CS_TEST_OVERRIDE_3_INITIATOR_AND_REFLECTOR_TONE_EXT
 	 */
-	BT_LE_CS_TEST_OVERRIDE_3_REPETITIVE_TONE_EXT = BT_HCI_OP_LE_CS_TEST_TONE_EXT_REPEAT,
+	BT_CS_TEST_OVERRIDE_3_REPETITIVE_TONE_EXT = BT_HCI_OP_LE_CS_TEST_TONE_EXT_REPEAT,
 };
 
 /** CS Test Override 4 Tone Antenna Permutation.
@@ -228,70 +227,69 @@ enum bt_le_cs_test_override_3_pm_tone_ext {
  * | 23                             | A2 A3 A4 A1                              |
  * +--------------------------------+------------------------------------------+
  */
-enum bt_le_cs_test_override_4_tone_antenna_permutation {
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_00 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_00,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_01 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_01,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_02 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_02,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_03 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_03,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_04 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_04,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_05 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_05,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_06 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_06,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_07 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_07,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_08 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_08,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_09 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_09,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_10 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_10,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_11 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_11,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_12 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_12,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_13 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_13,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_14 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_14,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_15 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_15,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_16 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_16,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_17 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_17,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_18 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_18,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_19 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_19,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_20 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_20,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_21 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_21,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_22 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_22,
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_23 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_23,
+enum bt_cs_test_override_4_tone_antenna_permutation {
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_00 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_00,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_01 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_01,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_02 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_02,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_03 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_03,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_04 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_04,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_05 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_05,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_06 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_06,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_07 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_07,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_08 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_08,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_09 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_09,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_10 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_10,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_11 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_11,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_12 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_12,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_13 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_13,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_14 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_14,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_15 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_15,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_16 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_16,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_17 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_17,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_18 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_18,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_19 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_19,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_20 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_20,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_21 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_21,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_22 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_22,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_23 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_23,
 	/** Loop through all valid Antenna Permuation Indices starting
 	 *  from the lowest index.
 	 */
-	BT_LE_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_LOOP =
-		BT_HCI_OP_LE_CS_TEST_AP_INDEX_LOOP,
+	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_LOOP = BT_HCI_OP_LE_CS_TEST_AP_INDEX_LOOP,
 };
 
 /** CS Test Override 7 Sounding Sequence Marker Value */
-enum bt_le_cs_test_override_7_ss_marker_value {
-	BT_LE_CS_TEST_OVERRIDE_7_SS_MARKER_VAL_0011 = BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_0011,
-	BT_LE_CS_TEST_OVERRIDE_7_SS_MARKER_VAL_1100 = BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_1100,
+enum bt_cs_test_override_7_ss_marker_value {
+	BT_CS_TEST_OVERRIDE_7_SS_MARKER_VAL_0011 = BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_0011,
+	BT_CS_TEST_OVERRIDE_7_SS_MARKER_VAL_1100 = BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_1100,
 	/** Loop through pattern '0011' and '1100' (in transmission order) */
-	BT_LE_CS_TEST_OVERRIDE_7_SS_MARKER_VAL_LOOP = BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_LOOP,
+	BT_CS_TEST_OVERRIDE_7_SS_MARKER_VAL_LOOP = BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_LOOP,
 };
 
 /** CS Test Override 8 CS_SYNC Payload Pattern */
-enum bt_le_cs_test_override_8_cs_sync_payload_pattern {
+enum bt_cs_test_override_8_cs_sync_payload_pattern {
 	/** PRBS9 payload sequence. */
-	BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_PRBS9 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_PRBS9,
+	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_PRBS9 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_PRBS9,
 	/** Repeated '11110000' payload sequence. */
-	BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_11110000 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_11110000,
+	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_11110000 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_11110000,
 	/** Repeated '10101010' payload sequence. */
-	BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_10101010 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_10101010,
+	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_10101010 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_10101010,
 	/** PRBS15 payload sequence. */
-	BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_PRBS15 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_PRBS15,
+	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_PRBS15 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_PRBS15,
 	/** Repeated '11111111' payload sequence. */
-	BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_11111111 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_11111111,
+	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_11111111 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_11111111,
 	/** Repeated '00000000' payload sequence. */
-	BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_00000000 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_00000000,
+	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_00000000 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_00000000,
 	/** Repeated '00001111' payload sequence. */
-	BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_00001111 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_00001111,
+	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_00001111 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_00001111,
 	/** Repeated '01010101' payload sequence. */
-	BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_01010101 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_01010101,
+	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_01010101 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_01010101,
 	/** Custom payload provided by the user. */
-	BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_USER = BT_HCI_OP_LE_CS_TEST_PAYLOAD_USER,
+	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_USER = BT_HCI_OP_LE_CS_TEST_PAYLOAD_USER,
 };
 
 /** CS Test parameters */
-struct bt_le_cs_test_param {
+struct bt_cs_test_param {
 	/** CS mode to be used during the CS procedure. */
 	enum bt_conn_le_cs_main_mode main_mode;
 	/** CS sub-mode to be used during the CS procedure. */
@@ -310,7 +308,7 @@ struct bt_le_cs_test_param {
 	/** CS_SYNC PHY */
 	enum bt_conn_le_cs_sync_phy cs_sync_phy;
 	/** Antenna identifier to be used for CS_SYNC packets. */
-	enum bt_le_cs_test_cs_sync_antenna_selection cs_sync_antenna_selection;
+	enum bt_cs_test_cs_sync_antenna_selection cs_sync_antenna_selection;
 	/** CS subevent length in microseconds.
 	 *
 	 *  Range: 1250us to 4s
@@ -351,11 +349,11 @@ struct bt_le_cs_test_param {
 	/** Antenna Configuration Index used during antenna switching during
 	 *  the tone phases of CS steps.
 	 */
-	enum bt_le_cs_test_tone_antenna_config_selection tone_antenna_config_selection;
+	enum bt_cs_test_tone_antenna_config_selection tone_antenna_config_selection;
 	/** Initiator SNR control options */
-	enum bt_le_cs_test_initiator_snr_control initiator_snr_control;
+	enum bt_cs_test_initiator_snr_control initiator_snr_control;
 	/** Reflector SNR control options */
-	enum bt_le_cs_test_reflector_snr_control reflector_snr_control;
+	enum bt_cs_test_reflector_snr_control reflector_snr_control;
 	/** Determines octets 14 and 15 of the initial value of the DRBG nonce. */
 	uint16_t drbg_nonce;
 
@@ -407,12 +405,12 @@ struct bt_le_cs_test_param {
 
 	/** Override config bit 3. These parameters are ignored if the bit is not set.  */
 	struct {
-		enum bt_le_cs_test_override_3_pm_tone_ext t_pm_tone_ext;
+		enum bt_cs_test_override_3_pm_tone_ext t_pm_tone_ext;
 	} override_config_3;
 
 	/** Override config bit 4. These parameters are ignored if the bit is not set. */
 	struct {
-		enum bt_le_cs_test_override_4_tone_antenna_permutation tone_antenna_permutation;
+		enum bt_cs_test_override_4_tone_antenna_permutation tone_antenna_permutation;
 	} override_config_4;
 
 	/** Override config bit 5. These parameters are ignored if the bit is not set.  */
@@ -444,17 +442,17 @@ struct bt_le_cs_test_param {
 	/** Override config bit 7. These parameters are ignored if the bit is not set. */
 	struct {
 		/** Value of the Sounding Sequence marker. */
-		enum bt_le_cs_test_override_7_ss_marker_value ss_marker_value;
+		enum bt_cs_test_override_7_ss_marker_value ss_marker_value;
 	} override_config_7;
 
 	/** Override config bit 8. These parameters are ignored if the bit is not set.  */
 	struct {
 		/** CS_SYNC payload pattern selection. */
-		enum bt_le_cs_test_override_8_cs_sync_payload_pattern cs_sync_payload_pattern;
+		enum bt_cs_test_override_8_cs_sync_payload_pattern cs_sync_payload_pattern;
 		/** User payload for CS_SYNC packets.
 		 *
 		 *  This parameter is only used when using
-		 *  @ref BT_LE_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_USER
+		 *  @ref BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_USER
 		 *
 		 *  The least significant bit corresponds to the most significant bit
 		 *  of the CS payload. When the sequence is less than 16 octets,
@@ -537,7 +535,7 @@ void bt_le_cs_set_valid_chmap_bits(uint8_t channel_map[10]);
  *
  * @return Zero on success or (negative) error code on failure.
  */
-int bt_le_cs_read_remote_supported_capabilities(struct bt_conn *conn);
+int bt_cs_read_remote_supported_capabilities(struct bt_conn *conn);
 
 /** @brief Set Channel Sounding default settings.
  *
@@ -551,8 +549,8 @@ int bt_le_cs_read_remote_supported_capabilities(struct bt_conn *conn);
  *
  * @return Zero on success or (negative) error code on failure.
  */
-int bt_le_cs_set_default_settings(struct bt_conn *conn,
-				  const struct bt_le_cs_set_default_settings_param *params);
+int bt_cs_set_default_settings(struct bt_conn *conn,
+			       const struct bt_cs_set_default_settings_param *params);
 
 /** @brief Read Remote FAE Table
  *
@@ -565,7 +563,7 @@ int bt_le_cs_set_default_settings(struct bt_conn *conn,
  *
  * @return Zero on success or (negative) error code on failure.
  */
-int bt_le_cs_read_remote_fae_table(struct bt_conn *conn);
+int bt_cs_read_remote_fae_table(struct bt_conn *conn);
 
 /** @brief Start a CS test
  *
@@ -587,7 +585,7 @@ int bt_le_cs_read_remote_fae_table(struct bt_conn *conn);
  *
  * @return Zero on success or (negative) error code on failure.
  */
-int bt_le_cs_start_test(const struct bt_le_cs_test_param *params);
+int bt_cs_start_test(const struct bt_cs_test_param *params);
 
 /** @brief Create CS configuration
  *
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 20ea9e447f6..806eaba2010 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -3326,14 +3326,14 @@ void notify_remote_cs_capabilities(struct bt_conn *conn, struct bt_conn_le_cs_ca
 	struct bt_conn_cb *callback;
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->le_cs_remote_capabilities_available) {
-			callback->le_cs_remote_capabilities_available(conn, &params);
+		if (callback->remote_cs_capabilities_available) {
+			callback->remote_cs_capabilities_available(conn, &params);
 		}
 	}
 
 	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->le_cs_remote_capabilities_available) {
-			cb->le_cs_remote_capabilities_available(conn, &params);
+		if (cb->remote_cs_capabilities_available) {
+			cb->remote_cs_capabilities_available(conn, &params);
 		}
 	}
 }
@@ -3343,14 +3343,14 @@ void notify_remote_cs_fae_table(struct bt_conn *conn, struct bt_conn_le_cs_fae_t
 	struct bt_conn_cb *callback;
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->le_cs_remote_fae_table_available) {
-			callback->le_cs_remote_fae_table_available(conn, &params);
+		if (callback->remote_cs_fae_table_available) {
+			callback->remote_cs_fae_table_available(conn, &params);
 		}
 	}
 
 	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->le_cs_remote_fae_table_available) {
-			cb->le_cs_remote_fae_table_available(conn, &params);
+		if (cb->remote_cs_fae_table_available) {
+			cb->remote_cs_fae_table_available(conn, &params);
 		}
 	}
 }
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index 8341e9f9364..d0d7f941b7b 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -36,7 +36,7 @@ void bt_le_cs_set_valid_chmap_bits(uint8_t channel_map[10])
 	BT_LE_CS_CHANNEL_BIT_SET_VAL(channel_map, 79, 0);
 }
 
-int bt_le_cs_read_remote_supported_capabilities(struct bt_conn *conn)
+int bt_cs_read_remote_supported_capabilities(struct bt_conn *conn)
 {
 	struct bt_hci_cp_le_read_remote_supported_capabilities *cp;
 	struct net_buf *buf;
@@ -168,8 +168,8 @@ void bt_hci_le_cs_read_remote_supported_capabilities_complete(struct net_buf *bu
 	bt_conn_unref(conn);
 }
 
-int bt_le_cs_set_default_settings(struct bt_conn *conn,
-				  const struct bt_le_cs_set_default_settings_param *params)
+int bt_cs_set_default_settings(struct bt_conn *conn,
+			       const struct bt_cs_set_default_settings_param *params)
 {
 	struct bt_hci_cp_le_cs_set_default_settings *cp;
 	struct net_buf *buf;
@@ -196,7 +196,7 @@ int bt_le_cs_set_default_settings(struct bt_conn *conn,
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_SET_DEFAULT_SETTINGS, buf, NULL);
 }
 
-int bt_le_cs_read_remote_fae_table(struct bt_conn *conn)
+int bt_cs_read_remote_fae_table(struct bt_conn *conn)
 {
 	struct bt_hci_cp_le_read_remote_fae_table *cp;
 	struct net_buf *buf;
@@ -241,7 +241,7 @@ void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf)
 	bt_conn_unref(conn);
 }
 
-int bt_le_cs_start_test(const struct bt_le_cs_test_param *params)
+int bt_cs_start_test(const struct bt_cs_test_param *params)
 {
 	struct bt_hci_op_le_cs_test *cp;
 	struct net_buf *buf;
diff --git a/subsys/bluetooth/shell/bt.c b/subsys/bluetooth/shell/bt.c
index b08f67835e1..b900fe721df 100644
--- a/subsys/bluetooth/shell/bt.c
+++ b/subsys/bluetooth/shell/bt.c
@@ -1142,8 +1142,8 @@ static struct bt_conn_cb conn_callbacks = {
 	.subrate_changed = subrate_changed,
 #endif
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
-	.le_cs_remote_capabilities_available = print_remote_cs_capabilities,
-	.le_cs_remote_fae_table_available = print_remote_cs_fae_table,
+	.remote_cs_capabilities_available = print_remote_cs_capabilities,
+	.remote_cs_fae_table_available = print_remote_cs_fae_table,
 	.le_cs_config_created = le_cs_config_created,
 	.le_cs_config_removed = le_cs_config_removed,
 #endif
diff --git a/subsys/bluetooth/shell/cs.c b/subsys/bluetooth/shell/cs.c
index c5bc228f35c..63fb0ad7828 100644
--- a/subsys/bluetooth/shell/cs.c
+++ b/subsys/bluetooth/shell/cs.c
@@ -28,12 +28,11 @@
 
 static int check_cs_sync_antenna_selection_input(uint16_t input)
 {
-	if (input != BT_LE_CS_ANTENNA_SELECTION_OPT_ONE &&
-	    input != BT_LE_CS_ANTENNA_SELECTION_OPT_TWO &&
-	    input != BT_LE_CS_ANTENNA_SELECTION_OPT_THREE &&
-	    input != BT_LE_CS_ANTENNA_SELECTION_OPT_FOUR &&
-	    input != BT_LE_CS_ANTENNA_SELECTION_OPT_REPETITIVE &&
-	    input != BT_LE_CS_ANTENNA_SELECTION_OPT_NO_RECOMMENDATION) {
+	if (input != BT_CS_ANTENNA_SELECTION_OPT_ONE && input != BT_CS_ANTENNA_SELECTION_OPT_TWO &&
+	    input != BT_CS_ANTENNA_SELECTION_OPT_THREE &&
+	    input != BT_CS_ANTENNA_SELECTION_OPT_FOUR &&
+	    input != BT_CS_ANTENNA_SELECTION_OPT_REPETITIVE &&
+	    input != BT_CS_ANTENNA_SELECTION_OPT_NO_RECOMMENDATION) {
 		return -EINVAL;
 	}
 
@@ -49,10 +48,9 @@ static int cmd_read_remote_supported_capabilities(const struct shell *sh, size_t
 		return -ENOEXEC;
 	}
 
-	err = bt_le_cs_read_remote_supported_capabilities(default_conn);
+	err = bt_cs_read_remote_supported_capabilities(default_conn);
 	if (err) {
-		shell_error(sh, "bt_le_cs_read_remote_supported_capabilities returned error %d",
-			    err);
+		shell_error(sh, "bt_cs_read_remote_supported_capabilities returned error %d", err);
 		return -ENOEXEC;
 	}
 
@@ -62,7 +60,7 @@ static int cmd_read_remote_supported_capabilities(const struct shell *sh, size_t
 static int cmd_set_default_settings(const struct shell *sh, size_t argc, char *argv[])
 {
 	int err = 0;
-	struct bt_le_cs_set_default_settings_param params;
+	struct bt_cs_set_default_settings_param params;
 	uint16_t antenna_input;
 	int16_t tx_power_input;
 
@@ -109,9 +107,9 @@ static int cmd_set_default_settings(const struct shell *sh, size_t argc, char *a
 	params.cs_sync_antenna_selection = antenna_input;
 	params.max_tx_power = tx_power_input;
 
-	err = bt_le_cs_set_default_settings(default_conn, &params);
+	err = bt_cs_set_default_settings(default_conn, &params);
 	if (err) {
-		shell_error(sh, "bt_le_cs_set_default_settings returned error %d", err);
+		shell_error(sh, "bt_cs_set_default_settings returned error %d", err);
 		return -ENOEXEC;
 	}
 
@@ -127,9 +125,9 @@ static int cmd_read_remote_fae_table(const struct shell *sh, size_t argc, char *
 		return -ENOEXEC;
 	}
 
-	err = bt_le_cs_read_remote_fae_table(default_conn);
+	err = bt_cs_read_remote_fae_table(default_conn);
 	if (err) {
-		shell_error(sh, "bt_le_cs_read_remote_fae_table returned error %d", err);
+		shell_error(sh, "bt_cs_read_remote_fae_table returned error %d", err);
 		return -ENOEXEC;
 	}
 
@@ -139,7 +137,7 @@ static int cmd_read_remote_fae_table(const struct shell *sh, size_t argc, char *
 static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 {
 	int err = 0;
-	struct bt_le_cs_test_param params;
+	struct bt_cs_test_param params;
 
 	params.main_mode = BT_CONN_LE_CS_MAIN_MODE_1;
 	params.sub_mode = BT_CONN_LE_CS_SUB_MODE_UNUSED;
@@ -163,7 +161,7 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 
 	params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_AA_ONLY;
 	params.cs_sync_phy = BT_CONN_LE_CS_SYNC_1M_PHY;
-	params.cs_sync_antenna_selection = BT_LE_CS_TEST_CS_SYNC_ANTENNA_SELECTION_ONE;
+	params.cs_sync_antenna_selection = BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_ONE;
 	params.subevent_len = 10000;
 	params.subevent_interval = 0;
 	params.max_num_subevents = 0;
@@ -173,9 +171,9 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	params.t_fcs_time = 120;
 	params.t_pm_time = 20;
 	params.t_sw_time = 0;
-	params.tone_antenna_config_selection = BT_LE_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
-	params.initiator_snr_control = BT_LE_CS_TEST_INITIATOR_SNR_CONTROL_NOT_USED;
-	params.reflector_snr_control = BT_LE_CS_TEST_REFLECTOR_SNR_CONTROL_NOT_USED;
+	params.tone_antenna_config_selection = BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
+	params.initiator_snr_control = BT_CS_TEST_INITIATOR_SNR_CONTROL_NOT_USED;
+	params.reflector_snr_control = BT_CS_TEST_REFLECTOR_SNR_CONTROL_NOT_USED;
 	params.drbg_nonce = 0x1234;
 	params.override_config = 0;
 	params.override_config_0.channel_map_repetition = 1;
@@ -186,9 +184,9 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	params.override_config_0.not_set.ch3c_shape = BT_CONN_LE_CS_CH3C_SHAPE_HAT;
 	params.override_config_0.not_set.ch3c_jump = 0x2;
 
-	err = bt_le_cs_start_test(&params);
+	err = bt_cs_start_test(&params);
 	if (err) {
-		shell_error(sh, "bt_le_cs_start_test returned error %d", err);
+		shell_error(sh, "bt_cs_start_test returned error %d", err);
 		return -ENOEXEC;
 	}
 
@@ -208,7 +206,7 @@ static int cmd_remove_config(const struct shell *sh, size_t argc, char *argv[])
 
 	err = bt_le_cs_remove_config(default_conn, config_id);
 	if (err) {
-		shell_error(sh, "bt_le_cs_remove_config returned error %d", err);
+		shell_error(sh, "bt_cs_remove_config returned error %d", err);
 		return -ENOEXEC;
 	}
 
@@ -363,7 +361,7 @@ static int cmd_create_config(const struct shell *sh, size_t argc, char *argv[])
 
 	err = bt_le_cs_create_config(default_conn, &params, context);
 	if (err) {
-		shell_error(sh, "bt_le_cs_create_config returned error %d", err);
+		shell_error(sh, "bt_cs_create_config returned error %d", err);
 		return -ENOEXEC;
 	}
 

From e5f87996cbdaf8922d3a60883f8d0f4e2aeb347f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:07 +0100
Subject: [PATCH 2005/2913] Revert "[nrf fromtree] bluetooth: host: HCI support
 for CS configuration"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f2ee010d886d5490c36af0b069d6156810577395.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/conn.h       | 145 -----------------
 include/zephyr/bluetooth/cs.h         | 197 +++++++++--------------
 include/zephyr/bluetooth/hci_types.h  |  61 -------
 subsys/bluetooth/host/conn.c          |  34 ----
 subsys/bluetooth/host/conn_internal.h |   4 -
 subsys/bluetooth/host/cs.c            | 121 --------------
 subsys/bluetooth/host/hci_core.c      |   3 -
 subsys/bluetooth/host/hci_core.h      |   1 -
 subsys/bluetooth/shell/bt.c           |  60 -------
 subsys/bluetooth/shell/cs.c           | 219 +++-----------------------
 10 files changed, 96 insertions(+), 749 deletions(-)

diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index e4030c265f9..6ddc9835ceb 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -413,131 +413,6 @@ struct bt_conn_le_cs_fae_table {
 	uint8_t *remote_fae_table;
 };
 
-/** Channel sounding main mode */
-enum bt_conn_le_cs_main_mode {
-	/** Mode-1 (RTT) */
-	BT_CONN_LE_CS_MAIN_MODE_1 = BT_HCI_OP_LE_CS_MAIN_MODE_1,
-	/** Mode-2 (PBR) */
-	BT_CONN_LE_CS_MAIN_MODE_2 = BT_HCI_OP_LE_CS_MAIN_MODE_2,
-	/** Mode-3 (RTT and PBR) */
-	BT_CONN_LE_CS_MAIN_MODE_3 = BT_HCI_OP_LE_CS_MAIN_MODE_3,
-};
-
-/** Channel sounding sub mode */
-enum bt_conn_le_cs_sub_mode {
-	/** Unused */
-	BT_CONN_LE_CS_SUB_MODE_UNUSED = BT_HCI_OP_LE_CS_SUB_MODE_UNUSED,
-	/** Mode-1 (RTT) */
-	BT_CONN_LE_CS_SUB_MODE_1 = BT_HCI_OP_LE_CS_SUB_MODE_1,
-	/** Mode-2 (PBR) */
-	BT_CONN_LE_CS_SUB_MODE_2 = BT_HCI_OP_LE_CS_SUB_MODE_2,
-	/** Mode-3 (RTT and PBR) */
-	BT_CONN_LE_CS_SUB_MODE_3 = BT_HCI_OP_LE_CS_SUB_MODE_3,
-};
-
-/** Channel sounding role */
-enum bt_conn_le_cs_role {
-	/** CS initiator role */
-	BT_CONN_LE_CS_ROLE_INITIATOR,
-	/** CS reflector role */
-	BT_CONN_LE_CS_ROLE_REFLECTOR,
-};
-
-/** Channel sounding RTT type */
-enum bt_conn_le_cs_rtt_type {
-	/** RTT AA only */
-	BT_CONN_LE_CS_RTT_TYPE_AA_ONLY = BT_HCI_OP_LE_CS_RTT_TYPE_AA_ONLY,
-	/** RTT with 32-bit sounding sequence */
-	BT_CONN_LE_CS_RTT_TYPE_32_BIT_SOUNDING = BT_HCI_OP_LE_CS_RTT_TYPE_32BIT_SOUND,
-	/** RTT with 96-bit sounding sequence */
-	BT_CONN_LE_CS_RTT_TYPE_96_BIT_SOUNDING = BT_HCI_OP_LE_CS_RTT_TYPE_96BIT_SOUND,
-	/** RTT with 32-bit random sequence */
-	BT_CONN_LE_CS_RTT_TYPE_32_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_32BIT_RAND,
-	/** RTT with 64-bit random sequence */
-	BT_CONN_LE_CS_RTT_TYPE_64_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_64BIT_RAND,
-	/** RTT with 96-bit random sequence */
-	BT_CONN_LE_CS_RTT_TYPE_96_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_96BIT_RAND,
-	/** RTT with 128-bit random sequence */
-	BT_CONN_LE_CS_RTT_TYPE_128_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_128BIT_RAND,
-};
-
-/** Channel sounding PHY used for CS sync */
-enum bt_conn_le_cs_sync_phy {
-	/** LE 1M PHY */
-	BT_CONN_LE_CS_SYNC_1M_PHY = BT_HCI_OP_LE_CS_CS_SYNC_1M,
-	/** LE 2M PHY */
-	BT_CONN_LE_CS_SYNC_2M_PHY = BT_HCI_OP_LE_CS_CS_SYNC_2M,
-	/** LE 2M 2BT PHY */
-	BT_CONN_LE_CS_SYNC_2M_2BT_PHY = BT_HCI_OP_LE_CS_CS_SYNC_2M_2BT,
-};
-
-/** Channel sounding channel selection type */
-enum bt_conn_le_cs_chsel_type {
-	/** Use Channel Selection Algorithm #3b for non-mode-0 CS steps */
-	BT_CONN_LE_CS_CHSEL_TYPE_3B = BT_HCI_OP_LE_CS_TEST_CHSEL_TYPE_3B,
-	/** Use Channel Selection Algorithm #3c for non-mode-0 CS steps */
-	BT_CONN_LE_CS_CHSEL_TYPE_3C = BT_HCI_OP_LE_CS_TEST_CHSEL_TYPE_3C,
-};
-
-/** Channel sounding channel sequence shape */
-enum bt_conn_le_cs_ch3c_shape {
-	/** Use Hat shape for user-specified channel sequence */
-	BT_CONN_LE_CS_CH3C_SHAPE_HAT = BT_HCI_OP_LE_CS_TEST_CH3C_SHAPE_HAT,
-	/** Use X shape for user-specified channel sequence */
-	BT_CONN_LE_CS_CH3C_SHAPE_X = BT_HCI_OP_LE_CS_TEST_CH3C_SHAPE_X,
-};
-
-/** Channel sounding configuration */
-struct bt_conn_le_cs_config {
-	/** CS configuration ID */
-	uint8_t id;
-	/** Main CS mode type */
-	enum bt_conn_le_cs_main_mode main_mode_type;
-	/** Sub CS mode type */
-	enum bt_conn_le_cs_sub_mode sub_mode_type;
-	/** Minimum number of CS main mode steps to be executed before a submode step is executed */
-	uint8_t min_main_mode_steps;
-	/** Maximum number of CS main mode steps to be executed before a submode step is executed */
-	uint8_t max_main_mode_steps;
-	/** Number of main mode steps taken from the end of the last CS subevent to be repeated
-	 *  at the beginning of the current CS subevent directly after the last mode-0 step of that
-	 *  event
-	 */
-	uint8_t main_mode_repetition;
-	/** Number of CS mode-0 steps to be included at the beginning of each CS subevent */
-	uint8_t mode_0_steps;
-	/** CS role */
-	enum bt_conn_le_cs_role role;
-	/** RTT type */
-	enum bt_conn_le_cs_rtt_type rtt_type;
-	/** CS Sync PHY */
-	enum bt_conn_le_cs_sync_phy cs_sync_phy;
-	/** The number of times the Channel_Map field will be cycled through for non-mode-0 steps
-	 *  within a CS procedure
-	 */
-	uint8_t channel_map_repetition;
-	/** Channel selection type */
-	enum bt_conn_le_cs_chsel_type channel_selection_type;
-	/** User-specified channel sequence shape */
-	enum bt_conn_le_cs_ch3c_shape ch3c_shape;
-	/** Number of channels skipped in each rising and falling sequence  */
-	uint8_t ch3c_jump;
-	/** Interlude time in microseconds between the RTT packets */
-	uint8_t t_ip1_time_us;
-	/** Interlude time in microseconds between the CS tones */
-	uint8_t t_ip2_time_us;
-	/** Time in microseconds for frequency changes */
-	uint8_t t_fcs_time_us;
-	/** Time in microseconds for the phase measurement period of the CS tones */
-	uint8_t t_pm_time_us;
-	/** Channel map used for CS procedure
-	 *  Channels n = 0, 1, 23, 24, 25, 77, and 78 are not allowed and shall be set to zero.
-	 *  Channel 79 is reserved for future use and shall be set to zero.
-	 *  At least 15 channels shall be enabled.
-	 */
-	uint8_t channel_map[10];
-};
-
 /** @brief Increment a connection's reference count.
  *
  *  Increment the reference count of a connection object.
@@ -1657,26 +1532,6 @@ struct bt_conn_cb {
 	 */
 	void (*remote_cs_fae_table_available)(struct bt_conn *conn,
 					      struct bt_conn_le_cs_fae_table *params);
-
-	/** @brief LE CS Config created.
-	 *
-	 *  This callback notifies the application that a Channel Sounding
-	 *  Configuration procedure has completed and a new CS config is created
-	 *
-	 *  @param conn Connection object.
-	 *  @param config CS configuration.
-	 */
-	void (*le_cs_config_created)(struct bt_conn *conn, struct bt_conn_le_cs_config *config);
-
-	/** @brief LE CS Config removed.
-	 *
-	 *  This callback notifies the application that a Channel Sounding
-	 *  Configuration procedure has completed and a CS config is removed
-	 *
-	 *  @param conn Connection object.
-	 *  @param config_id ID of the CS configuration that was removed.
-	 */
-	void (*le_cs_config_removed)(struct bt_conn *conn, uint8_t config_id);
 #endif
 
 	/** @internal Internally used field for list handling */
diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index f836dfd3f4b..17331290e32 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -27,26 +27,6 @@
 extern "C" {
 #endif
 
-/**
- * @brief Macro for getting a specific channel bit in CS channel map
- *
- * @param[in] chmap Channel map array
- * @param[in] bit   Bit number to be accessed
- *
- * @return Bit value, either 1 or 0
- */
-#define BT_LE_CS_CHANNEL_BIT_GET(chmap, bit) (((chmap)[(bit) / 8] >> ((bit) % 8)) & 1)
-
-/**
- * @brief Macro for setting a specific channel bit value in CS channel map
- *
- * @param[in] chmap Channel map array
- * @param[in] bit   Bit number to be accessed
- * @param[in] val   Bit value to be set, either 1 or 0
- */
-#define BT_LE_CS_CHANNEL_BIT_SET_VAL(chmap, bit, val)                                              \
-	((chmap)[(bit) / 8] = ((chmap)[(bit) / 8] & ~BIT((bit) % 8)) | ((val) << ((bit) % 8)))
-
 enum bt_cs_sync_antenna_selection_opt {
 	/** Use antenna identifier 1 for CS_SYNC packets. */
 	BT_CS_ANTENNA_SELECTION_OPT_ONE = BT_HCI_OP_LE_CS_ANTENNA_SEL_ONE,
@@ -80,6 +60,59 @@ struct bt_cs_set_default_settings_param {
 	int8_t max_tx_power;
 };
 
+/** CS Test Main Mode */
+enum bt_cs_test_main_mode {
+	/** CS Test Mode-1 */
+	BT_CS_TEST_MAIN_MODE_1 = BT_HCI_OP_LE_CS_MAIN_MODE_1,
+	/** CS Test Mode-2 */
+	BT_CS_TEST_MAIN_MODE_2 = BT_HCI_OP_LE_CS_MAIN_MODE_2,
+	/** CS Test Mode-3 */
+	BT_CS_TEST_MAIN_MODE_3 = BT_HCI_OP_LE_CS_MAIN_MODE_3,
+};
+
+/** CS Test Sub-Mode */
+enum bt_cs_test_sub_mode {
+	/** CS Test sub-mode-1 */
+	BT_CS_TEST_SUB_MODE_1 = BT_HCI_OP_LE_CS_SUB_MODE_1,
+	/** CS Test sub-mode-2 */
+	BT_CS_TEST_SUB_MODE_2 = BT_HCI_OP_LE_CS_SUB_MODE_2,
+	/** CS Test sub-mode-3 */
+	BT_CS_TEST_SUB_MODE_3 = BT_HCI_OP_LE_CS_SUB_MODE_3,
+	/** No CS Test sub-mode. */
+	BT_CS_TEST_SUB_MODE_UNUSED = BT_HCI_OP_LE_CS_SUB_MODE_UNUSED,
+};
+
+/** CS Test Role */
+enum bt_cs_test_role {
+	BT_CS_TEST_ROLE_INITIATOR = BT_HCI_OP_LE_CS_INITIATOR_ROLE,
+	BT_CS_TEST_ROLE_REFLECTOR = BT_HCI_OP_LE_CS_REFLECTOR_ROLE,
+};
+
+/** CS Test RTT type */
+enum bt_cs_test_rtt_type {
+	/** RTT AA Only */
+	BT_CS_TEST_RTT_AA_ONLY = BT_HCI_OP_LE_CS_RTT_TYPE_AA_ONLY,
+	/** RTT with 32-bit sounding sequence */
+	BT_CS_TEST_RTT_32_BIT_SOUNDING = BT_HCI_OP_LE_CS_RTT_TYPE_32BIT_SOUND,
+	/** RTT with 96-bit sounding sequence */
+	BT_CS_TEST_RTT_96_BIT_SOUNDING = BT_HCI_OP_LE_CS_RTT_TYPE_96BIT_SOUND,
+	/** RTT with 32-bit random sequence */
+	BT_CS_TEST_RTT_32_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_32BIT_RAND,
+	/** RTT with 64-bit random sequence */
+	BT_CS_TEST_RTT_64_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_64BIT_RAND,
+	/** RTT with 96-bit random sequence */
+	BT_CS_TEST_RTT_96_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_96BIT_RAND,
+	/** RTT with 128-bit random sequence */
+	BT_CS_TEST_RTT_128_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_128BIT_RAND,
+};
+
+/** CS Test CS_SYNC PHY */
+enum bt_cs_test_cs_sync_phy {
+	BT_CS_TEST_CS_SYNC_LE_1M_PHY = BT_HCI_OP_LE_CS_CS_SYNC_1M,
+	BT_CS_TEST_CS_SYNC_LE_2M_PHY = BT_HCI_OP_LE_CS_CS_SYNC_2M,
+	BT_CS_TEST_CS_SYNC_LE_2M_2BT_PHY = BT_HCI_OP_LE_CS_CS_SYNC_2M_2BT,
+};
+
 /** CS Test CS_SYNC Antenna Identifier */
 enum bt_cs_test_cs_sync_antenna_selection {
 	BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_ONE = BT_HCI_OP_LE_CS_ANTENNA_SEL_ONE,
@@ -146,6 +179,18 @@ enum bt_cs_test_reflector_snr_control {
 	BT_CS_TEST_REFLECTOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_NOT_USED,
 };
 
+/** CS Test Override 0 channel selection algorithm selection */
+enum bt_cs_test_override_0_chsel_alg {
+	BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3B = BT_HCI_OP_LE_CS_TEST_CHSEL_TYPE_3B,
+	BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3C = BT_HCI_OP_LE_CS_TEST_CHSEL_TYPE_3C,
+};
+
+/** CS Test Override 0 chsel #3c shape */
+enum bt_cs_test_override_0_ch3c_shape {
+	BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3C_HAT_SHAPE = BT_HCI_OP_LE_CS_TEST_CH3C_SHAPE_HAT,
+	BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3C_X_SHAPE = BT_HCI_OP_LE_CS_TEST_CH3C_SHAPE_X,
+};
+
 /** CS Test Override 3 T_PM Tone Extension */
 enum bt_cs_test_override_3_pm_tone_ext {
 	/** Initiator and reflector tones sent without tone extension */
@@ -291,9 +336,9 @@ enum bt_cs_test_override_8_cs_sync_payload_pattern {
 /** CS Test parameters */
 struct bt_cs_test_param {
 	/** CS mode to be used during the CS procedure. */
-	enum bt_conn_le_cs_main_mode main_mode;
+	enum bt_cs_test_main_mode main_mode;
 	/** CS sub-mode to be used during the CS procedure. */
-	enum bt_conn_le_cs_sub_mode sub_mode;
+	enum bt_cs_test_sub_mode sub_mode;
 	/** Number of main mode steps taken from the end of the last CS subevent
 	 * to be repeated at the beginning of the current CS subevent directly
 	 * after the last mode-0 step of that event.
@@ -302,11 +347,11 @@ struct bt_cs_test_param {
 	/** Number of CS mode-0 steps at the beginning of the test CS subevent. */
 	uint8_t mode_0_steps;
 	/** CS Test role */
-	enum bt_conn_le_cs_role role;
+	enum bt_cs_test_role role;
 	/** RTT variant */
-	enum bt_conn_le_cs_rtt_type rtt_type;
+	enum bt_cs_test_rtt_type rtt_type;
 	/** CS_SYNC PHY */
-	enum bt_conn_le_cs_sync_phy cs_sync_phy;
+	enum bt_cs_test_cs_sync_phy cs_sync_phy;
 	/** Antenna identifier to be used for CS_SYNC packets. */
 	enum bt_cs_test_cs_sync_antenna_selection cs_sync_antenna_selection;
 	/** CS subevent length in microseconds.
@@ -391,8 +436,8 @@ struct bt_cs_test_param {
 			} set;
 			struct {
 				uint8_t channel_map[10];
-				enum bt_conn_le_cs_chsel_type channel_selection_type;
-				enum bt_conn_le_cs_ch3c_shape ch3c_shape;
+				enum bt_cs_test_override_0_chsel_alg channel_selection_type;
+				enum bt_cs_test_override_0_ch3c_shape ch3c_shape;
 				uint8_t ch3c_jump;
 			} not_set;
 		};
@@ -425,13 +470,12 @@ struct bt_cs_test_param {
 	struct {
 		/** Bit number where the first marker in the channel sounding sequence starts.
 		 *
-		 *  Must be between 0 and 28 when using @ref BT_CONN_LE_CS_RTT_TYPE_32_BIT_SOUNDING.
+		 *  Must be between 0 and 28 when using @ref BT_CS_TEST_RTT_32_BIT_SOUNDING.
 		 */
 		uint8_t ss_marker1_position;
 		/** Bit number where the second marker in the channel sounding sequence starts.
 		 *
-		 *  Must be between 67 and 92 when using @ref
-		 * BT_CONN_LE_CS_RTT_TYPE_96_BIT_SOUNDING.
+		 *  Must be between 67 and 92 when using @ref BT_CS_TEST_RTT_96_BIT_SOUNDING.
 		 *
 		 *  A value of @ref BT_HCI_OP_LE_CS_TEST_SS_MARKER_2_POSITION_NOT_PRESENT
 		 *  indicates that this sounding sequence or marker is not present.
@@ -462,68 +506,6 @@ struct bt_cs_test_param {
 	} override_config_8;
 };
 
-/** CS config creation context */
-enum bt_le_cs_create_config_context {
-	/** Write CS configuration in local Controller only  */
-	BT_LE_CS_CREATE_CONFIG_CONTEXT_LOCAL_ONLY,
-	/** Write CS configuration in both local and remote Controller using Channel Sounding
-	 * Configuration procedure
-	 */
-	BT_LE_CS_CREATE_CONFIG_CONTEXT_LOCAL_AND_REMOTE
-};
-
-/** CS Create Config params */
-struct bt_le_cs_create_config_params {
-	/** CS configuration ID */
-	uint8_t id;
-	/** Main CS mode type */
-	enum bt_conn_le_cs_main_mode main_mode_type;
-	/** Sub CS mode type */
-	enum bt_conn_le_cs_sub_mode sub_mode_type;
-	/** Minimum number of CS main mode steps to be executed before a submode step is executed */
-	uint8_t min_main_mode_steps;
-	/** Maximum number of CS main mode steps to be executed before a submode step is executed */
-	uint8_t max_main_mode_steps;
-	/** Number of main mode steps taken from the end of the last CS subevent to be repeated
-	 * at the beginning of the current CS subevent directly after the last mode-0 step of that
-	 * event
-	 */
-	uint8_t main_mode_repetition;
-	/** Number of CS mode-0 steps to be included at the beginning of each CS subevent */
-	uint8_t mode_0_steps;
-	/** CS role */
-	enum bt_conn_le_cs_role role;
-	/** RTT type */
-	enum bt_conn_le_cs_rtt_type rtt_type;
-	/** CS Sync PHY */
-	enum bt_conn_le_cs_sync_phy cs_sync_phy;
-	/** The number of times the Channel_Map field will be cycled through for non-mode-0 steps
-	 * within a CS procedure
-	 */
-	uint8_t channel_map_repetition;
-	/** Channel selection type */
-	enum bt_conn_le_cs_chsel_type channel_selection_type;
-	/** User-specified channel sequence shape */
-	enum bt_conn_le_cs_ch3c_shape ch3c_shape;
-	/** Number of channels skipped in each rising and falling sequence  */
-	uint8_t ch3c_jump;
-	/** Channel map used for CS procedure
-	 *  Channels n = 0, 1, 23, 24, 25, 77, and 78 are not allowed and shall be set to zero.
-	 *  Channel 79 is reserved for future use and shall be set to zero.
-	 *  At least 15 channels shall be enabled.
-	 */
-	uint8_t channel_map[10];
-};
-
-/** @brief Set all valid channel map bits
- *
- * This command is used to enable all valid channels in a
- * given CS channel map
- *
- * @param channel_map  Chanel map
- */
-void bt_le_cs_set_valid_chmap_bits(uint8_t channel_map[10]);
-
 /** @brief Read Remote Supported Capabilities
  *
  * This command is used to query the CS capabilities that are supported
@@ -587,37 +569,6 @@ int bt_cs_read_remote_fae_table(struct bt_conn *conn);
  */
 int bt_cs_start_test(const struct bt_cs_test_param *params);
 
-/** @brief Create CS configuration
- *
- * This command is used to create a new CS configuration or update an
- * existing one with the config id specified.
- *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
- *
- * @param conn    Connection Object.
- * @param params  CS Create Config parameters
- * @param context Controls whether the configuration is written to the local controller or
- *                both the local and the remote controller
- *
- * @return Zero on success or (negative) error code on failure.
- */
-int bt_le_cs_create_config(struct bt_conn *conn, struct bt_le_cs_create_config_params *params,
-			   enum bt_le_cs_create_config_context context);
-
-/** @brief Create CS configuration
- *
- * This command is used to remove a CS configuration from the local controller
- * identified by the config_id
- *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
- *
- * @param conn      Connection Object.
- * @param config_id CS Config ID
- *
- * @return Zero on success or (negative) error code on failure.
- */
-int bt_le_cs_remove_config(struct bt_conn *conn, uint8_t config_id);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index efc231efaef..31b30bbcf96 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -2582,36 +2582,6 @@ struct bt_hci_op_le_cs_test {
 	uint8_t override_parameters_data[];
 } __packed;
 
-#define BT_HCI_OP_LE_CS_CREATE_CONFIG BT_OP(BT_OGF_LE, 0x0090) /* 0x2090 */
-
-struct bt_hci_cp_le_cs_create_config {
-	uint16_t handle;
-	uint8_t config_id;
-	uint8_t create_context;
-	uint8_t main_mode_type;
-	uint8_t sub_mode_type;
-	uint8_t min_main_mode_steps;
-	uint8_t max_main_mode_steps;
-	uint8_t main_mode_repetition;
-	uint8_t mode_0_steps;
-	uint8_t role;
-	uint8_t rtt_type;
-	uint8_t cs_sync_phy;
-	uint8_t channel_map[10];
-	uint8_t channel_map_repetition;
-	uint8_t channel_selection_type;
-	uint8_t ch3c_shape;
-	uint8_t ch3c_jump;
-	uint8_t reserved;
-} __packed;
-
-#define BT_HCI_OP_LE_CS_REMOVE_CONFIG BT_OP(BT_OGF_LE, 0x0091) /* 0x2091 */
-
-struct bt_hci_cp_le_cs_remove_config {
-	uint16_t handle;
-	uint8_t config_id;
-} __packed;
-
 /* Event definitions */
 
 #define BT_HCI_EVT_UNKNOWN                      0x00
@@ -3433,36 +3403,6 @@ struct bt_hci_evt_le_cs_read_remote_fae_table_complete {
 	uint8_t remote_fae_table[72];
 } __packed;
 
-#define BT_HCI_LE_CS_CONFIG_ACTION_REMOVED 0x00
-#define BT_HCI_LE_CS_CONFIG_ACTION_CREATED 0x01
-
-#define BT_HCI_EVT_LE_CS_CONFIG_COMPLETE 0x2F
-struct bt_hci_evt_le_cs_config_complete {
-	uint8_t status;
-	uint16_t handle;
-	uint8_t config_id;
-	uint8_t action;
-	uint8_t main_mode_type;
-	uint8_t sub_mode_type;
-	uint8_t min_main_mode_steps;
-	uint8_t max_main_mode_steps;
-	uint8_t main_mode_repetition;
-	uint8_t mode_0_steps;
-	uint8_t role;
-	uint8_t rtt_type;
-	uint8_t cs_sync_phy;
-	uint8_t channel_map[10];
-	uint8_t channel_map_repetition;
-	uint8_t channel_selection_type;
-	uint8_t ch3c_shape;
-	uint8_t ch3c_jump;
-	uint8_t reserved;
-	uint8_t t_ip1_time;
-	uint8_t t_ip2_time;
-	uint8_t t_fcs_time;
-	uint8_t t_pm_time;
-} __packed;
-
 /* Event mask bits */
 
 #define BT_EVT_BIT(n) (1ULL << (n))
@@ -3554,7 +3494,6 @@ struct bt_hci_evt_le_cs_config_complete {
 
 #define BT_EVT_MASK_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE BT_EVT_BIT(43)
 #define BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE              BT_EVT_BIT(44)
-#define BT_EVT_MASK_LE_CS_CONFIG_COMPLETE                             BT_EVT_BIT(46)
 
 /** HCI Error Codes, BT Core Spec v5.4 [Vol 1, Part F]. */
 #define BT_HCI_ERR_SUCCESS                      0x00
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 806eaba2010..862f196618b 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -3354,40 +3354,6 @@ void notify_remote_cs_fae_table(struct bt_conn *conn, struct bt_conn_le_cs_fae_t
 		}
 	}
 }
-
-void notify_cs_config_created(struct bt_conn *conn, struct bt_conn_le_cs_config *params)
-{
-	struct bt_conn_cb *callback;
-
-	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->le_cs_config_created) {
-			callback->le_cs_config_created(conn, params);
-		}
-	}
-
-	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->le_cs_config_created) {
-			cb->le_cs_config_created(conn, params);
-		}
-	}
-}
-
-void notify_cs_config_removed(struct bt_conn *conn, uint8_t config_id)
-{
-	struct bt_conn_cb *callback;
-
-	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->le_cs_config_removed) {
-			callback->le_cs_config_removed(conn, config_id);
-		}
-	}
-
-	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->le_cs_config_removed) {
-			cb->le_cs_config_removed(conn, config_id);
-		}
-	}
-}
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
 
 int bt_conn_le_param_update(struct bt_conn *conn,
diff --git a/subsys/bluetooth/host/conn_internal.h b/subsys/bluetooth/host/conn_internal.h
index 0c334bc7cbe..4cc4e70d858 100644
--- a/subsys/bluetooth/host/conn_internal.h
+++ b/subsys/bluetooth/host/conn_internal.h
@@ -498,10 +498,6 @@ void notify_remote_cs_capabilities(struct bt_conn *conn,
 void notify_remote_cs_fae_table(struct bt_conn *conn,
 			   struct bt_conn_le_cs_fae_table params);
 
-void notify_cs_config_created(struct bt_conn *conn, struct bt_conn_le_cs_config *params);
-
-void notify_cs_config_removed(struct bt_conn *conn, uint8_t config_id);
-
 #if defined(CONFIG_BT_SMP)
 /* If role specific LTK is present */
 bool bt_conn_ltk_present(const struct bt_conn *conn);
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index d0d7f941b7b..5a713ad2457 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -18,24 +18,6 @@
 LOG_MODULE_REGISTER(bt_cs);
 
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
-
-void bt_le_cs_set_valid_chmap_bits(uint8_t channel_map[10])
-{
-	memset(channel_map, 0xFF, 10);
-
-	/** Channels n = 0, 1, 23, 24, 25, 77, and 78 are not allowed and shall be set to zero.
-	 *  Channel 79 is reserved for future use and shall be set to zero.
-	 */
-	BT_LE_CS_CHANNEL_BIT_SET_VAL(channel_map, 0, 0);
-	BT_LE_CS_CHANNEL_BIT_SET_VAL(channel_map, 1, 0);
-	BT_LE_CS_CHANNEL_BIT_SET_VAL(channel_map, 23, 0);
-	BT_LE_CS_CHANNEL_BIT_SET_VAL(channel_map, 24, 0);
-	BT_LE_CS_CHANNEL_BIT_SET_VAL(channel_map, 25, 0);
-	BT_LE_CS_CHANNEL_BIT_SET_VAL(channel_map, 77, 0);
-	BT_LE_CS_CHANNEL_BIT_SET_VAL(channel_map, 78, 0);
-	BT_LE_CS_CHANNEL_BIT_SET_VAL(channel_map, 79, 0);
-}
-
 int bt_cs_read_remote_supported_capabilities(struct bt_conn *conn)
 {
 	struct bt_hci_cp_le_read_remote_supported_capabilities *cp;
@@ -344,107 +326,4 @@ int bt_cs_start_test(const struct bt_cs_test_param *params)
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_TEST, buf, NULL);
 }
 
-void bt_hci_le_cs_config_complete_event(struct net_buf *buf)
-{
-	struct bt_hci_evt_le_cs_config_complete *evt;
-	struct bt_conn_le_cs_config config;
-	struct bt_conn *conn;
-
-	if (buf->len < sizeof(*evt)) {
-		LOG_ERR("Unexpected end of buffer");
-		return;
-	}
-
-	evt = net_buf_pull_mem(buf, sizeof(*evt));
-	if (evt->status) {
-		LOG_INF("CS Config failed (status 0x%02X)", evt->status);
-		return;
-	}
-
-	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->handle), BT_CONN_TYPE_LE);
-	if (!conn) {
-		LOG_ERR("Could not lookup connection handle when reading CS configuration");
-		return;
-	}
-
-	if (evt->action == BT_HCI_LE_CS_CONFIG_ACTION_REMOVED) {
-		notify_cs_config_removed(conn, evt->config_id);
-		bt_conn_unref(conn);
-		return;
-	}
-
-	config.id = evt->config_id;
-	config.main_mode_type = evt->main_mode_type;
-	config.sub_mode_type = evt->sub_mode_type;
-	config.min_main_mode_steps = evt->min_main_mode_steps;
-	config.max_main_mode_steps = evt->max_main_mode_steps;
-	config.main_mode_repetition = evt->main_mode_repetition;
-	config.mode_0_steps = evt->mode_0_steps;
-	config.role = evt->role;
-	config.rtt_type = evt->rtt_type;
-	config.cs_sync_phy = evt->cs_sync_phy;
-	config.channel_map_repetition = evt->channel_map_repetition;
-	config.channel_selection_type = evt->channel_selection_type;
-	config.ch3c_shape = evt->ch3c_shape;
-	config.ch3c_jump = evt->ch3c_jump;
-	config.t_ip1_time_us = evt->t_ip1_time;
-	config.t_ip2_time_us = evt->t_ip2_time;
-	config.t_fcs_time_us = evt->t_fcs_time;
-	config.t_pm_time_us = evt->t_pm_time;
-	memcpy(config.channel_map, evt->channel_map, ARRAY_SIZE(config.channel_map));
-
-	notify_cs_config_created(conn, &config);
-	bt_conn_unref(conn);
-}
-
-int bt_le_cs_create_config(struct bt_conn *conn, struct bt_le_cs_create_config_params *params,
-			   enum bt_le_cs_create_config_context context)
-{
-	struct bt_hci_cp_le_cs_create_config *cp;
-	struct net_buf *buf;
-
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_CREATE_CONFIG, sizeof(*cp));
-	if (!buf) {
-		return -ENOBUFS;
-	}
-
-	cp = net_buf_add(buf, sizeof(*cp));
-	cp->handle = sys_cpu_to_le16(conn->handle);
-	cp->config_id = params->id;
-	cp->create_context = context;
-	cp->main_mode_type = params->main_mode_type;
-	cp->sub_mode_type = params->sub_mode_type;
-	cp->min_main_mode_steps = params->min_main_mode_steps;
-	cp->max_main_mode_steps = params->max_main_mode_steps;
-	cp->main_mode_repetition = params->main_mode_repetition;
-	cp->mode_0_steps = params->mode_0_steps;
-	cp->role = params->role;
-	cp->rtt_type = params->rtt_type;
-	cp->cs_sync_phy = params->cs_sync_phy;
-	cp->channel_map_repetition = params->channel_map_repetition;
-	cp->channel_selection_type = params->channel_selection_type;
-	cp->ch3c_shape = params->ch3c_shape;
-	cp->ch3c_jump = params->ch3c_jump;
-	cp->reserved = 0;
-	memcpy(cp->channel_map, params->channel_map, ARRAY_SIZE(cp->channel_map));
-
-	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_CREATE_CONFIG, buf, NULL);
-}
-
-int bt_le_cs_remove_config(struct bt_conn *conn, uint8_t config_id)
-{
-	struct bt_hci_cp_le_cs_remove_config *cp;
-	struct net_buf *buf;
-
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_REMOVE_CONFIG, sizeof(*cp));
-	if (!buf) {
-		return -ENOBUFS;
-	}
-
-	cp = net_buf_add(buf, sizeof(*cp));
-	cp->handle = sys_cpu_to_le16(conn->handle);
-	cp->config_id = config_id;
-
-	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_REMOVE_CONFIG, buf, NULL);
-}
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index 39fe50643a7..b1ab4fbb664 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -2828,8 +2828,6 @@ static const struct event_handler meta_events[] = {
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE,
 		      bt_hci_le_cs_read_remote_fae_table_complete,
 		      sizeof(struct bt_hci_evt_le_cs_read_remote_fae_table_complete)),
-	EVENT_HANDLER(BT_HCI_EVT_LE_CS_CONFIG_COMPLETE, bt_hci_le_cs_config_complete_event,
-		      sizeof(struct bt_hci_evt_le_cs_config_complete)),
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
 
 };
@@ -3406,7 +3404,6 @@ static int le_set_event_mask(void)
 	    BT_FEAT_LE_CHANNEL_SOUNDING(bt_dev.le.features)) {
 		mask |= BT_EVT_MASK_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE;
 		mask |= BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE;
-		mask |= BT_EVT_MASK_LE_CS_CONFIG_COMPLETE;
 	}
 
 	sys_put_le64(mask, cp_mask->events);
diff --git a/subsys/bluetooth/host/hci_core.h b/subsys/bluetooth/host/hci_core.h
index a50b534f1b7..590d85a6c49 100644
--- a/subsys/bluetooth/host/hci_core.h
+++ b/subsys/bluetooth/host/hci_core.h
@@ -541,7 +541,6 @@ void bt_hci_le_past_received_v2(struct net_buf *buf);
 /* CS HCI event handlers */
 void bt_hci_le_cs_read_remote_supported_capabilities_complete(struct net_buf *buf);
 void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf);
-void bt_hci_le_cs_config_complete_event(struct net_buf *buf);
 
 /* Adv HCI event handlers */
 void bt_hci_le_adv_set_terminated(struct net_buf *buf);
diff --git a/subsys/bluetooth/shell/bt.c b/subsys/bluetooth/shell/bt.c
index b900fe721df..25841fd48d6 100644
--- a/subsys/bluetooth/shell/bt.c
+++ b/subsys/bluetooth/shell/bt.c
@@ -1052,64 +1052,6 @@ void print_remote_cs_fae_table(struct bt_conn *conn, struct bt_conn_le_cs_fae_ta
 	shell_print(ctx_shell, "Received FAE Table: ");
 	shell_hexdump(ctx_shell, params->remote_fae_table, 72);
 }
-
-static void le_cs_config_created(struct bt_conn *conn, struct bt_conn_le_cs_config *config)
-{
-	const char *mode_str[5] = {"Unused", "1 (RTT)", "2 (PBR)", "3 (RTT + PBR)", "Invalid"};
-	const char *role_str[3] = {"Initiator", "Reflector", "Invalid"};
-	const char *rtt_type_str[8] = {"AA only",        "32-bit sounding", "96-bit sounding",
-				       "32-bit random",  "64-bit random",   "96-bit random",
-				       "128-bit random", "Invalid"};
-	const char *phy_str[4] = {"Invalid", "LE 1M PHY", "LE 2M PHY", "LE 2M 2BT PHY"};
-	const char *chsel_type_str[3] = {"Algorithm #3b", "Algorithm #3c", "Invalid"};
-	const char *ch3c_shape_str[3] = {"Hat shape", "X shape", "Invalid"};
-
-	uint8_t main_mode_idx = config->main_mode_type > 0 && config->main_mode_type < 4
-					? config->main_mode_type
-					: 4;
-	uint8_t sub_mode_idx = config->sub_mode_type < 4 ? config->sub_mode_type : 0;
-	uint8_t role_idx = MIN(config->role, 2);
-	uint8_t rtt_type_idx = MIN(config->rtt_type, 7);
-	uint8_t phy_idx =
-		config->cs_sync_phy > 0 && config->cs_sync_phy < 4 ? config->cs_sync_phy : 0;
-	uint8_t chsel_type_idx = MIN(config->channel_selection_type, 2);
-	uint8_t ch3c_shape_idx = MIN(config->ch3c_shape, 2);
-
-	shell_print(ctx_shell,
-		    "New CS config created:\n"
-		    "- ID: %d\n"
-		    "- Role: %s\n"
-		    "- Main mode: %s\n"
-		    "- Sub mode: %s\n"
-		    "- RTT type: %s\n"
-		    "- Main mode steps: %d - %d\n"
-		    "- Main mode repetition: %d\n"
-		    "- Mode 0 steps: %d\n"
-		    "- CS sync PHY: %s\n"
-		    "- T_IP1 time: %d\n"
-		    "- T_IP2 time: %d\n"
-		    "- T_FCS time: %d\n"
-		    "- T_PM time: %d\n"
-		    "- Channel map: 0x%08X%08X%04X\n"
-		    "- Channel map repetition: %d\n"
-		    "- Channel selection type: %s\n"
-		    "- Ch3c shape: %s\n"
-		    "- Ch3c jump: %d\n",
-		    config->id, role_str[role_idx], mode_str[main_mode_idx], mode_str[sub_mode_idx],
-		    rtt_type_str[rtt_type_idx], config->min_main_mode_steps,
-		    config->max_main_mode_steps, config->main_mode_repetition, config->mode_0_steps,
-		    phy_str[phy_idx], config->t_ip1_time_us, config->t_ip2_time_us,
-		    config->t_fcs_time_us, config->t_pm_time_us,
-		    sys_get_le32(&config->channel_map[6]), sys_get_le32(&config->channel_map[2]),
-		    sys_get_le16(&config->channel_map[0]), config->channel_map_repetition,
-		    chsel_type_str[chsel_type_idx], ch3c_shape_str[ch3c_shape_idx],
-		    config->ch3c_jump);
-}
-
-static void le_cs_config_removed(struct bt_conn *conn, uint8_t config_id)
-{
-	shell_print(ctx_shell, "CS config %d is removed", config_id);
-}
 #endif
 
 static struct bt_conn_cb conn_callbacks = {
@@ -1144,8 +1086,6 @@ static struct bt_conn_cb conn_callbacks = {
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
 	.remote_cs_capabilities_available = print_remote_cs_capabilities,
 	.remote_cs_fae_table_available = print_remote_cs_fae_table,
-	.le_cs_config_created = le_cs_config_created,
-	.le_cs_config_removed = le_cs_config_removed,
 #endif
 };
 #endif /* CONFIG_BT_CONN */
diff --git a/subsys/bluetooth/shell/cs.c b/subsys/bluetooth/shell/cs.c
index 63fb0ad7828..b8f32be61be 100644
--- a/subsys/bluetooth/shell/cs.c
+++ b/subsys/bluetooth/shell/cs.c
@@ -139,8 +139,8 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	int err = 0;
 	struct bt_cs_test_param params;
 
-	params.main_mode = BT_CONN_LE_CS_MAIN_MODE_1;
-	params.sub_mode = BT_CONN_LE_CS_SUB_MODE_UNUSED;
+	params.main_mode = BT_CS_TEST_MAIN_MODE_1;
+	params.sub_mode = BT_CS_TEST_SUB_MODE_UNUSED;
 	params.main_mode_repetition = 0;
 	params.mode_0_steps = 0x1;
 
@@ -152,15 +152,14 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 		return SHELL_CMD_HELP_PRINTED;
 	}
 
-	if (params.role != BT_CONN_LE_CS_ROLE_INITIATOR &&
-	    params.role != BT_CONN_LE_CS_ROLE_REFLECTOR) {
+	if (params.role != BT_CS_TEST_ROLE_INITIATOR && params.role != BT_CS_TEST_ROLE_REFLECTOR) {
 		shell_help(sh);
 		shell_error(sh, "Role selection input invalid");
 		return SHELL_CMD_HELP_PRINTED;
 	}
 
-	params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_AA_ONLY;
-	params.cs_sync_phy = BT_CONN_LE_CS_SYNC_1M_PHY;
+	params.rtt_type = BT_CS_TEST_RTT_AA_ONLY;
+	params.cs_sync_phy = BT_CS_TEST_CS_SYNC_LE_1M_PHY;
 	params.cs_sync_antenna_selection = BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_ONE;
 	params.subevent_len = 10000;
 	params.subevent_interval = 0;
@@ -178,10 +177,12 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	params.override_config = 0;
 	params.override_config_0.channel_map_repetition = 1;
 	memset(params.override_config_0.not_set.channel_map, 0,
-	       sizeof(params.override_config_0.not_set.channel_map));
+		sizeof(params.override_config_0.not_set.channel_map));
 	params.override_config_0.not_set.channel_map[1] = 0xFF;
-	params.override_config_0.not_set.channel_selection_type = BT_CONN_LE_CS_CHSEL_TYPE_3B;
-	params.override_config_0.not_set.ch3c_shape = BT_CONN_LE_CS_CH3C_SHAPE_HAT;
+	params.override_config_0.not_set.channel_selection_type =
+		BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3B;
+	params.override_config_0.not_set.ch3c_shape =
+		BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3C_HAT_SHAPE;
 	params.override_config_0.not_set.ch3c_jump = 0x2;
 
 	err = bt_cs_start_test(&params);
@@ -193,202 +194,26 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	return 0;
 }
 
-static int cmd_remove_config(const struct shell *sh, size_t argc, char *argv[])
-{
-	int err = 0;
-
-	if (default_conn == NULL) {
-		shell_error(sh, "Conn handle error, at least one connection is required.");
-		return -ENOEXEC;
-	}
-
-	uint8_t config_id = strtoul(argv[1], NULL, 10);
-
-	err = bt_le_cs_remove_config(default_conn, config_id);
-	if (err) {
-		shell_error(sh, "bt_cs_remove_config returned error %d", err);
-		return -ENOEXEC;
-	}
-
-	return 0;
-}
-
-static int cmd_create_config(const struct shell *sh, size_t argc, char *argv[])
-{
-	int err = 0;
-	enum bt_le_cs_create_config_context context;
-	struct bt_le_cs_create_config_params params;
-
-	if (default_conn == NULL) {
-		shell_error(sh, "Conn handle error, at least one connection is required.");
-		return -ENOEXEC;
-	}
-
-	params.id = strtoul(argv[1], NULL, 10);
-	if (!strcmp(argv[2], "local-only")) {
-		context = BT_LE_CS_CREATE_CONFIG_CONTEXT_LOCAL_ONLY;
-	} else if (!strcmp(argv[2], "local-only")) {
-		context = BT_LE_CS_CREATE_CONFIG_CONTEXT_LOCAL_AND_REMOTE;
-	} else {
-		shell_error(sh, "Invalid context: %s", argv[2]);
-		shell_help(sh);
-		return SHELL_CMD_HELP_PRINTED;
-	}
-
-	if (!strcmp(argv[3], "initiator")) {
-		params.role = BT_CONN_LE_CS_ROLE_INITIATOR;
-	} else if (!strcmp(argv[3], "reflector")) {
-		params.role = BT_CONN_LE_CS_ROLE_REFLECTOR;
-	} else {
-		shell_error(sh, "Invalid role: %s", argv[3]);
-		shell_help(sh);
-		return SHELL_CMD_HELP_PRINTED;
-	}
-
-	/* Set the default values */
-	params.main_mode_type = BT_CONN_LE_CS_MAIN_MODE_2;
-	params.sub_mode_type = BT_CONN_LE_CS_SUB_MODE_1;
-	params.min_main_mode_steps = 0x05;
-	params.max_main_mode_steps = 0x0A;
-	params.main_mode_repetition = 0;
-	params.mode_0_steps = 1;
-	params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_AA_ONLY;
-	params.cs_sync_phy = BT_CONN_LE_CS_SYNC_2M_PHY;
-	params.channel_map_repetition = 1;
-	params.channel_selection_type = BT_CONN_LE_CS_CHSEL_TYPE_3B;
-	params.ch3c_shape = BT_CONN_LE_CS_CH3C_SHAPE_HAT;
-	params.ch3c_jump = 2;
-
-	bt_le_cs_set_valid_chmap_bits(params.channel_map);
-
-	for (int j = 4; j < argc; j++) {
-		if (!strcmp(argv[j], "rtt-none")) {
-			params.main_mode_type = BT_CONN_LE_CS_MAIN_MODE_1;
-			params.sub_mode_type = BT_CONN_LE_CS_SUB_MODE_UNUSED;
-		} else if (!strcmp(argv[j], "pbr-none")) {
-			params.main_mode_type = BT_CONN_LE_CS_MAIN_MODE_2;
-			params.sub_mode_type = BT_CONN_LE_CS_SUB_MODE_UNUSED;
-		} else if (!strcmp(argv[j], "both-none")) {
-			params.main_mode_type = BT_CONN_LE_CS_MAIN_MODE_3;
-			params.sub_mode_type = BT_CONN_LE_CS_SUB_MODE_UNUSED;
-		} else if (!strcmp(argv[j], "pbr-rtt")) {
-			params.main_mode_type = BT_CONN_LE_CS_MAIN_MODE_2;
-			params.sub_mode_type = BT_CONN_LE_CS_SUB_MODE_1;
-		} else if (!strcmp(argv[j], "pbr-both")) {
-			params.main_mode_type = BT_CONN_LE_CS_MAIN_MODE_2;
-			params.sub_mode_type = BT_CONN_LE_CS_SUB_MODE_3;
-		} else if (!strcmp(argv[j], "both-pbr")) {
-			params.main_mode_type = BT_CONN_LE_CS_MAIN_MODE_3;
-			params.sub_mode_type = BT_CONN_LE_CS_SUB_MODE_2;
-		} else if (!strcmp(argv[j], "steps")) {
-			if (++j == argc) {
-				shell_help(sh);
-				return SHELL_CMD_HELP_PRINTED;
-			}
-
-			params.min_main_mode_steps = strtoul(argv[j], NULL, 10);
-			if (++j == argc) {
-				shell_help(sh);
-				return SHELL_CMD_HELP_PRINTED;
-			}
-
-			params.max_main_mode_steps = strtoul(argv[j], NULL, 10);
-			if (++j == argc) {
-				shell_help(sh);
-				return SHELL_CMD_HELP_PRINTED;
-			}
-
-			params.mode_0_steps = strtoul(argv[j], NULL, 10);
-		} else if (!strcmp(argv[j], "aa-only")) {
-			params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_AA_ONLY;
-		} else if (!strcmp(argv[j], "32b-sound")) {
-			params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_32_BIT_SOUNDING;
-		} else if (!strcmp(argv[j], "96b-sound")) {
-			params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_96_BIT_SOUNDING;
-		} else if (!strcmp(argv[j], "32b-rand")) {
-			params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_32_BIT_RANDOM;
-		} else if (!strcmp(argv[j], "64b-rand")) {
-			params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_64_BIT_RANDOM;
-		} else if (!strcmp(argv[j], "96b-rand")) {
-			params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_96_BIT_RANDOM;
-		} else if (!strcmp(argv[j], "128b-rand")) {
-			params.rtt_type = BT_CONN_LE_CS_RTT_TYPE_128_BIT_RANDOM;
-		} else if (!strcmp(argv[j], "phy-1m")) {
-			params.cs_sync_phy = BT_CONN_LE_CS_SYNC_1M_PHY;
-		} else if (!strcmp(argv[j], "phy-2m")) {
-			params.cs_sync_phy = BT_CONN_LE_CS_SYNC_2M_PHY;
-		} else if (!strcmp(argv[j], "phy-2m-2b")) {
-			params.cs_sync_phy = BT_CONN_LE_CS_SYNC_2M_2BT_PHY;
-		} else if (!strcmp(argv[j], "chmap-rep")) {
-			if (++j == argc) {
-				shell_help(sh);
-				return SHELL_CMD_HELP_PRINTED;
-			}
-
-			params.channel_map_repetition = strtoul(argv[j], NULL, 10);
-		} else if (!strcmp(argv[j], "hat-shape")) {
-			params.ch3c_shape = BT_CONN_LE_CS_CH3C_SHAPE_HAT;
-		} else if (!strcmp(argv[j], "x-shape")) {
-			params.ch3c_shape = BT_CONN_LE_CS_CH3C_SHAPE_X;
-		} else if (!strcmp(argv[j], "chsel-3b")) {
-			params.channel_selection_type = BT_CONN_LE_CS_CHSEL_TYPE_3B;
-		} else if (!strcmp(argv[j], "chsel-3c")) {
-			params.channel_selection_type = BT_CONN_LE_CS_CHSEL_TYPE_3C;
-		} else if (!strcmp(argv[j], "ch3c-jump")) {
-			if (++j == argc) {
-				shell_help(sh);
-				return SHELL_CMD_HELP_PRINTED;
-			}
-
-			params.ch3c_jump = strtoul(argv[j], NULL, 10);
-		} else if (!strcmp(argv[j], "chmap")) {
-			if (++j == argc) {
-				shell_help(sh);
-				return SHELL_CMD_HELP_PRINTED;
-			}
-
-			if (hex2bin(argv[j], strlen(argv[j]), params.channel_map, 10) == 0) {
-				shell_error(sh, "Invalid channel map");
-				return -ENOEXEC;
-			}
-
-			sys_mem_swap(params.channel_map, 10);
-		} else {
-			shell_help(sh);
-			return SHELL_CMD_HELP_PRINTED;
-		}
-	}
-
-	err = bt_le_cs_create_config(default_conn, &params, context);
-	if (err) {
-		shell_error(sh, "bt_cs_create_config returned error %d", err);
-		return -ENOEXEC;
-	}
-
-	return 0;
-}
-
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	cs_cmds,
-	SHELL_CMD_ARG(read_remote_supported_capabilities, NULL, "<None>",
-		      cmd_read_remote_supported_capabilities, 1, 0),
+	SHELL_CMD_ARG(
+		read_remote_supported_capabilities, NULL,
+		"<None>",
+		cmd_read_remote_supported_capabilities, 1, 0),
 	SHELL_CMD_ARG(
 		set_default_settings, NULL,
 		"<Enable initiator role: true, false> <Enable reflector role: true, false> "
 		" <CS_SYNC antenna selection: 0x01 - 0x04, 0xFE, 0xFF> <Max TX power: -127 - 20>",
 		cmd_set_default_settings, 5, 0),
-	SHELL_CMD_ARG(read_remote_fae_table, NULL, "<None>", cmd_read_remote_fae_table, 1, 0),
-	SHELL_CMD_ARG(start_simple_cs_test, NULL, "<Role selection (initiator, reflector): 0, 1>",
-		      cmd_cs_test_simple, 2, 0),
 	SHELL_CMD_ARG(
-		create_config, NULL,
-		"<id> <context: local-only, local-remote> <role: initiator, reflector> "
-		"[rtt-none, pbr-none, both-none, pbr-rtt, pbr-both, both-pbr] [steps <min> "
-		"<max> <mode-0>] [aa-only, 32b-sound, 96b-sound, 32b-rand, 64b-rand, 96b-rand, "
-		"128b-rand] [phy-1m, phy-2m, phy-2m-2b] [chmap-rep <rep>] [hat-shape, x-shape] "
-		"[ch3c-jump <jump>] [chmap <XXXXXXXXXXXXXXXX>] (78-0) [chsel-3b, chsel-3c]",
-		cmd_create_config, 4, 15),
-	SHELL_CMD_ARG(remove_config, NULL, "<id>", cmd_remove_config, 2, 0), SHELL_SUBCMD_SET_END);
+		read_remote_fae_table, NULL,
+		"<None>",
+		cmd_read_remote_fae_table, 1, 0),
+	SHELL_CMD_ARG(
+		start_simple_cs_test, NULL,
+		"<Role selection (initiator, reflector): 0, 1>",
+		cmd_cs_test_simple, 2, 0),
+	SHELL_SUBCMD_SET_END);
 
 static int cmd_cs(const struct shell *sh, size_t argc, char **argv)
 {

From e816386548244f76123725e97d3e7e7b94a741c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:07 +0100
Subject: [PATCH 2006/2913] Revert "[nrf fromtree] bluetooth: host: set
 BT_BUF_EVT_RX_SIZE to 255 when CS is enabled"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 42b5a99486ed840eff6fa4953f11bd8e59d34767.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/common/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/subsys/bluetooth/common/Kconfig b/subsys/bluetooth/common/Kconfig
index 8bec5ba90d5..a34dbae692e 100644
--- a/subsys/bluetooth/common/Kconfig
+++ b/subsys/bluetooth/common/Kconfig
@@ -100,11 +100,10 @@ config BT_BUF_ACL_RX_COUNT
 
 config BT_BUF_EVT_RX_SIZE
 	int "Maximum supported HCI Event buffer length"
-	default $(UINT8_MAX) if (BT_EXT_ADV && BT_OBSERVER) || BT_PER_ADV_SYNC || BT_DF_CONNECTION_CTE_RX || BT_CLASSIC || BT_CHANNEL_SOUNDING
+	default $(UINT8_MAX) if (BT_EXT_ADV && BT_OBSERVER) || BT_PER_ADV_SYNC || BT_DF_CONNECTION_CTE_RX || BT_CLASSIC
 	# LE Read Supported Commands command complete event.
 	default 68
 	range 68 $(UINT8_MAX)
-	range 78 $(UINT8_MAX) if BT_CHANNEL_SOUNDING
 	help
 	  Maximum supported HCI event buffer size. This value does not include
 	  the HCI Event header.

From 03789f85d934be769ec1ef2d2eaf34729bfbd0ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:07 +0100
Subject: [PATCH 2007/2913] Revert "[nrf fromtree] dts: nordic: Add Channel
 Sounding support to nrf-radio"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4afc1f5e98734ae993df682d262d09149f1ab2dd.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts | 3 +--
 dts/bindings/net/wireless/nordic,nrf-radio.yaml         | 7 -------
 dts/common/nordic/nrf54h20.dtsi                         | 1 -
 dts/common/nordic/nrf54l15.dtsi                         | 1 -
 soc/nordic/common/Kconfig.peripherals                   | 3 ---
 5 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
index cd8b95be664..43ca4460f25 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -97,9 +97,8 @@
 
 &radio {
 	status = "okay";
-	/* These features are not yet supported by the RADIO model */
+	/* This feature is not yet supported by the RADIO model */
 	/delete-property/ dfe-supported;
-	/delete-property/ cs-supported;
 };
 
 &clock {
diff --git a/dts/bindings/net/wireless/nordic,nrf-radio.yaml b/dts/bindings/net/wireless/nordic,nrf-radio.yaml
index 8c73d652662..9814e5f5fb7 100644
--- a/dts/bindings/net/wireless/nordic,nrf-radio.yaml
+++ b/dts/bindings/net/wireless/nordic,nrf-radio.yaml
@@ -227,10 +227,3 @@ properties:
     description: |
       If set, indicates that the radio hardware supports high TX power
       settings.
-
-  cs-supported:
-    type: boolean
-    description: |
-      If set, the radio hardware supports the BLE Channel Sounding feature.
-      This property should be treated as read-only and should not be overridden;
-      the correct value is provided for your target's SoC already.
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 7c8e9a3eec3..788e1eeaf0a 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -415,7 +415,6 @@
 				status = "disabled";
 				ble-2mbps-supported;
 				ble-coded-phy-supported;
-				cs-supported;
 				dfe-supported;
 				ieee802154-supported;
 				interrupts = <44 NRF_DEFAULT_IRQ_PRIORITY>;
diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/common/nordic/nrf54l15.dtsi
index 60b22599314..4eaac53d0eb 100644
--- a/dts/common/nordic/nrf54l15.dtsi
+++ b/dts/common/nordic/nrf54l15.dtsi
@@ -211,7 +211,6 @@
 				ieee802154-supported;
 				ble-2mbps-supported;
 				ble-coded-phy-supported;
-				cs-supported;
 
 				ieee802154: ieee802154 {
 					compatible = "nordic,nrf-ieee802154";
diff --git a/soc/nordic/common/Kconfig.peripherals b/soc/nordic/common/Kconfig.peripherals
index 5b1afd66d3f..2e77e7bf150 100644
--- a/soc/nordic/common/Kconfig.peripherals
+++ b/soc/nordic/common/Kconfig.peripherals
@@ -198,9 +198,6 @@ config HAS_HW_NRF_RADIO_BLE_2M
 config HAS_HW_NRF_RADIO_BLE_CODED
 	def_bool $(dt_nodelabel_bool_prop,radio,ble-coded-phy-supported)
 
-config HAS_HW_NRF_RADIO_CS
-	def_bool $(dt_nodelabel_bool_prop,radio,cs-supported)
-
 config HAS_HW_NRF_RADIO_DFE
 	def_bool $(dt_nodelabel_bool_prop,radio,dfe-supported)
 

From 96e5f99a3593c3e83d23883cc76c3eb4df27a9c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:07 +0100
Subject: [PATCH 2008/2913] Revert "[nrf fromtree] tests: drivers: uart:
 uart_pm: Disable PM_DEVICE_SYSTEM_MANAGED"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4c09483144c4b0947270af96ccf5f396bec12484.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../drivers/uart/uart_pm/boards/nrf54h20dk_nrf54h20_cpuapp.conf  | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 tests/drivers/uart/uart_pm/boards/nrf54h20dk_nrf54h20_cpuapp.conf

diff --git a/tests/drivers/uart/uart_pm/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/uart/uart_pm/boards/nrf54h20dk_nrf54h20_cpuapp.conf
deleted file mode 100644
index 09f887e0650..00000000000
--- a/tests/drivers/uart/uart_pm/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PM_DEVICE_SYSTEM_MANAGED=n

From 263f2d4caac5a460bb4245292e2bddaa6ad237dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:07 +0100
Subject: [PATCH 2009/2913] Revert "[nrf fromtree] dts: arm: nordic: Define
 power states for nrf54h20/cpuapp"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c24fc5b361782b7684b31212895e40ff410c55b9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/common/nordic/nrf54h20.dtsi | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 788e1eeaf0a..12da886e38e 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -28,7 +28,6 @@
 			device_type = "cpu";
 			clocks = <&cpuapp_hsfll>;
 			clock-frequency = <DT_FREQ_M(320)>;
-			cpu-power-states = <&idle &s2ram>;
 		};
 
 		cpurad: cpu@3 {
@@ -123,20 +122,6 @@
 				nordic,tasks-mask = <0xffff0000>;
 			};
 		};
-
-		power-states {
-			idle: idle {
-				compatible = "zephyr,power-state";
-				power-state-name = "suspend-to-idle";
-				min-residency-us = <100000>;
-			};
-
-			s2ram: s2ram {
-				compatible = "zephyr,power-state";
-				power-state-name = "suspend-to-ram";
-				min-residency-us = <800000>;
-			};
-		};
 	};
 
 	reserved-memory {

From 45a5698453c5d31f9a618d784f51d8fa2f2ca36b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:07 +0100
Subject: [PATCH 2010/2913] Revert "[nrf fromtree] mgmt: mcumgr: transport:
 bluetooth: add all gatt permission levels"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fdfeca4ce8d7af79639256cfd5ee9ebdcf8c8be8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/releases/migration-guide-4.0.rst          |  4 ---
 .../mgmt/mcumgr/smp_svr/overlay-bt.conf       |  1 +
 scripts/utils/migrate_mcumgr_kconfigs.py      |  3 +-
 .../mgmt/mcumgr/transport/Kconfig.bluetooth   | 24 ++++-----------
 subsys/mgmt/mcumgr/transport/src/smp_bt.c     | 29 ++++---------------
 tests/subsys/mgmt/mcumgr/all_options/prj.conf |  3 +-
 6 files changed, 16 insertions(+), 48 deletions(-)

diff --git a/doc/releases/migration-guide-4.0.rst b/doc/releases/migration-guide-4.0.rst
index f8a47907859..1437b4044de 100644
--- a/doc/releases/migration-guide-4.0.rst
+++ b/doc/releases/migration-guide-4.0.rst
@@ -283,10 +283,6 @@ hawkBit
 MCUmgr
 ======
 
-* The ``MCUMGR_TRANSPORT_BT_AUTHEN`` Kconfig option from the :kconfig:option:`CONFIG_MCUMGR_TRANSPORT_BT` MCUmgr transport has been replaced with the :kconfig:option:`CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW` Kconfig choice.
-  The requirement for Bluetooth authentication is now indicated by the :kconfig:option:`CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN` Kconfig option.
-  To remove the default requirement for Bluetooth authentication it is necessary to enable the :kconfig:option:`CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW` Kconfig option in the project configuration.
-
 Modem
 =====
 
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/overlay-bt.conf b/samples/subsys/mgmt/mcumgr/smp_svr/overlay-bt.conf
index 1b945465163..8942068beb4 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/overlay-bt.conf
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/overlay-bt.conf
@@ -9,6 +9,7 @@ CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
 
 # Enable the Bluetooth mcumgr transport (unauthenticated).
 CONFIG_MCUMGR_TRANSPORT_BT=y
+CONFIG_MCUMGR_TRANSPORT_BT_AUTHEN=n
 CONFIG_MCUMGR_TRANSPORT_BT_CONN_PARAM_CONTROL=y
 
 # Enable the Shell mcumgr transport.
diff --git a/scripts/utils/migrate_mcumgr_kconfigs.py b/scripts/utils/migrate_mcumgr_kconfigs.py
index 429474f80ce..b2ca14e332e 100644
--- a/scripts/utils/migrate_mcumgr_kconfigs.py
+++ b/scripts/utils/migrate_mcumgr_kconfigs.py
@@ -82,8 +82,7 @@
     "MCUMGR_BUF_SIZE" : "MCUMGR_TRANSPORT_NETBUF_SIZE",
     "MCUMGR_BUF_USER_DATA_SIZE" : "MCUMGR_TRANSPORT_NETBUF_USER_DATA_SIZE",
     "MCUMGR_SMP_BT" : "MCUMGR_TRANSPORT_BT",
-    "MCUMGR_SMP_BT_AUTHEN" : "MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN",
-    "MCUMGR_TRANSPORT_BT_AUTHEN" : "MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN",
+    "MCUMGR_SMP_BT_AUTHEN" : "MCUMGR_TRANSPORT_BT_AUTHEN",
     "MCUMGR_SMP_BT_CONN_PARAM_CONTROL" : "MCUMGR_TRANSPORT_BT_CONN_PARAM_CONTROL",
     "MCUMGR_SMP_BT_CONN_PARAM_CONTROL_MIN_INT" : "MCUMGR_TRANSPORT_BT_CONN_PARAM_CONTROL_MIN_INT",
     "MCUMGR_SMP_BT_CONN_PARAM_CONTROL_MAX_INT" : "MCUMGR_TRANSPORT_BT_CONN_PARAM_CONTROL_MAX_INT",
diff --git a/subsys/mgmt/mcumgr/transport/Kconfig.bluetooth b/subsys/mgmt/mcumgr/transport/Kconfig.bluetooth
index 1e1d5c7f6e4..4a65ddf137e 100644
--- a/subsys/mgmt/mcumgr/transport/Kconfig.bluetooth
+++ b/subsys/mgmt/mcumgr/transport/Kconfig.bluetooth
@@ -24,25 +24,13 @@ config MCUMGR_TRANSPORT_BT_REASSEMBLY
 	  When enabled, the SMP BT transport will buffer and reassemble received
 	  packet fragments before passing it for further processing.
 
-choice MCUMGR_TRANSPORT_BT_PERM
-	prompt "Permission used for the SMP service"
-	default MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN if BT_SMP
-	default MCUMGR_TRANSPORT_BT_PERM_RW
-	help
-	  Permission settings for GATT characteristics of the SMP service.
-
-config MCUMGR_TRANSPORT_BT_PERM_RW
-	bool "Read and write allowed"
-
-config MCUMGR_TRANSPORT_BT_PERM_RW_ENCRYPT
-	bool "Require encryption for access"
-	depends on BT_SMP
-
-config MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN
-	bool "Require encryption and authentication for access"
+config MCUMGR_TRANSPORT_BT_AUTHEN
+	bool "Authenticated requirement for Bluetooth mcumgr SMP transport"
 	depends on BT_SMP
-
-endchoice
+	default y
+	help
+	  Enables encrypted and authenticated connection requirement to
+	  Bluetooth SMP transport.
 
 config MCUMGR_TRANSPORT_BT_CONN_PARAM_CONTROL
 	bool "Request specific connection parameters for SMP packet exchange"
diff --git a/subsys/mgmt/mcumgr/transport/src/smp_bt.c b/subsys/mgmt/mcumgr/transport/src/smp_bt.c
index a72c8468647..f3e72da3c6c 100644
--- a/subsys/mgmt/mcumgr/transport/src/smp_bt.c
+++ b/subsys/mgmt/mcumgr/transport/src/smp_bt.c
@@ -49,27 +49,6 @@ LOG_MODULE_DECLARE(mcumgr_smp, CONFIG_MCUMGR_TRANSPORT_LOG_LEVEL);
 					CONFIG_BT_PERIPHERAL_PREF_TIMEOUT),		\
 				    (NULL))
 
-/* Permission levels for GATT characteristics of the SMP service. */
-#ifndef CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN
-#define CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN 0
-#endif
-#ifndef CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_ENCRYPT
-#define CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_ENCRYPT 0
-#endif
-#ifndef CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW
-#define CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW 0
-#endif
-
-#define SMP_GATT_PERM (							\
-	CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN ?			\
-	(BT_GATT_PERM_READ_AUTHEN | BT_GATT_PERM_WRITE_AUTHEN) :	\
-	CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_ENCRYPT ?			\
-	(BT_GATT_PERM_READ_ENCRYPT | BT_GATT_PERM_WRITE_ENCRYPT) :	\
-	(BT_GATT_PERM_READ | BT_GATT_PERM_WRITE))			\
-
-#define SMP_GATT_PERM_WRITE_MASK \
-	(BT_GATT_PERM_WRITE | BT_GATT_PERM_WRITE_ENCRYPT | BT_GATT_PERM_WRITE_AUTHEN)
-
 /* Minimum number of bytes that must be able to be sent with a notification to a target device
  * before giving up
  */
@@ -379,10 +358,14 @@ static void smp_bt_ccc_changed(const struct bt_gatt_attr *attr, uint16_t value)
 	BT_GATT_CHARACTERISTIC(&smp_bt_chr_uuid.uuid,					\
 			       BT_GATT_CHRC_WRITE_WITHOUT_RESP |			\
 			       BT_GATT_CHRC_NOTIFY,					\
-			       SMP_GATT_PERM & SMP_GATT_PERM_WRITE_MASK,		\
+			       COND_CODE_1(CONFIG_MCUMGR_TRANSPORT_BT_AUTHEN,		\
+					   (BT_GATT_PERM_WRITE_AUTHEN),			\
+					   (BT_GATT_PERM_WRITE)),			\
 			       NULL, smp_bt_chr_write, NULL),				\
 	BT_GATT_CCC(smp_bt_ccc_changed,							\
-		    SMP_GATT_PERM),
+		    COND_CODE_1(CONFIG_MCUMGR_TRANSPORT_BT_AUTHEN,			\
+				(BT_GATT_PERM_READ_AUTHEN | BT_GATT_PERM_WRITE_AUTHEN),	\
+				(BT_GATT_PERM_READ | BT_GATT_PERM_WRITE))),
 
 
 #ifdef CONFIG_MCUMGR_TRANSPORT_BT_DYNAMIC_SVC_REGISTRATION
diff --git a/tests/subsys/mgmt/mcumgr/all_options/prj.conf b/tests/subsys/mgmt/mcumgr/all_options/prj.conf
index 3087ce16c39..ba15113a923 100644
--- a/tests/subsys/mgmt/mcumgr/all_options/prj.conf
+++ b/tests/subsys/mgmt/mcumgr/all_options/prj.conf
@@ -17,9 +17,10 @@ CONFIG_STREAM_FLASH=y
 CONFIG_IMG_MANAGER=y
 CONFIG_MCUMGR=y
 CONFIG_MCUMGR_TRANSPORT_BT=y
+CONFIG_MCUMGR_TRANSPORT_BT_AUTHEN=n
 CONFIG_MCUMGR_TRANSPORT_BT_CONN_PARAM_CONTROL=y
 CONFIG_MCUMGR_TRANSPORT_BT_REASSEMBLY=y
-CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN=y
+CONFIG_MCUMGR_TRANSPORT_BT_AUTHEN=y
 CONFIG_MCUMGR_TRANSPORT_DUMMY=y
 CONFIG_MCUMGR_TRANSPORT_DUMMY_RX_BUF_SIZE=512
 CONFIG_MCUMGR_TRANSPORT_SHELL=y

From aea83a6ba734d0841f1b6a01904c07cbb38c8620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:08 +0100
Subject: [PATCH 2011/2913] Revert "[nrf fromtree] bluetooth: smp: remove
 experimental from BT_GATT_AUTHORIZATION_CUSTOM"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit dc5460d3f311a298cb0e7a4bf6a4bce68b007bf7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/host/Kconfig.gatt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/subsys/bluetooth/host/Kconfig.gatt b/subsys/bluetooth/host/Kconfig.gatt
index 77bf0191740..050dab1215c 100644
--- a/subsys/bluetooth/host/Kconfig.gatt
+++ b/subsys/bluetooth/host/Kconfig.gatt
@@ -285,7 +285,8 @@ config DEVICE_NAME_GATT_WRITABLE_AUTHEN
 endif #BT_DEVICE_NAME_GATT_WRITABLE
 
 config BT_GATT_AUTHORIZATION_CUSTOM
-	bool "Custom authorization of GATT operations"
+	bool "Custom authorization of GATT operations [EXPERIMENTAL]"
+	select EXPERIMENTAL
 	help
 	  This option allows the user to define application-specific
 	  authorization logic for GATT operations that can be registered

From f12deea6ec5d34424f01a568a31da5266ac69022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:08 +0100
Subject: [PATCH 2012/2913] Revert "[nrf fromtree] bluetooth: smp: remove
 experimental from BT_BONDABLE_PER_CONNECTION"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d1d141eeef93a94655138c024c46f79db1b2ec47.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/bluetooth/host/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index 233c916408f..b8d7f629a9c 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -645,7 +645,8 @@ config BT_BONDING_REQUIRED
 	  requests will be rejected.
 
 config BT_BONDABLE_PER_CONNECTION
-	bool "Set/clear the bonding flag per-connection"
+	bool "Set/clear the bonding flag per-connection [EXPERIMENTAL]"
+	select EXPERIMENTAL
 	help
 	  Enable support for the bt_conn_set_bondable API function that is
 	  used to set/clear the bonding flag on a per-connection basis.

From 8264bef67cae8908e869be765ed3f6eb076dc131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:08 +0100
Subject: [PATCH 2013/2913] Revert "[nrf fromtree] mgmt: mcumgr: grp: os_mgmt:
 Fix invalid return"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a25c395a385f92e450d16498ee8da8e7a3070a8b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c b/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
index 648f3842705..eb232093aa9 100644
--- a/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
@@ -505,7 +505,7 @@ os_mgmt_bootloader_info(struct smp_streamer *ctxt)
 	} else
 #endif
 	{
-		ok = smp_add_cmd_err(zse, MGMT_GROUP_ID_OS, OS_MGMT_ERR_QUERY_YIELDS_NO_ANSWER);
+		return OS_MGMT_ERR_QUERY_YIELDS_NO_ANSWER;
 	}
 
 	return ok ? MGMT_ERR_EOK : MGMT_ERR_EMSGSIZE;

From 2efc9e6a2078fc66ada8cd6d3b8dac19a68c45cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:08 +0100
Subject: [PATCH 2014/2913] Revert "[nrf fromtree] mgmt: mcumgr: grp: os_mgmt:
 Allow bootloader info without MCUboot"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit adb4588807a6dc83a03bb82e0b24e8c31abb277c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/mgmt/mcumgr/grp/os_mgmt/Kconfig       | 4 ++++
 subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c | 7 +------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/subsys/mgmt/mcumgr/grp/os_mgmt/Kconfig b/subsys/mgmt/mcumgr/grp/os_mgmt/Kconfig
index 8839d3664a3..bb2ae92053c 100644
--- a/subsys/mgmt/mcumgr/grp/os_mgmt/Kconfig
+++ b/subsys/mgmt/mcumgr/grp/os_mgmt/Kconfig
@@ -194,6 +194,8 @@ config MCUMGR_GRP_OS_INFO_BUILD_DATE_TIME
 
 endif
 
+if BOOTLOADER_MCUBOOT
+
 config MCUMGR_GRP_OS_BOOTLOADER_INFO
 	bool "Bootloader information"
 	help
@@ -207,6 +209,8 @@ config MCUMGR_GRP_OS_BOOTLOADER_INFO_HOOK
 	  Supports adding custom responses to the bootloader info command by using registered
 	  callbacks. Data can be appended to the struct provided in the callback.
 
+endif # BOOTLOADER_MCUBOOT
+
 module = MCUMGR_GRP_OS
 module-str = mcumgr_grp_os
 source "subsys/logging/Kconfig.template.log_config"
diff --git a/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c b/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
index eb232093aa9..15342fcb936 100644
--- a/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
@@ -423,7 +423,6 @@ os_mgmt_mcumgr_params(struct smp_streamer *ctxt)
 
 #if defined(CONFIG_MCUMGR_GRP_OS_BOOTLOADER_INFO)
 
-#if defined(CONFIG_BOOTLOADER_MCUBOOT)
 #if defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_SINGLE_APP)
 #define BOOTLOADER_MODE MCUBOOT_MODE_SINGLE_SLOT
 #elif defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_SWAP_SCRATCH)
@@ -441,7 +440,6 @@ os_mgmt_mcumgr_params(struct smp_streamer *ctxt)
 #else
 #define BOOTLOADER_MODE -1
 #endif
-#endif
 
 static int
 os_mgmt_bootloader_info(struct smp_streamer *ctxt)
@@ -487,7 +485,6 @@ os_mgmt_bootloader_info(struct smp_streamer *ctxt)
 #endif
 
 	/* If no parameter is recognized then just introduce the bootloader. */
-#if defined(CONFIG_BOOTLOADER_MCUBOOT)
 	if (decoded == 0) {
 		ok = zcbor_tstr_put_lit(zse, "bootloader") &&
 		     zcbor_tstr_put_lit(zse, "MCUboot");
@@ -502,9 +499,7 @@ os_mgmt_bootloader_info(struct smp_streamer *ctxt)
 		ok = ok && zcbor_tstr_put_lit(zse, "no-downgrade") &&
 		     zcbor_bool_encode(zse, &(bool){true});
 #endif
-	} else
-#endif
-	{
+	} else {
 		return OS_MGMT_ERR_QUERY_YIELDS_NO_ANSWER;
 	}
 

From 21c57857821c5159d7ddfda3be264fef95ba03b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:08 +0100
Subject: [PATCH 2015/2913] Revert "[nrf fromlist] bluetooth: tester: audio:
 Add check for bis stopping"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1a600984aa834648ed06b00134beae8ac03d775f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../tester/src/audio/btp_bap_broadcast.c       | 18 +-----------------
 .../tester/src/audio/btp_bap_broadcast.h       |  1 -
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
index 00c74efb67c..df3b2f3ba73 100644
--- a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
+++ b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
@@ -23,8 +23,6 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 #include "btp_bap_audio_stream.h"
 #include "btp_bap_broadcast.h"
 
-static K_SEM_DEFINE(sem_stream_stopped, 0U, CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT);
-
 static struct btp_bap_broadcast_remote_source remote_broadcast_sources[1];
 static struct btp_bap_broadcast_local_source local_source;
 /* Only one PA sync supported for now. */
@@ -134,9 +132,8 @@ static void stream_stopped(struct bt_bap_stream *stream, uint8_t reason)
 	LOG_DBG("Stopped stream %p with reason 0x%02X", stream, reason);
 
 	btp_bap_audio_stream_stopped(&b_stream->audio_stream);
-	b_stream->bis_synced = false;
 
-	k_sem_give(&sem_stream_stopped);
+	b_stream->bis_synced = false;
 }
 
 static void send_bis_stream_received_ev(const bt_addr_le_t *address, uint32_t broadcast_id,
@@ -330,8 +327,6 @@ uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 	source->qos.pd = sys_get_le24(cp->presentation_delay);
 	source->qos.sdu = sys_le16_to_cpu(cp->max_sdu);
 
-	source->stream_count = cp->subgroups * cp->streams_per_subgroup;
-
 	err = setup_broadcast_source(cp->streams_per_subgroup, cp->subgroups, source, &codec_cfg);
 	if (err != 0) {
 		LOG_DBG("Unable to setup broadcast source: %d", err);
@@ -489,8 +484,6 @@ uint8_t btp_bap_broadcast_source_stop(const void *cmd, uint16_t cmd_len,
 
 	LOG_DBG("");
 
-	k_sem_reset(&sem_stream_stopped);
-
 	err = bt_bap_broadcast_source_stop(source->bap_broadcast);
 	if (err != 0) {
 		LOG_DBG("Unable to stop broadcast source: %d", err);
@@ -498,15 +491,6 @@ uint8_t btp_bap_broadcast_source_stop(const void *cmd, uint16_t cmd_len,
 		return BTP_STATUS_FAILED;
 	}
 
-	for (int i = 0; i < source->stream_count; i++) {
-		err = k_sem_take(&sem_stream_stopped, K_MSEC(1000));
-		if (err != 0) {
-			LOG_DBG("Timed out waiting for stream nr %d to stop", i);
-
-			return BTP_STATUS_FAILED;
-		}
-	}
-
 	return BTP_STATUS_SUCCESS;
 }
 
diff --git a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
index 64f738c3d37..cbecb446b3a 100644
--- a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
+++ b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
@@ -45,7 +45,6 @@ struct btp_bap_broadcast_local_source {
 	struct bt_audio_codec_qos qos;
 	struct btp_bap_broadcast_stream streams[CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT];
 	struct bt_audio_codec_cfg subgroup_codec_cfg[CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT];
-	uint8_t stream_count;
 	/* Only for BTP BAP commands */
 	struct bt_bap_broadcast_source *bap_broadcast;
 	/* Only for BTP CAP commands */

From 99ca06163b6faf6c815e14a51f41e7048ad180dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:08 +0100
Subject: [PATCH 2016/2913] Revert "[nrf fromlist] modules: hal_nordic: Allow
 app mem from net core in serialized 802.15.4"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4ea0c0303632648bd3d9ab3cd182abc11544c2c3.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../platform/nrf_802154_spinel_backend_ipc.c        | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/modules/hal_nordic/nrf_802154/serialization/platform/nrf_802154_spinel_backend_ipc.c b/modules/hal_nordic/nrf_802154/serialization/platform/nrf_802154_spinel_backend_ipc.c
index 9071b57c516..6df811f6bad 100644
--- a/modules/hal_nordic/nrf_802154/serialization/platform/nrf_802154_spinel_backend_ipc.c
+++ b/modules/hal_nordic/nrf_802154/serialization/platform/nrf_802154_spinel_backend_ipc.c
@@ -9,11 +9,6 @@
 #include <zephyr/device.h>
 #include <zephyr/logging/log.h>
 
-#if defined(CONFIG_SOC_NRF5340_CPUAPP)
-#include <nrf53_cpunet_mgmt.h>
-#include <hal/nrf_spu.h>
-#endif
-
 #include "nrf_802154.h"
 #include "nrf_802154_spinel_backend_callouts.h"
 #include "nrf_802154_serialization_error.h"
@@ -60,14 +55,6 @@ nrf_802154_ser_err_t nrf_802154_backend_init(void)
 	int err;
 
 #if defined(CONFIG_SOC_NRF5340_CPUAPP)
-
-#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
-	/* Retain nRF5340 Network MCU in Secure domain (bus
-	 * accesses by Network MCU will have Secure attribute set).
-	 */
-	nrf_spu_extdomain_set((NRF_SPU_Type *)DT_REG_ADDR(DT_NODELABEL(spu)), 0, true, false);
-#endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) */
-
 	nrf53_cpunet_enable(true);
 #endif
 

From e7e3851b5c7358c5f511989f096c6d50e025f297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:08 +0100
Subject: [PATCH 2017/2913] Revert "[nrf fromlist] manifest: update open-amp to
 include change to strlcpy"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 03363a943ff9c3734bda4cfe13d80cf655b9b5e9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 07aedbea3a2..c1049d2350c 100644
--- a/west.yml
+++ b/west.yml
@@ -303,7 +303,7 @@ manifest:
       revision: d2a119a9c7600ce06033a794de042e0ad9a38702
       path: modules/bsim_hw_models/nrf_hw_models
     - name: open-amp
-      revision: b735edbc739ad59156eb55bb8ce2583d74537719
+      revision: 76d2168bcdfcd23a9a7dce8c21f2083b90a1e60a
       path: modules/lib/open-amp
     - name: openthread
       revision: 2aeb8b833ba760ec29d5f340dd1ce7bcb61c5d56

From f9ccaf0fad23b5b6c916a918cbd28fc695d4e088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:08 +0100
Subject: [PATCH 2018/2913] Revert "[nrf fromlist] tests: net: ipv6: Enable
 mbed TLS heap"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cd1c6897951b0fa06daf439f85da7c167087cc16.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/ipv6/prj.conf | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/net/ipv6/prj.conf b/tests/net/ipv6/prj.conf
index 51cfa883727..b2b2f088673 100644
--- a/tests/net/ipv6/prj.conf
+++ b/tests/net/ipv6/prj.conf
@@ -36,6 +36,3 @@ CONFIG_NET_IPV6_PE_PREFER_PUBLIC_ADDRESSES=n
 
 # Increase the stack a bit for mps2/an385
 CONFIG_NET_RX_STACK_SIZE=1700
-
-# Make sure mbedTLS has access to heap
-CONFIG_MBEDTLS_ENABLE_HEAP=y

From c84cd4c8d76d0b1b06a19784b75f30100360431f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:08 +0100
Subject: [PATCH 2019/2913] Revert "[nrf fromtree] tests/samples: net: Fix the
 max number of file descriptors"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 643506ac45f276b4a2b9709399c34d946bb9013f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/net/sockets/echo_service/prj.conf | 1 -
 tests/net/all/prj.conf                    | 1 -
 tests/net/lib/dns_addremove/prj.conf      | 1 -
 tests/net/lib/dns_resolve/prj.conf        | 2 +-
 tests/net/lib/mdns_responder/prj.conf     | 1 -
 tests/net/pm/prj.conf                     | 2 +-
 tests/net/socket/service/prj.conf         | 2 +-
 7 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/samples/net/sockets/echo_service/prj.conf b/samples/net/sockets/echo_service/prj.conf
index 3b12a238378..b9c053c27a2 100644
--- a/samples/net/sockets/echo_service/prj.conf
+++ b/samples/net/sockets/echo_service/prj.conf
@@ -14,7 +14,6 @@ CONFIG_ZVFS_OPEN_MAX=10
 CONFIG_NET_MAX_CONN=5
 CONFIG_NET_SOCKETS_SERVICE=y
 CONFIG_NET_SOCKETS_POLL_MAX=20
-CONFIG_ZVFS_OPEN_MAX=20
 
 # Network driver config
 CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/tests/net/all/prj.conf b/tests/net/all/prj.conf
index f4f42f78187..7944be6a884 100644
--- a/tests/net/all/prj.conf
+++ b/tests/net/all/prj.conf
@@ -354,7 +354,6 @@ CONFIG_NET_SOCKETS_LOG_LEVEL_DBG=y
 CONFIG_NET_SOCKETS_OFFLOAD=y
 CONFIG_NET_SOCKETS_PACKET=y
 CONFIG_NET_SOCKETS_POLL_MAX=50
-CONFIG_ZVFS_OPEN_MAX=50
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_SOCKOPT_TLS=y
 CONFIG_NET_SOCKETS_TLS_MAX_CIPHERSUITES=10
diff --git a/tests/net/lib/dns_addremove/prj.conf b/tests/net/lib/dns_addremove/prj.conf
index 81c65b34f32..c28f0a14eac 100644
--- a/tests/net/lib/dns_addremove/prj.conf
+++ b/tests/net/lib/dns_addremove/prj.conf
@@ -18,4 +18,3 @@ CONFIG_PRINTK=y
 CONFIG_ZTEST=y
 CONFIG_MAIN_STACK_SIZE=2048
 CONFIG_NET_SOCKETS_POLL_MAX=5
-CONFIG_ZVFS_OPEN_MAX=5
diff --git a/tests/net/lib/dns_resolve/prj.conf b/tests/net/lib/dns_resolve/prj.conf
index e90e185040a..39ab38272e6 100644
--- a/tests/net/lib/dns_resolve/prj.conf
+++ b/tests/net/lib/dns_resolve/prj.conf
@@ -30,4 +30,4 @@ CONFIG_ZTEST=y
 
 CONFIG_MAIN_STACK_SIZE=1344
 CONFIG_NET_SOCKETS_POLL_MAX=9
-CONFIG_ZVFS_OPEN_MAX=9
+CONFIG_ZVFS_OPEN_MAX=8
diff --git a/tests/net/lib/mdns_responder/prj.conf b/tests/net/lib/mdns_responder/prj.conf
index 9ea50969898..6d4db394c8d 100644
--- a/tests/net/lib/mdns_responder/prj.conf
+++ b/tests/net/lib/mdns_responder/prj.conf
@@ -6,7 +6,6 @@ CONFIG_NET_LOOPBACK=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_SOCKETS_POLL_MAX=7
-CONFIG_ZVFS_OPEN_MAX=7
 
 # Network driver config
 CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/tests/net/pm/prj.conf b/tests/net/pm/prj.conf
index 9c838139d9b..5d478e4d070 100644
--- a/tests/net/pm/prj.conf
+++ b/tests/net/pm/prj.conf
@@ -7,7 +7,7 @@ CONFIG_NET_L2_ETHERNET=n
 CONFIG_NET_UDP=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_SOCKETS=y
-CONFIG_ZVFS_OPEN_MAX=3
+CONFIG_ZVFS_OPEN_MAX=2
 CONFIG_ZTEST_STACK_SIZE=2048
 CONFIG_MAIN_STACK_SIZE=2048
 CONFIG_NET_LOG=y
diff --git a/tests/net/socket/service/prj.conf b/tests/net/socket/service/prj.conf
index d0664554f7f..5f5c2325a33 100644
--- a/tests/net/socket/service/prj.conf
+++ b/tests/net/socket/service/prj.conf
@@ -5,7 +5,7 @@ CONFIG_NET_IPV6=y
 CONFIG_NET_UDP=y
 CONFIG_NET_TCP=y
 CONFIG_NET_SOCKETS=y
-CONFIG_ZVFS_OPEN_MAX=20
+CONFIG_ZVFS_OPEN_MAX=10
 CONFIG_NET_PKT_TX_COUNT=8
 CONFIG_NET_PKT_RX_COUNT=8
 CONFIG_NET_MAX_CONN=5

From e63cb24a6be1004d6c18d7086fbd190e53b47ffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:08 +0100
Subject: [PATCH 2020/2913] Revert "[nrf fromtree] net: dns: Check that
 dispatcher table is not overflowing"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f1dc0e44fbe4fa8215652254211e640f508da14e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/dns/dispatcher.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/subsys/net/lib/dns/dispatcher.c b/subsys/net/lib/dns/dispatcher.c
index 08672b78e7a..dc5602cae40 100644
--- a/subsys/net/lib/dns/dispatcher.c
+++ b/subsys/net/lib/dns/dispatcher.c
@@ -235,11 +235,6 @@ int dns_dispatcher_register(struct dns_socket_dispatcher *ctx)
 		entry->pair = ctx;
 
 		for (int i = 0; i < ctx->fds_len; i++) {
-			CHECKIF((int)ctx->fds[i].fd >= (int)ARRAY_SIZE(dispatch_table)) {
-				ret = -ERANGE;
-				goto out;
-			}
-
 			if (dispatch_table[ctx->fds[i].fd].ctx == NULL) {
 				dispatch_table[ctx->fds[i].fd].ctx = ctx;
 			}
@@ -272,11 +267,6 @@ int dns_dispatcher_register(struct dns_socket_dispatcher *ctx)
 	ctx->pair = NULL;
 
 	for (int i = 0; i < ctx->fds_len; i++) {
-		if ((int)ctx->fds[i].fd >= (int)ARRAY_SIZE(dispatch_table)) {
-			ret = -ERANGE;
-			goto out;
-		}
-
 		if (dispatch_table[ctx->fds[i].fd].ctx == NULL) {
 			dispatch_table[ctx->fds[i].fd].ctx = ctx;
 		}
@@ -298,25 +288,17 @@ int dns_dispatcher_register(struct dns_socket_dispatcher *ctx)
 
 int dns_dispatcher_unregister(struct dns_socket_dispatcher *ctx)
 {
-	int ret = 0;
-
 	k_mutex_lock(&lock, K_FOREVER);
 
 	(void)sys_slist_find_and_remove(&sockets, &ctx->node);
 
 	for (int i = 0; i < ctx->fds_len; i++) {
-		CHECKIF((int)ctx->fds[i].fd >= (int)ARRAY_SIZE(dispatch_table)) {
-			ret = -ERANGE;
-			goto out;
-		}
-
 		dispatch_table[ctx->fds[i].fd].ctx = NULL;
 	}
 
-out:
 	k_mutex_unlock(&lock);
 
-	return ret;
+	return 0;
 }
 
 void dns_dispatcher_init(void)

From b13fb067671def3a086b4e5a37baea716b5090e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:08 +0100
Subject: [PATCH 2021/2913] Revert "[nrf fromtree] net: dns: Increase the size
 of dispatcher table"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e814b7e495ec9e654c6f67413d637f696d357745.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/dns/dispatcher.c | 2 +-
 subsys/net/lib/sockets/Kconfig  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/subsys/net/lib/dns/dispatcher.c b/subsys/net/lib/dns/dispatcher.c
index dc5602cae40..68244b830ba 100644
--- a/subsys/net/lib/dns/dispatcher.c
+++ b/subsys/net/lib/dns/dispatcher.c
@@ -29,7 +29,7 @@ NET_BUF_POOL_DEFINE(dns_msg_pool, DNS_RESOLVER_BUF_CTR,
 
 static struct socket_dispatch_table {
 	struct dns_socket_dispatcher *ctx;
-} dispatch_table[CONFIG_ZVFS_OPEN_MAX];
+} dispatch_table[CONFIG_NET_SOCKETS_POLL_MAX];
 
 static int dns_dispatch(struct dns_socket_dispatcher *dispatcher,
 			int sock, struct sockaddr *addr, size_t addrlen,
diff --git a/subsys/net/lib/sockets/Kconfig b/subsys/net/lib/sockets/Kconfig
index 1fec4578270..87fd6efd4c0 100644
--- a/subsys/net/lib/sockets/Kconfig
+++ b/subsys/net/lib/sockets/Kconfig
@@ -50,7 +50,6 @@ config NET_SOCKETS_POLL_MAX
 	default 6 if WIFI_NM_WPA_SUPPLICANT
 	default 4 if SHELL_BACKEND_TELNET
 	default 3
-	range 1 ZVFS_OPEN_MAX
 	help
 	  Maximum number of entries supported for poll() call.
 

From 35e3ae4a40a1b1a1369a3dfbdbeba2733a60ffb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:08 +0100
Subject: [PATCH 2022/2913] Revert "[nrf fromlist] tests: lwm2m: Remove
 qemu-cortex-m3"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e42d302b030e0b3955ffdc6593f2bdbdf76259f2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../lwm2m/interop/boards/qemu_cortex_m3.conf   | 18 ++++++++++++++++++
 tests/net/lib/lwm2m/interop/testcase.yaml      |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 tests/net/lib/lwm2m/interop/boards/qemu_cortex_m3.conf

diff --git a/tests/net/lib/lwm2m/interop/boards/qemu_cortex_m3.conf b/tests/net/lib/lwm2m/interop/boards/qemu_cortex_m3.conf
new file mode 100644
index 00000000000..44263f885a4
--- /dev/null
+++ b/tests/net/lib/lwm2m/interop/boards/qemu_cortex_m3.conf
@@ -0,0 +1,18 @@
+CONFIG_NET_L2_ETHERNET=y
+CONFIG_ETH_DRIVER=y
+CONFIG_ETH_STELLARIS=y
+CONFIG_NET_QEMU_ETHERNET=y
+
+# RAM/ROM tuning
+CONFIG_IDLE_STACK_SIZE=128
+CONFIG_ISR_STACK_SIZE=512
+CONFIG_LWM2M_LOG_LEVEL_INF=y
+CONFIG_LOG_BUFFER_SIZE=512
+
+# qemu_cortex_m3 have smaller memory so simulate a small
+# device and small network where max CoAP packet is 256+headers.
+# This excercises the outgoing block-wise module intentionally.
+CONFIG_LWM2M_COAP_MAX_MSG_SIZE=256
+CONFIG_LWM2M_COAP_BLOCK_SIZE=256
+CONFIG_LWM2M_COAP_BLOCK_TRANSFER=y
+CONFIG_LWM2M_COAP_ENCODE_BUFFER_SIZE=2048
diff --git a/tests/net/lib/lwm2m/interop/testcase.yaml b/tests/net/lib/lwm2m/interop/testcase.yaml
index 19ad11d9fb7..46a7eee055b 100644
--- a/tests/net/lib/lwm2m/interop/testcase.yaml
+++ b/tests/net/lib/lwm2m/interop/testcase.yaml
@@ -9,6 +9,7 @@ tests:
       - native_sim
     platform_allow:
       - native_sim
+      - qemu_cortex_m3
       - qemu_x86
     tags:
       - testing

From a3161593f30c37b498c23ce1bb549f2c26d47cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:08 +0100
Subject: [PATCH 2023/2913] Revert "[nrf fromlist] tests: lwm2m: Fix minor
 timing issues on tests"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f535df7925332953c2116286f98ad8fe14411b98.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/lib/lwm2m/interop/pytest/test_blockwise.py | 5 -----
 tests/net/lib/lwm2m/interop/pytest/test_nosec.py     | 3 +++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/net/lib/lwm2m/interop/pytest/test_blockwise.py b/tests/net/lib/lwm2m/interop/pytest/test_blockwise.py
index f72ab7e05cf..27bece69f1e 100644
--- a/tests/net/lib/lwm2m/interop/pytest/test_blockwise.py
+++ b/tests/net/lib/lwm2m/interop/pytest/test_blockwise.py
@@ -79,8 +79,6 @@ def test_blockwise_3(shell: Shell, dut: DeviceAdapter, leshan: Leshan, endpoint:
     """Blockwise test 3: Block-Wise Get using TLV and SenML-CBOR content formats"""
 
     shell.exec_command('lwm2m create /19/0')
-    # Wait for update to finish so server is aware of the /19/0 object
-    dut.readlines_until(regex='.*net_lwm2m_rd_client: Update Done', timeout=5.0)
 
     # Generate 4 kB of binary app-data
     # and write it into BinaryAppData object
@@ -111,9 +109,6 @@ def test_blockwise_4(shell: Shell, dut: DeviceAdapter, leshan: Leshan, endpoint:
     """Blockwise test 4: Block-Wise SEND using SenML-CBOR content format"""
 
     shell.exec_command('lwm2m create /19/0')
-    # Wait for update to finish so server is aware of the /19/0 object
-    dut.readlines_until(regex='.*net_lwm2m_rd_client: Update Done', timeout=5.0)
-
     # Generate 4 kB of binary app-data
     data = ''.join(random.choice(string.ascii_letters) for i in range(4096)).encode()
     fmt = leshan.format
diff --git a/tests/net/lib/lwm2m/interop/pytest/test_nosec.py b/tests/net/lib/lwm2m/interop/pytest/test_nosec.py
index 6411efa0755..15ac98f2d1a 100644
--- a/tests/net/lib/lwm2m/interop/pytest/test_nosec.py
+++ b/tests/net/lib/lwm2m/interop/pytest/test_nosec.py
@@ -26,8 +26,11 @@
 def test_LightweightM2M_1_1_int_101(shell: Shell, dut: DeviceAdapter, leshan: Leshan, endpoint_nosec: str):
     """
     Verify that the client is registered.
+    Note that this MUST be the first testcase executed, otherwise it will fail to get the
+    correct log output.
     """
     logger.info("LightweightM2M-1.1-int-101 - Initial Registration")
+    dut.readlines_until(regex='.*Registration Done', timeout=5.0)
     assert leshan.get(f'/clients/{endpoint_nosec}')
 
 def test_LightweightM2M_1_1_int_105(shell: Shell, dut: DeviceAdapter, leshan: Leshan, endpoint_nosec: str, helperclient: object):

From 901eca40e0c892db2dec5e57886a92bebbd2ea0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:08 +0100
Subject: [PATCH 2024/2913] Revert "[nrf fromtree] usb: device_next: usbd_hid:
 Fix size in HID report get"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1f8e37087d3682799b677836534da728db88b9fe.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/usb/device_next/class/usbd_hid.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/subsys/usb/device_next/class/usbd_hid.c b/subsys/usb/device_next/class/usbd_hid.c
index 1de7abb5bd2..fe67f7e7850 100644
--- a/subsys/usb/device_next/class/usbd_hid.c
+++ b/subsys/usb/device_next/class/usbd_hid.c
@@ -235,7 +235,7 @@ static int handle_get_report(const struct device *dev,
 	const uint8_t id = HID_GET_REPORT_ID(setup->wValue);
 	struct hid_device_data *const ddata = dev->data;
 	const struct hid_device_ops *ops = ddata->ops;
-	const size_t size = setup->wLength;
+	const size_t size = net_buf_tailroom(buf);
 	int ret = 0;
 
 	switch (type) {
@@ -257,9 +257,8 @@ static int handle_get_report(const struct device *dev,
 	}
 
 	if (ret > 0) {
-		__ASSERT(ret <= net_buf_tailroom(buf),
-			 "Buffer overflow in the HID driver");
-		net_buf_add(buf, MIN(net_buf_tailroom(buf), ret));
+		__ASSERT(ret <= size, "Buffer overflow in the HID driver");
+		net_buf_add(buf, MIN(size, ret));
 	} else {
 		errno = ret ? ret : -ENOTSUP;
 	}

From 113137b15a247fc6e14e028cc8888adef30149c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:08 +0100
Subject: [PATCH 2025/2913] Revert "[nrf fromlist] modules: hostap: Use
 net_mgmt context"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5b87a8a2df5f7bcdb954ef4820f470cf04f8dd3f.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_main.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index ca64c321e3b..ce0a32282af 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -473,6 +473,9 @@ static void submit_iface_work(struct supplicant_context *ctx,
 static void interface_handler(struct net_mgmt_event_callback *cb,
 			      uint32_t mgmt_event, struct net_if *iface)
 {
+	struct supplicant_context *ctx = CONTAINER_OF(cb, struct supplicant_context,
+						      cb);
+
 	if ((mgmt_event & INTERFACE_EVENT_MASK) != mgmt_event) {
 		return;
 	}
@@ -485,13 +488,13 @@ static void interface_handler(struct net_mgmt_event_callback *cb,
 
 	if (mgmt_event == NET_EVENT_IF_ADMIN_UP) {
 		LOG_INF("Network interface %d (%p) up", net_if_get_by_iface(iface), iface);
-		add_interface(get_default_context(), iface);
+		submit_iface_work(ctx, iface, add_interface);
 		return;
 	}
 
 	if (mgmt_event == NET_EVENT_IF_ADMIN_DOWN) {
 		LOG_INF("Network interface %d (%p) down", net_if_get_by_iface(iface), iface);
-		del_interface(get_default_context(), iface);
+		submit_iface_work(ctx, iface, del_interface);
 		return;
 	}
 }

From da55ceee734fa8b1c44c84e8110eb84d05e50b28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:08 +0100
Subject: [PATCH 2026/2913] Revert "[nrf fromlist] modules: hostap: Fix typo in
 NM unregistration"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fde19b1d7f53d7d1dc797b1fcce26779f45fb926.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index ce0a32282af..4880f028348 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -421,7 +421,7 @@ static int del_interface(struct supplicant_context *ctx, struct net_if *iface)
 		goto out;
 	}
 
-	ret = wifi_nm_unregister_mgd_iface(wifi_nm_get_instance("wifi_supplicant"), iface);
+	ret = wifi_nm_unregister_mgd_iface(wifi_nm_get_instance("wpa_supplicant"), iface);
 	if (ret) {
 		LOG_ERR("Failed to unregister mgd iface %s with native stack (%d)",
 			ifname, ret);

From 82508bfbc7888aaf66cbd9f4292bcb4b66b2417a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:09 +0100
Subject: [PATCH 2027/2913] Revert "[nrf fromlist] modules: hostap: Fix double
 free in case of error conditions"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c57352e7a3e3666608d729302f192e6513fdef37.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index 4880f028348..f45579199c3 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -372,7 +372,7 @@ static int del_interface(struct supplicant_context *ctx, struct net_if *iface)
 	if (!wpa_s) {
 		ret = -ENOENT;
 		LOG_ERR("Failed to get wpa_s handle for %s", ifname);
-		goto free;
+		goto out;
 	}
 
 	supplicant_generate_state_event(ifname, NET_EVENT_SUPPLICANT_CMD_IFACE_REMOVING, 0);
@@ -380,7 +380,7 @@ static int del_interface(struct supplicant_context *ctx, struct net_if *iface)
 	if (sizeof(event->interface_status.ifname) < strlen(ifname)) {
 		wpa_printf(MSG_ERROR, "Interface name too long: %s (max: %d)",
 			ifname, sizeof(event->interface_status.ifname));
-		goto free;
+		goto out;
 	}
 
 	os_memcpy(event->interface_status.ifname, ifname, strlen(ifname));
@@ -398,7 +398,7 @@ static int del_interface(struct supplicant_context *ctx, struct net_if *iface)
 		 * with WPA supplicant so we cannot unregister NM etc.
 		 */
 		wpa_printf(MSG_ERROR, "Failed to send event: %d", ret);
-		goto free;
+		goto out;
 	}
 
 	while (retry++ < count && wpa_s->wpa_state != WPA_INTERFACE_DISABLED) {
@@ -436,11 +436,11 @@ static int del_interface(struct supplicant_context *ctx, struct net_if *iface)
 
 	return 0;
 
-free:
+out:
 	if (event) {
 		os_free(event);
 	}
-out:
+
 	return ret;
 }
 #endif

From 2246e1178c2ede355c8aa8f6c5be44db9cb523fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:09 +0100
Subject: [PATCH 2028/2913] Revert "[nrf fromlist] modules: hostap: Fix double
 free of the event"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d43b88f464ea0a1ae458280dcb3feb5e98f39672.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_main.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index f45579199c3..a4b25b35476 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -434,8 +434,6 @@ static int del_interface(struct supplicant_context *ctx, struct net_if *iface)
 
 	supplicant_generate_state_event(ifname, NET_EVENT_SUPPLICANT_CMD_IFACE_REMOVED, 0);
 
-	return 0;
-
 out:
 	if (event) {
 		os_free(event);

From eaa7819235d9ea3158637cc8565d055b0351d297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:09 +0100
Subject: [PATCH 2029/2913] Revert "[nrf fromlist] net: wifi: Fix DPP disabled
 build"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 29b9b3e2052e7022ce8a5c197612e08d75796535.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hostap/src/supp_api.c | 1 -
 modules/hostap/src/supp_api.h | 1 -
 2 files changed, 2 deletions(-)

diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index 96852e1e6e7..6ba2c650027 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -1915,7 +1915,6 @@ int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *pa
 	os_free(cmd);
 	return 0;
 }
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 int hapd_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params)
diff --git a/modules/hostap/src/supp_api.h b/modules/hostap/src/supp_api.h
index 0bd1461a117..bfc3a2735e6 100644
--- a/modules/hostap/src/supp_api.h
+++ b/modules/hostap/src/supp_api.h
@@ -268,7 +268,6 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
  * @return 0 for OK; -1 for ERROR
  */
 int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params);
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 /**

From 16d517b394aa6c0793af6983d6d211cb7aafca3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:09 +0100
Subject: [PATCH 2030/2913] Revert "[nrf fromlist] boards: nordic: nrf7002dk:
 re-enable external flash by default"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 90d4047d2e80b45b0eeb5134eecf654b3b301cda.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi b/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi
index cff6e54fd5d..ce11dbcb61d 100644
--- a/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi
+++ b/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi
@@ -173,6 +173,7 @@ arduino_i2c: &i2c1 {
 	cs-gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 	mx25r64: mx25r6435f@0 {
 		compatible = "jedec,spi-nor";
+		status = "disabled";
 		reg = <0>;
 		spi-max-frequency = <33000000>;
 		jedec-id = [c2 28 17];

From 190c11a5c8af115cc10c70d766836adc9501ba40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:09 +0100
Subject: [PATCH 2031/2913] Revert "[nrf fromlist] net: lib: coap: Initialize
 response_truncated"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 50d56af5a7ac56e529166517ff2dc94b683f5258.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/coap/coap_client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index c99a612cc88..f1c58b2538d 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -887,7 +887,7 @@ static void coap_client_recv(void *coap_cl, void *a, void *b)
 		for (int i = 0; i < num_clients; i++) {
 			if (clients[i]->response_ready) {
 				struct coap_packet response;
-				bool response_truncated = false;
+				bool response_truncated;
 
 				k_mutex_lock(&clients[i]->lock, K_FOREVER);
 

From 3b78cc117683184ad8d08b334fa977d57271057e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:09 +0100
Subject: [PATCH 2032/2913] Revert "[nrf fromtree] net: lib: http: ensure
 SYS_FOREVER_MS behavior"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5afe89dab0ae627d162952f2f69300b8c2fefc2d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/net/lib/http/http_client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/net/lib/http/http_client.c b/subsys/net/lib/http/http_client.c
index db2ddee4b2b..d71a93e634d 100644
--- a/subsys/net/lib/http/http_client.c
+++ b/subsys/net/lib/http/http_client.c
@@ -562,7 +562,7 @@ int http_client_req(int sock, struct http_request *req,
 	int total_sent = 0;
 	int ret, total_recv, i;
 	const char *method;
-	k_timeout_t req_timeout = (timeout == SYS_FOREVER_MS) ? K_FOREVER : K_MSEC(timeout);
+	k_timeout_t req_timeout = K_MSEC(timeout);
 	k_timepoint_t req_end_timepoint = sys_timepoint_calc(req_timeout);
 
 	if (sock < 0 || req == NULL || req->response == NULL ||

From 2b9c8206735193d03b1b3a4fc9b776864794c2ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:09 +0100
Subject: [PATCH 2033/2913] Revert "[nrf fromlist] boards: nordic: nrf7002dk:
 Remove enabling forwarder Kconfig"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e2c87e8fdf15f2d8caf30718074e8a0bfb1261f0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf7002dk/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/boards/nordic/nrf7002dk/Kconfig b/boards/nordic/nrf7002dk/Kconfig
index 1e2a7d09c93..4bd84612e7a 100644
--- a/boards/nordic/nrf7002dk/Kconfig
+++ b/boards/nordic/nrf7002dk/Kconfig
@@ -23,6 +23,8 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
 
 config BOARD_ENABLE_CPUNET
 	bool "nRF53 Network MCU"
+	select SOC_NRF_GPIO_FORWARDER_FOR_NRF5340 if \
+		$(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_GPIO_FORWARDER))
 	help
 	  This option enables releasing the Network 'force off' signal, which
 	  as a consequence will power up the Network MCU during system boot.

From 1291172f9829bf54f5222e25ee618359137b4908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:09 +0100
Subject: [PATCH 2034/2913] Revert "[nrf fromlist] soc: nordic: nrf53: Make
 GPIO pin forwarding automatic"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4ba4cab5b9fad5c1e0d2b1c94f1d3d2d5ef352d9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf53/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/soc/nordic/nrf53/Kconfig b/soc/nordic/nrf53/Kconfig
index 3a30a666d20..91f422e315e 100644
--- a/soc/nordic/nrf53/Kconfig
+++ b/soc/nordic/nrf53/Kconfig
@@ -180,6 +180,8 @@ config SOC_NRF53_CPUNET_ENABLE
 	depends on !BT
 	default y if NRF_802154_SER_HOST
 	select SOC_NRF53_CPUNET_MGMT
+	select SOC_NRF_GPIO_FORWARDER_FOR_NRF5340 if \
+		$(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_GPIO_FORWARDER))
 	help
 	  This option enables releasing the Network 'force off' signal, which
 	  as a consequence will power up the Network MCU during system boot.

From 87f6f2c4943a5185a8e2ce657193fe3a4ff5382d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:09 +0100
Subject: [PATCH 2035/2913] Revert "[nrf fromlist] boards: nordic: thingy53:
 Add missing FEM entries"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 173223e99299d9ec36a156f9e87cfcd4592eeacf.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../thingy53/thingy53_nrf5340_common.dtsi     | 12 ----------
 .../thingy53_nrf5340_cpunet-pinctrl.dtsi      | 16 --------------
 .../thingy53/thingy53_nrf5340_cpunet.dts      | 22 -------------------
 3 files changed, 50 deletions(-)

diff --git a/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi b/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
index 12b7cf6c13b..13a58443871 100644
--- a/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
+++ b/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
@@ -131,18 +131,6 @@
 		};
 	};
 
-	/* Disabled by default as SPI lines are shared with peripherals on application core */
-	spi_fwd: nrf-spi-forwarder {
-		compatible = "nordic,nrf-gpio-forwarder";
-		status = "disabled";
-		fem-spi-if {
-			gpios = <&gpio0 24 0>,
-				<&gpio0 29 0>,
-				<&gpio0 27 0>,
-				<&gpio0 28 0>;
-		};
-	};
-
 	aliases {
 		sw0 = &button0;
 		sw1 = &button1;
diff --git a/boards/nordic/thingy53/thingy53_nrf5340_cpunet-pinctrl.dtsi b/boards/nordic/thingy53/thingy53_nrf5340_cpunet-pinctrl.dtsi
index 76d1fd8bad5..940d3afedc7 100644
--- a/boards/nordic/thingy53/thingy53_nrf5340_cpunet-pinctrl.dtsi
+++ b/boards/nordic/thingy53/thingy53_nrf5340_cpunet-pinctrl.dtsi
@@ -23,20 +23,4 @@
 		};
 	};
 
-	spi0_default: spi0_default {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 29)>,
-				<NRF_PSEL(SPIM_MISO, 0, 27)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 28)>;
-		};
-	};
-
-	spi0_sleep: spi0_sleep {
-		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 0, 29)>,
-				<NRF_PSEL(SPIM_MISO, 0, 27)>,
-				<NRF_PSEL(SPIM_MOSI, 0, 28)>;
-			low-power-enable;
-		};
-	};
 };
diff --git a/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts b/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts
index aa4d4df909c..89e9f8c64e5 100644
--- a/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts
+++ b/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts
@@ -63,7 +63,6 @@
 		mode-gpios  = <&gpio1 12 GPIO_ACTIVE_HIGH>;
 		pdn-gpios   = <&gpio1 10 GPIO_ACTIVE_HIGH>;
 		tx-en-gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
-		spi-if = <&nrf_radio_fem_spi>;
 		supply-voltage-mv = <3000>;
 	};
 
@@ -112,27 +111,6 @@
 	pinctrl-names = "default", "sleep";
 };
 
-/* Disabled by default as shares same GPIO lines as SPI peripherals on application core */
-fem_spi: &spi0 {
-	status = "disabled";
-	cs-gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
-	pinctrl-0 = <&spi0_default>;
-	pinctrl-1 = <&spi0_sleep>;
-	pinctrl-names = "default", "sleep";
-
-	nrf_radio_fem_spi: nrf21540_fem_spi@0 {
-		compatible = "nordic,nrf21540-fem-spi";
-		status = "disabled";
-		reg = <0>;
-		spi-max-frequency = <8000000>;
-	};
-};
-
-&radio {
-	/* Uncomment to enable SPI interface for FEM */
-	/* fem = <&nrf_radio_fem>; */
-};
-
 &flash1 {
 
 	partitions {

From 348893462921cd64ad71cab63c6aebda006f21c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:09 +0100
Subject: [PATCH 2036/2913] Revert "[nrf fromlist] dfu: Add missing depends on
 for progressive erase"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 841d6ceec25a97a8d08139b862ce18e1ebe7d3eb.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/dfu/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/subsys/dfu/Kconfig b/subsys/dfu/Kconfig
index 5977764016d..ec7d90ba14a 100644
--- a/subsys/dfu/Kconfig
+++ b/subsys/dfu/Kconfig
@@ -69,7 +69,6 @@ config IMG_BLOCK_BUF_SIZE
 config IMG_ERASE_PROGRESSIVELY
 	bool "Erase flash progressively when receiving new firmware"
 	select STREAM_FLASH_ERASE
-	depends on FLASH_HAS_EXPLICIT_ERASE
 	help
 	  If enabled, flash is erased as necessary when receiving new firmware,
 	  instead of erasing the whole image slot at once. This is necessary

From 8af6f9c51ee0057e8669879600823c61ad64e009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:09 +0100
Subject: [PATCH 2037/2913] Revert "[nrf fromtree] drivers: udc_dwc2: Implement
 USBHS hibernation quirks"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fb52d17910343fcfa0b0f8344d2117946b69a57b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2_vendor_quirks.h | 32 ------------------------
 1 file changed, 32 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2_vendor_quirks.h b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
index 84d912f9fdb..57ff4c4de04 100644
--- a/drivers/usb/udc/udc_dwc2_vendor_quirks.h
+++ b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
@@ -249,36 +249,6 @@ static inline int usbhs_is_phy_clk_off(const struct device *dev)
 	return !k_event_test(&usbhs_events, USBHS_VBUS_READY);
 }
 
-static inline int usbhs_post_hibernation_entry(const struct device *dev)
-{
-	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = config->base;
-	NRF_USBHS_Type *wrapper = USBHS_DT_WRAPPER_REG_ADDR(0);
-
-	sys_set_bits((mem_addr_t)&base->pcgcctl, USB_DWC2_PCGCCTL_GATEHCLK);
-
-	sys_write32(0x87, (mem_addr_t)wrapper + 0xC80);
-	sys_write32(0x87, (mem_addr_t)wrapper + 0xC84);
-	sys_write32(1, (mem_addr_t)wrapper + 0x004);
-
-	return 0;
-}
-
-static inline int usbhs_pre_hibernation_exit(const struct device *dev)
-{
-	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = config->base;
-	NRF_USBHS_Type *wrapper = USBHS_DT_WRAPPER_REG_ADDR(0);
-
-	sys_clear_bits((mem_addr_t)&base->pcgcctl, USB_DWC2_PCGCCTL_GATEHCLK);
-
-	wrapper->TASKS_START = 1;
-	sys_write32(0, (mem_addr_t)wrapper + 0xC80);
-	sys_write32(0, (mem_addr_t)wrapper + 0xC84);
-
-	return 0;
-}
-
 #define QUIRK_NRF_USBHS_DEFINE(n)						\
 	struct dwc2_vendor_quirks dwc2_vendor_quirks_##n = {			\
 		.init = usbhs_enable_nrfs_service,				\
@@ -288,8 +258,6 @@ static inline int usbhs_pre_hibernation_exit(const struct device *dev)
 		.irq_clear = usbhs_irq_clear,					\
 		.caps = usbhs_init_caps,					\
 		.is_phy_clk_off = usbhs_is_phy_clk_off,				\
-		.post_hibernation_entry = usbhs_post_hibernation_entry,		\
-		.pre_hibernation_exit = usbhs_pre_hibernation_exit,		\
 	};
 
 DT_INST_FOREACH_STATUS_OKAY(QUIRK_NRF_USBHS_DEFINE)

From 57c48d2b651bbdded30a2d7e6579046a3a5df737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:09 +0100
Subject: [PATCH 2038/2913] Revert "[nrf fromtree] drivers: udc_dwc2: Add
 hibernation vendor quirks"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4a996a830b3d4bc7d8e06595efc1c485b4b1e4c1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 4 ----
 drivers/usb/udc/udc_dwc2.h | 6 ------
 2 files changed, 10 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 0283b4a1b71..2e56a9de180 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -1019,8 +1019,6 @@ static void dwc2_enter_hibernation(const struct device *dev)
 	/* Switch off power to the controller */
 	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNSWTCH);
 
-	(void)dwc2_quirk_post_hibernation_entry(dev);
-
 	/* Mark that the core is hibernated */
 	priv->hibernated = 1;
 	LOG_DBG("Hibernated");
@@ -1034,8 +1032,6 @@ static void dwc2_exit_hibernation(const struct device *dev, bool rwup)
 	mem_addr_t gpwrdn_reg = (mem_addr_t)&base->gpwrdn;
 	mem_addr_t pcgcctl_reg = (mem_addr_t)&base->pcgcctl;
 
-	(void)dwc2_quirk_pre_hibernation_exit(dev);
-
 	/* Switch on power to the controller */
 	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNSWTCH);
 	k_busy_wait(1);
diff --git a/drivers/usb/udc/udc_dwc2.h b/drivers/usb/udc/udc_dwc2.h
index 87e71f81899..07cd71bcb9c 100644
--- a/drivers/usb/udc/udc_dwc2.h
+++ b/drivers/usb/udc/udc_dwc2.h
@@ -30,10 +30,6 @@ struct dwc2_vendor_quirks {
 	int (*caps)(const struct device *dev);
 	/* Called while waiting for bits that require PHY to be clocked */
 	int (*is_phy_clk_off)(const struct device *dev);
-	/* Called after hibernation entry sequence */
-	int (*post_hibernation_entry)(const struct device *dev);
-	/* Called before hibernation exit sequence */
-	int (*pre_hibernation_exit)(const struct device *dev);
 };
 
 /* Driver configuration per instance */
@@ -76,7 +72,5 @@ DWC2_QUIRK_FUNC_DEFINE(shutdown)
 DWC2_QUIRK_FUNC_DEFINE(irq_clear)
 DWC2_QUIRK_FUNC_DEFINE(caps)
 DWC2_QUIRK_FUNC_DEFINE(is_phy_clk_off)
-DWC2_QUIRK_FUNC_DEFINE(post_hibernation_entry)
-DWC2_QUIRK_FUNC_DEFINE(pre_hibernation_exit)
 
 #endif /* ZEPHYR_DRIVERS_USB_UDC_DWC2_H */

From 4bfc800940b592b54fe99c27d0eb804340b0a5dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:09 +0100
Subject: [PATCH 2039/2913] Revert "[nrf fromtree] boards: nrf54h20dk: Allow
 running USB on radio core"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 97e7184811de512fcf2d442deb20769ee944a5e1.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts | 4 ----
 soc/nordic/nrf54h/Kconfig                               | 1 -
 2 files changed, 5 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
index 31827405f5f..31c345899cd 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
@@ -112,7 +112,3 @@ ipc0: &cpuapp_cpurad_ipc {
 &cpurad_ieee802154 {
 	status = "okay";
 };
-
-zephyr_udc0: &usbhs {
-	status = "disabled";
-};
diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
index dd647174b14..1cad8917162 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -43,7 +43,6 @@ config SOC_NRF54H20_CPURAD
 	select NRFS_HAS_CLOCK_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
-	select NRFS_HAS_VBUS_DETECTOR_SERVICE
 	select HAS_NORDIC_DMM
 	select HAS_PM
 	select HAS_POWEROFF

From 0fdb17cadac465e56ec107aca7cf9bb836f99b82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:09 +0100
Subject: [PATCH 2040/2913] Revert "[nrf fromtree] drivers: usb: udc_dwc2:
 Support Remote Wakeup"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 13117f600e5527e9b2d7698384de4ad23e502d05.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 110 ++++++-------------------------------
 1 file changed, 17 insertions(+), 93 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 2e56a9de180..54a946c5b05 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -31,8 +31,6 @@ enum dwc2_drv_event_type {
 	DWC2_DRV_EVT_SETUP,
 	/* Transaction on endpoint is finished */
 	DWC2_DRV_EVT_EP_FINISHED,
-	/* Remote Wakeup should be initiated */
-	DWC2_DRV_EVT_REMOTE_WAKEUP,
 	/* Core should enter hibernation */
 	DWC2_DRV_EVT_ENTER_HIBERNATION,
 	/* Core should exit hibernation due to bus reset */
@@ -117,7 +115,6 @@ struct udc_dwc2_data {
 	/* Configuration flags */
 	unsigned int dynfifosizing : 1;
 	unsigned int bufferdma : 1;
-	unsigned int syncrst : 1;
 	/* Runtime state flags */
 	unsigned int hibernated : 1;
 	unsigned int enumdone : 1;
@@ -903,8 +900,7 @@ static void dwc2_backup_registers(const struct device *dev)
 	backup->pcgcctl = sys_read32((mem_addr_t)&base->pcgcctl);
 }
 
-static void dwc2_restore_essential_registers(const struct device *dev,
-					     bool rwup)
+static void dwc2_restore_essential_registers(const struct device *dev)
 {
 	const struct udc_dwc2_config *const config = dev->config;
 	struct usb_dwc2_reg *const base = config->base;
@@ -925,9 +921,7 @@ static void dwc2_restore_essential_registers(const struct device *dev,
 	sys_write32(backup->gusbcfg, (mem_addr_t)&base->gusbcfg);
 	sys_write32(backup->dcfg, (mem_addr_t)&base->dcfg);
 
-	if (!rwup) {
-		pcgcctl |= USB_DWC2_PCGCCTL_RESTOREMODE | USB_DWC2_PCGCCTL_RSTPDWNMODULE;
-	}
+	pcgcctl |= USB_DWC2_PCGCCTL_RESTOREMODE | USB_DWC2_PCGCCTL_RSTPDWNMODULE;
 	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
 	k_busy_wait(1);
 
@@ -935,7 +929,7 @@ static void dwc2_restore_essential_registers(const struct device *dev,
 	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
 }
 
-static void dwc2_restore_device_registers(const struct device *dev, bool rwup)
+static void dwc2_restore_device_registers(const struct device *dev)
 {
 	const struct udc_dwc2_config *const config = dev->config;
 	struct usb_dwc2_reg *const base = config->base;
@@ -954,10 +948,7 @@ static void dwc2_restore_device_registers(const struct device *dev, bool rwup)
 		sys_write32(backup->dieptxf[i - 1], (mem_addr_t)&base->dieptxf[i - 1]);
 	}
 
-	if (!rwup) {
-		sys_write32(backup->dctl, (mem_addr_t)&base->dctl);
-	}
-
+	sys_write32(backup->dctl, (mem_addr_t)&base->dctl);
 	sys_write32(backup->diepmsk, (mem_addr_t)&base->diepmsk);
 	sys_write32(backup->doepmsk, (mem_addr_t)&base->doepmsk);
 	sys_write32(backup->daintmsk, (mem_addr_t)&base->daintmsk);
@@ -1024,7 +1015,7 @@ static void dwc2_enter_hibernation(const struct device *dev)
 	LOG_DBG("Hibernated");
 }
 
-static void dwc2_exit_hibernation(const struct device *dev, bool rwup)
+static void dwc2_exit_hibernation(const struct device *dev)
 {
 	const struct udc_dwc2_config *const config = dev->config;
 	struct usb_dwc2_reg *const base = config->base;
@@ -1047,14 +1038,6 @@ static void dwc2_exit_hibernation(const struct device *dev, bool rwup)
 	/* Disable power clamps */
 	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNCLMP);
 
-	if (rwup) {
-		if (priv->syncrst) {
-			k_busy_wait(1);
-		} else {
-			k_busy_wait(50);
-		}
-	}
-
 	/* Remove reset to the controller */
 	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNRST_N);
 	k_busy_wait(1);
@@ -1062,9 +1045,7 @@ static void dwc2_exit_hibernation(const struct device *dev, bool rwup)
 	/* Disable PMU interrupt */
 	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUINTSEL);
 
-	dwc2_restore_essential_registers(dev, rwup);
-
-	/* Note: in Remote Wakeup case 15 ms max signaling time starts now */
+	dwc2_restore_essential_registers(dev);
 
 	/* Wait for Restore Done Interrupt */
 	dwc2_wait_for_bit(dev, (mem_addr_t)&base->gintsts, USB_DWC2_GINTSTS_RSTRDONEINT);
@@ -1074,10 +1055,8 @@ static void dwc2_exit_hibernation(const struct device *dev, bool rwup)
 	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_RESTORE);
 	k_busy_wait(1);
 
-	if (!rwup) {
-		/* Clear reset to power down module */
-		sys_clear_bits(pcgcctl_reg, USB_DWC2_PCGCCTL_RSTPDWNMODULE);
-	}
+	/* Clear reset to power down module */
+	sys_clear_bits(pcgcctl_reg, USB_DWC2_PCGCCTL_RSTPDWNMODULE);
 
 	/* Restore GUSBCFG, DCFG and DCTL */
 	sys_write32(priv->backup.gusbcfg, (mem_addr_t)&base->gusbcfg);
@@ -1086,15 +1065,9 @@ static void dwc2_exit_hibernation(const struct device *dev, bool rwup)
 
 	/* Disable PMU */
 	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUACTV);
-	if (!rwup) {
-		k_busy_wait(5);
-		sys_set_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_PWRONPRGDONE);
-	} else {
-		k_busy_wait(1);
-		sys_write32(USB_DWC2_DCTL_RMTWKUPSIG | priv->backup.dctl,
-			    (mem_addr_t)&base->dctl);
-	}
+	k_busy_wait(5);
 
+	sys_set_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_PWRONPRGDONE);
 	k_msleep(1);
 	sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
 }
@@ -1648,13 +1621,9 @@ static int udc_dwc2_test_mode(const struct device *dev,
 
 static int udc_dwc2_host_wakeup(const struct device *dev)
 {
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-
 	LOG_DBG("Remote wakeup from %p", dev);
 
-	k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_REMOTE_WAKEUP));
-
-	return 0;
+	return -ENOTSUP;
 }
 
 /* Return actual USB device speed */
@@ -1816,10 +1785,6 @@ static int udc_dwc2_init_controller(const struct device *dev)
 	LOG_DBG("LPM mode is %s",
 		(ghwcfg3 & USB_DWC2_GHWCFG3_LPMMODE) ? "enabled" : "disabled");
 
-	if (ghwcfg3 & USB_DWC2_GHWCFG3_RSTTYPE) {
-		priv->syncrst = 1;
-	}
-
 	/* Configure AHB, select Completer or DMA mode */
 	gahbcfg = sys_read32(gahbcfg_reg);
 
@@ -2023,7 +1988,7 @@ static int udc_dwc2_disable(const struct device *dev)
 	config->irq_disable_func(dev);
 
 	if (priv->hibernated) {
-		dwc2_exit_hibernation(dev, false);
+		dwc2_exit_hibernation(dev);
 		priv->hibernated = 0;
 	}
 
@@ -2080,7 +2045,6 @@ static int dwc2_driver_preinit(const struct device *dev)
 	k_event_init(&priv->xfer_new);
 	k_event_init(&priv->xfer_finished);
 
-	data->caps.rwup = true;
 	data->caps.addr_before_status = true;
 	data->caps.mps0 = UDC_MPS0_64;
 
@@ -2740,36 +2704,20 @@ static void udc_dwc2_isr_handler(const struct device *dev)
 }
 
 static void dwc2_handle_hibernation_exit(const struct device *dev,
-					 bool rwup, bool bus_reset)
+					 bool bus_reset)
 {
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
 
-	dwc2_exit_hibernation(dev, rwup);
-	dwc2_restore_device_registers(dev, rwup);
+	dwc2_exit_hibernation(dev);
+	dwc2_restore_device_registers(dev);
 
 	priv->hibernated = 0;
-	if (!rwup) {
-		LOG_DBG("Hibernation exit complete");
-	}
+	LOG_DBG("Hibernation exit complete");
 
 	/* Let stack know we are no longer suspended */
 	udc_set_suspended(dev, false);
 	udc_submit_event(dev, UDC_EVT_RESUME, 0);
 
-	if (rwup) {
-		/* Resume has been driven for at least 1 ms now, do 1 ms more to
-		 * have sufficient margin.
-		 */
-		k_msleep(1);
-
-		sys_clear_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_RMTWKUPSIG);
-	}
-
-	if (rwup) {
-		LOG_DBG("Hibernation exit on Remote Wakeup complete");
-	}
-
 	if (bus_reset) {
 		/* Clear all pending transfers */
 		k_event_clear(&priv->xfer_new, UINT32_MAX);
@@ -2806,7 +2754,6 @@ static uint8_t pull_next_ep_from_bitmap(uint32_t *bitmap)
 static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 {
 	const struct device *dev = (const struct device *)arg;
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	const struct udc_dwc2_config *const config = dev->config;
 	struct udc_ep_config *ep_cfg;
@@ -2886,29 +2833,6 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 		dwc2_handle_evt_setup(dev);
 	}
 
-	if (evt & BIT(DWC2_DRV_EVT_REMOTE_WAKEUP)) {
-		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_REMOTE_WAKEUP) |
-			      BIT(DWC2_DRV_EVT_ENTER_HIBERNATION));
-
-		if (priv->hibernated) {
-			config->irq_disable_func(dev);
-
-			dwc2_handle_hibernation_exit(dev, true, false);
-
-			config->irq_enable_func(dev);
-		} else {
-			sys_set_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_RMTWKUPSIG);
-
-			udc_set_suspended(dev, false);
-			udc_submit_event(dev, UDC_EVT_RESUME, 0);
-
-			/* Drive resume for 2 ms to have sufficient margin */
-			k_msleep(2);
-
-			sys_clear_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_RMTWKUPSIG);
-		}
-	}
-
 	if (evt & BIT(DWC2_DRV_EVT_ENTER_HIBERNATION)) {
 		config->irq_disable_func(dev);
 
@@ -2932,7 +2856,7 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 		bus_reset = prev & BIT(DWC2_DRV_EVT_HIBERNATION_EXIT_BUS_RESET);
 
 		if (priv->hibernated) {
-			dwc2_handle_hibernation_exit(dev, false, bus_reset);
+			dwc2_handle_hibernation_exit(dev, bus_reset);
 		}
 
 		config->irq_enable_func(dev);

From 71d760850f5adaba544150ede9b0382ffc995d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:09 +0100
Subject: [PATCH 2041/2913] Revert "[nrf fromtree] drivers: udc_dwc2: Add
 missing GHWCFG bit defines"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b1e82943f4c71b0e78b2111990c6abebf71eaf49.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/common/usb_dwc2_hw.h | 35 --------------------------------
 1 file changed, 35 deletions(-)

diff --git a/drivers/usb/common/usb_dwc2_hw.h b/drivers/usb/common/usb_dwc2_hw.h
index fcb35489a04..f36a2a17ca3 100644
--- a/drivers/usb/common/usb_dwc2_hw.h
+++ b/drivers/usb/common/usb_dwc2_hw.h
@@ -350,27 +350,8 @@ USB_DWC2_GET_FIELD_AND_IDX_DEFINE(ghwcfg1_epdir, GHWCFG1_EPDIR)
 
 /* GHWCFG2 register */
 #define USB_DWC2_GHWCFG2			0x0048UL
-#define USB_DWC2_GHWCFG2_TKNQDEPTH_POS		26UL
-#define USB_DWC2_GHWCFG2_TKNQDEPTH_MASK		(0x1FUL << USB_DWC2_GHWCFG2_TKNQDEPTH_POS)
-#define USB_DWC2_GHWCFG2_PTXQDEPTH_POS		24UL
-#define USB_DWC2_GHWCFG2_PTXQDEPTH_MASK		(0x3UL << USB_DWC2_GHWCFG2_PTXQDEPTH_POS)
-#define USB_DWC2_GHWCFG2_PTXQDEPTH_QUE16	3
-#define USB_DWC2_GHWCFG2_PTXQDEPTH_QUE8		2
-#define USB_DWC2_GHWCFG2_PTXQDEPTH_QUE4		1
-#define USB_DWC2_GHWCFG2_PTXQDEPTH_QUE2		0
-#define USB_DWC2_GHWCFG2_NPTXQDEPTH_POS		22UL
-#define USB_DWC2_GHWCFG2_NPTXQDEPTH_MASK	(0x3UL << USB_DWC2_GHWCFG2_NPTXQDEPTH_POS)
-#define USB_DWC2_GHWCFG2_NPTXQDEPTH_EIGHT	2
-#define USB_DWC2_GHWCFG2_NPTXQDEPTH_FOUR	1
-#define USB_DWC2_GHWCFG2_NPTXQDEPTH_TWO		0
-#define USB_DWC2_GHWCFG2_MULTIPROCINTRPT_POS	20UL
-#define USB_DWC2_GHWCFG2_MULTIPROCINTRPT	BIT(USB_DWC2_GHWCFG2_MULTIPROCINTRPT_POS)
 #define USB_DWC2_GHWCFG2_DYNFIFOSIZING_POS	19UL
 #define USB_DWC2_GHWCFG2_DYNFIFOSIZING		BIT(USB_DWC2_GHWCFG2_DYNFIFOSIZING_POS)
-#define USB_DWC2_GHWCFG2_PERIOSUPPORT_POS	18UL
-#define USB_DWC2_GHWCFG2_PERIOSUPPORT		BIT(USB_DWC2_GHWCFG2_PERIOSUPPORT_POS)
-#define USB_DWC2_GHWCFG2_NUMHSTCHNL_POS		14UL
-#define USB_DWC2_GHWCFG2_NUMHSTCHNL_MASK	(0xFUL << USB_DWC2_GHWCFG2_NUMHSTCHNL_POS)
 #define USB_DWC2_GHWCFG2_NUMDEVEPS_POS		10UL
 #define USB_DWC2_GHWCFG2_NUMDEVEPS_MASK		(0xFUL << USB_DWC2_GHWCFG2_NUMDEVEPS_POS)
 #define USB_DWC2_GHWCFG2_FSPHYTYPE_POS		8UL
@@ -385,8 +366,6 @@ USB_DWC2_GET_FIELD_AND_IDX_DEFINE(ghwcfg1_epdir, GHWCFG1_EPDIR)
 #define USB_DWC2_GHWCFG2_HSPHYTYPE_ULPI		2
 #define USB_DWC2_GHWCFG2_HSPHYTYPE_UTMIPLUS	1
 #define USB_DWC2_GHWCFG2_HSPHYTYPE_NO_HS	0
-#define USB_DWC2_GHWCFG2_SINGPNT_POS		5UL
-#define USB_DWC2_GHWCFG2_SINGPNT		BIT(USB_DWC2_GHWCFG2_SINGPNT_POS)
 #define USB_DWC2_GHWCFG2_OTGARCH_POS		3UL
 #define USB_DWC2_GHWCFG2_OTGARCH_MASK		(0x3UL << USB_DWC2_GHWCFG2_OTGARCH_POS)
 #define USB_DWC2_GHWCFG2_OTGARCH_INTERNALDMA	2
@@ -402,10 +381,6 @@ USB_DWC2_GET_FIELD_AND_IDX_DEFINE(ghwcfg1_epdir, GHWCFG1_EPDIR)
 #define USB_DWC2_GHWCFG2_OTGMODE_SRPOTG		1
 #define USB_DWC2_GHWCFG2_OTGMODE_HNPSRP		0
 
-USB_DWC2_GET_FIELD_DEFINE(ghwcfg2_tknqdepth, GHWCFG2_TKNQDEPTH)
-USB_DWC2_GET_FIELD_DEFINE(ghwcfg2_ptxqdepth, GHWCFG2_PTXQDEPTH)
-USB_DWC2_GET_FIELD_DEFINE(ghwcfg2_nptxqdepth, GHWCFG2_NPTXQDEPTH)
-USB_DWC2_GET_FIELD_DEFINE(ghwcfg2_numhstchnl, GHWCFG2_NUMHSTCHNL)
 USB_DWC2_GET_FIELD_DEFINE(ghwcfg2_numdeveps, GHWCFG2_NUMDEVEPS)
 USB_DWC2_GET_FIELD_DEFINE(ghwcfg2_fsphytype, GHWCFG2_FSPHYTYPE)
 USB_DWC2_GET_FIELD_DEFINE(ghwcfg2_hsphytype, GHWCFG2_HSPHYTYPE)
@@ -418,20 +393,10 @@ USB_DWC2_GET_FIELD_DEFINE(ghwcfg2_otgmode, GHWCFG2_OTGMODE)
 #define USB_DWC2_GHWCFG3_DFIFODEPTH_MASK	(0xFFFFUL << USB_DWC2_GHWCFG3_DFIFODEPTH_POS)
 #define USB_DWC2_GHWCFG3_LPMMODE_POS		15UL
 #define USB_DWC2_GHWCFG3_LPMMODE		BIT(USB_DWC2_GHWCFG3_LPMMODE_POS)
-#define USB_DWC2_GHWCFG3_BCSUPPORT_POS		14UL
-#define USB_DWC2_GHWCFG3_BCSUPPORT		BIT(USB_DWC2_GHWCFG3_BCSUPPORT_POS)
-#define USB_DWC2_GHWCFG3_HSICMODE_POS		13UL
-#define USB_DWC2_GHWCFG3_HSICMODE		BIT(USB_DWC2_GHWCFG3_HSICMODE_POS)
-#define USB_DWC2_GHWCFG3_ADPSUPPORT_POS		12UL
-#define USB_DWC2_GHWCFG3_ADPSUPPORT		BIT(USB_DWC2_GHWCFG3_ADPSUPPORT_POS)
-#define USB_DWC2_GHWCFG3_RSTTYPE_POS		11UL
-#define USB_DWC2_GHWCFG3_RSTTYPE		BIT(USB_DWC2_GHWCFG3_RSTTYPE_POS)
 #define USB_DWC2_GHWCFG3_OPTFEATURE_POS		10UL
 #define USB_DWC2_GHWCFG3_OPTFEATURE		BIT(USB_DWC2_GHWCFG3_OPTFEATURE_POS)
 #define USB_DWC2_GHWCFG3_VNDCTLSUPT_POS		9UL
 #define USB_DWC2_GHWCFG3_VNDCTLSUPT		BIT(USB_DWC2_GHWCFG3_VNDCTLSUPT_POS)
-#define USB_DWC2_GHWCFG3_I2CINTSEL_POS		8UL
-#define USB_DWC2_GHWCFG3_I2CINTSEL		BIT(USB_DWC2_GHWCFG3_I2CINTSEL)
 #define USB_DWC2_GHWCFG3_OTGEN_POS		7UL
 #define USB_DWC2_GHWCFG3_OTGEN			BIT(USB_DWC2_GHWCFG3_OTGEN_POS)
 #define USB_DWC2_GHWCFG3_PKTSIZEWIDTH_POS	4UL

From 4d2cfdcd61fd20992de7509931fc575f26a5c2d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:09 +0100
Subject: [PATCH 2042/2913] Revert "[nrf fromtree] drivers: usb: udc_dwc2: Exit
 hibernation on disable"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0bb05fc87ef6c31b2562c5c1a2e525ac52ce6d50.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 54a946c5b05..d21163345a2 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -1070,6 +1070,11 @@ static void dwc2_exit_hibernation(const struct device *dev)
 	sys_set_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_PWRONPRGDONE);
 	k_msleep(1);
 	sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
+
+	dwc2_restore_device_registers(dev);
+
+	priv->hibernated = 0;
+	LOG_DBG("Hibernation exit complete");
 }
 
 static void cancel_hibernation_request(struct udc_dwc2_data *const priv)
@@ -1966,7 +1971,6 @@ static int udc_dwc2_enable(const struct device *dev)
 static int udc_dwc2_disable(const struct device *dev)
 {
 	const struct udc_dwc2_config *const config = dev->config;
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
 	mem_addr_t dctl_reg = (mem_addr_t)&base->dctl;
 	int err;
@@ -1986,12 +1990,6 @@ static int udc_dwc2_disable(const struct device *dev)
 	}
 
 	config->irq_disable_func(dev);
-
-	if (priv->hibernated) {
-		dwc2_exit_hibernation(dev);
-		priv->hibernated = 0;
-	}
-
 	sys_clear_bits((mem_addr_t)&base->gahbcfg, USB_DWC2_GAHBCFG_GLBINTRMASK);
 
 	err = dwc2_quirk_disable(dev);
@@ -2709,10 +2707,6 @@ static void dwc2_handle_hibernation_exit(const struct device *dev,
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
 
 	dwc2_exit_hibernation(dev);
-	dwc2_restore_device_registers(dev);
-
-	priv->hibernated = 0;
-	LOG_DBG("Hibernation exit complete");
 
 	/* Let stack know we are no longer suspended */
 	udc_set_suspended(dev, false);

From 81d962b35d5ab7907d4728fe7e695721fe0ee66b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:09 +0100
Subject: [PATCH 2043/2913] Revert "[nrf fromtree] drivers: usb: udc_dwc2:
 Enter hibernation in thread"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6246b5ac6d54e09fbc31c9b3ef49972f7f8567d6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 107 +++++++++----------------------------
 1 file changed, 24 insertions(+), 83 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index d21163345a2..fcdb22afdb1 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -31,8 +31,6 @@ enum dwc2_drv_event_type {
 	DWC2_DRV_EVT_SETUP,
 	/* Transaction on endpoint is finished */
 	DWC2_DRV_EVT_EP_FINISHED,
-	/* Core should enter hibernation */
-	DWC2_DRV_EVT_ENTER_HIBERNATION,
 	/* Core should exit hibernation due to bus reset */
 	DWC2_DRV_EVT_HIBERNATION_EXIT_BUS_RESET,
 	/* Core should exit hibernation due to host resume */
@@ -1077,18 +1075,6 @@ static void dwc2_exit_hibernation(const struct device *dev)
 	LOG_DBG("Hibernation exit complete");
 }
 
-static void cancel_hibernation_request(struct udc_dwc2_data *const priv)
-{
-	k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_ENTER_HIBERNATION));
-}
-
-static void request_hibernation(struct udc_dwc2_data *const priv)
-{
-	if (priv->suspend_type == DWC2_SUSPEND_HIBERNATION) {
-		k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_ENTER_HIBERNATION));
-	}
-}
-
 static void dwc2_unset_unused_fifo(const struct device *dev)
 {
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
@@ -2638,8 +2624,6 @@ static void udc_dwc2_isr_handler(const struct device *dev)
 			sys_write32(USB_DWC2_GINTSTS_USBRST, gintsts_reg);
 			dwc2_on_bus_reset(dev);
 			LOG_DBG("USB Reset interrupt");
-
-			cancel_hibernation_request(priv);
 		}
 
 		if (int_status & USB_DWC2_GINTSTS_ENUMDONE) {
@@ -2654,8 +2638,6 @@ static void udc_dwc2_isr_handler(const struct device *dev)
 			sys_write32(USB_DWC2_GINTSTS_WKUPINT, gintsts_reg);
 			udc_set_suspended(dev, false);
 			udc_submit_event(dev, UDC_EVT_RESUME, 0);
-
-			cancel_hibernation_request(priv);
 		}
 
 		if (int_status & USB_DWC2_GINTSTS_IEPINT) {
@@ -2682,11 +2664,9 @@ static void udc_dwc2_isr_handler(const struct device *dev)
 		}
 
 		if (int_status & USB_DWC2_GINTSTS_USBSUSP) {
-			/* Clear USB Suspend interrupt. */
-			sys_write32(USB_DWC2_GINTSTS_USBSUSP, gintsts_reg);
-
 			if (!priv->enumdone) {
-				/* Ignore stale suspend interrupt */
+				/* Clear stale suspend interrupt */
+				sys_write32(USB_DWC2_GINTSTS_USBSUSP, gintsts_reg);
 				continue;
 			}
 
@@ -2694,41 +2674,20 @@ static void udc_dwc2_isr_handler(const struct device *dev)
 			udc_set_suspended(dev, true);
 			udc_submit_event(dev, UDC_EVT_SUSPEND, 0);
 
-			request_hibernation(priv);
+			if (priv->suspend_type == DWC2_SUSPEND_HIBERNATION) {
+				dwc2_enter_hibernation(dev);
+				/* Next interrupt will be from PMU */
+				break;
+			}
+
+			/* Clear USB Suspend interrupt. */
+			sys_write32(USB_DWC2_GINTSTS_USBSUSP, gintsts_reg);
 		}
 	}
 
 	(void)dwc2_quirk_irq_clear(dev);
 }
 
-static void dwc2_handle_hibernation_exit(const struct device *dev,
-					 bool bus_reset)
-{
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-
-	dwc2_exit_hibernation(dev);
-
-	/* Let stack know we are no longer suspended */
-	udc_set_suspended(dev, false);
-	udc_submit_event(dev, UDC_EVT_RESUME, 0);
-
-	if (bus_reset) {
-		/* Clear all pending transfers */
-		k_event_clear(&priv->xfer_new, UINT32_MAX);
-		k_event_clear(&priv->xfer_finished, UINT32_MAX);
-		dwc2_on_bus_reset(dev);
-	} else {
-		/* Resume any pending transfer handling */
-		if (k_event_test(&priv->xfer_new, UINT32_MAX)) {
-			k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
-		}
-
-		if (k_event_test(&priv->xfer_finished, UINT32_MAX)) {
-			k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
-		}
-	}
-}
-
 static uint8_t pull_next_ep_from_bitmap(uint32_t *bitmap)
 {
 	unsigned int bit;
@@ -2768,14 +2727,9 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 	if (evt & BIT(DWC2_DRV_EVT_XFER)) {
 		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
 
-		if (!priv->hibernated) {
-			LOG_DBG("New transfer(s) in the queue");
-			eps = k_event_test(&priv->xfer_new, UINT32_MAX);
-			k_event_clear(&priv->xfer_new, eps);
-		} else {
-			/* Events will be handled after hibernation exit */
-			eps = 0;
-		}
+		LOG_DBG("New transfer(s) in the queue");
+		eps = k_event_test(&priv->xfer_new, UINT32_MAX);
+		k_event_clear(&priv->xfer_new, eps);
 
 		while (eps) {
 			ep = pull_next_ep_from_bitmap(&eps);
@@ -2792,13 +2746,8 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 	if (evt & BIT(DWC2_DRV_EVT_EP_FINISHED)) {
 		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
 
-		if (!priv->hibernated) {
-			eps = k_event_test(&priv->xfer_finished, UINT32_MAX);
-			k_event_clear(&priv->xfer_finished, eps);
-		} else {
-			/* Events will be handled after hibernation exit */
-			eps = 0;
-		}
+		eps = k_event_test(&priv->xfer_finished, UINT32_MAX);
+		k_event_clear(&priv->xfer_finished, eps);
 
 		while (eps) {
 			ep = pull_next_ep_from_bitmap(&eps);
@@ -2827,30 +2776,22 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 		dwc2_handle_evt_setup(dev);
 	}
 
-	if (evt & BIT(DWC2_DRV_EVT_ENTER_HIBERNATION)) {
-		config->irq_disable_func(dev);
-
-		prev = k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_ENTER_HIBERNATION));
-
-		/* Only enter hibernation if IRQ did not cancel the request */
-		if (prev & BIT(DWC2_DRV_EVT_ENTER_HIBERNATION)) {
-			dwc2_enter_hibernation(dev);
-		}
-
-		config->irq_enable_func(dev);
-	}
-
 	if (evt & hibernation_exit_events) {
-		bool bus_reset;
-
 		LOG_DBG("Hibernation exit event");
 		config->irq_disable_func(dev);
 
 		prev = k_event_clear(&priv->drv_evt, hibernation_exit_events);
-		bus_reset = prev & BIT(DWC2_DRV_EVT_HIBERNATION_EXIT_BUS_RESET);
 
 		if (priv->hibernated) {
-			dwc2_handle_hibernation_exit(dev, bus_reset);
+			dwc2_exit_hibernation(dev);
+
+			/* Let stack know we are no longer suspended */
+			udc_set_suspended(dev, false);
+			udc_submit_event(dev, UDC_EVT_RESUME, 0);
+
+			if (prev & BIT(DWC2_DRV_EVT_HIBERNATION_EXIT_BUS_RESET)) {
+				dwc2_on_bus_reset(dev);
+			}
 		}
 
 		config->irq_enable_func(dev);

From 19d05f04b0aa8b1b183fb02580cfd94632abc0ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:10 +0100
Subject: [PATCH 2044/2913] Revert "[nrf fromtree] drivers: usb: udc_dwc2:
 Synchronize thread with UDC API"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit afad96006715f63a4607e141c8e9a9d94023f074.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index fcdb22afdb1..4a8abafb957 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -2722,8 +2722,6 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 	 */
 	evt = k_event_wait(&priv->drv_evt, UINT32_MAX, false, K_FOREVER);
 
-	udc_lock_internal(dev, K_FOREVER);
-
 	if (evt & BIT(DWC2_DRV_EVT_XFER)) {
 		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
 
@@ -2796,8 +2794,6 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 
 		config->irq_enable_func(dev);
 	}
-
-	udc_unlock_internal(dev);
 }
 
 static const struct udc_api udc_dwc2_api = {

From 1e79480b5cfa482a985487c99ad4b62c5f67ff43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:10 +0100
Subject: [PATCH 2045/2913] Revert "[nrf fromtree] drivers: usb: udc_dwc2:
 Replace queue with events"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3fbfd624af93f5f4f7514e25ff87ffd285279c80.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/Kconfig.dwc2 |   9 +-
 drivers/usb/udc/udc_dwc2.c   | 215 ++++++++++++++---------------------
 2 files changed, 96 insertions(+), 128 deletions(-)

diff --git a/drivers/usb/udc/Kconfig.dwc2 b/drivers/usb/udc/Kconfig.dwc2
index 4c023cfb04d..745429a94a1 100644
--- a/drivers/usb/udc/Kconfig.dwc2
+++ b/drivers/usb/udc/Kconfig.dwc2
@@ -7,7 +7,6 @@ config UDC_DWC2
 	depends on DT_HAS_SNPS_DWC2_ENABLED
 	select NRFS if NRFS_HAS_VBUS_DETECTOR_SERVICE
 	select NRFS_VBUS_DETECTOR_SERVICE_ENABLED if NRFS_HAS_VBUS_DETECTOR_SERVICE
-	select EVENTS
 	help
 	  DWC2 USB device controller driver.
 
@@ -38,3 +37,11 @@ config UDC_DWC2_THREAD_PRIORITY
 	default 8
 	help
 	  DWC2 driver thread priority.
+
+config UDC_DWC2_MAX_QMESSAGES
+	int "UDC DWC2 maximum number of ISR event messages"
+	depends on UDC_DWC2
+	range 4 64
+	default 8
+	help
+	  DWC2 maximum number of ISR event messages.
diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 4a8abafb957..945c242bed4 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -29,14 +29,32 @@ enum dwc2_drv_event_type {
 	DWC2_DRV_EVT_XFER,
 	/* Setup packet received */
 	DWC2_DRV_EVT_SETUP,
-	/* Transaction on endpoint is finished */
-	DWC2_DRV_EVT_EP_FINISHED,
-	/* Core should exit hibernation due to bus reset */
-	DWC2_DRV_EVT_HIBERNATION_EXIT_BUS_RESET,
-	/* Core should exit hibernation due to host resume */
-	DWC2_DRV_EVT_HIBERNATION_EXIT_HOST_RESUME,
+	/* OUT transaction for specific endpoint is finished */
+	DWC2_DRV_EVT_DOUT,
+	/* IN transaction for specific endpoint is finished */
+	DWC2_DRV_EVT_DIN,
+	/* Core should exit hibernation */
+	DWC2_DRV_EVT_HIBERNATION_EXIT,
 };
 
+enum dwc2_hibernation_exit_reason {
+	DWC2_HIBERNATION_EXIT_BUS_RESET,
+	DWC2_HIBERNATION_EXIT_HOST_WAKEUP,
+};
+
+struct dwc2_drv_event {
+	const struct device *dev;
+	enum dwc2_drv_event_type type;
+	union {
+		uint8_t ep;
+		enum dwc2_hibernation_exit_reason exit_reason;
+	};
+};
+
+K_MSGQ_DEFINE(drv_msgq, sizeof(struct dwc2_drv_event),
+	      CONFIG_UDC_DWC2_MAX_QMESSAGES, sizeof(void *));
+
+
 /* Minimum RX FIFO size in 32-bit words considering the largest used OUT packet
  * of 512 bytes. The value must be adjusted according to the number of OUT
  * endpoints.
@@ -93,12 +111,6 @@ struct dwc2_reg_backup {
 /* Driver private data per instance */
 struct udc_dwc2_data {
 	struct k_thread thread_data;
-	/* Main events the driver thread waits for */
-	struct k_event drv_evt;
-	/* Transfer triggers (OUT on bits 0-15, IN on bits 16-31) */
-	struct k_event xfer_new;
-	/* Finished transactions (OUT on bits 0-15, IN on bits 16-31) */
-	struct k_event xfer_finished;
 	struct dwc2_reg_backup backup;
 	uint32_t ghwcfg1;
 	uint32_t txf_set;
@@ -1490,9 +1502,12 @@ static int udc_dwc2_ep_set_halt(const struct device *dev,
 static int udc_dwc2_ep_clear_halt(const struct device *dev,
 				  struct udc_ep_config *const cfg)
 {
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	mem_addr_t dxepctl_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
 	uint32_t dxepctl;
+	struct dwc2_drv_event evt = {
+		.ep = cfg->addr,
+		.type = DWC2_DRV_EVT_XFER,
+	};
 
 	dxepctl = sys_read32(dxepctl_reg);
 	dxepctl &= ~USB_DWC2_DEPCTL_STALL;
@@ -1504,16 +1519,7 @@ static int udc_dwc2_ep_clear_halt(const struct device *dev,
 
 	/* Resume queued transfers if any */
 	if (udc_buf_peek(dev, cfg->addr)) {
-		uint32_t ep_bit;
-
-		if (USB_EP_DIR_IS_IN(cfg->addr)) {
-			ep_bit = BIT(16 + USB_EP_GET_IDX(cfg->addr));
-		} else {
-			ep_bit = BIT(USB_EP_GET_IDX(cfg->addr));
-		}
-
-		k_event_post(&priv->xfer_new, ep_bit);
-		k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
+		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
 	}
 
 	return 0;
@@ -1523,22 +1529,16 @@ static int udc_dwc2_ep_enqueue(const struct device *dev,
 			       struct udc_ep_config *const cfg,
 			       struct net_buf *const buf)
 {
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	struct dwc2_drv_event evt = {
+		.ep = cfg->addr,
+		.type = DWC2_DRV_EVT_XFER,
+	};
 
 	LOG_DBG("%p enqueue %x %p", dev, cfg->addr, buf);
 	udc_buf_put(cfg, buf);
 
 	if (!cfg->stat.halted) {
-		uint32_t ep_bit;
-
-		if (USB_EP_DIR_IS_IN(cfg->addr)) {
-			ep_bit = BIT(16 + USB_EP_GET_IDX(cfg->addr));
-		} else {
-			ep_bit = BIT(USB_EP_GET_IDX(cfg->addr));
-		}
-
-		k_event_post(&priv->xfer_new, ep_bit);
-		k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
+		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
 	}
 
 	return 0;
@@ -2016,7 +2016,6 @@ static int udc_dwc2_shutdown(const struct device *dev)
 static int dwc2_driver_preinit(const struct device *dev)
 {
 	const struct udc_dwc2_config *config = dev->config;
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	struct udc_data *data = dev->data;
 	uint16_t mps = 1023;
 	uint32_t numdeveps;
@@ -2025,10 +2024,6 @@ static int dwc2_driver_preinit(const struct device *dev)
 
 	k_mutex_init(&data->mutex);
 
-	k_event_init(&priv->drv_evt);
-	k_event_init(&priv->xfer_new);
-	k_event_init(&priv->xfer_finished);
-
 	data->caps.addr_before_status = true;
 	data->caps.mps0 = UDC_MPS0_64;
 
@@ -2269,6 +2264,7 @@ static inline void dwc2_handle_in_xfercompl(const struct device *dev,
 {
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	struct udc_ep_config *ep_cfg;
+	struct dwc2_drv_event evt;
 	struct net_buf *buf;
 
 	ep_cfg = udc_get_ep_cfg(dev, ep_idx | USB_EP_DIR_IN);
@@ -2283,8 +2279,10 @@ static inline void dwc2_handle_in_xfercompl(const struct device *dev,
 		return;
 	}
 
-	k_event_post(&priv->xfer_finished, BIT(16 + ep_idx));
-	k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
+	evt.dev = dev;
+	evt.ep = ep_cfg->addr;
+	evt.type = DWC2_DRV_EVT_DIN;
+	k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
 }
 
 static inline void dwc2_handle_iepint(const struct device *dev)
@@ -2328,6 +2326,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep_idx);
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	struct dwc2_drv_event evt;
 	uint32_t bcnt;
 	struct net_buf *buf;
 	uint32_t doeptsiz;
@@ -2342,6 +2341,9 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 		return;
 	}
 
+	evt.type = DWC2_DRV_EVT_DOUT;
+	evt.ep = ep_cfg->addr;
+
 	/* The original transfer size value is necessary here because controller
 	 * decreases the value for every byte stored.
 	 */
@@ -2389,8 +2391,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 	    net_buf_tailroom(buf)) {
 		dwc2_prep_rx(dev, buf, ep_cfg);
 	} else {
-		k_event_post(&priv->xfer_finished, BIT(ep_idx));
-		k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
+		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
 	}
 }
 
@@ -2442,7 +2443,12 @@ static inline void dwc2_handle_oepint(const struct device *dev)
 		}
 
 		if (status & USB_DWC2_DOEPINT_SETUP) {
-			k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_SETUP));
+			struct dwc2_drv_event evt = {
+				.type = DWC2_DRV_EVT_SETUP,
+				.ep = USB_CONTROL_EP_OUT,
+			};
+
+			k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
 		}
 
 		if (status & USB_DWC2_DOEPINT_STSPHSERCVD) {
@@ -2577,6 +2583,7 @@ static void udc_dwc2_isr_handler(const struct device *dev)
 	if (priv->hibernated) {
 		uint32_t gpwrdn = sys_read32((mem_addr_t)&base->gpwrdn);
 		bool reset, resume = false;
+		enum dwc2_hibernation_exit_reason exit_reason;
 
 		/* Clear interrupts */
 		sys_write32(gpwrdn, (mem_addr_t)&base->gpwrdn);
@@ -2584,17 +2591,22 @@ static void udc_dwc2_isr_handler(const struct device *dev)
 		if (gpwrdn & USB_DWC2_GPWRDN_LNSTSCHNG) {
 			resume = usb_dwc2_get_gpwrdn_linestate(gpwrdn) ==
 				 USB_DWC2_GPWRDN_LINESTATE_DM1DP0;
+			exit_reason = DWC2_HIBERNATION_EXIT_HOST_WAKEUP;
 		}
 
 		reset = gpwrdn & USB_DWC2_GPWRDN_RESETDETECTED;
-
-		if (resume) {
-			k_event_post(&priv->drv_evt,
-				     BIT(DWC2_DRV_EVT_HIBERNATION_EXIT_HOST_RESUME));
+		if (reset) {
+			exit_reason = DWC2_HIBERNATION_EXIT_BUS_RESET;
 		}
 
-		if (reset) {
-			k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_HIBERNATION_EXIT_BUS_RESET));
+		if (reset || resume) {
+			struct dwc2_drv_event evt = {
+				.dev = dev,
+				.type = DWC2_DRV_EVT_HIBERNATION_EXIT,
+				.exit_reason = exit_reason,
+			};
+
+			k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
 		}
 
 		(void)dwc2_quirk_irq_clear(dev);
@@ -2688,98 +2700,40 @@ static void udc_dwc2_isr_handler(const struct device *dev)
 	(void)dwc2_quirk_irq_clear(dev);
 }
 
-static uint8_t pull_next_ep_from_bitmap(uint32_t *bitmap)
-{
-	unsigned int bit;
-
-	__ASSERT_NO_MSG(bitmap && *bitmap);
-
-	bit = find_lsb_set(*bitmap) - 1;
-	*bitmap &= ~BIT(bit);
-
-	if (bit >= 16) {
-		return USB_EP_DIR_IN | (bit - 16);
-	} else {
-		return USB_EP_DIR_OUT | bit;
-	}
-}
-
 static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 {
 	const struct device *dev = (const struct device *)arg;
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	const struct udc_dwc2_config *const config = dev->config;
 	struct udc_ep_config *ep_cfg;
-	const uint32_t hibernation_exit_events = (BIT(DWC2_DRV_EVT_HIBERNATION_EXIT_BUS_RESET) |
-						  BIT(DWC2_DRV_EVT_HIBERNATION_EXIT_HOST_RESUME));
-	uint32_t prev;
-	uint32_t evt;
-	uint32_t eps;
-	uint8_t ep;
+	struct dwc2_drv_event evt;
 
 	/* This is the bottom-half of the ISR handler and the place where
 	 * a new transfer can be fed.
 	 */
-	evt = k_event_wait(&priv->drv_evt, UINT32_MAX, false, K_FOREVER);
-
-	if (evt & BIT(DWC2_DRV_EVT_XFER)) {
-		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
-
-		LOG_DBG("New transfer(s) in the queue");
-		eps = k_event_test(&priv->xfer_new, UINT32_MAX);
-		k_event_clear(&priv->xfer_new, eps);
-
-		while (eps) {
-			ep = pull_next_ep_from_bitmap(&eps);
-			ep_cfg = udc_get_ep_cfg(dev, ep);
-
-			if (!udc_ep_is_busy(dev, ep_cfg->addr)) {
-				dwc2_handle_xfer_next(dev, ep_cfg);
-			} else {
-				LOG_DBG("ep 0x%02x busy", ep_cfg->addr);
-			}
-		}
-	}
-
-	if (evt & BIT(DWC2_DRV_EVT_EP_FINISHED)) {
-		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
-
-		eps = k_event_test(&priv->xfer_finished, UINT32_MAX);
-		k_event_clear(&priv->xfer_finished, eps);
-
-		while (eps) {
-			ep = pull_next_ep_from_bitmap(&eps);
-			ep_cfg = udc_get_ep_cfg(dev, ep);
-
-			if (USB_EP_DIR_IS_IN(ep)) {
-				LOG_DBG("DIN event ep 0x%02x", ep);
-				dwc2_handle_evt_din(dev, ep_cfg);
-			} else {
-				LOG_DBG("DOUT event ep 0x%02x", ep_cfg->addr);
-				dwc2_handle_evt_dout(dev, ep_cfg);
-			}
-
-			if (!udc_ep_is_busy(dev, ep_cfg->addr)) {
-				dwc2_handle_xfer_next(dev, ep_cfg);
-			} else {
-				LOG_DBG("ep 0x%02x busy", ep_cfg->addr);
-			}
-		}
-	}
-
-	if (evt & BIT(DWC2_DRV_EVT_SETUP)) {
-		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_SETUP));
+	k_msgq_get(&drv_msgq, &evt, K_FOREVER);
+	ep_cfg = udc_get_ep_cfg(dev, evt.ep);
 
+	switch (evt.type) {
+	case DWC2_DRV_EVT_XFER:
+		LOG_DBG("New transfer in the queue");
+		break;
+	case DWC2_DRV_EVT_SETUP:
 		LOG_DBG("SETUP event");
 		dwc2_handle_evt_setup(dev);
-	}
-
-	if (evt & hibernation_exit_events) {
+		break;
+	case DWC2_DRV_EVT_DOUT:
+		LOG_DBG("DOUT event ep 0x%02x", ep_cfg->addr);
+		dwc2_handle_evt_dout(dev, ep_cfg);
+		break;
+	case DWC2_DRV_EVT_DIN:
+		LOG_DBG("DIN event");
+		dwc2_handle_evt_din(dev, ep_cfg);
+		break;
+	case DWC2_DRV_EVT_HIBERNATION_EXIT:
 		LOG_DBG("Hibernation exit event");
 		config->irq_disable_func(dev);
 
-		prev = k_event_clear(&priv->drv_evt, hibernation_exit_events);
-
 		if (priv->hibernated) {
 			dwc2_exit_hibernation(dev);
 
@@ -2787,12 +2741,19 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 			udc_set_suspended(dev, false);
 			udc_submit_event(dev, UDC_EVT_RESUME, 0);
 
-			if (prev & BIT(DWC2_DRV_EVT_HIBERNATION_EXIT_BUS_RESET)) {
+			if (evt.exit_reason == DWC2_HIBERNATION_EXIT_BUS_RESET) {
 				dwc2_on_bus_reset(dev);
 			}
 		}
 
 		config->irq_enable_func(dev);
+		break;
+	}
+
+	if (ep_cfg->addr != USB_CONTROL_EP_OUT && !udc_ep_is_busy(dev, ep_cfg->addr)) {
+		dwc2_handle_xfer_next(dev, ep_cfg);
+	} else {
+		LOG_DBG("ep 0x%02x busy", ep_cfg->addr);
 	}
 }
 

From 71bff98ee07e38888692dc7cafd61a10b6b43437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:10 +0100
Subject: [PATCH 2046/2913] Revert "[nrf fromtree] drivers: usb: udc_dwc2:
 Remove forward defitions"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 734839ff185091c68488c26db3f09eb72e026e17.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/usb/udc/udc_dwc2.c | 2971 ++++++++++++++++++------------------
 1 file changed, 1489 insertions(+), 1482 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 945c242bed4..dc520abe78a 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -139,6 +139,13 @@ struct udc_dwc2_data {
 	uint8_t setup[8];
 };
 
+static void dwc2_on_bus_reset(const struct device *dev);
+static void dwc2_exit_hibernation(const struct device *dev);
+static void dwc2_wait_for_bit(const struct device *dev,
+			      mem_addr_t addr, uint32_t bit);
+static void udc_dwc2_ep_disable(const struct device *dev,
+				struct udc_ep_config *const cfg, bool stall);
+
 #if defined(CONFIG_PINCTRL)
 #include <zephyr/drivers/pinctrl.h>
 
@@ -178,33 +185,6 @@ static inline struct usb_dwc2_reg *dwc2_get_base(const struct device *dev)
 	return config->base;
 }
 
-static void dwc2_wait_for_bit(const struct device *dev,
-			      mem_addr_t addr, uint32_t bit)
-{
-	k_timepoint_t timeout = sys_timepoint_calc(K_MSEC(100));
-
-	/* This could potentially be converted to use proper synchronization
-	 * primitives instead of busy looping, but the number of interrupt bits
-	 * this function can be waiting for is rather high.
-	 *
-	 * Busy looping is most likely fine unless profiling shows otherwise.
-	 */
-	while (!(sys_read32(addr) & bit)) {
-		if (dwc2_quirk_is_phy_clk_off(dev)) {
-			/* No point in waiting, because the bit can only be set
-			 * when the PHY is actively clocked.
-			 */
-			return;
-		}
-
-		if (sys_timepoint_expired(timeout)) {
-			LOG_ERR("Timeout waiting for bit 0x%08X at 0x%08X",
-				bit, (uint32_t)addr);
-			return;
-		}
-	}
-}
-
 /* Get DOEPCTLn or DIEPCTLn register address */
 static mem_addr_t dwc2_get_dxepctl_reg(const struct device *dev, const uint8_t ep)
 {
@@ -854,1907 +834,1934 @@ static int dwc2_handle_evt_din(const struct device *dev,
 	return udc_submit_ep_event(dev, buf, 0);
 }
 
-static void dwc2_backup_registers(const struct device *dev)
+static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 {
-	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = config->base;
+	const struct device *dev = (const struct device *)arg;
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	struct dwc2_reg_backup *backup = &priv->backup;
+	const struct udc_dwc2_config *const config = dev->config;
+	struct udc_ep_config *ep_cfg;
+	struct dwc2_drv_event evt;
 
-	backup->gotgctl = sys_read32((mem_addr_t)&base->gotgctl);
-	backup->gahbcfg = sys_read32((mem_addr_t)&base->gahbcfg);
-	backup->gusbcfg = sys_read32((mem_addr_t)&base->gusbcfg);
-	backup->gintmsk = sys_read32((mem_addr_t)&base->gintmsk);
-	backup->grxfsiz = sys_read32((mem_addr_t)&base->grxfsiz);
-	backup->gnptxfsiz = sys_read32((mem_addr_t)&base->gnptxfsiz);
-	backup->gi2cctl = sys_read32((mem_addr_t)&base->gi2cctl);
-	backup->glpmcfg = sys_read32((mem_addr_t)&base->glpmcfg);
-	backup->gdfifocfg = sys_read32((mem_addr_t)&base->gdfifocfg);
+	/* This is the bottom-half of the ISR handler and the place where
+	 * a new transfer can be fed.
+	 */
+	k_msgq_get(&drv_msgq, &evt, K_FOREVER);
+	ep_cfg = udc_get_ep_cfg(dev, evt.ep);
 
-	for (uint8_t i = 1U; i < priv->ineps; i++) {
-		backup->dieptxf[i - 1] = sys_read32((mem_addr_t)&base->dieptxf[i - 1]);
-	}
+	switch (evt.type) {
+	case DWC2_DRV_EVT_XFER:
+		LOG_DBG("New transfer in the queue");
+		break;
+	case DWC2_DRV_EVT_SETUP:
+		LOG_DBG("SETUP event");
+		dwc2_handle_evt_setup(dev);
+		break;
+	case DWC2_DRV_EVT_DOUT:
+		LOG_DBG("DOUT event ep 0x%02x", ep_cfg->addr);
+		dwc2_handle_evt_dout(dev, ep_cfg);
+		break;
+	case DWC2_DRV_EVT_DIN:
+		LOG_DBG("DIN event");
+		dwc2_handle_evt_din(dev, ep_cfg);
+		break;
+	case DWC2_DRV_EVT_HIBERNATION_EXIT:
+		LOG_DBG("Hibernation exit event");
+		config->irq_disable_func(dev);
 
-	backup->dcfg = sys_read32((mem_addr_t)&base->dcfg);
-	backup->dctl = sys_read32((mem_addr_t)&base->dctl);
-	backup->diepmsk = sys_read32((mem_addr_t)&base->diepmsk);
-	backup->doepmsk = sys_read32((mem_addr_t)&base->doepmsk);
-	backup->daintmsk = sys_read32((mem_addr_t)&base->daintmsk);
+		if (priv->hibernated) {
+			dwc2_exit_hibernation(dev);
 
-	for (uint8_t i = 0U; i < 16; i++) {
-		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
+			/* Let stack know we are no longer suspended */
+			udc_set_suspended(dev, false);
+			udc_submit_event(dev, UDC_EVT_RESUME, 0);
 
-		if (epdir == USB_DWC2_GHWCFG1_EPDIR_IN || epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			backup->diepctl[i] = sys_read32((mem_addr_t)&base->in_ep[i].diepctl);
-			if (backup->diepctl[i] & USB_DWC2_DEPCTL_DPID) {
-				backup->diepctl[i] |= USB_DWC2_DEPCTL_SETD1PID;
-			} else {
-				backup->diepctl[i] |= USB_DWC2_DEPCTL_SETD0PID;
+			if (evt.exit_reason == DWC2_HIBERNATION_EXIT_BUS_RESET) {
+				dwc2_on_bus_reset(dev);
 			}
-			backup->dieptsiz[i] = sys_read32((mem_addr_t)&base->in_ep[i].dieptsiz);
-			backup->diepdma[i] = sys_read32((mem_addr_t)&base->in_ep[i].diepdma);
 		}
 
-		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT || epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			backup->doepctl[i] = sys_read32((mem_addr_t)&base->out_ep[i].doepctl);
-			if (backup->doepctl[i] & USB_DWC2_DEPCTL_DPID) {
-				backup->doepctl[i] |= USB_DWC2_DEPCTL_SETD1PID;
-			} else {
-				backup->doepctl[i] |= USB_DWC2_DEPCTL_SETD0PID;
-			}
-			backup->doeptsiz[i] = sys_read32((mem_addr_t)&base->out_ep[i].doeptsiz);
-			backup->doepdma[i] = sys_read32((mem_addr_t)&base->out_ep[i].doepdma);
-		}
+		config->irq_enable_func(dev);
+		break;
 	}
 
-	backup->pcgcctl = sys_read32((mem_addr_t)&base->pcgcctl);
+	if (ep_cfg->addr != USB_CONTROL_EP_OUT && !udc_ep_is_busy(dev, ep_cfg->addr)) {
+		dwc2_handle_xfer_next(dev, ep_cfg);
+	} else {
+		LOG_DBG("ep 0x%02x busy", ep_cfg->addr);
+	}
 }
 
-static void dwc2_restore_essential_registers(const struct device *dev)
+static void dwc2_on_bus_reset(const struct device *dev)
 {
-	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = config->base;
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	struct dwc2_reg_backup *backup = &priv->backup;
-	uint32_t pcgcctl = backup->pcgcctl & USB_DWC2_PCGCCTL_RESTOREVALUE_MASK;
+	uint32_t doepmsk;
 
-	sys_write32(backup->glpmcfg, (mem_addr_t)&base->glpmcfg);
-	sys_write32(backup->gi2cctl, (mem_addr_t)&base->gi2cctl);
-	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
+	/* Set the NAK bit for all OUT endpoints */
+	for (uint8_t i = 0U; i < priv->numdeveps; i++) {
+		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
+		mem_addr_t doepctl_reg;
 
-	sys_write32(backup->gahbcfg | USB_DWC2_GAHBCFG_GLBINTRMASK,
-		    (mem_addr_t)&base->gahbcfg);
+		LOG_DBG("ep 0x%02x EPDIR %u", i, epdir);
+		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT ||
+		    epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			doepctl_reg = dwc2_get_dxepctl_reg(dev, i);
+			sys_write32(USB_DWC2_DEPCTL_SNAK, doepctl_reg);
+		}
+	}
 
-	sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
-	sys_write32(USB_DWC2_GINTSTS_RSTRDONEINT, (mem_addr_t)&base->gintmsk);
+	doepmsk = USB_DWC2_DOEPINT_SETUP | USB_DWC2_DOEPINT_XFERCOMPL;
+	if (priv->bufferdma) {
+		doepmsk |= USB_DWC2_DOEPINT_STSPHSERCVD;
+	}
 
-	sys_write32(backup->gusbcfg, (mem_addr_t)&base->gusbcfg);
-	sys_write32(backup->dcfg, (mem_addr_t)&base->dcfg);
+	sys_write32(doepmsk, (mem_addr_t)&base->doepmsk);
+	sys_set_bits((mem_addr_t)&base->diepmsk, USB_DWC2_DIEPINT_XFERCOMPL);
 
-	pcgcctl |= USB_DWC2_PCGCCTL_RESTOREMODE | USB_DWC2_PCGCCTL_RSTPDWNMODULE;
-	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
-	k_busy_wait(1);
+	/* Software has to handle RxFLvl interrupt only in Completer mode */
+	if (!priv->bufferdma) {
+		sys_set_bits((mem_addr_t)&base->gintmsk,
+			     USB_DWC2_GINTSTS_RXFLVL);
+	}
 
-	pcgcctl |= USB_DWC2_PCGCCTL_ESSREGRESTORED;
-	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
+	/* Clear device address during reset. */
+	sys_clear_bits((mem_addr_t)&base->dcfg, USB_DWC2_DCFG_DEVADDR_MASK);
+
+	/* Speed enumeration must happen after reset. */
+	priv->enumdone = 0;
 }
 
-static void dwc2_restore_device_registers(const struct device *dev)
+static void dwc2_handle_enumdone(const struct device *dev)
 {
-	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = config->base;
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	struct dwc2_reg_backup *backup = &priv->backup;
+	uint32_t dsts;
 
-	sys_write32(backup->gotgctl, (mem_addr_t)&base->gotgctl);
-	sys_write32(backup->gahbcfg, (mem_addr_t)&base->gahbcfg);
-	sys_write32(backup->gusbcfg, (mem_addr_t)&base->gusbcfg);
-	sys_write32(backup->gintmsk, (mem_addr_t)&base->gintmsk);
-	sys_write32(backup->grxfsiz, (mem_addr_t)&base->grxfsiz);
-	sys_write32(backup->gnptxfsiz, (mem_addr_t)&base->gnptxfsiz);
-	sys_write32(backup->gdfifocfg, (mem_addr_t)&base->gdfifocfg);
+	dsts = sys_read32((mem_addr_t)&base->dsts);
+	priv->enumspd = usb_dwc2_get_dsts_enumspd(dsts);
+	priv->enumdone = 1;
+}
 
-	for (uint8_t i = 1U; i < priv->ineps; i++) {
-		sys_write32(backup->dieptxf[i - 1], (mem_addr_t)&base->dieptxf[i - 1]);
-	}
+static inline int dwc2_read_fifo_setup(const struct device *dev, uint8_t ep,
+				       const size_t size)
+{
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	size_t offset;
 
-	sys_write32(backup->dctl, (mem_addr_t)&base->dctl);
-	sys_write32(backup->diepmsk, (mem_addr_t)&base->diepmsk);
-	sys_write32(backup->doepmsk, (mem_addr_t)&base->doepmsk);
-	sys_write32(backup->daintmsk, (mem_addr_t)&base->daintmsk);
+	/* FIFO access is always in 32-bit words */
 
-	for (uint8_t i = 0U; i < 16; i++) {
-		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
+	if (size != 8) {
+		LOG_ERR("%d bytes SETUP", size);
+	}
 
-		if (epdir == USB_DWC2_GHWCFG1_EPDIR_IN || epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			sys_write32(backup->dieptsiz[i], (mem_addr_t)&base->in_ep[i].dieptsiz);
-			sys_write32(backup->diepdma[i], (mem_addr_t)&base->in_ep[i].diepdma);
-			sys_write32(backup->diepctl[i], (mem_addr_t)&base->in_ep[i].diepctl);
-		}
+	/*
+	 * We store the setup packet temporarily in the driver's private data
+	 * because there is always a race risk after the status stage OUT
+	 * packet from the host and the new setup packet. This is fine in
+	 * bottom-half processing because the events arrive in a queue and
+	 * there will be a next net_buf for the setup packet.
+	 */
+	for (offset = 0; offset < MIN(size, 8); offset += 4) {
+		sys_put_le32(sys_read32(UDC_DWC2_EP_FIFO(base, ep)),
+			     &priv->setup[offset]);
+	}
 
-		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT || epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			sys_write32(backup->doeptsiz[i], (mem_addr_t)&base->out_ep[i].doeptsiz);
-			sys_write32(backup->doepdma[i], (mem_addr_t)&base->out_ep[i].doepdma);
-			sys_write32(backup->doepctl[i], (mem_addr_t)&base->out_ep[i].doepctl);
-		}
+	/* On protocol error simply discard extra data */
+	while (offset < size) {
+		sys_read32(UDC_DWC2_EP_FIFO(base, ep));
+		offset += 4;
 	}
+
+	return 0;
 }
 
-static void dwc2_enter_hibernation(const struct device *dev)
+static inline void dwc2_handle_rxflvl(const struct device *dev)
 {
-	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = config->base;
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	mem_addr_t gpwrdn_reg = (mem_addr_t)&base->gpwrdn;
-	mem_addr_t pcgcctl_reg = (mem_addr_t)&base->pcgcctl;
-
-	dwc2_backup_registers(dev);
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	struct udc_ep_config *ep_cfg;
+	struct net_buf *buf;
+	uint32_t grxstsp;
+	uint32_t pktsts;
+	uint32_t bcnt;
+	uint8_t ep;
 
-	/* This code currently only supports UTMI+. UTMI+ runs at either 30 or
-	 * 60 MHz and therefore 1 us busy waits have sufficiently large margin.
-	 */
+	grxstsp = sys_read32((mem_addr_t)&base->grxstsp);
+	ep = usb_dwc2_get_grxstsp_epnum(grxstsp);
+	bcnt = usb_dwc2_get_grxstsp_bcnt(grxstsp);
+	pktsts = usb_dwc2_get_grxstsp_pktsts(grxstsp);
 
-	/* Enable PMU Logic */
-	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUACTV);
-	k_busy_wait(1);
+	LOG_DBG("ep 0x%02x: pktsts %u, bcnt %u", ep, pktsts, bcnt);
 
-	/* Stop PHY clock */
-	sys_set_bits(pcgcctl_reg, USB_DWC2_PCGCCTL_STOPPCLK);
-	k_busy_wait(1);
-
-	/* Enable PMU interrupt */
-	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUINTSEL);
-	k_busy_wait(1);
-
-	/* Unmask PMU interrupt bits */
-	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_LINESTAGECHANGEMSK |
-				 USB_DWC2_GPWRDN_RESETDETMSK |
-				 USB_DWC2_GPWRDN_DISCONNECTDETECTMSK |
-				 USB_DWC2_GPWRDN_STSCHNGINTMSK);
-	k_busy_wait(1);
-
-	/* Enable power clamps */
-	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNCLMP);
-	k_busy_wait(1);
+	switch (pktsts) {
+	case USB_DWC2_GRXSTSR_PKTSTS_SETUP:
+		dwc2_read_fifo_setup(dev, ep, bcnt);
+		break;
+	case USB_DWC2_GRXSTSR_PKTSTS_OUT_DATA:
+		ep_cfg = udc_get_ep_cfg(dev, ep);
 
-	/* Switch off power to the controller */
-	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNSWTCH);
+		buf = udc_buf_peek(dev, ep_cfg->addr);
 
-	/* Mark that the core is hibernated */
-	priv->hibernated = 1;
-	LOG_DBG("Hibernated");
+		/* RxFIFO data must be retrieved even when buf is NULL */
+		dwc2_read_fifo(dev, ep, buf, bcnt);
+		break;
+	case USB_DWC2_GRXSTSR_PKTSTS_OUT_DATA_DONE:
+		LOG_DBG("RX pktsts DONE");
+		break;
+	case USB_DWC2_GRXSTSR_PKTSTS_SETUP_DONE:
+		LOG_DBG("SETUP pktsts DONE");
+	case USB_DWC2_GRXSTSR_PKTSTS_GLOBAL_OUT_NAK:
+		LOG_DBG("Global OUT NAK");
+		break;
+	default:
+		break;
+	}
 }
 
-static void dwc2_exit_hibernation(const struct device *dev)
+static inline void dwc2_handle_in_xfercompl(const struct device *dev,
+					    const uint8_t ep_idx)
 {
-	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = config->base;
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	mem_addr_t gpwrdn_reg = (mem_addr_t)&base->gpwrdn;
-	mem_addr_t pcgcctl_reg = (mem_addr_t)&base->pcgcctl;
+	struct udc_ep_config *ep_cfg;
+	struct dwc2_drv_event evt;
+	struct net_buf *buf;
 
-	/* Switch on power to the controller */
-	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNSWTCH);
-	k_busy_wait(1);
+	ep_cfg = udc_get_ep_cfg(dev, ep_idx | USB_EP_DIR_IN);
+	buf = udc_buf_peek(dev, ep_cfg->addr);
+	if (buf == NULL) {
+		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
+		return;
+	}
 
-	/* Reset the controller */
-	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNRST_N);
-	k_busy_wait(1);
+	net_buf_pull(buf, priv->tx_len[ep_idx]);
+	if (buf->len  && dwc2_tx_fifo_write(dev, ep_cfg, buf) == 0) {
+		return;
+	}
 
-	/* Enable restore from PMU */
-	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_RESTORE);
-	k_busy_wait(1);
+	evt.dev = dev;
+	evt.ep = ep_cfg->addr;
+	evt.type = DWC2_DRV_EVT_DIN;
+	k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+}
 
-	/* Disable power clamps */
-	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNCLMP);
+static inline void dwc2_handle_iepint(const struct device *dev)
+{
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	const uint8_t n_max = 16;
+	uint32_t diepmsk;
+	uint32_t daint;
 
-	/* Remove reset to the controller */
-	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNRST_N);
-	k_busy_wait(1);
+	diepmsk = sys_read32((mem_addr_t)&base->diepmsk);
+	daint = sys_read32((mem_addr_t)&base->daint);
 
-	/* Disable PMU interrupt */
-	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUINTSEL);
+	for (uint8_t n = 0U; n < n_max; n++) {
+		mem_addr_t diepint_reg = (mem_addr_t)&base->in_ep[n].diepint;
+		uint32_t diepint;
+		uint32_t status;
 
-	dwc2_restore_essential_registers(dev);
+		if (daint & USB_DWC2_DAINT_INEPINT(n)) {
+			/* Read and clear interrupt status */
+			diepint = sys_read32(diepint_reg);
+			status = diepint & diepmsk;
+			sys_write32(status, diepint_reg);
 
-	/* Wait for Restore Done Interrupt */
-	dwc2_wait_for_bit(dev, (mem_addr_t)&base->gintsts, USB_DWC2_GINTSTS_RSTRDONEINT);
-	sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
+			LOG_DBG("ep 0x%02x interrupt status: 0x%x",
+				n | USB_EP_DIR_IN, status);
 
-	/* Disable restore from PMU */
-	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_RESTORE);
-	k_busy_wait(1);
+			if (status & USB_DWC2_DIEPINT_XFERCOMPL) {
+				dwc2_handle_in_xfercompl(dev, n);
+			}
 
-	/* Clear reset to power down module */
-	sys_clear_bits(pcgcctl_reg, USB_DWC2_PCGCCTL_RSTPDWNMODULE);
+		}
+	}
 
-	/* Restore GUSBCFG, DCFG and DCTL */
-	sys_write32(priv->backup.gusbcfg, (mem_addr_t)&base->gusbcfg);
-	sys_write32(priv->backup.dcfg, (mem_addr_t)&base->dcfg);
-	sys_write32(priv->backup.dctl, (mem_addr_t)&base->dctl);
+	/* Clear IEPINT interrupt */
+	sys_write32(USB_DWC2_GINTSTS_IEPINT, (mem_addr_t)&base->gintsts);
+}
 
-	/* Disable PMU */
-	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUACTV);
-	k_busy_wait(5);
+static inline void dwc2_handle_out_xfercompl(const struct device *dev,
+					     const uint8_t ep_idx)
+{
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep_idx);
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	struct dwc2_drv_event evt;
+	uint32_t bcnt;
+	struct net_buf *buf;
+	uint32_t doeptsiz;
+	const bool is_iso = dwc2_ep_is_iso(ep_cfg);
 
-	sys_set_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_PWRONPRGDONE);
-	k_msleep(1);
-	sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
+	doeptsiz = sys_read32((mem_addr_t)&base->out_ep[ep_idx].doeptsiz);
 
-	dwc2_restore_device_registers(dev);
+	buf = udc_buf_peek(dev, ep_cfg->addr);
+	if (!buf) {
+		LOG_ERR("No buffer for ep 0x%02x", ep_cfg->addr);
+		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
+		return;
+	}
 
-	priv->hibernated = 0;
-	LOG_DBG("Hibernation exit complete");
-}
+	evt.type = DWC2_DRV_EVT_DOUT;
+	evt.ep = ep_cfg->addr;
 
-static void dwc2_unset_unused_fifo(const struct device *dev)
-{
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	struct udc_ep_config *tmp;
+	/* The original transfer size value is necessary here because controller
+	 * decreases the value for every byte stored.
+	 */
+	bcnt = usb_dwc2_get_doeptsizn_xfersize(priv->rx_siz[ep_idx]) -
+	       usb_dwc2_get_doeptsizn_xfersize(doeptsiz);
 
-	for (uint8_t i = priv->ineps - 1U; i > 0; i--) {
-		tmp = udc_get_ep_cfg(dev, i | USB_EP_DIR_IN);
+	if (is_iso) {
+		uint32_t pkts;
+		bool valid;
 
-		if (tmp->stat.enabled && (priv->txf_set & BIT(i))) {
-			return;
+		pkts = usb_dwc2_get_doeptsizn_pktcnt(priv->rx_siz[ep_idx]) -
+			usb_dwc2_get_doeptsizn_pktcnt(doeptsiz);
+		switch (usb_dwc2_get_doeptsizn_rxdpid(doeptsiz)) {
+		case USB_DWC2_DOEPTSIZN_RXDPID_DATA0:
+			valid = (pkts == 1);
+			break;
+		case USB_DWC2_DOEPTSIZN_RXDPID_DATA1:
+			valid = (pkts == 2);
+			break;
+		case USB_DWC2_DOEPTSIZN_RXDPID_DATA2:
+			valid = (pkts == 3);
+			break;
+		case USB_DWC2_DOEPTSIZN_RXDPID_MDATA:
+		default:
+			valid = false;
+			break;
 		}
 
-		if (!tmp->stat.enabled && (priv->txf_set & BIT(i))) {
-			priv->txf_set &= ~BIT(i);
+		if (!valid) {
+			if (!priv->bufferdma) {
+				/* RxFlvl added data to net buf, rollback */
+				net_buf_remove_mem(buf, bcnt);
+			}
+			/* Data is not valid, discard it */
+			bcnt = 0;
 		}
 	}
+
+	if (priv->bufferdma && bcnt) {
+		sys_cache_data_invd_range(buf->data, bcnt);
+		net_buf_add(buf, bcnt);
+	}
+
+	if (!is_iso && (bcnt % udc_mps_ep_size(ep_cfg)) == 0 &&
+	    net_buf_tailroom(buf)) {
+		dwc2_prep_rx(dev, buf, ep_cfg);
+	} else {
+		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+	}
 }
 
-/*
- * In dedicated FIFO mode there are i (i = 1 ... ineps - 1) FIFO size registers,
- * e.g. DIEPTXF1, DIEPTXF2, ... DIEPTXF4. When dynfifosizing is enabled,
- * the size register is mutable. The offset of DIEPTXF1 registers is 0.
- */
-static int dwc2_set_dedicated_fifo(const struct device *dev,
-				   struct udc_ep_config *const cfg,
-				   uint32_t *const diepctl)
+static inline void dwc2_handle_oepint(const struct device *dev)
 {
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
-	const uint32_t addnl = USB_MPS_ADDITIONAL_TRANSACTIONS(cfg->mps);
-	uint32_t reqdep;
-	uint32_t txfaddr;
-	uint32_t txfdep;
-	uint32_t tmp;
+	const uint8_t n_max = 16;
+	uint32_t doepmsk;
+	uint32_t daint;
 
-	/* Keep everything but FIFO number */
-	tmp = *diepctl & ~USB_DWC2_DEPCTL_TXFNUM_MASK;
+	doepmsk = sys_read32((mem_addr_t)&base->doepmsk);
+	daint = sys_read32((mem_addr_t)&base->daint);
 
-	reqdep = DIV_ROUND_UP(udc_mps_ep_size(cfg), 4U);
-	if (priv->bufferdma) {
-		/* In DMA mode, TxFIFO capable of holding 2 packets is enough */
-		reqdep *= MIN(2, (1 + addnl));
-	} else {
-		reqdep *= (1 + addnl);
-	}
+	for (uint8_t n = 0U; n < n_max; n++) {
+		mem_addr_t doepint_reg = (mem_addr_t)&base->out_ep[n].doepint;
+		uint32_t doepint;
+		uint32_t status;
 
-	if (priv->dynfifosizing) {
-		if (priv->txf_set & ~BIT_MASK(ep_idx)) {
-			dwc2_unset_unused_fifo(dev);
+		if (!(daint & USB_DWC2_DAINT_OUTEPINT(n))) {
+			continue;
 		}
 
-		if (priv->txf_set & ~BIT_MASK(ep_idx)) {
-			LOG_WRN("Some of the FIFOs higher than %u are set, %lx",
-				ep_idx, priv->txf_set & ~BIT_MASK(ep_idx));
-			return -EIO;
-		}
+		/* Read and clear interrupt status */
+		doepint = sys_read32(doepint_reg);
+		status = doepint & doepmsk;
+		sys_write32(status, doepint_reg);
 
-		if ((ep_idx - 1) != 0U) {
-			txfaddr = dwc2_get_txfdep(dev, ep_idx - 2) +
-				  dwc2_get_txfaddr(dev, ep_idx - 2);
-		} else {
-			txfaddr = priv->rxfifo_depth +
-				MAX(UDC_DWC2_FIFO0_DEPTH, priv->max_txfifo_depth[0]);
-		}
+		LOG_DBG("ep 0x%02x interrupt status: 0x%x", n, status);
 
-		/* Make sure to not set TxFIFO greater than hardware allows */
-		txfdep = reqdep;
-		if (txfdep > priv->max_txfifo_depth[ep_idx]) {
-			return -ENOMEM;
-		}
+		/* StupPktRcvd is not enabled for interrupt, but must be checked
+		 * when XferComp hits to determine if SETUP token was received.
+		 */
+		if (priv->bufferdma && (status & USB_DWC2_DOEPINT_XFERCOMPL) &&
+		    (doepint & USB_DWC2_DOEPINT_STUPPKTRCVD)) {
+			uint32_t addr;
 
-		/* Do not allocate TxFIFO outside the SPRAM */
-		if (txfaddr + txfdep > priv->dfifodepth) {
-			return -ENOMEM;
+			sys_write32(USB_DWC2_DOEPINT_STUPPKTRCVD, doepint_reg);
+			status &= ~USB_DWC2_DOEPINT_XFERCOMPL;
+
+			/* DMAAddr points past the memory location where the
+			 * SETUP data was stored. Copy the received SETUP data
+			 * to temporary location used also in Completer mode
+			 * which allows common SETUP interrupt handling.
+			 */
+			addr = sys_read32((mem_addr_t)&base->out_ep[0].doepdma);
+			sys_cache_data_invd_range((void *)(addr - 8), 8);
+			memcpy(priv->setup, (void *)(addr - 8), sizeof(priv->setup));
 		}
 
-		/* Set FIFO depth (32-bit words) and address */
-		dwc2_set_txf(dev, ep_idx - 1, txfdep, txfaddr);
-	} else {
-		txfdep = dwc2_get_txfdep(dev, ep_idx - 1);
-		txfaddr = dwc2_get_txfaddr(dev, ep_idx - 1);
+		if (status & USB_DWC2_DOEPINT_SETUP) {
+			struct dwc2_drv_event evt = {
+				.type = DWC2_DRV_EVT_SETUP,
+				.ep = USB_CONTROL_EP_OUT,
+			};
 
-		if (reqdep > txfdep) {
-			return -ENOMEM;
+			k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
 		}
 
-		LOG_DBG("Reuse FIFO%u addr 0x%08x depth %u", ep_idx, txfaddr, txfdep);
-	}
-
-	/* Assign FIFO to the IN endpoint */
-	*diepctl = tmp | usb_dwc2_set_depctl_txfnum(ep_idx);
-	priv->txf_set |= BIT(ep_idx);
-	dwc2_flush_tx_fifo(dev, ep_idx);
+		if (status & USB_DWC2_DOEPINT_STSPHSERCVD) {
+			/* Driver doesn't need any special handling, but it is
+			 * mandatory that the bit is cleared in Buffer DMA mode.
+			 * If the bit is not cleared (i.e. when this interrupt
+			 * bit is masked), then SETUP interrupts will cease
+			 * after first control transfer with data stage from
+			 * device to host.
+			 */
+		}
 
-	LOG_INF("Set FIFO%u (ep 0x%02x) addr 0x%04x depth %u size %u",
-		ep_idx, cfg->addr, txfaddr, txfdep, dwc2_ftx_avail(dev, ep_idx));
+		if (status & USB_DWC2_DOEPINT_XFERCOMPL) {
+			dwc2_handle_out_xfercompl(dev, n);
+		}
+	}
 
-	return 0;
+	/* Clear OEPINT interrupt */
+	sys_write32(USB_DWC2_GINTSTS_OEPINT, (mem_addr_t)&base->gintsts);
 }
 
-static int dwc2_ep_control_enable(const struct device *dev,
-				  struct udc_ep_config *const cfg)
+/* In DWC2 otg context incomplete isochronous IN transfer means that the host
+ * did not issue IN token to at least one isochronous endpoint and software has
+ * find on which endpoints the data is no longer valid and discard it.
+ */
+static void dwc2_handle_incompisoin(const struct device *dev)
 {
-	mem_addr_t dxepctl0_reg;
-	uint32_t dxepctl0;
+	const struct udc_dwc2_config *const config = dev->config;
+	struct usb_dwc2_reg *const base = config->base;
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	mem_addr_t gintsts_reg = (mem_addr_t)&base->gintsts;
+	const uint32_t mask =
+		USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_EPTYPE_MASK |
+		USB_DWC2_DEPCTL_USBACTEP;
+	const uint32_t val =
+		USB_DWC2_DEPCTL_EPENA |
+		usb_dwc2_set_depctl_eptype(USB_DWC2_DEPCTL_EPTYPE_ISO) |
+		USB_DWC2_DEPCTL_USBACTEP;
 
-	dxepctl0_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
-	dxepctl0 = sys_read32(dxepctl0_reg);
+	for (uint8_t i = 1U; i < priv->numdeveps; i++) {
+		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
 
-	dxepctl0 &= ~USB_DWC2_DEPCTL0_MPS_MASK;
-	switch (cfg->mps) {
-	case 8:
-		dxepctl0 |= USB_DWC2_DEPCTL0_MPS_8 << USB_DWC2_DEPCTL_MPS_POS;
-		break;
-	case 16:
-		dxepctl0 |= USB_DWC2_DEPCTL0_MPS_16 << USB_DWC2_DEPCTL_MPS_POS;
-		break;
-	case 32:
-		dxepctl0 |= USB_DWC2_DEPCTL0_MPS_32 << USB_DWC2_DEPCTL_MPS_POS;
-		break;
-	case 64:
-		dxepctl0 |= USB_DWC2_DEPCTL0_MPS_64 << USB_DWC2_DEPCTL_MPS_POS;
-		break;
-	default:
-		return -EINVAL;
-	}
+		if (epdir == USB_DWC2_GHWCFG1_EPDIR_IN ||
+		    epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			mem_addr_t diepctl_reg = dwc2_get_dxepctl_reg(dev, i | USB_EP_DIR_IN);
+			uint32_t diepctl;
 
-	dxepctl0 |= USB_DWC2_DEPCTL_USBACTEP;
+			diepctl = sys_read32(diepctl_reg);
 
-	if (cfg->addr == USB_CONTROL_EP_OUT) {
-		int ret;
+			/* Check if endpoint didn't receive ISO OUT data */
+			if ((diepctl & mask) == val) {
+				struct udc_ep_config *cfg;
+				struct net_buf *buf;
 
-		dwc2_flush_rx_fifo(dev);
-		ret = dwc2_ctrl_feed_dout(dev, 8);
-		if (ret) {
-			return ret;
+				cfg = udc_get_ep_cfg(dev, i | USB_EP_DIR_IN);
+				__ASSERT_NO_MSG(cfg && cfg->stat.enabled &&
+						dwc2_ep_is_iso(cfg));
+
+				udc_dwc2_ep_disable(dev, cfg, false);
+
+				buf = udc_buf_get(dev, cfg->addr);
+				if (buf) {
+					udc_submit_ep_event(dev, buf, 0);
+				}
+			}
 		}
-	} else {
-		dwc2_flush_tx_fifo(dev, 0);
 	}
 
-	sys_write32(dxepctl0, dxepctl0_reg);
-	dwc2_set_epint(dev, cfg, true);
-
-	return 0;
+	sys_write32(USB_DWC2_GINTSTS_INCOMPISOIN, gintsts_reg);
 }
 
-static int udc_dwc2_ep_activate(const struct device *dev,
-				struct udc_ep_config *const cfg)
+/* In DWC2 otg context incomplete isochronous OUT transfer means that the host
+ * did not issue OUT token to at least one isochronous endpoint and software has
+ * to find on which endpoint it didn't receive any data and let the stack know.
+ */
+static void dwc2_handle_incompisoout(const struct device *dev)
 {
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	const struct udc_dwc2_config *const config = dev->config;
+	struct usb_dwc2_reg *const base = config->base;
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
-	mem_addr_t dxepctl_reg;
-	uint32_t dxepctl;
-
-	LOG_DBG("Enable ep 0x%02x", cfg->addr);
-
-	if (ep_idx == 0U) {
-		return dwc2_ep_control_enable(dev, cfg);
-	}
+	mem_addr_t gintsts_reg = (mem_addr_t)&base->gintsts;
+	const uint32_t mask =
+		USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_EPTYPE_MASK |
+		USB_DWC2_DEPCTL_DPID | USB_DWC2_DEPCTL_USBACTEP;
+	const uint32_t val =
+		USB_DWC2_DEPCTL_EPENA |
+		usb_dwc2_set_depctl_eptype(USB_DWC2_DEPCTL_EPTYPE_ISO) |
+		((priv->sof_num & 1) ? USB_DWC2_DEPCTL_DPID : 0) |
+		USB_DWC2_DEPCTL_USBACTEP;
 
-	if (USB_EP_DIR_IS_OUT(cfg->addr)) {
-		/* TODO: use dwc2_get_dxepctl_reg() */
-		dxepctl_reg = (mem_addr_t)&base->out_ep[ep_idx].doepctl;
-	} else {
-		if (priv->ineps > 0U && ep_idx > (priv->ineps - 1U)) {
-			LOG_ERR("No resources available for ep 0x%02x", cfg->addr);
-			return -EINVAL;
-		}
+	for (uint8_t i = 1U; i < priv->numdeveps; i++) {
+		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
 
-		dxepctl_reg = (mem_addr_t)&base->in_ep[ep_idx].diepctl;
-	}
+		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT ||
+		    epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			mem_addr_t doepctl_reg = dwc2_get_dxepctl_reg(dev, i);
+			uint32_t doepctl;
 
-	dxepctl = sys_read32(dxepctl_reg);
-	/* Set max packet size */
-	dxepctl &= ~USB_DWC2_DEPCTL_MPS_MASK;
-	dxepctl |= usb_dwc2_set_depctl_mps(udc_mps_ep_size(cfg));
+			doepctl = sys_read32(doepctl_reg);
 
-	/* Set endpoint type */
-	dxepctl &= ~USB_DWC2_DEPCTL_EPTYPE_MASK;
+			/* Check if endpoint didn't receive ISO OUT data */
+			if ((doepctl & mask) == val) {
+				struct udc_ep_config *cfg;
+				struct net_buf *buf;
 
-	switch (cfg->attributes & USB_EP_TRANSFER_TYPE_MASK) {
-	case USB_EP_TYPE_BULK:
-		dxepctl |= USB_DWC2_DEPCTL_EPTYPE_BULK <<
-			   USB_DWC2_DEPCTL_EPTYPE_POS;
-		dxepctl |= USB_DWC2_DEPCTL_SETD0PID;
-		break;
-	case USB_EP_TYPE_INTERRUPT:
-		dxepctl |= USB_DWC2_DEPCTL_EPTYPE_INTERRUPT <<
-			   USB_DWC2_DEPCTL_EPTYPE_POS;
-		dxepctl |= USB_DWC2_DEPCTL_SETD0PID;
-		break;
-	case USB_EP_TYPE_ISO:
-		dxepctl |= USB_DWC2_DEPCTL_EPTYPE_ISO <<
-			   USB_DWC2_DEPCTL_EPTYPE_POS;
-		break;
-	default:
-		return -EINVAL;
-	}
+				cfg = udc_get_ep_cfg(dev, i);
+				__ASSERT_NO_MSG(cfg && cfg->stat.enabled &&
+						dwc2_ep_is_iso(cfg));
 
-	if (USB_EP_DIR_IS_IN(cfg->addr) && udc_mps_ep_size(cfg) != 0U) {
-		int ret = dwc2_set_dedicated_fifo(dev, cfg, &dxepctl);
+				udc_dwc2_ep_disable(dev, cfg, false);
 
-		if (ret) {
-			return ret;
+				buf = udc_buf_get(dev, cfg->addr);
+				if (buf) {
+					udc_submit_ep_event(dev, buf, 0);
+				}
+			}
 		}
 	}
 
-	dxepctl |= USB_DWC2_DEPCTL_USBACTEP;
-
-	/* Enable endpoint interrupts */
-	dwc2_set_epint(dev, cfg, true);
-	sys_write32(dxepctl, dxepctl_reg);
-
-	for (uint8_t i = 1U; i < priv->ineps; i++) {
-		LOG_DBG("DIEPTXF%u %08x DIEPCTL%u %08x",
-			i, sys_read32((mem_addr_t)&base->dieptxf[i - 1U]), i, dxepctl);
-	}
-
-	return 0;
+	sys_write32(USB_DWC2_GINTSTS_INCOMPISOOUT, gintsts_reg);
 }
 
-static int dwc2_unset_dedicated_fifo(const struct device *dev,
-				     struct udc_ep_config *const cfg,
-				     uint32_t *const diepctl)
+static void dwc2_backup_registers(const struct device *dev)
 {
+	const struct udc_dwc2_config *const config = dev->config;
+	struct usb_dwc2_reg *const base = config->base;
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
-
-	/* Clear FIFO number field */
-	*diepctl &= ~USB_DWC2_DEPCTL_TXFNUM_MASK;
+	struct dwc2_reg_backup *backup = &priv->backup;
 
-	if (priv->dynfifosizing) {
-		if (priv->txf_set & ~BIT_MASK(ep_idx)) {
-			LOG_WRN("Some of the FIFOs higher than %u are set, %lx",
-				ep_idx, priv->txf_set & ~BIT_MASK(ep_idx));
-			return 0;
-		}
+	backup->gotgctl = sys_read32((mem_addr_t)&base->gotgctl);
+	backup->gahbcfg = sys_read32((mem_addr_t)&base->gahbcfg);
+	backup->gusbcfg = sys_read32((mem_addr_t)&base->gusbcfg);
+	backup->gintmsk = sys_read32((mem_addr_t)&base->gintmsk);
+	backup->grxfsiz = sys_read32((mem_addr_t)&base->grxfsiz);
+	backup->gnptxfsiz = sys_read32((mem_addr_t)&base->gnptxfsiz);
+	backup->gi2cctl = sys_read32((mem_addr_t)&base->gi2cctl);
+	backup->glpmcfg = sys_read32((mem_addr_t)&base->glpmcfg);
+	backup->gdfifocfg = sys_read32((mem_addr_t)&base->gdfifocfg);
 
-		dwc2_set_txf(dev, ep_idx - 1, 0, 0);
+	for (uint8_t i = 1U; i < priv->ineps; i++) {
+		backup->dieptxf[i - 1] = sys_read32((mem_addr_t)&base->dieptxf[i - 1]);
 	}
 
-	priv->txf_set &= ~BIT(ep_idx);
-
-	return 0;
-}
-
-/* Disabled IN endpoint means that device will send NAK (isochronous: ZLP) after
- * receiving IN token from host even if there is packet available in TxFIFO.
- * Disabled OUT endpoint means that device will NAK (isochronous: discard data)
- * incoming OUT data (or HS PING) even if there is space available in RxFIFO.
- *
- * Set stall parameter to true if caller wants to send STALL instead of NAK.
- */
-static void udc_dwc2_ep_disable(const struct device *dev,
-				struct udc_ep_config *const cfg, bool stall)
-{
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
-	mem_addr_t dxepctl_reg;
-	uint32_t dxepctl;
+	backup->dcfg = sys_read32((mem_addr_t)&base->dcfg);
+	backup->dctl = sys_read32((mem_addr_t)&base->dctl);
+	backup->diepmsk = sys_read32((mem_addr_t)&base->diepmsk);
+	backup->doepmsk = sys_read32((mem_addr_t)&base->doepmsk);
+	backup->daintmsk = sys_read32((mem_addr_t)&base->daintmsk);
 
-	dxepctl_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
-	dxepctl = sys_read32(dxepctl_reg);
+	for (uint8_t i = 0U; i < 16; i++) {
+		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
 
-	if (dxepctl & USB_DWC2_DEPCTL_NAKSTS) {
-		/* Endpoint already sends forced NAKs. STALL if necessary. */
-		if (stall) {
-			dxepctl |= USB_DWC2_DEPCTL_STALL;
-			sys_write32(dxepctl, dxepctl_reg);
+		if (epdir == USB_DWC2_GHWCFG1_EPDIR_IN || epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			backup->diepctl[i] = sys_read32((mem_addr_t)&base->in_ep[i].diepctl);
+			if (backup->diepctl[i] & USB_DWC2_DEPCTL_DPID) {
+				backup->diepctl[i] |= USB_DWC2_DEPCTL_SETD1PID;
+			} else {
+				backup->diepctl[i] |= USB_DWC2_DEPCTL_SETD0PID;
+			}
+			backup->dieptsiz[i] = sys_read32((mem_addr_t)&base->in_ep[i].dieptsiz);
+			backup->diepdma[i] = sys_read32((mem_addr_t)&base->in_ep[i].diepdma);
 		}
 
-		return;
+		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT || epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			backup->doepctl[i] = sys_read32((mem_addr_t)&base->out_ep[i].doepctl);
+			if (backup->doepctl[i] & USB_DWC2_DEPCTL_DPID) {
+				backup->doepctl[i] |= USB_DWC2_DEPCTL_SETD1PID;
+			} else {
+				backup->doepctl[i] |= USB_DWC2_DEPCTL_SETD0PID;
+			}
+			backup->doeptsiz[i] = sys_read32((mem_addr_t)&base->out_ep[i].doeptsiz);
+			backup->doepdma[i] = sys_read32((mem_addr_t)&base->out_ep[i].doepdma);
+		}
 	}
 
-	if (USB_EP_DIR_IS_OUT(cfg->addr)) {
-		mem_addr_t dctl_reg, gintsts_reg, doepint_reg;
-		uint32_t dctl;
-
-		dctl_reg = (mem_addr_t)&base->dctl;
-		gintsts_reg = (mem_addr_t)&base->gintsts;
-		doepint_reg = (mem_addr_t)&base->out_ep[ep_idx].doepint;
-
-		dctl = sys_read32(dctl_reg);
-
-		if (sys_read32(gintsts_reg) & USB_DWC2_GINTSTS_GOUTNAKEFF) {
-			LOG_ERR("GOUTNAKEFF already active");
-		} else {
-			dctl |= USB_DWC2_DCTL_SGOUTNAK;
-			sys_write32(dctl, dctl_reg);
-			dctl &= ~USB_DWC2_DCTL_SGOUTNAK;
-		}
+	backup->pcgcctl = sys_read32((mem_addr_t)&base->pcgcctl);
+}
 
-		dwc2_wait_for_bit(dev, gintsts_reg, USB_DWC2_GINTSTS_GOUTNAKEFF);
+static void dwc2_restore_essential_registers(const struct device *dev)
+{
+	const struct udc_dwc2_config *const config = dev->config;
+	struct usb_dwc2_reg *const base = config->base;
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	struct dwc2_reg_backup *backup = &priv->backup;
+	uint32_t pcgcctl = backup->pcgcctl & USB_DWC2_PCGCCTL_RESTOREVALUE_MASK;
 
-		/* The application cannot disable control OUT endpoint 0. */
-		if (ep_idx != 0) {
-			dxepctl |= USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_EPDIS;
-		}
+	sys_write32(backup->glpmcfg, (mem_addr_t)&base->glpmcfg);
+	sys_write32(backup->gi2cctl, (mem_addr_t)&base->gi2cctl);
+	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
 
-		if (stall) {
-			/* For OUT endpoints STALL is set instead of SNAK */
-			dxepctl |= USB_DWC2_DEPCTL_STALL;
-		} else {
-			dxepctl |= USB_DWC2_DEPCTL_SNAK;
-		}
-		sys_write32(dxepctl, dxepctl_reg);
+	sys_write32(backup->gahbcfg | USB_DWC2_GAHBCFG_GLBINTRMASK,
+		    (mem_addr_t)&base->gahbcfg);
 
-		if (ep_idx != 0) {
-			dwc2_wait_for_bit(dev, doepint_reg, USB_DWC2_DOEPINT_EPDISBLD);
-		}
+	sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
+	sys_write32(USB_DWC2_GINTSTS_RSTRDONEINT, (mem_addr_t)&base->gintmsk);
 
-		/* Clear Endpoint Disabled interrupt */
-		sys_write32(USB_DWC2_DIEPINT_EPDISBLD, doepint_reg);
+	sys_write32(backup->gusbcfg, (mem_addr_t)&base->gusbcfg);
+	sys_write32(backup->dcfg, (mem_addr_t)&base->dcfg);
 
-		dctl |= USB_DWC2_DCTL_CGOUTNAK;
-		sys_write32(dctl, dctl_reg);
-	} else {
-		mem_addr_t diepint_reg;
+	pcgcctl |= USB_DWC2_PCGCCTL_RESTOREMODE | USB_DWC2_PCGCCTL_RSTPDWNMODULE;
+	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
+	k_busy_wait(1);
 
-		diepint_reg = (mem_addr_t)&base->in_ep[ep_idx].diepint;
+	pcgcctl |= USB_DWC2_PCGCCTL_ESSREGRESTORED;
+	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
+}
 
-		dxepctl |= USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_SNAK;
-		if (stall) {
-			/* For IN endpoints STALL is set in addition to SNAK */
-			dxepctl |= USB_DWC2_DEPCTL_STALL;
-		}
-		sys_write32(dxepctl, dxepctl_reg);
+static void dwc2_restore_device_registers(const struct device *dev)
+{
+	const struct udc_dwc2_config *const config = dev->config;
+	struct usb_dwc2_reg *const base = config->base;
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	struct dwc2_reg_backup *backup = &priv->backup;
 
-		dwc2_wait_for_bit(dev, diepint_reg, USB_DWC2_DIEPINT_INEPNAKEFF);
+	sys_write32(backup->gotgctl, (mem_addr_t)&base->gotgctl);
+	sys_write32(backup->gahbcfg, (mem_addr_t)&base->gahbcfg);
+	sys_write32(backup->gusbcfg, (mem_addr_t)&base->gusbcfg);
+	sys_write32(backup->gintmsk, (mem_addr_t)&base->gintmsk);
+	sys_write32(backup->grxfsiz, (mem_addr_t)&base->grxfsiz);
+	sys_write32(backup->gnptxfsiz, (mem_addr_t)&base->gnptxfsiz);
+	sys_write32(backup->gdfifocfg, (mem_addr_t)&base->gdfifocfg);
 
-		dxepctl |= USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_EPDIS;
-		sys_write32(dxepctl, dxepctl_reg);
+	for (uint8_t i = 1U; i < priv->ineps; i++) {
+		sys_write32(backup->dieptxf[i - 1], (mem_addr_t)&base->dieptxf[i - 1]);
+	}
 
-		dwc2_wait_for_bit(dev, diepint_reg, USB_DWC2_DIEPINT_EPDISBLD);
+	sys_write32(backup->dctl, (mem_addr_t)&base->dctl);
+	sys_write32(backup->diepmsk, (mem_addr_t)&base->diepmsk);
+	sys_write32(backup->doepmsk, (mem_addr_t)&base->doepmsk);
+	sys_write32(backup->daintmsk, (mem_addr_t)&base->daintmsk);
 
-		/* Clear Endpoint Disabled interrupt */
-		sys_write32(USB_DWC2_DIEPINT_EPDISBLD, diepint_reg);
+	for (uint8_t i = 0U; i < 16; i++) {
+		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
 
-		/* TODO: Read DIEPTSIZn here? Programming Guide suggest it to
-		 * let application know how many bytes of interrupted transfer
-		 * were transferred to the host.
-		 */
+		if (epdir == USB_DWC2_GHWCFG1_EPDIR_IN || epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			sys_write32(backup->dieptsiz[i], (mem_addr_t)&base->in_ep[i].dieptsiz);
+			sys_write32(backup->diepdma[i], (mem_addr_t)&base->in_ep[i].diepdma);
+			sys_write32(backup->diepctl[i], (mem_addr_t)&base->in_ep[i].diepctl);
+		}
 
-		dwc2_flush_tx_fifo(dev, usb_dwc2_get_depctl_txfnum(dxepctl));
+		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT || epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			sys_write32(backup->doeptsiz[i], (mem_addr_t)&base->out_ep[i].doeptsiz);
+			sys_write32(backup->doepdma[i], (mem_addr_t)&base->out_ep[i].doepdma);
+			sys_write32(backup->doepctl[i], (mem_addr_t)&base->out_ep[i].doepctl);
+		}
 	}
-
-	udc_ep_set_busy(dev, cfg->addr, false);
 }
 
-/* Deactivated endpoint means that there will be a bus timeout when the host
- * tries to access the endpoint.
- */
-static int udc_dwc2_ep_deactivate(const struct device *dev,
-				  struct udc_ep_config *const cfg)
+static void dwc2_enter_hibernation(const struct device *dev)
 {
-	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
-	mem_addr_t dxepctl_reg;
-	uint32_t dxepctl;
+	const struct udc_dwc2_config *const config = dev->config;
+	struct usb_dwc2_reg *const base = config->base;
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	mem_addr_t gpwrdn_reg = (mem_addr_t)&base->gpwrdn;
+	mem_addr_t pcgcctl_reg = (mem_addr_t)&base->pcgcctl;
 
-	dxepctl_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
-	dxepctl = sys_read32(dxepctl_reg);
+	dwc2_backup_registers(dev);
 
-	if (dxepctl & USB_DWC2_DEPCTL_USBACTEP) {
-		LOG_DBG("Disable ep 0x%02x DxEPCTL%u %x",
-			cfg->addr, ep_idx, dxepctl);
+	/* This code currently only supports UTMI+. UTMI+ runs at either 30 or
+	 * 60 MHz and therefore 1 us busy waits have sufficiently large margin.
+	 */
 
-		udc_dwc2_ep_disable(dev, cfg, false);
+	/* Enable PMU Logic */
+	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUACTV);
+	k_busy_wait(1);
 
-		dxepctl = sys_read32(dxepctl_reg);
-		dxepctl &= ~USB_DWC2_DEPCTL_USBACTEP;
-	} else {
-		LOG_WRN("ep 0x%02x is not active DxEPCTL%u %x",
-			cfg->addr, ep_idx, dxepctl);
-	}
+	/* Stop PHY clock */
+	sys_set_bits(pcgcctl_reg, USB_DWC2_PCGCCTL_STOPPCLK);
+	k_busy_wait(1);
 
-	if (USB_EP_DIR_IS_IN(cfg->addr) && udc_mps_ep_size(cfg) != 0U &&
-	    ep_idx != 0U) {
-		dwc2_unset_dedicated_fifo(dev, cfg, &dxepctl);
-	}
+	/* Enable PMU interrupt */
+	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUINTSEL);
+	k_busy_wait(1);
 
-	sys_write32(dxepctl, dxepctl_reg);
-	dwc2_set_epint(dev, cfg, false);
+	/* Unmask PMU interrupt bits */
+	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_LINESTAGECHANGEMSK |
+				 USB_DWC2_GPWRDN_RESETDETMSK |
+				 USB_DWC2_GPWRDN_DISCONNECTDETECTMSK |
+				 USB_DWC2_GPWRDN_STSCHNGINTMSK);
+	k_busy_wait(1);
 
-	if (cfg->addr == USB_CONTROL_EP_OUT) {
-		struct net_buf *buf = udc_buf_get_all(dev, cfg->addr);
+	/* Enable power clamps */
+	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNCLMP);
+	k_busy_wait(1);
 
-		/* Release the buffer allocated in dwc2_ctrl_feed_dout() */
-		if (buf) {
-			net_buf_unref(buf);
-		}
-	}
+	/* Switch off power to the controller */
+	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNSWTCH);
 
-	return 0;
+	/* Mark that the core is hibernated */
+	priv->hibernated = 1;
+	LOG_DBG("Hibernated");
 }
 
-static int udc_dwc2_ep_set_halt(const struct device *dev,
-				struct udc_ep_config *const cfg)
+static void dwc2_exit_hibernation(const struct device *dev)
 {
-	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
-
-	udc_dwc2_ep_disable(dev, cfg, true);
-
-	LOG_DBG("Set halt ep 0x%02x", cfg->addr);
-	if (ep_idx != 0) {
-		cfg->stat.halted = true;
-	}
-
-	return 0;
-}
+	const struct udc_dwc2_config *const config = dev->config;
+	struct usb_dwc2_reg *const base = config->base;
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	mem_addr_t gpwrdn_reg = (mem_addr_t)&base->gpwrdn;
+	mem_addr_t pcgcctl_reg = (mem_addr_t)&base->pcgcctl;
 
-static int udc_dwc2_ep_clear_halt(const struct device *dev,
-				  struct udc_ep_config *const cfg)
-{
-	mem_addr_t dxepctl_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
-	uint32_t dxepctl;
-	struct dwc2_drv_event evt = {
-		.ep = cfg->addr,
-		.type = DWC2_DRV_EVT_XFER,
-	};
+	/* Switch on power to the controller */
+	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNSWTCH);
+	k_busy_wait(1);
 
-	dxepctl = sys_read32(dxepctl_reg);
-	dxepctl &= ~USB_DWC2_DEPCTL_STALL;
-	dxepctl |= USB_DWC2_DEPCTL_SETD0PID;
-	sys_write32(dxepctl, dxepctl_reg);
+	/* Reset the controller */
+	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNRST_N);
+	k_busy_wait(1);
 
-	LOG_DBG("Clear halt ep 0x%02x", cfg->addr);
-	cfg->stat.halted = false;
+	/* Enable restore from PMU */
+	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_RESTORE);
+	k_busy_wait(1);
 
-	/* Resume queued transfers if any */
-	if (udc_buf_peek(dev, cfg->addr)) {
-		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
-	}
+	/* Disable power clamps */
+	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNCLMP);
 
-	return 0;
-}
+	/* Remove reset to the controller */
+	sys_set_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PWRDNRST_N);
+	k_busy_wait(1);
 
-static int udc_dwc2_ep_enqueue(const struct device *dev,
-			       struct udc_ep_config *const cfg,
-			       struct net_buf *const buf)
-{
-	struct dwc2_drv_event evt = {
-		.ep = cfg->addr,
-		.type = DWC2_DRV_EVT_XFER,
-	};
+	/* Disable PMU interrupt */
+	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUINTSEL);
 
-	LOG_DBG("%p enqueue %x %p", dev, cfg->addr, buf);
-	udc_buf_put(cfg, buf);
+	dwc2_restore_essential_registers(dev);
 
-	if (!cfg->stat.halted) {
-		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
-	}
+	/* Wait for Restore Done Interrupt */
+	dwc2_wait_for_bit(dev, (mem_addr_t)&base->gintsts, USB_DWC2_GINTSTS_RSTRDONEINT);
+	sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
 
-	return 0;
-}
+	/* Disable restore from PMU */
+	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_RESTORE);
+	k_busy_wait(1);
 
-static int udc_dwc2_ep_dequeue(const struct device *dev,
-			       struct udc_ep_config *const cfg)
-{
-	struct net_buf *buf;
+	/* Clear reset to power down module */
+	sys_clear_bits(pcgcctl_reg, USB_DWC2_PCGCCTL_RSTPDWNMODULE);
 
-	udc_dwc2_ep_disable(dev, cfg, false);
+	/* Restore GUSBCFG, DCFG and DCTL */
+	sys_write32(priv->backup.gusbcfg, (mem_addr_t)&base->gusbcfg);
+	sys_write32(priv->backup.dcfg, (mem_addr_t)&base->dcfg);
+	sys_write32(priv->backup.dctl, (mem_addr_t)&base->dctl);
 
-	buf = udc_buf_get_all(dev, cfg->addr);
-	if (buf) {
-		udc_submit_ep_event(dev, buf, -ECONNABORTED);
-	}
+	/* Disable PMU */
+	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_PMUACTV);
+	k_busy_wait(5);
 
-	udc_ep_set_busy(dev, cfg->addr, false);
+	sys_set_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_PWRONPRGDONE);
+	k_msleep(1);
+	sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
 
-	LOG_DBG("dequeue ep 0x%02x", cfg->addr);
+	dwc2_restore_device_registers(dev);
 
-	return 0;
+	priv->hibernated = 0;
+	LOG_DBG("Hibernation exit complete");
 }
 
-static int udc_dwc2_set_address(const struct device *dev, const uint8_t addr)
+static void udc_dwc2_isr_handler(const struct device *dev)
 {
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	mem_addr_t dcfg_reg = (mem_addr_t)&base->dcfg;
-	uint32_t dcfg;
+	const struct udc_dwc2_config *const config = dev->config;
+	struct usb_dwc2_reg *const base = config->base;
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	mem_addr_t gintsts_reg = (mem_addr_t)&base->gintsts;
+	uint32_t int_status;
+	uint32_t gintmsk;
 
-	if (addr > (USB_DWC2_DCFG_DEVADDR_MASK >> USB_DWC2_DCFG_DEVADDR_POS)) {
-		return -EINVAL;
-	}
+	if (priv->hibernated) {
+		uint32_t gpwrdn = sys_read32((mem_addr_t)&base->gpwrdn);
+		bool reset, resume = false;
+		enum dwc2_hibernation_exit_reason exit_reason;
 
-	dcfg = sys_read32(dcfg_reg);
-	dcfg &= ~USB_DWC2_DCFG_DEVADDR_MASK;
-	dcfg |= usb_dwc2_set_dcfg_devaddr(addr);
-	sys_write32(dcfg, dcfg_reg);
-	LOG_DBG("Set new address %u for %p", addr, dev);
+		/* Clear interrupts */
+		sys_write32(gpwrdn, (mem_addr_t)&base->gpwrdn);
 
-	return 0;
-}
+		if (gpwrdn & USB_DWC2_GPWRDN_LNSTSCHNG) {
+			resume = usb_dwc2_get_gpwrdn_linestate(gpwrdn) ==
+				 USB_DWC2_GPWRDN_LINESTATE_DM1DP0;
+			exit_reason = DWC2_HIBERNATION_EXIT_HOST_WAKEUP;
+		}
 
-static int udc_dwc2_test_mode(const struct device *dev,
-			      const uint8_t mode, const bool dryrun)
-{
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	mem_addr_t dctl_reg = (mem_addr_t)&base->dctl;
-	uint32_t dctl;
+		reset = gpwrdn & USB_DWC2_GPWRDN_RESETDETECTED;
+		if (reset) {
+			exit_reason = DWC2_HIBERNATION_EXIT_BUS_RESET;
+		}
 
-	if (mode == 0U || mode > USB_DWC2_DCTL_TSTCTL_TESTFE) {
-		return -EINVAL;
-	}
+		if (reset || resume) {
+			struct dwc2_drv_event evt = {
+				.dev = dev,
+				.type = DWC2_DRV_EVT_HIBERNATION_EXIT,
+				.exit_reason = exit_reason,
+			};
 
-	dctl = sys_read32(dctl_reg);
-	if (usb_dwc2_get_dctl_tstctl(dctl) != USB_DWC2_DCTL_TSTCTL_DISABLED) {
-		return -EALREADY;
-	}
+			k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+		}
 
-	if (dryrun) {
-		LOG_DBG("Test Mode %u supported", mode);
-		return 0;
+		(void)dwc2_quirk_irq_clear(dev);
+		return;
 	}
 
-	dctl |= usb_dwc2_set_dctl_tstctl(mode);
-	sys_write32(dctl, dctl_reg);
-	LOG_DBG("Enable Test Mode %u", mode);
+	gintmsk = sys_read32((mem_addr_t)&base->gintmsk);
 
-	return 0;
-}
+	/*  Read and handle interrupt status register */
+	while ((int_status = sys_read32(gintsts_reg) & gintmsk)) {
 
-static int udc_dwc2_host_wakeup(const struct device *dev)
-{
-	LOG_DBG("Remote wakeup from %p", dev);
+		LOG_DBG("GINTSTS 0x%x", int_status);
 
-	return -ENOTSUP;
-}
+		if (int_status & USB_DWC2_GINTSTS_SOF) {
+			uint32_t dsts;
 
-/* Return actual USB device speed */
-static enum udc_bus_speed udc_dwc2_device_speed(const struct device *dev)
-{
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
+			/* Clear USB SOF interrupt. */
+			sys_write32(USB_DWC2_GINTSTS_SOF, gintsts_reg);
 
-	switch (priv->enumspd) {
-	case USB_DWC2_DSTS_ENUMSPD_HS3060:
-		return UDC_BUS_SPEED_HS;
-	case USB_DWC2_DSTS_ENUMSPD_LS6:
-		__ASSERT(false, "Low speed mode not supported");
-		__fallthrough;
-	case USB_DWC2_DSTS_ENUMSPD_FS48:
-		__fallthrough;
-	case USB_DWC2_DSTS_ENUMSPD_FS3060:
-		__fallthrough;
-	default:
-		return UDC_BUS_SPEED_FS;
-	}
-}
+			dsts = sys_read32((mem_addr_t)&base->dsts);
+			priv->sof_num = usb_dwc2_get_dsts_soffn(dsts);
+			udc_submit_event(dev, UDC_EVT_SOF, 0);
+		}
 
-static int dwc2_core_soft_reset(const struct device *dev)
-{
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	mem_addr_t grstctl_reg = (mem_addr_t)&base->grstctl;
-	const unsigned int csr_timeout_us = 10000UL;
-	uint32_t cnt = 0UL;
+		if (int_status & USB_DWC2_GINTSTS_USBRST) {
+			/* Clear and handle USB Reset interrupt. */
+			sys_write32(USB_DWC2_GINTSTS_USBRST, gintsts_reg);
+			dwc2_on_bus_reset(dev);
+			LOG_DBG("USB Reset interrupt");
+		}
 
-	/* Check AHB master idle state */
-	while (!(sys_read32(grstctl_reg) & USB_DWC2_GRSTCTL_AHBIDLE)) {
-		k_busy_wait(1);
+		if (int_status & USB_DWC2_GINTSTS_ENUMDONE) {
+			/* Clear and handle Enumeration Done interrupt. */
+			sys_write32(USB_DWC2_GINTSTS_ENUMDONE, gintsts_reg);
+			dwc2_handle_enumdone(dev);
+			udc_submit_event(dev, UDC_EVT_RESET, 0);
+		}
 
-		if (++cnt > csr_timeout_us) {
-			LOG_ERR("Wait for AHB idle timeout, GRSTCTL 0x%08x",
-				sys_read32(grstctl_reg));
-			return -EIO;
+		if (int_status & USB_DWC2_GINTSTS_WKUPINT) {
+			/* Clear Resume/Remote Wakeup Detected interrupt. */
+			sys_write32(USB_DWC2_GINTSTS_WKUPINT, gintsts_reg);
+			udc_set_suspended(dev, false);
+			udc_submit_event(dev, UDC_EVT_RESUME, 0);
 		}
-	}
 
-	/* Apply Core Soft Reset */
-	sys_write32(USB_DWC2_GRSTCTL_CSFTRST, grstctl_reg);
+		if (int_status & USB_DWC2_GINTSTS_IEPINT) {
+			/* Handle IN Endpoints interrupt */
+			dwc2_handle_iepint(dev);
+		}
 
-	cnt = 0UL;
-	do {
-		if (++cnt > csr_timeout_us) {
-			LOG_ERR("Wait for CSR done timeout, GRSTCTL 0x%08x",
-				sys_read32(grstctl_reg));
-			return -EIO;
+		if (int_status & USB_DWC2_GINTSTS_RXFLVL) {
+			/* Handle RxFIFO Non-Empty interrupt */
+			dwc2_handle_rxflvl(dev);
 		}
 
-		k_busy_wait(1);
-	} while (sys_read32(grstctl_reg) & USB_DWC2_GRSTCTL_CSFTRST &&
-		 !(sys_read32(grstctl_reg) & USB_DWC2_GRSTCTL_CSFTRSTDONE));
+		if (int_status & USB_DWC2_GINTSTS_OEPINT) {
+			/* Handle OUT Endpoints interrupt */
+			dwc2_handle_oepint(dev);
+		}
 
-	sys_clear_bits(grstctl_reg, USB_DWC2_GRSTCTL_CSFTRST | USB_DWC2_GRSTCTL_CSFTRSTDONE);
+		if (int_status & USB_DWC2_GINTSTS_INCOMPISOIN) {
+			dwc2_handle_incompisoin(dev);
+		}
 
-	return 0;
-}
+		if (int_status & USB_DWC2_GINTSTS_INCOMPISOOUT) {
+			dwc2_handle_incompisoout(dev);
+		}
 
-static int udc_dwc2_init_controller(const struct device *dev)
-{
-	const struct udc_dwc2_config *const config = dev->config;
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	struct usb_dwc2_reg *const base = config->base;
-	mem_addr_t grxfsiz_reg = (mem_addr_t)&base->grxfsiz;
-	mem_addr_t gahbcfg_reg = (mem_addr_t)&base->gahbcfg;
-	mem_addr_t gusbcfg_reg = (mem_addr_t)&base->gusbcfg;
-	mem_addr_t dcfg_reg = (mem_addr_t)&base->dcfg;
-	uint32_t dcfg;
-	uint32_t gusbcfg;
-	uint32_t gahbcfg;
-	uint32_t ghwcfg2;
-	uint32_t ghwcfg3;
-	uint32_t ghwcfg4;
-	uint32_t val;
-	int ret;
-	bool hs_phy;
+		if (int_status & USB_DWC2_GINTSTS_USBSUSP) {
+			if (!priv->enumdone) {
+				/* Clear stale suspend interrupt */
+				sys_write32(USB_DWC2_GINTSTS_USBSUSP, gintsts_reg);
+				continue;
+			}
 
-	ret = dwc2_core_soft_reset(dev);
-	if (ret) {
-		return ret;
-	}
+			/* Notify the stack */
+			udc_set_suspended(dev, true);
+			udc_submit_event(dev, UDC_EVT_SUSPEND, 0);
 
-	priv->ghwcfg1 = sys_read32((mem_addr_t)&base->ghwcfg1);
-	ghwcfg2 = sys_read32((mem_addr_t)&base->ghwcfg2);
-	ghwcfg3 = sys_read32((mem_addr_t)&base->ghwcfg3);
-	ghwcfg4 = sys_read32((mem_addr_t)&base->ghwcfg4);
+			if (priv->suspend_type == DWC2_SUSPEND_HIBERNATION) {
+				dwc2_enter_hibernation(dev);
+				/* Next interrupt will be from PMU */
+				break;
+			}
 
-	if (!(ghwcfg4 & USB_DWC2_GHWCFG4_DEDFIFOMODE)) {
-		LOG_ERR("Only dedicated TX FIFO mode is supported");
-		return -ENOTSUP;
+			/* Clear USB Suspend interrupt. */
+			sys_write32(USB_DWC2_GINTSTS_USBSUSP, gintsts_reg);
+		}
 	}
 
-	/*
-	 * Force device mode as we do no support role changes.
-	 * Wait 25ms for the change to take effect.
-	 */
-	gusbcfg = USB_DWC2_GUSBCFG_FORCEDEVMODE;
-	sys_write32(gusbcfg, gusbcfg_reg);
-	k_msleep(25);
+	(void)dwc2_quirk_irq_clear(dev);
+}
 
-	/* Buffer DMA is always supported in Internal DMA mode.
-	 * TODO: check and support descriptor DMA if available
-	 */
-	priv->bufferdma = (usb_dwc2_get_ghwcfg2_otgarch(ghwcfg2) ==
-			   USB_DWC2_GHWCFG2_OTGARCH_INTERNALDMA);
+static void dwc2_unset_unused_fifo(const struct device *dev)
+{
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	struct udc_ep_config *tmp;
 
-	if (!IS_ENABLED(CONFIG_UDC_DWC2_DMA)) {
-		priv->bufferdma = 0;
-	} else if (priv->bufferdma) {
-		LOG_WRN("Experimental DMA enabled");
-	}
+	for (uint8_t i = priv->ineps - 1U; i > 0; i--) {
+		tmp = udc_get_ep_cfg(dev, i | USB_EP_DIR_IN);
 
-	if (ghwcfg2 & USB_DWC2_GHWCFG2_DYNFIFOSIZING) {
-		LOG_DBG("Dynamic FIFO Sizing is enabled");
-		priv->dynfifosizing = true;
+		if (tmp->stat.enabled && (priv->txf_set & BIT(i))) {
+			return;
+		}
+
+		if (!tmp->stat.enabled && (priv->txf_set & BIT(i))) {
+			priv->txf_set &= ~BIT(i);
+		}
 	}
+}
 
-	if (IS_ENABLED(CONFIG_UDC_DWC2_HIBERNATION) &&
-	    ghwcfg4 & USB_DWC2_GHWCFG4_HIBERNATION) {
-		LOG_INF("Hibernation enabled");
-		priv->suspend_type = DWC2_SUSPEND_HIBERNATION;
+/*
+ * In dedicated FIFO mode there are i (i = 1 ... ineps - 1) FIFO size registers,
+ * e.g. DIEPTXF1, DIEPTXF2, ... DIEPTXF4. When dynfifosizing is enabled,
+ * the size register is mutable. The offset of DIEPTXF1 registers is 0.
+ */
+static int dwc2_set_dedicated_fifo(const struct device *dev,
+				   struct udc_ep_config *const cfg,
+				   uint32_t *const diepctl)
+{
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
+	const uint32_t addnl = USB_MPS_ADDITIONAL_TRANSACTIONS(cfg->mps);
+	uint32_t reqdep;
+	uint32_t txfaddr;
+	uint32_t txfdep;
+	uint32_t tmp;
+
+	/* Keep everything but FIFO number */
+	tmp = *diepctl & ~USB_DWC2_DEPCTL_TXFNUM_MASK;
+
+	reqdep = DIV_ROUND_UP(udc_mps_ep_size(cfg), 4U);
+	if (priv->bufferdma) {
+		/* In DMA mode, TxFIFO capable of holding 2 packets is enough */
+		reqdep *= MIN(2, (1 + addnl));
 	} else {
-		priv->suspend_type = DWC2_SUSPEND_NO_POWER_SAVING;
+		reqdep *= (1 + addnl);
 	}
 
-	/* Get the number or endpoints and IN endpoints we can use later */
-	priv->numdeveps = usb_dwc2_get_ghwcfg2_numdeveps(ghwcfg2) + 1U;
-	priv->ineps = usb_dwc2_get_ghwcfg4_ineps(ghwcfg4) + 1U;
-	LOG_DBG("Number of endpoints (NUMDEVEPS + 1) %u", priv->numdeveps);
-	LOG_DBG("Number of IN endpoints (INEPS + 1) %u", priv->ineps);
+	if (priv->dynfifosizing) {
+		if (priv->txf_set & ~BIT_MASK(ep_idx)) {
+			dwc2_unset_unused_fifo(dev);
+		}
 
-	LOG_DBG("Number of periodic IN endpoints (NUMDEVPERIOEPS) %u",
-		usb_dwc2_get_ghwcfg4_numdevperioeps(ghwcfg4));
-	LOG_DBG("Number of additional control endpoints (NUMCTLEPS) %u",
-		usb_dwc2_get_ghwcfg4_numctleps(ghwcfg4));
+		if (priv->txf_set & ~BIT_MASK(ep_idx)) {
+			LOG_WRN("Some of the FIFOs higher than %u are set, %lx",
+				ep_idx, priv->txf_set & ~BIT_MASK(ep_idx));
+			return -EIO;
+		}
 
-	LOG_DBG("OTG architecture (OTGARCH) %u, mode (OTGMODE) %u",
-		usb_dwc2_get_ghwcfg2_otgarch(ghwcfg2),
-		usb_dwc2_get_ghwcfg2_otgmode(ghwcfg2));
+		if ((ep_idx - 1) != 0U) {
+			txfaddr = dwc2_get_txfdep(dev, ep_idx - 2) +
+				  dwc2_get_txfaddr(dev, ep_idx - 2);
+		} else {
+			txfaddr = priv->rxfifo_depth +
+				MAX(UDC_DWC2_FIFO0_DEPTH, priv->max_txfifo_depth[0]);
+		}
 
-	priv->dfifodepth = usb_dwc2_get_ghwcfg3_dfifodepth(ghwcfg3);
-	LOG_DBG("DFIFO depth (DFIFODEPTH) %u bytes", priv->dfifodepth * 4);
+		/* Make sure to not set TxFIFO greater than hardware allows */
+		txfdep = reqdep;
+		if (txfdep > priv->max_txfifo_depth[ep_idx]) {
+			return -ENOMEM;
+		}
 
-	priv->max_pktcnt = GHWCFG3_PKTCOUNT(usb_dwc2_get_ghwcfg3_pktsizewidth(ghwcfg3));
-	priv->max_xfersize = GHWCFG3_XFERSIZE(usb_dwc2_get_ghwcfg3_xfersizewidth(ghwcfg3));
-	LOG_DBG("Max packet count %u, Max transfer size %u",
-		priv->max_pktcnt, priv->max_xfersize);
+		/* Do not allocate TxFIFO outside the SPRAM */
+		if (txfaddr + txfdep > priv->dfifodepth) {
+			return -ENOMEM;
+		}
 
-	LOG_DBG("Vendor Control interface support enabled: %s",
-		(ghwcfg3 & USB_DWC2_GHWCFG3_VNDCTLSUPT) ? "true" : "false");
+		/* Set FIFO depth (32-bit words) and address */
+		dwc2_set_txf(dev, ep_idx - 1, txfdep, txfaddr);
+	} else {
+		txfdep = dwc2_get_txfdep(dev, ep_idx - 1);
+		txfaddr = dwc2_get_txfaddr(dev, ep_idx - 1);
 
-	LOG_DBG("PHY interface type: FSPHYTYPE %u, HSPHYTYPE %u, DATAWIDTH %u",
-		usb_dwc2_get_ghwcfg2_fsphytype(ghwcfg2),
-		usb_dwc2_get_ghwcfg2_hsphytype(ghwcfg2),
-		usb_dwc2_get_ghwcfg4_phydatawidth(ghwcfg4));
+		if (reqdep > txfdep) {
+			return -ENOMEM;
+		}
 
-	LOG_DBG("LPM mode is %s",
-		(ghwcfg3 & USB_DWC2_GHWCFG3_LPMMODE) ? "enabled" : "disabled");
+		LOG_DBG("Reuse FIFO%u addr 0x%08x depth %u", ep_idx, txfaddr, txfdep);
+	}
 
-	/* Configure AHB, select Completer or DMA mode */
-	gahbcfg = sys_read32(gahbcfg_reg);
+	/* Assign FIFO to the IN endpoint */
+	*diepctl = tmp | usb_dwc2_set_depctl_txfnum(ep_idx);
+	priv->txf_set |= BIT(ep_idx);
+	dwc2_flush_tx_fifo(dev, ep_idx);
 
-	if (priv->bufferdma) {
-		gahbcfg |= USB_DWC2_GAHBCFG_DMAEN;
-	} else {
-		gahbcfg &= ~USB_DWC2_GAHBCFG_DMAEN;
-	}
+	LOG_INF("Set FIFO%u (ep 0x%02x) addr 0x%04x depth %u size %u",
+		ep_idx, cfg->addr, txfaddr, txfdep, dwc2_ftx_avail(dev, ep_idx));
 
-	sys_write32(gahbcfg, gahbcfg_reg);
+	return 0;
+}
 
-	dcfg = sys_read32(dcfg_reg);
+static int dwc2_ep_control_enable(const struct device *dev,
+				  struct udc_ep_config *const cfg)
+{
+	mem_addr_t dxepctl0_reg;
+	uint32_t dxepctl0;
 
-	dcfg &= ~USB_DWC2_DCFG_DESCDMA;
+	dxepctl0_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
+	dxepctl0 = sys_read32(dxepctl0_reg);
 
-	/* Configure PHY and device speed */
-	dcfg &= ~USB_DWC2_DCFG_DEVSPD_MASK;
-	switch (usb_dwc2_get_ghwcfg2_hsphytype(ghwcfg2)) {
-	case USB_DWC2_GHWCFG2_HSPHYTYPE_UTMIPLUSULPI:
-		__fallthrough;
-	case USB_DWC2_GHWCFG2_HSPHYTYPE_ULPI:
-		gusbcfg |= USB_DWC2_GUSBCFG_PHYSEL_USB20 |
-			   USB_DWC2_GUSBCFG_ULPI_UTMI_SEL_ULPI;
-		dcfg |= USB_DWC2_DCFG_DEVSPD_USBHS20
-			<< USB_DWC2_DCFG_DEVSPD_POS;
-		hs_phy = true;
+	dxepctl0 &= ~USB_DWC2_DEPCTL0_MPS_MASK;
+	switch (cfg->mps) {
+	case 8:
+		dxepctl0 |= USB_DWC2_DEPCTL0_MPS_8 << USB_DWC2_DEPCTL_MPS_POS;
 		break;
-	case USB_DWC2_GHWCFG2_HSPHYTYPE_UTMIPLUS:
-		gusbcfg |= USB_DWC2_GUSBCFG_PHYSEL_USB20 |
-			   USB_DWC2_GUSBCFG_ULPI_UTMI_SEL_UTMI;
-		dcfg |= USB_DWC2_DCFG_DEVSPD_USBHS20
-			<< USB_DWC2_DCFG_DEVSPD_POS;
-		hs_phy = true;
+	case 16:
+		dxepctl0 |= USB_DWC2_DEPCTL0_MPS_16 << USB_DWC2_DEPCTL_MPS_POS;
+		break;
+	case 32:
+		dxepctl0 |= USB_DWC2_DEPCTL0_MPS_32 << USB_DWC2_DEPCTL_MPS_POS;
+		break;
+	case 64:
+		dxepctl0 |= USB_DWC2_DEPCTL0_MPS_64 << USB_DWC2_DEPCTL_MPS_POS;
 		break;
-	case USB_DWC2_GHWCFG2_HSPHYTYPE_NO_HS:
-		__fallthrough;
 	default:
-		if (usb_dwc2_get_ghwcfg2_fsphytype(ghwcfg2) !=
-		    USB_DWC2_GHWCFG2_FSPHYTYPE_NO_FS) {
-			gusbcfg |= USB_DWC2_GUSBCFG_PHYSEL_USB11;
-		}
-
-		dcfg |= USB_DWC2_DCFG_DEVSPD_USBFS1148
-			<< USB_DWC2_DCFG_DEVSPD_POS;
-		hs_phy = false;
+		return -EINVAL;
 	}
 
-	if (usb_dwc2_get_ghwcfg4_phydatawidth(ghwcfg4)) {
-		gusbcfg |= USB_DWC2_GUSBCFG_PHYIF_16_BIT;
-	}
+	dxepctl0 |= USB_DWC2_DEPCTL_USBACTEP;
 
-	/* Update PHY configuration */
-	sys_write32(gusbcfg, gusbcfg_reg);
-	sys_write32(dcfg, dcfg_reg);
+	if (cfg->addr == USB_CONTROL_EP_OUT) {
+		int ret;
 
-	priv->outeps = 0U;
-	for (uint8_t i = 0U; i < priv->numdeveps; i++) {
-		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
-
-		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT ||
-		    epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			mem_addr_t doepctl_reg = dwc2_get_dxepctl_reg(dev, i);
-
-			sys_write32(USB_DWC2_DEPCTL_SNAK, doepctl_reg);
-			priv->outeps++;
+		dwc2_flush_rx_fifo(dev);
+		ret = dwc2_ctrl_feed_dout(dev, 8);
+		if (ret) {
+			return ret;
 		}
+	} else {
+		dwc2_flush_tx_fifo(dev, 0);
 	}
 
-	LOG_DBG("Number of OUT endpoints %u", priv->outeps);
-
-	/* Read and store all TxFIFO depths because Programmed FIFO Depths must
-	 * not exceed the power-on values.
-	 */
-	val = sys_read32((mem_addr_t)&base->gnptxfsiz);
-	priv->max_txfifo_depth[0] = usb_dwc2_get_gnptxfsiz_nptxfdep(val);
-	for (uint8_t i = 1; i < priv->ineps; i++) {
-		priv->max_txfifo_depth[i] = dwc2_get_txfdep(dev, i - 1);
-	}
-
-	priv->rxfifo_depth = usb_dwc2_get_grxfsiz(sys_read32(grxfsiz_reg));
-
-	if (priv->dynfifosizing) {
-		uint32_t gnptxfsiz;
-		uint32_t default_depth;
-
-		/* TODO: For proper runtime FIFO sizing UDC driver would have to
-		 * have prior knowledge of the USB configurations. Only with the
-		 * prior knowledge, the driver will be able to fairly distribute
-		 * available resources. For the time being just use different
-		 * defaults based on maximum configured PHY speed, but this has
-		 * to be revised if e.g. thresholding support would be necessary
-		 * on some target.
-		 */
-		if (hs_phy) {
-			default_depth = UDC_DWC2_GRXFSIZ_HS_DEFAULT;
-		} else {
-			default_depth = UDC_DWC2_GRXFSIZ_FS_DEFAULT;
-		}
-		default_depth += priv->outeps * 2U;
+	sys_write32(dxepctl0, dxepctl0_reg);
+	dwc2_set_epint(dev, cfg, true);
 
-		/* Driver does not dynamically resize RxFIFO so there is no need
-		 * to store reset value. Read the reset value and make sure that
-		 * the programmed value is not greater than what driver sets.
-		 */
-		priv->rxfifo_depth = MIN(priv->rxfifo_depth, default_depth);
-		sys_write32(usb_dwc2_set_grxfsiz(priv->rxfifo_depth), grxfsiz_reg);
+	return 0;
+}
 
-		/* Set TxFIFO 0 depth */
-		val = MAX(UDC_DWC2_FIFO0_DEPTH, priv->max_txfifo_depth[0]);
-		gnptxfsiz = usb_dwc2_set_gnptxfsiz_nptxfdep(val) |
-			    usb_dwc2_set_gnptxfsiz_nptxfstaddr(priv->rxfifo_depth);
+static int udc_dwc2_ep_activate(const struct device *dev,
+				struct udc_ep_config *const cfg)
+{
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
+	mem_addr_t dxepctl_reg;
+	uint32_t dxepctl;
 
-		sys_write32(gnptxfsiz, (mem_addr_t)&base->gnptxfsiz);
-	}
+	LOG_DBG("Enable ep 0x%02x", cfg->addr);
 
-	LOG_DBG("RX FIFO size %u bytes", priv->rxfifo_depth * 4);
-	for (uint8_t i = 1U; i < priv->ineps; i++) {
-		LOG_DBG("TX FIFO%u depth %u addr %u",
-			i, priv->max_txfifo_depth[i], dwc2_get_txfaddr(dev, i));
+	if (ep_idx == 0U) {
+		return dwc2_ep_control_enable(dev, cfg);
 	}
 
-	if (udc_ep_enable_internal(dev, USB_CONTROL_EP_OUT,
-				   USB_EP_TYPE_CONTROL, 64, 0)) {
-		LOG_ERR("Failed to enable control endpoint");
-		return -EIO;
-	}
+	if (USB_EP_DIR_IS_OUT(cfg->addr)) {
+		/* TODO: use dwc2_get_dxepctl_reg() */
+		dxepctl_reg = (mem_addr_t)&base->out_ep[ep_idx].doepctl;
+	} else {
+		if (priv->ineps > 0U && ep_idx > (priv->ineps - 1U)) {
+			LOG_ERR("No resources available for ep 0x%02x", cfg->addr);
+			return -EINVAL;
+		}
 
-	if (udc_ep_enable_internal(dev, USB_CONTROL_EP_IN,
-				   USB_EP_TYPE_CONTROL, 64, 0)) {
-		LOG_ERR("Failed to enable control endpoint");
-		return -EIO;
+		dxepctl_reg = (mem_addr_t)&base->in_ep[ep_idx].diepctl;
 	}
 
-	/* Unmask interrupts */
-	sys_write32(USB_DWC2_GINTSTS_OEPINT | USB_DWC2_GINTSTS_IEPINT |
-		    USB_DWC2_GINTSTS_ENUMDONE | USB_DWC2_GINTSTS_USBRST |
-		    USB_DWC2_GINTSTS_WKUPINT | USB_DWC2_GINTSTS_USBSUSP |
-		    USB_DWC2_GINTSTS_INCOMPISOOUT | USB_DWC2_GINTSTS_INCOMPISOIN |
-		    USB_DWC2_GINTSTS_SOF,
-		    (mem_addr_t)&base->gintmsk);
-
-	return 0;
-}
+	dxepctl = sys_read32(dxepctl_reg);
+	/* Set max packet size */
+	dxepctl &= ~USB_DWC2_DEPCTL_MPS_MASK;
+	dxepctl |= usb_dwc2_set_depctl_mps(udc_mps_ep_size(cfg));
 
-static int udc_dwc2_enable(const struct device *dev)
-{
-	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	int err;
+	/* Set endpoint type */
+	dxepctl &= ~USB_DWC2_DEPCTL_EPTYPE_MASK;
 
-	err = dwc2_quirk_pre_enable(dev);
-	if (err) {
-		LOG_ERR("Quirk pre enable failed %d", err);
-		return err;
+	switch (cfg->attributes & USB_EP_TRANSFER_TYPE_MASK) {
+	case USB_EP_TYPE_BULK:
+		dxepctl |= USB_DWC2_DEPCTL_EPTYPE_BULK <<
+			   USB_DWC2_DEPCTL_EPTYPE_POS;
+		dxepctl |= USB_DWC2_DEPCTL_SETD0PID;
+		break;
+	case USB_EP_TYPE_INTERRUPT:
+		dxepctl |= USB_DWC2_DEPCTL_EPTYPE_INTERRUPT <<
+			   USB_DWC2_DEPCTL_EPTYPE_POS;
+		dxepctl |= USB_DWC2_DEPCTL_SETD0PID;
+		break;
+	case USB_EP_TYPE_ISO:
+		dxepctl |= USB_DWC2_DEPCTL_EPTYPE_ISO <<
+			   USB_DWC2_DEPCTL_EPTYPE_POS;
+		break;
+	default:
+		return -EINVAL;
 	}
 
-	err = udc_dwc2_init_controller(dev);
-	if (err) {
-		return err;
-	}
+	if (USB_EP_DIR_IS_IN(cfg->addr) && udc_mps_ep_size(cfg) != 0U) {
+		int ret = dwc2_set_dedicated_fifo(dev, cfg, &dxepctl);
 
-	err = dwc2_quirk_post_enable(dev);
-	if (err) {
-		LOG_ERR("Quirk post enable failed %d", err);
-		return err;
+		if (ret) {
+			return ret;
+		}
 	}
 
-	/* Enable global interrupt */
-	sys_set_bits((mem_addr_t)&base->gahbcfg, USB_DWC2_GAHBCFG_GLBINTRMASK);
-	config->irq_enable_func(dev);
+	dxepctl |= USB_DWC2_DEPCTL_USBACTEP;
 
-	/* Disable soft disconnect */
-	sys_clear_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_SFTDISCON);
-	LOG_DBG("Enable device %p", base);
+	/* Enable endpoint interrupts */
+	dwc2_set_epint(dev, cfg, true);
+	sys_write32(dxepctl, dxepctl_reg);
+
+	for (uint8_t i = 1U; i < priv->ineps; i++) {
+		LOG_DBG("DIEPTXF%u %08x DIEPCTL%u %08x",
+			i, sys_read32((mem_addr_t)&base->dieptxf[i - 1U]), i, dxepctl);
+	}
 
 	return 0;
 }
 
-static int udc_dwc2_disable(const struct device *dev)
+static int dwc2_unset_dedicated_fifo(const struct device *dev,
+				     struct udc_ep_config *const cfg,
+				     uint32_t *const diepctl)
 {
-	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	mem_addr_t dctl_reg = (mem_addr_t)&base->dctl;
-	int err;
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
 
-	/* Enable soft disconnect */
-	sys_set_bits(dctl_reg, USB_DWC2_DCTL_SFTDISCON);
-	LOG_DBG("Disable device %p", dev);
+	/* Clear FIFO number field */
+	*diepctl &= ~USB_DWC2_DEPCTL_TXFNUM_MASK;
 
-	if (udc_ep_disable_internal(dev, USB_CONTROL_EP_OUT)) {
-		LOG_DBG("Failed to disable control endpoint");
-		return -EIO;
-	}
+	if (priv->dynfifosizing) {
+		if (priv->txf_set & ~BIT_MASK(ep_idx)) {
+			LOG_WRN("Some of the FIFOs higher than %u are set, %lx",
+				ep_idx, priv->txf_set & ~BIT_MASK(ep_idx));
+			return 0;
+		}
 
-	if (udc_ep_disable_internal(dev, USB_CONTROL_EP_IN)) {
-		LOG_DBG("Failed to disable control endpoint");
-		return -EIO;
+		dwc2_set_txf(dev, ep_idx - 1, 0, 0);
 	}
 
-	config->irq_disable_func(dev);
-	sys_clear_bits((mem_addr_t)&base->gahbcfg, USB_DWC2_GAHBCFG_GLBINTRMASK);
-
-	err = dwc2_quirk_disable(dev);
-	if (err) {
-		LOG_ERR("Quirk disable failed %d", err);
-		return err;
-	}
+	priv->txf_set &= ~BIT(ep_idx);
 
 	return 0;
 }
 
-static int udc_dwc2_init(const struct device *dev)
+static void dwc2_wait_for_bit(const struct device *dev,
+			      mem_addr_t addr, uint32_t bit)
 {
-	int ret;
+	k_timepoint_t timeout = sys_timepoint_calc(K_MSEC(100));
 
-	ret = dwc2_quirk_init(dev);
-	if (ret) {
-		LOG_ERR("Quirk init failed %d", ret);
-		return ret;
-	}
+	/* This could potentially be converted to use proper synchronization
+	 * primitives instead of busy looping, but the number of interrupt bits
+	 * this function can be waiting for is rather high.
+	 *
+	 * Busy looping is most likely fine unless profiling shows otherwise.
+	 */
+	while (!(sys_read32(addr) & bit)) {
+		if (dwc2_quirk_is_phy_clk_off(dev)) {
+			/* No point in waiting, because the bit can only be set
+			 * when the PHY is actively clocked.
+			 */
+			return;
+		}
 
-	return dwc2_init_pinctrl(dev);
+		if (sys_timepoint_expired(timeout)) {
+			LOG_ERR("Timeout waiting for bit 0x%08X at 0x%08X",
+				bit, (uint32_t)addr);
+			return;
+		}
+	}
 }
 
-static int udc_dwc2_shutdown(const struct device *dev)
+/* Disabled IN endpoint means that device will send NAK (isochronous: ZLP) after
+ * receiving IN token from host even if there is packet available in TxFIFO.
+ * Disabled OUT endpoint means that device will NAK (isochronous: discard data)
+ * incoming OUT data (or HS PING) even if there is space available in RxFIFO.
+ *
+ * Set stall parameter to true if caller wants to send STALL instead of NAK.
+ */
+static void udc_dwc2_ep_disable(const struct device *dev,
+				struct udc_ep_config *const cfg, bool stall)
 {
-	int ret;
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
+	mem_addr_t dxepctl_reg;
+	uint32_t dxepctl;
 
-	ret = dwc2_quirk_shutdown(dev);
-	if (ret) {
-		LOG_ERR("Quirk shutdown failed %d", ret);
-		return ret;
-	}
+	dxepctl_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
+	dxepctl = sys_read32(dxepctl_reg);
 
-	return 0;
-}
+	if (dxepctl & USB_DWC2_DEPCTL_NAKSTS) {
+		/* Endpoint already sends forced NAKs. STALL if necessary. */
+		if (stall) {
+			dxepctl |= USB_DWC2_DEPCTL_STALL;
+			sys_write32(dxepctl, dxepctl_reg);
+		}
 
-static int dwc2_driver_preinit(const struct device *dev)
-{
-	const struct udc_dwc2_config *config = dev->config;
-	struct udc_data *data = dev->data;
-	uint16_t mps = 1023;
-	uint32_t numdeveps;
-	uint32_t ineps;
-	int err;
+		return;
+	}
 
-	k_mutex_init(&data->mutex);
+	if (USB_EP_DIR_IS_OUT(cfg->addr)) {
+		mem_addr_t dctl_reg, gintsts_reg, doepint_reg;
+		uint32_t dctl;
 
-	data->caps.addr_before_status = true;
-	data->caps.mps0 = UDC_MPS0_64;
+		dctl_reg = (mem_addr_t)&base->dctl;
+		gintsts_reg = (mem_addr_t)&base->gintsts;
+		doepint_reg = (mem_addr_t)&base->out_ep[ep_idx].doepint;
 
-	(void)dwc2_quirk_caps(dev);
-	if (data->caps.hs) {
-		mps = 1024;
-	}
+		dctl = sys_read32(dctl_reg);
 
-	/*
-	 * At this point, we cannot or do not want to access the hardware
-	 * registers to get GHWCFGn values. For now, we will use devicetree to
-	 * get GHWCFGn values and use them to determine the number and type of
-	 * configured endpoints in the hardware. This can be considered a
-	 * workaround, and we may change the upper layer internals to avoid it
-	 * in the future.
-	 */
-	ineps = usb_dwc2_get_ghwcfg4_ineps(config->ghwcfg4) + 1U;
-	numdeveps = usb_dwc2_get_ghwcfg2_numdeveps(config->ghwcfg2) + 1U;
-	LOG_DBG("Number of endpoints (NUMDEVEPS + 1) %u", numdeveps);
-	LOG_DBG("Number of IN endpoints (INEPS + 1) %u", ineps);
+		if (sys_read32(gintsts_reg) & USB_DWC2_GINTSTS_GOUTNAKEFF) {
+			LOG_ERR("GOUTNAKEFF already active");
+		} else {
+			dctl |= USB_DWC2_DCTL_SGOUTNAK;
+			sys_write32(dctl, dctl_reg);
+			dctl &= ~USB_DWC2_DCTL_SGOUTNAK;
+		}
 
-	for (uint32_t i = 0, n = 0; i < numdeveps; i++) {
-		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(config->ghwcfg1, i);
+		dwc2_wait_for_bit(dev, gintsts_reg, USB_DWC2_GINTSTS_GOUTNAKEFF);
 
-		if (epdir != USB_DWC2_GHWCFG1_EPDIR_OUT &&
-		    epdir != USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			continue;
+		/* The application cannot disable control OUT endpoint 0. */
+		if (ep_idx != 0) {
+			dxepctl |= USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_EPDIS;
 		}
 
-		if (i == 0) {
-			config->ep_cfg_out[n].caps.control = 1;
-			config->ep_cfg_out[n].caps.mps = 64;
+		if (stall) {
+			/* For OUT endpoints STALL is set instead of SNAK */
+			dxepctl |= USB_DWC2_DEPCTL_STALL;
 		} else {
-			config->ep_cfg_out[n].caps.bulk = 1;
-			config->ep_cfg_out[n].caps.interrupt = 1;
-			config->ep_cfg_out[n].caps.iso = 1;
-			config->ep_cfg_out[n].caps.high_bandwidth = data->caps.hs;
-			config->ep_cfg_out[n].caps.mps = mps;
+			dxepctl |= USB_DWC2_DEPCTL_SNAK;
 		}
+		sys_write32(dxepctl, dxepctl_reg);
 
-		config->ep_cfg_out[n].caps.out = 1;
-		config->ep_cfg_out[n].addr = USB_EP_DIR_OUT | i;
-
-		LOG_DBG("Register ep 0x%02x (%u)", i, n);
-		err = udc_register_ep(dev, &config->ep_cfg_out[n]);
-		if (err != 0) {
-			LOG_ERR("Failed to register endpoint");
-			return err;
+		if (ep_idx != 0) {
+			dwc2_wait_for_bit(dev, doepint_reg, USB_DWC2_DOEPINT_EPDISBLD);
 		}
 
-		n++;
-		/* Also check the number of desired OUT endpoints in devicetree. */
-		if (n >= config->num_out_eps) {
-			break;
-		}
-	}
+		/* Clear Endpoint Disabled interrupt */
+		sys_write32(USB_DWC2_DIEPINT_EPDISBLD, doepint_reg);
 
-	for (uint32_t i = 0, n = 0; i < numdeveps; i++) {
-		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(config->ghwcfg1, i);
+		dctl |= USB_DWC2_DCTL_CGOUTNAK;
+		sys_write32(dctl, dctl_reg);
+	} else {
+		mem_addr_t diepint_reg;
 
-		if (epdir != USB_DWC2_GHWCFG1_EPDIR_IN &&
-		    epdir != USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			continue;
-		}
+		diepint_reg = (mem_addr_t)&base->in_ep[ep_idx].diepint;
 
-		if (i == 0) {
-			config->ep_cfg_in[n].caps.control = 1;
-			config->ep_cfg_in[n].caps.mps = 64;
-		} else {
-			config->ep_cfg_in[n].caps.bulk = 1;
-			config->ep_cfg_in[n].caps.interrupt = 1;
-			config->ep_cfg_in[n].caps.iso = 1;
-			config->ep_cfg_in[n].caps.high_bandwidth = data->caps.hs;
-			config->ep_cfg_in[n].caps.mps = mps;
+		dxepctl |= USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_SNAK;
+		if (stall) {
+			/* For IN endpoints STALL is set in addition to SNAK */
+			dxepctl |= USB_DWC2_DEPCTL_STALL;
 		}
+		sys_write32(dxepctl, dxepctl_reg);
 
-		config->ep_cfg_in[n].caps.in = 1;
-		config->ep_cfg_in[n].addr = USB_EP_DIR_IN | i;
+		dwc2_wait_for_bit(dev, diepint_reg, USB_DWC2_DIEPINT_INEPNAKEFF);
 
-		LOG_DBG("Register ep 0x%02x (%u)", USB_EP_DIR_IN | i, n);
-		err = udc_register_ep(dev, &config->ep_cfg_in[n]);
-		if (err != 0) {
-			LOG_ERR("Failed to register endpoint");
-			return err;
-		}
+		dxepctl |= USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_EPDIS;
+		sys_write32(dxepctl, dxepctl_reg);
 
-		n++;
-		/* Also check the number of desired IN endpoints in devicetree. */
-		if (n >= MIN(ineps, config->num_in_eps)) {
-			break;
-		}
-	}
+		dwc2_wait_for_bit(dev, diepint_reg, USB_DWC2_DIEPINT_EPDISBLD);
 
-	config->make_thread(dev);
+		/* Clear Endpoint Disabled interrupt */
+		sys_write32(USB_DWC2_DIEPINT_EPDISBLD, diepint_reg);
 
-	return 0;
-}
+		/* TODO: Read DIEPTSIZn here? Programming Guide suggest it to
+		 * let application know how many bytes of interrupted transfer
+		 * were transferred to the host.
+		 */
 
-static int udc_dwc2_lock(const struct device *dev)
-{
-	return udc_lock_internal(dev, K_FOREVER);
-}
+		dwc2_flush_tx_fifo(dev, usb_dwc2_get_depctl_txfnum(dxepctl));
+	}
 
-static int udc_dwc2_unlock(const struct device *dev)
-{
-	return udc_unlock_internal(dev);
+	udc_ep_set_busy(dev, cfg->addr, false);
 }
 
-static void dwc2_on_bus_reset(const struct device *dev)
+/* Deactivated endpoint means that there will be a bus timeout when the host
+ * tries to access the endpoint.
+ */
+static int udc_dwc2_ep_deactivate(const struct device *dev,
+				  struct udc_ep_config *const cfg)
 {
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	uint32_t doepmsk;
+	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
+	mem_addr_t dxepctl_reg;
+	uint32_t dxepctl;
 
-	/* Set the NAK bit for all OUT endpoints */
-	for (uint8_t i = 0U; i < priv->numdeveps; i++) {
-		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
-		mem_addr_t doepctl_reg;
+	dxepctl_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
+	dxepctl = sys_read32(dxepctl_reg);
 
-		LOG_DBG("ep 0x%02x EPDIR %u", i, epdir);
-		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT ||
-		    epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			doepctl_reg = dwc2_get_dxepctl_reg(dev, i);
-			sys_write32(USB_DWC2_DEPCTL_SNAK, doepctl_reg);
-		}
-	}
+	if (dxepctl & USB_DWC2_DEPCTL_USBACTEP) {
+		LOG_DBG("Disable ep 0x%02x DxEPCTL%u %x",
+			cfg->addr, ep_idx, dxepctl);
 
-	doepmsk = USB_DWC2_DOEPINT_SETUP | USB_DWC2_DOEPINT_XFERCOMPL;
-	if (priv->bufferdma) {
-		doepmsk |= USB_DWC2_DOEPINT_STSPHSERCVD;
-	}
+		udc_dwc2_ep_disable(dev, cfg, false);
 
-	sys_write32(doepmsk, (mem_addr_t)&base->doepmsk);
-	sys_set_bits((mem_addr_t)&base->diepmsk, USB_DWC2_DIEPINT_XFERCOMPL);
+		dxepctl = sys_read32(dxepctl_reg);
+		dxepctl &= ~USB_DWC2_DEPCTL_USBACTEP;
+	} else {
+		LOG_WRN("ep 0x%02x is not active DxEPCTL%u %x",
+			cfg->addr, ep_idx, dxepctl);
+	}
 
-	/* Software has to handle RxFLvl interrupt only in Completer mode */
-	if (!priv->bufferdma) {
-		sys_set_bits((mem_addr_t)&base->gintmsk,
-			     USB_DWC2_GINTSTS_RXFLVL);
+	if (USB_EP_DIR_IS_IN(cfg->addr) && udc_mps_ep_size(cfg) != 0U &&
+	    ep_idx != 0U) {
+		dwc2_unset_dedicated_fifo(dev, cfg, &dxepctl);
 	}
 
-	/* Clear device address during reset. */
-	sys_clear_bits((mem_addr_t)&base->dcfg, USB_DWC2_DCFG_DEVADDR_MASK);
+	sys_write32(dxepctl, dxepctl_reg);
+	dwc2_set_epint(dev, cfg, false);
 
-	/* Speed enumeration must happen after reset. */
-	priv->enumdone = 0;
-}
+	if (cfg->addr == USB_CONTROL_EP_OUT) {
+		struct net_buf *buf = udc_buf_get_all(dev, cfg->addr);
 
-static void dwc2_handle_enumdone(const struct device *dev)
-{
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	uint32_t dsts;
+		/* Release the buffer allocated in dwc2_ctrl_feed_dout() */
+		if (buf) {
+			net_buf_unref(buf);
+		}
+	}
 
-	dsts = sys_read32((mem_addr_t)&base->dsts);
-	priv->enumspd = usb_dwc2_get_dsts_enumspd(dsts);
-	priv->enumdone = 1;
+	return 0;
 }
 
-static inline int dwc2_read_fifo_setup(const struct device *dev, uint8_t ep,
-				       const size_t size)
+static int udc_dwc2_ep_set_halt(const struct device *dev,
+				struct udc_ep_config *const cfg)
 {
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	size_t offset;
-
-	/* FIFO access is always in 32-bit words */
-
-	if (size != 8) {
-		LOG_ERR("%d bytes SETUP", size);
-	}
+	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
 
-	/*
-	 * We store the setup packet temporarily in the driver's private data
-	 * because there is always a race risk after the status stage OUT
-	 * packet from the host and the new setup packet. This is fine in
-	 * bottom-half processing because the events arrive in a queue and
-	 * there will be a next net_buf for the setup packet.
-	 */
-	for (offset = 0; offset < MIN(size, 8); offset += 4) {
-		sys_put_le32(sys_read32(UDC_DWC2_EP_FIFO(base, ep)),
-			     &priv->setup[offset]);
-	}
+	udc_dwc2_ep_disable(dev, cfg, true);
 
-	/* On protocol error simply discard extra data */
-	while (offset < size) {
-		sys_read32(UDC_DWC2_EP_FIFO(base, ep));
-		offset += 4;
+	LOG_DBG("Set halt ep 0x%02x", cfg->addr);
+	if (ep_idx != 0) {
+		cfg->stat.halted = true;
 	}
 
 	return 0;
 }
 
-static inline void dwc2_handle_rxflvl(const struct device *dev)
+static int udc_dwc2_ep_clear_halt(const struct device *dev,
+				  struct udc_ep_config *const cfg)
 {
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	struct udc_ep_config *ep_cfg;
-	struct net_buf *buf;
-	uint32_t grxstsp;
-	uint32_t pktsts;
-	uint32_t bcnt;
-	uint8_t ep;
+	mem_addr_t dxepctl_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
+	uint32_t dxepctl;
+	struct dwc2_drv_event evt = {
+		.ep = cfg->addr,
+		.type = DWC2_DRV_EVT_XFER,
+	};
 
-	grxstsp = sys_read32((mem_addr_t)&base->grxstsp);
-	ep = usb_dwc2_get_grxstsp_epnum(grxstsp);
-	bcnt = usb_dwc2_get_grxstsp_bcnt(grxstsp);
-	pktsts = usb_dwc2_get_grxstsp_pktsts(grxstsp);
+	dxepctl = sys_read32(dxepctl_reg);
+	dxepctl &= ~USB_DWC2_DEPCTL_STALL;
+	dxepctl |= USB_DWC2_DEPCTL_SETD0PID;
+	sys_write32(dxepctl, dxepctl_reg);
 
-	LOG_DBG("ep 0x%02x: pktsts %u, bcnt %u", ep, pktsts, bcnt);
+	LOG_DBG("Clear halt ep 0x%02x", cfg->addr);
+	cfg->stat.halted = false;
 
-	switch (pktsts) {
-	case USB_DWC2_GRXSTSR_PKTSTS_SETUP:
-		dwc2_read_fifo_setup(dev, ep, bcnt);
-		break;
-	case USB_DWC2_GRXSTSR_PKTSTS_OUT_DATA:
-		ep_cfg = udc_get_ep_cfg(dev, ep);
+	/* Resume queued transfers if any */
+	if (udc_buf_peek(dev, cfg->addr)) {
+		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+	}
 
-		buf = udc_buf_peek(dev, ep_cfg->addr);
+	return 0;
+}
 
-		/* RxFIFO data must be retrieved even when buf is NULL */
-		dwc2_read_fifo(dev, ep, buf, bcnt);
-		break;
-	case USB_DWC2_GRXSTSR_PKTSTS_OUT_DATA_DONE:
-		LOG_DBG("RX pktsts DONE");
-		break;
-	case USB_DWC2_GRXSTSR_PKTSTS_SETUP_DONE:
-		LOG_DBG("SETUP pktsts DONE");
-	case USB_DWC2_GRXSTSR_PKTSTS_GLOBAL_OUT_NAK:
-		LOG_DBG("Global OUT NAK");
-		break;
-	default:
-		break;
+static int udc_dwc2_ep_enqueue(const struct device *dev,
+			       struct udc_ep_config *const cfg,
+			       struct net_buf *const buf)
+{
+	struct dwc2_drv_event evt = {
+		.ep = cfg->addr,
+		.type = DWC2_DRV_EVT_XFER,
+	};
+
+	LOG_DBG("%p enqueue %x %p", dev, cfg->addr, buf);
+	udc_buf_put(cfg, buf);
+
+	if (!cfg->stat.halted) {
+		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
 	}
+
+	return 0;
 }
 
-static inline void dwc2_handle_in_xfercompl(const struct device *dev,
-					    const uint8_t ep_idx)
+static int udc_dwc2_ep_dequeue(const struct device *dev,
+			       struct udc_ep_config *const cfg)
 {
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	struct udc_ep_config *ep_cfg;
-	struct dwc2_drv_event evt;
 	struct net_buf *buf;
 
-	ep_cfg = udc_get_ep_cfg(dev, ep_idx | USB_EP_DIR_IN);
-	buf = udc_buf_peek(dev, ep_cfg->addr);
-	if (buf == NULL) {
-		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
-		return;
-	}
+	udc_dwc2_ep_disable(dev, cfg, false);
 
-	net_buf_pull(buf, priv->tx_len[ep_idx]);
-	if (buf->len  && dwc2_tx_fifo_write(dev, ep_cfg, buf) == 0) {
-		return;
+	buf = udc_buf_get_all(dev, cfg->addr);
+	if (buf) {
+		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
 
-	evt.dev = dev;
-	evt.ep = ep_cfg->addr;
-	evt.type = DWC2_DRV_EVT_DIN;
-	k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+	udc_ep_set_busy(dev, cfg->addr, false);
+
+	LOG_DBG("dequeue ep 0x%02x", cfg->addr);
+
+	return 0;
 }
 
-static inline void dwc2_handle_iepint(const struct device *dev)
+static int udc_dwc2_set_address(const struct device *dev, const uint8_t addr)
 {
 	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	const uint8_t n_max = 16;
-	uint32_t diepmsk;
-	uint32_t daint;
+	mem_addr_t dcfg_reg = (mem_addr_t)&base->dcfg;
+	uint32_t dcfg;
 
-	diepmsk = sys_read32((mem_addr_t)&base->diepmsk);
-	daint = sys_read32((mem_addr_t)&base->daint);
+	if (addr > (USB_DWC2_DCFG_DEVADDR_MASK >> USB_DWC2_DCFG_DEVADDR_POS)) {
+		return -EINVAL;
+	}
 
-	for (uint8_t n = 0U; n < n_max; n++) {
-		mem_addr_t diepint_reg = (mem_addr_t)&base->in_ep[n].diepint;
-		uint32_t diepint;
-		uint32_t status;
+	dcfg = sys_read32(dcfg_reg);
+	dcfg &= ~USB_DWC2_DCFG_DEVADDR_MASK;
+	dcfg |= usb_dwc2_set_dcfg_devaddr(addr);
+	sys_write32(dcfg, dcfg_reg);
+	LOG_DBG("Set new address %u for %p", addr, dev);
 
-		if (daint & USB_DWC2_DAINT_INEPINT(n)) {
-			/* Read and clear interrupt status */
-			diepint = sys_read32(diepint_reg);
-			status = diepint & diepmsk;
-			sys_write32(status, diepint_reg);
+	return 0;
+}
 
-			LOG_DBG("ep 0x%02x interrupt status: 0x%x",
-				n | USB_EP_DIR_IN, status);
+static int udc_dwc2_test_mode(const struct device *dev,
+			      const uint8_t mode, const bool dryrun)
+{
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	mem_addr_t dctl_reg = (mem_addr_t)&base->dctl;
+	uint32_t dctl;
 
-			if (status & USB_DWC2_DIEPINT_XFERCOMPL) {
-				dwc2_handle_in_xfercompl(dev, n);
-			}
+	if (mode == 0U || mode > USB_DWC2_DCTL_TSTCTL_TESTFE) {
+		return -EINVAL;
+	}
 
-		}
+	dctl = sys_read32(dctl_reg);
+	if (usb_dwc2_get_dctl_tstctl(dctl) != USB_DWC2_DCTL_TSTCTL_DISABLED) {
+		return -EALREADY;
 	}
 
-	/* Clear IEPINT interrupt */
-	sys_write32(USB_DWC2_GINTSTS_IEPINT, (mem_addr_t)&base->gintsts);
+	if (dryrun) {
+		LOG_DBG("Test Mode %u supported", mode);
+		return 0;
+	}
+
+	dctl |= usb_dwc2_set_dctl_tstctl(mode);
+	sys_write32(dctl, dctl_reg);
+	LOG_DBG("Enable Test Mode %u", mode);
+
+	return 0;
 }
 
-static inline void dwc2_handle_out_xfercompl(const struct device *dev,
-					     const uint8_t ep_idx)
+static int udc_dwc2_host_wakeup(const struct device *dev)
+{
+	LOG_DBG("Remote wakeup from %p", dev);
+
+	return -ENOTSUP;
+}
+
+/* Return actual USB device speed */
+static enum udc_bus_speed udc_dwc2_device_speed(const struct device *dev)
 {
-	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep_idx);
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
+
+	switch (priv->enumspd) {
+	case USB_DWC2_DSTS_ENUMSPD_HS3060:
+		return UDC_BUS_SPEED_HS;
+	case USB_DWC2_DSTS_ENUMSPD_LS6:
+		__ASSERT(false, "Low speed mode not supported");
+		__fallthrough;
+	case USB_DWC2_DSTS_ENUMSPD_FS48:
+		__fallthrough;
+	case USB_DWC2_DSTS_ENUMSPD_FS3060:
+		__fallthrough;
+	default:
+		return UDC_BUS_SPEED_FS;
+	}
+}
+
+static int dwc2_core_soft_reset(const struct device *dev)
+{
 	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	struct dwc2_drv_event evt;
-	uint32_t bcnt;
-	struct net_buf *buf;
-	uint32_t doeptsiz;
-	const bool is_iso = dwc2_ep_is_iso(ep_cfg);
+	mem_addr_t grstctl_reg = (mem_addr_t)&base->grstctl;
+	const unsigned int csr_timeout_us = 10000UL;
+	uint32_t cnt = 0UL;
 
-	doeptsiz = sys_read32((mem_addr_t)&base->out_ep[ep_idx].doeptsiz);
+	/* Check AHB master idle state */
+	while (!(sys_read32(grstctl_reg) & USB_DWC2_GRSTCTL_AHBIDLE)) {
+		k_busy_wait(1);
 
-	buf = udc_buf_peek(dev, ep_cfg->addr);
-	if (!buf) {
-		LOG_ERR("No buffer for ep 0x%02x", ep_cfg->addr);
-		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
-		return;
+		if (++cnt > csr_timeout_us) {
+			LOG_ERR("Wait for AHB idle timeout, GRSTCTL 0x%08x",
+				sys_read32(grstctl_reg));
+			return -EIO;
+		}
 	}
 
-	evt.type = DWC2_DRV_EVT_DOUT;
-	evt.ep = ep_cfg->addr;
+	/* Apply Core Soft Reset */
+	sys_write32(USB_DWC2_GRSTCTL_CSFTRST, grstctl_reg);
 
-	/* The original transfer size value is necessary here because controller
-	 * decreases the value for every byte stored.
+	cnt = 0UL;
+	do {
+		if (++cnt > csr_timeout_us) {
+			LOG_ERR("Wait for CSR done timeout, GRSTCTL 0x%08x",
+				sys_read32(grstctl_reg));
+			return -EIO;
+		}
+
+		k_busy_wait(1);
+	} while (sys_read32(grstctl_reg) & USB_DWC2_GRSTCTL_CSFTRST &&
+		 !(sys_read32(grstctl_reg) & USB_DWC2_GRSTCTL_CSFTRSTDONE));
+
+	sys_clear_bits(grstctl_reg, USB_DWC2_GRSTCTL_CSFTRST | USB_DWC2_GRSTCTL_CSFTRSTDONE);
+
+	return 0;
+}
+
+static int udc_dwc2_init_controller(const struct device *dev)
+{
+	const struct udc_dwc2_config *const config = dev->config;
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	struct usb_dwc2_reg *const base = config->base;
+	mem_addr_t grxfsiz_reg = (mem_addr_t)&base->grxfsiz;
+	mem_addr_t gahbcfg_reg = (mem_addr_t)&base->gahbcfg;
+	mem_addr_t gusbcfg_reg = (mem_addr_t)&base->gusbcfg;
+	mem_addr_t dcfg_reg = (mem_addr_t)&base->dcfg;
+	uint32_t dcfg;
+	uint32_t gusbcfg;
+	uint32_t gahbcfg;
+	uint32_t ghwcfg2;
+	uint32_t ghwcfg3;
+	uint32_t ghwcfg4;
+	uint32_t val;
+	int ret;
+	bool hs_phy;
+
+	ret = dwc2_core_soft_reset(dev);
+	if (ret) {
+		return ret;
+	}
+
+	priv->ghwcfg1 = sys_read32((mem_addr_t)&base->ghwcfg1);
+	ghwcfg2 = sys_read32((mem_addr_t)&base->ghwcfg2);
+	ghwcfg3 = sys_read32((mem_addr_t)&base->ghwcfg3);
+	ghwcfg4 = sys_read32((mem_addr_t)&base->ghwcfg4);
+
+	if (!(ghwcfg4 & USB_DWC2_GHWCFG4_DEDFIFOMODE)) {
+		LOG_ERR("Only dedicated TX FIFO mode is supported");
+		return -ENOTSUP;
+	}
+
+	/*
+	 * Force device mode as we do no support role changes.
+	 * Wait 25ms for the change to take effect.
 	 */
-	bcnt = usb_dwc2_get_doeptsizn_xfersize(priv->rx_siz[ep_idx]) -
-	       usb_dwc2_get_doeptsizn_xfersize(doeptsiz);
+	gusbcfg = USB_DWC2_GUSBCFG_FORCEDEVMODE;
+	sys_write32(gusbcfg, gusbcfg_reg);
+	k_msleep(25);
 
-	if (is_iso) {
-		uint32_t pkts;
-		bool valid;
+	/* Buffer DMA is always supported in Internal DMA mode.
+	 * TODO: check and support descriptor DMA if available
+	 */
+	priv->bufferdma = (usb_dwc2_get_ghwcfg2_otgarch(ghwcfg2) ==
+			   USB_DWC2_GHWCFG2_OTGARCH_INTERNALDMA);
 
-		pkts = usb_dwc2_get_doeptsizn_pktcnt(priv->rx_siz[ep_idx]) -
-			usb_dwc2_get_doeptsizn_pktcnt(doeptsiz);
-		switch (usb_dwc2_get_doeptsizn_rxdpid(doeptsiz)) {
-		case USB_DWC2_DOEPTSIZN_RXDPID_DATA0:
-			valid = (pkts == 1);
-			break;
-		case USB_DWC2_DOEPTSIZN_RXDPID_DATA1:
-			valid = (pkts == 2);
-			break;
-		case USB_DWC2_DOEPTSIZN_RXDPID_DATA2:
-			valid = (pkts == 3);
-			break;
-		case USB_DWC2_DOEPTSIZN_RXDPID_MDATA:
-		default:
-			valid = false;
-			break;
-		}
+	if (!IS_ENABLED(CONFIG_UDC_DWC2_DMA)) {
+		priv->bufferdma = 0;
+	} else if (priv->bufferdma) {
+		LOG_WRN("Experimental DMA enabled");
+	}
 
-		if (!valid) {
-			if (!priv->bufferdma) {
-				/* RxFlvl added data to net buf, rollback */
-				net_buf_remove_mem(buf, bcnt);
-			}
-			/* Data is not valid, discard it */
-			bcnt = 0;
-		}
+	if (ghwcfg2 & USB_DWC2_GHWCFG2_DYNFIFOSIZING) {
+		LOG_DBG("Dynamic FIFO Sizing is enabled");
+		priv->dynfifosizing = true;
 	}
 
-	if (priv->bufferdma && bcnt) {
-		sys_cache_data_invd_range(buf->data, bcnt);
-		net_buf_add(buf, bcnt);
+	if (IS_ENABLED(CONFIG_UDC_DWC2_HIBERNATION) &&
+	    ghwcfg4 & USB_DWC2_GHWCFG4_HIBERNATION) {
+		LOG_INF("Hibernation enabled");
+		priv->suspend_type = DWC2_SUSPEND_HIBERNATION;
+	} else {
+		priv->suspend_type = DWC2_SUSPEND_NO_POWER_SAVING;
 	}
 
-	if (!is_iso && (bcnt % udc_mps_ep_size(ep_cfg)) == 0 &&
-	    net_buf_tailroom(buf)) {
-		dwc2_prep_rx(dev, buf, ep_cfg);
+	/* Get the number or endpoints and IN endpoints we can use later */
+	priv->numdeveps = usb_dwc2_get_ghwcfg2_numdeveps(ghwcfg2) + 1U;
+	priv->ineps = usb_dwc2_get_ghwcfg4_ineps(ghwcfg4) + 1U;
+	LOG_DBG("Number of endpoints (NUMDEVEPS + 1) %u", priv->numdeveps);
+	LOG_DBG("Number of IN endpoints (INEPS + 1) %u", priv->ineps);
+
+	LOG_DBG("Number of periodic IN endpoints (NUMDEVPERIOEPS) %u",
+		usb_dwc2_get_ghwcfg4_numdevperioeps(ghwcfg4));
+	LOG_DBG("Number of additional control endpoints (NUMCTLEPS) %u",
+		usb_dwc2_get_ghwcfg4_numctleps(ghwcfg4));
+
+	LOG_DBG("OTG architecture (OTGARCH) %u, mode (OTGMODE) %u",
+		usb_dwc2_get_ghwcfg2_otgarch(ghwcfg2),
+		usb_dwc2_get_ghwcfg2_otgmode(ghwcfg2));
+
+	priv->dfifodepth = usb_dwc2_get_ghwcfg3_dfifodepth(ghwcfg3);
+	LOG_DBG("DFIFO depth (DFIFODEPTH) %u bytes", priv->dfifodepth * 4);
+
+	priv->max_pktcnt = GHWCFG3_PKTCOUNT(usb_dwc2_get_ghwcfg3_pktsizewidth(ghwcfg3));
+	priv->max_xfersize = GHWCFG3_XFERSIZE(usb_dwc2_get_ghwcfg3_xfersizewidth(ghwcfg3));
+	LOG_DBG("Max packet count %u, Max transfer size %u",
+		priv->max_pktcnt, priv->max_xfersize);
+
+	LOG_DBG("Vendor Control interface support enabled: %s",
+		(ghwcfg3 & USB_DWC2_GHWCFG3_VNDCTLSUPT) ? "true" : "false");
+
+	LOG_DBG("PHY interface type: FSPHYTYPE %u, HSPHYTYPE %u, DATAWIDTH %u",
+		usb_dwc2_get_ghwcfg2_fsphytype(ghwcfg2),
+		usb_dwc2_get_ghwcfg2_hsphytype(ghwcfg2),
+		usb_dwc2_get_ghwcfg4_phydatawidth(ghwcfg4));
+
+	LOG_DBG("LPM mode is %s",
+		(ghwcfg3 & USB_DWC2_GHWCFG3_LPMMODE) ? "enabled" : "disabled");
+
+	/* Configure AHB, select Completer or DMA mode */
+	gahbcfg = sys_read32(gahbcfg_reg);
+
+	if (priv->bufferdma) {
+		gahbcfg |= USB_DWC2_GAHBCFG_DMAEN;
 	} else {
-		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+		gahbcfg &= ~USB_DWC2_GAHBCFG_DMAEN;
 	}
-}
 
-static inline void dwc2_handle_oepint(const struct device *dev)
-{
-	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	const uint8_t n_max = 16;
-	uint32_t doepmsk;
-	uint32_t daint;
+	sys_write32(gahbcfg, gahbcfg_reg);
 
-	doepmsk = sys_read32((mem_addr_t)&base->doepmsk);
-	daint = sys_read32((mem_addr_t)&base->daint);
+	dcfg = sys_read32(dcfg_reg);
 
-	for (uint8_t n = 0U; n < n_max; n++) {
-		mem_addr_t doepint_reg = (mem_addr_t)&base->out_ep[n].doepint;
-		uint32_t doepint;
-		uint32_t status;
+	dcfg &= ~USB_DWC2_DCFG_DESCDMA;
 
-		if (!(daint & USB_DWC2_DAINT_OUTEPINT(n))) {
-			continue;
+	/* Configure PHY and device speed */
+	dcfg &= ~USB_DWC2_DCFG_DEVSPD_MASK;
+	switch (usb_dwc2_get_ghwcfg2_hsphytype(ghwcfg2)) {
+	case USB_DWC2_GHWCFG2_HSPHYTYPE_UTMIPLUSULPI:
+		__fallthrough;
+	case USB_DWC2_GHWCFG2_HSPHYTYPE_ULPI:
+		gusbcfg |= USB_DWC2_GUSBCFG_PHYSEL_USB20 |
+			   USB_DWC2_GUSBCFG_ULPI_UTMI_SEL_ULPI;
+		dcfg |= USB_DWC2_DCFG_DEVSPD_USBHS20
+			<< USB_DWC2_DCFG_DEVSPD_POS;
+		hs_phy = true;
+		break;
+	case USB_DWC2_GHWCFG2_HSPHYTYPE_UTMIPLUS:
+		gusbcfg |= USB_DWC2_GUSBCFG_PHYSEL_USB20 |
+			   USB_DWC2_GUSBCFG_ULPI_UTMI_SEL_UTMI;
+		dcfg |= USB_DWC2_DCFG_DEVSPD_USBHS20
+			<< USB_DWC2_DCFG_DEVSPD_POS;
+		hs_phy = true;
+		break;
+	case USB_DWC2_GHWCFG2_HSPHYTYPE_NO_HS:
+		__fallthrough;
+	default:
+		if (usb_dwc2_get_ghwcfg2_fsphytype(ghwcfg2) !=
+		    USB_DWC2_GHWCFG2_FSPHYTYPE_NO_FS) {
+			gusbcfg |= USB_DWC2_GUSBCFG_PHYSEL_USB11;
 		}
 
-		/* Read and clear interrupt status */
-		doepint = sys_read32(doepint_reg);
-		status = doepint & doepmsk;
-		sys_write32(status, doepint_reg);
-
-		LOG_DBG("ep 0x%02x interrupt status: 0x%x", n, status);
+		dcfg |= USB_DWC2_DCFG_DEVSPD_USBFS1148
+			<< USB_DWC2_DCFG_DEVSPD_POS;
+		hs_phy = false;
+	}
 
-		/* StupPktRcvd is not enabled for interrupt, but must be checked
-		 * when XferComp hits to determine if SETUP token was received.
-		 */
-		if (priv->bufferdma && (status & USB_DWC2_DOEPINT_XFERCOMPL) &&
-		    (doepint & USB_DWC2_DOEPINT_STUPPKTRCVD)) {
-			uint32_t addr;
+	if (usb_dwc2_get_ghwcfg4_phydatawidth(ghwcfg4)) {
+		gusbcfg |= USB_DWC2_GUSBCFG_PHYIF_16_BIT;
+	}
 
-			sys_write32(USB_DWC2_DOEPINT_STUPPKTRCVD, doepint_reg);
-			status &= ~USB_DWC2_DOEPINT_XFERCOMPL;
+	/* Update PHY configuration */
+	sys_write32(gusbcfg, gusbcfg_reg);
+	sys_write32(dcfg, dcfg_reg);
 
-			/* DMAAddr points past the memory location where the
-			 * SETUP data was stored. Copy the received SETUP data
-			 * to temporary location used also in Completer mode
-			 * which allows common SETUP interrupt handling.
-			 */
-			addr = sys_read32((mem_addr_t)&base->out_ep[0].doepdma);
-			sys_cache_data_invd_range((void *)(addr - 8), 8);
-			memcpy(priv->setup, (void *)(addr - 8), sizeof(priv->setup));
-		}
+	priv->outeps = 0U;
+	for (uint8_t i = 0U; i < priv->numdeveps; i++) {
+		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
 
-		if (status & USB_DWC2_DOEPINT_SETUP) {
-			struct dwc2_drv_event evt = {
-				.type = DWC2_DRV_EVT_SETUP,
-				.ep = USB_CONTROL_EP_OUT,
-			};
+		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT ||
+		    epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			mem_addr_t doepctl_reg = dwc2_get_dxepctl_reg(dev, i);
 
-			k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+			sys_write32(USB_DWC2_DEPCTL_SNAK, doepctl_reg);
+			priv->outeps++;
 		}
+	}
 
-		if (status & USB_DWC2_DOEPINT_STSPHSERCVD) {
-			/* Driver doesn't need any special handling, but it is
-			 * mandatory that the bit is cleared in Buffer DMA mode.
-			 * If the bit is not cleared (i.e. when this interrupt
-			 * bit is masked), then SETUP interrupts will cease
-			 * after first control transfer with data stage from
-			 * device to host.
-			 */
-		}
+	LOG_DBG("Number of OUT endpoints %u", priv->outeps);
 
-		if (status & USB_DWC2_DOEPINT_XFERCOMPL) {
-			dwc2_handle_out_xfercompl(dev, n);
-		}
+	/* Read and store all TxFIFO depths because Programmed FIFO Depths must
+	 * not exceed the power-on values.
+	 */
+	val = sys_read32((mem_addr_t)&base->gnptxfsiz);
+	priv->max_txfifo_depth[0] = usb_dwc2_get_gnptxfsiz_nptxfdep(val);
+	for (uint8_t i = 1; i < priv->ineps; i++) {
+		priv->max_txfifo_depth[i] = dwc2_get_txfdep(dev, i - 1);
 	}
 
-	/* Clear OEPINT interrupt */
-	sys_write32(USB_DWC2_GINTSTS_OEPINT, (mem_addr_t)&base->gintsts);
-}
+	priv->rxfifo_depth = usb_dwc2_get_grxfsiz(sys_read32(grxfsiz_reg));
 
-/* In DWC2 otg context incomplete isochronous IN transfer means that the host
- * did not issue IN token to at least one isochronous endpoint and software has
- * find on which endpoints the data is no longer valid and discard it.
- */
-static void dwc2_handle_incompisoin(const struct device *dev)
-{
-	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = config->base;
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	mem_addr_t gintsts_reg = (mem_addr_t)&base->gintsts;
-	const uint32_t mask =
-		USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_EPTYPE_MASK |
-		USB_DWC2_DEPCTL_USBACTEP;
-	const uint32_t val =
-		USB_DWC2_DEPCTL_EPENA |
-		usb_dwc2_set_depctl_eptype(USB_DWC2_DEPCTL_EPTYPE_ISO) |
-		USB_DWC2_DEPCTL_USBACTEP;
+	if (priv->dynfifosizing) {
+		uint32_t gnptxfsiz;
+		uint32_t default_depth;
 
-	for (uint8_t i = 1U; i < priv->numdeveps; i++) {
-		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
+		/* TODO: For proper runtime FIFO sizing UDC driver would have to
+		 * have prior knowledge of the USB configurations. Only with the
+		 * prior knowledge, the driver will be able to fairly distribute
+		 * available resources. For the time being just use different
+		 * defaults based on maximum configured PHY speed, but this has
+		 * to be revised if e.g. thresholding support would be necessary
+		 * on some target.
+		 */
+		if (hs_phy) {
+			default_depth = UDC_DWC2_GRXFSIZ_HS_DEFAULT;
+		} else {
+			default_depth = UDC_DWC2_GRXFSIZ_FS_DEFAULT;
+		}
+		default_depth += priv->outeps * 2U;
 
-		if (epdir == USB_DWC2_GHWCFG1_EPDIR_IN ||
-		    epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			mem_addr_t diepctl_reg = dwc2_get_dxepctl_reg(dev, i | USB_EP_DIR_IN);
-			uint32_t diepctl;
+		/* Driver does not dynamically resize RxFIFO so there is no need
+		 * to store reset value. Read the reset value and make sure that
+		 * the programmed value is not greater than what driver sets.
+		 */
+		priv->rxfifo_depth = MIN(priv->rxfifo_depth, default_depth);
+		sys_write32(usb_dwc2_set_grxfsiz(priv->rxfifo_depth), grxfsiz_reg);
 
-			diepctl = sys_read32(diepctl_reg);
+		/* Set TxFIFO 0 depth */
+		val = MAX(UDC_DWC2_FIFO0_DEPTH, priv->max_txfifo_depth[0]);
+		gnptxfsiz = usb_dwc2_set_gnptxfsiz_nptxfdep(val) |
+			    usb_dwc2_set_gnptxfsiz_nptxfstaddr(priv->rxfifo_depth);
 
-			/* Check if endpoint didn't receive ISO OUT data */
-			if ((diepctl & mask) == val) {
-				struct udc_ep_config *cfg;
-				struct net_buf *buf;
+		sys_write32(gnptxfsiz, (mem_addr_t)&base->gnptxfsiz);
+	}
 
-				cfg = udc_get_ep_cfg(dev, i | USB_EP_DIR_IN);
-				__ASSERT_NO_MSG(cfg && cfg->stat.enabled &&
-						dwc2_ep_is_iso(cfg));
+	LOG_DBG("RX FIFO size %u bytes", priv->rxfifo_depth * 4);
+	for (uint8_t i = 1U; i < priv->ineps; i++) {
+		LOG_DBG("TX FIFO%u depth %u addr %u",
+			i, priv->max_txfifo_depth[i], dwc2_get_txfaddr(dev, i));
+	}
 
-				udc_dwc2_ep_disable(dev, cfg, false);
+	if (udc_ep_enable_internal(dev, USB_CONTROL_EP_OUT,
+				   USB_EP_TYPE_CONTROL, 64, 0)) {
+		LOG_ERR("Failed to enable control endpoint");
+		return -EIO;
+	}
 
-				buf = udc_buf_get(dev, cfg->addr);
-				if (buf) {
-					udc_submit_ep_event(dev, buf, 0);
-				}
-			}
-		}
+	if (udc_ep_enable_internal(dev, USB_CONTROL_EP_IN,
+				   USB_EP_TYPE_CONTROL, 64, 0)) {
+		LOG_ERR("Failed to enable control endpoint");
+		return -EIO;
 	}
 
-	sys_write32(USB_DWC2_GINTSTS_INCOMPISOIN, gintsts_reg);
+	/* Unmask interrupts */
+	sys_write32(USB_DWC2_GINTSTS_OEPINT | USB_DWC2_GINTSTS_IEPINT |
+		    USB_DWC2_GINTSTS_ENUMDONE | USB_DWC2_GINTSTS_USBRST |
+		    USB_DWC2_GINTSTS_WKUPINT | USB_DWC2_GINTSTS_USBSUSP |
+		    USB_DWC2_GINTSTS_INCOMPISOOUT | USB_DWC2_GINTSTS_INCOMPISOIN |
+		    USB_DWC2_GINTSTS_SOF,
+		    (mem_addr_t)&base->gintmsk);
+
+	return 0;
 }
 
-/* In DWC2 otg context incomplete isochronous OUT transfer means that the host
- * did not issue OUT token to at least one isochronous endpoint and software has
- * to find on which endpoint it didn't receive any data and let the stack know.
- */
-static void dwc2_handle_incompisoout(const struct device *dev)
+static int udc_dwc2_enable(const struct device *dev)
 {
 	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = config->base;
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	mem_addr_t gintsts_reg = (mem_addr_t)&base->gintsts;
-	const uint32_t mask =
-		USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_EPTYPE_MASK |
-		USB_DWC2_DEPCTL_DPID | USB_DWC2_DEPCTL_USBACTEP;
-	const uint32_t val =
-		USB_DWC2_DEPCTL_EPENA |
-		usb_dwc2_set_depctl_eptype(USB_DWC2_DEPCTL_EPTYPE_ISO) |
-		((priv->sof_num & 1) ? USB_DWC2_DEPCTL_DPID : 0) |
-		USB_DWC2_DEPCTL_USBACTEP;
-
-	for (uint8_t i = 1U; i < priv->numdeveps; i++) {
-		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(priv->ghwcfg1, i);
-
-		if (epdir == USB_DWC2_GHWCFG1_EPDIR_OUT ||
-		    epdir == USB_DWC2_GHWCFG1_EPDIR_BDIR) {
-			mem_addr_t doepctl_reg = dwc2_get_dxepctl_reg(dev, i);
-			uint32_t doepctl;
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	int err;
 
-			doepctl = sys_read32(doepctl_reg);
+	err = dwc2_quirk_pre_enable(dev);
+	if (err) {
+		LOG_ERR("Quirk pre enable failed %d", err);
+		return err;
+	}
 
-			/* Check if endpoint didn't receive ISO OUT data */
-			if ((doepctl & mask) == val) {
-				struct udc_ep_config *cfg;
-				struct net_buf *buf;
+	err = udc_dwc2_init_controller(dev);
+	if (err) {
+		return err;
+	}
 
-				cfg = udc_get_ep_cfg(dev, i);
-				__ASSERT_NO_MSG(cfg && cfg->stat.enabled &&
-						dwc2_ep_is_iso(cfg));
+	err = dwc2_quirk_post_enable(dev);
+	if (err) {
+		LOG_ERR("Quirk post enable failed %d", err);
+		return err;
+	}
 
-				udc_dwc2_ep_disable(dev, cfg, false);
+	/* Enable global interrupt */
+	sys_set_bits((mem_addr_t)&base->gahbcfg, USB_DWC2_GAHBCFG_GLBINTRMASK);
+	config->irq_enable_func(dev);
 
-				buf = udc_buf_get(dev, cfg->addr);
-				if (buf) {
-					udc_submit_ep_event(dev, buf, 0);
-				}
-			}
-		}
-	}
+	/* Disable soft disconnect */
+	sys_clear_bits((mem_addr_t)&base->dctl, USB_DWC2_DCTL_SFTDISCON);
+	LOG_DBG("Enable device %p", base);
 
-	sys_write32(USB_DWC2_GINTSTS_INCOMPISOOUT, gintsts_reg);
+	return 0;
 }
 
-static void udc_dwc2_isr_handler(const struct device *dev)
+static int udc_dwc2_disable(const struct device *dev)
 {
 	const struct udc_dwc2_config *const config = dev->config;
-	struct usb_dwc2_reg *const base = config->base;
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	mem_addr_t gintsts_reg = (mem_addr_t)&base->gintsts;
-	uint32_t int_status;
-	uint32_t gintmsk;
+	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
+	mem_addr_t dctl_reg = (mem_addr_t)&base->dctl;
+	int err;
+
+	/* Enable soft disconnect */
+	sys_set_bits(dctl_reg, USB_DWC2_DCTL_SFTDISCON);
+	LOG_DBG("Disable device %p", dev);
+
+	if (udc_ep_disable_internal(dev, USB_CONTROL_EP_OUT)) {
+		LOG_DBG("Failed to disable control endpoint");
+		return -EIO;
+	}
+
+	if (udc_ep_disable_internal(dev, USB_CONTROL_EP_IN)) {
+		LOG_DBG("Failed to disable control endpoint");
+		return -EIO;
+	}
 
-	if (priv->hibernated) {
-		uint32_t gpwrdn = sys_read32((mem_addr_t)&base->gpwrdn);
-		bool reset, resume = false;
-		enum dwc2_hibernation_exit_reason exit_reason;
+	config->irq_disable_func(dev);
+	sys_clear_bits((mem_addr_t)&base->gahbcfg, USB_DWC2_GAHBCFG_GLBINTRMASK);
 
-		/* Clear interrupts */
-		sys_write32(gpwrdn, (mem_addr_t)&base->gpwrdn);
+	err = dwc2_quirk_disable(dev);
+	if (err) {
+		LOG_ERR("Quirk disable failed %d", err);
+		return err;
+	}
 
-		if (gpwrdn & USB_DWC2_GPWRDN_LNSTSCHNG) {
-			resume = usb_dwc2_get_gpwrdn_linestate(gpwrdn) ==
-				 USB_DWC2_GPWRDN_LINESTATE_DM1DP0;
-			exit_reason = DWC2_HIBERNATION_EXIT_HOST_WAKEUP;
-		}
+	return 0;
+}
 
-		reset = gpwrdn & USB_DWC2_GPWRDN_RESETDETECTED;
-		if (reset) {
-			exit_reason = DWC2_HIBERNATION_EXIT_BUS_RESET;
-		}
+static int udc_dwc2_init(const struct device *dev)
+{
+	int ret;
 
-		if (reset || resume) {
-			struct dwc2_drv_event evt = {
-				.dev = dev,
-				.type = DWC2_DRV_EVT_HIBERNATION_EXIT,
-				.exit_reason = exit_reason,
-			};
+	ret = dwc2_quirk_init(dev);
+	if (ret) {
+		LOG_ERR("Quirk init failed %d", ret);
+		return ret;
+	}
 
-			k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
-		}
+	return dwc2_init_pinctrl(dev);
+}
 
-		(void)dwc2_quirk_irq_clear(dev);
-		return;
+static int udc_dwc2_shutdown(const struct device *dev)
+{
+	int ret;
+
+	ret = dwc2_quirk_shutdown(dev);
+	if (ret) {
+		LOG_ERR("Quirk shutdown failed %d", ret);
+		return ret;
 	}
 
-	gintmsk = sys_read32((mem_addr_t)&base->gintmsk);
+	return 0;
+}
 
-	/*  Read and handle interrupt status register */
-	while ((int_status = sys_read32(gintsts_reg) & gintmsk)) {
+static int dwc2_driver_preinit(const struct device *dev)
+{
+	const struct udc_dwc2_config *config = dev->config;
+	struct udc_data *data = dev->data;
+	uint16_t mps = 1023;
+	uint32_t numdeveps;
+	uint32_t ineps;
+	int err;
 
-		LOG_DBG("GINTSTS 0x%x", int_status);
+	k_mutex_init(&data->mutex);
 
-		if (int_status & USB_DWC2_GINTSTS_SOF) {
-			uint32_t dsts;
+	data->caps.addr_before_status = true;
+	data->caps.mps0 = UDC_MPS0_64;
 
-			/* Clear USB SOF interrupt. */
-			sys_write32(USB_DWC2_GINTSTS_SOF, gintsts_reg);
+	(void)dwc2_quirk_caps(dev);
+	if (data->caps.hs) {
+		mps = 1024;
+	}
 
-			dsts = sys_read32((mem_addr_t)&base->dsts);
-			priv->sof_num = usb_dwc2_get_dsts_soffn(dsts);
-			udc_submit_event(dev, UDC_EVT_SOF, 0);
-		}
+	/*
+	 * At this point, we cannot or do not want to access the hardware
+	 * registers to get GHWCFGn values. For now, we will use devicetree to
+	 * get GHWCFGn values and use them to determine the number and type of
+	 * configured endpoints in the hardware. This can be considered a
+	 * workaround, and we may change the upper layer internals to avoid it
+	 * in the future.
+	 */
+	ineps = usb_dwc2_get_ghwcfg4_ineps(config->ghwcfg4) + 1U;
+	numdeveps = usb_dwc2_get_ghwcfg2_numdeveps(config->ghwcfg2) + 1U;
+	LOG_DBG("Number of endpoints (NUMDEVEPS + 1) %u", numdeveps);
+	LOG_DBG("Number of IN endpoints (INEPS + 1) %u", ineps);
 
-		if (int_status & USB_DWC2_GINTSTS_USBRST) {
-			/* Clear and handle USB Reset interrupt. */
-			sys_write32(USB_DWC2_GINTSTS_USBRST, gintsts_reg);
-			dwc2_on_bus_reset(dev);
-			LOG_DBG("USB Reset interrupt");
-		}
+	for (uint32_t i = 0, n = 0; i < numdeveps; i++) {
+		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(config->ghwcfg1, i);
 
-		if (int_status & USB_DWC2_GINTSTS_ENUMDONE) {
-			/* Clear and handle Enumeration Done interrupt. */
-			sys_write32(USB_DWC2_GINTSTS_ENUMDONE, gintsts_reg);
-			dwc2_handle_enumdone(dev);
-			udc_submit_event(dev, UDC_EVT_RESET, 0);
+		if (epdir != USB_DWC2_GHWCFG1_EPDIR_OUT &&
+		    epdir != USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			continue;
 		}
 
-		if (int_status & USB_DWC2_GINTSTS_WKUPINT) {
-			/* Clear Resume/Remote Wakeup Detected interrupt. */
-			sys_write32(USB_DWC2_GINTSTS_WKUPINT, gintsts_reg);
-			udc_set_suspended(dev, false);
-			udc_submit_event(dev, UDC_EVT_RESUME, 0);
+		if (i == 0) {
+			config->ep_cfg_out[n].caps.control = 1;
+			config->ep_cfg_out[n].caps.mps = 64;
+		} else {
+			config->ep_cfg_out[n].caps.bulk = 1;
+			config->ep_cfg_out[n].caps.interrupt = 1;
+			config->ep_cfg_out[n].caps.iso = 1;
+			config->ep_cfg_out[n].caps.high_bandwidth = data->caps.hs;
+			config->ep_cfg_out[n].caps.mps = mps;
 		}
 
-		if (int_status & USB_DWC2_GINTSTS_IEPINT) {
-			/* Handle IN Endpoints interrupt */
-			dwc2_handle_iepint(dev);
-		}
+		config->ep_cfg_out[n].caps.out = 1;
+		config->ep_cfg_out[n].addr = USB_EP_DIR_OUT | i;
 
-		if (int_status & USB_DWC2_GINTSTS_RXFLVL) {
-			/* Handle RxFIFO Non-Empty interrupt */
-			dwc2_handle_rxflvl(dev);
+		LOG_DBG("Register ep 0x%02x (%u)", i, n);
+		err = udc_register_ep(dev, &config->ep_cfg_out[n]);
+		if (err != 0) {
+			LOG_ERR("Failed to register endpoint");
+			return err;
 		}
 
-		if (int_status & USB_DWC2_GINTSTS_OEPINT) {
-			/* Handle OUT Endpoints interrupt */
-			dwc2_handle_oepint(dev);
+		n++;
+		/* Also check the number of desired OUT endpoints in devicetree. */
+		if (n >= config->num_out_eps) {
+			break;
 		}
+	}
 
-		if (int_status & USB_DWC2_GINTSTS_INCOMPISOIN) {
-			dwc2_handle_incompisoin(dev);
-		}
+	for (uint32_t i = 0, n = 0; i < numdeveps; i++) {
+		uint32_t epdir = usb_dwc2_get_ghwcfg1_epdir(config->ghwcfg1, i);
 
-		if (int_status & USB_DWC2_GINTSTS_INCOMPISOOUT) {
-			dwc2_handle_incompisoout(dev);
+		if (epdir != USB_DWC2_GHWCFG1_EPDIR_IN &&
+		    epdir != USB_DWC2_GHWCFG1_EPDIR_BDIR) {
+			continue;
 		}
 
-		if (int_status & USB_DWC2_GINTSTS_USBSUSP) {
-			if (!priv->enumdone) {
-				/* Clear stale suspend interrupt */
-				sys_write32(USB_DWC2_GINTSTS_USBSUSP, gintsts_reg);
-				continue;
-			}
+		if (i == 0) {
+			config->ep_cfg_in[n].caps.control = 1;
+			config->ep_cfg_in[n].caps.mps = 64;
+		} else {
+			config->ep_cfg_in[n].caps.bulk = 1;
+			config->ep_cfg_in[n].caps.interrupt = 1;
+			config->ep_cfg_in[n].caps.iso = 1;
+			config->ep_cfg_in[n].caps.high_bandwidth = data->caps.hs;
+			config->ep_cfg_in[n].caps.mps = mps;
+		}
 
-			/* Notify the stack */
-			udc_set_suspended(dev, true);
-			udc_submit_event(dev, UDC_EVT_SUSPEND, 0);
+		config->ep_cfg_in[n].caps.in = 1;
+		config->ep_cfg_in[n].addr = USB_EP_DIR_IN | i;
 
-			if (priv->suspend_type == DWC2_SUSPEND_HIBERNATION) {
-				dwc2_enter_hibernation(dev);
-				/* Next interrupt will be from PMU */
-				break;
-			}
+		LOG_DBG("Register ep 0x%02x (%u)", USB_EP_DIR_IN | i, n);
+		err = udc_register_ep(dev, &config->ep_cfg_in[n]);
+		if (err != 0) {
+			LOG_ERR("Failed to register endpoint");
+			return err;
+		}
 
-			/* Clear USB Suspend interrupt. */
-			sys_write32(USB_DWC2_GINTSTS_USBSUSP, gintsts_reg);
+		n++;
+		/* Also check the number of desired IN endpoints in devicetree. */
+		if (n >= MIN(ineps, config->num_in_eps)) {
+			break;
 		}
 	}
 
-	(void)dwc2_quirk_irq_clear(dev);
+	config->make_thread(dev);
+
+	return 0;
 }
 
-static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
+static int udc_dwc2_lock(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	const struct udc_dwc2_config *const config = dev->config;
-	struct udc_ep_config *ep_cfg;
-	struct dwc2_drv_event evt;
-
-	/* This is the bottom-half of the ISR handler and the place where
-	 * a new transfer can be fed.
-	 */
-	k_msgq_get(&drv_msgq, &evt, K_FOREVER);
-	ep_cfg = udc_get_ep_cfg(dev, evt.ep);
-
-	switch (evt.type) {
-	case DWC2_DRV_EVT_XFER:
-		LOG_DBG("New transfer in the queue");
-		break;
-	case DWC2_DRV_EVT_SETUP:
-		LOG_DBG("SETUP event");
-		dwc2_handle_evt_setup(dev);
-		break;
-	case DWC2_DRV_EVT_DOUT:
-		LOG_DBG("DOUT event ep 0x%02x", ep_cfg->addr);
-		dwc2_handle_evt_dout(dev, ep_cfg);
-		break;
-	case DWC2_DRV_EVT_DIN:
-		LOG_DBG("DIN event");
-		dwc2_handle_evt_din(dev, ep_cfg);
-		break;
-	case DWC2_DRV_EVT_HIBERNATION_EXIT:
-		LOG_DBG("Hibernation exit event");
-		config->irq_disable_func(dev);
-
-		if (priv->hibernated) {
-			dwc2_exit_hibernation(dev);
-
-			/* Let stack know we are no longer suspended */
-			udc_set_suspended(dev, false);
-			udc_submit_event(dev, UDC_EVT_RESUME, 0);
-
-			if (evt.exit_reason == DWC2_HIBERNATION_EXIT_BUS_RESET) {
-				dwc2_on_bus_reset(dev);
-			}
-		}
-
-		config->irq_enable_func(dev);
-		break;
-	}
+	return udc_lock_internal(dev, K_FOREVER);
+}
 
-	if (ep_cfg->addr != USB_CONTROL_EP_OUT && !udc_ep_is_busy(dev, ep_cfg->addr)) {
-		dwc2_handle_xfer_next(dev, ep_cfg);
-	} else {
-		LOG_DBG("ep 0x%02x busy", ep_cfg->addr);
-	}
+static int udc_dwc2_unlock(const struct device *dev)
+{
+	return udc_unlock_internal(dev);
 }
 
 static const struct udc_api udc_dwc2_api = {

From 0e5928722a46a3a6dd98cdf78bceaeb9fbe5a9cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:10 +0100
Subject: [PATCH 2047/2913] Revert "[nrf fromtree] tests: net: http_server: Add
 netif dependency"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cc3038c2f4104a5ff693bbf185b16ac0675575ad.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/net/lib/http_server/common/testcase.yaml | 1 -
 tests/net/lib/http_server/core/testcase.yaml   | 1 -
 tests/net/lib/http_server/crime/testcase.yaml  | 1 -
 tests/net/lib/http_server/tls/testcase.yaml    | 1 -
 4 files changed, 4 deletions(-)

diff --git a/tests/net/lib/http_server/common/testcase.yaml b/tests/net/lib/http_server/common/testcase.yaml
index 530fab321bf..8b89a10da97 100644
--- a/tests/net/lib/http_server/common/testcase.yaml
+++ b/tests/net/lib/http_server/common/testcase.yaml
@@ -1,5 +1,4 @@
 common:
-  depends_on: netif
   min_ram: 40
   tags:
     - net
diff --git a/tests/net/lib/http_server/core/testcase.yaml b/tests/net/lib/http_server/core/testcase.yaml
index 3ecfe659d48..695674768b0 100644
--- a/tests/net/lib/http_server/core/testcase.yaml
+++ b/tests/net/lib/http_server/core/testcase.yaml
@@ -1,5 +1,4 @@
 common:
-  depends_on: netif
   min_ram: 80
   tags:
     - http
diff --git a/tests/net/lib/http_server/crime/testcase.yaml b/tests/net/lib/http_server/crime/testcase.yaml
index 5fbcfe5ea27..31660759135 100644
--- a/tests/net/lib/http_server/crime/testcase.yaml
+++ b/tests/net/lib/http_server/crime/testcase.yaml
@@ -1,5 +1,4 @@
 common:
-  depends_on: netif
   min_ram: 60
   tags:
     - http
diff --git a/tests/net/lib/http_server/tls/testcase.yaml b/tests/net/lib/http_server/tls/testcase.yaml
index c163efb2526..19611844a00 100644
--- a/tests/net/lib/http_server/tls/testcase.yaml
+++ b/tests/net/lib/http_server/tls/testcase.yaml
@@ -1,5 +1,4 @@
 common:
-  depends_on: netif
   min_ram: 192
   tags:
     - http

From c23b92fdb261f07fb06e0427c9771c2053698414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:10 +0100
Subject: [PATCH 2048/2913] Revert "[nrf fromtree] bluetooth: host: CS support
 for CS Test"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit dd1272f56ecc3d3b4d7212afcf20745638a752c7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/cs.h        | 467 ---------------------------
 include/zephyr/bluetooth/hci_types.h | 146 ---------
 subsys/bluetooth/host/cs.c           | 104 ------
 subsys/bluetooth/shell/cs.c          |  65 ----
 4 files changed, 782 deletions(-)

diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index 17331290e32..880cbeeeccc 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -60,451 +60,6 @@ struct bt_cs_set_default_settings_param {
 	int8_t max_tx_power;
 };
 
-/** CS Test Main Mode */
-enum bt_cs_test_main_mode {
-	/** CS Test Mode-1 */
-	BT_CS_TEST_MAIN_MODE_1 = BT_HCI_OP_LE_CS_MAIN_MODE_1,
-	/** CS Test Mode-2 */
-	BT_CS_TEST_MAIN_MODE_2 = BT_HCI_OP_LE_CS_MAIN_MODE_2,
-	/** CS Test Mode-3 */
-	BT_CS_TEST_MAIN_MODE_3 = BT_HCI_OP_LE_CS_MAIN_MODE_3,
-};
-
-/** CS Test Sub-Mode */
-enum bt_cs_test_sub_mode {
-	/** CS Test sub-mode-1 */
-	BT_CS_TEST_SUB_MODE_1 = BT_HCI_OP_LE_CS_SUB_MODE_1,
-	/** CS Test sub-mode-2 */
-	BT_CS_TEST_SUB_MODE_2 = BT_HCI_OP_LE_CS_SUB_MODE_2,
-	/** CS Test sub-mode-3 */
-	BT_CS_TEST_SUB_MODE_3 = BT_HCI_OP_LE_CS_SUB_MODE_3,
-	/** No CS Test sub-mode. */
-	BT_CS_TEST_SUB_MODE_UNUSED = BT_HCI_OP_LE_CS_SUB_MODE_UNUSED,
-};
-
-/** CS Test Role */
-enum bt_cs_test_role {
-	BT_CS_TEST_ROLE_INITIATOR = BT_HCI_OP_LE_CS_INITIATOR_ROLE,
-	BT_CS_TEST_ROLE_REFLECTOR = BT_HCI_OP_LE_CS_REFLECTOR_ROLE,
-};
-
-/** CS Test RTT type */
-enum bt_cs_test_rtt_type {
-	/** RTT AA Only */
-	BT_CS_TEST_RTT_AA_ONLY = BT_HCI_OP_LE_CS_RTT_TYPE_AA_ONLY,
-	/** RTT with 32-bit sounding sequence */
-	BT_CS_TEST_RTT_32_BIT_SOUNDING = BT_HCI_OP_LE_CS_RTT_TYPE_32BIT_SOUND,
-	/** RTT with 96-bit sounding sequence */
-	BT_CS_TEST_RTT_96_BIT_SOUNDING = BT_HCI_OP_LE_CS_RTT_TYPE_96BIT_SOUND,
-	/** RTT with 32-bit random sequence */
-	BT_CS_TEST_RTT_32_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_32BIT_RAND,
-	/** RTT with 64-bit random sequence */
-	BT_CS_TEST_RTT_64_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_64BIT_RAND,
-	/** RTT with 96-bit random sequence */
-	BT_CS_TEST_RTT_96_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_96BIT_RAND,
-	/** RTT with 128-bit random sequence */
-	BT_CS_TEST_RTT_128_BIT_RANDOM = BT_HCI_OP_LE_CS_RTT_TYPE_128BIT_RAND,
-};
-
-/** CS Test CS_SYNC PHY */
-enum bt_cs_test_cs_sync_phy {
-	BT_CS_TEST_CS_SYNC_LE_1M_PHY = BT_HCI_OP_LE_CS_CS_SYNC_1M,
-	BT_CS_TEST_CS_SYNC_LE_2M_PHY = BT_HCI_OP_LE_CS_CS_SYNC_2M,
-	BT_CS_TEST_CS_SYNC_LE_2M_2BT_PHY = BT_HCI_OP_LE_CS_CS_SYNC_2M_2BT,
-};
-
-/** CS Test CS_SYNC Antenna Identifier */
-enum bt_cs_test_cs_sync_antenna_selection {
-	BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_ONE = BT_HCI_OP_LE_CS_ANTENNA_SEL_ONE,
-	BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_TWO = BT_HCI_OP_LE_CS_ANTENNA_SEL_TWO,
-	BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_THREE = BT_HCI_OP_LE_CS_ANTENNA_SEL_THREE,
-	BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_FOUR = BT_HCI_OP_LE_CS_ANTENNA_SEL_FOUR,
-};
-
-/** CS Test Tone Antennna Config Selection.
- *
- *  These enum values are indices in the following table, where N_AP is the maximum
- *  number of antenna paths (in the range [1, 4]).
- *
- * +--------------+-------------+-------------------+-------------------+--------+
- * | Config Index | Total Paths | Dev A: # Antennas | Dev B: # Antennas | Config |
- * +--------------+-------------+-------------------+-------------------+--------+
- * |            0 |           1 |                 1 |                 1 | 1:1    |
- * |            1 |           2 |                 2 |                 1 | N_AP:1 |
- * |            2 |           3 |                 3 |                 1 | N_AP:1 |
- * |            3 |           4 |                 4 |                 1 | N_AP:1 |
- * |            4 |           2 |                 1 |                 2 | 1:N_AP |
- * |            5 |           3 |                 1 |                 3 | 1:N_AP |
- * |            6 |           4 |                 1 |                 4 | 1:N_AP |
- * |            7 |           4 |                 2 |                 2 | 2:2    |
- * +--------------+-------------+-------------------+-------------------+--------+
- *
- *  There are therefore four groups of possible antenna configurations:
- *
- *  - 1:1 configuration, where both A and B support 1 antenna each
- *  - 1:N_AP configuration, where A supports 1 antenna, B supports N_AP antennas, and
- *    N_AP is a value in the range [2, 4]
- *  - N_AP:1 configuration, where A supports N_AP antennas, B supports 1 antenna, and
- *    N_AP is a value in the range [2, 4]
- *  - 2:2 configuration, where both A and B support 2 antennas and N_AP = 4
- */
-enum bt_cs_test_tone_antenna_config_selection {
-	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_ONE = BT_HCI_OP_LE_CS_TEST_ACI_0,
-	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_TWO = BT_HCI_OP_LE_CS_TEST_ACI_1,
-	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_THREE = BT_HCI_OP_LE_CS_TEST_ACI_2,
-	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_FOUR = BT_HCI_OP_LE_CS_TEST_ACI_3,
-	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_FIVE = BT_HCI_OP_LE_CS_TEST_ACI_4,
-	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_SIX = BT_HCI_OP_LE_CS_TEST_ACI_5,
-	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_SEVEN = BT_HCI_OP_LE_CS_TEST_ACI_6,
-	BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_EIGHT = BT_HCI_OP_LE_CS_TEST_ACI_7,
-};
-
-/** CS Test Initiator SNR control options */
-enum bt_cs_test_initiator_snr_control {
-	BT_CS_TEST_INITIATOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_18,
-	BT_CS_TEST_INITIATOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_21,
-	BT_CS_TEST_INITIATOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_24,
-	BT_CS_TEST_INITIATOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_27,
-	BT_CS_TEST_INITIATOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_30,
-	BT_CS_TEST_INITIATOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_NOT_USED,
-};
-
-/** CS Test Reflector SNR control options */
-enum bt_cs_test_reflector_snr_control {
-	BT_CS_TEST_REFLECTOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_18,
-	BT_CS_TEST_REFLECTOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_21,
-	BT_CS_TEST_REFLECTOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_24,
-	BT_CS_TEST_REFLECTOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_27,
-	BT_CS_TEST_REFLECTOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_30,
-	BT_CS_TEST_REFLECTOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_NOT_USED,
-};
-
-/** CS Test Override 0 channel selection algorithm selection */
-enum bt_cs_test_override_0_chsel_alg {
-	BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3B = BT_HCI_OP_LE_CS_TEST_CHSEL_TYPE_3B,
-	BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3C = BT_HCI_OP_LE_CS_TEST_CHSEL_TYPE_3C,
-};
-
-/** CS Test Override 0 chsel #3c shape */
-enum bt_cs_test_override_0_ch3c_shape {
-	BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3C_HAT_SHAPE = BT_HCI_OP_LE_CS_TEST_CH3C_SHAPE_HAT,
-	BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3C_X_SHAPE = BT_HCI_OP_LE_CS_TEST_CH3C_SHAPE_X,
-};
-
-/** CS Test Override 3 T_PM Tone Extension */
-enum bt_cs_test_override_3_pm_tone_ext {
-	/** Initiator and reflector tones sent without tone extension */
-	BT_CS_TEST_OVERRIDE_3_NO_TONE_EXT = BT_HCI_OP_LE_CS_TEST_TONE_EXT_NONE,
-	/** Initiator tone sent with extension, reflector tone sent without tone extension */
-	BT_CS_TEST_OVERRIDE_3_INITIATOR_TONE_EXT_ONLY = BT_HCI_OP_LE_CS_TEST_TONE_EXT_INIT,
-	/** Initiator tone sent without extension, reflector tone sent with tone extension */
-	BT_CS_TEST_OVERRIDE_3_REFLECTOR_TONE_EXT_ONLY = BT_HCI_OP_LE_CS_TEST_TONE_EXT_REFL,
-	/** Initiator and reflector tones sent with tone extension */
-	BT_CS_TEST_OVERRIDE_3_INITIATOR_AND_REFLECTOR_TONE_EXT = BT_HCI_OP_LE_CS_TEST_TONE_EXT_BOTH,
-	/** Applicable for mode-2 and mode-3 only:
-	 *
-	 *  Loop through:
-	 *   - @ref BT_CS_TEST_OVERRIDE_3_NO_TONE_EXT
-	 *   - @ref BT_CS_TEST_OVERRIDE_3_INITIATOR_TONE_EXT_ONLY
-	 *   - @ref BT_CS_TEST_OVERRIDE_3_REFLECTOR_TONE_EXT_ONLY
-	 *   - @ref BT_CS_TEST_OVERRIDE_3_INITIATOR_AND_REFLECTOR_TONE_EXT
-	 */
-	BT_CS_TEST_OVERRIDE_3_REPETITIVE_TONE_EXT = BT_HCI_OP_LE_CS_TEST_TONE_EXT_REPEAT,
-};
-
-/** CS Test Override 4 Tone Antenna Permutation.
- *
- *  These values represent indices in an antenna path permutation table.
- *
- *  Which table is applicable (and which indices are valid)
- *  depends on the maximum number of antenna paths (N_AP).
- *
- *  If N_AP = 2, the permutation table is:
- *
- * +--------------------------------+------------------------------------------+
- * | Antenna Path Permutation Index | Antenna Path Positions After Permutation |
- * +--------------------------------+------------------------------------------+
- * | 0                              | A1 A2                                    |
- * | 1                              | A2 A1                                    |
- * +--------------------------------+------------------------------------------+
- *
- * If N_AP = 3, the permutation table is:
- *
- * +--------------------------------+------------------------------------------+
- * | Antenna Path Permutation Index | Antenna Path Positions After Permutation |
- * +--------------------------------+------------------------------------------+
- * | 0                              | A1 A2 A3                                 |
- * | 1                              | A2 A1 A3                                 |
- * | 2                              | A1 A3 A2                                 |
- * | 3                              | A3 A1 A2                                 |
- * | 4                              | A3 A2 A1                                 |
- * | 5                              | A2 A3 A1                                 |
- * +--------------------------------+------------------------------------------+
- *
- * If N_AP = 4, the permutation table is:
- *
- * +--------------------------------+------------------------------------------+
- * | Antenna Path Permutation Index | Antenna Path Positions After Permutation |
- * +--------------------------------+------------------------------------------+
- * | 0                              | A1 A2 A3 A4                              |
- * | 1                              | A2 A1 A3 A4                              |
- * | 2                              | A1 A3 A2 A4                              |
- * | 3                              | A3 A1 A2 A4                              |
- * | 4                              | A3 A2 A1 A4                              |
- * | 5                              | A2 A3 A1 A4                              |
- * | 6                              | A1 A2 A4 A3                              |
- * | 7                              | A2 A1 A4 A3                              |
- * | 8                              | A1 A4 A2 A3                              |
- * | 9                              | A4 A1 A2 A3                              |
- * | 10                             | A4 A2 A1 A3                              |
- * | 11                             | A2 A4 A1 A3                              |
- * | 12                             | A1 A4 A3 A2                              |
- * | 13                             | A4 A1 A3 A2                              |
- * | 14                             | A1 A3 A4 A2                              |
- * | 15                             | A3 A1 A4 A2                              |
- * | 16                             | A3 A4 A1 A2                              |
- * | 17                             | A4 A3 A1 A2                              |
- * | 18                             | A4 A2 A3 A1                              |
- * | 19                             | A2 A4 A3 A1                              |
- * | 20                             | A4 A3 A2 A1                              |
- * | 21                             | A3 A4 A2 A1                              |
- * | 22                             | A3 A2 A4 A1                              |
- * | 23                             | A2 A3 A4 A1                              |
- * +--------------------------------+------------------------------------------+
- */
-enum bt_cs_test_override_4_tone_antenna_permutation {
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_00 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_00,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_01 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_01,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_02 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_02,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_03 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_03,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_04 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_04,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_05 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_05,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_06 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_06,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_07 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_07,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_08 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_08,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_09 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_09,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_10 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_10,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_11 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_11,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_12 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_12,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_13 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_13,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_14 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_14,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_15 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_15,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_16 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_16,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_17 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_17,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_18 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_18,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_19 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_19,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_20 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_20,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_21 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_21,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_22 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_22,
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_23 = BT_HCI_OP_LE_CS_TEST_AP_INDEX_23,
-	/** Loop through all valid Antenna Permuation Indices starting
-	 *  from the lowest index.
-	 */
-	BT_CS_TEST_OVERRIDE_4_ANTENNA_PERMUTATION_INDEX_LOOP = BT_HCI_OP_LE_CS_TEST_AP_INDEX_LOOP,
-};
-
-/** CS Test Override 7 Sounding Sequence Marker Value */
-enum bt_cs_test_override_7_ss_marker_value {
-	BT_CS_TEST_OVERRIDE_7_SS_MARKER_VAL_0011 = BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_0011,
-	BT_CS_TEST_OVERRIDE_7_SS_MARKER_VAL_1100 = BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_1100,
-	/** Loop through pattern '0011' and '1100' (in transmission order) */
-	BT_CS_TEST_OVERRIDE_7_SS_MARKER_VAL_LOOP = BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_LOOP,
-};
-
-/** CS Test Override 8 CS_SYNC Payload Pattern */
-enum bt_cs_test_override_8_cs_sync_payload_pattern {
-	/** PRBS9 payload sequence. */
-	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_PRBS9 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_PRBS9,
-	/** Repeated '11110000' payload sequence. */
-	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_11110000 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_11110000,
-	/** Repeated '10101010' payload sequence. */
-	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_10101010 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_10101010,
-	/** PRBS15 payload sequence. */
-	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_PRBS15 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_PRBS15,
-	/** Repeated '11111111' payload sequence. */
-	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_11111111 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_11111111,
-	/** Repeated '00000000' payload sequence. */
-	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_00000000 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_00000000,
-	/** Repeated '00001111' payload sequence. */
-	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_00001111 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_00001111,
-	/** Repeated '01010101' payload sequence. */
-	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_01010101 = BT_HCI_OP_LE_CS_TEST_PAYLOAD_01010101,
-	/** Custom payload provided by the user. */
-	BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_USER = BT_HCI_OP_LE_CS_TEST_PAYLOAD_USER,
-};
-
-/** CS Test parameters */
-struct bt_cs_test_param {
-	/** CS mode to be used during the CS procedure. */
-	enum bt_cs_test_main_mode main_mode;
-	/** CS sub-mode to be used during the CS procedure. */
-	enum bt_cs_test_sub_mode sub_mode;
-	/** Number of main mode steps taken from the end of the last CS subevent
-	 * to be repeated at the beginning of the current CS subevent directly
-	 * after the last mode-0 step of that event.
-	 */
-	uint8_t main_mode_repetition;
-	/** Number of CS mode-0 steps at the beginning of the test CS subevent. */
-	uint8_t mode_0_steps;
-	/** CS Test role */
-	enum bt_cs_test_role role;
-	/** RTT variant */
-	enum bt_cs_test_rtt_type rtt_type;
-	/** CS_SYNC PHY */
-	enum bt_cs_test_cs_sync_phy cs_sync_phy;
-	/** Antenna identifier to be used for CS_SYNC packets. */
-	enum bt_cs_test_cs_sync_antenna_selection cs_sync_antenna_selection;
-	/** CS subevent length in microseconds.
-	 *
-	 *  Range: 1250us to 4s
-	 */
-	uint32_t subevent_len;
-	/** Gap between the start of two consecutive CS subevents (N * 0.625 ms)
-	 *
-	 *  A value of 0 means that there is only one CS subevent.
-	 */
-	uint16_t subevent_interval;
-	/** Maximum allowed number of subevents in the procedure.
-	 *
-	 *  A value of 0 means that this parameter is ignored.
-	 */
-	uint8_t max_num_subevents;
-	/** Desired TX power level for the CS procedure.
-	 *
-	 *  Value range is @ref BT_HCI_OP_LE_CS_MIN_MAX_TX_POWER to
-	 *  @ref BT_HCI_OP_LE_CS_MAX_MAX_TX_POWER.
-	 *
-	 *  Special values:
-	 *    - @ref BT_HCI_OP_LE_CS_TEST_MAXIMIZE_TX_POWER tells the controller
-	 *      it should use as high a transmit power as possible
-	 *    - @ref BT_HCI_OP_LE_CS_TEST_MINIMIZE_TX_POWER tells the controller
-	 *      it should use as low a transmit power as possible
-	 */
-	uint8_t transmit_power_level;
-	/** Interlude time in microseconds between the RTT packets. */
-	uint8_t t_ip1_time;
-	/** Interlude time in microseconds between the CS tones. */
-	uint8_t t_ip2_time;
-	/** Time in microseconds for frequency changes. */
-	uint8_t t_fcs_time;
-	/** Time in microseconds for the phase measurement period of the CS tones. */
-	uint8_t t_pm_time;
-	/** Time in microseconds for the antenna switch period of the CS tones. */
-	uint8_t t_sw_time;
-	/** Antenna Configuration Index used during antenna switching during
-	 *  the tone phases of CS steps.
-	 */
-	enum bt_cs_test_tone_antenna_config_selection tone_antenna_config_selection;
-	/** Initiator SNR control options */
-	enum bt_cs_test_initiator_snr_control initiator_snr_control;
-	/** Reflector SNR control options */
-	enum bt_cs_test_reflector_snr_control reflector_snr_control;
-	/** Determines octets 14 and 15 of the initial value of the DRBG nonce. */
-	uint16_t drbg_nonce;
-
-	/** Override configuration.
-	 *
-	 *  This parameter is used to override CS parameters from the DRBG.
-	 *  Each bit configures a different set of parameters.
-	 *
-	 *  All overrides are optional, except for those configured by bit 0.
-	 *
-	 *  These are:
-	 *    - Bit 0 set: Override using list of channels
-	 *    - Bit 0 not set: Override using channel map
-	 *    - Bit 2 set: Override main mode steps
-	 *    - Bit 3 set: Override T_PM_Tone_Ext
-	 *    - Bit 4 set: Override tone antenna permutation
-	 *    - Bit 5 set: Override CS_SYNC AA
-	 *    - Bit 6 set: Override SS marker positions
-	 *    - Bit 7 set: Override SS marker value
-	 *    - Bit 8 set: Override CS_SYNC payload pattern and user payload
-	 *    - Bit 10 set: Procedure is replaced with a stable phase test
-	 */
-	uint16_t override_config;
-
-	/** override config bit 0. */
-	struct {
-		/** Number of times the channels indicated by the channel map or channel field
-		 *  are cycled through for non-mode-0 steps within a CS procedure.
-		 */
-		uint8_t channel_map_repetition;
-		union {
-			struct {
-				uint8_t num_channels;
-				uint8_t *channels;
-			} set;
-			struct {
-				uint8_t channel_map[10];
-				enum bt_cs_test_override_0_chsel_alg channel_selection_type;
-				enum bt_cs_test_override_0_ch3c_shape ch3c_shape;
-				uint8_t ch3c_jump;
-			} not_set;
-		};
-	} override_config_0;
-
-	/** Override config bit 2. These parameters are ignored if the bit is not set. */
-	struct {
-		uint8_t main_mode_steps;
-	} override_config_2;
-
-	/** Override config bit 3. These parameters are ignored if the bit is not set.  */
-	struct {
-		enum bt_cs_test_override_3_pm_tone_ext t_pm_tone_ext;
-	} override_config_3;
-
-	/** Override config bit 4. These parameters are ignored if the bit is not set. */
-	struct {
-		enum bt_cs_test_override_4_tone_antenna_permutation tone_antenna_permutation;
-	} override_config_4;
-
-	/** Override config bit 5. These parameters are ignored if the bit is not set.  */
-	struct {
-		/** Access Address used in CS_SYNC packets sent by the initiator. */
-		uint32_t cs_sync_aa_initiator;
-		/** Access Address used in CS_SYNC packets sent by the reflector. */
-		uint32_t cs_sync_aa_reflector;
-	} override_config_5;
-
-	/** Override config bit 6. These parameters are ignored if the bit is not set. */
-	struct {
-		/** Bit number where the first marker in the channel sounding sequence starts.
-		 *
-		 *  Must be between 0 and 28 when using @ref BT_CS_TEST_RTT_32_BIT_SOUNDING.
-		 */
-		uint8_t ss_marker1_position;
-		/** Bit number where the second marker in the channel sounding sequence starts.
-		 *
-		 *  Must be between 67 and 92 when using @ref BT_CS_TEST_RTT_96_BIT_SOUNDING.
-		 *
-		 *  A value of @ref BT_HCI_OP_LE_CS_TEST_SS_MARKER_2_POSITION_NOT_PRESENT
-		 *  indicates that this sounding sequence or marker is not present.
-		 */
-		uint8_t ss_marker2_position;
-	} override_config_6;
-
-	/** Override config bit 7. These parameters are ignored if the bit is not set. */
-	struct {
-		/** Value of the Sounding Sequence marker. */
-		enum bt_cs_test_override_7_ss_marker_value ss_marker_value;
-	} override_config_7;
-
-	/** Override config bit 8. These parameters are ignored if the bit is not set.  */
-	struct {
-		/** CS_SYNC payload pattern selection. */
-		enum bt_cs_test_override_8_cs_sync_payload_pattern cs_sync_payload_pattern;
-		/** User payload for CS_SYNC packets.
-		 *
-		 *  This parameter is only used when using
-		 *  @ref BT_CS_TEST_OVERRIDE_8_PAYLOAD_PATTERN_USER
-		 *
-		 *  The least significant bit corresponds to the most significant bit
-		 *  of the CS payload. When the sequence is less than 16 octets,
-		 *  the least significant octets shall be padded with zeros.
-		 */
-		uint8_t cs_sync_user_payload[16];
-	} override_config_8;
-};
 
 /** @brief Read Remote Supported Capabilities
  *
@@ -547,28 +102,6 @@ int bt_cs_set_default_settings(struct bt_conn *conn,
  */
 int bt_cs_read_remote_fae_table(struct bt_conn *conn);
 
-/** @brief Start a CS test
- *
- * This command is used to start a CS test where the IUT is placed in the role
- * of either the initiator or reflector.
- *
- * The first mode-0 channel in the list is used as the starting channel for
- * the test. At the beginning of any test, the IUT in the flector role shall
- * listen on the first mode-0 channel until it receives the first transmission
- * from the initiator. Similarly, with the IUT in the initiator role, the tester
- * will start by listening on the first mode-0 channel and the IUT shall transmit
- * on that channel for the first half of the first CS step. Thereafter, the
- * parameters of this command describe the required transmit and receive behavior
- * for the CS test.
- *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
- *
- * @param params CS Test parameters
- *
- * @return Zero on success or (negative) error code on failure.
- */
-int bt_cs_start_test(const struct bt_cs_test_param *params);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 31b30bbcf96..48d7196c9e6 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -2436,152 +2436,6 @@ struct bt_hci_cp_le_read_remote_fae_table {
 	uint16_t handle;
 } __packed;
 
-
-#define BT_HCI_OP_LE_CS_TEST BT_OP(BT_OGF_LE, 0x0095) /* 0x2095 */
-
-#define BT_HCI_OP_LE_CS_MAIN_MODE_1 0x1
-#define BT_HCI_OP_LE_CS_MAIN_MODE_2 0x2
-#define BT_HCI_OP_LE_CS_MAIN_MODE_3 0x3
-
-#define BT_HCI_OP_LE_CS_SUB_MODE_1 0x1
-#define BT_HCI_OP_LE_CS_SUB_MODE_2 0x2
-#define BT_HCI_OP_LE_CS_SUB_MODE_3 0x3
-#define BT_HCI_OP_LE_CS_SUB_MODE_UNUSED 0xFF
-
-#define BT_HCI_OP_LE_CS_INITIATOR_ROLE 0x0
-#define BT_HCI_OP_LE_CS_REFLECTOR_ROLE 0x1
-
-#define BT_HCI_OP_LE_CS_RTT_TYPE_AA_ONLY     0x0
-#define BT_HCI_OP_LE_CS_RTT_TYPE_32BIT_SOUND 0x1
-#define BT_HCI_OP_LE_CS_RTT_TYPE_96BIT_SOUND 0x2
-#define BT_HCI_OP_LE_CS_RTT_TYPE_32BIT_RAND  0x3
-#define BT_HCI_OP_LE_CS_RTT_TYPE_64BIT_RAND  0x4
-#define BT_HCI_OP_LE_CS_RTT_TYPE_96BIT_RAND  0x5
-#define BT_HCI_OP_LE_CS_RTT_TYPE_128BIT_RAND 0x6
-
-#define BT_HCI_OP_LE_CS_CS_SYNC_1M     0x1
-#define BT_HCI_OP_LE_CS_CS_SYNC_2M     0x2
-#define BT_HCI_OP_LE_CS_CS_SYNC_2M_2BT 0x3
-
-#define BT_HCI_OP_LE_CS_TEST_MAXIMIZE_TX_POWER 0x7E
-#define BT_HCI_OP_LE_CS_TEST_MINIMIZE_TX_POWER 0x7F
-
-#define BT_HCI_OP_LE_CS_TEST_ACI_0 0x0
-#define BT_HCI_OP_LE_CS_TEST_ACI_1 0x1
-#define BT_HCI_OP_LE_CS_TEST_ACI_2 0x2
-#define BT_HCI_OP_LE_CS_TEST_ACI_3 0x3
-#define BT_HCI_OP_LE_CS_TEST_ACI_4 0x4
-#define BT_HCI_OP_LE_CS_TEST_ACI_5 0x5
-#define BT_HCI_OP_LE_CS_TEST_ACI_6 0x6
-#define BT_HCI_OP_LE_CS_TEST_ACI_7 0x7
-
-#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_18 0x0
-#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_21 0x1
-#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_24 0x2
-#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_27 0x3
-#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_30 0x4
-#define BT_HCI_OP_LE_CS_TEST_INITIATOR_SNR_NOT_USED 0xFF
-
-#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_18 0x0
-#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_21 0x1
-#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_24 0x2
-#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_27 0x3
-#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_30 0x4
-#define BT_HCI_OP_LE_CS_TEST_REFLECTOR_SNR_NOT_USED 0xFF
-
-#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_0_MASK BIT(0)
-#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_2_MASK BIT(2)
-#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_3_MASK BIT(3)
-#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_4_MASK BIT(4)
-#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_5_MASK BIT(5)
-#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_6_MASK BIT(6)
-#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_7_MASK BIT(7)
-#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_8_MASK BIT(8)
-#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_10_MASK BIT(10)
-
-#define BT_HCI_OP_LE_CS_TEST_CHSEL_TYPE_3B 0x0
-#define BT_HCI_OP_LE_CS_TEST_CHSEL_TYPE_3C 0x1
-
-#define BT_HCI_OP_LE_CS_TEST_CH3C_SHAPE_HAT 0x0
-#define BT_HCI_OP_LE_CS_TEST_CH3C_SHAPE_X   0x1
-
-#define BT_HCI_OP_LE_CS_TEST_TONE_EXT_NONE 0x0
-#define BT_HCI_OP_LE_CS_TEST_TONE_EXT_INIT 0x1
-#define BT_HCI_OP_LE_CS_TEST_TONE_EXT_REFL 0x2
-#define BT_HCI_OP_LE_CS_TEST_TONE_EXT_BOTH 0x3
-#define BT_HCI_OP_LE_CS_TEST_TONE_EXT_REPEAT 0x4
-
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_00 0x0
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_01 0x1
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_02 0x2
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_03 0x3
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_04 0x4
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_05 0x5
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_06 0x6
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_07 0x7
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_08 0x8
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_09 0x9
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_10 0xA
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_11 0xB
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_12 0xC
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_13 0xD
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_14 0xE
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_15 0xF
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_16 0x10
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_17 0x11
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_18 0x12
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_19 0x13
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_20 0x14
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_21 0x15
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_22 0x16
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_23 0x17
-#define BT_HCI_OP_LE_CS_TEST_AP_INDEX_LOOP 0xFF
-
-#define BT_HCI_OP_LE_CS_TEST_SS_MARKER_2_POSITION_NOT_PRESENT 0xFF
-
-#define BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_0011 0x0
-#define BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_1100 0x1
-#define BT_HCI_OP_LE_CS_TEST_SS_MARKER_VAL_LOOP 0x2
-
-#define BT_HCI_OP_LE_CS_TEST_PAYLOAD_PRBS9    0x00
-#define BT_HCI_OP_LE_CS_TEST_PAYLOAD_11110000 0x01
-#define BT_HCI_OP_LE_CS_TEST_PAYLOAD_10101010 0x02
-#define BT_HCI_OP_LE_CS_TEST_PAYLOAD_PRBS15   0x03
-#define BT_HCI_OP_LE_CS_TEST_PAYLOAD_11111111 0x04
-#define BT_HCI_OP_LE_CS_TEST_PAYLOAD_00000000 0x05
-#define BT_HCI_OP_LE_CS_TEST_PAYLOAD_00001111 0x06
-#define BT_HCI_OP_LE_CS_TEST_PAYLOAD_01010101 0x07
-#define BT_HCI_OP_LE_CS_TEST_PAYLOAD_USER     0x80
-
-struct bt_hci_op_le_cs_test {
-	uint8_t main_mode_type;
-	uint8_t sub_mode_type;
-	uint8_t main_mode_repetition;
-	uint8_t mode_0_steps;
-	uint8_t role;
-	uint8_t rtt_type;
-	uint8_t cs_sync_phy;
-	uint8_t cs_sync_antenna_selection;
-	uint8_t subevent_len[3];
-	uint16_t subevent_interval;
-	uint8_t max_num_subevents;
-	uint8_t transmit_power_level;
-	uint8_t t_ip1_time;
-	uint8_t t_ip2_time;
-	uint8_t t_fcs_time;
-	uint8_t t_pm_time;
-	uint8_t t_sw_time;
-	uint8_t tone_antenna_config_selection;
-	uint8_t reserved;
-	uint8_t snr_control_initiator;
-	uint8_t snr_control_reflector;
-	uint16_t drbg_nonce;
-	uint8_t channel_map_repetition;
-	uint16_t override_config;
-	uint8_t override_parameters_length;
-	uint8_t override_parameters_data[];
-} __packed;
-
 /* Event definitions */
 
 #define BT_HCI_EVT_UNKNOWN                      0x00
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index 5a713ad2457..78b42dc399e 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -222,108 +222,4 @@ void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf)
 
 	bt_conn_unref(conn);
 }
-
-int bt_cs_start_test(const struct bt_cs_test_param *params)
-{
-	struct bt_hci_op_le_cs_test *cp;
-	struct net_buf *buf;
-
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_TEST, sizeof(*cp));
-	if (!buf) {
-		return -ENOBUFS;
-	}
-
-	cp = net_buf_add(buf, sizeof(*cp));
-
-	cp->main_mode_type = params->main_mode;
-	cp->sub_mode_type = params->sub_mode;
-	cp->main_mode_repetition = params->main_mode_repetition;
-	cp->mode_0_steps = params->mode_0_steps;
-	cp->role = params->role;
-	cp->rtt_type = params->rtt_type;
-	cp->cs_sync_phy = params->cs_sync_phy;
-	cp->cs_sync_antenna_selection = params->cs_sync_antenna_selection;
-	sys_put_le24(params->subevent_len, cp->subevent_len);
-	cp->subevent_interval = sys_cpu_to_le16(params->subevent_interval);
-	cp->max_num_subevents = params->max_num_subevents;
-	cp->transmit_power_level = params->transmit_power_level;
-	cp->t_ip1_time = params->t_ip1_time;
-	cp->t_ip2_time = params->t_ip2_time;
-	cp->t_fcs_time = params->t_fcs_time;
-	cp->t_pm_time = params->t_pm_time;
-	cp->t_sw_time = params->t_sw_time;
-	cp->tone_antenna_config_selection = params->tone_antenna_config_selection;
-
-	cp->reserved = 0;
-
-	cp->snr_control_initiator = params->initiator_snr_control;
-	cp->snr_control_reflector = params->reflector_snr_control;
-	cp->drbg_nonce = sys_cpu_to_le16(params->drbg_nonce);
-	cp->channel_map_repetition = params->override_config_0.channel_map_repetition;
-	cp->override_config = sys_cpu_to_le16(params->override_config);
-
-	uint8_t override_parameters_length = 0;
-
-	if (params->override_config & BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_0_MASK) {
-		const uint8_t num_channels = params->override_config_0.set.num_channels;
-
-		net_buf_add_u8(buf, num_channels);
-		override_parameters_length++;
-		net_buf_add_mem(buf, params->override_config_0.set.channels, num_channels);
-		override_parameters_length += num_channels;
-	} else {
-		net_buf_add_mem(buf, params->override_config_0.not_set.channel_map,
-				sizeof(params->override_config_0.not_set.channel_map));
-		net_buf_add_u8(buf, params->override_config_0.not_set.channel_selection_type);
-		net_buf_add_u8(buf, params->override_config_0.not_set.ch3c_shape);
-		net_buf_add_u8(buf, params->override_config_0.not_set.ch3c_jump);
-
-		override_parameters_length +=
-			(sizeof(params->override_config_0.not_set.channel_map) +
-			 sizeof(params->override_config_0.not_set.channel_selection_type) +
-			 sizeof(params->override_config_0.not_set.ch3c_shape) +
-			 sizeof(params->override_config_0.not_set.ch3c_jump));
-	}
-
-	if (params->override_config & BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_2_MASK) {
-		net_buf_add_mem(buf, &params->override_config_2, sizeof(params->override_config_2));
-		override_parameters_length += sizeof(params->override_config_2);
-	}
-
-	if (params->override_config & BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_3_MASK) {
-		net_buf_add_mem(buf, &params->override_config_3, sizeof(params->override_config_3));
-		override_parameters_length += sizeof(params->override_config_3);
-	}
-
-	if (params->override_config & BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_4_MASK) {
-		net_buf_add_mem(buf, &params->override_config_4, sizeof(params->override_config_4));
-		override_parameters_length += sizeof(params->override_config_4);
-	}
-
-	if (params->override_config & BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_5_MASK) {
-		net_buf_add_le32(buf, params->override_config_5.cs_sync_aa_initiator);
-		net_buf_add_le32(buf, params->override_config_5.cs_sync_aa_reflector);
-		override_parameters_length += sizeof(params->override_config_5);
-	}
-
-	if (params->override_config & BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_6_MASK) {
-		net_buf_add_mem(buf, &params->override_config_6, sizeof(params->override_config_6));
-		override_parameters_length += sizeof(params->override_config_6);
-	}
-
-	if (params->override_config & BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_7_MASK) {
-		net_buf_add_mem(buf, &params->override_config_7, sizeof(params->override_config_7));
-		override_parameters_length += sizeof(params->override_config_7);
-	}
-
-	if (params->override_config & BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_8_MASK) {
-		net_buf_add_mem(buf, &params->override_config_8, sizeof(params->override_config_8));
-		override_parameters_length += sizeof(params->override_config_8);
-	}
-
-	cp->override_parameters_length = override_parameters_length;
-
-	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_TEST, buf, NULL);
-}
-
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
diff --git a/subsys/bluetooth/shell/cs.c b/subsys/bluetooth/shell/cs.c
index b8f32be61be..fbe089155cc 100644
--- a/subsys/bluetooth/shell/cs.c
+++ b/subsys/bluetooth/shell/cs.c
@@ -133,67 +133,6 @@ static int cmd_read_remote_fae_table(const struct shell *sh, size_t argc, char *
 
 	return 0;
 }
-
-static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
-{
-	int err = 0;
-	struct bt_cs_test_param params;
-
-	params.main_mode = BT_CS_TEST_MAIN_MODE_1;
-	params.sub_mode = BT_CS_TEST_SUB_MODE_UNUSED;
-	params.main_mode_repetition = 0;
-	params.mode_0_steps = 0x1;
-
-	params.role = shell_strtoul(argv[1], 16, &err);
-
-	if (err) {
-		shell_help(sh);
-		shell_error(sh, "Could not parse input 1, Role selection");
-		return SHELL_CMD_HELP_PRINTED;
-	}
-
-	if (params.role != BT_CS_TEST_ROLE_INITIATOR && params.role != BT_CS_TEST_ROLE_REFLECTOR) {
-		shell_help(sh);
-		shell_error(sh, "Role selection input invalid");
-		return SHELL_CMD_HELP_PRINTED;
-	}
-
-	params.rtt_type = BT_CS_TEST_RTT_AA_ONLY;
-	params.cs_sync_phy = BT_CS_TEST_CS_SYNC_LE_1M_PHY;
-	params.cs_sync_antenna_selection = BT_CS_TEST_CS_SYNC_ANTENNA_SELECTION_ONE;
-	params.subevent_len = 10000;
-	params.subevent_interval = 0;
-	params.max_num_subevents = 0;
-	params.transmit_power_level = BT_HCI_OP_LE_CS_TEST_MAXIMIZE_TX_POWER;
-	params.t_ip1_time = 80;
-	params.t_ip2_time = 80;
-	params.t_fcs_time = 120;
-	params.t_pm_time = 20;
-	params.t_sw_time = 0;
-	params.tone_antenna_config_selection = BT_CS_TEST_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
-	params.initiator_snr_control = BT_CS_TEST_INITIATOR_SNR_CONTROL_NOT_USED;
-	params.reflector_snr_control = BT_CS_TEST_REFLECTOR_SNR_CONTROL_NOT_USED;
-	params.drbg_nonce = 0x1234;
-	params.override_config = 0;
-	params.override_config_0.channel_map_repetition = 1;
-	memset(params.override_config_0.not_set.channel_map, 0,
-		sizeof(params.override_config_0.not_set.channel_map));
-	params.override_config_0.not_set.channel_map[1] = 0xFF;
-	params.override_config_0.not_set.channel_selection_type =
-		BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3B;
-	params.override_config_0.not_set.ch3c_shape =
-		BT_CS_TEST_OVERRIDE_0_CHSEL_ALG_3C_HAT_SHAPE;
-	params.override_config_0.not_set.ch3c_jump = 0x2;
-
-	err = bt_cs_start_test(&params);
-	if (err) {
-		shell_error(sh, "bt_cs_start_test returned error %d", err);
-		return -ENOEXEC;
-	}
-
-	return 0;
-}
-
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	cs_cmds,
 	SHELL_CMD_ARG(
@@ -209,10 +148,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		read_remote_fae_table, NULL,
 		"<None>",
 		cmd_read_remote_fae_table, 1, 0),
-	SHELL_CMD_ARG(
-		start_simple_cs_test, NULL,
-		"<Role selection (initiator, reflector): 0, 1>",
-		cmd_cs_test_simple, 2, 0),
 	SHELL_SUBCMD_SET_END);
 
 static int cmd_cs(const struct shell *sh, size_t argc, char **argv)

From 53f974b7aa10ee5389f2edeb68712133d7190ee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:10 +0100
Subject: [PATCH 2049/2913] Revert "[nrf fromtree] bluetooth: host: CS support
 for remote capabilities and FAE table"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2efd4bcf4470f852db53131956bcf3b8f9e2bdf6.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 include/zephyr/bluetooth/conn.h       | 175 -------------------------
 include/zephyr/bluetooth/cs.h         |  27 ----
 include/zephyr/bluetooth/hci_types.h  | 109 ----------------
 subsys/bluetooth/host/conn.c          |  36 -----
 subsys/bluetooth/host/conn_internal.h |   6 -
 subsys/bluetooth/host/cs.c            | 181 --------------------------
 subsys/bluetooth/host/hci_core.c      |  23 ----
 subsys/bluetooth/host/hci_core.h      |   4 -
 subsys/bluetooth/shell/bt.c           |  76 -----------
 subsys/bluetooth/shell/cs.c           |  43 ------
 10 files changed, 680 deletions(-)

diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index 6ddc9835ceb..fa741715504 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -262,157 +262,6 @@ enum __packed bt_conn_type {
 			   BT_CONN_TYPE_SCO | BT_CONN_TYPE_ISO,
 };
 
-/** Supported AA-Only RTT precision. */
-enum bt_conn_le_cs_capability_rtt_aa_only {
-	/** AA-Only RTT variant is not supported. */
-	BT_CONN_LE_CS_RTT_AA_ONLY_NOT_SUPP = 0,
-	/** 10ns time-of-flight accuracy. */
-	BT_CONN_LE_CS_RTT_AA_ONLY_10NS,
-	/** 150ns time-of-flight accuracy. */
-	BT_CONN_LE_CS_RTT_AA_ONLY_150NS,
-};
-
-/** Supported Sounding Sequence RTT precision. */
-enum bt_conn_le_cs_capability_rtt_sounding {
-	/** Sounding Sequence RTT variant is not supported. */
-	BT_CONN_LE_CS_RTT_SOUNDING_NOT_SUPP = 0,
-	/** 10ns time-of-flight accuracy. */
-	BT_CONN_LE_CS_RTT_SOUNDING_10NS,
-	/** 150ns time-of-flight accuracy. */
-	BT_CONN_LE_CS_RTT_SOUNDING_150NS,
-};
-
-/** Supported Random Payload RTT precision. */
-enum bt_conn_le_cs_capability_rtt_random_payload {
-	/** Random Payload RTT variant is not supported. */
-	BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_NOT_SUPP = 0,
-	/** 10ns time-of-flight accuracy. */
-	BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_10NS,
-	/** 150ns time-of-flight accuracy. */
-	BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_150NS,
-};
-
-/** Remote channel sounding capabilities for LE connections supporting CS */
-struct bt_conn_le_cs_capabilities {
-	/** Number of CS configurations */
-	uint8_t num_config_supported;
-	/** Maximum number of consecutive CS procedures.
-	 *
-	 * When set to zero, indicates support for both fixed and indefinite
-	 * numbers of CS procedures before termination.
-	 */
-	uint16_t max_consecutive_procedures_supported;
-	/** Number of antennas. */
-	uint8_t num_antennas_supported;
-	/** Maximum number of antenna paths. */
-	uint8_t max_antenna_paths_supported;
-	/** Initiator role. */
-	bool initiator_supported;
-	/** Reflector role. */
-	bool reflector_supported;
-	/** Mode-3 */
-	bool mode_3_supported;
-	/** RTT AA-Only */
-	enum bt_conn_le_cs_capability_rtt_aa_only rtt_aa_only_precision;
-	/** RTT Sounding */
-	enum bt_conn_le_cs_capability_rtt_sounding rtt_sounding_precision;
-	/** RTT Random Payload */
-	enum bt_conn_le_cs_capability_rtt_random_payload rtt_random_payload_precision;
-	/** Number of CS steps needed to achieve the
-	 * accuracy requirements for RTT AA Only.
-	 *
-	 * Set to 0 if RTT AA Only isn't supported.
-	 */
-	uint8_t rtt_aa_only_n;
-	/** Number of CS steps needed to achieve the
-	 * accuracy requirements for RTT Sounding.
-	 *
-	 * Set to 0 if RTT Sounding isn't supported
-	 */
-	uint8_t rtt_sounding_n;
-	/** Number of CS steps needed to achieve the
-	 * accuracy requirements for RTT Random Payload.
-	 *
-	 * Set to 0 if RTT Random Payload isn't supported.
-	 */
-	uint8_t rtt_random_payload_n;
-	/** Phase-based normalized attack detector metric
-	 * when a CS_SYNC with sounding sequence is received.
-	 */
-	bool phase_based_nadm_sounding_supported;
-	/** Phase-based normalized attack detector metric
-	 * when a CS_SYNC with random sequence is received.
-	 */
-	bool phase_based_nadm_random_supported;
-	/** CS_SYNC LE 2M PHY. */
-	bool cs_sync_2m_phy_supported;
-	/** CS_SYNC LE 2M 2BT PHY. */
-	bool cs_sync_2m_2bt_phy_supported;
-	/** Subfeature: CS with no Frequency Actuation Error. */
-	bool cs_without_fae_supported;
-	/** Subfeature: Channel Selection Algorithm #3c */
-	bool chsel_alg_3c_supported;
-	/** Subfeature: Phase-based Ranging from RTT sounding sequence. */
-	bool pbr_from_rtt_sounding_seq_supported;
-	/** Optional T_IP1 time durations during CS steps.
-	 *
-	 *  - Bit 0: 10 us
-	 *  - Bit 1: 20 us
-	 *  - Bit 2: 30 us
-	 *  - Bit 3: 40 us
-	 *  - Bit 4: 50 us
-	 *  - Bit 5: 60 us
-	 *  - Bit 6: 80 us
-	 */
-	uint16_t t_ip1_times_supported;
-	/** Optional T_IP2 time durations during CS steps.
-	 *
-	 *  - Bit 0: 10 us
-	 *  - Bit 1: 20 us
-	 *  - Bit 2: 30 us
-	 *  - Bit 3: 40 us
-	 *  - Bit 4: 50 us
-	 *  - Bit 5: 60 us
-	 *  - Bit 6: 80 us
-	 */
-	uint16_t t_ip2_times_supported;
-	/** Optional T_FCS time durations during CS steps.
-	 *
-	 *  - Bit 0: 15 us
-	 *  - Bit 1: 20 us
-	 *  - Bit 2: 30 us
-	 *  - Bit 3: 40 us
-	 *  - Bit 4: 50 us
-	 *  - Bit 5: 60 us
-	 *  - Bit 6: 80 us
-	 *  - Bit 7: 100 us
-	 *  - Bit 8: 120 us
-	 */
-	uint16_t t_fcs_times_supported;
-	/** Optional T_PM time durations during CS steps.
-	 *
-	 *  - Bit 0: 10 us
-	 *  - Bit 1: 20 us
-	 */
-	uint16_t t_pm_times_supported;
-	/** Time in microseconds for the antenna switch period of the CS tones. */
-	uint8_t t_sw_time;
-	/** Supported SNR levels used in RTT packets.
-	 *
-	 *  - Bit 0: 18dB
-	 *  - Bit 1: 21dB
-	 *  - Bit 2: 24dB
-	 *  - Bit 3: 27dB
-	 *  - Bit 4: 30dB
-	 */
-	uint8_t tx_snr_capability;
-};
-
-/** Remote FAE Table for LE connections supporting CS */
-struct bt_conn_le_cs_fae_table {
-	uint8_t *remote_fae_table;
-};
-
 /** @brief Increment a connection's reference count.
  *
  *  Increment the reference count of a connection object.
@@ -1510,30 +1359,6 @@ struct bt_conn_cb {
 				const struct bt_conn_le_subrate_changed *params);
 #endif /* CONFIG_BT_SUBRATING */
 
-#if defined(CONFIG_BT_CHANNEL_SOUNDING)
-	/** @brief LE CS Read Remote Supported Capabilities Complete event.
-	 *
-	 *  This callback notifies the application that the remote channel
-	 *  sounding capabilities have been received from the peer.
-	 *
-	 *  @param conn Connection object.
-	 *  @param remote_cs_capabilities Remote Channel Sounding Capabilities.
-	 */
-	void (*remote_cs_capabilities_available)(struct bt_conn *conn,
-						 struct bt_conn_le_cs_capabilities *params);
-
-	/** @brief LE CS Read Remote FAE Table Complete event.
-	 *
-	 *  This callback notifies the application that the remote mode-0
-	 *  FAE Table has been received from the peer.
-	 *
-	 *  @param conn Connection object.
-	 *  @param params FAE Table.
-	 */
-	void (*remote_cs_fae_table_available)(struct bt_conn *conn,
-					      struct bt_conn_le_cs_fae_table *params);
-#endif
-
 	/** @internal Internally used field for list handling */
 	sys_snode_t _node;
 };
diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index 880cbeeeccc..903f32eccb0 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -60,20 +60,6 @@ struct bt_cs_set_default_settings_param {
 	int8_t max_tx_power;
 };
 
-
-/** @brief Read Remote Supported Capabilities
- *
- * This command is used to query the CS capabilities that are supported
- * by the remote controller.
- *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
- *
- * @param conn   Connection Object.
- *
- * @return Zero on success or (negative) error code on failure.
- */
-int bt_cs_read_remote_supported_capabilities(struct bt_conn *conn);
-
 /** @brief Set Channel Sounding default settings.
  *
  * This command is used to set default Channel Sounding settings for this
@@ -89,19 +75,6 @@ int bt_cs_read_remote_supported_capabilities(struct bt_conn *conn);
 int bt_cs_set_default_settings(struct bt_conn *conn,
 			       const struct bt_cs_set_default_settings_param *params);
 
-/** @brief Read Remote FAE Table
- *
- * This command is used to read the per-channel mode-0 Frequency Actuation Error
- * table of the remote Controller.
- *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
- *
- * @param conn   Connection Object.
- *
- * @return Zero on success or (negative) error code on failure.
- */
-int bt_cs_read_remote_fae_table(struct bt_conn *conn);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 48d7196c9e6..afdb03f0ce9 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -201,9 +201,6 @@ struct bt_hci_cmd_hdr {
 #define BT_LE_FEAT_BIT_PAWR_ADVERTISER          43
 #define BT_LE_FEAT_BIT_PAWR_SCANNER             44
 
-#define BT_LE_FEAT_BIT_CHANNEL_SOUNDING         46
-#define BT_LE_FEAT_BIT_CHANNEL_SOUNDING_HOST    47
-
 #define BT_LE_FEAT_TEST(feat, n)                (feat[(n) >> 3] & \
 						 BIT((n) & 7))
 
@@ -271,10 +268,6 @@ struct bt_hci_cmd_hdr {
 						  BT_LE_FEAT_BIT_PAWR_ADVERTISER)
 #define BT_FEAT_LE_PAWR_SCANNER(feat)             BT_LE_FEAT_TEST(feat, \
 						  BT_LE_FEAT_BIT_PAWR_SCANNER)
-#define BT_FEAT_LE_CHANNEL_SOUNDING(feat)         BT_LE_FEAT_TEST(feat, \
-						  BT_LE_FEAT_BIT_CHANNEL_SOUNDING)
-#define BT_FEAT_LE_CHANNEL_SOUNDING_HOST(feat)    BT_LE_FEAT_TEST(feat, \
-						  BT_LE_FEAT_BIT_CHANNEL_SOUNDING_HOST)
 
 #define BT_FEAT_LE_CIS(feat)            (BT_FEAT_LE_CIS_CENTRAL(feat) | \
 					BT_FEAT_LE_CIS_PERIPHERAL(feat))
@@ -2402,12 +2395,6 @@ struct bt_hci_cp_le_tx_test_v4_tx_power {
 	int8_t tx_power;
 } __packed;
 
-#define BT_HCI_OP_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES BT_OP(BT_OGF_LE, 0x008A) /* 0x208A */
-
-struct bt_hci_cp_le_read_remote_supported_capabilities {
-	uint16_t handle;
-} __packed;
-
 #define BT_HCI_OP_LE_CS_SET_DEFAULT_SETTINGS BT_OP(BT_OGF_LE, 0x008D) /* 0x208D */
 
 #define BT_HCI_OP_LE_CS_INITIATOR_ROLE_MASK BIT(0)
@@ -2430,12 +2417,6 @@ struct bt_hci_cp_le_cs_set_default_settings {
 	int8_t max_tx_power;
 } __packed;
 
-#define BT_HCI_OP_LE_CS_READ_REMOTE_FAE_TABLE BT_OP(BT_OGF_LE, 0x008E) /* 0x208E */
-
-struct bt_hci_cp_le_read_remote_fae_table {
-	uint16_t handle;
-} __packed;
-
 /* Event definitions */
 
 #define BT_HCI_EVT_UNKNOWN                      0x00
@@ -3170,93 +3151,6 @@ struct bt_hci_evt_le_subrate_change {
 	uint16_t supervision_timeout;
 } __packed;
 
-#define BT_HCI_LE_CS_INITIATOR_ROLE_MASK BIT(0)
-#define BT_HCI_LE_CS_REFLECTOR_ROLE_MASK BIT(1)
-
-#define BT_HCI_LE_CS_MODES_SUPPORTED_MODE_3_MASK BIT(0)
-
-#define BT_HCI_LE_CS_RTT_AA_ONLY_N_10NS_MASK        BIT(0)
-#define BT_HCI_LE_CS_RTT_SOUNDING_N_10NS_MASK       BIT(1)
-#define BT_HCI_LE_CS_RTT_RANDOM_PAYLOAD_N_10NS_MASK BIT(2)
-
-#define BT_HCI_LE_CS_NADM_SOUNDING_CAPABILITY_PHASE_BASED_MASK BIT(0)
-#define BT_HCI_LE_CS_NADM_RANDOM_CAPABILITY_PHASE_BASED_MASK BIT(0)
-
-#define BT_HCI_LE_CS_SYNC_PHYS_2M_MASK BIT(1)
-#define BT_HCI_LE_CS_SYNC_PHYS_2M_2BT_MASK BIT(2)
-
-#define BT_HCI_LE_CS_SUBFEATURE_NO_TX_FAE_MASK BIT(1)
-#define BT_HCI_LE_CS_SUBFEATURE_CHSEL_ALG_3C_MASK BIT(2)
-#define BT_HCI_LE_CS_SUBFEATURE_PBR_FROM_RTT_SOUNDING_SEQ_MASK BIT(3)
-
-#define BT_HCI_LE_CS_T_IP1_TIME_10US_MASK BIT(0)
-#define BT_HCI_LE_CS_T_IP1_TIME_20US_MASK BIT(1)
-#define BT_HCI_LE_CS_T_IP1_TIME_30US_MASK BIT(2)
-#define BT_HCI_LE_CS_T_IP1_TIME_40US_MASK BIT(3)
-#define BT_HCI_LE_CS_T_IP1_TIME_50US_MASK BIT(4)
-#define BT_HCI_LE_CS_T_IP1_TIME_60US_MASK BIT(5)
-#define BT_HCI_LE_CS_T_IP1_TIME_80US_MASK BIT(6)
-
-#define BT_HCI_LE_CS_T_IP2_TIME_10US_MASK BIT(0)
-#define BT_HCI_LE_CS_T_IP2_TIME_20US_MASK BIT(1)
-#define BT_HCI_LE_CS_T_IP2_TIME_30US_MASK BIT(2)
-#define BT_HCI_LE_CS_T_IP2_TIME_40US_MASK BIT(3)
-#define BT_HCI_LE_CS_T_IP2_TIME_50US_MASK BIT(4)
-#define BT_HCI_LE_CS_T_IP2_TIME_60US_MASK BIT(5)
-#define BT_HCI_LE_CS_T_IP2_TIME_80US_MASK BIT(6)
-
-#define BT_HCI_LE_CS_T_FCS_TIME_15US_MASK   BIT(0)
-#define BT_HCI_LE_CS_T_FCS_TIME_20US_MASK   BIT(1)
-#define BT_HCI_LE_CS_T_FCS_TIME_30US_MASK   BIT(2)
-#define BT_HCI_LE_CS_T_FCS_TIME_40US_MASK   BIT(3)
-#define BT_HCI_LE_CS_T_FCS_TIME_50US_MASK   BIT(4)
-#define BT_HCI_LE_CS_T_FCS_TIME_60US_MASK   BIT(5)
-#define BT_HCI_LE_CS_T_FCS_TIME_80US_MASK   BIT(6)
-#define BT_HCI_LE_CS_T_FCS_TIME_100US_MASK  BIT(7)
-#define BT_HCI_LE_CS_T_FCS_TIME_1200US_MASK BIT(8)
-
-#define BT_HCI_LE_CS_T_PM_TIME_10US_MASK BIT(0)
-#define BT_HCI_LE_CS_T_PM_TIME_20US_MASK BIT(1)
-
-#define BT_HCI_LE_CS_TX_SNR_CAPABILITY_18DB_MASK BIT(0)
-#define BT_HCI_LE_CS_TX_SNR_CAPABILITY_21DB_MASK BIT(1)
-#define BT_HCI_LE_CS_TX_SNR_CAPABILITY_24DB_MASK BIT(2)
-#define BT_HCI_LE_CS_TX_SNR_CAPABILITY_27DB_MASK BIT(3)
-#define BT_HCI_LE_CS_TX_SNR_CAPABILITY_30DB_MASK BIT(4)
-
-#define BT_HCI_EVT_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE 0x2C
-struct bt_hci_evt_le_cs_read_remote_supported_capabilities_complete {
-	uint8_t status;
-	uint16_t conn_handle;
-	uint8_t num_config_supported;
-	uint16_t max_consecutive_procedures_supported;
-	uint8_t num_antennas_supported;
-	uint8_t max_antenna_paths_supported;
-	uint8_t roles_supported;
-	uint8_t modes_supported;
-	uint8_t rtt_capability;
-	uint8_t rtt_aa_only_n;
-	uint8_t rtt_sounding_n;
-	uint8_t rtt_random_payload_n;
-	uint16_t nadm_sounding_capability;
-	uint16_t nadm_random_capability;
-	uint8_t cs_sync_phys_supported;
-	uint16_t subfeatures_supported;
-	uint16_t t_ip1_times_supported;
-	uint16_t t_ip2_times_supported;
-	uint16_t t_fcs_times_supported;
-	uint16_t t_pm_times_supported;
-	uint8_t t_sw_time_supported;
-	uint8_t tx_snr_capability;
-} __packed;
-
-#define BT_HCI_EVT_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE 0x2D
-struct bt_hci_evt_le_cs_read_remote_fae_table_complete {
-	uint8_t status;
-	uint16_t conn_handle;
-	uint8_t remote_fae_table[72];
-} __packed;
-
 /* Event mask bits */
 
 #define BT_EVT_BIT(n) (1ULL << (n))
@@ -3346,9 +3240,6 @@ struct bt_hci_evt_le_cs_read_remote_fae_table_complete {
 #define BT_EVT_MASK_LE_PER_ADV_RESPONSE_REPORT     BT_EVT_BIT(39)
 #define BT_EVT_MASK_LE_ENH_CONN_COMPLETE_V2        BT_EVT_BIT(40)
 
-#define BT_EVT_MASK_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE BT_EVT_BIT(43)
-#define BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE              BT_EVT_BIT(44)
-
 /** HCI Error Codes, BT Core Spec v5.4 [Vol 1, Part F]. */
 #define BT_HCI_ERR_SUCCESS                      0x00
 #define BT_HCI_ERR_UNKNOWN_CMD                  0x01
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 862f196618b..b8c835876c7 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -3320,42 +3320,6 @@ int bt_conn_le_subrate_request(struct bt_conn *conn,
 }
 #endif /* CONFIG_BT_SUBRATING */
 
-#if defined(CONFIG_BT_CHANNEL_SOUNDING)
-void notify_remote_cs_capabilities(struct bt_conn *conn, struct bt_conn_le_cs_capabilities params)
-{
-	struct bt_conn_cb *callback;
-
-	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->remote_cs_capabilities_available) {
-			callback->remote_cs_capabilities_available(conn, &params);
-		}
-	}
-
-	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->remote_cs_capabilities_available) {
-			cb->remote_cs_capabilities_available(conn, &params);
-		}
-	}
-}
-
-void notify_remote_cs_fae_table(struct bt_conn *conn, struct bt_conn_le_cs_fae_table params)
-{
-	struct bt_conn_cb *callback;
-
-	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->remote_cs_fae_table_available) {
-			callback->remote_cs_fae_table_available(conn, &params);
-		}
-	}
-
-	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->remote_cs_fae_table_available) {
-			cb->remote_cs_fae_table_available(conn, &params);
-		}
-	}
-}
-#endif /* CONFIG_BT_CHANNEL_SOUNDING */
-
 int bt_conn_le_param_update(struct bt_conn *conn,
 			    const struct bt_le_conn_param *param)
 {
diff --git a/subsys/bluetooth/host/conn_internal.h b/subsys/bluetooth/host/conn_internal.h
index 4cc4e70d858..58228588d0c 100644
--- a/subsys/bluetooth/host/conn_internal.h
+++ b/subsys/bluetooth/host/conn_internal.h
@@ -492,12 +492,6 @@ void notify_path_loss_threshold_report(struct bt_conn *conn,
 void notify_subrate_change(struct bt_conn *conn,
 			   struct bt_conn_le_subrate_changed params);
 
-void notify_remote_cs_capabilities(struct bt_conn *conn,
-			   struct bt_conn_le_cs_capabilities params);
-
-void notify_remote_cs_fae_table(struct bt_conn *conn,
-			   struct bt_conn_le_cs_fae_table params);
-
 #if defined(CONFIG_BT_SMP)
 /* If role specific LTK is present */
 bool bt_conn_ltk_present(const struct bt_conn *conn);
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index 78b42dc399e..4ec67fd42ce 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -13,143 +13,7 @@
 
 #include "conn_internal.h"
 
-#define LOG_LEVEL CONFIG_BT_HCI_CORE_LOG_LEVEL
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(bt_cs);
-
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
-int bt_cs_read_remote_supported_capabilities(struct bt_conn *conn)
-{
-	struct bt_hci_cp_le_read_remote_supported_capabilities *cp;
-	struct net_buf *buf;
-
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES, sizeof(*cp));
-	if (!buf) {
-		return -ENOBUFS;
-	}
-
-	cp = net_buf_add(buf, sizeof(*cp));
-	cp->handle = sys_cpu_to_le16(conn->handle);
-
-	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES, buf, NULL);
-}
-
-void bt_hci_le_cs_read_remote_supported_capabilities_complete(struct net_buf *buf)
-{
-	struct bt_conn *conn;
-	struct bt_conn_le_cs_capabilities remote_cs_capabilities;
-	struct bt_hci_evt_le_cs_read_remote_supported_capabilities_complete *evt;
-
-	if (buf->len < sizeof(*evt)) {
-		LOG_ERR("Unexpected end of buffer");
-		return;
-	}
-
-	evt = net_buf_pull_mem(buf, sizeof(*evt));
-	if (evt->status) {
-		LOG_INF("Read Remote Supported Capabilities failed (status 0x%02X)", evt->status);
-		return;
-	}
-
-	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->conn_handle), BT_CONN_TYPE_LE);
-	if (!conn) {
-		LOG_ERR("Could not lookup connection handle when reading remote CS capabilities");
-		return;
-	}
-
-	remote_cs_capabilities.num_config_supported = evt->num_config_supported;
-	remote_cs_capabilities.max_consecutive_procedures_supported =
-		sys_le16_to_cpu(evt->max_consecutive_procedures_supported);
-	remote_cs_capabilities.num_antennas_supported = evt->num_antennas_supported;
-	remote_cs_capabilities.max_antenna_paths_supported = evt->max_antenna_paths_supported;
-
-	remote_cs_capabilities.initiator_supported =
-		evt->roles_supported & BT_HCI_LE_CS_INITIATOR_ROLE_MASK;
-	remote_cs_capabilities.reflector_supported =
-		evt->roles_supported & BT_HCI_LE_CS_REFLECTOR_ROLE_MASK;
-	remote_cs_capabilities.mode_3_supported =
-		evt->modes_supported & BT_HCI_LE_CS_MODES_SUPPORTED_MODE_3_MASK;
-
-	remote_cs_capabilities.rtt_aa_only_n = evt->rtt_aa_only_n;
-	remote_cs_capabilities.rtt_sounding_n = evt->rtt_sounding_n;
-	remote_cs_capabilities.rtt_random_payload_n = evt->rtt_random_payload_n;
-
-	if (evt->rtt_aa_only_n) {
-		if (evt->rtt_capability & BT_HCI_LE_CS_RTT_AA_ONLY_N_10NS_MASK) {
-			remote_cs_capabilities.rtt_aa_only_precision =
-				BT_CONN_LE_CS_RTT_AA_ONLY_10NS;
-		} else {
-			remote_cs_capabilities.rtt_aa_only_precision =
-				BT_CONN_LE_CS_RTT_AA_ONLY_150NS;
-		}
-	} else {
-		remote_cs_capabilities.rtt_aa_only_precision = BT_CONN_LE_CS_RTT_AA_ONLY_NOT_SUPP;
-	}
-
-	if (evt->rtt_sounding_n) {
-		if (evt->rtt_capability & BT_HCI_LE_CS_RTT_SOUNDING_N_10NS_MASK) {
-			remote_cs_capabilities.rtt_sounding_precision =
-				BT_CONN_LE_CS_RTT_SOUNDING_10NS;
-		} else {
-			remote_cs_capabilities.rtt_sounding_precision =
-				BT_CONN_LE_CS_RTT_SOUNDING_150NS;
-		}
-	} else {
-		remote_cs_capabilities.rtt_sounding_precision = BT_CONN_LE_CS_RTT_SOUNDING_NOT_SUPP;
-	}
-
-	if (evt->rtt_random_payload_n) {
-		if (evt->rtt_capability & BT_HCI_LE_CS_RTT_RANDOM_PAYLOAD_N_10NS_MASK) {
-			remote_cs_capabilities.rtt_random_payload_precision =
-				BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_10NS;
-		} else {
-			remote_cs_capabilities.rtt_random_payload_precision =
-				BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_150NS;
-		}
-	} else {
-		remote_cs_capabilities.rtt_random_payload_precision =
-			BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_NOT_SUPP;
-	}
-
-	remote_cs_capabilities.phase_based_nadm_sounding_supported =
-		sys_le16_to_cpu(evt->nadm_sounding_capability) &
-		BT_HCI_LE_CS_NADM_SOUNDING_CAPABILITY_PHASE_BASED_MASK;
-
-	remote_cs_capabilities.phase_based_nadm_random_supported =
-		sys_le16_to_cpu(evt->nadm_random_capability) &
-		BT_HCI_LE_CS_NADM_RANDOM_CAPABILITY_PHASE_BASED_MASK;
-
-	remote_cs_capabilities.cs_sync_2m_phy_supported =
-		evt->cs_sync_phys_supported & BT_HCI_LE_CS_SYNC_PHYS_2M_MASK;
-
-	remote_cs_capabilities.cs_sync_2m_2bt_phy_supported =
-		evt->cs_sync_phys_supported & BT_HCI_LE_CS_SYNC_PHYS_2M_2BT_MASK;
-
-	remote_cs_capabilities.cs_without_fae_supported =
-		sys_le16_to_cpu(evt->subfeatures_supported) &
-		BT_HCI_LE_CS_SUBFEATURE_NO_TX_FAE_MASK;
-
-	remote_cs_capabilities.chsel_alg_3c_supported =
-		sys_le16_to_cpu(evt->subfeatures_supported) &
-		BT_HCI_LE_CS_SUBFEATURE_CHSEL_ALG_3C_MASK;
-
-	remote_cs_capabilities.pbr_from_rtt_sounding_seq_supported =
-		sys_le16_to_cpu(evt->subfeatures_supported) &
-		BT_HCI_LE_CS_SUBFEATURE_PBR_FROM_RTT_SOUNDING_SEQ_MASK;
-
-	remote_cs_capabilities.t_ip1_times_supported = sys_le16_to_cpu(evt->t_ip1_times_supported);
-	remote_cs_capabilities.t_ip2_times_supported = sys_le16_to_cpu(evt->t_ip2_times_supported);
-	remote_cs_capabilities.t_fcs_times_supported = sys_le16_to_cpu(evt->t_fcs_times_supported);
-	remote_cs_capabilities.t_pm_times_supported = sys_le16_to_cpu(evt->t_pm_times_supported);
-
-	remote_cs_capabilities.t_sw_time = evt->t_sw_time_supported;
-	remote_cs_capabilities.tx_snr_capability = evt->tx_snr_capability;
-
-	notify_remote_cs_capabilities(conn, remote_cs_capabilities);
-
-	bt_conn_unref(conn);
-}
-
 int bt_cs_set_default_settings(struct bt_conn *conn,
 			       const struct bt_cs_set_default_settings_param *params)
 {
@@ -177,49 +41,4 @@ int bt_cs_set_default_settings(struct bt_conn *conn,
 
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_SET_DEFAULT_SETTINGS, buf, NULL);
 }
-
-int bt_cs_read_remote_fae_table(struct bt_conn *conn)
-{
-	struct bt_hci_cp_le_read_remote_fae_table *cp;
-	struct net_buf *buf;
-
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CS_READ_REMOTE_FAE_TABLE, sizeof(*cp));
-	if (!buf) {
-		return -ENOBUFS;
-	}
-
-	cp = net_buf_add(buf, sizeof(*cp));
-	cp->handle = sys_cpu_to_le16(conn->handle);
-
-	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_READ_REMOTE_FAE_TABLE, buf, NULL);
-}
-
-void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf)
-{
-	struct bt_conn *conn;
-	struct bt_conn_le_cs_fae_table fae_table;
-	struct bt_hci_evt_le_cs_read_remote_fae_table_complete *evt;
-
-	if (buf->len < sizeof(*evt)) {
-		LOG_ERR("Unexpected end of buffer");
-		return;
-	}
-
-	evt = net_buf_pull_mem(buf, sizeof(*evt));
-	if (evt->status) {
-		LOG_INF("Read Remote FAE Table failed with status 0x%02X", evt->status);
-		return;
-	}
-
-	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->conn_handle), BT_CONN_TYPE_LE);
-	if (!conn) {
-		LOG_ERR("Could not lookup connection handle when reading remote FAE Table");
-		return;
-	}
-
-	fae_table.remote_fae_table = evt->remote_fae_table;
-	notify_remote_cs_fae_table(conn, fae_table);
-
-	bt_conn_unref(conn);
-}
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index b1ab4fbb664..adc215a67ea 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -2821,14 +2821,6 @@ static const struct event_handler meta_events[] = {
 		      sizeof(struct bt_hci_evt_le_enh_conn_complete_v2)),
 #endif /* CONFIG_BT_PER_ADV_RSP || CONFIG_BT_PER_ADV_SYNC_RSP */
 #endif /* CONFIG_BT_CONN */
-#if defined(CONFIG_BT_CHANNEL_SOUNDING)
-	EVENT_HANDLER(BT_HCI_EVT_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE,
-		      bt_hci_le_cs_read_remote_supported_capabilities_complete,
-		      sizeof(struct bt_hci_evt_le_cs_read_remote_supported_capabilities_complete)),
-	EVENT_HANDLER(BT_HCI_EVT_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE,
-		      bt_hci_le_cs_read_remote_fae_table_complete,
-		      sizeof(struct bt_hci_evt_le_cs_read_remote_fae_table_complete)),
-#endif /* CONFIG_BT_CHANNEL_SOUNDING */
 
 };
 
@@ -3399,13 +3391,6 @@ static int le_set_event_mask(void)
 		mask |= BT_EVT_MASK_LE_ENH_CONN_COMPLETE_V2;
 	}
 
-
-	if (IS_ENABLED(CONFIG_BT_CHANNEL_SOUNDING) &&
-	    BT_FEAT_LE_CHANNEL_SOUNDING(bt_dev.le.features)) {
-		mask |= BT_EVT_MASK_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE;
-		mask |= BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE;
-	}
-
 	sys_put_le64(mask, cp_mask->events);
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_SET_EVENT_MASK, buf, NULL);
 }
@@ -3628,14 +3613,6 @@ static int le_init(void)
 		}
 	}
 
-	if (IS_ENABLED(CONFIG_BT_CHANNEL_SOUNDING) &&
-	    BT_FEAT_LE_CHANNEL_SOUNDING(bt_dev.le.features)) {
-		err = le_set_host_feature(BT_LE_FEAT_BIT_CHANNEL_SOUNDING_HOST, 1);
-		if (err) {
-			return err;
-		}
-	}
-
 	return  le_set_event_mask();
 }
 
diff --git a/subsys/bluetooth/host/hci_core.h b/subsys/bluetooth/host/hci_core.h
index 590d85a6c49..b39f219024d 100644
--- a/subsys/bluetooth/host/hci_core.h
+++ b/subsys/bluetooth/host/hci_core.h
@@ -538,10 +538,6 @@ void bt_hci_le_vs_df_connectionless_iq_report(struct net_buf *buf);
 void bt_hci_le_past_received(struct net_buf *buf);
 void bt_hci_le_past_received_v2(struct net_buf *buf);
 
-/* CS HCI event handlers */
-void bt_hci_le_cs_read_remote_supported_capabilities_complete(struct net_buf *buf);
-void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf);
-
 /* Adv HCI event handlers */
 void bt_hci_le_adv_set_terminated(struct net_buf *buf);
 void bt_hci_le_scan_req_received(struct net_buf *buf);
diff --git a/subsys/bluetooth/shell/bt.c b/subsys/bluetooth/shell/bt.c
index 25841fd48d6..70b3e69941d 100644
--- a/subsys/bluetooth/shell/bt.c
+++ b/subsys/bluetooth/shell/bt.c
@@ -982,78 +982,6 @@ void subrate_changed(struct bt_conn *conn,
 }
 #endif
 
-#if defined(CONFIG_BT_CHANNEL_SOUNDING)
-void print_remote_cs_capabilities(struct bt_conn *conn, struct bt_conn_le_cs_capabilities *params)
-{
-	shell_print(
-		ctx_shell,
-		"Received remote channel sounding capabilities:\n"
-		"- Num CS configurations: %d\n"
-		"- Max consecutive CS procedures: %d\n"
-		"- Num antennas supported: %d\n"
-		"- Max antenna paths supported: %d\n"
-		"- Initiator role supported: %s\n"
-		"- Reflector role supported: %s\n"
-		"- Mode 3 supported: %s\n"
-		"- RTT AA only supported: %s\n"
-		"- RTT AA only is 10ns precise: %s\n"
-		"- RTT AA only N: %d\n"
-		"- RTT sounding supported: %s\n"
-		"- RTT sounding is 10ns precise: %s\n"
-		"- RTT sounding N: %d\n"
-		"- RTT random payload supported: %s\n"
-		"- RTT random payload is 10ns precise: %s\n"
-		"- RTT random payload N: %d\n"
-		"- Phase-based NADM with sounding sequences supported: %s\n"
-		"- Phase-based NADM with random sequences supported: %s\n"
-		"- CS Sync 2M PHY supported: %s\n"
-		"- CS Sync 2M 2BT PHY supported: %s\n"
-		"- CS without transmitter FAE supported: %s\n"
-		"- Channel selection algorithm #3c supported: %s\n"
-		"- Phase-based ranging from RTT sounding sequence supported: %s\n"
-		"- T_IP1 times supported: 0x%04x\n"
-		"- T_IP2 times supported: 0x%04x\n"
-		"- T_FCS times supported: 0x%04x\n"
-		"- T_PM times supported: 0x%04x\n"
-		"- T_SW time supported: %d us\n"
-		"- TX SNR capability: 0x%02x",
-		params->num_config_supported, params->max_consecutive_procedures_supported,
-		params->num_antennas_supported, params->max_antenna_paths_supported,
-		params->initiator_supported ? "Yes" : "No",
-		params->reflector_supported ? "Yes" : "No", params->mode_3_supported ? "Yes" : "No",
-		params->rtt_aa_only_precision == BT_CONN_LE_CS_RTT_AA_ONLY_NOT_SUPP ? "No" : "Yes",
-		params->rtt_aa_only_precision == BT_CONN_LE_CS_RTT_AA_ONLY_10NS ? "Yes" : "No",
-		params->rtt_aa_only_n,
-		params->rtt_sounding_precision == BT_CONN_LE_CS_RTT_SOUNDING_NOT_SUPP ? "No"
-										      : "Yes",
-		params->rtt_sounding_precision == BT_CONN_LE_CS_RTT_SOUNDING_10NS ? "Yes" : "No",
-		params->rtt_sounding_n,
-		params->rtt_random_payload_precision == BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_NOT_SUPP
-			? "No"
-			: "Yes",
-		params->rtt_random_payload_precision == BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_10NS
-			? "Yes"
-			: "No",
-		params->rtt_random_payload_n,
-		params->phase_based_nadm_sounding_supported ? "Yes" : "No",
-		params->phase_based_nadm_random_supported ? "Yes" : "No",
-		params->cs_sync_2m_phy_supported ? "Yes" : "No",
-		params->cs_sync_2m_2bt_phy_supported ? "Yes" : "No",
-		params->cs_without_fae_supported ? "Yes" : "No",
-		params->chsel_alg_3c_supported ? "Yes" : "No",
-		params->pbr_from_rtt_sounding_seq_supported ? "Yes" : "No",
-		params->t_ip1_times_supported, params->t_ip2_times_supported,
-		params->t_fcs_times_supported, params->t_pm_times_supported, params->t_sw_time,
-		params->tx_snr_capability);
-}
-
-void print_remote_cs_fae_table(struct bt_conn *conn, struct bt_conn_le_cs_fae_table *params)
-{
-	shell_print(ctx_shell, "Received FAE Table: ");
-	shell_hexdump(ctx_shell, params->remote_fae_table, 72);
-}
-#endif
-
 static struct bt_conn_cb conn_callbacks = {
 	.connected = connected,
 	.disconnected = disconnected,
@@ -1083,10 +1011,6 @@ static struct bt_conn_cb conn_callbacks = {
 #if defined(CONFIG_BT_SUBRATING)
 	.subrate_changed = subrate_changed,
 #endif
-#if defined(CONFIG_BT_CHANNEL_SOUNDING)
-	.remote_cs_capabilities_available = print_remote_cs_capabilities,
-	.remote_cs_fae_table_available = print_remote_cs_fae_table,
-#endif
 };
 #endif /* CONFIG_BT_CONN */
 
diff --git a/subsys/bluetooth/shell/cs.c b/subsys/bluetooth/shell/cs.c
index fbe089155cc..00a16cb4adb 100644
--- a/subsys/bluetooth/shell/cs.c
+++ b/subsys/bluetooth/shell/cs.c
@@ -39,24 +39,6 @@ static int check_cs_sync_antenna_selection_input(uint16_t input)
 	return 0;
 }
 
-static int cmd_read_remote_supported_capabilities(const struct shell *sh, size_t argc, char *argv[])
-{
-	int err = 0;
-
-	if (default_conn == NULL) {
-		shell_error(sh, "Conn handle error, at least one connection is required.");
-		return -ENOEXEC;
-	}
-
-	err = bt_cs_read_remote_supported_capabilities(default_conn);
-	if (err) {
-		shell_error(sh, "bt_cs_read_remote_supported_capabilities returned error %d", err);
-		return -ENOEXEC;
-	}
-
-	return 0;
-}
-
 static int cmd_set_default_settings(const struct shell *sh, size_t argc, char *argv[])
 {
 	int err = 0;
@@ -116,38 +98,13 @@ static int cmd_set_default_settings(const struct shell *sh, size_t argc, char *a
 	return 0;
 }
 
-static int cmd_read_remote_fae_table(const struct shell *sh, size_t argc, char *argv[])
-{
-	int err = 0;
-
-	if (default_conn == NULL) {
-		shell_error(sh, "Conn handle error, at least one connection is required.");
-		return -ENOEXEC;
-	}
-
-	err = bt_cs_read_remote_fae_table(default_conn);
-	if (err) {
-		shell_error(sh, "bt_cs_read_remote_fae_table returned error %d", err);
-		return -ENOEXEC;
-	}
-
-	return 0;
-}
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	cs_cmds,
-	SHELL_CMD_ARG(
-		read_remote_supported_capabilities, NULL,
-		"<None>",
-		cmd_read_remote_supported_capabilities, 1, 0),
 	SHELL_CMD_ARG(
 		set_default_settings, NULL,
 		"<Enable initiator role: true, false> <Enable reflector role: true, false> "
 		" <CS_SYNC antenna selection: 0x01 - 0x04, 0xFE, 0xFF> <Max TX power: -127 - 20>",
 		cmd_set_default_settings, 5, 0),
-	SHELL_CMD_ARG(
-		read_remote_fae_table, NULL,
-		"<None>",
-		cmd_read_remote_fae_table, 1, 0),
 	SHELL_SUBCMD_SET_END);
 
 static int cmd_cs(const struct shell *sh, size_t argc, char **argv)

From e92dfc44c2e172ac21ad091dff1d5685a9c4de25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:10 +0100
Subject: [PATCH 2050/2913] Revert "[nrf fromlist] doc: extensions: link-roles:
 missing module not critical"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 43734cb9f5df0de2368b43d71607853287d06a5e.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 doc/_extensions/zephyr/link-roles.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/doc/_extensions/zephyr/link-roles.py b/doc/_extensions/zephyr/link-roles.py
index c1474bab312..19d2a985487 100644
--- a/doc/_extensions/zephyr/link-roles.py
+++ b/doc/_extensions/zephyr/link-roles.py
@@ -9,7 +9,6 @@
 import re
 import subprocess
 from docutils import nodes
-from sphinx.util import logging
 
 try:
     import west.manifest
@@ -22,9 +21,6 @@
     west_manifest = None
 
 
-logger = logging.getLogger(__name__)
-
-
 def get_github_rev():
     try:
         output = subprocess.check_output(
@@ -92,7 +88,9 @@ def role(name, rawtext, text, lineno, inliner, options={}, content=[]):
             )
         # Invalid module provided
         elif module != config.link_roles_manifest_project:
-            logger.debug(f"Module {module} not found in the west manifest")
+            raise ModuleNotFoundError(
+                f"Module {module} not found in the west manifest\n\t{trace}"
+            )
         # Baseurl for manifest project not set
         elif baseurl is None:
             raise ValueError(

From 3499ddd77dc6c095a0fa3d11188d85a570e36888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:10 +0100
Subject: [PATCH 2051/2913] Revert "[nrf fromlist] drivers: wifi: nrfwifi:
 determine shared iovdd and bucken from dt"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1f00ee210404a97739b0687c4114a0975de6d2ba.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/wifi/nrfwifi/Kconfig.nrfwifi          | 7 +++++++
 drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/wifi/nrfwifi/Kconfig.nrfwifi b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
index d8cae0f38c8..cf423082b4e 100644
--- a/drivers/wifi/nrfwifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrfwifi/Kconfig.nrfwifi
@@ -664,6 +664,13 @@ config NET_MGMT_EVENT_QUEUE_SIZE
 	default 16
 endif # NRF_WIFI_RPU_RECOVERY
 
+config NRF_WIFI_COMBINED_BUCKEN_IOVDD_GPIO
+	bool
+	help
+	  Enable this option to use a single GPIO to control both buck enable and IOVDD enable,
+	  there will be a internal hardware switch to add delay between the two operations. This
+	  is typically 4ms delay for nRF70.
+
 config NRF_WIFI_FEAT_WMM
 	bool "WMM/QoS support"
 	default y
diff --git a/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c b/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c
index c5f909b4c3a..b8b45d7f811 100644
--- a/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c
+++ b/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c
@@ -242,8 +242,7 @@ static int rpu_pwron(void)
 	/* Settling time for iovdd nRF7002 DK/EK - switch (TCK106AG): ~600us */
 	k_msleep(1);
 
-	if ((bucken_spec.port == iovdd_ctrl_spec.port) &&
-	    (bucken_spec.pin == iovdd_ctrl_spec.pin)) {
+	if (IS_ENABLED(CONFIG_NRF_WIFI_COMBINED_BUCKEN_IOVDD_GPIO)) {
 		/* When a single GPIO is used, we need a total wait time after bucken assertion
 		 * to be 6ms (1ms + 1ms + 4ms).
 		 */

From 609d19129310883fbbf9ddf64e413cb4e7fa0419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:10 +0100
Subject: [PATCH 2052/2913] Revert "[nrf fromlist] samples: net: wifi: add
 build of nrf7002eb"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9bdfef468c180c8c7e70ae4782780cfd1edf7a71.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 samples/net/wifi/sample.yaml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/samples/net/wifi/sample.yaml b/samples/net/wifi/sample.yaml
index 1c106e4897a..694a4d68f92 100644
--- a/samples/net/wifi/sample.yaml
+++ b/samples/net/wifi/sample.yaml
@@ -62,11 +62,3 @@ tests:
     integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
       - nucleo_h723zg
-  sample.net.wifi.nrf7002eb:
-    extra_args:
-      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
-      - SHIELD=nrf7002eb
-    platform_allow:
-      - thingy53/nrf5340/cpuapp
-    integration_platforms:
-      - thingy53/nrf5340/cpuapp

From 1ccc97c82543b3d48c4de1e79155c8f5b22e9c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:10 +0100
Subject: [PATCH 2053/2913] Revert "[nrf fromlist] boards: shields: add
 nrf7002eb"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7c0953b646026fde8b9b00f6bd94e25648cccaa8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/shields/nrf7002eb/Kconfig.shield       |   8 --
 .../boards/thingy53_nrf5340_cpuapp.overlay    |  19 -----
 boards/shields/nrf7002eb/doc/index.rst        |  72 ------------------
 boards/shields/nrf7002eb/doc/nrf7002eb.jpg    | Bin 62681 -> 0 bytes
 boards/shields/nrf7002eb/nrf7002eb.overlay    |  42 ----------
 .../shields/nrf7002eb/nrf7002eb_coex.overlay  |  13 ----
 6 files changed, 154 deletions(-)
 delete mode 100644 boards/shields/nrf7002eb/Kconfig.shield
 delete mode 100644 boards/shields/nrf7002eb/boards/thingy53_nrf5340_cpuapp.overlay
 delete mode 100644 boards/shields/nrf7002eb/doc/index.rst
 delete mode 100644 boards/shields/nrf7002eb/doc/nrf7002eb.jpg
 delete mode 100644 boards/shields/nrf7002eb/nrf7002eb.overlay
 delete mode 100644 boards/shields/nrf7002eb/nrf7002eb_coex.overlay

diff --git a/boards/shields/nrf7002eb/Kconfig.shield b/boards/shields/nrf7002eb/Kconfig.shield
deleted file mode 100644
index e369cfe3de4..00000000000
--- a/boards/shields/nrf7002eb/Kconfig.shield
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config SHIELD_NRF7002EB
-	def_bool $(shields_list_contains,nrf7002eb)
-
-config SHIELD_NRF7002EB_COEX
-	def_bool $(shields_list_contains,nrf7002eb_coex)
diff --git a/boards/shields/nrf7002eb/boards/thingy53_nrf5340_cpuapp.overlay b/boards/shields/nrf7002eb/boards/thingy53_nrf5340_cpuapp.overlay
deleted file mode 100644
index ee052ec68ae..00000000000
--- a/boards/shields/nrf7002eb/boards/thingy53_nrf5340_cpuapp.overlay
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * This uses gpio0 pin 8 which conflicts with STATUS pin of Wi-Fi SR coex
- */
-&npm1100_force_pwm_mode {
-	status = "disabled";
-};
-
-/*
- * Pins P0.9, P0.10, P0.11, P0.12 conflict with SPI4 and nrf7002 host irq
- */
-&uart0 {
-	status = "disabled";
-};
diff --git a/boards/shields/nrf7002eb/doc/index.rst b/boards/shields/nrf7002eb/doc/index.rst
deleted file mode 100644
index e93c778f87c..00000000000
--- a/boards/shields/nrf7002eb/doc/index.rst
+++ /dev/null
@@ -1,72 +0,0 @@
-.. _nrf7002eb:
-
-nRF7002 EB
-##########
-
-Overview
-********
-
-The nRF7002 EB is a versatile evaluation kit in the form of a thumbstick shield which connects to
-compatible Nordic host boards, like the Thingy53, using the Nordic edge-connector.
-
-The nRF7002 EB unlocks low-power Wi-Fi 6 capabilities for your host device. It support dual-band Wi-Fi
-2.4GHz and 5GHz, and is based on the nRF7002 SoC.
-Seamlessly connect to Wi-Fi networks and leverage Wi-Fi-based locationing, enabling advanced
-features such as SSID sniffing of local Wi-Fi hubs
-
-.. figure:: nrf7002eb.jpg
-   :alt: nRF7002 EB
-   :align: center
-
-   nRF7002 EB
-
-Requirements
-************
-
-The nRF7002 EB board is designed to fit straight into a Nordic edge-connector and uses SPI as the
-communication interface. Any host board that supports the Nordic edge-connector can be used with
-the nRF7002 EB.
-
-Prerequisites
--------------
-
-the nRF70 driver requires firmware binary blobs for Wi-Fi operation. Run the command
-below to retrieve those files.
-
-.. code-block:: console
-
-   west update
-   west blobs fetch hal_nordic
-
-Usage
-*****
-
-The shield can be used in any application by setting ``--shield nrf7002eb`` when invoking ``west build``.
-
-Shield Variants
-###############
-
-The nRF7002 EK has a variant which includes the COEX pins. These pins are not be routed to the
-edge-connector on some boards, like earlier revisions of the Thingy53 than v1.0.0.
-
-- ``nrf7002ek``: The default variant.
-- ``nrf7002ek_coex``: Variant which includes the COEX pins.
-
-SR Co-existence
-###############
-
-The nRF7002 EK supports SR co-existence provided the host board supports it. The SR co-existence
-pins are connected to the host board's GPIO pins.
-
-Two Kconfig options are available to enable SR co-existence:
-
-- :kconfig:option:`CONFIG_NRF70_SR_COEX`: Enables SR co-existence.
-- :kconfig:option:`CONFIG_NRF70_SR_COEX_RF_SWITCH`: Control SR side RF switch.
-
-References
-**********
-
-- `Developing with nRF7002 EB <https://docs.nordicsemi.com/bundle/ncs-latest/page/nrf/app_dev/device_guides/nrf70/nrf7002eb_dev_guide.html>`_
-- `nRF7002 EB product specification <https://infocenter.nordicsemi.com/topic/ug_nrf7002_eb/UG/nrf7002_EB/intro.html>`_
-- `nRF7002 product specification <https://infocenter.nordicsemi.com/index.jsp?topic=%2Fstruct_nrf70%2Fstruct%2Fnrf7002.html&cp=3_0>`_
-- `nRF7002 Co-existence <https://infocenter.nordicsemi.com/index.jsp?topic=%2Fps_nrf7002%2Fchapters%2Ffunctional%2Fdoc%2Fcoexistence.html&cp=3_0_0_7>`_
diff --git a/boards/shields/nrf7002eb/doc/nrf7002eb.jpg b/boards/shields/nrf7002eb/doc/nrf7002eb.jpg
deleted file mode 100644
index a8afd6741354a604bc962fbce9d54ecb6d641a72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 62681
zcmeFZbzB_F);8KmkRZX`HMq;*1cv~@U5CLL+#!S{1cwBITLQslaCawIf@=sK+#&cK
zviCmc{N7Kl{&(LRdit5FwN|aQy1J?Ad3x?=?tcO}%JNF`00IIczzBZ<_scZMaz1v}
z0HCDA3ZMZ1fC}ItAOQ$)^std3Jo>Y@gk$o*u{|6={aXeJj(On5u;6<)_{Iyz1n~VU
z_+}T1{73gA9OuEe5kvsM|Bt<blIjZ@UQQlvPCkCPCO0p?2scQChnI$jTLg~z1>o8U
zpZ@I&TophE?ts6nK6nQp{DqAk;NSS6OGLPL51x_0G1A|jqQF0+{0Aodj|dPD|FT2%
zp!+voq=GBJ3)-L8{eR}}AvJKx`*}bHKtn-6MR|mVii(Pkj`kRn01FcX1CtaF{|Nyl
z88sCp83hFm11B>L9XmY*#Zw^`c5WVietv3Zkhn0f7(8y?2O|jR=;)Xjm?T(OB)qf~
zw7mbf%Y8e5iw5_|2nm4>K*U8r!bQ062B_hFK0^3Y{t5;D84(Hj5eh0A`eO{ZKn>1A
zrjQVkksdulMuxWr!rK94+(&q{Jklum8WyN@t^~ZnA3meeKda~<)ck(Pz-Q_98vQX5
zF$pOdBNOve7FK=%K_Ov~h>Wb9yn>>VvX-`vuAaVuA=nCHZDVU^@9yF0<?Z9^_vUTL
zyU?)kh`9KV35iL`DXG~xUvl&E3kr)WtEy{i>*^aCJG;7jdi(kZzK)GgOioSD%+4*Z
ztgfwZZ2sEXJ~}=*Jv+bneR=f|7XtjC{!{*n?7zf?3y%vC85s!~^&u_<MDK^dagiU<
z@}S^JYoJ=V;?wa4qY*s&@VTM`ot{tgkkHcY`(q*o{$<9ahtU2+_J1v~*Z+?q`&VH9
zj%yCUL_&ZcJS1E|61cpJc=`zuzCEcg*;^?;gp?5V(?y8Nq7`uib0T`FOD3jyz3*0*
zQ^GH0@J%x%*R<c<wP@V~(u5nacdZou(^Rag0^lmlc(o1h^LK^qC!D@pgD(WIUc@jo
zfG+Ht+jeNK1aN|iV~@(5ZAW5cHOSuON!_lGii7OyD0}7^7|Zr$Ks3>tF;9MLD%_Pl
zxrjac<oV{VQRtXoBo15K&PVxb>&C_odV$yM{{@*3Kb<}(#IMKa;%(4cV9nVH<2~?=
ztmR$PuK-jcTK~;<0u4Dwa{>*+ALQS-#8hEMcDfpgiPog_zx5hEJ*hY&Z!7mfFFSWW
zcGNlFB<*~B+_a}_geAx!@9)7=CPb%_*hPUTyjkiO8nG<6^n~jtIG!;4nL+?3+Xl#!
z9G2#BqJ(n~B)Taoe>g3UArnYg|MoSHQ=2kLt2nFgyU}fWSr$D7{u>$!s*J*;-}_JF
zp73@`4=jbEI*(7)8!+H0GR@(Jt%q9doE5x{8v4YBChxV`a8`5`O|=xBbspk$@SC!y
zF7~J0N`wkJE<v2Wg!;>wyBh1IUNid%$34384Ff58U)PHm6ra@tJ;b$^Z5}JA$fwm@
z72IP3Q<`5hnCN0}CUERZ9ua>_N}e_eLK?q8fTbOT>k1A#tta`$cyE$K-xe>iZJ32T
zH(Po6en<(t8K*Q7<S}_VDW|NFcL}a&VI3=_vV#U7$Ps9hJ@UT?cIPdiOY_7V+)#oN
z=~zgw&&^Id+ppN!sypeq>03{;wWo-%?gK)H#5<OW(_~K;&F)uuSjBaZ<Q1M@O{XXg
zIh~fxuVmePq*Tb)fgdb6SIwYe=UhMSxEH!&_Q%j-)iZLEM>(j-HtDC^Y`KS{A)I3B
zj92o*6uK2vpOI)<h0Xd>H{NH(J7dknnzH?9CC1QNMmV?af3LjaO`jAHbQQX6Fc}{O
zjV_Q@)3td!RFWi0`mD0zkplRQ3Ry{-w0kEu&!}3$_un`Au&Dj1uYysibaM2ses5Au
zzR6dmY&qpsZe#9u-Nkm*W2wQm3Jc-iK34i=Se|&H&>D01b$QR(0=f4$C0Yl?MTfxm
zxf{772ctqKdrP-2QT&N(UFYx`2UYo}i9f`+k%{_@S1)x{vu^yKT%_Ft&jh}H+1A>K
zs}l94SIcLhN)&$lG`n2nS!>vBn&cW~Y0$LJ-LqD2Shl3~=q0Ly+1X^!`%jopB4~m-
zyV{mMP^}M8zTDo(uRHV(ts!wFn$~FJHA6k_q6<F0-TzTzw30=QQ-j~JE_@HXipc%!
zkQ5!1YdEg}jdj{&cVZ(nOSf7(?`3NpJGaXjY!0mcn54N__lh}YAa^3FcC1*b0*Pgz
z=+m2C|B1QD^j5-e986<1fl`rK>6PZsx?#ffZBtcF%`ydB?gL-$Hue=#LQ^(~jO#I8
zsoPIYSx=r}7&L>3Vr^_WzR2))-$0?nROwf`-tm6BPPUBu`}*-6f<m$R#;rNNo*dg^
zacV`m=(v11*uo&n?To%R`~yzIrFl6l6DyS}RRjfs&HmED^!0@P8b?eO%kwHeF|ig-
zNKJTC2Mv@%5OuZC4W{zkqv4^%XTpvg=JgKRwf?!JA94V!hQ0SJeRJX(eCMoNcVB++
zA4bQ9tiClGcBk*(ZAh{n11Nb$U!IK^+yi~(_keHPDZSxKh9l`CQoVS!y1KNN8;QJ1
z_Cr<oK&-{xNzgC(hzRA>jRh8A5m>wf<<i@Gzy|CNA)F3B*r-crcdne<`|8h!BQ2>u
z(iHpqMJviZkj0jDgC2BLCfS#TTN8O}@6W+xS6V`2`KlYu&c#JZBBhM_4o}r_;N7G%
z0!I}36Y3DF@?-mrv7Qc<#G&*5Vx+h$li-^edY(E_3QlcsYzo@|t)+ScQ)}Se*b!<R
zv;WQ!s?>@+{2Xc|8<n7)qHBsV+Y=2ZBU%Vq_>lEE_p$LkfWeyUskShXnkk%7GfHCb
zeO@q%a)<<`08md$qCs5zEz0C=73fjsZ3%R1+`S?%`L_ZT3WvCKjq+FmmiGaq4f_1?
z8dcYoMdKg04bTN+j)oeBS1y?uY(?W5>lHnIP~!{#k8@g_C8@6ss-^QVKgi+Ef0zyQ
z({nBGiBweCDb-x$BJ&Ubbp4FqNB=cNI<?^nN3&j0&p8b=Ociutl<{eoSu%s+j()Pa
zY2ILyNpt{ttPFMNcW+>mE|epU^@ARlgI~s7QTF1e<K^g7pPw;H7C@$c@Y0V;yy5e{
zk4e11hr8Y7*t&upLwBD#gUo%S-WIUf6#PheKL%K~V%v3Exb&t3Se!IDq|Hs}kX)TM
z%pa|B^4$YSHzAsv5i`Trph5RXB~T5@IXXh@DG&+jj;_UPefs0|=nq|j(#TX_CZ-!>
zirAs2g`CJ!b@;d0W?UP(ZuKKC6D*zFH77Rw2M1<GHZfge(y=98X-~Pi>Tx|GVG%Vx
zbte5SqdflT`Zi`Ums_l8*+sg8u0F$Uqf?yLT(2%}Eihw>|BZvJAmWlB%I@Y_X`r+5
z5&399k|C{NzTW`N;`@9MO?(Vn)?~AsL~eEugz<d@|7_(8fL$9$g~C0v#b;|2w9(nA
zT77;d;_69Hkox@!Uv(u6@-5_5G%o>GN5jv1z?;$`5gh;FET50)1^Q1H7D6TS)@F}k
zukT&G(R16rXGfYatE(rq)tPr2qDHnu@ycG=*c)ZWzn%4}Kh6(Z@Hnm|>kR{edUTCJ
z2s3jvXDwTGP5xnJ0W}^#cNQ)4(CLkMaZtAq&pptoc>XQ7FP;XQj8VdX9IXrgYnJPt
z!350i_=|%IW;*E0D0A%dhWe_e`nuP?meJ=;Uu27J6~EMvAM8ysG}UF|JWJrC)$E$E
zDRs1KtSL<j-9Nqj(x$|mG-OuQ_?DjJvT7i2=c=W(SfIIf>_?OAC#R-4sZ|Q6qGnjR
zz$5Y{Em~>ZJcYxEt!6ZHDu(EF?h-qv#1knHNaJ`diX#0Qa7ae}iRj?aIcAbqFltA2
zPPCqN`*c3U6vT<vK7a)C8w)~@W<FTh<v2CrUDckz42Efwq)@HD5qT%&6(_tp*0f_5
z(&#?d{d1lMf>ka3o^RB6IyrI_U!llsm?#NCueL?+_@40kQz0h#MnBCaL;6%rTUfIJ
z#p8D!IrF^}AAbgdU`*NeIZlgynTt&6c*;xk#YZKzbwpR;RZ&HezJ%{YYOx(gJ^jP_
z-hK^oloN})L^gyjt`|s;Z-}b7XNr1_u<3PYqBo3Nw=@On9#ImmYY%h)_&Yxuq7}L{
z4S(GOb1<LSdij7hj-&&tpLpD^nUl4+3Mo6&6~oaVFNrd!wH^tE<NJsTVcxRU9xhOk
zH#T2O&bCgvU<^^9&V_-<KgPIT20BEBC8Y{jD!&$HuJQBV_LGBUJhnZC9&59Oz3SDr
z`5kygw%a}NLf3}saa57u*o?!{j1jRD-i1=gpl{qwI}265UEiiLYLrb=%Vf4n+Kx&C
zsoHcMv$<(k>W;@Em+pzDQ3k6DhDS@J#cRmGY#lQ|^~7*<KR~?5p@j1Q>SUph*eMt)
zh94q+HO+2JD^NHq0P47IBBnc}`gl&HIb1R?%`mk^ufU#6Prsvj54;tUu5PG1Ih!FP
zr3PQ(-E_T)HT_+%Z&@EDO>pcBqhL)79z}{Msb#vm8kwm}YSlQQ;(4VWlxwv;nA$(a
zzY1|}eL8+R%p_`CeVyN6K(fBrwbwp^BBK2R>8Zf*&#&)<$w$y;exxORUZ~$hDm?4h
zqmJgc8rSUAPFN7FyqTeFK@d>sEZnd^xJ%$@VrTyfP8#I&xm39a&^8NC`~0@QtZn(v
zrzdEGP26_<#4BvtS`)JT`i~kZvKqn0p4Q^xJKs1wgD@FOR2VA{(2$^!%))0d8WY+x
zEVZ+o$+FcHSyOOHS{DSN*MBunVcCR$8uKhPn0n9KxgNS;L^>)_)4`A+KR*5KG<*KF
z>PtpvJfDqm?YQ$PuyDfnWnJ6D;`HFGk%p!{%OBU$v1)?$mAwRf>uw?P62?!(uH!Qu
zzBhyOX5}bPy<USzKe?%W@51q)MlZCTN~EHQ+2>C&iK8WDNQWAiJ8PV7rOsondP7Qw
zcr@ab4^$}jGxAi$R~a}`UO-iIL_>qdn&y{?1|e?e+*{Q4dePp44Gr|MUHSH_H+=c6
z`LHhhk&0DbC`<ZJ8%oy9&#o?9`%<Y=V$<!|E+B#LhI)SKGq#4Dy*GC(lTMIK71hVW
z3@!$PkVBrjm}C-^%*O4xXO9XEboGf83}~QCBhTRfrd8cI1SW=q*^hZhuDjz{!kzpX
z@Ko`X!LbMBBdAm5US3`^+j@G_?%!yR&cpL(=Q@INw<Yb5?*aeyKB}?BqxWi(WW>FV
zC{4Z&4v<{a0dBWtE5$=8`JGo!D5yJ|S4cOEJ_hctAp+J6ZahXJk4<d{?aCBb)z<op
zu@{rKvw}!2^7m)!KC`H#FcxI;HKs1_5vjP772~0e{K#BOpQOe%Q_tU4=V&UblGTWm
z-$&~gC(i7w3or|0D$Jf;`1*<WtMp~1?+e#-gdbJS)aCZX!RyCw49fd8l`i9h>(bA*
zwv4{(=9J}g(k|iVz1#L_?48$Zi_>YAut})%u%Tf^IP1&v?eUyiBHX;@w-6iq?1CXP
z47Tlna(Pk<=&G}KkyUj|clH7!`|bxnT6m{BuaIls51fY#(l8@qJG}NfkJB)`%KXT+
zJ05@YgnMfDMwhXbnAmH}A(ZRG$Pahpw^up~x(=dJcP}tb;+`P81o~OF==J)YC4R>K
zT&b_~_6f<0RfeC_I2VR$#bA^y%8Bo)eA47xN&T$cY6=>^*m5wK%d&!pBVLc21S)4f
zR#XUE;XTeY${OD?s8cL0QbxPP>=Rp!o@`t0=Wq;guB2x#Dx?_-FONeJA?r;?Dr(rZ
zVMe;$ZY<mX6@gwbn<nU0D=0x1PQ;75>KO77M;uhr<-XQc+}G$z-t-8FZn!uwQg!C@
zNf29qfh@PO@FqBu7u9b>@r#kTHg5%(9)-22{Uvj1|H4|1Jl`j+cMRrJJKJ7L%LUc5
zWsG*qoB^-e*zmeH#T%!d(VXacN%ap92J)kEmhN%Nj<g2sM&(l?&|i5LDRW3z8pXxA
zEWE5JFf_59I@gUCdk0c6FZ-5bOC3vB?BjKyF@C0c71%f^_TeMi>T7gL5M_JWxYBR`
zToa#{<d;LO;2a+E7W6*#&IYb0rt@1@YdgN6I>j7F@Hup54d#5|ty}FNosU);V?U8Q
zRHQn$F{IE_XBe_0|IKJ9)7YK<*bN6^;k>loV~IHVMU(uHf{si?sO$uPh3Ct|#a^8#
zxr}$i2jx&2>VWAy!yBowmFft=a3$@>%8jcLD+LD{d2yGNrwN65X+eCUM|!~?Ei4CR
zWLRTinGgw!zGrgo(b)#G26NkjNm_jcM4{&Fx!#h@QC8s0yc&Uf0N-BE`fm2rsH??P
zlKagoG>OGW5b^UW*L)*`mM?<m*UPsz7AjO<jZnp2iA<|eXPMgkPM^uLfk1wfT_vUj
zEpsTHEy^F7@(RUQD^!Wr|J<xQEdiZ@n8vLtV}9_FkJuQzhFo8iMfRW<*>Xtajmddc
zjL5Lz$yj|z_gb4qN;}xKgRL~yM+OYd>+-F?Nq2GGw~b6tJQ0AtN#bB}>seAsV({Nc
zRvea0MG-RJBsBTi1k?_c`=wL4ztC5K*<&9YnJ5lZ2_=5e#>@%|n5yK8NGEB&2ND`L
zJjJe#w6~1Bo|Swli|5;`ZW=5Ma(AE)xlG<=z;qv7*D~Cx=&^th)W+>cSiis2?_)TM
zHM5_(>u;FIsg7~jlO}!rj)#pk>THvePuHkjmuVRsuj?hMK0@i<2iwvjR<&a?PB2-C
z^b?9K>kDm8GeQeU^RRLj(Zw8&9)5*Dx%1($rlsYs&YiKRK0%l0Jsam?iGem=ThB#B
zY`}S;Kw|yj{5@c8u+;p%A3dG{XR*m&TLQPqfkV@GY)mE3$o)8bfBuAPNWpdfh_FUP
zBf>paD>c^uB#-yYlln0FS7TYRFG~fkTqR00&PNj4juBCtGPatU-!hPM{fIpsRy6YY
zs1wtdtxWZ?dJ|T4-}dJ~q>r<ErK29TqsA&Pyy<ORdY|TTy++cmmB|*7FOt^!BR^2m
z`e$j|=Lw(TQnG0cL3<s!=CrmS9m6g{@6*iC#QTM)ZQsww-B}WnYdbBgNwu%Klv3mP
zNNQE5o*R`y*DZ8>$;3n1>m~QROET<#>~mp0W1Lz|r2(_p^{(XlfKbyZViX*Y#%ep|
z#YRS9DerhS*CsszqnuQ_8%OdToel)hnZgeZ&`&{|M_<0zxH~cECRK`V`46g~@RInM
zU$0d5Z^llgMVwyJJLn&^R8KUNdAAY=avo1ka;)N^P+2BVU>iG*f@5=`#y$Duq{xCt
z=-gijbx1DDCFxT)Z`hV~TMlooN?S`^?L?~B!ZNfUQO;axanRIF9t`KkMjoIk9x;(r
zjKXMKr%z$L&7X?Iy~NW+((*Fu`1o5Kw9~pj*tyx`l@`|XBxv2xr0$w^-UC}qGGd>c
zXx+(9;`@%Sy?cD+bDqq2I)vfr25~+U8#?Zr%D#TSd1s__4+N&p`Pk}KN3pDIO4qk;
zEJb;YTNEjrRH5U1s5d`!9cQM_Q2FV24>+lP5{1@Syy}s@94|!1k)*1p+{v)^rfK2>
zPi)jR(~`F~gdI@L-X!&Qei|HKyNnUPyxW5o7HF=UU^_ePvAJJ}mI@Mv>P>z?y7XU}
zF;!hpGVfq+RS<LCGL3X{U3RYQ*^tdv&2h0}*l2!zBGoh@Fn?mV0*YY%h#4%s_z{(w
zr59C=?dAOPbl7mUmAw!Yt=|zW`TNXQOJz<lV<|_xK=5b0?q#+*!SB`Q6JvKo4c5us
zM>P5rm_J|fMXYgoiV7Uwqy`9K@Wa+^oL<Y-IWu2G%tCzzD9&IiN7SLG#Vk-+!P?m5
z*<)JcH^Z(k>Ak7Y%Jr%}Iq7Lrypa)H-z#9Gdu+S8&o#QlPz*C%2p>fR6xP=IGvC>u
zEV^qMz;E!ZX(>nTkfY3f!J65NdvaW$COR%UUD&W<I<lE}8*|Xp3QWnTkj<*PhD77`
z9XzhEY(|KRO{_e15C>~EjpsO{D`iJASa9^ky%^}_`5Lt;k=Nj05~N#RBRG|G(uKYE
z!!VOim*J=_%!WKBhYl1)>(j2OaC*aI3NdC_n2$8fY@u)@z>D)XN)cIcoOUM8N__4<
zPpJ4f)y}FuAva~PzmL7Ikbg+eQ&_l%$@k2jWq807uP%V4Kqhb7eOO?~Yujm7Mhto#
zvo1_dg5$H3+3j5-rl;^TCO~?<v^lQ&ePyvioriI3IuSA^prCfTc?iE*QcQm6Q><7w
zSwp(d)%|X*cRA<vi-s9qz_Q!?XnM;e0oGGMG$#<VviM!k*19g9nZkXnf@9ASCO|2j
zTcOKBN8^x;a^CHb2-28_Nl!IJIs-m#Mz(8`HjgHF=E=a!hcK#uvYhpnTa5#m6lr(E
zAF(&1%&kXdMHj?8yhctop3H-wUd6jJ8#AB8jRR#7SFH7bH(YGootRifYQ*^hxm=-S
z2Z|E{!B4R;lhI!Mj0&Ef&iWd+)Un|&Snpr|6D^Xyx&K+f3<>IV>M6}H=~*_up$xI-
zt3!+5`)h<^+_N0@^a_9La!AUnOg7@ji*)uE#x}c<P^+=g8;<=P7kfi)EbQfB!Qk(r
z9o$#2Q5S71WaT!9rOCS64}JHZMX}tE0y{H-wepoW7`1%uP9lL6fKO2`ti9G{xOonw
zkkU5~KaJ_&FxviVY;I&cYK#!@divtEi&Q@dwc_VXQpz2%F-<#hQVl23oLmW^30+@E
z#8c^bXh6I1O%VZ}8!vo*YyE_5yRwra(#1^y%^y$P;eBy!(9y2s59eF7X-YqWy_Y8H
zG8kb+i|N&(4TNSLexL9|B>bT=JZAfw>s$TB=y^S!IZAoksog|Y*_Ub;vc*9AasJF>
zm1qU^@<X}Fl!nMXy?1ucWpCz#X~2gX#$`1tY@;~*>RuH{WP2zAy*`w_=lRI%93q68
z+4+>}@?$r|4n<pN)Ot;+i&nIPN*_hlkza~U&X2yE^ZKL#^Te1vM<nRKoD(nNLf*zR
zvK8?_MMT1AU~p4}rj%Za$%m8G&8$0p4}FTZz?X@311d4&^&`(ERnT@7l0ZEy!QEFW
zPI)D&)@S-8pE+JJ6Y+4jcF?U2daOiKm;5El1_W%@c;=lCZY<_j$eX2f^!JYdl2c)4
z4(6XFt8$-4bm%!tDbV<hpU3a3SLV+K_AzBWX_llB)qBAZxQ+}76g|nZZ*n@Ude#s+
zbiz5l!K#x?m8Cq>68H2pY@eorN8~H`=~}vrI!wS4%aT&$hp0~p<gqY7Mcgprhb^2l
zr(S=XAh|C8^taMyJk%^t_(fJPdfRKjrpUxdUP<xGQ}mrz4!@KFq-o;#Bfd(F^7fKm
zf&E?w(FL&{iU-}vT-*a^i)|Usp&!${ZJ0Q5qx4w$>ig8}7yo^?SFP+nZZztdEz4R+
z2zn*W-9=J|l$|#0E-VGp7(C+?B4SkYyP!^R$#MoVDhf!;das|2m03Fr9xpSwP=0uJ
zak^4Tdzes{{_^|F4R#m$Sk$v&S1}V3Q5JiD?tzNQ?A+b`MyCpQ<=-hKwsVeNf)#Tl
z;E~0nINuxl@4q`%fc3Y!q~hvvLA}MQKU)MB3Q{-Dgs=t^Oce@N;#NDzJgXjMZd~!U
zb1y{ppHXNx>rl?~8%RjXe!4p~kR%C^8UI>w5417g*gffef}8n4{~lP%xf4*(IMhkZ
zuoH`R^{Omw$RO-o4u!t1uMwyLX%)cm-{8x)QW@9q+kB#qqN2YCGIb>{*6x95+TUF(
z>X+-_(OX{0Rbv#p8W@8=#gDPTQE6(DW<@j!oluH<pb*~VIa18AI8n#jN1Z}X<cQ7d
zAQ4fJOBwbty^bTWdX-AkW~#bm-m^#$7*Ru=m|}F&59<3E6nj!waLWHFiD!0{z}f%&
zb>zldG;)g7vG>y^W$<Zdp9Z8h6*c(IinAMs@7s|<Xs2H$3RZ34n&h(SBVz#r)#}Eq
z9P^VXLUu7)7K1OaoF9Yz3yt;To3-U*XN+iZhB<x0+fho?NrVoDCL%HpU$#j!zr`}G
z1z~vH#1f8-E)TnH4xZ%I25}%VS&2Q}8~+jKjO~zwL6Yk4jT>FqDF5@NP939>z~Cj7
zAMEu;q)uwhkMRAgQi-!F-aBSG!vQ;j{eYTxjPF19t}nP>PG>qGshqsnlI~UjVJp$+
ziQEZn*GZ5}ahWHIrf{q+Lce|HrA`tT^(r&FBUCHB2P6}-(t<*~mXlZm=Inh)YZNEb
zb(n{3bN!8s>ZT`tifY=BuCyTC5z52<$o{_gtr^srKY0&qo{!%HRQJH+oy}PH{&THe
z-`}|sHB0}cQF2*p`yM#Cwu9dt4+@dAqgsJWx_~ZSgN<~lkJhPIZ-zaJ57YE*9&<S!
zt4T)Quubr{y&)4XOG6g&#vgR~bl~ZTsKgw*uA%8#`>xt<K(y+97R~~|R<QN(a1r6+
zg1U2BSUFolIKj?NTs{^qTs)lIT!5IQkBbG^0pdYp34wp@Cr)?J)J8{RXC+RjC!or$
z>LLTNwNvzSgJ}7wX@mV7z#uC+NeLP;9}yoX7bl2^1&xoBBh+2QN1X1DaS=FvsOF-h
z`6J@tAWo+bCj-bhyFqC9Ir%xcIpCxOFJ3yh4L2)m5lvb7zb(K&iPQb<s<*c{r#By`
zvzrYU4+sR};^yVz<>i1&aJc(IJuG}UpzielSdfLdgWc?0JnWpIG!GUnES)_)#OdJu
z|K*sIi>m6s4F6Aa;N<k+?H_4(4>>Qm^8YSl?%KXC5H3xKyR)Yo7$WBdfqKyYqizNM
zm#&Mao8zAVtiW6lM~D+#%pIO_o_}@qz>)Zu^h3Zlc1|vTG~k*2mlPcTOXz><{6p99
z2t{O_!JZGDD9MV`Jy;U4at7O3iTr_<JeGnWAqyT3ek*Qa4t@b1K@JPBAeh67SD0If
zA0)^F7UcfNjuO<}!vYG1JlKI-=Cp$w;pY~DaC3wBIfNm6a3j3JmK?&?RuB$LK><N)
z9uTh}MA+&deRVfG_%O0?{7-)#>{!9=@CoqqgN3c&y$f)I;eH5lbASYRtT_ZBJi-F}
zeBAuJ{FZbyR$vi%XE!Gc_;Ijvvao@0*}Fh&=x84DB_jPoNt}+C6YlMwk1rf8Jgnie
z;&jjLpq@T|*J|52L9{$99x}%x#4E_d3*r|R5(05^^9lbgp$l<yhmV&BQ-3%rf1DSQ
zaf4WRIJ;>(J3ETg{fol#SDPw)Oj}uaSjbv<K;UZsVzg-g!)RgS<`v=oD~lqk&Q^BT
zzW-;U4`<PzL#Jrx4)50Y?=wOR;`%pow4?bm9z`s`52IV0&fUTb0#Ec`m0(*7s0{>u
zp2Ek<Up03BlS3!W59Sf%7v|;Q2MJqq@biGc93U$JZVmxnem)*+Yd(k&*y103cV}x4
zZwohwv<-Y5!7~6KMSn;<G*9*HpjOV_?(k{qUp;x-LLQRG&CAEZ4dUPt(1x>n_ytAy
zdFi<RKlI%S0{7lZ7z7_5mX;j+mR39*7TneX9J~V7Lc)TUd=Lvh>wi4@f8je1kBESP
z2oL}Nr@mW4__(>PEqOS&!IpyX<nzH#88AN&hp;6`7!04Q3JF+){?C2?Gphf`tn>fL
zI`2PYPw4Nl_mF$8hfCmJLx}6Yj;=p#|8cqeM;v|)et`eFq)X8JclqxO{C5WaI|Kin
zf&b3He`nzTe;N4qq7VXw&oI5=OTPOR#BwDW8M7Cf>hem@<=~`jIHCHJBiP9uSqcE0
zpdN0T3eRZZ{9qc?UvMrrCY)PM0$^Bx-Cd+#ym<Z(OZk7?pHDpyt^r`2<H6Sd*#5t*
z!Louc{^0Cp8n~1c*u~8Qj?Lj%(A&f10Vl&T0eqrt1;-_D%<cwv5RPXa>Mj4myARmr
z4~DbY;n+=EQwAOz0UXoV{0FxD4-B?-bArq8!(|w(oS<;~i28qFs|OtLfSnvY;lBMT
z4-sNQpgLOcJp+8B02BZvKoxia&;XWzCtwFS0v-Sdd=G`!xC5H-_GkYKeX>9LFW_31
za4kCk4A+naoB=1m;*UP?a17uw@bd56x?A({{;5L1d<FoIe%#-mz#kDnjR%0+_xJbL
zpYQK)v*CpL1psJ={#)Pq695RG!Rz1uyN)3X0G_-BfZFbV*I6b3KwT)Dlt1fY;b!rt
zp9hXUqBZ>CgX4Svz%qb89`FqS9vl6YH+b7aJCHLC0NU_eJs$>ulvDs<vVq$+{$IrX
z@C3uZ^7g-#`8$7qNc>2Mh!218f(-wAg!Vv(fAkm?6$K6RF(xL)V+;%|Y&;w+Y+P&%
z3>+dHTzmpTLPE?Z#3V!nBzOdb1b;~UNN^qGN9d0pp%Y+XU=jS^F87^q5<emWP>+NF
z=db@m;-`cMgbF9SKV;(X0;jgaIs8ay=x{DPIh->7K!*RP4ZcT4Kzf9Tf_ncqp&SPZ
z2R@e16#teGSS@M6LQBbXM**<Sv!ys6wWn}Ivwi+i|93kI;cVp3y(y8z#ZD%IXW<)<
zX)h>6i}Mywyrzd{QvW$cksj~%9D1$PA2efKy`sEKT$FDAv`G)WY~0y!jAr`V6hep>
zm_$@V%wP_iQVNwK+7Fo$>0@-$#vUxCqWa;adnoY!qRgT4N7GWP+;PUog1>M$)!YPj
z(lUFk`^TjIhyVba)@b^EUYcJ8rH=7Iii96$z0If^69Y{|YozM)-To~<qT+u<bwxJ&
zuaeIi3QJTt>$R0op*wb{cB0<epRLb6wER+b{@Wsg{!SLT!}7HAsFRGf%u7z=<DFLW
z^v0d|{UpZLH+`oP@3Ig75=A48a@!8L2TFq}Er*j_o{KV4P5}8KaqPLqv$@vJj@vab
zSMxujNFtRmW(P|dp3Jbs!FqRWOYfTWuFPReg=c;`{%<|5xtm_rUp+~v{>$!&WAT6y
z36D2JSSCh26MMqqZa_;3y$tgcZ;%G3n|E!j_%A-yfTFw+;_p$>KmX{UxI#>y&vZmI
z5Gbf7xomK1`lAwmTZL|3PRr1A*xE1gT(F9OKBSVG$yMAwoCxp}2<{TYu6fTwtZ>!q
zJ%a9p!CwP*6ENL62*$>Ejo0Mj)K?|1yNFdknm^(w?hsSunU3iR=Qi;dqGcOR5e)$?
zA^aiy6c?Jl6?{Eekvx5szmAr^J37n$Q2<8RiwFEkbmumkJ&nuuC~fFdRFlMAn2kTD
za#X)bvE8Bd=Y;jN$yKz#2O+#5fhu8)juvvpQ9YPvI@`q<#*Jm%+uw2~S}45IXJ~X1
zQqWA6vg=#J{zxOF%<IM19D+IJ+nc_`B<OStDU%k>nuOc%?NQio8h^y7{6sP3|Eo+0
zepP}OG_kv}dZJ8f?4o5#fzP?PpTDhn7I&OXxIcD{X;M&w>d-8DOT1lkwjpxWIe3fn
ziAGW8`HLA1;}}q-pasmBe?Pz3h(W=AKYHi&LD+awJihC=PWq$>cQkw04iVwP1(%aM
zmH?08Oq)c}X3xk@Lv%HtL7j;k6ZsLitl?LuUD>r9J8y%J5%ES-6BW~~^7?mJI91-e
z@XbJam%%`V4=Wok@v%g##b4)0N>(;R@kT^G)P^h+>UlQ4yHw}o6G;Eomp>Lnn!O!b
zcH|khw;{iR*wnOv?}>_V;uK=TTF05Xx5q<m($cs->dASg+_cZu^r>X-W+`WUAC{qO
zeZ*}F>-$b7k6-rKm(tCZNp)7CdRJ2V#l&z=nUSfCreqmkUi@w+#4mhh2ZE))Z8^T)
zqSMJddKW*`eWC9}mGpG5u^;V2Peg8MAHA0iC><6=E!kj#m`94MVMlc9I^Fo)q)K3k
z86T&~q|j!Hg#6N*FUxO<Dl(zS^b_iW;d!E?!Q52>ri>>^+HB3%>u_oD{LGWVJc6Hc
zTQ(&}lWzw6c7g(CVL9|ga|ijyHND@8ex!snsES4mFI3i?l<kH<C<b<0;@&wu-NKPE
z&>2a)ImrJ&HAf7|tT~ws{p#0rO<>X3z-=<EKlatg_bayh@US>sdA-c$$M=bnX)m{p
zm+vEQPCNizXru(w`jhG3`v+_Kh1QmdlbIJ#j;R-Z(GX8bnT>B>bp{i*@JlYuKC?&Y
zW@3IPz`P~LFJO!Lp8gx{oNb)7jb^4h%$s*h#*0ipzI`dRY`7xARluOwFNgzkjF1RV
z2WwB*w6d?yL*(Gwfs9c5LZ#zsPkr2^!zaCxja?GH%Oe=XM9)nj6547s>9EHUV<hMI
zHM{0$<+=<s)H5{_o>i(;nfHD2<s{6`uE#Z?3(eTpF3|N+pHp*w(O@7fT&p3LzKH`%
zX=U%LmS<=ytCx<-T(>@b8I$k6k&r1iW1qMHTBjdk9=-nxXt(8YG0dlFR_OByw_}b|
zZaxK^agGl)Ol#rb3o96=pYZj1t977zpn_}AgbTb{qv%R`3Mk0O#ebe>^wK+PzV&<y
z;}@A?RzEgvGqv**(A5@QiT!mmBz8i+=p8{8HaZ!OZNZ9#*n=<gKCFrxW_(+QEAA~;
zD&BlugRMH&J)Lo?HL;kvZ_#z3&DYO42RixjzA7Q=R^Pm}yAKynDa2IGN{v6Qk$icY
zz1r1+MEy(HW<x+}A(``8Ei_YFwR%ZwZH1<6p=Ha4_S<9xMzgAyMf3A|O@<8xR9vvz
zqEyF{v3^O>po-8Fw(aV92MNES726;A1BwbS7L0`O5o12SQ14E`rTLk<(8nEbCs($Z
z+3JNEs4n2VtkRr5p}O?-s<_<u9{7IQZ^Qx}Q(tjJxBY4)<9Pd$hpQhp&`m8n#RNi5
zQ&Ofcbt0NR^t@@<a-kJCf@E7x_&v)LHw$h_3sD)r)J@`$R6R7FTf`EyszyfT-k@j?
zi}pnSn!IOUJ83*r&ATUlB5rct#<2}u7|w{`RW2#@bLJxVOA|^uC#_Aic3jcqUz(4(
z^c<WG?e6YQsL?T0iT=nQP4%vd*&U_=vdS%fl6-n4o^Cm3pi|5SbFi$h2+Z#eMCF|A
zDc%8l7|gsoX;dt8+<O#af^J_{>;81R7SAemhHWR3lD%zZALQpoXjVpdrqH-e^=1^*
zBA&+Q%-}AP<%z##ujj$Dk7lpT__?nYyq{<KF1Pt^0_)6eCp~uN_sc~+&)i!4;mx6|
zlq={0Nj{-Q`uOA}b6vhhgDD>}ks-PFa1y_V<E0VKg+{c~<sIc@tuL2-@7$_Qy3NGz
zvr(Z`@(RtKq`|8UyP9L)vSKIBno1gqk%ICRsc?ix_`WI{ogx8_MIX<>raKd3V^$O!
zd_t8YmcN=3Q^{icXFr;RvKO0H=B1HT?9yX6p&`=rC+23D4PDLHZqqU4=A;=-^_Uq0
z$Q1A7Qu7==gz%G!*<`44igtB$*)r>TJLct{oqjbBmNlLX(twZPQ7$dVGBBxTM#JWn
zXJ>xGbBcD1?0xkY>-mFz8LqiIUn^t}BA8)EVj>$AZUvdr*q8fLO^IfF+s9km%3r^A
zCQyz_6s`xlx%blyv~lk4VX67XYFHL6B#mF{@36dg5_WhRx&K9-0odqLkqAA?TuB_}
z_4JOhw;rn#+s?x_Z+{M?mR(|VSf;hGfTx9<QicV!0==UP7iysEil8AJ;JIgqDgxwb
zZ2}Gh4PXV-ep~NMENzvXG1bp+R;6n#mZ<BS;L^?UvqSEeWk6PW^uv2mY`38O6@Y{s
zvh2NEUFCR8)%e|pM7{8sgZ)dgL99;SMIYY>n($5T7knn0UZtaDYUZz2G^OznwIa>j
zE%j_NuspsE+SvCXBG70uynU6-n!MRl)WRQ(05Bj(X(B3Of;ji~i-&Ct)$xcqx0xD7
zwE`!VApFn0%GMT&{0jjo0AQq%eMQ5)*3=k{Ib^*j017O6jaLgB8dNZ_&Lhv<R`4h;
z(?o_pX^Hk8odKZ1AMo}hoR^Dwrehs4&GYdDx>}Z@TMmj?uVH1B^@#bvO=n$Sj({S+
z4-t6V&MLAjlNzn3!gN~+8eSTzADddtDngK5+25?$W@f8}Ha%t6U>s_AW32iOnaXjp
zYcPG37jQM%YtZv6TLj%iG_lySiRUwamekqH!=pssQ0`ZJcG0<F)sXO3$a90!dV|yE
zJ+Rg^XCJFg?37rS<q9FAgKZaV_nwU^?tD>sAC>G*Ng}qP?>VSMCDm8vUVFla%GVC8
zG|k7w5_*I8XteMGyv0olk>g|;(D3P`9;VuIZgXJ2pNi%>i*}W%zj+MWl@QHoqzFPM
zZN$=#wUE)@!zVk*02+;J&s;7U&(5z&-+lGWOxag-nrJA~n_6iDX2$5R5ovizkrB-i
z-b<}U)`&gHsp&aC9)x~LGitRg%F3;mTxUtSYaBU99XSo?b^Rq_-MWL{pG<>H&=LF`
zKqm2C*>fKWRMn?eK$YS*aYmqZ!xk}tv3F_Zzv0UetvVSxdOKS7{Ou44oi8^xJ`jRG
z9qHKyI^(RTR#KwjGJMIDm9bN!x|9q_4pRMo{?dEX^t$BWW;Dq&y`2^x<rxzJqWLQv
z^VP_@8+A`LnTgXk$>?ttqyQW&NouL-qu1tPK*}p*Aea`%9O>ETHZXl|M!z}msvSr6
z6##_uBEXlgBmfOBS_at@_##CB2S7kZ1Q1csk>QIK0A7&c&*MG<P;d!w@bC$V_)%$S
zxp{c`1Z0Wn=%pEC7?}j6;L8^@c&-s1Azm;v6%w4U(PxxDpFAR%U16!}*0Kq+9>rD7
zq)j6YkU41`*pWDW2O<0z@?k&vc;9SEOjB7Ii?>LcEn{YI&h5nWy|3Tx+ZLDA0Iimw
z;qqbi;p?1$raPa2p&;ESf=iN@94GrHZHf1QxJ7DG+J*e3_q7>na_n~3#{A~^P=1zo
z#!cPj4#mXuO`C^zlD26zhp8pQouXm$9No#U$RT<iN2-W%VOL&xE=lXj=M&9KjWg3B
z!a7HTiL2d6G!=}!t-hjC{pm`0ZZu+VtTX*iHc7HEGe@lS&PuzY$i<OH{7d6^`_lC<
zc`DPlQs#J~6<x#k9AnZG2dT{^C-pNgdc$YM8itdkPg-{%*8&koDfa+_ZwHY9#A7tP
zEXJ!u{QcHVsR5p>8U}Hnl-Wtka7~tHS70+OExwTL=FNxIN?kWz$xz;2J~)RY0IF^5
zP|sOW?k)Y{N-BEff;{`|8T`qiHtJ)AnBT+`+goI(kVzbdgyW!AA(#Fi;TiEqR1HI*
zFaFWf{V8XJ!r(i_qpbwbk=Z><Fzu)!zlkiI#jo``<kX^!>?ud5ZB>om*md-Lf6B>P
z7K6`02xI!`R8czPQdt-fbRo1!r5!TV!V)Exq<9YmQ>}U)%iXH6#IbtP_i<I#=&E1E
zL$^xL5o?j1_vwTx$^rt23nqHAnO>^bFKU(GW@)L<g2tZK63hsqdlV;#R>bx+x;Jq+
zn^zvFWGS?~p3qIb7T+&857)*IUh2uU)37&kTpM=1lvwpTW(rhgF+ds29;EPRpC`<c
z9FkjEbTFn>SlT3Md1E@2*!d;rjY;QwYeQY#Y7T4!l(=cNHbleKHs%FrtKw+k(bv@d
z-<1uy5JAyU-BB~9a?b6Pn!;bl!zgs9(tH|(-}6yCwQz-P)~=)1e+3h@wLL|B)zq|2
zV#lyuROfuBD!p|NNHtIuafDiwJC)8$uwVK~GEeLLOl#?SoamETI4JJ=oy!U)53?_E
zA$LPnDqoV=>YMf6y3Kyx?Z?xSL)V8vN7ugQkgcoEKSafMVf)GbmR33DRwj#l3kA}1
z8X{t|O)(>Xyk)ge+EtbL<G8-417>ef<RGLoxjVJTwgb~`=b!P$P`-W!D=TtBz`M$5
zOssG>(wC^PGtsjReDCHcs*^0pxLcPXXddjWy{P3n^ZjJR{foC_ae5!>88s)f9kvQ{
zjcE&Zd}U9jc0ik&ar72B#blhI@~`a3->F$OQJ1#%X%KY6^k&ed;MLXv`&Uu2Bar?1
z6Nus5juVuL=9>NacH8!;aynQ?Z<KjFiE@2b<aqEDe3jg7JQ?iyvCbvbK=_m?PSjH~
zbEl|3=MDIpuCZpa?w!2SvLX9Zr?lJ=F|C{`k9yMzYeaFa@C?&$nfca}x3CaH{vZjS
z*<#EAK1jy;gic_wS>f9m4o90z)sTqo7pz4k#bqe3M6pMNECtBF@BW-ROHzv#)2Kof
zt{$$66D@41GTnWDVS>^{C||v0sMMyI4t20UjkltX#!{biaIz^G3>)1{Vd;eNUeY}s
zi1t<|%JVn=elAcuBc#V2?NxT&?EHbaj>|3i>(y;W`y?S9A)jH?FX!RsEO{TCWNf*2
ziz;=?$rTxEO5-qRB?fSDruBATx3gs6z7ZRLBJ29pD@JDE?Xj+ESV4A)$?Hxb`OA!S
zv=L-WC4OIu5jlUOj?8I$&gfYS6G8zXQ?u;zx$FFVrL|+0RZhWc3ong6sxD$Wc6}>i
z>jQ|#q334qt7!xK;AuGuD4mI5vOntqYH%htDhT-H#ga`~QlC~cLw3=_)GTbBQ2tIl
zdBvAiv|wkYW&ty5KyX0iZMAI35>c@RPwLltG#1sV?Y$!ZJmm=Gxa$5LIaQ~KHN!VK
ziLnJK6Hxu83J|VH{4m2gMc~KU(&B)r6?J35B{mDMdA2OO64W7+v9}yrK(X@99Gp1W
z%QFV{GN8|n^nL$r^KC{f^JzdO&)mdUnHoV<WC1t5;cwpwuJhjsn)S?@Zd6ccse_SM
zCs1{9Cp))S29vC%j=a<>^^&>y=f$*myXfUbMN2XABy}lV9g8-KATC;nDs69zm8bQ`
z6>%z;7@f#q9%E|>xT4@)M+>L<Yomp!w<HUdk1HE%)Aq=|=d=qXuJK!wR$@UJO^!O+
zAyJ#`<t1!l+!s30p&k=VL-v-A=a_v-Hy*t@KDKVM?~=3^W{YdYxf<NhoMr{DcGw1t
zCS%+hy2`D)VX0GSo`+t`A&<rT?I>;XqG=QT3VtGx`}dLUH-7n0Q=_1SPSh=sS7=s!
zZR!VNH~zgA4~t8f7tLDP{)w92tMCMiu{^fC<WxP<{7rf5SJvMu;YcKN<~6uqA5#kJ
zCm#A3Qgu%Tvf_<xpSzns9jUcH0~-w6W*xIdMt*A+q1O{s-hMY@Bs;CA%s3e*S1$jn
zl+O^G*P`al4OwjU4pP_CT5m9m?ljVcxu{$TU6zMx3dPt4%>L+0rD@CSP0TU^H|~B~
ziY|3nvRv=Y)d|>Z$RqfROtBR)bo*k;fkxhakF~>z!{n2zE|xbkXU*gjEt3*b3~Gkw
z5jsEjYwZ#%^je2+OW(wwC$N+adrXjCj3}|^Rzw&ME%&kJM-(k|*`tur7Y`ur{&G}@
zKNhSv&@1fezWLVa`T2mme*f~UL_d!^4LMenv%uhlb+*=OV&4Uve;E8s`CHMar{NqT
zu~lNAOH+~qYeM=Tg;Vyd{SEU2Q6G#xmIO&w8LH_7D$G5#&lbUO0NK3k>uUftcCn7y
z){#G&IkOa1t2NwWH?B-SJvZn;TF)n=JO0X&!)Y_sM#vXRNJgUAD3}pdJ@uL*BbVio
zLoHEF;@oc6v3sA1k=~1}BZ0(YUB;T4*F>u$ELB3q30TC<Tzv&(sw|62+AQoaE|%PE
zUVmEx+|3Xg;WC$${dHzxaB7+I(GP*!DsrN(qDK7-LPuw>VP?aAX(mB;TlQem#Qfe4
zD0`xjVFRsK$BjovjF@K{me1M7hflc3v94sUjA}&zC(6%Lx`ZwBSiuUe>Sf|x`mHOE
z__3lV^8{DzcfW$pksaIxpAJ;K=@OtI%C5~gXRoWZ8k)HqFwnC!ar#{ft7@3BaQaYF
zT$3t$qDNrRE=QY4m|^PIV5of--PKgc5I%WaFwb4{bvh?wPJYuhdX{dQA^dQPESIso
zIgF6nF1G;^plkF2llwN$9|1nydZ&KEAZo}!y7zHTlsnX-mRU~@=csOW7G%~b8(k=5
z*xJB=qAbP4$X~wt;;ekrHMQQt(%+BOF&hOV?L!Hx-25hiZ5?PWFtPlJfP)%VpnG%x
zAu)`K9G{DIfZmDWS;mWRQ&VI0&s?iF7=mj%Cb3cWOtl3QI-ii>lHCJOFes+wBn+<`
zCW<3dlIdTP!uU}!{l<=UstHe~v5HY{8aauvDsEFt?P-S-UD2`%U~17G$-$M=QLi~(
zM}P0p?4q$>{DA6dT4CS~e?S%j#xi<>S0bU^@hl-MT|~e)htx~P@JczT+JUKqfJoGZ
zopatA^J*KhU->pU`Ek_<g;vgT!qoCJ;&8UfZsRFj6I-x)6`3c=yQ^pJe0|uv{XZy_
zH!-IeU$ek4!3Du{9TX(zKN$waxk?N~;t@z#sa~qs|JY#+RQ^onl#%xltzIw(FrWCf
zmy(9%&JrtkR_H)0i7~xHT^gD1{!IGI7ic391F_XLqnjzdY8B>-K3D~=A6dG|BIE^b
zgVRguf|BXo^F#-&M$+2CiDCkEBRz-gEL#>c4fXSATiaZ+?)~a(%!*QW{*LEN9c)x)
zXWvo5-A!c|v16VTy&CpS>8ErK8M(vfW4)hmMDQmjRyk%Jen7rWsE}#LxW9949Dds~
zSdxTk`Mt5*pX|~Bt!FDcrF?<3{9W8I%zp22r9Jmf?Il=n^PS6?{SH&j$6+t&VCy2s
zC};&3b80dipZ#vOlyF`qNMz_`kO}sA(G6{;KKOT4C=52!Nn~94I6~?sK|qC_wz4YG
zvFh4M{5{}sO#^=CT#`kfTw((&tf@#Sf6K6px>mfGTV_XmF1ETKlM+>}Pi8kZqjGC=
zvAfNsa7B@Fd&>Oe1qNyH$H;+vN-nkN;&T0x9v(wwf7d0UKH-&X{Le4(=xV~dYQ1X$
zr`O~$LuVE=v()+>Y~n}-nuHIXv}c(baZlx|Ou<KG(L7`H6+S%18D_qh0_ucyMo#^)
zX#AxjwfBIPZTnl>%_?sua`G6pJU;Q#{zWE%W^uU-$#~s}+H1p{HG*o`pp%FZiR{>?
z%-PHsHiPhAD@~GW#YvKCY?UU?hOg}eqM>xClQo_F)Gwxo=_u7r7(SnIcytD-?zo@+
zsFQ^69P-{pjDGg9SsND#!gprp_B%(iA`FTwLxm<;s@B{C*zu0Lp@9d&-=41WOy9x+
z=EhXfH8CuaKaCqt8yK8k$-#en;`B}pW*BO8Aa2Kcqi*^7Xf@TUj41HsbtaK`OslQM
z-1deQxts-0bd@eCIkb<qeRnc{*sN;GAgO#_r1D3;xx-V++R196J<kuJ<xZ=wB)_P)
zo!&`((U;Bh{_@<J;Mez`S{SgRMi~0smcYk8``q~fi8f0&71)OnnF6Jm@X`dbM<t5%
z(85TGZWHr}qqHJo%;BkUw~T@WzCgObdm#VV(+Kxf#Scfe!9rJ+sZGj+>GcWK)tw=e
zyA!cM-%N?-QEJnbgNu~aorR;b4WGLUu^|6U$(GftVE?QF;s%SCkm{S&aZsO)$ZiZI
z5gahUdCt1hB=X}&U4==ydudqfsE<(cKGc_KGU4|XSU9|N==n>0FCV4ZWoDbV8JW1=
zcr{63#25R$Cn$sidb%^-?{5K3k&zk=!)1Z9@}ho+<(Eyi9x{)<wNbnFp`M^$Cx=C=
zMYyFC)o|xH$>_2tG;WzkS4LAfhrVdDaWHpM^|w%m(jES~t3TYjtBPT3oRLh9oxq1P
zxOv=B`SvWUvM~pw=z6EvOx%7O<i&y3V}<?2zuj40B`T9%{yM@4*HDcnZYJ-_j0K(B
zh*P-_4KTm6A5k`?_&7VDlKyeFe>gqrzrGc2F`6WMf4m3QpM1Rs;OlBBTmS(H{)=9y
z$mmE&j~*7*58nnN<HCQw>k+=R1`YuooO|g?V-frTg^=jsC%l#qwJbktx_uXvl97!&
z`m@A_e|ad0uy4re_!cN_H+o-33q@RrQE?$!<7hVu9)O}U(j)oT-$?VxdTv$L$-SR+
zRnxj~{r%cHGGe8^jP2p=>2`Yl{^}9(Ffn0|tFhk0o5mzaeX(x^{S717vj=cxvo1}o
zb%?07@7?N9Urdj;io0;A&;R<9r=mxsHXyInA&6xZFDCoNuGFu_g)d2{*3r*l!jVaa
zshso1Sw>=|y(`h$^)eOAs`Ms~N^d`8dF>Iv+|?9STF(?1S58gYU(=wZAsZThhj6{k
zBj;UL%1FmIHHEGdhc<ad1Zs&%OP*0@FFX4hV7?3ctxVgE$!dnKN~4hKAKY)7t>NRJ
z?U;T9;oE-@R1dqwxsk{}(`z~;SV&#@!dQ#u3)Q=>_||3l`J;t&`vuqc=lkz`Ucb!3
zy`t@!xGOO8DYQi4d&%l*r%Yv_cU^-ld}5-{Ld!nHYR9?b&GlXV+bE9u_==>guwT}s
zeEXK$Qw%FYE6GblDg)WTnKSK`A=U6#hF?Di*Qb6aN`{+Phspf$L+0=*Yx3C%MFyc;
zqR<n5vC7y)aUK3ygMPI`_9E*}tgm^(Ul{%mw%!6Ljwk3FCczTiU4py22X}XOcMSvx
z7Tnz-fkO`W!`(H=A&0xWYhLpIo_fA|tKQwY-M!h_v6}9h>FNIUJ-bbb7G2=h=O;hu
zgK$*!rwR!HjN|xTS%hMBipmkFZ<bs|CpBQJnV)qu7@it=!n;p&V9rYa!rsEvx>3SV
zVcaAK-U<rz5%oYkgC2KJhQ1!MCY3=BZ(Mqwt<ok!vY=S^ZXI(VJ|dsgvIOIDS@!n0
zuA29A`a!WqZl)OEdUns7MwsD}PaL{uO=?%$3^^gFKfI=3&pCU7t9jd949`}IhUgDU
z63&Ka%BefCHDQ@DsoN{oE7thnGkpdUfA%Wk?hzpJGDbQINuXfI#J@-Cl&?U>M9n&U
z+Ms;(y{Jr1^&2(B(Xxra$+rlXTg@Nx+HZCKKPxH!LNOM5C+_wLbc1O&Zw>*M_v~#{
zv~H`-h^33$dC|tf@C|yPUokAWY9mnsdZXg)o{to0lsFa0UIvLaLMi4hQaoJhoQ(@Y
zup3OrTDRqX;7+@>#?N|+DfO%}*b=omy8Jr*a`<LFStafShLLO&$FM6{)uz5Ono8z{
zCnd5ZXQS}7iGjBYdNU_7eA!oL2tIfgPT1NMh>T#uZ6>u5i^sH^(ny~=2Q9EL;Xx5K
zk1qb_gUIIGEN1&49My+jBCRUn$SyA^TJOX!UMtbj^>pV{ze<-Po0OtIbv)7e+0L;f
z7*jsM5B6?5q<uP#+}DILjdM(8#ZOg(4btos&X~wSzi5%({^V*L^F+hRzhE3Gze$X8
z)f?Gd*9EgzTh*Ic9}|m$Gr?hvW9{-gVg0kFu>8X6CSh;D5GTz?QM1AvyID)7uiybi
z>dX7X7>rGegB-k*6pDsy-|UL}=%kMPcY^Z3yf+n_PTa}Q5Z+bXX;dV$?Zr|Ji;?@~
zKlX|i8jtHkrZ8VSZ)ZQe6&>Ap2-WrlNU%w(##5v2KmuiBptxZD%@c))t{c;{9ECaD
z$5CN3^-762!9(LsULz4cx+L=TATn_B$U3S2zU7U@G<MJ-Gu?`7iL6Y0(Je|^=nb28
zxT;}hg<DmliOilxq%jgW#j^10(Uem#F(k>C%Gq(4yKIT`-C`Wm&KUyZH>Vb|q$w=^
ziWy<?t<MiEt~bNf?{T*3OH1y}LqRzzNDJTfg;NP0VK4xp#-(nR%P9-wxC2t$0mRgz
z-<yhOyD8yOa1%WDMvpoFQX9oj3L{4$FY^n3qLx}<-_>ZWbOFhejEmljN%QJFr#%VV
zWdUo_lLz<*GMpkcEZWd@D`tcG!9gpjUk5x1FYF3z;PIvv#uWz(u9gq5rg4cxiGNeD
ze-N;dxl7|knrA#g2P1kQ;O5aKj1H!)YjQe8>}d+<9rU=l>;6n=&<I4*I^=IOl$}Ou
zhQmcl&TX??9^kO)`qcZ;(JyYefqJ(4f*CBt$QU_kudXv59nU3b#*w&C(0@=$XPySN
zPftsckHd`6l+$TO*u$N!umHYVm6tl+bk(SJS~*L%G;8h8nSGHi$l+Yinl2%T%EFbH
z4Z`~pV~h}5HQ=efBQh=J06Qg&0IWi35kl%buLIJr!;l5i(i1EDQD|b->PgE2U;k{h
z_VYAR354WrVJS7l>!eZc+wfD)-F*FXyh1+DqncH6rB`BKYv^xE2wS1icsW9tX`W?%
z5p4%}p2F}&M6r$KWnNXkgu9a!J#Vt)9rmCb_pJbm6Xp~~Wz4oC&pP~WBRWaDanrvX
zk^bTr`w56#^&Q`d%9+sNgS62gD>sD9n6R$y2)!NJt>{-A@5+UT?(rY}9|(d9!?0~1
za6VQ9LKln<*XW|%Dj6+tNEJ(}ZAY!5)mF8|!{9COU{_iaBe}8iKm8WP<Y-ah-Kqm#
z86RY!7?#t;MGK3H{W-^V+e6Y)Q4_jnRO_MC>MxVbpH}(+Q<%Tq`rfdz&jS`CruI^%
z%7RifP-may^q>jyT(etDiGoAwe-KZ+U8*@(e3Ps8w>sA}j>T5^b6hZJIx7it$xR)+
zb4Zq8hyFWr>E{tXWagyqE73{lC3>i-U@DK*i$Hp|07hI}c}z2~DeeKu?)T<d^8s$B
zY;&zuwlv4!mrQXEcY1tTUOC_uNf-yI$@R-z9~#t^9---o`jPiH_MG|F(6GNyp(Y}S
zk|ENFwAt2>BWX+%&VN)lla@m!js}eZydpiw+DnU=>bh3yy@zEIFvq7Az};LKW@|QN
zPs<%|%grjb!FcDFn!Qt>(@r^4pef)6)P0!L`bi;5d8VnO9#_i^im4GUT^*>HAEuS=
zWF|*63Xun%(*rF&$C<<pq~DhXaF$~mnmnhPGqf?dQXmhD`2^O`)9uq}Vg+?`Y3w4N
zj&SsCc7Vn8V=M7l%Kt*Oz(uKqnJ?4LAZ{r_l+0N{67=0vJ<b5IhGK`tSq+b9-v{Ig
z^+zT(IsBw3@=rehNFB?;J+N;=VVooWyCpMsxUr_LJOsHFqot~61V7A6O6x*@Gix1`
zb&Rz4^S5W{=2UR+q&>7u|J*mfYtZ%Mo2mwcR~P*!Q7TUom{W2H%~(e$6ADo67sJ?B
z*6*0k6@6Y+ki{)EpIiV@M-m;U&vB-#EBiU4TO@Z99JY7Be(E^?(crjD&s=1+UL{*J
zxrhL^)$Zu>(8APQ&mmqy4eld?$Ao_tCU?lTjST_yDZB{z9K@Rhwl^;ePGTSKLc3mc
zqqwKt`BDGjFVtK)rG3pNed?mcfTym?Q83Z0Tiytf<`?Fe4=>YBqwb&VO0vs^CgFxP
zmx@_E6~oy7xD@wK91o-_C^%3y(0F{s|G8!C`D5bjcX8-6*FfoPcTYi32{u?c;V+cr
zA~J7PnZW|i=1yRjqCf~~<S3nJHoArd`-0&6+Xx$g3wpArNQPMS_$MtLy<tt=-8-<N
zW_wK2a9)%f>|;qgdgAT-0MZm!VyNoCgo0Hx#7b-li9+EOVD2q5Ai8w6!v#UXt3ETG
zc~@6oXZiNveI5?r11ixZWw`M2d9J%1ckb9Ta~_tsOZG@^MDwmn8e&o)(`rk+q=PrN
z9#XP-+2Xu}FbfBv^*q%j+l04IW*hjwE>Jr>L_6VXLF+REK2K<=*O4tr_^J$&x}ALz
z$9LjRC7Hrt6~O_v2~|vC1P$R}|KnR6e)@~E8)bTX&E|qa(T3bK>Rp7*x}TXaWfWs4
z$7xs0+#t*^w9guS+Qt&s32mt&Nnn-jXoPrZJ%mzs1?F1)V)V#K&|j!BH)d$XZjwHi
zm=)0SmJVTN9rAPW6SaJxt~JH{jI-U_DywHCN*&(HtPeAAWg1bGZZiqyi64|*V|k%e
zSYa+dJUh)zywPuHNohr4ellyxp-vP32^N0v41qslsKpT<I@_zf{FzP4LW+Dkw)j95
z-29R7k+$?m&*|<>4&T`-ReeYHKvN*n3B7tigRpgBcDdh|UfXcBAGOc*-F&nlxn@iU
z@u}3W_&Y3TQOPG&3D}%6zepj3D48W3+{^nPM@5w=u&wB)7iI~%uLHE>Epqc|NnGy(
zZ8Ut;`qw{7R@2sCd(b;ctSa^H-QQ730oCPQy-d~i0geVsvYUUOAL86mqzn~sG{=y6
zK7~bdjpnub5L@$UAPVN~@m52;qVC#DHrLd=XER7%1n2bmt`TcNYAXCJgbuA;E!=r~
z{WPkDlFt1g6v-Ith;lPrFHxD7AGy0UvCf1<6U_Hzj(|l1aSnBDZuiI~EGs7B&{z;}
zV$Kh&NBnRN1;2T2P&a0taka1Pw&?HK2GZ{V=Di}l@tEy01MQ#32beKO2)szBJb62g
zffB7LMmM&HVUp`pNk=ye@9XA#O1i@p2L!CSGj3P}JGXyNJB!$J1%`4|a|N1gO*EU%
zvLIO5ZKZ)u8{4`ho<<N$YZOmL4=O{2+<HII!XwFWD7<FtZ8qpn$##AH$*L4_?4pwV
zxGM;Cf;Akc0U6D^UU!6DOXgy_Z?WoHC`y^Y!Svd?M-GK(>UyVjyf%i3{wQIwIZh5A
z6nx*+<D4PN@MDrzsW+PgdH#Zs7%ekSF*BYUL6?=U;7%dEhG@6bvI;cbI9DGQ60T{u
z=ZlrcId)#BjtB)<D2Om~4{u?o!()nclE>4VE%TtdAKYzq<#Df0TDhx*?j5Po(Mchv
zQ2VLXmlt`Np0MF)vFH*LXYb}YkcI9p=#&e4_F=f}oMRDiSv<VB+xAE^K{$}58e8O)
zJ;LfV0Rbhs>yPkN?&Qp0zWfWf|L-vSY;~riKVs@k6`GUs1>T|z-hnn7qNACH9ja@p
zquI9DE|+hmaZ1>lTeRrL{W)K{DO&NK`H`ixDgTD}O5D_unN?t?vj8G8{cXfwydj|A
zJn1Ri=AHelQ{AFWzeRV-A2Aia;`*f;P36Tc-=!r_bwu}fM$dWb(T{X@Vu(=Hc||v+
zNJ(=bx7y#0c{$odnJ#|uL!KI^7OLYE3fs8U^mRXax>jawW8~Np+4&-h7Zz3A>D|=M
zsn`T>pXTTNf;&sfjw=1bl;ny9<LMo|?=MvI4;iRw6MnA&0s6afG}*$?E-qq8?di;?
z_KxPbfaV>a&<2pcxcyMz9VOBfSRD+0CCX6)TjO4Hzg4P_5j}rT(#iEoU<`ONR`44Z
zLfu2Rp=hH%`Y-pnf4LhCe0vp@ec3Cc`&}M0AmAjD<z}ooQSX(*LmXo^`94m+mlcII
zQ6OzoyfkaHF*{~9eX+l`^^(q$eyJ`N=KYtW(2fyRjaQ@apu+^P%VtH#IQZGTUZidJ
zxw=V!<GItg^?&~oGT+yCJsLZBS>OA0dEO0K=DPlOw+i?+cK;r2{4e?@#8K^3TFUl(
z3EtR8*WDQV@?Ri{W_Ukn%~}TjLb?9iwf`R!ZCGfS4>132+rMMGzoTfsOBc{E*+t1&
zIaEzyvA$r7skw?%1pU6?{OXqYpGe{3Kas+f&Z4-{a*sjgBu9=l@1$+cHs7FoCEs5t
zR_)H2Y~wNDjHTgL4FU^CWi<z)ku^^HWZQV}Lgs?^4%Q5dxST+y^uHvIn+Iq&5&mo<
zLn0P`p@@j#P(pBj7ZHya?am#tH(lI(`Ys`yk-wc^7Z8UM0xuf<XC`h>?dr%QQ{VeL
zj1W1gg7W3mlE@IeXvnXD16yf#+DCKm1AtCM>1X<G(VvA*iVZmp1RqFZxeY3K@|^-<
zn-WxuLud)b#d3|IKPw~3C5{##(D~{yaay)u{DL~%t-8tr67*(rFNe+Ay1RORf?1={
zF!hQoPNr1_l!M=2r%g9S3tSLJy1IMkszi4tAljMBbr`AOMulDC^m0#Iw>PG<#sWXm
zc8m*|{dj}ZEOr<B=|k5p+S3#*wArK^0kp<BrOW=sdK>w?tCwjl*k4AVWhj`kMgs?7
zypMZSb7lpLn1)v<uUVRV#cGZjU8AbhAk%;UA?J)4;)p|XRS>S|ZF(5SbN8NRondBv
zi-;f7M=Wg~qo!_oL~+Z-v7m2Fzt8q=#Dxm$Q>*wK8K2&sjWv@Alq18<BVD_!QJQ|o
zuAE=1#Tt_a@$RH5gJ<AgFZpg0C{^E5K-!=|3G@@!Qp|EKXkF%x3&q^_D^e@r=&P`t
zGlm&gu@%Kkw4#5>sjgb-foFzq>}DCxQ7^2Mx)h(G;_nILube-BmdWC#WUwDF{a2b2
zb~gE%N(KF0!+oTx!7lM{({V&t%i7?6(K)mGZR3)Wl6ED$5IZZ=D(9kR(^skd{m5)G
zC^`GYuOX!a=Yw6!$+Euv<kp6TtV9AvSPSggayHo2zWw;HzkHoJ(5u_WrRrH(S=sA9
za&Dkyj@tguX=BTZk;^@7N#N{nQvA59=bSC8s~gy0DVQKIYS*K<N33hCgMPiHDQ(?4
z+FgThrL_xtPDk<6ew?4zH{;;3nvQA<Fh(*;p?Mdrx7>e;IOgJR%BTeyIusQ6<fpGR
zv+(CDR1}mM1-Di^s=K{Q^(-788f1`~kDgW4-^zMPqHH&1T$SgescZ`-^6WsX^%?q;
zGU_rG<hntr3c7U2q4i~eam;sUsFIuBned1nqBD9Ei2t+qX-x1NA6e1HyvFaP&|QAw
z6g_o?XeVZeT01&ZdPf3?o^5hy6(|zi?U|`^cOU&5&dlE`g$@osORG$0H^ba+3|U&;
z5;tYU)E!|B3T{QVp`Vp=yhsQ4Bf3Y&_z89Uh}PpT$gCC4#=GqPo;%93=^FExvq)!_
zJ8JF+)gdNC9mfWXc|C-v;NrMkQOY)4eOy=dW7Q=OX5!X_k6KWvlLBH<j0$ex5o;<g
z6ZUjF1L9^7xWDwl-lkUzpgq9a*(wQ}x6lBPg?n*_VxgbY*SoAW>D92uSt?dtGn&n?
zW*y&OvlhNI=6szg4r8!(b*F!dea)1M^tb%p9aCWH?-8@Z^|L^h;L_8f#SwuP;%4V7
z*Pz=QZv&e06=mbM-1IK#on?O>rJj##DUzbJJg4K+Li{feu^QEsshVO)GA^_t9(yvN
zDZ!Puhyb0SlAA07qFzdm7^$1VHwG<iPlDH$z%szEr^kYja&5;GXvIJH<j>xpWcuXK
zHOCfj)Jg&j?+1S`tN2rI2bGf3ybyZYKA>q?_BC}Cs5gtMK_!C48z1=;O6ZJ<)#Co4
zeL&d5i1SvBW_k85dWKh%M%lL5G)b#pORfUC$EZWxVWzE0UxB46F^H$3K-7?ztKOas
zORGrCQqHXS65LMaE57F6Xm89|P-I)mUbc$kw$DrtdBFv^l*u&4w1IpgZ?jBu-FDAW
zJ}j<XrNJJ~p}GPrTOv0g&{>#Uwb5pN>h!)}(Y%6EjI_sBF*3?3x7mM9!tB0G%HF5a
z?G_JhvDmaOy6~K`6YjBB!5;CMe9JFsJ$6MAF38qX9TJiY`m`Rw9d9)^zGo#8yW##p
zSBFl9wV?=ovkM_ct6Pdn26s(!NQj5dv1A?W$Vg45&9q0jAmbYYN*T<duQhB>7-AX+
z8XzOdMJ&s~9rprj(E_e*|5ZB0vi-YfZWDVbLU37{j%`>QUMIRK3;prVau0*WEN4-&
zK{D!WZ#j0u_`<r6QK(i~Kck)}FgNBILLrVzD49Wf-q(1};Wr9d?n){+wplbXou|g6
zQ2-Qa4MjT=;!C2anVXm9!c@zA$awGGn%$`_jQp@Y=gM8D)t4+^<@@x<%uXxw#i1{i
zr`}O;CI327r2x;$R<G6>srTs^Awj+;6Km8n^FGy2>q@=1W}yrv*ev6!Psu)Dc^sWO
zvz_N65#?KBfB(}2?L6IPv{-yia4f6GM=#c!20%>g7Di{&?1=gXTZq+BMzw@|WYEnC
zbp%&Vzp067q0EuQcPycw<+AAmtdM#AzAnuoYCim!=dQ?r<|`PDSw>z~#c^JTZn}JD
zIn~0^KXQfkVkKP5vhQ_N2Y|U!%RjP5hThI_(9&>9bx@GvCPwW-Oxbu0=EJgTCSWOw
zHi{ueZj;F=vq^7%W;v4iyIQ>NGGkAyqnDMi8|uHh>+Ak&Z3UVI#|e7uNXiABVqZu@
zO=suK`r+steTS9_Prfoh4BM4HC)!7<M0oGZn#PQ=I*SR__mwX6aO^rIb0zoZNqe?=
z6qL{iau^1$R8~6GXv}sIWzkZbhp3}(DQsMMWk6f|Br3rrq+OAQJ~I6^ZCrT;Az{rv
z+YetkGlH>4Y{$_JWm6O8HF0v%7zvi8sx{c~3&Ewdh0v^xhDU*eDA*hZmib5D8mglz
zQgy{eBl`K)%<$cIGmLeu<F;lZOi-KydP^CbFbeXF4EJbpI>H-9zopD&Wy=|U6cG)F
zbyKogG#Cc@7a_6G|FR!*Df<j+&|EOS%gEO)#tt*+*z5+I`$)s8<$m37_+oX*w2LNo
z{K(&A?sT16tnY{}L)ASu`kfX%%+&U-i{rG@dfC2<;Md{DV;3p|Y`Ij#PcGORAtEaD
z4qEC%`!2tEg05EI8HwNaWtrS>a*;WDhFy+xmd4GYMQ@3oErO<!>(X5ZcyBvlhhmMP
ztCeEI-%pW_AIHU*4Q7##0ZuB;SOuc+EL#Rz28Hdr))fo!x^xc;6~T1|$|WrCVw_yZ
z;AQU+byGIsdIff*mbTH*)na@dE&a%G69*hMxc)@v?)8S<tBQp`lD=B5*Yul@m06b&
zg-ZThU9+HlJ;+BEL8xe^Vlth1`%kfInIX7gs#cC>TNhPgA?;l3gdfoRqT>fa#WPhT
zK(}tO)H!GR&13Gp>%*HRPUndgN^EE%fF6+%wqmsOplL*1L#5Oj8S7hXfSDE!kAR%m
z*yAn<ZE)XkSxbdP$v0QvjMgpTGkYk}Hd|^r&c(P$RsLcsHl%2wp`bq``}%B}-!Ezz
z_C6&V4(gQQd*y4UR7=TbbVy&_N(CPOCwF=~YWZXDGF<1WN4z#vvII`7Zk}-1aC5h$
zDpZt$O-qhV5_zEp%q93t<6^kcmO?Wy51XspGX5mV#e7Z2M!#rOm+d$v2Y0W7#~S_a
zHN#DB5fH5lqZmDBwIMpp?mMy-AyQ-H)Fu9>=^rLV=hy_#qFI(SrQIJ-_ZALg9Ay$O
zS#N;z`e2c3HjTp>5aVB{@xHCjwR_x-;(*TqnNy|^|FNkSpL=Cky&)AE{>Ew>d##T<
z;zp&o<OJZr7PR>a*x`JS>$5!n*->UYrm0QiV%t%k2+i2KA&-e!KF%py!;e(q8)ac*
zPSflwz7S!9=nSP$+;bxIoZJ}t1*=nHe2wJwi{6_b*iYu2dI2i{$-A5=M<5Z~$4%++
za%H+2%#=Ra5pP@Gu;gfkpGFrmmUDxEBW6p^aRB5J_;6LRD|E`I>?`LXkM3WLTX<1D
zOR~~o$$aUx8OaUxGWgxWIn5oKl~S?{6QE=kZHbw|WG1ji09pBD2VJv90GhZ)?+pfs
zYp~7P@)g?K@`co#+B62%QmC?akcR%qIGPM$lyfTHQ5dvlYyZx<Thj1<g^JzkhTV$y
z^S>M8E~7DAGzWgh_{2F;5?9KTc`nuN|98ABK!mCDNP3<JhyGBM`R|cF_Qm{uDOpo}
zQ$MHu3q^OI5|HvdDl+Q7OS((9AlE@N;a@VBoT-=eq992kulHhW+A?>|d=XqcsNQ=G
zv^Ly>$a$#NoT{AB%yQcZ4nh2ltMYGo*5mM_OjpBgG}(YTHZx&%yk4DKmq~eC?j_o<
zYvd`tb6S6)+LVhu8j$?{eNvWx`=I(4svn5Ggks5&*H{YbC=gJ07$a$2=xYS!D=ZbY
z4?)aX&tqt9?=WxLrTbr5&@V;g`u&t=E=ft>re<nM|Nm(Dem?~gjAD|<m-4Z((NspJ
zzfiUBiz>PQTrPe52nT}z4+jJPzGwTc3H|PJ34;ui4VGL~)zlU3-QyAkE2o&7dty@U
z^cM~_v*h1BaM+Yw;+s^#As1iOJqqe(E_?q+KN?Qt<3p0oA*26o2*pQ1``g&Ng=50g
z>Uo}J<4WhIE}eD9AGMvgriPJE8o25^cXq#lD*+R775&d|Ol8Xa>0<kE5r4e)JJ=6L
zj6AfJb&%#ciMF{4mG$v|6@8=Ntzdm@#GU5Crs=wPXaWkS8u&zIkN?1SKLZK}7C%8>
z7C*Hrmy5)*{NY0V-&BG}+v6H<<`?Dpp0YQvJby@IdB8LNx-T~V&?>K(sy<oq-K2e6
z%cB6^N3c6s0A1a2wX3zt>kR1i7fM0h@fv<x5%lDdNqU$+n0`PIZhn##?ewG^uzC3n
z#<5Xvw0=dB6O>o6LsF_%^0*+irpq<al9|KlHdalb%<3yTVX*G1OswO;=by5aSf?zc
zN!(kzwT})IoS?YOj;wY=b(Cco_N=$q*h-T~ID)!f%agSffeEoVx|@BWIN?4fVC|u-
z#QEvk?|83b`>wbUKCt4W4NH?nTSxhc5L)QA;O$5^{guz)Xp?lbZsLs&-fBzpe99l!
z&z>mZ{$YW@VY|M6rb)m(^rRrX>}h286yaXgauLOGRf6d9!+O7p&z?^XGM{@c&@cYI
zMI=UHSJh8enb|JCFa(ZiR^Tnae5txw>P}Xj^lhj0(FhgF6*BQr6)I`_)A<*wZ!7iY
zXhPnxd$21vYl0^=V3tc{8jFDGjxbN*6QH|$(p9vj#aw>J&UEqXO+}XHwt!m5C;Zp*
z$cTq5;r|LMeqxaCUE-eAzB24<gd9kjcIMu{L(cWaHgr`)q;hsj731x}q5%iehn7e@
zJNoQiS3_+xQ<cY4n0d~eCx7Apg;GI{j2@r;PSABYw|y@uZrAct_7r4RO8ACF9_t~M
zcqn-Wr6I(Cc2rm4j!H84meMH&a7LhM$l7#K4dbD7va|UxYEE7;bza>+uxHx=KiYMe
zm48r4AqMRCXCooshe}jKMV+j4q(E=rQQ<-3-v`yD56|U^#VEOyxY#gfEZ;|+E2e=t
z!z;CZxncZQ7j1rL`oB=ccFqM2N!H8&)~Qgp##QB~fOD;C&pt2#wh_U0Qws7VvP^}h
zXHZdgs;y~<uk;vKqrSh%Lq_0!vQ#BM(+N`pql9b2ZCs*?G*f89X9T(L(Nj*4%z+S>
ztBF$<Ch5VhM)R;N$+SMDK1-nG!LkkWlL7D65RVXXMipJ1JiN{gCp}wNtP!EiMt*T}
zlEIHDEBXQJg98WaAOk^B|3bjIF@$hkBTROqb?3NtJ=Z{DK5_A;fr71FcnslSul8V(
zr3%Hfq8SfgU@xM*K5Eb-Ry2y)$kXvQWXtTD({8c76!+)8s$;lzs$C)&QzE;i8`yow
z5KEBZNWC~`|E#g1F*C2D1+HDPn*y{76jc_q4jFMjhBUuvlEUfa$(+_Q(2y^m?rSYH
z3DGz^`(x$|Dj}RVDSEKlZrTr<B|1@whu(RS#s=6{42-i1E{My^EfO7V?Vg)=9n!fa
z_I+6LQ}nRlex<>VIU2}lX!TW^!?5q~OibXxCe?1O?5y!q&^_l|i(st7jZG|#*><=p
z^)Ptq9gb-m`V}nl3haz1mmg{NV<;N66}Xzb;g<&<LB@Hf^flSG^f+U%D$I;(f#gXX
zgup%u6e+-RYxbcwizH|sH8R3GOE{YMjONznc3+1-AeVf=i#ht3l9|7~?E~=nd*H&|
zcgZ!OFV=5z%7nA=H8VzrH<@8Nq3vO?L6M6{o@H03SY>jLDn46)dv$*n#rG^DMiy0~
zNNS8qFN+gQQ{3s@qfVHnWCZ5xK9F*f=I%;F^dt^3Iu!g$HUB6IW>{P^OPlnit*!uf
zD)Nyfx5=K8hU)d#3^>{%kPxX{k$7Co<yH5`qG7KfQ$TZ$<4QzN_`Z}TAqqGb`NEnj
znWx`%ltNMt=PF$AeN-JYSQ-KQihBF_TPW3z_>_+H0`}<CetK~@?1JTsaq+6cqidWb
zM|TvZuNG-d^ISuuHosPh@nyaa{)OTNM|t?SiMtb-NAz!xt2E%8zaDUJdGGU8CBIz-
z6=$jNO6UKWoAvlft*<SHD?PDp7ktt0FCAYx*nTr#6&oFb;oyE<HYq^p1xi(CDet-q
zSW6mSW;<lWT3E_^I>b9a)w3nNRp3KK*t$t!Vrs8VDEi^_@?yuZcsf;j+2|tGA9wUV
zpcPb19DaD}u}Cd<v<Lcqab~e9s7qRnmyKjAjbB@w6({thSYDS75Ie2NlV3MR+Ko4(
z?$+)G<+wQ&*A>dV<}V4YCAbj&kWO_eVj$0}u0P2~uv0FeC-?Cjx+-zu@0_$rUCgbQ
z_%gm)x!8c_OHl`icjQA7MD_qo@WAQY)Dv>pswT%C0&d&*T(8Zt8U1nAb?E(Z**01n
ze2-+ab~(RH;#BT-G`C<H&?PIdeS{hzF6o{_NV@!;g`LMu0T1IfJ1U~1ube7Q^YruZ
z8k@&!XvPNP+idx|qWq1d^qzfqyvYtJ|NUI2_%z)KUip}*%b!9iJ(<G0eQ1BgZM6Yd
zz~&!@&s6CYE-2fIlJt$8nOLl&QR0*}vB=eB4cE*QS*=f8Cj3(R3-0)yX!NF11#Ef#
zDd{*@%JfoEh4WDG&^6|Dk)Uj;Dmz!vlJuy)B~@MFStoyfborK@!pthc`E|HbXe<|q
z*Xa<wqS0VglR$ZSJkmEWwZp+&3MG+T*|Q>=eb38HwMSHm@}=6Ugm!O0Gq>!ZjG0-{
zGB085+vuSU=URVL?EnjgZsyO{h@%9rWs%W}&LZ2L><Vbx*|U;}jW1{Am61p1aYs>m
zXM1}yun%|uvsRS1;nUMKKrn2xD5+-JK0%{z8(m{aj$_=@qWSc;4)%0wrfX#j?`yIm
z4=#snf~>>w@SW>eYe5*HQ$*Y$5leZ6Vls`3KQDIkkT-EQ7$nUEn9f%v_J^`&+YUfk
z`J=3zTEvrIsX+n{%4as>qE9jllf?^))8$+>%s|s@6T<K<b3&DtongNNI2{AN-M*`j
z5WS)ccYK`G&FtU43lxa)2B*(evMR6>k2cDuHouzRzfBKt9Htbr_FNZ*B05Tg3-F`3
z*QLIR#8N1eB__g{<S!9*iC5-$BTZ{Pe0nXO^LfY3^^~4o`!x?7lv0zr+;s0;*7%N}
zTA3lD>zadlSMGe_g}ySu`tSptk+2H_^y5fAFKS@5RYi-w%{8_rs(rPsKrU-{c$&;)
zEALA@1Cq)ZT5G{N9we_SVuy7y@1*$Skx+M7oo^Nri<6I2&F-(t7cqNmJ6QcbGPIrN
zm`deb=Mf64>WtOnJ6L3Hp2o4=1D{$GcnO7&I*NA3h!22dEq-!)JNd*be^zJd+uFYO
zIGS40N~ZLq-N_}F%}*<Qn8oS{S8_k$;lGVecBo3W-Lf-7!NQEmZ2_<FV>QRr+(qpZ
zJzfvEO1yAC{?_ocQ>3>5pE_o}%D?s*mjyK2d;7f2WF0RblU&$qI93Y!R0jctz%yw{
zH0Vy`2--2VMAkKp#tk^^{poVR{-iS=!wllUeHDMbH>?wsRANJk+2yhtiU#n)bh$q8
zber2%;!2T0Hu&mgF+QB7DdB50A}8&&SU3Y#cvie}Wp?a9K2$daf1}Hd`)(X0!hkaX
z-WRD|#<X|n)2aDVC*5DD0m!vriC%kK)GI#3kO~^8!pRZ=tfDxCb}<(lYeidj;3yXv
zt>H26yq%%8-3>x7gbv$upUSh}t^W&!|9%a?x9cVZ65wMfI`)sK#*J&l67TduJ71>0
zPbeQ_^LOYhA{&MqxyJ9zyqUJQ+Nl*k<6lm3m5+5NbG?`%(zPJ>!KZ7JhU&lSy<t<T
zGoa~f6}_9oA*6psZQ4$EM_23dL~=x|LJ4Xv$mT(QLmu=`UXqF{0yiyR2}kRfbT$P!
zvHi9H=e~p*OE8}l#NE)>Hx+`yz!>=C88SJN-Yw>D1BNTZwIVX%j`)r*wTcXSy_OsG
z6)TEEI_7KNDyrNBB#oD`$lWQ`h+6?jF@K@>cNh{%J>qPnpiT-wmV!woC}Q8lmp}zO
z@~9+;84qr>jx_j_gVp|G_-R}Ih@8n&z(i3Pb0=Ns?>f6W4`r-|*YnTxToNEh1*~nY
zrIK$AP&h(cRa8+>RfXnRVe(^-8)+t_5-#@LBShDmDiPE?XcGwIabtjuhwrRqIuF{?
z;<kN%5^Pe~oh#hmQZQy^C1!}^Nu2~AHQ1NME5vv)_{gLx@+Seez7JG3ixq*$J;b*d
zpRszDx%qs{@U6Sh#o3NX(D|xT;{|nou?<=gepGtPwznVvB=LL_nDP`f|HUsOyy5fO
z$WLO|O<MDvIlMc24fjFS^#u3+bgZ*#|B&{?EW`HJ2})66>DZSz%YCxa!dIq`9U5HN
zQ?F&ZXIqF;@!I=NM54zaRpzR8n>%v<&pGbGUruEy>k%VLLM=dv+A^DWP#t+jk>a_%
z!BI+stsFtq3z#tV1X-UcL_1%*V)dUolG`%~wm}xr^$`B@!ZdC)SE=da579^KB8?OF
z#d#io>L)Uu-A}*y%q)v&ZPvh8XO@4$RY_w^YE|^uY-`1-+2eviZ_|G4d4>(h&fhg8
z;pgA1@*Mgy54F@z*NGs8`)aJWK85Y_7pmd$%_#cejETBU5WP>|bpc-6+S7<((P(LP
z1aE_IqURXta41ywRR>6sq!~N5U)kh^&GX<BZy0WEIv{I<A)}`nYCXuYEjGw|I-a=W
z!u%V#`d;)c<(^|?2;^Qu@C|f^ck<T2$6qtrdS$1(X!@|rWnC`=#DMG_krD5gmvO$N
zD@o<ke_1zTrJ&~E_Vf;Ux2`|b&%_34GqvWE93`vcI9f*A?HkfyFaPS8L*nnKGEDtm
ztTFa`mMFgh+$2(IbR?B9Q9>ZI$6-wA+}ZVNzf*mm{tk-cVcFf_l|(}6&9b<G(zB$*
zuJnQEuxPrEW-o7|13s2BA;w|4xcZ3RDK28nXTX&PW78v|GjL>IMa(26;}0DLHb9(}
z34C%2R3=beFkc$anFAqmw20<1a&v_v)w{*1pyU?>@Mo8rx33#W5Ge?FomU68h<;uV
z7v4pdbRKNXqO(#MoDN^-9iHO@uV6?}BYGHQvdW{aOI4-us!`@?W@<S1GCXtnh0W6r
zEK?AZvQ~e~HKKuIW%jU!CP0X>_@U`KXP^+w0jl3sub0S76UHC1j`%f*mk}MHMQ9Fv
z*M5YT$K98MK?2GYy`OW-<Rb5*Kx-eK?GO&_yz|NaRzAI49Z)|#!=Z?|^1XscGZcj@
zXRB4o)to9Ptt_UxGO9@*kFS)PW4KrXIS|%vYZUT*HAUy$H4#GF3<r3^<40WP+W{R;
z2&O9(ulc;8$bF;eha_d429QjLV@mJ|-wyFhtY6z-C|h9cz$>IdPgh6{$N8|)&@=N5
zyLDpxeEG>vGm7Y>F9T4I>7o&4{^i&lD*sUS+ca*mEha5~!3=7E2(*EI+hV1L2?pcz
zWu7JthN~xKpqw>giI$YlcYZagY_LTb)bxsFIMUHRcr7=(B<U}d(iUkb-*X?f<t>9+
zeL-9J>3SUi)t6Mz>DINoIdYdFkRvPV6LlP(sTv|)%3X4D;<kZ(_HL4b?G!wrf9h4^
z8}74aH!%xSanUYvafflL0e2NO5bt=9qf11ZLd_LGus~qS9?|H1Boc}@J)VeU_wE2^
zL8$q>JY!3yF#*D>H6XL%a({t8^}`==EPrxWw*QaWpQmO4W=^85`afmo_-3xOi`=*(
zV_55JnNjO%_`D3uo$&l*B3fiIENS_Yccrl_)7^T6U!S}uUR|fKXULc&Sj_ukj9l5R
zQnvNb@2<|uC45U$=f8Yn8f_H!CFm4($T>2QD%m7%5<1QDv6_Zajg`!pf0oVzSZ9-5
zi_1%3-bEp4AD?#aKWnaI7Ms^F;(p})urSqESCu1z##!O{HvjU9Il{@xae?nm?l%I(
z5CT4XT^qGYgKTX{d-~~@<;n@$Ti0b1o0UfNH=F4oUr9U4IwfS|@KTu(%ldu3>zwiV
z4xjHRO_`B!NN?82e+iU%Yozoi0ZDyz<ISMecQ`*QiaVcI9fM1e2=OE7%Po&~h$s4h
z!==l2!ghc}D2^gQq)Je~95W-A7#zn1ouy?VInx6YnwzCtAFT2#``|pos*fEFM`x+Q
z-$;DF-$YN0Q8dO>*2ht8e|NsDda)B-(ZZ(+3N?hDMf3Qf;TB@l^{!=9X^`t@FueLh
z543-f{Nhmga|&;;fG)s8_LRV)F+&n^q~!h=iu$Q@G~wM8t7tM73N*=kvIa<UO7PKv
zE^<%xPzN~YS=Ubw6F-t@#$WtF=AFjf*TLv(wA&H~g+FT_|9&pKs&uEH_^_C9#~^9;
z&iyHd^mdyFY)?0{7Ul}hGL38le7flCo{E4ZMtTifdBnV;tJ+4I=H}k*JTa!uXcmJ5
z?=Tp4SLJxvr<1i<916HTgo&naH<wGwSam}zC`w<hFD}YEglJ4nE2SIp%@)tD%G2j5
znJ9?uxCO3n1ZzC}2Qo+|$@x(ur|J!Of{NJ2>)8<43h{dQ@YZTQW&{oiN9qsD<A|Go
zMohu{ass*Xo$hy096(i74)$+VIubK&OIwOXriu7={uam7J6;F7C*LiUk66_9Gc~u<
ztd!fpe;)#t1k?$Sw$8L_=P>|IOIqUQR+h^s#&Y?<d83D+phH?_Av3%g-UY4pFqk_Z
za5@;l^_QS@g~n-z{2R6DMV!bzk!oylnxvD-xiko+Wyn(h`~FDtwvlhWfes0G?hb!H
zJI8k3^TSrPt}~;fy4=p{Km|y|Dht9b<x^}z<k0^3s9ipKNUg2cdKZ<phI0rr-|R&B
zyYcbC8zBj@OMJT2pAXZ`Y6^1dS4oz_)>IXD1{;RiZOCN(ELG*=_SPMA-2|~naUQ*{
zJstFCElQC{l4&+N=JN+J(`>Jr`v%ouf5WOu9-fcxPrr*0Z7zV<Kwn;0mn^A5ZQPfI
zZCB<jN%}HUlD0MIZAP@ZU@BMc%3g{GrG~1L5!_8m@00Nn0G`hSGQ^fGE&r<Gm!~xZ
zL`fkKs^WFuYZmD1H-d0rl4S7f%&kr;sdtrp%y530bKjHin8qZ$RV#b>9qAVGqoTE@
zEEC?TCfO3`qH?<@Kgna5tLGqVq`T_J5h>vR0#E*CTWsJi&0zb?uI%+t4m_>A;jCq3
zpg_}Oh2vh%EPTT_{tLwsF$%9uV)W!2`C&_je_WaWkTR3{R@d=nLXc#RLV%R`=xJuu
zKKr1TmVZlU274h_`YuvHGjabyEH@beZmA?lC0Ibw(4QcdpX-e2AyIHfsSX{V!jwed
zj?_`#Vz}65D^F+7QIU|uBrAat(Iwk9L3qf{Dt2btjF;||xcjASYsM_8`3HK!dEpPU
zYILfFq6D$S9M;Fh@+z3@O>d+5*IS?8BmN9WPj&3BU0siw2XQ7I%VD8`0-ZkojJ{=_
zO}X45ktB_#olC|=FQC#8CC3??uev+xp~?GpL(a~fg@2)f`<)7wqh^{;1YD)ImN$wN
zAr#F+&aGV<+kKo;NRBb*^Khw2=P!DY4ap(%k2!9rQ)%DZ+x>|tEXWgI?U1QuE_h9d
zcJ}QKo8<YnWKBa6xr5MFOn~r}IbNFYOEf_@ihtASljYYk6{fAbMd!T10a>R%QqZTV
zlXf;*TN2S9Zs5OIcc!b?b7st+xXB7NF#U=x3d7RSrgUy}rAU+4&9OBpsWHDUrN|R2
zJMk3$wwo2FvywC}ia&LO9W0bATl9H-uTrkFs^4z1lEy9)hJ|93*A76GPk+efHi4Ab
zN(ORYUXQ^{)CyFZBFf^;{|s?`Zm1?uij5OB*zV1x1m#LN94w9ud986$ZcJR)?5iE}
z%aVo{zkM!D+-{4IQc(C{c)hHZ76GzpN<4@)oCB_BF6T-jEcZ*;12D5bITjqFwP7x+
zap--Rr^!4mkKAfhBCmo(@|IJ40wu{N{%kFfHtC5MjCtmFUDC2bLGuiwaP7YH&KF2q
zw^Zi2fA?(~O;jPg+J(@tVMw(c__ShiZ|=UUwbl`@4ZiNk)3^Hlc5ayu_$(-Ms+(PY
zUK9<sobOKfWs!Gnh)w)+Moe$ZoCZY^U$wYZ=6nAN7ff$w>o<}43YyH=IotUb-73!w
z3okEHbVJs9S=`Es#mKWAhtzd}sL;)<<=_mT6pkY+;=WbA?L5iYKzdX!27tM4jshM>
zmp`;C!w89MNq;bWNs;2iC?m8|jw?s`o^=!8*4XGaK6`Mw_<c5RGI<%Sq=<=}VMTaN
zoyB@IwW&=aehIj3K8KuYgmIs=3fPU!O`6I}D83e5I1`u&z<m==&2wwV*2M}t9VJ4D
z+qr1vUWcdsJbSW@ZHkCDCeL^Y$lO^qww|m~#^AnH+=FdFNDPctgnU2<TjnE-C+LFz
z3&qz((4YV}Udrl2e6+!%Ac~H9@?$F0(BSDs9$LoLHQpJk+%W+ArtJmc-d5nbgXik<
zOW2Kgw01Mahx#rN1R|OmdtjllQ5H9m>?Z*zkvy>FEqNYpqMF#_ho;HiqA9%1sAr*N
zjXzS9DBF(mT8T>@10_<2QrnW;<5Q)#EzV7}oQz4$ky^Hec)FC2<3jK^j4<`G$OE~3
z3e6!A?{bE?qeD90@;6GGcb&$zr^2ynEw4&$92{+o$~Z~~FU+c{Doiq}gyt#!C=+&b
zmj_{ZE}9qSrN*RH_grCp6=fCCd8ShNPGyc!fXM3Q$6?Ly&&=BRgF-yfl!^K)BOl~#
z_wgm1)|tw#7|PoiVj|{e5X~$4rP$qrn&{VXwvOUhOAz%$Q*e%+v6-{mJr{4&+xLo^
zo7=`+t6U;m%2|HOP&I2Ohe;oq8s{k6E}qH-iwdeqQAepZ0R)>)UI}eTEfZ_(6h9eP
zVDs;|S0O_rEao9a;CYY7<|ztwDsXS4&meC7kE2_OK0iEv{k#3ESAmu)fcL2*`PN7;
zzSjwq=8z0TSp*x4HCXNEwhBJ)uF52H@Ff;E=T)WEL9UQf*}baEZ~cF3w@;@O5#1ZV
z^3^_z-IY@AAcV~Cpfc$Ho+<pu_6$8*e+W(Hr%Znf)J1^EmF?loiBgakWRP>cE<P|<
ziQRWy1DQ_~MD*oH7=nOZmGaZ|9KDbS8`LKbFVX-CdBJRj%g{e?W5MoE-?Y~nnJTng
z?Gw5`c)@HFo_?K}ai72*{ajhuELW2EIU#;m%UFY67GFH!VSQL5>K>}fheLB1gO2xv
z@3h><^3aCKB9+VKU7^TH+B#J%VYTQ4t+$pkD$DDPD_+T3E0ND8wgHq+-xUoW9rK}d
zYBjd})BG;|iajw&wrI5!U960KgV=L5$!Clm!!+d(q#e1THy0ndaew+SwIg(kLo7QD
z3_PKlI=uOrmVRh5Er!VX%f<;rk*7Js<T}d@Qt6LU(0bCztGR$w)RRN^5@Jej<ckhX
zIC;A0t-o3`ED%Lo<w=KsDx}$jrRrPPTXq#n$&4$8cGMxxPj#`JSyDN;%qg!nB`vf%
zO~AhIp5T@3+il4E{UvT~G#j8;@PUw<0@TdZ|HayYxE;73M$3ew(pspsHL_Wbe+h}X
zu;}a21OsC4U->Y&WfE~U>P8`|xPwK_QCIU<l-=oIixJgDnX@9xaQZ%qDtc-(PtV|0
z*U>CXr!}dnH((iqjX5Y8z^jbpB#|{u*ac18SQw2|{*jU4=<&}lFXyR00aC6+)p!D)
zIx#bMc|IcOzQn_!m1pFCw#+u%rzYTvbxtcz2_A9F>SZh$a-JEv@4;PQmQ6Lz@G_L#
zmbnD9R?!n|&s#;6WkY!)qXwin7-rqD0v=1#Rh6ewQD;s>dY2xemyuTr^*P<gVbp$u
z)iLb00b5+`tPPyctATu3oq3c&PhzY|D{nRYM}yl;A(NGFzyJhKm5T7nU;(>>@3W>>
zo`fj6SH-bshzt%=iK9Q^)*!nS!?7jNjJSfOvUJ3nf659!V7YyaFL^gs?O-Q`aKgLX
zIF9{sZ(8<w`<cTUmsAx=p6baEPmqQkwzg_Dgw~tgOcX?&sJ2^!g=*ob!cxhN-z}s%
zc2b^xVxQ@H-+{-q`y}4ck*La?1Mp@PI2OTmybUf1qX`oU&62XcQw=Mnbk=Oq1sS0{
z8a-i-xm()f^NTi9n%rya&n3EjwMvz$P>s^9sLZDYmL6^4?8c}xwr#ReP!>zYKF&q)
z%gv3~;{Vj;k2(bB8G_pjY63x#1;*7JemzZVLUXR2O8Z^gOr13vTUSP~ZP`Dq|3YO|
z_#5pJhCrdih`IUsc&q8J8GbE0?YCKq0|=IZ`GpEHa1vw(BDi^uwmFkzeUU3JU2@%6
zi^AOK>9o98EfpE3o5arFZmG`i$1(6Ky;a5WSBK-3ZiHclA%cZZL<cX9pm~H=a+qe%
z+ccR~u3*n^no&%t%~FkVR&3&NEtB6!L)lku%<SkQw88ah_t&MUQV{8nmJkJNs>rvL
zH0_|@DSED!n?Kgdc(Zma%rmMNR$dE0dHbi>SJC+mKQyLgXObzSAcR_r!rlX1Z8s@f
zp8UFOIizj!FhX>c^=#deuE{UJ%F`#s-5kH}tqwirl*IiJ0_eC&|J0)kkDR)RE=?UT
z_mk=rgV(~V>J&r&|GjDjt<Hv#vU@*Caf}7<H$C;JRyM3vGp1t<_0N{$yD!Pnv|$d`
z1!GBIUX+VGq@zpNjg?_Ll3cG!YMq$Bs~ae2+~cabQr;T!4RX(kh@D;Xiz#6dQ!<6t
zLdzPK1F!*-2R{5_5;+xmfauDp(N+tHp)_&bN(nlFkmR5MsukG3TeP5;CYa|HnBg2x
z2I}mp$4M)byv^ooIocTHnXLBrzz$A4u2IfRR=PZ#Ld*BmS=PO%IAt>IFhcU&GedcU
z&ObmcRX%?Dx0P~d=#-={b0wh?)P;6E%*k6Z&_5DWhbB7Z78QrW>Y<6iHCSRN%r&Df
z{WN@%n=bT-wSegnUeVxkNezlxh7$>JROWQY4TI68Od#tG8C%~}2N4%+FoU+GG!D;+
zZ#h10NRr~u%gFHi9vvn*6}7rj&SxCGEyU`!vp1H>Gmz<4-ej`2-22Q*I@1j!bzj_+
zZ|5a1ixJwQ5~!A9;^h8#gVaSB^q3-Dwxn%tqK>6X2FxJ*&eMwHfYBdW`C5ABZ<=fI
zgP?$n-R_jY)+y^7T75>)X3h~b?|{L8Jsr<<P<+TJ^op`S&0C(xe@$j6+CF%oOx@io
zZ`Yj*(RX5#WSKt?8~Eg#tMBAv73NP&=7f^WlwIswCrRi!!(CC1ib5JhA$new&=BVC
z4l`V&u4IAXSo%of$(c(wgFeE88u~emiHyIe?#F1G{n!Iln!UJP5jj1s-(KDp;kzbK
z79@!BdziE>F&O3>t~@#86a{$*fPp%fZdI$+V4d=A-n2tkONc3nm5UVN;ENM_S6ehr
zZ(gTw+2qya5reJcbo!>ck-KVR<GUj`Z^l!;%<Tt`Qj=IN;v2&+`D+E%sk=6v$c<2J
z@t%4O3$F5v+Jkpep97bOLXDS~jfb#fcXF(vWUhMJpMic%e}06%6W*b+ZYxf(lnc?T
zDFA1c?6}@F*=e)Gk;udg$*tN-q)nNroYD<@I-#XHwfZ8|uTtbE!>;WMnK6U$Cc>j$
zz$fj|^ary}t*&0|cfk)@bt=onfL~?6dm{V)P4pM)lQzKtpl(~K5)aZ5@pkHq{tCg1
z6V|`=nS%<2NbU&QIaj|66f=vSj30D5YXb<Hvlkpsrz%EUsV4n9J(>>%MC=78(EG&T
zZ8CY@JoMzVebu;UDRv%DjrX(yY^$#sL>d+zQ}ZGAFQZeZTyNIaFGs#XzK*=%UNYA?
zeh$VuU9koeC6NV3?f`%Kt)DX=W;gsg1Z`w6%M**@#zpuoOjPGK%H83Tw&438O;lS%
zcI*j*xxd_LP8@=VVrxpYR)#E%x_2UJBtNlD1;j=lR&T5SCj36W{!$KYx_a1_$BH=k
z2z7N*t@HE3DaDq*?K%4z7|opdizQX)X2B~%zEfJjd1XD<BgTy^PSOouKV#Kyn$M2k
z*0O1QiKAaEt=mGZ`+RwQ>0qj4HGYPu39t0OZg{r}9QzA3cEc}yNczr*F}k0K0z~-R
zz69|=9mlu5mMVVkLwS?#ttJqz2!bn};#$!r;2d|UGORyYP}9Xcs3pb6ooCrr#~lGB
zX{C}9dbV*GcG<ifL!i484c{(x#?0GPhPDmjuU?Kpr=+=VB4gLpxp(oCt%_V`y69S*
zyvNQ4>E}^9U4GhB&s!}l>)0pN@4xs?h9y!z?K<IyD)IBEJL&(4GVY|uSHhSk;*6h4
z+}&4uC4J#E(tKBYqC<N}rug{r1N1)t$o~)^KR}_AvHjC`3c5f`{9W5K&ANH{<$qBh
zMabSAA;$hBoujI-Cp{-TR}DCOcX=uNowO=oc4EC=<Z#z`En?&NcYv#)Sbg#}_vUGU
z%kaUb^1J^-o|{QIXSt%i=3we(gzr5CGoK?p^Hl0pT2xHxbe8oIx#;X8WRrBzfXqx5
z3p)b=IP2Rl-)_2PI(abPP5y|QVq{zPgmKjKXYbhyHz@8zzWt%9R%gBGvVJ$4gMDRd
z$^*QEZzRI^{2!v;0lJbW+8(~KZD%Gkv2EM7GqG*kwrwX9-PpEmdnPxYFTeNR`hUH;
z*E*|L7rLtY-m0_f?7dIqDG>7~`Rd+J<$ky0j_9Y+i|zn@cfoY*9541i0LgK$tX`=t
zFHm#k`wn#nNz$v2&{jkJj_vj9!9s;RiFL-<o!}YH#~k_AeP46vUE0%E3F`x~k>W*s
zR)!zBvR4Q>hKhxd;n#Gnb`^>mnXWQ+QzM6^I>U+Ubkn(Bll&#^q2HbMSY@FaI?wmh
zrPVk1h&xO|MN?`1==J7(99p-I+@?Q&x@StF#*a6A-e{#VU(Q`mdw4`fCN0l{T|H=U
zz=A0FVKbN6>-i+6B>KVk`fi8=lv?wA)Pd9b^-BawnHGz0{0|qFcJk2sd4fIA5y}s>
z0u1+6e|Fo)HV&dQ`y*rgol$va#B(M%4kca0TF8)TQ`s&Q;;$+H5_-f328@dsjEPGz
zx{!?+`S{)5<8#f>m(@|1UT&0UYb>z7*k<`~r%hrbKg77E8DCV&M~Yo>tkAp!<4RwD
zWctfAUJ_VcRr)cK>~rb}sCwCMb-jw`(>1NRf1qksAuf}N?Pj+-alV5uOl>?8@qh+z
zVb!a7K2%W8L=1X%l2&HgVb=0C#CvcY?F$>c{{cd_W1YQyp|TpA?q)}fT9B1qOu&uG
z|DrUCJ*J}AATK}#p-rGUr17(Y0-jJqav(&O>aT);X$`Sa>64Sr8Dg74w76BaANl)b
za{f5;YO-7=2Y=0nJTf128lq;1L|8;fiRXXK(RqX~0MVHZh?{l-z(|T^5gSsjxO}8p
z$N5j6)u`br|GY})@;@w_ddm6f7#Wxf^ixejPHa$I=>DSDs6#~mmc`qA;7kj!JC7q|
zt{`*uk;!2nL8+3Ajqp;4Kl=J8Vp^j&{A6qM=FDuHGaDdjl!81mTIVUdNPex$xYleD
z$_a6@Wpma~KPo+=VsqF*JHN(yal~G7Z?CesBH=4<Y}ZRWW4mI>j`4CNjPQ<D-JN-n
zxFtsq4plCTZHYgMT2O1QQkh_HJ%1|Pbsl_HzAz>I0yO>tj;OY2P^7^C1c4l_q8_#c
zE-1A8s`2YR@3t^CuEw=td!9w!Ub1U~qRTH3YHHAC00d74ygs0=6HB&a_Jc9XY-`k$
zWBpm$@AQ_9vX}PKu;LEWqssgD{QWAc*qy~WQK+AZP`#~(ZcsXr2~!)9QEh?HiQ*(J
z{u$7(i+3#F&g#G~D`3k4o4+NonJndnq$gM$!bjj;E>JbR3C`6^{g+eYx-!9^Evq#(
z!$KSEDXZJ0?qO43t8e|nG&N>UdMedr0w^1#k;1%%X?J$s&@3vY1EPRl&R2m`e*=U6
z8W+F}mg<o~m`2!<p70#+{+79{IM8~Erq05nA2P{Gp2~f?!~NT)<#3B}N==?k?W}e=
z-Kxd7Q%zpP18S96|3LpT;S%!h;hx$o!dju1)(YUs+IQ>>AE=~wz!si=<Pq5DyOLM`
z7XFUa{ryk{+o`XaQI>ca9hdNqQ6y~reMq4GqyL$l>i6G{7j}cKe}L@ILl7~CT@`$6
zGmh~xkd2;4T&oKD-KXODThd@VP`&j;e@mUz;kR>hx6u8My6dz_8Z-&y)itk2+5m9l
z^AVq<{_sZ&4GPaE87hZn<HFf;41ubaD_VV?h^v>BXo4?xx8ksXOynBAKDeuPEnVLO
zM-yjgJRQ#*;w<=0J4%JNOyN*ppNxasEzg9SM>(B%OPjONb;$9SFCJOsg0_i8Z%^JY
zJ}e2IG!ivC{YHGEQi;IJ%x4T!n&>k}m)<Gm8L}qRcM184nSoeWFdt|+e%|Q>Gv2O@
zCDD>K6@&Oj1S!&{)JrIa9r_}FbgVzmpORe0QpXDCm6<G*21^CPt;M#8)y6++D*Xx^
zGBd^7y$De=O!!hy7hi%&?45dwRDlw#ix*|52XZ~h?h*XrP6C<5tFQb8P9{x%!KcYN
z=QwQ)Ks0!hJm9%EZP4sNa?Hg&>}(@HJC01l=gP0rb~s>kyR}z*COBMGpfp1+r&d2d
zE&P8CRaS94u|Yp$yw2L!x|j&HoN@U`s1glrQTI}{;8V3(W(DcU{gUZgnA*nk><YoU
zf0J12hgkFLsSrG2^PB|{Gc5JBW7(%zq~NW*0MyJ=NN6Gi+DUMN(|4mj>vgL_b*m&{
zmasp{VD<T?IW`uOLY<k)N$b-kq>cP1{JTa@;{HtJmFX|z<Xl_uY4Y|#oBy6}(C@d}
zhZ>fnOW;Vt$u4eRvZFq6ldVP6`=NG($2+maR|WljaBd$Y-S-FFw&wCVE#qijp2TW*
z;Y;g!Hl5`qn*w<Pv<1}e`q?ipSsp?7;_O=vCS9XHwg31WHqfw3a-eEPem%bS96Pf$
zU4!Io{dA#m&(JI~?KXIpf@<k}89h%Wo|dhBH~+O}G37U*r>3%FY{a4Rn}YTk&>Dmf
zt_+%F$#VD+OMNSxZlCp5oLN;Wr`_uyI=##z+!h_LzpUP?=^t$oa1Df5;hKm^IV+lv
znh~l>9X8Wm<tF6<{$)5)%gN^xaIB5pfBPACb_*j1CR}@sdG{m9>F6fs^n3~*RCYSH
zbrSl84Xq8<m1A^J&XRv&Pe#Yd;5^uiU_<Kj^ZNee!dqF{)iskxY<>^Z@!Ef;?=b?z
znK-!3y=5Kr<`l$X*|=3)?mqV{5QMFROe9-@Z2|2|s!~~T%ICwAU%6G%h0zIT9d=(5
zH@<}O{R2GsL4XkWrl^Ya_81W#Qds5=dZl6<37?}j4=a?cY<5GoTQ4I|=OKS0Q<^mZ
zWoiQkx){78Mvnr8^-XmziOE9jEKQ)N4vH?7RrYjIvqag2$7yC8uBlD%EN=M|_7THr
zWwP#Q9u|X2JmmAn<^KMF@fii1!3)fv-L$F@4@RgoK)L_vBUV@g{`1+-Xqj&1jO(5_
zpfS&xS5Qr`yuoxe&rZvny5mN>w7PoyG{-aNFKk+As0?EH58pdG!7voct|+^lU};;J
z6f_5F$ExYetQ29uI9TR%hB`HZW6GNRd+=Phrm_D>n!l*1ZoS!JzLY|#PQ<iKp*F<5
ziZ~0W1A{9Pl6hkj=UGuNqXoBmIZWrb+hXQ%4#|N>^iQGM*xfE?KmM}j;|zs*BjlJ<
zcBCZd@O9ksf>;T;(k3FP^{6&r`Gm~x%aXI;eXNrQ>@!65Hlz(b`e~kR5qKIc!j4U}
zh-#}x+5V%VW#ODNzm`KRkrlpaitnZI=1o^!kAD=yx_zd0$<;9NQ)MVIY-7oiB1Na&
z-9fRm7l5`wP|bzcT;}74!hql2a*Xv;9#ro&eP@iDE7tiRK_Eod<3)%zdE3Z%xixNS
z7!8XqVJl_HXAE|zkmn-7W4DJ^wR(2098xB25h|3T)a9?{;0#O5dcX-JbLZEbp?Lp8
zh$rDdyakhBY8<Zp7mD3WWeOH8DCq;a{h$`BTGMIBn%<C2IH&G2s19beUnrdbDDzD$
zaT|x9qK&F-*rQvw6RhiE>6d{?Gp%emGZZ|Xpb0J!3*Xh4Uj9-gf%ZV{n@LZHBwl4-
zS7e#?ST`*}RgG8%?j6EldPy_&kJK`aQx>6K?Kzu_6P0f^jn>EtGy(m%1D+7x+3nGU
zm}@vli7f#uI4ATsP|bL&V(yA0LshvMjH^|{_%@`JFEU5FEkkbsRJRD_5KlaLNDfUn
z$06|n1YEJ1dnMJX7cCBpM6qIALqM)W*O-AUbzOvE{)U*SeM>7$cS2aUDc{N}>oB}1
z5QY9G5gEH)$<{1z?XV(hLPXFz=~njnCyN>>6TzQd?E`zUKwV!VYb7i5g1k`NmlKK|
zIz4-(Paoz_a)XteG;ABPo{12)2wg;kX;Qg!%0FD>7F|OF>r`6l-1bCb`N{$9<S!7i
znVe}Anu31*4$}RujybbRo3@T6uD(S&J59DeFzlJpI>KGLy^)!)IbBZ0jbiSZLhVSd
znTdm2sP<=O(p|=;sbqFqK0<R`Og!4{CGT$m%4wDHX>N)ND3Ty;Qgvd^SDl-lBbYI!
zTRe5;4LYs9e6*#KSVu}F0h+rAMC5ce?kD?4>ekw$TjB)!Ew-*OWK7pBA&FP<7+-u<
zn^)~u&BHD;l_O-S!RX5=B4g@$BQwt1#VO=sL3>gaT#y|XPS4<lVoQNcCn`L4dX3t}
zR_he{4A<i$&l3^KD#b3K0X*wdt9T1cM^Oe`S2L<wt*Cxl`1m~+F{;M=4|<6)N-_AP
z9vLm9W|hDQSmBvH*M20ghfDBXKV7UpF->Ov+&Ii3%piLoyrG0TLy*AT-Z{BWvF($e
zrd5b5Jk?<IwxC*zGZdO?(FBnyQHKdfq=KmEXwBwRG+aGXSmME|PNsvft8?6HG#qxI
zdO$0V?_}$DwhaAxL<UDA{bbY@GJV1=&rKv+#VzFdDIGDFQLYLxx9Aq)7+}WCiTB?}
zu-kKHMpY@7YU8V!g?xTznDx)`j<4UyrpxAH*YG5&gYE&l6k4`C<6Quq>aEPs559pN
zdFiT;LPK>mE|Rp%DLmtM2^@j_u;65|?PXQCB+SM`HBj}?;;#_|En5P%*Qj1zrA>BS
zPIf$#v!Omt2s+yAu<5;u{xh8(XV{At;OYUA85eYX3rTiRH7sH4c>N46-zQ(%p4)RI
zqTr!BtmiZv<FjUvUJPA34rs*KhP&9o@go_MClT{VtTE{XqOCM()SIewN!M!_%C*jZ
zEPFu9Bj<dQ-2LF2qBeF7az<NOV@LYoHzeGiW2yrP3+PHIF3MBJCksiT;Pk-Ko&Ag-
zlD2AdZ{a~_v4-s?gc&{G&cB8Fa5%lYf|JT%oMe?WOI#BVy3`Z)VbK;|_^!S8qgw%L
za~%=M82a#(Ttxmfr-`rA5SBh)Wu7KsAjP-k;!j7XRKqLc>|rF+GU-b$t#w!y_6}*U
z+FPA=9u#Xs<DxBA7V(8#SC3Iu&sGBPRKg|=z^oTc=E8*<%jJ?1TEL1moV*k`7)%NR
z#G%3WPdTt-MUKL&EoS1r>5K)i5_!q!I@`l3u9fMFig+}WBP8*z@O{IqwUq1jN4rnq
zaw;!7=>(6XY?;4in*SqW>V3}?>|Im<fq`M7^)|VfnFS~4n>}70R~n*bX2mA=eWszL
zVj>a|K^+{F2B2OyrI%11(Xr6pX7LY+{Jx>x)ApQ>GWT#qgY}%9arkkfvBBdv_AJfY
zOx}h^3cYYU)C`4H!TS5<G&<s5NYlomQXIC($;I#jC|<17_x*jL%g*8>;Jy}j2oGGf
zg;Nh7jx9X7Fr@ZpVI}qq#!otLvDLRI^ro_p;+`myB!k~<5v2W@-afFUA(0(AoIB2x
ziIiuH<b*O50R7^i3VVWzt6J(+T{lrwd+2d%X!kIv`;7t(9mZVFN7T5TfVqQ<kGCS2
zf?q=UB5igB>>|L$WV3aJ4jhF=q5>bxYSatEz$~ZgmA0%@J7h)U+*8$~9(O95`9Izz
zqhC@B?oocmJd?*mJml&}zq$KG76{i=zpFIh)=shaDS1IPX_!&JWMuj`<v?e>u^f=1
z@J+l|;pL6Jp%DtHbFYA6pVLe{`-~T-P^Y|-%~-WUFG@NtIgoyP8f-1Zc4Mlj6UZh+
zc?(}Iu#wydRO|{&r>a^1D92nAQS~%I?;Ju;JxzgcIAsis12Yvx4|}v23Zp+3Nj=4&
z^@I~)Uok&{@Kcmb>z{6^XtzF>Ya<<5BdfG<fozi98zGJH#umm7v<$S0!R0T|yG=DC
zvlx@7uOmyW8HS>gh7W;*{^?c-LL~Rh)4P|GBo!o1Tj`@G9Y<jJzB2ZUzL|2^4+`qn
z7aH{BiUlJ9<J@?kh~-%wAku<XH|iIoTXdz!3gwtK+|v=sCZ5fkT1S73D<mQglmix3
zF{?$8zRAKe;I=BS^;ZA#U9Uo43|v;ab7aaaOit&}TAtWMtM<EpC+NqvYToJ`C~?;p
zP}F<~-^aUwwK;g#IN>?0OT#ISXROU`A+c}=)BZUhq7w_jT5FJLkWF%2xpB%BoJn3c
zv3WI%o{EZC&tY<)eee%JgOH#zrP@RQ9;tiD8K*oj_~eKfxNHUcL93rR#6b6F*a9_D
zE8&4mW`aN`@dHU)ej&*Q6*wr)Gj;$AHR!Bf@1)3z3w><RFFnt!I(kq_yQ-7#xXVV^
zPfFh`fVTa42+92x82mjqctIq@>f<k={)THE44+605-ZejAEsELaDJpe?oS*ZkaKo)
zT6czk<mmz<)pQdhN9kK%ES@h8ybrJjNdhKbwbcvNeT!nH%qG?v{Ye*Xd(Ce5MTQ;P
zh?9l5S+o46;Ef)(;CH;0C$F?)kEWJuWUcfC_qs_@{)NH1bc=ShT}L>R3l?6r(4e@K
zoO?EgT&E7hA_k<8#8166+H^SOQrFD5r0-B;hdvGE*WX=zwX7Z^j+koc+5_lVZWVze
zw<!L(2_J1&aU*|{4rCyrLc)(!mlT&(%#IuQAAeLAVF+p)pfE&6rG@f>vBdn%6v6BY
zgbJ?$+XC0it<9lV_hn%*!LQOTR&BMB2r^w6OmXx%IaVANhBg<FV-*MgF>hzbn-9WN
z#4krS(^aX+bZsc<)xDuY?fdqWT0Moo7%`kv0mir8jIno9xaXETBSSd6s%WWi>a8`m
z1|R<`XSmoFY!j+m7&m|pXCL!*^fi<!Xqw$H4Ys|~$hSp=D5^}cb&VsxID%tXghX`Y
zaY?xe7dveu&oY~3WiDDUXNNmLupTy#f_)`PC1mk)=RgXHv;z5k@+|v~Af6IlBpSLw
z<{_Pf@!RzS(-ue~g6@EMMa*!pV5>hh^%Q5!5sVBfBd}7yJW}%xk3MIJFRP3KbJ>>A
z$@805@ZZz(i%~kI*Rxc36C>6DTZx(?QuceMDKS_<X(SLs!0#fTa3y-1sA5momW@YP
zYS9+%g6n)HrURv9*I#wgTOG1cDCiOW5e!wwCS~Q+bDi2XfT3kMjfI{T>#~DZ+7BTd
zMWm#&#!iLMb8M#Qdz3Ftk<@eur52J+ewK=DX_-t$<fg*p@M^P6zemygsTz9njA>=9
zzpiXaVV%#?Q}yp8_C=~zhMm&1j=6T!q2ghe1e9#iQJ?fo`)ZF3`#?jUn4OprTvST?
zoZ5T#_I<#^a<#4w@iK<jz~0Yay;8vGg@>tym4Z6-HfM`i6sN{pA*URW5(L8XajcH@
zUL!SD>Uf}gU+UihlSF$LKIcfS6V*lw>=1nJuw~6lYpuEi@TmUQCZ>8oPwG@&qgu2}
zN&S=XiuaG!kdsHktPEIIO<Tg3JI@q~S5fb&Tr8l(KL8s^#eedfKf3(7#cB;C9TrbZ
z9uci?`BYZG8BYqU+^<Wi>>3H;$qTf*^fQAl<CN**5o$#SEtD&WwTPQV8Cc;boQYU{
z%dxS}JUKmfOQ5zAs{NHRmwM~b{sH=N4j-h`Iq&V-y@K)3LpB?Q6oA#~OhUF;0nIDy
zKC&bM!?821yQ0CdAA5u|?CW;iEm*ell+)EYh5_)UJSLB9Qc(ME+=11+b!(eXar!3g
zuRP`?68`f1@uOD(losDyPZfiM5dJDCBAK*T+o<s5${LJ#K<$AEfeBqH?*X4!at$xu
zWb^#vN=Hl8UK(LLpduJ`B%gqNBFzlY6Rt!Z#EN@QGJ$@+BbRvf7+5K~b%Ff~7@9x*
zeUXtoGM}w4yUd8MEpV>>#4l`#Aog6`^9v+_(aB-1O*-ylTH}oIIO0^AIE_$`!Z?kP
z@mOv2rlBMB;ln$4^$LnOB%w-mpzt0Tx|pLFaC<5Ea%gC5J)%V-gZ*Xzy9i)TQLJ>&
zDJoc`6fpb!H+<rPx+?d3)5br*N!041((^}R`LT_5->8a8+%L`JJE6VzW_dcgiZ;`U
zUFLRpJX6e}ig@o67~)9v%#=i&y*%_*rXNxTL|7<J9IgcFh$=kPN(xL9&&YNBN2aFE
zLOMgU>$DN@!P!UIu|BD5Pi{mKszWmKJFbko&mMcu76KLyqS7!`O|u>7B7;`gBP2kX
z(qmih41IE$iTTSvk0kl)RNZ`<W_??9-JSGC54#7194BgT3A#zVDI828u5$#xqu*ud
z!d6_p3rmV#_a{PU<awJ>Dlt*JPCiUnWXnT~;gO`}{FgIjLU)V?KVxK^m0WofsJ~pC
zMk~o4e_SiuXG@H(u~?Re>X4mb9&sIninJWo!51)fV<8%$NCwPKdcOKRFemS?KCxj&
z8D3)ZNMZMpOQt_7t!dF-@oXWXZZpi>y;+-3fzq7bsrTxFdhhZFQ)AKPr}J^|P&GsJ
z;hDg+e`JLJKz~uZf5D6Rj{tmdTRTleP}pzc+L1T=m#F27(w^*gisd1dY7C8xrm*5%
zk2IR;{tpr6djX)#P_IF$O?Fmlkm|F1!YJS`u|g9=Awsl6s7Khhb(-iZ@w-mxw>=R?
z$=&!0fgMt>zy>)3#c|RL-AyK&(~jB2_;())$uMA0^#FSH_nAZ;^Zar&tJ%2{QrEWH
ziTnQQlH|UJ1V@Ee5`vrxA^6m>97cZN9;^A*K%QG`%;OOIRD8KJa&zwi&#NEauF@6-
zdcF*<c-kz-XTo@3VdddjH@du5D&1*;jT;flLBXzmHD$)1#}hs_87^f0*H6ZRWz~c+
zBpO0(oR^deHy^kbO4Cslk*=QsHsd&SuTv`RiW#$z-Lq0&J}>cQ7>?46GzPPuRfa%~
zkAw)N5g^PDLSF^@l-mj19_)CN%H)BrH?k?#i7Lb#0lz}w(AsN`x|dLKHk$QpG7JHE
zHli6rUw(`d2p+-ci{>(*?wD{ptvAY+B2L-_$y8aRH#=Y9muHEZ03xbcR^ZCC3lDQe
zr9x%*JYkk2Dyx3{k=-ZX<Mf695oYpjWHuO-cC+Ju%lz&Syb~ZkA;|{iV||+U`)8)_
zeH@}x2GUlSdUT#N2&9Go15jYxH-821BYrWeebK3Xakir-N&U!?X{34l^<^{~_dDqP
zNRs-A3itDT{mY<2gRat$`jI4wUGEy=^ks-sbu`aB{C8(b=7-5wk_6d}fgQvzBMHa0
z?l)nQ6xrF{nHtkkk`&&u7|}n#f7y++Yp!^`{790}RF~Z={Cd>6>n4=yRq97_C=WK~
z&cas>$mI#9|Eo%Ln9e7=YLXOWh27!G&x*7x2~x{#B<OJFq5F7p$!{zldL54c07982
zxCiou471;jMdO<~SwZiVq<m(wySPOqmSdcnzDUfK?z<dm14;$iwx?V}-hkbtU~qEA
z-(VnD@HF-`tDg}e^(7<0PNg5g3grvA)ON2m9N&JtOB+kw#+0ogWW3&xe#a`SP!z6t
zr-Y#P7SRl#46rm*+raoVGdKATkuM(BivOzQM=oC)3>f=X)w5uG`2|TVC5*P=c696^
zYNhJN(Yq-S`g%EJ2I(jPKm$doa3{Cf4=gQ}(pN}zT@fE;KY~_?9v!wTe^DLMwm7f+
zK50AAmL!Q7jBw1MhFO-ZwMqS0`lXoo7fBjtzvm%sQuaMsUKWJQpioHp4-gy)^BG<g
zt<gM0W$?QKOSvNr{>k=_;X$?}18!CY?5)em;9J68Er_553PE3z{Nrhjy~s=GAdRNy
zgn;7MNAibxu<XF+zTUIfx2HY5P;4Vk*U^{jLmQ>z@3miah%mhPH98u>#CYgj_|TJ&
z+}dVtp8c%|GQT@$vu#g)kDHbM2dbid4IwZHFgU>fVX9yB|NjfBqB;it52kuYx_{63
zzo6>ZBLb-Z0Fn5in$l0XT#LEH)AQ-qbPjS6BAR3{AB+JN5j$)t=gJ$9zat4cD{84B
zrz$e!1fDFGkrb;Z7Z-deMz~GNEaaNWKBGFnRpA%bclwxmk(F_ieck-=<r5YSi_jc`
zo@y9sEVrnsw)}Ny5o?nshgKM|WQ@t|KV38?12$Ny(bK(Vg)*&Q7kPeu3e%x{UyiRK
zsb;lx(O+LXX?!o=?Nhn~!Tk*KkZEb7WA(&Mwb7c9J(NI|mx?j*gP$4~-dKK1eU+~l
zdI?+p8iaGz9EXIag}-N42NziA7_izuSEstd^zi?l`7~;nLRYql)VGW>DYQ6x!MyRM
zcW^c{7wYkpu62BU+Cm#WCh`wIaAAmrE*b^<$mZRAi#88GB8K07pc7yP1PfbbkvyXG
zf9rPU6I}}aK8FOUuv@3f$NF)Oik&dU?}&*u`AGe%Sgup<YZ?*P>ta;#d+RTTGQ8T}
zHoN<~^lr$i`>jQwJViB`u=*95@vBcgYB81XS_XJtmViQUMNQt9Yx%H#n~jOus|Z09
zcLxI2K7PyV9Don`Qoq}6UQb@!y8%JLzp#SBXKK7h3kty~-+gy|D=S&?imWt<$};3G
zRs%&!3j!Jx^nDZ*U&5|Q{BJNZ2i2l$d<9o~-(9`SWN0@OX*_Ge9D}B88Whu9yj;`z
zAQi2hRJ{>zrb;8yoK*&QKRJ8OE91ZQSnR*18mn~@%E4MZD>1eVU(W@atq?PSE&@#C
zk!=DH*SmZDjIcO4VrO^j)X0*tR(jD&h71%ooxEhIfZO4;)-WZHn>|(@UpVWiL8rA5
z9Ywx4naXSnCp(fC`m}Anv0_lQ>9rs8S~U3k7@mFnDy_QV?&wq(pzc;Dti)Q-9CQl+
zXz8xpVo=fBos@@vy})H;Wl(HV*wXcLIHo4&<~L^ZY@b1VxSC0j82?YbLhtNsR1Ohp
z4)+rdiW5>z+?veF{o8*4EQL<m?ii@~uAz42<*I4ZY{DKxe?HRhJqpIg*!7rqcUd;g
z%K|JChn9L-d0*TY_q4EAWn>=Tv%*sbW};yxCMb>Tr)RGVkYH;6zHz4#M?x9ieypIL
z`)XE<8GT#=HX-Vs3U68%{~Ru!kiyj^M9a#d>WNj>HP_Pbxc=;9sihNFeKp%_<mEiD
zovfc~7usHM3LGsVh=u9;954sp)n)FM8STmEM@7P`*SCYjE4FpyQh!GiVa@aGZBLgb
zd=WVAKhw){gvror^z3na7i7b87@3+O|A;WL7rBAk-o5+0jneItQC}m3U}RHeqCs)q
zi<Btd4iKrnOEA8{eXP!|mPZEm5{lQPd2<PP%JNk)*le!$a4)Q?+*p38*X#kRPpDOK
zN|wOn0Sk-C5xg}{p8U&{cIVrlGeVso+ps$I9UCcSNE2`W0M084&U@hnAakF5oO=}W
zslN(cYb01N5&a^HRx1{ll!dxhxvz?SbwS4;(lZP;!?{%FrA1q6xY%sYZSFb1AK-OS
zwT)3GF=>Y%m*A#dBqxdMmT&LZ?8o%it8Ekr`i!+^bDzLl)TM=P_LP@=vmbfKUR(ba
zvh>%_B&8E4tf}m?mwBXRQ2ka;u65Xv4{<S%<q#Q3nI+n#qTozjjmGzSZTi5RovYS|
zl*+Qcz8Q<K?D$=6wAC$SU!Lvhv_59k<24J5J~q;+nL;EY1dlas-qQ7UU6!zyDGbS>
zIgb2jR!rwY-{-!RBf`Zaj<w)bOd0b&l1h4}Q#NwG{<cTC>a2cGIO{uc(?u65D*V{F
zVi-{Y4UF#NuEADU?`xb%Rds;$%7FpoO2!qx^&^by-GTZsa`9DTVY%knL#WGc%#XRm
z1{mW>ot1@##Gz$)ho^Y0tmj?}sI*c1&%+D44Z6#=6wgMRxyA`lXn%mc0ShA&GK1#5
z*F<AV7h=}}nFJ%JhN%(c*llE5t89gpV~u~aG2l{V2XNO#y0%9Btk2hZqKdEB93H>D
z-6=J!4pJMfeU=`;1X21i)ic*BWWq-?QVDQR9{mJgfeqyKnK-6NF>&=RS33TXDEP?q
zg~q*7BmDgQ6LxS5EME95zi|-H@w^L!9QEH4BBcP;D7w@7kj-{S=%uegg|8qYNY4`S
z?j0P*AiGVD`T+56pVKRIEfL)XcI}f)n`vu@NK1!Dn)Wcadgm9p0x6WVdLya~4{>^9
zjG;n*iJ)bqs^<|VOgb>cYFswh5}0=Dm6a{e2UQ<gWbaBu09cc4GsR$H1uCWc6_hmt
zWL+Y}fIj(pwPI5r5Elm1*<!TFlb`o9O^K*LEQ#jZeFE^g_M*VDt_$^*IP)4|Snat<
zKew9zTe#T9VcWO7ss58kWQ-nvm+&A5o%7ET^-LKCs$wKtpi$bcW0&3#`EUgC`A*u2
z*3Q>9&6g|Q@7MZ7M?|P<8aoacbBRl7s$jNyyAFzy#d1E!xnOnay06#G-lN)g{<`kc
zm;~IjS7H@G7Jq<~G;FgJb&|h>TrDGa)yXnw<V+5ofG6+94GlxBA$zLohIB)nNjIjB
zo<0pMnR?ozt~{R{u^{8$L8b8IyAG}}gBQ$dI4zJyZ{-HtCNX}uALSu7in*F%eDp65
zy<1ZS+ug0Fpb#l*<x&IcD6L^>Olzx@K1ao$E^%@BE0)kypbFl~W7MZaqYhr)o<k#3
zvRv5i0;C}vTi{PzNATqdb+d2Oe{E-SeaRKs!`?pMEe(P{BsQSb)cwA_FH9Iy`y6no
zX=I&dcn$oSk4^l|G_zoD*)h6EBkQ!VTjZr|^{(0ocN=!Ds==7ZQ*o++D`1UYV6aWG
z_gSV&;jp@al>Y9xc20=bdmpoaf#b&pv<k3RyY!lH!;{xuJk7C=X@#sx2kX|G^<}NY
z1q(qsKtIBtm9#MCGqu13HcD!4Z+mc}$iEq?s=DWOP5gf8D|;{NF7Z}xMqD(Xa)B$>
z&z;p0gXX;4dBQSbUu9yh4i_yaH`eT%X@Cjk`%wXFzZGz^q3w)NZDsvAY#_q8_{>)`
zB->h#hBTT|{wyXiCBI*OK(<2C>nnt5I#wUo+qUAR>=K@ji=aKwSEIalFEa~rAz#kG
zzIeU71TKeO^g65)at{jhUu#bROb>O2v6x4ESXQuOOzH_i)3?DFfZ2^<ujo22$8F@>
z&Z0c|1kYbgt>3PZOGS0K<TMpij&%)~PO0#2hHCWBBOODhi&O=o30D?cZey{VU$&Wx
zpK^1_w^Yj-!1`Pae*{vcS9SrOA~k*#plxm1F=snSZx>VGd_a~z2Sj&udq#yPzm#Bx
zv<Vk!uo-t;s_4M{wS<{J|BzmHrX(ZGJ!+90DOH!R?KWE83$0i6H3^LG8H2Y>`knRV
z);R@_ZuAo9Nb&pr=kvt7q?_v>;QP}W%>?r-rp8psAFNnV0K40$PgAneC1c$nr|ZW)
zZrYB30MIlUYN&|0l{3z^(Uvs=(<7{9&h_q#c8o@|hJCb&kMk(asZH1A&Si7Ni<#cH
zd7lz$)JF~;3pjvHf?QMV++*fd)OMU>um1RBxp+FIn(xiFM25A))*3@F;420bdut_!
zYelaX_GsleRJ~~wu@HYy!Dux6>NPM~j^#s`M!4-QUUi0JhYx;LU<-qtZnyn>L!WZM
z@+_6sff?7*Z_6dMlh3Gt$R$n_JPkW!1Su|oGVM<!@okAY;i~r~cBShosATq1_z_sS
z(V3dwvB4Kwcul-0s9J3uSs5cHV7+t#rFu)<{qrn^fniHF#IoA`G3D0~$Ij0dT5GBP
z@=&jV@Bkv&cCQg6TY6pEwet1*H2ipy>nY9yC0`fMQNHGDUR>@!QLm>v)cg%HzmPoc
z!kdNaiBTJQX46Aj+s_@`jT-NHxdMdMJM-5T4dBkDN*%$K3x~eumL)&M?ET_$ln77@
z;O!m}1$!pL3^hc%VYckVk7=+9lOJmkuVV-`I?=pq2D0QlqMXtos%Se5sbuN%S6*tw
zzs(D7dy#DY%tp?4C|N7=a-R^MoJou>=(K0dOa&3t2bY5dDFqvuEH=H-!=zE&0@9Q(
z1srT?xd+zQ7cFC(V_u$O+MD*HtiyWRcQnPaDQ~qZBc%0{=GUPX<8d8ryj}Ae5&C`w
z6(WqM4VWcLgp1fytu}@R!X6P-*ZKQ5CRh=d4}l>{%g<n(4q!#A=X=yKePaF&4(oD`
z-;i0)E@8Sndfe|VC2tuPGKAs^Gb-*tyyuA08=3z*hp6fjZz4^5aJiD{v$x2LH9DS8
z`QhLNcrm)^`F@~F>C{No0I?j6&2%-aD^B$GvjI+%YU@l0&BY$QmXa+mx$9?s3$F{-
zOptme?{;es%smqt`p`Vrl{dN?k%EV66QMmr{4SNb81Nrp7FQtQCCVFzq17x4NkdA<
zbtV1iTS^HAH{s)#AXN|DL8Ck0*6hXsHrf~m&Xzi8;VFue6;aQm$Cf5<B6}SM0|US1
zDO!T$N-e$Zp{6y@e}Se2I?8o_aiq=<22$0t=6S%jmEzbDuCeODo+^b<?x#pJ$G(C8
zaS5OE2{Z3-`g?_-;a0DVfEijSm5bU+T6i7YGa>rIQh1B4s`}{IXiZTLK0hiUBx}>*
z$qaHxjoW<cX>&~<{^gPHfYww|(2&(WIDvnV+&yjp3MA|>fYBCRmnPUp>_)-<2G6AS
zi@+dNFXj^U3=y<CgpQ&Rp409>QdS-gBon@_muw0+e5+{H-d_RI!!i1dQG-|4b+58l
zPaNBrZk;&&D0v`j*6aB!Zff|FPAZrj+@b8GS%?4DeL94xhNb21UIC@kyV5}JYIK_E
zVeweg(rHq^w8NlD=A8D^{^j<a<7(*+6aY9>^8V62ym4MAhAy=Y_y;ik&L(pUz@uJ!
z2vRvAQL=p>UAo{mU%GsWuZW6f98mB2{;~>^@<7=Cn-6E$w*Oc8coig_E3tUtN}^D?
z<jY@J&HB}Ga9`7SdLY5<8!D+oc%QI1;WDO|Y{Hi+AljDS=pA~ck&b$gL4+gMPxD{(
zI}g+HxV5swQU%|329L|%m}TV-Wj}A`OJf~2W;nZUdr%@{&{$RKX$nt2+|EGgZ?3$2
z`#-<a*4dm59+ijpg+(GU@;qeA(5&#+5L`202w8?FM+YFyX|I<1%RgF}Hz|3taa%9e
znFdOR9&OHKT45GF*e+gb!jN7N5xZQ7Q+8iW;IH&{2GO_4P+x);3E((v4VYsFS`>Bm
z<C;;mYt_szM=m2$K^ofjV71cIU;BEiYvykR!oK=x<Pl_0W}>)Y__lVOD<+XEjlHK7
z%YEJ!GbM;<YLCYQy1VphY>Kg51?44}Q_0ad9+rRM`giW;oS>V)bW@L26HrSn9YRsB
z<snk->T-uG$0-UE>?$4TGUoHp79vpR_G9D~Hws!qW%7cnUZ$?MhiL}#OpfQP2@Zc1
zzF_dy#}my*OZHoao^$7awg0QHeEC;beCDgv|9OoY{PUV?P`-5Hm#<R$W!jf7UHbBu
z>zx1P-c_iGHM;zOv6)$dDV5;~-wI7BsivZ$p+ZAL@6CR9F%FL=U0Bewq>X1Gf|wD*
zC8qjZ@vqIlG=J6lTv3Uk1=nO<b&>oB80lg?)cdKy`HJ5St#4SZL#WTR5u9E_SE0QO
z-!QJOFNrg4Xd~hHv10D4Xw}(zKwh?50$CJ|)<}fLhWmRFO@gj77H!FJs3NI1_}#_K
zk%9(#1Y*GT$}!=bjoTi70+Bp5l+|`__%|JAW6Y)?G=5`o5qDff4CSh7P0DSjN;ZwI
z9^*JW5;`z$?8u?tQ7poo_kQ>C9Iq_#3jZ3YVRv9LyK(rAi*+Rl;pfU-s{xm(EK!>1
zKqgegW+%)1kmqofP4VZzOpS)A!Q;rjGD4k7KGEbKfDTu4X(5a<+LZ70k&Zv(9nmk0
z?)RXVL9m;`+yFen;O}@R7hr~Rjp|MgZ%*d~uc8GWWK9>E`Yf|acqY@}REopnPeR^t
z2^40f@e^q$&t%~Le<lX4{fYk+Y5RZ9A8<(MFUQXRY^eW#&L78q)c?FccchH-`}hCr
z{P|Cj0ri8nl4v17bH?UG-sW`1rr4v=8X?M1d?n)X4P$_XN-PdH!;btiGMH9GZ3xvi
zq6#F1)A$x>;W?YluiLR~=w0q^VSUMbiLsr$rx5sNwbb!wKAU%+yKp(Zf!{gnq~N9y
z$WL)yqB6s>98+IEWu7%j!rJWiQILL#cZx>rh;}A%CTjaSHlH#R>1P6}OE%##A*1(b
z&I7vkxU-hUi8|>^*LYe^(3Gt$+II~|)F6Fq8!nwcoK|M^63sZb@uXRpB+@`X7T7du
z3K&vBL<N_o?*a|=`9J;vk`)Bv{KxPY1$bY5`f2q|DYFdRGLp4^HRo6$$tkSCvrw=R
z5#KX=!1Oc!J~muB1cN}3i8U@OUZ*pQtbF~A>L#VkqHe{_cUUj9p@_k}V++3zd|{;H
z1wtiO#hMlQ<#MVa%4t=cf#SMhEc;Gx?&%+^Ye*@^0xgeO-F3gh0lFac%)Ws(Uqui=
z3XA2e(`GeGF5aUILL2PL)U_*a=MSW>XpnwerjCOtVwdH5-3N_6UmPnri~H4I6?@#{
z5fbim3rol2p!SBw?-X^X7_zB(OfL#p0K~G~zq*{{Bk3nA&EK-Q5EY=di^8@{o}2}C
z4y>aa9b%gW<j%%_6`2U=cDck1+ZIGv%V$~w@k~-uQMXT?#%4q<9R~$QQ?o)4l}WXp
z$FLFBhafu~%$$y%FJ?(ujiO{|K!jLm&flUfY~A8hR#63YvetSDVToIqrPOQQl*M++
zaHh2y6A&?kG^*~G-1zwAa+TbvMW?7@@LY`Uxy7-u$x~}QK@!Z;JAyGQ{8Gr%2zNgG
z6V14H*8tUpp{RPGQsQV%)}qOOi9?*fwtNF>j&XIRXd>_FCH|^IWs5#E?0m+xmgVx!
z&*+oO1-dJ8V+yr%de_~jgOC;ZUwv^{Q;5YS`eEPLbyqAxj^$PVJ7oZ}vzlyweN1k%
zdP_80j*x%w6n0IP(<ZH#-xx<Me6)+p#PL!fi;BhFb{Cel$t$VHdJirK`&<vSy$+8D
zNss*2e_vboiWEVm2s&JW*Cqj6FTO!1XWtVo+3xUoH0bWs)03>xVf;dG#j*94^WX*Y
z<fAFW?;}+k(ON2L*R}8xGv!h-zRm!aU%rN42%De(m3?_{B$mV2!yWRrK;!)Kb99vZ
zQ`R=}4#GmHi%!Q}_qt8&AA$9pM(PQD7M%mS^sWG00&5=>x&unm&gIurkGROTMafO}
ze*pIoh#~ZKg)Z^)45L4%oF7|3LM<!j?{}z5GV0Z<Sa1<`Q_$4jFZEZ4lOK_3AqYOE
zU=%z%sky)F9Be)JKL@nsunxf2)wqS9?i0VQ+NE<6ek=4I6yqKVT1(Nq+`od8gYCWq
zj>B3j!v7idyxA8?RPd1lypck&11)O^3DV(3H1Y>UWv&NBVjSr25~lL4$QX2)-s3t^
z%`R>nAOp3|l1`g~&+POL^wlu2<y<0)3>YYjniz?Hi4q}IOP``(Ed&qU+auF=UuYr5
zOgM)i%9m4~k*Q-h-Hh-`O$YV2L2~t%FR<#A*o!^K$|@}++d1_*t1}aVdz)XP$!v*^
zOM@-OPZ?O3mPd{b!`gLi)V;n**u9Wwxh@9Cs&E>A2j2+!cDkWO1u^%MQ(g%eDOiD!
z(+M%0b6K77J;iozix+r;SFJ${)$ds(2X>zXaYWt8NwjFg{7}VGe3X!UEM2fBVewcL
zfRhylQ$AoilVA$9fMmC}$J$Y1%$&B(C_xn~h|VQ%35qp_S7zIbNtJf0^)(UCY!_a4
zk|>Q1)0mHgufT-<$j2`QzT&*`)dwPJne}X8MtW?6qR~UE!-bvn9DtKun|wp2MBtD5
zn-c{k&a3rd$ZMh27H4hf+e6E_jh_RhT<;>fOFWi{gO3k6$3L}Ye5}q8Z=qpPS2`7(
zA)K)P#*Z`9*fKWP5Tp|K`WoI0Vhg(!I%q+WpK`7#Ui||!)2@Xq3LC;#aLZ{Cb_$m*
z3pEJF@)TK9I`A?XIqI<y*ss9NX#iFAOWZek$*dGFKLSgzz7(bh894Fa<s8;r(p35?
zpv)zybc^b^wlJwd9rhkIj{)XPc$qV#6)-DU9MUn&wJUTsItNfu)H}44@B}xjcqY;&
z2%JOMzg$Nl&`Zj&?^{N3ZgT*uKK@t!JT-%g;kXBtsjlQfO0fF~II`x12i3^G1)8@;
z4yQjpha*P6{`mpo2XG)?u0GvDP)_exS~l9A8rSz}qjVBGgpC(r0uru=0W|T@$-&S5
z*iBmXu&G~ToqcD*=`m{kzl)q=ld2lT04h8LFgWqsMS)rqj$X1ZSMLf$jzr@MmZG(s
z{$rKuK>yRwB+`^V{bDS*I&x*TksL=Xg{?mH@%W&hU}CKchB};(uV|}x0uXs~BZ(ow
z*8yf{KV3=-*pC7iygO#pdE5TRuoXmjHE<==IQHWs<g{u#MUWG#VAVc-U^!A|q!J*r
z@SD9l?l1V>zQ!e3(3IYyb5LK8!sM9eV^JCBX+*?qBbT|&MX^~1*UD()ZSJsIkX5z%
zrNJ`ZM>UFs>^gq-9q)WcY7@eSY*eM5SlRLv$0`}Vm#Gm0k8vRJbYWn~Rp=h3sj5Sx
zQkX)Jm4Tt%x+TsjTZjkRsYHYP8yc8swP_uACcv@XyG9$a<8k*~Fc`@Bscy&`2?3tg
z*!!j7%mlBg^)Ixb9bVET>wHZ`!jm_*w2s(68*GblUV;r-{BsQ){BwumpYvojtR#Q;
z0T4CN<|=_+cek~+a7h>CtLXhA8Y7_9@Ep*cVdvrW=Wy9+i70hF8@=QdWrZzctVShE
zQddS|2|c!Atd$~Kt#UmPJ(3Jcj**@o<BUr|J5q~2BD7?ex~CY8r|o-c&4}A3lLzDZ
zr#MKa?^8rwXL|8-dy2rTb);N?=~Yk0P<s%fa5yeS^=N-KX0-JWUqOQFB8k8i`ev*#
zErXClOohr0CxQB*n(Q=c%%h*SJuA0vogyruVHiSby7+1?oK?;g_e1K!@2=Awdn$$Z
zV@%Y0$NKmr{TN{HxOZphqCtd78D9qKa!21Gqn*lzJbUV5e2(6N+aU(oraWT_r*tS?
zvr@Qt^b!AK-i?*5lBS?@jRCv{mJ5LfGI1LTc(jEZrymyXFgReP{lTLT6JOojUy_!C
z<x{Y$k=Emw7fmpaJc5=mtTCuqN7n%88K4zJM^+C_rB`D;K;HwQS60A?T(|QNp!KVi
zOltOi756(5+L!3%Po#WNqo$WzcGekgjVF{?k2%7snFQ4dcZSeghUm>0!(t2TQS^h9
zSx@Svb<Jr#>$0XELj!*Qpn1nKRyLnTYR5qP)t<aYFzb}%q+ce87F1V)?+J6%yHawn
zY4pD3y_tn>e_{~}Cn(E+--}RdQu_|U9H={b2j00s0dPS(oG0kn^=aKsu62wqFe?<C
zn9hNwRlSg;egvaEvpIv@_6+hhj-ow?FzWDn87ssmxc*5C7hepFtk$}$=ez-A&4c&U
zx@BM!w=Hy|lL{)9avQ!6>E-eUk;<ih0C?>){61;<bVBx#93D^EF?v>?->K^PmLu@Y
zntD|7wS7%Vn=>8n*&PW#=UK|`QfcmWLvv_=jZ}6}Udfl74N`ZU50PvIUkRvb<}3SL
zBx1Jq%C>_apT9T0;s@H=engR3Be6fA`%+*lsSoqk;d29buQ-uJ=*x3trWl|R^z=-h
zPc9k{EWt$Y;xg{-?fa6R!th&5uQBnrI{X{dII34;+B?K;o!%Mx?&zsWU+dSmo+CZ`
z_3tOjYqt3li3~~@;kur}YhU{W-%gRyHKN&iA5>31XHJI*=>jz+B!C@W`t6_nn}_hH
zOsR`!?PuqvbaufO62V*|0@fY(SfL`2+YdfdVKbctWbc7Y-`rYHGk$?PMNUxscsqrL
zP}pJAmh(NORONq6F(wjNmuv;)lq$Z>I4SsF9p(K4tdD=;gpH>pL*1v&2Y6)zjmOYI
zytaOZ*!(ra9!P71XFaof-~_hbTbqtpIh=8!u{`HAIZ$W*t^xJJ9fS5GT-&OX*)nb@
zgU9~Jr$f>~6DTDjRcy1J!`!3U;051`c&2eTMf|O((bAzkL{Y1OMp5{tH9RB2*0Juf
zf}QLxvs=Oypv9U(POftVUM#UCQ=7ES5_%QchhSy1dc9(y$vm@qjk_Bk;SMZ4EA{6x
zlflG6;MAp#bIs@hzgiY=OUkh6rd@l53MJCz1pfL|pp_<y_;va;ea*Y@!sfB^s|c<w
zb=yd0dh{YZ@PI1{8dh(wM@6Ih*`1#>p;IB^A`ybpoS!=rWefl|c(>It`E`xwWGI<p
zWOFrag|Ww_rw`e~FMJ(y4uKz84Z{nNV@@emUI}}AhAj*^$K6tsUdd^HDd;Zbb(S(F
zt3z=8x;5R{eD7d4ChyIqsm(=;=cAC5l~qgi&Q@}9qm-loW+Tn9zaIm2GVd{Q{c5#>
z^4+mCk`L=PdLxUIiHK1!f}tSjiKw|oIN#kE3rcjzh&yOiCP?x?2Uu+8yQk0Iqb(Ft
z{HKxd%^F(o$M;Bl6dRsmgkZ_Db`&d&m-(p34FdW#RS1>XZJRM~`40jh|Ktn*@wNwl
ziZ8XmB;b4R_>;g<y#T`lCRp0t&O(O*)iH1BLpnoBhfgm+s_P#>;%oIsiTbtZ`wFQ3
z@AzNv9}ErffAQ4+A^(hbs9%de(*F~Q_#fmS{<EN%Q{iv8x~qc#8OZ>|*1#{g*{?Xh
zQdeI8-K>;1f!pZ;mNtW1{42IT5GYw=TtI=dhL7|cC?v6IAUGW#M%U2iJ_Or}Meh0^
zfFQ%QLkU#O%6SG*;_~JE2apSZ7rzaMTt;s7=(>f$q5Mlv;PhQSi%HS*Z({OscEMwk
z>NcR!_Tj+!fXtL{KY^z3cy#a4pkQ>PWcS@9@{mjQB+Rsz`U{ZFG4xY$*!zw4JaDuW
ze2c_{PWS4sg&M7p+Zd>8({1Ere1-BwOmwkpGtS8~n_(E9Za@1x${~BXR~j#9!Kl)*
z=MDUJi;?GKTI|x}ZMOQ<b1zx!_+TTTWftqlSB5YKGiEqfjbn~~%V0^&b)V3(8NAo`
zE07OWU{rMCE|WAz8k!h!y&^ZufWOf>c0a6Xzn^h0-Gn@$0Ud=QhMAUdq=VC9V2EhZ
zjDaEnh)CzygHuKk5~yyxIRU?kh*_4}oPQr2(r9dROW>lkh7cQ|V2DXrh!BCpW7)`>
zy2B3v25vr33t8x>V7RqVH9A9=B&-w~!C_Jr?&Y_UJ6uFtyA-*?kx`7b7k~nQ93Um4
z{1H{;llMTBV#L{*gkT6HfgOcK|I-FjuHLYcz%j%&>^Z>*zV@{T;REGv0P;Jb2s$g^
zif|!?Tkyq|XuUCvKL$xpKjPSf8~nAzlMkkVYpcnJm4h_M<}Q@o!WXt6Sua4PEv0(%
z7Gqc=0zl?U*GiMaXIWC;gI&OlDl_pHYmo#<ydJ`(RK)k=78eci5dM$HWF?fmSoq=l
zuhWk(stibV7_iF~eyPb@t*JHAEPHksAqYx1U7uUrepvl>kB_>oQ|yAo+g1DlZa4kC
z(2=A#E7w@T<%uZ$`v^(n0L=3_$+I2Snkhjfs80u8wE?@D;CH3KOzi@J9fD}^mXSB^
zN$UiRL5{rQw)<>jLc>aynR`7m&B<lOmGNm-y)R8u)p|w}ui-fMRPd!9J1nck=bWg1
z*%P?8k+vY|98e4c<65~JvreM$$#T8+KLFx-iE<88T|(C|-~CL(ZsNNUr^7Ez!v)_h
z;lXh?u(pJ|2QK43V*1xXA@Zh&(2hs@w8TNgf+x|R^V9n5J_DDhF|mA{pDEF2bB`WF
zu^|u!&_!Mu=yjGr41f!CvWu$jsp%l(O7DOecv9yg(R`~`1Uz_+Xm4J5&Nin&HNJN4
z$^wh>Kw@Jt;$I39)1A4rQ1AXNIBj_T0KYA)2-rpbA{3NlcKiIhqjsrgTPl8j>+=C(
zog;ukQT-0Z6x6`_m_|gh3Tjo_){!UYW8B}G7eRl6{hK_PL8#5i+LO4F&OYd6*UNA0
zv18BSAVU`{qwXJ=NNxSMv^js>i)k}zfPzqjF~-Q2Apda0lH2#gJG)$NvAMo(3gE8A
zW&wCW)`@-EO-LH1+8F*F3JjsqZeqvkvmhhlU8gl7O;z+MUPSi}vg3fd!%Lt2avj_P
zsa@`V24T1%MzcZ<mzwkg(Wg8^DI?|o7ic1v-6*Q*$M=OP$gOY#&#V`Vq=_ZirD5d^
zaPm5ApopC!B54sdl|XeUF|_U%W%+x{qI<u?N+6FdF$40~#Kh2##-Io+Z|4JZ$dd2@
zo1ZQ+Qw&NFba#`Eu|^xU`bvw~VKiv5Xc`p_L=+kV`CGA#nwIt~1!cvcjbKw?QLVRt
zf;k>wCBs6K!b&b4{{W|0SO(LuHQH(J{IMry;%FTRZJ97y=qM1bpIJ?WZ$*_s=h2M+
z01iljQ3T}EACH$<?~Q`Z01Kq^=M#)$95A47ItxS*0y1<un87>EZ#Ib?3hN8+K0yE~
z*`T~oA#L$+DHakHfEM9uMQuRM5Nwh*)XSa0j@2V-REX|l8Q?Rrs%RzW3gk(ic_>h;
zGy*LsI##Jbj>II^LQp&f2bLUeg#Q2&0>JGS5tO6Z@4SHt)5cxEMa7_7AYM}}5WyOy
zIu6&)5{%&j5#fqVQJNqjG-|uTBues0tkCBDU{VG>C<vq5GDxOpa*i97&;e>2$>6$#
z>50^yR5&yv;7otQ!>DSWp@`*5{_)(H>emWbLI5==r+D`z009JB4>}JR2*q}VuYpbV
zal%82m<06y05irXMZ=(kr;>?J4oiY<MSys2whYaAh;Y;e1X2quxV--W>Bpr10AZI|
z$HrgqG=4=&0OekcR4I1*QR_fII5U!#)68&e@Y%c$3X}i}qp;-U@q&odD-1vt?|L-v
zSm)UAVj$W(S0!!0%ZsE}M|Ob*=p3OWphZO_09vSHVLpV{pc()WP3?(h2~U&_jUD?3
z5z~=TNHr3zCuB4WH(F)L6|WP`Nxm6t<q7}<M~Dq0P^1<9zI&196NW$=JUkDcINr=e
z$@>{3bU!!NTSXT~{l2q8G=E|b_Ty*3r5!VdM7uZ7E0bt8!P8Av`o)1KqklL?ET41#
z02pNQ0`EoHA*K5=*#7`QoumLYclrqi&++wArV@_?VgCR%XRLof7m~Qh5^zBg9lG#*
zR}&URgh`?t-tN%K7|T0g8!b9h#WEqzs+HEDCdTi^hUKb^SS<xckQ6M)B0i{_R-z<E
z{iI{EmdJuBNYF-QBmf{h0XFWSrEz~-5~emFS~t6J<!Dp|TWmCH?Kli(o$k=tmqzNr
zo;UaoEW)t?KwIXjFHI~BpGO&Ddktj<+xyD9M4)j69aOs+Wak73?ErY^em^;Q0+FTh
zu%pQzW?n@hg{EEuc`RMr<yL#f-7mKWqJZPjglF0Fi;k+>;s8Jmc2PH~FY@upiBK8|
z*BCXV&{Z*yNcz3vUke~zAhnUcspP^&d^wigw(RqXNPtmczRSAt&fX<5DqU2l^26wv
z5ib?k3#t@%=*SG7gbJzvNZweXCj_w$J(j!BE?eEhc#&pJ)f+^10{FxykePJ>?BHl<
zjibb15GHKLU+S)k+9|4F{5tZc6Txj>;hPAa0P+jEk@oeC=r_#VRXL%6K5!)hi_?P5
zSnWesx0~lbS^Sy7>-w`rA1AGtadX`PgPoKE$lo}td-4LSxA@E*>k*1mG@A$BpT<RH
z7HUq8L!)zs3rm9NqCoieUszF2#04(3lMkDiR=OcP9O1Isloi@>#1^XRcc5%4=-|U%
z`n!Q+E4qcCD-6&PP{EEM1DqU9i-?v+jI7zu7GpJ|v!Z~2VOM%Nh6ExqIA72;oZMd+
zEm-jG9@C*$#uYtbiwGe^pf0&^``q5$>8<RzM(}DUpq)v+dArEim?)FUuE)tWF$e~n
z<X2QBN4b2fXNimFe~iwslJD`<6nfG=@#{YRb$5LVbF9_Bhd8flb9=C_Ez{=+<pW1#
zgLoiljanFpcM$-Htyb%~q6Y4+7WD&tRQ~`u8KRQ|8&1S90LVCC16^%q!0c(H!?wd*
zwoj{RyD`aF+BW^+%h&5RVh%ar{%%VLm;iF7gWIe?SRxasD3(FZ5#wlDlSF$NE;_9O
zhjX$3CeV%JN)(ipCroHQvq~kYYI<Rc(ZPx;fL=jC0_Y<2V$o+LF#(KA7ps%>+5|Ws
zFoWMtI@8X1tERP~KJMRM@@GWgL_%DNruDo~gA7Df<={0{n4bwp7oqyb;U#H@AQS*;
zAXNxD6p2NuH^&!JOoX&{=yf(cN5(lN1~-hBs7ioVFzC9FF;EzJA1)2-`x}hill6_<
zrNm1paVCLHuDQj67-*P=3>^@z%Lq!^>;bk(=9lbhX#z2%4vYE51xvyRRPJcY8*YRu
zi#@g<JJu2_stD*jenT|Ds(RJ2z7U9W##p`hcBwCa_;HVgx-n;uj9tv<`u_O7oao_*
zH?=G04q*ctRyi6h7u$-I%F8N_5=>|%)gT>QHn*#SZ^lq8Iw#SZj53Daj=HemzD({v
zdfUX9+?Od0Do={z4z^eIk6yfSF$exS_Evg1>RiyoPhge9MG3KPNWMy;B)SCU<n+bc
zJ(gNBa?)6DCS=KrNl-8yIyh#oRWsOun_cCps4v(X!nd3Pw({)#WnElX{)`k7VG4X~
zT#i!H?m-W+GhLHUHvR~d8#@QP8Vku+!LxW{Wj|wWyad%3SQf7&)q!kv3g{eqFJ#L0
zrVxQ(6@Y3YdSr!_Km{2Vl>FYN<~C_R8I;OiB4~$j8uZP!4D=~jC2rE5i9<Yt3SmD*
z#qt0&xrYmrv9__0JE<dq1s#E#I412NK%Upe5T97-$B<2iTd}V??Nd(7Q7Nf%c&)Bz
zpTWU|z_uQ*6B3cTdCjKpd%su?zufhOU5>9bhU1c!JIW2GG88B^gvtkyHPqjBZ!SDH
z1zJhc6h}y-j68e1hS`L2&<G2|zsx8MOOiIaT4AbhoS;LBo6s5r60H!06D`XTlX)Ru
zYmYxkkfL4|IH$>*F8bgt(L~ZHp^h~=1vN`metW|N8HI92O#mKW3`-KcTwn9Ng_|Iz
z;Z5CTh_N8Fkc)H+p^iR}WjtjC1Ve+HjC^8jRTxD)Lq(WP3KC67kRB%j;s&D4ZkwDW
zwCIT4Ch{DoFo++cfGO)|S$Tf$fYh2BzOvN(z;PU62C$$6cTm3YC|1h1lTe<c`NT26
z=nFvuU=bV&1R`t)yqK^NMT<*Bi+~@Hk>-eqBq$=FYI6JciohtfbqXSjX7-fB5!4jW
zEJKf3zS|4H<RufYdDVw{qJ}>%=3Je1oNa|E9Bu1!Zb!&i7@nY%K=Yv12AQOZRl~o|
zPSOf)>79#f6O$aUcr-LyXYe(=PCYFmpy)V*yn}ouT*Xa!&Xq|b@@%qhO}i*+9QefA
zkoAxC;aG`48X&2+oFK<(G$F#f`MB4|XM&620%N5=ykmHNNszCGqWi#uamAw*U{yqj
zIZf#DXnPi2o%f0XCCQKlNVY(wOfxCcp0b`8zBzS-<yV>W8Mo*m!%#v4MZDvJdlj5C
zN;(I9<lH}41&j(zZ%8nC-^Nvi(fcNK*ds!y;1ca~0~~@WQ<quVu%)H8kpK@smG&MR
zbD$k2mZwZ~qL2t?8&FU&@tV*gNCDylUc1Py7aTWgD2)s*=6I4vW>N>(n_`js1Z1=d
zRM}GFy&;e(*TOtESjyBLle+i3up#qs&^W*ZRs0z#%aYPjG$<k1Ng1Wyx;DP`j_Rfb
zKqQ!&yt8)zkOT_W_^Y0#Fx<PWiJDR9rfI=m$EwM1X+jLon&!(ulb{jl0!?41szIZr
z0whBg=(M5-z|p@LNU1)eL!hW?@(>mLtAce^fJqCEGfE7!SlObDBcyTDE<@EfWo`EJ
zkvVP!N~A-AG$Uq9kMX<?_6gAt^DUR>WFgh9phaskZ=;$0lNd}Gt{!rxY<!R?B{T+r
zCFdI!C20kr;m@2u^umLEi#cegb@=ZV_y%{l2(;uz3!Kndi{{es`Nu4Ixm2%>cZVJD
zq=lL_S?X=V5us@Wj<@%bEh*O63{W=7KoFTiJ$ut99wAf$nKG?bG^ap@P$^9#w(D35
zl#oaiVTw^Fgky-=Afd*yZaqR!MU8^c^)jq;?76hrR+CUd6-`H(R0th9t_F&L%(!5w
zY&3T07-MiE(g2M(HQQ{sW!4l+44}50qP192tv1!5$k^{)V9+&=hVe!}P6X;)9ilV~
zDEPQc@poORQ;zQw7Q1sdOaAdCbw3z>0Z*a`lczm$V0Cjc89kD*?M!V-)T4p#jBKEi
zHQlzUzv~mnwUcV-s<8dIBSngufGT<g#C!cS*^RYw5VH#ksO=;Z&<i(2apue-SG#NP
z2P}fG$iPaT$uSgD;2T1ch($<dpMAGZMA1~Uu5bJIhSWoyAI<_Idilo!QFJ@kKa6*0
zdWZY|xwEgxAQd_t;>e64QVpnxJmBf}@OOh`)b4cTz=V|pVMJ{WWa|9-#uStgcZKU$
zB`4$^-a$17(=0+k(G)<1RZR@uvwdrTqGYZcfbrP^&f)>X4c!bY7$KpEZ!I}UAfXFO
zxBlS@m{5ZTBZ$Nl=N#&!Q$TTCMJp$Df!Qr{uq)iHa34%)yAHN3>Z{R5Sc&N8oYaT`
zUiJa4=$$m;1FEt1>s%xkZ8e3}02Y%fMnQNrw2*^rYH=MwY;gipTG;e|zs_}srCt+{
zT|8kS7zRa7RYLc%-ZBr<SrD*-2?g7rS6d?6?1dog=Ps~#QguL06vidc?*Vj&LsEb)
zr)a=4GN1@<GJ8veLOTW6PdP(id7D%O^aNLp<+gMoEB0<T!+>@qfOG<?=$rY$O+ahH
z8NqJsvjWUC0-Y3lb-6dYfUMc!F}*^`Sn6Vd$jHp0g^ezjw&>AvvpA8oo{oQ<ac(zc
zOuf2VDR_f~Q(6WLn?jqxmnIXJXD$V9`5oedfHK&G8y7%uqm8P^m%-)3!Iocu4HEHb
z^OSsmR>)XvV`*U?F|Jl10%21^i2*LDHr|5wzzA$KqJnS~o1Hiz)>o#SzaWVGI95Zm
z4|%eVd1Mj9$f)ljP^TDS2XJS+x-ft$yWkEEdDB`W5PL>M;(l{}5<tr+Au55uVIyKQ
zK!8aHoV>anwnbE+-M#{0GweZ&QC&Qt6G|eCrp4%;9gZ~3p9#Rz<KqCX;__C(+R*3@
zA^e$tV+(vA1*{~X3Sb|Nf<|ss2vV#m!&+rcfl003XV=&Bh!NC`97=#cB)FqQQyZr1
zN0D@$W#lEfvy!_WoK~L%&qJd8;3k4?s#$O%O>QGo1tkE%DDff3vv84BQaK)3iiECu
zfoWq@?PeH6hU`}(MsPx-1UrhmFjVvus3TXq@I&RNbu`(=M#X?aGIqCWv>lncf1CkB
zL;xj8CRK>lpfZ?^9o&q(k;76LFw;d1hQ-NF0>-UUhe8?1OQn<3f8KLST6E+Hr)o<`
zE0R?aqML&S6l-PzXf*&0@X=V5iDs`ZLv~V>R*or#+hcUik6+#ZWvI96PZpC3E9O_Y
z1F_XU8&-*T&=W9C!*@9WbcsU+mQgtxGLVuRks42k^lvj#_s(p7!(qZXVXcCEA-)W@
z7eu#ZQxP%_I;%#9tbD@IfDqY0A`T1&VE_Q=Cjk#ZfU}^TUJv(Jv7ISEAsVB%R+xK+
zePNfd=w{{1hl`g$LW2>UOpq`LKv;o}_kiT!ejq}R5F@BD>&Il~oxp-Gyb>WJc8GQz
zVe)SgxTP@)I!a9(hJgqIP+$@WApizWmF*xKX*?}x#ka^refn@(!-$rY*PotdCR~hB
z4NJ(gne88uKiZJOlf%zA@Zc*}9V<&V21wJ<+Xw+KqHlUIdD(*s6y=Enz}DbkN>PoV
zbOl#f!&E?kD(av;xK)fKegK*=_^3iqi?)>9xI&yEkl??8`31+C0_qY{Y2nTKQ(P@2
zg6<xjs6n@h!C<68JYm@4Ts)nDIrWw?iFk}-peITrBzo!*Aw|<8S~$s<(Q7mmu;}Z?
zJ=E!~*Vm3PLXB;Oa%J+|+J14|sC^In{bjU<A4j>?S0$kkcgyi`bytBA2Srj%ydBrS
zoq<k;6h`jzoIK{1_h`ic6t0>~kQD?7>o#(LqcHs-w8uaMjsyF`5(!gPhype~E)>hX
zP@{@#V8=!)g{~f+`{Nu&79|a6Re_Uzr7T{DKooS6M_c?&fY89HVr#C?vm7xYih!|l
zQieJ}?~Df_(RvCOZWPuu{#8iWT*CP@JHZh|wW-;piScklvLHb&5Trqjc(y`npjc>C
zx@bo>!V_afqNb2KJOZZ>H0;o!rkf(@t0eujBV8Z?1L6)J&^_|-hPhxnP3-x|p_EZv
zF13r~0jPUBw#We}AV~ALxi%ID&gYzF3z7gR0djI9COBAsGzbep74d8W21g`+9cHgc
z#@f8L<l{CCB{z>+22qm$z)25SdwbkPLi7bxt2~$TZ`8wBoGtd{3Oy+i5U-CI(Y*^P
z1Q40%@s?%5tPFOnxK3nCO#%Z~fa3wt$8Oq`Z9CZsF&MuHKx=42Vy}~r{v>2kW!fOk
zIeI;xMx^Rh`}L0c@kw@gd&~6+9R!^rxz4%Bgp`{tPZV!dm;w6chR6Yd1TC1~WNA}E
zRVu*fQxU(Q6IC!OI*9R)<)pYt0Mr$U)-xY_U(JFl8?F}cEr&;}9rvu!yQmhn4I+1r
z?FdMMi&W4A_h;oBgG(8HF`NS}6s293`^qzT9@VY_f-&D1osC)n6|!1gVggh?X(#{?
zz0(&YnUxbrgoA1Y%D_@O%&idTmbj~i%w_3)_;tZJHI-jW%}<9|XN(r%p*2=EXh3fU
zTU&Fn!nq2xT(dgG0s%V_-!lSEtxId`-2$~HSU)llOS79~sN`J82aI5tSS$_U72Los
ziaTgHn4ZD%c!2~(_lpM2tYc>+-i%p28}ASe8+XO$9PQUQwANvpd$5vT9dym@iXLl6
z2kVL4y1*%Wvo^vE1UcIXhRQ+)4kiLUxhD-0bqmR1?KZ3`8+>n^I%4qYB&lI)I~q(=
z>~6U{0uxU0*dvNCf>XDA8)M@Dq7!?$<!4w#=}K_=D8UZK9&(?oi0`sA<><grHvm;5
zflyxzTC*{$R6GZorx;#4c&Rl2Vr)}~HxxnROL-4}LK9WeCcf~hbJB=0!>85;aEv*3
zY=T#K<S{kk8nObjRK*jsPH(q%L;k<s@T`|)Ojlf^I`0De0?7mc(6OfUIMR-l6XX8?
zGE`jpBy1M|sYXP+ltMt!r(l!T@Q^_OP%&<}aNPIrhqbKHHj_0)r56SQDZmnD6K8KI
z{=b|Q08@UmTY5a+aD9(IEG?#y)WI$_rO6xx2s^x(+cRy6*IR1vXJUPAK|+UMsCd}D
z+{o+;7~?s=P*9U#v9CE#PItAlaatjIl*qlNrdCbX*biJlmJJEd6`@yZ<E`DMA`dxe
z@rc_rMR8GoH4vkEHi=TIOkYwqMHt>ON;EneDvpIuj4i?QP)&3)J<LBKs?eK~D?ir;
z0_llP!axh7vIxc30#!H4D}=&Ay@#9&bCB1pnrUR?5W9Qc6AE-)m4YnjCJuf@s46%R
zwBq6I3Ru)oX~q|xFu!H%CyMr(L@w}vOXzhVfCn7hFxGry(O2s>ZjUg+htKnd(q@PB
zagN0Nn1P{DbOHE#YaDJMqXHJvWTX{Pa!y><?rkchZ%RkTKobIYtR7ZAT5x5FAgUjB
zF-5s_Q6HEyNr#9+l^V;iB3HZs5Dy-o@9!Wx9{fIYfJLb%I1NW3R#Grs>x{N^xmhUM
zQ_;#Y)$lU3&{T}_bU0{8fnh7r3c4bt!)-4+S}F>Tiz?X<QKgY;paGla^@$z0BEQo#
z+s<7=>06t2+||I@qnsxokA1Vq9iSR63f))&0VzXP6axb(r!U4ky39BrPR#TP-O!FA
z4!Ho8;5)~`xB6^>uD6!G+=<kn0?4bW96!6g3+@)rB4}<pQV|2Of2;juJ1Ckt!~sDY
zmXrk$J4Z1hi(WYoO$dY&QYb^Tfg0la!boAT^=McaB#l#YB|C6D@2oNmk|>dTb7<#z
zztGMKj}Qa7oS7ls1O~8Dk{Z0PkDT4Eyl0t!S;&tKYk#-#j49~?0Dvty2u<OT_JJHk
zpfy;9xqPLZO`&v{dj%lSQFO-2DWNL{u&(k&>``%cm?(u*8tbDsipFC!A+b3)&J;FW
z(Rf}#A|@w`&toZ?6sW@K#jO!Wm;`XN-dn=WrQL<H22V*KFbD;$M19<E5l*F)jci&D
z1Z&(&6cX@l8>qVKqHjoSK8FB##87?sz=F&Dxh-yJ44#~kiXqv?Dm%?m2Zq4~UbT;o
z*-nuKNR}fi@a!NeaMEeW2^KXcUIX)pO3(#TyESz18s@x!OWiz|lwzLFo6;VkDn|<P
zoGU9xM4B#)GRB)0ddo!Bj?F*Dvt0n?IvgX7Yp)p;4Fzy(j3r4)uI~4Wtpk;|f{%w1
zx7(WqS1h=E%-X+9mA0WW5_`cHTy>7Q8{Kg>p$t?pK%@fJgRpB)SPGAHye7)zoK_jf
zuy`^`h~Or~Q35;K-)0tp49K2#bxF&u;ZvhS=Y3&d?9O$hQ7{9#t--XtwiQ5L9*lS_
zjNAVI0Hz?c0{(HfLQGBY0e17e66#5Efgq(5o^S>|PcHGO5EXZ!eeHt*H!dblclpUq
z{{R>pt8%FZhn}#<Xr<p-&gP$3U0RJetXbh*rcyBpI1IH&1pxyjf)K%e0b0N`jfJy-
zhc!ZgOW6}p0Lw!^Isj0-Jtxlb9v#@WVMGeFR$&Sy%|ZSbE45r{2qP0}Za%W=A$xg=
zkn9B6tcbt`bgSr$CwBFc(Kdc_u{e8h1tzzW-G|y@5rBt?Y%n)CK;##1%)$);V2X6k
zv4Fd!rY8(C&=Q*<?|nngZ2eo8ZJ$_31HTWC_T#4%8bQ0z0)$R*0kiScBS415;%9=H
zN{MX%0dt$yGL!^L;c<4NfG)KibFU_HV=6pvua2=VI18}j1*V{^Mqm3(1i%(2Ovw$^
z^8t=sgQ_>Vk7H4n&v{5`-Ay?2a&~2pslB<HvB?1Xum;8He>j%*OfVI&@y={3&r_!W
zJoaPE(oB5u*0FRJXAWTb!Q5{-E|)hC)<Ifl{6$^=0CKExLIO+|z_w|}VDjD5SdDWE
z8_-3CFA2O~s6>S<l_?p=Sn`k(#287re^~R4FMwTC^8z27SiqF<m=Zg<8Cfj=_<oE~
ztfNFd0a^At#k8jcBS3Hf2Z!4!XOqWnx(x%y1ZCI8vZ0QBV@>a!U>ARb5IhCN;7xvU
zJ}K)Rtoy@{c{$z%c-xdN>5`v2&i=TpSo4E_I)i5j0Xbd)tO%?fL^;Sg1=#N;xcH$$
zqN^y=jp4;rM<ynKI3SKpY1EW78Eqb?j5jU_Co$^4<$A)E_!NF$`o?YoHa!-8nX2q+
zs&luzKnk-@7?hQBmWtd06Gx0_^VabIe;LlN20DzV8^G4{NJV$ciZEOkTjPw3Xf-mr
zrlA^Edd5X2SPy`Eq2pM+DmcjU6aj4GjI66>jD<!(6L`l^^}xjtREE#Wb?D~g?EEmt
zw945Mq!rRJtJHpQsGb}RcWaGBl4;Z4S%kxm5(T}dyc>cRr9+Yn@rGBL{{V7ExJ7K;
zn7vzl6-p3jl#SyzF@fV0ZlF|30=!|^Xm$@zr#B^n)y!aPaPG814i)(`WBbBF`R6R!
z0^%{Zhk)-GCRVBM9GAmEtK7#RN@7X00MOU0;}Y*GLXd(+9dH+g)sWK76hot3WP?V^
z5diG`<Cz!)51eh;VVg38QFXT0G&J8ZuEazXkF~>8u(QZXuuUC@1>%J|I6T(!y2T18
zWrLmCF7KBM3aSF6DHh&drf~`b{{ZlkW6eTCvo2g7=ligr?XK~3b>j`TKOS&K^kf{B
zG(@DN?2YddZ9IoMrag$>HHP$#jY4jKZFCqChhf6J{_(|TAXgTW^x_q13Kx3~3E6L0
z^g%0DF4B>`uMR+RDS$eFp;uP$H~10uGPD(Wy2;E3<FHMnSy#w7`WP*v)QNM5VINLi
z3V;AAZ8wFG-~`cOrqr@Mn0p_+ZJH3IUECkqJ$PG$C`fD<WvZISDKH4#a9f4hFrY?I
z180Ub*3~MCCB40p(>5McJfeSj-pUxa#&^s96*4inpkn2t+~X$iMWK^`_6|{-9?`xP
zX1<T!7lmmPTn@ij0wi@qAle<6@nq_25AegaPZ-8{;w0UPM=|(v?~Y|$>usTu9bhVI
z&V}2#qjXIeqAuwnwJ=>v>kB6xm3s%I(Ky>?Yn4MG({gcx%1CY-^yS+(PKL>}BO4p}
z!RfOW!`!SyjXLVMWgr`t1TQ<`teoOShoKo4Qg?$7Y|SZi1@05&cPV)82l~P-4DpE@
zJ>|NyHp019A*mXv0z2y#uM;cJ2PuB0K0(zWn*mzQmEIyy5#U4XdEcV&kSIZEo9dAu
z{{UE&0x|yp<BvQ<=a2Q9PLU{oJj9T-<o^J#6{<o{n{6+HM8{Wrj=lY5Y6XfmcRFjl
z)*0Ac59NzZB2mq#`g1TxRyu#_$X0#FUI5k_lg9xUZd>Ti7KsXP^OH+>9e)=ic~f3i
z>b)8>o{p>_MY|_iI8=V%{><jvuJCah!%!6p^J;&1$G!@+y=x-0#>TYu?bZ;mbRM$d
zR+RDo0GKKQTiidqX|Sl*Q_ed!0Ra8Ju^?`~6wMQ)n&VvKT7LQZ#*>mLd&|1C!<2);
z&Iu8|v4#=L!<XJotLkQn)A__D_1*)MT5{PPHVQ%$kV?7AV44V1`^bKbdP0GZB?oye
zu?)^Y4x-!EF(jR6&5N^+yhI!4kp3~^5pPG|7;&%`6Q8VQpZh`~NQ+{Zc=!RlUTNbd
zhQ)>J9nyilrOg*yZfgxCH=+{ta3oDF4)MB4)E+RcmUl8lPm`R|LHrqB#p^`gNV@Nj
z8K6y9CM$A<Pi$aXvl?bW*)#$M5wSG4K#V>&mh!IRbBelJgz3RBF0?5J8;P8m%Q#Q|
zWI}4nTE5D6Lg7(CLOqLY9!CV2$bdW{ecmxdMBq{$5N~*r(x^v$@?vd$x%1~CBg%`g
zGkR%%E-?{z2UwAO_&L5XCY=mN7DnOgjL`^3dg~N8Qt)?`pwMp!3RAO;^8P=LD2~xX
zxJ(e6frHQ-VipZN4)JPnd1rXiZPKVB2=Kf<@S<S=Ii@R%q=NE7GePk6Cn$6|0%6C@
zS=8F1ki1o(fsKrI9-e55A|t#=HZ@%^c|5W&5_5u!DI(5+vjYS*Tx7gRlo6(%jM648
zYrLy!iX_%BLblZf9e8walMsP<Zt!Em&pD?FwHf9Of7ahQ5cPK)5RJS;5Fmoifd!oT
zJh>Xb(BVZpqrUdzJKcQK6s+0KEFM++nC=+?1<KBGb}y;waSqT-fC1e$3j`gRO$sG@
zJ*E0$Y|c;gq~;$^hr=8y_l_h<MSTp#0+h0VO%)Jb@Z5|CE!fXL@0?f)!Id#714lpa
z85{K5i3xumaw3(yc)($5I;Z!M5rfX8#HgRWWH$Z`8sSU-0Mn324YQg{M!OO{3xJ_p
z-!=!e5rhZ0j2eVNB<U^31{Kr~$))?nTDN{|2`W<wQL&sJ&NE{|?&O$26vQGm*wL>>
zZ0FYub<8&09VGQN`^ZEB{eE){bZ4+Tv8`}TbLHAfjvlk5ZZYPS)17*58Z(8p{{Vhn
zCHmHLiEeX;ld}*<;F2iq)?fAhKjG&)$2|W4$^B!G2mGJ@96A30hpc)0f5*T7*`*4~
An*aa+

diff --git a/boards/shields/nrf7002eb/nrf7002eb.overlay b/boards/shields/nrf7002eb/nrf7002eb.overlay
deleted file mode 100644
index d580a2efb8c..00000000000
--- a/boards/shields/nrf7002eb/nrf7002eb.overlay
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <freq.h>
-
-/ {
-	chosen {
-		zephyr,wifi = &wlan0;
-	};
-};
-
-&edge_connector_spi {
-	status = "okay";
-
-	nrf70: nrf7002@0 {
-		compatible = "nordic,nrf7002-spi";
-		status = "okay";
-		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(8)>;
-
-		bucken-gpios = <&edge_connector 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
-		iovdd-ctrl-gpios = <&edge_connector 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
-		host-irq-gpios = <&edge_connector 19 GPIO_ACTIVE_HIGH>;
-
-		wlan0: wlan0 {
-			compatible = "nordic,wlan";
-		};
-
-		wifi-max-tx-pwr-2g-dsss = <21>;
-		wifi-max-tx-pwr-2g-mcs0 = <16>;
-		wifi-max-tx-pwr-2g-mcs7 = <16>;
-		wifi-max-tx-pwr-5g-low-mcs0 = <13>;
-		wifi-max-tx-pwr-5g-low-mcs7 = <13>;
-		wifi-max-tx-pwr-5g-mid-mcs0 = <13>;
-		wifi-max-tx-pwr-5g-mid-mcs7 = <13>;
-		wifi-max-tx-pwr-5g-high-mcs0 = <12>;
-		wifi-max-tx-pwr-5g-high-mcs7 = <12>;
-	};
-};
diff --git a/boards/shields/nrf7002eb/nrf7002eb_coex.overlay b/boards/shields/nrf7002eb/nrf7002eb_coex.overlay
deleted file mode 100644
index a8925c25567..00000000000
--- a/boards/shields/nrf7002eb/nrf7002eb_coex.overlay
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nrf7002eb.overlay"
-
-&nrf70 {
-	status0-gpios = <&edge_connector 5 GPIO_ACTIVE_HIGH>;
-	req-gpios = <&edge_connector 6 GPIO_ACTIVE_HIGH>;
-	grant-gpios = <&edge_connector 15 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>;
-};

From e8983928eb9b73d3459692c23b163af65908fbc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:10 +0100
Subject: [PATCH 2054/2913] Revert "[nrf fromtree] soc: nordic: nrf53: Make
 GPIO pin forwarding selectable"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fcc4bcf128d883ff242e4297d0cf09c287b75874.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 soc/nordic/nrf53/Kconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/soc/nordic/nrf53/Kconfig b/soc/nordic/nrf53/Kconfig
index 91f422e315e..56676ba6db3 100644
--- a/soc/nordic/nrf53/Kconfig
+++ b/soc/nordic/nrf53/Kconfig
@@ -163,11 +163,10 @@ config NRF_SPU_RAM_REGION_SIZE
 	  RAM region size for the NRF_SPU peripheral
 
 config SOC_NRF_GPIO_FORWARDER_FOR_NRF5340
-	bool "Forward GPIO pins to network core"
+	bool
 	depends on NRF_SOC_SECURE_SUPPORTED
-	default y if $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_GPIO_FORWARDER))
 	help
-	  Will forward configured pins with the forwarder compatible to the network core for usage.
+	  hidden option for including the nRF GPIO pin forwarding
 
 config SOC_NRF53_CPUNET_MGMT
 	bool

From 2da364b478f1a61787fe2800a8886f107a37e0c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:10 +0100
Subject: [PATCH 2055/2913] Revert "[nrf fromlist] sysbuild: cmake: Fix
 ExternalZephyrProject_Add() revision handling"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f1ba687c6ee1cccd3747ca0ae4c5ecb6e43172f7.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../cmake/modules/sysbuild_extensions.cmake     | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
index 9fb8ecdca6a..0853535a911 100644
--- a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
+++ b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
@@ -398,22 +398,7 @@ function(ExternalZephyrProject_Add)
     # unless <image>_BOARD is defined.
     if(DEFINED ZBUILD_BOARD_REVISION)
       # Use provided board revision
-      if(ZBUILD_BOARD MATCHES "/")
-        # HWMv2 requires adding version to the board, split elements up, attach version, then
-        # reassemble into a complete string
-        string(REPLACE "/" ";" split_board_qualifiers "${ZBUILD_BOARD}")
-        list(GET split_board_qualifiers 0 target_board)
-        set(target_board ${target_board}@${ZBUILD_BOARD_REVISION})
-        list(REMOVE_AT split_board_qualifiers 0)
-        list(PREPEND split_board_qualifiers ${target_board})
-        string(REPLACE ";" "/" board_qualifiers "${split_board_qualifiers}")
-        set_target_properties(${ZBUILD_APPLICATION} PROPERTIES BOARD ${board_qualifiers})
-        set(split_board_qualifiers)
-        set(board_qualifiers)
-      else()
-        # Legacy HWMv1 support, version goes at end
-        set_target_properties(${ZBUILD_APPLICATION} PROPERTIES BOARD ${ZBUILD_BOARD}@${ZBUILD_BOARD_REVISION})
-      endif()
+      set_target_properties(${ZBUILD_APPLICATION} PROPERTIES BOARD ${ZBUILD_BOARD}@${ZBUILD_BOARD_REVISION})
     else()
       set_target_properties(${ZBUILD_APPLICATION} PROPERTIES BOARD ${ZBUILD_BOARD})
     endif()

From e8063eaeee3b1091ae6e174724fc1e9c99238341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:10 +0100
Subject: [PATCH 2056/2913] Revert "[nrf fromlist] net: openthread: add
 `OPENTHREAD_STORE_FRAME_COUNTER_AHEAD`"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit aa0526279290a16d9e3948e4065de09f13228054.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/openthread/Kconfig.thread                      | 10 ++--------
 .../platform/openthread-core-zephyr-config.h           | 10 ----------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/modules/openthread/Kconfig.thread b/modules/openthread/Kconfig.thread
index 22f11d5c606..dce39fecec8 100644
--- a/modules/openthread/Kconfig.thread
+++ b/modules/openthread/Kconfig.thread
@@ -187,13 +187,13 @@ config OPENTHREAD_BLE_TCAT_THREAD_STACK_SIZE
 	default 5120 if OPENTHREAD_CRYPTO_PSA
 	default 4200
 	help
-	  Openthread default TCAT stack size.
+	   Openthread default TCAT stack size.
 
 config OPENTHREAD_BLE_TCAT_RING_BUF_SIZE
 	int "Openthread BLE ringbuffer size"
 	default 512
 	help
-	  Openthread BLE TCAT ringbuffer size.
+	   Openthread BLE TCAT ringbuffer size.
 
 config OPENTHREAD_NAT64_CIDR
 	string "Set IPv4 CIDR used by NAT64"
@@ -204,9 +204,3 @@ config OPENTHREAD_NAT64_CIDR
 	  to set source address of the outgoing translated IPv4 packets.
 	  The CIDR must have four bytes in the address with the
 	  non-zero length of prefix (e.g., "127.0.0.1/24").
-
-config OPENTHREAD_STORE_FRAME_COUNTER_AHEAD
-	int "Openthread frame counter ahead value"
-	default 100000
-	help
-	  Openthread value ahead of the current frame counter for persistent storage.
diff --git a/modules/openthread/platform/openthread-core-zephyr-config.h b/modules/openthread/platform/openthread-core-zephyr-config.h
index 20f424ee2fe..71a087ca0b5 100644
--- a/modules/openthread/platform/openthread-core-zephyr-config.h
+++ b/modules/openthread/platform/openthread-core-zephyr-config.h
@@ -448,14 +448,4 @@
 #define OPENTHREAD_CONFIG_RADIO_STATS_ENABLE CONFIG_OPENTHREAD_RADIO_STATS
 #endif
 
-/**
- * @def OPENTHREAD_CONFIG_STORE_FRAME_COUNTER_AHEAD
- *
- * The value ahead of the current frame counter for persistent storage.
- *
- */
-#ifdef CONFIG_OPENTHREAD_STORE_FRAME_COUNTER_AHEAD
-#define OPENTHREAD_CONFIG_STORE_FRAME_COUNTER_AHEAD CONFIG_OPENTHREAD_STORE_FRAME_COUNTER_AHEAD
-#endif
-
 #endif  /* OPENTHREAD_CORE_ZEPHYR_CONFIG_H_ */

From 5f6436ae390b9970a54bb115a707ed7cd96695a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:10 +0100
Subject: [PATCH 2057/2913] Revert "[nrf fromlist] manifest: openthread:
 Regular OpenThread upmerge"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 346d697533dac25ae05d72e199217d1bac2ab6cd.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/openthread/CMakeLists.txt   |  4 ----
 modules/openthread/Kconfig.features | 12 ------------
 west.yml                            |  2 +-
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/modules/openthread/CMakeLists.txt b/modules/openthread/CMakeLists.txt
index 6bf3936718a..2ee23327435 100644
--- a/modules/openthread/CMakeLists.txt
+++ b/modules/openthread/CMakeLists.txt
@@ -45,7 +45,6 @@ kconfig_to_ot_option(CONFIG_OPENTHREAD_BACKBONE_ROUTER_MULTICAST_ROUTING OT_BACK
 kconfig_to_ot_option(CONFIG_OPENTHREAD_BLE_TCAT OT_BLE_TCAT "Enable BLE TCAT support")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_BORDER_AGENT OT_BORDER_AGENT "Enable Border Agent")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_BORDER_AGENT_EPHEMERAL_KEY_ENABLE OT_BORDER_AGENT_EPSKC "Border agent ephemeral PSKc")
-kconfig_to_ot_option(CONFIG_OPENTHREAD_BORDER_AGENT_ID OT_BORDER_AGENT_ID "Create and save border agent ID")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_BORDER_ROUTER OT_BORDER_ROUTER "Enable Border Router")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_BORDER_ROUTING OT_BORDER_ROUTING "Enable Border routing")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_BORDER_ROUTING_COUNTERS OT_BORDER_ROUTING_COUNTERS "Enable Border routing counters")
@@ -71,10 +70,8 @@ kconfig_to_ot_option(CONFIG_OPENTHREAD_DNS_CLIENT OT_DNS_CLIENT "Enable DNS clie
 kconfig_to_ot_option(CONFIG_OPENTHREAD_DNS_CLIENT_OVER_TCP OT_DNS_CLIENT_OVER_TCP "Enable dns query over tcp")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_DNS_DSO OT_DNS_DSO "Enable DNS Stateful Operations (DSO) support")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_DNS_UPSTREAM_QUERY OT_DNS_UPSTREAM_QUERY "Enable forwarding DNS queries to upstream")
-kconfig_to_ot_option(CONFIG_OPENTHREAD_DNSSD_DISCOVERY_PROXY OT_DNSSD_DISCOVERY_PROXY "Enable DNS-SD discovery proxy support")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_DNSSD_SERVER OT_DNSSD_SERVER "Enable DNS-SD server support")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_DUA OT_DUA "Enable Domain Unicast Address feature for Thread 1.2")
-kconfig_to_ot_option(CONFIG_OPENTHREAD_DYNAMIC_STORE_FRAME_AHEAD_COUNTER OT_DYNAMIC_STORE_FRAME_AHEAD_COUNTER "Enable dynamic store frame ahead counter")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_ECDSA OT_ECDSA "Enable ECDSA support")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_ENABLE_SERVICE OT_SERVICE "Enable Service entries in Thread Network Data")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_EXTERNAL_HEAP OT_EXTERNAL_HEAP "Enable external heap support")
@@ -102,7 +99,6 @@ kconfig_to_ot_option(CONFIG_OPENTHREAD_NAT64_BORDER_ROUTING OT_NAT64_BORDER_ROUT
 kconfig_to_ot_option(CONFIG_OPENTHREAD_NAT64_TRANSLATOR OT_NAT64_TRANSLATOR "Enable NAT64 translator")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_NEIGHBOR_DISCOVERY_AGENT OT_NEIGHBOR_DISCOVERY_AGENT "Enable neighbor discovery agent support")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_NETDIAG_CLIENT OT_NETDIAG_CLIENT "Enable TMF network diagnostics on clients")
-kconfig_to_ot_option(CONFIG_OPENTHREAD_NETDIAG_VENDOR_INFO OT_NETDIAG_VENDOR_INFO "Allow setting vendor info at runtime")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_NETDATA_PUBLISHER OT_NETDATA_PUBLISHER "Enable Thread Network Data publisher")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_OPERATIONAL_DATASET_AUTO_INIT OT_OPERATIONAL_DATASET_AUTO_INIT "Enable operational dataset auto init")
 kconfig_to_ot_option(CONFIG_OPENTHREAD_OTNS OT_OTNS "Enable OTNS support")
diff --git a/modules/openthread/Kconfig.features b/modules/openthread/Kconfig.features
index ccdd3236d38..eb713232c92 100644
--- a/modules/openthread/Kconfig.features
+++ b/modules/openthread/Kconfig.features
@@ -52,9 +52,6 @@ config OPENTHREAD_BORDER_AGENT
 config OPENTHREAD_BORDER_AGENT_EPHEMERAL_KEY_ENABLE
 	bool "Border agent ephemeral PSKc"
 
-config OPENTHREAD_BORDER_AGENT_ID
-	bool "Create and save border agent ID"
-
 config OPENTHREAD_BORDER_ROUTER
 	bool "Border Router support"
 
@@ -153,9 +150,6 @@ config OPENTHREAD_DNS_UPSTREAM_QUERY
 	help
 	  Enable forwarding DNS queries to platform DNS upstream API
 
-config OPENTHREAD_DNSSD_DISCOVERY_PROXY
-	bool "DNS-SD discovery proxy support"
-
 config OPENTHREAD_DNSSD_SERVER
 	bool "DNS-SD server support"
 
@@ -164,9 +158,6 @@ config OPENTHREAD_DUA
 	help
 	  Enable Domain Unicast Address feature for Thread 1.2
 
-config OPENTHREAD_DYNAMIC_STORE_FRAME_AHEAD_COUNTER
-	bool "Dynamic store frame ahead counter"
-
 config OPENTHREAD_ECDSA
 	bool "ECDSA support"
 
@@ -257,9 +248,6 @@ config OPENTHREAD_NAT64_TRANSLATOR
 config OPENTHREAD_NETDIAG_CLIENT
 	bool "TMF network diagnostics on client"
 
-config OPENTHREAD_NETDIAG_VENDOR_INFO
-	bool "Allow setting vendor info at runtime"
-
 config OPENTHREAD_NEIGHBOR_DISCOVERY_AGENT
 	bool "Neighbor discovery agent support"
 
diff --git a/west.yml b/west.yml
index c1049d2350c..49bc40e1e4f 100644
--- a/west.yml
+++ b/west.yml
@@ -306,7 +306,7 @@ manifest:
       revision: 76d2168bcdfcd23a9a7dce8c21f2083b90a1e60a
       path: modules/lib/open-amp
     - name: openthread
-      revision: 2aeb8b833ba760ec29d5f340dd1ce7bcb61c5d56
+      revision: e10a92570f94ff1e0bc5e0da9ecf0ee135d955a6
       path: modules/lib/openthread
     - name: percepio
       path: modules/debug/percepio

From ff4829d2afa9431bee009100b69ce327887ced3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:10 +0100
Subject: [PATCH 2058/2913] Revert "[nrf fromtree] tests: drivers: Add PPR
 support in NRF GRTC timer test"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a6fd92da4ce785ef31d67e6d43982bfbee9f5227.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf_grtc_timer/boards/nrf54h20dk_nrf54h20_cpuppr.overlay | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 tests/drivers/timer/nrf_grtc_timer/boards/nrf54h20dk_nrf54h20_cpuppr.overlay

diff --git a/tests/drivers/timer/nrf_grtc_timer/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/tests/drivers/timer/nrf_grtc_timer/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
deleted file mode 100644
index d16ef2893e3..00000000000
--- a/tests/drivers/timer/nrf_grtc_timer/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
+++ /dev/null
@@ -1,5 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-
-&grtc {
-	owned-channels = <5 6>;
-};

From 9845111626fbab56a0158eb175b20d416606c423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:10 +0100
Subject: [PATCH 2059/2913] Revert "[nrf fromtree] dts: bindings: arm: nordic:
 Add TDDCONF sources"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ae949a822b306512a409684be186ce452d71da6d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/bindings/arm/nordic,nrf-tddconf.yaml      | 26 +++++--------------
 dts/common/nordic/nrf54h20.dtsi               |  1 -
 .../zephyr/dt-bindings/misc/nordic-tddconf.h  | 14 ----------
 .../boards/nrf54h20_cpuapp.overlay            |  3 +--
 .../boards/nrf54h20_cpurad.overlay            |  9 -------
 snippets/nordic-log-stm-dict/snippet.yml      |  3 ---
 .../boards/nrf54h20_cpuapp.overlay            |  3 +--
 .../boards/nrf54h20_cpurad.overlay            |  9 -------
 snippets/nordic-log-stm/snippet.yml           |  3 ---
 9 files changed, 9 insertions(+), 62 deletions(-)
 delete mode 100644 include/zephyr/dt-bindings/misc/nordic-tddconf.h
 delete mode 100644 snippets/nordic-log-stm-dict/boards/nrf54h20_cpurad.overlay
 delete mode 100644 snippets/nordic-log-stm/boards/nrf54h20_cpurad.overlay

diff --git a/dts/bindings/arm/nordic,nrf-tddconf.yaml b/dts/bindings/arm/nordic,nrf-tddconf.yaml
index 46f9a0e7b2d..8ef56b44c58 100644
--- a/dts/bindings/arm/nordic,nrf-tddconf.yaml
+++ b/dts/bindings/arm/nordic,nrf-tddconf.yaml
@@ -11,27 +11,15 @@ compatible: "nordic,nrf-tddconf"
 include: base.yaml
 
 properties:
-  etbsources:
-    type: int
-    description: |
-      Bitmask of enabled sources for the ETB sink. Valid values can be found in
-      dt-bindings/misc/nordic-tddconf.h
-
-  tpiusources:
-    type: int
-    description: |
-      Bitmask of enabled sources for the TPIU sink. Valid values can be found in
-      dt-bindings/misc/nordic-tddconf.h
-
-  etrsources:
-    type: int
-    description: |
-      Bitmask of enabled sources for the ETR sink. Valid values can be found in
-      dt-bindings/misc/nordic-tddconf.h
-
+  stmsink:
+    type: string
+    description: indicates the sink for STM data
+    enum:
+      - "etr"
+      - "tpiu"
+      # - "etb" - Not supported yet
   portconfig:
     type: int
-    default: 3
     description: TPIU clock divider - TDD HSFLL / 2^(2 + portconfig)
     enum:
       - 0
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 12da886e38e..a5241adb6dc 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -10,7 +10,6 @@
 #include <zephyr/dt-bindings/misc/nordic-nrf-ficr-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-domain-id-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-owner-id-nrf54h20.h>
-#include <zephyr/dt-bindings/misc/nordic-tddconf.h>
 
 /delete-node/ &sw_pwm;
 
diff --git a/include/zephyr/dt-bindings/misc/nordic-tddconf.h b/include/zephyr/dt-bindings/misc/nordic-tddconf.h
deleted file mode 100644
index b1b45b99252..00000000000
--- a/include/zephyr/dt-bindings/misc/nordic-tddconf.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_MISC_NORDIC_TDDCONF_H_
-
-#define NRF_TDDCONF_SOURCE_STMMAINCORE BIT(0)
-#define NRF_TDDCONF_SOURCE_ETMMAINCORE BIT(1)
-#define NRF_TDDCONF_SOURCE_STMHWEVENTS BIT(2)
-#define NRF_TDDCONF_SOURCE_STMPPR      BIT(3)
-#define NRF_TDDCONF_SOURCE_STMFLPR     BIT(4)
-
-#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_MISC_NORDIC_TDDCONF_H_ */
diff --git a/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay b/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay
index d620b83872f..bedc93411c9 100644
--- a/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay
+++ b/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay
@@ -9,7 +9,6 @@
 
 &tddconf {
 	status = "okay";
-	etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE | NRF_TDDCONF_SOURCE_STMPPR |
-		NRF_TDDCONF_SOURCE_STMFLPR)>;
+	stmsink = "etr";
 	portconfig = <0>;
 };
diff --git a/snippets/nordic-log-stm-dict/boards/nrf54h20_cpurad.overlay b/snippets/nordic-log-stm-dict/boards/nrf54h20_cpurad.overlay
deleted file mode 100644
index 5bdeddd3c07..00000000000
--- a/snippets/nordic-log-stm-dict/boards/nrf54h20_cpurad.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&tddconf {
-	status = "okay";
-	etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE)>;
-};
diff --git a/snippets/nordic-log-stm-dict/snippet.yml b/snippets/nordic-log-stm-dict/snippet.yml
index a482498d1e9..5bacbaf5af0 100644
--- a/snippets/nordic-log-stm-dict/snippet.yml
+++ b/snippets/nordic-log-stm-dict/snippet.yml
@@ -6,6 +6,3 @@ boards:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpuapp.overlay
       EXTRA_CONF_FILE: boards/nrf54h20_cpuapp.conf
-  /.*/nrf54h20/cpurad/:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpurad.overlay
diff --git a/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay b/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay
index d620b83872f..bedc93411c9 100644
--- a/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay
+++ b/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay
@@ -9,7 +9,6 @@
 
 &tddconf {
 	status = "okay";
-	etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE | NRF_TDDCONF_SOURCE_STMPPR |
-		NRF_TDDCONF_SOURCE_STMFLPR)>;
+	stmsink = "etr";
 	portconfig = <0>;
 };
diff --git a/snippets/nordic-log-stm/boards/nrf54h20_cpurad.overlay b/snippets/nordic-log-stm/boards/nrf54h20_cpurad.overlay
deleted file mode 100644
index 5bdeddd3c07..00000000000
--- a/snippets/nordic-log-stm/boards/nrf54h20_cpurad.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&tddconf {
-	status = "okay";
-	etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE)>;
-};
diff --git a/snippets/nordic-log-stm/snippet.yml b/snippets/nordic-log-stm/snippet.yml
index e2ff7b6f8a1..1cd65087bcc 100644
--- a/snippets/nordic-log-stm/snippet.yml
+++ b/snippets/nordic-log-stm/snippet.yml
@@ -6,6 +6,3 @@ boards:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpuapp.overlay
       EXTRA_CONF_FILE: boards/nrf54h20_cpuapp.conf
-  /.*/nrf54h20/cpurad/:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpurad.overlay

From 8e5e682fbe13aa71dc48b5d750839b15bccf603d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:11 +0100
Subject: [PATCH 2060/2913] Revert "[nrf fromlist] logging: frontend_stmesp:
 Avoid unaligned word access"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c0841625b8097006c1c4e5df32e3cb41abe60279.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../logging/frontends/log_frontend_stmesp.c   | 70 ++-----------------
 1 file changed, 6 insertions(+), 64 deletions(-)

diff --git a/subsys/logging/frontends/log_frontend_stmesp.c b/subsys/logging/frontends/log_frontend_stmesp.c
index 4042fac853c..e1d3a7a7e8b 100644
--- a/subsys/logging/frontends/log_frontend_stmesp.c
+++ b/subsys/logging/frontends/log_frontend_stmesp.c
@@ -33,10 +33,6 @@ BUILD_ASSERT(sizeof(void *) == sizeof(uint32_t));
 	stmesp_data8(reg, data, timestamp, marked,                                                 \
 		     IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_GUARANTEED_ACCESS))
 
-#define STM_D16(reg, data, timestamp, marked)                                                      \
-	stmesp_data16(reg, data, timestamp, marked,                                                \
-		      IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_GUARANTEED_ACCESS))
-
 #define STM_D32(reg, data, timestamp, marked)                                                      \
 	stmesp_data32(reg, data, timestamp, marked,                                                \
 		      IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_GUARANTEED_ACCESS))
@@ -215,72 +211,18 @@ static int early_package_cb(const void *buf, size_t len, void *ctx)
 
 static inline void write_data(const void *data, size_t len, STMESP_Type *const stm_esp)
 {
-	const uint8_t *p8 = data;
-	const uint32_t *p32;
-	uint32_t unaligned;
-
-	if (!len) {
-		return;
-	}
+	uint32_t *p32 = (uint32_t *)data;
 
-	/* Start by writing using D8 or D16 until pointer is word aligned. */
-	unaligned = (uintptr_t)data & 0x00000003UL;
-	if (unaligned != 0) {
-		unaligned = 4 - unaligned;
-		unaligned = MIN(len, unaligned);
-
-		len -= unaligned;
-
-		switch (unaligned) {
-		case 3:
-			STM_D8(stm_esp, *p8++, false, false);
-			STM_D16(stm_esp, *(uint16_t *)p8, false, false);
-			p8 += sizeof(uint16_t);
-			break;
-		case 2:
-			if (len) {
-				STM_D16(stm_esp, *(uint16_t *)p8, false, false);
-				p8 += sizeof(uint16_t);
-			} else {
-				/* If len 0 then it means that even though 2 bytes are
-				 * to be copied we can have address which is not aligned
-				 * to 2 bytes.
-				 */
-				STM_D8(stm_esp, *p8++, false, false);
-				STM_D8(stm_esp, *p8++, false, false);
-			}
-			break;
-		default:
-			/* 1 byte to align. */
-			STM_D8(stm_esp, *p8++, false, false);
-		}
-	}
-
-	p32 = (const uint32_t *)p8;
-
-	/* Use D32 to write as much data as possible. */
 	while (len >= sizeof(uint32_t)) {
 		STM_D32(stm_esp, *p32++, false, false);
 		len -= sizeof(uint32_t);
 	}
 
-	/* Write tail using D16 or D8. Address is word aligned at that point. */
-	if (len) {
-		p8 = (const uint8_t *)p32;
-		switch (len) {
-		case 2:
-			STM_D16(stm_esp, *(uint16_t *)p8, false, false);
-			p8 += sizeof(uint16_t);
-			break;
-		case 3:
-			STM_D16(stm_esp, *(uint16_t *)p8, false, false);
-			p8 += sizeof(uint16_t);
-			/* fallthrough */
-		default:
-			/* 1 byte to align. */
-			STM_D8(stm_esp, *p8++, false, false);
-			break;
-		}
+	uint8_t *p8 = (uint8_t *)p32;
+
+	while (len > 0) {
+		STM_D8(stm_esp, *p8++, false, false);
+		len--;
 	}
 }
 

From 12443eb6000f5a98e1b42ad1d5112a401fd861e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:11 +0100
Subject: [PATCH 2061/2913] Revert "[nrf fromlist] logging: frontends: stmesp:
 Run clang-format"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 204142bb1f141852f0cbfce368a48dca4814e4d2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../logging/frontends/log_frontend_stmesp.c   | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/subsys/logging/frontends/log_frontend_stmesp.c b/subsys/logging/frontends/log_frontend_stmesp.c
index e1d3a7a7e8b..389f0f72aeb 100644
--- a/subsys/logging/frontends/log_frontend_stmesp.c
+++ b/subsys/logging/frontends/log_frontend_stmesp.c
@@ -26,15 +26,15 @@ BUILD_ASSERT(sizeof(void *) == sizeof(uint32_t));
 
 #define STMESP_FLUSH_WORD 0xaabbccdd
 
-#define STM_FLAG(reg)                                                                              \
+#define STM_FLAG(reg) \
 	stmesp_flag(reg, 1, false, IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_GUARANTEED_ACCESS))
 
-#define STM_D8(reg, data, timestamp, marked)                                                       \
-	stmesp_data8(reg, data, timestamp, marked,                                                 \
+#define STM_D8(reg, data, timestamp, marked)       \
+	stmesp_data8(reg, data, timestamp, marked, \
 		     IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_GUARANTEED_ACCESS))
 
-#define STM_D32(reg, data, timestamp, marked)                                                      \
-	stmesp_data32(reg, data, timestamp, marked,                                                \
+#define STM_D32(reg, data, timestamp, marked)       \
+	stmesp_data32(reg, data, timestamp, marked, \
 		      IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_GUARANTEED_ACCESS))
 
 /* Buffer for storing frontend data before STM/ETR is ready for usage.
@@ -95,7 +95,7 @@ union stm_log_dict_hdr {
 /* Dictionary header initializer. */
 #define DICT_HDR_INITIALIZER(_level, _source_id, _data_len)                                        \
 	{                                                                                          \
-		.hdr = {.ver = CONFIG_LOG_FRONTEND_STMESP_DICT_VER,                                \
+		.hdr = {.ver = CONFIG_LOG_FRONTEND_STMESP_DICT_VER,                         \
 			.type = STM_MSG_TYPE_LOG_DICT,                                             \
 			.level = _level,                                                           \
 			.data_len = _data_len,                                                     \
@@ -281,8 +281,8 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
 	size_t sname_len;
 	int package_len;
 	int total_len;
-	static const uint32_t flags =
-		CBPRINTF_PACKAGE_CONVERT_RW_STR | CBPRINTF_PACKAGE_CONVERT_RO_STR;
+	static const uint32_t flags = CBPRINTF_PACKAGE_CONVERT_RW_STR |
+				      CBPRINTF_PACKAGE_CONVERT_RO_STR;
 
 	sname = log_source_name_get(0, get_source_id(source));
 	if (sname) {
@@ -293,8 +293,8 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
 	}
 	total_len = desc.data_len + sname_len /* null terminator */;
 
-	package_len = cbprintf_package_convert(package, desc.package_len, NULL, NULL, flags, strl,
-					       ARRAY_SIZE(strl));
+	package_len = cbprintf_package_convert(package, desc.package_len, NULL, NULL, flags,
+					       strl, ARRAY_SIZE(strl));
 	hdr.log.total_len = total_len + package_len;
 	hdr.log.package_len = package_len;
 
@@ -308,8 +308,8 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
 		}
 
 		STM_D32(stm_esp, hdr.raw, use_timestamp, true);
-		(void)cbprintf_package_convert(package, desc.package_len, package_cb, stm_esp,
-					       flags, strl, ARRAY_SIZE(strl));
+		(void)cbprintf_package_convert(package, desc.package_len,
+					       package_cb, stm_esp, flags, strl, ARRAY_SIZE(strl));
 		write_data(sname, sname_len, stm_esp);
 		if (data) {
 			write_data(data, desc.data_len, stm_esp);
@@ -327,8 +327,8 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
 		}
 
 		early_buf_put_data((const uint8_t *)&hdr, sizeof(hdr));
-		(void)cbprintf_package_convert(package, desc.package_len, early_package_cb, NULL,
-					       flags, strl, ARRAY_SIZE(strl));
+		(void)cbprintf_package_convert(package, desc.package_len, early_package_cb,
+					       NULL, flags, strl, ARRAY_SIZE(strl));
 		early_buf_put_data(sname, sname_len);
 		if (data) {
 			early_buf_put_data(data, desc.data_len);
@@ -357,8 +357,8 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
 		}
 
 		STM_D32(stm_esp, dict_desc.raw, true, true);
-		(void)cbprintf_package_convert(package, desc.package_len, package_cb, stm_esp,
-					       flags, NULL, 0);
+		(void)cbprintf_package_convert(package, desc.package_len, package_cb,
+					       stm_esp, flags, NULL, 0);
 		if (data) {
 			package_cb(data, desc.data_len, stm_esp);
 		}
@@ -370,8 +370,8 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
 		key = k_spin_lock(&lock);
 		len_loc = early_buf_len_loc();
 		early_package_cb(&dict_desc.raw, sizeof(dict_desc.raw), NULL);
-		(void)cbprintf_package_convert(package, desc.package_len, early_package_cb, NULL,
-					       flags, NULL, 0);
+		(void)cbprintf_package_convert(package, desc.package_len, early_package_cb,
+					       NULL, flags, NULL, 0);
 		if (data) {
 			early_package_cb(data, desc.data_len, NULL);
 		}
@@ -383,8 +383,8 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
 /* Common function for optimized message (log with 0-2 arguments) which is used in
  * case when STMESP is not yet ready.
  */
-static inline uint32_t *early_msg_start(uint32_t level, const void *source, uint32_t package_hdr,
-					const char *fmt)
+static inline uint32_t *early_msg_start(uint32_t level, const void *source,
+					uint32_t package_hdr, const char *fmt)
 {
 	union stm_log_dict_hdr dict_desc = DICT_HDR_INITIALIZER(level, get_source_id(source), 0);
 	uint32_t fmt32 = (uint32_t)fmt;
@@ -398,8 +398,8 @@ static inline uint32_t *early_msg_start(uint32_t level, const void *source, uint
 }
 
 /* Common function for optimized message (log with 0-2 arguments) which writes to STMESP */
-static inline void msg_start(STMESP_Type *stm_esp, uint32_t level, const void *source,
-			     uint32_t package_hdr, const char *fmt)
+static inline void msg_start(STMESP_Type *stm_esp, uint32_t level,
+			     const void *source, uint32_t package_hdr, const char *fmt)
 
 {
 	union stm_log_dict_hdr dict_desc = DICT_HDR_INITIALIZER(level, get_source_id(source), 0);

From 3f10f8c00a502bbf9d3cf46de28798fe4e794090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:11 +0100
Subject: [PATCH 2062/2913] Revert "[nrf fromlist] logging: frontend:
 stmesp_demux: Improve robustness"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6bbdba51b3814205de6492d2de61cfba21b805b9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/logging/frontends/Kconfig              |  6 ----
 .../frontends/log_frontend_stmesp_demux.c     | 35 +------------------
 2 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/subsys/logging/frontends/Kconfig b/subsys/logging/frontends/Kconfig
index 9d4b7a43797..e5c3870b1b6 100644
--- a/subsys/logging/frontends/Kconfig
+++ b/subsys/logging/frontends/Kconfig
@@ -95,12 +95,6 @@ config LOG_FRONTEND_STMESP_DEMUX_BUFFER_SIZE
 config LOG_FRONTEND_STMESP_DEMUX_MAX_UTILIZATION
 	bool "Track maximum utilization"
 
-config LOG_FRONTEND_STMESP_DEMUX_GC_TIMEOUT
-	int "Message timeout (in milliseconds)"
-	default 100
-	help
-	  If log message is not completed within that time frame it is discarded.
-
 endif # LOG_FRONTEND_STMESP_DEMUX
 
 config LOG_FRONTEND_STMESP_FLUSH_PORT_ID
diff --git a/subsys/logging/frontends/log_frontend_stmesp_demux.c b/subsys/logging/frontends/log_frontend_stmesp_demux.c
index a3c052eab25..ed09f89ec8e 100644
--- a/subsys/logging/frontends/log_frontend_stmesp_demux.c
+++ b/subsys/logging/frontends/log_frontend_stmesp_demux.c
@@ -25,7 +25,6 @@ BUILD_ASSERT(sizeof(struct log_frontend_stmesp_demux_log_header) == sizeof(uint3
 struct log_frontend_stmesp_demux_active_entry {
 	sys_snode_t node;
 	uint32_t m_ch;
-	uint32_t ts;
 	struct log_frontend_stmesp_demux_log *packet;
 	int off;
 };
@@ -222,36 +221,6 @@ static void log_frontend_stmesp_demux_hw_event(uint64_t *ts, uint8_t data)
 	mpsc_pbuf_put_data(&demux.pbuf, (const uint32_t *)&packet, wlen);
 }
 
-/* Check if there are any active messages which are not completed for a significant
- * amount of time. It may indicate that part of message was lost (due to reset,
- * fault in the core or fault on the bus). In that case message shall be closed as
- * incomplete to not block processing of other messages.
- */
-static void garbage_collector(uint32_t now)
-{
-	sys_snode_t *node;
-
-	SYS_SLIST_FOR_EACH_NODE(&demux.active_entries, node) {
-		struct log_frontend_stmesp_demux_active_entry *entry =
-			CONTAINER_OF(node, struct log_frontend_stmesp_demux_active_entry, node);
-
-		if ((now - entry->ts) > CONFIG_LOG_FRONTEND_STMESP_DEMUX_GC_TIMEOUT) {
-			union log_frontend_stmesp_demux_packet p = {.log = entry->packet};
-
-			sys_slist_find_and_remove(&demux.active_entries, node);
-			entry->packet->content_invalid = 1;
-			mpsc_pbuf_commit(&demux.pbuf, p.generic);
-			demux.dropped++;
-			k_mem_slab_free(&demux.mslab, entry);
-			/* After removing one we need to stop as removing disrupts
-			 * iterating over the list as current node is no longer in
-			 * the list.
-			 */
-			break;
-		}
-	}
-}
-
 int log_frontend_stmesp_demux_packet_start(uint32_t *data, uint64_t *ts)
 {
 	if (skip) {
@@ -296,10 +265,9 @@ int log_frontend_stmesp_demux_packet_start(uint32_t *data, uint64_t *ts)
 	union log_frontend_stmesp_demux_header hdr = {.raw = *data};
 	uint32_t pkt_len = hdr.log.total_len + offsetof(struct log_frontend_stmesp_demux_log, data);
 	uint32_t wlen = calc_wlen(pkt_len);
-	uint32_t now = k_uptime_get_32();
 
-	garbage_collector(now);
 	err = k_mem_slab_alloc(&demux.mslab, (void **)&entry, K_NO_WAIT);
+
 	if (err < 0) {
 		goto on_nomem;
 	}
@@ -320,7 +288,6 @@ int log_frontend_stmesp_demux_packet_start(uint32_t *data, uint64_t *ts)
 	}
 	entry->packet->hdr = hdr.log;
 	entry->packet->hdr.major = m;
-	entry->ts = now;
 	demux.curr = entry;
 	sys_slist_append(&demux.active_entries, &entry->node);
 

From 657e606906b62a90aa4f6b9316693d5e89f4cace Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:11 +0100
Subject: [PATCH 2063/2913] Revert "[nrf fromlist] tests: kernel: timer:
 Exclude nRF54H20 PPR core"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a48638a5ef26936ed3f58ca6678ea929d1710eaa.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/kernel/timer/timer_api/Kconfig            | 3 ---
 tests/kernel/timer/timer_behavior/testcase.yaml | 2 --
 2 files changed, 5 deletions(-)

diff --git a/tests/kernel/timer/timer_api/Kconfig b/tests/kernel/timer/timer_api/Kconfig
index 7854b2cacd7..9a0bfb8c74d 100644
--- a/tests/kernel/timer/timer_api/Kconfig
+++ b/tests/kernel/timer/timer_api/Kconfig
@@ -4,7 +4,4 @@
 config SYS_CLOCK_TICKS_PER_SEC
 	default 16384 if NRF_RTC_TIMER && TICKLESS_KERNEL
 
-config ASSERT_VERBOSE
-	default n if SOC_NRF54H20_CPUPPR
-
 source "Kconfig.zephyr"
diff --git a/tests/kernel/timer/timer_behavior/testcase.yaml b/tests/kernel/timer/timer_behavior/testcase.yaml
index 40fcde82256..7e1b725ffba 100644
--- a/tests/kernel/timer/timer_behavior/testcase.yaml
+++ b/tests/kernel/timer/timer_behavior/testcase.yaml
@@ -8,8 +8,6 @@ tests:
       - mcu
     simulation_exclude:
       - renode
-    platform_exclude:
-      - nrf54h20dk/nrf54h20/cpuppr
     harness_config:
       record:
         regex: "RECORD:(?P<metrics>.*)"

From 2a6a1b314fca7f6b42127b4c735941b8e5b52277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:11 +0100
Subject: [PATCH 2064/2913] Revert "[nrf fromlist] tests: kernel: timer: Fix
 failing tests"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d25622a3428c4e8971e7046a2864690fae25668b.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/kernel/timer/timer_api/src/main.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/tests/kernel/timer/timer_api/src/main.c b/tests/kernel/timer/timer_api/src/main.c
index 90ef86a2986..b996baa72e3 100644
--- a/tests/kernel/timer/timer_api/src/main.c
+++ b/tests/kernel/timer/timer_api/src/main.c
@@ -28,22 +28,15 @@ struct timer_data {
  */
 #define INEXACT_MS_CONVERT ((CONFIG_SYS_CLOCK_TICKS_PER_SEC % MSEC_PER_SEC) != 0)
 
-#if CONFIG_ARCH_HAS_CUSTOM_BUSY_WAIT && CONFIG_NRF_RTC_TIMER
-/* On Nordic SOCs using RTC_TIMER as the system timer and custom k_busy_wait() implementation,
- * one or both of the tick and busy-wait clocks may derive from sources that have slews that
- * sum to +/- 13%.
+#if CONFIG_NRF_RTC_TIMER
+/* On Nordic SOCs one or both of the tick and busy-wait clocks may
+ * derive from sources that have slews that sum to +/- 13%.
  */
 #define BUSY_TICK_SLEW_PPM 130000U
-#elif CONFIG_ARCH_HAS_CUSTOM_BUSY_WAIT && CONFIG_NRF_GRTC_TIMER
-/* On Nordic SOCs using GRTC_TIMER as the system timer and custom k_busy_wait() implementation,
- * one or both of the tick and busy-wait clocks may derive from sources that have slews that
- * sum to +/- 2%.
- */
-#define BUSY_TICK_SLEW_PPM 20000U
 #else
-/* In other cases assume the clocks are perfectly aligned. */
+/* On other platforms assume the clocks are perfectly aligned. */
 #define BUSY_TICK_SLEW_PPM 0U
-#endif /* CONFIG_ARCH_HAS_CUSTOM_BUSY_WAIT && CONFIG_NRF_RTC_TIMER */
+#endif
 #define PPM_DIVISOR 1000000U
 
 /* If the tick clock is faster or slower than the busywait clock the

From 38097e09e58f885ba2e1425802ba3c8a828c070f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:11 +0100
Subject: [PATCH 2065/2913] Revert "[nrf fromlist] test: drivers: pwm: add fast
 PWM"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 94e326f29d8f1e71dcbce75d104da799ccbec4fd.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf54h20dk_nrf54h20_cpuapp_fast.overlay   | 21 -------------------
 tests/drivers/pwm/pwm_api/testcase.yaml       |  4 ----
 2 files changed, 25 deletions(-)
 delete mode 100644 tests/drivers/pwm/pwm_api/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay

diff --git a/tests/drivers/pwm/pwm_api/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/drivers/pwm/pwm_api/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
deleted file mode 100644
index c4e2cb8c38b..00000000000
--- a/tests/drivers/pwm/pwm_api/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
+++ /dev/null
@@ -1,21 +0,0 @@
-&pinctrl {
-	pwm_default: pwm_default {
-		group1 {
-			psels = <NRF_PSEL(PWM_OUT0, 7, 0)>;
-		};
-	};
-	pwm_sleep: pwm_sleep {
-		group1 {
-			psels = <NRF_PSEL(PWM_OUT0, 7, 0)>;
-			low-power-enable;
-		};
-	};
-};
-
-&pwm120 {
-	status = "okay";
-	pinctrl-0 = <&pwm_default>;
-	pinctrl-1 = <&pwm_sleep>;
-	pinctrl-names = "default", "sleep";
-	memory-regions = <&dma_fast_region>;
-};
diff --git a/tests/drivers/pwm/pwm_api/testcase.yaml b/tests/drivers/pwm/pwm_api/testcase.yaml
index b30458cc970..c9f3ac62e39 100644
--- a/tests/drivers/pwm/pwm_api/testcase.yaml
+++ b/tests/drivers/pwm/pwm_api/testcase.yaml
@@ -21,7 +21,3 @@ tests:
       or dt_alias_exists("pwm-3")) and CONFIG_DT_HAS_NXP_FLEXIO_ENABLED and
       CONFIG_DT_HAS_NXP_FLEXIO_PWM_ENABLED
     depends_on: pwm
-  drivers.pwm.pwm_fast:
-    extra_args: DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
-    platform_allow:
-      - nrf54h20dk/nrf54h20/cpuapp

From 28da12a6e05e8f24a160bbbc05104fde03827087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:11 +0100
Subject: [PATCH 2066/2913] Revert "[nrf fromlist] scripts: list_boards:
 Reintroduce Board.dir as @property"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2b3736860fc0bf8c38033bfe836f503cc0cc1298.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/list_boards.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/scripts/list_boards.py b/scripts/list_boards.py
index c2b8e3740b3..23859e00cce 100755
--- a/scripts/list_boards.py
+++ b/scripts/list_boards.py
@@ -103,13 +103,6 @@ class Board:
     socs: List[Soc] = field(default_factory=list, compare=False)
     variants: List[str] = field(default_factory=list, compare=False)
 
-    @property
-    def dir(self):
-        # Get the main board directory.
-        if isinstance(self.directories, Path):
-            return self.directories
-        return self.directories[0]
-
     def from_qualifier(self, qualifiers):
         qualifiers_list = qualifiers.split('/')
 

From 99c299ef6404529e1d40034b6962a67ec857974a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:11 +0100
Subject: [PATCH 2067/2913] Revert "[nrf fromlist] sysbuild: dts: Introduce
 sysbuild_dt_* API"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 38fdd95d663c18f37719d92671cb02d539d06313.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/modules/extensions.cmake                | 71 +++-------------
 .../cmake/modules/sysbuild_extensions.cmake   | 85 -------------------
 2 files changed, 12 insertions(+), 144 deletions(-)

diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index b9812d84379..4d8422a3ced 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -3611,9 +3611,6 @@ endfunction()
 #   alias at the beginning of a path interchangeably with the full
 #   path to the aliased node in these functions. The usage comments
 #   will make this clear in each case.
-#
-# - Each of these methods also has a sysbuild_dt_* counterpart.
-#   See share/sysbuild/cmake/modules/sysbuild_extensions.cmake.
 
 # Usage:
 #   dt_nodelabel(<var> NODELABEL <label>)
@@ -3641,10 +3638,6 @@ endfunction()
 # NODELABEL <label>  : Node label
 # REQUIRED           : Generate a fatal error if the node-label is not found
 function(dt_nodelabel var)
-  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
-    message(FATAL_ERROR "dt_nodelabel(${ARGV0} ...) devicetree is not available.")
-  endif()
-
   set(options "REQUIRED")
   set(req_single_args "NODELABEL")
   cmake_parse_arguments(DT_LABEL "${options}" "${req_single_args}" "" ${ARGN})
@@ -3661,7 +3654,7 @@ function(dt_nodelabel var)
     endif()
   endforeach()
 
-  get_target_property(${var} "${DEVICETREE_TARGET}" "DT_NODELABEL|${DT_LABEL_NODELABEL}")
+  get_target_property(${var} devicetree_target "DT_NODELABEL|${DT_LABEL_NODELABEL}")
   if(${${var}} STREQUAL ${var}-NOTFOUND)
     if(DT_LABEL_REQUIRED)
       message(FATAL_ERROR "required nodelabel not found: ${DT_LABEL_NODELABEL}")
@@ -3693,10 +3686,6 @@ endfunction()
 # PROPERTY <prop> : The alias to check
 # REQUIRED        : Generate a fatal error if the alias is not found
 function(dt_alias var)
-  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
-    message(FATAL_ERROR "dt_alias(${ARGV0} ...) devicetree is not available.")
-  endif()
-
   set(options "REQUIRED")
   set(req_single_args "PROPERTY")
   cmake_parse_arguments(DT_ALIAS "${options}" "${req_single_args}" "" ${ARGN})
@@ -3713,7 +3702,7 @@ function(dt_alias var)
     endif()
   endforeach()
 
-  get_target_property(${var} "${DEVICETREE_TARGET}" "DT_ALIAS|${DT_ALIAS_PROPERTY}")
+  get_target_property(${var} devicetree_target "DT_ALIAS|${DT_ALIAS_PROPERTY}")
   if(${${var}} STREQUAL ${var}-NOTFOUND)
     if(DT_ALIAS_REQUIRED)
       message(FATAL_ERROR "required alias not found: ${DT_ALIAS_PROPERTY}")
@@ -3741,10 +3730,6 @@ endfunction()
 # <var>       : Return variable where the check result will be returned
 # PATH <path> : Node path
 function(dt_node_exists var)
-  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
-    message(FATAL_ERROR "dt_node_exists(${ARGV0} ...) devicetree is not available.")
-  endif()
-
   set(req_single_args "PATH")
   cmake_parse_arguments(DT_NODE "" "${req_single_args}" "" ${ARGN})
 
@@ -3790,10 +3775,6 @@ endfunction()
 # PATH <path>     : Node path
 # STATUS <status> : Status to check
 function(dt_node_has_status var)
-  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
-    message(FATAL_ERROR "dt_node_has_status(${ARGV0} ...) devicetree is not available.")
-  endif()
-
   set(req_single_args "PATH;STATUS")
   cmake_parse_arguments(DT_NODE "" "${req_single_args}" "" ${ARGN})
 
@@ -3880,10 +3861,6 @@ endfunction()
 # INDEX <idx>    : Optional index when retrieving a value in an array property
 # REQUIRED       : Generate a fatal error if the property is not found
 function(dt_prop var)
-  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
-    message(FATAL_ERROR "dt_prop(${ARGV0} ...) devicetree is not available.")
-  endif()
-
   set(options "REQUIRED")
   set(req_single_args "PATH;PROPERTY")
   set(single_args "INDEX")
@@ -3902,7 +3879,7 @@ function(dt_prop var)
   endforeach()
 
   dt_path_internal(canonical "${DT_PROP_PATH}")
-  get_property(exists TARGET "${DEVICETREE_TARGET}"
+  get_property(exists TARGET devicetree_target
       PROPERTY "DT_PROP|${canonical}|${DT_PROP_PROPERTY}"
       SET
   )
@@ -3915,7 +3892,7 @@ function(dt_prop var)
     return()
   endif()
 
-  get_target_property(val "${DEVICETREE_TARGET}"
+  get_target_property(val devicetree_target
       "DT_PROP|${canonical}|${DT_PROP_PROPERTY}"
   )
 
@@ -3944,10 +3921,6 @@ endfunction()
 # INDEX <idx>            : Optional index when retrieving a value in an array property
 
 function(dt_comp_path var)
-  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
-    message(FATAL_ERROR "dt_comp_path(${ARGV0} ...) devicetree is not available.")
-  endif()
-
   set(req_single_args "COMPATIBLE")
   set(single_args "INDEX")
   cmake_parse_arguments(DT_COMP "" "${req_single_args};${single_args}" "" ${ARGN})
@@ -3964,7 +3937,7 @@ function(dt_comp_path var)
     endif()
   endforeach()
 
-  get_property(exists TARGET "${DEVICETREE_TARGET}"
+  get_property(exists TARGET devicetree_target
       PROPERTY "DT_COMP|${DT_COMP_COMPATIBLE}"
       SET
   )
@@ -3974,7 +3947,7 @@ function(dt_comp_path var)
     return()
   endif()
 
-  get_target_property(val "${DEVICETREE_TARGET}"
+  get_target_property(val devicetree_target
       "DT_COMP|${DT_COMP_COMPATIBLE}"
   )
 
@@ -4003,10 +3976,6 @@ endfunction()
 # <var>          : Return variable where the property value will be stored
 # PATH <path>    : Node path
 function(dt_num_regs var)
-  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
-    message(FATAL_ERROR "dt_num_regs(${ARGV0} ...) devicetree is not available.")
-  endif()
-
   set(req_single_args "PATH")
   cmake_parse_arguments(DT_REG "" "${req_single_args}" "" ${ARGN})
 
@@ -4023,7 +3992,7 @@ function(dt_num_regs var)
   endforeach()
 
   dt_path_internal(canonical "${DT_REG_PATH}")
-  get_target_property(${var} "${DEVICETREE_TARGET}" "DT_REG|${canonical}|NUM")
+  get_target_property(${var} devicetree_target "DT_REG|${canonical}|NUM")
 
   set(${var} ${${var}} PARENT_SCOPE)
 endfunction()
@@ -4053,10 +4022,6 @@ endfunction()
 # INDEX <idx>    : Register block index number
 # NAME <name>    : Register block name
 function(dt_reg_addr var)
-  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
-    message(FATAL_ERROR "dt_reg_addr(${ARGV0} ...) devicetree is not available.")
-  endif()
-
   set(req_single_args "PATH")
   set(single_args "INDEX;NAME")
   cmake_parse_arguments(DT_REG "" "${req_single_args};${single_args}" "" ${ARGN})
@@ -4086,7 +4051,7 @@ function(dt_reg_addr var)
   endif()
 
   dt_path_internal(canonical "${DT_REG_PATH}")
-  get_target_property(${var}_list "${DEVICETREE_TARGET}" "DT_REG|${canonical}|ADDR")
+  get_target_property(${var}_list devicetree_target "DT_REG|${canonical}|ADDR")
 
   list(GET ${var}_list ${DT_REG_INDEX} ${var})
 
@@ -4117,10 +4082,6 @@ endfunction()
 # INDEX <idx>    : Register block index number
 # NAME <name>    : Register block name
 function(dt_reg_size var)
-  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
-    message(FATAL_ERROR "dt_reg_size(${ARGV0} ...) devicetree is not available.")
-  endif()
-
   set(req_single_args "PATH")
   set(single_args "INDEX;NAME")
   cmake_parse_arguments(DT_REG "" "${req_single_args};${single_args}" "" ${ARGN})
@@ -4150,7 +4111,7 @@ function(dt_reg_size var)
   endif()
 
   dt_path_internal(canonical "${DT_REG_PATH}")
-  get_target_property(${var}_list "${DEVICETREE_TARGET}" "DT_REG|${canonical}|SIZE")
+  get_target_property(${var}_list devicetree_target "DT_REG|${canonical}|SIZE")
 
   list(GET ${var}_list ${DT_REG_INDEX} ${var})
 
@@ -4198,10 +4159,6 @@ endfunction()
 # <var>           : Return variable
 # PROPERTY <prop> : Chosen property
 function(dt_has_chosen var)
-  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
-    message(FATAL_ERROR "dt_has_chosen(${ARGV0} ...) devicetree is not available.")
-  endif()
-
   set(req_single_args "PROPERTY")
   cmake_parse_arguments(DT_CHOSEN "" "${req_single_args}" "" ${ARGN})
 
@@ -4217,7 +4174,7 @@ function(dt_has_chosen var)
     endif()
   endforeach()
 
-  get_target_property(exists "${DEVICETREE_TARGET}" "DT_CHOSEN|${DT_CHOSEN_PROPERTY}")
+  get_target_property(exists devicetree_target "DT_CHOSEN|${DT_CHOSEN_PROPERTY}")
 
   if(${exists} STREQUAL exists-NOTFOUND)
     set(${var} FALSE PARENT_SCOPE)
@@ -4237,10 +4194,6 @@ endfunction()
 # <var>           : Return variable where the node path will be stored
 # PROPERTY <prop> : Chosen property
 function(dt_chosen var)
-  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
-    message(FATAL_ERROR "dt_chosen(${ARGV0} ...) devicetree is not available.")
-  endif()
-
   set(req_single_args "PROPERTY")
   cmake_parse_arguments(DT_CHOSEN "" "${req_single_args}" "" ${ARGN})
 
@@ -4256,7 +4209,7 @@ function(dt_chosen var)
     endif()
   endforeach()
 
-  get_target_property(${var} "${DEVICETREE_TARGET}" "DT_CHOSEN|${DT_CHOSEN_PROPERTY}")
+  get_target_property(${var} devicetree_target "DT_CHOSEN|${DT_CHOSEN_PROPERTY}")
 
   if(${${var}} STREQUAL ${var}-NOTFOUND)
     set(${var} PARENT_SCOPE)
@@ -4328,7 +4281,7 @@ endfunction()
 # to an existing node. Set it to FALSE otherwise. See
 # dt_path_internal for a definition and examples of 'canonical' paths.
 function(dt_path_internal_exists var path)
-  get_target_property(path_prop "${DEVICETREE_TARGET}" "DT_NODE|${path}")
+  get_target_property(path_prop devicetree_target "DT_NODE|${path}")
   if (path_prop)
     set(${var} TRUE PARENT_SCOPE)
   else()
diff --git a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
index 0853535a911..c1b2513d192 100644
--- a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
+++ b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
@@ -503,8 +503,6 @@ function(ExternalZephyrProject_Cmake)
   endif()
   load_cache(IMAGE ${ZCMAKE_APPLICATION} BINARY_DIR ${BINARY_DIR})
   import_kconfig(CONFIG_ ${BINARY_DIR}/zephyr/.config TARGET ${ZCMAKE_APPLICATION})
-  set(DEVICETREE_TARGET ${ZCMAKE_APPLICATION}_devicetree_target)
-  include(${BINARY_DIR}/zephyr/dts.cmake)
 
   # This custom target informs CMake how the BYPRODUCTS are generated if a target
   # depends directly on the BYPRODUCT instead of depending on the image target.
@@ -752,86 +750,3 @@ function(sysbuild_images_order variable dependency_type)
   topological_sort(TARGETS ${SIS_IMAGES} PROPERTY_NAME ${property_name} RESULT sorted)
   set(${variable} ${sorted} PARENT_SCOPE)
 endfunction()
-
-# Internal macro for defining the sysbuild_dt_* CMake extensions, used to
-# retrieve devicetree information from a Zephyr based build system.
-#
-# It takes a dt_* function <name> and adds common wrapper code, which
-# adds an `IMAGE` argument to select the devicetree of a given <image>,
-# and forwards all other arguments to the original function, including
-# the sole return variable <var> - a common trait of the dt_* API.
-#
-# For additional documentation of each dt_* CMake extension,
-# see section 4.1. of cmake/modules/extensions.cmake.
-#
-macro(sysbuild_dt_function name)
-  function(sysbuild_${name} var)
-    cmake_parse_arguments(PARSE_ARGV 1 SBDT "" "IMAGE" "")
-    zephyr_check_arguments_required_all("sysbuild_${name}" SBDT IMAGE)
-
-    set(DEVICETREE_TARGET ${SBDT_IMAGE}_devicetree_target)
-    if(NOT TARGET ${SBDT_IMAGE} OR NOT TARGET ${DEVICETREE_TARGET})
-      message(FATAL_ERROR "sysbuild_${name}(...) image '${SBDT_IMAGE}' "
-                          "does not exist or its devicetree is not loaded yet"
-      )
-    endif()
-
-    cmake_language(CALL ${name} ${var} ${SBDT_UNPARSED_ARGUMENTS})
-    set(${var} "${${var}}" PARENT_SCOPE)
-  endfunction()
-endmacro()
-
-# Usage:
-#   sysbuild_dt_nodelabel(<var> IMAGE <image> NODELABEL <label>)
-#
-sysbuild_dt_function(dt_nodelabel)
-
-# Usage:
-#   sysbuild_dt_alias(<var> IMAGE <image> PROPERTY <prop>)
-#
-sysbuild_dt_function(dt_alias)
-
-# Usage:
-#   sysbuild_dt_node_exists(<var> IMAGE <image> PATH <path>)
-#
-sysbuild_dt_function(dt_node_exists)
-
-# Usage:
-#   sysbuild_dt_node_has_status(<var> IMAGE <image> PATH <path> STATUS <status>)
-#
-sysbuild_dt_function(dt_node_has_status)
-
-# Usage:
-#   sysbuild_dt_prop(<var> IMAGE <image> PATH <path> PROPERTY <prop> [INDEX <idx>])
-#
-sysbuild_dt_function(dt_prop)
-
-# Usage:
-#   sysbuild_dt_comp_path(<var> IMAGE <image> COMPATIBLE <compatible> [INDEX <idx>])
-#
-sysbuild_dt_function(dt_comp_path)
-
-# Usage:
-#   sysbuild_dt_num_regs(<var> IMAGE <image> PATH <path>)
-#
-sysbuild_dt_function(dt_num_regs)
-
-# Usage:
-#   sysbuild_dt_reg_addr(<var> IMAGE <image> PATH <path> [INDEX <idx>] [NAME <name>])
-#
-sysbuild_dt_function(dt_reg_addr)
-
-# Usage:
-#   sysbuild_dt_reg_size(<var> IMAGE <image> PATH <path> [INDEX <idx>] [NAME <name>])
-#
-sysbuild_dt_function(dt_reg_size)
-
-# Usage:
-#   sysbuild_dt_has_chosen(<var> IMAGE <image> PROPERTY <prop>)
-#
-sysbuild_dt_function(dt_has_chosen)
-
-# Usage:
-#   sysbuild_dt_chosen(<var> IMAGE <image> PROPERTY <prop>)
-#
-sysbuild_dt_function(dt_chosen)

From d789a86bdbbe609621c5132c62eeaf5ec07b7391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:11 +0100
Subject: [PATCH 2068/2913] Revert "[nrf fromlist] scripts: gen_dts_cmake:
 Support variable target name in dts.cmake"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4cd36a95bc22a77be0459eb39a9d725953fd6a57.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/modules/dts.cmake      |  2 --
 scripts/dts/gen_dts_cmake.py | 21 +++++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/cmake/modules/dts.cmake b/cmake/modules/dts.cmake
index 82c5a302fbc..22631ceecbd 100644
--- a/cmake/modules/dts.cmake
+++ b/cmake/modules/dts.cmake
@@ -117,8 +117,6 @@ set(GEN_DTS_CMAKE_SCRIPT        ${DT_SCRIPTS}/gen_dts_cmake.py)
 # The generated information itself, which we include() after
 # creating it.
 set(DTS_CMAKE                   ${PROJECT_BINARY_DIR}/dts.cmake)
-# The CMake target to be initialized by including ${DTS_CMAKE}.
-set(DEVICETREE_TARGET           devicetree_target)
 
 # The location of a file containing known vendor prefixes, relative to
 # each element of DTS_ROOT. Users can define their own in their own
diff --git a/scripts/dts/gen_dts_cmake.py b/scripts/dts/gen_dts_cmake.py
index 653910cbf8d..6fa4a347880 100755
--- a/scripts/dts/gen_dts_cmake.py
+++ b/scripts/dts/gen_dts_cmake.py
@@ -11,13 +11,12 @@
 
 The generated CMake file looks like this:
 
-  add_custom_target(${DEVICETREE_TARGET})
-  set_target_properties(${DEVICETREE_TARGET} PROPERTIES
+  add_custom_target(devicetree_target)
+  set_target_properties(devicetree_target PROPERTIES
                         "DT_PROP|/soc|compatible" "vnd,soc;")
   ...
 
-It takes an input variable - DEVICETREE_TARGET - and creates a special
-CMake target with this name, which will contain various values in the
+It defines a special CMake target, and saves various values in the
 devicetree as CMake target properties.
 
 Be careful:
@@ -155,13 +154,15 @@ def main():
         cmake_comp = f'DT_COMP|{comp}'
         cmake_props.append(f'"{cmake_comp}" "{cmake_path}"')
 
-    cmake_props = map(
-        'set_target_properties(${{DEVICETREE_TARGET}} PROPERTIES {})'.format,
-        cmake_props
-    )
     with open(args.cmake_out, "w", encoding="utf-8") as cmake_file:
-        print('add_custom_target(${DEVICETREE_TARGET})\n', *cmake_props,
-              sep='\n', file=cmake_file)
+        print('add_custom_target(devicetree_target)', file=cmake_file)
+        print(file=cmake_file)
+
+        for prop in cmake_props:
+            print(
+                f'set_target_properties(devicetree_target PROPERTIES {prop})',
+                file=cmake_file
+            )
 
 
 if __name__ == "__main__":

From 76c99f7b6be63833ff9c70d54dc5a64c1170ce2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:11 +0100
Subject: [PATCH 2069/2913] Revert "[nrf fromlist] scripts: list_hardware: Do
 not check qualifiers for run once config"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b8b1c0b0b69de4df9ab2ee7c62bc80eebd0218f9.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/list_hardware.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/scripts/list_hardware.py b/scripts/list_hardware.py
index 2485985f4b4..2ea2ed9f0c5 100755
--- a/scripts/list_hardware.py
+++ b/scripts/list_hardware.py
@@ -100,13 +100,25 @@ def __init__(self, folder='', soc_yaml=None):
                 for item_data in data['runners']['run_once'][grp]:
                     for group in item_data['groups']:
                         for qualifiers in group['qualifiers']:
-                            soc_name = qualifiers.split('/')[0]
+                            soc_name, *components = qualifiers.split('/')
                             found_match = False
 
+                            # Allow 'ns' as final qualifier until "virtual" CPUs are ported to soc.yml
+                            # https://github.com/zephyrproject-rtos/zephyr/issues/70721
+                            if components and components[-1] == 'ns':
+                                components.pop()
+
                             for soc in self._socs + self._extended_socs:
                                 if re.match(fr'^{soc_name}$', soc.name) is not None:
-                                    found_match = True
-                                    break
+                                    if soc.cpuclusters and components:
+                                        check_string = '/'.join(components)
+                                        for cpucluster in soc.cpuclusters:
+                                            if re.match(fr'^{check_string}$', cpucluster) is not None:
+                                                found_match = True
+                                                break
+                                    elif not soc.cpuclusters and not components:
+                                        found_match = True
+                                        break
 
                             if found_match is False:
                                 sys.exit(f'ERROR: SoC qualifier match unresolved: {qualifiers}')

From 6738028b2b2091c0e06e949f6a2aa5f26a75e041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:11 +0100
Subject: [PATCH 2070/2913] Revert "[nrf fromlist] scripts: west_commands: run:
 Add priority to run once config"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0431663b1be49be3b3a4bf0138970353be14d425.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/schemas/board-schema.yml    |   5 --
 scripts/schemas/soc-schema.yml      |   5 --
 scripts/west_commands/run_common.py | 105 +++++++++++-----------------
 3 files changed, 40 insertions(+), 75 deletions(-)

diff --git a/scripts/schemas/board-schema.yml b/scripts/schemas/board-schema.yml
index 3ca85af73c6..2e578ba2e8a 100644
--- a/scripts/schemas/board-schema.yml
+++ b/scripts/schemas/board-schema.yml
@@ -99,11 +99,6 @@ mapping:
   runners:
     type: map
     mapping:
-      priority:
-        type: int
-        desc: |
-              Priority of this flash run once configuration. The highest value data will be used
-              instead of any with lower priorities. If omitted, will default to 10.
       run_once:
         type: map
         desc: |
diff --git a/scripts/schemas/soc-schema.yml b/scripts/schemas/soc-schema.yml
index 060afea3254..1d8537e8ad2 100644
--- a/scripts/schemas/soc-schema.yml
+++ b/scripts/schemas/soc-schema.yml
@@ -88,11 +88,6 @@ mapping:
   runners:
     type: map
     mapping:
-      priority:
-        type: int
-        desc: |
-              Priority of this flash run once configuration. The highest value data will be used
-              instead of any with lower priorities. If omitted, will default to 0.
       run_once:
         type: map
         desc: |
diff --git a/scripts/west_commands/run_common.py b/scripts/west_commands/run_common.py
index 012f27359d6..772d736c183 100644
--- a/scripts/west_commands/run_common.py
+++ b/scripts/west_commands/run_common.py
@@ -42,10 +42,6 @@
 # Don't change this, or output from argparse won't match up.
 INDENT = ' ' * 2
 
-IGNORED_RUN_ONCE_PRIORITY = -1
-SOC_FILE_RUN_ONCE_DEFAULT_PRIORITY = 0
-BOARD_FILE_RUN_ONCE_DEFAULT_PRIORITY = 10
-
 if log.VERBOSE >= log.VERBOSE_NORMAL:
     # Using level 1 allows sub-DEBUG levels of verbosity. The
     # west.log module decides whether or not to actually print the
@@ -100,13 +96,6 @@ class ImagesFlashed:
     flashed: int = 0
     total: int = 0
 
-@dataclass
-class SocBoardFilesProcessing:
-    filename: str
-    board: bool = False
-    priority: int = IGNORED_RUN_ONCE_PRIORITY
-    yaml: object = None
-
 def command_verb(command):
     return "flash" if command.name == "flash" else "debug"
 
@@ -189,10 +178,6 @@ def do_run_common(command, user_args, user_runner_args, domain_file=None):
     # images for a given board.
     board_image_count = defaultdict(ImagesFlashed)
 
-    highest_priority = IGNORED_RUN_ONCE_PRIORITY
-    highest_entry = None
-    check_files = []
-
     if user_args.context:
         dump_context(command, user_args, user_runner_args)
         return
@@ -238,58 +223,48 @@ def do_run_common(command, user_args, user_runner_args, domain_file=None):
             # Load board flash runner configuration (if it exists) and store
             # single-use commands in a dictionary so that they get executed
             # once per unique board name.
-            for directory in cache.get_list('SOC_DIRECTORIES'):
-                if directory not in processed_boards:
-                    check_files.append(SocBoardFilesProcessing(Path(directory) / 'soc.yml'))
-                    processed_boards.add(directory)
-
-            for directory in cache.get_list('BOARD_DIRECTORIES'):
-                if directory not in processed_boards:
-                    check_files.append(SocBoardFilesProcessing(Path(directory) / 'board.yml', True))
-                    processed_boards.add(directory)
-
-        for check in check_files:
-            try:
-                with open(check.filename, 'r') as f:
-                    check.yaml = yaml.safe_load(f.read())
-
-                    if 'runners' not in check.yaml:
-                        continue
-                    elif check.board is False and 'run_once' not in check.yaml['runners']:
+            if cache['BOARD_DIR'] not in processed_boards and 'SOC_FULL_DIR' in cache:
+                soc_yaml_file = Path(cache['SOC_FULL_DIR']) / 'soc.yml'
+                board_yaml_file = Path(cache['BOARD_DIR']) / 'board.yml'
+                group_type = 'boards'
+
+                # Search for flash runner configuration, board takes priority over SoC
+                try:
+                    with open(board_yaml_file, 'r') as f:
+                        data_yaml = yaml.safe_load(f.read())
+
+                except FileNotFoundError:
+                    continue
+
+                if 'runners' not in data_yaml:
+                    # Check SoC file
+                    group_type = 'qualifiers'
+                    try:
+                        with open(soc_yaml_file, 'r') as f:
+                            data_yaml = yaml.safe_load(f.read())
+
+                    except FileNotFoundError:
                         continue
 
-                    if 'priority' in check.yaml['runners']:
-                        check.priority = check.yaml['runners']['priority']
-                    else:
-                        check.priority = BOARD_FILE_RUN_ONCE_DEFAULT_PRIORITY if check.board is True else SOC_FILE_RUN_ONCE_DEFAULT_PRIORITY
-
-                    if check.priority == highest_priority:
-                        log.die("Duplicate flash run once configuration found with equal priorities")
-
-                    elif check.priority > highest_priority:
-                        highest_priority = check.priority
-                        highest_entry = check
-
-            except FileNotFoundError:
-                continue
-
-        if highest_entry is not None:
-            group_type = 'boards' if highest_entry.board is True else 'qualifiers'
-
-            for cmd in highest_entry.yaml['runners']['run_once']:
-                for data in highest_entry.yaml['runners']['run_once'][cmd]:
-                    for group in data['groups']:
-                        run_first = bool(data['run'] == 'first')
-                        if group_type == 'qualifiers':
-                            targets = []
-                            for target in group[group_type]:
-                                # For SoC-based qualifiers, prepend to the beginning of the
-                                # match to allow for matching any board name
-                                targets.append('([^/]+)/' + target)
-                        else:
-                            targets = group[group_type]
-
-                        used_cmds.append(UsedFlashCommand(cmd, targets, data['runners'], run_first))
+                processed_boards.add(cache['BOARD_DIR'])
+
+                if 'runners' not in data_yaml or 'run_once' not in data_yaml['runners']:
+                    continue
+
+                for cmd in data_yaml['runners']['run_once']:
+                    for data in data_yaml['runners']['run_once'][cmd]:
+                        for group in data['groups']:
+                            run_first = bool(data['run'] == 'first')
+                            if group_type == 'qualifiers':
+                                targets = []
+                                for target in group[group_type]:
+                                    # For SoC-based qualifiers, prepend to the beginning of the
+                                    # match to allow for matching any board name
+                                    targets.append('([^/]+)/' + target)
+                            else:
+                                targets = group[group_type]
+
+                            used_cmds.append(UsedFlashCommand(cmd, targets, data['runners'], run_first))
 
     # Reduce entries to only those having matching board names (either exact or with regex) and
     # remove any entries with empty board lists

From 30ad41d7634aa5cef0ef975276ef13d21d2385fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:11 +0100
Subject: [PATCH 2071/2913] Revert "[nrf fromlist] tests: add twister tests for
 CMake board and SoC extension"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0344c2d91490f58b19ee2aabc7d0bd6297b80303.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/cmake/hwm/board_extend/CMakeLists.txt   |  14 --
 tests/cmake/hwm/board_extend/Kconfig          |  15 --
 .../hwm/board_extend/boards/native_sim.conf   |   1 -
 .../boards/native_sim_native_64_two.conf      |   1 -
 .../boards/native_sim_native_one.conf         |   1 -
 .../oot_root/boards/arm/mps2/Kconfig.mps2     |   5 -
 .../oot_root/boards/arm/mps2/board.cmake      |  14 --
 .../oot_root/boards/arm/mps2/board.yml        |   2 -
 .../boards/arm/mps2/mps2_an521-common.dtsi    | 191 ---------------
 .../boards/arm/mps2/mps2_an521_cputest.dts    | 130 -----------
 .../arm/mps2/mps2_an521_cputest_defconfig     |  21 --
 .../boards/native/native_sim_extend/Kconfig   |  30 ---
 .../native_sim_extend/Kconfig.defconfig       |  16 --
 .../boards/native/native_sim_extend/board.yml |   7 -
 .../native_sim_native_64_two.dts              |  14 --
 .../native_sim_native_64_two.yaml             |  25 --
 .../native_sim_native_64_two_defconfig        |   7 -
 .../native_sim_native_one.dts                 | 218 ------------------
 .../native_sim_native_one.yaml                |  25 --
 .../native_sim_native_one_defconfig           |   7 -
 .../board_extend/oot_root/soc/arm/Kconfig.soc |   6 -
 .../hwm/board_extend/oot_root/soc/arm/soc.yml |   4 -
 tests/cmake/hwm/board_extend/prj.conf         |   1 -
 tests/cmake/hwm/board_extend/src/main.c       |  85 -------
 tests/cmake/hwm/board_extend/testcase.yaml    |  33 ---
 25 files changed, 873 deletions(-)
 delete mode 100644 tests/cmake/hwm/board_extend/CMakeLists.txt
 delete mode 100644 tests/cmake/hwm/board_extend/Kconfig
 delete mode 100644 tests/cmake/hwm/board_extend/boards/native_sim.conf
 delete mode 100644 tests/cmake/hwm/board_extend/boards/native_sim_native_64_two.conf
 delete mode 100644 tests/cmake/hwm/board_extend/boards/native_sim_native_one.conf
 delete mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/Kconfig.mps2
 delete mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/board.cmake
 delete mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/board.yml
 delete mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521-common.dtsi
 delete mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest.dts
 delete mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest_defconfig
 delete mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/Kconfig
 delete mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/Kconfig.defconfig
 delete mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/board.yml
 delete mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two.dts
 delete mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two.yaml
 delete mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two_defconfig
 delete mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.dts
 delete mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.yaml
 delete mode 100644 tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one_defconfig
 delete mode 100644 tests/cmake/hwm/board_extend/oot_root/soc/arm/Kconfig.soc
 delete mode 100644 tests/cmake/hwm/board_extend/oot_root/soc/arm/soc.yml
 delete mode 100644 tests/cmake/hwm/board_extend/prj.conf
 delete mode 100644 tests/cmake/hwm/board_extend/src/main.c
 delete mode 100644 tests/cmake/hwm/board_extend/testcase.yaml

diff --git a/tests/cmake/hwm/board_extend/CMakeLists.txt b/tests/cmake/hwm/board_extend/CMakeLists.txt
deleted file mode 100644
index 20bd94d6af0..00000000000
--- a/tests/cmake/hwm/board_extend/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-
-cmake_minimum_required(VERSION 3.20.0)
-
-set(BOARD_ROOT  ${CMAKE_CURRENT_LIST_DIR}/oot_root)
-set(SOC_ROOT  ${CMAKE_CURRENT_LIST_DIR}/oot_root)
-
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(native_sim_extend)
-
-FILE(GLOB app_sources src/*.c)
-target_sources(app PRIVATE ${app_sources})
diff --git a/tests/cmake/hwm/board_extend/Kconfig b/tests/cmake/hwm/board_extend/Kconfig
deleted file mode 100644
index 6bbf5b73227..00000000000
--- a/tests/cmake/hwm/board_extend/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-
-config BASE_BOARD_SETTING
-	bool "Base board test string"
-	help
-	  This kconfig is set when the base board config fragment is supposed to
-	  be sourced, that is when oot variant defines
-	  'extends:'
-	  '  board: native_sim'
-	  '  qualifier: posix'
-	  '  inherit: 1'
-
-source "Kconfig.zephyr"
diff --git a/tests/cmake/hwm/board_extend/boards/native_sim.conf b/tests/cmake/hwm/board_extend/boards/native_sim.conf
deleted file mode 100644
index 71a2b211d0a..00000000000
--- a/tests/cmake/hwm/board_extend/boards/native_sim.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BASE_BOARD_SETTING=y
diff --git a/tests/cmake/hwm/board_extend/boards/native_sim_native_64_two.conf b/tests/cmake/hwm/board_extend/boards/native_sim_native_64_two.conf
deleted file mode 100644
index b2dfe184407..00000000000
--- a/tests/cmake/hwm/board_extend/boards/native_sim_native_64_two.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXTENDED_VARIANT_BOARD_SETTING=y
diff --git a/tests/cmake/hwm/board_extend/boards/native_sim_native_one.conf b/tests/cmake/hwm/board_extend/boards/native_sim_native_one.conf
deleted file mode 100644
index b2dfe184407..00000000000
--- a/tests/cmake/hwm/board_extend/boards/native_sim_native_one.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXTENDED_VARIANT_BOARD_SETTING=y
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/Kconfig.mps2 b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/Kconfig.mps2
deleted file mode 100644
index 448c9cc1308..00000000000
--- a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/Kconfig.mps2
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2017 Linaro Limited
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_MPS2
-	select SOC_MPS2_AN521_CPUTEST if BOARD_MPS2_AN521_CPUTEST
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/board.cmake b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/board.cmake
deleted file mode 100644
index 27c74975756..00000000000
--- a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/board.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright (c) 2024, Nordic Semiconductor ASA
-
-if(CONFIG_BOARD_MPS2_AN521_CPUTEST)
-  set(QEMU_CPU_TYPE_${ARCH} cortex-m33)
-  set(QEMU_FLAGS_${ARCH}
-    -cpu ${QEMU_CPU_TYPE_${ARCH}}
-    -machine mps2-an521
-    -nographic
-    -m 16
-    -vga none
-    )
-endif()
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/board.yml b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/board.yml
deleted file mode 100644
index 05982ac1bb8..00000000000
--- a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/board.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-board:
-  extend: mps2
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521-common.dtsi b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521-common.dtsi
deleted file mode 100644
index 5b1959ff5fe..00000000000
--- a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521-common.dtsi
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (c) 2019 Linaro Limited
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-sysclk: system-clock {
-	compatible = "fixed-clock";
-	clock-frequency = <25000000>;
-	#clock-cells = <0>;
-};
-
-timer0: timer@0 {
-	compatible = "arm,cmsdk-timer";
-	reg = <0x0 0x1000>;
-	interrupts = <3 3>;
-};
-
-timer1: timer@1000 {
-	compatible = "arm,cmsdk-timer";
-	reg = <0x1000 0x1000>;
-	interrupts = <4 3>;
-};
-
-dtimer0: dtimer@2000 {
-	compatible = "arm,cmsdk-dtimer";
-	reg = <0x2000 0x1000>;
-	interrupts = <5 3>;
-};
-
-mhu0: mhu@3000 {
-	compatible = "arm,mhu";
-	reg = <0x3000 0x1000>;
-	interrupts = <6 3>;
-};
-
-mhu1: mhu@4000 {
-	compatible = "arm,mhu";
-	reg = <0x4000 0x1000>;
-	interrupts = <7 3>;
-};
-
-gpio0: gpio@100000 {
-	compatible = "arm,cmsdk-gpio";
-	reg = <0x100000 0x1000>;
-	interrupts = <68 3>;
-	gpio-controller;
-	#gpio-cells = <2>;
-};
-
-gpio1: gpio@101000 {
-	compatible = "arm,cmsdk-gpio";
-	reg = <0x101000 0x1000>;
-	interrupts = <69 3>;
-	gpio-controller;
-	#gpio-cells = <2>;
-};
-
-gpio2: gpio@102000 {
-	compatible = "arm,cmsdk-gpio";
-	reg = <0x102000 0x1000>;
-	interrupts = <70 3>;
-	gpio-controller;
-	#gpio-cells = <2>;
-};
-
-gpio3: gpio@103000 {
-	compatible = "arm,cmsdk-gpio";
-	reg = <0x103000 0x1000>;
-	interrupts = <71 3>;
-	gpio-controller;
-	#gpio-cells = <2>;
-};
-
-wdog0: wdog@81000 {
-	compatible = "arm,cmsdk-watchdog";
-	reg = <0x81000 0x1000>;
-	clocks = <&sysclk>;
-};
-
-uart0: uart@200000 {
-	compatible = "arm,cmsdk-uart";
-	reg = <0x200000 0x1000>;
-	interrupts = <33 3 32 3>;
-	interrupt-names = "tx", "rx";
-	clocks = <&sysclk>;
-	current-speed = <115200>;
-};
-
-uart1: uart@201000 {
-	compatible = "arm,cmsdk-uart";
-	reg = <0x201000 0x1000>;
-	interrupts = <35 3 34 3>;
-	interrupt-names = "tx", "rx";
-	clocks = <&sysclk>;
-	current-speed = <115200>;
-};
-
-uart2: uart@202000 {
-	compatible = "arm,cmsdk-uart";
-	reg = <0x202000 0x1000>;
-	interrupts = <37 3 36 3>;
-	interrupt-names = "tx", "rx";
-	clocks = <&sysclk>;
-	current-speed = <115200>;
-};
-
-uart3: uart@203000 {
-	compatible = "arm,cmsdk-uart";
-	reg = <0x203000 0x1000>;
-	interrupts = <39 3 38 3>;
-	interrupt-names = "tx", "rx";
-	clocks = <&sysclk>;
-	current-speed = <115200>;
-};
-
-uart4: uart@204000 {
-	compatible = "arm,cmsdk-uart";
-	reg = <0x204000 0x1000>;
-	interrupts = <41 3 40 3>;
-	interrupt-names = "tx", "rx";
-	clocks = <&sysclk>;
-	current-speed = <115200>;
-};
-
-i2c_touch: i2c@207000 {
-	compatible = "arm,versatile-i2c";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-	#address-cells = <1>;
-	#size-cells = <0>;
-	reg = <0x207000 0x1000>;
-};
-
-i2c_audio_conf: i2c@208000 {
-	compatible = "arm,versatile-i2c";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-	#address-cells = <1>;
-	#size-cells = <0>;
-	reg = <0x208000 0x1000>;
-};
-
-i2c_shield0: i2c@20c000 {
-	compatible = "arm,versatile-i2c";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-	#address-cells = <1>;
-	#size-cells = <0>;
-	reg = <0x20c000 0x1000>;
-};
-
-i2c_shield1: i2c@20d000 {
-	compatible = "arm,versatile-i2c";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-	#address-cells = <1>;
-	#size-cells = <0>;
-	reg = <0x20d000 0x1000>;
-};
-
-gpio_led0: mps2_fpgaio@302000 {
-	compatible = "arm,mps2-fpgaio-gpio";
-
-	reg = <0x302000 0x4>;
-	gpio-controller;
-	#gpio-cells = <1>;
-	ngpios = <2>;
-};
-
-gpio_button: mps2_fpgaio@302008 {
-	compatible = "arm,mps2-fpgaio-gpio";
-
-	reg = <0x302008 0x4>;
-	gpio-controller;
-	#gpio-cells = <1>;
-	ngpios = <2>;
-};
-
-gpio_misc: mps2_fpgaio@30204c {
-	compatible = "arm,mps2-fpgaio-gpio";
-
-	reg = <0x30204c 0x4>;
-	gpio-controller;
-	#gpio-cells = <1>;
-	ngpios = <10>;
-};
-
-eth0: eth@2000000 {
-	/* Linux has "smsc,lan9115" */
-	compatible = "smsc,lan9220";
-	/* Actual reg range is ~0x200 */
-	reg = <0x2000000 0x100000>;
-	interrupts = <48 3>;
-};
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest.dts b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest.dts
deleted file mode 100644
index 2bb956645ca..00000000000
--- a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest.dts
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2018-2019 Linaro Limited
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-
-#include <mem.h>
-#include <arm/armv8-m.dtsi>
-#include <zephyr/dt-bindings/i2c/i2c.h>
-#include <zephyr/dt-bindings/input/input-event-codes.h>
-
-/ {
-	compatible = "arm,mps2";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	aliases {
-		led0 = &led_0;
-		led1 = &led_1;
-		sw0 = &user_button_0;
-		sw1 = &user_button_1;
-		uart-1 = &uart1;
-		watchdog0 = &wdog0;
-	};
-
-	chosen {
-		zephyr,console = &uart0;
-		zephyr,shell-uart = &uart0;
-
-		/*
-		 * These SRAM and flash settings give the entire available
-		 * code and data memories to this secure firmware image.
-		 * This may conflict with mps2_an521_remote firmware. Use
-		 * caution when using both targets simultaneously.
-		 */
-		zephyr,sram = &ssram2_3;
-		zephyr,flash = &ssram1;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		led_0: led_0 {
-			gpios = <&gpio_led0 0>;
-			label = "USERLED0";
-		};
-		led_1: led_1 {
-			gpios = <&gpio_led0 1>;
-			label = "USERLED1";
-		};
-	};
-
-	gpio_keys {
-		compatible = "gpio-keys";
-		user_button_0: button_0 {
-			label = "USERPB0";
-			gpios = <&gpio_button 0>;
-			zephyr,code = <INPUT_KEY_0>;
-		};
-		user_button_1: button_1 {
-			label = "USERPB1";
-			gpios = <&gpio_button 1>;
-			zephyr,code = <INPUT_KEY_1>;
-		};
-	};
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu@0 {
-			device_type = "cpu";
-			compatible = "arm,cortex-m33";
-			reg = <0>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			mpu: mpu@e000ed90 {
-				compatible = "arm,armv8m-mpu";
-				reg = <0xe000ed90 0x40>;
-			};
-		};
-	};
-
-	/*
-	 * The memory regions defined below are according to AN521:
-	 * https://documentation-service.arm.com/static/5fa12fe9b1a7c5445f29017f
-	 *
-	 * Please see tables mentioned in individual comments below for details.
-	 */
-
-	ssram1: memory@10000000 {
-		/* Table 3-2, row 6. */
-		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x10000000 DT_SIZE_M(4)>;
-		zephyr,memory-region = "SSRAM1";
-	};
-
-	ssram2_3: memory@38000000 {
-		/* Table 3-4, rows 16 and 17. */
-		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x38000000 DT_SIZE_M(4)>;
-		zephyr,memory-region = "SSRAM2_3";
-	};
-
-	psram: memory@80000000 {
-		/* Table 3-6, row 1. */
-		device_type = "memory";
-		reg = <0x80000000 DT_SIZE_M(16)>;
-	};
-
-	soc {
-		peripheral@50000000 {
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0x0 0x50000000 0x10000000>;
-
-			#include "mps2_an521-common.dtsi"
-		};
-	};
-};
-
-&nvic {
-	arm,num-irq-priority-bits = <3>;
-};
-
-&uart1 {
-	status = "okay";
-};
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest_defconfig b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest_defconfig
deleted file mode 100644
index 08949950a9e..00000000000
--- a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest_defconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (c) 2018-2019 Linaro Limited
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-#CONFIG_RUNTIME_NMI=y
-#CONFIG_ARM_TRUSTZONE_M=y
-#CONFIG_ARM_MPU=y
-CONFIG_QEMU_ICOUNT_SHIFT=6
-#
-## GPIOs
-CONFIG_GPIO=y
-
-# Serial
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-CONFIG_SERIAL=y
-
-# Build a non-secure firmware image
-#CONFIG_TRUSTED_EXECUTION_NONSECURE=y
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/Kconfig b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/Kconfig
deleted file mode 100644
index e724497c3b5..00000000000
--- a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/Kconfig
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config EXTENDED_VARIANT_BOARD_SETTING
-	bool "Extended variant board test string"
-	depends on BOARD_NATIVE_SIM_NATIVE_ONE || BOARD_NATIVE_SIM_NATIVE_64_TWO
-	help
-	  This kconfig is set when the extended variant board config fragment
-	  is supposed to be sourced, that is when oot variant defines 'extends:'
-
-config EXTENDED_VARIANT_BOARD_ONE_SETTING_PROMPTLESS
-	bool
-	depends on BOARD_NATIVE_SIM_NATIVE_ONE
-	help
-	  This kconfig is promptless and is expected to be set through the
-	  Kconfig.defconfig for the extended board.
-
-config EXTENDED_VARIANT_BOARD_TWO_SETTING_PROMPTLESS
-	bool
-	depends on BOARD_NATIVE_SIM_NATIVE_64_TWO
-	help
-	  This kconfig is promptless and is expected to be set through the
-	  Kconfig.defconfig for the extended board.
-
-config EXTENDED_VARIANT_BOARD_SETTING_DEFCONFIG
-	bool "Extended variant board test string defconfig"
-	depends on BOARD_NATIVE_SIM_NATIVE_ONE || BOARD_NATIVE_SIM_NATIVE_64_TWO
-	help
-	  This kconfig is set when the extended variant board defconfig fragment
-	  is supposed to be sourced, that is when oot variant defines 'extends:'
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/Kconfig.defconfig b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/Kconfig.defconfig
deleted file mode 100644
index 343daa1246a..00000000000
--- a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/Kconfig.defconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_NATIVE_SIM_NATIVE_ONE
-
-config EXTENDED_VARIANT_BOARD_ONE_SETTING_PROMPTLESS
-	default y
-
-endif # BOARD_NATIVE_SIM_NATIVE_ONE
-
-if BOARD_NATIVE_SIM_NATIVE_64_TWO
-
-config EXTENDED_VARIANT_BOARD_TWO_SETTING_PROMPTLESS
-	default y
-
-endif # BOARD_NATIVE_SIM_NATIVE_64_TWO
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/board.yml b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/board.yml
deleted file mode 100644
index 8df9cf3c433..00000000000
--- a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/board.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-board:
-  extend: native_sim
-  variants:
-    - name: one
-      qualifier: native
-    - name: two
-      qualifier: native/64
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two.dts b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two.dts
deleted file mode 100644
index b3fc17d81fb..00000000000
--- a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "native_sim_native_one.dts"
-
-/ {
-	/delete-node/ added-by-native-one;
-
-	added-by-native-two{
-	};
-};
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two.yaml b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two.yaml
deleted file mode 100644
index 190d4906cc8..00000000000
--- a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-identifier: native_sim_native_64_two
-name: Native Simulation port - 32-bit
-type: native
-simulation: native
-arch: posix
-ram: 65536
-flash: 65536
-toolchain:
-  - host
-  - llvm
-supported:
-  - can
-  - counter
-  - dma
-  - eeprom
-  - netif:eth
-  - usb_device
-  - adc
-  - i2c
-  - spi
-  - gpio
-  - rtc
-testing:
-  default: true
-vendor: zephyr
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two_defconfig b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two_defconfig
deleted file mode 100644
index d0de015b0df..00000000000
--- a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_64_two_defconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_CONSOLE=y
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000
-
-CONFIG_EXTENDED_VARIANT_BOARD_SETTING_DEFCONFIG=y
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.dts b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.dts
deleted file mode 100644
index 652c7605f60..00000000000
--- a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.dts
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2019 Jan Van Winkel (jan.van_winkel@dxplore.eu)
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-#include <posix/posix.dtsi>
-#include <zephyr/dt-bindings/adc/adc.h>
-#include <zephyr/dt-bindings/i2c/i2c.h>
-#include <zephyr/dt-bindings/gpio/gpio.h>
-
-/ {
-	model = "Native Sim Board";
-	compatible = "zephyr,posix";
-
-	chosen {
-		zephyr,console = &uart0;
-		zephyr,shell-uart = &uart0;
-		zephyr,uart-mcumgr = &uart0;
-		zephyr,flash = &flash0;
-		zephyr,entropy = &rng;
-		zephyr,flash-controller = &flashcontroller0;
-		zephyr,display = &sdl_dc;
-		zephyr,canbus = &can_loopback0;
-		zephyr,code-partition = &slot0_partition;
-	};
-
-	aliases {
-		eeprom-0 = &eeprom0;
-		i2c-0 = &i2c0;
-		spi-0 = &spi0;
-		led0 = &led0;
-		rtc = &rtc;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		led0: led_0 {
-			gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
-			label = "Green LED";
-		};
-	};
-
-	lvgl_pointer {
-		compatible = "zephyr,lvgl-pointer-input";
-		input = <&input_sdl_touch>;
-	};
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu0: cpu@0 {
-			compatible = "zephyr,native-posix-cpu";
-			reg = <0>;
-		};
-	};
-
-	flashcontroller0: flash-controller@0 {
-		compatible = "zephyr,sim-flash";
-		reg = <0x00000000 DT_SIZE_K(2048)>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-		erase-value = <0xff>;
-
-		flash0: flash@0 {
-			status = "okay";
-			compatible = "soc-nv-flash";
-			erase-block-size = <4096>;
-			write-block-size = <1>;
-			reg = <0x00000000 DT_SIZE_K(2048)>;
-
-			partitions {
-				compatible = "fixed-partitions";
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				boot_partition: partition@0 {
-					label = "mcuboot";
-					reg = <0x00000000 0x0000C000>;
-				};
-				slot0_partition: partition@c000 {
-					label = "image-0";
-					reg = <0x0000C000 0x00069000>;
-				};
-				slot1_partition: partition@75000 {
-					label = "image-1";
-					reg = <0x00075000 0x00069000>;
-				};
-				scratch_partition: partition@de000 {
-					label = "image-scratch";
-					reg = <0x000de000 0x0001e000>;
-				};
-				storage_partition: partition@fc000 {
-					label = "storage";
-					reg = <0x000fc000 0x00004000>;
-				};
-			};
-		};
-	};
-
-	eeprom0: eeprom {
-		status = "okay";
-		compatible = "zephyr,sim-eeprom";
-		size = <DT_SIZE_K(32)>;
-	};
-
-	i2c0: i2c@100 {
-		status = "okay";
-		compatible = "zephyr,i2c-emul-controller";
-		clock-frequency = <I2C_BITRATE_STANDARD>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-		reg = <0x100 4>;
-	};
-
-	spi0: spi@200 {
-		status = "okay";
-		compatible = "zephyr,spi-emul-controller";
-		clock-frequency = <50000000>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-		reg = <0x200 4>;
-	};
-
-	espi0: espi@300 {
-		status = "okay";
-		compatible = "zephyr,espi-emul-controller";
-		reg = <0x300 4>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-	};
-
-	uart0: uart {
-		status = "okay";
-		compatible = "zephyr,native-posix-uart";
-		/* Dummy current-speed entry to comply with serial
-		 * DTS binding
-		 */
-		current-speed = <0>;
-	};
-
-	uart1: uart_1 {
-		status = "okay";
-		compatible = "zephyr,native-posix-uart";
-		/* Dummy current-speed entry to comply with serial
-		 * DTS binding
-		 */
-		current-speed = <0>;
-	};
-
-	rng: rng {
-		status = "okay";
-		compatible = "zephyr,native-posix-rng";
-	};
-
-	counter0: counter {
-		status = "okay";
-		compatible = "zephyr,native-posix-counter";
-	};
-
-	gpio0: gpio@800 {
-		status = "okay";
-		compatible = "zephyr,gpio-emul";
-		reg = <0x800 0x4>;
-		rising-edge;
-		falling-edge;
-		high-level;
-		low-level;
-		gpio-controller;
-		#gpio-cells = <2>;
-	};
-
-	zephyr_udc0: udc0 {
-		compatible = "zephyr,native-posix-udc";
-	};
-
-	sdl_dc: sdl_dc {
-		compatible = "zephyr,sdl-dc";
-		height = <240>;
-		width = <320>;
-	};
-
-	input_sdl_touch: input-sdl-touch {
-		compatible = "zephyr,input-sdl-touch";
-	};
-
-	can_loopback0: can_loopback0 {
-		status = "okay";
-		compatible = "zephyr,can-loopback";
-	};
-
-	can0: can {
-		status = "disabled";
-		compatible = "zephyr,native-linux-can";
-		/* adjust zcan0 to desired host interface or create an alternative
-		 * name, e.g.: sudo ip link property add dev vcan0 altname zcan0
-		 */
-		host-interface = "zcan0";
-	};
-
-	rtc: rtc {
-		status = "okay";
-		compatible = "zephyr,rtc-emul";
-		alarms-count = <2>;
-	};
-
-	dma: dma {
-		compatible = "zephyr,dma-emul";
-		#dma-cells = <1>;
-		stack-size = <4096>;
-	};
-
-	added-by-native-one {
-	};
-};
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.yaml b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.yaml
deleted file mode 100644
index ea2c2d856ae..00000000000
--- a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-identifier: native_sim_native_one
-name: Native Simulation port - 32-bit
-type: native
-simulation: native
-arch: posix
-ram: 65536
-flash: 65536
-toolchain:
-  - host
-  - llvm
-supported:
-  - can
-  - counter
-  - dma
-  - eeprom
-  - netif:eth
-  - usb_device
-  - adc
-  - i2c
-  - spi
-  - gpio
-  - rtc
-testing:
-  default: true
-vendor: zephyr
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one_defconfig b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one_defconfig
deleted file mode 100644
index d0de015b0df..00000000000
--- a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one_defconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_CONSOLE=y
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000
-
-CONFIG_EXTENDED_VARIANT_BOARD_SETTING_DEFCONFIG=y
diff --git a/tests/cmake/hwm/board_extend/oot_root/soc/arm/Kconfig.soc b/tests/cmake/hwm/board_extend/oot_root/soc/arm/Kconfig.soc
deleted file mode 100644
index a699e8413a1..00000000000
--- a/tests/cmake/hwm/board_extend/oot_root/soc/arm/Kconfig.soc
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) 2024, Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_MPS2_AN521_CPUTEST
-	bool
-	select SOC_MPS2_AN521
diff --git a/tests/cmake/hwm/board_extend/oot_root/soc/arm/soc.yml b/tests/cmake/hwm/board_extend/oot_root/soc/arm/soc.yml
deleted file mode 100644
index 04b69c75ae4..00000000000
--- a/tests/cmake/hwm/board_extend/oot_root/soc/arm/soc.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-socs:
-  - extend: an521
-    cpuclusters:
-      - name: cputest
diff --git a/tests/cmake/hwm/board_extend/prj.conf b/tests/cmake/hwm/board_extend/prj.conf
deleted file mode 100644
index 9467c292689..00000000000
--- a/tests/cmake/hwm/board_extend/prj.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ZTEST=y
diff --git a/tests/cmake/hwm/board_extend/src/main.c b/tests/cmake/hwm/board_extend/src/main.c
deleted file mode 100644
index 9795bd8dcb8..00000000000
--- a/tests/cmake/hwm/board_extend/src/main.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/ztest.h>
-
-#ifdef CONFIG_EXTENDED_VARIANT_BOARD_SETTING
-#define EXTENDED_BOARD_A 1
-#else
-#define EXTENDED_BOARD_A 0
-#endif
-
-#ifdef CONFIG_EXTENDED_VARIANT_BOARD_ONE_SETTING_PROMPTLESS
-#define EXTENDED_BOARD_ONE_B 1
-#else
-#define EXTENDED_BOARD_ONE_B 0
-#endif
-
-#ifdef CONFIG_EXTENDED_VARIANT_BOARD_TWO_SETTING_PROMPTLESS
-#define EXTENDED_BOARD_TWO_C 1
-#else
-#define EXTENDED_BOARD_TWO_C 0
-#endif
-
-#ifdef CONFIG_EXTENDED_VARIANT_BOARD_SETTING_DEFCONFIG
-#define EXTENDED_BOARD_D 1
-#else
-#define EXTENDED_BOARD_D 0
-#endif
-
-#ifdef CONFIG_BASE_BOARD_SETTING
-#define BASE_BOARD_CONFIG 1
-#else
-#define BASE_BOARD_CONFIG 0
-#endif
-
-#ifdef CONFIG_SOC_MPS2_AN521_CPUTEST
-#define EXTENDED_SOC 1
-#else
-#define EXTENDED_SOC 0
-#endif
-
-ZTEST_SUITE(soc_board_extend, NULL, NULL, NULL, NULL, NULL);
-
-#if CONFIG_BOARD_NATIVE_SIM
-ZTEST(soc_board_extend, test_native_sim_extend)
-{
-#if CONFIG_BOARD_NATIVE_SIM_NATIVE_ONE
-	zassert_true(EXTENDED_BOARD_A, "Expected extended board to be set");
-	zassert_true(EXTENDED_BOARD_ONE_B, "Expected extended board to be set");
-	zassert_false(EXTENDED_BOARD_TWO_C, "Did not expect extended board two to be set");
-	zassert_true(EXTENDED_BOARD_D, "Expected extended board to be set");
-	zassert_false(BASE_BOARD_CONFIG, "Did not expect base board to be set");
-	zassert_true(DT_NODE_EXISTS(DT_PATH(added_by_native_one)));
-	zassert_false(DT_NODE_EXISTS(DT_PATH(added_by_native_two)));
-	zassert_false(DT_NODE_EXISTS(DT_PATH(adc)));
-#elif CONFIG_BOARD_NATIVE_SIM_NATIVE_64_TWO
-	zassert_true(EXTENDED_BOARD_A, "Expected extended board to be set");
-	zassert_false(EXTENDED_BOARD_ONE_B, "Did not expect extended board one to be set");
-	zassert_true(EXTENDED_BOARD_TWO_C, "Expected extended board to be set");
-	zassert_true(EXTENDED_BOARD_D, "Expected extended board to be set");
-	zassert_false(BASE_BOARD_CONFIG, "Did not expect base board to be set");
-	zassert_false(DT_NODE_EXISTS(DT_PATH(added_by_native_one)));
-	zassert_true(DT_NODE_EXISTS(DT_PATH(added_by_native_two)));
-	zassert_false(DT_NODE_EXISTS(DT_PATH(adc)));
-#else
-	zassert_true(false, "Did not expect to build for a base native_sim board");
-#endif
-#elif CONFIG_BOARD_MPS2
-ZTEST(soc_board_extend, test_an521_soc_extend)
-{
-#if CONFIG_BOARD_MPS2_AN521_CPUTEST
-	zassert_true(EXTENDED_SOC, "Expected extended SoC to be set");
-#elif CONFIG_BOARD_MPS2
-	zassert_true(false, "Did not expect to build for a base mps2 board");
-#endif
-
-#else
-ZTEST(soc_board_extend, test_failure)
-{
-	zassert_true(false, "Did not expect to build for a regular board");
-#endif
-}
diff --git a/tests/cmake/hwm/board_extend/testcase.yaml b/tests/cmake/hwm/board_extend/testcase.yaml
deleted file mode 100644
index aae39ce6b2c..00000000000
--- a/tests/cmake/hwm/board_extend/testcase.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-common:
-  tags:
-    - cmake
-tests:
-  cmake.board.extend_one:
-    extra_args:
-      # Twister can only lookup known board roots.
-      # Thus platform above is set to native_sim, while at this location
-      # we overrule with the native_sim/native/one board.
-      # Test will fail if we accidentially build for the base native_sim board.
-      - CACHED_BOARD=native_sim/native/one
-    platform_allow:
-      - native_sim
-      - native_sim/native/64
-    integration_platforms:
-      - native_sim
-      - native_sim/native/64
-  cmake.board.extend_two:
-    extra_args:
-      - CACHED_BOARD=native_sim/native/64/two
-    platform_allow:
-      - native_sim
-      - native_sim/native/64
-    integration_platforms:
-      - native_sim
-      - native_sim/native/64
-  cmake.soc.extend_cputest:
-    extra_args:
-      - CACHED_BOARD=mps2/an521/cputest
-    platform_allow:
-      - mps2/an521/cpu0
-    integration_platforms:
-      - mps2/an521/cpu0

From 829551baea4006ffc0ec37c977314e0f944c9db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:11 +0100
Subject: [PATCH 2072/2913] Revert "[nrf fromlist] cmake: scripts: support SoC
 extension"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 15c21aab194f9e8d68606e3111dcbdb80fddf53d.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/modules/hwm_v2.cmake     | 18 ++++------
 cmake/modules/soc_v2.cmake     |  7 +---
 scripts/list_hardware.py       | 66 +++++++++-------------------------
 scripts/schemas/soc-schema.yml | 19 ++--------
 4 files changed, 26 insertions(+), 84 deletions(-)

diff --git a/cmake/modules/hwm_v2.cmake b/cmake/modules/hwm_v2.cmake
index a440c95c832..c4feb03736e 100644
--- a/cmake/modules/hwm_v2.cmake
+++ b/cmake/modules/hwm_v2.cmake
@@ -73,23 +73,19 @@ while(TRUE)
     string(TOUPPER "${ARCH_V2_NAME}" ARCH_V2_NAME_UPPER)
     set(ARCH_V2_${ARCH_V2_NAME_UPPER}_DIR ${ARCH_V2_DIR})
   elseif(HWM_TYPE MATCHES "^soc|^series|^family")
-    cmake_parse_arguments(SOC_V2 "" "NAME;HWM" "DIR" ${line})
+    cmake_parse_arguments(SOC_V2 "" "NAME;DIR;HWM" "" ${line})
 
     list(APPEND kconfig_soc_source_dir "${SOC_V2_DIR}")
-    string(TOUPPER "${SOC_V2_NAME}" SOC_V2_NAME_UPPER)
-    string(TOUPPER "${HWM_TYPE}" HWM_TYPE_UPPER)
 
     if(HWM_TYPE STREQUAL "soc")
-      # We support both SOC_foo_DIR and SOC_FOO_DIR.
-      set(SOC_${SOC_V2_NAME}_DIRECTORIES ${SOC_V2_DIR})
-      set(SOC_${SOC_V2_NAME_UPPER}_DIRECTORIES ${SOC_V2_DIR})
-      list(GET SOC_V2_DIR 0 SOC_${SOC_V2_NAME}_DIR)
-      list(GET SOC_V2_DIR 0 SOC_${SOC_V2_NAME_UPPER}_DIR)
+      set(setting_name SOC_${SOC_V2_NAME}_DIR)
     else()
-      # We support both SOC_series_foo_DIR and SOC_SERIES_FOO_DIR (and family /  FAMILY).
-      set(SOC_${HWM_TYPE}_${SOC_V2_NAME}_DIR ${SOC_V2_DIR})
-      set(SOC_${HWM_TYPE_UPPER}_${SOC_V2_NAME_UPPER}_DIR ${SOC_V2_DIR})
+      set(setting_name SOC_${HWM_TYPE}_${SOC_V2_NAME}_DIR)
     endif()
+    # We support both SOC_foo_DIR and SOC_FOO_DIR.
+    set(${setting_name} ${SOC_V2_DIR})
+    string(TOUPPER ${setting_name} setting_name)
+    set(${setting_name} ${SOC_V2_DIR})
   endif()
 
   if(idx EQUAL -1)
diff --git a/cmake/modules/soc_v2.cmake b/cmake/modules/soc_v2.cmake
index f98d33e0011..606ed690f77 100644
--- a/cmake/modules/soc_v2.cmake
+++ b/cmake/modules/soc_v2.cmake
@@ -28,10 +28,5 @@ if(HWMv2)
   set(SOC_FAMILY ${CONFIG_SOC_FAMILY})
   set(SOC_V2_DIR ${SOC_${SOC_NAME}_DIR})
   set(SOC_FULL_DIR ${SOC_V2_DIR} CACHE PATH "Path to the SoC directory." FORCE)
-  set(SOC_DIRECTORIES ${SOC_${SOC_NAME}_DIRECTORIES} CACHE INTERNAL
-      "List of SoC directories for SoC (${SOC_NAME})" FORCE
-  )
-  foreach(dir ${SOC_DIRECTORIES})
-    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${dir}/soc.yml)
-  endforeach()
+  set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${SOC_V2_DIR}/soc.yml)
 endif()
diff --git a/scripts/list_hardware.py b/scripts/list_hardware.py
index 2ea2ed9f0c5..1e994f3fd56 100755
--- a/scripts/list_hardware.py
+++ b/scripts/list_hardware.py
@@ -35,7 +35,6 @@ def __init__(self, folder='', soc_yaml=None):
         self._socs = []
         self._series = []
         self._families = []
-        self._extended_socs = []
 
         if soc_yaml is None:
             return
@@ -48,12 +47,12 @@ def __init__(self, folder='', soc_yaml=None):
             sys.exit(f'ERROR: Malformed yaml {soc_yaml.as_posix()}', e)
 
         for f in data.get('family', []):
-            family = Family(f['name'], [folder], [], [])
+            family = Family(f['name'], folder, [], [])
             for s in f.get('series', []):
-                series = Series(s['name'], [folder], f['name'], [])
+                series = Series(s['name'], folder, f['name'], [])
                 socs = [(Soc(soc['name'],
                              [c['name'] for c in soc.get('cpuclusters', [])],
-                             [folder], s['name'], f['name']))
+                             folder, s['name'], f['name']))
                         for soc in s.get('socs', [])]
                 series.socs.extend(socs)
                 self._series.append(series)
@@ -62,36 +61,26 @@ def __init__(self, folder='', soc_yaml=None):
                 family.socs.extend(socs)
             socs = [(Soc(soc['name'],
                          [c['name'] for c in soc.get('cpuclusters', [])],
-                         [folder], None, f['name']))
+                         folder, None, f['name']))
                     for soc in f.get('socs', [])]
             self._socs.extend(socs)
             self._families.append(family)
 
         for s in data.get('series', []):
-            series = Series(s['name'], [folder], '', [])
+            series = Series(s['name'], folder, '', [])
             socs = [(Soc(soc['name'],
                          [c['name'] for c in soc.get('cpuclusters', [])],
-                         [folder], s['name'], ''))
+                         folder, s['name'], ''))
                     for soc in s.get('socs', [])]
             series.socs.extend(socs)
             self._series.append(series)
             self._socs.extend(socs)
 
-        for soc in data.get('socs', []):
-            mutual_exclusive = {'name', 'extend'}
-            if len(mutual_exclusive - soc.keys()) < 1:
-                sys.exit(f'ERROR: Malformed content in SoC file: {soc_yaml}\n'
-                         f'{mutual_exclusive} are mutual exclusive at this level.')
-            if soc.get('name') is not None:
-                self._socs.append(Soc(soc['name'], [c['name'] for c in soc.get('cpuclusters', [])],
-                                  [folder], '', ''))
-            elif soc.get('extend') is not None:
-                self._extended_socs.append(Soc(soc['extend'],
-                                           [c['name'] for c in soc.get('cpuclusters', [])],
-                                           [folder], '', ''))
-            else:
-                sys.exit(f'ERROR: Malformed "socs" section in SoC file: {soc_yaml}\n'
-                         f'Cannot find one of required keys {mutual_exclusive}.')
+        socs = [(Soc(soc['name'],
+                     [c['name'] for c in soc.get('cpuclusters', [])],
+                     folder, '', ''))
+                for soc in data.get('socs', [])]
+        self._socs.extend(socs)
 
         # Ensure that any runner configuration matches socs and cpuclusters declared in the same
         # soc.yml file
@@ -108,7 +97,7 @@ def __init__(self, folder='', soc_yaml=None):
                             if components and components[-1] == 'ns':
                                 components.pop()
 
-                            for soc in self._socs + self._extended_socs:
+                            for soc in self._socs:
                                 if re.match(fr'^{soc_name}$', soc.name) is not None:
                                     if soc.cpuclusters and components:
                                         check_string = '/'.join(components)
@@ -144,23 +133,8 @@ def from_yaml(socs_yaml):
     def extend(self, systems):
         self._families.extend(systems.get_families())
         self._series.extend(systems.get_series())
-
-        for es in self._extended_socs[:]:
-            for s in systems.get_socs():
-                if s.name == es.name:
-                    s.extend(es)
-                    self._extended_socs.remove(es)
-                    break
         self._socs.extend(systems.get_socs())
 
-        for es in systems.get_extended_socs():
-            for s in self._socs:
-                if s.name == es.name:
-                    s.extend(es)
-                    break
-            else:
-                self._extended_socs.append(es)
-
     def get_families(self):
         return self._families
 
@@ -170,9 +144,6 @@ def get_series(self):
     def get_socs(self):
         return self._socs
 
-    def get_extended_socs(self):
-        return self._extended_socs
-
     def get_soc(self, name):
         try:
             return next(s for s in self._socs if s.name == name)
@@ -185,20 +156,15 @@ def get_soc(self, name):
 class Soc:
     name: str
     cpuclusters: List[str]
-    folder: List[str]
+    folder: str
     series: str = ''
     family: str = ''
 
-    def extend(self, soc):
-        if self.name == soc.name:
-            self.cpuclusters.extend(soc.cpuclusters)
-            self.folder.extend(soc.folder)
-
 
 @dataclass
 class Series:
     name: str
-    folder: List[str]
+    folder: str
     family: str
     socs: List[Soc]
 
@@ -206,7 +172,7 @@ class Series:
 @dataclass
 class Family:
     name: str
-    folder: List[str]
+    folder: str
     series: List[Series]
     socs: List[Soc]
 
@@ -323,7 +289,7 @@ def dump_v2_system(args, type, system):
         info = args.cmakeformat.format(
            TYPE='TYPE;' + type,
            NAME='NAME;' + system.name,
-           DIR='DIR;' + ';'.join([Path(x).as_posix() for x in system.folder]),
+           DIR='DIR;' + Path(system.folder).as_posix(),
            HWM='HWM;' + 'v2'
         )
     else:
diff --git a/scripts/schemas/soc-schema.yml b/scripts/schemas/soc-schema.yml
index 1d8537e8ad2..c13b4a4f7e0 100644
--- a/scripts/schemas/soc-schema.yml
+++ b/scripts/schemas/soc-schema.yml
@@ -24,22 +24,7 @@ schema;soc-schema:
     - type: map
       mapping:
         name:
-          required: true # Note: either name or extend is required, but that is handled in python
-          type: str
-        cpuclusters:
-          include: cpucluster-schema
-
-schema;soc-extend-schema:
-  required: false
-  type: seq
-  sequence:
-    - type: map
-      mapping:
-        name:
-          required: false # Note: either name or extend is required, but that is handled in python
-          type: str
-        extend:
-          required: false # Note: either name or extend is required, but that is handled in python
+          required: true
           type: str
         cpuclusters:
           include: cpucluster-schema
@@ -75,7 +60,7 @@ mapping:
   series:
     include: series-schema
   socs:
-    include: soc-extend-schema
+    include: soc-schema
   vendor:
     required: false
     type: str

From 68b09a29bf987f44e532c2f25c082631ab736fba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:11 +0100
Subject: [PATCH 2073/2913] Revert "[nrf noup] revertme: Resolve merge
 conflicts"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fe2bd338a957488f89f6d19b994ae76be987ec26.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/ci/check_compliance.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/scripts/ci/check_compliance.py b/scripts/ci/check_compliance.py
index 3a6ddfdb717..e376222efb1 100755
--- a/scripts/ci/check_compliance.py
+++ b/scripts/ci/check_compliance.py
@@ -506,12 +506,8 @@ def get_v2_model(self, kconfig_dir, settings_file):
         kconfig_boards_file = os.path.join(kconfig_dir, 'boards', 'Kconfig.boards')
         kconfig_defconfig_file = os.path.join(kconfig_dir, 'boards', 'Kconfig.defconfig')
 
-        board_roots = self.get_module_setting_root('board', settings_file)
-        board_roots.insert(0, Path(ZEPHYR_BASE))
-        soc_roots = self.get_module_setting_root('soc', settings_file)
-        soc_roots.insert(0, Path(ZEPHYR_BASE))
-        root_args = argparse.Namespace(**{'board_roots': board_roots,
-                                          'soc_roots': soc_roots, 'board': None,
+        root_args = argparse.Namespace(**{'board_roots': [Path(ZEPHYR_BASE)],
+                                          'soc_roots': [Path(ZEPHYR_BASE)], 'board': None,
                                           'board_dir': []})
         v2_boards = list_boards.find_v2_boards(root_args).values()
 
@@ -620,7 +616,7 @@ def parse_kconfig(self, filename="Kconfig", hwm=None):
         os.makedirs(os.path.join(kconfiglib_dir, 'arch'), exist_ok=True)
 
         os.environ["KCONFIG_BOARD_DIR"] = kconfiglib_boards_dir
-        self.get_v2_model(kconfiglib_dir, os.path.join(kconfiglib_dir, "settings_file.txt"))
+        self.get_v2_model(kconfiglib_dir)
 
         # Tells Kconfiglib to generate warnings for all references to undefined
         # symbols within Kconfig files

From 66f6800fc91542fa030ee4b96eb8478ce251defa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:11 +0100
Subject: [PATCH 2074/2913] Revert "[nrf fromlist] cmake: scripts: support
 board extension"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ac11ba595ea48e5f5328ec630b124988d296f668.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 Kconfig.zephyr                             |   4 +-
 boards/Kconfig                             |   2 +-
 boards/Kconfig.v1                          |   6 +-
 boards/Kconfig.v2                          |   2 +-
 cmake/modules/boards.cmake                 |  34 ++++--
 cmake/modules/dts.cmake                    |  40 ++++---
 cmake/modules/hwm_v2.cmake                 |  14 +--
 cmake/modules/kconfig.cmake                |   7 +-
 cmake/modules/kernel.cmake                 |   4 +-
 doc/_extensions/zephyr/kconfig/__init__.py |  12 +-
 scripts/ci/check_compliance.py             |  20 ++--
 scripts/ci/test_plan.py                    |   4 +-
 scripts/kconfig/lint.py                    |   2 +-
 scripts/list_boards.py                     | 125 +++++----------------
 scripts/schemas/board-schema.yml           |  22 +---
 scripts/west_commands/boards.py            |   2 +-
 share/sysbuild/Kconfig                     |   2 +-
 17 files changed, 101 insertions(+), 201 deletions(-)

diff --git a/Kconfig.zephyr b/Kconfig.zephyr
index f97819896d9..425d79f4e74 100644
--- a/Kconfig.zephyr
+++ b/Kconfig.zephyr
@@ -17,13 +17,13 @@ osource "${APPLICATION_SOURCE_DIR}/VERSION"
 # Shield defaults should have precedence over board defaults, which should have
 # precedence over SoC defaults, so include them in that order.
 #
-# $ARCH and $KCONFIG_BOARD_DIR will be glob patterns when building documentation.
+# $ARCH and $BOARD_DIR will be glob patterns when building documentation.
 # This loads custom shields defconfigs (from BOARD_ROOT)
 osource "$(KCONFIG_BINARY_DIR)/Kconfig.shield.defconfig"
 # This loads Zephyr base shield defconfigs
 source "boards/shields/*/Kconfig.defconfig"
 
-osource "$(KCONFIG_BOARD_DIR)/Kconfig.defconfig"
+osource "$(BOARD_DIR)/Kconfig.defconfig"
 
 # This loads Zephyr specific SoC root defconfigs
 source "$(KCONFIG_BINARY_DIR)/soc/Kconfig.defconfig"
diff --git a/boards/Kconfig b/boards/Kconfig
index 8f186b32caf..6eb9ca5916d 100644
--- a/boards/Kconfig
+++ b/boards/Kconfig
@@ -129,7 +129,7 @@ config QEMU_EXTRA_FLAGS
 	  GDBstub over serial with `-serial tcp:127.0.0.1:5678,server`
 
 # There might not be any board options, hence the optional source
-osource "$(KCONFIG_BOARD_DIR)/Kconfig"
+osource "$(BOARD_DIR)/Kconfig"
 endmenu
 
 config BOARD_HAS_TIMING_FUNCTIONS
diff --git a/boards/Kconfig.v1 b/boards/Kconfig.v1
index c98bd27d2db..670e2f2376e 100644
--- a/boards/Kconfig.v1
+++ b/boards/Kconfig.v1
@@ -2,13 +2,9 @@
 
 # SPDX-License-Identifier: Apache-2.0
 
-# In HWMv1 the KCONFIG_BOARD_DIR points directly to the BOARD_DIR.
-# Set the BOARD_DIR variable for backwards compatibility to legacy hardware model.
-BOARD_DIR := $(KCONFIG_BOARD_DIR)
-
 choice
 	prompt "Board Selection"
 
-source "$(KCONFIG_BOARD_DIR)/Kconfig.board"
+source "$(BOARD_DIR)/Kconfig.board"
 
 endchoice
diff --git a/boards/Kconfig.v2 b/boards/Kconfig.v2
index 6fce9ccb99d..47bb3ae2240 100644
--- a/boards/Kconfig.v2
+++ b/boards/Kconfig.v2
@@ -25,4 +25,4 @@ config BOARD_QUALIFIERS
 	  For example, if building for ``nrf5340dk/nrf5340/cpuapp`` then this will contain the
 	  value ``nrf5340/cpuapp``.
 
-osource "$(KCONFIG_BOARD_DIR)/Kconfig.$(BOARD)"
+osource "$(BOARD_DIR)/Kconfig.$(BOARD)"
diff --git a/cmake/modules/boards.cmake b/cmake/modules/boards.cmake
index d13e0a16f2d..d2c0666f2c5 100644
--- a/cmake/modules/boards.cmake
+++ b/cmake/modules/boards.cmake
@@ -185,7 +185,9 @@ set(format_str "{NAME}\;{DIR}\;{HWM}\;")
 set(format_str "${format_str}{REVISION_FORMAT}\;{REVISION_DEFAULT}\;{REVISION_EXACT}\;")
 set(format_str "${format_str}{REVISIONS}\;{SOCS}\;{QUALIFIERS}")
 
-list(TRANSFORM BOARD_DIRECTORIES PREPEND "--board-dir=" OUTPUT_VARIABLE board_dir_arg)
+if(BOARD_DIR)
+  set(board_dir_arg "--board-dir=${BOARD_DIR}")
+endif()
 execute_process(${list_boards_commands} --board=${BOARD} ${board_dir_arg}
   --cmakeformat=${format_str}
                 OUTPUT_VARIABLE ret_board
@@ -198,15 +200,29 @@ endif()
 
 if(NOT "${ret_board}" STREQUAL "")
   string(STRIP "${ret_board}" ret_board)
-  set(single_val "NAME;HWM;REVISION_FORMAT;REVISION_DEFAULT;REVISION_EXACT")
-  set(multi_val  "DIR;REVISIONS;SOCS;QUALIFIERS")
+  string(FIND "${ret_board}" "\n" idx REVERSE)
+  if(idx GREATER -1)
+    while(TRUE)
+      math(EXPR start "${idx} + 1")
+      string(SUBSTRING "${ret_board}" ${start} -1 line)
+      string(SUBSTRING "${ret_board}" 0 ${idx} ret_board)
+
+      cmake_parse_arguments(LIST_BOARD "" "DIR" "" ${line})
+      set(board_dirs "${board_dirs}\n${LIST_BOARD_DIR}")
+
+      if(idx EQUAL -1)
+        break()
+      endif()
+      string(FIND "${ret_board}" "\n" idx REVERSE)
+    endwhile()
+    message(FATAL_ERROR "Multiple boards named '${BOARD}' found in:${board_dirs}")
+  endif()
+
+  set(single_val "NAME;DIR;HWM;REVISION_FORMAT;REVISION_DEFAULT;REVISION_EXACT")
+  set(multi_val  "REVISIONS;SOCS;QUALIFIERS")
   cmake_parse_arguments(LIST_BOARD "" "${single_val}" "${multi_val}" ${ret_board})
-  list(GET LIST_BOARD_DIR 0 BOARD_DIR)
-  set(BOARD_DIR ${BOARD_DIR} CACHE PATH "Main board directory for board (${BOARD})" FORCE)
-  set(BOARD_DIRECTORIES ${LIST_BOARD_DIR} CACHE INTERNAL "List of board directories for board (${BOARD})" FORCE)
-  foreach(dir ${BOARD_DIRECTORIES})
-    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${dir}/board.yml)
-  endforeach()
+  set(BOARD_DIR ${LIST_BOARD_DIR} CACHE PATH "Board directory for board (${BOARD})" FORCE)
+  set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${BOARD_DIR}/board.yml)
 
   # Create two CMake variables identifying the hw model.
   # CMake variable: HWM=[v1,v2]
diff --git a/cmake/modules/dts.cmake b/cmake/modules/dts.cmake
index 22631ceecbd..ec0999d366b 100644
--- a/cmake/modules/dts.cmake
+++ b/cmake/modules/dts.cmake
@@ -70,9 +70,9 @@ find_package(Dtc 1.4.6)
 #
 # Optional variables:
 # - BOARD: board name to use when looking for DTS_SOURCE
-# - BOARD_DIRECTORIES: list of board directories to use when looking for DTS_SOURCE
+# - BOARD_DIR: board directory to use when looking for DTS_SOURCE
 # - BOARD_REVISION_STRING: used when looking for a board revision's
-#   devicetree overlay file in one of the BOARD_DIRECTORIES
+#   devicetree overlay file in BOARD_DIR
 # - DTC_OVERLAY_FILE: list of devicetree overlay files which will be
 #   used to modify or extend the base devicetree.
 # - EXTRA_DTC_OVERLAY_FILE: list of extra devicetree overlay files.
@@ -86,7 +86,7 @@ find_package(Dtc 1.4.6)
 #   C preprocessor when generating the devicetree from DTS_SOURCE
 # - DTS_SOURCE: the devicetree source file to use may be pre-set
 #   with this variable; otherwise, it defaults to
-#   ${BOARD_DIRECTORIES}/<normalized_board_target>.dts
+#   ${BOARD_DIR}/${BOARD}.dts
 #
 # Variables set by this module and not mentioned above are for internal
 # use only, and may be removed, renamed, or re-purposed without prior notice.
@@ -127,30 +127,28 @@ if(NOT DEFINED DTS_SOURCE)
   zephyr_build_string(board_string SHORT shortened_board_string
                       BOARD ${BOARD} BOARD_QUALIFIERS ${BOARD_QUALIFIERS}
   )
-  foreach(dir ${BOARD_DIRECTORIES})
-    if(EXISTS ${dir}/${shortened_board_string}.dts AND NOT BOARD_${BOARD}_SINGLE_SOC)
-      message(FATAL_ERROR "Board ${ZFILE_BOARD} defines multiple SoCs.\nShortened file name "
-              "(${shortened_board_string}.dts) not allowed, use '<board>_<soc>.dts' naming"
-      )
-    elseif(EXISTS ${dir}/${board_string}.dts AND EXISTS ${dir}/${shortened_board_string}.dts)
-      message(FATAL_ERROR "Conflicting file names discovered. Cannot use both "
-              "${board_string}.dts and ${shortened_board_string}.dts. "
-              "Please choose one naming style, ${board_string}.dts is recommended."
-      )
-    elseif(EXISTS ${dir}/${board_string}.dts)
-      set(DTS_SOURCE ${dir}/${board_string}.dts)
-    elseif(EXISTS ${dir}/${shortened_board_string}.dts)
-      set(DTS_SOURCE ${dir}/${shortened_board_string}.dts)
-    endif()
-  endforeach()
+  if(EXISTS ${BOARD_DIR}/${shortened_board_string}.dts AND NOT BOARD_${BOARD}_SINGLE_SOC)
+    message(FATAL_ERROR "Board ${ZFILE_BOARD} defines multiple SoCs.\nShortened file name "
+            "(${shortened_board_string}.dts) not allowed, use '<board>_<soc>.dts' naming"
+    )
+  elseif(EXISTS ${BOARD_DIR}/${board_string}.dts AND EXISTS ${BOARD_DIR}/${shortened_board_string}.dts)
+    message(FATAL_ERROR "Conflicting file names discovered. Cannot use both "
+            "${board_string}.dts and ${shortened_board_string}.dts. "
+            "Please choose one naming style, ${board_string}.dts is recommended."
+    )
+  elseif(EXISTS ${BOARD_DIR}/${board_string}.dts)
+    set(DTS_SOURCE ${BOARD_DIR}/${board_string}.dts)
+  elseif(EXISTS ${BOARD_DIR}/${shortened_board_string}.dts)
+    set(DTS_SOURCE ${BOARD_DIR}/${shortened_board_string}.dts)
+  endif()
 endif()
 
 if(EXISTS ${DTS_SOURCE})
   # We found a devicetree. Append all relevant dts overlays we can find...
-  zephyr_file(CONF_FILES ${BOARD_DIRECTORIES} DTS DTS_SOURCE)
+  zephyr_file(CONF_FILES ${BOARD_DIR} DTS DTS_SOURCE)
 
   zephyr_file(
-    CONF_FILES ${BOARD_DIRECTORIES}
+    CONF_FILES ${BOARD_DIR}
     DTS no_rev_suffix_dts_board_overlays
     BOARD ${BOARD}
     BOARD_QUALIFIERS ${BOARD_QUALIFIERS}
diff --git a/cmake/modules/hwm_v2.cmake b/cmake/modules/hwm_v2.cmake
index c4feb03736e..b514a33c5b0 100644
--- a/cmake/modules/hwm_v2.cmake
+++ b/cmake/modules/hwm_v2.cmake
@@ -95,15 +95,11 @@ endwhile()
 list(REMOVE_DUPLICATES kconfig_soc_source_dir)
 
 # Support multiple ARCH_ROOT, SOC_ROOT and BOARD_ROOT
-kconfig_gen("arch" "Kconfig"             "${kconfig_arch_source_dir}" "Zephyr Arch Kconfig")
-kconfig_gen("soc"  "Kconfig.defconfig"   "${kconfig_soc_source_dir}"  "Zephyr SoC defconfig")
-kconfig_gen("soc"  "Kconfig"             "${kconfig_soc_source_dir}"  "Zephyr SoC Kconfig")
-kconfig_gen("soc"  "Kconfig.soc"         "${kconfig_soc_source_dir}"  "SoC Kconfig")
-kconfig_gen("soc"  "Kconfig.sysbuild"    "${kconfig_soc_source_dir}"  "Sysbuild SoC Kconfig")
-kconfig_gen("boards" "Kconfig.defconfig" "${BOARD_DIRECTORIES}"       "Zephyr board defconfig")
-kconfig_gen("boards" "Kconfig.${BOARD}"  "${BOARD_DIRECTORIES}"       "board Kconfig")
-kconfig_gen("boards" "Kconfig"           "${BOARD_DIRECTORIES}"       "Zephyr board Kconfig")
-kconfig_gen("boards" "Kconfig.sysbuild"  "${BOARD_DIRECTORIES}"       "Sysbuild board Kconfig")
+kconfig_gen("arch" "Kconfig"           "${kconfig_arch_source_dir}" "Zephyr Arch Kconfig")
+kconfig_gen("soc"  "Kconfig.defconfig" "${kconfig_soc_source_dir}"  "Zephyr SoC defconfig")
+kconfig_gen("soc"  "Kconfig"           "${kconfig_soc_source_dir}"  "Zephyr SoC Kconfig")
+kconfig_gen("soc"  "Kconfig.soc"       "${kconfig_soc_source_dir}"  "SoC Kconfig")
+kconfig_gen("soc"  "Kconfig.sysbuild"  "${kconfig_soc_source_dir}"  "Sysbuild SoC Kconfig")
 
 # Clear variables created by cmake_parse_arguments
 unset(SOC_V2_NAME)
diff --git a/cmake/modules/kconfig.cmake b/cmake/modules/kconfig.cmake
index ba461d30bbc..3f374db5aea 100644
--- a/cmake/modules/kconfig.cmake
+++ b/cmake/modules/kconfig.cmake
@@ -21,12 +21,9 @@ file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/kconfig/include/config)
 set_ifndef(KCONFIG_NAMESPACE "CONFIG")
 
 set_ifndef(KCONFIG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Kconfig)
-set(KCONFIG_BOARD_DIR ${KCONFIG_BINARY_DIR}/boards)
 file(MAKE_DIRECTORY ${KCONFIG_BINARY_DIR})
 
 if(HWMv1)
-  # HWMv1 only supoorts a single board dir which points directly to the board dir.
-  set(KCONFIG_BOARD_DIR ${BOARD_DIR})
   # Support multiple SOC_ROOT
   file(MAKE_DIRECTORY ${KCONFIG_BINARY_DIR}/soc)
   set(kconfig_soc_root ${SOC_ROOT})
@@ -76,7 +73,7 @@ else()
 endif()
 
 if(NOT DEFINED BOARD_DEFCONFIG)
-  zephyr_file(CONF_FILES ${BOARD_DIRECTORIES} DEFCONFIG BOARD_DEFCONFIG)
+  zephyr_file(CONF_FILES ${BOARD_DIR} DEFCONFIG BOARD_DEFCONFIG)
 endif()
 
 if(DEFINED BOARD_REVISION)
@@ -158,7 +155,7 @@ set(COMMON_KCONFIG_ENV_SETTINGS
   APP_VERSION_TWEAK_STRING=${APP_VERSION_TWEAK_STRING}
   CONFIG_=${KCONFIG_NAMESPACE}_
   KCONFIG_CONFIG=${DOTCONFIG}
-  KCONFIG_BOARD_DIR=${KCONFIG_BOARD_DIR}
+  BOARD_DIR=${BOARD_DIR}
   BOARD=${BOARD}
   BOARD_REVISION=${BOARD_REVISION}
   BOARD_QUALIFIERS=${BOARD_QUALIFIERS}
diff --git a/cmake/modules/kernel.cmake b/cmake/modules/kernel.cmake
index 6a1a48b172d..1946e2357ba 100644
--- a/cmake/modules/kernel.cmake
+++ b/cmake/modules/kernel.cmake
@@ -173,9 +173,7 @@ if(CONFIG_LLEXT AND CONFIG_LLEXT_TYPE_ELF_SHAREDLIB)
   set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
 endif()
 
-foreach(dir ${BOARD_DIRECTORIES})
-  include(${dir}/board.cmake OPTIONAL)
-endforeach()
+include(${BOARD_DIR}/board.cmake OPTIONAL)
 
 # If we are using a suitable ethernet driver inside qemu, then these options
 # must be set, otherwise a zephyr instance cannot receive any network packets.
diff --git a/doc/_extensions/zephyr/kconfig/__init__.py b/doc/_extensions/zephyr/kconfig/__init__.py
index abbdcc1b9be..6052db638fa 100644
--- a/doc/_extensions/zephyr/kconfig/__init__.py
+++ b/doc/_extensions/zephyr/kconfig/__init__.py
@@ -91,7 +91,7 @@ def kconfig_load(app: Sphinx) -> Tuple[kconfiglib.Kconfig, Dict[str, str]]:
         root_args = argparse.Namespace(**{'soc_roots': [Path(ZEPHYR_BASE)]})
         v2_systems = list_hardware.find_v2_systems(root_args)
 
-        soc_folders = {soc.folder[0] for soc in v2_systems.get_socs()}
+        soc_folders = {soc.folder for soc in v2_systems.get_socs()}
         with open(Path(td) / "soc" / "Kconfig.defconfig", "w") as f:
             f.write('')
 
@@ -114,9 +114,8 @@ def kconfig_load(app: Sphinx) -> Tuple[kconfiglib.Kconfig, Dict[str, str]]:
 
         (Path(td) / 'boards').mkdir(exist_ok=True)
         root_args = argparse.Namespace(**{'board_roots': [Path(ZEPHYR_BASE)],
-                                          'soc_roots': [Path(ZEPHYR_BASE)], 'board': None,
-                                          'board_dir': []})
-        v2_boards = list_boards.find_v2_boards(root_args).values()
+                                          'soc_roots': [Path(ZEPHYR_BASE)], 'board': None})
+        v2_boards = list_boards.find_v2_boards(root_args)
 
         with open(Path(td) / "boards" / "Kconfig.boards", "w") as f:
             for board in v2_boards:
@@ -127,8 +126,7 @@ def kconfig_load(app: Sphinx) -> Tuple[kconfiglib.Kconfig, Dict[str, str]]:
                     board_str = 'BOARD_' + re.sub(r"[^a-zA-Z0-9_]", "_", qualifier).upper()
                     f.write('config  ' + board_str + '\n')
                     f.write('\t bool\n')
-                f.write('source "' +
-                        (board.directories[0] / ('Kconfig.' + board.name)).as_posix() + '"\n\n')
+                f.write('source "' + (board.dir / ('Kconfig.' + board.name)).as_posix() + '"\n\n')
 
         # base environment
         os.environ["ZEPHYR_BASE"] = str(ZEPHYR_BASE)
@@ -142,7 +140,7 @@ def kconfig_load(app: Sphinx) -> Tuple[kconfiglib.Kconfig, Dict[str, str]]:
         os.environ["HWM_SCHEME"] = "v2"
 
         os.environ["BOARD"] = "boards"
-        os.environ["KCONFIG_BOARD_DIR"] = str(Path(td) / "boards")
+        os.environ["BOARD_DIR"] = str(Path(td) / "boards")
 
         # insert external Kconfigs to the environment
         module_paths = dict()
diff --git a/scripts/ci/check_compliance.py b/scripts/ci/check_compliance.py
index e376222efb1..95a662614bb 100755
--- a/scripts/ci/check_compliance.py
+++ b/scripts/ci/check_compliance.py
@@ -507,14 +507,12 @@ def get_v2_model(self, kconfig_dir, settings_file):
         kconfig_defconfig_file = os.path.join(kconfig_dir, 'boards', 'Kconfig.defconfig')
 
         root_args = argparse.Namespace(**{'board_roots': [Path(ZEPHYR_BASE)],
-                                          'soc_roots': [Path(ZEPHYR_BASE)], 'board': None,
-                                          'board_dir': []})
-        v2_boards = list_boards.find_v2_boards(root_args).values()
+                                          'soc_roots': [Path(ZEPHYR_BASE)], 'board': None})
+        v2_boards = list_boards.find_v2_boards(root_args)
 
         with open(kconfig_defconfig_file, 'w') as fp:
             for board in v2_boards:
-                fp.write('osource "' +
-                         (board.directories[0] / 'Kconfig.defconfig').as_posix() + '"\n')
+                fp.write('osource "' + (Path(board.dir) / 'Kconfig.defconfig').as_posix() + '"\n')
 
         with open(kconfig_boards_file, 'w') as fp:
             for board in v2_boards:
@@ -527,8 +525,7 @@ def get_v2_model(self, kconfig_dir, settings_file):
                     fp.write('config  ' + board_str + '\n')
                     fp.write('\t bool\n')
                 fp.write(
-                    'source "' +
-                    (board.directories[0] / ('Kconfig.' + board.name)).as_posix() + '"\n\n'
+                    'source "' + (Path(board.dir) / ('Kconfig.' + board.name)).as_posix() + '"\n\n'
                 )
 
         with open(kconfig_file, 'w') as fp:
@@ -536,7 +533,7 @@ def get_v2_model(self, kconfig_dir, settings_file):
                 'osource "' + (Path(kconfig_dir) / 'boards' / 'Kconfig.syms.v1').as_posix() + '"\n'
             )
             for board in v2_boards:
-                fp.write('osource "' + (Path(board.directories[0]) / 'Kconfig').as_posix() + '"\n')
+                fp.write('osource "' + (Path(board.dir) / 'Kconfig').as_posix() + '"\n')
 
         kconfig_defconfig_file = os.path.join(kconfig_dir, 'soc', 'Kconfig.defconfig')
         kconfig_soc_file = os.path.join(kconfig_dir, 'soc', 'Kconfig.soc')
@@ -545,7 +542,7 @@ def get_v2_model(self, kconfig_dir, settings_file):
         root_args = argparse.Namespace(**{'soc_roots': soc_roots})
         v2_systems = list_hardware.find_v2_systems(root_args)
 
-        soc_folders = {soc.folder[0] for soc in v2_systems.get_socs()}
+        soc_folders = {soc.folder for soc in v2_systems.get_socs()}
         with open(kconfig_defconfig_file, 'w') as fp:
             for folder in soc_folders:
                 fp.write('osource "' + (Path(folder) / 'Kconfig.defconfig').as_posix() + '"\n')
@@ -615,7 +612,7 @@ def parse_kconfig(self, filename="Kconfig", hwm=None):
         os.makedirs(os.path.join(kconfiglib_dir, 'soc'), exist_ok=True)
         os.makedirs(os.path.join(kconfiglib_dir, 'arch'), exist_ok=True)
 
-        os.environ["KCONFIG_BOARD_DIR"] = kconfiglib_boards_dir
+        os.environ["BOARD_DIR"] = kconfiglib_boards_dir
         self.get_v2_model(kconfiglib_dir)
 
         # Tells Kconfiglib to generate warnings for all references to undefined
@@ -925,9 +922,6 @@ def check_no_undef_outside_kconfig(self, kconf):
         "BOOT_RAM_LOAD", # Used in sysbuild for MCUboot configuration
         "BOOT_SWAP_USING_MOVE", # Used in sysbuild for MCUboot configuration
         "BOOT_SWAP_USING_SCRATCH", # Used in sysbuild for MCUboot configuration
-        "BOARD_MPS2_AN521_CPUTEST", # Used for board and SoC extension feature tests
-        "BOARD_NATIVE_SIM_NATIVE_64_TWO", # Used for board and SoC extension feature tests
-        "BOARD_NATIVE_SIM_NATIVE_ONE", # Used for board and SoC extension feature tests
         "BOOT_ENCRYPTION_KEY_FILE", # Used in sysbuild
         "BOOT_ENCRYPT_IMAGE", # Used in sysbuild
         "BOOT_MAX_IMG_SECTORS_AUTO", # Used in sysbuild
diff --git a/scripts/ci/test_plan.py b/scripts/ci/test_plan.py
index 3e3cf8ee4c7..61305a75f45 100755
--- a/scripts/ci/test_plan.py
+++ b/scripts/ci/test_plan.py
@@ -239,12 +239,12 @@ def find_boards(self):
         # Look for boards in monitored repositories
         lb_args = argparse.Namespace(**{'arch_roots': roots, 'board_roots': roots, 'board': None, 'soc_roots':roots,
                                         'board_dir': None})
-        known_boards = list_boards.find_v2_boards(lb_args).values()
+        known_boards = list_boards.find_v2_boards(lb_args)
 
         for changed in changed_boards:
             for board in known_boards:
                 c = (zephyr_base / changed).resolve()
-                if c.is_relative_to(board.directories[0].resolve()):
+                if c.is_relative_to(board.dir.resolve()):
                     for file in glob.glob(os.path.join(board.dir, f"{board.name}*.yaml")):
                         with open(file, 'r') as f:
                             b = yaml.load(f.read(), Loader=SafeLoader)
diff --git a/scripts/kconfig/lint.py b/scripts/kconfig/lint.py
index 5a123ded42f..30064c34546 100755
--- a/scripts/kconfig/lint.py
+++ b/scripts/kconfig/lint.py
@@ -209,7 +209,7 @@ def init_kconfig():
         ZEPHYR_BASE=TOP_DIR,
         SOC_DIR="soc",
         ARCH_DIR="arch",
-        KCONFIG_BOARD_DIR="boards/*/*",
+        BOARD_DIR="boards/*/*",
         ARCH="*")
 
     kconf = kconfiglib.Kconfig(suppress_traceback=True)
diff --git a/scripts/list_boards.py b/scripts/list_boards.py
index 23859e00cce..6b810d0e286 100755
--- a/scripts/list_boards.py
+++ b/scripts/list_boards.py
@@ -4,13 +4,13 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import argparse
-from collections import defaultdict, Counter
+from collections import defaultdict
 from dataclasses import dataclass, field
 import itertools
 from pathlib import Path
 import pykwalify.core
 import sys
-from typing import List, Union
+from typing import List
 import yaml
 import list_hardware
 from list_hardware import unique_paths
@@ -91,8 +91,7 @@ def from_soc(soc, variants):
 @dataclass(frozen=True)
 class Board:
     name: str
-    # HWMv1 only supports a single Path, and requires Board dataclass to be hashable.
-    directories: Union[Path, List[Path]]
+    dir: Path
     hwm: str
     arch: str = None
     vendor: str = None
@@ -103,41 +102,6 @@ class Board:
     socs: List[Soc] = field(default_factory=list, compare=False)
     variants: List[str] = field(default_factory=list, compare=False)
 
-    def from_qualifier(self, qualifiers):
-        qualifiers_list = qualifiers.split('/')
-
-        node = Soc(None)
-        n = len(qualifiers_list)
-        if n > 0:
-            soc_qualifier = qualifiers_list.pop(0)
-            for s in self.socs:
-                if s.name == soc_qualifier:
-                    node = s
-                    break
-
-        if n > 1:
-            if node.cpuclusters:
-                cpu_qualifier = qualifiers_list.pop(0)
-                for c in node.cpuclusters:
-                    if c.name == cpu_qualifier:
-                        node = c
-                        break
-                else:
-                    node = Variant(None)
-
-        for q in qualifiers_list:
-            for v in node.variants:
-                if v.name == q:
-                    node = v
-                    break
-            else:
-                node = Variant(None)
-
-        if node in (Soc(None), Variant(None)):
-            sys.exit(f'ERROR: qualifiers {qualifiers} not found when extending board {self.name}')
-
-        return node
-
 
 def board_key(board):
     return board.name
@@ -200,10 +164,11 @@ def find_arch2board_set_in(root, arches, board_dir):
     for arch in arches:
         if not (boards / arch).is_dir():
             continue
+
         for maybe_board in (boards / arch).iterdir():
             if not maybe_board.is_dir():
                 continue
-            if board_dir and maybe_board not in board_dir:
+            if board_dir is not None and board_dir != maybe_board:
                 continue
             for maybe_defconfig in maybe_board.iterdir():
                 file_name = maybe_defconfig.name
@@ -215,8 +180,7 @@ def find_arch2board_set_in(root, arches, board_dir):
 
 
 def load_v2_boards(board_name, board_yml, systems):
-    boards = {}
-    board_extensions = []
+    boards = []
     if board_yml.is_file():
         with board_yml.open('r') as f:
             b = yaml.load(f.read(), Loader=SafeLoader)
@@ -234,18 +198,6 @@ def load_v2_boards(board_name, board_yml, systems):
 
         board_array = b.get('boards', [b.get('board', None)])
         for board in board_array:
-            mutual_exclusive = {'name', 'extend'}
-            if len(mutual_exclusive - board.keys()) < 1:
-                sys.exit(f'ERROR: Malformed "board" section in file: {board_yml.as_posix()}\n'
-                         f'{mutual_exclusive} are mutual exclusive at this level.')
-
-            # This is a extending an existing board, place in array to allow later processing.
-            if 'extend' in board:
-                board.update({'dir': board_yml.parent})
-                board_extensions.append(board)
-                continue
-
-            # Create board
             if board_name is not None:
                 if board['name'] != board_name:
                     # Not the board we're looking for, ignore.
@@ -267,9 +219,9 @@ def load_v2_boards(board_name, board_yml, systems):
             socs = [Soc.from_soc(systems.get_soc(s['name']), s.get('variants', []))
                     for s in board.get('socs', {})]
 
-            boards[board['name']] = Board(
+            board = Board(
                 name=board['name'],
-                directories=[board_yml.parent],
+                dir=board_yml.parent,
                 vendor=board.get('vendor'),
                 revision_format=board.get('revision', {}).get('format'),
                 revision_default=board.get('revision', {}).get('default'),
@@ -280,28 +232,8 @@ def load_v2_boards(board_name, board_yml, systems):
                 variants=[Variant.from_dict(v) for v in board.get('variants', [])],
                 hwm='v2',
             )
-            board_qualifiers = board_v2_qualifiers(boards[board['name']])
-            duplicates = [q for q, n in Counter(board_qualifiers).items() if n > 1]
-            if duplicates:
-                sys.exit(f'ERROR: Duplicated board qualifiers detected {duplicates} for board: '
-                         f'{board["name"]}.\nPlease check content of: {board_yml.as_posix()}\n')
-    return boards, board_extensions
-
-
-def extend_v2_boards(boards, board_extensions):
-    for e in board_extensions:
-        board = boards.get(e['extend'])
-        if board is None:
-            continue
-        board.directories.append(e['dir'])
-
-        for v in e.get('variants', []):
-            node = board.from_qualifier(v['qualifier'])
-            if str(v['qualifier'] + '/' + v['name']) in board_v2_qualifiers(board):
-                board_yml = e['dir'] / BOARD_YML
-                sys.exit(f'ERROR: Variant: {v["name"]}, defined multiple times for board: '
-                         f'{board.name}.\nLast defined in {board_yml}')
-            node.variants.append(Variant.from_dict(v))
+            boards.append(board)
+    return boards
 
 
 # Note that this does not share the args.board functionality of find_v2_boards
@@ -319,25 +251,14 @@ def find_v2_boards(args):
     root_args = argparse.Namespace(**{'soc_roots': args.soc_roots})
     systems = list_hardware.find_v2_systems(root_args)
 
-    boards = {}
-    board_extensions = []
+    boards = []
     board_files = []
-    if args.board_dir:
-        board_files = [d / BOARD_YML for d in args.board_dir]
-    else:
-        for root in unique_paths(args.board_roots):
-            board_files.extend((root / 'boards').rglob(BOARD_YML))
+    for root in unique_paths(args.board_roots):
+        board_files.extend((root / 'boards').rglob(BOARD_YML))
 
     for board_yml in board_files:
-        b, e = load_v2_boards(args.board, board_yml, systems)
-        conflict_boards = set(boards.keys()).intersection(b.keys())
-        if conflict_boards:
-            sys.exit(f'ERROR: Board(s): {conflict_boards}, defined multiple times.\n'
-                     f'Last defined in {board_yml}')
-        boards.update(b)
-        board_extensions.extend(e)
-
-    extend_v2_boards(boards, board_extensions)
+        b = load_v2_boards(args.board, board_yml, systems)
+        boards.extend(b)
     return boards
 
 
@@ -362,7 +283,7 @@ def add_args(parser):
                         help='add a soc root, may be given more than once')
     parser.add_argument("--board", dest='board', default=None,
                         help='lookup the specific board, fail if not found')
-    parser.add_argument("--board-dir", default=[], type=Path, action='append',
+    parser.add_argument("--board-dir", default=None, type=Path,
                         help='Only look for boards at the specific location')
 
 
@@ -404,16 +325,20 @@ def board_v2_qualifiers_csv(board):
 
 
 def dump_v2_boards(args):
-    boards = find_v2_boards(args)
+    if args.board_dir:
+        root_args = argparse.Namespace(**{'soc_roots': args.soc_roots})
+        systems = list_hardware.find_v2_systems(root_args)
+        boards = load_v2_boards(args.board, args.board_dir / BOARD_YML, systems)
+    else:
+        boards = find_v2_boards(args)
 
-    for b in boards.values():
+    for b in boards:
         qualifiers_list = board_v2_qualifiers(b)
         if args.cmakeformat is not None:
             notfound = lambda x: x or 'NOTFOUND'
             info = args.cmakeformat.format(
                 NAME='NAME;' + b.name,
-                DIR='DIR;' + ';'.join(
-                    [str(x.as_posix()) for x in b.directories]),
+                DIR='DIR;' + str(b.dir.as_posix()),
                 VENDOR='VENDOR;' + notfound(b.vendor),
                 HWM='HWM;' + b.hwm,
                 REVISION_DEFAULT='REVISION_DEFAULT;' + notfound(b.revision_default),
@@ -438,7 +363,7 @@ def dump_boards(args):
             if args.cmakeformat is not None:
                 info = args.cmakeformat.format(
                     NAME='NAME;' + board.name,
-                    DIR='DIR;' + str(board.directories.as_posix()),
+                    DIR='DIR;' + str(board.dir.as_posix()),
                     HWM='HWM;' + board.hwm,
                     VENDOR='VENDOR;NOTFOUND',
                     REVISION_DEFAULT='REVISION_DEFAULT;NOTFOUND',
diff --git a/scripts/schemas/board-schema.yml b/scripts/schemas/board-schema.yml
index 2e578ba2e8a..56ee4eab034 100644
--- a/scripts/schemas/board-schema.yml
+++ b/scripts/schemas/board-schema.yml
@@ -23,29 +23,13 @@ schema;variant-schema:
           required: false
           include: variant-schema
 
-schema;extend-variant-schema:
-  required: false
-  type: seq
-  sequence:
-    - type: map
-      mapping:
-        name:
-          required: true
-          type: str
-        qualifier:
-          required: true
-          type: str
-
 schema;board-schema:
   type: map
   mapping:
     name:
-      required: false # Note: either name or extend is required, but that is handled in python
+      required: true
       type: str
       desc: Name of the board
-    extend:
-      required: false # Note: either name or extend is required, but that is handled in python
-      type: str
     vendor:
       required: false
       type: str
@@ -75,7 +59,7 @@ schema;board-schema:
                   required: true
                   type: str
     socs:
-      required: false # Required for name:, but not for extend.
+      required: true
       type: seq
       sequence:
         - type: map
@@ -85,8 +69,6 @@ schema;board-schema:
               type: str
             variants:
               include: variant-schema
-    variants:
-      include: extend-variant-schema
 
 type: map
 mapping:
diff --git a/scripts/west_commands/boards.py b/scripts/west_commands/boards.py
index f329ea54217..3bb213ae029 100644
--- a/scripts/west_commands/boards.py
+++ b/scripts/west_commands/boards.py
@@ -96,7 +96,7 @@ def do_run(self, args, _):
             log.inf(args.format.format(name=board.name, arch=board.arch,
                                        dir=board.dir, hwm=board.hwm, qualifiers=''))
 
-        for board in list_boards.find_v2_boards(args).values():
+        for board in list_boards.find_v2_boards(args):
             if name_re is not None and not name_re.search(board.name):
                 continue
             log.inf(
diff --git a/share/sysbuild/Kconfig b/share/sysbuild/Kconfig
index 69f2d4cd396..556462af310 100644
--- a/share/sysbuild/Kconfig
+++ b/share/sysbuild/Kconfig
@@ -6,7 +6,7 @@ rsource "Kconfig.$(HWM_SCHEME)"
 
 comment "Sysbuild image configuration"
 
-osource "$(KCONFIG_BOARD_DIR)/Kconfig.sysbuild"
+osource "$(BOARD_DIR)/Kconfig.sysbuild"
 osource "$(KCONFIG_BINARY_DIR)/soc/Kconfig.sysbuild"
 
 menu "Modules"

From 79595d8f600398d5d6b9cc2be3612861a6439fef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:12 +0100
Subject: [PATCH 2075/2913] Revert "[nrf noup] revertme: Cover up merge
 conflicts"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c22239fd5c3b8501003bd462e94a183314fd8c13.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/ci/check_compliance.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/ci/check_compliance.py b/scripts/ci/check_compliance.py
index 95a662614bb..1a45e32a741 100755
--- a/scripts/ci/check_compliance.py
+++ b/scripts/ci/check_compliance.py
@@ -506,8 +506,12 @@ def get_v2_model(self, kconfig_dir, settings_file):
         kconfig_boards_file = os.path.join(kconfig_dir, 'boards', 'Kconfig.boards')
         kconfig_defconfig_file = os.path.join(kconfig_dir, 'boards', 'Kconfig.defconfig')
 
-        root_args = argparse.Namespace(**{'board_roots': [Path(ZEPHYR_BASE)],
-                                          'soc_roots': [Path(ZEPHYR_BASE)], 'board': None})
+        board_roots = self.get_module_setting_root('board', settings_file)
+        board_roots.insert(0, Path(ZEPHYR_BASE))
+        soc_roots = self.get_module_setting_root('soc', settings_file)
+        soc_roots.insert(0, Path(ZEPHYR_BASE))
+        root_args = argparse.Namespace(**{'board_roots': board_roots,
+                                          'soc_roots': soc_roots, 'board': None})
         v2_boards = list_boards.find_v2_boards(root_args)
 
         with open(kconfig_defconfig_file, 'w') as fp:
@@ -613,7 +617,7 @@ def parse_kconfig(self, filename="Kconfig", hwm=None):
         os.makedirs(os.path.join(kconfiglib_dir, 'arch'), exist_ok=True)
 
         os.environ["BOARD_DIR"] = kconfiglib_boards_dir
-        self.get_v2_model(kconfiglib_dir)
+        self.get_v2_model(kconfiglib_dir, os.path.join(kconfiglib_dir, "settings_file.txt"))
 
         # Tells Kconfiglib to generate warnings for all references to undefined
         # symbols within Kconfig files

From 5c571618b6d1862ef9cccb15b1997e548ee8f372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:12 +0100
Subject: [PATCH 2076/2913] Revert "[nrf fromlist] cmake: cleanup hwm_v2.cmake
 module code"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9aae291a4b4c341efead287b642e1d1e47e83b5c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 cmake/modules/hwm_v2.cmake | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/cmake/modules/hwm_v2.cmake b/cmake/modules/hwm_v2.cmake
index b514a33c5b0..45238f212b3 100644
--- a/cmake/modules/hwm_v2.cmake
+++ b/cmake/modules/hwm_v2.cmake
@@ -24,11 +24,9 @@ if(NOT HWMv2)
 endif()
 
 # Internal helper function for creation of Kconfig files.
-function(kconfig_gen bin_dir file dirs comment)
-  set(kconfig_header "# Load ${comment} descriptions.\n")
-  set(kconfig_file ${KCONFIG_BINARY_DIR}/${bin_dir}/${file})
-  file(WRITE ${kconfig_file} "${kconfig_header}")
-
+function(kconfig_gen bin_dir file dirs)
+  file(MAKE_DIRECTORY "${bin_dir}")
+  set(kconfig_file ${bin_dir}/${file})
   foreach(dir ${dirs})
     cmake_path(CONVERT "${dir}" TO_CMAKE_PATH_LIST dir)
     file(APPEND ${kconfig_file} "osource \"${dir}/${file}\"\n")
@@ -94,12 +92,28 @@ while(TRUE)
 endwhile()
 list(REMOVE_DUPLICATES kconfig_soc_source_dir)
 
-# Support multiple ARCH_ROOT, SOC_ROOT and BOARD_ROOT
-kconfig_gen("arch" "Kconfig"           "${kconfig_arch_source_dir}" "Zephyr Arch Kconfig")
-kconfig_gen("soc"  "Kconfig.defconfig" "${kconfig_soc_source_dir}"  "Zephyr SoC defconfig")
-kconfig_gen("soc"  "Kconfig"           "${kconfig_soc_source_dir}"  "Zephyr SoC Kconfig")
-kconfig_gen("soc"  "Kconfig.soc"       "${kconfig_soc_source_dir}"  "SoC Kconfig")
-kconfig_gen("soc"  "Kconfig.sysbuild"  "${kconfig_soc_source_dir}"  "Sysbuild SoC Kconfig")
+# Support multiple ARCH_ROOT and SOC_ROOT
+set(arch_kconfig_file  Kconfig)
+set(soc_defconfig_file Kconfig.defconfig)
+set(soc_zephyr_file    Kconfig)
+set(soc_kconfig_file   Kconfig.soc)
+set(soc_sysbuild_file  Kconfig.sysbuild)
+set(arch_kconfig_header "# Load arch Kconfig descriptions.\n")
+set(defconfig_header    "# Load Zephyr SoC Kconfig defconfig.\n")
+set(soc_zephyr_header   "# Load Zephyr SoC Kconfig descriptions.\n")
+set(soc_kconfig_header  "# Load SoC Kconfig descriptions.\n")
+set(soc_sysbuild_header "# Load SoC sysbuild Kconfig descriptions.\n")
+file(WRITE ${KCONFIG_BINARY_DIR}/arch/${arch_kconfig_file} "${arch_kconfig_header}")
+file(WRITE ${KCONFIG_BINARY_DIR}/soc/${soc_defconfig_file} "${defconfig_header}")
+file(WRITE ${KCONFIG_BINARY_DIR}/soc/${soc_zephyr_file}    "${soc_zephyr_header}")
+file(WRITE ${KCONFIG_BINARY_DIR}/soc/${soc_kconfig_file}   "${soc_kconfig_header}")
+file(WRITE ${KCONFIG_BINARY_DIR}/soc/${soc_sysbuild_file}  "${soc_sysbuild_header}")
+
+kconfig_gen("${KCONFIG_BINARY_DIR}/arch" "${arch_kconfig_file}" "${kconfig_arch_source_dir}")
+kconfig_gen("${KCONFIG_BINARY_DIR}/soc" "${soc_defconfig_file}" "${kconfig_soc_source_dir}")
+kconfig_gen("${KCONFIG_BINARY_DIR}/soc" "${soc_zephyr_file}" "${kconfig_soc_source_dir}")
+kconfig_gen("${KCONFIG_BINARY_DIR}/soc" "${soc_kconfig_file}" "${kconfig_soc_source_dir}")
+kconfig_gen("${KCONFIG_BINARY_DIR}/soc" "${soc_sysbuild_file}" "${kconfig_soc_source_dir}")
 
 # Clear variables created by cmake_parse_arguments
 unset(SOC_V2_NAME)

From 3b1c68965b0c89bfd8d2650766d35847f9555caa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:12 +0100
Subject: [PATCH 2077/2913] Revert "[nrf fromlist] icbmsg: Allow deregistration
 of the endpoints"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 85968881010c03e94e75cf6d00c5f8ee6da54380.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 subsys/ipc/ipc_service/backends/ipc_icbmsg.c | 64 +-------------------
 1 file changed, 2 insertions(+), 62 deletions(-)

diff --git a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
index 70c4c4c362f..624896d657a 100644
--- a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
+++ b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
@@ -139,14 +139,6 @@ enum ept_bounding_state {
 	EPT_READY,		/* Bounding is done. Bound callback was called. */
 };
 
-enum ept_rebound_state {
-	EPT_NORMAL = 0,		/* No endpoint rebounding is needed. */
-	EPT_DEREGISTERED,	/* Endpoint was deregistered. */
-	EPT_REBOUNDING,		/* Rebounding was requested, waiting for work queue to
-				 * start rebounding process.
-				 */
-};
-
 struct channel_config {
 	uint8_t *blocks_ptr;	/* Address where the blocks start. */
 	size_t block_size;	/* Size of one block. */
@@ -167,7 +159,6 @@ struct icbmsg_config {
 struct ept_data {
 	const struct ipc_ept_cfg *cfg;	/* Endpoint configuration. */
 	atomic_t state;			/* Bounding state. */
-	atomic_t rebound_state;		/* Rebounding state. */
 	uint8_t addr;			/* Endpoint address. */
 };
 
@@ -777,18 +768,6 @@ static void ept_bound_process(struct backend_data *dev_data)
 		k_mutex_unlock(&dev_data->mutex);
 #endif
 	}
-
-	/* Check if any endpoint is ready to rebound and call the callback if it is. */
-	for (i = 0; i < NUM_EPT; i++) {
-		ept = &dev_data->ept[i];
-		matching_state = atomic_cas(&ept->rebound_state, EPT_REBOUNDING,
-						EPT_NORMAL);
-		if (matching_state) {
-			if (ept->cfg->cb.bound != NULL) {
-				ept->cfg->cb.bound(ept->cfg->priv);
-			}
-		}
-	}
 }
 
 /**
@@ -812,10 +791,7 @@ static struct ept_data *get_ept_and_rx_validate(struct backend_data *dev_data,
 	state = atomic_get(&ept->state);
 
 	if (state == EPT_READY) {
-		/* Ready state, ensure that it is not deregistered nor rebounding. */
-		if (atomic_get(&ept->rebound_state) != EPT_NORMAL) {
-			return NULL;
-		}
+		/* Valid state - nothing to do. */
 	} else if (state == EPT_BOUNDING) {
 		/* Endpoint bound callback was not called yet - call it. */
 		atomic_set(&ept->state, EPT_READY);
@@ -1077,28 +1053,9 @@ static int register_ept(const struct device *instance, void **token,
 {
 	struct backend_data *dev_data = instance->data;
 	struct ept_data *ept = NULL;
-	bool matching_state;
 	int ept_index;
 	int r = 0;
 
-	/* Try to find endpoint to rebound */
-	for (ept_index = 0; ept_index < NUM_EPT; ept_index++) {
-		ept = &dev_data->ept[ept_index];
-		if (ept->cfg == cfg) {
-			matching_state = atomic_cas(&ept->rebound_state, EPT_DEREGISTERED,
-						   EPT_REBOUNDING);
-			if (!matching_state) {
-				return -EINVAL;
-			}
-#ifdef CONFIG_MULTITHREADING
-			schedule_ept_bound_process(dev_data);
-#else
-			ept_bound_process(dev_data);
-#endif
-			return 0;
-		}
-	}
-
 	/* Reserve new endpoint index. */
 	ept_index = atomic_inc(&dev_data->flags) & FLAG_EPT_COUNT_MASK;
 	if (ept_index >= NUM_EPT) {
@@ -1129,23 +1086,6 @@ static int register_ept(const struct device *instance, void **token,
 	return r;
 }
 
-/**
- * Backend endpoint deregistration callback.
- */
-static int deregister_ept(const struct device *instance, void *token)
-{
-	struct ept_data *ept = token;
-	bool matching_state;
-
-	matching_state = atomic_cas(&ept->rebound_state, EPT_NORMAL, EPT_DEREGISTERED);
-
-	if (!matching_state) {
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
 /**
  * Returns maximum TX buffer size.
  */
@@ -1274,7 +1214,7 @@ const static struct ipc_service_backend backend_ops = {
 	.close_instance = NULL, /* not implemented */
 	.send = send,
 	.register_endpoint = register_ept,
-	.deregister_endpoint = deregister_ept,
+	.deregister_endpoint = NULL, /* not implemented */
 	.get_tx_buffer_size = get_tx_buffer_size,
 	.get_tx_buffer = get_tx_buffer,
 	.drop_tx_buffer = drop_tx_buffer,

From b4ec5318bf9b3d55d552a9639038cfaa6fbb6a27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:12 +0100
Subject: [PATCH 2078/2913] Revert "[nrf fromlist] tests: kernel: interrupt:
 nested_irq: support nrf54h ppr"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fea079bc933045b91c9eb66ae54472a6026143a8.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 tests/kernel/interrupt/src/nested_irq.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/kernel/interrupt/src/nested_irq.c b/tests/kernel/interrupt/src/nested_irq.c
index 1650a7b77ec..1bcb11c38ea 100644
--- a/tests/kernel/interrupt/src/nested_irq.c
+++ b/tests/kernel/interrupt/src/nested_irq.c
@@ -60,12 +60,6 @@
 #define IRQ0_LINE	16
 #define IRQ1_LINE	17
 
-#define IRQ0_PRIO	1
-#define IRQ1_PRIO	2
-#elif defined(CONFIG_SOC_NRF54H20_CPUPPR)
-#define IRQ0_LINE	14
-#define IRQ1_LINE	15
-
 #define IRQ0_PRIO	1
 #define IRQ1_PRIO	2
 #else

From 94879fd331478aaaa35ff8c7d09358bc8ae58c63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:12 +0100
Subject: [PATCH 2079/2913] Revert "[nrf fromlist] boards: nordic: nrf54h20dk:
 Disable asserts on ppr tests"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7851352579f7211fe90ec6c07e2ea1794be5782c.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf54h20dk/Kconfig.defconfig | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/Kconfig.defconfig b/boards/nordic/nrf54h20dk/Kconfig.defconfig
index a2be74d3648..e37975f96ad 100644
--- a/boards/nordic/nrf54h20dk/Kconfig.defconfig
+++ b/boards/nordic/nrf54h20dk/Kconfig.defconfig
@@ -14,11 +14,3 @@ config BT_CTLR
 	default y if BT
 
 endif # BOARD_NRF54H20DK_NRF54H20_CPURAD
-
-if BOARD_NRF54H20DK_NRF54H20_CPUPPR
-
-# As PPR has limited memory most of tests does not fit with asserts enabled.
-config ASSERT
-	default n if ZTEST
-
-endif # BOARD_NRF54H20DK_NRF54H20_CPUPPR

From e1b1eeb1fb2e16c4de3186c9a0a88ad17a714a1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:29:12 +0100
Subject: [PATCH 2080/2913] Revert "[nrf fromlist] scripts: pylib: twister:
 twisterlib: prevent empty gcda files"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 59cb93df5d7dd8eb17222992ff7a553f32633f90.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 scripts/pylib/twister/twisterlib/coverage.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/pylib/twister/twisterlib/coverage.py b/scripts/pylib/twister/twisterlib/coverage.py
index 00fc9ddaca3..8a0ea95569b 100644
--- a/scripts/pylib/twister/twisterlib/coverage.py
+++ b/scripts/pylib/twister/twisterlib/coverage.py
@@ -122,9 +122,8 @@ def create_gcda_files(self, extracted_coverage_info):
 
             try:
                 hexdump_val = self.merge_hexdumps(hexdumps)
-                hex_bytes = bytes.fromhex(hexdump_val)
                 with open(filename, 'wb') as fp:
-                    fp.write(hex_bytes)
+                    fp.write(bytes.fromhex(hexdump_val))
             except ValueError:
                 logger.exception("Unable to convert hex data for file: {}".format(filename))
                 gcda_created = False

From be1162efee06a11fab75c3416d5aae64d73a379c Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Fri, 7 Jun 2024 11:55:31 +0200
Subject: [PATCH 2081/2913] [nrf fromlist] scripts: gen_dts_cmake: Support
 variable target name in dts.cmake

Instead of hardcoding the name `devicetree_target`, we can update the
generated `dts.cmake` to accept `DEVICETREE_TARGET` as input variable.
This will become useful in multi-image builds, where we would like to
process multiple devicetrees.

Upstream PR #: 73903

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 4cd36a95bc22a77be0459eb39a9d725953fd6a57)
---
 cmake/modules/dts.cmake      |  2 ++
 scripts/dts/gen_dts_cmake.py | 21 ++++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/cmake/modules/dts.cmake b/cmake/modules/dts.cmake
index 737e083aa57..4ab76989f74 100644
--- a/cmake/modules/dts.cmake
+++ b/cmake/modules/dts.cmake
@@ -127,6 +127,8 @@ set(GEN_DTS_CMAKE_SCRIPT        ${DT_SCRIPTS}/gen_dts_cmake.py)
 # The generated information itself, which we include() after
 # creating it.
 set(DTS_CMAKE                   ${PROJECT_BINARY_DIR}/dts.cmake)
+# The CMake target to be initialized by including ${DTS_CMAKE}.
+set(DEVICETREE_TARGET           devicetree_target)
 
 # The location of a file containing known vendor prefixes, relative to
 # each element of DTS_ROOT. Users can define their own in their own
diff --git a/scripts/dts/gen_dts_cmake.py b/scripts/dts/gen_dts_cmake.py
index 47fd30b67b9..39496e74459 100755
--- a/scripts/dts/gen_dts_cmake.py
+++ b/scripts/dts/gen_dts_cmake.py
@@ -11,12 +11,13 @@
 
 The generated CMake file looks like this:
 
-  add_custom_target(devicetree_target)
-  set_target_properties(devicetree_target PROPERTIES
+  add_custom_target(${DEVICETREE_TARGET})
+  set_target_properties(${DEVICETREE_TARGET} PROPERTIES
                         "DT_PROP|/soc|compatible" "vnd,soc;")
   ...
 
-It defines a special CMake target, and saves various values in the
+It takes an input variable - DEVICETREE_TARGET - and creates a special
+CMake target with this name, which will contain various values in the
 devicetree as CMake target properties.
 
 Be careful:
@@ -170,15 +171,13 @@ def main():
         cmake_comp = f'DT_COMP|{comp}'
         cmake_props.append(f'"{cmake_comp}" "{cmake_path}"')
 
+    cmake_props = map(
+        'set_target_properties(${{DEVICETREE_TARGET}} PROPERTIES {})'.format,
+        cmake_props
+    )
     with open(args.cmake_out, "w", encoding="utf-8") as cmake_file:
-        print('add_custom_target(devicetree_target)', file=cmake_file)
-        print(file=cmake_file)
-
-        for prop in cmake_props:
-            print(
-                f'set_target_properties(devicetree_target PROPERTIES {prop})',
-                file=cmake_file
-            )
+        print('add_custom_target(${DEVICETREE_TARGET})\n', *cmake_props,
+              sep='\n', file=cmake_file)
 
 
 if __name__ == "__main__":

From 2ab3b1a49fcf252c623ff252cdb6c33560467bc1 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Fri, 7 Jun 2024 11:55:31 +0200
Subject: [PATCH 2082/2913] [nrf fromlist] sysbuild: dts: Introduce
 sysbuild_dt_* API

Add new functions to `sysbuild_extensions.cmake`, which will mirror the
familiar dt_* API from Zephyr `extensions.cmake`. For example:

   dt_nodelabel(<var> NODELABEL <label>)

gets the following sysbuild counterpart, with one extra argument:

   sysbuild_dt_nodelabel(<var> IMAGE <image> NODELABEL <label>)

This API allows sysbuild to retrieve devicetree information for a given
<image>, only after its respective `ExternalZephyrProject_Cmake()` call.

This works by importing the generated `dts.cmake` files from each
image's build directory, and creating multiple CMake targets to hold the
generated properties - much like how the `CMakeCache.txt` and `.config`
are also imported to be used by the related `sysbuild_get()` function.

The dt_* API itself also has to be updated, in order to read properties
from a variable `DEVICETREE_TARGET` set in the parent scope.

Upstream PR #: 73903

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 38fdd95d663c18f37719d92671cb02d539d06313)
---
 cmake/modules/extensions.cmake                | 71 +++++++++++++---
 .../cmake/modules/sysbuild_extensions.cmake   | 85 +++++++++++++++++++
 2 files changed, 144 insertions(+), 12 deletions(-)

diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index 411398b0ae8..91bfa14aeff 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -3799,6 +3799,9 @@ endfunction()
 #   alias at the beginning of a path interchangeably with the full
 #   path to the aliased node in these functions. The usage comments
 #   will make this clear in each case.
+#
+# - Each of these methods also has a sysbuild_dt_* counterpart.
+#   See share/sysbuild/cmake/modules/sysbuild_extensions.cmake.
 
 # Usage:
 #   dt_nodelabel(<var> NODELABEL <label>)
@@ -3826,6 +3829,10 @@ endfunction()
 # NODELABEL <label>  : Node label
 # REQUIRED           : Generate a fatal error if the node-label is not found
 function(dt_nodelabel var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_nodelabel(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(options "REQUIRED")
   set(req_single_args "NODELABEL")
   cmake_parse_arguments(DT_LABEL "${options}" "${req_single_args}" "" ${ARGN})
@@ -3842,7 +3849,7 @@ function(dt_nodelabel var)
     endif()
   endforeach()
 
-  get_target_property(${var} devicetree_target "DT_NODELABEL|${DT_LABEL_NODELABEL}")
+  get_target_property(${var} "${DEVICETREE_TARGET}" "DT_NODELABEL|${DT_LABEL_NODELABEL}")
   if(${${var}} STREQUAL ${var}-NOTFOUND)
     if(DT_LABEL_REQUIRED)
       message(FATAL_ERROR "required nodelabel not found: ${DT_LABEL_NODELABEL}")
@@ -3874,6 +3881,10 @@ endfunction()
 # PROPERTY <prop> : The alias to check
 # REQUIRED        : Generate a fatal error if the alias is not found
 function(dt_alias var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_alias(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(options "REQUIRED")
   set(req_single_args "PROPERTY")
   cmake_parse_arguments(DT_ALIAS "${options}" "${req_single_args}" "" ${ARGN})
@@ -3890,7 +3901,7 @@ function(dt_alias var)
     endif()
   endforeach()
 
-  get_target_property(${var} devicetree_target "DT_ALIAS|${DT_ALIAS_PROPERTY}")
+  get_target_property(${var} "${DEVICETREE_TARGET}" "DT_ALIAS|${DT_ALIAS_PROPERTY}")
   if(${${var}} STREQUAL ${var}-NOTFOUND)
     if(DT_ALIAS_REQUIRED)
       message(FATAL_ERROR "required alias not found: ${DT_ALIAS_PROPERTY}")
@@ -3918,6 +3929,10 @@ endfunction()
 # <var>       : Return variable where the check result will be returned
 # PATH <path> : Node path
 function(dt_node_exists var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_node_exists(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PATH")
   cmake_parse_arguments(DT_NODE "" "${req_single_args}" "" ${ARGN})
 
@@ -3963,6 +3978,10 @@ endfunction()
 # PATH <path>     : Node path
 # STATUS <status> : Status to check
 function(dt_node_has_status var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_node_has_status(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PATH;STATUS")
   cmake_parse_arguments(DT_NODE "" "${req_single_args}" "" ${ARGN})
 
@@ -4049,6 +4068,10 @@ endfunction()
 # INDEX <idx>    : Optional index when retrieving a value in an array property
 # REQUIRED       : Generate a fatal error if the property is not found
 function(dt_prop var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_prop(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(options "REQUIRED")
   set(req_single_args "PATH;PROPERTY")
   set(single_args "INDEX")
@@ -4067,7 +4090,7 @@ function(dt_prop var)
   endforeach()
 
   dt_path_internal(canonical "${DT_PROP_PATH}")
-  get_property(exists TARGET devicetree_target
+  get_property(exists TARGET "${DEVICETREE_TARGET}"
       PROPERTY "DT_PROP|${canonical}|${DT_PROP_PROPERTY}"
       SET
   )
@@ -4080,7 +4103,7 @@ function(dt_prop var)
     return()
   endif()
 
-  get_target_property(val devicetree_target
+  get_target_property(val "${DEVICETREE_TARGET}"
       "DT_PROP|${canonical}|${DT_PROP_PROPERTY}"
   )
 
@@ -4109,6 +4132,10 @@ endfunction()
 # INDEX <idx>            : Optional index when retrieving a value in an array property
 
 function(dt_comp_path var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_comp_path(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "COMPATIBLE")
   set(single_args "INDEX")
   cmake_parse_arguments(DT_COMP "" "${req_single_args};${single_args}" "" ${ARGN})
@@ -4125,7 +4152,7 @@ function(dt_comp_path var)
     endif()
   endforeach()
 
-  get_property(exists TARGET devicetree_target
+  get_property(exists TARGET "${DEVICETREE_TARGET}"
       PROPERTY "DT_COMP|${DT_COMP_COMPATIBLE}"
       SET
   )
@@ -4135,7 +4162,7 @@ function(dt_comp_path var)
     return()
   endif()
 
-  get_target_property(val devicetree_target
+  get_target_property(val "${DEVICETREE_TARGET}"
       "DT_COMP|${DT_COMP_COMPATIBLE}"
   )
 
@@ -4164,6 +4191,10 @@ endfunction()
 # <var>          : Return variable where the property value will be stored
 # PATH <path>    : Node path
 function(dt_num_regs var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_num_regs(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PATH")
   cmake_parse_arguments(DT_REG "" "${req_single_args}" "" ${ARGN})
 
@@ -4180,7 +4211,7 @@ function(dt_num_regs var)
   endforeach()
 
   dt_path_internal(canonical "${DT_REG_PATH}")
-  get_target_property(${var} devicetree_target "DT_REG|${canonical}|NUM")
+  get_target_property(${var} "${DEVICETREE_TARGET}" "DT_REG|${canonical}|NUM")
 
   set(${var} ${${var}} PARENT_SCOPE)
 endfunction()
@@ -4210,6 +4241,10 @@ endfunction()
 # INDEX <idx>    : Register block index number
 # NAME <name>    : Register block name
 function(dt_reg_addr var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_reg_addr(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PATH")
   set(single_args "INDEX;NAME")
   cmake_parse_arguments(DT_REG "" "${req_single_args};${single_args}" "" ${ARGN})
@@ -4239,7 +4274,7 @@ function(dt_reg_addr var)
   endif()
 
   dt_path_internal(canonical "${DT_REG_PATH}")
-  get_target_property(${var}_list devicetree_target "DT_REG|${canonical}|ADDR")
+  get_target_property(${var}_list "${DEVICETREE_TARGET}" "DT_REG|${canonical}|ADDR")
 
   list(GET ${var}_list ${DT_REG_INDEX} ${var})
 
@@ -4270,6 +4305,10 @@ endfunction()
 # INDEX <idx>    : Register block index number
 # NAME <name>    : Register block name
 function(dt_reg_size var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_reg_size(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PATH")
   set(single_args "INDEX;NAME")
   cmake_parse_arguments(DT_REG "" "${req_single_args};${single_args}" "" ${ARGN})
@@ -4299,7 +4338,7 @@ function(dt_reg_size var)
   endif()
 
   dt_path_internal(canonical "${DT_REG_PATH}")
-  get_target_property(${var}_list devicetree_target "DT_REG|${canonical}|SIZE")
+  get_target_property(${var}_list "${DEVICETREE_TARGET}" "DT_REG|${canonical}|SIZE")
 
   list(GET ${var}_list ${DT_REG_INDEX} ${var})
 
@@ -4347,6 +4386,10 @@ endfunction()
 # <var>           : Return variable
 # PROPERTY <prop> : Chosen property
 function(dt_has_chosen var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_has_chosen(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PROPERTY")
   cmake_parse_arguments(DT_CHOSEN "" "${req_single_args}" "" ${ARGN})
 
@@ -4362,7 +4405,7 @@ function(dt_has_chosen var)
     endif()
   endforeach()
 
-  get_target_property(exists devicetree_target "DT_CHOSEN|${DT_CHOSEN_PROPERTY}")
+  get_target_property(exists "${DEVICETREE_TARGET}" "DT_CHOSEN|${DT_CHOSEN_PROPERTY}")
 
   if(${exists} STREQUAL exists-NOTFOUND)
     set(${var} FALSE PARENT_SCOPE)
@@ -4382,6 +4425,10 @@ endfunction()
 # <var>           : Return variable where the node path will be stored
 # PROPERTY <prop> : Chosen property
 function(dt_chosen var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_chosen(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PROPERTY")
   cmake_parse_arguments(DT_CHOSEN "" "${req_single_args}" "" ${ARGN})
 
@@ -4397,7 +4444,7 @@ function(dt_chosen var)
     endif()
   endforeach()
 
-  get_target_property(${var} devicetree_target "DT_CHOSEN|${DT_CHOSEN_PROPERTY}")
+  get_target_property(${var} "${DEVICETREE_TARGET}" "DT_CHOSEN|${DT_CHOSEN_PROPERTY}")
 
   if(${${var}} STREQUAL ${var}-NOTFOUND)
     set(${var} PARENT_SCOPE)
@@ -4469,7 +4516,7 @@ endfunction()
 # to an existing node. Set it to FALSE otherwise. See
 # dt_path_internal for a definition and examples of 'canonical' paths.
 function(dt_path_internal_exists var path)
-  get_target_property(path_prop devicetree_target "DT_NODE|${path}")
+  get_target_property(path_prop "${DEVICETREE_TARGET}" "DT_NODE|${path}")
   if (path_prop)
     set(${var} TRUE PARENT_SCOPE)
   else()
diff --git a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
index b9987fb14d4..47a7ce2c939 100644
--- a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
+++ b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
@@ -518,6 +518,8 @@ function(ExternalZephyrProject_Cmake)
   endif()
   load_cache(IMAGE ${ZCMAKE_APPLICATION} BINARY_DIR ${BINARY_DIR})
   import_kconfig(CONFIG_ ${BINARY_DIR}/zephyr/.config TARGET ${ZCMAKE_APPLICATION})
+  set(DEVICETREE_TARGET ${ZCMAKE_APPLICATION}_devicetree_target)
+  include(${BINARY_DIR}/zephyr/dts.cmake)
 
   # This custom target informs CMake how the BYPRODUCTS are generated if a target
   # depends directly on the BYPRODUCT instead of depending on the image target.
@@ -769,3 +771,86 @@ function(sysbuild_images_order variable dependency_type)
   topological_sort(TARGETS ${SIS_IMAGES} PROPERTY_NAME ${property_name} RESULT sorted)
   set(${variable} ${sorted} PARENT_SCOPE)
 endfunction()
+
+# Internal macro for defining the sysbuild_dt_* CMake extensions, used to
+# retrieve devicetree information from a Zephyr based build system.
+#
+# It takes a dt_* function <name> and adds common wrapper code, which
+# adds an `IMAGE` argument to select the devicetree of a given <image>,
+# and forwards all other arguments to the original function, including
+# the sole return variable <var> - a common trait of the dt_* API.
+#
+# For additional documentation of each dt_* CMake extension,
+# see section 4.1. of cmake/modules/extensions.cmake.
+#
+macro(sysbuild_dt_function name)
+  function(sysbuild_${name} var)
+    cmake_parse_arguments(PARSE_ARGV 1 SBDT "" "IMAGE" "")
+    zephyr_check_arguments_required_all("sysbuild_${name}" SBDT IMAGE)
+
+    set(DEVICETREE_TARGET ${SBDT_IMAGE}_devicetree_target)
+    if(NOT TARGET ${SBDT_IMAGE} OR NOT TARGET ${DEVICETREE_TARGET})
+      message(FATAL_ERROR "sysbuild_${name}(...) image '${SBDT_IMAGE}' "
+                          "does not exist or its devicetree is not loaded yet"
+      )
+    endif()
+
+    cmake_language(CALL ${name} ${var} ${SBDT_UNPARSED_ARGUMENTS})
+    set(${var} "${${var}}" PARENT_SCOPE)
+  endfunction()
+endmacro()
+
+# Usage:
+#   sysbuild_dt_nodelabel(<var> IMAGE <image> NODELABEL <label>)
+#
+sysbuild_dt_function(dt_nodelabel)
+
+# Usage:
+#   sysbuild_dt_alias(<var> IMAGE <image> PROPERTY <prop>)
+#
+sysbuild_dt_function(dt_alias)
+
+# Usage:
+#   sysbuild_dt_node_exists(<var> IMAGE <image> PATH <path>)
+#
+sysbuild_dt_function(dt_node_exists)
+
+# Usage:
+#   sysbuild_dt_node_has_status(<var> IMAGE <image> PATH <path> STATUS <status>)
+#
+sysbuild_dt_function(dt_node_has_status)
+
+# Usage:
+#   sysbuild_dt_prop(<var> IMAGE <image> PATH <path> PROPERTY <prop> [INDEX <idx>])
+#
+sysbuild_dt_function(dt_prop)
+
+# Usage:
+#   sysbuild_dt_comp_path(<var> IMAGE <image> COMPATIBLE <compatible> [INDEX <idx>])
+#
+sysbuild_dt_function(dt_comp_path)
+
+# Usage:
+#   sysbuild_dt_num_regs(<var> IMAGE <image> PATH <path>)
+#
+sysbuild_dt_function(dt_num_regs)
+
+# Usage:
+#   sysbuild_dt_reg_addr(<var> IMAGE <image> PATH <path> [INDEX <idx>] [NAME <name>])
+#
+sysbuild_dt_function(dt_reg_addr)
+
+# Usage:
+#   sysbuild_dt_reg_size(<var> IMAGE <image> PATH <path> [INDEX <idx>] [NAME <name>])
+#
+sysbuild_dt_function(dt_reg_size)
+
+# Usage:
+#   sysbuild_dt_has_chosen(<var> IMAGE <image> PROPERTY <prop>)
+#
+sysbuild_dt_function(dt_has_chosen)
+
+# Usage:
+#   sysbuild_dt_chosen(<var> IMAGE <image> PROPERTY <prop>)
+#
+sysbuild_dt_function(dt_chosen)

From 88e9f91ffa5b30f3b20c8fed5dbcd5cc88b1d32e Mon Sep 17 00:00:00 2001
From: Riadh Ghaddab <rghaddab@baylibre.com>
Date: Tue, 17 Sep 2024 11:16:28 +0200
Subject: [PATCH 2083/2913] [nrf fromlist] settings: ZMS: add a backend for ZMS
 (Zephyr Memory Storage)

This adds the initial backend support for the ZMS storage system.

Upstream PR #: 78632

Signed-off-by: Riadh Ghaddab <rghaddab@baylibre.com>
(cherry picked from commit 8ed9b80c546d794239c3fa1c9f9d090b8746ead4)
---
 subsys/settings/Kconfig                       |  41 ++
 .../settings/include/settings/settings_zms.h  |  64 +++
 subsys/settings/src/CMakeLists.txt            |   1 +
 subsys/settings/src/settings_zms.c            | 432 ++++++++++++++++++
 tests/subsys/settings/zms/CMakeLists.txt      |   7 +
 tests/subsys/settings/zms/prj.conf            |   8 +
 tests/subsys/settings/zms/src/CMakeLists.txt  |  12 +
 tests/subsys/settings/zms/src/settings_test.h |  42 ++
 .../settings/zms/src/settings_test_zms.c      | 125 +++++
 tests/subsys/settings/zms/testcase.yaml       |   7 +
 10 files changed, 739 insertions(+)
 create mode 100644 subsys/settings/include/settings/settings_zms.h
 create mode 100644 subsys/settings/src/settings_zms.c
 create mode 100644 tests/subsys/settings/zms/CMakeLists.txt
 create mode 100644 tests/subsys/settings/zms/prj.conf
 create mode 100644 tests/subsys/settings/zms/src/CMakeLists.txt
 create mode 100644 tests/subsys/settings/zms/src/settings_test.h
 create mode 100644 tests/subsys/settings/zms/src/settings_test_zms.c
 create mode 100644 tests/subsys/settings/zms/testcase.yaml

diff --git a/subsys/settings/Kconfig b/subsys/settings/Kconfig
index bc015cde9c7..48eacf82a8c 100644
--- a/subsys/settings/Kconfig
+++ b/subsys/settings/Kconfig
@@ -32,6 +32,7 @@ config SETTINGS_ENCODE_LEN
 
 choice SETTINGS_BACKEND
 	prompt "Storage back-end"
+	default SETTINGS_ZMS if ZMS
 	default SETTINGS_NVS if NVS
 	default SETTINGS_FCB if FCB
 	default SETTINGS_FILE if FILE_SYSTEM
@@ -39,6 +40,31 @@ choice SETTINGS_BACKEND
 	help
 	  Storage back-end to be used by the settings subsystem.
 
+config SETTINGS_ZMS
+	bool "ZMS (Zephyr Memory Storage)"
+	depends on ZMS
+	help
+	  Use ZMS as settings storage backend.
+
+if SETTINGS_ZMS
+
+config SETTINGS_ZMS_NAME_CACHE
+	bool "ZMS name lookup cache"
+	select SYS_HASH_FUNC32
+	help
+	  Enable ZMS name lookup cache, used to reduce the Settings name
+	  lookup time.
+
+config SETTINGS_ZMS_NAME_CACHE_SIZE
+	int "ZMS name lookup cache size"
+	default 128
+	range 1 $(UINT32_MAX)
+	depends on SETTINGS_ZMS_NAME_CACHE
+	help
+	  Number of entries in Settings ZMS name cache.
+
+endif # SETTINGS_ZMS
+
 config SETTINGS_FCB
 	bool "FCB"
 	depends on FCB
@@ -132,6 +158,21 @@ config SETTINGS_NVS_SECTOR_COUNT
 	help
 	  Number of sectors used for the NVS settings area
 
+config SETTINGS_ZMS_SECTOR_SIZE_MULT
+	int "Sector size of the ZMS settings area"
+	default 1
+	depends on SETTINGS_ZMS
+	help
+	  The sector size to use for the ZMS settings area as a multiple of
+	  FLASH_ERASE_BLOCK_SIZE.
+
+config SETTINGS_ZMS_SECTOR_COUNT
+	int "Sector count of the ZMS settings area"
+	default 8
+	depends on SETTINGS_ZMS
+	help
+	  Number of sectors used for the ZMS settings area
+
 config SETTINGS_SHELL
 	bool "Settings shell"
 	depends on SHELL
diff --git a/subsys/settings/include/settings/settings_zms.h b/subsys/settings/include/settings/settings_zms.h
new file mode 100644
index 00000000000..dd9fb3aba12
--- /dev/null
+++ b/subsys/settings/include/settings/settings_zms.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2024 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __SETTINGS_ZMS_H_
+#define __SETTINGS_ZMS_H_
+
+#include <zephyr/fs/zms.h>
+#include <zephyr/settings/settings.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* In the ZMS backend, each setting is stored in two ZMS entries:
+ *	1. setting's name
+ *	2. setting's value
+ *
+ * The ZMS entry ID for the setting's value is determined implicitly based on
+ * the ID of the ZMS entry for the setting's name, once that is found. The
+ * difference between name and value ID is constant and equal to
+ * ZMS_NAME_ID_OFFSET.
+ *
+ * Setting's name entries start from ZMS_NAMECNT_ID + 1.
+ * The entry with ID == ZMS_NAMECNT_ID is used to store the largest name ID in use.
+ *
+ * Deleted records will not be found, only the last record will be read.
+ */
+#define ZMS_NAMECNT_ID     0x80000000
+#define ZMS_NAME_ID_OFFSET 0x40000000
+
+struct settings_zms {
+	struct settings_store cf_store;
+	struct zms_fs cf_zms;
+	uint32_t last_name_id;
+	const struct device *flash_dev;
+#if CONFIG_SETTINGS_ZMS_NAME_CACHE
+	struct {
+		uint32_t name_hash;
+		uint32_t name_id;
+	} cache[CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE];
+
+	uint32_t cache_next;
+	uint32_t cache_total;
+	bool loaded;
+#endif
+};
+
+/* register zms to be a source of settings */
+int settings_zms_src(struct settings_zms *cf);
+
+/* register zms to be the destination of settings */
+int settings_zms_dst(struct settings_zms *cf);
+
+/* Initialize a zms backend. */
+int settings_zms_backend_init(struct settings_zms *cf);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SETTINGS_ZMS_H_ */
diff --git a/subsys/settings/src/CMakeLists.txt b/subsys/settings/src/CMakeLists.txt
index d4ec6e76142..4aa797fbb35 100644
--- a/subsys/settings/src/CMakeLists.txt
+++ b/subsys/settings/src/CMakeLists.txt
@@ -13,3 +13,4 @@ zephyr_sources_ifdef(CONFIG_SETTINGS_FCB settings_fcb.c)
 zephyr_sources_ifdef(CONFIG_SETTINGS_NVS settings_nvs.c)
 zephyr_sources_ifdef(CONFIG_SETTINGS_NONE settings_none.c)
 zephyr_sources_ifdef(CONFIG_SETTINGS_SHELL settings_shell.c)
+zephyr_sources_ifdef(CONFIG_SETTINGS_ZMS settings_zms.c)
diff --git a/subsys/settings/src/settings_zms.c b/subsys/settings/src/settings_zms.c
new file mode 100644
index 00000000000..0f1164e4ea1
--- /dev/null
+++ b/subsys/settings/src/settings_zms.c
@@ -0,0 +1,432 @@
+/*
+ * Copyright (c) 2024 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <errno.h>
+#include <string.h>
+
+#include "settings/settings_zms.h"
+#include "settings_priv.h"
+
+#include <zephyr/settings/settings.h>
+#include <zephyr/sys/hash_function.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/logging/log.h>
+LOG_MODULE_DECLARE(settings, CONFIG_SETTINGS_LOG_LEVEL);
+
+#if DT_HAS_CHOSEN(zephyr_settings_partition)
+#define SETTINGS_PARTITION DT_FIXED_PARTITION_ID(DT_CHOSEN(zephyr_settings_partition))
+#else
+#define SETTINGS_PARTITION FIXED_PARTITION_ID(storage_partition)
+#endif
+
+struct settings_zms_read_fn_arg {
+	struct zms_fs *fs;
+	uint32_t id;
+};
+
+static int settings_zms_load(struct settings_store *cs, const struct settings_load_arg *arg);
+static int settings_zms_save(struct settings_store *cs, const char *name, const char *value,
+			     size_t val_len);
+static void *settings_zms_storage_get(struct settings_store *cs);
+
+static struct settings_store_itf settings_zms_itf = {.csi_load = settings_zms_load,
+						     .csi_save = settings_zms_save,
+						     .csi_storage_get = settings_zms_storage_get};
+
+static ssize_t settings_zms_read_fn(void *back_end, void *data, size_t len)
+{
+	struct settings_zms_read_fn_arg *rd_fn_arg;
+
+	rd_fn_arg = (struct settings_zms_read_fn_arg *)back_end;
+
+	return zms_read(rd_fn_arg->fs, rd_fn_arg->id, data, len);
+}
+
+int settings_zms_src(struct settings_zms *cf)
+{
+	cf->cf_store.cs_itf = &settings_zms_itf;
+	settings_src_register(&cf->cf_store);
+
+	return 0;
+}
+
+int settings_zms_dst(struct settings_zms *cf)
+{
+	cf->cf_store.cs_itf = &settings_zms_itf;
+	settings_dst_register(&cf->cf_store);
+
+	return 0;
+}
+
+#if CONFIG_SETTINGS_ZMS_NAME_CACHE
+#define SETTINGS_ZMS_CACHE_OVFL(cf) ((cf)->cache_total > ARRAY_SIZE((cf)->cache))
+
+static void settings_zms_cache_add(struct settings_zms *cf, const char *name, uint32_t name_id)
+{
+	uint32_t name_hash = sys_hash32(name, strlen(name));
+
+	cf->cache[cf->cache_next].name_hash = name_hash;
+	cf->cache[cf->cache_next++].name_id = name_id;
+
+	cf->cache_next %= CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE;
+}
+
+static uint32_t settings_zms_cache_match(struct settings_zms *cf, const char *name, char *rdname,
+					 size_t len)
+{
+	uint32_t name_hash = sys_hash32(name, strlen(name));
+	int rc;
+
+	for (int i = 0; i < CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE; i++) {
+		if (cf->cache[i].name_hash != name_hash) {
+			continue;
+		}
+
+		if (cf->cache[i].name_id <= ZMS_NAMECNT_ID) {
+			continue;
+		}
+
+		rc = zms_read(&cf->cf_zms, cf->cache[i].name_id, rdname, len);
+		if (rc < 0) {
+			continue;
+		}
+
+		rdname[rc] = '\0';
+
+		if (strcmp(name, rdname)) {
+			continue;
+		}
+
+		return cf->cache[i].name_id;
+	}
+
+	return ZMS_NAMECNT_ID;
+}
+#endif /* CONFIG_SETTINGS_ZMS_NAME_CACHE */
+
+static int settings_zms_load(struct settings_store *cs, const struct settings_load_arg *arg)
+{
+	int ret = 0;
+	struct settings_zms *cf = CONTAINER_OF(cs, struct settings_zms, cf_store);
+	struct settings_zms_read_fn_arg read_fn_arg;
+	char name[SETTINGS_MAX_NAME_LEN + SETTINGS_EXTRA_LEN + 1];
+	ssize_t rc1, rc2;
+	uint32_t name_id = ZMS_NAMECNT_ID;
+
+#if CONFIG_SETTINGS_ZMS_NAME_CACHE
+	uint32_t cached = 0;
+
+	cf->loaded = false;
+#endif
+
+	name_id = cf->last_name_id + 1;
+
+	while (1) {
+
+		name_id--;
+		if (name_id == ZMS_NAMECNT_ID) {
+#if CONFIG_SETTINGS_ZMS_NAME_CACHE
+			cf->loaded = true;
+			cf->cache_total = cached;
+#endif
+			break;
+		}
+
+		/* In the ZMS backend, each setting item is stored in two ZMS
+		 * entries one for the setting's name and one with the
+		 * setting's value.
+		 */
+		rc1 = zms_read(&cf->cf_zms, name_id, &name, sizeof(name));
+		/* get the length of data and verify that it exists */
+		rc2 = zms_get_data_length(&cf->cf_zms, name_id + ZMS_NAME_ID_OFFSET);
+
+		if ((rc1 <= 0) && (rc2 <= 0)) {
+			/* Settings largest ID in use is invalid due to
+			 * reset, power failure or partition overflow.
+			 * Decrement it and check the next ID in subsequent
+			 * iteration.
+			 */
+			if (name_id == cf->last_name_id) {
+				cf->last_name_id--;
+				zms_write(&cf->cf_zms, ZMS_NAMECNT_ID, &cf->last_name_id,
+					  sizeof(uint32_t));
+			}
+
+			continue;
+		}
+
+		if ((rc1 <= 0) || (rc2 <= 0)) {
+			/* Settings item is not stored correctly in the ZMS.
+			 * ZMS entry for its name or value is either missing
+			 * or deleted. Clean dirty entries to make space for
+			 * future settings item.
+			 */
+			zms_delete(&cf->cf_zms, name_id);
+			zms_delete(&cf->cf_zms, name_id + ZMS_NAME_ID_OFFSET);
+
+			if (name_id == cf->last_name_id) {
+				cf->last_name_id--;
+				zms_write(&cf->cf_zms, ZMS_NAMECNT_ID, &cf->last_name_id,
+					  sizeof(uint32_t));
+			}
+
+			continue;
+		}
+
+		/* Found a name, this might not include a trailing \0 */
+		name[rc1] = '\0';
+		read_fn_arg.fs = &cf->cf_zms;
+		read_fn_arg.id = name_id + ZMS_NAME_ID_OFFSET;
+
+#if CONFIG_SETTINGS_ZMS_NAME_CACHE
+		settings_zms_cache_add(cf, name, name_id);
+		cached++;
+#endif
+
+		ret = settings_call_set_handler(name, rc2, settings_zms_read_fn, &read_fn_arg,
+						(void *)arg);
+		if (ret) {
+			break;
+		}
+	}
+	return ret;
+}
+
+static int settings_zms_save(struct settings_store *cs, const char *name, const char *value,
+			     size_t val_len)
+{
+	struct settings_zms *cf = CONTAINER_OF(cs, struct settings_zms, cf_store);
+	char rdname[SETTINGS_MAX_NAME_LEN + SETTINGS_EXTRA_LEN + 1];
+	uint32_t name_id, write_name_id;
+	bool delete, write_name;
+	int rc = 0;
+
+	if (!name) {
+		return -EINVAL;
+	}
+
+	/* Find out if we are doing a delete */
+	delete = ((value == NULL) || (val_len == 0));
+
+#if CONFIG_SETTINGS_ZMS_NAME_CACHE
+	bool name_in_cache = false;
+
+	name_id = settings_zms_cache_match(cf, name, rdname, sizeof(rdname));
+	if (name_id != ZMS_NAMECNT_ID) {
+		write_name_id = name_id;
+		write_name = false;
+		name_in_cache = true;
+		goto found;
+	}
+#endif
+
+	/* No entry with "name" is in cache, let's find if it exists in the storage */
+	name_id = cf->last_name_id + 1;
+	write_name_id = cf->last_name_id + 1;
+	write_name = true;
+
+#if CONFIG_SETTINGS_ZMS_NAME_CACHE
+	/* We can skip reading ZMS if we know that the cache wasn't overflowed. */
+	if (cf->loaded && !SETTINGS_ZMS_CACHE_OVFL(cf)) {
+		goto found;
+	}
+#endif
+
+	/* Let's find if we already have an ID within storage */
+	while (1) {
+		name_id--;
+		if (name_id == ZMS_NAMECNT_ID) {
+			break;
+		}
+
+		rc = zms_read(&cf->cf_zms, name_id, &rdname, sizeof(rdname));
+
+		if (rc < 0) {
+			/* Error or entry not found */
+			if (rc == -ENOENT) {
+				/* This is a free ID let's keep it */
+				write_name_id = name_id;
+			}
+			continue;
+		}
+
+		rdname[rc] = '\0';
+
+		if (strcmp(name, rdname)) {
+			/* ID exists but the name is different, that's not the ID
+			 * we are looking for.
+			 */
+			continue;
+		}
+
+		/* At this step we found the ID that corresponds to name */
+		if (!delete) {
+			write_name_id = name_id;
+			write_name = false;
+		}
+
+		goto found;
+	}
+
+found:
+	if (delete) {
+		if (name_id == ZMS_NAMECNT_ID) {
+			return 0;
+		}
+
+		rc = zms_delete(&cf->cf_zms, name_id);
+		if (rc >= 0) {
+			rc = zms_delete(&cf->cf_zms, name_id + ZMS_NAME_ID_OFFSET);
+		}
+
+		if (rc < 0) {
+			return rc;
+		}
+
+		if (name_id == cf->last_name_id) {
+			cf->last_name_id--;
+			rc = zms_write(&cf->cf_zms, ZMS_NAMECNT_ID, &cf->last_name_id,
+				       sizeof(uint32_t));
+			if (rc < 0) {
+				/* Error: can't to store
+				 * the largest name ID in use.
+				 */
+				return rc;
+			}
+		}
+
+		return 0;
+	}
+
+	/* No free IDs left. */
+	if (write_name_id == ZMS_NAMECNT_ID + ZMS_NAME_ID_OFFSET - 1) {
+		return -ENOMEM;
+	}
+
+	/* update the last_name_id and write to flash if required*/
+	if (write_name_id > cf->last_name_id) {
+		cf->last_name_id = write_name_id;
+		rc = zms_write(&cf->cf_zms, ZMS_NAMECNT_ID, &cf->last_name_id, sizeof(uint32_t));
+		if (rc < 0) {
+			return rc;
+		}
+	}
+
+	/* write the value */
+	rc = zms_write(&cf->cf_zms, write_name_id + ZMS_NAME_ID_OFFSET, value, val_len);
+	if (rc < 0) {
+		return rc;
+	}
+
+	/* write the name if required */
+	if (write_name) {
+		rc = zms_write(&cf->cf_zms, write_name_id, name, strlen(name));
+		if (rc < 0) {
+			return rc;
+		}
+	}
+
+#if CONFIG_SETTINGS_ZMS_NAME_CACHE
+	if (!name_in_cache) {
+		settings_zms_cache_add(cf, name, write_name_id);
+		if (cf->loaded && !SETTINGS_ZMS_CACHE_OVFL(cf)) {
+			cf->cache_total++;
+		}
+	}
+#endif
+
+	return 0;
+}
+
+/* Initialize the zms backend. */
+int settings_zms_backend_init(struct settings_zms *cf)
+{
+	int rc;
+	uint32_t last_name_id;
+
+	cf->cf_zms.flash_device = cf->flash_dev;
+	if (cf->cf_zms.flash_device == NULL) {
+		return -ENODEV;
+	}
+
+	rc = zms_mount(&cf->cf_zms);
+	if (rc) {
+		return rc;
+	}
+
+	rc = zms_read(&cf->cf_zms, ZMS_NAMECNT_ID, &last_name_id, sizeof(last_name_id));
+	if (rc < 0) {
+		cf->last_name_id = ZMS_NAMECNT_ID;
+	} else {
+		cf->last_name_id = last_name_id;
+	}
+
+	LOG_DBG("Initialized");
+	return 0;
+}
+
+int settings_backend_init(void)
+{
+	static struct settings_zms default_settings_zms;
+	int rc;
+	uint32_t cnt = 0;
+	size_t zms_sector_size, zms_size = 0;
+	const struct flash_area *fa;
+	struct flash_sector hw_flash_sector;
+	uint32_t sector_cnt = 1;
+
+	rc = flash_area_open(SETTINGS_PARTITION, &fa);
+	if (rc) {
+		return rc;
+	}
+
+	rc = flash_area_get_sectors(SETTINGS_PARTITION, &sector_cnt, &hw_flash_sector);
+	if (rc != 0 && rc != -ENOMEM) {
+		return rc;
+	}
+
+	zms_sector_size = CONFIG_SETTINGS_ZMS_SECTOR_SIZE_MULT * hw_flash_sector.fs_size;
+
+	if (zms_sector_size > UINT32_MAX) {
+		return -EDOM;
+	}
+
+	while (cnt < CONFIG_SETTINGS_ZMS_SECTOR_COUNT) {
+		zms_size += zms_sector_size;
+		if (zms_size > fa->fa_size) {
+			break;
+		}
+		cnt++;
+	}
+
+	/* define the zms file system using the page_info */
+	default_settings_zms.cf_zms.sector_size = zms_sector_size;
+	default_settings_zms.cf_zms.sector_count = cnt;
+	default_settings_zms.cf_zms.offset = fa->fa_off;
+	default_settings_zms.flash_dev = fa->fa_dev;
+
+	rc = settings_zms_backend_init(&default_settings_zms);
+	if (rc) {
+		return rc;
+	}
+
+	rc = settings_zms_src(&default_settings_zms);
+
+	if (rc) {
+		return rc;
+	}
+
+	rc = settings_zms_dst(&default_settings_zms);
+
+	return rc;
+}
+
+static void *settings_zms_storage_get(struct settings_store *cs)
+{
+	struct settings_zms *cf = CONTAINER_OF(cs, struct settings_zms, cf_store);
+
+	return &cf->cf_zms;
+}
diff --git a/tests/subsys/settings/zms/CMakeLists.txt b/tests/subsys/settings/zms/CMakeLists.txt
new file mode 100644
index 00000000000..218451c840e
--- /dev/null
+++ b/tests/subsys/settings/zms/CMakeLists.txt
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(test_settings_zms_raw)
+
+add_subdirectory(./src zms_test_bindir)
diff --git a/tests/subsys/settings/zms/prj.conf b/tests/subsys/settings/zms/prj.conf
new file mode 100644
index 00000000000..3de961c7c72
--- /dev/null
+++ b/tests/subsys/settings/zms/prj.conf
@@ -0,0 +1,8 @@
+CONFIG_ZTEST=y
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_ZMS=y
+
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_RUNTIME=y
+CONFIG_SETTINGS_ZMS=y
diff --git a/tests/subsys/settings/zms/src/CMakeLists.txt b/tests/subsys/settings/zms/src/CMakeLists.txt
new file mode 100644
index 00000000000..220a42849a8
--- /dev/null
+++ b/tests/subsys/settings/zms/src/CMakeLists.txt
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2024 BayLibre SAS
+
+zephyr_include_directories(
+	${ZEPHYR_BASE}/subsys/settings/include
+	${ZEPHYR_BASE}/subsys/settings/src
+	${ZEPHYR_BASE}/tests/subsys/settings/zms/src
+	)
+
+target_sources(app PRIVATE settings_test_zms.c)
+
+add_subdirectory(../../src settings_test_bindir)
diff --git a/tests/subsys/settings/zms/src/settings_test.h b/tests/subsys/settings/zms/src/settings_test.h
new file mode 100644
index 00000000000..472ff71f59b
--- /dev/null
+++ b/tests/subsys/settings/zms/src/settings_test.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2024 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef _SETTINGS_TEST_ZMS_H
+#define _SETTINGS_TEST_ZMS_H
+
+#include <stdio.h>
+#include <string.h>
+#include <zephyr/ztest.h>
+
+#include <zephyr/settings/settings.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint8_t val8;
+extern uint8_t val8_un;
+extern uint32_t val32;
+extern uint64_t val64;
+
+extern int test_get_called;
+extern int test_set_called;
+extern int test_commit_called;
+extern int test_export_block;
+
+extern struct settings_handler c_test_handlers[];
+
+void ctest_clear_call_state(void);
+int ctest_get_call_state(void);
+
+void config_wipe_srcs(void);
+void *settings_config_setup(void);
+void settings_config_teardown(void *fixture);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _SETTINGS_TEST_ZMS_H */
diff --git a/tests/subsys/settings/zms/src/settings_test_zms.c b/tests/subsys/settings/zms/src/settings_test_zms.c
new file mode 100644
index 00000000000..17a5ccd56fe
--- /dev/null
+++ b/tests/subsys/settings/zms/src/settings_test_zms.c
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2024 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stdlib.h>
+#include <string.h>
+
+#include "settings_priv.h"
+#include "settings_test.h"
+
+uint8_t val8;
+uint8_t val8_un;
+uint32_t val32;
+uint64_t val64;
+
+int test_get_called;
+int test_set_called;
+int test_commit_called;
+int test_export_block;
+
+int c1_handle_get(const char *name, char *val, int val_len_max);
+int c1_handle_set(const char *name, size_t len, settings_read_cb read_cb, void *cb_arg);
+int c1_handle_commit(void);
+int c1_handle_export(int (*cb)(const char *name, const void *value, size_t val_len));
+
+struct settings_handler c_test_handlers[] = {
+	{.name = "myfoo",
+	 .h_get = c1_handle_get,
+	 .h_set = c1_handle_set,
+	 .h_commit = c1_handle_commit,
+	 .h_export = c1_handle_export},
+};
+
+int c1_handle_get(const char *name, char *val, int val_len_max)
+{
+	const char *next;
+
+	test_get_called = 1;
+
+	if (settings_name_steq(name, "mybar", &next) && !next) {
+		val_len_max = MIN(val_len_max, sizeof(val8));
+		memcpy(val, &val8, MIN(val_len_max, sizeof(val8)));
+		return val_len_max;
+	}
+
+	if (settings_name_steq(name, "mybar64", &next) && !next) {
+		val_len_max = MIN(val_len_max, sizeof(val64));
+		memcpy(val, &val64, MIN(val_len_max, sizeof(val64)));
+		return val_len_max;
+	}
+
+	return -ENOENT;
+}
+
+int c1_handle_set(const char *name, size_t len, settings_read_cb read_cb, void *cb_arg)
+{
+	size_t val_len;
+	int rc;
+	const char *next;
+
+	test_set_called = 1;
+	if (settings_name_steq(name, "mybar", &next) && !next) {
+		rc = read_cb(cb_arg, &val8, sizeof(val8));
+		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
+		return 0;
+	}
+
+	if (settings_name_steq(name, "mybar64", &next) && !next) {
+		rc = read_cb(cb_arg, &val64, sizeof(val64));
+		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
+		return 0;
+	}
+
+	if (settings_name_steq(name, "unaligned", &next) && !next) {
+		val_len = len;
+		zassert_equal(val_len, sizeof(val8_un), "value length: %d, ought equal 1", val_len);
+		rc = read_cb(cb_arg, &val8_un, sizeof(val8_un));
+		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
+		return 0;
+	}
+
+	return -ENOENT;
+}
+
+int c1_handle_commit(void)
+{
+	test_commit_called = 1;
+	return 0;
+}
+
+int c1_handle_export(int (*cb)(const char *name, const void *value, size_t val_len))
+{
+	if (test_export_block) {
+		return 0;
+	}
+
+	(void)cb("myfoo/mybar", &val8, sizeof(val8));
+
+	(void)cb("myfoo/mybar64", &val64, sizeof(val64));
+
+	(void)cb("myfoo/unaligned", &val8_un, sizeof(val8_un));
+
+	return 0;
+}
+
+void ctest_clear_call_state(void)
+{
+	test_get_called = 0;
+	test_set_called = 0;
+	test_commit_called = 0;
+}
+
+int ctest_get_call_state(void)
+{
+	return test_get_called + test_set_called + test_commit_called;
+}
+
+void config_wipe_srcs(void)
+{
+	sys_slist_init(&settings_load_srcs);
+	settings_save_dst = NULL;
+}
+
+ZTEST_SUITE(settings_config, NULL, settings_config_setup, NULL, NULL, settings_config_teardown);
diff --git a/tests/subsys/settings/zms/testcase.yaml b/tests/subsys/settings/zms/testcase.yaml
new file mode 100644
index 00000000000..2234fd4cd78
--- /dev/null
+++ b/tests/subsys/settings/zms/testcase.yaml
@@ -0,0 +1,7 @@
+tests:
+  settings.zms:
+    depends_on: zms
+    min_ram: 32
+    tags:
+      - settings
+      - zms

From db51f473910eddba06d6d9a4fb77aca761a247cf Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Tue, 26 Jan 2021 15:43:08 +0100
Subject: [PATCH 2084/2913] [nrf noup] ci: set `ZEPHYR_<MODULE_NAME>_KCONFIG`
 for NCS modules
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit sets `ZEPHYR_<MODULE_NAME>_KCONFIG` variable for each
Kconfig file discovered in `nrf/modules/<module>/Kconfig`.

This is not meant as a permanent solution; we should do more careful
consideration on the optimal approach forward that will allow
compliance_check.py to be used downstream with custom
module_ext_roots, and at the same time keep current flexibility for
module glue code handling intact.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
(cherry picked from commit df94528234c7fe2e5f5a1bd7f732b39ff378a773)
---
 scripts/ci/check_compliance.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/scripts/ci/check_compliance.py b/scripts/ci/check_compliance.py
index 397edd09d35..c311b3f7265 100755
--- a/scripts/ci/check_compliance.py
+++ b/scripts/ci/check_compliance.py
@@ -414,6 +414,13 @@ def get_modules(self, modules_file, settings_file):
         modules = [name for name in os.listdir(modules_dir) if
                    os.path.exists(os.path.join(modules_dir, name, 'Kconfig'))]
 
+        nrf_modules_dir = ZEPHYR_BASE + '/../nrf/modules'
+        nrf_modules = []
+        if os.path.exists(nrf_modules_dir):
+            nrf_modules = [name for name in os.listdir(nrf_modules_dir) if
+                           os.path.exists(os.path.join(nrf_modules_dir, name,
+                                                       'Kconfig'))]
+
         with open(modules_file, 'r') as fp_module_file:
             content = fp_module_file.read()
 
@@ -423,6 +430,15 @@ def get_modules(self, modules_file, settings_file):
                     re.sub('[^a-zA-Z0-9]', '_', module).upper(),
                     modules_dir + '/' + module + '/Kconfig'
                 ))
+            for module in nrf_modules:
+                fp_module_file.write("ZEPHYR_{}_KCONFIG = {}\n".format(
+                    re.sub('[^a-zA-Z0-9]', '_', module).upper(),
+                    nrf_modules_dir + '/' + module + '/Kconfig'
+                ))
+                fp_module_file.write("NCS_{}_KCONFIG = {}\n".format(
+                    re.sub('[^a-zA-Z0-9]', '_', module).upper(),
+                    modules_dir + '/' + module + '/Kconfig'
+                ))
             fp_module_file.write(content)
 
     def get_module_setting_root(self, root, settings_file):

From 8c455f4ada9de8049f2d2ac4390c8271b4e11006 Mon Sep 17 00:00:00 2001
From: Piotr Golyzniak <piotr.golyzniak@nordicsemi.no>
Date: Mon, 1 Aug 2022 13:06:01 +0200
Subject: [PATCH 2085/2913] [nrf noup] ci: scripts: add quarantine file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add scripts/quarantine.yaml file, which will be used in CI.

Signed-off-by: Piotr Golyzniak <piotr.golyzniak@nordicsemi.no>
Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
Signed-off-by: Maciej Perkowski <Maciej.Perkowski@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 980e3ca8c6ac4b98bcf05de1582403da03b4cb08)
---
 scripts/quarantine.yaml | 88 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 scripts/quarantine.yaml

diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml
new file mode 100644
index 00000000000..20c4f9248ea
--- /dev/null
+++ b/scripts/quarantine.yaml
@@ -0,0 +1,88 @@
+# The configurations resulting as a product of scenarios and platforms
+# will be skipped if quarantine is used. More details here:
+# https://docs.zephyrproject.org/latest/guides/test/twister.html#quarantine
+
+- scenarios:
+    - testing.ztest.busy_sim
+    - testing.ztest.busy_sim_nrf52840dk_pin
+  platforms:
+    - nrf52840dk_nrf52840
+
+# Already reported, but will not be fixed (look at the discussion):
+# https://github.com/zephyrproject-rtos/zephyr/issues/44947
+- scenarios:
+    - libraries.cmsis_dsp.matrix.unary_f64
+  platforms:
+    - nrf5340dk_nrf5340_cpunet
+    - qemu_cortex_m3
+  comment: "Flash overflows"
+
+# Already reported, but will not be fixed (look at the discussion):
+# https://github.com/zephyrproject-rtos/zephyr/issues/44947
+- scenarios:
+    - libraries.cmsis_dsp.matrix.binary_f16
+    - libraries.cmsis_dsp.matrix.binary_f16.fpu
+  platforms:
+    - nrf5340dk_nrf5340_cpuapp_ns
+  comment: "Flash overflows"
+
+# Already reported, but will not be fixed (look at the discussion):
+# https://github.com/zephyrproject-rtos/zephyr/issues/44947
+- scenarios:
+    - libraries.cmsis_dsp.matrix.binary_q15
+    - libraries.cmsis_dsp.matrix.binary_q15.fpu
+    - libraries.cmsis_dsp.matrix.unary_f32
+    - libraries.cmsis_dsp.matrix.unary_f32.fpu
+    - libraries.cmsis_dsp.matrix.unary_f64
+    - libraries.cmsis_dsp.matrix.unary_f64.fpu
+  platforms:
+    - nrf5340dk_nrf5340_cpuapp_ns
+    - nrf9160dk_nrf9160_ns
+  comment: "Flash overflows"
+
+# libsdl2-dev package should be added into docker image
+- scenarios:
+    - sample.boards.nrf.nrf_led_matrix
+    - sample.display.lvgl.gui
+  platforms:
+    - native_posix
+  comment: "libsdl2-dev package not available"
+
+- scenarios:
+    - sample.net.sockets.echo_server.usbnet
+    - sample.net.sockets.echo_server.usbnet_composite
+  platforms:
+    - nrf5340dk_nrf5340_cpuapp_ns
+  comment: "Ram/flash overflows, also in the upstream"
+
+- scenarios:
+    - sample.net.zperf.netusb_ecm
+    - sample.net.zperf.netusb_eem
+    - sample.net.zperf.netusb_rndis
+  platforms:
+    - nrf52833dk_nrf52833
+    - nrf5340dk_nrf5340_cpuapp_ns
+  comment: "Ram/flash overflows, also in the upstream"
+
+- scenarios:
+    - net.mqtt.tls
+  platforms:
+    - nrf5340dk_nrf5340_cpuapp_ns
+    - nrf9160dk_nrf9160_ns
+  comment: "Ram/flash overflows, also in the upstream"
+
+- scenarios:
+    - kernel.common.picolibc
+    - libraries.picolibc
+    - libraries.libc.picolibc.mem_alloc
+    - libraries.picolibc.sprintf_new
+  platforms:
+    - nrf52dk_nrf52832
+  comment: "Ram overflows, also in the upstream"
+
+- scenarios:
+    - sample.psa_crypto
+  platforms:
+    - nrf5340dk_nrf5340_cpuapp_ns
+    - nrf9160dk_nrf9160_ns
+  comment: "Due to using sdk-zephyr manifest instead of nrf. Should be fixed after the change"

From c1330a048e7fc274cae0d806166cf47448946f8b Mon Sep 17 00:00:00 2001
From: Sebastian Wezel <sebastian.wezel@nordicsemi.no>
Date: Tue, 15 Mar 2022 13:12:25 +0100
Subject: [PATCH 2086/2913] [nrf noup] ci: add .github/test-spec.yml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This file is used for NCS-specific testing configuration based on
modifications to files in this repository.

Signed-off-by: Alperen Sener <alperen.sener@nordicsemi.no>
Signed-off-by: Elisabeth Solheim Klakken <elisabeth.solheim@nordicsemi.no>
Signed-off-by: Mariusz Poslinski <mariusz.poslinski@nordicsemi.no>
Signed-off-by: Markus Swarowsky <markus.swarowskyl@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Sebastian Wezel <sebastian.wezel@nordicsemi.no>
Signed-off-by: Tomasz Tyzenhauz <tomasz.tyzenhauz@nordicsemi.no>
Signed-off-by: Fredrik Ås <fredrik.aas@nordicsemi.no>
Signed-off-by: Michał Szablowski <michal.szablowski@nordicsemi.no>
Signed-off-by: Tony Le <tony.le@nordicsemi.no>
Signed-off-by: Krishna T <krishna.t@nordicsemi.no>
Signed-off-by: Dawid Przybylo <dawid.przybylo@nordicsemi.no>
Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Signed-off-by: Jørgen Kvalvaag <jorgen.kvalvaag@nordicsemi.no>
Signed-off-by: Magne Værnes <magne.varnes@nordicsemi.no>
Signed-off-by: Lang Xie <Lang.Xie@nordicsemi.no>
Signed-off-by: Alexander Svensen <alexander.svensen@nordicsemi.no>
Signed-off-by: Jan Gałda <jan.galda@nordicsemi.no>
Signed-off-by: Vladislav Litvinov <vladislav.litvinov@nordicsemi.no>
Signed-off-by: Guojun Wang <guojun.wang@nordicsemi.no>
Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
Signed-off-by: Thomas Stilwell <Thomas.Stilwell@nordicsemi.no>
Signed-off-by: Krzysztof Szromek <krzysztof.szromek@nordicsemi.no>
Signed-off-by: Grzegorz Chwierut <grzegorz.chwierut@nordicsemi.no>
(cherry picked from commit 98762a9ff01147afb8fa5fcbd7d5772b58311900)
---
 .github/test-spec.yml | 406 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 406 insertions(+)
 create mode 100644 .github/test-spec.yml

diff --git a/.github/test-spec.yml b/.github/test-spec.yml
new file mode 100644
index 00000000000..63a29824c11
--- /dev/null
+++ b/.github/test-spec.yml
@@ -0,0 +1,406 @@
+# This is the Jenkins ci variant of the .github/labler.yaml
+
+"CI-run-zephyr-twister":
+  - any:
+      - "!.github/**/*"
+      - "!doc/**/*"
+      - "!CODEOWNERS"
+      - "!LICENSE"
+      - "!**/*.rst"
+      - "!VERSION"
+      - "!submanifests/**/*"
+      - "!MAINTAINERS.yml"
+      - "!version.h.in"
+      - "!Jenkinsfile"
+      - "!**/*.md"
+
+"CI-iot-zephyr-lwm2m-test":
+  - "drivers/console/**/*"
+  - "drivers/flash/**/*"
+  - "subsys/dfu/boot/**/*"
+  - "subsys/net/ip/**/*"
+  - "subsys/net/lib/http/**/*"
+  - "subsys/net/lib/lwm2m//**/*"
+  - "subsys/net/**/*"
+
+"CI-iot-samples-test":
+  - "boards/nordic/nrf9160dk/**/*"
+  - "dts/arm/nordic/nrf9160*"
+  - "include/net/**/*"
+  - "subsys/net/lib/**/*"
+
+"CI-iot-libraries-test":
+  - "boards/nordic/nrf9160dk/**/*"
+  - "dts/arm/nordic/nrf9160*"
+  - "include/net/socket_ncs.h"
+  - "subsys/testsuite/ztest/**/*"
+
+"CI-lwm2m-test": null
+# Not necessary to run tests on changes to this repo.
+
+"CI-boot-test":
+  - "subsys/mgmt/mcumgr/**/*"
+  - "subsys/dfu/**/*"
+  - "include/mgmt/mcumgr/**/*"
+  - "include/dfu/**/*"
+  - "samples/subsys/mgmt/mcumgr/smp_svr/**/*"
+  - "tests/boot/**/*"
+  - "tests/subsys/dfu/**/*"
+  - "tests/subsys/mgmt/mcumgr/**/*"
+
+"CI-tfm-test":
+  - "boards/nordic/nrf5340dk/**/*"
+  - "boards/nordic/nrf9160dk/**/*"
+  - "drivers/entropy/*"
+  - "dts/arm/nordic/nrf5340*"
+  - "dts/arm/nordic/nrf9160*"
+  - "modules/trusted-firmware-m/**/*"
+  - "samples/tfm_integration/**/*"
+
+"CI-ble-test":
+  - any:
+      - "drivers/bluetooth/**/*"
+  - any:
+      - "dts/arm/nordic/nrf5*"
+  - any:
+      - "subsys/bluetooth/**/*"
+      - "!subsys/bluetooth/mesh/**/*"
+      - "!subsys/bluetooth/audio/**/*"
+  - any:
+      - "include/zephyr/bluetooth/**/*"
+      - "!include/zephyr/bluetooth/mesh/**/*"
+  - "samples/bluetooth/hci_ipc/**/*"
+
+"CI-ble-samples-test":
+  - any:
+      - "drivers/bluetooth/**/*"
+  - any:
+      - "dts/arm/nordic/nrf5*"
+  - any:
+      - "subsys/bluetooth/**/*"
+      - "!subsys/bluetooth/mesh/**/*"
+      - "!subsys/bluetooth/audio/**/*"
+  - any:
+      - "include/zephyr/bluetooth/**/*"
+      - "!include/zephyr/bluetooth/mesh/**/*"
+  - "samples/bluetooth/**/*"
+
+"CI-mesh-test":
+  - "subsys/bluetooth/mesh/**/*"
+  - "include/zephyr/bluetooth/mesh/**/*"
+  - "samples/bluetooth/mesh/**/*"
+  - "samples/bluetooth/mesh_demo/**/*"
+  - "samples/bluetooth/mesh_provisioner/**/*"
+  - "tests/bluetooth/mesh/**/*"
+  - "tests/bluetooth/mesh_shell/**/*"
+
+"CI-zigbee-test":
+  - "subsys/mgmt/mcumgr/**/*"
+  - "subsys/dfu/**/*"
+  - "include/mgmt/mcumgr/**/*"
+  - "include/dfu/**/*"
+
+"CI-thingy91-test":
+  - "boards/nordic/nrf9160dk/**/*"
+  - "arch/x86/core/**/*"
+  - "arch/x86/include/**/*"
+  - "drivers/console/**/*"
+  - "drivers/ethernet/**/*"
+  - "drivers/flash/**/*"
+  - "drivers/hwinfo/**/*"
+  - "drivers/interrupt_controller/**/*"
+  - "drivers/net/**/*"
+  - "drivers/serial/**/*"
+  - "drivers/timer/**/*"
+  - "include/**/*"
+  - "kernel/**/*"
+  - "lib/libc/common/source/stdlib/**/*"
+  - "lib/libc/newlib/**/*"
+  - "lib/libc/picolibc/**/*"
+  - "lib/os/**/*"
+  - "lib/posix/**/*"
+  - "misc/**/*"
+  - "modules/mbedtls/**/*"
+  - "soc/x86/ia32/**/*"
+  - "subsys/fs/fcb/**/*"
+  - "subsys/logging/**/*"
+  - "subsys/net/**/*"
+  - "subsys/random/**/*"
+  - "subsys/settings/include/**/*"
+  - "subsys/settings/src/**/*"
+  - "subsys/stats/**/*"
+  - "subsys/storage/flash_map/**/*"
+  - "subsys/storage/stream/**/*"
+  - "subsys/tracing/**/*"
+
+"CI-desktop-test":
+  - "drivers/bluetooth/*"
+  - "subsys/bluetooth/*"
+  - "include/zephyr/bluetooth/*"
+
+"CI-crypto-test":
+  - "boards/nordic/nrf52840dk/**/*"
+  - "boards/nordic/nrf5340dk/**/*"
+  - "boards/nordic/nrf9160dk/**/*"
+  - "drivers/entropy/*"
+  - "drivers/serial/**/*"
+  - "dts/arm/nordic/nrf52840*"
+  - "dts/arm/nordic/nrf5340*"
+  - "dts/arm/nordic/nrf9160*"
+  - "include/drivers/serial/**/*"
+  - "modules/mbedtls/**/*"
+
+"CI-fem-test":
+  - "boards/nordic/**/*"
+  - "drivers/bluetooth/hci/**/*"
+  - "drivers/entropy/**/*"
+  - "dts/bindings/**/*"
+  - "include/zephyr/net/**/*"
+  - "include/zephyr/arch/**/*"
+  - "lib/libc/**/*"
+  - "lib/open-amp/**/*"
+  - "modules/hal_nordic/**/*"
+  - "modules/mbedtls/**/*"
+  - "modules/openthread/**/*"
+  - "modules/trusted-firmware-m/**/*"
+  - "samples/net/sockets/echo_*/**/*"
+  - "share/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/net/**/*"
+  - "subsys/settings/**/*"
+  - "subsys/bluetooth/shell/**/*"
+  - "subsys/ipc/**/*"
+  - "Kconfig"
+  - "CMakeLists.txt"
+
+"CI-rs-test":
+  - "boards/nordic/**/*"
+  - "drivers/bluetooth/hci/**/*"
+  - "drivers/entropy/**/*"
+  - "dts/bindings/**/*"
+  - "include/zephyr/net/**/*"
+  - "include/zephyr/arch/**/*"
+  - "lib/libc/**/*"
+  - "lib/open-amp/**/*"
+  - "modules/hal_nordic/**/*"
+  - "modules/mbedtls/**/*"
+  - "modules/openthread/**/*"
+  - "modules/trusted-firmware-m/**/*"
+  - "samples/net/sockets/echo_*/**/*"
+  - "share/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/net/**/*"
+  - "subsys/settings/**/*"
+  - "subsys/bluetooth/shell/**/*"
+  - "subsys/ipc/**/*"
+  - "Kconfig"
+  - "CMakeLists.txt"
+
+"CI-thread-test":
+  - "include/zephyr/net/**/*"
+  - "modules/mbedtls/**/*"
+  - "modules/openthread/**/*"
+  - "samples/net/openthread/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/net/**/*"
+  - "subsys/settings/**/*"
+
+"CI-nfc-test":
+  - "drivers/bluetooth/hci/**/*"
+  - "drivers/entropy/**/*"
+  - "drivers/flash/**/*"
+  - "drivers/mbox/**/*"
+  - "drivers/spi/**/*"
+  - "lib/crc/**/*"
+  - "modules/hal_nordic/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/bluetooth/**/*"
+  - "subsys/ipc/ipc_service/**/*"
+  - "subsys/fs/**/*"
+  - "subsys/mem_mgmt/**/*"
+  - "subsys/net/**/*"
+  - "subsys/random/**/*"
+  - "subsys/settings/**/*"
+  - "subsys/shell/**/*"
+  - "subsys/storage/**/*"
+
+"CI-matter-test":
+  - "include/dfu/**/*"
+  - "include/mgmt/mcumgr/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/dfu/**/*"
+  - "subsys/settings/**/*"
+  - "subsys/net/**/*"
+  - "subsys/mgmt/mcumgr/**/*"
+  - "drivers/net/**/*"
+  - "samples/bluetooth/hci_ipc/**/*"
+  - any:
+      - "subsys/bluetooth/**/*"
+      - "!subsys/bluetooth/mesh/**/*"
+      - "!subsys/bluetooth/audio/**/*"
+
+"CI-find-my-test":
+  - "boards/nordic/**/*"
+  - "drivers/bluetooth/**/*"
+  - "drivers/entropy/**/*"
+  - "drivers/flash/**/*"
+  - "drivers/usb/**/*"
+  - "drivers/regulator/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/bluetooth/**/*"
+  - "subsys/dfu/**/*"
+  - "subsys/fs/**/*"
+  - "subsys/ipc/**/*"
+  - "subsys/net/**/*"
+  - "subsys/random/**/*"
+  - "subsys/settings/**/*"
+  - "subsys/storage/**/*"
+  - "subsys/tracing/**/*"
+  - "subsys/usb/device/**/*"
+
+"CI-rpc-test":
+  - "subsys/ipc/ipc_service/**/*"
+  - "subsys/random/**/*"
+  - "soc/nordic/nrf53/**/*"
+
+"CI-modemshell-test":
+  - "include/net/**/*"
+  - "include/posix/**/*"
+  - "include/shell/**/*"
+  - "drivers/net/**/*"
+  - "drivers/serial/**/*"
+  - "drivers/wifi/**/*"
+  - "subsys/shell/**/*"
+  - "subsys/net/**/*"
+  - "subsys/settings/**/*"
+
+"CI-positioning-test":
+  - "include/net/**/*"
+  - "include/posix/**/*"
+  - "drivers/net/**/*"
+  - "drivers/wifi/**/*"
+  - "subsys/net/**/*"
+  - "subsys/settings/**/*"
+
+"CI-cloud-test":
+  - "include/zephyr/dfu/**/*"
+  - "include/zephyr/net/**/*"
+  - "include/zephyr/posix/**/*"
+  - "include/zephyr/settings/**/*"
+  - "drivers/led/**/*"
+  - "drivers/net/**/*"
+  - "drivers/sensor/**/*"
+  - "drivers/serial/**/*"
+  - "drivers/wifi/**/*"
+  - "lib/posix/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/dfu/**/*"
+  - "subsys/net/**/*"
+  - "subsys/settings/**/*"
+
+"CI-wifi":
+  - "subsys/net/l2/wifi/**/*"
+  - "subsys/net/l2/ethernet/**/*"
+
+"CI-sidewalk-test":
+  - "include/dfu/**/*"
+  - "include/mgmt/mcumgr/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/dfu/**/*"
+  - "subsys/settings/**/*"
+  - "subsys/mgmt/mcumgr/**/*"
+  - "samples/bluetooth/hci_ipc/**/*"
+  - any:
+      - "subsys/bluetooth/**/*"
+      - "!subsys/bluetooth/mesh/**/*"
+      - "!subsys/bluetooth/audio/**/*"
+
+"CI-audio-test":
+  - "boards/nordic/nrf5340_audio_dk/**/*"
+  - "drivers/flash/**/*"
+  - "drivers/spi/**/*"
+  - "drivers/gpio/**/*"
+  - "drivers/i2c/**/*"
+  - "drivers/watchdog/**/*"
+  - "include/dfu/**/*"
+  - "include/mgmt/mcumgr/**/*"
+  - "samples/bluetooth/hci_ipc/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/bluetooth/audio/**/*"
+  - "subsys/bluetooth/host/**/*"
+  - "subsys/dfu/**/*"
+  - "subsys/fs/**/*"
+  - "subsys/mgmt/mcumgr/**/*"
+  - "subsys/sd/**/*"
+  - "subsys/storage/**/*"
+  - "subsys/task_wdt/**/*"
+  - "subsys/usb/**/*"
+  - "subsys/zbus/**/*"
+
+"CI-pmic-samples-test":
+  - "samples/shields/npm1300_ek/**/*"
+  - "boards/shields/npm1300_ek/**/*"
+  - "**/**npm1300**/**"
+  - "drivers/regulator/regulator_common.c"
+  - "drivers/regulator/regulator_shell.c"
+  - "drivers/gpio/gpio_shell.c"
+  - "drivers/sensor/sensor_shell.c"
+
+"CI-test-low-level":
+  - "arch/**/*"
+  - "boards/nordic/nrf54*/**/*"
+  - "drivers/**/*"
+  - "dts/**/*"
+  - "include/zephyr/**/*"
+  - "kernel/**/*"
+  - "modules/hal_nordic/**/*"
+  - "samples/basic/blinky_pwm/**/*"
+  - "samples/basic/fade_led/**/*"
+  - "samples/boards/nrf/**/*"
+  - "samples/boards/nordic/**/*"
+  - "samples/drivers/adc/**/*"
+  - "samples/drivers/jesd216/**/*"
+  - "samples/drivers/mbox/**/*"
+  - "samples/drivers/soc_flash_nrf/**/*"
+  - "samples/drivers/spi_flash/**/*"
+  - "samples/drivers/watchdog/**/*"
+  - "samples/hello_world/**/*"
+  - "samples/sensor/**/*"
+  - "samples/subsys/ipc/**/*"
+  - "samples/subsys/logging/**/*"
+  - "samples/subsys/settings/**/*"
+  - "samples/subsys/usb/cdc_acm/**/*"
+  - "samples/subsys/usb/mass/**/*"
+  - "samples/synchronization/**/*"
+  - "subsys/logging/**/*"
+  - "subsys/settings/**/*"
+  - "tests/arch/**/*"
+  - "tests/boards/nrf/**/*"
+  - "tests/boards/nordic/**/*"
+  - "tests/drivers/**/*"
+  - "tests/kernel/**/*"
+
+"CI-suit-dfu-test":
+  - "subsys/mgmt/mcumgr/**/*"
+  - "include/mgmt/mcumgr/**/*"
+  - "samples/subsys/mgmt/mcumgr/smp_svr/**/*"
+  - "subsys/bluetooth/**/*"
+  - "drivers/bluetooth/**/*"
+  - "drivers/flash/**/*"
+  - "drivers/spi/**/*"
+  - "drivers/mbox/**/*"
+  - "drivers/serial/**/*"
+  - "drivers/console/**/*"
+  - "dts/common/nordic/*"
+  - "dts/arm/nordic/nrf54h*"
+  - "dts/riscv/nordic/nrf54h*"
+  - "boards/nordic/nrf54h*"
+  - "soc/nordic/nrf54h/**/*"
+  - "include/zephyr/**/*"
+  - "subsys/logging/**/*"
+  - "subsys/tracing/**/*"
+  - "scripts/west_commands/build.py"
+  - "scripts/west_commands/flash.py"
+  - "scripts/west_commands/runners/nrfutil.py"
+  - "scripts/west_commands/runners/core.py"
+  - "scripts/west_commands/runners/nrf_common.py"

From c222336b87410f436714cd72b49a24140d77a221 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Date: Thu, 1 Jun 2023 15:58:56 +0200
Subject: [PATCH 2087/2913] [nrf noup] tests: drivers: build_all: regulator:
 use old schema

New Twister schema is not supported yet in sdk-zephyr, drop this patch
once Twister is updated.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
(cherry picked from commit d1ded336a6e34041e9de4fa4f52cc3669c9aa17f)
---
 tests/drivers/build_all/regulator/testcase.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/drivers/build_all/regulator/testcase.yaml b/tests/drivers/build_all/regulator/testcase.yaml
index 30d494aca23..b662f0ac205 100644
--- a/tests/drivers/build_all/regulator/testcase.yaml
+++ b/tests/drivers/build_all/regulator/testcase.yaml
@@ -3,9 +3,7 @@
 
 tests:
   drivers.regulator.build:
-    tags:
-      - drivers
-      - regulator
+    tags: drivers regulator
     build_only: true
     platform_allow:
       - native_sim

From ace337902279ab165f09828888c8c741335a0986 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Mon, 19 Jun 2023 12:19:05 +0200
Subject: [PATCH 2088/2913] [nrf noup] Revert "twister: Use natural sort when
 generating hardware map"

This reverts commit c37deeb0c4602dc3eeb700a7dc3ed317283fff17.

This is only a temporary change, until we align our CI. To be removed
once natsort is avaialble in the NCS CI.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 374374bd72782f93412ea12d1713d543d4080ffb)
---
 scripts/pylib/twister/twisterlib/hardwaremap.py | 2 +-
 scripts/requirements-run-test.txt               | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/pylib/twister/twisterlib/hardwaremap.py b/scripts/pylib/twister/twisterlib/hardwaremap.py
index 1121301c577..74e97def989 100644
--- a/scripts/pylib/twister/twisterlib/hardwaremap.py
+++ b/scripts/pylib/twister/twisterlib/hardwaremap.py
@@ -384,7 +384,7 @@ def readlink(link):
 
     def save(self, hwm_file):
         # use existing map
-        self.detected = natsorted(self.detected, key=lambda x: x.serial or '')
+        self.detected.sort(key=lambda x: x.serial or '')
         if os.path.exists(hwm_file):
             with open(hwm_file) as yaml_file:
                 hwm = yaml.load(yaml_file, Loader=SafeLoader)
diff --git a/scripts/requirements-run-test.txt b/scripts/requirements-run-test.txt
index fd7a8ac4e91..9aa23847f8a 100644
--- a/scripts/requirements-run-test.txt
+++ b/scripts/requirements-run-test.txt
@@ -7,7 +7,6 @@ pyocd>=0.35.0
 
 # used by twister for board/hardware map
 tabulate
-natsort
 
 # used by mcuboot
 cbor>=1.0.0

From d9af20980718c5cf35865d670664e7d97acac153 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Date: Thu, 3 Mar 2022 15:28:16 +0100
Subject: [PATCH 2089/2913] [nrf noup] doc: remove Kconfig search

Kconfig search is handled in a separate docset in NCS, so remove the
page. This is a long-term noup patch.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Signed-off-by: Krishna T <krishna.t@nordicsemi.no>
(cherry picked from commit 3fe805d25ad4858aa4cea4d326ef1652f52c23d3)
---
 MAINTAINERS.yml                   | 1 -
 doc/build/kconfig/setting.rst     | 6 ++----
 doc/develop/application/index.rst | 5 ++---
 doc/kconfig.rst                   | 8 --------
 4 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 doc/kconfig.rst

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index 060fe0be769..bd36809edf2 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -987,7 +987,6 @@ Documentation:
     - doc/images/Zephyr-Kite-in-tree.png
     - doc/index-tex.rst
     - doc/index.rst
-    - doc/kconfig.rst
     - doc/templates/sample.tmpl
     - doc/templates/board.tmpl
     - boards/index.rst
diff --git a/doc/build/kconfig/setting.rst b/doc/build/kconfig/setting.rst
index 3a70d90da82..7d6d1acdc14 100644
--- a/doc/build/kconfig/setting.rst
+++ b/doc/build/kconfig/setting.rst
@@ -7,8 +7,7 @@ The :ref:`menuconfig and guiconfig interfaces <menuconfig>` can be used to test
 out configurations during application development. This page explains how to
 make settings permanent.
 
-All Kconfig options can be searched in the :ref:`Kconfig search page
-<kconfig-search>`.
+All Kconfig options can be searched in the Kconfig search page.
 
 .. note::
 
@@ -115,8 +114,7 @@ Assignments in configuration files are only respected if the dependencies for
 the symbol are satisfied. A warning is printed otherwise. To figure out what
 the dependencies of a symbol are, use one of the :ref:`interactive
 configuration interfaces <menuconfig>` (you can jump directly to a symbol with
-:kbd:`/`), or look up the symbol in the :ref:`Kconfig search page
-<kconfig-search>`.
+:kbd:`/`), or look up the symbol in the Kconfig search page.
 
 
 .. _initial-conf:
diff --git a/doc/develop/application/index.rst b/doc/develop/application/index.rst
index fa787d5640e..6bf3620adfd 100644
--- a/doc/develop/application/index.rst
+++ b/doc/develop/application/index.rst
@@ -648,9 +648,8 @@ started.
 
 See :ref:`setting_configuration_values` for detailed documentation on setting
 Kconfig configuration values. The :ref:`initial-conf` section on the same page
-explains how the initial configuration is derived. See :ref:`kconfig-search`
-for a complete list of configuration options.
-See :ref:`hardening` for security information related with Kconfig options.
+explains how the initial configuration is derived. See :ref:`hardening` for
+security information related with Kconfig options.
 
 The other pages in the :ref:`Kconfig section of the manual <kconfig>` are also
 worth going through, especially if you planning to add new configuration
diff --git a/doc/kconfig.rst b/doc/kconfig.rst
deleted file mode 100644
index 1123de2adbd..00000000000
--- a/doc/kconfig.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-:orphan:
-
-.. _kconfig-search:
-
-Kconfig Search
-==============
-
-.. kconfig:search::

From 1d839554d2dc1170b573ec6fe3cab629d97f288f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Thu, 13 Jan 2022 11:37:18 +0100
Subject: [PATCH 2090/2913] [nrf noup] modules: tf-m: use of
 PSA_HAS_XXXX_SUPPORT
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-This allows configurations enabled by PSA_WANTS_ALG_XXXX to be
 used to control which TF-M module is enabled
-If the TF-M image doesn't support e.g. the MAC APIs, then the
 MAC interface is not enabled

Note: This functionality requires that nrf_security is enabled

ref: NCSDK-11689

Make TF-M crypto module depend on PSA_WANT_GENERATE_RANDOM, same
as all other crypto modules, which have PSA_HAS to group all PSA
features that require the module.
This makes TF-M by default exclude the RNG module when not needed.

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
(cherry picked from commit 676d548b558daea46043f239dcf414c4cffacde0)
---
 modules/trusted-firmware-m/Kconfig.tfm.crypto_modules | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules b/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
index 1d70a2c44d2..02d3580c22f 100644
--- a/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
+++ b/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
@@ -10,6 +10,7 @@ if TFM_PARTITION_CRYPTO
 config TFM_CRYPTO_RNG_MODULE_ENABLED
 	bool "Random number generator crypto module"
 	default y
+	depends on PSA_WANT_GENERATE_RANDOM && NRF_SECURITY
 	help
 	  Enables the random number generator  module within the crypto partition.
 	  Unset this option if 'psa_generate_random' is not used.
@@ -17,6 +18,7 @@ config TFM_CRYPTO_RNG_MODULE_ENABLED
 config TFM_CRYPTO_KEY_MODULE_ENABLED
 	bool "KEY crypto module"
 	default y
+	depends on PSA_HAS_KEY_SUPPORT && NRF_SECURITY
 	help
 	  Enables the KEY crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_key_management.c'
@@ -25,6 +27,7 @@ config TFM_CRYPTO_KEY_MODULE_ENABLED
 config TFM_CRYPTO_AEAD_MODULE_ENABLED
 	bool "AEAD crypto module"
 	default y
+	depends on PSA_HAS_AEAD_SUPPORT && NRF_SECURITY
 	help
 	  Enables the AEAD crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_aead.c'
@@ -33,6 +36,7 @@ config TFM_CRYPTO_AEAD_MODULE_ENABLED
 config TFM_CRYPTO_MAC_MODULE_ENABLED
 	bool "MAC crypto module"
 	default y
+	depends on PSA_HAS_MAC_SUPPORT && NRF_SECURITY
 	help
 	  Enables the MAC crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_mac.c'
@@ -41,6 +45,7 @@ config TFM_CRYPTO_MAC_MODULE_ENABLED
 config TFM_CRYPTO_HASH_MODULE_ENABLED
 	bool "HASH crypto module"
 	default y
+	depends on PSA_HAS_HASH_SUPPORT && NRF_SECURITY
 	help
 	  Enables the HASH crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_hash.c'
@@ -49,6 +54,7 @@ config TFM_CRYPTO_HASH_MODULE_ENABLED
 config TFM_CRYPTO_CIPHER_MODULE_ENABLED
 	bool "CIPHER crypto module"
 	default y
+	depends on PSA_HAS_CIPHER_SUPPORT && NRF_SECURITY
 	help
 	  Enables the CIPHER crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_cipher.c'
@@ -57,6 +63,7 @@ config TFM_CRYPTO_CIPHER_MODULE_ENABLED
 config TFM_CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED
 	bool "ASYM ENCRYPT crypto module"
 	default y
+	depends on PSA_HAS_ASYM_ENCRYPT_SUPPORT && NRF_SECURITY
 	help
 	  Enables the ASYM ENCRYPT crypto module within the crypto partition.
 	  Unset this option if the encrypt functionality provided by 'crypto_asymmetric.c'
@@ -65,6 +72,7 @@ config TFM_CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED
 config TFM_CRYPTO_ASYM_SIGN_MODULE_ENABLED
 	bool "ASYM SIGN crypto module"
 	default y
+	depends on PSA_HAS_ASYM_SIGN_SUPPORT && NRF_SECURITY
 	help
 	  Enables the ASYM SIGN crypto module within the crypto partition.
 	  Unset this option if the sign functionality provided by 'crypto_asymmetric.c'
@@ -73,10 +81,12 @@ config TFM_CRYPTO_ASYM_SIGN_MODULE_ENABLED
 config TFM_CRYPTO_KEY_DERIVATION_MODULE_ENABLED
 	bool "KEY DERIVATION crypto module"
 	default y
+	depends on (PSA_HAS_KEY_DERIVATION || PSA_HAS_KEY_AGREEMENT) && NRF_SECURITY
 	help
 	  Enables the KEY_DERIVATION crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_key_derivation.c'
 	  is not used.
+	  Note that key agreement is under key derivation in the current implementation.
 
 endif # TFM_PARTITION_CRYPTO
 

From 703e828089b27c41fe030052e586d10bdaba7d75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B8e?= <sebastian.boe@nordicsemi.no>
Date: Sat, 29 Jan 2022 13:03:08 +0100
Subject: [PATCH 2091/2913] [nrf noup] modules: mbedtls: Allow MBEDTLS_BUILTIN
 to be deselected
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Out-of-tree crypto subsystems need to deselect MBEDTLS_BUILTIN, but
deselection is not supported. It is however supported to select a
dependency in a ! expression.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
(cherry picked from commit 5a62fe9cc2ade67040d97c207ed444a58c22397f)
---
 modules/mbedtls/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/mbedtls/Kconfig b/modules/mbedtls/Kconfig
index cb178fb3c27..7c383955a4a 100644
--- a/modules/mbedtls/Kconfig
+++ b/modules/mbedtls/Kconfig
@@ -29,6 +29,7 @@ choice MBEDTLS_IMPLEMENTATION
 
 config MBEDTLS_BUILTIN
 	bool "Use Zephyr in-tree mbedTLS version"
+	depends on ! DISABLE_MBEDTLS_BUILTIN
 	help
 	  Link with mbedTLS sources included with Zephyr distribution.
 	  Included mbedTLS version is well integrated with and supported
@@ -42,6 +43,11 @@ config MBEDTLS_LIBRARY
 
 endchoice
 
+# subsystems cannot deselect MBEDTLS_BUILTIN, but they can select
+# DISABLE_MBEDTLS_BUILTIN.
+config DISABLE_MBEDTLS_BUILTIN
+	bool
+
 config CUSTOM_MBEDTLS_CFG_FILE
 	bool "Custom mbed TLS configuration file"
 	help

From f98ad62ed7e90cbb80745a53090f45319c059377 Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Mon, 12 Feb 2024 14:30:23 +0100
Subject: [PATCH 2092/2913] [nrf noup] modules: mbedtls: Add include folders

We moved the header files in sdk-mbedtls from the library
folder to the include/library folder. This was done to avoid
issues when building MbedTLS with the nrf_security module
and the Oberon PSA core. The Oberon PSA core provides a subset
of these header files and since they are included with quotes
we cannot have them in the same directory.
This change make the needed adaptions in CMake for the
applications that don't use nrf_security.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
(cherry picked from commit 801154a9986d2a4c48d51f881973c8ba72ae5b40)
---
 modules/mbedtls/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/mbedtls/CMakeLists.txt b/modules/mbedtls/CMakeLists.txt
index 61c7400017d..8801e1ecdf1 100644
--- a/modules/mbedtls/CMakeLists.txt
+++ b/modules/mbedtls/CMakeLists.txt
@@ -40,6 +40,8 @@ zephyr_interface_library_named(mbedTLS)
     # Add regular includes
     target_include_directories(mbedTLS INTERFACE
         ${ZEPHYR_CURRENT_MODULE_DIR}/include
+        ${ZEPHYR_CURRENT_MODULE_DIR}/include/library
+        ${ZEPHYR_CURRENT_MODULE_DIR}/library
         configs
         include
     )

From f1f6bc0f98f77e042ca8454caef1eaef498a5aed Mon Sep 17 00:00:00 2001
From: Joakim Andersson <joakim.andersson@nordicsemi.no>
Date: Fri, 20 Nov 2020 14:44:03 +0100
Subject: [PATCH 2093/2913] [nrf noup] Bluetooth: update experimental for
 qualification
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update Kconfig options for qualification:
 - Remove experimental on qualified feature.
 - Add experimental on unqualified feature.
 - BT_L2CAP_ECRED is not marked as experimental upstream and we qualify it
   downstream.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Signed-off-by: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Signed-off-by: Herman Berget <herman.berget@nordicsemi.no>
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit e92e87d7790ce93101dc6038b4831e660757501e)
---
 subsys/bluetooth/controller/Kconfig | 4 +++-
 subsys/bluetooth/host/Kconfig.l2cap | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
index 02c272c0478..ab7706a73bb 100644
--- a/subsys/bluetooth/controller/Kconfig
+++ b/subsys/bluetooth/controller/Kconfig
@@ -139,10 +139,12 @@ config BT_CTLR
 	  the HAS_BT_CTLR option.
 
 config BT_LL_SW_SPLIT
-	bool "Software-based BLE Link Layer"
+	bool "Software-based BLE Link Layer [EXPERIMENTAL]"
 	default y
 	depends on DT_HAS_ZEPHYR_BT_HCI_LL_SW_SPLIT_ENABLED
 	select HAS_BT_CTLR
+	select EXPERIMENTAL
+	select ENTROPY_GENERATOR
 	help
 	  Use Zephyr software BLE Link Layer ULL LLL split implementation.
 
diff --git a/subsys/bluetooth/host/Kconfig.l2cap b/subsys/bluetooth/host/Kconfig.l2cap
index 2841e7d8a12..34e862378c5 100644
--- a/subsys/bluetooth/host/Kconfig.l2cap
+++ b/subsys/bluetooth/host/Kconfig.l2cap
@@ -52,7 +52,7 @@ config BT_L2CAP_DYNAMIC_CHANNEL
 	  allowing the creation of dynamic L2CAP Channels.
 
 config BT_L2CAP_ECRED
-	bool "L2CAP Enhanced Credit Based Flow Control support"
+	bool "L2CAP Enhanced Credit Based Flow Control support [EXPERIMENTAL]"
 	depends on BT_L2CAP_DYNAMIC_CHANNEL
 	help
 	  This option enables support for LE Connection oriented Channels with

From 5afdd32b9160b5a52043e3b422c82fae771976f8 Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Thu, 13 Jul 2023 13:42:10 +0000
Subject: [PATCH 2094/2913] [nrf noup] drivers/flashdisk: Add support for
 Partition Manager

The commits adds support for generating flash disks from Partition
Manager defined partitions.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 1601992b029b1a917feb8990102cb7504db274af)
---
 drivers/disk/flashdisk.c | 78 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/drivers/disk/flashdisk.c b/drivers/disk/flashdisk.c
index 1ac3d15ba62..4d8e3f1eee0 100644
--- a/drivers/disk/flashdisk.c
+++ b/drivers/disk/flashdisk.c
@@ -469,6 +469,8 @@ static const struct disk_operations flash_disk_ops = {
 	.ioctl = disk_flash_access_ioctl,
 };
 
+#ifndef USE_PARTITION_MANAGER
+/* The non-Partition manager, DTS based generators below */
 #define DT_DRV_COMPAT zephyr_flash_disk
 
 #define PARTITION_PHANDLE(n) DT_PHANDLE_BY_IDX(DT_DRV_INST(n), partition, 0)
@@ -510,6 +512,82 @@ DT_INST_FOREACH_STATUS_OKAY(VERIFY_CACHE_SIZE_IS_NOT_ZERO_IF_NOT_READ_ONLY)
 		"Devicetree node " DT_NODE_PATH(DT_DRV_INST(n))				\
 		" has cache size which is not a multiple of its sector size");
 DT_INST_FOREACH_STATUS_OKAY(VERIFY_CACHE_SIZE_IS_MULTIPLY_OF_SECTOR_SIZE)
+#else /* ifndef USE_PARTITION_MANAGER */
+/* Partition Manager based generators below */
+
+/* Gets the PM_..._EXTRA_PARAM_##param value */
+#define PM_FLASH_DISK_ENTRY_EXTRA_PARAM(name, param) PM_##name##_EXTRA_PARAM_disk_##param
+
+/* Gets the PM_..._NAME value which is originally cased, as in yaml, partition name */
+#define PM_FLASH_DISK_ENTRY_PARTITION_NAME(name) PM_##name##_NAME
+
+/* Generates flashdiskN_cache variable name, where N is partition ID */
+#define PM_FLASH_DISK_CACHE_VARIABLE(n) UTIL_CAT(flashdisk, UTIL_CAT(FIXED_PARTITION_ID(n), _cache))
+
+/* Generate cache buffers */
+#define CACHE_SIZE(n) (COND_CODE_1(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, read_only), (0), (1)) * \
+		       PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, cache_size))
+#define DEFINE_FLASHDISKS_CACHE(n) \
+	static uint8_t __aligned(4) PM_FLASH_DISK_CACHE_VARIABLE(n)[CACHE_SIZE(n)];
+
+PM_FOREACH_AFFILIATED_TO_disk(DEFINE_FLASHDISKS_CACHE)
+
+/* Generated single Flash Disk device data from Partition Manager partition.
+ * Partition is required to have type set to disk in partition definitions:
+ *  type: disk
+ * and following extra params can be provided:
+ *  extra_params: {
+ *	name = "<name>",
+ *	cache_size = <size>,
+ *	sector_size = <ssize>,
+ *	read_only = <ro>
+ *  }
+ * where:
+ *  <name> is mandatory device name that will be used by Disk Access and FAT FS to mount device;
+ *  <cache_size> is cache r/w cache size, which is mandatory if read_only = 0 or not present,
+ *  and should be multiple of <ssize>;
+ *  <ssize> is mandatory device sector size information, usually should be erase page size,
+ *  for flash devices, for example 4096 bytes;
+ *  read_only is optional, if not present then assumed false; <ro> can be 0(false) or 1(true).
+ */
+#define DEFINE_FLASHDISKS_DEVICE(n)						\
+{										\
+	.info = {								\
+		.ops = &flash_disk_ops,						\
+		.name = STRINGIFY(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, name)),		\
+	},									\
+	.area_id = FIXED_PARTITION_ID(n),					\
+	.offset = FIXED_PARTITION_OFFSET(n),					\
+	.cache = PM_FLASH_DISK_CACHE_VARIABLE(n),				\
+	.cache_size = sizeof(PM_FLASH_DISK_CACHE_VARIABLE(n)),			\
+	.size = FIXED_PARTITION_SIZE(n),					\
+	.sector_size = PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, sector_size),		\
+},
+
+/* The bellow used PM_FOREACH_TYPE_disk is generated by Partition Manager foreach
+ * loop macro. The lower case _disk is type name for which the macro has been generated;
+ * partition entry can have multiple types set and foreach macro will be generated
+ * for every type found across partition definitions.
+ */
+static struct flashdisk_data flash_disks[] = {
+	PM_FOREACH_AFFILIATED_TO_disk(DEFINE_FLASHDISKS_DEVICE)
+};
+
+#define VERIFY_CACHE_SIZE_IS_NOT_ZERO_IF_NOT_READ_ONLY(n)				\
+	COND_CODE_1(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, read_only),			\
+		(/* cache-size is not used for read-only disks */),			\
+		(BUILD_ASSERT(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, cache_size) != 0,	\
+		"Flash disk partition " STRINGIFY(PM_FLASH_DISK_ENTRY_PARTITION_NAME(n))\
+		" must have non-zero cache-size");))
+PM_FOREACH_AFFILIATED_TO_disk(VERIFY_CACHE_SIZE_IS_NOT_ZERO_IF_NOT_READ_ONLY)
+
+#define VERIFY_CACHE_SIZE_IS_MULTIPLY_OF_SECTOR_SIZE(n)					\
+	BUILD_ASSERT(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, cache_size) %			\
+		     PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, sector_size) == 0,		\
+		"Devicetree node " STRINGIFY(PM_FLASH_DISK_ENTRY_PARTITION_NAME(n))	\
+		" has cache size which is not a multiple of its sector size");
+PM_FOREACH_AFFILIATED_TO_disk(VERIFY_CACHE_SIZE_IS_MULTIPLY_OF_SECTOR_SIZE)
+#endif /* USE_PARTITION_MANAGER */
 
 static int disk_flash_init(void)
 {

From c09514429fbba8ba2f5245f2a71a5d0d3a9ae93f Mon Sep 17 00:00:00 2001
From: Marek Pieta <Marek.Pieta@nordicsemi.no>
Date: Fri, 5 May 2023 11:12:26 +0200
Subject: [PATCH 2095/2913] [nrf noup] mcumgr: img_mgmt: Fix check for chosen
 code partition

The "zephyr-code-partition" chosen DTS node cannot be used when build
uses Partition Manager. In that case, mcumgr must rely on the
definitions provided by the Partition Manager.

Jira: NCSDK-21381

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 763a1886246f5caa4aac5fc5cc5bce6682a3115f)
---
 subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
index 3c8995cd9e3..a95b78938e2 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
@@ -42,6 +42,23 @@
 
 #if !defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD)
 
+#if USE_PARTITION_MANAGER
+#include <flash_map_pm.h>
+
+#ifdef PM_MCUBOOT_SECONDARY_PAD_SIZE
+BUILD_ASSERT(PM_MCUBOOT_PAD_SIZE == PM_MCUBOOT_SECONDARY_PAD_SIZE);
+#endif
+
+#if CONFIG_BUILD_WITH_TFM
+  #define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE + PM_TFM_SIZE)
+#else
+  #define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE)
+#endif
+
+#define FIXED_PARTITION_IS_RUNNING_APP_PARTITION(label)	\
+	(FIXED_PARTITION_OFFSET(label) == (PM_ADDRESS - PM_ADDRESS_OFFSET))
+
+#else /* ! USE_PARTITION_MANAGER */
 #ifndef CONFIG_FLASH_LOAD_OFFSET
 #error MCUmgr requires application to be built with CONFIG_FLASH_LOAD_OFFSET set \
 	to be able to figure out application running slot.
@@ -49,6 +66,7 @@
 
 #define FIXED_PARTITION_IS_RUNNING_APP_PARTITION(label)	\
 	 (FIXED_PARTITION_OFFSET(label) == CONFIG_FLASH_LOAD_OFFSET)
+#endif /* USE_PARTITION_MANAGER */
 
 BUILD_ASSERT(sizeof(struct image_header) == IMAGE_HEADER_SIZE,
 	     "struct image_header not required size");

From 42168a2a28b67633a1d8c63346b2fab638d106fb Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Thu, 23 Jun 2022 14:10:01 +0000
Subject: [PATCH 2096/2913] [nrf noup] mgmt/mcumgr: Bootutil hooks to handle
 image-1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The commit adds bootutil hook, for nrf5340, to allow it
handling the non-accessible image-1/primary slot.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 7b33eafddebfebbadeb213581466af5eee52ad3b)
---
 subsys/mgmt/mcumgr/CMakeLists.txt             |  8 +++++
 subsys/mgmt/mcumgr/Kconfig                    |  1 +
 .../mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c  | 35 +++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c

diff --git a/subsys/mgmt/mcumgr/CMakeLists.txt b/subsys/mgmt/mcumgr/CMakeLists.txt
index 39d4a4ca8ce..ad088eca067 100644
--- a/subsys/mgmt/mcumgr/CMakeLists.txt
+++ b/subsys/mgmt/mcumgr/CMakeLists.txt
@@ -16,3 +16,11 @@ add_subdirectory(transport)
 add_subdirectory_ifdef(CONFIG_SMP_CLIENT    smp_client)
 
 zephyr_library_link_libraries(mgmt_mcumgr)
+
+if (CONFIG_BOOT_IMAGE_ACCESS_HOOKS)
+    zephyr_include_directories(
+        ${ZEPHYR_MCUBOOT_MODULE_DIR}/boot/bootutil/include
+        ${ZEPHYR_MCUBOOT_MODULE_DIR}/boot/zephyr/include
+    )
+    zephyr_library_sources(bootutil_hooks/nrf53_hooks.c)
+endif()
diff --git a/subsys/mgmt/mcumgr/Kconfig b/subsys/mgmt/mcumgr/Kconfig
index 49bd17f4669..1c6a3a2a516 100644
--- a/subsys/mgmt/mcumgr/Kconfig
+++ b/subsys/mgmt/mcumgr/Kconfig
@@ -6,6 +6,7 @@ menuconfig MCUMGR
 	bool "mcumgr Support"
 	depends on NET_BUF
 	depends on ZCBOR
+	imply BOOT_IMAGE_ACCESS_HOOKS if (SOC_NRF5340_CPUAPP_QKAA && MCUMGR_GRP_IMG)
 	help
 	  This option enables the mcumgr management library.
 
diff --git a/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c b/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c
new file mode 100644
index 00000000000..f1ac8a168e6
--- /dev/null
+++ b/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include "bootutil/bootutil_public.h"
+
+#if CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER != -1
+/* Sysbuild */
+#define NET_CORE_IMAGE CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER
+#else
+/* Legacy child/parent */
+#define NET_CORE_IMAGE 1
+#endif
+
+int boot_read_swap_state_primary_slot_hook(int image_index,
+		struct boot_swap_state *state)
+{
+	if (image_index == NET_CORE_IMAGE) {
+		/* Pretend that primary slot of image 1 unpopulated */
+		state->magic = BOOT_MAGIC_UNSET;
+		state->swap_type = BOOT_SWAP_TYPE_NONE;
+		state->image_num = image_index;
+		state->copy_done = BOOT_FLAG_UNSET;
+		state->image_ok = BOOT_FLAG_UNSET;
+
+		/* Prevent bootutil from trying to obtain true info */
+		return 0;
+	}
+
+	return BOOT_HOOK_REGULAR;
+}

From d7c8b1a4518fd65d2d4fe6d3685b303de33d68fe Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Thu, 28 Sep 2023 11:10:55 +0000
Subject: [PATCH 2097/2913] [nrf noup] mgmt/MCUmgr/grp/img: Move out label to
 make compiler happy

Move it inside ifdef.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 44b6e2cd62a01054017716bbec17b4b332bfd59e)
---
 subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
index 52b2ed76f67..a0ac03c0fe7 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
@@ -285,13 +285,14 @@ int img_mgmt_get_next_boot_slot(int image, enum img_mgmt_next_boot_type *type)
 			return_slot = other_slot;
 		}
 	}
+out:
+
 #else
 	if (rcs == 0 && rca == 0 && img_mgmt_vercmp(&aver, &over) < 0) {
 		return_slot = other_slot;
 	}
 #endif /* defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT) */
 
-out:
 	if (type != NULL) {
 		*type = lt;
 	}

From e3b083e560914cf53a4821aaa742feb89dd3434f Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Mon, 16 Oct 2023 08:40:38 +0100
Subject: [PATCH 2098/2913] [nrf noup] samples: bluetooth: hci_pow_ctrl:
 Migrate child image config

Migrates child image configuration for this sample over to sysbuild

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit beecaaabbbacce1b6f278a6a7e77e54a73ab9f02)
---
 samples/bluetooth/hci_pwr_ctrl/sysbuild/hci_rpmsg.conf | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 samples/bluetooth/hci_pwr_ctrl/sysbuild/hci_rpmsg.conf

diff --git a/samples/bluetooth/hci_pwr_ctrl/sysbuild/hci_rpmsg.conf b/samples/bluetooth/hci_pwr_ctrl/sysbuild/hci_rpmsg.conf
new file mode 100644
index 00000000000..e6749ae6399
--- /dev/null
+++ b/samples/bluetooth/hci_pwr_ctrl/sysbuild/hci_rpmsg.conf
@@ -0,0 +1 @@
+CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y

From 5fffb086bd06a6673bc1d7d9528213ab3dd5eca5 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Mon, 16 Oct 2023 08:41:27 +0100
Subject: [PATCH 2099/2913] [nrf noup] samples: mgmt: mcumgr smp_svr: Migrate
 child image config

Migrates child image configuration for this sample over to sysbuild

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 6199743d6366ea6a00201890322d1790945f034d)
---
 .../subsys/mgmt/mcumgr/smp_svr/sysbuild/hci_rpmsg.conf | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 samples/subsys/mgmt/mcumgr/smp_svr/sysbuild/hci_rpmsg.conf

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild/hci_rpmsg.conf b/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild/hci_rpmsg.conf
new file mode 100644
index 00000000000..98260877332
--- /dev/null
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild/hci_rpmsg.conf
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2022 Nordic Semiconductor
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_BT_MAX_CONN=2
+CONFIG_BT_BUF_ACL_RX_SIZE=502
+CONFIG_BT_BUF_ACL_TX_SIZE=502
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251

From 7c789f5997e1bbcc44b67069c1b190ac219fde1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 1 Dec 2022 14:41:13 +0100
Subject: [PATCH 2100/2913] [nrf noup] samples&tests: Restore a few
 CONFIG_NEWLIB_LIBC_NANO=n
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a follow-up to commit 9dd570f8a2207a02c886480b0065cd5a0e3a2e94.

Since in NCS, unlike in vanilla Zephyr, the nano variant of newlib
is the default one, restore entries that disable the nano variant
in one sample and one test that require the full newlib variant.
This patch is supposed to be removed when picolibc becomes the default.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit cb05ba516e75d6656be0368375c210374158430e)
---
 tests/lib/newlib/heap_listener/prj.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/lib/newlib/heap_listener/prj.conf b/tests/lib/newlib/heap_listener/prj.conf
index e5a5dc6df4c..7282777ff1c 100644
--- a/tests/lib/newlib/heap_listener/prj.conf
+++ b/tests/lib/newlib/heap_listener/prj.conf
@@ -1,3 +1,4 @@
 CONFIG_ZTEST=y
 CONFIG_NEWLIB_LIBC=y
+CONFIG_NEWLIB_LIBC_NANO=n
 CONFIG_NEWLIB_LIBC_HEAP_LISTENER=y

From 3191308fa1917085663c31f3d685d447daeb663c Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Fri, 15 Dec 2023 07:57:14 +0000
Subject: [PATCH 2101/2913] [nrf noup] samples/tests: Disable PM for some
 sysbuild builds

Disables partition manager when building some samples and tests
which use sysbuild to prevent build issues

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit cd344abd45cc7647e691b1ced0214a4ba3dfb6f1)
---
 samples/boards/nordic/nrf53_sync_rtc/sysbuild.conf          | 1 +
 samples/drivers/mbox/sysbuild.conf                          | 1 +
 samples/subsys/ipc/ipc_service/icmsg/sysbuild.conf          | 1 +
 samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.conf | 1 +
 samples/subsys/ipc/ipc_service/static_vrings/sysbuild.conf  | 1 +
 samples/subsys/logging/multidomain/sysbuild.conf            | 1 +
 tests/boot/mcuboot_recovery_retention/sysbuild.conf         | 1 +
 tests/boot/test_mcuboot/sysbuild.conf                       | 1 +
 tests/drivers/flash/common/sysbuild.conf                    | 1 +
 tests/drivers/flash/negative_tests/sysbuild.conf            | 1 +
 tests/subsys/fs/fcb/sysbuild.conf                           | 1 +
 tests/subsys/fs/littlefs/sysbuild.conf                      | 1 +
 12 files changed, 12 insertions(+)
 create mode 100644 samples/boards/nordic/nrf53_sync_rtc/sysbuild.conf
 create mode 100644 samples/drivers/mbox/sysbuild.conf
 create mode 100644 samples/subsys/ipc/ipc_service/icmsg/sysbuild.conf
 create mode 100644 samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.conf
 create mode 100644 samples/subsys/ipc/ipc_service/static_vrings/sysbuild.conf
 create mode 100644 samples/subsys/logging/multidomain/sysbuild.conf
 create mode 100644 tests/drivers/flash/common/sysbuild.conf
 create mode 100644 tests/drivers/flash/negative_tests/sysbuild.conf
 create mode 100644 tests/subsys/fs/fcb/sysbuild.conf
 create mode 100644 tests/subsys/fs/littlefs/sysbuild.conf

diff --git a/samples/boards/nordic/nrf53_sync_rtc/sysbuild.conf b/samples/boards/nordic/nrf53_sync_rtc/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/samples/boards/nordic/nrf53_sync_rtc/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/drivers/mbox/sysbuild.conf b/samples/drivers/mbox/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/samples/drivers/mbox/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/subsys/ipc/ipc_service/icmsg/sysbuild.conf b/samples/subsys/ipc/ipc_service/icmsg/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/icmsg/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.conf b/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.conf b/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/subsys/logging/multidomain/sysbuild.conf b/samples/subsys/logging/multidomain/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/samples/subsys/logging/multidomain/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/boot/mcuboot_recovery_retention/sysbuild.conf b/tests/boot/mcuboot_recovery_retention/sysbuild.conf
index 47f00ff3cff..3b5b3c96380 100644
--- a/tests/boot/mcuboot_recovery_retention/sysbuild.conf
+++ b/tests/boot/mcuboot_recovery_retention/sysbuild.conf
@@ -1 +1,2 @@
 SB_CONFIG_BOOTLOADER_MCUBOOT=y
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/boot/test_mcuboot/sysbuild.conf b/tests/boot/test_mcuboot/sysbuild.conf
index 47f00ff3cff..3b5b3c96380 100644
--- a/tests/boot/test_mcuboot/sysbuild.conf
+++ b/tests/boot/test_mcuboot/sysbuild.conf
@@ -1 +1,2 @@
 SB_CONFIG_BOOTLOADER_MCUBOOT=y
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/drivers/flash/common/sysbuild.conf b/tests/drivers/flash/common/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/tests/drivers/flash/common/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/drivers/flash/negative_tests/sysbuild.conf b/tests/drivers/flash/negative_tests/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/tests/drivers/flash/negative_tests/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/subsys/fs/fcb/sysbuild.conf b/tests/subsys/fs/fcb/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/tests/subsys/fs/fcb/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/subsys/fs/littlefs/sysbuild.conf b/tests/subsys/fs/littlefs/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/tests/subsys/fs/littlefs/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n

From 0935cf262298c0924f58cf60cd38a54592d0ef89 Mon Sep 17 00:00:00 2001
From: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
Date: Thu, 29 Feb 2024 13:38:48 +0100
Subject: [PATCH 2102/2913] [nrf noup] modules: tfm: Add Kconfig for
 CRYPTO_PAKE_MODULE_ENABLED

Add a Kconfig for th TFM_CRYPTO_PAKE_MODULE_ENABLED to support the PAKE
APIs.

noup as the PAKE support including the PAKE module doesn't exist yet in
upstream TF-M as they depend on mbed TLS support for it

Ref: NCSDK-22416
Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
(cherry picked from commit eb58994e4696b18909c35406d47d0ff5a5baa781)
---
 modules/trusted-firmware-m/Kconfig.tfm.crypto_modules | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules b/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
index 02d3580c22f..9604319ca01 100644
--- a/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
+++ b/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
@@ -88,6 +88,17 @@ config TFM_CRYPTO_KEY_DERIVATION_MODULE_ENABLED
 	  is not used.
 	  Note that key agreement is under key derivation in the current implementation.
 
+config TFM_CRYPTO_PAKE_MODULE_ENABLED
+	bool "PAKE crypto module"
+	default y
+	depends on PSA_HAS_PAKE_SUPPORT
+	depends on NRF_SECURITY
+	depends on PSA_CRYPTO_DRIVER_OBERON || PSA_CRYPTO_DRIVER_CRACEN
+	help
+	  Enables the PAKE crypto module within the crypto partition.
+	  Unset this option if the functionality provided by 'crypto_pake.c'
+	  is not used.
+
 endif # TFM_PARTITION_CRYPTO
 
 endif # BUILD_WITH_TFM

From 584c022ac508bff2ac97fa2a2a02cfa005bf5263 Mon Sep 17 00:00:00 2001
From: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
Date: Tue, 7 Feb 2023 12:39:12 +0100
Subject: [PATCH 2103/2913] [nrf noup] Bluetooth: Mesh: zero randomization for
 friend's adv

Friend's replies on LPN's polls do not assume randomization in
advertiser. Zero randomization will help to optimize time when
LPN keeps receiving window open and save power.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
(cherry picked from commit 6d826614fb100e3b4ba01955000ed4ab68e67ce1)
---
 subsys/bluetooth/mesh/Kconfig   |  2 +-
 subsys/bluetooth/mesh/adv_ext.c | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 395284e80fa..7a9569d98ec 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -1690,7 +1690,7 @@ config BT_MESH_LPN_INIT_POLL_TIMEOUT
 config BT_MESH_LPN_SCAN_LATENCY
 	int "Latency for enabling scanning"
 	range 0 50
-	default 15
+	default 2
 	help
 	  Latency in milliseconds that it takes to enable scanning. This
 	  is in practice how much time in advance before the Receive Window
diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index 367d42ee28b..afb06d63622 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -13,6 +13,9 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/mesh.h>
+#if defined(CONFIG_BT_LL_SOFTDEVICE)
+#include <sdc_hci_vs.h>
+#endif
 
 #include "common/bt_str.h"
 
@@ -153,6 +156,28 @@ static inline struct bt_mesh_ext_adv *gatt_adv_get(void)
 	}
 }
 
+static int set_adv_randomness(uint8_t handle, int rand_us)
+{
+#if defined(CONFIG_BT_LL_SOFTDEVICE)
+	struct net_buf *buf;
+	sdc_hci_cmd_vs_set_adv_randomness_t *cmd_params;
+
+	buf = bt_hci_cmd_create(SDC_HCI_OPCODE_CMD_VS_SET_ADV_RANDOMNESS, sizeof(*cmd_params));
+	if (!buf) {
+		LOG_ERR("Could not allocate command buffer");
+		return -ENOMEM;
+	}
+
+	cmd_params = net_buf_add(buf, sizeof(*cmd_params));
+	cmd_params->adv_handle = handle;
+	cmd_params->rand_us = rand_us;
+
+	return bt_hci_cmd_send_sync(SDC_HCI_OPCODE_CMD_VS_SET_ADV_RANDOMNESS, buf, NULL);
+#else
+	return 0;
+#endif /* defined(CONFIG_BT_LL_SOFTDEVICE) */
+}
+
 static int adv_start(struct bt_mesh_ext_adv *ext_adv,
 		     const struct bt_le_adv_param *param,
 		     struct bt_le_ext_adv_start_param *start,
@@ -520,6 +545,13 @@ int bt_mesh_adv_enable(void)
 		if (err) {
 			return err;
 		}
+
+		if (IS_ENABLED(CONFIG_BT_LL_SOFTDEVICE) && adv->tag & BT_MESH_FRIEND_ADV) {
+			err = set_adv_randomness(adv->instance->handle, 0);
+			if (err) {
+				LOG_ERR("Failed to set zero randomness: %d", err);
+			}
+		}
 	}
 
 	return 0;

From f1cb6df153b25d92c6bfcba58e6bb3262ba3e08e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20Storr=C3=B8?= <anders.storro@nordicsemi.no>
Date: Wed, 8 Mar 2023 12:17:09 +0100
Subject: [PATCH 2104/2913] [nrf noup] Bluetooth: Mesh: Fix adv randomness bug
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes issue where randomness can be removed for advertising sets that
have to handle other adv types than the BT_MESH_FRIEND_ADV tag type.

Signed-off-by: Anders Storrø <anders.storro@nordicsemi.no>
Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 8709818e88c4bf34c80da3918f428c28b3bfd98f)
---
 subsys/bluetooth/mesh/adv_ext.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index afb06d63622..f240260026b 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -546,8 +546,10 @@ int bt_mesh_adv_enable(void)
 			return err;
 		}
 
-		if (IS_ENABLED(CONFIG_BT_LL_SOFTDEVICE) && adv->tag & BT_MESH_FRIEND_ADV) {
-			err = set_adv_randomness(adv->instance->handle, 0);
+		if (IS_ENABLED(CONFIG_BT_LL_SOFTDEVICE) &&
+		    IS_ENABLED(CONFIG_BT_MESH_ADV_EXT_FRIEND_SEPARATE) &&
+		    advs[i].tags == BT_MESH_ADV_TAG_BIT_FRIEND) {
+			err = set_adv_randomness(advs[i].instance->handle, 0);
 			if (err) {
 				LOG_ERR("Failed to set zero randomness: %d", err);
 			}

From deb2aa894b1dc1eea2bb36a39106f2714d1b75a5 Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Thu, 28 Mar 2024 15:04:41 +0100
Subject: [PATCH 2105/2913] [nrf noup] dfu/boot/mcuboot: fix confirmation in
 case of USE_PARTITION_MANAGER

Active partition ID need to be extracted basing on PARTITION_MANAGER
products.

ref.:NCSDK-26693

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit a7b53d1f6fb34219d6be11f40188c86e1f3be317)
(cherry picked from commit d99f13efc7fe216de96ab072b353ffdbe3f96ae1)
---
 subsys/dfu/boot/mcuboot.c | 44 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/subsys/dfu/boot/mcuboot.c b/subsys/dfu/boot/mcuboot.c
index 93d58cb5b6c..b9753eef141 100644
--- a/subsys/dfu/boot/mcuboot.c
+++ b/subsys/dfu/boot/mcuboot.c
@@ -42,6 +42,48 @@ LOG_MODULE_REGISTER(mcuboot_dfu, LOG_LEVEL_DBG);
 #define BOOT_HEADER_MAGIC_V1 0x96f3b83d
 #define BOOT_HEADER_SIZE_V1 32
 
+#if USE_PARTITION_MANAGER
+#include <pm_config.h>
+
+#if CONFIG_MCUBOOT_APPLICATION_IMAGE_NUMBER != -1
+/* Sysbuild */
+#ifdef CONFIG_MCUBOOT
+/* lib is part of MCUboot -> operate on the primary application slot */
+#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_PRIMARY_ID
+#else
+/* TODO: Add firmware loader support */
+/* lib is part of the app -> operate on active slot */
+#if defined(CONFIG_NCS_IS_VARIANT_IMAGE)
+#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_SECONDARY_ID
+#else
+#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_PRIMARY_ID
+#endif
+#endif /* CONFIG_MCUBOOT */
+#else
+/* Legacy child/parent */
+#if CONFIG_BUILD_WITH_TFM
+	#define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE + PM_TFM_SIZE)
+#else
+	#define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE)
+#endif
+
+#ifdef CONFIG_MCUBOOT
+	/* lib is part of MCUboot -> operate on the primary application slot */
+	#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_PRIMARY_ID
+#else
+	/* lib is part of the App -> operate on active slot */
+#if (PM_ADDRESS - PM_ADDRESS_OFFSET) == PM_MCUBOOT_PRIMARY_ADDRESS
+	#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_PRIMARY_ID
+#elif (PM_ADDRESS - PM_ADDRESS_OFFSET) == PM_MCUBOOT_SECONDARY_ADDRESS
+	#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_SECONDARY_ID
+#else
+	#error Missing partition definitions.
+#endif
+#endif /* CONFIG_MCUBOOT */
+#endif /* CONFIG_MCUBOOT_APPLICATION_IMAGE_NUMBER != -1 */
+
+#else
+
 #if defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD)
 /* For RAM LOAD mode, the active image must be fetched from the bootloader */
 static uint8_t boot_fetch_active_slot(void);
@@ -52,6 +94,8 @@ static uint8_t boot_fetch_active_slot(void);
 #define ACTIVE_SLOT_FLASH_AREA_ID DT_FIXED_PARTITION_ID(DT_CHOSEN(zephyr_code_partition))
 #endif
 
+#endif /* USE_PARTITION_MANAGER */
+
 /*
  * Raw (on-flash) representation of the v1 image header.
  */

From 7349c61ab6e6675bb9a1303539fb90b1a4a87070 Mon Sep 17 00:00:00 2001
From: Sigurd Hellesvik <sigurd.hellesvik@nordicsemi.no>
Date: Tue, 26 Mar 2024 16:35:05 +0100
Subject: [PATCH 2106/2913] [nrf noup] modules: mbedtls: Use help for
 DISABLE_MBEDTLS_BUILTIN info

Using a comment to explain Kconfig options make them
invisible to Kconfig search. Use help instead.

Signed-off-by: Sigurd Hellesvik <sigurd.hellesvik@nordicsemi.no>
(cherry picked from commit 2bff40a5046fafdc45109cdd9942c461c709b9bd)
---
 modules/mbedtls/Kconfig | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/mbedtls/Kconfig b/modules/mbedtls/Kconfig
index 7c383955a4a..8f96afc6825 100644
--- a/modules/mbedtls/Kconfig
+++ b/modules/mbedtls/Kconfig
@@ -43,10 +43,11 @@ config MBEDTLS_LIBRARY
 
 endchoice
 
-# subsystems cannot deselect MBEDTLS_BUILTIN, but they can select
-# DISABLE_MBEDTLS_BUILTIN.
 config DISABLE_MBEDTLS_BUILTIN
 	bool
+	help
+	  Subsystems cannot deselect MBEDTLS_BUILTIN, but they can select
+	  DISABLE_MBEDTLS_BUILTIN.
 
 config CUSTOM_MBEDTLS_CFG_FILE
 	bool "Custom mbed TLS configuration file"

From 5336bb307f71b13cf4f1e07aafbb639a857fb3b3 Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Wed, 10 Apr 2024 16:21:40 +0200
Subject: [PATCH 2107/2913] [nrf noup] sample/**/smp_svr: nrf54l15pdk external
 memory dts overlay

Added overlay with m25r64 on-DK memory selecton.
This aim to support testing DFU with secondary partition moved to the
external flash.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
(cherry picked from commit f8b30ba1b3d7b505e702ad8b5348346c672b2da0)
---
 .../boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
new file mode 100644
index 00000000000..410388bfa6d
--- /dev/null
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
@@ -0,0 +1,9 @@
+/ {
+	chosen {
+		nordic,pm-ext-flash = &mx25r64;
+	};
+};
+
+&mx25r64 {
+	status = "okay";
+};

From 6692263072e247f5eef7fb41bb1ee46e56fa7fbe Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Fri, 30 Nov 2018 14:07:56 +0100
Subject: [PATCH 2108/2913] [nrf noup] ci: NCS-specific CI tweaks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Necessary changes for NCS CI.

- Add a Jenkinsfile
- Add a commit-tags workflow: This enables sauce tag checking in sdk-zephyr
- compliance.yml: Disable check for merge commits, since we have upmerges
downstream. Also, since in the code we refer to Kconfig symbols that are defined
in the sdk-nrf repository, the Kconfig checks (Kconfig, KconfigBasic and
KconfigBasicNoModules) will not pass so exclude them. Also, disable any
maintainers-related checks
- scripts/gitlint: Extend the max commit line lengths for Gitlint to account
for sauce tags
- Adapt to the changes in:
https://github.com/nrfconnect/action-commit-tags/pull/4

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Signed-off-by: Krishna T <krishna.t@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit ef75b3e9cc4d05bef72ec6fcce1f3bec5add5d23)
---
 .github/workflows/commit-tags.yml      | 28 ++++++++++++++++++++++++++
 .github/workflows/compliance.yml       |  6 +++---
 Jenkinsfile                            |  5 +++++
 scripts/gitlint/zephyr_commit_rules.py |  4 ++--
 4 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/commit-tags.yml
 create mode 100644 Jenkinsfile

diff --git a/.github/workflows/commit-tags.yml b/.github/workflows/commit-tags.yml
new file mode 100644
index 00000000000..828f0297167
--- /dev/null
+++ b/.github/workflows/commit-tags.yml
@@ -0,0 +1,28 @@
+name: Commit tags
+
+on:
+  pull_request:
+    types: [synchronize, opened, reopened, edited, labeled, unlabeled,
+            milestoned, demilestoned, assigned, unassigned, ready_for_review,
+            review_requested]
+
+jobs:
+  commit_tags:
+    runs-on: ubuntu-22.04
+    name: Run commit tags checks on patch series (PR)
+    steps:
+    - name: Update PATH for west
+      run: |
+        echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+    - name: Checkout the code
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+        fetch-depth: 0
+
+    - name: Run the commit tags
+      uses: nrfconnect/action-commit-tags@main
+      with:
+        target: .
+        upstream: zephyrproject-rtos/zephyr/main
diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml
index 2ad48848fed..56927365550 100644
--- a/.github/workflows/compliance.yml
+++ b/.github/workflows/compliance.yml
@@ -31,8 +31,8 @@ jobs:
         git config --global user.name "Your Name"
         git remote -v
         # Ensure there's no merge commits in the PR
-        [[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
-        (echo "::error ::Merge commits not allowed, rebase instead";false)
+        #[[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
+        #(echo "::error ::Merge commits not allowed, rebase instead";false)
         rm -fr ".git/rebase-apply"
         rm -fr ".git/rebase-merge"
         git rebase origin/${BASE_REF}
@@ -83,7 +83,7 @@ jobs:
         # Increase rename limit to allow for large PRs
         git config diff.renameLimit 10000
         ./scripts/ci/check_compliance.py --annotate -e KconfigBasic -e ClangFormat \
-        -c origin/${BASE_REF}..
+        -e Kconfig -e KconfigBasicNoModules -e ModulesMaintainers -c origin/${BASE_REF}..
 
     - name: upload-results
       uses: actions/upload-artifact@v4
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 00000000000..3b9cf002239
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,5 @@
+@Library("CI_LIB") _
+
+def pipeline = new ncs.sdk_zephyr.Main()
+
+pipeline.run(JOB_NAME)
diff --git a/scripts/gitlint/zephyr_commit_rules.py b/scripts/gitlint/zephyr_commit_rules.py
index a2c9cd3cb7f..ef317e22684 100644
--- a/scripts/gitlint/zephyr_commit_rules.py
+++ b/scripts/gitlint/zephyr_commit_rules.py
@@ -78,7 +78,7 @@ class TitleMaxLengthRevert(LineRule):
     name = "title-max-length-no-revert"
     id = "UC5"
     target = CommitMessageTitle
-    options_spec = [IntOption('line-length', 75, "Max line length")]
+    options_spec = [IntOption('line-length', 120, "Max line length")]
     violation_message = "Commit title exceeds max length ({0}>{1})"
 
     def validate(self, line, _commit):
@@ -103,7 +103,7 @@ class MaxLineLengthExceptions(LineRule):
     name = "max-line-length-with-exceptions"
     id = "UC4"
     target = CommitMessageBody
-    options_spec = [IntOption('line-length', 75, "Max line length")]
+    options_spec = [IntOption('line-length', 120, "Max line length")]
     violation_message = "Commit message body line exceeds max length ({0}>{1})"
 
     def validate(self, line, _commit):

From a4bd5a4ccc9a3d29c5dac46d13bfff5068ce3c95 Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Wed, 27 Sep 2023 09:41:10 +0000
Subject: [PATCH 2109/2913] [nrf noup] test: schedule_api: Use Minimal C
 library

There is no point to use PICOLIB here as it bloats the tests.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 1fb551a83cd9763170f35f74e7dfaa8a6984d4a7)
---
 tests/kernel/sched/schedule_api/prj.conf        | 1 +
 tests/kernel/sched/schedule_api/prj_dumb.conf   | 1 +
 tests/kernel/sched/schedule_api/prj_multiq.conf | 1 +
 3 files changed, 3 insertions(+)

diff --git a/tests/kernel/sched/schedule_api/prj.conf b/tests/kernel/sched/schedule_api/prj.conf
index fe5125047e3..785e9a3987b 100644
--- a/tests/kernel/sched/schedule_api/prj.conf
+++ b/tests/kernel/sched/schedule_api/prj.conf
@@ -7,3 +7,4 @@ CONFIG_MAX_THREAD_BYTES=5
 CONFIG_TEST_USERSPACE=y
 CONFIG_MP_MAX_NUM_CPUS=1
 CONFIG_ZTEST_FATAL_HOOK=y
+CONFIG_MINIMAL_LIBC=y
diff --git a/tests/kernel/sched/schedule_api/prj_dumb.conf b/tests/kernel/sched/schedule_api/prj_dumb.conf
index c0ddfbd7c3f..a1d0cf6dced 100644
--- a/tests/kernel/sched/schedule_api/prj_dumb.conf
+++ b/tests/kernel/sched/schedule_api/prj_dumb.conf
@@ -5,3 +5,4 @@ CONFIG_SCHED_DUMB=y
 CONFIG_MAX_THREAD_BYTES=5
 CONFIG_MP_MAX_NUM_CPUS=1
 CONFIG_ZTEST_FATAL_HOOK=y
+CONFIG_MINIMAL_LIBC=y
diff --git a/tests/kernel/sched/schedule_api/prj_multiq.conf b/tests/kernel/sched/schedule_api/prj_multiq.conf
index 6b28a1f39b2..cfe09fbce47 100644
--- a/tests/kernel/sched/schedule_api/prj_multiq.conf
+++ b/tests/kernel/sched/schedule_api/prj_multiq.conf
@@ -7,3 +7,4 @@ CONFIG_MP_MAX_NUM_CPUS=1
 CONFIG_ZTEST_FATAL_HOOK=y
 CONFIG_NUM_COOP_PRIORITIES=30
 CONFIG_NUM_PREEMPT_PRIORITIES=40
+CONFIG_MINIMAL_LIBC=y

From 360d107b5e65963d90546c8ebaf7bb0be8f91bd4 Mon Sep 17 00:00:00 2001
From: Jan Tore Guggedal <jantore.guggedal@nordicsemi.no>
Date: Mon, 18 May 2020 20:50:13 +0200
Subject: [PATCH 2110/2913] [nrf noup] net: mqtt: Provide option to enable TLS
 session caching

Provides an option to enable TLS session caching for an MQTT
client's secure socket.

Signed-off-by: Jan Tore Guggedal <jantore.guggedal@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit 327226912eecb79b1cca2c96ef99dc904b08ed19)
---
 include/zephyr/net/mqtt.h                       |  3 +++
 subsys/net/lib/mqtt/mqtt_transport_socket_tls.c | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index 2514fc709c2..5da175fe065 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -372,6 +372,9 @@ struct mqtt_sec_config {
 	uint32_t alpn_protocol_name_count;
 #endif
 
+	/** Indicates the preference for enabling TLS session caching. */
+	int session_cache;
+
 	/** Peer hostname for ceritificate verification.
 	 *  May be NULL to skip hostname verification.
 	 */
diff --git a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
index a33cee5aecf..445f45c95df 100644
--- a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
+++ b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
@@ -91,6 +91,16 @@ int mqtt_client_tls_connect(struct mqtt_client *client)
 		}
 	}
 
+	if (tls_config->session_cache == TLS_SESSION_CACHE_ENABLED) {
+		ret = zsock_setsockopt(client->transport.tls.sock, SOL_TLS,
+				       TLS_SESSION_CACHE,
+				       &tls_config->session_cache,
+				       sizeof(tls_config->session_cache));
+		if (ret < 0) {
+			goto error;
+		}
+	}
+
 	if (tls_config->cert_nocopy != TLS_CERT_NOCOPY_NONE) {
 		ret = zsock_setsockopt(client->transport.tls.sock, SOL_TLS,
 				       TLS_CERT_NOCOPY, &tls_config->cert_nocopy,

From 02eb16bf2db2ec34897bc05aca96df8a12ae5102 Mon Sep 17 00:00:00 2001
From: Mirko Covizzi <mirko.covizzi@nordicsemi.no>
Date: Thu, 10 Mar 2022 00:25:50 -0800
Subject: [PATCH 2111/2913] [nrf noup] net: mqtt: add native TLS support

This commit adds an extra parameter in the configuration
structure to configure native TLS support at runtime.

Signed-off-by: Mirko Covizzi <mirko.covizzi@nordicsemi.no>
(cherry picked from commit 640fd0cd087fd83efd2d83fd173930cb188e3a26)
---
 doc/connectivity/networking/api/mqtt.rst        | 3 +++
 include/zephyr/net/mqtt.h                       | 3 +++
 subsys/net/lib/mqtt/mqtt_transport_socket_tls.c | 7 ++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/doc/connectivity/networking/api/mqtt.rst b/doc/connectivity/networking/api/mqtt.rst
index b232f125333..79da5abe57b 100644
--- a/doc/connectivity/networking/api/mqtt.rst
+++ b/doc/connectivity/networking/api/mqtt.rst
@@ -150,6 +150,7 @@ additional configuration information:
    tls_config->sec_tag_list = m_sec_tags;
    tls_config->sec_tag_count = ARRAY_SIZE(m_sec_tags);
    tls_config->hostname = MQTT_BROKER_HOSTNAME;
+   tls_config->set_native_tls = true;
 
 In this sample code, the ``m_sec_tags`` array holds a list of tags, referencing TLS
 credentials that the MQTT library should use for authentication. We do not specify
@@ -162,6 +163,8 @@ Note, that TLS credentials referenced by the ``m_sec_tags`` array must be
 registered in the system first. For more information on how to do that, refer
 to :ref:`secure sockets documentation <secure_sockets_interface>`.
 
+Finally, ``set_native_tls`` can be optionally set to enable native TLS support instead of offloading TLS operations to the modem.
+
 An example of how to use TLS with MQTT is also present in
 :zephyr:code-sample:`mqtt-publisher` sample application.
 
diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index 5da175fe065..9c09069b107 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -382,6 +382,9 @@ struct mqtt_sec_config {
 
 	/** Indicates the preference for copying certificates to the heap. */
 	int cert_nocopy;
+
+	/** Set socket to native TLS */
+	bool set_native_tls;
 };
 
 /** @brief MQTT transport type. */
diff --git a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
index 445f45c95df..c3816e5949f 100644
--- a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
+++ b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
@@ -22,10 +22,15 @@ int mqtt_client_tls_connect(struct mqtt_client *client)
 {
 	const struct sockaddr *broker = client->broker;
 	struct mqtt_sec_config *tls_config = &client->transport.tls.config;
+	int type = SOCK_STREAM;
 	int ret;
 
+	if (tls_config->set_native_tls) {
+		type |= SOCK_NATIVE_TLS;
+	}
+
 	client->transport.tls.sock = zsock_socket(broker->sa_family,
-						  SOCK_STREAM, IPPROTO_TLS_1_2);
+						  type, IPPROTO_TLS_1_2);
 	if (client->transport.tls.sock < 0) {
 		return -errno;
 	}

From 4c864a32a607bf1f2a550d313046987256a130bc Mon Sep 17 00:00:00 2001
From: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
Date: Mon, 4 Dec 2023 15:27:08 +0100
Subject: [PATCH 2112/2913] [nrf noup] soc: arm: nRF53: Add SPU Flash/RAM
 alignment

TF-M will uses SPU alignment during build time to make sure all
partitions can be locked down with the SPU.

So adding them for nRF53

Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
(cherry picked from commit 8315b87957b9ca4805759ef0b2cef76eedc70318)
---
 soc/nordic/nrf53/Kconfig | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/soc/nordic/nrf53/Kconfig b/soc/nordic/nrf53/Kconfig
index 9fc9d7a9df0..e051c0b67fb 100644
--- a/soc/nordic/nrf53/Kconfig
+++ b/soc/nordic/nrf53/Kconfig
@@ -156,12 +156,26 @@ config NRF_SPU_FLASH_REGION_SIZE
 	help
 	  FLASH region size for the NRF_SPU peripheral
 
+config NRF_SPU_FLASH_REGION_ALIGNMENT
+	hex
+	default 0x4000
+	help
+	  FLASH regions must be aligned to this value due to SPU HW
+	  limitations.
+
 config NRF_SPU_RAM_REGION_SIZE
 	hex
 	default 0x2000
 	help
 	  RAM region size for the NRF_SPU peripheral
 
+config NRF_SPU_RAM_REGION_ALIGNMENT
+	hex
+	default 0x2000
+	help
+	  RAM regions must be aligned to this value due to SPU HW
+	  limitations.
+
 config SOC_NRF_GPIO_FORWARDER_FOR_NRF5340
 	bool "Forward GPIO pins to network core"
 	depends on NRF_SOC_SECURE_SUPPORTED

From 17b5fabf13dc18ffde5ff622080f130cd52529c0 Mon Sep 17 00:00:00 2001
From: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
Date: Mon, 4 Dec 2023 15:27:14 +0100
Subject: [PATCH 2113/2913] [nrf noup] soc: arm: nRF91: Add SPU Flash/RAM
 alignment

TF-M will uses SPU alignment during build time to make sure all
partitions can be locked down with the SPU.

So adding them for nRF91

The nRF54L15 doesn't use the SPU for setting the security attributes
for flash/RAM regions. In order to avoid having multiple Kconfigs
with similar meaning renamed the alignment Kconfig option to something
more generic in order to use the same symbol for all the TrustZone enabled
devices.

Ref: NCSDK-25023

Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
(cherry picked from commit 0107d28417da899552a1ffae3814a4a5be2feb6b)
---
 soc/nordic/nrf53/Kconfig | 22 ++++++++++++++--------
 soc/nordic/nrf91/Kconfig | 20 ++++++++++++++++++++
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/soc/nordic/nrf53/Kconfig b/soc/nordic/nrf53/Kconfig
index e051c0b67fb..e63f93a3409 100644
--- a/soc/nordic/nrf53/Kconfig
+++ b/soc/nordic/nrf53/Kconfig
@@ -156,12 +156,15 @@ config NRF_SPU_FLASH_REGION_SIZE
 	help
 	  FLASH region size for the NRF_SPU peripheral
 
-config NRF_SPU_FLASH_REGION_ALIGNMENT
+config  NRF_TRUSTZONE_FLASH_REGION_SIZE
 	hex
-	default 0x4000
+	default NRF_SPU_FLASH_REGION_SIZE
 	help
-	  FLASH regions must be aligned to this value due to SPU HW
-	  limitations.
+	  Define the flash region size from a TrustZone perspective.
+	  This is used when we set the security attributes(S/NSC/NS) of a region
+	  in TrustZone enabled devices.
+	  In practice this option defines the granularity of the security attributes,
+	  i.e. the smallest region that can be set to secure or non-secure.
 
 config NRF_SPU_RAM_REGION_SIZE
 	hex
@@ -169,12 +172,15 @@ config NRF_SPU_RAM_REGION_SIZE
 	help
 	  RAM region size for the NRF_SPU peripheral
 
-config NRF_SPU_RAM_REGION_ALIGNMENT
+config  NRF_TRUSTZONE_RAM_REGION_SIZE
 	hex
-	default 0x2000
+	default NRF_SPU_RAM_REGION_SIZE
 	help
-	  RAM regions must be aligned to this value due to SPU HW
-	  limitations.
+	  Define the RAM region size from a TrustZone perspective.
+	  This is used when we set the security attributes(S/NSC/NS) of a region
+	  in TrustZone enabled devices.
+	  In practice this option defines the granularity of the security attributes,
+	  i.e. the smallest region that can be set to secure or non-secure.
 
 config SOC_NRF_GPIO_FORWARDER_FOR_NRF5340
 	bool "Forward GPIO pins to network core"
diff --git a/soc/nordic/nrf91/Kconfig b/soc/nordic/nrf91/Kconfig
index ed38eff73a2..9f55cdd77ed 100644
--- a/soc/nordic/nrf91/Kconfig
+++ b/soc/nordic/nrf91/Kconfig
@@ -24,6 +24,16 @@ config NRF_SPU_FLASH_REGION_SIZE
 	help
 	  FLASH region size for the NRF_SPU peripheral
 
+config  NRF_TRUSTZONE_FLASH_REGION_SIZE
+	hex
+	default NRF_SPU_FLASH_REGION_SIZE
+	help
+	  Define the flash region size from a TrustZone perspective.
+	  This is used when we set the security attributes(S/NSC/NS) of a region
+	  in TrustZone enabled devices.
+	  In practice this option defines the granularity of the security attributes,
+	  i.e. the smallest region that can be set to secure or non-secure.
+
 config NRF_SPU_RAM_REGION_SIZE
 	hex
 	default 0x2000
@@ -34,4 +44,14 @@ config NRF_ENABLE_ICACHE
 	bool "Instruction cache (I-Cache)"
 	default y
 
+config  NRF_TRUSTZONE_RAM_REGION_SIZE
+	hex
+	default NRF_SPU_RAM_REGION_SIZE
+	help
+	  Define the RAM region size from a TrustZone perspective.
+	  This is used when we set the security attributes(S/NSC/NS) of a region
+	  in TrustZone enabled devices.
+	  In practice this option defines the granularity of the security attributes,
+	  i.e. the smallest region that can be set to secure or non-secure.
+
 endif # SOC_SERIES_NRF91X

From d3f54075039e0ca79ce3008df46c6f70f44d1ea2 Mon Sep 17 00:00:00 2001
From: Marek Pieta <Marek.Pieta@nordicsemi.no>
Date: Mon, 14 Nov 2022 11:22:06 +0100
Subject: [PATCH 2114/2913] [nrf noup] boards: thingy53_nrf5340: Add common
 partition map

Change introduces common static Partition Manager configuration.
The tfm_nonsecure partition must be SPU region aligned.

Ref: NCSDK-18033
Ref: NCSDK-19515

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
(cherry picked from commit 4f1f83b81edf0c7502344736130ab66e03b25bee)
---
 .../pm_static_thingy53_nrf5340_cpuapp.yml     | 55 ++++++++++++++
 .../pm_static_thingy53_nrf5340_cpuapp_ns.yml  | 73 +++++++++++++++++++
 2 files changed, 128 insertions(+)
 create mode 100644 boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp.yml
 create mode 100644 boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp_ns.yml

diff --git a/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp.yml b/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp.yml
new file mode 100644
index 00000000000..7a48d51ec33
--- /dev/null
+++ b/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp.yml
@@ -0,0 +1,55 @@
+app:
+  address: 0x10200
+  region: flash_primary
+  size: 0xdfe00
+mcuboot:
+  address: 0x0
+  region: flash_primary
+  size: 0x10000
+mcuboot_pad:
+  address: 0x10000
+  region: flash_primary
+  size: 0x200
+mcuboot_primary:
+  address: 0x10000
+  orig_span: &id001
+  - mcuboot_pad
+  - app
+  region: flash_primary
+  size: 0xe0000
+  span: *id001
+mcuboot_primary_app:
+  address: 0x10200
+  orig_span: &id002
+  - app
+  region: flash_primary
+  size: 0xdfe00
+  span: *id002
+settings_storage:
+  address: 0xf0000
+  region: flash_primary
+  size: 0x10000
+mcuboot_primary_1:
+  address: 0x0
+  size: 0x40000
+  device: flash_ctrl
+  region: ram_flash
+mcuboot_secondary:
+  address: 0x00000
+  size: 0xe0000
+  device: MX25R64
+  region: external_flash
+mcuboot_secondary_1:
+  address: 0xe0000
+  size: 0x40000
+  device: MX25R64
+  region: external_flash
+external_flash:
+  address: 0x120000
+  size: 0x6e0000
+  device: MX25R64
+  region: external_flash
+pcd_sram:
+  address: 0x20000000
+  size: 0x2000
+  region: sram_primary
diff --git a/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp_ns.yml b/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp_ns.yml
new file mode 100644
index 00000000000..70ffe6d9c12
--- /dev/null
+++ b/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp_ns.yml
@@ -0,0 +1,73 @@
+mcuboot:
+  address: 0x0
+  region: flash_primary
+  size: 0x10000
+mcuboot_pad:
+  address: 0x10000
+  region: flash_primary
+  size: 0x200
+tfm_secure:
+  address: 0x10000
+  size: 0xc000
+  span: [mcuboot_pad, tfm]
+tfm_nonsecure:
+  address: 0x1c000
+  size: 0xd4000
+  span: [app]
+tfm:
+  address: 0x10200
+  region: flash_primary
+  size: 0xbe00
+app:
+  address: 0x1c000
+  region: flash_primary
+  size: 0xd4000
+mcuboot_primary:
+  address: 0x10000
+  orig_span: &id001
+  - mcuboot_pad
+  - tfm
+  - app
+  region: flash_primary
+  size: 0xe0000
+  span: *id001
+mcuboot_primary_app:
+  address: 0x10200
+  orig_span: &id002
+  - tfm
+  - app
+  region: flash_primary
+  size: 0xdfe00
+  span: *id002
+nonsecure_storage:
+  address: 0xf0000
+  size: 0x10000
+  span: [settings_storage]
+settings_storage:
+  address: 0xf0000
+  region: flash_primary
+  size: 0x10000
+mcuboot_primary_1:
+  address: 0x0
+  size: 0x40000
+  device: flash_ctrl
+  region: ram_flash
+mcuboot_secondary:
+  address: 0x00000
+  size: 0xe0000
+  device: MX25R64
+  region: external_flash
+mcuboot_secondary_1:
+  address: 0xe0000
+  size: 0x40000
+  device: MX25R64
+  region: external_flash
+external_flash:
+  address: 0x120000
+  size: 0x6e0000
+  device: MX25R64
+  region: external_flash
+pcd_sram:
+  address: 0x20000000
+  size: 0x2000
+  region: sram_primary

From 71ba9b7f2b9b61c3eba1fcd2a444d5315990973e Mon Sep 17 00:00:00 2001
From: Mateusz Kapala <mateusz.kapala@nordicsemi.no>
Date: Thu, 2 Feb 2023 11:04:23 +0100
Subject: [PATCH 2115/2913] [nrf noup] boards: arm: thingy53: Disable USB CDC
 added by MCUBoot

Enabling USB CDC by default in Thingy:53 board configuration
caused that there were two instances of USB CDC in MCUBoot. Change
disables one instance which was added automatically by NCS if
MCUBoot bootloader was built as a child image.

Jira: NCSDK-18596

Signed-off-by: Mateusz Kapala <mateusz.kapala@nordicsemi.no>
Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit f01f4727d70b4ed20bbaf0fb8c1f022e16fb3064)
---
 boards/nordic/thingy53/Kconfig.defconfig | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/boards/nordic/thingy53/Kconfig.defconfig b/boards/nordic/thingy53/Kconfig.defconfig
index d149d360f85..cbd8246c76f 100644
--- a/boards/nordic/thingy53/Kconfig.defconfig
+++ b/boards/nordic/thingy53/Kconfig.defconfig
@@ -81,6 +81,13 @@ endif # !TRUSTED_EXECUTION_SECURE
 
 source "boards/common/usb/Kconfig.cdc_acm_serial.defconfig"
 
+# By default, a USB CDC ACM instance is already enabled in the board's DTS.
+# It is not necessary for nRF Connect SDK to add another instance if MCUBoot
+# bootloader is built as a child image.
+config MCUBOOT_USB_SUPPORT
+	bool
+	default n
+
 endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
 
 if BOARD_THINGY53_NRF5340_CPUNET

From 6a76af10e4ea46e4e43a3c122243c378f6c44193 Mon Sep 17 00:00:00 2001
From: Marek Pieta <Marek.Pieta@nordicsemi.no>
Date: Mon, 28 Nov 2022 15:31:33 +0100
Subject: [PATCH 2116/2913] [nrf noup] boards: thingy53_nrf5340: Enable MCUboot
 by default

Change enables MCUboot bootloader by default to allow programming
samples and applications without external programmer (using MCUboot
serial recovery). Change also enables network core to prevent build
failures when building MCUboot with nRF53 multi image DFU.

Jira: NCSDK-18263

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
(cherry picked from commit 1e7e8edd624db75044326f201ecd02880298e493)
---
 boards/nordic/thingy53/Kconfig.defconfig            | 6 ++++++
 boards/nordic/thingy53/thingy53_nrf5340_common.dtsi | 1 +
 2 files changed, 7 insertions(+)

diff --git a/boards/nordic/thingy53/Kconfig.defconfig b/boards/nordic/thingy53/Kconfig.defconfig
index cbd8246c76f..144abfbf628 100644
--- a/boards/nordic/thingy53/Kconfig.defconfig
+++ b/boards/nordic/thingy53/Kconfig.defconfig
@@ -5,6 +5,12 @@
 
 if BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
 
+config BOOTLOADER_MCUBOOT
+	default y if !MCUBOOT
+
+config BOARD_ENABLE_CPUNET
+	default y if !MCUBOOT
+
 # Code Partition:
 #
 # For the secure version of the board the firmware is linked at the beginning
diff --git a/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi b/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
index 72471a0c95e..8bc98ef65b4 100644
--- a/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
+++ b/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
@@ -13,6 +13,7 @@
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,ieee802154 = &ieee802154;
+		nordic,pm-ext-flash = &mx25r64;
 	};
 
 	buttons {

From bbb5ec081cf974175f494472db714f87f32d50b4 Mon Sep 17 00:00:00 2001
From: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
Date: Wed, 15 Nov 2023 12:55:40 +0100
Subject: [PATCH 2117/2913] [nrf noup] boards: arm: nrf9131ek: enable tfm

This patch backports the nrf9131ek to a time before tfm was refactored.

To be reverted when TF-M is updated.

Signed-off-by: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
(cherry picked from commit f4efefb975d3e0b54aee51be89bd830ccd04c67b)
---
 boards/nordic/nrf9131ek/Kconfig.defconfig | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/boards/nordic/nrf9131ek/Kconfig.defconfig b/boards/nordic/nrf9131ek/Kconfig.defconfig
index b63e7ef8d34..8e0e1d02d1d 100644
--- a/boards/nordic/nrf9131ek/Kconfig.defconfig
+++ b/boards/nordic/nrf9131ek/Kconfig.defconfig
@@ -5,6 +5,21 @@
 
 if BOARD_NRF9131EK_NRF9131 || BOARD_NRF9131EK_NRF9131_NS
 
+# By default, if we build for a Non-Secure version of the board,
+# enable building with TF-M as the Secure Execution Environment.
+config BUILD_WITH_TFM
+	default y if BOARD_NRF9131EK_NRF9131_NS
+
+if BUILD_WITH_TFM
+
+# By default, if we build with TF-M, instruct build system to
+# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
+config TFM_FLASH_MERGED_BINARY
+	bool
+	default y
+
+endif # BUILD_WITH_TFM
+
 # For the secure version of the board the firmware is linked at the beginning
 # of the flash, or into the code-partition defined in DT if it is intended to
 # be loaded by MCUboot. If the secure firmware is to be combined with a non-

From 77164802b510021c1dd5e66543637f53616272a2 Mon Sep 17 00:00:00 2001
From: Mateusz Michalek <mateusz.michalek@nordicsemi.no>
Date: Wed, 20 Mar 2024 12:10:13 +0100
Subject: [PATCH 2118/2913] [nrf noup] samples: smp_svr: configuration for
 nrf54l15

Configuration allows DFU with serial transport using
mcumgr and over BT using nRF Connect.

Signed-off-by: Mateusz Michalek <mateusz.michalek@nordicsemi.no>
(cherry picked from commit 0b39a49df9468bdcdda450731d6b02ddebba14bb)
---
 samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 3d9cb6489cf..e37fae9d746 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -14,9 +14,11 @@ tests:
       - nrf52840dk/nrf52840
       - pinnacle_100_dvk
       - mg100
+      - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
+      - nrf54l15pdk/nrf54l15/cpuapp
   sample.mcumgr.smp_svr.bt_static_svc:
     harness: bluetooth
     tags: bluetooth

From cb87e139e9acb5389e6e77d815315ee20dfce526 Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Fri, 12 Apr 2024 17:53:35 +0200
Subject: [PATCH 2119/2913] [nrf noup] samples/**/smp_svr: testcase of
 nrf54l15pdk with ext-flash

Added description of sample testcase for building smp_svr with
support of secondary partition in on PDK spi_nor flash.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
(cherry picked from commit b4f2813c71c6308c0b65d5a0fa39aaf043731fbf)
---
 samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index e37fae9d746..76ea4b84c30 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -167,6 +167,18 @@ tests:
       - mg100
     integration_platforms:
       - nrf52840dk/nrf52840
+  sample.mcumgr.smp_svr.bt.nrf54l15pdk.ext_flash:
+    extra_args:
+      - OVERLAY_CONFIG="overlay-bt.conf"
+      - DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
+      - mcuboot_CONF_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.conf"
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
+    extra_configs:
+      - CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
+    platform_allow:
+      - nrf54l15pdk/nrf54l15/cpuapp
+    integration_platforms:
+      - nrf54l15pdk/nrf54l15/cpuapp
   sample.mcumgr.smp_svr.ram_load:
     extra_args: FILE_SUFFIX="ram_load"
     platform_allow:

From 0aec2f2b5f00736eede28fcd0201d63267a4cd6b Mon Sep 17 00:00:00 2001
From: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
Date: Fri, 19 Apr 2024 12:58:47 +0200
Subject: [PATCH 2120/2913] [nrf noup] samples: psa_crypto: Remove support for
 Nordic boards

We have our own psa crypto samples to show how to used PSA crypto with
NCS.

This sample still uses CONFIG_MBEDTLS_BUILTIN which is not supported
anymore, therefore removing the support for it in NCS.

Ref: NCSDK-17944
Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
(cherry picked from commit 124e72c6d8c85f195acf1379f2c95a32d1229f08)
---
 samples/tfm_integration/psa_crypto/sample.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/samples/tfm_integration/psa_crypto/sample.yaml b/samples/tfm_integration/psa_crypto/sample.yaml
index ff5448cc5e6..0f69b98b93e 100644
--- a/samples/tfm_integration/psa_crypto/sample.yaml
+++ b/samples/tfm_integration/psa_crypto/sample.yaml
@@ -16,8 +16,6 @@ tests:
     platform_allow:
       - mps2/an521/cpu0/ns
       - v2m_musca_s1/musca_s1/ns
-      - nrf5340dk/nrf5340/cpuapp/ns
-      - nrf9160dk/nrf9160/ns
       - stm32l562e_dk/stm32l562xx/ns
       - bl5340_dvk/nrf5340/cpuapp/ns
     integration_platforms:

From 332dd9efa80dd74be1496bdb1e98485a812c798a Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Mon, 15 Apr 2024 18:51:29 +0200
Subject: [PATCH 2121/2913] [nrf noup] samples/smp_svr: nrf54l15pdk ext-flash
 partition

Added DTS with partitioning which involves external flash
as place for slo1_partition.external slot1_partition

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
(cherry picked from commit 7edd93c1edb7701c8e7a67591df2c32c19c3374d)
---
 ...54l15pdk_nrf54l15_cpuapp_ext_flash.overlay | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
index 410388bfa6d..76b648903a0 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
@@ -4,6 +4,42 @@
 	};
 };
 
+/delete-node/ &boot_partition;
+/delete-node/ &slot0_partition;
+/delete-node/ &slot1_partition;
+
+/delete-node/ &slot0_ns_partition;
+/delete-node/ &slot1_ns_partition;
+
+/delete-node/ &storage_partition;
+
+&rram0 {
+	partitions {
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x000000000 0x00014000>;
+		};
+		slot0_partition: partition@14000 {
+			label = "image-0";
+			reg = <0x000014000 0x0015A000>;
+		};
+		storage_partition: partition@16E000 {
+			label = "storage";
+			reg = < 0x16E000 0x9000 >;
+		};
+	};
+};
+
 &mx25r64 {
 	status = "okay";
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		slot1_partition: partition@0 {
+			label = "image-1";
+			reg = <0x000000000 0x0015A000>;
+		};
+	};
 };

From b309d299a623f1f132d873dc03dd2a3e5d0d1c0a Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Mon, 29 Apr 2024 17:26:47 +0200
Subject: [PATCH 2122/2913] [nrf noup] samples/**/smp_svr: testcase of
 nrf54l15pdk with ext-flash DT

Added description of sample testcase for building smp_svr with
support of secondary partition in on PDK spi_nor flash uisng
DTS.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
(cherry picked from commit 08368a1040105dc596829aacd8aa6ccf80465c97)
---
 samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 76ea4b84c30..9a1657506f0 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -179,6 +179,18 @@ tests:
       - nrf54l15pdk/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15pdk/nrf54l15/cpuapp
+  sample.mcumgr.smp_svr.bt.nrf54l15pdk.ext_flash.pure_dts:
+    extra_args:
+      - OVERLAY_CONFIG="overlay-bt.conf"
+      - DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
+      - mcuboot_CONF_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.conf"
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
+    extra_configs:
+      - SB_CONFIG_PARTITION_MANAGER=n
+    platform_allow:
+      - nrf54l15pdk/nrf54l15/cpuapp
+    integration_platforms:
+      - nrf54l15pdk/nrf54l15/cpuapp
   sample.mcumgr.smp_svr.ram_load:
     extra_args: FILE_SUFFIX="ram_load"
     platform_allow:

From cdc76c13215b7534c9607af7607de2038452ddc4 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Thu, 9 May 2024 09:34:06 +0100
Subject: [PATCH 2123/2913] [nrf noup] boards: nordic: thingy53: Add sysbuild
 Kconfig file

Adds a sysbuild Kconfig file which enables external flash when
partition manager is enabled

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 031b51365d27df2bc012be3e1775164f0ee925d2)
---
 boards/nordic/thingy53/Kconfig.sysbuild | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 boards/nordic/thingy53/Kconfig.sysbuild

diff --git a/boards/nordic/thingy53/Kconfig.sysbuild b/boards/nordic/thingy53/Kconfig.sysbuild
new file mode 100644
index 00000000000..2110f226e6b
--- /dev/null
+++ b/boards/nordic/thingy53/Kconfig.sysbuild
@@ -0,0 +1,5 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
+	default y if BOOTLOADER_MCUBOOT

From 95f5086e664382f8df8c6af458e3653638966f29 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Tue, 14 May 2024 12:22:51 +0100
Subject: [PATCH 2124/2913] [nrf noup] scripts: west: build: Use sysbuild by
 default if in NCS dir

Uses sysbuild by default when building an application which resides in
an allowed NCS-based directory when the sysbuild config key is not
set. Do not use sysbuild if the mps2 board is being used to avoid
problems with CI testing.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit f7060745b31b1d26e57a3280cd3f0dc6660682ec)
---
 scripts/west_commands/build.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/west_commands/build.py b/scripts/west_commands/build.py
index d3c159db2fc..1c2e0be28a1 100644
--- a/scripts/west_commands/build.py
+++ b/scripts/west_commands/build.py
@@ -631,7 +631,12 @@ def _run_cmake(self, board, origin, cmake_opts):
         if user_args:
             cmake_opts.extend(shlex.split(user_args))
 
-        config_sysbuild = config_getboolean('sysbuild', False)
+        config_sysbuild = config_getboolean('sysbuild', None)
+
+        if config_sysbuild is None:
+            # If no option is set, then enable sysbuild globally
+            config_sysbuild = True
+
         if self.args.sysbuild or (config_sysbuild and not self.args.no_sysbuild):
             cmake_opts.extend(['-S{}'.format(SYSBUILD_PROJ_DIR),
                                '-DAPP_DIR:PATH={}'.format(self.source_dir)])

From 142532e6ec395debf8cbe7d29482e2a44a42f800 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Fri, 17 May 2024 10:15:33 +0100
Subject: [PATCH 2125/2913] [nrf noup] board: nordic: thingy53: Enable default
 images for sysbuild

Enables MCUboot, empty network core and network core updates by
default when building for the thingy53

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit ab305add763a56b6671c3b1b5828a6c7d6d88105)
---
 boards/nordic/thingy53/Kconfig.sysbuild | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/boards/nordic/thingy53/Kconfig.sysbuild b/boards/nordic/thingy53/Kconfig.sysbuild
index 2110f226e6b..c03d191b370 100644
--- a/boards/nordic/thingy53/Kconfig.sysbuild
+++ b/boards/nordic/thingy53/Kconfig.sysbuild
@@ -1,5 +1,22 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
+if BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
+
+choice BOOTLOADER
+	default BOOTLOADER_MCUBOOT
+endchoice
+
+config SECURE_BOOT_NETCORE
+	default y
+
+config NETCORE_APP_UPDATE
+	default y if SECURE_BOOT_NETCORE
+
+config NRF_DEFAULT_EMPTY
+	default y if SECURE_BOOT_NETCORE
+
+endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
+
 config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
 	default y if BOOTLOADER_MCUBOOT

From dd9226be2b6f0fdd44816a268942553febe53079 Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Tue, 21 May 2024 16:30:31 +0200
Subject: [PATCH 2126/2913] [nrf noup] samples/**/smp_svr: fix
 SB_CONFIG_PARTITION_MANAGER injection

In sample.yaml:
`SB_CONFIG_PARTITION_MANAGER=n` moved to extar_args as extra_config
can't handle property with `SB_` prefix.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
(cherry picked from commit 4101af67a14edb655c33fa08e778bd44ef52cff2)
---
 samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 9a1657506f0..4d1fcca58ac 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -185,7 +185,6 @@ tests:
       - DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
       - mcuboot_CONF_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.conf"
       - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
-    extra_configs:
       - SB_CONFIG_PARTITION_MANAGER=n
     platform_allow:
       - nrf54l15pdk/nrf54l15/cpuapp

From bdfeb85dec41fe9138e7937a75682d84db8602ab Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Mon, 1 Oct 2018 10:27:32 +0200
Subject: [PATCH 2127/2913] [nrf noup] include: net: add NCS extensions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add some socket options and address family extensions to Zephyr
headers, which will be useful for nRF Connect SDK.

Add secure socket options:
* Add CID socket options to NCS specific options.
* Add TLS/DTLS tls ciphersuite chosen socket option to NCS specific
  options.
* Add TLS/DTLS connection save/load socket options to NCS specific
  options.
* Add TLS/DTLS handshake status socket option to NCS specific options.

* Add SO_KEEPOPEN socket option.
* Add SO_RAI socket options.
* Add SO_IPV6_DELAYED_ADDR_REFRESH socket option.

The "author" of this commit is a contact person; various people with
s-o-b lines following here have contributed to the maintenance of this
patch.

Signed-off-by: Andreas Moltumyr <andreas.moltumyr@nordicsemi.no>
Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
Signed-off-by: Christopher Métrailler <christopher.metrailler@nordicsemi.no>
Signed-off-by: Emanuele Di Santo <emdi@nordicsemi.no>
Signed-off-by: Glenn Ruben Bakke <glenn.ruben.bakke@nordicsemi.no>
Signed-off-by: Håkon Alseth <haal@nordicsemi.no>
Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
Signed-off-by: Jan Tore Guggedal <jantore.guggedal@nordicsemi.no>
Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
Signed-off-by: Mirko Covizzi <mirko.covizzi@nordicsemi.no>
Signed-off-by: Petri Honkala <petri.honkala@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Tommi Mammela <tommi.mammela@nordicsemi.no>
Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Signed-off-by: Eivind Jølsgard <eivind.jolsgard@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit eab09f631472554b4a1cd9df6b67a587ecd7d634)
---
 include/zephyr/net/socket.h     |   1 +
 include/zephyr/net/socket_ncs.h | 170 ++++++++++++++++++++++++++++++++
 2 files changed, 171 insertions(+)
 create mode 100644 include/zephyr/net/socket_ncs.h

diff --git a/include/zephyr/net/socket.h b/include/zephyr/net/socket.h
index 58c3fb0332d..fd99b8daf28 100644
--- a/include/zephyr/net/socket.h
+++ b/include/zephyr/net/socket.h
@@ -34,6 +34,7 @@
 #include <zephyr/sys/iterable_sections.h>
 #include <zephyr/sys/fdtable.h>
 #include <zephyr/net/dns_resolve.h>
+#include <zephyr/net/socket_ncs.h>
 #include <stdlib.h>
 
 #ifdef __cplusplus
diff --git a/include/zephyr/net/socket_ncs.h b/include/zephyr/net/socket_ncs.h
new file mode 100644
index 00000000000..4a198b5992b
--- /dev/null
+++ b/include/zephyr/net/socket_ncs.h
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_NET_SOCKET_NCS_H_
+#define ZEPHYR_INCLUDE_NET_SOCKET_NCS_H_
+
+/**
+ * @file
+ * @brief NCS specific additions to the BSD sockets API definitions
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* When CONFIG_NET_SOCKETS_OFFLOAD is enabled, offloaded sockets take precedence
+ * when creating a new socket. Combine this flag with a socket type when
+ * creating a socket, to enforce native socket creation (e. g. SOCK_STREAM | SOCK_NATIVE).
+ * If it's desired to create a native TLS socket, but still offload the
+ * underlying TCP/UDP socket, use e. g. SOCK_STREAM | SOCK_NATIVE_TLS.
+ */
+#define SOCK_NATIVE 0x80000000
+#define SOCK_NATIVE_TLS 0x40000000
+
+/* NCS specific TLS level socket options */
+
+/** Socket option to set DTLS handshake timeout, specifically for nRF sockets.
+ *  The option accepts an integer, indicating the total handshake timeout,
+ *  including retransmissions, in seconds.
+ *  Accepted values for the option are: 1, 3, 7, 15, 31, 63, 123.
+ */
+#define TLS_DTLS_HANDSHAKE_TIMEO 18
+
+/** Socket option to save DTLS connection, specifically for nRF sockets.
+ */
+#define TLS_DTLS_CONN_SAVE 19
+
+/** Socket option to load DTLS connection, specifically for nRF sockets.
+ */
+#define TLS_DTLS_CONN_LOAD 20
+
+/** Socket option to get result of latest TLS/DTLS completed handshakes end status,
+ *  specifically for nRF sockets.
+ *  The option accepts an integer, indicating the setting.
+ *  Accepted vaules for the option are: 0 and 1.
+ */
+#define TLS_DTLS_HANDSHAKE_STATUS 21
+
+/* Valid values for TLS_SESSION_CACHE option */
+#define TLS_SESSION_CACHE_DISABLED 0 /**< Disable TLS session caching. */
+#define TLS_SESSION_CACHE_ENABLED 1 /**< Enable TLS session caching. */
+
+/* Valid values for TLS_DTLS_HANDSHAKE_TIMEO option */
+#define TLS_DTLS_HANDSHAKE_TIMEO_NONE 0 /**< No timeout */
+#define TLS_DTLS_HANDSHAKE_TIMEO_1S 1 /**< 1 second */
+#define TLS_DTLS_HANDSHAKE_TIMEO_3S 3 /**< 1s + 2s */
+#define TLS_DTLS_HANDSHAKE_TIMEO_7S 7 /**< 1s + 2s + 4s */
+#define TLS_DTLS_HANDSHAKE_TIMEO_15S 15 /**< 1s + 2s + 4s + 8s */
+#define TLS_DTLS_HANDSHAKE_TIMEO_31S 31 /**< 1s + 2s + 4s + 8s + 16s */
+#define TLS_DTLS_HANDSHAKE_TIMEO_63S 63 /**< 1s + 2s + 4s + 8s + 16s + 32s */
+#define TLS_DTLS_HANDSHAKE_TIMEO_123S 123 /**< 1s + 2s + 4s + 8s + 16s + 32s + 60s */
+
+/* Valid values for TLS_DTLS_HANDSHAKE_STATUS option */
+#define TLS_DTLS_HANDSHAKE_STATUS_FULL		0
+#define TLS_DTLS_HANDSHAKE_STATUS_CACHED	1
+
+/* NCS specific socket options */
+
+/** sockopt: enable sending data as part of exceptional events */
+#define SO_EXCEPTIONAL_DATA 33
+/** sockopt: Keep socket open when its PDN connection is lost
+ *           or the device is put into flight mode.
+ */
+#define SO_KEEPOPEN 34
+/** sockopt: bind to PDN */
+#define SO_BINDTOPDN 40
+
+/** sockopt: Release assistance indication (RAI).
+ *  The option accepts an integer, indicating the type of RAI.
+ *  Accepted values for the option are: @ref RAI_NO_DATA, @ref RAI_LAST, @ref RAI_ONE_RESP,
+ *  @ref RAI_ONGOING, @ref RAI_WAIT_MORE.
+ */
+#define SO_RAI 61
+
+/** Release assistance indication (RAI).
+ *  Indicate that the application does not intend to send more data.
+ *  This applies immediately and lets the modem exit connected mode more
+ *  quickly.
+ *
+ *  @note This requires the socket to be connected.
+ */
+#define RAI_NO_DATA 1
+/** Release assistance indication (RAI).
+ *  Indicate that the application does not intend to send more data
+ *  after the next call to send() or sendto().
+ *  This lets the modem exit connected mode more quickly after sending the data.
+ */
+#define RAI_LAST 2
+/** Release assistance indication (RAI).
+ *  Indicate that the application is expecting to receive just one data packet
+ *  after the next call to send() or sendto().
+ *  This lets the modem exit connected mode more quickly after having received the data.
+ */
+#define RAI_ONE_RESP 3
+/** Release assistance indication (RAI).
+ *  Indicate that the socket is in active use by a client application.
+ *  This lets the modem stay in connected mode longer.
+ */
+#define RAI_ONGOING 4
+/** Release assistance indication (RAI).
+ *  Indicate that the socket is in active use by a server application.
+ *  This lets the modem stay in connected mode longer.
+ */
+#define RAI_WAIT_MORE 5
+
+/* NCS specific IPPROTO_ALL level socket options */
+
+/** IPv4 and IPv6 protocol level (pseudo-val) for nRF sockets. */
+#define IPPROTO_ALL 512
+/** sockopt: disable all replies to unexpected traffics */
+#define SO_SILENCE_ALL 30
+
+/* NCS specific IPPROTO_IP level socket options */
+
+/** sockopt: enable IPv4 ICMP replies */
+#define SO_IP_ECHO_REPLY 31
+
+/* NCS specific IPPROTO_IPV6 level socket options */
+
+/** sockopt: enable IPv6 ICMP replies */
+#define SO_IPV6_ECHO_REPLY 32
+
+/** sockopt: Delay IPv6 address refresh during power saving mode  */
+#define SO_IPV6_DELAYED_ADDR_REFRESH 62
+
+/* NCS specific TCP level socket options */
+
+/** sockopt: Configurable TCP server session timeout in minutes.
+ * Range is 0 to 135. 0 is no timeout and 135 is 2 h 15 min. Default is 0 (no timeout).
+ */
+#define SO_TCP_SRV_SESSTIMEO 55
+
+/* NCS specific gettaddrinfo() flags */
+
+/** Assume `service` contains a Packet Data Network (PDN) ID.
+ *  When specified together with the AI_NUMERICSERV flag,
+ *  `service` shall be formatted as follows: "port:pdn_id"
+ *  where "port" is the port number and "pdn_id" is the PDN ID.
+ *  Example: "8080:1", port 8080 PDN ID 1.
+ *  Example: "42:0", port 42 PDN ID 0.
+ */
+#define AI_PDNSERV 0x1000
+
+/* NCS specific send() and sendto() flags */
+
+/** Request a blocking send operation until the request is acknowledged.
+ *  When used in send() or sendto(), the request will not return until the
+ *  send operation is completed by lower layers, or until the timeout, given by the SO_SNDTIMEO
+ *  socket option, is reached. Valid timeout values are 1 to 600 seconds.
+ */
+#define MSG_WAITACK 0x200
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_NET_SOCKET_NCS_H_ */

From a276b18225e40c15298e2f8b0f60c979d321e555 Mon Sep 17 00:00:00 2001
From: Sigvart Hovland <sigvart.hovland@nordicsemi.no>
Date: Fri, 3 May 2019 14:21:52 +0200
Subject: [PATCH 2128/2913] [nrf noup] tree-wide: support NCS Partition Manager
 (PM) definitions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Partition Manager (PM) is a component of the nRF Connect SDK (NCS)
which uses yaml files to resolve flash partition placement with a
holistic view of the entire device, including each firmware image
present on the flash device, and various subsystems, such as settings
and NFFS.

When this NCS extension is used, various source files which would use
partition information from devicetree in "vanilla" zephyr instead use
defines generated by PM instead.

This commit removes support for HEX_FILES_TO_MERGE, as it conflicts
with PM.

The settings subsystem pm.yml defines a partition 'settings_storage'.
The nffs subsystem pm.yml defines 'nffs_storage'.

Leverage label translation to avoid patching partition names.

Refer to the NCS documentation page for this feature for more details.

This is a long-running out of tree patch which has been worked on by
several people. The following sign-offs are in alphabetical order by
first name.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>
Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
Signed-off-by: Ole Sæther <ole.saether@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
Signed-off-by: Sigvart Hovland <sigvart.hovland@nordicsemi.no>
Signed-off-by: Thomas Stenersen <thomas.stenersen@nordicsemi.no>
Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>
Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit e56959d1eb4c3d21aa9335f8d642f047b2afb7db)
---
 arch/arm/core/mpu/arm_mpu_regions.c           | 13 +++++
 cmake/linker/ld/target.cmake                  |  1 +
 cmake/modules/kernel.cmake                    |  4 ++
 drivers/flash/soc_flash_nrf.c                 | 11 ++++
 .../arch/arm/cortex_m/scripts/linker.ld       | 50 +++++++++++++++++++
 include/zephyr/storage/flash_map.h            |  6 +++
 lib/heap/Kconfig                              |  2 +-
 lib/libc/common/source/stdlib/malloc.c        | 18 ++++++-
 subsys/dfu/boot/mcuboot_shell.c               | 40 +++++++++++++++
 subsys/fs/littlefs_fs.c                       |  7 ++-
 subsys/ipc/rpmsg_service/rpmsg_backend.h      | 27 ++++++++++
 11 files changed, 175 insertions(+), 4 deletions(-)

diff --git a/arch/arm/core/mpu/arm_mpu_regions.c b/arch/arm/core/mpu/arm_mpu_regions.c
index 0bf7a219c27..383fd573513 100644
--- a/arch/arm/core/mpu/arm_mpu_regions.c
+++ b/arch/arm/core/mpu/arm_mpu_regions.c
@@ -8,6 +8,9 @@
 #include <zephyr/arch/arm/mpu/arm_mpu.h>
 
 #include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#if USE_PARTITION_MANAGER
+#include <pm_config.h>
+#endif
 
 static const struct arm_mpu_region mpu_regions[] = {
 #ifdef CONFIG_XIP
@@ -24,6 +27,14 @@ static const struct arm_mpu_region mpu_regions[] = {
 
 	/* Region 1 */
 	MPU_REGION_ENTRY("SRAM_0",
+#if USE_PARTITION_MANAGER
+			 PM_SRAM_ADDRESS,
+#if defined(CONFIG_ARMV8_M_BASELINE) || defined(CONFIG_ARMV8_M_MAINLINE)
+			 REGION_RAM_ATTR(PM_SRAM_ADDRESS, PM_SRAM_SIZE)),
+#else
+			 REGION_RAM_ATTR(REGION_SRAM_SIZE)),
+#endif
+#else
 			 CONFIG_SRAM_BASE_ADDRESS,
 #if defined(CONFIG_ARMV8_M_BASELINE) || defined(CONFIG_ARMV8_M_MAINLINE)
 			 REGION_RAM_ATTR(CONFIG_SRAM_BASE_ADDRESS, \
@@ -31,6 +42,8 @@ static const struct arm_mpu_region mpu_regions[] = {
 #else
 			 REGION_RAM_ATTR(REGION_SRAM_SIZE)),
 #endif
+
+#endif /* USE_PARTITION_MANAGER */
 };
 
 const struct arm_mpu_config mpu_config = {
diff --git a/cmake/linker/ld/target.cmake b/cmake/linker/ld/target.cmake
index 37a88b837c4..253013a8382 100644
--- a/cmake/linker/ld/target.cmake
+++ b/cmake/linker/ld/target.cmake
@@ -85,6 +85,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
       ${current_includes}
       ${soc_linker_script_includes}
       ${template_script_defines}
+      -DUSE_PARTITION_MANAGER=$<OR:$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>,$<BOOL:${IMAGE_NAME}>,$<TARGET_EXISTS:partition_manager>>
       -E ${LINKER_SCRIPT}
       -P # Prevent generation of debug `#line' directives.
       -o ${linker_script_gen}
diff --git a/cmake/modules/kernel.cmake b/cmake/modules/kernel.cmake
index 6a1a48b172d..db07a04b921 100644
--- a/cmake/modules/kernel.cmake
+++ b/cmake/modules/kernel.cmake
@@ -250,3 +250,7 @@ if("${CMAKE_EXTRA_GENERATOR}" STREQUAL "Eclipse CDT4")
   include(${ZEPHYR_BASE}/cmake/ide/eclipse_cdt4_generator_amendment.cmake)
   eclipse_cdt4_generator_amendment(1)
 endif()
+
+if(ZEPHYR_NRF_MODULE_DIR)
+  include(${ZEPHYR_NRF_MODULE_DIR}/cmake/partition_manager.cmake)
+endif()
diff --git a/drivers/flash/soc_flash_nrf.c b/drivers/flash/soc_flash_nrf.c
index 9e1ba68319f..574739082dc 100644
--- a/drivers/flash/soc_flash_nrf.c
+++ b/drivers/flash/soc_flash_nrf.c
@@ -37,6 +37,11 @@ LOG_MODULE_REGISTER(flash_nrf);
 
 #define SOC_NV_FLASH_NODE DT_INST(0, soc_nv_flash)
 
+#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER
+#include <soc_secure.h>
+#include <pm_config.h>
+#endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER */
+
 #ifndef CONFIG_SOC_FLASH_NRF_RADIO_SYNC_NONE
 #define FLASH_SLOT_WRITE     7500
 #if defined(CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE)
@@ -166,6 +171,12 @@ static int flash_nrf_read(const struct device *dev, off_t addr,
 	}
 #endif
 
+#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER && PM_APP_ADDRESS
+	if (addr < PM_APP_ADDRESS) {
+		return soc_secure_mem_read(data, (void *)addr, len);
+	}
+#endif
+
 	nrf_nvmc_buffer_read(data, (uint32_t)addr, len);
 
 	return 0;
diff --git a/include/zephyr/arch/arm/cortex_m/scripts/linker.ld b/include/zephyr/arch/arm/cortex_m/scripts/linker.ld
index 761ae06f9b6..6a1e91b66ed 100644
--- a/include/zephyr/arch/arm/cortex_m/scripts/linker.ld
+++ b/include/zephyr/arch/arm/cortex_m/scripts/linker.ld
@@ -34,6 +34,39 @@
 #define ROMSTART_REGION ROMABLE_REGION
 #endif
 
+#if USE_PARTITION_MANAGER
+
+#include <pm_config.h>
+
+#if CONFIG_NCS_IS_VARIANT_IMAGE && defined(PM_S0_ID)
+/* We are linking against S1, create symbol containing the flash ID of S0.
+ * This is used when writing code operating on the "other" slot.
+ */
+_image_1_primary_slot_id = PM_S0_ID;
+
+#else /* ! CONFIG_NCS_IS_VARIANT_IMAGE */
+
+#ifdef PM_S1_ID
+/* We are linking against S0, create symbol containing the flash ID of S1.
+ * This is used when writing code operating on the "other" slot.
+ */
+_image_1_primary_slot_id = PM_S1_ID;
+#endif /* PM_S1_ID */
+
+#endif /* CONFIG_NCS_IS_VARIANT_IMAGE */
+
+#define ROM_ADDR PM_ADDRESS
+#define ROM_SIZE PM_SIZE
+
+#if defined(CONFIG_PM_USE_CONFIG_SRAM_SIZE)
+#define RAM_SIZE CONFIG_PM_SRAM_SIZE
+#else
+#define RAM_SIZE PM_SRAM_SIZE
+#endif
+#define RAM_ADDR PM_SRAM_ADDRESS
+
+#else /* ! USE_PARTITION_MANAGER */
+
 #if !defined(CONFIG_XIP) && (CONFIG_FLASH_SIZE == 0)
 #define ROM_ADDR RAM_ADDR
 #else
@@ -55,6 +88,23 @@
 #define RAM_SIZE (CONFIG_SRAM_SIZE * 1K)
 #define RAM_ADDR CONFIG_SRAM_BASE_ADDRESS
 
+#endif /* USE_PARTITION_MANAGER */
+
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_ccm), okay)
+#define CCM_SIZE DT_REG_SIZE(DT_CHOSEN(zephyr_ccm))
+#define CCM_ADDR DT_REG_ADDR(DT_CHOSEN(zephyr_ccm))
+#endif
+
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_itcm), okay)
+#define ITCM_SIZE DT_REG_SIZE(DT_CHOSEN(zephyr_itcm))
+#define ITCM_ADDR DT_REG_ADDR(DT_CHOSEN(zephyr_itcm))
+#endif
+
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
+#define DTCM_SIZE DT_REG_SIZE(DT_CHOSEN(zephyr_dtcm))
+#define DTCM_ADDR DT_REG_ADDR(DT_CHOSEN(zephyr_dtcm))
+#endif
+
 #if defined(CONFIG_CUSTOM_SECTION_ALIGN)
 _region_min_align = CONFIG_CUSTOM_SECTION_MIN_ALIGN_SIZE;
 #else
diff --git a/include/zephyr/storage/flash_map.h b/include/zephyr/storage/flash_map.h
index a0d528acfb7..670a14308e6 100644
--- a/include/zephyr/storage/flash_map.h
+++ b/include/zephyr/storage/flash_map.h
@@ -326,6 +326,10 @@ const char *flash_area_label(const struct flash_area *fa);
  */
 uint8_t flash_area_erased_val(const struct flash_area *fa);
 
+#if USE_PARTITION_MANAGER
+#include <flash_map_pm.h>
+#else
+
 /**
  * Returns non-0 value if fixed-partition of given DTS node label exists.
  *
@@ -447,6 +451,8 @@ DT_FOREACH_STATUS_OKAY(fixed_partitions, FOR_EACH_PARTITION_TABLE)
 #undef FOR_EACH_PARTITION_TABLE
 /** @endcond */
 
+#endif /* USE_PARTITION_MANAGER */
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/heap/Kconfig b/lib/heap/Kconfig
index 89ede278006..147659f96a9 100644
--- a/lib/heap/Kconfig
+++ b/lib/heap/Kconfig
@@ -69,7 +69,7 @@ config HEAP_LISTENER
 choice
 	prompt "Supported heap sizes"
 	depends on !64BIT
-	default SYS_HEAP_SMALL_ONLY if (SRAM_SIZE <= 256)
+	default SYS_HEAP_SMALL_ONLY if (SRAM_SIZE <= 256) && !PARTITION_MANAGER_ENABLED
 	default SYS_HEAP_AUTO
 	help
 	  Heaps using reduced-size chunk headers can accommodate so called
diff --git a/lib/libc/common/source/stdlib/malloc.c b/lib/libc/common/source/stdlib/malloc.c
index a75b028000d..505bd50bad0 100644
--- a/lib/libc/common/source/stdlib/malloc.c
+++ b/lib/libc/common/source/stdlib/malloc.c
@@ -25,6 +25,20 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
+#if USE_PARTITION_MANAGER
+
+#include <pm_config.h>
+
+#define RAM_SIZE PM_SRAM_SIZE
+#define RAM_ADDR PM_SRAM_ADDRESS
+
+#else /* ! USE_PARTITION_MANAGER */
+
+#define RAM_SIZE (KB((size_t) CONFIG_SRAM_SIZE))
+#define RAM_ADDR CONFIG_SRAM_BASE_ADDRESS
+
+#endif /* USE_PARTITION_MANAGER */
+
 #ifdef CONFIG_COMMON_LIBC_MALLOC
 
 #if (CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE != 0)
@@ -106,8 +120,8 @@ static POOL_SECTION unsigned char __aligned(HEAP_ALIGN) malloc_arena[HEAP_SIZE];
 extern char _heap_sentry[];
 #    define HEAP_SIZE  ROUND_DOWN((POINTER_TO_UINT(_heap_sentry) - HEAP_BASE), HEAP_ALIGN)
 #   else
-#    define HEAP_SIZE	ROUND_DOWN((KB((size_t) CONFIG_SRAM_SIZE) -	\
-		((size_t) HEAP_BASE - (size_t) CONFIG_SRAM_BASE_ADDRESS)), HEAP_ALIGN)
+#    define HEAP_SIZE	ROUND_DOWN((RAM_SIZE -	\
+		((size_t) HEAP_BASE - (size_t) RAM_ADDR)), HEAP_ALIGN)
 #   endif /* else CONFIG_XTENSA */
 
 #  endif /* else CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE > 0 */
diff --git a/subsys/dfu/boot/mcuboot_shell.c b/subsys/dfu/boot/mcuboot_shell.c
index be4e558713f..e167bc1e39b 100644
--- a/subsys/dfu/boot/mcuboot_shell.c
+++ b/subsys/dfu/boot/mcuboot_shell.c
@@ -20,6 +20,16 @@
 #endif
 #endif
 
+#if USE_PARTITION_MANAGER
+#include <flash_map_pm.h>
+
+#ifdef CONFIG_NCS_IS_VARIANT_IMAGE
+#define ACTIVE_IMAGE_ID PM_MCUBOOT_SECONDARY_ID
+#else
+#define ACTIVE_IMAGE_ID PM_MCUBOOT_PRIMARY_ID
+#endif
+#endif
+
 struct area_desc {
 	const char *name;
 	unsigned int id;
@@ -93,6 +103,35 @@ static int cmd_mcuboot_erase(const struct shell *sh, size_t argc,
 	id = strtoul(argv[1], NULL, 0);
 
 	/* Check if this is the parent (MCUboot) or own slot and if so, deny the request */
+#if USE_PARTITION_MANAGER
+#ifdef PM_MCUBOOT_ID
+	if (id == PM_MCUBOOT_ID || id == PM_MCUBOOT_PAD_ID) {
+		shell_error(sh, "Cannot erase boot partition");
+		return -EACCES;
+	}
+#endif
+
+#ifdef PM_APP_ID
+	if (id == PM_APP_ID) {
+		shell_error(sh, "Cannot erase this area");
+		return -EACCES;
+	}
+#endif
+
+#ifdef PM_MCUBOOT_PRIMARY_APP_ID
+	if (id == PM_MCUBOOT_PRIMARY_APP_ID) {
+		shell_error(sh, "Cannot erase this area");
+		return -EACCES;
+	}
+#endif
+
+#ifdef ACTIVE_IMAGE_ID
+	if (id == ACTIVE_IMAGE_ID) {
+		shell_error(sh, "Cannot erase active partitions");
+		return -EACCES;
+	}
+#endif
+#else
 #if FIXED_PARTITION_EXISTS(boot_partition)
 	if (id == FIXED_PARTITION_ID(boot_partition)) {
 		shell_error(sh, "Cannot erase boot partition");
@@ -105,6 +144,7 @@ static int cmd_mcuboot_erase(const struct shell *sh, size_t argc,
 		shell_error(sh, "Cannot erase active partitions");
 		return -EACCES;
 	}
+#endif
 #endif
 
 	err = boot_erase_img_bank(id);
diff --git a/subsys/fs/littlefs_fs.c b/subsys/fs/littlefs_fs.c
index 5634f290d75..0ab47e2b983 100644
--- a/subsys/fs/littlefs_fs.c
+++ b/subsys/fs/littlefs_fs.c
@@ -1109,7 +1109,12 @@ struct fs_mount_t FS_FSTAB_ENTRY(DT_DRV_INST(inst)) = { \
 	.type = FS_LITTLEFS, \
 	.mnt_point = DT_INST_PROP(inst, mount_point), \
 	.fs_data = &fs_data_##inst, \
-	.storage_dev = (void *)DT_FIXED_PARTITION_ID(FS_PARTITION(inst)), \
+	.storage_dev = (void *) \
+		COND_CODE_1(USE_PARTITION_MANAGER, \
+			    (COND_CODE_1(FIXED_PARTITION_EXISTS(littlefs_storage), \
+					 (FIXED_PARTITION_ID(littlefs_storage)), \
+					 (FIXED_PARTITION_ID(storage)))), \
+			    (DT_FIXED_PARTITION_ID(FS_PARTITION(inst)))), \
 	.flags = FSTAB_ENTRY_DT_MOUNT_FLAGS(DT_DRV_INST(inst)), \
 };
 
diff --git a/subsys/ipc/rpmsg_service/rpmsg_backend.h b/subsys/ipc/rpmsg_service/rpmsg_backend.h
index a74e46b8520..9996e1d74d9 100644
--- a/subsys/ipc/rpmsg_service/rpmsg_backend.h
+++ b/subsys/ipc/rpmsg_service/rpmsg_backend.h
@@ -13,8 +13,35 @@
 extern "C" {
 #endif
 
+#if CONFIG_PARTITION_MANAGER_ENABLED
+
+#include "pm_config.h"
+
+#if defined(PM_RPMSG_NRF53_SRAM_ADDRESS) || defined(PM__RPMSG_NRF53_SRAM_ADDRESS)
+
+#if defined(PM_RPMSG_NRF53_SRAM_ADDRESS)
+#define VDEV_START_ADDR PM_RPMSG_NRF53_SRAM_ADDRESS
+#define VDEV_SIZE PM_RPMSG_NRF53_SRAM_SIZE
+#else
+/* The current image is a child image in a different domain than the image
+ * which defined the required values. To reach the values of the parent domain
+ * we use the 'PM__' variant of the define.
+ */
+#define VDEV_START_ADDR PM__RPMSG_NRF53_SRAM_ADDRESS
+#define VDEV_SIZE PM__RPMSG_NRF53_SRAM_SIZE
+#endif /* defined(PM_RPMSG_NRF53_SRAM_ADDRESS) */
+
+#else
 #define VDEV_START_ADDR		DT_REG_ADDR(DT_CHOSEN(zephyr_ipc_shm))
 #define VDEV_SIZE		DT_REG_SIZE(DT_CHOSEN(zephyr_ipc_shm))
+#endif /* defined(PM_RPMSG_NRF53_SRAM_ADDRESS) || defined(PM__RPMSG_NRF53_SRAM_ADDRESS) */
+
+#else
+
+#define VDEV_START_ADDR		DT_REG_ADDR(DT_CHOSEN(zephyr_ipc_shm))
+#define VDEV_SIZE		DT_REG_SIZE(DT_CHOSEN(zephyr_ipc_shm))
+
+#endif /* CONFIG_PARTITION_MANAGER_ENABLED */
 
 #define VDEV_STATUS_ADDR	VDEV_START_ADDR
 #define VDEV_STATUS_SIZE	0x400

From 04625c40e769bf9e0c73d8043569a3a00a98a421 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Fri, 17 May 2024 14:10:51 +0200
Subject: [PATCH 2129/2913] [nrf noup] kernel: Disable boot banner if
 NCS_BOOT_BANNER is enabled

Zephyr's boot banner should not be used if NCS boot banner is enabled.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 2afff479b2ef3ed56afbd540e0fa3e7e53a3a0c4)
---
 kernel/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/Kconfig b/kernel/Kconfig
index 36fcf1d821c..e709b98c250 100644
--- a/kernel/Kconfig
+++ b/kernel/Kconfig
@@ -442,6 +442,7 @@ config SKIP_BSS_CLEAR
 config BOOT_BANNER
 	bool "Boot banner"
 	default y
+	depends on !NCS_BOOT_BANNER
 	select PRINTK
 	select EARLY_CONSOLE
 	help

From 8e483875b0e019bec9ff904d709f25084b2c7590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5vard=20Reierstad?= <haavard.reierstad@nordicsemi.no>
Date: Fri, 31 May 2024 08:21:51 +0200
Subject: [PATCH 2130/2913] =?UTF-8?q?[nrf=20noup]=C2=A0Bluetooth:=20Mesh:?=
 =?UTF-8?q?=20remove=20legacy=20adv=20support?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removes explicit support for the legacy advertiser due
to incompatibility with SDC.

The legacy advertiser can be used (experimentally) with the
Zephyr Link Layer enabled, but is not recommended.

Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 710ffc1ae64aa5bb6807baecd79bb143acc9fda8)
---
 subsys/bluetooth/mesh/Kconfig | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 7a9569d98ec..268e21c42ad 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -59,12 +59,16 @@ choice BT_MESH_ADV
 
 menuconfig BT_MESH_ADV_LEGACY
 	bool "Legacy advertising"
+	depends on BT_LL_SW_SPLIT
 	help
 	  Use legacy advertising commands for mesh sending. Legacy
-	  advertising is significantly slower than the extended advertising, but
-	  is supported by all controllers.
+	  advertising is significantly slower than the extended advertising.
 
-	  WARNING: The legacy advertiser can occasionally do more message
+	  WARNING: This feature is not supported in NCS. The legacy advertiser will not work
+	  with SDC, as attempting to start an advertisement during the scanner duty cycle
+	  will result in an error. The Zephyr Link Layer can be used experimentally as an
+	  alternative.
+	  The legacy advertiser can occasionally do more message
 	  retransmissions than requested because of limitations of HCI
 	  interface API.
 

From ea97683b72b0b8f44ecbc9db266d6ef5276357ad Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Wed, 5 Jun 2024 13:37:34 +0100
Subject: [PATCH 2131/2913] [nrf noup] board: nordic: thingy53: Default to
 update only MCUboot type

Changes the default MCUboot mode to update only for the thingy53,
to align with previous bootloader builds

Changes the thingy53 default configuration for sysbuild to enable
using all RAM in the MCUboot image

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 35df9f232ff779aa117e5f440d556d4903f17142)
---
 boards/nordic/thingy53/Kconfig.sysbuild | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/boards/nordic/thingy53/Kconfig.sysbuild b/boards/nordic/thingy53/Kconfig.sysbuild
index c03d191b370..df489c1dd54 100644
--- a/boards/nordic/thingy53/Kconfig.sysbuild
+++ b/boards/nordic/thingy53/Kconfig.sysbuild
@@ -7,6 +7,10 @@ choice BOOTLOADER
 	default BOOTLOADER_MCUBOOT
 endchoice
 
+choice MCUBOOT_MODE
+	default MCUBOOT_MODE_OVERWRITE_ONLY
+endchoice
+
 config SECURE_BOOT_NETCORE
 	default y
 
@@ -16,6 +20,9 @@ config NETCORE_APP_UPDATE
 config NRF_DEFAULT_EMPTY
 	default y if SECURE_BOOT_NETCORE
 
+config MCUBOOT_USE_ALL_AVAILABLE_RAM
+	default y if BOARD_THINGY53_NRF5340_CPUAPP_NS && BOOTLOADER_MCUBOOT
+
 endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
 
 config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY

From 73947532cebf297b3ffd37a4487eb82686298c85 Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Wed, 5 Jun 2024 15:41:34 +0200
Subject: [PATCH 2132/2913] [nrf noup] samples/../smp_svr: fix nrf54l15pdk ext
 flash dts overlay

Align to changes in DTS:
  renamed: rram0 -> cpuapp_rram
  sized up cpauapp_rram region szie as part of it was reserved for
  cpuflpr_rram (which is not used by this config).

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
(cherry picked from commit a283f6b726973c4ee4688aa37750cf80bb5cbaf6)
---
 .../boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
index 76b648903a0..ddbd39f4bde 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
@@ -13,7 +13,8 @@
 
 /delete-node/ &storage_partition;
 
-&rram0 {
+&cpuapp_rram {
+	reg = < 0x0 DT_SIZE_K(1524) >;
 	partitions {
 		boot_partition: partition@0 {
 			label = "mcuboot";

From 305c8246bb3583fd27830b8a98e893d244a6b40e Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Wed, 12 Jun 2024 16:15:29 +0200
Subject: [PATCH 2133/2913] [nrf noup] samples: sysbuild: hello_world: support
 PM on nRF53

PM support is still required for nRF53/nRF54l15 in the context of NCS.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 29b2233c624721668927f692d7a67b1430068249)
---
 samples/sysbuild/hello_world/sysbuild.cmake | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/samples/sysbuild/hello_world/sysbuild.cmake b/samples/sysbuild/hello_world/sysbuild.cmake
index c7c2615c665..8f8fc49dbff 100644
--- a/samples/sysbuild/hello_world/sysbuild.cmake
+++ b/samples/sysbuild/hello_world/sysbuild.cmake
@@ -11,5 +11,17 @@ ExternalZephyrProject_Add(
   BOARD ${SB_CONFIG_REMOTE_BOARD}
 )
 
+if(SB_CONFIG_SOC_SERIES_NRF53X)
+  set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUNET)
+  set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES remote)
+  set_property(GLOBAL PROPERTY DOMAIN_APP_CPUNET remote)
+  set(CPUNET_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "")
+else(SB_CONFIG_SOC_SERIES_NRF54LX)
+  set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUFLPR)
+  set_property(GLOBAL APPEND PROPERTY PM_CPUFLPR_IMAGES remote)
+  set_property(GLOBAL PROPERTY DOMAIN_APP_CPUFLPR remote)
+  set(CPUFLPR_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "")
+endif()
+
 add_dependencies(${DEFAULT_IMAGE} remote)
 sysbuild_add_dependencies(FLASH ${DEFAULT_IMAGE} remote)

From d2c110b472fc6e4fab867e4c9fdf24136219666f Mon Sep 17 00:00:00 2001
From: Damian Krolik <damian.krolik@nordicsemi.no>
Date: Mon, 25 Sep 2023 16:41:15 +0200
Subject: [PATCH 2134/2913] [nrf noup] settings: nvs: use dedicated lookup
 cache hash function

Introduce NVS_LOOKUP_CACHE_FOR_SETTINGS Kconfig option that
enables a dedicated hash function for the NVS lookup cache
that takes advantage of the NVS ID allocation scheme used
by the NVS settings backend. As such, this option should
only be used if an application uses NVS via the settings
layer.

Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>
(cherry picked from commit aa850001cd2334aa9a0e74fcdba8e639e6edd30b)
---
 subsys/fs/nvs/Kconfig |  9 +++++++++
 subsys/fs/nvs/nvs.c   | 46 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/subsys/fs/nvs/Kconfig b/subsys/fs/nvs/Kconfig
index 208be140f22..db9334506fd 100644
--- a/subsys/fs/nvs/Kconfig
+++ b/subsys/fs/nvs/Kconfig
@@ -29,6 +29,15 @@ config NVS_LOOKUP_CACHE_SIZE
 	  Number of entries in Non-volatile Storage lookup cache.
 	  It is recommended that it be a power of 2.
 
+config NVS_LOOKUP_CACHE_FOR_SETTINGS
+	bool "Non-volatile Storage lookup cache optimized for settings"
+	depends on NVS_LOOKUP_CACHE
+	help
+	  Use the lookup cache hash function that results in the least number of
+	  collissions and, in turn, the best NVS performance provided that the NVS
+	  is used as the settings backend only. This option should NOT be enabled
+	  if the NVS is also written to directly, outside the settings layer.
+
 config NVS_DATA_CRC
 	bool "Non-volatile Storage CRC protection on the data"
 	help
diff --git a/subsys/fs/nvs/nvs.c b/subsys/fs/nvs/nvs.c
index 2c7c4ff5606..5b1b3056c9d 100644
--- a/subsys/fs/nvs/nvs.c
+++ b/subsys/fs/nvs/nvs.c
@@ -13,6 +13,11 @@
 #include <zephyr/sys/crc.h>
 #include "nvs_priv.h"
 
+#ifdef CONFIG_NVS_LOOKUP_CACHE_FOR_SETTINGS
+#include <zephyr/sys/util.h>
+#include <settings/settings_nvs.h>
+#endif
+
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(fs_nvs, CONFIG_NVS_LOG_LEVEL);
 
@@ -21,6 +26,45 @@ static int nvs_ate_valid(struct nvs_fs *fs, const struct nvs_ate *entry);
 
 #ifdef CONFIG_NVS_LOOKUP_CACHE
 
+#ifdef CONFIG_NVS_LOOKUP_CACHE_FOR_SETTINGS
+
+static inline size_t nvs_lookup_cache_pos(uint16_t id)
+{
+	/*
+	 * 1. The NVS settings backend uses up to (NVS_NAME_ID_OFFSET - 1) NVS IDs to
+	      store keys and equal number of NVS IDs to store values.
+	 * 2. For each key-value pair, the value is stored at NVS ID greater by exactly
+	 *    NVS_NAME_ID_OFFSET than NVS ID that holds the key.
+	 * 3. The backend tries to minimize the range of NVS IDs used to store keys.
+	 *    That is, NVS IDs are allocated sequentially, and freed NVS IDs are reused
+	 *    before allocating new ones.
+	 *
+	 * Therefore, to assure the least number of collisions in the lookup cache,
+	 * the least significant bit of the hash indicates whether the given NVS ID
+	 * represents a key or a value, and remaining bits of the hash are set to
+	 * the ordinal number of the key-value pair. Consequently, the hash function
+	 * provides the following mapping:
+	 *
+	 * 1st settings key   => hash 0
+	 * 1st settings value => hash 1
+	 * 2nd settings key   => hash 2
+	 * 2nd settings value => hash 3
+	 * ...
+	 */
+	BUILD_ASSERT(IS_POWER_OF_TWO(NVS_NAMECNT_ID), "NVS_NAMECNT_ID is not power of 2");
+	BUILD_ASSERT(IS_POWER_OF_TWO(NVS_NAME_ID_OFFSET), "NVS_NAME_ID_OFFSET is not power of 2");
+
+	uint16_t key_value_bit;
+	uint16_t key_value_ord;
+
+	key_value_bit = (id >> LOG2(NVS_NAME_ID_OFFSET)) & 1;
+	key_value_ord = id & (NVS_NAME_ID_OFFSET - 1);
+
+	return ((key_value_ord << 1) | key_value_bit) % CONFIG_NVS_LOOKUP_CACHE_SIZE;
+}
+
+#else /* CONFIG_NVS_LOOKUP_CACHE_FOR_SETTINGS */
+
 static inline size_t nvs_lookup_cache_pos(uint16_t id)
 {
 	uint16_t hash;
@@ -36,6 +80,8 @@ static inline size_t nvs_lookup_cache_pos(uint16_t id)
 	return hash % CONFIG_NVS_LOOKUP_CACHE_SIZE;
 }
 
+#endif /* CONFIG_NVS_LOOKUP_CACHE_FOR_SETTINGS */
+
 static int nvs_lookup_cache_rebuild(struct nvs_fs *fs)
 {
 	int rc;

From ac886cc886287031e90ec7a35f59c2205cb95265 Mon Sep 17 00:00:00 2001
From: Kamil Gawor <Kamil.Gawor@nordicsemi.no>
Date: Tue, 9 Apr 2024 14:24:34 +0200
Subject: [PATCH 2135/2913] [nrf noup] entropy: Add fake entropy nRF PRNG
 driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This adds temporary entropy driver simulation for
nRF54h20 device since final entropy source is not
available yet.

TODO: Remove this commit when proper solution will
be available.

Jira: NCSDK-25947

Signed-off-by: Kamil Gawor <Kamil.Gawor@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Andreas Moltumyr <andreas.moltumyr@nordicsemi.no>
Signed-off-by: Karol Lasończyk <karol.lasonczyk@nordicsemi.no>
(cherry picked from commit 0d8345e043b78b9cbea34abfe508eff0ae5fd7b1)
---
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts |   6 ++
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts |   5 +
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts  |   6 ++
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts  |   5 +
 drivers/entropy/CMakeLists.txt                |   7 ++
 drivers/entropy/Kconfig                       |   1 +
 drivers/entropy/Kconfig.nrf_prng              |  19 ++++
 drivers/entropy/fake_entropy_nrf_prng.c       | 101 ++++++++++++++++++
 dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi      |   9 ++
 dts/bindings/rng/nordic,nrf-prng.yaml         |   8 ++
 10 files changed, 167 insertions(+)
 create mode 100644 drivers/entropy/Kconfig.nrf_prng
 create mode 100644 drivers/entropy/fake_entropy_nrf_prng.c
 create mode 100644 dts/bindings/rng/nordic,nrf-prng.yaml

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 95d557bf944..05d62c1057f 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -26,6 +26,7 @@
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,canbus = &can120;
+		zephyr,entropy = &prng;
 	};
 
 	aliases {
@@ -106,6 +107,11 @@
 			pwms = <&pwm130 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
 		};
 	};
+
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
+	};
 };
 
 &cpuapp_ram0x_region {
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
index 49ca847873f..8734ff9f745 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
@@ -27,6 +27,11 @@
 		zephyr,ieee802154 = &cpurad_ieee802154;
 		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
+		zephyr,entropy = &prng;
+	};
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
 	};
 	aliases {
 		ipc-to-cpusys = &cpurad_cpusys_ipc;
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index a380ac7473a..3e16e45803f 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -28,6 +28,7 @@
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,canbus = &can120;
+		zephyr,entropy = &prng;
 	};
 
 	aliases {
@@ -108,6 +109,11 @@
 			pwms = <&pwm130 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
 		};
 	};
+
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
+	};
 };
 
 &cpuapp_ram0x_region {
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
index f9bfae09897..f1f3af54132 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
@@ -28,6 +28,11 @@
 		zephyr,ieee802154 = &cpurad_ieee802154;
 		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
+		zephyr,entropy = &prng;
+	};
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
 	};
 	aliases {
 		ipc-to-cpusys = &cpurad_cpusys_ipc;
diff --git a/drivers/entropy/CMakeLists.txt b/drivers/entropy/CMakeLists.txt
index d5588378f6f..e23b558a6a9 100644
--- a/drivers/entropy/CMakeLists.txt
+++ b/drivers/entropy/CMakeLists.txt
@@ -36,4 +36,11 @@ zephyr_library_sources_ifdef(CONFIG_ENTROPY_NPCX_DRBG       entropy_npcx_drbg.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_MAX32_TRNG      entropy_max32.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_RENESAS_RA      entropy_renesas_ra.c)
 
+if (CONFIG_FAKE_ENTROPY_NRF_PRNG)
+  zephyr_library_sources(fake_entropy_nrf_prng.c)
+
+  message(WARNING "\nA nRF PRNG is used, which does not produce real random bits."
+  "This is not secure and should therefore never be used in a product.")
+endif()
+
 zephyr_library_link_libraries_ifdef(CONFIG_BUILD_WITH_TFM tfm_api)
diff --git a/drivers/entropy/Kconfig b/drivers/entropy/Kconfig
index debd0f8d7a1..40571df47f1 100644
--- a/drivers/entropy/Kconfig
+++ b/drivers/entropy/Kconfig
@@ -38,6 +38,7 @@ source "drivers/entropy/Kconfig.psa_crypto"
 source "drivers/entropy/Kconfig.npcx"
 source "drivers/entropy/Kconfig.max32"
 source "drivers/entropy/Kconfig.renesas_ra"
+source "drivers/entropy/Kconfig.nrf_prng"
 
 config ENTROPY_HAS_DRIVER
 	bool
diff --git a/drivers/entropy/Kconfig.nrf_prng b/drivers/entropy/Kconfig.nrf_prng
new file mode 100644
index 00000000000..e81db4de4b1
--- /dev/null
+++ b/drivers/entropy/Kconfig.nrf_prng
@@ -0,0 +1,19 @@
+# nRF fake entropy prng generator driver configuration
+
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if ENTROPY_GENERATOR
+
+config FAKE_ENTROPY_NRF_PRNG
+	bool "A fake nRF entropy driver"
+	default y
+	depends on DT_HAS_NORDIC_ENTROPY_PRNG_ENABLED
+	depends on (SOC_SERIES_NRF54HX || SOC_SERIES_NRF92X || SOC_SERIES_NRF54LX)
+	select ENTROPY_HAS_DRIVER
+	help
+	  This is a super simple PRNG driver that can be used on nRF platforms that
+	  do not have an entropy source.
+	  This is NOT SAFE to use for cryptographic operations!
+
+endif
diff --git a/drivers/entropy/fake_entropy_nrf_prng.c b/drivers/entropy/fake_entropy_nrf_prng.c
new file mode 100644
index 00000000000..8624c844405
--- /dev/null
+++ b/drivers/entropy/fake_entropy_nrf_prng.c
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/init.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <zephyr/drivers/entropy.h>
+
+#define DT_DRV_COMPAT nordic_entropy_prng
+
+/* This file implements a pseudo-RNG
+ * https://vigna.di.unimi.it/xorshift/xoshiro128plus.c
+ */
+
+static uint32_t s[4];
+
+static inline uint32_t rotl(const uint32_t x, int k)
+{
+	return (x << k) | (x >> (32 - k));
+}
+
+static uint32_t rng_next(void)
+{
+	const uint32_t result = rotl(s[0] + s[3], 7) + s[0];
+
+	const uint32_t t = s[1] << 9;
+
+	s[2] ^= s[0];
+	s[3] ^= s[1];
+	s[1] ^= s[2];
+	s[0] ^= s[3];
+
+	s[2] ^= t;
+
+	s[3] = rotl(s[3], 11);
+
+	return result;
+}
+
+static int entropy_prng_get_entropy(const struct device *dev, uint8_t *buffer, uint16_t length)
+{
+	ARG_UNUSED(dev);
+
+	while (length) {
+		/*
+		 * Note that only 1 thread (Zephyr thread or HW models), runs at
+		 * a time, therefore there is no need to use random_r()
+		 */
+		uint32_t value = rng_next();
+
+		size_t to_copy = MIN(length, sizeof(long));
+
+		memcpy(buffer, &value, to_copy);
+		buffer += to_copy;
+		length -= to_copy;
+	}
+
+	return 0;
+}
+
+static int entropy_prng_get_entropy_isr(const struct device *dev, uint8_t *buf, uint16_t len,
+					uint32_t flags)
+{
+	ARG_UNUSED(flags);
+
+	int err;
+
+	/*
+	 * entropy_prng_get_entropy() is also safe for ISRs
+	 * and always produces data.
+	 */
+	err = entropy_prng_get_entropy(dev, buf, len);
+	if (err < 0) {
+		return err;
+	} else {
+		return len;
+	}
+}
+
+static int entropy_prng_init(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	/* Picked some arbitrary initial seed. */
+	s[0] = 0xAF568BC0;
+	s[1] = 0xAC34307E;
+	s[2] = 0x9B7F6DD1;
+	s[3] = 0xD84319FC;
+	return 0;
+}
+
+static const struct entropy_driver_api entropy_prng_api_funcs = {
+	.get_entropy = entropy_prng_get_entropy, .get_entropy_isr = entropy_prng_get_entropy_isr};
+
+DEVICE_DT_INST_DEFINE(0, entropy_prng_init, NULL, NULL, NULL, PRE_KERNEL_1,
+		      CONFIG_ENTROPY_INIT_PRIORITY, &entropy_prng_api_funcs);
diff --git a/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi b/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
index 469bccca5b0..1444be3b57b 100644
--- a/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
@@ -11,6 +11,10 @@ systick: &cpuapp_systick {};
 nvic: &cpuapp_nvic {};
 
 / {
+	chosen {
+		zephyr,entropy = &prng;
+	};
+
 	soc {
 		compatible = "simple-bus";
 		interrupt-parent = <&cpuapp_nvic>;
@@ -21,6 +25,11 @@ nvic: &cpuapp_nvic {};
 		compatible = "zephyr,psa-crypto-rng";
 		status = "disabled";
 	};
+
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
+	};
 };
 
 &cpuapp_ppb {
diff --git a/dts/bindings/rng/nordic,nrf-prng.yaml b/dts/bindings/rng/nordic,nrf-prng.yaml
new file mode 100644
index 00000000000..8936393a0b6
--- /dev/null
+++ b/dts/bindings/rng/nordic,nrf-prng.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+
+description: This is a super simple PRNG
+
+compatible: "nordic,entropy-prng"
+
+include: base.yaml

From e0e29a28ba683a71429c9ac6f642209d73c74de1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B8e?= <sebastian.boe@nordicsemi.no>
Date: Fri, 24 May 2024 15:32:07 +0200
Subject: [PATCH 2136/2913] [nrf noup] soc: nordic: nrf54l: Skip clock
 configuration from ns
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Do not permit configuring clocks from non-secure as NRF_OSCILLATORS is
a not supported as a non-secure peripheral

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
(cherry picked from commit a2ca5957e9657ce3a1eb09b493c110c3f5319be3)
---
 soc/nordic/nrf54l/Kconfig | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index 35c698c7b08..b8b4d015e37 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -49,10 +49,18 @@ config SOC_NRF54L20_ENGA_CPUAPP
 if SOC_SERIES_NRF54LX
 
 config SOC_NRF54LX_SKIP_CLOCK_CONFIG
-	bool "Skip clock frequency configuration in system initialization"
+	bool
+	prompt "Skip clock frequency configuration in system initialization" if TRUSTED_EXECUTION_SECURE
+	default y if TRUSTED_EXECUTION_NONSECURE
 	help
-	  With this option, the CPU clock frequency is not set during system initialization.
-	  The CPU runs with the default, hardware-selected frequency.
+	  With this option, the CPU clock frequency is not set during this
+	  Zephyr image's system initialization. The CPU runs with either
+	  the HW reset values, or with the configuration set by an image
+	  earlier in the boot chain.
+
+	  Note that for security reasons it is not supported to configure
+	  the clock peripheral (NRF_OSCILLATORS) from the non-secure
+	  domain.
 
 config SOC_NRF54LX_DISABLE_FICR_TRIMCNF
 	bool "Disable trimming of the device"

From 4eb8d62beb3cb4859f5be0d927d3e3a1f38164d4 Mon Sep 17 00:00:00 2001
From: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Date: Mon, 8 Jul 2024 10:08:10 +0200
Subject: [PATCH 2137/2913] [nrf noup] ci: Enable action-manifest-pr

This action will automatically manage a PR to sdk-nrf
once a PR to sdk-zephyr is created.

This includes:
 - Creating an initial PR
 - Updating and (optionally) rebase it once the PR
   to sdk-nrf is merged.

The action can be disabled by adding the string
"manifest-pr-skip" to the title or body of the PR.

This will simplify cherry-picking changes from upstream
zephyr.

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
(cherry picked from commit 4605159c7d01e4c79dc86b690ad884427a8778df)
---
 .github/workflows/manifest-PR.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/workflows/manifest-PR.yml

diff --git a/.github/workflows/manifest-PR.yml b/.github/workflows/manifest-PR.yml
new file mode 100644
index 00000000000..a871aa381de
--- /dev/null
+++ b/.github/workflows/manifest-PR.yml
@@ -0,0 +1,17 @@
+name: handle manifest PR
+on:
+  pull_request_target:
+    types: [opened, synchronize, closed]
+    branches:
+      - main
+
+
+jobs:
+  call-manifest-pr-action:
+    runs-on: ubuntu-latest
+    steps:
+      - name: handle manifest PR
+        uses: nrfconnect/action-manifest-pr@main
+        with:
+          token: ${{ secrets.NCS_GITHUB_TOKEN }}
+          manifest-pr-title-details: ${{ github.event.pull_request.title }}

From 417d970e748b9b514541178126e629aedb163268 Mon Sep 17 00:00:00 2001
From: Mateusz Michalek <mateusz.michalek@nordicsemi.no>
Date: Mon, 17 Jun 2024 14:57:09 +0200
Subject: [PATCH 2138/2913] [nrf noup] drivers: flash: kconfig: nrf_rram region
 resolution

adjusting region resolution to match erase-block-size

Signed-off-by: Mateusz Michalek <mateusz.michalek@nordicsemi.no>
(cherry picked from commit 22ab87b0f9928a688de6c7c07a7ac667819ae9a0)
---
 drivers/flash/Kconfig.nrf_rram | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/flash/Kconfig.nrf_rram b/drivers/flash/Kconfig.nrf_rram
index 2300d8542b8..1e433b66d1e 100644
--- a/drivers/flash/Kconfig.nrf_rram
+++ b/drivers/flash/Kconfig.nrf_rram
@@ -70,14 +70,14 @@ config SOC_FLASH_NRF_TIMEOUT_MULTIPLIER
 
 config NRF_RRAM_REGION_ADDRESS_RESOLUTION
 	hex
-	default 0x400
+	default 0x1000
 	help
 	  RRAMC's region protection address resolution.
 	  Applies to region with configurable start address.
 
 config NRF_RRAM_REGION_SIZE_UNIT
 	hex
-	default 0x400
+	default 0x1000
 	help
 	  Base unit for the size of RRAMC's region protection.
 

From 2f5004a035be90bf4a83e9f57820ca6ee0c91f57 Mon Sep 17 00:00:00 2001
From: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Date: Tue, 16 Jul 2024 14:43:30 +0200
Subject: [PATCH 2139/2913] [nrf noup] dts: Add Bluetooth Controller to
 nRF54H20

The nRF54H20 supports a Bluetooth controller.
The HCI driver interface has changed upstream in
https://github.com/zephyrproject-rtos/zephyr/pull/72323
so now we need to add it to device tree.

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
(cherry picked from commit f47a9b8666778709e9e031854511566d55ce3ad4)
---
 dts/arm/nordic/nrf54h20_cpurad.dtsi | 8 ++++++++
 dts/common/nordic/nrf54h20.dtsi     | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/dts/arm/nordic/nrf54h20_cpurad.dtsi b/dts/arm/nordic/nrf54h20_cpurad.dtsi
index 2d2fdee8d27..2cfda47afc5 100644
--- a/dts/arm/nordic/nrf54h20_cpurad.dtsi
+++ b/dts/arm/nordic/nrf54h20_cpurad.dtsi
@@ -23,6 +23,10 @@ wdt011: &cpurad_wdt011 {};
 /delete-node/ &cpuflpr;
 
 / {
+	chosen {
+		zephyr,bt-hci = &bt_hci_controller;
+	};
+
 	soc {
 		compatible = "simple-bus";
 		interrupt-parent = <&cpurad_nvic>;
@@ -99,3 +103,7 @@ wdt011: &cpurad_wdt011 {};
 &dppic020 {
 	status = "okay";
 };
+
+&bt_hci_controller {
+	status = "okay";
+};
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index cc9f2d3d8e4..ec63eb5f461 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -442,6 +442,14 @@
 					compatible = "nordic,nrf-ieee802154";
 					status = "disabled";
 				};
+
+				/* Note: In the nRF Connect SDK the SoftDevice Controller
+				 * is added and set as the default Bluetooth Controller.
+				 */
+				bt_hci_controller: bt_hci_controller {
+					compatible = "zephyr,bt-hci-ll-sw-split";
+					status = "disabled";
+				};
 			};
 
 			ccm030: ccm@3a000 {

From fa30d0575d4adaff30579ca6530d6b2be03260a0 Mon Sep 17 00:00:00 2001
From: Marek Pieta <Marek.Pieta@nordicsemi.no>
Date: Fri, 14 Jun 2024 09:13:48 +0200
Subject: [PATCH 2140/2913] [nrf noup] bluetooth: att: Allow ATT sent callback
 after data TX is done

By default, the BLE stack calls sent callback for ATT data when the data
is passed to BLE controller for transmission. Enabling this Kconfig
option delays calling the sent callback until data transmission is
finished by BLE controller (the callback is delayed until receiving the
num complete packets event).

Jira: NCSDK-27422

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
(cherry picked from commit 26fcb4f0c4427912619cda058f7777d8f6625d03)
---
 subsys/bluetooth/host/Kconfig.gatt | 17 +++++++++++++++++
 subsys/bluetooth/host/att.c        | 17 ++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/subsys/bluetooth/host/Kconfig.gatt b/subsys/bluetooth/host/Kconfig.gatt
index 20f9e53833d..f9b099058cc 100644
--- a/subsys/bluetooth/host/Kconfig.gatt
+++ b/subsys/bluetooth/host/Kconfig.gatt
@@ -38,6 +38,23 @@ config BT_ATT_RETRY_ON_SEC_ERR
 	  If an ATT request fails due to insufficient security, the host will
 	  try to elevate the security level and retry the ATT request.
 
+config BT_ATT_SENT_CB_AFTER_TX
+	bool "Delay ATT sent callback until data transmission is done by controller [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	help
+	  By default, the BLE stack calls sent callback for ATT data when the
+	  data is passed to BLE controller for transmission. Enabling this
+	  Kconfig option delays calling the sent callback until data
+	  transmission is finished by BLE controller (the callback is called
+	  upon receiving the Number of Completed Packets HCI Event).
+
+	  The feature is not available in Zephyr RTOS (it's specific to NCS
+	  Zephyr fork). It is a temporary solution allowing to control flow of
+	  GATT notifications with HID reports for HID use-case.
+
+	  Enabling this option may require increasing CONFIG_BT_CONN_TX_MAX in
+	  configuration, because ATT would use additional TX contexts.
+
 config BT_EATT
 	bool "Enhanced ATT Bearers support [EXPERIMENTAL]"
 	depends on BT_L2CAP_ECRED
diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c
index 1fe44971397..974b8f78839 100644
--- a/subsys/bluetooth/host/att.c
+++ b/subsys/bluetooth/host/att.c
@@ -315,6 +315,13 @@ static void att_sent(void *user_data)
 	bt_att_sent(chan);
 }
 
+static void chan_sent_cb(struct bt_conn *conn, void *user_data, int err)
+{
+	struct net_buf *nb = user_data;
+
+	net_buf_unref(nb);
+}
+
 /* In case of success the ownership of the buffer is transferred to the stack
  * which takes care of releasing it when it completes transmitting to the
  * controller.
@@ -408,7 +415,15 @@ static int chan_send(struct bt_att_chan *chan, struct net_buf *buf)
 
 	data->att_chan = chan;
 
-	err = bt_l2cap_send_pdu(&chan->chan, buf, NULL, NULL);
+	if (IS_ENABLED(CONFIG_BT_ATT_SENT_CB_AFTER_TX)) {
+		err = bt_l2cap_send_pdu(&chan->chan, buf, chan_sent_cb, net_buf_ref(buf));
+		if (err) {
+			net_buf_unref(buf);
+		}
+	} else {
+		err = bt_l2cap_send_pdu(&chan->chan, buf, NULL, NULL);
+	}
+
 	if (err) {
 		if (err == -ENOBUFS) {
 			LOG_ERR("Ran out of TX buffers or contexts.");

From f67a41a2d615cf07542bbaf2793c9abdeeaf6d2b Mon Sep 17 00:00:00 2001
From: Sigurd Hellesvik <sigurd.hellesvik@nordicsemi.no>
Date: Fri, 23 Aug 2024 11:24:06 +0200
Subject: [PATCH 2141/2913] [nrf noup] board: nordic_ thingy53: Enable QSPI by
 default

The Thingy:53 enabled MCUboot and external flash by default.
Therefore, it should also enable drivers for its external
flash by default.

Signed-off-by: Sigurd Hellesvik <sigurd.hellesvik@nordicsemi.no>
(cherry picked from commit 88307ffd820675f23d265483bdb19e6008250b6b)
---
 boards/nordic/thingy53/Kconfig.defconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/boards/nordic/thingy53/Kconfig.defconfig b/boards/nordic/thingy53/Kconfig.defconfig
index 144abfbf628..f024144451a 100644
--- a/boards/nordic/thingy53/Kconfig.defconfig
+++ b/boards/nordic/thingy53/Kconfig.defconfig
@@ -94,6 +94,9 @@ config MCUBOOT_USB_SUPPORT
 	bool
 	default n
 
+config NORDIC_QSPI_NOR
+	default y
+
 endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
 
 if BOARD_THINGY53_NRF5340_CPUNET

From d8813377fd8093e0e9f31ab64ad40fa23b00dd87 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Mon, 9 Sep 2024 08:31:03 +0100
Subject: [PATCH 2142/2913] [nrf noup] mgmt: mcumgr: grp: img_mgmt: Add
 handling for QSPI XIP

Adds handling code to allow selecting the correct image slot when
using QSPI XIP in DirectXIP mode

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit a83be5d3b0f9545f7efe044e5eb1789dbcec4e8d)
---
 subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig        | 8 ++++++++
 subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig b/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
index d0d80531c11..e05169b625b 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
@@ -215,6 +215,14 @@ config MCUMGR_GRP_IMG_SLOT_INFO_HOOKS
 	  This will enable the slot info function hooks which can be used to add additional
 	  information to responses.
 
+config MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE
+	bool "QSPI XIP Split image mode"
+	depends on MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP
+	help
+	  This option should not be selected by users and should automatically be selected by
+	  sysbuild if needed. This enables selecting the correct slot when running a QSPI XIP
+	  split image application in DirectXIP mode.
+
 module = MCUMGR_GRP_IMG
 module-str = mcumgr_grp_img
 source "subsys/logging/Kconfig.template.log_config"
diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
index a95b78938e2..a89cb5f2258 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
@@ -230,6 +230,12 @@ int img_mgmt_active_slot(int image)
 	/* Multi image does not support DirectXIP or RAM load currently */
 #if CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER > 1
 	slot = (image << 1);
+
+#if CONFIG_MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE
+	if (FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot1_partition)) {
+		slot += 1;
+	}
+#endif
 #elif defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD)
 	/* RAM load requires querying bootloader */
 	int rc;

From 7c8fdc27628f9126eaaed9895547d986f23271d5 Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Mon, 16 Sep 2024 15:09:50 +0200
Subject: [PATCH 2143/2913] [nrf noup] boards/nordic/nrf54l15dk: Set ROM offset
 by PM

While Partition Manager is enabled, it manages the offset
by itself.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
(cherry picked from commit 620b4df913d415a19b326629612a401658f3961b)
---
 boards/nordic/nrf54l15dk/Kconfig.defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boards/nordic/nrf54l15dk/Kconfig.defconfig b/boards/nordic/nrf54l15dk/Kconfig.defconfig
index 639cbccf3f4..56ce044c7e1 100644
--- a/boards/nordic/nrf54l15dk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l15dk/Kconfig.defconfig
@@ -5,6 +5,7 @@ if BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
 	BOARD_NRF54L15DK_NRF54L15_CPUAPP
 
 config ROM_START_OFFSET
+	default 0 if PARTITION_MANAGER_ENABLED
 	default 0x800 if BOOTLOADER_MCUBOOT
 
 endif # BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \

From 80086feaf9cee14bc46a09f0132ee2c6d35e1d3d Mon Sep 17 00:00:00 2001
From: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
Date: Thu, 26 Sep 2024 12:40:33 +0200
Subject: [PATCH 2144/2913] [nrf noup] samples: basic: blinky: add eGPIO tests
 configuration

Add overlay for nrf54l15dk to enable eGPIO tests.

Signed-off-by: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
(cherry picked from commit 26b8d92f84c6f6358467b80a4a833657d7726d1c)
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay      | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay

diff --git a/samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay b/samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay
new file mode 100644
index 00000000000..d165fc44b4b
--- /dev/null
+++ b/samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+&led0 {
+	gpios = <&egpio 9 GPIO_ACTIVE_HIGH>;
+};

From fe0996cbae631a2cb3ce6fa38e5140712a9c9c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Wed, 11 Sep 2024 10:17:28 +0200
Subject: [PATCH 2145/2913] [nrf noup] modules: mbedtls: Disable configurations
 in Kconfig.tls-generic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-This commit prevents legacy mbed TLS configurations from being in
 conflict with PSA Configurations while using nrf_security.
-This [nrf noup] is reworked from an earlier cherry-pick of
 commit d8c96cfab37d3738dac933075780f6ca24593447, but has the following
 changes:
 - Endif's relevant that is using our pattern for masking
   configs duplicated or in conflict in nrf_security
  (by using if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)) is
  made clearer by adding a comment at their corresponding endif
  (# !(NRF_SECURITY || NORDIC_SECURITY_BACKEND))
 - Changes to zephyr_init.c for entropy_dev checking for
   CONFIG_NRF_CC3XX_PLATFORM is removed as the symbol entropy_dev
   doesn't exist in this file anymore

ref: NCSDK-13503

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit 728983fe1906c18007bdd44ebc2e00e06e9d3139)
---
 modules/mbedtls/Kconfig.tls-generic | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/modules/mbedtls/Kconfig.tls-generic b/modules/mbedtls/Kconfig.tls-generic
index 32c91b25523..72ff2710225 100644
--- a/modules/mbedtls/Kconfig.tls-generic
+++ b/modules/mbedtls/Kconfig.tls-generic
@@ -7,6 +7,8 @@
 menu "Mbed TLS configuration"
 	depends on MBEDTLS_BUILTIN && MBEDTLS_CFG_FILE = "config-tls-generic.h"
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 menu "TLS"
 
 config MBEDTLS_TLS_VERSION_1_2
@@ -40,10 +42,14 @@ endif # MBEDTLS_TLS_VERSION_1_2 || MBEDTLS_TLS_VERSION_1_3
 
 endmenu # TLS
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 menu "Ciphersuite configuration"
 
 comment "Supported key exchange modes"
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_KEY_EXCHANGE_ALL_ENABLED
 	bool "All available ciphersuite modes"
 	select MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
@@ -71,6 +77,8 @@ config MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
 config MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
 	bool "RSA-PSK based ciphersuite modes"
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_PSK_MAX_LEN
 	int "Max size of TLS pre-shared keys"
 	default 32
@@ -78,6 +86,8 @@ config MBEDTLS_PSK_MAX_LEN
 	  Max size of TLS pre-shared keys, in bytes. It has no effect if no
 	  PSK key exchange is used.
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
 	bool "RSA-only based ciphersuite modes"
 	default y if UOSCORE || UEDHOC
@@ -214,8 +224,12 @@ config MBEDTLS_ECP_NIST_OPTIM
 
 endif
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 comment "Supported ciphers and cipher modes"
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_CIPHER_ALL_ENABLED
 	bool "All available ciphers and modes"
 	select MBEDTLS_CIPHER_AES_ENABLED
@@ -307,8 +321,12 @@ config MBEDTLS_CMAC
 	bool "CMAC (Cipher-based Message Authentication Code) mode for block ciphers."
 	depends on MBEDTLS_CIPHER_AES_ENABLED || MBEDTLS_CIPHER_DES_ENABLED
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 comment "Supported hash algorithms"
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_HASH_ALL_ENABLED
 	bool "All available MAC methods"
 	select MBEDTLS_MD5
@@ -349,10 +367,14 @@ config MBEDTLS_SHA512
 config MBEDTLS_POLY1305
 	bool "Poly1305 hash family"
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 endmenu
 
 comment "Random number generators"
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_CTR_DRBG_ENABLED
 	bool "CTR_DRBG AES-256-based random generator"
 	depends on MBEDTLS_CIPHER_AES_ENABLED
@@ -362,15 +384,21 @@ config MBEDTLS_HMAC_DRBG_ENABLED
 	bool "HMAC_DRBG random generator"
 	select MBEDTLS_MD
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 comment "Other configurations"
 
 config MBEDTLS_CIPHER
 	bool "generic cipher layer."
 	default y if PSA_WANT_ALG_CMAC
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_MD
 	bool "generic message digest layer."
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_GENPRIME_ENABLED
 	bool "prime-number generation code."
 
@@ -388,6 +416,8 @@ config MBEDTLS_HAVE_ASM
 	  of asymmetric cryptography, however this might have an impact on the
 	  code size.
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_ENTROPY_C
 	bool "Mbed TLS entropy accumulator"
 	depends on MBEDTLS_SHA256 || MBEDTLS_SHA384 || MBEDTLS_SHA512
@@ -396,6 +426,8 @@ config MBEDTLS_ENTROPY_C
 	  mostly used in conjunction with CTR_DRBG or HMAC_DRBG to create
 	  a deterministic random number generator.
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_ENTROPY_POLL_ZEPHYR
 	bool "Provide entropy data to Mbed TLS through entropy driver or random generator"
 	default y

From 34b182199bb799fa11f48f5786b208e35d6045bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Mon, 9 Sep 2024 14:55:05 +0200
Subject: [PATCH 2146/2913] [nrf noup] mbedtls: Enable PSA_WANT_GENERATE_RANDOM
 for PSA RNG
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-This is a [nrf noup] because PSA_WANT_GENERATE_RANDOM is a Nordic
 configuration that is not found upstream. This was previously in
 commit 5cfe5750b622efff77427425bf61854a95ade9fb but has been split out

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit 3b697befa1dc2407f3f62a422ac534c3e089e65f)
---
 drivers/entropy/Kconfig.psa_crypto | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/entropy/Kconfig.psa_crypto b/drivers/entropy/Kconfig.psa_crypto
index d06001225b0..18514a071d1 100644
--- a/drivers/entropy/Kconfig.psa_crypto
+++ b/drivers/entropy/Kconfig.psa_crypto
@@ -7,6 +7,7 @@ config ENTROPY_PSA_CRYPTO_RNG
 	bool "PSA Crypto Random source Entropy driver"
 	depends on DT_HAS_ZEPHYR_PSA_CRYPTO_RNG_ENABLED
 	select ENTROPY_HAS_DRIVER
+	select PSA_WANT_GENERATE_RANDOM
 	default y
 	help
 	  Enable the PSA Crypto source Entropy driver.

From df649bb00a96c6818e0e9596b58c2fece66ef130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Wed, 21 Aug 2024 12:35:25 +0200
Subject: [PATCH 2147/2913] [nrf noup] mbedtls: Remove unsupported algorithms
 in PSA crypto
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-This commit is a [nrf noup] because it removes configuration options
 for cryptographic algortihms available in Mbed TLS but which is not
 actively supported in nRF Connect SDK.
 The list of algorithms removed:
 - AES CFB - Cipher Feedback block cipher
 - AES OFB - Output Feedback block cipher
 - FFDH
 - RIPEMD160
 - Aria
 - Camellia
 - DES

 The removal of these algorithms is based both on a wish to remove
 weaker cryptography and unsupported features in the products we have
 today.

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit 1147b11bb1585f9ba3e9163d9ad6fcfd7845a32f)
---
 modules/mbedtls/Kconfig.psa.auto  | 61 -------------------------------
 modules/mbedtls/Kconfig.psa.logic |  7 ----
 2 files changed, 68 deletions(-)

diff --git a/modules/mbedtls/Kconfig.psa.auto b/modules/mbedtls/Kconfig.psa.auto
index 08b1bbc0241..56a81dd6efd 100644
--- a/modules/mbedtls/Kconfig.psa.auto
+++ b/modules/mbedtls/Kconfig.psa.auto
@@ -36,10 +36,6 @@ config PSA_WANT_ALG_CMAC
 	bool "PSA_WANT_ALG_CMAC" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_ALG_CFB
-	bool "PSA_WANT_ALG_CFB" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 config PSA_WANT_ALG_CHACHA20_POLY1305
 	bool "PSA_WANT_ALG_CHACHA20_POLY1305" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
@@ -60,10 +56,6 @@ config PSA_WANT_ALG_ECDH
 	bool "PSA_WANT_ALG_ECDH" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_ALG_FFDH
-	bool "PSA_WANT_ALG_FFDH" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 config PSA_WANT_ALG_ECDSA
 	bool "PSA_WANT_ALG_ECDSA" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
@@ -96,9 +88,6 @@ config PSA_WANT_ALG_MD5
 	bool "PSA_WANT_ALG_MD5" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_ALG_OFB
-	bool "PSA_WANT_ALG_OFB" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_ALG_PBKDF2_HMAC
 	bool "PSA_WANT_ALG_PBKDF2_HMAC" if !MBEDTLS_PROMPTLESS
@@ -108,9 +97,6 @@ config PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
 	bool "PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_ALG_RIPEMD160
-	bool "PSA_WANT_ALG_RIPEMD160" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_ALG_RSA_OAEP
 	bool "PSA_WANT_ALG_RSA_OAEP" if !MBEDTLS_PROMPTLESS
@@ -228,26 +214,6 @@ config PSA_WANT_ECC_SECP_R1_521
 	bool "PSA_WANT_ECC_SECP_R1_521" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_DH_RFC7919_2048
-	bool "PSA_WANT_DH_RFC7919_2048" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_DH_RFC7919_3072
-	bool "PSA_WANT_DH_RFC7919_3072" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_DH_RFC7919_4096
-	bool "PSA_WANT_DH_RFC7919_4096" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_DH_RFC7919_6144
-	bool "PSA_WANT_DH_RFC7919_6144" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_DH_RFC7919_8192
-	bool "PSA_WANT_DH_RFC7919_8192" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 config PSA_WANT_KEY_TYPE_DERIVE
 	bool "PSA_WANT_KEY_TYPE_DERIVE" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
@@ -268,30 +234,15 @@ config PSA_WANT_KEY_TYPE_AES
 	bool "PSA_WANT_KEY_TYPE_AES" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_KEY_TYPE_ARIA
-	bool "PSA_WANT_KEY_TYPE_ARIA" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_KEY_TYPE_CAMELLIA
-	bool "PSA_WANT_KEY_TYPE_CAMELLIA" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 config PSA_WANT_KEY_TYPE_CHACHA20
 	bool "PSA_WANT_KEY_TYPE_CHACHA20" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_KEY_TYPE_DES
-	bool "PSA_WANT_KEY_TYPE_DES" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	bool "PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_KEY_TYPE_DH_PUBLIC_KEY
-	bool "PSA_WANT_KEY_TYPE_DH_PUBLIC_KEY" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 config PSA_WANT_KEY_TYPE_RAW_DATA
 	bool "PSA_WANT_KEY_TYPE_RAW_DATA" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
@@ -328,16 +279,4 @@ config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_KEY_TYPE_DH_KEY_PAIR_IMPORT
-	bool "PSA_WANT_KEY_TYPE_DH_KEY_PAIR_IMPORT" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_KEY_TYPE_DH_KEY_PAIR_EXPORT
-	bool "PSA_WANT_KEY_TYPE_DH_KEY_PAIR_EXPORT" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_KEY_TYPE_DH_KEY_PAIR_GENERATE
-	bool "PSA_WANT_KEY_TYPE_DH_KEY_PAIR_GENERATE" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 endif # PSA_CRYPTO_CLIENT
diff --git a/modules/mbedtls/Kconfig.psa.logic b/modules/mbedtls/Kconfig.psa.logic
index dcea9e35405..2de81163dc1 100644
--- a/modules/mbedtls/Kconfig.psa.logic
+++ b/modules/mbedtls/Kconfig.psa.logic
@@ -18,10 +18,3 @@ config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
 	depends on PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT || \
 		   PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT || \
 		   PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE
-
-config PSA_WANT_KEY_TYPE_DH_KEY_PAIR_BASIC
-	bool
-	default y
-	depends on PSA_WANT_KEY_TYPE_DH_KEY_PAIR_IMPORT || \
-		   PSA_WANT_KEY_TYPE_DH_KEY_PAIR_EXPORT || \
-		   PSA_WANT_KEY_TYPE_DH_KEY_PAIR_GENERATE

From 843a8379516f7d46da975ebaacf0b4b78f551ac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Wed, 21 Aug 2024 12:49:58 +0200
Subject: [PATCH 2148/2913] [nrf noup] mbedtls: Add dependency logic for PSA
 crypto configurations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-This is a [nrf noup] as this the upstream version of PSA crypto configs
 is generated by tooling, and there is no mechanisms to qualify
 that dependent configurations are enabled (by depends or select).
-This adds dependency-mapping between configurations in the Kconfigs
 added for PSA crypto in upstream.
-Selecting CHACHA20 key type if PSA_WANT_ALG_STREAM_CIPHER is
 enabled

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit 3e925032d3bef4a68ee4383cd35f71581ee4f880)
---
 modules/mbedtls/Kconfig.psa.auto | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/modules/mbedtls/Kconfig.psa.auto b/modules/mbedtls/Kconfig.psa.auto
index 56a81dd6efd..fa8cdbc7b53 100644
--- a/modules/mbedtls/Kconfig.psa.auto
+++ b/modules/mbedtls/Kconfig.psa.auto
@@ -71,6 +71,7 @@ config PSA_WANT_ALG_GCM
 config PSA_WANT_ALG_HKDF
 	bool "PSA_WANT_ALG_HKDF" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_ALG_HMAC
 
 config PSA_WANT_ALG_HKDF_EXTRACT
 	bool "PSA_WANT_ALG_HKDF_EXTRACT" if !MBEDTLS_PROMPTLESS
@@ -92,11 +93,12 @@ config PSA_WANT_ALG_MD5
 config PSA_WANT_ALG_PBKDF2_HMAC
 	bool "PSA_WANT_ALG_PBKDF2_HMAC" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_ALG_HMAC
 
 config PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
 	bool "PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-
+	depends on PSA_WANT_ALG_CMAC
 
 config PSA_WANT_ALG_RSA_OAEP
 	bool "PSA_WANT_ALG_RSA_OAEP" if !MBEDTLS_PROMPTLESS
@@ -153,18 +155,22 @@ config PSA_WANT_ALG_SHA3_512
 config PSA_WANT_ALG_STREAM_CIPHER
 	bool "PSA_WANT_ALG_STREAM_CIPHER" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	select PSA_WANT_KEY_TYPE_CHACHA20
 
 config PSA_WANT_ALG_TLS12_PRF
 	bool "PSA_WANT_ALG_TLS12_PRF" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_ALG_HMAC
 
 config PSA_WANT_ALG_TLS12_PSK_TO_MS
 	bool "PSA_WANT_ALG_TLS12_PSK_TO_MS" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_ALG_HMAC
 
 config PSA_WANT_ALG_TLS12_ECJPAKE_TO_PMS
 	bool "PSA_WANT_ALG_TLS12_ECJPAKE_TO_PMS" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_ALG_SHA_256
 
 config PSA_WANT_ECC_BRAINPOOL_P_R1_256
 	bool "PSA_WANT_ECC_BRAINPOOL_P_R1_256" if !MBEDTLS_PROMPTLESS
@@ -237,7 +243,8 @@ config PSA_WANT_KEY_TYPE_AES
 config PSA_WANT_KEY_TYPE_CHACHA20
 	bool "PSA_WANT_KEY_TYPE_CHACHA20" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-
+	depends on PSA_WANT_ALG_CHACHA20_POLY1305 || \
+		   PSA_WANT_ALG_STREAM_CIPHER
 
 config PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	bool "PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY" if !MBEDTLS_PROMPTLESS
@@ -253,30 +260,37 @@ config PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT
 	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT
 	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE
 	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
 	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 endif # PSA_CRYPTO_CLIENT

From fc809ce37a2407abac5e8b53843152bb76e998ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Wed, 21 Aug 2024 12:53:27 +0200
Subject: [PATCH 2149/2913] [nrf noup] mbedtls: Adding helptext warnings for
 weak crypto
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-This commit is a [nrf noup] because PSA crypto configs in upstream
 Zephyr doesn't have help-text in their configurations and we don't
 want to duplicate configurations to control the value
-This adds warning for SHA-1 and MD5 usage

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit 8f6a02426f35fe5405bf4413b753b2c225201587)
---
 modules/mbedtls/Kconfig.psa.auto | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/mbedtls/Kconfig.psa.auto b/modules/mbedtls/Kconfig.psa.auto
index fa8cdbc7b53..834252432b5 100644
--- a/modules/mbedtls/Kconfig.psa.auto
+++ b/modules/mbedtls/Kconfig.psa.auto
@@ -88,7 +88,9 @@ config PSA_WANT_ALG_HMAC
 config PSA_WANT_ALG_MD5
 	bool "PSA_WANT_ALG_MD5" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-
+	help
+	  Warning: The MD5 hash is weak and deprecated and is only recommended
+	  for use in legacy protocols.
 
 config PSA_WANT_ALG_PBKDF2_HMAC
 	bool "PSA_WANT_ALG_PBKDF2_HMAC" if !MBEDTLS_PROMPTLESS
@@ -119,6 +121,9 @@ config PSA_WANT_ALG_RSA_PSS
 config PSA_WANT_ALG_SHA_1
 	bool "PSA_WANT_ALG_SHA_1" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	help
+	  Warning: The SHA-1 hash is weak and deprecated and is only recommended
+	  for use in legacy protocols.
 
 config PSA_WANT_ALG_SHA_224
 	bool "PSA_WANT_ALG_SHA_224" if !MBEDTLS_PROMPTLESS

From a72070860e1d8ad92aeee8fd0fc513c23dadbbf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Wed, 21 Aug 2024 12:56:48 +0200
Subject: [PATCH 2150/2913] [nrf noup] mbedtls: Adding missing configuration
 for RSA key type derive
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-This is a [nrf noup] because the upstream Zephyr is generated using
 a script and is not committed as-is as source-code. The relevant
 responsible person for this feature has received information about
 the missing configuration and this will be resolved upstream in
 Mbed TLS and will propagate down to zephyr. Once this has happened,
 this [nrf noup] can be dropped.
-Add missing PSA_WANT_KEY_TYPE_RSA_KEY_DERIVE

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit 75ac1943bc904f20b342c89bb9919130cfe2ef65)
---
 modules/mbedtls/Kconfig.psa.auto | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/mbedtls/Kconfig.psa.auto b/modules/mbedtls/Kconfig.psa.auto
index 834252432b5..b235c30380f 100644
--- a/modules/mbedtls/Kconfig.psa.auto
+++ b/modules/mbedtls/Kconfig.psa.auto
@@ -298,4 +298,9 @@ config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE
 	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
+config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE
+	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
+	default y if PSA_CRYPTO_ENABLE_ALL
+
 endif # PSA_CRYPTO_CLIENT

From d368caa888115805e3414cb76fe118ab26d4b2d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Thu, 5 Sep 2024 15:05:43 +0200
Subject: [PATCH 2151/2913] [nrf noup] mbedtls: Don't select
 PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC is internally resolved by
 Mbed TLS. It has been made promptless in a previous commit.
 Keeping this change separated since the Kconfig.psa is auto-generated
 and it would likely be a bit more complex to handle this in a
 single commit. Upstream maintainers have been notified about this
 mismatch in configurations.

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit a1456789b749c1ad52a6c68df42544500456f37d)
---
 modules/mbedtls/Kconfig.tls-generic | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/mbedtls/Kconfig.tls-generic b/modules/mbedtls/Kconfig.tls-generic
index 72ff2710225..1d8ef925fce 100644
--- a/modules/mbedtls/Kconfig.tls-generic
+++ b/modules/mbedtls/Kconfig.tls-generic
@@ -96,6 +96,7 @@ config MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
 	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT if PSA_CRYPTO_CLIENT
 	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT if PSA_CRYPTO_CLIENT
 	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE if PSA_CRYPTO_CLIENT
+	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE if PSA_CRYPTO_CLIENT
 
 config MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
 	bool "DHE-RSA based ciphersuite modes"

From 084ca19817afe06f398ea483efa95dda57da3ef0 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Tue, 7 May 2024 08:27:09 +0100
Subject: [PATCH 2152/2913] [nrf noup] kernel: banner: Make function weak

Makes the boot banner function weak, this resolves an issue when
building with llext enabled which uses different build options
than a normal zephyr build

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 683421718ef6344b399ab0f9fce05cedc32b4d94)
---
 kernel/banner.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/banner.c b/kernel/banner.c
index 5cadda0a5e9..a16784cb975 100644
--- a/kernel/banner.c
+++ b/kernel/banner.c
@@ -24,7 +24,7 @@
 #endif /* BUILD_VERSION */
 #endif /* !BANNER_VERSION */
 
-void boot_banner(void)
+__weak void boot_banner(void)
 {
 #if defined(CONFIG_BOOT_DELAY) && (CONFIG_BOOT_DELAY > 0)
 #ifdef CONFIG_BOOT_BANNER

From f01b6fa59a8a85955b02e3db074dcf8deccd0fcc Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Fri, 20 Sep 2024 14:48:37 +0200
Subject: [PATCH 2153/2913] [nrf noup] lib: os: zvfs: Remove EXPERIMENTAL from
 ZVFS

Although ZVFS is experimental, the warning is annoying the matter team.
Therefore, remove the experimental selection.

This may be reverted once upstream unselects experimental.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 4b9357e2cfee37f90b170b5fba7ae4da6dabcfb3)
---
 lib/os/zvfs/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/os/zvfs/Kconfig b/lib/os/zvfs/Kconfig
index 101e2cce086..b22d2b1f172 100644
--- a/lib/os/zvfs/Kconfig
+++ b/lib/os/zvfs/Kconfig
@@ -6,7 +6,6 @@
 menuconfig ZVFS
 	bool "Zephyr virtual filesystem (ZVFS) support [EXPERIMENTAL]"
 	select FDTABLE
-	select EXPERIMENTAL
 	help
 	  ZVFS is a central, Zephyr-native library that provides a common interoperable API for all
 	  types of file descriptors such as those from the non-virtual FS, sockets, eventfds, FILE *'s

From 4fbfe1690e859866822b404df66474931a6e75e5 Mon Sep 17 00:00:00 2001
From: Juha Ylinen <juha.ylinen@nordicsemi.no>
Date: Fri, 19 Jan 2024 15:26:33 +0200
Subject: [PATCH 2154/2913] [nrf noup] samples: lwm2m_client: Add support for
 nRF91x

Add support for nRF91x by providing overlay configuration file.

Signed-off-by: Juha Ylinen <juha.ylinen@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 427ba759b72bb9fa6ea5002f9301fd1ab942606f)
---
 samples/net/lwm2m_client/overlay-nrf91x.conf | 53 ++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 samples/net/lwm2m_client/overlay-nrf91x.conf

diff --git a/samples/net/lwm2m_client/overlay-nrf91x.conf b/samples/net/lwm2m_client/overlay-nrf91x.conf
new file mode 100644
index 00000000000..9597791c10e
--- /dev/null
+++ b/samples/net/lwm2m_client/overlay-nrf91x.conf
@@ -0,0 +1,53 @@
+# Configuration file for nRF91x
+# This file is merged with prj.conf in the application folder, and options
+# set here will take precedence if they are present in both files.
+
+# General
+CONFIG_MAIN_STACK_SIZE=4096
+
+CONFIG_NET_SOCKETS=y
+CONFIG_NET_NATIVE=y
+CONFIG_NET_SOCKETS_OFFLOAD=y
+
+CONFIG_NET_CONFIG_MY_IPV6_ADDR=""
+CONFIG_NET_CONFIG_PEER_IPV6_ADDR=""
+CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
+CONFIG_NET_CONFIG_MY_IPV4_GW=""
+
+CONFIG_NET_CONFIG_NEED_IPV6=n
+CONFIG_NET_CONFIG_NEED_IPV4=n
+CONFIG_NET_CONFIG_AUTO_INIT=n
+
+# Modem related configurations
+CONFIG_NRF_MODEM_LIB_NET_IF=y
+CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_DOWN=n
+CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_CONNECT=n
+CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_START=n
+CONFIG_NRF_MODEM_LIB_ON_FAULT_APPLICATION_SPECIFIC=y
+
+CONFIG_LTE_LINK_CONTROL_LOG_LEVEL_DBG=n
+CONFIG_NRF_MODEM_LIB_NET_IF_LOG_LEVEL_DBG=n
+
+# Disable Duplicate Address Detection (DAD)
+# due to not being properly implemented for offloaded interfaces.
+CONFIG_NET_IPV6_NBR_CACHE=n
+CONFIG_NET_IPV6_MLD=n
+
+# Zephyr NET Connection Manager and Connectivity layer.
+CONFIG_NET_CONNECTION_MANAGER=y
+CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE=1024
+
+CONFIG_LWM2M_APP_ID="nrf91x"
+CONFIG_LWM2M_APP_SERVER="coaps://leshan.eclipseprojects.io:5684"
+CONFIG_LWM2M_DNS_SUPPORT=y
+
+## Enable DTLS support
+CONFIG_LWM2M_DTLS_SUPPORT=y
+CONFIG_LWM2M_TLS_SESSION_CACHING=y
+CONFIG_LWM2M_DTLS_CID=y
+CONFIG_TLS_CREDENTIALS=y
+
+## Crypto
+CONFIG_OBERON_BACKEND=y
+CONFIG_NORDIC_SECURITY_BACKEND=y
+CONFIG_MBEDTLS_SHA256_C=y

From c2f1a498cef9a00fd89482a392f2c81962adb26b Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Mon, 7 Oct 2024 15:36:43 +0200
Subject: [PATCH 2155/2913] [nrf noup] samples: net: Enable Wi-Fi driver in
 sysbuild builds

Make sure Wi-Fi driver is enabled in networking samples supporting Wi-Fi
when sysbuild is used.
For shields we cannot automate this, as sysbuild doesn't recognize
shields, so, Wi-Fi has to be explicitly enabled, this is done for
twister in Wi-Fi sample.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 5eec5ca2ac59038194a91b7086edc50949ed83c9)
(cherry picked from commit 74aa39df52e40b8342ca7feff8ff0847df74365c)
---
 samples/net/dns_resolve/Kconfig.sysbuild         | 13 +++++++++++++
 samples/net/ipv4_autoconf/Kconfig.sysbuild       | 13 +++++++++++++
 samples/net/lwm2m_client/Kconfig.sysbuild        | 13 +++++++++++++
 samples/net/mdns_responder/Kconfig.sysbuild      | 13 +++++++++++++
 samples/net/mqtt_publisher/Kconfig.sysbuild      | 13 +++++++++++++
 samples/net/mqtt_sn_publisher/Kconfig.sysbuild   | 13 +++++++++++++
 samples/net/sockets/coap_server/Kconfig.sysbuild | 13 +++++++++++++
 samples/net/sockets/echo_async/Kconfig.sysbuild  | 13 +++++++++++++
 samples/net/sockets/echo_client/Kconfig.sysbuild | 13 +++++++++++++
 samples/net/sockets/echo_server/Kconfig.sysbuild | 13 +++++++++++++
 samples/net/sockets/http_get/Kconfig.sysbuild    | 13 +++++++++++++
 samples/net/sockets/sntp_client/Kconfig.sysbuild | 13 +++++++++++++
 samples/net/syslog_net/Kconfig.sysbuild          | 13 +++++++++++++
 samples/net/telnet/Kconfig.sysbuild              | 13 +++++++++++++
 samples/net/wifi/Kconfig.sysbuild                | 13 +++++++++++++
 samples/net/wifi/shell/sample.yaml               |  2 ++
 16 files changed, 197 insertions(+)
 create mode 100644 samples/net/dns_resolve/Kconfig.sysbuild
 create mode 100644 samples/net/ipv4_autoconf/Kconfig.sysbuild
 create mode 100644 samples/net/lwm2m_client/Kconfig.sysbuild
 create mode 100644 samples/net/mdns_responder/Kconfig.sysbuild
 create mode 100644 samples/net/mqtt_publisher/Kconfig.sysbuild
 create mode 100644 samples/net/mqtt_sn_publisher/Kconfig.sysbuild
 create mode 100644 samples/net/sockets/coap_server/Kconfig.sysbuild
 create mode 100644 samples/net/sockets/echo_async/Kconfig.sysbuild
 create mode 100644 samples/net/sockets/echo_client/Kconfig.sysbuild
 create mode 100644 samples/net/sockets/echo_server/Kconfig.sysbuild
 create mode 100644 samples/net/sockets/http_get/Kconfig.sysbuild
 create mode 100644 samples/net/sockets/sntp_client/Kconfig.sysbuild
 create mode 100644 samples/net/syslog_net/Kconfig.sysbuild
 create mode 100644 samples/net/telnet/Kconfig.sysbuild
 create mode 100644 samples/net/wifi/Kconfig.sysbuild

diff --git a/samples/net/dns_resolve/Kconfig.sysbuild b/samples/net/dns_resolve/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/dns_resolve/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/ipv4_autoconf/Kconfig.sysbuild b/samples/net/ipv4_autoconf/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/ipv4_autoconf/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/lwm2m_client/Kconfig.sysbuild b/samples/net/lwm2m_client/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/lwm2m_client/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/mdns_responder/Kconfig.sysbuild b/samples/net/mdns_responder/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/mdns_responder/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/mqtt_publisher/Kconfig.sysbuild b/samples/net/mqtt_publisher/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/mqtt_publisher/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/mqtt_sn_publisher/Kconfig.sysbuild b/samples/net/mqtt_sn_publisher/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/mqtt_sn_publisher/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/coap_server/Kconfig.sysbuild b/samples/net/sockets/coap_server/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/sockets/coap_server/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/echo_async/Kconfig.sysbuild b/samples/net/sockets/echo_async/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/sockets/echo_async/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/echo_client/Kconfig.sysbuild b/samples/net/sockets/echo_client/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/sockets/echo_client/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/echo_server/Kconfig.sysbuild b/samples/net/sockets/echo_server/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/sockets/echo_server/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/http_get/Kconfig.sysbuild b/samples/net/sockets/http_get/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/sockets/http_get/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/sntp_client/Kconfig.sysbuild b/samples/net/sockets/sntp_client/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/sockets/sntp_client/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/syslog_net/Kconfig.sysbuild b/samples/net/syslog_net/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/syslog_net/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/telnet/Kconfig.sysbuild b/samples/net/telnet/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/telnet/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/wifi/Kconfig.sysbuild b/samples/net/wifi/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/wifi/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/wifi/shell/sample.yaml b/samples/net/wifi/shell/sample.yaml
index 487dbfea642..308d2e59dc6 100644
--- a/samples/net/wifi/shell/sample.yaml
+++ b/samples/net/wifi/shell/sample.yaml
@@ -57,6 +57,7 @@ tests:
       - nrf7002dk/nrf5340/cpuapp/nrf7001
   sample.net.wifi.nrf7002ek:
     extra_args:
+      - SB_CONFIG_WIFI_NRF70=y
       - CONFIG_BUILD_ONLY_NO_BLOBS=y
       - SHIELD=nrf7002ek
     platform_allow:
@@ -68,6 +69,7 @@ tests:
   sample.net.wifi.nrf7002eb:
     extra_args:
       - CONFIG_NRF70_UTIL=y
+      - SB_CONFIG_WIFI_NRF70=y
       - CONFIG_BUILD_ONLY_NO_BLOBS=y
       - SHIELD=nrf7002eb
     platform_allow:

From ac836a6d2efa0d9a492b1f7cd33ba6e30262328c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Wed, 25 Sep 2024 13:49:59 +0200
Subject: [PATCH 2156/2913] [nrf noup] mbedtls: Don't enable auto-generation of
 Mbed TLS files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- We don't use this mechanism in nRF Connect SDK

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit 59f4768d7c0cb16cbf6385a7fe5e3b8e02394a5c)
---
 tests/crypto/mbedtls/CMakeLists.txt | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/tests/crypto/mbedtls/CMakeLists.txt b/tests/crypto/mbedtls/CMakeLists.txt
index 7ebdc9d76a9..47670bead01 100644
--- a/tests/crypto/mbedtls/CMakeLists.txt
+++ b/tests/crypto/mbedtls/CMakeLists.txt
@@ -6,15 +6,5 @@ project(mbedtls)
 
 set(output_file ${PROJECT_BINARY_DIR}/mbedtls-check.timestamp)
 
-add_custom_command(
-    COMMENT "Check Mbed TLS auto-generated files"
-    COMMAND
-        ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/modules/mbedtls/create_psa_files.py --check
-    OUTPUT
-        ${output_file}
-)
-
-add_custom_target(check_mbedtls_auto_generated_files ALL DEPENDS ${output_file})
-
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})

From 494fae664340a16b25531368d94aed8f7bdc198e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Wed, 25 Sep 2024 14:05:41 +0200
Subject: [PATCH 2157/2913] [nrf noup] net: tests: Add legacy crypto API
 support for big_http_download
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-We handle legacy Crypto API support specially (favoring PSA crypto)
 the tests here require MD interface to build, which needs the config
 MBEDTLS_LEGACY_CRYPTO_C to be enable to get access to

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit e38e10f814c596e02320253c17b948a692f1374e)
---
 samples/net/sockets/big_http_download/prj.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/net/sockets/big_http_download/prj.conf b/samples/net/sockets/big_http_download/prj.conf
index a406f314dfb..8677e7113e4 100644
--- a/samples/net/sockets/big_http_download/prj.conf
+++ b/samples/net/sockets/big_http_download/prj.conf
@@ -3,6 +3,7 @@ CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_ENABLE_HEAP=y
 CONFIG_MBEDTLS_MD=y
+CONFIG_MBEDTLS_LEGACY_CRYPTO_C=y
 CONFIG_MAIN_STACK_SIZE=2536
 
 # Networking config

From c34c299fc63c7cb4613fee86f43c39966e8c1328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Wed, 25 Sep 2024 14:31:02 +0200
Subject: [PATCH 2158/2913] [nrf noup] net: tests: crypto: Adding legacy Crypto
 support ipv6 tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-This adds crypto support for ipv6 tests by enabling
 CONFIG_MBEDTLS_LEGACY_CRYPTO_C

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit 1a5bfcdc8771ca6ebc26dd0c9f7f0bcbc79cd44f)
---
 tests/net/ipv6/prj.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/net/ipv6/prj.conf b/tests/net/ipv6/prj.conf
index 51cfa883727..c8dda772895 100644
--- a/tests/net/ipv6/prj.conf
+++ b/tests/net/ipv6/prj.conf
@@ -33,6 +33,7 @@ CONFIG_NET_IF_MAX_IPV6_COUNT=2
 CONFIG_NET_IPV6_PE=y
 CONFIG_NET_IPV6_PE_FILTER_PREFIX_COUNT=2
 CONFIG_NET_IPV6_PE_PREFER_PUBLIC_ADDRESSES=n
+CONFIG_MBEDTLS_LEGACY_CRYPTO_C=y
 
 # Increase the stack a bit for mps2/an385
 CONFIG_NET_RX_STACK_SIZE=1700

From 38d709da80534e8af33df2a22dcbfa6c948ca48d Mon Sep 17 00:00:00 2001
From: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
Date: Tue, 8 Oct 2024 21:27:51 +0530
Subject: [PATCH 2159/2913] [nrf noup] samples: net: wifi: Changes for EAP-TLS
 support

Enable wifi sample to connect in EAP-TLS mode. Create sample
certificates.

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
(cherry picked from commit 387e246f63699a40a504cc58fb6bb0810129bf0c)
---
 samples/net/wifi/shell/overlay-enterprise.conf | 2 +-
 samples/net/wifi/shell/prj.conf                | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/samples/net/wifi/shell/overlay-enterprise.conf b/samples/net/wifi/shell/overlay-enterprise.conf
index 34416282811..ba6d958f9a5 100644
--- a/samples/net/wifi/shell/overlay-enterprise.conf
+++ b/samples/net/wifi/shell/overlay-enterprise.conf
@@ -7,4 +7,4 @@ CONFIG_NET_BUF_RX_COUNT=36
 # For TLS and X.509 processing MbedTLS needs large heap size and using separate heap
 # for MbedTLS gives us more control over the heap size.
 CONFIG_MBEDTLS_ENABLE_HEAP=y
-CONFIG_MBEDTLS_HEAP_SIZE=55000
+CONFIG_MBEDTLS_HEAP_SIZE=70000
diff --git a/samples/net/wifi/shell/prj.conf b/samples/net/wifi/shell/prj.conf
index e1a1b40a409..ab3d718f06b 100644
--- a/samples/net/wifi/shell/prj.conf
+++ b/samples/net/wifi/shell/prj.conf
@@ -31,6 +31,10 @@ CONFIG_NET_STATISTICS_PERIODIC_OUTPUT=n
 CONFIG_WIFI=y
 CONFIG_WIFI_LOG_LEVEL_ERR=y
 CONFIG_NET_L2_WIFI_SHELL=y
+
+CONFIG_MBEDTLS_ENABLE_HEAP=y
+CONFIG_MBEDTLS_HEAP_SIZE=70000
+
 # printing of scan results puts pressure on queues in new locking
 # design in net_mgmt. So, use a higher timeout for a crowded
 # environment.

From 78f1815cf2a86117242570a653597c8fa3f2fc7f Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 22 Oct 2024 23:09:14 +0530
Subject: [PATCH 2160/2913] [nrf noup] samples: net: wifi: Update certificates

Upstream certificates are RSA3K + Suite-B, they are not support yet on
nRF boards, so, generate a new certificate for both phase1 and phase2
and use them.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
(cherry picked from commit 0113fd656f235a627194c1dcd280d341e7716685)
---
 samples/net/wifi/test_certs/ca.pem          | 47 +++++++-------
 samples/net/wifi/test_certs/ca2.pem         | 47 +++++++-------
 samples/net/wifi/test_certs/client-key.pem  | 70 +++++++++------------
 samples/net/wifi/test_certs/client-key2.pem | 70 +++++++++------------
 samples/net/wifi/test_certs/client.pem      | 48 +++++++-------
 samples/net/wifi/test_certs/client2.pem     | 48 +++++++-------
 samples/net/wifi/test_certs/server-key.pem  | 70 +++++++++------------
 samples/net/wifi/test_certs/server-key2.pem | 30 +++++++++
 samples/net/wifi/test_certs/server.pem      | 46 ++++++--------
 samples/net/wifi/test_certs/server2.pem     | 22 +++++++
 10 files changed, 248 insertions(+), 250 deletions(-)
 create mode 100644 samples/net/wifi/test_certs/server-key2.pem
 create mode 100644 samples/net/wifi/test_certs/server2.pem

diff --git a/samples/net/wifi/test_certs/ca.pem b/samples/net/wifi/test_certs/ca.pem
index b401b39ae33..2b872d2e30d 100644
--- a/samples/net/wifi/test_certs/ca.pem
+++ b/samples/net/wifi/test_certs/ca.pem
@@ -1,27 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEozCCAwugAwIBAgIJAME6wWYWgog4MA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNV
-BAYTAlVTMRQwEgYDVQQHDAtTYW50YSBDbGFyYTEXMBUGA1UECgwOV2ktRmkgQWxs
-aWFuY2UxHzAdBgNVBAMMFlN1aXRlIEIgUlNBIDNrIFJvb3QgQ0EwHhcNMTkwODI3
-MDAyMjU1WhcNMjkwODI0MDAyMjU1WjBdMQswCQYDVQQGEwJVUzEUMBIGA1UEBwwL
-U2FudGEgQ2xhcmExFzAVBgNVBAoMDldpLUZpIEFsbGlhbmNlMR8wHQYDVQQDDBZT
-dWl0ZSBCIFJTQSAzayBSb290IENBMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
-igKCAYEAtzzg4P4NDIPaRGftX3s0f5ZDuEXTSOYOS12vcNRiRy6rMlCTzzYTFHve
-caTiBRJ9Zw4apvzYK/xVSKNN/8rHE2/kojjXnpeTPrmpduSwlXKyE+gDfmWNbd5t
-8Swa/1y4FisJPVbPBxAH4s58HjKqMrLbogPTZfcRZwGBnjvwvlbdAV37biXrv5+h
-YZbiD1u/DNzQe2LezwkbjAqmJExfUyq85D7Nmyci4gjSWA/y/AEtb0R3q2bf5EHh
-bl+2DAdJuhqup2EsGI0RrekuXokNe0K3WMfGgOZpY3nsVuRXUbnQ5fm/Li5movsv
-MWBx7xRC9pvFhtb94sG2XH7bfYTkgxaphWWIjVcuc95w5CEt5TExGovZ4NZMl9CP
-vgpxsHUx/dLg84zkWA1RKXOe+2OGe2RsajLdyTgq4i/89kScKQmmKKenTis3jjmR
-O++I8rngrz+pV49WGWsTRnkwIqNaV28zfKMf2etTzOI7WyR0SqfhznV8iluYVnfd
-eTK19fApAgMBAAGjZjBkMB0GA1UdDgQWBBS7O/zgLUEj6W41+XoTcfsOLPxkljAf
-BgNVHSMEGDAWgBS7O/zgLUEj6W41+XoTcfsOLPxkljASBgNVHRMBAf8ECDAGAQH/
-AgEAMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQwFAAOCAYEAWinoNLzdFi0f
-qsR+kkqckAj5k1uH04EqhZip4yLU8VzZUz0KPN4SlgPWys+tzvRHo7AX3VYC1AqM
-+6IR5b8Wff40Sm5MIUao07mkM3aJfhKfe63/zw7YPSPWfyiiN7899yLYCzlQjwM8
-Wp4MEXdkoCQqQawnPMr/yKjGJt6Clg/nKFT8qKVSQMoGTo3QEZveg4V7RraLlEn1
-bx8IExQX9OWww9XspuJAl/oxSj2JUbs3kiZemSjrqtBCIeJgDnLeYW+YDxUh4vG0
-agpidNa3Y21k8IGv66jdvEbTair5Bg+VFVZC5PaN8v/B+JwGg6Gl2iVfW7nJskI9
-+D968cXhnCRWLawRJtQTz4nQspC/Kc2qLAfEmeat/jFdsLC4tfPdA/HjrL3eb1Bv
-oJolgywVIFaMng1WO5FYV0jpMD1BpIkfWAdrXcPGWkMwTbGHvb0Q6/CH7KfPRtyo
-iEfxujGQSAjvwD39Hcp8XDtOx1ugH8SoUMCC6ZlrTUwJPMCXui0Z
+MIIEBzCCAu+gAwIBAgIUK8+d+8IOzeX+DP3VSvdF3lHiCdcwDQYJKoZIhvcNAQEL
+BQAwgZIxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIDAZSYWRpdXMxEjAQBgNVBAcMCVNv
+bWV3aGVyZTEUMBIGA1UECgwLRXhhbXBsZSBJbmMxJjAkBgNVBAMMHUV4YW1wbGUg
+Q2VydGlmaWNhdGUgQXV0aG9yaXR5MSAwHgYJKoZIhvcNAQkBFhFhZG1pbkBleGFt
+cGxlLm9yZzAeFw0yNDEwMDgxMDI0MDZaFw0zNDEwMDYxMDI0MDZaMIGSMQswCQYD
+VQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hlcmUxFDAS
+BgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRl
+IEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5vcmcwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWKIwjdRIp9IrpZELN/ZsN13Xj
+qQI6n086PNJ7BZfLi0+tD164rmxFk2eukNNksFCPhvMkqUxouGhc4mJjeivvrZxR
+oT3cblOQIkkdEci6iTKC2E1a20W/Ur7cTXoIsnKwjiUjXk+cujkrZu4fcHX+O4vy
+wTd5tEbhmifT/4u5nN8U2vBcEZqkGHOCp30VZSxtlGwqp4lc+tVziF3uFViW9MXk
+3bVt+s1E7ztwG7+WBgVlLYe3CNSWkMxfyYBafH/l7iep6AFjoTn1z3AAjYi7IUNN
+0JkW8MTgafRQIu4QsV5luq/Tiar2vwAm/GNgUJdSzUKARsfQzb/XTIgnLQqtAgMB
+AAGjUzBRMB0GA1UdDgQWBBSijSC03/Thi6EOdM91V33zsbQpgzAfBgNVHSMEGDAW
+gBSijSC03/Thi6EOdM91V33zsbQpgzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQAvKEfmCDoMTKC6bfP6DSs+MSAGc5tCr6w6cz2AKNJ2fOMhkq55
+JF47oBBGm9SdTB6Jqo6c109Ps69/+LMtEEGwvzL0RL0WAuTYGo6sudm9hj/jDHZh
+pAqi/2BQQeVgTa6oW0jtNPFe+/cobXo9TJ7wECGrhvVbmfl5ZPc0YVOIjjR0/LhL
+q7lqPAlJ5vx0WvsX+QReN97we8vD0x1D3mCySJTi3Irh+grE0yJOSN2fa7cyqi9+
+vSiNUB1eUgQwrO+S8ZazYNvAZXC2Xf4WB4SOifJD73pYPAdwOejc0FA+zfEKa/6/
+vTUs8cIhlmDWO+BEoc9wygMKMmhT5s7/T5Bv
 -----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/ca2.pem b/samples/net/wifi/test_certs/ca2.pem
index b401b39ae33..2b872d2e30d 100644
--- a/samples/net/wifi/test_certs/ca2.pem
+++ b/samples/net/wifi/test_certs/ca2.pem
@@ -1,27 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEozCCAwugAwIBAgIJAME6wWYWgog4MA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNV
-BAYTAlVTMRQwEgYDVQQHDAtTYW50YSBDbGFyYTEXMBUGA1UECgwOV2ktRmkgQWxs
-aWFuY2UxHzAdBgNVBAMMFlN1aXRlIEIgUlNBIDNrIFJvb3QgQ0EwHhcNMTkwODI3
-MDAyMjU1WhcNMjkwODI0MDAyMjU1WjBdMQswCQYDVQQGEwJVUzEUMBIGA1UEBwwL
-U2FudGEgQ2xhcmExFzAVBgNVBAoMDldpLUZpIEFsbGlhbmNlMR8wHQYDVQQDDBZT
-dWl0ZSBCIFJTQSAzayBSb290IENBMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
-igKCAYEAtzzg4P4NDIPaRGftX3s0f5ZDuEXTSOYOS12vcNRiRy6rMlCTzzYTFHve
-caTiBRJ9Zw4apvzYK/xVSKNN/8rHE2/kojjXnpeTPrmpduSwlXKyE+gDfmWNbd5t
-8Swa/1y4FisJPVbPBxAH4s58HjKqMrLbogPTZfcRZwGBnjvwvlbdAV37biXrv5+h
-YZbiD1u/DNzQe2LezwkbjAqmJExfUyq85D7Nmyci4gjSWA/y/AEtb0R3q2bf5EHh
-bl+2DAdJuhqup2EsGI0RrekuXokNe0K3WMfGgOZpY3nsVuRXUbnQ5fm/Li5movsv
-MWBx7xRC9pvFhtb94sG2XH7bfYTkgxaphWWIjVcuc95w5CEt5TExGovZ4NZMl9CP
-vgpxsHUx/dLg84zkWA1RKXOe+2OGe2RsajLdyTgq4i/89kScKQmmKKenTis3jjmR
-O++I8rngrz+pV49WGWsTRnkwIqNaV28zfKMf2etTzOI7WyR0SqfhznV8iluYVnfd
-eTK19fApAgMBAAGjZjBkMB0GA1UdDgQWBBS7O/zgLUEj6W41+XoTcfsOLPxkljAf
-BgNVHSMEGDAWgBS7O/zgLUEj6W41+XoTcfsOLPxkljASBgNVHRMBAf8ECDAGAQH/
-AgEAMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQwFAAOCAYEAWinoNLzdFi0f
-qsR+kkqckAj5k1uH04EqhZip4yLU8VzZUz0KPN4SlgPWys+tzvRHo7AX3VYC1AqM
-+6IR5b8Wff40Sm5MIUao07mkM3aJfhKfe63/zw7YPSPWfyiiN7899yLYCzlQjwM8
-Wp4MEXdkoCQqQawnPMr/yKjGJt6Clg/nKFT8qKVSQMoGTo3QEZveg4V7RraLlEn1
-bx8IExQX9OWww9XspuJAl/oxSj2JUbs3kiZemSjrqtBCIeJgDnLeYW+YDxUh4vG0
-agpidNa3Y21k8IGv66jdvEbTair5Bg+VFVZC5PaN8v/B+JwGg6Gl2iVfW7nJskI9
-+D968cXhnCRWLawRJtQTz4nQspC/Kc2qLAfEmeat/jFdsLC4tfPdA/HjrL3eb1Bv
-oJolgywVIFaMng1WO5FYV0jpMD1BpIkfWAdrXcPGWkMwTbGHvb0Q6/CH7KfPRtyo
-iEfxujGQSAjvwD39Hcp8XDtOx1ugH8SoUMCC6ZlrTUwJPMCXui0Z
+MIIEBzCCAu+gAwIBAgIUK8+d+8IOzeX+DP3VSvdF3lHiCdcwDQYJKoZIhvcNAQEL
+BQAwgZIxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIDAZSYWRpdXMxEjAQBgNVBAcMCVNv
+bWV3aGVyZTEUMBIGA1UECgwLRXhhbXBsZSBJbmMxJjAkBgNVBAMMHUV4YW1wbGUg
+Q2VydGlmaWNhdGUgQXV0aG9yaXR5MSAwHgYJKoZIhvcNAQkBFhFhZG1pbkBleGFt
+cGxlLm9yZzAeFw0yNDEwMDgxMDI0MDZaFw0zNDEwMDYxMDI0MDZaMIGSMQswCQYD
+VQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hlcmUxFDAS
+BgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRl
+IEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5vcmcwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWKIwjdRIp9IrpZELN/ZsN13Xj
+qQI6n086PNJ7BZfLi0+tD164rmxFk2eukNNksFCPhvMkqUxouGhc4mJjeivvrZxR
+oT3cblOQIkkdEci6iTKC2E1a20W/Ur7cTXoIsnKwjiUjXk+cujkrZu4fcHX+O4vy
+wTd5tEbhmifT/4u5nN8U2vBcEZqkGHOCp30VZSxtlGwqp4lc+tVziF3uFViW9MXk
+3bVt+s1E7ztwG7+WBgVlLYe3CNSWkMxfyYBafH/l7iep6AFjoTn1z3AAjYi7IUNN
+0JkW8MTgafRQIu4QsV5luq/Tiar2vwAm/GNgUJdSzUKARsfQzb/XTIgnLQqtAgMB
+AAGjUzBRMB0GA1UdDgQWBBSijSC03/Thi6EOdM91V33zsbQpgzAfBgNVHSMEGDAW
+gBSijSC03/Thi6EOdM91V33zsbQpgzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQAvKEfmCDoMTKC6bfP6DSs+MSAGc5tCr6w6cz2AKNJ2fOMhkq55
+JF47oBBGm9SdTB6Jqo6c109Ps69/+LMtEEGwvzL0RL0WAuTYGo6sudm9hj/jDHZh
+pAqi/2BQQeVgTa6oW0jtNPFe+/cobXo9TJ7wECGrhvVbmfl5ZPc0YVOIjjR0/LhL
+q7lqPAlJ5vx0WvsX+QReN97we8vD0x1D3mCySJTi3Irh+grE0yJOSN2fa7cyqi9+
+vSiNUB1eUgQwrO+S8ZazYNvAZXC2Xf4WB4SOifJD73pYPAdwOejc0FA+zfEKa/6/
+vTUs8cIhlmDWO+BEoc9wygMKMmhT5s7/T5Bv
 -----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/client-key.pem b/samples/net/wifi/test_certs/client-key.pem
index 893280f7ba6..6ab70da2452 100644
--- a/samples/net/wifi/test_certs/client-key.pem
+++ b/samples/net/wifi/test_certs/client-key.pem
@@ -1,40 +1,30 @@
------BEGIN PRIVATE KEY-----
-MIIG/AIBADANBgkqhkiG9w0BAQEFAASCBuYwggbiAgEAAoIBgQCm2jz5DYHRvaSF
-4F+A7V1FgBaJdjIQNWZ7e/rpNuAzkMDNdGJKzW/JtuUDgq6Ttf4RnajIhplA/h3A
-1dGLpH66RK48hjrBW5BLpl0RPtPZLmsLnI3/cbUnj3FpFssvfBnmjhNCGl0KC6kX
-gmKOpQLprXYncCvrt8DG7looKJ8FdGx3Mxmi7m9P/B9hIu2MD0WVAF+Ec+MQyy43
-MEtl16bMkui+MZKTWNE/8opcCVxE4oEFMw9TCToR5+IS6uwMhE/yN0Lx6hKuptZ0
-TYt4Y7XsIYHfFJ3L47bsbQuZh3pVorTWlpQmUbs1n1f/d+8SNf29Mipx+nvKBPJl
-zUtnqI3f7lmOZ/X480JRTvZODM6Hzflc1//A6RvgJvP7oYlXTX+SZBJKkZ079tB5
-AoXmsCxw8ePCMf1kVjlxVLcko8LEa30MjCrUqCJ61PINhEgd+0JnV14csYAMZKh0
-2K2v26HPGyZxAXoJ2/x75zW152jfLTkF6fE2EGcx7Ah9UtmNmM0CAwEAAQKCAYAl
-DGBtjKo+wDU/5MpP/mSvgfl/HFeRccoHsUfNcPnneUTWWflZUrR3vbysQuAwvEBl
-+PP5UqnE3KgOoWud7jCVe5qUpdl2BbbMlWwk4CZ6Gux575E4Hy9yUU+FXiJPsOav
-YuyzyNbP3Db3mWP4+HrlGDccGrQl6u9LPLGYKSzmMSvEa/xNSVQ+FmWBVBga+Wkh
-5KtQ5cqNeBATAQ481t2anyQ+1xMM1LPh1yERvqJWSVUMqoHElk/mme6A9NjlDpu2
-CSl82w/qFP/psxZ+66+ZKSIrUCWAiKPboDmAJeSsAsHKol5z0l7l9AFDwoh3vM2P
-dmBZ63af3gtCdx877r/nBlwiemwlgaAxh2HLJPtC6OfzffMcdUbO4AZ5SDutF/kp
-yAgweqBfpdJiQhOTsQvGzB007b9szCOXdOs+3KXjyakch9XFM6KR7KKpCTeuBlWY
-SDOsfzqZ119Neapr68NMoXMouhiwyfo4+3nAPPPrCuavsBQwihFD6BSNOA8jj6EC
-gcEA0ivuGU9ga3mVToQv9reOcG39aX7Dc4emu/8QrAaIivwZTLf9HOB/KRpKcaBH
-Z57N3GEE5qMfAyl3XrL9EWxh27W4YxzouQROwZILTpss3k7PNSd4fg1EDvOHEYkd
-B/IrSCwErkeL79fncIPW15LD+GnXKxPu6euJbp2Yk2RkW7pRvvxuQFxKV3Y1rrAO
-E1COo7bKW7CYyF3qoaLTuwb7qJRBU+sE1FHj1+YbueJSoNWbNDItZAsISedemtsR
-xFGfAoHBAMs8LOlpotTkvXDjG9u0n95YQvBEWh9A0uTIPjF9e2YIvVx6pdiXm5p4
-0pbsaNudbU4ZoRsbZiXFwIruXcOfdu1z0vmjdWVolp6p3C0QaRZ+jSgCChqZ67qQ
-E6oVPVnZCasqXfZPrpnW0T9NvtxeTAt2Yvv5P2jnF4ePzmv0RcW6FxGXS8K28uvL
-Bbw1vqECLT6HdNmU1V+TdUKoIaJAC3lWWDKrMQq1Y+H4C9hvsTHWY8pHz6GjYuHx
-X+eYErw2EwKBwFuWFzDiXUMYfY70na4muSSXWbnyKpwavfbopMxCIJhoWWIMP3mo
-/uDbexte3B70ngLuKGOVK/uFw2X6G7vO/invW4WdYHDXxrYlvVWo23mY4ETqiWBs
-yX62cuKaXJNM3b2aqQOFXB7NeCaY3TOd2lZTUReNnSxEnuQcOxPnyLAMVnkiqazU
-SvUoJyaTw9542V/QVQh1wW53NrrvKNM0rM/+oyU9oiIf+Wjo9qYfUSCTVQn+37bb
-8+W4tIpI8soZQwKBwG12MbJd5QfJU4dTqxOAi4KUAymphujCX1Q9zdGWBjqEhoki
-veSUc4iVfscu+aMffVnNUAprjW7WvceWbwYIA2QNOBqgwYAm/sjiL+ZNqmwlKR3d
-S1fcgyxuoUjAO9UCosSAAy/A5weQvg7cbun+F/Mshk+0hUSZAwFOoR1f6Zx/iCE/
-Xdy38MqzBJnEULIjm/7LslHmaa4am9OU/tiGqidmLAbOUZG09OEmWirurX9sOz8d
-wmUKvR14hfEU5TJd5QKBwDjaQimySkKfn7VGxgUyoCfkYKgBp0MKqsNFc8Mi3w0D
-/vyEWv41o/cLRwdBopwIzVSY1uypRjMkqsDaR4KcuA6OoBbdCYQHqGl/P0N91QGH
-hSrkCFISWnj8i7IchhkW8uVo4leQM34rlbqz1F7jPXmKC5J4LabaYJSQn0DRNPgh
-5wkbKM/BSC58cP0lHkSEYu/uXCrW3+qW1Hk/kPqsZ15fuOtDvJzoqcOjzXuHG+3u
-8uc9kkrSksPzrwSWaPbH8Q==
------END PRIVATE KEY-----
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQILVdWyEWhWU0CAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDMFReIusCg7gSkoUQZV2flBIIE
+0BIFQH7+0dc7wHIQQ1y0ao90rrK3ExtCABH6xp4OAHUNPR1549zSEak/9Ba6WLBp
+YE0m/lpLz4oUJE4Kd3rg4ekSZk4mapZoW7g5ax4qAEblmM6rqmyjiU0Q6tsAb8n1
+x+RyjUILlgTH1HDmeNA53QNMCw++xIMIJPN29SvFN6vkU2Fd2f74/TuZRSaCEPLO
+LKtNMwWCMTrlv0UewEryOvZegPQuEF/Ewmmw/9l5VfkPp6zAtZKzWsfk4jUo5tv2
+5dPoHR+RKjNNVwetnCq59QYMS2My6KLqX4Vzqnbu8K1nlbm85ZHnvLGi8cDn8EB7
+QtRL+Ev5IwcwYJgV5AMojouJLQdR655jeITWI1Gsohz28YG8c1qYX4ZN6albSd1G
+fd1tMOWkeu4uEzJ7ijLDfnCzrklnLuAZx8yLzyrOa7i9AwwJmdgUEdbWWsru3L6C
+zDJ45rpA0FobdlTem4kpoE9yiyHkIhf3wmI3X+0aodC11pdbHP260KIC8E1K9FUh
+s/IoEQCYrBp8UltNTlezwq/E5uOuIu4EpfjEgH1Z3+hSDbnmMAXNX4DbL234x7iy
+3Y256DtOeHSElnRz3kDnZVNtM1Kd5fgEYJ1ptYRPYaWyJka7/hC/0UObuM9w+QeO
+OlG0QgumQFloyhDa9anPBK4sYJp4g1fK8golUDW4AdpFPNOJvvgOvQUzhPpHjr+N
+lpZ75Y6I3JSSKJ/UMlSCOqjak8oZtMtJNMfbx1lgwwDtgjDSJvSdl735gI9VmXXH
+qnlGEtyiQ7k1Z1a4HxiY2/CiDHvkymClir/Ik8gt+wmyT9c/9BcehLRf6PxMsDVy
+PCkty1LlzN+5tSZJtJnOiTlgsRn/w49Ohp74ITheSdb30/6PnFI+o8rcJHmrjN4d
+t3z/bCyWAeC8mS7m0wtXlyBeG9xvdyT8dDHAFOnqxX30dEwEbjNj58kWGAgRf9i3
+HlOAP8yRy7LAV7A4HEPnEzXBxYpsROUw/8d3Jtmr2nAp2hfKP339DYZPHZpRLjJr
+WQlJasHHLxHKKjSsuM06WsCO+Tt2FTSgGJuU6nFVK75fssmmJYzj9qMHVM6YSjfY
+sT0ZIWRgO9NLFx5O3QxY1wgMLhhv1FREy9NVnMU0W3A1u0F7dwHywZGha2IqEXgu
++UyWIJnePMvluV/s66AN/OpIxKU48c0B4l7XzXkHHd43tDUG3ztfRuPbWCHipuRO
+eo+vHGD01iBLSE1ZhrYLHKQhJvIKx/PIEaqJHP/Vy35AD/2/GH09TiIBHzX9aXie
+TiKFs30FQv7SpLNHNE7jUxsYGNUbYa70S/Vgn3wkKATcXpCc749XQV4OUbFoqkDm
+vuZOjkIOlm/OtZkUuDWmk96mgoVG/gWSEJPynJHUpmWdu/BCdYOgxBk/bmPa1leS
+Z5NbO0fGMnNhDMXYA5rqmVzABcNSYhgYw5aciWpBlgYHEYrPxZvCxWftIyb24oEk
+wdHEaFbIYbOoVZqo7Ym2hrvVrJb8Qdukf1BmUgfSSSc7BFoSrBUO4SNFtZI55NOB
+OM4rnkqfoYR0IpnxzPIpxpsWljG9QsgnTaffStDgIGXiAtBWJFy+44f1IS4EoC6B
++we1Q6atPwYSyPtG8mn4Ce0BNxLDUoFDLMQ7Bt8QBMeX
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/client-key2.pem b/samples/net/wifi/test_certs/client-key2.pem
index 893280f7ba6..6ab70da2452 100644
--- a/samples/net/wifi/test_certs/client-key2.pem
+++ b/samples/net/wifi/test_certs/client-key2.pem
@@ -1,40 +1,30 @@
------BEGIN PRIVATE KEY-----
-MIIG/AIBADANBgkqhkiG9w0BAQEFAASCBuYwggbiAgEAAoIBgQCm2jz5DYHRvaSF
-4F+A7V1FgBaJdjIQNWZ7e/rpNuAzkMDNdGJKzW/JtuUDgq6Ttf4RnajIhplA/h3A
-1dGLpH66RK48hjrBW5BLpl0RPtPZLmsLnI3/cbUnj3FpFssvfBnmjhNCGl0KC6kX
-gmKOpQLprXYncCvrt8DG7looKJ8FdGx3Mxmi7m9P/B9hIu2MD0WVAF+Ec+MQyy43
-MEtl16bMkui+MZKTWNE/8opcCVxE4oEFMw9TCToR5+IS6uwMhE/yN0Lx6hKuptZ0
-TYt4Y7XsIYHfFJ3L47bsbQuZh3pVorTWlpQmUbs1n1f/d+8SNf29Mipx+nvKBPJl
-zUtnqI3f7lmOZ/X480JRTvZODM6Hzflc1//A6RvgJvP7oYlXTX+SZBJKkZ079tB5
-AoXmsCxw8ePCMf1kVjlxVLcko8LEa30MjCrUqCJ61PINhEgd+0JnV14csYAMZKh0
-2K2v26HPGyZxAXoJ2/x75zW152jfLTkF6fE2EGcx7Ah9UtmNmM0CAwEAAQKCAYAl
-DGBtjKo+wDU/5MpP/mSvgfl/HFeRccoHsUfNcPnneUTWWflZUrR3vbysQuAwvEBl
-+PP5UqnE3KgOoWud7jCVe5qUpdl2BbbMlWwk4CZ6Gux575E4Hy9yUU+FXiJPsOav
-YuyzyNbP3Db3mWP4+HrlGDccGrQl6u9LPLGYKSzmMSvEa/xNSVQ+FmWBVBga+Wkh
-5KtQ5cqNeBATAQ481t2anyQ+1xMM1LPh1yERvqJWSVUMqoHElk/mme6A9NjlDpu2
-CSl82w/qFP/psxZ+66+ZKSIrUCWAiKPboDmAJeSsAsHKol5z0l7l9AFDwoh3vM2P
-dmBZ63af3gtCdx877r/nBlwiemwlgaAxh2HLJPtC6OfzffMcdUbO4AZ5SDutF/kp
-yAgweqBfpdJiQhOTsQvGzB007b9szCOXdOs+3KXjyakch9XFM6KR7KKpCTeuBlWY
-SDOsfzqZ119Neapr68NMoXMouhiwyfo4+3nAPPPrCuavsBQwihFD6BSNOA8jj6EC
-gcEA0ivuGU9ga3mVToQv9reOcG39aX7Dc4emu/8QrAaIivwZTLf9HOB/KRpKcaBH
-Z57N3GEE5qMfAyl3XrL9EWxh27W4YxzouQROwZILTpss3k7PNSd4fg1EDvOHEYkd
-B/IrSCwErkeL79fncIPW15LD+GnXKxPu6euJbp2Yk2RkW7pRvvxuQFxKV3Y1rrAO
-E1COo7bKW7CYyF3qoaLTuwb7qJRBU+sE1FHj1+YbueJSoNWbNDItZAsISedemtsR
-xFGfAoHBAMs8LOlpotTkvXDjG9u0n95YQvBEWh9A0uTIPjF9e2YIvVx6pdiXm5p4
-0pbsaNudbU4ZoRsbZiXFwIruXcOfdu1z0vmjdWVolp6p3C0QaRZ+jSgCChqZ67qQ
-E6oVPVnZCasqXfZPrpnW0T9NvtxeTAt2Yvv5P2jnF4ePzmv0RcW6FxGXS8K28uvL
-Bbw1vqECLT6HdNmU1V+TdUKoIaJAC3lWWDKrMQq1Y+H4C9hvsTHWY8pHz6GjYuHx
-X+eYErw2EwKBwFuWFzDiXUMYfY70na4muSSXWbnyKpwavfbopMxCIJhoWWIMP3mo
-/uDbexte3B70ngLuKGOVK/uFw2X6G7vO/invW4WdYHDXxrYlvVWo23mY4ETqiWBs
-yX62cuKaXJNM3b2aqQOFXB7NeCaY3TOd2lZTUReNnSxEnuQcOxPnyLAMVnkiqazU
-SvUoJyaTw9542V/QVQh1wW53NrrvKNM0rM/+oyU9oiIf+Wjo9qYfUSCTVQn+37bb
-8+W4tIpI8soZQwKBwG12MbJd5QfJU4dTqxOAi4KUAymphujCX1Q9zdGWBjqEhoki
-veSUc4iVfscu+aMffVnNUAprjW7WvceWbwYIA2QNOBqgwYAm/sjiL+ZNqmwlKR3d
-S1fcgyxuoUjAO9UCosSAAy/A5weQvg7cbun+F/Mshk+0hUSZAwFOoR1f6Zx/iCE/
-Xdy38MqzBJnEULIjm/7LslHmaa4am9OU/tiGqidmLAbOUZG09OEmWirurX9sOz8d
-wmUKvR14hfEU5TJd5QKBwDjaQimySkKfn7VGxgUyoCfkYKgBp0MKqsNFc8Mi3w0D
-/vyEWv41o/cLRwdBopwIzVSY1uypRjMkqsDaR4KcuA6OoBbdCYQHqGl/P0N91QGH
-hSrkCFISWnj8i7IchhkW8uVo4leQM34rlbqz1F7jPXmKC5J4LabaYJSQn0DRNPgh
-5wkbKM/BSC58cP0lHkSEYu/uXCrW3+qW1Hk/kPqsZ15fuOtDvJzoqcOjzXuHG+3u
-8uc9kkrSksPzrwSWaPbH8Q==
------END PRIVATE KEY-----
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQILVdWyEWhWU0CAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDMFReIusCg7gSkoUQZV2flBIIE
+0BIFQH7+0dc7wHIQQ1y0ao90rrK3ExtCABH6xp4OAHUNPR1549zSEak/9Ba6WLBp
+YE0m/lpLz4oUJE4Kd3rg4ekSZk4mapZoW7g5ax4qAEblmM6rqmyjiU0Q6tsAb8n1
+x+RyjUILlgTH1HDmeNA53QNMCw++xIMIJPN29SvFN6vkU2Fd2f74/TuZRSaCEPLO
+LKtNMwWCMTrlv0UewEryOvZegPQuEF/Ewmmw/9l5VfkPp6zAtZKzWsfk4jUo5tv2
+5dPoHR+RKjNNVwetnCq59QYMS2My6KLqX4Vzqnbu8K1nlbm85ZHnvLGi8cDn8EB7
+QtRL+Ev5IwcwYJgV5AMojouJLQdR655jeITWI1Gsohz28YG8c1qYX4ZN6albSd1G
+fd1tMOWkeu4uEzJ7ijLDfnCzrklnLuAZx8yLzyrOa7i9AwwJmdgUEdbWWsru3L6C
+zDJ45rpA0FobdlTem4kpoE9yiyHkIhf3wmI3X+0aodC11pdbHP260KIC8E1K9FUh
+s/IoEQCYrBp8UltNTlezwq/E5uOuIu4EpfjEgH1Z3+hSDbnmMAXNX4DbL234x7iy
+3Y256DtOeHSElnRz3kDnZVNtM1Kd5fgEYJ1ptYRPYaWyJka7/hC/0UObuM9w+QeO
+OlG0QgumQFloyhDa9anPBK4sYJp4g1fK8golUDW4AdpFPNOJvvgOvQUzhPpHjr+N
+lpZ75Y6I3JSSKJ/UMlSCOqjak8oZtMtJNMfbx1lgwwDtgjDSJvSdl735gI9VmXXH
+qnlGEtyiQ7k1Z1a4HxiY2/CiDHvkymClir/Ik8gt+wmyT9c/9BcehLRf6PxMsDVy
+PCkty1LlzN+5tSZJtJnOiTlgsRn/w49Ohp74ITheSdb30/6PnFI+o8rcJHmrjN4d
+t3z/bCyWAeC8mS7m0wtXlyBeG9xvdyT8dDHAFOnqxX30dEwEbjNj58kWGAgRf9i3
+HlOAP8yRy7LAV7A4HEPnEzXBxYpsROUw/8d3Jtmr2nAp2hfKP339DYZPHZpRLjJr
+WQlJasHHLxHKKjSsuM06WsCO+Tt2FTSgGJuU6nFVK75fssmmJYzj9qMHVM6YSjfY
+sT0ZIWRgO9NLFx5O3QxY1wgMLhhv1FREy9NVnMU0W3A1u0F7dwHywZGha2IqEXgu
++UyWIJnePMvluV/s66AN/OpIxKU48c0B4l7XzXkHHd43tDUG3ztfRuPbWCHipuRO
+eo+vHGD01iBLSE1ZhrYLHKQhJvIKx/PIEaqJHP/Vy35AD/2/GH09TiIBHzX9aXie
+TiKFs30FQv7SpLNHNE7jUxsYGNUbYa70S/Vgn3wkKATcXpCc749XQV4OUbFoqkDm
+vuZOjkIOlm/OtZkUuDWmk96mgoVG/gWSEJPynJHUpmWdu/BCdYOgxBk/bmPa1leS
+Z5NbO0fGMnNhDMXYA5rqmVzABcNSYhgYw5aciWpBlgYHEYrPxZvCxWftIyb24oEk
+wdHEaFbIYbOoVZqo7Ym2hrvVrJb8Qdukf1BmUgfSSSc7BFoSrBUO4SNFtZI55NOB
+OM4rnkqfoYR0IpnxzPIpxpsWljG9QsgnTaffStDgIGXiAtBWJFy+44f1IS4EoC6B
++we1Q6atPwYSyPtG8mn4Ce0BNxLDUoFDLMQ7Bt8QBMeX
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/client.pem b/samples/net/wifi/test_certs/client.pem
index 5386185fcf3..9e815474cd8 100644
--- a/samples/net/wifi/test_certs/client.pem
+++ b/samples/net/wifi/test_certs/client.pem
@@ -1,28 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIEsTCCAxmgAwIBAgIJAJfUB+ymBRUTMA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNV
-BAYTAlVTMRQwEgYDVQQHDAtTYW50YSBDbGFyYTEXMBUGA1UECgwOV2ktRmkgQWxs
-aWFuY2UxHzAdBgNVBAMMFlN1aXRlIEIgUlNBIDNrIFJvb3QgQ0EwHhcNMTkwODI3
-MDAyMjU2WhcNMjkwODI0MDAyMjU2WjA9MQswCQYDVQQGEwJVUzEXMBUGA1UECgwO
-V2ktRmkgQWxsaWFuY2UxFTATBgNVBAMMDHVzZXItcnNhMzA3MjCCAaIwDQYJKoZI
-hvcNAQEBBQADggGPADCCAYoCggGBAKbaPPkNgdG9pIXgX4DtXUWAFol2MhA1Znt7
-+uk24DOQwM10YkrNb8m25QOCrpO1/hGdqMiGmUD+HcDV0YukfrpErjyGOsFbkEum
-XRE+09kuawucjf9xtSePcWkWyy98GeaOE0IaXQoLqReCYo6lAumtdidwK+u3wMbu
-WigonwV0bHczGaLub0/8H2Ei7YwPRZUAX4Rz4xDLLjcwS2XXpsyS6L4xkpNY0T/y
-ilwJXETigQUzD1MJOhHn4hLq7AyET/I3QvHqEq6m1nRNi3hjtewhgd8Uncvjtuxt
-C5mHelWitNaWlCZRuzWfV/937xI1/b0yKnH6e8oE8mXNS2eojd/uWY5n9fjzQlFO
-9k4MzofN+VzX/8DpG+Am8/uhiVdNf5JkEkqRnTv20HkCheawLHDx48Ix/WRWOXFU
-tySjwsRrfQyMKtSoInrU8g2ESB37QmdXXhyxgAxkqHTYra/boc8bJnEBegnb/Hvn
-NbXnaN8tOQXp8TYQZzHsCH1S2Y2YzQIDAQABo4GTMIGQMAkGA1UdEwQCMAAwHQYD
-VR0OBBYEFNpIxeQyWBP8kE3g5lCfY7dW4aHdMB8GA1UdIwQYMBaAFLs7/OAtQSPp
-bjX5ehNx+w4s/GSWMCEGA1UdEQQaMBiBFnVzZXItcnNhMzA3MkB3MS1maS5vcmcw
-EwYDVR0lBAwwCgYIKwYBBQUHAwIwCwYDVR0PBAQDAgWgMA0GCSqGSIb3DQEBDAUA
-A4IBgQA+ZcZprt/VuxvlThQMVHW32jglsoFJtvM4eN87e+HU4MPz1xCh8/Cg98RM
-SMIQX4F0T6seycQCeTV858CdkaAI7NgvMscPHZz1393NMoYt80IaqOMoSf+zsxY0
-sdvLDICKTCzpOKcloNrNo5Y8nio2pi+W4/H3BV7xrDe8JmofF4GsHHf0LEdxd1Hw
-8DX0vqiAbgiKVP2zZTBomCUPEQOe8xGE/xyfvmyRXuEd1XQFZesZnSe6UKmCMDgW
-UoD0mYjQKKZaregbP4r3MLDz18WGGVvLDPWODgVtLbwiT9W2ARziz097d5S53hgz
-yQ6ycweXbSscaYQ23YLZ8bXy9WIOzZVaAp1t0+LMet515d44nRKfvqy08g/odIH6
-/4sfNEyif7DcE6AV6tJ2mG1Qdel8hA0MggYEvn7QldehVC4CVQGVU/yRMDgZ3JR5
-yJbgEoWihslZWsXFbKMt/pcV89OEIhjk1Q+swReQ1MBMuiXjz8DojU5F3gxQpFnb
-obAN27U=
------END CERTIFICATE-----
\ No newline at end of file
+MIIDojCCAooCFGZ4UJXBKG70aewILFtsy4mbvaYZMA0GCSqGSIb3DQEBCwUAMIGS
+MQswCQYDVQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hl
+cmUxFDASBgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRp
+ZmljYXRlIEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
+cmcwHhcNMjQxMDA4MTAyNjI1WhcNMzQxMDA2MTAyNjI1WjCBhzELMAkGA1UEBhMC
+RlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQK
+DAtFeGFtcGxlIEluYzEbMBkGA1UEAwwSY2xpZW50LmV4YW1wbGUub3JnMSAwHgYJ
+KoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMu3HXJvi2Q4hQnLL4v/sCyEr5x+ZtBcSi2yETMViaf2EStW
+UOs1A1pmCQbO7nadLQcWaX4tzefQCRrs1X4hIQuDIqRPNi6h6G1g5HEtqBWZhvwu
+hDbmFiX8/Vtw/P0/9sox2DzyLG0mjJUAYAbKtyC1kQalybVBtrSaazyyAyh6oOuU
+chAb7SmmNDsRB959TWM/mp+6yCcFGzCDKNBwlwthB6Uw92d3SfOyXEnZm8rPf0hV
+4ICL5iB+xEYBv1LKmznFK/4UAyKpxAygc5fxKVWwlSsq8MrES5ak0n6H71wViaXK
+BrH5yh9jEkK9XSeaUwg8C9eOOexyx/5JDY3TTE8CAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEAUNddNiRUlJH0acJJv8ztXNWjNewd17tAk1BBHp6yyGAD8b52p6QbDAdS
+xO3WsSc2bqSy599jp4GshO27TMQsBRMfoggCG21Aj6sIs0Hd4shTE4T0GUBEBxC2
+/HReuD+cGIzzKMYlvK8RPSaGLPvPw5SryvmOnjD368V0KCHwT04Z14i4sMxlkd5q
+wB7fxTkVla9MR4uWObX62mJykmqT86chScJpldtBpRh8wrEa3Gt9FZoi/eqP0De8
+oCxmCZDrozGTZ4IIaNzchx3Ensh1RQwvvxd6ATerYdUjq4V2TlTksDRdCXtj+uNJ
+FnB32sUHiIouxudAsqDf8UL9/99RCw==
+-----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/client2.pem b/samples/net/wifi/test_certs/client2.pem
index 5386185fcf3..9e815474cd8 100644
--- a/samples/net/wifi/test_certs/client2.pem
+++ b/samples/net/wifi/test_certs/client2.pem
@@ -1,28 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIEsTCCAxmgAwIBAgIJAJfUB+ymBRUTMA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNV
-BAYTAlVTMRQwEgYDVQQHDAtTYW50YSBDbGFyYTEXMBUGA1UECgwOV2ktRmkgQWxs
-aWFuY2UxHzAdBgNVBAMMFlN1aXRlIEIgUlNBIDNrIFJvb3QgQ0EwHhcNMTkwODI3
-MDAyMjU2WhcNMjkwODI0MDAyMjU2WjA9MQswCQYDVQQGEwJVUzEXMBUGA1UECgwO
-V2ktRmkgQWxsaWFuY2UxFTATBgNVBAMMDHVzZXItcnNhMzA3MjCCAaIwDQYJKoZI
-hvcNAQEBBQADggGPADCCAYoCggGBAKbaPPkNgdG9pIXgX4DtXUWAFol2MhA1Znt7
-+uk24DOQwM10YkrNb8m25QOCrpO1/hGdqMiGmUD+HcDV0YukfrpErjyGOsFbkEum
-XRE+09kuawucjf9xtSePcWkWyy98GeaOE0IaXQoLqReCYo6lAumtdidwK+u3wMbu
-WigonwV0bHczGaLub0/8H2Ei7YwPRZUAX4Rz4xDLLjcwS2XXpsyS6L4xkpNY0T/y
-ilwJXETigQUzD1MJOhHn4hLq7AyET/I3QvHqEq6m1nRNi3hjtewhgd8Uncvjtuxt
-C5mHelWitNaWlCZRuzWfV/937xI1/b0yKnH6e8oE8mXNS2eojd/uWY5n9fjzQlFO
-9k4MzofN+VzX/8DpG+Am8/uhiVdNf5JkEkqRnTv20HkCheawLHDx48Ix/WRWOXFU
-tySjwsRrfQyMKtSoInrU8g2ESB37QmdXXhyxgAxkqHTYra/boc8bJnEBegnb/Hvn
-NbXnaN8tOQXp8TYQZzHsCH1S2Y2YzQIDAQABo4GTMIGQMAkGA1UdEwQCMAAwHQYD
-VR0OBBYEFNpIxeQyWBP8kE3g5lCfY7dW4aHdMB8GA1UdIwQYMBaAFLs7/OAtQSPp
-bjX5ehNx+w4s/GSWMCEGA1UdEQQaMBiBFnVzZXItcnNhMzA3MkB3MS1maS5vcmcw
-EwYDVR0lBAwwCgYIKwYBBQUHAwIwCwYDVR0PBAQDAgWgMA0GCSqGSIb3DQEBDAUA
-A4IBgQA+ZcZprt/VuxvlThQMVHW32jglsoFJtvM4eN87e+HU4MPz1xCh8/Cg98RM
-SMIQX4F0T6seycQCeTV858CdkaAI7NgvMscPHZz1393NMoYt80IaqOMoSf+zsxY0
-sdvLDICKTCzpOKcloNrNo5Y8nio2pi+W4/H3BV7xrDe8JmofF4GsHHf0LEdxd1Hw
-8DX0vqiAbgiKVP2zZTBomCUPEQOe8xGE/xyfvmyRXuEd1XQFZesZnSe6UKmCMDgW
-UoD0mYjQKKZaregbP4r3MLDz18WGGVvLDPWODgVtLbwiT9W2ARziz097d5S53hgz
-yQ6ycweXbSscaYQ23YLZ8bXy9WIOzZVaAp1t0+LMet515d44nRKfvqy08g/odIH6
-/4sfNEyif7DcE6AV6tJ2mG1Qdel8hA0MggYEvn7QldehVC4CVQGVU/yRMDgZ3JR5
-yJbgEoWihslZWsXFbKMt/pcV89OEIhjk1Q+swReQ1MBMuiXjz8DojU5F3gxQpFnb
-obAN27U=
------END CERTIFICATE-----
\ No newline at end of file
+MIIDojCCAooCFGZ4UJXBKG70aewILFtsy4mbvaYZMA0GCSqGSIb3DQEBCwUAMIGS
+MQswCQYDVQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hl
+cmUxFDASBgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRp
+ZmljYXRlIEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
+cmcwHhcNMjQxMDA4MTAyNjI1WhcNMzQxMDA2MTAyNjI1WjCBhzELMAkGA1UEBhMC
+RlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQK
+DAtFeGFtcGxlIEluYzEbMBkGA1UEAwwSY2xpZW50LmV4YW1wbGUub3JnMSAwHgYJ
+KoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMu3HXJvi2Q4hQnLL4v/sCyEr5x+ZtBcSi2yETMViaf2EStW
+UOs1A1pmCQbO7nadLQcWaX4tzefQCRrs1X4hIQuDIqRPNi6h6G1g5HEtqBWZhvwu
+hDbmFiX8/Vtw/P0/9sox2DzyLG0mjJUAYAbKtyC1kQalybVBtrSaazyyAyh6oOuU
+chAb7SmmNDsRB959TWM/mp+6yCcFGzCDKNBwlwthB6Uw92d3SfOyXEnZm8rPf0hV
+4ICL5iB+xEYBv1LKmznFK/4UAyKpxAygc5fxKVWwlSsq8MrES5ak0n6H71wViaXK
+BrH5yh9jEkK9XSeaUwg8C9eOOexyx/5JDY3TTE8CAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEAUNddNiRUlJH0acJJv8ztXNWjNewd17tAk1BBHp6yyGAD8b52p6QbDAdS
+xO3WsSc2bqSy599jp4GshO27TMQsBRMfoggCG21Aj6sIs0Hd4shTE4T0GUBEBxC2
+/HReuD+cGIzzKMYlvK8RPSaGLPvPw5SryvmOnjD368V0KCHwT04Z14i4sMxlkd5q
+wB7fxTkVla9MR4uWObX62mJykmqT86chScJpldtBpRh8wrEa3Gt9FZoi/eqP0De8
+oCxmCZDrozGTZ4IIaNzchx3Ensh1RQwvvxd6ATerYdUjq4V2TlTksDRdCXtj+uNJ
+FnB32sUHiIouxudAsqDf8UL9/99RCw==
+-----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/server-key.pem b/samples/net/wifi/test_certs/server-key.pem
index c5e19c72c7c..5f032cad701 100644
--- a/samples/net/wifi/test_certs/server-key.pem
+++ b/samples/net/wifi/test_certs/server-key.pem
@@ -1,40 +1,30 @@
------BEGIN PRIVATE KEY-----
-MIIG/QIBADANBgkqhkiG9w0BAQEFAASCBucwggbjAgEAAoIBgQCxz8vr2/UJ40kU
-U6MNpdwyTm1SYOZ45bicgcCzScIG/1/KJGGnVHN9LmJ8BBTfyVO5EK7qrAD0gMrr
-Piy/J4zIw4iZvfbSX24nfsnItKGyBT1gpuDAzwBR4CqES+5JGXgx+yVoaBtHIRij
-xSdF0JQYHaX5tf44EJGF2QVtamfexIHpo1kCIslZnuWJsJi+0iiEl6rWvLiHsrkJ
-0YdBU57a1yMJNXWz/FJWpBUXNqKmFiQOtSdioJotlW2YsRMVH+vwoDCIbMD7/Z7t
-2DJQZu9cThGJFGHx49onoLpR3yj2Pm8KGa+eNVh+sL2BvK5tQEIzXZVIqmxJVAju
-WvuSma7pb55MScTwbqbEBDFLIs/ledkU2nyQjWfdiPUA0XHx0d9bF1u3SjGuMlc9
-5aTPTL96+6tq8nUumWU8pYz90Sz3CKKRgH0staa+JHZSPsT89OolbqAbLSzXwq/A
-KMMsV5xrebaFPu99+pFV8AiAhDijosLrQI4B9Jx2v8/89h2Ozb0CAwEAAQKCAYEA
-i0sJqL8q+o/+09mhRjPEh/RAV+RpKBRtxs0utET3ppuv4p8VkQvrXQlVRWm9IIKK
-/9M988DDDsdGL3sJesX01+G1xRq3nJ39oRsF4CEA+oB4UJrqPqDq0zkUlYcWKFW3
-fxALgfrsQ5B9yO3NkjePjETNnQ0hFbKFDaGxSsGslSrDys+YDsBJk9eSYYbiYboo
-25Yk0wwMUuGDa1mk51wmebFHVRN4HYNwzUbE7uZyDEIUBSGMtQqzPTpuHMu68zWJ
-RR8aljmZr5yR5uHNJXoOts/RGX9p0vfcfKrbBc56Rl+OaTrV5/yoTX3PLXHuTfib
-RJ8INT34HC2Y1giSkJyv8/AfsbdwnnJXcpSvX67C+MbfqCyZznkAtQBu8fovggbG
-7oJZaz9XcOFWYdArWb/XELXS+EL4chEL1R2o8NXegL0xbrD0vOYe2BMFnmRkLjQd
-0vm3NL9Hrc+F48SiHD64ef/i+aEsw02hLQX+DigmmnZzCTmCDtE5srzaqJcCBuzR
-AoHBANoxtX5OhZiXy8n+C1keE0/xQxK+SfSueqCv6XL47WtIZlErL48v1EwWxDId
-7fAGKvnIhPdbm8TqFSJ3V/Y0XOYPockA5T8vzeQHKhFh4GlHqSskx+B6Z/t7SJG1
-jQAV9ieB/YTQnYcBNb9sCUNDnl8PNibvq2pivu0m0VY8KgKZedfZ1oVkFKDiZ8Ns
-59Twy8Ps/rtUfPYy1mU/Rgse+wn5XE20nay9PCS/lsOHXJlWsICLjAHqCegc8j4M
-WR2EzwKBwQDQnt6pFR4K3lj/LIbeCaGp4RC26spekuZvgg9vsieSuw0qkx1LbG78
-I8suTkDWtSsBNHa3W6H5SSgs0S/DA5CZUxVgKj7xRo5+ZQOdF2LFr5UFbsUWa5nz
-o75VQQZ90c5oiEOfMZ893bPgxgNLMm6smoYRvRhdyT1EVo136xl10mq0kqshzzVg
-fCEuDegnPJqlSIkbwprz74dnGynffyyETezohAFBV1G/kGgQXmOYs9c4ZuKQgoWc
-3VHC5NkEP7MCgcAjP2J9W/vy8ZqnL9XveI9QG75lGb5iu4jtyl0hCJt5+EEnHZ3a
-OLTH8emR2wnj+2sX3M+2EeNxBQuS/MqF6GGVfLL7AJ0H/xX4nzupgTE6cKwgXxm2
-5q9Djd/kQfrcJ7ATI8mrmfPIqmZfXPmGFzdPTerGkXMUhY0oTFwG3UNAFkD7oKIp
-/Efk0Y5HoKE24gtYxEFGS9jAAOhnhLgw9blCHDlQCDxseklr+lNFlOldkAaFTYW5
-jXA6QerUITSIMzsCgcBZhpPOw30s9NYESztlNYTmverKVF+bzjaNS6cMK8vHr/Wq
-e49qupG2KjYbHQG+Iejej4ESloQf0kEnWm3Aplr7MShPKFHygHDN1NOEKnD8nKi6
-uBpj0LE0WORo+Yqrm8mUGkXKnyTTC70RjGgFcRMFhxpZqmg2dxGPrgTvnThD05Rv
-ATHnRGCHkz054kXp8Jv8qfAMtaqBXB0jJgkGHDEiZb5w2ZUgUTSHnJTL0XW0JhkJ
-3z0C/sAP3PolRMfMhvkCgcBYnh6w1UtwydPk68+vnc0+32L036dFwyUTcu9NTu70
-5UrJw4zKxiEPJnN02tiU2kjIc5VfqtQReSMcTpCWQWmrtAwPlnYpJOH/LToEL+x4
-t8GSWH37mMfkI4ZnNzabLHmYcMxtxT0pokKpqJoer/zB4b0FFv9bTEdZ5Xx9N4um
-EQlxmBsVk2K0268x7rky+JQWz4b5DqhAgH5mkxRPAZ1zn0G5rzyhkO6DSgA/WIiY
-6pTLxwpk9r34uvoqBzPSkss=
------END PRIVATE KEY-----
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIjI78fcZSH7oCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDfF676hRrL290F0MgMDZiuBIIE
+0Hkz7skRV8Ox0SoX5N8GsOPfN4PS1cLyHgokY6dUhJPU5vUzOn9iSiGQSEzSguQ7
+11mssjRC2T45wB/95VK2EPtRw1f/6VOUR6RJnnGb0PV1Rydp/x5TZ6vzcXpakqly
+eljJR/20fIJClsZzhw0iu5la9fkF6G8WYFEkqex5jALSiN4qVLvkiqcTnh5+amem
+8+OCKgvgooKD2ids4/0GGfJRQSC6DFf3kuxNl+MMvmDXmz/vrD85ONnyXzKXDA3N
+3vRgL/YT6GzwIXb+7/c/tIMpnacxPAdbNOs3DY5ss4xcK68L5PwpM2BljzBa5dGw
+Smgf2VRaYRVzmrte5j280QjfrlHRU2cHaxm0GCu2AOTGwMXcSNYMXfDNuxc57oQJ
+vHXMeZD4K5lACbhYdZ5lJNFvv29YI7dZ7QOGu6nXlAuhZfbdc/cgT0som7eG8xpT
+pERllhQ5ych9sP9nAccN6VUsWgmlF73lbSptBek1ccYkp9LIYCteJUPl2qPcz6zl
+A7zrZ54f3Lg0fOm2pCtg+qKBiw1nd3MR/YbRCgyvudyZE2cCN/ZspWqxsavbGYOz
+JOfIFNnyAcOYtEv1n1BGLfMa1THW2bDV8XmHVHUtM0k4z250QAmLygWLY2166iUF
+qotBkvctKKdulzGdT4nVer1UEKTqcxhDf0dRiHN5spZtFrOee0uGIoQWHt2oecaK
+pJovW+i0qO/1DG5spfU2m1bz6jR2u6nxi340oRrMSoe1ELVg3l1/wmM8yzh07GuK
+pshzxwqAG/FnaKCvcKGUG2EfnAvOcbMgSa2w3GvyRkcDPn00arvX9nuXj0gkRDBi
+eoVMkKKTeeYSGQ4ik+ja3xkgHcxh5W8aoezLvBbmUq206cmhLwfnYMhnvFTs6EBK
+E0ENpCHwF/qoVBIzRCijG/eeCuf3a1YkJsWlvEeVrPeOmDFeDft3SSGOzHxE2A/7
+HWmHbWTm7dPOfgsU4zf+HglnBjN3kYU7StyM0EGxmB4lfB2BiWiL/3R13ERHQZfa
+oOqa4/hOFXOXfTQk6ufXtBx8L9BemBqh36zbs2xVvIizJKeRMruoRblWZkHhUKR8
+K5GA7FYkU9ZPPP0UPKsO94xzwfbevi+7nWeUZoqcqAUy8Jt5aD2QpvFVbPBBOz17
+PGaubeVn/Ry8swPvkpddtmJ4mgF+3SVctmzY+EE/oN1XS8wa+XeuaThzk89Lvrfa
+606nRWrNw3PSKjYoEEtRLhPeJCi9uOVenbOjtclio9mV5Sugwurolczvq8DAGpMG
+W4WgALgOWDjQAudiNH5dtcMGkBONbYywkJc7cT2OZFmzkCbchPPWlKGopuaFGAoU
+SPj7C9SenHmOWAFRX5jJrOZAuVqkdKN3ShWZUL+cDkOCCQlZ0E31u0m9yozY1MeO
+Sx42GtZaSGff37FGYeMZM2ztlutw2zmv2B1g52SBHTjCqQU/ud2Q6/U0kUzjbsdF
+/0KQY9wgZRdOvbnA2lBirN1rXzLWPdduOZ5QImfHfvToN+oOlEqVvvWG12DdA4e5
+y4Dumx00lfKEsGutjF3oKgE6jsjwqAwCoYEAFHTtsvA0hKPisQwNHZmpjGARvR56
+yMEmXynKvgyVGvVP2a9VdqBXSpstL24HfDIu+nlyEWGQ
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/server-key2.pem b/samples/net/wifi/test_certs/server-key2.pem
new file mode 100644
index 00000000000..5f032cad701
--- /dev/null
+++ b/samples/net/wifi/test_certs/server-key2.pem
@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIjI78fcZSH7oCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDfF676hRrL290F0MgMDZiuBIIE
+0Hkz7skRV8Ox0SoX5N8GsOPfN4PS1cLyHgokY6dUhJPU5vUzOn9iSiGQSEzSguQ7
+11mssjRC2T45wB/95VK2EPtRw1f/6VOUR6RJnnGb0PV1Rydp/x5TZ6vzcXpakqly
+eljJR/20fIJClsZzhw0iu5la9fkF6G8WYFEkqex5jALSiN4qVLvkiqcTnh5+amem
+8+OCKgvgooKD2ids4/0GGfJRQSC6DFf3kuxNl+MMvmDXmz/vrD85ONnyXzKXDA3N
+3vRgL/YT6GzwIXb+7/c/tIMpnacxPAdbNOs3DY5ss4xcK68L5PwpM2BljzBa5dGw
+Smgf2VRaYRVzmrte5j280QjfrlHRU2cHaxm0GCu2AOTGwMXcSNYMXfDNuxc57oQJ
+vHXMeZD4K5lACbhYdZ5lJNFvv29YI7dZ7QOGu6nXlAuhZfbdc/cgT0som7eG8xpT
+pERllhQ5ych9sP9nAccN6VUsWgmlF73lbSptBek1ccYkp9LIYCteJUPl2qPcz6zl
+A7zrZ54f3Lg0fOm2pCtg+qKBiw1nd3MR/YbRCgyvudyZE2cCN/ZspWqxsavbGYOz
+JOfIFNnyAcOYtEv1n1BGLfMa1THW2bDV8XmHVHUtM0k4z250QAmLygWLY2166iUF
+qotBkvctKKdulzGdT4nVer1UEKTqcxhDf0dRiHN5spZtFrOee0uGIoQWHt2oecaK
+pJovW+i0qO/1DG5spfU2m1bz6jR2u6nxi340oRrMSoe1ELVg3l1/wmM8yzh07GuK
+pshzxwqAG/FnaKCvcKGUG2EfnAvOcbMgSa2w3GvyRkcDPn00arvX9nuXj0gkRDBi
+eoVMkKKTeeYSGQ4ik+ja3xkgHcxh5W8aoezLvBbmUq206cmhLwfnYMhnvFTs6EBK
+E0ENpCHwF/qoVBIzRCijG/eeCuf3a1YkJsWlvEeVrPeOmDFeDft3SSGOzHxE2A/7
+HWmHbWTm7dPOfgsU4zf+HglnBjN3kYU7StyM0EGxmB4lfB2BiWiL/3R13ERHQZfa
+oOqa4/hOFXOXfTQk6ufXtBx8L9BemBqh36zbs2xVvIizJKeRMruoRblWZkHhUKR8
+K5GA7FYkU9ZPPP0UPKsO94xzwfbevi+7nWeUZoqcqAUy8Jt5aD2QpvFVbPBBOz17
+PGaubeVn/Ry8swPvkpddtmJ4mgF+3SVctmzY+EE/oN1XS8wa+XeuaThzk89Lvrfa
+606nRWrNw3PSKjYoEEtRLhPeJCi9uOVenbOjtclio9mV5Sugwurolczvq8DAGpMG
+W4WgALgOWDjQAudiNH5dtcMGkBONbYywkJc7cT2OZFmzkCbchPPWlKGopuaFGAoU
+SPj7C9SenHmOWAFRX5jJrOZAuVqkdKN3ShWZUL+cDkOCCQlZ0E31u0m9yozY1MeO
+Sx42GtZaSGff37FGYeMZM2ztlutw2zmv2B1g52SBHTjCqQU/ud2Q6/U0kUzjbsdF
+/0KQY9wgZRdOvbnA2lBirN1rXzLWPdduOZ5QImfHfvToN+oOlEqVvvWG12DdA4e5
+y4Dumx00lfKEsGutjF3oKgE6jsjwqAwCoYEAFHTtsvA0hKPisQwNHZmpjGARvR56
+yMEmXynKvgyVGvVP2a9VdqBXSpstL24HfDIu+nlyEWGQ
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/server.pem b/samples/net/wifi/test_certs/server.pem
index 2b2032fe406..d8f82faf6dd 100644
--- a/samples/net/wifi/test_certs/server.pem
+++ b/samples/net/wifi/test_certs/server.pem
@@ -1,28 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIEyDCCAzCgAwIBAgIJAJfUB+ymBRUSMA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNV
-BAYTAlVTMRQwEgYDVQQHDAtTYW50YSBDbGFyYTEXMBUGA1UECgwOV2ktRmkgQWxs
-aWFuY2UxHzAdBgNVBAMMFlN1aXRlIEIgUlNBIDNrIFJvb3QgQ0EwHhcNMTkwODI3
-MDAyMjU2WhcNMjkwODI0MDAyMjU2WjBJMQswCQYDVQQGEwJVUzEXMBUGA1UECgwO
-V2ktRmkgQWxsaWFuY2UxITAfBgNVBAMMGHJzYTMwNzIuc2VydmVyLncxLWZpLm9y
-ZzCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALHPy+vb9QnjSRRTow2l
-3DJObVJg5njluJyBwLNJwgb/X8okYadUc30uYnwEFN/JU7kQruqsAPSAyus+LL8n
-jMjDiJm99tJfbid+yci0obIFPWCm4MDPAFHgKoRL7kkZeDH7JWhoG0chGKPFJ0XQ
-lBgdpfm1/jgQkYXZBW1qZ97EgemjWQIiyVme5YmwmL7SKISXqta8uIeyuQnRh0FT
-ntrXIwk1dbP8UlakFRc2oqYWJA61J2Kgmi2VbZixExUf6/CgMIhswPv9nu3YMlBm
-71xOEYkUYfHj2iegulHfKPY+bwoZr541WH6wvYG8rm1AQjNdlUiqbElUCO5a+5KZ
-rulvnkxJxPBupsQEMUsiz+V52RTafJCNZ92I9QDRcfHR31sXW7dKMa4yVz3lpM9M
-v3r7q2rydS6ZZTyljP3RLPcIopGAfSy1pr4kdlI+xPz06iVuoBstLNfCr8AowyxX
-nGt5toU+7336kVXwCICEOKOiwutAjgH0nHa/z/z2HY7NvQIDAQABo4GeMIGbMAwG
-A1UdEwEB/wQCMAAwHQYDVR0OBBYEFONspF14yc8Y4OEAxOr7Yz27cW6xMB8GA1Ud
-IwQYMBaAFLs7/OAtQSPpbjX5ehNx+w4s/GSWMCYGA1UdEQEB/wQcMBqCGHJzYTMw
-NzIuc2VydmVyLncxLWZpLm9yZzAWBgNVHSUBAf8EDDAKBggrBgEFBQcDATALBgNV
-HQ8EBAMCBaAwDQYJKoZIhvcNAQEMBQADggGBAF6N1MxicmvDftBeaeoukI0Ri52F
-U0VjBZd3Mfcs8X7AOfYeUoOHnVw+TGLnkHLd3XUnkWdD88zrfSh5yl0VPN1b3zXW
-PSItGU6BCILqhgCFMwCiE/rSbdmddqdHLslcaAXC9/vZvBUn5UzB8lGHn54rU5UJ
-Kb75CtB9+5yVdcIjVMaJ9Kc+RSDE8TrgRFaP0sgUxYNgV5IWjlkgxo5VjtKcXjsn
-FXeSHAyIPhaAhi/eFDQdmeI/wI0q0mzSwESXE5JgN8adUaMSJwKxcP1YtHjYRhTi
-ztFpYzG0xe1ePnoiOSAU454QJNGJUcS68WDnEIQRRdfky0ffX5KAEfgHJNt6BdPg
-B4xNvLpteH+6lJQyLv12hpuOGjeMpLMmuXNhTh9J+rf1IZYTPToHrIEG2K4LpBBx
-0XFxbQP+8KCXyFJg14R/qQ002wJIyY85QtRr8z8XD+qwcZCh9Gv7nyjdFkJY2hae
-bJiYUtdUyQOqq39CwkHxaamck9cOnxZZIrrYRw==
+MIIDojCCAooCFCPQcj7ej5jhr6/mLlAoLYgfgsYcMA0GCSqGSIb3DQEBCwUAMIGS
+MQswCQYDVQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hl
+cmUxFDASBgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRp
+ZmljYXRlIEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
+cmcwHhcNMjQxMDA4MTAyNTI5WhcNMzQxMDA2MTAyNTI5WjCBhzELMAkGA1UEBhMC
+RlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQK
+DAtFeGFtcGxlIEluYzEbMBkGA1UEAwwSc2VydmVyLmV4YW1wbGUub3JnMSAwHgYJ
+KoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBANcE/OPHQK/y1b6UsIktNK7WIZB528HECY7Bz18EGba0uHod
+91RbzHSJ1qI3iQyldI1UW/kY5oYjBW3lhLH0BkD/EsqvNYCV+3YzAM3ITtdOdEU9
+CqjgXttehQHfXvc7jQlF8Q2gYPUz2dDLo/gcTkz1d+mCr6nQUjT8Kq/nG54T0NnD
+k8udchjUlNaQsvx/WVs3TUYxMbWzQRtpJIbv99rAWq7YgQbkNZnSYC1VgrU/BiuQ
+0KrP6rfkxvBCGwIh2JXIL3FV4N8AsgGZvjXQ3zXKXwuPhxWdSmjKWlioVM3mha2A
+/1e1gX6nFY/uk46D60XWxcJ6tHGHoafU7EtN3zMCAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEAWwdTMphD0jxLtYO0iq/+fMtq2R96ZUN9wprZ7qg1evUNQjqLR4jKX306
+ZJX5uw+6r5Ve/k368qvcSF/sSfvBm8yd3JcegTl5t8T2/Aks8o3sfyuS0uyJC1rS
+zTrd7FmJG9YMosU1BqYobda64MXq7g+6MyrQoZ6fVdPvC6Sox3+a4fl9xjdm4CTY
+MsWqBJMe26LptvRIJ01/B6PjVTvsn/fxxj7rHmnJ/j63AIiBntm0vV/85cwYy/4o
+HlPH/Qjvn3hZjUlBcveiYat998F+s9gH2usvCkG3kly/n1/667LLCymmCHxtH8ka
+7tF3siO1EANureFY8qj6ZvlKeTkZ6g==
 -----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/server2.pem b/samples/net/wifi/test_certs/server2.pem
new file mode 100644
index 00000000000..d8f82faf6dd
--- /dev/null
+++ b/samples/net/wifi/test_certs/server2.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDojCCAooCFCPQcj7ej5jhr6/mLlAoLYgfgsYcMA0GCSqGSIb3DQEBCwUAMIGS
+MQswCQYDVQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hl
+cmUxFDASBgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRp
+ZmljYXRlIEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
+cmcwHhcNMjQxMDA4MTAyNTI5WhcNMzQxMDA2MTAyNTI5WjCBhzELMAkGA1UEBhMC
+RlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQK
+DAtFeGFtcGxlIEluYzEbMBkGA1UEAwwSc2VydmVyLmV4YW1wbGUub3JnMSAwHgYJ
+KoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBANcE/OPHQK/y1b6UsIktNK7WIZB528HECY7Bz18EGba0uHod
+91RbzHSJ1qI3iQyldI1UW/kY5oYjBW3lhLH0BkD/EsqvNYCV+3YzAM3ITtdOdEU9
+CqjgXttehQHfXvc7jQlF8Q2gYPUz2dDLo/gcTkz1d+mCr6nQUjT8Kq/nG54T0NnD
+k8udchjUlNaQsvx/WVs3TUYxMbWzQRtpJIbv99rAWq7YgQbkNZnSYC1VgrU/BiuQ
+0KrP6rfkxvBCGwIh2JXIL3FV4N8AsgGZvjXQ3zXKXwuPhxWdSmjKWlioVM3mha2A
+/1e1gX6nFY/uk46D60XWxcJ6tHGHoafU7EtN3zMCAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEAWwdTMphD0jxLtYO0iq/+fMtq2R96ZUN9wprZ7qg1evUNQjqLR4jKX306
+ZJX5uw+6r5Ve/k368qvcSF/sSfvBm8yd3JcegTl5t8T2/Aks8o3sfyuS0uyJC1rS
+zTrd7FmJG9YMosU1BqYobda64MXq7g+6MyrQoZ6fVdPvC6Sox3+a4fl9xjdm4CTY
+MsWqBJMe26LptvRIJ01/B6PjVTvsn/fxxj7rHmnJ/j63AIiBntm0vV/85cwYy/4o
+HlPH/Qjvn3hZjUlBcveiYat998F+s9gH2usvCkG3kly/n1/667LLCymmCHxtH8ka
+7tF3siO1EANureFY8qj6ZvlKeTkZ6g==
+-----END CERTIFICATE-----

From 14d166ffe235587818ce069c85c5b819c0b170a5 Mon Sep 17 00:00:00 2001
From: Riadh Ghaddab <rghaddab@baylibre.com>
Date: Fri, 11 Oct 2024 10:06:38 +0200
Subject: [PATCH 2161/2913] [nrf noup] settings: zms: use dedicated lookup
 cache hash function

Introduce ZMS_LOOKUP_CACHE_FOR_SETTINGS Kconfig option that enables a
dedicated hash function for the ZMS lookup cache that takes advantage
of the ZMS ID allocation scheme used by the ZMS settings backend.
As such, this option should only be used if an application uses ZMS via
the settings layer.

Signed-off-by: Riadh Ghaddab <rghaddab@baylibre.com>
(cherry picked from commit 031c3c0bec0931ae011c78d36637a57c5cdfd3aa)
---
 subsys/fs/zms/Kconfig |  9 +++++++++
 subsys/fs/zms/zms.c   | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/subsys/fs/zms/Kconfig b/subsys/fs/zms/Kconfig
index 781da81bf0a..e1312c57fd8 100644
--- a/subsys/fs/zms/Kconfig
+++ b/subsys/fs/zms/Kconfig
@@ -50,6 +50,15 @@ config ZMS_CUSTOM_BLOCK_SIZE
 	help
 	  Changes the internal buffer size of ZMS
 
+config ZMS_LOOKUP_CACHE_FOR_SETTINGS
+	bool "ZMS Storage lookup cache optimized for settings"
+	depends on ZMS_LOOKUP_CACHE
+	help
+	  Use the lookup cache hash function that results in the least number of
+	  collissions and, in turn, the best ZMS performance provided that the ZMS
+	  is used as the settings backend only. This option should NOT be enabled
+	  if the ZMS is also written to directly, outside the settings layer.
+
 config ZMS_NO_DOUBLE_WRITE
 	bool "Avoid writing the same data again in the storage"
 	help
diff --git a/subsys/fs/zms/zms.c b/subsys/fs/zms/zms.c
index 0e5ca1e5f3b..99096ab0c17 100644
--- a/subsys/fs/zms/zms.c
+++ b/subsys/fs/zms/zms.c
@@ -11,6 +11,10 @@
 #include <zephyr/fs/zms.h>
 #include <zephyr/sys/crc.h>
 #include "zms_priv.h"
+#ifdef CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS
+#include <zephyr/sys/util.h>
+#include <settings/settings_zms.h>
+#endif
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(fs_zms, CONFIG_ZMS_LOG_LEVEL);
@@ -25,6 +29,45 @@ static int zms_ate_valid_different_sector(struct zms_fs *fs, const struct zms_at
 
 #ifdef CONFIG_ZMS_LOOKUP_CACHE
 
+#ifdef CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS
+
+static inline size_t zms_lookup_cache_pos(uint32_t id)
+{
+	/*
+	 * 1. The ZMS settings backend uses up to (ZMS_NAME_ID_OFFSET - 1) ZMS IDs to
+	      store keys and equal number of ZMS IDs to store values.
+	 * 2. For each key-value pair, the value is stored at ZMS ID greater by exactly
+	 *    ZMS_NAME_ID_OFFSET than ZMS ID that holds the key.
+	 * 3. The backend tries to minimize the range of ZMS IDs used to store keys.
+	 *    That is, ZMS IDs are allocated sequentially, and freed ZMS IDs are reused
+	 *    before allocating new ones.
+	 *
+	 * Therefore, to assure the least number of collisions in the lookup cache,
+	 * the least significant bit of the hash indicates whether the given ZMS ID
+	 * represents a key or a value, and remaining bits of the hash are set to
+	 * the ordinal number of the key-value pair. Consequently, the hash function
+	 * provides the following mapping:
+	 *
+	 * 1st settings key   => hash 0
+	 * 1st settings value => hash 1
+	 * 2nd settings key   => hash 2
+	 * 2nd settings value => hash 3
+	 * ...
+	 */
+	BUILD_ASSERT(IS_POWER_OF_TWO(ZMS_NAMECNT_ID), "ZMS_NAMECNT_ID is not power of 2");
+	BUILD_ASSERT(IS_POWER_OF_TWO(ZMS_NAME_ID_OFFSET), "ZMS_NAME_ID_OFFSET is not power of 2");
+
+	uint32_t key_value_bit;
+	uint32_t key_value_ord;
+
+	key_value_bit = (id >> LOG2(ZMS_NAME_ID_OFFSET)) & 1;
+	key_value_ord = id & (ZMS_NAME_ID_OFFSET - 1);
+
+	return ((key_value_ord << 1) | key_value_bit) % CONFIG_ZMS_LOOKUP_CACHE_SIZE;
+}
+
+#else /* CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS */
+
 static inline size_t zms_lookup_cache_pos(uint32_t id)
 {
 	uint32_t hash;
@@ -40,6 +83,8 @@ static inline size_t zms_lookup_cache_pos(uint32_t id)
 	return hash % CONFIG_ZMS_LOOKUP_CACHE_SIZE;
 }
 
+#endif /* CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS */
+
 static int zms_lookup_cache_rebuild(struct zms_fs *fs)
 {
 	int rc;

From 6cb845ed293df687a7bd6f1aa9bb38e0bab0ad3c Mon Sep 17 00:00:00 2001
From: Marek Pieta <Marek.Pieta@nordicsemi.no>
Date: Fri, 14 Jun 2024 12:08:55 +0200
Subject: [PATCH 2162/2913] [nrf noup] bluetooth: conn: Allow for an extra ref
 in bt_l2cap_send_pdu

Allow for an additional buffer reference if callback is provided. This
can be used to extend lifetime of the net buffer until the data
transmission is confirmed by ACK of the remote.

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
(cherry picked from commit db5300cf406ff1124e4047a6a3b2e0f1be0d94f8)
---
 subsys/bluetooth/host/conn.c  | 8 +++++++-
 subsys/bluetooth/host/l2cap.c | 8 ++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 66b16749a54..713e68cb862 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -695,7 +695,13 @@ static int send_buf(struct bt_conn *conn, struct net_buf *buf,
 
 	uint16_t frag_len = MIN(conn_mtu(conn), len);
 
-	__ASSERT_NO_MSG(buf->ref == 1);
+	if (buf->ref > 1 + (cb ? 1 : 0)) {
+		/* Allow for an additional buffer reference if callback is provided.
+		 * This can be used to extend lifetime of the net buffer until the
+		 * data transmission is confirmed by ACK of the remote.
+		 */
+		__ASSERT_NO_MSG(false);
+	}
 
 	if (buf->len > frag_len) {
 		LOG_DBG("keep %p around", buf);
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index 03b68592d5c..dcaa70a7868 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -724,13 +724,17 @@ int bt_l2cap_send_pdu(struct bt_l2cap_le_chan *le_chan, struct net_buf *pdu,
 		return -ENOTCONN;
 	}
 
-	if (pdu->ref != 1) {
+	/* Allow for an additional buffer reference if callback is provided. This can be used to
+	 * extend lifetime of the net buffer until the data transmission is confirmed by ACK of the
+	 * remote.
+	 */
+	if (pdu->ref > 1 + (cb ? 1 : 0)) {
 		/* The host may alter the buf contents when fragmenting. Higher
 		 * layers cannot expect the buf contents to stay intact. Extra
 		 * refs suggests a silent data corruption would occur if not for
 		 * this error.
 		 */
-		LOG_ERR("Expecting 1 ref, got %d", pdu->ref);
+		LOG_ERR("Expecting up to %d refs, got %d", cb ? 2 : 1, pdu->ref);
 		return -EINVAL;
 	}
 

From 96143b5fbec574b2b91d74f964d08a76025b3cf5 Mon Sep 17 00:00:00 2001
From: Marek Pieta <Marek.Pieta@nordicsemi.no>
Date: Wed, 7 Aug 2024 10:29:21 +0200
Subject: [PATCH 2163/2913] [nrf noup] bluetooth: conn: Skip buffer ref count
 check in send_buf

If ATT sent callback is delayed until data transmission is done by BLE
controller, the transmitted buffer may have an additional reference. The
reference is used to extend lifetime of the net buffer until the data
transmission is confirmed by ACK of the remote.

send_buf function can be called multiple times, if buffer has to be
fragmented over HCI. In that case, the callback is provided as an
argument only for the last transmitted fragment. The `buf->ref == 1`
check is skipped because it's impossible to properly validate number of
references for the sent fragments if buffers may have the additional
reference.

Jira: NCSDK-28624

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
(cherry picked from commit 2f78c568f7016f5f9497a2420e55973a46d46018)
---
 subsys/bluetooth/host/conn.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 713e68cb862..740b82d8cc3 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -695,13 +695,17 @@ static int send_buf(struct bt_conn *conn, struct net_buf *buf,
 
 	uint16_t frag_len = MIN(conn_mtu(conn), len);
 
-	if (buf->ref > 1 + (cb ? 1 : 0)) {
-		/* Allow for an additional buffer reference if callback is provided.
-		 * This can be used to extend lifetime of the net buffer until the
-		 * data transmission is confirmed by ACK of the remote.
-		 */
-		__ASSERT_NO_MSG(false);
-	}
+	/* If ATT sent callback is delayed until data transmission is done by BLE controller, the
+	 * transmitted buffer may have an additional reference. The reference is used to extend
+	 * lifetime of the net buffer until the data transmission is confirmed by ACK of the remote.
+	 *
+	 * send_buf function can be called multiple times, if buffer has to be fragmented over HCI.
+	 * In that case, the callback is provided as an argument only for the last transmitted
+	 * fragment. The `buf->ref == 1` check is skipped because it's impossible to properly
+	 * validate number of references for the sent fragments if buffers may have the additional
+	 * reference.
+	 */
+	__ASSERT_NO_MSG(IS_ENABLED(CONFIG_BT_ATT_SENT_CB_AFTER_TX) || (buf->ref == 1));
 
 	if (buf->len > frag_len) {
 		LOG_DBG("keep %p around", buf);

From b381f5633df2f28c318bc86cf6fc9d059e57a056 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Wed, 30 Oct 2024 16:37:13 +0100
Subject: [PATCH 2164/2913] [nrf noup] moduled: hal_nordic: require nrf-regtool

Upstream not ready yet, revert once applied there.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 8758068d4570a4e34e0da2391144af7d5274e45c)
---
 modules/hal_nordic/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt
index 5209efdced9..0d3f2a2f5eb 100644
--- a/modules/hal_nordic/CMakeLists.txt
+++ b/modules/hal_nordic/CMakeLists.txt
@@ -12,7 +12,7 @@ if(CONFIG_NRF_REGTOOL_GENERATE_UICR)
   list(APPEND nrf_regtool_components GENERATE:UICR)
 endif()
 if(DEFINED nrf_regtool_components)
-  find_package(nrf-regtool 8.0.0
+  find_package(nrf-regtool 8.0.0 REQUIRED
     COMPONENTS ${nrf_regtool_components}
     PATHS ${CMAKE_CURRENT_LIST_DIR}/nrf-regtool
     NO_CMAKE_PATH

From 2ada43b2e34ee2f04e617301ca8cfb3cc0daab0d Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Wed, 23 Oct 2024 13:52:42 +0200
Subject: [PATCH 2165/2913] [nrf noup] sample/smp_svr: nrf54l15dk test cases

Added nrf54l15dk testcases as copies of nrf54l15pdk.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Signed-off-by: Mateusz Michalek <mateusz.michalek@nordicsemi.no>
(cherry picked from commit f478e8de4645d63d6835c29c49a7b1e818759000)
---
 ...54l15dk_nrf54l15_cpuapp_ext_flash.overlay} |  0
 .../subsys/mgmt/mcumgr/smp_svr/sample.yaml    | 33 +++++++++++--------
 2 files changed, 19 insertions(+), 14 deletions(-)
 rename samples/subsys/mgmt/mcumgr/smp_svr/boards/{nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay => nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay} (100%)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay
similarity index 100%
rename from samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay
rename to samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 4d1fcca58ac..38ee2c5a2c6 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -14,11 +14,12 @@ tests:
       - nrf52840dk/nrf52840
       - pinnacle_100_dvk
       - mg100
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l10/cpuapp
     integration_platforms:
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
   sample.mcumgr.smp_svr.bt_static_svc:
     harness: bluetooth
     tags: bluetooth
@@ -167,29 +168,33 @@ tests:
       - mg100
     integration_platforms:
       - nrf52840dk/nrf52840
-  sample.mcumgr.smp_svr.bt.nrf54l15pdk.ext_flash:
+  sample.mcumgr.smp_svr.bt.nrf54l15dk.ext_flash:
     extra_args:
       - OVERLAY_CONFIG="overlay-bt.conf"
-      - DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
-      - mcuboot_CONF_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.conf"
-      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
+      - DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
+      - mcuboot_CONF_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.conf"
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
     extra_configs:
       - CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
     platform_allow:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l10/cpuapp
+      - nrf54l15dk/nrf54l05/cpuapp
     integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp
-  sample.mcumgr.smp_svr.bt.nrf54l15pdk.ext_flash.pure_dts:
+      - nrf54l15dk/nrf54l15/cpuapp
+  sample.mcumgr.smp_svr.bt.nrf54l15dk.ext_flash.pure_dts:
     extra_args:
       - OVERLAY_CONFIG="overlay-bt.conf"
-      - DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
-      - mcuboot_CONF_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.conf"
-      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_ext_flash.overlay"
+      - DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
+      - mcuboot_CONF_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.conf"
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
       - SB_CONFIG_PARTITION_MANAGER=n
     platform_allow:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l10/cpuapp
+      - nrf54l15dk/nrf54l05/cpuapp
     integration_platforms:
-      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
   sample.mcumgr.smp_svr.ram_load:
     extra_args: FILE_SUFFIX="ram_load"
     platform_allow:

From 7699be64128369443c3cc406489c662d57704b3a Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Tue, 12 Nov 2024 11:13:38 +0000
Subject: [PATCH 2166/2913] [nrf noup] mcuboot: Add
 CONFIG_MCUBOOT_BOOTLOADER_USES_SHA512

The option notifies application that MCUboot has been configured
to use SHA512 for image hashing.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit b5fda5ef3743044a9470cfb1e1e7747fa094b7a5)
---
 modules/Kconfig.mcuboot | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/Kconfig.mcuboot b/modules/Kconfig.mcuboot
index 2706ad6583c..0e84cca48f2 100644
--- a/modules/Kconfig.mcuboot
+++ b/modules/Kconfig.mcuboot
@@ -256,6 +256,11 @@ config MCUBOOT_BOOTLOADER_NO_DOWNGRADE
 	  MCUBOOT_DOWNGRADE_PREVENTION option enabled.
 endif
 
+config MCUBOOT_BOOTLOADER_USES_SHA512
+	bool "MCUboot uses SHA512 for image hash"
+	help
+	  MCUboot has been compiled to verify images using SHA512.
+
 config MCUBOOT_APPLICATION_FIRMWARE_UPDATER
 	bool "Application is firmware updater image"
 	depends on MCUBOOT_BOOTLOADER_MODE_FIRMWARE_UPDATER

From a704a3e66cbf54d5624c6b56a8d1f3593adc2317 Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Tue, 12 Nov 2024 12:50:38 +0000
Subject: [PATCH 2167/2913] [nrf noup] mgmt/mcumgr: Add support for SHA512 in
 images

Adds support for images signed with SHA512.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 56b14cc5ac248991e18241a63f9ab863fd89acca)
---
 .../include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h |  8 ++++++++
 subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c       | 12 ++++++------
 subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c |  8 ++++----
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h b/subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h
index 133a1abf054..d584467ee2b 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h
@@ -18,6 +18,14 @@
 extern "C" {
 #endif
 
+#ifdef CONFIG_MCUBOOT_BOOTLOADER_USES_SHA512
+#define IMAGE_TLV_SHA		IMAGE_TLV_SHA512
+#define IMAGE_SHA_LEN		64
+#else
+#define IMAGE_TLV_SHA		IMAGE_TLV_SHA256
+#define IMAGE_SHA_LEN		32
+#endif
+
 /**
  * @brief Ensures the spare slot (slot 1) is fully erased.
  *
diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
index a89cb5f2258..399d87be1d8 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
@@ -338,7 +338,7 @@ int img_mgmt_read_info(int image_slot, struct image_version *ver, uint8_t *hash,
 		if (tlv.it_type == 0xff && tlv.it_len == 0xffff) {
 			return IMG_MGMT_ERR_INVALID_TLV;
 		}
-		if (tlv.it_type != IMAGE_TLV_SHA256 || tlv.it_len != IMAGE_HASH_LEN) {
+		if (tlv.it_type != IMAGE_TLV_SHA || tlv.it_len != IMAGE_SHA_LEN) {
 			/* Non-hash TLV.  Skip it. */
 			data_off += sizeof(tlv) + tlv.it_len;
 			continue;
@@ -352,10 +352,10 @@ int img_mgmt_read_info(int image_slot, struct image_version *ver, uint8_t *hash,
 
 		data_off += sizeof(tlv);
 		if (hash != NULL) {
-			if (data_off + IMAGE_HASH_LEN > data_end) {
+			if (data_off + IMAGE_SHA_LEN > data_end) {
 				return IMG_MGMT_ERR_TLV_INVALID_SIZE;
 			}
-			rc = img_mgmt_read(image_slot, data_off, hash, IMAGE_HASH_LEN);
+			rc = img_mgmt_read(image_slot, data_off, hash, IMAGE_SHA_LEN);
 			if (rc != 0) {
 				return rc;
 			}
@@ -398,13 +398,13 @@ int
 img_mgmt_find_by_hash(uint8_t *find, struct image_version *ver)
 {
 	int i;
-	uint8_t hash[IMAGE_HASH_LEN];
+	uint8_t hash[IMAGE_SHA_LEN];
 
 	for (i = 0; i < 2 * CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER; i++) {
 		if (img_mgmt_read_info(i, ver, hash, NULL) != 0) {
 			continue;
 		}
-		if (!memcmp(hash, find, IMAGE_HASH_LEN)) {
+		if (!memcmp(hash, find, IMAGE_SHA_LEN)) {
 			return i;
 		}
 	}
@@ -714,7 +714,7 @@ img_mgmt_upload_good_rsp(struct smp_streamer *ctxt)
 static int
 img_mgmt_upload_log(bool is_first, bool is_last, int status)
 {
-	uint8_t hash[IMAGE_HASH_LEN];
+	uint8_t hash[IMAGE_SHA_LEN];
 	const uint8_t *hashp;
 	int rc;
 
diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
index a0ac03c0fe7..9e3e867e17d 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
@@ -416,8 +416,8 @@ static bool img_mgmt_state_encode_slot(struct smp_streamer *ctxt, uint32_t slot,
 	zcbor_state_t *zse = ctxt->writer->zs;
 	uint32_t flags;
 	char vers_str[IMG_MGMT_VER_MAX_STR_LEN];
-	uint8_t hash[IMAGE_HASH_LEN]; /* SHA256 hash */
-	struct zcbor_string zhash = { .value = hash, .len = IMAGE_HASH_LEN };
+	uint8_t hash[IMAGE_SHA_LEN];
+	struct zcbor_string zhash = { .value = hash, .len = IMAGE_SHA_LEN};
 	struct image_version ver;
 	bool ok;
 	int rc = img_mgmt_read_info(slot, &ver, hash, &flags);
@@ -720,14 +720,14 @@ img_mgmt_state_write(struct smp_streamer *ctxt)
 					     IMG_MGMT_ERR_INVALID_HASH);
 			goto end;
 		}
-	} else if (zhash.len != IMAGE_HASH_LEN) {
+	} else if (zhash.len != IMAGE_SHA_LEN) {
 		/* The img_mgmt_find_by_hash does exact length compare
 		 * so just fail here.
 		 */
 		ok = smp_add_cmd_err(zse, MGMT_GROUP_ID_IMAGE, IMG_MGMT_ERR_INVALID_HASH);
 		goto end;
 	} else {
-		uint8_t hash[IMAGE_HASH_LEN];
+		uint8_t hash[IMAGE_SHA_LEN];
 
 		memcpy(hash, zhash.value, zhash.len);
 

From b381230c990dfe9cfcc0cef6b536f545a514fe58 Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Tue, 12 Nov 2024 12:52:03 +0000
Subject: [PATCH 2168/2913] [nrf noup] samples/smp_svr: Increase stack size
 required

Increase stack size as support for SHA512 requires more data.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit f70627b9dec3c9dcd5c0451bdea4893d95272c75)
---
 samples/subsys/mgmt/mcumgr/smp_svr/prj.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/prj.conf b/samples/subsys/mgmt/mcumgr/smp_svr/prj.conf
index 06a27644bac..925ac0c93a2 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/prj.conf
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/prj.conf
@@ -8,7 +8,7 @@ CONFIG_FLASH_MAP=y
 
 # Some command handlers require a large stack.
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2304
-CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_MAIN_STACK_SIZE=2176
 
 # Ensure an MCUboot-compatible binary is generated.
 CONFIG_BOOTLOADER_MCUBOOT=y

From 3823e9261e0f92e350b8db9973feee2ff3e8ae61 Mon Sep 17 00:00:00 2001
From: Krzysztof Szromek <krzysztof.szromek@nordicsemi.no>
Date: Tue, 12 Nov 2024 10:28:23 +0100
Subject: [PATCH 2169/2913] [nrf noup] ci: fix suit-dfu-test entries in
 test-spec

Fix and update triggers for SUIT DFU tests.

Signed-off-by: Krzysztof Szromek <krzysztof.szromek@nordicsemi.no>
(cherry picked from commit 083162656d638aba0d5bf5733cc5a0deeba206a2)
---
 .github/test-spec.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/test-spec.yml b/.github/test-spec.yml
index 63a29824c11..bf09724ea49 100644
--- a/.github/test-spec.yml
+++ b/.github/test-spec.yml
@@ -391,10 +391,11 @@
   - "drivers/mbox/**/*"
   - "drivers/serial/**/*"
   - "drivers/console/**/*"
+  - "drivers/gpio/**/*"
   - "dts/common/nordic/*"
-  - "dts/arm/nordic/nrf54h*"
-  - "dts/riscv/nordic/nrf54h*"
-  - "boards/nordic/nrf54h*"
+  - "dts/arm/nordic/nrf54h*/**/*"
+  - "dts/riscv/nordic/nrf54h*/**/*"
+  - "boards/nordic/nrf54h*/**/*"
   - "soc/nordic/nrf54h/**/*"
   - "include/zephyr/**/*"
   - "subsys/logging/**/*"

From dc526a611a7f67f95e162234908206f8925f0696 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= <rafal.kuznia@nordicsemi.no>
Date: Tue, 22 Oct 2024 08:55:47 +0200
Subject: [PATCH 2170/2913] [nrf noup] modules: hal_nordic: adjust nrfx
 reservations to NCS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added ncs-specific modules to nrfx_config_reserved_resources.
The modules are:
- mpsl
- nrfe

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
(cherry picked from commit 3467a9ba9ef51fa296c1dc8960d1e936cab3b271)
---
 modules/hal_nordic/nrfx/Kconfig               |   2 +-
 .../nrfx/nrfx_config_reserved_resources_ncs.h | 916 ++++++++++++++++++
 2 files changed, 917 insertions(+), 1 deletion(-)
 create mode 100644 modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h

diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 2fd97920df8..c73a155dc60 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -1211,6 +1211,6 @@ endmenu
 
 config NRFX_RESERVED_RESOURCES_HEADER
 	string
-	default "nrfx_config_reserved_resources.h"
+	default "nrfx_config_reserved_resources_ncs.h"
 
 endmenu # "nrfx drivers"
diff --git a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h
new file mode 100644
index 00000000000..554b049f29f
--- /dev/null
+++ b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h
@@ -0,0 +1,916 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef NRFX_CONFIG_RESERVED_RESOURCES_H__
+#define NRFX_CONFIG_RESERVED_RESOURCES_H__
+
+/** @brief Bitmask that defines GPIOTE130 channels reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_GPIOTE130_CHANNELS_USED                                                               \
+	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), owned_channels) |                           \
+	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), child_owned_channels))
+
+/** @brief Bitmask that defines GPIOTE131 channels reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_GPIOTE131_CHANNELS_USED                                                               \
+	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), owned_channels) |                           \
+	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), child_owned_channels))
+
+/** @brief Bitmask that defines EGU instances that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_EGUS_USED 0
+
+/** @brief Bitmask that defines TIMER instances that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_TIMERS_USED 0
+
+/*
+ * The enabled Bluetooth controller subsystem is responsible for providing
+ * definitions of the BT_CTLR_USED_* symbols used below in a file named
+ * bt_ctlr_used_resources.h and for adding its location to global include
+ * paths so that the file can be included here for all Zephyr libraries that
+ * are to be built.
+ */
+#if defined(CONFIG_BT_LL_SW_SPLIT)
+#include <bt_ctlr_used_resources.h>
+#if defined(DPPI_PRESENT)
+#if defined(NRF53_SERIES)
+#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
+#define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
+#elif defined(NRF54L_SERIES)
+#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
+#define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
+#endif
+#else /* defined(DPPI_PRESENT) */
+#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
+#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
+#endif /* defined(DPPI_PRESENT) */
+#endif /* defined(CONFIG_BT_LL_SW_SPLIT) */
+
+#if defined(CONFIG_BT_LL_SOFTDEVICE)
+#include <sdc_soc.h>
+#if defined(NRF52_SERIES)
+#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR SDC_PPI_CHANNELS_USED_MASK
+#elif defined(NRF53_SERIES)
+#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR SDC_DPPI_CHANNELS_USED_MASK
+#elif defined(NRF54L_SERIES)
+#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC10_CHANNELS_USED_MASK
+#define NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC00_CHANNELS_USED_MASK
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR                                                   \
+	(SDC_PPIB00_CHANNELS_USED_MASK | SDC_PPIB10_CHANNELS_USED_MASK)
+#elif defined(NRF54H_SERIES)
+#define NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC020_CHANNELS_USED_MASK
+#define NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC030_CHANNELS_USED_MASK
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR                                                 \
+	(SDC_PPIB020_CHANNELS_USED_MASK | SDC_PPIB030_CHANNELS_USED_MASK)
+#else
+#error Unsupported chip family
+#endif
+#endif /* defined(CONFIG_BT_LL_SOFTDEVICE) */
+
+#if defined(CONFIG_NRF_802154_RADIO_DRIVER)
+#if defined(NRF52_SERIES)
+#include <../src/nrf_802154_peripherals_nrf52.h>
+#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV NRF_802154_PPI_CHANNELS_USED_MASK
+#define NRFX_PPI_GROUPS_USED_BY_802154_DRV   NRF_802154_PPI_GROUPS_USED_MASK
+#elif defined(NRF53_SERIES)
+#include <../src/nrf_802154_peripherals_nrf53.h>
+#define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
+#define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
+#elif defined(NRF54L_SERIES)
+#include <../src/nrf_802154_peripherals_nrf54l.h>
+#define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
+#define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
+#elif defined(NRF54H_SERIES)
+#include <../src/nrf_802154_peripherals_nrf54h.h>
+#define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
+#define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
+#else
+#error Unsupported chip family
+#endif
+#endif /* CONFIG_NRF_802154_RADIO_DRIVER */
+
+#if defined(CONFIG_MPSL)
+#include <mpsl.h>
+#if defined(NRF52_SERIES)
+#define NRFX_PPI_CHANNELS_USED_BY_MPSL MPSL_PPI_CHANNELS_USED_MASK
+#elif defined(NRF53_SERIES)
+#define NRFX_DPPI0_CHANNELS_USED_BY_MPSL MPSL_DPPIC_CHANNELS_USED_MASK
+#elif defined(NRF54L_SERIES)
+#define NRFX_DPPI10_CHANNELS_USED_BY_MPSL MPSL_DPPIC10_CHANNELS_USED_MASK
+#define NRFX_DPPI20_CHANNELS_USED_BY_MPSL MPSL_DPPIC20_CHANNELS_USED_MASK
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL                                                      \
+	(MPSL_PPIB11_CHANNELS_USED_MASK | MPSL_PPIB21_CHANNELS_USED_MASK)
+#elif defined(NRF54H_SERIES)
+#define NRFX_DPPI020_CHANNELS_USED_BY_MPSL MPSL_DPPIC020_CHANNELS_USED_MASK
+#else
+#error Unsupported chip family
+#endif
+#endif
+
+#ifndef NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI0_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI0_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI0_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI0_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI0_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI00_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI00_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI00_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI00_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI00_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI00_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI10_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI10_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI10_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI10_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI10_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI20_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI20_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI20_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI20_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI20_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI20_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI30_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI30_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI30_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI30_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI30_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI30_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI020_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI020_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI020_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI020_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI020_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI030_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI030_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI030_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI030_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI030_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI030_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI120_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI120_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI120_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI120_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI120_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI120_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI130_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI130_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI130_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI130_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI130_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI130_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI131_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI131_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI131_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI131_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI131_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI131_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI132_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI132_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI132_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI132_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI132_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI132_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI133_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI133_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI133_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI133_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI133_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI133_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI134_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI134_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI134_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI134_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI134_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI134_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI135_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI135_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI135_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI135_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI135_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI135_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI136_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI136_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI136_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI136_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI136_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI136_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPI_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPI_GROUPS_USED_BY_BT_CTLR
+#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR 0
+#endif
+
+#ifndef NRFX_PPI_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPI_GROUPS_USED_BY_802154_DRV
+#define NRFX_PPI_GROUPS_USED_BY_802154_DRV 0
+#endif
+
+#ifndef NRFX_PPI_CHANNELS_USED_BY_MPSL
+#define NRFX_PPI_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_PPI_GROUPS_USED_BY_MPSL
+#define NRFX_PPI_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#if defined(NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL)
+
+BUILD_ASSERT((NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI0_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI0_GROUPS_USED_BY_802154_DRV & NRFX_DPPI0_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI00_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI00_GROUPS_USED_BY_802154_DRV & NRFX_DPPI00_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI10_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI10_GROUPS_USED_BY_802154_DRV & NRFX_DPPI10_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI20_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI20_GROUPS_USED_BY_802154_DRV & NRFX_DPPI20_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI30_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI30_GROUPS_USED_BY_802154_DRV & NRFX_DPPI30_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI020_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI020_GROUPS_USED_BY_802154_DRV & NRFX_DPPI020_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI030_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI030_GROUPS_USED_BY_802154_DRV & NRFX_DPPI030_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI120_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI120_GROUPS_USED_BY_802154_DRV & NRFX_DPPI120_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI130_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI130_GROUPS_USED_BY_802154_DRV & NRFX_DPPI130_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI131_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI131_GROUPS_USED_BY_802154_DRV & NRFX_DPPI131_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI132_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI132_GROUPS_USED_BY_802154_DRV & NRFX_DPPI132_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI133_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI133_GROUPS_USED_BY_802154_DRV & NRFX_DPPI133_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI134_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI134_GROUPS_USED_BY_802154_DRV & NRFX_DPPI134_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI135_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI135_GROUPS_USED_BY_802154_DRV & NRFX_DPPI135_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI136_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI136_GROUPS_USED_BY_802154_DRV & NRFX_DPPI136_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPI_CHANNELS_USED_BY_802154_DRV & NRFX_PPI_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPI_GROUPS_USED_BY_802154_DRV & NRFX_PPI_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+#endif /* NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL */
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI0_CHANNELS_USED                                                                   \
+	(NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI0_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI0_GROUPS_USED                                                                     \
+	(NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI0_GROUPS_USED_BY_802154_DRV |                \
+	 NRFX_DPPI0_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI00_CHANNELS_USED                                                                  \
+	(NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI00_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI00_GROUPS_USED                                                                    \
+	(NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI00_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI00_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI10_CHANNELS_USED                                                                  \
+	(NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI10_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI10_GROUPS_USED                                                                    \
+	(NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI10_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI10_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI20_CHANNELS_USED                                                                  \
+	(NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI20_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI20_GROUPS_USED                                                                    \
+	(NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI20_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI20_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI30_CHANNELS_USED                                                                  \
+	(NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI30_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI30_GROUPS_USED                                                                    \
+	(NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI30_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI30_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI020_CHANNELS_USED                                                                 \
+	(NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI020_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI020_GROUPS_USED                                                                   \
+	(NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI020_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI020_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI030_CHANNELS_USED                                                                 \
+	(NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI030_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI030_GROUPS_USED                                                                   \
+	(NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI030_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI030_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI120_CHANNELS_USED                                                                 \
+	(NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI120_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI120_GROUPS_USED                                                                   \
+	(NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI120_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI120_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI130_CHANNELS_USED                                                                 \
+	(NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI130_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI130_GROUPS_USED                                                                   \
+	(NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI130_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI130_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI131_CHANNELS_USED                                                                 \
+	(NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI131_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI131_GROUPS_USED                                                                   \
+	(NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI131_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI131_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI132_CHANNELS_USED                                                                 \
+	(NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI132_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI132_GROUPS_USED                                                                   \
+	(NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI132_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI132_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI133_CHANNELS_USED                                                                 \
+	(NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI133_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI133_GROUPS_USED                                                                   \
+	(NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI133_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI133_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI134_CHANNELS_USED                                                                 \
+	(NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI134_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI134_GROUPS_USED                                                                   \
+	(NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI134_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI134_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI135_CHANNELS_USED                                                                 \
+	(NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI135_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI135_GROUPS_USED                                                                   \
+	(NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI135_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI135_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI136_CHANNELS_USED                                                                 \
+	(NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI136_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI136_GROUPS_USED                                                                   \
+	(NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI136_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI136_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines PPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_PPI_CHANNELS_USED                                                                     \
+	(NRFX_PPI_CHANNELS_USED_BY_BT_CTLR | NRFX_PPI_CHANNELS_USED_BY_802154_DRV |                \
+	 NRFX_PPI_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_DPPI_CHANNELS_USED NRFX_DPPI0_CHANNELS_USED
+#define NRFX_DPPI_GROUPS_USED   NRFX_DPPI0_GROUPS_USED
+
+/** @brief Bitmask that defines PPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_PPI_GROUPS_USED                                                                       \
+	(NRFX_PPI_GROUPS_USED_BY_BT_CTLR | NRFX_PPI_GROUPS_USED_BY_802154_DRV |                    \
+	 NRFX_PPI_GROUPS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_00_10_CHANNELS_USED                                                 \
+	(NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_01_20_CHANNELS_USED                                                 \
+	(NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_11_21_CHANNELS_USED                                                 \
+	(NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_22_30_CHANNELS_USED                                                 \
+	(NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_02_03_CHANNELS_USED                                                 \
+	(NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_04_12_CHANNELS_USED                                                 \
+	(NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_020_030_CHANNELS_USED                                               \
+	(NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR |                                              \
+	 NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV | NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL)
+
+#endif /* NRFX_CONFIG_RESERVED_RESOURCES_H__ */

From 0fa77a1710c86cfbaea76b670799366ce10cf5a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ayt=C3=BCrk=20D=C3=BCzen?= <ayturk.duzen@nordicsemi.no>
Date: Wed, 20 Nov 2024 13:06:23 +0100
Subject: [PATCH 2171/2913] [nrf noup] tests: bluetooth: tester: sysbuild
 configurable 53/54H
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add support for sysbuild 54h20 building
added nrf54h20 cpurad configuration to hci_ipc sample.

Signed-off-by: Aytürk Düzen <ayturk.duzen@nordicsemi.no>
Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit a7c968ab77b97a1480a80e6baa31a29a6abc0f8d)
---
 .../nrf54h20_cpurad-bt_ll_softdevice.conf     | 33 +++++++++++++++++++
 tests/bluetooth/tester/Kconfig.sysbuild       |  1 +
 tests/bluetooth/tester/sysbuild.cmake         | 23 +++++++++----
 3 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 samples/bluetooth/hci_ipc/nrf54h20_cpurad-bt_ll_softdevice.conf

diff --git a/samples/bluetooth/hci_ipc/nrf54h20_cpurad-bt_ll_softdevice.conf b/samples/bluetooth/hci_ipc/nrf54h20_cpurad-bt_ll_softdevice.conf
new file mode 100644
index 00000000000..1f7748e5cd7
--- /dev/null
+++ b/samples/bluetooth/hci_ipc/nrf54h20_cpurad-bt_ll_softdevice.conf
@@ -0,0 +1,33 @@
+CONFIG_IPC_SERVICE=y
+CONFIG_MBOX=y
+
+CONFIG_ISR_STACK_SIZE=1024
+CONFIG_IDLE_STACK_SIZE=256
+CONFIG_MAIN_STACK_SIZE=512
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512
+CONFIG_HEAP_MEM_POOL_SIZE=8192
+
+CONFIG_BT=y
+CONFIG_BT_HCI_RAW=y
+
+CONFIG_BT_BUF_EVT_RX_COUNT=16
+CONFIG_BT_BUF_EVT_RX_SIZE=255
+CONFIG_BT_BUF_ACL_RX_SIZE=255
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+CONFIG_BT_BUF_CMD_TX_SIZE=255
+
+# Host
+CONFIG_BT_BROADCASTER=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_OBSERVER=y
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_EXT_ADV=y
+CONFIG_BT_PER_ADV=y
+CONFIG_BT_PER_ADV_SYNC=y
+
+# Controller
+CONFIG_BT_LL_SW_SPLIT=n
+CONFIG_BT_LL_SOFTDEVICE=y
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
+CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191
diff --git a/tests/bluetooth/tester/Kconfig.sysbuild b/tests/bluetooth/tester/Kconfig.sysbuild
index 5256fa48d88..6d3a155c660 100644
--- a/tests/bluetooth/tester/Kconfig.sysbuild
+++ b/tests/bluetooth/tester/Kconfig.sysbuild
@@ -5,6 +5,7 @@ source "share/sysbuild/Kconfig"
 
 config NET_CORE_BOARD
 	string
+	default "nrf54h20dk/nrf54h20/cpurad" if "$(BOARD)" = "nrf54h20dk"
 	default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk"
 	default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk"
 
diff --git a/tests/bluetooth/tester/sysbuild.cmake b/tests/bluetooth/tester/sysbuild.cmake
index 07806ec40e2..e2fc2ed0de8 100644
--- a/tests/bluetooth/tester/sysbuild.cmake
+++ b/tests/bluetooth/tester/sysbuild.cmake
@@ -2,8 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
-	# For builds in the nrf5340, we build the netcore image with the controller
-
 	set(NET_APP hci_ipc)
 	set(NET_APP_SRC_DIR ${ZEPHYR_BASE}/samples/bluetooth/${NET_APP})
 
@@ -13,10 +11,23 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 		BOARD       ${SB_CONFIG_NET_CORE_BOARD}
 	)
 
-	set(${NET_APP}_CONF_FILE
-	 ${NET_APP_SRC_DIR}/nrf5340_cpunet_iso-bt_ll_sw_split.conf
-	 CACHE INTERNAL ""
-	)
+	if(SB_CONFIG_SOC_NRF5340_CPUAPP)
+		set(${NET_APP}_CONF_FILE
+		${NET_APP_SRC_DIR}/nrf5340_cpunet_iso-bt_ll_sw_split.conf
+		CACHE INTERNAL ""
+		)
+		set(${NET_APP}_SNIPPET
+		"bt-ll-sw-split"
+		CACHE INTERNAL ""
+		)
+	endif()
+
+	if(SB_CONFIG_SOC_NRF54H20_CPUAPP)
+		set(${NET_APP}_CONF_FILE
+		${NET_APP_SRC_DIR}/nrf54h20_cpurad-bt_ll_softdevice.conf
+		CACHE INTERNAL ""
+		)
+	endif()
 
 	set(${NET_APP}_EXTRA_CONF_FILE
 	 ${APP_DIR}/hci_ipc_cpunet.conf

From f6f66c84a31574c8eb2c62b373b7f359ca2b47be Mon Sep 17 00:00:00 2001
From: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
Date: Tue, 21 May 2024 13:59:58 +0200
Subject: [PATCH 2172/2913] [nrf noup] Bluetooth: Mesh: Disable processing of
 ext ADV packets

Disable processing of extended ADV packets by mesh scanner.
This is done to prevent loss of scan time due to reception
of pointer packets while scanning for mesh packets.

Signed-off-by: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
(cherry picked from commit f2772ab39ad889d5a0133364436e172ee6eb52b8)
---
 subsys/bluetooth/mesh/Kconfig   | 11 +++++++++++
 subsys/bluetooth/mesh/adv_ext.c | 12 ++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 268e21c42ad..4f0ff3bc88c 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -212,6 +212,17 @@ config BT_MESH_ADV_EXT_FRIEND_SEPARATE
 	  messages as close to the start of the ReceiveWindow as possible,
 	  thus reducing the scanning time on the Low Power node.
 
+config BT_MESH_ADV_EXT_ACCEPT_EXT_ADV_PACKETS
+	bool "Reject or accept extended advertising packets"
+	depends on BT_LL_SOFTDEVICE
+	help
+	  Configure the scanner and initiator to either reject or accept extended
+	  advertising packets by the SoftDevice Controller. This is set to false
+	  by default, to prevent loss of scan time when receiving a pointer packet
+	  while scanning for Bluetooth Mesh packets. Set to true if extended
+	  advertising packets are to be received by the SoftDevice Controller for
+	  purposes other than Bluetooth Mesh.
+
 endif # BT_MESH_ADV_EXT
 
 endchoice
diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index f240260026b..63ece26889e 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -478,6 +478,18 @@ void bt_mesh_adv_init(void)
 				   K_PRIO_COOP(MESH_WORKQ_PRIORITY), NULL);
 		k_thread_name_set(&bt_mesh_workq.thread, "BT MESH WQ");
 	}
+
+#if defined(CONFIG_BT_LL_SOFTDEVICE)
+	const sdc_hci_cmd_vs_scan_accept_ext_adv_packets_set_t cmd_params = {
+		.accept_ext_adv_packets = IS_ENABLED(CONFIG_BT_MESH_ADV_EXT_ACCEPT_EXT_ADV_PACKETS),
+	};
+
+	int err = sdc_hci_cmd_vs_scan_accept_ext_adv_packets_set(&cmd_params);
+
+	if (err) {
+		LOG_ERR("Failed to set accept_ext_adv_packets: %d", err);
+	}
+#endif
 }
 
 static struct bt_mesh_ext_adv *adv_instance_find(struct bt_le_ext_adv *instance)

From c9b6b6a201ae7eb1dc152a1978102a8bae78ce56 Mon Sep 17 00:00:00 2001
From: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Date: Fri, 27 Sep 2024 14:03:14 +0300
Subject: [PATCH 2173/2913] [nrf noup] boards: Add non-secure target for
 nrf54L15dk

This adds the nrf54l15dk/nrf54l15/cpuapp/ns board variant to
sdk-zephyr. It allows to build nRF54l15dk with TF-M in nRF Connect SDK.

This is done as a noup as the out-of-tree board extension feature is
not available. When zephyrproject-rtos/zephyr#69548 is completed this
commit can be reverted and the variant be placed in sdk-nrf.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Signed-off-by: Grzegorz Chwierut <grzegorz.chwierut@nordicsemi.no>
(cherry picked from commit d651a29606395d80abe754ddbd12d73157f6c675)
(cherry picked from commit 2d1e173dfed02366566420ba923a0d293a65bf91)
---
 boards/nordic/nrf54l15dk/Kconfig              | 34 ++++++++++
 boards/nordic/nrf54l15dk/Kconfig.defconfig    | 18 +++++
 boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk   |  2 +-
 boards/nordic/nrf54l15dk/board.cmake          |  8 +++
 boards/nordic/nrf54l15dk/board.yml            |  2 +
 .../nrf54l15dk_nrf54l15_cpuapp_ns.dts         | 65 +++++++++++++++++++
 .../nrf54l15dk_nrf54l15_cpuapp_ns.yaml        | 23 +++++++
 .../nrf54l15dk_nrf54l15_cpuapp_ns_defconfig   | 31 +++++++++
 8 files changed, 182 insertions(+), 1 deletion(-)
 create mode 100644 boards/nordic/nrf54l15dk/Kconfig
 create mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts
 create mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml
 create mode 100644 boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig

diff --git a/boards/nordic/nrf54l15dk/Kconfig b/boards/nordic/nrf54l15dk/Kconfig
new file mode 100644
index 00000000000..c8890bc4498
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/Kconfig
@@ -0,0 +1,34 @@
+# nRF54L15 DK board configuration
+
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
+
+config NRF_MPC_REGION_SIZE
+	hex
+	default 0x1000
+	help
+	  Region size for the Memory Protection Controller (MPC) in bytes.
+
+config NRF_TRUSTZONE_FLASH_REGION_SIZE
+	hex
+	default NRF_MPC_REGION_SIZE
+	help
+	  This defines the flash region size from the TRUSTZONE perspective.
+	  It is used when configuring the TRUSTZONE and when setting alignments
+	  requirements for the partitions.
+	  This abstraction allows us to configure TRUSTZONE without depending
+	  on peripheral specific symbols.
+
+config NRF_TRUSTZONE_RAM_REGION_SIZE
+	hex
+	default NRF_MPC_REGION_SIZE
+	help
+	  This defines the RAM region size from the TRUSTZONE perspective.
+	  It is used when configuring the TRUSTZONE and when setting alignments
+	  requirements for the partitions.
+	  This abstraction allows us to configure TRUSTZONE without depending
+	  on peripheral specific symbols.
+
+endif #BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
diff --git a/boards/nordic/nrf54l15dk/Kconfig.defconfig b/boards/nordic/nrf54l15dk/Kconfig.defconfig
index 56ce044c7e1..ca46527e512 100644
--- a/boards/nordic/nrf54l15dk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l15dk/Kconfig.defconfig
@@ -10,3 +10,21 @@ config ROM_START_OFFSET
 
 endif # BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
 	# BOARD_NRF54L15DK_NRF54L15_CPUAPP
+
+if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
+
+config BT_CTLR
+	default BT
+
+# By default, if we build for a Non-Secure version of the board,
+# enable building with TF-M as the Secure Execution Environment.
+config BUILD_WITH_TFM
+	default y if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
+
+# By default, if we build with TF-M, instruct build system to
+# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
+config TFM_FLASH_MERGED_BINARY
+	default y
+	depends on BUILD_WITH_TFM
+
+endif #BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
diff --git a/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk b/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk
index 25472cfff6c..57b90e2c516 100644
--- a/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk
+++ b/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk
@@ -4,6 +4,6 @@
 config BOARD_NRF54L15DK
 	select SOC_NRF54L05_CPUAPP if BOARD_NRF54L15DK_NRF54L05_CPUAPP
 	select SOC_NRF54L10_CPUAPP if BOARD_NRF54L15DK_NRF54L10_CPUAPP
-	select SOC_NRF54L15_CPUAPP if BOARD_NRF54L15DK_NRF54L15_CPUAPP
+	select SOC_NRF54L15_CPUAPP if BOARD_NRF54L15DK_NRF54L15_CPUAPP || BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
 	select SOC_NRF54L15_CPUFLPR if BOARD_NRF54L15DK_NRF54L15_CPUFLPR || \
 					    BOARD_NRF54L15DK_NRF54L15_CPUFLPR_XIP
diff --git a/boards/nordic/nrf54l15dk/board.cmake b/boards/nordic/nrf54l15dk/board.cmake
index 7cba3884eda..81af434c648 100644
--- a/boards/nordic/nrf54l15dk/board.cmake
+++ b/boards/nordic/nrf54l15dk/board.cmake
@@ -10,5 +10,13 @@ elseif(CONFIG_SOC_NRF54L05_CPUFLPR OR CONFIG_SOC_NRF54L10_CPUFLPR OR
   board_runner_args(jlink "--device=RISC-V" "--speed=4000" "-if SW" "--tool-opt=-jlinkscriptfile ${JLINKSCRIPTFILE}")
 endif()
 
+if(BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS)
+  set(TFM_PUBLIC_KEY_FORMAT "full")
+endif()
+
+if(CONFIG_TFM_FLASH_MERGED_BINARY)
+  set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex)
+endif()
+
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf54l15dk/board.yml b/boards/nordic/nrf54l15dk/board.yml
index f1a873cc35f..f4214f09d28 100644
--- a/boards/nordic/nrf54l15dk/board.yml
+++ b/boards/nordic/nrf54l15dk/board.yml
@@ -9,3 +9,5 @@ board:
     variants:
     - name: xip
       cpucluster: cpuflpr
+    - name: ns
+      cpucluster: cpuapp
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts
new file mode 100644
index 00000000000..e629a8b4ad7
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#define USE_NON_SECURE_ADDRESS_MAP 1
+
+#include <nordic/nrf54l15_cpuapp.dtsi>
+#include "nrf54l_05_10_15_cpuapp_common.dtsi"
+
+/ {
+	compatible = "nordic,nrf54l15dk_nrf54l15-cpuapp";
+	model = "Nordic nRF54L15 DK nRF54L15 Application MCU";
+
+	chosen {
+		zephyr,code-partition = &slot0_partition;
+		zephyr,sram = &cpuapp_sram;
+	};
+};
+
+&cpuapp_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x0 DT_SIZE_K(64)>;
+		};
+		slot0_partition: partition@10000 {
+			label = "image-0";
+			reg = <0x10000 DT_SIZE_K(324)>;
+		};
+		slot0_ns_partition: partition@61000 {
+			label = "image-0-nonsecure";
+			reg = <0x61000 DT_SIZE_K(324)>;
+		};
+		slot1_partition: partition@b2000 {
+			label = "image-1";
+			reg = <0xb2000 DT_SIZE_K(324)>;
+		};
+		slot1_ns_partition: partition@103000 {
+			label = "image-1-nonsecure";
+			reg = <0x103000 DT_SIZE_K(324)>;
+		};
+		/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
+		storage_partition: partition@15c000 {
+			label = "storage";
+			reg = <0x15c000 DT_SIZE_K(36)>;
+		};
+	};
+};
+
+&uart30 {
+	/* Disable so that TF-M can use this UART */
+	status = "disabled";
+
+	current-speed = <115200>;
+	pinctrl-0 = <&uart30_default>;
+	pinctrl-1 = <&uart30_sleep>;
+	pinctrl-names = "default", "sleep";
+};
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml
new file mode 100644
index 00000000000..e58bf792b06
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml
@@ -0,0 +1,23 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+
+identifier: nrf54l15dk/nrf54l15/cpuapp/ns
+name: nRF54l15-DK-nRF54l15-Application-Non-Secure
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+sysbuild: true
+ram: 256
+flash: 1524
+supported:
+  - adc
+  - gpio
+  - i2c
+  - spi
+  - counter
+  - watchdog
+  - adc
+  - i2s
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig
new file mode 100644
index 00000000000..70f01d7c9ba
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig
@@ -0,0 +1,31 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
+
+# Enable TrustZone-M
+CONFIG_ARM_TRUSTZONE_M=y
+
+# This Board implies building Non-Secure firmware
+CONFIG_TRUSTED_EXECUTION_NONSECURE=y
+
+# Don't enable the cache in the non-secure image as it is a
+# secure-only peripheral on 54l
+CONFIG_CACHE_MANAGEMENT=n
+CONFIG_EXTERNAL_CACHE=n
+
+CONFIG_UART_CONSOLE=y
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Start SYSCOUNTER on driver init
+CONFIG_NRF_GRTC_START_SYSCOUNTER=y

From 154010491d693e2b04087ceb8fd9045bfd12a008 Mon Sep 17 00:00:00 2001
From: Joakim Andersson <joakim.andersson@nordicsemi.no>
Date: Mon, 16 Jan 2023 14:15:22 +0100
Subject: [PATCH 2174/2913] [nrf noup] dts: choose a crypto accelerator for
 entropy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a long-term noup patch because crypto driver support is
NCS-only for both cryptocell and CRACEN.

Set HAS_HW_NRF_CC3XX to be defined in NS build when cryptocell
is accessed through the PSA API.
We need to know which CC3XX features are available.

Set PSA as the entropy source for 54L.

PSA is the only NCS-supported interface to CRACEN.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
(cherry picked from commit 296400609adfab07a708db306d58bd7773918300)
---
 dts/arm/nordic/nrf52840.dtsi               | 4 ++--
 dts/arm/nordic/nrf5340_cpuapp.dtsi         | 4 ++--
 dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi | 3 ++-
 dts/arm/nordic/nrf91.dtsi                  | 3 ++-
 soc/nordic/common/Kconfig.peripherals      | 6 ++++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index e2265c130b0..b0049bfa605 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -8,7 +8,7 @@
 / {
 	chosen {
 		zephyr,bt-hci = &bt_hci_controller;
-		zephyr,entropy = &rng;
+		zephyr,entropy = &cryptocell;
 		zephyr,flash-controller = &flash_controller;
 	};
 
@@ -562,7 +562,7 @@
 			reg = <0x5002a000 0x1000>, <0x5002b000 0x1000>;
 			reg-names = "wrapper", "core";
 			interrupts = <42 NRF_DEFAULT_IRQ_PRIORITY>;
-			status = "disabled";
+			status = "okay";
 		};
 	};
 };
diff --git a/dts/arm/nordic/nrf5340_cpuapp.dtsi b/dts/arm/nordic/nrf5340_cpuapp.dtsi
index c02f939a7fa..ec59f40ab9c 100644
--- a/dts/arm/nordic/nrf5340_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuapp.dtsi
@@ -34,7 +34,7 @@
 	};
 
 	chosen {
-		zephyr,entropy = &rng_hci;
+		zephyr,entropy = &cryptocell;
 		zephyr,flash-controller = &flash_controller;
 	};
 
@@ -103,7 +103,7 @@
 			reg = <0x50844000 0x1000>, <0x50845000 0x1000>;
 			reg-names = "wrapper", "core";
 			interrupts = <68 NRF_DEFAULT_IRQ_PRIORITY>;
-			status = "disabled";
+			status = "okay";
 		};
 	};
 
diff --git a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
index a05b7ac1a46..b4b9777679e 100644
--- a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
@@ -16,6 +16,7 @@ nvic: &cpuapp_nvic {};
 / {
 	chosen {
 		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,entropy = &psa_rng;
 	};
 
 	soc {
@@ -26,7 +27,7 @@ nvic: &cpuapp_nvic {};
 
 	psa_rng: psa-rng {
 		compatible = "zephyr,psa-crypto-rng";
-		status = "disabled";
+		status = "okay";
 	};
 };
 
diff --git a/dts/arm/nordic/nrf91.dtsi b/dts/arm/nordic/nrf91.dtsi
index 9a64ed92229..5e65519929e 100644
--- a/dts/arm/nordic/nrf91.dtsi
+++ b/dts/arm/nordic/nrf91.dtsi
@@ -28,6 +28,7 @@
 	};
 
 	chosen {
+		zephyr,entropy = &cryptocell;
 		zephyr,flash-controller = &flash_controller;
 	};
 
@@ -51,7 +52,7 @@
 			reg = <0x50840000 0x1000>, <0x50841000 0x1000>;
 			reg-names = "wrapper", "core";
 			interrupts = <64 NRF_DEFAULT_IRQ_PRIORITY>;
-			status = "disabled";
+			status = "okay";
 		};
 
 		ctrlap: ctrlap@50006000 {
diff --git a/soc/nordic/common/Kconfig.peripherals b/soc/nordic/common/Kconfig.peripherals
index 8ba97b225b9..9ea6ebc45c5 100644
--- a/soc/nordic/common/Kconfig.peripherals
+++ b/soc/nordic/common/Kconfig.peripherals
@@ -13,10 +13,12 @@ config HAS_HW_NRF_BPROT
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_BPROT))
 
 config HAS_HW_NRF_CC310
-	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_310))
+	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_310)) || \
+		 ($(dt_nodelabel_enabled,psa_rng) && SOC_SERIES_NRF91X)
 
 config HAS_HW_NRF_CC312
-	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_312))
+	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_312)) || \
+		 ($(dt_nodelabel_enabled,psa_rng) && SOC_NRF5340_CPUAPP)
 
 config HAS_HW_NRF_CCM
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_CCM))

From 1fb03f13e30065987a4fa0ad1eaa9764ef8e0b03 Mon Sep 17 00:00:00 2001
From: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Date: Thu, 5 Sep 2024 08:04:15 +0200
Subject: [PATCH 2175/2913] [nrf noup] dts: Select SoftDevice Controller DTS
 binding as default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The SoftDevice Controller is a different controller than
the open source link layer with a different set of quirks.
It should therefore have its own device tree binding.

This commit converts the SoftDevice Controller driver
to use this new DTS binding instead of reusing the existing one.

This commit updates or adds additional overlays for
existing samples, applications and tests that were using the
open source link layer.

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Signed-off-by: Kristoffer Rist Skøien <kristoffer.skoien@nordicsemi.no>
Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
(cherry picked from commit e88198c09a18ebf8a12aa0674cf535433d105018)
(cherry picked from commit 73127457dd15b87fd4a7757df0c4e10dfeb5dd4e)
(cherry picked from commit 324f8ae1d82cb5edd3fb9eb8763965baed12dda4)
(cherry picked from commit b22e695a722ce2aae31b0c1f9549d1bb61ec1ce3)
---
 .../nrf54l20pdk/nrf54l20_cpuapp_common.dtsi   |   4 +-
 dts/arm/nordic/nrf52805.dtsi                  |  11 +-
 dts/arm/nordic/nrf52810.dtsi                  |  11 +-
 dts/arm/nordic/nrf52811.dtsi                  |  11 +-
 dts/arm/nordic/nrf52820.dtsi                  |  11 +-
 dts/arm/nordic/nrf52832.dtsi                  |  11 +-
 dts/arm/nordic/nrf52833.dtsi                  |  11 +-
 dts/arm/nordic/nrf52840.dtsi                  |  11 +-
 dts/arm/nordic/nrf5340_cpunet.dtsi            |  11 +-
 dts/arm/nordic/nrf54h20_cpurad.dtsi           |   4 +-
 dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi    |   4 +-
 dts/common/nordic/nrf54h20.dtsi               |   7 +-
 dts/common/nordic/nrf54l20.dtsi               |   7 +-
 dts/common/nordic/nrf54l_05_10_15.dtsi        |   8 +-
 .../bluetooth/bap_broadcast_sink/sample.yaml  |   4 +-
 .../bap_broadcast_sink/sysbuild.cmake         |   4 +
 .../bap_broadcast_source/sample.yaml          |   4 +-
 .../bap_broadcast_source/sysbuild.cmake       |   4 +
 .../bluetooth/bap_unicast_client/sample.yaml  |   4 +-
 .../bap_unicast_client/sysbuild.cmake         |   4 +
 .../bluetooth/bap_unicast_server/sample.yaml  |   4 +-
 .../bap_unicast_server/sysbuild.cmake         |   4 +
 samples/bluetooth/beacon/sample.yaml          |   4 +-
 samples/bluetooth/cap_acceptor/sample.yaml    |   4 +-
 samples/bluetooth/cap_acceptor/sysbuild.cmake |   4 +
 samples/bluetooth/cap_initiator/sample.yaml   |   4 +-
 .../bluetooth/cap_initiator/sysbuild.cmake    |   4 +
 .../direction_finding_central/sample.yaml     |  15 ++-
 .../sample.yaml                               |  14 ++-
 .../sample.yaml                               |  14 ++-
 .../direction_finding_peripheral/sample.yaml  |  15 ++-
 samples/bluetooth/hci_ipc/sample.yaml         |  34 ++++--
 samples/bluetooth/hci_uart/sample.yaml        |  18 +++-
 samples/bluetooth/hci_vs_scan_req/sample.yaml |   2 +
 samples/bluetooth/iso_central/sample.yaml     |   6 +-
 .../pbp_public_broadcast_sink/sample.yaml     |   4 +-
 .../pbp_public_broadcast_sink/sysbuild.cmake  |   4 +
 .../pbp_public_broadcast_source/sample.yaml   |   4 +-
 .../sysbuild.cmake                            |   4 +
 .../bt-ll-sw-split/bt-ll-sw-split.overlay     |   4 +
 .../controller/ll_sw/nordic/lll/lll.c         |   2 +-
 .../controller/ctrl_api/testcase.yaml         |   2 +
 .../controller/ctrl_chmu/testcase.yaml        |   2 +
 .../controller/ctrl_cis_create/testcase.yaml  |   2 +
 .../ctrl_cis_terminate/testcase.yaml          |   2 +
 .../controller/ctrl_collision/testcase.yaml   |   2 +
 .../controller/ctrl_conn_update/testcase.yaml |  11 +-
 .../controller/ctrl_cte_req/testcase.yaml     |   2 +
 .../ctrl_data_length_update/testcase.yaml     |  10 +-
 .../controller/ctrl_encrypt/testcase.yaml     |   2 +
 .../ctrl_feature_exchange/testcase.yaml       |   2 +
 .../controller/ctrl_hci/testcase.yaml         |   2 +
 .../controller/ctrl_invalid/testcase.yaml     |   2 +
 .../controller/ctrl_le_ping/testcase.yaml     |   2 +
 .../ctrl_min_used_chans/testcase.yaml         |   2 +
 .../controller/ctrl_phy_update/testcase.yaml  |   6 +-
 .../controller/ctrl_sca_update/testcase.yaml  |   2 +
 .../controller/ctrl_sw_privacy/testcase.yaml  |   2 +
 .../controller/ctrl_terminate/testcase.yaml   |   2 +
 .../ctrl_tx_buffer_alloc/testcase.yaml        |  22 +++-
 .../controller/ctrl_tx_queue/testcase.yaml    |   2 +
 .../controller/ctrl_unsupported/testcase.yaml |   6 +-
 .../controller/ctrl_user_ext/testcase.yaml    |   2 +
 .../controller/ctrl_version/testcase.yaml     |   2 +
 .../df/connection_cte_req/testcase.yaml       |   2 +
 .../df/connection_cte_tx_params/testcase.yaml |   2 +
 .../connectionless_cte_chains/testcase.yaml   |   2 +
 .../df/connectionless_cte_rx/testcase.yaml    |   2 +
 .../df/connectionless_cte_tx/testcase.yaml    |   2 +
 tests/bluetooth/init/testcase.yaml            | 101 +++++++++++++-----
 70 files changed, 389 insertions(+), 127 deletions(-)

diff --git a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
index cdf6d62a30a..ed9d76a6b19 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
@@ -18,7 +18,7 @@
 		zephyr,bt-c2h-uart = &uart20;
 		zephyr,flash-controller = &rram_controller;
 		zephyr,flash = &cpuapp_rram;
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,ieee802154 = &ieee802154;
 	};
 };
@@ -108,7 +108,7 @@
 	status = "okay";
 };
 
-&bt_hci_controller {
+&bt_hci_sdc {
 	status = "okay";
 };
 
diff --git a/dts/arm/nordic/nrf52805.dtsi b/dts/arm/nordic/nrf52805.dtsi
index e1c8e6a2efb..aa9061d4aab 100644
--- a/dts/arm/nordic/nrf52805.dtsi
+++ b/dts/arm/nordic/nrf52805.dtsi
@@ -11,7 +11,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -97,12 +97,13 @@
 			status = "okay";
 			ble-2mbps-supported;
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
index 40d872dda44..8ed7a32bfec 100644
--- a/dts/arm/nordic/nrf52810.dtsi
+++ b/dts/arm/nordic/nrf52810.dtsi
@@ -7,7 +7,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -101,12 +101,13 @@
 			status = "okay";
 			ble-2mbps-supported;
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi
index 735bfee427b..4c5f4ca58f7 100644
--- a/dts/arm/nordic/nrf52811.dtsi
+++ b/dts/arm/nordic/nrf52811.dtsi
@@ -11,7 +11,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -113,12 +113,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52820.dtsi b/dts/arm/nordic/nrf52820.dtsi
index 82bdcb58934..f7ec2b926f6 100644
--- a/dts/arm/nordic/nrf52820.dtsi
+++ b/dts/arm/nordic/nrf52820.dtsi
@@ -11,7 +11,7 @@
 / {
 
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -115,12 +115,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK another Bluetooth controller
-			 * is added and set as the default.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
index abb1aed468c..f09793f5020 100644
--- a/dts/arm/nordic/nrf52832.dtsi
+++ b/dts/arm/nordic/nrf52832.dtsi
@@ -7,7 +7,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -101,12 +101,13 @@
 			status = "okay";
 			ble-2mbps-supported;
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi
index e8a033b4002..a881898a8f3 100644
--- a/dts/arm/nordic/nrf52833.dtsi
+++ b/dts/arm/nordic/nrf52833.dtsi
@@ -11,7 +11,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -115,12 +115,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index b0049bfa605..e331e8b422f 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -7,7 +7,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &cryptocell;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -103,12 +103,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf5340_cpunet.dtsi b/dts/arm/nordic/nrf5340_cpunet.dtsi
index 49167033109..d4d06bf2d3e 100644
--- a/dts/arm/nordic/nrf5340_cpunet.dtsi
+++ b/dts/arm/nordic/nrf5340_cpunet.dtsi
@@ -9,7 +9,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -102,12 +102,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf54h20_cpurad.dtsi b/dts/arm/nordic/nrf54h20_cpurad.dtsi
index 2cfda47afc5..e8ff2dac3a4 100644
--- a/dts/arm/nordic/nrf54h20_cpurad.dtsi
+++ b/dts/arm/nordic/nrf54h20_cpurad.dtsi
@@ -24,7 +24,7 @@ wdt011: &cpurad_wdt011 {};
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 	};
 
 	soc {
@@ -104,6 +104,6 @@ wdt011: &cpurad_wdt011 {};
 	status = "okay";
 };
 
-&bt_hci_controller {
+&bt_hci_sdc {
 	status = "okay";
 };
diff --git a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
index b4b9777679e..e5ec7785589 100644
--- a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
@@ -15,7 +15,7 @@ nvic: &cpuapp_nvic {};
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &psa_rng;
 	};
 
@@ -31,7 +31,7 @@ nvic: &cpuapp_nvic {};
 	};
 };
 
-&bt_hci_controller {
+&bt_hci_sdc {
 	status = "okay";
 };
 
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index ec63eb5f461..061f53b9d68 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -443,9 +443,10 @@
 					status = "disabled";
 				};
 
-				/* Note: In the nRF Connect SDK the SoftDevice Controller
-				 * is added and set as the default Bluetooth Controller.
-				 */
+				bt_hci_sdc: bt_hci_sdc {
+					compatible = "nordic,bt-hci-sdc";
+					status = "disabled";
+				};
 				bt_hci_controller: bt_hci_controller {
 					compatible = "zephyr,bt-hci-ll-sw-split";
 					status = "disabled";
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index e5b019deff9..48ea4d9abbc 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -202,9 +202,10 @@
 					status = "disabled";
 				};
 
-				/* Note: In the nRF Connect SDK the SoftDevice Controller
-				 * is added and set as the default Bluetooth Controller.
-				 */
+				bt_hci_sdc: bt_hci_sdc {
+					compatible = "nordic,bt-hci-sdc";
+					status = "disabled";
+				};
 				bt_hci_controller: bt_hci_controller {
 					compatible = "zephyr,bt-hci-ll-sw-split";
 					status = "disabled";
diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi
index 633b1d425e4..b2e3c70bf5f 100644
--- a/dts/common/nordic/nrf54l_05_10_15.dtsi
+++ b/dts/common/nordic/nrf54l_05_10_15.dtsi
@@ -241,9 +241,11 @@
 					status = "disabled";
 				};
 
-				/* Note: In the nRF Connect SDK the SoftDevice Controller
-				 * is added and set as the default Bluetooth Controller.
-				 */
+				bt_hci_sdc: bt_hci_sdc {
+					compatible = "nordic,bt-hci-sdc";
+					status = "disabled";
+				};
+
 				bt_hci_controller: bt_hci_controller {
 					compatible = "zephyr,bt-hci-ll-sw-split";
 					status = "disabled";
diff --git a/samples/bluetooth/bap_broadcast_sink/sample.yaml b/samples/bluetooth/bap_broadcast_sink/sample.yaml
index 5d06dee0bf8..148b8b64169 100644
--- a/samples/bluetooth/bap_broadcast_sink/sample.yaml
+++ b/samples/bluetooth/bap_broadcast_sink/sample.yaml
@@ -24,5 +24,7 @@ tests:
       - nrf52_bsim
       - nrf52833dk/nrf52833
       - nrf52840dongle/nrf52840
-    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/bap_broadcast_sink/sysbuild.cmake b/samples/bluetooth/bap_broadcast_sink/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/bap_broadcast_sink/sysbuild.cmake
+++ b/samples/bluetooth/bap_broadcast_sink/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/bap_broadcast_source/sample.yaml b/samples/bluetooth/bap_broadcast_source/sample.yaml
index 246a62a535f..37008007c92 100644
--- a/samples/bluetooth/bap_broadcast_source/sample.yaml
+++ b/samples/bluetooth/bap_broadcast_source/sample.yaml
@@ -25,5 +25,7 @@ tests:
       - nrf52_bsim
       - nrf52833dk/nrf52833
       - nrf52840dongle/nrf52840
-    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/bap_broadcast_source/sysbuild.cmake b/samples/bluetooth/bap_broadcast_source/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/bap_broadcast_source/sysbuild.cmake
+++ b/samples/bluetooth/bap_broadcast_source/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/bap_unicast_client/sample.yaml b/samples/bluetooth/bap_unicast_client/sample.yaml
index 7283090b878..44f32934ce9 100644
--- a/samples/bluetooth/bap_unicast_client/sample.yaml
+++ b/samples/bluetooth/bap_unicast_client/sample.yaml
@@ -22,5 +22,7 @@ tests:
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52dk/nrf52832
-    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/bap_unicast_client/sysbuild.cmake b/samples/bluetooth/bap_unicast_client/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/bap_unicast_client/sysbuild.cmake
+++ b/samples/bluetooth/bap_unicast_client/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/bap_unicast_server/sample.yaml b/samples/bluetooth/bap_unicast_server/sample.yaml
index 068f752b626..266ced73f66 100644
--- a/samples/bluetooth/bap_unicast_server/sample.yaml
+++ b/samples/bluetooth/bap_unicast_server/sample.yaml
@@ -22,5 +22,7 @@ tests:
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52dk/nrf52832
-    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/bap_unicast_server/sysbuild.cmake b/samples/bluetooth/bap_unicast_server/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/bap_unicast_server/sysbuild.cmake
+++ b/samples/bluetooth/bap_unicast_server/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/beacon/sample.yaml b/samples/bluetooth/beacon/sample.yaml
index e0bf6d22fb9..6ab2413ca8f 100644
--- a/samples/bluetooth/beacon/sample.yaml
+++ b/samples/bluetooth/beacon/sample.yaml
@@ -16,7 +16,9 @@ tests:
       - nrf52dk/nrf52832
       - nrf54l15dk/nrf54l15/cpuapp
   sample.bluetooth.beacon-coex:
-    extra_args: CONF_FILE="prj-coex.conf"
+    extra_args:
+      - CONF_FILE="prj-coex.conf"
+      - SNIPPET="bt-ll-sw-split"
     harness: bluetooth
     platform_allow:
       - nrf52840dk/nrf52840
diff --git a/samples/bluetooth/cap_acceptor/sample.yaml b/samples/bluetooth/cap_acceptor/sample.yaml
index 824e744eeca..9061f44679f 100644
--- a/samples/bluetooth/cap_acceptor/sample.yaml
+++ b/samples/bluetooth/cap_acceptor/sample.yaml
@@ -26,5 +26,7 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52840dk/nrf52840
       - nrf52840dongle/nrf52840
-    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/cap_acceptor/sysbuild.cmake b/samples/bluetooth/cap_acceptor/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/cap_acceptor/sysbuild.cmake
+++ b/samples/bluetooth/cap_acceptor/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/cap_initiator/sample.yaml b/samples/bluetooth/cap_initiator/sample.yaml
index b4f593c9912..e3e557f4830 100644
--- a/samples/bluetooth/cap_initiator/sample.yaml
+++ b/samples/bluetooth/cap_initiator/sample.yaml
@@ -26,5 +26,7 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52840dk/nrf52840
       - nrf52840dongle/nrf52840
-    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/cap_initiator/sysbuild.cmake b/samples/bluetooth/cap_initiator/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/cap_initiator/sysbuild.cmake
+++ b/samples/bluetooth/cap_initiator/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/direction_finding_central/sample.yaml b/samples/bluetooth/direction_finding_central/sample.yaml
index b7a118e6cdc..ffdf634c6e3 100644
--- a/samples/bluetooth/direction_finding_central/sample.yaml
+++ b/samples/bluetooth/direction_finding_central/sample.yaml
@@ -14,15 +14,24 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding.central.aod:
+  sample.bluetooth.direction_finding.central.aod_with_controller:
     harness: bluetooth
-    extra_args: EXTRA_CONF_FILE="overlay-aod.conf"
+    extra_args:
+      - EXTRA_CONF_FILE="overlay-aod.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     tags: bluetooth
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding.central.aod_host_only:
+    harness: bluetooth
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aod.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    tags: bluetooth
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
index 8e6097de58a..c500cc80dce 100644
--- a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
+++ b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
@@ -12,14 +12,22 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding_connectionless_rx.aod:
+  sample.bluetooth.direction_finding_connectionless_rx.aod_with_controller:
     harness: bluetooth
-    extra_args: EXTRA_CONF_FILE="overlay-aod.conf"
+    extra_args:
+      - EXTRA_CONF_FILE="overlay-aod.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding_connectionless_rx.aod_host_only:
+    harness: bluetooth
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aod.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
index 78d21b2c95f..2a4fa93d19d 100644
--- a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
+++ b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
@@ -12,14 +12,22 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding_connectionless.aoa:
+  sample.bluetooth.direction_finding_connectionless.aoa_with_controller:
     harness: bluetooth
-    extra_args: EXTRA_CONF_FILE="overlay-aoa.conf"
+    extra_args:
+      - EXTRA_CONF_FILE="overlay-aoa.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding_connectionless.aoa_host_only:
+    harness: bluetooth
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aoa.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_peripheral/sample.yaml b/samples/bluetooth/direction_finding_peripheral/sample.yaml
index f300cb415cc..01f612ad08a 100644
--- a/samples/bluetooth/direction_finding_peripheral/sample.yaml
+++ b/samples/bluetooth/direction_finding_peripheral/sample.yaml
@@ -14,15 +14,24 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding.peripheral.aod:
+  sample.bluetooth.direction_finding.peripheral.aod_with_controller:
     harness: bluetooth
-    extra_args: EXTRA_CONF_FILE="overlay-aoa.conf"
+    extra_args:
+      - EXTRA_CONF_FILE="overlay-aoa.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     tags: bluetooth
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding.peripheral.aod_host_only:
+    harness: bluetooth
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aoa.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    tags: bluetooth
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/hci_ipc/sample.yaml b/samples/bluetooth/hci_ipc/sample.yaml
index b758b254768..3763478b6b3 100644
--- a/samples/bluetooth/hci_ipc/sample.yaml
+++ b/samples/bluetooth/hci_ipc/sample.yaml
@@ -15,7 +15,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_broadcast.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -25,7 +27,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_receive.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -35,7 +39,9 @@ tests:
   sample.bluetooth.hci_ipc.bis.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_bis-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_bis-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -45,7 +51,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_central.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_central-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_central-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -55,7 +63,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_peripheral.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -65,7 +75,9 @@ tests:
   sample.bluetooth.hci_ipc.cis.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_cis-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_cis-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -75,7 +87,9 @@ tests:
   sample.bluetooth.hci_ipc.iso.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -99,6 +113,7 @@ tests:
     extra_args:
       - CONF_FILE="nrf5340_cpunet_df-bt_ll_sw_split.conf"
       - DTC_OVERLAY_FILE="nrf5340_cpunet_df-bt_ll_sw_split.overlay"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
@@ -109,13 +124,16 @@ tests:
       - CONF_FILE="nrf5340_cpunet_df-bt_ll_sw_split.conf"
       - DTC_OVERLAY_FILE="nrf5340_cpunet_df-bt_ll_sw_split.overlay"
       - CONFIG_BT_CTLR_PHY_CODED=n
+      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
   sample.bluetooth.hci_ipc.mesh.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
diff --git a/samples/bluetooth/hci_uart/sample.yaml b/samples/bluetooth/hci_uart/sample.yaml
index b555a74ac5b..97ad6c561b2 100644
--- a/samples/bluetooth/hci_uart/sample.yaml
+++ b/samples/bluetooth/hci_uart/sample.yaml
@@ -20,7 +20,9 @@ tests:
     platform_allow: nrf52833dk/nrf52833
     integration_platforms:
       - nrf52833dk/nrf52833
-    extra_args: DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+    extra_args:
+      - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
     tags:
@@ -29,7 +31,9 @@ tests:
   sample.bluetooth.hci_uart.nrf5340_netcore.df:
     harness: bluetooth
     platform_allow: nrf5340dk/nrf5340/cpunet
-    extra_args: DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
+    extra_args:
+      - DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
     tags:
@@ -40,7 +44,9 @@ tests:
     platform_allow: nrf52833dk/nrf52833
     integration_platforms:
       - nrf52833dk/nrf52833
-    extra_args: DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+    extra_args:
+      - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
       - CONFIG_BT_CTLR_DTM_HCI_DF_IQ_REPORT=y
@@ -50,7 +56,9 @@ tests:
   sample.bluetooth.hci_uart.nrf5340_netcore.df.iq_report:
     harness: bluetooth
     platform_allow: nrf5340dk/nrf5340/cpunet
-    extra_args: DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
+    extra_args:
+      - DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
       - CONFIG_BT_CTLR_DTM_HCI_DF_IQ_REPORT=y
@@ -84,6 +92,7 @@ tests:
     extra_args:
       - EXTRA_CONF_FILE=overlay-all-bt_ll_sw_split.conf
       - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     tags:
       - uart
       - bluetooth
@@ -95,6 +104,7 @@ tests:
     extra_args:
       - EXTRA_CONF_FILE=overlay-all-bt_ll_sw_split.conf
       - DTC_OVERLAY_FILE=./boards/nrf54l15dk_nrf54l15_cpuapp_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     tags:
       - uart
       - bluetooth
diff --git a/samples/bluetooth/hci_vs_scan_req/sample.yaml b/samples/bluetooth/hci_vs_scan_req/sample.yaml
index 245a83aa0d9..49526522d16 100644
--- a/samples/bluetooth/hci_vs_scan_req/sample.yaml
+++ b/samples/bluetooth/hci_vs_scan_req/sample.yaml
@@ -9,4 +9,6 @@ tests:
       - nrf52dk/nrf52832
     extra_configs:
       - CONFIG_BT_LL_SW_SPLIT=y
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/iso_central/sample.yaml b/samples/bluetooth/iso_central/sample.yaml
index 3a7dedd404a..57254ee809a 100644
--- a/samples/bluetooth/iso_central/sample.yaml
+++ b/samples/bluetooth/iso_central/sample.yaml
@@ -11,11 +11,11 @@ tests:
   sample.bluetooth.iso_central.bt_ll_sw_split:
     harness: bluetooth
     platform_allow:
-      - qemu_cortex_m3
-      - qemu_x86
       - nrf52_bsim
       - nrf52833dk/nrf52833
     integration_platforms:
       - nrf52833dk/nrf52833
-    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml b/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
index d7c816ee5b7..901d40b00d4 100644
--- a/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
+++ b/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
@@ -23,5 +23,7 @@ tests:
     integration_platforms:
       - nrf52_bsim
       - nrf52833dk/nrf52833
-    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake b/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake
+++ b/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/pbp_public_broadcast_source/sample.yaml b/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
index 80c90704211..1d2e31306e2 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
+++ b/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
@@ -23,5 +23,7 @@ tests:
     integration_platforms:
       - nrf52_bsim
       - nrf52833dk/nrf52833
-    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake b/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake
index d3bf7be5b6c..e0a7fd9d175 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake
+++ b/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake
@@ -18,6 +18,10 @@ if(NOT("${SB_CONFIG_NET_CORE_BOARD}" STREQUAL ""))
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/snippets/bt-ll-sw-split/bt-ll-sw-split.overlay b/snippets/bt-ll-sw-split/bt-ll-sw-split.overlay
index 04bf83ef44d..a57a0e82ba6 100644
--- a/snippets/bt-ll-sw-split/bt-ll-sw-split.overlay
+++ b/snippets/bt-ll-sw-split/bt-ll-sw-split.overlay
@@ -2,6 +2,10 @@
 	status = "okay";
 };
 
+&bt_hci_sdc {
+	status = "disabled";
+};
+
 / {
 	chosen {
 		zephyr,bt-hci = &bt_hci_controller;
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
index ebfdf364941..d449c9736b1 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
@@ -62,7 +62,7 @@ static struct {
 /* FIXME: This could probably use a chosen entropy device instead on relying on
  * the nodelabel being the same as for the old nrf rng.
  */
-static const struct device *const dev_entropy = DEVICE_DT_GET(DT_NODELABEL(rng));
+static const struct device *const dev_entropy = DEVICE_DT_GET(DT_CHOSEN(zephyr_entropy));
 #endif /* CONFIG_ENTROPY_HAS_DRIVER */
 
 static int init_reset(void);
diff --git a/tests/bluetooth/controller/ctrl_api/testcase.yaml b/tests/bluetooth/controller/ctrl_api/testcase.yaml
index 19bf6c9ab49..21f178bf9b2 100644
--- a/tests/bluetooth/controller/ctrl_api/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_api/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_api.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_chmu/testcase.yaml b/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
index f7e8068d60e..9c3ee626433 100644
--- a/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_chmu.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml b/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
index 99612a89bc3..2371d7063eb 100644
--- a/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_cis_create.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml b/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
index 956172a89b2..a98229ba45f 100644
--- a/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_cis_terminate.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_collision/testcase.yaml b/tests/bluetooth/controller/ctrl_collision/testcase.yaml
index 6086a9a4ebc..daa8f3bc6c3 100644
--- a/tests/bluetooth/controller/ctrl_collision/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_collision/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_collision.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml b/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
index 5b0bda4b908..fc4ecb0b647 100644
--- a/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
@@ -7,11 +7,18 @@ common:
 tests:
   bluetooth.controller.ctrl_conn_update.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_conn_update.apm_test:
     type: unit
-    extra_args: CONF_FILE=prj_apm.conf
+    extra_args:
+      - CONF_FILE=prj_apm.conf
+      - SNIPPET="bt-ll-sw-split"
+
 
   bluetooth.controller.ctrl_conn_update.no_param_req_test:
     type: unit
-    extra_args: CONF_FILE=prj_no_param_req.conf
+    extra_args:
+      - CONF_FILE=prj_no_param_req.conf
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml b/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
index fd6ff51118d..c6288aecc43 100644
--- a/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_cte_req.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml b/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
index 9778af435b4..c7d1174e12b 100644
--- a/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
@@ -6,11 +6,17 @@ common:
 tests:
   bluetooth.controller.ctrl_data_length_update.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_data_length_update.test_nocodedphy:
     type: unit
-    extra_args: CONF_FILE=prj_nocoded.conf
+    extra_args:
+      - CONF_FILE=prj_nocoded.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_data_length_update.test_nophy:
     type: unit
-    extra_args: CONF_FILE=prj_nophy.conf
+    extra_args:
+      - CONF_FILE=prj_nophy.conf
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml b/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
index d5bb2cb8b11..86dd5bfe4d3 100644
--- a/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_encrypt.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml b/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
index 257542f3612..087e49575ff 100644
--- a/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_feature_exchange.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_hci/testcase.yaml b/tests/bluetooth/controller/ctrl_hci/testcase.yaml
index c750ebc8dd8..5e00c85f6f4 100644
--- a/tests/bluetooth/controller/ctrl_hci/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_hci/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_hci.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_invalid/testcase.yaml b/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
index 2d1741931e3..cee54e6b09e 100644
--- a/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_invalid.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml b/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
index b6a77528f32..54178905da1 100644
--- a/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_le_ping.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml b/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
index 0991b0cdd43..a9445cbf8c4 100644
--- a/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_min_used_chans.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml b/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
index 1d7da169f1d..d5c49d587a8 100644
--- a/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
@@ -6,6 +6,10 @@ common:
 tests:
   bluetooth.controller.ctrl_phy_update.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
   bluetooth.controller.ctrl_phy_update.test_reduced_buf:
     type: unit
-    extra_args: CONF_FILE=prj_rx_cnt.conf
+    extra_args:
+      - CONF_FILE=prj_rx_cnt.conf
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml b/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
index cbf63aa1b57..cbc3c3faf72 100644
--- a/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_sca_update.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml b/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml
index 778606d6954..ac5dd6e957e 100644
--- a/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml
@@ -4,3 +4,5 @@ common:
 tests:
   bluetooth.ctrl_sw_privacy.test:
     platform_allow: nrf52_bsim
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_terminate/testcase.yaml b/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
index cbe639401ea..6b1409e9653 100644
--- a/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_terminate.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml
index 614eb7fe94c..363986bd3d3 100644
--- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml
@@ -6,23 +6,35 @@ common:
 tests:
   bluetooth.controller.ctrl_tx_buffer_alloc.test_0_per_conn:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_1_per_conn:
     type: unit
-    extra_args: CONF_FILE=prj_1.conf
+    extra_args:
+      - CONF_FILE=prj_1.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_2_per_conn:
     type: unit
-    extra_args: CONF_FILE=prj_2.conf
+    extra_args:
+      - CONF_FILE=prj_2.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_3_per_conn:
     type: unit
-    extra_args: CONF_FILE=prj_3.conf
+    extra_args:
+      - CONF_FILE=prj_3.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_max_per_conn_alloc:
     type: unit
-    extra_args: CONF_FILE=prj_max.conf
+    extra_args:
+      - CONF_FILE=prj_max.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_max_common_alloc:
     type: unit
-    extra_args: CONF_FILE=prj_max_common.conf
+    extra_args:
+      - CONF_FILE=prj_max_common.conf
+       - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml b/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml
index 295ad891a63..282b620b317 100644
--- a/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml
@@ -5,3 +5,5 @@ common:
 tests:
   bluetooth.ctrl_tx_queue.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml b/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml
index 28aba1a752a..48b18af9353 100644
--- a/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml
@@ -6,7 +6,11 @@ common:
 tests:
   bluetooth.controller.ctrl_unsupported.default.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_unsupported.test:
     type: unit
-    extra_args: CONF_FILE=prj_unsupported.conf
+    extra_args:
+      - CONF_FILE=prj_unsupported.conf
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml b/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml
index af319a7a719..be963df24a8 100644
--- a/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml
@@ -4,3 +4,5 @@ common:
 tests:
   bluetooth.ctrl_user_ext.test:
     platform_allow: nrf52_bsim
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_version/testcase.yaml b/tests/bluetooth/controller/ctrl_version/testcase.yaml
index 6badcbc7254..5df86b9bca9 100644
--- a/tests/bluetooth/controller/ctrl_version/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_version/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_version.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connection_cte_req/testcase.yaml b/tests/bluetooth/df/connection_cte_req/testcase.yaml
index 768aba4a51f..fbfe4b0d9a1 100644
--- a/tests/bluetooth/df/connection_cte_req/testcase.yaml
+++ b/tests/bluetooth/df/connection_cte_req/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.conection_cte_req:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml b/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml
index 38a23b0950e..a9986c5b0e5 100644
--- a/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml
+++ b/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.conection_cte_tx_params:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml b/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
index 6aa5bb0f0c1..844a7bbb524 100644
--- a/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.connectionless_cte_chains:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml b/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml
index f839b1910eb..c8f08a90843 100644
--- a/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.connectionless_cte_rx:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml b/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml
index 77d651d0cbc..491cc0e7e59 100644
--- a/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.connectionless_cte_tx:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/init/testcase.yaml b/tests/bluetooth/init/testcase.yaml
index 9badf5e1a69..778049c511a 100644
--- a/tests/bluetooth/init/testcase.yaml
+++ b/tests/bluetooth/init/testcase.yaml
@@ -74,7 +74,9 @@ tests:
     extra_args: CONF_FILE=prj_9.conf
     platform_allow: qemu_cortex_m3
   bluetooth.init.test_ctlr:
-    extra_args: CONF_FILE=prj_ctlr.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -86,7 +88,9 @@ tests:
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_4_0:
-    extra_args: CONF_FILE=prj_ctlr_4_0.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_4_0.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -95,7 +99,9 @@ tests:
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_4_0_dbg:
-    extra_args: CONF_FILE=prj_ctlr_4_0_dbg.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_4_0_dbg.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -104,7 +110,9 @@ tests:
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_tiny:
-    extra_args: CONF_FILE=prj_ctlr_tiny.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_tiny.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -116,6 +124,7 @@ tests:
     extra_args:
       - CONF_FILE=prj_ctlr_dbg.conf
       - DTC_OVERLAY_FILE=pa_lna.overlay
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -126,6 +135,7 @@ tests:
     extra_args:
       - CONF_FILE=prj_ctlr_5_x_dbg.conf
       - DTC_OVERLAY_FILE=pa_lna.overlay
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -137,6 +147,7 @@ tests:
       - CONF_FILE=prj_ctlr.conf
       - CONFIG_BT_CTLR_ADVANCED_FEATURES=y
       - CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER=y
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf52840dk/nrf52840
@@ -146,13 +157,16 @@ tests:
   bluetooth.init.test_ctlr_ticker:
     extra_args:
       - CONF_FILE=prj_ctlr_ticker.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
     integration_platforms:
       - nrf52dk/nrf52832
   bluetooth.init.test_ctlr_broadcaster:
-    extra_args: CONF_FILE=prj_ctlr_broadcaster.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_broadcaster.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -161,7 +175,9 @@ tests:
     integration_platforms:
       - nrf52dk/nrf52832
   bluetooth.init.test_ctlr_peripheral:
-    extra_args: CONF_FILE=prj_ctlr_peripheral.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -170,7 +186,9 @@ tests:
     integration_platforms:
       - nrf52dk/nrf52832
   bluetooth.init.test_ctlr_peripheral_priv:
-    extra_args: CONF_FILE=prj_ctlr_peripheral_priv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral_priv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -179,7 +197,9 @@ tests:
     integration_platforms:
       - nrf52840dk/nrf52840
   bluetooth.init.test_ctlr_observer:
-    extra_args: CONF_FILE=prj_ctlr_observer.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_observer.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -188,7 +208,9 @@ tests:
     integration_platforms:
       - nrf52dk/nrf52832
   bluetooth.init.test_ctlr_central:
-    extra_args: CONF_FILE=prj_ctlr_central.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -198,7 +220,9 @@ tests:
       - nrf52dk/nrf52832
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_central_priv:
-    extra_args: CONF_FILE=prj_ctlr_central_priv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central_priv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -208,7 +232,9 @@ tests:
       - nrf52dk/nrf52832
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_broadcaster_ext:
-    extra_args: CONF_FILE=prj_ctlr_broadcaster_ext.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_broadcaster_ext.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -217,7 +243,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_peripheral_ext:
-    extra_args: CONF_FILE=prj_ctlr_peripheral_ext.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral_ext.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -226,7 +254,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_peripheral_ext_priv:
-    extra_args: CONF_FILE=prj_ctlr_peripheral_ext_priv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral_ext_priv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -235,7 +265,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_oberver_ext:
-    extra_args: CONF_FILE=prj_ctlr_observer_ext.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_observer_ext.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -244,7 +276,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_central_ext:
-    extra_args: CONF_FILE=prj_ctlr_central_ext.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central_ext.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -253,7 +287,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_central_ext_priv:
-    extra_args: CONF_FILE=prj_ctlr_central_ext_priv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central_ext_priv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -262,7 +298,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_adv:
-    extra_args: CONF_FILE=prj_ctlr_per_adv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_adv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -271,7 +309,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_adv_no_adi:
-    extra_args: CONF_FILE=prj_ctlr_per_adv_no_adi.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_adv_no_adi.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -280,7 +320,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_sync:
-    extra_args: CONF_FILE=prj_ctlr_per_sync.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_sync.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -289,7 +331,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_sync_no_adi:
-    extra_args: CONF_FILE=prj_ctlr_per_sync_no_adi.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_sync_no_adi.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -298,7 +342,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_sync_no_filter:
-    extra_args: CONF_FILE=prj_ctlr_per_sync_no_filter.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_sync_no_filter.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -307,7 +353,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_peripheral_iso:
-    extra_args: CONF_FILE=prj_ctlr_peripheral_iso.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral_iso.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -316,7 +364,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_central_iso:
-    extra_args: CONF_FILE=prj_ctlr_central_iso.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central_iso.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -335,7 +385,9 @@ tests:
       - DTC_OVERLAY_FILE=h5.overlay
     platform_allow: qemu_cortex_m3
   bluetooth.init.test_llcp:
-    extra_args: CONF_FILE=prj_llcp.conf
+    extra_args:
+      - CONF_FILE=prj_llcp.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -347,5 +399,6 @@ tests:
     extra_args:
       - CONF_FILE=prj_ctlr.conf
       - CONFIG_BT_RECV_WORKQ_BT=y
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840

From 4c3af28f5d55a4608f18204911256dca2267c7dc Mon Sep 17 00:00:00 2001
From: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
Date: Wed, 20 Nov 2024 15:14:15 +0530
Subject: [PATCH 2176/2913] [nrf fromlist] nrfwifi: Display EAP_TLS_SHA256
 security in scan results

EAP_TLS_SHA256 was being identified as EAP_TLS in display scan
results. Identify the security type in scan results sent by
RPU and display accordingly.

Upstream PR #: 81514

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
(cherry picked from commit 4092e6df311e18779fe1bb28ca29fff9e7931891)
---
 drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c b/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
index e30f572aeb3..f85c71c4f5f 100644
--- a/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
+++ b/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
@@ -297,6 +297,8 @@ static inline enum wifi_security_type drv_to_wifi_mgmt(int drv_security_type)
 		return WIFI_SECURITY_TYPE_WAPI;
 	case NRF_WIFI_EAP:
 		return WIFI_SECURITY_TYPE_EAP;
+	case NRF_WIFI_EAP_TLS_SHA256:
+		return WIFI_SECURITY_TYPE_EAP_TLS_SHA256;
 	default:
 		return WIFI_SECURITY_TYPE_UNKNOWN;
 	}

From 68e32853ebda5611ab393197c5e320908642d509 Mon Sep 17 00:00:00 2001
From: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Date: Thu, 19 Sep 2024 13:02:57 +0200
Subject: [PATCH 2177/2913] [nrf noup] drivers: flash: Allow reading secure mem
 by nrf_rram.

fixup! [nrf noup] tree-wide: support NCS Partition Manager (PM) definitions

To read the secure memory we need to use soc_secure_mem_read
function instead of memcpy.

This commit allows to use the soc_secure_mem_read function
if the CONFIG_TRUSTED_EXECUTION_NONSECURE and PARTITION_MANAGER
is enabled.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
(cherry picked from commit 711346aa377a65263784cd0d37efc9230e68229b)
---
 drivers/flash/soc_flash_nrf_rram.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/flash/soc_flash_nrf_rram.c b/drivers/flash/soc_flash_nrf_rram.c
index d26a15cf723..d46e3524ea8 100644
--- a/drivers/flash/soc_flash_nrf_rram.c
+++ b/drivers/flash/soc_flash_nrf_rram.c
@@ -54,6 +54,11 @@ LOG_MODULE_REGISTER(flash_nrf_rram, CONFIG_FLASH_LOG_LEVEL);
 #define WRITE_BLOCK_SIZE_FROM_DT DT_PROP(RRAM, write_block_size)
 #define ERASE_VALUE              0xFF
 
+#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER
+#include <soc_secure.h>
+#include <pm_config.h>
+#endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER */
+
 #ifdef CONFIG_MULTITHREADING
 static struct k_sem sem_lock;
 #define SYNC_INIT()   k_sem_init(&sem_lock, 1, 1)
@@ -279,6 +284,12 @@ static int nrf_rram_read(const struct device *dev, off_t addr, void *data, size_
 	}
 	addr += RRAM_START;
 
+#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER && PM_APP_ADDRESS
+	if (addr < PM_APP_ADDRESS) {
+		return soc_secure_mem_read(data, (void *)addr, len);
+	}
+#endif
+
 	memcpy(data, (void *)addr, len);
 
 	return 0;

From 27421706c10224be7dfa35cd29b5b5027fb6ab1b Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 10 Dec 2024 14:06:31 +0100
Subject: [PATCH 2178/2913] [nrf fromlist] drivers: pinctrl: nrf: Add support
 for clock outputs

Add support for GRTC clock output pins.

Upstream PR #: 82788

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 drivers/pinctrl/pinctrl_nrf.c                 | 27 +++++++++++++++++++
 .../zephyr/dt-bindings/pinctrl/nrf-pinctrl.h  |  4 +++
 2 files changed, 31 insertions(+)

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 3a05e3a3618..9cc18a2821c 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -99,6 +99,15 @@ static const nrf_gpio_pin_drive_t drive_modes[NRF_DRIVE_COUNT] = {
 #define NRF_PSEL_TWIS(reg, line) ((NRF_TWIS_Type *)reg)->PSEL.line
 #endif
 
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc) || defined(CONFIG_NRFX_GRTC)
+#if DT_NODE_HAS_PROP(DT_NODELABEL(grtc), clkout_fast_frequency)
+#define NRF_GRTC_CLKOUT_FAST 1
+#endif
+#if DT_NODE_HAS_PROP(DT_NODELABEL(grtc), clkout_32k_frequency)
+#define NRF_GRTC_CLKOUT_SLOW 1
+#endif
+#endif
+
 int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			   uintptr_t reg)
 {
@@ -345,6 +354,24 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
 			break;
 #endif /* defined(NRF_PSEL_QSPI) */
+#if defined(NRF_GRTC_CLKOUT_FAST)
+		case NRF_FUN_GRTC_CLKOUT_FAST:
+#if NRF_GPIO_HAS_SEL && defined(GPIO_PIN_CNF_CTRLSEL_GRTC)
+			nrf_gpio_pin_control_select(psel, NRF_GPIO_PIN_SEL_GRTC);
+#endif
+			dir = NRF_GPIO_PIN_DIR_OUTPUT;
+			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
+			break;
+#endif /* defined(NRF_GRTC_CLKOUT_FAST) */
+#if defined(NRF_GRTC_CLKOUT_SLOW)
+		case NRF_FUN_GRTC_CLKOUT_32K:
+#if NRF_GPIO_HAS_SEL && defined(GPIO_PIN_CNF_CTRLSEL_GRTC)
+			nrf_gpio_pin_control_select(psel, NRF_GPIO_PIN_SEL_GRTC);
+#endif
+			dir = NRF_GPIO_PIN_DIR_OUTPUT;
+			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
+			break;
+#endif /* defined(NRF_GRTC_CLKOUT_SLOW) */
 #if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_can)
 		/* Pin routing is controlled by secure domain, via UICR */
 		case NRF_FUN_CAN_TX:
diff --git a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
index 533d0f1ff7e..51656a15074 100644
--- a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
@@ -166,6 +166,10 @@
 #define NRF_FUN_TWIS_SCL 48U
 /** TWIS SDA */
 #define NRF_FUN_TWIS_SDA 49U
+/** GRTC fast clock output */
+#define NRF_FUN_GRTC_CLKOUT_FAST 55U
+/** GRTC slow clock output */
+#define NRF_FUN_GRTC_CLKOUT_32K  56U
 
 /** @} */
 

From 17dbed717a3746acae53d4f9851a0fbd60d4de9d Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 10 Dec 2024 14:08:35 +0100
Subject: [PATCH 2179/2913] [nrf fromlist] dts: nordic: Add support for clock
 outputs

Add support for GRTC clock output pins.

Upstream PR #: 82788

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit a7b06baa1d4a61108b85d822e9bc122012864da8)
---
 .../nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts |  2 ++
 .../nrf54h20dk_nrf54h20-pinctrl.dtsi          | 15 ++++++++++++
 .../nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi   | 15 ++++++++++++
 dts/bindings/timer/nordic,nrf-grtc.yaml       | 24 ++++++++++++++++++-
 dts/common/nordic/nrf54h20.dtsi               |  7 ++----
 dts/common/nordic/nrf54l20.dtsi               |  8 +++++++
 dts/common/nordic/nrf54l_05_10_15.dtsi        |  8 +++++++
 7 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
index 8e53dfe09dc..7d0a2f96aa5 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -69,6 +69,8 @@
 	/* Channels 7-11 reserved for Zero Latency IRQs, 3-4 for FLPR */
 	child-owned-channels = <3 4 7 8 9 10 11>;
 	status = "okay";
+	/delete-property/ clocks;
+	/delete-property/ clock-names;
 };
 
 &cpuapp_rram {
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
index 79ac2c6b7ad..9b574a18ec5 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
@@ -98,4 +98,19 @@
 			low-power-enable;
 		};
 	};
+
+	/omit-if-no-ref/ grtc_default: grtc_default {
+		group1 {
+			psels = <NRF_PSEL(GRTC_CLKOUT_FAST, 1, 8)>,
+				<NRF_PSEL(GRTC_CLKOUT_32K, 0, 1)>;
+		};
+	};
+
+	/omit-if-no-ref/ grtc_sleep: grtc_sleep {
+		group1 {
+			psels = <NRF_PSEL(GRTC_CLKOUT_FAST, 1, 8)>,
+				<NRF_PSEL(GRTC_CLKOUT_32K, 0, 1)>;
+			low-power-enable;
+		};
+	};
 };
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi
index 0b6e2056a82..6b7457a2818 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi
@@ -77,4 +77,19 @@
 			low-power-enable;
 		};
 	};
+
+	/omit-if-no-ref/ grtc_default: grtc_default {
+		group1 {
+			psels = <NRF_PSEL(GRTC_CLKOUT_FAST, 1, 8)>,
+				<NRF_PSEL(GRTC_CLKOUT_32K, 0, 4)>;
+		};
+	};
+
+	/omit-if-no-ref/ grtc_sleep: grtc_sleep {
+		group1 {
+			psels = <NRF_PSEL(GRTC_CLKOUT_FAST, 1, 8)>,
+				<NRF_PSEL(GRTC_CLKOUT_32K, 0, 4)>;
+			low-power-enable;
+		};
+	};
 };
diff --git a/dts/bindings/timer/nordic,nrf-grtc.yaml b/dts/bindings/timer/nordic,nrf-grtc.yaml
index e78e57df97e..4b041d0adc1 100644
--- a/dts/bindings/timer/nordic,nrf-grtc.yaml
+++ b/dts/bindings/timer/nordic,nrf-grtc.yaml
@@ -4,18 +4,40 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description: Nordic GRTC (Global RTC)
+description: |
+  Nordic GRTC (Global RTC)
+
+      Example of using clock outputs:
+        &grtc {
+          pinctrl-0 = <&grtc_default>;
+          pinctrl-1 = <&grtc_sleep>;
+          pinctrl-names = "default", "sleep";
+          clkout-fast-frequency = <8000000>;
+          clkout-32k;
+          /* In case of nRF54H20 devices: */
+          nordic,clockpin-enable = <NRF_FUN_GRTC_CLKOUT_FAST>;
+        };
 
 compatible: "nordic,nrf-grtc"
 
 include:
   - "base.yaml"
   - "nordic,split-channels.yaml"
+  - "pinctrl-device.yaml"
+  - "nordic-clockpin.yaml"
 
 properties:
   reg:
     required: true
 
+  clkout-fast-frequency:
+    type: int
+    description: Fast output clock frequency.
+
+  clkout-32k:
+    type: boolean
+    description: 32768 Hz output clock frequency enable.
+
   interrupts:
     required: true
 
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 061f53b9d68..e67251b17a2 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -956,11 +956,8 @@
 				reg = <0x99c000 0x1000>;
 				status = "disabled";
 				cc-num = <16>;
-				/* GRTC uses both LFCLK and FLL16M, but its accuracy and
-				 * precision are inherited from LFCLK. that's why this
-				 *  one is linked here.
-				 */
-				clocks = <&lfclk>;
+				clocks = <&lfclk>, <&fll16m>;
+				clock-names = "lfclock", "hfclock";
 				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 48ea4d9abbc..74230163123 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -35,6 +35,12 @@
 	};
 
 	clocks {
+		pclk: pclk {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <DT_FREQ_M(16)>;
+		};
+
 		lfxo: lfxo {
 			compatible = "nordic,nrf-lfxo";
 			#clock-cells = <0>;
@@ -506,6 +512,8 @@
 				compatible = "nordic,nrf-grtc";
 				reg = <0xe2000 0x1000>;
 				cc-num = <12>;
+				clocks = <&lfxo>, <&pclk>;
+				clock-names = "lfclock", "hfclock";
 				status = "disabled";
 			};
 
diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi
index b2e3c70bf5f..d1141643ef1 100644
--- a/dts/common/nordic/nrf54l_05_10_15.dtsi
+++ b/dts/common/nordic/nrf54l_05_10_15.dtsi
@@ -48,6 +48,12 @@
 	};
 
 	clocks {
+		pclk: pclk {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <DT_FREQ_M(16)>;
+		};
+
 		lfxo: lfxo {
 			compatible = "nordic,nrf-lfxo";
 			#clock-cells = <0>;
@@ -555,6 +561,8 @@
 				compatible = "nordic,nrf-grtc";
 				reg = <0xe2000 0x1000>;
 				cc-num = <12>;
+				clocks = <&lfxo>, <&pclk>;
+				clock-names = "lfclock", "hfclock";
 				status = "disabled";
 			};
 

From 987a7ad99f8609f52cb3241e7fa48594967ce514 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 10 Dec 2024 14:10:52 +0100
Subject: [PATCH 2180/2913] [nrf fromlist] drivers: timer: nrf_grtc: Add
 support for clock outputs

Add support for GRTC clock output pins.

Upstream PR #: 82788

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit af6174f17710041d9d6efea8248fc2835aa55a7f)
---
 drivers/timer/nrf_grtc_timer.c | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/drivers/timer/nrf_grtc_timer.c b/drivers/timer/nrf_grtc_timer.c
index ee3f35e09d0..05779038142 100644
--- a/drivers/timer/nrf_grtc_timer.c
+++ b/drivers/timer/nrf_grtc_timer.c
@@ -10,12 +10,15 @@
 #if defined(CONFIG_CLOCK_CONTROL_NRF)
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #endif
+#include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/drivers/timer/nrf_grtc_timer.h>
 #include <nrfx_grtc.h>
 #include <zephyr/sys/math_extras.h>
 
 #define GRTC_NODE DT_NODELABEL(grtc)
+#define HFCLK_NODE DT_PHANDLE_BY_NAME(GRTC_NODE, clocks, hfclock)
+#define LFCLK_NODE DT_PHANDLE_BY_NAME(GRTC_NODE, clocks, lfclock)
 
 /* Ensure that GRTC properties in devicetree are defined correctly. */
 #if !DT_NODE_HAS_PROP(GRTC_NODE, owned_channels)
@@ -49,7 +52,7 @@
 
 #define MAX_CYCLES (MAX_TICKS * CYC_PER_TICK)
 
-#define LFCLK_FREQUENCY_HZ 32768
+#define LFCLK_FREQUENCY_HZ DT_PROP(LFCLK_NODE, clock_frequency)
 
 #if defined(CONFIG_TEST)
 const int32_t z_sys_timer_irq_for_test = DT_IRQN(GRTC_NODE);
@@ -518,7 +521,35 @@ static int sys_clock_driver_init(void)
 #if defined(CONFIG_NRF_GRTC_ALWAYS_ON)
 	nrfx_grtc_active_request_set(true);
 #endif
+
+#if DT_PROP(GRTC_NODE, clkout_32k)
+	nrfy_grtc_clkout_set(NRF_GRTC, NRF_GRTC_CLKOUT_32K, true);
+#endif
+
+#if DT_NODE_HAS_PROP(GRTC_NODE, clkout_fast_frequency)
+#if !DT_NODE_HAS_PROP(HFCLK_NODE, clock_frequency)
+#error "hfclock reference required when fast clock output is enabled."
+#endif
+
+#if DT_PROP(GRTC_NODE, clkout_fast_frequency) > (DT_PROP(HFCLK_NODE, clock_frequency) / 2)
+#error "Invalid frequency value for fast clock output."
+#endif
+	uint32_t base_frequency = DT_PROP(HFCLK_NODE, clock_frequency);
+	uint32_t requested_frequency = DT_PROP(GRTC_NODE, clkout_fast_frequency);
+	uint32_t grtc_div = base_frequency / (requested_frequency * 2);
+
+	nrfy_grtc_clkout_divider_set(NRF_GRTC, (uint8_t)grtc_div);
+	nrfy_grtc_clkout_set(NRF_GRTC, NRF_GRTC_CLKOUT_FAST, true);
+#endif
+
+#if DT_PROP(GRTC_NODE, clkout_32k) || DT_NODE_HAS_PROP(GRTC_NODE, clkout_fast_frequency)
+	PINCTRL_DT_DEFINE(GRTC_NODE);
+	const struct pinctrl_dev_config *pcfg = PINCTRL_DT_DEV_CONFIG_GET(GRTC_NODE);
+
+	return pinctrl_apply_state(pcfg, PINCTRL_STATE_DEFAULT);
+#else
 	return 0;
+#endif
 }
 
 void sys_clock_set_timeout(int32_t ticks, bool idle)

From f1de584a5a824ebc09104e45c46a87acf3306b40 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 28 Nov 2024 14:03:03 +0100
Subject: [PATCH 2181/2913] [nrf fromtree] tests: arch: arm:
 arm_irq_vector_table: Fix for nRF54H20

Fix failing tests for nRF54H20 targets.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 2b91df8810551f61818145ced03b2d4d97458b2c)
---
 .../arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.conf     | 1 +
 .../arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpurad.conf     | 1 +
 .../arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf  | 1 +
 .../arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf  | 1 +
 .../arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.conf   | 1 +
 .../arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpurad.conf   | 1 +
 6 files changed, 6 insertions(+)
 create mode 100644 tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpurad.conf
 create mode 100644 tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf
 create mode 100644 tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpurad.conf

diff --git a/tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpurad.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/arch/arm/arm_interrupt/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpurad.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n

From 780667762da5c05318e0ed3e3c777bc0a0302408 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Fri, 22 Nov 2024 13:50:45 +0100
Subject: [PATCH 2182/2913] [nrf fromlist] soc: nordic: nrf54h20: disallow
 using LR in s2ram marking function

This change ensures that LR will not be implicitly used when calling
`pm_s2ram_mark_check_and_clear`.

Upstream PR #: 81853

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 269aa0f7cbe1c293f1b6dedbb5275a90af3453c6)
---
 soc/nordic/nrf54h/pm_s2ram.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/soc/nordic/nrf54h/pm_s2ram.c b/soc/nordic/nrf54h/pm_s2ram.c
index 20c28e42df5..ea9e60973d1 100644
--- a/soc/nordic/nrf54h/pm_s2ram.c
+++ b/soc/nordic/nrf54h/pm_s2ram.c
@@ -132,6 +132,8 @@ void __attribute__((naked)) pm_s2ram_mark_set(void)
 
 bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
 {
+	register uint32_t link_reg __asm__("r14");
+
 	__asm__ volatile(
 		/* Set return value to 0 */
 		"mov	r0, #0\n"
@@ -159,13 +161,14 @@ bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
 		"mov	r0, #1\n"
 
 		"exit:\n"
-		"bx	lr\n"
+		"bx	%[link_reg]\n"
 		:
 		: [resetinfo_addr] "r"(NRF_RESETINFO),
 		  [resetreas_offs] "r"(offsetof(NRF_RESETINFO_Type, RESETREAS.LOCAL)),
 		  [resetreas_unretained_mask] "r"(NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK),
 		  [restorevalid_offs] "r"(offsetof(NRF_RESETINFO_Type, RESTOREVALID)),
-		  [restorevalid_present_mask] "r"(RESETINFO_RESTOREVALID_RESTOREVALID_Msk)
+		  [restorevalid_present_mask] "r"(RESETINFO_RESTOREVALID_RESTOREVALID_Msk),
+		  [link_reg] "r"(link_reg)
 
-		: "r0", "r1", "r3", "r4", "memory");
+		: "r0", "r1", "r3", "r4", "cc", "memory");
 }

From b978fbb9ae2c62cc924f458158c7033cdb69acbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karol=20Laso=C5=84czyk?= <karol.lasonczyk@nordicsemi.no>
Date: Fri, 22 Nov 2024 10:02:36 +0100
Subject: [PATCH 2183/2913] [nrf noup] drivers: hwinfo: Support for reset
 reasons in nRF54H20
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adding support for reset reasons in the nRF54H20 SoC.

Upstream PR #: 81751

This commit should be replaced with a fromtree one, since PR 81751 has
been already merged, but the latter became dependent on nrfx 3.10.0
which is not present in the upmerge and integrating it at the final
stage of the upmerge is too risky, hence the commit has been turned
into a noup. It is supposed to be replaced with the proper fromtree
commit right after the upmerge.

Signed-off-by: Karol Lasończyk <karol.lasonczyk@nordicsemi.no>
---
 drivers/hwinfo/hwinfo_nrf.c | 48 ++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/drivers/hwinfo/hwinfo_nrf.c b/drivers/hwinfo/hwinfo_nrf.c
index d1fca5350a6..48b8a3ea5f4 100644
--- a/drivers/hwinfo/hwinfo_nrf.c
+++ b/drivers/hwinfo/hwinfo_nrf.c
@@ -8,8 +8,13 @@
 #include <zephyr/drivers/hwinfo.h>
 #include <string.h>
 #include <zephyr/sys/byteorder.h>
-#if !defined(CONFIG_SOC_SERIES_NRF54HX) && !defined(CONFIG_BOARD_QEMU_CORTEX_M0)
+#if defined(CONFIG_BOARD_QEMU_CORTEX_M0) || \
+	(defined(CONFIG_NRF_PLATFORM_HALTIUM) && \
+	 defined(CONFIG_RISCV_CORE_NORDIC_VPR))
+#define RESET_CAUSE_AVAILABLE 0
+#else
 #include <helpers/nrfx_reset_reason.h>
+#define RESET_CAUSE_AVAILABLE 1
 #endif
 
 #if defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) && defined(NRF_FICR_S)
@@ -63,7 +68,30 @@ ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 	return length;
 }
 
-#if !defined(CONFIG_SOC_SERIES_NRF54HX) && !defined(CONFIG_BOARD_QEMU_CORTEX_M0)
+#if RESET_CAUSE_AVAILABLE
+
+#if defined(NRF_RESETINFO)
+
+#define REASON_LOCKUP (NRFX_RESET_REASON_LOCKUP | NRFX_RESET_REASON_LOCAL_LOCKUP_MASK)
+#define REASON_SOFTWARE (NRFX_RESET_REASON_SREQ | NRFX_RESET_REASON_LOCAL_SREQ_MASK)
+#define REASON_WATCHDOG	\
+	(NRFX_RESET_REASON_DOG_MASK | \
+	 NRFX_RESET_REASON_LOCAL_DOG1_MASK | \
+	 NRFX_RESET_REASON_LOCAL_DOG0_MASK)
+
+#else /* NRF_RESETINFO */
+
+#define REASON_LOCKUP NRFX_RESET_REASON_LOCKUP_MASK
+#define REASON_SOFTWARE NRFX_RESET_REASON_SREQ_MASK
+
+#if NRF_POWER_HAS_RESETREAS
+#define REASON_WATCHDOG NRFX_RESET_REASON_DOG_MASK
+#else
+#define REASON_WATCHDOG	NRFX_RESET_REASON_DOG1_MASK
+#endif /* NRF_POWER_HAS_RESETREAS */
+
+#endif /* NRF_RESETINFO */
+
 int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 {
 	uint32_t flags = 0;
@@ -73,19 +101,21 @@ int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 	if (reason & NRFX_RESET_REASON_RESETPIN_MASK) {
 		flags |= RESET_PIN;
 	}
-	if (reason & NRFX_RESET_REASON_DOG_MASK) {
+	if (reason & REASON_WATCHDOG) {
 		flags |= RESET_WATCHDOG;
 	}
-	if (reason & NRFX_RESET_REASON_LOCKUP_MASK) {
+
+	if (reason & REASON_LOCKUP) {
 		flags |= RESET_CPU_LOCKUP;
 	}
+
 	if (reason & NRFX_RESET_REASON_OFF_MASK) {
 		flags |= RESET_LOW_POWER_WAKE;
 	}
 	if (reason & NRFX_RESET_REASON_DIF_MASK) {
 		flags |= RESET_DEBUG;
 	}
-	if (reason & NRFX_RESET_REASON_SREQ_MASK) {
+	if (reason & REASON_SOFTWARE) {
 		flags |= RESET_SOFTWARE;
 	}
 
@@ -124,11 +154,7 @@ int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 		flags |= RESET_DEBUG;
 	}
 #endif
-#if !NRF_POWER_HAS_RESETREAS
-	if (reason & NRFX_RESET_REASON_DOG1_MASK) {
-		flags |= RESET_WATCHDOG;
-	}
-#endif
+
 #if NRFX_RESET_REASON_HAS_GRTC
 	if (reason & NRFX_RESET_REASON_GRTC_MASK) {
 		flags |= RESET_CLOCK;
@@ -184,4 +210,4 @@ int z_impl_hwinfo_get_supported_reset_cause(uint32_t *supported)
 
 	return 0;
 }
-#endif
+#endif /* RESET_CAUSE_AVAILABLE */

From 71703480a147be0171685098aa45142b1695b2ba Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Fri, 21 Jun 2024 13:25:22 +0200
Subject: [PATCH 2184/2913] [nrf noup] soc: nrf54l: Add custom section for KMU

Add a custom section in the linker which should always
be placed in the top of RAM. This will be used by the
KMU to push keys into it. Since when you provision a key
into the KMU you need to set specific a memory location
for the PUSH operation we need to keep this memory location
static across images/dfus.

This is a noup since the KMU is not supported upstream.

Ref: NCSDK-25121

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
(cherry picked from commit fcecc1370438052dc8ad84a2903f7d47f8e642de)
---
 soc/nordic/nrf54l/CMakeLists.txt           |  9 +++++++++
 soc/nordic/nrf54l/kmu_push_area_section.ld | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 soc/nordic/nrf54l/kmu_push_area_section.ld

diff --git a/soc/nordic/nrf54l/CMakeLists.txt b/soc/nordic/nrf54l/CMakeLists.txt
index cebbda571b6..c8badc8d61d 100644
--- a/soc/nordic/nrf54l/CMakeLists.txt
+++ b/soc/nordic/nrf54l/CMakeLists.txt
@@ -6,3 +6,12 @@ zephyr_library_sources(
   ../validate_rram_partitions.c
   )
 zephyr_include_directories(.)
+
+# We need a buffer in memory in a static location which can be used by
+# the KMU peripheral. The KMU has a static destination address, we chose
+# this address to be 0x20000000, which is the first address in the SRAM.
+if(NOT CONFIG_BUILD_WITH_TFM AND CONFIG_PSA_NEED_CRACEN_KMU_DRIVER)
+# Exclamation mark is printable character with the lowest number in ASCII table.
+# We are sure that this file will be included first.
+zephyr_linker_sources(RAM_SECTIONS SORT_KEY ! kmu_push_area_section.ld)
+endif()
diff --git a/soc/nordic/nrf54l/kmu_push_area_section.ld b/soc/nordic/nrf54l/kmu_push_area_section.ld
new file mode 100644
index 00000000000..e8c8cd9f09a
--- /dev/null
+++ b/soc/nordic/nrf54l/kmu_push_area_section.ld
@@ -0,0 +1,19 @@
+# This section must be loaded first of all the
+# custom sections because we want it to be placed
+# at the top address of RAM.
+SECTION_PROLOGUE(NRF_KMU_RESERVED_PUSH_SECTION,(NOLOAD) ,)
+{
+    __nrf_kmu_reserved_push_area = .;
+    *(.nrf_kmu_reserved_push_area)
+    __nrf_kmu_reserved_push_area_end = .;
+} GROUP_NOLOAD_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
+
+# It doesn't seem to be possible to enforce placing a section
+# at a specific address in memory using the Zephyr SECTION macros.
+# So this assert is necessary to avoid accidentatly moving this
+# section to a different address.
+ASSERT(__nrf_kmu_reserved_push_area == RAM_ADDR, "Error:  \
+ The section NRF_KMU_RESERVED_PUSH_SECTION needs to be    \
+ placed on the top RAM address but it is not, please edit \
+ your linker scripts to make sure that it is placed on    \
+ the to RAM address.")

From 840fc4597d7b06e9291b74b352daf1bf6ecd0f6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B8e?= <sebastian.boe@nordicsemi.no>
Date: Fri, 24 May 2024 15:34:47 +0200
Subject: [PATCH 2185/2913] [nrf noup] soc: nordic: nrf54l: Port Soc.c to be
 compatible with TFM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In this patch we do several things to be able to configure power and
clocks when NRF_OSCILLATORS and NRF_REGULATORS is secure.

We port soc.c to TF-M so that the TF-M image can do the same
configuration that would normally be done by the Zephyr image.

This is done by explicitly including autoconf.h for instance.

We also ifdef-out the configuration when nordicsemi_nrf54l_init is
invoked from a non-secure image, because the peripherals are secure.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
(cherry picked from commit e3e053f4b6b58c0dad2a8ad776d1762bb630c621)
---
 soc/nordic/nrf54l/soc.c | 66 ++++++++++++++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 17 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index abb0f778ac3..26248018f6b 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -12,13 +12,21 @@
  * for the Nordic Semiconductor nRF54L family processor.
  */
 
+#ifdef __NRF_TFM__
+#include <autoconf.h>
+#endif
+
 #include <zephyr/devicetree.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 #include <zephyr/kernel.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
+
+#ifndef __NRF_TFM__
 #include <zephyr/cache.h>
+#endif
+
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 #if defined(NRF_APPLICATION)
@@ -40,17 +48,9 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 #define HFXO_NODE DT_NODELABEL(hfxo)
 #endif
 
-static int nordicsemi_nrf54l_init(void)
-{
-	/* Update the SystemCoreClock global variable with current core clock
-	 * retrieved from hardware state.
-	 */
-	SystemCoreClockUpdate();
-
 #if defined(NRF_APPLICATION)
-	/* Enable ICACHE */
-	sys_cache_instr_enable();
-
+static inline void power_and_clock_configuration(void)
+{
 #if DT_ENUM_HAS_VALUE(LFXO_NODE, load_capacitors, internal)
 	uint32_t xosc32ktrim = NRF_FICR->XOSC32KTRIM;
 
@@ -77,16 +77,16 @@ static int nordicsemi_nrf54l_init(void)
 	 * NOTE: The desired capacitance value is used in encoded from in INTCAP calculation formula
 	 *       That is different than in case of HFXO.
 	 */
-	uint32_t cap_val_encoded = (((DT_PROP(LFXO_NODE, load_capacitance_femtofarad) - 4000UL)
-				     * 2UL) / 1000UL);
+	uint32_t cap_val_encoded =
+		(((DT_PROP(LFXO_NODE, load_capacitance_femtofarad) - 4000UL) * 2UL) / 1000UL);
 
 	/* Calculation of INTCAP code before rounding. Min that calculations here are done on
 	 * values multiplied by 2^9, e.g. 0.765625 * 2^9 = 392.
 	 * offset_k should be divided by 2^6, but to add it to value shifted by 2^9 we have to
 	 * multiply it be 2^3.
 	 */
-	uint32_t mid_val = (cap_val_encoded - 4UL) * (uint32_t)(slope_k + 392UL)
-			   + (offset_k << 3UL);
+	uint32_t mid_val =
+		(cap_val_encoded - 4UL) * (uint32_t)(slope_k + 392UL) + (offset_k << 3UL);
 
 	/* Get integer part of the INTCAP code */
 	uint32_t lfxo_intcap = mid_val >> 9UL;
@@ -132,8 +132,9 @@ static int nordicsemi_nrf54l_init(void)
 	 */
 	uint32_t cap_val_femto_f = DT_PROP(HFXO_NODE, load_capacitance_femtofarad);
 
-	uint32_t mid_val_intcap = (((cap_val_femto_f - 5500UL) * (uint32_t)(slope_m + 791UL))
-		 + (offset_m << 2UL) * 1000UL) >> 8UL;
+	uint32_t mid_val_intcap = (((cap_val_femto_f - 5500UL) * (uint32_t)(slope_m + 791UL)) +
+				   (offset_m << 2UL) * 1000UL) >>
+				  8UL;
 
 	/* Convert the calculated value to piko Farads */
 	uint32_t hfxo_intcap = mid_val_intcap / 1000;
@@ -163,9 +164,40 @@ static int nordicsemi_nrf54l_init(void)
 #endif
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);
 #endif
-
+}
 #endif /* NRF_APPLICATION */
 
+int nordicsemi_nrf54l_init(void)
+{
+	/* Update the SystemCoreClock global variable with current core clock
+	 * retrieved from hardware state.
+	 */
+#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(__NRF_TFM__)
+	/* Currently not supported for non-secure */
+	SystemCoreClockUpdate();
+#endif
+
+#ifdef __NRF_TFM__
+	/* TF-M enables the instruction cache from target_cfg.c, so we
+	 * don't need to enable it here.
+	 */
+#else
+	/* Enable ICACHE */
+	sys_cache_instr_enable();
+#endif
+
+	/* NRF_REGULATORS and NRF_OSCILLATORS are configured to be secure
+	 * as NRF_REGULATORS.POFCON is needed by the secure domain to
+	 * prevent glitches when the power supply is attacked.
+	 *
+	 * NRF_OSCILLATORS is also configured as secure because of a HW limitation
+	 * that requires them to be configured with the same security property.
+	 */
+#if (defined(NRF_APPLICATION) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)) ||                  \
+	defined(__NRF_TFM__)
+	power_and_clock_configuration();
+#endif
+
 	return 0;
 }
 

From 482ff99a72787460dfd0d595aaf809ff3e820043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag=20Erik=20Gj=C3=B8rvad?= <dag.erik.gjorvad@nordicsemi.no>
Date: Thu, 12 Dec 2024 10:25:00 +0100
Subject: [PATCH 2186/2913] [nrf noup] soc: nordic: nrf54l Fix for wait lasting
 half expected time
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Noup as it patches code that does not exist in zephyr
arch_busy_wait and k_busy_wait waited half the expected time
due to SystemCoreClock being set back to the default value when ns
builds. Changed to rely on device tree as to avoid
hardcoded clock frequencies

Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no>
(cherry picked from commit 665aba441dd7c933d60bbf17fdd8eba6b7ba8591)
---
 soc/nordic/nrf54l/soc.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index 26248018f6b..d7f3005d1f4 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -48,6 +48,13 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 #define HFXO_NODE DT_NODELABEL(hfxo)
 #endif
 
+/* Building for cpuflpr with ns uses cpu_1 instead of cpu_0 */
+#if DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
+#define DEVICE_DT_CLOCK_FREQ DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
+#elif DT_PROP(DT_PATH(cpus, cpu_1), clock_frequency)
+#define DEVICE_DT_CLOCK_FREQ DT_PROP(DT_PATH(cpus, cpu_1), clock_frequency)
+#endif
+
 #if defined(NRF_APPLICATION)
 static inline void power_and_clock_configuration(void)
 {
@@ -172,16 +179,18 @@ int nordicsemi_nrf54l_init(void)
 	/* Update the SystemCoreClock global variable with current core clock
 	 * retrieved from hardware state.
 	 */
-#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(__NRF_TFM__)
-	/* Currently not supported for non-secure */
-	SystemCoreClockUpdate();
-#endif
 
 #ifdef __NRF_TFM__
 	/* TF-M enables the instruction cache from target_cfg.c, so we
 	 * don't need to enable it here.
 	 */
 #else
+
+	/* Update SystemCoreClock in Zephyr based on device tree to avoid SystemCoreClock
+	 * being overwritten with default value when initializing with TF-M
+	 */
+	SystemCoreClock = DEVICE_DT_CLOCK_FREQ;
+
 	/* Enable ICACHE */
 	sys_cache_instr_enable();
 #endif

From 40520509dae1ce09e277f68eadca8ee23621dd96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Thu, 5 Sep 2024 15:06:57 +0200
Subject: [PATCH 2187/2913] [nrf noup] samples: bluetooth: update autoconf.h
 header path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update path for autoconf.h which is now in zephyr/autoconf.h

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit 923f09004041cd98a0338acf196415a3c43bebb4)
---
 samples/bluetooth/bap_unicast_client/src/stream_tx.c        | 2 +-
 samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c   | 2 +-
 samples/bluetooth/cap_acceptor/src/main.c                   | 2 +-
 samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c | 2 +-
 samples/bluetooth/cap_initiator/src/main.c                  | 2 +-
 soc/nordic/nrf54l/soc.c                                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/samples/bluetooth/bap_unicast_client/src/stream_tx.c b/samples/bluetooth/bap_unicast_client/src/stream_tx.c
index ebdc01ab87f..44c81f08749 100644
--- a/samples/bluetooth/bap_unicast_client/src/stream_tx.c
+++ b/samples/bluetooth/bap_unicast_client/src/stream_tx.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c b/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
index 132ee499c87..b7f685d1d08 100644
--- a/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
+++ b/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
@@ -7,7 +7,7 @@
  *  SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_acceptor/src/main.c b/samples/bluetooth/cap_acceptor/src/main.c
index 37ba41d32ec..c84ab70e94a 100644
--- a/samples/bluetooth/cap_acceptor/src/main.c
+++ b/samples/bluetooth/cap_acceptor/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c b/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
index 25dba8cc16d..b30f34c6f99 100644
--- a/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
+++ b/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/samples/bluetooth/cap_initiator/src/main.c b/samples/bluetooth/cap_initiator/src/main.c
index 1b35ea7981f..8eab76938bc 100644
--- a/samples/bluetooth/cap_initiator/src/main.c
+++ b/samples/bluetooth/cap_initiator/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <stddef.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index d7f3005d1f4..eab3bf18a14 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -13,7 +13,7 @@
  */
 
 #ifdef __NRF_TFM__
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #endif
 
 #include <zephyr/devicetree.h>

From 9140a90bc0e07d1a6a5be46d257f417b3289bf38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 17 Oct 2024 14:22:45 +0200
Subject: [PATCH 2188/2913] [nrf fromlist] drivers: mspi: Add driver for
 DesignWare SSI based controllers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a generic driver for MSPI controllers based on the DesignWare
SSI core. With small vendor-specific adaptations covering integration
details, it should be possible to use the driver for various devices.

Upstream PR #: 85520

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/mspi/CMakeLists.txt                |    1 +
 drivers/mspi/Kconfig                       |    1 +
 drivers/mspi/Kconfig.dw                    |    9 +
 drivers/mspi/mspi_dw.c                     | 1355 ++++++++++++++++++++
 drivers/mspi/mspi_dw.h                     |  239 ++++
 drivers/mspi/mspi_dw_vendor_specific.h     |   87 ++
 dts/bindings/mspi/snps,designware-ssi.yaml |   45 +
 7 files changed, 1737 insertions(+)
 create mode 100644 drivers/mspi/Kconfig.dw
 create mode 100644 drivers/mspi/mspi_dw.c
 create mode 100644 drivers/mspi/mspi_dw.h
 create mode 100644 drivers/mspi/mspi_dw_vendor_specific.h
 create mode 100644 dts/bindings/mspi/snps,designware-ssi.yaml

diff --git a/drivers/mspi/CMakeLists.txt b/drivers/mspi/CMakeLists.txt
index f248cb0b533..78f704393f4 100644
--- a/drivers/mspi/CMakeLists.txt
+++ b/drivers/mspi/CMakeLists.txt
@@ -4,4 +4,5 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/mspi.h)
 
 zephyr_library()
 zephyr_library_sources_ifdef(CONFIG_MSPI_AMBIQ_AP3   mspi_ambiq_ap3.c)
+zephyr_library_sources_ifdef(CONFIG_MSPI_DW          mspi_dw.c)
 zephyr_library_sources_ifdef(CONFIG_MSPI_EMUL        mspi_emul.c)
diff --git a/drivers/mspi/Kconfig b/drivers/mspi/Kconfig
index 0adb2a34393..269d8d16f04 100644
--- a/drivers/mspi/Kconfig
+++ b/drivers/mspi/Kconfig
@@ -60,6 +60,7 @@ module-str = mspi
 source "subsys/logging/Kconfig.template.log_config"
 
 source "drivers/mspi/Kconfig.ambiq"
+source "drivers/mspi/Kconfig.dw"
 source "drivers/mspi/Kconfig.mspi_emul"
 
 endif # MSPI
diff --git a/drivers/mspi/Kconfig.dw b/drivers/mspi/Kconfig.dw
new file mode 100644
index 00000000000..1ab82da0e85
--- /dev/null
+++ b/drivers/mspi/Kconfig.dw
@@ -0,0 +1,9 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config MSPI_DW
+	bool "DesignWare SSI controller driver"
+	default y
+	depends on DT_HAS_SNPS_DESIGNWARE_SSI_ENABLED
+	select PINCTRL if $(dt_compat_any_has_prop,$(DT_COMPAT_SNPS_DESIGNWARE_SSI),pinctrl-0)
+	imply MSPI_XIP
diff --git a/drivers/mspi/mspi_dw.c b/drivers/mspi/mspi_dw.c
new file mode 100644
index 00000000000..33fc2c36e15
--- /dev/null
+++ b/drivers/mspi/mspi_dw.c
@@ -0,0 +1,1355 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT snps_designware_ssi
+
+#include <zephyr/drivers/mspi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+
+#include "mspi_dw.h"
+#include "mspi_dw_vendor_specific.h"
+
+LOG_MODULE_REGISTER(mspi_dw, CONFIG_MSPI_LOG_LEVEL);
+
+#define DUMMY_BYTE 0xAA
+
+#if defined(CONFIG_MSPI_XIP)
+struct xip_params {
+	uint32_t read_cmd;
+	uint32_t write_cmd;
+	uint16_t rx_dummy;
+	uint16_t tx_dummy;
+	uint8_t cmd_length;
+	uint8_t addr_length;
+	enum mspi_io_mode io_mode;
+};
+
+struct xip_ctrl {
+	uint32_t read;
+	uint32_t write;
+};
+#endif
+
+struct mspi_dw_data {
+	const struct mspi_dev_id *dev_id;
+	uint32_t packets_done;
+	uint8_t *buf_pos;
+	const uint8_t *buf_end;
+
+	uint32_t ctrlr0;
+	uint32_t spi_ctrlr0;
+	uint32_t baudr;
+
+#if defined(CONFIG_MSPI_XIP)
+	uint32_t xip_freq;
+	struct xip_params xip_params_stored;
+	struct xip_params xip_params_active;
+	uint16_t xip_enabled;
+	enum mspi_cpp_mode xip_cpp;
+#endif
+
+	uint16_t dummy_bytes;
+	uint8_t bytes_to_discard;
+	uint8_t bytes_per_frame_exp;
+	bool standard_spi;
+
+	struct k_sem finished;
+	struct k_sem ctx_lock;
+	struct k_sem cfg_lock;
+	struct mspi_xfer xfer;
+};
+
+struct mspi_dw_config {
+	DEVICE_MMIO_ROM;
+	void (*irq_config)(void);
+	uint32_t clock_frequency;
+#if defined(CONFIG_PINCTRL)
+	const struct pinctrl_dev_config *pcfg;
+#endif
+	const struct gpio_dt_spec *ce_gpios;
+	uint8_t ce_gpios_len;
+	uint8_t tx_fifo_depth_minus_1;
+	uint8_t tx_fifo_threshold;
+	uint8_t rx_fifo_threshold;
+	DECLARE_REG_ACCESS();
+};
+
+/* Register access helpers. */
+#define DEFINE_MM_REG_RD_WR(reg, off) \
+	DEFINE_MM_REG_RD(reg, off) \
+	DEFINE_MM_REG_WR(reg, off)
+
+DEFINE_MM_REG_WR(ctrlr0,	0x00)
+DEFINE_MM_REG_WR(ctrlr1,	0x04)
+DEFINE_MM_REG_WR(ssienr,	0x08)
+DEFINE_MM_REG_WR(ser,		0x10)
+DEFINE_MM_REG_WR(baudr,		0x14)
+DEFINE_MM_REG_RD_WR(txftlr,	0x18)
+DEFINE_MM_REG_RD_WR(rxftlr,	0x1c)
+DEFINE_MM_REG_RD(txflr,		0x20)
+DEFINE_MM_REG_RD(rxflr,		0x24)
+DEFINE_MM_REG_RD(sr,		0x28)
+DEFINE_MM_REG_WR(imr,		0x2c)
+DEFINE_MM_REG_RD(isr,		0x30)
+DEFINE_MM_REG_RD_WR(dr,		0x60)
+DEFINE_MM_REG_WR(spi_ctrlr0,	0xf4)
+
+#if defined(CONFIG_MSPI_XIP)
+DEFINE_MM_REG_WR(xip_incr_inst,		0x100)
+DEFINE_MM_REG_WR(xip_wrap_inst,		0x104)
+DEFINE_MM_REG_WR(xip_ctrl,		0x108)
+DEFINE_MM_REG_WR(xip_write_incr_inst,	0x140)
+DEFINE_MM_REG_WR(xip_write_wrap_inst,	0x144)
+DEFINE_MM_REG_WR(xip_write_ctrl,	0x148)
+#endif
+
+static void tx_data(const struct device *dev,
+		    const struct mspi_xfer_packet *packet)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_dw_config *dev_config = dev->config;
+	const uint8_t *buf_pos = dev_data->buf_pos;
+	const uint8_t *buf_end = dev_data->buf_end;
+	/* When the function is called, it is known that at least one item
+	 * can be written to the FIFO. The loop below writes to the FIFO
+	 * the number of items that is known to fit and then updates that
+	 * number basing on the actual FIFO level (because some data may get
+	 * sent while the FIFO is written; especially for high frequencies
+	 * this may often occur) and continues until the FIFO is filled up
+	 * or the buffer end is reached.
+	 */
+	uint32_t room = 1;
+	uint8_t bytes_per_frame_exp = dev_data->bytes_per_frame_exp;
+	uint8_t tx_fifo_depth = dev_config->tx_fifo_depth_minus_1 + 1;
+	uint32_t data;
+
+	do {
+		if (bytes_per_frame_exp == 2) {
+			data = sys_get_be32(buf_pos);
+			buf_pos += 4;
+		} else if (bytes_per_frame_exp == 1) {
+			data = sys_get_be16(buf_pos);
+			buf_pos += 2;
+		} else {
+			data = *buf_pos;
+			buf_pos += 1;
+		}
+		write_dr(dev, data);
+
+		if (buf_pos >= buf_end) {
+			write_txftlr(dev, 0);
+			break;
+		}
+
+		if (--room == 0) {
+			room = tx_fifo_depth
+			     - FIELD_GET(TXFLR_TXTFL_MASK, read_txflr(dev));
+		}
+	} while (room);
+
+	dev_data->buf_pos = (uint8_t *)buf_pos;
+}
+
+static bool make_rx_cycles(const struct device *dev)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_dw_config *dev_config = dev->config;
+	uint16_t dummy_bytes = dev_data->dummy_bytes;
+	/* See tx_data(). */
+	uint32_t room = 1;
+	uint8_t tx_fifo_depth = dev_config->tx_fifo_depth_minus_1 + 1;
+
+	do {
+		write_dr(dev, DUMMY_BYTE);
+
+		--dummy_bytes;
+		if (!dummy_bytes) {
+			dev_data->dummy_bytes = 0;
+			return true;
+		}
+
+		if (--room == 0) {
+			room = tx_fifo_depth
+			     - FIELD_GET(TXFLR_TXTFL_MASK, read_txflr(dev));
+		}
+	} while (room);
+
+	dev_data->dummy_bytes = dummy_bytes;
+	return false;
+}
+
+static void read_rx_fifo(const struct device *dev,
+			 const struct mspi_xfer_packet *packet)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_dw_config *dev_config = dev->config;
+	uint8_t bytes_to_discard = dev_data->bytes_to_discard;
+	uint8_t *buf_pos = dev_data->buf_pos;
+	const uint8_t *buf_end = &packet->data_buf[packet->num_bytes];
+	uint8_t bytes_per_frame_exp = dev_data->bytes_per_frame_exp;
+	/* See `room` in tx_data(). */
+	uint32_t in_fifo = 1;
+	uint32_t remaining_frames;
+
+	do {
+		uint32_t data = read_dr(dev);
+
+		if (bytes_to_discard) {
+			--bytes_to_discard;
+		} else {
+			if (bytes_per_frame_exp == 2) {
+				sys_put_be32(data, buf_pos);
+				buf_pos += 4;
+			} else if (bytes_per_frame_exp == 1) {
+				sys_put_be16(data, buf_pos);
+				buf_pos += 2;
+			} else {
+				*buf_pos = (uint8_t)data;
+				buf_pos += 1;
+			}
+
+			if (buf_pos >= buf_end) {
+				dev_data->bytes_to_discard = bytes_to_discard;
+				dev_data->buf_pos = buf_pos;
+				return;
+			}
+		}
+
+		if (--in_fifo == 0) {
+			in_fifo = FIELD_GET(RXFLR_RXTFL_MASK, read_rxflr(dev));
+		}
+	} while (in_fifo);
+
+	remaining_frames = (bytes_to_discard + buf_end - buf_pos)
+			   >> bytes_per_frame_exp;
+	if (remaining_frames - 1 < dev_config->rx_fifo_threshold) {
+		write_rxftlr(dev, remaining_frames - 1);
+	}
+
+	dev_data->bytes_to_discard = bytes_to_discard;
+	dev_data->buf_pos = buf_pos;
+}
+
+static void mspi_dw_isr(const struct device *dev)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_xfer_packet *packet =
+		&dev_data->xfer.packets[dev_data->packets_done];
+	uint32_t int_status = read_isr(dev);
+
+	if (int_status & ISR_RXFIS_BIT) {
+		read_rx_fifo(dev, packet);
+	}
+
+	if (dev_data->buf_pos >= dev_data->buf_end) {
+		write_imr(dev, 0);
+		/* It may happen that at this point the controller is still
+		 * shifting out the last frame (the last interrupt occurs when
+		 * the TX FIFO is empty). Wait if it signals that it is busy.
+		 */
+		while (read_sr(dev) & SR_BUSY_BIT) {
+		}
+
+		k_sem_give(&dev_data->finished);
+	} else {
+		if (int_status & ISR_TXEIS_BIT) {
+			if (dev_data->dummy_bytes) {
+				if (make_rx_cycles(dev)) {
+					write_imr(dev, IMR_RXFIM_BIT);
+				}
+			} else {
+				tx_data(dev, packet);
+			}
+		}
+	}
+
+	vendor_specific_irq_clear(dev);
+}
+
+static int api_config(const struct mspi_dt_spec *spec)
+{
+	ARG_UNUSED(spec);
+
+	return -ENOTSUP;
+}
+
+static bool apply_io_mode(struct mspi_dw_data *dev_data,
+			  enum mspi_io_mode io_mode)
+{
+	dev_data->ctrlr0 &= ~CTRLR0_SPI_FRF_MASK;
+	dev_data->spi_ctrlr0 &= ~SPI_CTRLR0_TRANS_TYPE_MASK;
+
+	/* Frame format used for transferring data. */
+
+	if (io_mode == MSPI_IO_MODE_SINGLE) {
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
+					       CTRLR0_SPI_FRF_STANDARD);
+		dev_data->standard_spi = true;
+		return true;
+	}
+
+	dev_data->standard_spi = false;
+
+	switch (io_mode) {
+	case MSPI_IO_MODE_DUAL:
+	case MSPI_IO_MODE_DUAL_1_1_2:
+	case MSPI_IO_MODE_DUAL_1_2_2:
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
+					       CTRLR0_SPI_FRF_DUAL);
+		break;
+	case MSPI_IO_MODE_QUAD:
+	case MSPI_IO_MODE_QUAD_1_1_4:
+	case MSPI_IO_MODE_QUAD_1_4_4:
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
+					       CTRLR0_SPI_FRF_QUAD);
+		break;
+	case MSPI_IO_MODE_OCTAL:
+	case MSPI_IO_MODE_OCTAL_1_1_8:
+	case MSPI_IO_MODE_OCTAL_1_8_8:
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
+					       CTRLR0_SPI_FRF_OCTAL);
+		break;
+	default:
+		LOG_ERR("IO mode %d not supported", io_mode);
+		return false;
+	}
+
+	/* Transfer format used for Address and Instruction: */
+
+	switch (io_mode) {
+	case MSPI_IO_MODE_DUAL_1_1_2:
+	case MSPI_IO_MODE_QUAD_1_1_4:
+	case MSPI_IO_MODE_OCTAL_1_1_8:
+		/* - both sent in Standard SPI mode */
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_TRANS_TYPE_MASK,
+						   SPI_CTRLR0_TRANS_TYPE_TT0);
+		break;
+	case MSPI_IO_MODE_DUAL_1_2_2:
+	case MSPI_IO_MODE_QUAD_1_4_4:
+	case MSPI_IO_MODE_OCTAL_1_8_8:
+		/* - Instruction sent in Standard SPI mode,
+		 *   Address sent the same way as data
+		 */
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_TRANS_TYPE_MASK,
+						   SPI_CTRLR0_TRANS_TYPE_TT1);
+		break;
+	default:
+		/* - both sent the same way as data. */
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_TRANS_TYPE_MASK,
+						   SPI_CTRLR0_TRANS_TYPE_TT2);
+		break;
+	}
+
+	return true;
+}
+
+static bool apply_cmd_length(struct mspi_dw_data *dev_data, uint32_t cmd_length)
+{
+	switch (cmd_length) {
+	case 0:
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_INST_L_MASK,
+						   SPI_CTRLR0_INST_L0);
+		break;
+	case 1:
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_INST_L_MASK,
+						   SPI_CTRLR0_INST_L8);
+		break;
+	case 2:
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_INST_L_MASK,
+						   SPI_CTRLR0_INST_L16);
+		break;
+	default:
+		LOG_ERR("Command length %d not supported", cmd_length);
+		return false;
+	}
+
+	return true;
+}
+
+static bool apply_addr_length(struct mspi_dw_data *dev_data,
+			      uint32_t addr_length)
+{
+	dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_ADDR_L_MASK,
+					   addr_length * 2);
+
+	return true;
+}
+
+#if defined(CONFIG_MSPI_XIP)
+static bool apply_xip_io_mode(const struct mspi_dw_data *dev_data,
+			      struct xip_ctrl *ctrl)
+{
+	enum mspi_io_mode io_mode = dev_data->xip_params_active.io_mode;
+
+	/* Frame format used for transferring data. */
+
+	if (io_mode == MSPI_IO_MODE_SINGLE) {
+		LOG_ERR("XIP not available in single line mode");
+		return false;
+	}
+
+	switch (io_mode) {
+	case MSPI_IO_MODE_DUAL:
+	case MSPI_IO_MODE_DUAL_1_1_2:
+	case MSPI_IO_MODE_DUAL_1_2_2:
+		ctrl->read |= FIELD_PREP(XIP_CTRL_FRF_MASK,
+					 XIP_CTRL_FRF_DUAL);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_FRF_MASK,
+					  XIP_WRITE_CTRL_FRF_DUAL);
+		break;
+	case MSPI_IO_MODE_QUAD:
+	case MSPI_IO_MODE_QUAD_1_1_4:
+	case MSPI_IO_MODE_QUAD_1_4_4:
+		ctrl->read |= FIELD_PREP(XIP_CTRL_FRF_MASK,
+					 XIP_CTRL_FRF_QUAD);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_FRF_MASK,
+					  XIP_WRITE_CTRL_FRF_QUAD);
+		break;
+	case MSPI_IO_MODE_OCTAL:
+	case MSPI_IO_MODE_OCTAL_1_1_8:
+	case MSPI_IO_MODE_OCTAL_1_8_8:
+		ctrl->read |= FIELD_PREP(XIP_CTRL_FRF_MASK,
+					 XIP_CTRL_FRF_OCTAL);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_FRF_MASK,
+					  XIP_WRITE_CTRL_FRF_OCTAL);
+		break;
+	default:
+		LOG_ERR("IO mode %d not supported", io_mode);
+		return false;
+	}
+
+	/* Transfer format used for Address and Instruction: */
+
+	switch (io_mode) {
+	case MSPI_IO_MODE_DUAL_1_1_2:
+	case MSPI_IO_MODE_QUAD_1_1_4:
+	case MSPI_IO_MODE_OCTAL_1_1_8:
+		/* - both sent in Standard SPI mode */
+		ctrl->read |= FIELD_PREP(XIP_CTRL_TRANS_TYPE_MASK,
+					 XIP_CTRL_TRANS_TYPE_TT0);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_TRANS_TYPE_MASK,
+					  XIP_WRITE_CTRL_TRANS_TYPE_TT0);
+		break;
+	case MSPI_IO_MODE_DUAL_1_2_2:
+	case MSPI_IO_MODE_QUAD_1_4_4:
+	case MSPI_IO_MODE_OCTAL_1_8_8:
+		/* - Instruction sent in Standard SPI mode,
+		 *   Address sent the same way as data
+		 */
+		ctrl->read |= FIELD_PREP(XIP_CTRL_TRANS_TYPE_MASK,
+					 XIP_CTRL_TRANS_TYPE_TT1);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_TRANS_TYPE_MASK,
+					  XIP_WRITE_CTRL_TRANS_TYPE_TT1);
+		break;
+	default:
+		/* - both sent the same way as data. */
+		ctrl->read |= FIELD_PREP(XIP_CTRL_TRANS_TYPE_MASK,
+					 XIP_CTRL_TRANS_TYPE_TT2);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_TRANS_TYPE_MASK,
+					  XIP_WRITE_CTRL_TRANS_TYPE_TT2);
+		break;
+	}
+
+	return true;
+}
+
+static bool apply_xip_cmd_length(const struct mspi_dw_data *dev_data,
+				 struct xip_ctrl *ctrl)
+{
+	uint8_t cmd_length = dev_data->xip_params_active.cmd_length;
+
+	switch (cmd_length) {
+	case 0:
+		ctrl->read |= FIELD_PREP(XIP_CTRL_INST_L_MASK,
+					 XIP_CTRL_INST_L0);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_INST_L_MASK,
+					  XIP_WRITE_CTRL_INST_L0);
+		break;
+	case 1:
+		ctrl->read |= XIP_CTRL_INST_EN_BIT
+			   |  FIELD_PREP(XIP_CTRL_INST_L_MASK,
+					 XIP_CTRL_INST_L8);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_INST_L_MASK,
+					  XIP_WRITE_CTRL_INST_L8);
+		break;
+	case 2:
+		ctrl->read |= XIP_CTRL_INST_EN_BIT
+			   |  FIELD_PREP(XIP_CTRL_INST_L_MASK,
+					 XIP_CTRL_INST_L16);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_INST_L_MASK,
+					  XIP_WRITE_CTRL_INST_L16);
+		break;
+	default:
+		LOG_ERR("Command length %d not supported", cmd_length);
+		return false;
+	}
+
+	return true;
+}
+
+static bool apply_xip_addr_length(const struct mspi_dw_data *dev_data,
+				  struct xip_ctrl *ctrl)
+{
+	uint8_t addr_length = dev_data->xip_params_active.addr_length;
+
+	ctrl->read |= FIELD_PREP(XIP_CTRL_ADDR_L_MASK, addr_length * 2);
+	ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_ADDR_L_MASK, addr_length * 2);
+
+	return true;
+}
+#endif /* defined(CONFIG_MSPI_XIP) */
+
+static int _api_dev_config(const struct device *dev,
+			   const enum mspi_dev_cfg_mask param_mask,
+			   const struct mspi_dev_cfg *cfg)
+{
+	const struct mspi_dw_config *dev_config = dev->config;
+	struct mspi_dw_data *dev_data = dev->data;
+
+	if (param_mask & MSPI_DEVICE_CONFIG_ENDIAN) {
+		if (cfg->endian != MSPI_XFER_BIG_ENDIAN) {
+			LOG_ERR("Only big endian transfers are supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_CE_POL) {
+		if (cfg->ce_polarity != MSPI_CE_ACTIVE_LOW) {
+			LOG_ERR("Only active low CE is supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_MEM_BOUND) {
+		if (cfg->mem_boundary) {
+			LOG_ERR("Auto CE break is not supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_BREAK_TIME) {
+		if (cfg->time_to_break) {
+			LOG_ERR("Auto CE break is not supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_IO_MODE) {
+#if defined(CONFIG_MSPI_XIP)
+		dev_data->xip_params_stored.io_mode = cfg->io_mode;
+#endif
+
+		if (!apply_io_mode(dev_data, cfg->io_mode)) {
+			return -EINVAL;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_CPP) {
+#if defined(CONFIG_MSPI_XIP)
+		/* Make sure the new setting is compatible with the one used
+		 * for XIP if it is enabled.
+		 */
+		if (!dev_data->xip_enabled) {
+			dev_data->xip_cpp = cfg->cpp;
+		} else if (dev_data->xip_cpp != cfg->cpp) {
+			LOG_ERR("Conflict with configuration used for XIP.");
+			return -EINVAL;
+		}
+#endif
+
+		dev_data->ctrlr0 &= ~(CTRLR0_SCPOL_BIT | CTRLR0_SCPH_BIT);
+
+		switch (cfg->cpp) {
+		default:
+		case MSPI_CPP_MODE_0:
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 0) |
+					    FIELD_PREP(CTRLR0_SCPH_BIT,  0);
+			break;
+		case MSPI_CPP_MODE_1:
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 0) |
+					    FIELD_PREP(CTRLR0_SCPH_BIT,  1);
+			break;
+		case MSPI_CPP_MODE_2:
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 1) |
+					    FIELD_PREP(CTRLR0_SCPH_BIT,  0);
+			break;
+		case MSPI_CPP_MODE_3:
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 1) |
+					    FIELD_PREP(CTRLR0_SCPH_BIT,  1);
+			break;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_FREQUENCY) {
+		if (cfg->freq > dev_config->clock_frequency / 2 ||
+		    cfg->freq < dev_config->clock_frequency / 65534) {
+			LOG_ERR("Invalid frequency: %u, MIN: %u, MAX: %u",
+				cfg->freq, dev_config->clock_frequency / 65534,
+				dev_config->clock_frequency / 2);
+			return -EINVAL;
+		}
+
+#if defined(CONFIG_MSPI_XIP)
+		/* Make sure the new setting is compatible with the one used
+		 * for XIP if it is enabled.
+		 */
+		if (!dev_data->xip_enabled) {
+			dev_data->xip_freq = cfg->freq;
+		} else if (dev_data->xip_freq != cfg->freq) {
+			LOG_ERR("Conflict with configuration used for XIP.");
+			return -EINVAL;
+		}
+#endif
+
+		dev_data->baudr = dev_config->clock_frequency / cfg->freq;
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_DATA_RATE) {
+		/* TODO: add support for DDR */
+		if (cfg->data_rate != MSPI_DATA_RATE_SINGLE) {
+			LOG_ERR("Only single data rate is supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_DQS) {
+		/* TODO: add support for DQS */
+		if (cfg->dqs_enable) {
+			LOG_ERR("DQS line is not supported.");
+			return -ENOTSUP;
+		}
+	}
+
+#if defined(CONFIG_MSPI_XIP)
+	if (param_mask & MSPI_DEVICE_CONFIG_READ_CMD) {
+		dev_data->xip_params_stored.read_cmd = cfg->read_cmd;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_WRITE_CMD) {
+		dev_data->xip_params_stored.write_cmd = cfg->write_cmd;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_RX_DUMMY) {
+		dev_data->xip_params_stored.rx_dummy = cfg->rx_dummy;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_TX_DUMMY) {
+		dev_data->xip_params_stored.tx_dummy = cfg->tx_dummy;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_CMD_LEN) {
+		dev_data->xip_params_stored.cmd_length = cfg->cmd_length;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_ADDR_LEN) {
+		dev_data->xip_params_stored.addr_length = cfg->addr_length;
+	}
+#endif
+
+	/* Always use Motorola SPI frame format. */
+	dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_FRF_MASK, CTRLR0_FRF_SPI);
+	/* Enable clock stretching. */
+	dev_data->spi_ctrlr0 |= SPI_CTRLR0_CLK_STRETCH_EN_BIT;
+
+	return 0;
+}
+
+static int api_dev_config(const struct device *dev,
+			  const struct mspi_dev_id *dev_id,
+			  const enum mspi_dev_cfg_mask param_mask,
+			  const struct mspi_dev_cfg *cfg)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc;
+
+	if (dev_id != dev_data->dev_id) {
+		rc = k_sem_take(&dev_data->cfg_lock,
+				K_MSEC(CONFIG_MSPI_COMPLETION_TIMEOUT_TOLERANCE));
+		if (rc < 0) {
+			LOG_ERR("Failed to switch controller to device");
+			return -EBUSY;
+		}
+
+		dev_data->dev_id = dev_id;
+
+		if (param_mask == MSPI_DEVICE_CONFIG_NONE) {
+			return 0;
+		}
+	}
+
+	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
+
+	rc = _api_dev_config(dev, param_mask, cfg);
+
+	k_sem_give(&dev_data->ctx_lock);
+
+	if (rc < 0) {
+		dev_data->dev_id = NULL;
+		k_sem_give(&dev_data->cfg_lock);
+	}
+
+	return rc;
+}
+
+static int api_get_channel_status(const struct device *dev, uint8_t ch)
+{
+	ARG_UNUSED(ch);
+
+	struct mspi_dw_data *dev_data = dev->data;
+
+	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
+
+	dev_data->dev_id = NULL;
+	k_sem_give(&dev_data->cfg_lock);
+
+	k_sem_give(&dev_data->ctx_lock);
+
+	return 0;
+}
+
+static void tx_control_field(const struct device *dev,
+			     uint32_t field, uint8_t len)
+{
+	uint8_t shift = 8 * len;
+
+	do {
+		shift -= 8;
+		write_dr(dev, field >> shift);
+	} while (shift);
+}
+
+static int start_next_packet(const struct device *dev, k_timeout_t timeout)
+{
+	const struct mspi_dw_config *dev_config = dev->config;
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_xfer_packet *packet =
+		&dev_data->xfer.packets[dev_data->packets_done];
+	bool xip_enabled = COND_CODE_1(CONFIG_MSPI_XIP,
+				       (dev_data->xip_enabled != 0),
+				       (false));
+	unsigned int key;
+	uint8_t tx_fifo_threshold;
+	uint32_t packet_frames;
+	uint32_t imr;
+	int rc = 0;
+
+	if (packet->num_bytes == 0 &&
+	    dev_data->xfer.cmd_length == 0 &&
+	    dev_data->xfer.addr_length == 0) {
+		return 0;
+	}
+
+	dev_data->dummy_bytes = 0;
+
+	dev_data->ctrlr0 &= ~CTRLR0_TMOD_MASK
+			 &  ~CTRLR0_DFS_MASK;
+
+	dev_data->spi_ctrlr0 &= ~SPI_CTRLR0_WAIT_CYCLES_MASK;
+
+	if (dev_data->standard_spi &&
+	    (dev_data->xfer.cmd_length != 0 ||
+	     dev_data->xfer.addr_length != 0)) {
+		dev_data->bytes_per_frame_exp = 0;
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 7);
+	} else {
+		if ((packet->num_bytes % 4) == 0) {
+			dev_data->bytes_per_frame_exp = 2;
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 31);
+		} else if ((packet->num_bytes % 2) == 0) {
+			dev_data->bytes_per_frame_exp = 1;
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 15);
+		} else {
+			dev_data->bytes_per_frame_exp = 0;
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 7);
+		}
+	}
+
+	packet_frames = packet->num_bytes >> dev_data->bytes_per_frame_exp;
+
+	if (packet_frames > UINT16_MAX + 1) {
+		LOG_ERR("Packet length (%u) exceeds supported maximum",
+			packet->num_bytes);
+		return -EINVAL;
+	}
+
+	if (packet->dir == MSPI_TX || packet->num_bytes == 0) {
+		imr = IMR_TXEIM_BIT;
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_TMOD_MASK,
+					       CTRLR0_TMOD_TX);
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_WAIT_CYCLES_MASK,
+						   dev_data->xfer.tx_dummy);
+
+		write_rxftlr(dev, 0);
+		tx_fifo_threshold = dev_config->tx_fifo_threshold;
+	} else {
+		uint32_t tmod;
+		uint8_t rx_fifo_threshold;
+
+		/* In Standard SPI Mode, the controller does not support
+		 * sending the command and address fields separately, they
+		 * need to be sent as data; hence, for RX packets with these
+		 * fields, the TX/RX transfer mode needs to be used and
+		 * consequently, dummy bytes need to be transmitted so that
+		 * clock cycles for the RX part are provided (the controller
+		 * does not do it automatically in the TX/RX mode).
+		 */
+		if (dev_data->standard_spi &&
+		    (dev_data->xfer.cmd_length != 0 ||
+		     dev_data->xfer.addr_length != 0)) {
+			uint32_t rx_total_bytes;
+
+			dev_data->bytes_to_discard = dev_data->xfer.cmd_length
+						   + dev_data->xfer.addr_length;
+			rx_total_bytes = dev_data->bytes_to_discard
+				       + packet->num_bytes;
+
+			dev_data->dummy_bytes = packet->num_bytes;
+
+			imr = IMR_TXEIM_BIT | IMR_RXFIM_BIT;
+			tmod = CTRLR0_TMOD_TX_RX;
+			tx_fifo_threshold = dev_config->tx_fifo_threshold;
+			/* For standard SPI, only 1-byte frames are used. */
+			rx_fifo_threshold = MIN(rx_total_bytes - 1,
+						dev_config->rx_fifo_threshold);
+		} else {
+			imr = IMR_RXFIM_BIT;
+			tmod = CTRLR0_TMOD_RX;
+			tx_fifo_threshold = 0;
+			rx_fifo_threshold = MIN(packet_frames - 1,
+						dev_config->rx_fifo_threshold);
+		}
+
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_TMOD_MASK, tmod);
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_WAIT_CYCLES_MASK,
+						   dev_data->xfer.rx_dummy);
+
+		write_rxftlr(dev, FIELD_PREP(RXFTLR_RFT_MASK,
+					     rx_fifo_threshold));
+	}
+
+	if (dev_data->dev_id->ce.port) {
+		rc = gpio_pin_set_dt(&dev_data->dev_id->ce, 1);
+		if (rc < 0) {
+			LOG_ERR("Failed to activate CE line (%d)", rc);
+			return rc;
+		}
+	}
+
+	if (xip_enabled) {
+		key = irq_lock();
+		write_ssienr(dev, 0);
+	}
+
+	/* These registers cannot be written when the controller is enabled,
+	 * that's why it is temporarily disabled above; with locked interrupts,
+	 * to prevent potential XIP transfers during that period.
+	 */
+	write_ctrlr0(dev, dev_data->ctrlr0);
+	write_ctrlr1(dev, packet_frames > 0
+		? FIELD_PREP(CTRLR1_NDF_MASK, packet_frames - 1)
+		: 0);
+	write_spi_ctrlr0(dev, dev_data->spi_ctrlr0);
+	write_baudr(dev, dev_data->baudr);
+	write_ser(dev, BIT(dev_data->dev_id->dev_idx));
+
+	if (xip_enabled) {
+		write_ssienr(dev, SSIENR_SSIC_EN_BIT);
+		irq_unlock(key);
+	}
+
+	dev_data->buf_pos = packet->data_buf;
+	dev_data->buf_end = &packet->data_buf[packet->num_bytes];
+
+	if ((imr & IMR_TXEIM_BIT) && dev_data->buf_pos < dev_data->buf_end) {
+		uint32_t start_level = tx_fifo_threshold;
+
+		if (dev_data->dummy_bytes) {
+			uint32_t tx_total = dev_data->bytes_to_discard
+					  + dev_data->dummy_bytes;
+
+			if (start_level > tx_total - 1) {
+				start_level = tx_total - 1;
+			}
+		}
+
+		write_txftlr(dev,
+			FIELD_PREP(TXFTLR_TXFTHR_MASK, start_level) |
+			FIELD_PREP(TXFTLR_TFT_MASK, tx_fifo_threshold));
+	} else {
+		write_txftlr(dev, 0);
+	}
+
+	/* Ensure that there will be no interrupt from the controller yet. */
+	write_imr(dev, 0);
+	/* Enable the controller. This must be done before DR is written. */
+	write_ssienr(dev, SSIENR_SSIC_EN_BIT);
+
+	if (dev_data->standard_spi) {
+		if (dev_data->xfer.cmd_length) {
+			tx_control_field(dev, packet->cmd,
+					 dev_data->xfer.cmd_length);
+		}
+
+		if (dev_data->xfer.addr_length) {
+			tx_control_field(dev, packet->address,
+					 dev_data->xfer.addr_length);
+		}
+	} else {
+		if (dev_data->xfer.cmd_length) {
+			write_dr(dev, packet->cmd);
+		}
+
+		if (dev_data->xfer.addr_length) {
+			write_dr(dev, packet->address);
+		}
+	}
+
+	if (dev_data->dummy_bytes) {
+		if (make_rx_cycles(dev)) {
+			imr = IMR_RXFIM_BIT;
+		}
+	} else if (packet->dir == MSPI_TX && packet->num_bytes) {
+		tx_data(dev, packet);
+	}
+
+	/* Enable interrupts now and wait until the packet is done. */
+	write_imr(dev, imr);
+
+	rc = k_sem_take(&dev_data->finished, timeout);
+	if (rc < 0) {
+		rc = -ETIMEDOUT;
+	}
+
+	/* Disable the controller. This will immediately halt the transfer
+	 * if it hasn't finished yet.
+	 */
+	if (xip_enabled) {
+		/* If XIP is enabled, the controller must be kept enabled,
+		 * so disable it only momentarily if there's a need to halt
+		 * a transfer that has timeout out.
+		 */
+		if (rc == -ETIMEDOUT) {
+			key = irq_lock();
+
+			write_ssienr(dev, 0);
+			write_ssienr(dev, SSIENR_SSIC_EN_BIT);
+
+			irq_unlock(key);
+		}
+	} else {
+		write_ssienr(dev, 0);
+	}
+
+	if (dev_data->dev_id->ce.port) {
+		int rc2;
+
+		/* Do not use `rc` to not overwrite potential timeout error. */
+		rc2 = gpio_pin_set_dt(&dev_data->dev_id->ce, 0);
+		if (rc2 < 0) {
+			LOG_ERR("Failed to deactivate CE line (%d)", rc2);
+			return rc2;
+		}
+	}
+
+	return rc;
+}
+
+static int _api_transceive(const struct device *dev,
+			   const struct mspi_xfer *req)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc;
+
+	dev_data->spi_ctrlr0 &= ~SPI_CTRLR0_WAIT_CYCLES_MASK
+			     &  ~SPI_CTRLR0_INST_L_MASK
+			     &  ~SPI_CTRLR0_ADDR_L_MASK;
+
+	if (!apply_cmd_length(dev_data, req->cmd_length) ||
+	    !apply_addr_length(dev_data, req->addr_length)) {
+		return -EINVAL;
+	}
+
+	if (dev_data->standard_spi &&
+	    (req->rx_dummy != 0 || req->tx_dummy != 0)) {
+		LOG_ERR("Dummy cycles unsupported in single line mode");
+		return -EINVAL;
+	} else if (req->rx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX ||
+		   req->tx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX) {
+		LOG_ERR("Unsupported RX (%u) or TX (%u) dummy cycles",
+			req->rx_dummy, req->tx_dummy);
+		return -EINVAL;
+	}
+
+	dev_data->xfer = *req;
+
+	for (dev_data->packets_done = 0;
+	     dev_data->packets_done < dev_data->xfer.num_packet;
+	     dev_data->packets_done++) {
+		rc = start_next_packet(dev, K_MSEC(dev_data->xfer.timeout));
+		if (rc < 0) {
+			return rc;
+		}
+	}
+
+	return 0;
+}
+
+static int api_transceive(const struct device *dev,
+			  const struct mspi_dev_id *dev_id,
+			  const struct mspi_xfer *req)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc, rc2;
+
+	if (dev_id != dev_data->dev_id) {
+		LOG_ERR("Controller is not configured for this device");
+		return -EINVAL;
+	}
+
+	/* TODO: add support for asynchronous transfers */
+	if (req->async) {
+		LOG_ERR("Asynchronous transfers are not supported");
+		return -ENOTSUP;
+	}
+
+	rc = pm_device_runtime_get(dev);
+	if (rc < 0) {
+		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+		return rc;
+	}
+
+	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
+
+	rc = _api_transceive(dev, req);
+
+	k_sem_give(&dev_data->ctx_lock);
+
+	rc2 = pm_device_runtime_put(dev);
+	if (rc2 < 0) {
+		LOG_ERR("pm_device_runtime_put() failed: %d", rc2);
+		rc = (rc < 0 ? rc : rc2);
+	}
+
+	return rc;
+}
+
+#if defined(CONFIG_MSPI_XIP)
+static int _api_xip_config(const struct device *dev,
+			   const struct mspi_dev_id *dev_id,
+			   const struct mspi_xip_cfg *cfg)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc;
+
+	if (!cfg->enable) {
+		rc = vendor_specific_xip_disable(dev, dev_id, cfg);
+		if (rc < 0) {
+			return rc;
+		}
+
+		dev_data->xip_enabled &= ~BIT(dev_id->dev_idx);
+
+		if (!dev_data->xip_enabled) {
+			write_ssienr(dev, 0);
+
+			/* Since XIP is disabled, it is okay for the controller
+			 * to be suspended.
+			 */
+			rc = pm_device_runtime_put(dev);
+			if (rc < 0) {
+				LOG_ERR("pm_device_runtime_put() failed: %d", rc);
+				return rc;
+			}
+		}
+
+		return 0;
+	}
+
+	if (!dev_data->xip_enabled) {
+		struct xip_params *params = &dev_data->xip_params_active;
+		struct xip_ctrl ctrl = {0};
+
+		*params = dev_data->xip_params_stored;
+
+		if (!apply_xip_io_mode(dev_data, &ctrl) ||
+		    !apply_xip_cmd_length(dev_data, &ctrl) ||
+		    !apply_xip_addr_length(dev_data, &ctrl)) {
+			return -EINVAL;
+		}
+
+		if (params->rx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX ||
+		    params->tx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX) {
+			LOG_ERR("Unsupported RX (%u) or TX (%u) dummy cycles",
+				params->rx_dummy, params->tx_dummy);
+			return -EINVAL;
+		}
+
+		/* Increase usage count additionally to prevent the controller
+		 * from being suspended as long as XIP is active.
+		 */
+		rc = pm_device_runtime_get(dev);
+		if (rc < 0) {
+			LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+			return rc;
+		}
+
+		ctrl.read |= FIELD_PREP(XIP_CTRL_WAIT_CYCLES_MASK,
+					params->rx_dummy);
+		ctrl.write |= FIELD_PREP(XIP_WRITE_CTRL_WAIT_CYCLES_MASK,
+					 params->tx_dummy);
+
+		/* Make sure the baud rate and serial clock phase/polarity
+		 * registers are configured properly. They may not be if
+		 * non-XIP transfers have not been performed yet.
+		 */
+		write_ctrlr0(dev, dev_data->ctrlr0);
+		write_baudr(dev, dev_data->baudr);
+
+		write_xip_incr_inst(dev, params->read_cmd);
+		write_xip_wrap_inst(dev, params->read_cmd);
+		write_xip_ctrl(dev, ctrl.read);
+		write_xip_write_incr_inst(dev, params->write_cmd);
+		write_xip_write_wrap_inst(dev, params->write_cmd);
+		write_xip_write_ctrl(dev, ctrl.write);
+	} else if (dev_data->xip_params_active.read_cmd !=
+		   dev_data->xip_params_stored.read_cmd ||
+		   dev_data->xip_params_active.write_cmd !=
+		   dev_data->xip_params_stored.write_cmd ||
+		   dev_data->xip_params_active.cmd_length !=
+		   dev_data->xip_params_stored.cmd_length ||
+		   dev_data->xip_params_active.addr_length !=
+		   dev_data->xip_params_stored.addr_length ||
+		   dev_data->xip_params_active.rx_dummy !=
+		   dev_data->xip_params_stored.rx_dummy ||
+		   dev_data->xip_params_active.tx_dummy !=
+		   dev_data->xip_params_stored.tx_dummy) {
+		LOG_ERR("Conflict with configuration already used for XIP.");
+		return -EINVAL;
+	}
+
+	rc = vendor_specific_xip_enable(dev, dev_id, cfg);
+	if (rc < 0) {
+		return rc;
+	}
+
+	write_ssienr(dev, SSIENR_SSIC_EN_BIT);
+
+	dev_data->xip_enabled |= BIT(dev_id->dev_idx);
+
+	return 0;
+}
+
+static int api_xip_config(const struct device *dev,
+			  const struct mspi_dev_id *dev_id,
+			  const struct mspi_xip_cfg *cfg)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc, rc2;
+
+	if (cfg->enable && dev_id != dev_data->dev_id) {
+		LOG_ERR("Controller is not configured for this device");
+		return -EINVAL;
+	}
+
+	rc = pm_device_runtime_get(dev);
+	if (rc < 0) {
+		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+		return rc;
+	}
+
+	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
+
+	rc = _api_xip_config(dev, dev_id, cfg);
+
+	k_sem_give(&dev_data->ctx_lock);
+
+	rc2 = pm_device_runtime_put(dev);
+	if (rc2 < 0) {
+		LOG_ERR("pm_device_runtime_put() failed: %d", rc2);
+		rc = (rc < 0 ? rc : rc2);
+	}
+
+	return rc;
+}
+#endif /* defined(CONFIG_MSPI_XIP) */
+
+static int dev_pm_action_cb(const struct device *dev,
+			    enum pm_device_action action)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+
+	if (action == PM_DEVICE_ACTION_RESUME) {
+#if defined(CONFIG_PINCTRL)
+		const struct mspi_dw_config *dev_config = dev->config;
+		int rc = pinctrl_apply_state(dev_config->pcfg,
+					     PINCTRL_STATE_DEFAULT);
+
+		if (rc < 0) {
+			LOG_ERR("Cannot apply default pins state (%d)", rc);
+			return rc;
+		}
+#endif
+		vendor_specific_resume(dev);
+
+		k_sem_give(&dev_data->ctx_lock);
+
+		return 0;
+	}
+
+	if (IS_ENABLED(CONFIG_PM_DEVICE) &&
+	    action == PM_DEVICE_ACTION_SUSPEND) {
+		bool xip_enabled = COND_CODE_1(CONFIG_MSPI_XIP,
+					       (dev_data->xip_enabled != 0),
+					       (false));
+
+#if defined(CONFIG_PINCTRL)
+		const struct mspi_dw_config *dev_config = dev->config;
+		int rc = pinctrl_apply_state(dev_config->pcfg,
+					     PINCTRL_STATE_SLEEP);
+
+		if (rc < 0) {
+			LOG_ERR("Cannot apply sleep pins state (%d)", rc);
+			return rc;
+		}
+#endif
+		if (xip_enabled ||
+		    k_sem_take(&dev_data->ctx_lock, K_NO_WAIT) != 0) {
+			LOG_ERR("Controller in use, cannot be suspended");
+			return -EBUSY;
+		}
+
+		vendor_specific_suspend(dev);
+
+		return 0;
+	}
+
+	return -ENOTSUP;
+}
+
+static int dev_init(const struct device *dev)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_dw_config *dev_config = dev->config;
+	const struct gpio_dt_spec *ce_gpio;
+	int rc;
+
+	DEVICE_MMIO_MAP(dev, K_MEM_CACHE_NONE);
+
+	vendor_specific_init(dev);
+
+	dev_config->irq_config();
+
+	k_sem_init(&dev_data->finished, 0, 1);
+	k_sem_init(&dev_data->cfg_lock, 1, 1);
+	/* This semaphore will be set to 1 after the device is resumed. */
+	k_sem_init(&dev_data->ctx_lock, 0, 1);
+
+	for (ce_gpio = dev_config->ce_gpios;
+	     ce_gpio < &dev_config->ce_gpios[dev_config->ce_gpios_len];
+	     ce_gpio++) {
+		if (!device_is_ready(ce_gpio->port)) {
+			LOG_ERR("CE GPIO port %s is not ready",
+				ce_gpio->port->name);
+			return -ENODEV;
+		}
+
+		rc = gpio_pin_configure_dt(ce_gpio, GPIO_OUTPUT_INACTIVE);
+		if (rc < 0) {
+			return rc;
+		}
+	}
+
+#if defined(CONFIG_PINCTRL)
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		rc = pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
+		if (rc < 0) {
+			LOG_ERR("Cannot apply sleep pins state (%d)", rc);
+			return rc;
+		}
+	}
+#endif
+
+	return pm_device_driver_init(dev, dev_pm_action_cb);
+}
+
+static DEVICE_API(mspi, drv_api) = {
+	.config             = api_config,
+	.dev_config         = api_dev_config,
+	.get_channel_status = api_get_channel_status,
+	.transceive         = api_transceive,
+#if defined(CONFIG_MSPI_XIP)
+	.xip_config         = api_xip_config,
+#endif
+};
+
+#define MSPI_DW_INST_IRQ(idx, inst)					\
+	IRQ_CONNECT(DT_INST_IRQ_BY_IDX(inst, idx, irq),			\
+		    DT_INST_IRQ_BY_IDX(inst, idx, priority),		\
+		    mspi_dw_isr, DEVICE_DT_INST_GET(inst), 0);		\
+	irq_enable(DT_INST_IRQ_BY_IDX(inst, idx, irq))
+
+#define MSPI_DW_MMIO_ROM_INIT(node_id)					\
+	COND_CODE_1(DT_REG_HAS_NAME(node_id, core),			\
+		(Z_DEVICE_MMIO_NAMED_ROM_INITIALIZER(core, node_id)),	\
+		(DEVICE_MMIO_ROM_INIT(node_id)))
+
+#define MSPI_DW_CLOCK_FREQUENCY(inst)					\
+	COND_CODE_1(DT_NODE_HAS_PROP(DT_INST_PHANDLE(inst, clocks),	\
+				     clock_frequency),			\
+		(DT_INST_PROP_BY_PHANDLE(inst, clocks,			\
+					 clock_frequency)),		\
+		(DT_INST_PROP(inst, clock_frequency)))
+
+#define MSPI_DW_DT_INST_PROP(inst, prop) .prop = DT_INST_PROP(inst, prop)
+
+#define FOREACH_CE_GPIOS_ELEM(inst)					\
+	DT_INST_FOREACH_PROP_ELEM_SEP(inst, ce_gpios,			\
+				      GPIO_DT_SPEC_GET_BY_IDX, (,))
+#define MSPI_DW_CE_GPIOS(inst)						\
+	.ce_gpios = (const struct gpio_dt_spec [])			\
+		{ FOREACH_CE_GPIOS_ELEM(inst) },			\
+	.ce_gpios_len = DT_INST_PROP_LEN(inst, ce_gpios)
+
+#define TX_FIFO_DEPTH(inst) DT_INST_PROP(inst, fifo_depth)
+#define RX_FIFO_DEPTH(inst) DT_INST_PROP_OR(inst, rx_fifo_depth,	\
+					    TX_FIFO_DEPTH(inst))
+#define MSPI_DW_FIFO_PROPS(inst)					\
+	.tx_fifo_depth_minus_1 = TX_FIFO_DEPTH(inst) - 1,		\
+	.tx_fifo_threshold =						\
+		DT_INST_PROP_OR(inst, tx_fifo_threshold,		\
+				7 * TX_FIFO_DEPTH(inst) / 8 - 1),	\
+	.rx_fifo_threshold =						\
+		DT_INST_PROP_OR(inst, rx_fifo_threshold,		\
+				1 * RX_FIFO_DEPTH(inst) / 8 - 1)
+
+#define MSPI_DW_INST(inst)						\
+	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);		\
+	IF_ENABLED(CONFIG_PINCTRL, (PINCTRL_DT_INST_DEFINE(inst);))	\
+	static void irq_config##inst(void)				\
+	{								\
+		LISTIFY(DT_INST_NUM_IRQS(inst),				\
+			MSPI_DW_INST_IRQ, (;), inst);			\
+	}								\
+	static struct mspi_dw_data dev##inst##_data;			\
+	static const struct mspi_dw_config dev##inst##_config = {	\
+		MSPI_DW_MMIO_ROM_INIT(DT_DRV_INST(inst)),		\
+		.irq_config = irq_config##inst,				\
+		.clock_frequency = MSPI_DW_CLOCK_FREQUENCY(inst),	\
+	IF_ENABLED(CONFIG_PINCTRL,					\
+		(.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),))	\
+	IF_ENABLED(DT_INST_NODE_HAS_PROP(inst, ce_gpios),		\
+		(MSPI_DW_CE_GPIOS(inst),))				\
+		MSPI_DW_FIFO_PROPS(inst),				\
+		DEFINE_REG_ACCESS(inst)					\
+	};								\
+	DEVICE_DT_INST_DEFINE(inst,					\
+		dev_init, PM_DEVICE_DT_INST_GET(inst),			\
+		&dev##inst##_data, &dev##inst##_config,			\
+		POST_KERNEL, CONFIG_MSPI_INIT_PRIORITY,			\
+		&drv_api);
+
+DT_INST_FOREACH_STATUS_OKAY(MSPI_DW_INST)
diff --git a/drivers/mspi/mspi_dw.h b/drivers/mspi/mspi_dw.h
new file mode 100644
index 00000000000..6f4a2c5a981
--- /dev/null
+++ b/drivers/mspi/mspi_dw.h
@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * This file is a part of mspi_dw.c extracted only for clarity.
+ * It is not supposed to be included by any file other than mspi_dw.c.
+ */
+
+/* CTRLR0 - Control Register 0 */
+#define CTRLR0_SPI_FRF_MASK	GENMASK(23, 22)
+#define CTRLR0_SPI_FRF_STANDARD	0UL
+#define CTRLR0_SPI_FRF_DUAL	1UL
+#define CTRLR0_SPI_FRF_QUAD	2UL
+#define CTRLR0_SPI_FRF_OCTAL	3UL
+#define CTRLR0_TMOD_MASK	GENMASK(11, 10)
+#define CTRLR0_TMOD_TX_RX	0UL
+#define CTRLR0_TMOD_TX		1UL
+#define CTRLR0_TMOD_RX		2UL
+#define CTRLR0_TMOD_EEPROM	3UL
+#define CTRLR0_SCPOL_BIT	BIT(9)
+#define CTRLR0_SCPH_BIT		BIT(8)
+#define CTRLR0_FRF_MASK		GENMASK(7, 6)
+#define CTRLR0_FRF_SPI		0UL
+#define CTRLR0_FRF_SSP		1UL
+#define CTRLR0_FRF_MICROWIRE	2UL
+#define CTRLR0_DFS_MASK		GENMASK(4, 0)
+
+/* CTRLR1- Control Register 1 */
+#define CTRLR1_NDF_MASK		GENMASK(15, 0)
+
+/* SSIENR - SSI Enable Register */
+#define SSIENR_SSIC_EN_BIT	BIT(0)
+
+/* TXFTLR - Transmit FIFO Threshold Level */
+#define TXFTLR_TXFTHR_MASK	GENMASK(23, 16)
+#define TXFTLR_TFT_MASK		GENMASK(7, 0)
+
+/* RXFTLR - Receive FIFO Threshold Level */
+#define RXFTLR_RFT_MASK		GENMASK(7, 0)
+
+/* TXFLR - Transmit FIFO Level Register */
+#define TXFLR_TXTFL_MASK	GENMASK(7, 0)
+
+/* RXFLR - Receive FIFO Level Register */
+#define RXFLR_RXTFL_MASK	GENMASK(7, 0)
+
+/* SR - Status Register */
+#define SR_BUSY_BIT	        BIT(0)
+
+/* IMR - Interrupt Mask Register */
+#define IMR_TXEIM_BIT		BIT(0)
+#define IMR_TXOIM_BIT		BIT(1)
+#define IMR_RXUIM_BIT		BIT(2)
+#define IMR_RXOIM_BIT		BIT(3)
+#define IMR_RXFIM_BIT		BIT(4)
+#define IMR_MSTIM_BIT		BIT(5)
+
+/* ISR - Interrupt Status Register */
+#define ISR_TXEIS_BIT		BIT(0)
+#define ISR_TXOIS_BIT		BIT(1)
+#define ISR_RXUIS_BIT		BIT(2)
+#define ISR_RXOIS_BIT		BIT(3)
+#define ISR_RXFIS_BIT		BIT(4)
+#define ISR_MSTIS_BIT		BIT(5)
+
+/* SPI_CTRLR0 - SPI Control Register */
+#define SPI_CTRLR0_CLK_STRETCH_EN_BIT		BIT(30)
+#define SPI_CTRLR0_XIP_PREFETCH_EN_BIT		BIT(29)
+#define SPI_CTRLR0_XIP_MBL_BIT			BIT(26)
+#define SPI_CTRLR0_SPI_RXDS_SIG_EN_BIT		BIT(25)
+#define SPI_CTRLR0_SPI_DM_EN_BIT		BIT(24)
+#define SPI_CTRLR0_RXDS_VL_EN_BIT		BIT(23)
+#define SPI_CTRLR0_SSIC_XIP_CONT_XFER_EN_BIT	BIT(21)
+#define SPI_CTRLR0_XIP_INST_EN_BIT		BIT(20)
+#define SPI_CTRLR0_XIP_DFS_HC_BIT		BIT(19)
+#define SPI_CTRLR0_SPI_RXDS_EN_BIT		BIT(18)
+#define SPI_CTRLR0_INST_DDR_EN_BIT		BIT(17)
+#define SPI_CTRLR0_SPI_DDR_EN_BIT		BIT(16)
+#define SPI_CTRLR0_WAIT_CYCLES_MASK		GENMASK(15, 11)
+#define SPI_CTRLR0_WAIT_CYCLES_MAX		BIT_MASK(5)
+#define SPI_CTRLR0_INST_L_MASK			GENMASK(9, 8)
+#define SPI_CTRLR0_INST_L0			0UL
+#define SPI_CTRLR0_INST_L4			1UL
+#define SPI_CTRLR0_INST_L8			2UL
+#define SPI_CTRLR0_INST_L16			3UL
+#define SPI_CTRLR0_XIP_MD_BIT_EN_BIT		BIT(7)
+#define SPI_CTRLR0_ADDR_L_MASK			GENMASK(5, 2)
+#define SPI_CTRLR0_TRANS_TYPE_MASK		GENMASK(1, 0)
+#define SPI_CTRLR0_TRANS_TYPE_TT0		0UL
+#define SPI_CTRLR0_TRANS_TYPE_TT1		1UL
+#define SPI_CTRLR0_TRANS_TYPE_TT2		2UL
+#define SPI_CTRLR0_TRANS_TYPE_TT3		3UL
+
+/* XIP_CTRL - XIP Control Register */
+#define XIP_CTRL_XIP_PREFETCH_EN_BIT	BIT(28)
+#define XIP_CTRL_XIP_MBL_MASK		GENMASK(27, 26)
+#define XIP_CTRL_XIP_MBL_2		0UL
+#define XIP_CTRL_XIP_MBL_4		1UL
+#define XIP_CTRL_XIP_MBL_8		2UL
+#define XIP_CTRL_XIP_MBL_16		3UL
+#define XIP_CTRL_RXDS_SIG_EN_BIT	BIT(25)
+#define XIP_CTRL_XIP_HYBERBUS_EN_BIT	BIT(24)
+#define XIP_CTRL_CONT_XFER_EN_BIT	BIT(23)
+#define XIP_CTRL_INST_EN_BIT		BIT(22)
+#define XIP_CTRL_RXDS_EN_BIT		BIT(21)
+#define XIP_CTRL_INST_DDR_EN_BIT	BIT(20)
+#define XIP_CTRL_DDR_EN_BIT		BIT(19)
+#define XIP_CTRL_DFS_HC_BIT		BIT(18)
+#define XIP_CTRL_WAIT_CYCLES_MASK	GENMASK(17, 13)
+#define XIP_CTRL_WAIT_CYCLES_MAX	BIT_MASK(5)
+#define XIP_CTRL_MD_BITS_EN_BIT		BIT(12)
+#define XIP_CTRL_INST_L_MASK		GENMASK(10, 9)
+#define XIP_CTRL_INST_L0		0UL
+#define XIP_CTRL_INST_L4		1UL
+#define XIP_CTRL_INST_L8		2UL
+#define XIP_CTRL_INST_L16		3UL
+#define XIP_CTRL_ADDR_L_MASK		GENMASK(7, 4)
+#define XIP_CTRL_TRANS_TYPE_MASK	GENMASK(3, 2)
+#define XIP_CTRL_TRANS_TYPE_TT0		0UL
+#define XIP_CTRL_TRANS_TYPE_TT1		1UL
+#define XIP_CTRL_TRANS_TYPE_TT2		2UL
+#define XIP_CTRL_FRF_MASK		GENMASK(1, 0)
+#define XIP_CTRL_FRF_DUAL		1UL
+#define XIP_CTRL_FRF_QUAD		2UL
+#define XIP_CTRL_FRF_OCTAL		3UL
+
+/* XIP_CTRL - XIP Control Register */
+#define XIP_CTRL_XIP_PREFETCH_EN_BIT	BIT(28)
+#define XIP_CTRL_XIP_MBL_MASK		GENMASK(27, 26)
+#define XIP_CTRL_XIP_MBL_2		0UL
+#define XIP_CTRL_XIP_MBL_4		1UL
+#define XIP_CTRL_XIP_MBL_8		2UL
+#define XIP_CTRL_XIP_MBL_16		3UL
+#define XIP_CTRL_XIP_HYBERBUS_EN_BIT	BIT(24)
+#define XIP_CTRL_CONT_XFER_EN_BIT	BIT(23)
+#define XIP_CTRL_INST_EN_BIT		BIT(22)
+#define XIP_CTRL_RXDS_EN_BIT		BIT(21)
+#define XIP_CTRL_INST_DDR_EN_BIT	BIT(20)
+#define XIP_CTRL_DDR_EN_BIT		BIT(19)
+#define XIP_CTRL_DFS_HC_BIT		BIT(18)
+
+/* XIP_WRITE_CTRL - XIP Write Control Register */
+#define XIP_WRITE_CTRL_WAIT_CYCLES_MASK	GENMASK(20, 16)
+#define XIP_WRITE_CTRL_WAIT_CYCLES_MAX	BIT_MASK(5)
+#define XIP_WRITE_CTRL_RXDS_SIG_EN_BIT	BIT(13)
+#define XIP_WRITE_CTRL_HYBERBUS_EN_BIT	BIT(12)
+#define XIP_WRITE_CTRL_INST_DDR_EN_BIT	BIT(11)
+#define XIP_WRITE_CTRL_SPI_DDR_EN_BIT	BIT(10)
+#define XIP_WRITE_CTRL_INST_L_MASK	GENMASK(9, 8)
+#define XIP_WRITE_CTRL_INST_L0		0UL
+#define XIP_WRITE_CTRL_INST_L4		1UL
+#define XIP_WRITE_CTRL_INST_L8		2UL
+#define XIP_WRITE_CTRL_INST_L16		3UL
+#define XIP_WRITE_CTRL_ADDR_L_MASK	GENMASK(7, 4)
+#define XIP_WRITE_CTRL_TRANS_TYPE_MASK	GENMASK(3, 2)
+#define XIP_WRITE_CTRL_TRANS_TYPE_TT0	0UL
+#define XIP_WRITE_CTRL_TRANS_TYPE_TT1	1UL
+#define XIP_WRITE_CTRL_TRANS_TYPE_TT2	2UL
+#define XIP_WRITE_CTRL_FRF_MASK		GENMASK(1, 0)
+#define XIP_WRITE_CTRL_FRF_DUAL		1UL
+#define XIP_WRITE_CTRL_FRF_QUAD		2UL
+#define XIP_WRITE_CTRL_FRF_OCTAL	3UL
+
+/* Register access helpers. */
+#define USES_AUX_REG(inst) + DT_INST_PROP(inst, aux_reg_enable)
+#define AUX_REG_INSTANCES (0 DT_INST_FOREACH_STATUS_OKAY(USES_AUX_REG))
+#define BASE_ADDR(dev) (mm_reg_t)DEVICE_MMIO_GET(dev)
+
+#if AUX_REG_INSTANCES != 0
+static uint32_t aux_reg_read(const struct device *dev, uint32_t off)
+{
+	return sys_in32(BASE_ADDR(dev) + off/4);
+}
+static void aux_reg_write(uint32_t data, const struct device *dev, uint32_t off)
+{
+	sys_out32(data, BASE_ADDR(dev) + off/4);
+}
+#endif
+
+#if AUX_REG_INSTANCES != DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT)
+static uint32_t reg_read(const struct device *dev, uint32_t off)
+{
+	return sys_read32(BASE_ADDR(dev) + off);
+}
+static void reg_write(uint32_t data, const struct device *dev, uint32_t off)
+{
+	sys_write32(data, BASE_ADDR(dev) + off);
+}
+#endif
+
+#if AUX_REG_INSTANCES == 0
+/* If no instance uses aux-reg access. */
+#define DECLARE_REG_ACCESS()
+#define DEFINE_REG_ACCESS(inst)
+#define DEFINE_MM_REG_RD(reg, off) \
+	static inline uint32_t read_##reg(const struct device *dev) \
+	{ return reg_read(dev, off); }
+#define DEFINE_MM_REG_WR(reg, off) \
+	static inline void write_##reg(const struct device *dev, uint32_t data) \
+	{ reg_write(data, dev, off); }
+
+#elif AUX_REG_INSTANCES == DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT)
+/* If all instances use aux-reg access. */
+#define DECLARE_REG_ACCESS()
+#define DEFINE_REG_ACCESS(inst)
+#define DEFINE_MM_REG_RD(reg, off) \
+	static inline uint32_t read_##reg(const struct device *dev) \
+	{ return aux_reg_read(dev, off); }
+#define DEFINE_MM_REG_WR(reg, off) \
+	static inline void write_##reg(const struct device *dev, uint32_t data) \
+	{ aux_reg_write(data, dev, off); }
+
+#else
+/* If register access varies by instance. */
+#define DECLARE_REG_ACCESS() \
+	uint32_t (*read)(const struct device *dev, uint32_t off); \
+	void (*write)(uint32_t data, const struct device *dev, uint32_t off)
+#define DEFINE_REG_ACCESS(inst) \
+	COND_CODE_1(DT_INST_PROP(inst, aux_reg_enable), \
+		(.read = aux_reg_read, \
+		.write = aux_reg_write,), \
+		(.read = reg_read, \
+		.write = reg_write,))
+#define DEFINE_MM_REG_RD(reg, off) \
+	static inline uint32_t read_##reg(const struct device *dev) \
+	{ \
+		const struct mspi_dw_config *dev_config = dev->config; \
+		return dev_config->read(dev, off); \
+	}
+#define DEFINE_MM_REG_WR(reg, off) \
+	static inline void write_##reg(const struct device *dev, uint32_t data) \
+	{ \
+		const struct mspi_dw_config *dev_config = dev->config; \
+		dev_config->write(data, dev, off); \
+	}
+#endif
diff --git a/drivers/mspi/mspi_dw_vendor_specific.h b/drivers/mspi/mspi_dw_vendor_specific.h
new file mode 100644
index 00000000000..7255f926fa8
--- /dev/null
+++ b/drivers/mspi/mspi_dw_vendor_specific.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * This file is a part of mspi_dw.c extracted only for clarity.
+ * It is not supposed to be included by any file other than mspi_dw.c.
+ */
+
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
+
+#include <nrf.h>
+
+static void vendor_specific_init(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	NRF_EXMIF->EVENTS_CORE = 0;
+	NRF_EXMIF->INTENSET = BIT(EXMIF_INTENSET_CORE_Pos);
+}
+
+static void vendor_specific_suspend(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	NRF_EXMIF->TASKS_STOP = 1;
+}
+
+static void vendor_specific_resume(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	NRF_EXMIF->TASKS_START = 1;
+}
+
+static void vendor_specific_irq_clear(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	NRF_EXMIF->EVENTS_CORE = 0;
+}
+
+#if defined(CONFIG_MSPI_XIP)
+static int vendor_specific_xip_enable(const struct device *dev,
+				      const struct mspi_dev_id *dev_id,
+				      const struct mspi_xip_cfg *cfg)
+{
+	ARG_UNUSED(dev);
+
+	if (dev_id->dev_idx == 0) {
+		NRF_EXMIF->EXTCONF1.OFFSET = cfg->address_offset;
+		NRF_EXMIF->EXTCONF1.SIZE = cfg->address_offset
+					 + cfg->size - 1;
+		NRF_EXMIF->EXTCONF1.ENABLE = 1;
+	} else if (dev_id->dev_idx == 1) {
+		NRF_EXMIF->EXTCONF2.OFFSET = cfg->address_offset;
+		NRF_EXMIF->EXTCONF2.SIZE = cfg->address_offset
+					 + cfg->size - 1;
+		NRF_EXMIF->EXTCONF2.ENABLE = 1;
+	} else {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int vendor_specific_xip_disable(const struct device *dev,
+				       const struct mspi_dev_id *dev_id,
+				       const struct mspi_xip_cfg *cfg)
+{
+	ARG_UNUSED(dev);
+
+	if (dev_id->dev_idx == 0) {
+		NRF_EXMIF->EXTCONF1.ENABLE = 0;
+	} else if (dev_id->dev_idx == 1) {
+		NRF_EXMIF->EXTCONF2.ENABLE = 0;
+	} else {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+#endif /* defined(CONFIG_MSPI_XIP) */
+
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) */
diff --git a/dts/bindings/mspi/snps,designware-ssi.yaml b/dts/bindings/mspi/snps,designware-ssi.yaml
new file mode 100644
index 00000000000..fb516cb7835
--- /dev/null
+++ b/dts/bindings/mspi/snps,designware-ssi.yaml
@@ -0,0 +1,45 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Synopsys DesignWare Synchronous Serial Interface (SSI) node
+
+compatible: "snps,designware-ssi"
+
+include: [mspi-controller.yaml, pinctrl-device.yaml]
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  aux-reg-enable:
+    type: boolean
+    description: |
+      Activates auxiliary register access that is needed on some platforms.
+
+  fifo-depth:
+    required: true
+    type: int
+    description: |
+      Number of items that can be stored in the TX FIFO. Range: 8-256.
+      If the RX FIFO depth is not specified separately in the rx-fifo-depth
+      property, this value specifies depth of both TX and RX FIFOs.
+
+  rx-fifo-depth:
+    type: int
+    description: |
+      Number of items that can be stored in the RX FIFO. Range: 8-256.
+
+  tx-fifo-threshold:
+    type: int
+    description: |
+      Number of entries in the TX FIFO above which the TX transfer is started.
+      Maximum value is the TX FIFO depth - 1.
+
+  rx-fifo-threshold:
+    type: int
+    description: |
+      Number of entries in the RX FIFO above which the controller gets an RX
+      interrupt. Maximum value is the RX FIFO depth - 1.

From d869c3942e6d079a4def11d94cb1abc21bb94b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 17 Oct 2024 14:23:17 +0200
Subject: [PATCH 2189/2913] [nrf fromlist] drivers: flash: Add generic NOR
 flash driver for MSPI devices
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a flash driver intended to handle various flash devices
connected over MSPI bus as long as they support JEDEC SFDP.
This is an initial commit providing only basic operations
in Octal I/O mode with some hard-coded values for Macronix
MX25Ux series chips.

Upstream PR #: 85520

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/flash/CMakeLists.txt         |   1 +
 drivers/flash/Kconfig.mspi           |  30 ++
 drivers/flash/flash_mspi_nor.c       | 658 +++++++++++++++++++++++++++
 dts/bindings/mtd/jedec,mspi-nor.yaml |  24 +
 4 files changed, 713 insertions(+)
 create mode 100644 drivers/flash/flash_mspi_nor.c
 create mode 100644 dts/bindings/mtd/jedec,mspi-nor.yaml

diff --git a/drivers/flash/CMakeLists.txt b/drivers/flash/CMakeLists.txt
index 617f1422a90..d3bbf7ee2ff 100644
--- a/drivers/flash/CMakeLists.txt
+++ b/drivers/flash/CMakeLists.txt
@@ -34,6 +34,7 @@ zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_MX25UM51345G flash_mcux_f
 zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_NOR flash_mcux_flexspi_nor.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_ATXP032 flash_mspi_atxp032.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_EMUL_DEVICE flash_mspi_emul_device.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_NOR flash_mspi_nor.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_NOR flash_npcx_fiu_nor.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_QSPI flash_npcx_fiu_qspi.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_RPI_PICO flash_rpi_pico.c)
diff --git a/drivers/flash/Kconfig.mspi b/drivers/flash/Kconfig.mspi
index 158fcefb528..5f4ade2473f 100644
--- a/drivers/flash/Kconfig.mspi
+++ b/drivers/flash/Kconfig.mspi
@@ -28,4 +28,34 @@ config FLASH_MSPI_ATXP032
 	select FLASH_JESD216
 	select MSPI_AMBIQ_AP3 if SOC_SERIES_APOLLO3X
 
+menuconfig FLASH_MSPI_NOR
+	bool "Generic MSPI NOR Flash"
+	default y
+	depends on DT_HAS_JEDEC_MSPI_NOR_ENABLED
+	select FLASH_MSPI
+	select FLASH_HAS_EXPLICIT_ERASE
+	select FLASH_JESD216
+	select GPIO if $(dt_compat_any_has_prop,$(DT_COMPAT_JEDEC_MSPI_NOR),reset-gpios)
+
+if FLASH_MSPI_NOR
+
+config FLASH_MSPI_NOR_INIT_PRIORITY
+	int
+	default 80
+	help
+	  Device driver initialization priority.
+	  Device is connected to MSPI bus, it has to
+	  be initialized after MSPI driver.
+
+config FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE
+	int "Page size to use for FLASH_LAYOUT feature"
+	default 65536
+	help
+	  When CONFIG_FLASH_PAGE_LAYOUT is used this driver will support that
+	  API. By default the page size corresponds to the block size (65536).
+	  Other options include the 32K-byte erase size (32768), the sector
+	  size (4096), or any non-zero multiple of the sector size.
+
+endif # FLASH_MSPI_NOR
+
 endmenu
diff --git a/drivers/flash/flash_mspi_nor.c b/drivers/flash/flash_mspi_nor.c
new file mode 100644
index 00000000000..1f9f2c67ee9
--- /dev/null
+++ b/drivers/flash/flash_mspi_nor.c
@@ -0,0 +1,658 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT jedec_mspi_nor
+
+#include <zephyr/drivers/flash.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/mspi.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
+
+#include "jesd216.h"
+#include "spi_nor.h"
+
+LOG_MODULE_REGISTER(flash_mspi_nor, CONFIG_FLASH_LOG_LEVEL);
+
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios)
+#define WITH_RESET_GPIO 1
+#endif
+
+struct flash_mspi_nor_data {
+	struct k_sem acquired;
+	struct mspi_xfer_packet packet;
+	struct mspi_xfer xfer;
+};
+
+struct flash_mspi_nor_config {
+	const struct device *bus;
+	uint32_t flash_size;
+	struct mspi_dev_id mspi_id;
+	struct mspi_dev_cfg mspi_cfg;
+#if defined(CONFIG_MSPI_XIP)
+	struct mspi_xip_cfg xip_cfg;
+#endif
+#if defined(WITH_RESET_GPIO)
+	struct gpio_dt_spec reset;
+	uint32_t reset_pulse_us;
+	uint32_t reset_recovery_us;
+#endif
+#if defined(CONFIG_FLASH_PAGE_LAYOUT)
+	struct flash_pages_layout layout;
+#endif
+	uint8_t jedec_id[SPI_NOR_MAX_ID_LEN];
+};
+
+static int acquire(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	int rc;
+
+	k_sem_take(&dev_data->acquired, K_FOREVER);
+
+	rc = pm_device_runtime_get(dev_config->bus);
+	if (rc < 0) {
+		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+		return rc;
+	}
+
+	/* This acquires the MSPI controller and configures it for the flash. */
+	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
+			     MSPI_DEVICE_CONFIG_ALL, &dev_config->mspi_cfg);
+	if (rc < 0) {
+		LOG_ERR("mspi_dev_config() failed: %d", rc);
+		return rc;
+	}
+
+	return 0;
+}
+
+static void release(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+
+	/* This releases the MSPI controller. */
+	(void)mspi_get_channel_status(dev_config->bus, 0);
+
+	(void)pm_device_runtime_put(dev_config->bus);
+
+	k_sem_give(&dev_data->acquired);
+}
+
+static inline uint32_t dev_flash_size(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+
+	return dev_config->flash_size;
+}
+
+static inline uint16_t dev_page_size(const struct device *dev)
+{
+	return SPI_NOR_PAGE_SIZE;
+}
+
+static int api_read(const struct device *dev, off_t addr, void *dest,
+		    size_t size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	const uint32_t flash_size = dev_flash_size(dev);
+	int rc;
+
+	if (size == 0) {
+		return 0;
+	}
+
+	if ((addr < 0) || ((addr + size) > flash_size)) {
+		return -EINVAL;
+	}
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	/* TODO: get rid of all these hard-coded values for MX25Ux chips */
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 20;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = SPI_NOR_OCMD_RD;
+	dev_data->packet.address   = addr;
+	dev_data->packet.data_buf  = dest;
+	dev_data->packet.num_bytes = size;
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+
+	release(dev);
+
+	if (rc < 0) {
+		LOG_ERR("SPI_NOR_OCMD_RD xfer failed: %d", rc);
+		return rc;
+	}
+
+	return 0;
+}
+
+static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	uint8_t status_reg;
+	int rc;
+
+	while (true) {
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.addr_length = 4;
+		dev_data->xfer.rx_dummy    = 4;
+		dev_data->packet.dir       = MSPI_RX;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_RDSR;
+		dev_data->packet.address   = 0;
+		dev_data->packet.data_buf  = &status_reg;
+		dev_data->packet.num_bytes = sizeof(status_reg);
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_RDSR xfer failed: %d", rc);
+			return rc;
+		}
+		if (!(status_reg & SPI_NOR_WIP_BIT)) {
+			break;
+		}
+
+		k_sleep(poll_period);
+	}
+
+	return 0;
+}
+
+static int api_write(const struct device *dev, off_t addr, const void *src,
+		     size_t size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	const uint32_t flash_size = dev_flash_size(dev);
+	const uint16_t page_size = dev_page_size(dev);
+	int rc;
+
+	if (size == 0) {
+		return 0;
+	}
+
+	if ((addr < 0) || ((addr + size) > flash_size)) {
+		return -EINVAL;
+	}
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	while (size > 0) {
+		/* Split write into parts, each within one page only. */
+		uint16_t page_offset = (uint16_t)(addr % page_size);
+		uint16_t page_left = page_size - page_offset;
+		uint16_t to_write = (uint16_t)MIN(size, page_left);
+
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.tx_dummy    = 0;
+		dev_data->packet.dir       = MSPI_TX;
+
+		dev_data->xfer.addr_length = 0;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
+		dev_data->packet.num_bytes = 0;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
+			break;
+		}
+
+		dev_data->xfer.addr_length = 4;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_PAGE_PRG;
+		dev_data->packet.address   = addr;
+		dev_data->packet.data_buf  = (uint8_t *)src;
+		dev_data->packet.num_bytes = to_write;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_PAGE_PRG xfer failed: %d", rc);
+			break;
+		}
+
+		addr += to_write;
+		src   = (const uint8_t *)src + to_write;
+		size -= to_write;
+
+		rc = wait_until_ready(dev, K_MSEC(1));
+		if (rc < 0) {
+			break;
+		}
+	}
+
+	release(dev);
+
+	return rc;
+}
+
+static int api_erase(const struct device *dev, off_t addr, size_t size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	const uint32_t flash_size = dev_flash_size(dev);
+	int rc = 0;
+
+	if ((addr < 0) || ((addr + size) > flash_size)) {
+		return -EINVAL;
+	}
+
+	if (!SPI_NOR_IS_SECTOR_ALIGNED(addr)) {
+		return -EINVAL;
+	}
+
+	if ((size % SPI_NOR_SECTOR_SIZE) != 0) {
+		return -EINVAL;
+	}
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	while (size > 0) {
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.tx_dummy    = 0;
+		dev_data->packet.dir       = MSPI_TX;
+		dev_data->packet.num_bytes = 0;
+
+		dev_data->xfer.addr_length = 0;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
+			break;
+		}
+
+		if (size == flash_size) {
+			/* Chip erase. */
+			dev_data->xfer.addr_length = 0;
+			dev_data->packet.cmd       = SPI_NOR_OCMD_CE;
+
+			size -= flash_size;
+		} else {
+			/* Sector erase. */
+			dev_data->xfer.addr_length = 4;
+			dev_data->packet.cmd       = SPI_NOR_OCMD_SE;
+			dev_data->packet.address   = addr;
+
+			addr += SPI_NOR_SECTOR_SIZE;
+			size -= SPI_NOR_SECTOR_SIZE;
+		}
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("Erase command 0x%02x xfer failed: %d",
+				dev_data->packet.cmd, rc);
+			break;
+		}
+
+		rc = wait_until_ready(dev, K_MSEC(1));
+		if (rc < 0) {
+			break;
+		}
+	}
+
+	release(dev);
+
+	return rc;
+}
+
+static const
+struct flash_parameters *api_get_parameters(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	static const struct flash_parameters parameters = {
+		.write_block_size = 1,
+		.erase_value = 0xff,
+	};
+
+	return &parameters;
+}
+
+static int read_jedec_id(const struct device *dev, uint8_t *id)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	int rc;
+
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 4;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_OCMD_READ_ID;
+	dev_data->packet.address   = 0;
+	dev_data->packet.data_buf  = id;
+	dev_data->packet.num_bytes = JESD216_READ_ID_LEN;
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		printk("mspi_transceive() failed: %d\n", rc);
+		return rc;
+	}
+
+	return rc;
+}
+
+#if defined(CONFIG_FLASH_PAGE_LAYOUT)
+static void api_page_layout(const struct device *dev,
+			     const struct flash_pages_layout **layout,
+			     size_t *layout_size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+
+	*layout = &dev_config->layout;
+	*layout_size = 1;
+}
+#endif /* CONFIG_FLASH_PAGE_LAYOUT */
+
+#if defined(CONFIG_FLASH_JESD216_API)
+static int api_sfdp_read(const struct device *dev, off_t addr, void *dest,
+			 size_t size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	int rc;
+
+	if (size == 0) {
+		return 0;
+	}
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 20;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_OCMD_READ_SFDP;
+	dev_data->packet.address   = addr;
+	dev_data->packet.data_buf  = dest;
+	dev_data->packet.num_bytes = size;
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		printk("JESD216_OCMD_READ_SFDP xfer failed: %d\n", rc);
+		return rc;
+	}
+
+	release(dev);
+
+	return rc;
+}
+
+static int api_read_jedec_id(const struct device *dev, uint8_t *id)
+{
+	int rc = 0;
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	rc = read_jedec_id(dev, id);
+
+	release(dev);
+
+	return rc;
+}
+#endif /* CONFIG_FLASH_JESD216_API  */
+
+static int dev_pm_action_cb(const struct device *dev,
+			    enum pm_device_action action)
+{
+	switch (action) {
+	case PM_DEVICE_ACTION_SUSPEND:
+		break;
+	case PM_DEVICE_ACTION_RESUME:
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+static int flash_chip_init(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	struct mspi_dev_cfg init_dev_cfg = dev_config->mspi_cfg;
+	uint8_t id[JESD216_READ_ID_LEN] = {0};
+	int rc;
+
+	init_dev_cfg.freq = MHZ(1);
+	init_dev_cfg.io_mode = MSPI_IO_MODE_SINGLE;
+
+	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
+			     MSPI_DEVICE_CONFIG_ALL, &init_dev_cfg);
+	if (rc < 0) {
+		LOG_ERR("Failed to set initial device config: %d", rc);
+		return rc;
+	}
+
+	dev_data->xfer.xfer_mode  = MSPI_PIO;
+	dev_data->xfer.packets    = &dev_data->packet;
+	dev_data->xfer.num_packet = 1;
+	dev_data->xfer.timeout    = 10;
+
+	dev_data->xfer.cmd_length  = 1;
+	dev_data->xfer.addr_length = 0;
+	dev_data->xfer.tx_dummy    = 0;
+	dev_data->xfer.rx_dummy    = 0;
+
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_CMD_READ_ID;
+	dev_data->packet.data_buf  = id;
+	dev_data->packet.num_bytes = sizeof(id);
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		LOG_ERR("Failed to read JEDEC ID in single line mode: %d", rc);
+		return rc;
+	}
+
+	/*
+	 * If the read ID does not match the one from DTS, assume the flash
+	 * is already in the Octa I/O mode, so switching it is not needed.
+	 */
+	if (memcmp(id, dev_config->jedec_id, sizeof(id)) == 0) {
+		static const uint8_t enable_sopi[] = { 0x01 };
+
+		dev_data->packet.dir       = MSPI_TX;
+		dev_data->packet.cmd       = SPI_NOR_CMD_WREN;
+		dev_data->packet.num_bytes = 0;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_CMD_WREN xfer failed: %d", rc);
+			return rc;
+		}
+
+		dev_data->xfer.addr_length = 4;
+		dev_data->packet.cmd       = SPI_NOR_CMD_WR_CFGREG2;
+		dev_data->packet.address   = 0;
+		dev_data->packet.data_buf  = (uint8_t *)&enable_sopi;
+		dev_data->packet.num_bytes = sizeof(enable_sopi);
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			printk("SPI_NOR_CMD_WR_CFGREG2 xfer failed: %d\n", rc);
+			return rc;
+		}
+	}
+
+	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
+			     MSPI_DEVICE_CONFIG_ALL, &dev_config->mspi_cfg);
+	if (rc < 0) {
+		LOG_ERR("Failed to set device config: %d", rc);
+		return rc;
+	}
+
+	rc = read_jedec_id(dev, id);
+	if (rc < 0) {
+		return rc;
+	}
+
+	if (memcmp(id, dev_config->jedec_id, sizeof(id)) != 0) {
+		LOG_ERR("JEDEC ID mismatch, read: %02x %02x %02x, "
+			"expected: %02x %02x %02x",
+			id[0], id[1], id[2],
+			dev_config->jedec_id[0],
+			dev_config->jedec_id[1],
+			dev_config->jedec_id[2]);
+		return -ENODEV;
+	}
+
+#if defined(CONFIG_MSPI_XIP)
+	/* Enable XIP access for this chip if specified so in DT. */
+	if (dev_config->xip_cfg.enable) {
+		rc = mspi_xip_config(dev_config->bus, &dev_config->mspi_id,
+				     &dev_config->xip_cfg);
+		if (rc < 0) {
+			return rc;
+		}
+	}
+#endif
+
+	return 0;
+}
+
+static int drv_init(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	int rc;
+
+	if (!device_is_ready(dev_config->bus)) {
+		LOG_ERR("Device %s is not ready", dev_config->bus->name);
+		return -ENODEV;
+	}
+
+#if defined(WITH_RESET_GPIO)
+	if (dev_config->reset.port) {
+		if (!gpio_is_ready_dt(&dev_config->reset)) {
+			LOG_ERR("Device %s is not ready",
+				dev_config->reset.port->name);
+			return -ENODEV;
+		}
+
+		rc = gpio_pin_configure_dt(&dev_config->reset,
+					   GPIO_OUTPUT_ACTIVE);
+		if (rc < 0) {
+			LOG_ERR("Failed to activate RESET: %d", rc);
+			return -EIO;
+		}
+
+		if (dev_config->reset_pulse_us != 0) {
+			k_busy_wait(dev_config->reset_pulse_us);
+		}
+
+		rc = gpio_pin_set_dt(&dev_config->reset, 0);
+		if (rc < 0) {
+			LOG_ERR("Failed to deactivate RESET: %d", rc);
+			return -EIO;
+		}
+
+		if (dev_config->reset_recovery_us != 0) {
+			k_busy_wait(dev_config->reset_recovery_us);
+		}
+	}
+#endif
+
+	rc = pm_device_runtime_get(dev_config->bus);
+	if (rc < 0) {
+		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+		return rc;
+	}
+
+	/* Acquire the MSPI controller. */
+	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
+			     MSPI_DEVICE_CONFIG_NONE, NULL);
+	if (rc == 0) {
+		rc = flash_chip_init(dev);
+
+		/* Release the MSPI controller. */
+		(void)mspi_get_channel_status(dev_config->bus, 0);
+	}
+
+	(void)pm_device_runtime_put(dev_config->bus);
+
+	if (rc < 0) {
+		return rc;
+	}
+
+	k_sem_init(&dev_data->acquired, 1, K_SEM_MAX_LIMIT);
+
+	return pm_device_driver_init(dev, dev_pm_action_cb);
+}
+
+static DEVICE_API(flash, drv_api) = {
+	.read = api_read,
+	.write = api_write,
+	.erase = api_erase,
+	.get_parameters = api_get_parameters,
+#if defined(CONFIG_FLASH_PAGE_LAYOUT)
+	.page_layout = api_page_layout,
+#endif
+#if defined(CONFIG_FLASH_JESD216_API)
+	.sfdp_read = api_sfdp_read,
+	.read_jedec_id = api_read_jedec_id,
+#endif
+};
+
+#define FLASH_SIZE_INST(inst) (DT_INST_PROP(inst, size) / 8)
+
+#define FLASH_MSPI_NOR_INST(inst)						\
+	BUILD_ASSERT(DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		     MSPI_IO_MODE_OCTAL,					\
+		"Only Octal I/O mode is supported for now");			\
+	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);			\
+	static struct flash_mspi_nor_data dev##inst##_data;			\
+	static const struct flash_mspi_nor_config dev##inst##_config = {	\
+		.bus = DEVICE_DT_GET(DT_INST_BUS(inst)),			\
+		.flash_size = FLASH_SIZE_INST(inst),				\
+		.mspi_id = MSPI_DEVICE_ID_DT_INST(inst),			\
+		.mspi_cfg = MSPI_DEVICE_CONFIG_DT_INST(inst),			\
+	IF_ENABLED(CONFIG_MSPI_XIP,						\
+		(.xip_cfg = MSPI_XIP_CONFIG_DT_INST(inst),))			\
+	IF_ENABLED(WITH_RESET_GPIO,						\
+		(.reset = GPIO_DT_SPEC_INST_GET_OR(inst, reset_gpios, {0}),	\
+		.reset_pulse_us = DT_INST_PROP_OR(inst, t_reset_pulse, 0)	\
+				/ 1000,						\
+		.reset_recovery_us = DT_INST_PROP_OR(inst, t_reset_recovery, 0)	\
+				   / 1000,))					\
+	IF_ENABLED(CONFIG_FLASH_PAGE_LAYOUT,					\
+		(.layout = {							\
+			.pages_size = CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE,	\
+			.pages_count = FLASH_SIZE_INST(inst)			\
+				     / CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE,	\
+		},))								\
+		.jedec_id = DT_INST_PROP(inst, jedec_id),			\
+	};									\
+	DEVICE_DT_INST_DEFINE(inst,						\
+		drv_init, PM_DEVICE_DT_INST_GET(inst),				\
+		&dev##inst##_data, &dev##inst##_config,				\
+		POST_KERNEL, CONFIG_FLASH_MSPI_NOR_INIT_PRIORITY,		\
+		&drv_api);
+
+DT_INST_FOREACH_STATUS_OKAY(FLASH_MSPI_NOR_INST)
diff --git a/dts/bindings/mtd/jedec,mspi-nor.yaml b/dts/bindings/mtd/jedec,mspi-nor.yaml
new file mode 100644
index 00000000000..5bad8f54b5d
--- /dev/null
+++ b/dts/bindings/mtd/jedec,mspi-nor.yaml
@@ -0,0 +1,24 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Generic NOR flash on MSPI bus
+
+compatible: "jedec,mspi-nor"
+
+include: [mspi-device.yaml, "jedec,spi-nor-common.yaml"]
+
+properties:
+  reset-gpios:
+    type: phandle-array
+    description: |
+      RESET line. If specified, the flash chip will be reset at initialization.
+
+  t-reset-pulse:
+    type: int
+    description: |
+      Minimum duration, in nanoseconds, of an active pulse on the RESET line.
+
+  t-reset-recovery:
+    type: int
+    description: |
+      Minimum time, in nanoseconds, the flash chip needs to recover after reset.

From bb3a457e82b253726a48e1769325208ced6f71f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 17 Oct 2024 14:17:54 +0200
Subject: [PATCH 2190/2913] [nrf noup] drivers: pinctrl_nrf: Add support for
 EXMIF pins
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a follow-up to commit 45d827a51a708e54437f5681dc6c4fb77bfb4f52.

Although routing for those pins is configured via UICR, pinctrl still
needs to be involved so that it is possible to set desired drive mode
for them etc.
Add also the missing RWDS pin.

Upstream PR #: 85520
Applied as [nrf noup] due to a conflict in nrf-pinctrl.h

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/pinctrl/pinctrl_nrf.c                  | 18 ++++++++++++++++++
 .../zephyr/dt-bindings/pinctrl/nrf-pinctrl.h   |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 9cc18a2821c..ddd253eda51 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -383,6 +383,24 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_can) */
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
+		/* Pin routing is controlled by secure domain, via UICR */
+		case NRF_FUN_EXMIF_CK:
+		case NRF_FUN_EXMIF_DQ0:
+		case NRF_FUN_EXMIF_DQ1:
+		case NRF_FUN_EXMIF_DQ2:
+		case NRF_FUN_EXMIF_DQ3:
+		case NRF_FUN_EXMIF_DQ4:
+		case NRF_FUN_EXMIF_DQ5:
+		case NRF_FUN_EXMIF_DQ6:
+		case NRF_FUN_EXMIF_DQ7:
+		case NRF_FUN_EXMIF_CS0:
+		case NRF_FUN_EXMIF_CS1:
+		case NRF_FUN_EXMIF_RWDS:
+			dir = NRF_GPIO_PIN_DIR_INPUT;
+			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
+			break;
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) */
 #if defined(NRF_PSEL_TWIS)
 		case NRF_FUN_TWIS_SCL:
 			NRF_PSEL_TWIS(reg, SCL) = psel;
diff --git a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
index 51656a15074..7d75f0d7109 100644
--- a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
@@ -166,6 +166,8 @@
 #define NRF_FUN_TWIS_SCL 48U
 /** TWIS SDA */
 #define NRF_FUN_TWIS_SDA 49U
+/** EXMIF RWDS */
+#define NRF_FUN_EXMIF_RWDS 50U
 /** GRTC fast clock output */
 #define NRF_FUN_GRTC_CLKOUT_FAST 55U
 /** GRTC slow clock output */

From bd74349a2a0414d3b34a253ff5b5e1e2f5274bbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Tue, 3 Dec 2024 17:51:51 +0100
Subject: [PATCH 2191/2913] [nrf fromlist] boards: nrf54h20dk: Add XIP region
 definition to memory map
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Access to this region must be requested through UICR by a local
domain that want to use the Execute In Place (XIP) feature of
the EXMIF peripheral.

Upstream PR #: 85520

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit 71cc8b6287a55a06bd0a8e8a921172a5eef6861d)
---
 .../nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index 8392389c0ad..165fa12ba80 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -174,6 +174,15 @@
 			zephyr,memory-region = "DMA_RAM3x_RAD";
 			zephyr,memory-attr = <( DT_MEM_DMA )>;
 		};
+
+		xip_region: memory@60000000 {
+			compatible = "nordic,owned-memory";
+			reg = <0x60000000 0x20000000>;
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x60000000 0x20000000>;
+		};
 	};
 };
 

From 664042f82d42173a6f52e3d92c061fbd361ce7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Tue, 3 Dec 2024 18:02:10 +0100
Subject: [PATCH 2192/2913] [nrf fromlist] samples: code_relocation_nocopy: Add
 configuration for nRF54H20 DK
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add nRF54H20 DK specific entries to allow using the sample on this
board.

Upstream PR #: 85520

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit 9edbdaf1cc6b20e1a070b9ce20bde88a30f5c35c)
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.conf      |  1 +
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay   | 17 +++++++++++++++++
 .../code_relocation_nocopy/linker_arm_nocopy.ld |  7 +++++++
 3 files changed, 25 insertions(+)
 create mode 100644 samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..83035081389
--- /dev/null
+++ b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_FLASH=y
diff --git a/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..ab53f12725d
--- /dev/null
+++ b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,17 @@
+&cpuapp_ram0x_region {
+	nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWXS>;
+};
+
+&xip_region {
+	status = "okay";
+	nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RX>;
+};
+
+&mx25uw63 {
+	read-command = <0xEC13>;
+	command-length = "INSTR_2_BYTE";
+	address-length = "ADDR_4_BYTE";
+	rx-dummy = <20>;
+
+	xip-config = <1 0 0x20000000 0>;
+};
diff --git a/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld b/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
index a1467f8e264..0a11783cca2 100644
--- a/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
+++ b/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
@@ -47,6 +47,13 @@
 #define EXTFLASH_ADDR	DT_REG_ADDR(DT_INST(0, st_stm32_xspi_nor))
 #define EXTFLASH_SIZE	DT_REG_ADDR_BY_IDX(DT_INST(0, st_stm32_xspi_nor), 1)
 
+#elif defined(CONFIG_FLASH_MSPI_NOR) && defined(CONFIG_SOC_NRF54H20_CPUAPP)
+
+#define EXTFLASH_NODE	DT_INST(0, jedec_mspi_nor)
+#define EXTFLASH_ADDR	0x60000000
+#define EXTFLASH_SIZE	DT_PROP_OR(EXTFLASH_NODE, size_in_bytes, \
+				   DT_PROP(EXTFLASH_NODE, size) / 8)
+
 #else
 
 /*

From 13b4fd90a8240c8be46e11c1ca5fc9ec47ceeac5 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Tue, 10 Dec 2024 13:49:31 +0100
Subject: [PATCH 2193/2913] [nrf noup] cmake: use -DUSE_PARTITION_MANAGER=1 for
 lld linker script template

fixup! [nrf noup] tree-wide: support NCS Partition Manager (PM) definitions

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 7d364d07a827f7a7a8b829cfa9c5a628f5485473)
---
 cmake/linker/lld/target.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmake/linker/lld/target.cmake b/cmake/linker/lld/target.cmake
index b6b96525e70..bdea4f1ec92 100644
--- a/cmake/linker/lld/target.cmake
+++ b/cmake/linker/lld/target.cmake
@@ -52,6 +52,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
     -imacros ${AUTOCONF_H}
     ${current_includes}
     ${template_script_defines}
+    -DUSE_PARTITION_MANAGER=$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>
     -E ${LINKER_SCRIPT}
     -P # Prevent generation of debug `#line' directives.
     -o ${linker_script_gen}

From 3b45cae0e824a17d9886ad0221a3c0c58417108f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 17 Oct 2024 17:43:48 +0200
Subject: [PATCH 2194/2913] [nrf fromlist] dts: nordic: Change compatible
 property for EXMIF node
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a follow-up to commit cdf45cb234077522b5cef2da084869af43d42dc1.

Adjust the DTS node for the nRF EXMIF peripheral so that it is possible
to handle the peripheral with the generic MSPI driver for DW SSI based
controllers and use all its data lines in communication.
Also adjust the related board files accordingly.

Upstream PR #: 85520

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../nrf54h20dk_nrf54h20-pinctrl.dtsi          | 27 ++++++++++++++++++-
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts | 19 ++++++++++---
 .../nrf9280pdk_nrf9280-pinctrl.dtsi           | 27 ++++++++++++++++++-
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts  | 19 ++++++++++---
 .../{spi => mspi}/nordic,nrf-exmif.yaml       |  6 +----
 dts/common/nordic/nrf54h20.dtsi               |  5 ++--
 dts/common/nordic/nrf9280.dtsi                |  5 ++--
 7 files changed, 87 insertions(+), 21 deletions(-)
 rename dts/bindings/{spi => mspi}/nordic,nrf-exmif.yaml (70%)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
index 9b574a18ec5..f62df87dfe2 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
@@ -73,12 +73,37 @@
 	/omit-if-no-ref/ exmif_default: exmif_default {
 		group1 {
 			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
 				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
 			nordic,drive-mode = <NRF_DRIVE_H0H1>;
 		};
 	};
 
+	/omit-if-no-ref/ exmif_sleep: exmif_sleep {
+		group1 {
+			low-power-enable;
+			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
+				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
+		};
+	};
+
 	/omit-if-no-ref/ can120_default: can120_default {
 		group1 {
 			psels = <NRF_PSEL(CAN_RX, 9, 4)>,
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 05d62c1057f..06e642948f3 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -262,15 +262,15 @@ ipc0: &cpuapp_cpurad_ipc {
 };
 
 &exmif {
-	cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&exmif_default>;
-	pinctrl-names = "default";
+	pinctrl-1 = <&exmif_sleep>;
+	pinctrl-names = "default", "sleep";
 	status = "okay";
+
 	mx25uw63: mx25uw6345g@0 {
-		compatible = "jedec,spi-nor";
+		compatible = "jedec,mspi-nor";
 		status = "disabled";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(48)>;
 		jedec-id = [c2 84 37];
 		sfdp-bfp = [
 			e5 20 8a ff  ff ff ff 03  00 ff 00 ff  00 ff 00 ff
@@ -283,6 +283,17 @@ ipc0: &cpuapp_cpurad_ipc {
 		has-dpd;
 		t-enter-dpd = <10000>;
 		t-exit-dpd = <30000>;
+		reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;
+		t-reset-pulse = <10000>;
+		t-reset-recovery = <35000>;
+
+		mspi-max-frequency = <DT_FREQ_M(50)>;
+		mspi-io-mode = "MSPI_IO_MODE_OCTAL";
+		mspi-data-rate = "MSPI_DATA_RATE_SINGLE";
+		mspi-hardware-ce-num = <1>;
+		mspi-cpp-mode = "MSPI_CPP_MODE_0";
+		mspi-endian = "MSPI_BIG_ENDIAN";
+		mspi-ce-polarity = "MSPI_CE_ACTIVE_LOW";
 	};
 };
 
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
index 48067a7052c..143fd45f33e 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
@@ -54,12 +54,37 @@
 	/omit-if-no-ref/ exmif_default: exmif_default {
 		group1 {
 			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
 				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
 			nordic,drive-mode = <NRF_DRIVE_H0H1>;
 		};
 	};
 
+	/omit-if-no-ref/ exmif_sleep: exmif_sleep {
+		group1 {
+			low-power-enable;
+			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
+				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
+		};
+	};
+
 	/omit-if-no-ref/ can120_default: can120_default {
 		group1 {
 			psels = <NRF_PSEL(CAN_RX, 9, 4)>,
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index 3e16e45803f..09bc9c554cc 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -249,15 +249,15 @@ ipc0: &cpuapp_cpurad_ipc {
 };
 
 &exmif {
-	cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&exmif_default>;
-	pinctrl-names = "default";
+	pinctrl-1 = <&exmif_sleep>;
+	pinctrl-names = "default", "sleep";
 	status = "okay";
+
 	mx25uw63: mx25uw6345g@0 {
-		compatible = "jedec,spi-nor";
+		compatible = "jedec,mspi-nor";
 		status = "disabled";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(48)>;
 		jedec-id = [c2 84 37];
 		sfdp-bfp = [
 			e5 20 8a ff  ff ff ff 03  00 ff 00 ff  00 ff 00 ff
@@ -270,6 +270,17 @@ ipc0: &cpuapp_cpurad_ipc {
 		has-dpd;
 		t-enter-dpd = <10000>;
 		t-exit-dpd = <30000>;
+		reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;
+		t-reset-pulse = <10000>;
+		t-reset-recovery = <35000>;
+
+		mspi-max-frequency = <DT_FREQ_M(50)>;
+		mspi-io-mode = "MSPI_IO_MODE_OCTAL";
+		mspi-data-rate = "MSPI_DATA_RATE_SINGLE";
+		mspi-hardware-ce-num = <1>;
+		mspi-cpp-mode = "MSPI_CPP_MODE_0";
+		mspi-endian = "MSPI_BIG_ENDIAN";
+		mspi-ce-polarity = "MSPI_CE_ACTIVE_LOW";
 	};
 };
 
diff --git a/dts/bindings/spi/nordic,nrf-exmif.yaml b/dts/bindings/mspi/nordic,nrf-exmif.yaml
similarity index 70%
rename from dts/bindings/spi/nordic,nrf-exmif.yaml
rename to dts/bindings/mspi/nordic,nrf-exmif.yaml
index d2b8815046b..294254aa60e 100644
--- a/dts/bindings/spi/nordic,nrf-exmif.yaml
+++ b/dts/bindings/mspi/nordic,nrf-exmif.yaml
@@ -5,8 +5,4 @@ description: Nordic External Memory Interface (EXMIF)
 
 compatible: "nordic,nrf-exmif"
 
-include: snps,designware-spi.yaml
-
-properties:
-  reg:
-    required: true
+include: snps,designware-ssi.yaml
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index e67251b17a2..e141ac10a5e 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -522,8 +522,8 @@
 				status = "disabled";
 			};
 
-			exmif: spi@95000 {
-				compatible = "nordic,nrf-exmif";
+			exmif: exmif@95000 {
+				compatible = "nordic,nrf-exmif", "snps,designware-ssi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x95000 0x500 0x95500 0xb00>;
@@ -532,7 +532,6 @@
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 				clock-frequency = <DT_FREQ_M(400)>;
 				fifo-depth = <32>;
-				max-xfer-size = <16>;
 				status = "disabled";
 			};
 
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index f95fb6cd8ab..fe0bcaeaed1 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -364,8 +364,8 @@
 				status = "disabled";
 			};
 
-			exmif: spi@95000 {
-				compatible = "nordic,nrf-exmif";
+			exmif: exmif@95000 {
+				compatible = "nordic,nrf-exmif", "snps,designware-ssi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x95000 0x500 0x95500 0xb00>;
@@ -373,7 +373,6 @@
 				interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>;
 				clock-frequency = <DT_FREQ_M(400)>;
 				fifo-depth = <32>;
-				max-xfer-size = <16>;
 				status = "disabled";
 			};
 

From 87a4e340b0426eaea9717b73bfbfaea001047034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Fri, 18 Oct 2024 10:16:08 +0200
Subject: [PATCH 2195/2913] [nrf fromlist] samples|tests: drivers: flash: Add
 support for "jedec,mspi-nor" devices
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extend several flash samples and tests so that they can also be used
with "jedec,mspi-nor" devices.
Add configurations needed for the nrf54h20dk/nrf54h20/cpuapp target.

Upstream PR #: 85520

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay    | 9 +++++++++
 samples/drivers/jesd216/sample.yaml                      | 2 +-
 samples/drivers/jesd216/src/main.c                       | 4 +++-
 .../spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay  | 9 +++++++++
 samples/drivers/spi_flash/sample.yaml                    | 2 +-
 samples/drivers/spi_flash/src/main.c                     | 2 ++
 .../common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay     | 9 +++++++++
 tests/drivers/flash/common/src/main.c                    | 2 ++
 8 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..b8f138ad2b2
--- /dev/null
+++ b/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&mx25uw63 {
+	status = "okay";
+};
diff --git a/samples/drivers/jesd216/sample.yaml b/samples/drivers/jesd216/sample.yaml
index 0ea0dae331a..4be5e5defbb 100644
--- a/samples/drivers/jesd216/sample.yaml
+++ b/samples/drivers/jesd216/sample.yaml
@@ -21,7 +21,7 @@ tests:
       - hifive_unmatched/fu740/u74
       - mimxrt1170_evk/mimxrt1176/cm7
       - mimxrt1170_evk/mimxrt1176/cm4
-    filter: dt_compat_enabled("jedec,spi-nor")
+    filter: dt_compat_enabled("jedec,spi-nor") or dt_compat_enabled("jedec,mspi-nor")
     depends_on: spi
   sample.drivers.jesd216.nrf52840dk_spi:
     extra_args:
diff --git a/samples/drivers/jesd216/src/main.c b/samples/drivers/jesd216/src/main.c
index 480649397b6..b8dad485997 100644
--- a/samples/drivers/jesd216/src/main.c
+++ b/samples/drivers/jesd216/src/main.c
@@ -14,6 +14,8 @@
 
 #if DT_HAS_COMPAT_STATUS_OKAY(jedec_spi_nor)
 #define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_spi_nor)
+#elif DT_HAS_COMPAT_STATUS_OKAY(jedec_mspi_nor)
+#define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_mspi_nor)
 #elif DT_HAS_COMPAT_STATUS_OKAY(nordic_qspi_nor)
 #define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(nordic_qspi_nor)
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_qspi_nor)
@@ -201,7 +203,7 @@ static void summarize_dw15(const struct jesd216_param_header *php,
 		printf("0-4-4 Mode methods: entry 0x%01x ; exit 0x%02x\n",
 		       dw15.entry_044, dw15.exit_044);
 	} else {
-		printf("0-4-4 Mode: not supported");
+		printf("0-4-4 Mode: not supported\n");
 	}
 	printf("4-4-4 Mode sequences: enable 0x%02x ; disable 0x%01x\n",
 	       dw15.enable_444, dw15.disable_444);
diff --git a/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..b8f138ad2b2
--- /dev/null
+++ b/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&mx25uw63 {
+	status = "okay";
+};
diff --git a/samples/drivers/spi_flash/sample.yaml b/samples/drivers/spi_flash/sample.yaml
index a3b8cfed380..351e33997a0 100644
--- a/samples/drivers/spi_flash/sample.yaml
+++ b/samples/drivers/spi_flash/sample.yaml
@@ -7,7 +7,7 @@ tests:
       - flash
     filter: dt_compat_enabled("jedec,spi-nor") or dt_compat_enabled("st,stm32-qspi-nor")
       or dt_compat_enabled("st,stm32-ospi-nor") or dt_compat_enabled("st,stm32-xspi-nor")
-      or (dt_compat_enabled("nordic,qspi-nor") and CONFIG_NORDIC_QSPI_NOR)
+      or dt_compat_enabled("nordic,qspi-nor") or dt_compat_enabled("jedec,mspi-nor")
     platform_exclude:
       - hifive_unmatched/fu740/s7
       - hifive_unmatched/fu740/u74
diff --git a/samples/drivers/spi_flash/src/main.c b/samples/drivers/spi_flash/src/main.c
index b84359ae05b..52e8b6062b5 100644
--- a/samples/drivers/spi_flash/src/main.c
+++ b/samples/drivers/spi_flash/src/main.c
@@ -34,6 +34,8 @@
 
 #if DT_HAS_COMPAT_STATUS_OKAY(jedec_spi_nor)
 #define SPI_FLASH_COMPAT jedec_spi_nor
+#elif DT_HAS_COMPAT_STATUS_OKAY(jedec_mspi_nor)
+#define SPI_FLASH_COMPAT jedec_mspi_nor
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_qspi_nor)
 #define SPI_FLASH_COMPAT st_stm32_qspi_nor
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_ospi_nor)
diff --git a/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..b8f138ad2b2
--- /dev/null
+++ b/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&mx25uw63 {
+	status = "okay";
+};
diff --git a/tests/drivers/flash/common/src/main.c b/tests/drivers/flash/common/src/main.c
index e7552aaf177..54b868a9234 100644
--- a/tests/drivers/flash/common/src/main.c
+++ b/tests/drivers/flash/common/src/main.c
@@ -14,6 +14,8 @@
 #define TEST_AREA_DEV_NODE	DT_INST(0, nordic_qspi_nor)
 #elif defined(CONFIG_SPI_NOR)
 #define TEST_AREA_DEV_NODE	DT_INST(0, jedec_spi_nor)
+#elif defined(CONFIG_FLASH_MSPI_NOR)
+#define TEST_AREA_DEV_NODE	DT_INST(0, jedec_mspi_nor)
 #else
 #define TEST_AREA	storage_partition
 #endif

From 48b0ca5a97c2e19b1a786eed534d9be0b04548dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Tue, 17 Dec 2024 21:45:47 +0100
Subject: [PATCH 2196/2913] [nrf noup] drivers: spi_dw: Bring back custom EXMIF
 peripheral handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit brings back modifications from these reverted commits:
- f68b2edaa2233cde29d955bc3d3b3dd75ff50334
- e606246f0fc3e9299cb5bdd3c1e34a091e5d85a1
slightly adjusted so that the EXMIF peripheral is still by default
handled by the mspi_dw driver, and in cases where this driver cannot
be used because something still does not work correctly, one can
switch to the old solution based on the tweaked spi_dw driver.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit 352fb6b750c90973396bd706fd1433801ee35317)
---
 drivers/pinctrl/pinctrl_nrf.c              |  3 +-
 drivers/spi/spi_dw.c                       | 32 +++++++++++++++++++++-
 dts/bindings/spi/nordic,nrf-exmif-spi.yaml |  8 ++++++
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 dts/bindings/spi/nordic,nrf-exmif-spi.yaml

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index ddd253eda51..7b4f31421ce 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -383,7 +383,8 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_can) */
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) || \
+	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif_spi)
 		/* Pin routing is controlled by secure domain, via UICR */
 		case NRF_FUN_EXMIF_CK:
 		case NRF_FUN_EXMIF_DQ0:
diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
index bb40deb1c85..e320aa39547 100644
--- a/drivers/spi/spi_dw.c
+++ b/drivers/spi/spi_dw.c
@@ -41,6 +41,14 @@ LOG_MODULE_REGISTER(spi_dw);
 #include <zephyr/drivers/pinctrl.h>
 #endif
 
+#ifdef CONFIG_HAS_NRFX
+#include <nrfx.h>
+#endif
+
+#ifdef CONFIG_SOC_NRF54H20_GPD
+#include <nrf/gpd.h>
+#endif
+
 static inline bool spi_dw_is_slave(struct spi_dw_data *spi)
 {
 	return (IS_ENABLED(CONFIG_SPI_SLAVE) &&
@@ -258,6 +266,7 @@ static int spi_dw_configure(const struct device *dev,
 		/* Baud rate and Slave select, for master only */
 		write_baudr(dev, SPI_DW_CLK_DIVIDER(info->clock_frequency,
 						    config->frequency));
+		write_ser(dev, BIT(config->slave));
 	}
 
 	if (spi_dw_is_slave(spi)) {
@@ -500,6 +509,10 @@ void spi_dw_isr(const struct device *dev)
 	uint32_t int_status;
 	int error;
 
+#ifdef CONFIG_HAS_NRFX
+	NRF_EXMIF->EVENTS_CORE = 0;
+#endif
+
 	int_status = read_isr(dev);
 
 	LOG_DBG("SPI %p int_status 0x%x - (tx: %d, rx: %d)", dev, int_status,
@@ -548,6 +561,18 @@ int spi_dw_init(const struct device *dev)
 
 	DEVICE_MMIO_MAP(dev, K_MEM_CACHE_NONE);
 
+#ifdef CONFIG_HAS_NRFX
+	NRF_EXMIF->INTENSET = BIT(0);
+	NRF_EXMIF->TASKS_START = 1;
+
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	err = nrf_gpd_request(NRF_GPD_FAST_ACTIVE1);
+	if (err < 0) {
+		return err;
+	}
+#endif
+#endif
+
 	info->config_func();
 
 	/* Masking interrupt and making sure controller is disabled */
@@ -566,6 +591,11 @@ int spi_dw_init(const struct device *dev)
 	return 0;
 }
 
+#define REG_ADDR(inst) \
+	COND_CODE_1(DT_NODE_HAS_COMPAT(DT_DRV_INST(inst), nordic_nrf_exmif_spi), \
+		    (Z_DEVICE_MMIO_NAMED_ROM_INITIALIZER(core, DT_DRV_INST(inst))), \
+		    (DEVICE_MMIO_ROM_INIT(DT_DRV_INST(inst))))
+
 #define SPI_CFG_IRQS_SINGLE_ERR_LINE(inst)					\
 		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(inst, rx_avail, irq),		\
 			    DT_INST_IRQ_BY_NAME(inst, rx_avail, priority),	\
@@ -638,7 +668,7 @@ COND_CODE_1(IS_EQ(DT_NUM_IRQS(DT_DRV_INST(inst)), 1),              \
 		SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(inst), ctx)                     \
 	};                                                                                  \
 	static const struct spi_dw_config spi_dw_config_##inst = {                          \
-		DEVICE_MMIO_ROM_INIT(DT_DRV_INST(inst)),                                    \
+		REG_ADDR(inst),                                                             \
 		.clock_frequency = COND_CODE_1(                                             \
 			DT_NODE_HAS_PROP(DT_INST_PHANDLE(inst, clocks), clock_frequency),   \
 			(DT_INST_PROP_BY_PHANDLE(inst, clocks, clock_frequency)),           \
diff --git a/dts/bindings/spi/nordic,nrf-exmif-spi.yaml b/dts/bindings/spi/nordic,nrf-exmif-spi.yaml
new file mode 100644
index 00000000000..d988b414687
--- /dev/null
+++ b/dts/bindings/spi/nordic,nrf-exmif-spi.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Nordic External Memory Interface (EXMIF) used in SPI mode only
+
+compatible: "nordic,nrf-exmif-spi"
+
+include: snps,designware-spi.yaml

From c5e2400f4fd5464510d684b6ce4da415939f8bf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 12 Dec 2024 15:39:27 +0100
Subject: [PATCH 2197/2913] [nrf fromtree] boards: native: nrf_bsim: nrf54l15:
 Bring back clocks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Do not delete clocks for the bsim target. Clocks are referenced
by peripherals and it can be used to get frequency that clocks
the peripheral.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 32898cf38f060e5f9e0487c9208f1181eea6368b)
---
 boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
index 7d0a2f96aa5..13bf2e338f8 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -22,7 +22,6 @@
 	};
 
 	/delete-node/ cpus;
-	/delete-node/ clocks;
 	/delete-node/ sw-pwm;
 
 	soc {

From 02bf655fed56abdf41b293f03f3b5fd5e44c4151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Mon, 30 Dec 2024 11:24:19 +0100
Subject: [PATCH 2198/2913] [nrf fromtree] Revert "dts: common: nordic:
 nrf54l20: set timer frequency to 64MHz"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 413ca65d65f9b4aceb13b4609d0141d9ee60e2f2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit 3168b608cc1b0d68232720bfac579d6f245a2a56)
---
 dts/common/nordic/nrf54l20.dtsi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 74230163123..7487915cdfd 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -152,8 +152,7 @@
 				cc-num = <6>;
 				max-bit-width = <32>;
 				interrupts = <85 NRF_DEFAULT_IRQ_PRIORITY>;
-				/* NRFX-6881: Temporary workaround for timer00 */
-				max-frequency = <DT_FREQ_M(64)>;
+				max-frequency = <DT_FREQ_M(128)>;
 				prescaler = <0>;
 			};
 

From a8ec7ba4c9d96c245a584f3ea6c4759e08ce993e Mon Sep 17 00:00:00 2001
From: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
Date: Wed, 27 Nov 2024 11:19:43 +0100
Subject: [PATCH 2199/2913] [nrf fromtree] tests: drivers: mspi: make MSPI API
 test more generic

Add ifdefs to make MSPI API test more generic.

Signed-off-by: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
(cherry picked from commit fc59ce3970f17d33da8e87c112c05ad23a64a462)
---
 tests/drivers/mspi/api/src/main.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/drivers/mspi/api/src/main.c b/tests/drivers/mspi/api/src/main.c
index 0e7743249c0..16d5a2e3124 100644
--- a/tests/drivers/mspi/api/src/main.c
+++ b/tests/drivers/mspi/api/src/main.c
@@ -52,13 +52,17 @@ static struct mspi_dev_cfg device_cfg[] = {
 	DT_FOREACH_CHILD_STATUS_OKAY_SEP(MSPI_BUS_NODE, MSPI_DEVICE_CONFIG_DT, (,))
 };
 
+#if CONFIG_MSPI_XIP
 static struct mspi_xip_cfg xip_cfg[] = {
 	DT_FOREACH_CHILD_STATUS_OKAY_SEP(MSPI_BUS_NODE, MSPI_XIP_CONFIG_DT, (,))
 };
+#endif
 
+#if CONFIG_MSPI_SCRAMBLE
 static struct mspi_scramble_cfg scramble_cfg[] = {
 	DT_FOREACH_CHILD_STATUS_OKAY_SEP(MSPI_BUS_NODE, MSPI_SCRAMBLE_CONFIG_DT, (,))
 };
+#endif
 
 ZTEST(mspi_api, test_mspi_api)
 {
@@ -105,7 +109,11 @@ ZTEST(mspi_api, test_mspi_api)
 
 		ret = mspi_register_callback(mspi_bus, &dev_id[dev_idx],
 					     MSPI_BUS_XFER_COMPLETE, NULL, NULL);
-		zassert_equal(ret, 0, "mspi_register_callback failed.");
+		if (ret == -ENOTSUP) {
+			printf("mspi_register_callback not supported.\n");
+		} else {
+			zassert_equal(ret, 0, "mspi_register_callback failed.");
+		}
 
 		ret = mspi_get_channel_status(mspi_bus, 0);
 		zassert_equal(ret, 0, "mspi_get_channel_status failed.");

From 169707448c7ca8c806025c65dcbe7836f059e2a5 Mon Sep 17 00:00:00 2001
From: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
Date: Mon, 25 Nov 2024 14:14:40 +0100
Subject: [PATCH 2200/2913] [nrf noup] drivers: pinctrl: Add SDP MSPI pin
 configuration

Configure SDP MSPI pins to switch their control to VPR core

Signed-off-by: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
(cherry picked from commit 2540f7b5b204c54738e32f694bbddf43b35aae28)
---
 drivers/pinctrl/pinctrl_nrf.c                 | 29 +++++++++++++++++++
 .../zephyr/dt-bindings/pinctrl/nrf-pinctrl.h  | 28 ++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 7b4f31421ce..2d4e580a14b 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -108,6 +108,13 @@ static const nrf_gpio_pin_drive_t drive_modes[NRF_DRIVE_COUNT] = {
 #endif
 #endif
 
+#if defined(CONFIG_SOC_NRF54L15_CPUAPP)
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller) || defined(CONFIG_MSPI_NRFE)
+#define NRF_PSEL_SDP_MSPI(psel)                                                                    \
+	nrf_gpio_pin_control_select(psel, NRF_GPIO_PIN_SEL_VPR);
+#endif
+#endif
+
 int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			   uintptr_t reg)
 {
@@ -420,6 +427,28 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
 #endif /* defined(NRF_PSEL_TWIS) */
+#if defined(CONFIG_SOC_NRF54L15_CPUAPP)
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller)
+		case NRF_FUN_SDP_MSPI_CS0:
+		case NRF_FUN_SDP_MSPI_CS1:
+		case NRF_FUN_SDP_MSPI_CS2:
+		case NRF_FUN_SDP_MSPI_CS3:
+		case NRF_FUN_SDP_MSPI_CS4:
+		case NRF_FUN_SDP_MSPI_SCK:
+		case NRF_FUN_SDP_MSPI_DQ0:
+		case NRF_FUN_SDP_MSPI_DQ1:
+		case NRF_FUN_SDP_MSPI_DQ2:
+		case NRF_FUN_SDP_MSPI_DQ3:
+		case NRF_FUN_SDP_MSPI_DQ4:
+		case NRF_FUN_SDP_MSPI_DQ5:
+		case NRF_FUN_SDP_MSPI_DQ6:
+		case NRF_FUN_SDP_MSPI_DQ7:
+			NRF_PSEL_SDP_MSPI(psel);
+			dir = NRF_GPIO_PIN_DIR_OUTPUT;
+			input = NRF_GPIO_PIN_INPUT_CONNECT;
+			break;
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller) */
+#endif /* CONFIG_SOC_NRF54L15_CPUAPP */
 		default:
 			return -ENOTSUP;
 		}
diff --git a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
index 7d75f0d7109..81a7a8bc77d 100644
--- a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
@@ -172,6 +172,34 @@
 #define NRF_FUN_GRTC_CLKOUT_FAST 55U
 /** GRTC slow clock output */
 #define NRF_FUN_GRTC_CLKOUT_32K  56U
+/** SDP_MSPI CK */
+#define NRF_FUN_SDP_MSPI_SCK 57U
+/** SDP_MSPI DQ0 */
+#define NRF_FUN_SDP_MSPI_DQ0 58U
+/** SDP_MSPI DQ1 */
+#define NRF_FUN_SDP_MSPI_DQ1 59U
+/** SDP_MSPI DQ2 */
+#define NRF_FUN_SDP_MSPI_DQ2 60U
+/** SDP_MSPI DQ3 */
+#define NRF_FUN_SDP_MSPI_DQ3 61U
+/** SDP_MSPI DQ4 */
+#define NRF_FUN_SDP_MSPI_DQ4 62U
+/** SDP_MSPI DQ5 */
+#define NRF_FUN_SDP_MSPI_DQ5 63U
+/** SDP_MSPI DQ6 */
+#define NRF_FUN_SDP_MSPI_DQ6 64U
+/** SDP_MSPI DQ7 */
+#define NRF_FUN_SDP_MSPI_DQ7 65U
+/** SDP_MSPI CS0 */
+#define NRF_FUN_SDP_MSPI_CS0 66U
+/** SDP_MSPI CS1 */
+#define NRF_FUN_SDP_MSPI_CS1 67U
+/** SDP_MSPI CS2 */
+#define NRF_FUN_SDP_MSPI_CS2 68U
+/** SDP_MSPI CS3 */
+#define NRF_FUN_SDP_MSPI_CS3 69U
+/** SDP_MSPI CS4 */
+#define NRF_FUN_SDP_MSPI_CS4 70U
 
 /** @} */
 

From 9735cb5536118574c7c09e03eaa45276b7990a01 Mon Sep 17 00:00:00 2001
From: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
Date: Mon, 25 Nov 2024 14:18:50 +0100
Subject: [PATCH 2201/2913] [nrf noup] tests: drivers: mspi: api: Add nRF54L15
 overlay file

Add nRF54l15 overlay file to be able to run SDP MSPI API test.

Signed-off-by: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
(cherry picked from commit abc79660847ec81cb4a0f004221508e78b70cf06)
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..3d5db366dc5
--- /dev/null
+++ b/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		mspi0 = &sdp_mspi;
+	};
+};
+
+&cpuflpr_vpr {
+	status = "okay";
+
+	sdp_mspi: sdp_mspi {
+		mspi_device: mspi_device@0 {
+			status = "okay";
+			compatible = "zephyr,mspi-emul-device";
+			reg = <0x0>;
+			mspi-max-frequency = <48000000>;
+		};
+	};
+};

From dd94be7b041a201f4c8f2ff39bfe12241cb741dc Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Tue, 17 Dec 2024 14:49:35 +0100
Subject: [PATCH 2202/2913] [nrf fromtree] include: drivers: nrf_clock_control:
 make nrf_clock inclusion stricter

Some devices do not support nrf_clock HAL.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit ee0508793569ae8b598c28bd8f118bd591f4bc2b)
---
 include/zephyr/drivers/clock_control/nrf_clock_control.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/zephyr/drivers/clock_control/nrf_clock_control.h b/include/zephyr/drivers/clock_control/nrf_clock_control.h
index 6ab86fb0b7e..866b4fe2ee1 100644
--- a/include/zephyr/drivers/clock_control/nrf_clock_control.h
+++ b/include/zephyr/drivers/clock_control/nrf_clock_control.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_NRF_CLOCK_CONTROL_H_
 
 #include <zephyr/device.h>
-#ifdef NRF_CLOCK
+#if defined(NRF_CLOCK) && !defined(NRF_LFRC)
 #include <hal/nrf_clock.h>
 #endif
 #include <zephyr/sys/onoff.h>

From 4b4252219b19e9fc8fb6f98995f93689545477cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Thu, 12 Dec 2024 12:04:44 +0100
Subject: [PATCH 2203/2913] [nrf fromtree] drivers: pwm: nrfx: add global hsfll
 request for fast PWM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added clock control api for global hsfll used in fast PWM120 driver.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit 2c89ed5441814d8275221304a66c4e0354364728)
---
 drivers/pwm/pwm_nrfx.c | 123 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 110 insertions(+), 13 deletions(-)

diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index 41b43cda339..410aa5c9348 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -13,6 +13,7 @@
 #include <zephyr/linker/devicetree_regions.h>
 #include <zephyr/cache.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #ifdef CONFIG_SOC_NRF54H20_GPD
 #include <nrf/gpd.h>
 #endif
@@ -35,6 +36,21 @@ LOG_MODULE_REGISTER(pwm_nrfx, CONFIG_PWM_LOG_LEVEL);
 #define ANOMALY_109_EGU_IRQ_CONNECT(idx)
 #endif
 
+#define PWM(dev_idx) DT_NODELABEL(pwm##dev_idx)
+#define PWM_PROP(dev_idx, prop) DT_PROP(PWM(dev_idx), prop)
+#define PWM_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(PWM(idx), prop)
+
+#define PWM_NRFX_IS_FAST(unused, prefix, idx, _)					\
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(PWM(idx)),					\
+		(COND_CODE_1(PWM_HAS_PROP(idx, power_domains),				\
+		    (IS_EQ(DT_PHA(PWM(idx), power_domains, id), NRF_GPD_FAST_ACTIVE1)),	\
+		    (0))), (0))
+
+#if (NRFX_FOREACH_PRESENT(PWM, PWM_NRFX_IS_FAST, (||), (0))) && \
+	CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
+#define PWM_NRFX_USE_CLOCK_CONTROL 1
+#endif
+
 #define PWM_NRFX_CH_POLARITY_MASK BIT(15)
 #define PWM_NRFX_CH_COMPARE_MASK  BIT_MASK(15)
 #define PWM_NRFX_CH_VALUE(compare_value, inverted) \
@@ -49,6 +65,10 @@ struct pwm_nrfx_config {
 #ifdef CONFIG_DCACHE
 	uint32_t mem_attr;
 #endif
+#ifdef PWM_NRFX_USE_CLOCK_CONTROL
+	const struct device *clk_dev;
+	struct nrf_clock_spec clk_spec;
+#endif
 };
 
 struct pwm_nrfx_data {
@@ -57,6 +77,9 @@ struct pwm_nrfx_data {
 	uint8_t  pwm_needed;
 	uint8_t  prescaler;
 	bool     stop_requested;
+#ifdef PWM_NRFX_USE_CLOCK_CONTROL
+	bool     clock_requested;
+#endif
 };
 /* Ensure the pwm_needed bit mask can accommodate all available channels. */
 #if (NRF_PWM_CHANNEL_COUNT > 8)
@@ -134,6 +157,33 @@ static bool channel_psel_get(uint32_t channel, uint32_t *psel,
 		== PWM_PSEL_OUT_CONNECT_Connected);
 }
 
+static int stop_pwm(const struct device *dev)
+{
+	const struct pwm_nrfx_config *config = dev->config;
+
+	/* Don't wait here for the peripheral to actually stop. Instead,
+	 * ensure it is stopped before starting the next playback.
+	 */
+	nrfx_pwm_stop(&config->pwm, false);
+
+#if PWM_NRFX_USE_CLOCK_CONTROL
+	struct pwm_nrfx_data *data = dev->data;
+
+	if (data->clock_requested) {
+		int ret = nrf_clock_control_release(config->clk_dev, &config->clk_spec);
+
+		if (ret < 0) {
+			LOG_ERR("Global HSFLL release failed: %d", ret);
+			return ret;
+		}
+
+		data->clock_requested = false;
+	}
+#endif
+
+	return 0;
+}
+
 static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 			       uint32_t period_cycles, uint32_t pulse_cycles,
 			       pwm_flags_t flags)
@@ -225,10 +275,13 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 	 * registers and drives its outputs accordingly.
 	 */
 	if (data->pwm_needed == 0) {
-		/* Don't wait here for the peripheral to actually stop. Instead,
-		 * ensure it is stopped before starting the next playback.
-		 */
-		nrfx_pwm_stop(&config->pwm, false);
+		int ret = stop_pwm(dev);
+
+		if (ret < 0) {
+			LOG_ERR("PWM stop failed: %d", ret);
+			return ret;
+		}
+
 		data->stop_requested = true;
 	} else {
 		if (data->stop_requested) {
@@ -248,6 +301,20 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 		 * until another playback is requested (new values will be
 		 * loaded then) or the PWM peripheral is stopped.
 		 */
+#if PWM_NRFX_USE_CLOCK_CONTROL
+		if (config->clk_dev && !data->clock_requested) {
+			int ret = nrf_clock_control_request_sync(config->clk_dev,
+								 &config->clk_spec,
+								 K_FOREVER);
+
+			if (ret < 0) {
+				LOG_ERR("Global HSFLL request failed: %d", ret);
+				return ret;
+			}
+
+			data->clock_requested = true;
+		}
+#endif
 		nrfx_pwm_simple_playback(&config->pwm, &config->seq, 1,
 					 NRFX_PWM_FLAG_NO_EVT_FINISHED);
 	}
@@ -270,7 +337,7 @@ static DEVICE_API(pwm, pwm_nrfx_drv_api_funcs) = {
 	.get_cycles_per_sec = pwm_nrfx_get_cycles_per_sec,
 };
 
-static void pwm_resume(const struct device *dev)
+static int pwm_resume(const struct device *dev)
 {
 	const struct pwm_nrfx_config *config = dev->config;
 	uint8_t initially_inverted = 0;
@@ -299,13 +366,21 @@ static void pwm_resume(const struct device *dev)
 
 		seq_values_ptr_get(dev)[i] = PWM_NRFX_CH_VALUE(0, inverted);
 	}
+
+	return 0;
 }
 
-static void pwm_suspend(const struct device *dev)
+static int pwm_suspend(const struct device *dev)
 {
 	const struct pwm_nrfx_config *config = dev->config;
 
-	nrfx_pwm_stop(&config->pwm, false);
+	int ret = stop_pwm(dev);
+
+	if (ret < 0) {
+		LOG_ERR("PWM stop failed: %d", ret);
+		return ret;
+	}
+
 	while (!nrfx_pwm_stopped_check(&config->pwm)) {
 	}
 
@@ -315,15 +390,17 @@ static void pwm_suspend(const struct device *dev)
 
 	memset(dev->data, 0, sizeof(struct pwm_nrfx_data));
 	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
+
+	return 0;
 }
 
 static int pwm_nrfx_pm_action(const struct device *dev,
 			      enum pm_device_action action)
 {
 	if (action == PM_DEVICE_ACTION_RESUME) {
-		pwm_resume(dev);
+		return pwm_resume(dev);
 	} else if (IS_ENABLED(CONFIG_PM_DEVICE) && (action == PM_DEVICE_ACTION_SUSPEND)) {
-		pwm_suspend(dev);
+		return pwm_suspend(dev);
 	} else {
 		return -ENOTSUP;
 	}
@@ -351,9 +428,6 @@ static int pwm_nrfx_init(const struct device *dev)
 	return pm_device_driver_init(dev, pwm_nrfx_pm_action);
 }
 
-#define PWM(dev_idx) DT_NODELABEL(pwm##dev_idx)
-#define PWM_PROP(dev_idx, prop) DT_PROP(PWM(dev_idx), prop)
-#define PWM_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(PWM(idx), prop)
 #define PWM_MEM_REGION(idx)     DT_PHANDLE(PWM(idx), memory_regions)
 
 #define PWM_MEMORY_SECTION(idx)						      \
@@ -366,6 +440,21 @@ static int pwm_nrfx_init(const struct device *dev)
 	COND_CODE_1(PWM_HAS_PROP(idx, memory_regions),			      \
 		(DT_PROP_OR(PWM_MEM_REGION(idx), zephyr_memory_attr, 0)), (0))
 
+/* Fast instances depend on the global HSFLL clock controller (as they need
+ * to request the highest frequency from it to operate correctly), so they
+ * must be initialized after that controller driver, hence the default PWM
+ * initialization priority may be too early for them.
+ */
+#if defined(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_INIT_PRIORITY) && \
+	CONFIG_PWM_INIT_PRIORITY < CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_INIT_PRIORITY
+#define PWM_INIT_PRIORITY(idx)								\
+	COND_CODE_1(PWM_NRFX_IS_FAST(_, /*empty*/, idx, _),				\
+		    (UTIL_INC(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_INIT_PRIORITY)),	\
+		    (CONFIG_PWM_INIT_PRIORITY))
+#else
+#define PWM_INIT_PRIORITY(idx) CONFIG_PWM_INIT_PRIORITY
+#endif
+
 #define PWM_NRFX_DEVICE(idx)						      \
 	NRF_DT_CHECK_NODE_HAS_PINCTRL_SLEEP(PWM(idx));			      \
 	static struct pwm_nrfx_data pwm_nrfx_##idx##_data;		      \
@@ -393,6 +482,14 @@ static int pwm_nrfx_init(const struct device *dev)
 			(16ul * 1000ul * 1000ul)),			      \
 		IF_ENABLED(CONFIG_DCACHE,				      \
 			(.mem_attr = PWM_GET_MEM_ATTR(idx),))		      \
+		IF_ENABLED(PWM_NRFX_USE_CLOCK_CONTROL,			      \
+			(.clk_dev = PWM_NRFX_IS_FAST(_, /*empty*/, idx, _)    \
+				    ? DEVICE_DT_GET(DT_CLOCKS_CTLR(PWM(idx))) \
+				    : NULL,				      \
+			 .clk_spec = {					      \
+				.frequency =				      \
+					NRF_PERIPH_GET_FREQUENCY(PWM(idx)),   \
+			 },))						      \
 	};								      \
 	static int pwm_nrfx_init##idx(const struct device *dev)		      \
 	{								      \
@@ -405,7 +502,7 @@ static int pwm_nrfx_init(const struct device *dev)
 			 pwm_nrfx_init##idx, PM_DEVICE_DT_GET(PWM(idx)),      \
 			 &pwm_nrfx_##idx##_data,			      \
 			 &pwm_nrfx_##idx##_config,			      \
-			 POST_KERNEL, CONFIG_PWM_INIT_PRIORITY,		      \
+			 POST_KERNEL, PWM_INIT_PRIORITY(idx),		      \
 			 &pwm_nrfx_drv_api_funcs)
 
 #define COND_PWM_NRFX_DEVICE(unused, prefix, i, _) \

From 73897911950e127b7c8b5fdf7298312a138044b4 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 17 Dec 2024 14:53:08 +0100
Subject: [PATCH 2204/2913] [nrf fromtree] tests: kernel: Fix for nRF54H20

Fix failing tests for nRF54H20 target.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit eb7e947d7827de0f27a445550fefc26978fc2a14)
---
 tests/drivers/can/host/boards/nrf54h20dk_nrf54h20_cpuapp.conf    | 1 +
 .../dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpuapp.conf  | 1 +
 .../dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpurad.conf  | 1 +
 .../thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpuapp.conf  | 1 +
 .../thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpurad.conf  | 1 +
 5 files changed, 5 insertions(+)
 create mode 100644 tests/drivers/can/host/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpurad.conf
 create mode 100644 tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpurad.conf

diff --git a/tests/drivers/can/host/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/can/host/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/drivers/can/host/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpurad.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/kernel/threads/dynamic_thread_stack/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpurad.conf
new file mode 100644
index 00000000000..0bcc82e646b
--- /dev/null
+++ b/tests/kernel/usage/thread_runtime_stats/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_GPD=n

From 8c049a46cbdeb6eef7c4aad38564510777b2924c Mon Sep 17 00:00:00 2001
From: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
Date: Tue, 7 Jan 2025 14:45:35 +0100
Subject: [PATCH 2205/2913] [nrf fromtree] net: openthread: radio: Fix platform
 radio state machine

Fix platform radio state machine to be compliant with one shown in
OpenThread's `include/openthread/platform/radio.h`

Align twister tests to verify proper behavior of the
state machine.

Signed-off-by: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
(cherry picked from commit b46f72009a72b8ea7bcc141e1bd8b31eaf6303f7)
---
 modules/openthread/platform/radio.c  | 37 +++++++++++++++++-----------
 tests/subsys/openthread/radio_test.c | 12 ++++++++-
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/modules/openthread/platform/radio.c b/modules/openthread/platform/radio.c
index 0aaa237ee14..32810b001b4 100644
--- a/modules/openthread/platform/radio.c
+++ b/modules/openthread/platform/radio.c
@@ -756,19 +756,25 @@ bool otPlatRadioIsEnabled(otInstance *aInstance)
 
 otError otPlatRadioEnable(otInstance *aInstance)
 {
-	if (!otPlatRadioIsEnabled(aInstance)) {
-		sState = OT_RADIO_STATE_SLEEP;
+	ARG_UNUSED(aInstance);
+
+	if (sState != OT_RADIO_STATE_DISABLED && sState != OT_RADIO_STATE_SLEEP) {
+		return OT_ERROR_INVALID_STATE;
 	}
 
+	sState = OT_RADIO_STATE_SLEEP;
 	return OT_ERROR_NONE;
 }
 
 otError otPlatRadioDisable(otInstance *aInstance)
 {
-	if (otPlatRadioIsEnabled(aInstance)) {
-		sState = OT_RADIO_STATE_DISABLED;
+	ARG_UNUSED(aInstance);
+
+	if (sState != OT_RADIO_STATE_DISABLED && sState != OT_RADIO_STATE_SLEEP) {
+		return OT_ERROR_INVALID_STATE;
 	}
 
+	sState = OT_RADIO_STATE_DISABLED;
 	return OT_ERROR_NONE;
 }
 
@@ -776,23 +782,24 @@ otError otPlatRadioSleep(otInstance *aInstance)
 {
 	ARG_UNUSED(aInstance);
 
-	otError error = OT_ERROR_INVALID_STATE;
-
-	if (sState == OT_RADIO_STATE_SLEEP ||
-	    sState == OT_RADIO_STATE_RECEIVE ||
-	    sState == OT_RADIO_STATE_TRANSMIT) {
-		error = OT_ERROR_NONE;
-		radio_api->stop(radio_dev);
-		sState = OT_RADIO_STATE_SLEEP;
+	if (sState != OT_RADIO_STATE_SLEEP && sState != OT_RADIO_STATE_RECEIVE) {
+		return OT_ERROR_INVALID_STATE;
 	}
 
-	return error;
+	radio_api->stop(radio_dev);
+	sState = OT_RADIO_STATE_SLEEP;
+
+	return OT_ERROR_NONE;
 }
 
 otError otPlatRadioReceive(otInstance *aInstance, uint8_t aChannel)
 {
 	ARG_UNUSED(aInstance);
 
+	if (sState == OT_RADIO_STATE_DISABLED) {
+		return OT_ERROR_INVALID_STATE;
+	}
+
 	channel = aChannel;
 
 	radio_api->set_channel(radio_dev, aChannel);
@@ -897,7 +904,9 @@ otError otPlatRadioTransmit(otInstance *aInstance, otRadioFrame *aPacket)
 
 	radio_caps = radio_api->get_capabilities(radio_dev);
 
-	if ((sState == OT_RADIO_STATE_RECEIVE) || (radio_caps & IEEE802154_HW_SLEEP_TO_TX)) {
+	if (sState == OT_RADIO_STATE_RECEIVE ||
+	    (sState == OT_RADIO_STATE_SLEEP &&
+	     radio_caps & IEEE802154_HW_SLEEP_TO_TX)) {
 		if (run_tx_task(aInstance) == 0) {
 			error = OT_ERROR_NONE;
 		}
diff --git a/tests/subsys/openthread/radio_test.c b/tests/subsys/openthread/radio_test.c
index 8c7a9fcb79e..6e407cab9c6 100644
--- a/tests/subsys/openthread/radio_test.c
+++ b/tests/subsys/openthread/radio_test.c
@@ -625,6 +625,9 @@ ZTEST(openthread_radio, test_radio_state_test)
 
 	zassert_equal(otPlatRadioSetTransmitPower(ot, power), OT_ERROR_NONE,
 		      "Failed to set TX power.");
+
+	zassert_equal(otPlatRadioSleep(ot), OT_ERROR_NONE, "Failed to switch to sleep mode.");
+
 	zassert_equal(otPlatRadioDisable(ot), OT_ERROR_NONE, "Failed to disable radio.");
 
 	zassert_false(otPlatRadioIsEnabled(ot), "Radio reports as enabled.");
@@ -632,6 +635,9 @@ ZTEST(openthread_radio, test_radio_state_test)
 	zassert_equal(otPlatRadioSleep(ot), OT_ERROR_INVALID_STATE,
 		      "Changed to sleep regardless being disabled.");
 
+	zassert_equal(otPlatRadioReceive(ot, channel), OT_ERROR_INVALID_STATE,
+		      "Changed to receive regardless being disabled.");
+
 	zassert_equal(otPlatRadioEnable(ot), OT_ERROR_NONE, "Enabling radio failed.");
 
 	zassert_true(otPlatRadioIsEnabled(ot), "Radio reports disabled.");
@@ -644,6 +650,9 @@ ZTEST(openthread_radio, test_radio_state_test)
 	zassert_equal(otPlatRadioReceive(ot, channel), OT_ERROR_NONE, "Failed to receive.");
 	zassert_equal(platformRadioChannelGet(ot), channel, "Channel number not remembered.");
 
+	zassert_equal(otPlatRadioDisable(ot), OT_ERROR_INVALID_STATE,
+		      "Changed to disabled regardless being in receive state.");
+
 	zassert_true(otPlatRadioIsEnabled(ot), "Radio reports as disabled.");
 	zassert_equal(1, set_channel_mock_fake.call_count);
 	zassert_equal(channel, set_channel_mock_fake.arg1_val);
@@ -651,7 +660,7 @@ ZTEST(openthread_radio, test_radio_state_test)
 	zassert_equal(power, set_txpower_mock_fake.arg1_val);
 	zassert_equal(1, start_mock_fake.call_count);
 	zassert_equal_ptr(radio, start_mock_fake.arg0_val, NULL);
-	zassert_equal(1, stop_mock_fake.call_count);
+	zassert_equal(2, stop_mock_fake.call_count);
 	zassert_equal_ptr(radio, stop_mock_fake.arg0_val, NULL);
 }
 
@@ -814,6 +823,7 @@ ZTEST(openthread_radio, test_net_pkt_transmit)
 		      "Failed to set TX power.");
 
 	set_channel_mock_fake.return_val = 0;
+	zassert_equal(otPlatRadioEnable(ot), OT_ERROR_NONE, "Failed to enable.");
 	zassert_equal(otPlatRadioReceive(ot, channel), OT_ERROR_NONE, "Failed to receive.");
 	zassert_equal(1, set_channel_mock_fake.call_count);
 	zassert_equal(channel, set_channel_mock_fake.arg1_val);

From 9050bb879514ec61bca8175455d5e9309b609a19 Mon Sep 17 00:00:00 2001
From: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
Date: Tue, 7 Jan 2025 14:46:13 +0100
Subject: [PATCH 2206/2913] [nrf fromtree] net: openthread: radio: Add setting
 channel in diag mode

Add possibility to set channel in diag mode by implementing
`platformRadioChannelSet` API.

Signed-off-by: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
(cherry picked from commit 712da726be9aaec7a1569b5e92dc4bdb7f756ac9)
---
 modules/openthread/platform/diag.c            |  2 +-
 modules/openthread/platform/platform-zephyr.h | 10 ++++++++++
 modules/openthread/platform/radio.c           |  7 +++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/modules/openthread/platform/diag.c b/modules/openthread/platform/diag.c
index edf8ad09dd5..23f82985812 100644
--- a/modules/openthread/platform/diag.c
+++ b/modules/openthread/platform/diag.c
@@ -104,8 +104,8 @@ bool otPlatDiagModeGet(void)
 
 void otPlatDiagChannelSet(uint8_t aChannel)
 {
-	ARG_UNUSED(aChannel);
 	sChannel = aChannel;
+	platformRadioChannelSet(aChannel);
 }
 
 void otPlatDiagTxPowerSet(int8_t aTxPower)
diff --git a/modules/openthread/platform/platform-zephyr.h b/modules/openthread/platform/platform-zephyr.h
index ca25fedf2b1..d6dd26adea0 100644
--- a/modules/openthread/platform/platform-zephyr.h
+++ b/modules/openthread/platform/platform-zephyr.h
@@ -70,6 +70,16 @@ void platformUartPanic(void);
  */
 uint16_t platformRadioChannelGet(otInstance *aInstance);
 
+#if defined(CONFIG_OPENTHREAD_DIAG)
+/**
+ * Set channel on radio driver.
+ *
+ * @param[in]  aChannel  The channel that the radio driver should use for operation.
+ *
+ */
+void platformRadioChannelSet(uint8_t aChannel);
+#endif /* CONFIG_OPENTHREAD_DIAG */
+
 #if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 /**
  * Start/stop continuous carrier wave transmission.
diff --git a/modules/openthread/platform/radio.c b/modules/openthread/platform/radio.c
index 32810b001b4..82b54a34763 100644
--- a/modules/openthread/platform/radio.c
+++ b/modules/openthread/platform/radio.c
@@ -722,6 +722,13 @@ uint16_t platformRadioChannelGet(otInstance *aInstance)
 	return channel;
 }
 
+#if defined(CONFIG_OPENTHREAD_DIAG)
+void platformRadioChannelSet(uint8_t aChannel)
+{
+	channel = aChannel;
+}
+#endif
+
 void otPlatRadioSetPanId(otInstance *aInstance, uint16_t aPanId)
 {
 	ARG_UNUSED(aInstance);

From 2f06c46461e72d87ecc454cec8886a5d6e1920ef Mon Sep 17 00:00:00 2001
From: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
Date: Fri, 10 Jan 2025 08:47:20 +0100
Subject: [PATCH 2207/2913] [nrf fromtree] net: openthread: cleanup diag
 commands

After https://github.com/openthread/openthread/pull/11055,
platform is not required to check diagnostics mode while
processing commands.

Signed-off-by: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
(cherry picked from commit 74bbbdccf874afd4b9f2974e0e1a62378aee8719)
---
 modules/openthread/platform/diag.c | 16 ++++------------
 west.yml                           |  2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/modules/openthread/platform/diag.c b/modules/openthread/platform/diag.c
index 23f82985812..79f4e38984a 100644
--- a/modules/openthread/platform/diag.c
+++ b/modules/openthread/platform/diag.c
@@ -125,8 +125,8 @@ void otPlatDiagRadioReceived(otInstance *aInstance,
 #if defined(CONFIG_IEEE802154_CARRIER_FUNCTIONS)
 otError otPlatDiagRadioTransmitCarrier(otInstance *aInstance, bool aEnable)
 {
-	if (!otPlatDiagModeGet() || (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE &&
-				     sTransmitMode != DIAG_TRANSMIT_MODE_CARRIER)) {
+	if (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE &&
+	    sTransmitMode != DIAG_TRANSMIT_MODE_CARRIER) {
 		return OT_ERROR_INVALID_STATE;
 	}
 
@@ -175,10 +175,6 @@ static otError gpio_get_spec(uint32_t gpio_idx, const struct gpio_dt_spec **spec
 
 	*spec = &gpio_spec[gpio_idx];
 
-	if (!otPlatDiagModeGet()) {
-		return OT_ERROR_INVALID_STATE;
-	}
-
 	if (!gpio_is_ready_dt(*spec)) {
 		return OT_ERROR_INVALID_ARGS;
 	}
@@ -326,8 +322,8 @@ static otError startModCarrier(otInstance *aInstance, uint8_t aArgsLength, char
 		return OT_ERROR_INVALID_ARGS;
 	}
 
-	if (!otPlatDiagModeGet() || (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE &&
-				     sTransmitMode != DIAG_TRANSMIT_MODE_MODCARRIER)) {
+	if (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE &&
+	    sTransmitMode != DIAG_TRANSMIT_MODE_MODCARRIER) {
 		return OT_ERROR_INVALID_STATE;
 	}
 
@@ -396,10 +392,6 @@ static otError processTransmit(otInstance *aInstance, uint8_t aArgsLength, char
 	long value;
 	uint32_t now;
 
-	if (!otPlatDiagModeGet()) {
-		return OT_ERROR_INVALID_STATE;
-	}
-
 	if (aArgsLength == 0) {
 		diag_output("transmit will send %" PRId32 " diagnostic messages with %" PRIu32
 			    " ms interval\r\n",
diff --git a/west.yml b/west.yml
index 53a3c8fd03d..07b33ef059f 100644
--- a/west.yml
+++ b/west.yml
@@ -324,7 +324,7 @@ manifest:
       revision: 52bb1783521c62c019451cee9b05b8eda9d7425f
       path: modules/lib/open-amp
     - name: openthread
-      revision: 2aeb8b833ba760ec29d5f340dd1ce7bcb61c5d56
+      revision: 3ae741f95e7dfb391dec35c48742862049eb62e8
       path: modules/lib/openthread
     - name: percepio
       path: modules/debug/percepio

From 5a8df7b63bc94189453f87de12415f054746b1fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Mon, 13 Jan 2025 14:33:30 +0100
Subject: [PATCH 2208/2913] [nrf fromtree] samples: boards: nordic:
 coresight_stm: Fix nrfutil trace command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Latest version of nrfutil trace doesn't support setting
uart baudrate.
Remove --baudrate {baudrate_val} from command that executes nrfutil.

Also, combine pytest script for:
- samples.boards.nordic.coresight_stm,
- tests.boards.nrf.coresight_stm,
to minimize code duplication (fix compliance check R0801).

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 153f5b63820ad2ec96c31ae0f868323a2c585998)
---
 .../nordic/coresight_stm/pytest/test_stm.py   | 296 +++++++++++++--
 .../boards/nordic/coresight_stm/sample.yaml   |   4 +-
 .../nrf/coresight_stm/pytest/test_stm.py      | 347 ------------------
 tests/boards/nrf/coresight_stm/testcase.yaml  |   4 +-
 4 files changed, 273 insertions(+), 378 deletions(-)
 delete mode 100644 tests/boards/nrf/coresight_stm/pytest/test_stm.py

diff --git a/samples/boards/nordic/coresight_stm/pytest/test_stm.py b/samples/boards/nordic/coresight_stm/pytest/test_stm.py
index fb2203e809e..4af24fbfa3c 100644
--- a/samples/boards/nordic/coresight_stm/pytest/test_stm.py
+++ b/samples/boards/nordic/coresight_stm/pytest/test_stm.py
@@ -7,6 +7,7 @@
 import logging
 import re
 import subprocess
+from dataclasses import dataclass
 from pathlib import Path
 from time import sleep
 
@@ -18,7 +19,8 @@
 SB_CONFIG_APP_CPUPPR_RUN = None
 SB_CONFIG_APP_CPUFLPR_RUN = None
 
-# https://github.com/zephyrproject-rtos/zephyr/blob/main/drivers/misc/coresight/nrf_etr.c#L102
+# See definition of stm_m_id[] and stm_m_name[] in
+# https://github.com/zephyrproject-rtos/zephyr/blob/main/drivers/misc/coresight/nrf_etr.c
 STM_M_ID = {
     "sec": 33,
     "app": 34,
@@ -31,7 +33,19 @@
 }
 
 
-def _analyse_autoconf(filepath: str) -> None:
+@dataclass
+class STMLimits:
+    log_0_arg: float | None
+    log_1_arg: float | None
+    log_2_arg: float | None
+    log_3_arg: float | None
+    log_str: float | None
+    tracepoint: float | None
+    tracepoint_d32: float | None
+    tolerance: float | None
+
+
+def analyse_autoconf(filepath: str) -> None:
     global SB_CONFIG_APP_CPUPPR_RUN
     global SB_CONFIG_APP_CPUFLPR_RUN
 
@@ -50,7 +64,7 @@ def _analyse_autoconf(filepath: str) -> None:
     logger.debug(f"{SB_CONFIG_APP_CPUFLPR_RUN=}")
 
 
-def _check_benchmark_results(output: str, core: str) -> None:
+def check_console_output(output: str, core: str) -> None:
     """
     Use regular expressions to parse 'output' string.
     Search for benchmark results related to 'core' coprocessor.
@@ -92,6 +106,55 @@ def _check_benchmark_results(output: str, core: str) -> None:
     assert latency_tracepoint_d32_str is not None, "Timing for tracepoint_d32 NOT found"
 
 
+def check_benchmark_results(output: str, core: str, constraints: STMLimits) -> None:
+    """
+    Use regular expressions to parse 'output' string.
+    Search for benchmark results related to 'core' coprocessor.
+    Check that benchamrk results are lower than limits provided in 'constraints'.
+    """
+
+    cfg = {
+        "log message with 0 arguments": {
+            "regex": rf"{core}: Timing for log message with 0 arguments: (.+)us",
+            "expected": constraints.log_0_arg,
+        },
+        "log message with 1 argument": {
+            "regex": rf"{core}: Timing for log message with 1 argument: (.+)us",
+            "expected": constraints.log_1_arg,
+        },
+        "log message with 2 arguments": {
+            "regex": rf"{core}: Timing for log message with 2 arguments: (.+)us",
+            "expected": constraints.log_2_arg,
+        },
+        "log message with 3 arguments": {
+            "regex": rf"{core}: Timing for log message with 3 arguments: (.+)us",
+            "expected": constraints.log_3_arg,
+        },
+        "log message with string": {
+            "regex": rf"{core}: Timing for log_message with string: (.+)us",
+            "expected": constraints.log_str,
+        },
+        "tracepoint": {
+            "regex": rf"{core}: Timing for tracepoint: (.+)us",
+            "expected": constraints.tracepoint,
+        },
+        "tracepoint_d32": {
+            "regex": rf"{core}: Timing for tracepoint_d32: (.+)us",
+            "expected": constraints.tracepoint_d32,
+        },
+    }
+
+    for check in cfg:
+        observed_str = re.search(cfg[check]["regex"], output).group(1)
+        assert observed_str is not None, f"Timing for {check} NOT found"
+        # check value
+        observed = float(observed_str)
+        threshold = cfg[check]["expected"] * (1 + constraints.tolerance)
+        assert (
+            observed < threshold
+        ), f"{core}: Timing for {check} - {observed} us exceeds {threshold} us"
+
+
 # nrfutil starts children processes
 # when subprocess.terminate(nrfutil_process) is executed, only the parent terminates
 # this blocks serial port for other uses
@@ -104,19 +167,21 @@ def _kill(proc):
         logger.exception(f'Could not kill nrfutil - {e}')
 
 
-def _nrfutil_dictionary_from_serial(
+def nrfutil_dictionary_from_serial(
     dut: DeviceAdapter,
     decoded_file_name: str = "output.txt",
     collect_time: float = 60.0,
 ) -> None:
     UART_PATH = dut.device_config.serial
-    UART_BAUDRATE = dut.device_config.baud
     dut.close()
 
     logger.debug(f"Using serial: {UART_PATH}")
 
-    if Path(f"{decoded_file_name}").exists():
-        logger.warning("Output file already exists!")
+    try:
+        Path(f"{decoded_file_name}").unlink()
+        logger.info("Old output file was deleted")
+    except FileNotFoundError:
+        pass
 
     # prepare database config string
     BUILD_DIR = str(dut.device_config.build_dir)
@@ -132,7 +197,7 @@ def _nrfutil_dictionary_from_serial(
     cmd = (
         "nrfutil trace stm --database-config "
         f"{config_str} "
-        f"--input-serialport {UART_PATH} --baudrate {UART_BAUDRATE} "
+        f"--input-serialport {UART_PATH} "
         f"--output-ascii {decoded_file_name}"
     )
     try:
@@ -149,11 +214,11 @@ def _nrfutil_dictionary_from_serial(
         _kill(proc)
 
 
-def test_STM_decoded(dut: DeviceAdapter):
+def test_sample_STM_decoded(dut: DeviceAdapter):
     """
-    Run sample.boards.nrf.coresight_stm from samples/boards/nrf/coresight_stm sample.
-    Both Application and Radio cores use STM for logging.
-    STM proxy (Application core) decodes logs from all domains.
+    Run sample.boards.nrf.coresight_stm from samples/boards/nordic/coresight_stm sample.
+    Application, Radio, PPR and FLPR cores use STM for logging.
+    STM proxy (Application core) decodes logs from all cores.
     After reset, coprocessors execute code in expected way and Application core
     outputs STM traces on UART port.
     """
@@ -162,45 +227,126 @@ def test_STM_decoded(dut: DeviceAdapter):
 
     # nrf54h20 prints immediately after it is flashed.
     # Wait a bit to skipp logs from previous test.
-    sleep(4)
+    sleep(5)
 
     # Get output from serial port
     output = "\n".join(dut.readlines())
 
     # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
-    _analyse_autoconf(autoconf_file)
+    analyse_autoconf(autoconf_file)
 
     # check that LOGs from Application core are present
-    _check_benchmark_results(
+    check_console_output(
         output=output,
         core='app',
     )
 
     # check that LOGs from Radio core are present
-    _check_benchmark_results(
+    check_console_output(
         output=output,
         core='rad',
     )
 
     if SB_CONFIG_APP_CPUPPR_RUN:
         # check that LOGs from PPR core are present
-        _check_benchmark_results(
+        check_console_output(
             output=output,
             core='ppr',
         )
 
     if SB_CONFIG_APP_CPUFLPR_RUN:
         # check that LOGs from FLPR core are present
-        _check_benchmark_results(
+        check_console_output(
             output=output,
             core='flpr',
         )
 
 
-def test_STM_dictionary_mode(dut: DeviceAdapter):
+def test_STM_decoded(dut: DeviceAdapter):
+    """
+    Run boards.nrf.coresight_stm from tests/boards/nrf/coresight_stm test suite.
+    Application, Radio, PPR and FLPR cores use STM for logging.
+    STM proxy (Application core) decodes logs from all cores.
+    After reset, coprocessors execute code in expected way and Application core
+    outputs STM traces on UART port.
+    """
+    BUILD_DIR = str(dut.device_config.build_dir)
+    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
+
+    app_constraints = STMLimits(
+        # all values in us
+        log_0_arg=1.8,
+        log_1_arg=2.1,
+        log_2_arg=2.0,
+        log_3_arg=2.1,
+        log_str=4.5,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,  # 50 %
+    )
+    rad_constraints = STMLimits(
+        # all values in us
+        log_0_arg=4.6,
+        log_1_arg=5.0,
+        log_2_arg=5.2,
+        log_3_arg=5.6,
+        log_str=6.3,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,
+    )
+    ppr_constraints = STMLimits(
+        # all values in us
+        log_0_arg=25.7,
+        log_1_arg=27.1,
+        log_2_arg=27.3,
+        log_3_arg=30.4,
+        log_str=65.7,
+        tracepoint=0.55,
+        tracepoint_d32=0.25,
+        tolerance=0.5,
+    )
+    flpr_constraints = STMLimits(
+        # all values in us
+        log_0_arg=1.3,
+        log_1_arg=1.6,
+        log_2_arg=1.6,
+        log_3_arg=1.7,
+        log_str=3.0,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,
+    )
+
+    # nrf54h20 prints immediately after it is flashed.
+    # Wait a bit to skipp logs from previous test.
+    sleep(5)
+
+    # Get output from serial port
+    output = "\n".join(dut.readlines())
+
+    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
+    analyse_autoconf(autoconf_file)
+
+    # check results on Application core
+    check_benchmark_results(output=output, core='app', constraints=app_constraints)
+
+    # check results on Radio core
+    check_benchmark_results(output=output, core='rad', constraints=rad_constraints)
+
+    if SB_CONFIG_APP_CPUPPR_RUN:
+        # check results on PPR core
+        check_benchmark_results(output=output, core='ppr', constraints=ppr_constraints)
+
+    if SB_CONFIG_APP_CPUFLPR_RUN:
+        # check results on FLPR core
+        check_benchmark_results(output=output, core='flpr', constraints=flpr_constraints)
+
+
+def test_sample_STM_dictionary_mode(dut: DeviceAdapter):
     """
-    Run sample.boards.nrf.coresight_stm.dict from samples/boards/nrf/coresight_stm sample.
-    Both Application and Radio cores use STM for logging.
+    Run sample.boards.nrf.coresight_stm.dict from samples/boards/nordic/coresight_stm sample.
+    Application, Radio, PPR and FLPR cores use STM for logging.
     STM proxy (Application core) prints on serial port raw logs from all domains.
     Nrfutil trace is used to decode STM logs.
     After reset, coprocessors execute code in expected way and Application core
@@ -213,10 +359,10 @@ def test_STM_dictionary_mode(dut: DeviceAdapter):
 
     # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
     # this information is needed to build nrfutil database-config
-    _analyse_autoconf(autoconf_file)
+    analyse_autoconf(autoconf_file)
 
     # use nrfutil trace to decode logs
-    _nrfutil_dictionary_from_serial(
+    nrfutil_dictionary_from_serial(
         dut=dut,
         decoded_file_name=f"{test_filename}",
         collect_time=COLLECT_TIMEOUT,
@@ -232,27 +378,123 @@ def test_STM_dictionary_mode(dut: DeviceAdapter):
     ), f"File {test_filename} is empty"
 
     # check that LOGs from Application core are present
-    _check_benchmark_results(
+    check_console_output(
         output=decoded_file_content,
         core='app',
     )
 
     # check that LOGs from Radio core are present
-    _check_benchmark_results(
+    check_console_output(
         output=decoded_file_content,
         core='rad',
     )
 
     if SB_CONFIG_APP_CPUPPR_RUN:
         # check that LOGs from PPR core are present
-        _check_benchmark_results(
+        check_console_output(
             output=decoded_file_content,
             core='ppr',
         )
 
     if SB_CONFIG_APP_CPUFLPR_RUN:
         # check that LOGs from FLPR core are present
-        _check_benchmark_results(
+        check_console_output(
             output=decoded_file_content,
             core='flpr',
         )
+
+
+def test_STM_dictionary_mode(dut: DeviceAdapter):
+    """
+    Run boards.nrf.coresight_stm.dict from tests/boards/nrf/coresight_stm test suite.
+    Application, Radio, PPR and FLPR cores use STM for logging.
+    STM proxy (Application core) prints on serial port raw logs from all domains.
+    Nrfutil trace is used to decode STM logs.
+    After reset, coprocessors execute code in expected way and Application core
+    outputs STM traces on UART port.
+    """
+    BUILD_DIR = str(dut.device_config.build_dir)
+    test_filename = f"{BUILD_DIR}/coresight_stm_dictionary.txt"
+    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
+    COLLECT_TIMEOUT = 10.0
+
+    app_constraints = STMLimits(
+        # all values in us
+        log_0_arg=0.7,
+        log_1_arg=0.8,
+        log_2_arg=0.8,
+        log_3_arg=1.3,
+        log_str=3.2,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,  # 50 %
+    )
+    rad_constraints = STMLimits(
+        # all values in us
+        log_0_arg=0.8,
+        log_1_arg=0.9,
+        log_2_arg=1.0,
+        log_3_arg=1.5,
+        log_str=3.6,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,
+    )
+    ppr_constraints = STMLimits(
+        # all values in us
+        log_0_arg=7.5,
+        log_1_arg=8.5,
+        log_2_arg=8.6,
+        log_3_arg=17.4,
+        log_str=45.2,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,
+    )
+    flpr_constraints = STMLimits(
+        # all values in us
+        log_0_arg=0.3,
+        log_1_arg=0.4,
+        log_2_arg=0.5,
+        log_3_arg=0.8,
+        log_str=2.6,
+        tracepoint=0.5,
+        tracepoint_d32=0.5,
+        tolerance=0.5,  # 50 %
+    )
+
+    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
+    # this information is needed to build nrfutil database-config
+    analyse_autoconf(autoconf_file)
+
+    # use nrfutil trace to decode logs
+    nrfutil_dictionary_from_serial(
+        dut=dut,
+        decoded_file_name=f"{test_filename}",
+        collect_time=COLLECT_TIMEOUT,
+    )
+
+    # read decoded logs
+    with open(f"{test_filename}", errors="ignore") as decoded_file:
+        decoded_file_content = decoded_file.read()
+
+    # if nothing in decoded_file, stop test
+    assert len(decoded_file_content) > 0, f"File {test_filename} is empty"
+
+    # check results on Application core
+    check_benchmark_results(output=decoded_file_content, core='app', constraints=app_constraints)
+
+    # check results on Radio core
+    check_benchmark_results(output=decoded_file_content, core='rad', constraints=rad_constraints)
+
+    if SB_CONFIG_APP_CPUPPR_RUN:
+        # check results on PPR core
+        check_benchmark_results(
+            output=decoded_file_content, core='ppr', constraints=ppr_constraints
+        )
+
+    if SB_CONFIG_APP_CPUFLPR_RUN:
+        # check results on FLPR core
+        check_benchmark_results(
+            output=decoded_file_content, core='flpr', constraints=flpr_constraints
+        )
diff --git a/samples/boards/nordic/coresight_stm/sample.yaml b/samples/boards/nordic/coresight_stm/sample.yaml
index 4251c5d6df8..bf9016baaba 100644
--- a/samples/boards/nordic/coresight_stm/sample.yaml
+++ b/samples/boards/nordic/coresight_stm/sample.yaml
@@ -15,7 +15,7 @@ tests:
     harness_config:
       pytest_dut_scope: session
       pytest_root:
-        - "pytest/test_stm.py::test_STM_dictionary_mode"
+        - "pytest/test_stm.py::test_sample_STM_dictionary_mode"
     required_snippets:
       - nordic-log-stm-dict
     extra_args:
@@ -27,7 +27,7 @@ tests:
     harness_config:
       pytest_dut_scope: session
       pytest_root:
-        - "pytest/test_stm.py::test_STM_decoded"
+        - "pytest/test_stm.py::test_sample_STM_decoded"
     required_snippets:
       - nordic-log-stm
     extra_args:
diff --git a/tests/boards/nrf/coresight_stm/pytest/test_stm.py b/tests/boards/nrf/coresight_stm/pytest/test_stm.py
deleted file mode 100644
index 7131d8f38bb..00000000000
--- a/tests/boards/nrf/coresight_stm/pytest/test_stm.py
+++ /dev/null
@@ -1,347 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-import logging
-import re
-import subprocess
-from dataclasses import dataclass
-from pathlib import Path
-from time import sleep
-
-import psutil
-from twister_harness import DeviceAdapter
-
-logger = logging.getLogger(__name__)
-
-
-SB_CONFIG_APP_CPUPPR_RUN = None
-SB_CONFIG_APP_CPUFLPR_RUN = None
-
-# See definition of stm_m_id[] and stm_m_name[] in
-# https://github.com/zephyrproject-rtos/zephyr/blob/main/drivers/misc/coresight/nrf_etr.c
-STM_M_ID = {
-    "sec": 33,
-    "app": 34,
-    "rad": 35,
-    "mod": 36,
-    "sys": 44,
-    "flpr": 45,
-    "ppr": 46,
-    "hw": 128,
-}
-
-
-@dataclass
-class STMLimits:
-    log_0_arg: float | None
-    log_1_arg: float | None
-    log_2_arg: float | None
-    log_3_arg: float | None
-    log_str: float | None
-    tracepoint: float | None
-    tracepoint_d32: float | None
-    tolerance: float | None
-
-
-def _analyse_autoconf(filepath: str) -> None:
-    global SB_CONFIG_APP_CPUPPR_RUN
-    global SB_CONFIG_APP_CPUFLPR_RUN
-
-    SB_CONFIG_APP_CPUPPR_RUN = False
-    SB_CONFIG_APP_CPUFLPR_RUN = False
-
-    # Parse contents of {BUILD_DIR}/_sysbuild/autoconf.h
-    with open(f"{filepath}", errors="ignore") as autoconf:
-        for line in autoconf:
-            if "SB_CONFIG_APP_CPUPPR_RUN 1" in line:
-                SB_CONFIG_APP_CPUPPR_RUN = True
-                continue
-            if "SB_CONFIG_APP_CPUFLPR_RUN 1" in line:
-                SB_CONFIG_APP_CPUFLPR_RUN = True
-    logger.debug(f"{SB_CONFIG_APP_CPUPPR_RUN=}")
-    logger.debug(f"{SB_CONFIG_APP_CPUFLPR_RUN=}")
-
-
-def _check_benchmark_results(output: str, core: str, constraints: STMLimits) -> None:
-    """
-    Use regular expressions to parse 'output' string.
-    Search for benchmark results related to 'core' coprocessor.
-    Check that benchamrk results are lower than limits provided in 'constraints'.
-    """
-
-    cfg = {
-        "log message with 0 arguments": {
-            "regex": rf"{core}: Timing for log message with 0 arguments: (.+)us",
-            "expected": constraints.log_0_arg,
-        },
-        "log message with 1 argument": {
-            "regex": rf"{core}: Timing for log message with 1 argument: (.+)us",
-            "expected": constraints.log_1_arg,
-        },
-        "log message with 2 arguments": {
-            "regex": rf"{core}: Timing for log message with 2 arguments: (.+)us",
-            "expected": constraints.log_2_arg,
-        },
-        "log message with 3 arguments": {
-            "regex": rf"{core}: Timing for log message with 3 arguments: (.+)us",
-            "expected": constraints.log_3_arg,
-        },
-        "log message with string": {
-            "regex": rf"{core}: Timing for log_message with string: (.+)us",
-            "expected": constraints.log_str,
-        },
-        "tracepoint": {
-            "regex": rf"{core}: Timing for tracepoint: (.+)us",
-            "expected": constraints.tracepoint,
-        },
-        "tracepoint_d32": {
-            "regex": rf"{core}: Timing for tracepoint_d32: (.+)us",
-            "expected": constraints.tracepoint_d32,
-        },
-    }
-
-    for check in cfg:
-        observed_str = re.search(cfg[check]["regex"], output).group(1)
-        assert observed_str is not None, f"Timing for {check} NOT found"
-        # check value
-        observed = float(observed_str)
-        threshold = cfg[check]["expected"] * (1 + constraints.tolerance)
-        assert (
-            observed < threshold
-        ), f"{core}: Timing for {check} - {observed} us exceeds {threshold} us"
-
-
-# nrfutil starts children processes
-# when subprocess.terminate(nrfutil_process) is executed, only the parent terminates
-# this blocks serial port for other uses
-def _kill(proc):
-    try:
-        for child in psutil.Process(proc.pid).children(recursive=True):
-            child.kill()
-        proc.kill()
-    except Exception as e:
-        logger.exception(f'Could not kill nrfutil - {e}')
-
-
-def _nrfutil_dictionary_from_serial(
-    dut: DeviceAdapter,
-    decoded_file_name: str = "output.txt",
-    collect_time: float = 60.0,
-) -> None:
-    UART_PATH = dut.device_config.serial
-    UART_BAUDRATE = dut.device_config.baud
-    dut.close()
-
-    logger.debug(f"Using serial: {UART_PATH}")
-
-    if Path(f"{decoded_file_name}").exists():
-        logger.warning("Output file already exists!")
-
-    # prepare database config string
-    BUILD_DIR = str(dut.device_config.build_dir)
-    logger.debug(f"{BUILD_DIR=}")
-    config_str = f"{STM_M_ID['app']}:{BUILD_DIR}/coresight_stm/zephyr/log_dictionary.json"
-    config_str += f",{STM_M_ID['rad']}:{BUILD_DIR}/remote_rad/zephyr/log_dictionary.json"
-    if SB_CONFIG_APP_CPUPPR_RUN:
-        config_str += f",{STM_M_ID['ppr']}:{BUILD_DIR}/remote_ppr/zephyr/log_dictionary.json"
-    if SB_CONFIG_APP_CPUFLPR_RUN:
-        config_str += f",{STM_M_ID['flpr']}:{BUILD_DIR}/remote_flpr/zephyr/log_dictionary.json"
-    logger.debug(f"{config_str=}")
-
-    cmd = (
-        "nrfutil trace stm --database-config "
-        f"{config_str} "
-        f"--input-serialport {UART_PATH} --baudrate {UART_BAUDRATE} "
-        f"--output-ascii {decoded_file_name}"
-    )
-    try:
-        # run nrfutil trace in background non-blocking
-        logger.info(f"Executing:\n{cmd}")
-        proc = subprocess.Popen(cmd.split(), stdout=subprocess.DEVNULL)
-    except OSError as exc:
-        logger.error(f"Unable to start nrfutil trace:\n{cmd}\n{exc}")
-    try:
-        proc.wait(collect_time)
-    except subprocess.TimeoutExpired:
-        pass
-    finally:
-        _kill(proc)
-
-
-def test_STM_decoded(dut: DeviceAdapter):
-    """
-    Run sample.boards.nrf.coresight_stm from samples/boards/nrf/coresight_stm sample.
-    Both Application and Radio cores use STM for logging.
-    STM proxy (Application core) decodes logs from all domains.
-    After reset, coprocessors execute code in expected way and Application core
-    outputs STM traces on UART port.
-    """
-    BUILD_DIR = str(dut.device_config.build_dir)
-    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
-
-    app_constraints = STMLimits(
-        # all values in us
-        log_0_arg=1.8,
-        log_1_arg=2.1,
-        log_2_arg=2.0,
-        log_3_arg=2.1,
-        log_str=4.5,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,  # 50 %
-    )
-    rad_constraints = STMLimits(
-        # all values in us
-        log_0_arg=4.6,
-        log_1_arg=5.0,
-        log_2_arg=5.2,
-        log_3_arg=5.6,
-        log_str=6.3,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,
-    )
-    ppr_constraints = STMLimits(
-        # all values in us
-        log_0_arg=25.7,
-        log_1_arg=27.1,
-        log_2_arg=27.3,
-        log_3_arg=30.4,
-        log_str=65.7,
-        tracepoint=0.55,
-        tracepoint_d32=0.25,
-        tolerance=0.5,
-    )
-    flpr_constraints = STMLimits(
-        # all values in us
-        log_0_arg=1.3,
-        log_1_arg=1.6,
-        log_2_arg=1.6,
-        log_3_arg=1.7,
-        log_str=3.0,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,
-    )
-    # nrf54h20 prints immediately after it is flashed.
-    # Wait a bit to skipp logs from previous test.
-    sleep(6)
-
-    # Get output from serial port
-    output = "\n".join(dut.readlines())
-
-    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
-    _analyse_autoconf(autoconf_file)
-
-    # check results on Application core
-    _check_benchmark_results(output=output, core='app', constraints=app_constraints)
-
-    # check results on Radio core
-    _check_benchmark_results(output=output, core='rad', constraints=rad_constraints)
-
-    if SB_CONFIG_APP_CPUPPR_RUN:
-        # check results on PPR core
-        _check_benchmark_results(output=output, core='ppr', constraints=ppr_constraints)
-
-    if SB_CONFIG_APP_CPUFLPR_RUN:
-        # check results on FLPR core
-        _check_benchmark_results(output=output, core='flpr', constraints=flpr_constraints)
-
-
-def test_STM_dictionary_mode(dut: DeviceAdapter):
-    """
-    Run sample.boards.nrf.coresight_stm.dict from samples/boards/nrf/coresight_stm sample.
-    Both Application and Radio cores use STM for logging.
-    STM proxy (Application core) prints on serial port raw logs from all domains.
-    Nrfutil trace is used to decode STM logs.
-    After reset, coprocessors execute code in expected way and Application core
-    outputs STM traces on UART port.
-    """
-    BUILD_DIR = str(dut.device_config.build_dir)
-    test_filename = f"{BUILD_DIR}/coresight_stm_dictionary.txt"
-    autoconf_file = f"{BUILD_DIR}/_sysbuild/autoconf.h"
-    COLLECT_TIMEOUT = 10.0
-
-    app_constraints = STMLimits(
-        # all values in us
-        log_0_arg=0.7,
-        log_1_arg=0.8,
-        log_2_arg=0.8,
-        log_3_arg=1.3,
-        log_str=3.2,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,  # 50 %
-    )
-    rad_constraints = STMLimits(
-        # all values in us
-        log_0_arg=0.8,
-        log_1_arg=0.9,
-        log_2_arg=1.0,
-        log_3_arg=1.5,
-        log_str=3.6,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,
-    )
-    ppr_constraints = STMLimits(
-        # all values in us
-        log_0_arg=7.5,
-        log_1_arg=8.5,
-        log_2_arg=8.6,
-        log_3_arg=17.4,
-        log_str=45.2,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,
-    )
-    flpr_constraints = STMLimits(
-        # all values in us
-        log_0_arg=0.3,
-        log_1_arg=0.4,
-        log_2_arg=0.5,
-        log_3_arg=0.8,
-        log_str=2.6,
-        tracepoint=0.5,
-        tracepoint_d32=0.5,
-        tolerance=0.5,  # 50 %
-    )
-
-    # set SB_CONFIG_APP_CPUPPR_RUN, SB_CONFIG_APP_CPUFLPR_RUN
-    # this information is needed to build nrfutil database-config
-    _analyse_autoconf(autoconf_file)
-
-    # use nrfutil trace to decode logs
-    _nrfutil_dictionary_from_serial(
-        dut=dut,
-        decoded_file_name=f"{test_filename}",
-        collect_time=COLLECT_TIMEOUT,
-    )
-
-    # read decoded logs
-    with open(f"{test_filename}", errors="ignore") as decoded_file:
-        decoded_file_content = decoded_file.read()
-
-    # if nothing in decoded_file, stop test
-    assert len(decoded_file_content) > 0, f"File {test_filename} is empty"
-
-    # check results on Application core
-    _check_benchmark_results(output=decoded_file_content, core='app', constraints=app_constraints)
-
-    # check results on Radio core
-    _check_benchmark_results(output=decoded_file_content, core='rad', constraints=rad_constraints)
-
-    if SB_CONFIG_APP_CPUPPR_RUN:
-        # check results on PPR core
-        _check_benchmark_results(
-            output=decoded_file_content, core='ppr', constraints=ppr_constraints
-        )
-
-    if SB_CONFIG_APP_CPUFLPR_RUN:
-        # check results on FLPR core
-        _check_benchmark_results(
-            output=decoded_file_content, core='flpr', constraints=flpr_constraints
-        )
diff --git a/tests/boards/nrf/coresight_stm/testcase.yaml b/tests/boards/nrf/coresight_stm/testcase.yaml
index 1b496c9b8c7..308f231274c 100644
--- a/tests/boards/nrf/coresight_stm/testcase.yaml
+++ b/tests/boards/nrf/coresight_stm/testcase.yaml
@@ -16,7 +16,7 @@ tests:
     harness_config:
       pytest_dut_scope: session
       pytest_root:
-        - "pytest/test_stm.py::test_STM_dictionary_mode"
+        - "$ZEPHYR_BASE/samples/boards/nordic/coresight_stm/pytest/test_stm.py::test_STM_dictionary_mode"
     required_snippets:
       - nordic-log-stm-dict
     extra_args:
@@ -29,7 +29,7 @@ tests:
     harness_config:
       pytest_dut_scope: session
       pytest_root:
-        - "pytest/test_stm.py::test_STM_decoded"
+        - "$ZEPHYR_BASE/samples/boards/nordic/coresight_stm/pytest/test_stm.py::test_STM_decoded"
     required_snippets:
       - nordic-log-stm
     extra_args:

From 25e0488a8a5667078f806ec98b296694eb459449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Fri, 10 Jan 2025 08:12:44 +0100
Subject: [PATCH 2209/2913] [nrf fromtree] drivers: watchdog: nrfx: add
 synchronization after stop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In order to ensure that watchdog channels are freed in proper
driver state, synchronization in form of simple loop needs
to be added after stopping. In no irq variant, it is already done
on nrfx level. NRFY function can be replaced by NRFX one in
the future.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit b578ffa49a13f58288e44af5f44a11a3f44b3d00)
---
 drivers/watchdog/wdt_nrfx.c | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/drivers/watchdog/wdt_nrfx.c b/drivers/watchdog/wdt_nrfx.c
index 8ad72a7cca4..4459b7fac6d 100644
--- a/drivers/watchdog/wdt_nrfx.c
+++ b/drivers/watchdog/wdt_nrfx.c
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/kernel.h>
 #include <zephyr/sys/math_extras.h>
 #include <nrfx_wdt.h>
 #include <zephyr/drivers/watchdog.h>
@@ -13,11 +14,18 @@
 #include <zephyr/irq.h>
 LOG_MODULE_REGISTER(wdt_nrfx);
 
+#if !CONFIG_WDT_NRFX_NO_IRQ && NRF_WDT_HAS_STOP
+#define WDT_NRFX_SYNC_STOP 1
+#endif
+
 struct wdt_nrfx_data {
 	wdt_callback_t m_callbacks[NRF_WDT_CHANNEL_NUMBER];
 	uint32_t m_timeout;
 	uint8_t m_allocated_channels;
 	bool enabled;
+#if defined(WDT_NRFX_SYNC_STOP)
+	struct k_sem sync_stop;
+#endif
 };
 
 struct wdt_nrfx_config {
@@ -73,6 +81,10 @@ static int wdt_nrf_disable(const struct device *dev)
 		return -EFAULT;
 	}
 
+#if defined(WDT_NRFX_SYNC_STOP)
+	k_sem_take(&data->sync_stop, K_FOREVER);
+#endif
+
 	nrfx_wdt_channels_free(&config->wdt);
 
 	for (channel_id = 0; channel_id < data->m_allocated_channels; channel_id++) {
@@ -170,11 +182,17 @@ static DEVICE_API(wdt, wdt_nrfx_driver_api) = {
 static void wdt_event_handler(const struct device *dev, nrf_wdt_event_t event_type,
 			      uint32_t requests, void *p_context)
 {
+	struct wdt_nrfx_data *data = dev->data;
+
+#if defined(WDT_NRFX_SYNC_STOP)
+	if (event_type == NRF_WDT_EVENT_STOPPED) {
+		k_sem_give(&data->sync_stop);
+	}
+#else
 	(void)event_type;
+#endif
 	(void)p_context;
 
-	struct wdt_nrfx_data *data = dev->data;
-
 	while (requests) {
 		uint8_t i = u32_count_trailing_zeros(requests);
 
@@ -217,7 +235,11 @@ static void wdt_event_handler(const struct device *dev, nrf_wdt_event_t event_ty
 		}							       \
 		return 0;						       \
 	}								       \
-	static struct wdt_nrfx_data wdt_##idx##_data;			       \
+	static struct wdt_nrfx_data wdt_##idx##_data =	{		       \
+		IF_ENABLED(WDT_NRFX_SYNC_STOP,				       \
+			(.sync_stop = Z_SEM_INITIALIZER(		       \
+				wdt_##idx##_data.sync_stop, 0, 1),))	       \
+	};								       \
 	static const struct wdt_nrfx_config wdt_##idx##z_config = {	       \
 		.wdt = NRFX_WDT_INSTANCE(idx),				       \
 	};								       \

From e946812677622a55519831b510f0107d7adb381f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20St=C4=99pnicki?=
 <lukasz.stepnicki@nordicsemi.no>
Date: Thu, 16 Jan 2025 09:36:08 +0100
Subject: [PATCH 2210/2913] [nrf fromtree] arch: riscv: option to init custom
 hw stacked esf members.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When RISCV_SOC_HAS_ISR_STACKING is used, it may
be needed to initialize custom hw stacked esf members.
Some initial values may need to be aligned with
hw stacking mechanism to avoid any side effects.

Signed-off-by: Łukasz Stępnicki <lukasz.stepnicki@nordicsemi.no>
(cherry picked from commit 9c574ed9222b331403f684b235e476700a9b1854)
---
 arch/riscv/Kconfig                       | 5 +++++
 arch/riscv/core/thread.c                 | 4 ++++
 soc/nordic/common/vpr/soc_isr_stacking.h | 7 +++++++
 3 files changed, 16 insertions(+)

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 5e3049433a9..e5452575e15 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -124,6 +124,11 @@ config RISCV_SOC_HAS_ISR_STACKING
 	    saved on the stack by the hardware, and the registers saved by the
 	    software macros. The structure must be called 'struct arch_esf'.
 
+	  - SOC_ISR_STACKING_ESR_INIT: macro guarded by !_ASMLANGUAGE.
+	    Some hardware stacked registers should be initialized on init
+	    stack with proper values. This prevents from incorrect behavior
+	    on entry context switch when initial stack is restored.
+
 config RISCV_SOC_HAS_CUSTOM_IRQ_HANDLING
 	bool
 	help
diff --git a/arch/riscv/core/thread.c b/arch/riscv/core/thread.c
index 5c471034d25..7aca45be988 100644
--- a/arch/riscv/core/thread.c
+++ b/arch/riscv/core/thread.c
@@ -106,6 +106,10 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 	stack_init->soc_context = soc_esf_init;
 #endif
 
+#ifdef CONFIG_RISCV_SOC_HAS_ISR_STACKING
+	SOC_ISR_STACKING_ESR_INIT;
+#endif
+
 	thread->callee_saved.sp = (unsigned long)stack_init;
 
 	/* where to go when returning from z_riscv_switch() */
diff --git a/soc/nordic/common/vpr/soc_isr_stacking.h b/soc/nordic/common/vpr/soc_isr_stacking.h
index 8d2f64ad729..55733733539 100644
--- a/soc/nordic/common/vpr/soc_isr_stacking.h
+++ b/soc/nordic/common/vpr/soc_isr_stacking.h
@@ -62,6 +62,13 @@
 
 #endif /* DT_PROP(VPR_CPU, nordic_bus_width) == 64 */
 
+/*
+ * VPR stacked mcause needs to have proper value on initial stack.
+ * Initial mret will restore this value.
+ */
+#define SOC_ISR_STACKING_ESR_INIT                                                                  \
+	stack_init->_mcause = 0;
+
 #else /* _ASMLANGUAGE */
 
 /*

From 589410924c2e3557550c4353e780bed797bf9d3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Wed, 18 Dec 2024 08:30:27 +0100
Subject: [PATCH 2211/2913] [nrf fromtree] tests: boards: nrf: hwinfo: Add test
 for reset cause on nrf54*
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add test that checks reset cause reported by HWINFO.

Check that hwinfo_get_supported_reset_cause() returns
expected value.

Check that hwinfo_get_reset_cause() correctly detects:
- RESET_PIN,
- RESET_SOFTWARE,
- RESET_WATCHDOG.

Check that reset cause can be cleared
with hwinfo_clear_reset_cause().

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 8f83267f9a88caaac582fa93dab498ebbb3390af)
---
 .../nrf/hwinfo/reset_cause/CMakeLists.txt     |   8 +
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  14 +
 .../boards/nrf54h20dk_nrf54h20_cpurad.overlay |  14 +
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |   9 +
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       |   9 +
 tests/boards/nrf/hwinfo/reset_cause/prj.conf  |   7 +
 .../boards/nrf/hwinfo/reset_cause/src/main.c  | 366 ++++++++++++++++++
 .../nrf/hwinfo/reset_cause/testcase.yaml      |  38 ++
 8 files changed, 465 insertions(+)
 create mode 100644 tests/boards/nrf/hwinfo/reset_cause/CMakeLists.txt
 create mode 100644 tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpurad.overlay
 create mode 100644 tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
 create mode 100644 tests/boards/nrf/hwinfo/reset_cause/prj.conf
 create mode 100644 tests/boards/nrf/hwinfo/reset_cause/src/main.c
 create mode 100644 tests/boards/nrf/hwinfo/reset_cause/testcase.yaml

diff --git a/tests/boards/nrf/hwinfo/reset_cause/CMakeLists.txt b/tests/boards/nrf/hwinfo/reset_cause/CMakeLists.txt
new file mode 100644
index 00000000000..f659d208cb9
--- /dev/null
+++ b/tests/boards/nrf/hwinfo/reset_cause/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(reset_reason)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..ead2840f6f4
--- /dev/null
+++ b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		watchdog0 = &wdt010;
+	};
+};
+
+&wdt010 {
+	status = "okay";
+};
diff --git a/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpurad.overlay
new file mode 100644
index 00000000000..ead2840f6f4
--- /dev/null
+++ b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54h20dk_nrf54h20_cpurad.overlay
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		watchdog0 = &wdt010;
+	};
+};
+
+&wdt010 {
+	status = "okay";
+};
diff --git a/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..8d3dce3b380
--- /dev/null
+++ b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 00000000000..dc1ea1a9ddc
--- /dev/null
+++ b/tests/boards/nrf/hwinfo/reset_cause/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/boards/nrf/hwinfo/reset_cause/prj.conf b/tests/boards/nrf/hwinfo/reset_cause/prj.conf
new file mode 100644
index 00000000000..edd86844963
--- /dev/null
+++ b/tests/boards/nrf/hwinfo/reset_cause/prj.conf
@@ -0,0 +1,7 @@
+CONFIG_HWINFO=y
+
+CONFIG_WATCHDOG=y
+CONFIG_REBOOT=y
+
+CONFIG_LOG=y
+CONFIG_LOG_MODE_MINIMAL=y
diff --git a/tests/boards/nrf/hwinfo/reset_cause/src/main.c b/tests/boards/nrf/hwinfo/reset_cause/src/main.c
new file mode 100644
index 00000000000..1e07f679114
--- /dev/null
+++ b/tests/boards/nrf/hwinfo/reset_cause/src/main.c
@@ -0,0 +1,366 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/hwinfo.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/sys/reboot.h>
+#include <zephyr/cache.h>
+#include <errno.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(resetreason, LOG_LEVEL_INF);
+
+static const struct device *const my_wdt_device = DEVICE_DT_GET(DT_ALIAS(watchdog0));
+static struct wdt_timeout_cfg m_cfg_wdt0;
+static int my_wdt_channel;
+
+#define NOINIT_SECTION ".noinit.test_wdt"
+volatile uint32_t machine_state __attribute__((section(NOINIT_SECTION)));
+volatile uint32_t supported __attribute__((section(NOINIT_SECTION)));
+volatile uint32_t wdt_status __attribute__((section(NOINIT_SECTION)));
+volatile uint32_t reboot_status __attribute__((section(NOINIT_SECTION)));
+
+/* Value used to indicate that the watchdog has fired. */
+#define WDT_HAS_FIRED (0x12345678U)
+#define REBOOT_WAS_DONE (0x87654321U)
+
+/* Highest value in the switch statement in the main() */
+#define LAST_STATE (2)
+
+static void wdt_int_cb(const struct device *wdt_dev, int channel_id)
+{
+	ARG_UNUSED(wdt_dev);
+	ARG_UNUSED(channel_id);
+	wdt_status = WDT_HAS_FIRED;
+
+	/* Flush cache as reboot may invalidate all lines. */
+	sys_cache_data_flush_range((void *) &wdt_status, sizeof(wdt_status));
+}
+
+/* Print LOG delimiter. */
+static void print_bar(void)
+{
+	LOG_INF("===================================================================");
+}
+
+static void print_supported_reset_cause(void)
+{
+	int32_t ret;
+
+	/* Store supported reset causes in global variable placed at NOINIT_SECTION. */
+	ret = hwinfo_get_supported_reset_cause((uint32_t *) &supported);
+
+	/* Print which reset causes are supported. */
+	if (ret == 0) {
+		LOG_INF("Supported reset causes are:");
+		if (supported & RESET_PIN) {
+			LOG_INF(" 0: RESET_PIN is supported");
+		} else {
+			LOG_INF(" 0: no support for RESET_PIN");
+		}
+		if (supported & RESET_SOFTWARE) {
+			LOG_INF(" 1: RESET_SOFTWARE is supported");
+		} else {
+			LOG_INF(" 1: no support for RESET_SOFTWARE");
+		}
+		if (supported & RESET_BROWNOUT) {
+			LOG_INF(" 2: RESET_BROWNOUT is supported");
+		} else {
+			LOG_INF(" 2: no support for RESET_BROWNOUT");
+		}
+		if (supported & RESET_POR) {
+			LOG_INF(" 3: RESET_POR is supported");
+		} else {
+			LOG_INF(" 3: no support for RESET_POR");
+		}
+		if (supported & RESET_WATCHDOG) {
+			LOG_INF(" 4: RESET_WATCHDOG is supported");
+		} else {
+			LOG_INF(" 4: no support for RESET_WATCHDOG");
+		}
+		if (supported & RESET_DEBUG) {
+			LOG_INF(" 5: RESET_DEBUG is supported");
+		} else {
+			LOG_INF(" 5: no support for RESET_DEBUG");
+		}
+		if (supported & RESET_SECURITY) {
+			LOG_INF(" 6: RESET_SECURITY is supported");
+		} else {
+			LOG_INF(" 6: no support for RESET_SECURITY");
+		}
+		if (supported & RESET_LOW_POWER_WAKE) {
+			LOG_INF(" 7: RESET_LOW_POWER_WAKE is supported");
+		} else {
+			LOG_INF(" 7: no support for RESET_LOW_POWER_WAKE");
+		}
+		if (supported & RESET_CPU_LOCKUP) {
+			LOG_INF(" 8: RESET_CPU_LOCKUP is supported");
+		} else {
+			LOG_INF(" 8: no support for RESET_CPU_LOCKUP");
+		}
+		if (supported & RESET_PARITY) {
+			LOG_INF(" 9: RESET_PARITY is supported");
+		} else {
+			LOG_INF(" 9: no support for RESET_PARITY");
+		}
+		if (supported & RESET_PLL) {
+			LOG_INF("10: RESET_PLL is supported");
+		} else {
+			LOG_INF("10: no support for RESET_PLL");
+		}
+		if (supported & RESET_CLOCK) {
+			LOG_INF("11: RESET_CLOCK is supported");
+		} else {
+			LOG_INF("11: no support for RESET_CLOCK");
+		}
+		if (supported & RESET_HARDWARE) {
+			LOG_INF("12: RESET_HARDWARE is supported");
+		} else {
+			LOG_INF("12: no support for RESET_HARDWARE");
+		}
+		if (supported & RESET_USER) {
+			LOG_INF("13: RESET_USER is supported");
+		} else {
+			LOG_INF("13: no support for RESET_USER");
+		}
+		if (supported & RESET_TEMPERATURE) {
+			LOG_INF("14: RESET_TEMPERATURE is supported");
+		} else {
+			LOG_INF("14: no support for RESET_TEMPERATURE");
+		}
+	} else if (ret == -ENOSYS) {
+		LOG_INF("hwinfo_get_supported_reset_cause() is NOT supported");
+		supported = 0;
+	} else {
+		LOG_ERR("hwinfo_get_supported_reset_cause() failed (ret = %d)", ret);
+	}
+	sys_cache_data_flush_range((void *) &supported, sizeof(supported));
+	print_bar();
+}
+
+/* Print current value of reset cause. */
+static void print_current_reset_cause(uint32_t *cause)
+{
+	int32_t ret;
+
+	ret = hwinfo_get_reset_cause(cause);
+	if (ret == 0) {
+		LOG_INF("Current reset cause is:");
+		if (*cause & RESET_PIN) {
+			LOG_INF(" 0: reset due to RESET_PIN");
+		}
+		if (*cause & RESET_SOFTWARE) {
+			LOG_INF(" 1: reset due to RESET_SOFTWARE");
+		}
+		if (*cause & RESET_BROWNOUT) {
+			LOG_INF(" 2: reset due to RESET_BROWNOUT");
+		}
+		if (*cause & RESET_POR) {
+			LOG_INF(" 3: reset due to RESET_POR");
+		}
+		if (*cause & RESET_WATCHDOG) {
+			LOG_INF(" 4: reset due to RESET_WATCHDOG");
+		}
+		if (*cause & RESET_DEBUG) {
+			LOG_INF(" 5: reset due to RESET_DEBUG");
+		}
+		if (*cause & RESET_SECURITY) {
+			LOG_INF(" 6: reset due to RESET_SECURITY");
+		}
+		if (*cause & RESET_LOW_POWER_WAKE) {
+			LOG_INF(" 7: reset due to RESET_LOW_POWER_WAKE");
+		}
+		if (*cause & RESET_CPU_LOCKUP) {
+			LOG_INF(" 8: reset due to RESET_CPU_LOCKUP");
+		}
+		if (*cause & RESET_PARITY) {
+			LOG_INF(" 9: reset due to RESET_PARITY");
+		}
+		if (*cause & RESET_PLL) {
+			LOG_INF("10: reset due to RESET_PLL");
+		}
+		if (*cause & RESET_CLOCK) {
+			LOG_INF("11: reset due to RESET_CLOCK");
+		}
+		if (*cause & RESET_HARDWARE) {
+			LOG_INF("12: reset due to RESET_HARDWARE");
+		}
+		if (*cause & RESET_USER) {
+			LOG_INF("13: reset due to RESET_USER");
+		}
+		if (*cause & RESET_TEMPERATURE) {
+			LOG_INF("14: reset due to RESET_TEMPERATURE");
+		}
+	} else if (ret == -ENOSYS) {
+		LOG_INF("hwinfo_get_reset_cause() is NOT supported");
+		*cause = 0;
+	} else {
+		LOG_ERR("hwinfo_get_reset_cause() failed (ret = %d)", ret);
+	}
+	print_bar();
+}
+
+/* Clear reset cause. */
+static void test_clear_reset_cause(void)
+{
+	int32_t ret, temp;
+
+	ret = hwinfo_clear_reset_cause();
+	if (ret == 0) {
+		LOG_INF("hwinfo_clear_reset_cause() was executed");
+	} else if (ret == -ENOSYS) {
+		LOG_INF("hwinfo_get_reset_cause() is NOT supported");
+	} else {
+		LOG_ERR("hwinfo_get_reset_cause() failed (ret = %d)", ret);
+	}
+	print_bar();
+
+	/* Print current value of reset causes -> expected 0 */
+	print_current_reset_cause(&temp);
+	LOG_INF("TEST that all reset causes were cleared");
+	if (temp == 0) {
+		LOG_INF("PASS: reset causes were cleared");
+	} else {
+		LOG_ERR("FAIL: reset case = %u while expected is 0", temp);
+	}
+	print_bar();
+}
+
+void test_reset_software(uint32_t cause)
+{
+	/* Check that reset cause from sys_reboot is detected. */
+	if (supported & RESET_SOFTWARE) {
+		if (reboot_status != REBOOT_WAS_DONE) {
+			/* If software reset hasn't happen yet, do it. */
+			reboot_status = REBOOT_WAS_DONE;
+			LOG_INF("Test RESET_SOFTWARE - Rebooting");
+
+			/* Flush cache as reboot may invalidate all lines. */
+			sys_cache_data_flush_range((void *) &machine_state, sizeof(machine_state));
+			sys_cache_data_flush_range((void *) &reboot_status, sizeof(reboot_status));
+			sys_reboot(SYS_REBOOT_COLD);
+		} else {
+			/* Software reset was done */
+			LOG_INF("TEST that RESET_SOFTWARE was detected");
+			if (cause & RESET_SOFTWARE) {
+				LOG_INF("PASS: RESET_SOFTWARE detected");
+				print_bar();
+				/* Check RESET_SOFTWARE can be cleared */
+				test_clear_reset_cause();
+			} else {
+				LOG_ERR("FAIL: RESET_SOFTWARE not set");
+				print_bar();
+			}
+			/* Cleanup */
+			reboot_status = 0;
+			sys_cache_data_flush_range((void *) &reboot_status, sizeof(reboot_status));
+		}
+	}
+}
+
+void test_reset_watchdog(uint32_t cause)
+{
+	int32_t ret;
+
+	/* Check that reset cause from expired watchdog is detected. */
+	if (supported & RESET_WATCHDOG) {
+		if (wdt_status != WDT_HAS_FIRED) {
+			/* If watchdog hasn't fired yet, configure it do so. */
+			uint32_t watchdog_window = 2000U;
+
+			if (!device_is_ready(my_wdt_device)) {
+				LOG_ERR("WDT device %s is not ready", my_wdt_device->name);
+				return;
+			}
+
+			m_cfg_wdt0.callback = wdt_int_cb;
+			m_cfg_wdt0.flags = WDT_FLAG_RESET_SOC;
+			m_cfg_wdt0.window.max = watchdog_window;
+			m_cfg_wdt0.window.min = 0U;
+			my_wdt_channel = wdt_install_timeout(my_wdt_device, &m_cfg_wdt0);
+			if (my_wdt_channel < 0) {
+				LOG_ERR("wdt_install_timeout() returned %d", my_wdt_channel);
+				return;
+			}
+
+			ret = wdt_setup(my_wdt_device, WDT_OPT_PAUSE_HALTED_BY_DBG);
+			if (ret < 0) {
+				LOG_ERR("wdt_setup() returned %d", ret);
+				return;
+			}
+
+			/* Flush cache as reboot may invalidate all lines. */
+			sys_cache_data_flush_range((void *) &machine_state, sizeof(machine_state));
+			LOG_INF("Watchdog shall fire in ~%u miliseconds", watchdog_window);
+			print_bar();
+			k_sleep(K_FOREVER);
+		} else {
+			/* Watchdog has fired. */
+			LOG_INF("TEST that RESET_WATCHDOG was detected");
+			if (cause & RESET_WATCHDOG) {
+				LOG_INF("PASS: RESET_WATCHDOG detected");
+				print_bar();
+				/* Check RESET_WATCHDOG can be cleared */
+				test_clear_reset_cause();
+			} else {
+				LOG_ERR("FAIL: RESET_WATCHDOG not set");
+				print_bar();
+			}
+			/* Cleanup */
+			wdt_status = 0;
+			sys_cache_data_flush_range((void *) &wdt_status, sizeof(wdt_status));
+		}
+	}
+}
+
+int main(void)
+{
+	uint32_t cause;
+
+	LOG_INF("HW Info reset reason test on %s", CONFIG_BOARD_TARGET);
+	if (wdt_status == WDT_HAS_FIRED) {
+		LOG_INF("This boot is due to expected watchdog reset");
+	}
+	if (reboot_status == REBOOT_WAS_DONE) {
+		LOG_INF("This boot is due to expected software reset");
+	}
+	print_bar();
+
+	/* Test relies on REST_PIN to correctly start. */
+	print_current_reset_cause(&cause);
+	if (cause & RESET_PIN) {
+		LOG_INF("TEST that RESET_PIN was detected");
+		LOG_INF("PASS: RESET_PIN detected");
+		print_bar();
+		/* Check RESET_PIN can be cleared */
+		test_clear_reset_cause();
+		machine_state = 0;
+		reboot_status = 0;
+		wdt_status = 0;
+	}
+
+	while (machine_state <= LAST_STATE) {
+		LOG_DBG("machine_state = %u", machine_state);
+		LOG_DBG("reboot_status = %u", reboot_status);
+		LOG_DBG("wdt_status = %u", wdt_status);
+
+		switch (machine_state) {
+		case 0: /* Print (an store) which reset causes are supported. */
+			print_supported_reset_cause();
+			machine_state++;
+			break;
+		case 1: /* Test RESET_SOFTWARE. */
+			test_reset_software(cause);
+			machine_state++;
+		case 2: /* Test RESET_WATCHDOG. */
+			test_reset_watchdog(cause);
+			machine_state++;
+		}
+	}
+
+	LOG_INF("All tests done");
+	return 0;
+}
diff --git a/tests/boards/nrf/hwinfo/reset_cause/testcase.yaml b/tests/boards/nrf/hwinfo/reset_cause/testcase.yaml
new file mode 100644
index 00000000000..0ec999ee713
--- /dev/null
+++ b/tests/boards/nrf/hwinfo/reset_cause/testcase.yaml
@@ -0,0 +1,38 @@
+common:
+  tags:
+    - drivers
+    - hwinfo
+  harness: console
+
+tests:
+  drivers.hwinfo.reset_cause:
+    harness_config:
+      type: multi_line
+      ordered: true
+      regex:
+        - "HW Info reset reason test on"
+        - "PASS: RESET_PIN detected"
+        - "PASS: reset causes were cleared"
+        - "Supported reset causes are"
+        - "RESET_PIN is supported"
+        - "RESET_SOFTWARE is supported"
+        - "RESET_WATCHDOG is supported"
+        - "RESET_DEBUG is supported"
+        - "RESET_LOW_POWER_WAKE is supported"
+        - "RESET_CPU_LOCKUP is supported"
+        - "Rebooting"
+        - "HW Info reset reason test on"
+        - "PASS: RESET_SOFTWARE detected"
+        - "PASS: reset causes were cleared"
+        - "Watchdog shall fire"
+        - "HW Info reset reason test on"
+        - "PASS: RESET_WATCHDOG detected"
+        - "PASS: reset causes were cleared"
+        - "All tests done"
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpurad
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp

From 7d852b587dd3cd623c21b59fee5701bd35f4976c Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Thu, 12 Dec 2024 08:02:43 +0000
Subject: [PATCH 2212/2913] [nrf fromtree] boards: nordic: nrf5340dk/nrf9160dk:
 Use sysbuild for ns twister

Enables forcing use of sysbuild to build nrf5340dk/nrf9160dk
non-secure board targets when using twister

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit ab121decc4d59771bf8b051e41aa066d3e2e0c3c)
---
 boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml | 1 +
 boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml | 1 +
 boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml
index 4c366d2f363..cec7b107776 100644
--- a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml
+++ b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml
@@ -18,3 +18,4 @@ supported:
   - gpio
   - spi
 vendor: nordic
+sysbuild: true
diff --git a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml
index d610095afaf..86161bb4385 100644
--- a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml
+++ b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml
@@ -19,3 +19,4 @@ supported:
   - netif:modem
   - gpio
 vendor: nordic
+sysbuild: true
diff --git a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml
index 0faa84b38c9..52b8f85efb4 100644
--- a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml
+++ b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml
@@ -19,3 +19,4 @@ supported:
   - netif:modem
   - gpio
 vendor: nordic
+sysbuild: true

From 228b6bb6c034209303dcc67fded95b381551cccc Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Thu, 12 Dec 2024 07:58:06 +0000
Subject: [PATCH 2213/2913] [nrf noup] samples/tests: Add TF-M sysbuild config
 files

Fixes some issues with samples/tests by adding configuration
files to satisfy TF-M requirements

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit b983259c675e7681ada2c2f66e1e12b2c95156e2)
---
 samples/subsys/usb/dfu/sysbuild.conf     | 1 +
 tests/drivers/flash/common/sysbuild.conf | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 samples/subsys/usb/dfu/sysbuild.conf
 delete mode 100644 tests/drivers/flash/common/sysbuild.conf

diff --git a/samples/subsys/usb/dfu/sysbuild.conf b/samples/subsys/usb/dfu/sysbuild.conf
new file mode 100644
index 00000000000..47f00ff3cff
--- /dev/null
+++ b/samples/subsys/usb/dfu/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_BOOTLOADER_MCUBOOT=y
diff --git a/tests/drivers/flash/common/sysbuild.conf b/tests/drivers/flash/common/sysbuild.conf
deleted file mode 100644
index 6408669a847..00000000000
--- a/tests/drivers/flash/common/sysbuild.conf
+++ /dev/null
@@ -1 +0,0 @@
-SB_CONFIG_PARTITION_MANAGER=n

From ef59c307a42603c4fb4248aa1ab74c87f71bf606 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Thu, 12 Dec 2024 08:05:53 +0000
Subject: [PATCH 2214/2913] [nrf noup] cmake: linker: ld: target: Remove
 child/parent image flag

fixup! [nrf noup] tree-wide: support NCS Partition Manager (PM) definitions

Removes a condition in the partition manager enabled check which
was for child/parent images and keeps the sysbuild one only

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 20a2ba291a8fd3ac3fd0f51c0491d7debbd11be4)
---
 cmake/linker/ld/target.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/linker/ld/target.cmake b/cmake/linker/ld/target.cmake
index 253013a8382..6bbc11af14a 100644
--- a/cmake/linker/ld/target.cmake
+++ b/cmake/linker/ld/target.cmake
@@ -85,7 +85,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
       ${current_includes}
       ${soc_linker_script_includes}
       ${template_script_defines}
-      -DUSE_PARTITION_MANAGER=$<OR:$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>,$<BOOL:${IMAGE_NAME}>,$<TARGET_EXISTS:partition_manager>>
+      -DUSE_PARTITION_MANAGER=$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>
       -E ${LINKER_SCRIPT}
       -P # Prevent generation of debug `#line' directives.
       -o ${linker_script_gen}

From 9a9a95071c9f3887bc1f68c76090c1f888e7ae92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hubert=20Mi=C5=9B?= <hubert.mis@nordicsemi.no>
Date: Thu, 16 Jan 2025 17:23:27 +0100
Subject: [PATCH 2215/2913] [nrf fromtree] drv: nordic_vpr_launcher: manage
 data cache
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Write-back cache after copying VPR's code and data to the destination
memory. It allows VPRs to run from RAM regions cacheable by its host.

It allows to use FLPR in nRF54H20.

Signed-off-by: Hubert Miś <hubert.mis@nordicsemi.no>
(cherry picked from commit 1ef2df5c323aef8a1e295866f8684eaad459e5d0)
---
 drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c b/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
index 2c2915a7984..5bd43f87fb9 100644
--- a/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
+++ b/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
@@ -7,6 +7,7 @@
 
 #include <string.h>
 
+#include <zephyr/cache.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
@@ -38,6 +39,11 @@ static int nordic_vpr_launcher_init(const struct device *dev)
 		LOG_DBG("Loading VPR (%p) from %p to %p (%zu bytes)", config->vpr,
 			(void *)config->src_addr, (void *)config->exec_addr, config->size);
 		memcpy((void *)config->exec_addr, (void *)config->src_addr, config->size);
+#if defined(CONFIG_DCACHE)
+		LOG_DBG("Writing back cache with loaded VPR (from %p %zu bytes)",
+			(void *)config->exec_addr, config->size);
+		sys_cache_data_flush_range((void *)config->exec_addr, config->size);
+#endif
 	}
 #endif
 

From fa1f1bb926a92324a3041807c4c568433a49bca1 Mon Sep 17 00:00:00 2001
From: Karsten Koenig <karsten.koenig@nordicsemi.no>
Date: Tue, 14 Jan 2025 10:31:31 +0100
Subject: [PATCH 2216/2913] [nrf fromtree] dts: common: nordic: nrf54h20: Fix
 flpr bus-width

EngB+ uses 32bit bus-width stacking sequence for all VPR cores.

Signed-off-by: Karsten Koenig <karsten.koenig@nordicsemi.no>
(cherry picked from commit 620188224294aa19853aac7f9e9b545cb595d08d)
---
 dts/common/nordic/nrf54h20.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index e141ac10a5e..5aa5292bccb 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -84,7 +84,7 @@
 			device_type = "cpu";
 			clock-frequency = <DT_FREQ_M(320)>;
 			riscv,isa = "rv32emc";
-			nordic,bus-width = <64>;
+			nordic,bus-width = <32>;
 
 			cpuflpr_vevif_rx: mailbox {
 				compatible = "nordic,nrf-vevif-task-rx";

From d3f8dcdb47c28740ea0c278c1b5d4c1c3db2ec17 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Tue, 14 Jan 2025 16:58:22 +0100
Subject: [PATCH 2217/2913] [nrf fromtree] manifest: Update nRF hw models to
 latest

Update the HW models module to:
1069743a7fc06362e8f8d7f57225b8c7940da9f0

Including the following:
1069743 Fix in cracen hal conditional compile condition
3bbd3bd Enable build of hal/nrf_cracen_*.c
506da1f hal cracen_cm: Add const to prototype
b02d927 BLECrypt_if: For new aes_ecb scramble data if no libCrypto
e41f101 RRAMC nrf hal: Add replacements for new incoming RRAM APIs
4e933cf UART: Do not warn on invalid/unconfigured framesize
716b20c hal cracen_cm: Add replacements for new cracen_cm hal
fc597a4 CRACEN: Add CryptoMaster & CM AES (ECB only)
129f16c CRACEN RNG HAL: Remove senseless static inline

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit a2d202f4400ac7903baf9e8c99e7f2943b0c48e7)
Signed-off-by: Herman Berget <herman.berget@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 07b33ef059f..d1c00bdba9d 100644
--- a/west.yml
+++ b/west.yml
@@ -315,7 +315,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: 71bcaa88c97977647d387217dab99f7d6f026815
+      revision: 1069743a7fc06362e8f8d7f57225b8c7940da9f0
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
       revision: 0f53c9ebab526661131d5d7e73c7a6cb3b2d2e11

From c9a1028f551c054a965e0e31565abc7f558a5638 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Tue, 14 Jan 2025 17:03:52 +0100
Subject: [PATCH 2218/2913] [nrf fromtree] manifest: Update nRF hw models to
 enable cracen HAL

Update the HW models to the provisional branch zephyr_2025_01_14
which enables the use the not yet released CRACEN RNG & CM HAL

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit ec17cc0fa676478881e4efe00aae5c559fa43e55)
Signed-off-by: Herman Berget <herman.berget@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index d1c00bdba9d..b96645c3f07 100644
--- a/west.yml
+++ b/west.yml
@@ -315,7 +315,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: 1069743a7fc06362e8f8d7f57225b8c7940da9f0
+      revision: f6d4d3f157eaad78c81c64621e3507ec752bdfde
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
       revision: 0f53c9ebab526661131d5d7e73c7a6cb3b2d2e11

From 0f8c4b87c10527b4e710064d44b4196420589269 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Wed, 22 Jan 2025 15:15:17 +0100
Subject: [PATCH 2219/2913] [nrf fromtree] manifest: Update nRF hw models to
 latest enabling cracen HAL

Update the HW models to the provisional branch zephyr_2025_01_22
which enables the use the not yet released CRACEN RNG & CM HAL
while enabling the latest nrf HAL 3.10

Including the following:
4aac556 Support latest nrf HAL 3.10 / MDK 8.69.1 for 54L15 builds
2e75940 UART: Correct UART names printed out to the users

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 492ad96ee5f2559d38dd91ed037acc203f258cdf)
Signed-off-by: Herman Berget <herman.berget@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index b96645c3f07..9423981e8e4 100644
--- a/west.yml
+++ b/west.yml
@@ -315,7 +315,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: f6d4d3f157eaad78c81c64621e3507ec752bdfde
+      revision: 68df9ed65dd9d93bb257bf8f295cb753ecf83cd8
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
       revision: 0f53c9ebab526661131d5d7e73c7a6cb3b2d2e11

From 1338b0b074393a576d1e401d7836af3464b66915 Mon Sep 17 00:00:00 2001
From: Piotr Koziar <piotr.koziar@nordicsemi.no>
Date: Tue, 26 Nov 2024 12:29:00 +0100
Subject: [PATCH 2220/2913] [nrf fromtree] modules: hal_nordic: use
 CLOCK_CONTROL_NRF2 for HFCLK request/release

Makes 802.15.4 use the API under CONFIG_CLOCK_CONTROL_NRF2
in nrf_clock_control.h to request/release HFCLK.

Previous HFCLK requesting/releasing on nRF54H20 was more
of a workaround and could produce issues when
comes to sharing the resources.

Signed-off-by: Piotr Koziar <piotr.koziar@nordicsemi.no>
(cherry picked from commit b6ca9dbc713bffd80ad6a5d5b4cb4564fd192042)
---
 .../platform/nrf_802154_clock_zephyr.c        | 39 ++++---------------
 1 file changed, 8 insertions(+), 31 deletions(-)

diff --git a/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c b/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
index f9da7537dc1..c307401c657 100644
--- a/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
+++ b/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
@@ -11,12 +11,7 @@
 
 #include <compiler_abstraction.h>
 #include <zephyr/kernel.h>
-#if defined(CONFIG_CLOCK_CONTROL_NRF)
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
-#include <zephyr/drivers/clock_control.h>
-#elif !defined(NRF54H_SERIES)
-#error No implementation to start or stop HFCLK due to missing clock_control.
-#endif
 
 static bool hfclk_is_running;
 
@@ -35,7 +30,6 @@ bool nrf_802154_clock_hfclk_is_running(void)
 	return hfclk_is_running;
 }
 
-#if defined(CONFIG_CLOCK_CONTROL_NRF)
 
 static struct onoff_client hfclk_cli;
 
@@ -48,6 +42,7 @@ static void hfclk_on_callback(struct onoff_manager *mgr,
 	nrf_802154_clock_hfclk_ready();
 }
 
+#if defined(CONFIG_CLOCK_CONTROL_NRF)
 void nrf_802154_clock_hfclk_start(void)
 {
 	int ret;
@@ -75,40 +70,22 @@ void nrf_802154_clock_hfclk_stop(void)
 	hfclk_is_running = false;
 }
 
-#elif defined(NRF54H_SERIES)
-
-#define NRF_LRCCONF_RADIO_PD NRF_LRCCONF010
-/* HF clock time to ramp-up. */
-#define MAX_HFXO_RAMP_UP_TIME_US 550
-
-static void hfclk_started_timer_handler(struct k_timer *dummy)
-{
-	hfclk_is_running = true;
-	nrf_802154_clock_hfclk_ready();
-}
-
-K_TIMER_DEFINE(hfclk_started_timer, hfclk_started_timer_handler, NULL);
+#elif defined(CONFIG_CLOCK_CONTROL_NRF2)
 
 void nrf_802154_clock_hfclk_start(void)
 {
-	/* Use register directly, there is no support for that task in nrf_lrcconf_task_trigger.
-	 * This code might cause troubles if there are other HFXO users in this CPU.
-	 */
-	NRF_LRCCONF_RADIO_PD->EVENTS_HFXOSTARTED = 0x0;
-	NRF_LRCCONF_RADIO_PD->TASKS_REQHFXO = 0x1;
+	sys_notify_init_callback(&hfclk_cli.notify, hfclk_on_callback);
+	int ret = nrf_clock_control_request(DEVICE_DT_GET(DT_NODELABEL(hfxo)), NULL, &hfclk_cli);
 
-	k_timer_start(&hfclk_started_timer, K_USEC(MAX_HFXO_RAMP_UP_TIME_US), K_NO_WAIT);
+	__ASSERT_NO_MSG(ret >= 0);
 }
 
 void nrf_802154_clock_hfclk_stop(void)
 {
-	/* Use register directly, there is no support for that task in nrf_lrcconf_task_trigger.
-	 * This code might cause troubles if there are other HFXO users in this CPU.
-	 */
-	NRF_LRCCONF_RADIO_PD->TASKS_STOPREQHFXO = 0x1;
-	NRF_LRCCONF_RADIO_PD->EVENTS_HFXOSTARTED = 0x0;
+	int ret = nrf_clock_control_cancel_or_release(DEVICE_DT_GET(DT_NODELABEL(hfxo)),
+						      NULL, &hfclk_cli);
 
-	hfclk_is_running = false;
+	__ASSERT_NO_MSG(ret >= 0);
 }
 
 #endif

From 03bcd0835e4b14bf97af8c3e30bc1b86b6fe74c2 Mon Sep 17 00:00:00 2001
From: Piotr Koziar <piotr.koziar@nordicsemi.no>
Date: Tue, 21 Jan 2025 22:00:30 +0100
Subject: [PATCH 2221/2913] [nrf fromtree] modules: hal_nordic: enable
 CLOCK_CONTROL if nrf-802154 RD

Selects CLOCK_CONTROL config whenever nRF 802.15.4 Radio Driver
is enabled.

The driver requires HFCLK api available under the config switch.

Signed-off-by: Piotr Koziar <piotr.koziar@nordicsemi.no>
(cherry picked from commit f6892a4b29db9aceff58d82bf2a4f820d0624472)
---
 modules/hal_nordic/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/hal_nordic/Kconfig b/modules/hal_nordic/Kconfig
index f29b77e120e..183d25d9a19 100644
--- a/modules/hal_nordic/Kconfig
+++ b/modules/hal_nordic/Kconfig
@@ -23,6 +23,7 @@ menuconfig NRF_802154_RADIO_DRIVER
 	depends on HAS_HW_NRF_RADIO_IEEE802154
 	select DYNAMIC_INTERRUPTS
 	select ENTROPY_GENERATOR
+	select CLOCK_CONTROL
 	depends on !$(dt_nodelabel_enabled,timer1)
 	help
 	  This option enables nRF IEEE 802.15.4 radio driver in Zephyr. Note,

From 1f578fb5b4a5d56bd47b8f15bb4b04780a8eb1ca Mon Sep 17 00:00:00 2001
From: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
Date: Wed, 22 Jan 2025 07:51:44 +0100
Subject: [PATCH 2222/2913] [nrf fromtree] net: Added configuring child
 timeouts on openthread start

Some time ago three Kconfigs dedicated for the child timeouts
configuration were added, but changing them does not apply when
using OpenThread libraries. Added setting these values using
openthread API on openthread start.

Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
(cherry picked from commit 2534dc14b9557094cb902e1814bf7bd50a2c39ac)
---
 subsys/net/l2/openthread/openthread.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/subsys/net/l2/openthread/openthread.c b/subsys/net/l2/openthread/openthread.c
index c70a7e5d4e2..61fe1d5c3bc 100644
--- a/subsys/net/l2/openthread/openthread.c
+++ b/subsys/net/l2/openthread/openthread.c
@@ -21,6 +21,7 @@ LOG_MODULE_REGISTER(net_l2_openthread, CONFIG_OPENTHREAD_L2_LOG_LEVEL);
 #include <zephyr/sys/__assert.h>
 #include <zephyr/version.h>
 
+#include <openthread/child_supervision.h>
 #include <openthread/cli.h>
 #include <openthread/ip6.h>
 #include <openthread/link.h>
@@ -444,6 +445,13 @@ int openthread_start(struct openthread_context *ot_context)
 		otLinkSetPollPeriod(ot_context->instance, OT_POLL_PERIOD);
 	}
 
+	/* Configure Child Supervision and MLE Child timeouts. */
+	otChildSupervisionSetInterval(ot_context->instance,
+				      CONFIG_OPENTHREAD_CHILD_SUPERVISION_INTERVAL);
+	otChildSupervisionSetCheckTimeout(ot_context->instance,
+					  CONFIG_OPENTHREAD_CHILD_SUPERVISION_CHECK_TIMEOUT);
+	otThreadSetChildTimeout(ot_context->instance, CONFIG_OPENTHREAD_MLE_CHILD_TIMEOUT);
+
 	if (otDatasetIsCommissioned(ot_instance)) {
 		/* OpenThread already has dataset stored - skip the
 		 * configuration.

From d7eaf7a7a062caf98f0e626773ca148bd4d9dc11 Mon Sep 17 00:00:00 2001
From: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
Date: Fri, 24 Jan 2025 12:56:34 +0100
Subject: [PATCH 2223/2913] [nrf fromtree] openthread: fix logging
 configuration

Currently, `CONFIG_OPENTHREAD_LOG_LEVEL` is used to set log level
in OT and register log modules in Zephyr. OpenThread allows 5
levels, causing issues when `OPENTHREAD_LOG_LEVEL_DEBG` is
selected ad we are trying to register modules with unknown lvl.

This commit adds `CONFIG_OPENTHREAD_MODULE_LOG_LEVEL` which is
aligned for Zephyr's log levels.

Signed-off-by: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
(cherry picked from commit 341359568fdbaa217d8c1f71064e97af985a867f)
---
 modules/openthread/platform/alarm.c       |  2 +-
 modules/openthread/platform/ble.c         |  2 +-
 modules/openthread/platform/messagepool.c |  2 +-
 modules/openthread/platform/uart.c        |  2 +-
 subsys/net/l2/openthread/Kconfig          | 12 ++++++++++++
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/modules/openthread/platform/alarm.c b/modules/openthread/platform/alarm.c
index 8d41c1a66f9..26f8c1e01fc 100644
--- a/modules/openthread/platform/alarm.c
+++ b/modules/openthread/platform/alarm.c
@@ -6,7 +6,7 @@
  */
 
 #define LOG_MODULE_NAME net_openthread_alarm
-#define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
+#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
diff --git a/modules/openthread/platform/ble.c b/modules/openthread/platform/ble.c
index 4da858081ae..ee1c0b6ceb8 100644
--- a/modules/openthread/platform/ble.c
+++ b/modules/openthread/platform/ble.c
@@ -30,7 +30,7 @@
 /* Zephyr Logging */
 
 #define LOG_MODULE_NAME net_openthread_tcat
-#define LOG_LEVEL       CONFIG_OPENTHREAD_LOG_LEVEL
+#define LOG_LEVEL       CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
 
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
diff --git a/modules/openthread/platform/messagepool.c b/modules/openthread/platform/messagepool.c
index cb9a64674c4..c085aeb9a58 100644
--- a/modules/openthread/platform/messagepool.c
+++ b/modules/openthread/platform/messagepool.c
@@ -10,7 +10,7 @@
 #include <openthread/platform/messagepool.h>
 
 #define LOG_MODULE_NAME net_otPlat_messagepool
-#define LOG_LEVEL       CONFIG_OPENTHREAD_LOG_LEVEL
+#define LOG_LEVEL       CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
 
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
diff --git a/modules/openthread/platform/uart.c b/modules/openthread/platform/uart.c
index ebf156ded15..31afdac6bac 100644
--- a/modules/openthread/platform/uart.c
+++ b/modules/openthread/platform/uart.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
+#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
 #define LOG_MODULE_NAME net_otPlat_uart
 
 #include <zephyr/logging/log.h>
diff --git a/subsys/net/l2/openthread/Kconfig b/subsys/net/l2/openthread/Kconfig
index c6a32c353ca..bf022741f56 100644
--- a/subsys/net/l2/openthread/Kconfig
+++ b/subsys/net/l2/openthread/Kconfig
@@ -89,6 +89,18 @@ config OPENTHREAD_LOG_LEVEL
 	default 4 if OPENTHREAD_LOG_LEVEL_INFO
 	default 5 if OPENTHREAD_LOG_LEVEL_DEBG
 	default 0
+	help
+	  Log level for OpenThread stack.
+
+config OPENTHREAD_PLATFORM_LOG_LEVEL
+	int
+	default 1 if OPENTHREAD_LOG_LEVEL_CRIT
+	default 2 if OPENTHREAD_LOG_LEVEL_WARN
+	default 3 if OPENTHREAD_LOG_LEVEL_NOTE || OPENTHREAD_LOG_LEVEL_INFO
+	default 4 if OPENTHREAD_LOG_LEVEL_DEBG
+	default 0
+	help
+	  Log level for OpenThread Zephyr platform.
 
 menuconfig OPENTHREAD_L2_DEBUG
 	bool "OpenThread L2 log support"

From e693f311e1cad34add85417fe8df112a26d39b26 Mon Sep 17 00:00:00 2001
From: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
Date: Mon, 27 Jan 2025 08:44:09 +0100
Subject: [PATCH 2224/2913] [nrf fromtree] net: openthread: fix
 `otPlatBleEnable`

If BLE has already been enabled, `bt_enable` returns immediately
and does not call passed callback function.
In this case, call `bt_conn_cb_register` to ensure that callbacks
are registered correctly.

Signed-off-by: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
(cherry picked from commit 1bd8e4459ae161588c5310600dca991bf8d4dbec)
---
 modules/openthread/platform/ble.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openthread/platform/ble.c b/modules/openthread/platform/ble.c
index ee1c0b6ceb8..69c1698bcf5 100644
--- a/modules/openthread/platform/ble.c
+++ b/modules/openthread/platform/ble.c
@@ -476,7 +476,7 @@ otError otPlatBleEnable(otInstance *aInstance)
 		LOG_WRN("BLE enable failed with error code %d", err);
 		return OT_ERROR_FAILED;
 	} else if (err == -EALREADY) {
-		err = k_sem_take(&ot_plat_ble_init_semaphore, K_MSEC(500));
+		bt_conn_cb_register(&conn_callbacks);
 		return OT_ERROR_NONE;
 	}
 

From 04fa4866ca0384cd00159dc578ec3597b796f2d5 Mon Sep 17 00:00:00 2001
From: Timothy Keys <timothy.keys@nordicsemi.no>
Date: Sun, 19 Jan 2025 15:42:31 +0000
Subject: [PATCH 2225/2913] [nrf fromtree] ipc: ipc_service: Null terminate
 RPMsg endpoint names

This fixes the compiler warning -Wstringop-truncation in
version 13 of gcc.

Signed-off-by: Timothy Keys <timothy.keys@nordicsemi.no>
(cherry picked from commit 614f55f8bec29ca67a774eb568441ac099827eaa)
---
 subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c b/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c
index 19955f065b3..e9c42b36c15 100644
--- a/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c
+++ b/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c
@@ -201,6 +201,7 @@ static void ns_bind_cb(struct rpmsg_device *rdev, const char *name, uint32_t des
 		 * call by the HOST core.
 		 */
 		strncpy(rpmsg_ept->name, name, sizeof(rpmsg_ept->name));
+		rpmsg_ept->name[RPMSG_NAME_SIZE - 1] = '\0';
 		rpmsg_ept->dest = dest;
 		k_mutex_unlock(&rpmsg_inst->mtx);
 	}
@@ -403,6 +404,7 @@ static struct ipc_rpmsg_ept *register_ept_on_host(struct ipc_rpmsg_instance *rpm
 		 * not registered the endpoint yet. Cache it.
 		 */
 		strncpy(rpmsg_ept->name, cfg->name, sizeof(rpmsg_ept->name));
+		rpmsg_ept->name[RPMSG_NAME_SIZE - 1] = '\0';
 		k_mutex_unlock(&rpmsg_inst->mtx);
 	}
 
@@ -426,6 +428,7 @@ static struct ipc_rpmsg_ept *register_ept_on_remote(struct ipc_rpmsg_instance *r
 	rpmsg_ept->ep.priv = rpmsg_ept;
 
 	strncpy(rpmsg_ept->name, cfg->name, sizeof(rpmsg_ept->name));
+	rpmsg_ept->name[RPMSG_NAME_SIZE - 1] = '\0';
 
 	err = ipc_rpmsg_register_ept(rpmsg_inst, RPMSG_REMOTE, rpmsg_ept);
 	if (err != 0) {

From d1c67fbc58c53d860cc9673c35ecba61162c02ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Fri, 15 Nov 2024 12:26:11 +0100
Subject: [PATCH 2226/2913] [nrf fromtree] drivers: udc_dwc2: Set bit 17 if
 needed on Hibernation Exit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Programming Guide states that bit 17 on PCGCCTL writes should be set if
the controller was enumerated for High Speed operation. Add the missing
bit set to adhere to the Programming Guide.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit b963c7d5eb26596f2484090902bfa8cbaf5a8387)
---
 drivers/usb/common/usb_dwc2_hw.h | 32 ++++++++++++++++++++++++++++++++
 drivers/usb/udc/udc_dwc2.c       |  5 +++++
 2 files changed, 37 insertions(+)

diff --git a/drivers/usb/common/usb_dwc2_hw.h b/drivers/usb/common/usb_dwc2_hw.h
index fcb35489a04..d5e272c8752 100644
--- a/drivers/usb/common/usb_dwc2_hw.h
+++ b/drivers/usb/common/usb_dwc2_hw.h
@@ -997,6 +997,33 @@ USB_DWC2_SET_FIELD_DEFINE(doeptsizn_xfersize, DOEPTSIZN_XFERSIZE)
 
 /* Power and Clock Gating Control Register */
 #define USB_DWC2_PCGCCTL			0x0E00UL
+#define USB_DWC2_PCGCCTL_IF_DEV_MODE_POS	31UL
+#define USB_DWC2_PCGCCTL_IF_DEV_MODE		BIT(USB_DWC2_PCGCCTL_IF_DEV_MODE_POS)
+#define USB_DWC2_PCGCCTL_P2HD_PRT_SPD_POS	29UL
+#define USB_DWC2_PCGCCTL_P2HD_PRT_SPD_MASK	(0x3UL << USB_DWC2_PCGCCTL_P2HD_PRT_SPD_POS)
+#define USB_DWC2_PCGCCTL_P2HD_PRT_SPD_LS	2
+#define USB_DWC2_PCGCCTL_P2HD_PRT_SPD_FS	1
+#define USB_DWC2_PCGCCTL_P2HD_PRT_SPD_HS	0
+#define USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_POS	27UL
+#define USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_MASK	(0x3UL << USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_POS)
+#define USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_FS48	3
+#define USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_LS	2
+#define USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_FS	1
+#define USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_HS	0
+#define USB_DWC2_PCGCCTL_MAC_DEV_ADDR_POS	20UL
+#define USB_DWC2_PCGCCTL_MAC_DEV_ADDR_MASK	(0x7FUL << USB_DWC2_PCGCCTL_MAC_DEV_ADDR_POS)
+#define USB_DWC2_PCGCCTL_MAX_TERMSELECT_POS	19UL
+#define USB_DWC2_PCGCCTL_MAX_TERMSELECT		BIT(USB_DWC2_PCGCCTL_MAX_TERMSELECT_POS)
+#define USB_DWC2_PCGCCTL_MAC_XCVRSELECT_POS	17UL
+#define USB_DWC2_PCGCCTL_MAC_XCVRSELECT_MASK	(0x3UL << USB_DWC2_PCGCCTL_MAC_XCVRSELECT_POS)
+#define USB_DWC2_PCGCCTL_MAC_XCVRSELECT_LFS	3
+#define USB_DWC2_PCGCCTL_MAC_XCVRSELECT_LS	2
+#define USB_DWC2_PCGCCTL_MAC_XCVRSELECT_FS	1
+#define USB_DWC2_PCGCCTL_MAC_XCVRSELECT_HS	0
+#define USB_DWC2_PCGCCTL_SH2PL_PRT_CTL0_POS	16UL
+#define USB_DWC2_PCGCCTL_SH2PL_PRT_CTL0		BIT(USB_DWC2_PCGCCTL_SH2PL_PRT_CTL0_POS)
+#define USB_DWC2_PCGCCTL_PRT_CLK_SEL_POS	14UL
+#define USB_DWC2_PCGCCTL_PRT_CLK_SEL_MASK	(0x3UL << USB_DWC2_PCGCCTL_PRT_CLK_SEL_POS)
 #define USB_DWC2_PCGCCTL_RESTOREVALUE_POS	14UL
 #define USB_DWC2_PCGCCTL_RESTOREVALUE_MASK	(0x3FFFFUL << USB_DWC2_PCGCCTL_RESTOREVALUE_POS)
 #define USB_DWC2_PCGCCTL_ESSREGRESTORED_POS	13UL
@@ -1016,6 +1043,11 @@ USB_DWC2_SET_FIELD_DEFINE(doeptsizn_xfersize, DOEPTSIZN_XFERSIZE)
 #define USB_DWC2_PCGCCTL_STOPPCLK_POS		0UL
 #define USB_DWC2_PCGCCTL_STOPPCLK		BIT(USB_DWC2_PCGCCTL_STOPPCLK_POS)
 
+USB_DWC2_GET_FIELD_DEFINE(pcgcctl_p2hd_prt_spd, PCGCCTL_P2HD_PRT_SPD)
+USB_DWC2_GET_FIELD_DEFINE(pcgcctl_p2hd_dev_enum_spd, PCGCCTL_P2HD_DEV_ENUM_SPD)
+USB_DWC2_GET_FIELD_DEFINE(pcgcctl_mac_dev_addr, PCGCCTL_MAC_DEV_ADDR)
+USB_DWC2_GET_FIELD_DEFINE(pcgcctl_mac_xcvrselect, PCGCCTL_MAC_XCVRSELECT)
+USB_DWC2_GET_FIELD_DEFINE(pcgcctl_prt_clk_sel, PCGCCTL_PRT_CLK_SEL)
 USB_DWC2_GET_FIELD_DEFINE(pcgcctl_restorevalue, PCGCCTL_RESTOREVALUE)
 USB_DWC2_SET_FIELD_DEFINE(pcgcctl_restorevalue, PCGCCTL_RESTOREVALUE)
 
diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 7f1256a10f0..072fdbd2e13 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -915,6 +915,11 @@ static void dwc2_restore_essential_registers(const struct device *dev,
 	struct dwc2_reg_backup *backup = &priv->backup;
 	uint32_t pcgcctl = backup->pcgcctl & USB_DWC2_PCGCCTL_RESTOREVALUE_MASK;
 
+	if (usb_dwc2_get_pcgcctl_p2hd_dev_enum_spd(pcgcctl) ==
+	    USB_DWC2_PCGCCTL_P2HD_DEV_ENUM_SPD_HS) {
+		pcgcctl |= BIT(17);
+	}
+
 	sys_write32(backup->glpmcfg, (mem_addr_t)&base->glpmcfg);
 	sys_write32(backup->gi2cctl, (mem_addr_t)&base->gi2cctl);
 	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);

From b2c6f9a6cc57544416100ef2c61523f467c15d68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Fri, 15 Nov 2024 12:31:27 +0100
Subject: [PATCH 2227/2913] [nrf fromtree] drivers: udc_dwc2: Workaround
 hibernation exit glitch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

DWC2 otg versions earlier than 5.00a are subject to randomly occurring
glitch on Hibernation Exit by Host Initiated Resume, Hibernation Exit by
Device Inititated Resume and Hibernation Exit by Host Initiated Reset.
When the glitch happens the device address is not correctly restored.
If the address is not correctly restored then the tokens addressed to
the device will timeout leading to host resetting the bus.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 43880b930cf6ec282cba5051fd6fea9aa046b83f)
---
 drivers/usb/common/usb_dwc2_hw.h |  3 +++
 drivers/usb/udc/udc_dwc2.c       | 30 ++++++++++++++++++++++--------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/drivers/usb/common/usb_dwc2_hw.h b/drivers/usb/common/usb_dwc2_hw.h
index d5e272c8752..fcd0d2a0060 100644
--- a/drivers/usb/common/usb_dwc2_hw.h
+++ b/drivers/usb/common/usb_dwc2_hw.h
@@ -338,6 +338,9 @@ USB_DWC2_SET_FIELD_DEFINE(gnptxfsiz_nptxfstaddr, GNPTXFSIZ_NPTXFSTADDR)
 #define USB_DWC2_GGPIO_STM32_PWRDWN_POS		16UL
 #define USB_DWC2_GGPIO_STM32_PWRDWN		BIT(USB_DWC2_GGPIO_STM32_PWRDWN_POS)
 
+/* GSNPSID register */
+#define USB_DWC2_GSNPSID_REV_5_00A		0x4F54500AUL
+
 /* GHWCFG1 register */
 #define USB_DWC2_GHWCFG1			0x0044UL
 #define USB_DWC2_GHWCFG1_EPDIR_POS(i)		(i * 2)
diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 072fdbd2e13..01c0f3040ce 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -121,6 +121,8 @@ struct udc_dwc2_data {
 	unsigned int dynfifosizing : 1;
 	unsigned int bufferdma : 1;
 	unsigned int syncrst : 1;
+	/* Defect workarounds */
+	unsigned int wa_essregrestored : 1;
 	/* Runtime state flags */
 	unsigned int hibernated : 1;
 	unsigned int enumdone : 1;
@@ -945,6 +947,21 @@ static void dwc2_restore_essential_registers(const struct device *dev,
 
 	pcgcctl |= USB_DWC2_PCGCCTL_ESSREGRESTORED;
 	sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
+
+	/* Note: in Remote Wakeup case 15 ms max signaling time starts now */
+
+	/* Wait for Restore Done Interrupt */
+	dwc2_wait_for_bit(dev, (mem_addr_t)&base->gintsts, USB_DWC2_GINTSTS_RSTRDONEINT);
+
+	if (priv->wa_essregrestored) {
+		pcgcctl &= ~USB_DWC2_PCGCCTL_ESSREGRESTORED;
+		sys_write32(pcgcctl, (mem_addr_t)&base->pcgcctl);
+		k_busy_wait(1);
+	}
+
+	if (!bus_reset) {
+		sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
+	}
 }
 
 static void dwc2_restore_device_registers(const struct device *dev, bool rwup)
@@ -1081,14 +1098,6 @@ static void dwc2_exit_hibernation(const struct device *dev,
 
 	dwc2_restore_essential_registers(dev, rwup, bus_reset);
 
-	/* Note: in Remote Wakeup case 15 ms max signaling time starts now */
-
-	/* Wait for Restore Done Interrupt */
-	dwc2_wait_for_bit(dev, (mem_addr_t)&base->gintsts, USB_DWC2_GINTSTS_RSTRDONEINT);
-	if (!bus_reset) {
-		sys_write32(0xFFFFFFFFUL, (mem_addr_t)&base->gintsts);
-	}
-
 	/* Disable restore from PMU */
 	sys_clear_bits(gpwrdn_reg, USB_DWC2_GPWRDN_RESTORE);
 	k_busy_wait(1);
@@ -1757,6 +1766,7 @@ static int udc_dwc2_init_controller(const struct device *dev)
 	mem_addr_t gahbcfg_reg = (mem_addr_t)&base->gahbcfg;
 	mem_addr_t gusbcfg_reg = (mem_addr_t)&base->gusbcfg;
 	mem_addr_t dcfg_reg = (mem_addr_t)&base->dcfg;
+	uint32_t gsnpsid;
 	uint32_t dcfg;
 	uint32_t gusbcfg;
 	uint32_t gahbcfg;
@@ -1772,6 +1782,10 @@ static int udc_dwc2_init_controller(const struct device *dev)
 		return ret;
 	}
 
+	/* Enable RTL workarounds based on controller revision */
+	gsnpsid = sys_read32((mem_addr_t)&base->gsnpsid);
+	priv->wa_essregrestored = gsnpsid < USB_DWC2_GSNPSID_REV_5_00A;
+
 	priv->ghwcfg1 = sys_read32((mem_addr_t)&base->ghwcfg1);
 	ghwcfg2 = sys_read32((mem_addr_t)&base->ghwcfg2);
 	ghwcfg3 = sys_read32((mem_addr_t)&base->ghwcfg3);

From 2dab399ea9d6d4176bb4883b8e0d46abb6d9cdb3 Mon Sep 17 00:00:00 2001
From: Bartosz Miller <bartosz.miller@nordicsemi.no>
Date: Tue, 4 Feb 2025 14:18:18 +0100
Subject: [PATCH 2228/2913] [nrf fromtree] tests: susbys: Implement performance
 test for the NRFS

Add NRFS service handling performance test.

Signed-off-by: Bartosz Miller <bartosz.miller@nordicsemi.no>
(cherry picked from commit 9d20c5c382d9e92529b7232c84f6bd7355cb39d0)
---
 tests/subsys/nrfs/CMakeLists.txt        |  19 ++++
 tests/subsys/nrfs/Kconfig.sysbuild      |   9 ++
 tests/subsys/nrfs/README.txt            |   7 ++
 tests/subsys/nrfs/prj.conf              |  21 ++++
 tests/subsys/nrfs/remote/CMakeLists.txt |  12 ++
 tests/subsys/nrfs/remote/prj.conf       |  21 ++++
 tests/subsys/nrfs/src/main.c            | 141 ++++++++++++++++++++++++
 tests/subsys/nrfs/sysbuild.cmake        |  18 +++
 tests/subsys/nrfs/testcase.yaml         |  14 +++
 9 files changed, 262 insertions(+)
 create mode 100644 tests/subsys/nrfs/CMakeLists.txt
 create mode 100644 tests/subsys/nrfs/Kconfig.sysbuild
 create mode 100644 tests/subsys/nrfs/README.txt
 create mode 100644 tests/subsys/nrfs/prj.conf
 create mode 100644 tests/subsys/nrfs/remote/CMakeLists.txt
 create mode 100644 tests/subsys/nrfs/remote/prj.conf
 create mode 100644 tests/subsys/nrfs/src/main.c
 create mode 100644 tests/subsys/nrfs/sysbuild.cmake
 create mode 100644 tests/subsys/nrfs/testcase.yaml

diff --git a/tests/subsys/nrfs/CMakeLists.txt b/tests/subsys/nrfs/CMakeLists.txt
new file mode 100644
index 00000000000..af485e3dc2f
--- /dev/null
+++ b/tests/subsys/nrfs/CMakeLists.txt
@@ -0,0 +1,19 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+if(NOT SYSBUILD)
+	message(FATAL_ERROR
+		" This is a multi-image application that should be built using sysbuild.\n"
+		" Add --sysbuild argument to west build command to prepare all the images.")
+endif()
+
+project(nrfs)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/tests/subsys/nrfs/Kconfig.sysbuild b/tests/subsys/nrfs/Kconfig.sysbuild
new file mode 100644
index 00000000000..f281257725f
--- /dev/null
+++ b/tests/subsys/nrfs/Kconfig.sysbuild
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
+
+config REMOTE_BOARD
+	string
+	default "$(BOARD)/nrf54h20/cpurad" if SOC_NRF54H20_CPUAPP
+	default "$(BOARD)/nrf54h20/cpuapp" if SOC_NRF54H20_CPURAD
diff --git a/tests/subsys/nrfs/README.txt b/tests/subsys/nrfs/README.txt
new file mode 100644
index 00000000000..45888e61c3c
--- /dev/null
+++ b/tests/subsys/nrfs/README.txt
@@ -0,0 +1,7 @@
+The purpose of this test suite is to validate
+NRFS services request handling performance.
+
+These reaquest are propagated over IPC.
+
+MRAM latency serivice and Temperature service
+are used as benchmarks.
diff --git a/tests/subsys/nrfs/prj.conf b/tests/subsys/nrfs/prj.conf
new file mode 100644
index 00000000000..c1a01949d60
--- /dev/null
+++ b/tests/subsys/nrfs/prj.conf
@@ -0,0 +1,21 @@
+CONFIG_ZTEST=y
+CONFIG_TEST_USERSPACE=y
+
+CONFIG_HEAP_MEM_POOL_SIZE=2048
+CONFIG_ISR_STACK_SIZE=1024
+CONFIG_MAIN_STACK_SIZE=4096
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
+
+CONFIG_NRFS=y
+CONFIG_NRFS_MRAM_SERVICE_ENABLED=y
+CONFIG_NRFS_TEMP_SERVICE_ENABLED=y
+CONFIG_CLOCK_CONTROL=n
+
+CONFIG_ASSERT=y
+
+CONFIG_SERIAL=y
+CONFIG_PRINTK=y
+CONFIG_LOG=y
+CONFIG_LOG_MODE_IMMEDIATE=n
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/tests/subsys/nrfs/remote/CMakeLists.txt b/tests/subsys/nrfs/remote/CMakeLists.txt
new file mode 100644
index 00000000000..a0b3aab8b3d
--- /dev/null
+++ b/tests/subsys/nrfs/remote/CMakeLists.txt
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(remote)
+
+target_sources(app PRIVATE ../src/main.c)
diff --git a/tests/subsys/nrfs/remote/prj.conf b/tests/subsys/nrfs/remote/prj.conf
new file mode 100644
index 00000000000..c1a01949d60
--- /dev/null
+++ b/tests/subsys/nrfs/remote/prj.conf
@@ -0,0 +1,21 @@
+CONFIG_ZTEST=y
+CONFIG_TEST_USERSPACE=y
+
+CONFIG_HEAP_MEM_POOL_SIZE=2048
+CONFIG_ISR_STACK_SIZE=1024
+CONFIG_MAIN_STACK_SIZE=4096
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
+
+CONFIG_NRFS=y
+CONFIG_NRFS_MRAM_SERVICE_ENABLED=y
+CONFIG_NRFS_TEMP_SERVICE_ENABLED=y
+CONFIG_CLOCK_CONTROL=n
+
+CONFIG_ASSERT=y
+
+CONFIG_SERIAL=y
+CONFIG_PRINTK=y
+CONFIG_LOG=y
+CONFIG_LOG_MODE_IMMEDIATE=n
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/tests/subsys/nrfs/src/main.c b/tests/subsys/nrfs/src/main.c
new file mode 100644
index 00000000000..affc38720b3
--- /dev/null
+++ b/tests/subsys/nrfs/src/main.c
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/device.h>
+#include <internal/nrfs_backend.h>
+#include <nrfs_backend_ipc_service.h>
+#include <nrfs_mram.h>
+#include <nrfs_temp.h>
+#include <zephyr/ztest.h>
+
+#define IPC_BACKEND_CONNECTION_TIMEOUT_MS 5000
+#define NUM_OF_MRAM_REQUESTS              10000
+#define MRAM_REQUESTS_DEAD_TIME_MS        1
+#define NUM_OF_TEMP_REQUESTS              100
+#define TEMP_REQUESTS_DEAD_TIME_MS        100
+
+struct ipc_perf_result {
+	uint32_t sent_requests;
+	uint32_t handled_requests;
+	uint32_t failed_to_send;
+};
+
+static volatile uint32_t tst_perf_served_mram_requests;
+static volatile uint32_t tst_perf_served_temp_meas_requests;
+
+/*
+ * Callback function for counting handled TEMP service requests
+ */
+static void temp_handler_for_performance_test(nrfs_temp_evt_t const *p_evt, void *context)
+{
+	switch (p_evt->type) {
+	case NRFS_TEMP_EVT_MEASURE_DONE:
+		tst_perf_served_temp_meas_requests++;
+	default:
+		break;
+	}
+}
+
+/*
+ * Callback function for counting handled MRAM service requests
+ */
+static void mram_latency_handler_for_performance_test(nrfs_mram_latency_evt_t const *p_evt,
+						      void *context)
+{
+	switch (p_evt->type) {
+	case NRFS_MRAM_LATENCY_REQ_APPLIED:
+		tst_perf_served_mram_requests++;
+	default:
+		break;
+	}
+}
+
+/*
+ * Test NRFS MRAM latency service requests handling performance
+ */
+ZTEST(nrfs_stress_test, test_mram_nrfs_requests_performance)
+{
+	struct ipc_perf_result tst_ipc_perf_result;
+	uint32_t request_counter = 0;
+	volatile int32_t tst_ctx = 1;
+
+	TC_PRINT("START test_mram_nrfs_requests_performance\n");
+	zassert_equal(nrfs_mram_init(mram_latency_handler_for_performance_test), NRFS_SUCCESS,
+		      "Failed to initialise NRFS MRAM latency service");
+	memset(&tst_ipc_perf_result, 0, sizeof(tst_ipc_perf_result));
+	while (request_counter < NUM_OF_MRAM_REQUESTS) {
+		if (nrfs_mram_set_latency(true, (void *)tst_ctx) == NRFS_SUCCESS) {
+			tst_ipc_perf_result.sent_requests++;
+		} else {
+			tst_ipc_perf_result.failed_to_send++;
+		}
+		k_msleep(MRAM_REQUESTS_DEAD_TIME_MS);
+		tst_ctx++;
+		request_counter++;
+	}
+	/* wait for any remaining requests responses */
+	k_msleep(10 * MRAM_REQUESTS_DEAD_TIME_MS);
+	tst_ipc_perf_result.handled_requests = tst_perf_served_mram_requests;
+	TC_PRINT("STOP test_mram_nrfs_requests_performance\n");
+	TC_PRINT("SENT: %d, HANDLED: %d, FAILED TO SEND: %d\n", tst_ipc_perf_result.sent_requests,
+		 tst_ipc_perf_result.handled_requests, tst_ipc_perf_result.failed_to_send);
+	zassert_equal(tst_ipc_perf_result.sent_requests, tst_ipc_perf_result.handled_requests,
+		      "NRFS MRAM requests sent != served");
+}
+
+/*
+ * Test temperature service requests handling performance
+ */
+ZTEST(nrfs_stress_test, test_temperature_nrfs_requests_performance)
+{
+	struct ipc_perf_result tst_ipc_perf_result;
+	uint32_t request_counter = 0;
+	volatile int32_t tst_ctx = 1;
+
+	TC_PRINT("START test_temperature_nrfs_requests_performance\n");
+	zassert_equal(nrfs_temp_init(temp_handler_for_performance_test), NRFS_SUCCESS,
+		      "Failed to initialise NRFS temperature service");
+	memset((void *)&tst_ipc_perf_result, 0, sizeof(tst_ipc_perf_result));
+	while (request_counter < NUM_OF_TEMP_REQUESTS) {
+		if (nrfs_temp_measure_request((void *)tst_ctx) == NRFS_SUCCESS) {
+			tst_ipc_perf_result.sent_requests++;
+		} else {
+			tst_ipc_perf_result.failed_to_send++;
+		}
+		k_msleep(TEMP_REQUESTS_DEAD_TIME_MS);
+		tst_ctx++;
+		request_counter++;
+	}
+	/* wait for any remaining requests responses */
+	k_msleep(10 * TEMP_REQUESTS_DEAD_TIME_MS);
+	tst_ipc_perf_result.handled_requests = tst_perf_served_temp_meas_requests;
+	TC_PRINT("STOP test_temperature_nrfs_requests_performance\n");
+	TC_PRINT("SENT: %d, HANDLED: %d, FAILED TO SEND: %d\n", tst_ipc_perf_result.sent_requests,
+		 tst_ipc_perf_result.handled_requests, tst_ipc_perf_result.failed_to_send);
+	zassert_equal(tst_ipc_perf_result.sent_requests, tst_ipc_perf_result.handled_requests,
+		      "NRFS TEMP requests sent != served");
+}
+
+/*
+ * Test setup
+ */
+static void *test_setup(void)
+{
+	int ret;
+
+	tst_perf_served_mram_requests = 0;
+	tst_perf_served_temp_meas_requests = 0;
+
+	TC_PRINT("Hello World! %s\n", CONFIG_BOARD_TARGET);
+	TC_PRINT("Waiting for NRFS backend init\n");
+
+	/* Wait for IPC backend connection */
+	ret = nrfs_backend_wait_for_connection(K_MSEC(IPC_BACKEND_CONNECTION_TIMEOUT_MS));
+	zassert_equal(ret, 0, "Failed to establih NRFS backend connection. err: %d", ret);
+	return NULL;
+}
+
+ZTEST_SUITE(nrfs_stress_test, NULL, test_setup, NULL, NULL, NULL);
diff --git a/tests/subsys/nrfs/sysbuild.cmake b/tests/subsys/nrfs/sysbuild.cmake
new file mode 100644
index 00000000000..41e281ff18d
--- /dev/null
+++ b/tests/subsys/nrfs/sysbuild.cmake
@@ -0,0 +1,18 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if("${SB_CONFIG_REMOTE_BOARD}" STREQUAL "")
+  message(FATAL_ERROR "REMOTE_BOARD must be set to a valid board name")
+endif()
+
+# Add remote project
+ExternalZephyrProject_Add(
+    APPLICATION remote
+    SOURCE_DIR ${APP_DIR}/remote
+    BOARD ${SB_CONFIG_REMOTE_BOARD}
+    BOARD_REVISION ${BOARD_REVISION}
+  )
+
+# Add a dependency so that the remote image will be built and flashed first
+add_dependencies(nrfs remote)
+sysbuild_add_dependencies(FLASH nrfs remote)
diff --git a/tests/subsys/nrfs/testcase.yaml b/tests/subsys/nrfs/testcase.yaml
new file mode 100644
index 00000000000..527ff477cd0
--- /dev/null
+++ b/tests/subsys/nrfs/testcase.yaml
@@ -0,0 +1,14 @@
+common:
+  platform_allow:
+    - nrf54h20dk/nrf54h20/cpuapp
+    - nrf54h20dk/nrf54h20/cpurad
+  integration_platforms:
+    - nrf54h20dk/nrf54h20/cpuapp
+    - nrf54h20dk/nrf54h20/cpurad
+  tags:
+    - nrfs
+  harness: ztest
+  sysbuild: true
+
+tests:
+  subsys.nrfs.stress_test: {}

From d194120e704343696ef7295fec943c69b317f3fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Mon, 13 Jan 2025 14:31:25 +0100
Subject: [PATCH 2229/2913] [nrf fromtree] drivers: udc_dwc2: Fix large control
 write transfers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The DOEPTSIZ0 XferSize field is 7 bits long, meaning that maximum single
transfer can be 127 bytes long. Configure the control write (OUT)
transfers considering the XferSize field size to support transfers with
data stage larger than 127 bytes.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 18be1d076807a0c7a8b8e3c877302611b8c4d7d7)
---
 drivers/usb/udc/udc_dwc2.c | 39 ++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 01c0f3040ce..2a1efb847dc 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -250,6 +250,28 @@ static uint32_t dwc2_get_iept_xfersize(const struct device *dev, const uint32_t
 	}
 }
 
+static uint32_t dwc2_get_oept_pktctn(const struct device *dev, const uint32_t idx)
+{
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+
+	if (idx == 0) {
+		return usb_dwc2_get_doeptsiz0_pktcnt(UINT32_MAX);
+	} else {
+		return priv->max_pktcnt;
+	}
+}
+
+static uint32_t dwc2_get_oept_xfersize(const struct device *dev, const uint32_t idx)
+{
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+
+	if (idx == 0) {
+		return usb_dwc2_get_doeptsiz0_xfersize(UINT32_MAX);
+	} else {
+		return priv->max_xfersize;
+	}
+}
+
 static void dwc2_flush_rx_fifo(const struct device *dev)
 {
 	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
@@ -582,18 +604,23 @@ static void dwc2_prep_rx(const struct device *dev, struct net_buf *buf,
 	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
 	mem_addr_t doeptsiz_reg = (mem_addr_t)&base->out_ep[ep_idx].doeptsiz;
 	mem_addr_t doepctl_reg = dwc2_get_dxepctl_reg(dev, ep_idx);
+	uint32_t max_xfersize, max_pktcnt;
+	const uint32_t addnl = USB_MPS_ADDITIONAL_TRANSACTIONS(cfg->mps);
 	uint32_t pktcnt;
 	uint32_t doeptsiz;
 	uint32_t doepctl;
 	uint32_t xfersize;
 
+	max_xfersize = dwc2_get_oept_xfersize(dev, ep_idx);
+	max_pktcnt = dwc2_get_oept_pktctn(dev, ep_idx);
+
 	/* Clear NAK and set endpoint enable */
 	doepctl = sys_read32(doepctl_reg);
 	doepctl |= USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_CNAK;
 
 	if (dwc2_ep_is_iso(cfg)) {
 		xfersize = USB_MPS_TO_TPL(cfg->mps);
-		pktcnt = 1 + USB_MPS_ADDITIONAL_TRANSACTIONS(cfg->mps);
+		pktcnt = 1 + addnl;
 
 		if (xfersize > net_buf_tailroom(buf)) {
 			LOG_ERR("ISO RX buffer too small");
@@ -610,14 +637,18 @@ static void dwc2_prep_rx(const struct device *dev, struct net_buf *buf,
 		xfersize = net_buf_tailroom(buf);
 
 		/* Do as many packets in a single transfer as possible */
-		if (xfersize > priv->max_xfersize) {
-			xfersize = ROUND_DOWN(priv->max_xfersize, USB_MPS_TO_TPL(cfg->mps));
+		if (xfersize > max_xfersize) {
+			xfersize = ROUND_DOWN(max_xfersize, USB_MPS_TO_TPL(cfg->mps));
 		}
 
 		pktcnt = DIV_ROUND_UP(xfersize, USB_MPS_EP_SIZE(cfg->mps));
 	}
 
-	pktcnt = DIV_ROUND_UP(xfersize, udc_mps_ep_size(cfg));
+	if (pktcnt > max_pktcnt) {
+		pktcnt = ROUND_DOWN(max_pktcnt, (1 + addnl));
+		xfersize = pktcnt * udc_mps_ep_size(cfg);
+	}
+
 	doeptsiz = usb_dwc2_set_doeptsizn_pktcnt(pktcnt) |
 		   usb_dwc2_set_doeptsizn_xfersize(xfersize);
 	if (cfg->addr == USB_CONTROL_EP_OUT) {

From aef6b7b2788018435ce4f6a7c62056eac2d0c586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Tue, 14 Jan 2025 11:32:42 +0100
Subject: [PATCH 2230/2913] [nrf fromtree] drivers: udc_dwc2: Recover after
 STALLed OUT Data Stage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prepare buffer to receive SETUP data on OUT endpoint 0 after endpoint
halt. This solves the issue where the device would no longer process any
control transfers after the first failed transfer with too large OUT
Data Stage (when processing failed due to data stage buffer allocation
failure).

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 883b77fe3bb08c93ca302fb8ea3c11af2ebd00ff)
---
 drivers/usb/udc/udc_dwc2.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 2a1efb847dc..e117f1b172b 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -1591,6 +1591,9 @@ static int udc_dwc2_ep_set_halt(const struct device *dev,
 	LOG_DBG("Set halt ep 0x%02x", cfg->addr);
 	if (ep_idx != 0) {
 		cfg->stat.halted = true;
+	} else if (!udc_buf_peek(dev, USB_CONTROL_EP_OUT)) {
+		/* Data stage is STALLed, allow receiving next SETUP */
+		dwc2_ctrl_feed_dout(dev, 8);
 	}
 
 	return 0;

From 6bef4f34c5bc88ac00bee16b79d3e442076ae31e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Wed, 15 Jan 2025 14:44:56 +0100
Subject: [PATCH 2231/2913] [nrf fromtree] drivers: udc_dwc2: Fix multipart DMA
 OUT transfers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

DMA transfers are supposed to write to buffer tail. Use the proper
pointer to make multipart DMA transfers actually write the data to the
intended location.

The issue was observed on control write transfers where the OUT Data
Stage was at least 128 bytes (because endpoint 0 transfer width is
limited to 7 bits).

The issue is unlikely to happen on non-control transfers because the
transfer size width is at least 11 bits (at most 19 bits) and packet
size counter is at least 4 bits (at most: 10 bits) which means that
at least 2048 byte transfer spanning at least 15 packets (or at least
524288 byte spanning 1023 packets for 19 bits transfer size counter
and 10 bits packet counter) is required to necessitate multipart DMA.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 45ee2a0b0d105c390ee8298babe490ea348dc493)
---
 drivers/usb/udc/udc_dwc2.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index e117f1b172b..6d39ef54e3d 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -660,17 +660,19 @@ static void dwc2_prep_rx(const struct device *dev, struct net_buf *buf,
 	sys_write32(doeptsiz, doeptsiz_reg);
 
 	if (priv->bufferdma) {
-		if (!dwc2_dma_buffer_ok_to_use(dev, buf->data, xfersize, cfg->mps)) {
+		void *data = net_buf_tail(buf);
+
+		if (!dwc2_dma_buffer_ok_to_use(dev, data, xfersize, cfg->mps)) {
 			/* Cannot continue unless buffer is bounced. Device will
 			 * cease to function. Is fatal error appropriate here?
 			 */
 			return;
 		}
 
-		sys_write32((uint32_t)buf->data,
+		sys_write32((uint32_t)data,
 			    (mem_addr_t)&base->out_ep[ep_idx].doepdma);
 
-		sys_cache_data_invd_range(buf->data, xfersize);
+		sys_cache_data_invd_range(data, xfersize);
 	}
 
 	sys_write32(doepctl, doepctl_reg);
@@ -2514,7 +2516,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 	}
 
 	if (priv->bufferdma && bcnt) {
-		sys_cache_data_invd_range(buf->data, bcnt);
+		sys_cache_data_invd_range(net_buf_tail(buf), bcnt);
 		net_buf_add(buf, bcnt);
 	}
 

From 1d98f4a0f09e725894789acb9a15465715d06386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Tue, 4 Feb 2025 12:46:26 +0100
Subject: [PATCH 2232/2913] [nrf fromtree] drivers: udc_dwc2: Add helpers to
 check operating mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use helper functions to check whether device is operating in Buffer DMA
or Completer mode. This allows compile time optimizations to remove DMA
handling code when DMA is disabled via KConfig symbol UDC_DWC2_DMA.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit d4cc8de6448198a2ed6e66fc2c227b8d730ada78)
---
 drivers/usb/udc/udc_dwc2.c | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 6d39ef54e3d..61c16d1082b 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -203,6 +203,20 @@ static void dwc2_wait_for_bit(const struct device *dev,
 	}
 }
 
+static inline bool dwc2_in_completer_mode(const struct device *dev)
+{
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+
+	return !IS_ENABLED(CONFIG_UDC_DWC2_DMA) || !priv->bufferdma;
+}
+
+static inline bool dwc2_in_buffer_dma_mode(const struct device *dev)
+{
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+
+	return IS_ENABLED(CONFIG_UDC_DWC2_DMA) && priv->bufferdma;
+}
+
 /* Get DOEPCTLn or DIEPCTLn register address */
 static mem_addr_t dwc2_get_dxepctl_reg(const struct device *dev, const uint8_t ep)
 {
@@ -422,7 +436,7 @@ static int dwc2_tx_fifo_write(const struct device *dev,
 		len = buf->len;
 	}
 
-	if (!priv->bufferdma) {
+	if (dwc2_in_completer_mode(dev)) {
 		uint32_t spcavail = dwc2_ftx_avail(dev, ep_idx);
 		uint32_t spcperpkt = ROUND_UP(udc_mps_ep_size(cfg), 4);
 		uint32_t max_pkts, max_transfer;
@@ -487,7 +501,7 @@ static int dwc2_tx_fifo_write(const struct device *dev,
 		    usb_dwc2_set_dieptsizn_pktcnt(pktcnt) |
 		    usb_dwc2_set_dieptsizn_xfersize(len), dieptsiz_reg);
 
-	if (priv->bufferdma) {
+	if (dwc2_in_buffer_dma_mode(dev)) {
 		if (!dwc2_dma_buffer_ok_to_use(dev, buf->data, len, cfg->mps)) {
 			/* Cannot continue unless buffer is bounced. Device will
 			 * cease to function. Is fatal error appropriate here?
@@ -530,7 +544,7 @@ static int dwc2_tx_fifo_write(const struct device *dev,
 	/* Clear IN Endpoint NAK Effective interrupt in case it was set */
 	sys_write32(USB_DWC2_DIEPINT_INEPNAKEFF, diepint_reg);
 
-	if (!priv->bufferdma) {
+	if (dwc2_in_completer_mode(dev)) {
 		const uint8_t *src = buf->data;
 
 		while (pktcnt > 0) {
@@ -659,7 +673,7 @@ static void dwc2_prep_rx(const struct device *dev, struct net_buf *buf,
 	priv->rx_siz[ep_idx] = doeptsiz;
 	sys_write32(doeptsiz, doeptsiz_reg);
 
-	if (priv->bufferdma) {
+	if (dwc2_in_buffer_dma_mode(dev)) {
 		void *data = net_buf_tail(buf);
 
 		if (!dwc2_dma_buffer_ok_to_use(dev, data, xfersize, cfg->mps)) {
@@ -1211,7 +1225,7 @@ static int dwc2_set_dedicated_fifo(const struct device *dev,
 	tmp = *diepctl & ~USB_DWC2_DEPCTL_TXFNUM_MASK;
 
 	reqdep = DIV_ROUND_UP(udc_mps_ep_size(cfg), 4U);
-	if (priv->bufferdma) {
+	if (dwc2_in_buffer_dma_mode(dev)) {
 		/* In DMA mode, TxFIFO capable of holding 2 packets is enough */
 		reqdep *= MIN(2, (1 + addnl));
 	} else {
@@ -2292,7 +2306,7 @@ static void dwc2_on_bus_reset(const struct device *dev)
 	}
 
 	doepmsk = USB_DWC2_DOEPINT_SETUP | USB_DWC2_DOEPINT_XFERCOMPL;
-	if (priv->bufferdma) {
+	if (dwc2_in_buffer_dma_mode(dev)) {
 		doepmsk |= USB_DWC2_DOEPINT_STSPHSERCVD;
 	}
 
@@ -2300,7 +2314,7 @@ static void dwc2_on_bus_reset(const struct device *dev)
 	sys_set_bits((mem_addr_t)&base->diepmsk, USB_DWC2_DIEPINT_XFERCOMPL);
 
 	/* Software has to handle RxFLvl interrupt only in Completer mode */
-	if (!priv->bufferdma) {
+	if (dwc2_in_completer_mode(dev)) {
 		sys_set_bits((mem_addr_t)&base->gintmsk,
 			     USB_DWC2_GINTSTS_RXFLVL);
 	}
@@ -2506,7 +2520,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 		}
 
 		if (!valid) {
-			if (!priv->bufferdma) {
+			if (dwc2_in_completer_mode(dev)) {
 				/* RxFlvl added data to net buf, rollback */
 				net_buf_remove_mem(buf, bcnt);
 			}
@@ -2515,7 +2529,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 		}
 	}
 
-	if (priv->bufferdma && bcnt) {
+	if (dwc2_in_buffer_dma_mode(dev) && bcnt) {
 		sys_cache_data_invd_range(net_buf_tail(buf), bcnt);
 		net_buf_add(buf, bcnt);
 	}
@@ -2559,7 +2573,8 @@ static inline void dwc2_handle_oepint(const struct device *dev)
 		/* StupPktRcvd is not enabled for interrupt, but must be checked
 		 * when XferComp hits to determine if SETUP token was received.
 		 */
-		if (priv->bufferdma && (status & USB_DWC2_DOEPINT_XFERCOMPL) &&
+		if (dwc2_in_buffer_dma_mode(dev) &&
+		    (status & USB_DWC2_DOEPINT_XFERCOMPL) &&
 		    (doepint & USB_DWC2_DOEPINT_STUPPKTRCVD)) {
 			uint32_t addr;
 

From e1fe97d9f503914e4ac10e8dbac373cf0bfdde5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Tue, 4 Feb 2025 13:29:12 +0100
Subject: [PATCH 2233/2913] [nrf fromtree] drivers: udc_dwc2: Allocate multiple
 of bMaxPacketSize0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Control OUT buffers must be multiple of bMaxPacketSize0 in Buffer DMA
mode. While the transfer can be configured to smaller values, DMA will
write data past the buffer (and transfer size counter will underflow) if
the packet on the bus is larger or if there are multiple back-to-back
SETUP packets.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit a61afc8eb1131904c157496c278268e434b19d7e)
---
 drivers/usb/udc/udc_dwc2.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 61c16d1082b..930fdc15f15 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -666,8 +666,7 @@ static void dwc2_prep_rx(const struct device *dev, struct net_buf *buf,
 	doeptsiz = usb_dwc2_set_doeptsizn_pktcnt(pktcnt) |
 		   usb_dwc2_set_doeptsizn_xfersize(xfersize);
 	if (cfg->addr == USB_CONTROL_EP_OUT) {
-		/* Use 1 to allow 8 byte long buffers for SETUP data */
-		doeptsiz |= (1 << USB_DWC2_DOEPTSIZ0_SUPCNT_POS);
+		doeptsiz |= (3 << USB_DWC2_DOEPTSIZ0_SUPCNT_POS);
 	}
 
 	priv->rx_siz[ep_idx] = doeptsiz;
@@ -727,10 +726,17 @@ static void dwc2_handle_xfer_next(const struct device *dev,
 
 static int dwc2_ctrl_feed_dout(const struct device *dev, const size_t length)
 {
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
 	struct net_buf *buf;
+	size_t alloc_len = length;
+
+	if (dwc2_in_buffer_dma_mode(dev)) {
+		/* Control OUT buffers must be multiple of bMaxPacketSize0 */
+		alloc_len = ROUND_UP(length, 64);
+	}
 
-	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, length);
+	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, alloc_len);
 	if (buf == NULL) {
 		return -ENOMEM;
 	}

From 3431c52f1acc86802526c9b0b221739676168883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Tue, 4 Feb 2025 13:40:24 +0100
Subject: [PATCH 2234/2913] [nrf fromtree] drivers: udc_dwc2: Stop OUT
 transfers on ZLP
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The transfer is finished after ZLP is transmitted. Do not re-enable the
endpoint waiting for more data.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit ea72b27f3dbeabd9f07254b077ba9a8baf3c0b73)
---
 drivers/usb/udc/udc_dwc2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 930fdc15f15..a4065b89354 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -2540,7 +2540,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 		net_buf_add(buf, bcnt);
 	}
 
-	if (!is_iso && (bcnt % udc_mps_ep_size(ep_cfg)) == 0 &&
+	if (!is_iso && bcnt && (bcnt % udc_mps_ep_size(ep_cfg)) == 0 &&
 	    net_buf_tailroom(buf)) {
 		dwc2_prep_rx(dev, buf, ep_cfg);
 	} else {

From 98c604dbc6a3e5d39868b72b934f34d0507f1ca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Tue, 21 Jan 2025 14:08:31 +0100
Subject: [PATCH 2235/2913] [nrf fromtree] drivers: udc_dwc2: Rework control
 endpoint feeding
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In Completer mode SETUP data can always be received and therefore
endpoint 0 should only be enabled for OUT Data Stage and OUT Status
Stage.

In Buffer DMA mode, SETUP can only be received when endpoint is enabled
and therefore the software has to make sure that there is a buffer
available to receive SETUP data.

Rework the EP0 buffer feeding to adhere to DWC2 Programming Guide.
Synchronize the accesses with driver mutex to avoid interrupt related
race conditions.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 8348d9a2b712378998015f91176abe63adb2dfa7)
---
 drivers/usb/udc/udc_dwc2.c | 172 +++++++++++++++++++++++--------------
 1 file changed, 107 insertions(+), 65 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index a4065b89354..d1fc555d839 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -25,6 +25,8 @@ LOG_MODULE_REGISTER(udc_dwc2, CONFIG_UDC_DRIVER_LOG_LEVEL);
 #include "udc_dwc2_vendor_quirks.h"
 
 enum dwc2_drv_event_type {
+	/* USB connection speed determined after bus reset */
+	DWC2_DRV_EVT_ENUM_DONE,
 	/* Trigger next transfer, must not be used for control OUT */
 	DWC2_DRV_EVT_XFER,
 	/* Setup packet received */
@@ -383,6 +385,42 @@ static bool dwc2_ep_is_iso(struct udc_ep_config *const cfg)
 	return (cfg->attributes & USB_EP_TRANSFER_TYPE_MASK) == USB_EP_TYPE_ISO;
 }
 
+static int dwc2_ctrl_feed_dout(const struct device *dev, const size_t length)
+{
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
+	struct net_buf *buf;
+	size_t alloc_len = length;
+
+	if (dwc2_in_buffer_dma_mode(dev)) {
+		/* Control OUT buffers must be multiple of bMaxPacketSize0 */
+		alloc_len = ROUND_UP(length, 64);
+	}
+
+	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, alloc_len);
+	if (buf == NULL) {
+		return -ENOMEM;
+	}
+
+	udc_buf_put(ep_cfg, buf);
+	k_event_post(&priv->xfer_new, BIT(16));
+	k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
+
+	return 0;
+}
+
+static void dwc2_ensure_setup_ready(const struct device *dev)
+{
+	if (dwc2_in_completer_mode(dev)) {
+		/* In Completer mode EP0 can always receive SETUP data */
+		return;
+	}
+
+	if (!udc_buf_peek(dev, USB_CONTROL_EP_OUT)) {
+		dwc2_ctrl_feed_dout(dev, 8);
+	}
+}
+
 static bool dwc2_dma_buffer_ok_to_use(const struct device *dev, void *buf,
 				      uint32_t xfersize, uint16_t mps)
 {
@@ -708,6 +746,26 @@ static void dwc2_handle_xfer_next(const struct device *dev,
 	} else {
 		int err = dwc2_tx_fifo_write(dev, cfg, buf);
 
+		if (cfg->addr == USB_CONTROL_EP_IN) {
+			/* Feed a buffer for the next setup packet after arming
+			 * IN endpoint with the data. This is necessary both in
+			 * IN Data Stage (Control Read Transfer) and IN Status
+			 * Stage (Control Write Transfers and Control Transfers
+			 * without Data Stage).
+			 *
+			 * The buffer must be fed here in Buffer DMA mode to
+			 * allow receiving premature SETUP. This inevitably does
+			 * automatically arm the buffer for OUT Status Stage.
+			 *
+			 * The buffer MUST NOT be fed here in Completer mode to
+			 * avoid race condition where the next Control Write
+			 * Transfer Data Stage is received into the buffer.
+			 */
+			if (dwc2_in_buffer_dma_mode(dev)) {
+				dwc2_ctrl_feed_dout(dev, 8);
+			}
+		}
+
 		if (err) {
 			LOG_ERR("Failed to start write to TX FIFO, ep 0x%02x (err: %d)",
 				cfg->addr, err);
@@ -724,39 +782,35 @@ static void dwc2_handle_xfer_next(const struct device *dev,
 	udc_ep_set_busy(dev, cfg->addr, true);
 }
 
-static int dwc2_ctrl_feed_dout(const struct device *dev, const size_t length)
+static int dwc2_handle_evt_setup(const struct device *dev)
 {
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
 	struct net_buf *buf;
-	size_t alloc_len = length;
+	int err;
 
-	if (dwc2_in_buffer_dma_mode(dev)) {
-		/* Control OUT buffers must be multiple of bMaxPacketSize0 */
-		alloc_len = ROUND_UP(length, 64);
-	}
+	/* In Completer mode SETUP data is received without preparing endpoint 0
+	 * transfer beforehand. In Buffer DMA the SETUP can be copied to any EP0
+	 * OUT buffer. If there is any buffer queued, it is obsolete now.
+	 */
+	k_event_clear(&priv->xfer_finished, BIT(0) | BIT(16));
 
-	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, alloc_len);
-	if (buf == NULL) {
-		return -ENOMEM;
+	buf = udc_buf_get_all(dev, USB_CONTROL_EP_OUT);
+	if (buf) {
+		net_buf_unref(buf);
 	}
 
-	udc_buf_put(ep_cfg, buf);
-	dwc2_prep_rx(dev, buf, ep_cfg);
-	LOG_DBG("feed buf %p", buf);
-
-	return 0;
-}
+	buf = udc_buf_get_all(dev, USB_CONTROL_EP_IN);
+	if (buf) {
+		net_buf_unref(buf);
+	}
 
-static int dwc2_handle_evt_setup(const struct device *dev)
-{
-	struct udc_dwc2_data *const priv = udc_get_private(dev);
-	struct net_buf *buf;
-	int err;
+	udc_ep_set_busy(dev, USB_CONTROL_EP_OUT, false);
+	udc_ep_set_busy(dev, USB_CONTROL_EP_IN, false);
 
-	buf = udc_buf_get(dev, USB_CONTROL_EP_OUT);
+	/* Allocate buffer and copy received SETUP for processing */
+	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, 8);
 	if (buf == NULL) {
-		LOG_ERR("No buffer queued for control ep");
+		LOG_ERR("No buffer available for control ep");
 		return -ENODATA;
 	}
 
@@ -773,30 +827,17 @@ static int dwc2_handle_evt_setup(const struct device *dev)
 		/*  Allocate and feed buffer for data OUT stage */
 		LOG_DBG("s:%p|feed for -out-", buf);
 
-		/* Allocate at least 8 bytes in case the host decides to send
-		 * SETUP DATA instead of OUT DATA packet.
-		 */
-		err = dwc2_ctrl_feed_dout(dev, MAX(udc_data_stage_length(buf), 8));
+		err = dwc2_ctrl_feed_dout(dev, udc_data_stage_length(buf));
 		if (err == -ENOMEM) {
 			err = udc_submit_ep_event(dev, buf, err);
 		}
 	} else if (udc_ctrl_stage_is_data_in(dev)) {
 		LOG_DBG("s:%p|feed for -in-status", buf);
 
-		err = dwc2_ctrl_feed_dout(dev, 8);
-		if (err == -ENOMEM) {
-			err = udc_submit_ep_event(dev, buf, err);
-		}
-
 		err = udc_ctrl_submit_s_in_status(dev);
 	} else {
 		LOG_DBG("s:%p|feed >setup", buf);
 
-		err = dwc2_ctrl_feed_dout(dev, 8);
-		if (err == -ENOMEM) {
-			err = udc_submit_ep_event(dev, buf, err);
-		}
-
 		err = udc_ctrl_submit_s_status(dev);
 	}
 
@@ -806,6 +847,7 @@ static int dwc2_handle_evt_setup(const struct device *dev)
 static inline int dwc2_handle_evt_dout(const struct device *dev,
 				       struct udc_ep_config *const cfg)
 {
+	struct udc_data *data = dev->data;
 	struct net_buf *buf;
 	int err = 0;
 
@@ -822,25 +864,14 @@ static inline int dwc2_handle_evt_dout(const struct device *dev,
 			/* s-in-status finished */
 			LOG_DBG("dout:%p| status, feed >s", buf);
 
-			/* Feed a buffer for the next setup packet */
-			err = dwc2_ctrl_feed_dout(dev, 8);
-			if (err == -ENOMEM) {
-				err = udc_submit_ep_event(dev, buf, err);
-			}
-
 			/* Status stage finished, notify upper layer */
 			udc_ctrl_submit_status(dev, buf);
-		} else {
-			/*
-			 * For all other cases we feed with a buffer
-			 * large enough for setup packet.
-			 */
-			LOG_DBG("dout:%p| data, feed >s", buf);
 
-			err = dwc2_ctrl_feed_dout(dev, 8);
-			if (err == -ENOMEM) {
-				err = udc_submit_ep_event(dev, buf, err);
+			if (dwc2_in_buffer_dma_mode(dev)) {
+				dwc2_ctrl_feed_dout(dev, 8);
 			}
+		} else {
+			LOG_DBG("dout:%p| data, feed >s", buf);
 		}
 
 		/* Update to next stage of control transfer */
@@ -849,6 +880,13 @@ static inline int dwc2_handle_evt_dout(const struct device *dev,
 		if (udc_ctrl_stage_is_status_in(dev)) {
 			err = udc_ctrl_submit_s_out_status(dev, buf);
 		}
+
+		if (data->stage == CTRL_PIPE_STAGE_ERROR) {
+			/* Allow receiving next SETUP. USB stack won't queue any
+			 * buffer because it has no clue about this transfer.
+			 */
+			dwc2_ensure_setup_ready(dev);
+		}
 	} else {
 		err = udc_submit_ep_event(dev, buf, 0);
 	}
@@ -892,10 +930,12 @@ static int dwc2_handle_evt_din(const struct device *dev,
 		udc_ctrl_update_stage(dev, buf);
 
 		if (udc_ctrl_stage_is_status_out(dev)) {
-			/*
-			 * IN transfer finished, release buffer,
-			 * control OUT buffer should be already fed.
-			 */
+			if (dwc2_in_completer_mode(dev)) {
+				/* Allow OUT status stage */
+				dwc2_ctrl_feed_dout(dev, 8);
+			}
+
+			/* IN transfer finished, release buffer. */
 			net_buf_unref(buf);
 		}
 
@@ -1322,13 +1362,7 @@ static int dwc2_ep_control_enable(const struct device *dev,
 	dxepctl0 |= USB_DWC2_DEPCTL_USBACTEP;
 
 	if (cfg->addr == USB_CONTROL_EP_OUT) {
-		int ret;
-
 		dwc2_flush_rx_fifo(dev);
-		ret = dwc2_ctrl_feed_dout(dev, 8);
-		if (ret) {
-			return ret;
-		}
 	} else {
 		dwc2_flush_tx_fifo(dev, 0);
 	}
@@ -1613,9 +1647,9 @@ static int udc_dwc2_ep_set_halt(const struct device *dev,
 	LOG_DBG("Set halt ep 0x%02x", cfg->addr);
 	if (ep_idx != 0) {
 		cfg->stat.halted = true;
-	} else if (!udc_buf_peek(dev, USB_CONTROL_EP_OUT)) {
-		/* Data stage is STALLed, allow receiving next SETUP */
-		dwc2_ctrl_feed_dout(dev, 8);
+	} else {
+		/* Data/Status stage is STALLed, allow receiving next SETUP */
+		dwc2_ensure_setup_ready(dev);
 	}
 
 	return 0;
@@ -2341,6 +2375,8 @@ static void dwc2_handle_enumdone(const struct device *dev)
 	dsts = sys_read32((mem_addr_t)&base->dsts);
 	priv->enumspd = usb_dwc2_get_dsts_enumspd(dsts);
 	priv->enumdone = 1;
+
+	k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_ENUM_DONE));
 }
 
 static inline int dwc2_read_fifo_setup(const struct device *dev, uint8_t ep,
@@ -3041,6 +3077,12 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 		config->irq_enable_func(dev);
 	}
 
+	if (evt & BIT(DWC2_DRV_EVT_ENUM_DONE)) {
+		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_ENUM_DONE));
+
+		dwc2_ensure_setup_ready(dev);
+	}
+
 	udc_unlock_internal(dev);
 }
 

From f26d920ecf761c768a15ac3a6d9f714a5223cf2a Mon Sep 17 00:00:00 2001
From: Piotr Pryga <piotr.pryga@nordicsemi.no>
Date: Mon, 10 Feb 2025 18:43:22 +0100
Subject: [PATCH 2236/2913] [nrf fromtree] modules: hal_norfic: rise 802.15.4
 NET core init priority

Due to internal dependencies on other modules init priority
the 802.15.4 priority level must be increased. Former init
priority caused the module to be initialied before those
it depends on, so that lead to hard faults.

Signed-off-by: Piotr Pryga <piotr.pryga@nordicsemi.no>
(cherry picked from commit b5e7ac5edece82870703d6b792ec742b98550e61)
---
 modules/hal_nordic/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/Kconfig b/modules/hal_nordic/Kconfig
index 183d25d9a19..32ff1a6c74c 100644
--- a/modules/hal_nordic/Kconfig
+++ b/modules/hal_nordic/Kconfig
@@ -109,7 +109,7 @@ if NRF_802154_SER_RADIO
 
 config NRF_802154_SER_RADIO_INIT_PRIO
 	int "nRF52 IEEE 802.15.4 serialization initialization priority"
-	default 51
+	default 53
 	help
 	  Set the initialization priority number. Do not mess with it unless
 	  you know what you are doing.

From ab9407954889f55aefef8927297a47c35566ef30 Mon Sep 17 00:00:00 2001
From: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
Date: Wed, 18 Dec 2024 15:33:16 +0100
Subject: [PATCH 2237/2913] [nrf fromtree] tests: boards: nordic: add nrf comp
 tests.

Tests use nordic specific comparator api which enable it's
runtime reconfiguration.

As there were no tests prepared when introducing this api,
PR adds some to extend test coverage.

Signed-off-by: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
(cherry picked from commit dc7c396a0b5e9b5a8a30bd60b29bdba059670041)
---
 tests/boards/nrf/comp/CMakeLists.txt          |   8 +
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  36 +++
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |  40 +++
 tests/boards/nrf/comp/prj.conf                |   6 +
 tests/boards/nrf/comp/src/test.c              | 289 ++++++++++++++++++
 tests/boards/nrf/comp/testcase.yaml           |  14 +
 6 files changed, 393 insertions(+)
 create mode 100644 tests/boards/nrf/comp/CMakeLists.txt
 create mode 100644 tests/boards/nrf/comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/boards/nrf/comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/boards/nrf/comp/prj.conf
 create mode 100644 tests/boards/nrf/comp/src/test.c
 create mode 100644 tests/boards/nrf/comp/testcase.yaml

diff --git a/tests/boards/nrf/comp/CMakeLists.txt b/tests/boards/nrf/comp/CMakeLists.txt
new file mode 100644
index 00000000000..ee3c832e094
--- /dev/null
+++ b/tests/boards/nrf/comp/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(comp)
+
+target_sources(app PRIVATE src/test.c)
diff --git a/tests/boards/nrf/comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/boards/nrf/comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..cb8e9d408b8
--- /dev/null
+++ b/tests/boards/nrf/comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		test-comp = &comp;
+	};
+
+	zephyr,user {
+		first-gpios = <&gpio7 2 GPIO_ACTIVE_HIGH>;
+		second-gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&gpio7 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&comp {
+	status = "okay";
+	psel = "AIN5";
+	refsel = "AREF";
+	extrefsel= "AIN1";
+	sp-mode = "HIGH";
+	th-up = <36>;
+	th-down = <30>;
+	isource = "DISABLED";
+	enable-hyst;
+};
diff --git a/tests/boards/nrf/comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..4c9944b81c3
--- /dev/null
+++ b/tests/boards/nrf/comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		test-comp = &comp;
+	};
+
+	zephyr,user {
+		first-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+		second-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&led3 {
+	status = "disabled";
+};
+
+&button0 {
+	status = "disabled";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&comp {
+	status = "okay";
+	psel = "AIN4";
+	refsel = "AREF";
+	extrefsel= "AIN3";
+	sp-mode = "NORMAL";
+	th-up = <36>;
+	th-down = <30>;
+	isource = "DISABLED";
+	enable-hyst;
+};
diff --git a/tests/boards/nrf/comp/prj.conf b/tests/boards/nrf/comp/prj.conf
new file mode 100644
index 00000000000..36ee3da78e7
--- /dev/null
+++ b/tests/boards/nrf/comp/prj.conf
@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_GPIO=y
+CONFIG_COMPARATOR=y
+CONFIG_ZTEST=y
diff --git a/tests/boards/nrf/comp/src/test.c b/tests/boards/nrf/comp/src/test.c
new file mode 100644
index 00000000000..01493d06811
--- /dev/null
+++ b/tests/boards/nrf/comp/src/test.c
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/ztest.h>
+#include <zephyr/drivers/comparator/nrf_comp.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
+
+static const struct device *test_dev = DEVICE_DT_GET(DT_ALIAS(test_comp));
+static const struct gpio_dt_spec test_pin_1 = GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), first_gpios);
+static const struct gpio_dt_spec test_pin_2 = GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), second_gpios);
+
+
+struct comp_nrf_comp_se_config comp_se_config = {
+	.psel = COMP_NRF_COMP_PSEL_AIN5,
+	.sp_mode = COMP_NRF_COMP_SP_MODE_HIGH,
+	.isource = COMP_NRF_COMP_ISOURCE_DISABLED,
+	.refsel = COMP_NRF_COMP_REFSEL_AREF,
+	.extrefsel = COMP_NRF_COMP_EXTREFSEL_AIN1,
+	.th_up = 32,
+	.th_down = 32,
+};
+
+struct comp_nrf_comp_diff_config comp_diff_config = {
+	.psel = COMP_NRF_COMP_PSEL_AIN4,
+	.sp_mode = COMP_NRF_COMP_SP_MODE_LOW,
+	.isource = COMP_NRF_COMP_ISOURCE_DISABLED,
+	.extrefsel = COMP_NRF_COMP_EXTREFSEL_AIN5,
+	.enable_hyst = true,
+};
+
+atomic_t counter;
+
+static void test_callback(const struct device *dev, void *user_data)
+{
+	counter++;
+}
+
+/**
+ * @brief Configure comparator in single-ended mode with
+ * external voltage reference.
+ * Check if events were detected.
+ */
+
+ZTEST(comparator_runtime_configure, test_comp_config_se_aref)
+{
+	int rc;
+
+	rc = comp_nrf_comp_configure_se(test_dev, &comp_se_config);
+	zassert_equal(rc, 0, "Cannot configure comparator.");
+
+	rc = comparator_set_trigger_callback(test_dev, test_callback, NULL);
+	zassert_equal(rc, 0, "Cannot set callback for comparator.");
+
+	rc = comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_BOTH_EDGES);
+	zassert_equal(rc, 0, "Cannot set trigger for comparator.");
+
+	k_msleep(10);
+
+	atomic_clear(&counter);
+	gpio_pin_set_dt(&test_pin_2, 1);
+	k_msleep(10);
+	zassert_equal(atomic_get(&counter), 1, "COMP was not triggered for first threshold cross");
+	gpio_pin_set_dt(&test_pin_2, 0);
+	k_msleep(10);
+	zassert_equal(atomic_get(&counter), 2, "COMP was not triggered for second threshold cross");
+
+}
+
+/**
+ * @brief Configure comparator in single-ended mode with
+ * internal voltage reference.
+ * Check if events were detected.
+ */
+
+
+ZTEST(comparator_runtime_configure, test_comp_config_se_vdd)
+{
+	int rc;
+
+	struct comp_nrf_comp_se_config conf = comp_se_config;
+
+#ifdef COMP_REFSEL_REFSEL_AVDDAO1V8
+	conf.refsel = COMP_NRF_COMP_REFSEL_AVDDAO1V8;
+#else
+	conf.refsel = COMP_NRF_COMP_REFSEL_VDD;
+#endif
+	rc = comp_nrf_comp_configure_se(test_dev, &conf);
+	zassert_equal(rc, 0, "Cannot configure comparator.");
+
+	rc = comparator_set_trigger_callback(test_dev, test_callback, NULL);
+	zassert_equal(rc, 0, "Cannot set callback for comparator.");
+
+	rc = comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_BOTH_EDGES);
+	zassert_equal(rc, 0, "Cannot set trigger for comparator.");
+
+	k_msleep(10);
+
+	atomic_clear(&counter);
+	gpio_pin_set_dt(&test_pin_2, 1);
+	k_msleep(10);
+	zassert_equal(atomic_get(&counter), 1, "COMP was not triggered for first threshold cross");
+	gpio_pin_set_dt(&test_pin_2, 0);
+	k_msleep(10);
+	zassert_equal(atomic_get(&counter), 2, "COMP was not triggered for second threshold cross");
+
+}
+
+/**
+ * @brief Configure comparator in differential mode
+ * Check if events were detected.
+ */
+
+ZTEST(comparator_runtime_configure, test_comp_config_diff_both)
+{
+	int rc;
+
+	gpio_pin_set_dt(&test_pin_1, 1);
+	gpio_pin_set_dt(&test_pin_2, 0);
+	comparator_trigger_is_pending(test_dev);
+
+	atomic_clear(&counter);
+	struct comp_nrf_comp_diff_config config = comp_diff_config;
+
+	config.isource = COMP_NRF_COMP_ISOURCE_2UA5;
+	rc = comp_nrf_comp_configure_diff(test_dev, &config);
+	zassert_equal(rc, 0, "Cannot configure comparator.");
+
+	rc = comparator_set_trigger_callback(test_dev, test_callback, NULL);
+	zassert_equal(rc, 0, "Cannot set callback for comparator.");
+
+	rc = comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_BOTH_EDGES);
+	zassert_equal(rc, 0, "Cannot set trigger for comparator.");
+	k_msleep(10);
+
+	atomic_clear(&counter);
+	gpio_pin_set_dt(&test_pin_1, 0);
+	gpio_pin_set_dt(&test_pin_2, 1);
+	k_msleep(10);
+	zassert_equal(atomic_get(&counter), 1, "COMP was not triggered for first threshold cross");
+
+	gpio_pin_set_dt(&test_pin_2, 0);
+	gpio_pin_set_dt(&test_pin_1, 1);
+	k_msleep(10);
+
+	zassert_equal(atomic_get(&counter), 2, "COMP was not triggered for second threshold cross");
+}
+
+/**
+ * @brief Configure comparator in differential mode
+ * trigger both edges, event should be detected for falling one
+ */
+
+ZTEST(comparator_runtime_configure, test_comp_config_diff_falling)
+{
+	int rc;
+
+	gpio_pin_set_dt(&test_pin_1, 0);
+	gpio_pin_set_dt(&test_pin_2, 1);
+	comparator_trigger_is_pending(test_dev);
+
+	atomic_clear(&counter);
+	struct comp_nrf_comp_diff_config config = comp_diff_config;
+
+	config.isource = COMP_NRF_COMP_ISOURCE_5UA;
+	rc = comp_nrf_comp_configure_diff(test_dev, &config);
+
+	zassert_equal(rc,  0, "Cannot configure comparator.");
+
+	rc = comparator_set_trigger_callback(test_dev, test_callback, NULL);
+	zassert_equal(rc, 0, "Cannot set callback for comparator.");
+
+	rc = comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_FALLING_EDGE);
+	zassert_equal(rc, 0, "Cannot set trigger for comparator.");
+
+	atomic_clear(&counter);
+	gpio_pin_set_dt(&test_pin_1, 1);
+	gpio_pin_set_dt(&test_pin_2, 0);
+	k_msleep(10);
+
+	zassert_equal(counter, 0, "COMP was triggered for rising threshold cross");
+
+	gpio_pin_set_dt(&test_pin_1, 0);
+	gpio_pin_set_dt(&test_pin_2, 1);
+	k_msleep(10);
+
+	zassert_equal(atomic_get(&counter), 1, "COMP wasn't triggered for falling threshold cross");
+}
+
+/**
+ * @brief Configure comparator in differential mode
+ * trigger both edges, event should be detected for rising one
+ */
+
+ZTEST(comparator_runtime_configure, test_comp_config_diff_rising)
+{
+	int rc;
+
+	gpio_pin_set_dt(&test_pin_1, 1);
+	gpio_pin_set_dt(&test_pin_2, 0);
+	comparator_trigger_is_pending(test_dev);
+
+	atomic_clear(&counter);
+	struct comp_nrf_comp_diff_config config = comp_diff_config;
+
+	config.isource = COMP_NRF_COMP_ISOURCE_10UA;
+	rc = comp_nrf_comp_configure_diff(test_dev, &config);
+	zassert_equal(rc, 0, "Cannot configure comparator.");
+
+	rc = comparator_set_trigger_callback(test_dev, test_callback, NULL);
+	zassert_equal(rc, 0, "Cannot set callback for comparator.");
+
+	rc = comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_RISING_EDGE);
+	zassert_equal(rc, 0, "Cannot set trigger for comparator.");
+
+	atomic_clear(&counter);
+	gpio_pin_set_dt(&test_pin_1, 0);
+	gpio_pin_set_dt(&test_pin_2, 1);
+	k_msleep(10);
+
+	zassert_equal(atomic_get(&counter), 0, "COMP was triggered for falling threshold cross");
+
+	gpio_pin_set_dt(&test_pin_1, 1);
+	gpio_pin_set_dt(&test_pin_2, 0);
+	k_msleep(10);
+
+	zassert_equal(atomic_get(&counter), 1, "COMP was not triggered for rising threshold cross");
+}
+
+/**
+ * @brief Configure comparator in differential mode
+ * trigger both edges, event should not be detected.
+ */
+
+ZTEST(comparator_runtime_configure, test_comp_config_diff_none)
+{
+	int rc;
+
+	gpio_pin_set_dt(&test_pin_1, 1);
+	gpio_pin_set_dt(&test_pin_2, 0);
+	comparator_trigger_is_pending(test_dev);
+
+	atomic_clear(&counter);
+	struct comp_nrf_comp_diff_config config = comp_diff_config;
+
+	config.isource = COMP_NRF_COMP_ISOURCE_10UA;
+	rc = comp_nrf_comp_configure_diff(test_dev, &config);
+	zassert_equal(rc, 0, "Cannot configure comparator.");
+
+	rc = comparator_set_trigger_callback(test_dev, test_callback, NULL);
+	zassert_equal(rc, 0, "Cannot set callback for comparator.");
+
+	rc = comparator_set_trigger(test_dev, COMPARATOR_TRIGGER_NONE);
+	zassert_equal(rc, 0, "Cannot set trigger for comparator.");
+
+	atomic_clear(&counter);
+	gpio_pin_set_dt(&test_pin_1, 0);
+	gpio_pin_set_dt(&test_pin_2, 1);
+	k_msleep(10);
+
+	zassert_equal(atomic_get(&counter), 0, "COMP was triggered for falling threshold cross");
+
+	gpio_pin_set_dt(&test_pin_1, 1);
+	gpio_pin_set_dt(&test_pin_2, 0);
+	k_msleep(10);
+
+	zassert_equal(atomic_get(&counter), 0, "COMP was not triggered for rising threshold cross");
+}
+
+static void *suite_setup(void)
+{
+	TC_PRINT("Test executed on %s\n", CONFIG_BOARD_TARGET);
+	TC_PRINT("===================================================================\n");
+
+	return NULL;
+}
+
+static void test_before(void *f)
+{
+	ARG_UNUSED(f);
+	gpio_pin_configure_dt(&test_pin_1, GPIO_OUTPUT_INACTIVE);
+	gpio_pin_configure_dt(&test_pin_2, GPIO_OUTPUT_INACTIVE);
+
+}
+
+ZTEST_SUITE(comparator_runtime_configure, NULL, suite_setup, test_before, NULL, NULL);
diff --git a/tests/boards/nrf/comp/testcase.yaml b/tests/boards/nrf/comp/testcase.yaml
new file mode 100644
index 00000000000..d5ac3d9c267
--- /dev/null
+++ b/tests/boards/nrf/comp/testcase.yaml
@@ -0,0 +1,14 @@
+# Copyright (c) 2024 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+common:
+  harness_config:
+    fixture: gpio_loopback
+  tags:
+    - drivers
+    - comparator
+tests:
+  drivers.comparator.nrf_comp:
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp

From c51eec1dceca8d7d78da43ce56b7752f892fe321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Fri, 7 Feb 2025 14:03:12 +0100
Subject: [PATCH 2238/2913] [nrf fromtree] tests: subsys: logging: Test with
 CONFIG_LOG disabled
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Developer reports build error when he uses LOG_RAW in his code
and disables logging in prj.conf using CONFIG_LOG=n.

Add test case for above described scenario.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 5eff0c1cd7bfb40b930bacf3a200fd93f9668c85)
---
 .../logging/log_disabled/CMakeLists.txt       | 13 ++++++
 tests/subsys/logging/log_disabled/prj.conf    |  2 +
 tests/subsys/logging/log_disabled/src/main.c  | 43 +++++++++++++++++++
 .../subsys/logging/log_disabled/testcase.yaml | 16 +++++++
 4 files changed, 74 insertions(+)
 create mode 100644 tests/subsys/logging/log_disabled/CMakeLists.txt
 create mode 100644 tests/subsys/logging/log_disabled/prj.conf
 create mode 100644 tests/subsys/logging/log_disabled/src/main.c
 create mode 100644 tests/subsys/logging/log_disabled/testcase.yaml

diff --git a/tests/subsys/logging/log_disabled/CMakeLists.txt b/tests/subsys/logging/log_disabled/CMakeLists.txt
new file mode 100644
index 00000000000..b656ca6b4a2
--- /dev/null
+++ b/tests/subsys/logging/log_disabled/CMakeLists.txt
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+project(log_disable)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/tests/subsys/logging/log_disabled/prj.conf b/tests/subsys/logging/log_disabled/prj.conf
new file mode 100644
index 00000000000..9717b5ec67e
--- /dev/null
+++ b/tests/subsys/logging/log_disabled/prj.conf
@@ -0,0 +1,2 @@
+CONFIG_PRINTK=y
+CONFIG_LOG=n
diff --git a/tests/subsys/logging/log_disabled/src/main.c b/tests/subsys/logging/log_disabled/src/main.c
new file mode 100644
index 00000000000..100681de358
--- /dev/null
+++ b/tests/subsys/logging/log_disabled/src/main.c
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(app, LOG_LEVEL_DBG);
+
+int main(void)
+{
+	uint8_t data[] = {0, 1, 2, 3};
+	uint32_t dummy_1 = 1;
+	uint32_t dummy_2 = 2;
+	uint32_t dummy_3 = 3;
+	uint32_t dummy_4 = 4;
+	uint32_t dummy_5 = 5;
+	uint32_t dummy_6 = 6;
+	uint32_t dummy_7 = 7;
+
+	LOG_DBG("Debug log %u", dummy_1);
+	LOG_INF("Info log %u", dummy_2);
+	LOG_WRN("Warning log %u", dummy_3);
+	LOG_ERR("Error log %u", dummy_4);
+
+	for (int i = 0; i < 10; i++) {
+		LOG_WRN_ONCE("Warning on the first execution only %u", dummy_5);
+	}
+
+	LOG_PRINTK("Printk log %u\n", dummy_6);
+
+	LOG_RAW("Raw log %u\n", dummy_7);
+
+	LOG_HEXDUMP_DBG(data, sizeof(data), "Debug data");
+	LOG_HEXDUMP_INF(data, sizeof(data), "Info data");
+	LOG_HEXDUMP_WRN(data, sizeof(data), "Warning data");
+	LOG_HEXDUMP_ERR(data, sizeof(data), "Error data");
+
+	printk("All done.\n");
+	return 0;
+}
diff --git a/tests/subsys/logging/log_disabled/testcase.yaml b/tests/subsys/logging/log_disabled/testcase.yaml
new file mode 100644
index 00000000000..06a327988c9
--- /dev/null
+++ b/tests/subsys/logging/log_disabled/testcase.yaml
@@ -0,0 +1,16 @@
+common:
+  tags:
+    - logging
+  build_only: true
+  platform_allow:
+    - native_sim
+  integration_platforms:
+    - native_sim
+
+tests:
+  logging.log_disable:
+    harness: console
+    harness_config:
+      type: one_line
+      regex:
+        - "All done."

From fbdb4be26272ad5ea133bc7633ee9b69d3777af5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 12 Dec 2024 09:11:04 +0100
Subject: [PATCH 2239/2913] [nrf fromtree] dts: common: nordic: Add clock
 source to timers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add clock source to timers which indicates maximum frequency of
the timer instance.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 96d78bd56ac5a429f9eb8541aabab399df9ac162)
---
 dts/common/nordic/nrf54h20.dtsi        |  6 +++---
 dts/common/nordic/nrf54l09.dtsi        |  5 ++---
 dts/common/nordic/nrf54l20.dtsi        |  4 ++--
 dts/common/nordic/nrf54l_05_10_15.dtsi |  4 ++--
 dts/common/nordic/nrf9280.dtsi         | 10 +++++-----
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 5aa5292bccb..77b8dc9fb55 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -385,7 +385,7 @@
 				status = "disabled";
 				cc-num = <8>;
 				interrupts = <40 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&fll16m>;
+				clocks = <&hfxo>;
 				max-bit-width = <32>;
 				max-frequency = <DT_FREQ_M(32)>;
 				prescaler = <0>;
@@ -397,7 +397,7 @@
 				status = "disabled";
 				cc-num = <8>;
 				interrupts = <41 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&fll16m>;
+				clocks = <&hfxo>;
 				max-bit-width = <32>;
 				max-frequency = <DT_FREQ_M(32)>;
 				prescaler = <0>;
@@ -409,7 +409,7 @@
 				status = "disabled";
 				cc-num = <8>;
 				interrupts = <42 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&fll16m>;
+				clocks = <&hfxo>;
 				max-bit-width = <32>;
 				max-frequency = <DT_FREQ_M(32)>;
 				prescaler = <0>;
diff --git a/dts/common/nordic/nrf54l09.dtsi b/dts/common/nordic/nrf54l09.dtsi
index 37acf9d34cb..78b08b5510f 100644
--- a/dts/common/nordic/nrf54l09.dtsi
+++ b/dts/common/nordic/nrf54l09.dtsi
@@ -156,8 +156,7 @@
 				cc-num = <6>;
 				max-bit-width = <32>;
 				interrupts = <85 NRF_DEFAULT_IRQ_PRIORITY>;
-				/* NRFX-6881: Temporary workaround for timer00 */
-				max-frequency = <DT_FREQ_M(64)>;
+				clocks = <&hfpll>;
 				prescaler = <0>;
 			};
 
@@ -186,7 +185,7 @@
 				cc-num = <8>;
 				max-bit-width = <32>;
 				interrupts = <133 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(32)>;
+				clocks = <&hfxo>;
 				prescaler = <0>;
 			};
 
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 7487915cdfd..a7f72bf5a30 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -152,7 +152,7 @@
 				cc-num = <6>;
 				max-bit-width = <32>;
 				interrupts = <85 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(128)>;
+				clocks = <&hfpll>;
 				prescaler = <0>;
 			};
 
@@ -181,7 +181,7 @@
 				cc-num = <8>;
 				max-bit-width = <32>;
 				interrupts = <133 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(32)>;
+				clocks = <&hfxo>;
 				prescaler = <0>;
 			};
 
diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi
index d1141643ef1..d4e0ee6df00 100644
--- a/dts/common/nordic/nrf54l_05_10_15.dtsi
+++ b/dts/common/nordic/nrf54l_05_10_15.dtsi
@@ -191,7 +191,7 @@
 				cc-num = <6>;
 				max-bit-width = <32>;
 				interrupts = <85 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(128)>;
+				clocks = <&hfpll>;
 				prescaler = <0>;
 			};
 
@@ -220,7 +220,7 @@
 				cc-num = <8>;
 				max-bit-width = <32>;
 				interrupts = <133 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(32)>;
+				clocks = <&hfxo>;
 				prescaler = <0>;
 			};
 
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index fe0bcaeaed1..160ea12a480 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -265,7 +265,7 @@
 				cc-num = <8>;
 				interrupts = <40 NRF_DEFAULT_IRQ_PRIORITY>;
 				max-bit-width = <32>;
-				max-frequency = <DT_FREQ_M(32)>;
+				clocks = <&hfxo>;
 				prescaler = <0>;
 			};
 
@@ -276,7 +276,7 @@
 				cc-num = <8>;
 				interrupts = <41 NRF_DEFAULT_IRQ_PRIORITY>;
 				max-bit-width = <32>;
-				max-frequency = <DT_FREQ_M(32)>;
+				clocks = <&hfxo>;
 				prescaler = <0>;
 			};
 
@@ -287,7 +287,7 @@
 				cc-num = <8>;
 				interrupts = <42 NRF_DEFAULT_IRQ_PRIORITY>;
 				max-bit-width = <32>;
-				max-frequency = <DT_FREQ_M(32)>;
+				clocks = <&hfxo>;
 				prescaler = <0>;
 			};
 
@@ -466,7 +466,7 @@
 				cc-num = <6>;
 				interrupts = <226 NRF_DEFAULT_IRQ_PRIORITY>;
 				max-bit-width = <32>;
-				max-frequency = <DT_FREQ_M(320)>;
+				clocks = <&hsfll120>;
 				prescaler = <0>;
 			};
 
@@ -477,7 +477,7 @@
 				cc-num = <6>;
 				interrupts = <227 NRF_DEFAULT_IRQ_PRIORITY>;
 				max-bit-width = <32>;
-				max-frequency = <DT_FREQ_M(320)>;
+				clocks = <&hsfll120>;
 				prescaler = <0>;
 			};
 

From 32c44f2477a9a23053858085e369e55ab4bc689b Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Date: Wed, 8 Jan 2025 14:27:31 +0100
Subject: [PATCH 2240/2913] [nrf fromtree] manifest: update hal_nordic

Update hal_nordic so that nrfx twister files use native YAML
lists.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
(cherry picked from commit ceaf33c041c2fec891863a257c61c0edc8d9396f)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 9423981e8e4..387deacadd8 100644
--- a/west.yml
+++ b/west.yml
@@ -193,7 +193,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: c563b0e56dfa7e3915637b12b3428e6de36012be
+      revision: ecea8cdbd1a7d557563b47ad304ee9ba7a8709e5
       path: modules/hal/nordic
       groups:
         - hal

From f901bd4610bd0d9090f2b1f3b0c7c51b2dadbb9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 15 Jan 2025 11:16:29 +0100
Subject: [PATCH 2241/2913] [nrf fromtree] tests: drivers: uart: mix_fifo_poll:
 Fix for nrf54h20dk//cpurad
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add check for status okay for dut2. Compilation was failing if dut2
existed but was disabled.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 9c91b38f8f9b056da91fa845fa32a06e3e419c8f)
---
 tests/drivers/uart/uart_mix_fifo_poll/src/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/drivers/uart/uart_mix_fifo_poll/src/main.c b/tests/drivers/uart/uart_mix_fifo_poll/src/main.c
index 6fe7e51e973..0c83f5f2bce 100644
--- a/tests/drivers/uart/uart_mix_fifo_poll/src/main.c
+++ b/tests/drivers/uart/uart_mix_fifo_poll/src/main.c
@@ -50,7 +50,7 @@ static struct dut_data duts[] = {
 		.dev = DEVICE_DT_GET(UART_NODE),
 		.name = DT_NODE_FULL_NAME(UART_NODE),
 	},
-#if DT_NODE_EXISTS(DT_NODELABEL(dut2))
+#if DT_NODE_EXISTS(DT_NODELABEL(dut2)) && DT_NODE_HAS_STATUS(DT_NODELABEL(dut2), okay)
 	{
 		.dev = DEVICE_DT_GET(DT_NODELABEL(dut2)),
 		.name = DT_NODE_FULL_NAME(DT_NODELABEL(dut2)),

From fe18e3ca945de9de79316c077fecf76e84dedb1c Mon Sep 17 00:00:00 2001
From: Valerio Setti <vsetti@baylibre.com>
Date: Mon, 13 Jan 2025 17:51:27 +0100
Subject: [PATCH 2242/2913] [nrf fromtree] Bluetooth: make
 MBEDTLS_AES_ROM_TABLES implied not selected

MBEDTLS_AES_ROM_TABLES let Mbed TLS use precomputed AES tables instead
of generating them at runtime and placing in RAM. It clearly helps
reducing the RAM footprint, but at the same time it increases the ROM
one. In order to let the final user decide which kind of optimization
they prefer, we change the "select" statement with "imply".

Signed-off-by: Valerio Setti <vsetti@baylibre.com>
(cherry picked from commit aaf463ca7beacff51cb723d087c7fdc826a30276)
---
 subsys/bluetooth/crypto/Kconfig    | 2 +-
 subsys/bluetooth/host/Kconfig.gatt | 2 +-
 subsys/bluetooth/mesh/Kconfig      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/subsys/bluetooth/crypto/Kconfig b/subsys/bluetooth/crypto/Kconfig
index 5c1c2fb20fd..e5ab2117b3b 100644
--- a/subsys/bluetooth/crypto/Kconfig
+++ b/subsys/bluetooth/crypto/Kconfig
@@ -7,6 +7,6 @@ config BT_CRYPTO
 	select MBEDTLS_PSA_CRYPTO_C if !BUILD_WITH_TFM
 	select PSA_WANT_KEY_TYPE_AES
 	select PSA_WANT_ALG_CMAC
-	select MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
+	imply MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
 	help
 	  This option enables the Bluetooth Cryptographic Toolbox.
diff --git a/subsys/bluetooth/host/Kconfig.gatt b/subsys/bluetooth/host/Kconfig.gatt
index f9b099058cc..ece90724997 100644
--- a/subsys/bluetooth/host/Kconfig.gatt
+++ b/subsys/bluetooth/host/Kconfig.gatt
@@ -135,7 +135,7 @@ config BT_GATT_CACHING
 	depends on PSA_CRYPTO_CLIENT
 	select PSA_WANT_KEY_TYPE_AES
 	select PSA_WANT_ALG_CMAC
-	select MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
+	imply MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
 	help
 	  This option enables support for GATT Caching. When enabled the stack
 	  will register Client Supported Features and Database Hash
diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 4f0ff3bc88c..a33b20f663d 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -1499,7 +1499,7 @@ config BT_MESH_USES_MBEDTLS_PSA
 	select PSA_WANT_ALG_CMAC
 	select PSA_WANT_ALG_ECB_NO_PADDING
 	select PSA_WANT_KEY_TYPE_AES
-	select MBEDTLS_AES_ROM_TABLES
+	imply MBEDTLS_AES_ROM_TABLES
 	select PSA_WANT_ALG_CCM
 	select PSA_WANT_KEY_TYPE_HMAC
 	select PSA_WANT_ALG_HMAC

From 01bf89fae968ba4586002741b94291db8e34ed3b Mon Sep 17 00:00:00 2001
From: Valerio Setti <vsetti@baylibre.com>
Date: Tue, 14 Jan 2025 10:59:48 +0100
Subject: [PATCH 2243/2913] [nrf fromtree] Bluetooth: crypto: add select
 PSA_WANT_ALG_ECB_NO_PADDING

Explicitly enable "PSA_WANT_ALG_ECB_NO_PADDING" to select the AES ECB
mode that it is used in CMAC operation.

Signed-off-by: Valerio Setti <vsetti@baylibre.com>
(cherry picked from commit 12eee615333625049d70f167f674018489f7139c)
---
 subsys/bluetooth/crypto/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/subsys/bluetooth/crypto/Kconfig b/subsys/bluetooth/crypto/Kconfig
index e5ab2117b3b..0856daf9d9a 100644
--- a/subsys/bluetooth/crypto/Kconfig
+++ b/subsys/bluetooth/crypto/Kconfig
@@ -7,6 +7,7 @@ config BT_CRYPTO
 	select MBEDTLS_PSA_CRYPTO_C if !BUILD_WITH_TFM
 	select PSA_WANT_KEY_TYPE_AES
 	select PSA_WANT_ALG_CMAC
+	select PSA_WANT_ALG_ECB_NO_PADDING
 	imply MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
 	help
 	  This option enables the Bluetooth Cryptographic Toolbox.

From d04e975bf6237e8ef9f154650b735c764455e284 Mon Sep 17 00:00:00 2001
From: Valerio Setti <vsetti@baylibre.com>
Date: Tue, 14 Jan 2025 12:04:11 +0100
Subject: [PATCH 2244/2913] [nrf fromtree] Bluetooth: Host: imply
 MBEDTLS_PSA_P256M_DRIVER_ENABLED rather than select

Allow the user to disable the P256-M driver in case their version of
Mbed TLS does not support this driver.

Signed-off-by: Valerio Setti <vsetti@baylibre.com>
(cherry picked from commit 11a8a39c635ccde29c9d62282f7b3c8be59a1430)
---
 subsys/bluetooth/host/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index 8094e3ae67f..4ed05bbda60 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -1006,7 +1006,7 @@ config BT_SEND_ECC_EMULATION
 	select PSA_WANT_ALG_ECDH
 	select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE
 	select PSA_WANT_ECC_SECP_R1_256
-	select MBEDTLS_PSA_P256M_DRIVER_ENABLED if MBEDTLS_PSA_CRYPTO_C
+	imply MBEDTLS_PSA_P256M_DRIVER_ENABLED if MBEDTLS_PSA_CRYPTO_C
 	select BT_LONG_WQ
 	depends on BT_ECC && (BT_HCI_RAW || BT_HCI_HOST)
 	default y if HAS_BT_CTLR && !BT_CTLR_ECDH

From 77d8fa5ed982d06239dee01b77b0340aeb1450a0 Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Tue, 14 Jan 2025 12:59:58 +0100
Subject: [PATCH 2245/2913] [nrf fromtree] tests: kernel: Increase
 MAX_THREAD_BYTES to 6

Increase the MAX_THREAD_BYTES from 5->6 to accomodate
for devices with an increased number of threads in the
tests schedule_api and dynamic_thread_stack.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
(cherry picked from commit 37c23deea19a7118da6b428ef5fc916c9c2a0590)
---
 tests/kernel/sched/schedule_api/prj.conf           | 2 +-
 tests/kernel/sched/schedule_api/prj_dumb.conf      | 2 +-
 tests/kernel/sched/schedule_api/prj_multiq.conf    | 2 +-
 tests/kernel/threads/dynamic_thread_stack/prj.conf | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/kernel/sched/schedule_api/prj.conf b/tests/kernel/sched/schedule_api/prj.conf
index 785e9a3987b..8b649a3b7fc 100644
--- a/tests/kernel/sched/schedule_api/prj.conf
+++ b/tests/kernel/sched/schedule_api/prj.conf
@@ -3,7 +3,7 @@ CONFIG_IRQ_OFFLOAD=y
 CONFIG_NUM_PREEMPT_PRIORITIES=30
 CONFIG_NUM_COOP_PRIORITIES=30
 #CONFIG_SCHED_SCALABLE=y
-CONFIG_MAX_THREAD_BYTES=5
+CONFIG_MAX_THREAD_BYTES=6
 CONFIG_TEST_USERSPACE=y
 CONFIG_MP_MAX_NUM_CPUS=1
 CONFIG_ZTEST_FATAL_HOOK=y
diff --git a/tests/kernel/sched/schedule_api/prj_dumb.conf b/tests/kernel/sched/schedule_api/prj_dumb.conf
index a1d0cf6dced..0b05486bffc 100644
--- a/tests/kernel/sched/schedule_api/prj_dumb.conf
+++ b/tests/kernel/sched/schedule_api/prj_dumb.conf
@@ -2,7 +2,7 @@ CONFIG_ZTEST=y
 CONFIG_IRQ_OFFLOAD=y
 CONFIG_TEST_USERSPACE=y
 CONFIG_SCHED_DUMB=y
-CONFIG_MAX_THREAD_BYTES=5
+CONFIG_MAX_THREAD_BYTES=6
 CONFIG_MP_MAX_NUM_CPUS=1
 CONFIG_ZTEST_FATAL_HOOK=y
 CONFIG_MINIMAL_LIBC=y
diff --git a/tests/kernel/sched/schedule_api/prj_multiq.conf b/tests/kernel/sched/schedule_api/prj_multiq.conf
index cfe09fbce47..84c9d80ac61 100644
--- a/tests/kernel/sched/schedule_api/prj_multiq.conf
+++ b/tests/kernel/sched/schedule_api/prj_multiq.conf
@@ -2,7 +2,7 @@ CONFIG_ZTEST=y
 CONFIG_IRQ_OFFLOAD=y
 CONFIG_TEST_USERSPACE=y
 CONFIG_SCHED_MULTIQ=y
-CONFIG_MAX_THREAD_BYTES=5
+CONFIG_MAX_THREAD_BYTES=6
 CONFIG_MP_MAX_NUM_CPUS=1
 CONFIG_ZTEST_FATAL_HOOK=y
 CONFIG_NUM_COOP_PRIORITIES=30
diff --git a/tests/kernel/threads/dynamic_thread_stack/prj.conf b/tests/kernel/threads/dynamic_thread_stack/prj.conf
index 1f31fc34e79..b9c4f491ee7 100644
--- a/tests/kernel/threads/dynamic_thread_stack/prj.conf
+++ b/tests/kernel/threads/dynamic_thread_stack/prj.conf
@@ -1,7 +1,7 @@
 CONFIG_ZTEST=y
 CONFIG_INIT_STACKS=y
 CONFIG_THREAD_STACK_INFO=y
-CONFIG_MAX_THREAD_BYTES=5
+CONFIG_MAX_THREAD_BYTES=6
 CONFIG_DYNAMIC_THREAD=y
 CONFIG_DYNAMIC_THREAD_POOL_SIZE=2
 CONFIG_DYNAMIC_THREAD_ALLOC=y

From 311252263afcacea27feaf7988fbe1668ffc3aaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 16 Jan 2025 16:40:02 +0100
Subject: [PATCH 2246/2913] [nrf fromtree] mgmt: mcumgr: grp: os_mgmt: Fix
 compilation warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a follow up to commit 770482a45a07adcd2d118b3876fa151c0a57ba63.

Add initialization of the `ok` variable to prevent the "may be
uninitialized" warning when `CONFIG_BOOTLOADER_MCUBOOT` is not
defined.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit 6d9513ef3564cccd28e6e8a1976ac0e4f4cd8db9)
---
 subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c b/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
index 5a482d53761..8629c0030f9 100644
--- a/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
@@ -450,7 +450,7 @@ os_mgmt_bootloader_info(struct smp_streamer *ctxt)
 	zcbor_state_t *zsd = ctxt->reader->zs;
 	struct zcbor_string query = { 0 };
 	size_t decoded;
-	bool ok;
+	bool ok = true;
 	bool has_output = false;
 
 #if defined(CONFIG_MCUMGR_GRP_OS_BOOTLOADER_INFO_HOOK)

From cf375a2398dbabcaeeec2518895805c0a09704d4 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <npitre@baylibre.com>
Date: Tue, 7 Jan 2025 12:00:43 -0500
Subject: [PATCH 2247/2913] [nrf fromtree] Revert "arch: deprecate `_current`"

Mostly a revert of commit b1def7145fd1 ("arch: deprecate `_current`").

This commit was part of PR #80716 whose initial purpose was about providing
an architecture specific optimization for _current. The actual deprecation
was sneaked in later on without proper discussion.

The Zephyr core always used _current before and that was fine. It is quite
prevalent as well and the alternative is proving rather verbose.
Furthermore, as a concept, the "current thread" is not something that is
necessarily architecture specific. Therefore the primary abstraction
should not carry the arch_ prefix.

Hence this revert.

Signed-off-by: Nicolas Pitre <npitre@baylibre.com>
(cherry picked from commit 46aa6717ffec53af683fc635742eb5fb62a472f5)
---
 arch/arc/Kconfig                              |   2 +-
 arch/arc/core/fault.c                         |   2 +-
 arch/arc/core/irq_offload.c                   |   4 +-
 arch/arc/core/thread.c                        |  16 +-
 arch/arc/core/tls.c                           |   2 +-
 arch/arm/core/cortex_a_r/fault.c              |   4 +-
 arch/arm/core/cortex_a_r/swap_helper.S        |   4 +-
 arch/arm/core/cortex_a_r/thread.c             |  36 ++---
 arch/arm/core/cortex_m/swap_helper.S          |   2 +-
 arch/arm/core/cortex_m/thread.c               |  32 ++--
 arch/arm/core/cortex_m/thread_abort.c         |   2 +-
 .../arm/include/cortex_a_r/kernel_arch_func.h |   6 +-
 arch/arm/include/cortex_m/kernel_arch_func.h  |   6 +-
 arch/arm64/core/cortex_r/arm_mpu.c            |   6 +-
 arch/arm64/core/fatal.c                       |   7 +-
 arch/arm64/core/fpu.c                         |  14 +-
 arch/arm64/core/mmu.c                         |   2 +-
 arch/arm64/core/smp.c                         |   2 +-
 arch/arm64/core/thread.c                      |  10 +-
 arch/posix/core/swap.c                        |  12 +-
 arch/posix/core/thread.c                      |   2 +-
 arch/riscv/Kconfig                            |   2 +-
 arch/riscv/core/fatal.c                       |  28 ++--
 arch/riscv/core/fpu.c                         |  24 +--
 arch/riscv/core/isr.S                         |   4 +-
 arch/riscv/core/pmp.c                         |   6 +-
 arch/riscv/core/stacktrace.c                  |  13 +-
 arch/riscv/core/thread.c                      |  27 ++--
 arch/sparc/core/thread.c                      |   2 +-
 arch/x86/core/fatal.c                         |  18 +--
 arch/x86/core/ia32/float.c                    |   8 +-
 arch/x86/core/userspace.c                     |  14 +-
 arch/x86/core/x86_mmu.c                       |  15 +-
 arch/xtensa/core/fatal.c                      |   2 +-
 arch/xtensa/core/ptables.c                    |   2 +-
 arch/xtensa/core/thread.c                     |   2 +-
 arch/xtensa/core/vector_handlers.c            |   2 +-
 boards/native/native_posix/irq_handler.c      |   2 +-
 boards/native/native_sim/irq_handler.c        |   2 +-
 boards/native/nrf_bsim/irq_handler.c          |   2 +-
 doc/kernel/services/smp/smp.rst               |   2 +-
 doc/releases/migration-guide-4.1.rst          |   4 -
 doc/releases/release-notes-4.1.rst            |   4 +-
 drivers/wifi/eswifi/eswifi.h                  |   4 +-
 include/zephyr/arch/arch_interface.h          |   2 +-
 include/zephyr/arch/common/arch_inlines.h     |   2 +-
 include/zephyr/arch/x86/ia32/arch.h           |   2 +-
 include/zephyr/internal/syscall_handler.h     |   4 +-
 include/zephyr/kernel_structs.h               |   8 +-
 kernel/Kconfig                                |   2 +-
 kernel/errno.c                                |   4 +-
 kernel/fatal.c                                |   2 +-
 kernel/idle.c                                 |   4 +-
 kernel/include/kernel_internal.h              |   2 +-
 kernel/include/ksched.h                       |   4 +-
 kernel/include/kswap.h                        |   8 +-
 kernel/include/kthread.h                      |   6 +-
 kernel/include/priority_q.h                   |  20 +--
 kernel/ipi.c                                  |   2 +-
 kernel/mailbox.c                              |  10 +-
 kernel/mem_domain.c                           |   2 +-
 kernel/mem_slab.c                             |   2 +-
 kernel/mempool.c                              |   2 +-
 kernel/mmu.c                                  |   2 +-
 kernel/msg_q.c                                |   4 +-
 kernel/mutex.c                                |  16 +-
 kernel/pipes.c                                |  12 +-
 kernel/poll.c                                 |   2 +-
 kernel/queue.c                                |   4 +-
 kernel/sched.c                                | 138 +++++++++---------
 kernel/smp.c                                  |  10 +-
 kernel/spinlock_validate.c                    |   8 +-
 kernel/stack.c                                |   2 +-
 kernel/thread.c                               |  53 +++----
 kernel/timeslicing.c                          |   6 +-
 kernel/userspace.c                            |  12 +-
 kernel/userspace_handler.c                    |   2 +-
 kernel/work.c                                 |   2 +-
 lib/libc/armstdc/src/libc-hooks.c             |   2 +-
 lib/os/p4wq.c                                 |  12 +-
 scripts/build/gen_syscalls.py                 |   8 +-
 soc/espressif/esp32/soc.c                     |   2 +-
 soc/espressif/esp32/soc_appcpu.c              |   2 +-
 soc/espressif/esp32s2/soc.c                   |   2 +-
 soc/espressif/esp32s3/soc.c                   |   2 +-
 soc/espressif/esp32s3/soc_appcpu.c            |   2 +-
 subsys/net/lib/sockets/sockets.c              |   2 +-
 subsys/portability/cmsis_rtos_v2/kernel.c     |   6 +-
 subsys/profiling/perf/backends/perf_riscv.c   |   4 +-
 subsys/profiling/perf/backends/perf_x86.c     |   2 +-
 subsys/profiling/perf/backends/perf_x86_64.c  |   8 +-
 .../modules/kernel_service/thread/unwind.c    |   2 +-
 .../arm/arm_interrupt/src/arm_interrupt.c     |   6 +-
 .../arm/arm_thread_swap/src/arm_syscalls.c    |  28 ++--
 .../arm/arm_thread_swap/src/arm_thread_arch.c |  54 +++----
 .../arch/riscv/userspace/riscv_gp/src/main.c  |   2 +-
 .../benchmarks/footprints/src/system_thread.c |   4 +-
 tests/kernel/context/src/main.c               |   8 +-
 tests/kernel/fatal/exception/src/main.c       |   2 +-
 tests/kernel/fatal/message_capture/src/main.c |   2 +-
 tests/kernel/ipi_cascade/src/main.c           |  10 +-
 .../mem_protect/mem_protect/src/inherit.c     |   2 +-
 .../mem_protect/obj_validation/src/main.c     |   4 +-
 tests/kernel/mem_protect/userspace/src/main.c |   8 +-
 tests/kernel/sched/deadline/src/main.c        |  12 +-
 tests/kernel/smp/src/main.c                   |  17 +--
 tests/kernel/threads/thread_apis/src/main.c   |   6 +-
 .../thread_apis/src/test_essential_thread.c   |  14 +-
 .../src/test_thread_runtime_stats.c           |  28 ++--
 tests/subsys/pm/power_mgmt/src/main.c         |   6 +-
 tests/ztest/error_hook/src/main.c             |   6 +-
 111 files changed, 494 insertions(+), 504 deletions(-)

diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index fa00c3722e6..d44ca272b11 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -262,7 +262,7 @@ config ARC_CURRENT_THREAD_USE_NO_TLS
 	  RGF_NUM_BANKS the parameter is disabled by-default because banks syncronization
 	  requires significant time, and it slows down performance.
 	  ARCMWDT works with tls pointer in different way then GCC. Optimized access to
-	  TLS pointer via arch_current_thread() does not provide significant advantages
+	  TLS pointer via the _current symbol does not provide significant advantages
 	  in case of MetaWare.
 
 config GEN_ISR_TABLES
diff --git a/arch/arc/core/fault.c b/arch/arc/core/fault.c
index a6c8410e633..6f9da3cd1e0 100644
--- a/arch/arc/core/fault.c
+++ b/arch/arc/core/fault.c
@@ -55,7 +55,7 @@ static bool z_check_thread_stack_fail(const uint32_t fault_addr, uint32_t sp)
 {
 #if defined(CONFIG_MULTITHREADING)
 	uint32_t guard_end, guard_start;
-	const struct k_thread *thread = arch_current_thread();
+	const struct k_thread *thread = _current;
 
 	if (!thread) {
 		/* TODO: Under what circumstances could we get here ? */
diff --git a/arch/arc/core/irq_offload.c b/arch/arc/core/irq_offload.c
index f24a3e7dd8a..d1a3f900ca3 100644
--- a/arch/arc/core/irq_offload.c
+++ b/arch/arc/core/irq_offload.c
@@ -49,8 +49,8 @@ void arch_irq_offload(irq_offload_routine_t routine, const void *parameter)
 
 	__asm__ volatile("sync");
 
-	/* If arch_current_thread() was aborted in the offload routine, we shouldn't be here */
-	__ASSERT_NO_MSG((arch_current_thread()->base.thread_state & _THREAD_DEAD) == 0);
+	/* If _current was aborted in the offload routine, we shouldn't be here */
+	__ASSERT_NO_MSG((_current->base.thread_state & _THREAD_DEAD) == 0);
 }
 
 /* need to be executed on every core in the system */
diff --git a/arch/arc/core/thread.c b/arch/arc/core/thread.c
index cb5352bc475..4b1d836103e 100644
--- a/arch/arc/core/thread.c
+++ b/arch/arc/core/thread.c
@@ -210,7 +210,7 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 #ifdef CONFIG_MULTITHREADING
 void *z_arch_get_next_switch_handle(struct k_thread **old_thread)
 {
-	*old_thread = arch_current_thread();
+	*old_thread =  _current;
 
 	return z_get_next_switch_handle(NULL);
 }
@@ -227,16 +227,16 @@ void *z_arch_get_next_switch_handle(struct k_thread **old_thread)
 FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 					void *p1, void *p2, void *p3)
 {
-	setup_stack_vars(arch_current_thread());
+	setup_stack_vars(_current);
 
 	/* possible optimizaiton: no need to load mem domain anymore */
 	/* need to lock cpu here ? */
-	configure_mpu_thread(arch_current_thread());
+	configure_mpu_thread(_current);
 
 	z_arc_userspace_enter(user_entry, p1, p2, p3,
-			      (uint32_t)arch_current_thread()->stack_info.start,
-			      (arch_current_thread()->stack_info.size -
-			       arch_current_thread()->stack_info.delta), arch_current_thread());
+			      (uint32_t)_current->stack_info.start,
+			      (_current->stack_info.size -
+			       _current->stack_info.delta), _current);
 	CODE_UNREACHABLE;
 }
 #endif
@@ -336,7 +336,7 @@ int arc_vpx_lock(k_timeout_t timeout)
 
 	id = _current_cpu->id;
 #if (CONFIG_MP_MAX_NUM_CPUS > 1) && defined(CONFIG_SCHED_CPU_MASK)
-	__ASSERT(!arch_is_in_isr() && (arch_current_thread()->base.cpu_mask == BIT(id)), "");
+	__ASSERT(!arch_is_in_isr() && (_current->base.cpu_mask == BIT(id)), "");
 #endif
 	k_spin_unlock(&lock, key);
 
@@ -355,7 +355,7 @@ void arc_vpx_unlock(void)
 
 	key = k_spin_lock(&lock);
 #if (CONFIG_MP_MAX_NUM_CPUS > 1) && defined(CONFIG_SCHED_CPU_MASK)
-	__ASSERT(!arch_is_in_isr() && (arch_current_thread()->base.cpu_mask == BIT(id)), "");
+	__ASSERT(!arch_is_in_isr() && (_current->base.cpu_mask == BIT(id)), "");
 #endif
 	id = _current_cpu->id;
 	k_spin_unlock(&lock, key);
diff --git a/arch/arc/core/tls.c b/arch/arc/core/tls.c
index 9585b228926..3cf7d45cab9 100644
--- a/arch/arc/core/tls.c
+++ b/arch/arc/core/tls.c
@@ -29,7 +29,7 @@ size_t arch_tls_stack_setup(struct k_thread *new_thread, char *stack_ptr)
 
 void *_Preserve_flags _mwget_tls(void)
 {
-	return (void *)(arch_current_thread()->tls);
+	return (void *)(_current->tls);
 }
 
 #else
diff --git a/arch/arm/core/cortex_a_r/fault.c b/arch/arm/core/cortex_a_r/fault.c
index 5e3d38a66b4..daf1d2345ca 100644
--- a/arch/arm/core/cortex_a_r/fault.c
+++ b/arch/arm/core/cortex_a_r/fault.c
@@ -178,7 +178,7 @@ bool z_arm_fault_undef_instruction_fp(void)
 		 * context because it is about to be overwritten.
 		 */
 		if (((_current_cpu->nested == 2)
-				&& (arch_current_thread()->base.user_options & K_FP_REGS))
+				&& (_current->base.user_options & K_FP_REGS))
 			|| ((_current_cpu->nested > 2)
 				&& (spill_esf->undefined & FPEXC_EN))) {
 			/*
@@ -196,7 +196,7 @@ bool z_arm_fault_undef_instruction_fp(void)
 		 * means that a thread that uses the VFP does not have to,
 		 * but should, set K_FP_REGS on thread creation.
 		 */
-		arch_current_thread()->base.user_options |= K_FP_REGS;
+		_current->base.user_options |= K_FP_REGS;
 	}
 
 	return false;
diff --git a/arch/arm/core/cortex_a_r/swap_helper.S b/arch/arm/core/cortex_a_r/swap_helper.S
index 36dd9a96548..a41e1ab5942 100644
--- a/arch/arm/core/cortex_a_r/swap_helper.S
+++ b/arch/arm/core/cortex_a_r/swap_helper.S
@@ -70,7 +70,7 @@ SECTION_FUNC(TEXT, z_arm_do_swap)
 
 #if defined(CONFIG_FPU_SHARING)
     ldrb r0, [r2, #_thread_offset_to_user_options]
-    tst r0, #K_FP_REGS /* arch_current_thread()->base.user_options & K_FP_REGS */
+    tst r0, #K_FP_REGS /* _current->base.user_options & K_FP_REGS */
     beq out_fp_inactive
 
     mov ip, #FPEXC_EN
@@ -152,7 +152,7 @@ out_fp_inactive:
 
 #if defined(CONFIG_FPU_SHARING)
     ldrb r0, [r2, #_thread_offset_to_user_options]
-    tst r0, #K_FP_REGS /* arch_current_thread()->base.user_options & K_FP_REGS */
+    tst r0, #K_FP_REGS /* _current->base.user_options & K_FP_REGS */
     beq in_fp_inactive
 
     mov r3, #FPEXC_EN
diff --git a/arch/arm/core/cortex_a_r/thread.c b/arch/arm/core/cortex_a_r/thread.c
index 43be2d50690..b3bd91ce5c1 100644
--- a/arch/arm/core/cortex_a_r/thread.c
+++ b/arch/arm/core/cortex_a_r/thread.c
@@ -198,8 +198,8 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 {
 
 	/* Set up privileged stack before entering user mode */
-	arch_current_thread()->arch.priv_stack_start =
-		(uint32_t)z_priv_stack_find(arch_current_thread()->stack_obj);
+	_current->arch.priv_stack_start =
+		(uint32_t)z_priv_stack_find(_current->stack_obj);
 #if defined(CONFIG_MPU_STACK_GUARD)
 #if defined(CONFIG_THREAD_STACK_INFO)
 	/* We're dropping to user mode which means the guard area is no
@@ -208,13 +208,13 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 	 * which accounted for memory borrowed from the thread stack.
 	 */
 #if FP_GUARD_EXTRA_SIZE > 0
-	if ((arch_current_thread()->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) {
-		arch_current_thread()->stack_info.start -= FP_GUARD_EXTRA_SIZE;
-		arch_current_thread()->stack_info.size += FP_GUARD_EXTRA_SIZE;
+	if ((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) {
+		_current->stack_info.start -= FP_GUARD_EXTRA_SIZE;
+		_current->stack_info.size += FP_GUARD_EXTRA_SIZE;
 	}
 #endif /* FP_GUARD_EXTRA_SIZE */
-	arch_current_thread()->stack_info.start -= MPU_GUARD_ALIGN_AND_SIZE;
-	arch_current_thread()->stack_info.size += MPU_GUARD_ALIGN_AND_SIZE;
+	_current->stack_info.start -= MPU_GUARD_ALIGN_AND_SIZE;
+	_current->stack_info.size += MPU_GUARD_ALIGN_AND_SIZE;
 #endif /* CONFIG_THREAD_STACK_INFO */
 
 	/* Stack guard area reserved at the bottom of the thread's
@@ -222,23 +222,23 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 	 * buffer area accordingly.
 	 */
 #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
-	arch_current_thread()->arch.priv_stack_start +=
-		((arch_current_thread()->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) ?
+	_current->arch.priv_stack_start +=
+		((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) ?
 		MPU_GUARD_ALIGN_AND_SIZE_FLOAT : MPU_GUARD_ALIGN_AND_SIZE;
 #else
-	arch_current_thread()->arch.priv_stack_start += MPU_GUARD_ALIGN_AND_SIZE;
+	_current->arch.priv_stack_start += MPU_GUARD_ALIGN_AND_SIZE;
 #endif /* CONFIG_FPU && CONFIG_FPU_SHARING */
 #endif /* CONFIG_MPU_STACK_GUARD */
 
 #if defined(CONFIG_CPU_AARCH32_CORTEX_R)
-	arch_current_thread()->arch.priv_stack_end =
-		arch_current_thread()->arch.priv_stack_start + CONFIG_PRIVILEGED_STACK_SIZE;
+	_current->arch.priv_stack_end =
+		_current->arch.priv_stack_start + CONFIG_PRIVILEGED_STACK_SIZE;
 #endif
 
 	z_arm_userspace_enter(user_entry, p1, p2, p3,
-			     (uint32_t)arch_current_thread()->stack_info.start,
-			     arch_current_thread()->stack_info.size -
-			     arch_current_thread()->stack_info.delta);
+			     (uint32_t)_current->stack_info.start,
+			     _current->stack_info.size -
+			     _current->stack_info.delta);
 	CODE_UNREACHABLE;
 }
 
@@ -304,7 +304,7 @@ EXPORT_SYMBOL(z_arm_thread_is_in_user_mode);
 uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp)
 {
 #if defined(CONFIG_MULTITHREADING)
-	const struct k_thread *thread = arch_current_thread();
+	const struct k_thread *thread = _current;
 
 	if (thread == NULL) {
 		return 0;
@@ -314,7 +314,7 @@ uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp
 #if (defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)) && \
 	defined(CONFIG_MPU_STACK_GUARD)
 	uint32_t guard_len =
-		((arch_current_thread()->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) ?
+		((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) ?
 		MPU_GUARD_ALIGN_AND_SIZE_FLOAT : MPU_GUARD_ALIGN_AND_SIZE;
 #else
 	/* If MPU_STACK_GUARD is not enabled, the guard length is
@@ -377,7 +377,7 @@ uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp
 #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
 int arch_float_disable(struct k_thread *thread)
 {
-	if (thread != arch_current_thread()) {
+	if (thread != _current) {
 		return -EINVAL;
 	}
 
diff --git a/arch/arm/core/cortex_m/swap_helper.S b/arch/arm/core/cortex_m/swap_helper.S
index 23a49cb87ef..c6207084b5e 100644
--- a/arch/arm/core/cortex_m/swap_helper.S
+++ b/arch/arm/core/cortex_m/swap_helper.S
@@ -288,7 +288,7 @@ in_fp_endif:
 #if defined(CONFIG_MPU_STACK_GUARD) || defined(CONFIG_USERSPACE)
     /* Re-program dynamic memory map */
     push {r2,lr}
-    mov r0, r2 /* arch_current_thread() thread */
+    mov r0, r2 /* _current thread */
     bl z_arm_configure_dynamic_mpu_regions
     pop {r2,lr}
 #endif
diff --git a/arch/arm/core/cortex_m/thread.c b/arch/arm/core/cortex_m/thread.c
index 1f8d945c3eb..b67cbe8ee3e 100644
--- a/arch/arm/core/cortex_m/thread.c
+++ b/arch/arm/core/cortex_m/thread.c
@@ -231,8 +231,8 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 {
 
 	/* Set up privileged stack before entering user mode */
-	arch_current_thread()->arch.priv_stack_start =
-		(uint32_t)z_priv_stack_find(arch_current_thread()->stack_obj);
+	_current->arch.priv_stack_start =
+		(uint32_t)z_priv_stack_find(_current->stack_obj);
 #if defined(CONFIG_MPU_STACK_GUARD)
 #if defined(CONFIG_THREAD_STACK_INFO)
 	/* We're dropping to user mode which means the guard area is no
@@ -241,13 +241,13 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 	 * which accounted for memory borrowed from the thread stack.
 	 */
 #if FP_GUARD_EXTRA_SIZE > 0
-	if ((arch_current_thread()->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) {
-		arch_current_thread()->stack_info.start -= FP_GUARD_EXTRA_SIZE;
-		arch_current_thread()->stack_info.size += FP_GUARD_EXTRA_SIZE;
+	if ((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) {
+		_current->stack_info.start -= FP_GUARD_EXTRA_SIZE;
+		_current->stack_info.size += FP_GUARD_EXTRA_SIZE;
 	}
 #endif /* FP_GUARD_EXTRA_SIZE */
-	arch_current_thread()->stack_info.start -= MPU_GUARD_ALIGN_AND_SIZE;
-	arch_current_thread()->stack_info.size += MPU_GUARD_ALIGN_AND_SIZE;
+	_current->stack_info.start -= MPU_GUARD_ALIGN_AND_SIZE;
+	_current->stack_info.size += MPU_GUARD_ALIGN_AND_SIZE;
 #endif /* CONFIG_THREAD_STACK_INFO */
 
 	/* Stack guard area reserved at the bottom of the thread's
@@ -255,18 +255,18 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 	 * buffer area accordingly.
 	 */
 #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
-	arch_current_thread()->arch.priv_stack_start +=
-		((arch_current_thread()->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) ?
+	_current->arch.priv_stack_start +=
+		((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) ?
 		MPU_GUARD_ALIGN_AND_SIZE_FLOAT : MPU_GUARD_ALIGN_AND_SIZE;
 #else
-	arch_current_thread()->arch.priv_stack_start += MPU_GUARD_ALIGN_AND_SIZE;
+	_current->arch.priv_stack_start += MPU_GUARD_ALIGN_AND_SIZE;
 #endif /* CONFIG_FPU && CONFIG_FPU_SHARING */
 #endif /* CONFIG_MPU_STACK_GUARD */
 
 	z_arm_userspace_enter(user_entry, p1, p2, p3,
-			     (uint32_t)arch_current_thread()->stack_info.start,
-			     arch_current_thread()->stack_info.size -
-			     arch_current_thread()->stack_info.delta);
+			     (uint32_t)_current->stack_info.start,
+			     _current->stack_info.size -
+			     _current->stack_info.delta);
 	CODE_UNREACHABLE;
 }
 
@@ -379,7 +379,7 @@ void configure_builtin_stack_guard(struct k_thread *thread)
 uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp)
 {
 #if defined(CONFIG_MULTITHREADING)
-	const struct k_thread *thread = arch_current_thread();
+	const struct k_thread *thread = _current;
 
 	if (thread == NULL) {
 		return 0;
@@ -389,7 +389,7 @@ uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp
 #if (defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)) && \
 	defined(CONFIG_MPU_STACK_GUARD)
 	uint32_t guard_len =
-		((arch_current_thread()->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) ?
+		((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) ?
 		MPU_GUARD_ALIGN_AND_SIZE_FLOAT : MPU_GUARD_ALIGN_AND_SIZE;
 #else
 	/* If MPU_STACK_GUARD is not enabled, the guard length is
@@ -452,7 +452,7 @@ uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp
 #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
 int arch_float_disable(struct k_thread *thread)
 {
-	if (thread != arch_current_thread()) {
+	if (thread != _current) {
 		return -EINVAL;
 	}
 
diff --git a/arch/arm/core/cortex_m/thread_abort.c b/arch/arm/core/cortex_m/thread_abort.c
index 235adeab0b9..99af8671107 100644
--- a/arch/arm/core/cortex_m/thread_abort.c
+++ b/arch/arm/core/cortex_m/thread_abort.c
@@ -27,7 +27,7 @@ void z_impl_k_thread_abort(k_tid_t thread)
 {
 	SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_thread, abort, thread);
 
-	if (arch_current_thread() == thread) {
+	if (_current == thread) {
 		if (arch_is_in_isr()) {
 			/* ARM is unlike most arches in that this is true
 			 * even for non-peripheral interrupts, even though
diff --git a/arch/arm/include/cortex_a_r/kernel_arch_func.h b/arch/arm/include/cortex_a_r/kernel_arch_func.h
index 9ac2b2a1d90..7a100db07dd 100644
--- a/arch/arm/include/cortex_a_r/kernel_arch_func.h
+++ b/arch/arm/include/cortex_a_r/kernel_arch_func.h
@@ -40,8 +40,8 @@ static ALWAYS_INLINE void arch_kernel_init(void)
 static ALWAYS_INLINE int arch_swap(unsigned int key)
 {
 	/* store off key and return value */
-	arch_current_thread()->arch.basepri = key;
-	arch_current_thread()->arch.swap_return_value = -EAGAIN;
+	_current->arch.basepri = key;
+	_current->arch.swap_return_value = -EAGAIN;
 
 	z_arm_cortex_r_svc();
 	irq_unlock(key);
@@ -49,7 +49,7 @@ static ALWAYS_INLINE int arch_swap(unsigned int key)
 	/* Context switch is performed here. Returning implies the
 	 * thread has been context-switched-in again.
 	 */
-	return arch_current_thread()->arch.swap_return_value;
+	return _current->arch.swap_return_value;
 }
 
 static ALWAYS_INLINE void
diff --git a/arch/arm/include/cortex_m/kernel_arch_func.h b/arch/arm/include/cortex_m/kernel_arch_func.h
index 9183eb691b1..2a24103a32d 100644
--- a/arch/arm/include/cortex_m/kernel_arch_func.h
+++ b/arch/arm/include/cortex_m/kernel_arch_func.h
@@ -87,8 +87,8 @@ extern void z_arm_fatal_error(unsigned int reason, const struct arch_esf *esf);
 static ALWAYS_INLINE int arch_swap(unsigned int key)
 {
 	/* store off key and return value */
-	arch_current_thread()->arch.basepri = key;
-	arch_current_thread()->arch.swap_return_value = -EAGAIN;
+	_current->arch.basepri = key;
+	_current->arch.swap_return_value = -EAGAIN;
 
 	/* set pending bit to make sure we will take a PendSV exception */
 	SCB->ICSR |= SCB_ICSR_PENDSVSET_Msk;
@@ -99,7 +99,7 @@ static ALWAYS_INLINE int arch_swap(unsigned int key)
 	/* Context switch is performed here. Returning implies the
 	 * thread has been context-switched-in again.
 	 */
-	return arch_current_thread()->arch.swap_return_value;
+	return _current->arch.swap_return_value;
 }
 
 
diff --git a/arch/arm64/core/cortex_r/arm_mpu.c b/arch/arm64/core/cortex_r/arm_mpu.c
index 5bc9ecbf3e5..2bd6d265c9a 100644
--- a/arch/arm64/core/cortex_r/arm_mpu.c
+++ b/arch/arm64/core/cortex_r/arm_mpu.c
@@ -727,7 +727,7 @@ static int configure_dynamic_mpu_regions(struct k_thread *thread)
 	 */
 	thread->arch.region_num = (uint8_t)region_num;
 
-	if (thread == arch_current_thread()) {
+	if (thread == _current) {
 		ret = flush_dynamic_regions_to_mpu(dyn_regions, region_num);
 	}
 
@@ -795,7 +795,7 @@ int arch_mem_domain_thread_add(struct k_thread *thread)
 
 	ret = configure_dynamic_mpu_regions(thread);
 #ifdef CONFIG_SMP
-	if (ret == 0 && thread != arch_current_thread()) {
+	if (ret == 0 && thread != _current) {
 		/* the thread could be running on another CPU right now */
 		z_arm64_mem_cfg_ipi();
 	}
@@ -810,7 +810,7 @@ int arch_mem_domain_thread_remove(struct k_thread *thread)
 
 	ret = configure_dynamic_mpu_regions(thread);
 #ifdef CONFIG_SMP
-	if (ret == 0 && thread != arch_current_thread()) {
+	if (ret == 0 && thread != _current) {
 		/* the thread could be running on another CPU right now */
 		z_arm64_mem_cfg_ipi();
 	}
diff --git a/arch/arm64/core/fatal.c b/arch/arm64/core/fatal.c
index 0e793ea18bb..7955b6f7d6d 100644
--- a/arch/arm64/core/fatal.c
+++ b/arch/arm64/core/fatal.c
@@ -306,9 +306,8 @@ static bool z_arm64_stack_corruption_check(struct arch_esf *esf, uint64_t esr, u
 		}
 	}
 #ifdef CONFIG_USERSPACE
-	else if ((arch_current_thread()->base.user_options & K_USER) != 0 &&
-		 GET_ESR_EC(esr) == 0x24) {
-		sp_limit = (uint64_t)arch_current_thread()->stack_info.start;
+	else if ((_current->base.user_options & K_USER) != 0 && GET_ESR_EC(esr) == 0x24) {
+		sp_limit = (uint64_t)_current->stack_info.start;
 		guard_start = sp_limit - Z_ARM64_STACK_GUARD_SIZE;
 		sp = esf->sp;
 		if (sp <= sp_limit || (guard_start <= far && far <= sp_limit)) {
@@ -435,7 +434,7 @@ void z_arm64_do_kernel_oops(struct arch_esf *esf)
 	 * User mode is only allowed to induce oopses and stack check
 	 * failures via software-triggered system fatal exceptions.
 	 */
-	if (((arch_current_thread()->base.user_options & K_USER) != 0) &&
+	if (((_current->base.user_options & K_USER) != 0) &&
 		reason != K_ERR_STACK_CHK_FAIL) {
 		reason = K_ERR_KERNEL_OOPS;
 	}
diff --git a/arch/arm64/core/fpu.c b/arch/arm64/core/fpu.c
index 00abd59632a..a585165b943 100644
--- a/arch/arm64/core/fpu.c
+++ b/arch/arm64/core/fpu.c
@@ -36,7 +36,7 @@ static void DBG(char *msg, struct k_thread *th)
 	strcpy(buf, "CPU# exc# ");
 	buf[3] = '0' + _current_cpu->id;
 	buf[8] = '0' + arch_exception_depth();
-	strcat(buf, arch_current_thread()->name);
+	strcat(buf, _current->name);
 	strcat(buf, ": ");
 	strcat(buf, msg);
 	strcat(buf, " ");
@@ -125,7 +125,7 @@ static void flush_owned_fpu(struct k_thread *thread)
 			 * replace it, and this avoids a deadlock where
 			 * two CPUs want to pull each other's FPU context.
 			 */
-			if (thread == arch_current_thread()) {
+			if (thread == _current) {
 				arch_flush_local_fpu();
 				while (atomic_ptr_get(&_kernel.cpus[i].arch.fpu_owner) == thread) {
 					barrier_dsync_fence_full();
@@ -260,15 +260,15 @@ void z_arm64_fpu_trap(struct arch_esf *esf)
 	 * Make sure the FPU context we need isn't live on another CPU.
 	 * The current CPU's FPU context is NULL at this point.
 	 */
-	flush_owned_fpu(arch_current_thread());
+	flush_owned_fpu(_current);
 #endif
 
 	/* become new owner */
-	atomic_ptr_set(&_current_cpu->arch.fpu_owner, arch_current_thread());
+	atomic_ptr_set(&_current_cpu->arch.fpu_owner, _current);
 
 	/* restore our content */
-	z_arm64_fpu_restore(&arch_current_thread()->arch.saved_fp_context);
-	DBG("restore", arch_current_thread());
+	z_arm64_fpu_restore(&_current->arch.saved_fp_context);
+	DBG("restore", _current);
 }
 
 /*
@@ -287,7 +287,7 @@ static void fpu_access_update(unsigned int exc_update_level)
 
 	if (arch_exception_depth() == exc_update_level) {
 		/* We're about to execute non-exception code */
-		if (atomic_ptr_get(&_current_cpu->arch.fpu_owner) == arch_current_thread()) {
+		if (atomic_ptr_get(&_current_cpu->arch.fpu_owner) == _current) {
 			/* turn on FPU access */
 			write_cpacr_el1(cpacr | CPACR_EL1_FPEN_NOTRAP);
 		} else {
diff --git a/arch/arm64/core/mmu.c b/arch/arm64/core/mmu.c
index ef199b2e7ab..a914916d605 100644
--- a/arch/arm64/core/mmu.c
+++ b/arch/arm64/core/mmu.c
@@ -1309,7 +1309,7 @@ int arch_mem_domain_thread_add(struct k_thread *thread)
 	}
 
 	thread->arch.ptables = domain_ptables;
-	if (thread == arch_current_thread()) {
+	if (thread == _current) {
 		z_arm64_swap_ptables(thread);
 	} else {
 #ifdef CONFIG_SMP
diff --git a/arch/arm64/core/smp.c b/arch/arm64/core/smp.c
index e1c3f64dbb9..fd9d457ea7d 100644
--- a/arch/arm64/core/smp.c
+++ b/arch/arm64/core/smp.c
@@ -240,7 +240,7 @@ void mem_cfg_ipi_handler(const void *unused)
 	 * This is a no-op if the page table is already the right one.
 	 * Lock irq to prevent the interrupt during mem region switch.
 	 */
-	z_arm64_swap_mem_domains(arch_current_thread());
+	z_arm64_swap_mem_domains(_current);
 	arch_irq_unlock(key);
 }
 
diff --git a/arch/arm64/core/thread.c b/arch/arm64/core/thread.c
index f51e2035550..18f49945eda 100644
--- a/arch/arm64/core/thread.c
+++ b/arch/arm64/core/thread.c
@@ -159,15 +159,15 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 	uint64_t tmpreg;
 
 	/* Map the thread stack */
-	z_arm64_thread_mem_domains_init(arch_current_thread());
+	z_arm64_thread_mem_domains_init(_current);
 
 	/* Top of the user stack area */
-	stack_el0 = Z_STACK_PTR_ALIGN(arch_current_thread()->stack_info.start +
-				      arch_current_thread()->stack_info.size -
-				      arch_current_thread()->stack_info.delta);
+	stack_el0 = Z_STACK_PTR_ALIGN(_current->stack_info.start +
+				      _current->stack_info.size -
+				      _current->stack_info.delta);
 
 	/* Top of the privileged non-user-accessible part of the stack */
-	stack_el1 = (uintptr_t)(arch_current_thread()->stack_obj + ARCH_THREAD_STACK_RESERVED);
+	stack_el1 = (uintptr_t)(_current->stack_obj + ARCH_THREAD_STACK_RESERVED);
 
 	register void *x0 __asm__("x0") = user_entry;
 	register void *x1 __asm__("x1") = p1;
diff --git a/arch/posix/core/swap.c b/arch/posix/core/swap.c
index 18d83cf78d6..70d2cdedacc 100644
--- a/arch/posix/core/swap.c
+++ b/arch/posix/core/swap.c
@@ -23,7 +23,7 @@
 int arch_swap(unsigned int key)
 {
 	/*
-	 * struct k_thread * arch_current_thread() is the currently running thread
+	 * struct k_thread * _current is the currently running thread
 	 * struct k_thread * _kernel.ready_q.cache contains the next thread to
 	 * run (cannot be NULL)
 	 *
@@ -34,8 +34,8 @@ int arch_swap(unsigned int key)
 #if CONFIG_INSTRUMENT_THREAD_SWITCHING
 	z_thread_mark_switched_out();
 #endif
-	arch_current_thread()->callee_saved.key = key;
-	arch_current_thread()->callee_saved.retval = -EAGAIN;
+	_current->callee_saved.key = key;
+	_current->callee_saved.retval = -EAGAIN;
 
 	/* retval may be modified with a call to
 	 * arch_thread_return_value_set()
@@ -47,7 +47,7 @@ int arch_swap(unsigned int key)
 
 	posix_thread_status_t *this_thread_ptr  =
 		(posix_thread_status_t *)
-		arch_current_thread()->callee_saved.thread_status;
+		_current->callee_saved.thread_status;
 
 
 	arch_current_thread_set(_kernel.ready_q.cache);
@@ -66,9 +66,9 @@ int arch_swap(unsigned int key)
 
 	/* When we continue, _kernel->current points back to this thread */
 
-	irq_unlock(arch_current_thread()->callee_saved.key);
+	irq_unlock(_current->callee_saved.key);
 
-	return arch_current_thread()->callee_saved.retval;
+	return _current->callee_saved.retval;
 }
 
 
diff --git a/arch/posix/core/thread.c b/arch/posix/core/thread.c
index 0a3f2eccd74..050d075fe57 100644
--- a/arch/posix/core/thread.c
+++ b/arch/posix/core/thread.c
@@ -131,7 +131,7 @@ void z_impl_k_thread_abort(k_tid_t thread)
 
 	key = irq_lock();
 
-	if (arch_current_thread() == thread) {
+	if (_current == thread) {
 		if (tstatus->aborted == 0) { /* LCOV_EXCL_BR_LINE */
 			tstatus->aborted = 1;
 		} else {
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index e5452575e15..83e3ef86d07 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -38,7 +38,7 @@ config RISCV_CURRENT_VIA_GP
 	select ARCH_HAS_CUSTOM_CURRENT_IMPL
 	help
 	  Store the current thread's pointer into the global pointer (GP) register.
-	  When is enabled, calls to `arch_current_thread()` & `k_sched_current_thread_query()` will
+	  When is enabled, calls to `_current` & `k_sched_current_thread_query()` will
 	  be reduced to a single register read.
 
 endchoice # RISCV_GP_PURPOSE
diff --git a/arch/riscv/core/fatal.c b/arch/riscv/core/fatal.c
index 8e0e55c8e80..879ffab9a80 100644
--- a/arch/riscv/core/fatal.c
+++ b/arch/riscv/core/fatal.c
@@ -158,23 +158,23 @@ static bool bad_stack_pointer(struct arch_esf *esf)
 	uintptr_t sp = (uintptr_t)esf + sizeof(struct arch_esf);
 
 #ifdef CONFIG_USERSPACE
-	if (arch_current_thread()->arch.priv_stack_start != 0 &&
-	    sp >= arch_current_thread()->arch.priv_stack_start &&
-	    sp <  arch_current_thread()->arch.priv_stack_start + Z_RISCV_STACK_GUARD_SIZE) {
+	if (_current->arch.priv_stack_start != 0 &&
+	    sp >= _current->arch.priv_stack_start &&
+	    sp <  _current->arch.priv_stack_start + Z_RISCV_STACK_GUARD_SIZE) {
 		return true;
 	}
 
-	if (z_stack_is_user_capable(arch_current_thread()->stack_obj) &&
-	    sp >= arch_current_thread()->stack_info.start - K_THREAD_STACK_RESERVED &&
-	    sp <  arch_current_thread()->stack_info.start - K_THREAD_STACK_RESERVED
+	if (z_stack_is_user_capable(_current->stack_obj) &&
+	    sp >= _current->stack_info.start - K_THREAD_STACK_RESERVED &&
+	    sp <  _current->stack_info.start - K_THREAD_STACK_RESERVED
 		  + Z_RISCV_STACK_GUARD_SIZE) {
 		return true;
 	}
 #endif /* CONFIG_USERSPACE */
 
 #if CONFIG_MULTITHREADING
-	if (sp >= arch_current_thread()->stack_info.start - K_KERNEL_STACK_RESERVED &&
-	    sp <  arch_current_thread()->stack_info.start - K_KERNEL_STACK_RESERVED
+	if (sp >= _current->stack_info.start - K_KERNEL_STACK_RESERVED &&
+	    sp <  _current->stack_info.start - K_KERNEL_STACK_RESERVED
 		  + Z_RISCV_STACK_GUARD_SIZE) {
 		return true;
 	}
@@ -191,10 +191,10 @@ static bool bad_stack_pointer(struct arch_esf *esf)
 
 #ifdef CONFIG_USERSPACE
 	if ((esf->mstatus & MSTATUS_MPP) == 0 &&
-	    (esf->sp < arch_current_thread()->stack_info.start ||
-	     esf->sp > arch_current_thread()->stack_info.start +
-		       arch_current_thread()->stack_info.size -
-		       arch_current_thread()->stack_info.delta)) {
+	    (esf->sp < _current->stack_info.start ||
+	     esf->sp > _current->stack_info.start +
+		       _current->stack_info.size -
+		       _current->stack_info.delta)) {
 		/* user stack pointer moved outside of its allowed stack */
 		return true;
 	}
@@ -246,9 +246,9 @@ FUNC_NORETURN void arch_syscall_oops(void *ssf_ptr)
 
 void z_impl_user_fault(unsigned int reason)
 {
-	struct arch_esf *oops_esf = arch_current_thread()->syscall_frame;
+	struct arch_esf *oops_esf = _current->syscall_frame;
 
-	if (((arch_current_thread()->base.user_options & K_USER) != 0) &&
+	if (((_current->base.user_options & K_USER) != 0) &&
 		reason != K_ERR_STACK_CHK_FAIL) {
 		reason = K_ERR_KERNEL_OOPS;
 	}
diff --git a/arch/riscv/core/fpu.c b/arch/riscv/core/fpu.c
index bd648585c43..318e97e0002 100644
--- a/arch/riscv/core/fpu.c
+++ b/arch/riscv/core/fpu.c
@@ -36,8 +36,8 @@ static void DBG(char *msg, struct k_thread *th)
 
 	strcpy(buf, "CPU# exc# ");
 	buf[3] = '0' + _current_cpu->id;
-	buf[8] = '0' + arch_current_thread()->arch.exception_depth;
-	strcat(buf, arch_current_thread()->name);
+	buf[8] = '0' + _current->arch.exception_depth;
+	strcat(buf, _current->name);
 	strcat(buf, ": ");
 	strcat(buf, msg);
 	strcat(buf, " ");
@@ -82,12 +82,12 @@ static void z_riscv_fpu_load(void)
 		 "must be called with FPU access disabled");
 
 	/* become new owner */
-	atomic_ptr_set(&_current_cpu->arch.fpu_owner, arch_current_thread());
+	atomic_ptr_set(&_current_cpu->arch.fpu_owner, _current);
 
 	/* restore our content */
 	csr_set(mstatus, MSTATUS_FS_INIT);
-	z_riscv_fpu_restore(&arch_current_thread()->arch.saved_fp_context);
-	DBG("restore", arch_current_thread());
+	z_riscv_fpu_restore(&_current->arch.saved_fp_context);
+	DBG("restore", _current);
 }
 
 /*
@@ -168,7 +168,7 @@ static void flush_owned_fpu(struct k_thread *thread)
 		 * replace it, and this avoids a deadlock where
 		 * two CPUs want to pull each other's FPU context.
 		 */
-		if (thread == arch_current_thread()) {
+		if (thread == _current) {
 			z_riscv_fpu_disable();
 			arch_flush_local_fpu();
 			do {
@@ -213,7 +213,7 @@ void z_riscv_fpu_trap(struct arch_esf *esf)
 	/* save current owner's content  if any */
 	arch_flush_local_fpu();
 
-	if (arch_current_thread()->arch.exception_depth > 0) {
+	if (_current->arch.exception_depth > 0) {
 		/*
 		 * We were already in exception when the FPU access trapped.
 		 * We give it access and prevent any further IRQ recursion
@@ -233,7 +233,7 @@ void z_riscv_fpu_trap(struct arch_esf *esf)
 	 * Make sure the FPU context we need isn't live on another CPU.
 	 * The current CPU's FPU context is NULL at this point.
 	 */
-	flush_owned_fpu(arch_current_thread());
+	flush_owned_fpu(_current);
 #endif
 
 	/* make it accessible and clean to the returning context */
@@ -256,13 +256,13 @@ static bool fpu_access_allowed(unsigned int exc_update_level)
 	__ASSERT((csr_read(mstatus) & MSTATUS_IEN) == 0,
 		 "must be called with IRQs disabled");
 
-	if (arch_current_thread()->arch.exception_depth == exc_update_level) {
+	if (_current->arch.exception_depth == exc_update_level) {
 		/* We're about to execute non-exception code */
-		if (_current_cpu->arch.fpu_owner == arch_current_thread()) {
+		if (_current_cpu->arch.fpu_owner == _current) {
 			/* everything is already in place */
 			return true;
 		}
-		if (arch_current_thread()->arch.fpu_recently_used) {
+		if (_current->arch.fpu_recently_used) {
 			/*
 			 * Before this thread was context-switched out,
 			 * it made active use of the FPU, but someone else
@@ -273,7 +273,7 @@ static bool fpu_access_allowed(unsigned int exc_update_level)
 			z_riscv_fpu_disable();
 			arch_flush_local_fpu();
 #ifdef CONFIG_SMP
-			flush_owned_fpu(arch_current_thread());
+			flush_owned_fpu(_current);
 #endif
 			z_riscv_fpu_load();
 			_current_cpu->arch.fpu_state = MSTATUS_FS_CLEAN;
diff --git a/arch/riscv/core/isr.S b/arch/riscv/core/isr.S
index 193f4820871..11787d3b324 100644
--- a/arch/riscv/core/isr.S
+++ b/arch/riscv/core/isr.S
@@ -299,7 +299,7 @@ is_fp:	/* Process the FP trap and quickly return from exception */
 	mv a0, sp
 	tail z_riscv_fpu_trap
 2:
-no_fp:	/* increment arch_current_thread()->arch.exception_depth */
+no_fp:	/* increment _current->arch.exception_depth */
 	lr t0, ___cpu_t_current_OFFSET(s0)
 	lb t1, _thread_offset_to_exception_depth(t0)
 	add t1, t1, 1
@@ -726,7 +726,7 @@ no_reschedule:
 	mv a0, sp
 	call z_riscv_fpu_exit_exc
 
-	/* decrement arch_current_thread()->arch.exception_depth */
+	/* decrement _current->arch.exception_depth */
 	lr t0, ___cpu_t_current_OFFSET(s0)
 	lb t1, _thread_offset_to_exception_depth(t0)
 	add t1, t1, -1
diff --git a/arch/riscv/core/pmp.c b/arch/riscv/core/pmp.c
index fbbf7c55137..e29c8abd76d 100644
--- a/arch/riscv/core/pmp.c
+++ b/arch/riscv/core/pmp.c
@@ -752,8 +752,8 @@ int arch_buffer_validate(const void *addr, size_t size, int write)
 	int ret = -1;
 
 	/* Check if this is on the stack */
-	if (IS_WITHIN(start, size, arch_current_thread()->stack_info.start,
-		      arch_current_thread()->stack_info.size)) {
+	if (IS_WITHIN(start, size,
+		      _current->stack_info.start, _current->stack_info.size)) {
 		return 0;
 	}
 
@@ -768,7 +768,7 @@ int arch_buffer_validate(const void *addr, size_t size, int write)
 	}
 
 	/* Look for a matching partition in our memory domain */
-	struct k_mem_domain *domain = arch_current_thread()->mem_domain_info.mem_domain;
+	struct k_mem_domain *domain = _current->mem_domain_info.mem_domain;
 	int p_idx, remaining_partitions;
 	k_spinlock_key_t key = k_spin_lock(&z_mem_domain_lock);
 
diff --git a/arch/riscv/core/stacktrace.c b/arch/riscv/core/stacktrace.c
index 0dfe0a19638..361e152f00c 100644
--- a/arch/riscv/core/stacktrace.c
+++ b/arch/riscv/core/stacktrace.c
@@ -108,7 +108,7 @@ static void walk_stackframe(riscv_stacktrace_cb cb, void *cookie, const struct k
 		/* Unwind the provided exception stack frame */
 		fp = esf->s0;
 		ra = esf->mepc;
-	} else if ((csf == NULL) || (csf == &arch_current_thread()->callee_saved)) {
+	} else if ((csf == NULL) || (csf == &_current->callee_saved)) {
 		/* Unwind current thread (default case when nothing is provided ) */
 		fp = (uintptr_t)__builtin_frame_address(0);
 		ra = (uintptr_t)walk_stackframe;
@@ -181,7 +181,7 @@ static void walk_stackframe(riscv_stacktrace_cb cb, void *cookie, const struct k
 		/* Unwind the provided exception stack frame */
 		sp = z_riscv_get_sp_before_exc(esf);
 		ra = esf->mepc;
-	} else if ((csf == NULL) || (csf == &arch_current_thread()->callee_saved)) {
+	} else if ((csf == NULL) || (csf == &_current->callee_saved)) {
 		/* Unwind current thread (default case when nothing is provided ) */
 		sp = current_stack_pointer;
 		ra = (uintptr_t)walk_stackframe;
@@ -215,10 +215,8 @@ void arch_stack_walk(stack_trace_callback_fn callback_fn, void *cookie,
 		     const struct k_thread *thread, const struct arch_esf *esf)
 {
 	if (thread == NULL) {
-		/* In case `thread` is NULL, default that to `arch_current_thread()`
-		 * and try to unwind
-		 */
-		thread = arch_current_thread();
+		/* In case `thread` is NULL, default that to `_current` and try to unwind */
+		thread = _current;
 	}
 
 	walk_stackframe((riscv_stacktrace_cb)callback_fn, cookie, thread, esf, in_stack_bound,
@@ -282,8 +280,7 @@ void z_riscv_unwind_stack(const struct arch_esf *esf, const _callee_saved_t *csf
 	int i = 0;
 
 	LOG_ERR("call trace:");
-	walk_stackframe(print_trace_address, &i, arch_current_thread(), esf, in_fatal_stack_bound,
-			csf);
+	walk_stackframe(print_trace_address, &i, _current, esf, in_fatal_stack_bound, csf);
 	LOG_ERR("");
 }
 #endif /* CONFIG_EXCEPTION_STACK_TRACE */
diff --git a/arch/riscv/core/thread.c b/arch/riscv/core/thread.c
index 7aca45be988..896f8e5199d 100644
--- a/arch/riscv/core/thread.c
+++ b/arch/riscv/core/thread.c
@@ -136,29 +136,28 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 
 	/* Set up privileged stack */
 #ifdef CONFIG_GEN_PRIV_STACKS
-	arch_current_thread()->arch.priv_stack_start =
-			(unsigned long)z_priv_stack_find(arch_current_thread()->stack_obj);
+	_current->arch.priv_stack_start =
+			(unsigned long)z_priv_stack_find(_current->stack_obj);
 	/* remove the stack guard from the main stack */
-	arch_current_thread()->stack_info.start -= K_THREAD_STACK_RESERVED;
-	arch_current_thread()->stack_info.size += K_THREAD_STACK_RESERVED;
+	_current->stack_info.start -= K_THREAD_STACK_RESERVED;
+	_current->stack_info.size += K_THREAD_STACK_RESERVED;
 #else
-	arch_current_thread()->arch.priv_stack_start =
-		(unsigned long)arch_current_thread()->stack_obj;
+	_current->arch.priv_stack_start = (unsigned long)_current->stack_obj;
 #endif /* CONFIG_GEN_PRIV_STACKS */
-	top_of_priv_stack = Z_STACK_PTR_ALIGN(arch_current_thread()->arch.priv_stack_start +
+	top_of_priv_stack = Z_STACK_PTR_ALIGN(_current->arch.priv_stack_start +
 					      K_KERNEL_STACK_RESERVED +
 					      CONFIG_PRIVILEGED_STACK_SIZE);
 
 #ifdef CONFIG_INIT_STACKS
 	/* Initialize the privileged stack */
-	(void)memset((void *)arch_current_thread()->arch.priv_stack_start, 0xaa,
+	(void)memset((void *)_current->arch.priv_stack_start, 0xaa,
 		     Z_STACK_PTR_ALIGN(K_KERNEL_STACK_RESERVED + CONFIG_PRIVILEGED_STACK_SIZE));
 #endif /* CONFIG_INIT_STACKS */
 
 	top_of_user_stack = Z_STACK_PTR_ALIGN(
-				arch_current_thread()->stack_info.start +
-				arch_current_thread()->stack_info.size -
-				arch_current_thread()->stack_info.delta);
+				_current->stack_info.start +
+				_current->stack_info.size -
+				_current->stack_info.delta);
 
 	status = csr_read(mstatus);
 
@@ -174,12 +173,12 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 
 #ifdef CONFIG_PMP_STACK_GUARD
 	/* reconfigure as the kernel mode stack will be different */
-	z_riscv_pmp_stackguard_prepare(arch_current_thread());
+	z_riscv_pmp_stackguard_prepare(_current);
 #endif
 
 	/* Set up Physical Memory Protection */
-	z_riscv_pmp_usermode_prepare(arch_current_thread());
-	z_riscv_pmp_usermode_enable(arch_current_thread());
+	z_riscv_pmp_usermode_prepare(_current);
+	z_riscv_pmp_usermode_enable(_current);
 
 	/* preserve stack pointer for next exception entry */
 	arch_curr_cpu()->arch.user_exc_sp = top_of_priv_stack;
diff --git a/arch/sparc/core/thread.c b/arch/sparc/core/thread.c
index 8bdc4cd5500..e56d9f827c9 100644
--- a/arch/sparc/core/thread.c
+++ b/arch/sparc/core/thread.c
@@ -61,7 +61,7 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 
 void *z_arch_get_next_switch_handle(struct k_thread **old_thread)
 {
-	*old_thread = arch_current_thread();
+	*old_thread =  _current;
 
 	return z_get_next_switch_handle(*old_thread);
 }
diff --git a/arch/x86/core/fatal.c b/arch/x86/core/fatal.c
index f3103861f36..d43499a08d2 100644
--- a/arch/x86/core/fatal.c
+++ b/arch/x86/core/fatal.c
@@ -49,7 +49,7 @@ bool z_x86_check_stack_bounds(uintptr_t addr, size_t size, uint16_t cs)
 {
 	uintptr_t start, end;
 
-	if (arch_current_thread() == NULL || arch_is_in_isr()) {
+	if (_current == NULL || arch_is_in_isr()) {
 		/* We were servicing an interrupt or in early boot environment
 		 * and are supposed to be on the interrupt stack */
 		int cpu_id;
@@ -64,7 +64,7 @@ bool z_x86_check_stack_bounds(uintptr_t addr, size_t size, uint16_t cs)
 		end = start + CONFIG_ISR_STACK_SIZE;
 #ifdef CONFIG_USERSPACE
 	} else if ((cs & 0x3U) == 0U &&
-		   (arch_current_thread()->base.user_options & K_USER) != 0) {
+		   (_current->base.user_options & K_USER) != 0) {
 		/* The low two bits of the CS register is the privilege
 		 * level. It will be 0 in supervisor mode and 3 in user mode
 		 * corresponding to ring 0 / ring 3.
@@ -72,14 +72,14 @@ bool z_x86_check_stack_bounds(uintptr_t addr, size_t size, uint16_t cs)
 		 * If we get here, we must have been doing a syscall, check
 		 * privilege elevation stack bounds
 		 */
-		start = arch_current_thread()->stack_info.start - CONFIG_PRIVILEGED_STACK_SIZE;
-		end = arch_current_thread()->stack_info.start;
+		start = _current->stack_info.start - CONFIG_PRIVILEGED_STACK_SIZE;
+		end = _current->stack_info.start;
 #endif /* CONFIG_USERSPACE */
 	} else {
 		/* Normal thread operation, check its stack buffer */
-		start = arch_current_thread()->stack_info.start;
-		end = Z_STACK_PTR_ALIGN(arch_current_thread()->stack_info.start +
-					arch_current_thread()->stack_info.size);
+		start = _current->stack_info.start;
+		end = Z_STACK_PTR_ALIGN(_current->stack_info.start +
+					_current->stack_info.size);
 	}
 
 	return (addr <= start) || (addr + size > end);
@@ -97,7 +97,7 @@ bool z_x86_check_stack_bounds(uintptr_t addr, size_t size, uint16_t cs)
 __pinned_func
 bool z_x86_check_guard_page(uintptr_t addr)
 {
-	struct k_thread *thread = arch_current_thread();
+	struct k_thread *thread = _current;
 	uintptr_t start, end;
 
 	/* Front guard size - before thread stack area */
@@ -233,7 +233,7 @@ static inline uintptr_t get_cr3(const struct arch_esf *esf)
 	 * switch when we took the exception via z_x86_trampoline_to_kernel
 	 */
 	if ((esf->cs & 0x3) != 0) {
-		return arch_current_thread()->arch.ptables;
+		return _current->arch.ptables;
 	}
 #else
 	ARG_UNUSED(esf);
diff --git a/arch/x86/core/ia32/float.c b/arch/x86/core/ia32/float.c
index e4102d80332..c89bf7accd5 100644
--- a/arch/x86/core/ia32/float.c
+++ b/arch/x86/core/ia32/float.c
@@ -207,7 +207,7 @@ void z_float_enable(struct k_thread *thread, unsigned int options)
 
 	/* Associate the new FP context with the specified thread */
 
-	if (thread == arch_current_thread()) {
+	if (thread == _current) {
 		/*
 		 * When enabling FP support for the current thread, just claim
 		 * ownership of the FPU and leave CR0[TS] unset.
@@ -222,7 +222,7 @@ void z_float_enable(struct k_thread *thread, unsigned int options)
 		 * of the FPU to them (unless we need it ourselves).
 		 */
 
-		if ((arch_current_thread()->base.user_options & _FP_USER_MASK) == 0) {
+		if ((_current->base.user_options & _FP_USER_MASK) == 0) {
 			/*
 			 * We are not FP-capable, so mark FPU as owned by the
 			 * thread we've just enabled FP support for, then
@@ -278,7 +278,7 @@ int z_float_disable(struct k_thread *thread)
 
 	thread->base.user_options &= ~_FP_USER_MASK;
 
-	if (thread == arch_current_thread()) {
+	if (thread == _current) {
 		z_FpAccessDisable();
 		_kernel.current_fp = (struct k_thread *)0;
 	} else {
@@ -314,7 +314,7 @@ void _FpNotAvailableExcHandler(struct arch_esf *pEsf)
 
 	/* Enable highest level of FP capability configured into the kernel */
 
-	k_float_enable(arch_current_thread(), _FP_USER_MASK);
+	k_float_enable(_current, _FP_USER_MASK);
 }
 _EXCEPTION_CONNECT_NOCODE(_FpNotAvailableExcHandler,
 		IV_DEVICE_NOT_AVAILABLE, 0);
diff --git a/arch/x86/core/userspace.c b/arch/x86/core/userspace.c
index fd38d22cb90..436bc18edb7 100644
--- a/arch/x86/core/userspace.c
+++ b/arch/x86/core/userspace.c
@@ -132,9 +132,9 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 	/* Transition will reset stack pointer to initial, discarding
 	 * any old context since this is a one-way operation
 	 */
-	stack_end = Z_STACK_PTR_ALIGN(arch_current_thread()->stack_info.start +
-				      arch_current_thread()->stack_info.size -
-				      arch_current_thread()->stack_info.delta);
+	stack_end = Z_STACK_PTR_ALIGN(_current->stack_info.start +
+				      _current->stack_info.size -
+				      _current->stack_info.delta);
 
 #ifdef CONFIG_X86_64
 	/* x86_64 SysV ABI requires 16 byte stack alignment, which
@@ -156,15 +156,15 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 	 * Note that this also needs to page in the reserved
 	 * portion of the stack (which is usually the page just
 	 * before the beginning of stack in
-	 * arch_current_thread()->stack_info.start.
+	 * _current->stack_info.start.
 	 */
 	uintptr_t stack_start;
 	size_t stack_size;
 	uintptr_t stack_aligned_start;
 	size_t stack_aligned_size;
 
-	stack_start = POINTER_TO_UINT(arch_current_thread()->stack_obj);
-	stack_size = K_THREAD_STACK_LEN(arch_current_thread()->stack_info.size);
+	stack_start = POINTER_TO_UINT(_current->stack_obj);
+	stack_size = K_THREAD_STACK_LEN(_current->stack_info.size);
 
 #if defined(CONFIG_X86_STACK_PROTECTION)
 	/* With hardware stack protection, the first page of stack
@@ -182,7 +182,7 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 #endif
 
 	z_x86_userspace_enter(user_entry, p1, p2, p3, stack_end,
-			      arch_current_thread()->stack_info.start);
+			      _current->stack_info.start);
 	CODE_UNREACHABLE;
 }
 
diff --git a/arch/x86/core/x86_mmu.c b/arch/x86/core/x86_mmu.c
index fdda995b3b0..e4188b8670f 100644
--- a/arch/x86/core/x86_mmu.c
+++ b/arch/x86/core/x86_mmu.c
@@ -421,7 +421,7 @@ void z_x86_tlb_ipi(const void *arg)
 	/* We might have been moved to another memory domain, so always invoke
 	 * z_x86_thread_page_tables_get() instead of using current CR3 value.
 	 */
-	ptables_phys = k_mem_phys_addr(z_x86_thread_page_tables_get(arch_current_thread()));
+	ptables_phys = k_mem_phys_addr(z_x86_thread_page_tables_get(_current));
 #endif
 	/*
 	 * In the future, we can consider making this smarter, such as
@@ -1440,7 +1440,7 @@ static inline void bcb_fence(void)
 __pinned_func
 int arch_buffer_validate(const void *addr, size_t size, int write)
 {
-	pentry_t *ptables = z_x86_thread_page_tables_get(arch_current_thread());
+	pentry_t *ptables = z_x86_thread_page_tables_get(_current);
 	uint8_t *virt;
 	size_t aligned_size;
 	int ret = 0;
@@ -1958,7 +1958,7 @@ int arch_mem_domain_thread_add(struct k_thread *thread)
 	 * IPI takes care of this if the thread is currently running on some
 	 * other CPU.
 	 */
-	if (thread == arch_current_thread() && thread->arch.ptables != z_x86_cr3_get()) {
+	if (thread == _current && thread->arch.ptables != z_x86_cr3_get()) {
 		z_x86_cr3_set(thread->arch.ptables);
 	}
 #endif /* CONFIG_X86_KPTI */
@@ -1980,9 +1980,8 @@ void z_x86_current_stack_perms(void)
 	/* Clear any previous context in the stack buffer to prevent
 	 * unintentional data leakage.
 	 */
-	(void)memset((void *)arch_current_thread()->stack_info.start, 0xAA,
-		     arch_current_thread()->stack_info.size -
-			     arch_current_thread()->stack_info.delta);
+	(void)memset((void *)_current->stack_info.start, 0xAA,
+		     _current->stack_info.size - _current->stack_info.delta);
 
 	/* Only now is it safe to grant access to the stack buffer since any
 	 * previous context has been erased.
@@ -1992,13 +1991,13 @@ void z_x86_current_stack_perms(void)
 	 * This will grant stack and memory domain access if it wasn't set
 	 * already (in which case this returns very quickly).
 	 */
-	z_x86_swap_update_common_page_table(arch_current_thread());
+	z_x86_swap_update_common_page_table(_current);
 #else
 	/* Memory domain access is already programmed into the page tables.
 	 * Need to enable access to this new user thread's stack buffer in
 	 * its domain-specific page tables.
 	 */
-	set_stack_perms(arch_current_thread(), z_x86_thread_page_tables_get(arch_current_thread()));
+	set_stack_perms(_current, z_x86_thread_page_tables_get(_current));
 #endif
 }
 #endif /* CONFIG_USERSPACE */
diff --git a/arch/xtensa/core/fatal.c b/arch/xtensa/core/fatal.c
index 5721f130446..41a7a8d1409 100644
--- a/arch/xtensa/core/fatal.c
+++ b/arch/xtensa/core/fatal.c
@@ -140,7 +140,7 @@ FUNC_NORETURN void arch_syscall_oops(void *ssf)
 #ifdef CONFIG_USERSPACE
 void z_impl_xtensa_user_fault(unsigned int reason)
 {
-	if ((arch_current_thread()->base.user_options & K_USER) != 0) {
+	if ((_current->base.user_options & K_USER) != 0) {
 		if ((reason != K_ERR_KERNEL_OOPS) &&
 				(reason != K_ERR_STACK_CHK_FAIL)) {
 			reason = K_ERR_KERNEL_OOPS;
diff --git a/arch/xtensa/core/ptables.c b/arch/xtensa/core/ptables.c
index b6c8e8fb7fd..c02ecc64b0d 100644
--- a/arch/xtensa/core/ptables.c
+++ b/arch/xtensa/core/ptables.c
@@ -1086,7 +1086,7 @@ static int mem_buffer_validate(const void *addr, size_t size, int write, int rin
 	int ret = 0;
 	uint8_t *virt;
 	size_t aligned_size;
-	const struct k_thread *thread = arch_current_thread();
+	const struct k_thread *thread = _current;
 	uint32_t *ptables = thread_page_tables_get(thread);
 
 	/* addr/size arbitrary, fix this up into an aligned region */
diff --git a/arch/xtensa/core/thread.c b/arch/xtensa/core/thread.c
index 5bc736a352f..f9b8179173d 100644
--- a/arch/xtensa/core/thread.c
+++ b/arch/xtensa/core/thread.c
@@ -156,7 +156,7 @@ int arch_float_enable(struct k_thread *thread, unsigned int options)
 FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 					void *p1, void *p2, void *p3)
 {
-	struct k_thread *current = arch_current_thread();
+	struct k_thread *current = _current;
 	size_t stack_end;
 
 	/* Transition will reset stack pointer to initial, discarding
diff --git a/arch/xtensa/core/vector_handlers.c b/arch/xtensa/core/vector_handlers.c
index f721e480a2c..fa58b9c2133 100644
--- a/arch/xtensa/core/vector_handlers.c
+++ b/arch/xtensa/core/vector_handlers.c
@@ -34,7 +34,7 @@ extern char xtensa_arch_kernel_oops_epc[];
 bool xtensa_is_outside_stack_bounds(uintptr_t addr, size_t sz, uint32_t ps)
 {
 	uintptr_t start, end;
-	struct k_thread *thread = arch_current_thread();
+	struct k_thread *thread = _current;
 	bool was_in_isr, invalid;
 
 	/* Without userspace, there is no privileged stack so the thread stack
diff --git a/boards/native/native_posix/irq_handler.c b/boards/native/native_posix/irq_handler.c
index 69a1f131dcb..56ce6931c26 100644
--- a/boards/native/native_posix/irq_handler.c
+++ b/boards/native/native_posix/irq_handler.c
@@ -105,7 +105,7 @@ void posix_irq_handler(void)
 	 */
 	if (may_swap
 		&& (hw_irq_ctrl_get_cur_prio() == 256)
-		&& (_kernel.ready_q.cache) && (_kernel.ready_q.cache != arch_current_thread())) {
+		&& (_kernel.ready_q.cache) && (_kernel.ready_q.cache != _current)) {
 
 		(void)z_swap_irqlock(irq_lock);
 	}
diff --git a/boards/native/native_sim/irq_handler.c b/boards/native/native_sim/irq_handler.c
index c9a18f01863..38462b4b14a 100644
--- a/boards/native/native_sim/irq_handler.c
+++ b/boards/native/native_sim/irq_handler.c
@@ -113,7 +113,7 @@ void posix_irq_handler(void)
 	 */
 	if (may_swap
 		&& (hw_irq_ctrl_get_cur_prio() == 256)
-		&& (_kernel.ready_q.cache) && (_kernel.ready_q.cache != arch_current_thread())) {
+		&& (_kernel.ready_q.cache) && (_kernel.ready_q.cache != _current)) {
 
 		(void)z_swap_irqlock(irq_lock);
 	}
diff --git a/boards/native/nrf_bsim/irq_handler.c b/boards/native/nrf_bsim/irq_handler.c
index c794395fb9a..2d6ad4f66b7 100644
--- a/boards/native/nrf_bsim/irq_handler.c
+++ b/boards/native/nrf_bsim/irq_handler.c
@@ -135,7 +135,7 @@ void posix_irq_handler(void)
 	if (may_swap
 		&& (hw_irq_ctrl_get_cur_prio(cpu_n) == 256)
 		&& (CPU_will_be_awaken_from_WFE == false)
-		&& (_kernel.ready_q.cache) && (_kernel.ready_q.cache != arch_current_thread())) {
+		&& (_kernel.ready_q.cache) && (_kernel.ready_q.cache != _current)) {
 
 		z_swap_irqlock(irq_lock);
 	}
diff --git a/doc/kernel/services/smp/smp.rst b/doc/kernel/services/smp/smp.rst
index e570958fce2..615676494f8 100644
--- a/doc/kernel/services/smp/smp.rst
+++ b/doc/kernel/services/smp/smp.rst
@@ -276,7 +276,7 @@ Per-CPU data
 ============
 
 Many elements of the core kernel data need to be implemented for each
-CPU in SMP mode.  For example, the ``arch_current_thread()`` thread pointer obviously
+CPU in SMP mode.  For example, the ``_current`` thread pointer obviously
 needs to reflect what is running locally, there are many threads
 running concurrently.  Likewise a kernel-provided interrupt stack
 needs to be created and assigned for each physical CPU, as does the
diff --git a/doc/releases/migration-guide-4.1.rst b/doc/releases/migration-guide-4.1.rst
index fce9ffa3c13..271bb01d6be 100644
--- a/doc/releases/migration-guide-4.1.rst
+++ b/doc/releases/migration-guide-4.1.rst
@@ -404,10 +404,6 @@ Stream Flash
 Architectures
 *************
 
-* Common
-
-  * ``_current`` is deprecated, used :c:func:`arch_current_thread` instead.
-
 * native/POSIX
 
   * :kconfig:option:`CONFIG_NATIVE_APPLICATION` has been deprecated. Out-of-tree boards using this
diff --git a/doc/releases/release-notes-4.1.rst b/doc/releases/release-notes-4.1.rst
index aec178a5d33..b89e86be51f 100644
--- a/doc/releases/release-notes-4.1.rst
+++ b/doc/releases/release-notes-4.1.rst
@@ -59,9 +59,9 @@ Architectures
 * Common
 
   * Introduced :kconfig:option:`CONFIG_ARCH_HAS_CUSTOM_CURRENT_IMPL`, which can be selected when
-    an architecture implemented and enabled its own :c:func:`arch_current_thread` and
+    an architecture implements :c:func:`arch_current_thread` and
     :c:func:`arch_current_thread_set` functions for faster retrieval of the current CPU's thread
-    pointer. When enabled, ``_current`` variable will be routed to the
+    pointer. When enabled, the ``_current`` symbol will be routed to
     :c:func:`arch_current_thread` (:github:`80716`).
 
 * ARC
diff --git a/drivers/wifi/eswifi/eswifi.h b/drivers/wifi/eswifi/eswifi.h
index 0bf4fddb206..54bf00f0f78 100644
--- a/drivers/wifi/eswifi/eswifi.h
+++ b/drivers/wifi/eswifi/eswifi.h
@@ -92,9 +92,9 @@ static inline int eswifi_request(struct eswifi_dev *eswifi, char *cmd,
 static inline void eswifi_lock(struct eswifi_dev *eswifi)
 {
 	/* Nested locking */
-	if (atomic_get(&eswifi->mutex_owner) != (atomic_t)(uintptr_t)arch_current_thread()) {
+	if (atomic_get(&eswifi->mutex_owner) != (atomic_t)(uintptr_t)_current) {
 		k_mutex_lock(&eswifi->mutex, K_FOREVER);
-		atomic_set(&eswifi->mutex_owner, (atomic_t)(uintptr_t)arch_current_thread());
+		atomic_set(&eswifi->mutex_owner, (atomic_t)(uintptr_t)_current);
 		eswifi->mutex_depth = 1;
 	} else {
 		eswifi->mutex_depth++;
diff --git a/include/zephyr/arch/arch_interface.h b/include/zephyr/arch/arch_interface.h
index 0f081d06ada..6721cec1171 100644
--- a/include/zephyr/arch/arch_interface.h
+++ b/include/zephyr/arch/arch_interface.h
@@ -1289,7 +1289,7 @@ typedef bool (*stack_trace_callback_fn)(void *cookie, unsigned long addr);
  * ============ ======= ============================================
  * thread	esf
  * ============ ======= ============================================
- * thread	NULL	Stack trace from thread (can be arch_current_thread())
+ * thread	NULL	Stack trace from thread (can be _current)
  * thread	esf	Stack trace starting on esf
  * ============ ======= ============================================
  */
diff --git a/include/zephyr/arch/common/arch_inlines.h b/include/zephyr/arch/common/arch_inlines.h
index 8c0ba3343ad..0490dba71aa 100644
--- a/include/zephyr/arch/common/arch_inlines.h
+++ b/include/zephyr/arch/common/arch_inlines.h
@@ -19,7 +19,7 @@
 static ALWAYS_INLINE struct k_thread *arch_current_thread(void)
 {
 #ifdef CONFIG_SMP
-	/* In SMP, arch_current_thread() is a field read from _current_cpu, which
+	/* In SMP, _current is a field read from _current_cpu, which
 	 * can race with preemption before it is read.  We must lock
 	 * local interrupts when reading it.
 	 */
diff --git a/include/zephyr/arch/x86/ia32/arch.h b/include/zephyr/arch/x86/ia32/arch.h
index e2f961c817e..b82e0db0f17 100644
--- a/include/zephyr/arch/x86/ia32/arch.h
+++ b/include/zephyr/arch/x86/ia32/arch.h
@@ -305,7 +305,7 @@ static inline void arch_isr_direct_footer(int swap)
 	 * 3) Next thread to run in the ready queue is not this thread
 	 */
 	if (swap != 0 && _kernel.cpus[0].nested == 0 &&
-	    _kernel.ready_q.cache != arch_current_thread()) {
+	    _kernel.ready_q.cache != _current) {
 		unsigned int flags;
 
 		/* Fetch EFLAGS argument to z_swap() */
diff --git a/include/zephyr/internal/syscall_handler.h b/include/zephyr/internal/syscall_handler.h
index a1264d6c287..b48070fad6b 100644
--- a/include/zephyr/internal/syscall_handler.h
+++ b/include/zephyr/internal/syscall_handler.h
@@ -62,7 +62,7 @@ static inline bool k_is_in_user_syscall(void)
 	 * calls from supervisor mode bypass everything directly to
 	 * the implementation function.
 	 */
-	return !k_is_in_isr() && (arch_current_thread()->syscall_frame != NULL);
+	return !k_is_in_isr() && (_current->syscall_frame != NULL);
 }
 
 /**
@@ -350,7 +350,7 @@ int k_usermode_string_copy(char *dst, const char *src, size_t maxlen);
 #define K_OOPS(expr) \
 	do { \
 		if (expr) { \
-			arch_syscall_oops(arch_current_thread()->syscall_frame); \
+			arch_syscall_oops(_current->syscall_frame); \
 		} \
 	} while (false)
 
diff --git a/include/zephyr/kernel_structs.h b/include/zephyr/kernel_structs.h
index 4c5d41fa024..3e2a9fe4285 100644
--- a/include/zephyr/kernel_structs.h
+++ b/include/zephyr/kernel_structs.h
@@ -174,7 +174,7 @@ struct _cpu {
 #endif
 
 #ifdef CONFIG_SMP
-	/* True when arch_current_thread() is allowed to context switch */
+	/* True when _current is allowed to context switch */
 	uint8_t swap_ok;
 #endif
 
@@ -263,12 +263,12 @@ bool z_smp_cpu_mobile(void);
 
 #define _current_cpu ({ __ASSERT_NO_MSG(!z_smp_cpu_mobile()); \
 			arch_curr_cpu(); })
+#define _current arch_current_thread()
 
 #else
 #define _current_cpu (&_kernel.cpus[0])
-#endif /* CONFIG_SMP */
-
-#define _current arch_current_thread() __DEPRECATED_MACRO
+#define _current _kernel.cpus[0].current
+#endif
 
 /* kernel wait queue record */
 #ifdef CONFIG_WAITQ_SCALABLE
diff --git a/kernel/Kconfig b/kernel/Kconfig
index e709b98c250..0fbd3d92edc 100644
--- a/kernel/Kconfig
+++ b/kernel/Kconfig
@@ -211,7 +211,7 @@ config THREAD_ABORT_NEED_CLEANUP
 	bool
 	help
 	  This option enables the bits to clean up the current thread if
-	  k_thread_abort(arch_current_thread()) is called, as the cleanup cannot be
+	  k_thread_abort(_current) is called, as the cleanup cannot be
 	  running in the current thread stack.
 
 config THREAD_CUSTOM_DATA
diff --git a/kernel/errno.c b/kernel/errno.c
index 2535e00e336..bbbd6f87bfd 100644
--- a/kernel/errno.c
+++ b/kernel/errno.c
@@ -36,7 +36,7 @@ int *z_impl_z_errno(void)
 	/* Initialized to the lowest address in the stack so the thread can
 	 * directly read/write it
 	 */
-	return &arch_current_thread()->userspace_local_data->errno_var;
+	return &_current->userspace_local_data->errno_var;
 }
 
 static inline int *z_vrfy_z_errno(void)
@@ -48,7 +48,7 @@ static inline int *z_vrfy_z_errno(void)
 #else
 int *z_impl_z_errno(void)
 {
-	return &arch_current_thread()->errno_var;
+	return &_current->errno_var;
 }
 #endif /* CONFIG_USERSPACE */
 
diff --git a/kernel/fatal.c b/kernel/fatal.c
index a5682e7cd7f..3cf3114364d 100644
--- a/kernel/fatal.c
+++ b/kernel/fatal.c
@@ -90,7 +90,7 @@ void z_fatal_error(unsigned int reason, const struct arch_esf *esf)
 	 */
 	unsigned int key = arch_irq_lock();
 	struct k_thread *thread = IS_ENABLED(CONFIG_MULTITHREADING) ?
-			arch_current_thread() : NULL;
+			_current : NULL;
 
 	/* twister looks for the "ZEPHYR FATAL ERROR" string, don't
 	 * change it without also updating twister
diff --git a/kernel/idle.c b/kernel/idle.c
index 4d095c8f27b..62ff84e4c88 100644
--- a/kernel/idle.c
+++ b/kernel/idle.c
@@ -24,7 +24,7 @@ void idle(void *unused1, void *unused2, void *unused3)
 	ARG_UNUSED(unused2);
 	ARG_UNUSED(unused3);
 
-	__ASSERT_NO_MSG(arch_current_thread()->base.prio >= 0);
+	__ASSERT_NO_MSG(_current->base.prio >= 0);
 
 	while (true) {
 		/* SMP systems without a working IPI can't actual
@@ -85,7 +85,7 @@ void idle(void *unused1, void *unused2, void *unused3)
 		 * explicitly yield in the idle thread otherwise
 		 * nothing else will run once it starts.
 		 */
-		if (_kernel.ready_q.cache != arch_current_thread()) {
+		if (_kernel.ready_q.cache != _current) {
 			z_swap_unlocked();
 		}
 # endif /* !defined(CONFIG_USE_SWITCH) || defined(CONFIG_SPARC) */
diff --git a/kernel/include/kernel_internal.h b/kernel/include/kernel_internal.h
index cb13aacf600..94f90ce9462 100644
--- a/kernel/include/kernel_internal.h
+++ b/kernel/include/kernel_internal.h
@@ -286,7 +286,7 @@ int z_kernel_stats_query(struct k_obj_core *obj_core, void *stats);
  * where these steps require that the thread is no longer running.
  * If the target thread is not the current running thread, the cleanup
  * steps will be performed immediately. However, if the target thread is
- * the current running thread (e.g. k_thread_abort(arch_current_thread())), it defers
+ * the current running thread (e.g. k_thread_abort(_current)), it defers
  * the cleanup steps to later when the work will be finished in another
  * context.
  *
diff --git a/kernel/include/ksched.h b/kernel/include/ksched.h
index 4cc17d5e92e..1807330fe52 100644
--- a/kernel/include/ksched.h
+++ b/kernel/include/ksched.h
@@ -141,9 +141,9 @@ static inline bool _is_valid_prio(int prio, void *entry_point)
 static inline void z_sched_lock(void)
 {
 	__ASSERT(!arch_is_in_isr(), "");
-	__ASSERT(arch_current_thread()->base.sched_locked != 1U, "");
+	__ASSERT(_current->base.sched_locked != 1U, "");
 
-	--arch_current_thread()->base.sched_locked;
+	--_current->base.sched_locked;
 
 	compiler_barrier();
 }
diff --git a/kernel/include/kswap.h b/kernel/include/kswap.h
index ea3c4ef7923..a4e75e7ed6d 100644
--- a/kernel/include/kswap.h
+++ b/kernel/include/kswap.h
@@ -96,12 +96,12 @@ static ALWAYS_INLINE unsigned int do_swap(unsigned int key,
 	 */
 # ifndef CONFIG_ARM64
 	__ASSERT(arch_irq_unlocked(key) ||
-		 arch_current_thread()->base.thread_state & (_THREAD_DUMMY | _THREAD_DEAD),
+		 _current->base.thread_state & (_THREAD_DUMMY | _THREAD_DEAD),
 		 "Context switching while holding lock!");
 # endif /* CONFIG_ARM64 */
 #endif /* CONFIG_SPIN_VALIDATE */
 
-	old_thread = arch_current_thread();
+	old_thread = _current;
 
 	z_check_stack_sentinel();
 
@@ -146,7 +146,7 @@ static ALWAYS_INLINE unsigned int do_swap(unsigned int key,
 		arch_cohere_stacks(old_thread, NULL, new_thread);
 
 #ifdef CONFIG_SMP
-		/* Now add arch_current_thread() back to the run queue, once we are
+		/* Now add _current back to the run queue, once we are
 		 * guaranteed to reach the context switch in finite
 		 * time.  See z_sched_switch_spin().
 		 */
@@ -174,7 +174,7 @@ static ALWAYS_INLINE unsigned int do_swap(unsigned int key,
 		irq_unlock(key);
 	}
 
-	return arch_current_thread()->swap_retval;
+	return _current->swap_retval;
 }
 
 static inline int z_swap_irqlock(unsigned int key)
diff --git a/kernel/include/kthread.h b/kernel/include/kthread.h
index 35049c7805b..636a62b7009 100644
--- a/kernel/include/kthread.h
+++ b/kernel/include/kthread.h
@@ -211,17 +211,17 @@ static ALWAYS_INLINE bool should_preempt(struct k_thread *thread,
 		return true;
 	}
 
-	__ASSERT(arch_current_thread() != NULL, "");
+	__ASSERT(_current != NULL, "");
 
 	/* Or if we're pended/suspended/dummy (duh) */
-	if (z_is_thread_prevented_from_running(arch_current_thread())) {
+	if (z_is_thread_prevented_from_running(_current)) {
 		return true;
 	}
 
 	/* Otherwise we have to be running a preemptible thread or
 	 * switching to a metairq
 	 */
-	if (thread_is_preemptible(arch_current_thread()) || thread_is_metairq(thread)) {
+	if (thread_is_preemptible(_current) || thread_is_metairq(thread)) {
 		return true;
 	}
 
diff --git a/kernel/include/priority_q.h b/kernel/include/priority_q.h
index 5ca0de23cbe..259d689dda7 100644
--- a/kernel/include/priority_q.h
+++ b/kernel/include/priority_q.h
@@ -131,9 +131,9 @@ static ALWAYS_INLINE void z_priq_dumb_yield(sys_dlist_t *pq)
 #ifndef CONFIG_SMP
 	sys_dnode_t *n;
 
-	n = sys_dlist_peek_next_no_check(pq, &arch_current_thread()->base.qnode_dlist);
+	n = sys_dlist_peek_next_no_check(pq, &_current->base.qnode_dlist);
 
-	sys_dlist_dequeue(&arch_current_thread()->base.qnode_dlist);
+	sys_dlist_dequeue(&_current->base.qnode_dlist);
 
 	struct k_thread *t;
 
@@ -145,15 +145,15 @@ static ALWAYS_INLINE void z_priq_dumb_yield(sys_dlist_t *pq)
 
 	while (n != NULL) {
 		t = CONTAINER_OF(n, struct k_thread, base.qnode_dlist);
-		if (z_sched_prio_cmp(arch_current_thread(), t) > 0) {
+		if (z_sched_prio_cmp(_current, t) > 0) {
 			sys_dlist_insert(&t->base.qnode_dlist,
-					 &arch_current_thread()->base.qnode_dlist);
+					 &_current->base.qnode_dlist);
 			return;
 		}
 		n = sys_dlist_peek_next_no_check(pq, n);
 	}
 
-	sys_dlist_append(pq, &arch_current_thread()->base.qnode_dlist);
+	sys_dlist_append(pq, &_current->base.qnode_dlist);
 #endif
 }
 
@@ -229,8 +229,8 @@ static ALWAYS_INLINE void z_priq_rb_remove(struct _priq_rb *pq, struct k_thread
 static ALWAYS_INLINE void z_priq_rb_yield(struct _priq_rb *pq)
 {
 #ifndef CONFIG_SMP
-	z_priq_rb_remove(pq, arch_current_thread());
-	z_priq_rb_add(pq, arch_current_thread());
+	z_priq_rb_remove(pq, _current);
+	z_priq_rb_add(pq, _current);
 #endif
 }
 
@@ -319,11 +319,11 @@ static ALWAYS_INLINE void z_priq_mq_remove(struct _priq_mq *pq,
 static ALWAYS_INLINE void z_priq_mq_yield(struct _priq_mq *pq)
 {
 #ifndef CONFIG_SMP
-	struct prio_info pos = get_prio_info(arch_current_thread()->base.prio);
+	struct prio_info pos = get_prio_info(_current->base.prio);
 
-	sys_dlist_dequeue(&arch_current_thread()->base.qnode_dlist);
+	sys_dlist_dequeue(&_current->base.qnode_dlist);
 	sys_dlist_append(&pq->queues[pos.offset_prio],
-			 &arch_current_thread()->base.qnode_dlist);
+			 &_current->base.qnode_dlist);
 #endif
 }
 
diff --git a/kernel/ipi.c b/kernel/ipi.c
index 59c2eba6698..ee01c459425 100644
--- a/kernel/ipi.c
+++ b/kernel/ipi.c
@@ -101,7 +101,7 @@ void z_sched_ipi(void)
 #endif /* CONFIG_TRACE_SCHED_IPI */
 
 #ifdef CONFIG_TIMESLICING
-	if (thread_is_sliceable(arch_current_thread())) {
+	if (thread_is_sliceable(_current)) {
 		z_time_slice();
 	}
 #endif /* CONFIG_TIMESLICING */
diff --git a/kernel/mailbox.c b/kernel/mailbox.c
index 17ebfb2ea03..d7da8e3c8e4 100644
--- a/kernel/mailbox.c
+++ b/kernel/mailbox.c
@@ -216,7 +216,7 @@ static int mbox_message_put(struct k_mbox *mbox, struct k_mbox_msg *tx_msg,
 	k_spinlock_key_t key;
 
 	/* save sender id so it can be used during message matching */
-	tx_msg->rx_source_thread = arch_current_thread();
+	tx_msg->rx_source_thread = _current;
 
 	/* finish readying sending thread (actual or dummy) for send */
 	sending_thread = tx_msg->_syncing_thread;
@@ -296,7 +296,7 @@ int k_mbox_put(struct k_mbox *mbox, struct k_mbox_msg *tx_msg,
 	       k_timeout_t timeout)
 {
 	/* configure things for a synchronous send, then send the message */
-	tx_msg->_syncing_thread = arch_current_thread();
+	tx_msg->_syncing_thread = _current;
 
 	SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_mbox, put, mbox, timeout);
 
@@ -321,7 +321,7 @@ void k_mbox_async_put(struct k_mbox *mbox, struct k_mbox_msg *tx_msg,
 	 */
 	mbox_async_alloc(&async);
 
-	async->thread.prio = arch_current_thread()->base.prio;
+	async->thread.prio = _current->base.prio;
 
 	async->tx_msg = *tx_msg;
 	async->tx_msg._syncing_thread = (struct k_thread *)&async->thread;
@@ -388,7 +388,7 @@ int k_mbox_get(struct k_mbox *mbox, struct k_mbox_msg *rx_msg, void *buffer,
 	int result;
 
 	/* save receiver id so it can be used during message matching */
-	rx_msg->tx_target_thread = arch_current_thread();
+	rx_msg->tx_target_thread = _current;
 
 	/* search mailbox's tx queue for a compatible sender */
 	key = k_spin_lock(&mbox->lock);
@@ -425,7 +425,7 @@ int k_mbox_get(struct k_mbox *mbox, struct k_mbox_msg *rx_msg, void *buffer,
 	SYS_PORT_TRACING_OBJ_FUNC_BLOCKING(k_mbox, get, mbox, timeout);
 
 	/* wait until a matching sender appears or a timeout occurs */
-	arch_current_thread()->base.swap_data = rx_msg;
+	_current->base.swap_data = rx_msg;
 	result = z_pend_curr(&mbox->lock, key, &mbox->rx_msg_queue, timeout);
 
 	/* consume message data immediately, if needed */
diff --git a/kernel/mem_domain.c b/kernel/mem_domain.c
index 1fc8a36a94d..16b337acf01 100644
--- a/kernel/mem_domain.c
+++ b/kernel/mem_domain.c
@@ -299,7 +299,7 @@ void z_mem_domain_init_thread(struct k_thread *thread)
 	k_spinlock_key_t key = k_spin_lock(&z_mem_domain_lock);
 
 	/* New threads inherit memory domain configuration from parent */
-	ret = add_thread_locked(arch_current_thread()->mem_domain_info.mem_domain, thread);
+	ret = add_thread_locked(_current->mem_domain_info.mem_domain, thread);
 	__ASSERT_NO_MSG(ret == 0);
 	ARG_UNUSED(ret);
 
diff --git a/kernel/mem_slab.c b/kernel/mem_slab.c
index 540ef6ed424..a7da66d374f 100644
--- a/kernel/mem_slab.c
+++ b/kernel/mem_slab.c
@@ -252,7 +252,7 @@ int k_mem_slab_alloc(struct k_mem_slab *slab, void **mem, k_timeout_t timeout)
 		/* wait for a free block or timeout */
 		result = z_pend_curr(&slab->lock, key, &slab->wait_q, timeout);
 		if (result == 0) {
-			*mem = arch_current_thread()->base.swap_data;
+			*mem = _current->base.swap_data;
 		}
 
 		SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_mem_slab, alloc, slab, timeout, result);
diff --git a/kernel/mempool.c b/kernel/mempool.c
index 7e9a7677f71..d8926c63ed9 100644
--- a/kernel/mempool.c
+++ b/kernel/mempool.c
@@ -165,7 +165,7 @@ void *z_thread_aligned_alloc(size_t align, size_t size)
 	if (k_is_in_isr()) {
 		heap = _SYSTEM_HEAP;
 	} else {
-		heap = arch_current_thread()->resource_pool;
+		heap = _current->resource_pool;
 	}
 
 	if (heap != NULL) {
diff --git a/kernel/mmu.c b/kernel/mmu.c
index fc55096d44b..617b02997dd 100644
--- a/kernel/mmu.c
+++ b/kernel/mmu.c
@@ -1674,7 +1674,7 @@ static bool do_page_fault(void *addr, bool pin)
 #endif /* CONFIG_DEMAND_PAGING_ALLOW_IRQ */
 
 	key = k_spin_lock(&z_mm_lock);
-	faulting_thread = arch_current_thread();
+	faulting_thread = _current;
 
 	status = arch_page_location_get(addr, &page_in_location);
 	if (status == ARCH_PAGE_LOCATION_BAD) {
diff --git a/kernel/msg_q.c b/kernel/msg_q.c
index 9035fccda7d..3998c235108 100644
--- a/kernel/msg_q.c
+++ b/kernel/msg_q.c
@@ -169,7 +169,7 @@ int z_impl_k_msgq_put(struct k_msgq *msgq, const void *data, k_timeout_t timeout
 		SYS_PORT_TRACING_OBJ_FUNC_BLOCKING(k_msgq, put, msgq, timeout);
 
 		/* wait for put message success, failure, or timeout */
-		arch_current_thread()->base.swap_data = (void *) data;
+		_current->base.swap_data = (void *) data;
 
 		result = z_pend_curr(&msgq->lock, key, &msgq->wait_q, timeout);
 		SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_msgq, put, msgq, timeout, result);
@@ -267,7 +267,7 @@ int z_impl_k_msgq_get(struct k_msgq *msgq, void *data, k_timeout_t timeout)
 		SYS_PORT_TRACING_OBJ_FUNC_BLOCKING(k_msgq, get, msgq, timeout);
 
 		/* wait for get message success or timeout */
-		arch_current_thread()->base.swap_data = data;
+		_current->base.swap_data = data;
 
 		result = z_pend_curr(&msgq->lock, key, &msgq->wait_q, timeout);
 		SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_msgq, get, msgq, timeout, result);
diff --git a/kernel/mutex.c b/kernel/mutex.c
index 2fbede19e2c..ce76e5a2af5 100644
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
@@ -114,17 +114,17 @@ int z_impl_k_mutex_lock(struct k_mutex *mutex, k_timeout_t timeout)
 
 	key = k_spin_lock(&lock);
 
-	if (likely((mutex->lock_count == 0U) || (mutex->owner == arch_current_thread()))) {
+	if (likely((mutex->lock_count == 0U) || (mutex->owner == _current))) {
 
 		mutex->owner_orig_prio = (mutex->lock_count == 0U) ?
-					arch_current_thread()->base.prio :
+					_current->base.prio :
 					mutex->owner_orig_prio;
 
 		mutex->lock_count++;
-		mutex->owner = arch_current_thread();
+		mutex->owner = _current;
 
 		LOG_DBG("%p took mutex %p, count: %d, orig prio: %d",
-			arch_current_thread(), mutex, mutex->lock_count,
+			_current, mutex, mutex->lock_count,
 			mutex->owner_orig_prio);
 
 		k_spin_unlock(&lock, key);
@@ -144,7 +144,7 @@ int z_impl_k_mutex_lock(struct k_mutex *mutex, k_timeout_t timeout)
 
 	SYS_PORT_TRACING_OBJ_FUNC_BLOCKING(k_mutex, lock, mutex, timeout);
 
-	new_prio = new_prio_for_inheritance(arch_current_thread()->base.prio,
+	new_prio = new_prio_for_inheritance(_current->base.prio,
 					    mutex->owner->base.prio);
 
 	LOG_DBG("adjusting prio up on mutex %p", mutex);
@@ -157,7 +157,7 @@ int z_impl_k_mutex_lock(struct k_mutex *mutex, k_timeout_t timeout)
 
 	LOG_DBG("on mutex %p got_mutex value: %d", mutex, got_mutex);
 
-	LOG_DBG("%p got mutex %p (y/n): %c", arch_current_thread(), mutex,
+	LOG_DBG("%p got mutex %p (y/n): %c", _current, mutex,
 		got_mutex ? 'y' : 'n');
 
 	if (got_mutex == 0) {
@@ -167,7 +167,7 @@ int z_impl_k_mutex_lock(struct k_mutex *mutex, k_timeout_t timeout)
 
 	/* timed out */
 
-	LOG_DBG("%p timeout on mutex %p", arch_current_thread(), mutex);
+	LOG_DBG("%p timeout on mutex %p", _current, mutex);
 
 	key = k_spin_lock(&lock);
 
@@ -224,7 +224,7 @@ int z_impl_k_mutex_unlock(struct k_mutex *mutex)
 	/*
 	 * The current thread does not own the mutex.
 	 */
-	CHECKIF(mutex->owner != arch_current_thread()) {
+	CHECKIF(mutex->owner != _current) {
 		SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_mutex, unlock, mutex, -EPERM);
 
 		return -EPERM;
diff --git a/kernel/pipes.c b/kernel/pipes.c
index a9eef5a4f36..a81393c508d 100644
--- a/kernel/pipes.c
+++ b/kernel/pipes.c
@@ -443,11 +443,11 @@ int z_impl_k_pipe_put(struct k_pipe *pipe, const void *data,
 	 * invoked from within an ISR as that is not safe to do.
 	 */
 
-	src_desc = k_is_in_isr() ? &isr_desc : &arch_current_thread()->pipe_desc;
+	src_desc = k_is_in_isr() ? &isr_desc : &_current->pipe_desc;
 
 	src_desc->buffer        = (unsigned char *)data;
 	src_desc->bytes_to_xfer = bytes_to_write;
-	src_desc->thread        = arch_current_thread();
+	src_desc->thread        = _current;
 	sys_dlist_append(&src_list, &src_desc->node);
 
 	*bytes_written = pipe_write(pipe, &src_list,
@@ -488,7 +488,7 @@ int z_impl_k_pipe_put(struct k_pipe *pipe, const void *data,
 
 	SYS_PORT_TRACING_OBJ_FUNC_BLOCKING(k_pipe, put, pipe, timeout);
 
-	arch_current_thread()->base.swap_data = src_desc;
+	_current->base.swap_data = src_desc;
 
 	z_sched_wait(&pipe->lock, key, &pipe->wait_q.writers, timeout, NULL);
 
@@ -581,11 +581,11 @@ static int pipe_get_internal(k_spinlock_key_t key, struct k_pipe *pipe,
 	 * invoked from within an ISR as that is not safe to do.
 	 */
 
-	dest_desc = k_is_in_isr() ? &isr_desc : &arch_current_thread()->pipe_desc;
+	dest_desc = k_is_in_isr() ? &isr_desc : &_current->pipe_desc;
 
 	dest_desc->buffer = data;
 	dest_desc->bytes_to_xfer = bytes_to_read;
-	dest_desc->thread = arch_current_thread();
+	dest_desc->thread = _current;
 
 	src_desc = (struct _pipe_desc *)sys_dlist_get(&src_list);
 	while (src_desc != NULL) {
@@ -674,7 +674,7 @@ static int pipe_get_internal(k_spinlock_key_t key, struct k_pipe *pipe,
 
 	SYS_PORT_TRACING_OBJ_FUNC_BLOCKING(k_pipe, get, pipe, timeout);
 
-	arch_current_thread()->base.swap_data = dest_desc;
+	_current->base.swap_data = dest_desc;
 
 	z_sched_wait(&pipe->lock, key, &pipe->wait_q.readers, timeout, NULL);
 
diff --git a/kernel/poll.c b/kernel/poll.c
index 05e9fe10c3e..502e97537b9 100644
--- a/kernel/poll.c
+++ b/kernel/poll.c
@@ -290,7 +290,7 @@ int z_impl_k_poll(struct k_poll_event *events, int num_events,
 {
 	int events_registered;
 	k_spinlock_key_t key;
-	struct z_poller *poller = &arch_current_thread()->poller;
+	struct z_poller *poller = &_current->poller;
 
 	poller->is_polling = true;
 	poller->mode = MODE_POLL;
diff --git a/kernel/queue.c b/kernel/queue.c
index 09b224c9c94..4b00deeb1e7 100644
--- a/kernel/queue.c
+++ b/kernel/queue.c
@@ -346,9 +346,9 @@ void *z_impl_k_queue_get(struct k_queue *queue, k_timeout_t timeout)
 	int ret = z_pend_curr(&queue->lock, key, &queue->wait_q, timeout);
 
 	SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_queue, get, queue, timeout,
-		(ret != 0) ? NULL : arch_current_thread()->base.swap_data);
+		(ret != 0) ? NULL : _current->base.swap_data);
 
-	return (ret != 0) ? NULL : arch_current_thread()->base.swap_data;
+	return (ret != 0) ? NULL : _current->base.swap_data;
 }
 
 bool k_queue_remove(struct k_queue *queue, void *data)
diff --git a/kernel/sched.c b/kernel/sched.c
index 41cdafa5d7e..02dc0b699d2 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -31,7 +31,7 @@ extern struct k_thread *pending_current;
 struct k_spinlock _sched_spinlock;
 
 /* Storage to "complete" the context switch from an invalid/incomplete thread
- * context (ex: exiting an ISR that aborted arch_current_thread())
+ * context (ex: exiting an ISR that aborted _current)
  */
 __incoherent struct k_thread _thread_dummy;
 
@@ -98,12 +98,12 @@ static ALWAYS_INLINE struct k_thread *runq_best(void)
 	return _priq_run_best(curr_cpu_runq());
 }
 
-/* arch_current_thread() is never in the run queue until context switch on
+/* _current is never in the run queue until context switch on
  * SMP configurations, see z_requeue_current()
  */
 static inline bool should_queue_thread(struct k_thread *thread)
 {
-	return !IS_ENABLED(CONFIG_SMP) || (thread != arch_current_thread());
+	return !IS_ENABLED(CONFIG_SMP) || (thread != _current);
 }
 
 static ALWAYS_INLINE void queue_thread(struct k_thread *thread)
@@ -113,7 +113,7 @@ static ALWAYS_INLINE void queue_thread(struct k_thread *thread)
 		runq_add(thread);
 	}
 #ifdef CONFIG_SMP
-	if (thread == arch_current_thread()) {
+	if (thread == _current) {
 		/* add current to end of queue means "yield" */
 		_current_cpu->swap_ok = true;
 	}
@@ -167,8 +167,8 @@ static inline void clear_halting(struct k_thread *thread)
 static ALWAYS_INLINE struct k_thread *next_up(void)
 {
 #ifdef CONFIG_SMP
-	if (is_halting(arch_current_thread())) {
-		halt_thread(arch_current_thread(), is_aborting(arch_current_thread()) ?
+	if (is_halting(_current)) {
+		halt_thread(_current, is_aborting(_current) ?
 				      _THREAD_DEAD : _THREAD_SUSPENDED);
 	}
 #endif /* CONFIG_SMP */
@@ -207,42 +207,42 @@ static ALWAYS_INLINE struct k_thread *next_up(void)
 #else
 	/* Under SMP, the "cache" mechanism for selecting the next
 	 * thread doesn't work, so we have more work to do to test
-	 * arch_current_thread() against the best choice from the queue.  Here, the
+	 * _current against the best choice from the queue.  Here, the
 	 * thread selected above represents "the best thread that is
 	 * not current".
 	 *
-	 * Subtle note on "queued": in SMP mode, arch_current_thread() does not
+	 * Subtle note on "queued": in SMP mode, _current does not
 	 * live in the queue, so this isn't exactly the same thing as
-	 * "ready", it means "is arch_current_thread() already added back to the
+	 * "ready", it means "is _current already added back to the
 	 * queue such that we don't want to re-add it".
 	 */
-	bool queued = z_is_thread_queued(arch_current_thread());
-	bool active = !z_is_thread_prevented_from_running(arch_current_thread());
+	bool queued = z_is_thread_queued(_current);
+	bool active = !z_is_thread_prevented_from_running(_current);
 
 	if (thread == NULL) {
 		thread = _current_cpu->idle_thread;
 	}
 
 	if (active) {
-		int32_t cmp = z_sched_prio_cmp(arch_current_thread(), thread);
+		int32_t cmp = z_sched_prio_cmp(_current, thread);
 
 		/* Ties only switch if state says we yielded */
 		if ((cmp > 0) || ((cmp == 0) && !_current_cpu->swap_ok)) {
-			thread = arch_current_thread();
+			thread = _current;
 		}
 
 		if (!should_preempt(thread, _current_cpu->swap_ok)) {
-			thread = arch_current_thread();
+			thread = _current;
 		}
 	}
 
-	/* Put arch_current_thread() back into the queue */
-	if ((thread != arch_current_thread()) && active &&
-		!z_is_idle_thread_object(arch_current_thread()) && !queued) {
-		queue_thread(arch_current_thread());
+	/* Put _current back into the queue */
+	if ((thread != _current) && active &&
+		!z_is_idle_thread_object(_current) && !queued) {
+		queue_thread(_current);
 	}
 
-	/* Take the new arch_current_thread() out of the queue */
+	/* Take the new _current out of the queue */
 	if (z_is_thread_queued(thread)) {
 		dequeue_thread(thread);
 	}
@@ -258,7 +258,7 @@ void move_thread_to_end_of_prio_q(struct k_thread *thread)
 		dequeue_thread(thread);
 	}
 	queue_thread(thread);
-	update_cache(thread == arch_current_thread());
+	update_cache(thread == _current);
 }
 
 /* Track cooperative threads preempted by metairqs so we can return to
@@ -269,10 +269,10 @@ static void update_metairq_preempt(struct k_thread *thread)
 {
 #if (CONFIG_NUM_METAIRQ_PRIORITIES > 0) &&                                                         \
 	(CONFIG_NUM_COOP_PRIORITIES > CONFIG_NUM_METAIRQ_PRIORITIES)
-	if (thread_is_metairq(thread) && !thread_is_metairq(arch_current_thread()) &&
-	    !thread_is_preemptible(arch_current_thread())) {
+	if (thread_is_metairq(thread) && !thread_is_metairq(_current) &&
+	    !thread_is_preemptible(_current)) {
 		/* Record new preemption */
-		_current_cpu->metairq_preempted = arch_current_thread();
+		_current_cpu->metairq_preempted = _current;
 	} else if (!thread_is_metairq(thread) && !z_is_idle_thread_object(thread)) {
 		/* Returning from existing preemption */
 		_current_cpu->metairq_preempted = NULL;
@@ -292,14 +292,14 @@ static ALWAYS_INLINE void update_cache(int preempt_ok)
 
 	if (should_preempt(thread, preempt_ok)) {
 #ifdef CONFIG_TIMESLICING
-		if (thread != arch_current_thread()) {
+		if (thread != _current) {
 			z_reset_time_slice(thread);
 		}
 #endif /* CONFIG_TIMESLICING */
 		update_metairq_preempt(thread);
 		_kernel.ready_q.cache = thread;
 	} else {
-		_kernel.ready_q.cache = arch_current_thread();
+		_kernel.ready_q.cache = _current;
 	}
 
 #else
@@ -378,9 +378,9 @@ void z_move_thread_to_end_of_prio_q(struct k_thread *thread)
  */
 static void thread_halt_spin(struct k_thread *thread, k_spinlock_key_t key)
 {
-	if (is_halting(arch_current_thread())) {
-		halt_thread(arch_current_thread(),
-			    is_aborting(arch_current_thread()) ? _THREAD_DEAD : _THREAD_SUSPENDED);
+	if (is_halting(_current)) {
+		halt_thread(_current,
+			    is_aborting(_current) ? _THREAD_DEAD : _THREAD_SUSPENDED);
 	}
 	k_spin_unlock(&_sched_spinlock, key);
 	while (is_halting(thread)) {
@@ -394,7 +394,7 @@ static void thread_halt_spin(struct k_thread *thread, k_spinlock_key_t key)
 /* Shared handler for k_thread_{suspend,abort}().  Called with the
  * scheduler lock held and the key passed (which it may
  * release/reacquire!) which will be released before a possible return
- * (aborting arch_current_thread() will not return, obviously), which may be after
+ * (aborting _current will not return, obviously), which may be after
  * a context switch.
  */
 static ALWAYS_INLINE void z_thread_halt(struct k_thread *thread, k_spinlock_key_t key,
@@ -427,14 +427,14 @@ static ALWAYS_INLINE void z_thread_halt(struct k_thread *thread, k_spinlock_key_
 		if (arch_is_in_isr()) {
 			thread_halt_spin(thread, key);
 		} else  {
-			add_to_waitq_locked(arch_current_thread(), wq);
+			add_to_waitq_locked(_current, wq);
 			z_swap(&_sched_spinlock, key);
 		}
 	} else {
 		halt_thread(thread, terminate ? _THREAD_DEAD : _THREAD_SUSPENDED);
-		if ((thread == arch_current_thread()) && !arch_is_in_isr()) {
+		if ((thread == _current) && !arch_is_in_isr()) {
 			z_swap(&_sched_spinlock, key);
-			__ASSERT(!terminate, "aborted arch_current_thread() back from dead");
+			__ASSERT(!terminate, "aborted _current back from dead");
 		} else {
 			k_spin_unlock(&_sched_spinlock, key);
 		}
@@ -453,7 +453,7 @@ void z_impl_k_thread_suspend(k_tid_t thread)
 	/* Special case "suspend the current thread" as it doesn't
 	 * need the async complexity below.
 	 */
-	if (thread == arch_current_thread() && !arch_is_in_isr() && !IS_ENABLED(CONFIG_SMP)) {
+	if (thread == _current && !arch_is_in_isr() && !IS_ENABLED(CONFIG_SMP)) {
 		k_spinlock_key_t key = k_spin_lock(&_sched_spinlock);
 
 		z_mark_thread_as_suspended(thread);
@@ -521,7 +521,7 @@ static void unready_thread(struct k_thread *thread)
 	if (z_is_thread_queued(thread)) {
 		dequeue_thread(thread);
 	}
-	update_cache(thread == arch_current_thread());
+	update_cache(thread == _current);
 }
 
 /* _sched_spinlock must be held */
@@ -558,7 +558,7 @@ static void pend_locked(struct k_thread *thread, _wait_q_t *wait_q,
 void z_pend_thread(struct k_thread *thread, _wait_q_t *wait_q,
 		   k_timeout_t timeout)
 {
-	__ASSERT_NO_MSG(thread == arch_current_thread() || is_thread_dummy(thread));
+	__ASSERT_NO_MSG(thread == _current || is_thread_dummy(thread));
 	K_SPINLOCK(&_sched_spinlock) {
 		pend_locked(thread, wait_q, timeout);
 	}
@@ -616,7 +616,7 @@ int z_pend_curr(struct k_spinlock *lock, k_spinlock_key_t key,
 	       _wait_q_t *wait_q, k_timeout_t timeout)
 {
 #if defined(CONFIG_TIMESLICING) && defined(CONFIG_SWAP_NONATOMIC)
-	pending_current = arch_current_thread();
+	pending_current = _current;
 #endif /* CONFIG_TIMESLICING && CONFIG_SWAP_NONATOMIC */
 	__ASSERT_NO_MSG(sizeof(_sched_spinlock) == 0 || lock != &_sched_spinlock);
 
@@ -629,7 +629,7 @@ int z_pend_curr(struct k_spinlock *lock, k_spinlock_key_t key,
 	 * held.
 	 */
 	(void) k_spin_lock(&_sched_spinlock);
-	pend_locked(arch_current_thread(), wait_q, timeout);
+	pend_locked(_current, wait_q, timeout);
 	k_spin_release(lock);
 	return z_swap(&_sched_spinlock, key);
 }
@@ -727,7 +727,7 @@ static inline bool need_swap(void)
 
 	/* Check if the next ready thread is the same as the current thread */
 	new_thread = _kernel.ready_q.cache;
-	return new_thread != arch_current_thread();
+	return new_thread != _current;
 #endif /* CONFIG_SMP */
 }
 
@@ -763,15 +763,15 @@ void k_sched_lock(void)
 void k_sched_unlock(void)
 {
 	K_SPINLOCK(&_sched_spinlock) {
-		__ASSERT(arch_current_thread()->base.sched_locked != 0U, "");
+		__ASSERT(_current->base.sched_locked != 0U, "");
 		__ASSERT(!arch_is_in_isr(), "");
 
-		++arch_current_thread()->base.sched_locked;
+		++_current->base.sched_locked;
 		update_cache(0);
 	}
 
 	LOG_DBG("scheduler unlocked (%p:%d)",
-		arch_current_thread(), arch_current_thread()->base.sched_locked);
+		_current, _current->base.sched_locked);
 
 	SYS_PORT_TRACING_FUNC(k_thread, sched_unlock);
 
@@ -783,10 +783,10 @@ struct k_thread *z_swap_next_thread(void)
 #ifdef CONFIG_SMP
 	struct k_thread *ret = next_up();
 
-	if (ret == arch_current_thread()) {
+	if (ret == _current) {
 		/* When not swapping, have to signal IPIs here.  In
 		 * the context switch case it must happen later, after
-		 * arch_current_thread() gets requeued.
+		 * _current gets requeued.
 		 */
 		signal_pending_ipi();
 	}
@@ -827,7 +827,7 @@ static inline void set_current(struct k_thread *new_thread)
  * function.
  *
  * @warning
- * The arch_current_thread() value may have changed after this call and not refer
+ * The _current value may have changed after this call and not refer
  * to the interrupted thread anymore. It might be necessary to make a local
  * copy before calling this function.
  *
@@ -843,7 +843,7 @@ void *z_get_next_switch_handle(void *interrupted)
 	void *ret = NULL;
 
 	K_SPINLOCK(&_sched_spinlock) {
-		struct k_thread *old_thread = arch_current_thread(), *new_thread;
+		struct k_thread *old_thread = _current, *new_thread;
 
 		if (IS_ENABLED(CONFIG_SMP)) {
 			old_thread->switch_handle = NULL;
@@ -869,7 +869,7 @@ void *z_get_next_switch_handle(void *interrupted)
 #endif /* CONFIG_TIMESLICING */
 
 #ifdef CONFIG_SPIN_VALIDATE
-			/* Changed arch_current_thread()!  Update the spinlock
+			/* Changed _current!  Update the spinlock
 			 * bookkeeping so the validation doesn't get
 			 * confused when the "wrong" thread tries to
 			 * release the lock.
@@ -904,9 +904,9 @@ void *z_get_next_switch_handle(void *interrupted)
 	return ret;
 #else
 	z_sched_usage_switch(_kernel.ready_q.cache);
-	arch_current_thread()->switch_handle = interrupted;
+	_current->switch_handle = interrupted;
 	set_current(_kernel.ready_q.cache);
-	return arch_current_thread()->switch_handle;
+	return _current->switch_handle;
 #endif /* CONFIG_SMP */
 }
 #endif /* CONFIG_USE_SWITCH */
@@ -952,7 +952,7 @@ void z_impl_k_thread_priority_set(k_tid_t thread, int prio)
 	bool need_sched = z_thread_prio_set((struct k_thread *)thread, prio);
 
 	if ((need_sched) && (IS_ENABLED(CONFIG_SMP) ||
-			     (arch_current_thread()->base.sched_locked == 0U))) {
+			     (_current->base.sched_locked == 0U))) {
 		z_reschedule_unlocked();
 	}
 }
@@ -1036,7 +1036,7 @@ static inline void z_vrfy_k_reschedule(void)
 bool k_can_yield(void)
 {
 	return !(k_is_pre_kernel() || k_is_in_isr() ||
-		 z_is_idle_thread_object(arch_current_thread()));
+		 z_is_idle_thread_object(_current));
 }
 
 void z_impl_k_yield(void)
@@ -1048,7 +1048,7 @@ void z_impl_k_yield(void)
 	k_spinlock_key_t key = k_spin_lock(&_sched_spinlock);
 
 #ifdef CONFIG_SMP
-	z_mark_thread_as_queued(arch_current_thread());
+	z_mark_thread_as_queued(_current);
 #endif
 	runq_yield();
 
@@ -1070,7 +1070,7 @@ static int32_t z_tick_sleep(k_ticks_t ticks)
 
 	__ASSERT(!arch_is_in_isr(), "");
 
-	LOG_DBG("thread %p for %lu ticks", arch_current_thread(), (unsigned long)ticks);
+	LOG_DBG("thread %p for %lu ticks", _current, (unsigned long)ticks);
 
 	/* wait of 0 ms is treated as a 'yield' */
 	if (ticks == 0) {
@@ -1088,11 +1088,11 @@ static int32_t z_tick_sleep(k_ticks_t ticks)
 	k_spinlock_key_t key = k_spin_lock(&_sched_spinlock);
 
 #if defined(CONFIG_TIMESLICING) && defined(CONFIG_SWAP_NONATOMIC)
-	pending_current = arch_current_thread();
+	pending_current = _current;
 #endif /* CONFIG_TIMESLICING && CONFIG_SWAP_NONATOMIC */
-	unready_thread(arch_current_thread());
-	z_add_thread_timeout(arch_current_thread(), timeout);
-	z_mark_thread_as_sleeping(arch_current_thread());
+	unready_thread(_current);
+	z_add_thread_timeout(_current, timeout);
+	z_mark_thread_as_sleeping(_current);
 
 	(void)z_swap(&_sched_spinlock, key);
 
@@ -1195,7 +1195,7 @@ static inline void z_vrfy_k_wakeup(k_tid_t thread)
 
 k_tid_t z_impl_k_sched_current_thread_query(void)
 {
-	return arch_current_thread();
+	return _current;
 }
 
 #ifdef CONFIG_USERSPACE
@@ -1250,13 +1250,13 @@ static ALWAYS_INLINE void halt_thread(struct k_thread *thread, uint8_t new_state
 			(void)z_abort_thread_timeout(thread);
 			unpend_all(&thread->join_queue);
 
-			/* Edge case: aborting arch_current_thread() from within an
+			/* Edge case: aborting _current from within an
 			 * ISR that preempted it requires clearing the
-			 * arch_current_thread() pointer so the upcoming context
+			 * _current pointer so the upcoming context
 			 * switch doesn't clobber the now-freed
 			 * memory
 			 */
-			if (thread == arch_current_thread() && arch_is_in_isr()) {
+			if (thread == _current && arch_is_in_isr()) {
 				dummify = true;
 			}
 		}
@@ -1299,10 +1299,10 @@ static ALWAYS_INLINE void halt_thread(struct k_thread *thread, uint8_t new_state
 		k_thread_abort_cleanup(thread);
 #endif /* CONFIG_THREAD_ABORT_NEED_CLEANUP */
 
-		/* Do this "set arch_current_thread() to dummy" step last so that
-		 * subsystems above can rely on arch_current_thread() being
+		/* Do this "set _current to dummy" step last so that
+		 * subsystems above can rely on _current being
 		 * unchanged.  Disabled for posix as that arch
-		 * continues to use the arch_current_thread() pointer in its swap
+		 * continues to use the _current pointer in its swap
 		 * code.  Note that we must leave a non-null switch
 		 * handle for any threads spinning in join() (this can
 		 * never be used, as our thread is flagged dead, but
@@ -1310,7 +1310,7 @@ static ALWAYS_INLINE void halt_thread(struct k_thread *thread, uint8_t new_state
 		 */
 		if (dummify && !IS_ENABLED(CONFIG_ARCH_POSIX)) {
 #ifdef CONFIG_USE_SWITCH
-			arch_current_thread()->switch_handle = arch_current_thread();
+			_current->switch_handle = _current;
 #endif
 			z_dummy_thread_init(&_thread_dummy);
 
@@ -1368,13 +1368,13 @@ int z_impl_k_thread_join(struct k_thread *thread, k_timeout_t timeout)
 		ret = 0;
 	} else if (K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
 		ret = -EBUSY;
-	} else if ((thread == arch_current_thread()) ||
-		   (thread->base.pended_on == &arch_current_thread()->join_queue)) {
+	} else if ((thread == _current) ||
+		   (thread->base.pended_on == &_current->join_queue)) {
 		ret = -EDEADLK;
 	} else {
 		__ASSERT(!arch_is_in_isr(), "cannot join in ISR");
-		add_to_waitq_locked(arch_current_thread(), &thread->join_queue);
-		add_thread_timeout(arch_current_thread(), timeout);
+		add_to_waitq_locked(_current, &thread->join_queue);
+		add_thread_timeout(_current, timeout);
 
 		SYS_PORT_TRACING_OBJ_FUNC_BLOCKING(k_thread, join, thread, timeout);
 		ret = z_swap(&_sched_spinlock, key);
@@ -1473,7 +1473,7 @@ int z_sched_wait(struct k_spinlock *lock, k_spinlock_key_t key,
 	int ret = z_pend_curr(lock, key, wait_q, timeout);
 
 	if (data != NULL) {
-		*data = arch_current_thread()->base.swap_data;
+		*data = _current->base.swap_data;
 	}
 	return ret;
 }
diff --git a/kernel/smp.c b/kernel/smp.c
index b0eefb35e41..a5659525278 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -58,23 +58,23 @@ unsigned int z_smp_global_lock(void)
 {
 	unsigned int key = arch_irq_lock();
 
-	if (!arch_current_thread()->base.global_lock_count) {
+	if (!_current->base.global_lock_count) {
 		while (!atomic_cas(&global_lock, 0, 1)) {
 			arch_spin_relax();
 		}
 	}
 
-	arch_current_thread()->base.global_lock_count++;
+	_current->base.global_lock_count++;
 
 	return key;
 }
 
 void z_smp_global_unlock(unsigned int key)
 {
-	if (arch_current_thread()->base.global_lock_count != 0U) {
-		arch_current_thread()->base.global_lock_count--;
+	if (_current->base.global_lock_count != 0U) {
+		_current->base.global_lock_count--;
 
-		if (!arch_current_thread()->base.global_lock_count) {
+		if (!_current->base.global_lock_count) {
 			(void)atomic_clear(&global_lock);
 		}
 	}
diff --git a/kernel/spinlock_validate.c b/kernel/spinlock_validate.c
index c2a97356d9c..cb7ff5a3e7f 100644
--- a/kernel/spinlock_validate.c
+++ b/kernel/spinlock_validate.c
@@ -24,11 +24,11 @@ bool z_spin_unlock_valid(struct k_spinlock *l)
 
 	l->thread_cpu = 0;
 
-	if (arch_is_in_isr() && arch_current_thread()->base.thread_state & _THREAD_DUMMY) {
-		/* Edge case where an ISR aborted arch_current_thread() */
+	if (arch_is_in_isr() && _current->base.thread_state & _THREAD_DUMMY) {
+		/* Edge case where an ISR aborted _current */
 		return true;
 	}
-	if (tcpu != (_current_cpu->id | (uintptr_t)arch_current_thread())) {
+	if (tcpu != (_current_cpu->id | (uintptr_t)_current)) {
 		return false;
 	}
 	return true;
@@ -36,7 +36,7 @@ bool z_spin_unlock_valid(struct k_spinlock *l)
 
 void z_spin_lock_set_owner(struct k_spinlock *l)
 {
-	l->thread_cpu = _current_cpu->id | (uintptr_t)arch_current_thread();
+	l->thread_cpu = _current_cpu->id | (uintptr_t)_current;
 }
 
 #ifdef CONFIG_KERNEL_COHERENCE
diff --git a/kernel/stack.c b/kernel/stack.c
index b3ea624b162..5add38b9c23 100644
--- a/kernel/stack.c
+++ b/kernel/stack.c
@@ -182,7 +182,7 @@ int z_impl_k_stack_pop(struct k_stack *stack, stack_data_t *data,
 		return -EAGAIN;
 	}
 
-	*data = (stack_data_t)arch_current_thread()->base.swap_data;
+	*data = (stack_data_t)_current->base.swap_data;
 
 	SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_stack, pop, stack, timeout, 0);
 
diff --git a/kernel/thread.c b/kernel/thread.c
index f731bfefdb6..c3535540a68 100644
--- a/kernel/thread.c
+++ b/kernel/thread.c
@@ -82,7 +82,7 @@ EXPORT_SYMBOL(k_is_in_isr);
 #ifdef CONFIG_THREAD_CUSTOM_DATA
 void z_impl_k_thread_custom_data_set(void *value)
 {
-	arch_current_thread()->custom_data = value;
+	_current->custom_data = value;
 }
 
 #ifdef CONFIG_USERSPACE
@@ -95,7 +95,7 @@ static inline void z_vrfy_k_thread_custom_data_set(void *data)
 
 void *z_impl_k_thread_custom_data_get(void)
 {
-	return arch_current_thread()->custom_data;
+	return _current->custom_data;
 }
 
 #ifdef CONFIG_USERSPACE
@@ -110,7 +110,7 @@ static inline void *z_vrfy_k_thread_custom_data_get(void)
 
 int z_impl_k_is_preempt_thread(void)
 {
-	return !arch_is_in_isr() && thread_is_preemptible(arch_current_thread());
+	return !arch_is_in_isr() && thread_is_preemptible(_current);
 }
 
 #ifdef CONFIG_USERSPACE
@@ -139,7 +139,7 @@ int z_impl_k_thread_name_set(k_tid_t thread, const char *str)
 {
 #ifdef CONFIG_THREAD_NAME
 	if (thread == NULL) {
-		thread = arch_current_thread();
+		thread = _current;
 	}
 
 	strncpy(thread->name, str, CONFIG_THREAD_MAX_NAME_LEN - 1);
@@ -334,11 +334,11 @@ void z_check_stack_sentinel(void)
 {
 	uint32_t *stack;
 
-	if ((arch_current_thread()->base.thread_state & _THREAD_DUMMY) != 0) {
+	if ((_current->base.thread_state & _THREAD_DUMMY) != 0) {
 		return;
 	}
 
-	stack = (uint32_t *)arch_current_thread()->stack_info.start;
+	stack = (uint32_t *)_current->stack_info.start;
 	if (*stack != STACK_SENTINEL) {
 		/* Restore it so further checks don't trigger this same error */
 		*stack = STACK_SENTINEL;
@@ -614,8 +614,8 @@ char *z_setup_new_thread(struct k_thread *new_thread,
 	}
 #endif /* CONFIG_SCHED_CPU_MASK */
 #ifdef CONFIG_ARCH_HAS_CUSTOM_SWAP_TO_MAIN
-	/* arch_current_thread() may be null if the dummy thread is not used */
-	if (!arch_current_thread()) {
+	/* _current may be null if the dummy thread is not used */
+	if (!_current) {
 		new_thread->resource_pool = NULL;
 		return stack_ptr;
 	}
@@ -624,13 +624,13 @@ char *z_setup_new_thread(struct k_thread *new_thread,
 	z_mem_domain_init_thread(new_thread);
 
 	if ((options & K_INHERIT_PERMS) != 0U) {
-		k_thread_perms_inherit(arch_current_thread(), new_thread);
+		k_thread_perms_inherit(_current, new_thread);
 	}
 #endif /* CONFIG_USERSPACE */
 #ifdef CONFIG_SCHED_DEADLINE
 	new_thread->base.prio_deadline = 0;
 #endif /* CONFIG_SCHED_DEADLINE */
-	new_thread->resource_pool = arch_current_thread()->resource_pool;
+	new_thread->resource_pool = _current->resource_pool;
 
 #ifdef CONFIG_SMP
 	z_waitq_init(&new_thread->halt_queue);
@@ -725,7 +725,7 @@ k_tid_t z_vrfy_k_thread_create(struct k_thread *new_thread,
 	 */
 	K_OOPS(K_SYSCALL_VERIFY(_is_valid_prio(prio, NULL)));
 	K_OOPS(K_SYSCALL_VERIFY(z_is_prio_lower_or_equal(prio,
-							arch_current_thread()->base.prio)));
+							_current->base.prio)));
 
 	z_setup_new_thread(new_thread, stack, stack_size,
 			   entry, p1, p2, p3, prio, options, NULL);
@@ -770,25 +770,25 @@ FUNC_NORETURN void k_thread_user_mode_enter(k_thread_entry_t entry,
 {
 	SYS_PORT_TRACING_FUNC(k_thread, user_mode_enter);
 
-	arch_current_thread()->base.user_options |= K_USER;
-	z_thread_essential_clear(arch_current_thread());
+	_current->base.user_options |= K_USER;
+	z_thread_essential_clear(_current);
 #ifdef CONFIG_THREAD_MONITOR
-	arch_current_thread()->entry.pEntry = entry;
-	arch_current_thread()->entry.parameter1 = p1;
-	arch_current_thread()->entry.parameter2 = p2;
-	arch_current_thread()->entry.parameter3 = p3;
+	_current->entry.pEntry = entry;
+	_current->entry.parameter1 = p1;
+	_current->entry.parameter2 = p2;
+	_current->entry.parameter3 = p3;
 #endif /* CONFIG_THREAD_MONITOR */
 #ifdef CONFIG_USERSPACE
-	__ASSERT(z_stack_is_user_capable(arch_current_thread()->stack_obj),
+	__ASSERT(z_stack_is_user_capable(_current->stack_obj),
 		 "dropping to user mode with kernel-only stack object");
 #ifdef CONFIG_THREAD_USERSPACE_LOCAL_DATA
-	memset(arch_current_thread()->userspace_local_data, 0,
+	memset(_current->userspace_local_data, 0,
 	       sizeof(struct _thread_userspace_local_data));
 #endif /* CONFIG_THREAD_USERSPACE_LOCAL_DATA */
 #ifdef CONFIG_THREAD_LOCAL_STORAGE
-	arch_tls_stack_setup(arch_current_thread(),
-			     (char *)(arch_current_thread()->stack_info.start +
-				      arch_current_thread()->stack_info.size));
+	arch_tls_stack_setup(_current,
+			     (char *)(_current->stack_info.start +
+				      _current->stack_info.size));
 #endif /* CONFIG_THREAD_LOCAL_STORAGE */
 	arch_user_mode_enter(entry, p1, p2, p3);
 #else
@@ -916,7 +916,7 @@ static inline k_ticks_t z_vrfy_k_thread_timeout_expires_ticks(
 void z_thread_mark_switched_in(void)
 {
 #if defined(CONFIG_SCHED_THREAD_USAGE) && !defined(CONFIG_USE_SWITCH)
-	z_sched_usage_start(arch_current_thread());
+	z_sched_usage_start(_current);
 #endif /* CONFIG_SCHED_THREAD_USAGE && !CONFIG_USE_SWITCH */
 
 #ifdef CONFIG_TRACING
@@ -933,9 +933,10 @@ void z_thread_mark_switched_out(void)
 #ifdef CONFIG_TRACING
 #ifdef CONFIG_THREAD_LOCAL_STORAGE
 	/* Dummy thread won't have TLS set up to run arbitrary code */
-	if (!arch_current_thread() ||
-	    (arch_current_thread()->base.thread_state & _THREAD_DUMMY) != 0)
+	if (!_current ||
+	    (_current->base.thread_state & _THREAD_DUMMY) != 0) {
 		return;
+	}
 #endif /* CONFIG_THREAD_LOCAL_STORAGE */
 	SYS_PORT_TRACING_FUNC(k_thread, switched_out);
 #endif /* CONFIG_TRACING */
@@ -1084,7 +1085,7 @@ void k_thread_abort_cleanup(struct k_thread *thread)
 			thread_to_cleanup = NULL;
 		}
 
-		if (thread == arch_current_thread()) {
+		if (thread == _current) {
 			/* Need to defer for current running thread as the cleanup
 			 * might result in exception. Actual cleanup will be done
 			 * at the next time k_thread_abort() is called, or at thread
diff --git a/kernel/timeslicing.c b/kernel/timeslicing.c
index 0410d42b91f..be91d9606f5 100644
--- a/kernel/timeslicing.c
+++ b/kernel/timeslicing.c
@@ -15,7 +15,7 @@ static bool slice_expired[CONFIG_MP_MAX_NUM_CPUS];
 
 #ifdef CONFIG_SWAP_NONATOMIC
 /* If z_swap() isn't atomic, then it's possible for a timer interrupt
- * to try to timeslice away arch_current_thread() after it has already pended
+ * to try to timeslice away _current after it has already pended
  * itself but before the corresponding context switch.  Treat that as
  * a noop condition in z_time_slice().
  */
@@ -82,7 +82,7 @@ void k_sched_time_slice_set(int32_t slice, int prio)
 	K_SPINLOCK(&_sched_spinlock) {
 		slice_ticks = k_ms_to_ticks_ceil32(slice);
 		slice_max_prio = prio;
-		z_reset_time_slice(arch_current_thread());
+		z_reset_time_slice(_current);
 	}
 }
 
@@ -103,7 +103,7 @@ void k_thread_time_slice_set(struct k_thread *thread, int32_t thread_slice_ticks
 void z_time_slice(void)
 {
 	k_spinlock_key_t key = k_spin_lock(&_sched_spinlock);
-	struct k_thread *curr = arch_current_thread();
+	struct k_thread *curr = _current;
 
 #ifdef CONFIG_SWAP_NONATOMIC
 	if (pending_current == curr) {
diff --git a/kernel/userspace.c b/kernel/userspace.c
index 5aeafe221c7..7a66513c03e 100644
--- a/kernel/userspace.c
+++ b/kernel/userspace.c
@@ -437,7 +437,7 @@ static void *z_object_alloc(enum k_objects otype, size_t size)
 	/* The allocating thread implicitly gets permission on kernel objects
 	 * that it allocates
 	 */
-	k_thread_perms_set(zo, arch_current_thread());
+	k_thread_perms_set(zo, _current);
 
 	/* Activates reference counting logic for automatic disposal when
 	 * all permissions have been revoked
@@ -654,7 +654,7 @@ static int thread_perms_test(struct k_object *ko)
 		return 1;
 	}
 
-	index = thread_index_get(arch_current_thread());
+	index = thread_index_get(_current);
 	if (index != -1) {
 		return sys_bitfield_test_bit((mem_addr_t)&ko->perms, index);
 	}
@@ -663,9 +663,9 @@ static int thread_perms_test(struct k_object *ko)
 
 static void dump_permission_error(struct k_object *ko)
 {
-	int index = thread_index_get(arch_current_thread());
+	int index = thread_index_get(_current);
 	LOG_ERR("thread %p (%d) does not have permission on %s %p",
-		arch_current_thread(), index,
+		_current, index,
 		otype_to_str(ko->type), ko->name);
 	LOG_HEXDUMP_ERR(ko->perms, sizeof(ko->perms), "permission bitmap");
 }
@@ -718,7 +718,7 @@ void k_object_access_revoke(const void *object, struct k_thread *thread)
 
 void z_impl_k_object_release(const void *object)
 {
-	k_object_access_revoke(object, arch_current_thread());
+	k_object_access_revoke(object, _current);
 }
 
 void k_object_access_all_grant(const void *object)
@@ -794,7 +794,7 @@ void k_object_recycle(const void *obj)
 
 	if (ko != NULL) {
 		(void)memset(ko->perms, 0, sizeof(ko->perms));
-		k_thread_perms_set(ko, arch_current_thread());
+		k_thread_perms_set(ko, _current);
 		ko->flags |= K_OBJ_FLAG_INITIALIZED;
 	}
 }
diff --git a/kernel/userspace_handler.c b/kernel/userspace_handler.c
index 38e778713ba..ab6e4f0623c 100644
--- a/kernel/userspace_handler.c
+++ b/kernel/userspace_handler.c
@@ -72,7 +72,7 @@ static inline void z_vrfy_k_object_release(const void *object)
 
 	ko = validate_any_object(object);
 	K_OOPS(K_SYSCALL_VERIFY_MSG(ko != NULL, "object %p access denied", object));
-	k_thread_perms_clear(ko, arch_current_thread());
+	k_thread_perms_clear(ko, _current);
 }
 #include <zephyr/syscalls/k_object_release_mrsh.c>
 
diff --git a/kernel/work.c b/kernel/work.c
index 3e04033ff1b..24691bd3109 100644
--- a/kernel/work.c
+++ b/kernel/work.c
@@ -262,7 +262,7 @@ static inline int queue_submit_locked(struct k_work_q *queue,
 	}
 
 	int ret;
-	bool chained = (arch_current_thread() == &queue->thread) && !k_is_in_isr();
+	bool chained = (_current == &queue->thread) && !k_is_in_isr();
 	bool draining = flag_test(&queue->flags, K_WORK_QUEUE_DRAIN_BIT);
 	bool plugged = flag_test(&queue->flags, K_WORK_QUEUE_PLUGGED_BIT);
 
diff --git a/lib/libc/armstdc/src/libc-hooks.c b/lib/libc/armstdc/src/libc-hooks.c
index f9fe9d1c420..afce534eddf 100644
--- a/lib/libc/armstdc/src/libc-hooks.c
+++ b/lib/libc/armstdc/src/libc-hooks.c
@@ -23,7 +23,7 @@ void __stdout_hook_install(int (*hook)(int))
 
 volatile int *__aeabi_errno_addr(void)
 {
-	return &arch_current_thread()->errno_var;
+	return &_current->errno_var;
 }
 
 int fputc(int c, FILE *f)
diff --git a/lib/os/p4wq.c b/lib/os/p4wq.c
index 5a48ee6cf7b..39b59de20d9 100644
--- a/lib/os/p4wq.c
+++ b/lib/os/p4wq.c
@@ -87,10 +87,10 @@ static FUNC_NORETURN void p4wq_loop(void *p0, void *p1, void *p2)
 				= CONTAINER_OF(r, struct k_p4wq_work, rbnode);
 
 			rb_remove(&queue->queue, r);
-			w->thread = arch_current_thread();
+			w->thread = _current;
 			sys_dlist_append(&queue->active, &w->dlnode);
-			set_prio(arch_current_thread(), w);
-			thread_clear_requeued(arch_current_thread());
+			set_prio(_current, w);
+			thread_clear_requeued(_current);
 
 			k_spin_unlock(&queue->lock, k);
 
@@ -101,7 +101,7 @@ static FUNC_NORETURN void p4wq_loop(void *p0, void *p1, void *p2)
 			/* Remove from the active list only if it
 			 * wasn't resubmitted already
 			 */
-			if (!thread_was_requeued(arch_current_thread())) {
+			if (!thread_was_requeued(_current)) {
 				sys_dlist_remove(&w->dlnode);
 				w->thread = NULL;
 				k_sem_give(&w->done_sem);
@@ -223,9 +223,9 @@ void k_p4wq_submit(struct k_p4wq *queue, struct k_p4wq_work *item)
 	item->deadline += k_cycle_get_32();
 
 	/* Resubmission from within handler?  Remove from active list */
-	if (item->thread == arch_current_thread()) {
+	if (item->thread == _current) {
 		sys_dlist_remove(&item->dlnode);
-		thread_set_requeued(arch_current_thread());
+		thread_set_requeued(_current);
 		item->thread = NULL;
 	} else {
 		k_sem_init(&item->done_sem, 0, 1);
diff --git a/scripts/build/gen_syscalls.py b/scripts/build/gen_syscalls.py
index d2bb3249a81..352130caf83 100755
--- a/scripts/build/gen_syscalls.py
+++ b/scripts/build/gen_syscalls.py
@@ -362,7 +362,7 @@ def marshall_defs(func_name, func_type, args):
     else:
         mrsh += "\t\t" + "uintptr_t arg3, uintptr_t arg4, void *more, void *ssf)\n"
     mrsh += "{\n"
-    mrsh += "\t" + "arch_current_thread()->syscall_frame = ssf;\n"
+    mrsh += "\t" + "_current->syscall_frame = ssf;\n"
 
     for unused_arg in range(nmrsh, 6):
         mrsh += "\t(void) arg%d;\t/* unused */\n" % unused_arg
@@ -388,7 +388,7 @@ def marshall_defs(func_name, func_type, args):
 
     if func_type == "void":
         mrsh += "\t" + "%s;\n" % vrfy_call
-        mrsh += "\t" + "arch_current_thread()->syscall_frame = NULL;\n"
+        mrsh += "\t" + "_current->syscall_frame = NULL;\n"
         mrsh += "\t" + "return 0;\n"
     else:
         mrsh += "\t" + "%s ret = %s;\n" % (func_type, vrfy_call)
@@ -397,10 +397,10 @@ def marshall_defs(func_name, func_type, args):
             ptr = "((uint64_t *)%s)" % mrsh_rval(nmrsh - 1, nmrsh)
             mrsh += "\t" + "K_OOPS(K_SYSCALL_MEMORY_WRITE(%s, 8));\n" % ptr
             mrsh += "\t" + "*%s = ret;\n" % ptr
-            mrsh += "\t" + "arch_current_thread()->syscall_frame = NULL;\n"
+            mrsh += "\t" + "_current->syscall_frame = NULL;\n"
             mrsh += "\t" + "return 0;\n"
         else:
-            mrsh += "\t" + "arch_current_thread()->syscall_frame = NULL;\n"
+            mrsh += "\t" + "_current->syscall_frame = NULL;\n"
             mrsh += "\t" + "return (uintptr_t) ret;\n"
 
     mrsh += "}\n"
diff --git a/soc/espressif/esp32/soc.c b/soc/espressif/esp32/soc.c
index d244ff5c84c..ec1fc8c8bab 100644
--- a/soc/espressif/esp32/soc.c
+++ b/soc/espressif/esp32/soc.c
@@ -69,7 +69,7 @@ void IRAM_ATTR __esp_platform_start(void)
 	__asm__ __volatile__ ("wsr %0, PS" : : "r"(PS_INTLEVEL(XCHAL_EXCM_LEVEL) | PS_UM | PS_WOE));
 
 	/* Initialize the architecture CPU pointer.  Some of the
-	 * initialization code wants a valid arch_current_thread() before
+	 * initialization code wants a valid _current before
 	 * z_prep_c() is invoked.
 	 */
 	__asm__ __volatile__("wsr.MISC0 %0; rsync" : : "r"(&_kernel.cpus[0]));
diff --git a/soc/espressif/esp32/soc_appcpu.c b/soc/espressif/esp32/soc_appcpu.c
index e942bab01a2..82c8ef1ad65 100644
--- a/soc/espressif/esp32/soc_appcpu.c
+++ b/soc/espressif/esp32/soc_appcpu.c
@@ -80,7 +80,7 @@ void IRAM_ATTR __appcpu_start(void)
 		: "r"(PS_INTLEVEL(XCHAL_EXCM_LEVEL) | PS_UM | PS_WOE));
 
 	/* Initialize the architecture CPU pointer.  Some of the
-	 * initialization code wants a valid arch_current_thread() before
+	 * initialization code wants a valid _current before
 	 * z_prep_c() is invoked.
 	 */
 	__asm__ __volatile__("wsr.MISC0 %0; rsync" : : "r"(&_kernel.cpus[1]));
diff --git a/soc/espressif/esp32s2/soc.c b/soc/espressif/esp32s2/soc.c
index 858618817f2..02a6d1b4dc6 100644
--- a/soc/espressif/esp32s2/soc.c
+++ b/soc/espressif/esp32s2/soc.c
@@ -62,7 +62,7 @@ void __attribute__((section(".iram1"))) __esp_platform_start(void)
 	__asm__ __volatile__("wsr %0, PS" : : "r"(PS_INTLEVEL(XCHAL_EXCM_LEVEL) | PS_UM | PS_WOE));
 
 	/* Initialize the architecture CPU pointer.  Some of the
-	 * initialization code wants a valid arch_current_thread() before
+	 * initialization code wants a valid _current before
 	 * arch_kernel_init() is invoked.
 	 */
 	__asm__ __volatile__("wsr.MISC0 %0; rsync" : : "r"(&_kernel.cpus[0]));
diff --git a/soc/espressif/esp32s3/soc.c b/soc/espressif/esp32s3/soc.c
index 1a7d1c04dd9..763ba341940 100644
--- a/soc/espressif/esp32s3/soc.c
+++ b/soc/espressif/esp32s3/soc.c
@@ -97,7 +97,7 @@ void IRAM_ATTR __esp_platform_start(void)
 	__asm__ __volatile__("wsr %0, PS" : : "r"(PS_INTLEVEL(XCHAL_EXCM_LEVEL) | PS_UM | PS_WOE));
 
 	/* Initialize the architecture CPU pointer.  Some of the
-	 * initialization code wants a valid arch_current_thread() before
+	 * initialization code wants a valid _current before
 	 * arch_kernel_init() is invoked.
 	 */
 	__asm__ __volatile__("wsr.MISC0 %0; rsync" : : "r"(&_kernel.cpus[0]));
diff --git a/soc/espressif/esp32s3/soc_appcpu.c b/soc/espressif/esp32s3/soc_appcpu.c
index 1ec3bbf94aa..a03304c8751 100644
--- a/soc/espressif/esp32s3/soc_appcpu.c
+++ b/soc/espressif/esp32s3/soc_appcpu.c
@@ -65,7 +65,7 @@ void IRAM_ATTR __appcpu_start(void)
 	__asm__ __volatile__("wsr %0, PS" : : "r"(PS_INTLEVEL(XCHAL_EXCM_LEVEL) | PS_UM | PS_WOE));
 
 	/* Initialize the architecture CPU pointer.  Some of the
-	 * initialization code wants a valid arch_current_thread() before
+	 * initialization code wants a valid _current before
 	 * arch_kernel_init() is invoked.
 	 */
 	__asm__ __volatile__("wsr.MISC0 %0; rsync" : : "r"(&_kernel.cpus[1]));
diff --git a/subsys/net/lib/sockets/sockets.c b/subsys/net/lib/sockets/sockets.c
index a3bc0b71135..441ed438472 100644
--- a/subsys/net/lib/sockets/sockets.c
+++ b/subsys/net/lib/sockets/sockets.c
@@ -68,7 +68,7 @@ static inline void *get_sock_vtable(int sock,
 
 	if (ctx == NULL) {
 		NET_DBG("Invalid access on sock %d by thread %p (%s)", sock,
-			arch_current_thread(), k_thread_name_get(arch_current_thread()));
+			_current, k_thread_name_get(_current));
 	}
 
 	return ctx;
diff --git a/subsys/portability/cmsis_rtos_v2/kernel.c b/subsys/portability/cmsis_rtos_v2/kernel.c
index 1fbd606dbbf..519be96023d 100644
--- a/subsys/portability/cmsis_rtos_v2/kernel.c
+++ b/subsys/portability/cmsis_rtos_v2/kernel.c
@@ -39,7 +39,7 @@ osStatus_t osKernelGetInfo(osVersion_t *version, char *id_buf, uint32_t id_size)
  */
 int32_t osKernelLock(void)
 {
-	int temp = arch_current_thread()->base.sched_locked;
+	int temp = _current->base.sched_locked;
 
 	if (k_is_in_isr()) {
 		return osErrorISR;
@@ -55,7 +55,7 @@ int32_t osKernelLock(void)
  */
 int32_t osKernelUnlock(void)
 {
-	int temp = arch_current_thread()->base.sched_locked;
+	int temp = _current->base.sched_locked;
 
 	if (k_is_in_isr()) {
 		return osErrorISR;
@@ -71,7 +71,7 @@ int32_t osKernelUnlock(void)
  */
 int32_t osKernelRestoreLock(int32_t lock)
 {
-	arch_current_thread()->base.sched_locked = lock;
+	_current->base.sched_locked = lock;
 
 	if (k_is_in_isr()) {
 		return osErrorISR;
diff --git a/subsys/profiling/perf/backends/perf_riscv.c b/subsys/profiling/perf/backends/perf_riscv.c
index 0d04676a11b..2259e1c60db 100644
--- a/subsys/profiling/perf/backends/perf_riscv.c
+++ b/subsys/profiling/perf/backends/perf_riscv.c
@@ -76,10 +76,10 @@ size_t arch_perf_current_stack_trace(uintptr_t *buf, size_t size)
 	 * function prologue or epilogue.
 	 */
 	buf[idx++] = (uintptr_t)esf->ra;
-	if (valid_stack((uintptr_t)new_fp, arch_current_thread())) {
+	if (valid_stack((uintptr_t)new_fp, _current)) {
 		fp = new_fp;
 	}
-	while (valid_stack((uintptr_t)fp, arch_current_thread())) {
+	while (valid_stack((uintptr_t)fp, _current)) {
 		if (idx >= size) {
 			return 0;
 		}
diff --git a/subsys/profiling/perf/backends/perf_x86.c b/subsys/profiling/perf/backends/perf_x86.c
index 13216317634..e62ad64b74a 100644
--- a/subsys/profiling/perf/backends/perf_x86.c
+++ b/subsys/profiling/perf/backends/perf_x86.c
@@ -67,7 +67,7 @@ size_t arch_perf_current_stack_trace(uintptr_t *buf, size_t size)
 	 */
 
 	buf[idx++] = (uintptr_t)isf->eip;
-	while (valid_stack((uintptr_t)fp, arch_current_thread())) {
+	while (valid_stack((uintptr_t)fp, _current)) {
 		if (idx >= size) {
 			return 0;
 		}
diff --git a/subsys/profiling/perf/backends/perf_x86_64.c b/subsys/profiling/perf/backends/perf_x86_64.c
index f5e13b53597..84e45024c3c 100644
--- a/subsys/profiling/perf/backends/perf_x86_64.c
+++ b/subsys/profiling/perf/backends/perf_x86_64.c
@@ -35,13 +35,13 @@ size_t arch_perf_current_stack_trace(uintptr_t *buf, size_t size)
 
 	/*
 	 * In x86_64 (arch/x86/core/intel64/locore.S) %rip and %rbp
-	 * are always saved in arch_current_thread()->callee_saved before calling
+	 * are always saved in _current->callee_saved before calling
 	 * handler function if interrupt is not nested
 	 *
 	 * %rip points the location where interrupt was occurred
 	 */
-	buf[idx++] = (uintptr_t)arch_current_thread()->callee_saved.rip;
-	void **fp = (void **)arch_current_thread()->callee_saved.rbp;
+	buf[idx++] = (uintptr_t)_current->callee_saved.rip;
+	void **fp = (void **)_current->callee_saved.rbp;
 
 	/*
 	 * %rbp is frame pointer.
@@ -53,7 +53,7 @@ size_t arch_perf_current_stack_trace(uintptr_t *buf, size_t size)
 	 *  %rbp (next) <- %rbp (curr)
 	 *  ....
 	 */
-	while (valid_stack((uintptr_t)fp, arch_current_thread())) {
+	while (valid_stack((uintptr_t)fp, _current)) {
 		if (idx >= size) {
 			return 0;
 		}
diff --git a/subsys/shell/modules/kernel_service/thread/unwind.c b/subsys/shell/modules/kernel_service/thread/unwind.c
index e41df7d3b00..903f05822b1 100644
--- a/subsys/shell/modules/kernel_service/thread/unwind.c
+++ b/subsys/shell/modules/kernel_service/thread/unwind.c
@@ -30,7 +30,7 @@ static int cmd_kernel_thread_unwind(const struct shell *sh, size_t argc, char **
 	int err = 0;
 
 	if (argc == 1) {
-		thread = arch_current_thread();
+		thread = _current;
 	} else {
 		thread = UINT_TO_POINTER(shell_strtoull(argv[1], 16, &err));
 		if (err != 0) {
diff --git a/tests/arch/arm/arm_interrupt/src/arm_interrupt.c b/tests/arch/arm/arm_interrupt/src/arm_interrupt.c
index 8ab6e6c4691..3891c9b1d41 100644
--- a/tests/arch/arm/arm_interrupt/src/arm_interrupt.c
+++ b/tests/arch/arm/arm_interrupt/src/arm_interrupt.c
@@ -177,7 +177,7 @@ ZTEST(arm_interrupt, test_arm_esf_collection)
 	 * crashy thread we create below runs to completion before we get
 	 * to the end of this function
 	 */
-	k_thread_priority_set(arch_current_thread(), K_PRIO_PREEMPT(MAIN_PRIORITY));
+	k_thread_priority_set(_current, K_PRIO_PREEMPT(MAIN_PRIORITY));
 
 	TC_PRINT("Testing ESF Reporting\n");
 	k_thread_create(&esf_collection_thread, esf_collection_stack,
@@ -366,9 +366,9 @@ ZTEST(arm_interrupt, test_arm_interrupt)
 	uint32_t fp_extra_size =
 		(__get_CONTROL() & CONTROL_FPCA_Msk) ?
 			FPU_STACK_EXTRA_SIZE : 0;
-	__set_PSP(arch_current_thread()->stack_info.start + 0x10 + fp_extra_size);
+	__set_PSP(_current->stack_info.start + 0x10 + fp_extra_size);
 #else
-	__set_PSP(arch_current_thread()->stack_info.start + 0x10);
+	__set_PSP(_current->stack_info.start + 0x10);
 #endif
 
 	__enable_irq();
diff --git a/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c b/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c
index 2e444376134..075b36126a1 100644
--- a/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c
+++ b/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c
@@ -38,20 +38,20 @@ void z_impl_test_arm_user_syscall(void)
 	 * - PSPLIM register guards the privileged stack
 	 * - MSPLIM register still guards the interrupt stack
 	 */
-	zassert_true((arch_current_thread()->arch.mode & CONTROL_nPRIV_Msk) == 0,
+	zassert_true((_current->arch.mode & CONTROL_nPRIV_Msk) == 0,
 	"mode variable not set to PRIV mode in system call\n");
 
 	zassert_false(arch_is_user_context(),
 	"arch_is_user_context() indicates nPRIV\n");
 
 	zassert_true(
-		((__get_PSP() >= arch_current_thread()->arch.priv_stack_start) &&
-		(__get_PSP() < (arch_current_thread()->arch.priv_stack_start +
+		((__get_PSP() >= _current->arch.priv_stack_start) &&
+		(__get_PSP() < (_current->arch.priv_stack_start +
 			CONFIG_PRIVILEGED_STACK_SIZE))),
 	"Process SP outside thread privileged stack limits\n");
 
 #if defined(CONFIG_BUILTIN_STACK_GUARD)
-	zassert_true(__get_PSPLIM() == arch_current_thread()->arch.priv_stack_start,
+	zassert_true(__get_PSPLIM() == _current->arch.priv_stack_start,
 	"PSPLIM not guarding the thread's privileged stack\n");
 	zassert_true(__get_MSPLIM() == (uint32_t)z_interrupt_stacks,
 	"MSPLIM not guarding the interrupt stack\n");
@@ -78,16 +78,16 @@ void arm_isr_handler(const void *args)
 	 * - MSPLIM register still guards the interrupt stack
 	 */
 
-	zassert_true((arch_current_thread()->arch.mode & CONTROL_nPRIV_Msk) != 0,
+	zassert_true((_current->arch.mode & CONTROL_nPRIV_Msk) != 0,
 	"mode variable not set to nPRIV mode for user thread\n");
 
 	zassert_false(arch_is_user_context(),
 	"arch_is_user_context() indicates nPRIV in ISR\n");
 
 	zassert_true(
-		((__get_PSP() >= arch_current_thread()->stack_info.start) &&
-		(__get_PSP() < (arch_current_thread()->stack_info.start +
-			arch_current_thread()->stack_info.size))),
+		((__get_PSP() >= _current->stack_info.start) &&
+		(__get_PSP() < (_current->stack_info.start +
+			_current->stack_info.size))),
 	"Process SP outside thread stack limits\n");
 
 	static int first_call = 1;
@@ -97,7 +97,7 @@ void arm_isr_handler(const void *args)
 
 		/* Trigger thread yield() manually */
 		(void)irq_lock();
-		z_move_thread_to_end_of_prio_q(arch_current_thread());
+		z_move_thread_to_end_of_prio_q(_current);
 		SCB->ICSR |= SCB_ICSR_PENDSVSET_Msk;
 		irq_unlock(0);
 
@@ -165,20 +165,20 @@ ZTEST(arm_thread_swap, test_arm_syscalls)
 	 * - PSPLIM register guards the default stack
 	 * - MSPLIM register guards the interrupt stack
 	 */
-	zassert_true((arch_current_thread()->arch.mode & CONTROL_nPRIV_Msk) == 0,
+	zassert_true((_current->arch.mode & CONTROL_nPRIV_Msk) == 0,
 	"mode variable not set to PRIV mode for supervisor thread\n");
 
 	zassert_false(arch_is_user_context(),
 	"arch_is_user_context() indicates nPRIV\n");
 
 	zassert_true(
-		((__get_PSP() >= arch_current_thread()->stack_info.start) &&
-		(__get_PSP() < (arch_current_thread()->stack_info.start +
-			arch_current_thread()->stack_info.size))),
+		((__get_PSP() >= _current->stack_info.start) &&
+		(__get_PSP() < (_current->stack_info.start +
+			_current->stack_info.size))),
 	"Process SP outside thread stack limits\n");
 
 #if defined(CONFIG_BUILTIN_STACK_GUARD)
-	zassert_true(__get_PSPLIM() == arch_current_thread()->stack_info.start,
+	zassert_true(__get_PSPLIM() == _current->stack_info.start,
 	"PSPLIM not guarding the default stack\n");
 	zassert_true(__get_MSPLIM() == (uint32_t)z_interrupt_stacks,
 	"MSPLIM not guarding the interrupt stack\n");
diff --git a/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c b/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c
index 2ea9bd38162..a617abe0680 100644
--- a/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c
+++ b/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c
@@ -274,16 +274,16 @@ static void alt_thread_entry(void *p1, void *p2, void *p3)
 	/* Verify that the _current_ (alt) thread is
 	 * initialized with EXC_RETURN.Ftype set
 	 */
-	zassert_true((arch_current_thread()->arch.mode_exc_return & EXC_RETURN_FTYPE) != 0,
+	zassert_true((_current->arch.mode_exc_return & EXC_RETURN_FTYPE) != 0,
 		"Alt thread FPCA flag not clear at initialization\n");
 #if defined(CONFIG_MPU_STACK_GUARD)
 	/* Alt thread is created with K_FP_REGS set, so we
 	 * expect lazy stacking and long guard to be enabled.
 	 */
-	zassert_true((arch_current_thread()->arch.mode &
+	zassert_true((_current->arch.mode &
 		Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0,
 		"Alt thread MPU GUAR DFLOAT flag not set at initialization\n");
-	zassert_true((arch_current_thread()->base.user_options & K_FP_REGS) != 0,
+	zassert_true((_current->base.user_options & K_FP_REGS) != 0,
 		"Alt thread K_FP_REGS not set at initialization\n");
 	zassert_true((FPU->FPCCR & FPU_FPCCR_LSPEN_Msk) != 0,
 		"Lazy FP Stacking not set at initialization\n");
@@ -326,7 +326,7 @@ static void alt_thread_entry(void *p1, void *p2, void *p3)
 	p_ztest_thread->arch.swap_return_value = SWAP_RETVAL;
 #endif
 
-	z_move_thread_to_end_of_prio_q(arch_current_thread());
+	z_move_thread_to_end_of_prio_q(_current);
 
 	/* Modify the callee-saved registers by zero-ing them.
 	 * The main test thread will, later, assert that they
@@ -451,20 +451,20 @@ ZTEST(arm_thread_swap, test_arm_thread_swap)
 	 */
 	load_callee_saved_regs(&ztest_thread_callee_saved_regs_init);
 
-	k_thread_priority_set(arch_current_thread(), K_PRIO_COOP(PRIORITY));
+	k_thread_priority_set(_current, K_PRIO_COOP(PRIORITY));
 
 	/* Export current thread's callee-saved registers pointer
 	 * and arch.basepri variable pointer, into global pointer
 	 * variables, so they can be easily accessible by other
 	 * (alternative) test thread.
 	 */
-	p_ztest_thread = arch_current_thread();
+	p_ztest_thread = _current;
 
 	/* Confirm initial conditions before starting the test. */
 	test_flag = switch_flag;
 	zassert_true(test_flag == false,
 		"Switch flag not initialized properly\n");
-	zassert_true(arch_current_thread()->arch.basepri == 0,
+	zassert_true(_current->arch.basepri == 0,
 		"Thread BASEPRI flag not clear at thread start\n");
 	/* Verify, also, that the interrupts are unlocked. */
 #if defined(CONFIG_CPU_CORTEX_M_HAS_BASEPRI)
@@ -484,16 +484,16 @@ ZTEST(arm_thread_swap, test_arm_thread_swap)
 		"Main test thread does not start in privilege mode\n");
 
 	/* Assert that the mode status variable indicates privilege mode */
-	zassert_true((arch_current_thread()->arch.mode & CONTROL_nPRIV_Msk) == 0,
+	zassert_true((_current->arch.mode & CONTROL_nPRIV_Msk) == 0,
 		"Thread nPRIV flag not clear for supervisor thread: 0x%0x\n",
-		arch_current_thread()->arch.mode);
+		_current->arch.mode);
 #endif /* CONFIG_USERSPACE */
 
 #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
 	/* The main test thread is not (yet) actively using the FP registers */
-	zassert_true((arch_current_thread()->arch.mode_exc_return & EXC_RETURN_FTYPE) != 0,
+	zassert_true((_current->arch.mode_exc_return & EXC_RETURN_FTYPE) != 0,
 		"Thread Ftype flag not set at initialization 0x%0x\n",
-		arch_current_thread()->arch.mode);
+		_current->arch.mode);
 
 	/* Verify that the main test thread is initialized with FPCA cleared. */
 	zassert_true((__get_CONTROL() & CONTROL_FPCA_Msk) == 0,
@@ -506,7 +506,7 @@ ZTEST(arm_thread_swap, test_arm_thread_swap)
 	/* Clear the thread's floating-point callee-saved registers' container.
 	 * The container will, later, be populated by the swap mechanism.
 	 */
-	memset(&arch_current_thread()->arch.preempt_float, 0,
+	memset(&_current->arch.preempt_float, 0,
 		sizeof(struct _preempt_float));
 
 	/* Randomize the FP callee-saved registers at test initialization */
@@ -520,13 +520,13 @@ ZTEST(arm_thread_swap, test_arm_thread_swap)
 	/* The main test thread is using the FP registers, but the .mode
 	 * flag is not updated until the next context switch.
 	 */
-	zassert_true((arch_current_thread()->arch.mode_exc_return & EXC_RETURN_FTYPE) != 0,
+	zassert_true((_current->arch.mode_exc_return & EXC_RETURN_FTYPE) != 0,
 		"Thread Ftype flag not set at initialization\n");
 #if defined(CONFIG_MPU_STACK_GUARD)
-	zassert_true((arch_current_thread()->arch.mode &
+	zassert_true((_current->arch.mode &
 		Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) == 0,
 		"Thread MPU GUAR DFLOAT flag not clear at initialization\n");
-	zassert_true((arch_current_thread()->base.user_options & K_FP_REGS) == 0,
+	zassert_true((_current->base.user_options & K_FP_REGS) == 0,
 		"Thread K_FP_REGS not clear at initialization\n");
 	zassert_true((FPU->FPCCR & FPU_FPCCR_LSPEN_Msk) == 0,
 		"Lazy FP Stacking not clear at initialization\n");
@@ -555,13 +555,13 @@ ZTEST(arm_thread_swap, test_arm_thread_swap)
 	 * explicitly required by the test.
 	 */
 	(void)irq_lock();
-	z_move_thread_to_end_of_prio_q(arch_current_thread());
+	z_move_thread_to_end_of_prio_q(_current);
 
 	/* Clear the thread's callee-saved registers' container.
 	 * The container will, later, be populated by the swap
 	 * mechanism.
 	 */
-	memset(&arch_current_thread()->callee_saved, 0, sizeof(_callee_saved_t));
+	memset(&_current->callee_saved, 0, sizeof(_callee_saved_t));
 
 	/* Verify context-switch has not occurred yet. */
 	test_flag = switch_flag;
@@ -677,7 +677,7 @@ ZTEST(arm_thread_swap, test_arm_thread_swap)
 	 */
 	verify_callee_saved(
 		&ztest_thread_callee_saved_regs_container,
-		&arch_current_thread()->callee_saved);
+		&_current->callee_saved);
 
 	/* Verify context-switch did occur. */
 	test_flag = switch_flag;
@@ -693,7 +693,7 @@ ZTEST(arm_thread_swap, test_arm_thread_swap)
 	 * the alternative thread modified it, since the thread
 	 * is now switched back in.
 	 */
-	zassert_true(arch_current_thread()->arch.basepri == 0,
+	zassert_true(_current->arch.basepri == 0,
 		"arch.basepri value not in accordance with the update\n");
 
 #if defined(CONFIG_CPU_CORTEX_M_HAS_BASEPRI)
@@ -714,12 +714,12 @@ ZTEST(arm_thread_swap, test_arm_thread_swap)
 
 #if !defined(CONFIG_NO_OPTIMIZATIONS)
 	/* The thread is now swapped-back in. */
-	zassert_equal(arch_current_thread()->arch.swap_return_value, SWAP_RETVAL,
+	zassert_equal(_current->arch.swap_return_value, SWAP_RETVAL,
 		"Swap value not set as expected: 0x%x (0x%x)\n",
-		arch_current_thread()->arch.swap_return_value, SWAP_RETVAL);
-	zassert_equal(arch_current_thread()->arch.swap_return_value, ztest_swap_return_val,
+		_current->arch.swap_return_value, SWAP_RETVAL);
+	zassert_equal(_current->arch.swap_return_value, ztest_swap_return_val,
 		"Swap value not returned as expected 0x%x (0x%x)\n",
-		arch_current_thread()->arch.swap_return_value, ztest_swap_return_val);
+		_current->arch.swap_return_value, ztest_swap_return_val);
 #endif
 
 #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
@@ -737,7 +737,7 @@ ZTEST(arm_thread_swap, test_arm_thread_swap)
 	 */
 	verify_fp_callee_saved(
 		&ztest_thread_fp_callee_saved_regs,
-		&arch_current_thread()->arch.preempt_float);
+		&_current->arch.preempt_float);
 
 	/* Verify that the main test thread restored the FPSCR bit-0. */
 	zassert_true((__get_FPSCR() & 0x1) == 0x1,
@@ -746,13 +746,13 @@ ZTEST(arm_thread_swap, test_arm_thread_swap)
 	/* The main test thread is using the FP registers, and the .mode
 	 * flag and MPU GUARD flag are now updated.
 	 */
-	zassert_true((arch_current_thread()->arch.mode_exc_return & EXC_RETURN_FTYPE) == 0,
+	zassert_true((_current->arch.mode_exc_return & EXC_RETURN_FTYPE) == 0,
 		"Thread Ftype flag not cleared after main returned back\n");
 #if defined(CONFIG_MPU_STACK_GUARD)
-	zassert_true((arch_current_thread()->arch.mode &
+	zassert_true((_current->arch.mode &
 		Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0,
 		"Thread MPU GUARD FLOAT flag not set\n");
-	zassert_true((arch_current_thread()->base.user_options & K_FP_REGS) != 0,
+	zassert_true((_current->base.user_options & K_FP_REGS) != 0,
 		"Thread K_FPREGS not set after main returned back\n");
 	zassert_true((FPU->FPCCR & FPU_FPCCR_LSPEN_Msk) != 0,
 		"Lazy FP Stacking not set after main returned back\n");
diff --git a/tests/arch/riscv/userspace/riscv_gp/src/main.c b/tests/arch/riscv/userspace/riscv_gp/src/main.c
index 738ba94b968..fcbb7ba8d52 100644
--- a/tests/arch/riscv/userspace/riscv_gp/src/main.c
+++ b/tests/arch/riscv/userspace/riscv_gp/src/main.c
@@ -39,7 +39,7 @@ static void rogue_user_fn(void *p1, void *p2, void *p3)
 	if (IS_ENABLED(CONFIG_RISCV_GP)) {
 		zassert_equal(reg_read(gp), 0xbad);
 	} else { /* CONFIG_RISCV_CURRENT_VIA_GP */
-		zassert_equal((uintptr_t)arch_current_thread(), 0xbad);
+		zassert_equal((uintptr_t)_current, 0xbad);
 	}
 
 	/* Sleep to force a context switch, which will sanitize `gp` */
diff --git a/tests/benchmarks/footprints/src/system_thread.c b/tests/benchmarks/footprints/src/system_thread.c
index c44ed9146be..c88be8c631c 100644
--- a/tests/benchmarks/footprints/src/system_thread.c
+++ b/tests/benchmarks/footprints/src/system_thread.c
@@ -28,12 +28,12 @@ void test_thread_entry(void *p, void *p1, void *p2)
 
 void thread_swap(void *p1, void *p2, void *p3)
 {
-	k_thread_abort(arch_current_thread());
+	k_thread_abort(_current);
 }
 
 void thread_suspend(void *p1, void *p2, void *p3)
 {
-	k_thread_suspend(arch_current_thread());
+	k_thread_suspend(_current);
 }
 
 void thread_yield0(void *p1, void *p2, void *p3)
diff --git a/tests/kernel/context/src/main.c b/tests/kernel/context/src/main.c
index f7b1886aee1..699c7bdc642 100644
--- a/tests/kernel/context/src/main.c
+++ b/tests/kernel/context/src/main.c
@@ -135,7 +135,7 @@ static void isr_handler(const void *data)
 			break;
 		}
 
-		if (arch_current_thread()->base.prio < 0) {
+		if (_current->base.prio < 0) {
 			isr_info.value = K_COOP_THREAD;
 			break;
 		}
@@ -643,9 +643,9 @@ ZTEST(context, test_ctx_thread)
 	TC_PRINT("Testing k_is_in_isr() from a preemptible thread\n");
 	zassert_false(k_is_in_isr(), "Should not be in ISR context");
 
-	zassert_false(arch_current_thread()->base.prio < 0,
+	zassert_false(_current->base.prio < 0,
 		      "Current thread should have preemptible priority: %d",
-		      arch_current_thread()->base.prio);
+		      _current->base.prio);
 
 }
 
@@ -683,7 +683,7 @@ static void _test_kernel_thread(k_tid_t _thread_id)
 
 	zassert_false(k_is_in_isr(), "k_is_in_isr() when called from a thread is true");
 
-	zassert_false((arch_current_thread()->base.prio >= 0),
+	zassert_false((_current->base.prio >= 0),
 		      "thread is not a cooperative thread");
 }
 
diff --git a/tests/kernel/fatal/exception/src/main.c b/tests/kernel/fatal/exception/src/main.c
index 3d289af407b..6eb97068b6c 100644
--- a/tests/kernel/fatal/exception/src/main.c
+++ b/tests/kernel/fatal/exception/src/main.c
@@ -314,7 +314,7 @@ ZTEST(fatal_exception, test_fatal)
 	 * priority -1. To run the test smoothly make both main and ztest
 	 * threads run at same priority level.
 	 */
-	k_thread_priority_set(arch_current_thread(), K_PRIO_PREEMPT(MAIN_PRIORITY));
+	k_thread_priority_set(_current, K_PRIO_PREEMPT(MAIN_PRIORITY));
 
 #ifndef CONFIG_ARCH_POSIX
 	TC_PRINT("test alt thread 1: generic CPU exception\n");
diff --git a/tests/kernel/fatal/message_capture/src/main.c b/tests/kernel/fatal/message_capture/src/main.c
index c23b042c1a3..514f3ea6e55 100644
--- a/tests/kernel/fatal/message_capture/src/main.c
+++ b/tests/kernel/fatal/message_capture/src/main.c
@@ -86,7 +86,7 @@ int main(void)
 	 * panic and not an oops).  Set the thread non-essential as a
 	 * workaround.
 	 */
-	z_thread_essential_clear(arch_current_thread());
+	z_thread_essential_clear(_current);
 
 	test_message_capture();
 	return 0;
diff --git a/tests/kernel/ipi_cascade/src/main.c b/tests/kernel/ipi_cascade/src/main.c
index 95e77607cb4..1f96e677ce6 100644
--- a/tests/kernel/ipi_cascade/src/main.c
+++ b/tests/kernel/ipi_cascade/src/main.c
@@ -116,7 +116,7 @@ void thread3_entry(void *p1, void *p2, void *p3)
 
 	/* 9.1 - T3 should be executing on the same CPU that T1 was. */
 
-	cpu_t3 = arch_current_thread()->base.cpu;
+	cpu_t3 = _current->base.cpu;
 
 	zassert_true(cpu_t3 == cpu_t1, "T3 not executing on T1's original CPU");
 
@@ -136,7 +136,7 @@ void thread4_entry(void *p1, void *p2, void *p3)
 	 * It is expected to execute on the same CPU that T2 did.
 	 */
 
-	cpu_t4 = arch_current_thread()->base.cpu;
+	cpu_t4 = _current->base.cpu;
 
 	zassert_true(cpu_t4 == cpu_t2, "T4 on unexpected CPU");
 
@@ -165,7 +165,7 @@ void thread2_entry(void *p1, void *p2, void *p3)
 		arch_irq_unlock(key);
 	}
 
-	cpu_t2 = arch_current_thread()->base.cpu;
+	cpu_t2 = _current->base.cpu;
 
 	zassert_false(cpu_t2 == cpu_t1, "T2 and T1 unexpectedly on the same CPU");
 
@@ -205,7 +205,7 @@ ZTEST(ipi_cascade, test_ipi_cascade)
 
 	/* 3. T3 and T4 are blocked. Pin T3 to this CPU */
 
-	cpu_t1 = arch_current_thread()->base.cpu;
+	cpu_t1 = _current->base.cpu;
 	status = k_thread_cpu_pin(&thread3, cpu_t1);
 
 	zassert_true(status == 0, "Failed to pin T3 to %d : %d\n", cpu_t1, status);
@@ -249,7 +249,7 @@ ZTEST(ipi_cascade, test_ipi_cascade)
 
 	zassert_false(timer_expired, "Test terminated by timer");
 
-	zassert_true(cpu_t1 != arch_current_thread()->base.cpu,
+	zassert_true(cpu_t1 != _current->base.cpu,
 		     "Main thread (T1) did not change CPUs\n");
 
 	show_executing_threads("Final");
diff --git a/tests/kernel/mem_protect/mem_protect/src/inherit.c b/tests/kernel/mem_protect/mem_protect/src/inherit.c
index c0d614fae09..021fdf884fd 100644
--- a/tests/kernel/mem_protect/mem_protect/src/inherit.c
+++ b/tests/kernel/mem_protect/mem_protect/src/inherit.c
@@ -125,7 +125,7 @@ ZTEST(mem_protect, test_permission_inheritance)
 
 struct k_heap *z_impl_ret_resource_pool_ptr(void)
 {
-	return arch_current_thread()->resource_pool;
+	return _current->resource_pool;
 }
 
 static inline struct k_heap *z_vrfy_ret_resource_pool_ptr(void)
diff --git a/tests/kernel/mem_protect/obj_validation/src/main.c b/tests/kernel/mem_protect/obj_validation/src/main.c
index a6c03dce1b1..df7ddbbc845 100644
--- a/tests/kernel/mem_protect/obj_validation/src/main.c
+++ b/tests/kernel/mem_protect/obj_validation/src/main.c
@@ -132,7 +132,7 @@ ZTEST(object_validation, test_generic_object)
 ZTEST(object_validation, test_kobj_assign_perms_on_alloc_obj)
 {
 	static struct k_sem *test_dyn_sem;
-	struct k_thread *thread = arch_current_thread();
+	struct k_thread *thread = _current;
 
 	uintptr_t start_addr, end_addr;
 	size_t size_heap = K_HEAP_MEM_POOL_SIZE;
@@ -173,7 +173,7 @@ ZTEST(object_validation, test_no_ref_dyn_kobj_release_mem)
 	zassert_not_null(test_dyn_mutex,
 					 "Can not allocate dynamic kernel object");
 
-	struct k_thread *thread = arch_current_thread();
+	struct k_thread *thread = _current;
 
 	/* revoke access from the current thread */
 	k_object_access_revoke(test_dyn_mutex, thread);
diff --git a/tests/kernel/mem_protect/userspace/src/main.c b/tests/kernel/mem_protect/userspace/src/main.c
index 08b3932c7ad..76d5581b906 100644
--- a/tests/kernel/mem_protect/userspace/src/main.c
+++ b/tests/kernel/mem_protect/userspace/src/main.c
@@ -312,7 +312,7 @@ ZTEST_USER(userspace, test_read_kernram)
 
 	set_fault(K_ERR_CPU_EXCEPTION);
 
-	p = arch_current_thread()->init_data;
+	p = _current->init_data;
 	printk("%p\n", p);
 	zassert_unreachable("Read from kernel RAM did not fault");
 }
@@ -327,7 +327,7 @@ ZTEST_USER(userspace, test_write_kernram)
 	/* Try to write to kernel RAM. */
 	set_fault(K_ERR_CPU_EXCEPTION);
 
-	arch_current_thread()->init_data = NULL;
+	_current->init_data = NULL;
 	zassert_unreachable("Write to kernel RAM did not fault");
 }
 
@@ -1038,11 +1038,11 @@ ZTEST(userspace, test_tls_leakage)
 	 * supervisor mode to be leaked
 	 */
 
-	memset(arch_current_thread()->userspace_local_data, 0xff,
+	memset(_current->userspace_local_data, 0xff,
 	       sizeof(struct _thread_userspace_local_data));
 
 	k_thread_user_mode_enter(tls_leakage_user_part,
-				 arch_current_thread()->userspace_local_data, NULL, NULL);
+				 _current->userspace_local_data, NULL, NULL);
 #else
 	ztest_test_skip();
 #endif
diff --git a/tests/kernel/sched/deadline/src/main.c b/tests/kernel/sched/deadline/src/main.c
index 8b9d3a02f43..cf19255d5ec 100644
--- a/tests/kernel/sched/deadline/src/main.c
+++ b/tests/kernel/sched/deadline/src/main.c
@@ -232,7 +232,7 @@ static void test_reschedule_helper0(void *p1, void *p2, void *p3)
 {
 	/* 4. Reschedule brings us here */
 
-	zassert_true(expected_thread == arch_current_thread(), "");
+	zassert_true(expected_thread == _current, "");
 
 	expected_thread = &worker_threads[1];
 }
@@ -243,26 +243,26 @@ static void test_reschedule_helper1(void *p1, void *p2, void *p3)
 
 	/* 1. First helper expected to execute */
 
-	zassert_true(expected_thread == arch_current_thread(), "");
+	zassert_true(expected_thread == _current, "");
 
 	offload(reschedule_wrapper, NULL);
 
 	/* 2. Deadlines have not changed. Expected no changes */
 
-	zassert_true(expected_thread == arch_current_thread(), "");
+	zassert_true(expected_thread == _current, "");
 
-	k_thread_deadline_set(arch_current_thread(), MSEC_TO_CYCLES(1000));
+	k_thread_deadline_set(_current, MSEC_TO_CYCLES(1000));
 
 	/* 3. Deadline changed, but there was no reschedule */
 
-	zassert_true(expected_thread == arch_current_thread(), "");
+	zassert_true(expected_thread == _current, "");
 
 	expected_thread = &worker_threads[0];
 	offload(reschedule_wrapper, NULL);
 
 	/* 5. test_thread_reschedule_helper0 executed */
 
-	zassert_true(expected_thread == arch_current_thread(), "");
+	zassert_true(expected_thread == _current, "");
 }
 
 static void thread_offload(void (*f)(const void *p), const void *param)
diff --git a/tests/kernel/smp/src/main.c b/tests/kernel/smp/src/main.c
index 065dbcf8b92..f3d3f356eed 100644
--- a/tests/kernel/smp/src/main.c
+++ b/tests/kernel/smp/src/main.c
@@ -318,9 +318,8 @@ ZTEST(smp, test_coop_switch_in_abort)
 	unsigned int num_threads = arch_num_cpus();
 	unsigned int i;
 
-	zassert_true(arch_current_thread()->base.prio < 0,
-		     "test case relies on ztest thread be cooperative");
-	zassert_true(arch_current_thread()->base.prio > SPAWN_AB_PRIO,
+	zassert_true(_current->base.prio < 0, "test case relies on ztest thread be cooperative");
+	zassert_true(_current->base.prio > SPAWN_AB_PRIO,
 		     "spawn test need to have higher priority than ztest thread");
 
 	/* Spawn N number of cooperative threads, where N = number of CPUs */
@@ -871,15 +870,15 @@ static void t2_mutex_lock(void *p1, void *p2, void *p3)
 	ARG_UNUSED(p2);
 	ARG_UNUSED(p3);
 
-	zassert_equal(arch_current_thread()->base.global_lock_count, 0,
+	zassert_equal(_current->base.global_lock_count, 0,
 			"thread global lock cnt %d is incorrect",
-			arch_current_thread()->base.global_lock_count);
+			_current->base.global_lock_count);
 
 	k_mutex_lock((struct k_mutex *)p1, K_FOREVER);
 
-	zassert_equal(arch_current_thread()->base.global_lock_count, 0,
+	zassert_equal(_current->base.global_lock_count, 0,
 			"thread global lock cnt %d is incorrect",
-			arch_current_thread()->base.global_lock_count);
+			_current->base.global_lock_count);
 
 	k_mutex_unlock((struct k_mutex *)p1);
 
@@ -887,9 +886,9 @@ static void t2_mutex_lock(void *p1, void *p2, void *p3)
 	 * context switch but global_lock_cnt has not been decrease
 	 * because no irq_lock() was called.
 	 */
-	zassert_equal(arch_current_thread()->base.global_lock_count, 0,
+	zassert_equal(_current->base.global_lock_count, 0,
 			"thread global lock cnt %d is incorrect",
-			arch_current_thread()->base.global_lock_count);
+			_current->base.global_lock_count);
 }
 
 /**
diff --git a/tests/kernel/threads/thread_apis/src/main.c b/tests/kernel/threads/thread_apis/src/main.c
index 1b351068abe..162f85e5f5f 100644
--- a/tests/kernel/threads/thread_apis/src/main.c
+++ b/tests/kernel/threads/thread_apis/src/main.c
@@ -232,7 +232,7 @@ static void umode_entry(void *thread_id, void *p2, void *p3)
 	ARG_UNUSED(p2);
 	ARG_UNUSED(p3);
 
-	if (!z_is_thread_essential(arch_current_thread()) &&
+	if (!z_is_thread_essential(_current) &&
 	    (k_current_get() == (k_tid_t)thread_id)) {
 		ztest_test_pass();
 	} else {
@@ -249,9 +249,9 @@ static void umode_entry(void *thread_id, void *p2, void *p3)
  */
 static void enter_user_mode_entry(void *p1, void *p2, void *p3)
 {
-	z_thread_essential_set(arch_current_thread());
+	z_thread_essential_set(_current);
 
-	zassert_true(z_is_thread_essential(arch_current_thread()), "Thread isn't set"
+	zassert_true(z_is_thread_essential(_current), "Thread isn't set"
 		     " as essential\n");
 
 	k_thread_user_mode_enter(umode_entry,
diff --git a/tests/kernel/threads/thread_apis/src/test_essential_thread.c b/tests/kernel/threads/thread_apis/src/test_essential_thread.c
index fc101e7caf7..082765bd148 100644
--- a/tests/kernel/threads/thread_apis/src/test_essential_thread.c
+++ b/tests/kernel/threads/thread_apis/src/test_essential_thread.c
@@ -27,16 +27,16 @@ static void thread_entry(void *p1, void *p2, void *p3)
 	ARG_UNUSED(p2);
 	ARG_UNUSED(p3);
 
-	z_thread_essential_set(arch_current_thread());
+	z_thread_essential_set(_current);
 
-	if (z_is_thread_essential(arch_current_thread())) {
+	if (z_is_thread_essential(_current)) {
 		k_busy_wait(100);
 	} else {
 		zassert_unreachable("The thread is not set as essential");
 	}
 
-	z_thread_essential_clear(arch_current_thread());
-	zassert_false(z_is_thread_essential(arch_current_thread()),
+	z_thread_essential_clear(_current);
+	zassert_false(z_is_thread_essential(_current),
 		      "Essential flag of the thread is not cleared");
 
 	k_sem_give(&sync_sem);
@@ -68,7 +68,7 @@ void k_sys_fatal_error_handler(unsigned int reason,
 
 	fatal_error_signaled = true;
 
-	z_thread_essential_clear(arch_current_thread());
+	z_thread_essential_clear(_current);
 }
 
 static void abort_thread_entry(void *p1, void *p2, void *p3)
@@ -77,9 +77,9 @@ static void abort_thread_entry(void *p1, void *p2, void *p3)
 	ARG_UNUSED(p2);
 	ARG_UNUSED(p3);
 
-	z_thread_essential_set(arch_current_thread());
+	z_thread_essential_set(_current);
 
-	if (z_is_thread_essential(arch_current_thread())) {
+	if (z_is_thread_essential(_current)) {
 		k_busy_wait(100);
 	} else {
 		zassert_unreachable("The thread is not set as essential");
diff --git a/tests/kernel/usage/thread_runtime_stats/src/test_thread_runtime_stats.c b/tests/kernel/usage/thread_runtime_stats/src/test_thread_runtime_stats.c
index 08fd395ed2e..ff0ceeac7c8 100644
--- a/tests/kernel/usage/thread_runtime_stats/src/test_thread_runtime_stats.c
+++ b/tests/kernel/usage/thread_runtime_stats/src/test_thread_runtime_stats.c
@@ -72,7 +72,7 @@ ZTEST(usage_api, test_all_stats_usage)
 	k_thread_runtime_stats_t  stats4;
 	k_thread_runtime_stats_t  stats5;
 
-	priority = k_thread_priority_get(arch_current_thread());
+	priority = k_thread_priority_get(_current);
 	tid = k_thread_create(&helper_thread, helper_stack,
 			      K_THREAD_STACK_SIZEOF(helper_stack),
 			      helper1, NULL, NULL, NULL,
@@ -196,7 +196,7 @@ ZTEST(usage_api, test_thread_stats_enable_disable)
 	k_thread_runtime_stats_t  helper_stats3;
 	int  priority;
 
-	priority = k_thread_priority_get(arch_current_thread());
+	priority = k_thread_priority_get(_current);
 	tid = k_thread_create(&helper_thread, helper_stack,
 			      K_THREAD_STACK_SIZEOF(helper_stack),
 			      helper1, NULL, NULL, NULL,
@@ -209,7 +209,7 @@ ZTEST(usage_api, test_thread_stats_enable_disable)
 
 	k_sleep(K_TICKS(5));
 
-	k_thread_runtime_stats_get(arch_current_thread(), &stats1);
+	k_thread_runtime_stats_get(_current, &stats1);
 	k_thread_runtime_stats_get(tid, &helper_stats1);
 	k_thread_runtime_stats_disable(tid);
 
@@ -225,7 +225,7 @@ ZTEST(usage_api, test_thread_stats_enable_disable)
 	k_sleep(K_TICKS(2));
 
 	k_thread_runtime_stats_enable(tid);
-	k_thread_runtime_stats_get(arch_current_thread(), &stats2);
+	k_thread_runtime_stats_get(_current, &stats2);
 	k_thread_runtime_stats_get(tid, &helper_stats2);
 
 	/* Sleep for two ticks to let the helper thread execute again. */
@@ -280,12 +280,12 @@ ZTEST(usage_api, test_sys_stats_enable_disable)
 
 	k_sys_runtime_stats_disable();
 
-	k_thread_runtime_stats_get(arch_current_thread(), &thread_stats1);
+	k_thread_runtime_stats_get(_current, &thread_stats1);
 	k_thread_runtime_stats_all_get(&sys_stats1);
 
 	busy_loop(2);
 
-	k_thread_runtime_stats_get(arch_current_thread(), &thread_stats2);
+	k_thread_runtime_stats_get(_current, &thread_stats2);
 	k_thread_runtime_stats_all_get(&sys_stats2);
 
 	/*
@@ -297,7 +297,7 @@ ZTEST(usage_api, test_sys_stats_enable_disable)
 
 	busy_loop(2);
 
-	k_thread_runtime_stats_get(arch_current_thread(), &thread_stats3);
+	k_thread_runtime_stats_get(_current, &thread_stats3);
 	k_thread_runtime_stats_all_get(&sys_stats3);
 
 	/*
@@ -398,7 +398,7 @@ ZTEST(usage_api, test_thread_stats_usage)
 	k_thread_runtime_stats_t  stats2;
 	k_thread_runtime_stats_t  stats3;
 
-	priority = k_thread_priority_get(arch_current_thread());
+	priority = k_thread_priority_get(_current);
 
 	/*
 	 * Verify that k_thread_runtime_stats_get() returns the expected
@@ -408,7 +408,7 @@ ZTEST(usage_api, test_thread_stats_usage)
 	status = k_thread_runtime_stats_get(NULL, &stats1);
 	zassert_true(status == -EINVAL);
 
-	status = k_thread_runtime_stats_get(arch_current_thread(), NULL);
+	status = k_thread_runtime_stats_get(_current, NULL);
 	zassert_true(status == -EINVAL);
 
 	/* Align to the next tick */
@@ -422,7 +422,7 @@ ZTEST(usage_api, test_thread_stats_usage)
 			      helper1, NULL, NULL, NULL,
 			      priority + 2, 0, K_TICKS(1));
 
-	main_thread = arch_current_thread();
+	main_thread = _current;
 	k_timer_init(&timer, resume_main, NULL);
 	k_timer_start(&timer, K_TICKS(1), K_TICKS(10));
 
@@ -440,7 +440,7 @@ ZTEST(usage_api, test_thread_stats_usage)
 	 * the helper threads runtime stats.
 	 */
 
-	k_thread_suspend(arch_current_thread());
+	k_thread_suspend(_current);
 
 	/*
 	 * T = 1.
@@ -449,14 +449,14 @@ ZTEST(usage_api, test_thread_stats_usage)
 	 */
 
 	k_thread_runtime_stats_get(tid, &stats1);
-	k_thread_suspend(arch_current_thread());
+	k_thread_suspend(_current);
 
 	/*
 	 * T = 11.
 	 * Timer woke the main thread. Suspend main thread again.
 	 */
 
-	k_thread_suspend(arch_current_thread());
+	k_thread_suspend(_current);
 
 	/*
 	 * T = 21.
@@ -465,7 +465,7 @@ ZTEST(usage_api, test_thread_stats_usage)
 	 */
 
 	k_thread_runtime_stats_get(tid, &stats2);
-	k_thread_suspend(arch_current_thread());
+	k_thread_suspend(_current);
 
 	/*
 	 * T = 31.
diff --git a/tests/subsys/pm/power_mgmt/src/main.c b/tests/subsys/pm/power_mgmt/src/main.c
index da47ecee19d..3c75e44587f 100644
--- a/tests/subsys/pm/power_mgmt/src/main.c
+++ b/tests/subsys/pm/power_mgmt/src/main.c
@@ -254,7 +254,7 @@ const struct pm_state_info *pm_policy_next_state(uint8_t cpu, int32_t ticks)
 		     "There is no power state defined");
 
 	/* make sure this is idle thread */
-	zassert_true(z_is_idle_thread_object(arch_current_thread()));
+	zassert_true(z_is_idle_thread_object(_current));
 	zassert_true(ticks == _kernel.idle);
 	zassert_false(k_can_yield());
 	idle_entered = true;
@@ -276,7 +276,7 @@ static void notify_pm_state_entry(enum pm_state state)
 	/* enter suspend */
 	zassert_true(notify_app_entry == true,
 		     "Notification to enter suspend was not sent to the App");
-	zassert_true(z_is_idle_thread_object(arch_current_thread()));
+	zassert_true(z_is_idle_thread_object(_current));
 	zassert_equal(state, PM_STATE_SUSPEND_TO_IDLE);
 
 	pm_device_state_get(device_dummy, &device_power_state);
@@ -301,7 +301,7 @@ static void notify_pm_state_exit(enum pm_state state)
 	/* leave suspend */
 	zassert_true(notify_app_exit == true,
 		     "Notification to leave suspend was not sent to the App");
-	zassert_true(z_is_idle_thread_object(arch_current_thread()));
+	zassert_true(z_is_idle_thread_object(_current));
 	zassert_equal(state, PM_STATE_SUSPEND_TO_IDLE);
 
 	/* at this point, devices are active again*/
diff --git a/tests/ztest/error_hook/src/main.c b/tests/ztest/error_hook/src/main.c
index b775c38c04b..e4b05fc3eb0 100644
--- a/tests/ztest/error_hook/src/main.c
+++ b/tests/ztest/error_hook/src/main.c
@@ -71,10 +71,10 @@ __no_optimization static void trigger_fault_access(void)
 #elif defined(CONFIG_CPU_CORTEX_M) || defined(CONFIG_CPU_AARCH32_CORTEX_R) || \
 	defined(CONFIG_CPU_AARCH64_CORTEX_R)
 	/* As this test case only runs when User Mode is enabled,
-	 * accessing arch_current_thread() always triggers a memory access fault,
+	 * accessing _current always triggers a memory access fault,
 	 * and is guaranteed not to trigger SecureFault exceptions.
 	 */
-	void *a = (void *)arch_current_thread();
+	void *a = (void *)_current;
 #else
 	/* For most arch which support userspace, dereferencing NULL
 	 * pointer will be caught by exception.
@@ -338,7 +338,7 @@ ZTEST(error_hook_tests, test_catch_assert_in_isr)
 static void trigger_z_oops(void)
 {
 	/* Set up a dummy syscall frame, pointing to a valid area in memory. */
-	arch_current_thread()->syscall_frame = _image_ram_start;
+	_current->syscall_frame = _image_ram_start;
 
 	K_OOPS(true);
 }

From d461596808caf03aac37028437ff27ea38b15db2 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <npitre@baylibre.com>
Date: Tue, 7 Jan 2025 15:42:07 -0500
Subject: [PATCH 2248/2913] [nrf fromtree] kernel: move current thread pointer
 management to core code

Define the generic _current directly and get rid of the generic
arch_current_get().

The SMP default implementation is now known as z_smp_current_get().
It is no longer inlined which saves significant binary size (about 10%
for some random test case I checked).

Introduce z_current_thread_set() and use it in place of
arch_current_thread_set() for updating the current thread pointer
given this is not necessarily an architecture specific operation.
The architecture specific optimization, when enabled, should only care
about its own things and not have to also update the generic
_current_cpu->current copy.

Signed-off-by: Nicolas Pitre <npitre@baylibre.com>
(cherry picked from commit 7a3124d8669cba20f655846f0542df57ed1eda2e)
---
 arch/arm/core/cortex_m/thread.c           |  2 +-
 arch/posix/core/swap.c                    |  4 +-
 include/zephyr/arch/arch_inlines.h        |  2 -
 include/zephyr/arch/common/arch_inlines.h | 45 -----------------------
 include/zephyr/arch/riscv/arch_inlines.h  |  7 ++--
 include/zephyr/kernel_structs.h           | 16 +++++++-
 kernel/include/kswap.h                    |  4 +-
 kernel/sched.c                            |  4 +-
 kernel/smp.c                              | 14 +++++++
 9 files changed, 38 insertions(+), 60 deletions(-)
 delete mode 100644 include/zephyr/arch/common/arch_inlines.h

diff --git a/arch/arm/core/cortex_m/thread.c b/arch/arm/core/cortex_m/thread.c
index b67cbe8ee3e..c88fd8e41a0 100644
--- a/arch/arm/core/cortex_m/thread.c
+++ b/arch/arm/core/cortex_m/thread.c
@@ -522,7 +522,7 @@ void arch_switch_to_main_thread(struct k_thread *main_thread, char *stack_ptr,
 {
 	z_arm_prepare_switch_to_main();
 
-	arch_current_thread_set(main_thread);
+	z_current_thread_set(main_thread);
 
 #if defined(CONFIG_THREAD_LOCAL_STORAGE)
 	/* On Cortex-M, TLS uses a global variable as pointer to
diff --git a/arch/posix/core/swap.c b/arch/posix/core/swap.c
index 70d2cdedacc..cf13ab4d4d3 100644
--- a/arch/posix/core/swap.c
+++ b/arch/posix/core/swap.c
@@ -50,7 +50,7 @@ int arch_swap(unsigned int key)
 		_current->callee_saved.thread_status;
 
 
-	arch_current_thread_set(_kernel.ready_q.cache);
+	z_current_thread_set(_kernel.ready_q.cache);
 #if CONFIG_INSTRUMENT_THREAD_SWITCHING
 	z_thread_mark_switched_in();
 #endif
@@ -94,7 +94,7 @@ void arch_switch_to_main_thread(struct k_thread *main_thread, char *stack_ptr,
 	z_thread_mark_switched_out();
 #endif
 
-	arch_current_thread_set(_kernel.ready_q.cache);
+	z_current_thread_set(_kernel.ready_q.cache);
 
 #ifdef CONFIG_INSTRUMENT_THREAD_SWITCHING
 	z_thread_mark_switched_in();
diff --git a/include/zephyr/arch/arch_inlines.h b/include/zephyr/arch/arch_inlines.h
index 04c4a649f1e..0f32159e2f1 100644
--- a/include/zephyr/arch/arch_inlines.h
+++ b/include/zephyr/arch/arch_inlines.h
@@ -34,6 +34,4 @@
 #include <zephyr/arch/sparc/arch_inlines.h>
 #endif
 
-#include <zephyr/arch/common/arch_inlines.h>
-
 #endif /* ZEPHYR_INCLUDE_ARCH_INLINES_H_ */
diff --git a/include/zephyr/arch/common/arch_inlines.h b/include/zephyr/arch/common/arch_inlines.h
deleted file mode 100644
index 0490dba71aa..00000000000
--- a/include/zephyr/arch/common/arch_inlines.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2024 Meta Platforms.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_ZEPHYR_ARCH_COMMON_ARCH_INLINES_H_
-#define ZEPHYR_INCLUDE_ZEPHYR_ARCH_COMMON_ARCH_INLINES_H_
-
-#ifndef ZEPHYR_INCLUDE_ARCH_INLINES_H_
-#error "This header shouldn't be included directly"
-#endif /* ZEPHYR_INCLUDE_ARCH_INLINES_H_ */
-
-#ifndef _ASMLANGUAGE
-
-#include <zephyr/kernel_structs.h>
-
-#ifndef CONFIG_ARCH_HAS_CUSTOM_CURRENT_IMPL
-static ALWAYS_INLINE struct k_thread *arch_current_thread(void)
-{
-#ifdef CONFIG_SMP
-	/* In SMP, _current is a field read from _current_cpu, which
-	 * can race with preemption before it is read.  We must lock
-	 * local interrupts when reading it.
-	 */
-	unsigned int k = arch_irq_lock();
-
-	struct k_thread *ret = _current_cpu->current;
-
-	arch_irq_unlock(k);
-#else
-	struct k_thread *ret = _kernel.cpus[0].current;
-#endif /* CONFIG_SMP */
-	return ret;
-}
-
-static ALWAYS_INLINE void arch_current_thread_set(struct k_thread *thread)
-{
-	_current_cpu->current = thread;
-}
-#endif /* CONFIG_ARCH_HAS_CUSTOM_CURRENT_IMPL */
-
-#endif /* _ASMLANGUAGE */
-
-#endif /* ZEPHYR_INCLUDE_ZEPHYR_ARCH_COMMON_ARCH_INLINES_H_ */
diff --git a/include/zephyr/arch/riscv/arch_inlines.h b/include/zephyr/arch/riscv/arch_inlines.h
index c97413a5f8f..022879c88d4 100644
--- a/include/zephyr/arch/riscv/arch_inlines.h
+++ b/include/zephyr/arch/riscv/arch_inlines.h
@@ -28,13 +28,12 @@ static ALWAYS_INLINE _cpu_t *arch_curr_cpu(void)
 }
 
 #ifdef CONFIG_RISCV_CURRENT_VIA_GP
+
 register struct k_thread *__arch_current_thread __asm__("gp");
 
 #define arch_current_thread() __arch_current_thread
-#define arch_current_thread_set(thread)                                                            \
-	do {                                                                                       \
-		__arch_current_thread = _current_cpu->current = (thread);                          \
-	} while (0)
+#define arch_current_thread_set(thread) ({ __arch_current_thread = (thread); })
+
 #endif /* CONFIG_RISCV_CURRENT_VIA_GP */
 
 static ALWAYS_INLINE unsigned int arch_num_cpus(void)
diff --git a/include/zephyr/kernel_structs.h b/include/zephyr/kernel_structs.h
index 3e2a9fe4285..5cea718f0b4 100644
--- a/include/zephyr/kernel_structs.h
+++ b/include/zephyr/kernel_structs.h
@@ -260,16 +260,28 @@ extern atomic_t _cpus_active;
  * another SMP CPU.
  */
 bool z_smp_cpu_mobile(void);
-
 #define _current_cpu ({ __ASSERT_NO_MSG(!z_smp_cpu_mobile()); \
 			arch_curr_cpu(); })
-#define _current arch_current_thread()
+
+struct k_thread *z_smp_current_get(void);
+#define _current z_smp_current_get()
 
 #else
 #define _current_cpu (&_kernel.cpus[0])
 #define _current _kernel.cpus[0].current
 #endif
 
+/* This is always invoked from a context where preemption is disabled */
+#define z_current_thread_set(thread) ({ _current_cpu->current = (thread); })
+
+#ifdef CONFIG_ARCH_HAS_CUSTOM_CURRENT_IMPL
+#undef _current
+#define _current arch_current_thread()
+#undef z_current_thread_set
+#define z_current_thread_set(thread) \
+	arch_current_thread_set(({ _current_cpu->current = (thread); }))
+#endif
+
 /* kernel wait queue record */
 #ifdef CONFIG_WAITQ_SCALABLE
 
diff --git a/kernel/include/kswap.h b/kernel/include/kswap.h
index a4e75e7ed6d..803a4a546eb 100644
--- a/kernel/include/kswap.h
+++ b/kernel/include/kswap.h
@@ -133,7 +133,7 @@ static ALWAYS_INLINE unsigned int do_swap(unsigned int key,
 #endif /* CONFIG_SMP */
 		z_thread_mark_switched_out();
 		z_sched_switch_spin(new_thread);
-		arch_current_thread_set(new_thread);
+		z_current_thread_set(new_thread);
 
 #ifdef CONFIG_TIMESLICING
 		z_reset_time_slice(new_thread);
@@ -259,6 +259,6 @@ static inline void z_dummy_thread_init(struct k_thread *dummy_thread)
 	dummy_thread->base.slice_ticks = 0;
 #endif /* CONFIG_TIMESLICE_PER_THREAD */
 
-	arch_current_thread_set(dummy_thread);
+	z_current_thread_set(dummy_thread);
 }
 #endif /* ZEPHYR_KERNEL_INCLUDE_KSWAP_H_ */
diff --git a/kernel/sched.c b/kernel/sched.c
index 02dc0b699d2..c126792bcbb 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -797,11 +797,11 @@ struct k_thread *z_swap_next_thread(void)
 }
 
 #ifdef CONFIG_USE_SWITCH
-/* Just a wrapper around arch_current_thread_set(xxx) with tracing */
+/* Just a wrapper around z_current_thread_set(xxx) with tracing */
 static inline void set_current(struct k_thread *new_thread)
 {
 	z_thread_mark_switched_out();
-	arch_current_thread_set(new_thread);
+	z_current_thread_set(new_thread);
 }
 
 /**
diff --git a/kernel/smp.c b/kernel/smp.c
index a5659525278..f97f1b2a17e 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -248,3 +248,17 @@ bool z_smp_cpu_mobile(void)
 	arch_irq_unlock(k);
 	return !pinned;
 }
+
+struct k_thread *z_smp_current_get(void)
+{
+	/*
+	 * _current is a field read from _current_cpu, which can race
+	 * with preemption before it is read.  We must lock local
+	 * interrupts when reading it.
+	 */
+	unsigned int key = arch_irq_lock();
+	struct k_thread *t = _current_cpu->current;
+
+	arch_irq_unlock(key);
+	return t;
+}

From c33c111ebdfff8cce00fd3df37b6279866961066 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <npitre@baylibre.com>
Date: Wed, 8 Jan 2025 12:36:37 -0500
Subject: [PATCH 2249/2913] [nrf fromtree] kernel: mark z_smp_current_get()
 with the const attribute

Repeated references to _current won't produce a different result as the
executing thread instance is always the same. Use the const attribute to
let the compiler know it may reuse a previously obtained value. This offset
the penalty for moving z_smp_current_get() out of line and provides yet
more binary size reduction.

This change is isolated in its own commit to ease bisecting in case some
unexpected misbehavior is eventually observed.

Signed-off-by: Nicolas Pitre <npitre@baylibre.com>
(cherry picked from commit bc6eded597d074fe5b987e68686635105387ac2e)
---
 include/zephyr/kernel_structs.h | 2 +-
 kernel/smp.c                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/zephyr/kernel_structs.h b/include/zephyr/kernel_structs.h
index 5cea718f0b4..56df49dcb23 100644
--- a/include/zephyr/kernel_structs.h
+++ b/include/zephyr/kernel_structs.h
@@ -263,7 +263,7 @@ bool z_smp_cpu_mobile(void);
 #define _current_cpu ({ __ASSERT_NO_MSG(!z_smp_cpu_mobile()); \
 			arch_curr_cpu(); })
 
-struct k_thread *z_smp_current_get(void);
+__attribute_const__ struct k_thread *z_smp_current_get(void);
 #define _current z_smp_current_get()
 
 #else
diff --git a/kernel/smp.c b/kernel/smp.c
index f97f1b2a17e..63ac7bc8975 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -249,7 +249,7 @@ bool z_smp_cpu_mobile(void)
 	return !pinned;
 }
 
-struct k_thread *z_smp_current_get(void)
+__attribute_const__ struct k_thread *z_smp_current_get(void)
 {
 	/*
 	 * _current is a field read from _current_cpu, which can race

From 94ab74e8847778412050f3e0a7953dc3939e4c9b Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Fri, 10 Jan 2025 14:51:43 -0500
Subject: [PATCH 2250/2913] [nrf fromtree] tests: twister: add supported
 toolchains for unit tests

Allowed toolchains was not set in 'board' metadata causing those to not
build and get filtered.

Fixes #83792

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
(cherry picked from commit 1f4874088f17c2d617426aa8cb78b66bbb634989)
---
 .../boards/unit_testing/unit_testing/unit_testing.yaml          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/subsys/testsuite/boards/unit_testing/unit_testing/unit_testing.yaml b/subsys/testsuite/boards/unit_testing/unit_testing/unit_testing.yaml
index 17daf29aa15..8fc75ad3b80 100644
--- a/subsys/testsuite/boards/unit_testing/unit_testing/unit_testing.yaml
+++ b/subsys/testsuite/boards/unit_testing/unit_testing/unit_testing.yaml
@@ -2,5 +2,7 @@ identifier: unit_testing
 name: Unit Testing
 type: unit
 arch: unit
+toolchain:
+  - host
 testing:
   default: true

From 1555e8ef12aeb22f25530ec8c212b852d9fe5322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 20 Jan 2025 14:30:29 +0100
Subject: [PATCH 2251/2913] [nrf fromtree] tests: drivers: uart:
 uart_mix_fifo_poll: Move counter handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move enabling of counter to the test instead of test setup. Test may be
skipped in some configurations and in that case counter shall not be
started so by moving setup to the test code allows skipping test before
counter is started.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 1ee434a6c27dc30993fa614ba55f693a40c2829e)
---
 .../uart/uart_mix_fifo_poll/src/main.c        | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/tests/drivers/uart/uart_mix_fifo_poll/src/main.c b/tests/drivers/uart/uart_mix_fifo_poll/src/main.c
index 0c83f5f2bce..998efbdd651 100644
--- a/tests/drivers/uart/uart_mix_fifo_poll/src/main.c
+++ b/tests/drivers/uart/uart_mix_fifo_poll/src/main.c
@@ -147,13 +147,6 @@ static void counter_top_handler(const struct device *dev, void *user_data)
 
 static void init_test(int idx)
 {
-	int err;
-	struct counter_top_cfg top_cfg = {
-		.callback = counter_top_handler,
-		.user_data = NULL,
-		.flags = 0
-	};
-
 	memset(source, 0, sizeof(source));
 	async_rx_enabled = false;
 	uart_dev = duts[idx].dev;
@@ -170,19 +163,6 @@ static void init_test(int idx)
 			uart_irq_callback_set(uart_dev, int_driven_callback);
 		}
 	}
-
-	/* Setup counter which will periodically enable/disable UART RX,
-	 * Disabling RX should lead to flow control being activated.
-	 */
-	zassert_true(device_is_ready(counter_dev));
-
-	top_cfg.ticks = counter_us_to_ticks(counter_dev, 1000);
-
-	err = counter_set_top_value(counter_dev, &top_cfg);
-	zassert_true(err >= 0);
-
-	err = counter_start(counter_dev);
-	zassert_true(err >= 0);
 }
 
 static void rx_isr(void)
@@ -343,6 +323,24 @@ ZTEST(uart_mix_fifo_poll, test_mixed_uart_access)
 	int repeat = CONFIG_STRESS_TEST_REPS;
 	int err;
 	int num_of_contexts = ARRAY_SIZE(test_data);
+	struct counter_top_cfg top_cfg = {
+		.callback = counter_top_handler,
+		.user_data = NULL,
+		.flags = 0
+	};
+
+	/* Setup counter which will periodically enable/disable UART RX,
+	 * Disabling RX should lead to flow control being activated.
+	 */
+	zassert_true(device_is_ready(counter_dev));
+
+	top_cfg.ticks = counter_us_to_ticks(counter_dev, 1000);
+
+	err = counter_set_top_value(counter_dev, &top_cfg);
+	zassert_true(err >= 0);
+
+	err = counter_start(counter_dev);
+	zassert_true(err >= 0);
 
 	for (int i = 0; i < ARRAY_SIZE(test_data); i++) {
 		init_buf(txbuf[i], sizeof(txbuf[i]), i);
@@ -387,6 +385,9 @@ ZTEST(uart_mix_fifo_poll, test_mixed_uart_access)
 				"%d: Unexpected rx bytes count (%d/%d)",
 				i, source[i].cnt, repeat);
 	}
+
+	err = counter_stop(counter_dev);
+	zassert_true(err >= 0);
 }
 
 void *uart_mix_setup(void)

From 732ad00d770dd61b7a4343fa56d66afd114cbbca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 20 Jan 2025 14:27:53 +0100
Subject: [PATCH 2252/2913] [nrf fromtree] tests: drivers: uart:
 uart_mix_fifo_poll: Enable device PM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

uart120 requires device runtime to be enable. Enable it for nrf54h20dk.

When device runtime PM is used for interrupt driven and polling API
then UART device is initially suspended. It means that RX is disabled.
In order to enable RX device must be explicitly resumed using PM API.

Test is enabling UART RX (uart_rx_enable) from counter callback
(interrupt handler context). For fast instance on nrf54h20dk (uart120)
it is not allowed because PM resume can only be called from the thread
context. Because of that, test is skipped for uart120 and asynchronous
API.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit cc12f655c9d2313ac893d3f209747513728e5b89)
---
 .../boards/nrf54h20dk_nrf54h20_common.dtsi    |  2 ++
 .../boards/nrf54h20dk_nrf54h20_cpuapp.conf    |  2 ++
 .../uart/uart_mix_fifo_poll/src/main.c        | 21 +++++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54h20dk_nrf54h20_cpuapp.conf

diff --git a/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54h20dk_nrf54h20_common.dtsi b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54h20dk_nrf54h20_common.dtsi
index 72032c0397b..e3882968d42 100644
--- a/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54h20dk_nrf54h20_common.dtsi
+++ b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54h20dk_nrf54h20_common.dtsi
@@ -49,6 +49,7 @@ dut: &uart137 {
 	pinctrl-names = "default", "sleep";
 	current-speed = <115200>;
 	hw-flow-control;
+	zephyr,pm-device-runtime-auto;
 };
 
 dut2: &uart120 {
@@ -57,6 +58,7 @@ dut2: &uart120 {
 	pinctrl-names = "default", "sleep";
 	current-speed = <115200>;
 	hw-flow-control;
+	zephyr,pm-device-runtime-auto;
 };
 
 counter_dev: &timer137 {
diff --git a/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..74cc8d7691e
--- /dev/null
+++ b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1,2 @@
+CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_RUNTIME=y
diff --git a/tests/drivers/uart/uart_mix_fifo_poll/src/main.c b/tests/drivers/uart/uart_mix_fifo_poll/src/main.c
index 998efbdd651..b7c87b0b1e2 100644
--- a/tests/drivers/uart/uart_mix_fifo_poll/src/main.c
+++ b/tests/drivers/uart/uart_mix_fifo_poll/src/main.c
@@ -15,6 +15,7 @@
 #include <zephyr/ztest.h>
 #include <zephyr/drivers/counter.h>
 #include <zephyr/random/random.h>
+#include <zephyr/pm/device_runtime.h>
 /* RX and TX pins have to be connected together*/
 
 #if DT_NODE_EXISTS(DT_NODELABEL(dut))
@@ -329,6 +330,22 @@ ZTEST(uart_mix_fifo_poll, test_mixed_uart_access)
 		.flags = 0
 	};
 
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		if (async) {
+#if DT_NODE_EXISTS(DT_NODELABEL(uart120)) && DT_NODE_HAS_STATUS(DT_NODELABEL(uart120), okay)
+			if (uart_dev == DEVICE_DT_GET(DT_NODELABEL(uart120))) {
+				ztest_test_skip();
+			}
+#endif
+		} else {
+			/* If only polling API is available then UART device is initially
+			 * suspended which means that RX is disabled and poll_in won't work.
+			 * Device must be explicitly enabled.
+			 */
+			pm_device_runtime_get(uart_dev);
+		}
+	}
+
 	/* Setup counter which will periodically enable/disable UART RX,
 	 * Disabling RX should lead to flow control being activated.
 	 */
@@ -388,6 +405,10 @@ ZTEST(uart_mix_fifo_poll, test_mixed_uart_access)
 
 	err = counter_stop(counter_dev);
 	zassert_true(err >= 0);
+
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) && !async) {
+		pm_device_runtime_put(uart_dev);
+	}
 }
 
 void *uart_mix_setup(void)

From 5fcec13e718ac57b405833590763a356d6dd43ab Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 13 Jan 2025 15:40:17 +0530
Subject: [PATCH 2253/2913] [nrf fromtree] modules: hostap: Fix AP and no MBO
 build

Add check for MBO feature before including the source file.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 0953ea0010e04940c88f70a005b10e9e645b8299)
---
 modules/hostap/CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index 502bfd8b994..a2269e1051b 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -212,12 +212,15 @@ zephyr_library_sources(
   ${HOSTAP_SRC_BASE}/eap_server/eap_server_identity.c
   ${HOSTAP_SRC_BASE}/eap_server/eap_server_methods.c
   ${HOSTAP_SRC_BASE}/eapol_auth/eapol_auth_sm.c
-  ${HOSTAP_SRC_BASE}/ap/mbo_ap.c
   ${HOSTAP_SRC_BASE}/ap/ctrl_iface_ap.c
   ${HOSTAP_SRC_BASE}/utils/crc32.c
   ${HOSTAP_SRC_BASE}/utils/ip_addr.c
 )
 
+if (CONFIG_WIFI_NM_WPA_SUPPLICANT_MBO)
+  zephyr_library_sources(${HOSTAP_SRC_BASE}/ap/mbo_ap.c)
+endif()
+
 zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_11AX
   ${HOSTAP_SRC_BASE}/ap/ieee802_11_he.c
 )

From 02b4d6ae738113d13581349d4ec271ac14a1c7bb Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 13 Jan 2025 15:44:37 +0530
Subject: [PATCH 2254/2913] [nrf fromtree] modules: hostap: Fix advanced
 features disable

Zephyr introduced postive feature flags to make advanced features
conditional but the upstream has followed a negative feature flag
for advanced features, and during upmerge these two weren't reconciled.

Fix the build in case advanced features are disabled.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit d909634ba8c23515a024702f8e16cd18d63743cc)
---
 modules/hostap/CMakeLists.txt | 16 ++++++----------
 modules/hostap/Kconfig        | 10 +++-------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index a2269e1051b..d623f298869 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -58,20 +58,16 @@ zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_NO_DEBUG
   CONFIG_NO_STDOUT_DEBUG
 )
 
-zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_ROBUST_AV
-  CONFIG_ROBUST_AV
+zephyr_library_compile_definitions_ifndef(CONFIG_WIFI_NM_WPA_SUPPLICANT_ROBUST_AV
+  CONFIG_NO_ROBUST_AV
 )
 
-zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_WMM_AC
-  CONFIG_WMM_AC
+zephyr_library_compile_definitions_ifndef(CONFIG_WIFI_NM_WPA_SUPPLICANT_WMM_AC
+CONFIG_NO_WMM_AC
 )
 
-zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_RRM
-  CONFIG_RRM
-)
-
-zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_ROBUST_AV
-  CONFIG_ROBUST_AV
+zephyr_library_compile_definitions_ifndef(CONFIG_WIFI_NM_WPA_SUPPLICANT_RRM
+CONFIG_NO_RRM
 )
 
 zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_MBO
diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index fa4dd56cb8f..43738b64b6b 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -516,17 +516,13 @@ config WPA_CRYPTO
 config WPA_SUPP_CRYPTO
 	bool
 
-config ROBUST_AV
+config NO_ROBUST_AV
 	bool
-	default y
-	depends on WIFI_NM_WPA_SUPPLICANT_ROBUST_AV
 
-config RRM
+config NO_RRM
 	bool
-	default y
-	depends on WIFI_NM_WPA_SUPPLICANT_RRM
 
-config WMM_AC
+config NO_WMM_AC
 	bool
 
 config DPP

From 67fd3ed3e2a9dd62f1182e58e1d1c71744237959 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 13 Jan 2025 15:47:08 +0530
Subject: [PATCH 2255/2913] [nrf fromtree] tests: wifi: configs: Add a test for
 disable of advanced features

This feature is handy to free up some memory, so, make sure it always
builds.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 7532e73b400a8285a71c54243510db63ae351935)
---
 tests/net/wifi/configs/testcase.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/net/wifi/configs/testcase.yaml b/tests/net/wifi/configs/testcase.yaml
index f8ceaf6cd83..a4f11c2b049 100644
--- a/tests/net/wifi/configs/testcase.yaml
+++ b/tests/net/wifi/configs/testcase.yaml
@@ -53,3 +53,6 @@ tests:
   wifi.build.dpp:
     extra_configs:
       - CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP=y
+  wifi.build.disable_advanced_feat:
+    extra_configs:
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT_ADVANCED_FEATURES=y

From 657cfd824d8ae4d944da849fd76c81728cd48c74 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 14 Jan 2025 00:46:40 +0530
Subject: [PATCH 2256/2913] [nrf fromtree] modules: hostap: Remove redundant
 default

Default is always disabled.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 819acf18f00b58d26e1c182a08106c38e5e40b9e)
---
 modules/hostap/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index 43738b64b6b..368be0e704f 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -278,7 +278,6 @@ config WIFI_NM_WPA_SUPPLICANT_EAPOL
 
 config WIFI_NM_WPA_SUPPLICANT_CLI
 	bool "CLI support for wpa_supplicant"
-	default n
 
 config WIFI_NM_WPA_SUPPLICANT_INF_MON
 	bool "Monitor the net mgmt event to add/del interface"

From e4749b6576603aedfa36b479b60c2e74a036501e Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 14 Jan 2025 00:50:48 +0530
Subject: [PATCH 2257/2913] [nrf fromtree] manifest: hostap: Pull fix for WMM
 AC disabled build

Fixes build issue when WMM AC feature is disabled.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 2350b6b3b2edb710cec10c49119190bcaefa7610)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 387deacadd8..10523a88b07 100644
--- a/west.yml
+++ b/west.yml
@@ -274,7 +274,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: 516cf575760be783498eff901e994d1944bdb105
+      revision: b4c42d88afc5ee04751fe258db757c4ef70abb09
     - name: liblc3
       revision: bb85f7dde4195bfc0fca9e9c7c2eed0f8694203c
       path: modules/lib/liblc3

From 71106023f7c976e87eb3723d15f14c5a812eede1 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@silabs.com>
Date: Mon, 9 Dec 2024 13:44:59 +0200
Subject: [PATCH 2258/2913] [nrf fromtree] Bluetooth: Host: Remove HCI ECC
 emulation

Remove the HCI command & event emulation layer for ECDH commands and
events. This means that we always do the necessary operations in the host.
The existing BT_ECC Kconfig option stays, but now gets automatically
enabled when necessary (e.g. based on the BT_SMP option), which is why this
commit removes so many explicit assignments in prj.conf files.

Signed-off-by: Johan Hedberg <johan.hedberg@silabs.com>
(cherry picked from commit 09e86f3b69b3112b96d6f89bf388d1ced982aef9)
---
 .../bap_broadcast_assistant/prj.conf          |   2 -
 samples/bluetooth/bap_broadcast_sink/prj.conf |   2 -
 .../bap_unicast_client/boards/native_sim.conf |   1 -
 .../nrf5340_audio_dk_nrf5340_cpuapp.conf      |   2 -
 .../boards/nrf5340bsim_nrf5340_cpuapp.conf    |   2 -
 .../boards/nrf5340dk_nrf5340_cpuapp.conf      |   2 -
 .../bap_unicast_server/boards/native_sim.conf |   1 -
 .../nrf5340_audio_dk_nrf5340_cpuapp.conf      |   2 -
 .../boards/nrf5340bsim_nrf5340_cpuapp.conf    |   2 -
 .../boards/nrf5340dk_nrf5340_cpuapp.conf      |   2 -
 .../nrf5340_audio_dk_nrf5340_cpuapp.conf      |   2 -
 .../boards/nrf5340dk_nrf5340_cpuapp.conf      |   2 -
 .../nrf5340_audio_dk_nrf5340_cpuapp.conf      |   2 -
 .../boards/nrf5340dk_nrf5340_cpuapp.conf      |   2 -
 .../nrf5340_audio_dk_nrf5340_cpuapp.conf      |   2 -
 .../boards/nrf5340dk_nrf5340_cpuapp.conf      |   2 -
 .../bluetooth/hap_ha/boards/native_sim.conf   |   1 -
 samples/bluetooth/hci_spi/prj.conf            |   1 -
 samples/bluetooth/hci_uart/prj.conf           |   1 -
 samples/bluetooth/hci_uart_3wire/prj.conf     |   1 -
 .../boards/tlsr9518adk80d.conf                |   4 -
 samples/bluetooth/peripheral_sc_only/prj.conf |   1 -
 .../tmap_bmr/boards/native_posix.conf         |   1 -
 .../bluetooth/tmap_bmr/boards/native_sim.conf |   1 -
 .../tmap_bms/boards/native_posix.conf         |   1 -
 .../bluetooth/tmap_bms/boards/native_sim.conf |   1 -
 .../tmap_central/boards/native_posix.conf     |   1 -
 .../tmap_central/boards/native_sim.conf       |   1 -
 .../tmap_peripheral/boards/native_posix.conf  |   1 -
 .../tmap_peripheral/boards/native_sim.conf    |   1 -
 samples/boards/nordic/mesh/onoff-app/prj.conf |   1 -
 .../onoff_level_lighting_vnd_app/prj.conf     |   1 -
 subsys/bluetooth/controller/hci/hci.c         |   6 -
 subsys/bluetooth/host/CMakeLists.txt          |   1 -
 subsys/bluetooth/host/Kconfig                 |  29 +-
 subsys/bluetooth/host/ecc.c                   | 302 ++++++++------
 subsys/bluetooth/host/hci_core.c              |  34 +-
 subsys/bluetooth/host/hci_core.h              |   5 -
 subsys/bluetooth/host/hci_ecc.c               | 390 ------------------
 subsys/bluetooth/host/hci_ecc.h               |  10 -
 subsys/bluetooth/host/hci_raw.c               |   5 -
 subsys/bluetooth/host/smp.c                   |   8 +-
 tests/bluetooth/init/prj_10.conf              |   1 -
 tests/bluetooth/init/prj_11.conf              |   1 -
 tests/bluetooth/init/prj_12.conf              |   1 -
 tests/bluetooth/init/prj_13.conf              |   1 -
 tests/bluetooth/init/prj_14.conf              |   1 -
 tests/bluetooth/init/prj_15.conf              |   1 -
 tests/bluetooth/init/prj_17.conf              |   1 -
 tests/bluetooth/init/prj_20.conf              |   1 -
 tests/bluetooth/init/prj_21.conf              |   1 -
 tests/bluetooth/init/prj_9.conf               |   1 -
 tests/bluetooth/init/prj_ctlr.conf            |   1 -
 tests/bluetooth/init/prj_ctlr_5_x_dbg.conf    |   1 -
 tests/bluetooth/init/prj_ctlr_dbg.conf        |   1 -
 tests/bluetooth/init/prj_ctlr_ticker.conf     |   1 -
 tests/bluetooth/init/prj_ctlr_tiny.conf       |   1 -
 tests/bluetooth/init/prj_llcp.conf            |   1 -
 .../nrf5340_audio_dk_nrf5340_cpuapp.conf      |   3 -
 .../boards/nrf5340dk_nrf5340_cpuapp.conf      |   3 -
 .../nrf5340_audio_dk_nrf5340_cpuapp.conf      |   2 -
 .../boards/nrf5340dk_nrf5340_cpuapp.conf      |   2 -
 tests/bsim/bluetooth/audio/prj.conf           |   1 -
 .../boards/nrf5340bsim_nrf5340_cpuapp.conf    |   2 -
 .../ll/edtt/hci_test_app/prj_dut_llcp.conf    |   1 -
 .../ll/edtt/hci_test_app/prj_tst_llcp.conf    |   1 -
 66 files changed, 196 insertions(+), 674 deletions(-)
 delete mode 100644 samples/bluetooth/peripheral_sc_only/boards/tlsr9518adk80d.conf
 delete mode 100644 subsys/bluetooth/host/hci_ecc.c
 delete mode 100644 subsys/bluetooth/host/hci_ecc.h

diff --git a/samples/bluetooth/bap_broadcast_assistant/prj.conf b/samples/bluetooth/bap_broadcast_assistant/prj.conf
index e39c4c3eef0..370ff75f260 100644
--- a/samples/bluetooth/bap_broadcast_assistant/prj.conf
+++ b/samples/bluetooth/bap_broadcast_assistant/prj.conf
@@ -10,8 +10,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191
 
-CONFIG_BT_SEND_ECC_EMULATION=y
-
 CONFIG_BT_EXT_ADV=y
 CONFIG_BT_PER_ADV_SYNC=y
 CONFIG_BT_BAP_BASS_MAX_SUBGROUPS=2
diff --git a/samples/bluetooth/bap_broadcast_sink/prj.conf b/samples/bluetooth/bap_broadcast_sink/prj.conf
index fe0d8787d76..69c57526703 100644
--- a/samples/bluetooth/bap_broadcast_sink/prj.conf
+++ b/samples/bluetooth/bap_broadcast_sink/prj.conf
@@ -25,5 +25,3 @@ CONFIG_BT_AUDIO_CODEC_CAP_MAX_METADATA_SIZE=64
 CONFIG_BT_AUDIO_CODEC_CAP_MAX_DATA_SIZE=64
 
 CONFIG_BT_DEVICE_NAME="Broadcast Audio Sink"
-
-CONFIG_BT_SEND_ECC_EMULATION=y
diff --git a/samples/bluetooth/bap_unicast_client/boards/native_sim.conf b/samples/bluetooth/bap_unicast_client/boards/native_sim.conf
index c951fcc8c33..8ab1d7be113 100644
--- a/samples/bluetooth/bap_unicast_client/boards/native_sim.conf
+++ b/samples/bluetooth/bap_unicast_client/boards/native_sim.conf
@@ -1,5 +1,4 @@
 CONFIG_LOG_MODE_IMMEDIATE=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 
 CONFIG_LIBLC3=y
 CONFIG_FPU=y
diff --git a/samples/bluetooth/bap_unicast_client/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_unicast_client/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
index 50ba07e8522..614df139f0e 100644
--- a/samples/bluetooth/bap_unicast_client/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/bap_unicast_client/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -9,5 +9,3 @@ CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
-
-CONFIG_BT_SEND_ECC_EMULATION=y
diff --git a/samples/bluetooth/bap_unicast_client/boards/nrf5340bsim_nrf5340_cpuapp.conf b/samples/bluetooth/bap_unicast_client/boards/nrf5340bsim_nrf5340_cpuapp.conf
index ffb0e27ed64..9b059b92ddc 100644
--- a/samples/bluetooth/bap_unicast_client/boards/nrf5340bsim_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/bap_unicast_client/boards/nrf5340bsim_nrf5340_cpuapp.conf
@@ -6,5 +6,3 @@ CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
-
-CONFIG_BT_SEND_ECC_EMULATION=y
diff --git a/samples/bluetooth/bap_unicast_client/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_unicast_client/boards/nrf5340dk_nrf5340_cpuapp.conf
index e02323fb3f7..31b3a09380f 100644
--- a/samples/bluetooth/bap_unicast_client/boards/nrf5340dk_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/bap_unicast_client/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -9,5 +9,3 @@ CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
-
-CONFIG_BT_SEND_ECC_EMULATION=y
diff --git a/samples/bluetooth/bap_unicast_server/boards/native_sim.conf b/samples/bluetooth/bap_unicast_server/boards/native_sim.conf
index c951fcc8c33..8ab1d7be113 100644
--- a/samples/bluetooth/bap_unicast_server/boards/native_sim.conf
+++ b/samples/bluetooth/bap_unicast_server/boards/native_sim.conf
@@ -1,5 +1,4 @@
 CONFIG_LOG_MODE_IMMEDIATE=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 
 CONFIG_LIBLC3=y
 CONFIG_FPU=y
diff --git a/samples/bluetooth/bap_unicast_server/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_unicast_server/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
index ffb0e27ed64..9b059b92ddc 100644
--- a/samples/bluetooth/bap_unicast_server/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/bap_unicast_server/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -6,5 +6,3 @@ CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
-
-CONFIG_BT_SEND_ECC_EMULATION=y
diff --git a/samples/bluetooth/bap_unicast_server/boards/nrf5340bsim_nrf5340_cpuapp.conf b/samples/bluetooth/bap_unicast_server/boards/nrf5340bsim_nrf5340_cpuapp.conf
index ffb0e27ed64..9b059b92ddc 100644
--- a/samples/bluetooth/bap_unicast_server/boards/nrf5340bsim_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/bap_unicast_server/boards/nrf5340bsim_nrf5340_cpuapp.conf
@@ -6,5 +6,3 @@ CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
-
-CONFIG_BT_SEND_ECC_EMULATION=y
diff --git a/samples/bluetooth/bap_unicast_server/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_unicast_server/boards/nrf5340dk_nrf5340_cpuapp.conf
index e02323fb3f7..31b3a09380f 100644
--- a/samples/bluetooth/bap_unicast_server/boards/nrf5340dk_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/bap_unicast_server/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -9,5 +9,3 @@ CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
-
-CONFIG_BT_SEND_ECC_EMULATION=y
diff --git a/samples/bluetooth/cap_acceptor/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/cap_acceptor/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
index f58eedb0453..09fa41842eb 100644
--- a/samples/bluetooth/cap_acceptor/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/cap_acceptor/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -2,5 +2,3 @@ CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
-
-CONFIG_BT_SEND_ECC_EMULATION=y
diff --git a/samples/bluetooth/cap_acceptor/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/cap_acceptor/boards/nrf5340dk_nrf5340_cpuapp.conf
index f58eedb0453..09fa41842eb 100644
--- a/samples/bluetooth/cap_acceptor/boards/nrf5340dk_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/cap_acceptor/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -2,5 +2,3 @@ CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
-
-CONFIG_BT_SEND_ECC_EMULATION=y
diff --git a/samples/bluetooth/cap_initiator/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/cap_initiator/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
index f58eedb0453..09fa41842eb 100644
--- a/samples/bluetooth/cap_initiator/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/cap_initiator/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -2,5 +2,3 @@ CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
-
-CONFIG_BT_SEND_ECC_EMULATION=y
diff --git a/samples/bluetooth/cap_initiator/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/cap_initiator/boards/nrf5340dk_nrf5340_cpuapp.conf
index f58eedb0453..09fa41842eb 100644
--- a/samples/bluetooth/cap_initiator/boards/nrf5340dk_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/cap_initiator/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -2,5 +2,3 @@ CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
-
-CONFIG_BT_SEND_ECC_EMULATION=y
diff --git a/samples/bluetooth/ccp_call_control_server/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/ccp_call_control_server/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
index f58eedb0453..09fa41842eb 100644
--- a/samples/bluetooth/ccp_call_control_server/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/ccp_call_control_server/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -2,5 +2,3 @@ CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
-
-CONFIG_BT_SEND_ECC_EMULATION=y
diff --git a/samples/bluetooth/ccp_call_control_server/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/ccp_call_control_server/boards/nrf5340dk_nrf5340_cpuapp.conf
index f58eedb0453..09fa41842eb 100644
--- a/samples/bluetooth/ccp_call_control_server/boards/nrf5340dk_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/ccp_call_control_server/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -2,5 +2,3 @@ CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
-
-CONFIG_BT_SEND_ECC_EMULATION=y
diff --git a/samples/bluetooth/hap_ha/boards/native_sim.conf b/samples/bluetooth/hap_ha/boards/native_sim.conf
index f6c82a5dfbb..eff540ab4cf 100644
--- a/samples/bluetooth/hap_ha/boards/native_sim.conf
+++ b/samples/bluetooth/hap_ha/boards/native_sim.conf
@@ -1,5 +1,4 @@
 CONFIG_LOG_MODE_IMMEDIATE=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 
 # For LE-audio at 10ms intervals we need the tick counter to occur more frequently
 # than every 10 ms as each PDU for some reason takes 2 ticks to process.
diff --git a/samples/bluetooth/hci_spi/prj.conf b/samples/bluetooth/hci_spi/prj.conf
index 68c1cdb5a08..fbab977c266 100644
--- a/samples/bluetooth/hci_spi/prj.conf
+++ b/samples/bluetooth/hci_spi/prj.conf
@@ -5,7 +5,6 @@ CONFIG_MAIN_STACK_SIZE=512
 CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 CONFIG_BT_MAX_CONN=16
-CONFIG_BT_SEND_ECC_EMULATION=n
 
 # Workaround: Unable to allocate command buffer when using K_NO_WAIT since
 # Host number of completed commands does not follow normal flow control.
diff --git a/samples/bluetooth/hci_uart/prj.conf b/samples/bluetooth/hci_uart/prj.conf
index 036a9748910..bb4a25b2886 100644
--- a/samples/bluetooth/hci_uart/prj.conf
+++ b/samples/bluetooth/hci_uart/prj.conf
@@ -13,7 +13,6 @@ CONFIG_BT_BUF_CMD_TX_SIZE=255
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=255
 CONFIG_BT_CTLR_ASSERT_HANDLER=y
 CONFIG_BT_MAX_CONN=16
-CONFIG_BT_SEND_ECC_EMULATION=n
 CONFIG_BT_CTLR_DTM_HCI=y
 
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
diff --git a/samples/bluetooth/hci_uart_3wire/prj.conf b/samples/bluetooth/hci_uart_3wire/prj.conf
index 670bcec3234..d9a03554f9f 100644
--- a/samples/bluetooth/hci_uart_3wire/prj.conf
+++ b/samples/bluetooth/hci_uart_3wire/prj.conf
@@ -12,7 +12,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=255
 CONFIG_BT_MAX_CONN=16
-CONFIG_BT_SEND_ECC_EMULATION=n
 CONFIG_BT_CTLR_DTM_HCI=y
 
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
diff --git a/samples/bluetooth/peripheral_sc_only/boards/tlsr9518adk80d.conf b/samples/bluetooth/peripheral_sc_only/boards/tlsr9518adk80d.conf
deleted file mode 100644
index ce0a87933b7..00000000000
--- a/samples/bluetooth/peripheral_sc_only/boards/tlsr9518adk80d.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright (c) 2022 Telink Semiconductor
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_BT_SEND_ECC_EMULATION=n
diff --git a/samples/bluetooth/peripheral_sc_only/prj.conf b/samples/bluetooth/peripheral_sc_only/prj.conf
index b8086b247fe..37276678c5e 100644
--- a/samples/bluetooth/peripheral_sc_only/prj.conf
+++ b/samples/bluetooth/peripheral_sc_only/prj.conf
@@ -7,6 +7,5 @@ CONFIG_LOG=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SMP_SC_ONLY=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_BT_MAX_PAIRED=2
 CONFIG_BT_DEVICE_NAME="SC only peripheral"
diff --git a/samples/bluetooth/tmap_bmr/boards/native_posix.conf b/samples/bluetooth/tmap_bmr/boards/native_posix.conf
index c951fcc8c33..8ab1d7be113 100644
--- a/samples/bluetooth/tmap_bmr/boards/native_posix.conf
+++ b/samples/bluetooth/tmap_bmr/boards/native_posix.conf
@@ -1,5 +1,4 @@
 CONFIG_LOG_MODE_IMMEDIATE=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 
 CONFIG_LIBLC3=y
 CONFIG_FPU=y
diff --git a/samples/bluetooth/tmap_bmr/boards/native_sim.conf b/samples/bluetooth/tmap_bmr/boards/native_sim.conf
index 8927008819a..87e355c8675 100644
--- a/samples/bluetooth/tmap_bmr/boards/native_sim.conf
+++ b/samples/bluetooth/tmap_bmr/boards/native_sim.conf
@@ -1,5 +1,4 @@
 CONFIG_LOG_MODE_IMMEDIATE=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 
 CONFIG_LIBLC3=y
 CONFIG_FPU=y
diff --git a/samples/bluetooth/tmap_bms/boards/native_posix.conf b/samples/bluetooth/tmap_bms/boards/native_posix.conf
index c951fcc8c33..8ab1d7be113 100644
--- a/samples/bluetooth/tmap_bms/boards/native_posix.conf
+++ b/samples/bluetooth/tmap_bms/boards/native_posix.conf
@@ -1,5 +1,4 @@
 CONFIG_LOG_MODE_IMMEDIATE=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 
 CONFIG_LIBLC3=y
 CONFIG_FPU=y
diff --git a/samples/bluetooth/tmap_bms/boards/native_sim.conf b/samples/bluetooth/tmap_bms/boards/native_sim.conf
index 8927008819a..87e355c8675 100644
--- a/samples/bluetooth/tmap_bms/boards/native_sim.conf
+++ b/samples/bluetooth/tmap_bms/boards/native_sim.conf
@@ -1,5 +1,4 @@
 CONFIG_LOG_MODE_IMMEDIATE=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 
 CONFIG_LIBLC3=y
 CONFIG_FPU=y
diff --git a/samples/bluetooth/tmap_central/boards/native_posix.conf b/samples/bluetooth/tmap_central/boards/native_posix.conf
index c951fcc8c33..8ab1d7be113 100644
--- a/samples/bluetooth/tmap_central/boards/native_posix.conf
+++ b/samples/bluetooth/tmap_central/boards/native_posix.conf
@@ -1,5 +1,4 @@
 CONFIG_LOG_MODE_IMMEDIATE=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 
 CONFIG_LIBLC3=y
 CONFIG_FPU=y
diff --git a/samples/bluetooth/tmap_central/boards/native_sim.conf b/samples/bluetooth/tmap_central/boards/native_sim.conf
index 8927008819a..87e355c8675 100644
--- a/samples/bluetooth/tmap_central/boards/native_sim.conf
+++ b/samples/bluetooth/tmap_central/boards/native_sim.conf
@@ -1,5 +1,4 @@
 CONFIG_LOG_MODE_IMMEDIATE=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 
 CONFIG_LIBLC3=y
 CONFIG_FPU=y
diff --git a/samples/bluetooth/tmap_peripheral/boards/native_posix.conf b/samples/bluetooth/tmap_peripheral/boards/native_posix.conf
index c951fcc8c33..8ab1d7be113 100644
--- a/samples/bluetooth/tmap_peripheral/boards/native_posix.conf
+++ b/samples/bluetooth/tmap_peripheral/boards/native_posix.conf
@@ -1,5 +1,4 @@
 CONFIG_LOG_MODE_IMMEDIATE=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 
 CONFIG_LIBLC3=y
 CONFIG_FPU=y
diff --git a/samples/bluetooth/tmap_peripheral/boards/native_sim.conf b/samples/bluetooth/tmap_peripheral/boards/native_sim.conf
index 8927008819a..87e355c8675 100644
--- a/samples/bluetooth/tmap_peripheral/boards/native_sim.conf
+++ b/samples/bluetooth/tmap_peripheral/boards/native_sim.conf
@@ -1,5 +1,4 @@
 CONFIG_LOG_MODE_IMMEDIATE=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 
 CONFIG_LIBLC3=y
 CONFIG_FPU=y
diff --git a/samples/boards/nordic/mesh/onoff-app/prj.conf b/samples/boards/nordic/mesh/onoff-app/prj.conf
index 4c651644564..0ad1ed47fd8 100644
--- a/samples/boards/nordic/mesh/onoff-app/prj.conf
+++ b/samples/boards/nordic/mesh/onoff-app/prj.conf
@@ -27,7 +27,6 @@ CONFIG_BT_CTLR_PRIVACY=n
 CONFIG_BT_PERIPHERAL=y
 
 CONFIG_BT=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_BT_L2CAP_TX_BUF_COUNT=8
 
 CONFIG_BT_MESH=y
diff --git a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
index b9ce470b9eb..9e1fb479875 100644
--- a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
+++ b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
@@ -22,7 +22,6 @@ CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_BT_RX_STACK_SIZE=4096
 CONFIG_BT_L2CAP_TX_BUF_COUNT=8
 
diff --git a/subsys/bluetooth/controller/hci/hci.c b/subsys/bluetooth/controller/hci/hci.c
index b952092c885..e553345f5ad 100644
--- a/subsys/bluetooth/controller/hci/hci.c
+++ b/subsys/bluetooth/controller/hci/hci.c
@@ -21,8 +21,6 @@
 #include <zephyr/bluetooth/hci_vs.h>
 #include <zephyr/bluetooth/buf.h>
 
-#include "../host/hci_ecc.h"
-
 #include "util/util.h"
 #include "util/memq.h"
 #include "util/mem.h"
@@ -1049,10 +1047,6 @@ static void read_supported_commands(struct net_buf *buf, struct net_buf **evt)
 	rp->commands[41] |= BIT(1);
 #endif /* CONFIG_BT_CTLR_SYNC_TRANSFER_RECEIVER */
 
-#if defined(CONFIG_BT_HCI_RAW) && defined(CONFIG_BT_SEND_ECC_EMULATION)
-	bt_hci_ecc_supported_commands(rp->commands);
-#endif /* CONFIG_BT_HCI_RAW && CONFIG_BT_SEND_ECC_EMULATION */
-
 	/* LE Read TX Power. */
 	rp->commands[38] |= BIT(7);
 
diff --git a/subsys/bluetooth/host/CMakeLists.txt b/subsys/bluetooth/host/CMakeLists.txt
index f92a1f1a7b9..0911c22c8f8 100644
--- a/subsys/bluetooth/host/CMakeLists.txt
+++ b/subsys/bluetooth/host/CMakeLists.txt
@@ -8,7 +8,6 @@ add_subdirectory_ifdef(CONFIG_BT_SHELL shell)
 
 zephyr_library_sources_ifdef(CONFIG_BT_HCI_RAW          hci_raw.c hci_common.c)
 zephyr_library_sources_ifdef(CONFIG_BT_MONITOR          monitor.c)
-zephyr_library_sources_ifdef(CONFIG_BT_SEND_ECC_EMULATION          hci_ecc.c)
 zephyr_library_sources_ifdef(CONFIG_BT_SETTINGS         settings.c)
 zephyr_library_sources_ifdef(CONFIG_BT_HOST_CCM         aes_ccm.c)
 zephyr_library_sources_ifdef(CONFIG_BT_LONG_WQ          long_wq.c)
diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index 4ed05bbda60..885f395dced 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -15,7 +15,7 @@ config BT_LONG_WQ_STACK_SIZE
 	# Hidden: Long workqueue stack size. Should be derived from system
 	# requirements.
 	int
-	default 1400 if BT_SEND_ECC_EMULATION
+	default 1400 if BT_ECC
 	default 1300 if BT_GATT_CACHING
 	default 1024
 
@@ -407,7 +407,7 @@ config BT_SMP
 	bool "Security Manager Protocol support"
 	select BT_CRYPTO
 	select BT_RPA
-	select BT_ECC
+	select BT_ECC if !BT_SMP_OOB_LEGACY_PAIR_ONLY
 	help
 	  This option enables support for the Security Manager Protocol
 	  (SMP), making it possible to pair devices over LE.
@@ -991,16 +991,9 @@ config BT_DF_VS_CONN_IQ_REPORT_16_BITS_IQ_SAMPLES
 	  format.
 
 endif # BT_DF
-endif # BT_HCI_HOST
 
 config BT_ECC
 	bool "ECDH key generation support"
-	default y if BT_SMP && !BT_SMP_OOB_LEGACY_PAIR_ONLY
-	help
-	  This option adds support for ECDH HCI commands.
-
-config BT_SEND_ECC_EMULATION
-	bool "Emulate ECDH in the Host using PSA Crypto API library"
 	select MBEDTLS if !BUILD_WITH_TFM
 	select MBEDTLS_PSA_CRYPTO_C if !BUILD_WITH_TFM
 	select PSA_WANT_ALG_ECDH
@@ -1008,19 +1001,11 @@ config BT_SEND_ECC_EMULATION
 	select PSA_WANT_ECC_SECP_R1_256
 	imply MBEDTLS_PSA_P256M_DRIVER_ENABLED if MBEDTLS_PSA_CRYPTO_C
 	select BT_LONG_WQ
-	depends on BT_ECC && (BT_HCI_RAW || BT_HCI_HOST)
-	default y if HAS_BT_CTLR && !BT_CTLR_ECDH
-	help
-	  If this option is set PSA Crypto API library is used for emulating the
-	  ECDH HCI commands and events needed by e.g. LE Secure Connections.
-	  In builds including the BLE Host, if not set the controller crypto is
-	  used for ECDH and if the controller doesn't support the required HCI
-	  commands the LE Secure Connections support will be disabled.
-	  In builds including the HCI Raw interface and the BLE Controller, this
-	  option injects support for the 2 HCI commands required for LE Secure
-	  Connections so that Hosts can make use of those. The option defaults
-	  to enabled for a combined build with Zephyr's own controller, since it
-	  does not have any special ECC support itself (at least not currently).
+	help
+	  If this option is set PSA Crypto API library is used for performing ECDH
+	  operations needed e.g. by LE Secure Connections.
+
+endif # BT_HCI_HOST
 
 config BT_HOST_CCM
 	bool "Host side AES-CCM module"
diff --git a/subsys/bluetooth/host/ecc.c b/subsys/bluetooth/host/ecc.c
index a77922d7a6b..d28133e8386 100644
--- a/subsys/bluetooth/host/ecc.c
+++ b/subsys/bluetooth/host/ecc.c
@@ -13,6 +13,7 @@
 
 #include <psa/crypto.h>
 
+#include "long_wq.h"
 #include "ecc.h"
 #include "hci_core.h"
 
@@ -24,6 +25,38 @@ static uint8_t pub_key[BT_PUB_KEY_LEN];
 static sys_slist_t pub_key_cb_slist;
 static bt_dh_key_cb_t dh_key_cb;
 
+static void generate_pub_key(struct k_work *work);
+static void generate_dh_key(struct k_work *work);
+K_WORK_DEFINE(pub_key_work, generate_pub_key);
+K_WORK_DEFINE(dh_key_work, generate_dh_key);
+
+enum {
+	PENDING_PUB_KEY,
+	PENDING_DHKEY,
+
+	/* Total number of flags - must be at the end of the enum */
+	NUM_FLAGS,
+};
+
+static ATOMIC_DEFINE(flags, NUM_FLAGS);
+
+static struct {
+	uint8_t private_key_be[BT_PRIV_KEY_LEN];
+
+	union {
+		uint8_t public_key_be[BT_PUB_KEY_LEN];
+		uint8_t dhkey_be[BT_DH_KEY_LEN];
+	};
+} ecc;
+
+/* based on Core Specification 4.2 Vol 3. Part H 2.3.5.6.1 */
+static const uint8_t debug_private_key_be[BT_PRIV_KEY_LEN] = {
+	0x3f, 0x49, 0xf6, 0xd4, 0xa3, 0xc5, 0x5f, 0x38,
+	0x74, 0xc9, 0xb3, 0xe3, 0xd2, 0x10, 0x3f, 0x50,
+	0x4a, 0xff, 0x60, 0x7b, 0xeb, 0x40, 0xb7, 0x99,
+	0x58, 0x99, 0xb8, 0xa6, 0xcd, 0x3c, 0x1a, 0xbd,
+};
+
 static const uint8_t debug_public_key[BT_PUB_KEY_LEN] = {
 	/* X */
 	0xe6, 0x9d, 0x35, 0x0e, 0x48, 0x01, 0x03, 0xcc,
@@ -71,23 +104,146 @@ bool bt_pub_key_is_valid(const uint8_t key[BT_PUB_KEY_LEN])
 	return false;
 }
 
-int bt_pub_key_gen(struct bt_pub_key_cb *new_cb)
+static void set_key_attributes(psa_key_attributes_t *attr)
+{
+	psa_set_key_type(attr, PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_SECP_R1));
+	psa_set_key_bits(attr, 256);
+	psa_set_key_usage_flags(attr, PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_DERIVE);
+	psa_set_key_algorithm(attr, PSA_ALG_ECDH);
+}
+
+static void generate_pub_key(struct k_work *work)
 {
+	psa_key_attributes_t attr = PSA_KEY_ATTRIBUTES_INIT;
 	struct bt_pub_key_cb *cb;
+	psa_key_id_t key_id;
+	uint8_t tmp_pub_key_buf[BT_PUB_KEY_LEN + 1];
+	size_t tmp_len;
+	int err;
+
+	set_key_attributes(&attr);
+
+	if (psa_generate_key(&attr, &key_id) != PSA_SUCCESS) {
+		LOG_ERR("Failed to generate ECC key");
+		err = BT_HCI_ERR_UNSPECIFIED;
+		goto done;
+	}
+
+	if (psa_export_public_key(key_id, tmp_pub_key_buf, sizeof(tmp_pub_key_buf),
+				  &tmp_len) != PSA_SUCCESS) {
+		LOG_ERR("Failed to export ECC public key");
+		err = BT_HCI_ERR_UNSPECIFIED;
+		goto done;
+	}
+	/* secp256r1 PSA exported public key has an extra 0x04 predefined byte at
+	 * the beginning of the buffer which is not part of the coordinate so
+	 * we remove that.
+	 */
+	memcpy(ecc.public_key_be, &tmp_pub_key_buf[1], BT_PUB_KEY_LEN);
+
+	if (psa_export_key(key_id, ecc.private_key_be, BT_PRIV_KEY_LEN,
+			&tmp_len) != PSA_SUCCESS) {
+		LOG_ERR("Failed to export ECC private key");
+		err = BT_HCI_ERR_UNSPECIFIED;
+		goto done;
+	}
+
+	if (psa_destroy_key(key_id) != PSA_SUCCESS) {
+		LOG_ERR("Failed to destroy ECC key ID");
+		err = BT_HCI_ERR_UNSPECIFIED;
+		goto done;
+	}
+
+	sys_memcpy_swap(pub_key, ecc.public_key_be, BT_PUB_KEY_COORD_LEN);
+	sys_memcpy_swap(&pub_key[BT_PUB_KEY_COORD_LEN],
+			&ecc.public_key_be[BT_PUB_KEY_COORD_LEN], BT_PUB_KEY_COORD_LEN);
+
+	atomic_set_bit(bt_dev.flags, BT_DEV_HAS_PUB_KEY);
+	err = 0;
+
+done:
+	atomic_clear_bit(flags, PENDING_PUB_KEY);
+
+	/* Change to cooperative priority while we do the callbacks */
+	k_sched_lock();
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&pub_key_cb_slist, cb, node) {
+		if (cb->func) {
+			cb->func(err ? NULL : pub_key);
+		}
+	}
+
+	sys_slist_init(&pub_key_cb_slist);
+
+	k_sched_unlock();
+}
+
+static void generate_dh_key(struct k_work *work)
+{
 	int err;
 
-	/*
-	 * We check for both "LE Read Local P-256 Public Key" and
-	 * "LE Generate DH Key" support here since both commands are needed for
-	 * ECC support. If "LE Generate DH Key" is not supported then there
-	 * is no point in reading local public key.
+	psa_key_attributes_t attr = PSA_KEY_ATTRIBUTES_INIT;
+	psa_key_id_t key_id;
+	/* PSA expects secp256r1 public key to start with a predefined 0x04 byte
+	 * at the beginning the buffer.
 	 */
-	if (!BT_CMD_TEST(bt_dev.supported_commands, 34, 1) ||
-	    !BT_CMD_TEST(bt_dev.supported_commands, 34, 2)) {
-		LOG_WRN("ECC HCI commands not available");
-		return -ENOTSUP;
+	uint8_t tmp_pub_key_buf[BT_PUB_KEY_LEN + 1] = { 0x04 };
+	size_t tmp_len;
+
+	set_key_attributes(&attr);
+
+	const uint8_t *priv_key = (IS_ENABLED(CONFIG_BT_USE_DEBUG_KEYS) ?
+				   debug_private_key_be :
+				   ecc.private_key_be);
+	if (psa_import_key(&attr, priv_key, BT_PRIV_KEY_LEN, &key_id) != PSA_SUCCESS) {
+		err = -EIO;
+		LOG_ERR("Failed to import the private key for key agreement");
+		goto exit;
+	}
+
+	memcpy(&tmp_pub_key_buf[1], ecc.public_key_be, BT_PUB_KEY_LEN);
+	if (psa_raw_key_agreement(PSA_ALG_ECDH, key_id, tmp_pub_key_buf,
+				  sizeof(tmp_pub_key_buf), ecc.dhkey_be, BT_DH_KEY_LEN,
+				  &tmp_len) != PSA_SUCCESS) {
+		err = -EIO;
+		LOG_ERR("Raw key agreement failed");
+		goto exit;
 	}
 
+	if (psa_destroy_key(key_id) != PSA_SUCCESS) {
+		LOG_ERR("Failed to destroy the key");
+		err = -EIO;
+	}
+
+	err = 0;
+
+exit:
+	/* Change to cooperative priority while we do the callback */
+	k_sched_lock();
+
+	if (dh_key_cb) {
+		bt_dh_key_cb_t cb = dh_key_cb;
+
+		dh_key_cb = NULL;
+		atomic_clear_bit(flags, PENDING_DHKEY);
+
+		if (err) {
+			cb(NULL);
+		} else {
+			uint8_t dhkey[BT_DH_KEY_LEN];
+
+			sys_memcpy_swap(dhkey, ecc.dhkey_be, sizeof(ecc.dhkey_be));
+			cb(dhkey);
+		}
+	}
+
+	k_sched_unlock();
+}
+
+int bt_pub_key_gen(struct bt_pub_key_cb *new_cb)
+{
+	struct bt_pub_key_cb *cb;
+
 	if (IS_ENABLED(CONFIG_BT_USE_DEBUG_KEYS)) {
 		if (!BT_CMD_TEST(bt_dev.supported_commands, 41, 2)) {
 			LOG_WRN("ECC Debug keys HCI command not available");
@@ -110,29 +266,20 @@ int bt_pub_key_gen(struct bt_pub_key_cb *new_cb)
 		}
 	}
 
+	if (atomic_test_bit(flags, PENDING_DHKEY)) {
+		LOG_WRN("Busy performing another ECDH operation");
+		return -EBUSY;
+	}
+
 	sys_slist_prepend(&pub_key_cb_slist, &new_cb->node);
 
-	if (atomic_test_and_set_bit(bt_dev.flags, BT_DEV_PUB_KEY_BUSY)) {
+	if (atomic_test_and_set_bit(flags, PENDING_PUB_KEY)) {
 		return 0;
 	}
 
 	atomic_clear_bit(bt_dev.flags, BT_DEV_HAS_PUB_KEY);
 
-	err = bt_hci_cmd_send_sync(BT_HCI_OP_LE_P256_PUBLIC_KEY, NULL, NULL);
-	if (err) {
-
-		LOG_ERR("Sending LE P256 Public Key command failed");
-		atomic_clear_bit(bt_dev.flags, BT_DEV_PUB_KEY_BUSY);
-
-		SYS_SLIST_FOR_EACH_CONTAINER(&pub_key_cb_slist, cb, node) {
-			if (cb->func) {
-				cb->func(NULL);
-			}
-		}
-
-		sys_slist_init(&pub_key_cb_slist);
-		return err;
-	}
+	bt_long_wq_submit(&pub_key_work);
 
 	return 0;
 }
@@ -141,7 +288,7 @@ void bt_pub_key_hci_disrupted(void)
 {
 	struct bt_pub_key_cb *cb;
 
-	atomic_clear_bit(bt_dev.flags, BT_DEV_PUB_KEY_BUSY);
+	atomic_clear_bit(flags, PENDING_PUB_KEY);
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&pub_key_cb_slist, cb, node) {
 		if (cb->func) {
@@ -166,109 +313,34 @@ const uint8_t *bt_pub_key_get(void)
 	return NULL;
 }
 
-static int hci_generate_dhkey_v1(const uint8_t *remote_pk)
-{
-	struct bt_hci_cp_le_generate_dhkey *cp;
-	struct net_buf *buf;
-
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_GENERATE_DHKEY, sizeof(*cp));
-	if (!buf) {
-		return -ENOBUFS;
-	}
-
-	cp = net_buf_add(buf, sizeof(*cp));
-	memcpy(cp->key, remote_pk, sizeof(cp->key));
-
-	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_GENERATE_DHKEY, buf, NULL);
-}
-
-static int hci_generate_dhkey_v2(const uint8_t *remote_pk, uint8_t key_type)
-{
-	struct bt_hci_cp_le_generate_dhkey_v2 *cp;
-	struct net_buf *buf;
-
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_GENERATE_DHKEY_V2, sizeof(*cp));
-	if (!buf) {
-		return -ENOBUFS;
-	}
-
-	cp = net_buf_add(buf, sizeof(*cp));
-	memcpy(cp->key, remote_pk, sizeof(cp->key));
-	cp->key_type = key_type;
-
-	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_GENERATE_DHKEY_V2, buf, NULL);
-}
-
 int bt_dh_key_gen(const uint8_t remote_pk[BT_PUB_KEY_LEN], bt_dh_key_cb_t cb)
 {
-	int err;
-
 	if (dh_key_cb == cb) {
 		return -EALREADY;
 	}
 
-	if (dh_key_cb || atomic_test_bit(bt_dev.flags, BT_DEV_PUB_KEY_BUSY)) {
-		return -EBUSY;
-	}
-
 	if (!atomic_test_bit(bt_dev.flags, BT_DEV_HAS_PUB_KEY)) {
 		return -EADDRNOTAVAIL;
 	}
 
-	dh_key_cb = cb;
-
-	if (IS_ENABLED(CONFIG_BT_USE_DEBUG_KEYS) &&
-	    BT_CMD_TEST(bt_dev.supported_commands, 41, 2)) {
-		err = hci_generate_dhkey_v2(remote_pk,
-					    BT_HCI_LE_KEY_TYPE_DEBUG);
-	} else {
-		err = hci_generate_dhkey_v1(remote_pk);
-	}
-
-	if (err) {
-		dh_key_cb = NULL;
-		LOG_WRN("Failed to generate DHKey (err %d)", err);
-		return err;
-	}
-
-	return 0;
-}
-
-void bt_hci_evt_le_pkey_complete(struct net_buf *buf)
-{
-	struct bt_hci_evt_le_p256_public_key_complete *evt = (void *)buf->data;
-	struct bt_pub_key_cb *cb;
-
-	LOG_DBG("status: 0x%02x %s", evt->status, bt_hci_err_to_str(evt->status));
-
-	atomic_clear_bit(bt_dev.flags, BT_DEV_PUB_KEY_BUSY);
-
-	if (!evt->status) {
-		memcpy(pub_key, evt->key, BT_PUB_KEY_LEN);
-		atomic_set_bit(bt_dev.flags, BT_DEV_HAS_PUB_KEY);
-	}
-
-	SYS_SLIST_FOR_EACH_CONTAINER(&pub_key_cb_slist, cb, node) {
-		if (cb->func) {
-			cb->func(evt->status ? NULL : pub_key);
-		}
+	if (dh_key_cb ||
+	    atomic_test_bit(flags, PENDING_PUB_KEY) ||
+	    atomic_test_and_set_bit(flags, PENDING_DHKEY)) {
+		return -EBUSY;
 	}
 
-	sys_slist_init(&pub_key_cb_slist);
-}
-
-void bt_hci_evt_le_dhkey_complete(struct net_buf *buf)
-{
-	struct bt_hci_evt_le_generate_dhkey_complete *evt = (void *)buf->data;
+	dh_key_cb = cb;
 
-	LOG_DBG("status: 0x%02x %s", evt->status, bt_hci_err_to_str(evt->status));
+	/* Convert X and Y coordinates from little-endian to
+	 * big-endian (expected by the crypto API).
+	 */
+	sys_memcpy_swap(ecc.public_key_be, remote_pk, BT_PUB_KEY_COORD_LEN);
+	sys_memcpy_swap(&ecc.public_key_be[BT_PUB_KEY_COORD_LEN],
+			&remote_pk[BT_PUB_KEY_COORD_LEN], BT_PUB_KEY_COORD_LEN);
 
-	if (dh_key_cb) {
-		bt_dh_key_cb_t cb = dh_key_cb;
+	bt_long_wq_submit(&dh_key_work);
 
-		dh_key_cb = NULL;
-		cb(evt->status ? NULL : evt->dhkey);
-	}
+	return 0;
 }
 
 #ifdef ZTEST_UNITTEST
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index f5aa584e4cd..4701a69b0d5 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -40,7 +40,6 @@
 #include "keys.h"
 #include "monitor.h"
 #include "hci_core.h"
-#include "hci_ecc.h"
 #include "ecc.h"
 #include "id.h"
 #include "adv.h"
@@ -2757,14 +2756,6 @@ static const struct event_handler meta_events[] = {
 	EVENT_HANDLER(BT_HCI_EVT_LE_LTK_REQUEST, le_ltk_request,
 		      sizeof(struct bt_hci_evt_le_ltk_request)),
 #endif /* CONFIG_BT_SMP */
-#if defined(CONFIG_BT_ECC)
-	EVENT_HANDLER(BT_HCI_EVT_LE_P256_PUBLIC_KEY_COMPLETE,
-		      bt_hci_evt_le_pkey_complete,
-		      sizeof(struct bt_hci_evt_le_p256_public_key_complete)),
-	EVENT_HANDLER(BT_HCI_EVT_LE_GENERATE_DHKEY_COMPLETE,
-		      bt_hci_evt_le_dhkey_complete,
-		      sizeof(struct bt_hci_evt_le_generate_dhkey_complete)),
-#endif /* CONFIG_BT_SMP */
 #if defined(CONFIG_BT_EXT_ADV)
 #if defined(CONFIG_BT_BROADCASTER)
 	EVENT_HANDLER(BT_HCI_EVT_LE_ADV_SET_TERMINATED, bt_hci_le_adv_set_terminated,
@@ -3209,15 +3200,7 @@ static void read_supported_commands_complete(struct net_buf *buf)
 
 	LOG_DBG("status 0x%02x %s", rp->status, bt_hci_err_to_str(rp->status));
 
-	memcpy(bt_dev.supported_commands, rp->commands,
-	       sizeof(bt_dev.supported_commands));
-
-	/* Report additional HCI commands used for ECDH as
-	 * supported if PSA Crypto API ECC is used for emulation.
-	 */
-	if (IS_ENABLED(CONFIG_BT_SEND_ECC_EMULATION)) {
-		bt_hci_ecc_supported_commands(bt_dev.supported_commands);
-	}
+	memcpy(bt_dev.supported_commands, rp->commands, sizeof(bt_dev.supported_commands));
 }
 
 static void read_local_features_complete(struct net_buf *buf)
@@ -3402,17 +3385,6 @@ static int le_set_event_mask(void)
 		mask |= BT_EVT_MASK_LE_LTK_REQUEST;
 	}
 
-	/*
-	 * If "LE Read Local P-256 Public Key" and "LE Generate DH Key" are
-	 * supported we need to enable events generated by those commands.
-	 */
-	if (IS_ENABLED(CONFIG_BT_ECC) &&
-	    (BT_CMD_TEST(bt_dev.supported_commands, 34, 1)) &&
-	    (BT_CMD_TEST(bt_dev.supported_commands, 34, 2))) {
-		mask |= BT_EVT_MASK_LE_P256_PUBLIC_KEY_COMPLETE;
-		mask |= BT_EVT_MASK_LE_GENERATE_DHKEY_COMPLETE;
-	}
-
 	/*
 	 * Enable CIS events only if ISO connections are enabled and controller
 	 * support them.
@@ -4059,10 +4031,6 @@ int bt_send(struct net_buf *buf)
 
 	bt_monitor_send(bt_monitor_opcode(buf), buf->data, buf->len);
 
-	if (IS_ENABLED(CONFIG_BT_SEND_ECC_EMULATION)) {
-		return bt_hci_ecc_send(buf);
-	}
-
 	return bt_hci_send(bt_dev.hci, buf);
 }
 
diff --git a/subsys/bluetooth/host/hci_core.h b/subsys/bluetooth/host/hci_core.h
index ac2bf9d2970..e501ae1d5fe 100644
--- a/subsys/bluetooth/host/hci_core.h
+++ b/subsys/bluetooth/host/hci_core.h
@@ -36,7 +36,6 @@ enum {
 	BT_DEV_READY,
 	BT_DEV_PRESET_ID,
 	BT_DEV_HAS_PUB_KEY,
-	BT_DEV_PUB_KEY_BUSY,
 
 	/** The application either explicitly or implicitly instructed the stack to scan
 	 * for advertisers.
@@ -509,10 +508,6 @@ void bt_hci_user_passkey_notify(struct net_buf *buf);
 void bt_hci_user_passkey_req(struct net_buf *buf);
 void bt_hci_auth_complete(struct net_buf *buf);
 
-/* ECC HCI event handlers */
-void bt_hci_evt_le_pkey_complete(struct net_buf *buf);
-void bt_hci_evt_le_dhkey_complete(struct net_buf *buf);
-
 /* Common HCI event handlers */
 void bt_hci_le_enh_conn_complete(struct bt_hci_evt_le_enh_conn_complete *evt);
 
diff --git a/subsys/bluetooth/host/hci_ecc.c b/subsys/bluetooth/host/hci_ecc.c
deleted file mode 100644
index de9440e2d5e..00000000000
--- a/subsys/bluetooth/host/hci_ecc.c
+++ /dev/null
@@ -1,390 +0,0 @@
-/**
- * @file hci_ecc.c
- * HCI ECC emulation
- */
-
-/*
- * Copyright (c) 2016 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/sys/atomic.h>
-#include <zephyr/debug/stack.h>
-#include <zephyr/sys/byteorder.h>
-
-#include <psa/crypto.h>
-
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/buf.h>
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/drivers/bluetooth.h>
-
-#include "common/bt_str.h"
-
-#include "hci_ecc.h"
-#include "ecc.h"
-
-#ifdef CONFIG_BT_HCI_RAW
-#include <zephyr/bluetooth/hci_raw.h>
-#include "hci_raw_internal.h"
-#else
-#include "hci_core.h"
-#endif
-#include "long_wq.h"
-
-#define LOG_LEVEL CONFIG_BT_HCI_CORE_LOG_LEVEL
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(bt_hci_ecc);
-
-static void ecc_process(struct k_work *work);
-K_WORK_DEFINE(ecc_work, ecc_process);
-
-/* based on Core Specification 4.2 Vol 3. Part H 2.3.5.6.1 */
-static const uint8_t debug_private_key_be[BT_PRIV_KEY_LEN] = {
-	0x3f, 0x49, 0xf6, 0xd4, 0xa3, 0xc5, 0x5f, 0x38,
-	0x74, 0xc9, 0xb3, 0xe3, 0xd2, 0x10, 0x3f, 0x50,
-	0x4a, 0xff, 0x60, 0x7b, 0xeb, 0x40, 0xb7, 0x99,
-	0x58, 0x99, 0xb8, 0xa6, 0xcd, 0x3c, 0x1a, 0xbd,
-};
-
-enum {
-	PENDING_PUB_KEY,
-	PENDING_DHKEY,
-
-	USE_DEBUG_KEY,
-
-	/* Total number of flags - must be at the end of the enum */
-	NUM_FLAGS,
-};
-
-static ATOMIC_DEFINE(flags, NUM_FLAGS);
-
-static struct {
-	uint8_t private_key_be[BT_PRIV_KEY_LEN];
-
-	union {
-		uint8_t public_key_be[BT_PUB_KEY_LEN];
-		uint8_t dhkey_be[BT_DH_KEY_LEN];
-	};
-} ecc;
-
-static void send_cmd_status(uint16_t opcode, uint8_t status)
-{
-	struct bt_hci_evt_cmd_status *evt;
-	struct bt_hci_evt_hdr *hdr;
-	struct net_buf *buf;
-
-	LOG_DBG("opcode %x status 0x%02x %s", opcode, status, bt_hci_err_to_str(status));
-
-	buf = bt_buf_get_evt(BT_HCI_EVT_CMD_STATUS, false, K_FOREVER);
-	bt_buf_set_type(buf, BT_BUF_EVT);
-
-	hdr = net_buf_add(buf, sizeof(*hdr));
-	hdr->evt = BT_HCI_EVT_CMD_STATUS;
-	hdr->len = sizeof(*evt);
-
-	evt = net_buf_add(buf, sizeof(*evt));
-	evt->ncmd = 1U;
-	evt->opcode = sys_cpu_to_le16(opcode);
-	evt->status = status;
-
-	bt_hci_recv(bt_dev.hci, buf);
-}
-
-static void set_key_attributes(psa_key_attributes_t *attr)
-{
-	psa_set_key_type(attr, PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_SECP_R1));
-	psa_set_key_bits(attr, 256);
-	psa_set_key_usage_flags(attr, PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_DERIVE);
-	psa_set_key_algorithm(attr, PSA_ALG_ECDH);
-}
-
-static uint8_t generate_keys(void)
-{
-	psa_key_attributes_t attr = PSA_KEY_ATTRIBUTES_INIT;
-	psa_key_id_t key_id;
-	uint8_t tmp_pub_key_buf[BT_PUB_KEY_LEN + 1];
-	size_t tmp_len;
-
-	set_key_attributes(&attr);
-
-	if (psa_generate_key(&attr, &key_id) != PSA_SUCCESS) {
-		LOG_ERR("Failed to generate ECC key");
-		return BT_HCI_ERR_UNSPECIFIED;
-	}
-
-	if (psa_export_public_key(key_id, tmp_pub_key_buf, sizeof(tmp_pub_key_buf),
-				&tmp_len) != PSA_SUCCESS) {
-		LOG_ERR("Failed to export ECC public key");
-		return BT_HCI_ERR_UNSPECIFIED;
-	}
-	/* secp256r1 PSA exported public key has an extra 0x04 predefined byte at
-	 * the beginning of the buffer which is not part of the coordinate so
-	 * we remove that.
-	 */
-	memcpy(ecc.public_key_be, &tmp_pub_key_buf[1], BT_PUB_KEY_LEN);
-
-	if (psa_export_key(key_id, ecc.private_key_be, BT_PRIV_KEY_LEN,
-			&tmp_len) != PSA_SUCCESS) {
-		LOG_ERR("Failed to export ECC private key");
-		return BT_HCI_ERR_UNSPECIFIED;
-	}
-
-	if (psa_destroy_key(key_id) != PSA_SUCCESS) {
-		LOG_ERR("Failed to destroy ECC key ID");
-		return BT_HCI_ERR_UNSPECIFIED;
-	}
-
-	return 0;
-}
-
-static void emulate_le_p256_public_key_cmd(void)
-{
-	struct bt_hci_evt_le_p256_public_key_complete *evt;
-	struct bt_hci_evt_le_meta_event *meta;
-	struct bt_hci_evt_hdr *hdr;
-	struct net_buf *buf;
-	uint8_t status;
-
-	LOG_DBG("");
-
-	status = generate_keys();
-
-	buf = bt_buf_get_rx(BT_BUF_EVT, K_FOREVER);
-
-	hdr = net_buf_add(buf, sizeof(*hdr));
-	hdr->evt = BT_HCI_EVT_LE_META_EVENT;
-	hdr->len = sizeof(*meta) + sizeof(*evt);
-
-	meta = net_buf_add(buf, sizeof(*meta));
-	meta->subevent = BT_HCI_EVT_LE_P256_PUBLIC_KEY_COMPLETE;
-
-	evt = net_buf_add(buf, sizeof(*evt));
-	evt->status = status;
-
-	if (status) {
-		(void)memset(evt->key, 0, sizeof(evt->key));
-	} else {
-		/* Convert X and Y coordinates from big-endian (provided
-		 * by crypto API) to little endian HCI.
-		 */
-		sys_memcpy_swap(evt->key, ecc.public_key_be, BT_PUB_KEY_COORD_LEN);
-		sys_memcpy_swap(&evt->key[BT_PUB_KEY_COORD_LEN],
-				&ecc.public_key_be[BT_PUB_KEY_COORD_LEN], BT_PUB_KEY_COORD_LEN);
-	}
-
-	atomic_clear_bit(flags, PENDING_PUB_KEY);
-
-	bt_hci_recv(bt_dev.hci, buf);
-}
-
-static void emulate_le_generate_dhkey(void)
-{
-	struct bt_hci_evt_le_generate_dhkey_complete *evt;
-	struct bt_hci_evt_le_meta_event *meta;
-	struct bt_hci_evt_hdr *hdr;
-	struct net_buf *buf;
-	int ret = 0;
-	bool use_debug = atomic_test_bit(flags, USE_DEBUG_KEY);
-
-	psa_key_attributes_t attr = PSA_KEY_ATTRIBUTES_INIT;
-	psa_key_id_t key_id;
-	/* PSA expects secp256r1 public key to start with a predefined 0x04 byte
-	 * at the beginning the buffer.
-	 */
-	uint8_t tmp_pub_key_buf[BT_PUB_KEY_LEN + 1] = { 0x04 };
-	size_t tmp_len;
-
-	set_key_attributes(&attr);
-
-	if (psa_import_key(&attr, use_debug ? debug_private_key_be : ecc.private_key_be,
-				BT_PRIV_KEY_LEN, &key_id) != PSA_SUCCESS) {
-		ret = -EIO;
-		LOG_ERR("Failed to import the private key for key agreement");
-		goto exit;
-	}
-
-	memcpy(&tmp_pub_key_buf[1], ecc.public_key_be, BT_PUB_KEY_LEN);
-	if (psa_raw_key_agreement(PSA_ALG_ECDH, key_id, tmp_pub_key_buf,
-				sizeof(tmp_pub_key_buf), ecc.dhkey_be, BT_DH_KEY_LEN,
-				&tmp_len) != PSA_SUCCESS) {
-		ret = -EIO;
-		LOG_ERR("Raw key agreement failed");
-		goto exit;
-	}
-
-	if (psa_destroy_key(key_id) != PSA_SUCCESS) {
-		LOG_ERR("Failed to destroy the key");
-		ret = -EIO;
-	}
-
-exit:
-	buf = bt_buf_get_rx(BT_BUF_EVT, K_FOREVER);
-
-	hdr = net_buf_add(buf, sizeof(*hdr));
-	hdr->evt = BT_HCI_EVT_LE_META_EVENT;
-	hdr->len = sizeof(*meta) + sizeof(*evt);
-
-	meta = net_buf_add(buf, sizeof(*meta));
-	meta->subevent = BT_HCI_EVT_LE_GENERATE_DHKEY_COMPLETE;
-
-	evt = net_buf_add(buf, sizeof(*evt));
-
-	if (ret != 0) {
-		evt->status = BT_HCI_ERR_UNSPECIFIED;
-		(void)memset(evt->dhkey, 0xff, sizeof(evt->dhkey));
-	} else {
-		evt->status = 0U;
-		/* Convert from big-endian (provided by crypto API) to
-		 * little-endian HCI.
-		 */
-		sys_memcpy_swap(evt->dhkey, ecc.dhkey_be, sizeof(ecc.dhkey_be));
-	}
-
-	atomic_clear_bit(flags, PENDING_DHKEY);
-
-	bt_hci_recv(bt_dev.hci, buf);
-}
-
-static void ecc_process(struct k_work *work)
-{
-	if (atomic_test_bit(flags, PENDING_PUB_KEY)) {
-		emulate_le_p256_public_key_cmd();
-	} else if (atomic_test_bit(flags, PENDING_DHKEY)) {
-		emulate_le_generate_dhkey();
-	} else {
-		__ASSERT(0, "Unhandled ECC command");
-	}
-}
-
-static void clear_ecc_events(struct net_buf *buf)
-{
-	struct bt_hci_cp_le_set_event_mask *cmd;
-
-	cmd = (void *)(buf->data + sizeof(struct bt_hci_cmd_hdr));
-
-	/*
-	 * don't enable controller ECC events as those will be generated from
-	 * emulation code
-	 */
-	cmd->events[0] &= ~0x80; /* LE Read Local P-256 PKey Compl */
-	cmd->events[1] &= ~0x01; /* LE Generate DHKey Compl Event */
-}
-
-static uint8_t le_gen_dhkey(uint8_t *key, uint8_t key_type)
-{
-	if (atomic_test_bit(flags, PENDING_PUB_KEY)) {
-		return BT_HCI_ERR_CMD_DISALLOWED;
-	}
-
-	if (key_type > BT_HCI_LE_KEY_TYPE_DEBUG) {
-		return BT_HCI_ERR_INVALID_PARAM;
-	}
-
-	if (atomic_test_and_set_bit(flags, PENDING_DHKEY)) {
-		return BT_HCI_ERR_CMD_DISALLOWED;
-	}
-
-	/* Convert X and Y coordinates from little-endian HCI to
-	 * big-endian (expected by the crypto API).
-	 */
-	sys_memcpy_swap(ecc.public_key_be, key, BT_PUB_KEY_COORD_LEN);
-	sys_memcpy_swap(&ecc.public_key_be[BT_PUB_KEY_COORD_LEN], &key[BT_PUB_KEY_COORD_LEN],
-			BT_PUB_KEY_COORD_LEN);
-
-	atomic_set_bit_to(flags, USE_DEBUG_KEY,
-			  key_type == BT_HCI_LE_KEY_TYPE_DEBUG);
-
-	bt_long_wq_submit(&ecc_work);
-
-	return BT_HCI_ERR_SUCCESS;
-}
-
-static void le_gen_dhkey_v1(struct net_buf *buf)
-{
-	struct bt_hci_cp_le_generate_dhkey *cmd;
-	uint8_t status;
-
-	cmd = (void *)buf->data;
-	status = le_gen_dhkey(cmd->key, BT_HCI_LE_KEY_TYPE_GENERATED);
-
-	net_buf_unref(buf);
-	send_cmd_status(BT_HCI_OP_LE_GENERATE_DHKEY, status);
-}
-
-static void le_gen_dhkey_v2(struct net_buf *buf)
-{
-	struct bt_hci_cp_le_generate_dhkey_v2 *cmd;
-	uint8_t status;
-
-	cmd = (void *)buf->data;
-	status = le_gen_dhkey(cmd->key, cmd->key_type);
-
-	net_buf_unref(buf);
-	send_cmd_status(BT_HCI_OP_LE_GENERATE_DHKEY_V2, status);
-}
-
-static void le_p256_pub_key(struct net_buf *buf)
-{
-	uint8_t status;
-
-	net_buf_unref(buf);
-
-	if (atomic_test_bit(flags, PENDING_DHKEY)) {
-		status = BT_HCI_ERR_CMD_DISALLOWED;
-	} else if (atomic_test_and_set_bit(flags, PENDING_PUB_KEY)) {
-		status = BT_HCI_ERR_CMD_DISALLOWED;
-	} else {
-		bt_long_wq_submit(&ecc_work);
-		status = BT_HCI_ERR_SUCCESS;
-	}
-
-	send_cmd_status(BT_HCI_OP_LE_P256_PUBLIC_KEY, status);
-}
-
-int bt_hci_ecc_send(struct net_buf *buf)
-{
-	if (bt_buf_get_type(buf) == BT_BUF_CMD) {
-		struct bt_hci_cmd_hdr *chdr = (void *)buf->data;
-
-		switch (sys_le16_to_cpu(chdr->opcode)) {
-		case BT_HCI_OP_LE_P256_PUBLIC_KEY:
-			net_buf_pull(buf, sizeof(*chdr));
-			le_p256_pub_key(buf);
-			return 0;
-		case BT_HCI_OP_LE_GENERATE_DHKEY:
-			net_buf_pull(buf, sizeof(*chdr));
-			le_gen_dhkey_v1(buf);
-			return 0;
-		case BT_HCI_OP_LE_GENERATE_DHKEY_V2:
-			net_buf_pull(buf, sizeof(*chdr));
-			le_gen_dhkey_v2(buf);
-			return 0;
-		case BT_HCI_OP_LE_SET_EVENT_MASK:
-			clear_ecc_events(buf);
-			break;
-		default:
-			break;
-		}
-	}
-
-	return bt_hci_send(bt_dev.hci, buf);
-}
-
-void bt_hci_ecc_supported_commands(uint8_t *supported_commands)
-{
-	/* LE Read Local P-256 Public Key */
-	supported_commands[34] |= BIT(1);
-	/* LE Generate DH Key v1 */
-	supported_commands[34] |= BIT(2);
-	/* LE Generate DH Key v2 */
-	supported_commands[41] |= BIT(2);
-}
-
-int default_CSPRNG(uint8_t *dst, unsigned int len)
-{
-	return !bt_rand(dst, len);
-}
diff --git a/subsys/bluetooth/host/hci_ecc.h b/subsys/bluetooth/host/hci_ecc.h
deleted file mode 100644
index e22593c832a..00000000000
--- a/subsys/bluetooth/host/hci_ecc.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* hci_ecc.h - HCI ECC emulation */
-
-/*
- * Copyright (c) 2016 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-int bt_hci_ecc_send(struct net_buf *buf);
-void bt_hci_ecc_supported_commands(uint8_t *supported_commands);
diff --git a/subsys/bluetooth/host/hci_raw.c b/subsys/bluetooth/host/hci_raw.c
index 1580fea5ba5..3e913151156 100644
--- a/subsys/bluetooth/host/hci_raw.c
+++ b/subsys/bluetooth/host/hci_raw.c
@@ -19,7 +19,6 @@
 
 #include <zephyr/bluetooth/hci.h>
 
-#include "hci_ecc.h"
 #include "monitor.h"
 #include "hci_raw_internal.h"
 
@@ -313,10 +312,6 @@ int bt_send(struct net_buf *buf)
 		}
 	}
 
-	if (IS_ENABLED(CONFIG_BT_SEND_ECC_EMULATION)) {
-		return bt_hci_ecc_send(buf);
-	}
-
 	return bt_hci_send(bt_dev.hci, buf);
 }
 
diff --git a/subsys/bluetooth/host/smp.c b/subsys/bluetooth/host/smp.c
index cce63f7d1a2..db936b28fdf 100644
--- a/subsys/bluetooth/host/smp.c
+++ b/subsys/bluetooth/host/smp.c
@@ -298,17 +298,11 @@ static K_SEM_DEFINE(sc_local_pkey_ready, 0, 1);
 
 static bool le_sc_supported(void)
 {
-	/*
-	 * If controller based ECC is to be used it must support
-	 * "LE Read Local P-256 Public Key" and "LE Generate DH Key" commands.
-	 * Otherwise LE SC are not supported.
-	 */
 	if (IS_ENABLED(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)) {
 		return false;
 	}
 
-	return BT_CMD_TEST(bt_dev.supported_commands, 34, 1) &&
-	       BT_CMD_TEST(bt_dev.supported_commands, 34, 2);
+	return IS_ENABLED(CONFIG_BT_ECC);
 }
 
 static const struct bt_conn_auth_cb *latch_auth_cb(struct bt_smp *smp)
diff --git a/tests/bluetooth/init/prj_10.conf b/tests/bluetooth/init/prj_10.conf
index 317857577d7..81503cadb9a 100644
--- a/tests/bluetooth/init/prj_10.conf
+++ b/tests/bluetooth/init/prj_10.conf
@@ -4,6 +4,5 @@ CONFIG_BT_CENTRAL=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SIGNING=y
 CONFIG_BT_SMP_SC_ONLY=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_BT_USE_DEBUG_KEYS=y
 CONFIG_ZTEST=y
diff --git a/tests/bluetooth/init/prj_11.conf b/tests/bluetooth/init/prj_11.conf
index d0523c0fda2..a5492c5c1eb 100644
--- a/tests/bluetooth/init/prj_11.conf
+++ b/tests/bluetooth/init/prj_11.conf
@@ -4,7 +4,6 @@ CONFIG_BT_CENTRAL=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SIGNING=y
 CONFIG_BT_SMP_SC_ONLY=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_BT_USE_DEBUG_KEYS=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BT_GATT_CLIENT=y
diff --git a/tests/bluetooth/init/prj_12.conf b/tests/bluetooth/init/prj_12.conf
index 2fb4de6e9b3..16fc86e8f82 100644
--- a/tests/bluetooth/init/prj_12.conf
+++ b/tests/bluetooth/init/prj_12.conf
@@ -3,7 +3,6 @@ CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SIGNING=y
 CONFIG_BT_SMP_SC_ONLY=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_BT_USE_DEBUG_KEYS=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BT_GATT_CLIENT=y
diff --git a/tests/bluetooth/init/prj_13.conf b/tests/bluetooth/init/prj_13.conf
index 79b995a6b46..aa8cc122083 100644
--- a/tests/bluetooth/init/prj_13.conf
+++ b/tests/bluetooth/init/prj_13.conf
@@ -3,7 +3,6 @@ CONFIG_BT_CENTRAL=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SIGNING=y
 CONFIG_BT_SMP_SC_ONLY=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_BT_USE_DEBUG_KEYS=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BT_GATT_CLIENT=y
diff --git a/tests/bluetooth/init/prj_14.conf b/tests/bluetooth/init/prj_14.conf
index d030c856e26..93423f64742 100644
--- a/tests/bluetooth/init/prj_14.conf
+++ b/tests/bluetooth/init/prj_14.conf
@@ -3,5 +3,4 @@ CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SIGNING=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_ZTEST=y
diff --git a/tests/bluetooth/init/prj_15.conf b/tests/bluetooth/init/prj_15.conf
index 296cfb0dbe3..6dfcf4d7f59 100644
--- a/tests/bluetooth/init/prj_15.conf
+++ b/tests/bluetooth/init/prj_15.conf
@@ -3,5 +3,4 @@ CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SMP_SC_ONLY=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_ZTEST=y
diff --git a/tests/bluetooth/init/prj_17.conf b/tests/bluetooth/init/prj_17.conf
index 7cd0ea16996..5e504b9ead1 100644
--- a/tests/bluetooth/init/prj_17.conf
+++ b/tests/bluetooth/init/prj_17.conf
@@ -4,7 +4,6 @@ CONFIG_BT_CENTRAL=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SIGNING=y
 CONFIG_BT_SMP_SC_ONLY=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_BT_USE_DEBUG_KEYS=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BT_GATT_CLIENT=y
diff --git a/tests/bluetooth/init/prj_20.conf b/tests/bluetooth/init/prj_20.conf
index 6df91453eb6..4b80a6b4427 100644
--- a/tests/bluetooth/init/prj_20.conf
+++ b/tests/bluetooth/init/prj_20.conf
@@ -4,7 +4,6 @@ CONFIG_BT_CENTRAL=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SIGNING=y
 CONFIG_BT_SMP_SC_ONLY=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_BT_USE_DEBUG_KEYS=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BT_GATT_CLIENT=y
diff --git a/tests/bluetooth/init/prj_21.conf b/tests/bluetooth/init/prj_21.conf
index c930cc02c74..49c4c6eb452 100644
--- a/tests/bluetooth/init/prj_21.conf
+++ b/tests/bluetooth/init/prj_21.conf
@@ -4,7 +4,6 @@ CONFIG_BT_CENTRAL=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SIGNING=y
 CONFIG_BT_SMP_SC_ONLY=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_BT_USE_DEBUG_KEYS=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BT_GATT_CLIENT=y
diff --git a/tests/bluetooth/init/prj_9.conf b/tests/bluetooth/init/prj_9.conf
index 5e07e0f9479..2fdd7773009 100644
--- a/tests/bluetooth/init/prj_9.conf
+++ b/tests/bluetooth/init/prj_9.conf
@@ -4,5 +4,4 @@ CONFIG_BT_CENTRAL=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SIGNING=y
 CONFIG_BT_SMP_SC_ONLY=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_ZTEST=y
diff --git a/tests/bluetooth/init/prj_ctlr.conf b/tests/bluetooth/init/prj_ctlr.conf
index 8062b929965..b311a76b1cd 100644
--- a/tests/bluetooth/init/prj_ctlr.conf
+++ b/tests/bluetooth/init/prj_ctlr.conf
@@ -5,7 +5,6 @@ CONFIG_BT_CENTRAL=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SIGNING=y
 CONFIG_BT_SMP_SC_ONLY=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_CLASSIC=n
diff --git a/tests/bluetooth/init/prj_ctlr_5_x_dbg.conf b/tests/bluetooth/init/prj_ctlr_5_x_dbg.conf
index 90a7fbcd19d..828b486b88f 100644
--- a/tests/bluetooth/init/prj_ctlr_5_x_dbg.conf
+++ b/tests/bluetooth/init/prj_ctlr_5_x_dbg.conf
@@ -57,7 +57,6 @@ CONFIG_BT_ISO_PERIPHERAL=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SIGNING=y
 CONFIG_BT_SMP_SC_ONLY=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_BT_USE_DEBUG_KEYS=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BT_GATT_CLIENT=y
diff --git a/tests/bluetooth/init/prj_ctlr_dbg.conf b/tests/bluetooth/init/prj_ctlr_dbg.conf
index bd88daf7fd3..cc6f478b66b 100644
--- a/tests/bluetooth/init/prj_ctlr_dbg.conf
+++ b/tests/bluetooth/init/prj_ctlr_dbg.conf
@@ -40,7 +40,6 @@ CONFIG_BT_CENTRAL=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SIGNING=y
 CONFIG_BT_SMP_SC_ONLY=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_BT_USE_DEBUG_KEYS=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BT_GATT_CLIENT=y
diff --git a/tests/bluetooth/init/prj_ctlr_ticker.conf b/tests/bluetooth/init/prj_ctlr_ticker.conf
index 6dcbf95c76f..ac15e8662a6 100644
--- a/tests/bluetooth/init/prj_ctlr_ticker.conf
+++ b/tests/bluetooth/init/prj_ctlr_ticker.conf
@@ -39,7 +39,6 @@ CONFIG_BT_CENTRAL=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SIGNING=y
 CONFIG_BT_SMP_SC_ONLY=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_BT_USE_DEBUG_KEYS=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BT_GATT_CLIENT=y
diff --git a/tests/bluetooth/init/prj_ctlr_tiny.conf b/tests/bluetooth/init/prj_ctlr_tiny.conf
index 5bc0aa5a6b4..e3413d68e98 100644
--- a/tests/bluetooth/init/prj_ctlr_tiny.conf
+++ b/tests/bluetooth/init/prj_ctlr_tiny.conf
@@ -33,7 +33,6 @@ CONFIG_BT_CENTRAL=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SIGNING=y
 CONFIG_BT_SMP_SC_ONLY=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_CLASSIC=n
diff --git a/tests/bluetooth/init/prj_llcp.conf b/tests/bluetooth/init/prj_llcp.conf
index 8542a4e2f20..2bbcfb83834 100644
--- a/tests/bluetooth/init/prj_llcp.conf
+++ b/tests/bluetooth/init/prj_llcp.conf
@@ -5,7 +5,6 @@ CONFIG_BT_CENTRAL=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SIGNING=y
 CONFIG_BT_SMP_SC_ONLY=y
-CONFIG_BT_SEND_ECC_EMULATION=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_CLASSIC=n
diff --git a/tests/bluetooth/shell/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/tests/bluetooth/shell/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
index 4658bfcca48..488baa3f036 100644
--- a/tests/bluetooth/shell/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
+++ b/tests/bluetooth/shell/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -7,6 +7,3 @@ CONFIG_RING_BUFFER=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_AUDIO=y
 CONFIG_USB_DEVICE_PRODUCT="Zephyr Shell USB"
-
-# Enable encryption in the host
-CONFIG_BT_SEND_ECC_EMULATION=y
diff --git a/tests/bluetooth/shell/boards/nrf5340dk_nrf5340_cpuapp.conf b/tests/bluetooth/shell/boards/nrf5340dk_nrf5340_cpuapp.conf
index 4658bfcca48..488baa3f036 100644
--- a/tests/bluetooth/shell/boards/nrf5340dk_nrf5340_cpuapp.conf
+++ b/tests/bluetooth/shell/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -7,6 +7,3 @@ CONFIG_RING_BUFFER=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_AUDIO=y
 CONFIG_USB_DEVICE_PRODUCT="Zephyr Shell USB"
-
-# Enable encryption in the host
-CONFIG_BT_SEND_ECC_EMULATION=y
diff --git a/tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
index 3f605b57919..5bb1c4d8284 100644
--- a/tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
+++ b/tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -22,5 +22,3 @@ CONFIG_LOG_DEFAULT_LEVEL=3
 CONFIG_BTTESTER_LOG_LEVEL_DBG=y
 
 CONFIG_UART_INTERRUPT_DRIVEN=y
-
-CONFIG_BT_SEND_ECC_EMULATION=y
diff --git a/tests/bluetooth/tester/boards/nrf5340dk_nrf5340_cpuapp.conf b/tests/bluetooth/tester/boards/nrf5340dk_nrf5340_cpuapp.conf
index 3f605b57919..5bb1c4d8284 100644
--- a/tests/bluetooth/tester/boards/nrf5340dk_nrf5340_cpuapp.conf
+++ b/tests/bluetooth/tester/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -22,5 +22,3 @@ CONFIG_LOG_DEFAULT_LEVEL=3
 CONFIG_BTTESTER_LOG_LEVEL_DBG=y
 
 CONFIG_UART_INTERRUPT_DRIVEN=y
-
-CONFIG_BT_SEND_ECC_EMULATION=y
diff --git a/tests/bsim/bluetooth/audio/prj.conf b/tests/bsim/bluetooth/audio/prj.conf
index fad001802e4..034f3ac0735 100644
--- a/tests/bsim/bluetooth/audio/prj.conf
+++ b/tests/bsim/bluetooth/audio/prj.conf
@@ -29,7 +29,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_CMD_TX_SIZE=255
-CONFIG_BT_SEND_ECC_EMULATION=y
 
 CONFIG_BT_AUDIO=y
 CONFIG_BT_BAP_UNICAST_SERVER=y
diff --git a/tests/bsim/bluetooth/audio_samples/bap_unicast_client/boards/nrf5340bsim_nrf5340_cpuapp.conf b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/boards/nrf5340bsim_nrf5340_cpuapp.conf
index 6bf3108da1b..7b48d3d1a6c 100644
--- a/tests/bsim/bluetooth/audio_samples/bap_unicast_client/boards/nrf5340bsim_nrf5340_cpuapp.conf
+++ b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/boards/nrf5340bsim_nrf5340_cpuapp.conf
@@ -8,5 +8,3 @@ CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
-
-CONFIG_BT_SEND_ECC_EMULATION=y
diff --git a/tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_dut_llcp.conf b/tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_dut_llcp.conf
index 981986ebd2c..816319d5016 100644
--- a/tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_dut_llcp.conf
+++ b/tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_dut_llcp.conf
@@ -7,7 +7,6 @@ CONFIG_BT_BROADCASTER=y
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_OBSERVER=y
 CONFIG_LOG=y
-CONFIG_BT_ECC=y
 
 # BUF_CMD_TX_SIZE must be 255 because of HCI/GEV/BV-01-C
 CONFIG_BT_BUF_ACL_RX_SIZE=60
diff --git a/tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_tst_llcp.conf b/tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_tst_llcp.conf
index b1eb9a86f93..306e1e50e83 100644
--- a/tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_tst_llcp.conf
+++ b/tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_tst_llcp.conf
@@ -5,7 +5,6 @@ CONFIG_BT_HCI_RAW=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_CENTRAL=y
 CONFIG_LOG=y
-CONFIG_BT_ECC=y
 
 # BUF_CMD_TX_SIZE must be 255 because of HCI/GEV/BV-01-C
 CONFIG_BT_BUF_ACL_RX_SIZE=60

From 09ec2518e536c0f12ebc282498fd8c6bb629ba55 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@silabs.com>
Date: Tue, 21 Jan 2025 10:36:20 +0200
Subject: [PATCH 2259/2913] [nrf fromtree] Bluetooth: Host: Remove prompt from
 BT_ECC

This option only exposes internal APIs, so there should be no need to allow
applications to set an explicit value. Instead, users of the API should
select it through Kconfig.

Signed-off-by: Johan Hedberg <johan.hedberg@silabs.com>
(cherry picked from commit d3c8cb4b7918fa3683a426350ba3886bc4924d86)
---
 subsys/bluetooth/host/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index 885f395dced..122ceb2170d 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -993,7 +993,7 @@ config BT_DF_VS_CONN_IQ_REPORT_16_BITS_IQ_SAMPLES
 endif # BT_DF
 
 config BT_ECC
-	bool "ECDH key generation support"
+	bool
 	select MBEDTLS if !BUILD_WITH_TFM
 	select MBEDTLS_PSA_CRYPTO_C if !BUILD_WITH_TFM
 	select PSA_WANT_ALG_ECDH
@@ -1002,8 +1002,8 @@ config BT_ECC
 	imply MBEDTLS_PSA_P256M_DRIVER_ENABLED if MBEDTLS_PSA_CRYPTO_C
 	select BT_LONG_WQ
 	help
-	  If this option is set PSA Crypto API library is used for performing ECDH
-	  operations needed e.g. by LE Secure Connections.
+	  If this option is set, internal APIs will be available to perform ECDH operations
+	  through the long work queue. operations needed e.g. by LE Secure Connections.
 
 endif # BT_HCI_HOST
 

From f7d21e245262e8a29b5efe853796975162aa6539 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@silabs.com>
Date: Tue, 21 Jan 2025 10:40:30 +0200
Subject: [PATCH 2260/2913] [nrf fromtree] doc: release: Add notes for
 Bluetooth ECDH changes

Mention the removed prompt for BT_ECC in the migration guide, and also add
a note about the removed HCI emulation layer to the release notes.

Signed-off-by: Johan Hedberg <johan.hedberg@silabs.com>
(cherry picked from commit b3c6151679cfe333625198d465ad4e5952d53b81)
---
 doc/releases/migration-guide-4.1.rst | 3 +++
 doc/releases/release-notes-4.1.rst   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/doc/releases/migration-guide-4.1.rst b/doc/releases/migration-guide-4.1.rst
index 271bb01d6be..b5a5c6a58cb 100644
--- a/doc/releases/migration-guide-4.1.rst
+++ b/doc/releases/migration-guide-4.1.rst
@@ -344,6 +344,9 @@ Bluetooth Host
   makes a device vulnerable for downgrade attacks. If an application still needs to use LE legacy
   pairing, it should disable :kconfig:option:`CONFIG_BT_SMP_SC_PAIR_ONLY` manually.
 
+* The prompt for :kconfig:option:`CONFIG_BT_ECC` has been removed, since it only offers an internal
+  API, meaning internal users should explicitly select it in their respective Kconfig options.
+
 Bluetooth Crypto
 ================
 
diff --git a/doc/releases/release-notes-4.1.rst b/doc/releases/release-notes-4.1.rst
index b89e86be51f..98ac6c4bd8b 100644
--- a/doc/releases/release-notes-4.1.rst
+++ b/doc/releases/release-notes-4.1.rst
@@ -96,6 +96,9 @@ Bluetooth
   * :kconfig:option:`CONFIG_BT_BUF_ACL_RX_COUNT` has been deprecated and
     :kconfig:option:`CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA` has been added.
 
+  * The ECDH HCI command/event emulation layer has been removed, meaning the host will now always
+    do direct calls to PSA to perform these operations.
+
 * HCI Drivers
 
 * Mesh

From ad276b1a6317454093b32e7a57ab60ca03d07ce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Mon, 20 Jan 2025 11:52:42 +0100
Subject: [PATCH 2261/2913] [nrf fromtree] modules: openthread: ble: Update
 after BT_LE_ADV_CONN got deprecated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a follow-up to commit 8cfad44852845cd30336d40f61dade69ab4357db.

Replace the deprecated BT_LE_ADV_CONN macro with BT_LE_ADV_CONN_FAST_2.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit f930739acf8586e9e27ebf20bbe4df6189d348d3)
---
 modules/openthread/platform/ble.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openthread/platform/ble.c b/modules/openthread/platform/ble.c
index 69c1698bcf5..b3d841d46d5 100644
--- a/modules/openthread/platform/ble.c
+++ b/modules/openthread/platform/ble.c
@@ -438,7 +438,7 @@ otError otPlatBleGapAdvStart(otInstance *aInstance, uint16_t aInterval)
 	ARG_UNUSED(aInstance);
 	ARG_UNUSED(aInterval);
 
-	int err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), sd, ARRAY_SIZE(sd));
+	int err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_2, ad, ARRAY_SIZE(ad), sd, ARRAY_SIZE(sd));
 
 	if (err != 0 && err != -EALREADY) {
 		LOG_WRN("Advertising failed to start (err %d)", err);

From ff477dbf181393f089222d1c58be088d064d9c1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Thu, 23 Jan 2025 12:21:58 +0100
Subject: [PATCH 2262/2913] [nrf fromtree] audio: liblc3: Fix global include
 path issue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-liblc3 added a library-internal path to zephyr_interface containing
 a file that collides with common.h required e.g. by Mbed TLS
 This commit fixes build-issues by making this include-folder
 PRIVATE to the named library liblc3

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit 2ca64a3449c3e4b6fd457a0e15c8f3a1af5de337)
---
 modules/liblc3/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/liblc3/CMakeLists.txt b/modules/liblc3/CMakeLists.txt
index 2499445c3c6..275d11cb878 100644
--- a/modules/liblc3/CMakeLists.txt
+++ b/modules/liblc3/CMakeLists.txt
@@ -20,6 +20,9 @@ endif()
 
 zephyr_include_directories(
 	${ZEPHYR_LIBLC3_MODULE_DIR}/include
+)
+
+zephyr_library_include_directories(
 	${ZEPHYR_LIBLC3_MODULE_DIR}/src
 )
 

From 22a3a6418baeece4d0374bb8dfc439e3bd38bd5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Thu, 23 Jan 2025 15:59:52 +0100
Subject: [PATCH 2263/2913] [nrf fromtree] mesh: Fix common.h issue in
 onoff_level_lighting_vnd_app
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-Mbed TLS requires common.h to build. The sample provides common.h
 in sample folder level but included the path to zephyr_interface.
 This commit changes the include to be sample-specific

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit 627d2f971db7a7e09be63518e43dd74a0b4e4f2f)
---
 .../nordic/mesh/onoff_level_lighting_vnd_app/CMakeLists.txt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/CMakeLists.txt b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/CMakeLists.txt
index cbcb8a11d1a..67a278e537f 100644
--- a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/CMakeLists.txt
+++ b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/CMakeLists.txt
@@ -18,7 +18,7 @@ target_sources(app PRIVATE
 	       src/mesh/transition.c
 	       )
 
-zephyr_include_directories(
+target_include_directories(app PRIVATE
 	src/
 	src/mesh
 )

From 888e270305e2f5a36f794ad0453302fc55bc15b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Thu, 23 Jan 2025 17:59:26 +0100
Subject: [PATCH 2264/2913] [nrf fromtree] secure storage: Add missing include
 for mbedtls_platform_zeroize
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-Adding explicit include for mbedtls/platform_util.h to get acces
 to mbedtls_platform_zeroize in ITS. Somehow not visibile in Zephyr but
 it caused build issues in nRF Connect SDK.

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit 202c2c41ab90ab961c60f39bde68aa36bf12f562)
---
 subsys/secure_storage/src/its/transform/aead.c     | 1 +
 subsys/secure_storage/src/its/transform/aead_get.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/subsys/secure_storage/src/its/transform/aead.c b/subsys/secure_storage/src/its/transform/aead.c
index e9f2d57d73a..a2a97705137 100644
--- a/subsys/secure_storage/src/its/transform/aead.c
+++ b/subsys/secure_storage/src/its/transform/aead.c
@@ -5,6 +5,7 @@
 #include <zephyr/secure_storage/its/transform.h>
 #include <zephyr/secure_storage/its/transform/aead_get.h>
 #include <zephyr/sys/__assert.h>
+#include <mbedtls/platform_util.h>
 
 static psa_status_t psa_aead_crypt(psa_key_usage_t operation, secure_storage_its_uid_t uid,
 				   const uint8_t nonce
diff --git a/subsys/secure_storage/src/its/transform/aead_get.c b/subsys/secure_storage/src/its/transform/aead_get.c
index 07492b47e3f..8840a5541c2 100644
--- a/subsys/secure_storage/src/its/transform/aead_get.c
+++ b/subsys/secure_storage/src/its/transform/aead_get.c
@@ -8,6 +8,7 @@
 #include <psa/crypto.h>
 #include <string.h>
 #include <sys/types.h>
+#include <mbedtls/platform_util.h>
 
 LOG_MODULE_DECLARE(secure_storage, CONFIG_SECURE_STORAGE_LOG_LEVEL);
 

From 920fdc6e633766344d1cb8d5acdcc2b55b7a2315 Mon Sep 17 00:00:00 2001
From: Valerio Setti <vsetti@baylibre.com>
Date: Thu, 23 Jan 2025 15:25:37 +0100
Subject: [PATCH 2265/2913] [nrf fromtree] test: Bluetooth: crypto: increase
 stack size for all the boards

Bring the change that was already in place for the qemu_cortex_m3 board
to all the other ones, since also nrf52840 had a similar problem
(see issue #82812).

Signed-off-by: Valerio Setti <vsetti@baylibre.com>
(cherry picked from commit 9d0b1248caebcc3d25b9b548702d42ed058959e2)
---
 tests/bluetooth/bt_crypto/boards/qemu_cortex_m3.conf | 2 --
 tests/bluetooth/bt_crypto/prj.conf                   | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 100644 tests/bluetooth/bt_crypto/boards/qemu_cortex_m3.conf

diff --git a/tests/bluetooth/bt_crypto/boards/qemu_cortex_m3.conf b/tests/bluetooth/bt_crypto/boards/qemu_cortex_m3.conf
deleted file mode 100644
index 36ace22354c..00000000000
--- a/tests/bluetooth/bt_crypto/boards/qemu_cortex_m3.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_TEST_EXTRA_STACK_SIZE=1024
-CONFIG_MAIN_STACK_SIZE=2048
diff --git a/tests/bluetooth/bt_crypto/prj.conf b/tests/bluetooth/bt_crypto/prj.conf
index 807ba6ae741..250b394d62c 100644
--- a/tests/bluetooth/bt_crypto/prj.conf
+++ b/tests/bluetooth/bt_crypto/prj.conf
@@ -4,3 +4,6 @@ CONFIG_ZTEST=y
 CONFIG_BT=y
 CONFIG_BT_LL_SW_SPLIT=n
 CONFIG_BT_H4=n
+
+CONFIG_TEST_EXTRA_STACK_SIZE=1024
+CONFIG_MAIN_STACK_SIZE=2048

From 8037865d01e47f21282dda860561bf2aeeb54d69 Mon Sep 17 00:00:00 2001
From: Valerio Setti <vsetti@baylibre.com>
Date: Thu, 23 Jan 2025 10:56:14 +0100
Subject: [PATCH 2266/2913] [nrf fromtree] Bluetooth: Host: add
 PSA_WANT_xxx_IMPORT/EXPORT to BT_ECC

The BT Host module also uses import/export PSA functions alongside the
generate one, so these PSA_WANT should be added as well.

Previously it happened to work only because Mbed TLS is enabling
IMPORT/EXPORT internally whenever GENERATE/DERIVE is set. However the
same might not be true for all PSA Crypto providers.

Signed-off-by: Valerio Setti <vsetti@baylibre.com>
(cherry picked from commit 222f8d87b546c5e91ce132449b4fd41d55ed7207)
---
 subsys/bluetooth/host/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index 122ceb2170d..cc5ee14f92b 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -998,6 +998,8 @@ config BT_ECC
 	select MBEDTLS_PSA_CRYPTO_C if !BUILD_WITH_TFM
 	select PSA_WANT_ALG_ECDH
 	select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE
+	select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT
+	select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT
 	select PSA_WANT_ECC_SECP_R1_256
 	imply MBEDTLS_PSA_P256M_DRIVER_ENABLED if MBEDTLS_PSA_CRYPTO_C
 	select BT_LONG_WQ

From 7cee5ad15bcc5913cf7081100c76fcbdb9d0dffe Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Wed, 29 Jan 2025 12:52:12 +0100
Subject: [PATCH 2267/2913] [nrf fromtree] samples: net: prometheus: Add netif
 dependency

There's no point building the sample for platforms that do not support
networking, hence add netif dependency to reduce the CI execution
scope.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 3df9b5f87340fc5f8d37ba65ff00f17b18a545b6)
---
 samples/net/prometheus/sample.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/net/prometheus/sample.yaml b/samples/net/prometheus/sample.yaml
index c499e52f40f..57fa5abfef1 100644
--- a/samples/net/prometheus/sample.yaml
+++ b/samples/net/prometheus/sample.yaml
@@ -3,6 +3,7 @@ sample:
   name: prometheus_client_sample
 common:
   harness: net
+  depends_on: netif
   min_ram: 192
   tags:
     - http

From 1d8da90bf80e4a0d709379b4184b041fbdecb05e Mon Sep 17 00:00:00 2001
From: Piotr Koziar <piotr.koziar@nordicsemi.no>
Date: Mon, 27 Jan 2025 20:05:33 +0100
Subject: [PATCH 2268/2913] [nrf fromtree] modules: hal_nordic: suppress
 'unused variable' warnings

Refactors the code to avoid 'unused variable' warning
that is problematic for some builds.

Signed-off-by: Piotr Koziar <piotr.koziar@nordicsemi.no>
(cherry picked from commit 8f83ffc302dec61a06418efa317336016e820c65)
---
 .../sl_opensource/platform/nrf_802154_clock_zephyr.c   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c b/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
index c307401c657..a55e63bc589 100644
--- a/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
+++ b/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
@@ -45,7 +45,6 @@ static void hfclk_on_callback(struct onoff_manager *mgr,
 #if defined(CONFIG_CLOCK_CONTROL_NRF)
 void nrf_802154_clock_hfclk_start(void)
 {
-	int ret;
 	struct onoff_manager *mgr =
 		z_nrf_clock_control_get_onoff(CLOCK_CONTROL_NRF_SUBSYS_HF);
 
@@ -53,20 +52,21 @@ void nrf_802154_clock_hfclk_start(void)
 
 	sys_notify_init_callback(&hfclk_cli.notify, hfclk_on_callback);
 
-	ret = onoff_request(mgr, &hfclk_cli);
+	int ret = onoff_request(mgr, &hfclk_cli);
 	__ASSERT_NO_MSG(ret >= 0);
+	(void)ret;
 }
 
 void nrf_802154_clock_hfclk_stop(void)
 {
-	int ret;
 	struct onoff_manager *mgr =
 		z_nrf_clock_control_get_onoff(CLOCK_CONTROL_NRF_SUBSYS_HF);
 
 	__ASSERT_NO_MSG(mgr != NULL);
 
-	ret = onoff_cancel_or_release(mgr, &hfclk_cli);
+	int ret = onoff_cancel_or_release(mgr, &hfclk_cli);
 	__ASSERT_NO_MSG(ret >= 0);
+	(void)ret;
 	hfclk_is_running = false;
 }
 
@@ -78,6 +78,7 @@ void nrf_802154_clock_hfclk_start(void)
 	int ret = nrf_clock_control_request(DEVICE_DT_GET(DT_NODELABEL(hfxo)), NULL, &hfclk_cli);
 
 	__ASSERT_NO_MSG(ret >= 0);
+	(void)ret;
 }
 
 void nrf_802154_clock_hfclk_stop(void)
@@ -86,6 +87,7 @@ void nrf_802154_clock_hfclk_stop(void)
 						      NULL, &hfclk_cli);
 
 	__ASSERT_NO_MSG(ret >= 0);
+	(void)ret;
 }
 
 #endif

From 5b42055ee5b901dfb6950150b3b263b4b3d74e6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Tue, 14 Jan 2025 17:29:50 +0100
Subject: [PATCH 2269/2913] [nrf fromtree] bluetooth: host: Add select
 PSA_WANT_ALG_ECB_NO_PADDING
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a follow-up to commit 12eee615333625049d70f167f674018489f7139c.

Explicitly enable "PSA_WANT_ALG_ECB_NO_PADDING" to select the AES ECB
mode that it is used in CMAC operation.

This is done because CMAC uses AES-ECB, so both AES and ECB must
be explicitly enabled. Previously it worked because Mbed TLS is
not currently performing any check internally on this and it's
just enabling ECB automatically.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit dff78b4813e8fffd28c552b66abb8c656c990a28)
---
 subsys/bluetooth/host/Kconfig.gatt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/subsys/bluetooth/host/Kconfig.gatt b/subsys/bluetooth/host/Kconfig.gatt
index ece90724997..9acfae58c95 100644
--- a/subsys/bluetooth/host/Kconfig.gatt
+++ b/subsys/bluetooth/host/Kconfig.gatt
@@ -135,6 +135,7 @@ config BT_GATT_CACHING
 	depends on PSA_CRYPTO_CLIENT
 	select PSA_WANT_KEY_TYPE_AES
 	select PSA_WANT_ALG_CMAC
+	select PSA_WANT_ALG_ECB_NO_PADDING
 	imply MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
 	help
 	  This option enables support for GATT Caching. When enabled the stack

From 27b31f29aa1f59bc1c77962d4f3d71753c84a533 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Date: Tue, 7 Jan 2025 10:41:47 +0100
Subject: [PATCH 2270/2913] [nrf fromtree] dts: nordic: nrf9280: define
 hsfll120

Define HSFLL120 clock.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
(cherry picked from commit 332a3354f39681f0de6bdfd35217b429104a7b6a)
---
 dts/common/nordic/nrf9280.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 160ea12a480..2df403e78f2 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -92,6 +92,17 @@
 			#clock-cells = <0>;
 			clock-frequency = <DT_FREQ_M(16)>;
 		};
+
+		hsfll120: hsfll120 {
+			compatible = "nordic,nrf-hsfll-global";
+			clocks = <&fll16m>;
+			#clock-cells = <0>;
+			clock-frequency = <320000000>;
+			supported-clock-frequencies = <64000000
+						       128000000
+						       256000000
+						       320000000>;
+		};
 	};
 
 	soc {

From 31738433eed0faab05e474bcf011792e6ddd9432 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Fri, 31 Jan 2025 06:37:55 +0100
Subject: [PATCH 2271/2913] [nrf fromtree] boards: lilygo: ttgo_t7v1_5: Fix
 twister identifier

Due to a copy-paste error, it duplicated `ttgo_lora32/esp32/procpu`.
Also, remove the `lora` tag, as it seems to be omitted from devicetree.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit c074661de91b7ee17b6450d5e34b0e4fe0ee6ce1)
---
 boards/lilygo/ttgo_t7v1_5/ttgo_t7v1_5_esp32_procpu.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/boards/lilygo/ttgo_t7v1_5/ttgo_t7v1_5_esp32_procpu.yaml b/boards/lilygo/ttgo_t7v1_5/ttgo_t7v1_5_esp32_procpu.yaml
index 45d64a29250..25d43a61502 100644
--- a/boards/lilygo/ttgo_t7v1_5/ttgo_t7v1_5_esp32_procpu.yaml
+++ b/boards/lilygo/ttgo_t7v1_5/ttgo_t7v1_5_esp32_procpu.yaml
@@ -1,5 +1,5 @@
-identifier: ttgo_lora32/esp32/procpu
-name: TTGO LoRa32 PROCPU
+identifier: ttgo_t7v1_5/esp32/procpu
+name: TTGO T7 V1.5 PROCPU
 type: mcu
 arch: xtensa
 toolchain:
@@ -12,6 +12,5 @@ supported:
   - uart
   - pinmux
   - display
-  - lora
   - nvs
 vendor: lilygo

From 830887cc546ba568873b78a0985b779cc86301e3 Mon Sep 17 00:00:00 2001
From: Robin Kastberg <robin.kastberg@iar.com>
Date: Fri, 10 Jan 2025 11:20:05 +0000
Subject: [PATCH 2272/2913] [nrf fromtree] tests: kernel: workq_stop
 uninitialized variable

test_k_workqueue_stop uses an uninitialized variable, causing
sporadic test failures.

Signed-off-by: Robin Kastberg <robin.kastberg@iar.com>
(cherry picked from commit 75daa436ecc1b1127eb03197d7ae990115ce093a)
---
 tests/kernel/workq/work_queue/src/start_stop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/kernel/workq/work_queue/src/start_stop.c b/tests/kernel/workq/work_queue/src/start_stop.c
index eb1dcf22606..6ec14ad333c 100644
--- a/tests/kernel/workq/work_queue/src/start_stop.c
+++ b/tests/kernel/workq/work_queue/src/start_stop.c
@@ -25,7 +25,7 @@ ZTEST(workqueue_api, test_k_work_queue_stop)
 {
 	size_t i;
 	struct k_work work;
-	struct k_work_q work_q;
+	struct k_work_q work_q = {0};
 	struct k_work works[NUM_TEST_ITEMS];
 	struct k_work_queue_config cfg = {
 		.name = "test_work_q",

From 348deffb2684e90bd04f3f78c6e82e5dcc6ca03f Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Fri, 31 Jan 2025 01:32:20 +0530
Subject: [PATCH 2273/2913] [nrf fromtree] modules: hostap: Disable advanced
 feature for nRF boards

nRF boards have a ROM crunch esp. with combined with Matter/networking
features, as the advanced features are not essential for typical Wi-Fi
operation, disable them by default. Individual samples can choose to
enable it.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit e161ad675af3abb914e5590456b49b59bcc39b59)
---
 modules/hostap/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index 368be0e704f..2a4b1831f62 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -85,7 +85,7 @@ endif # WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_DBG
 # Memory optimizations
 config WIFI_NM_WPA_SUPPLICANT_ADVANCED_FEATURES
 	bool "Advanced features"
-	default y
+	default y if !SOC_FAMILY_NORDIC_NRF
 
 if WIFI_NM_WPA_SUPPLICANT_ADVANCED_FEATURES
 

From e743ea32feb1a3615eaf4926e8ddc0b1cb3d9320 Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Mon, 20 Jan 2025 12:11:16 +0100
Subject: [PATCH 2274/2913] [nrf fromlist] Bluetooth: BAP: Remove GATT_CACHING
 req for unicast server

The unicast server does not need GATT caching and it was likely
incorrectly added earlier as a dependency.

Upstream PR #: 84232

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
---
 samples/bluetooth/bap_unicast_server/prj.conf | 1 -
 samples/bluetooth/cap_acceptor/Kconfig        | 1 -
 samples/bluetooth/hap_ha/prj.conf             | 1 -
 samples/bluetooth/tmap_peripheral/prj.conf    | 1 -
 subsys/bluetooth/audio/Kconfig.bap            | 1 -
 tests/bluetooth/audio/ascs/prj.conf           | 1 -
 tests/bluetooth/audio/codec/prj.conf          | 1 -
 tests/bluetooth/shell/audio.conf              | 1 -
 tests/bluetooth/tester/overlay-le-audio.conf  | 1 -
 tests/bsim/bluetooth/audio/prj.conf           | 1 -
 10 files changed, 10 deletions(-)

diff --git a/samples/bluetooth/bap_unicast_server/prj.conf b/samples/bluetooth/bap_unicast_server/prj.conf
index 566baa8e830..a102747bf04 100644
--- a/samples/bluetooth/bap_unicast_server/prj.conf
+++ b/samples/bluetooth/bap_unicast_server/prj.conf
@@ -4,7 +4,6 @@ CONFIG_BT_SMP=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_ISO_PERIPHERAL=y
 CONFIG_BT_AUDIO=y
-CONFIG_BT_GATT_CACHING=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_BAP_UNICAST_SERVER=y
 CONFIG_BT_ASCS=y
diff --git a/samples/bluetooth/cap_acceptor/Kconfig b/samples/bluetooth/cap_acceptor/Kconfig
index 9c0ef351404..9ec0440cef2 100644
--- a/samples/bluetooth/cap_acceptor/Kconfig
+++ b/samples/bluetooth/cap_acceptor/Kconfig
@@ -7,7 +7,6 @@ config SAMPLE_UNICAST
 	bool "Whether or not to search for CAP acceptors for unicast audio"
 	default y
 	select BT_BAP_UNICAST_SERVER
-	select BT_GATT_CACHING
 	select BT_ISO_PERIPHERAL
 	select BT_ASCS
 	select BT_PAC_SNK
diff --git a/samples/bluetooth/hap_ha/prj.conf b/samples/bluetooth/hap_ha/prj.conf
index efd5a4004f9..8260f2cb12a 100644
--- a/samples/bluetooth/hap_ha/prj.conf
+++ b/samples/bluetooth/hap_ha/prj.conf
@@ -2,7 +2,6 @@ CONFIG_BT=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_ISO_PERIPHERAL=y
 CONFIG_BT_PRIVACY=y
-CONFIG_BT_GATT_CACHING=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
diff --git a/samples/bluetooth/tmap_peripheral/prj.conf b/samples/bluetooth/tmap_peripheral/prj.conf
index b073c27e2fa..cf40172576a 100644
--- a/samples/bluetooth/tmap_peripheral/prj.conf
+++ b/samples/bluetooth/tmap_peripheral/prj.conf
@@ -50,7 +50,6 @@ CONFIG_BT_TBS_CLIENT_TERMINATE_CALL=y
 CONFIG_BT_TBS_CLIENT_BEARER_URI_SCHEMES_SUPPORTED_LIST=y
 
 # Generic config
-CONFIG_BT_GATT_CACHING=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_EXT_ADV=y
diff --git a/subsys/bluetooth/audio/Kconfig.bap b/subsys/bluetooth/audio/Kconfig.bap
index 662d1d6e5a1..01ab717f379 100644
--- a/subsys/bluetooth/audio/Kconfig.bap
+++ b/subsys/bluetooth/audio/Kconfig.bap
@@ -12,7 +12,6 @@ config BT_BAP_UNICAST
 config BT_BAP_UNICAST_SERVER
 	bool "Bluetooth Unicast Audio Server Support"
 	depends on BT_GATT_DYNAMIC_DB
-	depends on BT_GATT_CACHING
 	depends on BT_PERIPHERAL
 	depends on BT_ISO_PERIPHERAL
 	depends on BT_ASCS
diff --git a/tests/bluetooth/audio/ascs/prj.conf b/tests/bluetooth/audio/ascs/prj.conf
index 84b05139ed0..5b6276dfcca 100644
--- a/tests/bluetooth/audio/ascs/prj.conf
+++ b/tests/bluetooth/audio/ascs/prj.conf
@@ -6,7 +6,6 @@ CONFIG_BT_MAX_CONN=1
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_ISO_PERIPHERAL=y
 CONFIG_BT_ISO_MAX_CHAN=1
-CONFIG_BT_GATT_CACHING=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_AUDIO=y
 CONFIG_BT_ASCS=y
diff --git a/tests/bluetooth/audio/codec/prj.conf b/tests/bluetooth/audio/codec/prj.conf
index ec00ae96a30..a2358bde705 100644
--- a/tests/bluetooth/audio/codec/prj.conf
+++ b/tests/bluetooth/audio/codec/prj.conf
@@ -5,7 +5,6 @@ CONFIG_BT_SMP=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_ISO_PERIPHERAL=y
 CONFIG_BT_AUDIO=y
-CONFIG_BT_GATT_CACHING=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_BAP_UNICAST_SERVER=y
 CONFIG_BT_ASCS=y
diff --git a/tests/bluetooth/shell/audio.conf b/tests/bluetooth/shell/audio.conf
index fbdd2f912d6..f09705ac681 100644
--- a/tests/bluetooth/shell/audio.conf
+++ b/tests/bluetooth/shell/audio.conf
@@ -17,7 +17,6 @@ CONFIG_BT_ISO_SYNC_RECEIVER=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PRIVACY=y
 CONFIG_BT_GATT_CLIENT=y
-CONFIG_BT_GATT_CACHING=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
 CONFIG_BT_GATT_AUTO_UPDATE_MTU=y
diff --git a/tests/bluetooth/tester/overlay-le-audio.conf b/tests/bluetooth/tester/overlay-le-audio.conf
index ed196ca6e5f..e6ada545978 100644
--- a/tests/bluetooth/tester/overlay-le-audio.conf
+++ b/tests/bluetooth/tester/overlay-le-audio.conf
@@ -2,7 +2,6 @@ CONFIG_BT_AUDIO=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_GATT_CLIENT=y
-CONFIG_BT_GATT_CACHING=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
 CONFIG_BT_GATT_AUTO_UPDATE_MTU=y
diff --git a/tests/bsim/bluetooth/audio/prj.conf b/tests/bsim/bluetooth/audio/prj.conf
index 034f3ac0735..aa571104fa7 100644
--- a/tests/bsim/bluetooth/audio/prj.conf
+++ b/tests/bsim/bluetooth/audio/prj.conf
@@ -19,7 +19,6 @@ CONFIG_BT_MAX_PAIRED=3
 CONFIG_BT_EXT_ADV_MAX_ADV_SET=3
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_GATT_CLIENT=y
-CONFIG_BT_GATT_CACHING=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
 CONFIG_BT_GATT_AUTO_UPDATE_MTU=y

From cf0873a6db6d41c8b4df1242f13712321f06adc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Fri, 24 Jan 2025 16:03:20 +0100
Subject: [PATCH 2275/2913] [nrf fromlist] manifest: wifi:
 CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG updates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-Update hostap to PR #76 which adds support for
 CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG instead of relying on legacy
 Mbed TLS ctr_drbg and entropy APIs. This change is in line with
 PSA crypto entropy changes in Zephyr happening with TinyCrypt
 deprecation and advancement of PSA crypto mechanisms
-Remove defconfigs for currently sets the Kconfigs:
 -CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
 -CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG_ALLOW_NON_CSPRNG

Upstream PR #: 84517

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
---
 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_defconfig | 4 ----
 west.yml                                                   | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_defconfig
index 49f3e03e263..8b28700426e 100644
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_defconfig
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_defconfig
@@ -19,9 +19,5 @@ CONFIG_SERIAL=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
-# Enable RNG
-CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG=y
-CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG_ALLOW_NON_CSPRNG=y
-
 # ISN needs CS-Rand which isn't supported upstream for nRF boards
 CONFIG_NET_TCP_ISN_RFC6528=n
diff --git a/west.yml b/west.yml
index 10523a88b07..49ecb93855c 100644
--- a/west.yml
+++ b/west.yml
@@ -274,7 +274,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: b4c42d88afc5ee04751fe258db757c4ef70abb09
+      revision: 219b1f75d6452aafd1aff1912cc07dd132f753fa
     - name: liblc3
       revision: bb85f7dde4195bfc0fca9e9c7c2eed0f8694203c
       path: modules/lib/liblc3

From 6233a3be44183eaac310f65037557691ba3769f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Tue, 28 Jan 2025 09:18:18 +0100
Subject: [PATCH 2276/2913] [nrf fromlist] wifi: Resolve
 PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-PSA_WANT_ALG_CMAC must be set for PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
 to be valid. This commit fixes this mismatch for hostap

Upstream PR #: 84517

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
---
 modules/hostap/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index 2a4b1831f62..c91fd1920a4 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -174,6 +174,7 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA
 	select PSA_WANT_ALG_SHA_384
 	select PSA_WANT_ALG_SHA_512
 	select PSA_WANT_ALG_PBKDF2_HMAC
+	select PSA_WANT_ALG_CMAC
 	select PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
 	select PSA_WANT_KEY_TYPE_AES
 	select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY

From 76bea5515511fc823ff54a0dc0c0530a22d31827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Tue, 28 Jan 2025 12:35:03 +0100
Subject: [PATCH 2277/2913] [nrf fromlist] wifi: hostap: Fixing naming
 collisions for some TLS configurations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-Mbed TLS has come up with its own naming-convention with regards
 to certain Mbed TLS configurations for TLS/DTLS and X.509. This
 commit fixes a couple of them by depending on MBEDTLS_BUILTIN
 which is set when Kconfig.tls-generic is used
 1. Make MBEDTLS_PEM_CERTIFICATE_FORMAT depend on MBEDTLS_BUILTIN
    The proper name for this functionaity is MBEDTL_PEM_PARSE_C and
    MBEDTLS_PEM_WRITE_C
 2. Make MBEDTLS_SERVER_NAME_INDICATION depend on MBEDTLS_BUILTIN
    The proper name for this is MBEDTLS_SSL_SERVER_NAME_INDICATION

Upstream PR #: 84517

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
---
 modules/hostap/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index c91fd1920a4..74c80256b16 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -184,8 +184,8 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA
 
 config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	bool "Enterprise Crypto support for WiFi"
-	select MBEDTLS_PEM_CERTIFICATE_FORMAT
-	select MBEDTLS_SERVER_NAME_INDICATION
+	select MBEDTLS_PEM_CERTIFICATE_FORMAT if MBEDTLS_BUILTIN
+	select MBEDTLS_SERVER_NAME_INDICATION if MBEDTLS_BUILTIN
 	select MBEDTLS_X509_CRL_PARSE_C
 	select MBEDTLS_TLS_VERSION_1_2
 	depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE

From b2af352ad45654ff7a90460608ae2474308cb098 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Fri, 31 Jan 2025 13:03:58 +0100
Subject: [PATCH 2278/2913] [nrf fromlist] twister: Account for board & SoC
 extensions

Problem
-------

Board & SoC extensions are used to define out-of-tree board variants or
SoC qualifiers. When a board is extended, it has multiple directories
associated with it (each with its own `board.yml`), where twister should
be able to find additional platform files to support these qualifiers.
Currently, this doesn't work, because twister only traverses the primary
BOARD_DIR and ignores the rest.

The fix would've been trivial in the case of "legacy" platform files,
i.e. those of the form `<normalized_board_target>.yaml`, but it's less
straightforward for the newly introduced `twister.yaml` format.

A `twister.yaml` file contains platform configuration that can be shared
by multiple board targets and tweaked for specific targets by using the
top-level `variants` key. Normally, there is at most one `twister.yaml`
per board, but the file isn't necessarily unique to one board. Instead,
it's unique to one directory, which may define multiple boards (as is
the case with e.g. `boards/qemu/x86/`).

With extensions in the picture, the goal is to initialize platforms when
given multiple `twister.yaml` per board. The OOT files are expected to
only provide information about OOT board targets, without being able to
override in-tree targets (same principle as in the Zephyr build system).

Solution
--------

Scanning for `twister.yaml` is broken up into multiple passes - first
loading all the files, then splitting the `variants` keys apart from the
shared configuration, before constructing the Platform instances.

The purpose of the split is to treat the variant information as global,
instead of making unnecessary or faulty assumptions about locality.
Remember that the build system can derive board target names not only
from `board.yml`, but from `soc.yml` too. Considering that any board may
end up using an OOT-extended SoC (and hence multiple `soc.yml` files),
not every board target can be said to belong to some board dir.

Unlike the variant data, the remaining top-level config is still rooted
to the primary BOARD_DIR and inherited by the extension dirs from there.
This is quite intuitive in most imagined cases, but there is a caveat:
if a `twister.yaml` resides in an extension dir, then it is allowed to
have a top-level config of its own, but it will be silently ignored.
This is to support corner cases where, much like how a single board dir
can define multiple boards, a single board dir can also extend multiple
boards, or even do both. In those cases, the primary BOARD_DIR rule
should make it unambiguous which config belongs to which board, even if
it may seem counter-intuitive at first.

Upstream PR #: 84975

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
---
 scripts/pylib/twister/twisterlib/platform.py |  38 ++----
 scripts/pylib/twister/twisterlib/testplan.py | 124 ++++++++++++-------
 2 files changed, 89 insertions(+), 73 deletions(-)

diff --git a/scripts/pylib/twister/twisterlib/platform.py b/scripts/pylib/twister/twisterlib/platform.py
index 325520d1513..869680e251d 100644
--- a/scripts/pylib/twister/twisterlib/platform.py
+++ b/scripts/pylib/twister/twisterlib/platform.py
@@ -83,7 +83,6 @@ def __init__(self):
         self.filter_data = dict()
         self.uart = ""
         self.resc = ""
-        self.qualifier = None
 
     def load(self, board, target, aliases, data):
         """Load the platform data from the board data and target data
@@ -95,26 +94,16 @@ def load(self, board, target, aliases, data):
         self.name = target
         self.aliases = aliases
 
-        # Get data for various targets and use the main board data as a
-        # defauly. Individual variant information will replace the default data
-        # provded in the main twister configuration for this board.
-        variants = data.get("variants", {})
-        variant_data = {}
-        for alias in aliases:
-            variant_data = variants.get(alias, {})
-            if variant_data:
-                break
-
         self.normalized_name = self.name.replace("/", "_")
-        self.sysbuild = variant_data.get("sysbuild", data.get("sysbuild", self.sysbuild))
-        self.twister = variant_data.get("twister", data.get("twister", self.twister))
+        self.sysbuild = data.get("sysbuild", self.sysbuild)
+        self.twister = data.get("twister", self.twister)
 
         # if no RAM size is specified by the board, take a default of 128K
-        self.ram = variant_data.get("ram", data.get("ram", self.ram))
+        self.ram = data.get("ram", self.ram)
         # if no flash size is specified by the board, take a default of 512K
-        self.flash = variant_data.get("flash", data.get("flash", self.flash))
+        self.flash = data.get("flash", self.flash)
 
-        testing = variant_data.get("testing", data.get("testing", {}))
+        testing = data.get("testing", {})
         self.timeout_multiplier = testing.get("timeout_multiplier", self.timeout_multiplier)
         self.ignore_tags = testing.get("ignore_tags", self.ignore_tags)
         self.only_tags = testing.get("only_tags", self.only_tags)
@@ -124,26 +113,23 @@ def load(self, board, target, aliases, data):
         self.uart = renode.get("uart", "")
         self.resc = renode.get("resc", "")
         self.supported = set()
-        for supp_feature in variant_data.get("supported", data.get("supported", [])):
+        for supp_feature in data.get("supported", []):
             for item in supp_feature.split(":"):
                 self.supported.add(item)
 
-        self.arch = variant_data.get('arch', data.get('arch', self.arch))
+        self.arch = data.get('arch', self.arch)
         self.vendor = board.vendor
-        self.tier = variant_data.get("tier", data.get("tier", self.tier))
-        self.type = variant_data.get('type', data.get('type', self.type))
+        self.tier = data.get("tier", self.tier)
+        self.type = data.get('type', self.type)
 
         self.simulators = [
-            Simulator(data) for data in variant_data.get(
-                'simulation',
-                data.get('simulation', self.simulators)
-            )
+            Simulator(data) for data in data.get('simulation', self.simulators)
         ]
         default_sim = self.simulator_by_name(None)
         if default_sim:
             self.simulation = default_sim.name
 
-        self.supported_toolchains = variant_data.get("toolchain", data.get("toolchain", []))
+        self.supported_toolchains = data.get("toolchain", [])
         if self.supported_toolchains is None:
             self.supported_toolchains = []
 
@@ -170,7 +156,7 @@ def load(self, board, target, aliases, data):
                 if toolchain not in self.supported_toolchains:
                     self.supported_toolchains.append(toolchain)
 
-        self.env = variant_data.get("env", data.get("env", []))
+        self.env = data.get("env", [])
         self.env_satisfied = True
         for env in self.env:
             if not os.environ.get(env, None):
diff --git a/scripts/pylib/twister/twisterlib/testplan.py b/scripts/pylib/twister/twisterlib/testplan.py
index 7c29df275eb..be232e61f78 100755
--- a/scripts/pylib/twister/twisterlib/testplan.py
+++ b/scripts/pylib/twister/twisterlib/testplan.py
@@ -7,7 +7,6 @@
 # SPDX-License-Identifier: Apache-2.0
 import collections
 import copy
-import glob
 import itertools
 import json
 import logging
@@ -437,12 +436,6 @@ def info(what):
         sys.stdout.write(what + "\n")
         sys.stdout.flush()
 
-    def find_twister_data(self, board_data_list, board_aliases):
-        """Find the twister data for a board in the list of board data based on the aliases"""
-        for board_data in board_data_list:
-            if board_data.get('identifier') in board_aliases:
-                return board_data
-
     def add_configurations(self):
         # Create a list of board roots as defined by the build system in general
         # Note, internally in twister a board root includes the `boards` folder
@@ -452,52 +445,42 @@ def add_configurations(self):
                             board_roots=board_roots, board=None, board_dir=None)
 
         known_boards = list_boards.find_v2_boards(lb_args)
-        bdirs = {}
         platform_config = self.test_config.get('platforms', {})
 
+        alias2target = {}
+        target2board = {}
+        target2data = {}
+        dir2data = {}
+        legacy_files = []
+
         # helper function to initialize and add platforms
-        def init_and_add_platforms(data, board, target, qualifier, aliases):
+        def init_and_add_platforms(data, board, target, aliases, src_dir):
             platform = Platform()
-            if not new_config_found:
-                data = self.find_twister_data(bdirs[board.dir], aliases)
-                if not data:
-                    return
             platform.load(board, target, aliases, data)
-            platform.qualifier = qualifier
             if platform.name in [p.name for p in self.platforms]:
-                logger.error(f"Duplicate platform {platform.name} in {board.dir}")
+                logger.error(f"Duplicate platform {platform.name} in {src_dir}")
                 raise Exception(f"Duplicate platform identifier {platform.name} found")
             if not platform.twister:
                 return
             self.platforms.append(platform)
 
         for board in known_boards.values():
-            new_config_found = False
-            # don't load the same board data twice
-            if not bdirs.get(board.dir):
-                datas = []
-                for file in glob.glob(os.path.join(board.dir, "*.yaml")):
-                    if os.path.basename(file) == "twister.yaml":
-                        continue
+            for board_dir in board.directories:
+                if board_dir in dir2data:
+                    # don't load the same board data twice
+                    continue
+                legacy_files.extend(
+                    file for file in board_dir.glob("*.yaml") if file.name != "twister.yaml"
+                )
+                data = None
+                file = board_dir / "twister.yaml"
+                if file.is_file():
                     try:
-                        scp = TwisterConfigParser(file, Platform.platform_schema)
-                        sdata = scp.load()
-                        datas.append(sdata)
+                        data = scl.yaml_load_verify(file, Platform.platform_schema)
                     except Exception as e:
                         logger.error(f"Error loading {file}: {e!r}")
                         self.load_errors += 1
-                        continue
-                bdirs[board.dir] = datas
-            data = {}
-            if os.path.exists(board.dir / 'twister.yaml'):
-                try:
-                    scp = TwisterConfigParser(board.dir / 'twister.yaml', Platform.platform_schema)
-                    data = scp.load()
-                except Exception as e:
-                    logger.error(f"Error loading {board.dir / 'twister.yaml'}: {e!r}")
-                    self.load_errors += 1
-                    continue
-                new_config_found = True
+                dir2data[board_dir] = data
 
 
 
@@ -507,27 +490,74 @@ def init_and_add_platforms(data, board, target, qualifier, aliases):
                     for rev in board.revisions:
                         if rev.name:
                             target = f"{board.name}@{rev.name}/{qual}"
-                            aliases = [target]
+                            alias2target[target] = target
                             if rev.name == board.revision_default:
-                                aliases.append(f"{board.name}/{qual}")
+                                alias2target[f"{board.name}/{qual}"] = target
                             if '/' not in qual and len(board.socs) == 1:
                                 if rev.name == board.revision_default:
-                                    aliases.append(f"{board.name}")
-                                aliases.append(f"{board.name}@{rev.name}")
+                                    alias2target[f"{board.name}"] = target
+                                alias2target[f"{board.name}@{rev.name}"] = target
                         else:
                             target = f"{board.name}/{qual}"
-                            aliases = [target]
+                            alias2target[target] = target
                             if '/' not in qual and len(board.socs) == 1 \
                                     and rev.name == board.revision_default:
-                                aliases.append(f"{board.name}")
+                                alias2target[f"{board.name}"] = target
 
-                        init_and_add_platforms(data, board, target, qual, aliases)
+                        target2board[target] = board
                 else:
                     target = f"{board.name}/{qual}"
-                    aliases = [target]
+                    alias2target[target] = target
                     if '/' not in qual and len(board.socs) == 1:
-                        aliases.append(board.name)
-                    init_and_add_platforms(data, board, target, qual, aliases)
+                        alias2target[board.name] = target
+                    target2board[target] = board
+
+        for board_dir, data in dir2data.items():
+            if data is None:
+                continue
+            # Separate the default and variant information in the loaded board data.
+            # The default (top-level) data can be shared by multiple board targets;
+            # it will be overlaid by the variant data (if present) for each target.
+            variant_data = data.pop("variants", {})
+            for variant in variant_data:
+                target = alias2target.get(variant)
+                if target is None:
+                    continue
+                if target in target2data:
+                    logger.error(f"Duplicate platform {target} in {board_dir}")
+                    raise Exception(f"Duplicate platform identifier {target} found")
+                target2data[target] = variant_data[variant]
+
+        # note: this inverse mapping will only be used for loading legacy files
+        target2aliases = {}
+
+        for target, aliases in itertools.groupby(alias2target, alias2target.get):
+            aliases = list(aliases)
+            board = target2board[target]
+
+            # Default board data always comes from the primary 'board.dir'.
+            # Other 'board.directories' can only supply variant data.
+            data = dir2data[board.dir]
+            if data is not None:
+                if target in target2data:
+                    data = copy.deepcopy(data)
+                    data.update(target2data[target])
+                init_and_add_platforms(data, board, target, aliases, board.dir)
+
+            target2aliases[target] = aliases
+
+        for file in legacy_files:
+            try:
+                data = scl.yaml_load_verify(file, Platform.platform_schema)
+            except Exception as e:
+                logger.error(f"Error loading {file}: {e!r}")
+                self.load_errors += 1
+                continue
+            target = alias2target.get(data.get("identifier"))
+            if target is not None:
+                init_and_add_platforms(
+                    data, target2board[target], target, target2aliases[target], file.parent
+                )
 
         for platform in self.platforms:
             if not platform_config.get('override_default_platforms', False):

From baaad1a97f8792d00cd264d81b0dbc5a089d5330 Mon Sep 17 00:00:00 2001
From: Sean Madigan <sean.madigan@nordicsemi.no>
Date: Tue, 11 Feb 2025 16:01:08 +0000
Subject: [PATCH 2279/2913] [nrf fromlist] dts: nordic: nrf5340: Revert nRF5340
 IPC backend to rpmsg

This reverts commit 70419bdee7ffd4ea7248f2b3f4c1a5a9d5a75c76.

This is because there are issues around slow IPC thoughput
with icbmsg, which is causing issues with BLE when lots of
data is required to be exchanged, e.g. with ISO.

Also there is an assert icmsg.c#L190 which occurs when
initializing bluetooth and IPC in certain circumstances.

Upstream PR #: 85621

Signed-off-by: Sean Madigan <sean.madigan@nordicsemi.no>
---
 ...340_dvk_nrf5340_cpuapp_partition_conf.dtsi |  4 +--
 .../bl5340_dvk_nrf5340_cpunet_common.dtsi     |  4 +--
 ...dvk_nrf5340_shared_sram_planning_conf.dtsi | 31 +++++++++++++++++++
 dts/arm/nordic/nrf5340_cpuapp_ipc.dtsi        | 10 +++---
 dts/arm/nordic/nrf5340_cpunet.dtsi            | 10 +++---
 .../nordic/nrf5340_shared_sram_partition.dtsi | 14 +--------
 6 files changed, 44 insertions(+), 29 deletions(-)
 create mode 100644 boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_shared_sram_planning_conf.dtsi

diff --git a/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpuapp_partition_conf.dtsi b/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpuapp_partition_conf.dtsi
index 2fc651230f4..b85e3d03dc2 100644
--- a/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpuapp_partition_conf.dtsi
+++ b/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpuapp_partition_conf.dtsi
@@ -57,5 +57,5 @@
 	reg = <0x20040000 0x30000>;
 };
 
-/* Include default shared RAM configuration file */
-#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
+/* Include shared RAM configuration file */
+#include "bl5340_dvk_nrf5340_shared_sram_planning_conf.dtsi"
diff --git a/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpunet_common.dtsi b/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpunet_common.dtsi
index 1f5fc0bb340..ce2e145d587 100644
--- a/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpunet_common.dtsi
+++ b/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpunet_common.dtsi
@@ -63,5 +63,5 @@
 	};
 };
 
-/* Include default shared RAM configuration file */
-#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
+/* Include shared RAM configuration file */
+#include "bl5340_dvk_nrf5340_shared_sram_planning_conf.dtsi"
diff --git a/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_shared_sram_planning_conf.dtsi b/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_shared_sram_planning_conf.dtsi
new file mode 100644
index 00000000000..fbb059494c3
--- /dev/null
+++ b/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_shared_sram_planning_conf.dtsi
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2019 Nordic Semiconductor ASA
+ * Copyright (c) 2021 Laird Connectivity
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Default shared SRAM planning when building for BL5340 DVK.
+ * This file is included by both nRF5340 CPUAPP (Application MCU)
+ * and nRF5340 CPUNET (Network MCU).
+ * - 64 kB SRAM allocated as Shared memory (sram0_shared)
+ * - Region defined after the image SRAM of Application MCU
+ */
+
+/ {
+	chosen {
+		/* shared memory reserved for the inter-processor communication */
+		zephyr,ipc_shm = &sram0_shared;
+	};
+
+	reserved-memory {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		sram0_shared: memory@20070000 {
+			/* SRAM allocated to shared memory */
+			reg = <0x20070000 0x10000>;
+		};
+	};
+};
diff --git a/dts/arm/nordic/nrf5340_cpuapp_ipc.dtsi b/dts/arm/nordic/nrf5340_cpuapp_ipc.dtsi
index 3e2eb310542..f5cda20e961 100644
--- a/dts/arm/nordic/nrf5340_cpuapp_ipc.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuapp_ipc.dtsi
@@ -5,14 +5,12 @@
  */
 
 ipc0: ipc0 {
-	compatible = "zephyr,ipc-icbmsg";
-	status = "okay";
+	compatible = "zephyr,ipc-openamp-static-vrings";
+	memory-region = <&sram0_shared>;
 	mboxes = <&mbox 0>, <&mbox 1>;
 	mbox-names = "tx", "rx";
-	tx-region = <&cpuapp_cpunet_ipc_shm>;
-	rx-region = <&cpunet_cpuapp_ipc_shm>;
-	tx-blocks = <32>;
-	rx-blocks = <32>;
+	role = "host";
+	status = "okay";
 
 	bt_hci_ipc0: bt_hci_ipc0 {
 		compatible = "zephyr,bt-hci-ipc";
diff --git a/dts/arm/nordic/nrf5340_cpunet.dtsi b/dts/arm/nordic/nrf5340_cpunet.dtsi
index d4d06bf2d3e..d33b4080deb 100644
--- a/dts/arm/nordic/nrf5340_cpunet.dtsi
+++ b/dts/arm/nordic/nrf5340_cpunet.dtsi
@@ -348,14 +348,12 @@
 	/* Default IPC description */
 	ipc {
 		ipc0: ipc0 {
-			compatible = "zephyr,ipc-icbmsg";
-			status = "okay";
+			compatible = "zephyr,ipc-openamp-static-vrings";
+			memory-region = <&sram0_shared>;
 			mboxes = <&mbox 0>, <&mbox 1>;
 			mbox-names = "rx", "tx";
-			tx-region = <&cpunet_cpuapp_ipc_shm>;
-			rx-region = <&cpuapp_cpunet_ipc_shm>;
-			tx-blocks = <32>;
-			rx-blocks = <32>;
+			role = "remote";
+			status = "okay";
 		};
 	};
 };
diff --git a/dts/common/nordic/nrf5340_shared_sram_partition.dtsi b/dts/common/nordic/nrf5340_shared_sram_partition.dtsi
index 8dc217ceae9..a5dc3489e89 100644
--- a/dts/common/nordic/nrf5340_shared_sram_partition.dtsi
+++ b/dts/common/nordic/nrf5340_shared_sram_partition.dtsi
@@ -14,9 +14,7 @@
  * the memory range allocated to the non-secure image (sram0_ns).
  *
  * By default the last 64 kB of application core SRAM is allocated as shared
- * memory (sram0_shared) which is divided in:
- * - 32 kB CPUAPP to CPUNET communication (cpuapp_cpunet_ipc_shm)
- * - 32 kB CPUNET to CPUAPP communication (cpunet_cpuapp_ipc_shm)
+ * memory (sram0_shared).
  */
 
 / {
@@ -30,18 +28,8 @@
 		ranges;
 
 		sram0_shared: memory@20070000 {
-			#address-cells = <1>;
-			#size-cells = <1>;
 			/* Last 64 kB of sram0 */
 			reg = <0x20070000 0x10000>;
-
-			cpuapp_cpunet_ipc_shm: memory@20070000 {
-				reg = <0x20070000 DT_SIZE_K(32)>;
-			};
-
-			cpunet_cpuapp_ipc_shm: memory@20078000 {
-				reg = <0x20078000 DT_SIZE_K(32)>;
-			};
 		};
 	};
 };

From fdf281511b1253c6625bc6d0ce61eb31d76c710e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 8 Jan 2025 11:15:56 +0100
Subject: [PATCH 2280/2913] [nrf noup] boards: nordic: nrf7002dk: Bring back NS
 variants
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Non-secure variants for nRF7002 DK were removed from upstream
in commit 10d49736cffa14d3798e615e70d58b3be8ee2cfc. Revert these
changes downstream, so that the NS variants are still available.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf7002dk/CMakeLists.txt        | 11 +++
 boards/nordic/nrf7002dk/Kconfig               |  6 +-
 boards/nordic/nrf7002dk/Kconfig.defconfig     | 76 +++++++++++++++++++
 boards/nordic/nrf7002dk/Kconfig.nrf7002dk     |  4 +-
 boards/nordic/nrf7002dk/board.cmake           | 13 +++-
 boards/nordic/nrf7002dk/board.yml             |  4 +
 .../nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts   | 39 ++++++++++
 .../nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml  | 19 +++++
 ...7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig | 27 +++++++
 .../nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts | 40 ++++++++++
 .../nrf7002dk_nrf5340_cpuapp_ns.yaml          | 19 +++++
 .../nrf7002dk_nrf5340_cpuapp_ns_defconfig     | 26 +++++++
 12 files changed, 281 insertions(+), 3 deletions(-)
 create mode 100644 boards/nordic/nrf7002dk/CMakeLists.txt
 create mode 100644 boards/nordic/nrf7002dk/Kconfig.defconfig
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig

diff --git a/boards/nordic/nrf7002dk/CMakeLists.txt b/boards/nordic/nrf7002dk/CMakeLists.txt
new file mode 100644
index 00000000000..db20255712b
--- /dev/null
+++ b/boards/nordic/nrf7002dk/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if((CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR
+    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
+    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 OR
+    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS) AND
+   CONFIG_BOARD_ENABLE_CPUNET)
+  zephyr_library()
+  zephyr_library_sources(nrf5340_cpunet_reset.c)
+endif()
diff --git a/boards/nordic/nrf7002dk/Kconfig b/boards/nordic/nrf7002dk/Kconfig
index e599cbcce07..bf5b239c98c 100644
--- a/boards/nordic/nrf7002dk/Kconfig
+++ b/boards/nordic/nrf7002dk/Kconfig
@@ -10,7 +10,9 @@ config MBOX_NRFX_IPC
 	default MBOX
 
 if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
 
 config BT_HCI_IPC
 	default y if BT
@@ -38,7 +40,9 @@ config BT_ECC
 config DOMAIN_CPUAPP_BOARD
 	string
 	default "nrf7002dk/nrf5340/cpuapp" if BOARD_NRF7002DK_NRF5340_CPUAPP
+	default "nrf7002dk/nrf5340/cpuapp/ns" if BOARD_NRF7002DK_NRF5340_CPUAPP_NS
 	default "nrf7002dk/nrf5340/cpuapp/nrf7001" if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
+	default "nrf7002dk/nrf5340/cpuapp/nrf7001/ns" if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
 	help
 	  The board which will be used for CPUAPP domain when creating a multi
 	  image application where one or more images should be located on
diff --git a/boards/nordic/nrf7002dk/Kconfig.defconfig b/boards/nordic/nrf7002dk/Kconfig.defconfig
new file mode 100644
index 00000000000..a6357ae50b2
--- /dev/null
+++ b/boards/nordic/nrf7002dk/Kconfig.defconfig
@@ -0,0 +1,76 @@
+# nRF5340 DK nRF5340 board configuration
+
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+# By default, if we build for a Non-Secure version of the board,
+# force building with TF-M as the Secure Execution Environment.
+config BUILD_WITH_TFM
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+if BUILD_WITH_TFM
+
+# By default, if we build with TF-M, instruct build system to
+# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
+config TFM_FLASH_MERGED_BINARY
+	bool
+	default y
+
+endif # BUILD_WITH_TFM
+
+# Code Partition:
+#
+# For the secure version of the board the firmware is linked at the beginning
+# of the flash, or into the code-partition defined in DT if it is intended to
+# be loaded by MCUboot. If the secure firmware is to be combined with a non-
+# secure image (TRUSTED_EXECUTION_SECURE=y), the secure FW image shall always
+# be restricted to the size of its code partition.
+#
+# For the non-secure version of the board, the firmware
+# must be linked into the code-partition (non-secure) defined in DT, regardless.
+# Apply this configuration below by setting the Kconfig symbols used by
+# the linker according to the information extracted from DT partitions.
+
+# SRAM Partition:
+#
+# If the secure firmware is to be combined with a non-secure image
+# (TRUSTED_EXECUTION_SECURE=y), the secure FW image SRAM shall always
+# be restricted to the secure image SRAM partition (sram-secure-partition).
+# Otherwise (if TRUSTED_EXECUTION_SECURE is not set) the whole zephyr,sram
+# may be used by the image.
+#
+# For the non-secure version of the board, the firmware image SRAM is
+# always restricted to the allocated non-secure SRAM partition.
+#
+# Workaround for not being able to have commas in macro arguments
+DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
+DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
+
+if (BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001) && \
+	TRUSTED_EXECUTION_SECURE
+
+config FLASH_LOAD_SIZE
+	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+config SRAM_SIZE
+	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM_PARTITION),0,K)
+
+endif
+
+if BOARD_NRF7002DK_NRF5340_CPUAPP_NS || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+config FLASH_LOAD_OFFSET
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+config FLASH_LOAD_SIZE
+	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+endif
+
+endif
diff --git a/boards/nordic/nrf7002dk/Kconfig.nrf7002dk b/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
index 61b9e818f36..91f52ee6f08 100644
--- a/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
+++ b/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
@@ -4,4 +4,6 @@
 config BOARD_NRF7002DK
 	select SOC_NRF5340_CPUNET_QKAA if BOARD_NRF7002DK_NRF5340_CPUNET
 	select SOC_NRF5340_CPUAPP_QKAA if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
+					  BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
diff --git a/boards/nordic/nrf7002dk/board.cmake b/boards/nordic/nrf7002dk/board.cmake
index 3832c0d20c1..bea0dc92ea9 100644
--- a/boards/nordic/nrf7002dk/board.cmake
+++ b/boards/nordic/nrf7002dk/board.cmake
@@ -1,11 +1,22 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
+if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS)
+  set(TFM_PUBLIC_KEY_FORMAT "full")
+endif()
+
 if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR
-   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001)
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS)
   board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
 endif()
 
+if(CONFIG_TFM_FLASH_MERGED_BINARY)
+  set_property(TARGET runners_yaml_props_target PROPERTY hex_file "${CMAKE_BINARY_DIR}/zephyr/tfm_merged.hex")
+endif()
+
 if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
diff --git a/boards/nordic/nrf7002dk/board.yml b/boards/nordic/nrf7002dk/board.yml
index 4f41341e442..39db5dcfa3a 100644
--- a/boards/nordic/nrf7002dk/board.yml
+++ b/boards/nordic/nrf7002dk/board.yml
@@ -5,5 +5,9 @@ board:
   socs:
     - name: nrf5340
       variants:
+        - name: ns
+          cpucluster: cpuapp
         - name: nrf7001
           cpucluster: cpuapp
+          variants:
+            - name: ns
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
new file mode 100644
index 00000000000..5ff28accf3f
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf5340_cpuappns_qkaa.dtsi>
+#include "nrf5340_cpuapp_common.dtsi"
+
+/ {
+	model = "Nordic NRF5340 DK NRF5340 Application";
+	compatible = "nordic,nrf5340-dk-nrf5340-cpuapp";
+
+	chosen {
+		zephyr,sram = &sram0_ns;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_ns_partition;
+		zephyr,entropy = &psa_rng;
+		zephyr,wifi = &wlan0;
+	};
+
+	psa_rng: psa-rng {
+		compatible = "zephyr,psa-crypto-rng";
+		status = "okay";
+	};
+};
+
+&qspi {
+	nrf70: nrf7001@1 {
+		compatible = "nordic,nrf7001-qspi";
+		status = "okay";
+		reg = <1>;
+		qspi-frequency = <24000000>;
+		qspi-quad-mode;
+
+		#include "nrf70_common.dtsi"
+	};
+};
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml
new file mode 100644
index 00000000000..16575969126
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml
@@ -0,0 +1,19 @@
+identifier: nrf7002dk/nrf5340/cpuapp/nrf7001/ns
+name: NRF7002-DK-NRF7001-NRF5340-application-MCU-Non-Secure
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+ram: 192
+flash: 192
+supported:
+  - gpio
+  - i2c
+  - pwm
+  - watchdog
+  - usbd
+  - usb_device
+  - netif:openthread
+vendor: nordic
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig
new file mode 100644
index 00000000000..c536aae767d
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig
@@ -0,0 +1,27 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Enable TrustZone-M
+CONFIG_ARM_TRUSTZONE_M=y
+
+# This Board implies building Non-Secure firmware
+CONFIG_TRUSTED_EXECUTION_NONSECURE=y
+
+# enable GPIO
+CONFIG_GPIO=y
+
+# enable PINCTRL
+CONFIG_PINCTRL=y
+
+# Enable uart driver
+CONFIG_SERIAL=y
+
+# enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
new file mode 100644
index 00000000000..0deb8ccc1bf
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf5340_cpuappns_qkaa.dtsi>
+#include "nrf5340_cpuapp_common.dtsi"
+
+/ {
+	model = "Nordic NRF5340 DK NRF5340 Application";
+	compatible = "nordic,nrf5340-dk-nrf5340-cpuapp";
+
+	chosen {
+		zephyr,sram = &sram0_ns_app;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_ns_partition;
+		zephyr,entropy = &psa_rng;
+		zephyr,wifi = &wlan0;
+	};
+
+	psa_rng: psa-rng {
+		compatible = "zephyr,psa-crypto-rng";
+		status = "okay";
+	};
+};
+
+&qspi {
+	nrf70: nrf7002@1 {
+		compatible = "nordic,nrf7002-qspi";
+		status = "okay";
+		reg = <1>;
+		qspi-frequency = <24000000>;
+		qspi-quad-mode;
+
+		#include "nrf70_common.dtsi"
+		#include "nrf70_common_5g.dtsi"
+	};
+};
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml
new file mode 100644
index 00000000000..ea43785b455
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml
@@ -0,0 +1,19 @@
+identifier: nrf7002dk/nrf5340/cpuapp/ns
+name: NRF7002-DK-NRF5340-application-MCU-Non-Secure
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+ram: 192
+flash: 192
+supported:
+  - gpio
+  - i2c
+  - pwm
+  - watchdog
+  - usbd
+  - usb_device
+  - netif:openthread
+vendor: nordic
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig
new file mode 100644
index 00000000000..c5b2eaadc16
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Enable TrustZone-M
+CONFIG_ARM_TRUSTZONE_M=y
+
+# This Board implies building Non-Secure firmware
+CONFIG_TRUSTED_EXECUTION_NONSECURE=y
+
+# enable GPIO
+CONFIG_GPIO=y
+
+# enable PINCTRL
+CONFIG_PINCTRL=y
+
+# Enable uart driver
+CONFIG_SERIAL=y
+
+# enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y

From 6c8ef872e1e43ea3d6dc590f22d993506aa915b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 8 Jan 2025 10:48:30 +0100
Subject: [PATCH 2281/2913] [nrf noup] Revert "mbedtls: auto-select
 MBEDTLS_CIPHER_AES_ENABLED when built-in in PSA"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ac6d8342728c8a63f9fea965ce41610618aeed5a.

Temporarily revert an upstream change that leads to a Kconfig dependency
loop with MBEDTLS_CIPHER_AES_ENABLED. This is supposed to be replaced
with a better fix later.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/mbedtls/Kconfig.tls-generic | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/mbedtls/Kconfig.tls-generic b/modules/mbedtls/Kconfig.tls-generic
index 1d8ef925fce..01a0eebb630 100644
--- a/modules/mbedtls/Kconfig.tls-generic
+++ b/modules/mbedtls/Kconfig.tls-generic
@@ -261,7 +261,6 @@ config MBEDTLS_SOME_CIPHER_ENABLED
 
 config MBEDTLS_CIPHER_AES_ENABLED
 	bool "AES block cipher"
-	default y if PSA_WANT_KEY_TYPE_AES && MBEDTLS_PSA_CRYPTO_C
 
 if MBEDTLS_CIPHER_AES_ENABLED
 

From 1298f35e2be7a5f08d05e1f06f5df6a1e74389dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Fri, 24 Jan 2025 17:57:54 +0100
Subject: [PATCH 2282/2913] [nrf noup] tests: arm_irq_vector_table: Disable
 starting of SSF client
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This test cannot be executed with the SDFW Service Framework client
started, so disable its initialization.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf  | 1 +
 .../arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf
index 0bcc82e646b..025c842f70b 100644
--- a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -1 +1,2 @@
 CONFIG_SOC_NRF54H20_GPD=n
+CONFIG_SSF_CLIENT_SYS_INIT=n
diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf
index 0bcc82e646b..025c842f70b 100644
--- a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf
+++ b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -1 +1,2 @@
 CONFIG_SOC_NRF54H20_GPD=n
+CONFIG_SSF_CLIENT_SYS_INIT=n

From 31205da1f0ca971823239788a2bee36922a7599c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Grochala?= <michal.grochala@nordicsemi.no>
Date: Fri, 31 Jan 2025 16:09:26 +0000
Subject: [PATCH 2283/2913] [nrf noup] bluetooth: Temporary Kconfig fix for BT
 RPC configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The BT_DRIVERS symbol default value 'y' used to depend on !BT_CTLR
but now it is always on when BT is set. For BT_RPC the BT_DRIVERS
symbol must not be enabled on the client side as no driver is used.

The temporary solution is to set BT_DRIVERS to 'y' by default only when
BT_HCI stack selection is enabled. It will be 'n' when BT_RPC_STACK
is enabled. The fix should be fine as NCS uses either HCI or RPC stack.

Signed-off-by: Michał Grochala <michal.grochala@nordicsemi.no>
---
 drivers/bluetooth/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index a1680af6583..e64a33f663c 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -12,7 +12,7 @@
 menuconfig BT_DRIVERS
 	bool "Bluetooth drivers"
 	default y
-	depends on BT
+	depends on BT && BT_HCI
 
 if BT_DRIVERS
 

From 015d5cc6915f2e74271b5ff48c6b804b0b613b30 Mon Sep 17 00:00:00 2001
From: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Date: Fri, 31 Jan 2025 14:47:05 +0200
Subject: [PATCH 2284/2913] [nrf noup] tests: secure_storage: fix test w/ ZMS
 backend on 54L15

noup because it's about partition manager.

Fix the build of secure_storage.psa.its.secure_storage.store.zms on
nrf54l15dk/nrf54l15/cpuapp by disabling partition manager, which is
incompatible with the ZMS implementation of the ITS store module.

Disabling it only for that test as it's not needed for the others
and even makes the NS board targets fail if disabling PM.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
---
 tests/subsys/secure_storage/psa/its/testcase.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/subsys/secure_storage/psa/its/testcase.yaml b/tests/subsys/secure_storage/psa/its/testcase.yaml
index bf72516e4b2..d464a82e8e9 100644
--- a/tests/subsys/secure_storage/psa/its/testcase.yaml
+++ b/tests/subsys/secure_storage/psa/its/testcase.yaml
@@ -26,6 +26,7 @@ tests:
     extra_args:
       - EXTRA_DTC_OVERLAY_FILE=zms.overlay
       - EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-transform_default.conf
+      - SB_CONFIG_PARTITION_MANAGER=n
 
   secure_storage.psa.its.secure_storage.store.settings:
     filter: CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS

From c37224c88ed144c714b2be8a16cae4bb5b10e748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= <frank.kvamtro@nordicsemi.no>
Date: Tue, 4 Feb 2025 14:55:58 +0100
Subject: [PATCH 2285/2913] [nrf noup] ble: Adding missing AES config for
 BT_CRYPTO
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-Adding imply MBEDTLS_CIPHER_AES_ENABLED if not TF-M build
 in BT_CRYPTO
-Needed to set a specific symbol for MBEDTLS + MBEDTLS_BUILTIN
 to work on network core build.
-This [nrf noup] can be removed once PSA crypto is fully
 supported in network core, or PSA crypto is not compiled in at all
 and is provided as a RPC-mechanism via the app-core

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
---
 subsys/bluetooth/crypto/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/subsys/bluetooth/crypto/Kconfig b/subsys/bluetooth/crypto/Kconfig
index 0856daf9d9a..0f46a0f59a0 100644
--- a/subsys/bluetooth/crypto/Kconfig
+++ b/subsys/bluetooth/crypto/Kconfig
@@ -8,6 +8,7 @@ config BT_CRYPTO
 	select PSA_WANT_KEY_TYPE_AES
 	select PSA_WANT_ALG_CMAC
 	select PSA_WANT_ALG_ECB_NO_PADDING
+	imply MBEDTLS_CIPHER_AES_ENABLED if !BUILD_WITH_TFM
 	imply MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
 	help
 	  This option enables the Bluetooth Cryptographic Toolbox.

From fcb4238dbd1ac2d030d38031f3297947e993afda Mon Sep 17 00:00:00 2001
From: Juha Ylinen <juha.ylinen@nordicsemi.no>
Date: Wed, 29 Jan 2025 16:05:45 +0200
Subject: [PATCH 2286/2913] [nrf noup] tests: secure_storage: Fix issues

Set CONFIG_TFM_PROFILE_TYPE_MEDIUM for boards with TF-M to enable
ITS and PS.

Enable CONFIG_PSA_WANT_GENERATE_RANDOM to fix persistent_key
tests when TF-M is used.

native_sim target needs CONFIG_PSA_WANT_ALG_ECB_NO_PADDING.

Skip checking of private_reserved field in psa_key_attributes if
present.

Increase maximum ITS asset size.

Signed-off-by: Juha Ylinen <juha.ylinen@nordicsemi.no>
---
 tests/subsys/secure_storage/psa/crypto/prj.conf            | 3 +++
 tests/subsys/secure_storage/psa/crypto/src/main.c          | 7 ++++++-
 tests/subsys/secure_storage/psa/crypto/testcase.yaml       | 3 +++
 .../secure_storage/psa/its/overlay-secure_storage.conf     | 4 ++++
 tests/subsys/secure_storage/psa/its/overlay-tfm.conf       | 3 ++-
 tests/subsys/secure_storage/psa/its/prj.conf               | 1 +
 6 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/tests/subsys/secure_storage/psa/crypto/prj.conf b/tests/subsys/secure_storage/psa/crypto/prj.conf
index d512b2fd70a..bc7ec5fdbb9 100644
--- a/tests/subsys/secure_storage/psa/crypto/prj.conf
+++ b/tests/subsys/secure_storage/psa/crypto/prj.conf
@@ -2,3 +2,6 @@ CONFIG_ZTEST=y
 
 CONFIG_PSA_WANT_KEY_TYPE_AES=y
 CONFIG_PSA_WANT_ALG_CBC_NO_PADDING=y
+
+# native_sim requires ECB cipher to be enabled
+CONFIG_PSA_WANT_ALG_ECB_NO_PADDING=y
diff --git a/tests/subsys/secure_storage/psa/crypto/src/main.c b/tests/subsys/secure_storage/psa/crypto/src/main.c
index 1a59f002796..08a6c4a6760 100644
--- a/tests/subsys/secure_storage/psa/crypto/src/main.c
+++ b/tests/subsys/secure_storage/psa/crypto/src/main.c
@@ -76,7 +76,12 @@ ZTEST(secure_storage_psa_crypto, test_its_caller_isolation)
 
 	ret = psa_get_key_attributes(ID, &retrieved_key_attributes);
 	zassert_equal(ret, PSA_SUCCESS);
-	zassert_mem_equal(&retrieved_key_attributes, &key_attributes, sizeof(key_attributes));
+	zassert_equal(key_attributes.private_bits, retrieved_key_attributes.private_bits);
+	zassert_equal(key_attributes.private_id, retrieved_key_attributes.private_id);
+	zassert_equal(key_attributes.private_lifetime, retrieved_key_attributes.private_lifetime);
+	zassert_mem_equal(&key_attributes.private_policy, &retrieved_key_attributes.private_policy,
+			  sizeof(key_attributes.private_policy));
+
 	ret = psa_destroy_key(ID);
 	zassert_equal(ret, PSA_SUCCESS);
 	ret = psa_get_key_attributes(ID, &retrieved_key_attributes);
diff --git a/tests/subsys/secure_storage/psa/crypto/testcase.yaml b/tests/subsys/secure_storage/psa/crypto/testcase.yaml
index ce369fc1013..df8a5b5d364 100644
--- a/tests/subsys/secure_storage/psa/crypto/testcase.yaml
+++ b/tests/subsys/secure_storage/psa/crypto/testcase.yaml
@@ -10,5 +10,8 @@ tests:
       - nrf54l15dk/nrf54l15/cpuapp
   secure_storage.psa.crypto.tfm:
     filter: CONFIG_BUILD_WITH_TFM
+    extra_args:
+      - CONFIG_TFM_PROFILE_TYPE_MEDIUM=y
+      - CONFIG_PSA_WANT_GENERATE_RANDOM=y
     integration_platforms:
       - nrf9151dk/nrf9151/ns
diff --git a/tests/subsys/secure_storage/psa/its/overlay-secure_storage.conf b/tests/subsys/secure_storage/psa/its/overlay-secure_storage.conf
index 3ca9fdabcf2..8a81a4a4f9a 100644
--- a/tests/subsys/secure_storage/psa/its/overlay-secure_storage.conf
+++ b/tests/subsys/secure_storage/psa/its/overlay-secure_storage.conf
@@ -2,3 +2,7 @@ CONFIG_ZTEST_STACK_SIZE=3072
 CONFIG_MAIN_STACK_SIZE=2048
 
 CONFIG_SECURE_STORAGE=y
+
+# native_sim requires ECB cipher to be enabled
+CONFIG_PSA_WANT_ALG_ECB_NO_PADDING=y
+CONFIG_PSA_WANT_KEY_TYPE_AES=y
diff --git a/tests/subsys/secure_storage/psa/its/overlay-tfm.conf b/tests/subsys/secure_storage/psa/its/overlay-tfm.conf
index 78762d8afa3..969d32669e4 100644
--- a/tests/subsys/secure_storage/psa/its/overlay-tfm.conf
+++ b/tests/subsys/secure_storage/psa/its/overlay-tfm.conf
@@ -1,2 +1,3 @@
 CONFIG_TFM_ITS_MAX_ASSET_SIZE_OVERRIDE=y
-CONFIG_TFM_ITS_MAX_ASSET_SIZE=256
+CONFIG_TFM_ITS_MAX_ASSET_SIZE=512
+CONFIG_TFM_PROFILE_TYPE_MEDIUM=y
diff --git a/tests/subsys/secure_storage/psa/its/prj.conf b/tests/subsys/secure_storage/psa/its/prj.conf
index 9467c292689..444328072a4 100644
--- a/tests/subsys/secure_storage/psa/its/prj.conf
+++ b/tests/subsys/secure_storage/psa/its/prj.conf
@@ -1 +1,2 @@
 CONFIG_ZTEST=y
+CONFIG_ZTEST_STACK_SIZE=3072

From 8a64a2e4ab24379765dde83c2a50044c0d615541 Mon Sep 17 00:00:00 2001
From: Juha Ylinen <juha.ylinen@nordicsemi.no>
Date: Thu, 30 Jan 2025 10:50:22 +0200
Subject: [PATCH 2287/2913] [nrf noup] samples: psa: Fix issues

Set CONFIG_TFM_PROFILE_TYPE_MEDIUM for boards with TF-M to enable
ITS and PS.

Enable CONFIG_PSA_WANT_GENERATE_RANDOM to fix persistent_key
sample.

native_sim requires ECB cipher to be enabled.

Signed-off-by: Juha Ylinen <juha.ylinen@nordicsemi.no>
---
 samples/psa/its/overlay-secure_storage.conf            | 3 +++
 samples/psa/its/sample.yaml                            | 2 ++
 samples/psa/persistent_key/overlay-secure_storage.conf | 3 +++
 samples/psa/persistent_key/sample.yaml                 | 3 +++
 4 files changed, 11 insertions(+)

diff --git a/samples/psa/its/overlay-secure_storage.conf b/samples/psa/its/overlay-secure_storage.conf
index 3473ae38910..8ff0c17ebcb 100644
--- a/samples/psa/its/overlay-secure_storage.conf
+++ b/samples/psa/its/overlay-secure_storage.conf
@@ -3,6 +3,9 @@
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 
+# native_sim requires ECB cipher to be enabled
+CONFIG_PSA_WANT_ALG_ECB_NO_PADDING=y
+
 # The default stack size (1024) is not enough for the PSA Crypto core.
 # On top of that, the ITS implementation uses the stack for buffers.
 CONFIG_MAIN_STACK_SIZE=3072
diff --git a/samples/psa/its/sample.yaml b/samples/psa/its/sample.yaml
index c4ee3543696..024c065ba74 100644
--- a/samples/psa/its/sample.yaml
+++ b/samples/psa/its/sample.yaml
@@ -13,6 +13,8 @@ common:
 tests:
   sample.psa.its.tfm:
     filter: CONFIG_BUILD_WITH_TFM
+    extra_args:
+      - CONFIG_TFM_PROFILE_TYPE_MEDIUM=y
     tags:
       - trusted-firmware-m
   sample.psa.its.secure_storage.entropy_driver:
diff --git a/samples/psa/persistent_key/overlay-secure_storage.conf b/samples/psa/persistent_key/overlay-secure_storage.conf
index 3473ae38910..8ff0c17ebcb 100644
--- a/samples/psa/persistent_key/overlay-secure_storage.conf
+++ b/samples/psa/persistent_key/overlay-secure_storage.conf
@@ -3,6 +3,9 @@
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 
+# native_sim requires ECB cipher to be enabled
+CONFIG_PSA_WANT_ALG_ECB_NO_PADDING=y
+
 # The default stack size (1024) is not enough for the PSA Crypto core.
 # On top of that, the ITS implementation uses the stack for buffers.
 CONFIG_MAIN_STACK_SIZE=3072
diff --git a/samples/psa/persistent_key/sample.yaml b/samples/psa/persistent_key/sample.yaml
index 01cf9f450d1..89ced48f5b4 100644
--- a/samples/psa/persistent_key/sample.yaml
+++ b/samples/psa/persistent_key/sample.yaml
@@ -13,6 +13,9 @@ common:
 tests:
   sample.psa.persistent_key.tfm:
     filter: CONFIG_BUILD_WITH_TFM
+    extra_args:
+      - CONFIG_TFM_PROFILE_TYPE_MEDIUM=y
+      - CONFIG_PSA_WANT_GENERATE_RANDOM=y
     tags:
       - trusted-firmware-m
   sample.psa.persistent_key.secure_storage.entropy_driver:

From 5156ca3db2741f009306aaa555c9bb70d9fe8777 Mon Sep 17 00:00:00 2001
From: Karsten Koenig <karsten.koenig@nordicsemi.no>
Date: Wed, 5 Feb 2025 14:04:39 +0100
Subject: [PATCH 2288/2913] Revert "[nrf noup] moduled: hal_nordic: require
 nrf-regtool"

This reverts commit 8758068d4570a4e34e0da2391144af7d5274e45c.

Signed-off-by: Karsten Koenig <karsten.koenig@nordicsemi.no>
---
 modules/hal_nordic/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt
index 0d3f2a2f5eb..5209efdced9 100644
--- a/modules/hal_nordic/CMakeLists.txt
+++ b/modules/hal_nordic/CMakeLists.txt
@@ -12,7 +12,7 @@ if(CONFIG_NRF_REGTOOL_GENERATE_UICR)
   list(APPEND nrf_regtool_components GENERATE:UICR)
 endif()
 if(DEFINED nrf_regtool_components)
-  find_package(nrf-regtool 8.0.0 REQUIRED
+  find_package(nrf-regtool 8.0.0
     COMPONENTS ${nrf_regtool_components}
     PATHS ${CMAKE_CURRENT_LIST_DIR}/nrf-regtool
     NO_CMAKE_PATH

From ca2e76c95f0dba3c32f91006061390312ebb89ca Mon Sep 17 00:00:00 2001
From: Karsten Koenig <karsten.koenig@nordicsemi.no>
Date: Mon, 3 Feb 2025 10:20:24 +0100
Subject: [PATCH 2289/2913] [nrf fromtree] modules: hal_nordic: bump regtool to
 8.1.2

Recent versions fixed issues for EXMIF and TDM pins as well as support
for dynamic placement of the ETR buffer.

Signed-off-by: Karsten Koenig <karsten.koenig@nordicsemi.no>

(cherry picked from commit 5f6a3ebcf5f50885061db050ccacaeeeced7aef3)
---
 modules/hal_nordic/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt
index 5209efdced9..02d72437734 100644
--- a/modules/hal_nordic/CMakeLists.txt
+++ b/modules/hal_nordic/CMakeLists.txt
@@ -12,7 +12,7 @@ if(CONFIG_NRF_REGTOOL_GENERATE_UICR)
   list(APPEND nrf_regtool_components GENERATE:UICR)
 endif()
 if(DEFINED nrf_regtool_components)
-  find_package(nrf-regtool 8.0.0
+  find_package(nrf-regtool 8.1.2
     COMPONENTS ${nrf_regtool_components}
     PATHS ${CMAKE_CURRENT_LIST_DIR}/nrf-regtool
     NO_CMAKE_PATH

From c8aea90f09265465244b6881a5c4a93486c5eef0 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Wed, 30 Oct 2024 16:37:13 +0100
Subject: [PATCH 2290/2913] [nrf noup] moduled: hal_nordic: require nrf-regtool

Upstream not ready yet, revert once applied there.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
Signed-off-by: Karsten Koenig <karsten.koenig@nordicsemi.no>

(cherry picked from commit 6384b5876f5b4c4c16a343d396de14d6ce52b4fe)
---
 modules/hal_nordic/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt
index 02d72437734..53bbca02494 100644
--- a/modules/hal_nordic/CMakeLists.txt
+++ b/modules/hal_nordic/CMakeLists.txt
@@ -12,7 +12,7 @@ if(CONFIG_NRF_REGTOOL_GENERATE_UICR)
   list(APPEND nrf_regtool_components GENERATE:UICR)
 endif()
 if(DEFINED nrf_regtool_components)
-  find_package(nrf-regtool 8.1.2
+  find_package(nrf-regtool 8.1.2 REQUIRED
     COMPONENTS ${nrf_regtool_components}
     PATHS ${CMAKE_CURRENT_LIST_DIR}/nrf-regtool
     NO_CMAKE_PATH

From 6c9b2f2f417cad2a64de64abb93cca93d78a1269 Mon Sep 17 00:00:00 2001
From: Sean Madigan <sean.madigan@nordicsemi.no>
Date: Thu, 13 Feb 2025 11:46:34 +0000
Subject: [PATCH 2291/2913] [nrf noup] lib: net_buf: buf: Revert alloc DBG to
 WRN change

nrf noup resolution - Please drop this commit after upmerge
if there is a conflict, as it should no longer be required.

This warning is raised in many places when using bluetooth.
However, it is not very useful for the user to see.

This is a noup PR as there is currently more changes coming
in around this code and how to handle deadlocks in zephyr.

Signed-off-by: Sean Madigan <sean.madigan@nordicsemi.no>
---
 lib/net_buf/buf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/net_buf/buf.c b/lib/net_buf/buf.c
index 6d409430f08..a2f504ac06b 100644
--- a/lib/net_buf/buf.c
+++ b/lib/net_buf/buf.c
@@ -273,7 +273,7 @@ struct net_buf *net_buf_alloc_len(struct net_buf_pool *pool, size_t size,
 
 	if (!K_TIMEOUT_EQ(timeout, K_NO_WAIT) &&
 	    k_current_get() == k_work_queue_thread_get(&k_sys_work_q)) {
-		LOG_WRN("Timeout discarded. No blocking in syswq");
+		LOG_DBG("Timeout discarded. No blocking in syswq");
 		timeout = K_NO_WAIT;
 	}
 

From 1e22329f0a86ed8310830c751c172ecbd098cfcc Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Wed, 12 Feb 2025 14:58:43 +0100
Subject: [PATCH 2292/2913] [nrf fromtree] cmake: code relocation setting.

With code relocation directives passed to the gen_relocate_app.py script
using generated file, then each directive can be place on individual
line in the file and thus free up the `|` character as separator.

Furthermore, a multi-line file with each directive on separate line is
also more user-readable, making debugging easier.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit cb8f99ab7ab809548ceba6033690f4ac24ea0c67)
---
 cmake/modules/extensions.cmake    | 4 ++--
 scripts/build/gen_relocate_app.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index 91bfa14aeff..4974c94961c 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -1521,7 +1521,7 @@ function(zephyr_code_relocate)
   if(CODE_REL_PHDR)
     set(CODE_REL_LOCATION "${CODE_REL_LOCATION}\ :${CODE_REL_PHDR}")
   endif()
-  # We use the "|" character to separate code relocation directives, instead of
+  # Each code relocation directive is placed on an independent line, instead of
   # using set_property(APPEND) to produce a ";"-separated CMake list. This way,
   # each directive can embed multiple CMake lists, representing flags and files,
   # the latter of which can come from generator expressions.
@@ -1529,7 +1529,7 @@ function(zephyr_code_relocate)
     PROPERTY INTERFACE_SOURCES)
   set_property(TARGET code_data_relocation_target
     PROPERTY INTERFACE_SOURCES
-    "${code_rel_str}|${CODE_REL_LOCATION}:${flag_list}:${file_list}")
+    "${code_rel_str}\n${CODE_REL_LOCATION}:${flag_list}:${file_list}")
 endfunction()
 
 # Usage:
diff --git a/scripts/build/gen_relocate_app.py b/scripts/build/gen_relocate_app.py
index f1bcccf1df6..95cb0e557b9 100644
--- a/scripts/build/gen_relocate_app.py
+++ b/scripts/build/gen_relocate_app.py
@@ -526,10 +526,10 @@ def create_dict_wrt_mem():
     rel_dict = dict()
     phdrs = dict()
 
-    input_rel_dict = args.input_rel_dict.read()
-    if input_rel_dict == '':
+    input_rel_dict = args.input_rel_dict.read().splitlines()
+    if not input_rel_dict:
         sys.exit("Disable CONFIG_CODE_DATA_RELOCATION if no file needs relocation")
-    for line in input_rel_dict.split('|'):
+    for line in input_rel_dict:
         if ':' not in line:
             continue
 

From d5aefbe12134f15bb6d143af50110396bb5ec3b3 Mon Sep 17 00:00:00 2001
From: Sylvain Chouleur <sylvain.chouleur@gmail.com>
Date: Mon, 17 Jun 2024 12:11:04 +0200
Subject: [PATCH 2293/2913] [nrf fromtree] scripts: code_relocate: support
 section filter

One might want to select the symbols to be relocated inside a file or
a library. To do this, one can use the FILTER argument of
zephyr_code_relocate which must contain a regular expression of the
section names to be selected for relocation.

The test_function_in_sram2 test case in
`tests/application_development/code_relocation` has been updated to
verify that only one function `function_in_sram()` is relocated to ram
and that the function `function_not_relocated()` is not being relocated
when using relocation filter.

Signed-off-by: Sylvain Chouleur <sylvain.chouleur@gmail.com>
Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 4454734d127ad5519c2f8d72e002d5471add4d24)
---
 cmake/modules/extensions.cmake                |  4 +-
 doc/kernel/code-relocation.rst                | 34 ++++++++++--
 scripts/build/gen_relocate_app.py             | 54 ++++++++++++-------
 .../code_relocation/CMakeLists.txt            |  2 +-
 .../code_relocation/src/test_file1.c          | 16 ++++++
 .../code_relocation/src/test_file2.c          | 11 ++++
 6 files changed, 95 insertions(+), 26 deletions(-)

diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index 4974c94961c..6ad4a169567 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -1452,7 +1452,7 @@ endmacro()
 # - PHDR [program_header]: add program header. Used on Xtensa platforms.
 function(zephyr_code_relocate)
   set(options NOCOPY NOKEEP)
-  set(single_args LIBRARY LOCATION PHDR)
+  set(single_args LIBRARY LOCATION PHDR FILTER)
   set(multi_args FILES)
   cmake_parse_arguments(CODE_REL "${options}" "${single_args}"
     "${multi_args}" ${ARGN})
@@ -1529,7 +1529,7 @@ function(zephyr_code_relocate)
     PROPERTY INTERFACE_SOURCES)
   set_property(TARGET code_data_relocation_target
     PROPERTY INTERFACE_SOURCES
-    "${code_rel_str}\n${CODE_REL_LOCATION}:${flag_list}:${file_list}")
+    "${code_rel_str}\n${CODE_REL_LOCATION}:${flag_list}:${file_list},${CODE_REL_FILTER}")
 endfunction()
 
 # Usage:
diff --git a/doc/kernel/code-relocation.rst b/doc/kernel/code-relocation.rst
index aea6e11793d..c3b8aced76e 100644
--- a/doc/kernel/code-relocation.rst
+++ b/doc/kernel/code-relocation.rst
@@ -14,15 +14,23 @@ This script provides a robust way to re-order the memory contents without
 actually having to modify the code.  In simple terms this script will do the job
 of ``__attribute__((section("name")))`` for a bunch of files together.
 
+A regular expression filter can be used to select only the required sections to be relocated.
+
 Details
 *******
-The memory region and file are given to the :ref:`gen_relocate_app.py` script in the form of a string.
+The memory region and file are given to the :ref:`gen_relocate_app.py` script
+through a file where each line specifies a list of files to be placed in the
+given region.
+
+An example of such a file is:
+
+  .. code-block:: none
 
-An example of such a string is:
-``SRAM2:/home/xyz/zephyr/samples/hello_world/src/main.c,SRAM1:/home/xyz/zephyr/samples/hello_world/src/main2.c``
+     SRAM2:/home/xyz/zephyr/samples/hello_world/src/main.c,
+     SRAM1:/home/xyz/zephyr/samples/hello_world/src/main2.c,
 
 This script is invoked with the following parameters:
-``python3 gen_relocate_app.py -i input_string -o generated_linker -c generated_code``
+``python3 gen_relocate_app.py -i input_file -o generated_linker -c generated_code``
 
 Kconfig :kconfig:option:`CONFIG_CODE_DATA_RELOCATION` option,  when enabled in
 ``prj.conf``, will invoke the script and do the required relocation.
@@ -97,6 +105,24 @@ This section shows additional configuration options that can be set in
      zephyr_code_relocate(FILES ${sources} LOCATION SRAM)
      zephyr_code_relocate(FILES $<TARGET_PROPERTY:my_tgt,SOURCES> LOCATION SRAM)
 
+Section Filtering
+=================
+
+By default, all sections of the specified files will be relocated. If
+``FILTER`` is used, a regular expression is provided to select only
+the sections to be relocated.
+
+The regular expression applies to sections names which can be used to
+select the file's symbols when this one has been built with
+``-ffunction-sections`` and ``-fdata-sections`` which is the case by
+default.
+
+  .. code-block:: none
+
+     zephyr_code_relocate(FILES src/file1.c FILTER ".*\\.func1|.*\\.func2" LOCATION SRAM2_TEXT)
+
+The example above will only relocate ``func1()`` and ``func2()`` of file ``src/file1.c``
+
 NOKEEP flag
 ===========
 
diff --git a/scripts/build/gen_relocate_app.py b/scripts/build/gen_relocate_app.py
index 95cb0e557b9..48ef8a4bf95 100644
--- a/scripts/build/gen_relocate_app.py
+++ b/scripts/build/gen_relocate_app.py
@@ -8,21 +8,22 @@
 """
 This script will relocate .text, .rodata, .data and .bss sections from required files
 and places it in the required memory region. This memory region and file
-are given to this python script in the form of a string.
+are given to this python script in the form of a file.
+A regular expression filter can be applied to select only the required sections from the file.
 
-Example of such a string would be::
+Example of content in such an input file would be::
 
-   SRAM2:COPY:/home/xyz/zephyr/samples/hello_world/src/main.c,\
-   SRAM1:COPY:/home/xyz/zephyr/samples/hello_world/src/main2.c, \
-   FLASH2:NOCOPY:/home/xyz/zephyr/samples/hello_world/src/main3.c
+   SRAM2:COPY:/home/xyz/zephyr/samples/hello_world/src/main.c,.*foo|.*bar
+   SRAM1:COPY:/home/xyz/zephyr/samples/hello_world/src/main2.c,.*bar
+   FLASH2:NOCOPY:/home/xyz/zephyr/samples/hello_world/src/main3.c,
 
 One can also specify the program header for a given memory region:
 
-   SRAM2\\ :phdr0:COPY:/home/xyz/zephyr/samples/hello_world/src/main.c
+   SRAM2\\ :phdr0:COPY:/home/xyz/zephyr/samples/hello_world/src/main.c,
 
 To invoke this script::
 
-   python3 gen_relocate_app.py -i input_string -o generated_linker -c generated_code
+   python3 gen_relocate_app.py -i input_file -o generated_linker -c generated_code
 
 Configuration that needs to be sent to the python script.
 
@@ -45,6 +46,7 @@
 import argparse
 import os
 import glob
+import re
 import warnings
 from collections import defaultdict
 from enum import Enum
@@ -225,7 +227,7 @@ def region_is_default_ram(region_name: str) -> bool:
     return region_name == args.default_ram_region
 
 
-def find_sections(filename: str) -> 'dict[SectionKind, list[OutputSection]]':
+def find_sections(filename: str, symbol_filter: str) -> 'dict[SectionKind, list[OutputSection]]':
     """
     Locate relocatable sections in the given object file.
 
@@ -243,6 +245,9 @@ def find_sections(filename: str) -> 'dict[SectionKind, list[OutputSection]]':
         out = defaultdict(list)
 
         for section in sections:
+            if not re.search(symbol_filter, section.name):
+                # Section is filtered-out
+                continue
             section_kind = SectionKind.for_section_named(section.name)
             if section_kind is None:
                 continue
@@ -501,9 +506,10 @@ def get_obj_filename(searchpath, filename):
 
 
 # Extracts all possible components for the input string:
-# <mem_region>[\ :program_header]:<flag_1>[;<flag_2>...]:<file_1>[;<file_2>...]
-# Returns a 4-tuple with them: (mem_region, program_header, flags, files)
+# <mem_region>[\ :program_header]:<flag_1>[;<flag_2>...]:<file_1>[;<file_2>...][,filter]
+# Returns a 5-tuple with them: (mem_region, program_header, flags, files, filter)
 # If no `program_header` is defined, returns an empty string
+# If no `filter` is defined, returns an empty string
 def parse_input_string(line):
     # Be careful when splitting by : to avoid breaking absolute paths on Windows
     mem_region, rest = line.split(':', 1)
@@ -513,13 +519,19 @@ def parse_input_string(line):
         mem_region = mem_region.rstrip()
         phdr, rest = rest.split(':', 1)
 
-    # Split lists by semicolons, in part to support generator expressions
-    flag_list, file_list = (lst.split(';') for lst in rest.split(':', 1))
+    flag_list, rest = rest.split(':', 1)
+    flag_list = flag_list.split(';')
+
+
+    # Split file list by semicolons, in part to support generator expressions
+    file_list, symbol_filter = rest.split(',', 1)
+    file_list = file_list.split(';')
 
-    return mem_region, phdr, flag_list, file_list
+    return mem_region, phdr, flag_list, file_list, symbol_filter
 
 
-# Create a dict with key as memory type and files as a list of values.
+# Create a dict with key as memory type and (files, symbol_filter) tuple
+# as a list of values.
 # Also, return another dict with program headers for memory regions
 def create_dict_wrt_mem():
     # need to support wild card *
@@ -529,11 +541,12 @@ def create_dict_wrt_mem():
     input_rel_dict = args.input_rel_dict.read().splitlines()
     if not input_rel_dict:
         sys.exit("Disable CONFIG_CODE_DATA_RELOCATION if no file needs relocation")
+
     for line in input_rel_dict:
         if ':' not in line:
             continue
 
-        mem_region, phdr, flag_list, file_list = parse_input_string(line)
+        mem_region, phdr, flag_list, file_list, symbol_filter = parse_input_string(line)
 
         # Handle any program header
         if phdr != '':
@@ -556,12 +569,15 @@ def create_dict_wrt_mem():
         if args.verbose:
             print("Memory region ", mem_region, " Selected for files:", file_name_list)
 
+        # Apply filter on files
+        file_name_filter_list = [(f, symbol_filter) for f in file_name_list]
+
         mem_region = "|".join((mem_region, *flag_list))
 
         if mem_region in rel_dict:
-            rel_dict[mem_region].extend(file_name_list)
+            rel_dict[mem_region].extend(file_name_filter_list)
         else:
-            rel_dict[mem_region] = file_name_list
+            rel_dict[mem_region] = file_name_filter_list
 
     return rel_dict, phdrs
 
@@ -585,13 +601,13 @@ def main():
     for memory_type, files in rel_dict.items():
         full_list_of_sections: 'dict[SectionKind, list[OutputSection]]' = defaultdict(list)
 
-        for filename in files:
+        for filename, symbol_filter in files:
             obj_filename = get_obj_filename(searchpath, filename)
             # the obj file wasn't found. Probably not compiled.
             if not obj_filename:
                 continue
 
-            file_sections = find_sections(obj_filename)
+            file_sections = find_sections(obj_filename, symbol_filter)
             # Merge sections from file into collection of sections for all files
             for category, sections in file_sections.items():
                 full_list_of_sections[category].extend(sections)
diff --git a/tests/application_development/code_relocation/CMakeLists.txt b/tests/application_development/code_relocation/CMakeLists.txt
index 60350a6e2a5..c58b9522e1e 100644
--- a/tests/application_development/code_relocation/CMakeLists.txt
+++ b/tests/application_development/code_relocation/CMakeLists.txt
@@ -17,7 +17,7 @@ endif()
 # Code relocation feature
 zephyr_code_relocate(FILES src/test_file1.c ${SRAM2_PHDR} LOCATION SRAM2)
 
-zephyr_code_relocate(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/test_file2.c ${RAM_PHDR} LOCATION RAM)
+zephyr_code_relocate(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/test_file2.c ${RAM_PHDR} LOCATION RAM FILTER ".*sram")
 
 # Add custom library that we can relocate code for
 add_subdirectory(test_lib)
diff --git a/tests/application_development/code_relocation/src/test_file1.c b/tests/application_development/code_relocation/src/test_file1.c
index 1e1cbafb54f..426f0ac56e6 100644
--- a/tests/application_development/code_relocation/src/test_file1.c
+++ b/tests/application_development/code_relocation/src/test_file1.c
@@ -23,12 +23,15 @@ __in_section(rodata, sram2, var) const uint32_t var_sram2_rodata = 100U;
 __in_section(custom_section, static, var) uint32_t var_custom_data = 1U;
 
 extern void function_in_sram(int32_t value);
+extern void function_not_relocated(int32_t value);
 void function_in_custom_section(void);
 
 #define HAS_SRAM2_DATA_SECTION (CONFIG_ARM)
 
 ZTEST(code_relocation, test_function_in_sram2)
 {
+	extern uintptr_t __ram_text_reloc_start;
+	extern uintptr_t __ram_text_reloc_end;
 	extern uintptr_t __sram2_text_reloc_start;
 	extern uintptr_t __sram2_text_reloc_end;
 	extern uintptr_t __sram2_data_reloc_start;
@@ -64,7 +67,20 @@ ZTEST(code_relocation, test_function_in_sram2)
 		"var_sram2_bss not in sram2_bss region");
 
 	/* Print values from sram */
+	printk("Address of function_in_sram %p\n", &function_in_sram);
+	zassert_between_inclusive((uintptr_t)&function_in_sram,
+		(uintptr_t)&__ram_text_reloc_start,
+		(uintptr_t)&__ram_text_reloc_end,
+		"function_in_sram is not in ram region");
 	function_in_sram(var_sram2_data);
+
+	/* Print values from non-relocated function */
+	printk("Address of function_not_relocated %p\n", &function_not_relocated);
+	zassert_between_inclusive((uintptr_t)&function_not_relocated,
+		(uintptr_t)&__text_region_start,
+		(uintptr_t)&__text_region_end,
+		"function_not_relocated is not in flash region");
+	function_not_relocated(var_sram2_data);
 	/* Call library function */
 	relocated_library();
 
diff --git a/tests/application_development/code_relocation/src/test_file2.c b/tests/application_development/code_relocation/src/test_file2.c
index d8b56730d39..9deccc3a42f 100644
--- a/tests/application_development/code_relocation/src/test_file2.c
+++ b/tests/application_development/code_relocation/src/test_file2.c
@@ -19,3 +19,14 @@ void function_in_sram(int32_t value)
 	printk("Address of memcpy %p\n\n", &memcpy);
 	zassert_mem_equal(src, dst, 8, "memcpy compare error");
 }
+
+void function_not_relocated(int32_t value)
+{
+	char src[8] = "data\n";
+	char dst[8];
+
+	printk("Hello World! %s\n", CONFIG_BOARD);
+	memcpy(dst, src, 8);
+	printk("Address of memcpy %p\n\n", &memcpy);
+	zassert_mem_equal(src, dst, 8, "memcpy compare error");
+}

From bf64a318c900f2cf9b97e0df5bb813d47b398654 Mon Sep 17 00:00:00 2001
From: Marek Pieta <Marek.Pieta@nordicsemi.no>
Date: Mon, 10 Feb 2025 13:02:05 +0100
Subject: [PATCH 2294/2913] [nrf fromtree] bluetooth: host: Allow for ECDH
 operations through system workq

Change allows performing ECDH operations through system workq. This is
done to allow reducing memory consumption by disabling the long workq on
small SoCs.

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
(cherry picked from commit c7f3ad6307a034beb486077899440cb6a2eeeca5)
---
 subsys/bluetooth/host/Kconfig |  7 ++++---
 subsys/bluetooth/host/ecc.c   | 12 ++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index cc5ee14f92b..36cbac984ac 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -1002,10 +1002,11 @@ config BT_ECC
 	select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT
 	select PSA_WANT_ECC_SECP_R1_256
 	imply MBEDTLS_PSA_P256M_DRIVER_ENABLED if MBEDTLS_PSA_CRYPTO_C
-	select BT_LONG_WQ
+	imply BT_LONG_WQ
 	help
-	  If this option is set, internal APIs will be available to perform ECDH operations
-	  through the long work queue. operations needed e.g. by LE Secure Connections.
+	  If this option is set, internal APIs will be available to perform ECDH operations through
+	  the long work queue (or system work queue). The operations are used e.g. by LE Secure
+	  Connections.
 
 endif # BT_HCI_HOST
 
diff --git a/subsys/bluetooth/host/ecc.c b/subsys/bluetooth/host/ecc.c
index d28133e8386..94c44dd0409 100644
--- a/subsys/bluetooth/host/ecc.c
+++ b/subsys/bluetooth/host/ecc.c
@@ -279,7 +279,11 @@ int bt_pub_key_gen(struct bt_pub_key_cb *new_cb)
 
 	atomic_clear_bit(bt_dev.flags, BT_DEV_HAS_PUB_KEY);
 
-	bt_long_wq_submit(&pub_key_work);
+	if (IS_ENABLED(CONFIG_BT_LONG_WQ)) {
+		bt_long_wq_submit(&pub_key_work);
+	} else {
+		k_work_submit(&pub_key_work);
+	}
 
 	return 0;
 }
@@ -338,7 +342,11 @@ int bt_dh_key_gen(const uint8_t remote_pk[BT_PUB_KEY_LEN], bt_dh_key_cb_t cb)
 	sys_memcpy_swap(&ecc.public_key_be[BT_PUB_KEY_COORD_LEN],
 			&remote_pk[BT_PUB_KEY_COORD_LEN], BT_PUB_KEY_COORD_LEN);
 
-	bt_long_wq_submit(&dh_key_work);
+	if (IS_ENABLED(CONFIG_BT_LONG_WQ)) {
+		bt_long_wq_submit(&dh_key_work);
+	} else {
+		k_work_submit(&dh_key_work);
+	}
 
 	return 0;
 }

From c95179863fbc1931bfe1e03f78ca0bb6953e40bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Fri, 14 Feb 2025 11:41:40 +0100
Subject: [PATCH 2295/2913] [nrf fromtree] tests: nrf: enable twister tests for
 nrf54l09pdk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enabled tests:
- clock_control_api
- nrf_clock_calibration
- nrf_lf_clock_start
- clock_control/onoff
- counter_basic_api
- flash/common
- flahs/negative_tests
- retained_mem/api
- nrf_grtc_timer
- wdt_error_cases
- fs/fcb
- stream/stream_flash

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 6f419cd6fb6b081b7faa3df44ecc876733847410)
---
 .../clock_control_api/testcase.yaml           |  2 ++
 .../nrf_clock_calibration/testcase.yaml       |  1 +
 .../nrf_lf_clock_start/testcase.yaml          |  8 +++++
 .../drivers/clock_control/onoff/testcase.yaml |  1 +
 .../nrf54l09pdk_nrf54l09_cpuapp.overlay       | 34 +++++++++++++++++++
 tests/drivers/flash/common/testcase.yaml      |  1 +
 tests/drivers/flash/negative_tests/src/main.c |  5 ++-
 .../flash/negative_tests/testcase.yaml        |  1 +
 .../boards/nrf54l09pdk_nrf54l09_cpuapp.conf   |  1 +
 .../nrf54l09pdk_nrf54l09_cpuapp.overlay       | 22 ++++++++++++
 tests/drivers/retained_mem/api/testcase.yaml  |  1 +
 .../timer/nrf_grtc_timer/testcase.yaml        |  1 +
 .../nrf54l09pdk_nrf54l09_cpuapp.overlay       |  9 +++++
 .../watchdog/wdt_error_cases/testcase.yaml    |  1 +
 tests/subsys/fs/fcb/testcase.yaml             |  1 +
 .../storage/stream/stream_flash/testcase.yaml |  1 +
 16 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 tests/drivers/counter/counter_basic_api/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
 create mode 100644 tests/drivers/retained_mem/api/boards/nrf54l09pdk_nrf54l09_cpuapp.conf
 create mode 100644 tests/drivers/retained_mem/api/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
 create mode 100644 tests/drivers/watchdog/wdt_error_cases/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay

diff --git a/tests/drivers/clock_control/clock_control_api/testcase.yaml b/tests/drivers/clock_control/clock_control_api/testcase.yaml
index c3d01a5c690..21b3f3deb76 100644
--- a/tests/drivers/clock_control/clock_control_api/testcase.yaml
+++ b/tests/drivers/clock_control/clock_control_api/testcase.yaml
@@ -21,6 +21,7 @@ tests:
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
       - nrf9160dk/nrf9160
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
     integration_platforms:
@@ -30,6 +31,7 @@ tests:
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
     integration_platforms:
diff --git a/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml b/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml
index 67108389500..963618c6f23 100644
--- a/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml
+++ b/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml
@@ -7,6 +7,7 @@ tests:
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
     integration_platforms:
diff --git a/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml b/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml
index a57a5f38225..cad39c3625f 100644
--- a/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml
+++ b/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml
@@ -13,6 +13,7 @@ tests:
       - nrf9160dk/nrf9160
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
     extra_configs:
@@ -29,6 +30,7 @@ tests:
       - nrf9160dk/nrf9160
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
     extra_configs:
@@ -59,6 +61,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
     integration_platforms:
@@ -74,6 +77,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
     integration_platforms:
@@ -89,6 +93,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
     integration_platforms:
@@ -104,6 +109,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
     integration_platforms:
@@ -119,6 +125,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
     integration_platforms:
@@ -134,6 +141,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
     integration_platforms:
diff --git a/tests/drivers/clock_control/onoff/testcase.yaml b/tests/drivers/clock_control/onoff/testcase.yaml
index 7d03f6a6ed5..74d8a7f84d8 100644
--- a/tests/drivers/clock_control/onoff/testcase.yaml
+++ b/tests/drivers/clock_control/onoff/testcase.yaml
@@ -7,6 +7,7 @@ tests:
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
       - nrf9160dk/nrf9160
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
new file mode 100644
index 00000000000..54b47926164
--- /dev/null
+++ b/tests/drivers/counter/counter_basic_api/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
@@ -0,0 +1,34 @@
+&timer00 {
+	prescaler = <6>;
+	status = "okay";
+};
+
+&timer10 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer20 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer21 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer22 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer23 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer24 {
+	prescaler = <4>;
+	status = "okay";
+};
diff --git a/tests/drivers/flash/common/testcase.yaml b/tests/drivers/flash/common/testcase.yaml
index 8c4f8ebeaac..700c411066c 100644
--- a/tests/drivers/flash/common/testcase.yaml
+++ b/tests/drivers/flash/common/testcase.yaml
@@ -43,6 +43,7 @@ tests:
   drivers.flash.common.no_explicit_erase:
     platform_allow:
       - nrf54l15dk/nrf54l05/cpuapp
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
diff --git a/tests/drivers/flash/negative_tests/src/main.c b/tests/drivers/flash/negative_tests/src/main.c
index f4d5751ba20..bd6a6557c26 100644
--- a/tests/drivers/flash/negative_tests/src/main.c
+++ b/tests/drivers/flash/negative_tests/src/main.c
@@ -26,7 +26,10 @@
 #define TEST_AREA_SIZE   FIXED_PARTITION_SIZE(TEST_AREA)
 #define TEST_AREA_DEVICE FIXED_PARTITION_DEVICE(TEST_AREA)
 
-#if defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || defined(CONFIG_SOC_NRF54L15)
+#if defined(CONFIG_SOC_NRF54L05) || \
+	defined(CONFIG_SOC_NRF54L09) || \
+	defined(CONFIG_SOC_NRF54L10) || \
+	defined(CONFIG_SOC_NRF54L15)
 #define TEST_FLASH_START (DT_REG_ADDR(DT_MEM_FROM_FIXED_PARTITION(DT_NODELABEL(TEST_AREA))))
 #define TEST_FLASH_SIZE  (DT_REG_SIZE(DT_MEM_FROM_FIXED_PARTITION(DT_NODELABEL(TEST_AREA))))
 #elif defined(CONFIG_SOC_NRF54H20)
diff --git a/tests/drivers/flash/negative_tests/testcase.yaml b/tests/drivers/flash/negative_tests/testcase.yaml
index cea837a8f0d..3a795e4a2da 100644
--- a/tests/drivers/flash/negative_tests/testcase.yaml
+++ b/tests/drivers/flash/negative_tests/testcase.yaml
@@ -5,5 +5,6 @@ common:
 tests:
   drivers.flash.negative_tests:
     platform_allow:
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
diff --git a/tests/drivers/retained_mem/api/boards/nrf54l09pdk_nrf54l09_cpuapp.conf b/tests/drivers/retained_mem/api/boards/nrf54l09pdk_nrf54l09_cpuapp.conf
new file mode 100644
index 00000000000..c15ba3ed96d
--- /dev/null
+++ b/tests/drivers/retained_mem/api/boards/nrf54l09pdk_nrf54l09_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_POWEROFF=y
diff --git a/tests/drivers/retained_mem/api/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay b/tests/drivers/retained_mem/api/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
new file mode 100644
index 00000000000..e304ecbbfb1
--- /dev/null
+++ b/tests/drivers/retained_mem/api/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
@@ -0,0 +1,22 @@
+/ {
+	cpuapp_sram@2002e000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x2002e000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RetainedMem";
+		status = "okay";
+
+		retainedmem0: retainedmem {
+			compatible = "zephyr,retained-ram";
+			status = "okay";
+		};
+	};
+
+	aliases {
+		retainedmemtestdevice = &retainedmem0;
+	};
+};
+
+&cpuapp_sram {
+	reg = <0x20000000 DT_SIZE_K(184)>;
+	ranges = <0x0 0x20000000 0x2e000>;
+};
diff --git a/tests/drivers/retained_mem/api/testcase.yaml b/tests/drivers/retained_mem/api/testcase.yaml
index a9c241978db..bec7bed1321 100644
--- a/tests/drivers/retained_mem/api/testcase.yaml
+++ b/tests/drivers/retained_mem/api/testcase.yaml
@@ -9,6 +9,7 @@ tests:
       - qemu_cortex_m3
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l05/cpuapp
       - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
diff --git a/tests/drivers/timer/nrf_grtc_timer/testcase.yaml b/tests/drivers/timer/nrf_grtc_timer/testcase.yaml
index 6a59a16f340..73dc8cc6170 100644
--- a/tests/drivers/timer/nrf_grtc_timer/testcase.yaml
+++ b/tests/drivers/timer/nrf_grtc_timer/testcase.yaml
@@ -2,6 +2,7 @@ tests:
   drivers.timer.nrf_grtc_timer:
     tags: drivers
     platform_allow:
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15dk/nrf54l15/cpuflpr
       - nrf54l15bsim/nrf54l15/cpuapp
diff --git a/tests/drivers/watchdog/wdt_error_cases/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay b/tests/drivers/watchdog/wdt_error_cases/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
new file mode 100644
index 00000000000..8d3dce3b380
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_error_cases/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_error_cases/testcase.yaml b/tests/drivers/watchdog/wdt_error_cases/testcase.yaml
index e417cc16e45..b5857132654 100644
--- a/tests/drivers/watchdog/wdt_error_cases/testcase.yaml
+++ b/tests/drivers/watchdog/wdt_error_cases/testcase.yaml
@@ -8,6 +8,7 @@ common:
 tests:
   drivers.watchdog.wdt_error_cases:
     platform_allow:
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
diff --git a/tests/subsys/fs/fcb/testcase.yaml b/tests/subsys/fs/fcb/testcase.yaml
index c26935685a2..53a61c3651e 100644
--- a/tests/subsys/fs/fcb/testcase.yaml
+++ b/tests/subsys/fs/fcb/testcase.yaml
@@ -12,6 +12,7 @@ tests:
       - nrf52840dk/nrf52840
   filesystem.fcb.no_erase:
     platform_allow:
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
   filesystem.fcb.native_sim.no_erase:
diff --git a/tests/subsys/storage/stream/stream_flash/testcase.yaml b/tests/subsys/storage/stream/stream_flash/testcase.yaml
index cf4fd513abc..7d9990462f9 100644
--- a/tests/subsys/storage/stream/stream_flash/testcase.yaml
+++ b/tests/subsys/storage/stream/stream_flash/testcase.yaml
@@ -22,6 +22,7 @@ tests:
     # common platforms could bring them here too so filter these out.
     filter: not dt_compat_enabled("zephyr,sim-flash")
     platform_allow:
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
     extra_configs:
       # Tests, currently, can only support single device testing

From 776b31e3ebc43993e2e7c2043a2bf1a5beb37815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Tue, 11 Feb 2025 11:45:14 +0100
Subject: [PATCH 2296/2913] [nrf fromtree] tests: drivers: watchodg: Enable
 wdt_error_cases on nRF5340dk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enable wdt_error_cases test on nRF5340dk.

Define valid test configuration for that target
(reuse from nRF54H/nRF54L).
Add target to the platform_allow.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit c4a817971db94eb65d2a58332ba3136aa13b0dc5)
---
 tests/drivers/watchdog/wdt_error_cases/src/main.c    | 4 ++--
 tests/drivers/watchdog/wdt_error_cases/testcase.yaml | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/drivers/watchdog/wdt_error_cases/src/main.c b/tests/drivers/watchdog/wdt_error_cases/src/main.c
index 990b2b52c98..935d8dd95a0 100644
--- a/tests/drivers/watchdog/wdt_error_cases/src/main.c
+++ b/tests/drivers/watchdog/wdt_error_cases/src/main.c
@@ -42,8 +42,8 @@
 #define DEFAULT_WINDOW_MIN (0U)
 
 /* Align tests to the specific target: */
-#if defined(CONFIG_SOC_SERIES_NRF54LX) || defined(CONFIG_SOC_NRF54H20) || \
-	defined(CONFIG_SOC_NRF9280)
+#if defined(CONFIG_SOC_SERIES_NRF53X) || defined(CONFIG_SOC_SERIES_NRF54LX) || \
+	defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280)
 #define WDT_TEST_FLAGS                                                                             \
 	(WDT_DISABLE_SUPPORTED | WDT_FLAG_RESET_SOC_SUPPORTED |                                    \
 	 WDT_FLAG_ONLY_ONE_TIMEOUT_VALUE_SUPPORTED | WDT_OPT_PAUSE_IN_SLEEP_SUPPORTED |            \
diff --git a/tests/drivers/watchdog/wdt_error_cases/testcase.yaml b/tests/drivers/watchdog/wdt_error_cases/testcase.yaml
index b5857132654..741b379caca 100644
--- a/tests/drivers/watchdog/wdt_error_cases/testcase.yaml
+++ b/tests/drivers/watchdog/wdt_error_cases/testcase.yaml
@@ -8,6 +8,7 @@ common:
 tests:
   drivers.watchdog.wdt_error_cases:
     platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp

From 5605c8c0d3855bc3f50c7a9b9ccd5c32d99b4779 Mon Sep 17 00:00:00 2001
From: Kamil Piszczek <Kamil.Piszczek@nordicsemi.no>
Date: Tue, 11 Feb 2025 15:16:28 +0100
Subject: [PATCH 2297/2913] [nrf fromtree] bluetooth: dis: add Kconfig for
 disabling optional characteristics

Added new Kconfig option set that allows the user to control the
presence of the following optional characteristics:

- Manufacturer Name String
- Model Number String

Depreacted the old configuration that can be deleted in the future
Zephyr releases.

Signed-off-by: Kamil Piszczek <Kamil.Piszczek@nordicsemi.no>
(cherry picked from commit 7c828bd232a1645f5edd17939db04c591877dea4)
---
 drivers/bluetooth/hci/Kconfig.nxp         |  5 ++-
 samples/bluetooth/peripheral_dis/prj.conf |  6 ++-
 subsys/bluetooth/services/Kconfig.dis     | 46 +++++++++++++++++++++--
 subsys/bluetooth/services/dis.c           | 40 +++++++++++++++++++-
 4 files changed, 90 insertions(+), 7 deletions(-)

diff --git a/drivers/bluetooth/hci/Kconfig.nxp b/drivers/bluetooth/hci/Kconfig.nxp
index b91dfbbe488..28b9baa2064 100644
--- a/drivers/bluetooth/hci/Kconfig.nxp
+++ b/drivers/bluetooth/hci/Kconfig.nxp
@@ -48,7 +48,10 @@ endif
 
 if BT_NXP
 
-config BT_DIS_MANUF
+config BT_DIS_MANUF_NAME
+	default y
+
+config BT_DIS_MANUF_NAME_STR
 	default "NXP"
 
 config BT_HCI_ACL_FLOW_CONTROL
diff --git a/samples/bluetooth/peripheral_dis/prj.conf b/samples/bluetooth/peripheral_dis/prj.conf
index 4fed0a4e66f..cc58337db9c 100644
--- a/samples/bluetooth/peripheral_dis/prj.conf
+++ b/samples/bluetooth/peripheral_dis/prj.conf
@@ -3,12 +3,14 @@ CONFIG_BT_PERIPHERAL=y
 
 CONFIG_BT_DIS=y
 CONFIG_BT_DIS_PNP=n
-CONFIG_BT_DIS_MODEL="Zephyr Model"
-CONFIG_BT_DIS_MANUF="Zephyr"
+CONFIG_BT_DIS_MODEL_NUMBER=y
+CONFIG_BT_DIS_MANUF_NAME=y
 CONFIG_BT_DIS_SERIAL_NUMBER=y
 CONFIG_BT_DIS_FW_REV=y
 CONFIG_BT_DIS_HW_REV=y
 CONFIG_BT_DIS_SW_REV=y
+CONFIG_BT_DIS_MODEL_NUMBER_STR="Zephyr Model"
+CONFIG_BT_DIS_MANUF_NAME_STR="Zephyr"
 CONFIG_BT_DIS_SERIAL_NUMBER_STR="Zephyr Serial"
 CONFIG_BT_DIS_FW_REV_STR="Zephyr Firmware"
 CONFIG_BT_DIS_HW_REV_STR="Zephyr Hardware"
diff --git a/subsys/bluetooth/services/Kconfig.dis b/subsys/bluetooth/services/Kconfig.dis
index e1056a250d1..6a15853903d 100644
--- a/subsys/bluetooth/services/Kconfig.dis
+++ b/subsys/bluetooth/services/Kconfig.dis
@@ -23,17 +23,57 @@ config BT_DIS_STR_MAX
 	  Bluetooth DIS string storage size. Storage can be up to 248 bytes
 	  long (excluding NULL termination).
 
-config BT_DIS_MODEL
-	string "Model name"
+config BT_DIS_MODEL_NUMBER
+	bool "Model number characteristic"
+	depends on !BT_DIS_MODEL_DEPRECATED_USED
+	default y
+	help
+	  Enable model number characteristic in Device Information Service.
+
+config BT_DIS_MODEL_NUMBER_STR
+	string "Model number"
+	depends on BT_DIS_MODEL_NUMBER
 	default SOC
+	help
+	  Configure model number string that can be read with the model number characteristic
+	  in Device Information Service.
+
+config BT_DIS_MODEL
+	string "Model name [DEPRECATED]"
 	help
 	  The device model inside Device Information Service.
+	  This option is deprecated. Use BT_DIS_MODEL_NUMBER and BT_DIS_MODEL_NUMBER_STR instead.
 
-config BT_DIS_MANUF
+config BT_DIS_MODEL_DEPRECATED_USED
+	bool
+	default y if BT_DIS_MODEL != ""
+	select DEPRECATED
+
+config BT_DIS_MANUF_NAME
+	bool "Manufacturer name characteristic"
+	depends on !BT_DIS_MANUF_DEPRECATED_USED
+	default y
+	help
+	  Enable manufacturer name characteristic in Device Information Service.
+
+config BT_DIS_MANUF_NAME_STR
 	string "Manufacturer name"
+	depends on BT_DIS_MANUF_NAME
 	default "Manufacturer"
+	help
+	  Configure manufacturer name string that can be read with the manufacturer name
+	  characteristic in Device Information Service.
+
+config BT_DIS_MANUF
+	string "Manufacturer name [DEPRECATED]"
 	help
 	  The device manufacturer inside Device Information Service.
+	  This option is deprecated. Use BT_DIS_MANUF_NAME and BT_DIS_MANUF_NAME_STR instead.
+
+config BT_DIS_MANUF_DEPRECATED_USED
+	bool
+	default y if BT_DIS_MANUF != ""
+	select DEPRECATED
 
 config BT_DIS_PNP
 	bool "PnP_ID characteristic"
diff --git a/subsys/bluetooth/services/dis.c b/subsys/bluetooth/services/dis.c
index 27676600b17..c9f429560c3 100644
--- a/subsys/bluetooth/services/dis.c
+++ b/subsys/bluetooth/services/dis.c
@@ -58,10 +58,20 @@ static uint8_t dis_system_id[8] = {BT_BYTES_LIST_LE40((uint64_t)CONFIG_BT_DIS_SY
 #endif
 
 #if defined(CONFIG_BT_DIS_SETTINGS)
+#if defined(CONFIG_BT_DIS_MODEL_NUMBER)
+BUILD_ASSERT(sizeof(CONFIG_BT_DIS_MODEL_NUMBER_STR) <= CONFIG_BT_DIS_STR_MAX + 1);
+static uint8_t dis_model[CONFIG_BT_DIS_STR_MAX + 1] = CONFIG_BT_DIS_MODEL_NUMBER_STR;
+#elif defined(CONFIG_BT_DIS_MODEL_DEPRECATED_USED)
 BUILD_ASSERT(sizeof(CONFIG_BT_DIS_MODEL) <= CONFIG_BT_DIS_STR_MAX + 1);
-BUILD_ASSERT(sizeof(CONFIG_BT_DIS_MANUF) <= CONFIG_BT_DIS_STR_MAX + 1);
 static uint8_t dis_model[CONFIG_BT_DIS_STR_MAX + 1] = CONFIG_BT_DIS_MODEL;
+#endif
+#if defined(CONFIG_BT_DIS_MANUF_NAME)
+BUILD_ASSERT(sizeof(CONFIG_BT_DIS_MANUF_NAME_STR) <= CONFIG_BT_DIS_STR_MAX + 1);
+static uint8_t dis_manuf[CONFIG_BT_DIS_STR_MAX + 1] = CONFIG_BT_DIS_MANUF_NAME_STR;
+#elif defined(CONFIG_BT_DIS_MANUF_DEPRECATED_USED)
+BUILD_ASSERT(sizeof(CONFIG_BT_DIS_MANUF) <= CONFIG_BT_DIS_STR_MAX + 1);
 static uint8_t dis_manuf[CONFIG_BT_DIS_STR_MAX + 1] = CONFIG_BT_DIS_MANUF;
+#endif
 #if defined(CONFIG_BT_DIS_SERIAL_NUMBER)
 BUILD_ASSERT(sizeof(CONFIG_BT_DIS_SERIAL_NUMBER_STR) <= CONFIG_BT_DIS_STR_MAX + 1);
 static uint8_t dis_serial_number[CONFIG_BT_DIS_STR_MAX + 1] = CONFIG_BT_DIS_SERIAL_NUMBER_STR;
@@ -114,8 +124,16 @@ static uint8_t dis_ieee_rcdl[CONFIG_BT_DIS_STR_MAX + 1] = CONFIG_BT_DIS_IEEE_RCD
 
 #else /* CONFIG_BT_DIS_SETTINGS */
 
+#if defined(CONFIG_BT_DIS_MODEL_NUMBER)
+#define BT_DIS_MODEL_REF             CONFIG_BT_DIS_MODEL_NUMBER_STR
+#elif defined(CONFIG_BT_DIS_MODEL_DEPRECATED_USED)
 #define BT_DIS_MODEL_REF             CONFIG_BT_DIS_MODEL
+#endif
+#if defined(CONFIG_BT_DIS_MANUF_NAME)
+#define BT_DIS_MANUF_REF             CONFIG_BT_DIS_MANUF_NAME_STR
+#elif defined(CONFIG_BT_DIS_MANUF_DEPRECATED_USED)
 #define BT_DIS_MANUF_REF             CONFIG_BT_DIS_MANUF
+#endif
 #define BT_DIS_SERIAL_NUMBER_STR_REF CONFIG_BT_DIS_SERIAL_NUMBER_STR
 #define BT_DIS_FW_REV_STR_REF        CONFIG_BT_DIS_FW_REV_STR
 #define BT_DIS_HW_REV_STR_REF        CONFIG_BT_DIS_HW_REV_STR
@@ -128,12 +146,20 @@ static uint8_t dis_ieee_rcdl[CONFIG_BT_DIS_STR_MAX + 1] = CONFIG_BT_DIS_IEEE_RCD
 
 #endif /* CONFIG_BT_DIS_SETTINGS */
 
+#define BT_DIS_READ_STR_USED \
+	(CONFIG_BT_DIS_MODEL_NUMBER || CONFIG_BT_DIS_MODEL_DEPRECATED_USED || \
+	 CONFIG_BT_DIS_MANUF_NAME || CONFIG_BT_DIS_MANUF_DEPRECATED_USED || \
+	 CONFIG_BT_DIS_SERIAL_NUMBER || CONFIG_BT_DIS_FW_REV || CONFIG_BT_DIS_HW_REV || \
+	 CONFIG_BT_DIS_SW_REV || CONFIG_BT_DIS_IEEE_RCDL)
+
+#if BT_DIS_READ_STR_USED
 static ssize_t read_str(struct bt_conn *conn, const struct bt_gatt_attr *attr, void *buf,
 			uint16_t len, uint16_t offset)
 {
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, attr->user_data,
 				 strlen(attr->user_data));
 }
+#endif
 
 #if CONFIG_BT_DIS_PNP
 static ssize_t read_pnp_id(struct bt_conn *conn, const struct bt_gatt_attr *attr, void *buf,
@@ -226,10 +252,16 @@ static ssize_t read_udi(struct bt_conn *conn, const struct bt_gatt_attr *attr, v
 BT_GATT_SERVICE_DEFINE(
 	dis_svc, BT_GATT_PRIMARY_SERVICE(BT_UUID_DIS),
 
+#if defined(CONFIG_BT_DIS_MODEL_NUMBER) || defined(CONFIG_BT_DIS_MODEL_DEPRECATED_USED)
 	BT_GATT_CHARACTERISTIC(BT_UUID_DIS_MODEL_NUMBER, BT_GATT_CHRC_READ, BT_GATT_PERM_READ,
 			       read_str, NULL, BT_DIS_MODEL_REF),
+#endif
+
+#if defined(CONFIG_BT_DIS_MANUF_NAME) || defined(CONFIG_BT_DIS_MANUF_DEPRECATED_USED)
 	BT_GATT_CHARACTERISTIC(BT_UUID_DIS_MANUFACTURER_NAME, BT_GATT_CHRC_READ, BT_GATT_PERM_READ,
 			       read_str, NULL, BT_DIS_MANUF_REF),
+#endif
+
 #if CONFIG_BT_DIS_PNP
 	BT_GATT_CHARACTERISTIC(BT_UUID_DIS_PNP_ID, BT_GATT_CHRC_READ, BT_GATT_PERM_READ,
 			       read_pnp_id, NULL, &dis_pnp_id),
@@ -309,7 +341,10 @@ static int dis_set(const char *name, size_t len_rd, settings_read_cb read_cb, vo
 	int nlen;
 	const char *next;
 
+	ARG_UNUSED(len);
+
 	nlen = settings_name_next(name, &next);
+#if defined(CONFIG_BT_DIS_MANUF_NAME) || defined(CONFIG_BT_DIS_MANUF_DEPRECATED_USED)
 	if (!strncmp(name, "manuf", nlen)) {
 		len = read_cb(store, &dis_manuf, sizeof(dis_manuf) - 1);
 		if (len < 0) {
@@ -321,6 +356,8 @@ static int dis_set(const char *name, size_t len_rd, settings_read_cb read_cb, vo
 		}
 		return 0;
 	}
+#endif
+#if defined(CONFIG_BT_DIS_MODEL_NUMBER) || defined(CONFIG_BT_DIS_MODEL_DEPRECATED_USED)
 	if (!strncmp(name, "model", nlen)) {
 		len = read_cb(store, &dis_model, sizeof(dis_model) - 1);
 		if (len < 0) {
@@ -332,6 +369,7 @@ static int dis_set(const char *name, size_t len_rd, settings_read_cb read_cb, vo
 		}
 		return 0;
 	}
+#endif
 #if defined(CONFIG_BT_DIS_SERIAL_NUMBER)
 	if (!strncmp(name, "serial", nlen)) {
 		len = read_cb(store, &dis_serial_number, sizeof(dis_serial_number) - 1);

From 4e418716f380f6d80afa9b6669db40a75927bdd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 13 Jan 2025 14:13:09 +0100
Subject: [PATCH 2298/2913] [nrf fromtree] tests: kernel: gen_isr_table: Fix
 test for nRF VPR targets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test was using interrupt lines which does not exist on nRF VPR
targets. nRF54Lx FLPR has interrupts >= 16 and nRF54Hx PPR does
not have interrupt 17. Added configuration which works for
nrf54h20_cpuppr and nrf54lx_flpr.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 0359f37263c920c71bca32bdd354da5abe08269f)
---
 tests/kernel/gen_isr_table/src/main.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/tests/kernel/gen_isr_table/src/main.c b/tests/kernel/gen_isr_table/src/main.c
index 82683f68363..475c2c903f6 100644
--- a/tests/kernel/gen_isr_table/src/main.c
+++ b/tests/kernel/gen_isr_table/src/main.c
@@ -20,10 +20,21 @@ extern uint32_t _irq_vector_table[];
 
 #if defined(CONFIG_RISCV)
 #if defined(CONFIG_NRFX_CLIC)
-#define ISR1_OFFSET	15
-#define ISR3_OFFSET	16
-#define ISR5_OFFSET	17
-#define TRIG_CHECK_SIZE	18
+
+#if defined(CONFIG_SOC_SERIES_NRF54LX) && defined(CONFIG_RISCV_CORE_NORDIC_VPR)
+#define ISR1_OFFSET	16
+#define ISR3_OFFSET	17
+#define ISR5_OFFSET	18
+#define TRIG_CHECK_SIZE	19
+#elif defined(CONFIG_SOC_NRF54H20_CPUPPR)
+#define ISR1_OFFSET	14
+#define ISR3_OFFSET	15
+#define ISR5_OFFSET	16
+#define TRIG_CHECK_SIZE	17
+#else
+#error "Target not supported"
+#endif
+
 #elif defined(CONFIG_RISCV_HAS_CLIC)
 #define ISR1_OFFSET	3
 #define ISR3_OFFSET	17

From 2099f1253baf80200e3831cef9f188f20e0c8c8a Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 6 Feb 2025 15:28:10 +0100
Subject: [PATCH 2299/2913] [nrf fromtree] tests: kernel: gen_isr_table: Fix
 kernel test for nRF FLPR target

Fix kernel `gen_isr_table` test for nRF FLPR target similairly
to PPR target.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 85282d604c0ec0988625ed2f3fe7c76473bdbe0b)
---
 tests/kernel/gen_isr_table/src/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/kernel/gen_isr_table/src/main.c b/tests/kernel/gen_isr_table/src/main.c
index 475c2c903f6..f789c612370 100644
--- a/tests/kernel/gen_isr_table/src/main.c
+++ b/tests/kernel/gen_isr_table/src/main.c
@@ -26,7 +26,7 @@ extern uint32_t _irq_vector_table[];
 #define ISR3_OFFSET	17
 #define ISR5_OFFSET	18
 #define TRIG_CHECK_SIZE	19
-#elif defined(CONFIG_SOC_NRF54H20_CPUPPR)
+#elif defined(CONFIG_SOC_NRF54H20_CPUPPR) || defined(CONFIG_SOC_NRF54H20_CPUFLPR)
 #define ISR1_OFFSET	14
 #define ISR3_OFFSET	15
 #define ISR5_OFFSET	16

From 4084fe86be263f9a49b92808abd20767971e0df3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Wed, 18 Dec 2024 15:59:38 +0100
Subject: [PATCH 2300/2913] [nrf fromtree] samples: basic: add support for
 nRF54H20 cpuppr PWM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added support for nRF54H20 cpuppr PWM in blinky_pwm and
fade_led sample.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit 5b34d77d7b6d91861c14a8cda7858170d940bd13)
---
 .../boards/nrf54h20dk_nrf54h20_cpuppr.overlay | 21 +++++++++++++++++++
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  4 ++++
 .../blinky_pwm/sysbuild/vpr_launcher/prj.conf |  1 +
 .../boards/nrf54h20dk_nrf54h20_cpuppr.overlay | 21 +++++++++++++++++++
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  4 ++++
 .../fade_led/sysbuild/vpr_launcher/prj.conf   |  1 +
 6 files changed, 52 insertions(+)
 create mode 100644 samples/basic/blinky_pwm/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
 create mode 100644 samples/basic/blinky_pwm/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 samples/basic/blinky_pwm/sysbuild/vpr_launcher/prj.conf
 create mode 100644 samples/basic/fade_led/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
 create mode 100644 samples/basic/fade_led/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 samples/basic/fade_led/sysbuild/vpr_launcher/prj.conf

diff --git a/samples/basic/blinky_pwm/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/samples/basic/blinky_pwm/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
new file mode 100644
index 00000000000..92b687ba0f8
--- /dev/null
+++ b/samples/basic/blinky_pwm/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
@@ -0,0 +1,21 @@
+#include <zephyr/dt-bindings/pwm/pwm.h>
+
+/ {
+	aliases {
+		pwm-led0 = &pwm_led2;
+	};
+
+	pwmleds {
+		compatible = "pwm-leds";
+		pwm_led2: pwm_led_2 {
+			pwms = <&pwm130 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+		};
+	};
+};
+
+&pwm130 {
+	status = "okay";
+	pinctrl-0 = <&pwm130_default>;
+	pinctrl-1 = <&pwm130_sleep>;
+	pinctrl-names = "default", "sleep";
+};
diff --git a/samples/basic/blinky_pwm/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/basic/blinky_pwm/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..55fe52a20ce
--- /dev/null
+++ b/samples/basic/blinky_pwm/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,4 @@
+&pwm130 {
+	status = "reserved";
+	interrupt-parent = <&cpuppr_clic>;
+};
diff --git a/samples/basic/blinky_pwm/sysbuild/vpr_launcher/prj.conf b/samples/basic/blinky_pwm/sysbuild/vpr_launcher/prj.conf
new file mode 100644
index 00000000000..b2a4ba59104
--- /dev/null
+++ b/samples/basic/blinky_pwm/sysbuild/vpr_launcher/prj.conf
@@ -0,0 +1 @@
+# nothing here
diff --git a/samples/basic/fade_led/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/samples/basic/fade_led/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
new file mode 100644
index 00000000000..92b687ba0f8
--- /dev/null
+++ b/samples/basic/fade_led/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
@@ -0,0 +1,21 @@
+#include <zephyr/dt-bindings/pwm/pwm.h>
+
+/ {
+	aliases {
+		pwm-led0 = &pwm_led2;
+	};
+
+	pwmleds {
+		compatible = "pwm-leds";
+		pwm_led2: pwm_led_2 {
+			pwms = <&pwm130 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+		};
+	};
+};
+
+&pwm130 {
+	status = "okay";
+	pinctrl-0 = <&pwm130_default>;
+	pinctrl-1 = <&pwm130_sleep>;
+	pinctrl-names = "default", "sleep";
+};
diff --git a/samples/basic/fade_led/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/basic/fade_led/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..55fe52a20ce
--- /dev/null
+++ b/samples/basic/fade_led/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,4 @@
+&pwm130 {
+	status = "reserved";
+	interrupt-parent = <&cpuppr_clic>;
+};
diff --git a/samples/basic/fade_led/sysbuild/vpr_launcher/prj.conf b/samples/basic/fade_led/sysbuild/vpr_launcher/prj.conf
new file mode 100644
index 00000000000..b2a4ba59104
--- /dev/null
+++ b/samples/basic/fade_led/sysbuild/vpr_launcher/prj.conf
@@ -0,0 +1 @@
+# nothing here

From 992516cc90562a0e12e62557aabaefb5f3190495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Wed, 18 Dec 2024 16:00:46 +0100
Subject: [PATCH 2301/2913] [nrf fromtree] tests: drivers: pwm: add support for
 nRF54H20 cpuppr PWM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added support for nRF54H20 cpuppr PWM in pwm_api test.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit cec083edd1a51e85d45e66764feec7cffd6eb4df)
---
 .../boards/nrf54h20dk_nrf54h20_cpuppr.overlay | 20 ++++++++++++++++++
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 +++++++++++++++++++
 .../pwm_api/sysbuild/vpr_launcher/prj.conf    |  1 +
 3 files changed, 42 insertions(+)
 create mode 100644 tests/drivers/pwm/pwm_api/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
 create mode 100644 tests/drivers/pwm/pwm_api/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/drivers/pwm/pwm_api/sysbuild/vpr_launcher/prj.conf

diff --git a/tests/drivers/pwm/pwm_api/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/tests/drivers/pwm/pwm_api/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
new file mode 100644
index 00000000000..c483d27f569
--- /dev/null
+++ b/tests/drivers/pwm/pwm_api/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
@@ -0,0 +1,20 @@
+&pinctrl {
+	pwm_default: pwm_default {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 0, 0)>;
+		};
+	};
+	pwm_sleep: pwm_sleep {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 0, 0)>;
+			low-power-enable;
+		};
+	};
+};
+
+&pwm130 {
+	status = "okay";
+	pinctrl-0 = <&pwm_default>;
+	pinctrl-1 = <&pwm_sleep>;
+	pinctrl-names = "default", "sleep";
+};
diff --git a/tests/drivers/pwm/pwm_api/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/pwm/pwm_api/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..d6d4266c481
--- /dev/null
+++ b/tests/drivers/pwm/pwm_api/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,21 @@
+&pinctrl {
+	pwm_default: pwm_default {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 0, 0)>;
+		};
+	};
+	pwm_sleep: pwm_sleep {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 0, 0)>;
+			low-power-enable;
+		};
+	};
+};
+
+&pwm130 {
+	status = "reserved";
+	interrupt-parent = <&cpuppr_clic>;
+	pinctrl-0 = <&pwm_default>;
+	pinctrl-1 = <&pwm_sleep>;
+	pinctrl-names = "default", "sleep";
+};
diff --git a/tests/drivers/pwm/pwm_api/sysbuild/vpr_launcher/prj.conf b/tests/drivers/pwm/pwm_api/sysbuild/vpr_launcher/prj.conf
new file mode 100644
index 00000000000..b2a4ba59104
--- /dev/null
+++ b/tests/drivers/pwm/pwm_api/sysbuild/vpr_launcher/prj.conf
@@ -0,0 +1 @@
+# nothing here

From f9c83501fa065c759a4c60d2df26554debea0464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Wed, 15 Jan 2025 13:20:51 +0100
Subject: [PATCH 2302/2913] [nrf fromtree] drivers: clock_control: nrf: start
 HFXO when using LFSYNTH
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When using synthesized low frequency clock, HFXO should be running
to ensure correct frequency.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit 9a476674681d38d68a83d169c8d870f97119e786)
---
 drivers/clock_control/clock_control_nrf.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/drivers/clock_control/clock_control_nrf.c b/drivers/clock_control/clock_control_nrf.c
index 42eeeaad8b2..c4d4710e1cd 100644
--- a/drivers/clock_control/clock_control_nrf.c
+++ b/drivers/clock_control/clock_control_nrf.c
@@ -79,6 +79,10 @@ struct nrf_clock_control_config {
 static atomic_t hfclk_users;
 static uint64_t hf_start_tstamp;
 static uint64_t hf_stop_tstamp;
+#if CONFIG_CLOCK_CONTROL_NRF_K32SRC_SYNTH
+/* Client to request HFXO to synthesize low frequency clock. */
+static struct onoff_client lfsynth_cli;
+#endif
 
 static struct nrf_clock_control_sub_data *get_sub_data(const struct device *dev,
 						       enum clock_control_nrf_type type)
@@ -202,6 +206,12 @@ static void lfclk_start(void)
 		anomaly_132_workaround();
 	}
 
+#if CONFIG_CLOCK_CONTROL_NRF_K32SRC_SYNTH
+	sys_notify_init_spinwait(&lfsynth_cli.notify);
+	(void)onoff_request(z_nrf_clock_control_get_onoff(CLOCK_CONTROL_NRF_SUBSYS_HF),
+			    &lfsynth_cli);
+#endif
+
 	nrfx_clock_lfclk_start();
 }
 
@@ -212,6 +222,11 @@ static void lfclk_stop(void)
 	}
 
 	nrfx_clock_lfclk_stop();
+
+#if CONFIG_CLOCK_CONTROL_NRF_K32SRC_SYNTH
+	(void)onoff_cancel_or_release(z_nrf_clock_control_get_onoff(CLOCK_CONTROL_NRF_SUBSYS_HF),
+				      &lfsynth_cli);
+#endif
 }
 
 static void hfclk_start(void)

From 03e2995730f8f41687ea0e94c89d91e85650dbcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Thu, 13 Feb 2025 11:13:27 +0100
Subject: [PATCH 2303/2913] [nrf fromtree] boards: nordic: nrf54l20pdk: Add PWM
 to the list of supported peripherals
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enable Twister tests of PWM driver on nrf54l20pdk.
Overlays were already added to PWM tests.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit ecd53f9e8a3ad19b6590a4dcdc1a21f767884690)
---
 boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
index 61266eb0da1..af73d34f3de 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
@@ -16,4 +16,5 @@ supported:
   - counter
   - gpio
   - i2c
+  - pwm
   - watchdog

From a08bb016a16af785244a9634fffddcd74ea2468a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Thu, 13 Feb 2025 12:10:00 +0100
Subject: [PATCH 2304/2913] [nrf fromtree] boards: nordic: nrf54l20pdk: Define
 PWM LED
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Define PWM LED at nRF54L20pdk board definition.

Set status=okay for pwm20 node.
Add pincontrol for pwm20:OUT0 at P1.07 (LED1).
Add pwm_led1 node.
Add alias pwm-led0.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 23e6854e7c14d03f6d5544e67f1b74cb03b4b4cf)
---
 .../nrf54l20pdk_nrf54l20-common.dtsi          | 21 +++++++++++++++++++
 .../nrf54l20pdk_nrf54l20-pinctrl.dtsi         | 13 ++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi
index c188cd39e93..35a434cda4b 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi
@@ -27,6 +27,19 @@
 		};
 	};
 
+	pwmleds {
+		compatible = "pwm-leds";
+		/*
+		 * PWM signal can be exposed on GPIO pin only within same domain.
+		 * There is only one domain which contains both PWM and GPIO:
+		 * PWM20/21/22 and GPIO Port P1/P3.
+		 * Only LEDs connected to P1/P3 can work with PWM, for example LED1.
+		 */
+		pwm_led1: pwm_led_1 {
+			pwms = <&pwm20 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+		};
+	};
+
 	buttons {
 		compatible = "gpio-keys";
 		button0: button_0 {
@@ -56,6 +69,7 @@
 		led1 = &led1;
 		led2 = &led2;
 		led3 = &led3;
+		pwm-led0 = &pwm_led1;
 		sw0 = &button0;
 		sw1 = &button1;
 		sw2 = &button2;
@@ -70,3 +84,10 @@
 	pinctrl-1 = <&uart20_sleep>;
 	pinctrl-names = "default", "sleep";
 };
+
+&pwm20 {
+	status = "okay";
+	pinctrl-0 = <&pwm20_default>;
+	pinctrl-1 = <&pwm20_sleep>;
+	pinctrl-names = "default", "sleep";
+};
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi
index 83aa91d8a34..7dc2b77ae83 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi
@@ -21,4 +21,17 @@
 			low-power-enable;
 		};
 	};
+
+	/omit-if-no-ref/ pwm20_default: pwm20_default {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 1, 7)>;
+		};
+	};
+
+	/omit-if-no-ref/ pwm20_sleep: pwm20_sleep {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 1, 7)>;
+			low-power-enable;
+		};
+	};
 };

From 4d63c4e1f00898e7619321e3d55d3fd61f4918f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Thu, 13 Feb 2025 12:14:20 +0100
Subject: [PATCH 2305/2913] [nrf fromtree] tests: drivers: pwm: Remove overlay
 for nRF54L20pdk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

All needed configuration was moved to the board definition.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 8f39cea7052af4c3d9c80be724bdbb3be4f80643)
---
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 tests/drivers/pwm/pwm_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay

diff --git a/tests/drivers/pwm/pwm_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/pwm/pwm_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
deleted file mode 100644
index 6d9ec96d77d..00000000000
--- a/tests/drivers/pwm/pwm_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
+++ /dev/null
@@ -1,20 +0,0 @@
-&pinctrl {
-	pwm_default: pwm_default {
-		group1 {
-			psels = <NRF_PSEL(PWM_OUT0, 1, 0)>;
-		};
-	};
-	pwm_sleep: pwm_sleep {
-		group1 {
-			psels = <NRF_PSEL(PWM_OUT0, 1, 0)>;
-			low-power-enable;
-		};
-	};
-};
-
-&pwm20 {
-	status = "okay";
-	pinctrl-0 = <&pwm_default>;
-	pinctrl-1 = <&pwm_sleep>;
-	pinctrl-names = "default", "sleep";
-};

From ba83fb04fa04af7f114d73079dd3eb07dc374540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Tue, 28 Jan 2025 11:16:52 +0100
Subject: [PATCH 2306/2913] [nrf fromtree] tests: drivers: sensor: temp: Add
 support for nRF54L20 and nRF54L09 PDKs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add support for nRF54L20 and nRF54L09 PDKs in temp_sensor
twister tests.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit 2a642f189435965d73decb09e5272c49c3a35ba2)
---
 .../boards/nrf54l09pdk_nrf54l09_cpuapp.overlay           | 9 +++++++++
 .../boards/nrf54l20pdk_nrf54l20_cpuapp.overlay           | 9 +++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 tests/drivers/sensor/temp_sensor/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
 create mode 100644 tests/drivers/sensor/temp_sensor/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay

diff --git a/tests/drivers/sensor/temp_sensor/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay b/tests/drivers/sensor/temp_sensor/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
new file mode 100644
index 00000000000..b1f2a2b9ec5
--- /dev/null
+++ b/tests/drivers/sensor/temp_sensor/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+temp_sensor: &temp {
+	status = "okay";
+};
diff --git a/tests/drivers/sensor/temp_sensor/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/sensor/temp_sensor/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 00000000000..b1f2a2b9ec5
--- /dev/null
+++ b/tests/drivers/sensor/temp_sensor/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+temp_sensor: &temp {
+	status = "okay";
+};

From bc9a9ac75c416eacb79fad42e9e6e1b7bc165160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Wed, 22 Jan 2025 16:52:23 +0100
Subject: [PATCH 2307/2913] [nrf fromtree] tests: drivers: watchdog: Add
 further support for nRF54L09 PDK.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added further support for nRF54L09 PDK in watchdog twister
tests.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit a0303d3c4b8eaa8575f14dc5b94e09f2f905606c)
---
 .../boards/nrf54l09pdk_nrf54l09_cpuapp.overlay           | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 tests/drivers/watchdog/wdt_basic_api/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay

diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
new file mode 100644
index 00000000000..dc1ea1a9ddc
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};

From 8a686a5641f3a684191c7f1aef12eb75d7665bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Wed, 22 Jan 2025 15:20:30 +0100
Subject: [PATCH 2308/2913] [nrf fromtree] tests: drivers: spi: Add support for
 nRF54L20 PDK
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added support for nRF54L20 PDK in SPIM twister tests.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit 04df6de43e6ad2f95db238047160a5342d2368a6)
---
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       | 73 +++++++++++++++++++
 .../drivers/spi/spi_error_cases/testcase.yaml |  1 +
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       | 47 ++++++++++++
 3 files changed, 121 insertions(+)
 create mode 100644 tests/drivers/spi/spi_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
 create mode 100644 tests/drivers/spi/spi_loopback/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay

diff --git a/tests/drivers/spi/spi_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/spi/spi_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 00000000000..c53893fd30f
--- /dev/null
+++ b/tests/drivers/spi/spi_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	spi22_default_alt: spi22_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
+				<NRF_PSEL(SPIM_MISO, 1, 11)>,
+				<NRF_PSEL(SPIM_MOSI, 1, 9)>;
+		};
+	};
+
+	spi22_sleep_alt: spi22_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
+				<NRF_PSEL(SPIM_MISO, 1, 11)>,
+				<NRF_PSEL(SPIM_MOSI, 1, 9)>;
+			low-power-enable;
+		};
+	};
+
+	spi21_default_alt: spi21_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 1, 12)>,
+				<NRF_PSEL(SPIS_MISO, 1, 10)>,
+				<NRF_PSEL(SPIS_MOSI, 1, 8)>,
+				<NRF_PSEL(SPIS_CSN, 1, 14)>;
+		};
+	};
+
+	spi21_sleep_alt: spi21_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 1, 12)>,
+				<NRF_PSEL(SPIS_MISO, 1, 10)>,
+				<NRF_PSEL(SPIS_MOSI, 1, 8)>,
+				<NRF_PSEL(SPIS_CSN, 1, 14)>;
+			low-power-enable;
+		};
+	};
+
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&spi22 {
+	status = "okay";
+	pinctrl-0 = <&spi22_default_alt>;
+	pinctrl-1 = <&spi22_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	overrun-character = <0x00>;
+	cs-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
+	dut_spi_dt: test-spi-dev@0 {
+		compatible = "vnd,spi-device";
+		reg = <0>;
+		spi-max-frequency = <4000000>;
+	};
+};
+
+dut_spis: &spi21 {
+	compatible = "nordic,nrf-spis";
+	status = "okay";
+	def-char = <0x00>;
+	pinctrl-0 = <&spi21_default_alt>;
+	pinctrl-1 = <&spi21_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	/delete-property/rx-delay-supported;
+	/delete-property/rx-delay;
+};
diff --git a/tests/drivers/spi/spi_error_cases/testcase.yaml b/tests/drivers/spi/spi_error_cases/testcase.yaml
index f96804a6172..366b736d8fb 100644
--- a/tests/drivers/spi/spi_error_cases/testcase.yaml
+++ b/tests/drivers/spi/spi_error_cases/testcase.yaml
@@ -12,6 +12,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
     integration_platforms:
       - nrf52840dk/nrf52840
   drivers.spi.spi_error_cases.fast:
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 00000000000..9dc27d1af05
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	spi00_default: spi00_default {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 2, 6)>,
+				<NRF_PSEL(SPIM_MISO, 2, 9)>,
+				<NRF_PSEL(SPIM_MOSI, 2, 8)>;
+		};
+	};
+
+	spi00_sleep: spi00_sleep {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 2, 6)>,
+				<NRF_PSEL(SPIM_MISO, 2, 9)>,
+				<NRF_PSEL(SPIM_MOSI, 2, 8)>;
+			low-power-enable;
+		};
+	};
+};
+
+&spi00 {
+	status = "okay";
+	pinctrl-0 = <&spi00_default>;
+	pinctrl-1 = <&spi00_sleep>;
+	pinctrl-names = "default", "sleep";
+	overrun-character = <0x00>;
+	zephyr,pm-device-runtime-auto;
+	slow@0 {
+		compatible = "test-spi-loopback-slow";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(2)>;
+	};
+	fast@0 {
+		compatible = "test-spi-loopback-fast";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(4)>;
+	};
+};
+
+&gpio2 {
+	status = "okay";
+};

From cb4ee549b65afcf44307db6a1d000e0980371bf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Tue, 28 Jan 2025 15:09:32 +0100
Subject: [PATCH 2309/2913] [nrf fromlist] tests: drivers: spi: Add further
 support for nRF54L20 PDK
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added support for nRF54L20 PDK in tests involving
multiple instances. Corrected pin assignements in
spi_error_cases test.

Upstream PR #: 84672

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       | 79 +++++++++++++++++++
 .../spi_controller_peripheral/testcase.yaml   |  1 +
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       | 35 ++++----
 3 files changed, 100 insertions(+), 15 deletions(-)
 create mode 100644 tests/drivers/spi/spi_controller_peripheral/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay

diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 00000000000..fe004aa7695
--- /dev/null
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	spi22_default_alt: spi22_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 1, 9)>,
+				<NRF_PSEL(SPIM_MISO, 1, 10)>,
+				<NRF_PSEL(SPIM_MOSI, 1, 2)>;
+		};
+	};
+
+	spi22_sleep_alt: spi22_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 1, 9)>,
+				<NRF_PSEL(SPIM_MISO, 1, 10)>,
+				<NRF_PSEL(SPIM_MOSI, 1, 2)>;
+			low-power-enable;
+		};
+	};
+
+	spi21_default_alt: spi21_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 1, 8)>,
+				<NRF_PSEL(SPIS_MISO, 1, 11)>,
+				<NRF_PSEL(SPIS_MOSI, 1, 3)>,
+				<NRF_PSEL(SPIS_CSN, 1, 1)>;
+		};
+	};
+
+	spi21_sleep_alt: spi21_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 1, 8)>,
+				<NRF_PSEL(SPIS_MISO, 1, 11)>,
+				<NRF_PSEL(SPIS_MOSI, 1, 3)>,
+				<NRF_PSEL(SPIS_CSN, 1, 1)>;
+			low-power-enable;
+		};
+	};
+
+};
+
+
+&gpio1 {
+	status = "okay";
+};
+
+&spi22 {
+	status = "okay";
+	pinctrl-0 = <&spi22_default_alt>;
+	pinctrl-1 = <&spi22_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	overrun-character = <0x00>;
+	cs-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
+	dut_spi_dt: test-spi-dev@0 {
+		compatible = "vnd,spi-device";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(16)>;
+	};
+};
+
+dut_spis: &spi21 {
+	compatible = "nordic,nrf-spis";
+	status = "okay";
+	def-char = <0x00>;
+	pinctrl-0 = <&spi21_default_alt>;
+	pinctrl-1 = <&spi21_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	/delete-property/rx-delay-supported;
+	/delete-property/rx-delay;
+};
+
+&uicr {
+	nfct-pins-as-gpios;
+};
diff --git a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
index e592664dace..6584c3e4440 100644
--- a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
+++ b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
@@ -63,6 +63,7 @@ tests:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
       - nrf54h20dk/nrf54h20/cpuppr
+      - nrf54l20pdk/nrf54l20/cpuapp
 
   drivers.spi.pm_runtime:
     extra_configs:
diff --git a/tests/drivers/spi/spi_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/spi/spi_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
index c53893fd30f..2ee989bda2b 100644
--- a/tests/drivers/spi/spi_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
+++ b/tests/drivers/spi/spi_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -7,43 +7,44 @@
 &pinctrl {
 	spi22_default_alt: spi22_default_alt {
 		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
-				<NRF_PSEL(SPIM_MISO, 1, 11)>,
-				<NRF_PSEL(SPIM_MOSI, 1, 9)>;
+			psels = <NRF_PSEL(SPIM_SCK, 1, 9)>,
+				<NRF_PSEL(SPIM_MISO, 1, 10)>,
+				<NRF_PSEL(SPIM_MOSI, 1, 2)>;
 		};
 	};
 
 	spi22_sleep_alt: spi22_sleep_alt {
 		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
-				<NRF_PSEL(SPIM_MISO, 1, 11)>,
-				<NRF_PSEL(SPIM_MOSI, 1, 9)>;
+			psels = <NRF_PSEL(SPIM_SCK, 1, 9)>,
+				<NRF_PSEL(SPIM_MISO, 1, 10)>,
+				<NRF_PSEL(SPIM_MOSI, 1, 2)>;
 			low-power-enable;
 		};
 	};
 
 	spi21_default_alt: spi21_default_alt {
 		group1 {
-			psels = <NRF_PSEL(SPIS_SCK, 1, 12)>,
-				<NRF_PSEL(SPIS_MISO, 1, 10)>,
-				<NRF_PSEL(SPIS_MOSI, 1, 8)>,
-				<NRF_PSEL(SPIS_CSN, 1, 14)>;
+			psels = <NRF_PSEL(SPIS_SCK, 1, 8)>,
+				<NRF_PSEL(SPIS_MISO, 1, 11)>,
+				<NRF_PSEL(SPIS_MOSI, 1, 3)>,
+				<NRF_PSEL(SPIS_CSN, 1, 1)>;
 		};
 	};
 
 	spi21_sleep_alt: spi21_sleep_alt {
 		group1 {
-			psels = <NRF_PSEL(SPIS_SCK, 1, 12)>,
-				<NRF_PSEL(SPIS_MISO, 1, 10)>,
-				<NRF_PSEL(SPIS_MOSI, 1, 8)>,
-				<NRF_PSEL(SPIS_CSN, 1, 14)>;
+			psels = <NRF_PSEL(SPIS_SCK, 1, 8)>,
+				<NRF_PSEL(SPIS_MISO, 1, 11)>,
+				<NRF_PSEL(SPIS_MOSI, 1, 3)>,
+				<NRF_PSEL(SPIS_CSN, 1, 1)>;
 			low-power-enable;
 		};
 	};
 
 };
 
-&gpio2 {
+
+&gpio1 {
 	status = "okay";
 };
 
@@ -71,3 +72,7 @@ dut_spis: &spi21 {
 	/delete-property/rx-delay-supported;
 	/delete-property/rx-delay;
 };
+
+&uicr {
+	nfct-pins-as-gpios;
+};

From 47893258ef36e758020524ba236fcc88aa2e042d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Wed, 22 Jan 2025 16:08:43 +0100
Subject: [PATCH 2310/2913] [nrf fromtree] tests: drivers: spi: Add support for
 nRF54L09 PDK
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added support for nRF54L09 PDK in SPIM twister tests.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit ccd2fd6c4778290f5f2c677770f8c01d6ef1c57f)
---
 .../nrf54l09pdk_nrf54l09_cpuapp.overlay       | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 tests/drivers/spi/spi_loopback/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay

diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
new file mode 100644
index 00000000000..cdb0d0dbcec
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	spi21_default: spi21_default {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 1, 6)>,
+				<NRF_PSEL(SPIM_MISO, 1, 9)>,
+				<NRF_PSEL(SPIM_MOSI, 1, 8)>;
+		};
+	};
+
+	spi21_sleep: spi21_sleep {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 1, 6)>,
+				<NRF_PSEL(SPIM_MISO, 1, 9)>,
+				<NRF_PSEL(SPIM_MOSI, 1, 8)>;
+			low-power-enable;
+		};
+	};
+};
+
+&spi21 {
+	status = "okay";
+	pinctrl-0 = <&spi21_default>;
+	pinctrl-1 = <&spi21_sleep>;
+	pinctrl-names = "default", "sleep";
+	overrun-character = <0x00>;
+	zephyr,pm-device-runtime-auto;
+	slow@0 {
+		compatible = "test-spi-loopback-slow";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(2)>;
+	};
+	fast@0 {
+		compatible = "test-spi-loopback-fast";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(4)>;
+	};
+};
+
+&gpio1 {
+	status = "okay";
+};

From ef6161bd50868f313bfc77cf2e415f38e61cca45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Fri, 14 Feb 2025 13:07:55 +0100
Subject: [PATCH 2311/2913] [nrf fromtree] drivers: adc: Add support for gain
 2/7 in nRF devices
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extend current adc gains with new entry 2/7.

Signed-off-by: Karol Lasończyk <karol.lasonczyk@nordicsemi.no>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 057de458e2d3c7187f32ff109d1179fa8b8ca8b9)
---
 drivers/adc/adc_common.c             | 1 +
 drivers/adc/adc_nrfx_saadc.c         | 5 +++++
 dts/bindings/adc/adc-controller.yaml | 2 ++
 include/zephyr/drivers/adc.h         | 1 +
 4 files changed, 9 insertions(+)

diff --git a/drivers/adc/adc_common.c b/drivers/adc/adc_common.c
index cf6472718de..eed4ec4ead6 100644
--- a/drivers/adc/adc_common.c
+++ b/drivers/adc/adc_common.c
@@ -17,6 +17,7 @@ int adc_gain_invert(enum adc_gain gain,
 		[ADC_GAIN_1_6] = {.mul = 6, .div = 1},
 		[ADC_GAIN_1_5] = {.mul = 5, .div = 1},
 		[ADC_GAIN_1_4] = {.mul = 4, .div = 1},
+		[ADC_GAIN_2_7] = {.mul = 7, .div = 2},
 		[ADC_GAIN_1_3] = {.mul = 3, .div = 1},
 		[ADC_GAIN_2_5] = {.mul = 5, .div = 2},
 		[ADC_GAIN_1_2] = {.mul = 2, .div = 1},
diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index 279ba412651..e3ea05f1248 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -202,6 +202,11 @@ static int adc_nrfx_channel_setup(const struct device *dev,
 		config.gain = NRF_SAADC_GAIN1_4;
 		break;
 #endif
+#if defined(SAADC_CH_CONFIG_GAIN_Gain2_7)
+	case ADC_GAIN_2_7:
+		config.gain = NRF_SAADC_GAIN2_7;
+		break;
+#endif
 #if defined(SAADC_CH_CONFIG_GAIN_Gain1_3) || defined(SAADC_CH_CONFIG_GAIN_Gain2_6)
 	case ADC_GAIN_1_3:
 		config.gain = NRF_SAADC_GAIN1_3;
diff --git a/dts/bindings/adc/adc-controller.yaml b/dts/bindings/adc/adc-controller.yaml
index c52c913d522..8f38ccf3e4f 100644
--- a/dts/bindings/adc/adc-controller.yaml
+++ b/dts/bindings/adc/adc-controller.yaml
@@ -41,6 +41,7 @@ child-binding:
         - ADC_GAIN_1_6: x 1/6
         - ADC_GAIN_1_5: x 1/5
         - ADC_GAIN_1_4: x 1/4
+        - ADC_GAIN_2_7: x 2/7
         - ADC_GAIN_1_3: x 1/3
         - ADC_GAIN_2_5: x 2/5
         - ADC_GAIN_1_2: x 1/2
@@ -62,6 +63,7 @@ child-binding:
         - "ADC_GAIN_1_6"
         - "ADC_GAIN_1_5"
         - "ADC_GAIN_1_4"
+        - "ADC_GAIN_2_7"
         - "ADC_GAIN_1_3"
         - "ADC_GAIN_2_5"
         - "ADC_GAIN_1_2"
diff --git a/include/zephyr/drivers/adc.h b/include/zephyr/drivers/adc.h
index 1c95baa9707..7eabbe17937 100644
--- a/include/zephyr/drivers/adc.h
+++ b/include/zephyr/drivers/adc.h
@@ -35,6 +35,7 @@ enum adc_gain {
 	ADC_GAIN_1_6, /**< x 1/6. */
 	ADC_GAIN_1_5, /**< x 1/5. */
 	ADC_GAIN_1_4, /**< x 1/4. */
+	ADC_GAIN_2_7, /**< x 2/7. */
 	ADC_GAIN_1_3, /**< x 1/3. */
 	ADC_GAIN_2_5, /**< x 2/5. */
 	ADC_GAIN_1_2, /**< x 1/2. */

From db40586fdffe583a0f12d9c8d7ff1962ac6e5dcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Fri, 14 Feb 2025 12:57:08 +0100
Subject: [PATCH 2312/2913] [nrf fromtree] tests: drivers: adc: add nRF54L20
 configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added the test configuration for nRF54L20 for the following tests:
- adc_api
- adc_error_cases

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit f78742ff752c302da1016c2bfb95d4824ea9460a)
---
 drivers/adc/adc_nrfx_saadc.c                  |  2 +-
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       | 44 +++++++++++++++++++
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       | 15 +++++++
 .../drivers/adc/adc_error_cases/testcase.yaml |  1 +
 4 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 tests/drivers/adc/adc_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
 create mode 100644 tests/drivers/adc/adc_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay

diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index e3ea05f1248..0dde7c5bcb0 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -31,7 +31,7 @@ static const uint8_t saadc_psels[NRF_SAADC_AIN7 + 1] = {
 	[NRF_SAADC_AIN6] = NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
 	[NRF_SAADC_AIN7] = NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
 };
-#elif defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || defined(CONFIG_SOC_NRF54L15)
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
 static const uint32_t saadc_psels[NRF_SAADC_DVDD + 1] = {
 	[NRF_SAADC_AIN0] = NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
 	[NRF_SAADC_AIN1] = NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
diff --git a/tests/drivers/adc/adc_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/adc/adc_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 00000000000..e1ca1190b33
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,44 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc 0>, <&adc 1> , <&adc 2>;
+	};
+};
+
+&adc {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
+		zephyr,input-positive = <NRF_SAADC_AIN1>;
+		zephyr,resolution = <10>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1_4";
+		zephyr,reference = "ADC_REF_EXTERNAL0";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN4>;
+		zephyr,resolution = <12>;
+	};
+
+	channel@2 {
+		reg = <2>;
+		zephyr,gain = "ADC_GAIN_2_3";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
+		zephyr,input-positive = <NRF_SAADC_AIN2>;
+		zephyr,resolution = <10>;
+	};
+};
diff --git a/tests/drivers/adc/adc_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/adc/adc_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 00000000000..c50279ce8f6
--- /dev/null
+++ b/tests/drivers/adc/adc_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ */
+
+/ {
+	aliases {
+		adc = &adc;
+	};
+};
+
+&adc {
+	status = "okay";
+};
diff --git a/tests/drivers/adc/adc_error_cases/testcase.yaml b/tests/drivers/adc/adc_error_cases/testcase.yaml
index 039be590b38..d1e0860a23d 100644
--- a/tests/drivers/adc/adc_error_cases/testcase.yaml
+++ b/tests/drivers/adc/adc_error_cases/testcase.yaml
@@ -4,4 +4,5 @@ tests:
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp

From 314f3ddd7fd670ce6038e846c8e69dd11c396edd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Fri, 14 Feb 2025 13:01:22 +0100
Subject: [PATCH 2313/2913] [nrf fromtree] drivers: adc: Fix Vref selection for
 nRF54L20pdk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Select Reference voltage of 900mV for ADC on nRF54L20pdk.

Add ADC to the list of supported peripherals.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 99c398845d15373f82839a7848359fe6f13e3394)
---
 boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml | 1 +
 drivers/adc/adc_nrfx_saadc.c                               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
index af73d34f3de..bb77373ffb3 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
@@ -13,6 +13,7 @@ sysbuild: true
 ram: 512
 flash: 449
 supported:
+  - adc
   - counter
   - gpio
   - i2c
diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index 0dde7c5bcb0..a1479ed2fd1 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -672,7 +672,7 @@ static DEVICE_API(adc, adc_nrfx_driver_api) = {
 #ifdef CONFIG_ADC_ASYNC
 	.read_async    = adc_nrfx_read_async,
 #endif
-#if defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) ||  defined(CONFIG_SOC_NRF54L15)
+#if defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
 	.ref_internal  = 900,
 #elif defined(CONFIG_NRF_PLATFORM_HALTIUM)
 	.ref_internal  = 1024,

From f22df3054fcb9097ad9405b6b4bbf738089c9966 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Wed, 13 Nov 2024 14:00:17 +0000
Subject: [PATCH 2314/2913] [nrf noup] samples: mgmt: mcumgr: smp_svr: Add
 nrf5340dk-optimised sample

Adds a configuration to this sample that is optimised for
testing/usage with the nRF5340 which enables the Bluetooth
transport, enables most management groups, has a static partition
manager file with secondary partitions on QSPI flash, configures
MCUboot in overwrite only mode with network core update support

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
---
 .../mcumgr/smp_svr/app_nrf5340_bt.overlay     |  5 ++
 .../mcumgr/smp_svr/pm_static_nrf5340_bt.yml   | 55 ++++++++++++
 .../mgmt/mcumgr/smp_svr/prj_nrf5340_bt.conf   | 88 +++++++++++++++++++
 .../subsys/mgmt/mcumgr/smp_svr/sample.yaml    |  8 ++
 .../subsys/mgmt/mcumgr/smp_svr/sysbuild.cmake | 16 ++++
 .../mcumgr/smp_svr/sysbuild_nrf5340_bt.conf   |  8 ++
 6 files changed, 180 insertions(+)
 create mode 100644 samples/subsys/mgmt/mcumgr/smp_svr/app_nrf5340_bt.overlay
 create mode 100644 samples/subsys/mgmt/mcumgr/smp_svr/pm_static_nrf5340_bt.yml
 create mode 100644 samples/subsys/mgmt/mcumgr/smp_svr/prj_nrf5340_bt.conf
 create mode 100644 samples/subsys/mgmt/mcumgr/smp_svr/sysbuild.cmake
 create mode 100644 samples/subsys/mgmt/mcumgr/smp_svr/sysbuild_nrf5340_bt.conf

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/app_nrf5340_bt.overlay b/samples/subsys/mgmt/mcumgr/smp_svr/app_nrf5340_bt.overlay
new file mode 100644
index 00000000000..fcc2e240fd9
--- /dev/null
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/app_nrf5340_bt.overlay
@@ -0,0 +1,5 @@
+/ {
+	chosen {
+		nordic,pm-ext-flash = &mx25r64;
+	};
+};
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/pm_static_nrf5340_bt.yml b/samples/subsys/mgmt/mcumgr/smp_svr/pm_static_nrf5340_bt.yml
new file mode 100644
index 00000000000..7a48d51ec33
--- /dev/null
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/pm_static_nrf5340_bt.yml
@@ -0,0 +1,55 @@
+app:
+  address: 0x10200
+  region: flash_primary
+  size: 0xdfe00
+mcuboot:
+  address: 0x0
+  region: flash_primary
+  size: 0x10000
+mcuboot_pad:
+  address: 0x10000
+  region: flash_primary
+  size: 0x200
+mcuboot_primary:
+  address: 0x10000
+  orig_span: &id001
+  - mcuboot_pad
+  - app
+  region: flash_primary
+  size: 0xe0000
+  span: *id001
+mcuboot_primary_app:
+  address: 0x10200
+  orig_span: &id002
+  - app
+  region: flash_primary
+  size: 0xdfe00
+  span: *id002
+settings_storage:
+  address: 0xf0000
+  region: flash_primary
+  size: 0x10000
+mcuboot_primary_1:
+  address: 0x0
+  size: 0x40000
+  device: flash_ctrl
+  region: ram_flash
+mcuboot_secondary:
+  address: 0x00000
+  size: 0xe0000
+  device: MX25R64
+  region: external_flash
+mcuboot_secondary_1:
+  address: 0xe0000
+  size: 0x40000
+  device: MX25R64
+  region: external_flash
+external_flash:
+  address: 0x120000
+  size: 0x6e0000
+  device: MX25R64
+  region: external_flash
+pcd_sram:
+  address: 0x20000000
+  size: 0x2000
+  region: sram_primary
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/prj_nrf5340_bt.conf b/samples/subsys/mgmt/mcumgr/smp_svr/prj_nrf5340_bt.conf
new file mode 100644
index 00000000000..cb53d3e6beb
--- /dev/null
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/prj_nrf5340_bt.conf
@@ -0,0 +1,88 @@
+# Enable MCUmgr and dependencies.
+CONFIG_NET_BUF=y
+CONFIG_ZCBOR=y
+CONFIG_CRC=y
+CONFIG_MCUMGR=y
+CONFIG_STREAM_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_BT=y
+CONFIG_BT_PERIPHERAL=y
+
+# Some command handlers require a large stack.
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2304
+CONFIG_MAIN_STACK_SIZE=2176
+
+# Ensure an MCUboot-compatible binary is generated.
+CONFIG_BOOTLOADER_MCUBOOT=y
+
+# Enable flash operations.
+CONFIG_FLASH=y
+
+# Required by the `taskstat` command.
+CONFIG_THREAD_MONITOR=y
+
+# Support for taskstat command
+CONFIG_MCUMGR_GRP_OS_TASKSTAT=y
+
+# Enable statistics and statistic names.
+CONFIG_STATS=y
+CONFIG_STATS_NAMES=y
+
+# Enable most core commands.
+CONFIG_FLASH=y
+CONFIG_IMG_MANAGER=y
+CONFIG_MCUMGR_GRP_IMG=y
+CONFIG_MCUMGR_GRP_OS=y
+CONFIG_MCUMGR_GRP_STAT=y
+
+# Enable logging
+CONFIG_LOG=y
+CONFIG_MCUBOOT_UTIL_LOG_LEVEL_WRN=y
+
+# Disable debug logging
+CONFIG_LOG_MAX_LEVEL=3
+
+# Allow for large Bluetooth data packets.
+CONFIG_BT_L2CAP_TX_MTU=498
+CONFIG_BT_BUF_ACL_RX_SIZE=502
+CONFIG_BT_BUF_ACL_TX_SIZE=502
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
+
+# Enable the Bluetooth mcumgr transport (unauthenticated).
+CONFIG_MCUMGR_TRANSPORT_BT=y
+CONFIG_MCUMGR_TRANSPORT_BT_CONN_PARAM_CONTROL=y
+
+# Enable the Shell mcumgr transport.
+CONFIG_BASE64=y
+CONFIG_CRC=y
+CONFIG_SHELL=y
+CONFIG_SHELL_BACKEND_SERIAL=y
+CONFIG_MCUMGR_TRANSPORT_SHELL=y
+
+# Enable the mcumgr Packet Reassembly feature over Bluetooth and its configuration dependencies.
+# MCUmgr buffer size is optimized to fit one SMP packet divided into five Bluetooth Write Commands,
+# transmitted with the maximum possible MTU value: 498 bytes.
+CONFIG_MCUMGR_TRANSPORT_BT_REASSEMBLY=y
+CONFIG_MCUMGR_TRANSPORT_NETBUF_SIZE=2475
+CONFIG_MCUMGR_GRP_OS_MCUMGR_PARAMS=y
+CONFIG_MCUMGR_TRANSPORT_WORKQUEUE_STACK_SIZE=4608
+
+# Enable the LittleFS file system.
+CONFIG_FILE_SYSTEM=y
+CONFIG_FILE_SYSTEM_LITTLEFS=y
+
+# Enable file system commands
+CONFIG_MCUMGR_GRP_FS=y
+
+# Enable the storage erase command.
+CONFIG_MCUMGR_GRP_ZBASIC=y
+CONFIG_MCUMGR_GRP_ZBASIC_STORAGE_ERASE=y
+
+# Disable Bluetooth ping support
+CONFIG_BT_CTLR_LE_PING=n
+
+# Disable shell commands that are not needed
+CONFIG_CLOCK_CONTROL_NRF_SHELL=n
+CONFIG_DEVICE_SHELL=n
+CONFIG_DEVMEM_SHELL=n
+CONFIG_FLASH_SHELL=n
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 38ee2c5a2c6..16526fdfe7b 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -217,3 +217,11 @@ tests:
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52840dk/nrf52840
+  sample.mcumgr.smp_svr.bt.nrf5340dk.ext_flash:
+    sysbuild: true
+    extra_args:
+      - FILE_SUFFIX=nrf5340_bt
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    integration_platforms:
+      - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild.cmake b/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild.cmake
new file mode 100644
index 00000000000..f0a9f06df84
--- /dev/null
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild.cmake
@@ -0,0 +1,16 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+if(FILE_SUFFIX STREQUAL "nrf5340_bt")
+  if(SB_CONFIG_SOC_NRF5340_CPUAPP)
+    # nRF5340 with Bluetooth configuration, add partition manager configuration to MCUboot image
+    list(APPEND mcuboot_EXTRA_DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/app_nrf5340_bt.overlay)
+    list(REMOVE_DUPLICATES mcuboot_EXTRA_DTC_OVERLAY_FILE)
+    set(mcuboot_EXTRA_DTC_OVERLAY_FILE ${mcuboot_EXTRA_DTC_OVERLAY_FILE} CACHE INTERNAL "" FORCE)
+  else()
+    message(FATAL_ERROR "File suffix 'nrf5340_bt' can only be used on an nRF5340 CPUAPP board target")
+  endif()
+endif()
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild_nrf5340_bt.conf b/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild_nrf5340_bt.conf
new file mode 100644
index 00000000000..16bcac179e8
--- /dev/null
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild_nrf5340_bt.conf
@@ -0,0 +1,8 @@
+# Enable MCUboot bootloader support
+SB_CONFIG_BOOTLOADER_MCUBOOT=y
+SB_CONFIG_MCUBOOT_MODE_OVERWRITE_ONLY=y
+SB_CONFIG_NETCORE_HCI_IPC=y
+SB_CONFIG_SECURE_BOOT_NETCORE=y
+SB_CONFIG_NETCORE_APP_UPDATE=y
+SB_CONFIG_MCUBOOT_NRF53_MULTI_IMAGE_UPDATE=y
+SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y

From b323a20c9db02226cbb83a2982c4557527fd373a Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Thu, 30 Jan 2025 12:33:13 +0000
Subject: [PATCH 2315/2913] [nrf fromtree] cmake: reports: Add support for JSON
 prefix

Adds support for prefixing files with the target of bl2 or tfm

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit f80446973a3d2d83037e0413a09b62258649a617)
---
 cmake/reports/CMakeLists.txt | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/cmake/reports/CMakeLists.txt b/cmake/reports/CMakeLists.txt
index 96cba730788..c9d2783db3f 100644
--- a/cmake/reports/CMakeLists.txt
+++ b/cmake/reports/CMakeLists.txt
@@ -29,7 +29,7 @@ foreach(report ram_report rom_report footprint)
     )
 endforeach()
 
-if (CONFIG_BUILD_WITH_TFM)
+if(CONFIG_BUILD_WITH_TFM)
   foreach(report ram_report rom_report footprint)
     add_custom_target(
       tfm_${report}
@@ -40,6 +40,7 @@ if (CONFIG_BUILD_WITH_TFM)
       -o ${CMAKE_BINARY_DIR}
       ${workspace_arg}
       -d ${report_depth}
+      --json tfm_${report}.json
       ${flag_for_${report}}
       DEPENDS tfm
       USES_TERMINAL
@@ -48,22 +49,23 @@ if (CONFIG_BUILD_WITH_TFM)
   endforeach()
 endif()
 
-if (CONFIG_TFM_BL2)
+if(CONFIG_TFM_BL2)
   foreach(report ram_report rom_report footprint)
-  add_custom_target(
-    bl2_${report}
-    ${PYTHON_EXECUTABLE}
-    ${ZEPHYR_BASE}/scripts/footprint/size_report
-    -k $<TARGET_PROPERTY:tfm,BL2_ELF_FILE>
-    -z ${ZEPHYR_BASE}
-    -o ${CMAKE_BINARY_DIR}
-    ${workspace_arg}
-    -d ${report_depth}
-    ${flag_for_${report}}
-    DEPENDS tfm
-    USES_TERMINAL
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    )
+    add_custom_target(
+      bl2_${report}
+      ${PYTHON_EXECUTABLE}
+      ${ZEPHYR_BASE}/scripts/footprint/size_report
+      -k $<TARGET_PROPERTY:tfm,BL2_ELF_FILE>
+      -z ${ZEPHYR_BASE}
+      -o ${CMAKE_BINARY_DIR}
+      ${workspace_arg}
+      -d ${report_depth}
+      --json bl2_${report}.json
+      ${flag_for_${report}}
+      DEPENDS tfm
+      USES_TERMINAL
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      )
   endforeach()
 endif()
 

From a653cb7d214c78d1b3f782caf513bca37214b79b Mon Sep 17 00:00:00 2001
From: Piotr Krzyzanowski <piotr.krzyzanowski@nordicsemi.no>
Date: Tue, 7 Jan 2025 13:48:49 +0100
Subject: [PATCH 2316/2913] [nrf fromtree] tests: pwm: pwm_gpio_loopback: add
 nrf platforms

Add Nordic platforms and rename the defines
to avoid redefining a nrf driver internal symbols

Signed-off-by: Piotr Krzyzanowski <piotr.krzyzanowski@nordicsemi.no>
(cherry picked from commit 09d5b9d80f3a24e899c1fb9e5b179cc9773ff10f)
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 65 +++++++++++++++++++
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 14 ++++
 .../drivers/pwm/pwm_gpio_loopback/src/main.c  | 26 ++++----
 .../pwm/pwm_gpio_loopback/testcase.yaml       |  5 ++
 4 files changed, 97 insertions(+), 13 deletions(-)
 create mode 100644 tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..8b5846df92d
--- /dev/null
+++ b/tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Test requires wire connection between:
+ *  - PWM130 OUT[0] at P0.00 <-> GPIO input at P0.01
+ *  - PWM120 OUT[0] at P7.00 <-> GPIO input at P1.09
+ *  - PWM120 OUT[1] at P7.01 <-> GPIO input at P1.05
+ */
+
+/ {
+	zephyr,user {
+		pwms = <&pwm130 0 160000 PWM_POLARITY_NORMAL>,
+			<&pwm120 0 80000 PWM_POLARITY_NORMAL>,
+			<&pwm120 1 80000 PWM_POLARITY_NORMAL>;
+		gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>,
+			<&gpio1 9 GPIO_ACTIVE_HIGH>,
+			<&gpio1 5 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&pinctrl {
+	pwm130_default: pwm130_default {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 0, 0)>;
+		};
+	};
+
+	pwm130_sleep: pwm130_sleep {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 0, 0)>;
+			low-power-enable;
+		};
+	};
+
+	pwm120_default: pwm120_default {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 7, 0)>,
+				<NRF_PSEL(PWM_OUT1, 7, 1)>;
+		};
+	};
+	pwm120_sleep: pwm120_sleep {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 7, 0)>,
+				<NRF_PSEL(PWM_OUT1, 7, 1)>;
+			low-power-enable;
+		};
+	};
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&pwm120 {
+	status = "okay";
+	pinctrl-0 = <&pwm120_default>;
+	pinctrl-1 = <&pwm120_sleep>;
+	pinctrl-names = "default", "sleep";
+	memory-regions = <&dma_fast_region>;
+};
+
+&dma_fast_region {
+	status = "okay";
+};
diff --git a/tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..4ecece17892
--- /dev/null
+++ b/tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Test requires jumper between:
+ *  - PWM20 OUT[0] at P1.10 <-> GPIO input at P1.11
+ */
+
+/ {
+	zephyr,user {
+		pwms = <&pwm20 0 160000 PWM_POLARITY_NORMAL>;
+		gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
+	};
+};
diff --git a/tests/drivers/pwm/pwm_gpio_loopback/src/main.c b/tests/drivers/pwm/pwm_gpio_loopback/src/main.c
index 37b83796782..16c2357f9b9 100644
--- a/tests/drivers/pwm/pwm_gpio_loopback/src/main.c
+++ b/tests/drivers/pwm/pwm_gpio_loopback/src/main.c
@@ -22,22 +22,22 @@
 
 static struct gpio_callback gpio_cb;
 
-#define PWM_COUNT                      DT_PROP_LEN(DT_PATH(zephyr_user), pwms)
-#define PWM_CONFIG_ENTRY(idx, node_id) PWM_DT_SPEC_GET_BY_IDX(node_id, idx)
-#define PWM_CONFIG_ARRAY(node_id)                                                                  \
+#define TEST_PWM_COUNT                      DT_PROP_LEN(DT_PATH(zephyr_user), pwms)
+#define TEST_PWM_CONFIG_ENTRY(idx, node_id) PWM_DT_SPEC_GET_BY_IDX(node_id, idx)
+#define TEST_PWM_CONFIG_ARRAY(node_id)                                                             \
 	{                                                                                          \
-		LISTIFY(PWM_COUNT, PWM_CONFIG_ENTRY, (,), node_id)                                 \
+		LISTIFY(TEST_PWM_COUNT, TEST_PWM_CONFIG_ENTRY, (,), node_id)                       \
 	}
 
-#define GPIO_COUNT                      DT_PROP_LEN(DT_PATH(zephyr_user), gpios)
-#define GPIO_CONFIG_ENTRY(idx, node_id) GPIO_DT_SPEC_GET_BY_IDX(node_id, gpios, idx)
-#define GPIO_CONFIG_ARRAY(node_id)                                                                 \
+#define TEST_GPIO_COUNT                      DT_PROP_LEN(DT_PATH(zephyr_user), gpios)
+#define TEST_GPIO_CONFIG_ENTRY(idx, node_id) GPIO_DT_SPEC_GET_BY_IDX(node_id, gpios, idx)
+#define TEST_GPIO_CONFIG_ARRAY(node_id)                                                            \
 	{                                                                                          \
-		LISTIFY(GPIO_COUNT, GPIO_CONFIG_ENTRY, (,), node_id)                               \
+		LISTIFY(TEST_GPIO_COUNT, TEST_GPIO_CONFIG_ENTRY, (,), node_id)                     \
 	}
 
-static const struct pwm_dt_spec pwms_dt[] = PWM_CONFIG_ARRAY(DT_PATH(zephyr_user));
-static const struct gpio_dt_spec gpios_dt[] = GPIO_CONFIG_ARRAY(DT_PATH(zephyr_user));
+static const struct pwm_dt_spec pwms_dt[] = TEST_PWM_CONFIG_ARRAY(DT_PATH(zephyr_user));
+static const struct gpio_dt_spec gpios_dt[] = TEST_GPIO_CONFIG_ARRAY(DT_PATH(zephyr_user));
 
 static struct test_context {
 	uint32_t last_edge_time;
@@ -218,7 +218,7 @@ static void test_run(const struct pwm_dt_spec *pwm_dt, const struct gpio_dt_spec
 
 ZTEST(pwm_gpio_loopback, test_pwm)
 {
-	for (int i = 0; i < PWM_COUNT; i++) {
+	for (int i = 0; i < TEST_PWM_COUNT; i++) {
 		zassert_true(device_is_ready(pwms_dt[i].dev), "PWM device is not ready");
 		zassert_true(device_is_ready(gpios_dt[i].port), "GPIO device is not ready");
 
@@ -238,7 +238,7 @@ ZTEST(pwm_gpio_loopback, test_pwm)
 
 ZTEST(pwm_gpio_loopback, test_pwm_cross)
 {
-	for (int i = 0; i < PWM_COUNT; i++) {
+	for (int i = 0; i < TEST_PWM_COUNT; i++) {
 		/* Test case: [Duty: 40%] */
 		test_run(&pwms_dt[i], &gpios_dt[i], 40, true);
 	}
@@ -246,7 +246,7 @@ ZTEST(pwm_gpio_loopback, test_pwm_cross)
 	/* Set all channels and check if they retain the original
 	 * configuration without calling pwm_set again
 	 */
-	for (int i = 0; i < PWM_COUNT; i++) {
+	for (int i = 0; i < TEST_PWM_COUNT; i++) {
 		test_run(&pwms_dt[i], &gpios_dt[i], 40, false);
 	}
 }
diff --git a/tests/drivers/pwm/pwm_gpio_loopback/testcase.yaml b/tests/drivers/pwm/pwm_gpio_loopback/testcase.yaml
index 37a36ec9628..1cc0dd5b797 100644
--- a/tests/drivers/pwm/pwm_gpio_loopback/testcase.yaml
+++ b/tests/drivers/pwm/pwm_gpio_loopback/testcase.yaml
@@ -15,3 +15,8 @@ tests:
       - esp32c6_devkitc
       - esp32s2_saola
       - esp32s3_devkitm/esp32s3/procpu
+
+  drivers.pwm.gpio_loopback.nrf:
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp

From 87b366df7b7930f114f651ff47c329038091518d Mon Sep 17 00:00:00 2001
From: Piotr Krzyzanowski <piotr.krzyzanowski@nordicsemi.no>
Date: Wed, 22 Jan 2025 14:27:01 +0100
Subject: [PATCH 2317/2913] [nrf fromtree] tests: pwm: pwm_gpio_loopback: nrf
 test stability

Improve test stability in 54l15 case
by measuring duty cycle after two periods

Signed-off-by: Piotr Krzyzanowski <piotr.krzyzanowski@nordicsemi.no>
(cherry picked from commit cb7690a17f9ff6a8bdfa311dcb87999aba942b6e)
---
 .../pwm/pwm_gpio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.conf

diff --git a/tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.conf
new file mode 100644
index 00000000000..795414a504a
--- /dev/null
+++ b/tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SKIP_EDGE_NUM=4

From b83eabe0b2cb9b461a6c2e43ce8fc91f5fe4f1fa Mon Sep 17 00:00:00 2001
From: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
Date: Fri, 7 Feb 2025 08:36:19 +0100
Subject: [PATCH 2318/2913] [nrf fromtree] tests: drivers: pwm:
 pwm_gpio_loopback: adjust configuration for nrf54h20

Extend CONFIG_SKIP_EDGE_NUM.

Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
(cherry picked from commit e3e45487dbce48c6d956c6b9f154dd6017956be5)
---
 .../pwm/pwm_gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.conf | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.conf

diff --git a/tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..795414a504a
--- /dev/null
+++ b/tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SKIP_EDGE_NUM=4

From eb1ae9f23430f8d988d09525b8b3a5831ab5600b Mon Sep 17 00:00:00 2001
From: Sean Madigan <sean.madigan@nordicsemi.no>
Date: Fri, 31 Jan 2025 12:52:39 +0000
Subject: [PATCH 2319/2913] [nrf fromtree] bluetooth: controller: Only
 BT_CTLR_ECDH default y if BT_HCI_RAW

In https://github.com/zephyrproject-rtos/zephyr/pull/84268
the ability to use the controller for ECDH was removed from
the host.

This means that BT_CTLR_ECDH is now only useful when using
BT_HCI_RAW.

Signed-off-by: Sean Madigan <sean.madigan@nordicsemi.no>
(cherry picked from commit 706938d7b2a7ae36f019dd57659619fcf7019b2f)
---
 subsys/bluetooth/controller/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
index ab7706a73bb..4953343ba3c 100644
--- a/subsys/bluetooth/controller/Kconfig
+++ b/subsys/bluetooth/controller/Kconfig
@@ -512,7 +512,7 @@ config BT_CTLR_LE_ENC
 config BT_CTLR_ECDH
 	bool "Elliptic Curve Diffie-Hellman (ECDH)"
 	depends on BT_CTLR_ECDH_SUPPORT
-	default y
+	default y if BT_HCI_RAW
 	help
 	  Enable support for Bluetooth v4.2 Elliptic Curve Diffie-Hellman
 	  feature in the controller.

From a195e7368f98a10ec3598f078139f2e51f624c89 Mon Sep 17 00:00:00 2001
From: Sean Madigan <sean.madigan@nordicsemi.no>
Date: Wed, 22 Jan 2025 11:26:13 +0000
Subject: [PATCH 2320/2913] [nrf fromtree] bluetooth: host: Add PSA returns to
 debug prints

Recently I have had to debug issues with PSA and having
the returns values from PSA is very useful in order to
find the root cause of the issue.

Signed-off-by: Sean Madigan <sean.madigan@nordicsemi.no>
(cherry picked from commit 8cff70a95d6c5fdf7bd489ca4c6eeafcbe735617)
---
 subsys/bluetooth/host/crypto_psa.c | 30 ++++++++++++---------
 subsys/bluetooth/host/ecc.c        | 43 +++++++++++++++++-------------
 subsys/bluetooth/host/gatt.c       | 25 ++++++++++-------
 3 files changed, 58 insertions(+), 40 deletions(-)

diff --git a/subsys/bluetooth/host/crypto_psa.c b/subsys/bluetooth/host/crypto_psa.c
index d3f2de3b886..c15a52f2fbd 100644
--- a/subsys/bluetooth/host/crypto_psa.c
+++ b/subsys/bluetooth/host/crypto_psa.c
@@ -29,8 +29,10 @@ LOG_MODULE_REGISTER(bt_host_crypto);
 
 int prng_init(void)
 {
-	if (psa_crypto_init() != PSA_SUCCESS) {
-		LOG_ERR("psa_crypto_init() failed");
+	psa_status_t status = psa_crypto_init();
+
+	if (status != PSA_SUCCESS) {
+		LOG_ERR("psa_crypto_init() failed %d", status);
 		return -EIO;
 	}
 	return 0;
@@ -39,11 +41,13 @@ int prng_init(void)
 #if defined(CONFIG_BT_HOST_CRYPTO_PRNG)
 int bt_rand(void *buf, size_t len)
 {
-	if (psa_generate_random(buf, len) == PSA_SUCCESS) {
+	psa_status_t status = psa_generate_random(buf, len);
+
+	if (status == PSA_SUCCESS) {
 		return 0;
 	}
 
-	LOG_ERR("psa_generate_random() failed");
+	LOG_ERR("psa_generate_random() failed %d", status);
 	return -EIO;
 }
 #else /* !CONFIG_BT_HOST_CRYPTO_PRNG */
@@ -79,8 +83,9 @@ int bt_encrypt_le(const uint8_t key[16], const uint8_t plaintext[16],
 	psa_set_key_bits(&attr, 128);
 	psa_set_key_usage_flags(&attr, PSA_KEY_USAGE_ENCRYPT);
 	psa_set_key_algorithm(&attr, PSA_ALG_ECB_NO_PADDING);
-	if (psa_import_key(&attr, tmp, 16, &key_id) != PSA_SUCCESS) {
-		LOG_ERR("Failed to import AES key");
+	status = psa_import_key(&attr, tmp, 16, &key_id);
+	if (status != PSA_SUCCESS) {
+		LOG_ERR("Failed to import AES key %d", status);
 		return -EINVAL;
 	}
 
@@ -89,12 +94,12 @@ int bt_encrypt_le(const uint8_t key[16], const uint8_t plaintext[16],
 	status = psa_cipher_encrypt(key_id, PSA_ALG_ECB_NO_PADDING, tmp, 16,
 					enc_data, 16, &out_len);
 	if (status != PSA_SUCCESS) {
-		LOG_ERR("AES encryption failed");
+		LOG_ERR("AES encryption failed %d", status);
 	}
 
 	destroy_status = psa_destroy_key(key_id);
 	if (destroy_status != PSA_SUCCESS) {
-		LOG_ERR("Failed to destroy AES key");
+		LOG_ERR("Failed to destroy AES key %d", destroy_status);
 	}
 
 	if ((status != PSA_SUCCESS) || (destroy_status != PSA_SUCCESS)) {
@@ -127,20 +132,21 @@ int bt_encrypt_be(const uint8_t key[16], const uint8_t plaintext[16],
 	psa_set_key_bits(&attr, 128);
 	psa_set_key_usage_flags(&attr, PSA_KEY_USAGE_ENCRYPT);
 	psa_set_key_algorithm(&attr, PSA_ALG_ECB_NO_PADDING);
-	if (psa_import_key(&attr, key, 16, &key_id) != PSA_SUCCESS) {
-		LOG_ERR("Failed to import AES key");
+	status = psa_import_key(&attr, key, 16, &key_id);
+	if (status != PSA_SUCCESS) {
+		LOG_ERR("Failed to import AES key %d", status);
 		return -EINVAL;
 	}
 
 	status = psa_cipher_encrypt(key_id, PSA_ALG_ECB_NO_PADDING,
 				plaintext, 16, enc_data, 16, &out_len);
 	if (status != PSA_SUCCESS) {
-		LOG_ERR("AES encryption failed");
+		LOG_ERR("AES encryption failed %d", status);
 	}
 
 	destroy_status = psa_destroy_key(key_id);
 	if (destroy_status != PSA_SUCCESS) {
-		LOG_ERR("Failed to destroy AES key");
+		LOG_ERR("Failed to destroy AES key %d", destroy_status);
 	}
 
 	if ((status != PSA_SUCCESS) || (destroy_status != PSA_SUCCESS)) {
diff --git a/subsys/bluetooth/host/ecc.c b/subsys/bluetooth/host/ecc.c
index 94c44dd0409..749ffc1d8aa 100644
--- a/subsys/bluetooth/host/ecc.c
+++ b/subsys/bluetooth/host/ecc.c
@@ -101,6 +101,7 @@ bool bt_pub_key_is_valid(const uint8_t key[BT_PUB_KEY_LEN])
 		return true;
 	}
 
+	LOG_ERR("psa_import_key() returned status %d", ret);
 	return false;
 }
 
@@ -120,18 +121,20 @@ static void generate_pub_key(struct k_work *work)
 	uint8_t tmp_pub_key_buf[BT_PUB_KEY_LEN + 1];
 	size_t tmp_len;
 	int err;
+	psa_status_t ret;
 
 	set_key_attributes(&attr);
 
-	if (psa_generate_key(&attr, &key_id) != PSA_SUCCESS) {
-		LOG_ERR("Failed to generate ECC key");
+	ret = psa_generate_key(&attr, &key_id);
+	if (ret != PSA_SUCCESS) {
+		LOG_ERR("Failed to generate ECC key %d", ret);
 		err = BT_HCI_ERR_UNSPECIFIED;
 		goto done;
 	}
 
-	if (psa_export_public_key(key_id, tmp_pub_key_buf, sizeof(tmp_pub_key_buf),
-				  &tmp_len) != PSA_SUCCESS) {
-		LOG_ERR("Failed to export ECC public key");
+	ret = psa_export_public_key(key_id, tmp_pub_key_buf, sizeof(tmp_pub_key_buf), &tmp_len);
+	if (ret != PSA_SUCCESS) {
+		LOG_ERR("Failed to export ECC public key %d", ret);
 		err = BT_HCI_ERR_UNSPECIFIED;
 		goto done;
 	}
@@ -141,15 +144,16 @@ static void generate_pub_key(struct k_work *work)
 	 */
 	memcpy(ecc.public_key_be, &tmp_pub_key_buf[1], BT_PUB_KEY_LEN);
 
-	if (psa_export_key(key_id, ecc.private_key_be, BT_PRIV_KEY_LEN,
-			&tmp_len) != PSA_SUCCESS) {
-		LOG_ERR("Failed to export ECC private key");
+	ret = psa_export_key(key_id, ecc.private_key_be, BT_PRIV_KEY_LEN, &tmp_len);
+	if (ret != PSA_SUCCESS) {
+		LOG_ERR("Failed to export ECC private key %d", ret);
 		err = BT_HCI_ERR_UNSPECIFIED;
 		goto done;
 	}
 
-	if (psa_destroy_key(key_id) != PSA_SUCCESS) {
-		LOG_ERR("Failed to destroy ECC key ID");
+	ret = psa_destroy_key(key_id);
+	if (ret != PSA_SUCCESS) {
+		LOG_ERR("Failed to destroy ECC key ID %d", ret);
 		err = BT_HCI_ERR_UNSPECIFIED;
 		goto done;
 	}
@@ -184,6 +188,7 @@ static void generate_dh_key(struct k_work *work)
 
 	psa_key_attributes_t attr = PSA_KEY_ATTRIBUTES_INIT;
 	psa_key_id_t key_id;
+	psa_status_t ret;
 	/* PSA expects secp256r1 public key to start with a predefined 0x04 byte
 	 * at the beginning the buffer.
 	 */
@@ -195,23 +200,25 @@ static void generate_dh_key(struct k_work *work)
 	const uint8_t *priv_key = (IS_ENABLED(CONFIG_BT_USE_DEBUG_KEYS) ?
 				   debug_private_key_be :
 				   ecc.private_key_be);
-	if (psa_import_key(&attr, priv_key, BT_PRIV_KEY_LEN, &key_id) != PSA_SUCCESS) {
+	ret = psa_import_key(&attr, priv_key, BT_PRIV_KEY_LEN, &key_id);
+	if (ret != PSA_SUCCESS) {
 		err = -EIO;
-		LOG_ERR("Failed to import the private key for key agreement");
+		LOG_ERR("Failed to import the private key for key agreement %d", ret);
 		goto exit;
 	}
 
 	memcpy(&tmp_pub_key_buf[1], ecc.public_key_be, BT_PUB_KEY_LEN);
-	if (psa_raw_key_agreement(PSA_ALG_ECDH, key_id, tmp_pub_key_buf,
-				  sizeof(tmp_pub_key_buf), ecc.dhkey_be, BT_DH_KEY_LEN,
-				  &tmp_len) != PSA_SUCCESS) {
+	ret = psa_raw_key_agreement(PSA_ALG_ECDH, key_id, tmp_pub_key_buf, sizeof(tmp_pub_key_buf),
+				    ecc.dhkey_be, BT_DH_KEY_LEN, &tmp_len);
+	if (ret != PSA_SUCCESS) {
 		err = -EIO;
-		LOG_ERR("Raw key agreement failed");
+		LOG_ERR("Raw key agreement failed %d", ret);
 		goto exit;
 	}
 
-	if (psa_destroy_key(key_id) != PSA_SUCCESS) {
-		LOG_ERR("Failed to destroy the key");
+	ret = psa_destroy_key(key_id);
+	if (ret != PSA_SUCCESS) {
+		LOG_ERR("Failed to destroy the key %d", ret);
 		err = -EIO;
 	}
 
diff --git a/subsys/bluetooth/host/gatt.c b/subsys/bluetooth/host/gatt.c
index 86ed719b29b..c9a056bb2df 100644
--- a/subsys/bluetooth/host/gatt.c
+++ b/subsys/bluetooth/host/gatt.c
@@ -703,20 +703,23 @@ struct gen_hash_state {
 static int db_hash_setup(struct gen_hash_state *state, uint8_t *key)
 {
 	psa_key_attributes_t key_attr = PSA_KEY_ATTRIBUTES_INIT;
+	psa_status_t ret;
 
 	psa_set_key_type(&key_attr, PSA_KEY_TYPE_AES);
 	psa_set_key_bits(&key_attr, 128);
 	psa_set_key_usage_flags(&key_attr, PSA_KEY_USAGE_SIGN_MESSAGE);
 	psa_set_key_algorithm(&key_attr, PSA_ALG_CMAC);
 
-	if (psa_import_key(&key_attr, key, 16, &(state->key)) != PSA_SUCCESS) {
-		LOG_ERR("Unable to import the key for AES CMAC");
+	ret = psa_import_key(&key_attr, key, 16, &(state->key));
+	if (ret != PSA_SUCCESS) {
+		LOG_ERR("Unable to import the key for AES CMAC %d", ret);
 		return -EIO;
 	}
 	state->operation = psa_mac_operation_init();
-	if (psa_mac_sign_setup(&(state->operation), state->key,
-			       PSA_ALG_CMAC) != PSA_SUCCESS) {
-		LOG_ERR("CMAC operation init failed");
+
+	ret = psa_mac_sign_setup(&(state->operation), state->key, PSA_ALG_CMAC);
+	if (ret != PSA_SUCCESS) {
+		LOG_ERR("CMAC operation init failed %d", ret);
 		return -EIO;
 	}
 	return 0;
@@ -724,8 +727,10 @@ static int db_hash_setup(struct gen_hash_state *state, uint8_t *key)
 
 static int db_hash_update(struct gen_hash_state *state, uint8_t *data, size_t len)
 {
-	if (psa_mac_update(&(state->operation), data, len) != PSA_SUCCESS) {
-		LOG_ERR("CMAC update failed");
+	psa_status_t ret = psa_mac_update(&(state->operation), data, len);
+
+	if (ret != PSA_SUCCESS) {
+		LOG_ERR("CMAC update failed %d", ret);
 		return -EIO;
 	}
 	return 0;
@@ -734,10 +739,10 @@ static int db_hash_update(struct gen_hash_state *state, uint8_t *data, size_t le
 static int db_hash_finish(struct gen_hash_state *state)
 {
 	size_t mac_length;
+	psa_status_t ret = psa_mac_sign_finish(&(state->operation), db_hash.hash, 16, &mac_length);
 
-	if (psa_mac_sign_finish(&(state->operation), db_hash.hash, 16,
-				&mac_length) != PSA_SUCCESS) {
-		LOG_ERR("CMAC finish failed");
+	if (ret != PSA_SUCCESS) {
+		LOG_ERR("CMAC finish failed %d", ret);
 		return -EIO;
 	}
 	return 0;

From 895b509051d3e9a9ed47e18a18ed8e2ce554a2c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 23 Jan 2025 16:33:29 +0100
Subject: [PATCH 2321/2913] [nrf fromtree] dts: bindings: serial:
 nordic,nrf-uart-common: Extend baudrate enum
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add faster baudrates (2M, 4M and 8M).

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit e7378953686da28a19576c33bffa4679e88ef851)
---
 dts/bindings/serial/nordic,nrf-uart-common.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dts/bindings/serial/nordic,nrf-uart-common.yaml b/dts/bindings/serial/nordic,nrf-uart-common.yaml
index d4061be7aab..425430deb14 100644
--- a/dts/bindings/serial/nordic,nrf-uart-common.yaml
+++ b/dts/bindings/serial/nordic,nrf-uart-common.yaml
@@ -43,3 +43,6 @@ properties:
       - 460800
       - 921600
       - 1000000
+      - 2000000
+      - 4000000
+      - 8000000

From 04ece2cf0e1b3a4a0ceb8c0091e32903c11cce44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 24 Jan 2025 12:31:22 +0100
Subject: [PATCH 2322/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Rename
 FAST to FAST_PD
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rename UARTE_ANY_FAST to UARTE_ANY_FAST_PD. There are 2 types of
'fast' UARTE instances. In nrf54h20 instance uart120 is in fast
power domain that requires additional power and clock management
of that domain. In nrf54lx fast uart00 instance does not require
that. Add _PD to indicate fast power domain.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 1573be5e9f8011c978044d9185d3decb74821bb5)
---
 drivers/serial/uart_nrfx_uarte.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 274afcbabf7..13336a09384 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -111,16 +111,18 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 #include <nrf/gpd.h>
 
 /* Macro must resolve to literal 0 or 1 */
-#define INSTANCE_IS_FAST(unused, prefix, idx, _)						\
+#define INSTANCE_IS_FAST_PD(unused, prefix, idx, _)						\
 	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(UARTE(idx)),					\
 		    (COND_CODE_1(DT_NODE_HAS_PROP(UARTE(idx), power_domains),			\
 			(IS_EQ(DT_PHA(UARTE(idx), power_domains, id), NRF_GPD_FAST_ACTIVE1)),	\
 			(0))), (0))
 
-#if UARTE_FOR_EACH_INSTANCE(INSTANCE_IS_FAST, (||), (0))
-/* Fast instance requires special PM treatment so device runtime PM must be enabled. */
+#if UARTE_FOR_EACH_INSTANCE(INSTANCE_IS_FAST_PD, (||), (0))
+/* Instance in fast power domain (PD) requires special PM treatment so device runtime PM must
+ * be enabled.
+ */
 BUILD_ASSERT(IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME));
-#define UARTE_ANY_FAST 1
+#define UARTE_ANY_FAST_PD 1
 #endif
 #endif
 
@@ -293,7 +295,7 @@ struct uarte_nrfx_data {
  * @retval false if device PM is not ISR safe.
  */
 #define IS_PM_ISR_SAFE(dev) \
-	(!IS_ENABLED(UARTE_ANY_FAST) ||\
+	(!IS_ENABLED(UARTE_ANY_FAST_PD) ||\
 	 COND_CODE_1(CONFIG_PM_DEVICE,\
 			((dev->pm_base->flags & BIT(PM_DEVICE_FLAG_ISR_SAFE))), \
 			(0)))
@@ -309,7 +311,7 @@ struct uarte_nrfx_config {
 #ifdef CONFIG_HAS_NORDIC_DMM
 	void *mem_reg;
 #endif
-#ifdef UARTE_ANY_FAST
+#ifdef UARTE_ANY_FAST_PD
 	const struct device *clk_dev;
 	struct nrf_clock_spec clk_spec;
 #endif
@@ -662,7 +664,7 @@ static void uarte_periph_enable(const struct device *dev)
 	struct uarte_nrfx_data *data = dev->data;
 
 	(void)data;
-#ifdef UARTE_ANY_FAST
+#ifdef UARTE_ANY_FAST_PD
 	if (config->clk_dev) {
 		int err;
 
@@ -2218,7 +2220,7 @@ static void uarte_pm_suspend(const struct device *dev)
 	struct uarte_nrfx_data *data = dev->data;
 
 	(void)data;
-#ifdef UARTE_ANY_FAST
+#ifdef UARTE_ANY_FAST_PD
 	if (cfg->clk_dev) {
 		int err;
 
@@ -2427,13 +2429,13 @@ static int uarte_instance_init(const struct device *dev,
  * which is using nrfs (IPC) are initialized later.
  */
 #define UARTE_INIT_LEVEL(idx) \
-	COND_CODE_1(INSTANCE_IS_FAST(_, /*empty*/, idx, _), (POST_KERNEL), (PRE_KERNEL_1))
+	COND_CODE_1(INSTANCE_IS_FAST_PD(_, /*empty*/, idx, _), (POST_KERNEL), (PRE_KERNEL_1))
 
 /* Get initialization priority of an instance. Instances that requires clock control
  * which is using nrfs (IPC) are initialized later.
  */
 #define UARTE_INIT_PRIO(idx)								\
-	COND_CODE_1(INSTANCE_IS_FAST(_, /*empty*/, idx, _),				\
+	COND_CODE_1(INSTANCE_IS_FAST_PD(_, /*empty*/, idx, _),				\
 		    (UTIL_INC(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_INIT_PRIORITY)),	\
 		    (CONFIG_SERIAL_INIT_PRIORITY))
 
@@ -2518,7 +2520,7 @@ static int uarte_instance_init(const struct device *dev,
 		IF_ENABLED(CONFIG_UART_##idx##_NRF_HW_ASYNC,		       \
 			(.timer = NRFX_TIMER_INSTANCE(			       \
 				CONFIG_UART_##idx##_NRF_HW_ASYNC_TIMER),))     \
-		IF_ENABLED(INSTANCE_IS_FAST(_, /*empty*/, idx, _),	       \
+		IF_ENABLED(INSTANCE_IS_FAST_PD(_, /*empty*/, idx, _),	       \
 			(.clk_dev = DEVICE_DT_GET(DT_CLOCKS_CTLR(UARTE(idx))), \
 			 .clk_spec = {					       \
 				.frequency = NRF_PERIPH_GET_FREQUENCY(UARTE(idx)),\
@@ -2537,7 +2539,7 @@ static int uarte_instance_init(const struct device *dev,
 	}								       \
 									       \
 	PM_DEVICE_DT_DEFINE(UARTE(idx), uarte_nrfx_pm_action,		       \
-			    COND_CODE_1(INSTANCE_IS_FAST(_, /*empty*/, idx, _),\
+			    COND_CODE_1(INSTANCE_IS_FAST_PD(_, /*empty*/, idx, _),\
 				    (0), (PM_DEVICE_ISR_SAFE)));	       \
 									       \
 	DEVICE_DT_DEFINE(UARTE(idx),					       \

From 581f3c1484bbe652e10d3b71c35c3677df4da046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 24 Jan 2025 12:36:31 +0100
Subject: [PATCH 2323/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Add
 support for higher baudrates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

nrf54x devices have UARTE instance capable of using baudrate higher
than 1M. Higher baudrates does not have predefined values for
BAUDRATE register. A formula can be used to calculate BAUDRATE
value that shall be used for desired baudrate. Add UARTE_ANY_HIGH_SPEED
macro which is set when high speed is enabled (uart00 in nrf54lx or
uart120 in nrf54h20). For high speed instance use formula for getting
value that shall be written to BAUDRATE register.

When runtime configuration is not used then same formula is used to
calculate fixed BAUDRATE value.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 972ec824f1e3bfa9599d84fe0f2f7b83dab0ae1f)
---
 drivers/serial/uart_nrfx_uarte.c | 57 +++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 13336a09384..0546ab2714f 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -126,6 +126,16 @@ BUILD_ASSERT(IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME));
 #endif
 #endif
 
+#define INSTANCE_IS_HIGH_SPEED(unused, prefix, idx, _) \
+	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(UARTE(prefix##idx)),				\
+	    ((NRF_PERIPH_GET_FREQUENCY(UARTE(prefix##idx)) > NRF_UARTE_BASE_FREQUENCY_16MHZ)),	\
+	    (0))
+
+/* Macro determines if there is any high speed instance (instance that is driven using
+ * clock that is faster than 16 MHz).
+ */
+#define UARTE_ANY_HIGH_SPEED (UARTE_FOR_EACH_INSTANCE(INSTANCE_IS_HIGH_SPEED, (||), (0)))
+
 #ifdef UARTE_ANY_CACHE
 /* uart120 instance does not retain BAUDRATE register when ENABLE=0. When this instance
  * is used then baudrate must be set after enabling the peripheral and not before.
@@ -256,6 +266,17 @@ struct uarte_nrfx_data {
 /* If enabled then UARTE peripheral is using memory which is cacheable. */
 #define UARTE_CFG_FLAG_CACHEABLE BIT(3)
 
+/* Formula for getting the baudrate settings is following:
+ * 2^12 * (2^20 / (f_PCLK / desired_baudrate)) where f_PCLK is a frequency that
+ * drives the UARTE.
+ *
+ * @param f_pclk Frequency of the clock that drives the peripheral.
+ * @param baudrate Desired baudrate.
+ *
+ * @return Baudrate setting to be written to the BAUDRATE register
+ */
+#define UARTE_GET_CUSTOM_BAUDRATE(f_pclk, baudrate) ((BIT(20) / (f_pclk / baudrate)) << 12)
+
 /* Macro for converting numerical baudrate to register value. It is convenient
  * to use this approach because for constant input it can calculate nrf setting
  * at compile time.
@@ -495,18 +516,19 @@ static void uarte_nrfx_isr_int(const void *arg)
 static int baudrate_set(const struct device *dev, uint32_t baudrate)
 {
 	const struct uarte_nrfx_config *config = dev->config;
+	nrf_uarte_baudrate_t nrf_baudrate;
+
 	/* calculated baudrate divisor */
-	nrf_uarte_baudrate_t nrf_baudrate = NRF_BAUDRATE(baudrate);
+	if (UARTE_ANY_HIGH_SPEED && (config->clock_freq > NRF_UARTE_BASE_FREQUENCY_16MHZ)) {
+		nrf_baudrate = UARTE_GET_CUSTOM_BAUDRATE(config->clock_freq, baudrate);
+	} else {
+		nrf_baudrate = NRF_BAUDRATE(baudrate);
+	}
 
 	if (nrf_baudrate == 0) {
 		return -EINVAL;
 	}
 
-	/* scale baudrate setting */
-	if (config->clock_freq > 0U) {
-		nrf_baudrate /= config->clock_freq / NRF_UARTE_BASE_FREQUENCY_16MHZ;
-	}
-
 #ifdef UARTE_BAUDRATE_RETENTION_WORKAROUND
 	struct uarte_nrfx_data *data = dev->data;
 
@@ -2413,17 +2435,21 @@ static int uarte_instance_init(const struct device *dev,
 #define UARTE_DISABLE_RX_INIT(node_id) \
 	.disable_rx = DT_PROP(node_id, disable_rx)
 
-/* Get frequency of the clock that driver the UARTE peripheral. Clock node can
- * have fixed or variable frequency. For fast UARTE use highest supported frequency.
- */
-#define UARTE_GET_BAUDRATE_DIV(idx) \
-	(NRF_PERIPH_GET_FREQUENCY(UARTE(idx)) / NRF_UARTE_BASE_FREQUENCY_16MHZ)
+/* Get frequency divider that is used to adjust the BAUDRATE value. */
+#define UARTE_GET_BAUDRATE_DIV(f_pclk) (f_pclk / NRF_UARTE_BASE_FREQUENCY_16MHZ)
 
 /* When calculating baudrate we need to take into account that high speed instances
  * must have baudrate adjust to the ratio between UARTE clocking frequency and 16 MHz.
+ * Additionally, >1Mbaud speeds are calculated using a formula.
  */
+#define UARTE_GET_BAUDRATE2(f_pclk, current_speed)					\
+	((f_pclk > NRF_UARTE_BASE_FREQUENCY_16MHZ) && (current_speed > 1000000)) ?	\
+		UARTE_GET_CUSTOM_BAUDRATE(f_pclk, current_speed) :			\
+		(NRF_BAUDRATE(current_speed) / UARTE_GET_BAUDRATE_DIV(f_pclk))
+
+/* Convert DT current-speed to a value that is written to the BAUDRATE register. */
 #define UARTE_GET_BAUDRATE(idx) \
-	(NRF_BAUDRATE(UARTE_PROP(idx, current_speed)) / UARTE_GET_BAUDRATE_DIV(idx))
+	UARTE_GET_BAUDRATE2(NRF_PERIPH_GET_FREQUENCY(UARTE(idx)), UARTE_PROP(idx, current_speed))
 
 /* Get initialization level of an instance. Instances that requires clock control
  * which is using nrfs (IPC) are initialized later.
@@ -2488,12 +2514,11 @@ static int uarte_instance_init(const struct device *dev,
 			    (.int_driven = &uarte##idx##_int_driven,))	       \
 	};								       \
 	COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE, (),		       \
-		(BUILD_ASSERT(NRF_BAUDRATE(UARTE_PROP(idx, current_speed)) > 0,\
-			  "Unsupported baudrate");))			       \
+		(BUILD_ASSERT(UARTE_GET_BAUDRATE(idx) > 0,		       \
+			      "Unsupported baudrate");))		       \
 	static const struct uarte_nrfx_config uarte_##idx##z_config = {	       \
 		COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,		       \
-		    (IF_ENABLED(DT_CLOCKS_HAS_IDX(UARTE(idx), 0),	       \
-			   (.clock_freq = NRF_PERIPH_GET_FREQUENCY(UARTE(idx)),))), \
+			(.clock_freq = NRF_PERIPH_GET_FREQUENCY(UARTE(idx)),),  \
 		    (IF_ENABLED(UARTE_HAS_FRAME_TIMEOUT,		       \
 			(.baudrate = UARTE_PROP(idx, current_speed),))	       \
 		     .nrf_baudrate = UARTE_GET_BAUDRATE(idx),		       \

From c70e602768e2357c9d0b28f2b85d0bcb9b0e3ef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 24 Jan 2025 12:41:32 +0100
Subject: [PATCH 2324/2913] [nrf fromtree] drivers: serial: nrfx_uarte: Fix
 spurious RXTO event
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fast instance in nrf54h (uart120) can generate a spurious RXTO event
some time after RXTO event that indicates that RX path is disabled.
The time when event is generated depends on baudrate and when slower
baudrates are used peripheral is disabled on time to not notice it
in the test but with higher baudates issue become visible. In order
to avoid spurious interrupt, RXTO interrupt is disabled during RXTO
event handling and enabled when RX is enabled. This workaround is
applied only for fast instance to avoid unnecessary register
accesses for slower instances.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit e235e7b38475e3e7ac8a0b2d19aa413bc7e92b08)
---
 drivers/serial/uart_nrfx_uarte.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 0546ab2714f..b973ce9fd7a 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -1165,6 +1165,14 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
 
 	nrf_uarte_rx_buffer_set(uarte, buf, len);
 
+	if (IS_ENABLED(UARTE_ANY_FAST_PD) && (cfg->flags & UARTE_CFG_FLAG_CACHEABLE)) {
+		/* Spurious RXTO event was seen on fast instance (UARTE120) thus
+		 * RXTO interrupt is kept enabled only when RX is active.
+		 */
+		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXTO);
+		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_RXTO_MASK);
+	}
+
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
 	nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED);
 
@@ -1637,6 +1645,12 @@ static void rxto_isr(const struct device *dev)
 
 #ifdef CONFIG_UART_NRFX_UARTE_ENHANCED_RX
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
+	if (IS_ENABLED(UARTE_ANY_FAST_PD) && (config->flags & UARTE_CFG_FLAG_CACHEABLE)) {
+		/* Spurious RXTO event was seen on fast instance (UARTE120) thus
+		 * RXTO interrupt is kept enabled only when RX is active.
+		 */
+		nrf_uarte_int_disable(uarte, NRF_UARTE_INT_RXTO_MASK);
+	}
 #ifdef UARTE_HAS_FRAME_TIMEOUT
 	nrf_uarte_shorts_disable(uarte, NRF_UARTE_SHORT_FRAME_TIMEOUT_STOPRX);
 #endif

From fb032222221c7ea8e3f54fa303a44899967cfb94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 24 Jan 2025 12:42:56 +0100
Subject: [PATCH 2325/2913] [nrf fromtree] tests: drivers: uart:
 uart_async_api: Tweak test_read_abort test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test was staring a TX transfer and aborting it after 300 us from
the timer handler. Test was assuming that ongoing transfer will
not finish in those 300 us. This might not be true for higher
baudrates. Instead of using fixed timeout, a value is calculated
from the baudrate and targets to abort the transfer after approx.
20 bytes of 95 byte long transfer.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 38c129da39f28b0d4b5e43ac84e99348312bc4ee)
---
 .../uart/uart_async_api/src/test_uart_async.c | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/tests/drivers/uart/uart_async_api/src/test_uart_async.c b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
index dd87afbdd15..36428479417 100644
--- a/tests/drivers/uart/uart_async_api/src/test_uart_async.c
+++ b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
@@ -592,6 +592,9 @@ static void *read_abort_setup(void)
 
 ZTEST_USER(uart_async_read_abort, test_read_abort)
 {
+	struct uart_config cfg;
+	int err;
+	uint32_t t_us;
 #if NOCACHE_MEM
 	static __aligned(32) uint8_t rx_buf[100] __used __NOCACHE;
 	static __aligned(32) uint8_t tx_buf[100] __used __NOCACHE;
@@ -603,17 +606,26 @@ ZTEST_USER(uart_async_read_abort, test_read_abort)
 	memset(rx_buf, 0, sizeof(rx_buf));
 	memset(tx_buf, 1, sizeof(tx_buf));
 
-	uart_rx_enable(uart_dev, rx_buf, sizeof(rx_buf), 50 * USEC_PER_MSEC);
+	err = uart_config_get(uart_dev, &cfg);
+	zassert_equal(err, 0);
+
+	/* Lets aim to abort after transmitting ~20 bytes (200 bauds) */
+	t_us = (20 * 10 * 1000000) / cfg.baudrate;
+
+	err = uart_rx_enable(uart_dev, rx_buf, sizeof(rx_buf), 50 * USEC_PER_MSEC);
+	zassert_equal(err, 0);
 	k_sem_give(&rx_buf_coherency);
 
-	uart_tx(uart_dev, tx_buf, 5, 100 * USEC_PER_MSEC);
+	err = uart_tx(uart_dev, tx_buf, 5, 100 * USEC_PER_MSEC);
+	zassert_equal(err, 0);
 	zassert_equal(k_sem_take(&tx_done, K_MSEC(100)), 0, "TX_DONE timeout");
 	zassert_equal(k_sem_take(&rx_rdy, K_MSEC(100)), 0, "RX_RDY timeout");
 	zassert_equal(memcmp(tx_buf, rx_buf, 5), 0, "Buffers not equal");
 
-	uart_tx(uart_dev, tx_buf, 95, 100 * USEC_PER_MSEC);
+	err = uart_tx(uart_dev, tx_buf, 95, 100 * USEC_PER_MSEC);
+	zassert_equal(err, 0);
 
-	k_timer_start(&read_abort_timer, K_USEC(300), K_NO_WAIT);
+	k_timer_start(&read_abort_timer, K_USEC(t_us), K_NO_WAIT);
 
 	/* RX will be aborted from k_timer timeout */
 

From 80cc5318ea91317d25fdeffb70e59507d68a1966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 24 Jan 2025 12:50:14 +0100
Subject: [PATCH 2326/2913] [nrf fromtree] tests: drivers: uart:
 uart_async_api: Use 4Mbaud for nrf54h20dk uart120
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use high baudrate when testing uart120 on nrf54h20dk/nrf54h20/cpuapp.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit fe6a4d0f932685df625d50b7a88a0e1d1daec7c4)
---
 .../uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi
index 9902d733d35..068bc6e57ba 100644
--- a/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi
@@ -50,6 +50,6 @@ dut2: &uart120 {
 	pinctrl-0 = <&uart120_default_alt>;
 	pinctrl-1 = <&uart120_sleep_alt>;
 	pinctrl-names = "default", "sleep";
-	current-speed = <115200>;
+	current-speed = <4000000>;
 	zephyr,pm-device-runtime-auto;
 };

From eee8e752879cb887c6fecaeb118be89badb3c553 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Thu, 9 Jan 2025 14:57:19 +0000
Subject: [PATCH 2327/2913] [nrf fromtree] cmake: modules: Prefer imgtool being
 in MCUboot directory

Changes the priority of imgtool so that the preferred version is
the one inside of the MCUboot directory

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 6db2c86d3acf5a9cc575e92228363372fc1921f1)
---
 cmake/modules/FindHostTools.cmake | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cmake/modules/FindHostTools.cmake b/cmake/modules/FindHostTools.cmake
index a1ea6631bf5..f0954a26b75 100644
--- a/cmake/modules/FindHostTools.cmake
+++ b/cmake/modules/FindHostTools.cmake
@@ -61,9 +61,10 @@ find_program(OPENOCD openocd)
 # bossac is an optional dependency
 find_program(BOSSAC bossac)
 
-# imgtool is an optional dependency (the build may also fall back to scripts/imgtool.py
-# in the mcuboot repository if that's present in some cases)
-find_program(IMGTOOL imgtool)
+# imgtool is an optional dependency (prefer the version that is in the mcuboot repository, if
+# present and a user has not specified a different version)
+zephyr_get(IMGTOOL SYSBUILD LOCAL)
+find_program(IMGTOOL imgtool.py HINTS ${ZEPHYR_MCUBOOT_MODULE_DIR}/scripts/ NAMES imgtool NAMES_PER_DIR)
 
 # winpty is an optional dependency
 find_program(PTY_INTERFACE winpty)

From f2f1caa64cb23ee8356b38664d21cad209fe5f55 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Mon, 20 Jan 2025 11:36:34 +0000
Subject: [PATCH 2328/2913] [nrf fromtree] cmake: mcuboot: Use
 zephyr-discovered imgtool

Uses imgtool which has already been located by zephyr

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 8b7beff1536b53807a9c7646a9af9b38452222aa)
---
 cmake/mcuboot.cmake | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/cmake/mcuboot.cmake b/cmake/mcuboot.cmake
index b6ab9dd5034..99f6af9e239 100644
--- a/cmake/mcuboot.cmake
+++ b/cmake/mcuboot.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023 Nordic Semiconductor ASA
+# Copyright (c) 2020-2025 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
 # This file includes extra build system logic that is enabled when
@@ -52,23 +52,8 @@ function(zephyr_mcuboot_tasks)
     endif()
   endforeach()
 
-  # Find imgtool. Even though west is installed, imgtool might not be.
-  # The user may also have a custom manifest which doesn't include
-  # MCUboot.
-  #
-  # Therefore, go with an explicitly installed imgtool first, falling
-  # back on mcuboot/scripts/imgtool.py.
-  if(IMGTOOL)
-    set(imgtool_path "${IMGTOOL}")
-  elseif(DEFINED ZEPHYR_MCUBOOT_MODULE_DIR)
-    set(IMGTOOL_PY "${ZEPHYR_MCUBOOT_MODULE_DIR}/scripts/imgtool.py")
-    if(EXISTS "${IMGTOOL_PY}")
-      set(imgtool_path "${IMGTOOL_PY}")
-    endif()
-  endif()
-
   # No imgtool, no signed binaries.
-  if(NOT DEFINED imgtool_path)
+  if(NOT DEFINED IMGTOOL)
     message(FATAL_ERROR "Can't sign images for MCUboot: can't find imgtool. To fix, install imgtool with pip3, or add the mcuboot repository to the west manifest and ensure it has a scripts/imgtool.py file.")
     return()
   endif()
@@ -94,7 +79,7 @@ function(zephyr_mcuboot_tasks)
   endif()
 
   # Basic 'imgtool sign' command with known image information.
-  set(imgtool_sign ${PYTHON_EXECUTABLE} ${imgtool_path} sign
+  set(imgtool_sign ${PYTHON_EXECUTABLE} ${IMGTOOL} sign
       --version ${CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION} --header-size ${CONFIG_ROM_START_OFFSET}
       --slot-size ${slot_size})
 

From 19552416c85eaf6ff1e48f3417b6d90336a34f9f Mon Sep 17 00:00:00 2001
From: Thomas Deppe <thomas.deppe@nordicsemi.no>
Date: Thu, 6 Feb 2025 14:33:25 +0100
Subject: [PATCH 2329/2913] [nrf fromtree] Bluetooth: Host: Add support for
 Advertising Coding Selection

Adds API for Advertising Coding Selection.

Introduces two new advertising options to configure the advertiser's
requirement concerning coding scheme when LE Coded PHY is configured.
While the Bluetooth v6.0 specification makes a distinction betweeen
preferred and required advertising PHY options, a simplification is
made to only expose the required PHY options. Inline with how LE Coded
PHY is implemented; this API will set both the primary and secondary
advertising PHY's to the same coding scheme.

The support is enabled by CONFIG_BT_EXT_ADV_CODING_SELECTION, and requires
a controller that selects CONFIG_BT_CTLR_ADV_EXT_CODING_SELECTION_SUPPORT.

Signed-off-by: Thomas Deppe <thomas.deppe@nordicsemi.no>
(cherry picked from commit f3bdd2bc8c6331612ae9d6e9cbddf4434e23a1e4)
---
 include/zephyr/bluetooth/bluetooth.h   | 34 +++++++++++++++++++++++
 include/zephyr/bluetooth/hci_types.h   | 30 ++++++++++++++++++++
 subsys/bluetooth/Kconfig.adv           |  8 ++++++
 subsys/bluetooth/controller/Kconfig    | 12 ++++++++
 subsys/bluetooth/host/adv.c            | 38 ++++++++++++++++++++++----
 tests/bluetooth/init/prj_host_6_x.conf |  9 ++++++
 tests/bluetooth/init/testcase.yaml     |  7 +++++
 7 files changed, 133 insertions(+), 5 deletions(-)
 create mode 100644 tests/bluetooth/init/prj_host_6_x.conf

diff --git a/include/zephyr/bluetooth/bluetooth.h b/include/zephyr/bluetooth/bluetooth.h
index 8d2ceebf6cb..1b5576d9466 100644
--- a/include/zephyr/bluetooth/bluetooth.h
+++ b/include/zephyr/bluetooth/bluetooth.h
@@ -784,6 +784,40 @@ enum {
 	 * @note Mutually exclusive with BT_LE_ADV_OPT_USE_IDENTITY.
 	 */
 	BT_LE_ADV_OPT_USE_NRPA = BIT(19),
+
+	/**
+	 * @brief Configures the advertiser to use the S=2 coding scheme for
+	 * LE Coded PHY.
+	 *
+	 * Sets the advertiser's required coding scheme to S=2, which is one
+	 * of the coding options available for LE Coded PHY. The S=2 coding
+	 * scheme offers higher data rates compared to S=8, with a trade-off
+	 * of reduced range. The coding scheme will only be set if both the
+	 * primary and secondary advertising channels indicate LE Coded Phy.
+	 * Additionally, the Controller must support the LE Feature Advertising
+	 * Coding Selection. If these conditions are not met, it will default to
+	 * no required coding scheme.
+	 *
+	 * @note Requires @kconfig{BT_EXT_ADV_CODING_SELECTION}
+	 */
+	BT_LE_ADV_OPT_REQUIRE_S2_CODING = BIT(20),
+
+	/**
+	 * @brief Configures the advertiser to use the S=8 coding scheme for
+	 * LE Coded PHY.
+	 *
+	 * Sets the advertiser's required coding scheme to S=8, which is one
+	 * of the coding options available for LE Coded PHY. The S=8 coding
+	 * scheme offers increased range compared to S=2, with a trade-off
+	 * of lower data rates. The coding scheme will only be set if both the
+	 * primary and secondary advertising channels indicate LE Coded Phy.
+	 * Additionally, the Controller must support the LE Feature Advertising
+	 * Coding Selection. If these conditions are not met, it will default to
+	 * no required coding scheme.
+	 *
+	 * @note Requires @kconfig{BT_EXT_ADV_CODING_SELECTION}
+	 */
+	BT_LE_ADV_OPT_REQUIRE_S8_CODING = BIT(21),
 };
 
 /** LE Advertising Parameters. */
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 9f312049007..d6fa395ff15 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -198,6 +198,8 @@ struct bt_hci_cmd_hdr {
 #define BT_LE_FEAT_BIT_CONN_SUBRATING           37
 #define BT_LE_FEAT_BIT_CONN_SUBRATING_HOST_SUPP 38
 #define BT_LE_FEAT_BIT_CHANNEL_CLASSIFICATION   39
+#define BT_LE_FEAT_BIT_ADV_CODING_SEL           40
+#define BT_LE_FEAT_BIT_ADV_CODING_SEL_HOST      41
 
 #define BT_LE_FEAT_BIT_PAWR_ADVERTISER          43
 #define BT_LE_FEAT_BIT_PAWR_SCANNER             44
@@ -268,6 +270,10 @@ struct bt_hci_cmd_hdr {
 						  BT_LE_FEAT_BIT_CONN_SUBRATING_HOST_SUPP)
 #define BT_FEAT_LE_CHANNEL_CLASSIFICATION(feat)   BT_LE_FEAT_TEST(feat, \
 						  BT_LE_FEAT_BIT_CHANNEL_CLASSIFICATION)
+#define BT_FEAT_LE_ADV_CODING_SEL(feat)	          BT_LE_FEAT_TEST(feat, \
+						  BT_LE_FEAT_BIT_ADV_CODING_SEL)
+#define BT_FEAT_LE_ADV_CODING_SEL_HOST(feat)	  BT_LE_FEAT_TEST(feat, \
+						  BT_LE_FEAT_BIT_ADV_CODING_SEL_HOST)
 #define BT_FEAT_LE_PAWR_ADVERTISER(feat)	  BT_LE_FEAT_TEST(feat, \
 						  BT_LE_FEAT_BIT_PAWR_ADVERTISER)
 #define BT_FEAT_LE_PAWR_SCANNER(feat)             BT_LE_FEAT_TEST(feat, \
@@ -1538,6 +1544,30 @@ struct bt_hci_rp_le_set_ext_adv_param {
 	int8_t  tx_power;
 } __packed;
 
+#define BT_HCI_LE_ADV_PHY_OPTION_NO_REQUIRED 0x00
+#define BT_HCI_LE_ADV_PHY_OPTION_REQUIRE_S2  0x03
+#define BT_HCI_LE_ADV_PHY_OPTION_REQUIRE_S8  0x04
+
+#define BT_HCI_OP_LE_SET_EXT_ADV_PARAM_V2        BT_OP(BT_OGF_LE, 0x007F) /* 0x207F */
+struct bt_hci_cp_le_set_ext_adv_param_v2 {
+	uint8_t      handle;
+	uint16_t     props;
+	uint8_t      prim_min_interval[3];
+	uint8_t      prim_max_interval[3];
+	uint8_t      prim_channel_map;
+	uint8_t      own_addr_type;
+	bt_addr_le_t peer_addr;
+	uint8_t      filter_policy;
+	int8_t       tx_power;
+	uint8_t      prim_adv_phy;
+	uint8_t      sec_adv_max_skip;
+	uint8_t      sec_adv_phy;
+	uint8_t      sid;
+	uint8_t      scan_req_notify_enable;
+	uint8_t      prim_adv_phy_opt;
+	uint8_t      sec_adv_phy_opt;
+} __packed;
+
 #define BT_HCI_LE_EXT_ADV_OP_INTERM_FRAG        0x00
 #define BT_HCI_LE_EXT_ADV_OP_FIRST_FRAG         0x01
 #define BT_HCI_LE_EXT_ADV_OP_LAST_FRAG          0x02
diff --git a/subsys/bluetooth/Kconfig.adv b/subsys/bluetooth/Kconfig.adv
index 99b40250a94..28e1dea61a2 100644
--- a/subsys/bluetooth/Kconfig.adv
+++ b/subsys/bluetooth/Kconfig.adv
@@ -68,6 +68,14 @@ config BT_PER_ADV_SYNC_RSP
 	  Select this to enable Periodic Advertising with Responses Sync
 	  API support.
 
+config BT_EXT_ADV_CODING_SELECTION
+	bool "Advertising Coding Selection support"
+	depends on !HAS_BT_CTLR || BT_CTLR_PHY_CODED
+	help
+	  Select this to enable Advertising Coding Selection API support.
+	  This allows the Host to indicate their strict requirement
+	  concerning coding scheme when using Extended Advertising.
+
 if BT_PER_ADV_SYNC
 
 config BT_PER_ADV_SYNC_MAX
diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
index 4953343ba3c..d5469c24bc1 100644
--- a/subsys/bluetooth/controller/Kconfig
+++ b/subsys/bluetooth/controller/Kconfig
@@ -45,6 +45,10 @@ config BT_CTLR_PHY_CODED_SUPPORT
 config BT_CTLR_ADV_EXT_SUPPORT
 	bool
 
+config BT_CTLR_ADV_EXT_CODING_SELECTION_SUPPORT
+	depends on BT_CTLR_PHY_CODED_SUPPORT
+	bool
+
 config BT_CTLR_ADV_PERIODIC_SUPPORT
 	depends on BT_CTLR_ADV_EXT_SUPPORT
 	bool
@@ -742,6 +746,14 @@ config BT_CTLR_ADV_PERIODIC_RSP
 	  Enable support for Bluetooth 5.4 LE Periodic Advertising with
 	  Responses in the Controller.
 
+config BT_CTLR_ADV_EXT_CODING_SELECTION
+	bool "Advertising Coding Selection support"
+	depends on BT_CTLR_PHY_CODED && BT_CTLR_ADV_EXT_CODING_SELECTION_SUPPORT
+	default y if BT_EXT_ADV_CODING_SELECTION
+	help
+	  Enable support for Bluetooth 6.0 Advertising Coding Selection
+	  in the Controller.
+
 if BT_CTLR_ADV_PERIODIC
 
 config BT_CTLR_ADV_PERIODIC_ADI_SUPPORT
diff --git a/subsys/bluetooth/host/adv.c b/subsys/bluetooth/host/adv.c
index db71858f8f2..d99144a420d 100644
--- a/subsys/bluetooth/host/adv.c
+++ b/subsys/bluetooth/host/adv.c
@@ -1121,20 +1121,32 @@ static int le_ext_adv_param_set(struct bt_le_ext_adv *adv,
 				const struct bt_le_adv_param *param,
 				bool  has_scan_data)
 {
-	struct bt_hci_cp_le_set_ext_adv_param *cp;
+	struct bt_hci_cp_le_set_ext_adv_param_v2 *cp;
+
+	uint16_t opcode;
+	uint16_t size;
 	bool dir_adv = param->peer != NULL, scannable;
 	struct net_buf *buf, *rsp;
 	int err;
 	enum adv_name_type name_type;
 	uint16_t props = 0;
 
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_SET_EXT_ADV_PARAM, sizeof(*cp));
+	if (IS_ENABLED(CONFIG_BT_EXT_ADV_CODING_SELECTION) &&
+	    BT_FEAT_LE_ADV_CODING_SEL(bt_dev.le.features)) {
+		opcode = BT_HCI_OP_LE_SET_EXT_ADV_PARAM_V2;
+		size = sizeof(struct bt_hci_cp_le_set_ext_adv_param_v2);
+	} else {
+		opcode = BT_HCI_OP_LE_SET_EXT_ADV_PARAM;
+		size = sizeof(struct bt_hci_cp_le_set_ext_adv_param);
+	}
+
+	buf = bt_hci_cmd_create(opcode, size);
 	if (!buf) {
 		return -ENOBUFS;
 	}
 
-	cp = net_buf_add(buf, sizeof(*cp));
-	(void)memset(cp, 0, sizeof(*cp));
+	cp = net_buf_add(buf, size);
+	(void)memset(cp, 0, size);
 
 	adv->options = param->options;
 
@@ -1171,6 +1183,22 @@ static int le_ext_adv_param_set(struct bt_le_ext_adv *adv,
 	if (param->options & BT_LE_ADV_OPT_CODED) {
 		cp->prim_adv_phy = BT_HCI_LE_PHY_CODED;
 		cp->sec_adv_phy = BT_HCI_LE_PHY_CODED;
+
+		if (IS_ENABLED(CONFIG_BT_EXT_ADV_CODING_SELECTION) &&
+		    opcode == BT_HCI_OP_LE_SET_EXT_ADV_PARAM_V2) {
+			uint8_t adv_phy_opt;
+
+			if (param->options & BT_LE_ADV_OPT_REQUIRE_S8_CODING) {
+				adv_phy_opt = BT_HCI_LE_ADV_PHY_OPTION_REQUIRE_S8;
+			} else if (param->options & BT_LE_ADV_OPT_REQUIRE_S2_CODING) {
+				adv_phy_opt = BT_HCI_LE_ADV_PHY_OPTION_REQUIRE_S2;
+			} else {
+				adv_phy_opt = BT_HCI_LE_ADV_PHY_OPTION_NO_REQUIRED;
+			}
+
+			cp->prim_adv_phy_opt = adv_phy_opt;
+			cp->sec_adv_phy_opt = adv_phy_opt;
+		}
 	}
 
 	if (!(param->options & BT_LE_ADV_OPT_EXT_ADV)) {
@@ -1222,7 +1250,7 @@ static int le_ext_adv_param_set(struct bt_le_ext_adv *adv,
 	cp->sec_adv_max_skip = param->secondary_max_skip;
 
 	cp->props = sys_cpu_to_le16(props);
-	err = bt_hci_cmd_send_sync(BT_HCI_OP_LE_SET_EXT_ADV_PARAM, buf, &rsp);
+	err = bt_hci_cmd_send_sync(opcode, buf, &rsp);
 	if (err) {
 		return err;
 	}
diff --git a/tests/bluetooth/init/prj_host_6_x.conf b/tests/bluetooth/init/prj_host_6_x.conf
new file mode 100644
index 00000000000..033794e2b36
--- /dev/null
+++ b/tests/bluetooth/init/prj_host_6_x.conf
@@ -0,0 +1,9 @@
+CONFIG_BT=y
+CONFIG_BT_BROADCASTER=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_OBSERVER=y
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_EXT_ADV=y
+CONFIG_BT_CTLR_PHY_CODED=y
+CONFIG_BT_EXT_ADV_CODING_SELECTION=y
+CONFIG_ZTEST=y
diff --git a/tests/bluetooth/init/testcase.yaml b/tests/bluetooth/init/testcase.yaml
index 778049c511a..a5cc40cd39e 100644
--- a/tests/bluetooth/init/testcase.yaml
+++ b/tests/bluetooth/init/testcase.yaml
@@ -402,3 +402,10 @@ tests:
       - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
+  bluetooth.init.test_host_6_x:
+    extra_args: CONF_FILE=prj_host_6_x.conf
+    platform_allow:
+      - qemu_cortex_m3
+      - nrf52840dk/nrf52840
+    integration_platforms:
+      - nrf52840dk/nrf52840

From ed93f6e3b6ece4b617bf753500fa44706bddd118 Mon Sep 17 00:00:00 2001
From: Thomas Deppe <thomas.deppe@nordicsemi.no>
Date: Tue, 11 Feb 2025 13:33:33 +0100
Subject: [PATCH 2330/2913] [nrf fromtree] Bluetooth: Host: Add host support
 for Advertising Coding Selection

Extends the API for Advertising Coding Selection.

The API is extended to set the Advertising Coding Selection
(Host Support) bit. With this feature, the primary and
secondary PHY can now explicitly report S=2 or S=8 coding
in the extended advertising report. Previously, the report
only indicated LE Coded regardless of whether S=2 or S=8
data coding was used. The API now sets the host support bit
and ensures that the advertising PHY coding scheme is
conveyed to the application via the scan callback.

The support is enabled by CONFIG_BT_EXT_ADV_CODING_SELECTION,
and requires a controller that selects
CONFIG_BT_CTLR_ADV_EXT_CODING_SELECTION_SUPPORT.

Signed-off-by: Thomas Deppe <thomas.deppe@nordicsemi.no>
(cherry picked from commit dcbcbe824d079d76aac2dca29e14b50dd5bee7d3)
---
 include/zephyr/bluetooth/gap.h       | 10 ++++++++-
 include/zephyr/bluetooth/hci_types.h |  8 +++++++
 subsys/bluetooth/controller/Kconfig  |  1 +
 subsys/bluetooth/host/hci_core.c     |  8 +++++++
 subsys/bluetooth/host/scan.c         | 33 ++++++++++++++++++++++++++--
 5 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/include/zephyr/bluetooth/gap.h b/include/zephyr/bluetooth/gap.h
index 1b1569e3003..2582d9fb96c 100644
--- a/include/zephyr/bluetooth/gap.h
+++ b/include/zephyr/bluetooth/gap.h
@@ -747,8 +747,16 @@ enum {
 	BT_GAP_LE_PHY_1M                      = BIT(0),
 	 /** LE 2M PHY */
 	BT_GAP_LE_PHY_2M                      = BIT(1),
-	/** LE Coded PHY */
+	/** LE Coded PHY, coding scheme not specified */
 	BT_GAP_LE_PHY_CODED                   = BIT(2),
+	/** LE Coded S=8 PHY. Only used for advertising reports
+	 * when Kconfig BT_EXT_ADV_CODING_SELECTION is enabled.
+	 */
+	BT_GAP_LE_PHY_CODED_S8                = BIT(3),
+	/** LE Coded S=2 PHY. Only used for advertising reports
+	 * when Kconfig BT_EXT_ADV_CODING_SELECTION is enabled.
+	 */
+	BT_GAP_LE_PHY_CODED_S2                = BIT(4),
 };
 
 /** Advertising PDU types */
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index d6fa395ff15..9717e8ed736 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -3203,6 +3203,14 @@ struct bt_hci_evt_le_phy_update_complete {
 #define BT_HCI_LE_ADV_EVT_TYPE_DATA_STATUS_INCOMPLETE 2
 #define BT_HCI_LE_ADV_EVT_TYPE_DATA_STATUS_RX_FAILED  0xFF
 
+/* Advertising Coding Selection extended advertising report PHY values.
+ * Only used when Kconfig BT_EXT_ADV_CODING_SELECTION is enabled.
+ */
+#define BT_HCI_LE_ADV_EVT_PHY_1M                0x01
+#define BT_HCI_LE_ADV_EVT_PHY_2M                0x02
+#define BT_HCI_LE_ADV_EVT_PHY_CODED_S8          0x03
+#define BT_HCI_LE_ADV_EVT_PHY_CODED_S2          0x04
+
 struct bt_hci_evt_le_ext_advertising_info {
 	uint16_t     evt_type;
 	bt_addr_le_t addr;
diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
index d5469c24bc1..3360db0abc1 100644
--- a/subsys/bluetooth/controller/Kconfig
+++ b/subsys/bluetooth/controller/Kconfig
@@ -749,6 +749,7 @@ config BT_CTLR_ADV_PERIODIC_RSP
 config BT_CTLR_ADV_EXT_CODING_SELECTION
 	bool "Advertising Coding Selection support"
 	depends on BT_CTLR_PHY_CODED && BT_CTLR_ADV_EXT_CODING_SELECTION_SUPPORT
+	select BT_CTLR_SET_HOST_FEATURE if BT_OBSERVER
 	default y if BT_EXT_ADV_CODING_SELECTION
 	help
 	  Enable support for Bluetooth 6.0 Advertising Coding Selection
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index 4701a69b0d5..7c1d1376d06 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -3682,6 +3682,14 @@ static int le_init(void)
 		}
 	}
 
+	if (IS_ENABLED(CONFIG_BT_EXT_ADV_CODING_SELECTION) &&
+	    BT_FEAT_LE_ADV_CODING_SEL(bt_dev.le.features)) {
+		err = le_set_host_feature(BT_LE_FEAT_BIT_ADV_CODING_SEL_HOST, 1);
+		if (err) {
+			return err;
+		}
+	}
+
 	return  le_set_event_mask();
 }
 
diff --git a/subsys/bluetooth/host/scan.c b/subsys/bluetooth/host/scan.c
index 05ad120fb38..c3551c2ef07 100644
--- a/subsys/bluetooth/host/scan.c
+++ b/subsys/bluetooth/host/scan.c
@@ -741,6 +741,28 @@ static uint8_t get_adv_type(uint8_t evt_type)
 	}
 }
 
+/* Convert Extended adv report PHY to GAP PHY */
+static uint8_t get_ext_adv_coding_sel_phy(uint8_t hci_phy)
+{
+	/* Converts from Extended adv report PHY to BT_GAP_LE_PHY_*
+	 * When Advertising Coding Selection (Host Support) is enabled
+	 * the controller will return the advertising coding scheme which
+	 * can be S=2 or S=8 data coding.
+	 */
+	switch (hci_phy) {
+	case BT_HCI_LE_ADV_EVT_PHY_1M:
+		return BT_GAP_LE_PHY_1M;
+	case BT_HCI_LE_ADV_EVT_PHY_2M:
+		return BT_GAP_LE_PHY_2M;
+	case BT_HCI_LE_ADV_EVT_PHY_CODED_S8:
+		return BT_GAP_LE_PHY_CODED_S8;
+	case BT_HCI_LE_ADV_EVT_PHY_CODED_S2:
+		return BT_GAP_LE_PHY_CODED_S2;
+	default:
+		return 0;
+	}
+}
+
 /* Convert extended adv report evt_type field to adv props */
 static uint16_t get_adv_props_extended(uint16_t evt_type)
 {
@@ -755,8 +777,15 @@ static uint16_t get_adv_props_extended(uint16_t evt_type)
 static void create_ext_adv_info(struct bt_hci_evt_le_ext_advertising_info const *const evt,
 				struct bt_le_scan_recv_info *const scan_info)
 {
-	scan_info->primary_phy = bt_get_phy(evt->prim_phy);
-	scan_info->secondary_phy = bt_get_phy(evt->sec_phy);
+	if (IS_ENABLED(CONFIG_BT_EXT_ADV_CODING_SELECTION) &&
+	    BT_FEAT_LE_ADV_CODING_SEL(bt_dev.le.features)) {
+		scan_info->primary_phy = get_ext_adv_coding_sel_phy(evt->prim_phy);
+		scan_info->secondary_phy = get_ext_adv_coding_sel_phy(evt->sec_phy);
+	} else {
+		scan_info->primary_phy = bt_get_phy(evt->prim_phy);
+		scan_info->secondary_phy = bt_get_phy(evt->sec_phy);
+	}
+
 	scan_info->tx_power = evt->tx_power;
 	scan_info->rssi = evt->rssi;
 	scan_info->sid = evt->sid;

From a68f065a8c150fe60fd7746c520f0567e5011a13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= <rafal.kuznia@nordicsemi.no>
Date: Tue, 18 Feb 2025 12:17:47 +0100
Subject: [PATCH 2331/2913] [nrf noup] entropy: Add fake entropy nRF PRNG
 driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This adds temporary entropy driver simulation for
nRF54l09 device since final entropy source is not
available yet.

TODO: Remove this commit when proper solution will
be available.

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
---
 dts/arm/nordic/nrf54l09_enga_cpuapp.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dts/arm/nordic/nrf54l09_enga_cpuapp.dtsi b/dts/arm/nordic/nrf54l09_enga_cpuapp.dtsi
index fc359cdb0ac..1dfc5ce133c 100644
--- a/dts/arm/nordic/nrf54l09_enga_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l09_enga_cpuapp.dtsi
@@ -18,6 +18,7 @@ nvic: &cpuapp_nvic {};
 / {
 	chosen {
 		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,entropy = &prng;
 	};
 
 	soc {
@@ -30,6 +31,11 @@ nvic: &cpuapp_nvic {};
 		compatible = "zephyr,psa-crypto-rng";
 		status = "disabled";
 	};
+
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
+	};
 };
 
 &bt_hci_controller {

From ff0fbbbf231fd21655950b06625f3b328a9730ee Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Thu, 13 Feb 2025 12:37:58 +0100
Subject: [PATCH 2332/2913] [nrf fromtree] tests/bsim UART: Let's connect the
 nrf54L UART00 in loopback too

A test is going to use this UART also, so we'll need it.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit dc87bb0f6812a42beb2814f80fd5bf4c1000e100)
---
 tests/bsim/ci.uart.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bsim/ci.uart.sh b/tests/bsim/ci.uart.sh
index 70d296d23df..7f53fa86406 100755
--- a/tests/bsim/ci.uart.sh
+++ b/tests/bsim/ci.uart.sh
@@ -20,7 +20,7 @@ ${ZEPHYR_BASE}/scripts/twister -T tests/drivers/uart/ --force-color --inline-log
 echo " nRF54L15:"
 ${ZEPHYR_BASE}/scripts/twister -T tests/drivers/uart/ --force-color --inline-logs -v -M \
   -p nrf54l15bsim/nrf54l15/cpuapp --fixture gpio_loopback \
-  -- -uart2_loopback
+  -- -uart0_loopback -uart2_loopback
 
 echo "UART: Multi device tests"
 WORK_DIR=${ZEPHYR_BASE}/bsim_uart nice tests/bsim/drivers/uart/compile.sh

From 9bc8f724c7465a26fbca4c92a51d2649088da731 Mon Sep 17 00:00:00 2001
From: Piotr Krzyzanowski <piotr.krzyzanowski@nordicsemi.no>
Date: Tue, 11 Feb 2025 17:08:33 +0100
Subject: [PATCH 2333/2913] [nrf fromtree] tests: drivers: uart: add 54l15 fast
 uart

Add the fast uart instance of 54l15 for testing

Signed-off-by: Piotr Krzyzanowski <piotr.krzyzanowski@nordicsemi.no>
(cherry picked from commit 6d8eb184b76fc35f95887c0440674f3b362de1c7)
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index ed4a2de1891..a1e29cbf0ff 100644
--- a/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -1,5 +1,9 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 
+&spi00 {
+	status = "disabled";
+};
+
 &pinctrl {
 	uart21_default_alt: uart21_default_alt {
 		group1 {
@@ -15,6 +19,21 @@
 			low-power-enable;
 		};
 	};
+
+	uart00_default_alt: uart00_default_alt {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 2, 8)>,
+				<NRF_PSEL(UART_RX, 2, 7)>;
+		};
+	};
+
+	uart00_sleep_alt: uart00_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 2, 8)>,
+				<NRF_PSEL(UART_RX, 2, 7)>;
+			low-power-enable;
+		};
+	};
 };
 
 dut: &uart21 {
@@ -24,3 +43,11 @@ dut: &uart21 {
 	pinctrl-names = "default", "sleep";
 	current-speed = <115200>;
 };
+
+dut2: &uart00 {
+	status = "okay";
+	pinctrl-0 = <&uart00_default_alt>;
+	pinctrl-1 = <&uart00_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	current-speed = <4000000>;
+};

From 3c7c521346c49521826e3829e389a1c2436e5a33 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Thu, 13 Feb 2025 12:23:38 +0100
Subject: [PATCH 2334/2913] [nrf fromtree] boards nrf54l15bsim: Do not work
 around peripheral clock issue

In 923d313a04726f6475b19ef803eb8b5a080e91d7 the clock frequency in DTS
for the UART00 was fixed, but not for the simulated target. This was
likely due to the HW models modeling it as 16MHz instead of 128MHz for
this particular one as it is in reality.

Now that the HW models have been fixed, let's let this clock be
configured like for real HW.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 5e7df92082ccb084ba13c2abf98f8512a00ad192)
---
 boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
index 13bf2e338f8..1a38b094795 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -84,10 +84,6 @@
 	};
 };
 
-&uart00 {
-	/delete-property/ clocks;
-};
-
 &uart20 {
 	status = "okay";
 	current-speed = <115200>;

From a2b33714ee8e918eddb102012e2c45f90f9c742d Mon Sep 17 00:00:00 2001
From: Piotr Krzyzanowski <piotr.krzyzanowski@nordicsemi.no>
Date: Thu, 13 Feb 2025 19:35:42 +0100
Subject: [PATCH 2335/2913] [nrf fromtree] boards: nrf_bsim: disable insted of
 deletion spi node

Disable insted of deletion of spi00 node on 54l15bsim

Signed-off-by: Piotr Krzyzanowski <piotr.krzyzanowski@nordicsemi.no>
(cherry picked from commit ae80fb10d4df487ce8323735bda4ffc0d92ad4a5)
---
 boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
index 1a38b094795..9a2d3e25c97 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -28,7 +28,6 @@
 		/delete-node/ memory@20000000;
 		/delete-node/ memory@2002f000;
 		peripheral@50000000 {
-			/delete-node/ spi@4a000;
 			/delete-node/ vpr@4c000;
 			/delete-node/ mailbox@0;
 			/delete-node/ interrupt-controller@f0000000;
@@ -84,6 +83,10 @@
 	};
 };
 
+&spi00 {
+	status = "disabled";
+};
+
 &uart20 {
 	status = "okay";
 	current-speed = <115200>;

From 5d070d48029bbba67b4a40f2f969cc05689a89ed Mon Sep 17 00:00:00 2001
From: Yago Fontoura do Rosario <yafo@demant.com>
Date: Wed, 8 Jan 2025 15:05:44 +0100
Subject: [PATCH 2336/2913] [nrf fromtree] Bluetooth: Host: Ensure conn_ready
 access is thread safe

* The `bt_dev.le.conn_ready` list is accessed by the tx_processor
which runs in a workqueue, but `bt_conn_data_ready` can be called
from different threads so we need to make sure that nothing will
trigger a context switch while we are manipulating the list since
sys_slist_*() functions are not thread safe.
* This only happens if call to `bt_conn_data_ready` is performed
from a preemptive task which can happen depending on the
application.

Signed-off-by: Yago Fontoura do Rosario <yafo@demant.com>
(cherry picked from commit 9f7736259fe3fa12aa50c6c72d9689e1af337839)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/host/conn.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 740b82d8cc3..823de605265 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -864,10 +864,18 @@ void bt_conn_data_ready(struct bt_conn *conn)
 		 *
 		 * This reference will be consumed when the conn is popped off
 		 * the list (in `get_conn_ready`).
+		 *
+		 * The `bt_dev.le.conn_ready` list is accessed by the tx_processor
+		 * which runs in a workqueue, but `bt_conn_data_ready` can be called
+		 * from different threads so we need to make sure that nothing will
+		 * trigger a thread switch while we are manipulating the list since
+		 * sys_slist_*() functions are not thread safe.
 		 */
 		bt_conn_ref(conn);
+		k_sched_lock();
 		sys_slist_append(&bt_dev.le.conn_ready,
 				 &conn->_conn_ready);
+		k_sched_unlock();
 		LOG_DBG("raised");
 	} else {
 		LOG_DBG("already in list");

From ce4b321c405d5669909ec160ed9e5e91e9899d47 Mon Sep 17 00:00:00 2001
From: Yago Fontoura do Rosario <yafo@demant.com>
Date: Mon, 13 Jan 2025 16:30:51 +0100
Subject: [PATCH 2337/2913] [nrf fromtree] tests: bluetooth: Add missing mocks
 after fix on host

* Two mocks were missing in kernel mocks

Signed-off-by: Yago Fontoura do Rosario <yafo@demant.com>
(cherry picked from commit ee326138cad076e454f6d23a5f52d0058925be6a)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 tests/bluetooth/host/conn/mocks/kernel.c | 2 ++
 tests/bluetooth/host/conn/mocks/kernel.h | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/bluetooth/host/conn/mocks/kernel.c b/tests/bluetooth/host/conn/mocks/kernel.c
index ef56b52ec88..5f12f5b246c 100644
--- a/tests/bluetooth/host/conn/mocks/kernel.c
+++ b/tests/bluetooth/host/conn/mocks/kernel.c
@@ -29,5 +29,7 @@ DEFINE_FAKE_VALUE_FUNC(void *, k_queue_get, struct k_queue *, k_timeout_t);
 DEFINE_FAKE_VOID_FUNC(k_queue_prepend, struct k_queue *, void *);
 DEFINE_FAKE_VALUE_FUNC(void *, k_heap_alloc, struct k_heap *, size_t, k_timeout_t);
 DEFINE_FAKE_VOID_FUNC(k_heap_free, struct k_heap *, void *);
+DEFINE_FAKE_VOID_FUNC(k_sched_lock);
+DEFINE_FAKE_VOID_FUNC(k_sched_unlock);
 
 struct k_work_q k_sys_work_q;
diff --git a/tests/bluetooth/host/conn/mocks/kernel.h b/tests/bluetooth/host/conn/mocks/kernel.h
index d649c527d28..ee6edca355d 100644
--- a/tests/bluetooth/host/conn/mocks/kernel.h
+++ b/tests/bluetooth/host/conn/mocks/kernel.h
@@ -29,7 +29,9 @@
 	FAKE(k_queue_get)                                                                          \
 	FAKE(k_queue_prepend)                                                                      \
 	FAKE(k_heap_alloc)                                                                         \
-	FAKE(k_heap_free)
+	FAKE(k_heap_free)                                                                          \
+	FAKE(k_sched_lock)                                                                         \
+	FAKE(k_sched_unlock)                                                                       \
 
 DECLARE_FAKE_VALUE_FUNC(bool, k_is_in_isr);
 DECLARE_FAKE_VALUE_FUNC(int, k_poll_signal_raise, struct k_poll_signal *, int);
@@ -52,3 +54,5 @@ DECLARE_FAKE_VALUE_FUNC(void *, k_queue_get, struct k_queue *, k_timeout_t);
 DECLARE_FAKE_VOID_FUNC(k_queue_prepend, struct k_queue *, void *);
 DECLARE_FAKE_VALUE_FUNC(void *, k_heap_alloc, struct k_heap *, size_t, k_timeout_t);
 DECLARE_FAKE_VOID_FUNC(k_heap_free, struct k_heap *, void *);
+DECLARE_FAKE_VOID_FUNC(k_sched_lock);
+DECLARE_FAKE_VOID_FUNC(k_sched_unlock);

From 2b02e6d644b5fe3919e9ec598f4c8cafb38d5cf9 Mon Sep 17 00:00:00 2001
From: alperen sener <alperen.sener@nordicsemi.no>
Date: Fri, 13 Dec 2024 17:18:12 +0100
Subject: [PATCH 2338/2913] [nrf fromtree] bluetooth: mesh: fix mesh pb gatt
 cli uuid usage

uuid needs to be keept in pb_gatt_cli server context until the client
is connected to server, otherwise, since we only kept the pointer from
the net_buffer, any incoming unprovisioned beacon before the connection
is established may overwrite uuid.

Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
(cherry picked from commit 37cdfe818b8bcae33d024d1c0e777b57d339913e)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/mesh/pb_gatt_cli.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/subsys/bluetooth/mesh/pb_gatt_cli.c b/subsys/bluetooth/mesh/pb_gatt_cli.c
index 07d77483caf..9138cf55f77 100644
--- a/subsys/bluetooth/mesh/pb_gatt_cli.c
+++ b/subsys/bluetooth/mesh/pb_gatt_cli.c
@@ -33,7 +33,8 @@
 LOG_MODULE_REGISTER(bt_mesh_pb_gatt_client);
 
 static struct {
-	const uint8_t *target;
+	bool target_set;
+	uint8_t target_uuid[16];
 	struct bt_mesh_proxy_role *srv;
 } server;
 
@@ -55,7 +56,7 @@ static void pb_gatt_connected(struct bt_conn *conn, void *user_data)
 	server.srv = bt_mesh_proxy_role_setup(conn, bt_mesh_gatt_send,
 					      pb_gatt_msg_recv);
 
-	server.target = NULL;
+	server.target_set = false;
 
 	bt_mesh_pb_gatt_cli_start(conn);
 }
@@ -91,8 +92,8 @@ int bt_mesh_pb_gatt_cli_setup(const uint8_t uuid[16])
 		return -EBUSY;
 	}
 
-	server.target = uuid;
-
+	memcpy(server.target_uuid, uuid, 16);
+	server.target_set = true;
 	return 0;
 }
 
@@ -112,8 +113,8 @@ void bt_mesh_pb_gatt_cli_adv_recv(const struct bt_le_scan_recv_info *info,
 
 	uuid = net_buf_simple_pull_mem(buf, 16);
 
-	if (server.target &&
-	    !memcmp(server.target, uuid, 16)) {
+	if (server.target_set &&
+	    !memcmp(server.target_uuid, uuid, 16)) {
 		(void)bt_mesh_gatt_cli_connect(info->addr, &pbgatt, NULL);
 		return;
 	}

From 4d1f5436a3cdd688b20a0dd4248e47cebfd0d073 Mon Sep 17 00:00:00 2001
From: alperen sener <alperen.sener@nordicsemi.no>
Date: Thu, 12 Dec 2024 00:19:47 +0100
Subject: [PATCH 2339/2913] [nrf fromtree] tests: bluetooth: mesh: Add PB-GATT
 provisioning test cases

Extending existing provisioning test code to use PB-GATT and adding
test cases for provisioning over PB-GATT. Test names are changed to
represent both provisioning brearers. Enabled required kconfigs for
PB-GATT and GATT proxy features in overlay_gatt.conf. Test argument
prov-bearer is added to provisioning tests to select bearer.

Following tests are renamed and extended to use PB-GATT
- pb_adv_multi
- pb_adv_no_oob
- pb_adv_oob_auth_ib_pk
- pb_adv_oob_auth_ignore_oob_pk
- pb_adv_oob_auth_oob_pk
- pb_adv_reprovision

PB-GATT test cases will run only with PSA encryption since tinycrypt
is to be deprecated.

Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
(cherry picked from commit 917683a46b3a66b7f4af9f2e5b39b49f0163b281)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 tests/bsim/bluetooth/mesh/CMakeLists.txt      |   1 +
 tests/bsim/bluetooth/mesh/overlay_gatt.conf   |   7 +-
 tests/bsim/bluetooth/mesh/src/main.c          |   3 +-
 .../bsim/bluetooth/mesh/src/test_provision.c  | 146 +++++++++++-------
 .../tests_scripts/provision/pb_adv_multi.sh   |  21 ---
 .../tests_scripts/provision/pb_adv_no_oob.sh  |  14 --
 .../provision/pb_adv_oob_auth_oob_pk.sh       |  13 --
 .../provision/pb_adv_reprovision.sh           |  14 --
 .../provision/pb_remote_parallel.sh           |  10 +-
 .../provision/pb_remote_reprovision.sh        |   6 +-
 .../provision/pb_remote_timeout.sh            |   4 +-
 .../tests_scripts/provision/prov_multi.sh     |  31 ++++
 .../tests_scripts/provision/prov_no_oob.sh    |  22 +++
 ...b_auth_ib_pk.sh => prov_oob_auth_ib_pk.sh} |  11 +-
 ...b_pk.sh => prov_oob_auth_ignore_oob_pk.sh} |  11 +-
 .../provision/prov_oob_auth_oob_pk.sh         |  20 +++
 .../provision/prov_reprovision.sh             |  22 +++
 17 files changed, 220 insertions(+), 136 deletions(-)
 delete mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_multi.sh
 delete mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_no_oob.sh
 delete mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_oob_pk.sh
 delete mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_reprovision.sh
 create mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_multi.sh
 create mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_no_oob.sh
 rename tests/bsim/bluetooth/mesh/tests_scripts/provision/{pb_adv_oob_auth_ib_pk.sh => prov_oob_auth_ib_pk.sh} (50%)
 rename tests/bsim/bluetooth/mesh/tests_scripts/provision/{pb_adv_oob_auth_ignore_oob_pk.sh => prov_oob_auth_ignore_oob_pk.sh} (50%)
 create mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_oob_pk.sh
 create mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_reprovision.sh

diff --git a/tests/bsim/bluetooth/mesh/CMakeLists.txt b/tests/bsim/bluetooth/mesh/CMakeLists.txt
index c907e8c036b..9897e5074a2 100644
--- a/tests/bsim/bluetooth/mesh/CMakeLists.txt
+++ b/tests/bsim/bluetooth/mesh/CMakeLists.txt
@@ -45,6 +45,7 @@ elseif(CONFIG_BT_MESH_GATT_PROXY)
   src/test_advertiser.c
   src/test_suspend.c
   src/test_beacon.c
+  src/test_provision.c
  )
 
 elseif(CONFIG_BT_CTLR_LOW_LAT)
diff --git a/tests/bsim/bluetooth/mesh/overlay_gatt.conf b/tests/bsim/bluetooth/mesh/overlay_gatt.conf
index a8ce71afaef..718e0eae4b4 100644
--- a/tests/bsim/bluetooth/mesh/overlay_gatt.conf
+++ b/tests/bsim/bluetooth/mesh/overlay_gatt.conf
@@ -1,7 +1,8 @@
+CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
-CONFIG_BT_MESH_GATT_PROXY=y
-CONFIG_BT_MESH_PB_GATT=y
 
-CONFIG_BT_CENTRAL=y
+CONFIG_BT_MESH_PB_GATT=y
+CONFIG_BT_MESH_PB_GATT_CLIENT=y
+CONFIG_BT_MESH_GATT_PROXY=y
 CONFIG_BT_MESH_PROXY_CLIENT=y
 CONFIG_BT_MESH_PROXY_SOLICITATION=y
diff --git a/tests/bsim/bluetooth/mesh/src/main.c b/tests/bsim/bluetooth/mesh/src/main.c
index bae3146fb21..7ce3a990d46 100644
--- a/tests/bsim/bluetooth/mesh/src/main.c
+++ b/tests/bsim/bluetooth/mesh/src/main.c
@@ -23,6 +23,7 @@ extern struct bst_test_list *test_proxy_sol_install(struct bst_test_list *test);
 extern struct bst_test_list *test_adv_install(struct bst_test_list *test);
 extern struct bst_test_list *test_suspend_install(struct bst_test_list *test);
 extern struct bst_test_list *test_beacon_install(struct bst_test_list *tests);
+extern struct bst_test_list *test_provision_install(struct bst_test_list *tests);
 #elif defined(CONFIG_BT_CTLR_LOW_LAT)
 extern struct bst_test_list *test_transport_install(struct bst_test_list *tests);
 extern struct bst_test_list *test_friendship_install(struct bst_test_list *tests);
@@ -60,7 +61,7 @@ bst_test_install_t test_installers[] = {
 	test_proxy_sol_install,
 #endif
 #elif defined(CONFIG_BT_MESH_GATT_PROXY)
-	test_adv_install, test_suspend_install, test_beacon_install,
+	test_adv_install, test_suspend_install, test_beacon_install, test_provision_install,
 #elif defined(CONFIG_BT_CTLR_LOW_LAT)
 	test_transport_install, test_friendship_install, test_suspend_install, test_adv_install,
 #else
diff --git a/tests/bsim/bluetooth/mesh/src/test_provision.c b/tests/bsim/bluetooth/mesh/src/test_provision.c
index f4057ebc7b7..126b63f6b81 100644
--- a/tests/bsim/bluetooth/mesh/src/test_provision.c
+++ b/tests/bsim/bluetooth/mesh/src/test_provision.c
@@ -95,6 +95,24 @@ static uint8_t *uuid_to_provision;
 static struct k_sem reprov_sem;
 static uint32_t link_close_timestamp;
 
+/* Set prov_bearer to non-zero invalid value. */
+static bt_mesh_prov_bearer_t prov_bearer = 0xF8;
+
+static void test_args_parse(int argc, char *argv[])
+{
+	bs_args_struct_t args_struct[] = {
+		{
+			.dest = &prov_bearer,
+			.type = 'i',
+			.name = "{invalid, PB-ADV, PB-GATT}",
+			.option = "prov-brearer",
+			.descript = "Provisioning bearer that is to be used."
+		},
+	};
+
+	bs_args_parse_all_cmd_line(argc, argv, args_struct);
+}
+
 #if IS_RPR_PRESENT
 static struct k_sem pdu_send_sem;
 static struct k_sem scan_sem;
@@ -268,10 +286,22 @@ static void unprovisioned_beacon(uint8_t uuid[16],
 	if (uuid_to_provision && memcmp(uuid, uuid_to_provision, 16)) {
 		return;
 	}
-
 	bt_mesh_provision_adv(uuid, 0, prov_addr, 0);
 }
 
+static void unprovisioned_beacon_gatt(uint8_t uuid[16], bt_mesh_prov_oob_info_t oob_info)
+{
+	if (!atomic_test_bit(test_flags, IS_PROVISIONER)) {
+		return;
+	}
+
+	if (uuid_to_provision && memcmp(uuid, uuid_to_provision, 16)) {
+		return;
+	}
+
+	bt_mesh_provision_gatt(uuid, 0, prov_addr, 0);
+}
+
 static void prov_complete(uint16_t net_idx, uint16_t addr)
 {
 	if (!atomic_test_bit(test_flags, IS_PROVISIONER)) {
@@ -305,7 +335,7 @@ static void prov_reprovisioned(uint16_t addr)
 
 static void prov_reset(void)
 {
-	ASSERT_OK(bt_mesh_prov_enable(BT_MESH_PROV_ADV));
+	ASSERT_OK(bt_mesh_prov_enable(prov_bearer));
 }
 
 static bt_mesh_input_action_t gact;
@@ -363,6 +393,7 @@ static void capabilities(const struct bt_mesh_dev_capabilities *cap);
 static struct bt_mesh_prov prov = {
 	.uuid = dev_uuid,
 	.unprovisioned_beacon = unprovisioned_beacon,
+	.unprovisioned_beacon_gatt = unprovisioned_beacon_gatt,
 	.complete = prov_complete,
 	.link_open = prov_link_open,
 	.link_close = prov_link_close,
@@ -483,7 +514,7 @@ static void oob_device(bool use_oob_pk)
 	for (int i = 0; i < ARRAY_SIZE(oob_auth_test_vector); i++) {
 		oob_auth_set(i);
 
-		ASSERT_OK(bt_mesh_prov_enable(BT_MESH_PROV_ADV));
+		ASSERT_OK(bt_mesh_prov_enable(prov_bearer));
 
 		/* Keep a long timeout so the prov multi case has time to finish: */
 		ASSERT_OK(k_sem_take(&prov_sem, K_SECONDS(40)));
@@ -606,13 +637,12 @@ static void node_configure_and_reset(void)
 
 /** @brief Verify that this device pb-adv provision.
  */
-static void test_device_pb_adv_no_oob(void)
+static void test_device_no_oob(void)
 {
 	k_sem_init(&prov_sem, 0, 1);
 
 	bt_mesh_device_setup(&prov, &comp);
-
-	ASSERT_OK(bt_mesh_prov_enable(BT_MESH_PROV_ADV));
+	ASSERT_OK(bt_mesh_prov_enable(prov_bearer));
 
 	LOG_INF("Mesh initialized\n");
 
@@ -624,13 +654,13 @@ static void test_device_pb_adv_no_oob(void)
 
 /** @brief Verify that this device can be reprovisioned after resets
  */
-static void test_device_pb_adv_reprovision(void)
+static void test_device_reprovision(void)
 {
 	k_sem_init(&prov_sem, 0, 1);
 
 	bt_mesh_device_setup(&prov, &comp);
 
-	ASSERT_OK(bt_mesh_prov_enable(BT_MESH_PROV_ADV));
+	ASSERT_OK(bt_mesh_prov_enable(prov_bearer));
 
 	LOG_INF("Mesh initialized\n");
 
@@ -645,7 +675,7 @@ static void test_device_pb_adv_reprovision(void)
 
 /** @brief Verify that this provisioner pb-adv provision.
  */
-static void test_provisioner_pb_adv_no_oob(void)
+static void test_provisioner_no_oob(void)
 {
 	k_sem_init(&prov_sem, 0, 1);
 
@@ -660,14 +690,14 @@ static void test_provisioner_pb_adv_no_oob(void)
 	PASS();
 }
 
-static void test_device_pb_adv_oob_auth(void)
+static void test_device_oob_auth(void)
 {
 	oob_device(false);
 
 	PASS();
 }
 
-static void test_provisioner_pb_adv_oob_auth(void)
+static void test_provisioner_oob_auth(void)
 {
 	oob_provisioner(false, false);
 
@@ -683,21 +713,21 @@ static void test_back_channel_pre_init(void)
 	}
 }
 
-static void test_device_pb_adv_oob_public_key(void)
+static void test_device_oob_public_key(void)
 {
 	oob_device(true);
 
 	PASS();
 }
 
-static void test_provisioner_pb_adv_oob_public_key(void)
+static void test_provisioner_oob_public_key(void)
 {
 	oob_provisioner(true, true);
 
 	PASS();
 }
 
-static void test_provisioner_pb_adv_oob_auth_no_oob_public_key(void)
+static void test_provisioner_oob_auth_no_oob_public_key(void)
 {
 	oob_provisioner(true, false);
 
@@ -706,7 +736,7 @@ static void test_provisioner_pb_adv_oob_auth_no_oob_public_key(void)
 
 /** @brief Verify that the provisioner can provision multiple devices in a row
  */
-static void test_provisioner_pb_adv_multi(void)
+static void test_provisioner_multi(void)
 {
 	k_sem_init(&prov_sem, 0, 1);
 
@@ -767,7 +797,7 @@ static void test_provisioner_iv_update_flag_one(void)
 
 /** @brief Verify that the provisioner can provision a device multiple times after resets
  */
-static void test_provisioner_pb_adv_reprovision(void)
+static void test_provisioner_reprovision(void)
 {
 	k_sem_init(&prov_sem, 0, 1);
 
@@ -798,7 +828,7 @@ static void test_device_unresponsive(void)
 
 	k_sem_init(&prov_sem, 0, 1);
 
-	ASSERT_OK(bt_mesh_prov_enable(BT_MESH_PROV_ADV));
+	ASSERT_OK(bt_mesh_prov_enable(prov_bearer));
 
 	/* stop responding for 30s to timeout PB-ADV link establishment. */
 	bt_mesh_scan_disable();
@@ -1739,35 +1769,35 @@ static void test_device_pb_remote_server_ncrp_second_time(void)
 }
 #endif /* IS_RPR_PRESENT */
 
-#define TEST_CASE(role, name, description)                                     \
-	{                                                                      \
-		.test_id = "prov_" #role "_" #name, .test_descr = description, \
-		.test_post_init_f = test_##role##_init,                        \
-		.test_tick_f = bt_mesh_test_timeout,                           \
-		.test_main_f = test_##role##_##name,                           \
-		.test_delete_f = test_terminate                                \
-	}
-#define TEST_CASE_WBACKCHANNEL(role, name, description)                                     \
-	{                                                                      \
-		.test_id = "prov_" #role "_" #name, .test_descr = description, \
-		.test_post_init_f = test_##role##_init,                        \
-		.test_pre_init_f = test_back_channel_pre_init,                 \
-		.test_tick_f = bt_mesh_test_timeout,                           \
-		.test_main_f = test_##role##_##name,                           \
-		.test_delete_f = test_terminate                                \
-	}
+/* Test cases by default will run over PB_ADV*/
+#define TEST_CASE(role, name, description)                                                         \
+	{.test_id = "prov_" #role "_" #name,                                                       \
+	 .test_descr = description,                                                                \
+	 .test_args_f = test_args_parse,							   \
+	 .test_post_init_f = test_##role##_init,                                                   \
+	 .test_tick_f = bt_mesh_test_timeout,                                                      \
+	 .test_main_f = test_##role##_##name,                                                      \
+	 .test_delete_f = test_terminate}
+/* Test cases that will run over either PB_ADV or PB_GATT */
+#define TEST_CASE_WBACKCHANNEL(role, name, description)                                    \
+	{.test_id = "prov_" #role "_" #name,                                           \
+	 .test_descr = description,                                                                \
+	 .test_args_f = test_args_parse,							   \
+	 .test_post_init_f = test_##role##_init,                                                   \
+	 .test_pre_init_f = test_back_channel_pre_init,                                            \
+	 .test_tick_f = bt_mesh_test_timeout,                                                      \
+	 .test_main_f = test_##role##_##name,                                                      \
+	 .test_delete_f = test_terminate}
 
 static const struct bst_test_instance test_connect[] = {
-	TEST_CASE(device, pb_adv_no_oob,
-		  "Device: pb-adv provisioning use no-oob method"),
-	TEST_CASE_WBACKCHANNEL(device, pb_adv_oob_auth,
-		  "Device: pb-adv provisioning use oob authentication"),
-	TEST_CASE_WBACKCHANNEL(device, pb_adv_oob_public_key,
-		  "Device: pb-adv provisioning use oob public key"),
-	TEST_CASE(device, pb_adv_reprovision,
-		  "Device: pb-adv provisioning, reprovision"),
 	TEST_CASE(device, unresponsive,
-		  "Device: pb-adv provisioning, stops and resumes responding to provisioning"),
+		  "Device: provisioning, stops and resumes responding to provisioning"),
+	TEST_CASE(device, no_oob, "Device: provisioning use no-oob method"),
+	TEST_CASE_WBACKCHANNEL(device, oob_auth,
+			       "Device: provisioning use oob authentication"),
+	TEST_CASE_WBACKCHANNEL(device, oob_public_key,
+			       "Device: provisioning use oob public key"),
+	TEST_CASE(device, reprovision, "Device: provisioning, reprovision"),
 #if IS_RPR_PRESENT
 	TEST_CASE(device, pb_remote_server_unproved,
 		  "Device: used for remote provisioning, starts unprovisioned"),
@@ -1780,23 +1810,24 @@ static const struct bst_test_instance test_connect[] = {
 	TEST_CASE(device, pb_remote_server_same_dev,
 		  "Device: used for remote reprovisioning, with both client and server"),
 #endif
-
-	TEST_CASE(provisioner, pb_adv_no_oob,
-		  "Provisioner: pb-adv provisioning use no-oob method"),
-	TEST_CASE(provisioner, pb_adv_multi,
-		  "Provisioner: pb-adv provisioning multiple devices"),
 	TEST_CASE(provisioner, iv_update_flag_zero,
 		  "Provisioner: effect on ivu_duration when IV Update flag is set to zero"),
 	TEST_CASE(provisioner, iv_update_flag_one,
 		  "Provisioner: effect on ivu_duration when IV Update flag is set to one"),
-	TEST_CASE_WBACKCHANNEL(provisioner, pb_adv_oob_auth,
-		  "Provisioner: pb-adv provisioning use oob authentication"),
-	TEST_CASE_WBACKCHANNEL(provisioner, pb_adv_oob_public_key,
-		  "Provisioner: pb-adv provisioning use oob public key"),
-	TEST_CASE_WBACKCHANNEL(provisioner, pb_adv_oob_auth_no_oob_public_key,
-		"Provisioner: pb-adv provisioning use oob authentication, ignore oob public key"),
-	TEST_CASE(provisioner, pb_adv_reprovision,
-		  "Provisioner: pb-adv provisioning, resetting and reprovisioning multiple times."),
+	TEST_CASE(provisioner, no_oob,
+			 "Provisioner: provisioning use no-oob method"),
+	TEST_CASE(provisioner, multi,
+			 "Provisioner: provisioning multiple devices"),
+	TEST_CASE_WBACKCHANNEL(provisioner, oob_auth,
+			       "Provisioner: provisioning use oob authentication"),
+	TEST_CASE_WBACKCHANNEL(provisioner, oob_public_key,
+			       "Provisioner: provisioning use oob public key"),
+	TEST_CASE_WBACKCHANNEL(
+		provisioner, oob_auth_no_oob_public_key,
+		"Provisioner: provisioning use oob authentication, ignore oob public key"),
+	TEST_CASE(
+		provisioner, reprovision,
+		"Provisioner: provisioning, resetting and reprovisioning multiple times."),
 #if IS_RPR_PRESENT
 	TEST_CASE(provisioner, pb_remote_client_reprovision,
 		  "Provisioner: pb-remote provisioning, resetting and reprov-ing multiple times."),
@@ -1808,8 +1839,7 @@ static const struct bst_test_instance test_connect[] = {
 		  "Provisioner: provisioning test, devices stop responding"),
 #endif
 
-	BSTEST_END_MARKER
-};
+	BSTEST_END_MARKER};
 
 struct bst_test_list *test_provision_install(struct bst_test_list *tests)
 {
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_multi.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_multi.sh
deleted file mode 100755
index 61bbbcc1a27..00000000000
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_multi.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2021 Nordic Semiconductor
-# SPDX-License-Identifier: Apache-2.0
-
-source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
-
-# Provision 3 devices in succession:
-# Note that the number of devices must match the
-# PROV_MULTI_COUNT define in test_provision.c
-RunTest mesh_prov_pb_adv_multi \
-	prov_provisioner_pb_adv_multi \
-	prov_device_pb_adv_no_oob \
-	prov_device_pb_adv_no_oob \
-	prov_device_pb_adv_no_oob
-
-overlay=overlay_psa_conf
-RunTest mesh_prov_pb_adv_multi_psa \
-	prov_provisioner_pb_adv_multi \
-	prov_device_pb_adv_no_oob \
-	prov_device_pb_adv_no_oob \
-	prov_device_pb_adv_no_oob
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_no_oob.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_no_oob.sh
deleted file mode 100755
index 91bde356f2b..00000000000
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_no_oob.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2021 Lingao Meng
-# SPDX-License-Identifier: Apache-2.0
-
-source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
-
-RunTest mesh_prov_pb_adv_on_oob \
-	prov_device_pb_adv_no_oob \
-	prov_provisioner_pb_adv_no_oob
-
-overlay=overlay_psa_conf
-RunTest mesh_prov_pb_adv_on_oob_psa \
-	prov_device_pb_adv_no_oob \
-	prov_provisioner_pb_adv_no_oob
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_oob_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_oob_pk.sh
deleted file mode 100755
index d24e5afccd4..00000000000
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_oob_pk.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2021 Nordic Semiconductor
-# SPDX-License-Identifier: Apache-2.0
-
-source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
-
-# Test provisioning with OOB authentication and with OOB public key
-RunTest mesh_prov_pb_adv_oob_public_key \
-	prov_device_pb_adv_oob_public_key prov_provisioner_pb_adv_oob_public_key
-
-overlay=overlay_psa_conf
-RunTest mesh_prov_pb_adv_oob_public_key_psa \
-	prov_device_pb_adv_oob_public_key prov_provisioner_pb_adv_oob_public_key
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_reprovision.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_reprovision.sh
deleted file mode 100755
index 0e3b84e3138..00000000000
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_reprovision.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2021 Nordic Semiconductor
-# SPDX-License-Identifier: Apache-2.0
-
-source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
-
-RunTest mesh_prov_pb_adv_repr \
-	prov_device_pb_adv_reprovision \
-	prov_provisioner_pb_adv_reprovision
-
-overlay=overlay_psa_conf
-RunTest mesh_prov_pb_adv_repr_psa \
-	prov_device_pb_adv_reprovision \
-	prov_provisioner_pb_adv_reprovision
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh
index 6ecb3292193..815df506d5f 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh
@@ -14,12 +14,14 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 RunTest mesh_prov_pb_remote_parallel \
 	prov_provisioner_pb_remote_client_parallel \
 	prov_device_pb_remote_server_unproved \
-	prov_device_pb_adv_no_oob \
-	prov_device_pb_adv_no_oob
+	prov_device_no_oob \
+	prov_device_no_oob \
+	-- -argstest prov-brearer=1
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_remote_parallel_psa \
 	prov_provisioner_pb_remote_client_parallel \
 	prov_device_pb_remote_server_unproved \
-	prov_device_pb_adv_no_oob \
-	prov_device_pb_adv_no_oob
+	prov_device_no_oob \
+	prov_device_no_oob \
+	-- -argstest prov-brearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh
index 1a2ae89d655..1e5da310bd3 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh
@@ -15,10 +15,12 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 RunTest mesh_prov_pb_remote_reprovision \
 	prov_provisioner_pb_remote_client_reprovision \
 	prov_device_pb_remote_server_unproved \
-	prov_device_pb_adv_reprovision
+	prov_device_reprovision \
+	-- -argstest prov-brearer=1
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_remote_reprovision_psa \
 	prov_provisioner_pb_remote_client_reprovision \
 	prov_device_pb_remote_server_unproved \
-	prov_device_pb_adv_reprovision
+	prov_device_reprovision \
+	-- -argstest prov-brearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh
index 7feba542c44..b332b1987ad 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh
@@ -27,10 +27,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 RunTest mesh_prov_pb_remote_provisioning_timeout \
 	prov_provisioner_pb_remote_client_provision_timeout \
 	prov_device_pb_remote_server_unproved_unresponsive \
-	prov_device_unresponsive
+	prov_device_unresponsive -- -argstest prov-brearer=1
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_remote_provisioning_timeout_psa \
 	prov_provisioner_pb_remote_client_provision_timeout \
 	prov_device_pb_remote_server_unproved_unresponsive \
-	prov_device_unresponsive
+	prov_device_unresponsive -- -argstest prov-brearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_multi.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_multi.sh
new file mode 100755
index 00000000000..bed577add24
--- /dev/null
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_multi.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+# Copyright 2021 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
+
+# Provision 3 devices in succession:
+# Note that the number of devices must match the
+# PROV_MULTI_COUNT define in test_provision.c
+RunTest mesh_prov_pb_adv_multi \
+	prov_provisioner_multi \
+	prov_device_no_oob \
+	prov_device_no_oob \
+	prov_device_no_oob \
+	-- -argstest prov-brearer=1
+
+overlay=overlay_gatt_conf_overlay_psa_conf
+RunTest mesh_prov_pb_gatt_multi \
+	prov_provisioner_multi \
+	prov_device_no_oob \
+	prov_device_no_oob \
+	prov_device_no_oob \
+	-- -argstest prov-brearer=2
+
+overlay=overlay_psa_conf
+RunTest mesh_prov_pb_adv_multi_psa \
+	prov_provisioner_multi \
+	prov_device_no_oob \
+	prov_device_no_oob \
+	prov_device_no_oob \
+	-- -argstest prov-brearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_no_oob.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_no_oob.sh
new file mode 100755
index 00000000000..4f633b91c2c
--- /dev/null
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_no_oob.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# Copyright 2021 Lingao Meng
+# SPDX-License-Identifier: Apache-2.0
+
+source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
+
+RunTest mesh_prov_pb_adv_on_oob \
+	prov_device_no_oob \
+	prov_provisioner_no_oob \
+	-- -argstest prov-brearer=1
+
+overlay=overlay_gatt_conf_overlay_psa_conf
+RunTest mesh_prov_pb_gatt_on_oob \
+	prov_device_no_oob \
+	prov_provisioner_no_oob \
+	-- -argstest prov-brearer=2
+
+overlay=overlay_psa_conf
+RunTest mesh_prov_pb_adv_on_oob_psa \
+	prov_device_no_oob \
+	prov_provisioner_no_oob \
+	-- -argstest prov-brearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ib_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ib_pk.sh
similarity index 50%
rename from tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ib_pk.sh
rename to tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ib_pk.sh
index ef8e07f7c80..e53c6b5f254 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ib_pk.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ib_pk.sh
@@ -6,8 +6,15 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 
 # Test provisioning with OOB authentication and with inband public key
 RunTest mesh_prov_pb_adv_oob_auth \
-	prov_device_pb_adv_oob_auth prov_provisioner_pb_adv_oob_auth
+	prov_device_oob_auth prov_provisioner_oob_auth \
+	-- -argstest prov-brearer=1
+
+overlay=overlay_gatt_conf_overlay_psa_conf
+RunTest mesh_prov_pb_gatt_oob_auth \
+	prov_device_oob_auth prov_provisioner_oob_auth \
+	-- -argstest prov-brearer=2
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_adv_oob_auth_psa \
-	prov_device_pb_adv_oob_auth prov_provisioner_pb_adv_oob_auth
+	prov_device_oob_auth prov_provisioner_oob_auth \
+	-- -argstest prov-brearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ignore_oob_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ignore_oob_pk.sh
similarity index 50%
rename from tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ignore_oob_pk.sh
rename to tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ignore_oob_pk.sh
index 8df3c6a4bf6..7ac6b5f4d75 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ignore_oob_pk.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ignore_oob_pk.sh
@@ -7,8 +7,15 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # Test provisioning with OOB authentication, with device OOB public key
 # but provisioner doesn't have OOB public key
 RunTest mesh_prov_pb_adv_device_w_oob_pk_prvnr_wt_pk \
-	prov_device_pb_adv_oob_public_key prov_provisioner_pb_adv_oob_auth_no_oob_public_key
+	prov_device_oob_public_key prov_provisioner_oob_auth_no_oob_public_key \
+	-- -argstest prov-brearer=1
+
+overlay=overlay_gatt_conf_overlay_psa_conf
+RunTest mesh_prov_pb_gatt_device_w_oob_pk_prvnr_wt_pk \
+	prov_device_oob_public_key prov_provisioner_oob_auth_no_oob_public_key \
+	-- -argstest prov-brearer=2
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_adv_device_w_oob_pk_prvnr_wt_pk_psa \
-	prov_device_pb_adv_oob_public_key prov_provisioner_pb_adv_oob_auth_no_oob_public_key
+	prov_device_oob_public_key prov_provisioner_oob_auth_no_oob_public_key \
+	-- -argstest prov-brearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_oob_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_oob_pk.sh
new file mode 100755
index 00000000000..90375f81a50
--- /dev/null
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_oob_pk.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# Copyright 2021 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
+
+# Test provisioning with OOB authentication and with OOB public key
+RunTest mesh_prov_pb_adv_oob_public_key \
+	prov_device_oob_public_key prov_provisioner_oob_public_key \
+	-- -argstest prov-brearer=1
+
+overlay=overlay_gatt_conf_overlay_psa_conf
+RunTest mesh_prov_pb_gatt_oob_public_key \
+	prov_device_oob_public_key prov_provisioner_oob_public_key \
+	-- -argstest prov-brearer=2
+
+overlay=overlay_psa_conf
+RunTest mesh_prov_pb_adv_oob_public_key_psa \
+	prov_device_oob_public_key prov_provisioner_oob_public_key \
+	-- -argstest prov-brearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_reprovision.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_reprovision.sh
new file mode 100755
index 00000000000..0143ef20c45
--- /dev/null
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_reprovision.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# Copyright 2021 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
+
+RunTest mesh_prov_pb_adv_repr \
+	prov_device_reprovision \
+	prov_provisioner_reprovision \
+	-- -argstest prov-brearer=1
+
+overlay=overlay_gatt_conf_overlay_psa_conf
+RunTest mesh_prov_pb_gatt_repr \
+	prov_device_reprovision \
+	prov_provisioner_reprovision \
+	-- -argstest prov-brearer=2
+
+overlay=overlay_psa_conf
+RunTest mesh_prov_pb_adv_repr_psa \
+	prov_device_reprovision \
+	prov_provisioner_reprovision \
+	-- -argstest prov-brearer=1

From 4305296199dde52fd7d9718b27c0d6fa04e5e586 Mon Sep 17 00:00:00 2001
From: Kyra Lengfeld <kyra.lengfeld@nordicsemi.no>
Date: Tue, 17 Dec 2024 18:19:32 +0100
Subject: [PATCH 2340/2913] [nrf fromtree] Bluetooth: Mesh: use settings
 priority feature

By using `SETTINGS_STATIC_HANDLER_DEFINE_WITH_CPRIO` we can ensure that
BT subsystems always get loaded after BT, and BT Mesh after both of
them.

This solves the host having to register a GATT service in a delayed
manner, as we are sure to now register the GATT service after sc_commit
sets `SC_LOAD`.

Signed-off-by: Kyra Lengfeld <kyra.lengfeld@nordicsemi.no>
(cherry picked from commit 64d87136838a70d847642979b26090fa83e451f9)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/common/bt_settings_commit.h | 19 ++++++++
 subsys/bluetooth/host/settings.c             |  4 +-
 subsys/bluetooth/host/settings.h             |  5 ++-
 subsys/bluetooth/mesh/proxy_srv.c            | 46 +++++---------------
 subsys/bluetooth/mesh/settings.c             |  5 ++-
 tests/bsim/bluetooth/mesh/overlay_gatt.conf  |  2 +
 6 files changed, 42 insertions(+), 39 deletions(-)
 create mode 100644 subsys/bluetooth/common/bt_settings_commit.h

diff --git a/subsys/bluetooth/common/bt_settings_commit.h b/subsys/bluetooth/common/bt_settings_commit.h
new file mode 100644
index 00000000000..921e62af50c
--- /dev/null
+++ b/subsys/bluetooth/common/bt_settings_commit.h
@@ -0,0 +1,19 @@
+/* Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef BT_SETTINGS_COMMIT_H_
+#define BT_SETTINGS_COMMIT_H_
+
+/**
+ * @brief Bluetooth Settings Commit Priorities
+ *
+ * Enum of commit priorities for Bluetooth settings handlers.
+ * Lower values indicate higher priority.
+ */
+enum bt_settings_commit_priority {
+	BT_SETTINGS_CPRIO_0,
+	BT_SETTINGS_CPRIO_1,
+	BT_SETTINGS_CPRIO_2,
+};
+
+#endif /* BT_SETTINGS_COMMIT_H_ */
diff --git a/subsys/bluetooth/host/settings.c b/subsys/bluetooth/host/settings.c
index 4cc2b56f6a0..1718bc653d4 100644
--- a/subsys/bluetooth/host/settings.c
+++ b/subsys/bluetooth/host/settings.c
@@ -8,6 +8,7 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/settings/settings.h>
+#include <common/bt_settings_commit.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
@@ -281,7 +282,8 @@ static int commit_settings(void)
 	return 0;
 }
 
-SETTINGS_STATIC_HANDLER_DEFINE(bt, "bt", NULL, set_setting, commit_settings, NULL);
+SETTINGS_STATIC_HANDLER_DEFINE_WITH_CPRIO(bt, "bt", NULL, set_setting, commit_settings, NULL,
+					  BT_SETTINGS_CPRIO_0);
 
 int bt_settings_init(void)
 {
diff --git a/subsys/bluetooth/host/settings.h b/subsys/bluetooth/host/settings.h
index 1aa3ab0a87f..cf5618b378d 100644
--- a/subsys/bluetooth/host/settings.h
+++ b/subsys/bluetooth/host/settings.h
@@ -10,6 +10,7 @@
 #include <zephyr/bluetooth/addr.h>
 
 #include <zephyr/settings/settings.h>
+#include <common/bt_settings_commit.h>
 
 /* Max settings key length (with all components) */
 #define BT_SETTINGS_KEY_MAX 36
@@ -18,7 +19,9 @@
 #define BT_SETTINGS_SIZE(in_size) ((((((in_size) - 1) / 3) * 4) + 4) + 1)
 
 #define BT_SETTINGS_DEFINE(_hname, _subtree, _set, _commit)                                        \
-	SETTINGS_STATIC_HANDLER_DEFINE(bt_##_hname, "bt/" _subtree, NULL, _set, _commit, NULL)
+	SETTINGS_STATIC_HANDLER_DEFINE_WITH_CPRIO(bt_##_hname, "bt/" _subtree, NULL, _set, _commit,\
+						  NULL, BT_SETTINGS_CPRIO_1)
+
 
 #define ID_DATA_LEN(array) (bt_dev.id_count * sizeof(array[0]))
 
diff --git a/subsys/bluetooth/mesh/proxy_srv.c b/subsys/bluetooth/mesh/proxy_srv.c
index aab4afe47df..8863a5ce52f 100644
--- a/subsys/bluetooth/mesh/proxy_srv.c
+++ b/subsys/bluetooth/mesh/proxy_srv.c
@@ -36,9 +36,6 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_mesh_gatt);
 
-#define PROXY_SVC_INIT_TIMEOUT K_MSEC(10)
-#define PROXY_SVC_REG_ATTEMPTS 5
-
 /* Interval to update random value in (10 minutes).
  *
  * Defined in the Bluetooth Mesh Specification v1.1, Section 7.2.2.2.4.
@@ -957,34 +954,6 @@ static struct bt_gatt_attr proxy_attrs[] = {
 };
 
 static struct bt_gatt_service proxy_svc = BT_GATT_SERVICE(proxy_attrs);
-static void svc_reg_work_handler(struct k_work *work);
-static struct k_work_delayable svc_reg_work = Z_WORK_DELAYABLE_INITIALIZER(svc_reg_work_handler);
-static uint32_t svc_reg_attempts;
-
-static void svc_reg_work_handler(struct k_work *work)
-{
-	int err;
-
-	err = bt_gatt_service_register(&proxy_svc);
-	if ((err == -EINVAL) && ((--svc_reg_attempts) > 0)) {
-		/* settings_load() didn't finish yet. Try again. */
-		(void)k_work_schedule(&svc_reg_work, PROXY_SVC_INIT_TIMEOUT);
-		return;
-	} else if (err) {
-		LOG_ERR("Unable to register Mesh Proxy Service (err %d)", err);
-		return;
-	}
-
-	service_registered = true;
-
-	for (int i = 0; i < ARRAY_SIZE(clients); i++) {
-		if (clients[i].cli) {
-			clients[i].filter_type = ACCEPT;
-		}
-	}
-
-	bt_mesh_adv_gatt_update();
-}
 
 int bt_mesh_proxy_gatt_enable(void)
 {
@@ -1000,13 +969,20 @@ int bt_mesh_proxy_gatt_enable(void)
 		return -EBUSY;
 	}
 
-	svc_reg_attempts = PROXY_SVC_REG_ATTEMPTS;
-	err = k_work_schedule(&svc_reg_work, PROXY_SVC_INIT_TIMEOUT);
-	if (err < 0) {
-		LOG_ERR("Enabling GATT proxy failed (err %d)", err);
+	err = bt_gatt_service_register(&proxy_svc);
+	if (err) {
+		LOG_ERR("Unable to register Mesh Proxy Service (err %d)", err);
 		return err;
 	}
 
+	service_registered = true;
+
+	for (int i = 0; i < ARRAY_SIZE(clients); i++) {
+		if (clients[i].cli) {
+			clients[i].filter_type = ACCEPT;
+		}
+	}
+
 	return 0;
 }
 
diff --git a/subsys/bluetooth/mesh/settings.c b/subsys/bluetooth/mesh/settings.c
index 6bd651c7493..f02672e6d66 100644
--- a/subsys/bluetooth/mesh/settings.c
+++ b/subsys/bluetooth/mesh/settings.c
@@ -12,6 +12,7 @@
 #include <zephyr/bluetooth/hci.h>
 
 #include <zephyr/settings/settings.h>
+#include <common/bt_settings_commit.h>
 #include <zephyr/bluetooth/mesh.h>
 
 #include "host/hci_core.h"
@@ -117,8 +118,8 @@ static int mesh_commit(void)
 	return 0;
 }
 
-SETTINGS_STATIC_HANDLER_DEFINE(bt_mesh, "bt/mesh", NULL, NULL, mesh_commit,
-			       NULL);
+SETTINGS_STATIC_HANDLER_DEFINE_WITH_CPRIO(bt_mesh, "bt/mesh", NULL, NULL, mesh_commit, NULL,
+					  BT_SETTINGS_CPRIO_2);
 
 /* Pending flags that use K_NO_WAIT as the storage timeout */
 #define NO_WAIT_PENDING_BITS (BIT(BT_MESH_SETTINGS_NET_PENDING) |           \
diff --git a/tests/bsim/bluetooth/mesh/overlay_gatt.conf b/tests/bsim/bluetooth/mesh/overlay_gatt.conf
index 718e0eae4b4..0438205696e 100644
--- a/tests/bsim/bluetooth/mesh/overlay_gatt.conf
+++ b/tests/bsim/bluetooth/mesh/overlay_gatt.conf
@@ -6,3 +6,5 @@ CONFIG_BT_MESH_PB_GATT_CLIENT=y
 CONFIG_BT_MESH_GATT_PROXY=y
 CONFIG_BT_MESH_PROXY_CLIENT=y
 CONFIG_BT_MESH_PROXY_SOLICITATION=y
+
+CONFIG_BT_BUF_CMD_TX_COUNT=3

From 9c4671fc92a062b87fa25cae8161b2245cc1e0e5 Mon Sep 17 00:00:00 2001
From: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
Date: Thu, 28 Nov 2024 15:30:11 +0100
Subject: [PATCH 2341/2913] [nrf fromtree] Bluetooth: Mesh: use secure storage
 in ble mesh

Commit:
 - adds dependency of the mbedtls psa usage on secure storage
 - removes PSA ITS emulator and enables usage of
   the secure storage in ble mesh bsim tests
 - enables secure storage in all ble mesh and related samples

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
(cherry picked from commit 967b096ad98a3c6f3d7b0a7aabf4dcb3ebf5d35f)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 modules/mbedtls/configs/config-tls-generic.h  |   6 -
 .../boards/nrf5340dk_nrf5340_cpuapp_ns.conf   |   1 +
 samples/bluetooth/mesh/prj.conf               |   1 +
 .../boards/nrf5340dk_nrf5340_cpuapp_ns.conf   |   1 +
 samples/bluetooth/mesh_demo/prj.conf          |   1 +
 .../boards/nrf5340dk_nrf5340_cpuapp_ns.conf   |   1 +
 samples/bluetooth/mesh_provisioner/prj.conf   |   1 +
 samples/boards/nordic/mesh/onoff-app/prj.conf |   2 +
 .../onoff_level_lighting_vnd_app/prj.conf     |   1 +
 .../phytec/reel_board/mesh_badge/prj.conf     |   1 +
 subsys/bluetooth/mesh/Kconfig                 |   5 +
 tests/bluetooth/mesh_shell/prj.conf           |   1 +
 tests/bsim/bluetooth/mesh/CMakeLists.txt      |  13 --
 tests/bsim/bluetooth/mesh/overlay_pst.conf    |   1 +
 tests/bsim/bluetooth/mesh/src/psa_its_emul.c  | 209 ------------------
 15 files changed, 17 insertions(+), 228 deletions(-)
 create mode 100644 samples/bluetooth/mesh/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
 create mode 100644 samples/bluetooth/mesh_demo/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
 create mode 100644 samples/bluetooth/mesh_provisioner/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
 delete mode 100644 tests/bsim/bluetooth/mesh/src/psa_its_emul.c

diff --git a/modules/mbedtls/configs/config-tls-generic.h b/modules/mbedtls/configs/config-tls-generic.h
index f3b0e96afcb..eb3f943a458 100644
--- a/modules/mbedtls/configs/config-tls-generic.h
+++ b/modules/mbedtls/configs/config-tls-generic.h
@@ -482,12 +482,6 @@
 #define MBEDTLS_PSA_P256M_DRIVER_ENABLED
 #endif
 
-#if defined(CONFIG_ARCH_POSIX) && !defined(CONFIG_PICOLIBC) && !defined(CONFIG_SECURE_STORAGE)
-#define MBEDTLS_PSA_ITS_FILE_C
-#define MBEDTLS_PSA_CRYPTO_STORAGE_C
-#define MBEDTLS_FS_IO
-#endif
-
 #if defined(CONFIG_SECURE_STORAGE)
 #define MBEDTLS_PSA_CRYPTO_STORAGE_C
 #endif
diff --git a/samples/bluetooth/mesh/boards/nrf5340dk_nrf5340_cpuapp_ns.conf b/samples/bluetooth/mesh/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
new file mode 100644
index 00000000000..2c00cdba081
--- /dev/null
+++ b/samples/bluetooth/mesh/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
@@ -0,0 +1 @@
+CONFIG_SECURE_STORAGE=n
diff --git a/samples/bluetooth/mesh/prj.conf b/samples/bluetooth/mesh/prj.conf
index 9c8daad9131..14b19316a86 100644
--- a/samples/bluetooth/mesh/prj.conf
+++ b/samples/bluetooth/mesh/prj.conf
@@ -5,6 +5,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
+CONFIG_SECURE_STORAGE=y
 CONFIG_HWINFO=y
 
 CONFIG_BT=y
diff --git a/samples/bluetooth/mesh_demo/boards/nrf5340dk_nrf5340_cpuapp_ns.conf b/samples/bluetooth/mesh_demo/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
new file mode 100644
index 00000000000..2c00cdba081
--- /dev/null
+++ b/samples/bluetooth/mesh_demo/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
@@ -0,0 +1 @@
+CONFIG_SECURE_STORAGE=n
diff --git a/samples/bluetooth/mesh_demo/prj.conf b/samples/bluetooth/mesh_demo/prj.conf
index c8c52aaffce..bcb738ae5bd 100644
--- a/samples/bluetooth/mesh_demo/prj.conf
+++ b/samples/bluetooth/mesh_demo/prj.conf
@@ -31,6 +31,7 @@ CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=600
+CONFIG_SECURE_STORAGE=y
 
 # Limit the number of key slots in PSA Crypto core to reduce
 # RAM footprint
diff --git a/samples/bluetooth/mesh_provisioner/boards/nrf5340dk_nrf5340_cpuapp_ns.conf b/samples/bluetooth/mesh_provisioner/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
new file mode 100644
index 00000000000..2c00cdba081
--- /dev/null
+++ b/samples/bluetooth/mesh_provisioner/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
@@ -0,0 +1 @@
+CONFIG_SECURE_STORAGE=n
diff --git a/samples/bluetooth/mesh_provisioner/prj.conf b/samples/bluetooth/mesh_provisioner/prj.conf
index 8055e388df1..10949c5480d 100644
--- a/samples/bluetooth/mesh_provisioner/prj.conf
+++ b/samples/bluetooth/mesh_provisioner/prj.conf
@@ -45,6 +45,7 @@ CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=600
+CONFIG_SECURE_STORAGE=y
 
 #CONFIG_BT_MESH_LOG_LEVEL_DBG=y
 #CONFIG_BT_MESH_SETTINGS_LOG_LEVEL_DBG=y
diff --git a/samples/boards/nordic/mesh/onoff-app/prj.conf b/samples/boards/nordic/mesh/onoff-app/prj.conf
index 0ad1ed47fd8..0e67042b265 100644
--- a/samples/boards/nordic/mesh/onoff-app/prj.conf
+++ b/samples/boards/nordic/mesh/onoff-app/prj.conf
@@ -9,6 +9,8 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
+CONFIG_SECURE_STORAGE=y
+
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=600
 
 CONFIG_BOOT_BANNER=y
diff --git a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
index 9e1fb479875..3bb984208c7 100644
--- a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
+++ b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
@@ -7,6 +7,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
+CONFIG_SECURE_STORAGE=y
 
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_BROADCASTER=y
diff --git a/samples/boards/phytec/reel_board/mesh_badge/prj.conf b/samples/boards/phytec/reel_board/mesh_badge/prj.conf
index ad6f656f301..5367f4d1e9a 100644
--- a/samples/boards/phytec/reel_board/mesh_badge/prj.conf
+++ b/samples/boards/phytec/reel_board/mesh_badge/prj.conf
@@ -66,4 +66,5 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
+CONFIG_SECURE_STORAGE=y
 CONFIG_CBPRINTF_FP_SUPPORT=y
diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index a33b20f663d..193c75dea12 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -1467,6 +1467,10 @@ config BT_MESH_SOL_ADV_XMIT
 
 endmenu # Proxy
 
+config BT_MESH_SECURE_STORAGE
+	bool
+	depends on SECURE_STORAGE
+
 choice BT_MESH_CRYPTO_LIB
 	prompt "Crypto library:"
 	default BT_MESH_USES_TFM_PSA if BUILD_WITH_TFM
@@ -1506,6 +1510,7 @@ config BT_MESH_USES_MBEDTLS_PSA
 	select PSA_WANT_ALG_SHA_256
 	select PSA_WANT_ALG_ECDH
 	select PSA_WANT_ECC_SECP_R1_256
+	select BT_MESH_SECURE_STORAGE if BT_SETTINGS
 	help
 	  Use Mbed TLS as PSA Crypto API provider. This is useful on platforms
 	  that do not support TF-M.
diff --git a/tests/bluetooth/mesh_shell/prj.conf b/tests/bluetooth/mesh_shell/prj.conf
index 043428e06a2..2af60029568 100644
--- a/tests/bluetooth/mesh_shell/prj.conf
+++ b/tests/bluetooth/mesh_shell/prj.conf
@@ -14,6 +14,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
+CONFIG_SECURE_STORAGE=y
 
 CONFIG_BT=y
 CONFIG_BT_OBSERVER=y
diff --git a/tests/bsim/bluetooth/mesh/CMakeLists.txt b/tests/bsim/bluetooth/mesh/CMakeLists.txt
index 9897e5074a2..7271af88810 100644
--- a/tests/bsim/bluetooth/mesh/CMakeLists.txt
+++ b/tests/bsim/bluetooth/mesh/CMakeLists.txt
@@ -29,7 +29,6 @@ if(CONFIG_SETTINGS)
 if(CONFIG_BT_MESH_USES_MBEDTLS_PSA)
  target_sources(app PRIVATE
   src/distribute_keyid.c
-  src/psa_its_emul.c
  )
 endif()
 
@@ -83,15 +82,3 @@ zephyr_include_directories(
   ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
   ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
 )
-
-# The mbedTLS PSA ITS is not thread safe.
-# The issue: https://github.com/zephyrproject-rtos/zephyr/issues/59362
-# Also, it isn't possible to use "native" ITS implementation since
-# mbedTLS includes headers that do not exist.
-# This linker option allows linking custom ITS implementation instead of
-# precompiled objects from the mbedTLS library to run it in parallel.
-if(CONFIG_BT_MESH_USES_MBEDTLS_PSA)
-  zephyr_ld_options(
-    ${LINKERFLAGPREFIX},--allow-multiple-definition
-    )
-endif()
diff --git a/tests/bsim/bluetooth/mesh/overlay_pst.conf b/tests/bsim/bluetooth/mesh/overlay_pst.conf
index 37b9f2b9969..52856866819 100644
--- a/tests/bsim/bluetooth/mesh/overlay_pst.conf
+++ b/tests/bsim/bluetooth/mesh/overlay_pst.conf
@@ -3,6 +3,7 @@ CONFIG_BT_SETTINGS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
+CONFIG_SECURE_STORAGE=y
 
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_MESH_GATT_PROXY=y
diff --git a/tests/bsim/bluetooth/mesh/src/psa_its_emul.c b/tests/bsim/bluetooth/mesh/src/psa_its_emul.c
deleted file mode 100644
index 0598b40a389..00000000000
--- a/tests/bsim/bluetooth/mesh/src/psa_its_emul.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-/*
- *  PSA ITS emulator over settings.
- */
-
-#include <stdlib.h>
-
-#include <zephyr/bluetooth/mesh.h>
-#include <../library/psa_crypto_its.h>
-
-#define LOG_MODULE_NAME pts_its_emu
-
-#include <zephyr/logging/log.h>
-#include "mesh/net.h"
-#include "mesh/settings.h"
-
-LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_INF);
-
-/* The value of 52 bytes was measured practically in the mbedTLS psa security storage. */
-#define MAX_ITEM_LENGTH 52
-#define MAX_ITEM_NUMBER MBEDTLS_PSA_KEY_SLOT_COUNT
-
-typedef struct {
-	uint32_t size;
-	psa_storage_create_flags_t flags;
-	uint8_t data[MAX_ITEM_LENGTH];
-} psa_its_pst_item_t;
-
-typedef struct {
-	psa_storage_uid_t uid;
-	psa_its_pst_item_t pst_item;
-} psa_its_item_t;
-
-static psa_its_item_t item[MAX_ITEM_NUMBER];
-
-static psa_its_item_t *get_item_by_uid(psa_storage_uid_t uid)
-{
-	for (int i = 0; i < MAX_ITEM_NUMBER; i++) {
-		if (uid == item[i].uid) {
-			return &item[i];
-		}
-	}
-
-	return NULL;
-}
-
-static int itsemul_set(const char *name, size_t len_rd, settings_read_cb read_cb, void *cb_arg)
-{
-	ssize_t len;
-	uint64_t uid;
-	psa_its_item_t *p_item;
-
-	LOG_DBG("read out uid: %s", name);
-
-	if (!name) {
-		LOG_ERR("Insufficient number of arguments");
-		return -ENOENT;
-	}
-
-	uid = strtoull(name, NULL, 10);
-	if (uid == ULLONG_MAX) {
-		LOG_ERR("Invalid format for uid");
-		return -EINVAL;
-	}
-
-	p_item = get_item_by_uid(uid);
-	if (p_item == NULL) {
-		p_item = get_item_by_uid(0ull);
-	}
-
-	if (p_item == NULL) {
-		LOG_ERR("Insufficient sources for %llu", uid);
-		return -EINVAL;
-	}
-
-	p_item->uid = uid;
-
-	len = read_cb(cb_arg, &p_item->pst_item, len_rd);
-	if (len < 0) {
-		LOG_ERR("Failed to read value (err %zd)", len);
-		return -EINVAL;
-	}
-
-	LOG_HEXDUMP_DBG(&p_item->pst_item, len, "pst_item:");
-
-	if (len != len_rd) {
-		LOG_ERR("Unexpected length (%zd != %zu)", len, len_rd);
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-SETTINGS_STATIC_HANDLER_DEFINE(psa_its_emu, "itsemul", NULL, itsemul_set, NULL, NULL);
-
-psa_status_t psa_its_get_info(psa_storage_uid_t uid, struct psa_storage_info_t *p_info)
-{
-	psa_its_item_t *p_item;
-
-	LOG_DBG("get info uid: %llu", uid);
-
-	p_item = get_item_by_uid(uid);
-	if (p_item == NULL) {
-		return PSA_ERROR_DOES_NOT_EXIST;
-	}
-
-	p_info->flags = p_item->pst_item.flags;
-	p_info->size = p_item->pst_item.size;
-
-	LOG_DBG("flags: %lu, size: %lu", p_info->flags, p_info->size);
-
-	return PSA_SUCCESS;
-}
-
-psa_status_t psa_its_get(psa_storage_uid_t uid, uint32_t data_offset, uint32_t data_length,
-			 void *p_data, size_t *p_data_length)
-{
-	psa_its_item_t *p_item;
-	psa_its_pst_item_t *p_pst_item;
-
-	LOG_DBG("get uid: %llu", uid);
-
-	p_item = get_item_by_uid(uid);
-	if (p_item == NULL) {
-		return PSA_ERROR_DOES_NOT_EXIST;
-	}
-
-	p_pst_item = &p_item->pst_item;
-
-	if (data_offset > p_pst_item->size) {
-		return PSA_ERROR_DATA_CORRUPT;
-	}
-
-	*p_data_length = MIN(p_pst_item->size - data_offset, data_length);
-	memcpy(p_data, p_pst_item->data + data_offset, *p_data_length);
-
-	return PSA_SUCCESS;
-}
-
-psa_status_t psa_its_set(psa_storage_uid_t uid, uint32_t data_length, const void *p_data,
-			 psa_storage_create_flags_t create_flags)
-{
-	char path[40];
-	psa_its_item_t *p_item;
-	psa_its_pst_item_t *p_pst_item;
-	psa_status_t status = PSA_SUCCESS;
-
-	LOG_DBG("Set uid: %llu, len: %lu", uid, data_length);
-
-	if (data_length > MAX_ITEM_LENGTH) {
-		LOG_ERR("Too long item data: %lu > " STRINGIFY(MAX_ITEM_LENGTH), data_length);
-	}
-
-	p_item = get_item_by_uid(uid);
-	if (p_item == NULL) {
-		p_item = get_item_by_uid(0ull);
-	}
-
-	if (p_item == NULL) {
-		return PSA_ERROR_STORAGE_FAILURE;
-	}
-
-	snprintk(path, sizeof(path), "itsemul/%llu", uid);
-
-	p_item->uid = uid;
-	p_pst_item = &p_item->pst_item;
-	p_pst_item->size = data_length;
-	p_pst_item->flags = create_flags;
-	memcpy(p_pst_item->data, p_data, data_length);
-
-	if (settings_save_one(path, p_pst_item, sizeof(psa_its_pst_item_t))) {
-		LOG_ERR("Failed to store its item: %s", path);
-		status = PSA_ERROR_STORAGE_FAILURE;
-	} else {
-		LOG_DBG("Stored its item: %s", path);
-	}
-
-	return status;
-}
-
-psa_status_t psa_its_remove(psa_storage_uid_t uid)
-{
-	char path[40];
-	psa_status_t status = PSA_SUCCESS;
-	psa_its_item_t *p_item;
-
-	LOG_DBG("remove uid: %llu", uid);
-
-	p_item = get_item_by_uid(uid);
-	if (p_item == NULL) {
-		return status;
-	}
-	memset(p_item, 0, sizeof(psa_its_item_t));
-
-	snprintk(path, sizeof(path), "itsemul/%llu", uid);
-
-	if (settings_delete(path)) {
-		LOG_ERR("Failed to remove its item: %s", path);
-		status = PSA_ERROR_STORAGE_FAILURE;
-	} else {
-		LOG_DBG("Removed its item: %s", path);
-	}
-
-	return status;
-}

From 5021b9fb26042afba5f2d1c31e6f9cb1e2add546 Mon Sep 17 00:00:00 2001
From: alperen sener <alperen.sener@nordicsemi.no>
Date: Fri, 10 Jan 2025 13:20:25 +0100
Subject: [PATCH 2342/2913] [nrf fromtree] tests: bluetooth: tester: Increase
 number of PSA key slots for mesh

MESH PTS tests require different number of keys, as an example; only
one netkey requires 8 key slots and there are test cases that use at
least two netkeys which consume the default 16 slots, so it is better
to have enough slots all times. Setting slot count to 32.

Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
(cherry picked from commit 35aea4909658dd5294889c5f268aa2d6873a69c0)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 tests/bluetooth/tester/overlay-mesh.conf | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/bluetooth/tester/overlay-mesh.conf b/tests/bluetooth/tester/overlay-mesh.conf
index db30d423577..815f4952497 100644
--- a/tests/bluetooth/tester/overlay-mesh.conf
+++ b/tests/bluetooth/tester/overlay-mesh.conf
@@ -1,3 +1,8 @@
+# Different test cases require different number of
+# PSA key slots; in order to make sure there is always
+# enough key slots allocating 32 slots.
+CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=32
+
 CONFIG_BT_MESH=y
 CONFIG_BT_MESH_RELAY=y
 CONFIG_BT_MESH_PB_ADV=y

From a87e8a7f6e833c33e58ae1e7eeda5f745996fbcf Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Tue, 14 Jan 2025 09:52:53 +0100
Subject: [PATCH 2343/2913] [nrf fromtree] bluetooth: mesh: Remove assertion
 for Received List message PDU size

According to MshDFUv1.0, section 6.2.3.5, the Firmware Distribution
Receivers List message is not limited by the size of the receivers list:

```
The number of selected entries shall be limited by the following:
- The number of entries shall not exceed the value of the Entries Limit
  field from the Firmware Distribution Receivers Get message.
- The number of entries shall not cause the message payload to exceed
  the maximum Access PDU size.
```

Thus, this assertion is incorrect as it doesn't allow to have the
receivers list bigger than number of maximal Access PDU size.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit 6463d15a6653a8e8ecad3e16f917f60a3f5f9c5e)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/mesh/dfd_srv.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/subsys/bluetooth/mesh/dfd_srv.c b/subsys/bluetooth/mesh/dfd_srv.c
index 1b640739e50..1aebb51ba3d 100644
--- a/subsys/bluetooth/mesh/dfd_srv.c
+++ b/subsys/bluetooth/mesh/dfd_srv.c
@@ -35,12 +35,8 @@ BUILD_ASSERT((DFD_UPLOAD_START_MSG_MAXLEN + BT_MESH_MODEL_OP_LEN(BT_MESH_DFD_OP_
 	     "The Firmware Distribution Upload Start message does not fit into the maximum "
 	     "incoming SDU size.");
 
-#define DFD_RECEIVERS_LIST_MSG_MAXLEN (4 + CONFIG_BT_MESH_DFD_SRV_TARGETS_MAX * 5)
-
-BUILD_ASSERT((DFD_RECEIVERS_LIST_MSG_MAXLEN + BT_MESH_MODEL_OP_LEN(BT_MESH_DFD_OP_RECEIVERS_LIST) +
-	      BT_MESH_MIC_SHORT) <= BT_MESH_TX_SDU_MAX,
-	     "The Firmware Distribution Receivers List message does not fit into the maximum "
-	     "outgoing SDU size.");
+#define DFD_RECEIVERS_LIST_MSG_MAXLEN (BT_MESH_TX_SDU_MAX - BT_MESH_MIC_SHORT - \
+				       BT_MESH_MODEL_OP_LEN(BT_MESH_DFD_OP_RECEIVERS_LIST))
 
 #define DFD_RECEIVERS_ADD_MSG_MAXLEN (CONFIG_BT_MESH_DFD_SRV_TARGETS_MAX * 3)
 

From 24d888dbf4205fb4329b85fb9447eeee616a1f7f Mon Sep 17 00:00:00 2001
From: Stine Akredalen <stine.akredalen@nordicsemi.no>
Date: Tue, 14 Jan 2025 21:10:28 +0100
Subject: [PATCH 2344/2913] [nrf fromtree] Bluetooth: host: Add overlays for
 bsim tests

Removed similar prj.conf files and added overlays instead to avoid
duplicate code.
Renamed some test files for consistency.

Signed-off-by: Stine Akredalen <stine.akredalen@nordicsemi.no>
(cherry picked from commit 724d32cd7ccb5e1863ac1218f33cc2bab110c22a)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 .../ccc_store/overlay-no_store_on_write.conf  |  2 +
 .../bluetooth/host/gatt/ccc_store/prj_2.conf  | 24 --------
 ...cc_store_2.sh => ccc_no_store_on_write.sh} |  4 +-
 .../host/gatt/ccc_store/testcase.yaml         |  4 +-
 .../{prj_2.conf => overlay-privacy.conf}      |  0
 ...ings_2.sh => run_gatt_settings_privacy.sh} | 40 ++++++-------
 .../host/gatt/settings/testcase.yaml          |  6 +-
 .../host/l2cap/credits/overlay-ecred.conf     |  1 +
 .../host/l2cap/credits/prj_ecred.conf         | 21 -------
 .../host/l2cap/credits/testcase.yaml          |  5 +-
 .../tests_scripts/l2cap_credits_ecred.sh      |  2 +-
 .../l2cap/credits_seg_recv/overlay-ecred.conf |  1 +
 .../l2cap/credits_seg_recv/prj_ecred.conf     | 23 --------
 .../host/l2cap/credits_seg_recv/testcase.yaml |  5 +-
 .../l2cap_credits_seg_recv_ecred.sh           |  2 +-
 .../l2cap/send_on_connect/overlay-ecred.conf  |  1 +
 .../host/l2cap/send_on_connect/prj_ecred.conf | 10 ----
 .../host/l2cap/send_on_connect/testcase.yaml  |  4 +-
 .../send_on_connect/tests_scripts/l2cap.sh    |  6 +-
 .../host/l2cap/stress/overlay-nofrag.conf     |  5 ++
 .../host/l2cap/stress/overlay-syswq.conf      |  1 +
 .../host/l2cap/stress/prj_nofrag.conf         | 47 ---------------
 .../host/l2cap/stress/prj_syswq.conf          | 57 -------------------
 .../bluetooth/host/l2cap/stress/testcase.yaml | 10 ++--
 .../stress/tests_scripts/l2cap_nofrag.sh      |  2 +-
 .../l2cap/stress/tests_scripts/l2cap_syswq.sh |  2 +-
 .../{prj_2.conf => overlay-no_lazy_load.conf} |  0
 ...update_2.sh => ccc_update_no_lazy_load.sh} |  2 +-
 .../host/security/ccc_update/testcase.yaml    |  4 +-
 29 files changed, 59 insertions(+), 232 deletions(-)
 create mode 100644 tests/bsim/bluetooth/host/gatt/ccc_store/overlay-no_store_on_write.conf
 delete mode 100644 tests/bsim/bluetooth/host/gatt/ccc_store/prj_2.conf
 rename tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/{ccc_store_2.sh => ccc_no_store_on_write.sh} (91%)
 rename tests/bsim/bluetooth/host/gatt/settings/{prj_2.conf => overlay-privacy.conf} (100%)
 rename tests/bsim/bluetooth/host/gatt/settings/test_scripts/{run_gatt_settings_2.sh => run_gatt_settings_privacy.sh} (62%)
 create mode 100644 tests/bsim/bluetooth/host/l2cap/credits/overlay-ecred.conf
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/credits/prj_ecred.conf
 create mode 100644 tests/bsim/bluetooth/host/l2cap/credits_seg_recv/overlay-ecred.conf
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/credits_seg_recv/prj_ecred.conf
 create mode 100644 tests/bsim/bluetooth/host/l2cap/send_on_connect/overlay-ecred.conf
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/send_on_connect/prj_ecred.conf
 create mode 100644 tests/bsim/bluetooth/host/l2cap/stress/overlay-nofrag.conf
 create mode 100644 tests/bsim/bluetooth/host/l2cap/stress/overlay-syswq.conf
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/stress/prj_nofrag.conf
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/stress/prj_syswq.conf
 rename tests/bsim/bluetooth/host/security/ccc_update/{prj_2.conf => overlay-no_lazy_load.conf} (100%)
 rename tests/bsim/bluetooth/host/security/ccc_update/test_scripts/{ccc_update_2.sh => ccc_update_no_lazy_load.sh} (97%)

diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/overlay-no_store_on_write.conf b/tests/bsim/bluetooth/host/gatt/ccc_store/overlay-no_store_on_write.conf
new file mode 100644
index 00000000000..dd3dedec6ac
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/ccc_store/overlay-no_store_on_write.conf
@@ -0,0 +1,2 @@
+# Test that CCC is stored even if BT_SETTINGS_DELAYED_STORE is enabled
+CONFIG_BT_SETTINGS_CCC_STORE_ON_WRITE=n
diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/prj_2.conf b/tests/bsim/bluetooth/host/gatt/ccc_store/prj_2.conf
deleted file mode 100644
index 82fa0d0c155..00000000000
--- a/tests/bsim/bluetooth/host/gatt/ccc_store/prj_2.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-CONFIG_BT=y
-CONFIG_BT_CENTRAL=y
-CONFIG_BT_PERIPHERAL=y
-CONFIG_BT_DEVICE_NAME="CCC Store Test"
-
-CONFIG_LOG=y
-
-CONFIG_BT_EXT_ADV=y
-CONFIG_BT_MAX_CONN=3
-CONFIG_BT_GATT_CLIENT=y
-
-CONFIG_BT_SMP=y
-
-CONFIG_SETTINGS=y
-CONFIG_BT_SETTINGS=y
-CONFIG_FLASH=y
-CONFIG_NVS=y
-CONFIG_FLASH_MAP=y
-CONFIG_SETTINGS_NVS=y
-
-CONFIG_ASSERT=y
-
-# Test that CCC is stored even if BT_SETTINGS_DELAYED_STORE is enabled
-CONFIG_BT_SETTINGS_CCC_STORE_ON_WRITE=n
diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store_2.sh b/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_no_store_on_write.sh
similarity index 91%
rename from tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store_2.sh
rename to tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_no_store_on_write.sh
index 29befb86602..97b6631b1a4 100755
--- a/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store_2.sh
+++ b/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_no_store_on_write.sh
@@ -4,8 +4,8 @@
 
 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
 
-test_exe="bs_${BOARD_TS}_$(guess_test_long_name)_prj_2_conf"
-simulation_id="ccc_store_2"
+test_exe="bs_${BOARD_TS}_$(guess_test_long_name)_overlay-no_store_on_write_conf"
+simulation_id="ccc_no_store_on_write"
 verbosity_level=2
 EXECUTE_TIMEOUT=60
 
diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/testcase.yaml b/tests/bsim/bluetooth/host/gatt/ccc_store/testcase.yaml
index f285f4c014c..12ab2fc7036 100644
--- a/tests/bsim/bluetooth/host/gatt/ccc_store/testcase.yaml
+++ b/tests/bsim/bluetooth/host/gatt/ccc_store/testcase.yaml
@@ -12,6 +12,6 @@ tests:
       bsim_exe_name: tests_bsim_bluetooth_host_gatt_ccc_store_prj_conf
   bluetooth.host.gatt.ccc_store_2:
     harness_config:
-      bsim_exe_name: tests_bsim_bluetooth_host_gatt_ccc_store_prj_2_conf
+      bsim_exe_name: tests_bsim_bluetooth_host_gatt_ccc_store_overlay-no_store_on_write_conf
     extra_args:
-      EXTRA_CONF_FILE=prj_2.conf
+      EXTRA_CONF_FILE=overlay-no_store_on_write.conf
diff --git a/tests/bsim/bluetooth/host/gatt/settings/prj_2.conf b/tests/bsim/bluetooth/host/gatt/settings/overlay-privacy.conf
similarity index 100%
rename from tests/bsim/bluetooth/host/gatt/settings/prj_2.conf
rename to tests/bsim/bluetooth/host/gatt/settings/overlay-privacy.conf
diff --git a/tests/bsim/bluetooth/host/gatt/settings/test_scripts/run_gatt_settings_2.sh b/tests/bsim/bluetooth/host/gatt/settings/test_scripts/run_gatt_settings_privacy.sh
similarity index 62%
rename from tests/bsim/bluetooth/host/gatt/settings/test_scripts/run_gatt_settings_2.sh
rename to tests/bsim/bluetooth/host/gatt/settings/test_scripts/run_gatt_settings_privacy.sh
index b4d3d16b01f..94e660dfecd 100755
--- a/tests/bsim/bluetooth/host/gatt/settings/test_scripts/run_gatt_settings_2.sh
+++ b/tests/bsim/bluetooth/host/gatt/settings/test_scripts/run_gatt_settings_privacy.sh
@@ -5,15 +5,15 @@ set -eu
 
 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
 
-simulation_id="settings_2"
+simulation_id="settings_privacy"
 verbosity_level=2
 EXECUTE_TIMEOUT=120
-test_2_exe="./bs_${BOARD_TS}_$(guess_test_long_name)_prj_2_conf"
+test_priv_exe="./bs_${BOARD_TS}_$(guess_test_long_name)_overlay-privacy_conf"
 
 cd ${BSIM_OUT_PATH}/bin
 
 # Remove the files used by the custom SETTINGS backend
-TO_DELETE="${simulation_id}_server_2.log ${simulation_id}_client_2.log"
+TO_DELETE="${simulation_id}_server_priv.log ${simulation_id}_client_priv.log"
 echo "remove settings files ${TO_DELETE}"
 rm ${TO_DELETE} || true
 
@@ -26,22 +26,22 @@ Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s="${simulation_id}" -D=8 -sim_le
 #
 # Each device will wait until the previous instance (called 'test round') has
 # finished executing before starting up.
-Execute "$test_2_exe" -v=${verbosity_level} \
-    -s="${simulation_id}" -d=0 -testid=server -RealEncryption=1 -argstest 0 6 "server_2"
-Execute "$test_2_exe" -v=${verbosity_level} \
-    -s="${simulation_id}" -d=1 -testid=server -RealEncryption=1 -argstest 1 6 "server_2"
-Execute "$test_2_exe" -v=${verbosity_level} \
-    -s="${simulation_id}" -d=2 -testid=server -RealEncryption=1 -argstest 2 6 "server_2"
-Execute "$test_2_exe" -v=${verbosity_level} \
-    -s="${simulation_id}" -d=3 -testid=server -RealEncryption=1 -argstest 3 6 "server_2"
-Execute "$test_2_exe" -v=${verbosity_level} \
-    -s="${simulation_id}" -d=4 -testid=server -RealEncryption=1 -argstest 4 6 "server_2"
-Execute "$test_2_exe" -v=${verbosity_level} \
-    -s="${simulation_id}" -d=5 -testid=server -RealEncryption=1 -argstest 5 6 "server_2"
-Execute "$test_2_exe" -v=${verbosity_level} \
-    -s="${simulation_id}" -d=6 -testid=server -RealEncryption=1 -argstest 6 6 "server_2"
-
-Execute "$test_2_exe" -v=${verbosity_level} \
-    -s="${simulation_id}" -d=7 -testid=client -RealEncryption=1 -argstest 0 0 "client_2"
+Execute "$test_priv_exe" -v=${verbosity_level} \
+    -s="${simulation_id}" -d=0 -testid=server -RealEncryption=1 -argstest 0 6 "server_priv"
+Execute "$test_priv_exe" -v=${verbosity_level} \
+    -s="${simulation_id}" -d=1 -testid=server -RealEncryption=1 -argstest 1 6 "server_priv"
+Execute "$test_priv_exe" -v=${verbosity_level} \
+    -s="${simulation_id}" -d=2 -testid=server -RealEncryption=1 -argstest 2 6 "server_priv"
+Execute "$test_priv_exe" -v=${verbosity_level} \
+    -s="${simulation_id}" -d=3 -testid=server -RealEncryption=1 -argstest 3 6 "server_priv"
+Execute "$test_priv_exe" -v=${verbosity_level} \
+    -s="${simulation_id}" -d=4 -testid=server -RealEncryption=1 -argstest 4 6 "server_priv"
+Execute "$test_priv_exe" -v=${verbosity_level} \
+    -s="${simulation_id}" -d=5 -testid=server -RealEncryption=1 -argstest 5 6 "server_priv"
+Execute "$test_priv_exe" -v=${verbosity_level} \
+    -s="${simulation_id}" -d=6 -testid=server -RealEncryption=1 -argstest 6 6 "server_priv"
+
+Execute "$test_priv_exe" -v=${verbosity_level} \
+    -s="${simulation_id}" -d=7 -testid=client -RealEncryption=1 -argstest 0 0 "client_priv"
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/gatt/settings/testcase.yaml b/tests/bsim/bluetooth/host/gatt/settings/testcase.yaml
index d09d5f9094c..8d8575b2c49 100644
--- a/tests/bsim/bluetooth/host/gatt/settings/testcase.yaml
+++ b/tests/bsim/bluetooth/host/gatt/settings/testcase.yaml
@@ -10,8 +10,8 @@ tests:
   bluetooth.host.gatt.settings:
     harness_config:
       bsim_exe_name: tests_bsim_bluetooth_host_gatt_settings_prj_conf
-  bluetooth.host.gatt.settings_2:
+  bluetooth.host.gatt.settings_priv:
     harness_config:
-      bsim_exe_name: tests_bsim_bluetooth_host_gatt_settings_prj_2_conf
+      bsim_exe_name: tests_bsim_bluetooth_host_gatt_settings_overlay-privacy_conf
     extra_args:
-      EXTRA_CONF_FILE=prj_2.conf
+      EXTRA_CONF_FILE=overlay-privacy.conf
diff --git a/tests/bsim/bluetooth/host/l2cap/credits/overlay-ecred.conf b/tests/bsim/bluetooth/host/l2cap/credits/overlay-ecred.conf
new file mode 100644
index 00000000000..df8a8081991
--- /dev/null
+++ b/tests/bsim/bluetooth/host/l2cap/credits/overlay-ecred.conf
@@ -0,0 +1 @@
+CONFIG_BT_L2CAP_ECRED=y
diff --git a/tests/bsim/bluetooth/host/l2cap/credits/prj_ecred.conf b/tests/bsim/bluetooth/host/l2cap/credits/prj_ecred.conf
deleted file mode 100644
index 3c0d340201b..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/credits/prj_ecred.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-CONFIG_BT=y
-CONFIG_BT_CENTRAL=y
-CONFIG_BT_PERIPHERAL=y
-CONFIG_BT_DEVICE_NAME="L2CAP credits test"
-
-CONFIG_BT_L2CAP_ECRED=y
-
-CONFIG_BT_SMP=y # Next config depends on it
-CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
-
-# Disable auto-initiated procedures so they don't
-# mess with the test's execution.
-CONFIG_BT_AUTO_PHY_UPDATE=n
-CONFIG_BT_AUTO_DATA_LEN_UPDATE=n
-CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
-
-CONFIG_LOG=y
-CONFIG_ASSERT=y
-
-# Enable when the test fails
-# CONFIG_BT_L2CAP_LOG_LEVEL_DBG=y
diff --git a/tests/bsim/bluetooth/host/l2cap/credits/testcase.yaml b/tests/bsim/bluetooth/host/l2cap/credits/testcase.yaml
index 1e59e225b81..4b7ef8127c5 100644
--- a/tests/bsim/bluetooth/host/l2cap/credits/testcase.yaml
+++ b/tests/bsim/bluetooth/host/l2cap/credits/testcase.yaml
@@ -12,6 +12,5 @@ tests:
       bsim_exe_name: tests_bsim_bluetooth_host_l2cap_credits_prj_conf
   bluetooth.host.l2cap.credits_ecred:
     harness_config:
-      bsim_exe_name: tests_bsim_bluetooth_host_l2cap_credits_prj_ecred_conf
-    extra_args:
-      CONF_FILE=prj_ecred.conf
+      bsim_exe_name: tests_bsim_bluetooth_host_l2cap_credits_prj_conf_overlay-ecred_conf
+    extra_args: EXTRA_CONF_FILE="overlay-ecred.conf"
diff --git a/tests/bsim/bluetooth/host/l2cap/credits/tests_scripts/l2cap_credits_ecred.sh b/tests/bsim/bluetooth/host/l2cap/credits/tests_scripts/l2cap_credits_ecred.sh
index 46ba8a27033..b58c32f6aab 100755
--- a/tests/bsim/bluetooth/host/l2cap/credits/tests_scripts/l2cap_credits_ecred.sh
+++ b/tests/bsim/bluetooth/host/l2cap/credits/tests_scripts/l2cap_credits_ecred.sh
@@ -6,7 +6,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
 
 verbosity_level=2
 simulation_id=$(guess_test_long_name)_ecred
-bsim_exe=./bs_${BOARD_TS}_$(guess_test_long_name)_prj_ecred_conf
+bsim_exe=./bs_${BOARD_TS}_$(guess_test_long_name)_prj_conf_overlay-ecred_conf
 
 cd ${BSIM_OUT_PATH}/bin
 
diff --git a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/overlay-ecred.conf b/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/overlay-ecred.conf
new file mode 100644
index 00000000000..df8a8081991
--- /dev/null
+++ b/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/overlay-ecred.conf
@@ -0,0 +1 @@
+CONFIG_BT_L2CAP_ECRED=y
diff --git a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/prj_ecred.conf b/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/prj_ecred.conf
deleted file mode 100644
index 27dd9b50912..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/prj_ecred.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-CONFIG_BT=y
-CONFIG_BT_CENTRAL=y
-CONFIG_BT_PERIPHERAL=y
-CONFIG_BT_DEVICE_NAME="L2CAP credits test"
-
-CONFIG_BT_L2CAP_ECRED=y
-
-CONFIG_BT_SMP=y # Next config depends on it
-CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
-
-# Disable auto-initiated procedures so they don't
-# mess with the test's execution.
-CONFIG_BT_AUTO_PHY_UPDATE=n
-CONFIG_BT_AUTO_DATA_LEN_UPDATE=n
-CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
-
-CONFIG_LOG=y
-CONFIG_ASSERT=y
-
-CONFIG_BT_L2CAP_SEG_RECV=y
-
-# Enable when the test fails
-# CONFIG_BT_L2CAP_LOG_LEVEL_DBG=y
diff --git a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/testcase.yaml b/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/testcase.yaml
index 49b754094c8..47ecd4484ab 100644
--- a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/testcase.yaml
+++ b/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/testcase.yaml
@@ -12,6 +12,5 @@ tests:
       bsim_exe_name: tests_bsim_bluetooth_host_l2cap_credits_seg_recv_prj_conf
   bluetooth.host.l2cap.credits_seg_recv_ecred:
     harness_config:
-      bsim_exe_name: tests_bsim_bluetooth_host_l2cap_credits_seg_recv_prj_ecred_conf
-    extra_args:
-      CONF_FILE=prj_ecred.conf
+      bsim_exe_name: tests_bsim_bluetooth_host_l2cap_credits_seg_recv_prj_conf_overlay-ecred_conf
+    extra_args: EXTRA_CONF_FILE="overlay-ecred.conf"
diff --git a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/tests_scripts/l2cap_credits_seg_recv_ecred.sh b/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/tests_scripts/l2cap_credits_seg_recv_ecred.sh
index 46ba8a27033..b58c32f6aab 100755
--- a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/tests_scripts/l2cap_credits_seg_recv_ecred.sh
+++ b/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/tests_scripts/l2cap_credits_seg_recv_ecred.sh
@@ -6,7 +6,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
 
 verbosity_level=2
 simulation_id=$(guess_test_long_name)_ecred
-bsim_exe=./bs_${BOARD_TS}_$(guess_test_long_name)_prj_ecred_conf
+bsim_exe=./bs_${BOARD_TS}_$(guess_test_long_name)_prj_conf_overlay-ecred_conf
 
 cd ${BSIM_OUT_PATH}/bin
 
diff --git a/tests/bsim/bluetooth/host/l2cap/send_on_connect/overlay-ecred.conf b/tests/bsim/bluetooth/host/l2cap/send_on_connect/overlay-ecred.conf
new file mode 100644
index 00000000000..df8a8081991
--- /dev/null
+++ b/tests/bsim/bluetooth/host/l2cap/send_on_connect/overlay-ecred.conf
@@ -0,0 +1 @@
+CONFIG_BT_L2CAP_ECRED=y
diff --git a/tests/bsim/bluetooth/host/l2cap/send_on_connect/prj_ecred.conf b/tests/bsim/bluetooth/host/l2cap/send_on_connect/prj_ecred.conf
deleted file mode 100644
index 6d418003174..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/send_on_connect/prj_ecred.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG_BT=y
-CONFIG_BT_CENTRAL=y
-CONFIG_BT_PERIPHERAL=y
-CONFIG_BT_SMP=y
-CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
-CONFIG_BT_L2CAP_ECRED=y
-
-CONFIG_BT_BUF_ACL_RX_SIZE=75
-
-CONFIG_ASSERT=y
diff --git a/tests/bsim/bluetooth/host/l2cap/send_on_connect/testcase.yaml b/tests/bsim/bluetooth/host/l2cap/send_on_connect/testcase.yaml
index 6604121a3be..36ee2712a43 100644
--- a/tests/bsim/bluetooth/host/l2cap/send_on_connect/testcase.yaml
+++ b/tests/bsim/bluetooth/host/l2cap/send_on_connect/testcase.yaml
@@ -13,6 +13,6 @@ tests:
       bsim_exe_name: tests_bsim_bluetooth_host_l2cap_send_on_connect_prj_conf
   bluetooth.host.l2cap.send_on_connect_ecred:
     harness_config:
-      bsim_exe_name: tests_bsim_bluetooth_host_l2cap_send_on_connect_prj_ecred_conf
+      bsim_exe_name: tests_bsim_bluetooth_host_l2cap_send_on_connect_prj_conf_overlay-ecred_conf
     extra_args:
-      CONF_FILE=prj_ecred.conf
+      EXTRA_CONF_FILE=overlay-ecred.conf
diff --git a/tests/bsim/bluetooth/host/l2cap/send_on_connect/tests_scripts/l2cap.sh b/tests/bsim/bluetooth/host/l2cap/send_on_connect/tests_scripts/l2cap.sh
index 32c5eebda06..d7b8abd67ca 100755
--- a/tests/bsim/bluetooth/host/l2cap/send_on_connect/tests_scripts/l2cap.sh
+++ b/tests/bsim/bluetooth/host/l2cap/send_on_connect/tests_scripts/l2cap.sh
@@ -25,10 +25,12 @@ simulation_id="l2cap_send_on_connect_ecred"
 
 cd ${BSIM_OUT_PATH}/bin
 
-Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_l2cap_send_on_connect_prj_ecred_conf \
+Execute \
+    ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_l2cap_send_on_connect_prj_conf_overlay-ecred_conf \
     -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central
 
-Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_l2cap_send_on_connect_prj_ecred_conf \
+Execute \
+    ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_l2cap_send_on_connect_prj_conf_overlay-ecred_conf \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/overlay-nofrag.conf b/tests/bsim/bluetooth/host/l2cap/stress/overlay-nofrag.conf
new file mode 100644
index 00000000000..52e940daeff
--- /dev/null
+++ b/tests/bsim/bluetooth/host/l2cap/stress/overlay-nofrag.conf
@@ -0,0 +1,5 @@
+# Send L2CAP PDUs without any fragmentation.
+CONFIG_BT_BUF_ACL_TX_SIZE=81
+
+CONFIG_BT_L2CAP_TX_BUF_COUNT=100
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=81
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/overlay-syswq.conf b/tests/bsim/bluetooth/host/l2cap/stress/overlay-syswq.conf
new file mode 100644
index 00000000000..2029d6edf95
--- /dev/null
+++ b/tests/bsim/bluetooth/host/l2cap/stress/overlay-syswq.conf
@@ -0,0 +1 @@
+CONFIG_BT_RECV_WORKQ_SYS=y
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/prj_nofrag.conf b/tests/bsim/bluetooth/host/l2cap/stress/prj_nofrag.conf
deleted file mode 100644
index ea9cda13529..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/stress/prj_nofrag.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-CONFIG_BT=y
-CONFIG_BT_CENTRAL=y
-CONFIG_BT_PERIPHERAL=y
-CONFIG_BT_DEVICE_NAME="L2CAP stress test"
-
-CONFIG_BT_EATT=n
-CONFIG_BT_L2CAP_ECRED=n
-
-CONFIG_BT_SMP=y # Next config depends on it
-CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
-
-# Disable auto-initiated procedures so they don't
-# mess with the test's execution.
-CONFIG_BT_AUTO_PHY_UPDATE=n
-CONFIG_BT_AUTO_DATA_LEN_UPDATE=n
-CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
-
-# L2CAP MPS
-# 23+27+27=77 makes exactly three full packets
-CONFIG_BT_L2CAP_TX_MTU=77
-
-# Send L2CAP PDUs without any fragmentation.
-CONFIG_BT_BUF_ACL_TX_SIZE=81
-
-CONFIG_BT_BUF_ACL_TX_COUNT=4
-
-# The minimum value for this is
-# L2AP MPS + L2CAP header (4)
-CONFIG_BT_BUF_ACL_RX_SIZE=81
-
-CONFIG_BT_L2CAP_TX_BUF_COUNT=100
-
-CONFIG_BT_CTLR_DATA_LENGTH_MAX=81
-CONFIG_BT_CTLR_RX_BUFFERS=10
-
-CONFIG_BT_MAX_CONN=10
-
-CONFIG_LOG=y
-CONFIG_ASSERT=y
-CONFIG_NET_BUF_POOL_USAGE=y
-
-# CONFIG_BT_L2CAP_LOG_LEVEL_DBG=y
-# CONFIG_BT_CONN_LOG_LEVEL_DBG=y
-CONFIG_LOG_THREAD_ID_PREFIX=y
-CONFIG_THREAD_NAME=y
-
-CONFIG_ARCH_POSIX_TRAP_ON_FATAL=y
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/prj_syswq.conf b/tests/bsim/bluetooth/host/l2cap/stress/prj_syswq.conf
deleted file mode 100644
index 3cddbe332cd..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/stress/prj_syswq.conf
+++ /dev/null
@@ -1,57 +0,0 @@
-CONFIG_BT=y
-CONFIG_BT_CENTRAL=y
-CONFIG_BT_PERIPHERAL=y
-CONFIG_BT_DEVICE_NAME="L2CAP stress test"
-
-CONFIG_BT_EATT=n
-CONFIG_BT_L2CAP_ECRED=n
-
-CONFIG_BT_SMP=y # Next config depends on it
-CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
-
-# Disable auto-initiated procedures so they don't
-# mess with the test's execution.
-CONFIG_BT_AUTO_PHY_UPDATE=n
-CONFIG_BT_AUTO_DATA_LEN_UPDATE=n
-CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
-
-# L2CAP MPS
-# 23+27+27=77 makes exactly three full packets
-CONFIG_BT_L2CAP_TX_MTU=77
-
-# Use this to send L2CAP PDUs without any fragmentation.
-# In this particular case, we prefer fragmenting to test that code path.
-# CONFIG_BT_BUF_ACL_TX_SIZE=81
-
-# L2CAP PDUs will be fragmented in 3 ACL packets.
-CONFIG_BT_BUF_ACL_TX_SIZE=27
-
-CONFIG_BT_BUF_ACL_TX_COUNT=4
-
-# The minimum value for this is
-# L2AP MPS + L2CAP header (4)
-CONFIG_BT_BUF_ACL_RX_SIZE=81
-
-# Governs BT_CONN_TX_MAX, and so must be >= than the max number of
-# peers, since we attempt to send one SDU per peer. The test execution
-# is a bit slowed down by having this at the very minimum, but we want
-# to keep it that way as to stress the stack as much as possible.
-CONFIG_BT_L2CAP_TX_BUF_COUNT=6
-
-CONFIG_BT_CTLR_DATA_LENGTH_MAX=27
-CONFIG_BT_CTLR_RX_BUFFERS=10
-
-CONFIG_BT_MAX_CONN=10
-
-CONFIG_LOG=y
-CONFIG_ASSERT=y
-CONFIG_NET_BUF_POOL_USAGE=y
-
-# CONFIG_BT_L2CAP_LOG_LEVEL_DBG=y
-# CONFIG_BT_CONN_LOG_LEVEL_DBG=y
-CONFIG_LOG_THREAD_ID_PREFIX=y
-CONFIG_THREAD_NAME=y
-
-CONFIG_ARCH_POSIX_TRAP_ON_FATAL=y
-
-CONFIG_BT_RECV_WORKQ_SYS=y
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/testcase.yaml b/tests/bsim/bluetooth/host/l2cap/stress/testcase.yaml
index 087f2f3ba50..f872f5873da 100644
--- a/tests/bsim/bluetooth/host/l2cap/stress/testcase.yaml
+++ b/tests/bsim/bluetooth/host/l2cap/stress/testcase.yaml
@@ -12,11 +12,9 @@ tests:
       bsim_exe_name: tests_bsim_bluetooth_host_l2cap_stress_prj_conf
   bluetooth.host.l2cap.stress_nofrag:
     harness_config:
-      bsim_exe_name: tests_bsim_bluetooth_host_l2cap_stress_prj_nofrag_conf
-    extra_args:
-      CONF_FILE=prj_nofrag.conf
+      bsim_exe_name: tests_bsim_bluetooth_host_l2cap_stress_prj_conf_overlay-nofrag_conf
+    extra_args: EXTRA_CONF_FILE="overlay-nofrag.conf"
   bluetooth.host.l2cap.stress_syswq:
     harness_config:
-      bsim_exe_name: tests_bsim_bluetooth_host_l2cap_stress_prj_syswq_conf
-    extra_args:
-      CONF_FILE=prj_syswq.conf
+      bsim_exe_name: tests_bsim_bluetooth_host_l2cap_stress_prj_conf_overlay-syswq_conf
+    extra_args: EXTRA_CONF_FILE="overlay-syswq.conf"
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/tests_scripts/l2cap_nofrag.sh b/tests/bsim/bluetooth/host/l2cap/stress/tests_scripts/l2cap_nofrag.sh
index 4d4bb7f9152..7183d4b0163 100755
--- a/tests/bsim/bluetooth/host/l2cap/stress/tests_scripts/l2cap_nofrag.sh
+++ b/tests/bsim/bluetooth/host/l2cap/stress/tests_scripts/l2cap_nofrag.sh
@@ -9,7 +9,7 @@ simulation_id="l2cap_stress_nofrag"
 verbosity_level=2
 EXECUTE_TIMEOUT=240
 
-bsim_exe=./bs_${BOARD_TS}_tests_bsim_bluetooth_host_l2cap_stress_prj_nofrag_conf
+bsim_exe=./bs_${BOARD_TS}_tests_bsim_bluetooth_host_l2cap_stress_prj_conf_overlay-nofrag_conf
 
 cd ${BSIM_OUT_PATH}/bin
 
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/tests_scripts/l2cap_syswq.sh b/tests/bsim/bluetooth/host/l2cap/stress/tests_scripts/l2cap_syswq.sh
index b6e24b06780..57fcf1747b6 100755
--- a/tests/bsim/bluetooth/host/l2cap/stress/tests_scripts/l2cap_syswq.sh
+++ b/tests/bsim/bluetooth/host/l2cap/stress/tests_scripts/l2cap_syswq.sh
@@ -9,7 +9,7 @@ simulation_id="l2cap_stress_syswq"
 verbosity_level=2
 EXECUTE_TIMEOUT=240
 
-bsim_exe=./bs_${BOARD_TS}_tests_bsim_bluetooth_host_l2cap_stress_prj_syswq_conf
+bsim_exe=./bs_${BOARD_TS}_tests_bsim_bluetooth_host_l2cap_stress_prj_conf_overlay-syswq_conf
 
 cd ${BSIM_OUT_PATH}/bin
 
diff --git a/tests/bsim/bluetooth/host/security/ccc_update/prj_2.conf b/tests/bsim/bluetooth/host/security/ccc_update/overlay-no_lazy_load.conf
similarity index 100%
rename from tests/bsim/bluetooth/host/security/ccc_update/prj_2.conf
rename to tests/bsim/bluetooth/host/security/ccc_update/overlay-no_lazy_load.conf
diff --git a/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update_2.sh b/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update_no_lazy_load.sh
similarity index 97%
rename from tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update_2.sh
rename to tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update_no_lazy_load.sh
index eb165fa85f0..90a089f34a5 100755
--- a/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update_2.sh
+++ b/tests/bsim/bluetooth/host/security/ccc_update/test_scripts/ccc_update_no_lazy_load.sh
@@ -5,7 +5,7 @@
 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
 
 test_name='ccc_update'
-test_exe="bs_${BOARD_TS}_tests_bsim_bluetooth_host_security_${test_name}_prj_2_conf"
+test_exe="bs_${BOARD_TS}_tests_bsim_bluetooth_host_security_${test_name}_overlay-no_lazy_load_conf"
 simulation_id="${test_name}_2"
 verbosity_level=2
 
diff --git a/tests/bsim/bluetooth/host/security/ccc_update/testcase.yaml b/tests/bsim/bluetooth/host/security/ccc_update/testcase.yaml
index 1c3176d268e..909439ab9ab 100644
--- a/tests/bsim/bluetooth/host/security/ccc_update/testcase.yaml
+++ b/tests/bsim/bluetooth/host/security/ccc_update/testcase.yaml
@@ -12,6 +12,6 @@ tests:
       bsim_exe_name: tests_bsim_bluetooth_host_security_ccc_update_prj_conf
   bluetooth.host.security.ccc_update_2:
     harness_config:
-      bsim_exe_name: tests_bsim_bluetooth_host_security_ccc_update_prj_2_conf
+      bsim_exe_name: tests_bsim_bluetooth_host_security_ccc_update_overlay-no_lazy_load_conf
     extra_args:
-      EXTRA_CONF_FILE=prj_2.conf
+      EXTRA_CONF_FILE=overlay-no_lazy_load.conf

From 0e6fbbd6f36eb2f1773691937beb8771fcd3cf45 Mon Sep 17 00:00:00 2001
From: Ahmed Ahmed <ahmed.ahmed@dewinelabs.com>
Date: Fri, 10 Jan 2025 13:46:42 +0100
Subject: [PATCH 2345/2913] [nrf fromtree] bluetooth: host: iterate over
 connections in TX list

Iterate over the list of connections to find a connection
that is able to send data, instead of returning NULL if
the first connection can't send data.

This solves the problem with starvation of other connections.

Signed-off-by: Ahmed Ahmed <ahmed.ahmed@dewinelabs.com>
(cherry picked from commit 099871622af37034cf9c144bfc3ae1e2ab94d76e)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/host/conn.c | 90 ++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 823de605265..e361cf8ce88 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -918,67 +918,67 @@ __maybe_unused static bool dont_have_methods(struct bt_conn *conn)
 
 struct bt_conn *get_conn_ready(void)
 {
-	/* Here we only peek: we pop the conn (and insert it at the back if it
-	 * still has data) after the QoS function returns false.
-	 */
-	sys_snode_t *node  = sys_slist_peek_head(&bt_dev.le.conn_ready);
-
-	if (node == NULL) {
-		return NULL;
-	}
-
-	/* `conn` borrows from the list node. That node is _not_ popped yet.
-	 *
-	 * If we end up not popping that conn off the list, we have to make sure
-	 * to increase the refcount before returning a pointer to that
-	 * connection out of this function.
-	 */
-	struct bt_conn *conn = CONTAINER_OF(node, struct bt_conn, _conn_ready);
+	struct bt_conn *conn, *tmp;
+	sys_snode_t *prev = NULL;
 
 	if (dont_have_viewbufs()) {
-		/* We will get scheduled again when the (view) buffers are freed. If you
-		 * hit this a lot, try increasing `CONFIG_BT_CONN_FRAG_COUNT`
+		/* We will get scheduled again when the (view) buffers are freed. If
+		 * you hit this a lot, try increasing `CONFIG_BT_CONN_FRAG_COUNT`
 		 */
 		LOG_DBG("no view bufs");
 		return NULL;
 	}
 
-	if (cannot_send_to_controller(conn)) {
-		/* We will get scheduled again when the buffers are freed. */
-		LOG_DBG("no LL bufs for %p", conn);
-		return NULL;
-	}
-
-	if (dont_have_tx_context(conn)) {
-		/* We will get scheduled again when TX contexts are available. */
-		LOG_DBG("no TX contexts");
-		return NULL;
-	}
+	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&bt_dev.le.conn_ready, conn, tmp,
+					  _conn_ready) {
+		/* Iterate over the list of connections that have data to send
+		 * and return the first one that can be sent.
+		 */
 
-	CHECKIF(dont_have_methods(conn)) {
-		LOG_DBG("conn %p (type %d) is missing mandatory methods",
-			conn, conn->type);
+		if (cannot_send_to_controller(conn)) {
+			/* When buffers are full, try next connection.
+			 */
+			LOG_DBG("no LL bufs for %p", conn);
+			prev = &conn->_conn_ready;
+			continue;
+		}
 
-		return NULL;
-	}
+		if (dont_have_tx_context(conn)) {
+			/* When TX contexts are not available, try next connection.
+			 */
+			LOG_DBG("no TX contexts for %p", conn);
+			prev = &conn->_conn_ready;
+			continue;
+		}
 
-	if (should_stop_tx(conn)) {
-		/* Move reference off the list and into the `conn` variable. */
-		__maybe_unused sys_snode_t *s = sys_slist_get(&bt_dev.le.conn_ready);
+		CHECKIF(dont_have_methods(conn)) {
+			/* When a connection is missing mandatory methods, try next
+			 * connection.
+			 */
+			LOG_DBG("conn %p (type %d) is missing mandatory methods",
+				conn, conn->type);
+			prev = &conn->_conn_ready;
+			continue;
+		}
 
-		__ASSERT_NO_MSG(s == node);
-		(void)atomic_set(&conn->_conn_ready_lock, 0);
+		if (should_stop_tx(conn)) {
+			/* Move reference off the list */
+			sys_slist_remove(&bt_dev.le.conn_ready, prev, &conn->_conn_ready);
+			(void)atomic_set(&conn->_conn_ready_lock, 0);
+			bt_conn_unref(conn);
 
-		/* Append connection to list if it still has data */
-		if (conn->has_data(conn)) {
-			LOG_DBG("appending %p to back of TX queue", conn);
-			bt_conn_data_ready(conn);
+			/* Append connection to list if it still has data */
+			if (conn->has_data(conn)) {
+				LOG_DBG("appending %p to back of TX queue", conn);
+				bt_conn_data_ready(conn);
+			}
 		}
 
-		return conn;
+		return bt_conn_ref(conn);
 	}
 
-	return bt_conn_ref(conn);
+	/* No connection has data to send */
+	return NULL;
 }
 
 /* Crazy that this file is compiled even if this is not true, but here we are. */

From ba8340a985cbeff5c4a1b637bd21b192305e2e66 Mon Sep 17 00:00:00 2001
From: Ahmed Ahmed <ahmed.ahmed@dewinelabs.com>
Date: Thu, 16 Jan 2025 13:49:00 +0100
Subject: [PATCH 2346/2913] [nrf fromtree] bluetooth: host: add asserts to
 foreach in get_conn_ready

Assert that the previous connection in the list and the tmp element
in the loop are different to the current connection.
Otherwise, if the same connection was somehow added twice it
could result in an infinite loop.

Signed-off-by: Ahmed Ahmed <ahmed.ahmed@dewinelabs.com>
(cherry picked from commit 2edddbddb54e2397f227d7fb43138c815a9fb637)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/host/conn.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index e361cf8ce88..9bb33e327ac 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -922,47 +922,44 @@ struct bt_conn *get_conn_ready(void)
 	sys_snode_t *prev = NULL;
 
 	if (dont_have_viewbufs()) {
-		/* We will get scheduled again when the (view) buffers are freed. If
-		 * you hit this a lot, try increasing `CONFIG_BT_CONN_FRAG_COUNT`
+		/* We will get scheduled again when the (view) buffers are freed. If you
+		 * hit this a lot, try increasing `CONFIG_BT_CONN_FRAG_COUNT`
 		 */
 		LOG_DBG("no view bufs");
 		return NULL;
 	}
 
-	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&bt_dev.le.conn_ready, conn, tmp,
-					  _conn_ready) {
+	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&bt_dev.le.conn_ready, conn, tmp, _conn_ready) {
+		__ASSERT_NO_MSG(tmp != conn);
+
 		/* Iterate over the list of connections that have data to send
 		 * and return the first one that can be sent.
 		 */
 
 		if (cannot_send_to_controller(conn)) {
-			/* When buffers are full, try next connection.
-			 */
+			/* When buffers are full, try next connection. */
 			LOG_DBG("no LL bufs for %p", conn);
 			prev = &conn->_conn_ready;
 			continue;
 		}
 
 		if (dont_have_tx_context(conn)) {
-			/* When TX contexts are not available, try next connection.
-			 */
+			/* When TX contexts are not available, try next connection. */
 			LOG_DBG("no TX contexts for %p", conn);
 			prev = &conn->_conn_ready;
 			continue;
 		}
 
 		CHECKIF(dont_have_methods(conn)) {
-			/* When a connection is missing mandatory methods, try next
-			 * connection.
-			 */
-			LOG_DBG("conn %p (type %d) is missing mandatory methods",
-				conn, conn->type);
+			/* When a connection is missing mandatory methods, try next connection. */
+			LOG_DBG("conn %p (type %d) is missing mandatory methods", conn, conn->type);
 			prev = &conn->_conn_ready;
 			continue;
 		}
 
 		if (should_stop_tx(conn)) {
 			/* Move reference off the list */
+			__ASSERT_NO_MSG(prev != &conn->_conn_ready);
 			sys_slist_remove(&bt_dev.le.conn_ready, prev, &conn->_conn_ready);
 			(void)atomic_set(&conn->_conn_ready_lock, 0);
 			bt_conn_unref(conn);

From e17bbfa17bc21b0661badcc30e202025cba976a5 Mon Sep 17 00:00:00 2001
From: Ahmed Ahmed <ahmed.ahmed@dewinelabs.com>
Date: Thu, 16 Jan 2025 13:53:52 +0100
Subject: [PATCH 2347/2913] [nrf fromtree] bluetooth: host: fix connection
 reference before returning

As the connection was removed from the list, we now own its reference.
Keep this reference and return it to the TX processor.

Signed-off-by: Ahmed Ahmed <ahmed.ahmed@dewinelabs.com>
(cherry picked from commit 6a45e17b4ba73ceeeab4478d2def0b82d9b8cd5d)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/host/conn.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 9bb33e327ac..40d91c3e8d6 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -962,13 +962,14 @@ struct bt_conn *get_conn_ready(void)
 			__ASSERT_NO_MSG(prev != &conn->_conn_ready);
 			sys_slist_remove(&bt_dev.le.conn_ready, prev, &conn->_conn_ready);
 			(void)atomic_set(&conn->_conn_ready_lock, 0);
-			bt_conn_unref(conn);
 
 			/* Append connection to list if it still has data */
 			if (conn->has_data(conn)) {
 				LOG_DBG("appending %p to back of TX queue", conn);
 				bt_conn_data_ready(conn);
 			}
+
+			return conn;
 		}
 
 		return bt_conn_ref(conn);

From 8d51afb9d000c988386f779d48ea70c41b435956 Mon Sep 17 00:00:00 2001
From: Lingao Meng <menglingao@xiaomi.com>
Date: Tue, 14 Jan 2025 09:54:13 +0800
Subject: [PATCH 2348/2913] [nrf fromtree] Bluetooth: Mesh: Fix Assert in
 bt_mesh_adv_unref when messages to a proxy

Fixes:https://github.com/zephyrproject-rtos/zephyr/issues/83904

This solution fix is to define a separate variable for the each proxy FIFO.

Signed-off-by: Lingao Meng <menglingao@xiaomi.com>
(cherry picked from commit 6371080406eb0b621f7327be77d880d9d707800b)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/mesh/adv.h       |  6 +++++-
 subsys/bluetooth/mesh/proxy_msg.c | 24 +++++++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/subsys/bluetooth/mesh/adv.h b/subsys/bluetooth/mesh/adv.h
index 563a2118b71..2db83d59211 100644
--- a/subsys/bluetooth/mesh/adv.h
+++ b/subsys/bluetooth/mesh/adv.h
@@ -58,7 +58,11 @@ struct bt_mesh_adv_ctx {
 };
 
 struct bt_mesh_adv {
-	sys_snode_t node;
+	void *adv_bearer;
+
+#if defined(CONFIG_BT_MESH_GATT)
+	void *gatt_bearer[CONFIG_BT_MAX_CONN];
+#endif
 
 	struct bt_mesh_adv_ctx ctx;
 
diff --git a/subsys/bluetooth/mesh/proxy_msg.c b/subsys/bluetooth/mesh/proxy_msg.c
index edee3ad384c..a4d8c8c14b2 100644
--- a/subsys/bluetooth/mesh/proxy_msg.c
+++ b/subsys/bluetooth/mesh/proxy_msg.c
@@ -56,6 +56,24 @@ static struct bt_mesh_proxy_role roles[CONFIG_BT_MAX_CONN];
 
 static int conn_count;
 
+static void proxy_queue_put(struct bt_mesh_proxy_role *role, struct bt_mesh_adv *adv)
+{
+	k_fifo_put(&role->pending, &(adv->gatt_bearer[bt_conn_index(role->conn)]));
+}
+
+static struct bt_mesh_adv *proxy_queue_get(struct bt_mesh_proxy_role *role)
+{
+	void *gatt_bearer;
+
+	gatt_bearer = k_fifo_get(&role->pending, K_NO_WAIT);
+	if (!gatt_bearer) {
+		return NULL;
+	}
+
+	return CONTAINER_OF(gatt_bearer, struct bt_mesh_adv,
+			    gatt_bearer[bt_conn_index(role->conn)]);
+}
+
 static void proxy_sar_timeout(struct k_work *work)
 {
 	struct bt_mesh_proxy_role *role;
@@ -66,7 +84,7 @@ static void proxy_sar_timeout(struct k_work *work)
 	role = CONTAINER_OF(dwork, struct bt_mesh_proxy_role, sar_timer);
 
 	while (!k_fifo_is_empty(&role->pending)) {
-		struct bt_mesh_adv *adv = k_fifo_get(&role->pending, K_NO_WAIT);
+		struct bt_mesh_adv *adv = proxy_queue_get(role);
 
 		__ASSERT_NO_MSG(adv);
 
@@ -243,7 +261,7 @@ int bt_mesh_proxy_relay_send(struct bt_conn *conn, struct bt_mesh_adv *adv)
 {
 	struct bt_mesh_proxy_role *role = &roles[bt_conn_index(conn)];
 
-	k_fifo_put(&role->pending, bt_mesh_adv_ref(adv));
+	proxy_queue_put(role, bt_mesh_adv_ref(adv));
 
 	bt_mesh_wq_submit(&role->work);
 
@@ -259,7 +277,7 @@ static void proxy_msg_send_pending(struct k_work *work)
 		return;
 	}
 
-	adv = k_fifo_get(&role->pending, K_NO_WAIT);
+	adv = proxy_queue_get(role);
 	if (!adv) {
 		return;
 	}

From 98c266e4ebf906c237c3cf4eefd098deec1d8c5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5vard=20Reierstad?= <haavard.reierstad@nordicsemi.no>
Date: Wed, 15 Jan 2025 12:30:27 +0100
Subject: [PATCH 2349/2913] [nrf fromtree] Bluetooth: Host: bsim: Refactor
 common files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit deals mainly with bsim tests which have `common.c/h` files.
It does the following changes:
* Use functionality from the `babbelkit` library for common functions
  related to flags, test progression (failing, passing etc.) and
  synchronization between two devices. Locally defined equivalents are
  removed.
* Remove the `common.c/h` containing only functionality that is provided
  by the `babblekit` library.
* Remove the `test_pre_init_f` and `test_tick_f` functions (commonly
  implemented as `test_init` and `test_tick`) from the modified tests.
  These functions are not needed as they were only used to fail the test
  if a device didn't complete the test within a certain time frame. This
  is already handled by the `sim_length` argument used in the test
  scripts.
* Changes use of `atol` to `strtol` as the prior is against Zephyr
  coding guidelines.

Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit fe923670a9ee60487cb921c69e08e2fcaec2befa)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 .../encrypted/css_sample_data/CMakeLists.txt  |   3 +
 .../encrypted/css_sample_data/src/central.c   |  21 ++--
 .../encrypted/css_sample_data/src/common.h    |  23 ----
 .../adv/encrypted/css_sample_data/src/main.c  |  26 -----
 .../css_sample_data/src/peripheral.c          |  23 ++--
 .../css_sample_data/test_scripts/run_tests.sh |   4 +-
 .../host/adv/extended/CMakeLists.txt          |   6 +-
 .../bluetooth/host/adv/extended/src/common.c  |  24 ----
 .../bluetooth/host/adv/extended/src/common.h  |  53 ---------
 .../adv/extended/src/ext_adv_advertiser.c     |  32 ++----
 .../host/adv/extended/src/ext_adv_scanner.c   |  39 +++----
 .../host/adv/periodic/CMakeLists.txt          |   3 +
 .../bluetooth/host/adv/periodic/src/common.c  |  15 ---
 .../bluetooth/host/adv/periodic/src/common.h  |  45 +-------
 .../adv/periodic/src/per_adv_advertiser.c     |  44 +++-----
 .../host/adv/periodic/src/per_adv_sync.c      |  72 ++++++------
 .../adv/periodic/tests_scripts/per_adv.sh     |   2 +-
 .../tests_scripts/per_adv_app_not_scanning.sh |   2 +-
 .../per_adv_app_not_scanning_coded.sh         |   2 +-
 .../periodic/tests_scripts/per_adv_conn.sh    |   2 +-
 .../tests_scripts/per_adv_conn_privacy.sh     |   2 +-
 .../tests_scripts/per_adv_long_data.sh        |   2 +-
 .../bluetooth/host/att/eatt/CMakeLists.txt    |   2 +
 .../bsim/bluetooth/host/att/eatt/src/common.c |  79 ++-----------
 .../bsim/bluetooth/host/att/eatt/src/common.h |  31 ------
 .../host/att/eatt/src/main_autoconnect.c      |   9 +-
 .../host/att/eatt/src/main_collision.c        |  26 ++---
 .../bluetooth/host/att/eatt/src/main_lowres.c |   9 +-
 .../host/att/eatt/src/main_reconfigure.c      |  35 +++---
 .../att/eatt/tests_scripts/autoconnect.sh     |   2 +-
 .../host/att/eatt/tests_scripts/collision.sh  |   2 +-
 .../host/att/eatt/tests_scripts/lowres.sh     |   2 +-
 .../att/eatt/tests_scripts/multiple_conn.sh   |   2 +-
 .../host/att/eatt_notif/CMakeLists.txt        |   3 +
 .../host/att/eatt_notif/src/client_test.c     |  47 ++++----
 .../host/att/eatt_notif/src/common.c          |  67 -----------
 .../host/att/eatt_notif/src/common.h          |  53 ---------
 .../host/att/eatt_notif/src/server_test.c     |  42 ++++---
 .../att/eatt_notif/test_scripts/eatt_notif.sh |   2 +-
 .../host/gatt/authorization/CMakeLists.txt    |   3 +
 .../host/gatt/authorization/src/common.c      |  20 ----
 .../host/gatt/authorization/src/common.h      |  44 --------
 .../gatt/authorization/src/gatt_client_test.c |  54 +++++----
 .../gatt/authorization/src/gatt_server_test.c |  33 ++++--
 .../gatt/authorization/test_scripts/gatt.sh   |   2 +-
 .../host/gatt/caching/CMakeLists.txt          |   3 +
 .../bluetooth/host/gatt/caching/src/common.c  |  66 -----------
 .../bluetooth/host/gatt/caching/src/common.h  |  50 ---------
 .../host/gatt/caching/src/gatt_client_test.c  | 105 +++++++++---------
 .../host/gatt/caching/src/gatt_server_test.c  |  43 ++++---
 .../host/gatt/ccc_store/CMakeLists.txt        |   4 +-
 .../host/gatt/ccc_store/src/central.c         |  73 +++++-------
 .../host/gatt/ccc_store/src/common.c          |  38 -------
 .../host/gatt/ccc_store/src/common.h          |  39 -------
 .../bluetooth/host/gatt/ccc_store/src/main.c  |  41 +------
 .../host/gatt/ccc_store/src/peripheral.c      |  63 ++++-------
 .../host/gatt/general/CMakeLists.txt          |   3 +
 .../bluetooth/host/gatt/general/src/common.c  |  20 ----
 .../bluetooth/host/gatt/general/src/common.h  |  44 --------
 .../host/gatt/general/src/gatt_client_test.c  |  68 +++++++-----
 .../host/gatt/general/src/gatt_server_test.c  |  28 +++--
 .../host/gatt/general/test_scripts/gatt.sh    |   2 +-
 .../bluetooth/host/gatt/notify/CMakeLists.txt |   3 +
 .../bluetooth/host/gatt/notify/src/common.c   |  20 ----
 .../bluetooth/host/gatt/notify/src/common.h   |  44 +-------
 .../host/gatt/notify/src/gatt_client_test.c   |  74 ++++++------
 .../host/gatt/notify/src/gatt_server_test.c   |  46 ++++----
 .../bluetooth/host/gatt/settings/src/main.c   |   5 +-
 .../bluetooth/host/iso/bis/CMakeLists.txt     |   1 -
 .../host/iso/bis/src/bis_broadcaster.c        |   7 --
 .../bluetooth/host/iso/bis/src/bis_receiver.c |   3 -
 .../bsim/bluetooth/host/iso/bis/src/common.c  |  31 ------
 .../bsim/bluetooth/host/iso/bis/src/common.h  |  16 ---
 .../bluetooth/host/iso/cis/CMakeLists.txt     |   3 +
 .../bluetooth/host/iso/cis/src/cis_central.c  |  59 +++++-----
 .../host/iso/cis/src/cis_peripheral.c         |  20 ++--
 .../bsim/bluetooth/host/iso/cis/src/common.c  |  17 +--
 .../bsim/bluetooth/host/iso/cis/src/common.h  |  34 ------
 .../host/l2cap/credits/CMakeLists.txt         |   3 +
 .../bluetooth/host/l2cap/credits/src/common.c |  22 ----
 .../bluetooth/host/l2cap/credits/src/common.h |  57 ----------
 .../bluetooth/host/l2cap/credits/src/main.c   |  64 ++++++-----
 .../l2cap/credits_seg_recv/CMakeLists.txt     |   4 +-
 .../host/l2cap/credits_seg_recv/src/common.c  |  22 ----
 .../host/l2cap/credits_seg_recv/src/common.h  |  57 ----------
 .../host/l2cap/credits_seg_recv/src/main.c    |  67 ++++++-----
 .../host/l2cap/general/CMakeLists.txt         |   3 +
 .../bluetooth/host/l2cap/general/src/common.c |  68 ------------
 .../bluetooth/host/l2cap/general/src/common.h |  59 ----------
 .../host/l2cap/general/src/main_l2cap_ecred.c |  89 ++++++++-------
 .../host/l2cap/many_conns/CMakeLists.txt      |   3 +
 .../host/l2cap/many_conns/src/common.c        |  22 ----
 .../host/l2cap/many_conns/src/common.h        |  57 ----------
 .../host/l2cap/many_conns/src/main.c          |  67 +++++------
 .../host/l2cap/send_on_connect/CMakeLists.txt |   4 +-
 .../host/l2cap/send_on_connect/src/common.c   |  22 ----
 .../host/l2cap/send_on_connect/src/common.h   |  44 --------
 .../src/main_l2cap_send_on_connect.c          |  62 +++++------
 .../host/l2cap/stress/CMakeLists.txt          |   3 +
 .../bluetooth/host/l2cap/stress/src/common.c  |  22 ----
 .../bluetooth/host/l2cap/stress/src/common.h  |  57 ----------
 .../bluetooth/host/l2cap/stress/src/main.c    |  62 ++++++-----
 .../host/l2cap/userdata/CMakeLists.txt        |   3 +
 .../host/l2cap/userdata/src/common.c          |  22 ----
 .../host/l2cap/userdata/src/common.h          |  44 --------
 .../l2cap/userdata/src/main_l2cap_userdata.c  |  61 +++++-----
 .../host/misc/conn_stress/central/src/main.c  |   4 +-
 .../misc/conn_stress/peripheral/src/main.c    |   2 +-
 .../host/misc/disable/CMakeLists.txt          |   2 +
 .../bluetooth/host/misc/disable/src/common.c  |  20 ----
 .../bluetooth/host/misc/disable/src/common.h  |  48 --------
 .../host/misc/disable/src/gatt_client_test.c  |  61 +++++-----
 .../host/misc/disable/src/gatt_server_test.c  |  28 +++--
 .../host/misc/disable/src/main_disable.c      |  30 ++---
 .../misc/unregister_conn_cb/CMakeLists.txt    |   3 +
 .../host/misc/unregister_conn_cb/src/common.c |  20 ----
 .../host/misc/unregister_conn_cb/src/common.h |  55 ---------
 .../host/misc/unregister_conn_cb/src/main.c   |  47 ++++----
 .../host/security/ccc_update/CMakeLists.txt   |   3 +
 .../host/security/ccc_update/src/central.c    |  48 ++++----
 .../host/security/ccc_update/src/common.h     |  24 ----
 .../host/security/ccc_update/src/main.c       |  41 -------
 .../host/security/ccc_update/src/peripheral.c |  40 +++----
 123 files changed, 1013 insertions(+), 2620 deletions(-)
 delete mode 100644 tests/bsim/bluetooth/host/adv/extended/src/common.c
 delete mode 100644 tests/bsim/bluetooth/host/adv/extended/src/common.h
 delete mode 100644 tests/bsim/bluetooth/host/att/eatt_notif/src/common.c
 delete mode 100644 tests/bsim/bluetooth/host/gatt/authorization/src/common.c
 delete mode 100644 tests/bsim/bluetooth/host/gatt/caching/src/common.c
 delete mode 100644 tests/bsim/bluetooth/host/gatt/ccc_store/src/common.c
 delete mode 100644 tests/bsim/bluetooth/host/gatt/general/src/common.c
 delete mode 100644 tests/bsim/bluetooth/host/gatt/notify/src/common.c
 delete mode 100644 tests/bsim/bluetooth/host/iso/bis/src/common.c
 delete mode 100644 tests/bsim/bluetooth/host/iso/bis/src/common.h
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/credits/src/common.c
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/credits/src/common.h
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/credits_seg_recv/src/common.c
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/credits_seg_recv/src/common.h
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/general/src/common.c
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/general/src/common.h
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/many_conns/src/common.c
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/many_conns/src/common.h
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/send_on_connect/src/common.c
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/send_on_connect/src/common.h
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/stress/src/common.c
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/stress/src/common.h
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/userdata/src/common.c
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/userdata/src/common.h
 delete mode 100644 tests/bsim/bluetooth/host/misc/disable/src/common.c
 delete mode 100644 tests/bsim/bluetooth/host/misc/unregister_conn_cb/src/common.c
 delete mode 100644 tests/bsim/bluetooth/host/misc/unregister_conn_cb/src/common.h

diff --git a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/CMakeLists.txt b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/CMakeLists.txt
index 5a644c12fe1..c60770f9811 100644
--- a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_ead_css_sample_data)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
         src/main.c
         src/common.c
diff --git a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/src/central.c b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/src/central.c
index ee2fa5d3da8..9a5d699806b 100644
--- a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/src/central.c
+++ b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/src/central.c
@@ -2,6 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "babblekit/testcase.h"
 #include "common.h"
 
 extern const struct test_sample_data *sample_data;
@@ -19,9 +20,8 @@ static bool data_parse_cb(struct bt_data *data, void *user_data)
 		if (decrypted_data_size != sample_data->size_ad_data) {
 			LOG_ERR("Size of decrypted data: %d", decrypted_data_size);
 			LOG_ERR("Size of sample data: %d", sample_data->size_ad_data);
-			FAIL("Computed size of data does not match the size of the data from the "
-			     "sample. (data set %d)\n",
-			     data_set);
+			TEST_FAIL("Computed size of data does not match the size of the data from "
+				  "the sample. (data set %d)", data_set);
 		}
 
 		if (memcmp(sample_data->randomizer_little_endian, data->data,
@@ -31,7 +31,7 @@ static bool data_parse_cb(struct bt_data *data, void *user_data)
 			LOG_ERR("Expected Randomizer from sample: %s",
 				bt_hex(sample_data->randomizer_little_endian,
 				       BT_EAD_RANDOMIZER_SIZE));
-			FAIL("Received Randomizer does not match the expected one.\n");
+			TEST_FAIL("Received Randomizer does not match the expected one.");
 		}
 
 		net_buf_simple_init_with_data(&decrypted_buf, decrypted_payload,
@@ -40,22 +40,21 @@ static bool data_parse_cb(struct bt_data *data, void *user_data)
 		err = bt_ead_decrypt(sample_data->session_key, sample_data->iv, data->data,
 				     data->data_len, decrypted_buf.data);
 		if (err != 0) {
-			FAIL("Error during decryption.\n");
+			TEST_FAIL("Error during decryption.");
 		} else if (memcmp(decrypted_buf.data, sample_data->ad_data, decrypted_data_size)) {
 			LOG_HEXDUMP_ERR(decrypted_buf.data, decrypted_data_size,
 					"Decrypted data from bt_ead_decrypt:");
 			LOG_HEXDUMP_ERR(sample_data->ad_data, sample_data->size_ad_data,
 					"Expected data from sample:");
-			FAIL("Decrypted AD data does not match expected sample data. (data set "
-			     "%d)\n",
-			     data_set);
+			TEST_FAIL("Decrypted AD data does not match expected sample data. (data set"
+				  " %d)", data_set);
 		}
 
 		LOG_HEXDUMP_DBG(decrypted_buf.data, decrypted_data_size, "Raw decrypted data: ");
 
 		bt_data_parse(&decrypted_buf, &data_parse_cb, NULL);
 
-		PASS("Central test passed. (data set %d)\n", data_set);
+		TEST_PASS("Central test passed. (data set %d)", data_set);
 
 		return false;
 	}
@@ -86,7 +85,7 @@ static void start_scan(void)
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
 	if (err) {
-		FAIL("Scanning failed to start (err %d)\n", err);
+		TEST_FAIL("Scanning failed to start (err %d)", err);
 	}
 
 	LOG_DBG("Scanning successfully started");
@@ -100,7 +99,7 @@ void test_central(void)
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 	}
 
 	LOG_DBG("Bluetooth initialized");
diff --git a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/src/common.h b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/src/common.h
index 91a5ff325bb..96769b64b57 100644
--- a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/src/common.h
+++ b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/src/common.h
@@ -46,29 +46,6 @@ int bt_test_ead_encrypt(const uint8_t session_key[BT_EAD_KEY_SIZE],
 			const uint8_t randomizer[BT_EAD_RANDOMIZER_SIZE], const uint8_t *payload,
 			size_t payload_size, uint8_t *encrypted_payload);
 
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-extern enum bst_result_t bst_result;
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)	  (void)atomic_set(&flag, (atomic_t) true)
-#define GET_FLAG(flag)	  (bool)atomic_get(&flag)
-#define UNSET_FLAG(flag)  (void)atomic_set(&flag, (atomic_t) false)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-
 LOG_MODULE_DECLARE(bt_bsim_ead_sample_data, CONFIG_BT_EAD_LOG_LEVEL);
 
 struct test_sample_data {
diff --git a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/src/main.c b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/src/main.c
index cb9925179d6..9175d9d82b3 100644
--- a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/src/main.c
+++ b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/src/main.c
@@ -2,51 +2,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bs_types.h"
-#include "bs_tracing.h"
 #include "bstests.h"
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_bsim_ead_sample_data, CONFIG_BT_EAD_LOG_LEVEL);
 
-extern enum bst_result_t bst_result;
-
-#define WAIT_TIME_S 20
-#define WAIT_TIME   (WAIT_TIME_S * 1e6)
-
 extern void test_central(void);
 extern void test_peripheral(void);
 extern void test_args_parse(int argc, char *argv[]);
 
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error_time_line("Test failed (not passed after %d seconds)\n",
-					 WAIT_TIME_S);
-	}
-}
-
-static void test_ead_sample_data_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-	bst_result = In_progress;
-}
-
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "central",
 		.test_descr = "Central device",
-		.test_pre_init_f = test_ead_sample_data_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_central,
 		.test_args_f = test_args_parse,
 	},
 	{
 		.test_id = "peripheral",
 		.test_descr = "Peripheral device",
-		.test_pre_init_f = test_ead_sample_data_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_peripheral,
 		.test_args_f = test_args_parse,
 	},
diff --git a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/src/peripheral.c b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/src/peripheral.c
index 41362a54789..f6dc1418bce 100644
--- a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/src/peripheral.c
@@ -2,6 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "babblekit/testcase.h"
 #include "common.h"
 
 extern const struct test_sample_data *sample_data;
@@ -25,7 +26,7 @@ static void create_adv(struct bt_le_ext_adv **adv)
 
 	err = bt_le_ext_adv_create(&params, NULL, adv);
 	if (err) {
-		FAIL("Failed to create advertiser (%d)\n", err);
+		TEST_FAIL("Failed to create advertiser (%d)", err);
 	}
 }
 
@@ -42,7 +43,7 @@ static void start_adv(struct bt_le_ext_adv *adv)
 
 	err = bt_le_ext_adv_start(adv, &start_params);
 	if (err) {
-		FAIL("Failed to start advertiser (%d)\n", err);
+		TEST_FAIL("Failed to start advertiser (%d)", err);
 	}
 
 	LOG_DBG("Advertiser started");
@@ -60,23 +61,21 @@ static void set_ad_data(struct bt_le_ext_adv *adv)
 	if (size_ead != sample_data->size_ead) {
 		LOG_ERR("Size of ead: %zu\n", size_ead);
 		LOG_ERR("Size of sample_ead: %zu", sample_data->size_ead);
-		FAIL("Computed size of encrypted data does not match the size of the encrypted "
-		     "data from the sample. (data set %d)\n",
-		     data_set);
+		TEST_FAIL("Computed size of encrypted data does not match the size of the encrypted"
+			  " data from the sample. (data set %d)", data_set);
 	}
 
 	err = bt_test_ead_encrypt(sample_data->session_key, sample_data->iv,
 				  sample_data->randomizer_little_endian, sample_data->ad_data,
 				  size_ad_data, ead);
 	if (err != 0) {
-		FAIL("Error during encryption.\n");
+		TEST_FAIL("Error during encryption.");
 	} else if (memcmp(ead, sample_data->ead, sample_data->size_ead) != 0) {
 		LOG_HEXDUMP_ERR(ead, size_ead, "Encrypted data from bt_ead_encrypt:");
 		LOG_HEXDUMP_ERR(sample_data->ead, sample_data->size_ead,
 				"Encrypted data from sample:");
-		FAIL("Encrypted AD data does not match the ones provided in the sample. (data set "
-		     "%d)\n",
-		     data_set);
+		TEST_FAIL("Encrypted AD data does not match the ones provided in the sample. (data"
+			  " set %d)", data_set);
 	}
 
 	LOG_HEXDUMP_DBG(ead, size_ead, "Encrypted data:");
@@ -87,10 +86,10 @@ static void set_ad_data(struct bt_le_ext_adv *adv)
 
 	err = bt_le_ext_adv_set_data(adv, &ead_struct, 1, NULL, 0);
 	if (err) {
-		FAIL("Failed to set advertising data (%d)\n", err);
+		TEST_FAIL("Failed to set advertising data (%d)", err);
 	}
 
-	PASS("Peripheral test passed. (data set %d)\n", data_set);
+	TEST_PASS("Peripheral test passed. (data set %d)", data_set);
 }
 
 void test_peripheral(void)
@@ -102,7 +101,7 @@ void test_peripheral(void)
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 	}
 
 	LOG_DBG("Bluetooth initialized");
diff --git a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/test_scripts/run_tests.sh b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/test_scripts/run_tests.sh
index 0ac5936aaa3..4bde3f3f740 100755
--- a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/test_scripts/run_tests.sh
+++ b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/test_scripts/run_tests.sh
@@ -21,7 +21,7 @@ Execute ./"$test_exe" \
     -RealEncryption=1 -argstest data-set="${data_set}"
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s="${simulation_id}_${data_set}" \
-    -D=2 -sim_length=60e6 $@
+    -D=2 -sim_length=20e6 $@
 
 wait_for_background_jobs
 
@@ -36,6 +36,6 @@ Execute ./"$test_exe" \
     -RealEncryption=1 -argstest data-set="${data_set}"
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s="${simulation_id}_${data_set}" \
-    -D=2 -sim_length=60e6 $@
+    -D=2 -sim_length=20e6 $@
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/adv/extended/CMakeLists.txt b/tests/bsim/bluetooth/host/adv/extended/CMakeLists.txt
index 1eeaba1207e..0ad660d9958 100644
--- a/tests/bsim/bluetooth/host/adv/extended/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/adv/extended/CMakeLists.txt
@@ -6,10 +6,8 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_ext_adv)
 
-target_sources(app PRIVATE
-    src/common.c
-)
-
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
 
 target_sources_ifdef(CONFIG_BT_CENTRAL app PRIVATE
     src/ext_adv_scanner.c
diff --git a/tests/bsim/bluetooth/host/adv/extended/src/common.c b/tests/bsim/bluetooth/host/adv/extended/src/common.c
deleted file mode 100644
index 6de9aee1de9..00000000000
--- a/tests/bsim/bluetooth/host/adv/extended/src/common.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) 2024 Croxel, Inc.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include "bstests.h"
-#include "common.h"
-
-extern enum bst_result_t bst_result;
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("test failed (not passed after %i seconds)\n", WAIT_SECONDS);
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-	bst_result = In_progress;
-}
diff --git a/tests/bsim/bluetooth/host/adv/extended/src/common.h b/tests/bsim/bluetooth/host/adv/extended/src/common.h
deleted file mode 100644
index 658613892e1..00000000000
--- a/tests/bsim/bluetooth/host/adv/extended/src/common.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright (c) 2024 Croxel, Inc.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_TEST_BSIM_BT_EXT_ADV_TEST_
-#define ZEPHYR_TEST_BSIM_BT_EXT_ADV_TEST_
-
-#include <zephyr/kernel.h>
-
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "time_machine.h"
-#include "bstests.h"
-
-#define WAIT_SECONDS 30                         /* seconds */
-#define WAIT_TIME (WAIT_SECONDS * USEC_PER_SEC) /* microseconds*/
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t)false
-#define SET_FLAG(flag)	   (void)atomic_set(&flag, (atomic_t) true)
-#define TEST_FLAG(flag)    (atomic_get(&flag) == (atomic_t)true)
-#define UNSET_FLAG(flag)   (void)atomic_set(&flag, (atomic_t) false)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)                                                                  \
-	while ((bool)atomic_get(&flag)) {                                                          \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define TAKE_FLAG(flag)                                                                            \
-	while (!(bool)atomic_cas(&flag, true, false)) {                                            \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-
-
-#define FAIL(...) \
-	do { \
-		bst_result = Failed; \
-		bs_trace_error_time_line(__VA_ARGS__); \
-	} while (0)
-
-#define PASS(...) \
-	do { \
-		bst_result = Passed; \
-		bs_trace_info_time(1, "PASSED: " __VA_ARGS__); \
-	} while (0)
-
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
-
-#endif /* ZEPHYR_TEST_BSIM_BT_EXT_ADV_TEST_ */
diff --git a/tests/bsim/bluetooth/host/adv/extended/src/ext_adv_advertiser.c b/tests/bsim/bluetooth/host/adv/extended/src/ext_adv_advertiser.c
index a146107efa8..492b26b106e 100644
--- a/tests/bsim/bluetooth/host/adv/extended/src/ext_adv_advertiser.c
+++ b/tests/bsim/bluetooth/host/adv/extended/src/ext_adv_advertiser.c
@@ -5,12 +5,8 @@
  */
 #include <zephyr/kernel.h>
 
-#include "common.h"
-
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "time_machine.h"
-#include "bstests.h"
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 #include <zephyr/types.h>
 #include <zephyr/sys/printk.h>
@@ -22,8 +18,8 @@ extern enum bst_result_t bst_result;
 
 static struct bt_conn *g_conn;
 
-CREATE_FLAG(flag_connected);
-CREATE_FLAG(flag_conn_recycled);
+static DEFINE_FLAG(flag_connected);
+static DEFINE_FLAG(flag_conn_recycled);
 
 static void common_init(void)
 {
@@ -32,7 +28,7 @@ static void common_init(void)
 	err = bt_enable(NULL);
 
 	if (err) {
-		FAIL("Bluetooth init failed: %d\n", err);
+		TEST_FAIL("Bluetooth init failed: %d", err);
 		return;
 	}
 	printk("Bluetooth initialized\n");
@@ -103,7 +99,7 @@ static void disconnect_from_target(void)
 
 	err = bt_conn_disconnect(g_conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
 	if (err) {
-		FAIL("BT Disconnect failed: %d\n", err);
+		TEST_FAIL("BT Disconnect failed: %d", err);
 		return;
 	}
 }
@@ -115,13 +111,13 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != BT_HCI_ERR_SUCCESS) {
-		FAIL("Failed to connect to %s: %u\n", addr, err);
+		TEST_FAIL("Failed to connect to %s: %u", addr, err);
 		return;
 	}
 
 	printk("Connected to %s\n", addr);
 	if (g_conn != NULL) {
-		FAIL("Attempt to override connection object without clean-up\n");
+		TEST_FAIL("Attempt to override connection object without clean-up");
 		return;
 	}
 	g_conn = bt_conn_ref(conn);
@@ -182,7 +178,7 @@ static void main_ext_adv_advertiser(void)
 
 	ext_adv = NULL;
 
-	PASS("Extended advertiser passed\n");
+	TEST_PASS("Extended advertiser passed");
 }
 
 static void adv_connect_and_disconnect_cycle(void)
@@ -228,7 +224,7 @@ static void main_ext_conn_adv_advertiser(void)
 
 	ext_adv = NULL;
 
-	PASS("Extended advertiser passed\n");
+	TEST_PASS("Extended advertiser passed");
 }
 
 static void main_ext_conn_adv_advertiser_x5(void)
@@ -252,7 +248,7 @@ static void main_ext_conn_adv_advertiser_x5(void)
 	delete_adv_set(ext_adv);
 	ext_adv = NULL;
 
-	PASS("Extended advertiser passed\n");
+	TEST_PASS("Extended advertiser passed");
 }
 
 static const struct bst_test_instance ext_adv_advertiser[] = {
@@ -260,16 +256,12 @@ static const struct bst_test_instance ext_adv_advertiser[] = {
 		.test_id = "ext_adv_advertiser",
 		.test_descr = "Basic extended advertising test. "
 			      "Will just start extended advertising.",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = main_ext_adv_advertiser
 	},
 	{
 		.test_id = "ext_adv_conn_advertiser",
 		.test_descr = "Basic connectable extended advertising test. "
 			      "Starts extended advertising, and restarts it after disconnecting",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = main_ext_conn_adv_advertiser
 	},
 	{
@@ -277,8 +269,6 @@ static const struct bst_test_instance ext_adv_advertiser[] = {
 		.test_descr = "Basic connectable extended advertising test. "
 			      "Starts extended advertising, and restarts it after disconnecting, "
 			      "repeated over 5 times",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = main_ext_conn_adv_advertiser_x5
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/adv/extended/src/ext_adv_scanner.c b/tests/bsim/bluetooth/host/adv/extended/src/ext_adv_scanner.c
index b4cd0691afe..231b344ca0f 100644
--- a/tests/bsim/bluetooth/host/adv/extended/src/ext_adv_scanner.c
+++ b/tests/bsim/bluetooth/host/adv/extended/src/ext_adv_scanner.c
@@ -5,12 +5,8 @@
  */
 #include <zephyr/kernel.h>
 
-#include "common.h"
-
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "time_machine.h"
-#include "bstests.h"
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 #include <zephyr/types.h>
 #include <zephyr/sys/printk.h>
@@ -22,9 +18,9 @@ extern enum bst_result_t bst_result;
 
 static struct bt_conn *g_conn;
 
-CREATE_FLAG(flag_ext_adv_seen);
-CREATE_FLAG(flag_connected);
-CREATE_FLAG(flag_conn_recycled);
+static DEFINE_FLAG(flag_ext_adv_seen);
+static DEFINE_FLAG(flag_connected);
+static DEFINE_FLAG(flag_conn_recycled);
 
 static void connected(struct bt_conn *conn, uint8_t err)
 {
@@ -33,7 +29,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != BT_HCI_ERR_SUCCESS) {
-		FAIL("Failed to connect to %s: %u\n", addr, err);
+		TEST_FAIL("Failed to connect to %s: %u", addr, err);
 		bt_conn_unref(g_conn);
 		g_conn = NULL;
 		return;
@@ -93,21 +89,20 @@ static void scan_recv(const struct bt_le_scan_recv_info *info,
 		SET_FLAG(flag_ext_adv_seen);
 	}
 
-	if (!TEST_FLAG(flag_connected) &&
-	    info->adv_props & BT_GAP_ADV_PROP_CONNECTABLE) {
+	if (!IS_FLAG_SET(flag_connected) && info->adv_props & BT_GAP_ADV_PROP_CONNECTABLE) {
 		int err;
 
 		printk("Stopping scan\n");
 		err = bt_le_scan_stop();
 		if (err) {
-			FAIL("Failed to stop scan: %d", err);
+			TEST_FAIL("Failed to stop scan: %d", err);
 			return;
 		}
 
 		err = bt_conn_le_create(info->addr, BT_CONN_LE_CREATE_CONN,
 					BT_LE_CONN_PARAM_DEFAULT, &g_conn);
 		if (err) {
-			FAIL("Could not connect to peer: %d", err);
+			TEST_FAIL("Could not connect to peer: %d", err);
 			return;
 		}
 	}
@@ -124,7 +119,7 @@ static void common_init(void)
 	err = bt_enable(NULL);
 
 	if (err) {
-		FAIL("Bluetooth init failed: %d\n", err);
+		TEST_FAIL("Bluetooth init failed: %d", err);
 		return;
 	}
 
@@ -141,7 +136,7 @@ static void start_scan(void)
 	printk("Start scanning...");
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, NULL);
 	if (err) {
-		FAIL("Failed to start scan: %d\n", err);
+		TEST_FAIL("Failed to start scan: %d", err);
 		return;
 	}
 	printk("done.\n");
@@ -156,7 +151,7 @@ static void main_ext_adv_scanner(void)
 
 	WAIT_FOR_FLAG(flag_ext_adv_seen);
 
-	PASS("Extended adv scanner passed\n");
+	TEST_PASS("Extended adv scanner passed");
 }
 
 static void scan_connect_and_disconnect_cycle(void)
@@ -191,7 +186,7 @@ static void main_ext_adv_conn_scanner(void)
 	printk("Waiting to extended advertisements (again)...\n");
 	WAIT_FOR_FLAG(flag_ext_adv_seen);
 
-	PASS("Extended adv scanner passed\n");
+	TEST_PASS("Extended adv scanner passed");
 }
 
 static void main_ext_adv_conn_scanner_x5(void)
@@ -207,7 +202,7 @@ static void main_ext_adv_conn_scanner_x5(void)
 	printk("Waiting to extended advertisements (again)...\n");
 	WAIT_FOR_FLAG(flag_ext_adv_seen);
 
-	PASS("Extended adv scanner x5 passed\n");
+	TEST_PASS("Extended adv scanner x5 passed");
 }
 
 static const struct bst_test_instance ext_adv_scanner[] = {
@@ -215,8 +210,6 @@ static const struct bst_test_instance ext_adv_scanner[] = {
 		.test_id = "ext_adv_scanner",
 		.test_descr = "Basic extended advertising scanning test. "
 			      "Will just scan an extended advertiser.",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = main_ext_adv_scanner
 	},
 	{
@@ -224,8 +217,6 @@ static const struct bst_test_instance ext_adv_scanner[] = {
 		.test_descr = "Basic extended advertising scanning test. "
 			      "Will scan an extended advertiser, connect "
 			      "and verify it's detected after disconnection",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = main_ext_adv_conn_scanner
 	},
 	{
@@ -234,8 +225,6 @@ static const struct bst_test_instance ext_adv_scanner[] = {
 			      "Will scan an extended advertiser, connect "
 			      "and verify it's detected after disconnection,"
 			      "repeated over 5 times",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = main_ext_adv_conn_scanner_x5
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/adv/periodic/CMakeLists.txt b/tests/bsim/bluetooth/host/adv/periodic/CMakeLists.txt
index 85b2a61c9db..525996ebd94 100644
--- a/tests/bsim/bluetooth/host/adv/periodic/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/adv/periodic/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_audio)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
     src/common.c
     src/main.c
diff --git a/tests/bsim/bluetooth/host/adv/periodic/src/common.c b/tests/bsim/bluetooth/host/adv/periodic/src/common.c
index b4e4151c49a..105dd4b8382 100644
--- a/tests/bsim/bluetooth/host/adv/periodic/src/common.c
+++ b/tests/bsim/bluetooth/host/adv/periodic/src/common.c
@@ -6,21 +6,6 @@
 
 #include "common.h"
 
-extern enum bst_result_t bst_result;
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("test failed (not passed after %i seconds)\n", WAIT_SECONDS);
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-	bst_result = In_progress;
-}
-
 uint8_t mfg_data[254] = {
 	0xFF, 0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C,
 	0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B,
diff --git a/tests/bsim/bluetooth/host/adv/periodic/src/common.h b/tests/bsim/bluetooth/host/adv/periodic/src/common.h
index 02a8fea70e8..03a1f0c5bbb 100644
--- a/tests/bsim/bluetooth/host/adv/periodic/src/common.h
+++ b/tests/bsim/bluetooth/host/adv/periodic/src/common.h
@@ -9,50 +9,7 @@
 #ifndef ZEPHYR_TEST_BSIM_BT_AUDIO_TEST_
 #define ZEPHYR_TEST_BSIM_BT_AUDIO_TEST_
 
-#include <zephyr/kernel.h>
-
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "time_machine.h"
-#include "bstests.h"
-
-#include <zephyr/types.h>
-#include <stddef.h>
-#include <errno.h>
-#include <zephyr/sys_clock.h>
-
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/uuid.h>
-#include <zephyr/bluetooth/gatt.h>
-
-#define WAIT_SECONDS 15                         /* seconds */
-#define WAIT_TIME (WAIT_SECONDS * USEC_PER_SEC) /* microseconds*/
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t)false
-#define SET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)true)
-#define UNSET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)false)
-#define TEST_FLAG(flag) (atomic_get(&flag) == (atomic_t)true)
-#define WAIT_FOR_FLAG(flag) \
-	while (!(bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1)); \
-	}
-
-#define FAIL(...) \
-	do { \
-		bst_result = Failed; \
-		bs_trace_error_time_line(__VA_ARGS__); \
-	} while (0)
-
-#define PASS(...) \
-	do { \
-		bst_result = Passed; \
-		bs_trace_info_time(1, "PASSED: " __VA_ARGS__); \
-	} while (0)
-
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
+#include <stdint.h>
 
 extern uint8_t mfg_data[254];
 
diff --git a/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_advertiser.c b/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_advertiser.c
index aa01d46db3c..3085bda474a 100644
--- a/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_advertiser.c
+++ b/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_advertiser.c
@@ -3,26 +3,28 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/kernel.h>
-
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "time_machine.h"
-#include "bstests.h"
 
+#include <errno.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
+#include <zephyr/sys_clock.h>
 #include <zephyr/sys/printk.h>
-
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 #include "common.h"
 
 extern enum bst_result_t bst_result;
 
 static struct bt_conn *g_conn;
 
-CREATE_FLAG(flag_connected);
-CREATE_FLAG(flag_bonded);
+static DEFINE_FLAG(flag_connected);
+static DEFINE_FLAG(flag_bonded);
 
 static void connected(struct bt_conn *conn, uint8_t err)
 {
@@ -31,7 +33,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != BT_HCI_ERR_SUCCESS) {
-		FAIL("Failed to connect to %s: %u\n", addr, err);
+		TEST_FAIL("Failed to connect to %s: %u", addr, err);
 		return;
 	}
 
@@ -75,7 +77,7 @@ static void common_init(void)
 	err = bt_enable(NULL);
 
 	if (err) {
-		FAIL("Bluetooth init failed: %d\n", err);
+		TEST_FAIL("Bluetooth init failed: %d", err);
 		return;
 	}
 	printk("Bluetooth initialized\n");
@@ -249,7 +251,7 @@ static void main_per_adv_advertiser(void)
 	delete_adv_set(per_adv);
 	per_adv = NULL;
 
-	PASS("Periodic advertiser passed\n");
+	TEST_PASS("Periodic advertiser passed");
 }
 
 #if defined(CONFIG_BT_CTLR_PHY_CODED)
@@ -273,7 +275,7 @@ static void main_per_adv_advertiser_coded(void)
 	delete_adv_set(per_adv);
 	per_adv = NULL;
 
-	PASS("Periodic advertiser coded PHY passed\n");
+	TEST_PASS("Periodic advertiser coded PHY passed");
 }
 #endif /* CONFIG_BT_CTLR_PHY_CODED */
 
@@ -305,7 +307,7 @@ static void main_per_adv_conn_advertiser(void)
 	delete_adv_set(conn_adv);
 	conn_adv = NULL;
 
-	PASS("Periodic advertiser passed\n");
+	TEST_PASS("Periodic advertiser passed");
 }
 
 static void main_per_adv_conn_privacy_advertiser(void)
@@ -341,7 +343,7 @@ static void main_per_adv_conn_privacy_advertiser(void)
 	delete_adv_set(conn_adv);
 	conn_adv = NULL;
 
-	PASS("Periodic advertiser passed\n");
+	TEST_PASS("Periodic advertiser passed");
 }
 
 static void main_per_adv_long_data_advertiser(void)
@@ -366,7 +368,7 @@ static void main_per_adv_long_data_advertiser(void)
 	delete_adv_set(per_adv);
 	per_adv = NULL;
 #endif
-	PASS("Periodic long data advertiser passed\n");
+	TEST_PASS("Periodic long data advertiser passed");
 }
 
 static const struct bst_test_instance per_adv_advertiser[] = {
@@ -374,8 +376,6 @@ static const struct bst_test_instance per_adv_advertiser[] = {
 		.test_id = "per_adv_advertiser",
 		.test_descr = "Basic periodic advertising test. "
 			      "Will just start periodic advertising.",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = main_per_adv_advertiser
 	},
 #if defined(CONFIG_BT_CTLR_PHY_CODED)
@@ -383,8 +383,6 @@ static const struct bst_test_instance per_adv_advertiser[] = {
 		.test_id = "per_adv_advertiser_coded_phy",
 		.test_descr = "Basic periodic advertising test on Coded PHY. "
 			      "Advertiser and periodic advertiser uses Coded PHY",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = main_per_adv_advertiser_coded
 	},
 #endif /* CONFIG_BT_CTLR_PHY_CODED */
@@ -392,24 +390,18 @@ static const struct bst_test_instance per_adv_advertiser[] = {
 		.test_id = "per_adv_conn_advertiser",
 		.test_descr = "Periodic advertising test with concurrent ACL "
 			      "and PA sync.",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = main_per_adv_conn_advertiser
 	},
 	{
 		.test_id = "per_adv_conn_privacy_advertiser",
 		.test_descr = "Periodic advertising test with concurrent ACL "
 			      "with bonding and PA sync.",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = main_per_adv_conn_privacy_advertiser
 	},
 	{
 		.test_id = "per_adv_long_data_advertiser",
 		.test_descr = "Periodic advertising test with a longer data length. "
 			      "To test the reassembly of large data packets",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = main_per_adv_long_data_advertiser
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_sync.c b/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_sync.c
index 08c3d125242..0b7a8969f9a 100644
--- a/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_sync.c
+++ b/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_sync.c
@@ -3,18 +3,20 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/kernel.h>
-
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "time_machine.h"
-#include "bstests.h"
 
+#include <errno.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
+#include <zephyr/sys_clock.h>
 #include <zephyr/sys/printk.h>
-
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 #include "common.h"
 
 extern enum bst_result_t bst_result;
@@ -23,12 +25,12 @@ static struct bt_conn *g_conn;
 static bt_addr_le_t per_addr;
 static uint8_t per_sid;
 
-CREATE_FLAG(flag_connected);
-CREATE_FLAG(flag_bonded);
-CREATE_FLAG(flag_per_adv);
-CREATE_FLAG(flag_per_adv_sync);
-CREATE_FLAG(flag_per_adv_sync_lost);
-CREATE_FLAG(flag_per_adv_recv);
+static DEFINE_FLAG(flag_connected);
+static DEFINE_FLAG(flag_bonded);
+static DEFINE_FLAG(flag_per_adv);
+static DEFINE_FLAG(flag_per_adv_sync);
+static DEFINE_FLAG(flag_per_adv_sync_lost);
+static DEFINE_FLAG(flag_per_adv_recv);
 
 static void connected(struct bt_conn *conn, uint8_t err)
 {
@@ -37,7 +39,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != BT_HCI_ERR_SUCCESS) {
-		FAIL("Failed to connect to %s: %u\n", addr, err);
+		TEST_FAIL("Failed to connect to %s: %u", addr, err);
 		return;
 	}
 
@@ -77,24 +79,24 @@ static struct bt_conn_auth_info_cb auto_info_cbs = {
 static void scan_recv(const struct bt_le_scan_recv_info *info,
 		      struct net_buf_simple *buf)
 {
-	if (!TEST_FLAG(flag_connected) &&
+	if (!IS_FLAG_SET(flag_connected) &&
 	    info->adv_props & BT_GAP_ADV_PROP_CONNECTABLE) {
 		int err;
 
 		printk("Stopping scan\n");
 		err = bt_le_scan_stop();
 		if (err != 0) {
-			FAIL("Failed to stop scan: %d", err);
+			TEST_FAIL("Failed to stop scan: %d", err);
 			return;
 		}
 
 		err = bt_conn_le_create(info->addr, BT_CONN_LE_CREATE_CONN,
 					BT_LE_CONN_PARAM_DEFAULT, &g_conn);
 		if (err != 0) {
-			FAIL("Could not connect to peer: %d", err);
+			TEST_FAIL("Could not connect to peer: %d", err);
 			return;
 		}
-	} else if (!TEST_FLAG(flag_per_adv) && info->interval != 0U) {
+	} else if (!IS_FLAG_SET(flag_per_adv) && info->interval != 0U) {
 
 		per_sid = info->sid;
 		bt_addr_le_copy(&per_addr, info->addr);
@@ -142,7 +144,7 @@ static void recv_cb(struct bt_le_per_adv_sync *recv_sync,
 	char le_addr[BT_ADDR_LE_STR_LEN];
 	uint8_t buf_data_len;
 
-	if (TEST_FLAG(flag_per_adv_recv)) {
+	if (IS_FLAG_SET(flag_per_adv_recv)) {
 		return;
 	}
 
@@ -154,7 +156,7 @@ static void recv_cb(struct bt_le_per_adv_sync *recv_sync,
 		buf_data_len = (uint8_t)net_buf_simple_pull_le16(buf);
 		if (buf->data[0] - 1 != sizeof(mfg_data) ||
 			memcmp(buf->data, mfg_data, sizeof(mfg_data))) {
-			FAIL("Unexpected adv data received\n");
+			TEST_FAIL("Unexpected adv data received");
 		}
 		net_buf_simple_pull(buf, ARRAY_SIZE(mfg_data));
 	}
@@ -175,7 +177,7 @@ static void common_init(void)
 	err = bt_enable(NULL);
 
 	if (err) {
-		FAIL("Bluetooth init failed: %d\n", err);
+		TEST_FAIL("Bluetooth init failed: %d", err);
 		return;
 	}
 
@@ -195,7 +197,7 @@ static void start_scan(void)
 			       BT_LE_SCAN_CODED_ACTIVE : BT_LE_SCAN_ACTIVE,
 			       NULL);
 	if (err) {
-		FAIL("Failed to start scan: %d\n", err);
+		TEST_FAIL("Failed to start scan: %d", err);
 		return;
 	}
 	printk("done.\n");
@@ -214,7 +216,7 @@ static void create_pa_sync(struct bt_le_per_adv_sync **sync)
 	sync_create_param.timeout = 0x0a;
 	err = bt_le_per_adv_sync_create(&sync_create_param, sync);
 	if (err) {
-		FAIL("Failed to create periodic advertising sync: %d\n", err);
+		TEST_FAIL("Failed to create periodic advertising sync: %d", err);
 		return;
 	}
 	printk("done.\n");
@@ -231,7 +233,7 @@ static void start_bonding(void)
 	printk("Setting security...");
 	err = bt_conn_set_security(g_conn, BT_SECURITY_L2);
 	if (err) {
-		FAIL("Failed to set security: %d\n", err);
+		TEST_FAIL("Failed to set security: %d", err);
 		return;
 	}
 	printk("done.\n");
@@ -253,7 +255,7 @@ static void main_per_adv_sync(void)
 	printk("Waiting for periodic sync lost...\n");
 	WAIT_FOR_FLAG(flag_per_adv_sync_lost);
 
-	PASS("Periodic advertising sync passed\n");
+	TEST_PASS("Periodic advertising sync passed");
 }
 
 static void main_per_adv_sync_app_not_scanning(void)
@@ -271,7 +273,7 @@ static void main_per_adv_sync_app_not_scanning(void)
 	printk("Stopping scan\n");
 	err = bt_le_scan_stop();
 	if (err != 0) {
-		FAIL("Failed to stop scan: %d", err);
+		TEST_FAIL("Failed to stop scan: %d", err);
 		return;
 	}
 
@@ -280,7 +282,7 @@ static void main_per_adv_sync_app_not_scanning(void)
 	printk("Waiting for periodic sync lost...\n");
 	WAIT_FOR_FLAG(flag_per_adv_sync_lost);
 
-	PASS("Periodic advertising sync passed\n");
+	TEST_PASS("Periodic advertising sync passed");
 }
 
 static void main_per_adv_conn_sync(void)
@@ -305,7 +307,7 @@ static void main_per_adv_conn_sync(void)
 	printk("Waiting for periodic sync lost...\n");
 	WAIT_FOR_FLAG(flag_per_adv_sync_lost);
 
-	PASS("Periodic advertising sync passed\n");
+	TEST_PASS("Periodic advertising sync passed");
 }
 
 static void main_per_adv_conn_privacy_sync(void)
@@ -336,7 +338,7 @@ static void main_per_adv_conn_privacy_sync(void)
 	printk("Waiting for periodic sync lost...\n");
 	WAIT_FOR_FLAG(flag_per_adv_sync_lost);
 
-	PASS("Periodic advertising sync passed\n");
+	TEST_PASS("Periodic advertising sync passed");
 }
 
 static void main_per_adv_long_data_sync(void)
@@ -359,7 +361,7 @@ static void main_per_adv_long_data_sync(void)
 	printk("Waiting for periodic sync lost...\n");
 	WAIT_FOR_FLAG(flag_per_adv_sync_lost);
 #endif
-	PASS("Periodic advertising long data sync passed\n");
+	TEST_PASS("Periodic advertising long data sync passed");
 }
 
 static const struct bst_test_instance per_adv_sync[] = {
@@ -367,8 +369,6 @@ static const struct bst_test_instance per_adv_sync[] = {
 		.test_id = "per_adv_sync",
 		.test_descr = "Basic periodic advertising sync test. "
 			      "Will just sync to a periodic advertiser.",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = main_per_adv_sync
 	},
 	{
@@ -376,8 +376,6 @@ static const struct bst_test_instance per_adv_sync[] = {
 		.test_descr = "Basic periodic advertising sync test but where "
 			      "the app stopped scanning before creating sync."
 			      "Expect the host to start scanning automatically.",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = main_per_adv_sync_app_not_scanning
 	},
 	{
@@ -385,8 +383,6 @@ static const struct bst_test_instance per_adv_sync[] = {
 		.test_descr = "Periodic advertising sync test, but where there "
 			      "is a connection between the advertiser and the "
 			      "synchronized device.",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = main_per_adv_conn_sync
 	},
 	{
@@ -394,8 +390,6 @@ static const struct bst_test_instance per_adv_sync[] = {
 		.test_descr = "Periodic advertising sync test, but where "
 			      "advertiser and synchronized device are bonded and using  "
 			      "privacy",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = main_per_adv_conn_privacy_sync
 	},
 	{
@@ -403,8 +397,6 @@ static const struct bst_test_instance per_adv_sync[] = {
 		.test_descr = "Periodic advertising sync test with larger "
 			      "data length. Test is used to verify that "
 			      "reassembly of long data is handeled correctly.",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = main_per_adv_long_data_sync
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv.sh b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv.sh
index a7b8d99b654..a27b9fedf4e 100755
--- a/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv.sh
+++ b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv.sh
@@ -21,6 +21,6 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
   -testid=per_adv_sync -rs=6
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=20e6 $@
+  -D=2 -sim_length=15e6 $@
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_app_not_scanning.sh b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_app_not_scanning.sh
index 7176929cb2d..33c61af5fb9 100755
--- a/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_app_not_scanning.sh
+++ b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_app_not_scanning.sh
@@ -21,6 +21,6 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
   -testid=per_adv_sync_app_not_scanning -rs=6
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=20e6 $@
+  -D=2 -sim_length=15e6 $@
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_app_not_scanning_coded.sh b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_app_not_scanning_coded.sh
index 31fd0195ddd..c64dbc4d20b 100755
--- a/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_app_not_scanning_coded.sh
+++ b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_app_not_scanning_coded.sh
@@ -22,6 +22,6 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_coded_conf \
   -testid=per_adv_sync_app_not_scanning -rs=6
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=20e6 $@
+  -D=2 -sim_length=15e6 $@
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn.sh b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn.sh
index a459c91e450..dce1400647f 100755
--- a/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn.sh
+++ b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn.sh
@@ -21,6 +21,6 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
   -testid=per_adv_conn_sync -rs=6
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=20e6 $@
+  -D=2 -sim_length=15e6 $@
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn_privacy.sh b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn_privacy.sh
index c3c4316ef5a..018887a2255 100755
--- a/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn_privacy.sh
+++ b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn_privacy.sh
@@ -22,6 +22,6 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
   -testid=per_adv_conn_privacy_sync -rs=6
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=20e6 $@
+  -D=2 -sim_length=15e6 $@
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_long_data.sh b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_long_data.sh
index 732e8aa13dd..48c0934fb88 100755
--- a/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_long_data.sh
+++ b/tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_long_data.sh
@@ -22,6 +22,6 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_long_data_co
   -testid=per_adv_long_data_sync -rs=6
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=20e6 $@
+  -D=2 -sim_length=15e6 $@
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/att/eatt/CMakeLists.txt b/tests/bsim/bluetooth/host/att/eatt/CMakeLists.txt
index 9f42ea3eb56..6bea3ce925d 100644
--- a/tests/bsim/bluetooth/host/att/eatt/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/att/eatt/CMakeLists.txt
@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_host)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
 
 target_sources(app PRIVATE
   src/common.c
diff --git a/tests/bsim/bluetooth/host/att/eatt/src/common.c b/tests/bsim/bluetooth/host/att/eatt/src/common.c
index 271d759dcd6..b0cec2ab3c5 100644
--- a/tests/bsim/bluetooth/host/att/eatt/src/common.c
+++ b/tests/bsim/bluetooth/host/att/eatt/src/common.c
@@ -6,6 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "babblekit/testcase.h"
 #include "common.h"
 #include "argparse.h"
 
@@ -30,7 +31,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err)
 			default_conn = NULL;
 		}
 
-		FAIL("Failed to connect to %s (%u)\n", addr, conn_err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, conn_err);
 		return;
 	}
 
@@ -77,44 +78,30 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 
 	err = bt_le_scan_stop();
 	if (err) {
-		FAIL("Stop LE scan failed (err %d)\n", err);
+		TEST_FAIL("Stop LE scan failed (err %d)", err);
 	}
 
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT,
 				&default_conn);
 	if (err) {
-		FAIL("Create conn failed (err %d)\n", err);
+		TEST_FAIL("Create conn failed (err %d)", err);
 	}
 
 	printk("Device connected\n");
 }
 
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(60e6); /* 60 seconds */
-	bst_result = In_progress;
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error_time_line("Test eatt finished.\n");
-	}
-}
-
 void central_setup_and_connect(void)
 {
 	int err;
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Can't enable Bluetooth (err %d)\n", err);
+		TEST_FAIL("Can't enable Bluetooth (err %d)", err);
 	}
 
 	err = bt_le_scan_start(BT_LE_SCAN_ACTIVE, device_found);
 	if (err) {
-		FAIL("Scanning failed to start (err %d)\n", err);
+		TEST_FAIL("Scanning failed to start (err %d)", err);
 	}
 
 	while (!is_connected) {
@@ -123,7 +110,7 @@ void central_setup_and_connect(void)
 
 	err = bt_conn_set_security(default_conn, BT_SECURITY_L2);
 	if (err) {
-		FAIL("Failed to start encryption procedure\n");
+		TEST_FAIL("Failed to start encryption procedure");
 	}
 
 	while (!is_encrypted) {
@@ -137,12 +124,12 @@ void peripheral_setup_and_connect(void)
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Can't enable Bluetooth (err %d)\n", err);
+		TEST_FAIL("Can't enable Bluetooth (err %d)", err);
 	}
 
 	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err) {
-		FAIL("Advertising failed to start (err %d)\n", err);
+		TEST_FAIL("Advertising failed to start (err %d)", err);
 	}
 
 	while (!is_connected) {
@@ -168,56 +155,10 @@ void disconnect(void)
 
 	err = bt_conn_disconnect(default_conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
 	if (err) {
-		FAIL("Disconnection failed (err %d)\n", err);
+		TEST_FAIL("Disconnection failed (err %d)", err);
 	}
 
 	while (is_connected) {
 		k_sleep(K_MSEC(100));
 	}
 }
-
-
-#define CHANNEL_ID 0
-#define MSG_SIZE 1
-
-void backchannel_init(void)
-{
-	uint device_number = get_device_nbr();
-	uint peer_number = device_number ^ 1;
-	uint device_numbers[] = { peer_number };
-	uint channel_numbers[] = { CHANNEL_ID };
-	uint *ch;
-
-	ch = bs_open_back_channel(device_number, device_numbers, channel_numbers,
-				  ARRAY_SIZE(channel_numbers));
-	if (!ch) {
-		FAIL("Unable to open backchannel\n");
-	}
-}
-
-void backchannel_sync_send(void)
-{
-	uint8_t sync_msg[MSG_SIZE] = { get_device_nbr() };
-
-	printk("Sending sync\n");
-	bs_bc_send_msg(CHANNEL_ID, sync_msg, ARRAY_SIZE(sync_msg));
-}
-
-void backchannel_sync_wait(void)
-{
-	uint8_t sync_msg[MSG_SIZE];
-
-	while (true) {
-		if (bs_bc_is_msg_received(CHANNEL_ID) > 0) {
-			bs_bc_receive_msg(CHANNEL_ID, sync_msg, ARRAY_SIZE(sync_msg));
-			if (sync_msg[0] != get_device_nbr()) {
-				/* Received a message from another device, exit */
-				break;
-			}
-		}
-
-		k_sleep(K_MSEC(1));
-	}
-
-	printk("Sync received\n");
-}
diff --git a/tests/bsim/bluetooth/host/att/eatt/src/common.h b/tests/bsim/bluetooth/host/att/eatt/src/common.h
index 49bc88f03fd..6dd9519f8d7 100644
--- a/tests/bsim/bluetooth/host/att/eatt/src/common.h
+++ b/tests/bsim/bluetooth/host/att/eatt/src/common.h
@@ -17,32 +17,6 @@
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/att.h>
 
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "bstests.h"
-#include "bs_pc_backchannel.h"
-
-extern enum bst_result_t bst_result;
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t)false
-#define SET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)true)
-#define WAIT_FOR_FLAG(flag) \
-	while (!(bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1)); \
-	}
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
 extern volatile int num_eatt_channels;
 extern struct bt_conn *default_conn;
 
@@ -50,8 +24,3 @@ void central_setup_and_connect(void);
 void peripheral_setup_and_connect(void);
 void wait_for_disconnect(void);
 void disconnect(void);
-void test_init(void);
-void test_tick(bs_time_t HW_device_time);
-void backchannel_init(void);
-void backchannel_sync_send(void);
-void backchannel_sync_wait(void);
diff --git a/tests/bsim/bluetooth/host/att/eatt/src/main_autoconnect.c b/tests/bsim/bluetooth/host/att/eatt/src/main_autoconnect.c
index 89b46b30f25..ba19c66db4e 100644
--- a/tests/bsim/bluetooth/host/att/eatt/src/main_autoconnect.c
+++ b/tests/bsim/bluetooth/host/att/eatt/src/main_autoconnect.c
@@ -6,6 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "babblekit/testcase.h"
 #include "common.h"
 
 static void test_peripheral_main(void)
@@ -21,7 +22,7 @@ static void test_peripheral_main(void)
 
 	disconnect();
 
-	PASS("EATT Peripheral tests Passed\n");
+	TEST_PASS("EATT Peripheral tests Passed");
 }
 
 static void test_central_main(void)
@@ -34,22 +35,18 @@ static void test_central_main(void)
 
 	wait_for_disconnect();
 
-	PASS("EATT Central tests Passed\n");
+	TEST_PASS("EATT Central tests Passed");
 }
 
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "peripheral_autoconnect",
 		.test_descr = "Peripheral autoconnect",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_peripheral_main,
 	},
 	{
 		.test_id = "central_autoconnect",
 		.test_descr = "Central autoconnect",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_central_main,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/att/eatt/src/main_collision.c b/tests/bsim/bluetooth/host/att/eatt/src/main_collision.c
index d4bd2f8abb2..f280ab28ea3 100644
--- a/tests/bsim/bluetooth/host/att/eatt/src/main_collision.c
+++ b/tests/bsim/bluetooth/host/att/eatt/src/main_collision.c
@@ -6,25 +6,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "babblekit/testcase.h"
+#include "babblekit/sync.h"
 #include "common.h"
 
 static void test_peripheral_main(void)
 {
 	int err;
 
-	backchannel_init();
+	TEST_ASSERT(bk_sync_init() == 0, "Failed to open backchannel");
 
 	peripheral_setup_and_connect();
 
 	/*
 	 * we need to sync with peer to ensure that we get collisions
 	 */
-	backchannel_sync_send();
-	backchannel_sync_wait();
+	bk_sync_send();
+	bk_sync_wait();
 
 	err = bt_eatt_connect(default_conn, CONFIG_BT_EATT_MAX);
 	if (err) {
-		FAIL("Sending credit based connection request failed (err %d)\n", err);
+		TEST_FAIL("Sending credit based connection request failed (err %d)", err);
 	}
 
 	while (bt_eatt_count(default_conn) < CONFIG_BT_EATT_MAX) {
@@ -36,23 +38,23 @@ static void test_peripheral_main(void)
 
 	disconnect();
 
-	PASS("EATT Peripheral tests Passed\n");
+	TEST_PASS("EATT Peripheral tests Passed");
 }
 
 static void test_central_main(void)
 {
 	int err;
 
-	backchannel_init();
+	TEST_ASSERT(bk_sync_init() == 0, "Failed to open backchannel");
 
 	central_setup_and_connect();
 
-	backchannel_sync_wait();
-	backchannel_sync_send();
+	bk_sync_wait();
+	bk_sync_send();
 
 	err = bt_eatt_connect(default_conn, CONFIG_BT_EATT_MAX);
 	if (err) {
-		FAIL("Sending credit based connection request failed (err %d)\n", err);
+		TEST_FAIL("Sending credit based connection request failed (err %d)", err);
 	}
 
 	while (bt_eatt_count(default_conn) < CONFIG_BT_EATT_MAX) {
@@ -61,22 +63,18 @@ static void test_central_main(void)
 
 	wait_for_disconnect();
 
-	PASS("EATT Central tests Passed\n");
+	TEST_PASS("EATT Central tests Passed");
 }
 
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "peripheral",
 		.test_descr = "Peripheral Collision",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_peripheral_main,
 	},
 	{
 		.test_id = "central",
 		.test_descr = "Central Collision",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_central_main,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/att/eatt/src/main_lowres.c b/tests/bsim/bluetooth/host/att/eatt/src/main_lowres.c
index fb93cbdba0e..c6b3752ad24 100644
--- a/tests/bsim/bluetooth/host/att/eatt/src/main_lowres.c
+++ b/tests/bsim/bluetooth/host/att/eatt/src/main_lowres.c
@@ -6,6 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "babblekit/testcase.h"
 #include "common.h"
 
 static void test_peripheral_main(void)
@@ -18,7 +19,7 @@ static void test_peripheral_main(void)
 
 	disconnect();
 
-	PASS("EATT Peripheral tests Passed\n");
+	TEST_PASS("EATT Peripheral tests Passed");
 }
 
 static void test_central_main(void)
@@ -35,22 +36,18 @@ static void test_central_main(void)
 
 	wait_for_disconnect();
 
-	PASS("EATT Central tests Passed\n");
+	TEST_PASS("EATT Central tests Passed");
 }
 
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "peripheral_lowres",
 		.test_descr = "Peripheral lowres",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_peripheral_main,
 	},
 	{
 		.test_id = "central_lowres",
 		.test_descr = "Central lowres",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_central_main,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/att/eatt/src/main_reconfigure.c b/tests/bsim/bluetooth/host/att/eatt/src/main_reconfigure.c
index c208fc09484..138583f4ce2 100644
--- a/tests/bsim/bluetooth/host/att/eatt/src/main_reconfigure.c
+++ b/tests/bsim/bluetooth/host/att/eatt/src/main_reconfigure.c
@@ -6,13 +6,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+#include "babblekit/sync.h"
 #include "common.h"
 
 #include <zephyr/bluetooth/gatt.h>
 
 #define NEW_MTU 100
 
-CREATE_FLAG(flag_reconfigured);
+static DEFINE_FLAG(flag_reconfigured);
 
 void att_mtu_updated(struct bt_conn *conn, uint16_t tx, uint16_t rx)
 {
@@ -29,7 +32,7 @@ static struct bt_gatt_cb cb = {
 
 static void test_peripheral_main(void)
 {
-	backchannel_init();
+	TEST_ASSERT(bk_sync_init() == 0, "Failed to open backchannel");
 
 	peripheral_setup_and_connect();
 
@@ -39,25 +42,25 @@ static void test_peripheral_main(void)
 	while (bt_eatt_count(default_conn) < CONFIG_BT_EATT_MAX) {
 		k_sleep(K_MSEC(10));
 	}
-	backchannel_sync_send();
-	backchannel_sync_wait();
+	bk_sync_send();
+	bk_sync_wait();
 
 	WAIT_FOR_FLAG(flag_reconfigured);
-	backchannel_sync_send();
+	bk_sync_send();
 
 	/* Wait for the reconfigured flag on the other end */
-	backchannel_sync_wait();
+	bk_sync_wait();
 
 	disconnect();
 
-	PASS("EATT Peripheral tests Passed\n");
+	TEST_PASS("EATT Peripheral tests Passed");
 }
 
 static void test_central_main(void)
 {
 	int err;
 
-	backchannel_init();
+	TEST_ASSERT(bk_sync_init() == 0, "Failed to open backchannel");
 
 	central_setup_and_connect();
 
@@ -69,35 +72,31 @@ static void test_central_main(void)
 
 	err = bt_eatt_reconfigure(default_conn, NEW_MTU);
 	if (err < 0) {
-		FAIL("Reconfigure failed (%d)\n", err);
+		TEST_FAIL("Reconfigure failed (%d)", err);
 	}
-	backchannel_sync_send();
-	backchannel_sync_wait();
+	bk_sync_send();
+	bk_sync_wait();
 
 	WAIT_FOR_FLAG(flag_reconfigured);
-	backchannel_sync_send();
+	bk_sync_send();
 
 	/* Wait for the reconfigured flag on the other end */
-	backchannel_sync_wait();
+	bk_sync_wait();
 
 	wait_for_disconnect();
 
-	PASS("EATT Central tests Passed\n");
+	TEST_PASS("EATT Central tests Passed");
 }
 
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "peripheral_reconfigure",
 		.test_descr = "Peripheral reconfigure",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_peripheral_main,
 	},
 	{
 		.test_id = "central_reconfigure",
 		.test_descr = "Central reconfigure",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_central_main,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/autoconnect.sh b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/autoconnect.sh
index 057e76f1813..47fc5f0e2a0 100755
--- a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/autoconnect.sh
+++ b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/autoconnect.sh
@@ -17,6 +17,6 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf
   -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_autoconnect -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=200e6 $@
+  -D=2 -sim_length=60e6 $@
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/collision.sh b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/collision.sh
index c89bab27548..010ac1600cb 100755
--- a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/collision.sh
+++ b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/collision.sh
@@ -17,6 +17,6 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_collision_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=200e6 $@
+  -D=2 -sim_length=60e6 $@
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/lowres.sh b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/lowres.sh
index 0d988761adf..b12d045edd9 100755
--- a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/lowres.sh
+++ b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/lowres.sh
@@ -16,6 +16,6 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_lowres_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral_lowres -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=200e6 $@
+  -D=2 -sim_length=60e6 $@
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/multiple_conn.sh b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/multiple_conn.sh
index e3919eb4a26..9bdf58693dc 100755
--- a/tests/bsim/bluetooth/host/att/eatt/tests_scripts/multiple_conn.sh
+++ b/tests/bsim/bluetooth/host/att/eatt/tests_scripts/multiple_conn.sh
@@ -17,6 +17,6 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_prj_multiple_conn_co
   -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=200e6 $@
+  -D=2 -sim_length=60e6 $@
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/att/eatt_notif/CMakeLists.txt b/tests/bsim/bluetooth/host/att/eatt_notif/CMakeLists.txt
index 202f757b3b7..bb9f7adb430 100644
--- a/tests/bsim/bluetooth/host/att/eatt_notif/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/att/eatt_notif/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_eatt_notif)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources} )
 
diff --git a/tests/bsim/bluetooth/host/att/eatt_notif/src/client_test.c b/tests/bsim/bluetooth/host/att/eatt_notif/src/client_test.c
index 5f403304fcb..e846b1d05b9 100644
--- a/tests/bsim/bluetooth/host/att/eatt_notif/src/client_test.c
+++ b/tests/bsim/bluetooth/host/att/eatt_notif/src/client_test.c
@@ -14,16 +14,25 @@
  * on EATT channels.
  */
 
+#include <stddef.h>
+#include <errno.h>
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
 #include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 #include <zephyr/bluetooth/att.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+#include "babblekit/sync.h"
 #include "common.h"
 
-CREATE_FLAG(flag_is_connected);
-CREATE_FLAG(flag_discover_complete);
-CREATE_FLAG(flag_is_encrypted);
+static DEFINE_FLAG(flag_is_connected);
+static DEFINE_FLAG(flag_discover_complete);
+static DEFINE_FLAG(flag_is_encrypted);
 
 static struct bt_conn *g_conn;
 static const struct bt_gatt_attr *local_attr;
@@ -42,7 +51,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != 0) {
-		FAIL("Failed to connect to %s (%u)\n", addr, err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, err);
 		return;
 	}
 
@@ -103,14 +112,14 @@ void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 	printk("Stopping scan\n");
 	err = bt_le_scan_stop();
 	if (err != 0) {
-		FAIL("Could not stop scan: %d");
+		TEST_FAIL("Could not stop scan: %d");
 		return;
 	}
 
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN,
 				BT_LE_CONN_PARAM_DEFAULT, &g_conn);
 	if (err != 0) {
-		FAIL("Could not connect to peer: %d", err);
+		TEST_FAIL("Could not connect to peer: %d", err);
 	}
 }
 
@@ -157,7 +166,7 @@ static void gatt_discover(void)
 
 	err = bt_gatt_discover(g_conn, &discover_params);
 	if (err != 0) {
-		FAIL("Discover failed(err %d)\n", err);
+		TEST_FAIL("Discover failed(err %d)", err);
 	}
 }
 
@@ -172,16 +181,16 @@ static void test_main(void)
 {
 	int err;
 
-	device_sync_init(PERIPHERAL_ID);
+	TEST_ASSERT(bk_sync_init() == 0, "Failed to open backchannel");
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth enable failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth enable failed (err %d)", err);
 	}
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
 	if (err != 0) {
-		FAIL("Scanning failed to start (err %d)\n", err);
+		TEST_FAIL("Scanning failed to start (err %d)", err);
 	}
 
 	printk("Scanning successfully started\n");
@@ -190,14 +199,14 @@ static void test_main(void)
 
 	err = bt_conn_set_security(g_conn, BT_SECURITY_L2);
 	if (err) {
-		FAIL("Failed to start encryption procedure\n");
+		TEST_FAIL("Failed to start encryption procedure");
 	}
 
 	WAIT_FOR_FLAG(flag_is_encrypted);
 
 	err = bt_eatt_connect(g_conn, CONFIG_BT_EATT_MAX);
 	if (err) {
-		FAIL("Sending credit based connection request failed (err %d)\n", err);
+		TEST_FAIL("Sending credit based connection request failed (err %d)", err);
 	}
 
 	/* Wait for the channels to be connected */
@@ -206,7 +215,7 @@ static void test_main(void)
 	}
 
 	printk("Waiting for sync\n");
-	device_sync_wait();
+	bk_sync_wait();
 
 	local_attr = &g_svc.attrs[1];
 
@@ -227,7 +236,7 @@ static void test_main(void)
 	printk("Connecting %d bearers\n", EATT_BEARERS_TEST);
 	err = bt_eatt_connect(g_conn, EATT_BEARERS_TEST);
 	if (err) {
-		FAIL("Sending credit based connection request failed (err %d)\n", err);
+		TEST_FAIL("Sending credit based connection request failed (err %d)", err);
 	}
 
 	/* Wait for the channels to be connected */
@@ -237,22 +246,20 @@ static void test_main(void)
 
 	printk("############# Send notifications during discovery request\n");
 	gatt_discover();
-	while (!TEST_FLAG(flag_discover_complete)) {
+	while (!IS_FLAG_SET(flag_discover_complete)) {
 		printk("Notifying...\n");
 		send_notification();
 	}
 
 	printk("Sending final sync\n");
-	device_sync_send();
+	bk_sync_send();
 
-	PASS("Client Passed\n");
+	TEST_PASS("Client Passed");
 }
 
 static const struct bst_test_instance test_vcs[] = {
 	{
 		.test_id = "client",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/att/eatt_notif/src/common.c b/tests/bsim/bluetooth/host/att/eatt_notif/src/common.c
deleted file mode 100644
index 1df3895fc3e..00000000000
--- a/tests/bsim/bluetooth/host/att/eatt_notif/src/common.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "common.h"
-#include <zephyr/logging/log.h>
-
-#define LOG_MODULE_NAME common
-
-LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_DBG);
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("test failed (not passed after %i seconds)\n", WAIT_TIME);
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-	bst_result = In_progress;
-}
-
-/* Call in init functions*/
-void device_sync_init(uint device_nbr)
-{
-	uint peer;
-
-	if (device_nbr == CENTRAL_ID) {
-		peer = PERIPHERAL_ID;
-	} else {
-		peer = CENTRAL_ID;
-	}
-
-	uint dev_nbrs[BACK_CHANNELS] = { peer };
-	uint channel_nbrs[BACK_CHANNELS] = { 0 };
-	const uint *ch = bs_open_back_channel(device_nbr, dev_nbrs, channel_nbrs, BACK_CHANNELS);
-
-	if (!ch) {
-		LOG_ERR("bs_open_back_channel failed!");
-	}
-}
-
-/* Call it to make peer to proceed.*/
-void device_sync_send(void)
-{
-	uint8_t msg[1] = "S";
-
-	bs_bc_send_msg(0, msg, sizeof(msg));
-}
-
-/* Wait until peer send sync*/
-void device_sync_wait(void)
-{
-	int size_msg_received = 0;
-	uint8_t msg;
-
-	while (!size_msg_received) {
-		size_msg_received = bs_bc_is_msg_received(0);
-		k_sleep(K_MSEC(1));
-	}
-
-	bs_bc_receive_msg(0, &msg, size_msg_received);
-}
diff --git a/tests/bsim/bluetooth/host/att/eatt_notif/src/common.h b/tests/bsim/bluetooth/host/att/eatt_notif/src/common.h
index aecbda9cbe6..ec2c039acb9 100644
--- a/tests/bsim/bluetooth/host/att/eatt_notif/src/common.h
+++ b/tests/bsim/bluetooth/host/att/eatt_notif/src/common.h
@@ -6,49 +6,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/kernel.h>
-
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "time_machine.h"
-#include "bstests.h"
-
-#include <zephyr/types.h>
-#include <stddef.h>
-#include <errno.h>
-
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/uuid.h>
-#include <zephyr/bluetooth/gatt.h>
-#include "bs_pc_backchannel.h"
-
-extern enum bst_result_t bst_result;
-
-#define WAIT_TIME (30 * 1e6) /*seconds*/
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t)false
-#define SET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)true)
-#define UNSET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)false)
-#define TEST_FLAG(flag) (atomic_get(&flag) == (atomic_t)true)
-#define WAIT_FOR_FLAG(flag) \
-	while (!(bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1)); \
-	}
-
-#define FAIL(...) \
-	do { \
-		bst_result = Failed; \
-		bs_trace_error_time_line(__VA_ARGS__); \
-	} while (0)
-
-#define PASS(...) \
-	do { \
-		bst_result = Passed; \
-		bs_trace_info_time(1, __VA_ARGS__); \
-	} while (0)
-
 #define CHRC_SIZE 10
 #define LONG_CHRC_SIZE 40
 
@@ -63,13 +20,3 @@ extern enum bst_result_t bst_result;
 #define TEST_LONG_CHRC_UUID \
 	BT_UUID_DECLARE_128(0x01, 0x23, 0x45, 0x67, 0x89, 0x01, 0x02, 0x03, \
 			    0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0xFF, 0x11)
-
-#define CENTRAL_ID 0
-#define PERIPHERAL_ID 1
-#define BACK_CHANNELS 1
-
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
-void device_sync_init(uint device_nbr);
-void device_sync_send(void);
-void device_sync_wait(void);
diff --git a/tests/bsim/bluetooth/host/att/eatt_notif/src/server_test.c b/tests/bsim/bluetooth/host/att/eatt_notif/src/server_test.c
index 474fb101113..94cf4ab699b 100644
--- a/tests/bsim/bluetooth/host/att/eatt_notif/src/server_test.c
+++ b/tests/bsim/bluetooth/host/att/eatt_notif/src/server_test.c
@@ -4,15 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common.h"
+#include <stddef.h>
+#include <errno.h>
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 #include <zephyr/bluetooth/att.h>
 
-CREATE_FLAG(flag_discover_complete);
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+#include "babblekit/sync.h"
+#include "common.h"
+
+static DEFINE_FLAG(flag_discover_complete);
 
 extern enum bst_result_t bst_result;
 
-CREATE_FLAG(flag_is_connected);
+static DEFINE_FLAG(flag_is_connected);
 
 static struct bt_conn *g_conn;
 
@@ -23,7 +35,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != 0) {
-		FAIL("Failed to connect to %s (%u)\n", addr, err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, err);
 		return;
 	}
 
@@ -65,7 +77,7 @@ static uint8_t discover_func(struct bt_conn *conn,
 
 	if (attr == NULL) {
 		if (chrc_handle == 0) {
-			FAIL("Did not discover chrc (%x)", chrc_handle);
+			TEST_FAIL("Did not discover chrc (%x)", chrc_handle);
 		}
 
 		(void)memset(params, 0, sizeof(*params));
@@ -86,7 +98,7 @@ static uint8_t discover_func(struct bt_conn *conn,
 
 		err = bt_gatt_discover(conn, params);
 		if (err != 0) {
-			FAIL("Discover failed (err %d)\n", err);
+			TEST_FAIL("Discover failed (err %d)", err);
 		}
 
 		return BT_GATT_ITER_STOP;
@@ -119,7 +131,7 @@ static void gatt_discover(void)
 
 	err = bt_gatt_discover(g_conn, &discover_params);
 	if (err != 0) {
-		FAIL("Discover failed(err %d)\n", err);
+		TEST_FAIL("Discover failed(err %d)", err);
 	}
 
 	printk("Discovery complete\n");
@@ -146,7 +158,7 @@ void subscribed_cb(struct bt_conn *conn, uint8_t err,
 	       params->ccc_handle);
 
 	printk("Sending sync to peer\n");
-	device_sync_send();
+	bk_sync_send();
 }
 
 static struct bt_gatt_discover_params disc_params;
@@ -168,7 +180,7 @@ static void gatt_subscribe(void)
 	printk("Subscribing: val %x\n", chrc_handle);
 	err = bt_gatt_subscribe(g_conn, &subscribe_params);
 	if (err != 0) {
-		FAIL("Subscription failed(err %d)\n", err);
+		TEST_FAIL("Subscription failed(err %d)", err);
 	}
 }
 
@@ -179,11 +191,11 @@ static void test_main(void)
 		BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR))
 	};
 
-	device_sync_init(CENTRAL_ID);
+	TEST_ASSERT(bk_sync_init() == 0, "Failed to open backchannel");
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 		return;
 	}
 
@@ -191,7 +203,7 @@ static void test_main(void)
 
 	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)\n", err);
+		TEST_FAIL("Advertising failed to start (err %d)", err);
 		return;
 	}
 
@@ -209,16 +221,14 @@ static void test_main(void)
 	gatt_subscribe();
 
 	printk("Waiting for final sync\n");
-	device_sync_wait();
+	bk_sync_wait();
 
-	PASS("Server Passed\n");
+	TEST_PASS("Server Passed");
 }
 
 static const struct bst_test_instance test_server[] = {
 	{
 		.test_id = "server",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/att/eatt_notif/test_scripts/eatt_notif.sh b/tests/bsim/bluetooth/host/att/eatt_notif/test_scripts/eatt_notif.sh
index 39000efbc74..39d442e38b2 100755
--- a/tests/bsim/bluetooth/host/att/eatt_notif/test_scripts/eatt_notif.sh
+++ b/tests/bsim/bluetooth/host/att/eatt_notif/test_scripts/eatt_notif.sh
@@ -19,6 +19,6 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_eatt_notif_prj_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=server -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=60e6 $@
+  -D=2 -sim_length=30e6 $@
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/gatt/authorization/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/authorization/CMakeLists.txt
index acb0dd45947..6746842d40b 100644
--- a/tests/bsim/bluetooth/host/gatt/authorization/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/gatt/authorization/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_gatt_authorization)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources} )
 
diff --git a/tests/bsim/bluetooth/host/gatt/authorization/src/common.c b/tests/bsim/bluetooth/host/gatt/authorization/src/common.c
deleted file mode 100644
index adff2dd05ef..00000000000
--- a/tests/bsim/bluetooth/host/gatt/authorization/src/common.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "common.h"
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("test failed (not passed after %i seconds)\n", WAIT_TIME);
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-	bst_result = In_progress;
-}
diff --git a/tests/bsim/bluetooth/host/gatt/authorization/src/common.h b/tests/bsim/bluetooth/host/gatt/authorization/src/common.h
index 339919dfe88..358b8ec9de5 100644
--- a/tests/bsim/bluetooth/host/gatt/authorization/src/common.h
+++ b/tests/bsim/bluetooth/host/gatt/authorization/src/common.h
@@ -6,47 +6,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/kernel.h>
-
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "time_machine.h"
-#include "bstests.h"
-
-#include <zephyr/types.h>
-#include <stddef.h>
-#include <errno.h>
-
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/uuid.h>
-#include <zephyr/bluetooth/gatt.h>
-
-extern enum bst_result_t bst_result;
-
-#define WAIT_TIME (30 * 1e6) /*seconds*/
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t)false
-#define SET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)true)
-#define UNSET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)false)
-#define WAIT_FOR_FLAG(flag) \
-	while (!(bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1)); \
-	}
-
-#define FAIL(...) \
-	do { \
-		bst_result = Failed; \
-		bs_trace_error_time_line(__VA_ARGS__); \
-	} while (0)
-
-#define PASS(...) \
-	do { \
-		bst_result = Passed; \
-		bs_trace_info_time(1, __VA_ARGS__); \
-	} while (0)
-
 #define CHRC_SIZE 10
 
 #define TEST_SERVICE_UUID \
@@ -68,6 +27,3 @@ extern enum bst_result_t bst_result;
 #define TEST_CP_CHRC_UUID \
 	BT_UUID_DECLARE_128(0x01, 0x23, 0x45, 0x67, 0x89, 0x01, 0x02, 0x03, \
 			    0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0xF0, 0x00)
-
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
diff --git a/tests/bsim/bluetooth/host/gatt/authorization/src/gatt_client_test.c b/tests/bsim/bluetooth/host/gatt/authorization/src/gatt_client_test.c
index fb8d7e71133..3e162d50297 100644
--- a/tests/bsim/bluetooth/host/gatt/authorization/src/gatt_client_test.c
+++ b/tests/bsim/bluetooth/host/gatt/authorization/src/gatt_client_test.c
@@ -4,15 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
+#include <stddef.h>
+#include <errno.h>
+
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
 #include <zephyr/bluetooth/gatt.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 #include "common.h"
 
-CREATE_FLAG(flag_is_connected);
-CREATE_FLAG(flag_discover_complete);
-CREATE_FLAG(flag_write_complete);
-CREATE_FLAG(flag_read_complete);
+static DEFINE_FLAG(flag_is_connected);
+static DEFINE_FLAG(flag_discover_complete);
+static DEFINE_FLAG(flag_write_complete);
+static DEFINE_FLAG(flag_read_complete);
 
 static struct bt_conn *g_conn;
 static uint16_t unhandled_chrc_handle;
@@ -31,7 +41,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != 0) {
-		FAIL("Failed to connect to %s (%u)\n", addr, err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, err);
 		return;
 	}
 
@@ -86,14 +96,14 @@ void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 	printk("Stopping scan\n");
 	err = bt_le_scan_stop();
 	if (err != 0) {
-		FAIL("Could not stop scan: %d");
+		TEST_FAIL("Could not stop scan: %d");
 		return;
 	}
 
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN,
 				BT_LE_CONN_PARAM_DEFAULT, &g_conn);
 	if (err != 0) {
-		FAIL("Could not connect to peer: %d", err);
+		TEST_FAIL("Could not connect to peer: %d", err);
 	}
 }
 
@@ -107,7 +117,7 @@ static uint8_t discover_func(struct bt_conn *conn,
 		if (unhandled_chrc_handle == 0 ||
 		    unauthorized_chrc_handle == 0 ||
 		    authorized_chrc_handle == 0) {
-			FAIL("Did not discover required characterstics");
+			TEST_FAIL("Did not discover required characterstics");
 		}
 
 		(void)memset(params, 0, sizeof(*params));
@@ -128,7 +138,7 @@ static uint8_t discover_func(struct bt_conn *conn,
 
 		err = bt_gatt_discover(conn, params);
 		if (err != 0) {
-			FAIL("Discover failed (err %d)\n", err);
+			TEST_FAIL("Discover failed (err %d)", err);
 		}
 
 		return BT_GATT_ITER_STOP;
@@ -168,7 +178,7 @@ static void gatt_discover(void)
 
 	err = bt_gatt_discover(g_conn, &discover_params);
 	if (err != 0) {
-		FAIL("Discover failed(err %d)\n", err);
+		TEST_FAIL("Discover failed(err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(flag_discover_complete);
@@ -179,11 +189,11 @@ static void gatt_write_cb(struct bt_conn *conn, uint8_t err,
 			  struct bt_gatt_write_params *params)
 {
 	if ((err != BT_ATT_ERR_SUCCESS) && (params->handle != unauthorized_chrc_handle)) {
-		FAIL("Write failed on authorized characteristics: 0x%02X\n", err);
+		TEST_FAIL("Write failed on authorized characteristics: 0x%02X", err);
 	}
 
 	if ((err != BT_ATT_ERR_AUTHORIZATION) && (params->handle == unauthorized_chrc_handle)) {
-		FAIL("Write failed on unauthorized characteristics: 0x%02X\n", err);
+		TEST_FAIL("Write failed on unauthorized characteristics: 0x%02X", err);
 	}
 
 	(void)memset(params, 0, sizeof(*params));
@@ -207,7 +217,7 @@ static void gatt_write(uint16_t handle)
 
 	err = bt_gatt_write(g_conn, &write_params);
 	if (err != 0) {
-		FAIL("bt_gatt_write failed: %d\n", err);
+		TEST_FAIL("bt_gatt_write failed: %d", err);
 	}
 
 	WAIT_FOR_FLAG(flag_write_complete);
@@ -231,7 +241,7 @@ static void gatt_cp_write(void)
 
 	err = bt_gatt_write(g_conn, &write_params);
 	if (err != 0) {
-		FAIL("bt_gatt_write failed: %d\n", err);
+		TEST_FAIL("bt_gatt_write failed: %d", err);
 	}
 
 	WAIT_FOR_FLAG(flag_write_complete);
@@ -244,16 +254,16 @@ static uint8_t gatt_read_cb(struct bt_conn *conn, uint8_t err,
 {
 	if ((err != BT_ATT_ERR_SUCCESS) &&
 	    (params->single.handle != unauthorized_chrc_handle)) {
-		FAIL("Read failed on authorized characteristics: 0x%02X\n", err);
+		TEST_FAIL("Read failed on authorized characteristics: 0x%02X", err);
 
 		if ((length != CHRC_SIZE) || (memcmp(data, chrc_data, length) != 0)) {
-			FAIL("chrc data different than expected", err);
+			TEST_FAIL("chrc data different than expected: 0x%02X", err);
 		}
 	}
 
 	if ((err != BT_ATT_ERR_AUTHORIZATION) &&
 	    (params->single.handle == unauthorized_chrc_handle)) {
-		FAIL("Read failed on unauthorized characteristics: 0x%02X\n", err);
+		TEST_FAIL("Read failed on unauthorized characteristics: 0x%02X", err);
 	}
 
 	(void)memset(params, 0, sizeof(*params));
@@ -279,7 +289,7 @@ static void gatt_read(uint16_t handle)
 
 	err = bt_gatt_read(g_conn, &read_params);
 	if (err != 0) {
-		FAIL("bt_gatt_read failed: %d\n", err);
+		TEST_FAIL("bt_gatt_read failed: %d", err);
 	}
 
 	WAIT_FOR_FLAG(flag_read_complete);
@@ -301,12 +311,12 @@ static void test_main(void)
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth discover failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth discover failed (err %d)", err);
 	}
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
 	if (err != 0) {
-		FAIL("Scanning failed to start (err %d)\n", err);
+		TEST_FAIL("Scanning failed to start (err %d)", err);
 	}
 
 	printk("Scanning successfully started\n");
@@ -324,14 +334,12 @@ static void test_main(void)
 	printk("Interacting with the authorized characteristic\n");
 	gatt_interact(authorized_chrc_handle);
 
-	PASS("GATT client Passed\n");
+	TEST_PASS("GATT client Passed");
 }
 
 static const struct bst_test_instance test_vcs[] = {
 	{
 		.test_id = "gatt_client",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/gatt/authorization/src/gatt_server_test.c b/tests/bsim/bluetooth/host/gatt/authorization/src/gatt_server_test.c
index c8a3303a8d9..4c206f7cd27 100644
--- a/tests/bsim/bluetooth/host/gatt/authorization/src/gatt_server_test.c
+++ b/tests/bsim/bluetooth/host/gatt/authorization/src/gatt_server_test.c
@@ -4,11 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
+#include <stddef.h>
+#include <errno.h>
+
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
+
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 #include "common.h"
 
 extern enum bst_result_t bst_result;
 
-CREATE_FLAG(flag_is_chrc_ctx_validated);
+static DEFINE_FLAG(flag_is_chrc_ctx_validated);
 
 static struct bt_conn *g_conn;
 
@@ -19,7 +32,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != 0) {
-		FAIL("Failed to connect to %s (%u)\n", addr, err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, err);
 		return;
 	}
 
@@ -87,7 +100,7 @@ static ssize_t write_test_chrc(struct test_chrc_ctx *chrc_ctx,
 	}
 
 	if (flags != 0) {
-		FAIL("Invalid flags %u\n", flags);
+		TEST_FAIL("Invalid flags %u", flags);
 		return BT_GATT_ERR(BT_ATT_ERR_UNLIKELY);
 	}
 
@@ -240,14 +253,14 @@ static ssize_t write_cp_chrc(struct bt_conn *conn,
 		pass = authorized_chrc_operation_validate();
 		log_str = "authorized";
 	} else {
-		FAIL("Invalid value of CP write counter %u\n", cp_write_cnt);
+		TEST_FAIL("Invalid value of CP write counter %u", cp_write_cnt);
 		return BT_GATT_ERR(BT_ATT_ERR_UNLIKELY);
 	}
 
 	if (pass) {
 		printk("Correct context for %s chrc\n", log_str);
 	} else {
-		FAIL("Invalid context for %s chrc\n", log_str);
+		TEST_FAIL("Invalid context for %s chrc", log_str);
 		return BT_GATT_ERR(BT_ATT_ERR_UNLIKELY);
 	}
 
@@ -327,7 +340,7 @@ static void test_main(void)
 
 	err = bt_gatt_authorization_cb_register(&gatt_authorization_callbacks);
 	if (err) {
-		FAIL("Registering GATT authorization callbacks failed (err %d)\n", err);
+		TEST_FAIL("Registering GATT authorization callbacks failed (err %d)", err);
 		return;
 	}
 
@@ -335,7 +348,7 @@ static void test_main(void)
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 		return;
 	}
 
@@ -343,7 +356,7 @@ static void test_main(void)
 
 	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)\n", err);
+		TEST_FAIL("Advertising failed to start (err %d)", err);
 		return;
 	}
 
@@ -351,14 +364,12 @@ static void test_main(void)
 
 	WAIT_FOR_FLAG(flag_is_chrc_ctx_validated);
 
-	PASS("GATT server passed\n");
+	TEST_PASS("GATT server passed");
 }
 
 static const struct bst_test_instance test_gatt_server[] = {
 	{
 		.test_id = "gatt_server",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/gatt/authorization/test_scripts/gatt.sh b/tests/bsim/bluetooth/host/gatt/authorization/test_scripts/gatt.sh
index 359247e08d9..c318928fbf8 100755
--- a/tests/bsim/bluetooth/host/gatt/authorization/test_scripts/gatt.sh
+++ b/tests/bsim/bluetooth/host/gatt/authorization/test_scripts/gatt.sh
@@ -17,6 +17,6 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_authorization_prj_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=gatt_server
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=60e6 $@
+  -D=2 -sim_length=30e6 $@
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/gatt/caching/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/caching/CMakeLists.txt
index 7869a21840f..b279e8c1439 100644
--- a/tests/bsim/bluetooth/host/gatt/caching/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/gatt/caching/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_gatt)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources} )
 
diff --git a/tests/bsim/bluetooth/host/gatt/caching/src/common.c b/tests/bsim/bluetooth/host/gatt/caching/src/common.c
deleted file mode 100644
index a7083921905..00000000000
--- a/tests/bsim/bluetooth/host/gatt/caching/src/common.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "common.h"
-#include "argparse.h"
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("test failed (not passed after %i seconds)\n", WAIT_TIME);
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-	bst_result = In_progress;
-}
-
-#define CHANNEL_ID 0
-#define MSG_SIZE 1
-
-void backchannel_init(void)
-{
-	uint device_number = get_device_nbr();
-	uint peer_number = device_number ^ 1;
-	uint device_numbers[] = { peer_number };
-	uint channel_numbers[] = { CHANNEL_ID };
-	uint *ch;
-
-	ch = bs_open_back_channel(device_number, device_numbers, channel_numbers,
-				  ARRAY_SIZE(channel_numbers));
-	if (!ch) {
-		FAIL("Unable to open backchannel\n");
-	}
-}
-
-void backchannel_sync_send(void)
-{
-	uint8_t sync_msg[MSG_SIZE] = { get_device_nbr() };
-
-	printk("Sending sync\n");
-	bs_bc_send_msg(CHANNEL_ID, sync_msg, ARRAY_SIZE(sync_msg));
-}
-
-void backchannel_sync_wait(void)
-{
-	uint8_t sync_msg[MSG_SIZE];
-
-	while (true) {
-		if (bs_bc_is_msg_received(CHANNEL_ID) > 0) {
-			bs_bc_receive_msg(CHANNEL_ID, sync_msg, ARRAY_SIZE(sync_msg));
-			if (sync_msg[0] != get_device_nbr()) {
-				/* Received a message from another device, exit */
-				break;
-			}
-		}
-
-		k_sleep(K_MSEC(1));
-	}
-
-	printk("Sync received\n");
-}
diff --git a/tests/bsim/bluetooth/host/gatt/caching/src/common.h b/tests/bsim/bluetooth/host/gatt/caching/src/common.h
index d01282ca035..adf5d4754a9 100644
--- a/tests/bsim/bluetooth/host/gatt/caching/src/common.h
+++ b/tests/bsim/bluetooth/host/gatt/caching/src/common.h
@@ -6,50 +6,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/kernel.h>
-
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "time_machine.h"
-#include "bstests.h"
-#include "bs_pc_backchannel.h"
-
-#include <zephyr/types.h>
-#include <stddef.h>
-#include <errno.h>
-
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/uuid.h>
-#include <zephyr/bluetooth/gatt.h>
-
-extern enum bst_result_t bst_result;
-
-#define WAIT_TIME (60 * 1e6) /*seconds*/
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t)false
-#define SET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)true)
-#define UNSET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)false)
-#define WAIT_FOR_FLAG(flag) \
-	while (!(bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1)); \
-	}
-
-#define FAIL(...) \
-	do { \
-		bst_result = Failed; \
-		bs_trace_error_time_line(__VA_ARGS__); \
-	} while (0)
-
-#define PASS(...) \
-	do { \
-		bst_result = Passed; \
-		bs_trace_info_time(1, __VA_ARGS__); \
-	} while (0)
-
-#define CHRC_SIZE 10
-
 #define TEST_SERVICE_UUID \
 	BT_UUID_DECLARE_128(0x01, 0x23, 0x45, 0x67, 0x89, 0x01, 0x02, 0x03, \
 			    0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x00)
@@ -61,9 +17,3 @@ extern enum bst_result_t bst_result;
 #define TEST_ADDITIONAL_CHRC_UUID \
 	BT_UUID_DECLARE_128(0x01, 0x23, 0x45, 0x67, 0x89, 0x01, 0x02, 0x03, \
 			    0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0xFF, 0x11)
-
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
-void backchannel_init(void);
-void backchannel_sync_send(void);
-void backchannel_sync_wait(void);
diff --git a/tests/bsim/bluetooth/host/gatt/caching/src/gatt_client_test.c b/tests/bsim/bluetooth/host/gatt/caching/src/gatt_client_test.c
index 3699f80e09b..65d9b0213c0 100644
--- a/tests/bsim/bluetooth/host/gatt/caching/src/gatt_client_test.c
+++ b/tests/bsim/bluetooth/host/gatt/caching/src/gatt_client_test.c
@@ -4,18 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
+#include <stddef.h>
+#include <errno.h>
+
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
 #include <zephyr/bluetooth/gatt.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+#include "babblekit/sync.h"
 #include "common.h"
 
-CREATE_FLAG(flag_is_connected);
-CREATE_FLAG(flag_discover_complete);
-CREATE_FLAG(flag_write_complete);
-CREATE_FLAG(flag_chan_1_read);
-CREATE_FLAG(flag_chan_2_read);
-CREATE_FLAG(flag_db_hash_read);
-CREATE_FLAG(flag_encrypted);
+static DEFINE_FLAG(flag_is_connected);
+static DEFINE_FLAG(flag_discover_complete);
+static DEFINE_FLAG(flag_write_complete);
+static DEFINE_FLAG(flag_chan_1_read);
+static DEFINE_FLAG(flag_chan_2_read);
+static DEFINE_FLAG(flag_db_hash_read);
+static DEFINE_FLAG(flag_encrypted);
 
 static struct bt_conn *g_conn;
 static uint16_t chrc_handle;
@@ -29,7 +40,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != 0) {
-		FAIL("Failed to connect to %s (%u)\n", addr, err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, err);
 
 		return;
 	}
@@ -60,9 +71,9 @@ static void disconnected(struct bt_conn *conn, uint8_t reason)
 void security_changed(struct bt_conn *conn, bt_security_t level, enum bt_security_err err)
 {
 	if (err != BT_SECURITY_ERR_SUCCESS) {
-		FAIL("Encryption failed\n");
+		TEST_FAIL("Encryption failed");
 	} else if (level < BT_SECURITY_L2) {
-		FAIL("Insufficient security\n");
+		TEST_FAIL("Insufficient security");
 	} else {
 		SET_FLAG(flag_encrypted);
 	}
@@ -94,14 +105,14 @@ void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type, struct ne
 	printk("Stopping scan\n");
 	err = bt_le_scan_stop();
 	if (err != 0) {
-		FAIL("Could not stop scan (err %d)\n");
+		TEST_FAIL("Could not stop scan (err %d)");
 
 		return;
 	}
 
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT, &g_conn);
 	if (err != 0) {
-		FAIL("Could not connect to peer (err %d)", err);
+		TEST_FAIL("Could not connect to peer (err %d)", err);
 	}
 }
 
@@ -112,7 +123,7 @@ static uint8_t discover_func(struct bt_conn *conn, const struct bt_gatt_attr *at
 
 	if (attr == NULL) {
 		if (chrc_handle == 0) {
-			FAIL("Did not discover chrc (%x)\n", chrc_handle);
+			TEST_FAIL("Did not discover chrc (%x)", chrc_handle);
 		}
 
 		(void)memset(params, 0, sizeof(*params));
@@ -133,7 +144,7 @@ static uint8_t discover_func(struct bt_conn *conn, const struct bt_gatt_attr *at
 
 		err = bt_gatt_discover(conn, params);
 		if (err != 0) {
-			FAIL("Discover failed (err %d)\n", err);
+			TEST_FAIL("Discover failed (err %d)", err);
 		}
 
 		return BT_GATT_ITER_STOP;
@@ -171,7 +182,7 @@ static void gatt_discover(const struct bt_uuid *uuid, uint8_t type)
 
 	err = bt_gatt_discover(g_conn, &discover_params);
 	if (err != 0) {
-		FAIL("Discover failed(err %d)\n", err);
+		TEST_FAIL("Discover failed (err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(flag_discover_complete);
@@ -203,10 +214,10 @@ static struct bt_gatt_read_params db_hash_read = {
 	.chan_opt = BT_ATT_CHAN_OPT_NONE,
 };
 
-void expect_status(uint8_t err, uint8_t status)
+static void expect_status(uint8_t err, uint8_t status)
 {
 	if (err != status) {
-		FAIL("Unexpected status from read: 0x%02X, expected 0x%02X\n", err, status);
+		TEST_FAIL("Unexpected status from read: 0x%02X, expected 0x%02X", err, status);
 	}
 }
 
@@ -224,7 +235,7 @@ static uint8_t gatt_read_expect_success_cb(struct bt_conn *conn, uint8_t err,
 	} else if (params == &chan_2_read) {
 		SET_FLAG(flag_chan_2_read);
 	} else {
-		FAIL("Unexpected params\n");
+		TEST_FAIL("Unexpected params");
 	}
 
 	return 0;
@@ -242,7 +253,7 @@ static uint8_t gatt_read_expect_err_unlikely_cb(struct bt_conn *conn, uint8_t er
 	} else if (params == &chan_2_read) {
 		SET_FLAG(flag_chan_2_read);
 	} else {
-		FAIL("Unexpected params\n");
+		TEST_FAIL("Unexpected params");
 	}
 
 	return 0;
@@ -260,7 +271,7 @@ static uint8_t gatt_read_expect_err_out_of_sync_cb(struct bt_conn *conn, uint8_t
 	} else if (params == &chan_2_read) {
 		SET_FLAG(flag_chan_2_read);
 	} else {
-		FAIL("Unexpected params\n");
+		TEST_FAIL("Unexpected params");
 	}
 
 	return 0;
@@ -274,14 +285,14 @@ static void gatt_read(struct bt_gatt_read_params *read_params)
 
 	err = bt_gatt_read(g_conn, read_params);
 	if (err != 0) {
-		FAIL("bt_gatt_read failed: %d\n", err);
+		TEST_FAIL("bt_gatt_read failed: %d", err);
 	}
 }
 
 static void write_cb(struct bt_conn *conn, uint8_t err, struct bt_gatt_write_params *params)
 {
 	if (err != BT_ATT_ERR_SUCCESS) {
-		FAIL("Write failed: 0x%02X\n", err);
+		TEST_FAIL("Write failed: 0x%02X", err);
 	}
 
 	SET_FLAG(flag_write_complete);
@@ -310,7 +321,7 @@ static void enable_robust_caching(void)
 
 	err = bt_gatt_write(g_conn, &write_params);
 	if (err) {
-		FAIL("bt_gatt_write failed (err %d)\n", err);
+		TEST_FAIL("bt_gatt_write failed (err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(flag_write_complete);
@@ -321,16 +332,16 @@ static void test_main_common(bool connect_eatt)
 {
 	int err;
 
-	backchannel_init();
+	TEST_ASSERT(bk_sync_init() == 0, "Failed to open backchannel");
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth discover failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth discover failed (err %d)", err);
 	}
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
 	if (err != 0) {
-		FAIL("Scanning failed to start (err %d)\n", err);
+		TEST_FAIL("Scanning failed to start (err %d)", err);
 	}
 
 	printk("Scanning successfully started\n");
@@ -339,7 +350,7 @@ static void test_main_common(bool connect_eatt)
 
 	err = bt_conn_set_security(g_conn, BT_SECURITY_L2);
 	if (err) {
-		FAIL("Failed to start encryption procedure\n");
+		TEST_FAIL("Failed to start encryption procedure");
 	}
 
 	WAIT_FOR_FLAG(flag_encrypted);
@@ -357,10 +368,10 @@ static void test_main_common(bool connect_eatt)
 	}
 
 	/* Tell the server to register additional service */
-	backchannel_sync_send();
+	bk_sync_send();
 
 	/* Wait for new service to be added by server */
-	backchannel_sync_wait();
+	bk_sync_wait();
 
 	chan_1_read.single.handle = chrc_handle;
 	chan_2_read.single.handle = chrc_handle;
@@ -386,9 +397,9 @@ static void test_main_db_hash_read_eatt(void)
 	WAIT_FOR_FLAG(flag_chan_2_read);
 
 	/* Signal to server that reads are done */
-	backchannel_sync_send();
+	bk_sync_send();
 
-	PASS("GATT client Passed\n");
+	TEST_PASS("GATT client Passed");
 }
 
 static void test_main_out_of_sync_eatt(void)
@@ -423,9 +434,9 @@ static void test_main_out_of_sync_eatt(void)
 	WAIT_FOR_FLAG(flag_chan_2_read);
 
 	/* Signal to server that reads are done */
-	backchannel_sync_send();
+	bk_sync_send();
 
-	PASS("GATT client Passed\n");
+	TEST_PASS("GATT client Passed");
 }
 
 static void test_main_retry_reads_eatt(void)
@@ -455,9 +466,9 @@ static void test_main_retry_reads_eatt(void)
 	WAIT_FOR_FLAG(flag_chan_2_read);
 
 	/* Signal to server that reads are done */
-	backchannel_sync_send();
+	bk_sync_send();
 
-	PASS("GATT client Passed\n");
+	TEST_PASS("GATT client Passed");
 }
 
 static void test_main_db_hash_read_no_eatt(void)
@@ -476,9 +487,9 @@ static void test_main_db_hash_read_no_eatt(void)
 	WAIT_FOR_FLAG(flag_chan_1_read);
 
 	/* Signal to server that reads are done */
-	backchannel_sync_send();
+	bk_sync_send();
 
-	PASS("GATT client Passed\n");
+	TEST_PASS("GATT client Passed");
 }
 
 static void test_main_out_of_sync_no_eatt(void)
@@ -501,9 +512,9 @@ static void test_main_out_of_sync_no_eatt(void)
 	WAIT_FOR_FLAG(flag_chan_1_read);
 
 	/* Signal to server that reads are done */
-	backchannel_sync_send();
+	bk_sync_send();
 
-	PASS("GATT client Passed\n");
+	TEST_PASS("GATT client Passed");
 }
 
 static void test_main_retry_reads_no_eatt(void)
@@ -521,46 +532,34 @@ static void test_main_retry_reads_no_eatt(void)
 	WAIT_FOR_FLAG(flag_chan_1_read);
 
 	/* Signal to server that reads are done */
-	backchannel_sync_send();
+	bk_sync_send();
 
-	PASS("GATT client Passed\n");
+	TEST_PASS("GATT client Passed");
 }
 
 static const struct bst_test_instance test_vcs[] = {
 	{
 		.test_id = "gatt_client_db_hash_read_eatt",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main_db_hash_read_eatt,
 	},
 	{
 		.test_id = "gatt_client_out_of_sync_eatt",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main_out_of_sync_eatt,
 	},
 	{
 		.test_id = "gatt_client_retry_reads_eatt",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main_retry_reads_eatt,
 	},
 	{
 		.test_id = "gatt_client_db_hash_read_no_eatt",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main_db_hash_read_no_eatt,
 	},
 	{
 		.test_id = "gatt_client_out_of_sync_no_eatt",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main_out_of_sync_no_eatt,
 	},
 	{
 		.test_id = "gatt_client_retry_reads_no_eatt",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main_retry_reads_no_eatt,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/gatt/caching/src/gatt_server_test.c b/tests/bsim/bluetooth/host/gatt/caching/src/gatt_server_test.c
index 637b7037e2f..1cb88b489fb 100644
--- a/tests/bsim/bluetooth/host/gatt/caching/src/gatt_server_test.c
+++ b/tests/bsim/bluetooth/host/gatt/caching/src/gatt_server_test.c
@@ -4,12 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
+#include <stddef.h>
+#include <errno.h>
+
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
+
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+#include "babblekit/sync.h"
 #include "common.h"
 
 extern enum bst_result_t bst_result;
 
-CREATE_FLAG(flag_is_connected);
-CREATE_FLAG(flag_is_encrypted);
+static DEFINE_FLAG(flag_is_connected);
+static DEFINE_FLAG(flag_is_encrypted);
 
 static struct bt_conn *g_conn;
 
@@ -20,7 +34,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != 0) {
-		FAIL("Failed to connect to %s (%u)\n", addr, err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, err);
 
 		return;
 	}
@@ -63,6 +77,7 @@ BT_CONN_CB_DEFINE(conn_callbacks) = {
 	.security_changed = security_changed,
 };
 
+#define CHRC_SIZE 10
 #define ARRAY_ITEM(i, _) i
 static const uint8_t chrc_data[] = { LISTIFY(CHRC_SIZE, ARRAY_ITEM, (,)) }; /* 1, 2, 3 ... */
 
@@ -90,11 +105,11 @@ static void test_main_common(bool connect_eatt)
 	const struct bt_data ad[] = { BT_DATA_BYTES(BT_DATA_FLAGS,
 						    (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)) };
 
-	backchannel_init();
+	TEST_ASSERT(bk_sync_init() == 0, "Failed to open backchannel");
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 
 		return;
 	}
@@ -103,7 +118,7 @@ static void test_main_common(bool connect_eatt)
 
 	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)\n", err);
+		TEST_FAIL("Advertising failed to start (err %d)", err);
 
 		return;
 	}
@@ -117,28 +132,28 @@ static void test_main_common(bool connect_eatt)
 
 		err = bt_eatt_connect(g_conn, CONFIG_BT_EATT_MAX);
 		if (err) {
-			FAIL("Failed to connect EATT channels (err %d)\n", err);
+			TEST_FAIL("Failed to connect EATT channels (err %d)", err);
 
 			return;
 		}
 	}
 
 	/* Wait for client to do discovery and configuration */
-	backchannel_sync_wait();
+	bk_sync_wait();
 
 	printk("Registering additional service\n");
 	err = bt_gatt_service_register(&additional_gatt_service);
 	if (err < 0) {
-		FAIL("Registering additional service failed (err %d)\n", err);
+		TEST_FAIL("Registering additional service failed (err %d)", err);
 	}
 
 	/* Signal to client that additional service is registered */
-	backchannel_sync_send();
+	bk_sync_send();
 
 	/* Wait for client to be done reading */
-	backchannel_sync_wait();
+	bk_sync_wait();
 
-	PASS("GATT server passed\n");
+	TEST_PASS("GATT server passed");
 }
 
 static void test_main_eatt(void)
@@ -154,14 +169,10 @@ static void test_main_no_eatt(void)
 static const struct bst_test_instance test_gatt_server[] = {
 	{
 		.test_id = "gatt_server_eatt",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main_eatt,
 	},
 	{
 		.test_id = "gatt_server_no_eatt",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main_no_eatt,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/ccc_store/CMakeLists.txt
index 832d770fbd9..35f8186b3ec 100644
--- a/tests/bsim/bluetooth/host/gatt/ccc_store/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/gatt/ccc_store/CMakeLists.txt
@@ -12,9 +12,11 @@ endif()
 find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_ccc_store)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
   src/main.c
-  src/common.c
 
   src/central.c
   src/peripheral.c
diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/src/central.c b/tests/bsim/bluetooth/host/gatt/ccc_store/src/central.c
index 0784a5e587d..a4f056dd408 100644
--- a/tests/bsim/bluetooth/host/gatt/ccc_store/src/central.c
+++ b/tests/bsim/bluetooth/host/gatt/ccc_store/src/central.c
@@ -22,14 +22,17 @@
 #include "settings.h"
 
 #include "argparse.h"
-#include "bs_pc_backchannel.h"
+
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+#include "babblekit/sync.h"
 
 #define SERVER_CHAN 0
 
-CREATE_FLAG(connected_flag);
-CREATE_FLAG(disconnected_flag);
-CREATE_FLAG(security_updated_flag);
-CREATE_FLAG(notification_received_flag);
+static DEFINE_FLAG(connected_flag);
+static DEFINE_FLAG(disconnected_flag);
+static DEFINE_FLAG(security_updated_flag);
+static DEFINE_FLAG(notification_received_flag);
 
 #define BT_UUID_DUMMY_SERVICE BT_UUID_DECLARE_128(DUMMY_SERVICE_TYPE)
 #define BT_UUID_DUMMY_SERVICE_NOTIFY BT_UUID_DECLARE_128(DUMMY_SERVICE_NOTIFY_TYPE)
@@ -38,7 +41,7 @@ static struct bt_conn *default_conn;
 
 static struct bt_conn_cb central_cb;
 
-CREATE_FLAG(gatt_subscribed_flag);
+static DEFINE_FLAG(gatt_subscribed_flag);
 
 static uint8_t notify_cb(struct bt_conn *conn, struct bt_gatt_subscribe_params *params,
 			 const void *data, uint16_t length)
@@ -88,7 +91,7 @@ static void ccc_subscribe(void)
 
 	err = bt_gatt_subscribe(default_conn, &subscribe_params);
 	if (err) {
-		FAIL("Failed to subscribe (att err %d)", err);
+		TEST_FAIL("Failed to subscribe (att err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(gatt_subscribed_flag);
@@ -106,13 +109,13 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 
 	err = bt_le_scan_stop();
 	if (err) {
-		FAIL("Failed to stop scanner (err %d)\n", err);
+		TEST_FAIL("Failed to stop scanner (err %d)", err);
 	}
 
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT,
 				&default_conn);
 	if (err) {
-		FAIL("Could not connect to peer: %s (err %d)\n", addr_str, err);
+		TEST_FAIL("Could not connect to peer: %s (err %d)", addr_str, err);
 	}
 }
 
@@ -125,7 +128,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(addr, addr_str, sizeof(addr_str));
 
 	if (err) {
-		FAIL("Failed to connect to %s (err %d)\n", addr_str, err);
+		TEST_FAIL("Failed to connect to %s (err %d)", addr_str, err);
 	}
 
 	LOG_DBG("Connected: %s", addr_str);
@@ -173,7 +176,7 @@ static void start_scan(void)
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
 	if (err) {
-		FAIL("Scanning failed to start (err %d)\n", err);
+		TEST_FAIL("Scanning failed to start (err %d)", err);
 	}
 
 	LOG_DBG("Scanning successfully started");
@@ -185,7 +188,7 @@ static void disconnect(void)
 
 	err = bt_conn_disconnect(default_conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
 	if (err) {
-		FAIL("Disconnection failed (err %d)\n", err);
+		TEST_FAIL("Disconnection failed (err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(disconnected_flag);
@@ -205,7 +208,7 @@ static void connect_pair_subscribe(void)
 
 	err = bt_conn_set_security(default_conn, BT_SECURITY_L2);
 	if (err != 0) {
-		FAIL("Failed to set security (err %d)\n", err);
+		TEST_FAIL("Failed to set security (err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(security_updated_flag);
@@ -215,9 +218,9 @@ static void connect_pair_subscribe(void)
 	ccc_subscribe();
 
 	/* confirm to server that we subscribed */
-	backchannel_sync_send(SERVER_CHAN, SERVER_ID);
+	bk_sync_send();
 	/* wait for server to check that the subscribtion is well registered */
-	backchannel_sync_wait(SERVER_CHAN, SERVER_ID);
+	bk_sync_wait();
 
 	WAIT_FOR_FLAG(notification_received_flag);
 	UNSET_FLAG(notification_received_flag);
@@ -234,21 +237,21 @@ static void connect_restore_sec(void)
 
 	err = bt_conn_set_security(default_conn, BT_SECURITY_L2);
 	if (err != 0) {
-		FAIL("Failed to set security (err %d)\n", err);
+		TEST_FAIL("Failed to set security (err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(security_updated_flag);
 	UNSET_FLAG(security_updated_flag);
 
 	/* check local subscription state */
-	if (GET_FLAG(gatt_subscribed_flag) == false) {
-		FAIL("Not subscribed\n");
+	if (!IS_FLAG_SET(gatt_subscribed_flag)) {
+		TEST_FAIL("Not subscribed");
 	}
 
 	/* notify the end of security update to server */
-	backchannel_sync_send(SERVER_CHAN, SERVER_ID);
+	bk_sync_send();
 	/* wait for server to check that the subscribtion has been restored */
-	backchannel_sync_wait(SERVER_CHAN, SERVER_ID);
+	bk_sync_wait();
 
 	WAIT_FOR_FLAG(notification_received_flag);
 	UNSET_FLAG(notification_received_flag);
@@ -256,26 +259,6 @@ static void connect_restore_sec(void)
 
 /* Util functions */
 
-void central_backchannel_init(void)
-{
-	uint device_number = get_device_nbr();
-	uint channel_numbers[1] = {
-		0,
-	};
-	uint device_numbers[1];
-	uint num_ch = 1;
-	uint *ch;
-
-	device_numbers[0] = SERVER_ID;
-
-	LOG_DBG("Opening back channels for device %d", device_number);
-	ch = bs_open_back_channel(device_number, device_numbers, channel_numbers, num_ch);
-	if (!ch) {
-		FAIL("Unable to open backchannel\n");
-	}
-	LOG_DBG("Back channels for device %d opened", device_number);
-}
-
 static void set_public_addr(void)
 {
 	bt_addr_le_t addr = {BT_ADDR_LE_RANDOM, {{0x0A, 0x89, 0x67, 0x45, 0x23, 0xC1}}};
@@ -293,12 +276,12 @@ void run_central(int times)
 	central_cb.disconnected = disconnected;
 	central_cb.security_changed = security_changed;
 
-	central_backchannel_init();
+	TEST_ASSERT(bk_sync_init() == 0);
 	set_public_addr();
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 	}
 
 	LOG_DBG("Bluetooth initialized");
@@ -307,12 +290,12 @@ void run_central(int times)
 
 	err = settings_load();
 	if (err) {
-		FAIL("Settings load failed (err %d)\n", err);
+		TEST_FAIL("Settings load failed (err %d)", err);
 	}
 
 	err = bt_unpair(BT_ID_DEFAULT, BT_ADDR_LE_ANY);
 	if (err) {
-		FAIL("Unpairing failed (err %d)\n", err);
+		TEST_FAIL("Unpairing failed (err %d)", err);
 	}
 
 	connect_pair_subscribe();
@@ -323,5 +306,5 @@ void run_central(int times)
 		disconnect();
 	}
 
-	PASS("Central test passed\n");
+	TEST_PASS("Central test passed");
 }
diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/src/common.c b/tests/bsim/bluetooth/host/gatt/ccc_store/src/common.c
deleted file mode 100644
index 7c9c898bc55..00000000000
--- a/tests/bsim/bluetooth/host/gatt/ccc_store/src/common.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (c) 2023 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stdint.h>
-
-#include "common.h"
-
-#include "argparse.h"
-#include "bs_pc_backchannel.h"
-
-void backchannel_sync_send(uint channel, uint device_nbr)
-{
-	uint8_t sync_msg[BC_MSG_SIZE] = {get_device_nbr(), device_nbr}; /* src, dst */
-
-	bs_bc_send_msg(channel, sync_msg, ARRAY_SIZE(sync_msg));
-}
-
-void backchannel_sync_wait(uint channel, uint device_nbr)
-{
-	uint8_t sync_msg[BC_MSG_SIZE];
-
-	LOG_DBG("Wait for %d on channel %d", device_nbr, channel);
-
-	while (true) {
-		if (bs_bc_is_msg_received(channel) > 0) {
-			bs_bc_receive_msg(channel, sync_msg, ARRAY_SIZE(sync_msg));
-
-			if (sync_msg[0] == device_nbr && sync_msg[1] == get_device_nbr()) {
-				break;
-			}
-		}
-
-		k_msleep(1);
-	}
-
-	LOG_DBG("Sync received");
-}
diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/src/common.h b/tests/bsim/bluetooth/host/gatt/ccc_store/src/common.h
index c4c8f9c4ff0..8f3dcfb29f2 100644
--- a/tests/bsim/bluetooth/host/gatt/ccc_store/src/common.h
+++ b/tests/bsim/bluetooth/host/gatt/ccc_store/src/common.h
@@ -2,39 +2,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/kernel.h>
-
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/settings/settings.h>
-
 #include <zephyr/logging/log.h>
 
-#include "bs_tracing.h"
-#include "bstests.h"
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-extern enum bst_result_t bst_result;
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)	  (void)atomic_set(&flag, (atomic_t) true)
-#define GET_FLAG(flag)	  (bool)atomic_get(&flag)
-#define UNSET_FLAG(flag)  (void)atomic_set(&flag, (atomic_t) false)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-
 LOG_MODULE_DECLARE(bt_bsim_ccc_store, LOG_LEVEL_DBG);
 
 #define DUMMY_SERVICE_TYPE    BT_UUID_128_ENCODE(0x2e2b8dc3, 0x06e0, 0x4f93, 0x9bb2, 0x734091c356f0)
@@ -46,11 +15,3 @@ LOG_MODULE_DECLARE(bt_bsim_ccc_store, LOG_LEVEL_DBG);
 
 #define VAL_HANDLE 18
 #define CCC_HANDLE 19
-
-#define BC_MSG_SIZE 2
-
-#define CLIENT_ID 0
-#define SERVER_ID 1
-
-void backchannel_sync_send(uint channel, uint device_nbr);
-void backchannel_sync_wait(uint channel, uint device_nbr);
diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/src/main.c b/tests/bsim/bluetooth/host/gatt/ccc_store/src/main.c
index fb47ef4c068..d37c1314e26 100644
--- a/tests/bsim/bluetooth/host/gatt/ccc_store/src/main.c
+++ b/tests/bsim/bluetooth/host/gatt/ccc_store/src/main.c
@@ -4,32 +4,13 @@
 
 #include <zephyr/kernel.h>
 
-#include "bs_types.h"
-#include "bs_tracing.h"
 #include "bstests.h"
-#include <string.h>
+#include <stdlib.h>
 
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(bt_bsim_ccc_store, LOG_LEVEL_DBG);
 
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-extern enum bst_result_t bst_result;
-
-#define WAIT_TIME_S 60
-#define WAIT_TIME   (WAIT_TIME_S * 1e6)
-
 static int n_times;
 
 extern void run_peripheral(int times);
@@ -45,41 +26,23 @@ static void peripheral_main(void)
 	run_peripheral(n_times);
 }
 
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error_time_line("Test failed (not passed after %d seconds)\n",
-					 WAIT_TIME_S);
-	}
-}
-
 static void test_args(int argc, char **argv)
 {
 	__ASSERT(argc == 1, "Please specify only 1 test argument\n");
 
-	n_times = atol(argv[0]);
-}
-
-static void test_ccc_store_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
+	n_times = strtol(argv[0], NULL, 10);
 }
 
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "central",
 		.test_descr = "Central device",
-		.test_pre_init_f = test_ccc_store_init,
-		.test_tick_f = test_tick,
 		.test_main_f = central_main,
 		.test_args_f = test_args,
 	},
 	{
 		.test_id = "peripheral",
 		.test_descr = "Peripheral device",
-		.test_pre_init_f = test_ccc_store_init,
-		.test_tick_f = test_tick,
 		.test_main_f = peripheral_main,
 		.test_args_f = test_args,
 	},
diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/src/peripheral.c b/tests/bsim/bluetooth/host/gatt/ccc_store/src/peripheral.c
index 873685ecd4f..6205306306b 100644
--- a/tests/bsim/bluetooth/host/gatt/ccc_store/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/gatt/ccc_store/src/peripheral.c
@@ -20,15 +20,17 @@
 #include "settings.h"
 
 #include "argparse.h"
-#include "bs_pc_backchannel.h"
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+#include "babblekit/sync.h"
 
 #define CLIENT_CHAN 0
 
-CREATE_FLAG(connected_flag);
-CREATE_FLAG(disconnected_flag);
-CREATE_FLAG(security_updated_flag);
+static DEFINE_FLAG(connected_flag);
+static DEFINE_FLAG(disconnected_flag);
+static DEFINE_FLAG(security_updated_flag);
 
-CREATE_FLAG(ccc_cfg_changed_flag);
+static DEFINE_FLAG(ccc_cfg_changed_flag);
 
 static const struct bt_uuid_128 dummy_service = BT_UUID_INIT_128(DUMMY_SERVICE_TYPE);
 
@@ -61,7 +63,7 @@ static void create_adv(struct bt_le_ext_adv **adv)
 
 	err = bt_le_ext_adv_create(BT_LE_ADV_CONN_FAST_1, NULL, adv);
 	if (err) {
-		FAIL("Failed to create advertiser (%d)\n", err);
+		TEST_FAIL("Failed to create advertiser (%d)", err);
 	}
 }
 
@@ -78,7 +80,7 @@ static void start_adv(struct bt_le_ext_adv *adv)
 
 	err = bt_le_ext_adv_start(adv, &start_params);
 	if (err) {
-		FAIL("Failed to start advertiser (err %d)\n", err);
+		TEST_FAIL("Failed to start advertiser (err %d)", err);
 	}
 
 	LOG_DBG("Advertiser started");
@@ -90,7 +92,7 @@ static void stop_adv(struct bt_le_ext_adv *adv)
 
 	err = bt_le_ext_adv_stop(adv);
 	if (err) {
-		FAIL("Failed to stop advertiser (err %d)\n", err);
+		TEST_FAIL("Failed to stop advertiser (err %d)", err);
 	}
 }
 
@@ -101,7 +103,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr_str, sizeof(addr_str));
 
 	if (err) {
-		FAIL("Failed to connect to %s (err %d)\n", addr_str, err);
+		TEST_FAIL("Failed to connect to %s (err %d)", addr_str, err);
 	}
 
 	LOG_DBG("Connected: %s", addr_str);
@@ -160,7 +162,7 @@ static void send_value_notification(void)
 
 	err = bt_gatt_notify(default_conn, attr, &value, sizeof(value));
 	if (err != 0) {
-		FAIL("Failed to send notification (err %d)\n", err);
+		TEST_FAIL("Failed to send notification (err %d)", err);
 	}
 
 	value++;
@@ -176,17 +178,17 @@ static void connect_pair_check_subscribtion(struct bt_le_ext_adv *adv)
 	UNSET_FLAG(security_updated_flag);
 
 	/* wait for confirmation of subscribtion from good client */
-	backchannel_sync_wait(CLIENT_CHAN, CLIENT_ID);
+	bk_sync_wait();
 
 	/* check that subscribtion request did not fail */
 	if (!is_peer_subscribed(default_conn)) {
-		FAIL("Client did not subscribed\n");
+		TEST_FAIL("Client did not subscribed");
 	}
 
 	stop_adv(adv);
 
 	/* confirm to client that the subscribtion has been well registered */
-	backchannel_sync_send(CLIENT_CHAN, CLIENT_ID);
+	bk_sync_send();
 
 	send_value_notification();
 }
@@ -201,42 +203,23 @@ static void connect_restore_sec_check_subscribtion(struct bt_le_ext_adv *adv)
 	UNSET_FLAG(security_updated_flag);
 
 	/* wait for client end of security update */
-	backchannel_sync_wait(CLIENT_CHAN, CLIENT_ID);
+	bk_sync_wait();
 
 	/* check that subscribtion has been restored */
 	if (!is_peer_subscribed(default_conn)) {
-		FAIL("Client is not subscribed\n");
+		TEST_FAIL("Client is not subscribed");
 	} else {
 		LOG_DBG("Client is subscribed");
 	}
 
 	/* confirm to good client that the subscribtion has been well restored */
-	backchannel_sync_send(CLIENT_CHAN, CLIENT_ID);
+	bk_sync_send();
 
 	send_value_notification();
 }
 
 /* Util functions */
 
-void peripheral_backchannel_init(void)
-{
-	uint device_number = get_device_nbr();
-	uint channel_numbers[1] = {
-		0,
-	};
-	uint device_numbers[1] = {
-		CLIENT_ID,
-	};
-	uint num_ch = 1;
-	uint *ch;
-
-	LOG_DBG("Opening back channels for device %d", device_number);
-	ch = bs_open_back_channel(device_number, device_numbers, channel_numbers, num_ch);
-	if (!ch) {
-		FAIL("Unable to open backchannel\n");
-	}
-}
-
 static void check_ccc_handle(void)
 {
 	struct bt_gatt_attr *service_notify_attr =
@@ -269,11 +252,11 @@ void run_peripheral(int times)
 	peripheral_cb.disconnected = disconnected;
 	peripheral_cb.security_changed = security_changed;
 
-	peripheral_backchannel_init();
+	TEST_ASSERT(bk_sync_init() == 0);
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 	}
 
 	LOG_DBG("Bluetooth initialized");
@@ -284,12 +267,12 @@ void run_peripheral(int times)
 
 	err = settings_load();
 	if (err) {
-		FAIL("Settings load failed (err %d)\n", err);
+		TEST_FAIL("Settings load failed (err %d)", err);
 	}
 
 	err = bt_unpair(BT_ID_DEFAULT, BT_ADDR_LE_ANY);
 	if (err) {
-		FAIL("Unpairing failed (err %d)\n", err);
+		TEST_FAIL("Unpairing failed (err %d)", err);
 	}
 
 	create_adv(&adv);
@@ -302,5 +285,5 @@ void run_peripheral(int times)
 		WAIT_FOR_FLAG(disconnected_flag);
 	}
 
-	PASS("Peripheral test passed\n");
+	TEST_PASS("Peripheral test passed");
 }
diff --git a/tests/bsim/bluetooth/host/gatt/general/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/general/CMakeLists.txt
index 7869a21840f..b279e8c1439 100644
--- a/tests/bsim/bluetooth/host/gatt/general/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/gatt/general/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_gatt)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources} )
 
diff --git a/tests/bsim/bluetooth/host/gatt/general/src/common.c b/tests/bsim/bluetooth/host/gatt/general/src/common.c
deleted file mode 100644
index df438607c5f..00000000000
--- a/tests/bsim/bluetooth/host/gatt/general/src/common.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "common.h"
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("test failed (not passed after %i seconds)\n", WAIT_TIME);
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-	bst_result = In_progress;
-}
diff --git a/tests/bsim/bluetooth/host/gatt/general/src/common.h b/tests/bsim/bluetooth/host/gatt/general/src/common.h
index b37e7aec46c..eb8fa59eb63 100644
--- a/tests/bsim/bluetooth/host/gatt/general/src/common.h
+++ b/tests/bsim/bluetooth/host/gatt/general/src/common.h
@@ -6,47 +6,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/kernel.h>
-
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "time_machine.h"
-#include "bstests.h"
-
-#include <zephyr/types.h>
-#include <stddef.h>
-#include <errno.h>
-
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/uuid.h>
-#include <zephyr/bluetooth/gatt.h>
-
-extern enum bst_result_t bst_result;
-
-#define WAIT_TIME (30 * 1e6) /*seconds*/
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t)false
-#define SET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)true)
-#define UNSET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)false)
-#define WAIT_FOR_FLAG(flag) \
-	while (!(bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1)); \
-	}
-
-#define FAIL(...) \
-	do { \
-		bst_result = Failed; \
-		bs_trace_error_time_line(__VA_ARGS__); \
-	} while (0)
-
-#define PASS(...) \
-	do { \
-		bst_result = Passed; \
-		bs_trace_info_time(1, __VA_ARGS__); \
-	} while (0)
-
 #define CHRC_SIZE 10
 #define LONG_CHRC_SIZE 40
 
@@ -69,6 +28,3 @@ extern enum bst_result_t bst_result;
 #define TEST_LESC_CHRC_UUID \
 	BT_UUID_DECLARE_128(0x01, 0x23, 0x45, 0x67, 0x89, 0x01, 0x02, 0x03, \
 			    0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0xFF, 0x33)
-
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
diff --git a/tests/bsim/bluetooth/host/gatt/general/src/gatt_client_test.c b/tests/bsim/bluetooth/host/gatt/general/src/gatt_client_test.c
index a0fe2704f8e..b78b5d2a619 100644
--- a/tests/bsim/bluetooth/host/gatt/general/src/gatt_client_test.c
+++ b/tests/bsim/bluetooth/host/gatt/general/src/gatt_client_test.c
@@ -4,16 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/kernel.h>
+
+#include <zephyr/types.h>
+#include <stddef.h>
+#include <errno.h>
+
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
 #include <zephyr/bluetooth/gatt.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 #include "common.h"
 
-CREATE_FLAG(flag_is_connected);
-CREATE_FLAG(flag_discover_complete);
-CREATE_FLAG(flag_security_changed);
-CREATE_FLAG(flag_write_complete);
-CREATE_FLAG(flag_read_complete);
+static DEFINE_FLAG(flag_is_connected);
+static DEFINE_FLAG(flag_discover_complete);
+static DEFINE_FLAG(flag_security_changed);
+static DEFINE_FLAG(flag_write_complete);
+static DEFINE_FLAG(flag_read_complete);
 
 static struct bt_conn *g_conn;
 static uint16_t chrc_handle;
@@ -36,7 +47,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != 0) {
-		FAIL("Failed to connect to %s (%u)\n", addr, err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, err);
 		return;
 	}
 
@@ -68,7 +79,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason)
 static void security_changed(struct bt_conn *conn, bt_security_t level, enum bt_security_err err)
 {
 	if (err != BT_SECURITY_ERR_SUCCESS) {
-		FAIL("Security failed (err %d)\n", err);
+		TEST_FAIL("Security failed (err %d)", err);
 	} else {
 		SET_FLAG(flag_security_changed);
 	}
@@ -101,14 +112,14 @@ void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 	printk("Stopping scan\n");
 	err = bt_le_scan_stop();
 	if (err != 0) {
-		FAIL("Could not stop scan: %d\n");
+		TEST_FAIL("Could not stop scan: %d");
 		return;
 	}
 
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN,
 				BT_LE_CONN_PARAM_DEFAULT, &g_conn);
 	if (err != 0) {
-		FAIL("Could not connect to peer: %d\n", err);
+		TEST_FAIL("Could not connect to peer: %d", err);
 	}
 }
 
@@ -120,7 +131,7 @@ static uint8_t discover_func(struct bt_conn *conn,
 
 	if (attr == NULL) {
 		if (chrc_handle == 0 || long_chrc_handle == 0) {
-			FAIL("Did not discover chrc (%x) or long_chrc (%x)\n", chrc_handle,
+			TEST_FAIL("Did not discover chrc (%x) or long_chrc (%x)", chrc_handle,
 			     long_chrc_handle);
 		}
 
@@ -142,7 +153,7 @@ static uint8_t discover_func(struct bt_conn *conn,
 
 		err = bt_gatt_discover(conn, params);
 		if (err != 0) {
-			FAIL("Discover failed (err %d)\n", err);
+			TEST_FAIL("Discover failed (err %d)", err);
 		}
 
 		return BT_GATT_ITER_STOP;
@@ -182,7 +193,7 @@ static void gatt_discover(void)
 
 	err = bt_gatt_discover(g_conn, &discover_params);
 	if (err != 0) {
-		FAIL("Discover failed(err %d)\n", err);
+		TEST_FAIL("Discover failed(err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(flag_discover_complete);
@@ -196,7 +207,7 @@ static void update_security(void)
 	printk("Updating security\n");
 	err = bt_conn_set_security(g_conn, BT_SECURITY_L2);
 	if (err != 0) {
-		FAIL("Set security failed (err %d)\n", err);
+		TEST_FAIL("Set security failed (err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(flag_security_changed);
@@ -241,13 +252,13 @@ static void gatt_write(uint16_t handle, uint8_t expect_att_err)
 
 	err = bt_gatt_write(g_conn, &write_params);
 	if (err != 0) {
-		FAIL("bt_gatt_write failed: %d\n", err);
+		TEST_FAIL("bt_gatt_write failed: %d", err);
 	}
 
 	WAIT_FOR_FLAG(flag_write_complete);
 
 	if (att_err != expect_att_err) {
-		FAIL("Write failed: 0x%02X\n", att_err);
+		TEST_FAIL("Write failed: 0x%02X", att_err);
 	}
 
 	printk("success\n");
@@ -270,7 +281,8 @@ static uint8_t gatt_read_cb(struct bt_conn *conn, uint8_t err,
 
 	if (data != NULL) {
 		if (data_received_size + length > sizeof(data_received)) {
-			FAIL("Invalid amount of data received: %u\n", data_received_size + length);
+			TEST_FAIL("Invalid amount of data received: %u",
+				  data_received_size + length);
 		} else {
 			memcpy(&data_received[data_received_size], data, length);
 			data_received_size += length;
@@ -282,23 +294,25 @@ static uint8_t gatt_read_cb(struct bt_conn *conn, uint8_t err,
 	if (params->single.handle == chrc_handle) {
 		if (data_received_size != CHRC_SIZE ||
 		    memcmp(data_received, chrc_data, data_received_size) != 0) {
-			FAIL("chrc data different than expected (%u %u)\n", length, CHRC_SIZE);
+			TEST_FAIL("chrc data different than expected (%u %u)", length, CHRC_SIZE);
 		}
 	} else if (params->single.handle == long_chrc_handle) {
 		if (data_received_size != LONG_CHRC_SIZE ||
 		    memcmp(data_received, long_chrc_data, data_received_size) != 0) {
-			FAIL("long_chrc data different than expected (%u %u)\n", length,
-			     LONG_CHRC_SIZE);
+			TEST_FAIL("long_chrc data different than expected (%u %u)", length,
+				  LONG_CHRC_SIZE);
 		}
 	} else if (params->single.handle == enc_chrc_handle) {
 		if (data_received_size != CHRC_SIZE ||
 		    memcmp(data_received, chrc_data, data_received_size) != 0) {
-			FAIL("enc_chrc data different than expected (%u %u)\n", length, CHRC_SIZE);
+			TEST_FAIL("enc_chrc data different than expected (%u %u)", length,
+				  CHRC_SIZE);
 		}
 	} else if (params->single.handle == lesc_chrc_handle) {
 		if (data_received_size != CHRC_SIZE ||
 		    memcmp(data_received, chrc_data, data_received_size) != 0) {
-			FAIL("lesc_chrc data different than expected (%u %u)\n", length, CHRC_SIZE);
+			TEST_FAIL("lesc_chrc data different than expected (%u %u)", length,
+				  CHRC_SIZE);
 		}
 	}
 
@@ -335,13 +349,13 @@ static void gatt_read(uint16_t handle, uint8_t expect_att_err)
 
 	err = bt_gatt_read(g_conn, &read_params);
 	if (err != 0) {
-		FAIL("bt_gatt_read failed: %d\n", err);
+		TEST_FAIL("bt_gatt_read failed: %d", err);
 	}
 
 	WAIT_FOR_FLAG(flag_read_complete);
 
 	if (att_err != expect_att_err) {
-		FAIL("Read failed: 0x%02X\n", att_err);
+		TEST_FAIL("Read failed: 0x%02X", att_err);
 	}
 
 	printk("success\n");
@@ -355,12 +369,12 @@ static void test_main(void)
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth discover failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth discover failed (err %d)", err);
 	}
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
 	if (err != 0) {
-		FAIL("Scanning failed to start (err %d)\n", err);
+		TEST_FAIL("Scanning failed to start (err %d)", err);
 	}
 
 	printk("Scanning successfully started\n");
@@ -389,14 +403,12 @@ static void test_main(void)
 	gatt_write(lesc_chrc_handle, BT_ATT_ERR_SUCCESS);
 	gatt_read(lesc_chrc_handle, BT_ATT_ERR_SUCCESS);
 
-	PASS("GATT client Passed\n");
+	TEST_PASS("GATT client Passed");
 }
 
 static const struct bst_test_instance test_vcs[] = {
 	{
 		.test_id = "gatt_client",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/gatt/general/src/gatt_server_test.c b/tests/bsim/bluetooth/host/gatt/general/src/gatt_server_test.c
index 476f5bba0ef..6f3225c4d29 100644
--- a/tests/bsim/bluetooth/host/gatt/general/src/gatt_server_test.c
+++ b/tests/bsim/bluetooth/host/gatt/general/src/gatt_server_test.c
@@ -4,11 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/kernel.h>
+
+#include <zephyr/types.h>
+#include <stddef.h>
+#include <errno.h>
+
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
+
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 #include "common.h"
 
 extern enum bst_result_t bst_result;
 
-CREATE_FLAG(flag_is_connected);
+static DEFINE_FLAG(flag_is_connected);
 
 static struct bt_conn *g_conn;
 
@@ -19,7 +33,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != 0) {
-		FAIL("Failed to connect to %s (%u)\n", addr, err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, err);
 		return;
 	}
 
@@ -79,7 +93,7 @@ static ssize_t write_test_chrc(struct bt_conn *conn,
 	}
 
 	if (flags != 0) {
-		FAIL("Invalid flags %u\n", flags);
+		TEST_FAIL("Invalid flags %u", flags);
 		return BT_GATT_ERR(BT_ATT_ERR_UNLIKELY);
 	}
 
@@ -155,7 +169,7 @@ static void test_main(void)
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 		return;
 	}
 
@@ -163,7 +177,7 @@ static void test_main(void)
 
 	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)\n", err);
+		TEST_FAIL("Advertising failed to start (err %d)", err);
 		return;
 	}
 
@@ -171,14 +185,12 @@ static void test_main(void)
 
 	WAIT_FOR_FLAG(flag_is_connected);
 
-	PASS("GATT server passed\n");
+	TEST_PASS("GATT server passed");
 }
 
 static const struct bst_test_instance test_gatt_server[] = {
 	{
 		.test_id = "gatt_server",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/gatt/general/test_scripts/gatt.sh b/tests/bsim/bluetooth/host/gatt/general/test_scripts/gatt.sh
index df41707e832..dbcf0078403 100755
--- a/tests/bsim/bluetooth/host/gatt/general/test_scripts/gatt.sh
+++ b/tests/bsim/bluetooth/host/gatt/general/test_scripts/gatt.sh
@@ -21,6 +21,6 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_general_prj_conf \
   -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=gatt_server -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=60e6 $@
+  -D=2 -sim_length=30e6 $@
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/gatt/notify/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/notify/CMakeLists.txt
index 7869a21840f..b279e8c1439 100644
--- a/tests/bsim/bluetooth/host/gatt/notify/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/gatt/notify/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_gatt)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources} )
 
diff --git a/tests/bsim/bluetooth/host/gatt/notify/src/common.c b/tests/bsim/bluetooth/host/gatt/notify/src/common.c
deleted file mode 100644
index df438607c5f..00000000000
--- a/tests/bsim/bluetooth/host/gatt/notify/src/common.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "common.h"
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("test failed (not passed after %i seconds)\n", WAIT_TIME);
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-	bst_result = In_progress;
-}
diff --git a/tests/bsim/bluetooth/host/gatt/notify/src/common.h b/tests/bsim/bluetooth/host/gatt/notify/src/common.h
index 67486b175e4..1058eb86d37 100644
--- a/tests/bsim/bluetooth/host/gatt/notify/src/common.h
+++ b/tests/bsim/bluetooth/host/gatt/notify/src/common.h
@@ -6,46 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/kernel.h>
-
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "time_machine.h"
-#include "bstests.h"
-
-#include <zephyr/types.h>
-#include <stddef.h>
-#include <errno.h>
-
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/uuid.h>
-#include <zephyr/bluetooth/gatt.h>
-
-extern enum bst_result_t bst_result;
-
-#define WAIT_TIME (60 * 1e6) /*seconds*/
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t)false
-#define SET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)true)
-#define UNSET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)false)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
+#include <zephyr/toolchain.h>
 
 #define CHRC_SIZE 10
 #define LONG_CHRC_SIZE 40
@@ -62,8 +23,5 @@ extern enum bst_result_t bst_result;
 	BT_UUID_DECLARE_128(0x01, 0x23, 0x45, 0x67, 0x89, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,      \
 			    0x07, 0x08, 0x09, 0xFF, 0x11)
 
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
-
 #define NOTIFICATION_COUNT 10
 BUILD_ASSERT(NOTIFICATION_COUNT % 2 == 0);
diff --git a/tests/bsim/bluetooth/host/gatt/notify/src/gatt_client_test.c b/tests/bsim/bluetooth/host/gatt/notify/src/gatt_client_test.c
index 125029653a0..273ddf51aa7 100644
--- a/tests/bsim/bluetooth/host/gatt/notify/src/gatt_client_test.c
+++ b/tests/bsim/bluetooth/host/gatt/notify/src/gatt_client_test.c
@@ -4,16 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stddef.h>
+#include <errno.h>
+
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
 #include <zephyr/bluetooth/gatt.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 #include "common.h"
 
-CREATE_FLAG(flag_is_connected);
-CREATE_FLAG(flag_is_encrypted);
-CREATE_FLAG(flag_discover_complete);
-CREATE_FLAG(flag_short_subscribed);
-CREATE_FLAG(flag_long_subscribed);
+static DEFINE_FLAG(flag_is_connected);
+static DEFINE_FLAG(flag_is_encrypted);
+static DEFINE_FLAG(flag_discover_complete);
+static DEFINE_FLAG(flag_short_subscribed);
+static DEFINE_FLAG(flag_long_subscribed);
 
 static struct bt_conn *g_conn;
 static uint16_t chrc_handle;
@@ -27,7 +37,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != 0) {
-		FAIL("Failed to connect to %s (%u)\n", addr, err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, err);
 		return;
 	}
 
@@ -57,9 +67,9 @@ static void disconnected(struct bt_conn *conn, uint8_t reason)
 void security_changed(struct bt_conn *conn, bt_security_t level, enum bt_security_err err)
 {
 	if (err) {
-		FAIL("Encryption failer (%d)\n", err);
+		TEST_FAIL("Encryption failure (%d)", err);
 	} else if (level < BT_SECURITY_L2) {
-		FAIL("Insufficient sec level (%d)\n", level);
+		TEST_FAIL("Insufficient sec level (%d)", level);
 	} else {
 		SET_FLAG(flag_is_encrypted);
 	}
@@ -91,13 +101,13 @@ void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type, struct ne
 	printk("Stopping scan\n");
 	err = bt_le_scan_stop();
 	if (err != 0) {
-		FAIL("Could not stop scan: %d");
+		TEST_FAIL("Could not stop scan: %d");
 		return;
 	}
 
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT, &g_conn);
 	if (err != 0) {
-		FAIL("Could not connect to peer: %d", err);
+		TEST_FAIL("Could not connect to peer: %d", err);
 	}
 }
 
@@ -108,7 +118,7 @@ static uint8_t discover_func(struct bt_conn *conn, const struct bt_gatt_attr *at
 
 	if (attr == NULL) {
 		if (chrc_handle == 0 || long_chrc_handle == 0) {
-			FAIL("Did not discover chrc (%x) or long_chrc (%x)", chrc_handle,
+			TEST_FAIL("Did not discover chrc (%x) or long_chrc (%x)", chrc_handle,
 			     long_chrc_handle);
 		}
 
@@ -130,7 +140,7 @@ static uint8_t discover_func(struct bt_conn *conn, const struct bt_gatt_attr *at
 
 		err = bt_gatt_discover(conn, params);
 		if (err != 0) {
-			FAIL("Discover failed (err %d)\n", err);
+			TEST_FAIL("Discover failed (err %d)", err);
 		}
 
 		return BT_GATT_ITER_STOP;
@@ -165,7 +175,7 @@ static void gatt_discover(enum bt_att_chan_opt opt)
 
 	err = bt_gatt_discover(g_conn, &discover_params);
 	if (err != 0) {
-		FAIL("Discover failed(err %d)\n", err);
+		TEST_FAIL("Discover failed(err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(flag_discover_complete);
@@ -176,7 +186,7 @@ static void test_short_subscribed(struct bt_conn *conn, uint8_t err,
 				  struct bt_gatt_subscribe_params *params)
 {
 	if (err) {
-		FAIL("Subscribe failed (err %d)\n", err);
+		TEST_FAIL("Subscribe failed (err %d)", err);
 	}
 
 	SET_FLAG(flag_short_subscribed);
@@ -189,7 +199,7 @@ static void test_short_subscribed(struct bt_conn *conn, uint8_t err,
 	if (params->value_handle == chrc_handle) {
 		printk("Subscribed to short characteristic\n");
 	} else {
-		FAIL("Unknown handle %d\n", params->value_handle);
+		TEST_FAIL("Unknown handle %d", params->value_handle);
 	}
 }
 
@@ -197,7 +207,7 @@ static void test_long_subscribed(struct bt_conn *conn, uint8_t err,
 				 struct bt_gatt_subscribe_params *params)
 {
 	if (err) {
-		FAIL("Subscribe failed (err %d)\n", err);
+		TEST_FAIL("Subscribe failed (err %d)", err);
 	}
 
 	SET_FLAG(flag_long_subscribed);
@@ -210,7 +220,7 @@ static void test_long_subscribed(struct bt_conn *conn, uint8_t err,
 	if (params->value_handle == long_chrc_handle) {
 		printk("Subscribed to long characteristic\n");
 	} else {
-		FAIL("Unknown handle %d\n", params->value_handle);
+		TEST_FAIL("Unknown handle %d", params->value_handle);
 	}
 }
 
@@ -250,7 +260,7 @@ static void gatt_subscribe_short(enum bt_att_chan_opt opt)
 	sub_params_short.chan_opt = opt;
 	err = bt_gatt_subscribe(g_conn, &sub_params_short);
 	if (err < 0) {
-		FAIL("Failed to subscribe\n");
+		TEST_FAIL("Failed to subscribe");
 	} else {
 		printk("Subscribe request sent\n");
 	}
@@ -264,7 +274,7 @@ static void gatt_unsubscribe_short(enum bt_att_chan_opt opt)
 	sub_params_short.chan_opt = opt;
 	err = bt_gatt_unsubscribe(g_conn, &sub_params_short);
 	if (err < 0) {
-		FAIL("Failed to unsubscribe\n");
+		TEST_FAIL("Failed to unsubscribe");
 	} else {
 		printk("Unsubscribe request sent\n");
 	}
@@ -279,7 +289,7 @@ static void gatt_subscribe_long(enum bt_att_chan_opt opt)
 	sub_params_long.chan_opt = opt;
 	err = bt_gatt_subscribe(g_conn, &sub_params_long);
 	if (err < 0) {
-		FAIL("Failed to subscribe\n");
+		TEST_FAIL("Failed to subscribe");
 	} else {
 		printk("Subscribe request sent\n");
 	}
@@ -294,7 +304,7 @@ static void gatt_unsubscribe_long(enum bt_att_chan_opt opt)
 	sub_params_long.chan_opt = opt;
 	err = bt_gatt_unsubscribe(g_conn, &sub_params_long);
 	if (err < 0) {
-		FAIL("Failed to unsubscribe\n");
+		TEST_FAIL("Failed to unsubscribe");
 	} else {
 		printk("Unsubscribe request sent\n");
 	}
@@ -306,12 +316,12 @@ static void setup(void)
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth discover failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth discover failed (err %d)", err);
 	}
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
 	if (err != 0) {
-		FAIL("Scanning failed to start (err %d)\n", err);
+		TEST_FAIL("Scanning failed to start (err %d)", err);
 	}
 
 	printk("Scanning successfully started\n");
@@ -320,7 +330,7 @@ static void setup(void)
 
 	err = bt_conn_set_security(g_conn, BT_SECURITY_L2);
 	if (err) {
-		FAIL("Starting encryption procedure failed (%d)\n", err);
+		TEST_FAIL("Starting encryption procedure failed (%d)", err);
 	}
 
 	WAIT_FOR_FLAG(flag_is_encrypted);
@@ -354,7 +364,7 @@ static void test_main_none(void)
 
 	printk("Unsubscribed\n");
 
-	PASS("GATT client Passed\n");
+	TEST_PASS("GATT client Passed");
 }
 
 static void test_main_unenhanced(void)
@@ -380,7 +390,7 @@ static void test_main_unenhanced(void)
 
 	printk("Unsubscribed\n");
 
-	PASS("GATT client Passed\n");
+	TEST_PASS("GATT client Passed");
 }
 
 static void test_main_enhanced(void)
@@ -406,7 +416,7 @@ static void test_main_enhanced(void)
 
 	printk("Unsubscribed\n");
 
-	PASS("GATT client Passed\n");
+	TEST_PASS("GATT client Passed");
 }
 
 static void test_main_mixed(void)
@@ -432,32 +442,24 @@ static void test_main_mixed(void)
 
 	printk("Unsubscribed\n");
 
-	PASS("GATT client Passed\n");
+	TEST_PASS("GATT client Passed");
 }
 
 static const struct bst_test_instance test_vcs[] = {
 	{
 		.test_id = "gatt_client_none",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main_none,
 	},
 	{
 		.test_id = "gatt_client_unenhanced",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main_unenhanced,
 	},
 	{
 		.test_id = "gatt_client_enhanced",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main_enhanced,
 	},
 	{
 		.test_id = "gatt_client_mixed",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main_mixed,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/gatt/notify/src/gatt_server_test.c b/tests/bsim/bluetooth/host/gatt/notify/src/gatt_server_test.c
index 6b4cc13a7c2..d293ad9ac19 100644
--- a/tests/bsim/bluetooth/host/gatt/notify/src/gatt_server_test.c
+++ b/tests/bsim/bluetooth/host/gatt/notify/src/gatt_server_test.c
@@ -3,14 +3,26 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
+#include <stddef.h>
+#include <errno.h>
+
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
+
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 #include "common.h"
 
 extern enum bst_result_t bst_result;
 
-CREATE_FLAG(flag_is_connected);
-CREATE_FLAG(flag_short_subscribe);
-CREATE_FLAG(flag_long_subscribe);
+static DEFINE_FLAG(flag_is_connected);
+static DEFINE_FLAG(flag_short_subscribe);
+static DEFINE_FLAG(flag_long_subscribe);
 
 static struct bt_conn *g_conn;
 
@@ -25,7 +37,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != 0) {
-		FAIL("Failed to connect to %s (%u)\n", addr, err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, err);
 		return;
 	}
 
@@ -137,7 +149,7 @@ static void short_notify(enum bt_att_chan_opt opt)
 		if (err == -ENOMEM) {
 			k_sleep(K_MSEC(10));
 		} else if (err) {
-			FAIL("Short notify failed (err %d)\n", err);
+			TEST_FAIL("Short notify failed (err %d)", err);
 		}
 	} while (err);
 }
@@ -163,7 +175,7 @@ static void long_notify(enum bt_att_chan_opt opt)
 		if (err == -ENOMEM) {
 			k_sleep(K_MSEC(10));
 		} else if (err) {
-			FAIL("Long notify failed (err %d)\n", err);
+			TEST_FAIL("Long notify failed (err %d)", err);
 		}
 	} while (err);
 }
@@ -177,7 +189,7 @@ static void setup(void)
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 		return;
 	}
 
@@ -185,7 +197,7 @@ static void setup(void)
 
 	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)\n", err);
+		TEST_FAIL("Advertising failed to start (err %d)", err);
 		return;
 	}
 
@@ -215,7 +227,7 @@ static void test_main_none(void)
 		k_sleep(K_MSEC(100));
 	}
 
-	PASS("GATT server passed\n");
+	TEST_PASS("GATT server passed");
 }
 
 static void test_main_enhanced(void)
@@ -231,7 +243,7 @@ static void test_main_enhanced(void)
 		k_sleep(K_MSEC(100));
 	}
 
-	PASS("GATT server passed\n");
+	TEST_PASS("GATT server passed");
 }
 
 static void test_main_unenhanced(void)
@@ -247,7 +259,7 @@ static void test_main_unenhanced(void)
 		k_sleep(K_MSEC(100));
 	}
 
-	PASS("GATT server passed\n");
+	TEST_PASS("GATT server passed");
 }
 
 static void test_main_mixed(void)
@@ -263,32 +275,24 @@ static void test_main_mixed(void)
 		k_sleep(K_MSEC(100));
 	}
 
-	PASS("GATT server passed\n");
+	TEST_PASS("GATT server passed");
 }
 
 static const struct bst_test_instance test_gatt_server[] = {
 	{
 		.test_id = "gatt_server_none",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main_none,
 	},
 	{
 		.test_id = "gatt_server_unenhanced",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main_unenhanced,
 	},
 	{
 		.test_id = "gatt_server_enhanced",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main_enhanced,
 	},
 	{
 		.test_id = "gatt_server_mixed",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main_mixed,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/gatt/settings/src/main.c b/tests/bsim/bluetooth/host/gatt/settings/src/main.c
index 6fd131ca3ed..12fbed9e8f8 100644
--- a/tests/bsim/bluetooth/host/gatt/settings/src/main.c
+++ b/tests/bsim/bluetooth/host/gatt/settings/src/main.c
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdlib.h>
 #include "utils.h"
 #include "main.h"
 #include "argparse.h"
@@ -41,8 +42,8 @@ static void test_args(int argc, char **argv)
 {
 	__ASSERT(argc == 3, "Please specify only 3 test arguments\n");
 
-	test_round = atol(argv[0]);
-	final_round = atol(argv[1]);
+	test_round = strtol(argv[0], NULL, 10);
+	final_round = strtol(argv[1], NULL, 10);
 	settings_file = argv[2];
 
 	bs_trace_raw(0, "Test round %u\n", test_round);
diff --git a/tests/bsim/bluetooth/host/iso/bis/CMakeLists.txt b/tests/bsim/bluetooth/host/iso/bis/CMakeLists.txt
index 89a3d5cf313..c9ecd0997a3 100644
--- a/tests/bsim/bluetooth/host/iso/bis/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/iso/bis/CMakeLists.txt
@@ -10,7 +10,6 @@ add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
 target_link_libraries(app PRIVATE babblekit)
 
 target_sources(app PRIVATE
-  src/common.c
   src/bis_broadcaster.c
   src/bis_receiver.c
   src/main.c
diff --git a/tests/bsim/bluetooth/host/iso/bis/src/bis_broadcaster.c b/tests/bsim/bluetooth/host/iso/bis/src/bis_broadcaster.c
index 4afc0bb3247..cef7d417ff3 100644
--- a/tests/bsim/bluetooth/host/iso/bis/src/bis_broadcaster.c
+++ b/tests/bsim/bluetooth/host/iso/bis/src/bis_broadcaster.c
@@ -3,9 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
-#include "common.h"
-
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/iso.h>
 #include <zephyr/logging/log.h>
@@ -308,15 +305,11 @@ static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "broadcaster",
 		.test_descr = "Minimal BIS broadcaster that broadcast ISO data",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main,
 	},
 	{
 		.test_id = "broadcaster_disable",
 		.test_descr = "BIS broadcaster that tests bt_disable for ISO",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main_disable,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/iso/bis/src/bis_receiver.c b/tests/bsim/bluetooth/host/iso/bis/src/bis_receiver.c
index ac72cd26694..d4a03284c17 100644
--- a/tests/bsim/bluetooth/host/iso/bis/src/bis_receiver.c
+++ b/tests/bsim/bluetooth/host/iso/bis/src/bis_receiver.c
@@ -5,7 +5,6 @@
  */
 
 #include <stdint.h>
-#include "common.h"
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/gap.h>
@@ -270,8 +269,6 @@ static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "receiver",
 		.test_descr = "receiver",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/iso/bis/src/common.c b/tests/bsim/bluetooth/host/iso/bis/src/common.c
deleted file mode 100644
index f644f9181c2..00000000000
--- a/tests/bsim/bluetooth/host/iso/bis/src/common.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include <string.h>
-
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/addr.h>
-#include <zephyr/sys/printk.h>
-#include <zephyr/sys/util.h>
-
-#include "babblekit/flags.h"
-#include "babblekit/testcase.h"
-
-#include "common.h"
-
-extern enum bst_result_t bst_result;
-
-void test_init(void)
-{
-	bst_result = In_progress;
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		TEST_FAIL("Test failed (not passed after %" PRIu64 " us)", WAIT_TIME);
-	}
-}
diff --git a/tests/bsim/bluetooth/host/iso/bis/src/common.h b/tests/bsim/bluetooth/host/iso/bis/src/common.h
deleted file mode 100644
index 60a191e3883..00000000000
--- a/tests/bsim/bluetooth/host/iso/bis/src/common.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Common functions and helpers for ISO broadcast tests
- *
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "bstests.h"
-
-#define WAIT_TIME (30e6) /* 30 seconds*/
-
-void test_init(void);
-void test_tick(bs_time_t HW_device_time);
diff --git a/tests/bsim/bluetooth/host/iso/cis/CMakeLists.txt b/tests/bsim/bluetooth/host/iso/cis/CMakeLists.txt
index 2e8e50c8f7f..a0328bc6870 100644
--- a/tests/bsim/bluetooth/host/iso/cis/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/iso/cis/CMakeLists.txt
@@ -18,6 +18,9 @@ zephyr_include_directories(
   )
 
 add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/common/testlib testlib)
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+
 target_link_libraries(app PRIVATE
   testlib
+  babblekit
 )
diff --git a/tests/bsim/bluetooth/host/iso/cis/src/cis_central.c b/tests/bsim/bluetooth/host/iso/cis/src/cis_central.c
index 80fff68d4ef..75c92a9e181 100644
--- a/tests/bsim/bluetooth/host/iso/cis/src/cis_central.c
+++ b/tests/bsim/bluetooth/host/iso/cis/src/cis_central.c
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 #include "common.h"
 
 #include <zephyr/bluetooth/bluetooth.h>
@@ -25,7 +27,7 @@ NET_BUF_POOL_FIXED_DEFINE(tx_pool, ENQUEUE_COUNT, BT_ISO_SDU_BUF_SIZE(CONFIG_BT_
 
 BUILD_ASSERT(CONFIG_BT_ISO_MAX_CHAN > 1, "CONFIG_BT_ISO_MAX_CHAN shall be at least 2");
 
-CREATE_FLAG(flag_iso_connected);
+static DEFINE_FLAG(flag_iso_connected);
 
 static void send_data_cb(struct k_work *work)
 {
@@ -35,7 +37,7 @@ static void send_data_cb(struct k_work *work)
 	struct net_buf *buf;
 	int ret;
 
-	if (!TEST_FLAG(flag_iso_connected)) {
+	if (!IS_FLAG_SET(flag_iso_connected)) {
 		/* TX has been aborted */
 		return;
 	}
@@ -86,7 +88,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 
 	err = bt_le_scan_stop();
 	if (err) {
-		FAIL("Failed to stop scanning (err %d)\n", err);
+		TEST_FAIL("Failed to stop scanning (err %d)", err);
 
 		return;
 	}
@@ -94,7 +96,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT,
 				&default_conn);
 	if (err) {
-		FAIL("Failed to create connection (err %d)\n", err);
+		TEST_FAIL("Failed to create connection (err %d)", err);
 
 		return;
 	}
@@ -132,14 +134,14 @@ static void sdu_sent_cb(struct bt_iso_chan *chan)
 
 	enqueue_cnt++;
 
-	if (!TEST_FLAG(flag_iso_connected)) {
+	if (!IS_FLAG_SET(flag_iso_connected)) {
 		/* TX has been aborted */
 		return;
 	}
 
 	err = k_work_schedule(&iso_send_work, K_NO_WAIT);
 	if (err < 0) {
-		FAIL("Failed to schedule TX for chan %p: %d\n", chan, err);
+		TEST_FAIL("Failed to schedule TX for chan %p: %d", chan, err);
 	}
 }
 
@@ -164,7 +166,7 @@ static void init(void)
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth enable failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth enable failed (err %d)", err);
 
 		return;
 	}
@@ -208,7 +210,7 @@ static void create_cig(size_t iso_channels)
 
 	err = bt_iso_cig_create(&param, &cig);
 	if (err != 0) {
-		FAIL("Failed to create CIG (%d)\n", err);
+		TEST_FAIL("Failed to create CIG (%d)", err);
 
 		return;
 	}
@@ -224,14 +226,14 @@ static int reconfigure_cig_interval(struct bt_iso_cig_param *param)
 	param->p_to_c_interval = param->c_to_p_interval;
 	err = bt_iso_cig_reconfigure(cig, param);
 	if (err != 0) {
-		FAIL("Failed to reconfigure CIG to new interval (%d)\n", err);
+		TEST_FAIL("Failed to reconfigure CIG to new interval (%d)", err);
 
 		return err;
 	}
 
 	err = bt_iso_cig_reconfigure(cig, param);
 	if (err != 0) {
-		FAIL("Failed to reconfigure CIG to same interval (%d)\n", err);
+		TEST_FAIL("Failed to reconfigure CIG to same interval (%d)", err);
 
 		return err;
 	}
@@ -241,7 +243,7 @@ static int reconfigure_cig_interval(struct bt_iso_cig_param *param)
 	param->p_to_c_interval = 2500; /* us */
 	err = bt_iso_cig_reconfigure(cig, param);
 	if (err != 0) {
-		FAIL("Failed to reconfigure CIG to new interval (%d)\n", err);
+		TEST_FAIL("Failed to reconfigure CIG to new interval (%d)", err);
 
 		return err;
 	}
@@ -259,7 +261,7 @@ static int reconfigure_cig_latency(struct bt_iso_cig_param *param)
 	param->p_to_c_latency = param->c_to_p_latency;
 	err = bt_iso_cig_reconfigure(cig, param);
 	if (err != 0) {
-		FAIL("Failed to reconfigure CIG latency (%d)\n", err);
+		TEST_FAIL("Failed to reconfigure CIG latency (%d)", err);
 
 		return err;
 	}
@@ -268,7 +270,7 @@ static int reconfigure_cig_latency(struct bt_iso_cig_param *param)
 	param->p_to_c_latency = 40; /* ms */
 	err = bt_iso_cig_reconfigure(cig, param);
 	if (err != 0) {
-		FAIL("Failed to reconfigure CIG for different latencies (%d)\n", err);
+		TEST_FAIL("Failed to reconfigure CIG for different latencies (%d)", err);
 
 		return err;
 	}
@@ -293,7 +295,7 @@ static void reconfigure_cig(void)
 
 	err = bt_iso_cig_reconfigure(cig, &param);
 	if (err != 0) {
-		FAIL("Failed to reconfigure CIS to new RTN (%d)\n", err);
+		TEST_FAIL("Failed to reconfigure CIS to new RTN (%d)", err);
 
 		return;
 	}
@@ -316,7 +318,8 @@ static void reconfigure_cig(void)
 
 	err = bt_iso_cig_reconfigure(cig, &param);
 	if (err != 0) {
-		FAIL("Failed to reconfigure CIG with new CIS and original parameters (%d)\n", err);
+		TEST_FAIL("Failed to reconfigure CIG with new CIS and original parameters (%d)",
+			  err);
 
 		return;
 	}
@@ -328,12 +331,12 @@ static void connect_acl(void)
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
 	if (err != 0) {
-		FAIL("Scanning failed to start (err %d)\n", err);
+		TEST_FAIL("Scanning failed to start (err %d)", err);
 
 		return;
 	}
 
-	WAIT_FOR_FLAG_SET(flag_connected);
+	WAIT_FOR_FLAG(flag_connected);
 }
 
 static void connect_cis(void)
@@ -346,12 +349,12 @@ static void connect_cis(void)
 
 	err = bt_iso_chan_connect(&connect_param, 1);
 	if (err) {
-		FAIL("Failed to connect ISO (%d)\n", err);
+		TEST_FAIL("Failed to connect ISO (%d)", err);
 
 		return;
 	}
 
-	WAIT_FOR_FLAG_SET(flag_iso_connected);
+	WAIT_FOR_FLAG(flag_iso_connected);
 }
 
 static void disconnect_cis(void)
@@ -360,7 +363,7 @@ static void disconnect_cis(void)
 
 	err = bt_iso_chan_disconnect(default_chan);
 	if (err) {
-		FAIL("Failed to disconnect ISO (err %d)\n", err);
+		TEST_FAIL("Failed to disconnect ISO (err %d)", err);
 
 		return;
 	}
@@ -374,7 +377,7 @@ static void disconnect_acl(void)
 
 	err = bt_conn_disconnect(default_conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
 	if (err) {
-		FAIL("Failed to disconnect ACL (err %d)\n", err);
+		TEST_FAIL("Failed to disconnect ACL (err %d)", err);
 
 		return;
 	}
@@ -388,7 +391,7 @@ static void terminate_cig(void)
 
 	err = bt_iso_cig_terminate(cig);
 	if (err != 0) {
-		FAIL("Failed to terminate CIG (%d)\n", err);
+		TEST_FAIL("Failed to terminate CIG (%d)", err);
 
 		return;
 	}
@@ -404,7 +407,7 @@ static void reset_bluetooth(void)
 
 	err = bt_disable();
 	if (err != 0) {
-		FAIL("Failed to disable (%d)\n", err);
+		TEST_FAIL("Failed to disable (%d)", err);
 
 		return;
 	}
@@ -414,7 +417,7 @@ static void reset_bluetooth(void)
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Failed to re-enable (%d)\n", err);
+		TEST_FAIL("Failed to re-enable (%d)", err);
 
 		return;
 	}
@@ -436,7 +439,7 @@ static void test_main(void)
 	disconnect_acl();
 	terminate_cig();
 
-	PASS("Test passed\n");
+	TEST_PASS("Test passed");
 }
 
 static void test_main_disable(void)
@@ -464,22 +467,18 @@ static void test_main_disable(void)
 	disconnect_acl();
 	terminate_cig();
 
-	PASS("Disable test passed\n");
+	TEST_PASS("Disable test passed");
 }
 
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "central",
 		.test_descr = "Central",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main,
 	},
 	{
 		.test_id = "central_disable",
 		.test_descr = "CIS central that tests bt_disable for ISO",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main_disable,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/iso/cis/src/cis_peripheral.c b/tests/bsim/bluetooth/host/iso/cis/src/cis_peripheral.c
index 56fe4070ad5..abd7bba1c5a 100644
--- a/tests/bsim/bluetooth/host/iso/cis/src/cis_peripheral.c
+++ b/tests/bsim/bluetooth/host/iso/cis/src/cis_peripheral.c
@@ -6,6 +6,8 @@
 
 #include <stdbool.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 #include "common.h"
 
 #include <zephyr/bluetooth/bluetooth.h>
@@ -16,7 +18,7 @@
 
 extern enum bst_result_t bst_result;
 
-CREATE_FLAG(flag_data_received);
+static DEFINE_FLAG(flag_data_received);
 
 static const struct bt_data ad[] = {
 	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
@@ -85,7 +87,7 @@ static int iso_accept(const struct bt_iso_accept_info *info, struct bt_iso_chan
 	printk("Incoming request from %p\n", (void *)info->acl);
 
 	if (iso_chan.iso) {
-		FAIL("No channels available\n");
+		TEST_FAIL("No channels available");
 
 		return -ENOMEM;
 	}
@@ -120,7 +122,7 @@ static void init(void)
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Bluetooth enable failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth enable failed (err %d)", err);
 
 		return;
 	}
@@ -133,7 +135,7 @@ static void init(void)
 
 	err = bt_iso_server_register(&iso_server);
 	if (err) {
-		FAIL("Unable to register ISO server (err %d)\n", err);
+		TEST_FAIL("Unable to register ISO server (err %d)", err);
 
 		return;
 	}
@@ -145,14 +147,14 @@ static void adv_connect(void)
 
 	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err) {
-		FAIL("Advertising failed to start (err %d)\n", err);
+		TEST_FAIL("Advertising failed to start (err %d)", err);
 
 		return;
 	}
 
 	printk("Advertising successfully started\n");
 
-	WAIT_FOR_FLAG_SET(flag_connected);
+	WAIT_FOR_FLAG(flag_connected);
 }
 
 static void test_main(void)
@@ -163,8 +165,8 @@ static void test_main(void)
 		adv_connect();
 		bt_testlib_conn_wait_free();
 
-		if (TEST_FLAG(flag_data_received)) {
-			PASS("Test passed\n");
+		if (IS_FLAG_SET(flag_data_received)) {
+			TEST_PASS("Test passed");
 		}
 	}
 }
@@ -173,8 +175,6 @@ static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "peripheral",
 		.test_descr = "Peripheral",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/iso/cis/src/common.c b/tests/bsim/bluetooth/host/iso/cis/src/common.c
index ef1a4e9f9dd..0bd848897b2 100644
--- a/tests/bsim/bluetooth/host/iso/cis/src/common.c
+++ b/tests/bsim/bluetooth/host/iso/cis/src/common.c
@@ -10,6 +10,8 @@
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/util.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 #include "common.h"
 
 extern enum bst_result_t bst_result;
@@ -31,7 +33,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 		bt_conn_unref(default_conn);
 		default_conn = NULL;
 
-		FAIL("Failed to connect to %s (0x%02x)\n", addr, err);
+		TEST_FAIL("Failed to connect to %s (0x%02x)", addr, err);
 
 		return;
 	}
@@ -72,16 +74,3 @@ BT_CONN_CB_DEFINE(conn_callbacks) = {
 	.disconnected = disconnected,
 	.le_param_updated = conn_param_updated_cb,
 };
-
-void test_init(void)
-{
-	bst_result = In_progress;
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("Test failed (not passed after %i us)\n", WAIT_TIME);
-	}
-}
diff --git a/tests/bsim/bluetooth/host/iso/cis/src/common.h b/tests/bsim/bluetooth/host/iso/cis/src/common.h
index 0b41515d223..53f8d4ed1fb 100644
--- a/tests/bsim/bluetooth/host/iso/cis/src/common.h
+++ b/tests/bsim/bluetooth/host/iso/cis/src/common.h
@@ -10,40 +10,6 @@
 
 #include <zephyr/sys/atomic.h>
 
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "bstests.h"
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)    (void)atomic_set(&flag, (atomic_t) true)
-#define UNSET_FLAG(flag)  (void)atomic_set(&flag, (atomic_t) false)
-#define TEST_FLAG(flag)   (atomic_get(&flag) == (atomic_t) true)
-#define WAIT_FOR_FLAG_SET(flag)                                                                    \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)                                                                  \
-	while ((bool)atomic_get(&flag)) {                                                          \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-
-#define WAIT_TIME (30e6) /* 30 seconds*/
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
 extern struct bt_conn *default_conn;
 extern atomic_t flag_connected;
 extern atomic_t flag_conn_updated;
-
-void test_init(void);
-void test_tick(bs_time_t HW_device_time);
diff --git a/tests/bsim/bluetooth/host/l2cap/credits/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/credits/CMakeLists.txt
index c28d99b9d67..1fca2758390 100644
--- a/tests/bsim/bluetooth/host/l2cap/credits/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/l2cap/credits/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_l2cap_credits)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources} )
 
diff --git a/tests/bsim/bluetooth/host/l2cap/credits/src/common.c b/tests/bsim/bluetooth/host/l2cap/credits/src/common.c
deleted file mode 100644
index 5b344c60571..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/credits/src/common.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "common.h"
-
-extern enum bst_result_t bst_result;
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-	bst_result = In_progress;
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("test failed (not passed after %i seconds)\n", WAIT_SECONDS);
-	}
-}
diff --git a/tests/bsim/bluetooth/host/l2cap/credits/src/common.h b/tests/bsim/bluetooth/host/l2cap/credits/src/common.h
deleted file mode 100644
index a778b7d5e1c..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/credits/src/common.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Common functions and helpers for L2CAP tests
- *
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stddef.h>
-
-#include <zephyr/types.h>
-#include <zephyr/sys/util.h>
-#include <zephyr/sys/byteorder.h>
-
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/l2cap.h>
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "bstests.h"
-#include "bs_pc_backchannel.h"
-
-extern enum bst_result_t bst_result;
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t)false
-#define SET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)true)
-#define UNSET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)false)
-#define TEST_FLAG(flag) (atomic_get(&flag) == (atomic_t)true)
-#define WAIT_FOR_FLAG_SET(flag)		   \
-	while (!(bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1));  \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)	  \
-	while ((bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1)); \
-	}
-
-
-#define WAIT_SECONDS 30 /* seconds */
-#define WAIT_TIME (WAIT_SECONDS * USEC_PER_SEC) /* microseconds*/
-
-#define FAIL(...)				       \
-	do {					       \
-		bst_result = Failed;		       \
-		bs_trace_error_time_line(__VA_ARGS__); \
-	} while (0)
-
-#define PASS(...)				    \
-	do {					    \
-		bst_result = Passed;		    \
-		bs_trace_info_time(1, __VA_ARGS__); \
-	} while (0)
-
-#define ASSERT(expr, ...) if (!(expr)) {FAIL(__VA_ARGS__); }
-
-void test_init(void);
-void test_tick(bs_time_t HW_device_time);
diff --git a/tests/bsim/bluetooth/host/l2cap/credits/src/main.c b/tests/bsim/bluetooth/host/l2cap/credits/src/main.c
index f35abf350ac..8e7df0f5ade 100644
--- a/tests/bsim/bluetooth/host/l2cap/credits/src/main.c
+++ b/tests/bsim/bluetooth/host/l2cap/credits/src/main.c
@@ -6,15 +6,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bstests.h"
-#include "common.h"
+#include <stddef.h>
+
+#include <zephyr/types.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
+
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/l2cap.h>
+
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 #define LOG_MODULE_NAME main
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_DBG);
 
-CREATE_FLAG(is_connected);
-CREATE_FLAG(flag_l2cap_connected);
+static DEFINE_FLAG(is_connected);
+static DEFINE_FLAG(flag_l2cap_connected);
 
 #define L2CAP_MPS       CONFIG_BT_L2CAP_TX_MTU
 #define SDU_NUM         3
@@ -44,7 +54,7 @@ int l2cap_chan_send(struct bt_l2cap_chan *chan, uint8_t *data, size_t len)
 	struct net_buf *buf = net_buf_alloc(&sdu_pool, K_NO_WAIT);
 
 	if (buf == NULL) {
-		FAIL("No more memory\n");
+		TEST_FAIL("No more memory");
 		return -ENOMEM;
 	}
 
@@ -53,7 +63,7 @@ int l2cap_chan_send(struct bt_l2cap_chan *chan, uint8_t *data, size_t len)
 
 	int ret = bt_l2cap_chan_send(chan, buf);
 
-	ASSERT(ret >= 0, "Failed sending: err %d", ret);
+	TEST_ASSERT(ret >= 0, "Failed sending: err %d", ret);
 
 	LOG_DBG("sent %d len %d", ret, len);
 	return ret;
@@ -94,7 +104,7 @@ int recv_cb(struct bt_l2cap_chan *chan, struct net_buf *buf)
 	rx_cnt++;
 
 	/* Verify SDU data matches TX'd data. */
-	ASSERT(memcmp(buf->data, tx_data, buf->len) == 0, "RX data doesn't match TX");
+	TEST_ASSERT(memcmp(buf->data, tx_data, buf->len) == 0, "RX data doesn't match TX");
 
 	/* Keep a ref for a few seconds: this will make the allocation fail, as
 	 * there is only 1 buffer in the pool.
@@ -160,7 +170,7 @@ static int l2cap_server_register(bt_security_t sec_level)
 
 	int err = bt_l2cap_server_register(&test_l2cap_server);
 
-	ASSERT(err == 0, "Failed to register l2cap server.");
+	TEST_ASSERT(err == 0, "Failed to register l2cap server.");
 
 	return test_l2cap_server.psm;
 }
@@ -172,7 +182,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (conn_err) {
-		FAIL("Failed to connect to %s (%u)", addr, conn_err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, conn_err);
 		return;
 	}
 
@@ -204,7 +214,7 @@ static void disconnect_device(struct bt_conn *conn, void *data)
 	SET_FLAG(is_connected);
 
 	err = bt_conn_disconnect(conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
-	ASSERT(!err, "Failed to initate disconnect (err %d)", err);
+	TEST_ASSERT(!err, "Failed to initate disconnect (err %d)", err);
 
 	LOG_DBG("Waiting for disconnection...");
 	WAIT_FOR_FLAG_UNSET(is_connected);
@@ -222,7 +232,7 @@ static void test_peripheral_main(void)
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Can't enable Bluetooth (err %d)", err);
+		TEST_FAIL("Can't enable Bluetooth (err %d)", err);
 		return;
 	}
 
@@ -230,13 +240,13 @@ static void test_peripheral_main(void)
 	LOG_DBG("Connectable advertising...");
 	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, NULL, 0, NULL, 0);
 	if (err) {
-		FAIL("Advertising failed to start (err %d)", err);
+		TEST_FAIL("Advertising failed to start (err %d)", err);
 		return;
 	}
 
 	LOG_DBG("Advertising started.");
 	LOG_DBG("Peripheral waiting for connection...");
-	WAIT_FOR_FLAG_SET(is_connected);
+	WAIT_FOR_FLAG(is_connected);
 	LOG_DBG("Peripheral Connected.");
 
 	int psm = l2cap_server_register(BT_SECURITY_L1);
@@ -261,9 +271,9 @@ static void test_peripheral_main(void)
 	bt_conn_foreach(BT_CONN_TYPE_LE, disconnect_device, NULL);
 	LOG_INF("Total received: %d", rx_cnt);
 
-	ASSERT(rx_cnt == SDU_NUM, "Did not receive expected no of SDUs\n");
+	TEST_ASSERT(rx_cnt == SDU_NUM, "Did not receive expected no of SDUs\n");
 
-	PASS("L2CAP CREDITS Peripheral passed\n");
+	TEST_PASS("L2CAP CREDITS Peripheral passed");
 }
 
 static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
@@ -275,7 +285,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 
 	err = bt_le_scan_stop();
 	if (err) {
-		FAIL("Stop LE scan failed (err %d)", err);
+		TEST_FAIL("Stop LE scan failed (err %d)", err);
 		return;
 	}
 
@@ -288,7 +298,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 	param = BT_LE_CONN_PARAM_DEFAULT;
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, param, &conn);
 	if (err) {
-		FAIL("Create conn failed (err %d)", err);
+		TEST_FAIL("Create conn failed (err %d)", err);
 		return;
 	}
 }
@@ -306,10 +316,10 @@ static void connect_peripheral(void)
 
 	int err = bt_le_scan_start(&scan_param, device_found);
 
-	ASSERT(!err, "Scanning failed to start (err %d)\n", err);
+	TEST_ASSERT(!err, "Scanning failed to start (err %d)\n", err);
 
 	LOG_DBG("Central initiating connection...");
-	WAIT_FOR_FLAG_SET(is_connected);
+	WAIT_FOR_FLAG(is_connected);
 }
 
 static void connect_l2cap_channel(struct bt_conn *conn, void *data)
@@ -323,9 +333,9 @@ static void connect_l2cap_channel(struct bt_conn *conn, void *data)
 	UNSET_FLAG(flag_l2cap_connected);
 
 	err = bt_l2cap_chan_connect(conn, &le_chan->chan, 0x0080);
-	ASSERT(!err, "Error connecting l2cap channel (err %d)\n", err);
+	TEST_ASSERT(!err, "Error connecting l2cap channel (err %d)\n", err);
 
-	WAIT_FOR_FLAG_SET(flag_l2cap_connected);
+	WAIT_FOR_FLAG(flag_l2cap_connected);
 }
 
 static void connect_l2cap_ecred_channel(struct bt_conn *conn, void *data)
@@ -340,9 +350,9 @@ static void connect_l2cap_ecred_channel(struct bt_conn *conn, void *data)
 	UNSET_FLAG(flag_l2cap_connected);
 
 	err = bt_l2cap_ecred_chan_connect(conn, chan_list, 0x0080);
-	ASSERT(!err, "Error connecting l2cap channel (err %d)\n", err);
+	TEST_ASSERT(!err, "Error connecting l2cap channel (err %d)\n", err);
 
-	WAIT_FOR_FLAG_SET(flag_l2cap_connected);
+	WAIT_FOR_FLAG(flag_l2cap_connected);
 }
 
 static void test_central_main(void)
@@ -356,7 +366,7 @@ static void test_central_main(void)
 	}
 
 	err = bt_enable(NULL);
-	ASSERT(err == 0, "Can't enable Bluetooth (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Can't enable Bluetooth (err %d)\n", err);
 	LOG_DBG("Central Bluetooth initialized.");
 
 	connect_peripheral();
@@ -380,22 +390,18 @@ static void test_central_main(void)
 
 	WAIT_FOR_FLAG_UNSET(is_connected);
 	LOG_DBG("Peripheral disconnected.");
-	PASS("L2CAP CREDITS Central passed\n");
+	TEST_PASS("L2CAP CREDITS Central passed");
 }
 
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "peripheral",
 		.test_descr = "Peripheral L2CAP CREDITS",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_peripheral_main
 	},
 	{
 		.test_id = "central",
 		.test_descr = "Central L2CAP CREDITS",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_central_main
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/CMakeLists.txt
index cf303ae2ef6..40e8bd1e367 100644
--- a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/CMakeLists.txt
@@ -5,8 +5,10 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_l2cap_credits_seg_recv)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
-  src/common.c
   src/main.c
   )
 
diff --git a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/src/common.c b/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/src/common.c
deleted file mode 100644
index 6b607482012..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/src/common.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "common.h"
-
-extern enum bst_result_t bst_result;
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-	bst_result = In_progress;
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("test failed (not passed after %i seconds)\n", WAIT_SECONDS);
-	}
-}
diff --git a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/src/common.h b/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/src/common.h
deleted file mode 100644
index c0b7ae353b4..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/src/common.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Common functions and helpers for L2CAP tests
- *
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stddef.h>
-
-#include <zephyr/types.h>
-#include <zephyr/sys/util.h>
-#include <zephyr/sys/byteorder.h>
-
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/l2cap.h>
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "bstests.h"
-#include "bs_pc_backchannel.h"
-
-extern enum bst_result_t bst_result;
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t)false
-#define SET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)true)
-#define UNSET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)false)
-#define TEST_FLAG(flag) (atomic_get(&flag) == (atomic_t)true)
-#define WAIT_FOR_FLAG_SET(flag)		   \
-	while (!(bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1));  \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)	  \
-	while ((bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1)); \
-	}
-
-
-#define WAIT_SECONDS 30 /* seconds */
-#define WAIT_TIME (WAIT_SECONDS * USEC_PER_SEC) /* microseconds*/
-
-#define FAIL(...)				       \
-	do {					       \
-		bst_result = Failed;		       \
-		bs_trace_error_time_line(__VA_ARGS__); \
-	} while (0)
-
-#define PASS(...)				    \
-	do {					    \
-		bst_result = Passed;		    \
-		bs_trace_info_time(1, __VA_ARGS__); \
-	} while (0)
-
-#define ASSERT(expr, ...) if (!(expr)) {FAIL(__VA_ARGS__); }
-
-void test_init(void);
-void test_tick(bs_time_t HW_device_time);
diff --git a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/src/main.c b/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/src/main.c
index 1ee69d76585..d06188510c4 100644
--- a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/src/main.c
+++ b/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/src/main.c
@@ -4,15 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bstests.h"
-#include "common.h"
+#include <stddef.h>
+
+#include <zephyr/types.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
+
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/l2cap.h>
+
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 #define LOG_MODULE_NAME main
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_DBG);
 
-CREATE_FLAG(is_connected);
-CREATE_FLAG(flag_l2cap_connected);
+static DEFINE_FLAG(is_connected);
+static DEFINE_FLAG(flag_l2cap_connected);
 
 #define L2CAP_MPS CONFIG_BT_L2CAP_TX_MTU
 #define SDU_NUM   3
@@ -44,7 +54,7 @@ int l2cap_chan_send(struct bt_l2cap_chan *chan, uint8_t *data, size_t len)
 	buf = net_buf_alloc(&sdu_pool, K_NO_WAIT);
 
 	if (buf == NULL) {
-		FAIL("No more memory\n");
+		TEST_FAIL("No more memory");
 		return -ENOMEM;
 	}
 
@@ -53,7 +63,7 @@ int l2cap_chan_send(struct bt_l2cap_chan *chan, uint8_t *data, size_t len)
 
 	ret = bt_l2cap_chan_send(chan, buf);
 
-	ASSERT(ret >= 0, "Failed sending: err %d", ret);
+	TEST_ASSERT(ret >= 0, "Failed sending: err %d", ret);
 
 	LOG_DBG("sent %d len %d", ret, len);
 	return ret;
@@ -88,10 +98,11 @@ void recv_cb(struct bt_l2cap_chan *l2cap_chan, size_t sdu_len, off_t seg_offset,
 {
 	LOG_DBG("sdu len %u frag offset %u frag len %u", sdu_len, seg_offset, seg->len);
 
-	ASSERT(sdu_len == sizeof(tx_data), "Recv SDU length does not match send length.");
+	TEST_ASSERT(sdu_len == sizeof(tx_data), "Recv SDU length does not match send length.");
 
 	/* Verify SDU data matches TX'd data. */
-	ASSERT(memcmp(seg->data, &tx_data[seg_offset], seg->len) == 0, "RX data doesn't match TX");
+	TEST_ASSERT(memcmp(seg->data, &tx_data[seg_offset], seg->len) == 0,
+		    "RX data doesn't match TX");
 
 	if (seg_offset + seg->len == sdu_len) {
 		/* Don't give credits right away. The taker of this
@@ -171,7 +182,7 @@ static int l2cap_server_register(bt_security_t sec_level)
 
 	err = bt_l2cap_server_register(&test_l2cap_server);
 
-	ASSERT(err == 0, "Failed to register l2cap server.");
+	TEST_ASSERT(err == 0, "Failed to register l2cap server.");
 
 	return test_l2cap_server.psm;
 }
@@ -183,7 +194,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (conn_err) {
-		FAIL("Failed to connect to %s (%u)", addr, conn_err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, conn_err);
 		return;
 	}
 
@@ -215,7 +226,7 @@ static void disconnect_device(struct bt_conn *conn, void *data)
 	SET_FLAG(is_connected);
 
 	err = bt_conn_disconnect(conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
-	ASSERT(!err, "Failed to initate disconnect (err %d)", err);
+	TEST_ASSERT(!err, "Failed to initate disconnect (err %d)", err);
 
 	LOG_DBG("Waiting for disconnection...");
 	WAIT_FOR_FLAG_UNSET(is_connected);
@@ -235,7 +246,7 @@ static void test_peripheral_main(void)
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Can't enable Bluetooth (err %d)", err);
+		TEST_FAIL("Can't enable Bluetooth (err %d)", err);
 		return;
 	}
 
@@ -243,13 +254,13 @@ static void test_peripheral_main(void)
 	LOG_DBG("Connectable advertising...");
 	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, NULL, 0, NULL, 0);
 	if (err) {
-		FAIL("Advertising failed to start (err %d)", err);
+		TEST_FAIL("Advertising failed to start (err %d)", err);
 		return;
 	}
 
 	LOG_DBG("Advertising started.");
 	LOG_DBG("Peripheral waiting for connection...");
-	WAIT_FOR_FLAG_SET(is_connected);
+	WAIT_FOR_FLAG(is_connected);
 	LOG_DBG("Peripheral Connected.");
 
 	psm = l2cap_server_register(BT_SECURITY_L1);
@@ -274,9 +285,9 @@ static void test_peripheral_main(void)
 	bt_conn_foreach(BT_CONN_TYPE_LE, disconnect_device, NULL);
 	LOG_INF("Total received: %d", rx_cnt);
 
-	ASSERT(rx_cnt == SDU_NUM, "Did not receive expected no of SDUs\n");
+	TEST_ASSERT(rx_cnt == SDU_NUM, "Did not receive expected no of SDUs");
 
-	PASS("L2CAP CREDITS Peripheral passed\n");
+	TEST_PASS("L2CAP CREDITS Peripheral passed");
 }
 
 static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
@@ -289,7 +300,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 
 	err = bt_le_scan_stop();
 	if (err) {
-		FAIL("Stop LE scan failed (err %d)", err);
+		TEST_FAIL("Stop LE scan failed (err %d)", err);
 		return;
 	}
 
@@ -300,7 +311,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 	param = BT_LE_CONN_PARAM_DEFAULT;
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, param, &conn);
 	if (err) {
-		FAIL("Create conn failed (err %d)", err);
+		TEST_FAIL("Create conn failed (err %d)", err);
 		return;
 	}
 }
@@ -319,10 +330,10 @@ static void connect_peripheral(void)
 
 	err = bt_le_scan_start(&scan_param, device_found);
 
-	ASSERT(!err, "Scanning failed to start (err %d)\n", err);
+	TEST_ASSERT(!err, "Scanning failed to start (err %d)", err);
 
 	LOG_DBG("Central initiating connection...");
-	WAIT_FOR_FLAG_SET(is_connected);
+	WAIT_FOR_FLAG(is_connected);
 }
 
 static void connect_l2cap_channel(struct bt_conn *conn, void *data)
@@ -346,9 +357,9 @@ static void connect_l2cap_channel(struct bt_conn *conn, void *data)
 	bt_l2cap_chan_give_credits(&le_chan->chan, 1);
 
 	err = bt_l2cap_chan_connect(conn, &le_chan->chan, 0x0080);
-	ASSERT(!err, "Error connecting l2cap channel (err %d)\n", err);
+	TEST_ASSERT(!err, "Error connecting l2cap channel (err %d)", err);
 
-	WAIT_FOR_FLAG_SET(flag_l2cap_connected);
+	WAIT_FOR_FLAG(flag_l2cap_connected);
 }
 
 static void connect_l2cap_ecred_channel(struct bt_conn *conn, void *data)
@@ -373,9 +384,9 @@ static void connect_l2cap_ecred_channel(struct bt_conn *conn, void *data)
 	bt_l2cap_chan_give_credits(&le_chan->chan, 1);
 
 	err = bt_l2cap_ecred_chan_connect(conn, chan_list, 0x0080);
-	ASSERT(!err, "Error connecting l2cap channel (err %d)\n", err);
+	TEST_ASSERT(!err, "Error connecting l2cap channel (err %d)", err);
 
-	WAIT_FOR_FLAG_SET(flag_l2cap_connected);
+	WAIT_FOR_FLAG(flag_l2cap_connected);
 }
 
 static void test_central_main(void)
@@ -390,7 +401,7 @@ static void test_central_main(void)
 	}
 
 	err = bt_enable(NULL);
-	ASSERT(err == 0, "Can't enable Bluetooth (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Can't enable Bluetooth (err %d)", err);
 	LOG_DBG("Central Bluetooth initialized.");
 
 	connect_peripheral();
@@ -414,19 +425,15 @@ static void test_central_main(void)
 
 	WAIT_FOR_FLAG_UNSET(is_connected);
 	LOG_DBG("Peripheral disconnected.");
-	PASS("L2CAP CREDITS Central passed\n");
+	TEST_PASS("L2CAP CREDITS Central passed");
 }
 
 static const struct bst_test_instance test_def[] = {
 	{.test_id = "peripheral",
 	 .test_descr = "Peripheral L2CAP CREDITS",
-	 .test_pre_init_f = test_init,
-	 .test_tick_f = test_tick,
 	 .test_main_f = test_peripheral_main},
 	{.test_id = "central",
 	 .test_descr = "Central L2CAP CREDITS",
-	 .test_pre_init_f = test_init,
-	 .test_tick_f = test_tick,
 	 .test_main_f = test_central_main},
 	BSTEST_END_MARKER,
 };
diff --git a/tests/bsim/bluetooth/host/l2cap/general/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/general/CMakeLists.txt
index 6adc381f4f5..5ac53e80ae1 100644
--- a/tests/bsim/bluetooth/host/l2cap/general/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/l2cap/general/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_l2cap)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources} )
 
diff --git a/tests/bsim/bluetooth/host/l2cap/general/src/common.c b/tests/bsim/bluetooth/host/l2cap/general/src/common.c
deleted file mode 100644
index 648b58f271b..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/general/src/common.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "common.h"
-
-#define LOG_MODULE_NAME common
-
-#include <zephyr/logging/log.h>
-
-LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_DBG);
-
-extern enum bst_result_t bst_result;
-
-void test_init(void)
-{
-	bst_result = In_progress;
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("test failed (not passed after %i us)\n", WAIT_TIME);
-	}
-}
-
-/* Call in init functions*/
-void device_sync_init(uint device_nbr)
-{
-	uint peer = CENTRAL_ID;
-
-	if (device_nbr == CENTRAL_ID) {
-		peer = PERIPHERAL_ID;
-	}
-
-	uint dev_nbrs[BACK_CHANNELS] = {peer};
-	uint channel_nbrs[BACK_CHANNELS] = {0};
-	uint *ch = bs_open_back_channel(device_nbr, dev_nbrs, channel_nbrs, BACK_CHANNELS);
-
-	if (!ch) {
-		LOG_ERR("bs_open_back_channel failed!");
-	}
-}
-
-/* Call it to make peer to proceed.*/
-void device_sync_send(void)
-{
-	uint8_t msg[1] = "S";
-
-	bs_bc_send_msg(0, msg, sizeof(msg));
-}
-
-/* Wait until peer send sync*/
-void device_sync_wait(void)
-{
-	int size_msg_received = 0;
-	uint8_t msg;
-
-	while (!size_msg_received) {
-		size_msg_received = bs_bc_is_msg_received(0);
-		k_sleep(K_MSEC(1));
-	}
-
-	bs_bc_receive_msg(0, &msg, size_msg_received);
-}
diff --git a/tests/bsim/bluetooth/host/l2cap/general/src/common.h b/tests/bsim/bluetooth/host/l2cap/general/src/common.h
deleted file mode 100644
index a399786bfd2..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/general/src/common.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Common functions and helpers for L2CAP tests
- *
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stddef.h>
-
-#include <zephyr/types.h>
-#include <zephyr/sys/util.h>
-#include <zephyr/sys/byteorder.h>
-
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/l2cap.h>
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "bstests.h"
-#include "bs_pc_backchannel.h"
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t)false
-#define SET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)true)
-#define UNSET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)false)
-#define TEST_FLAG(flag) (atomic_get(&flag) == (atomic_t)true)
-#define WAIT_FOR_FLAG_SET(flag)		   \
-	while (!(bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1));  \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)	  \
-	while ((bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1)); \
-	}
-
-
-#define WAIT_TIME (60e6) /* 60 seconds*/
-
-#define FAIL(...)				       \
-	do {					       \
-		bst_result = Failed;		       \
-		bs_trace_error_time_line(__VA_ARGS__); \
-	} while (0)
-
-#define PASS(...)				    \
-	do {					    \
-		bst_result = Passed;		    \
-		bs_trace_info_time(1, __VA_ARGS__); \
-	} while (0)
-
-#define CENTRAL_ID 0
-#define PERIPHERAL_ID 1
-#define BACK_CHANNELS 1
-
-void test_init(void);
-void test_tick(bs_time_t HW_device_time);
-void device_sync_init(uint device_nbr);
-void device_sync_send(void);
-void device_sync_wait(void);
diff --git a/tests/bsim/bluetooth/host/l2cap/general/src/main_l2cap_ecred.c b/tests/bsim/bluetooth/host/l2cap/general/src/main_l2cap_ecred.c
index 06135e030a5..4cd2f619ff7 100644
--- a/tests/bsim/bluetooth/host/l2cap/general/src/main_l2cap_ecred.c
+++ b/tests/bsim/bluetooth/host/l2cap/general/src/main_l2cap_ecred.c
@@ -6,7 +6,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common.h"
+#include <stddef.h>
+
+#include <zephyr/types.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
+
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/l2cap.h>
+
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+#include "babblekit/sync.h"
 
 #define LOG_MODULE_NAME main_l2cap_ecred
 #include <zephyr/logging/log.h>
@@ -54,8 +66,8 @@ struct channel {
 };
 static struct channel channels[L2CAP_CHANNELS];
 
-CREATE_FLAG(is_connected);
-CREATE_FLAG(unsequenced_data);
+static DEFINE_FLAG(is_connected);
+static DEFINE_FLAG(unsequenced_data);
 
 #define T_STACK_SIZE 512
 #define T_PRIORITY 5
@@ -90,22 +102,23 @@ static int chan_recv_cb(struct bt_l2cap_chan *l2cap_chan, struct net_buf *buf)
 
 	LOG_DBG("received_iterration %i sdus_received %i, chan_id: %d, data_length: %d",
 		received_iterration, chan->sdus_received, chan->chan_id, buf->len);
-	if (!TEST_FLAG(unsequenced_data) && received_iterration != chan->sdus_received) {
-		FAIL("Received out of sequence data.");
+	if (!IS_FLAG_SET(unsequenced_data) && received_iterration != chan->sdus_received) {
+		TEST_FAIL("Received out of sequence data.");
 	}
 
 	const int retval = memcmp(buf->data + sizeof(received_iterration),
 			    chan->payload + sizeof(received_iterration),
 			    buf->len - sizeof(received_iterration));
 	if (retval) {
-		FAIL("Payload received didn't match expected value memcmp returned %i", retval);
+		TEST_FAIL("Payload received didn't match expected value memcmp returned %i",
+			  retval);
 	}
 
 	/*By the time we rx on long msg channel we should have already rx on short msg channel*/
 	if (chan->chan_id == 0) {
 		if (channels[SHORT_MSG_CHAN_IDX].sdus_received !=
 			(channels[LONG_MSG_CHAN_IDX].sdus_received + 1)) {
-			FAIL("Didn't receive on short msg channel first");
+			TEST_FAIL("Didn't receive on short msg channel first");
 		}
 	}
 
@@ -232,7 +245,7 @@ static void connect_num_channels(uint8_t num_l2cap_channels)
 		struct channel *chan = get_free_channel();
 
 		if (!chan) {
-			FAIL("failed, chan not free");
+			TEST_FAIL("failed, chan not free");
 			return;
 		}
 
@@ -243,7 +256,7 @@ static void connect_num_channels(uint8_t num_l2cap_channels)
 						     servers[0].psm);
 
 	if (err) {
-		FAIL("can't connect ecred %d ", err);
+		TEST_FAIL("can't connect ecred %d ", err);
 	}
 }
 
@@ -297,7 +310,7 @@ static void register_l2cap_server(void)
 
 	server = get_free_server();
 	if (!server) {
-		FAIL("Failed to get free server");
+		TEST_FAIL("Failed to get free server");
 		return;
 	}
 
@@ -305,7 +318,7 @@ static void register_l2cap_server(void)
 	server->psm = 0;
 
 	if (bt_l2cap_server_register(server) < 0) {
-		FAIL("Failed to get free server");
+		TEST_FAIL("Failed to get free server");
 		return;
 	}
 
@@ -319,7 +332,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (conn_err) {
-		FAIL("Failed to connect to %s (%u)", addr, conn_err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, conn_err);
 		bt_conn_unref(default_conn);
 		default_conn = NULL;
 		return;
@@ -340,7 +353,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason)
 	LOG_DBG("%s (reason 0x%02x)", addr, reason);
 
 	if (default_conn != conn) {
-		FAIL("Conn mismatch disconnect %s %s)", default_conn, conn);
+		TEST_FAIL("Conn mismatch disconnect %s %s)", default_conn, conn);
 		return;
 	}
 
@@ -363,7 +376,7 @@ static void send_sdu(int iteration, int chan_idx, int bytes)
 	sys_put_le32(iteration, channels[chan_idx].payload);
 
 	if (channels[chan_idx].buf != 0) {
-		FAIL("Buf should have been deallocated by now");
+		TEST_FAIL("Buf should have been deallocated by now");
 		return;
 	}
 
@@ -374,7 +387,7 @@ static void send_sdu(int iteration, int chan_idx, int bytes)
 	}
 
 	if (buf == NULL) {
-		FAIL("Failed to get buff on ch %i, iteration %i should never happen", chan_idx,
+		TEST_FAIL("Failed to get buff on ch %i, iteration %i should never happen", chan_idx,
 		     chan_idx);
 	}
 
@@ -388,7 +401,7 @@ static void send_sdu(int iteration, int chan_idx, int bytes)
 	LOG_DBG("bt_l2cap_chan_send returned: %i", ret);
 
 	if (ret < 0) {
-		FAIL("Error: send failed error: %i", ret);
+		TEST_FAIL("Error: send failed error: %i", ret);
 		channels[chan_idx].buf = 0;
 		net_buf_unref(buf);
 	}
@@ -412,7 +425,7 @@ static void send_sdu_concurrently(void)
 								&channels[k].work);
 
 			if (err < 0) {
-				FAIL("Failed to submit work to the queue, error: %d", err);
+				TEST_FAIL("Failed to submit work to the queue, error: %d", err);
 			}
 		}
 
@@ -436,14 +449,14 @@ static int change_mtu_on_channels(int num_channels, int new_mtu)
 
 static void test_peripheral_main(void)
 {
-	device_sync_init(PERIPHERAL_ID);
+	TEST_ASSERT(bk_sync_init() == 0, "Failed to open backchannel");
 	LOG_DBG("*L2CAP ECRED Peripheral started*");
 	init_workqs();
 	int err;
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Can't enable Bluetooth (err %d)", err);
+		TEST_FAIL("Can't enable Bluetooth (err %d)", err);
 		return;
 	}
 
@@ -451,13 +464,13 @@ static void test_peripheral_main(void)
 	LOG_DBG("Connectable advertising...");
 	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err) {
-		FAIL("Advertising failed to start (err %d)", err);
+		TEST_FAIL("Advertising failed to start (err %d)", err);
 		return;
 	}
 
 	LOG_DBG("Advertising started.");
 	LOG_DBG("Peripheral waiting for connection...");
-	WAIT_FOR_FLAG_SET(is_connected);
+	WAIT_FOR_FLAG(is_connected);
 	LOG_DBG("Peripheral Connected.");
 	register_l2cap_server();
 	connect_num_channels(L2CAP_CHANNELS);
@@ -472,7 +485,7 @@ static void test_peripheral_main(void)
 	k_sem_take(&all_chan_conn_sem, K_FOREVER);
 
 	LOG_DBG("Send sync after reconnection");
-	device_sync_send();
+	bk_sync_send();
 
 	/* Send bytes on both channels and expect ch 1 to receive all of them before ch 0 *********/
 	LOG_DBG("############# Send bytes on both channels concurrently");
@@ -483,20 +496,20 @@ static void test_peripheral_main(void)
 	err = change_mtu_on_channels(L2CAP_CHANNELS, CONFIG_BT_L2CAP_TX_MTU + 10);
 
 	if (err) {
-		FAIL("MTU change failed (err %d)\n", err);
+		TEST_FAIL("MTU change failed (err %d)", err);
 	}
 
 	/* Read from both devices (Central and Peripheral) at the same time **********************/
 	LOG_DBG("############# Read from both devices (Central and Peripheral) at the same time");
 	LOG_DBG("Wait for sync before sending the msg");
-	device_sync_wait();
+	bk_sync_wait();
 	LOG_DBG("Received sync");
 	send_sdu(0, 1, 10);
 
 	k_sem_take(&sent_sem, K_FOREVER);
 	disconnect_all_channels();
 	WAIT_FOR_FLAG_UNSET(is_connected);
-	PASS("L2CAP ECRED Peripheral tests Passed");
+	TEST_PASS("L2CAP ECRED Peripheral tests Passed");
 	bs_trace_silent_exit(0);
 }
 
@@ -508,14 +521,14 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 
 	err = bt_le_scan_stop();
 	if (err) {
-		FAIL("Stop LE scan failed (err %d)", err);
+		TEST_FAIL("Stop LE scan failed (err %d)", err);
 		return;
 	}
 
 	param = BT_LE_CONN_PARAM_DEFAULT;
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, param, &default_conn);
 	if (err) {
-		FAIL("Create conn failed (err %d)", err);
+		TEST_FAIL("Create conn failed (err %d)", err);
 		return;
 	}
 }
@@ -529,40 +542,40 @@ static void test_central_main(void)
 		.window = BT_GAP_SCAN_FAST_WINDOW,
 	};
 
-	device_sync_init(CENTRAL_ID);
+	TEST_ASSERT(bk_sync_init() == 0, "Failed to open backchannel");
 
 	LOG_DBG("*L2CAP ECRED Central started*");
 	int err;
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Can't enable Bluetooth (err %d)\n", err);
+		TEST_FAIL("Can't enable Bluetooth (err %d)", err);
 		return;
 	}
 	LOG_DBG("Central Bluetooth initialized.\n");
 
 	err = bt_le_scan_start(&scan_param, device_found);
 	if (err) {
-		FAIL("Scanning failed to start (err %d)\n", err);
+		TEST_FAIL("Scanning failed to start (err %d)", err);
 		return;
 	}
 
 	LOG_DBG("Scanning successfully started\n");
 
 	LOG_DBG("Central waiting for connection...\n");
-	WAIT_FOR_FLAG_SET(is_connected);
+	WAIT_FOR_FLAG(is_connected);
 	LOG_DBG("Central Connected.\n");
 	register_l2cap_server();
 
 	LOG_DBG("Wait for sync after reconnection");
-	device_sync_wait();
+	bk_sync_wait();
 	LOG_DBG("Received sync");
 
 	/* Read from both devices (Central and Peripheral) at the same time **********************/
 	LOG_DBG("############# Read from both devices (Central and Peripheral) at the same time");
 	LOG_DBG("Send sync for SDU send");
 	SET_FLAG(unsequenced_data);
-	device_sync_send();
+	bk_sync_send();
 	send_sdu(0, 1, 10);
 
 	/* Wait until all of the channels are disconnected */
@@ -577,7 +590,7 @@ static void test_central_main(void)
 
 	if (channels[LONG_MSG_CHAN_IDX].sdus_received < SDU_SEND_COUNT ||
 	    channels[SHORT_MSG_CHAN_IDX].sdus_received < SDU_SEND_COUNT) {
-		FAIL("received less than %i", SDU_SEND_COUNT);
+		TEST_FAIL("received less than %i", SDU_SEND_COUNT);
 	}
 
 	/* Disconnect */
@@ -587,28 +600,24 @@ static void test_central_main(void)
 	LOG_DBG("Central tried to disconnect");
 
 	if (err) {
-		FAIL("Disconnection failed (err %d)", err);
+		TEST_FAIL("Disconnection failed (err %d)", err);
 		return;
 	}
 
 	LOG_DBG("Central Disconnected.");
 
-	PASS("L2CAP ECRED Central tests Passed\n");
+	TEST_PASS("L2CAP ECRED Central tests Passed");
 }
 
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "peripheral",
 		.test_descr = "Peripheral L2CAP ECRED",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_peripheral_main
 	},
 	{
 		.test_id = "central",
 		.test_descr = "Central L2CAP ECRED",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_central_main
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/l2cap/many_conns/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/many_conns/CMakeLists.txt
index 88c326dddf3..383f54c095c 100644
--- a/tests/bsim/bluetooth/host/l2cap/many_conns/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/l2cap/many_conns/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_l2cap_stress)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources} )
 
diff --git a/tests/bsim/bluetooth/host/l2cap/many_conns/src/common.c b/tests/bsim/bluetooth/host/l2cap/many_conns/src/common.c
deleted file mode 100644
index c6679d83494..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/many_conns/src/common.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "common.h"
-
-extern enum bst_result_t bst_result;
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-	bst_result = In_progress;
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("test failed (not passed after %i seconds)\n", WAIT_SECONDS);
-	}
-}
diff --git a/tests/bsim/bluetooth/host/l2cap/many_conns/src/common.h b/tests/bsim/bluetooth/host/l2cap/many_conns/src/common.h
deleted file mode 100644
index 2ce0288975d..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/many_conns/src/common.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Common functions and helpers for L2CAP tests
- *
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stddef.h>
-
-#include <zephyr/types.h>
-#include <zephyr/sys/util.h>
-#include <zephyr/sys/byteorder.h>
-
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/l2cap.h>
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "bstests.h"
-#include "bs_pc_backchannel.h"
-
-extern enum bst_result_t bst_result;
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t)false
-#define SET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)true)
-#define UNSET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)false)
-#define TEST_FLAG(flag) (atomic_get(&flag) == (atomic_t)true)
-#define WAIT_FOR_FLAG_SET(flag)		   \
-	while (!(bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1));  \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)	  \
-	while ((bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1)); \
-	}
-
-
-#define WAIT_SECONDS 400                        /* seconds */
-#define WAIT_TIME (WAIT_SECONDS * USEC_PER_SEC) /* microseconds*/
-
-#define FAIL(...)				       \
-	do {					       \
-		bst_result = Failed;		       \
-		bs_trace_error_time_line(__VA_ARGS__); \
-	} while (0)
-
-#define PASS(...)				    \
-	do {					    \
-		bst_result = Passed;		    \
-		bs_trace_info_time(1, __VA_ARGS__); \
-	} while (0)
-
-#define ASSERT(expr, ...) if (!(expr)) {FAIL(__VA_ARGS__); }
-
-void test_init(void);
-void test_tick(bs_time_t HW_device_time);
diff --git a/tests/bsim/bluetooth/host/l2cap/many_conns/src/main.c b/tests/bsim/bluetooth/host/l2cap/many_conns/src/main.c
index 04825306285..174d3739086 100644
--- a/tests/bsim/bluetooth/host/l2cap/many_conns/src/main.c
+++ b/tests/bsim/bluetooth/host/l2cap/many_conns/src/main.c
@@ -6,15 +6,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bstests.h"
-#include "common.h"
+#include <stddef.h>
+
+#include <zephyr/types.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
+
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/l2cap.h>
+
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 #define LOG_MODULE_NAME main
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_INF);
 
-CREATE_FLAG(is_connected);
-CREATE_FLAG(flag_l2cap_connected);
+static DEFINE_FLAG(is_connected);
+static DEFINE_FLAG(flag_l2cap_connected);
 
 #define NUM_PERIPHERALS CONFIG_BT_MAX_CONN
 #define L2CAP_CHANS     NUM_PERIPHERALS
@@ -47,7 +57,7 @@ struct test_ctx *get_ctx(struct bt_l2cap_chan *chan)
 	struct bt_l2cap_le_chan *le_chan = CONTAINER_OF(chan, struct bt_l2cap_le_chan, chan);
 	struct test_ctx *ctx = CONTAINER_OF(le_chan, struct test_ctx, le_chan);
 
-	ASSERT(ctx >= &contexts[0] &&
+	TEST_ASSERT(ctx >= &contexts[0] &&
 	       ctx <= &contexts[L2CAP_CHANS], "memory corruption");
 
 	return ctx;
@@ -59,14 +69,14 @@ int l2cap_chan_send(struct bt_l2cap_chan *chan, uint8_t *data, size_t len)
 
 	struct net_buf *buf = net_buf_alloc(&sdu_tx_pool, K_NO_WAIT);
 
-	ASSERT(buf, "No more memory\n");
+	TEST_ASSERT(buf, "No more memory");
 
 	net_buf_reserve(buf, BT_L2CAP_SDU_CHAN_SEND_RESERVE);
 	net_buf_add_mem(buf, data, len);
 
 	int ret = bt_l2cap_chan_send(chan, buf);
 
-	ASSERT(ret >= 0, "Failed sending: err %d", ret);
+	TEST_ASSERT(ret >= 0, "Failed sending: err %d", ret);
 
 	LOG_DBG("sent %d len %d", ret, len);
 	return ret;
@@ -187,7 +197,7 @@ static int l2cap_server_register(bt_security_t sec_level)
 
 	int err = bt_l2cap_server_register(&test_l2cap_server);
 
-	ASSERT(err == 0, "Failed to register l2cap server.");
+	TEST_ASSERT(err == 0, "Failed to register l2cap server.");
 
 	return test_l2cap_server.psm;
 }
@@ -198,7 +208,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err)
 
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
-	ASSERT(!conn_err, "Failed to connect to %s (%u)", addr, conn_err);
+	TEST_ASSERT(!conn_err, "Failed to connect to %s (%u)", addr, conn_err);
 
 	LOG_DBG("%s", addr);
 
@@ -229,7 +239,7 @@ static void disconnect_device(struct bt_conn *conn, void *data)
 	SET_FLAG(is_connected);
 
 	err = bt_conn_disconnect(conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
-	ASSERT(!err, "Failed to initate disconnect (err %d)", err);
+	TEST_ASSERT(!err, "Failed to initate disconnect (err %d)", err);
 
 	LOG_DBG("Waiting for disconnection...");
 	WAIT_FOR_FLAG_UNSET(is_connected);
@@ -246,16 +256,16 @@ static void test_peripheral_main(void)
 	}
 
 	err = bt_enable(NULL);
-	ASSERT(!err, "Can't enable Bluetooth (err %d)", err);
+	TEST_ASSERT(!err, "Can't enable Bluetooth (err %d)", err);
 
 	LOG_DBG("Peripheral Bluetooth initialized.");
 	LOG_DBG("Connectable advertising...");
 	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, NULL, 0, NULL, 0);
-	ASSERT(!err, "Advertising failed to start (err %d)", err);
+	TEST_ASSERT(!err, "Advertising failed to start (err %d)", err);
 
 	LOG_DBG("Advertising started.");
 	LOG_DBG("Peripheral waiting for connection...");
-	WAIT_FOR_FLAG_SET(is_connected);
+	WAIT_FOR_FLAG(is_connected);
 	LOG_DBG("Peripheral Connected.");
 
 	int psm = l2cap_server_register(BT_SECURITY_L1);
@@ -271,9 +281,9 @@ static void test_peripheral_main(void)
 	WAIT_FOR_FLAG_UNSET(is_connected);
 	LOG_INF("Total received: %d", rx_cnt);
 
-	ASSERT(rx_cnt == SDU_NUM, "Did not receive expected no of SDUs\n");
+	TEST_ASSERT(rx_cnt == SDU_NUM, "Did not receive expected no of SDUs");
 
-	PASS("L2CAP LATENCY Peripheral passed\n");
+	TEST_PASS("L2CAP LATENCY Peripheral passed");
 }
 
 static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
@@ -284,7 +294,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 	int err;
 
 	err = bt_le_scan_stop();
-	ASSERT(!err, "Stop LE scan failed (err %d)", err);
+	TEST_ASSERT(!err, "Stop LE scan failed (err %d)", err);
 
 	char str[BT_ADDR_LE_STR_LEN];
 
@@ -294,7 +304,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 
 	param = BT_LE_CONN_PARAM_DEFAULT;
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, param, &conn);
-	ASSERT(!err, "Create conn failed (err %d)", err);
+	TEST_ASSERT(!err, "Create conn failed (err %d)", err);
 }
 
 static void connect_peripheral(void)
@@ -310,10 +320,10 @@ static void connect_peripheral(void)
 
 	int err = bt_le_scan_start(&scan_param, device_found);
 
-	ASSERT(!err, "Scanning failed to start (err %d)\n", err);
+	TEST_ASSERT(!err, "Scanning failed to start (err %d)", err);
 
 	LOG_DBG("Central initiating connection...");
-	WAIT_FOR_FLAG_SET(is_connected);
+	WAIT_FOR_FLAG(is_connected);
 }
 
 static void connect_l2cap_channel(struct bt_conn *conn, void *data)
@@ -321,7 +331,7 @@ static void connect_l2cap_channel(struct bt_conn *conn, void *data)
 	int err;
 	struct test_ctx *ctx = alloc_test_context();
 
-	ASSERT(ctx, "No more available test contexts\n");
+	TEST_ASSERT(ctx, "No more available test contexts");
 
 	struct bt_l2cap_le_chan *le_chan = &ctx->le_chan;
 
@@ -330,9 +340,9 @@ static void connect_l2cap_channel(struct bt_conn *conn, void *data)
 	UNSET_FLAG(flag_l2cap_connected);
 
 	err = bt_l2cap_chan_connect(conn, &le_chan->chan, 0x0080);
-	ASSERT(!err, "Error connecting l2cap channel (err %d)\n", err);
+	TEST_ASSERT(!err, "Error connecting l2cap channel (err %d)", err);
 
-	WAIT_FOR_FLAG_SET(flag_l2cap_connected);
+	WAIT_FOR_FLAG(flag_l2cap_connected);
 }
 
 #define L2CAP_LE_CID_DYN_START	0x0040
@@ -363,8 +373,7 @@ void bt_test_l2cap_data_pull_spy(struct bt_conn *conn,
 		return;
 	}
 
-	ASSERT(uptime == last_pull_time,
-	       "Too much delay servicing ready channels\n");
+	TEST_ASSERT(uptime == last_pull_time, "Too much delay servicing ready channels");
 }
 
 static void test_central_main(void)
@@ -378,7 +387,7 @@ static void test_central_main(void)
 	}
 
 	err = bt_enable(NULL);
-	ASSERT(err == 0, "Can't enable Bluetooth (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Can't enable Bluetooth (err %d)", err);
 	LOG_DBG("Central Bluetooth initialized.");
 
 	/* Connect all peripherals */
@@ -407,7 +416,7 @@ static void test_central_main(void)
 	LOG_DBG("Wait until all transfers are completed.");
 	int remaining_tx_total;
 
-	/* Assertion that the `pull` callback gets serviced for all connections
+	/* TEST_Assertion that the `pull` callback gets serviced for all connections
 	 * at the same time is handled in bt_l2cap_data_pull_spy().
 	 */
 
@@ -426,22 +435,18 @@ static void test_central_main(void)
 	}
 	LOG_DBG("All peripherals disconnected.");
 
-	PASS("L2CAP LATENCY Central passed\n");
+	TEST_PASS("L2CAP LATENCY Central passed");
 }
 
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "peripheral",
 		.test_descr = "Peripheral L2CAP LATENCY",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_peripheral_main
 	},
 	{
 		.test_id = "central",
 		.test_descr = "Central L2CAP LATENCY",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_central_main
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/l2cap/send_on_connect/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/send_on_connect/CMakeLists.txt
index f6db9d424e2..5a5dd7ab174 100644
--- a/tests/bsim/bluetooth/host/l2cap/send_on_connect/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/l2cap/send_on_connect/CMakeLists.txt
@@ -5,8 +5,10 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_l2cap_send_on_connect)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
-  src/common.c
   src/main_l2cap_send_on_connect.c
   src/main.c
 )
diff --git a/tests/bsim/bluetooth/host/l2cap/send_on_connect/src/common.c b/tests/bsim/bluetooth/host/l2cap/send_on_connect/src/common.c
deleted file mode 100644
index f725ac6129c..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/send_on_connect/src/common.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "common.h"
-
-extern enum bst_result_t bst_result;
-
-void test_init(void)
-{
-	bst_result = In_progress;
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("test failed (not passed after %i us)\n", WAIT_TIME);
-	}
-}
diff --git a/tests/bsim/bluetooth/host/l2cap/send_on_connect/src/common.h b/tests/bsim/bluetooth/host/l2cap/send_on_connect/src/common.h
deleted file mode 100644
index 3b0d09c53b6..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/send_on_connect/src/common.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Common functions and helpers for L2CAP tests
- *
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stddef.h>
-
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "bstests.h"
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t)false
-#define SET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)true)
-#define UNSET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)false)
-#define WAIT_FOR_FLAG_SET(flag)		   \
-	while (!(bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1));  \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)	  \
-	while ((bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1)); \
-	}
-
-
-#define WAIT_TIME (30e6) /* 30 seconds*/
-
-#define FAIL(...)				       \
-	do {					       \
-		bst_result = Failed;		       \
-		bs_trace_error_time_line(__VA_ARGS__); \
-	} while (0)
-
-#define PASS(...)				    \
-	do {					    \
-		bst_result = Passed;		    \
-		bs_trace_info_time(1, __VA_ARGS__); \
-	} while (0)
-
-
-void test_init(void);
-void test_tick(bs_time_t HW_device_time);
diff --git a/tests/bsim/bluetooth/host/l2cap/send_on_connect/src/main_l2cap_send_on_connect.c b/tests/bsim/bluetooth/host/l2cap/send_on_connect/src/main_l2cap_send_on_connect.c
index 9fd1c4bfcb8..825a8a74a2e 100644
--- a/tests/bsim/bluetooth/host/l2cap/send_on_connect/src/main_l2cap_send_on_connect.c
+++ b/tests/bsim/bluetooth/host/l2cap/send_on_connect/src/main_l2cap_send_on_connect.c
@@ -4,20 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common.h"
-
+#include <stddef.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/l2cap.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+
 extern enum bst_result_t bst_result;
 
 static struct bt_conn *default_conn;
 
 #define PSM 0x80
 
-CREATE_FLAG(is_connected);
-CREATE_FLAG(chan_connected);
-CREATE_FLAG(data_received);
+static DEFINE_FLAG(is_connected);
+static DEFINE_FLAG(chan_connected);
+static DEFINE_FLAG(data_received);
 
 #define DATA_BYTE_VAL  0xBB
 
@@ -32,7 +34,7 @@ static void chan_connected_cb(struct bt_l2cap_chan *l2cap_chan)
 	/* Send data immediately on L2CAP connection */
 	buf = net_buf_alloc(&buf_pool, K_NO_WAIT);
 	if (!buf) {
-		FAIL("Buffer allocation failed\n");
+		TEST_FAIL("Buffer allocation failed");
 	}
 
 	(void)net_buf_reserve(buf, BT_L2CAP_SDU_CHAN_SEND_RESERVE);
@@ -41,7 +43,7 @@ static void chan_connected_cb(struct bt_l2cap_chan *l2cap_chan)
 	/* Try to send data */
 	err = bt_l2cap_chan_send(l2cap_chan, buf);
 	if (err < 0) {
-		FAIL("Could not send data, error %d\n", err);
+		TEST_FAIL("Could not send data, error %d", err);
 	}
 
 	SET_FLAG(chan_connected);
@@ -59,7 +61,7 @@ static int chan_recv_cb(struct bt_l2cap_chan *chan, struct net_buf *buf)
 	(void)chan;
 
 	if ((buf->len != 1) || (buf->data[0] != DATA_BYTE_VAL)) {
-		FAIL("Unexpected data received");
+		TEST_FAIL("Unexpected data received");
 	}
 
 	SET_FLAG(data_received);
@@ -100,12 +102,12 @@ static void connect_l2cap_channel(void)
 	if (IS_ENABLED(CONFIG_BT_L2CAP_ECRED)) {
 		err = bt_l2cap_ecred_chan_connect(default_conn, chans, server.psm);
 		if (err) {
-			FAIL("Failed to send ecred connection request (err %d)\n", err);
+			TEST_FAIL("Failed to send ecred connection request (err %d)", err);
 		}
 	} else {
 		err = bt_l2cap_chan_connect(default_conn, &channel.chan, server.psm);
 		if (err) {
-			FAIL("Failed to send connection request (err %d)\n", err);
+			TEST_FAIL("Failed to send connection request (err %d)", err);
 		}
 	}
 }
@@ -116,7 +118,7 @@ static void register_l2cap_server(void)
 
 	err = bt_l2cap_server_register(&server);
 	if (err < 0) {
-		FAIL("Failed to get free server (err %d)\n");
+		TEST_FAIL("Failed to get free server (err %d)", err);
 		return;
 	}
 }
@@ -124,7 +126,7 @@ static void register_l2cap_server(void)
 static void connected(struct bt_conn *conn, uint8_t err)
 {
 	if (err) {
-		FAIL("Failed to connect (err %d)\n", err);
+		TEST_FAIL("Failed to connect (err %d)", err);
 		bt_conn_unref(default_conn);
 		default_conn = NULL;
 		return;
@@ -138,7 +140,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	if (default_conn != conn) {
-		FAIL("Connection mismatch %p %p)\n", default_conn, conn);
+		TEST_FAIL("Connection mismatch %p %p)", default_conn, conn);
 		return;
 	}
 
@@ -160,14 +162,14 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 
 	err = bt_le_scan_stop();
 	if (err) {
-		FAIL("Failed to stop scanning (err %d)\n", err);
+		TEST_FAIL("Failed to stop scanning (err %d)", err);
 		return;
 	}
 
 	param = BT_LE_CONN_PARAM_DEFAULT;
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, param, &default_conn);
 	if (err) {
-		FAIL("Failed to create connection (err %d)\n", err);
+		TEST_FAIL("Failed to create connection (err %d)", err);
 		return;
 	}
 }
@@ -181,7 +183,7 @@ static void test_peripheral_main(void)
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 		return;
 	}
 
@@ -189,19 +191,19 @@ static void test_peripheral_main(void)
 
 	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)\n", err);
+		TEST_FAIL("Advertising failed to start (err %d)", err);
 		return;
 	}
 
-	WAIT_FOR_FLAG_SET(is_connected);
+	WAIT_FOR_FLAG(is_connected);
 
-	WAIT_FOR_FLAG_SET(chan_connected);
+	WAIT_FOR_FLAG(chan_connected);
 
-	WAIT_FOR_FLAG_SET(data_received);
+	WAIT_FOR_FLAG(data_received);
 
 	WAIT_FOR_FLAG_UNSET(is_connected);
 
-	PASS("Test passed\n");
+TEST_PASS("Test passed");
 }
 
 static void test_central_main(void)
@@ -210,45 +212,41 @@ static void test_central_main(void)
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 	}
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
 	if (err != 0) {
-		FAIL("Scanning failed to start (err %d)\n", err);
+		TEST_FAIL("Scanning failed to start (err %d)", err);
 	}
 
-	WAIT_FOR_FLAG_SET(is_connected);
+	WAIT_FOR_FLAG(is_connected);
 
 	connect_l2cap_channel();
-	WAIT_FOR_FLAG_SET(chan_connected);
+	WAIT_FOR_FLAG(chan_connected);
 
-	WAIT_FOR_FLAG_SET(data_received);
+	WAIT_FOR_FLAG(data_received);
 
 	err = bt_conn_disconnect(default_conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
 	if (err) {
-		FAIL("Failed to disconnect (err %d)\n", err);
+		TEST_FAIL("Failed to disconnect (err %d)", err);
 		return;
 	}
 
 	WAIT_FOR_FLAG_UNSET(is_connected);
 
-	PASS("Test passed\n");
+	TEST_PASS("Test passed");
 }
 
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "peripheral",
 		.test_descr = "Peripheral",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_peripheral_main,
 	},
 	{
 		.test_id = "central",
 		.test_descr = "Central",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_central_main,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/stress/CMakeLists.txt
index 88c326dddf3..383f54c095c 100644
--- a/tests/bsim/bluetooth/host/l2cap/stress/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/l2cap/stress/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_l2cap_stress)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources} )
 
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/src/common.c b/tests/bsim/bluetooth/host/l2cap/stress/src/common.c
deleted file mode 100644
index 5b344c60571..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/stress/src/common.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "common.h"
-
-extern enum bst_result_t bst_result;
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-	bst_result = In_progress;
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("test failed (not passed after %i seconds)\n", WAIT_SECONDS);
-	}
-}
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/src/common.h b/tests/bsim/bluetooth/host/l2cap/stress/src/common.h
deleted file mode 100644
index 88b7950899a..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/stress/src/common.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Common functions and helpers for L2CAP tests
- *
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stddef.h>
-
-#include <zephyr/types.h>
-#include <zephyr/sys/util.h>
-#include <zephyr/sys/byteorder.h>
-
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/l2cap.h>
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "bstests.h"
-#include "bs_pc_backchannel.h"
-
-extern enum bst_result_t bst_result;
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t)false
-#define SET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)true)
-#define UNSET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)false)
-#define TEST_FLAG(flag) (atomic_get(&flag) == (atomic_t)true)
-#define WAIT_FOR_FLAG_SET(flag)		   \
-	while (!(bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1));  \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)	  \
-	while ((bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1)); \
-	}
-
-
-#define WAIT_SECONDS 400                        /* seconds */
-#define WAIT_TIME (WAIT_SECONDS * USEC_PER_SEC) /* microseconds*/
-
-#define FAIL(...)				       \
-	do {					       \
-		bst_result = Failed;		       \
-		bs_trace_error_time_line(__VA_ARGS__); \
-	} while (0)
-
-#define PASS(...)				    \
-	do {					    \
-		bst_result = Passed;		    \
-		bs_trace_info_time(1, __VA_ARGS__); \
-	} while (0)
-
-#define ASSERT(expr, ...) if (!(expr)) {FAIL(__VA_ARGS__); }
-
-void test_init(void);
-void test_tick(bs_time_t HW_device_time);
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/src/main.c b/tests/bsim/bluetooth/host/l2cap/stress/src/main.c
index 0a9023ecbd3..e104fcfae81 100644
--- a/tests/bsim/bluetooth/host/l2cap/stress/src/main.c
+++ b/tests/bsim/bluetooth/host/l2cap/stress/src/main.c
@@ -6,15 +6,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bstests.h"
-#include "common.h"
+#include <stddef.h>
+
+#include <zephyr/types.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
+
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 #define LOG_MODULE_NAME main
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_INF);
 
-CREATE_FLAG(is_connected);
-CREATE_FLAG(flag_l2cap_connected);
+static DEFINE_FLAG(is_connected);
+static DEFINE_FLAG(flag_l2cap_connected);
 
 #define NUM_PERIPHERALS 6
 #define L2CAP_CHANS     NUM_PERIPHERALS
@@ -63,8 +72,7 @@ struct test_ctx *get_ctx(struct bt_l2cap_chan *chan)
 	struct bt_l2cap_le_chan *le_chan = CONTAINER_OF(chan, struct bt_l2cap_le_chan, chan);
 	struct test_ctx *ctx = CONTAINER_OF(le_chan, struct test_ctx, le_chan);
 
-	ASSERT(ctx >= &contexts[0] &&
-	       ctx <= &contexts[L2CAP_CHANS], "memory corruption");
+	TEST_ASSERT(ctx >= &contexts[0] && ctx <= &contexts[L2CAP_CHANS], "memory corruption");
 
 	return ctx;
 }
@@ -76,7 +84,7 @@ int l2cap_chan_send(struct bt_l2cap_chan *chan, uint8_t *data, size_t len)
 	struct net_buf *buf = net_buf_alloc(&sdu_tx_pool, K_NO_WAIT);
 
 	if (buf == NULL) {
-		FAIL("No more memory\n");
+		TEST_FAIL("No more memory");
 		return -ENOMEM;
 	}
 
@@ -93,7 +101,7 @@ int l2cap_chan_send(struct bt_l2cap_chan *chan, uint8_t *data, size_t len)
 		return ret;
 	}
 
-	ASSERT(ret >= 0, "Failed sending: err %d", ret);
+	TEST_ASSERT(ret >= 0, "Failed sending: err %d", ret);
 
 	LOG_DBG("sent %d len %d", ret, len);
 	return ret;
@@ -242,7 +250,7 @@ static int l2cap_server_register(bt_security_t sec_level)
 
 	int err = bt_l2cap_server_register(&test_l2cap_server);
 
-	ASSERT(err == 0, "Failed to register l2cap server.");
+	TEST_ASSERT(err == 0, "Failed to register l2cap server.");
 
 	return test_l2cap_server.psm;
 }
@@ -254,7 +262,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (conn_err) {
-		FAIL("Failed to connect to %s (%u)", addr, conn_err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, conn_err);
 		return;
 	}
 
@@ -287,7 +295,7 @@ static void disconnect_device(struct bt_conn *conn, void *data)
 	SET_FLAG(is_connected);
 
 	err = bt_conn_disconnect(conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
-	ASSERT(!err, "Failed to initate disconnect (err %d)", err);
+	TEST_ASSERT(!err, "Failed to initate disconnect (err %d)", err);
 
 	LOG_DBG("Waiting for disconnection...");
 	WAIT_FOR_FLAG_UNSET(is_connected);
@@ -305,7 +313,7 @@ static void test_peripheral_main(void)
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Can't enable Bluetooth (err %d)", err);
+		TEST_FAIL("Can't enable Bluetooth (err %d)", err);
 		return;
 	}
 
@@ -313,13 +321,13 @@ static void test_peripheral_main(void)
 	LOG_DBG("Connectable advertising...");
 	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, NULL, 0, NULL, 0);
 	if (err) {
-		FAIL("Advertising failed to start (err %d)", err);
+		TEST_FAIL("Advertising failed to start (err %d)", err);
 		return;
 	}
 
 	LOG_DBG("Advertising started.");
 	LOG_DBG("Peripheral waiting for connection...");
-	WAIT_FOR_FLAG_SET(is_connected);
+	WAIT_FOR_FLAG(is_connected);
 	LOG_DBG("Peripheral Connected.");
 
 	int psm = l2cap_server_register(BT_SECURITY_L1);
@@ -335,9 +343,9 @@ static void test_peripheral_main(void)
 	WAIT_FOR_FLAG_UNSET(is_connected);
 	LOG_INF("Total received: %d", rx_cnt);
 
-	ASSERT(rx_cnt == SDU_NUM, "Did not receive expected no of SDUs\n");
+	TEST_ASSERT(rx_cnt == SDU_NUM, "Did not receive expected no of SDUs");
 
-	PASS("L2CAP STRESS Peripheral passed\n");
+	TEST_PASS("L2CAP STRESS Peripheral passed");
 }
 
 static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
@@ -349,7 +357,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 
 	err = bt_le_scan_stop();
 	if (err) {
-		FAIL("Stop LE scan failed (err %d)", err);
+		TEST_FAIL("Stop LE scan failed (err %d)", err);
 		return;
 	}
 
@@ -362,7 +370,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 	param = BT_LE_CONN_PARAM_DEFAULT;
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, param, &conn);
 	if (err) {
-		FAIL("Create conn failed (err %d)", err);
+		TEST_FAIL("Create conn failed (err %d)", err);
 		return;
 	}
 }
@@ -380,10 +388,10 @@ static void connect_peripheral(void)
 
 	int err = bt_le_scan_start(&scan_param, device_found);
 
-	ASSERT(!err, "Scanning failed to start (err %d)\n", err);
+	TEST_ASSERT(!err, "Scanning failed to start (err %d)", err);
 
 	LOG_DBG("Central initiating connection...");
-	WAIT_FOR_FLAG_SET(is_connected);
+	WAIT_FOR_FLAG(is_connected);
 }
 
 static void connect_l2cap_channel(struct bt_conn *conn, void *data)
@@ -391,7 +399,7 @@ static void connect_l2cap_channel(struct bt_conn *conn, void *data)
 	int err;
 	struct test_ctx *ctx = alloc_test_context();
 
-	ASSERT(ctx, "No more available test contexts\n");
+	TEST_ASSERT(ctx, "No more available test contexts");
 
 	struct bt_l2cap_le_chan *le_chan = &ctx->le_chan;
 
@@ -401,9 +409,9 @@ static void connect_l2cap_channel(struct bt_conn *conn, void *data)
 	UNSET_FLAG(flag_l2cap_connected);
 
 	err = bt_l2cap_chan_connect(conn, &le_chan->chan, 0x0080);
-	ASSERT(!err, "Error connecting l2cap channel (err %d)\n", err);
+	TEST_ASSERT(!err, "Error connecting l2cap channel (err %d)", err);
 
-	WAIT_FOR_FLAG_SET(flag_l2cap_connected);
+	WAIT_FOR_FLAG(flag_l2cap_connected);
 }
 
 static void test_central_main(void)
@@ -417,7 +425,7 @@ static void test_central_main(void)
 	}
 
 	err = bt_enable(NULL);
-	ASSERT(err == 0, "Can't enable Bluetooth (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Can't enable Bluetooth (err %d)", err);
 	LOG_DBG("Central Bluetooth initialized.");
 
 	/* Connect all peripherals */
@@ -453,22 +461,18 @@ static void test_central_main(void)
 	}
 	LOG_DBG("All peripherals disconnected.");
 
-	PASS("L2CAP STRESS Central passed\n");
+	TEST_PASS("L2CAP STRESS Central passed");
 }
 
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "peripheral",
 		.test_descr = "Peripheral L2CAP STRESS",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_peripheral_main
 	},
 	{
 		.test_id = "central",
 		.test_descr = "Central L2CAP STRESS",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_central_main
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/l2cap/userdata/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/userdata/CMakeLists.txt
index 298213989f5..2355ef86c05 100644
--- a/tests/bsim/bluetooth/host/l2cap/userdata/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/l2cap/userdata/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_l2cap_userdata)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources} )
 
diff --git a/tests/bsim/bluetooth/host/l2cap/userdata/src/common.c b/tests/bsim/bluetooth/host/l2cap/userdata/src/common.c
deleted file mode 100644
index f725ac6129c..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/userdata/src/common.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "common.h"
-
-extern enum bst_result_t bst_result;
-
-void test_init(void)
-{
-	bst_result = In_progress;
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("test failed (not passed after %i us)\n", WAIT_TIME);
-	}
-}
diff --git a/tests/bsim/bluetooth/host/l2cap/userdata/src/common.h b/tests/bsim/bluetooth/host/l2cap/userdata/src/common.h
deleted file mode 100644
index 3b0d09c53b6..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/userdata/src/common.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Common functions and helpers for L2CAP tests
- *
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stddef.h>
-
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "bstests.h"
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t)false
-#define SET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)true)
-#define UNSET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)false)
-#define WAIT_FOR_FLAG_SET(flag)		   \
-	while (!(bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1));  \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)	  \
-	while ((bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1)); \
-	}
-
-
-#define WAIT_TIME (30e6) /* 30 seconds*/
-
-#define FAIL(...)				       \
-	do {					       \
-		bst_result = Failed;		       \
-		bs_trace_error_time_line(__VA_ARGS__); \
-	} while (0)
-
-#define PASS(...)				    \
-	do {					    \
-		bst_result = Passed;		    \
-		bs_trace_info_time(1, __VA_ARGS__); \
-	} while (0)
-
-
-void test_init(void);
-void test_tick(bs_time_t HW_device_time);
diff --git a/tests/bsim/bluetooth/host/l2cap/userdata/src/main_l2cap_userdata.c b/tests/bsim/bluetooth/host/l2cap/userdata/src/main_l2cap_userdata.c
index 57e70ae8821..e492036736f 100644
--- a/tests/bsim/bluetooth/host/l2cap/userdata/src/main_l2cap_userdata.c
+++ b/tests/bsim/bluetooth/host/l2cap/userdata/src/main_l2cap_userdata.c
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common.h"
-
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/l2cap.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+
 extern enum bst_result_t bst_result;
 
 static struct bt_conn *default_conn;
@@ -20,10 +21,10 @@ static struct bt_conn *default_conn;
 /* Pool to allocate a buffer that is too large to send */
 NET_BUF_POOL_DEFINE(buf_pool, 1, BT_L2CAP_SDU_BUF_SIZE(DATA_SIZE), USER_DATA_SIZE, NULL);
 
-CREATE_FLAG(is_connected);
-CREATE_FLAG(is_sent);
-CREATE_FLAG(has_received);
-CREATE_FLAG(chan_connected);
+static DEFINE_FLAG(is_connected);
+static DEFINE_FLAG(is_sent);
+static DEFINE_FLAG(has_received);
+static DEFINE_FLAG(chan_connected);
 
 static void chan_connected_cb(struct bt_l2cap_chan *l2cap_chan)
 {
@@ -96,7 +97,7 @@ static void connect_l2cap_channel(void)
 
 	err = bt_l2cap_ecred_chan_connect(default_conn, chans, server.psm);
 	if (err) {
-		FAIL("Failed to send ecred connection request (err %d)\n", err);
+		TEST_FAIL("Failed to send ecred connection request (err %d)", err);
 	}
 }
 
@@ -106,7 +107,7 @@ static void register_l2cap_server(void)
 
 	err = bt_l2cap_server_register(&server);
 	if (err < 0) {
-		FAIL("Failed to get free server (err %d)\n");
+		TEST_FAIL("Failed to get free server (err %d)");
 		return;
 	}
 }
@@ -114,7 +115,7 @@ static void register_l2cap_server(void)
 static void connected(struct bt_conn *conn, uint8_t err)
 {
 	if (err) {
-		FAIL("Failed to connect (err %d)\n", err);
+		TEST_FAIL("Failed to connect (err %d)", err);
 		bt_conn_unref(default_conn);
 		default_conn = NULL;
 		return;
@@ -128,7 +129,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	if (default_conn != conn) {
-		FAIL("Connection mismatch %p %p)\n", default_conn, conn);
+		TEST_FAIL("Connection mismatch %p %p)", default_conn, conn);
 		return;
 	}
 
@@ -150,14 +151,14 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 
 	err = bt_le_scan_stop();
 	if (err) {
-		FAIL("Failed to stop scanning (err %d)\n", err);
+		TEST_FAIL("Failed to stop scanning (err %d)", err);
 		return;
 	}
 
 	param = BT_LE_CONN_PARAM_DEFAULT;
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, param, &default_conn);
 	if (err) {
-		FAIL("Failed to create connection (err %d)\n", err);
+		TEST_FAIL("Failed to create connection (err %d)", err);
 		return;
 	}
 }
@@ -171,37 +172,37 @@ static void test_peripheral_main(void)
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 		return;
 	}
 
 	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)\n", err);
+		TEST_FAIL("Advertising failed to start (err %d)", err);
 		return;
 	}
 
-	WAIT_FOR_FLAG_SET(is_connected);
+	WAIT_FOR_FLAG(is_connected);
 
 	register_l2cap_server();
 
 	if (!IS_ENABLED(CONFIG_NO_RUNTIME_CHECKS)) {
-		PASS("Peripheral done\n");
+		TEST_PASS("Peripheral done");
 		return;
 	}
 
-	WAIT_FOR_FLAG_SET(has_received);
+	WAIT_FOR_FLAG(has_received);
 
 	/* /\* Wait until we get the credits *\/ */
 	/* k_sleep(K_MSEC(100)); */
 
 	err = bt_conn_disconnect(default_conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
 	if (err) {
-		FAIL("Failed to disconnect (err %d)\n", err);
+		TEST_FAIL("Failed to disconnect (err %d)", err);
 		return;
 	}
 
-	PASS("Test passed\n");
+	TEST_PASS("Test passed");
 }
 
 #define FILL	       0xAA
@@ -226,22 +227,22 @@ static void test_central_main(void)
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth discover failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth discover failed (err %d)", err);
 	}
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
 	if (err != 0) {
-		FAIL("Scanning failed to start (err %d)\n", err);
+		TEST_FAIL("Scanning failed to start (err %d)", err);
 	}
 
-	WAIT_FOR_FLAG_SET(is_connected);
+	WAIT_FOR_FLAG(is_connected);
 
 	connect_l2cap_channel();
-	WAIT_FOR_FLAG_SET(chan_connected);
+	WAIT_FOR_FLAG(chan_connected);
 
 	buf = net_buf_alloc(&buf_pool, K_NO_WAIT);
 	if (!buf) {
-		FAIL("Buffer allcation failed\n");
+		TEST_FAIL("Buffer allcation failed");
 	}
 
 	net_buf_reserve(buf, BT_L2CAP_SDU_CHAN_SEND_RESERVE);
@@ -264,10 +265,10 @@ static void test_central_main(void)
 	 */
 
 	if (err != 0) {
-		FAIL("Got error %d\n", err);
+		TEST_FAIL("Got error %d", err);
 	}
 
-	WAIT_FOR_FLAG_SET(is_sent);
+	WAIT_FOR_FLAG(is_sent);
 
 	printk("Buffer user_data after (should've been cleared)\n");
 	print_user_data(buf);
@@ -277,26 +278,22 @@ static void test_central_main(void)
 	/* Validate that the user data has changed */
 	for (int i = 0; i < USER_DATA_SIZE; i++) {
 		if (buf->user_data[i] == FILL) {
-			FAIL("Buffer user data should be reset by stack.\n");
+			TEST_FAIL("Buffer user data should be reset by stack.");
 		}
 	}
 
-	PASS("(Disabled-checks) Test passed\n");
+	TEST_PASS("(Disabled-checks) Test passed");
 }
 
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "peripheral",
 		.test_descr = "Peripheral",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_peripheral_main,
 	},
 	{
 		.test_id = "central",
 		.test_descr = "Central",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_central_main,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/misc/conn_stress/central/src/main.c b/tests/bsim/bluetooth/host/misc/conn_stress/central/src/main.c
index 9b8a38e8cb6..7ce3dbfe489 100644
--- a/tests/bsim/bluetooth/host/misc/conn_stress/central/src/main.c
+++ b/tests/bsim/bluetooth/host/misc/conn_stress/central/src/main.c
@@ -720,7 +720,7 @@ static void test_args(int argc, char **argv)
 		ptr = strstr(argv[0], "notify_size=");
 		if (ptr != NULL) {
 			ptr += strlen("notify_size=");
-			notification_size = atol(ptr);
+			notification_size = strtol(ptr, NULL, 10);
 			notification_size = MIN(NOTIFICATION_DATA_LEN, notification_size);
 		}
 	}
@@ -731,7 +731,7 @@ static void test_args(int argc, char **argv)
 		ptr = strstr(argv[1], "conn_interval=");
 		if (ptr != NULL) {
 			ptr += strlen("conn_interval=");
-			conn_interval_max = atol(ptr);
+			conn_interval_max = strtol(ptr, NULL, 10);
 		}
 	}
 
diff --git a/tests/bsim/bluetooth/host/misc/conn_stress/peripheral/src/main.c b/tests/bsim/bluetooth/host/misc/conn_stress/peripheral/src/main.c
index be11ade9baf..b46d52b60d7 100644
--- a/tests/bsim/bluetooth/host/misc/conn_stress/peripheral/src/main.c
+++ b/tests/bsim/bluetooth/host/misc/conn_stress/peripheral/src/main.c
@@ -473,7 +473,7 @@ static void test_args(int argc, char **argv)
 		ptr = strstr(argv[0], "notify_size=");
 		if (ptr != NULL) {
 			ptr += strlen("notify_size=");
-			notification_size = atol(ptr);
+			notification_size = strtol(ptr, NULL, 10);
 			notification_size = MIN(NOTIFICATION_DATA_LEN, notification_size);
 		}
 	}
diff --git a/tests/bsim/bluetooth/host/misc/disable/CMakeLists.txt b/tests/bsim/bluetooth/host/misc/disable/CMakeLists.txt
index af4a62820e7..199232976e1 100644
--- a/tests/bsim/bluetooth/host/misc/disable/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/misc/disable/CMakeLists.txt
@@ -14,6 +14,8 @@ zephyr_include_directories(
   )
 
 add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/common/testlib testlib)
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
 target_link_libraries(app PRIVATE
   testlib
+  babblekit
 )
diff --git a/tests/bsim/bluetooth/host/misc/disable/src/common.c b/tests/bsim/bluetooth/host/misc/disable/src/common.c
deleted file mode 100644
index df438607c5f..00000000000
--- a/tests/bsim/bluetooth/host/misc/disable/src/common.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "common.h"
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("test failed (not passed after %i seconds)\n", WAIT_TIME);
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-	bst_result = In_progress;
-}
diff --git a/tests/bsim/bluetooth/host/misc/disable/src/common.h b/tests/bsim/bluetooth/host/misc/disable/src/common.h
index cb93d7ff71a..46c3dc38232 100644
--- a/tests/bsim/bluetooth/host/misc/disable/src/common.h
+++ b/tests/bsim/bluetooth/host/misc/disable/src/common.h
@@ -6,51 +6,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/kernel.h>
-
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "time_machine.h"
-#include "bstests.h"
-
-#include <zephyr/types.h>
-#include <stddef.h>
-#include <errno.h>
-
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/uuid.h>
-#include <zephyr/bluetooth/gatt.h>
-
-extern enum bst_result_t bst_result;
-
-#define WAIT_TIME (600 * 1e6) /*seconds*/
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t)false
-#define SET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)true)
-#define UNSET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)false)
-#define WAIT_FOR_FLAG(flag) \
-	while (!(bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1)); \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag) \
-	while ((bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1)); \
-	}
-
-#define FAIL(...) \
-	do { \
-		bst_result = Failed; \
-		bs_trace_error_time_line(__VA_ARGS__); \
-	} while (0)
-
-#define PASS(...) \
-	do { \
-		bst_result = Passed; \
-		bs_trace_info_time(1, __VA_ARGS__); \
-	} while (0)
-
 #define CHRC_SIZE 10
 #define LONG_CHRC_SIZE 40
 
@@ -65,6 +20,3 @@ extern enum bst_result_t bst_result;
 #define TEST_LONG_CHRC_UUID \
 	BT_UUID_DECLARE_128(0x01, 0x23, 0x45, 0x67, 0x89, 0x01, 0x02, 0x03, \
 			    0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0xFF, 0x11)
-
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
diff --git a/tests/bsim/bluetooth/host/misc/disable/src/gatt_client_test.c b/tests/bsim/bluetooth/host/misc/disable/src/gatt_client_test.c
index 1c7df533bbd..4d53d60a7ec 100644
--- a/tests/bsim/bluetooth/host/misc/disable/src/gatt_client_test.c
+++ b/tests/bsim/bluetooth/host/misc/disable/src/gatt_client_test.c
@@ -4,15 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stddef.h>
+#include <errno.h>
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
 #include <zephyr/bluetooth/gatt.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 #include "common.h"
 
-CREATE_FLAG(flag_is_connected);
-CREATE_FLAG(flag_discover_complete);
-CREATE_FLAG(flag_write_complete);
-CREATE_FLAG(flag_read_complete);
+static DEFINE_FLAG(flag_is_connected);
+static DEFINE_FLAG(flag_discover_complete);
+static DEFINE_FLAG(flag_write_complete);
+static DEFINE_FLAG(flag_read_complete);
 
 static struct bt_conn *g_conn;
 static uint16_t chrc_handle;
@@ -32,7 +41,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != 0) {
-		FAIL("Failed to connect to %s (%u)\n", addr, err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, err);
 		return;
 	}
 
@@ -86,14 +95,14 @@ void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 	printk("Stopping scan\n");
 	err = bt_le_scan_stop();
 	if (err != 0) {
-		FAIL("Could not stop scan: %d");
+		TEST_FAIL("Could not stop scan: %d");
 		return;
 	}
 
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN,
 				BT_LE_CONN_PARAM_DEFAULT, &g_conn);
 	if (err != 0) {
-		FAIL("Could not connect to peer: %d", err);
+		TEST_FAIL("Could not connect to peer: %d", err);
 	}
 }
 
@@ -105,8 +114,8 @@ static uint8_t discover_func(struct bt_conn *conn,
 
 	if (attr == NULL) {
 		if (chrc_handle == 0 || long_chrc_handle == 0) {
-			FAIL("Did not discover chrc (%x) or long_chrc (%x)",
-			     chrc_handle, long_chrc_handle);
+			TEST_FAIL("Did not discover chrc (%x) or long_chrc (%x)", chrc_handle,
+				  long_chrc_handle);
 		}
 
 		(void)memset(params, 0, sizeof(*params));
@@ -127,7 +136,7 @@ static uint8_t discover_func(struct bt_conn *conn,
 
 		err = bt_gatt_discover(conn, params);
 		if (err != 0) {
-			FAIL("Discover failed (err %d)\n", err);
+			TEST_FAIL("Discover failed (err %d)", err);
 		}
 
 		return BT_GATT_ITER_STOP;
@@ -161,7 +170,7 @@ static void gatt_discover(void)
 
 	err = bt_gatt_discover(g_conn, &discover_params);
 	if (err != 0) {
-		FAIL("Discover failed(err %d)\n", err);
+		TEST_FAIL("Discover failed(err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(flag_discover_complete);
@@ -172,7 +181,7 @@ static void gatt_write_cb(struct bt_conn *conn, uint8_t err,
 			  struct bt_gatt_write_params *params)
 {
 	if (err != BT_ATT_ERR_SUCCESS) {
-		FAIL("Write failed: 0x%02X\n", err);
+		TEST_FAIL("Write failed: 0x%02X\n", err);
 	}
 
 	(void)memset(params, 0, sizeof(*params));
@@ -202,7 +211,7 @@ static void gatt_write(uint16_t handle)
 
 	err = bt_gatt_write(g_conn, &write_params);
 	if (err != 0) {
-		FAIL("bt_gatt_write failed: %d\n", err);
+		TEST_FAIL("bt_gatt_write failed: %d", err);
 	}
 
 	WAIT_FOR_FLAG(flag_write_complete);
@@ -214,18 +223,16 @@ static uint8_t gatt_read_cb(struct bt_conn *conn, uint8_t err,
 			    const void *data, uint16_t length)
 {
 	if (err != BT_ATT_ERR_SUCCESS) {
-		FAIL("Read failed: 0x%02X\n", err);
+		TEST_FAIL("Read failed: 0x%02X\n", err);
 	}
 
 	if (params->single.handle == chrc_handle) {
-		if (length != CHRC_SIZE ||
-		    memcmp(data, chrc_data, length) != 0) {
-			FAIL("chrc data different than expected", err);
+		if (length != CHRC_SIZE || memcmp(data, chrc_data, length) != 0) {
+			TEST_FAIL("chrc data different than expected", err);
 		}
 	} else if (params->single.handle == chrc_handle) {
-		if (length != LONG_CHRC_SIZE ||
-		    memcmp(data, long_chrc_data, length) != 0) {
-			FAIL("long_chrc data different than expected", err);
+		if (length != LONG_CHRC_SIZE || memcmp(data, long_chrc_data, length) != 0) {
+			TEST_FAIL("long_chrc data different than expected", err);
 		}
 	}
 
@@ -252,7 +259,7 @@ static void gatt_read(uint16_t handle)
 
 	err = bt_gatt_read(g_conn, &read_params);
 	if (err != 0) {
-		FAIL("bt_gatt_read failed: %d\n", err);
+		TEST_FAIL("bt_gatt_read failed: %d", err);
 	}
 
 	WAIT_FOR_FLAG(flag_read_complete);
@@ -269,13 +276,13 @@ static void test_main(void)
 
 		err = bt_enable(NULL);
 		if (err != 0) {
-			FAIL("Bluetooth discover failed (err %d)\n", err);
+			TEST_FAIL("Bluetooth discover failed (err %d)", err);
 		}
 		printk("Bluetooth initialized\n");
 
 		err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
 		if (err != 0) {
-			FAIL("Scanning failed to start (err %d)\n", err);
+			TEST_FAIL("Scanning failed to start (err %d)", err);
 		}
 
 		printk("Scanning successfully started\n");
@@ -294,7 +301,7 @@ static void test_main(void)
 
 		err = bt_conn_disconnect(g_conn, 0x13);
 		if (err != 0) {
-			FAIL("Disconnect failed (err %d)\n", err);
+			TEST_FAIL("Disconnect failed (err %d)", err);
 			return;
 		}
 
@@ -302,19 +309,17 @@ static void test_main(void)
 
 		err = bt_disable();
 		if (err != 0) {
-			FAIL("Bluetooth disable failed (err %d)\n", err);
+			TEST_FAIL("Bluetooth disable failed (err %d)", err);
 		}
 		printk("Bluetooth successfully disabled\n");
 	}
 
-	PASS("GATT client Passed\n");
+	TEST_PASS("GATT client Passed\n");
 }
 
 static const struct bst_test_instance test_vcs[] = {
 	{
 		.test_id = "gatt_client",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/misc/disable/src/gatt_server_test.c b/tests/bsim/bluetooth/host/misc/disable/src/gatt_server_test.c
index 78cee69024d..613f76d5c22 100644
--- a/tests/bsim/bluetooth/host/misc/disable/src/gatt_server_test.c
+++ b/tests/bsim/bluetooth/host/misc/disable/src/gatt_server_test.c
@@ -4,11 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stddef.h>
+#include <errno.h>
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
+
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 #include "common.h"
 
 extern enum bst_result_t bst_result;
 
-CREATE_FLAG(flag_is_connected);
+static DEFINE_FLAG(flag_is_connected);
 
 #define NUM_ITERATIONS 10
 
@@ -19,7 +31,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != 0) {
-		FAIL("Failed to connect to %s (%u)\n", addr, err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, err);
 		return;
 	}
 
@@ -71,7 +83,7 @@ static ssize_t write_test_chrc(struct bt_conn *conn,
 	}
 
 	if (flags != 0) {
-		FAIL("Invalid flags %u\n", flags);
+		TEST_FAIL("Invalid flags %u", flags);
 		return BT_GATT_ERR(BT_ATT_ERR_UNLIKELY);
 	}
 
@@ -138,7 +150,7 @@ static void test_main(void)
 	for (int i = 0; i < NUM_ITERATIONS; i++) {
 		err = bt_enable(NULL);
 		if (err != 0) {
-			FAIL("Bluetooth init failed (err %d)\n", err);
+			TEST_FAIL("Bluetooth init failed (err %d)", err);
 			return;
 		}
 
@@ -146,7 +158,7 @@ static void test_main(void)
 
 		err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
 		if (err != 0) {
-			FAIL("Advertising failed to start (err %d)\n", err);
+			TEST_FAIL("Advertising failed to start (err %d)", err);
 			return;
 		}
 
@@ -158,21 +170,19 @@ static void test_main(void)
 
 		err = bt_disable();
 		if (err != 0) {
-			FAIL("Bluetooth disable failed (err %d)\n", err);
+			TEST_FAIL("Bluetooth disable failed (err %d)", err);
 			return;
 		}
 
 		printk("Bluetooth disabled\n");
 	}
 
-	PASS("GATT server passed\n");
+	TEST_PASS("GATT server passed");
 }
 
 static const struct bst_test_instance test_gatt_server[] = {
 	{
 		.test_id = "gatt_server",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/misc/disable/src/main_disable.c b/tests/bsim/bluetooth/host/misc/disable/src/main_disable.c
index f7f2c3c495a..e100e50456d 100644
--- a/tests/bsim/bluetooth/host/misc/disable/src/main_disable.c
+++ b/tests/bsim/bluetooth/host/misc/disable/src/main_disable.c
@@ -6,10 +6,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/bluetooth/bluetooth.h>
+
 #define LOG_MODULE_NAME main_disable
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_DBG);
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 #include "common.h"
 
 extern enum bst_result_t bst_result;
@@ -23,16 +27,16 @@ static void test_disable_main(void)
 
 		err = bt_enable(NULL);
 		if (err != 0) {
-			FAIL("Enable failed (err %d)\n", err);
+			TEST_FAIL("Enable failed (err %d)", err);
 		}
 
 		err = bt_disable();
 		if (err) {
-			FAIL("Enable failed (err %d)\n", err);
+			TEST_FAIL("Enable failed (err %d)", err);
 		}
 	}
 
-	PASS("Disable test passed\n");
+	TEST_PASS("Disable test passed");
 }
 
 static void test_disable_set_default_id(void)
@@ -53,23 +57,23 @@ static void test_disable_set_default_id(void)
 
 		err = bt_id_create(&addr, NULL);
 		if (err != 0) {
-			FAIL("Creating ID failed (err %d)\n", err);
+			TEST_FAIL("Creating ID failed (err %d)", err);
 		}
 
 		err = bt_enable(NULL);
 		if (err != 0) {
-			FAIL("Enable failed (err %d)\n", err);
+			TEST_FAIL("Enable failed (err %d)", err);
 		}
 
 		bt_id_get(NULL, &id_count);
 		if (id_count != 1) {
-			FAIL("Expected only one ID, but got: %u\n", id_count);
+			TEST_FAIL("Expected only one ID, but got: %u", id_count);
 		}
 
 		id_count = 1;
 		bt_id_get(&stored_id, &id_count);
 		if (id_count != 1) {
-			FAIL("Expected only one ID, but got: %u\n", id_count);
+			TEST_FAIL("Expected only one ID, but got: %u", id_count);
 		}
 
 		if (!bt_addr_le_eq(&stored_id, &addr)) {
@@ -78,32 +82,28 @@ static void test_disable_set_default_id(void)
 
 			bt_addr_le_to_str(&addr, addr_set_str, BT_ADDR_LE_STR_LEN);
 			bt_addr_le_to_str(&stored_id, addr_stored_str, BT_ADDR_LE_STR_LEN);
-			FAIL("Expected stored ID to be equal to set ID: %s, %s\n",
-			     addr_set_str, addr_stored_str);
+			TEST_FAIL("Expected stored ID to be equal to set ID: %s, %s", addr_set_str,
+				  addr_stored_str);
 		}
 
 		err = bt_disable();
 		if (err) {
-			FAIL("Enable failed (err %d)\n", err);
+			TEST_FAIL("Enable failed (err %d)", err);
 		}
 	}
 
-	PASS("Disable set default ID test passed\n");
+	TEST_PASS("Disable set default ID test passed");
 }
 
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "disable",
 		.test_descr = "disable_test",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_disable_main
 	},
 	{
 		.test_id = "disable_set_default_id",
 		.test_descr = "disable_test where each iteration sets the default ID",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_disable_set_default_id
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/misc/unregister_conn_cb/CMakeLists.txt b/tests/bsim/bluetooth/host/misc/unregister_conn_cb/CMakeLists.txt
index 81042fb740b..57928c2eb04 100644
--- a/tests/bsim/bluetooth/host/misc/unregister_conn_cb/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/misc/unregister_conn_cb/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_unregister_conn_cb)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources} )
 
diff --git a/tests/bsim/bluetooth/host/misc/unregister_conn_cb/src/common.c b/tests/bsim/bluetooth/host/misc/unregister_conn_cb/src/common.c
deleted file mode 100644
index df438607c5f..00000000000
--- a/tests/bsim/bluetooth/host/misc/unregister_conn_cb/src/common.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "common.h"
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("test failed (not passed after %i seconds)\n", WAIT_TIME);
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-	bst_result = In_progress;
-}
diff --git a/tests/bsim/bluetooth/host/misc/unregister_conn_cb/src/common.h b/tests/bsim/bluetooth/host/misc/unregister_conn_cb/src/common.h
deleted file mode 100644
index 159f27a8a21..00000000000
--- a/tests/bsim/bluetooth/host/misc/unregister_conn_cb/src/common.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Common functions and helpers for unregister connection callback tests
- *
- * Copyright (c) 2024 NXP
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "time_machine.h"
-#include "bstests.h"
-
-#include <zephyr/types.h>
-#include <stddef.h>
-#include <errno.h>
-
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/conn.h>
-
-extern enum bst_result_t bst_result;
-
-#define WAIT_SECONDS (30) /*seconds*/
-#define WAIT_TIME (WAIT_SECONDS * USEC_PER_SEC) /*microseconds*/
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)    (void)atomic_set(&flag, (atomic_t) true)
-#define UNSET_FLAG(flag)  (void)atomic_set(&flag, (atomic_t) false)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)                                                                  \
-	while ((bool)atomic_get(&flag)) {                                                          \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
diff --git a/tests/bsim/bluetooth/host/misc/unregister_conn_cb/src/main.c b/tests/bsim/bluetooth/host/misc/unregister_conn_cb/src/main.c
index ac2d919afab..a2c6cd87ce4 100644
--- a/tests/bsim/bluetooth/host/misc/unregister_conn_cb/src/main.c
+++ b/tests/bsim/bluetooth/host/misc/unregister_conn_cb/src/main.c
@@ -7,14 +7,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bstests.h"
+#include <stddef.h>
+#include <errno.h>
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
 
 #include <testlib/conn.h>
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
-#include "common.h"
-
-CREATE_FLAG(flag_is_connected);
+static DEFINE_FLAG(flag_is_connected);
 
 static struct bt_conn *g_conn;
 
@@ -25,7 +30,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != 0) {
-		FAIL("Failed to connect to %s (%u)\n", addr, err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, err);
 		return;
 	}
 
@@ -82,13 +87,13 @@ void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type, struct ne
 	printk("Stopping scan\n");
 	err = bt_le_scan_stop();
 	if (err != 0) {
-		FAIL("Could not stop scan: %d");
+		TEST_FAIL("Could not stop scan: %d");
 		return;
 	}
 
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT, &conn);
 	if (err != 0) {
-		FAIL("Could not connect to peer: %d", err);
+		TEST_FAIL("Could not connect to peer: %d", err);
 	}
 	printk("%s: connected to found device\n", __func__);
 
@@ -125,7 +130,7 @@ static void start_adv(void)
 
 	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)\n", err);
+		TEST_FAIL("Advertising failed to start (err %d)", err);
 		return;
 	}
 
@@ -138,7 +143,7 @@ static void test_peripheral_main(void)
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 		return;
 	}
 
@@ -161,13 +166,13 @@ static void test_peripheral_main(void)
 
 	err = bt_disable();
 	if (err != 0) {
-		FAIL("Bluetooth disable failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth disable failed (err %d)", err);
 		return;
 	}
 
 	printk("Bluetooth successfully disabled\n");
 
-	PASS("Peripheral device passed\n");
+	TEST_PASS("Peripheral device passed");
 }
 
 static void test_central_main(void)
@@ -177,14 +182,14 @@ static void test_central_main(void)
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth discover failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth discover failed (err %d)", err);
 	}
 	printk("Bluetooth initialized\n");
 	bt_conn_cb_register(&conn_callbacks);
 	/* Connect to peer device after conn_callbacks registered*/
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
 	if (err != 0) {
-		FAIL("Scanning failed to start (err %d)\n", err);
+		TEST_FAIL("Scanning failed to start (err %d)", err);
 	}
 
 	printk("Scanning successfully started\n");
@@ -194,7 +199,7 @@ static void test_central_main(void)
 	err = bt_conn_disconnect(g_conn, 0x13);
 
 	if (err != 0) {
-		FAIL("Disconnect failed (err %d)\n", err);
+		TEST_FAIL("Disconnect failed (err %d)", err);
 		return;
 	}
 
@@ -203,40 +208,36 @@ static void test_central_main(void)
 	/* Reconnect to the device after conn_callbacks unregistered */
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
 	if (err != 0) {
-		FAIL("Scanning failed to start (err %d)\n", err);
+		TEST_FAIL("Scanning failed to start (err %d)", err);
 	}
 	printk("Scanning successfully started\n");
 
 	k_sleep(K_SECONDS(1));
 	bt_conn_foreach(BT_CONN_TYPE_LE, connection_info, &conn_count);
 	if (!conn_count) {
-		FAIL("Reconnect to peer device failed!");
+		TEST_FAIL("Reconnect to peer device failed!");
 	}
 
 	/* flag_is_connected not set means no conn_callbacks being called */
 	if (flag_is_connected) {
-		FAIL("Unregister conn_callback didn't work");
+		TEST_FAIL("Unregister conn_callback didn't work");
 	}
 	printk("Unregister connection callbacks succeed!\n");
 
 	err = bt_disable();
 	if (err != 0) {
-		FAIL("Bluetooth disable failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth disable failed (err %d)", err);
 	}
 	printk("Bluetooth successfully disabled\n");
 
-	PASS("Central device passed\n");
+	TEST_PASS("Central device passed");
 }
 
 static const struct bst_test_instance test_def[] = {{.test_id = "peripheral",
 						     .test_descr = "Peripheral device",
-						     .test_pre_init_f = test_init,
-						     .test_tick_f = test_tick,
 						     .test_main_f = test_peripheral_main},
 						    {.test_id = "central",
 						     .test_descr = "Central device",
-						     .test_pre_init_f = test_init,
-						     .test_tick_f = test_tick,
 						     .test_main_f = test_central_main},
 						    BSTEST_END_MARKER};
 
diff --git a/tests/bsim/bluetooth/host/security/ccc_update/CMakeLists.txt b/tests/bsim/bluetooth/host/security/ccc_update/CMakeLists.txt
index fb2b3228ecc..be4416ced57 100644
--- a/tests/bsim/bluetooth/host/security/ccc_update/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/security/ccc_update/CMakeLists.txt
@@ -12,6 +12,9 @@ endif()
 find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_ccc_update)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
   src/main.c
   src/common.c
diff --git a/tests/bsim/bluetooth/host/security/ccc_update/src/central.c b/tests/bsim/bluetooth/host/security/ccc_update/src/central.c
index 8f2d2c17dd4..40adf5efb29 100644
--- a/tests/bsim/bluetooth/host/security/ccc_update/src/central.c
+++ b/tests/bsim/bluetooth/host/security/ccc_update/src/central.c
@@ -18,6 +18,8 @@
 
 #include <zephyr/settings/settings.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 #include "common.h"
 #include "settings.h"
 
@@ -27,9 +29,9 @@
 #define CLIENT_CLIENT_CHAN 0
 #define SERVER_CLIENT_CHAN 1
 
-CREATE_FLAG(connected_flag);
-CREATE_FLAG(disconnected_flag);
-CREATE_FLAG(security_updated_flag);
+static DEFINE_FLAG(connected_flag);
+static DEFINE_FLAG(disconnected_flag);
+static DEFINE_FLAG(security_updated_flag);
 
 #define BT_UUID_DUMMY_SERVICE BT_UUID_DECLARE_128(DUMMY_SERVICE_TYPE)
 #define BT_UUID_DUMMY_SERVICE_NOTIFY BT_UUID_DECLARE_128(DUMMY_SERVICE_NOTIFY_TYPE)
@@ -38,7 +40,7 @@ static struct bt_conn *default_conn;
 
 static struct bt_conn_cb central_cb;
 
-CREATE_FLAG(gatt_write_flag);
+static DEFINE_FLAG(gatt_write_flag);
 static uint8_t gatt_write_att_err;
 
 static void gatt_write_cb(struct bt_conn *conn, uint8_t att_err,
@@ -47,7 +49,7 @@ static void gatt_write_cb(struct bt_conn *conn, uint8_t att_err,
 	gatt_write_att_err = att_err;
 
 	if (att_err) {
-		FAIL("GATT write ATT error (err %d)\n", att_err);
+		TEST_FAIL("GATT write ATT error (err %d)", att_err);
 	}
 
 	SET_FLAG(gatt_write_flag);
@@ -72,7 +74,7 @@ static int gatt_write(struct bt_conn *conn, uint16_t handle, const uint8_t *writ
 	 */
 	err = bt_gatt_write(conn, &params);
 	if (err) {
-		FAIL("GATT write failed (err %d)", err);
+		TEST_FAIL("GATT write failed (err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(gatt_write_flag);
@@ -87,7 +89,7 @@ static void ccc_subscribe(void)
 
 	err = gatt_write(default_conn, CCC_HANDLE, &buf, sizeof(buf));
 	if (err) {
-		FAIL("Failed to subscribe (att err %d)", err);
+		TEST_FAIL("Failed to subscribe (att err %d)", err);
 	}
 }
 
@@ -98,7 +100,7 @@ static void ccc_unsubscribe(void)
 
 	err = gatt_write(default_conn, CCC_HANDLE, &buf, sizeof(buf));
 	if (err) {
-		FAIL("Failed to unsubscribe (att err %d)", err);
+		TEST_FAIL("Failed to unsubscribe (att err %d)", err);
 	}
 }
 
@@ -114,13 +116,13 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 
 	err = bt_le_scan_stop();
 	if (err) {
-		FAIL("Failed to stop scanner (err %d)\n", err);
+		TEST_FAIL("Failed to stop scanner (err %d)", err);
 	}
 
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT,
 				&default_conn);
 	if (err) {
-		FAIL("Could not connect to peer: %s (err %d)\n", addr_str, err);
+		TEST_FAIL("Could not connect to peer: %s (err %d)", addr_str, err);
 	}
 }
 
@@ -133,7 +135,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(addr, addr_str, sizeof(addr_str));
 
 	if (err) {
-		FAIL("Failed to connect to %s (err %d)\n", addr_str, err);
+		TEST_FAIL("Failed to connect to %s (err %d)", addr_str, err);
 	}
 
 	LOG_DBG("Connected: %s", addr_str);
@@ -181,7 +183,7 @@ static void start_scan(void)
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
 	if (err) {
-		FAIL("Scanning failed to start (err %d)\n", err);
+		TEST_FAIL("Scanning failed to start (err %d)", err);
 	}
 
 	LOG_DBG("Scanning successfully started");
@@ -193,7 +195,7 @@ static void disconnect(void)
 
 	err = bt_conn_disconnect(default_conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
 	if (err) {
-		FAIL("Disconnection failed (err %d)\n", err);
+		TEST_FAIL("Disconnection failed (err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(disconnected_flag);
@@ -213,7 +215,7 @@ static void connect_pair_subscribe(void)
 
 	err = bt_conn_set_security(default_conn, BT_SECURITY_L2);
 	if (err != 0) {
-		FAIL("Failed to set security (err %d)\n", err);
+		TEST_FAIL("Failed to set security (err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(security_updated_flag);
@@ -259,7 +261,7 @@ static void connect_restore_sec(void)
 
 	err = bt_conn_set_security(default_conn, BT_SECURITY_L2);
 	if (err != 0) {
-		FAIL("Failed to set security (err %d)\n", err);
+		TEST_FAIL("Failed to set security (err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(security_updated_flag);
@@ -293,7 +295,7 @@ void central_backchannel_init(void)
 	LOG_DBG("Opening back channels for device %d", device_number);
 	ch = bs_open_back_channel(device_number, device_numbers, channel_numbers, num_ch);
 	if (!ch) {
-		FAIL("Unable to open backchannel\n");
+		TEST_FAIL("Unable to open backchannel");
 	}
 	LOG_DBG("Back channels for device %d opened", device_number);
 }
@@ -320,7 +322,7 @@ void run_central(void)
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 	}
 
 	LOG_DBG("Bluetooth initialized");
@@ -329,12 +331,12 @@ void run_central(void)
 
 	err = settings_load();
 	if (err) {
-		FAIL("Settings load failed (err %d)\n", err);
+		TEST_FAIL("Settings load failed (err %d)", err);
 	}
 
 	err = bt_unpair(BT_ID_DEFAULT, BT_ADDR_LE_ANY);
 	if (err) {
-		FAIL("Unpairing failed (err %d)\n", err);
+		TEST_FAIL("Unpairing failed (err %d)", err);
 	}
 
 	connect_pair_subscribe();
@@ -347,7 +349,7 @@ void run_central(void)
 	connect_restore_sec();
 	disconnect();
 
-	PASS("Central test passed\n");
+	TEST_PASS("Central test passed");
 }
 
 void run_bad_central(void)
@@ -366,7 +368,7 @@ void run_bad_central(void)
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Bluetooth init failed (err %d)\n");
+		TEST_FAIL("Bluetooth init failed (err %d)");
 	}
 
 	LOG_DBG("Bluetooth initialized");
@@ -375,13 +377,13 @@ void run_bad_central(void)
 
 	err = settings_load();
 	if (err) {
-		FAIL("Settings load failed (err %d)\n");
+		TEST_FAIL("Settings load failed (err %d)");
 	}
 
 	connect_unsubscribe();
 	disconnect();
 
-	PASS("Bad Central test passed\n");
+	TEST_PASS("Bad Central test passed");
 
 	/* tell the good client that we disconnected from the server */
 	backchannel_sync_send(CLIENT_CLIENT_CHAN, GOOD_CLIENT_ID);
diff --git a/tests/bsim/bluetooth/host/security/ccc_update/src/common.h b/tests/bsim/bluetooth/host/security/ccc_update/src/common.h
index 4166fa2b6aa..2a004e40ec1 100644
--- a/tests/bsim/bluetooth/host/security/ccc_update/src/common.h
+++ b/tests/bsim/bluetooth/host/security/ccc_update/src/common.h
@@ -10,30 +10,6 @@
 #include <zephyr/logging/log.h>
 
 #include "bs_tracing.h"
-#include "bstests.h"
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-extern enum bst_result_t bst_result;
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)	  (void)atomic_set(&flag, (atomic_t) true)
-#define GET_FLAG(flag)	  (bool)atomic_get(&flag)
-#define UNSET_FLAG(flag)  (void)atomic_set(&flag, (atomic_t) false)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
 
 LOG_MODULE_DECLARE(bt_bsim_ccc_update, LOG_LEVEL_DBG);
 
diff --git a/tests/bsim/bluetooth/host/security/ccc_update/src/main.c b/tests/bsim/bluetooth/host/security/ccc_update/src/main.c
index 4455e09d9f2..2ba29e07b68 100644
--- a/tests/bsim/bluetooth/host/security/ccc_update/src/main.c
+++ b/tests/bsim/bluetooth/host/security/ccc_update/src/main.c
@@ -3,33 +3,12 @@
  */
 
 #include <zephyr/kernel.h>
-
-#include "bs_types.h"
-#include "bs_tracing.h"
 #include "bstests.h"
-#include <string.h>
 
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(bt_bsim_ccc_update, LOG_LEVEL_DBG);
 
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-extern enum bst_result_t bst_result;
-
-#define WAIT_TIME_S 60
-#define WAIT_TIME   (WAIT_TIME_S * 1e6)
-
 extern void run_peripheral(void);
 extern void run_central(void);
 extern void run_bad_central(void);
@@ -49,40 +28,20 @@ static void peripheral_main(void)
 	run_peripheral();
 }
 
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error_time_line("Test failed (not passed after %d seconds)\n",
-					 WAIT_TIME_S);
-	}
-}
-
-static void test_ccc_update_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-}
-
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "central",
 		.test_descr = "Central device",
-		.test_pre_init_f = test_ccc_update_init,
-		.test_tick_f = test_tick,
 		.test_main_f = central_main,
 	},
 	{
 		.test_id = "bad_central",
 		.test_descr = "Bad Central device",
-		.test_pre_init_f = test_ccc_update_init,
-		.test_tick_f = test_tick,
 		.test_main_f = bad_central_main,
 	},
 	{
 		.test_id = "peripheral",
 		.test_descr = "Peripheral device",
-		.test_pre_init_f = test_ccc_update_init,
-		.test_tick_f = test_tick,
 		.test_main_f = peripheral_main,
 	},
 	BSTEST_END_MARKER};
diff --git a/tests/bsim/bluetooth/host/security/ccc_update/src/peripheral.c b/tests/bsim/bluetooth/host/security/ccc_update/src/peripheral.c
index 0cae51ba2d9..dae03f846a2 100644
--- a/tests/bsim/bluetooth/host/security/ccc_update/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/security/ccc_update/src/peripheral.c
@@ -16,6 +16,8 @@
 
 #include <zephyr/settings/settings.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 #include "common.h"
 #include "settings.h"
 
@@ -25,11 +27,11 @@
 #define GOOD_CLIENT_CHAN 0
 #define BAD_CLIENT_CHAN 1
 
-CREATE_FLAG(connected_flag);
-CREATE_FLAG(disconnected_flag);
-CREATE_FLAG(security_updated_flag);
+static DEFINE_FLAG(connected_flag);
+static DEFINE_FLAG(disconnected_flag);
+static DEFINE_FLAG(security_updated_flag);
 
-CREATE_FLAG(ccc_cfg_changed_flag);
+static DEFINE_FLAG(ccc_cfg_changed_flag);
 
 static const struct bt_uuid_128 dummy_service = BT_UUID_INIT_128(DUMMY_SERVICE_TYPE);
 
@@ -72,7 +74,7 @@ static void create_adv(struct bt_le_ext_adv **adv)
 
 	err = bt_le_ext_adv_create(&params, NULL, adv);
 	if (err) {
-		FAIL("Failed to create advertiser (%d)\n", err);
+		TEST_FAIL("Failed to create advertiser (%d)", err);
 	}
 }
 
@@ -89,7 +91,7 @@ static void start_adv(struct bt_le_ext_adv *adv)
 
 	err = bt_le_ext_adv_start(adv, &start_params);
 	if (err) {
-		FAIL("Failed to start advertiser (err %d)\n", err);
+		TEST_FAIL("Failed to start advertiser (err %d)", err);
 	}
 
 	LOG_DBG("Advertiser started");
@@ -101,7 +103,7 @@ static void stop_adv(struct bt_le_ext_adv *adv)
 
 	err = bt_le_ext_adv_stop(adv);
 	if (err) {
-		FAIL("Failed to stop advertiser (err %d)\n", err);
+		TEST_FAIL("Failed to stop advertiser (err %d)", err);
 	}
 }
 
@@ -112,7 +114,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr_str, sizeof(addr_str));
 
 	if (err) {
-		FAIL("Failed to connect to %s (err %d)\n", addr_str, err);
+		TEST_FAIL("Failed to connect to %s (err %d)", addr_str, err);
 	}
 
 	LOG_DBG("Connected: %s", addr_str);
@@ -176,7 +178,7 @@ static void connect_pair_check_subscribtion(struct bt_le_ext_adv *adv)
 
 	/* check that subscribtion request did not fail */
 	if (!is_peer_subscribed(default_conn)) {
-		FAIL("Good client did not subscribed\n");
+		TEST_FAIL("Good client did not subscribed");
 	}
 
 	stop_adv(adv);
@@ -197,7 +199,7 @@ static void connect_wait_unsubscribtion(struct bt_le_ext_adv *adv)
 
 	/* check that subscribtion is restored for bad client */
 	if (!is_peer_subscribed(default_conn)) {
-		FAIL("Subscribtion has not been restored for bad client\n");
+		TEST_FAIL("Subscribtion has not been restored for bad client");
 	}
 
 	/* confirm to bad client that the subscribtion had not been restored */
@@ -206,8 +208,8 @@ static void connect_wait_unsubscribtion(struct bt_le_ext_adv *adv)
 	backchannel_sync_wait(BAD_CLIENT_CHAN, BAD_CLIENT_ID);
 
 	/* check that unsubscribtion request didn't fail */
-	if (!GET_FLAG(ccc_cfg_changed_flag)) {
-		FAIL("Bad client didn't manage to update CCC config\n");
+	if (!IS_FLAG_SET(ccc_cfg_changed_flag)) {
+		TEST_FAIL("Bad client didn't manage to update CCC config");
 	}
 
 	/* confirm to bad client that unsubscribtion request has been well registered */
@@ -228,7 +230,7 @@ static void connect_restore_sec_check_subscribtion(struct bt_le_ext_adv *adv)
 
 	/* check that subscribtion hasn't been restored */
 	if (is_peer_subscribed(default_conn)) {
-		FAIL("Good client is subscribed\n");
+		TEST_FAIL("Good client is subscribed");
 	}
 
 	/* confirm to good client that the subscribtion has been well restored */
@@ -238,7 +240,7 @@ static void connect_restore_sec_check_subscribtion(struct bt_le_ext_adv *adv)
 
 	/* check that unsubscribtion request from good client has been registered */
 	if (is_peer_subscribed(default_conn)) {
-		FAIL("Good client did not unsubscribe\n");
+		TEST_FAIL("Good client did not unsubscribe");
 	}
 }
 
@@ -261,7 +263,7 @@ void peripheral_backchannel_init(void)
 	LOG_DBG("Opening back channels for device %d", device_number);
 	ch = bs_open_back_channel(device_number, device_numbers, channel_numbers, num_ch);
 	if (!ch) {
-		FAIL("Unable to open backchannel\n");
+		TEST_FAIL("Unable to open backchannel");
 	}
 }
 
@@ -305,7 +307,7 @@ void run_peripheral(void)
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 	}
 
 	LOG_DBG("Bluetooth initialized");
@@ -316,12 +318,12 @@ void run_peripheral(void)
 
 	err = settings_load();
 	if (err) {
-		FAIL("Settings load failed (err %d)\n", err);
+		TEST_FAIL("Settings load failed (err %d)", err);
 	}
 
 	err = bt_unpair(BT_ID_DEFAULT, BT_ADDR_LE_ANY);
 	if (err) {
-		FAIL("Unpairing failed (err %d)\n", err);
+		TEST_FAIL("Unpairing failed (err %d)", err);
 	}
 
 	create_adv(&adv);
@@ -335,5 +337,5 @@ void run_peripheral(void)
 	connect_restore_sec_check_subscribtion(adv);
 	WAIT_FOR_FLAG(disconnected_flag);
 
-	PASS("Peripheral test passed\n");
+	TEST_PASS("Peripheral test passed");
 }

From c4508b67f34bd5e5e8f3d94fb25b8d5d7528f71b Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Mon, 20 Jan 2025 20:46:36 +0100
Subject: [PATCH 2350/2913] [nrf fromtree] tests: Bluetooth: Tester: Reorder
 btp_buf to fix variable array

The `btp_hdr` needs to be last in the struct, as it has
a variable length array (data[]).

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit 176676d81fdc44a62fe6f5ffe857d0f521ee1f24)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 tests/bluetooth/tester/src/btp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bluetooth/tester/src/btp.c b/tests/bluetooth/tester/src/btp.c
index 6bc7a4d5e3a..ca95e18a475 100644
--- a/tests/bluetooth/tester/src/btp.c
+++ b/tests/bluetooth/tester/src/btp.c
@@ -31,11 +31,11 @@ static struct k_thread cmd_thread;
 #define CMD_QUEUED 2
 struct btp_buf {
 	intptr_t _reserved;
+	uint8_t rsp[BTP_MTU];
 	union {
 		uint8_t data[BTP_MTU];
 		struct btp_hdr hdr;
 	};
-	uint8_t rsp[BTP_MTU];
 };
 
 static struct btp_buf cmd_buf[CMD_QUEUED];

From 1e073b553ca90493d34a828fbcea81d6f42c6490 Mon Sep 17 00:00:00 2001
From: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
Date: Mon, 20 Jan 2025 16:17:43 +0100
Subject: [PATCH 2351/2913] [nrf fromtree] Bluetooth: Mesh: remove experimental
 flag from mbedtls support

Commit removes experimental flag from mbedtls psa
crypto library support.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
(cherry picked from commit a8e540c371e077fbbff53d5de7da09a0e99cca30)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/mesh/Kconfig | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 193c75dea12..0b69688a9ee 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -1492,8 +1492,7 @@ config BT_MESH_USES_TINYCRYPT
 	  Use TinyCrypt library to perform crypto operations.
 
 config BT_MESH_USES_MBEDTLS_PSA
-	bool "mbed TLS PSA [EXPERIMENTAL]"
-	select EXPERIMENTAL
+	bool "mbed TLS PSA"
 	select MBEDTLS
 	select MBEDTLS_PSA_CRYPTO_C
 	select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT
@@ -1503,7 +1502,6 @@ config BT_MESH_USES_MBEDTLS_PSA
 	select PSA_WANT_ALG_CMAC
 	select PSA_WANT_ALG_ECB_NO_PADDING
 	select PSA_WANT_KEY_TYPE_AES
-	imply MBEDTLS_AES_ROM_TABLES
 	select PSA_WANT_ALG_CCM
 	select PSA_WANT_KEY_TYPE_HMAC
 	select PSA_WANT_ALG_HMAC
@@ -1511,10 +1509,9 @@ config BT_MESH_USES_MBEDTLS_PSA
 	select PSA_WANT_ALG_ECDH
 	select PSA_WANT_ECC_SECP_R1_256
 	select BT_MESH_SECURE_STORAGE if BT_SETTINGS
+	imply MBEDTLS_AES_ROM_TABLES
 	help
-	  Use Mbed TLS as PSA Crypto API provider. This is useful on platforms
-	  that do not support TF-M.
-	  This feature is experimental and only BabbleSim tests were run.
+	  Use Mbed TLS as PSA Crypto API provider.
 
 config BT_MESH_USES_TFM_PSA
 	bool "Use TF-M PSA [EXPERIMENTAL]"

From c416d6f8f68f44c30683c77a6fed69909ecfb511 Mon Sep 17 00:00:00 2001
From: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
Date: Mon, 20 Jan 2025 16:36:38 +0100
Subject: [PATCH 2352/2913] =?UTF-8?q?[nrf=20fromtree]=C2=A0doc:=20update?=
 =?UTF-8?q?=20migration=20guide=20with=20mesh=20dependency?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Commit adds description of the mesh dependency on
the secure storage subsytem.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
(cherry picked from commit f9830452e58ca30414a542ecf5ec7b73d9e7f6d8)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 doc/releases/migration-guide-4.1.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/releases/migration-guide-4.1.rst b/doc/releases/migration-guide-4.1.rst
index b5a5c6a58cb..70a168c6de5 100644
--- a/doc/releases/migration-guide-4.1.rst
+++ b/doc/releases/migration-guide-4.1.rst
@@ -305,6 +305,11 @@ Bluetooth Mesh
   set as deprecated. Default option for platforms that do not support TF-M
   is :kconfig:option:`CONFIG_BT_MESH_USES_MBEDTLS_PSA`.
 
+* Mesh explicitly depends on the Secure Storage subsystem if storing into
+  non-volatile memory (:kconfig:option:`CONFIG_BT_SETTINGS`) is enabled and
+  Mbed TLS library (:kconfig:option:`CONFIG_BT_MESH_USES_MBEDTLS_PSA`) is used.
+  Applications should be built with :kconfig:option:`CONFIG_SECURE_STORAGE` enabled.
+
 Bluetooth Audio
 ===============
 

From 2fc86c1bfe5a9c3179a23274282dfe505dd08da0 Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Sun, 1 Dec 2024 21:16:46 +0100
Subject: [PATCH 2353/2913] [nrf fromtree] Bluetooth: Mesh: Improve logic for
 serving devices erase capabilities

The commit fixes issue where flash_area_flatten has been used where
code was only supposed to erase devices by hardware requirement prior
to write, by replacing the call with flash_area_erase and supporting
logic to select proper path.
There have been following Kconfig options added:
 - CONFIG_BT_MESH_BLOB_IO_FLASH_WITHOUT_ERASE
 - CONFIG_BT_MESH_BLOB_IO_FLASH_WITH_ERASE
that are available for user depending on devices in the system and allow
to turn off paths that are not used by BLOB IO; for example if user
never writes to device with erase CONFIG_BT_MESH_BLOB_IO_FLASH_WITH_ERASE
will disable the path.
Both Kconfig options are y by default and enable all paths.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 49f5598835f06304f958885028ffc239d6db3ecd)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/mesh/Kconfig         | 24 ++++++++++
 subsys/bluetooth/mesh/blob_io_flash.c | 63 +++++++++++++++++----------
 2 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 0b69688a9ee..13d892aa437 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -1055,6 +1055,30 @@ config BT_MESH_BLOB_IO_FLASH
 	  Enable the BLOB flash stream for reading and writing BLOBs directly to
 	  and from flash.
 
+if BT_MESH_BLOB_IO_FLASH
+
+config BT_MESH_BLOB_IO_FLASH_WITHOUT_ERASE
+	bool "BLOB flash support for devices without erase"
+	default y if FLASH_HAS_NO_EXPLICIT_ERASE
+	depends on FLASH_HAS_NO_EXPLICIT_ERASE
+	help
+	  Enable path supporting devices without erase. This option appears only
+	  if there are devices without explicit erase requirements in the system
+	  and may be disabled to reduce code size in case when no operations
+	  are intended on such type of devices.
+
+config BT_MESH_BLOB_IO_FLASH_WITH_ERASE
+	bool "BLOB flash support for devices with erase"
+	default y if FLASH_HAS_EXPLICIT_ERASE
+	depends on FLASH_HAS_EXPLICIT_ERASE
+	help
+	  Enable path supporting devices with erase. This option appears only
+	  if there are devices requiring erase,  before write, in the system
+	  and may be disabled to reduce code size in case when no operations
+	  are intended on such type of devices.
+
+endif # BT_MESH_BLOB_IO_FLASH
+
 config BT_MESH_DFU_SRV
 	bool "Support for Firmware Update Server model"
 	depends on BT_MESH_MODEL_EXTENSIONS
diff --git a/subsys/bluetooth/mesh/blob_io_flash.c b/subsys/bluetooth/mesh/blob_io_flash.c
index eb0b3342d3e..8d989a6feca 100644
--- a/subsys/bluetooth/mesh/blob_io_flash.c
+++ b/subsys/bluetooth/mesh/blob_io_flash.c
@@ -56,40 +56,55 @@ static void io_close(const struct bt_mesh_blob_io *io,
 	flash_area_close(flash->area);
 }
 
+static inline int erase_device_block(const struct flash_area *fa, off_t start, size_t size)
+{
+	/* If there are no devices requiring erase, then there is nothing to do */
+	if (IS_ENABLED(CONFIG_BT_MESH_BLOB_IO_FLASH_WITH_ERASE)) {
+		const struct device *fdev = flash_area_get_device(fa);
+
+		if (!fdev) {
+			return -ENODEV;
+		}
+
+		/* We have a mix of devices in system */
+		if (IS_ENABLED(CONFIG_BT_MESH_BLOB_IO_FLASH_WITHOUT_ERASE)) {
+			const struct flash_parameters *fparam = flash_get_parameters(fdev);
+
+			/* If device has no erase requirement then do nothing */
+			if (!(flash_params_get_erase_cap(fparam) & FLASH_ERASE_C_EXPLICIT)) {
+				return 0;
+			}
+		}
+
+		if (IS_ENABLED(CONFIG_FLASH_PAGE_LAYOUT)) {
+			struct flash_pages_info page;
+			int err;
+
+			err = flash_get_page_info_by_offs(fdev, start, &page);
+			if (err) {
+				return err;
+			}
+
+			size = page.size * DIV_ROUND_UP(size, page.size);
+			start = page.start_offset;
+		}
+		return flash_area_erase(fa, start, size);
+	}
+
+	return 0;
+}
+
 static int block_start(const struct bt_mesh_blob_io *io,
 		       const struct bt_mesh_blob_xfer *xfer,
 		       const struct bt_mesh_blob_block *block)
 {
 	struct bt_mesh_blob_io_flash *flash = FLASH_IO(io);
-	size_t erase_size;
 
 	if (flash->mode == BT_MESH_BLOB_READ) {
 		return 0;
 	}
 
-#if defined(CONFIG_FLASH_PAGE_LAYOUT)
-	struct flash_pages_info page;
-	const struct device *flash_dev;
-	int err;
-
-	flash_dev = flash_area_get_device(flash->area);
-	if (!flash_dev) {
-		return -ENODEV;
-	}
-
-	err = flash_get_page_info_by_offs(flash_dev,
-					  flash->offset + block->offset, &page);
-	if (err) {
-		return err;
-	}
-
-	erase_size = page.size * DIV_ROUND_UP(block->size, page.size);
-#else
-	erase_size = block->size;
-#endif
-
-	return flash_area_flatten(flash->area, flash->offset + block->offset,
-				  erase_size);
+	return erase_device_block(flash->area, flash->offset + block->offset, block->size);
 }
 
 static int rd_chunk(const struct bt_mesh_blob_io *io,

From ba4d71a351cc3b586e20377f449f1bf29376f9aa Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@silabs.com>
Date: Mon, 27 Jan 2025 08:08:28 +0200
Subject: [PATCH 2354/2913] [nrf fromtree] Bluetooth: Host: Remove leftover HCI
 ECC command checks

The code shouldn't be checking for HCI command support anymore, rather in
the case of debug keys we can just start immediately using them.

Fixes commit 09e86f3b69b3112b96d6f89bf388d1ced982aef9.

Signed-off-by: Johan Hedberg <johan.hedberg@silabs.com>
(cherry picked from commit 3ae8a9cfe11cedafe0dc6f0a9d321edd5fba58c0)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/host/ecc.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/subsys/bluetooth/host/ecc.c b/subsys/bluetooth/host/ecc.c
index 749ffc1d8aa..a7354c20e37 100644
--- a/subsys/bluetooth/host/ecc.c
+++ b/subsys/bluetooth/host/ecc.c
@@ -252,14 +252,10 @@ int bt_pub_key_gen(struct bt_pub_key_cb *new_cb)
 	struct bt_pub_key_cb *cb;
 
 	if (IS_ENABLED(CONFIG_BT_USE_DEBUG_KEYS)) {
-		if (!BT_CMD_TEST(bt_dev.supported_commands, 41, 2)) {
-			LOG_WRN("ECC Debug keys HCI command not available");
-		} else {
-			atomic_set_bit(bt_dev.flags, BT_DEV_HAS_PUB_KEY);
-			__ASSERT_NO_MSG(new_cb->func != NULL);
-			new_cb->func(debug_public_key);
-			return 0;
-		}
+		atomic_set_bit(bt_dev.flags, BT_DEV_HAS_PUB_KEY);
+		__ASSERT_NO_MSG(new_cb->func != NULL);
+		new_cb->func(debug_public_key);
+		return 0;
 	}
 
 	if (!new_cb) {
@@ -312,8 +308,7 @@ void bt_pub_key_hci_disrupted(void)
 
 const uint8_t *bt_pub_key_get(void)
 {
-	if (IS_ENABLED(CONFIG_BT_USE_DEBUG_KEYS) &&
-	    BT_CMD_TEST(bt_dev.supported_commands, 41, 2)) {
+	if (IS_ENABLED(CONFIG_BT_USE_DEBUG_KEYS)) {
 		return debug_public_key;
 	}
 

From c26cd4942a6ed84a73ca7183c7583a78e94619a2 Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon.janc@codecoup.pl>
Date: Tue, 21 Jan 2025 10:42:10 +0100
Subject: [PATCH 2355/2913] [nrf fromtree] tests: Bluetooth: Tester: Avoid
 union with packed structure

This may cause some compiler warnings due to flexible array being
used in btp_hdr. Simply avoid it and do explicit pointer type cast
where needed.

Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl>
(cherry picked from commit aff2875d214dfcac3aa657904548369124f73781)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 tests/bluetooth/tester/src/btp.c | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/tests/bluetooth/tester/src/btp.c b/tests/bluetooth/tester/src/btp.c
index ca95e18a475..0ce11e3fb83 100644
--- a/tests/bluetooth/tester/src/btp.c
+++ b/tests/bluetooth/tester/src/btp.c
@@ -31,11 +31,8 @@ static struct k_thread cmd_thread;
 #define CMD_QUEUED 2
 struct btp_buf {
 	intptr_t _reserved;
-	uint8_t rsp[BTP_MTU];
-	union {
-		uint8_t data[BTP_MTU];
-		struct btp_hdr hdr;
-	};
+	uint8_t data[BTP_MTU]; /* includes btp header */
+	uint8_t rsp[BTP_DATA_MAX_SIZE];
 };
 
 static struct btp_buf cmd_buf[CMD_QUEUED];
@@ -90,25 +87,27 @@ static void cmd_handler(void *p1, void *p2, void *p3)
 	while (1) {
 		const struct btp_handler *btp;
 		struct btp_buf *cmd;
+		struct btp_hdr *hdr;
 		uint8_t status;
 		uint16_t rsp_len = 0;
 		uint16_t len;
 
 		cmd = k_fifo_get(&cmds_queue, K_FOREVER);
+		hdr = (struct btp_hdr *)cmd->data;
 
-		LOG_DBG("cmd service 0x%02x opcode 0x%02x index 0x%02x", cmd->hdr.service,
-			cmd->hdr.opcode, cmd->hdr.index);
+		LOG_DBG("cmd service 0x%02x opcode 0x%02x index 0x%02x",
+			hdr->service, hdr->opcode, hdr->index);
 
-		len = sys_le16_to_cpu(cmd->hdr.len);
+		len = sys_le16_to_cpu(hdr->len);
 
-		btp = find_btp_handler(cmd->hdr.service, cmd->hdr.opcode);
+		btp = find_btp_handler(hdr->service, hdr->opcode);
 		if (btp) {
-			if (btp->index != cmd->hdr.index) {
+			if (btp->index != hdr->index) {
 				status = BTP_STATUS_FAILED;
 			} else if ((btp->expect_len >= 0) && (btp->expect_len != len)) {
 				status = BTP_STATUS_FAILED;
 			} else {
-				status = btp->func(cmd->hdr.data, len,
+				status = btp->func(hdr->data, len,
 						   cmd->rsp, &rsp_len);
 			}
 
@@ -127,11 +126,11 @@ static void cmd_handler(void *p1, void *p2, void *p3)
 		}
 
 		if ((status == BTP_STATUS_SUCCESS) && rsp_len > 0) {
-			tester_send_with_index(cmd->hdr.service, cmd->hdr.opcode,
-					       cmd->hdr.index, cmd->rsp, rsp_len);
+			tester_send_with_index(hdr->service, hdr->opcode,
+					       hdr->index, cmd->rsp, rsp_len);
 		} else {
-			tester_rsp_with_index(cmd->hdr.service, cmd->hdr.opcode,
-					      cmd->hdr.index, status);
+			tester_rsp_with_index(hdr->service, hdr->opcode,
+					      hdr->index, status);
 		}
 
 		(void)memset(cmd, 0, sizeof(*cmd));

From 416e8fc24c82ffb4240b9dd526cd4360ea417f49 Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon.janc@codecoup.pl>
Date: Fri, 24 Jan 2025 14:05:12 +0100
Subject: [PATCH 2356/2913] =?UTF-8?q?[nrf=20fromtree]=C2=A0tests:=20Blueto?=
 =?UTF-8?q?oth:=20Tester:=20Improve=20BTP=20MTU=20validation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make sure MTU is validated to avoid reading pass command buffer.
Also make more explicit check in response length validation.

Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl>
(cherry picked from commit 24abac1207c4b8edecb029d909bf56640e373549)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 tests/bluetooth/tester/src/btp.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/bluetooth/tester/src/btp.c b/tests/bluetooth/tester/src/btp.c
index 0ce11e3fb83..2ba92bf8214 100644
--- a/tests/bluetooth/tester/src/btp.c
+++ b/tests/bluetooth/tester/src/btp.c
@@ -90,7 +90,6 @@ static void cmd_handler(void *p1, void *p2, void *p3)
 		struct btp_hdr *hdr;
 		uint8_t status;
 		uint16_t rsp_len = 0;
-		uint16_t len;
 
 		cmd = k_fifo_get(&cmds_queue, K_FOREVER);
 		hdr = (struct btp_hdr *)cmd->data;
@@ -98,11 +97,13 @@ static void cmd_handler(void *p1, void *p2, void *p3)
 		LOG_DBG("cmd service 0x%02x opcode 0x%02x index 0x%02x",
 			hdr->service, hdr->opcode, hdr->index);
 
-		len = sys_le16_to_cpu(hdr->len);
-
 		btp = find_btp_handler(hdr->service, hdr->opcode);
 		if (btp) {
-			if (btp->index != hdr->index) {
+			uint16_t len = sys_le16_to_cpu(hdr->len);
+
+			if (len > BTP_DATA_MAX_SIZE) {
+				status = BTP_STATUS_FAILED;
+			} else if (btp->index != hdr->index) {
 				status = BTP_STATUS_FAILED;
 			} else if ((btp->expect_len >= 0) && (btp->expect_len != len)) {
 				status = BTP_STATUS_FAILED;
@@ -111,7 +112,8 @@ static void cmd_handler(void *p1, void *p2, void *p3)
 						   cmd->rsp, &rsp_len);
 			}
 
-			__ASSERT_NO_MSG((rsp_len + sizeof(struct btp_hdr)) <= BTP_MTU);
+			/* This means that caller likely overwrote rsp buffer */
+			__ASSERT_NO_MSG(rsp_len <= BTP_DATA_MAX_SIZE);
 		} else {
 			status = BTP_STATUS_UNKNOWN_CMD;
 		}

From f30c34f2dd91d14c6c4dd8b66cdbb6783f6b119a Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@silabs.com>
Date: Mon, 27 Jan 2025 16:32:27 +0200
Subject: [PATCH 2357/2913] [nrf fromtree] Bluetooth: Host: Fix overwriting ECC
 error value

Jump straight to the exit portion of the function in the case that
psa_destroy_key() failed and we set err to a non-zero value. This also
fixes Coverity CID 487701 "Code maintainability issues  (UNUSED_VALUE)".

Signed-off-by: Johan Hedberg <johan.hedberg@silabs.com>
(cherry picked from commit 8b356fd9fbc5928d7cb54d788ee516ca0c1eed05)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/host/ecc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/subsys/bluetooth/host/ecc.c b/subsys/bluetooth/host/ecc.c
index a7354c20e37..6efc4f2baa9 100644
--- a/subsys/bluetooth/host/ecc.c
+++ b/subsys/bluetooth/host/ecc.c
@@ -220,6 +220,7 @@ static void generate_dh_key(struct k_work *work)
 	if (ret != PSA_SUCCESS) {
 		LOG_ERR("Failed to destroy the key %d", ret);
 		err = -EIO;
+		goto exit;
 	}
 
 	err = 0;

From 805ede3f472e0632c648398d5ebdc772f679d4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Battrel?= <theo.battrel@nordicsemi.no>
Date: Fri, 10 Jan 2025 12:02:40 +0100
Subject: [PATCH 2358/2913] =?UTF-8?q?[nrf=20fromtree]=C2=A0Bluetooth:=20Ho?=
 =?UTF-8?q?st:=20Specify=20parameter=20needs=20of=20`bt=5Fset=5Fname`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

State that the name given to `bt_set_name` must be null terminated.

If not, the behavior of the function may be wrong as it's using `strlen`
to get the length of the given name and `strcmp` to compare it to the
current device name. Both of those functions expect null terminated string.

Signed-off-by: Théo Battrel <theo.battrel@nordicsemi.no>
(cherry picked from commit 7884b929fe7635dcde8f68bb60ae2018a572f1fe)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 include/zephyr/bluetooth/bluetooth.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/zephyr/bluetooth/bluetooth.h b/include/zephyr/bluetooth/bluetooth.h
index 1b5576d9466..d1618f98a3a 100644
--- a/include/zephyr/bluetooth/bluetooth.h
+++ b/include/zephyr/bluetooth/bluetooth.h
@@ -268,7 +268,7 @@ bool bt_is_ready(void);
  *
  * @sa @kconfig{CONFIG_BT_DEVICE_NAME_MAX}.
  *
- * @param name New name
+ * @param name New name, must be null terminated
  *
  * @return Zero on success or (negative) error code otherwise.
  */

From d2a2a87c62bf116018c4670d430cab3fb513c0ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Battrel?= <theo.battrel@nordicsemi.no>
Date: Wed, 15 Jan 2025 08:50:23 +0100
Subject: [PATCH 2359/2913] [nrf fromtree] Bluetooth: Host: GAP Device Name
 write now add null char at the end
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The function used to write the value of the GAP Device Name
characteristic now ensure that the string passed to `bt_set_name` is
null terminated.

Also fix a wrong offset calculation.

The function used to write the value of the GAP Device Name
characteristic was returning an error when the offset + the length of
data to write was superior **or equal** to the maximum size of the
device name.

This caused the actual maximum device name size to be reduced by 1 byte.

Signed-off-by: Théo Battrel <theo.battrel@nordicsemi.no>
(cherry picked from commit 972d4c7369bc9c2a4af3274768b4d6e74bb4141f)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/host/gatt.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/subsys/bluetooth/host/gatt.c b/subsys/bluetooth/host/gatt.c
index c9a056bb2df..7ea10083d0f 100644
--- a/subsys/bluetooth/host/gatt.c
+++ b/subsys/bluetooth/host/gatt.c
@@ -101,22 +101,24 @@ static ssize_t read_name(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 
 #if defined(CONFIG_BT_DEVICE_NAME_GATT_WRITABLE)
 
-static ssize_t write_name(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			 const void *buf, uint16_t len, uint16_t offset,
-			 uint8_t flags)
+static ssize_t write_name(struct bt_conn *conn, const struct bt_gatt_attr *attr, const void *buf,
+			  uint16_t len, uint16_t offset, uint8_t flags)
 {
-	char value[CONFIG_BT_DEVICE_NAME_MAX] = {};
+	/* adding one to fit the terminating null character */
+	char value[CONFIG_BT_DEVICE_NAME_MAX + 1] = {};
 
-	if (offset >= sizeof(value)) {
+	if (offset >= CONFIG_BT_DEVICE_NAME_MAX) {
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
 	}
 
-	if (offset + len >= sizeof(value)) {
+	if (offset + len > CONFIG_BT_DEVICE_NAME_MAX) {
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
 	}
 
 	memcpy(value, buf, len);
 
+	value[len] = '\0';
+
 	bt_set_name(value);
 
 	return len;

From e02acf331678718178e764ba03d93cac9f1238dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Battrel?= <theo.battrel@nordicsemi.no>
Date: Wed, 15 Jan 2025 12:41:47 +0100
Subject: [PATCH 2360/2913] =?UTF-8?q?[nrf=20fromtree]=C2=A0Tests:=20Blueto?=
 =?UTF-8?q?oth:=20Add=20MTU=20exchange=20procedure=20in=20testlib?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add `bt_testlib_att_exchange_mtu` function to simplify the procedure.

Signed-off-by: Théo Battrel <theo.battrel@nordicsemi.no>
(cherry picked from commit e3cf59bfd31f36533fe397ddc55fae5d57f28fec)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 tests/bluetooth/common/testlib/CMakeLists.txt |  1 +
 .../common/testlib/include/testlib/att.h      | 15 ++++
 tests/bluetooth/common/testlib/src/att.c      | 69 +++++++++++++++++++
 3 files changed, 85 insertions(+)
 create mode 100644 tests/bluetooth/common/testlib/include/testlib/att.h
 create mode 100644 tests/bluetooth/common/testlib/src/att.c

diff --git a/tests/bluetooth/common/testlib/CMakeLists.txt b/tests/bluetooth/common/testlib/CMakeLists.txt
index fa84121285d..5f71212adf1 100644
--- a/tests/bluetooth/common/testlib/CMakeLists.txt
+++ b/tests/bluetooth/common/testlib/CMakeLists.txt
@@ -15,6 +15,7 @@ target_include_directories(testlib PUBLIC
 
 target_sources(testlib PRIVATE
   src/adv.c
+  src/att.c
   src/att_read.c
   src/att_write.c
   src/conn_ref.c
diff --git a/tests/bluetooth/common/testlib/include/testlib/att.h b/tests/bluetooth/common/testlib/include/testlib/att.h
new file mode 100644
index 00000000000..f83b8b20e11
--- /dev/null
+++ b/tests/bluetooth/common/testlib/include/testlib/att.h
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_TESTS_BLUETOOTH_COMMON_TESTLIB_INCLUDE_TESTLIB_ATT_H_
+#define ZEPHYR_TESTS_BLUETOOTH_COMMON_TESTLIB_INCLUDE_TESTLIB_ATT_H_
+
+#include <stdint.h>
+#include <zephyr/bluetooth/conn.h>
+
+int bt_testlib_att_exchange_mtu(struct bt_conn *conn);
+
+#endif /* ZEPHYR_TESTS_BLUETOOTH_COMMON_TESTLIB_INCLUDE_TESTLIB_ATT_H_ */
diff --git a/tests/bluetooth/common/testlib/src/att.c b/tests/bluetooth/common/testlib/src/att.c
new file mode 100644
index 00000000000..01c9a5b774c
--- /dev/null
+++ b/tests/bluetooth/common/testlib/src/att.c
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/att.h>
+
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(bt_testlib_att, LOG_LEVEL_DBG);
+
+static uint8_t exchange_mtu_err;
+static K_MUTEX_DEFINE(exchange_mtu_lock);
+static K_CONDVAR_DEFINE(exchange_mtu_done);
+
+static void bt_testlib_att_exchange_mtu_cb(struct bt_conn *conn, uint8_t err,
+					   struct bt_gatt_exchange_params *params)
+{
+	char addr[BT_ADDR_LE_STR_LEN];
+
+	k_mutex_lock(&exchange_mtu_lock, K_FOREVER);
+
+	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
+
+	LOG_DBG("MTU exchange %s (%s)", err == 0U ? "successful" : "failed", addr);
+
+	exchange_mtu_err = err;
+
+	k_condvar_signal(&exchange_mtu_done);
+
+	k_mutex_unlock(&exchange_mtu_lock);
+}
+
+int bt_testlib_att_exchange_mtu(struct bt_conn *conn)
+{
+	int err;
+	struct bt_gatt_exchange_params exchange_mtu_params;
+
+	__ASSERT_NO_MSG(conn != NULL);
+
+	k_mutex_lock(&exchange_mtu_lock, K_FOREVER);
+
+	exchange_mtu_err = 0;
+
+	exchange_mtu_params.func = bt_testlib_att_exchange_mtu_cb;
+
+	err = bt_gatt_exchange_mtu(conn, &exchange_mtu_params);
+	if (err != 0) {
+		LOG_ERR("Failed to exchange MTU (err %d)", err);
+
+		k_mutex_unlock(&exchange_mtu_lock);
+
+		return err;
+	}
+
+	k_condvar_wait(&exchange_mtu_done, &exchange_mtu_lock, K_FOREVER);
+
+	err = exchange_mtu_err;
+
+	k_mutex_unlock(&exchange_mtu_lock);
+
+	return err;
+}

From 6f78320e8ec04896854a1ac3de1462de84828949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Battrel?= <theo.battrel@nordicsemi.no>
Date: Fri, 10 Jan 2025 12:27:31 +0100
Subject: [PATCH 2361/2913] [nrf fromtree] Tests: Bluetooth: Add 'device_name'
 GATT test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The goal of this test is to ensure that setting the device name by
writing to the GAP 'Device Name' characteristic work as expected.

Signed-off-by: Théo Battrel <theo.battrel@nordicsemi.no>
(cherry picked from commit 161222050cd02c92d2ff469f08208bd0521aeac0)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 .../host/gatt/device_name/CMakeLists.txt      |  24 +++
 .../bluetooth/host/gatt/device_name/prj.conf  |  35 ++++
 .../host/gatt/device_name/src/client.c        | 126 ++++++++++++++
 .../host/gatt/device_name/src/common.h        |  24 +++
 .../host/gatt/device_name/src/main.c          |  51 ++++++
 .../host/gatt/device_name/src/server.c        | 161 ++++++++++++++++++
 .../test_scripts/run_device_name.sh           |  28 +++
 .../host/gatt/device_name/testcase.yaml       |  10 ++
 8 files changed, 459 insertions(+)
 create mode 100644 tests/bsim/bluetooth/host/gatt/device_name/CMakeLists.txt
 create mode 100644 tests/bsim/bluetooth/host/gatt/device_name/prj.conf
 create mode 100644 tests/bsim/bluetooth/host/gatt/device_name/src/client.c
 create mode 100644 tests/bsim/bluetooth/host/gatt/device_name/src/common.h
 create mode 100644 tests/bsim/bluetooth/host/gatt/device_name/src/main.c
 create mode 100644 tests/bsim/bluetooth/host/gatt/device_name/src/server.c
 create mode 100755 tests/bsim/bluetooth/host/gatt/device_name/test_scripts/run_device_name.sh
 create mode 100644 tests/bsim/bluetooth/host/gatt/device_name/testcase.yaml

diff --git a/tests/bsim/bluetooth/host/gatt/device_name/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/device_name/CMakeLists.txt
new file mode 100644
index 00000000000..f8422e0256c
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/device_name/CMakeLists.txt
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+project(device_name)
+
+add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/common/testlib testlib)
+target_link_libraries(app PRIVATE testlib)
+
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
+zephyr_include_directories(
+  ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
+  ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
+)
+
+target_sources(app PRIVATE
+  src/main.c
+  src/server.c
+  src/client.c
+)
diff --git a/tests/bsim/bluetooth/host/gatt/device_name/prj.conf b/tests/bsim/bluetooth/host/gatt/device_name/prj.conf
new file mode 100644
index 00000000000..364cccfca48
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/device_name/prj.conf
@@ -0,0 +1,35 @@
+CONFIG_BT_TESTING=y
+
+CONFIG_BT=y
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_PERIPHERAL=y
+
+CONFIG_BT_DEVICE_NAME_DYNAMIC=y
+CONFIG_BT_DEVICE_NAME_GATT_WRITABLE=y
+
+# Dependency of testlib/adv and testlib/scan.
+CONFIG_BT_EXT_ADV=y
+
+CONFIG_BT_AUTO_PHY_UPDATE=n
+CONFIG_BT_GATT_AUTO_UPDATE_MTU=n
+CONFIG_BT_AUTO_DATA_LEN_UPDATE=n
+CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
+
+CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
+CONFIG_BT_GATT_AUTO_RESUBSCRIBE=n
+
+CONFIG_BT_SMP=y
+CONFIG_BT_GATT_CLIENT=y
+CONFIG_BT_GATT_DYNAMIC_DB=y
+CONFIG_BT_GATT_CACHING=y
+
+CONFIG_LOG=y
+CONFIG_ASSERT=y
+
+CONFIG_THREAD_NAME=y
+CONFIG_LOG_THREAD_ID_PREFIX=y
+
+CONFIG_ARCH_POSIX_TRAP_ON_FATAL=y
+
+CONFIG_BT_L2CAP_TX_MTU=512
+CONFIG_BT_BUF_ACL_RX_SIZE=518
diff --git a/tests/bsim/bluetooth/host/gatt/device_name/src/client.c b/tests/bsim/bluetooth/host/gatt/device_name/src/client.c
new file mode 100644
index 00000000000..b564692b8ce
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/device_name/src/client.c
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/att.h>
+#include <zephyr/bluetooth/gatt.h>
+
+#include <zephyr/settings/settings.h>
+
+#include <zephyr/logging/log.h>
+
+#include "testlib/adv.h"
+#include "testlib/att.h"
+#include "testlib/att_read.h"
+#include "testlib/att_write.h"
+#include "testlib/conn.h"
+
+#include "babblekit/flags.h"
+#include "babblekit/sync.h"
+#include "babblekit/testcase.h"
+
+#include "common.h"
+
+LOG_MODULE_REGISTER(client, LOG_LEVEL_DBG);
+
+static DEFINE_FLAG(client_security_changed_flag);
+
+static struct bt_conn_cb client_conn_cb;
+
+static void security_changed(struct bt_conn *conn, bt_security_t level, enum bt_security_err err)
+{
+	char addr_str[BT_ADDR_LE_STR_LEN];
+
+	bt_addr_le_to_str(bt_conn_get_dst(conn), addr_str, sizeof(addr_str));
+
+	TEST_ASSERT(err == 0, "Security update failed: %s level %u err %d", addr_str, level, err);
+
+	LOG_DBG("Security changed: %s level %u", addr_str, level);
+	SET_FLAG(client_security_changed_flag);
+}
+
+static void init_client_conn_callbacks(void)
+{
+	int err;
+
+	client_conn_cb.connected = NULL;
+	client_conn_cb.disconnected = NULL;
+	client_conn_cb.security_changed = security_changed;
+
+	err = bt_conn_cb_register(&client_conn_cb);
+	TEST_ASSERT(err == 0, "Failed to set client conn callbacks (err %d)", err);
+}
+
+void find_characteristic(struct bt_conn *conn, const struct bt_uuid *svc,
+			 const struct bt_uuid *chrc, uint16_t *chrc_value_handle)
+{
+	int err;
+	uint16_t svc_handle;
+	uint16_t svc_end_handle;
+	uint16_t chrc_end_handle;
+
+	err = bt_testlib_gatt_discover_primary(&svc_handle, &svc_end_handle, conn, svc,
+					       BT_ATT_FIRST_ATTRIBUTE_HANDLE,
+					       BT_ATT_LAST_ATTRIBUTE_HANDLE);
+	TEST_ASSERT(err == 0, "Failed to discover service: %d", err);
+
+	LOG_DBG("svc_handle: %u, svc_end_handle: %u", svc_handle, svc_end_handle);
+
+	err = bt_testlib_gatt_discover_characteristic(chrc_value_handle, &chrc_end_handle, NULL,
+						      conn, chrc, (svc_handle + 1), svc_end_handle);
+	TEST_ASSERT(err == 0, "Failed to get value handle: %d", err);
+
+	LOG_DBG("chrc_value_handle: %u, chrc_end_handle: %u", *chrc_value_handle, chrc_end_handle);
+}
+
+void client_procedure(void)
+{
+	int err;
+	struct bt_conn *conn;
+	uint16_t handle;
+
+	char server_new_name[CONFIG_BT_DEVICE_NAME_MAX];
+
+	NET_BUF_SIMPLE_DEFINE(attr_value_buf, BT_ATT_MAX_ATTRIBUTE_LEN);
+
+	generate_name(server_new_name, CONFIG_BT_DEVICE_NAME_MAX);
+
+	TEST_START("client");
+
+	bk_sync_init();
+
+	err = bt_enable(NULL);
+	TEST_ASSERT(err == 0, "Cannot enable Bluetooth (err %d)", err);
+
+	LOG_DBG("Bluetooth initialized");
+
+	init_client_conn_callbacks();
+
+	err = bt_testlib_adv_conn(&conn, BT_ID_DEFAULT, ADVERTISER_NAME);
+	TEST_ASSERT(err == 0, "Failed to start connectable advertising (err %d)", err);
+
+	err = bt_testlib_att_exchange_mtu(conn);
+	TEST_ASSERT(err == 0, "Failed to update MTU (err %d)", err);
+
+	find_characteristic(conn, BT_UUID_GAP, BT_UUID_GAP_DEVICE_NAME, &handle);
+
+	err = bt_testlib_att_read_by_handle_sync(&attr_value_buf, NULL, NULL, conn,
+						 BT_ATT_CHAN_OPT_UNENHANCED_ONLY, handle, 0);
+	TEST_ASSERT(err == 0, "Failed to read characteristic (err %d)", err);
+
+	LOG_DBG("Device Name of the server: %.*s", attr_value_buf.len, attr_value_buf.data);
+
+	err = bt_testlib_att_write(conn, BT_ATT_CHAN_OPT_UNENHANCED_ONLY, handle, server_new_name,
+				   sizeof(server_new_name));
+	TEST_ASSERT(err == BT_ATT_ERR_SUCCESS, "Got ATT error: %d", err);
+
+	bk_sync_send();
+
+	TEST_PASS("client");
+}
diff --git a/tests/bsim/bluetooth/host/gatt/device_name/src/common.h b/tests/bsim/bluetooth/host/gatt/device_name/src/common.h
new file mode 100644
index 00000000000..e04fc38fce2
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/device_name/src/common.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_TESTS_BSIM_BLUETOOTH_HOST_GATT_DEVICE_NAME_SRC_COMMON_H_
+#define ZEPHYR_TESTS_BSIM_BLUETOOTH_HOST_GATT_DEVICE_NAME_SRC_COMMON_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include <zephyr/bluetooth/bluetooth.h>
+
+#define ADVERTISER_NAME "Advertiser Pro II"
+
+static void generate_name(uint8_t *name, size_t length)
+{
+	for (size_t i = 0; i < length; i++) {
+		name[i] = (i % 26) + 97;
+	}
+}
+
+#endif /* ZEPHYR_TESTS_BSIM_BLUETOOTH_HOST_DEVICE_NAME_CLEAR_SRC_COMMON_H_ */
diff --git a/tests/bsim/bluetooth/host/gatt/device_name/src/main.c b/tests/bsim/bluetooth/host/gatt/device_name/src/main.c
new file mode 100644
index 00000000000..e6f5ad5e26b
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/device_name/src/main.c
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#include "bs_tracing.h"
+#include "bstests.h"
+#include "babblekit/testcase.h"
+#include "testlib/log_utils.h"
+
+extern void server_procedure(void);
+extern void client_procedure(void);
+extern enum bst_result_t bst_result;
+
+static void test_end_cb(void)
+{
+	if (bst_result != Passed) {
+		TEST_PRINT("Test has not passed.");
+	}
+}
+
+static const struct bst_test_instance entrypoints[] = {
+	{
+		.test_id = "server",
+		.test_delete_f = test_end_cb,
+		.test_main_f = server_procedure,
+	},
+	{
+		.test_id = "client",
+		.test_delete_f = test_end_cb,
+		.test_main_f = client_procedure,
+	},
+	BSTEST_END_MARKER,
+};
+
+static struct bst_test_list *install(struct bst_test_list *tests)
+{
+	return bst_add_tests(tests, entrypoints);
+};
+
+bst_test_install_t test_installers[] = {install, NULL};
+
+int main(void)
+{
+	bst_main();
+
+	return 0;
+}
diff --git a/tests/bsim/bluetooth/host/gatt/device_name/src/server.c b/tests/bsim/bluetooth/host/gatt/device_name/src/server.c
new file mode 100644
index 00000000000..3d3d7edeeac
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/device_name/src/server.c
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <string.h>
+#include <stdbool.h>
+
+#include <zephyr/kernel.h>
+
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/uuid.h>
+
+#include <zephyr/settings/settings.h>
+
+#include <zephyr/logging/log.h>
+
+#include <zephyr/sys/util.h>
+
+#include "testlib/conn.h"
+#include "testlib/scan.h"
+
+#include "babblekit/flags.h"
+#include "babblekit/sync.h"
+#include "babblekit/testcase.h"
+
+#include "common.h"
+
+LOG_MODULE_REGISTER(server, LOG_LEVEL_DBG);
+
+static DEFINE_FLAG(security_changed_flag);
+
+static struct bt_conn_cb server_conn_cb;
+
+static inline bool memeq(const void *m1, size_t len1, const void *m2, size_t len2)
+{
+	int ret;
+
+	if (len1 != len2) {
+		return false;
+	}
+
+	ret = memcmp(m1, m2, len1);
+
+	return ret == 0;
+}
+
+static void security_changed(struct bt_conn *conn, bt_security_t level, enum bt_security_err err)
+{
+	char addr_str[BT_ADDR_LE_STR_LEN];
+
+	bt_addr_le_to_str(bt_conn_get_dst(conn), addr_str, sizeof(addr_str));
+
+	TEST_ASSERT(err == 0, "Security update failed: %s level %u err %d", addr_str, level, err);
+
+	LOG_DBG("Security changed: %s level %u", addr_str, level);
+	SET_FLAG(security_changed_flag);
+}
+
+static void init_server_conn_callbacks(void)
+{
+	int err;
+
+	server_conn_cb.connected = NULL;
+	server_conn_cb.disconnected = NULL;
+	server_conn_cb.security_changed = security_changed;
+	server_conn_cb.identity_resolved = NULL;
+
+	err = bt_conn_cb_register(&server_conn_cb);
+	TEST_ASSERT(err == 0, "Failed to set server conn callbacks (err %d)", err);
+}
+
+static void connect_and_set_security(struct bt_conn **conn)
+{
+	int err;
+	bt_addr_le_t client = {};
+
+	err = bt_testlib_scan_find_name(&client, ADVERTISER_NAME);
+	TEST_ASSERT(err == 0, "Failed to start scan (err %d)", err);
+
+	err = bt_testlib_connect(&client, conn);
+	TEST_ASSERT(err == 0, "Failed to initiate connection (err %d)", err);
+
+	err = bt_conn_set_security(*conn, BT_SECURITY_L2);
+	TEST_ASSERT(err == 0, "Failed to set security (err %d)", err);
+
+	WAIT_FOR_FLAG(security_changed_flag);
+}
+
+void server_procedure(void)
+{
+	/* Test purpose:
+	 *
+	 * Verifies that writing to the GAP Device Name characteristic correctly
+	 * update the device name.
+	 *
+	 * Two devices:
+	 * - `server`: GATT server, connect and elevate security
+	 * - `client`: GATT client, when connected will look for the GAP Device
+	 *   Name characteristic handle and then will send a GATT write with a
+	 *   new name
+	 *
+	 * [verdict]
+	 * - the server device name has been updated by the client
+	 */
+
+	int err;
+	struct bt_conn *conn = NULL;
+
+	bool names_are_matching;
+
+	uint8_t expected_name[CONFIG_BT_DEVICE_NAME_MAX];
+
+	/* add one for the null character */
+	char original_name[CONFIG_BT_DEVICE_NAME_MAX + 1];
+	char new_name[CONFIG_BT_DEVICE_NAME_MAX + 1];
+
+	const char *name;
+
+	generate_name(expected_name, CONFIG_BT_DEVICE_NAME_MAX);
+
+	TEST_START("server");
+
+	bk_sync_init();
+
+	err = bt_enable(NULL);
+	TEST_ASSERT(err == 0, "Cannot enable Bluetooth (err %d)", err);
+
+	LOG_DBG("Bluetooth initialized");
+
+	err = bt_set_name("Server Super Name");
+	TEST_ASSERT(err == 0, "Failed to set the name (err %d)", err);
+
+	name = bt_get_name();
+	memcpy(original_name, name, strlen(name) + 1);
+
+	init_server_conn_callbacks();
+
+	connect_and_set_security(&conn);
+
+	/* wait for client to do gatt write */
+	bk_sync_wait();
+
+	name = bt_get_name();
+	memcpy(new_name, name, strlen(name) + 1);
+
+	LOG_DBG("Original Device Name: %s", original_name);
+	LOG_DBG("New Device Name: %s", new_name);
+
+	names_are_matching =
+		memeq(expected_name, sizeof(expected_name), new_name, strlen(new_name));
+	TEST_ASSERT(names_are_matching,
+		    "The name of the server doesn't match the one set by the client (server name: "
+		    "`%s`, expected name: `%.*s`)",
+		    new_name, sizeof(expected_name), expected_name);
+
+	TEST_PASS("server");
+}
diff --git a/tests/bsim/bluetooth/host/gatt/device_name/test_scripts/run_device_name.sh b/tests/bsim/bluetooth/host/gatt/device_name/test_scripts/run_device_name.sh
new file mode 100755
index 00000000000..944de3a87fe
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/device_name/test_scripts/run_device_name.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# Copyright 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+set -eu
+
+source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
+
+test_name="$(guess_test_long_name)"
+simulation_id=${test_name}
+
+verbosity_level=2
+
+EXECUTE_TIMEOUT=120
+
+SIM_LEN_US=$((2 * 1000 * 1000))
+
+test_exe="${BSIM_OUT_PATH}/bin/bs_${BOARD_TS}_${test_name}_prj_conf"
+
+cd ${BSIM_OUT_PATH}/bin
+
+Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} -D=2 -sim_length=${SIM_LEN_US} $@
+
+Execute "${test_exe}" -v=${verbosity_level} -s=${simulation_id} -d=0 -rs=420 -testid=server \
+    -RealEncryption=1
+Execute "${test_exe}" -v=${verbosity_level} -s=${simulation_id} -d=1 -rs=69  -testid=client \
+    -RealEncryption=1
+
+wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/gatt/device_name/testcase.yaml b/tests/bsim/bluetooth/host/gatt/device_name/testcase.yaml
new file mode 100644
index 00000000000..4bd3a1b7c83
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/device_name/testcase.yaml
@@ -0,0 +1,10 @@
+tests:
+  bluetooth.host.gatt.device_name:
+    build_only: true
+    tags:
+      - bluetooth
+    platform_allow:
+      - nrf52_bsim/native
+    harness: bsim
+    harness_config:
+      bsim_exe_name: tests_bsim_bluetooth_host_gatt_device_name_prj_conf

From 4ca71a2719b577550c55ca4c8aec6a1cce4bf6f9 Mon Sep 17 00:00:00 2001
From: Ludvig Jordet <ludvig.jordet@nordicsemi.no>
Date: Tue, 28 Jan 2025 16:41:13 +0100
Subject: [PATCH 2362/2913] =?UTF-8?q?[nrf=20fromtree]=C2=A0Tests:=20Blueto?=
 =?UTF-8?q?oth:=20Add=20hci=5Fipc=20config=20to=20Twister=20integration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This adds the configuration used when running PTS tests with hci_ipc to
the testcase.yaml, so they are built on integration by CI, avoiding
regression.

Signed-off-by: Ludvig Jordet <ludvig.jordet@nordicsemi.no>
(cherry picked from commit ce4bab5662764471f4233a09ade3e2e712fd013f)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 tests/bluetooth/tester/testcase.yaml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/bluetooth/tester/testcase.yaml b/tests/bluetooth/tester/testcase.yaml
index 7a389a122f5..b9946b9d610 100644
--- a/tests/bluetooth/tester/testcase.yaml
+++ b/tests/bluetooth/tester/testcase.yaml
@@ -16,6 +16,20 @@ tests:
       - frdm_rw612
     extra_configs:
       - CONFIG_NXP_MONOLITHIC_NBU=n
+  bluetooth.general.tester_hci_ipc:
+    build_only: true
+    harness: bluetooth
+    platform_allow:
+      - qemu_x86
+      - native_sim
+      - nrf5340dk/nrf5340/cpuapp
+    integration_platforms:
+      - nrf5340dk/nrf5340/cpuapp
+    extra_args:
+      # Build config used by AutoPTS for nRF53
+      - EXTRA_CONF_FILE="hci_ipc.conf"
+    tags: bluetooth
+    sysbuild: true
   bluetooth.general.tester_le_audio:
     build_only: true
     platform_allow:

From f7e09442fc30490b181904f0281cc37f2a057c19 Mon Sep 17 00:00:00 2001
From: Ludvig Jordet <ludvig.jordet@nordicsemi.no>
Date: Tue, 17 Dec 2024 17:07:01 +0100
Subject: [PATCH 2363/2913] [nrf fromtree] Bluetooth: Mesh: add missing device
 key candidate PSA support

Commit adds PSA key support for device key candidate.

Signed-off-by: Ludvig Jordet <ludvig.jordet@nordicsemi.no>
(cherry picked from commit 5facb50fe909b7c56b4bf6a1b548e1bd4769cea1)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/mesh/net.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/subsys/bluetooth/mesh/net.c b/subsys/bluetooth/mesh/net.c
index cf95884fd5a..276728bd9a4 100644
--- a/subsys/bluetooth/mesh/net.c
+++ b/subsys/bluetooth/mesh/net.c
@@ -1109,17 +1109,23 @@ BT_MESH_SETTINGS_DEFINE(seq, "Seq", seq_set);
 #if defined(CONFIG_BT_MESH_RPR_SRV)
 static int dev_key_cand_set(const char *name, size_t len_rd, settings_read_cb read_cb,
 		   void *cb_arg)
-{	int err;
+{
+	int err;
+	struct bt_mesh_key key;
 
-	if (len_rd < 16) {
-		return -EINVAL;
+	if (len_rd == 0) {
+		LOG_DBG("val (null)");
+
+		bt_mesh_key_destroy(&bt_mesh.dev_key_cand);
+		memset(&bt_mesh.dev_key_cand, 0, sizeof(struct bt_mesh_key));
+		return 0;
 	}
 
-	err = bt_mesh_settings_set(read_cb, cb_arg, &bt_mesh.dev_key_cand,
-				   sizeof(struct bt_mesh_key));
+	err = bt_mesh_settings_set(read_cb, cb_arg, &key, sizeof(struct bt_mesh_key));
 	if (!err) {
 		LOG_DBG("DevKey candidate recovered from storage");
 		atomic_set_bit(bt_mesh.flags, BT_MESH_DEVKEY_CAND);
+		bt_mesh_key_assign(&bt_mesh.dev_key_cand, &key);
 	}
 
 	return err;

From bb4378e4102f62e038220b07ef5c827547953dac Mon Sep 17 00:00:00 2001
From: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
Date: Wed, 29 Jan 2025 15:21:25 +0100
Subject: [PATCH 2364/2913] [nrf fromtree] Bluetooth: Mesh: remove deprecated
 field in cdb subnet

Commit removes deprecated filed in cdb subnetwork.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
(cherry picked from commit a09fa5f7f3caed6364ba9cc4fc0d48999b146b4d)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/mesh/cdb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/subsys/bluetooth/mesh/cdb.c b/subsys/bluetooth/mesh/cdb.c
index 33c9601807c..310108d7b75 100644
--- a/subsys/bluetooth/mesh/cdb.c
+++ b/subsys/bluetooth/mesh/cdb.c
@@ -55,7 +55,7 @@ struct node_val {
 
 /* NetKey storage information */
 struct net_key_val {
-	uint8_t kr_flag:1,
+	uint8_t unused:1,
 		kr_phase:7;
 	struct bt_mesh_key val[2];
 } __packed;
@@ -491,7 +491,7 @@ static void store_cdb_subnet(const struct bt_mesh_cdb_subnet *sub)
 
 	memcpy(&key.val[0], &sub->keys[0].net_key, sizeof(struct bt_mesh_key));
 	memcpy(&key.val[1], &sub->keys[1].net_key, sizeof(struct bt_mesh_key));
-	key.kr_flag = 0U; /* Deprecated */
+	key.unused = 0U;
 	key.kr_phase = sub->kr_phase;
 
 	snprintk(path, sizeof(path), "bt/mesh/cdb/Subnet/%x", sub->net_idx);

From a4c682dcb6892a3fbf3aa6f80e5ec07065ab4413 Mon Sep 17 00:00:00 2001
From: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
Date: Wed, 29 Jan 2025 16:11:34 +0100
Subject: [PATCH 2365/2913] [nrf fromtree] doc: update migration guide with
 mesh versions incompatibility

Commit adds description of key representation incompatibility
for mesh images built with different crypto libraries.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
(cherry picked from commit 5e235bbf88fa26597ae648428eff23a76b761348)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 doc/connectivity/bluetooth/api/mesh/dfu.rst |  5 +++--
 doc/releases/migration-guide-4.1.rst        | 10 ++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/doc/connectivity/bluetooth/api/mesh/dfu.rst b/doc/connectivity/bluetooth/api/mesh/dfu.rst
index 926754ab0f0..959872ae9b9 100644
--- a/doc/connectivity/bluetooth/api/mesh/dfu.rst
+++ b/doc/connectivity/bluetooth/api/mesh/dfu.rst
@@ -212,9 +212,10 @@ re-provisioned. The complete list of available options is defined in :c:enum:`bt
    provisioning. In this case, the device stays provisioned and the new composition data takes place
    after re-provisioning using the Remote Provisioning models.
 :c:enumerator:`BT_MESH_DFU_EFFECT_UNPROV`
-  This effect is chosen if the composition data in the new firmware changes, the device doesn't
+  This effect is chosen if the composition data in the new firmware changes, the device does not
   support the remote provisioning, and the new composition data takes effect after applying the
-  firmware.
+  firmware. The effect can also be chosen, if it is necessary to unprovision the device for
+  application-specific reasons.
 
 When the Target node receives the Firmware Update Firmware Metadata Check message, the Firmware
 Update Server model calls the :c:member:`bt_mesh_dfu_srv_cb.check` callback, the application can
diff --git a/doc/releases/migration-guide-4.1.rst b/doc/releases/migration-guide-4.1.rst
index 70a168c6de5..0d4f16db084 100644
--- a/doc/releases/migration-guide-4.1.rst
+++ b/doc/releases/migration-guide-4.1.rst
@@ -305,6 +305,16 @@ Bluetooth Mesh
   set as deprecated. Default option for platforms that do not support TF-M
   is :kconfig:option:`CONFIG_BT_MESH_USES_MBEDTLS_PSA`.
 
+* Mesh key representations are not backward compatible if images are built with TinyCrypt and
+  crypto libraries based on the PSA API. Mesh no longer stores the key values for those crypto
+  libraries. The crypto library stores the keys in the internal trusted storage.
+  If a provisioned device is going to update its image that was built with
+  the :kconfig:option:`CONFIG_BT_MESH_USES_TINYCRYPT` Kconfig option set on an image
+  that was built with :kconfig:option:`CONFIG_BT_MESH_USES_MBEDTLS_PSA` or
+  :kconfig:option:`CONFIG_BT_MESH_USES_TFM_PSA` without erasing the persistent area,
+  it should be unprovisioned first and reprovisioned after update again.
+  If the image is changed over Mesh DFU, use :c:enumerator:`BT_MESH_DFU_EFFECT_UNPROV`.
+
 * Mesh explicitly depends on the Secure Storage subsystem if storing into
   non-volatile memory (:kconfig:option:`CONFIG_BT_SETTINGS`) is enabled and
   Mbed TLS library (:kconfig:option:`CONFIG_BT_MESH_USES_MBEDTLS_PSA`) is used.

From b5268e170447d5b254172377c2c015a79fb34afa Mon Sep 17 00:00:00 2001
From: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
Date: Wed, 5 Feb 2025 14:06:42 +0100
Subject: [PATCH 2366/2913] [nrf fromtree] Bluetooth: Host: Updated Kconfig
 description

Added warning to the BT_RECV_WORKQ_SYS description
to explain the dangers by using this option.

Signed-off-by: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
(cherry picked from commit 0330ff1ac03aa84f271e103ea3fbaebb5d09732c)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/host/Kconfig | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index 36cbac984ac..ee1b50d3e62 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -90,8 +90,12 @@ config BT_RECV_WORKQ_SYS
 	  High priority HCI packets will processed in the context of the caller of bt_recv().
 	  The application needs to ensure the system workqueue stack size (SYSTEM_WORKQUEUE_STACK_SIZE)
 	  is large enough, refer to BT_RX_STACK_SIZE for the recommended minimum.
-	  Note: When this option is used, other users of the system work queue will influence the
-	  latency of incoming Bluetooth events.
+	  Warning: Enabling this option will cause the latency of incoming Bluetooth events to be
+	  affected by other tasks using the system work queue. When this option is active, the Host
+	  will process Bluetooth events in a blocking manner. This can lead to deadlocks if the
+	  application waits for the system work queue while handling Bluetooth events. This feature
+	  is intended for advanced users to allow aggressive memory optimization for devices with
+	  very limited memory. It is strongly advised not to use this option.
 
 config BT_RECV_WORKQ_BT
 	bool "Process low priority HCI packets in the bluetooth-specific work queue"

From cc05f9b4063ac4e16019069c077286cff8b0d98c Mon Sep 17 00:00:00 2001
From: Jordan Yates <jordan@embeint.com>
Date: Thu, 6 Feb 2025 09:35:56 +1000
Subject: [PATCH 2367/2913] [nrf fromtree] bluetooth: host: hci_core: add
 missing `NULL` check

Add check that the command buffer claimed in `bt_le_create_conn_cancel`
is not `NULL`. Fixes a fault caused by providing the `NULL` buffer to
`bt_hci_cmd_state_set_init`.

Signed-off-by: Jordan Yates <jordan@embeint.com>
(cherry picked from commit 7365bcf13350f7027811ffba4b363dc432e9ff98)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/host/hci_core.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index 7c1d1376d06..a95a543b0e7 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -884,6 +884,9 @@ int bt_le_create_conn_cancel(void)
 	struct bt_hci_cmd_state_set state;
 
 	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CREATE_CONN_CANCEL, 0);
+	if (!buf) {
+		return -ENOBUFS;
+	}
 
 	bt_hci_cmd_state_set_init(buf, &state, bt_dev.flags,
 				  BT_DEV_INITIATING, false);

From f8a9ebe1593acb4e8824197d50397c2c7ed303a3 Mon Sep 17 00:00:00 2001
From: alperen sener <alperen.sener@nordicsemi.no>
Date: Thu, 6 Feb 2025 13:30:48 +0100
Subject: [PATCH 2368/2913] [nrf fromtree] bluetooth: host/crypto: fix the psa
 crypto init for host

psa_crypto_init was bounded to CONFIG_BT_HOST_CRYPTO_PRNG and
used to be called under prng_init. Updating the ifdef condition
and appropriating the function name for crypto init.

Also it is better to make sure psa_crypto_init called by host.

Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
(cherry picked from commit 22de0b3732476c8b16a4c11a7c1724f57918e790)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/host/crypto.h     | 2 +-
 subsys/bluetooth/host/crypto_psa.c | 2 +-
 subsys/bluetooth/host/hci_core.c   | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/subsys/bluetooth/host/crypto.h b/subsys/bluetooth/host/crypto.h
index 7b3aa0f7df3..1a349591d4b 100644
--- a/subsys/bluetooth/host/crypto.h
+++ b/subsys/bluetooth/host/crypto.h
@@ -5,4 +5,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-int prng_init(void);
+int bt_crypto_init(void);
diff --git a/subsys/bluetooth/host/crypto_psa.c b/subsys/bluetooth/host/crypto_psa.c
index c15a52f2fbd..f71584c649c 100644
--- a/subsys/bluetooth/host/crypto_psa.c
+++ b/subsys/bluetooth/host/crypto_psa.c
@@ -27,7 +27,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_host_crypto);
 
-int prng_init(void)
+int bt_crypto_init(void)
 {
 	psa_status_t status = psa_crypto_init();
 
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index a95a543b0e7..b01c49d3243 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -3287,11 +3287,9 @@ static int common_init(void)
 	read_supported_commands_complete(rsp);
 	net_buf_unref(rsp);
 
-	if (IS_ENABLED(CONFIG_BT_HOST_CRYPTO_PRNG)) {
-		/* Initialize the PRNG so that it is safe to use it later
-		 * on in the initialization process.
-		 */
-		err = prng_init();
+	if (IS_ENABLED(CONFIG_BT_HOST_CRYPTO)) {
+		/* Initialize crypto for host */
+		err = bt_crypto_init();
 		if (err) {
 			return err;
 		}

From 622e25fd381e173bae686eb4be6df925d9b1383b Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Thu, 6 Feb 2025 13:11:44 +0100
Subject: [PATCH 2369/2913] [nrf fromtree] bluetooth: mesh: pb_adv: ensure that
 bitwise NOT doesn't result in 0

Ensure that ~(link.rx.seg) & SEG_NVAL doesn't result in 0.

Fixes #84804
Coverity-CID: 393090

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit fcf09dd0ad61e932dd0fee39ee0b4ae5adc2c88e)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/mesh/pb_adv.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/subsys/bluetooth/mesh/pb_adv.c b/subsys/bluetooth/mesh/pb_adv.c
index 8e363c0dae9..86f20497704 100644
--- a/subsys/bluetooth/mesh/pb_adv.c
+++ b/subsys/bluetooth/mesh/pb_adv.c
@@ -637,7 +637,14 @@ static void gen_prov_start(struct prov_rx *rx, struct net_buf_simple *buf)
 
 	link.rx.last_seg = START_LAST_SEG(rx->gpc);
 
+	/* This (BIT(0) is set) can happen if we received a Transaction Continuation PDU, before
+	 * receiving a Transaction Start PDU (see `gen_prov_cont`). Now we received the Transaction
+	 * Start PDU and we can extract the last segment number. Knowing this, we check if
+	 * previously received segment exceeds the last segment number. If so, we reject the
+	 * Transaction Start PDU.
+	 */
 	if ((link.rx.seg & BIT(0)) &&
+	    ((link.rx.seg & SEG_NVAL) != SEG_NVAL) &&
 	    (find_msb_set((~link.rx.seg) & SEG_NVAL) - 1 > link.rx.last_seg)) {
 		LOG_ERR("Invalid segment index %u", seg);
 		prov_failed(PROV_ERR_NVAL_FMT);

From 1ab2cc67297b7f6e19bfc4aa1c4342b5f4dfcc23 Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Thu, 6 Feb 2025 14:27:08 +0100
Subject: [PATCH 2370/2913] [nrf fromtree] bluetooth: mesh: access: cast to
 uint8_t to avoid potential overflow

Explicitly cast `BT_MESH_TRANSMIT` output to avoid potential overflow.

Fixes #84759
Fixes #84749
Fixes #84702
Coverity-CID: 487624
Coverity-CID: 487648
Coverity-CID: 487722

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit f82c0e85b09d8b8716a37d50225cea62926ebf49)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 include/zephyr/bluetooth/mesh/access.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/zephyr/bluetooth/mesh/access.h b/include/zephyr/bluetooth/mesh/access.h
index db477ee6206..71aa89db0ef 100644
--- a/include/zephyr/bluetooth/mesh/access.h
+++ b/include/zephyr/bluetooth/mesh/access.h
@@ -628,7 +628,7 @@ struct bt_mesh_model_op {
  *  @return Mesh transmit value that can be used e.g. for the default
  *          values of the configuration model data.
  */
-#define BT_MESH_TRANSMIT(count, int_ms) ((count) | (((int_ms / 10) - 1) << 3))
+#define BT_MESH_TRANSMIT(count, int_ms) ((uint8_t)((count) | (((int_ms / 10) - 1) << 3)))
 
 /**
  *  @brief Decode transmit count from a transmit value.

From c9500134f4e41cbec0d51e8518dd163ae198afcf Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Thu, 6 Feb 2025 21:17:49 +0100
Subject: [PATCH 2371/2913] [nrf fromtree] bluetooth: mesh: proxy_msg: check
 that att mtu is big enough

This commit checks that ATT MTU value returned by `bt_gatt_get_mtu` is
greater or equal to 3 to prevent integer overflow.

Fixes #84693
Coverity-CID: 487743

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit 038173acdadd507049579f2996f49e9f141a5b4b)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/mesh/proxy_msg.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/subsys/bluetooth/mesh/proxy_msg.c b/subsys/bluetooth/mesh/proxy_msg.c
index a4d8c8c14b2..82cd56457fc 100644
--- a/subsys/bluetooth/mesh/proxy_msg.c
+++ b/subsys/bluetooth/mesh/proxy_msg.c
@@ -176,6 +176,7 @@ int bt_mesh_proxy_msg_send(struct bt_conn *conn, uint8_t type,
 			   bt_gatt_complete_func_t end, void *user_data)
 {
 	int err;
+	uint16_t att_mtu = bt_gatt_get_mtu(conn);
 	uint16_t mtu;
 	struct bt_mesh_proxy_role *role = &roles[bt_conn_index(conn)];
 
@@ -183,7 +184,12 @@ int bt_mesh_proxy_msg_send(struct bt_conn *conn, uint8_t type,
 		bt_hex(msg->data, msg->len));
 
 	/* ATT_MTU - OpCode (1 byte) - Handle (2 bytes) */
-	mtu = bt_gatt_get_mtu(conn) - 3;
+	if (att_mtu < 3) {
+		LOG_WRN("Invalid ATT MTU: %d", att_mtu);
+		return -EINVAL;
+	}
+
+	mtu = att_mtu - 3;
 	if (mtu > msg->len) {
 		net_buf_simple_push_u8(msg, PDU_HDR(SAR_COMPLETE, type));
 		return role->cb.send(conn, msg->data, msg->len, end, user_data);

From 5fc17c7d8ff0eeb0376d1fc82a23c6a38f7cb037 Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Thu, 6 Feb 2025 21:40:37 +0100
Subject: [PATCH 2372/2913] [nrf fromtree] bluetooth: mesh: delayable_msg: cast
 to avoid truncation issue

Explicitly cast Kconfig option value to avoid truncation issue reported
by Coverity.

Fixes #84697
Coverity-CID: 487737

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit b7f16f10414c0df1e75937e2f55de7edc79f57d0)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/mesh/delayable_msg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/bluetooth/mesh/delayable_msg.c b/subsys/bluetooth/mesh/delayable_msg.c
index 5b2d1a241ab..a591ba68c95 100644
--- a/subsys/bluetooth/mesh/delayable_msg.c
+++ b/subsys/bluetooth/mesh/delayable_msg.c
@@ -179,7 +179,7 @@ static bool push_msg_from_delayable_msgs(void)
 	NET_BUF_SIMPLE_DEFINE(buf, BT_MESH_TX_SDU_MAX);
 
 	SYS_SLIST_FOR_EACH_NODE(&msg->chunks, node) {
-		uint16_t tmp = MIN(CONFIG_BT_MESH_ACCESS_DELAYABLE_MSG_CHUNK_SIZE, len);
+		uint16_t tmp = MIN((uint16_t)CONFIG_BT_MESH_ACCESS_DELAYABLE_MSG_CHUNK_SIZE, len);
 
 		chunk = CONTAINER_OF(node, struct delayable_msg_chunk, node);
 		memcpy(net_buf_simple_add(&buf, tmp), chunk->data, tmp);

From d191a5de8d157143cab33b5b1e75f8567340d3bf Mon Sep 17 00:00:00 2001
From: Lingao Meng <menglingao@xiaomi.com>
Date: Wed, 13 Nov 2024 16:23:04 +0800
Subject: [PATCH 2373/2913] [nrf fromtree] Bluetooth: Mesh: Remove
 ADV_FLAG_PROXY_START, due to meanless

The first why introduce ADV_FLAG_PROXY_START
see here(https://github.com/zephyrproject-rtos/zephyr/pull/58826)

The main core change is to mark ADV_FLAG_PROXY as moving to the last
enabled proxy instead of before.

But introducing the ADV_FLAG_PROXY_START flag seems meaningless.

Signed-off-by: Lingao Meng <menglingao@xiaomi.com>
(cherry picked from commit bcac572ab477b4421063bfaf9d8a5cf833dc5100)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/mesh/adv_ext.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index 63ece26889e..344cafc064e 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -51,8 +51,6 @@ enum {
 	ADV_FLAG_SENT,
 	/** Currently performing proxy advertising */
 	ADV_FLAG_PROXY,
-	/** The proxy has been start, but maybe pending. */
-	ADV_FLAG_PROXY_START,
 	/** The send-call has been pending. */
 	ADV_FLAG_SCHEDULE_PENDING,
 	/** Custom adv params have been set, we need to update the parameters on
@@ -286,7 +284,6 @@ static const char * const adv_tag_to_str[] = {
 static bool schedule_send_with_mask(struct bt_mesh_ext_adv *ext_adv, int ignore_mask)
 {
 	if (atomic_test_and_clear_bit(ext_adv->flags, ADV_FLAG_PROXY)) {
-		atomic_clear_bit(ext_adv->flags, ADV_FLAG_PROXY_START);
 		(void)bt_le_ext_adv_stop(ext_adv->instance);
 
 		atomic_clear_bit(ext_adv->flags, ADV_FLAG_ACTIVE);
@@ -326,7 +323,6 @@ static void send_pending_adv(struct k_work *work)
 
 		atomic_clear_bit(ext_adv->flags, ADV_FLAG_ACTIVE);
 		atomic_clear_bit(ext_adv->flags, ADV_FLAG_PROXY);
-		atomic_clear_bit(ext_adv->flags, ADV_FLAG_PROXY_START);
 
 		if (ext_adv->adv) {
 			struct bt_mesh_adv_ctx ctx = ext_adv->adv->ctx;
@@ -371,8 +367,6 @@ static void send_pending_adv(struct k_work *work)
 		return;
 	}
 
-	atomic_set_bit(ext_adv->flags, ADV_FLAG_PROXY_START);
-
 	if (!bt_mesh_adv_gatt_send()) {
 		atomic_set_bit(ext_adv->flags, ADV_FLAG_PROXY);
 	}
@@ -528,7 +522,7 @@ static void connected(struct bt_le_ext_adv *instance,
 {
 	struct bt_mesh_ext_adv *ext_adv = gatt_adv_get();
 
-	if (atomic_test_and_clear_bit(ext_adv->flags, ADV_FLAG_PROXY_START)) {
+	if (atomic_test_and_clear_bit(ext_adv->flags, ADV_FLAG_PROXY)) {
 		atomic_clear_bit(ext_adv->flags, ADV_FLAG_ACTIVE);
 		(void)schedule_send(ext_adv);
 	}

From 4d99685729acb3a1de812a14641425f09b3caa28 Mon Sep 17 00:00:00 2001
From: Lingao Meng <menglingao@xiaomi.com>
Date: Wed, 13 Nov 2024 16:47:04 +0800
Subject: [PATCH 2374/2913] [nrf fromtree] Bluetooth: Mesh: Remove
 START_PENDING flags

Remove START_PENDING flag, and replace with
bt_mesh_adv_is_empty_by_tag

not only make adv_ext.c more readable, but also enhancement

In previous implementation, after proxy started, will check
this flag, and when the flag is true, will direct stop proxy
and re-enter schedule, but has one problem, this flag set true,
but buf will be empty, such as when sending mesh relay messages
will for-each every sets, until find not-active, but also set
previous set START_PENDING flags, so will cause proxy advertising
started->stop->started.

Signed-off-by: Lingao Meng <menglingao@xiaomi.com>
(cherry picked from commit 2ebdcfa963a56cded34fa77b5681345ced682050)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/mesh/adv_ext.c | 137 +++++++++++++++++---------------
 1 file changed, 72 insertions(+), 65 deletions(-)

diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index 344cafc064e..4650541af84 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -51,8 +51,6 @@ enum {
 	ADV_FLAG_SENT,
 	/** Currently performing proxy advertising */
 	ADV_FLAG_PROXY,
-	/** The send-call has been pending. */
-	ADV_FLAG_SCHEDULE_PENDING,
 	/** Custom adv params have been set, we need to update the parameters on
 	 *  the next send.
 	 */
@@ -273,40 +271,72 @@ static int adv_send(struct bt_mesh_ext_adv *ext_adv, struct bt_mesh_adv *adv)
 	return err;
 }
 
-static const char * const adv_tag_to_str[] = {
-	[BT_MESH_ADV_TAG_LOCAL]  = "local adv",
-	[BT_MESH_ADV_TAG_RELAY]  = "relay adv",
-	[BT_MESH_ADV_TAG_PROXY]  = "proxy adv",
-	[BT_MESH_ADV_TAG_FRIEND] = "friend adv",
-	[BT_MESH_ADV_TAG_PROV]   = "prov adv",
-};
-
-static bool schedule_send_with_mask(struct bt_mesh_ext_adv *ext_adv, int ignore_mask)
+static bool stop_proxy_adv(struct bt_mesh_ext_adv *ext_adv)
 {
 	if (atomic_test_and_clear_bit(ext_adv->flags, ADV_FLAG_PROXY)) {
-		(void)bt_le_ext_adv_stop(ext_adv->instance);
+		int err = bt_le_ext_adv_stop(ext_adv->instance);
+
+		__ASSERT_NO_MSG(err == 0);
 
 		atomic_clear_bit(ext_adv->flags, ADV_FLAG_ACTIVE);
 	}
 
+	return true;
+}
+
+static bool schedule_send_with_mask(struct bt_mesh_ext_adv *ext_adv, int ignore_mask)
+{
+	(void)stop_proxy_adv(ext_adv);
+
 	if (atomic_test_bit(ext_adv->flags, ADV_FLAG_ACTIVE)) {
-		atomic_set_bit(ext_adv->flags, ADV_FLAG_SCHEDULE_PENDING);
 		return false;
 	} else if ((~ignore_mask) & k_work_busy_get(&ext_adv->work)) {
 		return false;
 	}
 
-	atomic_clear_bit(ext_adv->flags, ADV_FLAG_SCHEDULE_PENDING);
 	bt_mesh_wq_submit(&ext_adv->work);
 
 	return true;
 }
 
+static bool adv_send_process(struct bt_mesh_adv *adv, struct bt_mesh_ext_adv *ext_adv)
+{
+	int err;
+
+	while (adv || (adv = bt_mesh_adv_get_by_tag(ext_adv->tags, K_NO_WAIT))) {
+		/* busy == 0 means this was canceled */
+		if (!adv->ctx.busy) {
+			bt_mesh_adv_unref(adv);
+			adv = NULL;
+			continue;
+		}
+
+		adv->ctx.busy = 0U;
+		err = adv_send(ext_adv, adv);
+
+		bt_mesh_adv_unref(adv);
+		adv = NULL;
+
+		if (!err) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
 static void send_pending_adv(struct k_work *work)
 {
+	static const char * const adv_tag_to_str[] = {
+		[BT_MESH_ADV_TAG_LOCAL]  = "local",
+		[BT_MESH_ADV_TAG_RELAY]  = "relay",
+		[BT_MESH_ADV_TAG_PROXY]  = "proxy",
+		[BT_MESH_ADV_TAG_FRIEND] = "friend",
+		[BT_MESH_ADV_TAG_PROV]   = "prov",
+	};
 	struct bt_mesh_ext_adv *ext_adv;
-	struct bt_mesh_adv *adv;
-	int err;
+	struct bt_mesh_adv *adv = NULL;
+	bool sent;
 
 	ext_adv = CONTAINER_OF(work, struct bt_mesh_ext_adv, work);
 
@@ -316,7 +346,7 @@ static void send_pending_adv(struct k_work *work)
 	}
 
 	if (atomic_test_and_clear_bit(ext_adv->flags, ADV_FLAG_SENT)) {
-		LOG_DBG("Advertising stopped after %u ms for %s",
+		LOG_DBG("Advertising stopped after %u ms for %s adv",
 			k_uptime_get_32() - ext_adv->timestamp,
 			ext_adv->adv ? adv_tag_to_str[ext_adv->adv->ctx.tag]
 				     : adv_tag_to_str[BT_MESH_ADV_TAG_PROXY]);
@@ -335,45 +365,37 @@ static void send_pending_adv(struct k_work *work)
 		}
 	}
 
-	while ((adv = bt_mesh_adv_get_by_tag(ext_adv->tags, K_NO_WAIT))) {
-		/* busy == 0 means this was canceled */
-		if (!adv->ctx.busy) {
-			bt_mesh_adv_unref(adv);
-			continue;
+	do {
+		sent = adv_send_process(adv, ext_adv);
+		if (sent) {
+			return;
 		}
 
-		adv->ctx.busy = 0U;
-		err = adv_send(ext_adv, adv);
-
-		bt_mesh_adv_unref(adv);
-
-		if (!err) {
-			return; /* Wait for advertising to finish */
+		if (ext_adv->instance == NULL) {
+			LOG_DBG("Advertiser is suspended or deleted");
+			return;
 		}
-	}
-
-	if (ext_adv->instance == NULL) {
-		LOG_DBG("Advertiser is suspended or deleted");
-		return;
-	}
 
-	if (IS_ENABLED(CONFIG_BT_MESH_PROXY_SOLICITATION) &&
-	    !bt_mesh_sol_send()) {
-		return;
-	}
+		if (IS_ENABLED(CONFIG_BT_MESH_PROXY_SOLICITATION) &&
+		    !bt_mesh_sol_send()) {
+			return;
+		}
 
-	if (!IS_ENABLED(CONFIG_BT_MESH_GATT_SERVER) ||
-	    !(ext_adv->tags & BT_MESH_ADV_TAG_BIT_PROXY)) {
-		return;
-	}
+		if (!IS_ENABLED(CONFIG_BT_MESH_GATT_SERVER) ||
+		    !(ext_adv->tags & BT_MESH_ADV_TAG_BIT_PROXY)) {
+			return;
+		}
 
-	if (!bt_mesh_adv_gatt_send()) {
-		atomic_set_bit(ext_adv->flags, ADV_FLAG_PROXY);
-	}
+		if (!bt_mesh_adv_gatt_send()) {
+			atomic_set_bit(ext_adv->flags, ADV_FLAG_PROXY);
+		}
 
-	if (atomic_test_and_clear_bit(ext_adv->flags, ADV_FLAG_SCHEDULE_PENDING)) {
-		schedule_send_with_mask(ext_adv, K_WORK_RUNNING);
-	}
+		/* If there is a pending adv during the process of starting the
+		 * proxy advertising, the proxy advertising needs to be stop and
+		 * sent pending advertising immediately.
+		 */
+	} while ((adv = bt_mesh_adv_get_by_tag(ext_adv->tags, K_NO_WAIT)) &&
+		 stop_proxy_adv(ext_adv));
 }
 
 static bool schedule_send(struct bt_mesh_ext_adv *ext_adv)
@@ -508,6 +530,7 @@ static void adv_sent(struct bt_le_ext_adv *instance,
 	}
 
 	if (!atomic_test_bit(ext_adv->flags, ADV_FLAG_ACTIVE)) {
+		LOG_WRN("Advertiser %p ADV_FLAG_ACTIVE not set", ext_adv);
 		return;
 	}
 
@@ -516,28 +539,12 @@ static void adv_sent(struct bt_le_ext_adv *instance,
 	bt_mesh_wq_submit(&ext_adv->work);
 }
 
-#if defined(CONFIG_BT_MESH_GATT_SERVER)
-static void connected(struct bt_le_ext_adv *instance,
-		      struct bt_le_ext_adv_connected_info *info)
-{
-	struct bt_mesh_ext_adv *ext_adv = gatt_adv_get();
-
-	if (atomic_test_and_clear_bit(ext_adv->flags, ADV_FLAG_PROXY)) {
-		atomic_clear_bit(ext_adv->flags, ADV_FLAG_ACTIVE);
-		(void)schedule_send(ext_adv);
-	}
-}
-#endif /* CONFIG_BT_MESH_GATT_SERVER */
-
 int bt_mesh_adv_enable(void)
 {
 	int err;
 
 	static const struct bt_le_ext_adv_cb adv_cb = {
 		.sent = adv_sent,
-#if defined(CONFIG_BT_MESH_GATT_SERVER)
-		.connected = connected,
-#endif /* CONFIG_BT_MESH_GATT_SERVER */
 	};
 
 	if (advs[0].instance) {

From e6cb111120bd2f81f2fd9de380436e508b0e706c Mon Sep 17 00:00:00 2001
From: Lingao Meng <menglingao@xiaomi.com>
Date: Thu, 5 Dec 2024 10:00:02 +0800
Subject: [PATCH 2375/2913] [nrf fromtree] tests: bsim: Add testcase for
 bluetooth mesh extended advertiser

Add some configuration for test adv_ext.c

Signed-off-by: Lingao Meng <menglingao@xiaomi.com>

Signed-off-by: Lingao Meng <menglingao@xiaomi.com>
(cherry picked from commit f5bd2170d1e4bbc3367c56081bf8d684dfa140f1)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/mesh/adv_ext.c               | 137 ++++++------
 tests/bsim/bluetooth/mesh/compile.sh          |   4 +
 .../bluetooth/mesh/overlay_gatt_separate.conf |  12 ++
 .../mesh/overlay_multi_adv_sets.conf          |   5 +
 .../bsim/bluetooth/mesh/src/test_advertiser.c | 200 ++++++++++++++++++
 .../mesh/tests_scripts/advertiser/cancel.sh   |  17 ++
 .../tests_scripts/advertiser/proxy_mixin.sh   |   6 +
 .../tests_scripts/advertiser/random_order.sh  |   3 +
 .../mesh/tests_scripts/advertiser/relay.sh    |  18 ++
 .../tests_scripts/advertiser/reverse_order.sh |   3 +
 .../tests_scripts/advertiser/send_order.sh    |   3 +
 .../tests_scripts/advertiser/terminate.sh     |  15 ++
 .../tests_scripts/advertiser/tx_cb_multi.sh   |   3 +
 .../tests_scripts/advertiser/tx_cb_single.sh  |   3 +
 14 files changed, 368 insertions(+), 61 deletions(-)
 create mode 100644 tests/bsim/bluetooth/mesh/overlay_gatt_separate.conf
 create mode 100644 tests/bsim/bluetooth/mesh/overlay_multi_adv_sets.conf
 create mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/advertiser/cancel.sh
 create mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/advertiser/relay.sh
 create mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/advertiser/terminate.sh

diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index 4650541af84..05593a3b60e 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -271,43 +271,40 @@ static int adv_send(struct bt_mesh_ext_adv *ext_adv, struct bt_mesh_adv *adv)
 	return err;
 }
 
-static bool stop_proxy_adv(struct bt_mesh_ext_adv *ext_adv)
+static int stop_proxy_adv(struct bt_mesh_ext_adv *ext_adv)
 {
-	if (atomic_test_and_clear_bit(ext_adv->flags, ADV_FLAG_PROXY)) {
-		int err = bt_le_ext_adv_stop(ext_adv->instance);
+	int err;
 
-		__ASSERT_NO_MSG(err == 0);
+	if (atomic_test_bit(ext_adv->flags, ADV_FLAG_PROXY)) {
+		err = bt_le_ext_adv_stop(ext_adv->instance);
+		if (err) {
+			LOG_ERR("Failed to stop proxy advertising: %d", err);
+			return err;
+		}
 
+		atomic_clear_bit(ext_adv->flags, ADV_FLAG_PROXY);
 		atomic_clear_bit(ext_adv->flags, ADV_FLAG_ACTIVE);
 	}
 
-	return true;
-}
-
-static bool schedule_send_with_mask(struct bt_mesh_ext_adv *ext_adv, int ignore_mask)
-{
-	(void)stop_proxy_adv(ext_adv);
-
-	if (atomic_test_bit(ext_adv->flags, ADV_FLAG_ACTIVE)) {
-		return false;
-	} else if ((~ignore_mask) & k_work_busy_get(&ext_adv->work)) {
-		return false;
-	}
-
-	bt_mesh_wq_submit(&ext_adv->work);
-
-	return true;
+	return 0;
 }
 
-static bool adv_send_process(struct bt_mesh_adv *adv, struct bt_mesh_ext_adv *ext_adv)
+static int adv_queue_send_process(struct bt_mesh_ext_adv *ext_adv)
 {
-	int err;
+	struct bt_mesh_adv *adv;
+	int err = -ENOENT;
 
-	while (adv || (adv = bt_mesh_adv_get_by_tag(ext_adv->tags, K_NO_WAIT))) {
+	while ((adv = bt_mesh_adv_get_by_tag(ext_adv->tags, K_NO_WAIT))) {
 		/* busy == 0 means this was canceled */
 		if (!adv->ctx.busy) {
 			bt_mesh_adv_unref(adv);
-			adv = NULL;
+			continue;
+		}
+
+		if (stop_proxy_adv(ext_adv)) {
+			LOG_WRN("Advertising %p canceled due to proxy adv failed to stop", adv);
+			bt_mesh_adv_send_start(0, -ECANCELED, &adv->ctx);
+			bt_mesh_adv_unref(adv);
 			continue;
 		}
 
@@ -315,14 +312,43 @@ static bool adv_send_process(struct bt_mesh_adv *adv, struct bt_mesh_ext_adv *ex
 		err = adv_send(ext_adv, adv);
 
 		bt_mesh_adv_unref(adv);
-		adv = NULL;
 
 		if (!err) {
-			return true;
+			return 0; /* Wait for advertising to finish */
+		}
+	}
+
+	return err;
+}
+
+static void start_proxy_sol_or_proxy_adv(struct bt_mesh_ext_adv *ext_adv)
+{
+	if (ext_adv->instance == NULL) {
+		LOG_DBG("Advertiser is suspended or deleted");
+		return;
+	}
+
+	if (!(ext_adv->tags & BT_MESH_ADV_TAG_BIT_PROXY)) {
+		return;
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_PROXY_SOLICITATION)) {
+		if (stop_proxy_adv(ext_adv)) {
+			return;
+		}
+
+		if (!bt_mesh_sol_send()) {
+			return;
 		}
 	}
 
-	return false;
+	if (IS_ENABLED(CONFIG_BT_MESH_GATT_SERVER) &&
+	    !atomic_test_and_set_bit(ext_adv->flags, ADV_FLAG_PROXY)) {
+		if (bt_mesh_adv_gatt_send()) {
+			atomic_clear_bit(ext_adv->flags, ADV_FLAG_PROXY);
+			return;
+		}
+	}
 }
 
 static void send_pending_adv(struct k_work *work)
@@ -335,8 +361,7 @@ static void send_pending_adv(struct k_work *work)
 		[BT_MESH_ADV_TAG_PROV]   = "prov",
 	};
 	struct bt_mesh_ext_adv *ext_adv;
-	struct bt_mesh_adv *adv = NULL;
-	bool sent;
+	int err;
 
 	ext_adv = CONTAINER_OF(work, struct bt_mesh_ext_adv, work);
 
@@ -365,42 +390,32 @@ static void send_pending_adv(struct k_work *work)
 		}
 	}
 
-	do {
-		sent = adv_send_process(adv, ext_adv);
-		if (sent) {
-			return;
-		}
-
-		if (ext_adv->instance == NULL) {
-			LOG_DBG("Advertiser is suspended or deleted");
-			return;
-		}
-
-		if (IS_ENABLED(CONFIG_BT_MESH_PROXY_SOLICITATION) &&
-		    !bt_mesh_sol_send()) {
-			return;
-		}
-
-		if (!IS_ENABLED(CONFIG_BT_MESH_GATT_SERVER) ||
-		    !(ext_adv->tags & BT_MESH_ADV_TAG_BIT_PROXY)) {
-			return;
-		}
-
-		if (!bt_mesh_adv_gatt_send()) {
-			atomic_set_bit(ext_adv->flags, ADV_FLAG_PROXY);
-		}
+	err = adv_queue_send_process(ext_adv);
+	if (!err) {
+		return;
+	}
 
-		/* If there is a pending adv during the process of starting the
-		 * proxy advertising, the proxy advertising needs to be stop and
-		 * sent pending advertising immediately.
-		 */
-	} while ((adv = bt_mesh_adv_get_by_tag(ext_adv->tags, K_NO_WAIT)) &&
-		 stop_proxy_adv(ext_adv));
+	start_proxy_sol_or_proxy_adv(ext_adv);
 }
 
 static bool schedule_send(struct bt_mesh_ext_adv *ext_adv)
 {
-	return schedule_send_with_mask(ext_adv, 0);
+	if (atomic_test_bit(ext_adv->flags, ADV_FLAG_ACTIVE)) {
+		/* We don't need to resubmit the `send_pending_adv` work if the mesh advertiser
+		 * is sending a mesh packet. The `send_pending_adv` work is resubmitted when the
+		 * current advertising is finished, which is done through the `adv_sent` callback.
+		 *
+		 * The proxy advertisement in turns doesn't timeout or stop quickly and has less
+		 * priority than regular mesh messages, thus needs to be stopped immeditaly.
+		 */
+		if (!atomic_test_bit(ext_adv->flags, ADV_FLAG_PROXY)) {
+			return false;
+		}
+	}
+
+	bt_mesh_wq_submit(&ext_adv->work);
+
+	return true;
 }
 
 void bt_mesh_adv_gatt_update(void)
@@ -530,7 +545,7 @@ static void adv_sent(struct bt_le_ext_adv *instance,
 	}
 
 	if (!atomic_test_bit(ext_adv->flags, ADV_FLAG_ACTIVE)) {
-		LOG_WRN("Advertiser %p ADV_FLAG_ACTIVE not set", ext_adv);
+		LOG_DBG("Advertiser %p ADV_FLAG_ACTIVE not set", ext_adv);
 		return;
 	}
 
diff --git a/tests/bsim/bluetooth/mesh/compile.sh b/tests/bsim/bluetooth/mesh/compile.sh
index 05c51f7bfe1..15a80937879 100755
--- a/tests/bsim/bluetooth/mesh/compile.sh
+++ b/tests/bsim/bluetooth/mesh/compile.sh
@@ -13,15 +13,19 @@ source ${ZEPHYR_BASE}/tests/bsim/compile.source
 app=tests/bsim/bluetooth/mesh compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_pst.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_gatt.conf compile
+app=tests/bsim/bluetooth/mesh conf_overlay=overlay_gatt_separate.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_low_lat.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_psa.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_workq_sys.conf compile
+app=tests/bsim/bluetooth/mesh conf_overlay=overlay_multi_adv_sets.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_pst.conf;overlay_psa.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_gatt.conf;overlay_psa.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_gatt.conf;overlay_workq_sys.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_low_lat.conf;overlay_psa.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_gatt.conf;overlay_low_lat.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_pst.conf;overlay_gatt.conf" compile
+app=tests/bsim/bluetooth/mesh \
+  conf_overlay="overlay_gatt.conf;overlay_multi_adv_sets.conf" compile
 app=tests/bsim/bluetooth/mesh \
   conf_overlay="overlay_pst.conf;overlay_gatt.conf;overlay_psa.conf" compile
 app=tests/bsim/bluetooth/mesh \
diff --git a/tests/bsim/bluetooth/mesh/overlay_gatt_separate.conf b/tests/bsim/bluetooth/mesh/overlay_gatt_separate.conf
new file mode 100644
index 00000000000..68575635b62
--- /dev/null
+++ b/tests/bsim/bluetooth/mesh/overlay_gatt_separate.conf
@@ -0,0 +1,12 @@
+CONFIG_BT_CTLR_ADV_SET=4
+
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_PERIPHERAL=y
+
+CONFIG_BT_EXT_ADV_MAX_ADV_SET=4
+
+CONFIG_BT_MESH_PB_GATT=y
+CONFIG_BT_MESH_GATT_PROXY=y
+CONFIG_BT_MESH_ADV_EXT_GATT_SEPARATE=y
+CONFIG_BT_MESH_PROXY_CLIENT=y
+CONFIG_BT_MESH_PROXY_SOLICITATION=y
diff --git a/tests/bsim/bluetooth/mesh/overlay_multi_adv_sets.conf b/tests/bsim/bluetooth/mesh/overlay_multi_adv_sets.conf
new file mode 100644
index 00000000000..51ac121caea
--- /dev/null
+++ b/tests/bsim/bluetooth/mesh/overlay_multi_adv_sets.conf
@@ -0,0 +1,5 @@
+CONFIG_BT_CTLR_ADV_SET=4
+CONFIG_BT_EXT_ADV_MAX_ADV_SET=4
+
+CONFIG_BT_MESH_RELAY_ADV_SETS=2
+CONFIG_BT_MESH_ADV_EXT_RELAY_USING_MAIN_ADV_SET=y
diff --git a/tests/bsim/bluetooth/mesh/src/test_advertiser.c b/tests/bsim/bluetooth/mesh/src/test_advertiser.c
index 411533eb176..97b3c9c8aeb 100644
--- a/tests/bsim/bluetooth/mesh/src/test_advertiser.c
+++ b/tests/bsim/bluetooth/mesh/src/test_advertiser.c
@@ -37,6 +37,7 @@ static int seq_checker;
 static struct bt_mesh_test_gatt gatt_param;
 static int num_adv_sent;
 static uint8_t previous_checker = 0xff;
+static bool local_sent, relay_sent;
 
 static K_SEM_DEFINE(observer_sem, 0, 1);
 
@@ -501,6 +502,202 @@ static void test_tx_send_order(void)
 	PASS();
 }
 
+static void cancel_adv_send_start(uint16_t duration, int err, void *cb_data)
+{
+	if (cb_data != NULL) {
+		struct bt_mesh_adv *adv_cancel = (struct bt_mesh_adv *)cb_data;
+
+		adv_cancel->ctx.busy = 0;
+
+		bt_mesh_adv_unref(adv_cancel);
+
+		return;
+	}
+
+	ASSERT_FALSE_MSG(true, "The adv should be canceled.\n");
+}
+
+static void cancel_adv_send_end(int err, void *cb_data)
+{
+	k_sem_give(&observer_sem);
+}
+
+static void test_tx_send_cancel(void)
+{
+	static const struct bt_mesh_send_cb local_send_cb = {
+		.start = cancel_adv_send_start,
+		.end = cancel_adv_send_end,
+	};
+	struct bt_mesh_adv *adv_cancel;
+	uint8_t xmit = BT_MESH_TRANSMIT(2, 20);
+	struct bt_mesh_adv *local;
+
+	bt_init();
+	adv_init();
+
+	local = bt_mesh_adv_create(BT_MESH_ADV_DATA, BT_MESH_ADV_TAG_LOCAL,
+				   xmit, K_NO_WAIT);
+	ASSERT_FALSE_MSG(!local, "Out of local advs\n");
+
+	adv_cancel = bt_mesh_adv_create(BT_MESH_ADV_DATA, BT_MESH_ADV_TAG_LOCAL,
+					 xmit, K_NO_WAIT);
+	ASSERT_FALSE_MSG(!adv_cancel, "Out of local advs\n");
+
+	net_buf_simple_add_u8(&local->b, 0x00);
+	net_buf_simple_add_u8(&adv_cancel->b, 0x01);
+
+	bt_mesh_adv_send(local, &local_send_cb, bt_mesh_adv_ref(adv_cancel));
+	bt_mesh_adv_send(adv_cancel, &local_send_cb, NULL);
+
+	bt_mesh_adv_unref(local);
+	bt_mesh_adv_unref(adv_cancel);
+
+	/* Make relay advs sent out. */
+	k_sleep(K_SECONDS(1));
+
+	ASSERT_OK_MSG(k_sem_take(&observer_sem, K_SECONDS(10)),
+		      "Didn't call the last end tx cb.");
+
+	PASS();
+}
+
+static void terminate_adv_send_start(uint16_t duration, int err, void *cb_data)
+{
+	if (cb_data == NULL) {
+		k_sem_give(&observer_sem);
+		return;
+	}
+}
+
+static void terminate_adv_send_end(int err, void *cb_data)
+{
+	ASSERT_FALSE_MSG(true, "The adv should be terminated.\n");
+}
+
+static void test_tx_send_terminate(void)
+{
+	static const struct bt_mesh_send_cb local_send_cb = {
+		.start = terminate_adv_send_start,
+		.end = terminate_adv_send_end,
+	};
+	uint8_t xmit = BT_MESH_TRANSMIT(2, 20);
+	struct bt_mesh_adv *local;
+
+	bt_init();
+	adv_init();
+
+	local = bt_mesh_adv_create(BT_MESH_ADV_DATA, BT_MESH_ADV_TAG_LOCAL,
+				   xmit, K_NO_WAIT);
+	ASSERT_FALSE_MSG(!local, "Out of local advs\n");
+
+	net_buf_simple_add_u8(&local->b, 0x00);
+
+	bt_mesh_adv_send(local, &local_send_cb, NULL);
+
+	bt_mesh_adv_unref(local);
+
+	ASSERT_OK_MSG(k_sem_take(&observer_sem, K_SECONDS(10)),
+		      "Didn't call the last start tx cb.");
+
+	bt_mesh_adv_terminate(local);
+
+	/* Make relay advs sent out. */
+	k_sleep(K_SECONDS(1));
+
+	PASS();
+}
+
+static void local_adv_send_end(int err, void *cb_data)
+{
+	local_sent = true;
+}
+
+static void relay_adv_send_start(uint16_t duration, int err, void *cb_data)
+{
+#if defined(CONFIG_BT_MESH_RELAY_ADV_SETS) && CONFIG_BT_MESH_RELAY_ADV_SETS > 0
+	ASSERT_FALSE_MSG(local_sent,
+			 "The relay adv should sending with the local adv in parallel.\n");
+#else
+	ASSERT_FALSE_MSG(!local_sent,
+			 "The relay adv should start to sending after sent local adv.\n");
+#endif
+}
+
+static void relay_adv_send_end(int err, void *cb_data)
+{
+	relay_sent = true;
+}
+
+static void second_relay_adv_send_start(uint16_t duration, int err, void *cb_data)
+{
+#if defined(CONFIG_BT_MESH_RELAY_ADV_SETS) && CONFIG_BT_MESH_RELAY_ADV_SETS > 0
+	ASSERT_FALSE_MSG(relay_sent,
+			 "The second relay adv should sending with the first relay"
+			 " adv in parallel\n");
+#else
+	ASSERT_FALSE_MSG(!relay_sent,
+			 "The second relay adv should start to sending after sent"
+			 " first relay adv\n");
+#endif
+}
+
+static void second_relay_adv_send_end(int err, void *cb_data)
+{
+	k_sem_give(&observer_sem);
+}
+
+static void test_tx_send_relay(void)
+{
+	static const struct bt_mesh_send_cb local_send_cb = {
+		.end = local_adv_send_end,
+	};
+	static const struct bt_mesh_send_cb relay_first_send_cb = {
+		.start = relay_adv_send_start,
+		.end = relay_adv_send_end,
+	};
+	static const struct bt_mesh_send_cb relay_second_send_cb = {
+		.start = second_relay_adv_send_start,
+		.end = second_relay_adv_send_end,
+	};
+	struct bt_mesh_adv *local, *relay_first, *relay_second;
+	uint8_t xmit = BT_MESH_TRANSMIT(2, 20);
+
+	bt_init();
+	adv_init();
+
+	local = bt_mesh_adv_create(BT_MESH_ADV_DATA, BT_MESH_ADV_TAG_LOCAL,
+				   xmit, K_NO_WAIT);
+	ASSERT_FALSE_MSG(!local, "Out of local advs\n");
+
+	relay_first = bt_mesh_adv_create(BT_MESH_ADV_DATA, BT_MESH_ADV_TAG_RELAY,
+					 xmit, K_NO_WAIT);
+	ASSERT_FALSE_MSG(!relay_first, "Out of relay advs\n");
+
+	relay_second = bt_mesh_adv_create(BT_MESH_ADV_DATA, BT_MESH_ADV_TAG_RELAY,
+					  xmit, K_NO_WAIT);
+	ASSERT_FALSE_MSG(!relay_second, "Out of relay advs\n");
+
+	net_buf_simple_add_u8(&local->b, 0x00);
+	net_buf_simple_add_u8(&relay_first->b, 0x01);
+	net_buf_simple_add_u8(&relay_second->b, 0x02);
+
+	bt_mesh_adv_send(local, &local_send_cb, NULL);
+	bt_mesh_adv_send(relay_first, &relay_first_send_cb, NULL);
+	bt_mesh_adv_send(relay_second, &relay_second_send_cb, NULL);
+
+	bt_mesh_adv_unref(local);
+	bt_mesh_adv_unref(relay_first);
+	bt_mesh_adv_unref(relay_second);
+
+	/* Make relay advs sent out. */
+	k_sleep(K_SECONDS(1));
+
+	ASSERT_OK_MSG(k_sem_take(&observer_sem, K_SECONDS(10)),
+		      "Didn't call the last end tx cb.");
+
+	PASS();
+}
+
 static void test_tx_reverse_order(void)
 {
 	struct bt_mesh_adv *adv[CONFIG_BT_MESH_ADV_BUF_COUNT];
@@ -765,7 +962,10 @@ static const struct bst_test_instance test_adv[] = {
 	TEST_CASE(tx, cb_single,     "ADV: tx cb parameter checker"),
 	TEST_CASE(tx, cb_multi,      "ADV: tx cb sequence checker"),
 	TEST_CASE(tx, proxy_mixin,   "ADV: proxy mix-in gatt adv"),
+	TEST_CASE(tx, send_cancel,   "ADV: tx send cancel"),
+	TEST_CASE(tx, send_terminate, "ADV: tx send terminate"),
 	TEST_CASE(tx, send_order,    "ADV: tx send order"),
+	TEST_CASE(tx, send_relay,    "ADV: tx relay sent order"),
 	TEST_CASE(tx, reverse_order, "ADV: tx reversed order"),
 	TEST_CASE(tx, random_order,  "ADV: tx random order"),
 	TEST_CASE(tx, disable,       "ADV: test suspending/resuming advertiser"),
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/cancel.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/cancel.sh
new file mode 100755
index 00000000000..d1e59453833
--- /dev/null
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/cancel.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# Copyright 2025 Xiaomi Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
+
+# Test scenario:
+# Allocate an advertiser buffer 1 using bt_mesh_adv_buf_create().
+# Allocate an advertiser buffer 2 using bt_mesh_adv_buf_create().
+# Submit the advertiser buffer 1 and 2 using bt_mesh_adv_send().
+# In the first buffer cb->send_start cancel buffer 2.
+# Expect the second buffer cb->send_start not be called.
+
+RunTest mesh_adv_tx_send_cancel adv_tx_send_cancel
+
+overlay="overlay_multi_adv_sets_conf"
+RunTest mesh_adv_tx_send_cancel_multi_adv_sets adv_tx_send_cancel
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh
index fb6af48f651..a130701611d 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh
@@ -21,8 +21,14 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 overlay=overlay_gatt_conf
 RunTest mesh_adv_proxy_mixin adv_tx_proxy_mixin adv_rx_proxy_mixin
 
+overlay=overlay_gatt_separate_conf
+RunTest mesh_adv_proxy_mixin_separate adv_tx_proxy_mixin adv_rx_proxy_mixin
+
 overlay=overlay_gatt_conf_overlay_workq_sys_conf
 RunTest mesh_adv_proxy_mixin_workq adv_tx_proxy_mixin adv_rx_proxy_mixin
 
+overlay="overlay_gatt_conf_overlay_multi_adv_sets_conf"
+RunTest mesh_adv_proxy_mixin_multi_adv_sets adv_tx_proxy_mixin adv_rx_proxy_mixin
+
 overlay="overlay_gatt_conf_overlay_psa_conf"
 RunTest mesh_adv_proxy_mixin_psa adv_tx_proxy_mixin adv_rx_proxy_mixin
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh
index 5808d2cd508..16c6fd5ee62 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh
@@ -10,5 +10,8 @@ RunTest mesh_adv_random_order adv_tx_random_order adv_rx_random_order
 overlay=overlay_workq_sys_conf
 RunTest mesh_adv_random_order_workq adv_tx_random_order adv_rx_random_order
 
+overlay="overlay_multi_adv_sets_conf"
+RunTest mesh_adv_random_order_multi_adv_sets adv_tx_random_order adv_rx_random_order
+
 overlay=overlay_psa_conf
 RunTest mesh_adv_random_order_psa adv_tx_random_order adv_rx_random_order
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/relay.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/relay.sh
new file mode 100755
index 00000000000..453e8d14514
--- /dev/null
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/relay.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Copyright 2025 Xiaomi Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
+
+# Test scenario:
+# Allocate an advertiser buffer 1 using bt_mesh_adv_buf_create() with tag BT_MESH_ADV_TAG_LOCAL.
+# Allocate an advertiser buffer 2 using bt_mesh_adv_buf_create() with tag BT_MESH_ADV_TAG_RELAY.
+# Allocate an advertiser buffer 3 using bt_mesh_adv_buf_create() with tag BT_MESH_ADV_TAG_RELAY.
+# Submit the advertiser buffer 1,2 and 3 using bt_mesh_adv_send().
+# For not enable multiple advertising sets, expect the adv 1,2,3 are be sent by fifo order.
+# For enable multiple advertising sets, expect the adv 1,2,3 are be sent by same time.
+
+RunTest mesh_adv_tx_send_relay adv_tx_send_relay
+
+overlay="overlay_multi_adv_sets_conf"
+RunTest mesh_adv_tx_send_relay_multi_adv_sets adv_tx_send_relay
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh
index 1428833a35b..7c63dd9f7cf 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh
@@ -10,5 +10,8 @@ RunTest mesh_adv_reverse_order adv_tx_reverse_order adv_rx_receive_order
 overlay=overlay_workq_sys_conf
 RunTest mesh_adv_reverse_order_workq adv_tx_reverse_order adv_rx_receive_order
 
+overlay="overlay_multi_adv_sets_conf"
+RunTest mesh_adv_reverse_order_multi_adv_sets adv_tx_reverse_order adv_rx_receive_order
+
 overlay=overlay_psa_conf
 RunTest mesh_adv_reverse_order_psa adv_tx_reverse_order adv_rx_receive_order
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh
index 5122d7fdf05..90b43ac0e2a 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh
@@ -10,5 +10,8 @@ RunTest mesh_adv_send_order adv_tx_send_order adv_rx_receive_order
 overlay=overlay_workq_sys_conf
 RunTest mesh_adv_send_order_workq adv_tx_send_order adv_rx_receive_order
 
+overlay="overlay_multi_adv_sets_conf"
+RunTest mesh_adv_send_order_multi_adv_sets adv_tx_send_order adv_rx_receive_order
+
 overlay=overlay_psa_conf
 RunTest mesh_adv_send_order_psa adv_tx_send_order adv_rx_receive_order
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/terminate.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/terminate.sh
new file mode 100755
index 00000000000..f2c7e2e687e
--- /dev/null
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/terminate.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Copyright 2025 Xiaomi Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
+
+# Test scenario:
+# Allocate an advertiser buffer using bt_mesh_adv_buf_create().
+# Submit the advertiser buffer using bt_mesh_adv_send().
+# call `bt_mesh_adv_terminate` to terminate the ongoing transmission.
+# expect the advertiser terminated and cd->end not be called.
+RunTest mesh_adv_tx_send_terminate adv_tx_send_terminate
+
+overlay="overlay_multi_adv_sets_conf"
+RunTest mesh_adv_tx_send_terminate_multi_adv_sets adv_tx_send_terminate
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh
index a7e3ec95437..e5d063b1cbe 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh
@@ -10,5 +10,8 @@ RunTest mesh_adv_tx_cb_multi adv_tx_cb_multi
 overlay=overlay_workq_sys_conf
 RunTest mesh_adv_tx_cb_multi_workq adv_tx_cb_multi
 
+overlay="overlay_multi_adv_sets_conf"
+RunTest mesh_adv_tx_cb_multi_multi_adv_sets adv_tx_cb_multi
+
 overlay=overlay_psa_conf
 RunTest mesh_adv_tx_cb_multi_psa adv_tx_cb_multi
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh
index 48d81a60136..ccc8ad8da41 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh
@@ -10,5 +10,8 @@ RunTest mesh_adv_tx_cb_single adv_tx_cb_single adv_rx_xmit
 overlay=overlay_workq_sys_conf
 RunTest mesh_adv_tx_cb_single_workq adv_tx_cb_single adv_rx_xmit
 
+overlay="overlay_multi_adv_sets_conf"
+RunTest mesh_adv_tx_cb_single_psa_multi_adv_sets adv_tx_cb_single adv_rx_xmit
+
 overlay=overlay_psa_conf
 RunTest mesh_adv_tx_cb_single_psa adv_tx_cb_single adv_rx_xmit

From f1cc6bc4ef49e87d9f67a2b035f9c63e97cb7c12 Mon Sep 17 00:00:00 2001
From: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
Date: Fri, 7 Feb 2025 16:49:03 +0100
Subject: [PATCH 2376/2913] [nrf fromtree] Bluetooth: Mesh: remove double cdb
 node storing

Commit removes the double cdb node entry storing
into the settings if device was reprovisioned over
nppi interface.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
(cherry picked from commit 4bb595718da6dbb52c65c14243da510d146565b4)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/mesh/provisioner.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/subsys/bluetooth/mesh/provisioner.c b/subsys/bluetooth/mesh/provisioner.c
index 4f2232765bf..b1df6431d06 100644
--- a/subsys/bluetooth/mesh/provisioner.c
+++ b/subsys/bluetooth/mesh/provisioner.c
@@ -589,18 +589,16 @@ static void prov_node_add(void)
 	struct bt_mesh_cdb_node *node = provisionee.node;
 	int err;
 
-	if (atomic_test_bit(bt_mesh_prov_link.flags, REPROVISION)) {
-		bt_mesh_cdb_node_update(node, bt_mesh_prov_link.addr,
-					provisionee.elem_count);
-	}
-
 	err = bt_mesh_cdb_node_key_import(node, provisionee.new_dev_key);
 	if (err) {
 		LOG_ERR("Failed to import node device key");
 		return;
 	}
 
-	if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
+	if (atomic_test_bit(bt_mesh_prov_link.flags, REPROVISION)) {
+		bt_mesh_cdb_node_update(node, bt_mesh_prov_link.addr,
+					provisionee.elem_count);
+	} else if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
 		bt_mesh_cdb_node_store(node);
 	}
 

From c8d8d0fcf20ddd36de1307e154daf975cef1d9d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5vard=20Reierstad?= <haavard.reierstad@nordicsemi.no>
Date: Mon, 10 Feb 2025 08:52:25 +0100
Subject: [PATCH 2377/2913] [nrf fromtree] Bluetooth: testlib: Add addr string
 macro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds a macro returning a string representation of a Bluetooth address.
This allows you to print multiple addresses in a single printk or
LOG... call.

Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 997814cf8c7fcfdb0cb912d6b48efe08486c6583)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 .../common/testlib/include/testlib/addr.h          | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/bluetooth/common/testlib/include/testlib/addr.h b/tests/bluetooth/common/testlib/include/testlib/addr.h
index 2f9e49488b7..90802e50fb5 100644
--- a/tests/bluetooth/common/testlib/include/testlib/addr.h
+++ b/tests/bluetooth/common/testlib/include/testlib/addr.h
@@ -17,4 +17,18 @@
 		.a = {{last, 0x00, 0x00, 0x00, 0x00, 0xc0}},                                       \
 	})
 
+static inline char *bt_testlib_get_addr_str(const bt_addr_le_t *addr,
+					    char addr_str[BT_ADDR_LE_STR_LEN])
+{
+	bt_addr_le_to_str(addr, addr_str, BT_ADDR_LE_STR_LEN);
+
+	return addr_str;
+}
+
+/** Macro to simplify printing of addresses. The returned pointer is valid until the end of the
+ *  scope this was called from, due to the use of a compound literal.
+ */
+#define bt_testlib_addr_to_str(addr)                                                               \
+	bt_testlib_get_addr_str((addr), (char[BT_ADDR_LE_STR_LEN]) {0})
+
 #endif /* ZEPHYR_TESTS_BLUETOOTH_COMMON_TESTLIB_INCLUDE_TESTLIB_ADDR_H_ */

From ee1b5d6973bf12a97883a11633a327ffb8f98232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5vard=20Reierstad?= <haavard.reierstad@nordicsemi.no>
Date: Mon, 10 Feb 2025 09:20:54 +0100
Subject: [PATCH 2378/2913] [nrf fromtree] Bluetooth: tests: Add macros to
 babblekit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds two macros to the babblekit library:
* DEFINE_FLAG_STATIC
* TEST_ASSERT_NO_MSG

Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit c2c4f2e0d110edaeb12c47a4a81f69a895d28a7d)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 tests/bsim/babblekit/include/babblekit/flags.h    |  8 +++++++-
 tests/bsim/babblekit/include/babblekit/testcase.h | 11 +++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/tests/bsim/babblekit/include/babblekit/flags.h b/tests/bsim/babblekit/include/babblekit/flags.h
index 89c8b45ca3e..a614e811309 100644
--- a/tests/bsim/babblekit/include/babblekit/flags.h
+++ b/tests/bsim/babblekit/include/babblekit/flags.h
@@ -19,12 +19,18 @@
 #define DECLARE_FLAG(flag) extern atomic_t flag
 
 /* Define a new binary flag.
- * Declare them static if defining flags with the same name in multiple files.
+ * Use @ref DEFINE_FLAG_STATIC if defining flags with the same name in multiple files.
  *
  * @param flag Name of the flag
  */
 #define DEFINE_FLAG(flag)  atomic_t flag = (atomic_t) false
 
+/* Define a new, static binary flag.
+ *
+ * @param flag Name of the flag
+ */
+#define DEFINE_FLAG_STATIC(flag)  static atomic_t flag = (atomic_t) false
+
 #define SET_FLAG(flag)     (void)atomic_set(&flag, (atomic_t) true)
 #define UNSET_FLAG(flag)   (void)atomic_set(&flag, (atomic_t) false)
 
diff --git a/tests/bsim/babblekit/include/babblekit/testcase.h b/tests/bsim/babblekit/include/babblekit/testcase.h
index 9d13a1a0030..0cbbb7562ff 100644
--- a/tests/bsim/babblekit/include/babblekit/testcase.h
+++ b/tests/bsim/babblekit/include/babblekit/testcase.h
@@ -95,6 +95,17 @@ extern enum bst_result_t bst_result;
 		}                                                                                  \
 	} while (0)
 
+/*
+ * @brief Assert `expr` is true
+ *
+ * Assert that `expr` is true. If assertion is false, fail the test. I.e. return non-zero.
+ *
+ * @note This is different than `sys/__assert.h`.
+ *
+ */
+#define TEST_ASSERT_NO_MSG(expr)                                                                   \
+	TEST_ASSERT(expr, "")
+
 /*
  * @brief Print a value. Lower-level than `printk` or `LOG_xx`.
  *

From 02382d551d80f9345f0793f73a4c1d267ad1fbb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5vard=20Reierstad?= <haavard.reierstad@nordicsemi.no>
Date: Thu, 6 Feb 2025 15:08:48 +0100
Subject: [PATCH 2379/2913] [nrf fromtree] Bluetooth: Host: More bsim
 refactoring
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Commit does the following changes:
* Use functionality from the `babbelkit` library for common functions
  related to flags, test progression (failing, passing etc.) and
  synchronization between two devices. Locally defined equivalents are
  removed.
* Removes the files containing only functionality that is provided
  by the `babblekit` library.
* Remove the `test_pre_init_f` and `test_tick_f` functions (commonly
  implemented as `test_init` and `test_tick`) from the modified tests.
  These functions are not needed as they were only used to fail the test
  if a device didn't complete the test within a certain time frame. This
  is already handled by the `sim_length` argument used in the test
  scripts.

Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 7737483c0612d6d692c70d43f8dc1c6791f4922b)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 .../bluetooth/host/adv/chain/CMakeLists.txt   |  3 +
 .../bsim/bluetooth/host/adv/chain/src/main.c  | 49 ++---------
 .../adv/extended/src/ext_adv_advertiser.c     |  4 +-
 .../host/adv/extended/src/ext_adv_scanner.c   |  6 +-
 .../host/adv/long_ad/src/advertiser.c         |  6 +-
 .../bluetooth/host/adv/long_ad/src/scanner.c  |  2 +-
 .../adv/periodic/src/per_adv_advertiser.c     |  4 +-
 .../host/adv/periodic/src/per_adv_sync.c      | 12 +--
 .../host/att/eatt/src/main_reconfigure.c      |  2 +-
 .../host/att/eatt_notif/src/client_test.c     |  6 +-
 .../host/att/eatt_notif/src/server_test.c     |  4 +-
 .../host/att/mtu_update/CMakeLists.txt        |  3 +
 .../host/att/mtu_update/src/common.h          | 37 --------
 .../host/att/mtu_update/src/main_central.c    | 25 ++----
 .../host/att/mtu_update/src/main_peripheral.c | 22 +----
 .../att/mtu_update/test_scripts/run_test.sh   |  2 +-
 .../host/att/pipeline/common/utils.h          | 62 --------------
 .../host/att/pipeline/dut/CMakeLists.txt      |  8 +-
 .../host/att/pipeline/dut/src/main.c          | 79 +++++++----------
 .../host/att/pipeline/tester/CMakeLists.txt   |  4 +-
 .../host/att/pipeline/tester/src/main.c       | 84 +++++++------------
 .../host/att/read_fill_buf/bs_macro.h         | 13 ---
 .../host/att/read_fill_buf/bs_main.c          | 53 ------------
 .../att/read_fill_buf/client/CMakeLists.txt   |  8 +-
 .../host/att/read_fill_buf/client/main.c      | 28 ++++++-
 .../att/read_fill_buf/server/CMakeLists.txt   |  8 +-
 .../host/att/read_fill_buf/server/main.c      | 28 ++++++-
 .../read_fill_buf/test_scripts/run_tests.sh   |  8 +-
 .../retry_on_sec_err/client/CMakeLists.txt    |  3 +-
 .../host/att/retry_on_sec_err/client/main.c   | 14 ++--
 .../retry_on_sec_err/server/CMakeLists.txt    |  3 +-
 .../host/att/retry_on_sec_err/server/main.c   | 12 ++-
 .../host/att/retry_on_sec_err/test_utils.c    | 21 -----
 .../host/att/retry_on_sec_err/test_utils.h    | 29 -------
 .../host/att/sequential/common/common_defs.h  |  9 ++
 .../host/att/sequential/common/utils.h        | 59 -------------
 .../host/att/sequential/dut/CMakeLists.txt    |  3 +
 .../host/att/sequential/dut/src/main.c        | 57 +++++--------
 .../host/att/sequential/tester/CMakeLists.txt |  3 +
 .../host/att/sequential/tester/src/main.c     | 64 ++++++--------
 .../host/central/src/dummy_peripheral.c       |  1 -
 tests/bsim/bluetooth/host/central/src/main.c  |  3 -
 .../gatt/authorization/src/gatt_client_test.c |  8 +-
 .../gatt/authorization/src/gatt_server_test.c |  2 +-
 .../host/gatt/caching/src/gatt_client_test.c  | 14 ++--
 .../host/gatt/caching/src/gatt_server_test.c  |  4 +-
 .../host/gatt/ccc_store/src/central.c         | 10 +--
 .../host/gatt/ccc_store/src/peripheral.c      |  8 +-
 .../host/gatt/device_name/src/client.c        |  2 +-
 .../host/gatt/device_name/src/server.c        |  2 +-
 .../host/gatt/general/src/gatt_client_test.c  | 10 +--
 .../host/gatt/general/src/gatt_server_test.c  |  2 +-
 .../host/gatt/notify/src/gatt_client_test.c   | 10 +--
 .../host/gatt/notify/src/gatt_server_test.c   |  6 +-
 .../host/gatt/notify_multiple/CMakeLists.txt  |  3 +
 .../host/gatt/notify_multiple/src/common.c    | 20 -----
 .../host/gatt/notify_multiple/src/common.h    | 44 ----------
 .../notify_multiple/src/gatt_client_test.c    | 61 ++++++++------
 .../notify_multiple/src/gatt_server_test.c    | 36 +++++---
 .../host/gatt/sc_indicate/CMakeLists.txt      |  3 +
 .../host/gatt/sc_indicate/src/bs_bt_utils.c   | 22 ++---
 .../host/gatt/sc_indicate/src/bs_bt_utils.h   | 40 +--------
 .../host/gatt/sc_indicate/src/central.c       | 25 +++---
 .../host/gatt/sc_indicate/src/main.c          | 22 -----
 .../host/gatt/sc_indicate/src/peripheral.c    | 10 ++-
 .../host/gatt/settings/CMakeLists.txt         |  3 +
 .../bluetooth/host/gatt/settings/src/client.c |  4 +-
 .../host/gatt/settings/src/gatt_utils.c       | 14 ++--
 .../bluetooth/host/gatt/settings/src/main.c   | 28 +------
 .../bluetooth/host/gatt/settings/src/server.c |  4 +-
 .../bluetooth/host/gatt/settings/src/utils.c  | 10 +--
 .../bluetooth/host/gatt/settings/src/utils.h  | 47 -----------
 .../host/gatt/settings_clear/src/client.c     |  4 +-
 .../host/gatt/settings_clear/src/server.c     |  6 +-
 .../bluetooth/host/id/settings/CMakeLists.txt |  3 +
 .../bluetooth/host/id/settings/src/common.h   | 20 -----
 .../bsim/bluetooth/host/id/settings/src/dut.c | 18 ++--
 .../bluetooth/host/id/settings/src/main.c     | 23 -----
 .../host/iso/bis/src/bis_broadcaster.c        |  2 +-
 .../bluetooth/host/iso/bis/src/bis_receiver.c | 10 +--
 .../bluetooth/host/iso/cis/src/cis_central.c  |  2 +-
 .../host/iso/cis/src/cis_peripheral.c         |  2 +-
 .../bluetooth/host/iso/frag/src/broadcaster.c |  4 +-
 .../host/iso/frag_2/src/broadcaster.c         |  6 +-
 .../bluetooth/host/l2cap/credits/src/main.c   |  4 +-
 .../host/l2cap/credits_seg_recv/src/main.c    |  4 +-
 .../host/l2cap/general/src/main_l2cap_ecred.c |  4 +-
 .../host/l2cap/many_conns/src/main.c          |  4 +-
 .../host/l2cap/multilink_peripheral/src/dut.c |  2 +-
 .../host/l2cap/reassembly/dut/src/dut.c       |  2 +-
 .../host/l2cap/reassembly/peer/src/peer.c     |  6 +-
 .../src/main_l2cap_send_on_connect.c          |  6 +-
 .../bluetooth/host/l2cap/split/common/utils.h | 51 -----------
 .../host/l2cap/split/dut/CMakeLists.txt       |  3 +
 .../bluetooth/host/l2cap/split/dut/src/main.c | 46 ++++------
 .../host/l2cap/split/tester/CMakeLists.txt    |  3 +
 .../host/l2cap/split/tester/src/main.c        | 36 +++-----
 .../bluetooth/host/l2cap/stress/src/main.c    |  4 +-
 .../l2cap/userdata/src/main_l2cap_userdata.c  |  8 +-
 .../bluetooth/host/misc/acl_tx_frag/src/dut.c | 10 +--
 .../host/misc/acl_tx_frag/src/peer.c          |  4 +-
 .../host/misc/disable/src/gatt_client_test.c  |  8 +-
 .../host/misc/disable/src/gatt_server_test.c  |  2 +-
 .../host/misc/disconnect/common/common.h      |  9 ++
 .../host/misc/disconnect/common/sync.c        | 65 --------------
 .../host/misc/disconnect/common/sync.h        |  9 --
 .../host/misc/disconnect/common/utils.h       | 63 --------------
 .../host/misc/disconnect/dut/CMakeLists.txt   |  4 +-
 .../host/misc/disconnect/dut/src/main.c       | 63 ++++++--------
 .../misc/disconnect/tester/CMakeLists.txt     |  4 +-
 .../host/misc/disconnect/tester/src/main.c    | 70 ++++++----------
 .../bluetooth/host/misc/hfc/CMakeLists.txt    |  2 +
 tests/bsim/bluetooth/host/misc/hfc/src/main.c | 59 +++++--------
 .../bsim/bluetooth/host/misc/hfc/src/utils.h  | 55 ------------
 .../bluetooth/host/misc/sample_test/src/dut.c |  2 +-
 .../host/misc/sample_test/src/peer.c          |  6 +-
 .../host/misc/unregister_conn_cb/src/main.c   |  2 +-
 .../host/privacy/central/CMakeLists.txt       |  1 -
 .../host/privacy/central/src/bs_bt_utils.c    | 75 -----------------
 .../host/privacy/central/src/bs_bt_utils.h    | 72 ----------------
 .../bluetooth/host/privacy/central/src/dut.c  | 17 ++--
 .../bluetooth/host/privacy/central/src/main.c | 11 ---
 .../host/privacy/central/src/tester.c         | 34 ++++----
 .../host/privacy/device/CMakeLists.txt        |  3 +
 .../device/src/test_undirected_central.c      | 57 ++++---------
 .../privacy/device/src/test_undirected_main.c | 26 ------
 .../device/src/test_undirected_peripheral.c   | 46 +++-------
 .../privacy/device/test_scripts/run_tests.sh  |  3 +-
 .../host/privacy/legacy/CMakeLists.txt        |  8 +-
 .../host/privacy/legacy/src/bs_bt_utils.c     | 73 ----------------
 .../host/privacy/legacy/src/bs_bt_utils.h     | 54 ------------
 .../bluetooth/host/privacy/legacy/src/dut.c   | 31 ++++---
 .../bluetooth/host/privacy/legacy/src/main.c  |  5 --
 .../host/privacy/legacy/src/tester.c          | 56 ++++++-------
 .../host/privacy/peripheral/CMakeLists.txt    |  8 +-
 .../host/privacy/peripheral/src/bs_bt_utils.c | 35 --------
 .../host/privacy/peripheral/src/bs_bt_utils.h | 52 ------------
 .../privacy/peripheral/src/dut_rpa_expired.c  | 29 ++++---
 .../privacy/peripheral/src/dut_rpa_rotation.c | 28 ++++---
 .../host/privacy/peripheral/src/main.c        |  1 -
 .../privacy/peripheral/src/main_rpa_expired.c |  5 --
 .../peripheral/src/main_rpa_rotation.c        |  5 --
 .../peripheral/src/tester_rpa_expired.c       | 41 +++++----
 .../peripheral/src/tester_rpa_rotation.c      | 42 ++++++----
 .../bluetooth/host/scan/start_stop/src/main.c | 41 +++------
 .../bond_overwrite_allowed/CMakeLists.txt     |  3 +
 .../bond_overwrite_allowed/src/bs_bt_utils.c  | 42 +++-------
 .../bond_overwrite_allowed/src/bs_bt_utils.h  | 42 +---------
 .../bond_overwrite_allowed/src/central.c      |  9 +-
 .../bond_overwrite_allowed/src/main.c         |  4 -
 .../bond_overwrite_allowed/src/peripheral.c   | 13 +--
 .../bond_overwrite_denied/CMakeLists.txt      |  3 +
 .../bond_overwrite_denied/src/bs_bt_utils.c   | 42 +++-------
 .../bond_overwrite_denied/src/bs_bt_utils.h   | 42 +---------
 .../bond_overwrite_denied/src/central.c       |  5 +-
 .../security/bond_overwrite_denied/src/main.c |  4 -
 .../bond_overwrite_denied/src/peripheral.c    |  9 +-
 .../bond_per_connection/CMakeLists.txt        |  3 +
 .../bond_per_connection/src/bs_bt_utils.c     | 48 ++++-------
 .../bond_per_connection/src/bs_bt_utils.h     | 44 +---------
 .../bond_per_connection/src/central.c         |  5 +-
 .../security/bond_per_connection/src/main.c   |  4 -
 .../bond_per_connection/src/peripheral.c      |  9 +-
 .../host/security/ccc_update/src/central.c    |  8 +-
 .../host/security/ccc_update/src/peripheral.c |  9 +-
 .../id_addr_update/central/CMakeLists.txt     |  3 +
 .../id_addr_update/central/src/central.c      |  6 +-
 .../id_addr_update/central/src/utils.c        | 45 ++++------
 .../id_addr_update/central/src/utils.h        |  3 -
 .../id_addr_update/common/bs_bt_utils.h       | 50 -----------
 .../id_addr_update/peripheral/CMakeLists.txt  |  3 +
 .../peripheral/src/peripheral.c               | 16 ++--
 .../id_addr_update/peripheral/src/utils.c     | 39 +++------
 .../id_addr_update/peripheral/src/utils.h     |  3 -
 .../security_changed_callback/CMakeLists.txt  |  3 +
 .../src/bs_bt_utils.c                         | 41 +++------
 .../src/bs_bt_utils.h                         | 47 +----------
 .../security_changed_callback/src/central.c   |  4 +-
 .../security_changed_callback/src/main.c      |  6 --
 .../src/peripheral.c                          | 13 +--
 .../battery_service/src/central_test.c        |  6 +-
 181 files changed, 996 insertions(+), 2544 deletions(-)
 delete mode 100644 tests/bsim/bluetooth/host/att/mtu_update/src/common.h
 delete mode 100644 tests/bsim/bluetooth/host/att/pipeline/common/utils.h
 delete mode 100644 tests/bsim/bluetooth/host/att/read_fill_buf/bs_macro.h
 delete mode 100644 tests/bsim/bluetooth/host/att/read_fill_buf/bs_main.c
 delete mode 100644 tests/bsim/bluetooth/host/att/retry_on_sec_err/test_utils.c
 delete mode 100644 tests/bsim/bluetooth/host/att/retry_on_sec_err/test_utils.h
 create mode 100644 tests/bsim/bluetooth/host/att/sequential/common/common_defs.h
 delete mode 100644 tests/bsim/bluetooth/host/att/sequential/common/utils.h
 delete mode 100644 tests/bsim/bluetooth/host/gatt/notify_multiple/src/common.c
 delete mode 100644 tests/bsim/bluetooth/host/id/settings/src/common.h
 delete mode 100644 tests/bsim/bluetooth/host/l2cap/split/common/utils.h
 create mode 100644 tests/bsim/bluetooth/host/misc/disconnect/common/common.h
 delete mode 100644 tests/bsim/bluetooth/host/misc/disconnect/common/sync.c
 delete mode 100644 tests/bsim/bluetooth/host/misc/disconnect/common/sync.h
 delete mode 100644 tests/bsim/bluetooth/host/misc/disconnect/common/utils.h
 delete mode 100644 tests/bsim/bluetooth/host/misc/hfc/src/utils.h
 delete mode 100644 tests/bsim/bluetooth/host/privacy/central/src/bs_bt_utils.c
 delete mode 100644 tests/bsim/bluetooth/host/privacy/central/src/bs_bt_utils.h
 delete mode 100644 tests/bsim/bluetooth/host/privacy/legacy/src/bs_bt_utils.c
 delete mode 100644 tests/bsim/bluetooth/host/privacy/legacy/src/bs_bt_utils.h
 delete mode 100644 tests/bsim/bluetooth/host/privacy/peripheral/src/bs_bt_utils.c
 delete mode 100644 tests/bsim/bluetooth/host/privacy/peripheral/src/bs_bt_utils.h

diff --git a/tests/bsim/bluetooth/host/adv/chain/CMakeLists.txt b/tests/bsim/bluetooth/host/adv/chain/CMakeLists.txt
index 032cd1d68bc..9aaea173864 100644
--- a/tests/bsim/bluetooth/host/adv/chain/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/adv/chain/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_adv_chain)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
   src/main.c
   ${ZEPHYR_BASE}/samples/bluetooth/broadcaster_multiple/src/broadcaster_multiple.c
diff --git a/tests/bsim/bluetooth/host/adv/chain/src/main.c b/tests/bsim/bluetooth/host/adv/chain/src/main.c
index ad718125318..4feb20b87c1 100644
--- a/tests/bsim/bluetooth/host/adv/chain/src/main.c
+++ b/tests/bsim/bluetooth/host/adv/chain/src/main.c
@@ -14,22 +14,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
 
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "time_machine.h"
-#include "bstests.h"
-
-#define FAIL(...)					\
-	do {						\
-		bst_result = Failed;			\
-		bs_trace_error_time_line(__VA_ARGS__);	\
-	} while (0)
-
-#define PASS(...)					\
-	do {						\
-		bst_result = Passed;			\
-		bs_trace_info_time(1, __VA_ARGS__);	\
-	} while (0)
+#include "babblekit/testcase.h"
 
 #define NAME_LEN 30
 #define BT_AD_DATA_NAME_SIZE     (sizeof(CONFIG_BT_DEVICE_NAME) - 1U + 2U)
@@ -44,8 +29,6 @@
 
 static K_SEM_DEFINE(sem_recv, 0, 1);
 
-extern enum bst_result_t bst_result;
-
 static void test_adv_main(void)
 {
 	extern int broadcaster_multiple(void);
@@ -53,7 +36,7 @@ static void test_adv_main(void)
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Bluetooth init failed\n");
+		TEST_FAIL("Bluetooth init failed");
 
 		bs_trace_silent_exit(err);
 		return;
@@ -61,13 +44,13 @@ static void test_adv_main(void)
 
 	err = broadcaster_multiple();
 	if (err) {
-		FAIL("Adv tests failed\n");
+		TEST_FAIL("Adv tests failed");
 		bs_trace_silent_exit(err);
 		return;
 	}
 
 	/* Successfully started advertising multiple sets */
-	PASS("Adv tests passed\n");
+	TEST_PASS("Adv tests passed");
 
 	/* Let the scanner receive the reports */
 	k_sleep(K_SECONDS(10));
@@ -146,7 +129,7 @@ static void test_scan_main(void)
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Bluetooth init failed\n");
+		TEST_FAIL("Bluetooth init failed");
 
 		bs_trace_silent_exit(err);
 		return;
@@ -156,7 +139,7 @@ static void test_scan_main(void)
 
 	err = observer_start();
 	if (err) {
-		FAIL("Observer start failed\n");
+		TEST_FAIL("Observer start failed");
 
 		bs_trace_silent_exit(err);
 		return;
@@ -167,42 +150,26 @@ static void test_scan_main(void)
 
 	err = k_sem_take(&sem_recv, K_NO_WAIT);
 	if (err) {
-		FAIL("Scan receive failed\n");
+		TEST_FAIL("Scan receive failed");
 
 		bs_trace_silent_exit(err);
 		return;
 	}
 
-	PASS("Scan tests passed\n");
+	TEST_PASS("Scan tests passed");
 
 	bs_trace_silent_exit(0);
 }
 
-static void test_adv_chain_init(void)
-{
-	bst_ticker_set_next_tick_absolute(60e6);
-	bst_result = In_progress;
-}
-
-static void test_adv_chain_tick(bs_time_t HW_device_time)
-{
-	bst_result = Failed;
-	bs_trace_error_line("Test GATT Write finished.\n");
-}
-
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "adv",
 		.test_descr = "Central GATT Write",
-		.test_pre_init_f = test_adv_chain_init,
-		.test_tick_f = test_adv_chain_tick,
 		.test_main_f = test_adv_main
 	},
 	{
 		.test_id = "scan",
 		.test_descr = "Peripheral GATT Write",
-		.test_pre_init_f = test_adv_chain_init,
-		.test_tick_f = test_adv_chain_tick,
 		.test_main_f = test_scan_main
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/adv/extended/src/ext_adv_advertiser.c b/tests/bsim/bluetooth/host/adv/extended/src/ext_adv_advertiser.c
index 492b26b106e..186d77f6f67 100644
--- a/tests/bsim/bluetooth/host/adv/extended/src/ext_adv_advertiser.c
+++ b/tests/bsim/bluetooth/host/adv/extended/src/ext_adv_advertiser.c
@@ -18,8 +18,8 @@ extern enum bst_result_t bst_result;
 
 static struct bt_conn *g_conn;
 
-static DEFINE_FLAG(flag_connected);
-static DEFINE_FLAG(flag_conn_recycled);
+DEFINE_FLAG_STATIC(flag_connected);
+DEFINE_FLAG_STATIC(flag_conn_recycled);
 
 static void common_init(void)
 {
diff --git a/tests/bsim/bluetooth/host/adv/extended/src/ext_adv_scanner.c b/tests/bsim/bluetooth/host/adv/extended/src/ext_adv_scanner.c
index 231b344ca0f..f9299d1b499 100644
--- a/tests/bsim/bluetooth/host/adv/extended/src/ext_adv_scanner.c
+++ b/tests/bsim/bluetooth/host/adv/extended/src/ext_adv_scanner.c
@@ -18,9 +18,9 @@ extern enum bst_result_t bst_result;
 
 static struct bt_conn *g_conn;
 
-static DEFINE_FLAG(flag_ext_adv_seen);
-static DEFINE_FLAG(flag_connected);
-static DEFINE_FLAG(flag_conn_recycled);
+DEFINE_FLAG_STATIC(flag_ext_adv_seen);
+DEFINE_FLAG_STATIC(flag_connected);
+DEFINE_FLAG_STATIC(flag_conn_recycled);
 
 static void connected(struct bt_conn *conn, uint8_t err)
 {
diff --git a/tests/bsim/bluetooth/host/adv/long_ad/src/advertiser.c b/tests/bsim/bluetooth/host/adv/long_ad/src/advertiser.c
index b4fbc02b0d2..308d96eee24 100644
--- a/tests/bsim/bluetooth/host/adv/long_ad/src/advertiser.c
+++ b/tests/bsim/bluetooth/host/adv/long_ad/src/advertiser.c
@@ -32,7 +32,7 @@ static void create_adv(struct bt_le_ext_adv **adv)
 
 	err = bt_le_ext_adv_create(&params, NULL, adv);
 	if (err) {
-		TEST_FAIL("Failed to create advertiser (%d)\n", err);
+		TEST_FAIL("Failed to create advertiser (%d)", err);
 	}
 }
 
@@ -49,7 +49,7 @@ static void start_adv(struct bt_le_ext_adv *adv)
 
 	err = bt_le_ext_adv_start(adv, &start_params);
 	if (err) {
-		TEST_FAIL("Failed to start advertiser (%d)\n", err);
+		TEST_FAIL("Failed to start advertiser (%d)", err);
 	}
 }
 
@@ -99,7 +99,7 @@ static int set_ad_data(struct bt_le_ext_adv *adv, const uint8_t *serialized_ad,
 
 	err = bt_le_ext_adv_set_data(adv, ad, ad_len, NULL, 0);
 	if (err != 0 && err != -EDOM) {
-		TEST_FAIL("Failed to set advertising data (%d)\n", err);
+		TEST_FAIL("Failed to set advertising data (%d)", err);
 	}
 
 	return err;
diff --git a/tests/bsim/bluetooth/host/adv/long_ad/src/scanner.c b/tests/bsim/bluetooth/host/adv/long_ad/src/scanner.c
index b1d17877b74..e2ca5b60816 100644
--- a/tests/bsim/bluetooth/host/adv/long_ad/src/scanner.c
+++ b/tests/bsim/bluetooth/host/adv/long_ad/src/scanner.c
@@ -62,7 +62,7 @@ static void start_scan(void)
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
 	if (err) {
-		TEST_FAIL("Scanning failed to start (err %d)\n", err);
+		TEST_FAIL("Scanning failed to start (err %d)", err);
 	}
 
 	LOG_DBG("Scanning successfully started");
diff --git a/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_advertiser.c b/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_advertiser.c
index 3085bda474a..62385d3ce2d 100644
--- a/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_advertiser.c
+++ b/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_advertiser.c
@@ -23,8 +23,8 @@ extern enum bst_result_t bst_result;
 
 static struct bt_conn *g_conn;
 
-static DEFINE_FLAG(flag_connected);
-static DEFINE_FLAG(flag_bonded);
+DEFINE_FLAG_STATIC(flag_connected);
+DEFINE_FLAG_STATIC(flag_bonded);
 
 static void connected(struct bt_conn *conn, uint8_t err)
 {
diff --git a/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_sync.c b/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_sync.c
index 0b7a8969f9a..2938bf9846f 100644
--- a/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_sync.c
+++ b/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_sync.c
@@ -25,12 +25,12 @@ static struct bt_conn *g_conn;
 static bt_addr_le_t per_addr;
 static uint8_t per_sid;
 
-static DEFINE_FLAG(flag_connected);
-static DEFINE_FLAG(flag_bonded);
-static DEFINE_FLAG(flag_per_adv);
-static DEFINE_FLAG(flag_per_adv_sync);
-static DEFINE_FLAG(flag_per_adv_sync_lost);
-static DEFINE_FLAG(flag_per_adv_recv);
+DEFINE_FLAG_STATIC(flag_connected);
+DEFINE_FLAG_STATIC(flag_bonded);
+DEFINE_FLAG_STATIC(flag_per_adv);
+DEFINE_FLAG_STATIC(flag_per_adv_sync);
+DEFINE_FLAG_STATIC(flag_per_adv_sync_lost);
+DEFINE_FLAG_STATIC(flag_per_adv_recv);
 
 static void connected(struct bt_conn *conn, uint8_t err)
 {
diff --git a/tests/bsim/bluetooth/host/att/eatt/src/main_reconfigure.c b/tests/bsim/bluetooth/host/att/eatt/src/main_reconfigure.c
index 138583f4ce2..bab8e25264e 100644
--- a/tests/bsim/bluetooth/host/att/eatt/src/main_reconfigure.c
+++ b/tests/bsim/bluetooth/host/att/eatt/src/main_reconfigure.c
@@ -15,7 +15,7 @@
 
 #define NEW_MTU 100
 
-static DEFINE_FLAG(flag_reconfigured);
+DEFINE_FLAG_STATIC(flag_reconfigured);
 
 void att_mtu_updated(struct bt_conn *conn, uint16_t tx, uint16_t rx)
 {
diff --git a/tests/bsim/bluetooth/host/att/eatt_notif/src/client_test.c b/tests/bsim/bluetooth/host/att/eatt_notif/src/client_test.c
index e846b1d05b9..036478bb410 100644
--- a/tests/bsim/bluetooth/host/att/eatt_notif/src/client_test.c
+++ b/tests/bsim/bluetooth/host/att/eatt_notif/src/client_test.c
@@ -30,9 +30,9 @@
 #include "babblekit/sync.h"
 #include "common.h"
 
-static DEFINE_FLAG(flag_is_connected);
-static DEFINE_FLAG(flag_discover_complete);
-static DEFINE_FLAG(flag_is_encrypted);
+DEFINE_FLAG_STATIC(flag_is_connected);
+DEFINE_FLAG_STATIC(flag_discover_complete);
+DEFINE_FLAG_STATIC(flag_is_encrypted);
 
 static struct bt_conn *g_conn;
 static const struct bt_gatt_attr *local_attr;
diff --git a/tests/bsim/bluetooth/host/att/eatt_notif/src/server_test.c b/tests/bsim/bluetooth/host/att/eatt_notif/src/server_test.c
index 94cf4ab699b..6ac5a6662ac 100644
--- a/tests/bsim/bluetooth/host/att/eatt_notif/src/server_test.c
+++ b/tests/bsim/bluetooth/host/att/eatt_notif/src/server_test.c
@@ -20,11 +20,11 @@
 #include "babblekit/sync.h"
 #include "common.h"
 
-static DEFINE_FLAG(flag_discover_complete);
+DEFINE_FLAG_STATIC(flag_discover_complete);
 
 extern enum bst_result_t bst_result;
 
-static DEFINE_FLAG(flag_is_connected);
+DEFINE_FLAG_STATIC(flag_is_connected);
 
 static struct bt_conn *g_conn;
 
diff --git a/tests/bsim/bluetooth/host/att/mtu_update/CMakeLists.txt b/tests/bsim/bluetooth/host/att/mtu_update/CMakeLists.txt
index 737bd9b5d85..adb53fbca4c 100644
--- a/tests/bsim/bluetooth/host/att/mtu_update/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/att/mtu_update/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_mtu_update)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_include_directories(app PRIVATE src)
 
 target_sources_ifdef(CONFIG_BT_PERIPHERAL app PRIVATE
diff --git a/tests/bsim/bluetooth/host/att/mtu_update/src/common.h b/tests/bsim/bluetooth/host/att/mtu_update/src/common.h
deleted file mode 100644
index 426bef3200f..00000000000
--- a/tests/bsim/bluetooth/host/att/mtu_update/src/common.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Common functions and helpers for MTU Update test
- *
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stddef.h>
-
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "bstests.h"
-
-#define FAIL(...)					\
-	do {						\
-		bst_result = Failed;			\
-		bs_trace_error_time_line(__VA_ARGS__);	\
-	} while (0)
-
-#define PASS(...)					\
-	do {						\
-		bst_result = Passed;			\
-		bs_trace_info_time(1, __VA_ARGS__);	\
-	} while (0)
-
-extern enum bst_result_t bst_result;
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t)false
-#define SET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)true)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-
-#define WAIT_TIME (20e6) /* 20 seconds */
-#define PERIPHERAL_NOTIFY_TIME ((WAIT_TIME - 10e6) / 1e6)
diff --git a/tests/bsim/bluetooth/host/att/mtu_update/src/main_central.c b/tests/bsim/bluetooth/host/att/mtu_update/src/main_central.c
index d41cf846477..1f4854a7b81 100644
--- a/tests/bsim/bluetooth/host/att/mtu_update/src/main_central.c
+++ b/tests/bsim/bluetooth/host/att/mtu_update/src/main_central.c
@@ -14,15 +14,15 @@
 
 #include <zephyr/bluetooth/gatt.h>
 
-#include "common.h"
-#include "time_machine.h"
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_bsim_mtu_update, LOG_LEVEL_DBG);
 
 extern void run_central_sample(void *cb);
 
-CREATE_FLAG(flag_notification_received);
+DEFINE_FLAG_STATIC(flag_notification_received);
 uint8_t notify_data[100] = {};
 uint8_t is_data_equal;
 
@@ -51,31 +51,16 @@ static void test_central_main(void)
 	WAIT_FOR_FLAG(flag_notification_received);
 
 	if (is_data_equal) {
-		PASS("MTU Update test passed\n");
+		TEST_PASS("MTU Update test passed");
 	} else {
-		FAIL("MTU Update test failed\n");
+		TEST_FAIL("MTU Update test failed");
 	}
 }
 
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("Test failed (not passed after %i seconds)\n", WAIT_TIME);
-	}
-}
-
-static void test_mtu_update_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-	bst_result = In_progress;
-}
-
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "central",
 		.test_descr = "Central GATT MTU Update",
-		.test_pre_init_f = test_mtu_update_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_central_main
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/att/mtu_update/src/main_peripheral.c b/tests/bsim/bluetooth/host/att/mtu_update/src/main_peripheral.c
index 9124965b67b..8f76d2d6d3c 100644
--- a/tests/bsim/bluetooth/host/att/mtu_update/src/main_peripheral.c
+++ b/tests/bsim/bluetooth/host/att/mtu_update/src/main_peripheral.c
@@ -12,12 +12,13 @@
 
 #include <zephyr/sys/printk.h>
 
-#include "common.h"
-#include "time_machine.h"
+#include "babblekit/testcase.h"
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_bsim_mtu_update, LOG_LEVEL_DBG);
 
+#define PERIPHERAL_NOTIFY_TIME 10 /* seconds */
+
 extern void run_peripheral_sample(uint8_t *notify_data, size_t notify_data_size, uint16_t seconds);
 
 uint8_t notify_data[100] = {};
@@ -29,28 +30,13 @@ static void test_peripheral_main(void)
 
 	run_peripheral_sample(notify_data, sizeof(notify_data), PERIPHERAL_NOTIFY_TIME);
 
-	PASS("MTU Update test passed\n");
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("Test failed (not passed after %i seconds)\n", WAIT_TIME);
-	}
-}
-
-static void test_mtu_update_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-	bst_result = In_progress;
+	TEST_PASS("MTU Update test passed");
 }
 
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "peripheral",
 		.test_descr = "Peripheral GATT MTU Update",
-		.test_pre_init_f = test_mtu_update_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_peripheral_main
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/att/mtu_update/test_scripts/run_test.sh b/tests/bsim/bluetooth/host/att/mtu_update/test_scripts/run_test.sh
index f2947d62b12..b8cae777653 100755
--- a/tests/bsim/bluetooth/host/att/mtu_update/test_scripts/run_test.sh
+++ b/tests/bsim/bluetooth/host/att/mtu_update/test_scripts/run_test.sh
@@ -20,6 +20,6 @@ Execute "$peripheral_exe" \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-    -D=2 -sim_length=60e6 $@ -argschannel -at=40
+    -D=2 -sim_length=20e6 $@ -argschannel -at=40
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/att/pipeline/common/utils.h b/tests/bsim/bluetooth/host/att/pipeline/common/utils.h
deleted file mode 100644
index 60f2396fbb9..00000000000
--- a/tests/bsim/bluetooth/host/att/pipeline/common/utils.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "bs_tracing.h"
-#include "bs_types.h"
-#include "bstests.h"
-
-#define BS_SECONDS(dur_sec)    ((bs_time_t)dur_sec * USEC_PER_SEC)
-
-extern enum bst_result_t bst_result;
-
-#define DECLARE_FLAG(flag) extern atomic_t flag
-#define DEFINE_FLAG(flag)  atomic_t flag = (atomic_t) false
-#define TEST_FLAG(flag)    (bool)atomic_get(&flag)
-#define SET_FLAG(flag)     (void)atomic_set(&flag, (atomic_t) true)
-#define UNSET_FLAG(flag)   (void)atomic_set(&flag, (atomic_t) false)
-
-#define WAIT_FOR_VAL(var, val)                                                                    \
-	while (atomic_get(&var) != val) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)                                                                  \
-	while ((bool)atomic_get(&flag)) {                                                          \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define TAKE_FLAG(flag)                                                                            \
-	while (!(bool)atomic_cas(&flag, true, false)) {                                            \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-
-#define ASSERT(expr, ...)                                                                          \
-	do {                                                                                       \
-		if (!(expr)) {                                                                     \
-			FAIL(__VA_ARGS__);                                                         \
-		}                                                                                  \
-	} while (0)
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-#define TEST_TIMEOUT_SIMULATED BS_SECONDS(100)
-#define HVX_HANDLE 0x0012
-#define DUT_DEVICE_NBR 0
-
-/* Run for more than ATT_TIMEOUT */
-#define PROCEDURE_1_TIMEOUT_MS (1000 * 70)
diff --git a/tests/bsim/bluetooth/host/att/pipeline/dut/CMakeLists.txt b/tests/bsim/bluetooth/host/att/pipeline/dut/CMakeLists.txt
index 2fa98735680..20d7105045e 100644
--- a/tests/bsim/bluetooth/host/att/pipeline/dut/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/att/pipeline/dut/CMakeLists.txt
@@ -5,6 +5,7 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_pipeline_dut)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
 add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/common/testlib testlib)
 
 target_sources(app PRIVATE
@@ -12,9 +13,12 @@ target_sources(app PRIVATE
 )
 
 zephyr_include_directories(
-  ../common/
   ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
   ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
 )
 
-target_link_libraries(app PRIVATE testlib)
+target_link_libraries(app
+PRIVATE
+  testlib
+  babblekit
+)
diff --git a/tests/bsim/bluetooth/host/att/pipeline/dut/src/main.c b/tests/bsim/bluetooth/host/att/pipeline/dut/src/main.c
index a380ff615e2..46b4722ec65 100644
--- a/tests/bsim/bluetooth/host/att/pipeline/dut/src/main.c
+++ b/tests/bsim/bluetooth/host/att/pipeline/dut/src/main.c
@@ -18,20 +18,18 @@
 
 #include "testlib/att_read.h"
 
-#include <argparse.h>		/* For get_device_nbr() */
-#include "utils.h"
-#include "bstests.h"
-
-#define strucc struct
+#include "bsim_args_runner.h"
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main, LOG_LEVEL_INF);
 
-DEFINE_FLAG(is_connected);
-DEFINE_FLAG(is_subscribed);
-DEFINE_FLAG(one_indication);
-DEFINE_FLAG(two_notifications);
-DEFINE_FLAG(flag_data_length_updated);
+/* Run for more than ATT_TIMEOUT */
+#define PROCEDURE_1_TIMEOUT_MS (1000 * 70)
+
+DEFINE_FLAG_STATIC(is_connected);
+DEFINE_FLAG_STATIC(flag_data_length_updated);
 
 static struct bt_conn *dconn;
 
@@ -45,7 +43,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (conn_err) {
-		FAIL("Failed to connect to %s (%u)", addr, conn_err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, conn_err);
 		return;
 	}
 
@@ -85,7 +83,7 @@ static void do_dlu(struct bt_conn *conn)
 
 	LOG_INF("update DL");
 	err = bt_conn_le_data_len_update(conn, &param);
-	ASSERT(err == 0, "Can't update data length (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Can't update data length (err %d)", err);
 
 	WAIT_FOR_FLAG(flag_data_length_updated);
 }
@@ -106,7 +104,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 
 	err = bt_le_scan_stop();
 	if (err) {
-		FAIL("Stop LE scan failed (err %d)", err);
+		TEST_FAIL("Stop LE scan failed (err %d)", err);
 		return;
 	}
 
@@ -116,12 +114,12 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 	param = BT_LE_CONN_PARAM_DEFAULT;
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, param, &conn);
 	if (err) {
-		FAIL("Create conn failed (err %d)", err);
+		TEST_FAIL("Create conn failed (err %d)", err);
 		return;
 	}
 }
 
-static strucc bt_conn *connecc(void)
+static struct bt_conn *connecc(void)
 {
 	int err;
 	struct bt_conn *conn;
@@ -129,12 +127,12 @@ static strucc bt_conn *connecc(void)
 	UNSET_FLAG(is_connected);
 
 	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, NULL, 0, NULL, 0);
-	ASSERT(!err, "Adving failed to start (err %d)\n", err);
+	TEST_ASSERT(!err, "Adving failed to start (err %d)", err);
 
 	LOG_DBG(" wait connecc...");
 
 	WAIT_FOR_FLAG(is_connected);
-	LOG_INF("conecd");
+	LOG_INF("Connected");
 
 	conn = dconn;
 	dconn = NULL;
@@ -150,7 +148,7 @@ static struct bt_conn *connect(void)
 	UNSET_FLAG(is_connected);
 
 	err = bt_le_scan_start(BT_LE_SCAN_ACTIVE_CONTINUOUS, device_found);
-	ASSERT(!err, "Scanning failed to start (err %d)\n", err);
+	TEST_ASSERT(!err, "Scanning failed to start (err %d)", err);
 
 	LOG_DBG("Central initiating connection...");
 	WAIT_FOR_FLAG(is_connected);
@@ -220,7 +218,7 @@ static void send_write_handle(struct bt_conn *conn)
 	sys_put_le16(handle, data);
 
 	err = bt_gatt_notify(conn, attr, data, sizeof(data));
-	ASSERT(!err, "Failed to transmit handle for write (err %d)\n", err);
+	TEST_ASSERT(!err, "Failed to transmit handle for write (err %d)", err);
 }
 
 static void gatt_read(struct bt_conn *conn, uint16_t handle)
@@ -232,11 +230,11 @@ static void gatt_read(struct bt_conn *conn, uint16_t handle)
 	NET_BUF_SIMPLE_DEFINE(buf, BT_ATT_MAX_ATTRIBUTE_LEN);
 
 	err = bt_testlib_att_read_by_handle_sync(&buf, NULL, NULL, conn, 0, handle, 0);
-	ASSERT(!err, "Failed read: err %d", err);
+	TEST_ASSERT(!err, "Failed read: err %d", err);
 
 	value = net_buf_simple_pull_le16(&buf);
 
-	ASSERT(prev_val == value, "Something's up: expected %d got %d", prev_val, value);
+	TEST_ASSERT(prev_val == value, "Something's up: expected %d got %d", prev_val, value);
 	prev_val++;
 
 	LOG_INF("Read by handle: handle %x val %d err %d", handle, value, err);
@@ -251,14 +249,14 @@ static void find_the_chrc(struct bt_conn *conn, const struct bt_uuid *svc,
 	int err;
 
 	err = bt_testlib_gatt_discover_primary(&svc_handle, &svc_end_handle, conn, svc, 1, 0xffff);
-	ASSERT(!err, "Failed to discover service %d");
+	TEST_ASSERT(!err, "Failed to discover service %d");
 
 	LOG_DBG("svc_handle: %u, svc_end_handle: %u", svc_handle, svc_end_handle);
 
 	err = bt_testlib_gatt_discover_characteristic(chrc_value_handle, &chrc_end_handle,
 						      NULL, conn, chrc, (svc_handle + 1),
 						      svc_end_handle);
-	ASSERT(!err, "Failed to get value handle %d");
+	TEST_ASSERT(!err, "Failed to get value handle %d");
 
 	LOG_DBG("chrc_value_handle: %u, chrc_end_handle: %u", *chrc_value_handle, chrc_end_handle);
 }
@@ -271,7 +269,7 @@ void good_peer_procedure(void)
 	struct bt_conn *conn;
 
 	err = bt_enable(NULL);
-	ASSERT(err == 0, "Can't enable Bluetooth (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Can't enable Bluetooth (err %d)", err);
 	LOG_DBG("Central: Bluetooth initialized.");
 
 	conn = connecc();
@@ -285,7 +283,7 @@ void good_peer_procedure(void)
 		gatt_read(conn, handle);
 	}
 
-	PASS("Good peer done\n");
+	TEST_PASS("Good peer done");
 }
 
 void dut_procedure(void)
@@ -296,7 +294,7 @@ void dut_procedure(void)
 	struct bt_conn *good, *bad;
 
 	err = bt_enable(NULL);
-	ASSERT(err == 0, "Can't enable Bluetooth (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Can't enable Bluetooth (err %d)", err);
 	LOG_DBG("Central: Bluetooth initialized.");
 
 	LOG_DBG("Central: Connect to good peer");
@@ -311,7 +309,7 @@ void dut_procedure(void)
 	send_write_handle(bad);
 
 	/* Pass unless some assert in callbacks fails. */
-	PASS("DUT done\n");
+	TEST_PASS("DUT done");
 }
 
 void test_procedure_0(void)
@@ -346,7 +344,7 @@ void test_procedure_0(void)
 	 * - no buffer allocation failures for responding to the good peer,
 	 * timeouts or stalls.
 	 */
-	bool dut = (get_device_nbr() == DUT_DEVICE_NBR);
+	bool dut = (bsim_args_get_global_device_nbr() == 0);
 
 	/* We use the same image for both to lighten build load. */
 	if (dut) {
@@ -376,7 +374,7 @@ static void gatt_write(struct bt_conn *conn, struct bt_gatt_write_params *params
 	LOG_INF("Queue GATT write");
 
 	err = bt_gatt_write(conn, params);
-	ASSERT(!err, "Failed write: err %d", err);
+	TEST_ASSERT(!err, "Failed write: err %d", err);
 }
 
 void test_procedure_1(void)
@@ -398,7 +396,7 @@ void test_procedure_1(void)
 	int err;
 
 	err = bt_enable(NULL);
-	ASSERT(err == 0, "Can't enable Bluetooth (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Can't enable Bluetooth (err %d)", err);
 	LOG_DBG("Central: Bluetooth initialized.");
 
 	struct bt_conn *tester = connect();
@@ -415,35 +413,16 @@ void test_procedure_1(void)
 	bt_conn_unref(tester);
 
 	/* Pass unless some assert in callbacks fails. */
-	PASS("DUT done\n");
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
+	TEST_PASS("DUT done");
 }
 
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "dut",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_procedure_0,
 	},
 	{
 		.test_id = "dut_1",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_procedure_1,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/att/pipeline/tester/CMakeLists.txt b/tests/bsim/bluetooth/host/att/pipeline/tester/CMakeLists.txt
index 440ae5e49c0..fb32c26de70 100644
--- a/tests/bsim/bluetooth/host/att/pipeline/tester/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/att/pipeline/tester/CMakeLists.txt
@@ -5,12 +5,14 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_pipeline_tester)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
   src/main.c
 )
 
 zephyr_include_directories(
-  ../common/
   ${ZEPHYR_BASE}/subsys/bluetooth/common/
   ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
   ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
diff --git a/tests/bsim/bluetooth/host/att/pipeline/tester/src/main.c b/tests/bsim/bluetooth/host/att/pipeline/tester/src/main.c
index dcc20abcfbd..3f49e7e43cd 100644
--- a/tests/bsim/bluetooth/host/att/pipeline/tester/src/main.c
+++ b/tests/bsim/bluetooth/host/att/pipeline/tester/src/main.c
@@ -21,8 +21,8 @@
 #include "host/conn_internal.h"
 #include "host/l2cap_internal.h"
 
-#include "utils.h"
-#include "bstests.h"
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_tinyhost, LOG_LEVEL_INF);
@@ -38,12 +38,14 @@ LOG_MODULE_REGISTER(bt_tinyhost, LOG_LEVEL_INF);
 #define BT_L2CAP_CID_ATT    0x0004
 #define LAST_SUPPORTED_ATT_OPCODE 0x20
 
-DEFINE_FLAG(is_connected);
-DEFINE_FLAG(flag_data_length_updated);
-DEFINE_FLAG(flag_handle);
-DEFINE_FLAG(flag_notified);
-DEFINE_FLAG(flag_write_ack);
-DEFINE_FLAG(flag_req_in_progress);
+/* Run for more than ATT_TIMEOUT */
+#define PROCEDURE_1_TIMEOUT_MS (1000 * 70)
+
+DEFINE_FLAG_STATIC(is_connected);
+DEFINE_FLAG_STATIC(flag_data_length_updated);
+DEFINE_FLAG_STATIC(flag_handle);
+DEFINE_FLAG_STATIC(flag_write_ack);
+DEFINE_FLAG_STATIC(flag_req_in_progress);
 
 static uint16_t server_write_handle;
 
@@ -71,7 +73,7 @@ struct net_buf *bt_hci_cmd_create(uint16_t opcode, uint8_t param_len)
 	LOG_DBG("opcode 0x%04x param_len %u", opcode, param_len);
 
 	buf = net_buf_alloc(&hci_cmd_pool, K_FOREVER);
-	ASSERT(buf, "failed allocation");
+	TEST_ASSERT(buf, "failed allocation");
 
 	LOG_DBG("buf %p", buf);
 
@@ -114,14 +116,14 @@ static void handle_cmd_complete(struct net_buf *buf)
 		opcode = sys_le16_to_cpu(evt->opcode);
 
 	} else {
-		FAIL("unhandled event 0x%x", hdr->evt);
+		TEST_FAIL("unhandled event 0x%x", hdr->evt);
 	}
 
 	LOG_DBG("opcode 0x%04x status %x", opcode, status);
 
-	ASSERT(status == 0x00, "cmd status: %x", status);
+	TEST_ASSERT(status == 0x00, "cmd status: %x", status);
 
-	ASSERT(active_opcode == opcode, "unexpected opcode %x != %x", active_opcode, opcode);
+	TEST_ASSERT(active_opcode == opcode, "unexpected opcode %x != %x", active_opcode, opcode);
 
 	if (active_opcode) {
 		active_opcode = 0xFFFF;
@@ -208,8 +210,8 @@ static void handle_att_write_0(struct net_buf *buf)
 	LOG_INF("Got write for 0x%04x len %d", handle, buf->len);
 	LOG_HEXDUMP_DBG(buf->data, buf->len, "payload");
 
-	ASSERT(!TEST_FLAG(flag_req_in_progress),
-	       "Peer is pipelining REQs. This inSIGdent will be reported.\n");
+	TEST_ASSERT(!IS_FLAG_SET(flag_req_in_progress),
+	       "Peer is pipelining REQs. This inSIGdent will be reported.");
 
 	SET_FLAG(flag_req_in_progress);
 	send_write_rsp();
@@ -222,8 +224,8 @@ static void handle_att_write_1(struct net_buf *buf)
 	LOG_INF("Got write for 0x%04x len %d", handle, buf->len);
 	LOG_HEXDUMP_DBG(buf->data, buf->len, "payload");
 
-	ASSERT(!TEST_FLAG(flag_req_in_progress),
-	       "Peer is pipelining REQs. This inSIGdent will be reported.\n");
+	TEST_ASSERT(!IS_FLAG_SET(flag_req_in_progress),
+	       "Peer is pipelining REQs. This inSIGdent will be reported.");
 
 	SET_FLAG(flag_req_in_progress);
 
@@ -253,7 +255,7 @@ static void handle_att(struct net_buf *buf)
 		return;
 	default:
 		LOG_HEXDUMP_ERR(buf->data, buf->len, "payload");
-		FAIL("unhandled opcode %x\n", op);
+		TEST_FAIL("unhandled opcode %x", op);
 		return;
 	}
 }
@@ -270,10 +272,9 @@ static void handle_l2cap(struct net_buf *buf)
 	LOG_HEXDUMP_DBG(buf->data, buf->len, "l2cap");
 
 	/* Make sure we don't have to recombine packets */
-	ASSERT(buf->len == hdr->len, "buflen = %d != hdrlen %d",
-	       buf->len, hdr->len);
+	TEST_ASSERT(buf->len == hdr->len, "buflen = %d != hdrlen %d", buf->len, hdr->len);
 
-	ASSERT(cid == BT_L2CAP_CID_ATT, "We only support (U)ATT");
+	TEST_ASSERT(cid == BT_L2CAP_CID_ATT, "We only support (U)ATT");
 
 	/* (U)ATT PDU */
 	handle_att(buf);
@@ -292,8 +293,7 @@ static void handle_acl(struct net_buf *buf)
 	flags = bt_acl_flags(handle);
 	handle = bt_acl_handle(handle);
 
-	ASSERT(flags == BT_ACL_START,
-	       "Fragmentation not supported");
+	TEST_ASSERT(flags == BT_ACL_START, "Fragmentation not supported");
 
 	LOG_DBG("ACL: conn %d len %d flags %d", handle, len, flags);
 	LOG_HEXDUMP_DBG(buf->data, buf->len, "HCI ACL");
@@ -353,7 +353,7 @@ static void send_cmd(uint16_t opcode, struct net_buf *cmd, struct net_buf **rsp)
 	}
 
 	k_sem_take(&cmd_sem, K_FOREVER);
-	ASSERT(active_opcode == 0xFFFF, "");
+	TEST_ASSERT_NO_MSG(active_opcode == 0xFFFF);
 
 	active_opcode = opcode;
 
@@ -422,7 +422,7 @@ static void write_default_data_len(uint16_t tx_octets, uint16_t tx_time)
 	struct bt_hci_cp_le_write_default_data_len *cp;
 	struct net_buf *buf = bt_hci_cmd_create(BT_HCI_OP_LE_WRITE_DEFAULT_DATA_LEN, sizeof(*cp));
 
-	ASSERT(buf, "");
+	TEST_ASSERT_NO_MSG(buf);
 
 	cp = net_buf_add(buf, sizeof(*cp));
 	cp->max_tx_octets = sys_cpu_to_le16(tx_octets);
@@ -447,7 +447,7 @@ static void set_event_mask(uint16_t opcode)
 
 	/* The two commands have the same length/params */
 	buf = bt_hci_cmd_create(opcode, sizeof(*cp_mask));
-	ASSERT(buf, "");
+	TEST_ASSERT_NO_MSG(buf);
 
 	/* Forward all events */
 	cp_mask = net_buf_add(buf, sizeof(*cp_mask));
@@ -465,7 +465,7 @@ static void set_random_address(void)
 	LOG_DBG("%s", bt_addr_str(&addr.a));
 
 	buf = bt_hci_cmd_create(BT_HCI_OP_LE_SET_RANDOM_ADDRESS, sizeof(addr.a));
-	ASSERT(buf, "");
+	TEST_ASSERT_NO_MSG(buf);
 
 	net_buf_add_mem(buf, &addr.a, sizeof(addr.a));
 	send_cmd(BT_HCI_OP_LE_SET_RANDOM_ADDRESS, buf, NULL);
@@ -505,7 +505,7 @@ struct net_buf *alloc_l2cap_pdu(void)
 	uint16_t reserve;
 
 	buf = net_buf_alloc(&acl_tx_pool, K_FOREVER);
-	ASSERT(buf, "failed ACL allocation");
+	TEST_ASSERT(buf, "failed ACL allocation");
 
 	reserve = sizeof(struct bt_l2cap_hdr);
 	reserve += sizeof(struct bt_hci_acl_hdr) + BT_BUF_RESERVE;
@@ -540,8 +540,7 @@ static void send_l2cap_packet(struct net_buf *buf, uint16_t cid)
 	hdr->cid = sys_cpu_to_le16(cid);
 
 	/* Always entire packets, no HCI fragmentation */
-	ASSERT(buf->len <= CONFIG_BT_BUF_ACL_TX_SIZE,
-	       "Fragmentation not supported");
+	TEST_ASSERT(buf->len <= CONFIG_BT_BUF_ACL_TX_SIZE, "Fragmentation not supported");
 
 	send_acl(buf);
 }
@@ -626,7 +625,7 @@ void test_procedure_0(void)
 	/* Verify we get at least one write */
 	WAIT_FOR_FLAG(flag_write_ack);
 
-	PASS("Tester done\n");
+	TEST_PASS("Tester done");
 }
 
 void test_procedure_1(void)
@@ -649,43 +648,24 @@ void test_procedure_1(void)
 	/* In this testcase, DUT is the aggressor.
 	 * Tester verifies no spec violation happens.
 	 */
-	while (TEST_FLAG(is_connected)) {
+	while (IS_FLAG_SET(is_connected)) {
 		/* Should be enough to allow DUT's app to batch a few requests. */
 		k_msleep(1000);
-		if (TEST_FLAG(flag_req_in_progress)) {
+		if (IS_FLAG_SET(flag_req_in_progress)) {
 			send_write_rsp();
 		}
 	}
 
-	PASS("Tester done\n");
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
+	TEST_PASS("Tester done");
 }
 
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "tester",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_procedure_0,
 	},
 	{
 		.test_id = "tester_1",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_procedure_1,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/att/read_fill_buf/bs_macro.h b/tests/bsim/bluetooth/host/att/read_fill_buf/bs_macro.h
deleted file mode 100644
index abe3e07e674..00000000000
--- a/tests/bsim/bluetooth/host/att/read_fill_buf/bs_macro.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Copyright (c) 2023 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <bs_tracing.h>
-#include <bstests.h>
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		extern enum bst_result_t bst_result;                                               \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
diff --git a/tests/bsim/bluetooth/host/att/read_fill_buf/bs_main.c b/tests/bsim/bluetooth/host/att/read_fill_buf/bs_main.c
deleted file mode 100644
index dc12c3fa576..00000000000
--- a/tests/bsim/bluetooth/host/att/read_fill_buf/bs_main.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright (c) 2023 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <bs_tracing.h>
-#include <bs_types.h>
-#include <bstests.h>
-
-#define BS_SECONDS(dur_sec)    ((bs_time_t)dur_sec * 1000000)
-#define SIMULATED_TEST_TIMEOUT BS_SECONDS(60)
-
-void the_test(void);
-extern enum bst_result_t bst_result;
-
-void test_init(void)
-{
-	bst_result = In_progress;
-	bst_ticker_set_next_tick_absolute(SIMULATED_TEST_TIMEOUT);
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result == In_progress) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended. Consider increasing "
-			       "simulation length.\n");
-	}
-}
-
-static const struct bst_test_instance test_to_add[] = {
-	{
-		.test_id = "the_test",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
-		.test_main_f = the_test,
-	},
-	BSTEST_END_MARKER,
-};
-
-static struct bst_test_list *install(struct bst_test_list *tests)
-{
-	return bst_add_tests(tests, test_to_add);
-};
-
-bst_test_install_t test_installers[] = {install, NULL};
-
-int main(void)
-{
-	bst_main();
-
-	return 0;
-}
diff --git a/tests/bsim/bluetooth/host/att/read_fill_buf/client/CMakeLists.txt b/tests/bsim/bluetooth/host/att/read_fill_buf/client/CMakeLists.txt
index a384dcbed86..dabb2daff7f 100644
--- a/tests/bsim/bluetooth/host/att/read_fill_buf/client/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/att/read_fill_buf/client/CMakeLists.txt
@@ -6,7 +6,6 @@ find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
 project(app)
 
 target_sources(app PRIVATE
-  ../bs_main.c
   main.c
 )
 
@@ -15,5 +14,10 @@ zephyr_include_directories(
   ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
 )
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
 add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/common/testlib testlib)
-target_link_libraries(app PRIVATE testlib)
+target_link_libraries(app
+  PRIVATE
+    babblekit
+    testlib
+)
diff --git a/tests/bsim/bluetooth/host/att/read_fill_buf/client/main.c b/tests/bsim/bluetooth/host/att/read_fill_buf/client/main.c
index 159ce5cb27d..5e77c7c8993 100644
--- a/tests/bsim/bluetooth/host/att/read_fill_buf/client/main.c
+++ b/tests/bsim/bluetooth/host/att/read_fill_buf/client/main.c
@@ -15,7 +15,7 @@
 #include <testlib/scan.h>
 #include <testlib/security.h>
 
-#include "../bs_macro.h"
+#include "babblekit/testcase.h"
 #include "../common_defs.h"
 
 LOG_MODULE_REGISTER(client, LOG_LEVEL_DBG);
@@ -69,7 +69,7 @@ void test_long_read(struct bt_conn *conn, enum bt_att_chan_opt bearer)
 	}
 }
 
-void the_test(void)
+static void test_cli_main(void)
 {
 	bt_addr_le_t scan_result;
 	int err;
@@ -103,5 +103,27 @@ void the_test(void)
 	bt_conn_unref(conn);
 	conn = NULL;
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
+}
+
+static const struct bst_test_instance test_def[] = {
+	{
+		.test_id = "cli",
+		.test_main_f = test_cli_main,
+	},
+	BSTEST_END_MARKER,
+};
+
+static struct bst_test_list *install(struct bst_test_list *tests)
+{
+	return bst_add_tests(tests, test_def);
+};
+
+bst_test_install_t test_installers[] = {install, NULL};
+
+int main(void)
+{
+	bst_main();
+
+	return 0;
 }
diff --git a/tests/bsim/bluetooth/host/att/read_fill_buf/server/CMakeLists.txt b/tests/bsim/bluetooth/host/att/read_fill_buf/server/CMakeLists.txt
index a384dcbed86..dabb2daff7f 100644
--- a/tests/bsim/bluetooth/host/att/read_fill_buf/server/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/att/read_fill_buf/server/CMakeLists.txt
@@ -6,7 +6,6 @@ find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
 project(app)
 
 target_sources(app PRIVATE
-  ../bs_main.c
   main.c
 )
 
@@ -15,5 +14,10 @@ zephyr_include_directories(
   ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
 )
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
 add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/common/testlib testlib)
-target_link_libraries(app PRIVATE testlib)
+target_link_libraries(app
+  PRIVATE
+    babblekit
+    testlib
+)
diff --git a/tests/bsim/bluetooth/host/att/read_fill_buf/server/main.c b/tests/bsim/bluetooth/host/att/read_fill_buf/server/main.c
index 244eb6e7a66..0ca266257db 100644
--- a/tests/bsim/bluetooth/host/att/read_fill_buf/server/main.c
+++ b/tests/bsim/bluetooth/host/att/read_fill_buf/server/main.c
@@ -10,7 +10,7 @@
 
 #include <testlib/adv.h>
 
-#include "../bs_macro.h"
+#include "babblekit/testcase.h"
 #include "../common_defs.h"
 
 LOG_MODULE_REGISTER(server, LOG_LEVEL_DBG);
@@ -34,7 +34,7 @@ BT_GATT_SERVICE_DEFINE(long_attr_svc, BT_GATT_PRIMARY_SERVICE(MTU_VALIDATION_SVC
 					      BT_GATT_PERM_READ, read_mtu_validation_chrc, NULL,
 					      NULL));
 
-void the_test(void)
+static void test_srv_main(void)
 {
 	int err;
 
@@ -48,5 +48,27 @@ void the_test(void)
 	err = bt_testlib_adv_conn(NULL, BT_ID_DEFAULT, bt_get_name());
 	__ASSERT_NO_MSG(!err);
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
+}
+
+static const struct bst_test_instance test_def[] = {
+	{
+		.test_id = "srv",
+		.test_main_f = test_srv_main,
+	},
+	BSTEST_END_MARKER,
+};
+
+static struct bst_test_list *install(struct bst_test_list *tests)
+{
+	return bst_add_tests(tests, test_def);
+};
+
+bst_test_install_t test_installers[] = {install, NULL};
+
+int main(void)
+{
+	bst_main();
+
+	return 0;
 }
diff --git a/tests/bsim/bluetooth/host/att/read_fill_buf/test_scripts/run_tests.sh b/tests/bsim/bluetooth/host/att/read_fill_buf/test_scripts/run_tests.sh
index 2c51d5ff3f5..a35e1f0d2ad 100755
--- a/tests/bsim/bluetooth/host/att/read_fill_buf/test_scripts/run_tests.sh
+++ b/tests/bsim/bluetooth/host/att/read_fill_buf/test_scripts/run_tests.sh
@@ -8,17 +8,17 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
 
 verbosity_level=2
 simulation_id="read_fill_buf"
-test_exe_d0="${BSIM_OUT_PATH}/bin/bs_${BOARD_TS}_$(guess_test_long_name)_client_prj_conf"
-test_exe_d1="${BSIM_OUT_PATH}/bin/bs_${BOARD_TS}_$(guess_test_long_name)_server_prj_conf"
+test_exe_d0="./bs_${BOARD_TS}_$(guess_test_long_name)_client_prj_conf"
+test_exe_d1="./bs_${BOARD_TS}_$(guess_test_long_name)_server_prj_conf"
 
 cd ${BSIM_OUT_PATH}/bin
 
 Execute "$test_exe_d0" \
-    -v=${verbosity_level} -s="${simulation_id}" -d=0 -testid=the_test \
+    -v=${verbosity_level} -s="${simulation_id}" -d=0 -testid=cli \
     -RealEncryption=1
 
 Execute "$test_exe_d1" \
-    -v=${verbosity_level} -s="${simulation_id}" -d=1 -testid=the_test \
+    -v=${verbosity_level} -s="${simulation_id}" -d=1 -testid=srv \
     -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s="${simulation_id}" \
diff --git a/tests/bsim/bluetooth/host/att/retry_on_sec_err/client/CMakeLists.txt b/tests/bsim/bluetooth/host/att/retry_on_sec_err/client/CMakeLists.txt
index b244078e761..9a2c1c1f4ee 100644
--- a/tests/bsim/bluetooth/host/att/retry_on_sec_err/client/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/att/retry_on_sec_err/client/CMakeLists.txt
@@ -5,10 +5,10 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
 project(app)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
 add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/common/testlib testlib)
 
 target_sources(app PRIVATE
-  ../test_utils.c
   main.c
 )
 
@@ -19,4 +19,5 @@ zephyr_include_directories(
 
 target_link_libraries(app PRIVATE
   testlib
+  babblekit
 )
diff --git a/tests/bsim/bluetooth/host/att/retry_on_sec_err/client/main.c b/tests/bsim/bluetooth/host/att/retry_on_sec_err/client/main.c
index e48473fb4be..870f9642b4d 100644
--- a/tests/bsim/bluetooth/host/att/retry_on_sec_err/client/main.c
+++ b/tests/bsim/bluetooth/host/att/retry_on_sec_err/client/main.c
@@ -11,15 +11,17 @@
 #include <zephyr/logging/log.h>
 
 #include "../common_defs.h"
-#include "../test_utils.h"
 
 #include <testlib/conn.h>
 #include "testlib/scan.h"
 #include "testlib/security.h"
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+
 LOG_MODULE_REGISTER(client, LOG_LEVEL_DBG);
 
-DEFINE_FLAG(flag_attr_read_success);
+DEFINE_FLAG_STATIC(flag_attr_read_success);
 
 static uint8_t gatt_attr_read_cb(struct bt_conn *conn, uint8_t att_err,
 				 struct bt_gatt_read_params *params, const void *data, uint16_t len)
@@ -96,7 +98,7 @@ static void test_client(void)
 	bt_conn_unref(conn);
 	conn = NULL;
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
 
 DEFINE_FLAG(flag_pairing_in_progress);
@@ -158,20 +160,16 @@ static void test_client_security_request(void)
 	bt_conn_unref(conn);
 	conn = NULL;
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
 
 static const struct bst_test_instance client_tests[] = {
 	{
 		.test_id = "test_client",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_client,
 	},
 	{
 		.test_id = "test_client_security_request",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_client_security_request,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/att/retry_on_sec_err/server/CMakeLists.txt b/tests/bsim/bluetooth/host/att/retry_on_sec_err/server/CMakeLists.txt
index b244078e761..9a2c1c1f4ee 100644
--- a/tests/bsim/bluetooth/host/att/retry_on_sec_err/server/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/att/retry_on_sec_err/server/CMakeLists.txt
@@ -5,10 +5,10 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
 project(app)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
 add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/common/testlib testlib)
 
 target_sources(app PRIVATE
-  ../test_utils.c
   main.c
 )
 
@@ -19,4 +19,5 @@ zephyr_include_directories(
 
 target_link_libraries(app PRIVATE
   testlib
+  babblekit
 )
diff --git a/tests/bsim/bluetooth/host/att/retry_on_sec_err/server/main.c b/tests/bsim/bluetooth/host/att/retry_on_sec_err/server/main.c
index b2abffdc4e6..3f3150c2cb2 100644
--- a/tests/bsim/bluetooth/host/att/retry_on_sec_err/server/main.c
+++ b/tests/bsim/bluetooth/host/att/retry_on_sec_err/server/main.c
@@ -12,8 +12,10 @@
 #include "testlib/adv.h"
 #include "testlib/security.h"
 
+#include "babblekit/testcase.h"
+
 #include "../common_defs.h"
-#include "../test_utils.h"
+
 
 LOG_MODULE_REGISTER(server, LOG_LEVEL_DBG);
 
@@ -47,7 +49,7 @@ static void test_server(void)
 {
 	test_common(NULL);
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
 
 static void test_server_security_request(void)
@@ -60,20 +62,16 @@ static void test_server_security_request(void)
 	err = bt_testlib_secure(conn, BT_SECURITY_L2);
 	__ASSERT(!err, "err %d", err);
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
 
 static const struct bst_test_instance server_tests[] = {
 	{
 		.test_id = "test_server",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_server,
 	},
 	{
 		.test_id = "test_server_security_request",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_server_security_request,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/att/retry_on_sec_err/test_utils.c b/tests/bsim/bluetooth/host/att/retry_on_sec_err/test_utils.c
deleted file mode 100644
index cacb0fa9e53..00000000000
--- a/tests/bsim/bluetooth/host/att/retry_on_sec_err/test_utils.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright (c) 2023 Codecoup
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "test_utils.h"
-
-void test_init(void)
-{
-	bst_result = In_progress;
-	bst_ticker_set_next_tick_absolute(SIMULATED_TEST_TIMEOUT);
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result == In_progress) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended. Consider increasing "
-			       "simulation length.\n");
-	}
-}
diff --git a/tests/bsim/bluetooth/host/att/retry_on_sec_err/test_utils.h b/tests/bsim/bluetooth/host/att/retry_on_sec_err/test_utils.h
deleted file mode 100644
index 0d5113f00f6..00000000000
--- a/tests/bsim/bluetooth/host/att/retry_on_sec_err/test_utils.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (c) 2023 Codecoup
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <bs_tracing.h>
-#include <bstests.h>
-
-#define DECLARE_FLAG(flag) extern atomic_t flag
-#define DEFINE_FLAG(flag)  atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)     (void)atomic_set(&flag, (atomic_t) true)
-#define UNSET_FLAG(flag)   (void)atomic_set(&flag, (atomic_t) false)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-#define BS_SECONDS(dur_sec)    ((bs_time_t)dur_sec * 1000000)
-#define SIMULATED_TEST_TIMEOUT BS_SECONDS(60)
-
-extern enum bst_result_t bst_result;
-
-void test_init(void);
-void test_tick(bs_time_t HW_device_time);
diff --git a/tests/bsim/bluetooth/host/att/sequential/common/common_defs.h b/tests/bsim/bluetooth/host/att/sequential/common/common_defs.h
new file mode 100644
index 00000000000..122d2f7830b
--- /dev/null
+++ b/tests/bsim/bluetooth/host/att/sequential/common/common_defs.h
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define HVX_HANDLE 0x0012
+#define INDICATION_PAYLOAD "indication"
+#define NOTIFICATION_PAYLOAD "notification"
diff --git a/tests/bsim/bluetooth/host/att/sequential/common/utils.h b/tests/bsim/bluetooth/host/att/sequential/common/utils.h
deleted file mode 100644
index b4892d5a087..00000000000
--- a/tests/bsim/bluetooth/host/att/sequential/common/utils.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "bs_tracing.h"
-#include "bs_types.h"
-#include "bstests.h"
-
-#define BS_SECONDS(dur_sec)    ((bs_time_t)dur_sec * USEC_PER_SEC)
-#define TEST_TIMEOUT_SIMULATED BS_SECONDS(10)
-
-extern enum bst_result_t bst_result;
-
-#define DECLARE_FLAG(flag) extern atomic_t flag
-#define DEFINE_FLAG(flag)  atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)     (void)atomic_set(&flag, (atomic_t) true)
-#define UNSET_FLAG(flag)   (void)atomic_set(&flag, (atomic_t) false)
-
-#define WAIT_FOR_VAL(var, val)                                                                    \
-	while (atomic_get(&var) != val) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)                                                                  \
-	while ((bool)atomic_get(&flag)) {                                                          \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define TAKE_FLAG(flag)                                                                            \
-	while (!(bool)atomic_cas(&flag, true, false)) {                                            \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-
-#define ASSERT(expr, ...)                                                                          \
-	do {                                                                                       \
-		if (!(expr)) {                                                                     \
-			FAIL(__VA_ARGS__);                                                         \
-		}                                                                                  \
-	} while (0)
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-#define HVX_HANDLE 0x0012
-#define INDICATION_PAYLOAD "indication"
-#define NOTIFICATION_PAYLOAD "notification"
diff --git a/tests/bsim/bluetooth/host/att/sequential/dut/CMakeLists.txt b/tests/bsim/bluetooth/host/att/sequential/dut/CMakeLists.txt
index b6c34df4916..89ebab87ef3 100644
--- a/tests/bsim/bluetooth/host/att/sequential/dut/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/att/sequential/dut/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_sequential_dut)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
   src/main.c
 )
diff --git a/tests/bsim/bluetooth/host/att/sequential/dut/src/main.c b/tests/bsim/bluetooth/host/att/sequential/dut/src/main.c
index 3796c83db3c..a110689d131 100644
--- a/tests/bsim/bluetooth/host/att/sequential/dut/src/main.c
+++ b/tests/bsim/bluetooth/host/att/sequential/dut/src/main.c
@@ -16,17 +16,17 @@
 #include <zephyr/bluetooth/uuid.h>
 #include <zephyr/bluetooth/conn.h>
 
-#include "utils.h"
-#include "bstests.h"
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+
+#include "common_defs.h"
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dut, LOG_LEVEL_INF);
 
-DEFINE_FLAG(is_connected);
-DEFINE_FLAG(is_subscribed);
-DEFINE_FLAG(one_indication);
-DEFINE_FLAG(two_notifications);
-DEFINE_FLAG(flag_data_length_updated);
+DEFINE_FLAG_STATIC(is_connected);
+DEFINE_FLAG_STATIC(is_subscribed);
+DEFINE_FLAG_STATIC(flag_data_length_updated);
 
 static atomic_t nwrites;
 static atomic_t indications;
@@ -44,7 +44,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (conn_err) {
-		FAIL("Failed to connect to %s (%u)", addr, conn_err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, conn_err);
 		return;
 	}
 
@@ -84,7 +84,7 @@ static void do_dlu(void)
 	param.tx_max_time = 2500;
 
 	err = bt_conn_le_data_len_update(dconn, &param);
-	ASSERT(err == 0, "Can't update data length (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Can't update data length (err %d)", err);
 
 	WAIT_FOR_FLAG(flag_data_length_updated);
 }
@@ -105,7 +105,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 
 	err = bt_le_scan_stop();
 	if (err) {
-		FAIL("Stop LE scan failed (err %d)", err);
+		TEST_FAIL("Stop LE scan failed (err %d)", err);
 		return;
 	}
 
@@ -115,7 +115,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 	param = BT_LE_CONN_PARAM_DEFAULT;
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, param, &conn);
 	if (err) {
-		FAIL("Create conn failed (err %d)", err);
+		TEST_FAIL("Create conn failed (err %d)", err);
 		return;
 	}
 }
@@ -133,7 +133,7 @@ static void connect(void)
 	UNSET_FLAG(is_connected);
 
 	err = bt_le_scan_start(&scan_param, device_found);
-	ASSERT(!err, "Scanning failed to start (err %d)\n", err);
+	TEST_ASSERT(!err, "Scanning failed to start (err %d)", err);
 
 	LOG_DBG("Central initiating connection...");
 	WAIT_FOR_FLAG(is_connected);
@@ -187,8 +187,8 @@ static uint8_t notified(struct bt_conn *conn, struct bt_gatt_subscribe_params *p
 	static uint8_t indication[] = INDICATION_PAYLOAD;
 	bool is_nfy;
 
-	ASSERT(length >= sizeof(indication), "Unexpected data");
-	ASSERT(length <= sizeof(notification), "Unexpected data");
+	TEST_ASSERT(length >= sizeof(indication), "Unexpected data");
+	TEST_ASSERT(length <= sizeof(notification), "Unexpected data");
 
 	LOG_HEXDUMP_DBG(data, length, "HVx data");
 
@@ -210,9 +210,9 @@ static void subscribed(struct bt_conn *conn,
 		       uint8_t err,
 		       struct bt_gatt_subscribe_params *params)
 {
-	ASSERT(!err, "Subscribe failed (err %d)\n", err);
+	TEST_ASSERT(!err, "Subscribe failed (err %d)", err);
 
-	ASSERT(params, "params is NULL\n");
+	TEST_ASSERT(params, "params is NULL");
 
 	SET_FLAG(is_subscribed);
 	/* spoiler: tester doesn't really have attributes */
@@ -233,7 +233,7 @@ void subscribe(void)
 	};
 
 	err = bt_gatt_subscribe(dconn, &params);
-	ASSERT(!err, "Subscribe failed (err %d)\n", err);
+	TEST_ASSERT(!err, "Subscribe failed (err %d)", err);
 
 	WAIT_FOR_FLAG(is_subscribed);
 }
@@ -250,7 +250,7 @@ static void send_write_handle(void)
 	sys_put_le16(handle, data);
 
 	err = bt_gatt_notify(dconn, attr, data, sizeof(data));
-	ASSERT(!err, "Failed to transmit handle for write (err %d)\n", err);
+	TEST_ASSERT(!err, "Failed to transmit handle for write (err %d)", err);
 }
 
 void test_procedure_0(void)
@@ -259,7 +259,7 @@ void test_procedure_0(void)
 	int err;
 
 	err = bt_enable(NULL);
-	ASSERT(err == 0, "Can't enable Bluetooth (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Can't enable Bluetooth (err %d)", err);
 	LOG_DBG("Central: Bluetooth initialized.");
 
 	/* Test purpose:
@@ -313,29 +313,12 @@ void test_procedure_0(void)
 	/* Send RSP to LL */
 	bt_conn_suspend_tx(false);
 
-	PASS("DUT done\n");
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
+	TEST_PASS("DUT done");
 }
 
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "dut",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_procedure_0,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/att/sequential/tester/CMakeLists.txt b/tests/bsim/bluetooth/host/att/sequential/tester/CMakeLists.txt
index c4410ee0b9e..8227245fdd9 100644
--- a/tests/bsim/bluetooth/host/att/sequential/tester/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/att/sequential/tester/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_sequential_tester)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
   src/main.c
 )
diff --git a/tests/bsim/bluetooth/host/att/sequential/tester/src/main.c b/tests/bsim/bluetooth/host/att/sequential/tester/src/main.c
index 511323dacb3..4cd981d615b 100644
--- a/tests/bsim/bluetooth/host/att/sequential/tester/src/main.c
+++ b/tests/bsim/bluetooth/host/att/sequential/tester/src/main.c
@@ -21,8 +21,10 @@
 #include "host/conn_internal.h"
 #include "host/l2cap_internal.h"
 
-#include "utils.h"
-#include "bstests.h"
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+
+#include "common_defs.h"
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_tinyhost, LOG_LEVEL_INF);
@@ -37,12 +39,11 @@ LOG_MODULE_REGISTER(bt_tinyhost, LOG_LEVEL_INF);
 #define BT_ATT_OP_WRITE_CMD 0x52
 #define BT_L2CAP_CID_ATT    0x0004
 
-DEFINE_FLAG(is_connected);
-DEFINE_FLAG(flag_data_length_updated);
-DEFINE_FLAG(flag_handle);
-DEFINE_FLAG(flag_notified);
-DEFINE_FLAG(flag_write_ack);
-DEFINE_FLAG(flag_indication_ack);
+DEFINE_FLAG_STATIC(is_connected);
+DEFINE_FLAG_STATIC(flag_data_length_updated);
+DEFINE_FLAG_STATIC(flag_handle);
+DEFINE_FLAG_STATIC(flag_write_ack);
+DEFINE_FLAG_STATIC(flag_indication_ack);
 
 static uint16_t server_write_handle;
 
@@ -67,7 +68,7 @@ struct net_buf *bt_hci_cmd_create(uint16_t opcode, uint8_t param_len)
 	LOG_DBG("opcode 0x%04x param_len %u", opcode, param_len);
 
 	buf = net_buf_alloc(&hci_cmd_pool, K_FOREVER);
-	ASSERT(buf, "failed allocation");
+	TEST_ASSERT(buf, "failed allocation");
 
 	LOG_DBG("buf %p", buf);
 
@@ -110,14 +111,14 @@ static void handle_cmd_complete(struct net_buf *buf)
 		opcode = sys_le16_to_cpu(evt->opcode);
 
 	} else {
-		FAIL("unhandled event 0x%x", hdr->evt);
+		TEST_FAIL("unhandled event 0x%x", hdr->evt);
 	}
 
 	LOG_DBG("opcode 0x%04x status %x", opcode, status);
 
-	ASSERT(status == 0x00, "cmd status: %x", status);
+	TEST_ASSERT(status == 0x00, "cmd status: %x", status);
 
-	ASSERT(active_opcode == opcode, "unexpected opcode %x != %x", active_opcode, opcode);
+	TEST_ASSERT(active_opcode == opcode, "unexpected opcode %x != %x", active_opcode, opcode);
 
 	if (active_opcode) {
 		active_opcode = 0xFFFF;
@@ -229,7 +230,7 @@ static void handle_att(struct net_buf *buf)
 		return;
 	default:
 		LOG_HEXDUMP_ERR(buf->data, buf->len, "payload");
-		FAIL("unhandled opcode %x\n", op);
+		TEST_FAIL("unhandled opcode %x", op);
 		return;
 	}
 }
@@ -246,10 +247,10 @@ static void handle_l2cap(struct net_buf *buf)
 	LOG_HEXDUMP_DBG(buf->data, buf->len, "l2cap");
 
 	/* Make sure we don't have to recombine packets */
-	ASSERT(buf->len == hdr->len, "buflen = %d != hdrlen %d",
+	TEST_ASSERT(buf->len == hdr->len, "buflen = %d != hdrlen %d",
 	       buf->len, hdr->len);
 
-	ASSERT(cid == BT_L2CAP_CID_ATT, "We only support (U)ATT");
+	TEST_ASSERT(cid == BT_L2CAP_CID_ATT, "We only support (U)ATT");
 
 	/* (U)ATT PDU */
 	handle_att(buf);
@@ -268,7 +269,7 @@ static void handle_acl(struct net_buf *buf)
 	flags = bt_acl_flags(handle);
 	handle = bt_acl_handle(handle);
 
-	ASSERT(flags == BT_ACL_START,
+	TEST_ASSERT(flags == BT_ACL_START,
 	       "Fragmentation not supported");
 
 	LOG_DBG("ACL: conn %d len %d flags %d", handle, len, flags);
@@ -329,7 +330,7 @@ static void send_cmd(uint16_t opcode, struct net_buf *cmd, struct net_buf **rsp)
 	}
 
 	k_sem_take(&cmd_sem, K_FOREVER);
-	ASSERT(active_opcode == 0xFFFF, "");
+	TEST_ASSERT_NO_MSG(active_opcode == 0xFFFF);
 
 	active_opcode = opcode;
 
@@ -398,7 +399,7 @@ static void write_default_data_len(uint16_t tx_octets, uint16_t tx_time)
 	struct bt_hci_cp_le_write_default_data_len *cp;
 	struct net_buf *buf = bt_hci_cmd_create(BT_HCI_OP_LE_WRITE_DEFAULT_DATA_LEN, sizeof(*cp));
 
-	ASSERT(buf, "");
+	TEST_ASSERT_NO_MSG(buf);
 
 	cp = net_buf_add(buf, sizeof(*cp));
 	cp->max_tx_octets = sys_cpu_to_le16(tx_octets);
@@ -423,7 +424,7 @@ static void set_event_mask(uint16_t opcode)
 
 	/* The two commands have the same length/params */
 	buf = bt_hci_cmd_create(opcode, sizeof(*cp_mask));
-	ASSERT(buf, "");
+	TEST_ASSERT_NO_MSG(buf);
 
 	/* Forward all events */
 	cp_mask = net_buf_add(buf, sizeof(*cp_mask));
@@ -441,7 +442,7 @@ static void set_random_address(void)
 	LOG_DBG("%s", bt_addr_str(&addr.a));
 
 	buf = bt_hci_cmd_create(BT_HCI_OP_LE_SET_RANDOM_ADDRESS, sizeof(addr.a));
-	ASSERT(buf, "");
+	TEST_ASSERT_NO_MSG(buf);
 
 	net_buf_add_mem(buf, &addr.a, sizeof(addr.a));
 	send_cmd(BT_HCI_OP_LE_SET_RANDOM_ADDRESS, buf, NULL);
@@ -481,7 +482,7 @@ struct net_buf *alloc_l2cap_pdu(void)
 	uint16_t reserve;
 
 	buf = net_buf_alloc(&acl_tx_pool, K_FOREVER);
-	ASSERT(buf, "failed ACL allocation");
+	TEST_ASSERT(buf, "failed ACL allocation");
 
 	reserve = sizeof(struct bt_l2cap_hdr);
 	reserve += sizeof(struct bt_hci_acl_hdr) + BT_BUF_RESERVE;
@@ -516,7 +517,7 @@ static void send_l2cap_packet(struct net_buf *buf, uint16_t cid)
 	hdr->cid = sys_cpu_to_le16(cid);
 
 	/* Always entire packets, no HCI fragmentation */
-	ASSERT(buf->len <= CONFIG_BT_BUF_ACL_TX_SIZE,
+	TEST_ASSERT(buf->len <= CONFIG_BT_BUF_ACL_TX_SIZE,
 	       "Fragmentation not supported");
 
 	send_acl(buf);
@@ -625,29 +626,12 @@ void test_procedure_0(void)
 	WAIT_FOR_FLAG(flag_write_ack);
 	WAIT_FOR_FLAG(flag_indication_ack);
 
-	PASS("Tester done\n");
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
+	TEST_PASS("Tester done");
 }
 
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "tester",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_procedure_0,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/central/src/dummy_peripheral.c b/tests/bsim/bluetooth/host/central/src/dummy_peripheral.c
index 6f6cb7ae543..6f7e5a1cc12 100644
--- a/tests/bsim/bluetooth/host/central/src/dummy_peripheral.c
+++ b/tests/bsim/bluetooth/host/central/src/dummy_peripheral.c
@@ -54,7 +54,6 @@ static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "peripheral_dummy",
 		.test_descr = "Connectable peripheral",
-		.test_tick_f = bst_tick,
 		.test_main_f = test_peripheral_dummy,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/central/src/main.c b/tests/bsim/bluetooth/host/central/src/main.c
index 2068ecefc8d..2ee7b39d3fd 100644
--- a/tests/bsim/bluetooth/host/central/src/main.c
+++ b/tests/bsim/bluetooth/host/central/src/main.c
@@ -195,14 +195,12 @@ static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "central_connect_timeout",
 		.test_descr = "Verifies that the default connection timeout is used correctly",
-		.test_tick_f = bst_tick,
 		.test_main_f = test_central_connect_timeout,
 	},
 	{
 		.test_id = "central_connect_when_connecting",
 		.test_descr = "Verifies that the stack returns an error code when trying to connect"
 			      " while already connecting",
-		.test_tick_f = bst_tick,
 		.test_main_f = test_central_connect_when_connecting,
 	},
 	{
@@ -210,7 +208,6 @@ static const struct bst_test_instance test_def[] = {
 		.test_descr =
 			"Verifies that the stack returns an error code when trying to connect"
 			" to an existing device and does not unref the existing connection object.",
-		.test_tick_f = bst_tick,
 		.test_main_f = test_central_connect_to_existing,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/gatt/authorization/src/gatt_client_test.c b/tests/bsim/bluetooth/host/gatt/authorization/src/gatt_client_test.c
index 3e162d50297..7505230ed8a 100644
--- a/tests/bsim/bluetooth/host/gatt/authorization/src/gatt_client_test.c
+++ b/tests/bsim/bluetooth/host/gatt/authorization/src/gatt_client_test.c
@@ -19,10 +19,10 @@
 #include "babblekit/flags.h"
 #include "common.h"
 
-static DEFINE_FLAG(flag_is_connected);
-static DEFINE_FLAG(flag_discover_complete);
-static DEFINE_FLAG(flag_write_complete);
-static DEFINE_FLAG(flag_read_complete);
+DEFINE_FLAG_STATIC(flag_is_connected);
+DEFINE_FLAG_STATIC(flag_discover_complete);
+DEFINE_FLAG_STATIC(flag_write_complete);
+DEFINE_FLAG_STATIC(flag_read_complete);
 
 static struct bt_conn *g_conn;
 static uint16_t unhandled_chrc_handle;
diff --git a/tests/bsim/bluetooth/host/gatt/authorization/src/gatt_server_test.c b/tests/bsim/bluetooth/host/gatt/authorization/src/gatt_server_test.c
index 4c206f7cd27..88962b0d169 100644
--- a/tests/bsim/bluetooth/host/gatt/authorization/src/gatt_server_test.c
+++ b/tests/bsim/bluetooth/host/gatt/authorization/src/gatt_server_test.c
@@ -21,7 +21,7 @@
 
 extern enum bst_result_t bst_result;
 
-static DEFINE_FLAG(flag_is_chrc_ctx_validated);
+DEFINE_FLAG_STATIC(flag_is_chrc_ctx_validated);
 
 static struct bt_conn *g_conn;
 
diff --git a/tests/bsim/bluetooth/host/gatt/caching/src/gatt_client_test.c b/tests/bsim/bluetooth/host/gatt/caching/src/gatt_client_test.c
index 65d9b0213c0..1cc55dadf9a 100644
--- a/tests/bsim/bluetooth/host/gatt/caching/src/gatt_client_test.c
+++ b/tests/bsim/bluetooth/host/gatt/caching/src/gatt_client_test.c
@@ -20,13 +20,13 @@
 #include "babblekit/sync.h"
 #include "common.h"
 
-static DEFINE_FLAG(flag_is_connected);
-static DEFINE_FLAG(flag_discover_complete);
-static DEFINE_FLAG(flag_write_complete);
-static DEFINE_FLAG(flag_chan_1_read);
-static DEFINE_FLAG(flag_chan_2_read);
-static DEFINE_FLAG(flag_db_hash_read);
-static DEFINE_FLAG(flag_encrypted);
+DEFINE_FLAG_STATIC(flag_is_connected);
+DEFINE_FLAG_STATIC(flag_discover_complete);
+DEFINE_FLAG_STATIC(flag_write_complete);
+DEFINE_FLAG_STATIC(flag_chan_1_read);
+DEFINE_FLAG_STATIC(flag_chan_2_read);
+DEFINE_FLAG_STATIC(flag_db_hash_read);
+DEFINE_FLAG_STATIC(flag_encrypted);
 
 static struct bt_conn *g_conn;
 static uint16_t chrc_handle;
diff --git a/tests/bsim/bluetooth/host/gatt/caching/src/gatt_server_test.c b/tests/bsim/bluetooth/host/gatt/caching/src/gatt_server_test.c
index 1cb88b489fb..de58beff8b9 100644
--- a/tests/bsim/bluetooth/host/gatt/caching/src/gatt_server_test.c
+++ b/tests/bsim/bluetooth/host/gatt/caching/src/gatt_server_test.c
@@ -22,8 +22,8 @@
 
 extern enum bst_result_t bst_result;
 
-static DEFINE_FLAG(flag_is_connected);
-static DEFINE_FLAG(flag_is_encrypted);
+DEFINE_FLAG_STATIC(flag_is_connected);
+DEFINE_FLAG_STATIC(flag_is_encrypted);
 
 static struct bt_conn *g_conn;
 
diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/src/central.c b/tests/bsim/bluetooth/host/gatt/ccc_store/src/central.c
index a4f056dd408..664a65ca30d 100644
--- a/tests/bsim/bluetooth/host/gatt/ccc_store/src/central.c
+++ b/tests/bsim/bluetooth/host/gatt/ccc_store/src/central.c
@@ -29,10 +29,10 @@
 
 #define SERVER_CHAN 0
 
-static DEFINE_FLAG(connected_flag);
-static DEFINE_FLAG(disconnected_flag);
-static DEFINE_FLAG(security_updated_flag);
-static DEFINE_FLAG(notification_received_flag);
+DEFINE_FLAG_STATIC(connected_flag);
+DEFINE_FLAG_STATIC(disconnected_flag);
+DEFINE_FLAG_STATIC(security_updated_flag);
+DEFINE_FLAG_STATIC(notification_received_flag);
 
 #define BT_UUID_DUMMY_SERVICE BT_UUID_DECLARE_128(DUMMY_SERVICE_TYPE)
 #define BT_UUID_DUMMY_SERVICE_NOTIFY BT_UUID_DECLARE_128(DUMMY_SERVICE_NOTIFY_TYPE)
@@ -41,7 +41,7 @@ static struct bt_conn *default_conn;
 
 static struct bt_conn_cb central_cb;
 
-static DEFINE_FLAG(gatt_subscribed_flag);
+DEFINE_FLAG_STATIC(gatt_subscribed_flag);
 
 static uint8_t notify_cb(struct bt_conn *conn, struct bt_gatt_subscribe_params *params,
 			 const void *data, uint16_t length)
diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/src/peripheral.c b/tests/bsim/bluetooth/host/gatt/ccc_store/src/peripheral.c
index 6205306306b..0df6d2b7f9f 100644
--- a/tests/bsim/bluetooth/host/gatt/ccc_store/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/gatt/ccc_store/src/peripheral.c
@@ -26,11 +26,11 @@
 
 #define CLIENT_CHAN 0
 
-static DEFINE_FLAG(connected_flag);
-static DEFINE_FLAG(disconnected_flag);
-static DEFINE_FLAG(security_updated_flag);
+DEFINE_FLAG_STATIC(connected_flag);
+DEFINE_FLAG_STATIC(disconnected_flag);
+DEFINE_FLAG_STATIC(security_updated_flag);
 
-static DEFINE_FLAG(ccc_cfg_changed_flag);
+DEFINE_FLAG_STATIC(ccc_cfg_changed_flag);
 
 static const struct bt_uuid_128 dummy_service = BT_UUID_INIT_128(DUMMY_SERVICE_TYPE);
 
diff --git a/tests/bsim/bluetooth/host/gatt/device_name/src/client.c b/tests/bsim/bluetooth/host/gatt/device_name/src/client.c
index b564692b8ce..2225b23d9e6 100644
--- a/tests/bsim/bluetooth/host/gatt/device_name/src/client.c
+++ b/tests/bsim/bluetooth/host/gatt/device_name/src/client.c
@@ -29,7 +29,7 @@
 
 LOG_MODULE_REGISTER(client, LOG_LEVEL_DBG);
 
-static DEFINE_FLAG(client_security_changed_flag);
+DEFINE_FLAG_STATIC(client_security_changed_flag);
 
 static struct bt_conn_cb client_conn_cb;
 
diff --git a/tests/bsim/bluetooth/host/gatt/device_name/src/server.c b/tests/bsim/bluetooth/host/gatt/device_name/src/server.c
index 3d3d7edeeac..feb8ce34fe8 100644
--- a/tests/bsim/bluetooth/host/gatt/device_name/src/server.c
+++ b/tests/bsim/bluetooth/host/gatt/device_name/src/server.c
@@ -31,7 +31,7 @@
 
 LOG_MODULE_REGISTER(server, LOG_LEVEL_DBG);
 
-static DEFINE_FLAG(security_changed_flag);
+DEFINE_FLAG_STATIC(security_changed_flag);
 
 static struct bt_conn_cb server_conn_cb;
 
diff --git a/tests/bsim/bluetooth/host/gatt/general/src/gatt_client_test.c b/tests/bsim/bluetooth/host/gatt/general/src/gatt_client_test.c
index b78b5d2a619..a754f08649f 100644
--- a/tests/bsim/bluetooth/host/gatt/general/src/gatt_client_test.c
+++ b/tests/bsim/bluetooth/host/gatt/general/src/gatt_client_test.c
@@ -20,11 +20,11 @@
 #include "babblekit/flags.h"
 #include "common.h"
 
-static DEFINE_FLAG(flag_is_connected);
-static DEFINE_FLAG(flag_discover_complete);
-static DEFINE_FLAG(flag_security_changed);
-static DEFINE_FLAG(flag_write_complete);
-static DEFINE_FLAG(flag_read_complete);
+DEFINE_FLAG_STATIC(flag_is_connected);
+DEFINE_FLAG_STATIC(flag_discover_complete);
+DEFINE_FLAG_STATIC(flag_security_changed);
+DEFINE_FLAG_STATIC(flag_write_complete);
+DEFINE_FLAG_STATIC(flag_read_complete);
 
 static struct bt_conn *g_conn;
 static uint16_t chrc_handle;
diff --git a/tests/bsim/bluetooth/host/gatt/general/src/gatt_server_test.c b/tests/bsim/bluetooth/host/gatt/general/src/gatt_server_test.c
index 6f3225c4d29..274773fe776 100644
--- a/tests/bsim/bluetooth/host/gatt/general/src/gatt_server_test.c
+++ b/tests/bsim/bluetooth/host/gatt/general/src/gatt_server_test.c
@@ -22,7 +22,7 @@
 
 extern enum bst_result_t bst_result;
 
-static DEFINE_FLAG(flag_is_connected);
+DEFINE_FLAG_STATIC(flag_is_connected);
 
 static struct bt_conn *g_conn;
 
diff --git a/tests/bsim/bluetooth/host/gatt/notify/src/gatt_client_test.c b/tests/bsim/bluetooth/host/gatt/notify/src/gatt_client_test.c
index 273ddf51aa7..7baecfe4fb1 100644
--- a/tests/bsim/bluetooth/host/gatt/notify/src/gatt_client_test.c
+++ b/tests/bsim/bluetooth/host/gatt/notify/src/gatt_client_test.c
@@ -19,11 +19,11 @@
 #include "babblekit/flags.h"
 #include "common.h"
 
-static DEFINE_FLAG(flag_is_connected);
-static DEFINE_FLAG(flag_is_encrypted);
-static DEFINE_FLAG(flag_discover_complete);
-static DEFINE_FLAG(flag_short_subscribed);
-static DEFINE_FLAG(flag_long_subscribed);
+DEFINE_FLAG_STATIC(flag_is_connected);
+DEFINE_FLAG_STATIC(flag_is_encrypted);
+DEFINE_FLAG_STATIC(flag_discover_complete);
+DEFINE_FLAG_STATIC(flag_short_subscribed);
+DEFINE_FLAG_STATIC(flag_long_subscribed);
 
 static struct bt_conn *g_conn;
 static uint16_t chrc_handle;
diff --git a/tests/bsim/bluetooth/host/gatt/notify/src/gatt_server_test.c b/tests/bsim/bluetooth/host/gatt/notify/src/gatt_server_test.c
index d293ad9ac19..e5702d24523 100644
--- a/tests/bsim/bluetooth/host/gatt/notify/src/gatt_server_test.c
+++ b/tests/bsim/bluetooth/host/gatt/notify/src/gatt_server_test.c
@@ -20,9 +20,9 @@
 
 extern enum bst_result_t bst_result;
 
-static DEFINE_FLAG(flag_is_connected);
-static DEFINE_FLAG(flag_short_subscribe);
-static DEFINE_FLAG(flag_long_subscribe);
+DEFINE_FLAG_STATIC(flag_is_connected);
+DEFINE_FLAG_STATIC(flag_short_subscribe);
+DEFINE_FLAG_STATIC(flag_long_subscribe);
 
 static struct bt_conn *g_conn;
 
diff --git a/tests/bsim/bluetooth/host/gatt/notify_multiple/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/notify_multiple/CMakeLists.txt
index 7869a21840f..b279e8c1439 100644
--- a/tests/bsim/bluetooth/host/gatt/notify_multiple/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/gatt/notify_multiple/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_gatt)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources} )
 
diff --git a/tests/bsim/bluetooth/host/gatt/notify_multiple/src/common.c b/tests/bsim/bluetooth/host/gatt/notify_multiple/src/common.c
deleted file mode 100644
index df438607c5f..00000000000
--- a/tests/bsim/bluetooth/host/gatt/notify_multiple/src/common.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2022 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "common.h"
-
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("test failed (not passed after %i seconds)\n", WAIT_TIME);
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-	bst_result = In_progress;
-}
diff --git a/tests/bsim/bluetooth/host/gatt/notify_multiple/src/common.h b/tests/bsim/bluetooth/host/gatt/notify_multiple/src/common.h
index 56ca219497b..ea8d590b182 100644
--- a/tests/bsim/bluetooth/host/gatt/notify_multiple/src/common.h
+++ b/tests/bsim/bluetooth/host/gatt/notify_multiple/src/common.h
@@ -7,50 +7,9 @@
  */
 
 #include <zephyr/kernel.h>
-
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "time_machine.h"
-#include "bstests.h"
-
-#include <zephyr/types.h>
-#include <stddef.h>
-#include <errno.h>
-
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/uuid.h>
-#include <zephyr/bluetooth/gatt.h>
-
-extern enum bst_result_t bst_result;
 
-#define WAIT_TIME (60 * 1e6) /*seconds*/
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t)false
 #define FORCE_FLAG(flag, val) (void)atomic_set(&flag, (atomic_t)val)
-#define SET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)true)
-#define UNSET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)false)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)	  \
-	while ((bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1)); \
-	}
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
 
 #define CHRC_SIZE 10
 #define LONG_CHRC_SIZE 40
@@ -67,8 +26,5 @@ extern enum bst_result_t bst_result;
 	BT_UUID_DECLARE_128(0x01, 0x23, 0x45, 0x67, 0x89, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,      \
 			    0x07, 0x08, 0x09, 0xFF, 0x11)
 
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
-
 #define NOTIFICATION_COUNT 10
 BUILD_ASSERT(NOTIFICATION_COUNT % 2 == 0);
diff --git a/tests/bsim/bluetooth/host/gatt/notify_multiple/src/gatt_client_test.c b/tests/bsim/bluetooth/host/gatt/notify_multiple/src/gatt_client_test.c
index d46af04f9ec..c295076afeb 100644
--- a/tests/bsim/bluetooth/host/gatt/notify_multiple/src/gatt_client_test.c
+++ b/tests/bsim/bluetooth/host/gatt/notify_multiple/src/gatt_client_test.c
@@ -4,17 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/kernel.h>
+
+#include <zephyr/types.h>
+#include <stddef.h>
+#include <errno.h>
+
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/gatt.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+
 #include "common.h"
 
-CREATE_FLAG(flag_is_connected);
-CREATE_FLAG(flag_is_encrypted);
-CREATE_FLAG(flag_discover_complete);
-CREATE_FLAG(flag_write_complete);
-CREATE_FLAG(flag_subscribed_short);
-CREATE_FLAG(flag_subscribed_long);
+DEFINE_FLAG_STATIC(flag_is_connected);
+DEFINE_FLAG_STATIC(flag_is_encrypted);
+DEFINE_FLAG_STATIC(flag_discover_complete);
+DEFINE_FLAG_STATIC(flag_write_complete);
+DEFINE_FLAG_STATIC(flag_subscribed_short);
+DEFINE_FLAG_STATIC(flag_subscribed_long);
 
 static struct bt_conn *g_conn;
 static uint16_t chrc_handle;
@@ -39,7 +50,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != 0) {
-		FAIL("Failed to connect to %s (%u)\n", addr, err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, err);
 		return;
 	}
 
@@ -75,9 +86,9 @@ static void disconnected(struct bt_conn *conn, uint8_t reason)
 void security_changed(struct bt_conn *conn, bt_security_t level, enum bt_security_err err)
 {
 	if (err) {
-		FAIL("Encryption failer (%d)\n", err);
+		TEST_FAIL("Encryption failed (%d)", err);
 	} else if (level < BT_SECURITY_L2) {
-		FAIL("Insufficient sec level (%d)\n", level);
+		TEST_FAIL("Insufficient sec level (%d)", level);
 	} else {
 		SET_FLAG(flag_is_encrypted);
 	}
@@ -109,13 +120,13 @@ void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type, struct ne
 	printk("Stopping scan\n");
 	err = bt_le_scan_stop();
 	if (err != 0) {
-		FAIL("Could not stop scan: %d");
+		TEST_FAIL("Could not stop scan: %d");
 		return;
 	}
 
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT, &g_conn);
 	if (err != 0) {
-		FAIL("Could not connect to peer: %d", err);
+		TEST_FAIL("Could not connect to peer: %d", err);
 	}
 }
 
@@ -126,7 +137,7 @@ static uint8_t discover_func(struct bt_conn *conn, const struct bt_gatt_attr *at
 
 	if (attr == NULL) {
 		if (chrc_handle == 0 || long_chrc_handle == 0) {
-			FAIL("Did not discover chrc (%x) or long_chrc (%x)", chrc_handle,
+			TEST_FAIL("Did not discover chrc (%x) or long_chrc (%x)", chrc_handle,
 			     long_chrc_handle);
 		}
 
@@ -148,7 +159,7 @@ static uint8_t discover_func(struct bt_conn *conn, const struct bt_gatt_attr *at
 
 		err = bt_gatt_discover(conn, params);
 		if (err != 0) {
-			FAIL("Discover failed (err %d)\n", err);
+			TEST_FAIL("Discover failed (err %d)", err);
 		}
 
 		return BT_GATT_ITER_STOP;
@@ -187,7 +198,7 @@ static void gatt_discover(const struct bt_uuid *uuid, uint8_t type)
 
 	err = bt_gatt_discover(g_conn, &discover_params);
 	if (err != 0) {
-		FAIL("Discover failed(err %d)\n", err);
+		TEST_FAIL("Discover failed(err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(flag_discover_complete);
@@ -199,11 +210,11 @@ static void test_subscribed(struct bt_conn *conn,
 			    struct bt_gatt_subscribe_params *params)
 {
 	if (err) {
-		FAIL("Subscribe failed (err %d)\n", err);
+		TEST_FAIL("Subscribe failed (err %d)", err);
 	}
 
 	if (!params) {
-		FAIL("params NULL\n");
+		TEST_FAIL("params NULL");
 	}
 
 	if (params->value_handle == chrc_handle) {
@@ -213,7 +224,7 @@ static void test_subscribed(struct bt_conn *conn,
 		FORCE_FLAG(flag_subscribed_long, (bool)params->value);
 		printk("Subscribed to long characteristic\n");
 	} else {
-		FAIL("Unknown handle %d\n", params->value_handle);
+		TEST_FAIL("Unknown handle %d", params->value_handle);
 	}
 }
 
@@ -248,7 +259,7 @@ static struct bt_gatt_subscribe_params sub_params_long = {
 static void write_cb(struct bt_conn *conn, uint8_t err, struct bt_gatt_write_params *params)
 {
 	if (err != BT_ATT_ERR_SUCCESS) {
-		FAIL("Write failed: 0x%02X\n", err);
+		TEST_FAIL("Write failed: 0x%02X", err);
 	}
 
 	SET_FLAG(flag_write_complete);
@@ -277,7 +288,7 @@ static void write_csf(void)
 
 	err = bt_gatt_write(g_conn, &write_params);
 	if (err) {
-		FAIL("bt_gatt_write failed (err %d)\n", err);
+		TEST_FAIL("bt_gatt_write failed (err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(flag_write_complete);
@@ -295,7 +306,7 @@ static void subscribe(struct bt_gatt_subscribe_params *params, bool subscribe)
 	}
 
 	if (err < 0) {
-		FAIL("Failed to %ssubscribe (err %d)\n", subscribe ? "un":"", err);
+		TEST_FAIL("Failed to %ssubscribe (err %d)", subscribe ? "un":"", err);
 	} else {
 		printk("%ssubscribe request sent\n", subscribe ? "un":"");
 	}
@@ -308,12 +319,12 @@ static void test_main(void)
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth discover failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth discover failed (err %d)", err);
 	}
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
 	if (err != 0) {
-		FAIL("Scanning failed to start (err %d)\n", err);
+		TEST_FAIL("Scanning failed to start (err %d)", err);
 	}
 
 	printk("Scanning successfully started\n");
@@ -322,7 +333,7 @@ static void test_main(void)
 
 	err = bt_conn_set_security(g_conn, BT_SECURITY_L2);
 	if (err) {
-		FAIL("Starting encryption procedure failed (%d)\n", err);
+		TEST_FAIL("Starting encryption procedure failed (%d)", err);
 	}
 
 	WAIT_FOR_FLAG(flag_is_encrypted);
@@ -359,14 +370,12 @@ static void test_main(void)
 
 	printk("Unsubscribed\n");
 
-	PASS("GATT client Passed\n");
+	TEST_PASS("GATT client Passed");
 }
 
 static const struct bst_test_instance test_vcs[] = {
 	{
 		.test_id = "gatt_client",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/gatt/notify_multiple/src/gatt_server_test.c b/tests/bsim/bluetooth/host/gatt/notify_multiple/src/gatt_server_test.c
index 1a9a95262d6..7dbdfdf4cc5 100644
--- a/tests/bsim/bluetooth/host/gatt/notify_multiple/src/gatt_server_test.c
+++ b/tests/bsim/bluetooth/host/gatt/notify_multiple/src/gatt_server_test.c
@@ -4,13 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common.h"
+#include <zephyr/kernel.h>
+
+#include <zephyr/types.h>
+#include <stddef.h>
+#include <errno.h>
+
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
 
-extern enum bst_result_t bst_result;
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+
+#include "common.h"
 
-CREATE_FLAG(flag_is_connected);
-CREATE_FLAG(flag_short_subscribe);
-CREATE_FLAG(flag_long_subscribe);
+DEFINE_FLAG_STATIC(flag_is_connected);
+DEFINE_FLAG_STATIC(flag_short_subscribe);
+DEFINE_FLAG_STATIC(flag_long_subscribe);
 
 static struct bt_conn *g_conn;
 
@@ -25,7 +37,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != 0) {
-		FAIL("Failed to connect to %s (%u)\n", addr, err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, err);
 		return;
 	}
 
@@ -124,7 +136,7 @@ static inline void multiple_notify(const struct bt_gatt_attr *attrs[2])
 		if (err == -ENOMEM) {
 			k_sleep(K_MSEC(10));
 		} else if (err) {
-			FAIL("multiple notify failed (err %d)\n", err);
+			TEST_FAIL("multiple notify failed (err %d)", err);
 		}
 	} while (err);
 }
@@ -139,7 +151,7 @@ static void test_main(void)
 
 	err = bt_enable(NULL);
 	if (err != 0) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 		return;
 	}
 
@@ -147,7 +159,7 @@ static void test_main(void)
 
 	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)\n", err);
+		TEST_FAIL("Advertising failed to start (err %d)", err);
 		return;
 	}
 
@@ -173,17 +185,15 @@ static void test_main(void)
 	k_sleep(K_MSEC(1000));
 
 	if (num_notifications_sent != NOTIFICATION_COUNT) {
-		FAIL("Unexpected notification callback value\n");
+		TEST_FAIL("Unexpected notification callback value");
 	}
 
-	PASS("GATT server passed\n");
+	TEST_PASS("GATT server passed");
 }
 
 static const struct bst_test_instance test_gatt_server[] = {
 	{
 		.test_id = "gatt_server",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_main,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/gatt/sc_indicate/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/sc_indicate/CMakeLists.txt
index d734b3c054e..7a5f7ed51a4 100644
--- a/tests/bsim/bluetooth/host/gatt/sc_indicate/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/gatt/sc_indicate/CMakeLists.txt
@@ -12,6 +12,9 @@ endif()
 find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_auto_seq_req)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
   src/main.c
   src/central.c
diff --git a/tests/bsim/bluetooth/host/gatt/sc_indicate/src/bs_bt_utils.c b/tests/bsim/bluetooth/host/gatt/sc_indicate/src/bs_bt_utils.c
index 91391b404c7..df054cc3321 100644
--- a/tests/bsim/bluetooth/host/gatt/sc_indicate/src/bs_bt_utils.c
+++ b/tests/bsim/bluetooth/host/gatt/sc_indicate/src/bs_bt_utils.c
@@ -52,13 +52,13 @@ void clear_g_conn(void)
 
 	conn = g_conn;
 	g_conn = NULL;
-	BSIM_ASSERT(conn, "Test error: no g_conn!\n");
+	TEST_ASSERT(conn, "Test error: no g_conn!");
 	bt_conn_unref(conn);
 }
 
 static void connected(struct bt_conn *conn, uint8_t err)
 {
-	BSIM_ASSERT((!g_conn || (conn == g_conn)), "Unexpected new connection.");
+	TEST_ASSERT((!g_conn || (conn == g_conn)), "Unexpected new connection.");
 
 	if (!g_conn) {
 		g_conn = bt_conn_ref(conn);
@@ -94,10 +94,10 @@ static void stop_scan_and_connect(const bt_addr_le_t *addr,
 	printk("Got scan result, connecting.. dst %s, RSSI %d\n", addr_str, rssi);
 
 	err = bt_le_scan_stop();
-	BSIM_ASSERT(!err, "Err bt_le_scan_stop %d", err);
+	TEST_ASSERT(!err, "Err bt_le_scan_stop %d", err);
 
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT, &g_conn);
-	BSIM_ASSERT(!err, "Err bt_conn_le_create %d", err);
+	TEST_ASSERT(!err, "Err bt_conn_le_create %d", err);
 }
 
 void scan_connect_to_first_result(void)
@@ -105,7 +105,7 @@ void scan_connect_to_first_result(void)
 	int err;
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, stop_scan_and_connect);
-	BSIM_ASSERT(!err, "Err bt_le_scan_start %d", err);
+	TEST_ASSERT(!err, "Err bt_le_scan_start %d", err);
 }
 
 void disconnect(void)
@@ -113,7 +113,7 @@ void disconnect(void)
 	int err;
 
 	err = bt_conn_disconnect(g_conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
-	BSIM_ASSERT(!err, "bt_conn_disconnect failed (%d)\n", err);
+	TEST_ASSERT(!err, "bt_conn_disconnect failed (%d)", err);
 }
 
 void set_security(bt_security_t sec)
@@ -121,7 +121,7 @@ void set_security(bt_security_t sec)
 	int err;
 
 	err = bt_conn_set_security(g_conn, sec);
-	BSIM_ASSERT(!err, "Err bt_conn_set_security %d", err);
+	TEST_ASSERT(!err, "Err bt_conn_set_security %d", err);
 }
 
 void create_adv(struct bt_le_ext_adv **adv)
@@ -138,7 +138,7 @@ void create_adv(struct bt_le_ext_adv **adv)
 	params.interval_max = BT_GAP_ADV_FAST_INT_MAX_2;
 
 	err = bt_le_ext_adv_create(&params, NULL, adv);
-	BSIM_ASSERT(!err, "bt_le_ext_adv_create failed (%d)\n", err);
+	TEST_ASSERT(!err, "bt_le_ext_adv_create failed (%d)", err);
 }
 
 void start_adv(struct bt_le_ext_adv *adv)
@@ -146,7 +146,7 @@ void start_adv(struct bt_le_ext_adv *adv)
 	int err;
 
 	err = bt_le_ext_adv_start(adv, BT_LE_EXT_ADV_START_DEFAULT);
-	BSIM_ASSERT(!err, "bt_le_ext_adv_start failed (%d)\n", err);
+	TEST_ASSERT(!err, "bt_le_ext_adv_start failed (%d)", err);
 }
 
 void stop_adv(struct bt_le_ext_adv *adv)
@@ -154,7 +154,7 @@ void stop_adv(struct bt_le_ext_adv *adv)
 	int err;
 
 	err = bt_le_ext_adv_stop(adv);
-	BSIM_ASSERT(!err, "bt_le_ext_adv_stop failed (%d)\n", err);
+	TEST_ASSERT(!err, "bt_le_ext_adv_stop failed (%d)", err);
 }
 
 /* The following flags are raised by events and lowered by test code. */
@@ -178,5 +178,5 @@ void pairing_complete(struct bt_conn *conn, bool bonded)
 
 void pairing_failed(struct bt_conn *conn, enum bt_security_err err)
 {
-	FAIL("Pairing failed\n");
+	TEST_FAIL("Pairing failed");
 }
diff --git a/tests/bsim/bluetooth/host/gatt/sc_indicate/src/bs_bt_utils.h b/tests/bsim/bluetooth/host/gatt/sc_indicate/src/bs_bt_utils.h
index 5ec34005e9f..9f86eb38929 100644
--- a/tests/bsim/bluetooth/host/gatt/sc_indicate/src/bs_bt_utils.h
+++ b/tests/bsim/bluetooth/host/gatt/sc_indicate/src/bs_bt_utils.h
@@ -10,44 +10,8 @@
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/uuid.h>
 
-extern enum bst_result_t bst_result;
-
-#define DECLARE_FLAG(flag) extern atomic_t flag
-#define DEFINE_FLAG(flag)  atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)     (void)atomic_set(&flag, (atomic_t) true)
-#define UNSET_FLAG(flag)   (void)atomic_set(&flag, (atomic_t) false)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)                                                                  \
-	while ((bool)atomic_get(&flag)) {                                                          \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define TAKE_FLAG(flag)                                                                            \
-	while (!(bool)atomic_cas(&flag, true, false)) {                                            \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define GET_FLAG(flag) (bool)atomic_get(&flag)
-
-#define BSIM_ASSERT(expr, ...)                                                                     \
-	do {                                                                                       \
-		if (!(expr)) {                                                                     \
-			FAIL(__VA_ARGS__);                                                         \
-		}                                                                                  \
-	} while (0)
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 DECLARE_FLAG(flag_pairing_complete);
 DECLARE_FLAG(flag_bonded);
diff --git a/tests/bsim/bluetooth/host/gatt/sc_indicate/src/central.c b/tests/bsim/bluetooth/host/gatt/sc_indicate/src/central.c
index ca45874e9cb..f9bf4096598 100644
--- a/tests/bsim/bluetooth/host/gatt/sc_indicate/src/central.c
+++ b/tests/bsim/bluetooth/host/gatt/sc_indicate/src/central.c
@@ -16,14 +16,17 @@
 #include <zephyr/settings/settings.h>
 #include <zephyr/bluetooth/bluetooth.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test_central, LOG_LEVEL_DBG);
 
 #include "bs_bt_utils.h"
 
-DEFINE_FLAG(flag_discovered);
-DEFINE_FLAG(flag_subscribed);
-DEFINE_FLAG(flag_indicated);
+DEFINE_FLAG_STATIC(flag_discovered);
+DEFINE_FLAG_STATIC(flag_subscribed);
+DEFINE_FLAG_STATIC(flag_indicated);
 
 enum GATT_HANDLES {
 	SC,
@@ -66,7 +69,7 @@ static void subscribe(void)
 	subscribe_params.notify = sc_indicated;
 
 	err = bt_gatt_subscribe(get_g_conn(), &subscribe_params);
-	BSIM_ASSERT(!err, "bt_gatt_subscribe failed (%d)\n", err);
+	TEST_ASSERT(!err, "bt_gatt_subscribe failed (%d)", err);
 
 	WAIT_FOR_FLAG(flag_subscribed);
 }
@@ -78,7 +81,7 @@ static uint8_t discover_func(struct bt_conn *conn,
 	if (attr == NULL) {
 		for (size_t i = 0U; i < ARRAY_SIZE(gatt_handles); i++) {
 			LOG_DBG("handle[%d] = 0x%x", i, gatt_handles[i]);
-			BSIM_ASSERT(gatt_handles[i] != 0, "did not find all handles\n");
+			TEST_ASSERT(gatt_handles[i] != 0, "did not find all handles");
 		}
 
 		(void)memset(params, 0, sizeof(*params));
@@ -102,7 +105,7 @@ static uint8_t discover_func(struct bt_conn *conn,
 			params->type = BT_GATT_DISCOVER_DESCRIPTOR;
 
 			err = bt_gatt_discover(conn, params);
-			BSIM_ASSERT(!err, "bt_gatt_discover failed (%d)\n", err);
+			TEST_ASSERT(!err, "bt_gatt_discover failed (%d)", err);
 
 			return BT_GATT_ITER_STOP;
 		}
@@ -131,7 +134,7 @@ static void gatt_discover(void)
 	discover_params.type = BT_GATT_DISCOVER_CHARACTERISTIC;
 
 	err = bt_gatt_discover(get_g_conn(), &discover_params);
-	BSIM_ASSERT(!err, "bt_gatt_discover failed (%d)\n", err);
+	TEST_ASSERT(!err, "bt_gatt_discover failed (%d)", err);
 
 	WAIT_FOR_FLAG(flag_discovered);
 
@@ -161,13 +164,13 @@ void central(void)
 	};
 
 	err = bt_enable(NULL);
-	BSIM_ASSERT(!err, "bt_enable failed (%d)\n", err);
+	TEST_ASSERT(!err, "bt_enable failed (%d)", err);
 
 	err = bt_conn_auth_info_cb_register(&bt_conn_auth_info_cb);
-	BSIM_ASSERT(!err, "bt_conn_auth_info_cb_register failed.\n");
+	TEST_ASSERT(!err, "bt_conn_auth_info_cb_register failed.");
 
 	err = settings_load();
-	BSIM_ASSERT(!err, "settings_load failed (%d)\n", err);
+	TEST_ASSERT(!err, "settings_load failed (%d)", err);
 
 	scan_connect_to_first_result();
 	wait_connected();
@@ -191,5 +194,5 @@ void central(void)
 	/* wait for service change indication */
 	WAIT_FOR_FLAG(flag_indicated);
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
diff --git a/tests/bsim/bluetooth/host/gatt/sc_indicate/src/main.c b/tests/bsim/bluetooth/host/gatt/sc_indicate/src/main.c
index 97c0a48e20a..4be6925f2f8 100644
--- a/tests/bsim/bluetooth/host/gatt/sc_indicate/src/main.c
+++ b/tests/bsim/bluetooth/host/gatt/sc_indicate/src/main.c
@@ -7,38 +7,16 @@
 #include "bstests.h"
 #include "bs_bt_utils.h"
 
-#define BS_SECONDS_TO_US(dur_sec)    ((bs_time_t)dur_sec * USEC_PER_SEC)
-#define TEST_TIMEOUT_SIMULATED BS_SECONDS_TO_US(60)
-
 extern void central(void);
 extern void peripheral(void);
 
-static void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-static void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
-}
-
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "central",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = central,
 	},
 	{
 		.test_id = "peripheral",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = peripheral,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/gatt/sc_indicate/src/peripheral.c b/tests/bsim/bluetooth/host/gatt/sc_indicate/src/peripheral.c
index e15c00b60d7..7d1877b6414 100644
--- a/tests/bsim/bluetooth/host/gatt/sc_indicate/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/gatt/sc_indicate/src/peripheral.c
@@ -14,6 +14,8 @@
 #include <zephyr/settings/settings.h>
 #include <zephyr/bluetooth/bluetooth.h>
 
+#include "babblekit/testcase.h"
+
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test_peripheral, LOG_LEVEL_DBG);
 
@@ -60,10 +62,10 @@ void peripheral(void)
 	struct bt_le_ext_adv *adv = NULL;
 
 	err = bt_enable(NULL);
-	BSIM_ASSERT(!err, "bt_enable failed (%d)\n", err);
+	TEST_ASSERT(!err, "bt_enable failed (%d)", err);
 
 	err = settings_load();
-	BSIM_ASSERT(!err, "settings_load failed (%d)\n", err);
+	TEST_ASSERT(!err, "settings_load failed (%d)", err);
 
 	create_adv(&adv);
 	start_adv(adv);
@@ -76,11 +78,11 @@ void peripheral(void)
 
 	/* add a new service to trigger the service changed indication */
 	err = bt_gatt_service_register(&svc);
-	BSIM_ASSERT(!err, "bt_gatt_service_register failed (%d)\n", err);
+	TEST_ASSERT(!err, "bt_gatt_service_register failed (%d)", err);
 	LOG_DBG("New service added");
 
 	start_adv(adv);
 	wait_connected();
 
-	PASS("Done\n");
+	TEST_PASS("Done");
 }
diff --git a/tests/bsim/bluetooth/host/gatt/settings/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/settings/CMakeLists.txt
index 32d9c0c6af4..bd6907e01fb 100644
--- a/tests/bsim/bluetooth/host/gatt/settings/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/gatt/settings/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_gatt_settings)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
   src/server.c
   src/client.c
diff --git a/tests/bsim/bluetooth/host/gatt/settings/src/client.c b/tests/bsim/bluetooth/host/gatt/settings/src/client.c
index fc33f17bd4b..23e947fbabd 100644
--- a/tests/bsim/bluetooth/host/gatt/settings/src/client.c
+++ b/tests/bsim/bluetooth/host/gatt/settings/src/client.c
@@ -16,6 +16,8 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "babblekit/testcase.h"
+
 void client_round_0(void)
 {
 	struct bt_conn *conn;
@@ -168,5 +170,5 @@ void client_procedure(void)
 	client_round_5();
 	client_round_6();
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
diff --git a/tests/bsim/bluetooth/host/gatt/settings/src/gatt_utils.c b/tests/bsim/bluetooth/host/gatt/settings/src/gatt_utils.c
index 3345f61e00c..6368cb75a10 100644
--- a/tests/bsim/bluetooth/host/gatt/settings/src/gatt_utils.c
+++ b/tests/bsim/bluetooth/host/gatt/settings/src/gatt_utils.c
@@ -6,13 +6,15 @@
 
 #include "utils.h"
 #include "argparse.h"
-#include "bs_pc_backchannel.h"
 
 #include <zephyr/kernel.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/sys/__assert.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+
 /* Custom Service Variables */
 static const struct bt_uuid_128 test_svc_uuid = BT_UUID_INIT_128(
 	0xf0, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12,
@@ -28,7 +30,7 @@ static const struct bt_uuid_128 test_chrc_uuid = BT_UUID_INIT_128(
 
 static uint8_t test_value[] = { 'T', 'e', 's', 't', '\0' };
 
-DEFINE_FLAG(flag_client_read);
+DEFINE_FLAG_STATIC(flag_client_read);
 
 static ssize_t read_test(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 			void *buf, uint16_t len, uint16_t offset)
@@ -130,7 +132,7 @@ static uint8_t discover_func(struct bt_conn *conn, const struct bt_gatt_attr *at
 			printk("handle[%d] = 0x%x\n", i, gatt_handles[i]);
 
 			if (gatt_handles[i] == 0) {
-				FAIL("Did not discover all characteristics\n");
+				TEST_FAIL("Did not discover all characteristics");
 			}
 		}
 
@@ -222,7 +224,7 @@ void gatt_subscribe_to_service_changed(bool subscribe)
 	}
 
 	if (err != 0) {
-		FAIL("Subscription failed(err %d)\n", err);
+		TEST_FAIL("Subscription failed(err %d)", err);
 	} else {
 		printk("%subscribed %s SC indications\n",
 		       subscribe ? "S" : "Uns",
@@ -246,7 +248,7 @@ void gatt_discover(void)
 
 	err = bt_gatt_discover(get_conn(), &discover_params);
 	if (err != 0) {
-		FAIL("Discover failed(err %d)\n", err);
+		TEST_FAIL("Discover failed(err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(flag_discovered);
@@ -258,7 +260,7 @@ DEFINE_FLAG(flag_written);
 static void write_cb(struct bt_conn *conn, uint8_t err, struct bt_gatt_write_params *params)
 {
 	if (err != BT_ATT_ERR_SUCCESS) {
-		FAIL("Write failed: 0x%02X\n", err);
+		TEST_FAIL("Write failed: 0x%02X", err);
 	}
 
 	SET_FLAG(flag_written);
diff --git a/tests/bsim/bluetooth/host/gatt/settings/src/main.c b/tests/bsim/bluetooth/host/gatt/settings/src/main.c
index 12fbed9e8f8..bffb5045b8d 100644
--- a/tests/bsim/bluetooth/host/gatt/settings/src/main.c
+++ b/tests/bsim/bluetooth/host/gatt/settings/src/main.c
@@ -13,12 +13,11 @@
 
 #include <zephyr/sys/__assert.h>
 
+#include "babblekit/testcase.h"
+
 void server_procedure(void);
 void client_procedure(void);
 
-#define BS_SECONDS(dur_sec)    ((bs_time_t)dur_sec * USEC_PER_SEC)
-#define TEST_TIMEOUT_SIMULATED BS_SECONDS(30)
-
 static int test_round;
 static int final_round;
 static char *settings_file;
@@ -50,33 +49,14 @@ static void test_args(int argc, char **argv)
 	bs_trace_raw(0, "Final round %u\n", final_round);
 }
 
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
-}
-
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "server",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = server_procedure,
 		.test_args_f = test_args,
 	},
 	{
 		.test_id = "client",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = client_procedure,
 		.test_args_f = test_args,
 	},
@@ -141,7 +121,7 @@ void backchannel_init(void)
 	ch = bs_open_back_channel(device_number, device_numbers,
 				  channel_numbers, num_ch);
 	if (!ch) {
-		FAIL("Unable to open backchannel\n");
+		TEST_FAIL("Unable to open backchannel");
 	}
 }
 
@@ -197,7 +177,7 @@ void signal_next_test_round(void)
 		backchannel_sync_send(0);
 	}
 
-	PASS("round %d over\n", get_test_round());
+	TEST_PASS("round %d over", get_test_round());
 	stop_all_threads();
 }
 
diff --git a/tests/bsim/bluetooth/host/gatt/settings/src/server.c b/tests/bsim/bluetooth/host/gatt/settings/src/server.c
index 7fff0f72c15..a70550dcd6a 100644
--- a/tests/bsim/bluetooth/host/gatt/settings/src/server.c
+++ b/tests/bsim/bluetooth/host/gatt/settings/src/server.c
@@ -17,6 +17,8 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "babblekit/testcase.h"
+
 void set_public_addr(void)
 {
 	bt_addr_le_t addr = {BT_ADDR_LE_RANDOM,
@@ -200,7 +202,7 @@ void server_procedure(void)
 		server_round_6();
 		break;
 	default:
-		FAIL("Round %d doesn't exist\n", round);
+		TEST_FAIL("Round %d doesn't exist", round);
 		break;
 	}
 
diff --git a/tests/bsim/bluetooth/host/gatt/settings/src/utils.c b/tests/bsim/bluetooth/host/gatt/settings/src/utils.c
index c7cf895d8a2..cad71a91422 100644
--- a/tests/bsim/bluetooth/host/gatt/settings/src/utils.c
+++ b/tests/bsim/bluetooth/host/gatt/settings/src/utils.c
@@ -8,18 +8,18 @@
 #include "gatt_utils.h"
 #include <zephyr/sys/__assert.h>
 #include <zephyr/bluetooth/hci.h>
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 static struct bt_conn *default_conn;
 
-DEFINE_FLAG(flag_is_connected);
-DEFINE_FLAG(flag_test_end);
+DEFINE_FLAG_STATIC(flag_is_connected);
 
 void wait_connected(void)
 {
 	UNSET_FLAG(flag_is_connected);
 	WAIT_FOR_FLAG(flag_is_connected);
 	printk("connected\n");
-
 }
 
 void wait_disconnected(void)
@@ -87,7 +87,7 @@ static void scan_connect_to_first_result_device_found(const bt_addr_le_t *addr,
 
 	/* We're only interested in connectable events */
 	if (type != BT_HCI_ADV_IND && type != BT_HCI_ADV_DIRECT_IND) {
-		FAIL("Unexpected advertisement type.");
+		TEST_FAIL("Unexpected advertisement type.");
 	}
 
 	bt_addr_le_to_str(addr, addr_str, sizeof(addr_str));
@@ -147,7 +147,7 @@ DEFINE_FLAG(flag_pairing_complete);
 
 static void pairing_failed(struct bt_conn *conn, enum bt_security_err reason)
 {
-	FAIL("Pairing failed (unexpected): reason %u", reason);
+	TEST_FAIL("Pairing failed (unexpected): reason %u", reason);
 }
 
 static void pairing_complete(struct bt_conn *conn, bool bonded)
diff --git a/tests/bsim/bluetooth/host/gatt/settings/src/utils.h b/tests/bsim/bluetooth/host/gatt/settings/src/utils.h
index a721edc1d9c..e5e7abf1e73 100644
--- a/tests/bsim/bluetooth/host/gatt/settings/src/utils.h
+++ b/tests/bsim/bluetooth/host/gatt/settings/src/utils.h
@@ -4,57 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bs_tracing.h"
-#include "bs_types.h"
-#include "bstests.h"
-#include "time_machine.h"
-
 #include <errno.h>
 
 #include <zephyr/bluetooth/conn.h>
 
-extern enum bst_result_t bst_result;
-
-#define DECLARE_FLAG(flag) extern atomic_t flag
-#define DEFINE_FLAG(flag)  atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)	   (void)atomic_set(&flag, (atomic_t) true)
-#define UNSET_FLAG(flag)   (void)atomic_set(&flag, (atomic_t) false)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)                                                                  \
-	while ((bool)atomic_get(&flag)) {                                                          \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define TAKE_FLAG(flag)                                                                            \
-	while (!(bool)atomic_cas(&flag, true, false)) {                                            \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-
-#define ASSERT(expr, ...)                                                                          \
-	do {                                                                                       \
-		if (!(expr)) {                                                                     \
-			FAIL(__VA_ARGS__);                                                         \
-		}                                                                                  \
-	} while (0)
-
-DECLARE_FLAG(flag_test_end);
-
-#define FAIL(...)					\
-	SET_FLAG(flag_test_end);			\
-	do {						\
-		bst_result = Failed;			\
-		bs_trace_error_time_line(__VA_ARGS__);	\
-	} while (0)
-
-#define PASS(...)					\
-	SET_FLAG(flag_test_end);			\
-	do {						\
-		bst_result = Passed;			\
-		bs_trace_info_time(1, __VA_ARGS__);	\
-	} while (0)
-
 void disconnect(struct bt_conn *conn);
 void wait_disconnected(void);
 struct bt_conn *get_conn(void);
diff --git a/tests/bsim/bluetooth/host/gatt/settings_clear/src/client.c b/tests/bsim/bluetooth/host/gatt/settings_clear/src/client.c
index 74501617f33..94163a9aed4 100644
--- a/tests/bsim/bluetooth/host/gatt/settings_clear/src/client.c
+++ b/tests/bsim/bluetooth/host/gatt/settings_clear/src/client.c
@@ -27,8 +27,8 @@
 
 LOG_MODULE_REGISTER(client, LOG_LEVEL_DBG);
 
-static DEFINE_FLAG(client_security_changed_flag);
-static DEFINE_FLAG(client_is_subscribed_flag);
+DEFINE_FLAG_STATIC(client_security_changed_flag);
+DEFINE_FLAG_STATIC(client_is_subscribed_flag);
 
 /* Subscription parameters have the same lifetime as a subscription.
  * That is the backing struct should stay valid until a call to
diff --git a/tests/bsim/bluetooth/host/gatt/settings_clear/src/server.c b/tests/bsim/bluetooth/host/gatt/settings_clear/src/server.c
index 50cb684c3f1..c450a2769d3 100644
--- a/tests/bsim/bluetooth/host/gatt/settings_clear/src/server.c
+++ b/tests/bsim/bluetooth/host/gatt/settings_clear/src/server.c
@@ -27,9 +27,9 @@
 
 LOG_MODULE_REGISTER(server, LOG_LEVEL_DBG);
 
-static DEFINE_FLAG(ccc_cfg_changed_flag);
-static DEFINE_FLAG(disconnected_flag);
-static DEFINE_FLAG(security_changed_flag);
+DEFINE_FLAG_STATIC(ccc_cfg_changed_flag);
+DEFINE_FLAG_STATIC(disconnected_flag);
+DEFINE_FLAG_STATIC(security_changed_flag);
 
 static struct bt_conn_cb server_conn_cb;
 
diff --git a/tests/bsim/bluetooth/host/id/settings/CMakeLists.txt b/tests/bsim/bluetooth/host/id/settings/CMakeLists.txt
index 659359fc027..0ebece0d4d0 100644
--- a/tests/bsim/bluetooth/host/id/settings/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/id/settings/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_id_settings)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
   src/main.c
   src/dut.c
diff --git a/tests/bsim/bluetooth/host/id/settings/src/common.h b/tests/bsim/bluetooth/host/id/settings/src/common.h
deleted file mode 100644
index 41d8ba0346e..00000000000
--- a/tests/bsim/bluetooth/host/id/settings/src/common.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright (c) 2023 Nordic Semiconductor ASA
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "bs_tracing.h"
-#include "bstests.h"
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-extern enum bst_result_t bst_result;
diff --git a/tests/bsim/bluetooth/host/id/settings/src/dut.c b/tests/bsim/bluetooth/host/id/settings/src/dut.c
index 572ceaec188..4e5244f995e 100644
--- a/tests/bsim/bluetooth/host/id/settings/src/dut.c
+++ b/tests/bsim/bluetooth/host/id/settings/src/dut.c
@@ -11,7 +11,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/addr.h>
 
-#include "common.h"
+#include "babblekit/testcase.h"
 
 LOG_MODULE_DECLARE(bt_bsim_id_settings, LOG_LEVEL_DBG);
 
@@ -24,14 +24,14 @@ void run_dut1(void)
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 	}
 
 	LOG_DBG("Bluetooth initialised");
 
 	err = settings_load();
 	if (err) {
-		FAIL("Failed to load settings (err %d)\n", err);
+		TEST_FAIL("Failed to load settings (err %d)", err);
 	}
 
 	bt_id_get(NULL, &bt_id_count);
@@ -39,7 +39,7 @@ void run_dut1(void)
 
 	err = bt_id_create(NULL, NULL);
 	if (err < 0) {
-		FAIL("Failed to create a new identity (err %d)\n", err);
+		TEST_FAIL("Failed to create a new identity (err %d)", err);
 	}
 
 	bt_id_get(NULL, &bt_id_count);
@@ -48,7 +48,7 @@ void run_dut1(void)
 	/* Wait for the workqueue to complete before switching device */
 	k_msleep(100);
 
-	PASS("Test passed (DUT 1)\n");
+	TEST_PASS("Test passed (DUT 1)");
 }
 
 void run_dut2(void)
@@ -61,22 +61,22 @@ void run_dut2(void)
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 	}
 
 	LOG_DBG("Bluetooth initialised");
 
 	err = settings_load();
 	if (err) {
-		FAIL("Failed to load settings (err %d)\n", err);
+		TEST_FAIL("Failed to load settings (err %d)", err);
 	}
 
 	LOG_DBG("Settings loaded");
 
 	bt_id_get(NULL, &bt_id_count);
 	if (bt_id_count != expected_id_count) {
-		FAIL("Wrong ID count (got %d; expected %d)\n", bt_id_count, expected_id_count);
+		TEST_FAIL("Wrong ID count (got %d; expected %d)", bt_id_count, expected_id_count);
 	}
 
-	PASS("Test passed (DUT 2)\n");
+	TEST_PASS("Test passed (DUT 2)");
 }
diff --git a/tests/bsim/bluetooth/host/id/settings/src/main.c b/tests/bsim/bluetooth/host/id/settings/src/main.c
index f385270cf97..bd965fc093d 100644
--- a/tests/bsim/bluetooth/host/id/settings/src/main.c
+++ b/tests/bsim/bluetooth/host/id/settings/src/main.c
@@ -4,48 +4,25 @@
 
 #include <zephyr/kernel.h>
 
-#include "bs_types.h"
-#include "bs_tracing.h"
 #include "bstests.h"
 #include <string.h>
 
 #include <zephyr/logging/log.h>
 
-#include "common.h"
-
-#define WAIT_TIME_S 60
-#define WAIT_TIME   (WAIT_TIME_S * 1e6)
-
 LOG_MODULE_REGISTER(bt_bsim_id_settings, LOG_LEVEL_DBG);
 
 extern void run_dut1(void);
 extern void run_dut2(void);
 
-void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		FAIL("Test failed (not passed after %d seconds)\n", WAIT_TIME_S);
-	}
-}
-
-static void test_id_settings_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-}
-
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "dut1",
 		.test_descr = "DUT 1",
-		.test_pre_init_f = test_id_settings_init,
-		.test_tick_f = test_tick,
 		.test_main_f = run_dut1,
 	},
 	{
 		.test_id = "dut2",
 		.test_descr = "DUT 2",
-		.test_pre_init_f = test_id_settings_init,
-		.test_tick_f = test_tick,
 		.test_main_f = run_dut2,
 	},
 	BSTEST_END_MARKER};
diff --git a/tests/bsim/bluetooth/host/iso/bis/src/bis_broadcaster.c b/tests/bsim/bluetooth/host/iso/bis/src/bis_broadcaster.c
index cef7d417ff3..d18bc305053 100644
--- a/tests/bsim/bluetooth/host/iso/bis/src/bis_broadcaster.c
+++ b/tests/bsim/bluetooth/host/iso/bis/src/bis_broadcaster.c
@@ -24,7 +24,7 @@ NET_BUF_POOL_FIXED_DEFINE(tx_pool, CONFIG_BT_ISO_TX_BUF_COUNT,
 			  BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_TX_MTU),
 			  CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
 
-static DEFINE_FLAG(flag_iso_connected);
+DEFINE_FLAG_STATIC(flag_iso_connected);
 
 static void send_data_cb(struct k_work *work);
 K_WORK_DELAYABLE_DEFINE(iso_send_work, send_data_cb);
diff --git a/tests/bsim/bluetooth/host/iso/bis/src/bis_receiver.c b/tests/bsim/bluetooth/host/iso/bis/src/bis_receiver.c
index d4a03284c17..5f80abdd1c1 100644
--- a/tests/bsim/bluetooth/host/iso/bis/src/bis_receiver.c
+++ b/tests/bsim/bluetooth/host/iso/bis/src/bis_receiver.c
@@ -22,11 +22,11 @@ LOG_MODULE_REGISTER(bis_receiver, LOG_LEVEL_INF);
 
 extern enum bst_result_t bst_result;
 
-static DEFINE_FLAG(flag_broadcaster_found);
-static DEFINE_FLAG(flag_iso_connected);
-static DEFINE_FLAG(flag_data_received);
-static DEFINE_FLAG(flag_pa_synced);
-static DEFINE_FLAG(flag_biginfo);
+DEFINE_FLAG_STATIC(flag_broadcaster_found);
+DEFINE_FLAG_STATIC(flag_iso_connected);
+DEFINE_FLAG_STATIC(flag_data_received);
+DEFINE_FLAG_STATIC(flag_pa_synced);
+DEFINE_FLAG_STATIC(flag_biginfo);
 
 static struct bt_iso_chan iso_chans[CONFIG_BT_ISO_MAX_CHAN];
 static struct bt_le_scan_recv_info broadcaster_info;
diff --git a/tests/bsim/bluetooth/host/iso/cis/src/cis_central.c b/tests/bsim/bluetooth/host/iso/cis/src/cis_central.c
index 75c92a9e181..f67afe3d399 100644
--- a/tests/bsim/bluetooth/host/iso/cis/src/cis_central.c
+++ b/tests/bsim/bluetooth/host/iso/cis/src/cis_central.c
@@ -27,7 +27,7 @@ NET_BUF_POOL_FIXED_DEFINE(tx_pool, ENQUEUE_COUNT, BT_ISO_SDU_BUF_SIZE(CONFIG_BT_
 
 BUILD_ASSERT(CONFIG_BT_ISO_MAX_CHAN > 1, "CONFIG_BT_ISO_MAX_CHAN shall be at least 2");
 
-static DEFINE_FLAG(flag_iso_connected);
+DEFINE_FLAG_STATIC(flag_iso_connected);
 
 static void send_data_cb(struct k_work *work)
 {
diff --git a/tests/bsim/bluetooth/host/iso/cis/src/cis_peripheral.c b/tests/bsim/bluetooth/host/iso/cis/src/cis_peripheral.c
index abd7bba1c5a..ef0ede7b081 100644
--- a/tests/bsim/bluetooth/host/iso/cis/src/cis_peripheral.c
+++ b/tests/bsim/bluetooth/host/iso/cis/src/cis_peripheral.c
@@ -18,7 +18,7 @@
 
 extern enum bst_result_t bst_result;
 
-static DEFINE_FLAG(flag_data_received);
+DEFINE_FLAG_STATIC(flag_data_received);
 
 static const struct bt_data ad[] = {
 	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
diff --git a/tests/bsim/bluetooth/host/iso/frag/src/broadcaster.c b/tests/bsim/bluetooth/host/iso/frag/src/broadcaster.c
index 87dfd08f7ce..cdc9d68acee 100644
--- a/tests/bsim/bluetooth/host/iso/frag/src/broadcaster.c
+++ b/tests/bsim/bluetooth/host/iso/frag/src/broadcaster.c
@@ -21,8 +21,8 @@ NET_BUF_POOL_FIXED_DEFINE(tx_pool, CONFIG_BT_ISO_TX_BUF_COUNT,
 			  BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_TX_MTU),
 			  CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
 
-static DEFINE_FLAG(iso_connected);
-static DEFINE_FLAG(sdu_sent);
+DEFINE_FLAG_STATIC(iso_connected);
+DEFINE_FLAG_STATIC(sdu_sent);
 
 static int send_data(struct bt_iso_chan *chan, bool ts)
 {
diff --git a/tests/bsim/bluetooth/host/iso/frag_2/src/broadcaster.c b/tests/bsim/bluetooth/host/iso/frag_2/src/broadcaster.c
index 6b70c3fd056..c5491a5520f 100644
--- a/tests/bsim/bluetooth/host/iso/frag_2/src/broadcaster.c
+++ b/tests/bsim/bluetooth/host/iso/frag_2/src/broadcaster.c
@@ -22,9 +22,9 @@ NET_BUF_POOL_FIXED_DEFINE(tx_pool, CONFIG_BT_ISO_TX_BUF_COUNT,
 			  BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_TX_MTU),
 			  CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
 
-static DEFINE_FLAG(iso_connected);
-static DEFINE_FLAG(first_frag);
-static DEFINE_FLAG(sdu_sent);
+DEFINE_FLAG_STATIC(iso_connected);
+DEFINE_FLAG_STATIC(first_frag);
+DEFINE_FLAG_STATIC(sdu_sent);
 
 extern void bt_conn_suspend_tx(bool suspend);
 extern void bt_testing_set_iso_mtu(uint16_t mtu);
diff --git a/tests/bsim/bluetooth/host/l2cap/credits/src/main.c b/tests/bsim/bluetooth/host/l2cap/credits/src/main.c
index 8e7df0f5ade..a667a7601a6 100644
--- a/tests/bsim/bluetooth/host/l2cap/credits/src/main.c
+++ b/tests/bsim/bluetooth/host/l2cap/credits/src/main.c
@@ -23,8 +23,8 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_DBG);
 
-static DEFINE_FLAG(is_connected);
-static DEFINE_FLAG(flag_l2cap_connected);
+DEFINE_FLAG_STATIC(is_connected);
+DEFINE_FLAG_STATIC(flag_l2cap_connected);
 
 #define L2CAP_MPS       CONFIG_BT_L2CAP_TX_MTU
 #define SDU_NUM         3
diff --git a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/src/main.c b/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/src/main.c
index d06188510c4..07ee76eed26 100644
--- a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/src/main.c
+++ b/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/src/main.c
@@ -21,8 +21,8 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_DBG);
 
-static DEFINE_FLAG(is_connected);
-static DEFINE_FLAG(flag_l2cap_connected);
+DEFINE_FLAG_STATIC(is_connected);
+DEFINE_FLAG_STATIC(flag_l2cap_connected);
 
 #define L2CAP_MPS CONFIG_BT_L2CAP_TX_MTU
 #define SDU_NUM   3
diff --git a/tests/bsim/bluetooth/host/l2cap/general/src/main_l2cap_ecred.c b/tests/bsim/bluetooth/host/l2cap/general/src/main_l2cap_ecred.c
index 4cd2f619ff7..87fd1f169cb 100644
--- a/tests/bsim/bluetooth/host/l2cap/general/src/main_l2cap_ecred.c
+++ b/tests/bsim/bluetooth/host/l2cap/general/src/main_l2cap_ecred.c
@@ -66,8 +66,8 @@ struct channel {
 };
 static struct channel channels[L2CAP_CHANNELS];
 
-static DEFINE_FLAG(is_connected);
-static DEFINE_FLAG(unsequenced_data);
+DEFINE_FLAG_STATIC(is_connected);
+DEFINE_FLAG_STATIC(unsequenced_data);
 
 #define T_STACK_SIZE 512
 #define T_PRIORITY 5
diff --git a/tests/bsim/bluetooth/host/l2cap/many_conns/src/main.c b/tests/bsim/bluetooth/host/l2cap/many_conns/src/main.c
index 174d3739086..ff9f3030d1e 100644
--- a/tests/bsim/bluetooth/host/l2cap/many_conns/src/main.c
+++ b/tests/bsim/bluetooth/host/l2cap/many_conns/src/main.c
@@ -23,8 +23,8 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_INF);
 
-static DEFINE_FLAG(is_connected);
-static DEFINE_FLAG(flag_l2cap_connected);
+DEFINE_FLAG_STATIC(is_connected);
+DEFINE_FLAG_STATIC(flag_l2cap_connected);
 
 #define NUM_PERIPHERALS CONFIG_BT_MAX_CONN
 #define L2CAP_CHANS     NUM_PERIPHERALS
diff --git a/tests/bsim/bluetooth/host/l2cap/multilink_peripheral/src/dut.c b/tests/bsim/bluetooth/host/l2cap/multilink_peripheral/src/dut.c
index e62eb7f6772..9fa65ce4336 100644
--- a/tests/bsim/bluetooth/host/l2cap/multilink_peripheral/src/dut.c
+++ b/tests/bsim/bluetooth/host/l2cap/multilink_peripheral/src/dut.c
@@ -18,7 +18,7 @@
 
 LOG_MODULE_REGISTER(dut, CONFIG_APP_LOG_LEVEL);
 
-static DEFINE_FLAG(ADVERTISING);
+DEFINE_FLAG_STATIC(ADVERTISING);
 
 static void sdu_destroy(struct net_buf *buf)
 {
diff --git a/tests/bsim/bluetooth/host/l2cap/reassembly/dut/src/dut.c b/tests/bsim/bluetooth/host/l2cap/reassembly/dut/src/dut.c
index 405fd47beb9..5693f7deccc 100644
--- a/tests/bsim/bluetooth/host/l2cap/reassembly/dut/src/dut.c
+++ b/tests/bsim/bluetooth/host/l2cap/reassembly/dut/src/dut.c
@@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(dut, LOG_LEVEL_DBG);
 
 extern unsigned long runtime_log_level;
 
-static DEFINE_FLAG(got_notification);
+DEFINE_FLAG_STATIC(got_notification);
 
 static uint8_t received_notification(struct bt_conn *conn,
 				     struct bt_gatt_subscribe_params *params,
diff --git a/tests/bsim/bluetooth/host/l2cap/reassembly/peer/src/peer.c b/tests/bsim/bluetooth/host/l2cap/reassembly/peer/src/peer.c
index b17246bb8b0..dd9d0e77fb8 100644
--- a/tests/bsim/bluetooth/host/l2cap/reassembly/peer/src/peer.c
+++ b/tests/bsim/bluetooth/host/l2cap/reassembly/peer/src/peer.c
@@ -283,7 +283,7 @@ static void send_cmd(uint16_t opcode, struct net_buf *cmd, struct net_buf **rsp)
 	}
 
 	k_sem_take(&cmd_sem, K_FOREVER);
-	TEST_ASSERT(active_opcode == 0xFFFF, "");
+	TEST_ASSERT_NO_MSG(active_opcode == 0xFFFF);
 
 	__ASSERT_NO_MSG(opcode);
 	active_opcode = opcode;
@@ -353,7 +353,7 @@ static void set_event_mask(uint16_t opcode)
 
 	/* The two commands have the same length/params */
 	buf = bt_hci_cmd_create(opcode, sizeof(*cp_mask));
-	TEST_ASSERT(buf, "");
+	TEST_ASSERT_NO_MSG(buf);
 
 	/* Forward all events */
 	cp_mask = net_buf_add(buf, sizeof(*cp_mask));
@@ -371,7 +371,7 @@ static void set_random_address(void)
 	LOG_DBG("%s", bt_addr_str(&addr.a));
 
 	buf = bt_hci_cmd_create(BT_HCI_OP_LE_SET_RANDOM_ADDRESS, sizeof(addr.a));
-	TEST_ASSERT(buf, "");
+	TEST_ASSERT_NO_MSG(buf);
 
 	net_buf_add_mem(buf, &addr.a, sizeof(addr.a));
 	send_cmd(BT_HCI_OP_LE_SET_RANDOM_ADDRESS, buf, NULL);
diff --git a/tests/bsim/bluetooth/host/l2cap/send_on_connect/src/main_l2cap_send_on_connect.c b/tests/bsim/bluetooth/host/l2cap/send_on_connect/src/main_l2cap_send_on_connect.c
index 825a8a74a2e..3031fcb7b28 100644
--- a/tests/bsim/bluetooth/host/l2cap/send_on_connect/src/main_l2cap_send_on_connect.c
+++ b/tests/bsim/bluetooth/host/l2cap/send_on_connect/src/main_l2cap_send_on_connect.c
@@ -17,9 +17,9 @@ static struct bt_conn *default_conn;
 
 #define PSM 0x80
 
-static DEFINE_FLAG(is_connected);
-static DEFINE_FLAG(chan_connected);
-static DEFINE_FLAG(data_received);
+DEFINE_FLAG_STATIC(is_connected);
+DEFINE_FLAG_STATIC(chan_connected);
+DEFINE_FLAG_STATIC(data_received);
 
 #define DATA_BYTE_VAL  0xBB
 
diff --git a/tests/bsim/bluetooth/host/l2cap/split/common/utils.h b/tests/bsim/bluetooth/host/l2cap/split/common/utils.h
deleted file mode 100644
index a21a3c324fe..00000000000
--- a/tests/bsim/bluetooth/host/l2cap/split/common/utils.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "bs_tracing.h"
-#include "bs_types.h"
-#include "bstests.h"
-
-#define BS_SECONDS(dur_sec)    ((bs_time_t)dur_sec * USEC_PER_SEC)
-#define TEST_TIMEOUT_SIMULATED BS_SECONDS(30)
-
-extern enum bst_result_t bst_result;
-
-#define DECLARE_FLAG(flag) extern atomic_t flag
-#define DEFINE_FLAG(flag)  atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)	   (void)atomic_set(&flag, (atomic_t) true)
-#define UNSET_FLAG(flag)   (void)atomic_set(&flag, (atomic_t) false)
-
-#define WAIT_FOR_FLAG(flag)			\
-	while (!(bool)atomic_get(&flag)) {	\
-		(void)k_sleep(K_MSEC(1));	\
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)		\
-	while ((bool)atomic_get(&flag)) {	\
-		(void)k_sleep(K_MSEC(1));	\
-	}
-#define TAKE_FLAG(flag)					\
-	while (!(bool)atomic_cas(&flag, true, false)) {	\
-		(void)k_sleep(K_MSEC(1));		\
-	}
-
-#define ASSERT(expr, ...)			\
-	do {					\
-		if (!(expr)) {			\
-			FAIL(__VA_ARGS__);	\
-		}				\
-	} while (0)
-
-#define FAIL(...)					\
-	do {						\
-		bst_result = Failed;			\
-		bs_trace_error_time_line(__VA_ARGS__);	\
-	} while (0)
-
-#define PASS(...)					\
-	do {						\
-		bst_result = Passed;			\
-		bs_trace_info_time(1, __VA_ARGS__);	\
-	} while (0)
diff --git a/tests/bsim/bluetooth/host/l2cap/split/dut/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/split/dut/CMakeLists.txt
index e5120c13de0..bca0f9c5d8f 100644
--- a/tests/bsim/bluetooth/host/l2cap/split/dut/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/l2cap/split/dut/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_l2cap_split_dut)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
   src/main.c
   )
diff --git a/tests/bsim/bluetooth/host/l2cap/split/dut/src/main.c b/tests/bsim/bluetooth/host/l2cap/split/dut/src/main.c
index 72818bee5c2..fad4b90d614 100644
--- a/tests/bsim/bluetooth/host/l2cap/split/dut/src/main.c
+++ b/tests/bsim/bluetooth/host/l2cap/split/dut/src/main.c
@@ -11,16 +11,17 @@
 
 #include "host/hci_core.h"
 #include "common.h"
-#include "utils.h"
-#include "bstests.h"
+
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 #define LOG_MODULE_NAME main
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_INF);
 
-DEFINE_FLAG(is_connected);
-DEFINE_FLAG(flag_l2cap_connected);
-DEFINE_FLAG(flag_l2cap_rx_ok);
+DEFINE_FLAG_STATIC(is_connected);
+DEFINE_FLAG_STATIC(flag_l2cap_connected);
+DEFINE_FLAG_STATIC(flag_l2cap_rx_ok);
 
 static struct bt_l2cap_le_chan test_chan;
 
@@ -115,7 +116,7 @@ static int l2cap_server_register(bt_security_t sec_level)
 
 	int err = bt_l2cap_server_register(&test_l2cap_server);
 
-	ASSERT(err == 0, "Failed to register l2cap server.");
+	TEST_ASSERT(err == 0, "Failed to register l2cap server.");
 
 	return test_l2cap_server.psm;
 }
@@ -127,7 +128,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (conn_err) {
-		FAIL("Failed to connect to %s (%u)", addr, conn_err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, conn_err);
 		return;
 	}
 
@@ -161,7 +162,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 
 	err = bt_le_scan_stop();
 	if (err) {
-		FAIL("Stop LE scan failed (err %d)", err);
+		TEST_FAIL("Stop LE scan failed (err %d)", err);
 		return;
 	}
 
@@ -174,7 +175,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 	param = BT_LE_CONN_PARAM_DEFAULT;
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, param, &conn);
 	if (err) {
-		FAIL("Create conn failed (err %d)", err);
+		TEST_FAIL("Create conn failed (err %d)", err);
 		return;
 	}
 }
@@ -192,7 +193,7 @@ static void connect(void)
 
 	int err = bt_le_scan_start(&scan_param, device_found);
 
-	ASSERT(!err, "Scanning failed to start (err %d)\n", err);
+	TEST_ASSERT(!err, "Scanning failed to start (err %d)", err);
 
 	LOG_DBG("Central initiating connection...");
 	WAIT_FOR_FLAG(is_connected);
@@ -205,7 +206,7 @@ static void disconnect_device(struct bt_conn *conn, void *data)
 	SET_FLAG(is_connected);
 
 	err = bt_conn_disconnect(conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
-	ASSERT(!err, "Failed to initate disconnect (err %d)", err);
+	TEST_ASSERT(!err, "Failed to initate disconnect (err %d)", err);
 
 	LOG_DBG("Waiting for disconnection...");
 	WAIT_FOR_FLAG_UNSET(is_connected);
@@ -221,7 +222,7 @@ static void do_dlu(struct bt_conn *conn, void *data)
 	param.tx_max_time = 1712;
 
 	err = bt_conn_le_data_len_update(conn, &param);
-	ASSERT(err == 0, "Can't update data length (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Can't update data length (err %d)", err);
 }
 
 void test_procedure_0(void)
@@ -230,7 +231,7 @@ void test_procedure_0(void)
 	int err;
 
 	err = bt_enable(NULL);
-	ASSERT(err == 0, "Can't enable Bluetooth (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Can't enable Bluetooth (err %d)", err);
 	LOG_DBG("Central Bluetooth initialized.");
 
 	int psm = l2cap_server_register(BT_SECURITY_L1);
@@ -246,29 +247,12 @@ void test_procedure_0(void)
 
 	bt_conn_foreach(BT_CONN_TYPE_LE, disconnect_device, NULL);
 
-	PASS("DUT done\n");
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
+	TEST_PASS("DUT done");
 }
 
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "test_0",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_procedure_0,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/l2cap/split/tester/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/split/tester/CMakeLists.txt
index d294025336c..6fab142893a 100644
--- a/tests/bsim/bluetooth/host/l2cap/split/tester/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/l2cap/split/tester/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_l2cap_split_tester)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE src/main.c)
 
 zephyr_include_directories(
diff --git a/tests/bsim/bluetooth/host/l2cap/split/tester/src/main.c b/tests/bsim/bluetooth/host/l2cap/split/tester/src/main.c
index 8e5d6522548..af3467948bc 100644
--- a/tests/bsim/bluetooth/host/l2cap/split/tester/src/main.c
+++ b/tests/bsim/bluetooth/host/l2cap/split/tester/src/main.c
@@ -21,16 +21,17 @@
 #include "host/conn_internal.h"
 #include "host/l2cap_internal.h"
 
-#include "utils.h"
 #include "common.h"
-#include "bstests.h"
+
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_tinyhost, 3);
 
-DEFINE_FLAG(is_connected);
-DEFINE_FLAG(flag_l2cap_connected);
-DEFINE_FLAG(flag_data_length_updated);
+DEFINE_FLAG_STATIC(is_connected);
+DEFINE_FLAG_STATIC(flag_l2cap_connected);
+DEFINE_FLAG_STATIC(flag_data_length_updated);
 
 static K_FIFO_DEFINE(rx_queue);
 
@@ -203,10 +204,10 @@ static void handle_sig(struct net_buf *buf)
 		handle_l2cap_credits(buf);
 		return;
 	case BT_L2CAP_DISCONN_REQ:
-		FAIL("channel disconnected\n");
+		TEST_FAIL("channel disconnected");
 		return;
 	default:
-		FAIL("unhandled opcode %x\n", hdr->code);
+		TEST_FAIL("unhandled opcode %x", hdr->code);
 		return;
 	}
 }
@@ -231,7 +232,7 @@ static void handle_l2cap(struct net_buf *buf)
 
 	/* CoC PDU */
 	if (cid == 0x0040) {
-		FAIL("unexpected data rx");
+		TEST_FAIL("unexpected data rx");
 	}
 }
 
@@ -642,29 +643,12 @@ void test_procedure_0(void)
 	WAIT_FOR_FLAG_UNSET(is_connected);
 	LOG_DBG("disconnected");
 
-	PASS("Tester done\n");
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
+	TEST_PASS("Tester done");
 }
 
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "test_0",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_procedure_0,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/src/main.c b/tests/bsim/bluetooth/host/l2cap/stress/src/main.c
index e104fcfae81..d05f4e4f0a7 100644
--- a/tests/bsim/bluetooth/host/l2cap/stress/src/main.c
+++ b/tests/bsim/bluetooth/host/l2cap/stress/src/main.c
@@ -22,8 +22,8 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_INF);
 
-static DEFINE_FLAG(is_connected);
-static DEFINE_FLAG(flag_l2cap_connected);
+DEFINE_FLAG_STATIC(is_connected);
+DEFINE_FLAG_STATIC(flag_l2cap_connected);
 
 #define NUM_PERIPHERALS 6
 #define L2CAP_CHANS     NUM_PERIPHERALS
diff --git a/tests/bsim/bluetooth/host/l2cap/userdata/src/main_l2cap_userdata.c b/tests/bsim/bluetooth/host/l2cap/userdata/src/main_l2cap_userdata.c
index e492036736f..904bb073c3d 100644
--- a/tests/bsim/bluetooth/host/l2cap/userdata/src/main_l2cap_userdata.c
+++ b/tests/bsim/bluetooth/host/l2cap/userdata/src/main_l2cap_userdata.c
@@ -21,10 +21,10 @@ static struct bt_conn *default_conn;
 /* Pool to allocate a buffer that is too large to send */
 NET_BUF_POOL_DEFINE(buf_pool, 1, BT_L2CAP_SDU_BUF_SIZE(DATA_SIZE), USER_DATA_SIZE, NULL);
 
-static DEFINE_FLAG(is_connected);
-static DEFINE_FLAG(is_sent);
-static DEFINE_FLAG(has_received);
-static DEFINE_FLAG(chan_connected);
+DEFINE_FLAG_STATIC(is_connected);
+DEFINE_FLAG_STATIC(is_sent);
+DEFINE_FLAG_STATIC(has_received);
+DEFINE_FLAG_STATIC(chan_connected);
 
 static void chan_connected_cb(struct bt_l2cap_chan *l2cap_chan)
 {
diff --git a/tests/bsim/bluetooth/host/misc/acl_tx_frag/src/dut.c b/tests/bsim/bluetooth/host/misc/acl_tx_frag/src/dut.c
index 6fe11230201..b09d192b14e 100644
--- a/tests/bsim/bluetooth/host/misc/acl_tx_frag/src/dut.c
+++ b/tests/bsim/bluetooth/host/misc/acl_tx_frag/src/dut.c
@@ -27,11 +27,11 @@
 
 LOG_MODULE_REGISTER(dut, LOG_LEVEL_DBG);
 
-static DEFINE_FLAG(is_subscribed);
-static DEFINE_FLAG(mtu_has_been_exchanged);
-static DEFINE_FLAG(conn_recycled);
-static DEFINE_FLAG(conn_param_updated);
-static DEFINE_FLAG(indicated);
+DEFINE_FLAG_STATIC(is_subscribed);
+DEFINE_FLAG_STATIC(mtu_has_been_exchanged);
+DEFINE_FLAG_STATIC(conn_recycled);
+DEFINE_FLAG_STATIC(conn_param_updated);
+DEFINE_FLAG_STATIC(indicated);
 
 extern unsigned long runtime_log_level;
 
diff --git a/tests/bsim/bluetooth/host/misc/acl_tx_frag/src/peer.c b/tests/bsim/bluetooth/host/misc/acl_tx_frag/src/peer.c
index af48857808a..da130c1dc70 100644
--- a/tests/bsim/bluetooth/host/misc/acl_tx_frag/src/peer.c
+++ b/tests/bsim/bluetooth/host/misc/acl_tx_frag/src/peer.c
@@ -25,8 +25,8 @@
 
 LOG_MODULE_REGISTER(peer, LOG_LEVEL_DBG);
 
-static DEFINE_FLAG(is_subscribed);
-static DEFINE_FLAG(got_notification_1);
+DEFINE_FLAG_STATIC(is_subscribed);
+DEFINE_FLAG_STATIC(got_notification_1);
 
 extern unsigned long runtime_log_level;
 
diff --git a/tests/bsim/bluetooth/host/misc/disable/src/gatt_client_test.c b/tests/bsim/bluetooth/host/misc/disable/src/gatt_client_test.c
index 4d53d60a7ec..7608641f178 100644
--- a/tests/bsim/bluetooth/host/misc/disable/src/gatt_client_test.c
+++ b/tests/bsim/bluetooth/host/misc/disable/src/gatt_client_test.c
@@ -18,10 +18,10 @@
 #include "babblekit/flags.h"
 #include "common.h"
 
-static DEFINE_FLAG(flag_is_connected);
-static DEFINE_FLAG(flag_discover_complete);
-static DEFINE_FLAG(flag_write_complete);
-static DEFINE_FLAG(flag_read_complete);
+DEFINE_FLAG_STATIC(flag_is_connected);
+DEFINE_FLAG_STATIC(flag_discover_complete);
+DEFINE_FLAG_STATIC(flag_write_complete);
+DEFINE_FLAG_STATIC(flag_read_complete);
 
 static struct bt_conn *g_conn;
 static uint16_t chrc_handle;
diff --git a/tests/bsim/bluetooth/host/misc/disable/src/gatt_server_test.c b/tests/bsim/bluetooth/host/misc/disable/src/gatt_server_test.c
index 613f76d5c22..0c8b4b9b330 100644
--- a/tests/bsim/bluetooth/host/misc/disable/src/gatt_server_test.c
+++ b/tests/bsim/bluetooth/host/misc/disable/src/gatt_server_test.c
@@ -20,7 +20,7 @@
 
 extern enum bst_result_t bst_result;
 
-static DEFINE_FLAG(flag_is_connected);
+DEFINE_FLAG_STATIC(flag_is_connected);
 
 #define NUM_ITERATIONS 10
 
diff --git a/tests/bsim/bluetooth/host/misc/disconnect/common/common.h b/tests/bsim/bluetooth/host/misc/disconnect/common/common.h
new file mode 100644
index 00000000000..732b2afc4b5
--- /dev/null
+++ b/tests/bsim/bluetooth/host/misc/disconnect/common/common.h
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define HVX_HANDLE           0x0012
+#define INDICATION_PAYLOAD   "indication"
+#define NOTIFICATION_PAYLOAD "notification"
diff --git a/tests/bsim/bluetooth/host/misc/disconnect/common/sync.c b/tests/bsim/bluetooth/host/misc/disconnect/common/sync.c
deleted file mode 100644
index d66a01832b3..00000000000
--- a/tests/bsim/bluetooth/host/misc/disconnect/common/sync.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/sys/util.h>
-#include "argparse.h"
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "time_machine.h"
-#include "bstests.h"
-#include "bs_pc_backchannel.h"
-
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(sync, LOG_LEVEL_INF);
-
-#define CHANNEL_ID 0
-#define MSG_SIZE 1
-
-int backchannel_init(void)
-{
-	uint device_number = get_device_nbr();
-	uint peer_number = device_number ^ 1;
-	uint device_numbers[] = { peer_number };
-	uint channel_numbers[] = { CHANNEL_ID };
-	uint *ch;
-
-	ch = bs_open_back_channel(device_number, device_numbers, channel_numbers,
-				  ARRAY_SIZE(channel_numbers));
-
-	if (!ch) {
-		return -1;
-	}
-
-	return 0;
-}
-
-void backchannel_sync_send(void)
-{
-	uint8_t sync_msg[MSG_SIZE] = { get_device_nbr() };
-
-	LOG_INF("Sending sync");
-	bs_bc_send_msg(CHANNEL_ID, sync_msg, ARRAY_SIZE(sync_msg));
-}
-
-void backchannel_sync_wait(void)
-{
-	uint8_t sync_msg[MSG_SIZE];
-
-	while (true) {
-		if (bs_bc_is_msg_received(CHANNEL_ID) > 0) {
-			bs_bc_receive_msg(CHANNEL_ID, sync_msg, ARRAY_SIZE(sync_msg));
-			if (sync_msg[0] != get_device_nbr()) {
-				/* Received a message from another device, exit */
-				break;
-			}
-		}
-
-		k_sleep(K_MSEC(1));
-	}
-
-	LOG_INF("Sync received");
-}
diff --git a/tests/bsim/bluetooth/host/misc/disconnect/common/sync.h b/tests/bsim/bluetooth/host/misc/disconnect/common/sync.h
deleted file mode 100644
index aa3ef4e48ce..00000000000
--- a/tests/bsim/bluetooth/host/misc/disconnect/common/sync.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-int backchannel_init(void);
-void backchannel_sync_send(void);
-void backchannel_sync_wait(void);
diff --git a/tests/bsim/bluetooth/host/misc/disconnect/common/utils.h b/tests/bsim/bluetooth/host/misc/disconnect/common/utils.h
deleted file mode 100644
index d5be7e04bb3..00000000000
--- a/tests/bsim/bluetooth/host/misc/disconnect/common/utils.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "bs_tracing.h"
-#include "bs_types.h"
-#include "bstests.h"
-
-#define BS_SECONDS(dur_sec)    ((bs_time_t)dur_sec * USEC_PER_SEC)
-#define TEST_TIMEOUT_SIMULATED BS_SECONDS(10)
-
-extern enum bst_result_t bst_result;
-
-#define DECLARE_FLAG(flag) extern atomic_t flag
-#define DEFINE_FLAG(flag)  atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)     (void)atomic_set(&flag, (atomic_t) true)
-#define UNSET_FLAG(flag)   (void)atomic_set(&flag, (atomic_t) false)
-
-#define WAIT_FOR_EXPR(var, expr)                                                                   \
-	while (atomic_get(&var) expr) {                                                            \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_VAL(var, val)                                                                     \
-	while (atomic_get(&var) != val) {                                                          \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)                                                                  \
-	while ((bool)atomic_get(&flag)) {                                                          \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define TAKE_FLAG(flag)                                                                            \
-	while (!(bool)atomic_cas(&flag, true, false)) {                                            \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-
-#define ASSERT(expr, ...)                                                                          \
-	do {                                                                                       \
-		if (!(expr)) {                                                                     \
-			FAIL(__VA_ARGS__);                                                         \
-		}                                                                                  \
-	} while (0)
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-#define HVX_HANDLE 0x0012
-#define INDICATION_PAYLOAD "indication"
-#define NOTIFICATION_PAYLOAD "notification"
diff --git a/tests/bsim/bluetooth/host/misc/disconnect/dut/CMakeLists.txt b/tests/bsim/bluetooth/host/misc/disconnect/dut/CMakeLists.txt
index 9546e14eeb2..00e3d30dab8 100644
--- a/tests/bsim/bluetooth/host/misc/disconnect/dut/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/misc/disconnect/dut/CMakeLists.txt
@@ -5,9 +5,11 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_disconnect_dut)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
   src/main.c
-  ../common/sync.c
 )
 
 zephyr_include_directories(
diff --git a/tests/bsim/bluetooth/host/misc/disconnect/dut/src/main.c b/tests/bsim/bluetooth/host/misc/disconnect/dut/src/main.c
index 90a70c30c52..6e63aa8a604 100644
--- a/tests/bsim/bluetooth/host/misc/disconnect/dut/src/main.c
+++ b/tests/bsim/bluetooth/host/misc/disconnect/dut/src/main.c
@@ -16,16 +16,18 @@
 #include <zephyr/bluetooth/uuid.h>
 #include <zephyr/bluetooth/conn.h>
 
-#include "utils.h"
-#include "sync.h"
-#include "bstests.h"
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+#include "babblekit/sync.h"
+
+#include "common.h"
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dut, LOG_LEVEL_INF);
 
-DEFINE_FLAG(is_connected);
-DEFINE_FLAG(is_subscribed);
-DEFINE_FLAG(flag_data_length_updated);
+DEFINE_FLAG_STATIC(is_connected);
+DEFINE_FLAG_STATIC(is_subscribed);
+DEFINE_FLAG_STATIC(flag_data_length_updated);
 
 static atomic_t notifications;
 
@@ -41,7 +43,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (conn_err) {
-		FAIL("Failed to connect to %s (%u)", addr, conn_err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, conn_err);
 		return;
 	}
 
@@ -81,7 +83,7 @@ static void do_dlu(void)
 	param.tx_max_time = 2500;
 
 	err = bt_conn_le_data_len_update(dconn, &param);
-	ASSERT(err == 0, "Can't update data length (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Can't update data length (err %d)", err);
 
 	WAIT_FOR_FLAG(flag_data_length_updated);
 }
@@ -102,7 +104,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 
 	err = bt_le_scan_stop();
 	if (err) {
-		FAIL("Stop LE scan failed (err %d)", err);
+		TEST_FAIL("Stop LE scan failed (err %d)", err);
 		return;
 	}
 
@@ -112,7 +114,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 	param = BT_LE_CONN_PARAM_DEFAULT;
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, param, &conn);
 	if (err) {
-		FAIL("Create conn failed (err %d)", err);
+		TEST_FAIL("Create conn failed (err %d)", err);
 		return;
 	}
 }
@@ -130,7 +132,7 @@ static void connect(void)
 	UNSET_FLAG(is_connected);
 
 	err = bt_le_scan_start(&scan_param, device_found);
-	ASSERT(!err, "Scanning failed to start (err %d)\n", err);
+	TEST_ASSERT(!err, "Scanning failed to start (err %d)", err);
 
 	LOG_DBG("Central initiating connection...");
 	WAIT_FOR_FLAG(is_connected);
@@ -156,21 +158,21 @@ static uint8_t notified(struct bt_conn *conn, struct bt_gatt_subscribe_params *p
 		return BT_GATT_ITER_CONTINUE;
 	}
 
-	ASSERT(length >= sizeof(indication), "Unexpected data\n");
-	ASSERT(length <= sizeof(notification), "Unexpected data\n");
+	TEST_ASSERT(length >= sizeof(indication), "Unexpected data");
+	TEST_ASSERT(length <= sizeof(notification), "Unexpected data");
 
 	is_nfy = memcmp(data, notification, length) == 0;
 
 	LOG_INF("%s from 0x%x", is_nfy ? "notified" : "indicated",
 		params->value_handle);
 
-	ASSERT(is_nfy, "Unexpected indication\n");
+	TEST_ASSERT(is_nfy, "Unexpected indication");
 
 	atomic_inc(&notifications);
 
 	if (atomic_get(&notifications) == 3) {
 		LOG_INF("##################### BRB..");
-		backchannel_sync_send();
+		bk_sync_send();
 
 		/* Make scheduler rotate us in and out multiple times */
 		for (int i = 0; i < 10; i++) {
@@ -189,9 +191,9 @@ static void subscribed(struct bt_conn *conn,
 		       uint8_t err,
 		       struct bt_gatt_subscribe_params *params)
 {
-	ASSERT(!err, "Subscribe failed (err %d)\n", err);
+	TEST_ASSERT(!err, "Subscribe failed (err %d)", err);
 
-	ASSERT(params, "params is NULL\n");
+	TEST_ASSERT(params, "params is NULL");
 
 	SET_FLAG(is_subscribed);
 	/* spoiler: tester doesn't really have attributes */
@@ -212,20 +214,20 @@ void subscribe(void)
 	};
 
 	err = bt_gatt_subscribe(dconn, &params);
-	ASSERT(!err, "Subscribe failed (err %d)\n", err);
+	TEST_ASSERT(!err, "Subscribe failed (err %d)", err);
 
 	WAIT_FOR_FLAG(is_subscribed);
 }
 
 void test_procedure_0(void)
 {
-	ASSERT(backchannel_init() == 0, "Failed to open backchannel\n");
+	TEST_ASSERT(bk_sync_init() == 0, "Failed to open backchannel");
 
 	LOG_DBG("Test start: ATT disconnect protocol");
 	int err;
 
 	err = bt_enable(NULL);
-	ASSERT(err == 0, "Can't enable Bluetooth (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Can't enable Bluetooth (err %d)", err);
 	LOG_DBG("Central: Bluetooth initialized.");
 
 	/* Test purpose:
@@ -255,35 +257,18 @@ void test_procedure_0(void)
 
 	do_dlu();
 
-	WAIT_FOR_EXPR(notifications, < 4);
+	WAIT_FOR(atomic_get(&notifications) < 4, 10000, k_msleep(1));
 
 	WAIT_FOR_FLAG_UNSET(is_connected);
 
 	LOG_INF("##################### END TEST #####################");
 
-	PASS("DUT exit\n");
-}
-
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
+	TEST_PASS("DUT exit");
 }
 
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "dut",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_procedure_0,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/misc/disconnect/tester/CMakeLists.txt b/tests/bsim/bluetooth/host/misc/disconnect/tester/CMakeLists.txt
index e3a567377ef..c734daa5603 100644
--- a/tests/bsim/bluetooth/host/misc/disconnect/tester/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/misc/disconnect/tester/CMakeLists.txt
@@ -5,9 +5,11 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_disconnect_tester)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
   src/main.c
-  ../common/sync.c
 )
 
 zephyr_include_directories(
diff --git a/tests/bsim/bluetooth/host/misc/disconnect/tester/src/main.c b/tests/bsim/bluetooth/host/misc/disconnect/tester/src/main.c
index 6f5dff3bafe..48923faa980 100644
--- a/tests/bsim/bluetooth/host/misc/disconnect/tester/src/main.c
+++ b/tests/bsim/bluetooth/host/misc/disconnect/tester/src/main.c
@@ -21,11 +21,13 @@
 #include "host/conn_internal.h"
 #include "host/l2cap_internal.h"
 
-#include "utils.h"
-#include "sync.h"
-#include "bstests.h"
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+#include "babblekit/sync.h"
 #include "NRF_HWLowL.h"		/* for hwll_disconnect_phy(); */
 
+#include "common.h"
+
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_tinyhost, LOG_LEVEL_INF);
 
@@ -39,8 +41,8 @@ LOG_MODULE_REGISTER(bt_tinyhost, LOG_LEVEL_INF);
 #define BT_ATT_OP_WRITE_CMD 0x52
 #define BT_L2CAP_CID_ATT    0x0004
 
-DEFINE_FLAG(is_connected);
-DEFINE_FLAG(flag_data_length_updated);
+DEFINE_FLAG_STATIC(is_connected);
+DEFINE_FLAG_STATIC(flag_data_length_updated);
 
 static K_FIFO_DEFINE(rx_queue);
 
@@ -63,7 +65,7 @@ struct net_buf *bt_hci_cmd_create(uint16_t opcode, uint8_t param_len)
 	LOG_DBG("opcode 0x%04x param_len %u", opcode, param_len);
 
 	buf = net_buf_alloc(&hci_cmd_pool, K_FOREVER);
-	ASSERT(buf, "failed allocation");
+	TEST_ASSERT(buf, "failed allocation");
 
 	LOG_DBG("buf %p", buf);
 
@@ -106,14 +108,14 @@ static void handle_cmd_complete(struct net_buf *buf)
 		opcode = sys_le16_to_cpu(evt->opcode);
 
 	} else {
-		FAIL("unhandled event 0x%x", hdr->evt);
+		TEST_FAIL("unhandled event 0x%x", hdr->evt);
 	}
 
 	LOG_DBG("opcode 0x%04x status %x", opcode, status);
 
-	ASSERT(status == 0x00, "cmd status: %x", status);
+	TEST_ASSERT(status == 0x00, "cmd status: %x", status);
 
-	ASSERT(active_opcode == opcode, "unexpected opcode %x != %x", active_opcode, opcode);
+	TEST_ASSERT(active_opcode == opcode, "unexpected opcode %x != %x", active_opcode, opcode);
 
 	if (active_opcode) {
 		active_opcode = 0xFFFF;
@@ -188,8 +190,8 @@ static void handle_att_write(struct net_buf *buf)
 
 	static uint8_t ccc_write[2] = {0x03, 0x00};
 
-	ASSERT(buf->len == 2, "unexpected write length: %d\n", buf->len);
-	ASSERT(memcmp(buf->data, ccc_write, sizeof(ccc_write)) == 0, "bad data\n");
+	TEST_ASSERT(buf->len == 2, "unexpected write length: %d", buf->len);
+	TEST_ASSERT(memcmp(buf->data, ccc_write, sizeof(ccc_write)) == 0, "bad data");
 
 	send_write_rsp();
 }
@@ -207,7 +209,7 @@ static void handle_att(struct net_buf *buf)
 		return;
 	default:
 		LOG_HEXDUMP_ERR(buf->data, buf->len, "payload");
-		FAIL("unhandled opcode %x\n", op);
+		TEST_FAIL("unhandled opcode %x", op);
 		return;
 	}
 }
@@ -224,10 +226,9 @@ static void handle_l2cap(struct net_buf *buf)
 	LOG_HEXDUMP_DBG(buf->data, buf->len, "l2cap");
 
 	/* Make sure we don't have to recombine packets */
-	ASSERT(buf->len == hdr->len, "buflen = %d != hdrlen %d",
-	       buf->len, hdr->len);
+	TEST_ASSERT(buf->len == hdr->len, "buflen = %d != hdrlen %d", buf->len, hdr->len);
 
-	ASSERT(cid == BT_L2CAP_CID_ATT, "We only support (U)ATT");
+	TEST_ASSERT(cid == BT_L2CAP_CID_ATT, "We only support (U)ATT");
 
 	/* (U)ATT PDU */
 	handle_att(buf);
@@ -246,8 +247,7 @@ static void handle_acl(struct net_buf *buf)
 	flags = bt_acl_flags(handle);
 	handle = bt_acl_handle(handle);
 
-	ASSERT(flags == BT_ACL_START,
-	       "Fragmentation not supported");
+	TEST_ASSERT(flags == BT_ACL_START, "Fragmentation not supported");
 
 	LOG_DBG("ACL: conn %d len %d flags %d", handle, len, flags);
 	LOG_HEXDUMP_DBG(buf->data, buf->len, "HCI ACL");
@@ -307,7 +307,7 @@ static void send_cmd(uint16_t opcode, struct net_buf *cmd, struct net_buf **rsp)
 	}
 
 	k_sem_take(&cmd_sem, K_FOREVER);
-	ASSERT(active_opcode == 0xFFFF, "");
+	TEST_ASSERT_NO_MSG(active_opcode == 0xFFFF);
 
 	active_opcode = opcode;
 
@@ -376,7 +376,7 @@ static void write_default_data_len(uint16_t tx_octets, uint16_t tx_time)
 	struct bt_hci_cp_le_write_default_data_len *cp;
 	struct net_buf *buf = bt_hci_cmd_create(BT_HCI_OP_LE_WRITE_DEFAULT_DATA_LEN, sizeof(*cp));
 
-	ASSERT(buf, "");
+	TEST_ASSERT_NO_MSG(buf);
 
 	cp = net_buf_add(buf, sizeof(*cp));
 	cp->max_tx_octets = sys_cpu_to_le16(tx_octets);
@@ -401,7 +401,7 @@ static void set_event_mask(uint16_t opcode)
 
 	/* The two commands have the same length/params */
 	buf = bt_hci_cmd_create(opcode, sizeof(*cp_mask));
-	ASSERT(buf, "");
+	TEST_ASSERT_NO_MSG(buf);
 
 	/* Forward all events */
 	cp_mask = net_buf_add(buf, sizeof(*cp_mask));
@@ -419,7 +419,7 @@ static void set_random_address(void)
 	LOG_DBG("%s", bt_addr_str(&addr.a));
 
 	buf = bt_hci_cmd_create(BT_HCI_OP_LE_SET_RANDOM_ADDRESS, sizeof(addr.a));
-	ASSERT(buf, "");
+	TEST_ASSERT_NO_MSG(buf);
 
 	net_buf_add_mem(buf, &addr.a, sizeof(addr.a));
 	send_cmd(BT_HCI_OP_LE_SET_RANDOM_ADDRESS, buf, NULL);
@@ -459,7 +459,7 @@ struct net_buf *alloc_l2cap_pdu(void)
 	uint16_t reserve;
 
 	buf = net_buf_alloc(&acl_tx_pool, K_FOREVER);
-	ASSERT(buf, "failed ACL allocation");
+	TEST_ASSERT(buf, "failed ACL allocation");
 
 	reserve = sizeof(struct bt_l2cap_hdr);
 	reserve += sizeof(struct bt_hci_acl_hdr) + BT_BUF_RESERVE;
@@ -494,8 +494,7 @@ static void send_l2cap_packet(struct net_buf *buf, uint16_t cid)
 	hdr->cid = sys_cpu_to_le16(cid);
 
 	/* Always entire packets, no HCI fragmentation */
-	ASSERT(buf->len <= CONFIG_BT_BUF_ACL_TX_SIZE,
-	       "Fragmentation not supported");
+	TEST_ASSERT(buf->len <= CONFIG_BT_BUF_ACL_TX_SIZE, "Fragmentation not supported");
 
 	send_acl(buf);
 }
@@ -546,7 +545,7 @@ static void init_tinyhost(void)
 
 void test_procedure_0(void)
 {
-	ASSERT(backchannel_init() == 0, "Failed to open backchannel\n");
+	TEST_ASSERT(bk_sync_init() == 0, "Failed to open backchannel");
 
 	init_tinyhost();
 
@@ -565,7 +564,7 @@ void test_procedure_0(void)
 	}
 
 	/* Wait until DUT starts sleeping */
-	backchannel_sync_wait();
+	bk_sync_wait();
 
 	/* Send some more, so DUT has some more data to process before having to
 	 * handle the disconnect.
@@ -583,30 +582,13 @@ void test_procedure_0(void)
 	hwll_disconnect_phy();
 
 	/* Pass has to be before the exit() for process to not error out */
-	PASS("Tester exit\n");
+	TEST_PASS("Tester exit");
 	bs_trace_silent_exit(0);
 }
 
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
-}
-
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "tester",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = test_procedure_0,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/misc/hfc/CMakeLists.txt b/tests/bsim/bluetooth/host/misc/hfc/CMakeLists.txt
index 3a65df76512..411978a885b 100644
--- a/tests/bsim/bluetooth/host/misc/hfc/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/misc/hfc/CMakeLists.txt
@@ -6,6 +6,7 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(bsim_test_hfc)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
 add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/common/testlib testlib)
 
 target_sources(app PRIVATE
@@ -18,4 +19,5 @@ zephyr_include_directories(
 
 target_link_libraries(app PRIVATE
   testlib
+  babblekit
 )
diff --git a/tests/bsim/bluetooth/host/misc/hfc/src/main.c b/tests/bsim/bluetooth/host/misc/hfc/src/main.c
index 7c70511c32f..1cb5f32091b 100644
--- a/tests/bsim/bluetooth/host/misc/hfc/src/main.c
+++ b/tests/bsim/bluetooth/host/misc/hfc/src/main.c
@@ -19,14 +19,14 @@
 #include "testlib/att_read.h"
 
 #include <argparse.h>		/* For get_device_nbr() */
-#include "utils.h"
-#include "bstests.h"
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main, LOG_LEVEL_INF);
 
-DEFINE_FLAG(is_connected);
-DEFINE_FLAG(is_subscribed);
+DEFINE_FLAG_STATIC(is_connected);
+DEFINE_FLAG_STATIC(is_subscribed);
 
 /* Default connection */
 static struct bt_conn *dconn;
@@ -47,7 +47,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (conn_err) {
-		FAIL("Failed to connect to %s (%u)", addr, conn_err);
+		TEST_FAIL("Failed to connect to %s (%u)", addr, conn_err);
 		return;
 	}
 
@@ -90,7 +90,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 
 	err = bt_le_scan_stop();
 	if (err) {
-		FAIL("Stop LE scan failed (err %d)", err);
+		TEST_FAIL("Stop LE scan failed (err %d)", err);
 		return;
 	}
 
@@ -101,7 +101,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, param, &conn);
 	if (err) {
 		k_oops();
-		FAIL("Create conn failed (err %d)", err);
+		TEST_FAIL("Create conn failed (err %d)", err);
 		return;
 	}
 }
@@ -114,7 +114,7 @@ static struct bt_conn *connect_as_peripheral(void)
 	UNSET_FLAG(is_connected);
 
 	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, NULL, 0, NULL, 0);
-	ASSERT(!err, "Adving failed to start (err %d)\n", err);
+	TEST_ASSERT(!err, "Adving failed to start (err %d)", err);
 
 	LOG_DBG("advertising");
 	WAIT_FOR_FLAG(is_connected);
@@ -140,7 +140,7 @@ static struct bt_conn *connect_as_central(void)
 	UNSET_FLAG(is_connected);
 
 	err = bt_le_scan_start(&scan_param, device_found);
-	ASSERT(!err, "Scanning failed to start (err %d)\n", err);
+	TEST_ASSERT(!err, "Scanning failed to start (err %d)", err);
 
 	LOG_DBG("Central initiating connection...");
 	WAIT_FOR_FLAG(is_connected);
@@ -163,14 +163,14 @@ static void find_the_chrc(struct bt_conn *conn,
 	int err;
 
 	err = bt_testlib_gatt_discover_primary(&svc_handle, &svc_end_handle, conn, svc, 1, 0xffff);
-	ASSERT(!err, "Failed to discover service %d");
+	TEST_ASSERT(!err, "Failed to discover service %d");
 
 	LOG_DBG("svc_handle: %u, svc_end_handle: %u", svc_handle, svc_end_handle);
 
 	err = bt_testlib_gatt_discover_characteristic(chrc_value_handle, &chrc_end_handle,
 						      NULL, conn, chrc, (svc_handle + 1),
 						      svc_end_handle);
-	ASSERT(!err, "Failed to get value handle %d");
+	TEST_ASSERT(!err, "Failed to get value handle %d");
 
 	LOG_DBG("chrc_value_handle: %u, chrc_end_handle: %u", *chrc_value_handle, chrc_end_handle);
 }
@@ -199,9 +199,9 @@ static void subscribed(struct bt_conn *conn,
 		       uint8_t err,
 		       struct bt_gatt_subscribe_params *params)
 {
-	ASSERT(!err, "Subscribe failed (err %d)\n", err);
+	TEST_ASSERT(!err, "Subscribe failed (err %d)", err);
 
-	ASSERT(params, "params is NULL\n");
+	TEST_ASSERT(params, "params is NULL");
 
 	SET_FLAG(is_subscribed);
 
@@ -222,7 +222,7 @@ static void subscribe(struct bt_conn *conn,
 	params.ccc_handle = handle + 1;
 
 	err = bt_gatt_subscribe(conn, &params);
-	ASSERT(!err, "Subscribe failed (err %d)\n", err);
+	TEST_ASSERT(!err, "Subscribe failed (err %d)", err);
 
 	WAIT_FOR_FLAG(is_subscribed);
 }
@@ -269,7 +269,7 @@ static bool is_disconnected(struct bt_conn *conn)
 	struct bt_conn_info info;
 
 	err = bt_conn_get_info(conn, &info);
-	ASSERT(err == 0, "Failed to get info for %p\n", conn);
+	TEST_ASSERT(err == 0, "Failed to get info for %p", conn);
 
 	/* Return if fully disconnected */
 	return info.state == BT_CONN_STATE_DISCONNECTED;
@@ -322,7 +322,7 @@ static void entrypoint_dut(void)
 	s->rx = 0;
 
 	err = bt_enable(NULL);
-	ASSERT(err == 0, "Can't enable Bluetooth (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Can't enable Bluetooth (err %d)", err);
 	LOG_DBG("Central: Bluetooth initialized.");
 
 	s->conn = connect_and_subscribe();
@@ -350,7 +350,7 @@ static void entrypoint_dut(void)
 	/* linux will "unref" the conn :p */
 	disconnect(s->conn);
 
-	PASS("DUT done\n");
+	TEST_PASS("DUT done");
 }
 
 static void entrypoint_peer(void)
@@ -364,7 +364,7 @@ static void entrypoint_peer(void)
 	LOG_DBG("Test start: peer 0");
 
 	err = bt_enable(NULL);
-	ASSERT(err == 0, "Can't enable Bluetooth (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Can't enable Bluetooth (err %d)", err);
 	LOG_DBG("Bluetooth initialized.");
 
 	/* prepare data for notifications */
@@ -372,7 +372,7 @@ static void entrypoint_peer(void)
 	memset(data, 0xfe, sizeof(data));
 
 	/* Pass unless something else errors out later */
-	PASS("peer 0 done\n");
+	TEST_PASS("peer 0 done");
 
 	tx = 0;
 	while (true) {
@@ -396,38 +396,19 @@ static void entrypoint_peer(void)
 
 		LOG_INF("disconnect");
 		err = disconnect(conn);
-		ASSERT(!err, "Failed to initate disconnect (err %d)", err);
+		TEST_ASSERT(!err, "Failed to initate disconnect (err %d)", err);
 		bt_conn_unref(conn);
 		conn = NULL;
 	}
 }
 
-static void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-static void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
-}
-
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "dut",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = entrypoint_dut,
 	},
 	{
 		.test_id = "peer",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = entrypoint_peer,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/misc/hfc/src/utils.h b/tests/bsim/bluetooth/host/misc/hfc/src/utils.h
deleted file mode 100644
index baf0750d267..00000000000
--- a/tests/bsim/bluetooth/host/misc/hfc/src/utils.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "bs_tracing.h"
-#include "bs_types.h"
-#include "bstests.h"
-
-#define BS_SECONDS(dur_sec)    ((bs_time_t)dur_sec * USEC_PER_SEC)
-#define TEST_TIMEOUT_SIMULATED BS_SECONDS(60)
-
-extern enum bst_result_t bst_result;
-
-#define DECLARE_FLAG(flag) extern atomic_t flag
-#define DEFINE_FLAG(flag)  atomic_t flag = (atomic_t)false
-#define SET_FLAG(flag)     (void)atomic_set(&flag, (atomic_t)true)
-#define UNSET_FLAG(flag)   (void)atomic_set(&flag, (atomic_t)false)
-
-#define WAIT_FOR_VAL(var, val)                                                                    \
-	while (atomic_get(&var) != val) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)                                                                  \
-	while ((bool)atomic_get(&flag)) {                                                          \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define TAKE_FLAG(flag)                                                                            \
-	while (!(bool)atomic_cas(&flag, true, false)) {                                            \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-
-#define ASSERT(expr, ...)                                                                          \
-	do {                                                                                       \
-		if (!(expr)) {                                                                     \
-			FAIL(__VA_ARGS__);                                                         \
-		}                                                                                  \
-	} while (0)
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
diff --git a/tests/bsim/bluetooth/host/misc/sample_test/src/dut.c b/tests/bsim/bluetooth/host/misc/sample_test/src/dut.c
index 535eb31cf23..3e9b2fd60b2 100644
--- a/tests/bsim/bluetooth/host/misc/sample_test/src/dut.c
+++ b/tests/bsim/bluetooth/host/misc/sample_test/src/dut.c
@@ -23,7 +23,7 @@
 
 LOG_MODULE_REGISTER(dut, LOG_LEVEL_DBG);
 
-static DEFINE_FLAG(is_subscribed);
+DEFINE_FLAG_STATIC(is_subscribed);
 
 extern unsigned long runtime_log_level;
 
diff --git a/tests/bsim/bluetooth/host/misc/sample_test/src/peer.c b/tests/bsim/bluetooth/host/misc/sample_test/src/peer.c
index a5a4dfd3733..d6b79254eb5 100644
--- a/tests/bsim/bluetooth/host/misc/sample_test/src/peer.c
+++ b/tests/bsim/bluetooth/host/misc/sample_test/src/peer.c
@@ -26,9 +26,9 @@
 
 LOG_MODULE_REGISTER(peer, LOG_LEVEL_DBG);
 
-static DEFINE_FLAG(is_subscribed);
-static DEFINE_FLAG(got_notification_1);
-static DEFINE_FLAG(got_notification_2);
+DEFINE_FLAG_STATIC(is_subscribed);
+DEFINE_FLAG_STATIC(got_notification_1);
+DEFINE_FLAG_STATIC(got_notification_2);
 
 extern unsigned long runtime_log_level;
 
diff --git a/tests/bsim/bluetooth/host/misc/unregister_conn_cb/src/main.c b/tests/bsim/bluetooth/host/misc/unregister_conn_cb/src/main.c
index a2c6cd87ce4..b1a1042d81e 100644
--- a/tests/bsim/bluetooth/host/misc/unregister_conn_cb/src/main.c
+++ b/tests/bsim/bluetooth/host/misc/unregister_conn_cb/src/main.c
@@ -19,7 +19,7 @@
 #include "babblekit/testcase.h"
 #include "babblekit/flags.h"
 
-static DEFINE_FLAG(flag_is_connected);
+DEFINE_FLAG_STATIC(flag_is_connected);
 
 static struct bt_conn *g_conn;
 
diff --git a/tests/bsim/bluetooth/host/privacy/central/CMakeLists.txt b/tests/bsim/bluetooth/host/privacy/central/CMakeLists.txt
index 7ec3436c8f8..b4c38e40420 100644
--- a/tests/bsim/bluetooth/host/privacy/central/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/privacy/central/CMakeLists.txt
@@ -12,7 +12,6 @@ add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
 target_link_libraries(app PRIVATE babblekit)
 
 target_sources(app PRIVATE
-	src/bs_bt_utils.c
 	src/tester.c
 	src/main.c
 	src/dut.c
diff --git a/tests/bsim/bluetooth/host/privacy/central/src/bs_bt_utils.c b/tests/bsim/bluetooth/host/privacy/central/src/bs_bt_utils.c
deleted file mode 100644
index 6011b5d300c..00000000000
--- a/tests/bsim/bluetooth/host/privacy/central/src/bs_bt_utils.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "bs_bt_utils.h"
-#include "bs_pc_backchannel.h"
-#include "argparse.h"
-
-#define BS_SECONDS(dur_sec)    ((bs_time_t)dur_sec * 1000000)
-#define TEST_TIMEOUT_SIMULATED BS_SECONDS(60)
-#define CHANNEL_ID	       0
-#define MSG_SIZE	       1
-
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
-}
-
-void backchannel_init(uint peer)
-{
-	uint device_number = get_device_nbr();
-	uint device_numbers[] = {peer};
-	uint channel_numbers[] = {CHANNEL_ID};
-	uint *ch;
-
-	ch = bs_open_back_channel(device_number, device_numbers, channel_numbers,
-				  ARRAY_SIZE(channel_numbers));
-	if (!ch) {
-		FAIL("Unable to open backchannel\n");
-	}
-}
-
-void backchannel_sync_send(void)
-{
-	uint8_t sync_msg[MSG_SIZE] = {get_device_nbr()};
-
-	bs_bc_send_msg(CHANNEL_ID, sync_msg, ARRAY_SIZE(sync_msg));
-}
-
-void backchannel_sync_wait(void)
-{
-	uint8_t sync_msg[MSG_SIZE];
-
-	while (true) {
-		if (bs_bc_is_msg_received(CHANNEL_ID) > 0) {
-			bs_bc_receive_msg(CHANNEL_ID, sync_msg, ARRAY_SIZE(sync_msg));
-			if (sync_msg[0] != get_device_nbr()) {
-				/* Received a message from another device, exit */
-				break;
-			}
-		}
-
-		k_sleep(K_MSEC(1));
-	}
-}
-
-void print_address(bt_addr_le_t *addr)
-{
-	char array[BT_ADDR_LE_STR_LEN];
-
-	bt_addr_le_to_str(addr, array, sizeof(array));
-	printk("Address : %s\n", array);
-}
diff --git a/tests/bsim/bluetooth/host/privacy/central/src/bs_bt_utils.h b/tests/bsim/bluetooth/host/privacy/central/src/bs_bt_utils.h
deleted file mode 100644
index 84fd44993bc..00000000000
--- a/tests/bsim/bluetooth/host/privacy/central/src/bs_bt_utils.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Common functions and helpers for BSIM ADV tests
- *
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "bs_tracing.h"
-#include "bs_types.h"
-#include "bstests.h"
-#include "time_machine.h"
-
-#include <errno.h>
-
-#include <zephyr/sys/__assert.h>
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/gatt.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/uuid.h>
-#include <zephyr/kernel.h>
-#include <zephyr/types.h>
-
-extern enum bst_result_t bst_result;
-
-#define DECLARE_FLAG(flag) extern atomic_t flag
-#define DEFINE_FLAG(flag)  atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)	   (void)atomic_set(&flag, (atomic_t) true)
-#define UNSET_FLAG(flag)   (void)atomic_set(&flag, (atomic_t) false)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)                                                                  \
-	while ((bool)atomic_get(&flag)) {                                                          \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define TAKE_FLAG(flag)                                                                            \
-	while (!(bool)atomic_cas(&flag, true, false)) {                                            \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-
-#define ASSERT(expr, ...)                                                                          \
-	do {                                                                                       \
-		if (!(expr)) {                                                                     \
-			FAIL(__VA_ARGS__);                                                         \
-		}                                                                                  \
-	} while (0)
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-#define DUT_CENTRAL_ID	     0
-#define TESTER_PERIPHERAL_ID 1
-
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
-void backchannel_init(uint peer);
-void backchannel_sync_send(void);
-void backchannel_sync_wait(void);
-
-void print_address(bt_addr_le_t *addr);
diff --git a/tests/bsim/bluetooth/host/privacy/central/src/dut.c b/tests/bsim/bluetooth/host/privacy/central/src/dut.c
index 5a49b6e5097..669217f4d75 100644
--- a/tests/bsim/bluetooth/host/privacy/central/src/dut.c
+++ b/tests/bsim/bluetooth/host/privacy/central/src/dut.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bs_bt_utils.h"
-
 #include <stdint.h>
 
 #include <zephyr/bluetooth/addr.h>
@@ -13,6 +11,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 
 #include <babblekit/testcase.h>
+#include <babblekit/sync.h>
 #include <testlib/conn.h>
 #include <testlib/scan.h>
 
@@ -24,7 +23,7 @@ void start_scanning(void)
 	/* Enable bluetooth */
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Failed to enable bluetooth (err %d\n)", err);
+		TEST_FAIL("Failed to enable bluetooth (err %d)", err);
 	}
 
 	/* Start active scanning */
@@ -38,7 +37,7 @@ void start_scanning(void)
 
 	err = bt_le_scan_start(&param, NULL);
 	if (err) {
-		FAIL("Failed to start scanning");
+		TEST_FAIL("Failed to start scanning");
 	}
 }
 
@@ -48,12 +47,12 @@ void dut_procedure(void)
 
 	/* Nothing to do */
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
 
 void dut_procedure_connect_short_rpa_timeout(void)
 {
-	backchannel_init(1);
+	TEST_ASSERT(bk_sync_init() == 0);
 
 	const uint16_t rpa_timeout_s = 1;
 
@@ -73,13 +72,13 @@ void dut_procedure_connect_short_rpa_timeout(void)
 	TEST_ASSERT(!err, "Failed to start scan (err %d)", err);
 
 	/* Indicate to the peer device that we have found the advertiser. */
-	backchannel_sync_send();
+	bk_sync_send();
 
 	/* Create a connection using that address */
 	err = bt_testlib_connect(&peer, &conn);
 	TEST_ASSERT(!err, "Failed to initiate connection (err %d)", err);
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
 
 void dut_procedure_connect_timeout(void)
@@ -114,5 +113,5 @@ void dut_procedure_connect_timeout(void)
 	TEST_ASSERT(diff_to_expected_ms < 0.1 * expected_conn_timeout_ms,
 		    "Connection timeout not within 10 \%% of expected timeout");
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
diff --git a/tests/bsim/bluetooth/host/privacy/central/src/main.c b/tests/bsim/bluetooth/host/privacy/central/src/main.c
index 0aa42d16c25..2e6f560c0d3 100644
--- a/tests/bsim/bluetooth/host/privacy/central/src/main.c
+++ b/tests/bsim/bluetooth/host/privacy/central/src/main.c
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bs_bt_utils.h"
 #include "bstests.h"
 
 void tester_procedure(void);
@@ -17,31 +16,23 @@ static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "central",
 		.test_descr = "Central performs active scanning using RPA",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = dut_procedure,
 	},
 	{
 		.test_id = "central_connect_short_rpa_timeout",
 		.test_descr = "Central connects to a peripheral using a short RPA timeout",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = dut_procedure_connect_short_rpa_timeout,
 	},
 	{
 		.test_id = "central_connect_fails_with_short_rpa_timeout",
 		.test_descr = "Central connects to a peripheral using a short RPA timeout"
 			      " but expects connection establishment to time out.",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = dut_procedure_connect_timeout,
 	},
 	{
 		.test_id = "peripheral",
 		.test_descr = "Performs scannable advertising, validates that the scanner"
 			      " RPA address refreshes",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = tester_procedure,
 	},
 	{
@@ -49,8 +40,6 @@ static const struct bst_test_instance test_to_add[] = {
 		.test_descr = "Performs connectable advertising. "
 			      "The advertiser is stopped for 10 seconds when instructed by the DUT"
 			      " to allow it to run the initiator for longer than its RPA timeout.",
-		.test_post_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = tester_procedure_periph_delayed_start_of_conn_adv,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/privacy/central/src/tester.c b/tests/bsim/bluetooth/host/privacy/central/src/tester.c
index 119802c4a0d..adf3e67d7bd 100644
--- a/tests/bsim/bluetooth/host/privacy/central/src/tester.c
+++ b/tests/bsim/bluetooth/host/privacy/central/src/tester.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bs_bt_utils.h"
-
 #include <stdint.h>
 #include <string.h>
 
@@ -14,10 +12,12 @@
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/toolchain.h>
 
-#include <babblekit/testcase.h>
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+#include "babblekit/sync.h"
 
-DEFINE_FLAG(flag_new_address);
-DEFINE_FLAG(flag_connected);
+DEFINE_FLAG_STATIC(flag_new_address);
+DEFINE_FLAG_STATIC(flag_connected);
 
 void scanned_cb(struct bt_le_ext_adv *adv, struct bt_le_ext_adv_scanned_info *info)
 {
@@ -41,9 +41,10 @@ void scanned_cb(struct bt_le_ext_adv *adv, struct bt_le_ext_adv_scanned_info *in
 	/* Check if the scan request comes from a new address */
 	if (bt_addr_le_cmp(&old_addr, &new_addr)) {
 		int64_t new_time, diff, time_diff_ms, rpa_timeout_ms;
+		char addr_str[BT_ADDR_LE_STR_LEN];
 
-		printk("Scanned request from new ");
-		print_address(info->addr);
+		bt_addr_le_to_str(info->addr, addr_str, sizeof(addr_str));
+		printk("Scanned request from new address : %s\n", addr_str);
 
 		/* Ensure the RPA rotation occurs within +-10% of CONFIG_BT_RPA_TIMEOUT */
 		new_time = k_uptime_get();
@@ -57,7 +58,8 @@ void scanned_cb(struct bt_le_ext_adv *adv, struct bt_le_ext_adv_scanned_info *in
 		}
 
 		if (diff > rpa_timeout_ms * 0.10) {
-			FAIL("RPA rotation did not occur within +-10%% of CONFIG_BT_RPA_TIMEOUT");
+			TEST_FAIL("RPA rotation did not occur within +-10%% of "
+				  "CONFIG_BT_RPA_TIMEOUT");
 		}
 		old_time = new_time;
 
@@ -89,7 +91,7 @@ void start_advertising(void)
 	/* Enable bluetooth */
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Failed to enable bluetooth (err %d\n)", err);
+		TEST_FAIL("Failed to enable bluetooth (err %d)", err);
 	}
 
 	/* Create advertising set */
@@ -104,13 +106,13 @@ void start_advertising(void)
 
 	err = bt_le_ext_adv_create(&params, &adv_callbacks, &adv);
 	if (err) {
-		FAIL("Failed to create advertising set (err %d)\n", err);
+		TEST_FAIL("Failed to create advertising set (err %d)", err);
 	}
 
 	/* Set scan data */
 	err = bt_le_ext_adv_set_data(adv, NULL, 0, sd, ARRAY_SIZE(sd));
 	if (err) {
-		FAIL("Failed to set advertising data (err %d)", err);
+		TEST_FAIL("Failed to set advertising data (err %d)", err);
 	}
 
 	/* Start advertising */
@@ -119,7 +121,7 @@ void start_advertising(void)
 
 	err = bt_le_ext_adv_start(adv, &start_params);
 	if (err) {
-		FAIL("Failed to start advertising (err %d)\n", err);
+		TEST_FAIL("Failed to start advertising (err %d)", err);
 	}
 }
 
@@ -132,12 +134,12 @@ void tester_procedure(void)
 		UNSET_FLAG(flag_new_address);
 	}
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
 
 void tester_procedure_periph_delayed_start_of_conn_adv(void)
 {
-	backchannel_init(0);
+	TEST_ASSERT(bk_sync_init() == 0);
 
 	int err;
 	struct bt_le_adv_param params =
@@ -167,7 +169,7 @@ void tester_procedure_periph_delayed_start_of_conn_adv(void)
 	err = bt_le_ext_adv_start(adv, BT_LE_EXT_ADV_START_DEFAULT);
 	TEST_ASSERT(!err, "Failed to start advertiser (err %d)", err);
 
-	backchannel_sync_wait();
+	bk_sync_wait();
 
 	err = bt_le_ext_adv_stop(adv);
 	TEST_ASSERT(!err, "Failed to stop advertiser (err %d)", err);
@@ -182,5 +184,5 @@ void tester_procedure_periph_delayed_start_of_conn_adv(void)
 
 	WAIT_FOR_FLAG(flag_connected);
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
diff --git a/tests/bsim/bluetooth/host/privacy/device/CMakeLists.txt b/tests/bsim/bluetooth/host/privacy/device/CMakeLists.txt
index 695ed8b17c0..e4fe1e4c90e 100644
--- a/tests/bsim/bluetooth/host/privacy/device/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/privacy/device/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_privacy)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
   src/test_undirected_main.c
   src/test_undirected_central.c
diff --git a/tests/bsim/bluetooth/host/privacy/device/src/test_undirected_central.c b/tests/bsim/bluetooth/host/privacy/device/src/test_undirected_central.c
index c245c213197..80b7a94c775 100644
--- a/tests/bsim/bluetooth/host/privacy/device/src/test_undirected_central.c
+++ b/tests/bsim/bluetooth/host/privacy/device/src/test_undirected_central.c
@@ -18,37 +18,13 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(bt_bsim_privacy, LOG_LEVEL_INF);
 
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "bstests.h"
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 #include "bs_cmd_line.h"
 
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)	  (void)atomic_set(&flag, (atomic_t) true)
-#define GET_FLAG(flag)	  (bool)atomic_get(&flag)
-#define UNSET_FLAG(flag)  (void)atomic_set(&flag, (atomic_t) false)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-extern enum bst_result_t bst_result;
-
-CREATE_FLAG(paired);
-CREATE_FLAG(rpa_tested);
-CREATE_FLAG(identity_tested);
+DEFINE_FLAG_STATIC(paired);
+DEFINE_FLAG_STATIC(rpa_tested);
+DEFINE_FLAG_STATIC(identity_tested);
 
 static void start_scan(void);
 
@@ -135,20 +111,19 @@ static void check_addresses(const bt_addr_le_t *peer_addr)
 		SET_FLAG(identity_tested);
 		addr_equal = bt_addr_le_eq(&peer_identity, peer_addr);
 		if (!addr_equal) {
-			FAIL("The peer address is not the same as the peer previously paired.\n");
+			TEST_FAIL(
+				"The peer address is not the same as the peer previously paired.");
 		}
 	} else if (test_addr_type == RPA) {
 		SET_FLAG(rpa_tested);
 		addr_equal = bt_addr_le_eq(&peer_identity, peer_addr);
 		if (!addr_equal) {
-			FAIL("The resolved address is not the same as the peer previously "
-			     "paired.\n");
+			TEST_FAIL("The resolved address is not the same as the peer previously "
+				  "paired.");
 		}
 	}
 }
 
-
-
 static void scan_recv(const struct bt_le_scan_recv_info *info,
 		      struct net_buf_simple *ad)
 {
@@ -174,23 +149,23 @@ static void scan_recv(const struct bt_le_scan_recv_info *info,
 	 * the address resolving keys, then this check should only apply after
 	 * the pairing is done.
 	 */
-	if (GET_FLAG(paired) &&
+	if (IS_FLAG_SET(paired) &&
 	    info->adv_props == (BT_GAP_ADV_PROP_EXT_ADV | BT_GAP_ADV_PROP_SCANNABLE)) {
 		LOG_DBG("skipping AUX_ADV_IND report, waiting for AUX_SCAN_REQ "
 			"(props: 0x%x)", info->adv_props);
 		return;
 	}
 
-	if (GET_FLAG(paired)) {
+	if (IS_FLAG_SET(paired)) {
 		check_addresses(info->addr);
 	}
 
-	if (connection_test || !GET_FLAG(paired)) {
+	if (connection_test || !IS_FLAG_SET(paired)) {
 		if (bt_le_scan_stop()) {
 			LOG_DBG("Failed to stop scanner");
 			return;
 		}
-		LOG_DBG("Scanner stopped: conn %d paired %d", connection_test, GET_FLAG(paired));
+		LOG_DBG("Scanner stopped: conn %d paired %d", connection_test, IS_FLAG_SET(paired));
 
 		err = bt_conn_le_create(info->addr,
 					BT_CONN_LE_CREATE_CONN,
@@ -217,7 +192,7 @@ static void start_scan(void)
 			       NULL);
 
 	if (err) {
-		FAIL("Scanning failed to start (err %d)\n", err);
+		TEST_FAIL("Scanning failed to start (err %d)", err);
 	}
 
 	LOG_DBG("Scanning successfully started");
@@ -284,7 +259,7 @@ void test_central(void)
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 	}
 
 	UNSET_FLAG(identity_tested);
@@ -311,5 +286,5 @@ void test_central_main(void)
 
 	test_central();
 
-	PASS("passed\n");
+	TEST_PASS("passed");
 }
diff --git a/tests/bsim/bluetooth/host/privacy/device/src/test_undirected_main.c b/tests/bsim/bluetooth/host/privacy/device/src/test_undirected_main.c
index 68c7ece462a..f6053ca4099 100644
--- a/tests/bsim/bluetooth/host/privacy/device/src/test_undirected_main.c
+++ b/tests/bsim/bluetooth/host/privacy/device/src/test_undirected_main.c
@@ -12,53 +12,27 @@
 
 #include <zephyr/sys/printk.h>
 
-#include "bs_types.h"
-#include "bs_tracing.h"
 #include "bstests.h"
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_bsim_privacy, LOG_LEVEL_INF);
 
-extern enum bst_result_t bst_result;
-
-#define WAIT_TIME_S 20
-#define WAIT_TIME   (WAIT_TIME_S * 1e6) /* 20 seconds */
-
 extern void central_test_args_parse(int argc, char *argv[]);
 extern void peripheral_test_args_parse(int argc, char *argv[]);
 
 extern void test_central_main(void);
 extern void test_peripheral(void);
 
-void sim_timeout(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error_time_line("Test failed (not passed after %d seconds)\n",
-					 WAIT_TIME_S);
-	}
-}
-
-static void test_privacy_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-	bst_result = In_progress;
-}
-
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "central",
 		.test_descr = "Central device",
-		.test_pre_init_f = test_privacy_init,
-		.test_tick_f = sim_timeout,
 		.test_main_f = test_central_main,
 		.test_args_f = central_test_args_parse,
 	},
 	{
 		.test_id = "peripheral",
 		.test_descr = "Peripheral device",
-		.test_pre_init_f = test_privacy_init,
-		.test_tick_f = sim_timeout,
 		.test_main_f = test_peripheral,
 		.test_args_f = peripheral_test_args_parse,
 	},
diff --git a/tests/bsim/bluetooth/host/privacy/device/src/test_undirected_peripheral.c b/tests/bsim/bluetooth/host/privacy/device/src/test_undirected_peripheral.c
index fbfc45536ad..38349e02682 100644
--- a/tests/bsim/bluetooth/host/privacy/device/src/test_undirected_peripheral.c
+++ b/tests/bsim/bluetooth/host/privacy/device/src/test_undirected_peripheral.c
@@ -20,38 +20,14 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(bt_bsim_privacy, LOG_LEVEL_INF);
 
-#include "bs_types.h"
-#include "bs_tracing.h"
-#include "bstests.h"
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 #include "bs_cmd_line.h"
 
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-extern enum bst_result_t bst_result;
-
-#define CREATE_FLAG(flag) static atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)	  (void)atomic_set(&flag, (atomic_t) true)
-#define GET_FLAG(flag)	  (bool)atomic_get(&flag)
-#define UNSET_FLAG(flag)  (void)atomic_set(&flag, (atomic_t) false)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-
-CREATE_FLAG(paired_flag);
-CREATE_FLAG(connected_flag);
-CREATE_FLAG(wait_disconnection);
-CREATE_FLAG(wait_scanned);
+DEFINE_FLAG_STATIC(paired_flag);
+DEFINE_FLAG_STATIC(connected_flag);
+DEFINE_FLAG_STATIC(wait_disconnection);
+DEFINE_FLAG_STATIC(wait_scanned);
 
 static struct bt_conn *default_conn;
 
@@ -288,7 +264,7 @@ static void disconnect(void)
 
 	err = bt_conn_disconnect(default_conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
 	if (err) {
-		FAIL("Disconnection failed (err %d)\n", err);
+		TEST_FAIL("Disconnection failed (err %d)", err);
 	}
 
 	WAIT_FOR_FLAG(wait_disconnection);
@@ -318,9 +294,9 @@ static void connected(struct bt_conn *conn, uint8_t err)
 
 	default_conn = bt_conn_ref(conn);
 
-	if (!GET_FLAG(paired_flag)) {
+	if (!IS_FLAG_SET(paired_flag)) {
 		if (bt_conn_set_security(conn, BT_SECURITY_L2)) {
-			FAIL("Failed to set security\n");
+			TEST_FAIL("Failed to set security");
 		}
 	} else {
 		SET_FLAG(connected_flag);
@@ -406,7 +382,7 @@ static void test_peripheral_main(void)
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Bluetooth init failed (err %d)\n", err);
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
 	}
 
 	LOG_DBG("Bluetooth initialized");
@@ -460,5 +436,5 @@ void test_peripheral(void)
 
 	test_peripheral_main();
 
-	PASS("passed\n");
+	TEST_PASS("passed");
 }
diff --git a/tests/bsim/bluetooth/host/privacy/device/test_scripts/run_tests.sh b/tests/bsim/bluetooth/host/privacy/device/test_scripts/run_tests.sh
index 87b97841b15..171957b7163 100755
--- a/tests/bsim/bluetooth/host/privacy/device/test_scripts/run_tests.sh
+++ b/tests/bsim/bluetooth/host/privacy/device/test_scripts/run_tests.sh
@@ -59,11 +59,10 @@ for args in ${TEST_ARGS[@]}; do
             use-ext-adv=${use_ext_adv} scannable=${scannable} connectable=${connectable}
 
         Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s="${simulation_id}_${sim_id_count}" \
-            -D=2 -sim_length=60e6 $@
+            -D=2 -sim_length=20e6 $@
 
         wait_for_background_jobs
 
         sim_id_count=$(( sim_id_count + 1 ))
     done
 done
-
diff --git a/tests/bsim/bluetooth/host/privacy/legacy/CMakeLists.txt b/tests/bsim/bluetooth/host/privacy/legacy/CMakeLists.txt
index 0f313743af0..b080f45fbe4 100644
--- a/tests/bsim/bluetooth/host/privacy/legacy/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/privacy/legacy/CMakeLists.txt
@@ -5,8 +5,14 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_privacy_legacy)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/common/testlib testlib)
+target_link_libraries(app PRIVATE
+  babblekit
+  testlib
+)
+
 target_sources(app PRIVATE
-	src/bs_bt_utils.c
 	src/tester.c
 	src/main.c
 	src/dut.c
diff --git a/tests/bsim/bluetooth/host/privacy/legacy/src/bs_bt_utils.c b/tests/bsim/bluetooth/host/privacy/legacy/src/bs_bt_utils.c
deleted file mode 100644
index b367c0dfb29..00000000000
--- a/tests/bsim/bluetooth/host/privacy/legacy/src/bs_bt_utils.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "bs_bt_utils.h"
-#include "argparse.h"
-#include "bs_pc_backchannel.h"
-
-#define BS_SECONDS(dur_sec)    ((bs_time_t)dur_sec * 1000000)
-#define TEST_TIMEOUT_SIMULATED BS_SECONDS(70)
-
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
-}
-
-#define CHANNEL_ID 0
-#define MSG_SIZE 1
-
-void backchannel_init(uint peer)
-{
-	uint device_number = get_device_nbr();
-	uint device_numbers[] = { peer };
-	uint channel_numbers[] = { CHANNEL_ID };
-	uint *ch;
-
-	ch = bs_open_back_channel(device_number, device_numbers,
-				  channel_numbers, ARRAY_SIZE(channel_numbers));
-	if (!ch) {
-		FAIL("Unable to open backchannel\n");
-	}
-}
-
-void backchannel_sync_send(void)
-{
-	uint8_t sync_msg[MSG_SIZE] = { get_device_nbr() };
-
-	printk("Sending sync\n");
-	bs_bc_send_msg(CHANNEL_ID, sync_msg, ARRAY_SIZE(sync_msg));
-}
-
-void backchannel_sync_wait(void)
-{
-	uint8_t sync_msg[MSG_SIZE];
-
-	while (true) {
-		if (bs_bc_is_msg_received(CHANNEL_ID) > 0) {
-			bs_bc_receive_msg(CHANNEL_ID, sync_msg,
-					  ARRAY_SIZE(sync_msg));
-			if (sync_msg[0] != get_device_nbr()) {
-				/* Received a message from another device, exit */
-				break;
-			}
-		}
-
-		k_sleep(K_MSEC(1));
-	}
-
-	printk("Sync received\n");
-}
diff --git a/tests/bsim/bluetooth/host/privacy/legacy/src/bs_bt_utils.h b/tests/bsim/bluetooth/host/privacy/legacy/src/bs_bt_utils.h
deleted file mode 100644
index 82580472881..00000000000
--- a/tests/bsim/bluetooth/host/privacy/legacy/src/bs_bt_utils.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Common functions and helpers for BSIM ADV tests
- *
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "bs_tracing.h"
-#include "bs_types.h"
-#include "bstests.h"
-#include "time_machine.h"
-
-#include <errno.h>
-
-#include <zephyr/sys/__assert.h>
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/gatt.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/uuid.h>
-#include <zephyr/kernel.h>
-#include <zephyr/types.h>
-
-extern enum bst_result_t bst_result;
-
-#define ASSERT(expr, ...)                                                                          \
-	do {                                                                                       \
-		if (!(expr)) {                                                                     \
-			FAIL(__VA_ARGS__);                                                         \
-		}                                                                                  \
-	} while (0)
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-#define CENTRAL_SIM_ID 0
-#define PERIPHERAL_SIM_ID 1
-
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
-
-void backchannel_init(uint peer);
-void backchannel_sync_send(void);
-void backchannel_sync_wait(void);
diff --git a/tests/bsim/bluetooth/host/privacy/legacy/src/dut.c b/tests/bsim/bluetooth/host/privacy/legacy/src/dut.c
index f9530d46ac0..71d328d03b7 100644
--- a/tests/bsim/bluetooth/host/privacy/legacy/src/dut.c
+++ b/tests/bsim/bluetooth/host/privacy/legacy/src/dut.c
@@ -4,14 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bs_bt_utils.h"
-
 #include <stdint.h>
 #include <string.h>
 
+#include <errno.h>
+
+#include <zephyr/sys/__assert.h>
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
+
+#include "babblekit/testcase.h"
+#include "babblekit/sync.h"
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dut, 4);
@@ -34,11 +43,11 @@ static void set_public_addr(void)
 
 	err = bt_id_create(&dut_addr, irk);
 	if (err) {
-		FAIL("Failed to override addr %d\n", err);
+		TEST_FAIL("Failed to override addr %d", err);
 	}
 }
 
-void start_advertising(uint32_t options)
+static void start_advertising(uint32_t options)
 {
 	int err;
 
@@ -48,11 +57,11 @@ void start_advertising(uint32_t options)
 
 	err = bt_le_adv_start(&param, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err) {
-		FAIL("Failed to start advertising (err %d)\n", err);
+		TEST_FAIL("Failed to start advertising (err %d)", err);
 	}
 }
 
-void generate_new_rpa(void)
+static void generate_new_rpa(void)
 {
 	/* This will generate a new RPA and mark it valid */
 	struct bt_le_oob oob_local = { 0 };
@@ -65,7 +74,7 @@ void dut_procedure(void)
 	int err;
 
 	/* open a backchannel to the peer */
-	backchannel_init(CENTRAL_SIM_ID);
+	TEST_ASSERT(bk_sync_init() == 0);
 
 	/* override public address so the scanner can test if we're using it or not */
 	set_public_addr();
@@ -73,7 +82,7 @@ void dut_procedure(void)
 	LOG_DBG("enable bt");
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Failed to enable bluetooth (err %d\n)", err);
+		TEST_FAIL("Failed to enable bluetooth (err %d)", err);
 	}
 
 	LOG_DBG("generate new RPA");
@@ -84,16 +93,16 @@ void dut_procedure(void)
 
 	/* wait for the tester to validate we're using our identity address */
 	LOG_DBG("wait for validation by tester");
-	backchannel_sync_wait();
+	bk_sync_wait();
 	LOG_DBG("wait for validation by tester");
 	err = bt_le_adv_stop();
 	if (err) {
-		FAIL("Failed to stop advertising (err %d\n)", err);
+		TEST_FAIL("Failed to stop advertising (err %d)", err);
 	}
 
 	LOG_DBG("start adv with RPA");
 	start_advertising(BT_LE_ADV_OPT_CONN);
 
 	/* Test pass verdict is decided by the tester */
-	PASS("DUT done\n");
+	TEST_PASS("DUT done");
 }
diff --git a/tests/bsim/bluetooth/host/privacy/legacy/src/main.c b/tests/bsim/bluetooth/host/privacy/legacy/src/main.c
index edcd8e81bfd..1f976a3b075 100644
--- a/tests/bsim/bluetooth/host/privacy/legacy/src/main.c
+++ b/tests/bsim/bluetooth/host/privacy/legacy/src/main.c
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bs_bt_utils.h"
 #include "bstests.h"
 
 void tester_procedure(void);
@@ -13,14 +12,10 @@ void dut_procedure(void);
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "central",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = tester_procedure,
 	},
 	{
 		.test_id = "peripheral",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = dut_procedure,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/privacy/legacy/src/tester.c b/tests/bsim/bluetooth/host/privacy/legacy/src/tester.c
index eb2e1a55157..160f0f90e5c 100644
--- a/tests/bsim/bluetooth/host/privacy/legacy/src/tester.c
+++ b/tests/bsim/bluetooth/host/privacy/legacy/src/tester.c
@@ -4,11 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bs_bt_utils.h"
-#include <zephyr/bluetooth/addr.h>
-#include <zephyr/bluetooth/conn.h>
 #include <stdint.h>
+#include <errno.h>
+
+#include <zephyr/sys/__assert.h>
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
+
+#include "babblekit/testcase.h"
+#include "babblekit/sync.h"
+#include "testlib/addr.h"
 
 #include "common/bt_str.h"
 
@@ -27,21 +38,13 @@ struct test_data_t {
 
 extern bt_addr_le_t dut_addr;
 
-void print_address(const bt_addr_le_t *addr)
-{
-	char array[BT_ADDR_LE_STR_LEN];
-
-	bt_addr_le_to_str(addr, array, sizeof(array));
-	LOG_DBG("Address : %s", array);
-}
-
 static void cb_expect_rpa(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 			  struct net_buf_simple *ad)
 {
 	int64_t diff_ms, rpa_timeout_ms;
 
 	if (bt_addr_le_eq(addr, &dut_addr)) {
-		FAIL("DUT used identity addr instead of RPA\n");
+		TEST_FAIL("DUT used identity addr instead of RPA");
 	}
 
 	/* Only save the address + time if this is the first scan */
@@ -56,10 +59,8 @@ static void cb_expect_rpa(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 		return;
 	}
 	test_data.addr_set = true;
-	LOG_DBG("Old ");
-	print_address(&test_data.old_addr);
-	LOG_DBG("New ");
-	print_address(addr);
+	LOG_DBG("Old addr: %s, New addr: %s", bt_testlib_addr_to_str(&test_data.old_addr),
+		bt_testlib_addr_to_str(addr));
 
 	test_data.rpa_rotations++;
 
@@ -68,32 +69,29 @@ static void cb_expect_rpa(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 	rpa_timeout_ms = CONFIG_BT_RPA_TIMEOUT * MSEC_PER_SEC;
 
 	if (abs(diff_ms - rpa_timeout_ms) > (rpa_timeout_ms / 10)) {
-		FAIL("RPA rotation did not occur within +-10% of CONFIG_BT_RPA_TIMEOUT\n");
+		TEST_FAIL("RPA rotation did not occur within +-10%% of CONFIG_BT_RPA_TIMEOUT");
 	}
 
 	bt_addr_le_copy(&test_data.old_addr, addr);
 	test_data.old_time = k_uptime_get();
 
 	if (test_data.rpa_rotations > EXPECTED_NUM_ROTATIONS) {
-		PASS("PASS\n");
+		TEST_PASS("PASS");
 	}
 }
 
 static void cb_expect_id(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 			 struct net_buf_simple *ad)
 {
-	LOG_DBG("expecting addr:");
-	print_address(&dut_addr);
-	LOG_DBG("got addr:");
-	print_address(addr);
+	LOG_DBG("Expecting addr: %s, Got addr: %s", bt_testlib_addr_to_str(&test_data.old_addr),
+		bt_testlib_addr_to_str(addr));
 
 	if (addr->type != BT_ADDR_LE_RANDOM) {
-		FAIL("Expected public address (0x%x) got 0x%x\n",
-		     BT_ADDR_LE_RANDOM, addr->type);
+		TEST_FAIL("Expected public address (0x%x) got 0x%x", BT_ADDR_LE_RANDOM, addr->type);
 	}
 
 	if (!bt_addr_le_eq(&dut_addr, addr)) {
-		FAIL("DUT not using identity address\n");
+		TEST_FAIL("DUT not using identity address");
 	}
 }
 
@@ -109,7 +107,7 @@ static void scan_cb(const bt_addr_le_t *addr, int8_t rssi, uint8_t type, struct
 		cb_expect_id(addr, rssi, type, ad);
 
 		/* Tell DUT to switch to RPA */
-		backchannel_sync_send();
+		bk_sync_send();
 		test_data.id_addr_ok = true;
 	} else {
 		cb_expect_rpa(addr, rssi, type, ad);
@@ -121,16 +119,16 @@ void tester_procedure(void)
 	int err;
 
 	/* open a backchannel to the peer */
-	backchannel_init(PERIPHERAL_SIM_ID);
+	TEST_ASSERT(bk_sync_init() == 0);
 
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Failed to enable bluetooth (err %d\n)", err);
+		TEST_FAIL("Failed to enable bluetooth (err %d)", err);
 	}
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE_CONTINUOUS, scan_cb);
 
 	if (err) {
-		FAIL("Failed to start scanning\n");
+		TEST_FAIL("Failed to start scanning");
 	}
 }
diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/CMakeLists.txt b/tests/bsim/bluetooth/host/privacy/peripheral/CMakeLists.txt
index 8b6bee0ccf0..32877debd2f 100644
--- a/tests/bsim/bluetooth/host/privacy/peripheral/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/privacy/peripheral/CMakeLists.txt
@@ -5,8 +5,14 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_rpa_peripheral)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/common/testlib testlib)
+target_link_libraries(app PRIVATE
+  babblekit
+  testlib
+)
+
 target_sources(app PRIVATE
-	src/bs_bt_utils.c
 	src/tester_rpa_rotation.c
 	src/tester_rpa_expired.c
 	src/main.c
diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/src/bs_bt_utils.c b/tests/bsim/bluetooth/host/privacy/peripheral/src/bs_bt_utils.c
deleted file mode 100644
index 795fef11014..00000000000
--- a/tests/bsim/bluetooth/host/privacy/peripheral/src/bs_bt_utils.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "bs_bt_utils.h"
-#include "argparse.h"
-
-#define BS_SECONDS(dur_sec)    ((bs_time_t)dur_sec * 1000000)
-#define TEST_TIMEOUT_SIMULATED BS_SECONDS(70)
-
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
-}
-
-void print_address(bt_addr_le_t *addr)
-{
-	char array[BT_ADDR_LE_STR_LEN];
-
-	bt_addr_le_to_str(addr, array, sizeof(array));
-	printk("Address : %s\n", array);
-}
diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/src/bs_bt_utils.h b/tests/bsim/bluetooth/host/privacy/peripheral/src/bs_bt_utils.h
deleted file mode 100644
index bb28c81edbd..00000000000
--- a/tests/bsim/bluetooth/host/privacy/peripheral/src/bs_bt_utils.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Common functions and helpers for BSIM ADV tests
- *
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "bs_tracing.h"
-#include "bs_types.h"
-#include "bstests.h"
-#include "time_machine.h"
-
-#include <errno.h>
-
-#include <zephyr/sys/__assert.h>
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/gatt.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/uuid.h>
-#include <zephyr/kernel.h>
-#include <zephyr/types.h>
-
-extern enum bst_result_t bst_result;
-
-#define ASSERT(expr, ...)                                                                          \
-	do {                                                                                       \
-		if (!(expr)) {                                                                     \
-			FAIL(__VA_ARGS__);                                                         \
-		}                                                                                  \
-	} while (0)
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-#define TESTER_CENTRAL_ID 0
-#define DUT_PERIPHERAL_ID 1
-
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
-
-void print_address(bt_addr_le_t *addr);
diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/src/dut_rpa_expired.c b/tests/bsim/bluetooth/host/privacy/peripheral/src/dut_rpa_expired.c
index 124900fad5f..4c0e2f561e5 100644
--- a/tests/bsim/bluetooth/host/privacy/peripheral/src/dut_rpa_expired.c
+++ b/tests/bsim/bluetooth/host/privacy/peripheral/src/dut_rpa_expired.c
@@ -4,17 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bs_bt_utils.h"
-
+#include <errno.h>
 #include <stdint.h>
 #include <string.h>
 
+#include <zephyr/sys/__assert.h>
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
 #include <zephyr/toolchain.h>
 #include <zephyr/settings/settings.h>
 
+#include "babblekit/testcase.h"
+
 #include "common/bt_str.h"
 
 #define ID_1 1
@@ -89,7 +96,7 @@ static void create_adv(struct bt_le_ext_adv **adv, int id)
 
 	err = bt_le_ext_adv_create(&params, &cb_adv, adv);
 	if (err) {
-		FAIL("Failed to create advertiser (%d)\n", err);
+		TEST_FAIL("Failed to create advertiser (%d)", err);
 	}
 }
 
@@ -101,12 +108,12 @@ void start_rpa_advertising(void)
 	/* Enable bluetooth */
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Failed to enable bluetooth (err %d\n)", err);
+		TEST_FAIL("Failed to enable bluetooth (err %d)", err);
 	}
 
 	err = settings_load();
 	if (err) {
-		FAIL("Failed to enable settings (err %d\n)", err);
+		TEST_FAIL("Failed to enable settings (err %d)", err);
 	}
 
 	bt_id_get(NULL, &bt_id_count);
@@ -119,12 +126,12 @@ void start_rpa_advertising(void)
 
 		id_a = bt_id_create(NULL, NULL);
 		if (id_a != ID_1) {
-			FAIL("bt_id_create id_a failed (err %d)\n", id_a);
+			TEST_FAIL("bt_id_create id_a failed (err %d)", id_a);
 		}
 
 		id_b = bt_id_create(NULL, NULL);
 		if (id_b != ID_2) {
-			FAIL("bt_id_create id_b failed (err %d)\n", id_b);
+			TEST_FAIL("bt_id_create id_b failed (err %d)", id_b);
 		}
 	} else {
 		printk("Extra identities loaded from settings\n");
@@ -132,7 +139,7 @@ void start_rpa_advertising(void)
 
 	bt_id_get(NULL, &bt_id_count);
 	if (bt_id_count != CONFIG_BT_ID_MAX) {
-		FAIL("bt_id_get returned incorrect number of identities %u\n", bt_id_count);
+		TEST_FAIL("bt_id_get returned incorrect number of identities %u", bt_id_count);
 	}
 
 	for (int i = 0; i < CONFIG_BT_EXT_ADV_MAX_ADV_SET; i++) {
@@ -147,12 +154,12 @@ void start_rpa_advertising(void)
 		/* Set extended advertising data */
 		err = bt_le_ext_adv_set_data(adv_set[i], &ad_id[i], 1, NULL, 0);
 		if (err) {
-			FAIL("Failed to set advertising data for set %d (err %d)\n", i, err);
+			TEST_FAIL("Failed to set advertising data for set %d (err %d)", i, err);
 		}
 
 		err = bt_le_ext_adv_start(adv_set[i], BT_LE_EXT_ADV_START_DEFAULT);
 		if (err) {
-			FAIL("Failed to start advertising (err %d)\n", err);
+			TEST_FAIL("Failed to start advertising (err %d)", err);
 		}
 	}
 }
@@ -162,5 +169,5 @@ void dut_rpa_expired_procedure(void)
 	start_rpa_advertising();
 
 	/* Nothing to do */
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/src/dut_rpa_rotation.c b/tests/bsim/bluetooth/host/privacy/peripheral/src/dut_rpa_rotation.c
index 9d72b5368b2..47f16a9b12b 100644
--- a/tests/bsim/bluetooth/host/privacy/peripheral/src/dut_rpa_rotation.c
+++ b/tests/bsim/bluetooth/host/privacy/peripheral/src/dut_rpa_rotation.c
@@ -4,17 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bs_bt_utils.h"
 
+#include <errno.h>
 #include <stdint.h>
 #include <string.h>
 
+#include <zephyr/sys/__assert.h>
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
 #include <zephyr/toolchain.h>
 #include <zephyr/settings/settings.h>
 
+#include "babblekit/testcase.h"
+
 #include "common/bt_str.h"
 
 #define ID_A_INDEX 1
@@ -63,7 +71,7 @@ static void create_adv(struct bt_le_ext_adv **adv, int id)
 
 	err = bt_le_ext_adv_create(&params, &cb_adv, adv);
 	if (err) {
-		FAIL("Failed to create advertiser (%d)\n", err);
+		TEST_FAIL("Failed to create advertiser (%d)", err);
 	}
 }
 
@@ -75,12 +83,12 @@ void start_advertising(void)
 	/* Enable bluetooth */
 	err = bt_enable(NULL);
 	if (err) {
-		FAIL("Failed to enable bluetooth (err %d\n)", err);
+		TEST_FAIL("Failed to enable bluetooth (err %d)", err);
 	}
 
 	err = settings_load();
 	if (err) {
-		FAIL("Failed to enable settings (err %d\n)", err);
+		TEST_FAIL("Failed to enable settings (err %d)", err);
 	}
 
 	bt_id_get(NULL, &bt_id_count);
@@ -92,12 +100,12 @@ void start_advertising(void)
 
 		id_a = bt_id_create(NULL, NULL);
 		if (id_a != ID_A_INDEX) {
-			FAIL("bt_id_create id_a failed (err %d)\n", id_a);
+			TEST_FAIL("bt_id_create id_a failed (err %d)", id_a);
 		}
 
 		id_b = bt_id_create(NULL, NULL);
 		if (id_b != ID_B_INDEX) {
-			FAIL("bt_id_create id_b failed (err %d)\n", id_b);
+			TEST_FAIL("bt_id_create id_b failed (err %d)", id_b);
 		}
 	} else {
 		printk("Extra identities loaded from settings\n");
@@ -105,7 +113,7 @@ void start_advertising(void)
 
 	bt_id_get(NULL, &bt_id_count);
 	if (bt_id_count != CONFIG_BT_ID_MAX) {
-		FAIL("bt_id_get returned incorrect number of identities %u\n", bt_id_count);
+		TEST_FAIL("bt_id_get returned incorrect number of identities %u", bt_id_count);
 	}
 
 	for (int i = 0; i < CONFIG_BT_EXT_ADV_MAX_ADV_SET; i++) {
@@ -121,12 +129,12 @@ void start_advertising(void)
 		/* Set extended advertising data */
 		err = bt_le_ext_adv_set_data(adv_set[i], &ad_id[i], 1, NULL, 0);
 		if (err) {
-			FAIL("Failed to set advertising data for set %d (err %d)\n", i, err);
+			TEST_FAIL("Failed to set advertising data for set %d (err %d)", i, err);
 		}
 
 		err = bt_le_ext_adv_start(adv_set[i], BT_LE_EXT_ADV_START_DEFAULT);
 		if (err) {
-			FAIL("Failed to start advertising (err %d)\n", err);
+			TEST_FAIL("Failed to start advertising (err %d)", err);
 		}
 	}
 }
@@ -136,5 +144,5 @@ void dut_procedure(void)
 	start_advertising();
 
 	/* Nothing to do */
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/src/main.c b/tests/bsim/bluetooth/host/privacy/peripheral/src/main.c
index b84a1787636..c5cd5140ea7 100644
--- a/tests/bsim/bluetooth/host/privacy/peripheral/src/main.c
+++ b/tests/bsim/bluetooth/host/privacy/peripheral/src/main.c
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bs_bt_utils.h"
 #include "bstests.h"
 
 extern struct bst_test_list *test_main_rpa_rotation_install(struct bst_test_list *tests);
diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/src/main_rpa_expired.c b/tests/bsim/bluetooth/host/privacy/peripheral/src/main_rpa_expired.c
index f5eb51a3e9d..c7badb01922 100644
--- a/tests/bsim/bluetooth/host/privacy/peripheral/src/main_rpa_expired.c
+++ b/tests/bsim/bluetooth/host/privacy/peripheral/src/main_rpa_expired.c
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bs_bt_utils.h"
 #include "bstests.h"
 
 void tester_verify_rpa_procedure(void);
@@ -13,14 +12,10 @@ void dut_rpa_expired_procedure(void);
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "central_rpa_check",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = tester_verify_rpa_procedure,
 	},
 	{
 		.test_id = "peripheral_rpa_expired",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = dut_rpa_expired_procedure,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/src/main_rpa_rotation.c b/tests/bsim/bluetooth/host/privacy/peripheral/src/main_rpa_rotation.c
index ac66700ab2f..3eacd2efc29 100644
--- a/tests/bsim/bluetooth/host/privacy/peripheral/src/main_rpa_rotation.c
+++ b/tests/bsim/bluetooth/host/privacy/peripheral/src/main_rpa_rotation.c
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bs_bt_utils.h"
 #include "bstests.h"
 
 void tester_procedure(void);
@@ -13,14 +12,10 @@ void dut_procedure(void);
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "central",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = tester_procedure,
 	},
 	{
 		.test_id = "peripheral",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = dut_procedure,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/src/tester_rpa_expired.c b/tests/bsim/bluetooth/host/privacy/peripheral/src/tester_rpa_expired.c
index 09c9ffab9c4..6862005a252 100644
--- a/tests/bsim/bluetooth/host/privacy/peripheral/src/tester_rpa_expired.c
+++ b/tests/bsim/bluetooth/host/privacy/peripheral/src/tester_rpa_expired.c
@@ -4,13 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bs_bt_utils.h"
-#include <zephyr/bluetooth/addr.h>
-#include <zephyr/bluetooth/conn.h>
+#include <errno.h>
 #include <stdint.h>
+
+#include <zephyr/sys/__assert.h>
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
 #include <zephyr/settings/settings.h>
 
+#include "babblekit/testcase.h"
+#include "testlib/addr.h"
+
 #define EXPECTED_NUM_ROTATIONS 5
 
 struct adv_set_data_t {
@@ -39,7 +49,7 @@ static void test_address(bt_addr_le_t *addr)
 	static int64_t rpa_timeout_ms = CONFIG_BT_RPA_TIMEOUT * MSEC_PER_SEC;
 
 	if (!BT_ADDR_IS_RPA(&addr->a)) {
-		FAIL("Bluetooth address is not RPA\n");
+		TEST_FAIL("Bluetooth address is not RPA");
 	}
 
 	/* Only save the address if this is the first scan */
@@ -55,10 +65,9 @@ static void test_address(bt_addr_le_t *addr)
 		return;
 	}
 
-	printk("Ad set %d Old ", adv_index);
-	print_address(&adv_set_data[adv_index].old_addr);
-	printk("Ad set %d New ", adv_index);
-	print_address(addr);
+	printk("Ad set %d: Old addr %s, new addr %s\n", adv_index,
+	       bt_testlib_addr_to_str(&adv_set_data[adv_index].old_addr),
+	       bt_testlib_addr_to_str(addr));
 
 	/*	For the first 2 rpa rotations, either of the first 2 adv sets returns false.
 	 *	Hence first 2 adv sets continue with old rpa in first 2 rpa rotations.
@@ -69,28 +78,28 @@ static void test_address(bt_addr_le_t *addr)
 
 		if (adv_index < 2) {
 			if (!bt_addr_le_eq(addr, &adv_set_data[adv_index].old_addr)) {
-				FAIL("Adv sets should continue with old rpa\n");
+				TEST_FAIL("Adv sets should continue with old rpa");
 			}
 		} else {
 			if (bt_addr_le_eq(addr, &adv_set_data[adv_index].old_addr)) {
-				FAIL("New RPA should have been generated\n");
+				TEST_FAIL("New RPA should have been generated");
 			}
 		}
 	} else {
 		if (adv_index < 2) {
 			if (bt_addr_le_eq(addr, &adv_set_data[adv_index].old_addr)) {
-				FAIL("New RPA should have been generated\n");
+				TEST_FAIL("New RPA should have been generated");
 			}
 		} else {
 			if (!bt_addr_le_eq(addr, &adv_set_data[adv_index].old_addr)) {
-				FAIL("Adv sets should continue with old rpa\n");
+				TEST_FAIL("Adv sets should continue with old rpa");
 			}
 		}
 	}
 
 	adv_set_data[adv_index].rpa_rotations++;
 	if (adv_set_data[adv_index].rpa_rotations > EXPECTED_NUM_ROTATIONS) {
-		PASS("PASS\n");
+		TEST_PASS("PASS");
 	}
 
 	adv_set_data[adv_index].old_time = k_uptime_get();
@@ -117,7 +126,7 @@ void start_rpa_scanning(void)
 	int err = bt_le_scan_start(&scan_param, cb_device_found);
 
 	if (err) {
-		FAIL("Failed to start scanning");
+		TEST_FAIL("Failed to start scanning");
 	}
 }
 
@@ -127,12 +136,12 @@ void tester_verify_rpa_procedure(void)
 	int err = bt_enable(NULL);
 
 	if (err) {
-		FAIL("Failed to enable bluetooth (err %d\n)", err);
+		TEST_FAIL("Failed to enable bluetooth (err %d)", err);
 	}
 
 	err = settings_load();
 	if (err) {
-		FAIL("Failed to enable settings (err %d\n)", err);
+		TEST_FAIL("Failed to enable settings (err %d)", err);
 	}
 
 	start_rpa_scanning();
diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/src/tester_rpa_rotation.c b/tests/bsim/bluetooth/host/privacy/peripheral/src/tester_rpa_rotation.c
index f0e68785e32..12b7279f76b 100644
--- a/tests/bsim/bluetooth/host/privacy/peripheral/src/tester_rpa_rotation.c
+++ b/tests/bsim/bluetooth/host/privacy/peripheral/src/tester_rpa_rotation.c
@@ -4,13 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bs_bt_utils.h"
+#include <errno.h>
+#include <stdint.h>
+
+#include <zephyr/sys/__assert.h>
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/conn.h>
-#include <stdint.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
 #include <zephyr/settings/settings.h>
 
+#include "babblekit/testcase.h"
+#include "testlib/addr.h"
+
 #define EXPECTED_NUM_ROTATIONS 5
 
 struct adv_set_data_t {
@@ -46,21 +56,21 @@ static void validate_rpa_addr_generated_for_adv_sets(void)
 		 * a different address even though they use the same Bluetooth ID.
 		 */
 		if (!IS_ENABLED(CONFIG_BT_RPA_SHARING)) {
-			FAIL("RPA same for adv sets with same id and RPA sharing disabled\n");
+			TEST_FAIL("RPA same for adv sets with same id and RPA sharing disabled");
 		}
 	} else {
 		/* In the RPA sharing mode, the first two adv sets should have
 		 * the same address as they use the same Bluetooth ID.
 		 */
 		if (IS_ENABLED(CONFIG_BT_RPA_SHARING)) {
-			FAIL("RPA not same for adv sets with same id and RPA sharing enabled\n");
+			TEST_FAIL("RPA not same for adv sets with same id and RPA sharing enabled");
 		}
 	}
 	if (bt_addr_le_eq(&adv_set_data[0].old_addr, &adv_set_data[3].old_addr)) {
-		FAIL("RPA same for adv sets with different id's\n");
+		TEST_FAIL("RPA same for adv sets with different id's");
 	}
 	if (bt_addr_le_eq(&adv_set_data[1].old_addr, &adv_set_data[3].old_addr)) {
-		FAIL("RPA same for adv sets with different id's\n");
+		TEST_FAIL("RPA same for adv sets with different id's");
 	}
 	adv_set_data[0].addr_set	= false;
 	adv_set_data[1].addr_set	= false;
@@ -72,7 +82,7 @@ static void test_address(bt_addr_le_t *addr)
 	int64_t diff_ms, rpa_timeout_ms;
 
 	if (!BT_ADDR_IS_RPA(&addr->a)) {
-		FAIL("Bluetooth address is not RPA\n");
+		TEST_FAIL("Bluetooth address is not RPA");
 	}
 
 	/* Only save the address + time if this is the first scan */
@@ -87,10 +97,10 @@ static void test_address(bt_addr_le_t *addr)
 		return;
 	}
 	adv_set_data[adv_index].addr_set = true;
-	printk("Ad set %d Old ", adv_index);
-	print_address(&adv_set_data[adv_index].old_addr);
-	printk("Ad set %d New ", adv_index);
-	print_address(addr);
+
+	printk("Ad set %d: Old addr %s, new addr %s\n", adv_index,
+	       bt_testlib_addr_to_str(&adv_set_data[adv_index].old_addr),
+	       bt_testlib_addr_to_str(addr));
 
 	adv_set_data[adv_index].rpa_rotations++;
 
@@ -99,7 +109,7 @@ static void test_address(bt_addr_le_t *addr)
 	rpa_timeout_ms = CONFIG_BT_RPA_TIMEOUT * MSEC_PER_SEC;
 
 	if (abs(diff_ms - rpa_timeout_ms) > (rpa_timeout_ms / 10)) {
-		FAIL("RPA rotation did not occur within +-10%% of CONFIG_BT_RPA_TIMEOUT\n");
+		TEST_FAIL("RPA rotation did not occur within +-10%% of CONFIG_BT_RPA_TIMEOUT");
 	}
 
 	bt_addr_le_copy(&adv_set_data[adv_index].old_addr, addr);
@@ -107,7 +117,7 @@ static void test_address(bt_addr_le_t *addr)
 	validate_rpa_addr_generated_for_adv_sets();
 
 	if (adv_set_data[adv_index].rpa_rotations > EXPECTED_NUM_ROTATIONS) {
-		PASS("PASS\n");
+		TEST_PASS("PASS");
 	}
 }
 
@@ -131,7 +141,7 @@ void start_scanning(void)
 	int err = bt_le_scan_start(&scan_param, cb_device_found);
 
 	if (err) {
-		FAIL("Failed to start scanning");
+		TEST_FAIL("Failed to start scanning");
 	}
 }
 
@@ -141,12 +151,12 @@ void tester_procedure(void)
 	int err = bt_enable(NULL);
 
 	if (err) {
-		FAIL("Failed to enable bluetooth (err %d\n)", err);
+		TEST_FAIL("Failed to enable bluetooth (err %d)", err);
 	}
 
 	err = settings_load();
 	if (err) {
-		FAIL("Failed to enable settings (err %d\n)", err);
+		TEST_FAIL("Failed to enable settings (err %d)", err);
 	}
 
 	start_scanning();
diff --git a/tests/bsim/bluetooth/host/scan/start_stop/src/main.c b/tests/bsim/bluetooth/host/scan/start_stop/src/main.c
index b266d887507..966e23ad488 100644
--- a/tests/bsim/bluetooth/host/scan/start_stop/src/main.c
+++ b/tests/bsim/bluetooth/host/scan/start_stop/src/main.c
@@ -18,25 +18,10 @@
 
 LOG_MODULE_REGISTER(bt_bsim_scan_start_stop, LOG_LEVEL_DBG);
 
-#define WAIT_TIME_S 60
-#define WAIT_TIME   (WAIT_TIME_S * 1e6)
-
 static atomic_t flag_adv_report_received;
 static atomic_t flag_periodic_sync_established;
 static bt_addr_le_t adv_addr;
 
-static void test_tick(bs_time_t HW_device_time)
-{
-	if (bst_result != Passed) {
-		TEST_FAIL("Test failed (not passed after %d seconds)\n", WAIT_TIME_S);
-	}
-}
-
-static void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(WAIT_TIME);
-}
-
 static void bt_sync_established_cb(struct bt_le_per_adv_sync *sync,
 				   struct bt_le_per_adv_sync_synced_info *info)
 {
@@ -98,7 +83,7 @@ void run_dut(void)
 	LOG_DBG("Starting DUT");
 
 	err = bt_enable(NULL);
-	TEST_ASSERT(!err, "Bluetooth init failed (err %d)\n", err);
+	TEST_ASSERT(!err, "Bluetooth init failed (err %d)", err);
 
 	LOG_DBG("Bluetooth initialised");
 
@@ -118,7 +103,7 @@ void run_dut(void)
 	bt_le_per_adv_sync_cb_register(&sync_callbacks);
 
 	err = bt_le_per_adv_sync_create(&per_sync_param, &p_per_sync);
-	TEST_ASSERT(!err, "Periodic sync setup failed (err %d)\n", err);
+	TEST_ASSERT(!err, "Periodic sync setup failed (err %d)", err);
 	LOG_DBG("Periodic sync started");
 
 	/* Start scanner. Check that we can start the scanner while it is already
@@ -134,7 +119,7 @@ void run_dut(void)
 	};
 
 	err = bt_le_scan_start(&scan_params, device_found);
-	TEST_ASSERT(!err, "Scanner setup failed (err %d)\n", err);
+	TEST_ASSERT(!err, "Scanner setup failed (err %d)", err);
 	LOG_DBG("Explicit scanner started");
 
 	LOG_DBG("Wait for an advertising report");
@@ -142,12 +127,12 @@ void run_dut(void)
 
 	/* Stop the scanner. That should not affect the periodic advertising sync. */
 	err = bt_le_scan_stop();
-	TEST_ASSERT(!err, "Scanner stop failed (err %d)\n", err);
+	TEST_ASSERT(!err, "Scanner stop failed (err %d)", err);
 	LOG_DBG("Explicit scanner stopped");
 
 	/* We should be able to stop the periodic advertising sync. */
 	err = bt_le_per_adv_sync_delete(p_per_sync);
-	TEST_ASSERT(!err, "Periodic sync stop failed (err %d)\n", err);
+	TEST_ASSERT(!err, "Periodic sync stop failed (err %d)", err);
 	LOG_DBG("Periodic sync stopped");
 
 	/* Start the periodic advertising sync. This time, provide the address of the advertiser
@@ -161,19 +146,19 @@ void run_dut(void)
 		.timeout = BT_GAP_PER_ADV_MAX_TIMEOUT
 	};
 	err = bt_le_per_adv_sync_create(&per_sync_param, &p_per_sync);
-	TEST_ASSERT(!err, "Periodic sync setup failed (err %d)\n", err);
+	TEST_ASSERT(!err, "Periodic sync setup failed (err %d)", err);
 	LOG_DBG("Periodic sync started");
 
 	/* Start the explicit scanner */
 	err = bt_le_scan_start(&scan_params, device_found);
-	TEST_ASSERT(!err, "Scanner setup failed (err %d)\n", err);
+	TEST_ASSERT(!err, "Scanner setup failed (err %d)", err);
 	LOG_DBG("Explicit scanner started");
 
 	/* Stop the explicit scanner. This should not stop scanner, since we still try to establish
 	 * a sync.
 	 */
 	err = bt_le_scan_stop();
-	TEST_ASSERT(!err, "Scanner stop failed (err %d)\n", err);
+	TEST_ASSERT(!err, "Scanner stop failed (err %d)", err);
 	LOG_DBG("Explicit scanner stopped");
 
 	/* Signal to the tester to start the periodic adv. */
@@ -186,7 +171,7 @@ void run_dut(void)
 	/* Signal to the tester to end the test. */
 	bk_sync_send();
 
-	TEST_PASS("Test passed (DUT)\n");
+	TEST_PASS("Test passed (DUT)");
 }
 
 void run_tester(void)
@@ -199,7 +184,7 @@ void run_tester(void)
 	LOG_DBG("Starting DUT");
 
 	err = bt_enable(NULL);
-	TEST_ASSERT(!err, "Bluetooth init failed (err %d)\n", err);
+	TEST_ASSERT(!err, "Bluetooth init failed (err %d)", err);
 
 	LOG_DBG("Bluetooth initialised");
 
@@ -233,22 +218,18 @@ void run_tester(void)
 
 	bt_le_per_adv_stop(per_adv);
 
-	TEST_PASS("Test passed (Tester)\n");
+	TEST_PASS("Test passed (Tester)");
 }
 
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "scanner",
 		.test_descr = "SCANNER",
-		.test_post_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = run_dut,
 	},
 	{
 		.test_id = "periodic_adv",
 		.test_descr = "PER_ADV",
-		.test_post_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = run_tester,
 	},
 	BSTEST_END_MARKER
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/CMakeLists.txt b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/CMakeLists.txt
index 6ff34818db7..8da0030f365 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_multi_id_bond_overwrite_deny)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
 	src/bs_bt_utils.c
 	src/central.c
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/bs_bt_utils.c b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/bs_bt_utils.c
index d43fb32626a..e96fdebdfee 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/bs_bt_utils.c
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/bs_bt_utils.c
@@ -9,24 +9,6 @@
 BUILD_ASSERT(CONFIG_BT_MAX_PAIRED >= 2, "CONFIG_BT_MAX_PAIRED is too small.");
 BUILD_ASSERT(CONFIG_BT_ID_MAX >= 3, "CONFIG_BT_ID_MAX is too small.");
 
-#define BS_SECONDS(dur_sec)    ((bs_time_t)dur_sec * 1000000)
-#define TEST_TIMEOUT_SIMULATED BS_SECONDS(60)
-
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
-}
-
 DEFINE_FLAG(flag_is_connected);
 struct bt_conn *g_conn;
 
@@ -48,7 +30,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason)
 BUILD_ASSERT(CONFIG_BT_MAX_CONN == 1, "This test assumes a single link.");
 static void connected(struct bt_conn *conn, uint8_t err)
 {
-	ASSERT((!g_conn || (conn == g_conn)), "Unexpected new connection.");
+	TEST_ASSERT((!g_conn || (conn == g_conn)), "Unexpected new connection.");
 
 	if (!g_conn) {
 		g_conn = bt_conn_ref(conn);
@@ -73,7 +55,7 @@ void clear_g_conn(void)
 
 	conn = g_conn;
 	g_conn = NULL;
-	ASSERT(conn, "Test error: No g_conn!\n");
+	TEST_ASSERT(conn, "Test error: No g_conn!");
 	bt_conn_unref(conn);
 }
 
@@ -101,9 +83,9 @@ void bs_bt_utils_setup(void)
 	int err;
 
 	err = bt_enable(NULL);
-	ASSERT(!err, "bt_enable failed.\n");
+	TEST_ASSERT(!err, "bt_enable failed.");
 	err = bt_conn_auth_info_cb_register(&bt_conn_auth_info_cb);
-	ASSERT(!err, "bt_conn_auth_info_cb_register failed.\n");
+	TEST_ASSERT(!err, "bt_conn_auth_info_cb_register failed.");
 }
 
 static void scan_connect_to_first_result__device_found(const bt_addr_le_t *addr, int8_t rssi,
@@ -118,17 +100,17 @@ static void scan_connect_to_first_result__device_found(const bt_addr_le_t *addr,
 
 	/* We're only interested in connectable events */
 	if (type != BT_HCI_ADV_IND && type != BT_HCI_ADV_DIRECT_IND) {
-		FAIL("Unexpected advertisement type.");
+		TEST_FAIL("Unexpected advertisement type.");
 	}
 
 	bt_addr_le_to_str(addr, addr_str, sizeof(addr_str));
-	printk("Got scan result, connecting.. dst %s, RSSI %d\n", addr_str, rssi);
+	printk("Got scan result, connecting.. dst %s, RSSI %d", addr_str, rssi);
 
 	err = bt_le_scan_stop();
-	ASSERT(!err, "Err bt_le_scan_stop %d", err);
+	TEST_ASSERT(!err, "Err bt_le_scan_stop %d", err);
 
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT, &g_conn);
-	ASSERT(!err, "Err bt_conn_le_create %d", err);
+	TEST_ASSERT(!err, "Err bt_conn_le_create %d", err);
 }
 
 void scan_connect_to_first_result(void)
@@ -136,7 +118,7 @@ void scan_connect_to_first_result(void)
 	int err;
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, scan_connect_to_first_result__device_found);
-	ASSERT(!err, "Err bt_le_scan_start %d", err);
+	TEST_ASSERT(!err, "Err bt_le_scan_start %d", err);
 }
 
 void disconnect(void)
@@ -144,7 +126,7 @@ void disconnect(void)
 	int err;
 
 	err = bt_conn_disconnect(g_conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
-	ASSERT(!err, "Err bt_conn_disconnect %d", err);
+	TEST_ASSERT(!err, "Err bt_conn_disconnect %d", err);
 }
 
 void set_security(bt_security_t sec)
@@ -152,7 +134,7 @@ void set_security(bt_security_t sec)
 	int err;
 
 	err = bt_conn_set_security(g_conn, sec);
-	ASSERT(!err, "Err bt_conn_set_security %d", err);
+	TEST_ASSERT(!err, "Err bt_conn_set_security %d", err);
 }
 
 void advertise_connectable(int id, bt_addr_le_t *directed_dst)
@@ -171,5 +153,5 @@ void advertise_connectable(int id, bt_addr_le_t *directed_dst)
 	}
 
 	err = bt_le_adv_start(&param, NULL, 0, NULL, 0);
-	ASSERT(err == 0, "Advertising failed to start (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Advertising failed to start (err %d)", err);
 }
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/bs_bt_utils.h b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/bs_bt_utils.h
index b3718eb769d..364ad44dc5d 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/bs_bt_utils.h
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/bs_bt_utils.h
@@ -24,46 +24,8 @@
 #include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
-extern enum bst_result_t bst_result;
-
-#define DECLARE_FLAG(flag) extern atomic_t flag
-#define DEFINE_FLAG(flag)  atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)	   (void)atomic_set(&flag, (atomic_t) true)
-#define UNSET_FLAG(flag)   (void)atomic_set(&flag, (atomic_t) false)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)                                                                  \
-	while ((bool)atomic_get(&flag)) {                                                          \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define TAKE_FLAG(flag)                                                                            \
-	while (!(bool)atomic_cas(&flag, true, false)) {                                            \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-
-#define ASSERT(expr, ...)                                                                          \
-	do {                                                                                       \
-		if (!(expr)) {                                                                     \
-			FAIL(__VA_ARGS__);                                                         \
-		}                                                                                  \
-	} while (0)
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 DECLARE_FLAG(flag_pairing_complete);
 DECLARE_FLAG(flag_pairing_failed);
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/central.c b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/central.c
index 164646fe79c..c2e03e71dac 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/central.c
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/central.c
@@ -12,6 +12,9 @@
 
 #include <zephyr/bluetooth/bluetooth.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+
 void central(void)
 {
 	bt_addr_le_t id_b;
@@ -40,8 +43,8 @@ void central(void)
 	printk("== Directed connect id b ==\n");
 	scan_connect_to_first_result();
 	wait_connected();
-	ASSERT(bt_addr_le_eq(bt_conn_get_dst(g_conn), &id_b),
-	       "Unexpected Peer. Did something resolve incorrectly?");
+	TEST_ASSERT(bt_addr_le_eq(bt_conn_get_dst(g_conn), &id_b),
+		    "Unexpected Peer. Did something resolve incorrectly?");
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/main.c b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/main.c
index 0b3d857c0c4..9fa91e719ee 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/main.c
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/main.c
@@ -13,14 +13,10 @@ void peripheral(void);
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "central",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = central,
 	},
 	{
 		.test_id = "peripheral",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = peripheral,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/peripheral.c b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/peripheral.c
index 633768879d3..11d0fe51ff3 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/peripheral.c
@@ -13,6 +13,9 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+
 void peripheral(void)
 {
 	bs_bt_utils_setup();
@@ -22,10 +25,10 @@ void peripheral(void)
 	bt_addr_le_t central;
 
 	id_a = bt_id_create(NULL, NULL);
-	ASSERT(id_a >= 0, "bt_id_create id_a failed (err %d)\n", id_a);
+	TEST_ASSERT(id_a >= 0, "bt_id_create id_a failed (err %d)", id_a);
 
 	id_b = bt_id_create(NULL, NULL);
-	ASSERT(id_b >= 0, "bt_id_create id_b failed (err %d)\n", id_b);
+	TEST_ASSERT(id_b >= 0, "bt_id_create id_b failed (err %d)", id_b);
 
 	printk("== Bonding id a ==\n");
 	advertise_connectable(id_a, NULL);
@@ -42,8 +45,8 @@ void peripheral(void)
 	BUILD_ASSERT(IS_ENABLED(CONFIG_BT_SMP_ALLOW_UNAUTH_OVERWRITE), "");
 	BUILD_ASSERT(IS_ENABLED(CONFIG_BT_ID_UNPAIR_MATCHING_BONDS), "");
 	TAKE_FLAG(flag_pairing_complete);
-	ASSERT(bt_addr_le_eq(bt_conn_get_dst(g_conn), &central),
-	       "Test requires that central uses the same identity in both bonds.");
+	TEST_ASSERT(bt_addr_le_eq(bt_conn_get_dst(g_conn), &central),
+		    "Test requires that central uses the same identity in both bonds.");
 	/* Central should disconnect here. */
 	wait_disconnected();
 	clear_g_conn();
@@ -53,5 +56,5 @@ void peripheral(void)
 	wait_connected();
 	/* Central should verify that its bond with id_b works as expected. */
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/CMakeLists.txt b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/CMakeLists.txt
index 6ff34818db7..8da0030f365 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_multi_id_bond_overwrite_deny)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
 	src/bs_bt_utils.c
 	src/central.c
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/bs_bt_utils.c b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/bs_bt_utils.c
index d43fb32626a..e96fdebdfee 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/bs_bt_utils.c
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/bs_bt_utils.c
@@ -9,24 +9,6 @@
 BUILD_ASSERT(CONFIG_BT_MAX_PAIRED >= 2, "CONFIG_BT_MAX_PAIRED is too small.");
 BUILD_ASSERT(CONFIG_BT_ID_MAX >= 3, "CONFIG_BT_ID_MAX is too small.");
 
-#define BS_SECONDS(dur_sec)    ((bs_time_t)dur_sec * 1000000)
-#define TEST_TIMEOUT_SIMULATED BS_SECONDS(60)
-
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
-}
-
 DEFINE_FLAG(flag_is_connected);
 struct bt_conn *g_conn;
 
@@ -48,7 +30,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason)
 BUILD_ASSERT(CONFIG_BT_MAX_CONN == 1, "This test assumes a single link.");
 static void connected(struct bt_conn *conn, uint8_t err)
 {
-	ASSERT((!g_conn || (conn == g_conn)), "Unexpected new connection.");
+	TEST_ASSERT((!g_conn || (conn == g_conn)), "Unexpected new connection.");
 
 	if (!g_conn) {
 		g_conn = bt_conn_ref(conn);
@@ -73,7 +55,7 @@ void clear_g_conn(void)
 
 	conn = g_conn;
 	g_conn = NULL;
-	ASSERT(conn, "Test error: No g_conn!\n");
+	TEST_ASSERT(conn, "Test error: No g_conn!");
 	bt_conn_unref(conn);
 }
 
@@ -101,9 +83,9 @@ void bs_bt_utils_setup(void)
 	int err;
 
 	err = bt_enable(NULL);
-	ASSERT(!err, "bt_enable failed.\n");
+	TEST_ASSERT(!err, "bt_enable failed.");
 	err = bt_conn_auth_info_cb_register(&bt_conn_auth_info_cb);
-	ASSERT(!err, "bt_conn_auth_info_cb_register failed.\n");
+	TEST_ASSERT(!err, "bt_conn_auth_info_cb_register failed.");
 }
 
 static void scan_connect_to_first_result__device_found(const bt_addr_le_t *addr, int8_t rssi,
@@ -118,17 +100,17 @@ static void scan_connect_to_first_result__device_found(const bt_addr_le_t *addr,
 
 	/* We're only interested in connectable events */
 	if (type != BT_HCI_ADV_IND && type != BT_HCI_ADV_DIRECT_IND) {
-		FAIL("Unexpected advertisement type.");
+		TEST_FAIL("Unexpected advertisement type.");
 	}
 
 	bt_addr_le_to_str(addr, addr_str, sizeof(addr_str));
-	printk("Got scan result, connecting.. dst %s, RSSI %d\n", addr_str, rssi);
+	printk("Got scan result, connecting.. dst %s, RSSI %d", addr_str, rssi);
 
 	err = bt_le_scan_stop();
-	ASSERT(!err, "Err bt_le_scan_stop %d", err);
+	TEST_ASSERT(!err, "Err bt_le_scan_stop %d", err);
 
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT, &g_conn);
-	ASSERT(!err, "Err bt_conn_le_create %d", err);
+	TEST_ASSERT(!err, "Err bt_conn_le_create %d", err);
 }
 
 void scan_connect_to_first_result(void)
@@ -136,7 +118,7 @@ void scan_connect_to_first_result(void)
 	int err;
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, scan_connect_to_first_result__device_found);
-	ASSERT(!err, "Err bt_le_scan_start %d", err);
+	TEST_ASSERT(!err, "Err bt_le_scan_start %d", err);
 }
 
 void disconnect(void)
@@ -144,7 +126,7 @@ void disconnect(void)
 	int err;
 
 	err = bt_conn_disconnect(g_conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
-	ASSERT(!err, "Err bt_conn_disconnect %d", err);
+	TEST_ASSERT(!err, "Err bt_conn_disconnect %d", err);
 }
 
 void set_security(bt_security_t sec)
@@ -152,7 +134,7 @@ void set_security(bt_security_t sec)
 	int err;
 
 	err = bt_conn_set_security(g_conn, sec);
-	ASSERT(!err, "Err bt_conn_set_security %d", err);
+	TEST_ASSERT(!err, "Err bt_conn_set_security %d", err);
 }
 
 void advertise_connectable(int id, bt_addr_le_t *directed_dst)
@@ -171,5 +153,5 @@ void advertise_connectable(int id, bt_addr_le_t *directed_dst)
 	}
 
 	err = bt_le_adv_start(&param, NULL, 0, NULL, 0);
-	ASSERT(err == 0, "Advertising failed to start (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Advertising failed to start (err %d)", err);
 }
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/bs_bt_utils.h b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/bs_bt_utils.h
index b3718eb769d..364ad44dc5d 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/bs_bt_utils.h
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/bs_bt_utils.h
@@ -24,46 +24,8 @@
 #include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
-extern enum bst_result_t bst_result;
-
-#define DECLARE_FLAG(flag) extern atomic_t flag
-#define DEFINE_FLAG(flag)  atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)	   (void)atomic_set(&flag, (atomic_t) true)
-#define UNSET_FLAG(flag)   (void)atomic_set(&flag, (atomic_t) false)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)                                                                  \
-	while ((bool)atomic_get(&flag)) {                                                          \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define TAKE_FLAG(flag)                                                                            \
-	while (!(bool)atomic_cas(&flag, true, false)) {                                            \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-
-#define ASSERT(expr, ...)                                                                          \
-	do {                                                                                       \
-		if (!(expr)) {                                                                     \
-			FAIL(__VA_ARGS__);                                                         \
-		}                                                                                  \
-	} while (0)
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 DECLARE_FLAG(flag_pairing_complete);
 DECLARE_FLAG(flag_pairing_failed);
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/central.c b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/central.c
index 26f3bee4710..6bf8d38bbf0 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/central.c
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/central.c
@@ -12,6 +12,9 @@
 
 #include <zephyr/bluetooth/bluetooth.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+
 void central(void)
 {
 	bs_bt_utils_setup();
@@ -30,5 +33,5 @@ void central(void)
 	wait_connected();
 	set_security(BT_SECURITY_L2);
 	wait_disconnected();
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/main.c b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/main.c
index 0b3d857c0c4..9fa91e719ee 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/main.c
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/main.c
@@ -13,14 +13,10 @@ void peripheral(void);
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "central",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = central,
 	},
 	{
 		.test_id = "peripheral",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = peripheral,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/peripheral.c b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/peripheral.c
index 319779c94f1..e9d0f484f30 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/peripheral.c
@@ -13,6 +13,9 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+
 void peripheral(void)
 {
 	bs_bt_utils_setup();
@@ -22,10 +25,10 @@ void peripheral(void)
 	bt_addr_le_t central;
 
 	id_a = bt_id_create(NULL, NULL);
-	ASSERT(id_a >= 0, "bt_id_create id_a failed (err %d)\n", id_a);
+	TEST_ASSERT(id_a >= 0, "bt_id_create id_a failed (err %d)", id_a);
 
 	id_b = bt_id_create(NULL, NULL);
-	ASSERT(id_b >= 0, "bt_id_create id_b failed (err %d)\n", id_b);
+	TEST_ASSERT(id_b >= 0, "bt_id_create id_b failed (err %d)", id_b);
 
 	printk("== Bonding id a ==\n");
 	advertise_connectable(id_a, NULL);
@@ -41,5 +44,5 @@ void peripheral(void)
 	/* Central should bond here. */
 	BUILD_ASSERT(!IS_ENABLED(CONFIG_BT_ID_UNPAIR_MATCHING_BONDS), "");
 	WAIT_FOR_FLAG(flag_pairing_failed);
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
diff --git a/tests/bsim/bluetooth/host/security/bond_per_connection/CMakeLists.txt b/tests/bsim/bluetooth/host/security/bond_per_connection/CMakeLists.txt
index 2fa69bf185f..c94b46437ec 100644
--- a/tests/bsim/bluetooth/host/security/bond_per_connection/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/security/bond_per_connection/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_multi_id_bond_per_connection)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
 	src/bs_bt_utils.c
 	src/central.c
diff --git a/tests/bsim/bluetooth/host/security/bond_per_connection/src/bs_bt_utils.c b/tests/bsim/bluetooth/host/security/bond_per_connection/src/bs_bt_utils.c
index b6ac6315ca9..85dd13dedec 100644
--- a/tests/bsim/bluetooth/host/security/bond_per_connection/src/bs_bt_utils.c
+++ b/tests/bsim/bluetooth/host/security/bond_per_connection/src/bs_bt_utils.c
@@ -9,23 +9,6 @@
 BUILD_ASSERT(CONFIG_BT_MAX_PAIRED >= 2, "CONFIG_BT_MAX_PAIRED is too small.");
 BUILD_ASSERT(CONFIG_BT_ID_MAX >= 3, "CONFIG_BT_ID_MAX is too small.");
 
-#define BS_SECONDS(dur_sec)    ((bs_time_t)dur_sec * 1000000)
-#define TEST_TIMEOUT_SIMULATED BS_SECONDS(60)
-
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
-}
 
 DEFINE_FLAG(flag_is_connected);
 struct bt_conn *g_conn;
@@ -50,7 +33,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason)
 BUILD_ASSERT(CONFIG_BT_MAX_CONN == 1, "This test assumes a single link.");
 static void connected(struct bt_conn *conn, uint8_t err)
 {
-	ASSERT((!g_conn || (conn == g_conn)), "Unexpected new connection.");
+	TEST_ASSERT((!g_conn || (conn == g_conn)), "Unexpected new connection.");
 
 	if (!g_conn) {
 		g_conn = bt_conn_ref(conn);
@@ -63,8 +46,9 @@ static void connected(struct bt_conn *conn, uint8_t err)
 
 	SET_FLAG(flag_is_connected);
 
-	if (GET_FLAG(call_bt_conn_set_bondable) && bt_conn_set_bondable(conn, GET_FLAG(bondable))) {
-		ASSERT(0, "Fail during setting bondable flag for given connection.");
+	if (IS_FLAG_SET(call_bt_conn_set_bondable) &&
+	    bt_conn_set_bondable(conn, IS_FLAG_SET(bondable))) {
+		TEST_ASSERT(0, "Fail during setting bondable flag for given connection.");
 	}
 }
 
@@ -79,7 +63,7 @@ void clear_g_conn(void)
 
 	conn = g_conn;
 	g_conn = NULL;
-	ASSERT(conn, "Test error: No g_conn!\n");
+	TEST_ASSERT(conn, "Test error: No g_conn!");
 	bt_conn_unref(conn);
 }
 
@@ -90,7 +74,7 @@ DEFINE_FLAG(flag_not_bonded);
 
 static void pairing_failed(struct bt_conn *conn, enum bt_security_err reason)
 {
-	FAIL("Pairing failed (unexpected): reason %u\n", reason);
+	TEST_FAIL("Pairing failed (unexpected): reason %u", reason);
 }
 
 static void pairing_complete(struct bt_conn *conn, bool bonded)
@@ -114,9 +98,9 @@ void bs_bt_utils_setup(void)
 	int err;
 
 	err = bt_enable(NULL);
-	ASSERT(!err, "bt_enable failed.\n");
+	TEST_ASSERT(!err, "bt_enable failed.");
 	err = bt_conn_auth_info_cb_register(&bt_conn_auth_info_cb);
-	ASSERT(!err, "bt_conn_auth_info_cb_register failed.\n");
+	TEST_ASSERT(!err, "bt_conn_auth_info_cb_register failed.");
 }
 
 static void scan_connect_to_first_result__device_found(const bt_addr_le_t *addr, int8_t rssi,
@@ -131,17 +115,17 @@ static void scan_connect_to_first_result__device_found(const bt_addr_le_t *addr,
 
 	/* We're only interested in connectable events */
 	if (type != BT_HCI_ADV_IND && type != BT_HCI_ADV_DIRECT_IND) {
-		FAIL("Unexpected advertisement type.");
+		TEST_FAIL("Unexpected advertisement type.");
 	}
 
 	bt_addr_le_to_str(addr, addr_str, sizeof(addr_str));
 	printk("Got scan result, connecting.. dst %s, RSSI %d\n", addr_str, rssi);
 
 	err = bt_le_scan_stop();
-	ASSERT(!err, "Err bt_le_scan_stop %d", err);
+	TEST_ASSERT(!err, "Err bt_le_scan_stop %d", err);
 
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT, &g_conn);
-	ASSERT(!err, "Err bt_conn_le_create %d", err);
+	TEST_ASSERT(!err, "Err bt_conn_le_create %d", err);
 }
 
 void scan_connect_to_first_result(void)
@@ -149,7 +133,7 @@ void scan_connect_to_first_result(void)
 	int err;
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, scan_connect_to_first_result__device_found);
-	ASSERT(!err, "Err bt_le_scan_start %d", err);
+	TEST_ASSERT(!err, "Err bt_le_scan_start %d", err);
 }
 
 void disconnect(void)
@@ -157,7 +141,7 @@ void disconnect(void)
 	int err;
 
 	err = bt_conn_disconnect(g_conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
-	ASSERT(!err, "Err bt_conn_disconnect %d", err);
+	TEST_ASSERT(!err, "Err bt_conn_disconnect %d", err);
 }
 
 void unpair(int id)
@@ -165,7 +149,7 @@ void unpair(int id)
 	int err;
 
 	err = bt_unpair(id, BT_ADDR_LE_ANY);
-	ASSERT(!err, "Err bt_unpair %d", err);
+	TEST_ASSERT(!err, "Err bt_unpair %d", err);
 }
 
 void set_security(bt_security_t sec)
@@ -173,7 +157,7 @@ void set_security(bt_security_t sec)
 	int err;
 
 	err = bt_conn_set_security(g_conn, sec);
-	ASSERT(!err, "Err bt_conn_set_security %d", err);
+	TEST_ASSERT(!err, "Err bt_conn_set_security %d", err);
 }
 
 void advertise_connectable(int id, bt_addr_le_t *directed_dst)
@@ -192,7 +176,7 @@ void advertise_connectable(int id, bt_addr_le_t *directed_dst)
 	}
 
 	err = bt_le_adv_start(&param, NULL, 0, NULL, 0);
-	ASSERT(err == 0, "Advertising failed to start (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Advertising failed to start (err %d)", err);
 }
 
 void set_bondable(bool enable)
diff --git a/tests/bsim/bluetooth/host/security/bond_per_connection/src/bs_bt_utils.h b/tests/bsim/bluetooth/host/security/bond_per_connection/src/bs_bt_utils.h
index c16d9cb9676..44068911be5 100644
--- a/tests/bsim/bluetooth/host/security/bond_per_connection/src/bs_bt_utils.h
+++ b/tests/bsim/bluetooth/host/security/bond_per_connection/src/bs_bt_utils.h
@@ -24,48 +24,8 @@
 #include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
-extern enum bst_result_t bst_result;
-
-#define DECLARE_FLAG(flag) extern atomic_t flag
-#define DEFINE_FLAG(flag)  atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)	   (void)atomic_set(&flag, (atomic_t) true)
-#define UNSET_FLAG(flag)   (void)atomic_set(&flag, (atomic_t) false)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)                                                                  \
-	while ((bool)atomic_get(&flag)) {                                                          \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define TAKE_FLAG(flag)                                                                            \
-	while (!(bool)atomic_cas(&flag, true, false)) {                                            \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define GET_FLAG(flag)                                                                             \
-	(bool)atomic_get(&flag)
-
-#define ASSERT(expr, ...)                                                                          \
-	do {                                                                                       \
-		if (!(expr)) {                                                                     \
-			FAIL(__VA_ARGS__);                                                         \
-		}                                                                                  \
-	} while (0)
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 DECLARE_FLAG(flag_pairing_complete);
 DECLARE_FLAG(flag_bonded);
diff --git a/tests/bsim/bluetooth/host/security/bond_per_connection/src/central.c b/tests/bsim/bluetooth/host/security/bond_per_connection/src/central.c
index 4e0052310d3..bfdb1508e7f 100644
--- a/tests/bsim/bluetooth/host/security/bond_per_connection/src/central.c
+++ b/tests/bsim/bluetooth/host/security/bond_per_connection/src/central.c
@@ -12,6 +12,9 @@
 
 #include <zephyr/bluetooth/bluetooth.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+
 void central(void)
 {
 	bs_bt_utils_setup();
@@ -51,5 +54,5 @@ void central(void)
 	wait_disconnected();
 	clear_g_conn();
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
diff --git a/tests/bsim/bluetooth/host/security/bond_per_connection/src/main.c b/tests/bsim/bluetooth/host/security/bond_per_connection/src/main.c
index 1b797f104c7..2a39920435b 100644
--- a/tests/bsim/bluetooth/host/security/bond_per_connection/src/main.c
+++ b/tests/bsim/bluetooth/host/security/bond_per_connection/src/main.c
@@ -13,14 +13,10 @@ void peripheral(void);
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "central",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = central,
 	},
 	{
 		.test_id = "peripheral",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = peripheral,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/security/bond_per_connection/src/peripheral.c b/tests/bsim/bluetooth/host/security/bond_per_connection/src/peripheral.c
index 04fc3cdd8f2..81d0e9a7470 100644
--- a/tests/bsim/bluetooth/host/security/bond_per_connection/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/security/bond_per_connection/src/peripheral.c
@@ -13,6 +13,9 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+
 void peripheral(void)
 {
 	bs_bt_utils_setup();
@@ -21,10 +24,10 @@ void peripheral(void)
 	int id_b;
 
 	id_a = bt_id_create(NULL, NULL);
-	ASSERT(id_a >= 0, "bt_id_create id_a failed (err %d)\n", id_a);
+	TEST_ASSERT(id_a >= 0, "bt_id_create id_a failed (err %d)", id_a);
 
 	id_b = bt_id_create(NULL, NULL);
-	ASSERT(id_b >= 0, "bt_id_create id_b failed (err %d)\n", id_b);
+	TEST_ASSERT(id_b >= 0, "bt_id_create id_b failed (err %d)", id_b);
 
 	printk("== Bonding id a - global bondable mode ==\n");
 	BUILD_ASSERT(CONFIG_BT_BONDABLE, "CONFIG_BT_BONDABLE must be enabled by default.");
@@ -58,5 +61,5 @@ void peripheral(void)
 	TAKE_FLAG(flag_pairing_complete);
 	TAKE_FLAG(flag_not_bonded);
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
diff --git a/tests/bsim/bluetooth/host/security/ccc_update/src/central.c b/tests/bsim/bluetooth/host/security/ccc_update/src/central.c
index 40adf5efb29..8f067641ac3 100644
--- a/tests/bsim/bluetooth/host/security/ccc_update/src/central.c
+++ b/tests/bsim/bluetooth/host/security/ccc_update/src/central.c
@@ -29,9 +29,9 @@
 #define CLIENT_CLIENT_CHAN 0
 #define SERVER_CLIENT_CHAN 1
 
-static DEFINE_FLAG(connected_flag);
-static DEFINE_FLAG(disconnected_flag);
-static DEFINE_FLAG(security_updated_flag);
+DEFINE_FLAG_STATIC(connected_flag);
+DEFINE_FLAG_STATIC(disconnected_flag);
+DEFINE_FLAG_STATIC(security_updated_flag);
 
 #define BT_UUID_DUMMY_SERVICE BT_UUID_DECLARE_128(DUMMY_SERVICE_TYPE)
 #define BT_UUID_DUMMY_SERVICE_NOTIFY BT_UUID_DECLARE_128(DUMMY_SERVICE_NOTIFY_TYPE)
@@ -40,7 +40,7 @@ static struct bt_conn *default_conn;
 
 static struct bt_conn_cb central_cb;
 
-static DEFINE_FLAG(gatt_write_flag);
+DEFINE_FLAG_STATIC(gatt_write_flag);
 static uint8_t gatt_write_att_err;
 
 static void gatt_write_cb(struct bt_conn *conn, uint8_t att_err,
diff --git a/tests/bsim/bluetooth/host/security/ccc_update/src/peripheral.c b/tests/bsim/bluetooth/host/security/ccc_update/src/peripheral.c
index dae03f846a2..10cb4210c22 100644
--- a/tests/bsim/bluetooth/host/security/ccc_update/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/security/ccc_update/src/peripheral.c
@@ -27,11 +27,10 @@
 #define GOOD_CLIENT_CHAN 0
 #define BAD_CLIENT_CHAN 1
 
-static DEFINE_FLAG(connected_flag);
-static DEFINE_FLAG(disconnected_flag);
-static DEFINE_FLAG(security_updated_flag);
-
-static DEFINE_FLAG(ccc_cfg_changed_flag);
+DEFINE_FLAG_STATIC(connected_flag);
+DEFINE_FLAG_STATIC(disconnected_flag);
+DEFINE_FLAG_STATIC(security_updated_flag);
+DEFINE_FLAG_STATIC(ccc_cfg_changed_flag);
 
 static const struct bt_uuid_128 dummy_service = BT_UUID_INIT_128(DUMMY_SERVICE_TYPE);
 
diff --git a/tests/bsim/bluetooth/host/security/id_addr_update/central/CMakeLists.txt b/tests/bsim/bluetooth/host/security/id_addr_update/central/CMakeLists.txt
index 0ca6f4313bd..eb720e642f4 100644
--- a/tests/bsim/bluetooth/host/security/id_addr_update/central/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/security/id_addr_update/central/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_id_addr_update)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
   src/central.c
   src/utils.c)
diff --git a/tests/bsim/bluetooth/host/security/id_addr_update/central/src/central.c b/tests/bsim/bluetooth/host/security/id_addr_update/central/src/central.c
index 7ccaed1a65d..e64196648a4 100644
--- a/tests/bsim/bluetooth/host/security/id_addr_update/central/src/central.c
+++ b/tests/bsim/bluetooth/host/security/id_addr_update/central/src/central.c
@@ -13,6 +13,8 @@
 
 #include <zephyr/bluetooth/bluetooth.h>
 
+#include "babblekit/testcase.h"
+
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(central, LOG_LEVEL_INF);
 
@@ -60,14 +62,12 @@ void central(void)
 	wait_disconnected();
 	clear_conn(conn_b);
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
 
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "central",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = central,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/security/id_addr_update/central/src/utils.c b/tests/bsim/bluetooth/host/security/id_addr_update/central/src/utils.c
index a1ccc4f6996..ff4b104b584 100644
--- a/tests/bsim/bluetooth/host/security/id_addr_update/central/src/utils.c
+++ b/tests/bsim/bluetooth/host/security/id_addr_update/central/src/utils.c
@@ -6,27 +6,14 @@
 
 #include "bs_bt_utils.h"
 #include "utils.h"
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 BUILD_ASSERT(CONFIG_BT_MAX_PAIRED >= 2, "CONFIG_BT_MAX_PAIRED is too small.");
 BUILD_ASSERT(CONFIG_BT_ID_MAX >= 3, "CONFIG_BT_ID_MAX is too small.");
 BUILD_ASSERT(CONFIG_BT_MAX_CONN == 2, "CONFIG_BT_MAX_CONN should be equal to two.");
 BUILD_ASSERT(CONFIG_BT_GATT_CLIENT, "CONFIG_BT_GATT_CLIENT is disabled.");
 
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
-}
-
 DEFINE_FLAG(flag_has_new_conn);
 struct bt_conn *new_conn;
 
@@ -38,7 +25,7 @@ void clear_conn(struct bt_conn *conn)
 		new_conn = NULL;
 	}
 
-	ASSERT(conn, "Test error: No new_conn!\n");
+	TEST_ASSERT(conn, "Test error: No new_conn!");
 	bt_conn_unref(conn);
 }
 
@@ -47,7 +34,7 @@ void wait_connected(struct bt_conn **conn)
 	WAIT_FOR_FLAG(flag_has_new_conn);
 	UNSET_FLAG(flag_has_new_conn);
 
-	ASSERT(new_conn, "connection unpopulated.");
+	TEST_ASSERT(new_conn, "connection unpopulated.");
 	*conn = new_conn;
 	new_conn = NULL;
 }
@@ -65,7 +52,7 @@ static void print_conn_state_transition(const char *prefix, struct bt_conn *conn
 	char addr_str[BT_ADDR_LE_STR_LEN];
 
 	err = bt_conn_get_info(conn, &info);
-	ASSERT(!err, "Unexpected conn info result.");
+	TEST_ASSERT(!err, "Unexpected conn info result.");
 
 	bt_addr_le_to_str(info.le.dst, addr_str, sizeof(addr_str));
 	printk("%s: %s\n", prefix, addr_str);
@@ -79,7 +66,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason)
 
 static void connected(struct bt_conn *conn, uint8_t err)
 {
-	ASSERT((!new_conn || (conn == new_conn)), "Unexpected new connection.");
+	TEST_ASSERT((!new_conn || (conn == new_conn)), "Unexpected new connection.");
 
 	if (!new_conn) {
 		new_conn = bt_conn_ref(conn);
@@ -116,7 +103,7 @@ void set_security(struct bt_conn *conn, bt_security_t sec)
 	int err;
 
 	err = bt_conn_set_security(conn, sec);
-	ASSERT(!err, "Err bt_conn_set_security %d", err);
+	TEST_ASSERT(!err, "Err bt_conn_set_security %d", err);
 }
 
 void wait_pairing_completed(void)
@@ -130,12 +117,12 @@ void bs_bt_utils_setup(void)
 	int err;
 
 	err = bt_enable(NULL);
-	ASSERT(!err, "bt_enable failed.\n");
+	TEST_ASSERT(!err, "bt_enable failed.");
 	err = bt_conn_auth_info_cb_register(&bt_conn_auth_info_cb);
-	ASSERT(!err, "bt_conn_auth_info_cb_register failed.\n");
+	TEST_ASSERT(!err, "bt_conn_auth_info_cb_register failed.");
 
 	err = settings_load();
-	ASSERT(!err, "settings_load failed.\n");
+	TEST_ASSERT(!err, "settings_load failed.");
 }
 
 static void scan_connect_to_first_result__device_found(const bt_addr_le_t *addr, int8_t rssi,
@@ -146,17 +133,17 @@ static void scan_connect_to_first_result__device_found(const bt_addr_le_t *addr,
 
 	/* We're only interested in connectable events */
 	if (type != BT_HCI_ADV_IND && type != BT_HCI_ADV_DIRECT_IND) {
-		FAIL("Unexpected advertisement type.");
+		TEST_FAIL("Unexpected advertisement type.");
 	}
 
 	bt_addr_le_to_str(addr, addr_str, sizeof(addr_str));
 	printk("Got scan result, connecting.. dst %s, RSSI %d\n", addr_str, rssi);
 
 	err = bt_le_scan_stop();
-	ASSERT(!err, "Err bt_le_scan_stop %d", err);
+	TEST_ASSERT(!err, "Err bt_le_scan_stop %d", err);
 
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT, &new_conn);
-	ASSERT(!err, "Err bt_conn_le_create %d", err);
+	TEST_ASSERT(!err, "Err bt_conn_le_create %d", err);
 }
 
 void scan_connect_to_first_result(void)
@@ -164,7 +151,7 @@ void scan_connect_to_first_result(void)
 	int err;
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, scan_connect_to_first_result__device_found);
-	ASSERT(!err, "Err bt_le_scan_start %d", err);
+	TEST_ASSERT(!err, "Err bt_le_scan_start %d", err);
 }
 
 void disconnect(struct bt_conn *conn)
@@ -172,7 +159,7 @@ void disconnect(struct bt_conn *conn)
 	int err;
 
 	err = bt_conn_disconnect(conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
-	ASSERT(!err, "Err bt_conn_disconnect %d", err);
+	TEST_ASSERT(!err, "Err bt_conn_disconnect %d", err);
 }
 
 DEFINE_FLAG(flag_bas_has_notification);
@@ -223,5 +210,5 @@ void bas_subscribe(struct bt_conn *conn)
 	subscribe_params.notify = bas_notify_func;
 
 	err = bt_gatt_subscribe(conn, &subscribe_params);
-	ASSERT(!err, "bt_gatt_subscribe failed (err %d)\n", err);
+	TEST_ASSERT(!err, "bt_gatt_subscribe failed (err %d)", err);
 }
diff --git a/tests/bsim/bluetooth/host/security/id_addr_update/central/src/utils.h b/tests/bsim/bluetooth/host/security/id_addr_update/central/src/utils.h
index af79f165858..11b563b3219 100644
--- a/tests/bsim/bluetooth/host/security/id_addr_update/central/src/utils.h
+++ b/tests/bsim/bluetooth/host/security/id_addr_update/central/src/utils.h
@@ -1,9 +1,6 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
-
 void bs_bt_utils_setup(void);
 
 void clear_conn(struct bt_conn *conn);
diff --git a/tests/bsim/bluetooth/host/security/id_addr_update/common/bs_bt_utils.h b/tests/bsim/bluetooth/host/security/id_addr_update/common/bs_bt_utils.h
index 2b4b4a48911..01f3edd1358 100644
--- a/tests/bsim/bluetooth/host/security/id_addr_update/common/bs_bt_utils.h
+++ b/tests/bsim/bluetooth/host/security/id_addr_update/common/bs_bt_utils.h
@@ -6,10 +6,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bs_tracing.h"
-#include "bs_types.h"
-#include "bstests.h"
-#include "time_machine.h"
 #include <zephyr/sys/__assert.h>
 
 #include <errno.h>
@@ -25,52 +21,6 @@
 #include <zephyr/settings/settings.h>
 #include <zephyr/types.h>
 
-extern enum bst_result_t bst_result;
-
-#define BS_SECONDS(dur_sec)    ((bs_time_t)dur_sec * 1000000)
-#define TEST_TIMEOUT_SIMULATED BS_SECONDS(60)
-
-#define DECLARE_FLAG(flag) extern atomic_t flag
-#define DEFINE_FLAG(flag)  atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)	   (void)atomic_set(&flag, (atomic_t) true)
-#define UNSET_FLAG(flag)   (void)atomic_set(&flag, (atomic_t) false)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)                                                                  \
-	while ((bool)atomic_get(&flag)) {                                                          \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define TAKE_FLAG(flag)                                                                            \
-	while (!(bool)atomic_cas(&flag, true, false)) {                                            \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define GET_FLAG(flag)                                                                             \
-	(bool)atomic_get(&flag)
-
-#define ASSERT(expr, ...)                                                                          \
-	do {                                                                                       \
-		if (!(expr)) {                                                                     \
-			FAIL(__VA_ARGS__);                                                         \
-		}                                                                                  \
-	} while (0)
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
-
 void bs_bt_utils_setup(void);
 
 void clear_conn(struct bt_conn *conn);
diff --git a/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/CMakeLists.txt b/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/CMakeLists.txt
index 5ea3558fa64..1dcecd4459a 100644
--- a/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_id_addr_update)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
   src/peripheral.c
   src/utils.c
diff --git a/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/peripheral.c b/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/peripheral.c
index b481b1623c8..368b8ebb74f 100644
--- a/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/peripheral.c
@@ -14,6 +14,8 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "babblekit/testcase.h"
+
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(peripheral, LOG_LEVEL_INF);
 
@@ -24,12 +26,12 @@ static void verify_equal_address(struct bt_conn *conn_a, struct bt_conn *conn_b)
 	struct bt_conn_info info_b;
 
 	err = bt_conn_get_info(conn_a, &info_a);
-	ASSERT(!err, "Unexpected info_a result.");
+	TEST_ASSERT(!err, "Unexpected info_a result.");
 
 	err = bt_conn_get_info(conn_b, &info_b);
-	ASSERT(!err, "Unexpected info_b result.");
+	TEST_ASSERT(!err, "Unexpected info_b result.");
 
-	ASSERT(bt_addr_le_eq(info_a.le.dst, info_b.le.dst),
+	TEST_ASSERT(bt_addr_le_eq(info_a.le.dst, info_b.le.dst),
 	       "Conn A address is not equal with the conn B address");
 }
 
@@ -45,10 +47,10 @@ void peripheral(void)
 
 	/* Create two identities that will simultaneously connect with the same central peer. */
 	id_a = bt_id_create(NULL, NULL);
-	ASSERT(id_a >= 0, "bt_id_create id_a failed (err %d)\n", id_a);
+	TEST_ASSERT(id_a >= 0, "bt_id_create id_a failed (err %d)", id_a);
 
 	id_b = bt_id_create(NULL, NULL);
-	ASSERT(id_b >= 0, "bt_id_create id_b failed (err %d)\n", id_b);
+	TEST_ASSERT(id_b >= 0, "bt_id_create id_b failed (err %d)", id_b);
 
 	/* Connect with the first identity. */
 	LOG_INF("adv");
@@ -82,14 +84,12 @@ void peripheral(void)
 	wait_disconnected();
 	clear_conn(conn_b);
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
 
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "peripheral",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = peripheral,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/utils.c b/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/utils.c
index 83c34361d36..fd513049d04 100644
--- a/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/utils.c
+++ b/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/utils.c
@@ -6,26 +6,13 @@
 
 #include "bs_bt_utils.h"
 #include "utils.h"
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 BUILD_ASSERT(CONFIG_BT_MAX_PAIRED >= 2, "CONFIG_BT_MAX_PAIRED is too small.");
 BUILD_ASSERT(CONFIG_BT_ID_MAX >= 3, "CONFIG_BT_ID_MAX is too small.");
 BUILD_ASSERT(CONFIG_BT_MAX_CONN == 2, "CONFIG_BT_MAX_CONN should be equal to two.");
 
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
-}
-
 DEFINE_FLAG(flag_has_new_conn);
 struct bt_conn *new_conn;
 
@@ -37,7 +24,7 @@ void clear_conn(struct bt_conn *conn)
 		new_conn = NULL;
 	}
 
-	ASSERT(conn, "Test error: No new_conn!\n");
+	TEST_ASSERT(conn, "Test error: No new_conn!");
 	bt_conn_unref(conn);
 }
 
@@ -46,7 +33,7 @@ void wait_connected(struct bt_conn **conn)
 	WAIT_FOR_FLAG(flag_has_new_conn);
 	UNSET_FLAG(flag_has_new_conn);
 
-	ASSERT(new_conn, "connection unpopulated.");
+	TEST_ASSERT(new_conn, "connection unpopulated.");
 	*conn = new_conn;
 	new_conn = NULL;
 }
@@ -64,7 +51,7 @@ static void print_conn_state_transition(const char *prefix, struct bt_conn *conn
 	char addr_str[BT_ADDR_LE_STR_LEN];
 
 	err = bt_conn_get_info(conn, &info);
-	ASSERT(!err, "Unexpected conn info result.");
+	TEST_ASSERT(!err, "Unexpected conn info result.");
 
 	bt_addr_le_to_str(info.le.dst, addr_str, sizeof(addr_str));
 	printk("%s: %s\n", prefix, addr_str);
@@ -78,7 +65,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason)
 
 static void connected(struct bt_conn *conn, uint8_t err)
 {
-	ASSERT((!new_conn || (conn == new_conn)), "Unexpected new connection.");
+	TEST_ASSERT((!new_conn || (conn == new_conn)), "Unexpected new connection.");
 
 	if (!new_conn) {
 		new_conn = bt_conn_ref(conn);
@@ -115,7 +102,7 @@ void set_security(struct bt_conn *conn, bt_security_t sec)
 	int err;
 
 	err = bt_conn_set_security(conn, sec);
-	ASSERT(!err, "Err bt_conn_set_security %d", err);
+	TEST_ASSERT(!err, "Err bt_conn_set_security %d", err);
 }
 
 void wait_pairing_completed(void)
@@ -129,12 +116,12 @@ void bs_bt_utils_setup(void)
 	int err;
 
 	err = bt_enable(NULL);
-	ASSERT(!err, "bt_enable failed.\n");
+	TEST_ASSERT(!err, "bt_enable failed.");
 	err = bt_conn_auth_info_cb_register(&bt_conn_auth_info_cb);
-	ASSERT(!err, "bt_conn_auth_info_cb_register failed.\n");
+	TEST_ASSERT(!err, "bt_conn_auth_info_cb_register failed.");
 
 	err = settings_load();
-	ASSERT(!err, "settings_load failed.\n");
+	TEST_ASSERT(!err, "settings_load failed.");
 }
 
 void disconnect(struct bt_conn *conn)
@@ -142,7 +129,7 @@ void disconnect(struct bt_conn *conn)
 	int err;
 
 	err = bt_conn_disconnect(conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
-	ASSERT(!err, "Err bt_conn_disconnect %d", err);
+	TEST_ASSERT(!err, "Err bt_conn_disconnect %d", err);
 }
 
 void advertise_connectable(int id)
@@ -156,7 +143,7 @@ void advertise_connectable(int id)
 	param.options |= BT_LE_ADV_OPT_CONN;
 
 	err = bt_le_adv_start(&param, NULL, 0, NULL, 0);
-	ASSERT(!err, "Advertising failed to start (err %d)\n", err);
+	TEST_ASSERT(!err, "Advertising failed to start (err %d)", err);
 }
 
 DEFINE_FLAG(flag_bas_ccc_subscribed);
@@ -203,7 +190,7 @@ void bas_notify(struct bt_conn *conn)
 	int err;
 
 	err = bt_gatt_notify(conn, &bas.attrs[2], &bas_level, sizeof(bas_level));
-	ASSERT(!err, "bt_gatt_notify failed (err %d)\n", err);
+	TEST_ASSERT(!err, "bt_gatt_notify failed (err %d)", err);
 }
 
 DEFINE_FLAG(flag_bas_has_notification);
diff --git a/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/utils.h b/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/utils.h
index 01690b2c82c..975c3f16a48 100644
--- a/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/utils.h
+++ b/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/utils.h
@@ -1,9 +1,6 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
-
 void bs_bt_utils_setup(void);
 
 void clear_conn(struct bt_conn *conn);
diff --git a/tests/bsim/bluetooth/host/security/security_changed_callback/CMakeLists.txt b/tests/bsim/bluetooth/host/security/security_changed_callback/CMakeLists.txt
index e6dcda9d49a..e0f557ddbc4 100644
--- a/tests/bsim/bluetooth/host/security/security_changed_callback/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/security/security_changed_callback/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(bsim_test_security_changed_callback)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
 	src/bs_bt_utils.c
 	src/central.c
diff --git a/tests/bsim/bluetooth/host/security/security_changed_callback/src/bs_bt_utils.c b/tests/bsim/bluetooth/host/security/security_changed_callback/src/bs_bt_utils.c
index 6f7f379853b..241dc5b9bf0 100644
--- a/tests/bsim/bluetooth/host/security/security_changed_callback/src/bs_bt_utils.c
+++ b/tests/bsim/bluetooth/host/security/security_changed_callback/src/bs_bt_utils.c
@@ -9,25 +9,10 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/settings/settings.h>
 
-LOG_MODULE_REGISTER(bs_bt_utils, LOG_LEVEL_DBG);
-
-#define BS_SECONDS(dur_sec)    ((bs_time_t)dur_sec * 1000000)
-#define TEST_TIMEOUT_SIMULATED BS_SECONDS(60)
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
-void test_tick(bs_time_t HW_device_time)
-{
-	bs_trace_debug_time(0, "Simulation ends now.\n");
-	if (bst_result != Passed) {
-		bst_result = Failed;
-		bs_trace_error("Test did not pass before simulation ended.\n");
-	}
-}
-
-void test_init(void)
-{
-	bst_ticker_set_next_tick_absolute(TEST_TIMEOUT_SIMULATED);
-	bst_result = In_progress;
-}
+LOG_MODULE_REGISTER(bs_bt_utils, LOG_LEVEL_DBG);
 
 DEFINE_FLAG(flag_is_connected);
 struct bt_conn *g_conn;
@@ -55,7 +40,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason)
 
 static void connected(struct bt_conn *conn, uint8_t err)
 {
-	ASSERT((!g_conn || (conn == g_conn)), "Unexpected new connection.");
+	TEST_ASSERT((!g_conn || (conn == g_conn)), "Unexpected new connection.");
 
 	if (!g_conn) {
 		g_conn = bt_conn_ref(conn);
@@ -81,7 +66,7 @@ void clear_g_conn(void)
 
 	conn = g_conn;
 	g_conn = NULL;
-	ASSERT(conn, "Test error: No g_conn!\n");
+	TEST_ASSERT(conn, "Test error: No g_conn!\n");
 	bt_conn_unref(conn);
 }
 
@@ -119,13 +104,13 @@ void bs_bt_utils_setup(void)
 	int err;
 
 	err = bt_enable(NULL);
-	ASSERT(!err, "bt_enable failed.\n");
+	TEST_ASSERT(!err, "bt_enable failed.");
 	err = bt_conn_auth_info_cb_register(&bt_conn_auth_info_cb);
-	ASSERT(!err, "bt_conn_auth_info_cb_register failed.\n");
+	TEST_ASSERT(!err, "bt_conn_auth_info_cb_register failed.");
 
 	err = settings_load();
 	if (err) {
-		FAIL("Settings load failed (err %d)\n", err);
+		TEST_FAIL("Settings load failed (err %d)", err);
 	}
 }
 
@@ -145,10 +130,10 @@ static void stop_scan_and_connect(const bt_addr_le_t *addr,
 	printk("Got scan result, connecting.. dst %s, RSSI %d\n", addr_str, rssi);
 
 	err = bt_le_scan_stop();
-	ASSERT(!err, "Err bt_le_scan_stop %d", err);
+	TEST_ASSERT(!err, "Err bt_le_scan_stop %d", err);
 
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT, &g_conn);
-	ASSERT(!err, "Err bt_conn_le_create %d", err);
+	TEST_ASSERT(!err, "Err bt_conn_le_create %d", err);
 }
 
 void scan_connect_to_first_result(void)
@@ -156,7 +141,7 @@ void scan_connect_to_first_result(void)
 	int err;
 
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, stop_scan_and_connect);
-	ASSERT(!err, "Err bt_le_scan_start %d", err);
+	TEST_ASSERT(!err, "Err bt_le_scan_start %d", err);
 }
 
 void set_security(bt_security_t sec)
@@ -164,7 +149,7 @@ void set_security(bt_security_t sec)
 	int err;
 
 	err = bt_conn_set_security(g_conn, sec);
-	ASSERT(!err, "Err bt_conn_set_security %d", err);
+	TEST_ASSERT(!err, "Err bt_conn_set_security %d", err);
 }
 
 void advertise_connectable(int id, bt_addr_le_t *directed_dst)
@@ -183,5 +168,5 @@ void advertise_connectable(int id, bt_addr_le_t *directed_dst)
 	}
 
 	err = bt_le_adv_start(&param, NULL, 0, NULL, 0);
-	ASSERT(err == 0, "Advertising failed to start (err %d)\n", err);
+	TEST_ASSERT(err == 0, "Advertising failed to start (err %d)", err);
 }
diff --git a/tests/bsim/bluetooth/host/security/security_changed_callback/src/bs_bt_utils.h b/tests/bsim/bluetooth/host/security/security_changed_callback/src/bs_bt_utils.h
index ed6cea0d5ef..3491493c990 100644
--- a/tests/bsim/bluetooth/host/security/security_changed_callback/src/bs_bt_utils.h
+++ b/tests/bsim/bluetooth/host/security/security_changed_callback/src/bs_bt_utils.h
@@ -6,10 +6,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "bs_tracing.h"
-#include "bs_types.h"
-#include "bstests.h"
-
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -22,47 +18,8 @@
 #include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
-extern enum bst_result_t bst_result;
-
-#define DECLARE_FLAG(flag) extern atomic_t flag
-#define DEFINE_FLAG(flag)  atomic_t flag = (atomic_t) false
-#define SET_FLAG(flag)     (void)atomic_set(&flag, (atomic_t) true)
-#define UNSET_FLAG(flag)   (void)atomic_set(&flag, (atomic_t) false)
-#define WAIT_FOR_FLAG(flag)                                                                        \
-	while (!(bool)atomic_get(&flag)) {                                                         \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define WAIT_FOR_FLAG_UNSET(flag)                                                                  \
-	while ((bool)atomic_get(&flag)) {                                                          \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define TAKE_FLAG(flag)                                                                            \
-	while (!(bool)atomic_cas(&flag, true, false)) {                                            \
-		(void)k_sleep(K_MSEC(1));                                                          \
-	}
-#define GET_FLAG(flag) (bool)atomic_get(&flag)
-
-#define ASSERT(expr, ...)                                                                          \
-	do {                                                                                       \
-		if (!(expr)) {                                                                     \
-			FAIL(__VA_ARGS__);                                                         \
-		}                                                                                  \
-	} while (0)
-
-#define FAIL(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Failed;                                                               \
-		bs_trace_error_time_line(__VA_ARGS__);                                             \
-	} while (0)
-
-#define PASS(...)                                                                                  \
-	do {                                                                                       \
-		bst_result = Passed;                                                               \
-		bs_trace_info_time(1, __VA_ARGS__);                                                \
-	} while (0)
-
-void test_tick(bs_time_t HW_device_time);
-void test_init(void);
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 DECLARE_FLAG(flag_pairing_complete);
 DECLARE_FLAG(flag_bonded);
diff --git a/tests/bsim/bluetooth/host/security/security_changed_callback/src/central.c b/tests/bsim/bluetooth/host/security/security_changed_callback/src/central.c
index abf896d8618..f03dca354f6 100644
--- a/tests/bsim/bluetooth/host/security/security_changed_callback/src/central.c
+++ b/tests/bsim/bluetooth/host/security/security_changed_callback/src/central.c
@@ -12,6 +12,8 @@
 #include <zephyr/bluetooth/bluetooth.h>
 
 #include "bs_bt_utils.h"
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
 
 LOG_MODULE_REGISTER(test_central, LOG_LEVEL_DBG);
 
@@ -35,5 +37,5 @@ void central(void)
 
 	clear_g_conn();
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
diff --git a/tests/bsim/bluetooth/host/security/security_changed_callback/src/main.c b/tests/bsim/bluetooth/host/security/security_changed_callback/src/main.c
index dcefa274297..3a22ca41d2c 100644
--- a/tests/bsim/bluetooth/host/security/security_changed_callback/src/main.c
+++ b/tests/bsim/bluetooth/host/security/security_changed_callback/src/main.c
@@ -14,20 +14,14 @@ void peripheral_disconnect_in_sec_cb(void);
 static const struct bst_test_instance test_to_add[] = {
 	{
 		.test_id = "central",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = central,
 	},
 	{
 		.test_id = "peripheral_unpair_in_sec_cb",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = peripheral_unpair_in_sec_cb,
 	},
 	{
 		.test_id = "peripheral_disconnect_in_sec_cb",
-		.test_pre_init_f = test_init,
-		.test_tick_f = test_tick,
 		.test_main_f = peripheral_disconnect_in_sec_cb,
 	},
 	BSTEST_END_MARKER,
diff --git a/tests/bsim/bluetooth/host/security/security_changed_callback/src/peripheral.c b/tests/bsim/bluetooth/host/security/security_changed_callback/src/peripheral.c
index 56c351efb05..108f9d9fd57 100644
--- a/tests/bsim/bluetooth/host/security/security_changed_callback/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/security/security_changed_callback/src/peripheral.c
@@ -13,6 +13,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 
 #include "bs_bt_utils.h"
+#include "babblekit/testcase.h"
 
 LOG_MODULE_REGISTER(test_peripheral, LOG_LEVEL_DBG);
 
@@ -20,7 +21,7 @@ BUILD_ASSERT(CONFIG_BT_BONDABLE, "CONFIG_BT_BONDABLE must be enabled by default.
 
 static void pairing_complete_unpair(struct bt_conn *conn, bool bonded)
 {
-	FAIL("Pairing succeed\n");
+	TEST_FAIL("Pairing succeed");
 }
 
 static void peripheral_security_changed_unpair(struct bt_conn *conn,
@@ -51,7 +52,7 @@ void peripheral_unpair_in_sec_cb(void)
 
 	bt_conn_cb_register(&peripheral_cb);
 	err = bt_conn_auth_info_cb_register(&peripheral_auth_info_cb);
-	ASSERT(!err, "bt_conn_auth_info_cb_register failed.\n");
+	TEST_ASSERT(!err, "bt_conn_auth_info_cb_register failed.");
 
 	advertise_connectable(BT_ID_DEFAULT, NULL);
 	wait_connected();
@@ -60,12 +61,12 @@ void peripheral_unpair_in_sec_cb(void)
 
 	clear_g_conn();
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
 
 static void pairing_failed_disconnect(struct bt_conn *conn, enum bt_security_err err)
 {
-	FAIL("Pairing failed\n");
+	TEST_FAIL("Pairing failed");
 }
 
 static void peripheral_security_changed_disconnect(struct bt_conn *conn,
@@ -95,7 +96,7 @@ void peripheral_disconnect_in_sec_cb(void)
 
 	bt_conn_cb_register(&peripheral_cb);
 	err = bt_conn_auth_info_cb_register(&peripheral_auth_info_cb);
-	ASSERT(!err, "bt_conn_auth_info_cb_register failed.\n");
+	TEST_ASSERT(!err, "bt_conn_auth_info_cb_register failed.");
 
 	advertise_connectable(BT_ID_DEFAULT, NULL);
 	wait_connected();
@@ -104,5 +105,5 @@ void peripheral_disconnect_in_sec_cb(void)
 
 	clear_g_conn();
 
-	PASS("PASS\n");
+	TEST_PASS("PASS");
 }
diff --git a/tests/bsim/bluetooth/samples/battery_service/src/central_test.c b/tests/bsim/bluetooth/samples/battery_service/src/central_test.c
index 958bbd99ba4..832c6e4449f 100644
--- a/tests/bsim/bluetooth/samples/battery_service/src/central_test.c
+++ b/tests/bsim/bluetooth/samples/battery_service/src/central_test.c
@@ -57,9 +57,9 @@ static struct bt_gatt_subscribe_params battery_critical_status_sub_params;
 #define BAS_BLS_IND_RECEIVED_COUNT 20
 #define BAS_BLS_NTF_RECEIVED_COUNT 20
 
-static DEFINE_FLAG(notification_count_reached);
-static DEFINE_FLAG(indication_count_reached);
-static DEFINE_FLAG(bcs_char_read);
+DEFINE_FLAG_STATIC(notification_count_reached);
+DEFINE_FLAG_STATIC(indication_count_reached);
+DEFINE_FLAG_STATIC(bcs_char_read);
 
 /* Callback for handling Battery Critical Status Read Response */
 static uint8_t battery_critical_status_read_cb(struct bt_conn *conn, uint8_t err,

From 4e26578ba63339c5b7221e1cbbde97c97388181e Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Mon, 10 Feb 2025 15:16:50 +0100
Subject: [PATCH 2380/2913] [nrf fromtree] tests: bluetooth: tester: mesh:
 Increase CMD tx bufs

Increase CONFIG_BT_BUF_CMD_TX_COUNT to avoid deadlock when running out
of buffers. See #77241 for the reference.

This fixes Mesh Provisioning Service tests (MESH/NODE/MPS).

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit 6c35d372dd201647fd7fc97e070da20421ad077b)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 tests/bluetooth/tester/overlay-mesh.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/bluetooth/tester/overlay-mesh.conf b/tests/bluetooth/tester/overlay-mesh.conf
index 815f4952497..04e6c074e21 100644
--- a/tests/bluetooth/tester/overlay-mesh.conf
+++ b/tests/bluetooth/tester/overlay-mesh.conf
@@ -58,3 +58,6 @@ CONFIG_BT_MESH_COMP_PAGE_2=y
 CONFIG_BT_MESH_BRG_CFG_SRV=y
 CONFIG_BT_MESH_BRG_CFG_CLI=y
 CONFIG_SETTINGS=y
+
+# Increase the number of buffers to avoid deadlock when running out of buffers
+CONFIG_BT_BUF_CMD_TX_COUNT=4

From 06550b42ba7d1e91facde5722d71012ec258806e Mon Sep 17 00:00:00 2001
From: alperen sener <alperen.sener@nordicsemi.no>
Date: Fri, 7 Feb 2025 09:57:37 +0100
Subject: [PATCH 2381/2913] [nrf fromtree] tests: bluetooth: tester: Make BTP
 CMD thread stack size kconfig

Different test layers need different stack sizes for BTP CMD thread
and also AutoPTS might need to overwrite this config based on test
case.

Increase the stack size for mesh tests.

Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
(cherry picked from commit 3cab4fe0dc589a4babf3584021e7e5ee68f596e4)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 tests/bluetooth/tester/Kconfig           | 6 ++++++
 tests/bluetooth/tester/overlay-mesh.conf | 1 +
 tests/bluetooth/tester/src/btp.c         | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/bluetooth/tester/Kconfig b/tests/bluetooth/tester/Kconfig
index 5768a740441..af0230b8dc8 100644
--- a/tests/bluetooth/tester/Kconfig
+++ b/tests/bluetooth/tester/Kconfig
@@ -9,6 +9,12 @@ module = BTTESTER
 module-str = bttester
 source "subsys/logging/Kconfig.template.log_config"
 
+config BTTESTER_BTP_CMD_THREAD_STACK_SIZE
+	int "BTP CMD threads stack size."
+	default 2048
+	help
+	  Stack size in byte used by the BTP CMD thread.
+
 endmenu
 
 source "Kconfig.zephyr"
diff --git a/tests/bluetooth/tester/overlay-mesh.conf b/tests/bluetooth/tester/overlay-mesh.conf
index 04e6c074e21..1377d93639a 100644
--- a/tests/bluetooth/tester/overlay-mesh.conf
+++ b/tests/bluetooth/tester/overlay-mesh.conf
@@ -2,6 +2,7 @@
 # PSA key slots; in order to make sure there is always
 # enough key slots allocating 32 slots.
 CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=32
+CONFIG_BTTESTER_BTP_CMD_THREAD_STACK_SIZE=3072
 
 CONFIG_BT_MESH=y
 CONFIG_BT_MESH_RELAY=y
diff --git a/tests/bluetooth/tester/src/btp.c b/tests/bluetooth/tester/src/btp.c
index 2ba92bf8214..3951ea0aee1 100644
--- a/tests/bluetooth/tester/src/btp.c
+++ b/tests/bluetooth/tester/src/btp.c
@@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 
 #include "btp/btp.h"
 
-#define STACKSIZE 2048
+#define STACKSIZE CONFIG_BTTESTER_BTP_CMD_THREAD_STACK_SIZE
 static K_THREAD_STACK_DEFINE(stack, STACKSIZE);
 static struct k_thread cmd_thread;
 

From f600c9985aa615eccf905e1065be74f8f58ba6ad Mon Sep 17 00:00:00 2001
From: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
Date: Wed, 5 Feb 2025 15:53:35 +0100
Subject: [PATCH 2382/2913] [nrf fromtree] Bluetooth: Mesh: Remove experimental
 TF-M PSA

Remove the experimental flag from BT_MESH_USES_TFM_PSA.

Signed-off-by: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
(cherry picked from commit 45f233ba619079a0403a11deac802d62cceaf137)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/mesh/Kconfig | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 13d892aa437..8feef62d947 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -1538,13 +1538,11 @@ config BT_MESH_USES_MBEDTLS_PSA
 	  Use Mbed TLS as PSA Crypto API provider.
 
 config BT_MESH_USES_TFM_PSA
-	bool "Use TF-M PSA [EXPERIMENTAL]"
-	select EXPERIMENTAL
+	bool "TF-M PSA"
 	depends on BUILD_WITH_TFM
 	help
 	  Use TF-M as PSA Crypto API provider. This is only possible on platforms
 	  that support TF-M.
-	  This feature is experimental.
 
 endchoice
 

From c5d37e56fef3b662cf0e77c2ebab32395bd8ddc7 Mon Sep 17 00:00:00 2001
From: alperen sener <alperen.sener@nordicsemi.no>
Date: Wed, 12 Feb 2025 15:51:49 +0100
Subject: [PATCH 2383/2913] [nrf fromtree] bluetooth: mesh: Correct callback
 check mesh blob client

xfer_progress_complete should be checked instead of end callback

Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
(cherry picked from commit 3fdb81cd1fee384939c41726484b70b0e62ebcec)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/mesh/blob_cli.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/bluetooth/mesh/blob_cli.c b/subsys/bluetooth/mesh/blob_cli.c
index 40d3d37a6c0..f5aae195476 100644
--- a/subsys/bluetooth/mesh/blob_cli.c
+++ b/subsys/bluetooth/mesh/blob_cli.c
@@ -1086,7 +1086,7 @@ static void progress_checked(struct bt_mesh_blob_cli *cli)
 
 	cli->state = BT_MESH_BLOB_CLI_STATE_NONE;
 
-	if (cli->cb && cli->cb->end) {
+	if (cli->cb && cli->cb->xfer_progress_complete) {
 		cli->cb->xfer_progress_complete(cli);
 	}
 }

From 107f9f0cf5369c707282724f7484d708a99ed274 Mon Sep 17 00:00:00 2001
From: alperen sener <alperen.sener@nordicsemi.no>
Date: Wed, 19 Feb 2025 13:35:12 +0100
Subject: [PATCH 2384/2913] [nrf noup] samples: bluetooth: mesh: Disable secure
 storage for real targets.

Mesh currently works with trusted storage on real targets. Until secure
storage is supported by default disable it.

Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 samples/bluetooth/mesh/boards/qemu_x86.conf                 | 6 ++++++
 samples/bluetooth/mesh/prj.conf                             | 2 +-
 samples/bluetooth/mesh_demo/boards/qemu_x86.conf            | 6 ++++++
 samples/bluetooth/mesh_demo/prj.conf                        | 2 +-
 samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf     | 6 ++++++
 samples/bluetooth/mesh_provisioner/prj.conf                 | 2 +-
 samples/boards/nordic/mesh/onoff-app/prj.conf               | 2 +-
 .../nordic/mesh/onoff_level_lighting_vnd_app/prj.conf       | 2 +-
 8 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 samples/bluetooth/mesh/boards/qemu_x86.conf
 create mode 100644 samples/bluetooth/mesh_demo/boards/qemu_x86.conf
 create mode 100644 samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf

diff --git a/samples/bluetooth/mesh/boards/qemu_x86.conf b/samples/bluetooth/mesh/boards/qemu_x86.conf
new file mode 100644
index 00000000000..bfb57193b78
--- /dev/null
+++ b/samples/bluetooth/mesh/boards/qemu_x86.conf
@@ -0,0 +1,6 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_NRF_SECURITY=n
+CONFIG_MBEDTLS_ENABLE_HEAP=n
+CONFIG_TRUSTED_STORAGE=n
+CONFIG_SECURE_STORAGE=y
diff --git a/samples/bluetooth/mesh/prj.conf b/samples/bluetooth/mesh/prj.conf
index 14b19316a86..cd7d6532b61 100644
--- a/samples/bluetooth/mesh/prj.conf
+++ b/samples/bluetooth/mesh/prj.conf
@@ -5,7 +5,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 CONFIG_HWINFO=y
 
 CONFIG_BT=y
diff --git a/samples/bluetooth/mesh_demo/boards/qemu_x86.conf b/samples/bluetooth/mesh_demo/boards/qemu_x86.conf
new file mode 100644
index 00000000000..bfb57193b78
--- /dev/null
+++ b/samples/bluetooth/mesh_demo/boards/qemu_x86.conf
@@ -0,0 +1,6 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_NRF_SECURITY=n
+CONFIG_MBEDTLS_ENABLE_HEAP=n
+CONFIG_TRUSTED_STORAGE=n
+CONFIG_SECURE_STORAGE=y
diff --git a/samples/bluetooth/mesh_demo/prj.conf b/samples/bluetooth/mesh_demo/prj.conf
index bcb738ae5bd..b7016b02c65 100644
--- a/samples/bluetooth/mesh_demo/prj.conf
+++ b/samples/bluetooth/mesh_demo/prj.conf
@@ -31,7 +31,7 @@ CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=600
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 # Limit the number of key slots in PSA Crypto core to reduce
 # RAM footprint
diff --git a/samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf b/samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf
new file mode 100644
index 00000000000..bfb57193b78
--- /dev/null
+++ b/samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf
@@ -0,0 +1,6 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_NRF_SECURITY=n
+CONFIG_MBEDTLS_ENABLE_HEAP=n
+CONFIG_TRUSTED_STORAGE=n
+CONFIG_SECURE_STORAGE=y
diff --git a/samples/bluetooth/mesh_provisioner/prj.conf b/samples/bluetooth/mesh_provisioner/prj.conf
index 10949c5480d..24176780516 100644
--- a/samples/bluetooth/mesh_provisioner/prj.conf
+++ b/samples/bluetooth/mesh_provisioner/prj.conf
@@ -45,7 +45,7 @@ CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=600
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 #CONFIG_BT_MESH_LOG_LEVEL_DBG=y
 #CONFIG_BT_MESH_SETTINGS_LOG_LEVEL_DBG=y
diff --git a/samples/boards/nordic/mesh/onoff-app/prj.conf b/samples/boards/nordic/mesh/onoff-app/prj.conf
index 0e67042b265..0783579e795 100644
--- a/samples/boards/nordic/mesh/onoff-app/prj.conf
+++ b/samples/boards/nordic/mesh/onoff-app/prj.conf
@@ -9,7 +9,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=600
 
diff --git a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
index 3bb984208c7..96b5466b4a1 100644
--- a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
+++ b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
@@ -7,7 +7,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_BROADCASTER=y

From 7d700debb8618ebed8119f7c6abf702d0cb51093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= <rafal.kuznia@nordicsemi.no>
Date: Wed, 19 Feb 2025 15:47:07 +0100
Subject: [PATCH 2385/2913] [nrf noup] dts: Select SoftDevice Controller on
 nRF54L09
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The SDC HCI controller is defined as a device tree node.
A node representing the SDC controller is added and selected as the
default over the open source link layer. This is consistent with other
SoCs.

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
---
 boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi | 4 ++--
 dts/arm/nordic/nrf54l09_enga_cpuapp.dtsi              | 4 ++--
 dts/common/nordic/nrf54l09.dtsi                       | 8 +++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi b/boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi
index c258cb2f4b7..454996a405c 100644
--- a/boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi
@@ -18,7 +18,7 @@
 		zephyr,bt-c2h-uart = &uart20;
 		zephyr,flash-controller = &rram_controller;
 		zephyr,flash = &cpuapp_rram;
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,ieee802154 = &ieee802154;
 	};
 };
@@ -108,7 +108,7 @@
 	status = "okay";
 };
 
-&bt_hci_controller {
+&bt_hci_sdc {
 	status = "okay";
 };
 
diff --git a/dts/arm/nordic/nrf54l09_enga_cpuapp.dtsi b/dts/arm/nordic/nrf54l09_enga_cpuapp.dtsi
index 1dfc5ce133c..6c7f34d3b21 100644
--- a/dts/arm/nordic/nrf54l09_enga_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l09_enga_cpuapp.dtsi
@@ -17,7 +17,7 @@ nvic: &cpuapp_nvic {};
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &prng;
 	};
 
@@ -38,7 +38,7 @@ nvic: &cpuapp_nvic {};
 	};
 };
 
-&bt_hci_controller {
+&bt_hci_sdc {
 	status = "okay";
 };
 
diff --git a/dts/common/nordic/nrf54l09.dtsi b/dts/common/nordic/nrf54l09.dtsi
index 78b08b5510f..e73a609a813 100644
--- a/dts/common/nordic/nrf54l09.dtsi
+++ b/dts/common/nordic/nrf54l09.dtsi
@@ -212,9 +212,11 @@
 					status = "disabled";
 				};
 
-				/* Note: In the nRF Connect SDK the SoftDevice Controller
-				 * is added and set as the default Bluetooth Controller.
-				 */
+				bt_hci_sdc: bt_hci_sdc {
+					compatible = "nordic,bt-hci-sdc";
+					status = "disabled";
+				};
+
 				bt_hci_controller: bt_hci_controller {
 					compatible = "zephyr,bt-hci-ll-sw-split";
 					status = "disabled";

From 098da0b92211a46b1976673759e1036c2209bc83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5vard=20Reierstad?= <haavard.reierstad@nordicsemi.no>
Date: Fri, 21 Feb 2025 09:52:54 +0100
Subject: [PATCH 2386/2913] Revert "[nrf noup] lib: net_buf: buf: Revert alloc
 DBG to WRN change"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6c9b2f2f417cad2a64de64abb93cca93d78a1269.

Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
---
 lib/net_buf/buf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/net_buf/buf.c b/lib/net_buf/buf.c
index a2f504ac06b..6d409430f08 100644
--- a/lib/net_buf/buf.c
+++ b/lib/net_buf/buf.c
@@ -273,7 +273,7 @@ struct net_buf *net_buf_alloc_len(struct net_buf_pool *pool, size_t size,
 
 	if (!K_TIMEOUT_EQ(timeout, K_NO_WAIT) &&
 	    k_current_get() == k_work_queue_thread_get(&k_sys_work_q)) {
-		LOG_DBG("Timeout discarded. No blocking in syswq");
+		LOG_WRN("Timeout discarded. No blocking in syswq");
 		timeout = K_NO_WAIT;
 	}
 

From 74e5da213cf1ef07ec923e7cbccf92d094044bf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5vard=20Reierstad?= <haavard.reierstad@nordicsemi.no>
Date: Fri, 21 Feb 2025 09:52:54 +0100
Subject: [PATCH 2387/2913] [nrf fromtree] net: buf: revert disallowing
 blocking in syswq
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reverts the change made in d4d53010f00cadbb4f89c6d41391937646fc1740
(The changes was moved to another file in a restructuring)

The commit incorrectly assumed that no blocking would be allowed in
the syswq. This has caused issues observed among others
in #77241 and #80167

Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit e13e893dfcf5754b002421ad9af83eab09f0c559)
Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
---
 include/zephyr/net_buf.h | 39 ++++++++++++---------------------------
 lib/net_buf/buf.c        |  6 ------
 2 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/include/zephyr/net_buf.h b/include/zephyr/net_buf.h
index 02c041e9dca..62f6299cd30 100644
--- a/include/zephyr/net_buf.h
+++ b/include/zephyr/net_buf.h
@@ -1325,19 +1325,14 @@ int net_buf_id(const struct net_buf *buf);
 /**
  * @brief Allocate a new fixed buffer from a pool.
  *
- * @note Some types of data allocators do not support
- *       blocking (such as the HEAP type). In this case it's still possible
- *       for net_buf_alloc() to fail (return NULL) even if it was given
- *       K_FOREVER.
- *
- * @note The timeout value will be overridden to K_NO_WAIT if called from the
- *       system workqueue.
- *
  * @param pool Which pool to allocate the buffer from.
  * @param timeout Affects the action taken should the pool be empty.
  *        If K_NO_WAIT, then return immediately. If K_FOREVER, then
  *        wait as long as necessary. Otherwise, wait until the specified
- *        timeout.
+ *        timeout. Note that some types of data allocators do not support
+ *        blocking (such as the HEAP type). In this case it's still possible
+ *        for net_buf_alloc() to fail (return NULL) even if it was given
+ *        K_FOREVER.
  *
  * @return New buffer or NULL if out of buffers.
  */
@@ -1365,20 +1360,15 @@ static inline struct net_buf * __must_check net_buf_alloc(struct net_buf_pool *p
 /**
  * @brief Allocate a new variable length buffer from a pool.
  *
- * @note Some types of data allocators do not support
- *       blocking (such as the HEAP type). In this case it's still possible
- *       for net_buf_alloc() to fail (return NULL) even if it was given
- *       K_FOREVER.
- *
- * @note The timeout value will be overridden to K_NO_WAIT if called from the
- *       system workqueue.
- *
  * @param pool Which pool to allocate the buffer from.
  * @param size Amount of data the buffer must be able to fit.
  * @param timeout Affects the action taken should the pool be empty.
  *        If K_NO_WAIT, then return immediately. If K_FOREVER, then
  *        wait as long as necessary. Otherwise, wait until the specified
- *        timeout.
+ *        timeout. Note that some types of data allocators do not support
+ *        blocking (such as the HEAP type). In this case it's still possible
+ *        for net_buf_alloc() to fail (return NULL) even if it was given
+ *        K_FOREVER.
  *
  * @return New buffer or NULL if out of buffers.
  */
@@ -1402,21 +1392,16 @@ struct net_buf * __must_check net_buf_alloc_len(struct net_buf_pool *pool,
  * Allocate a new buffer from a pool, where the data pointer comes from the
  * user and not from the pool.
  *
- * @note Some types of data allocators do not support
- *       blocking (such as the HEAP type). In this case it's still possible
- *       for net_buf_alloc() to fail (return NULL) even if it was given
- *       K_FOREVER.
- *
- * @note The timeout value will be overridden to K_NO_WAIT if called from the
- *       system workqueue.
- *
  * @param pool Which pool to allocate the buffer from.
  * @param data External data pointer
  * @param size Amount of data the pointed data buffer if able to fit.
  * @param timeout Affects the action taken should the pool be empty.
  *        If K_NO_WAIT, then return immediately. If K_FOREVER, then
  *        wait as long as necessary. Otherwise, wait until the specified
- *        timeout.
+ *        timeout. Note that some types of data allocators do not support
+ *        blocking (such as the HEAP type). In this case it's still possible
+ *        for net_buf_alloc() to fail (return NULL) even if it was given
+ *        K_FOREVER.
  *
  * @return New buffer or NULL if out of buffers.
  */
diff --git a/lib/net_buf/buf.c b/lib/net_buf/buf.c
index 6d409430f08..c8f42e6f510 100644
--- a/lib/net_buf/buf.c
+++ b/lib/net_buf/buf.c
@@ -271,12 +271,6 @@ struct net_buf *net_buf_alloc_len(struct net_buf_pool *pool, size_t size,
 
 	k_spin_unlock(&pool->lock, key);
 
-	if (!K_TIMEOUT_EQ(timeout, K_NO_WAIT) &&
-	    k_current_get() == k_work_queue_thread_get(&k_sys_work_q)) {
-		LOG_WRN("Timeout discarded. No blocking in syswq");
-		timeout = K_NO_WAIT;
-	}
-
 #if defined(CONFIG_NET_BUF_LOG) && (CONFIG_NET_BUF_LOG_LEVEL >= LOG_LEVEL_WRN)
 	if (K_TIMEOUT_EQ(timeout, K_FOREVER)) {
 		uint32_t ref = k_uptime_get_32();

From 24fec0c8c67fdd64fe370396aeb64fc55257c925 Mon Sep 17 00:00:00 2001
From: Ludvig Jordet <ludvig.jordet@nordicsemi.no>
Date: Fri, 21 Feb 2025 09:52:54 +0100
Subject: [PATCH 2388/2913] [nrf fromlist] Bluetooth: Mesh: Update Kconfig help
 about Mesh on System WQ

This updates the help text for the Kconfig option BT_MESH_WORKQ_SYS to
take into account the change made in PR #84282 which causes the host to
no longer return -ENOBUFS. Since the mesh will now instead block the
work queue, a note has been added about a potential consequence of this.

Upstream PR #: 86022

Signed-off-by: Ludvig Jordet <ludvig.jordet@nordicsemi.no>
---
 subsys/bluetooth/mesh/Kconfig | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 8feef62d947..367744d91a2 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -130,10 +130,12 @@ config BT_MESH_WORKQ_SYS
 	  refer to BT_MESH_ADV_STACK_SIZE for the recommended minimum.
 
 	  When this option is enabled and the mesh tries to send a message,
-	  and the host ran out the HCI command buffers controlled by
-	  CONFIG_BT_BUF_CMD_TX_COUNT, the host returns -ENOBUFS immediately
-	  and the mesh drops the message transmission. To mitigate this
-	  issue, make sure to have sufficient number of HCI command buffers.
+	  and the host ran out of the HCI command buffers controlled by
+	  CONFIG_BT_BUF_CMD_TX_COUNT, the system work queue will be blocked
+	  until an HCI command buffer has been freed. This may cause a deadlock
+	  where the host cannot use the system workqueue to free the buffer
+	  that the mesh is waiting for. To mitigate this issue, make sure to
+	  have a sufficient number of HCI command buffers.
 	  When this option is enabled, the latency of sending mesh messages
 	  will be affected by other users on the system work queue, resulting in
 	  reduced reliability for sending mesh messages.

From e538f0c4b875bc8ba4b5b66c00f6ea44ce6b6dc6 Mon Sep 17 00:00:00 2001
From: Morten Priess <mtpr@oticon.com>
Date: Thu, 22 Aug 2024 14:42:56 +0200
Subject: [PATCH 2389/2913] [nrf fromtree] Bluetooth: controller: Fix ISO
 broadcaster pre-transmission groups > 1

For pre-transmission groups > 1, the broadcaster link layer would fetch
incorrect payloads from the TX node queue.

Update payload index calculation to reference correct TX payload. Fix
PTO FIXMEs and range checks.

Signed-off-by: Morten Priess <mtpr@oticon.com>
(cherry picked from commit d58724d7d73f1d0119d893e98bb072cfc632770c)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../controller/ll_sw/nordic/lll/lll_adv_iso.c | 21 ++++++++++++++++---
 .../bluetooth/controller/ll_sw/ull_adv_iso.c  | 11 ++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c
index a31b68b3ad1..02a9c473901 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c
@@ -627,9 +627,24 @@ static void isr_tx_common(void *param,
 	if (!pdu) {
 		uint8_t payload_index;
 
-		payload_index = (lll->bn_curr - 1U) +
-				(lll->ptc_curr * lll->pto);
-		payload_count = lll->payload_count + payload_index - lll->bn;
+		if (lll->ptc_curr) {
+			uint8_t ptx_idx = lll->ptc_curr - 1;
+			uint8_t ptx_payload_idx;
+			uint32_t ptx_group_mult;
+			uint8_t ptx_group_idx;
+
+			/* Calculate group index and multiplier for deriving
+			 * pre-transmission payload index.
+			 */
+			ptx_group_idx = ptx_idx / lll->bn;
+			ptx_payload_idx = ptx_idx - ptx_group_idx * lll->bn;
+			ptx_group_mult = (ptx_group_idx + 1) * lll->pto;
+			payload_index = ptx_payload_idx + ptx_group_mult * lll->bn;
+		} else {
+			payload_index  = lll->bn_curr - 1U;
+		}
+
+		payload_count = lll->payload_count - lll->bn + payload_index;
 
 #if !TEST_WITH_DUMMY_PDU
 		struct lll_adv_iso_stream *stream;
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c b/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c
index 32afe0b75fc..c3fb7cf92a6 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c
@@ -201,12 +201,11 @@ static uint8_t big_create(uint8_t big_handle, uint8_t adv_handle, uint8_t num_bi
 				return BT_HCI_ERR_INVALID_PARAM;
 			}
 
-			/* FIXME: PTO is currently limited to BN */
-			if (!IN_RANGE(pto, 0x00, bn /*0x0F*/)) {
+			if (!IN_RANGE(pto, 0x00, 0x0F)) {
 				return BT_HCI_ERR_INVALID_PARAM;
 			}
 
-			if (bn * irc + pto < nse) {
+			if (pto && !(bn * irc < nse)) {
 				return BT_HCI_ERR_INVALID_PARAM;
 			}
 		} else {
@@ -1162,10 +1161,8 @@ static uint8_t ptc_calc(const struct lll_adv_iso *lll, uint32_t event_spacing,
 		       (lll->sub_interval * lll->bn * lll->num_bis)) *
 		      lll->bn;
 
-		/* FIXME: Here we restrict to a maximum of BN Pre-Transmission
-		 * subevents per BIS
-		 */
-		ptc = MIN(ptc, lll->bn);
+		/* Restrict PTC to number of available subevents */
+		ptc = MIN(ptc, lll->nse - lll->bn * lll->irc);
 
 		return ptc;
 	}

From 5f71dfc9ece16ae00a543982b61c844efedc7664 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Wed, 8 Jan 2025 06:19:15 +0100
Subject: [PATCH 2390/2913] [nrf fromtree] Bluetooth: Controller: Add back the
 use of pre-transmissions

Add back the implementation in the Controller that tries to
enable pre-transmissions to improve time diversity to aid a
remote ISO Sync Receiver role device.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 9cd9f4150d40b101b45b569ab62429e263fae0d2)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../controller/ll_sw/nordic/lll/lll_adv_iso.c |  4 ++
 .../bluetooth/controller/ll_sw/ull_adv_iso.c  | 59 +++++++++++++++++--
 .../bluetooth/controller/ll_sw/ull_sync_iso.c | 13 +++-
 3 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c
index 02a9c473901..40aeaa211db 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c
@@ -669,6 +669,10 @@ static void isr_tx_common(void *param,
 				 (tx->payload_count < payload_count));
 		}
 		if (!link || (tx->payload_count != payload_count)) {
+			/* FIXME: Do not transmit on air an empty PDU if this is a Pre-Transmission
+			 *        subevent, instead use radio_tmr_start_us() to schedule next valid
+			 *        subevent.
+			 */
 			pdu = radio_pkt_empty_get();
 			pdu->ll_id = lll->framing ? PDU_BIS_LLID_FRAMED :
 						    PDU_BIS_LLID_START_CONTINUE;
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c b/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c
index c3fb7cf92a6..d1428c422b6 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c
@@ -51,6 +51,17 @@
 
 #include "hal/debug.h"
 
+/* Controller implementation dependent minimum Pre-Transmission Offset and
+ * Pre-Transmission Group Count to use when there is available time space in the
+ * BIG events.
+ * The number of Pre-Transmission Group Count configure how many future ISO SDUs
+ * from the Offset will be Pre-Transmitted in advance in the current BIG event.
+ *
+ * TODO: These could be a Kconfig option.
+ */
+#define BT_CTLR_ADV_ISO_PTO_MIN         1U
+#define BT_CTLR_ADV_ISO_PTO_GROUP_COUNT 1U
+
 static int init_reset(void);
 static struct ll_adv_iso_set *adv_iso_get(uint8_t handle);
 static struct stream *adv_iso_stream_acquire(void);
@@ -357,7 +368,12 @@ static uint8_t big_create(uint8_t big_handle, uint8_t adv_handle, uint8_t num_bi
 			lll_adv_iso->max_pdu = MIN(LL_BIS_OCTETS_TX_MAX, max_sdu);
 		}
 
-		/* FIXME: SDU per max latency */
+		/* FIXME: SDU per max latency, consider how to use Pre-transmission in the
+		 *        calculations.
+		 *        Take decision based on how ptc_calc function forces the use of
+		 *        Pre-Transmission when not using test command. Refer to comments in
+		 *        ptc_calc function.
+		 */
 		sdu_per_event = MAX((max_latency * USEC_PER_MSEC / sdu_interval), 2U) -
 				1U;
 
@@ -443,6 +459,9 @@ static uint8_t big_create(uint8_t big_handle, uint8_t adv_handle, uint8_t num_bi
 		return BT_HCI_ERR_INVALID_PARAM;
 	}
 
+	/* Decision to use requested Pre-Transmission Offset or force Pre-Transmission when
+	 * possible (Zephyr Controller decision).
+	 */
 	lll_adv_iso->ptc = ptc_calc(lll_adv_iso, event_spacing, event_spacing_max);
 
 	if (test_config) {
@@ -454,7 +473,7 @@ static uint8_t big_create(uint8_t big_handle, uint8_t adv_handle, uint8_t num_bi
 	} else {
 		/* Pre-Transmission Offset (PTO) */
 		if (lll_adv_iso->ptc) {
-			lll_adv_iso->pto = bn / lll_adv_iso->bn;
+			lll_adv_iso->pto = MAX((bn / lll_adv_iso->bn), BT_CTLR_ADV_ISO_PTO_MIN);
 		} else {
 			lll_adv_iso->pto = 0U;
 		}
@@ -1154,15 +1173,43 @@ static uint8_t ptc_calc(const struct lll_adv_iso *lll, uint32_t event_spacing,
 			uint32_t event_spacing_max)
 {
 	if (event_spacing < event_spacing_max) {
-		uint8_t ptc;
+		uint32_t ptc;
+		uint8_t nse;
 
-		/* Possible maximum Pre-transmission Subevents per BIS */
+		/* Possible maximum Pre-transmission Subevents per BIS.
+		 * sub_interval is at least T_MSS_150 + MPT (hence a value in 8 bits or more), i.e.
+		 * the below division and the subsequent multiplication with lll->bn does not
+		 * overflow.
+		 */
 		ptc = ((event_spacing_max - event_spacing) /
 		       (lll->sub_interval * lll->bn * lll->num_bis)) *
 		      lll->bn;
 
-		/* Restrict PTC to number of available subevents */
-		ptc = MIN(ptc, lll->nse - lll->bn * lll->irc);
+		/* Required NSE */
+		nse = lll->bn * lll->irc; /* 3 bits * 4 bits, total 7 bits */
+
+		/* Requested NSE is greater than Required NSE, Pre-Transmission offset has been
+		 * provided.
+		 *
+		 * NOTE: This is the case under HCI test command use to create BIG, i.e. test_config
+		 *       variable is true.
+		 */
+		if (lll->nse > nse) {
+			/* Restrict PTC to number of available subevents */
+			ptc = MIN(ptc, lll->nse - nse);
+		} else {
+			/* No PTO requested, Zephyr Controller implementation here will try using
+			 * Pre-Transmisson offset of BT_CTLR_ADV_ISO_PTO_MIN, i.e. restrict to a
+			 * maximum of BN Pre-Transmission subevents per BIS. This allows for a
+			 * better time diversity ensuring skipped or missing reception at the ISO
+			 * Sync Receiver so it can still have another chance at receiving the ISO
+			 * PDUs within the permitted maximum transport latency.
+			 *
+			 * Usecases where BAP Broadcast Audio Assistant role device has a drifting
+			 * ACL Peripheral role active in the BAP Broadcast Audio Sink device.
+			 */
+			ptc = MIN(ptc, (lll->bn * BT_CTLR_ADV_ISO_PTO_GROUP_COUNT));
+		}
 
 		return ptc;
 	}
diff --git a/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c b/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c
index a249dc1b2df..94933a0178c 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c
@@ -483,13 +483,20 @@ void ull_sync_iso_setup(struct ll_sync_iso_set *sync_iso,
 	lll->sub_interval = PDU_BIG_INFO_SUB_INTERVAL_GET(bi);
 	lll->max_pdu = bi->max_pdu;
 	lll->pto = PDU_BIG_INFO_PTO_GET(bi);
+	lll->bis_spacing = PDU_BIG_INFO_SPACING_GET(bi);
+	lll->irc = PDU_BIG_INFO_IRC_GET(bi);
 	if (lll->pto) {
-		lll->ptc = lll->bn;
+		uint8_t nse;
+
+		nse = lll->irc * lll->bn; /* 4 bits * 3 bits, total 7 bits */
+		if (nse >= lll->nse) {
+			return;
+		}
+
+		lll->ptc = lll->nse - nse;
 	} else {
 		lll->ptc = 0U;
 	}
-	lll->bis_spacing = PDU_BIG_INFO_SPACING_GET(bi);
-	lll->irc = PDU_BIG_INFO_IRC_GET(bi);
 	lll->sdu_interval = PDU_BIG_INFO_SDU_INTERVAL_GET(bi);
 
 	/* Pick the 39-bit payload count, 1 MSb is framing bit */

From 50f0302cec865d1b0246f934cc1ac8d74f289349 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Wed, 8 Jan 2025 21:30:10 +0100
Subject: [PATCH 2391/2913] [nrf fromtree] Bluetooth: controller: Fixup
 Broadcast ISO pre-transmission groups > 1

Fixup payload_index to be uint16_t to avoid index overflow.

Do not remember why ptc is 4 bits, where as it must be 5 bit
value similar to nse; added an assertion check until it is
fixed.

Fix ISO Broadcaster and ISO Sync Receiver for PTO > 1 and
use of Pre-Transmission Group Counts.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 363c1431dd57defe47f1033884069737b4a6c551)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../controller/ll_sw/nordic/lll/lll_adv_iso.c | 28 ++++++++-----
 .../ll_sw/nordic/lll/lll_sync_iso.c           | 39 ++++++++++++++++---
 .../bluetooth/controller/ll_sw/ull_adv_iso.c  |  8 +++-
 .../bluetooth/controller/ll_sw/ull_sync_iso.c |  7 ++++
 4 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c
index 40aeaa211db..91ca0b1d0c6 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c
@@ -625,26 +625,36 @@ static void isr_tx_common(void *param,
 
 	/* Get ISO data PDU, not control subevent */
 	if (!pdu) {
-		uint8_t payload_index;
+		uint16_t payload_index;
 
 		if (lll->ptc_curr) {
-			uint8_t ptx_idx = lll->ptc_curr - 1;
+			/* FIXME: Do not remember why ptc is 4 bits, it should be 5 bits as ptc is a
+			 *        running buffer offset related to nse.
+			 *        Fix ptc and ptc_curr definitions, until then there is an assertion
+			 *        check when ptc is calculated in ptc_calc function.
+			 */
+			uint8_t ptx_idx = lll->ptc_curr - 1U; /* max. nse 5 bits */
 			uint8_t ptx_payload_idx;
-			uint32_t ptx_group_mult;
+			uint16_t ptx_group_mult;
 			uint8_t ptx_group_idx;
 
 			/* Calculate group index and multiplier for deriving
 			 * pre-transmission payload index.
 			 */
-			ptx_group_idx = ptx_idx / lll->bn;
-			ptx_payload_idx = ptx_idx - ptx_group_idx * lll->bn;
-			ptx_group_mult = (ptx_group_idx + 1) * lll->pto;
-			payload_index = ptx_payload_idx + ptx_group_mult * lll->bn;
+			ptx_group_idx = ptx_idx / lll->bn; /* 5 bits */
+			ptx_payload_idx = ptx_idx - ptx_group_idx * lll->bn; /* 8 bits */
+			ptx_group_mult = (ptx_group_idx + 1U) * lll->pto; /* 9 bits */
+			payload_index = ptx_payload_idx + ptx_group_mult * lll->bn; /* 13 bits */
+
+			/* FIXME: memq_peek_n function does not support indices > UINT8_MAX,
+			 *        add assertion check to honor this limitation.
+			 */
+			LL_ASSERT(payload_index <= UINT8_MAX);
 		} else {
-			payload_index  = lll->bn_curr - 1U;
+			payload_index  = lll->bn_curr - 1U; /* 3 bits */
 		}
 
-		payload_count = lll->payload_count - lll->bn + payload_index;
+		payload_count = lll->payload_count + payload_index - lll->bn;
 
 #if !TEST_WITH_DUMMY_PDU
 		struct lll_adv_iso_stream *stream;
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c
index b3af4fd8404..c17370dcf0b 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c
@@ -52,6 +52,7 @@ static void isr_rx_estab(void *param);
 static void isr_rx(void *param);
 static void isr_rx_done(void *param);
 static void isr_done(void *param);
+static uint16_t payload_index_get(const struct lll_sync_iso *lll);
 static void next_chan_calc(struct lll_sync_iso *lll, uint16_t event_counter,
 			   uint16_t data_chan_id);
 static void isr_rx_iso_data_valid(const struct lll_sync_iso *const lll,
@@ -659,8 +660,7 @@ static void isr_rx(void *param)
 		 * Ensure we are not having offset values over 255 in payload_count_max, used to
 		 * allocate the buffers.
 		 */
-		payload_offset = (lll->latency_event * lll->bn) +  (lll->bn_curr - 1U) +
-				 (lll->ptc_curr * lll->pto);
+		payload_offset = (lll->latency_event * lll->bn) + payload_index_get(lll);
 		if (payload_offset >= lll->payload_count_max) {
 			goto isr_rx_done;
 		}
@@ -1031,8 +1031,7 @@ static void isr_rx(void *param)
 		if (bis) {
 			struct node_rx_pdu *node_rx;
 
-			payload_count += (lll->bn_curr - 1U) +
-					 (lll->ptc_curr * lll->pto);
+			payload_count += payload_index_get(lll);
 
 			/* By design, there shall always be one free node rx
 			 * available for setting up radio for new PDU reception.
@@ -1336,6 +1335,35 @@ static void isr_done(void *param)
 	}
 }
 
+static uint16_t payload_index_get(const struct lll_sync_iso *lll)
+{
+	uint16_t payload_index;
+
+	if (lll->ptc_curr) {
+		/* FIXME: Do not remember why ptc is 4 bits, it should be 5 bits as ptc is a
+		 *        running buffer offset related to nse.
+		 *        Fix ptc and ptc_curr definitions, until then there is an assertion
+		 *        check when ptc is calculated in ptc_calc function.
+		 */
+		uint8_t ptx_idx = lll->ptc_curr - 1U; /* max. nse 5 bits */
+		uint8_t ptx_payload_idx;
+		uint16_t ptx_group_mult;
+		uint8_t ptx_group_idx;
+
+		/* Calculate group index and multiplier for deriving
+		 * pre-transmission payload index.
+		 */
+		ptx_group_idx = ptx_idx / lll->bn; /* 5 bits */
+		ptx_payload_idx = ptx_idx - ptx_group_idx * lll->bn; /* 8 bits */
+		ptx_group_mult = (ptx_group_idx + 1U) * lll->pto; /* 9 bits */
+		payload_index = ptx_payload_idx + ptx_group_mult * lll->bn; /* 13 bits */
+	} else {
+		payload_index  = lll->bn_curr - 1U; /* 3 bits */
+	}
+
+	return payload_index;
+}
+
 static void next_chan_calc(struct lll_sync_iso *lll, uint16_t event_counter,
 			   uint16_t data_chan_id)
 {
@@ -1377,8 +1405,7 @@ static void isr_rx_iso_data_valid(const struct lll_sync_iso *const lll,
 	node_rx->hdr.handle = handle;
 
 	iso_meta = &node_rx->rx_iso_meta;
-	iso_meta->payload_number = lll->payload_count + (lll->bn_curr - 1U) +
-				   (lll->ptc_curr * lll->pto);
+	iso_meta->payload_number = lll->payload_count + payload_index_get(lll);
 	/* Decrement BN as payload_count was pre-incremented */
 	iso_meta->payload_number -= lll->bn;
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c b/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c
index d1428c422b6..d041f1e2a30 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c
@@ -212,7 +212,7 @@ static uint8_t big_create(uint8_t big_handle, uint8_t adv_handle, uint8_t num_bi
 				return BT_HCI_ERR_INVALID_PARAM;
 			}
 
-			if (!IN_RANGE(pto, 0x00, 0x0F)) {
+			if (pto > 0x0F) {
 				return BT_HCI_ERR_INVALID_PARAM;
 			}
 
@@ -1211,6 +1211,12 @@ static uint8_t ptc_calc(const struct lll_adv_iso *lll, uint32_t event_spacing,
 			ptc = MIN(ptc, (lll->bn * BT_CTLR_ADV_ISO_PTO_GROUP_COUNT));
 		}
 
+		/* FIXME: Do not remember why ptc is 4 bits, it should be 5 bits as ptc is a
+		 *        running buffer offset related to nse. Fix ptc and ptc_curr definitions,
+		 *        until then lets have an assert check here.
+		 */
+		LL_ASSERT(ptc <= BIT_MASK(4));
+
 		return ptc;
 	}
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c b/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c
index 94933a0178c..f9aa64863cf 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c
@@ -494,6 +494,13 @@ void ull_sync_iso_setup(struct ll_sync_iso_set *sync_iso,
 		}
 
 		lll->ptc = lll->nse - nse;
+
+		/* FIXME: Do not remember why ptc is 4 bits, it should be 5 bits as ptc is a
+		 *        running buffer offset related to nse.
+		 *        Fix ptc and ptc_curr definitions, until then we keep an assertion check
+		 *        here.
+		 */
+		LL_ASSERT(lll->ptc <= BIT_MASK(4));
 	} else {
 		lll->ptc = 0U;
 	}

From d1dd497535c3aec928e7c53aba4c5568aacb4b4e Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Wed, 25 Dec 2024 16:48:55 +0100
Subject: [PATCH 2392/2913] [nrf fromtree] Bluetooth: Controller: Fix
 radio_tmr_start_us for single timer use

This commit addresses two bugs in use of single timer s/w
switch implementation, incorrect aux_offset in subsequent
ADV_EXT_IND and ISO receiver failing to receive second or
greater BIS subevents.

Fix radio_tmr_start_now implementation to consider the
initial latency in starting the event timer in single timer
use mode. This fixes the incorrect aux_offset in ADV_EXT_IND
PDUs.

Fix radio_tmr_start_us implementation for single timer use,
as the timer is reset on every radio end, and hence the
requested start_us has to be adjusted for the accumulated
last_end_pdu_us value. This fixes the BIS subevent
receptions.

Also, fix the maximum radio ISR latency value used in
radio_tmr_start_us to consider the maximum Rx chain delay
and maximum radio ramp up delays. 80 us + ~30 us + ~40 us
should be able to meet the 150 us tIFS duration.

Relates to commit bcd28e0a866b ("Bluetooth: Controller: Fix
sw switch single timer for spurious TXEN/RXEN").

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 37bf99eee743f74e0414b604ee3adadf5368f550)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../ll_sw/nordic/hal/nrf5/radio/radio.c       | 92 ++++++++++++++++---
 .../ll_sw/nordic/hal/nrf5/radio/radio.h       |  4 +-
 .../hal/nrf5/radio/radio_nrf5_resources.h     |  6 +-
 3 files changed, 85 insertions(+), 17 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
index d9ecba277aa..ecba6079886 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
@@ -611,8 +611,15 @@ uint32_t radio_is_address(void)
 }
 
 #if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
+static uint32_t last_pdu_end_latency_us;
 static uint32_t last_pdu_end_us;
 
+static void last_pdu_end_us_init(uint32_t latency_us)
+{
+	last_pdu_end_latency_us = latency_us;
+	last_pdu_end_us = 0U;
+}
+
 uint32_t radio_is_done(void)
 {
 	if (NRF_RADIO->NRF_RADIO_TRX_END_EVENT != 0) {
@@ -1388,7 +1395,11 @@ void radio_tmr_tifs_set(uint32_t tifs)
 
 uint32_t radio_tmr_start(uint8_t trx, uint32_t ticks_start, uint32_t remainder)
 {
+	uint32_t remainder_us;
+
+	/* Convert jitter to positive offset remainder in microseconds */
 	hal_ticker_remove_jitter(&ticks_start, &remainder);
+	remainder_us = remainder;
 
 #if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
 	/* When using single timer for software tIFS switching, ensure that
@@ -1401,18 +1412,18 @@ uint32_t radio_tmr_start(uint8_t trx, uint32_t ticks_start, uint32_t remainder)
 	uint32_t latency_ticks;
 	uint32_t latency_us;
 
-	latency_us = MAX(remainder, HAL_RADIO_ISR_LATENCY_MAX_US) - remainder;
+	latency_us = MAX(remainder_us, HAL_RADIO_ISR_LATENCY_MAX_US) - remainder_us;
 	latency_ticks = HAL_TICKER_US_TO_TICKS(latency_us);
 	ticks_start -= latency_ticks;
-	remainder += latency_us;
-#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+	remainder_us += latency_us;
+#endif /* CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 
 	nrf_timer_task_trigger(EVENT_TIMER, NRF_TIMER_TASK_CLEAR);
 	EVENT_TIMER->MODE = 0;
 	EVENT_TIMER->PRESCALER = HAL_EVENT_TIMER_PRESCALER_VALUE;
 	EVENT_TIMER->BITMODE = 2;	/* 24 - bit */
 
-	nrf_timer_cc_set(EVENT_TIMER, HAL_EVENT_TIMER_TRX_CC_OFFSET, remainder);
+	nrf_timer_cc_set(EVENT_TIMER, HAL_EVENT_TIMER_TRX_CC_OFFSET, remainder_us);
 
 #if defined(CONFIG_BT_CTLR_NRF_GRTC)
 	uint32_t cntr_l, cntr_h, cntr_h_overflow, stale;
@@ -1479,7 +1490,7 @@ uint32_t radio_tmr_start(uint8_t trx, uint32_t ticks_start, uint32_t remainder)
 
 #if !defined(CONFIG_BT_CTLR_TIFS_HW)
 #if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
-	last_pdu_end_us = 0U;
+	last_pdu_end_us_init(latency_us);
 
 #else /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 	nrf_timer_task_trigger(SW_SWITCH_TIMER, NRF_TIMER_TASK_CLEAR);
@@ -1506,7 +1517,7 @@ uint32_t radio_tmr_start(uint8_t trx, uint32_t ticks_start, uint32_t remainder)
 #endif /* CONFIG_BT_CTLR_PHY_CODED && CONFIG_HAS_HW_NRF_RADIO_BLE_CODED */
 #endif /* !CONFIG_BT_CTLR_TIFS_HW */
 
-	return remainder;
+	return remainder_us;
 }
 
 uint32_t radio_tmr_start_tick(uint8_t trx, uint32_t ticks_start)
@@ -1514,7 +1525,7 @@ uint32_t radio_tmr_start_tick(uint8_t trx, uint32_t ticks_start)
 	uint32_t remainder_us;
 
 	/* Setup compare event with min. 1 us offset */
-	remainder_us = 1;
+	remainder_us = 1U;
 
 #if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
 	/* When using single timer for software tIFS switching, ensure that
@@ -1531,7 +1542,7 @@ uint32_t radio_tmr_start_tick(uint8_t trx, uint32_t ticks_start)
 	latency_ticks = HAL_TICKER_US_TO_TICKS(latency_us);
 	ticks_start -= latency_ticks;
 	remainder_us += latency_us;
-#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+#endif /* CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 
 	nrf_timer_task_trigger(EVENT_TIMER, NRF_TIMER_TASK_STOP);
 	nrf_timer_task_trigger(EVENT_TIMER, NRF_TIMER_TASK_CLEAR);
@@ -1603,7 +1614,7 @@ uint32_t radio_tmr_start_tick(uint8_t trx, uint32_t ticks_start)
 
 #if !defined(CONFIG_BT_CTLR_TIFS_HW)
 #if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
-	last_pdu_end_us = 0U;
+	last_pdu_end_us_init(latency_us);
 #endif /* CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 #if defined(CONFIG_SOC_COMPATIBLE_NRF53X) || defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
 	/* NOTE: Timer clear DPPI configuration is needed only for nRF53
@@ -1630,7 +1641,10 @@ uint32_t radio_tmr_start_us(uint8_t trx, uint32_t start_us)
 
 #if !defined(CONFIG_BT_CTLR_TIFS_HW)
 #if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
-	last_pdu_end_us = 0U;
+	/* As timer is reset on every radio end, remove the accumulated
+	 * last_pdu_end_us in the given start_us.
+	 */
+	start_us -= last_pdu_end_us;
 #endif /* CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 #if defined(CONFIG_SOC_COMPATIBLE_NRF53X) || defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
 	/* NOTE: Timer clear DPPI configuration is needed only for nRF53
@@ -1672,7 +1686,7 @@ uint32_t radio_tmr_start_us(uint8_t trx, uint32_t start_us)
 
 		latency_us = MAX(actual_us, HAL_RADIO_ISR_LATENCY_MAX_US) - actual_us;
 		actual_us += latency_us;
-#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+#endif /* CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 
 		nrf_timer_event_clear(EVENT_TIMER, HAL_EVENT_TIMER_TRX_EVENT);
 		nrf_timer_cc_set(EVENT_TIMER, HAL_EVENT_TIMER_TRX_CC_OFFSET, actual_us);
@@ -1684,6 +1698,10 @@ uint32_t radio_tmr_start_us(uint8_t trx, uint32_t start_us)
 	} while ((now_us > start_us) &&
 		 (EVENT_TIMER->EVENTS_COMPARE[HAL_EVENT_TIMER_TRX_CC_OFFSET] == 0U));
 
+#if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
+	actual_us += last_pdu_end_us;
+#endif /* CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+
 	return actual_us;
 }
 
@@ -1697,9 +1715,26 @@ uint32_t radio_tmr_start_now(uint8_t trx)
 	nrf_timer_task_trigger(EVENT_TIMER, HAL_EVENT_TIMER_SAMPLE_TASK);
 	start_us = EVENT_TIMER->CC[HAL_EVENT_TIMER_SAMPLE_CC_OFFSET];
 
+#if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
+	/* As timer is reset on every radio end, add the accumulated
+	 * last_pdu_end_us to the captured current time.
+	 */
+	start_us += last_pdu_end_us;
+#endif /* CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+
 	/* Setup radio start at current time */
 	start_us = radio_tmr_start_us(trx, start_us);
 
+#if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
+	/* Remove the single timer start latency used to mitigate use of too
+	 * small compare register value. Thus, start_us returned be always
+	 * the value corresponding to the captured radio ready timestamp.
+	 * This is used in the calculation of aux_offset in subsequent
+	 * ADV_EXT_IND PDUs.
+	 */
+	start_us -= last_pdu_end_latency_us;
+#endif /* CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+
 	return start_us;
 }
 
@@ -1721,18 +1756,29 @@ uint32_t radio_tmr_start_get(void)
 	return start_ticks;
 }
 
+uint32_t radio_tmr_start_latency_get(void)
+{
+#if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
+	return last_pdu_end_latency_us;
+#else /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+	return 0U;
+#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+}
+
 void radio_tmr_stop(void)
 {
 	nrf_timer_task_trigger(EVENT_TIMER, NRF_TIMER_TASK_STOP);
 #if defined(TIMER_TASKS_SHUTDOWN_TASKS_SHUTDOWN_Msk)
 	nrf_timer_task_trigger(EVENT_TIMER, NRF_TIMER_TASK_SHUTDOWN);
-#endif
+#endif /* TIMER_TASKS_SHUTDOWN_TASKS_SHUTDOWN_Msk */
 
 #if !defined(CONFIG_BT_CTLR_TIFS_HW)
+#if !defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
 	nrf_timer_task_trigger(SW_SWITCH_TIMER, NRF_TIMER_TASK_STOP);
 #if defined(TIMER_TASKS_SHUTDOWN_TASKS_SHUTDOWN_Msk)
 	nrf_timer_task_trigger(SW_SWITCH_TIMER, NRF_TIMER_TASK_SHUTDOWN);
-#endif
+#endif /* TIMER_TASKS_SHUTDOWN_TASKS_SHUTDOWN_Msk */
+#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 #endif /* !CONFIG_BT_CTLR_TIFS_HW */
 
 #if defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
@@ -1740,9 +1786,9 @@ void radio_tmr_stop(void)
 #endif /* CONFIG_SOC_COMPATIBLE_NRF54LX */
 }
 
-void radio_tmr_hcto_configure(uint32_t hcto)
+void radio_tmr_hcto_configure(uint32_t hcto_us)
 {
-	nrf_timer_cc_set(EVENT_TIMER, HAL_EVENT_TIMER_HCTO_CC_OFFSET, hcto);
+	nrf_timer_cc_set(EVENT_TIMER, HAL_EVENT_TIMER_HCTO_CC_OFFSET, hcto_us);
 
 	hal_radio_recv_timeout_cancel_ppi_config();
 	hal_radio_disable_on_hcto_ppi_config();
@@ -1751,6 +1797,18 @@ void radio_tmr_hcto_configure(uint32_t hcto)
 		BIT(HAL_RADIO_DISABLE_ON_HCTO_PPI));
 }
 
+void radio_tmr_hcto_configure_abs(uint32_t hcto_from_start_us)
+{
+#if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
+	/* As timer is reset on every radio end, remove the accumulated
+	 * last_pdu_end_us in the given hcto_us.
+	 */
+	hcto_from_start_us -= last_pdu_end_us;
+#endif /* CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+
+	radio_tmr_hcto_configure(hcto_from_start_us);
+}
+
 void radio_tmr_aa_capture(void)
 {
 	hal_radio_ready_time_capture_ppi_config();
@@ -1825,7 +1883,11 @@ uint32_t radio_tmr_end_get(void)
 
 uint32_t radio_tmr_tifs_base_get(void)
 {
+#if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
+	return 0U;
+#else /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 	return radio_tmr_end_get();
+#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 }
 
 #if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.h
index bc5d1605302..ae334df9af5 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.h
@@ -146,8 +146,10 @@ uint32_t radio_tmr_start_tick(uint8_t trx, uint32_t ticks_start);
 uint32_t radio_tmr_start_us(uint8_t trx, uint32_t us);
 uint32_t radio_tmr_start_now(uint8_t trx);
 uint32_t radio_tmr_start_get(void);
+uint32_t radio_tmr_start_latency_get(void);
 void radio_tmr_stop(void);
-void radio_tmr_hcto_configure(uint32_t hcto);
+void radio_tmr_hcto_configure(uint32_t hcto_us);
+void radio_tmr_hcto_configure_abs(uint32_t hcto_from_start_us);
 void radio_tmr_aa_capture(void);
 uint32_t radio_tmr_aa_get(void);
 void radio_tmr_aa_save(uint32_t aa);
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h
index 618e1535839..01a080f1c84 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h
@@ -50,8 +50,12 @@
 /* Radio ISR Latency to be considered with single timer used so that the PPI/
  * DPPI is disabled in time when the timer is cleared on radio end, so that
  * the timer compare should not trigger TXEN/RXEN immediately on radio end.
+ * This value will be used as minimum turnaround time in setting up Rx to Tx
+ * using radio_tmr_start_us under single timer use.
+ * The value of 80 us is used considering 150 us TIFS minus the maximum rx
+ * chain delay ~30 us, and minus the radio ramp up delay ~40 us.
  */
-#define HAL_RADIO_ISR_LATENCY_MAX_US 150U
+#define HAL_RADIO_ISR_LATENCY_MAX_US 80U
 
 #if defined(CONFIG_BT_CTLR_PHY_CODED)
 #define SW_SWITCH_TIMER_EVTS_COMP_BASE 3

From d28c320bf16628b8f7c9e78d09f84457383352e1 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Wed, 1 Jan 2025 06:54:11 +0100
Subject: [PATCH 2393/2913] [nrf fromtree] Bluetooth: Controller: Fix single
 timer s/w switch when using DPPI

Fix single timer s/w switch when using DPPI on nRF53/54L
where the previous compare register index is incorrect when
the base index is a odd numbered DPPI used.

The issue is discovered as failing ISO Receiver sample with
Coded PHY and single timer use, where the compare base is
configured to use the DPPI 3 (instead of 4).

Upstream samples do not use single timer for s/w switch, the
issue is discovered when adding support for nRF54L which has
to use single timer due to the radio only having a single
timer.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 3bc24622d35e47f84d6986096b4ed910a5e37b53)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
index 1ddf9af1ccf..e0447e600b7 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
@@ -432,7 +432,7 @@ static inline void hal_radio_b2b_txen_on_sw_switch(uint8_t compare_reg_index,
 	HAL_SW_SWITCH_RADIO_ENABLE_PPI_REGISTER_EVT(compare_reg_index) =
 		HAL_SW_SWITCH_RADIO_ENABLE_PPI_EVT(radio_enable_ppi);
 
-	uint8_t prev_ppi_idx = (compare_reg_index + 0x01) & 0x01;
+	uint8_t prev_ppi_idx = (compare_reg_index + 0x01 - SW_SWITCH_TIMER_EVTS_COMP_BASE) & 0x01;
 
 	radio_enable_ppi = HAL_SW_SWITCH_RADIO_ENABLE_PPI(prev_ppi_idx);
 	nrf_radio_subscribe_set(NRF_RADIO, NRF_RADIO_TASK_TXEN, radio_enable_ppi);
@@ -464,7 +464,7 @@ static inline void hal_radio_b2b_rxen_on_sw_switch(uint8_t compare_reg_index,
 	HAL_SW_SWITCH_RADIO_ENABLE_PPI_REGISTER_EVT(compare_reg_index) =
 		HAL_SW_SWITCH_RADIO_ENABLE_PPI_EVT(radio_enable_ppi);
 
-	uint8_t prev_ppi_idx = (compare_reg_index + 0x01) & 0x01;
+	uint8_t prev_ppi_idx = (compare_reg_index + 0x01 - SW_SWITCH_TIMER_EVTS_COMP_BASE) & 0x01;
 
 	radio_enable_ppi = HAL_SW_SWITCH_RADIO_ENABLE_PPI(prev_ppi_idx);
 	nrf_radio_subscribe_set(NRF_RADIO, NRF_RADIO_TASK_RXEN, radio_enable_ppi);
@@ -492,7 +492,7 @@ static inline void hal_radio_sw_switch_b2b_tx_disable(uint8_t compare_reg_index)
 {
 	hal_radio_sw_switch_disable();
 
-	uint8_t prev_ppi_idx = (compare_reg_index + 0x01) & 0x01;
+	uint8_t prev_ppi_idx = (compare_reg_index + 0x01 - SW_SWITCH_TIMER_EVTS_COMP_BASE) & 0x01;
 	uint8_t radio_enable_ppi = HAL_SW_SWITCH_RADIO_ENABLE_PPI(prev_ppi_idx);
 
 	nrf_radio_subscribe_set(NRF_RADIO, NRF_RADIO_TASK_TXEN, radio_enable_ppi);
@@ -502,7 +502,7 @@ static inline void hal_radio_sw_switch_b2b_rx_disable(uint8_t compare_reg_index)
 {
 	hal_radio_sw_switch_disable();
 
-	uint8_t prev_ppi_idx = (compare_reg_index + 0x01) & 0x01;
+	uint8_t prev_ppi_idx = (compare_reg_index + 0x01 - SW_SWITCH_TIMER_EVTS_COMP_BASE) & 0x01;
 	uint8_t radio_enable_ppi = HAL_SW_SWITCH_RADIO_ENABLE_PPI(prev_ppi_idx);
 
 	nrf_radio_subscribe_set(NRF_RADIO, NRF_RADIO_TASK_RXEN, radio_enable_ppi);

From 230c063c205e76643d55166d456003034639ea90 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Wed, 1 Jan 2025 15:21:58 +0100
Subject: [PATCH 2394/2913] [nrf fromtree] Bluetooth: Controller: Fix single
 timer s/w switch base indices

Fix single timer s/w switch base indices from overlapping
with sample index.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit dd95c22f506483ab420772f3784cac3b86cf8dd6)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h
index 01a080f1c84..bfeaacb6f84 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h
@@ -58,8 +58,8 @@
 #define HAL_RADIO_ISR_LATENCY_MAX_US 80U
 
 #if defined(CONFIG_BT_CTLR_PHY_CODED)
-#define SW_SWITCH_TIMER_EVTS_COMP_BASE 3
-#define SW_SWITCH_TIMER_EVTS_COMP_S2_BASE 5
+#define SW_SWITCH_TIMER_EVTS_COMP_BASE 4
+#define SW_SWITCH_TIMER_EVTS_COMP_S2_BASE 6
 
 /* Wrapper for EVENTS_END event generated by Radio peripheral at the very end of the transmission
  * or reception of a PDU on air. In case of regular PDU it is generated when last bit of CRC is
@@ -81,8 +81,8 @@
 #define HAL_EVENT_TIMER_DEFERRED_TRX_CC_OFFSET 2
 #define HAL_EVENT_TIMER_DEFERRED_TX_EVENT      NRF_TIMER_EVENT_COMPARE2
 
-#define HAL_EVENT_TIMER_SAMPLE_CC_OFFSET       2
-#define HAL_EVENT_TIMER_SAMPLE_TASK            NRF_TIMER_TASK_CAPTURE2
+#define HAL_EVENT_TIMER_SAMPLE_CC_OFFSET       3
+#define HAL_EVENT_TIMER_SAMPLE_TASK            NRF_TIMER_TASK_CAPTURE3
 
 #define HAL_EVENT_TIMER_PA_LNA_CC_OFFSET       2
 #define HAL_EVENT_TIMER_PA_LNA_PDN_CC_OFFSET   3

From 8aa151106e6701f4af5840580579c584996392b5 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Wed, 15 Jan 2025 10:40:27 +0100
Subject: [PATCH 2395/2913] [nrf fromtree] Bluetooth: Controller: Add
 radio_sim_nrf54l.h file

Add radio_sim_nrf54l.h file, which for now a copy of the
SoC radio_nrf54lx.h file. This is added for having separate
simulation model dependent timing values and specific
implementation details.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 7e51788dd7a1f0f91fc03f6f5f0aa8f915e2c550)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../ll_sw/nordic/hal/nrf5/radio/radio_nrf5.h  |  17 +-
 .../nordic/hal/nrf5/radio/radio_sim_nrf52.h   |   9 +-
 .../nordic/hal/nrf5/radio/radio_sim_nrf5340.h |   3 -
 .../nordic/hal/nrf5/radio/radio_sim_nrf54l.h  | 813 ++++++++++++++++++
 4 files changed, 824 insertions(+), 18 deletions(-)
 create mode 100644 subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf54l.h

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5.h
index 327888e4dfe..07c40bd566a 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5.h
@@ -20,11 +20,7 @@
 #define HAL_RADIO_NS2US_ROUND(ns) ((ns + 500)/1000)
 
 /* SoC specific defines */
-#if defined(CONFIG_BOARD_NRF52_BSIM)
-#include "radio_sim_nrf52.h"
-#elif defined(CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUNET)
-#include "radio_sim_nrf5340.h"
-#elif defined(CONFIG_SOC_SERIES_NRF51X)
+#if defined(CONFIG_SOC_SERIES_NRF51X)
 #include "radio_nrf51.h"
 #elif defined(CONFIG_SOC_NRF52805)
 #include "radio_nrf52805.h"
@@ -43,9 +39,16 @@
 #elif defined(CONFIG_SOC_NRF5340_CPUNET)
 #include <hal/nrf_vreqctrl.h>
 #include "radio_nrf5340.h"
-#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
+#elif defined(CONFIG_SOC_SERIES_NRF54LX)
 #include "radio_nrf54lx.h"
-#else /* !CONFIG_SOC_COMPATIBLE_NRF54LX */
+#elif defined(CONFIG_BOARD_NRF52_BSIM)
+#include "radio_sim_nrf52.h"
+#elif defined(CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUNET)
+#include <hal/nrf_vreqctrl.h>
+#include "radio_sim_nrf5340.h"
+#elif defined(CONFIG_BOARD_NRF54L15BSIM_NRF54L15_CPUAPP)
+#include "radio_sim_nrf54l.h"
+#else
 #error "Unsupported SoC."
 #endif
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf52.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf52.h
index 8e4838ef10e..62f0fc7a8d3 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf52.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf52.h
@@ -6,12 +6,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * This header needs lots of types and macros, instead of relaying on
- * good inclusion order let's pull them through soc.h
- */
-#include <soc.h>
-
 /* Use the NRF_RTC instance for coarse radio event scheduling */
 #define NRF_RTC NRF_RTC0
 
@@ -156,10 +150,9 @@
  */
 #define HAL_RADIO_NRF52833_RXEN_RXIDLE_RX_2M_DEFAULT_NO_HW_TIFS_NS 129000
 #define HAL_RADIO_NRF52833_RXEN_RXIDLE_RX_2M_DEFAULT_NO_HW_TIFS_US \
-	HAL_RADIO_NS2US_CEIL(\
+	HAL_RADIO_NS2US_CEIL( \
 		HAL_RADIO_NRF52833_RXEN_RXIDLE_RX_2M_DEFAULT_NO_HW_TIFS_NS)
 
-
 /* RXEN->RXIDLE + RXIDLE->RX (with fast Radio ramp-up mode)
  * in microseconds for LE Coded PHY [S2].
  */
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf5340.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf5340.h
index 6e115926c41..967db391b59 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf5340.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf5340.h
@@ -5,9 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <soc.h>
-#include <hal/nrf_vreqctrl.h>
-
 /* Use the NRF_RTC instance for coarse radio event scheduling */
 #define NRF_RTC NRF_RTC0
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf54l.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf54l.h
new file mode 100644
index 00000000000..bc0cc2993c5
--- /dev/null
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf54l.h
@@ -0,0 +1,813 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Use the NRF_RTC instance for coarse radio event scheduling */
+#if !defined(CONFIG_BT_CTLR_NRF_GRTC)
+#define NRF_RTC NRF_RTC10
+#endif /* !CONFIG_BT_CTLR_NRF_GRTC */
+
+#undef EVENT_TIMER_ID
+#define EVENT_TIMER_ID 10
+
+#undef EVENT_TIMER
+#define EVENT_TIMER _CONCAT(NRF_TIMER, EVENT_TIMER_ID)
+
+#if !defined(CONFIG_BT_CTLR_TIFS_HW)
+#undef SW_SWITCH_TIMER
+#if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
+#define SW_SWITCH_TIMER EVENT_TIMER
+#else  /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+/* TODO: Using NRF_TIMER from another domain needs DPPIC and PPIB setup */
+#error "SW tIFS switching using dedicated second timer not supported yet."
+#endif  /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+#endif /* !CONFIG_BT_CTLR_TIFS_HW */
+
+/* HAL abstraction of event timer prescaler value */
+#define HAL_EVENT_TIMER_PRESCALER_VALUE 5U
+
+/* NRF Radio HW timing constants
+ * - provided in US and NS (for higher granularity)
+ * - based on empirical measurements and sniffer logs
+ */
+
+/* TXEN->TXIDLE + TXIDLE->TX (with fast Radio ramp-up mode)
+ * in microseconds for LE 1M PHY.
+ */
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_FAST_NS 40900 /*40.1 + 0.8*/
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_FAST_US \
+	HAL_RADIO_NS2US_ROUND(HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_FAST_NS)
+
+/* TXEN->TXIDLE + TXIDLE->TX (with default Radio ramp-up mode)
+ * in microseconds for LE 1M PHY.
+ */
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_DEFAULT_NS 140900 /*140.1 + 0.8*/
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_DEFAULT_US \
+	HAL_RADIO_NS2US_ROUND(HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_DEFAULT_NS)
+
+/* TXEN->TXIDLE + TXIDLE->TX (with default Radio ramp-up mode
+ * and no HW TIFS auto-switch) in microseconds for LE 1M PHY.
+ */
+ /* 129.5 + 0.8 */
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_DEFAULT_NO_HW_TIFS_NS 130300
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_DEFAULT_NO_HW_TIFS_US \
+	HAL_RADIO_NS2US_ROUND( \
+		HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_DEFAULT_NO_HW_TIFS_NS)
+
+/* TXEN->TXIDLE + TXIDLE->TX (with fast Radio ramp-up mode)
+ * in microseconds for LE 2M PHY.
+ */
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_FAST_NS 40000 /* 40.1 - 0.1 */
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_FAST_US \
+	HAL_RADIO_NS2US_ROUND(HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_FAST_NS)
+
+/* TXEN->TXIDLE + TXIDLE->TX (with default Radio ramp-up mode)
+ * in microseconds for LE 2M PHY.
+ */
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_DEFAULT_NS 144900 /* 145 - 0.1 */
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_DEFAULT_US \
+	HAL_RADIO_NS2US_ROUND(HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_DEFAULT_NS)
+
+/* TXEN->TXIDLE + TXIDLE->TX (with default Radio ramp-up mode and
+ * no HW TIFS auto-switch) in microseconds for LE 2M PHY.
+ */
+/* 129.5 - 0.1 */
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_DEFAULT_NO_HW_TIFS_NS 129400
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_DEFAULT_NO_HW_TIFS_US \
+	HAL_RADIO_NS2US_ROUND( \
+		HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_DEFAULT_NO_HW_TIFS_NS)
+
+/* TXEN->TXIDLE + TXIDLE->TX (with fast Radio ramp-up mode)
+ * in microseconds for LE CODED PHY [S2].
+ */
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_FAST_NS 42300 /* 40.1 + 2.2 */
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_FAST_US \
+	HAL_RADIO_NS2US_ROUND(HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_FAST_NS)
+
+/* TXEN->TXIDLE + TXIDLE->TX (with default Radio ramp-up mode)
+ * in microseconds for LE 2M PHY [S2].
+ */
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_DEFAULT_NS 132200 /* 130 + 2.2 */
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_DEFAULT_US \
+	HAL_RADIO_NS2US_ROUND(HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_DEFAULT_NS)
+
+/* TXEN->TXIDLE + TXIDLE->TX (with default Radio ramp-up mode and
+ * no HW TIFS auto-switch) in microseconds for LE 2M PHY [S2].
+ */
+/* 129.5 + 2.2 */
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_DEFAULT_NO_HW_TIFS_NS 131700
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_DEFAULT_NO_HW_TIFS_US \
+	HAL_RADIO_NS2US_ROUND( \
+		HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_DEFAULT_NO_HW_TIFS_NS)
+
+/* TXEN->TXIDLE + TXIDLE->TX (with fast Radio ramp-up mode)
+ * in microseconds for LE CODED PHY [S8].
+ */
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_FAST_NS 42300 /* 40.1 + 2.2 */
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_FAST_US \
+	HAL_RADIO_NS2US_ROUND(HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_FAST_NS)
+/* TXEN->TXIDLE + TXIDLE->TX (with default Radio ramp-up mode)
+ * in microseconds for LE 2M PHY [S8].
+ */
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_DEFAULT_NS 121800 /*119.6 + 2.2*/
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_DEFAULT_US \
+	HAL_RADIO_NS2US_ROUND(HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_DEFAULT_NS)
+
+/* TXEN->TXIDLE + TXIDLE->TX (with default Radio ramp-up mode and
+ * no HW TIFS auto-switch) in microseconds for LE 2M PHY [S8].
+ */
+ /* 129.5 + 2.2 */
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_DEFAULT_NO_HW_TIFS_NS 131700
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_DEFAULT_NO_HW_TIFS_US \
+	HAL_RADIO_NS2US_ROUND( \
+		HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_DEFAULT_NO_HW_TIFS_NS)
+
+/* RXEN->RXIDLE + RXIDLE->RX (with fast Radio ramp-up mode)
+ * in microseconds for LE 1M PHY.
+ */
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_FAST_NS 40300 /* 40.1 + 0.2 */
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_FAST_US \
+	HAL_RADIO_NS2US_CEIL(HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_FAST_NS)
+
+/* RXEN->RXIDLE + RXIDLE->RX (with default Radio ramp-up mode)
+ * in microseconds for LE 1M PHY.
+ */
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_DEFAULT_NS 140300 /*140.1 + 0.2*/
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_DEFAULT_US \
+	HAL_RADIO_NS2US_CEIL(HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_DEFAULT_NS)
+
+/* RXEN->RXIDLE + RXIDLE->RX (with default Radio ramp-up mode and
+ * no HW TIFS auto-switch) in microseconds for LE 1M PHY.
+ */
+/* 129.5 + 0.2 */
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_DEFAULT_NO_HW_TIFS_NS 129700
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_DEFAULT_NO_HW_TIFS_US \
+	HAL_RADIO_NS2US_CEIL( \
+		HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_DEFAULT_NO_HW_TIFS_NS)
+
+/* RXEN->RXIDLE + RXIDLE->RX (with fast Radio ramp-up mode)
+ * in microseconds for LE 2M PHY.
+ */
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_FAST_NS 40300 /* 40.1 + 0.2 */
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_FAST_US \
+	HAL_RADIO_NS2US_CEIL(HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_FAST_NS)
+
+/* RXEN->RXIDLE + RXIDLE->RX (with default Radio ramp-up mode)
+ * in microseconds for LE 2M PHY.
+ */
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_DEFAULT_NS 144800 /*144.6 + 0.2*/
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_DEFAULT_US \
+	HAL_RADIO_NS2US_CEIL(HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_DEFAULT_NS)
+
+/* RXEN->RXIDLE + RXIDLE->RX (with default Radio ramp-up mode and
+ * no HW TIFS auto-switch) in microseconds for LE 2M PHY.
+ */
+/* 129.5 + 0.2 */
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_DEFAULT_NO_HW_TIFS_NS 129700
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_DEFAULT_NO_HW_TIFS_US \
+	HAL_RADIO_NS2US_CEIL( \
+		HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_DEFAULT_NO_HW_TIFS_NS)
+
+/* RXEN->RXIDLE + RXIDLE->RX (with fast Radio ramp-up mode)
+ * in microseconds for LE Coded PHY [S2].
+ */
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_FAST_NS 40300 /* 40.1 + 0.2 */
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_FAST_US \
+	HAL_RADIO_NS2US_CEIL(HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_FAST_NS)
+
+/* RXEN->RXIDLE + RXIDLE->RX (with default Radio ramp-up mode)
+ * in microseconds for LE Coded PHY [S2].
+ */
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_DEFAULT_NS 130200 /* 130 + 0.2 */
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_DEFAULT_US \
+	HAL_RADIO_NS2US_CEIL(HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_DEFAULT_NS)
+
+/* RXEN->RXIDLE + RXIDLE->RX (with default Radio ramp-up mode
+ * and no HW TIFS auto-switch) in microseconds for LE Coded PHY [S2].
+ */
+/* 129.5 + 0.2 */
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_DEFAULT_NO_HW_TIFS_NS 129700
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_DEFAULT_NO_HW_TIFS_US \
+	HAL_RADIO_NS2US_CEIL( \
+		HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_DEFAULT_NO_HW_TIFS_NS)
+
+/* RXEN->RXIDLE + RXIDLE->RX (with fast Radio ramp-up mode)
+ * in microseconds for LE Coded PHY [S8].
+ */
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_FAST_NS 40300 /* 40.1 + 0.2 */
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_FAST_US \
+	HAL_RADIO_NS2US_CEIL(HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_FAST_NS)
+
+/* RXEN->RXIDLE + RXIDLE->RX (with default Radio ramp-up mode)
+ * in microseconds for LE Coded PHY [S8].
+ */
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_DEFAULT_NS 120200 /* 120.0 + 0.2 */
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_DEFAULT_US \
+	HAL_RADIO_NS2US_CEIL(HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_DEFAULT_NS)
+
+/* RXEN->RXIDLE + RXIDLE->RX (with default Radio ramp-up mode and
+ * no HW TIFS auto-switch) in microseconds for LE Coded PHY [S8].
+ */
+/* 129.5 + 0.2 */
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_DEFAULT_NO_HW_TIFS_NS 129700
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_DEFAULT_NO_HW_TIFS_US \
+	HAL_RADIO_NS2US_CEIL( \
+		HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_DEFAULT_NO_HW_TIFS_NS)
+
+#define HAL_RADIO_NRF54LX_TX_CHAIN_DELAY_1M_US  1 /* ceil(0.6) */
+#define HAL_RADIO_NRF54LX_TX_CHAIN_DELAY_1M_NS  600 /* 0.6 */
+#define HAL_RADIO_NRF54LX_TX_CHAIN_DELAY_2M_US  1 /* ceil(0.6) */
+#define HAL_RADIO_NRF54LX_TX_CHAIN_DELAY_2M_NS  600 /* 0.6 */
+#define HAL_RADIO_NRF54LX_TX_CHAIN_DELAY_S2_US  1 /* ceil(0.6) */
+#define HAL_RADIO_NRF54LX_TX_CHAIN_DELAY_S2_NS  600 /* 0.6 */
+#define HAL_RADIO_NRF54LX_TX_CHAIN_DELAY_S8_US  1 /* ceil(0.6) */
+#define HAL_RADIO_NRF54LX_TX_CHAIN_DELAY_S8_NS  600 /* 0.6 */
+
+#define HAL_RADIO_NRF54LX_RX_CHAIN_DELAY_1M_US  10 /* ceil(9.4) */
+#define HAL_RADIO_NRF54LX_RX_CHAIN_DELAY_1M_NS  9400 /* 9.4 */
+#define HAL_RADIO_NRF54LX_RX_CHAIN_DELAY_2M_US  5 /* ceil(5.0) */
+#define HAL_RADIO_NRF54LX_RX_CHAIN_DELAY_2M_NS  5000 /* 5.0 */
+#define HAL_RADIO_NRF54LX_RX_CHAIN_DELAY_S2_US  25 /* ceil(19.6) */
+#define HAL_RADIO_NRF54LX_RX_CHAIN_DELAY_S2_NS  24600 /* 19.6 */
+#define HAL_RADIO_NRF54LX_RX_CHAIN_DELAY_S8_US  30 /* ceil(29.6) */
+#define HAL_RADIO_NRF54LX_RX_CHAIN_DELAY_S8_NS  29600 /* 29.6 */
+
+#if defined(CONFIG_BT_CTLR_RADIO_ENABLE_FAST)
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_US \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_FAST_US
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_NS \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_FAST_NS
+
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_US \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_FAST_US
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_NS \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_FAST_NS
+
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_US \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_FAST_US
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_NS \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_FAST_NS
+
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_US \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_FAST_US
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_NS \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_FAST_NS
+
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_US \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_FAST_US
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_NS \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_FAST_NS
+
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_US \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_FAST_US
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_NS \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_FAST_NS
+
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_US \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_FAST_US
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_NS \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_FAST_NS
+
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_US \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_FAST_US
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_NS \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_FAST_NS
+
+#else /* !CONFIG_BT_CTLR_RADIO_ENABLE_FAST */
+#if defined(CONFIG_BT_CTLR_TIFS_HW)
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_US \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_DEFAULT_US
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_NS \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_DEFAULT_NS
+
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_US \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_DEFAULT_US
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_NS \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_DEFAULT_NS
+
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_US \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_DEFAULT_US
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_NS \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_DEFAULT_NS
+
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_US \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_DEFAULT_US
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_NS \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_DEFAULT_NS
+
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_US \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_DEFAULT_US
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_NS \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_DEFAULT_NS
+
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_US \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_DEFAULT_US
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_NS \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_DEFAULT_NS
+
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_US \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_DEFAULT_US
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_NS \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_DEFAULT_NS
+
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_US \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_DEFAULT_US
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_NS \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_DEFAULT_NS
+
+#else /* !CONFIG_BT_CTLR_TIFS_HW */
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_US \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_DEFAULT_NO_HW_TIFS_US
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_NS \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_DEFAULT_NO_HW_TIFS_NS
+
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_US \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_DEFAULT_NO_HW_TIFS_US
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_NS \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_DEFAULT_NO_HW_TIFS_NS
+
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_US \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_DEFAULT_NO_HW_TIFS_US
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_NS \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_DEFAULT_NO_HW_TIFS_NS
+
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_US \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_DEFAULT_NO_HW_TIFS_US
+#define HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_NS \
+	HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_DEFAULT_NO_HW_TIFS_NS
+
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_US \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_DEFAULT_NO_HW_TIFS_US
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_NS \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_DEFAULT_NO_HW_TIFS_NS
+
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_US \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_DEFAULT_NO_HW_TIFS_US
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_NS \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_DEFAULT_NO_HW_TIFS_NS
+
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_US \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_DEFAULT_NO_HW_TIFS_US
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_NS \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_DEFAULT_NO_HW_TIFS_NS
+
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_US \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_DEFAULT_NO_HW_TIFS_US
+#define HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_NS \
+	HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_DEFAULT_NO_HW_TIFS_NS
+#endif /* !CONFIG_BT_CTLR_TIFS_HW */
+#endif /* !CONFIG_BT_CTLR_RADIO_ENABLE_FAST */
+
+/* HAL abstraction of Radio bitfields */
+#define HAL_RADIO_INTENSET_DISABLED_Msk           RADIO_INTENSET00_DISABLED_Msk
+#define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk      RADIO_SHORTS_PHYEND_DISABLE_Msk
+#define HAL_RADIO_SHORTS_TRX_PHYEND_DISABLE_Msk   RADIO_SHORTS_PHYEND_DISABLE_Msk
+#define HAL_RADIO_CLEARPATTERN_CLEARPATTERN_Clear (1UL)
+
+/* HAL abstraction of Radio IRQ number */
+#define HAL_RADIO_IRQn                          RADIO_0_IRQn
+
+/* SoC specific NRF_RADIO power-on reset value. Refer to Product Specification,
+ * RADIO Registers section for the documented reset values.
+ *
+ * NOTE: Only implementation used values defined here.
+ *       In the future if MDK or nRFx header include these, use them instead.
+ */
+#define HAL_RADIO_RESET_VALUE_DFEMODE       0x00000000UL
+#define HAL_RADIO_RESET_VALUE_CTEINLINECONF 0x00002800UL
+#define HAL_RADIO_RESET_VALUE_DATAWHITE     0x00890040UL
+
+static inline void hal_radio_reset(void)
+{
+	/* TODO: Add any required setup for each radio event
+	 */
+}
+
+static inline void hal_radio_stop(void)
+{
+	/* TODO: Add any required cleanup of actions taken in hal_radio_reset()
+	 */
+}
+
+static inline void hal_radio_ram_prio_setup(void)
+{
+	/* TODO */
+}
+
+static inline uint32_t hal_radio_phy_mode_get(uint8_t phy, uint8_t flags)
+{
+	uint32_t mode;
+
+	switch (phy) {
+	case BIT(0):
+	default:
+		mode = RADIO_MODE_MODE_Ble_1Mbit;
+		break;
+
+	case BIT(1):
+		mode = RADIO_MODE_MODE_Ble_2Mbit;
+		break;
+
+#if defined(CONFIG_BT_CTLR_PHY_CODED)
+	case BIT(2):
+		if (flags & 0x01) {
+			mode = RADIO_MODE_MODE_Ble_LR125Kbit;
+		} else {
+			mode = RADIO_MODE_MODE_Ble_LR500Kbit;
+		}
+		break;
+#endif /* CONFIG_BT_CTLR_PHY_CODED */
+	}
+
+	return mode;
+}
+
+static inline int8_t hal_radio_tx_power_max_get(void)
+{
+	return 8; /* +8 dBm */
+}
+
+static inline int8_t hal_radio_tx_power_min_get(void)
+{
+	return -46; /* -46 dBm */
+}
+
+static inline int8_t hal_radio_tx_power_floor(int8_t tx_power_lvl)
+{
+	if (tx_power_lvl >= 8) {
+		return 8;
+	}
+
+	if (tx_power_lvl >= 7) {
+		return 7;
+	}
+
+	if (tx_power_lvl >= 6) {
+		return 6;
+	}
+
+	if (tx_power_lvl >= 5) {
+		return 5;
+	}
+
+	if (tx_power_lvl >= 4) {
+		return 4;
+	}
+
+	if (tx_power_lvl >= 3) {
+		return 3;
+	}
+
+	if (tx_power_lvl >= 2) {
+		return 2;
+	}
+
+	if (tx_power_lvl >= 1) {
+		return 1;
+	}
+
+	if (tx_power_lvl >= 0) {
+		return 0;
+	}
+
+	if (tx_power_lvl >= -1) {
+		return -1;
+	}
+
+	if (tx_power_lvl >= -2) {
+		return -2;
+	}
+
+	if (tx_power_lvl >= -3) {
+		return -3;
+	}
+
+	if (tx_power_lvl >= -4) {
+		return -4;
+	}
+
+	if (tx_power_lvl >= -5) {
+		return -5;
+	}
+
+	if (tx_power_lvl >= -6) {
+		return -6;
+	}
+
+	if (tx_power_lvl >= -7) {
+		return -7;
+	}
+
+	if (tx_power_lvl >= -8) {
+		return -8;
+	}
+
+	if (tx_power_lvl >= -9) {
+		return -9;
+	}
+
+	if (tx_power_lvl >= -10) {
+		return -10;
+	}
+
+	if (tx_power_lvl >= -12) {
+		return -12;
+	}
+
+	if (tx_power_lvl >= -14) {
+		return -14;
+	}
+
+	if (tx_power_lvl >= -16) {
+		return -16;
+	}
+
+	if (tx_power_lvl >= -20) {
+		return -20;
+	}
+
+	if (tx_power_lvl >= -26) {
+		return -26;
+	}
+
+	if (tx_power_lvl >= -40) {
+		return -40;
+	}
+
+	return -46;
+}
+
+static inline uint32_t hal_radio_tx_power_value(int8_t tx_power_lvl)
+{
+	if (tx_power_lvl >= 8) {
+		return RADIO_TXPOWER_TXPOWER_Pos8dBm;
+	}
+
+	if (tx_power_lvl >= 7) {
+		return RADIO_TXPOWER_TXPOWER_Pos7dBm;
+	}
+
+	if (tx_power_lvl >= 6) {
+		return RADIO_TXPOWER_TXPOWER_Pos6dBm;
+	}
+
+	if (tx_power_lvl >= 5) {
+		return RADIO_TXPOWER_TXPOWER_Pos5dBm;
+	}
+
+	if (tx_power_lvl >= 4) {
+		return RADIO_TXPOWER_TXPOWER_Pos4dBm;
+	}
+
+	if (tx_power_lvl >= 3) {
+		return RADIO_TXPOWER_TXPOWER_Pos3dBm;
+	}
+
+	if (tx_power_lvl >= 2) {
+		return RADIO_TXPOWER_TXPOWER_Pos2dBm;
+	}
+
+	if (tx_power_lvl >= 1) {
+		return RADIO_TXPOWER_TXPOWER_Pos1dBm;
+	}
+
+	if (tx_power_lvl >= 0) {
+		return RADIO_TXPOWER_TXPOWER_0dBm;
+	}
+
+	if (tx_power_lvl >= -1) {
+		return RADIO_TXPOWER_TXPOWER_Neg1dBm;
+	}
+
+	if (tx_power_lvl >= -2) {
+		return RADIO_TXPOWER_TXPOWER_Neg2dBm;
+	}
+
+	if (tx_power_lvl >= -3) {
+		return RADIO_TXPOWER_TXPOWER_Neg3dBm;
+	}
+
+	if (tx_power_lvl >= -4) {
+		return RADIO_TXPOWER_TXPOWER_Neg4dBm;
+	}
+
+	if (tx_power_lvl >= -5) {
+		return RADIO_TXPOWER_TXPOWER_Neg5dBm;
+	}
+
+	if (tx_power_lvl >= -6) {
+		return RADIO_TXPOWER_TXPOWER_Neg6dBm;
+	}
+
+	if (tx_power_lvl >= -7) {
+		return RADIO_TXPOWER_TXPOWER_Neg7dBm;
+	}
+
+	if (tx_power_lvl >= -8) {
+		return RADIO_TXPOWER_TXPOWER_Neg8dBm;
+	}
+
+	if (tx_power_lvl >= -9) {
+		return RADIO_TXPOWER_TXPOWER_Neg9dBm;
+	}
+
+	if (tx_power_lvl >= -10) {
+		return RADIO_TXPOWER_TXPOWER_Neg10dBm;
+	}
+
+	if (tx_power_lvl >= -12) {
+		return RADIO_TXPOWER_TXPOWER_Neg12dBm;
+	}
+
+	if (tx_power_lvl >= -14) {
+		return RADIO_TXPOWER_TXPOWER_Neg14dBm;
+	}
+
+	if (tx_power_lvl >= -16) {
+		return RADIO_TXPOWER_TXPOWER_Neg16dBm;
+	}
+
+	if (tx_power_lvl >= -20) {
+		return RADIO_TXPOWER_TXPOWER_Neg20dBm;
+	}
+
+#if defined(RADIO_TXPOWER_TXPOWER_Neg26dBm)
+	if (tx_power_lvl >= -26) {
+		return RADIO_TXPOWER_TXPOWER_Neg26dBm;
+	}
+#endif
+
+#if defined(RADIO_TXPOWER_TXPOWER_Neg28dBm)
+	if (tx_power_lvl >= -28) {
+		return RADIO_TXPOWER_TXPOWER_Neg28dBm;
+	}
+#endif
+
+	if (tx_power_lvl >= -40) {
+		return RADIO_TXPOWER_TXPOWER_Neg40dBm;
+	}
+
+	return RADIO_TXPOWER_TXPOWER_Neg46dBm;
+}
+
+static inline uint32_t hal_radio_tx_ready_delay_us_get(uint8_t phy, uint8_t flags)
+{
+	switch (phy) {
+	default:
+	case BIT(0):
+		return HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_US;
+	case BIT(1):
+		return HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_US;
+
+#if defined(CONFIG_BT_CTLR_PHY_CODED)
+	case BIT(2):
+		if (flags & 0x01) {
+			return HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_US;
+		} else {
+			return HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_US;
+		}
+#endif /* CONFIG_BT_CTLR_PHY_CODED */
+	}
+}
+
+static inline uint32_t hal_radio_rx_ready_delay_us_get(uint8_t phy, uint8_t flags)
+{
+	switch (phy) {
+	default:
+	case BIT(0):
+		return HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_US;
+	case BIT(1):
+		return HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_US;
+
+#if defined(CONFIG_BT_CTLR_PHY_CODED)
+	case BIT(2):
+		if (flags & 0x01) {
+			return HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_US;
+		} else {
+			return HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_US;
+		}
+#endif /* CONFIG_BT_CTLR_PHY_CODED */
+	}
+}
+
+static inline uint32_t hal_radio_tx_chain_delay_us_get(uint8_t phy, uint8_t flags)
+{
+	switch (phy) {
+	default:
+	case BIT(0):
+		return HAL_RADIO_NRF54LX_TX_CHAIN_DELAY_1M_US;
+	case BIT(1):
+		return HAL_RADIO_NRF54LX_TX_CHAIN_DELAY_2M_US;
+
+#if defined(CONFIG_BT_CTLR_PHY_CODED)
+	case BIT(2):
+		if (flags & 0x01) {
+			return HAL_RADIO_NRF54LX_TX_CHAIN_DELAY_S8_US;
+		} else {
+			return HAL_RADIO_NRF54LX_TX_CHAIN_DELAY_S2_US;
+		}
+#endif /* CONFIG_BT_CTLR_PHY_CODED */
+	}
+}
+
+static inline uint32_t hal_radio_rx_chain_delay_us_get(uint8_t phy, uint8_t flags)
+{
+	switch (phy) {
+	default:
+	case BIT(0):
+		return HAL_RADIO_NRF54LX_RX_CHAIN_DELAY_1M_US;
+	case BIT(1):
+		return HAL_RADIO_NRF54LX_RX_CHAIN_DELAY_2M_US;
+
+#if defined(CONFIG_BT_CTLR_PHY_CODED)
+	case BIT(2):
+		if (flags & 0x01) {
+			return HAL_RADIO_NRF54LX_RX_CHAIN_DELAY_S8_US;
+		} else {
+			return HAL_RADIO_NRF54LX_RX_CHAIN_DELAY_S2_US;
+		}
+#endif /* CONFIG_BT_CTLR_PHY_CODED */
+	}
+}
+
+static inline uint32_t hal_radio_tx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
+{
+	switch (phy) {
+	default:
+	case BIT(0):
+		return HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_1M_NS;
+	case BIT(1):
+		return HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_2M_NS;
+
+#if defined(CONFIG_BT_CTLR_PHY_CODED)
+	case BIT(2):
+		if (flags & 0x01) {
+			return HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S8_NS;
+		} else {
+			return HAL_RADIO_NRF54LX_TXEN_TXIDLE_TX_S2_NS;
+		}
+#endif /* CONFIG_BT_CTLR_PHY_CODED */
+	}
+}
+
+static inline uint32_t hal_radio_rx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
+{
+	switch (phy) {
+	default:
+	case BIT(0):
+		return HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_1M_NS;
+	case BIT(1):
+		return HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_2M_NS;
+
+#if defined(CONFIG_BT_CTLR_PHY_CODED)
+	case BIT(2):
+		if (flags & 0x01) {
+			return HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S8_NS;
+		} else {
+			return HAL_RADIO_NRF54LX_RXEN_RXIDLE_RX_S2_NS;
+		}
+#endif /* CONFIG_BT_CTLR_PHY_CODED */
+	}
+}
+
+static inline uint32_t hal_radio_tx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
+{
+	switch (phy) {
+	default:
+	case BIT(0):
+		return HAL_RADIO_NRF54LX_TX_CHAIN_DELAY_1M_NS;
+	case BIT(1):
+		return HAL_RADIO_NRF54LX_TX_CHAIN_DELAY_2M_NS;
+
+#if defined(CONFIG_BT_CTLR_PHY_CODED)
+	case BIT(2):
+		if (flags & 0x01) {
+			return HAL_RADIO_NRF54LX_TX_CHAIN_DELAY_S8_NS;
+		} else {
+			return HAL_RADIO_NRF54LX_TX_CHAIN_DELAY_S2_NS;
+		}
+#endif /* CONFIG_BT_CTLR_PHY_CODED */
+	}
+}
+
+static inline uint32_t hal_radio_rx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
+{
+	switch (phy) {
+	default:
+	case BIT(0):
+		return HAL_RADIO_NRF54LX_RX_CHAIN_DELAY_1M_NS;
+	case BIT(1):
+		return HAL_RADIO_NRF54LX_RX_CHAIN_DELAY_2M_NS;
+
+#if defined(CONFIG_BT_CTLR_PHY_CODED)
+	case BIT(2):
+		if (flags & 0x01) {
+			return HAL_RADIO_NRF54LX_RX_CHAIN_DELAY_S8_NS;
+		} else {
+			return HAL_RADIO_NRF54LX_RX_CHAIN_DELAY_S2_NS;
+		}
+#endif /* CONFIG_BT_CTLR_PHY_CODED */
+	}
+}

From c778e3810f38655eb5afb90ea5301af559109d74 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Wed, 1 Jan 2025 15:21:58 +0100
Subject: [PATCH 2396/2913] [nrf fromtree] Bluetooth: Controller: Fix nRF5
 radio and event timer abstractions

Fix nRF5 radio and event timer abstractions for some that
where hard coded compared to use of the ones defined in the
resources header file.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 06b7503e33338bad4e22361b9caf008dbf3859f5)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../ll_sw/nordic/hal/nrf5/radio/radio.c       |  4 +-
 .../ll_sw/nordic/hal/nrf5/radio/radio_nrf51.h |  7 ++-
 .../nordic/hal/nrf5/radio/radio_nrf52805.h    |  7 ++-
 .../nordic/hal/nrf5/radio/radio_nrf52810.h    |  7 ++-
 .../nordic/hal/nrf5/radio/radio_nrf52811.h    |  4 ++
 .../nordic/hal/nrf5/radio/radio_nrf52820.h    |  4 ++
 .../nordic/hal/nrf5/radio/radio_nrf52832.h    |  7 ++-
 .../nordic/hal/nrf5/radio/radio_nrf52833.h    |  4 ++
 .../nordic/hal/nrf5/radio/radio_nrf52840.h    |  7 ++-
 .../nordic/hal/nrf5/radio/radio_nrf5340.h     |  6 ++
 .../nordic/hal/nrf5/radio/radio_nrf54lx.h     |  6 ++
 .../nordic/hal/nrf5/radio/radio_nrf5_dppi.h   | 56 +++++++++----------
 .../nrf5/radio/radio_nrf5_dppi_resources.h    | 16 +++---
 .../nordic/hal/nrf5/radio/radio_nrf5_ppi.h    | 18 +++---
 .../hal/nrf5/radio/radio_nrf5_resources.h     | 30 ++++++++--
 .../nordic/hal/nrf5/radio/radio_sim_nrf52.h   | 20 ++++++-
 .../nordic/hal/nrf5/radio/radio_sim_nrf5340.h | 13 ++++-
 .../nordic/hal/nrf5/radio/radio_sim_nrf54l.h  |  6 ++
 18 files changed, 149 insertions(+), 73 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
index ecba6079886..1e10c8e71a8 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
@@ -622,7 +622,7 @@ static void last_pdu_end_us_init(uint32_t latency_us)
 
 uint32_t radio_is_done(void)
 {
-	if (NRF_RADIO->NRF_RADIO_TRX_END_EVENT != 0) {
+	if (NRF_RADIO->HAL_RADIO_TRX_EVENTS_END != 0) {
 		/* On packet END event increment last packet end time value.
 		 * Note: this depends on the function being called exactly once
 		 * in the ISR function.
@@ -637,7 +637,7 @@ uint32_t radio_is_done(void)
 #else /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 uint32_t radio_is_done(void)
 {
-	return (NRF_RADIO->NRF_RADIO_TRX_END_EVENT != 0);
+	return (NRF_RADIO->HAL_RADIO_TRX_EVENTS_END != 0);
 }
 #endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf51.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf51.h
index 4ccb6f2e309..faad07f4cbc 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf51.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf51.h
@@ -24,9 +24,10 @@
 #define HAL_RADIO_NRF51_RX_CHAIN_DELAY_NS 3000 /* 3.0 */
 
 /* HAL abstraction of Radio bitfields */
-#define HAL_RADIO_INTENSET_DISABLED_Msk         RADIO_INTENSET_DISABLED_Msk
-#define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk    RADIO_SHORTS_END_DISABLE_Msk
-#define HAL_RADIO_SHORTS_TRX_PHYEND_DISABLE_Msk RADIO_SHORTS_PHYEND_DISABLE_Msk
+#define HAL_NRF_RADIO_EVENT_END              NRF_RADIO_EVENT_END
+#define HAL_RADIO_EVENTS_END                 EVENTS_END
+#define HAL_RADIO_INTENSET_DISABLED_Msk      RADIO_INTENSET_DISABLED_Msk
+#define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk RADIO_SHORTS_END_DISABLE_Msk
 
 /* HAL abstraction of Radio IRQ number */
 #define HAL_RADIO_IRQn                          RADIO_IRQn
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52805.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52805.h
index ad4e1377d39..ee96c07a5fc 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52805.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52805.h
@@ -186,9 +186,10 @@
 #endif /* !CONFIG_BT_CTLR_RADIO_ENABLE_FAST */
 
 /* HAL abstraction of Radio bitfields */
-#define HAL_RADIO_INTENSET_DISABLED_Msk         RADIO_INTENSET_DISABLED_Msk
-#define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk    RADIO_SHORTS_END_DISABLE_Msk
-#define HAL_RADIO_SHORTS_TRX_PHYEND_DISABLE_Msk RADIO_SHORTS_PHYEND_DISABLE_Msk
+#define HAL_NRF_RADIO_EVENT_END              NRF_RADIO_EVENT_END
+#define HAL_RADIO_EVENTS_END                 EVENTS_END
+#define HAL_RADIO_INTENSET_DISABLED_Msk      RADIO_INTENSET_DISABLED_Msk
+#define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk RADIO_SHORTS_END_DISABLE_Msk
 
 /* HAL abstraction of Radio IRQ number */
 #define HAL_RADIO_IRQn                          RADIO_IRQn
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52810.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52810.h
index b672f74cf9a..7b22249ec92 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52810.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52810.h
@@ -188,9 +188,10 @@
 #endif /* !CONFIG_BT_CTLR_RADIO_ENABLE_FAST */
 
 /* HAL abstraction of Radio bitfields */
-#define HAL_RADIO_INTENSET_DISABLED_Msk         RADIO_INTENSET_DISABLED_Msk
-#define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk    RADIO_SHORTS_END_DISABLE_Msk
-#define HAL_RADIO_SHORTS_TRX_PHYEND_DISABLE_Msk RADIO_SHORTS_PHYEND_DISABLE_Msk
+#define HAL_NRF_RADIO_EVENT_END              NRF_RADIO_EVENT_END
+#define HAL_RADIO_EVENTS_END                 EVENTS_END
+#define HAL_RADIO_INTENSET_DISABLED_Msk      RADIO_INTENSET_DISABLED_Msk
+#define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk RADIO_SHORTS_END_DISABLE_Msk
 
 /* HAL abstraction of Radio IRQ number */
 #define HAL_RADIO_IRQn                          RADIO_IRQn
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52811.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52811.h
index 9204ed3ac3e..5caa59470b6 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52811.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52811.h
@@ -343,6 +343,10 @@
 #endif /* !CONFIG_BT_CTLR_RADIO_ENABLE_FAST */
 
 /* HAL abstraction of Radio bitfields */
+#define HAL_NRF_RADIO_EVENT_END                   NRF_RADIO_EVENT_END
+#define HAL_RADIO_EVENTS_END                      EVENTS_END
+#define HAL_NRF_RADIO_EVENT_PHYEND                NRF_RADIO_EVENT_PHYEND
+#define HAL_RADIO_EVENTS_PHYEND                   EVENTS_PHYEND
 #define HAL_RADIO_INTENSET_DISABLED_Msk           RADIO_INTENSET_DISABLED_Msk
 #define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk      RADIO_SHORTS_END_DISABLE_Msk
 #define HAL_RADIO_SHORTS_TRX_PHYEND_DISABLE_Msk   RADIO_SHORTS_PHYEND_DISABLE_Msk
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52820.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52820.h
index c0be42698ad..ab15f62f685 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52820.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52820.h
@@ -343,6 +343,10 @@
 #endif /* !CONFIG_BT_CTLR_RADIO_ENABLE_FAST */
 
 /* HAL abstraction of Radio bitfields */
+#define HAL_NRF_RADIO_EVENT_END                   NRF_RADIO_EVENT_END
+#define HAL_RADIO_EVENTS_END                      EVENTS_END
+#define HAL_NRF_RADIO_EVENT_PHYEND                NRF_RADIO_EVENT_PHYEND
+#define HAL_RADIO_EVENTS_PHYEND                   EVENTS_PHYEND
 #define HAL_RADIO_INTENSET_DISABLED_Msk           RADIO_INTENSET_DISABLED_Msk
 #define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk      RADIO_SHORTS_END_DISABLE_Msk
 #define HAL_RADIO_SHORTS_TRX_PHYEND_DISABLE_Msk   RADIO_SHORTS_PHYEND_DISABLE_Msk
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52832.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52832.h
index 398c92b5064..10e942cca1e 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52832.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52832.h
@@ -189,9 +189,10 @@
 #endif /* !CONFIG_BT_CTLR_RADIO_ENABLE_FAST */
 
 /* HAL abstraction of Radio bitfields */
-#define HAL_RADIO_INTENSET_DISABLED_Msk         RADIO_INTENSET_DISABLED_Msk
-#define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk    RADIO_SHORTS_END_DISABLE_Msk
-#define HAL_RADIO_SHORTS_TRX_PHYEND_DISABLE_Msk RADIO_SHORTS_PHYEND_DISABLE_Msk
+#define HAL_NRF_RADIO_EVENT_END              NRF_RADIO_EVENT_END
+#define HAL_RADIO_EVENTS_END                 EVENTS_END
+#define HAL_RADIO_INTENSET_DISABLED_Msk      RADIO_INTENSET_DISABLED_Msk
+#define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk RADIO_SHORTS_END_DISABLE_Msk
 
 /* HAL abstraction of Radio IRQ number */
 #define HAL_RADIO_IRQn                          RADIO_IRQn
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52833.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52833.h
index 169f5c93714..e8c55fc8952 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52833.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52833.h
@@ -343,6 +343,10 @@
 #endif /* !CONFIG_BT_CTLR_RADIO_ENABLE_FAST */
 
 /* HAL abstraction of Radio bitfields */
+#define HAL_NRF_RADIO_EVENT_END                   NRF_RADIO_EVENT_END
+#define HAL_RADIO_EVENTS_END                      EVENTS_END
+#define HAL_NRF_RADIO_EVENT_PHYEND                NRF_RADIO_EVENT_PHYEND
+#define HAL_RADIO_EVENTS_PHYEND                   EVENTS_PHYEND
 #define HAL_RADIO_INTENSET_DISABLED_Msk           RADIO_INTENSET_DISABLED_Msk
 #define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk      RADIO_SHORTS_END_DISABLE_Msk
 #define HAL_RADIO_SHORTS_TRX_PHYEND_DISABLE_Msk   RADIO_SHORTS_PHYEND_DISABLE_Msk
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52840.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52840.h
index 07c9a7d6130..80ab0f9e241 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52840.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52840.h
@@ -346,9 +346,10 @@
 #endif /* !CONFIG_BT_CTLR_RADIO_ENABLE_FAST */
 
 /* HAL abstraction of Radio bitfields */
-#define HAL_RADIO_INTENSET_DISABLED_Msk         RADIO_INTENSET_DISABLED_Msk
-#define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk    RADIO_SHORTS_END_DISABLE_Msk
-#define HAL_RADIO_SHORTS_TRX_PHYEND_DISABLE_Msk RADIO_SHORTS_PHYEND_DISABLE_Msk
+#define HAL_NRF_RADIO_EVENT_END              NRF_RADIO_EVENT_END
+#define HAL_RADIO_EVENTS_END                 EVENTS_END
+#define HAL_RADIO_INTENSET_DISABLED_Msk      RADIO_INTENSET_DISABLED_Msk
+#define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk RADIO_SHORTS_END_DISABLE_Msk
 
 /* HAL abstraction of Radio IRQ number */
 #define HAL_RADIO_IRQn                          RADIO_IRQn
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5340.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5340.h
index f8b7635e7d1..a9638b62634 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5340.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5340.h
@@ -365,6 +365,12 @@
 #endif
 
 /* HAL abstraction of Radio bitfields */
+#define HAL_NRF_RADIO_EVENT_END                   NRF_RADIO_EVENT_END
+#define HAL_RADIO_EVENTS_END                      EVENTS_END
+#define HAL_RADIO_PUBLISH_END                     PUBLISH_END
+#define HAL_NRF_RADIO_EVENT_PHYEND                NRF_RADIO_EVENT_PHYEND
+#define HAL_RADIO_EVENTS_PHYEND                   EVENTS_PHYEND
+#define HAL_RADIO_PUBLISH_PHYEND                  PUBLISH_PHYEND
 #define HAL_RADIO_INTENSET_DISABLED_Msk           RADIO_INTENSET_DISABLED_Msk
 #define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk      RADIO_SHORTS_END_DISABLE_Msk
 #define HAL_RADIO_SHORTS_TRX_PHYEND_DISABLE_Msk   RADIO_SHORTS_PHYEND_DISABLE_Msk
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h
index bc0cc2993c5..7c73a603ea9 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h
@@ -361,6 +361,12 @@
 #endif /* !CONFIG_BT_CTLR_RADIO_ENABLE_FAST */
 
 /* HAL abstraction of Radio bitfields */
+#define HAL_NRF_RADIO_EVENT_END                   NRF_RADIO_EVENT_END
+#define HAL_RADIO_EVENTS_END                      EVENTS_END
+#define HAL_RADIO_PUBLISH_END                     PUBLISH_END
+#define HAL_NRF_RADIO_EVENT_PHYEND                NRF_RADIO_EVENT_PHYEND
+#define HAL_RADIO_EVENTS_PHYEND                   EVENTS_PHYEND
+#define HAL_RADIO_PUBLISH_PHYEND                  PUBLISH_PHYEND
 #define HAL_RADIO_INTENSET_DISABLED_Msk           RADIO_INTENSET00_DISABLED_Msk
 #define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk      RADIO_SHORTS_PHYEND_DISABLE_Msk
 #define HAL_RADIO_SHORTS_TRX_PHYEND_DISABLE_Msk   RADIO_SHORTS_PHYEND_DISABLE_Msk
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
index e0447e600b7..916fcafd878 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
@@ -26,7 +26,7 @@ static inline void hal_radio_nrf_ppi_channels_disable(uint32_t mask)
 static inline void hal_radio_enable_on_tick_ppi_config_and_enable(uint8_t trx)
 {
 	if (trx) {
-		nrf_timer_publish_set(EVENT_TIMER, NRF_TIMER_EVENT_COMPARE0,
+		nrf_timer_publish_set(EVENT_TIMER, HAL_EVENT_TIMER_TRX_EVENT,
 				      HAL_RADIO_ENABLE_TX_ON_TICK_PPI);
 		nrf_radio_subscribe_set(NRF_RADIO, NRF_RADIO_TASK_TXEN,
 					HAL_RADIO_ENABLE_TX_ON_TICK_PPI);
@@ -40,7 +40,7 @@ static inline void hal_radio_enable_on_tick_ppi_config_and_enable(uint8_t trx)
 		nrf_dppi_channels_enable(NRF_DPPIC,
 					 BIT(HAL_RADIO_ENABLE_TX_ON_TICK_PPI));
 	} else {
-		nrf_timer_publish_set(EVENT_TIMER, NRF_TIMER_EVENT_COMPARE0,
+		nrf_timer_publish_set(EVENT_TIMER, HAL_EVENT_TIMER_TRX_EVENT,
 				      HAL_RADIO_ENABLE_RX_ON_TICK_PPI);
 		nrf_radio_subscribe_set(NRF_RADIO, NRF_RADIO_TASK_RXEN,
 					HAL_RADIO_ENABLE_RX_ON_TICK_PPI);
@@ -63,10 +63,10 @@ static inline void hal_radio_enable_on_tick_ppi_config_and_enable(uint8_t trx)
  */
 static inline void hal_radio_recv_timeout_cancel_ppi_config(void)
 {
-	nrf_radio_publish_set(NRF_RADIO,
-			      NRF_RADIO_EVENT_ADDRESS, HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
-	nrf_timer_subscribe_set(EVENT_TIMER,
-				NRF_TIMER_TASK_CAPTURE1, HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
+	nrf_radio_publish_set(NRF_RADIO, NRF_RADIO_EVENT_ADDRESS,
+			      HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
+	nrf_timer_subscribe_set(EVENT_TIMER, HAL_EVENT_TIMER_ADDRESS_TASK,
+				HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
 }
 
 /*******************************************************************************
@@ -76,10 +76,10 @@ static inline void hal_radio_recv_timeout_cancel_ppi_config(void)
  */
 static inline void hal_radio_disable_on_hcto_ppi_config(void)
 {
-	nrf_timer_publish_set(EVENT_TIMER,
-			      NRF_TIMER_EVENT_COMPARE1, HAL_RADIO_DISABLE_ON_HCTO_PPI);
-	nrf_radio_subscribe_set(NRF_RADIO,
-				NRF_RADIO_TASK_DISABLE, HAL_RADIO_DISABLE_ON_HCTO_PPI);
+	nrf_timer_publish_set(EVENT_TIMER, HAL_EVENT_TIMER_HCTO_EVENT,
+			      HAL_RADIO_DISABLE_ON_HCTO_PPI);
+	nrf_radio_subscribe_set(NRF_RADIO, NRF_RADIO_TASK_DISABLE,
+				HAL_RADIO_DISABLE_ON_HCTO_PPI);
 }
 
 /*******************************************************************************
@@ -89,9 +89,9 @@ static inline void hal_radio_disable_on_hcto_ppi_config(void)
  */
 static inline void hal_radio_end_time_capture_ppi_config(void)
 {
-	nrf_radio_publish_set(NRF_RADIO, NRF_RADIO_EVENT_END, HAL_RADIO_END_TIME_CAPTURE_PPI);
-	nrf_timer_subscribe_set(EVENT_TIMER,
-				NRF_TIMER_TASK_CAPTURE2, HAL_RADIO_END_TIME_CAPTURE_PPI);
+	nrf_radio_publish_set(NRF_RADIO, HAL_NRF_RADIO_EVENT_END, HAL_RADIO_END_TIME_CAPTURE_PPI);
+	nrf_timer_subscribe_set(EVENT_TIMER, HAL_EVENT_TIMER_TRX_END_TASK,
+				HAL_RADIO_END_TIME_CAPTURE_PPI);
 }
 
 /*******************************************************************************
@@ -131,10 +131,10 @@ static inline void hal_event_timer_start_ppi_config(void)
  */
 static inline void hal_radio_ready_time_capture_ppi_config(void)
 {
-	nrf_radio_publish_set(NRF_RADIO,
-			      NRF_RADIO_EVENT_READY, HAL_RADIO_READY_TIME_CAPTURE_PPI);
-	nrf_timer_subscribe_set(EVENT_TIMER,
-				NRF_TIMER_TASK_CAPTURE0, HAL_RADIO_READY_TIME_CAPTURE_PPI);
+	nrf_radio_publish_set(NRF_RADIO, NRF_RADIO_EVENT_READY,
+			      HAL_RADIO_READY_TIME_CAPTURE_PPI);
+	nrf_timer_subscribe_set(EVENT_TIMER, HAL_EVENT_TIMER_READY_TASK,
+				HAL_RADIO_READY_TIME_CAPTURE_PPI);
 }
 
 #if defined(CONFIG_BT_CTLR_LE_ENC) || defined(CONFIG_BT_CTLR_BROADCAST_ISO_ENC)
@@ -215,16 +215,14 @@ static inline void hal_trigger_crypt_by_bcmatch_ppi_config(void)
 /******************************************************************************/
 #if !defined(CONFIG_BT_CTLR_TIFS_HW)
 
-#if !defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
-#define NRF_RADIO_PUBLISH_PDU_END_EVT PUBLISH_PHYEND
-/* Wrappenr for EVENTS_END event name used by nRFX API */
-#define NRFX_RADIO_TXRX_END_EVENT NRF_RADIO_EVENT_PHYEND
-#else /* CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
-#define NRF_RADIO_PUBLISH_PDU_END_EVT PUBLISH_END
-#define NRFX_RADIO_TXRX_END_EVENT NRF_RADIO_EVENT_END
-#endif /* CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
-
 /* DPPI setup used for SW-based auto-switching during TIFS. */
+#if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
+#define HAL_NRF_RADIO_TIFS_DPPI_EVENT_END HAL_NRF_RADIO_EVENT_END
+#define HAL_RADIO_TIFS_DPPI_PUBLISH_END   HAL_RADIO_PUBLISH_END
+#else /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+#define HAL_NRF_RADIO_TIFS_DPPI_EVENT_END HAL_NRF_RADIO_EVENT_PHYEND
+#define HAL_RADIO_TIFS_DPPI_PUBLISH_END   HAL_RADIO_PUBLISH_PHYEND
+#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 
 /* Clear SW-switch timer on packet end:
  * wire the RADIO EVENTS_END event to SW_SWITCH_TIMER TASKS_CLEAR task.
@@ -236,7 +234,8 @@ static inline void hal_trigger_crypt_by_bcmatch_ppi_config(void)
  */
 static inline void hal_sw_switch_timer_clear_ppi_config(void)
 {
-	nrf_radio_publish_set(NRF_RADIO, NRFX_RADIO_TXRX_END_EVENT, HAL_SW_SWITCH_TIMER_CLEAR_PPI);
+	nrf_radio_publish_set(NRF_RADIO, HAL_NRF_RADIO_TIFS_DPPI_EVENT_END,
+			      HAL_SW_SWITCH_TIMER_CLEAR_PPI);
 	nrf_timer_subscribe_set(SW_SWITCH_TIMER,
 				NRF_TIMER_TASK_CLEAR, HAL_SW_SWITCH_TIMER_CLEAR_PPI);
 
@@ -305,7 +304,8 @@ static inline void hal_sw_switch_timer_clear_ppi_config(void)
  * Note: we do not need an additional PPI, since we have already set up
  * a PPI to publish RADIO END event.
  */
-#define HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI_REGISTER_EVT (NRF_RADIO->NRF_RADIO_PUBLISH_PDU_END_EVT)
+#define HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI_REGISTER_EVT \
+	(NRF_RADIO->HAL_RADIO_TIFS_DPPI_PUBLISH_END)
 #define HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI_EVT \
 	(((HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI << \
 		RADIO_PUBLISH_END_CHIDX_Pos) \
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi_resources.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi_resources.h
index 8bb3fc1c9f0..ed57597a134 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi_resources.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi_resources.h
@@ -94,16 +94,16 @@
 /* Clear SW-switch timer on packet end:
  * wire the RADIO EVENTS_END event to SW_SWITCH_TIMER TASKS_CLEAR task.
  *
- * Note: In case of HW TIFS support or single timer configuration we do not need
- * an additional PPI, since we have already set up a PPI to publish RADIO END
- * event. In other case separate PPI is used because packet end is marked by
- * PHYEND event while last bit or CRC is marked by END event.
+ * Note: In case of single timer configuration we do not need an additional PPI,
+ * since we have already set up a PPI to publish RADIO END event. In other case
+ * separate PPI is used because packet end is marked by PHYEND event while last
+ * bit or CRC is marked by END event.
  */
-#if !defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
-#define HAL_SW_SWITCH_TIMER_CLEAR_PPI 24
-#else /* CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+#if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
 #define HAL_SW_SWITCH_TIMER_CLEAR_PPI HAL_RADIO_END_TIME_CAPTURE_PPI
-#endif /* CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+#else /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+#define HAL_SW_SWITCH_TIMER_CLEAR_PPI 24
+#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 
 /* Wire a SW SWITCH TIMER EVENTS_COMPARE[<cc_offset>] event
  * to a PPI GROUP TASK DISABLE task (PPI group with index <index>).
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h
index 8185036fbc3..5d18d76ff61 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h
@@ -63,7 +63,7 @@ static inline void hal_radio_enable_on_tick_ppi_config_and_enable(uint8_t trx)
 	if (trx) {
 		nrf_ppi_channel_endpoint_setup(NRF_PPI,
 			HAL_RADIO_ENABLE_TX_ON_TICK_PPI,
-			(uint32_t)&(EVENT_TIMER->EVENTS_COMPARE[0]),
+			(uint32_t)&(EVENT_TIMER->EVENTS_COMPARE[HAL_EVENT_TIMER_TRX_CC_OFFSET]),
 			(uint32_t)&(NRF_RADIO->TASKS_TXEN));
 
 #if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
@@ -80,7 +80,7 @@ static inline void hal_radio_enable_on_tick_ppi_config_and_enable(uint8_t trx)
 	} else {
 		nrf_ppi_channel_endpoint_setup(NRF_PPI,
 			HAL_RADIO_ENABLE_RX_ON_TICK_PPI,
-			(uint32_t)&(EVENT_TIMER->EVENTS_COMPARE[0]),
+			(uint32_t)&(EVENT_TIMER->EVENTS_COMPARE[HAL_EVENT_TIMER_TRX_CC_OFFSET]),
 			(uint32_t)&(NRF_RADIO->TASKS_RXEN));
 
 #if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
@@ -122,7 +122,7 @@ static inline void hal_radio_recv_timeout_cancel_ppi_config(void)
 		NRF_PPI,
 		HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI,
 		(uint32_t)&(NRF_RADIO->EVENTS_ADDRESS),
-		(uint32_t)&(EVENT_TIMER->TASKS_CAPTURE[1]));
+		(uint32_t)&(EVENT_TIMER->TASKS_CAPTURE[HAL_EVENT_TIMER_HCTO_CC_OFFSET]));
 }
 
 #endif /* (EVENT_TIMER_ID == 0) */
@@ -149,7 +149,7 @@ static inline void hal_radio_disable_on_hcto_ppi_config(void)
 	nrf_ppi_channel_endpoint_setup(
 		NRF_PPI,
 		HAL_RADIO_DISABLE_ON_HCTO_PPI,
-		(uint32_t)&(EVENT_TIMER->EVENTS_COMPARE[1]),
+		(uint32_t)&(EVENT_TIMER->EVENTS_COMPARE[HAL_EVENT_TIMER_HCTO_CC_OFFSET]),
 		(uint32_t)&(NRF_RADIO->TASKS_DISABLE));
 }
 
@@ -177,8 +177,8 @@ static inline void hal_radio_end_time_capture_ppi_config(void)
 	nrf_ppi_channel_endpoint_setup(
 		NRF_PPI,
 		HAL_RADIO_END_TIME_CAPTURE_PPI,
-		(uint32_t)&(NRF_RADIO->NRF_RADIO_TRX_END_EVENT),
-		(uint32_t)&(EVENT_TIMER->TASKS_CAPTURE[2]));
+		(uint32_t)&(NRF_RADIO->HAL_RADIO_TRX_EVENTS_END),
+		(uint32_t)&(EVENT_TIMER->TASKS_CAPTURE[HAL_EVENT_TIMER_TRX_END_CC_OFFSET]));
 }
 
 #endif /* (EVENT_TIMER_ID == 0) */
@@ -207,7 +207,7 @@ static inline void hal_radio_ready_time_capture_ppi_config(void)
 		NRF_PPI,
 		HAL_RADIO_READY_TIME_CAPTURE_PPI,
 		(uint32_t)&(NRF_RADIO->EVENTS_READY),
-		(uint32_t)&(EVENT_TIMER->TASKS_CAPTURE[0]));
+		(uint32_t)&(EVENT_TIMER->TASKS_CAPTURE[HAL_EVENT_TIMER_TRX_CC_OFFSET]));
 }
 
 /*******************************************************************************
@@ -303,7 +303,7 @@ static inline void hal_sw_switch_timer_clear_ppi_config(void)
 	nrf_ppi_channel_endpoint_setup(
 		NRF_PPI,
 		HAL_SW_SWITCH_TIMER_CLEAR_PPI,
-		(uint32_t)&(NRF_RADIO->NRF_RADIO_TRX_END_EVENT),
+		(uint32_t)&(NRF_RADIO->HAL_RADIO_TRX_EVENTS_END),
 		(uint32_t)&(SW_SWITCH_TIMER->TASKS_CLEAR));
 }
 
@@ -364,7 +364,7 @@ static inline void hal_sw_switch_timer_clear_ppi_config(void)
  * 'index' must be 0 or 1.
  */
 #define HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI_EVT \
-	((uint32_t)&(NRF_RADIO->NRF_RADIO_TRX_END_EVENT))
+	((uint32_t)&(NRF_RADIO->HAL_RADIO_TRX_EVENTS_END))
 #define HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI_TASK(index) \
 	((uint32_t)&(NRF_PPI->TASKS_CHG[SW_SWITCH_TIMER_TASK_GROUP(index)].EN))
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h
index bfeaacb6f84..41163909c67 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h
@@ -18,7 +18,7 @@
  * or reception of a PDU on air. In case of regular PDU it is generated when last bit of CRC is
  * received or transmitted.
  */
-#define NRF_RADIO_TRX_END_EVENT EVENTS_END
+#define HAL_RADIO_TRX_EVENTS_END HAL_RADIO_EVENTS_END
 
 /* Wrapper for RADIO_SHORTS mask connecting EVENTS_END to EVENTS_DISABLE.
  * This is a default shortcut used to automatically disable Radio after end of PDU.
@@ -27,9 +27,14 @@
 
 #define HAL_EVENT_TIMER_TRX_CC_OFFSET          0
 #define HAL_EVENT_TIMER_TRX_EVENT              NRF_TIMER_EVENT_COMPARE0
+#define HAL_EVENT_TIMER_READY_TASK             NRF_TIMER_TASK_CAPTURE0
 
 #define HAL_EVENT_TIMER_HCTO_CC_OFFSET         1
+#define HAL_EVENT_TIMER_HCTO_EVENT             NRF_TIMER_EVENT_COMPARE1
+#define HAL_EVENT_TIMER_ADDRESS_TASK           NRF_TIMER_TASK_CAPTURE1
+
 #define HAL_EVENT_TIMER_TRX_END_CC_OFFSET      2
+#define HAL_EVENT_TIMER_TRX_END_TASK           NRF_TIMER_TASK_CAPTURE2
 
 #define HAL_EVENT_TIMER_DEFERRED_TRX_CC_OFFSET 2
 #define HAL_EVENT_TIMER_DEFERRED_TX_EVENT      NRF_TIMER_EVENT_COMPARE2
@@ -65,7 +70,7 @@
  * or reception of a PDU on air. In case of regular PDU it is generated when last bit of CRC is
  * received or transmitted.
  */
-#define NRF_RADIO_TRX_END_EVENT EVENTS_END
+#define HAL_RADIO_TRX_EVENTS_END HAL_RADIO_EVENTS_END
 
 /* Wrapper for RADIO_SHORTS mask connecting EVENTS_END to EVENTS_DISABLE.
  * This is a default shortcut used to automatically disable Radio after end of PDU.
@@ -74,9 +79,14 @@
 
 #define HAL_EVENT_TIMER_TRX_CC_OFFSET          0
 #define HAL_EVENT_TIMER_TRX_EVENT              NRF_TIMER_EVENT_COMPARE0
+#define HAL_EVENT_TIMER_READY_TASK             NRF_TIMER_TASK_CAPTURE0
 
 #define HAL_EVENT_TIMER_HCTO_CC_OFFSET         1
+#define HAL_EVENT_TIMER_HCTO_EVENT             NRF_TIMER_EVENT_COMPARE1
+#define HAL_EVENT_TIMER_ADDRESS_TASK           NRF_TIMER_TASK_CAPTURE1
+
 #define HAL_EVENT_TIMER_TRX_END_CC_OFFSET      2
+#define HAL_EVENT_TIMER_TRX_END_TASK           NRF_TIMER_TASK_CAPTURE2
 
 #define HAL_EVENT_TIMER_DEFERRED_TRX_CC_OFFSET 2
 #define HAL_EVENT_TIMER_DEFERRED_TX_EVENT      NRF_TIMER_EVENT_COMPARE2
@@ -94,7 +104,7 @@
  * or reception of a PDU on air. In case of regular PDU it is generated when last bit of CRC is
  * received or transmitted.
  */
-#define NRF_RADIO_TRX_END_EVENT EVENTS_END
+#define HAL_RADIO_TRX_EVENTS_END HAL_RADIO_EVENTS_END
 
 /* Wrapper for RADIO_SHORTS mask connecting EVENTS_END to EVENTS_DISABLE.
  * This is a default shortcut used to automatically disable Radio after end of PDU.
@@ -103,9 +113,14 @@
 
 #define HAL_EVENT_TIMER_TRX_CC_OFFSET          0
 #define HAL_EVENT_TIMER_TRX_EVENT              NRF_TIMER_EVENT_COMPARE0
+#define HAL_EVENT_TIMER_READY_TASK             NRF_TIMER_TASK_CAPTURE0
 
 #define HAL_EVENT_TIMER_HCTO_CC_OFFSET         1
+#define HAL_EVENT_TIMER_HCTO_EVENT             NRF_TIMER_EVENT_COMPARE1
+#define HAL_EVENT_TIMER_ADDRESS_TASK           NRF_TIMER_TASK_CAPTURE1
+
 #define HAL_EVENT_TIMER_TRX_END_CC_OFFSET      2
+#define HAL_EVENT_TIMER_TRX_END_TASK           NRF_TIMER_TASK_CAPTURE2
 
 #define HAL_EVENT_TIMER_DEFERRED_TRX_CC_OFFSET 2
 #define HAL_EVENT_TIMER_DEFERRED_TX_EVENT      NRF_TIMER_EVENT_COMPARE2
@@ -153,7 +168,7 @@
  * including CTE EVENTS_PHYEND event is generated at very end of a PDU. In case there is no CTE in
  * a PDU the EVENTS_PHYEND event is generated in the same instant as EVENTS_END event.
  */
-#define NRF_RADIO_TRX_END_EVENT EVENTS_PHYEND
+#define HAL_RADIO_TRX_EVENTS_END HAL_RADIO_EVENTS_PHYEND
 
 /* Wrapper for RADIO_SHORTS mask connecting EVENTS_PHYEND to EVENTS_DISABLE.
  * This is a mask for SOC that has Direction Finding Extension in a Radio peripheral.
@@ -174,7 +189,7 @@
  * or reception of a PDU on air. In case of regular PDU it is generated when last bit of CRC is
  * received or transmitted.
  */
-#define NRF_RADIO_TRX_END_EVENT EVENTS_END
+#define HAL_RADIO_TRX_EVENTS_END HAL_RADIO_EVENTS_END
 
 /* Wrapper for RADIO_SHORTS mask connecting EVENTS_END to EVENTS_DISABLE.
  * This is a default shortcut used to automatically disable Radio after end of PDU.
@@ -184,9 +199,14 @@
 
 #define HAL_EVENT_TIMER_TRX_CC_OFFSET          0
 #define HAL_EVENT_TIMER_TRX_EVENT              NRF_TIMER_EVENT_COMPARE0
+#define HAL_EVENT_TIMER_READY_TASK             NRF_TIMER_TASK_CAPTURE0
 
 #define HAL_EVENT_TIMER_HCTO_CC_OFFSET         1
+#define HAL_EVENT_TIMER_HCTO_EVENT             NRF_TIMER_EVENT_COMPARE1
+#define HAL_EVENT_TIMER_ADDRESS_TASK           NRF_TIMER_TASK_CAPTURE1
+
 #define HAL_EVENT_TIMER_TRX_END_CC_OFFSET      2
+#define HAL_EVENT_TIMER_TRX_END_TASK           NRF_TIMER_TASK_CAPTURE2
 
 #define HAL_EVENT_TIMER_DEFERRED_TRX_CC_OFFSET 2
 #define HAL_EVENT_TIMER_DEFERRED_TX_EVENT      NRF_TIMER_EVENT_COMPARE2
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf52.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf52.h
index 62f0fc7a8d3..099f073f30c 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf52.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf52.h
@@ -345,13 +345,27 @@
 #endif /* !CONFIG_BT_CTLR_RADIO_ENABLE_FAST */
 
 /* HAL abstraction of Radio bitfields */
-#define HAL_RADIO_INTENSET_DISABLED_Msk         RADIO_INTENSET_DISABLED_Msk
-#define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk    RADIO_SHORTS_END_DISABLE_Msk
-#define HAL_RADIO_SHORTS_TRX_PHYEND_DISABLE_Msk RADIO_SHORTS_PHYEND_DISABLE_Msk
+#define HAL_NRF_RADIO_EVENT_END                   NRF_RADIO_EVENT_END
+#define HAL_RADIO_EVENTS_END                      EVENTS_END
+#define HAL_NRF_RADIO_EVENT_PHYEND                NRF_RADIO_EVENT_PHYEND
+#define HAL_RADIO_EVENTS_PHYEND                   EVENTS_PHYEND
+#define HAL_RADIO_INTENSET_DISABLED_Msk           RADIO_INTENSET_DISABLED_Msk
+#define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk      RADIO_SHORTS_END_DISABLE_Msk
+#define HAL_RADIO_SHORTS_TRX_PHYEND_DISABLE_Msk   RADIO_SHORTS_PHYEND_DISABLE_Msk
+#define HAL_RADIO_CLEARPATTERN_CLEARPATTERN_Clear RADIO_CLEARPATTERN_CLEARPATTERN_Clear
 
 /* HAL abstraction of Radio IRQ number */
 #define HAL_RADIO_IRQn                          RADIO_IRQn
 
+/* SoC specific NRF_RADIO power-on reset value. Refer to Product Specification,
+ * RADIO Registers section for the documented reset values.
+ *
+ * NOTE: Only implementation used values defined here.
+ *       In the future if MDK or nRFx header include these, use them instead.
+ */
+#define HAL_RADIO_RESET_VALUE_DFEMODE       0x00000000UL
+#define HAL_RADIO_RESET_VALUE_CTEINLINECONF 0x00002800UL
+
 static inline void hal_radio_reset(void)
 {
 }
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf5340.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf5340.h
index 967db391b59..ff31a6693cf 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf5340.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf5340.h
@@ -363,9 +363,16 @@
 #endif
 
 /* HAL abstraction of Radio bitfields */
-#define HAL_RADIO_INTENSET_DISABLED_Msk         RADIO_INTENSET_DISABLED_Msk
-#define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk    RADIO_SHORTS_END_DISABLE_Msk
-#define HAL_RADIO_SHORTS_TRX_PHYEND_DISABLE_Msk RADIO_SHORTS_PHYEND_DISABLE_Msk
+#define HAL_NRF_RADIO_EVENT_END                   NRF_RADIO_EVENT_END
+#define HAL_RADIO_EVENTS_END                      EVENTS_END
+#define HAL_RADIO_PUBLISH_END                     PUBLISH_END
+#define HAL_NRF_RADIO_EVENT_PHYEND                NRF_RADIO_EVENT_PHYEND
+#define HAL_RADIO_EVENTS_PHYEND                   EVENTS_PHYEND
+#define HAL_RADIO_PUBLISH_PHYEND                  PUBLISH_PHYEND
+#define HAL_RADIO_INTENSET_DISABLED_Msk           RADIO_INTENSET_DISABLED_Msk
+#define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk      RADIO_SHORTS_END_DISABLE_Msk
+#define HAL_RADIO_SHORTS_TRX_PHYEND_DISABLE_Msk   RADIO_SHORTS_PHYEND_DISABLE_Msk
+#define HAL_RADIO_CLEARPATTERN_CLEARPATTERN_Clear RADIO_CLEARPATTERN_CLEARPATTERN_Clear
 
 /* HAL abstraction of Radio IRQ number */
 #define HAL_RADIO_IRQn                          RADIO_IRQn
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf54l.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf54l.h
index bc0cc2993c5..7c73a603ea9 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf54l.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf54l.h
@@ -361,6 +361,12 @@
 #endif /* !CONFIG_BT_CTLR_RADIO_ENABLE_FAST */
 
 /* HAL abstraction of Radio bitfields */
+#define HAL_NRF_RADIO_EVENT_END                   NRF_RADIO_EVENT_END
+#define HAL_RADIO_EVENTS_END                      EVENTS_END
+#define HAL_RADIO_PUBLISH_END                     PUBLISH_END
+#define HAL_NRF_RADIO_EVENT_PHYEND                NRF_RADIO_EVENT_PHYEND
+#define HAL_RADIO_EVENTS_PHYEND                   EVENTS_PHYEND
+#define HAL_RADIO_PUBLISH_PHYEND                  PUBLISH_PHYEND
 #define HAL_RADIO_INTENSET_DISABLED_Msk           RADIO_INTENSET00_DISABLED_Msk
 #define HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk      RADIO_SHORTS_PHYEND_DISABLE_Msk
 #define HAL_RADIO_SHORTS_TRX_PHYEND_DISABLE_Msk   RADIO_SHORTS_PHYEND_DISABLE_Msk

From af1dea4ad6b5be31822a5326c59e0c3f15073bcd Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Fri, 3 Jan 2025 14:05:59 +0100
Subject: [PATCH 2397/2913] [nrf fromtree] Bluetooth: Controller: Restrict ISO
 Sync Receiver subevent jitter

Restrict the jitter considered in the PDU reception in the
subevents of ISO Sync Receiver.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit e4b6751bbc92098338712bfc85bcf6fa5d1b0b1e)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../ll_sw/nordic/lll/lll_sync_iso.c           | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c
index c17370dcf0b..607662dd393 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c
@@ -1092,6 +1092,9 @@ static void isr_rx(void *param)
 		/* Setup radio packet timer header complete timeout for
 		 * subsequent subevent PDU.
 		 */
+		uint32_t jitter_max_us;
+		uint32_t overhead_us;
+		uint32_t jitter_us;
 
 		/* Calculate the radio start with consideration of the drift
 		 * based on the access address capture timestamp.
@@ -1102,7 +1105,17 @@ static void isr_rx(void *param)
 		hcto -= radio_rx_chain_delay_get(lll->phy, PHY_FLAGS_S8);
 		hcto -= addr_us_get(lll->phy);
 		hcto -= radio_rx_ready_delay_get(lll->phy, PHY_FLAGS_S8);
-		hcto -= (EVENT_CLOCK_JITTER_US << 1) * nse;
+		overhead_us = radio_rx_chain_delay_get(lll->phy, PHY_FLAGS_S8);
+		overhead_us += addr_us_get(lll->phy);
+		overhead_us += radio_rx_ready_delay_get(lll->phy, PHY_FLAGS_S8);
+		overhead_us += (EVENT_CLOCK_JITTER_US << 1);
+		jitter_max_us = (EVENT_IFS_US - overhead_us) >> 1;
+		jitter_max_us -= RANGE_DELAY_US + HAL_RADIO_TMR_START_DELAY_US;
+		jitter_us = (EVENT_CLOCK_JITTER_US << 1) * nse;
+		if (jitter_us > jitter_max_us) {
+			jitter_us = jitter_max_us;
+		}
+		hcto -= jitter_us;
 
 		start_us = hcto;
 		hcto = radio_tmr_start_us(0U, start_us);
@@ -1112,8 +1125,8 @@ static void isr_rx(void *param)
 		 * 4 us early and subevents could have a 4 us drift each until
 		 * the current subevent we are listening.
 		 */
-		hcto += (((EVENT_CLOCK_JITTER_US << 1) * nse) << 1) +
-			RANGE_DELAY_US + HAL_RADIO_TMR_START_DELAY_US;
+		hcto += (jitter_us << 1);
+		hcto += RANGE_DELAY_US + HAL_RADIO_TMR_START_DELAY_US;
 	} else {
 		/* First subevent PDU was not received, hence setup radio packet
 		 * timer header complete timeout from where the first subevent

From cf84a748ded9f8e06cdf498d125bb793a4fb0e3b Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Thu, 2 Jan 2025 09:41:48 +0100
Subject: [PATCH 2398/2913] [nrf fromtree] Revert "Bluetooth: Controller: Fix
 ext conn create when using single timer"

This reverts commit a7fff7445cd34d8388c13fcee430635252bcb044.

The next commit will re-add back the fix to primary
advertising channel plus auxiliary advertising channel too.
This will help keep the fix together regarding use of
single timer for software tIFS switching implementation.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 28f93157fdb3afa99b8e3ccba4c55fb63318664a)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../controller/ll_sw/nordic/hal/nrf5/radio/radio.c       | 9 ---------
 .../controller/ll_sw/nordic/hal/nrf5/radio/radio.h       | 1 -
 .../bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c  | 5 -----
 3 files changed, 15 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
index 1e10c8e71a8..9595e685fd4 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
@@ -641,15 +641,6 @@ uint32_t radio_is_done(void)
 }
 #endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 
-uint32_t radio_is_tx_done(void)
-{
-	if (IS_ENABLED(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)) {
-		return radio_is_done();
-	} else {
-		return 1U;
-	}
-}
-
 uint32_t radio_has_disabled(void)
 {
 	return (NRF_RADIO->EVENTS_DISABLED != 0);
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.h
index ae334df9af5..b655d04e84c 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.h
@@ -86,7 +86,6 @@ void radio_status_reset(void);
 uint32_t radio_is_ready(void);
 uint32_t radio_is_address(void);
 uint32_t radio_is_done(void);
-uint32_t radio_is_tx_done(void);
 uint32_t radio_has_disabled(void);
 uint32_t radio_is_idle(void);
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c
index 731ca94ed50..1efbdf432b6 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c
@@ -581,11 +581,6 @@ static void isr_tx_rx(void *param)
 		node_rx_prof = lll_prof_reserve();
 	}
 
-	/* Call to ensure packet/event timer accumulates the elapsed time
-	 * under single timer use.
-	 */
-	(void)radio_is_tx_done();
-
 	/* Clear radio tx status and events */
 	lll_isr_tx_status_reset();
 

From a3a1f4ba19505d29125fb5369575009fff03ae63 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Sat, 6 Jul 2024 02:06:36 +0200
Subject: [PATCH 2399/2913] [nrf fromtree] Bluetooth: Controller: Single timer
 use Extended Advertising nRF54L support

Update Extended Advertising for single timer use support
required for nRF54L Series SoCs.

As the timer is reset on every radio end, add implementation
to accumulate the last_pdu_end_us.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 373dc0db71d1c8741c64e18776feff1633c094b7)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../controller/ll_sw/nordic/hal/nrf5/radio/radio.c       | 9 +++++++++
 .../controller/ll_sw/nordic/hal/nrf5/radio/radio.h       | 1 +
 subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c   | 5 +++++
 .../bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c  | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
index 9595e685fd4..1e10c8e71a8 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
@@ -641,6 +641,15 @@ uint32_t radio_is_done(void)
 }
 #endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 
+uint32_t radio_is_tx_done(void)
+{
+	if (IS_ENABLED(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)) {
+		return radio_is_done();
+	} else {
+		return 1U;
+	}
+}
+
 uint32_t radio_has_disabled(void)
 {
 	return (NRF_RADIO->EVENTS_DISABLED != 0);
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.h
index b655d04e84c..ae334df9af5 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.h
@@ -86,6 +86,7 @@ void radio_status_reset(void);
 uint32_t radio_is_ready(void);
 uint32_t radio_is_address(void);
 uint32_t radio_is_done(void);
+uint32_t radio_is_tx_done(void);
 uint32_t radio_has_disabled(void);
 uint32_t radio_is_idle(void);
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c
index a4b6d0dd3ad..8334f35ebf8 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c
@@ -1303,6 +1303,11 @@ static void isr_done(void *param)
 {
 	struct lll_adv *lll;
 
+	/* Call to ensure packet/event timer accumulates the elapsed time
+	 * under single timer use.
+	 */
+	(void)radio_is_tx_done();
+
 	/* Clear radio status and events */
 	lll_isr_status_reset();
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c
index 1efbdf432b6..731ca94ed50 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c
@@ -581,6 +581,11 @@ static void isr_tx_rx(void *param)
 		node_rx_prof = lll_prof_reserve();
 	}
 
+	/* Call to ensure packet/event timer accumulates the elapsed time
+	 * under single timer use.
+	 */
+	(void)radio_is_tx_done();
+
 	/* Clear radio tx status and events */
 	lll_isr_tx_status_reset();
 

From a77836f63e1ca1dbdfd58eb932a85199feff02aa Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Sun, 29 Dec 2024 15:49:04 +0100
Subject: [PATCH 2400/2913] [nrf fromtree] Bluetooth: Controller: Single timer
 use Extended Scanning nRF54L support

Update Extended Scanning for single timer use support
required for nRF54L Series SoCs.

As the timer is reset on every radio end, use the
radio_tmr_hcto_configure_abs() function to set the header
complete timeout correctly when using single timer for s/w
switching.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit c4a665106450aa35bf4c129615c8c5a320bcc668)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan_aux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan_aux.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan_aux.c
index 7bbd7abe6af..5d32d0e63cd 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan_aux.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan_aux.c
@@ -365,7 +365,7 @@ void lll_scan_aux_isr_aux_setup(void *param)
 	hcto += window_size_us;
 	hcto += radio_rx_chain_delay_get(phy_aux, PHY_FLAGS_S8);
 	hcto += addr_us_get(phy_aux);
-	radio_tmr_hcto_configure(hcto);
+	radio_tmr_hcto_configure_abs(hcto);
 
 	/* capture end of Rx-ed PDU, extended scan to schedule auxiliary
 	 * channel chaining, create connection or to create periodic sync.

From 01bec6549ff47b5317f1e6789924780143069c55 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Sun, 29 Dec 2024 15:49:04 +0100
Subject: [PATCH 2401/2913] [nrf fromtree] Bluetooth: Controller: Single timer
 use Conn Scheduling nRF54L support

Update advanced non-overlapping Central Connection Creation
scheduling for single timer use support required for nRF54L
Series SoCs.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 88a73dd937d515f9842ac18f3ab118805b0bb21b)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
index 37bc040b883..ba00888580b 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
@@ -287,7 +287,7 @@ void lll_scan_prepare_connect_req(struct lll_scan *lll, struct pdu_adv *pdu_tx,
 		*conn_space_us = conn_offset_us;
 		pdu_tx->connect_ind.win_offset = sys_cpu_to_le16(0);
 	} else {
-		uint32_t win_offset_us =
+		uint32_t win_offset_us = radio_tmr_start_latency_get() +
 			lll->conn_win_offset_us +
 			radio_rx_ready_delay_get(phy, PHY_FLAGS_S8);
 

From 84798749155192da870f35aea4780bf1a7a75491 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Sun, 29 Dec 2024 15:49:04 +0100
Subject: [PATCH 2402/2913] [nrf fromtree] Bluetooth: Controller: Single timer
 use Periodic Adv Sync nRF54L support

Update Periodic Advertising Sync implementation for single
timer use support required for nRF54L Series SoCs.

As the timer is reset on every radio end, use the
radio_tmr_hcto_configure_abs() function to set the header
complete timeout correctly when using single timer for s/w
switching.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit ccba18a32f1146cdd00003de3da0091f2e4c365a)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
index 40eac85cb77..05c9929ed17 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
@@ -757,7 +757,7 @@ static void isr_aux_setup(void *param)
 	hcto += window_size_us;
 	hcto += radio_rx_chain_delay_get(phy_aux, PHY_FLAGS_S8);
 	hcto += addr_us_get(phy_aux);
-	radio_tmr_hcto_configure(hcto);
+	radio_tmr_hcto_configure_abs(hcto);
 
 	/* capture end of Rx-ed PDU, extended scan to schedule auxiliary
 	 * channel chaining, create connection or to create periodic sync.

From 1e36a812449ee44696b2513d20ae42afee5986b7 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Sun, 29 Dec 2024 15:49:04 +0100
Subject: [PATCH 2403/2913] [nrf fromtree] Bluetooth: Controller: Single timer
 use ISO Receive nRF54L support

Update ISO Sync Receiver for single timer use support
required for nRF54L Series SoCs.

As the timer is reset on every radio end, use the
radio_tmr_hcto_configure_abs() function to set the header
complete timeout correctly when using single timer for s/w
switching.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 980cc216a81480b193e2a3dbd6de35ad19a0d0fb)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c
index 607662dd393..0257bc0eafa 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c
@@ -1152,7 +1152,7 @@ static void isr_rx(void *param)
 	hcto += radio_rx_chain_delay_get(lll->phy, PHY_FLAGS_S8);
 
 	/* setup absolute PDU header reception timeout */
-	radio_tmr_hcto_configure(hcto);
+	radio_tmr_hcto_configure_abs(hcto);
 
 	/* setup capture of PDU end timestamp */
 	radio_tmr_end_capture();

From 7525c0ef50628e938c7fe2deb8bb7cb8852e92d9 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Sun, 29 Dec 2024 15:49:04 +0100
Subject: [PATCH 2404/2913] [nrf fromtree] Bluetooth: Controller: Single timer
 use ISO Central nRF54L support

Update ISO Central for single timer use support required
for nRF54L Series SoCs.

As the timer is reset on every radio end, use the
radio_tmr_hcto_configure_abs() function to set the header
complete timeout correctly when using single timer for s/w
switching.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit b6ce1a6ae01f49dc7bf54ceed463593577413706)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../ll_sw/nordic/lll/lll_central_iso.c        | 58 +++++++++++++------
 1 file changed, 40 insertions(+), 18 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c
index 4b4a76a3dec..59a456f35a2 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c
@@ -546,6 +546,8 @@ static void isr_tx(void *param)
 	if (se_curr < cis_lll->nse) {
 		const struct lll_conn *evt_conn_lll;
 		uint16_t data_chan_id;
+
+#if !defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
 		uint32_t subevent_us;
 		uint32_t start_us;
 
@@ -555,6 +557,7 @@ static void isr_tx(void *param)
 
 		start_us = radio_tmr_start_us(1U, subevent_us);
 		LL_ASSERT(start_us == (subevent_us + 1U));
+#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 
 		/* Get reference to ACL context */
 		evt_conn_lll = ull_conn_lll_get(cis_lll->acl_handle);
@@ -574,9 +577,7 @@ static void isr_tx(void *param)
 		uint64_t payload_count;
 		uint16_t event_counter;
 		uint16_t data_chan_id;
-		uint32_t subevent_us;
 		uint16_t cis_handle;
-		uint32_t start_us;
 		memq_link_t *link;
 
 		/* Calculate channel for next CIS */
@@ -590,12 +591,23 @@ static void isr_tx(void *param)
 			return;
 		}
 
-		/* Get reference to ACL context */
-		next_conn_lll = ull_conn_lll_get(next_cis_lll->acl_handle);
+#if !defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
+		uint32_t subevent_us;
+		uint32_t start_us;
+
+		subevent_us = radio_tmr_ready_restore();
+		subevent_us += next_cis_lll->offset - cis_offset_first;
+
+		start_us = radio_tmr_start_us(1U, subevent_us);
+		LL_ASSERT(start_us == (subevent_us + 1U));
+#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 
 		/* Event counter value,  0-15 bit of cisEventCounter */
 		event_counter = next_cis_lll->event_count;
 
+		/* Get reference to ACL context */
+		next_conn_lll = ull_conn_lll_get(next_cis_lll->acl_handle);
+
 		/* Calculate the radio channel to use for ISO event */
 		data_chan_id = lll_chan_id(next_cis_lll->access_addr);
 		next_cis_chan = lll_chan_iso_event(event_counter, data_chan_id,
@@ -604,12 +616,6 @@ static void isr_tx(void *param)
 						   &next_cis_chan_prn_s,
 						   &next_cis_chan_remap_idx);
 
-		subevent_us = radio_tmr_ready_restore();
-		subevent_us += next_cis_lll->offset - cis_offset_first;
-
-		start_us = radio_tmr_start_us(1U, subevent_us);
-		LL_ASSERT(start_us == (subevent_us + 1U));
-
 		cis_lll = next_cis_lll;
 
 		/* Tx Ack stale ISO Data */
@@ -838,9 +844,18 @@ static void isr_rx(void *param)
 			uint64_t payload_count;
 			uint16_t event_counter;
 			uint16_t data_chan_id;
+			memq_link_t *link;
+
+#if !defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
 			uint32_t subevent_us;
 			uint32_t start_us;
-			memq_link_t *link;
+
+			subevent_us = radio_tmr_ready_restore();
+			subevent_us += next_cis_lll->offset - cis_offset_first;
+
+			start_us = radio_tmr_start_us(1U, subevent_us);
+			LL_ASSERT(start_us == (subevent_us + 1U));
+#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 
 			/* Event counter value,  0-15 bit of cisEventCounter */
 			event_counter = next_cis_lll->event_count;
@@ -853,12 +868,6 @@ static void isr_rx(void *param)
 							   &next_cis_chan_prn_s,
 							   &next_cis_chan_remap_idx);
 
-			subevent_us = radio_tmr_ready_restore();
-			subevent_us += next_cis_lll->offset - cis_offset_first;
-
-			start_us = radio_tmr_start_us(1U, subevent_us);
-			LL_ASSERT(start_us == (subevent_us + 1U));
-
 			old_cis_lll = cis_lll;
 			cis_lll = next_cis_lll;
 
@@ -935,7 +944,6 @@ static void isr_prepare_subevent(void *param)
 	struct pdu_cis *pdu_tx;
 	uint64_t payload_count;
 	uint8_t payload_index;
-	uint32_t subevent_us;
 	uint32_t start_us;
 
 	/* Get reference to CIS LLL context */
@@ -1052,12 +1060,26 @@ static void isr_prepare_subevent(void *param)
 	radio_switch_complete_and_rx(0U);
 #endif /* !CONFIG_BT_CTLR_PHY */
 
+#if defined(HAL_RADIO_GPIO_HAVE_PA_PIN) || \
+	defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
+	uint32_t subevent_us;
+
 	subevent_us = radio_tmr_ready_restore();
 	subevent_us += cis_lll->offset - cis_offset_first +
 		       (cis_lll->sub_interval * se_curr);
 
+#if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
+	start_us = radio_tmr_start_us(1U, subevent_us);
+	LL_ASSERT(start_us == (subevent_us + 1U));
+
+#else /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 	/* Compensate for the 1 us added by radio_tmr_start_us() */
 	start_us = subevent_us + 1U;
+#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+
+#endif /* HAL_RADIO_GPIO_HAVE_PA_PIN ||
+	* CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER
+	*/
 
 	/* capture end of Tx-ed PDU, used to calculate HCTO. */
 	radio_tmr_end_capture();

From 218b06f3a07582db13d937a04e4ffa4b24ebf156 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Sun, 29 Dec 2024 15:49:04 +0100
Subject: [PATCH 2405/2913] [nrf fromtree] Bluetooth: Controller: Single timer
 use ISO Peripheral nRF54L support

Update ISO Peripheral for single timer use support required
for nRF54L Series SoCs.

As the timer is reset on every radio end, use the
radio_tmr_hcto_configure_abs() function to set the header
complete timeout correctly when using single timer for s/w
switching.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 1508aa49a8b44ed91996f365aa0c46104e253525)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../ll_sw/nordic/lll/lll_peripheral_iso.c     | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c
index d189a22d61e..1c2d3c3267f 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c
@@ -462,8 +462,6 @@ static void isr_rx(void *param)
 	struct pdu_cis *pdu_tx;
 	uint64_t payload_count;
 	uint8_t payload_index;
-	uint32_t subevent_us;
-	uint32_t start_us;
 	uint8_t trx_done;
 	uint8_t crc_ok;
 	uint8_t cie;
@@ -807,6 +805,12 @@ static void isr_rx(void *param)
 		se_curr = 0U;
 	}
 
+	radio_isr_set(isr_tx, cis_lll);
+
+#if !defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
+	uint32_t subevent_us;
+	uint32_t start_us;
+
 	/* Schedule next subevent reception */
 	subevent_us = radio_tmr_aa_restore();
 	subevent_us += cis_lll->offset - cis_offset_first +
@@ -825,8 +829,7 @@ static void isr_rx(void *param)
 
 	start_us = radio_tmr_start_us(0U, subevent_us);
 	LL_ASSERT(start_us == (subevent_us + 1U));
-
-	radio_isr_set(isr_tx, cis_lll);
+#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 }
 
 static void isr_tx(void *param)
@@ -923,8 +926,14 @@ static void isr_tx(void *param)
 	subevent_us -= radio_rx_chain_delay_get(0U, 0U);
 #endif /* !CONFIG_BT_CTLR_PHY */
 
+#if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
+	start_us = radio_tmr_start_us(0U, subevent_us);
+	LL_ASSERT(start_us == (subevent_us + 1U));
+
+#else /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 	/* Compensate for the 1 us added by radio_tmr_start_us() */
 	start_us = subevent_us + 1U;
+#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 
 	hcto = start_us +
 	       ((EVENT_JITTER_US + EVENT_TICKER_RES_MARGIN_US +
@@ -941,7 +950,7 @@ static void isr_tx(void *param)
 	hcto += radio_rx_chain_delay_get(0U, 0U);
 #endif /* !CONFIG_BT_CTLR_PHY */
 
-	radio_tmr_hcto_configure(hcto);
+	radio_tmr_hcto_configure_abs(hcto);
 
 #if defined(HAL_RADIO_GPIO_HAVE_LNA_PIN)
 	radio_gpio_lna_setup();
@@ -1172,7 +1181,7 @@ static void isr_prepare_subevent_common(void *param)
 	hcto += radio_rx_chain_delay_get(0U, 0U);
 #endif /* !CONFIG_BT_CTLR_PHY */
 
-	radio_tmr_hcto_configure(hcto);
+	radio_tmr_hcto_configure_abs(hcto);
 
 #if defined(HAL_RADIO_GPIO_HAVE_LNA_PIN)
 	radio_gpio_lna_setup();

From 6b8ec1ef300f60624ae32b8d4c37922314e2db40 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Wed, 25 Dec 2024 06:58:25 +0100
Subject: [PATCH 2406/2913] [nrf fromtree] Bluetooth: Controller: Minor fix
 defines and conditional compilations

Replace use of HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI with
HAL_TRIGGER_CRYPT_PPI; they have same value but use the
correctly named HAL_TRIGGER_CRYPT_PPI define now.

Fix conditional compile to correctly exclude reference of
NRF_CCM when CONFIG_BT_CTLR_PRIVACY=n.

Fix missing reference to CCM_TASKS_CRYPT_DELAY_BITS when
CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER=y.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 439cd0b8bc7b534688a44a35cbec582218c3f3e9)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h         | 8 +++++---
 .../ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h    | 7 +++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
index 916fcafd878..821a38b8145 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
@@ -105,7 +105,7 @@ static inline void hal_event_timer_start_ppi_config(void)
 	nrf_grtc_publish_set(NRF_GRTC, HAL_CNTR_GRTC_EVENT_COMPARE_RADIO,
 			     HAL_EVENT_TIMER_START_PPI);
 
-	/* Enable same DPPI in Global domain */
+	/* Enable same DPPI in Peripheral domain */
 	nrf_dppi_channels_enable(NRF_DPPIC20,
 				 BIT(HAL_EVENT_TIMER_START_PPI));
 
@@ -148,8 +148,8 @@ static inline void hal_radio_ready_time_capture_ppi_config(void)
 static inline void hal_trigger_crypt_ppi_config(void)
 {
 	nrf_radio_publish_set(NRF_RADIO,
-			      NRF_RADIO_EVENT_ADDRESS, HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
-	nrf_ccm_subscribe_set(NRF_CCM, NRF_CCM_TASK_START, HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
+			      NRF_RADIO_EVENT_ADDRESS, HAL_TRIGGER_CRYPT_PPI);
+	nrf_ccm_subscribe_set(NRF_CCM, NRF_CCM_TASK_START, HAL_TRIGGER_CRYPT_PPI);
 }
 
 /*******************************************************************************
@@ -160,6 +160,7 @@ static inline void hal_trigger_crypt_ppi_disable(void)
 	nrf_ccm_subscribe_clear(NRF_CCM, NRF_CCM_TASK_START);
 }
 
+#if defined(CONFIG_BT_CTLR_PRIVACY)
 /*******************************************************************************
  * Trigger automatic address resolution on Bit counter match:
  * wire the RADIO EVENTS_BCMATCH event to the AAR TASKS_START task.
@@ -169,6 +170,7 @@ static inline void hal_trigger_aar_ppi_config(void)
 	nrf_radio_publish_set(NRF_RADIO, NRF_RADIO_EVENT_BCMATCH, HAL_TRIGGER_AAR_PPI);
 	nrf_aar_subscribe_set(NRF_AAR, NRF_AAR_TASK_START, HAL_TRIGGER_AAR_PPI);
 }
+#endif /* CONFIG_BT_CTLR_PRIVACY */
 
 /* When hardware does not support Coded PHY we still allow the Controller
  * implementation to accept Coded PHY flags, but the Controller will use 1M
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h
index 41163909c67..8bd540bbfa6 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h
@@ -62,6 +62,11 @@
  */
 #define HAL_RADIO_ISR_LATENCY_MAX_US 80U
 
+#if defined(CONFIG_BT_CTLR_DF_CONN_CTE_RX)
+/* Delay of CCM TASKS_CRYPT start in number of bits for Radio Bit counter */
+#define CCM_TASKS_CRYPT_DELAY_BITS 3
+#endif /* CONFIG_BT_CTLR_DF_CONN_CTE_RX */
+
 #if defined(CONFIG_BT_CTLR_PHY_CODED)
 #define SW_SWITCH_TIMER_EVTS_COMP_BASE 4
 #define SW_SWITCH_TIMER_EVTS_COMP_S2_BASE 6
@@ -181,8 +186,10 @@
 /* Delay of EVENTS_PHYEND event on receive PDU without CTE included when CTEINLINE is enabled */
 #define RADIO_EVENTS_PHYEND_DELAY_US 16
 
+#if defined(CONFIG_BT_CTLR_DF_CONN_CTE_RX)
 /* Delay of CCM TASKS_CRYPT start in number of bits for Radio Bit counter */
 #define CCM_TASKS_CRYPT_DELAY_BITS 3
+#endif /* CONFIG_BT_CTLR_DF_CONN_CTE_RX */
 
 #else /* !CONFIG_BT_CTLR_DF */
 /* Wrapper for EVENTS_END event generated by Radio peripheral at the very end of the transmission

From fe73c8b1b3eeb9be7ab51ea812fdb9140602bd2c Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Wed, 25 Dec 2024 07:05:10 +0100
Subject: [PATCH 2407/2913] [nrf fromtree] Bluetooth: Controller: Align DDPI
 usage with nRF54L power domains

Align DDPI usage with nRF54L series power domains and
available DDPI configurations.

Use indices below 4 when needing to bridge with GPIO,
use indices below 8 when needing to bridge with MCU domain
like CCM and AAR; and use indices above 7 to bridge with
Peripheral domain.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 031a17c2716eee81f45dbf01f9095aa046c6b42a)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../nrf5/radio/radio_nrf5_dppi_resources.h    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi_resources.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi_resources.h
index ed57597a134..7a1eab2fdad 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi_resources.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi_resources.h
@@ -8,35 +8,35 @@
  * Enable Radio on Event Timer tick:
  * wire the EVENT_TIMER EVENTS_COMPARE[0] event to RADIO TASKS_TXEN/RXEN task.
  */
-#define HAL_RADIO_ENABLE_TX_ON_TICK_PPI 6
-#define HAL_RADIO_ENABLE_RX_ON_TICK_PPI 6
+#define HAL_RADIO_ENABLE_TX_ON_TICK_PPI 9
+#define HAL_RADIO_ENABLE_RX_ON_TICK_PPI 9
 
 /*******************************************************************************
  * Capture event timer on Address reception:
  * wire the RADIO EVENTS_ADDRESS event to the
  * EVENT_TIMER TASKS_CAPTURE[<address timer>] task.
  */
-#define HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI 9
+#define HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI 11
 
 /*******************************************************************************
  * Disable Radio on HCTO:
  * wire the EVENT_TIMER EVENTS_COMPARE[<HCTO timer>] event
  * to the RADIO TASKS_DISABLE task.
  */
-#define HAL_RADIO_DISABLE_ON_HCTO_PPI 10
+#define HAL_RADIO_DISABLE_ON_HCTO_PPI 12
 
 /*******************************************************************************
  * Capture event timer on Radio end:
  * wire the RADIO EVENTS_END event to the
  * EVENT_TIMER TASKS_CAPTURE[<radio end timer>] task.
  */
-#define HAL_RADIO_END_TIME_CAPTURE_PPI 11
+#define HAL_RADIO_END_TIME_CAPTURE_PPI 13
 
 /*******************************************************************************
  * Start event timer on RTC tick:
  * wire the RTC0 EVENTS_COMPARE[2] event to EVENT_TIMER  TASKS_START task.
  */
-#define HAL_EVENT_TIMER_START_PPI 7
+#define HAL_EVENT_TIMER_START_PPI 8
 #define HAL_PPIB_SEND_EVENT_TIMER_START_PPI \
 	_CONCAT(NRF_PPIB_TASK_SEND_, HAL_EVENT_TIMER_START_PPI)
 #define HAL_PPIB_RECEIVE_EVENT_TIMER_START_PPI \
@@ -47,7 +47,7 @@
  * wire the RADIO EVENTS_READY event to the
  * EVENT_TIMER TASKS_CAPTURE[<radio ready timer>] task.
  */
-#define HAL_RADIO_READY_TIME_CAPTURE_PPI 8
+#define HAL_RADIO_READY_TIME_CAPTURE_PPI 10
 
 /*******************************************************************************
  * Trigger encryption task upon address reception:
@@ -62,27 +62,27 @@
  * Trigger automatic address resolution on Bit counter match:
  * wire the RADIO EVENTS_BCMATCH event to the AAR TASKS_START task.
  */
-#define HAL_TRIGGER_AAR_PPI 12
+#define HAL_TRIGGER_AAR_PPI 6
 
 #if defined(CONFIG_BT_CTLR_PHY_CODED) && \
 	defined(CONFIG_HAS_HW_NRF_RADIO_BLE_CODED)
 /*******************************************************************************
  * Trigger Radio Rate override upon Rateboost event.
  */
-#define HAL_TRIGGER_RATEOVERRIDE_PPI 13
+#define HAL_TRIGGER_RATEOVERRIDE_PPI 3
 #endif /* CONFIG_BT_CTLR_PHY_CODED && CONFIG_HAS_HW_NRF_RADIO_BLE_CODED */
 
 #if defined(HAL_RADIO_GPIO_HAVE_PA_PIN) || defined(HAL_RADIO_GPIO_HAVE_LNA_PIN)
 /******************************************************************************/
-#define HAL_ENABLE_PALNA_PPI 5
+#define HAL_ENABLE_PALNA_PPI 2
 
 #if defined(HAL_RADIO_FEM_IS_NRF21540)
-#define HAL_DISABLE_PALNA_PPI 4
+#define HAL_DISABLE_PALNA_PPI 0
 #else
 #define HAL_DISABLE_PALNA_PPI HAL_ENABLE_PALNA_PPI
 #endif
 
-#define HAL_ENABLE_FEM_PPI 3
+#define HAL_ENABLE_FEM_PPI 1
 #define HAL_DISABLE_FEM_PPI HAL_DISABLE_PALNA_PPI
 
 #endif /* HAL_RADIO_GPIO_HAVE_PA_PIN || HAL_RADIO_GPIO_HAVE_LNA_PIN */
@@ -162,11 +162,11 @@
  * when direction finding RX and PHY is set to PHY1M. Due to that it can be shared with Radio Rate
  * override.
  */
-#define HAL_TRIGGER_CRYPT_DELAY_PPI 13
+#define HAL_TRIGGER_CRYPT_DELAY_PPI 3
 #endif /* CONFIG_BT_CTLR_DF_CONN_CTE_RX */
 
 /* The 2 adjacent PPI groups used for implementing SW_SWITCH_TIMER-based
  * auto-switch for TIFS. 'index' must be 0 or 1.
  */
-#define SW_SWITCH_TIMER_TASK_GROUP_BASE 0
+#define SW_SWITCH_TIMER_TASK_GROUP_BASE 4
 #endif /* !CONFIG_BT_CTLR_TIFS_HW */

From b85af473dbb0574e144edcfd45f7810f311a3ad5 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Mon, 23 Sep 2024 05:55:01 +0200
Subject: [PATCH 2408/2913] [nrf fromtree] Bluetooth: Controller: Add NRF_CCM
 support in nRF54L15 SoC

Add NRF_CCM h/w based encryption support in nRF54L15 SoCs.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 430464034755efdd49cb391de3b874fcc1cb58a9)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../bluetooth/controller/Kconfig.ll_sw_split  |   6 +-
 .../ll_sw/nordic/hal/nrf5/radio/radio.c       | 297 +++++++++++++++---
 .../nordic/hal/nrf5/radio/radio_nrf54lx.h     |  13 +
 .../nordic/hal/nrf5/radio/radio_nrf5_dppi.h   |  18 +-
 .../nrf5/radio/radio_nrf5_dppi_resources.h    |  10 +
 .../nordic/hal/nrf5/radio/radio_sim_nrf54l.h  |  13 +
 6 files changed, 317 insertions(+), 40 deletions(-)

diff --git a/subsys/bluetooth/controller/Kconfig.ll_sw_split b/subsys/bluetooth/controller/Kconfig.ll_sw_split
index ee422f1230e..b4572c05d3b 100644
--- a/subsys/bluetooth/controller/Kconfig.ll_sw_split
+++ b/subsys/bluetooth/controller/Kconfig.ll_sw_split
@@ -21,8 +21,7 @@ config BT_LLL_VENDOR_NORDIC
 	select BT_CTLR_CRYPTO_SUPPORT
 	select BT_CTLR_LE_ENC_SUPPORT if BT_CTLR_CRYPTO_SUPPORT && \
 					 !BT_CTLR_DATA_LENGTH_CLEAR && \
-					 !BT_CTLR_PHY_2M_NRF && \
-					 !SOC_COMPATIBLE_NRF54LX
+					 !BT_CTLR_PHY_2M_NRF
 	select BT_CTLR_PRIVACY_SUPPORT if BT_CTLR_CRYPTO_SUPPORT && \
 					  !SOC_SERIES_NRF51X && \
 					  !SOC_COMPATIBLE_NRF54LX
@@ -31,6 +30,7 @@ config BT_LLL_VENDOR_NORDIC
 	select BT_CTLR_PER_INIT_FEAT_XCHG_SUPPORT
 	select BT_CTLR_DATA_LEN_UPDATE_SUPPORT if !BT_CTLR_LE_ENC_SUPPORT || \
 						  HAS_HW_NRF_CCM_LFLEN_8BIT || \
+						  SOC_COMPATIBLE_NRF54LX || \
 						  BT_CTLR_DATA_LENGTH_CLEAR
 	select BT_CTLR_EXT_SCAN_FP_SUPPORT
 	select BT_CTLR_PHY_2M_SUPPORT if HAS_HW_NRF_RADIO_BLE_2M || \
@@ -43,7 +43,7 @@ config BT_LLL_VENDOR_NORDIC
 	select BT_CTLR_SYNC_PERIODIC_SUPPORT
 	select BT_CTLR_ADV_ISO_SUPPORT
 	select BT_CTLR_SYNC_ISO_SUPPORT
-	select BT_CTLR_BROADCAST_ISO_ENC_SUPPORT if !SOC_COMPATIBLE_NRF54LX
+	select BT_CTLR_BROADCAST_ISO_ENC_SUPPORT
 	select BT_CTLR_CENTRAL_ISO_SUPPORT
 	select BT_CTLR_PERIPHERAL_ISO_SUPPORT
 	select BT_CTLR_DF_SUPPORT if HAS_HW_NRF_RADIO_DFE
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
index 1e10c8e71a8..3734a575dc0 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
@@ -7,6 +7,7 @@
 
 #include <zephyr/toolchain.h>
 #include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/sys/byteorder.h>
 #include <soc.h>
 
 #include <nrfx_gpiote.h>
@@ -2057,7 +2058,33 @@ void radio_gpio_pa_lna_disable(void)
 #endif /* HAL_RADIO_GPIO_HAVE_PA_PIN || HAL_RADIO_GPIO_HAVE_LNA_PIN */
 
 #if defined(CONFIG_BT_CTLR_LE_ENC) || defined(CONFIG_BT_CTLR_BROADCAST_ISO_ENC)
+#if defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
+struct ccm_job_ptr {
+	void *ptr;
+	struct {
+		uint32_t length:24;
+		uint32_t attribute:8;
+	} __packed;
+} __packed;
+
+#define CCM_JOB_PTR_ATTRIBUTE_ALEN  11U
+#define CCM_JOB_PTR_ATTRIBUTE_MLEN  12U
+#define CCM_JOB_PTR_ATTRIBUTE_ADATA 13U
+#define CCM_JOB_PTR_ATTRIBUTE_MDATA 14U
+
+static struct {
+	uint16_t in_alen;
+	uint16_t in_mlen;
+	uint8_t  in_mlen_msb;
+	uint8_t  out_mlen_msb;
+	uint16_t out_alen;
+	struct ccm_job_ptr in[6];
+	struct ccm_job_ptr out[6];
+} ccm_job;
+
+#else /* !CONFIG_SOC_COMPATIBLE_NRF54LX */
 static uint8_t MALIGN(4) _ccm_scratch[(HAL_RADIO_PDU_LEN_MAX - 4) + 16];
+#endif /* !CONFIG_SOC_COMPATIBLE_NRF54LX */
 
 #if defined(CONFIG_BT_CTLR_LE_ENC) || defined(CONFIG_BT_CTLR_SYNC_ISO)
 static void *radio_ccm_ext_rx_pkt_set(struct ccm *cnf, uint8_t phy, uint8_t pdu_type, void *pkt)
@@ -2066,21 +2093,34 @@ static void *radio_ccm_ext_rx_pkt_set(struct ccm *cnf, uint8_t phy, uint8_t pdu_
 
 	NRF_CCM->ENABLE = CCM_ENABLE_ENABLE_Disabled;
 	NRF_CCM->ENABLE = CCM_ENABLE_ENABLE_Enabled;
+
 	mode = (CCM_MODE_MODE_Decryption << CCM_MODE_MODE_Pos) &
 	       CCM_MODE_MODE_Msk;
 
-#if !defined(CONFIG_SOC_SERIES_NRF51X)
+#if defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
+	/* Enable CCM Protocol Mode BLE */
+	mode |= (CCM_MODE_PROTOCOL_Ble << CCM_MODE_PROTOCOL_Pos) &
+		CCM_MODE_PROTOCOL_Msk;
+
+	/* Enable CCM MAC Length 4 bytes */
+	mode |= (CCM_MODE_MACLEN_M4 << CCM_MODE_MACLEN_Pos) &
+		CCM_MODE_MACLEN_Msk;
+
+#elif !defined(CONFIG_SOC_SERIES_NRF51X)
 	/* Enable CCM support for 8-bit length field PDUs. */
 	mode |= (CCM_MODE_LENGTH_Extended << CCM_MODE_LENGTH_Pos) &
 		CCM_MODE_LENGTH_Msk;
+#endif /* !CONFIG_SOC_SERIES_NRF51X */
 
 	/* Select CCM data rate based on current PHY in use. */
 	switch (phy) {
 	default:
 	case PHY_1M:
+#if !defined(CONFIG_SOC_SERIES_NRF51X)
 		mode |= (CCM_MODE_DATARATE_1Mbit <<
 			 CCM_MODE_DATARATE_Pos) &
 			CCM_MODE_DATARATE_Msk;
+#endif /* !CONFIG_SOC_SERIES_NRF51X */
 
 		if (false) {
 
@@ -2103,9 +2143,11 @@ static void *radio_ccm_ext_rx_pkt_set(struct ccm *cnf, uint8_t phy, uint8_t pdu_
 		break;
 
 	case PHY_2M:
+#if !defined(CONFIG_SOC_SERIES_NRF51X)
 		mode |= (CCM_MODE_DATARATE_2Mbit <<
 			 CCM_MODE_DATARATE_Pos) &
 			CCM_MODE_DATARATE_Msk;
+#endif /* !CONFIG_SOC_SERIES_NRF51X */
 
 		hal_trigger_crypt_ppi_config();
 		hal_radio_nrf_ppi_channels_enable(BIT(HAL_TRIGGER_CRYPT_PPI));
@@ -2136,47 +2178,131 @@ static void *radio_ccm_ext_rx_pkt_set(struct ccm *cnf, uint8_t phy, uint8_t pdu_
 #endif /* CONFIG_BT_CTLR_PHY_CODED */
 	}
 
-#if !defined(CONFIG_SOC_NRF52832) && \
-	(!defined(CONFIG_BT_CTLR_DATA_LENGTH_MAX) || \
-	 (CONFIG_BT_CTLR_DATA_LENGTH_MAX < ((HAL_RADIO_PDU_LEN_MAX) - 4U)))
-	uint8_t max_len = (NRF_RADIO->PCNF1 & RADIO_PCNF1_MAXLEN_Msk) >>
-			RADIO_PCNF1_MAXLEN_Pos;
-
-	/* MAXPACKETSIZE value 0x001B (27) - 0x00FB (251) bytes */
-	NRF_CCM->MAXPACKETSIZE = max_len - 4U;
-#endif
+	NRF_CCM->MODE = mode;
 
+#if defined(CONFIG_HAS_HW_NRF_CCM_HEADERMASK) || \
+	defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
 #if defined(CONFIG_HAS_HW_NRF_CCM_HEADERMASK)
+#define ADATAMASK HEADERMASK
+#endif /* CONFIG_HAS_HW_NRF_CCM_HEADERMASK */
 	switch (pdu_type) {
 	case RADIO_PKT_CONF_PDU_TYPE_BIS:
-		NRF_CCM->HEADERMASK = 0xC3; /* mask CSSN and CSTF */
+		NRF_CCM->ADATAMASK = 0xC3; /* mask CSSN and CSTF */
 		break;
 	case RADIO_PKT_CONF_PDU_TYPE_CIS:
-		NRF_CCM->HEADERMASK = 0xA3; /* mask SN, NESN, CIE and NPI */
+		NRF_CCM->ADATAMASK = 0xA3; /* mask SN, NESN, CIE and NPI */
 		break;
 	default:
-		/* Using default reset value of HEADERMASK */
-		NRF_CCM->HEADERMASK = 0xE3; /* mask SN, NESN and MD */
+		/* Using default reset value of ADATAMASK */
+		NRF_CCM->ADATAMASK = 0xE3; /* mask SN, NESN and MD */
 		break;
 	}
+#if defined(CONFIG_HAS_HW_NRF_CCM_HEADERMASK)
+#undef ADATAMASK
 #endif /* CONFIG_HAS_HW_NRF_CCM_HEADERMASK */
+#endif /* CONFIG_HAS_HW_NRF_CCM_HEADERMASK ||
+	* CONFIG_SOC_COMPATIBLE_NRF54LX
+	*/
 
-#else /* CONFIG_SOC_SERIES_NRF51X */
-	hal_trigger_crypt_ppi_config();
-	hal_radio_nrf_ppi_channels_enable(BIT(HAL_TRIGGER_CRYPT_PPI));
-#endif /* CONFIG_SOC_SERIES_NRF51X */
+#if !defined(CONFIG_SOC_SERIES_NRF51X) && \
+	!defined(CONFIG_SOC_NRF52832) && \
+	!defined(CONFIG_SOC_COMPATIBLE_NRF54LX) && \
+	(!defined(CONFIG_BT_CTLR_DATA_LENGTH_MAX) || \
+	 (CONFIG_BT_CTLR_DATA_LENGTH_MAX < ((HAL_RADIO_PDU_LEN_MAX) - 4U)))
+	const uint8_t max_len = (NRF_RADIO->PCNF1 & RADIO_PCNF1_MAXLEN_Msk) >>
+				RADIO_PCNF1_MAXLEN_Pos;
 
-	NRF_CCM->MODE = mode;
+	/* MAXPACKETSIZE value 0x001B (27) - 0x00FB (251) bytes */
+	NRF_CCM->MAXPACKETSIZE = max_len - 4U;
+#endif
+
+#if defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
+	/* Configure the CCM key, nonce and pointers */
+	NRF_CCM->KEY.VALUE[3] = sys_get_be32(&cnf->key[0]);
+	NRF_CCM->KEY.VALUE[2] = sys_get_be32(&cnf->key[4]);
+	NRF_CCM->KEY.VALUE[1] = sys_get_be32(&cnf->key[8]);
+	NRF_CCM->KEY.VALUE[0] = sys_get_be32(&cnf->key[12]);
+
+	NRF_CCM->NONCE.VALUE[3] = ((uint8_t *)&cnf->counter)[0];
+	NRF_CCM->NONCE.VALUE[2] = sys_get_be32(&((uint8_t *)&cnf->counter)[1]) |
+				  (cnf->direction << 7);
+	NRF_CCM->NONCE.VALUE[1] = sys_get_be32(&cnf->iv[0]);
+	NRF_CCM->NONCE.VALUE[0] = sys_get_be32(&cnf->iv[4]);
+
+	const uint8_t mlen = (NRF_RADIO->PCNF1 & RADIO_PCNF1_MAXLEN_Msk) >>
+			     RADIO_PCNF1_MAXLEN_Pos;
+
+	const uint8_t alen = sizeof(uint8_t);
+
+	ccm_job.in_alen = alen;
+	ccm_job.in[0].ptr = &ccm_job.in_alen;
+	ccm_job.in[0].length = sizeof(ccm_job.in_alen);
+	ccm_job.in[0].attribute = CCM_JOB_PTR_ATTRIBUTE_ALEN;
+
+	ccm_job.in[1].ptr = (void *)((uint8_t *)_pkt_scratch + 1U);
+	ccm_job.in[1].length = sizeof(uint8_t);
+	ccm_job.in[1].attribute = CCM_JOB_PTR_ATTRIBUTE_MLEN;
+
+	ccm_job.in_mlen_msb = 0U;
+	ccm_job.in[2].ptr = &ccm_job.in_mlen_msb;
+	ccm_job.in[2].length = sizeof(ccm_job.in_mlen_msb);
+	ccm_job.in[2].attribute = CCM_JOB_PTR_ATTRIBUTE_MLEN;
+
+	ccm_job.in[3].ptr = (void *)((uint8_t *)_pkt_scratch + 0U);
+	ccm_job.in[3].length = sizeof(uint8_t);
+	ccm_job.in[3].attribute = CCM_JOB_PTR_ATTRIBUTE_ADATA;
+
+	ccm_job.in[4].ptr = (void *)((uint8_t *)_pkt_scratch + 3U);
+	ccm_job.in[4].length = mlen;
+	ccm_job.in[4].attribute = CCM_JOB_PTR_ATTRIBUTE_MDATA;
+
+	ccm_job.in[5].ptr = NULL;
+	ccm_job.in[5].length = 0U;
+	ccm_job.in[5].attribute = 0U;
+
+	ccm_job.out[0].ptr = &ccm_job.out_alen;
+	ccm_job.out[0].length = sizeof(ccm_job.out_alen);
+	ccm_job.out[0].attribute = CCM_JOB_PTR_ATTRIBUTE_ALEN;
+
+	ccm_job.out[1].ptr = (void *)((uint8_t *)pkt + 1U);
+	ccm_job.out[1].length = sizeof(uint8_t);
+	ccm_job.out[1].attribute = CCM_JOB_PTR_ATTRIBUTE_MLEN;
+
+	ccm_job.out[2].ptr = &ccm_job.out_mlen_msb;
+	ccm_job.out[2].length = sizeof(ccm_job.out_mlen_msb);
+	ccm_job.out[2].attribute = CCM_JOB_PTR_ATTRIBUTE_MLEN;
+
+	ccm_job.out[3].ptr = (void *)((uint8_t *)pkt + 0U);
+	ccm_job.out[3].length = sizeof(uint8_t);
+	ccm_job.out[3].attribute = CCM_JOB_PTR_ATTRIBUTE_ADATA;
+
+	ccm_job.out[4].ptr = (void *)((uint8_t *)pkt + 3U);
+	ccm_job.out[4].length = mlen - sizeof(uint32_t);
+	ccm_job.out[4].attribute = CCM_JOB_PTR_ATTRIBUTE_MDATA;
+
+	ccm_job.out[5].ptr = NULL;
+	ccm_job.out[5].length = 0U;
+	ccm_job.out[5].attribute = 0U;
+
+	NRF_CCM->IN.PTR = (uint32_t)ccm_job.in;
+	NRF_CCM->OUT.PTR = (uint32_t)ccm_job.out;
+
+	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_END);
+	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ERROR);
+
+#else /* !CONFIG_SOC_COMPATIBLE_NRF54LX */
 	NRF_CCM->CNFPTR = (uint32_t)cnf;
 	NRF_CCM->INPTR = (uint32_t)_pkt_scratch;
 	NRF_CCM->OUTPTR = (uint32_t)pkt;
 	NRF_CCM->SCRATCHPTR = (uint32_t)_ccm_scratch;
 	NRF_CCM->SHORTS = 0;
+
 	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ENDKSGEN);
 	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_END);
 	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ERROR);
 
 	nrf_ccm_task_trigger(NRF_CCM, NRF_CCM_TASK_KSGEN);
+#endif /* !CONFIG_SOC_COMPATIBLE_NRF54LX */
 
 	return _pkt_scratch;
 }
@@ -2199,11 +2325,12 @@ static void *radio_ccm_ext_tx_pkt_set(struct ccm *cnf, uint8_t pdu_type, void *p
 
 	NRF_CCM->ENABLE = CCM_ENABLE_ENABLE_Disabled;
 	NRF_CCM->ENABLE = CCM_ENABLE_ENABLE_Enabled;
+
 	mode = (CCM_MODE_MODE_Encryption << CCM_MODE_MODE_Pos) &
 	       CCM_MODE_MODE_Msk;
+
 #if defined(CONFIG_SOC_COMPATIBLE_NRF52X) || \
-	defined(CONFIG_SOC_COMPATIBLE_NRF53X) || \
-	defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
+	defined(CONFIG_SOC_COMPATIBLE_NRF53X)
 	/* Enable CCM support for 8-bit length field PDUs. */
 	mode |= (CCM_MODE_LENGTH_Extended << CCM_MODE_LENGTH_Pos) &
 		CCM_MODE_LENGTH_Msk;
@@ -2213,45 +2340,145 @@ static void *radio_ccm_ext_tx_pkt_set(struct ccm *cnf, uint8_t pdu_type, void *p
 	 */
 	mode |= (CCM_MODE_DATARATE_2Mbit << CCM_MODE_DATARATE_Pos) &
 		CCM_MODE_DATARATE_Msk;
-#endif
 
-#if !defined(CONFIG_SOC_SERIES_NRF51X) && \
-	!defined(CONFIG_SOC_NRF52832) && \
-	(!defined(CONFIG_BT_CTLR_DATA_LENGTH_MAX) || \
-	 (CONFIG_BT_CTLR_DATA_LENGTH_MAX < ((HAL_RADIO_PDU_LEN_MAX) - 4)))
-	uint8_t max_len = (NRF_RADIO->PCNF1 & RADIO_PCNF1_MAXLEN_Msk) >>
-			RADIO_PCNF1_MAXLEN_Pos;
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
+	/* Enable CCM Protocol Mode BLE */
+	mode |= (CCM_MODE_PROTOCOL_Ble << CCM_MODE_PROTOCOL_Pos) &
+		CCM_MODE_PROTOCOL_Msk;
 
-	/* MAXPACKETSIZE value 0x001B (27) - 0x00FB (251) bytes */
-	NRF_CCM->MAXPACKETSIZE = max_len - 4U;
+	/* NOTE: use fastest data rate as tx data needs to be prepared before
+	 * radio Tx on any PHY.
+	 */
+	mode |= (CCM_MODE_DATARATE_4Mbit << CCM_MODE_DATARATE_Pos) &
+		CCM_MODE_DATARATE_Msk;
+
+	/* Enable CCM MAC Length 4 bytes */
+	mode |= (CCM_MODE_MACLEN_M4 << CCM_MODE_MACLEN_Pos) &
+		CCM_MODE_MACLEN_Msk;
 #endif
 
+	NRF_CCM->MODE = mode;
+
+#if defined(CONFIG_HAS_HW_NRF_CCM_HEADERMASK) || \
+	defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
 #if defined(CONFIG_HAS_HW_NRF_CCM_HEADERMASK)
+#define ADATAMASK HEADERMASK
+#endif /* CONFIG_HAS_HW_NRF_CCM_HEADERMASK */
 	switch (pdu_type) {
 	case RADIO_PKT_CONF_PDU_TYPE_BIS:
-		NRF_CCM->HEADERMASK = 0xC3; /* mask CSSN and CSTF */
+		NRF_CCM->ADATAMASK = 0xC3; /* mask CSSN and CSTF */
 		break;
 	case RADIO_PKT_CONF_PDU_TYPE_CIS:
-		NRF_CCM->HEADERMASK = 0xA3; /* mask SN, NESN, CIE and NPI */
+		NRF_CCM->ADATAMASK = 0xA3; /* mask SN, NESN, CIE and NPI */
 		break;
 	default:
-		/* Using default reset value of HEADERMASK */
-		NRF_CCM->HEADERMASK = 0xE3; /* mask SN, NESN and MD */
+		/* Using default reset value of ADATAMASK */
+		NRF_CCM->ADATAMASK = 0xE3; /* mask SN, NESN and MD */
 		break;
 	}
+#if defined(CONFIG_HAS_HW_NRF_CCM_HEADERMASK)
+#undef ADATAMASK
 #endif /* CONFIG_HAS_HW_NRF_CCM_HEADERMASK */
+#endif /* CONFIG_HAS_HW_NRF_CCM_HEADERMASK ||
+	* CONFIG_SOC_COMPATIBLE_NRF54LX
+	*/
 
-	NRF_CCM->MODE = mode;
+#if !defined(CONFIG_SOC_SERIES_NRF51X) && \
+	!defined(CONFIG_SOC_NRF52832) && \
+	!defined(CONFIG_SOC_COMPATIBLE_NRF54LX) && \
+	(!defined(CONFIG_BT_CTLR_DATA_LENGTH_MAX) || \
+	 (CONFIG_BT_CTLR_DATA_LENGTH_MAX < ((HAL_RADIO_PDU_LEN_MAX) - 4U)))
+	const uint8_t max_len = (NRF_RADIO->PCNF1 & RADIO_PCNF1_MAXLEN_Msk) >>
+				RADIO_PCNF1_MAXLEN_Pos;
+
+	/* MAXPACKETSIZE value 0x001B (27) - 0x00FB (251) bytes */
+	NRF_CCM->MAXPACKETSIZE = max_len - 4U;
+#endif
+
+#if defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
+	/* Configure the CCM key, nonce and pointers */
+	NRF_CCM->KEY.VALUE[3] = sys_get_be32(&cnf->key[0]);
+	NRF_CCM->KEY.VALUE[2] = sys_get_be32(&cnf->key[4]);
+	NRF_CCM->KEY.VALUE[1] = sys_get_be32(&cnf->key[8]);
+	NRF_CCM->KEY.VALUE[0] = sys_get_be32(&cnf->key[12]);
+
+	NRF_CCM->NONCE.VALUE[3] = ((uint8_t *)&cnf->counter)[0];
+	NRF_CCM->NONCE.VALUE[2] = sys_get_be32(&((uint8_t *)&cnf->counter)[1]) |
+				  (cnf->direction << 7);
+	NRF_CCM->NONCE.VALUE[1] = sys_get_be32(&cnf->iv[0]);
+	NRF_CCM->NONCE.VALUE[0] = sys_get_be32(&cnf->iv[4]);
+
+	const uint8_t alen = sizeof(uint8_t);
+
+	ccm_job.in_alen = alen;
+	ccm_job.in[0].ptr = &ccm_job.in_alen;
+	ccm_job.in[0].length = sizeof(ccm_job.in_alen);
+	ccm_job.in[0].attribute = CCM_JOB_PTR_ATTRIBUTE_ALEN;
+
+	const uint8_t mlen = *((uint8_t *)pkt + 1U);
+
+	ccm_job.in_mlen = mlen;
+	ccm_job.in[1].ptr = &ccm_job.in_mlen;
+	ccm_job.in[1].length = sizeof(ccm_job.in_mlen);
+	ccm_job.in[1].attribute = CCM_JOB_PTR_ATTRIBUTE_MLEN;
+
+	ccm_job.in[2].ptr = (void *)((uint8_t *)pkt + 0U);
+	ccm_job.in[2].length = alen;
+	ccm_job.in[2].attribute = CCM_JOB_PTR_ATTRIBUTE_ADATA;
+
+	ccm_job.in[3].ptr = (void *)((uint8_t *)pkt + 3U);
+	ccm_job.in[3].length = mlen;
+	ccm_job.in[3].attribute = CCM_JOB_PTR_ATTRIBUTE_MDATA;
+
+	ccm_job.in[4].ptr = NULL;
+	ccm_job.in[4].length = 0U;
+	ccm_job.in[4].attribute = 0U;
+
+	ccm_job.out[0].ptr = &ccm_job.out_alen;
+	ccm_job.out[0].length = sizeof(ccm_job.out_alen);
+	ccm_job.out[0].attribute = CCM_JOB_PTR_ATTRIBUTE_ALEN;
+
+	ccm_job.out[1].ptr = (void *)((uint8_t *)_pkt_scratch + 1U);
+	ccm_job.out[1].length = sizeof(uint8_t);
+	ccm_job.out[1].attribute = CCM_JOB_PTR_ATTRIBUTE_MLEN;
+
+	ccm_job.out[2].ptr = &ccm_job.out_mlen_msb;
+	ccm_job.out[2].length = sizeof(ccm_job.out_mlen_msb);
+	ccm_job.out[2].attribute = CCM_JOB_PTR_ATTRIBUTE_MLEN;
+
+	ccm_job.out[3].ptr = (void *)((uint8_t *)_pkt_scratch + 0U);
+	ccm_job.out[3].length = sizeof(uint8_t);
+	ccm_job.out[3].attribute = CCM_JOB_PTR_ATTRIBUTE_ADATA;
+
+	ccm_job.out[4].ptr = (void *)((uint8_t *)_pkt_scratch + 3U);
+	ccm_job.out[4].length = mlen + sizeof(uint32_t);
+	ccm_job.out[4].attribute = CCM_JOB_PTR_ATTRIBUTE_MDATA;
+
+	ccm_job.out[5].ptr = NULL;
+	ccm_job.out[5].length = 0U;
+	ccm_job.out[5].attribute = 0U;
+
+	NRF_CCM->IN.PTR = (uint32_t)ccm_job.in;
+	NRF_CCM->OUT.PTR = (uint32_t)ccm_job.out;
+
+	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_END);
+	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ERROR);
+
+	nrf_ccm_task_trigger(NRF_CCM, NRF_CCM_TASK_START);
+
+#else /* !CONFIG_SOC_COMPATIBLE_NRF54LX */
 	NRF_CCM->CNFPTR = (uint32_t)cnf;
 	NRF_CCM->INPTR = (uint32_t)pkt;
 	NRF_CCM->OUTPTR = (uint32_t)_pkt_scratch;
 	NRF_CCM->SCRATCHPTR = (uint32_t)_ccm_scratch;
 	NRF_CCM->SHORTS = CCM_SHORTS_ENDKSGEN_CRYPT_Msk;
+
 	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ENDKSGEN);
 	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_END);
 	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ERROR);
 
 	nrf_ccm_task_trigger(NRF_CCM, NRF_CCM_TASK_KSGEN);
+#endif /* !CONFIG_SOC_COMPATIBLE_NRF54LX */
 
 	return _pkt_scratch;
 }
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h
index 7c73a603ea9..047e3ea2487 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h
@@ -385,6 +385,19 @@
 #define HAL_RADIO_RESET_VALUE_CTEINLINECONF 0x00002800UL
 #define HAL_RADIO_RESET_VALUE_DATAWHITE     0x00890040UL
 
+/* HAL abstraction of CCM h/w */
+#define NRF_CCM                               NRF_CCM00
+#define NRF_CCM_TASK_CRYPT                    NRF_CCM_TASK_START
+#define EVENTS_ENDCRYPT                       EVENTS_END
+#define INPTR                                 IN.PTR
+#define OUTPTR                                OUT.PTR
+#define MICSTATUS                             MACSTATUS
+#define CCM_INTENSET_ENDCRYPT_Msk             CCM_INTENSET_END_Msk
+#define CCM_INTENCLR_ENDCRYPT_Msk             CCM_INTENCLR_END_Msk
+#define CCM_MODE_DATARATE_125Kbps             CCM_MODE_DATARATE_125Kbit
+#define CCM_MODE_DATARATE_500Kbps             CCM_MODE_DATARATE_500Kbit
+#define CCM_RATEOVERRIDE_RATEOVERRIDE_500Kbps CCM_RATEOVERRIDE_RATEOVERRIDE_500Kbit
+
 static inline void hal_radio_reset(void)
 {
 	/* TODO: Add any required setup for each radio event
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
index 821a38b8145..1f5c2205f3c 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
@@ -147,9 +147,23 @@ static inline void hal_radio_ready_time_capture_ppi_config(void)
  */
 static inline void hal_trigger_crypt_ppi_config(void)
 {
-	nrf_radio_publish_set(NRF_RADIO,
-			      NRF_RADIO_EVENT_ADDRESS, HAL_TRIGGER_CRYPT_PPI);
 	nrf_ccm_subscribe_set(NRF_CCM, NRF_CCM_TASK_START, HAL_TRIGGER_CRYPT_PPI);
+
+#if !defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
+	nrf_radio_publish_set(NRF_RADIO, NRF_RADIO_EVENT_ADDRESS, HAL_TRIGGER_CRYPT_PPI);
+
+#else /* !CONFIG_SOC_COMPATIBLE_NRF54LX */
+	nrf_radio_publish_set(NRF_RADIO, NRF_RADIO_EVENT_PAYLOAD, HAL_TRIGGER_CRYPT_PPI);
+
+	/* Enable same DPPI in MCU  domain */
+	nrf_dppi_channels_enable(NRF_DPPIC00, BIT(HAL_TRIGGER_CRYPT_PPI));
+
+	/* Setup PPIB send subscribe */
+	nrf_ppib_subscribe_set(NRF_PPIB10, HAL_PPIB_SEND_TRIGGER_CRYPT_PPI, HAL_TRIGGER_CRYPT_PPI);
+
+	/* Setup PPIB receive publish */
+	nrf_ppib_publish_set(NRF_PPIB00, HAL_PPIB_RECEIVE_TRIGGER_CRYPT_PPI, HAL_TRIGGER_CRYPT_PPI);
+#endif /* !CONFIG_SOC_COMPATIBLE_NRF54LX */
 }
 
 /*******************************************************************************
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi_resources.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi_resources.h
index 7a1eab2fdad..5433d0d3eec 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi_resources.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi_resources.h
@@ -55,8 +55,18 @@
  *
  * Note: we do not need an additional PPI, since we have already set up
  * a PPI to publish RADIO ADDRESS event.
+ * Note: For nRF54L, CCM is started on RADIO PAYLOAD, hence need an explicit
+ * PPI channel.
  */
+#if defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
+#define HAL_TRIGGER_CRYPT_PPI 7
+#else /* CONFIG_SOC_COMPATIBLE_NRF54LX */
 #define HAL_TRIGGER_CRYPT_PPI HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI
+#endif /* CONFIG_SOC_COMPATIBLE_NRF54LX */
+#define HAL_PPIB_SEND_TRIGGER_CRYPT_PPI \
+	_CONCAT(NRF_PPIB_TASK_SEND_, HAL_TRIGGER_CRYPT_PPI)
+#define HAL_PPIB_RECEIVE_TRIGGER_CRYPT_PPI \
+	_CONCAT(NRF_PPIB_EVENT_RECEIVE_, HAL_TRIGGER_CRYPT_PPI)
 
 /*******************************************************************************
  * Trigger automatic address resolution on Bit counter match:
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf54l.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf54l.h
index 7c73a603ea9..047e3ea2487 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf54l.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_sim_nrf54l.h
@@ -385,6 +385,19 @@
 #define HAL_RADIO_RESET_VALUE_CTEINLINECONF 0x00002800UL
 #define HAL_RADIO_RESET_VALUE_DATAWHITE     0x00890040UL
 
+/* HAL abstraction of CCM h/w */
+#define NRF_CCM                               NRF_CCM00
+#define NRF_CCM_TASK_CRYPT                    NRF_CCM_TASK_START
+#define EVENTS_ENDCRYPT                       EVENTS_END
+#define INPTR                                 IN.PTR
+#define OUTPTR                                OUT.PTR
+#define MICSTATUS                             MACSTATUS
+#define CCM_INTENSET_ENDCRYPT_Msk             CCM_INTENSET_END_Msk
+#define CCM_INTENCLR_ENDCRYPT_Msk             CCM_INTENCLR_END_Msk
+#define CCM_MODE_DATARATE_125Kbps             CCM_MODE_DATARATE_125Kbit
+#define CCM_MODE_DATARATE_500Kbps             CCM_MODE_DATARATE_500Kbit
+#define CCM_RATEOVERRIDE_RATEOVERRIDE_500Kbps CCM_RATEOVERRIDE_RATEOVERRIDE_500Kbit
+
 static inline void hal_radio_reset(void)
 {
 	/* TODO: Add any required setup for each radio event

From 6de6e755b729a9a3915accf0bddd0e19db55e7cb Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Sat, 28 Dec 2024 07:38:26 +0100
Subject: [PATCH 2409/2913] [nrf fromtree] Bluetooth: Controller: BUILD_ASSERT
 ticker nodes exceed UINT8_MAX

Added BUILD_ASSERT to ensure ticker node count does not
exceed UINT8_MAX.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 750250f12983c9a2b8b009a85b082099b492eb09)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 subsys/bluetooth/controller/ll_sw/ull.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/subsys/bluetooth/controller/ll_sw/ull.c b/subsys/bluetooth/controller/ll_sw/ull.c
index 40c335dee85..52ab480b663 100644
--- a/subsys/bluetooth/controller/ll_sw/ull.c
+++ b/subsys/bluetooth/controller/ll_sw/ull.c
@@ -221,6 +221,9 @@
 				   FLASH_TICKER_NODES + \
 				   COEX_TICKER_NODES)
 
+/* Ticker implementation supports up to 255 ticker node count value */
+BUILD_ASSERT(TICKER_NODES <= UINT8_MAX);
+
 /* When both central and peripheral are supported, one each Rx node will be
  * needed by connectable advertising and the initiator to generate connection
  * complete event, hence conditionally set the count.

From 0a614a3f81bb8615ce70b435336a1380a06b1953 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Fri, 17 Jan 2025 12:31:22 +0100
Subject: [PATCH 2410/2913] [nrf fromtree] Bluetooth: Controller: Fix
 regression in connection update

The connection event at the connection update instant was
skipped due to previous ticker node in use that is being
stopped was registering a relative occupied time that
overlapped with the new ticker node being started for
scheduling the connection with new interval.

Added mock interface for ticker_stop_abs() hence needed by
the Controller unit testing.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 5dffad061cfc55f9c12f54b28ef46dd37dc40583)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 subsys/bluetooth/controller/ll_sw/ull_conn.c      | 5 +++--
 tests/bluetooth/controller/mock_ctrl/src/ticker.c | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn.c b/subsys/bluetooth/controller/ll_sw/ull_conn.c
index 93a610fa705..ae6cfd93d6a 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_conn.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_conn.c
@@ -2179,8 +2179,9 @@ static void ull_conn_update_ticker(struct ll_conn *conn,
 
 	/* start periph/central with new timings */
 	uint8_t ticker_id_conn = TICKER_ID_CONN_BASE + ll_conn_handle_get(conn);
-	uint32_t ticker_status = ticker_stop(TICKER_INSTANCE_ID_CTLR, TICKER_USER_ID_ULL_HIGH,
-				    ticker_id_conn, ticker_stop_conn_op_cb, (void *)conn);
+	uint32_t ticker_status = ticker_stop_abs(TICKER_INSTANCE_ID_CTLR, TICKER_USER_ID_ULL_HIGH,
+						 ticker_id_conn, ticks_at_expire,
+						 ticker_stop_conn_op_cb, (void *)conn);
 	LL_ASSERT((ticker_status == TICKER_STATUS_SUCCESS) ||
 		  (ticker_status == TICKER_STATUS_BUSY));
 	ticker_status = ticker_start(
diff --git a/tests/bluetooth/controller/mock_ctrl/src/ticker.c b/tests/bluetooth/controller/mock_ctrl/src/ticker.c
index 2d5381eeeb1..f4a18b8253a 100644
--- a/tests/bluetooth/controller/mock_ctrl/src/ticker.c
+++ b/tests/bluetooth/controller/mock_ctrl/src/ticker.c
@@ -33,6 +33,13 @@ uint8_t ticker_stop(uint8_t instance_index, uint8_t user_id, uint8_t ticker_id,
 	return TICKER_STATUS_SUCCESS;
 }
 
+uint8_t ticker_stop_abs(uint8_t instance_index, uint8_t user_id,
+			 uint8_t ticker_id, uint32_t ticks_at_stop,
+			 ticker_op_func fp_op_func, void *op_context)
+{
+	return TICKER_STATUS_SUCCESS;
+}
+
 void ticker_job_sched(uint8_t instance_index, uint8_t user_id)
 {
 }

From 32d63d87494f2a57d5f869ec47cff506a2ff1032 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Fri, 17 Jan 2025 14:50:35 +0100
Subject: [PATCH 2411/2913] [nrf fromtree] Bluetooth: Controller: Fix reset of
 drift_skip count

Fix reset of drift_skip count when an anchor point sync was
missed so that drift compensation is applied on the next
successful anchor point sync. This will improve connection
stability for short overlapping radio event intervals.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit e09d629024a69d8394b926886b771e545ae73fe7)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 subsys/bluetooth/controller/ll_sw/ull_conn.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn.c b/subsys/bluetooth/controller/ll_sw/ull_conn.c
index ae6cfd93d6a..459e079cb23 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_conn.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_conn.c
@@ -1074,7 +1074,7 @@ void ull_conn_done(struct node_rx_event_done *done)
 	if (done->extra.trx_cnt) {
 		if (0) {
 #if defined(CONFIG_BT_PERIPHERAL)
-		} else if (lll->role) {
+		} else if (lll->role == BT_HCI_ROLE_PERIPHERAL) {
 			if (!conn->periph.drift_skip) {
 				ull_drift_ticks_get(done, &ticks_drift_plus,
 						    &ticks_drift_minus);
@@ -1103,6 +1103,12 @@ void ull_conn_done(struct node_rx_event_done *done)
 
 		/* Reset connection failed to establish countdown */
 		conn->connect_expire = 0U;
+	} else {
+#if defined(CONFIG_BT_PERIPHERAL)
+		if (lll->role == BT_HCI_ROLE_PERIPHERAL) {
+			conn->periph.drift_skip = 0U;
+		}
+#endif /* CONFIG_BT_PERIPHERAL */
 	}
 
 	elapsed_event = latency_event + lll->lazy_prepare + 1U;

From 89957791cff6e5bde14e8df59ec52b12c903cf64 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Sat, 18 Jan 2025 08:06:40 +0100
Subject: [PATCH 2412/2913] [nrf fromtree] Bluetooth: Controller: Fix
 uninitialized is_aborted in conn done event

Fix uninitialized is_aborted in connection done event.

Relates to commit cadef5a64fa5 ("Bluetooth: Controller:
Introduce BT_CTLR_PERIPHERAL_RESERVE_MAX").

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit f3e398d64c451ea2b5b4fa4041655387b78caf5f)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
index 4f61cba9665..922799642db 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
@@ -263,6 +263,8 @@ void lll_conn_abort_cb(struct lll_prepare_param *prepare_param, void *param)
 	e->type = EVENT_DONE_EXTRA_TYPE_CONN;
 	e->trx_cnt = 0U;
 	e->crc_valid = 0U;
+	e->is_aborted = 1U;
+
 #if defined(CONFIG_BT_CTLR_LE_ENC)
 	e->mic_state = LLL_CONN_MIC_NONE;
 #endif /* CONFIG_BT_CTLR_LE_ENC */

From 7318bd11205ba2869b1d9c6d642c5d65c78ea32c Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Mon, 20 Jan 2025 21:15:19 +0100
Subject: [PATCH 2413/2913] [nrf fromtree] Bluetooth: Controller: Fix
 regression in Code PHY S2 Rx to any PHY Tx

Fix regression in Coded PHY S2 reception to any other PHY Tx
in the s/w switch implementation.

Regression in commit 55b7dba8ec93 ("Bluetooth: Controller:
Refactor sw_switch hal interface use").

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 7573ac521d837213e1507d2bb7af7ae70141c0a8)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h   | 2 +-
 .../controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
index 1f5c2205f3c..06aea328eaf 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
@@ -559,7 +559,7 @@ static inline void hal_radio_sw_switch_coded_tx_config_set(uint8_t ppi_en,
 	HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI_REGISTER_EVT =
 		HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI_EVT;
 	nrf_timer_subscribe_set(SW_SWITCH_TIMER,
-				nrf_timer_capture_task_get(cc_s2),
+				nrf_timer_capture_task_get(SW_SWITCH_TIMER_EVTS_COMP(group_index)),
 				HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI);
 
 	nrf_dppi_channels_enable(NRF_DPPIC,
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h
index 5d18d76ff61..05445e1fb48 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h
@@ -517,7 +517,8 @@ static inline void hal_radio_sw_switch_coded_tx_config_set(uint8_t ppi_en,
 	nrf_ppi_event_endpoint_setup(NRF_PPI, HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI,
 				     HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI_EVT);
 	nrf_ppi_task_endpoint_setup(NRF_PPI, HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI,
-				    HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI_TASK(cc_s2));
+				    HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI_TASK(
+					    SW_SWITCH_TIMER_EVTS_COMP(group_index)));
 
 	nrf_ppi_channels_enable(
 		NRF_PPI,

From 87de55b92596c712cc30e4bdbc5b690b640c7e7a Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Sat, 25 Jan 2025 16:24:51 +0100
Subject: [PATCH 2414/2913] [nrf fromtree] Bluetooth: Controller: Fix
 connection event busy check

Fix connection event busy check when peripheral role is
using minimal time reservation.

Peripheral and Central have a anchor point sync if the
Peripheral has successfully transmitted once to the Central.

Fixes commit cadef5a64fa5 ("Bluetooth: Controller: Introduce
BT_CTLR_PERIPHERAL_RESERVE_MAX")'.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 745810c4ce5cf5ea41f04351a77b443a8c9ccc61)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
index 922799642db..2122de97092 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
@@ -67,6 +67,7 @@ static struct pdu_data *get_last_tx_pdu(struct lll_conn *lll);
 static uint8_t crc_expire;
 static uint8_t crc_valid;
 static uint8_t is_aborted;
+static uint16_t tx_cnt;
 static uint16_t trx_cnt;
 
 #if defined(CONFIG_BT_CTLR_LE_ENC)
@@ -147,6 +148,7 @@ void lll_conn_flush(uint16_t handle, struct lll_conn *lll)
 
 void lll_conn_prepare_reset(void)
 {
+	tx_cnt = 0U;
 	trx_cnt = 0U;
 	crc_valid = 0U;
 	crc_expire = 0U;
@@ -193,7 +195,7 @@ int lll_conn_peripheral_is_abort_cb(void *next, void *curr,
 	/* Do not be aborted by same event if a single peripheral trx has not
 	 * been exchanged.
 	 */
-	if ((next == curr) && (trx_cnt <= 1U)) {
+	if ((next == curr) && (tx_cnt < 1U)) {
 		return -EBUSY;
 	}
 
@@ -216,7 +218,7 @@ void lll_conn_abort_cb(struct lll_prepare_param *prepare_param, void *param)
 		 * back to central, otherwise let the supervision timeout
 		 * countdown be started.
 		 */
-		if ((lll->role == BT_HCI_ROLE_PERIPHERAL) && (trx_cnt <= 1U)) {
+		if ((lll->role == BT_HCI_ROLE_PERIPHERAL) && (tx_cnt < 1U)) {
 			is_aborted = 1U;
 		}
 
@@ -609,6 +611,8 @@ void lll_conn_isr_tx(void *param)
 	/* Clear radio tx status and events */
 	lll_isr_tx_status_reset();
 
+	tx_cnt++;
+
 	lll = param;
 
 	/* setup tIFS switching */

From f28150c69cb9b02482f64588fa23605893715803 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Sat, 25 Jan 2025 17:13:11 +0100
Subject: [PATCH 2415/2913] [nrf fromtree] Bluetooth: Controller: Fix incorrect
 drift comp on PHY update

Fix incorrect peripheral drift compensation when connection
events are overlapping and a PHY update causes the currently
used PHY to change.

Incorrect preamble to address that is calculated using
updated PHY was used causing supervision timeout.

Fixed by storing the PHY used in the current connection
event and using that for drift compensation calculation.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 13fa3a029065dd28638de706eeb941f72670dd9e)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 subsys/bluetooth/controller/ll_sw/lll_conn.h         | 12 ++++++++----
 .../bluetooth/controller/ll_sw/nordic/lll/lll_conn.c |  2 +-
 .../controller/ll_sw/nordic/lll/lll_peripheral.c     |  5 +++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/lll_conn.h b/subsys/bluetooth/controller/ll_sw/lll_conn.h
index 19a7820ed94..bcaaa4d2d2e 100644
--- a/subsys/bluetooth/controller/ll_sw/lll_conn.h
+++ b/subsys/bluetooth/controller/ll_sw/lll_conn.h
@@ -86,10 +86,14 @@ struct lll_conn {
 
 #if defined(CONFIG_BT_PERIPHERAL)
 		struct {
-			uint8_t  initiated:1;
-			uint8_t  cancelled:1;
-			uint8_t  forced:1;
-			uint8_t  latency_enabled:1;
+			uint8_t initiated:1;
+			uint8_t cancelled:1;
+			uint8_t forced:1;
+			uint8_t latency_enabled:1;
+
+#if defined(CONFIG_BT_CTLR_PHY)
+			uint8_t phy_rx_event:3;
+#endif /* CONFIG_BT_CTLR_PHY */
 
 			uint32_t window_widening_periodic_us;
 			uint32_t window_widening_max_us;
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
index 2122de97092..66fdf483c37 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
@@ -993,7 +993,7 @@ static void isr_done(void *param)
 
 #if defined(CONFIG_BT_CTLR_PHY)
 			preamble_to_addr_us =
-				addr_us_get(lll->phy_rx);
+				addr_us_get(lll->periph.phy_rx_event);
 #else /* !CONFIG_BT_CTLR_PHY */
 			preamble_to_addr_us =
 				addr_us_get(0);
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral.c
index c15ca24eb90..0ed7a63af8d 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral.c
@@ -177,6 +177,11 @@ static int prepare_cb(struct lll_prepare_param *p)
 		lll->periph.window_size_prepare_us;
 	lll->periph.window_size_prepare_us = 0;
 
+#if defined(CONFIG_BT_CTLR_PHY)
+	/* back up rx PHY for use in drift compensation */
+	lll->periph.phy_rx_event = lll->phy_rx;
+#endif /* CONFIG_BT_CTLR_PHY */
+
 	/* Ensure that empty flag reflects the state of the Tx queue, as a
 	 * peripheral if this is the first connection event and as no prior PDU
 	 * is transmitted, an incorrect acknowledgment by peer should not

From 34a8e0ea2f69c96b44797b394b7a8d74f0916847 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Sun, 26 Jan 2025 07:44:58 +0100
Subject: [PATCH 2416/2913] [nrf fromtree] Bluetooth: Controller: Workaround
 HCTO for BabbleSIM

Workaround HCTO calculation for BabbleSIM due to need of
addition timeout value required to have anchor point sync.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit e8da9817116146b526193f8293f125b902d74773)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../controller/ll_sw/nordic/lll/lll_conn.c       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
index 66fdf483c37..effc2069ae5 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
@@ -698,10 +698,26 @@ void lll_conn_isr_tx(void *param)
 	}
 #endif /* CONFIG_BT_CTLR_DF_CONN_CTE_TX */
 
+#if !defined(CONFIG_BOARD_NRF52_BSIM) && \
+	!defined(CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUNET) && \
+	!defined(CONFIG_BOARD_NRF54L15BSIM_NRF54L15_CPUAPP)
+
 	/* +/- 2us active clock jitter, +1 us PPI to timer start compensation */
 	hcto = radio_tmr_tifs_base_get() + lll->tifs_hcto_us +
 	       (EVENT_CLOCK_JITTER_US << 1) + RANGE_DELAY_US +
 	       HAL_RADIO_TMR_START_DELAY_US;
+
+#else /* FIXME: Why different for BabbleSIM? */
+	/* HACK: Have exact 150 us */
+	hcto = radio_tmr_tifs_base_get() + lll->tifs_hcto_us;
+
+	/* HACK: Could wrong MODE register value (next in tIFS switching) being
+	 *       use for Rx Chain Delay in BabbleSIM? or is there a bug in
+	 *       target implementation?
+	 */
+	hcto += radio_rx_chain_delay_get(lll->phy_tx, PHY_FLAGS_S8);
+#endif /* FIXME: Why different for BabbleSIM? */
+
 #if defined(CONFIG_BT_CTLR_DF_CONN_CTE_TX)
 	hcto += cte_len;
 #endif /* CONFIG_BT_CTLR_DF_CONN_CTE_TX */

From bae52a85d880aa30d68a73edb530ac12d9eef7a8 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Tue, 28 Jan 2025 08:49:15 +0100
Subject: [PATCH 2417/2913] [nrf fromtree] Bluetooth: Controller: Fix Central
 ISO related to elapsed events value

Fix incorrect elapsed events value when event prepare are
aborted in the pipeline. This can caused premature
supervision timeouts.

Relates to commit 247037bd3e2a ("Bluetooth: Controller: Fix
incorrect elapsed events value").

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 1c86636a7f37414db960c0d3df8ab8731bc3dd87)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../ll_sw/nordic/lll/lll_central_iso.c        | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c
index 59a456f35a2..8fe4453409c 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c
@@ -92,23 +92,12 @@ int lll_central_iso_reset(void)
 
 void lll_central_iso_prepare(void *param)
 {
-	struct lll_conn_iso_group *cig_lll;
-	struct lll_prepare_param *p;
-	uint16_t elapsed;
 	int err;
 
 	/* Initiate HF clock start up */
 	err = lll_hfclock_on();
 	LL_ASSERT(err >= 0);
 
-	/* Instants elapsed */
-	p = param;
-	elapsed = p->lazy + 1U;
-
-	/* Save the (latency + 1) for use in event and/or supervision timeout */
-	cig_lll = p->param;
-	cig_lll->latency_prepare += elapsed;
-
 	/* Invoke common pipeline handling of prepare */
 	err = lll_prepare(lll_is_abort_cb, abort_cb, prepare_cb, 0U, param);
 	LL_ASSERT(!err || err == -EINPROGRESS);
@@ -135,7 +124,6 @@ static int prepare_cb(struct lll_prepare_param *p)
 	struct ull_hdr *ull;
 	uint32_t remainder;
 	uint32_t start_us;
-	uint16_t lazy;
 	uint32_t ret;
 	uint8_t phy;
 	int err = 0;
@@ -173,9 +161,9 @@ static int prepare_cb(struct lll_prepare_param *p)
 					   &data_chan_prn_s,
 					   &data_chan_remap_idx);
 
-	/* Store the current event latency */
-	cig_lll->latency_event = cig_lll->latency_prepare;
-	lazy = cig_lll->latency_prepare - 1U;
+	/* Calculate the current event latency */
+	cig_lll->lazy_prepare = p->lazy;
+	cig_lll->latency_event = cig_lll->latency_prepare + cig_lll->lazy_prepare;
 
 	/* Reset accumulated latencies */
 	cig_lll->latency_prepare = 0U;
@@ -395,13 +383,13 @@ static int prepare_cb(struct lll_prepare_param *p)
 
 static void abort_cb(struct lll_prepare_param *prepare_param, void *param)
 {
+	struct lll_conn_iso_group *cig_lll;
 	int err;
 
 	/* NOTE: This is not a prepare being cancelled */
 	if (!prepare_param) {
 		struct lll_conn_iso_stream *next_cis_lll;
 		struct lll_conn_iso_stream *cis_lll;
-		struct lll_conn_iso_group *cig_lll;
 
 		cis_lll = ull_conn_iso_lll_stream_get(cis_handle_curr);
 		cig_lll = param;
@@ -431,6 +419,13 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param)
 	err = lll_hfclock_off();
 	LL_ASSERT(err >= 0);
 
+	/* Get reference to CIG LLL context */
+	cig_lll = prepare_param->param;
+
+	/* Accumulate the latency as event is aborted while being in pipeline */
+	cig_lll->lazy_prepare = prepare_param->lazy;
+	cig_lll->latency_prepare += (cig_lll->lazy_prepare + 1U);
+
 	lll_done(param);
 }
 

From e252e6237baf1a27dffeeba8f82510be4220a515 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Tue, 28 Jan 2025 09:02:53 +0100
Subject: [PATCH 2418/2913] [nrf fromtree] Bluetooth: Controller: Fix Connected
 ISO to use accumulated latency

Fix Connected ISO to use accumulated latency to update the
payload count.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 3bf330855edb734f62a8cdff0506a017b30bdfcf)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c   | 4 ++--
 .../controller/ll_sw/nordic/lll/lll_peripheral_iso.c          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c
index 8fe4453409c..065b058f8fd 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c
@@ -171,7 +171,7 @@ static int prepare_cb(struct lll_prepare_param *p)
 	se_curr = 1U;
 
 	/* Adjust the SN and NESN for skipped CIG events */
-	payload_count_lazy_update(cis_lll, lazy);
+	payload_count_lazy_update(cis_lll, cig_lll->latency_event);
 
 	/* Start setting up of Radio h/w */
 	radio_reset();
@@ -358,7 +358,7 @@ static int prepare_cb(struct lll_prepare_param *p)
 		cis_lll = ull_conn_iso_lll_stream_get_by_group(cig_lll, &cis_handle);
 		if (cis_lll && cis_lll->active) {
 			/* Adjust sn and nesn for skipped CIG events */
-			payload_count_lazy_update(cis_lll, lazy);
+			payload_count_lazy_update(cis_lll, cig_lll->latency_event);
 
 			/* Adjust sn and nesn for canceled events */
 			if (err) {
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c
index 1c2d3c3267f..3ff20706dc6 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c
@@ -204,7 +204,7 @@ static int prepare_cb(struct lll_prepare_param *p)
 	se_curr = 1U;
 
 	/* Adjust sn and nesn for skipped CIG events */
-	payload_count_lazy(cis_lll, cig_lll->lazy_prepare);
+	payload_count_lazy(cis_lll, cig_lll->latency_event);
 
 	/* Start setting up of Radio h/w */
 	radio_reset();
@@ -375,7 +375,7 @@ static int prepare_cb(struct lll_prepare_param *p)
 		}
 
 		/* Adjust sn and nesn for skipped CIG events */
-		payload_count_lazy(cis_lll, cig_lll->lazy_prepare);
+		payload_count_lazy(cis_lll, cig_lll->latency_event);
 
 		/* Adjust sn and nesn for canceled events */
 		if (err) {

From cf5bed0d56627d8355a20482904ee75acc19985b Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Tue, 28 Jan 2025 09:44:06 +0100
Subject: [PATCH 2419/2913] [nrf fromtree] Bluetooth: Controller: Fix incorrect
 event_count when CIG overlaps

Fix incorrect event_count use in CIG events when the next
CIG interval's prepare overlaps with the current CIG event.
Use separate event_count_prepare variable in ULL and copy
the value in LLL event.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit be91cfedfb54f9022dc0aa02c577b57b35f887a4)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 subsys/bluetooth/controller/ll_sw/lll_conn_iso.h     |  3 ++-
 .../controller/ll_sw/nordic/lll/lll_central_iso.c    |  6 ++++++
 .../controller/ll_sw/nordic/lll/lll_peripheral_iso.c |  6 ++++++
 subsys/bluetooth/controller/ll_sw/ull_central_iso.c  |  5 +++++
 subsys/bluetooth/controller/ll_sw/ull_conn_iso.c     | 12 ++++++------
 .../bluetooth/controller/ll_sw/ull_peripheral_iso.c  |  5 +++++
 6 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/lll_conn_iso.h b/subsys/bluetooth/controller/ll_sw/lll_conn_iso.h
index 31e2f70fcd6..676c574155e 100644
--- a/subsys/bluetooth/controller/ll_sw/lll_conn_iso.h
+++ b/subsys/bluetooth/controller/ll_sw/lll_conn_iso.h
@@ -45,7 +45,8 @@ struct lll_conn_iso_stream {
 	struct lll_conn_iso_stream_rxtx tx; /* TX parameters */
 
 	/* Event and payload counters */
-	uint64_t event_count:39;    /* cisEventCount */
+	uint64_t event_count_prepare:39; /* cisEventCount in overlapping CIG prepare */
+	uint64_t event_count:39;         /* cisEventCount in current CIG event */
 
 	/* Acknowledgment and flow control */
 	uint8_t sn:1;               /* Sequence number */
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c
index 065b058f8fd..526403e92d9 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c
@@ -150,6 +150,9 @@ static int prepare_cb(struct lll_prepare_param *p)
 	/* Get reference to ACL context */
 	conn_lll = ull_conn_lll_get(cis_lll->acl_handle);
 
+	/* Pick the event_count calculated in the ULL prepare */
+	cis_lll->event_count = cis_lll->event_count_prepare;
+
 	/* Event counter value,  0-15 bit of cisEventCounter */
 	event_counter = cis_lll->event_count;
 
@@ -357,6 +360,9 @@ static int prepare_cb(struct lll_prepare_param *p)
 	do {
 		cis_lll = ull_conn_iso_lll_stream_get_by_group(cig_lll, &cis_handle);
 		if (cis_lll && cis_lll->active) {
+			/* Pick the event_count calculated in the ULL prepare */
+			cis_lll->event_count = cis_lll->event_count_prepare;
+
 			/* Adjust sn and nesn for skipped CIG events */
 			payload_count_lazy_update(cis_lll, cig_lll->latency_event);
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c
index 3ff20706dc6..00e641fd151 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c
@@ -164,6 +164,9 @@ static int prepare_cb(struct lll_prepare_param *p)
 	/* Get reference to ACL context */
 	conn_lll = ull_conn_lll_get(cis_lll->acl_handle);
 
+	/* Pick the event_count calculated in the ULL prepare */
+	cis_lll->event_count = cis_lll->event_count_prepare;
+
 	/* Event counter value,  0-15 bit of cisEventCounter */
 	event_counter = cis_lll->event_count;
 
@@ -374,6 +377,9 @@ static int prepare_cb(struct lll_prepare_param *p)
 			break;
 		}
 
+		/* Pick the event_count calculated in the ULL prepare */
+		cis_lll->event_count = cis_lll->event_count_prepare;
+
 		/* Adjust sn and nesn for skipped CIG events */
 		payload_count_lazy(cis_lll, cig_lll->latency_event);
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_central_iso.c b/subsys/bluetooth/controller/ll_sw/ull_central_iso.c
index fa3e3715664..d49256e3b09 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_central_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_central_iso.c
@@ -929,6 +929,11 @@ uint8_t ull_central_iso_setup(uint16_t cis_handle,
 #if defined(CONFIG_BT_CTLR_ISOAL_PSN_IGNORE)
 	cis->pkt_seq_num = 0U;
 #endif /* CONFIG_BT_CTLR_ISOAL_PSN_IGNORE */
+	/* It is intentional to initialize to the 39 bit maximum value and rollover to 0 in the
+	 * prepare function, the event counter is pre-incremented in prepare function for the
+	 * current ISO event.
+	 */
+	cis->lll.event_count_prepare = LLL_CONN_ISO_EVENT_COUNT_MAX;
 	cis->lll.event_count = LLL_CONN_ISO_EVENT_COUNT_MAX;
 	cis->lll.next_subevent = 0U;
 	cis->lll.tifs_us = conn->lll.tifs_cis_us;
diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn_iso.c b/subsys/bluetooth/controller/ll_sw/ull_conn_iso.c
index a55d023668f..b25267a34bd 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_conn_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_conn_iso.c
@@ -711,17 +711,17 @@ void ull_conn_iso_ticker_cb(uint32_t ticks_at_expire, uint32_t ticks_drift,
 		 * has been reached, and offset calculated.
 		 */
 		if (cis->lll.handle != 0xFFFF && cis->lll.active) {
-			cis->lll.event_count += (lazy + 1U);
+			cis->lll.event_count_prepare += (lazy + 1U);
 
 #if !defined(CONFIG_BT_CTLR_JIT_SCHEDULING)
-			cis->lll.event_count -= cis->lll.lazy_active;
+			cis->lll.event_count_prepare -= cis->lll.lazy_active;
 			cis->lll.lazy_active = 0U;
 #endif /* !CONFIG_BT_CTLR_JIT_SCHEDULING */
 
 			leading_event_count = MAX(leading_event_count,
-						cis->lll.event_count);
+						cis->lll.event_count_prepare);
 
-			ull_iso_lll_event_prepare(cis->lll.handle, cis->lll.event_count);
+			ull_iso_lll_event_prepare(cis->lll.handle, cis->lll.event_count_prepare);
 		}
 
 		/* Latch datapath validity entering event */
@@ -975,7 +975,7 @@ void ull_conn_iso_start(struct ll_conn *conn, uint16_t cis_handle,
 				cis_offset = cis->offset + iso_interval_us - acl_latency_us;
 			}
 
-			cis->lll.event_count += lost_cig_events;
+			cis->lll.event_count_prepare += lost_cig_events;
 
 			lost_payloads = (lost_cig_events - (cis->lll.rx.ft - 1)) * cis->lll.rx.bn;
 			cis->lll.rx.payload_count += lost_payloads;
@@ -1520,7 +1520,7 @@ void ull_conn_iso_transmit_test_cig_interval(uint16_t handle, uint32_t ticks_at_
 		 * on 64-bit sdu_counter:
 		 *   (39 bits x 22 bits (4x10^6 us) = 61 bits / 8 bits (255 us) = 53 bits)
 		 */
-		sdu_counter = DIV_ROUND_UP((cis->lll.event_count + 1U) * iso_interval,
+		sdu_counter = DIV_ROUND_UP((cis->lll.event_count_prepare + 1U) * iso_interval,
 					       sdu_interval);
 
 		if (cis->hdr.test_mode.tx.sdu_counter == 0U) {
diff --git a/subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c b/subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c
index 345fddb8746..77b3f240f1b 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c
@@ -333,6 +333,11 @@ uint8_t ull_peripheral_iso_setup(struct pdu_data_llctrl_cis_ind *ind,
 #if defined(CONFIG_BT_CTLR_ISOAL_PSN_IGNORE)
 	cis->pkt_seq_num = 0U;
 #endif /* CONFIG_BT_CTLR_ISOAL_PSN_IGNORE */
+	/* It is intentional to initialize to the 39 bit maximum value and rollover to 0 in the
+	 * prepare function, the event counter is pre-incremented in prepare function for the
+	 * current ISO event.
+	 */
+	cis->lll.event_count_prepare = LLL_CONN_ISO_EVENT_COUNT_MAX;
 	cis->lll.event_count = LLL_CONN_ISO_EVENT_COUNT_MAX;
 	cis->lll.next_subevent = 0U;
 	cis->lll.tifs_us = conn->lll.tifs_cis_us;

From 4a2ebc470e9effdddf62a1deda787186a0166a51 Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Tue, 4 Feb 2025 11:03:34 +0100
Subject: [PATCH 2420/2913] [nrf fromtree] Bluetooth: Controller: Fix coverity
 issue for cis == NULL

Coverity was unhappy that
`struct ll_conn_iso_stream *cis = NULL;` was never assigned to
a non-NULL value, which is due to the assignment being
guarded by `#if defined(CONFIG_BT_CTLR_CONN_ISO)`.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit a9279eef350f9e01fd13c8fedc156b40a8c425b4)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 subsys/bluetooth/controller/ll_sw/ull_iso.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/ull_iso.c b/subsys/bluetooth/controller/ll_sw/ull_iso.c
index 2e34cef275f..f10b4c15f11 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_iso.c
@@ -4,11 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stddef.h>
+
 #include <soc.h>
 #include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/buf.h>
+#include <zephyr/sys/util_macro.h>
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
@@ -233,10 +236,7 @@ uint8_t ll_setup_iso_path(uint16_t handle, uint8_t path_dir, uint8_t path_id,
 	ARG_UNUSED(controller_delay);
 	ARG_UNUSED(codec_config);
 
-	if (false) {
-
-#if defined(CONFIG_BT_CTLR_CONN_ISO)
-	} else if (IS_CIS_HANDLE(handle)) {
+	if (IS_ENABLED(CONFIG_BT_CTLR_CONN_ISO) && IS_CIS_HANDLE(handle)) {
 		struct ll_conn_iso_group *cig;
 		struct ll_conn *conn;
 
@@ -307,8 +307,6 @@ uint8_t ll_setup_iso_path(uint16_t handle, uint8_t path_dir, uint8_t path_id,
 				sdu_interval = cig->c_sdu_interval;
 			}
 		}
-#endif /* CONFIG_BT_CTLR_CONN_ISO */
-
 #if defined(CONFIG_BT_CTLR_ADV_ISO)
 	} else if (IS_ADV_ISO_HANDLE(handle)) {
 		struct ll_adv_iso_set *adv_iso;
@@ -450,7 +448,7 @@ uint8_t ll_setup_iso_path(uint16_t handle, uint8_t path_dir, uint8_t path_id,
 		}
 
 		if (!err) {
-			if (cis) {
+			if (IS_ENABLED(CONFIG_BT_CTLR_CONN_ISO) && cis != NULL) {
 				cis->hdr.datapath_out = dp;
 			}
 

From c368cd7235125bd55995ec14b344d7d78091b0ac Mon Sep 17 00:00:00 2001
From: Mariusz Skamra <mariusz.skamra@codecoup.pl>
Date: Thu, 6 Feb 2025 11:51:42 +0100
Subject: [PATCH 2421/2913] [nrf fromtree] Bluetooth: Controller: Fix LE Create
 BIG Complete event parameter

This fixes uninitialized iso_interval parameter in
bt_hci_evt_le_big_complete.

Signed-off-by: Mariusz Skamra <mariusz.skamra@codecoup.pl>
(cherry picked from commit 6723625336611a6627564f05eefe55b3fb6fcfc9)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 subsys/bluetooth/controller/hci/hci.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/subsys/bluetooth/controller/hci/hci.c b/subsys/bluetooth/controller/hci/hci.c
index e553345f5ad..fcf50b5322f 100644
--- a/subsys/bluetooth/controller/hci/hci.c
+++ b/subsys/bluetooth/controller/hci/hci.c
@@ -8180,6 +8180,7 @@ static void le_big_complete(struct pdu_data *pdu_data,
 	sep->pto = lll->pto;
 	sep->irc = lll->irc;
 	sep->max_pdu = sys_cpu_to_le16(lll->max_pdu);
+	sep->iso_interval = sys_cpu_to_le16(lll->iso_interval);
 	sep->num_bis = lll->num_bis;
 
 	/* Connection handle list of all BISes in the BIG */

From 855ecdb910154dc92916bd6b41e2e5570d165e62 Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Tue, 4 Feb 2025 11:33:19 +0100
Subject: [PATCH 2422/2913] [nrf fromtree] Bluetooth: Controller: Fix casting
 in radio_aa_set for BASE0

We have previously fixed an issue with shifting and
assigning the value without a cast, but coverity
is still complaining about aa[1] and aa[0] with:

"Casting narrower unsigned aa[1] to wider signed type
int effectively tests its lower bound."

Using the common function, sys_get_le24, should fix this issue.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit 9fca7ee3a546e82694dc4bd1fae4ff8a329444e2)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
index 3734a575dc0..fab5618a4d8 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
@@ -405,7 +405,7 @@ void radio_aa_set(const uint8_t *aa)
 	NRF_RADIO->RXADDRESSES =
 	    ((RADIO_RXADDRESSES_ADDR0_Enabled) << RADIO_RXADDRESSES_ADDR0_Pos);
 	NRF_RADIO->PREFIX0 = aa[3];
-	NRF_RADIO->BASE0 = (((uint32_t) aa[2]) << 24) | (aa[1] << 16) | (aa[0] << 8);
+	NRF_RADIO->BASE0 = sys_get_le24(aa) << 8;
 }
 
 void radio_pkt_configure(uint8_t bits_len, uint8_t max_len, uint8_t flags)

From 59ae559950b0ae24d7edd4496944568fcfdbc1ad Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Fri, 4 Oct 2024 19:10:11 +0200
Subject: [PATCH 2423/2913] [nrf fromtree] Bluetooth: Controller: Fix
 BT_CTLR_LOW_LAT_ULL conditional code

Fix BT_CTLR_LOW_LAT_ULL conditional compilation code by
decoupling it from BT_CTLR_LOW_LAT code.

BT_CTLR_LOW_LAT_ULL makes ULL execution context to tailchain
in comparison to continuously process in a while loop.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 5119896c7d7484b3b1aadf55a403b0f183a6e946)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../controller/ll_sw/nordic/lll/lll_conn.c       |  4 ++--
 subsys/bluetooth/controller/ll_sw/ull_conn.c     | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
index effc2069ae5..3ff4e29efea 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
@@ -771,9 +771,9 @@ void lll_conn_isr_tx(void *param)
 
 	radio_isr_set(lll_conn_isr_rx, param);
 
-#if defined(CONFIG_BT_CTLR_LOW_LAT_ULL)
+#if defined(CONFIG_BT_CTLR_LOW_LAT)
 	ull_conn_lll_tx_demux_sched(lll);
-#endif /* CONFIG_BT_CTLR_LOW_LAT_ULL */
+#endif /* CONFIG_BT_CTLR_LOW_LAT */
 }
 
 void lll_conn_rx_pkt_set(struct lll_conn *lll)
diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn.c b/subsys/bluetooth/controller/ll_sw/ull_conn.c
index 459e079cb23..7661bfa6dd2 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_conn.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_conn.c
@@ -82,9 +82,9 @@
 LOG_MODULE_REGISTER(bt_ctlr_ull_conn);
 
 static int init_reset(void);
-#if !defined(CONFIG_BT_CTLR_LOW_LAT_ULL)
+#if !defined(CONFIG_BT_CTLR_LOW_LAT)
 static void tx_demux_sched(struct ll_conn *conn);
-#endif /* CONFIG_BT_CTLR_LOW_LAT_ULL */
+#endif /* CONFIG_BT_CTLR_LOW_LAT */
 static void tx_demux(void *param);
 static struct node_tx *tx_ull_dequeue(struct ll_conn *conn, struct node_tx *tx);
 
@@ -240,7 +240,7 @@ int ll_tx_mem_enqueue(uint16_t handle, void *tx)
 
 	MFIFO_ENQUEUE(conn_tx, idx);
 
-#if !defined(CONFIG_BT_CTLR_LOW_LAT_ULL)
+#if !defined(CONFIG_BT_CTLR_LOW_LAT)
 	if (ull_ref_get(&conn->ull)) {
 #if defined(CONFIG_BT_CTLR_FORCE_MD_AUTO)
 		if (tx_cnt >= CONFIG_BT_BUF_ACL_TX_COUNT) {
@@ -261,7 +261,7 @@ int ll_tx_mem_enqueue(uint16_t handle, void *tx)
 		lll_conn_force_md_cnt_set(0U);
 #endif /* CONFIG_BT_CTLR_FORCE_MD_AUTO */
 	}
-#endif /* !CONFIG_BT_CTLR_LOW_LAT_ULL */
+#endif /* !CONFIG_BT_CTLR_LOW_LAT */
 
 	if (IS_ENABLED(CONFIG_BT_PERIPHERAL) && conn->lll.role) {
 		ull_periph_latency_cancel(conn, handle);
@@ -1395,7 +1395,7 @@ void ull_conn_done(struct node_rx_event_done *done)
 	}
 }
 
-#if defined(CONFIG_BT_CTLR_LOW_LAT_ULL)
+#if defined(CONFIG_BT_CTLR_LOW_LAT)
 void ull_conn_lll_tx_demux_sched(struct lll_conn *lll)
 {
 	static memq_link_t link;
@@ -1405,7 +1405,7 @@ void ull_conn_lll_tx_demux_sched(struct lll_conn *lll)
 
 	mayfly_enqueue(TICKER_USER_ID_LLL, TICKER_USER_ID_ULL_HIGH, 1U, &mfy);
 }
-#endif /* CONFIG_BT_CTLR_LOW_LAT_ULL */
+#endif /* CONFIG_BT_CTLR_LOW_LAT */
 
 void ull_conn_tx_demux(uint8_t count)
 {
@@ -1702,7 +1702,7 @@ static int init_reset(void)
 	return 0;
 }
 
-#if !defined(CONFIG_BT_CTLR_LOW_LAT_ULL)
+#if !defined(CONFIG_BT_CTLR_LOW_LAT)
 static void tx_demux_sched(struct ll_conn *conn)
 {
 	static memq_link_t link;
@@ -1712,7 +1712,7 @@ static void tx_demux_sched(struct ll_conn *conn)
 
 	mayfly_enqueue(TICKER_USER_ID_THREAD, TICKER_USER_ID_ULL_HIGH, 0U, &mfy);
 }
-#endif /* !CONFIG_BT_CTLR_LOW_LAT_ULL */
+#endif /* !CONFIG_BT_CTLR_LOW_LAT */
 
 static void tx_demux(void *param)
 {

From 02e286678cbcffa9cca70e54fd67f902d4715e85 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Thu, 30 Jan 2025 09:44:55 +0100
Subject: [PATCH 2424/2913] [nrf fromtree] Bluetooth: Controller: Fix device
 address in Periodic Adv Sync

Fix incorrect device address reported in the LE Periodic
Advertising Sync Established event when using Periodic
Advertiser List.

During Extended Scanning there can be an ADV_EXT_IND PDU
received between currently being received ADV_EXT_IND PDU
and AUX_ADV_IND PDU; if the one received between has an
address match then incorrectly the Periodic Synchronization
was established to the device whos AUX_ADV_IND PDU is being
received. Fix by storing the auxiliary context that has the
address match and compare with it when matching the SID in
SyncInfo of AUX_ADV_IND PDU being received prior to creating
the synchronization.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 83e2ec3c9b17f410adc5d960b0b386f6212d75ed)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../bluetooth/controller/ll_sw/ull_scan_aux.c | 87 ++++++++++++++++---
 .../controller/ll_sw/ull_scan_types.h         |  5 ++
 subsys/bluetooth/controller/ll_sw/ull_sync.c  | 19 ++--
 .../controller/ll_sw/ull_sync_internal.h      |  2 +-
 4 files changed, 94 insertions(+), 19 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c b/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
index 312cabdfc67..08d2a9c93aa 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
@@ -444,19 +444,30 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_pdu *rx)
 
 	ptr = h->data;
 
+#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
+	bool is_aux_addr_match = false;
+#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
+
 	if (h->adv_addr) {
 #if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
 		/* Check if Periodic Advertising Synchronization to be created
 		 */
 		if (sync && (scan->periodic.state != LL_SYNC_STATE_CREATED)) {
-			/* Check address and update internal state */
 #if defined(CONFIG_BT_CTLR_PRIVACY)
-			ull_sync_setup_addr_check(sync, scan, pdu->tx_addr, ptr,
-						  ftr->rl_idx);
+			uint8_t rl_idx = ftr->rl_idx;
 #else /* !CONFIG_BT_CTLR_PRIVACY */
-			ull_sync_setup_addr_check(sync, scan, pdu->tx_addr, ptr, 0U);
+			uint8_t rl_idx = 0U;
 #endif /* !CONFIG_BT_CTLR_PRIVACY */
 
+			/* Check address and update internal state */
+			is_aux_addr_match =
+				ull_sync_setup_addr_check(sync, scan->periodic.filter_policy,
+							  pdu->tx_addr, ptr, rl_idx);
+			if (is_aux_addr_match) {
+				scan->periodic.state = LL_SYNC_STATE_ADDR_MATCH;
+			} else {
+				scan->periodic.state = LL_SYNC_STATE_IDLE;
+			}
 		}
 #endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
 
@@ -489,14 +500,21 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_pdu *rx)
 		si = (void *)ptr;
 		ptr += sizeof(*si);
 
+#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
 		/* Check if Periodic Advertising Synchronization to be created.
 		 * Setup synchronization if address and SID match in the
 		 * Periodic Advertiser List or with the explicitly supplied.
+		 *
+		 * is_aux_addr_match, device address in auxiliary channel PDU;
+		 * scan->periodic.param has not been assigned yet.
+		 * Otherwise, address was in primary channel PDU and we are now
+		 * checking SID (in SyncInfo) in auxiliary channel PDU.
 		 */
-		if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_PERIODIC) && aux && sync && adi &&
+		if (sync && aux && (is_aux_addr_match || (scan->periodic.param == aux)) && adi &&
 		    ull_sync_setup_sid_match(sync, scan, PDU_ADV_ADI_SID_GET(adi))) {
 			ull_sync_setup(scan, aux->lll.phy, rx, si);
 		}
+#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
 	}
 
 	if (h->tx_pwr) {
@@ -692,6 +710,15 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_pdu *rx)
 #endif /* CONFIG_BT_CTLR_JIT_SCHEDULING */
 
 #if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
+		/* Store the aux context that has Periodic Advertising
+		 * Synchronization address match.
+		 */
+		if (sync && (scan->periodic.state == LL_SYNC_STATE_ADDR_MATCH)) {
+			scan->periodic.param = aux;
+		}
+
+		/* Store the node rx allocated for incomplete report, if needed.
+		 */
 		aux->rx_incomplete = rx_incomplete;
 		rx_incomplete = NULL;
 #endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
@@ -916,6 +943,7 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_pdu *rx)
 #if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
 	if (sync && (scan->periodic.state != LL_SYNC_STATE_CREATED)) {
 		scan->periodic.state = LL_SYNC_STATE_IDLE;
+		scan->periodic.param = NULL;
 	}
 #endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
 
@@ -1518,7 +1546,16 @@ static void ticker_op_cb(uint32_t status, void *param)
 }
 
 #else /* CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS */
-
+/* NOTE: BT_CTLR_SCAN_AUX_USE_CHAINS is alternative new design with less RAM
+ *       usage for supporting Extended Scanning of simultaneous interleaved
+ *       Extended Advertising chains.
+ *
+ * TODO: As the previous design has Bluetooth Qualified Design Listing by
+ *       Nordic Semiconductor ASA, both implementation are present in this file,
+ *       and default builds use CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=n. Remove old
+ *       implementation when we have a new Bluetooth Qualified Design Listing
+ *       with the new Extended Scanning and Periodic Sync implementation.
+ */
 void ull_scan_aux_setup(memq_link_t *link, struct node_rx_pdu *rx)
 {
 	struct node_rx_pdu *rx_incomplete;
@@ -1778,19 +1815,30 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_pdu *rx)
 
 	ptr = h->data;
 
+#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
+	bool is_aux_addr_match = false;
+#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
+
 	if (h->adv_addr) {
 #if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
 		/* Check if Periodic Advertising Synchronization to be created
 		 */
 		if (sync && (scan->periodic.state != LL_SYNC_STATE_CREATED)) {
-			/* Check address and update internal state */
 #if defined(CONFIG_BT_CTLR_PRIVACY)
-			ull_sync_setup_addr_check(sync, scan, pdu->tx_addr, ptr,
-						  ftr->rl_idx);
+			uint8_t rl_idx = ftr->rl_idx;
 #else /* !CONFIG_BT_CTLR_PRIVACY */
-			ull_sync_setup_addr_check(sync, scan, pdu->tx_addr, ptr, 0U);
+			uint8_t rl_idx = 0U;
 #endif /* !CONFIG_BT_CTLR_PRIVACY */
 
+			/* Check address and update internal state */
+			is_aux_addr_match =
+				ull_sync_setup_addr_check(sync, scan->periodic.filter_policy,
+							  pdu->tx_addr, ptr, rl_idx);
+			if (is_aux_addr_match) {
+				scan->periodic.state = LL_SYNC_STATE_ADDR_MATCH;
+			} else {
+				scan->periodic.state = LL_SYNC_STATE_IDLE;
+			}
 		}
 #endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
 
@@ -1823,14 +1871,21 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_pdu *rx)
 		si = (void *)ptr;
 		ptr += sizeof(*si);
 
+#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
 		/* Check if Periodic Advertising Synchronization to be created.
 		 * Setup synchronization if address and SID match in the
 		 * Periodic Advertiser List or with the explicitly supplied.
+		 *
+		 * is_aux_addr_match, device address in auxiliary channel PDU;
+		 * scan->periodic.param has not been assigned yet.
+		 * Otherwise, address was in primary channel PDU and we are now
+		 * checking SID (in SyncInfo) in auxiliary channel PDU.
 		 */
-		if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_PERIODIC) && chain && sync && adi &&
-		    ull_sync_setup_sid_match(sync, scan, PDU_ADV_ADI_SID_GET(adi))) {
+		if (sync && chain && (is_aux_addr_match || (scan->periodic.param == chain)) &&
+		    adi && ull_sync_setup_sid_match(sync, scan, PDU_ADV_ADI_SID_GET(adi))) {
 			ull_sync_setup(scan, chain->lll.phy, rx, si);
 		}
+#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
 	}
 
 	if (h->tx_pwr) {
@@ -2012,6 +2067,13 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_pdu *rx)
 #endif /* CONFIG_BT_CTLR_JIT_SCHEDULING */
 
 #if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
+		/* Store the chain context that has Periodic Advertising
+		 * Synchronization address match.
+		 */
+		if (sync && (scan->periodic.state == LL_SYNC_STATE_ADDR_MATCH)) {
+			scan->periodic.param = chain;
+		}
+
 		if (sync_lll) {
 			struct ll_sync_set *sync_set = HDR_LLL2ULL(sync_lll);
 
@@ -2153,6 +2215,7 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_pdu *rx)
 #if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
 	if (sync && (scan->periodic.state != LL_SYNC_STATE_CREATED)) {
 		scan->periodic.state = LL_SYNC_STATE_IDLE;
+		scan->periodic.param = NULL;
 	}
 #endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_scan_types.h b/subsys/bluetooth/controller/ll_sw/ull_scan_types.h
index c9d2c073f8f..f4458825a5a 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_scan_types.h
+++ b/subsys/bluetooth/controller/ll_sw/ull_scan_types.h
@@ -31,6 +31,11 @@ struct ll_scan_set {
 		 * cancelling sync create, hence the volatile keyword.
 		 */
 		struct ll_sync_set *volatile sync;
+
+		/* Non-NULL when Periodic Advertising Synchronisation address
+		 * matched.
+		 */
+		void *param;
 	} periodic;
 #endif
 };
diff --git a/subsys/bluetooth/controller/ll_sw/ull_sync.c b/subsys/bluetooth/controller/ll_sw/ull_sync.c
index 63e9e7ef57c..9094366716f 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_sync.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_sync.c
@@ -152,11 +152,13 @@ uint8_t ll_sync_create(uint8_t options, uint8_t sid, uint8_t adv_addr_type,
 
 	scan->periodic.cancelled = 0U;
 	scan->periodic.state = LL_SYNC_STATE_IDLE;
+	scan->periodic.param = NULL;
 	scan->periodic.filter_policy =
 		options & BT_HCI_LE_PER_ADV_CREATE_SYNC_FP_USE_LIST;
 	if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) {
 		scan_coded->periodic.cancelled = 0U;
 		scan_coded->periodic.state = LL_SYNC_STATE_IDLE;
+		scan_coded->periodic.param = NULL;
 		scan_coded->periodic.filter_policy =
 			scan->periodic.filter_policy;
 	}
@@ -880,12 +882,12 @@ void ull_sync_release(struct ll_sync_set *sync)
 	mem_release(sync, &sync_free);
 }
 
-void ull_sync_setup_addr_check(struct ll_sync_set *sync, struct ll_scan_set *scan,
+bool ull_sync_setup_addr_check(struct ll_sync_set *sync, uint8_t filter_policy,
 			       uint8_t addr_type, uint8_t *addr, uint8_t rl_idx)
 {
 	/* Check if Periodic Advertiser list to be used */
 	if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_PERIODIC_ADV_LIST) &&
-	    scan->periodic.filter_policy) {
+	    filter_policy) {
 		/* Check in Periodic Advertiser List */
 		if (ull_filter_ull_pal_addr_match(addr_type, addr)) {
 			/* Remember the address, to check with
@@ -896,7 +898,7 @@ void ull_sync_setup_addr_check(struct ll_sync_set *sync, struct ll_scan_set *sca
 				     BDADDR_SIZE);
 
 			/* Address matched */
-			scan->periodic.state = LL_SYNC_STATE_ADDR_MATCH;
+			return true;
 
 		/* Check in Resolving List */
 		} else if (IS_ENABLED(CONFIG_BT_CTLR_PRIVACY) &&
@@ -911,14 +913,14 @@ void ull_sync_setup_addr_check(struct ll_sync_set *sync, struct ll_scan_set *sca
 			sync->peer_addr_resolved = 1U;
 
 			/* Address matched */
-			scan->periodic.state = LL_SYNC_STATE_ADDR_MATCH;
+			return true;
 		}
 
 	/* Check with explicitly supplied address */
 	} else if ((addr_type == sync->peer_id_addr_type) &&
 		   !memcmp(addr, sync->peer_id_addr, BDADDR_SIZE)) {
 		/* Address matched */
-		scan->periodic.state = LL_SYNC_STATE_ADDR_MATCH;
+		return true;
 
 	/* Check identity address with explicitly supplied address */
 	} else if (IS_ENABLED(CONFIG_BT_CTLR_PRIVACY) &&
@@ -930,9 +932,11 @@ void ull_sync_setup_addr_check(struct ll_sync_set *sync, struct ll_scan_set *sca
 			sync->peer_addr_resolved = 1U;
 
 			/* Identity address matched */
-			scan->periodic.state = LL_SYNC_STATE_ADDR_MATCH;
+			return true;
 		}
 	}
+
+	return false;
 }
 
 bool ull_sync_setup_sid_match(struct ll_sync_set *sync, struct ll_scan_set *scan, uint8_t sid)
@@ -1060,6 +1064,7 @@ void ull_sync_setup(struct ll_scan_set *scan, uint8_t phy,
 
 	/* Set the state to sync create */
 	scan->periodic.state = LL_SYNC_STATE_CREATED;
+	scan->periodic.param = NULL;
 	if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) {
 		struct ll_scan_set *scan_1m;
 
@@ -1069,8 +1074,10 @@ void ull_sync_setup(struct ll_scan_set *scan, uint8_t phy,
 
 			scan_coded = ull_scan_set_get(SCAN_HANDLE_PHY_CODED);
 			scan_coded->periodic.state = LL_SYNC_STATE_CREATED;
+			scan_coded->periodic.param = NULL;
 		} else {
 			scan_1m->periodic.state = LL_SYNC_STATE_CREATED;
+			scan_1m->periodic.param = NULL;
 		}
 	}
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_sync_internal.h b/subsys/bluetooth/controller/ll_sw/ull_sync_internal.h
index 79f2f3d67de..e8111a783c9 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_sync_internal.h
+++ b/subsys/bluetooth/controller/ll_sw/ull_sync_internal.h
@@ -9,7 +9,7 @@ int ull_sync_reset(void);
 uint16_t ull_sync_handle_get(struct ll_sync_set *sync);
 struct ll_sync_set *ull_sync_is_enabled_get(uint16_t handle);
 void ull_sync_release(struct ll_sync_set *sync);
-void ull_sync_setup_addr_check(struct ll_sync_set *sync, struct ll_scan_set *scan,
+bool ull_sync_setup_addr_check(struct ll_sync_set *sync, uint8_t filter_policy,
 			       uint8_t addr_type, uint8_t *addr, uint8_t rl_idx);
 bool ull_sync_setup_sid_match(struct ll_sync_set *sync, struct ll_scan_set *scan, uint8_t sid);
 void ull_sync_create_from_sync_transfer(uint16_t conn_handle,  uint16_t service_data,

From 7e22b4a1856c22c52b1596da8f257a364c91cb03 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Fri, 7 Feb 2025 06:18:21 +0100
Subject: [PATCH 2425/2913] [nrf fromtree] Bluetooth: Controller: Fix
 sync_delay and latency in LE BIG Complete

Fix missing sync_delay and transport_latency information in HCI
LE BIG Complete event.

Relates to commit 1a640e47111e ("Bluetooth: controller:
Included transport latency in LE_Big_Established").

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 8ebc4f3384585eb32028dac558f5db7ef320b53a)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 subsys/bluetooth/controller/hci/hci.c | 36 ++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/subsys/bluetooth/controller/hci/hci.c b/subsys/bluetooth/controller/hci/hci.c
index fcf50b5322f..ba6609f7532 100644
--- a/subsys/bluetooth/controller/hci/hci.c
+++ b/subsys/bluetooth/controller/hci/hci.c
@@ -8152,8 +8152,11 @@ static void le_big_complete(struct pdu_data *pdu_data,
 			    struct net_buf *buf)
 {
 	struct bt_hci_evt_le_big_complete *sep;
+	uint32_t transport_latency_big;
 	struct ll_adv_iso_set *adv_iso;
+	uint32_t iso_interval_us;
 	struct lll_adv_iso *lll;
+	uint32_t big_sync_delay;
 	size_t evt_size;
 
 	adv_iso = node_rx->rx_ftr.param;
@@ -8170,9 +8173,36 @@ static void le_big_complete(struct pdu_data *pdu_data,
 		return;
 	}
 
-	/* FIXME: Fill sync delay and latency */
-	sys_put_le24(0, sep->sync_delay);
-	sys_put_le24(0, sep->latency);
+	/* BT Core v5.4 - Vol 6, Part B, Section 4.4.6.4:
+	 * BIG_Sync_Delay = (Num_BIS – 1) × BIS_Spacing + (NSE – 1) × Sub_Interval + MPT.
+	 *
+	 * BT Core v5.4 - Vol 6, Part G, Section 3.2.1: (Framed)
+	 * Transport_Latenct_BIG = BIG_Sync_Delay + PTO × (NSE / BN – IRC) * ISO_Interval +
+	 *                             ISO_Interval + SDU_Interval
+	 *
+	 * BT Core v5.4 - Vol 6, Part G, Section 3.2.2: (Unframed)
+	 * Transport_Latenct_BIG = BIG_Sync_Delay + (PTO × (NSE / BN – IRC) + 1) * ISO_Interval -
+	 *                             SDU_Interval
+	 */
+	iso_interval_us = lll->iso_interval * ISO_INT_UNIT_US;
+	big_sync_delay = ull_iso_big_sync_delay(lll->num_bis, lll->bis_spacing, lll->nse,
+						lll->sub_interval, lll->phy, lll->max_pdu,
+						lll->enc);
+	sys_put_le24(big_sync_delay, sep->sync_delay);
+
+	if (lll->framing) {
+		/* Framed */
+		transport_latency_big = big_sync_delay +
+					lll->pto * (lll->nse / lll->bn - lll->irc) *
+					iso_interval_us + iso_interval_us + lll->sdu_interval;
+	} else {
+		/* Unframed */
+		transport_latency_big = big_sync_delay +
+					(lll->pto * (lll->nse / lll->bn - lll->irc) + 1) *
+					iso_interval_us - lll->sdu_interval;
+	}
+
+	sys_put_le24(transport_latency_big, sep->latency);
 
 	sep->phy = find_lsb_set(lll->phy);
 	sep->nse = lll->nse;

From 686b58ed9cb36d563bbca6181e30c33fffe5b2ce Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Fri, 7 Feb 2025 19:12:22 +0100
Subject: [PATCH 2426/2913] [nrf fromtree] Bluetooth: Controller: Fix Periodic
 Sync for multiple chain reception

Fix regression introduced in Periodic Advertising
Synchronization due to change related to multiple
Advertising chain reception.

Related commit c334ed515b08 ("Bluetooth: Controller: Fix
multiple Extended Adv chain reception"), and
commit da792a9e1707 ("Bluetooth: Controller: Fix interleaved
extended scanning assert").

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 2461552e192c467212f6ef359870f65ed899c715)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c | 1 +
 subsys/bluetooth/controller/ll_sw/ull_scan_aux.c        | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
index 05c9929ed17..88beb52c836 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
@@ -834,6 +834,7 @@ static int isr_rx(struct lll_sync *lll, uint8_t node_type, uint8_t crc_ok,
 
 			ftr = &(node_rx->rx_ftr);
 			ftr->param = lll;
+			ftr->lll_aux = lll->lll_aux;
 			ftr->aux_failed = 0U;
 			ftr->rssi = (rssi_ready) ? radio_rssi_get() :
 						   BT_HCI_LE_RSSI_NOT_AVAILABLE;
diff --git a/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c b/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
index 08d2a9c93aa..43c4928fd0a 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
@@ -293,7 +293,13 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_pdu *rx)
 			 */
 			sync_lll = ftr->param;
 
-			lll_aux = sync_lll->lll_aux;
+			/* We can not retrieve aux context that was stored in
+			 * lll_sync when superior PDU was handled, as it may be
+			 * reset to NULL before this node rx is processed here.
+			 * The reset happens when new Periodic Advertising chain
+			 * is being received before we process the node here.
+			 */
+			lll_aux =  ftr->lll_aux;
 			LL_ASSERT(lll_aux);
 
 			aux = HDR_LLL2ULL(lll_aux);

From 84483b89fec10635edca3850cfc3da901e92c6c6 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Fri, 7 Feb 2025 19:16:13 +0100
Subject: [PATCH 2427/2913] [nrf fromtree] Bluetooth: Controller: Fix assertion
 terminating Periodic Sync

Fix assertion due to changes introduced to support multiple
advertising chain reception.

Auxiliary context association with the Periodic Sync context
was not cleared due to which when terminating a Periodic
Synchronization triggered an assertion check, under race
conditions, detecting that the auxiliary context was already
released.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 32637290207a583dc183567016670cf9e70e2879)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
index 88beb52c836..babc27c0502 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
@@ -635,6 +635,9 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param)
 	lll = prepare_param->param;
 	lll->skip_prepare += (lll->lazy_prepare + 1U);
 
+	/* Reset Sync context association with any Aux context as the chain reception is aborted. */
+	lll->lll_aux = NULL;
+
 	/* Extra done event, to check sync lost */
 	e = ull_event_done_extra_get();
 	LL_ASSERT(e);
@@ -1185,6 +1188,9 @@ static void isr_rx_done_cleanup(struct lll_sync *lll, uint8_t crc_ok, bool sync_
 {
 	struct event_done_extra *e;
 
+	/* Reset Sync context association with any Aux context as the chain reception is done. */
+	lll->lll_aux = NULL;
+
 	/* Calculate and place the drift information in done event */
 	e = ull_event_done_extra_get();
 	LL_ASSERT(e);

From 8d6cd646b0b070cfcd70afeb72994ad6a429359c Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Fri, 7 Feb 2025 19:23:37 +0100
Subject: [PATCH 2428/2913] [nrf fromtree] Bluetooth: Controller: Fix to
 release aux context stored in node rx

Fix to release aux context stored in node rx, and not in the
superior scan or sync context as the one in the superior scan
or sync context could be reset or have a different new aux
context when multiple advertising chain reception is used.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit a8065926acaccef1255c29522a9b8f86dd83f4cf)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c     | 1 +
 subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan_aux.c | 5 ++++-
 subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c     | 2 ++
 subsys/bluetooth/controller/ll_sw/ull_scan_aux.c            | 4 ++--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
index ba00888580b..710ef8f620c 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
@@ -1100,6 +1100,7 @@ static void isr_done_cleanup(void *param)
 		node_rx2->hdr.type = NODE_RX_TYPE_EXT_AUX_RELEASE;
 
 		node_rx2->rx_ftr.param = lll;
+		node_rx2->rx_ftr.lll_aux = lll->lll_aux;
 
 		ull_rx_put_sched(node_rx2->hdr.link, node_rx2);
 	}
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan_aux.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan_aux.c
index 5d32d0e63cd..7cc128c4852 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan_aux.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan_aux.c
@@ -710,6 +710,7 @@ static void isr_done(void *param)
 		node_rx->hdr.type = NODE_RX_TYPE_EXT_AUX_RELEASE;
 
 		node_rx->rx_ftr.param = lll;
+		node_rx->rx_ftr.lll_aux = lll->lll_aux;
 		node_rx->rx_ftr.aux_failed = 1U;
 
 		ull_rx_put_sched(node_rx->hdr.link, node_rx);
@@ -897,6 +898,7 @@ static void isr_rx(struct lll_scan *lll, struct lll_scan_aux *lll_aux,
 			 * free it.
 			 */
 			node_rx2->rx_ftr.param = lll;
+			node_rx2->rx_ftr.lll_aux = lll->lll_aux;
 
 			ull_rx_put_sched(node_rx2->hdr.link, node_rx2);
 		}
@@ -1620,7 +1622,8 @@ static void isr_rx_connect_rsp(void *param)
 
 		node_rx->hdr.type = NODE_RX_TYPE_EXT_AUX_RELEASE;
 
-		node_rx->rx_ftr.param = lll->lll_aux;
+		node_rx->rx_ftr.param = lll;
+		node_rx->rx_ftr.lll_aux = lll->lll_aux;
 
 		ull_rx_put_sched(node_rx->hdr.link, node_rx);
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
index babc27c0502..7fa1f66f4dd 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
@@ -1152,6 +1152,7 @@ static void isr_rx_aux_chain(void *param)
 		node_rx->hdr.type = NODE_RX_TYPE_EXT_AUX_RELEASE;
 
 		node_rx->rx_ftr.param = lll;
+		node_rx->rx_ftr.lll_aux = lll->lll_aux;
 		node_rx->rx_ftr.aux_failed = 1U;
 
 		ull_rx_put(node_rx->hdr.link, node_rx);
@@ -1250,6 +1251,7 @@ static void isr_done(void *param)
 		node_rx->hdr.type = NODE_RX_TYPE_EXT_AUX_RELEASE;
 
 		node_rx->rx_ftr.param = lll;
+		node_rx->rx_ftr.lll_aux = lll->lll_aux;
 		node_rx->rx_ftr.aux_failed = 1U;
 
 		ull_rx_put_sched(node_rx->hdr.link, node_rx);
diff --git a/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c b/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
index 43c4928fd0a..7de4c201768 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
@@ -1132,7 +1132,7 @@ void ull_scan_aux_release(memq_link_t *link, struct node_rx_pdu *rx)
 		rx->hdr.type = NODE_RX_TYPE_RELEASE;
 
 		lll = rx->rx_ftr.param;
-		lll_aux = lll->lll_aux;
+		lll_aux = rx->rx_ftr.lll_aux;
 
 	} else if (!IS_ENABLED(CONFIG_BT_CTLR_SYNC_PERIODIC) ||
 		   ull_scan_aux_is_valid_get(param_ull)) {
@@ -1151,7 +1151,7 @@ void ull_scan_aux_release(memq_link_t *link, struct node_rx_pdu *rx)
 		sync->data_len = 0U;
 
 		lll = rx->rx_ftr.param;
-		lll_aux = lll->lll_aux;
+		lll_aux = rx->rx_ftr.lll_aux;
 
 		/* Change node type so HCI can dispatch report for truncated
 		 * data properly.

From ba88cc25dd99971745a87bbe7f22efbb79a6c11d Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Thu, 13 Feb 2025 05:58:58 +0100
Subject: [PATCH 2429/2913] [nrf fromtree] Bluetooth: Controller: Fix
 regression in scan aux release

Fix regression in scan aux release now that aux context is
retrieved from the node rx when supporting multiple chain
reception.

Relates to commit a8065926acac ("Bluetooth: Controller: Fix
to release aux context stored in node rx").

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 49642efa41c8fd2230f1527e8e498a720f44d61c)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../controller/ll_sw/nordic/lll/lll_scan.c    |  3 ++
 .../controller/ll_sw/nordic/lll/lll_sync.c    | 19 +++++++++--
 .../bluetooth/controller/ll_sw/ull_scan_aux.c | 34 ++++++++++++++++++-
 3 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
index 710ef8f620c..5f51c55f425 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
@@ -1089,6 +1089,9 @@ static void isr_done_cleanup(void *param)
 		lll->is_stop = 1U;
 	}
 
+	/* LLL scheduled auxiliary PDU reception is_abort on duration expire or
+	 * aborted in the unreserved time space.
+	 */
 	if (lll->is_aux_sched) {
 		struct node_rx_pdu *node_rx2;
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
index 7fa1f66f4dd..6a42da4167d 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
@@ -635,7 +635,13 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param)
 	lll = prepare_param->param;
 	lll->skip_prepare += (lll->lazy_prepare + 1U);
 
-	/* Reset Sync context association with any Aux context as the chain reception is aborted. */
+	/* Reset Sync context association with any Aux context as the chain reception is aborted.
+	 * There is no race with ULL execution context assigning lll_aux as this is prepare being
+	 * aborted and no assignment would be done yet before the superior PDU is received.
+	 * TODO: This code here is redundant as isr_rx_done_cleanup() should ensure it is reset
+	 *       on every periodic sync chain done. Remove it if there is no regression running
+	 *       conformance tests.
+	 */
 	lll->lll_aux = NULL;
 
 	/* Extra done event, to check sync lost */
@@ -819,6 +825,11 @@ static int isr_rx(struct lll_sync *lll, uint8_t node_type, uint8_t crc_ok,
 		if (node_type != NODE_RX_TYPE_EXT_AUX_REPORT) {
 			/* Reset Sync context association with any Aux context
 			 * as a new chain is being setup for reception here.
+			 * TODO: This code here is redundant as
+			 *       isr_rx_done_cleanup() should ensure it is reset
+			 *       on every periodic sync chain done. Remove it if
+			 *       there is no regression running conformance
+			 *       tests.
 			 */
 			lll->lll_aux = NULL;
 
@@ -1189,7 +1200,11 @@ static void isr_rx_done_cleanup(struct lll_sync *lll, uint8_t crc_ok, bool sync_
 {
 	struct event_done_extra *e;
 
-	/* Reset Sync context association with any Aux context as the chain reception is done. */
+	/* Reset Sync context association with any Aux context as the chain reception is done.
+	 * By code inspection there should not be a race that ULL execution context assigns lll_aux
+	 * that would be reset here, because either we are here not receiving a chain PDU or the
+	 * lll_aux has been set in the node rx type NODE_RX_TYPE_EXT_AUX_RELEASE before we are here.
+	 */
 	lll->lll_aux = NULL;
 
 	/* Calculate and place the drift information in done event */
diff --git a/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c b/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
index 7de4c201768..7419325254a 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
@@ -1126,6 +1126,10 @@ void ull_scan_aux_release(memq_link_t *link, struct node_rx_pdu *rx)
 	param_ull = HDR_LLL2ULL(rx->rx_ftr.param);
 
 	if (ull_scan_is_valid_get(param_ull)) {
+		/* Release aux context when LLL scheduled auxiliary PDU
+		 * reception is_abort on duration expire or aborted in the
+		 * unreserved time space.
+		 */
 		struct lll_scan *lll;
 
 		/* Mark for buffer for release */
@@ -1134,8 +1138,21 @@ void ull_scan_aux_release(memq_link_t *link, struct node_rx_pdu *rx)
 		lll = rx->rx_ftr.param;
 		lll_aux = rx->rx_ftr.lll_aux;
 
+		/* Under race condition when LLL scheduling a reception of
+		 * auxiliary PDU, a scan aux context may be assigned late and
+		 * the node rx releasing the aux context will not have it.
+		 * Release the scan aux context assigned in the scan context.
+		 */
+		if (!lll_aux) {
+			lll_aux = lll->lll_aux;
+		}
+
 	} else if (!IS_ENABLED(CONFIG_BT_CTLR_SYNC_PERIODIC) ||
 		   ull_scan_aux_is_valid_get(param_ull)) {
+		/* Release aux context when ULL scheduled auxiliary PDU
+		 * reception is aborted.
+		 */
+
 		/* Mark for buffer for release */
 		rx->hdr.type = NODE_RX_TYPE_RELEASE;
 
@@ -1150,9 +1167,21 @@ void ull_scan_aux_release(memq_link_t *link, struct node_rx_pdu *rx)
 		/* reset data len total */
 		sync->data_len = 0U;
 
+		/* Release aux context in case of chain PDU reception, otherwise
+		 * lll_aux is NULL.
+		 */
 		lll = rx->rx_ftr.param;
 		lll_aux = rx->rx_ftr.lll_aux;
 
+		/* Under race condition when LLL scheduling a reception of
+		 * auxiliary PDU, a scan aux context may be assigned late and
+		 * the node rx releasing the aux context will not have it.
+		 * Release the scan aux context assigned in the sync context.
+		 */
+		if (!lll_aux) {
+			lll_aux = lll->lll_aux;
+		}
+
 		/* Change node type so HCI can dispatch report for truncated
 		 * data properly.
 		 */
@@ -1183,13 +1212,16 @@ void ull_scan_aux_release(memq_link_t *link, struct node_rx_pdu *rx)
 		scan = ull_scan_is_valid_get(scan);
 		if (scan) {
 			is_stop = scan->is_stop;
-		} else {
+		} else if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_PERIODIC)) {
 			struct lll_sync *sync_lll;
 			struct ll_sync_set *sync;
 
 			sync_lll = (void *)lll;
 			sync = HDR_LLL2ULL(sync_lll);
 			is_stop = sync->is_stop;
+		} else {
+			LL_ASSERT(0);
+			return;
 		}
 
 		if (!is_stop) {

From 47cad3ba27cc845c391f03bd16b652f96ca2aaba Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Thu, 13 Feb 2025 05:58:58 +0100
Subject: [PATCH 2430/2913] [nrf fromtree] Bluetooth: Controller: Fix redundant
 reset of sync aux association

Remove redundant reset of LLL sync aux context association.

Related to commit 32637290207a ("Bluetooth: Controller: Fix
assertion terminating Periodic Sync").

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit dcdd3308953ababa0a67382e696982b9f8e2ab86)
Signed-off-by: Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
---
 .../controller/ll_sw/nordic/lll/lll_sync.c    | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
index 6a42da4167d..c80591939b1 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
@@ -635,15 +635,6 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param)
 	lll = prepare_param->param;
 	lll->skip_prepare += (lll->lazy_prepare + 1U);
 
-	/* Reset Sync context association with any Aux context as the chain reception is aborted.
-	 * There is no race with ULL execution context assigning lll_aux as this is prepare being
-	 * aborted and no assignment would be done yet before the superior PDU is received.
-	 * TODO: This code here is redundant as isr_rx_done_cleanup() should ensure it is reset
-	 *       on every periodic sync chain done. Remove it if there is no regression running
-	 *       conformance tests.
-	 */
-	lll->lll_aux = NULL;
-
 	/* Extra done event, to check sync lost */
 	e = ull_event_done_extra_get();
 	LL_ASSERT(e);
@@ -823,16 +814,6 @@ static int isr_rx(struct lll_sync *lll, uint8_t node_type, uint8_t crc_ok,
 		 * again a node_rx for periodic report incomplete.
 		 */
 		if (node_type != NODE_RX_TYPE_EXT_AUX_REPORT) {
-			/* Reset Sync context association with any Aux context
-			 * as a new chain is being setup for reception here.
-			 * TODO: This code here is redundant as
-			 *       isr_rx_done_cleanup() should ensure it is reset
-			 *       on every periodic sync chain done. Remove it if
-			 *       there is no regression running conformance
-			 *       tests.
-			 */
-			lll->lll_aux = NULL;
-
 			node_rx = ull_pdu_rx_alloc_peek(4);
 		} else {
 			node_rx = ull_pdu_rx_alloc_peek(3);

From 6eb30dfa23df1d45f49297394c406bc485742b5b Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 13 Feb 2025 15:52:34 +0100
Subject: [PATCH 2431/2913] [nrf fromtree] soc: nordic: nrf54l: Fix num of irq
 for nRF54L20

Change number of IRQ parameter for nRF54L20 devices.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 50c21f159143e18c8a05cbb946a5e7610033355f)
---
 soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuapp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuapp b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuapp
index 6aabb1a8738..153f2fd767b 100644
--- a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuapp
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuapp
@@ -6,6 +6,6 @@
 if SOC_NRF54L20_ENGA_CPUAPP
 
 config NUM_IRQS
-	default 274
+	default 290
 
 endif # SOC_NRF54L20_ENGA_CPUAPP

From f01cc4c17dfd4dfdb1312b9e26602b4025f38b82 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Tue, 14 Jan 2025 12:03:54 +0100
Subject: [PATCH 2432/2913] [nrf fromtree] manifest: Update hal_nordic with new
 cracen hal and rng driver

Update with the latest nordic hal

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 2a95e2291f90d0e38490c4b922f8bcf50e67705a)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 49ecb93855c..ae2aea14828 100644
--- a/west.yml
+++ b/west.yml
@@ -193,7 +193,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: ecea8cdbd1a7d557563b47ad304ee9ba7a8709e5
+      revision: 31ec68ca7cce969ebec6d849332e2fbab59ec3f4
       path: modules/hal/nordic
       groups:
         - hal

From 88ce8e0e765bfa67221c03d1103092f8a0184737 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Tue, 21 Jan 2025 13:54:37 +0100
Subject: [PATCH 2433/2913] [nrf fromtree] manifest: update hal_nordic revision
 to integrate nrfx 3.10.0

New nrfx version contains support for nRF7120 Eng A device.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 3fe559a0c6bb23ac04758d89cfd494562bd1ae90)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index ae2aea14828..1931e30d741 100644
--- a/west.yml
+++ b/west.yml
@@ -193,7 +193,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 31ec68ca7cce969ebec6d849332e2fbab59ec3f4
+      revision: a1db06a2f6a1d069994d595cef563f58e44c4344
       path: modules/hal/nordic
       groups:
         - hal

From ae94cdfedee62d4b1bafd421eed7828392285f47 Mon Sep 17 00:00:00 2001
From: Matthias Hauser <matthias.hauser@we-online.de>
Date: Fri, 17 Jan 2025 11:53:07 +0100
Subject: [PATCH 2434/2913] [nrf fromtree] drivers: nrfx: Avoid unhandled event
 calling assert function

Avoid unhandled event calling assert function

Signed-off-by: Matthias Hauser <matthias.hauser@we-online.de>
(cherry picked from commit 543864321cbdf5a60ed7e76976f52e28147c75e5)
---
 drivers/clock_control/clock_control_nrf.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/clock_control/clock_control_nrf.c b/drivers/clock_control/clock_control_nrf.c
index c4d4710e1cd..836dc9888c3 100644
--- a/drivers/clock_control/clock_control_nrf.c
+++ b/drivers/clock_control/clock_control_nrf.c
@@ -637,6 +637,11 @@ static void clock_event_handler(nrfx_clock_evt_type_t event)
 			__ASSERT_NO_MSG(false);
 		}
 		break;
+	case NRFX_CLOCK_EVT_PLL_STARTED:
+	{
+		/* unhandled event */
+		break;
+	}
 	default:
 		__ASSERT_NO_MSG(0);
 		break;

From 6b77915e06e53a29e7fde40bb1ef8f31fcac7c61 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Wed, 22 Jan 2025 08:26:36 +0100
Subject: [PATCH 2435/2913] [nrf fromtree] drivers: clock_control: nrf: ignore
 XOTUNE-related events for now

New events from nrfx_clock driver are not utilized for now
by the clock_control, so should be ignored to avoid assertion.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 2692f167576b74c0a9f13309d5a55f88a93f2cc6)
---
 drivers/clock_control/clock_control_nrf.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/clock_control/clock_control_nrf.c b/drivers/clock_control/clock_control_nrf.c
index 836dc9888c3..03955d3fb7d 100644
--- a/drivers/clock_control/clock_control_nrf.c
+++ b/drivers/clock_control/clock_control_nrf.c
@@ -638,6 +638,11 @@ static void clock_event_handler(nrfx_clock_evt_type_t event)
 		}
 		break;
 	case NRFX_CLOCK_EVT_PLL_STARTED:
+#if NRF_CLOCK_HAS_XO_TUNE
+	case NRFX_CLOCK_EVT_XO_TUNED:
+	case NRFX_CLOCK_EVT_XO_TUNE_ERROR:
+	case NRFX_CLOCK_EVT_XO_TUNE_FAILED:
+#endif
 	{
 		/* unhandled event */
 		break;

From dd2b35e524b5b390a279001f243b92e918db0539 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Thu, 13 Feb 2025 14:43:29 +0100
Subject: [PATCH 2436/2913] Revert "[nrf noup] drivers: hwinfo: Support for
 reset reasons in nRF54H20"

This reverts commit b978fbb9ae2c62cc924f458158c7033cdb69acbc.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
---
 drivers/hwinfo/hwinfo_nrf.c | 48 +++++++++----------------------------
 1 file changed, 11 insertions(+), 37 deletions(-)

diff --git a/drivers/hwinfo/hwinfo_nrf.c b/drivers/hwinfo/hwinfo_nrf.c
index 48b8a3ea5f4..d1fca5350a6 100644
--- a/drivers/hwinfo/hwinfo_nrf.c
+++ b/drivers/hwinfo/hwinfo_nrf.c
@@ -8,13 +8,8 @@
 #include <zephyr/drivers/hwinfo.h>
 #include <string.h>
 #include <zephyr/sys/byteorder.h>
-#if defined(CONFIG_BOARD_QEMU_CORTEX_M0) || \
-	(defined(CONFIG_NRF_PLATFORM_HALTIUM) && \
-	 defined(CONFIG_RISCV_CORE_NORDIC_VPR))
-#define RESET_CAUSE_AVAILABLE 0
-#else
+#if !defined(CONFIG_SOC_SERIES_NRF54HX) && !defined(CONFIG_BOARD_QEMU_CORTEX_M0)
 #include <helpers/nrfx_reset_reason.h>
-#define RESET_CAUSE_AVAILABLE 1
 #endif
 
 #if defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) && defined(NRF_FICR_S)
@@ -68,30 +63,7 @@ ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 	return length;
 }
 
-#if RESET_CAUSE_AVAILABLE
-
-#if defined(NRF_RESETINFO)
-
-#define REASON_LOCKUP (NRFX_RESET_REASON_LOCKUP | NRFX_RESET_REASON_LOCAL_LOCKUP_MASK)
-#define REASON_SOFTWARE (NRFX_RESET_REASON_SREQ | NRFX_RESET_REASON_LOCAL_SREQ_MASK)
-#define REASON_WATCHDOG	\
-	(NRFX_RESET_REASON_DOG_MASK | \
-	 NRFX_RESET_REASON_LOCAL_DOG1_MASK | \
-	 NRFX_RESET_REASON_LOCAL_DOG0_MASK)
-
-#else /* NRF_RESETINFO */
-
-#define REASON_LOCKUP NRFX_RESET_REASON_LOCKUP_MASK
-#define REASON_SOFTWARE NRFX_RESET_REASON_SREQ_MASK
-
-#if NRF_POWER_HAS_RESETREAS
-#define REASON_WATCHDOG NRFX_RESET_REASON_DOG_MASK
-#else
-#define REASON_WATCHDOG	NRFX_RESET_REASON_DOG1_MASK
-#endif /* NRF_POWER_HAS_RESETREAS */
-
-#endif /* NRF_RESETINFO */
-
+#if !defined(CONFIG_SOC_SERIES_NRF54HX) && !defined(CONFIG_BOARD_QEMU_CORTEX_M0)
 int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 {
 	uint32_t flags = 0;
@@ -101,21 +73,19 @@ int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 	if (reason & NRFX_RESET_REASON_RESETPIN_MASK) {
 		flags |= RESET_PIN;
 	}
-	if (reason & REASON_WATCHDOG) {
+	if (reason & NRFX_RESET_REASON_DOG_MASK) {
 		flags |= RESET_WATCHDOG;
 	}
-
-	if (reason & REASON_LOCKUP) {
+	if (reason & NRFX_RESET_REASON_LOCKUP_MASK) {
 		flags |= RESET_CPU_LOCKUP;
 	}
-
 	if (reason & NRFX_RESET_REASON_OFF_MASK) {
 		flags |= RESET_LOW_POWER_WAKE;
 	}
 	if (reason & NRFX_RESET_REASON_DIF_MASK) {
 		flags |= RESET_DEBUG;
 	}
-	if (reason & REASON_SOFTWARE) {
+	if (reason & NRFX_RESET_REASON_SREQ_MASK) {
 		flags |= RESET_SOFTWARE;
 	}
 
@@ -154,7 +124,11 @@ int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 		flags |= RESET_DEBUG;
 	}
 #endif
-
+#if !NRF_POWER_HAS_RESETREAS
+	if (reason & NRFX_RESET_REASON_DOG1_MASK) {
+		flags |= RESET_WATCHDOG;
+	}
+#endif
 #if NRFX_RESET_REASON_HAS_GRTC
 	if (reason & NRFX_RESET_REASON_GRTC_MASK) {
 		flags |= RESET_CLOCK;
@@ -210,4 +184,4 @@ int z_impl_hwinfo_get_supported_reset_cause(uint32_t *supported)
 
 	return 0;
 }
-#endif /* RESET_CAUSE_AVAILABLE */
+#endif

From 0d6e8cfe79f2ee122854daf824c17eb0416b8188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karol=20Laso=C5=84czyk?= <karol.lasonczyk@nordicsemi.no>
Date: Fri, 22 Nov 2024 10:02:36 +0100
Subject: [PATCH 2437/2913] [nrf fromtree] drivers: hwinfo: Support for reset
 reasons in nRF54H20
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adding support for reset reasons in the nRF54H20 SoC.

Signed-off-by: Karol Lasończyk <karol.lasonczyk@nordicsemi.no>
(cherry picked from commit f551b2dc009c2b12d3a708d0629416afcc807869)
---
 drivers/hwinfo/hwinfo_nrf.c | 49 ++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 11 deletions(-)

diff --git a/drivers/hwinfo/hwinfo_nrf.c b/drivers/hwinfo/hwinfo_nrf.c
index d1fca5350a6..b045912dd6b 100644
--- a/drivers/hwinfo/hwinfo_nrf.c
+++ b/drivers/hwinfo/hwinfo_nrf.c
@@ -8,8 +8,13 @@
 #include <zephyr/drivers/hwinfo.h>
 #include <string.h>
 #include <zephyr/sys/byteorder.h>
-#if !defined(CONFIG_SOC_SERIES_NRF54HX) && !defined(CONFIG_BOARD_QEMU_CORTEX_M0)
+#if defined(CONFIG_BOARD_QEMU_CORTEX_M0) || \
+	(defined(CONFIG_NRF_PLATFORM_HALTIUM) && \
+	 defined(CONFIG_RISCV_CORE_NORDIC_VPR))
+#define RESET_CAUSE_AVAILABLE 0
+#else
 #include <helpers/nrfx_reset_reason.h>
+#define RESET_CAUSE_AVAILABLE 1
 #endif
 
 #if defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) && defined(NRF_FICR_S)
@@ -63,7 +68,30 @@ ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 	return length;
 }
 
-#if !defined(CONFIG_SOC_SERIES_NRF54HX) && !defined(CONFIG_BOARD_QEMU_CORTEX_M0)
+#if RESET_CAUSE_AVAILABLE
+
+#if defined(NRF_RESETINFO)
+
+#define REASON_LOCKUP (NRFX_RESET_REASON_LOCKUP_MASK | NRFX_RESET_REASON_LOCAL_LOCKUP_MASK)
+#define REASON_SOFTWARE (NRFX_RESET_REASON_SREQ_MASK | NRFX_RESET_REASON_LOCAL_SREQ_MASK)
+#define REASON_WATCHDOG	\
+	(NRFX_RESET_REASON_DOG_MASK | \
+	 NRFX_RESET_REASON_LOCAL_DOG1_MASK | \
+	 NRFX_RESET_REASON_LOCAL_DOG0_MASK)
+
+#else /* NRF_RESETINFO */
+
+#define REASON_LOCKUP NRFX_RESET_REASON_LOCKUP_MASK
+#define REASON_SOFTWARE NRFX_RESET_REASON_SREQ_MASK
+
+#if NRF_POWER_HAS_RESETREAS
+#define REASON_WATCHDOG NRFX_RESET_REASON_DOG_MASK
+#else
+#define REASON_WATCHDOG	(NRFX_RESET_REASON_DOG0_MASK | NRFX_RESET_REASON_DOG1_MASK)
+#endif /* NRF_POWER_HAS_RESETREAS */
+
+#endif /* NRF_RESETINFO */
+
 int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 {
 	uint32_t flags = 0;
@@ -73,19 +101,21 @@ int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 	if (reason & NRFX_RESET_REASON_RESETPIN_MASK) {
 		flags |= RESET_PIN;
 	}
-	if (reason & NRFX_RESET_REASON_DOG_MASK) {
+	if (reason & REASON_WATCHDOG) {
 		flags |= RESET_WATCHDOG;
 	}
-	if (reason & NRFX_RESET_REASON_LOCKUP_MASK) {
+
+	if (reason & REASON_LOCKUP) {
 		flags |= RESET_CPU_LOCKUP;
 	}
+
 	if (reason & NRFX_RESET_REASON_OFF_MASK) {
 		flags |= RESET_LOW_POWER_WAKE;
 	}
 	if (reason & NRFX_RESET_REASON_DIF_MASK) {
 		flags |= RESET_DEBUG;
 	}
-	if (reason & NRFX_RESET_REASON_SREQ_MASK) {
+	if (reason & REASON_SOFTWARE) {
 		flags |= RESET_SOFTWARE;
 	}
 
@@ -124,11 +154,7 @@ int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 		flags |= RESET_DEBUG;
 	}
 #endif
-#if !NRF_POWER_HAS_RESETREAS
-	if (reason & NRFX_RESET_REASON_DOG1_MASK) {
-		flags |= RESET_WATCHDOG;
-	}
-#endif
+
 #if NRFX_RESET_REASON_HAS_GRTC
 	if (reason & NRFX_RESET_REASON_GRTC_MASK) {
 		flags |= RESET_CLOCK;
@@ -147,6 +173,7 @@ int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 	if (reason & NRFX_RESET_REASON_LCTRLAP_MASK) {
 		flags |= RESET_DEBUG;
 	}
+
 #endif
 #if defined(NRFX_RESET_REASON_TAMPC_MASK)
 	if (reason & NRFX_RESET_REASON_TAMPC_MASK) {
@@ -184,4 +211,4 @@ int z_impl_hwinfo_get_supported_reset_cause(uint32_t *supported)
 
 	return 0;
 }
-#endif
+#endif /* RESET_CAUSE_AVAILABLE */

From fd0f27a2cf81930d88cc84dc7af0010f143d67ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 4 Dec 2024 15:37:16 +0100
Subject: [PATCH 2438/2913] [nrf fromtree] modules: hal_nordic: nrfx_config:
 Customize NRFX_SPIM_EXTENDED_ENABLED
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

nrfx_config is setting NRFX_SPIM_EXTENDED_ENABLED based on presence of
a DT property. However, there are test cases when it is expected that
extended SPIM features will be disabled on a target that supports
extended features. Allow that by not setting the value if it is already
defined.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit eebaf819b6f19bdff099ec857225f1c8dc08d92d)
---
 modules/hal_nordic/nrfx/nrfx_config.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index d7427221532..d9305d9fb73 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -492,9 +492,12 @@
 
 #define NRFX_SPIM_DT_HAS_RX_DELAY(node) DT_PROP(node, rx_delay_supported) +
 
+#ifndef NRFX_SPIM_EXTENDED_ENABLED
 #if DT_FOREACH_STATUS_OKAY(nordic_nrf_spim, NRFX_SPIM_DT_HAS_RX_DELAY) 0
 #define NRFX_SPIM_EXTENDED_ENABLED 1
 #endif
+#endif
+
 #ifdef CONFIG_NRFX_SPIM00
 #define NRFX_SPIM00_ENABLED 1
 #endif

From 67c011b24b2c2828370effe4afdba8d0fa70945e Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Tue, 11 Feb 2025 14:00:20 +0100
Subject: [PATCH 2439/2913] Revert "[nrf noup] modules: hal_nordic: adjust nrfx
 reservations to NCS"

This reverts commit 3467a9ba9ef51fa296c1dc8960d1e936cab3b271.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
---
 modules/hal_nordic/nrfx/Kconfig               |   2 +-
 .../nrfx/nrfx_config_reserved_resources_ncs.h | 916 ------------------
 2 files changed, 1 insertion(+), 917 deletions(-)
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h

diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index c73a155dc60..2fd97920df8 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -1211,6 +1211,6 @@ endmenu
 
 config NRFX_RESERVED_RESOURCES_HEADER
 	string
-	default "nrfx_config_reserved_resources_ncs.h"
+	default "nrfx_config_reserved_resources.h"
 
 endmenu # "nrfx drivers"
diff --git a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h
deleted file mode 100644
index 554b049f29f..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h
+++ /dev/null
@@ -1,916 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_RESERVED_RESOURCES_H__
-#define NRFX_CONFIG_RESERVED_RESOURCES_H__
-
-/** @brief Bitmask that defines GPIOTE130 channels reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_GPIOTE130_CHANNELS_USED                                                               \
-	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), owned_channels) |                           \
-	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), child_owned_channels))
-
-/** @brief Bitmask that defines GPIOTE131 channels reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_GPIOTE131_CHANNELS_USED                                                               \
-	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), owned_channels) |                           \
-	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), child_owned_channels))
-
-/** @brief Bitmask that defines EGU instances that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_EGUS_USED 0
-
-/** @brief Bitmask that defines TIMER instances that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_TIMERS_USED 0
-
-/*
- * The enabled Bluetooth controller subsystem is responsible for providing
- * definitions of the BT_CTLR_USED_* symbols used below in a file named
- * bt_ctlr_used_resources.h and for adding its location to global include
- * paths so that the file can be included here for all Zephyr libraries that
- * are to be built.
- */
-#if defined(CONFIG_BT_LL_SW_SPLIT)
-#include <bt_ctlr_used_resources.h>
-#if defined(DPPI_PRESENT)
-#if defined(NRF53_SERIES)
-#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
-#define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
-#elif defined(NRF54L_SERIES)
-#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
-#define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
-#endif
-#else /* defined(DPPI_PRESENT) */
-#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
-#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
-#endif /* defined(DPPI_PRESENT) */
-#endif /* defined(CONFIG_BT_LL_SW_SPLIT) */
-
-#if defined(CONFIG_BT_LL_SOFTDEVICE)
-#include <sdc_soc.h>
-#if defined(NRF52_SERIES)
-#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR SDC_PPI_CHANNELS_USED_MASK
-#elif defined(NRF53_SERIES)
-#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR SDC_DPPI_CHANNELS_USED_MASK
-#elif defined(NRF54L_SERIES)
-#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC10_CHANNELS_USED_MASK
-#define NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC00_CHANNELS_USED_MASK
-#define NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR                                                   \
-	(SDC_PPIB00_CHANNELS_USED_MASK | SDC_PPIB10_CHANNELS_USED_MASK)
-#elif defined(NRF54H_SERIES)
-#define NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC020_CHANNELS_USED_MASK
-#define NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC030_CHANNELS_USED_MASK
-#define NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR                                                 \
-	(SDC_PPIB020_CHANNELS_USED_MASK | SDC_PPIB030_CHANNELS_USED_MASK)
-#else
-#error Unsupported chip family
-#endif
-#endif /* defined(CONFIG_BT_LL_SOFTDEVICE) */
-
-#if defined(CONFIG_NRF_802154_RADIO_DRIVER)
-#if defined(NRF52_SERIES)
-#include <../src/nrf_802154_peripherals_nrf52.h>
-#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV NRF_802154_PPI_CHANNELS_USED_MASK
-#define NRFX_PPI_GROUPS_USED_BY_802154_DRV   NRF_802154_PPI_GROUPS_USED_MASK
-#elif defined(NRF53_SERIES)
-#include <../src/nrf_802154_peripherals_nrf53.h>
-#define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
-#define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
-#elif defined(NRF54L_SERIES)
-#include <../src/nrf_802154_peripherals_nrf54l.h>
-#define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
-#define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
-#elif defined(NRF54H_SERIES)
-#include <../src/nrf_802154_peripherals_nrf54h.h>
-#define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
-#define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
-#else
-#error Unsupported chip family
-#endif
-#endif /* CONFIG_NRF_802154_RADIO_DRIVER */
-
-#if defined(CONFIG_MPSL)
-#include <mpsl.h>
-#if defined(NRF52_SERIES)
-#define NRFX_PPI_CHANNELS_USED_BY_MPSL MPSL_PPI_CHANNELS_USED_MASK
-#elif defined(NRF53_SERIES)
-#define NRFX_DPPI0_CHANNELS_USED_BY_MPSL MPSL_DPPIC_CHANNELS_USED_MASK
-#elif defined(NRF54L_SERIES)
-#define NRFX_DPPI10_CHANNELS_USED_BY_MPSL MPSL_DPPIC10_CHANNELS_USED_MASK
-#define NRFX_DPPI20_CHANNELS_USED_BY_MPSL MPSL_DPPIC20_CHANNELS_USED_MASK
-#define NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL                                                      \
-	(MPSL_PPIB11_CHANNELS_USED_MASK | MPSL_PPIB21_CHANNELS_USED_MASK)
-#elif defined(NRF54H_SERIES)
-#define NRFX_DPPI020_CHANNELS_USED_BY_MPSL MPSL_DPPIC020_CHANNELS_USED_MASK
-#else
-#error Unsupported chip family
-#endif
-#endif
-
-#ifndef NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI0_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI0_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI0_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI0_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI0_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI00_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI00_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI00_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI00_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI00_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI00_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI10_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI10_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI10_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI10_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI10_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI20_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI20_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI20_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI20_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI20_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI20_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI30_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI30_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI30_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI30_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI30_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI30_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI020_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI020_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI020_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI020_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI020_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI030_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI030_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI030_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI030_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI030_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI030_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI120_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI120_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI120_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI120_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI120_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI120_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI130_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI130_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI130_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI130_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI130_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI130_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI131_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI131_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI131_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI131_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI131_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI131_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI132_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI132_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI132_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI132_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI132_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI132_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI133_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI133_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI133_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI133_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI133_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI133_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI134_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI134_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI134_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI134_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI134_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI134_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI135_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI135_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI135_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI135_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI135_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI135_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR
-#define NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV
-#define NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI136_GROUPS_USED_BY_802154_DRV
-#define NRFX_DPPI136_GROUPS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_DPPI136_CHANNELS_USED_BY_MPSL
-#define NRFX_DPPI136_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_DPPI136_GROUPS_USED_BY_MPSL
-#define NRFX_DPPI136_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPI_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPI_GROUPS_USED_BY_BT_CTLR
-#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR 0
-#endif
-
-#ifndef NRFX_PPI_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPI_GROUPS_USED_BY_802154_DRV
-#define NRFX_PPI_GROUPS_USED_BY_802154_DRV 0
-#endif
-
-#ifndef NRFX_PPI_CHANNELS_USED_BY_MPSL
-#define NRFX_PPI_CHANNELS_USED_BY_MPSL 0
-#endif
-#ifndef NRFX_PPI_GROUPS_USED_BY_MPSL
-#define NRFX_PPI_GROUPS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR
-#define NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR 0
-#endif
-#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV
-#define NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV 0
-#endif
-#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL
-#define NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL 0
-#endif
-
-#if defined(NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL)
-
-BUILD_ASSERT((NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI0_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI0_GROUPS_USED_BY_802154_DRV & NRFX_DPPI0_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI00_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI00_GROUPS_USED_BY_802154_DRV & NRFX_DPPI00_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI10_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI10_GROUPS_USED_BY_802154_DRV & NRFX_DPPI10_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI20_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI20_GROUPS_USED_BY_802154_DRV & NRFX_DPPI20_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI30_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI30_GROUPS_USED_BY_802154_DRV & NRFX_DPPI30_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI020_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI020_GROUPS_USED_BY_802154_DRV & NRFX_DPPI020_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI030_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI030_GROUPS_USED_BY_802154_DRV & NRFX_DPPI030_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI120_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI120_GROUPS_USED_BY_802154_DRV & NRFX_DPPI120_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI130_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI130_GROUPS_USED_BY_802154_DRV & NRFX_DPPI130_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI131_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI131_GROUPS_USED_BY_802154_DRV & NRFX_DPPI131_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI132_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI132_GROUPS_USED_BY_802154_DRV & NRFX_DPPI132_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI133_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI133_GROUPS_USED_BY_802154_DRV & NRFX_DPPI133_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI134_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI134_GROUPS_USED_BY_802154_DRV & NRFX_DPPI134_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI135_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI135_GROUPS_USED_BY_802154_DRV & NRFX_DPPI135_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI136_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_DPPI136_GROUPS_USED_BY_802154_DRV & NRFX_DPPI136_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_PPI_CHANNELS_USED_BY_802154_DRV & NRFX_PPI_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_PPI_GROUPS_USED_BY_802154_DRV & NRFX_PPI_GROUPS_USED_BY_MPSL) == 0,
-	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV &
-	      NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV &
-	      NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV &
-	      NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV &
-	      NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV &
-	      NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV &
-	      NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-BUILD_ASSERT((NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV &
-	      NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL) == 0,
-	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
-	     "assigned to the MPSL.");
-
-#endif /* NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL */
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI0_CHANNELS_USED                                                                   \
-	(NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI0_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI0_GROUPS_USED                                                                     \
-	(NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI0_GROUPS_USED_BY_802154_DRV |                \
-	 NRFX_DPPI0_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI00_CHANNELS_USED                                                                  \
-	(NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV |          \
-	 NRFX_DPPI00_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI00_GROUPS_USED                                                                    \
-	(NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI00_GROUPS_USED_BY_802154_DRV |              \
-	 NRFX_DPPI00_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI10_CHANNELS_USED                                                                  \
-	(NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV |          \
-	 NRFX_DPPI10_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI10_GROUPS_USED                                                                    \
-	(NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI10_GROUPS_USED_BY_802154_DRV |              \
-	 NRFX_DPPI10_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI20_CHANNELS_USED                                                                  \
-	(NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV |          \
-	 NRFX_DPPI20_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI20_GROUPS_USED                                                                    \
-	(NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI20_GROUPS_USED_BY_802154_DRV |              \
-	 NRFX_DPPI20_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI30_CHANNELS_USED                                                                  \
-	(NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV |          \
-	 NRFX_DPPI30_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI30_GROUPS_USED                                                                    \
-	(NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI30_GROUPS_USED_BY_802154_DRV |              \
-	 NRFX_DPPI30_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI020_CHANNELS_USED                                                                 \
-	(NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI020_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI020_GROUPS_USED                                                                   \
-	(NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI020_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI020_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI030_CHANNELS_USED                                                                 \
-	(NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI030_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI030_GROUPS_USED                                                                   \
-	(NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI030_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI030_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI120_CHANNELS_USED                                                                 \
-	(NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI120_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI120_GROUPS_USED                                                                   \
-	(NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI120_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI120_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI130_CHANNELS_USED                                                                 \
-	(NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI130_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI130_GROUPS_USED                                                                   \
-	(NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI130_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI130_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI131_CHANNELS_USED                                                                 \
-	(NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI131_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI131_GROUPS_USED                                                                   \
-	(NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI131_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI131_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI132_CHANNELS_USED                                                                 \
-	(NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI132_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI132_GROUPS_USED                                                                   \
-	(NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI132_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI132_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI133_CHANNELS_USED                                                                 \
-	(NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI133_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI133_GROUPS_USED                                                                   \
-	(NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI133_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI133_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI134_CHANNELS_USED                                                                 \
-	(NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI134_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI134_GROUPS_USED                                                                   \
-	(NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI134_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI134_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI135_CHANNELS_USED                                                                 \
-	(NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI135_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI135_GROUPS_USED                                                                   \
-	(NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI135_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI135_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI136_CHANNELS_USED                                                                 \
-	(NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV |        \
-	 NRFX_DPPI136_CHANNELS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines DPPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_DPPI136_GROUPS_USED                                                                   \
-	(NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI136_GROUPS_USED_BY_802154_DRV |            \
-	 NRFX_DPPI136_GROUPS_USED_BY_MPSL)
-
-/** @brief Bitmask that defines PPI channels that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_PPI_CHANNELS_USED                                                                     \
-	(NRFX_PPI_CHANNELS_USED_BY_BT_CTLR | NRFX_PPI_CHANNELS_USED_BY_802154_DRV |                \
-	 NRFX_PPI_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_DPPI_CHANNELS_USED NRFX_DPPI0_CHANNELS_USED
-#define NRFX_DPPI_GROUPS_USED   NRFX_DPPI0_GROUPS_USED
-
-/** @brief Bitmask that defines PPI groups that are reserved for use outside
- *         of the nrfx library.
- */
-#define NRFX_PPI_GROUPS_USED                                                                       \
-	(NRFX_PPI_GROUPS_USED_BY_BT_CTLR | NRFX_PPI_GROUPS_USED_BY_802154_DRV |                    \
-	 NRFX_PPI_GROUPS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_00_10_CHANNELS_USED                                                 \
-	(NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV |  \
-	 NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_01_20_CHANNELS_USED                                                 \
-	(NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV |  \
-	 NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_11_21_CHANNELS_USED                                                 \
-	(NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV |  \
-	 NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_22_30_CHANNELS_USED                                                 \
-	(NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV |  \
-	 NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_02_03_CHANNELS_USED                                                 \
-	(NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV |  \
-	 NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_04_12_CHANNELS_USED                                                 \
-	(NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV |  \
-	 NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL)
-
-#define NRFX_PPIB_INTERCONNECT_020_030_CHANNELS_USED                                               \
-	(NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR |                                              \
-	 NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV | NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL)
-
-#endif /* NRFX_CONFIG_RESERVED_RESOURCES_H__ */

From 6f794f93748cdf5e71602cca122f40532f433efe Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Wed, 20 Nov 2024 13:49:41 +0100
Subject: [PATCH 2440/2913] [nrf fromtree] modules: hal_nordic: nrfx: use
 templates from hal_nordic

There is no reason to duplicate `nrfx_config_*.h` files.
Use configuration files from `hal_nordic/nrfx/templates`.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
(cherry picked from commit aa3f78791d76efb66836b7dd12a1c0dcc55b4252)
---
 modules/hal_nordic/nrfx/Kconfig               |    2 +-
 modules/hal_nordic/nrfx/nrfx_config.h         | 1190 +---------
 modules/hal_nordic/nrfx/nrfx_config_common.h  |   29 -
 modules/hal_nordic/nrfx/nrfx_config_ext.h     |   12 -
 modules/hal_nordic/nrfx/nrfx_config_nrf51.h   |  871 -------
 .../hal_nordic/nrfx/nrfx_config_nrf52805.h    | 1117 ---------
 .../hal_nordic/nrfx/nrfx_config_nrf52810.h    | 1252 ----------
 .../hal_nordic/nrfx/nrfx_config_nrf52811.h    | 1279 -----------
 .../hal_nordic/nrfx/nrfx_config_nrf52820.h    | 1277 -----------
 .../hal_nordic/nrfx/nrfx_config_nrf52832.h    | 1608 -------------
 .../hal_nordic/nrfx/nrfx_config_nrf52833.h    | 1646 -------------
 .../hal_nordic/nrfx/nrfx_config_nrf52840.h    | 1673 --------------
 .../nrfx/nrfx_config_nrf5340_application.h    | 1615 -------------
 .../nrfx/nrfx_config_nrf5340_network.h        |  888 -------
 .../nrfx/nrfx_config_nrf54h20_application.h   | 1947 ----------------
 .../nrfx/nrfx_config_nrf54h20_flpr.h          | 1823 ---------------
 .../nrfx/nrfx_config_nrf54h20_ppr.h           | 1884 ---------------
 .../nrfx/nrfx_config_nrf54h20_radiocore.h     | 2010 ----------------
 .../nrfx/nrfx_config_nrf54l05_application.h   | 1775 --------------
 .../nrfx/nrfx_config_nrf54l05_flpr.h          | 1784 ---------------
 .../nrfx_config_nrf54l09_enga_application.h   | 1355 -----------
 .../nrfx/nrfx_config_nrf54l10_application.h   | 1775 --------------
 .../nrfx/nrfx_config_nrf54l10_flpr.h          | 1784 ---------------
 .../nrfx/nrfx_config_nrf54l15_application.h   | 1775 --------------
 .../nrfx/nrfx_config_nrf54l15_flpr.h          | 1784 ---------------
 .../nrfx_config_nrf54l20_enga_application.h   | 1604 -------------
 modules/hal_nordic/nrfx/nrfx_config_nrf91.h   | 1229 ----------
 .../nrfx_config_nrf9230_engb_application.h    | 1964 ----------------
 .../nrfx/nrfx_config_nrf9230_engb_ppr.h       | 1901 ---------------
 .../nrfx/nrfx_config_nrf9230_engb_radiocore.h | 2031 -----------------
 modules/hal_nordic/nrfx/nrfx_kconfig.h        | 1109 +++++++++
 modules/hal_nordic/nrfx/nrfx_log.h            |    2 +-
 ..._resources.h => nrfx_reserved_resources.h} |    6 +-
 33 files changed, 1177 insertions(+), 42824 deletions(-)
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_common.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_ext.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf51.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf52805.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf52810.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf52811.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf52820.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf52832.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf52833.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf52840.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf5340_application.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf5340_network.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54h20_application.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54h20_flpr.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54h20_ppr.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54h20_radiocore.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l05_application.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l05_flpr.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l09_enga_application.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l10_application.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l10_flpr.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf54l20_enga_application.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf91.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_application.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_ppr.h
 delete mode 100644 modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_radiocore.h
 create mode 100644 modules/hal_nordic/nrfx/nrfx_kconfig.h
 rename modules/hal_nordic/nrfx/{nrfx_config_reserved_resources.h => nrfx_reserved_resources.h} (99%)

diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 2fd97920df8..8e407038a9f 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -1211,6 +1211,6 @@ endmenu
 
 config NRFX_RESERVED_RESOURCES_HEADER
 	string
-	default "nrfx_config_reserved_resources.h"
+	default "nrfx_reserved_resources.h"
 
 endmenu # "nrfx drivers"
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index d9305d9fb73..a9de5dfeb78 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 - 2022, Nordic Semiconductor ASA
+ * Copyright (c) 2019, Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,1160 +7,96 @@
 #ifndef NRFX_CONFIG_H__
 #define NRFX_CONFIG_H__
 
-#include <zephyr/devicetree.h>
-#include <zephyr/sys/util_macro.h>
+/* Define nrfx API version used in Zephyr. */
+#define NRFX_CONFIG_API_VER_MAJOR 3
+#define NRFX_CONFIG_API_VER_MINOR 8
+#define NRFX_CONFIG_API_VER_MICRO 0
 
-/*
- * These are mappings of Kconfig options enabling nrfx drivers and particular
- * peripheral instances to the corresponding symbols used inside of nrfx.
- * Please note that only subsets of these entries are used for particular SoCs
- * supported by nrfx (see the corresponding nrfx_config_*.h files).
- */
-
-#ifdef CONFIG_NRFX_ADC
-#define NRFX_ADC_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_ADC_LOG
-#define NRFX_ADC_CONFIG_LOG_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_CLOCK
-#define NRFX_CLOCK_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_CLOCK_LOG
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 1
-#endif
-
-#ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC
-#if defined(CONFIG_SOC_SERIES_NRF91X) || defined(CONFIG_SOC_COMPATIBLE_NRF53X)
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#else
-#define NRFX_CLOCK_CONFIG_LF_SRC 0
-#endif
-#endif // CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC
-
-#ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL
-#if defined(CONFIG_SOC_SERIES_NRF91X) || defined(CONFIG_SOC_COMPATIBLE_NRF53X)
-#define NRFX_CLOCK_CONFIG_LF_SRC 2
-#else
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-#endif // CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL
-
-#ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_SYNTH
-#ifdef CONFIG_SOC_COMPATIBLE_NRF53X
-#define NRFX_CLOCK_CONFIG_LF_SRC 3
-#else
-#define NRFX_CLOCK_CONFIG_LF_SRC 2
-#endif
-#endif // CONFIG_CLOCK_CONTROL_NRF_K32SRC_SYNTH
-
-#ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_EXT_LOW_SWING
-#define NRFX_CLOCK_CONFIG_LF_SRC 131073
-#endif
-
-#ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_EXT_FULL_SWING
-#define NRFX_CLOCK_CONFIG_LF_SRC 196609
-#endif
-
-#ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC_CALIBRATION
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_CLOCK_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_COMP
-#define NRFX_COMP_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_COMP_LOG
-#define NRFX_COMP_CONFIG_LOG_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_DPPI
-#define NRFX_DPPI_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI_LOG
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI0
-#define NRFX_DPPI0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI00
-#define NRFX_DPPI00_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI10
-#define NRFX_DPPI10_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI20
-#define NRFX_DPPI20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI30
-#define NRFX_DPPI30_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI020
-#define NRFX_DPPI020_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI120
-#define NRFX_DPPI120_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI130
-#define NRFX_DPPI130_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI131
-#define NRFX_DPPI131_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI132
-#define NRFX_DPPI132_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI133
-#define NRFX_DPPI133_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI134
-#define NRFX_DPPI134_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI135
-#define NRFX_DPPI135_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_DPPI136
-#define NRFX_DPPI136_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_EGU
-#define NRFX_EGU_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_EGU_LOG
-#define NRFX_EGU_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_EGU0
-#define NRFX_EGU0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_EGU1
-#define NRFX_EGU1_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_EGU2
-#define NRFX_EGU2_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_EGU3
-#define NRFX_EGU3_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_EGU4
-#define NRFX_EGU4_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_EGU5
-#define NRFX_EGU5_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_EGU10
-#define NRFX_EGU10_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_EGU20
-#define NRFX_EGU20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_EGU020
-#define NRFX_EGU020_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_EGU130
-#define NRFX_EGU130_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_GRTC
-#define NRFX_GRTC_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_GRTC_LOG
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT
-#define NRF_GRTC_HAS_EXTENDED 1
-#endif
-#ifdef CONFIG_NRF_GRTC_TIMER_AUTO_KEEP_ALIVE
-#define NRFX_GRTC_CONFIG_AUTOEN 1
-#endif
-#ifdef CONFIG_NRF_GRTC_START_SYSCOUNTER
-#define NRFX_GRTC_CONFIG_AUTOSTART 1
-#endif
-
-#ifdef CONFIG_NRFX_GPIOTE
-#define NRFX_GPIOTE_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_GPIOTE_LOG
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_GPIOTE0
-#define NRFX_GPIOTE0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_GPIOTE1
-#define NRFX_GPIOTE1_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_GPIOTE20
-#define NRFX_GPIOTE20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_GPIOTE30
-#define NRFX_GPIOTE30_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_GPIOTE130
-#define NRFX_GPIOTE130_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_GPIOTE131
-#define NRFX_GPIOTE131_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_GPIOTE_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS CONFIG_NRFX_GPIOTE_NUM_OF_EVT_HANDLERS
-#endif
-
-#ifdef CONFIG_NRFX_I2S
-#define NRFX_I2S_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_I2S_LOG
-#define NRFX_I2S_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_I2S0
-#define NRFX_I2S0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_I2S20
-#define NRFX_I2S20_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_IPC
-#define NRFX_IPC_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_IPC_LOG
-#define NRFX_IPC_CONFIG_LOG_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_LPCOMP
-#define NRFX_LPCOMP_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_LPCOMP_LOG
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_NFCT
-#define NRFX_NFCT_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_NFCT_LOG
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_NVMC
-#define NRFX_NVMC_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_NVMC_LOG
-#define NRFX_NVMC_CONFIG_LOG_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_PDM
-#define NRFX_PDM_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PDM_LOG
-#define NRFX_PDM_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PDM0
-#define NRFX_PDM0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PDM20
-#define NRFX_PDM20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PDM21
-#define NRFX_PDM21_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_POWER
-#define NRFX_POWER_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_POWER_LOG
-#define NRFX_POWER_CONFIG_LOG_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_PPI
-#define NRFX_PPI_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPI_LOG
-#define NRFX_PPI_CONFIG_LOG_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_PPIB
-#define NRFX_PPIB_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPIB_LOG
-#define NRFX_PPIB_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPIB00
-#define NRFX_PPIB00_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPIB01
-#define NRFX_PPIB01_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPIB10
-#define NRFX_PPIB10_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPIB11
-#define NRFX_PPIB11_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPIB20
-#define NRFX_PPIB20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPIB21
-#define NRFX_PPIB21_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPIB22
-#define NRFX_PPIB22_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PPIB30
-#define NRFX_PPIB30_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_PRS
-#define NRFX_PRS_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PRS_LOG
-#define NRFX_PRS_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PRS_BOX_0
-#define NRFX_PRS_BOX_0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PRS_BOX_1
-#define NRFX_PRS_BOX_1_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PRS_BOX_2
-#define NRFX_PRS_BOX_2_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PRS_BOX_3
-#define NRFX_PRS_BOX_3_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PRS_BOX_4
-#define NRFX_PRS_BOX_4_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_PWM
-#define NRFX_PWM_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PWM_LOG
-#define NRFX_PWM_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PWM0
-#define NRFX_PWM0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PWM1
-#define NRFX_PWM1_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PWM2
-#define NRFX_PWM2_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PWM3
-#define NRFX_PWM3_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PWM20
-#define NRFX_PWM20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PWM21
-#define NRFX_PWM21_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PWM22
-#define NRFX_PWM22_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PWM120
-#define NRFX_PWM120_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PWM130
-#define NRFX_PWM130_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PWM131
-#define NRFX_PWM131_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PWM132
-#define NRFX_PWM132_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_PWM133
-#define NRFX_PWM133_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_QDEC
-#define NRFX_QDEC_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_QDEC_LOG
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_QDEC0
-#define NRFX_QDEC0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_QDEC1
-#define NRFX_QDEC1_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_QDEC20
-#define NRFX_QDEC20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_QDEC21
-#define NRFX_QDEC21_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_QDEC130
-#define NRFX_QDEC130_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_QDEC131
-#define NRFX_QDEC131_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_QSPI
-#define NRFX_QSPI_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_QSPI_LOG
-#define NRFX_QSPI_CONFIG_LOG_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_RNG
-#define NRFX_RNG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_RNG_LOG
-#define NRFX_RNG_CONFIG_LOG_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_RRAMC
-#define NRFX_RRAMC_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_RTC
-#define NRFX_RTC_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_RTC_LOG
-#define NRFX_RTC_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_RTC0
-#define NRFX_RTC0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_RTC1
-#define NRFX_RTC1_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_RTC2
-#define NRFX_RTC2_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_RTC130
-#define NRFX_RTC130_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_RTC131
-#define NRFX_RTC131_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_SAADC
-#define NRFX_SAADC_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SAADC_LOG
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_SPI
-#define NRFX_SPI_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPI_LOG
-#define NRFX_SPI_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPI0
-#define NRFX_SPI0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPI1
-#define NRFX_SPI1_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPI2
-#define NRFX_SPI2_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_SPIM
-#define NRFX_SPIM_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM_LOG
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM0
-#define NRFX_SPIM0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM1
-#define NRFX_SPIM1_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM2
-#define NRFX_SPIM2_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM3
-#define NRFX_SPIM3_ENABLED 1
-#ifdef CONFIG_NRF52_ANOMALY_198_WORKAROUND
-#define NRFX_SPIM3_NRF52840_ANOMALY_198_WORKAROUND_ENABLED 1
-#endif
-#endif
-#ifdef CONFIG_NRFX_SPIM4
-#define NRFX_SPIM4_ENABLED 1
-#endif
-
-#define NRFX_SPIM_DT_HAS_RX_DELAY(node) DT_PROP(node, rx_delay_supported) +
-
-#ifndef NRFX_SPIM_EXTENDED_ENABLED
-#if DT_FOREACH_STATUS_OKAY(nordic_nrf_spim, NRFX_SPIM_DT_HAS_RX_DELAY) 0
-#define NRFX_SPIM_EXTENDED_ENABLED 1
-#endif
-#endif
-
-#ifdef CONFIG_NRFX_SPIM00
-#define NRFX_SPIM00_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM20
-#define NRFX_SPIM20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM21
-#define NRFX_SPIM21_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM22
-#define NRFX_SPIM22_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM30
-#define NRFX_SPIM30_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM120
-#define NRFX_SPIM120_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM121
-#define NRFX_SPIM121_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM130
-#define NRFX_SPIM130_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM131
-#define NRFX_SPIM131_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM132
-#define NRFX_SPIM132_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM133
-#define NRFX_SPIM133_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM134
-#define NRFX_SPIM134_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM135
-#define NRFX_SPIM135_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM136
-#define NRFX_SPIM136_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM137
-#define NRFX_SPIM137_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_SPIS
-#define NRFX_SPIS_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS_LOG
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS0
-#define NRFX_SPIS0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS1
-#define NRFX_SPIS1_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS2
-#define NRFX_SPIS2_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS3
-#define NRFX_SPIS3_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS00
-#define NRFX_SPIS00_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS20
-#define NRFX_SPIS20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS21
-#define NRFX_SPIS21_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS22
-#define NRFX_SPIS22_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS30
-#define NRFX_SPIS30_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS120
-#define NRFX_SPIS120_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS130
-#define NRFX_SPIS130_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS131
-#define NRFX_SPIS131_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS132
-#define NRFX_SPIS132_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS133
-#define NRFX_SPIS133_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS134
-#define NRFX_SPIS134_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS135
-#define NRFX_SPIS135_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS136
-#define NRFX_SPIS136_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIS137
-#define NRFX_SPIS137_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_SYSTICK
-#define NRFX_SYSTICK_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SYSTICK_LOG
-#define NRFX_SYSTICK_CONFIG_LOG_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_TBM
-#define NRFX_TBM_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_TEMP
-#define NRFX_TEMP_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TEMP_LOG
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_TIMER
-#define NRFX_TIMER_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER_LOG
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER0
-#define NRFX_TIMER0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER1
-#define NRFX_TIMER1_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER2
-#define NRFX_TIMER2_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER3
-#define NRFX_TIMER3_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER4
-#define NRFX_TIMER4_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER00
-#define NRFX_TIMER00_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER10
-#define NRFX_TIMER10_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER20
-#define NRFX_TIMER20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER21
-#define NRFX_TIMER21_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER22
-#define NRFX_TIMER22_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER23
-#define NRFX_TIMER23_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER24
-#define NRFX_TIMER24_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER020
-#define NRFX_TIMER020_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER021
-#define NRFX_TIMER021_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER022
-#define NRFX_TIMER022_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER120
-#define NRFX_TIMER120_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER121
-#define NRFX_TIMER121_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER130
-#define NRFX_TIMER130_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER131
-#define NRFX_TIMER131_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER132
-#define NRFX_TIMER132_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER133
-#define NRFX_TIMER133_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER134
-#define NRFX_TIMER134_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER135
-#define NRFX_TIMER135_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER136
-#define NRFX_TIMER136_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TIMER137
-#define NRFX_TIMER137_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_TWI
-#define NRFX_TWI_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWI_LOG
-#define NRFX_TWI_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWI0
-#define NRFX_TWI0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWI1
-#define NRFX_TWI1_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_TWIM
-#define NRFX_TWIM_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM_LOG
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM0
-#define NRFX_TWIM0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM1
-#define NRFX_TWIM1_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM2
-#define NRFX_TWIM2_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM3
-#define NRFX_TWIM3_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM20
-#define NRFX_TWIM20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM21
-#define NRFX_TWIM21_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM22
-#define NRFX_TWIM22_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM30
-#define NRFX_TWIM30_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM120
-#define NRFX_TWIM120_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM130
-#define NRFX_TWIM130_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM131
-#define NRFX_TWIM131_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM132
-#define NRFX_TWIM132_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM133
-#define NRFX_TWIM133_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM134
-#define NRFX_TWIM134_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM135
-#define NRFX_TWIM135_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM136
-#define NRFX_TWIM136_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM137
-#define NRFX_TWIM137_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_TWIS
-#define NRFX_TWIS_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS_LOG
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS0
-#define NRFX_TWIS0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS1
-#define NRFX_TWIS1_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS2
-#define NRFX_TWIS2_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS3
-#define NRFX_TWIS3_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS20
-#define NRFX_TWIS20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS21
-#define NRFX_TWIS21_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS22
-#define NRFX_TWIS22_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS30
-#define NRFX_TWIS30_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS130
-#define NRFX_TWIS130_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS131
-#define NRFX_TWIS131_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS132
-#define NRFX_TWIS132_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS133
-#define NRFX_TWIS133_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS134
-#define NRFX_TWIS134_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS135
-#define NRFX_TWIS135_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS136
-#define NRFX_TWIS136_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS137
-#define NRFX_TWIS137_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_UART
-#define NRFX_UART_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UART_LOG
-#define NRFX_UART_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UART0
-#define NRFX_UART0_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_UARTE
-#define NRFX_UARTE_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE_LOG
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE0
-#define NRFX_UARTE0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE1
-#define NRFX_UARTE1_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE2
-#define NRFX_UARTE2_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE3
-#define NRFX_UARTE3_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE00
-#define NRFX_UARTE00_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE20
-#define NRFX_UARTE20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE21
-#define NRFX_UARTE21_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE22
-#define NRFX_UARTE22_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE30
-#define NRFX_UARTE30_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE120
-#define NRFX_UARTE120_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE130
-#define NRFX_UARTE130_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE131
-#define NRFX_UARTE131_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE132
-#define NRFX_UARTE132_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE133
-#define NRFX_UARTE133_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE134
-#define NRFX_UARTE134_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE135
-#define NRFX_UARTE135_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE136
-#define NRFX_UARTE136_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE137
-#define NRFX_UARTE137_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 1
-#endif
-#ifdef CONFIG_NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 1
-#endif
-#ifdef CONFIG_NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-#ifdef CONFIG_NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
-#define NRFX_UARTE_CONFIG_RX_CACHE_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_USBREG
-#define NRFX_USBREG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_USBREG_LOG
-#define NRFX_USBREG_CONFIG_LOG_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRFX_WDT
-#define NRFX_WDT_ENABLED 1
-#endif
-#ifdef CONFIG_WDT_NRFX_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 1
-#endif
-#ifdef CONFIG_NRFX_WDT_LOG
-#define NRFX_WDT_CONFIG_LOG_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_WDT0
-#define NRFX_WDT0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_WDT1
-#define NRFX_WDT1_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_WDT30
-#define NRFX_WDT30_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_WDT31
-#define NRFX_WDT31_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_WDT010
-#define NRFX_WDT010_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_WDT011
-#define NRFX_WDT011_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_WDT130
-#define NRFX_WDT130_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_WDT131
-#define NRFX_WDT131_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_WDT132
-#define NRFX_WDT132_ENABLED 1
-#endif
-
-#ifdef CONFIG_NRF52_ANOMALY_109_WORKAROUND
-#define NRFX_SPIM_NRF52_ANOMALY_109_WORKAROUND_ENABLED 1
-#define NRFX_SPIS_NRF52_ANOMALY_109_WORKAROUND_ENABLED 1
-#define NRFX_TWIM_NRF52_ANOMALY_109_WORKAROUND_ENABLED 1
-#define NRFX_PWM_NRF52_ANOMALY_109_WORKAROUND_ENABLED 1
-#define NRFX_PWM_NRF52_ANOMALY_109_EGU_INSTANCE \
-	CONFIG_NRF52_ANOMALY_109_WORKAROUND_EGU_INSTANCE
-#endif
-
-#if defined(CONFIG_SOC_SERIES_BSIM_NRFXX)
-#include "nrfx_config_bsim.h"
-#endif
-
-/*
- * For chips with TrustZone support, MDK provides CMSIS-Core peripheral
- * accessing symbols in two flavors, with secure and non-secure base address
- * mappings. Their names contain the suffix _S or _NS, respectively.
- * Because nrfx HALs and drivers require these peripheral accessing symbols
- * without any suffixes, the following macro is provided that will translate
- * their names according to the kind of the target that is built.
- */
-#if defined(NRF_TRUSTZONE_NONSECURE)
-#define NRF_PERIPH(P) P##_NS
-#else
-#define NRF_PERIPH(P) P##_S
-#endif
-
-#define NRFX_CONFIG_BIT_DT(node_id, prop, idx) BIT(DT_PROP_BY_IDX(node_id, prop, idx))
-#define NRFX_CONFIG_MASK_DT(node_id, prop) \
-	(COND_CODE_1(DT_NODE_HAS_PROP(node_id, prop), \
-		(DT_FOREACH_PROP_ELEM_SEP(node_id, prop, NRFX_CONFIG_BIT_DT, (|))), \
-		(0)))
-
-/* If the GRTC system timer driver is to be used, prepare definitions required
- * by the nrfx_grtc driver (NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK and
- * NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS) based on information from devicetree.
- */
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc)
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK \
-	(NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), owned_channels) & \
-	 ~NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), child_owned_channels))
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS \
-	(DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), owned_channels, 0) - \
-	 DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), child_owned_channels, 0))
-#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc) */
-
-/* If global of local DPPIC peripherals are used, provide the following macro
- * definitions required by the interconnect/apb layer:
- * - NRFX_DPPI_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
- * - NRFX_DPPI_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
- * - NRFX_DPPI_PUB_OR_SUB_MASK(inst_num)
- * - NRFX_DPPI_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num)
- * - NRFX_INTERCONNECT_APB_GLOBAL_DPPI_DEFINE
- * - NRFX_INTERCONNECT_APB_LOCAL_DPPI_DEFINE
- * based on information from devicetree.
- */
-#if	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_global) || \
-	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_local)
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 1
-#endif
-/* Source (publish) channels masks generation. */
-#define NRFX_DPPI_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
-	NRFX_CONFIG_MASK_DT(DT_NODELABEL(_CONCAT(dppic, inst_num)), source_channels)
-
-/* Sink (subscribe) channels masks generation. */
-#define NRFX_DPPI_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
-	NRFX_CONFIG_MASK_DT(DT_NODELABEL(_CONCAT(dppic, inst_num)), sink_channels)
-
-#define NRFX_DPPI_PUB_OR_SUB_MASK(inst_num) \
-	UTIL_OR(DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), source_channels), \
-		DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), sink_channels))
-
-/* Variables names generation. */
-#define NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(node_id) _CONCAT(_CONCAT(m_, node_id), _channels)
-#define NRFX_DPPI_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num) \
-	NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(DT_NODELABEL(_CONCAT(dppic, inst_num)))
-
-/* Variables entries generation. */
-#define NRFX_CONFIG_DPPI_CHANNELS_ENTRY(node_id) \
-	static nrfx_atomic_t NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(node_id) \
-		__attribute__((used)) = \
-		NRFX_CONFIG_MASK_DT(node_id, source_channels) | \
-		NRFX_CONFIG_MASK_DT(node_id, sink_channels);
-#define NRFX_INTERCONNECT_APB_GLOBAL_DPPI_DEFINE \
-	DT_FOREACH_STATUS_OKAY(nordic_nrf_dppic_global, NRFX_CONFIG_DPPI_CHANNELS_ENTRY)
-#define NRFX_INTERCONNECT_APB_LOCAL_DPPI_DEFINE \
-	DT_FOREACH_STATUS_OKAY(nordic_nrf_dppic_local, NRFX_CONFIG_DPPI_CHANNELS_ENTRY)
-#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_global) || ... */
-
-/* If local or global DPPIC peripherals are used, provide the following macro
- * definitions required by the interconnect/ipct layer:
- * - NRFX_IPCTx_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
- * - NRFX_IPCTx_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
- * - NRFX_IPCT_PUB_OR_SUB_MASK(inst_num)
- * - NRFX_IPCTx_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num)
- * - NRFX_INTERCONNECT_IPCT_GLOBAL_DEFINE
- * - NRFX_INTERCONNECT_IPCT_LOCAL_DEFINE
- * based on information from devicetree.
- */
-#if	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_ipct_global) || \
-	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_ipct_local)
-/* Channels masks generation. */
-#define NRFX_CONFIG_IPCT_MASK_DT(node_id) \
-	COND_CODE_1(DT_NODE_HAS_PROP(node_id, owned_channels), \
-		(NRFX_CONFIG_MASK_DT(node_id, owned_channels)), \
-		(COND_CODE_1(DT_NODE_HAS_COMPAT(node_id, nordic_nrf_ipct_local), \
-			(BIT_MASK(DT_PROP(node_id, channels))), (0))))
-
-#if defined(NRF_APPLICATION)
-#define NRFX_CONFIG_IPCT_LOCAL_NODE DT_NODELABEL(cpuapp_ipct)
-#elif defined(NRF_RADIOCORE)
-#define NRFX_CONFIG_IPCT_LOCAL_NODE DT_NODELABEL(cpurad_ipct)
-#endif
-#define NRFX_CONFIG_IPCT_NODE_BY_INST_NUM(inst_num) \
-	COND_CODE_1(IS_EMPTY(inst_num), \
-		(NRFX_CONFIG_IPCT_LOCAL_NODE), \
-		(DT_NODELABEL(_CONCAT(ipct, inst_num))))
-
-#define NRFX_IPCTx_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
-	NRFX_CONFIG_IPCT_MASK_DT(NRFX_CONFIG_IPCT_NODE_BY_INST_NUM(inst_num))
-
-#define NRFX_IPCTx_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
-	NRFX_CONFIG_IPCT_MASK_DT(NRFX_CONFIG_IPCT_NODE_BY_INST_NUM(inst_num))
-
-#define NRFX_IPCT_PUB_OR_SUB_MASK(inst_num) \
-	COND_CODE_1(IS_EMPTY(inst_num), \
-		(DT_NODE_HAS_STATUS_OKAY(NRFX_CONFIG_IPCT_LOCAL_NODE)), \
-		(DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(ipct, inst_num)), owned_channels)))
-
-/* Variables names generation. */
-#define NRFX_CONFIG_IPCT_CHANNELS_ENTRY_NAME(node_id) _CONCAT(_CONCAT(m_, node_id), _channels)
-#define NRFX_IPCTx_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num) \
-	COND_CODE_1(IS_EMPTY(inst_num), \
-		(NRFX_CONFIG_IPCT_CHANNELS_ENTRY_NAME(NRFX_CONFIG_IPCT_LOCAL_NODE)), \
-		(NRFX_CONFIG_IPCT_CHANNELS_ENTRY_NAME(DT_NODELABEL(_CONCAT(ipct, inst_num)))))
-
-/* Variables entries generation. */
-#define NRFX_CONFIG_IPCT_CHANNELS_ENTRY(node_id) \
-	static nrfx_atomic_t NRFX_CONFIG_IPCT_CHANNELS_ENTRY_NAME(node_id) \
-		__attribute__((used)) = \
-		NRFX_CONFIG_IPCT_MASK_DT(node_id);
-#define NRFX_INTERCONNECT_IPCT_LOCAL_DEFINE \
-	DT_FOREACH_STATUS_OKAY(nordic_nrf_ipct_local, NRFX_CONFIG_IPCT_CHANNELS_ENTRY)
-#define NRFX_INTERCONNECT_IPCT_GLOBAL_DEFINE \
-	DT_FOREACH_STATUS_OKAY(nordic_nrf_ipct_global, NRFX_CONFIG_IPCT_CHANNELS_ENTRY)
-#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_ipct_global) || ... */
+/* Define nrfx configuration based on Zephyrs KConfigs. */
+#include "nrfx_kconfig.h"
 
-#include <nrfx_config_common.h>
+/* Use defaults for undefined symbols. */
+#include <templates/nrfx_config_common.h>
 #if defined(NRF51)
-    #include <nrfx_config_nrf51.h>
+    #include <templates/nrfx_config_nrf51.h>
 #elif defined(NRF52805_XXAA)
-    #include <nrfx_config_nrf52805.h>
+    #include <templates/nrfx_config_nrf52805.h>
 #elif defined(NRF52810_XXAA)
-    #include <nrfx_config_nrf52810.h>
+    #include <templates/nrfx_config_nrf52810.h>
 #elif defined(NRF52811_XXAA)
-    #include <nrfx_config_nrf52811.h>
+    #include <templates/nrfx_config_nrf52811.h>
 #elif defined(NRF52820_XXAA)
-    #include <nrfx_config_nrf52820.h>
+    #include <templates/nrfx_config_nrf52820.h>
 #elif defined(NRF52832_XXAA) || defined (NRF52832_XXAB)
-    #include <nrfx_config_nrf52832.h>
+    #include <templates/nrfx_config_nrf52832.h>
 #elif defined(NRF52833_XXAA)
-    #include <nrfx_config_nrf52833.h>
+    #include <templates/nrfx_config_nrf52833.h>
 #elif defined(NRF52840_XXAA)
-    #include <nrfx_config_nrf52840.h>
+    #include <templates/nrfx_config_nrf52840.h>
 #elif defined(NRF5340_XXAA_APPLICATION)
-    #include <nrfx_config_nrf5340_application.h>
+    #include <templates/nrfx_config_nrf5340_application.h>
 #elif defined(NRF5340_XXAA_NETWORK)
-    #include <nrfx_config_nrf5340_network.h>
+    #include <templates/nrfx_config_nrf5340_network.h>
 #elif defined(NRF54H20_XXAA) && defined(NRF_APPLICATION)
-    #include <nrfx_config_nrf54h20_application.h>
+    #include <templates/nrfx_config_nrf54h20_application.h>
 #elif defined(NRF54H20_XXAA) && defined(NRF_RADIOCORE)
-    #include <nrfx_config_nrf54h20_radiocore.h>
+    #include <templates/nrfx_config_nrf54h20_radiocore.h>
 #elif defined(NRF54H20_XXAA) && defined(NRF_PPR)
-    #include <nrfx_config_nrf54h20_ppr.h>
+    #include <templates/nrfx_config_nrf54h20_ppr.h>
 #elif defined(NRF54H20_XXAA) && defined(NRF_FLPR)
-    #include <nrfx_config_nrf54h20_flpr.h>
+    #include <templates/nrfx_config_nrf54h20_flpr.h>
+#elif defined(NRF54H20_ENGA_XXAA) && defined(NRF_APPLICATION)
+    #include <templates/nrfx_config_nrf54h20_enga_application.h>
+#elif defined(NRF54H20_ENGA_XXAA) && defined(NRF_RADIOCORE)
+    #include <templates/nrfx_config_nrf54h20_enga_radiocore.h>
+#elif defined(NRF54H20_ENGA_XXAA) && defined(NRF_PPR)
+    #include <templates/nrfx_config_nrf54h20_enga_ppr.h>
+#elif defined(NRF54H20_ENGA_XXAA) && defined(NRF_FLPR)
+    #include <templates/nrfx_config_nrf54h20_enga_flpr.h>
+#elif defined(NRF54H20_ENGB_XXAA) && defined(NRF_APPLICATION)
+    #include <templates/nrfx_config_nrf54h20_engb_application.h>
+#elif defined(NRF54H20_ENGB_XXAA) && defined(NRF_RADIOCORE)
+    #include <templates/nrfx_config_nrf54h20_engb_radiocore.h>
+#elif defined(NRF54H20_ENGB_XXAA) && defined(NRF_PPR)
+    #include <templates/nrfx_config_nrf54h20_engb_ppr.h>
+#elif defined(NRF54H20_ENGB_XXAA) && defined(NRF_FLPR)
+    #include <templates/nrfx_config_nrf54h20_engb_flpr.h>
 #elif defined(NRF54L05_XXAA) && defined(NRF_APPLICATION)
-    #include <nrfx_config_nrf54l05_application.h>
+    #include <templates/nrfx_config_nrf54l05_application.h>
 #elif defined(NRF54L05_XXAA) && defined(NRF_FLPR)
-    #include <nrfx_config_nrf54l05_flpr.h>
+    #include <templates/nrfx_config_nrf54l05_flpr.h>
 #elif defined(NRF54L09_ENGA_XXAA) && defined(NRF_APPLICATION)
-    #include <nrfx_config_nrf54l09_enga_application.h>
+    #include <templates/nrfx_config_nrf54l09_enga_application.h>
+#elif defined(NRF54L09_ENGA_XXAA) && defined(NRF_FLPR)
+    #include <templates/nrfx_config_nrf54l09_enga_flpr.h>
 #elif defined(NRF54L10_XXAA) && defined(NRF_APPLICATION)
-    #include <nrfx_config_nrf54l10_application.h>
+    #include <templates/nrfx_config_nrf54l10_application.h>
 #elif defined(NRF54L10_XXAA) && defined(NRF_FLPR)
-    #include <nrfx_config_nrf54l10_flpr.h>
+    #include <templates/nrfx_config_nrf54l10_flpr.h>
 #elif defined(NRF54L15_XXAA) && defined(NRF_APPLICATION)
-    #include <nrfx_config_nrf54l15_application.h>
+    #include <templates/nrfx_config_nrf54l15_application.h>
 #elif defined(NRF54L15_XXAA) && defined(NRF_FLPR)
-    #include <nrfx_config_nrf54l15_flpr.h>
-#elif (defined(NRF54L20_XXAA) || defined(NRF54L20_ENGA_XXAA)) && defined(NRF_APPLICATION)
-    #include <nrfx_config_nrf54l20_enga_application.h>
+    #include <templates/nrfx_config_nrf54l15_flpr.h>
+#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_APPLICATION)
+    #include <templates/nrfx_config_nrf54l15_enga_application.h>
+#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_FLPR)
+    #include <templates/nrfx_config_nrf54l15_enga_flpr.h>
+#elif defined(NRF54L20_ENGA_XXAA) && defined(NRF_APPLICATION)
+    #include <templates/nrfx_config_nrf54l20_enga_application.h>
+#elif defined(NRF54L20_ENGA_XXAA) && defined(NRF_FLPR)
+    #include <templates/nrfx_config_nrf54l20_enga_flpr.h>
 #elif defined(NRF9120_XXAA) || defined(NRF9160_XXAA)
-    #include <nrfx_config_nrf91.h>
+    #include <templates/nrfx_config_nrf91.h>
 #elif defined(NRF9230_ENGB_XXAA) && defined(NRF_APPLICATION)
-    #include <nrfx_config_nrf9230_engb_application.h>
+    #include <templates/nrfx_config_nrf9230_engb_application.h>
 #elif defined(NRF9230_ENGB_XXAA) && defined(NRF_RADIOCORE)
-    #include <nrfx_config_nrf9230_engb_radiocore.h>
+    #include <templates/nrfx_config_nrf9230_engb_radiocore.h>
 #elif defined(NRF9230_ENGB_XXAA) && defined(NRF_PPR)
-    #include <nrfx_config_nrf9230_engb_ppr.h>
+    #include <templates/nrfx_config_nrf9230_engb_ppr.h>
+#elif defined(NRF9230_ENGB_XXAA) && defined(NRF_FLPR)
+    #include <templates/nrfx_config_nrf9230_engb_flpr.h>
 #else
-    #include <nrfx_config_ext.h>
+    #include "nrfx_config_ext.h"
 #endif
 
 #endif // NRFX_CONFIG_H__
diff --git a/modules/hal_nordic/nrfx/nrfx_config_common.h b/modules/hal_nordic/nrfx/nrfx_config_common.h
deleted file mode 100644
index 0cf80068038..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_common.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2022 - 2023, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_COMMON_H__
-#define NRFX_CONFIG_COMMON_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-/** @brief Symbol specifying major version of the nrfx API to be used. */
-#ifndef NRFX_CONFIG_API_VER_MAJOR
-#define NRFX_CONFIG_API_VER_MAJOR 3
-#endif
-
-/** @brief Symbol specifying minor version of the nrfx API to be used. */
-#ifndef NRFX_CONFIG_API_VER_MINOR
-#define NRFX_CONFIG_API_VER_MINOR 8
-#endif
-
-/** @brief Symbol specifying micro version of the nrfx API to be used. */
-#ifndef NRFX_CONFIG_API_VER_MICRO
-#define NRFX_CONFIG_API_VER_MICRO 0
-#endif
-
-#endif /* NRFX_CONFIG_COMMON_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_ext.h b/modules/hal_nordic/nrfx/nrfx_config_ext.h
deleted file mode 100644
index 9110b2fa7a9..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_ext.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2023 - 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_EXT_H__
-#define NRFX_CONFIG_EXT_H__
-
-#error "Unknown device."
-
-#endif /* NRFX_CONFIG_EXT_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf51.h b/modules/hal_nordic/nrfx/nrfx_config_nrf51.h
deleted file mode 100644
index 51d8bb1b8a5..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf51.h
+++ /dev/null
@@ -1,871 +0,0 @@
-/*
- * Copyright (c) 2017 - 2023, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF51_H__
-#define NRFX_CONFIG_NRF51_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 3
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 3
-#endif
-
-/**
- * @brief NRFX_ADC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_ADC_ENABLED
-#define NRFX_ADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_ADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 3
- */
-#ifndef NRFX_ADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_ADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_ADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_ADC_CONFIG_LOG_ENABLED
-#define NRFX_ADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_ADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_ADC_CONFIG_LOG_LEVEL
-#define NRFX_ADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 3
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 3
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0 Maximum: 15
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 1
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 3
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NVMC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NVMC_ENABLED
-#define NRFX_NVMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 3
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PPI_ENABLED
-#define NRFX_PPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PPI_CONFIG_LOG_ENABLED
-#define NRFX_PPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPI_CONFIG_LOG_LEVEL
-#define NRFX_PPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 3
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RNG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RNG_ENABLED
-#define NRFX_RNG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 3
- */
-#ifndef NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RNG_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RNG_CONFIG_LOG_ENABLED
-#define NRFX_RNG_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RNG_CONFIG_LOG_LEVEL
-#define NRFX_RNG_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 3
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC0_ENABLED
-#define NRFX_RTC0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC1_ENABLED
-#define NRFX_RTC1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI_ENABLED
-#define NRFX_SPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 3
- */
-#ifndef NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI_CONFIG_LOG_ENABLED
-#define NRFX_SPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPI_CONFIG_LOG_LEVEL
-#define NRFX_SPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPI0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI0_ENABLED
-#define NRFX_SPI0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI1_ENABLED
-#define NRFX_SPI1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 3
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS1_ENABLED
-#define NRFX_SPIS1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 3
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 3
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER0_ENABLED
-#define NRFX_TIMER0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER1_ENABLED
-#define NRFX_TIMER1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER2_ENABLED
-#define NRFX_TIMER2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI_ENABLED
-#define NRFX_TWI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 3
- */
-#ifndef NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI_CONFIG_LOG_ENABLED
-#define NRFX_TWI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWI_CONFIG_LOG_LEVEL
-#define NRFX_TWI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWI0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI0_ENABLED
-#define NRFX_TWI0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI1_ENABLED
-#define NRFX_TWI1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART_ENABLED
-#define NRFX_UART_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 3
- */
-#ifndef NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UART_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART_CONFIG_LOG_ENABLED
-#define NRFX_UART_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UART_CONFIG_LOG_LEVEL
-#define NRFX_UART_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UART0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART0_ENABLED
-#define NRFX_UART0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 3
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-#endif // NRFX_CONFIG_NRF51_H__
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf52805.h b/modules/hal_nordic/nrfx/nrfx_config_nrf52805.h
deleted file mode 100644
index 3ae4fa2228c..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf52805.h
+++ /dev/null
@@ -1,1117 +0,0 @@
-/*
- * Copyright (c) 2020 - 2023, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF52805_H__
-#define NRFX_CONFIG_NRF52805_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- * - External Low Swing  = 131073
- * - External Full Swing = 196609
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_CT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_CT_ENABLED
-#define NRFX_CLOCK_CONFIG_CT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU0_ENABLED
-#define NRFX_EGU0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU1_ENABLED
-#define NRFX_EGU1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0 Maximum: 15
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 1
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NVMC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NVMC_ENABLED
-#define NRFX_NVMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PPI_ENABLED
-#define NRFX_PPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PPI_CONFIG_LOG_ENABLED
-#define NRFX_PPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPI_CONFIG_LOG_LEVEL
-#define NRFX_PPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RNG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RNG_ENABLED
-#define NRFX_RNG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RNG_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RNG_CONFIG_LOG_ENABLED
-#define NRFX_RNG_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RNG_CONFIG_LOG_LEVEL
-#define NRFX_RNG_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC0_ENABLED
-#define NRFX_RTC0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC1_ENABLED
-#define NRFX_RTC1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI_ENABLED
-#define NRFX_SPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI_CONFIG_LOG_ENABLED
-#define NRFX_SPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPI_CONFIG_LOG_LEVEL
-#define NRFX_SPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPI0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI0_ENABLED
-#define NRFX_SPI0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM0_ENABLED
-#define NRFX_SPIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS0_ENABLED
-#define NRFX_SPIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER0_ENABLED
-#define NRFX_TIMER0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER1_ENABLED
-#define NRFX_TIMER1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER2_ENABLED
-#define NRFX_TIMER2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI_ENABLED
-#define NRFX_TWI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI_CONFIG_LOG_ENABLED
-#define NRFX_TWI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWI_CONFIG_LOG_LEVEL
-#define NRFX_TWI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWI0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI0_ENABLED
-#define NRFX_TWI0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM0_ENABLED
-#define NRFX_TWIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY - Assume that any instance would be initialized
- * only once.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS0_ENABLED
-#define NRFX_TWIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART_ENABLED
-#define NRFX_UART_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UART_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART_CONFIG_LOG_ENABLED
-#define NRFX_UART_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UART_CONFIG_LOG_LEVEL
-#define NRFX_UART_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UART0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART0_ENABLED
-#define NRFX_UART0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE0_ENABLED
-#define NRFX_UARTE0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-#endif // NRFX_CONFIG_NRF52805_H__
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf52810.h b/modules/hal_nordic/nrfx/nrfx_config_nrf52810.h
deleted file mode 100644
index c61641c8719..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf52810.h
+++ /dev/null
@@ -1,1252 +0,0 @@
-/*
- * Copyright (c) 2017 - 2023, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF52810_H__
-#define NRFX_CONFIG_NRF52810_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- * - External Low Swing  = 131073
- * - External Full Swing = 196609
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_CT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_CT_ENABLED
-#define NRFX_CLOCK_CONFIG_CT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU0_ENABLED
-#define NRFX_EGU0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU1_ENABLED
-#define NRFX_EGU1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0 Maximum: 15
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 1
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NVMC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NVMC_ENABLED
-#define NRFX_NVMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PPI_ENABLED
-#define NRFX_PPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PPI_CONFIG_LOG_ENABLED
-#define NRFX_PPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPI_CONFIG_LOG_LEVEL
-#define NRFX_PPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM0_ENABLED
-#define NRFX_PWM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RNG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RNG_ENABLED
-#define NRFX_RNG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RNG_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RNG_CONFIG_LOG_ENABLED
-#define NRFX_RNG_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RNG_CONFIG_LOG_LEVEL
-#define NRFX_RNG_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC0_ENABLED
-#define NRFX_RTC0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC1_ENABLED
-#define NRFX_RTC1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI_ENABLED
-#define NRFX_SPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI_CONFIG_LOG_ENABLED
-#define NRFX_SPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPI_CONFIG_LOG_LEVEL
-#define NRFX_SPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPI0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI0_ENABLED
-#define NRFX_SPI0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM0_ENABLED
-#define NRFX_SPIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS0_ENABLED
-#define NRFX_SPIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER0_ENABLED
-#define NRFX_TIMER0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER1_ENABLED
-#define NRFX_TIMER1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER2_ENABLED
-#define NRFX_TIMER2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI_ENABLED
-#define NRFX_TWI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI_CONFIG_LOG_ENABLED
-#define NRFX_TWI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWI_CONFIG_LOG_LEVEL
-#define NRFX_TWI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWI0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI0_ENABLED
-#define NRFX_TWI0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM0_ENABLED
-#define NRFX_TWIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY - Assume that any instance would be initialized
- * only once.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS0_ENABLED
-#define NRFX_TWIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART_ENABLED
-#define NRFX_UART_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UART_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART_CONFIG_LOG_ENABLED
-#define NRFX_UART_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UART_CONFIG_LOG_LEVEL
-#define NRFX_UART_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UART0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART0_ENABLED
-#define NRFX_UART0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE0_ENABLED
-#define NRFX_UARTE0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-#endif // NRFX_CONFIG_NRF52810_H__
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf52811.h b/modules/hal_nordic/nrfx/nrfx_config_nrf52811.h
deleted file mode 100644
index 152569ed899..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf52811.h
+++ /dev/null
@@ -1,1279 +0,0 @@
-/*
- * Copyright (c) 2018 - 2023, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF52811_H__
-#define NRFX_CONFIG_NRF52811_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- * - External Low Swing  = 131073
- * - External Full Swing = 196609
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_CT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_CT_ENABLED
-#define NRFX_CLOCK_CONFIG_CT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU0_ENABLED
-#define NRFX_EGU0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU1_ENABLED
-#define NRFX_EGU1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0 Maximum: 15
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 1
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NVMC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NVMC_ENABLED
-#define NRFX_NVMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PPI_ENABLED
-#define NRFX_PPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PPI_CONFIG_LOG_ENABLED
-#define NRFX_PPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPI_CONFIG_LOG_LEVEL
-#define NRFX_PPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM0_ENABLED
-#define NRFX_PWM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RNG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RNG_ENABLED
-#define NRFX_RNG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RNG_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RNG_CONFIG_LOG_ENABLED
-#define NRFX_RNG_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RNG_CONFIG_LOG_LEVEL
-#define NRFX_RNG_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC0_ENABLED
-#define NRFX_RTC0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC1_ENABLED
-#define NRFX_RTC1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI_ENABLED
-#define NRFX_SPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI_CONFIG_LOG_ENABLED
-#define NRFX_SPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPI_CONFIG_LOG_LEVEL
-#define NRFX_SPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPI1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI1_ENABLED
-#define NRFX_SPI1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI0_ENABLED
-#define NRFX_SPI0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM1_ENABLED
-#define NRFX_SPIM1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM0_ENABLED
-#define NRFX_SPIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS1_ENABLED
-#define NRFX_SPIS1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS0_ENABLED
-#define NRFX_SPIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER0_ENABLED
-#define NRFX_TIMER0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER1_ENABLED
-#define NRFX_TIMER1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER2_ENABLED
-#define NRFX_TIMER2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI_ENABLED
-#define NRFX_TWI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI_CONFIG_LOG_ENABLED
-#define NRFX_TWI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWI_CONFIG_LOG_LEVEL
-#define NRFX_TWI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWI0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI0_ENABLED
-#define NRFX_TWI0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM0_ENABLED
-#define NRFX_TWIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY - Assume that any instance would be initialized
- * only once.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS0_ENABLED
-#define NRFX_TWIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART_ENABLED
-#define NRFX_UART_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UART_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART_CONFIG_LOG_ENABLED
-#define NRFX_UART_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UART_CONFIG_LOG_LEVEL
-#define NRFX_UART_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UART0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART0_ENABLED
-#define NRFX_UART0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE0_ENABLED
-#define NRFX_UARTE0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-#endif // NRFX_CONFIG_NRF52811_H__
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf52820.h b/modules/hal_nordic/nrfx/nrfx_config_nrf52820.h
deleted file mode 100644
index 863b073f028..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf52820.h
+++ /dev/null
@@ -1,1277 +0,0 @@
-/*
- * Copyright (c) 2020 - 2023, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF52820_H__
-#define NRFX_CONFIG_NRF52820_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- * - External Low Swing  = 131073
- * - External Full Swing = 196609
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_CT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_CT_ENABLED
-#define NRFX_CLOCK_CONFIG_CT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU0_ENABLED
-#define NRFX_EGU0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU1_ENABLED
-#define NRFX_EGU1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU2_ENABLED
-#define NRFX_EGU2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU3_ENABLED
-#define NRFX_EGU3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU4_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU4_ENABLED
-#define NRFX_EGU4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU5_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU5_ENABLED
-#define NRFX_EGU5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0 Maximum: 15
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 1
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NVMC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NVMC_ENABLED
-#define NRFX_NVMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PPI_ENABLED
-#define NRFX_PPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PPI_CONFIG_LOG_ENABLED
-#define NRFX_PPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPI_CONFIG_LOG_LEVEL
-#define NRFX_PPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RNG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RNG_ENABLED
-#define NRFX_RNG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RNG_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RNG_CONFIG_LOG_ENABLED
-#define NRFX_RNG_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RNG_CONFIG_LOG_LEVEL
-#define NRFX_RNG_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC0_ENABLED
-#define NRFX_RTC0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC1_ENABLED
-#define NRFX_RTC1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI_ENABLED
-#define NRFX_SPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI_CONFIG_LOG_ENABLED
-#define NRFX_SPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPI_CONFIG_LOG_LEVEL
-#define NRFX_SPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPI0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI0_ENABLED
-#define NRFX_SPI0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI1_ENABLED
-#define NRFX_SPI1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM0_ENABLED
-#define NRFX_SPIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM1_ENABLED
-#define NRFX_SPIM1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS0_ENABLED
-#define NRFX_SPIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS1_ENABLED
-#define NRFX_SPIS1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER0_ENABLED
-#define NRFX_TIMER0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER1_ENABLED
-#define NRFX_TIMER1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER2_ENABLED
-#define NRFX_TIMER2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER3_ENABLED
-#define NRFX_TIMER3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI_ENABLED
-#define NRFX_TWI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI_CONFIG_LOG_ENABLED
-#define NRFX_TWI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWI_CONFIG_LOG_LEVEL
-#define NRFX_TWI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWI0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI0_ENABLED
-#define NRFX_TWI0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI1_ENABLED
-#define NRFX_TWI1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM0_ENABLED
-#define NRFX_TWIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM1_ENABLED
-#define NRFX_TWIM1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY - Assume that any instance would be initialized
- * only once.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS0_ENABLED
-#define NRFX_TWIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS1_ENABLED
-#define NRFX_TWIS1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART_ENABLED
-#define NRFX_UART_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UART_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART_CONFIG_LOG_ENABLED
-#define NRFX_UART_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UART_CONFIG_LOG_LEVEL
-#define NRFX_UART_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UART0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART0_ENABLED
-#define NRFX_UART0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE0_ENABLED
-#define NRFX_UARTE0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_USBD_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_USBD_ENABLED
-#define NRFX_USBD_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_USBD_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_USBD_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_USBD_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_USBD_CONFIG_DMASCHEDULER_ISO_BOOST - Give priority to isochronous transfers
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_USBD_CONFIG_DMASCHEDULER_ISO_BOOST
-#define NRFX_USBD_CONFIG_DMASCHEDULER_ISO_BOOST 1
-#endif
-
-/**
- * @brief NRFX_USBD_CONFIG_ISO_IN_ZLP - Respond to an IN token on ISO IN endpoint with ZLP when
- * no data is ready.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_USBD_CONFIG_ISO_IN_ZLP
-#define NRFX_USBD_CONFIG_ISO_IN_ZLP 0
-#endif
-
-/**
- * @brief NRFX_USBD_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_USBD_CONFIG_LOG_ENABLED
-#define NRFX_USBD_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_USBD_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_USBD_CONFIG_LOG_LEVEL
-#define NRFX_USBD_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-#endif // NRFX_CONFIG_NRF52820_H__
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf52832.h b/modules/hal_nordic/nrfx/nrfx_config_nrf52832.h
deleted file mode 100644
index b181bf6cdcc..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf52832.h
+++ /dev/null
@@ -1,1608 +0,0 @@
-/*
- * Copyright (c) 2017 - 2023, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF52832_H__
-#define NRFX_CONFIG_NRF52832_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- * - External Low Swing  = 131073
- * - External Full Swing = 196609
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_CT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_CT_ENABLED
-#define NRFX_CLOCK_CONFIG_CT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU0_ENABLED
-#define NRFX_EGU0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU1_ENABLED
-#define NRFX_EGU1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU2_ENABLED
-#define NRFX_EGU2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU3_ENABLED
-#define NRFX_EGU3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU4_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU4_ENABLED
-#define NRFX_EGU4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU5_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU5_ENABLED
-#define NRFX_EGU5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0 Maximum: 15
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 1
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0 Maximum: 5
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 4
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NVMC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NVMC_ENABLED
-#define NRFX_NVMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PPI_ENABLED
-#define NRFX_PPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PPI_CONFIG_LOG_ENABLED
-#define NRFX_PPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPI_CONFIG_LOG_LEVEL
-#define NRFX_PPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_NRF52_ANOMALY_109_WORKAROUND_ENABLED - Enables nRF52 Anomaly 109 workaround
- * for PWM.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_NRF52_ANOMALY_109_WORKAROUND_ENABLED
-#define NRFX_PWM_NRF52_ANOMALY_109_WORKAROUND_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_NRF52_ANOMALY_109_EGU_INSTANCE - EGU instance used by the nRF52 Anomaly 109
- * workaround for PWM.
- *
- * Integer value. Minimum: 0 Maximum: 5
- */
-#ifndef NRFX_PWM_NRF52_ANOMALY_109_EGU_INSTANCE
-#define NRFX_PWM_NRF52_ANOMALY_109_EGU_INSTANCE 5
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM0_ENABLED
-#define NRFX_PWM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM1_ENABLED
-#define NRFX_PWM1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM2_ENABLED
-#define NRFX_PWM2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RNG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RNG_ENABLED
-#define NRFX_RNG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RNG_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RNG_CONFIG_LOG_ENABLED
-#define NRFX_RNG_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RNG_CONFIG_LOG_LEVEL
-#define NRFX_RNG_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC0_ENABLED
-#define NRFX_RTC0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC1_ENABLED
-#define NRFX_RTC1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC2_ENABLED
-#define NRFX_RTC2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI_ENABLED
-#define NRFX_SPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI_CONFIG_LOG_ENABLED
-#define NRFX_SPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPI_CONFIG_LOG_LEVEL
-#define NRFX_SPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPI0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI0_ENABLED
-#define NRFX_SPI0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI1_ENABLED
-#define NRFX_SPI1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI2_ENABLED
-#define NRFX_SPI2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_NRF52_ANOMALY_109_WORKAROUND_ENABLED - Enables nRF52 Anomaly 109 workaround for
- * SPIM.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_NRF52_ANOMALY_109_WORKAROUND_ENABLED
-#define NRFX_SPIM_NRF52_ANOMALY_109_WORKAROUND_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM0_ENABLED
-#define NRFX_SPIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM1_ENABLED
-#define NRFX_SPIM1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM2_ENABLED
-#define NRFX_SPIM2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_NRF52_ANOMALY_109_WORKAROUND_ENABLED - Enables nRF52 Anomaly 109 workaround
- * for SPIS.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_NRF52_ANOMALY_109_WORKAROUND_ENABLED
-#define NRFX_SPIS_NRF52_ANOMALY_109_WORKAROUND_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS0_ENABLED
-#define NRFX_SPIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS1_ENABLED
-#define NRFX_SPIS1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS2_ENABLED
-#define NRFX_SPIS2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER0_ENABLED
-#define NRFX_TIMER0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER1_ENABLED
-#define NRFX_TIMER1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER2_ENABLED
-#define NRFX_TIMER2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER3_ENABLED
-#define NRFX_TIMER3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER4_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER4_ENABLED
-#define NRFX_TIMER4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI_ENABLED
-#define NRFX_TWI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI_CONFIG_LOG_ENABLED
-#define NRFX_TWI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWI_CONFIG_LOG_LEVEL
-#define NRFX_TWI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWI0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI0_ENABLED
-#define NRFX_TWI0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI1_ENABLED
-#define NRFX_TWI1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_NRF52_ANOMALY_109_WORKAROUND_ENABLED - Enables nRF52 Anomaly 109 workaround for
- * TWIM.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_NRF52_ANOMALY_109_WORKAROUND_ENABLED
-#define NRFX_TWIM_NRF52_ANOMALY_109_WORKAROUND_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM0_ENABLED
-#define NRFX_TWIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM1_ENABLED
-#define NRFX_TWIM1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY - Assume that any instance would be initialized
- * only once.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS0_ENABLED
-#define NRFX_TWIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS1_ENABLED
-#define NRFX_TWIS1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART_ENABLED
-#define NRFX_UART_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UART_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART_CONFIG_LOG_ENABLED
-#define NRFX_UART_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UART_CONFIG_LOG_LEVEL
-#define NRFX_UART_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UART0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART0_ENABLED
-#define NRFX_UART0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE0_ENABLED
-#define NRFX_UARTE0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-#endif // NRFX_CONFIG_NRF52832_H__
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf52833.h b/modules/hal_nordic/nrfx/nrfx_config_nrf52833.h
deleted file mode 100644
index f53b04eb62d..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf52833.h
+++ /dev/null
@@ -1,1646 +0,0 @@
-/*
- * Copyright (c) 2019 - 2023, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF52833_H__
-#define NRFX_CONFIG_NRF52833_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- * - External Low Swing  = 131073
- * - External Full Swing = 196609
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_CT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_CT_ENABLED
-#define NRFX_CLOCK_CONFIG_CT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU0_ENABLED
-#define NRFX_EGU0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU1_ENABLED
-#define NRFX_EGU1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU2_ENABLED
-#define NRFX_EGU2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU3_ENABLED
-#define NRFX_EGU3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU4_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU4_ENABLED
-#define NRFX_EGU4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU5_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU5_ENABLED
-#define NRFX_EGU5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0 Maximum: 15
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 1
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0 Maximum: 5
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 4
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NVMC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NVMC_ENABLED
-#define NRFX_NVMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PPI_ENABLED
-#define NRFX_PPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PPI_CONFIG_LOG_ENABLED
-#define NRFX_PPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPI_CONFIG_LOG_LEVEL
-#define NRFX_PPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM0_ENABLED
-#define NRFX_PWM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM1_ENABLED
-#define NRFX_PWM1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM2_ENABLED
-#define NRFX_PWM2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM3_ENABLED
-#define NRFX_PWM3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RNG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RNG_ENABLED
-#define NRFX_RNG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RNG_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RNG_CONFIG_LOG_ENABLED
-#define NRFX_RNG_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RNG_CONFIG_LOG_LEVEL
-#define NRFX_RNG_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC0_ENABLED
-#define NRFX_RTC0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC1_ENABLED
-#define NRFX_RTC1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC2_ENABLED
-#define NRFX_RTC2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI_ENABLED
-#define NRFX_SPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI_CONFIG_LOG_ENABLED
-#define NRFX_SPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPI_CONFIG_LOG_LEVEL
-#define NRFX_SPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPI0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI0_ENABLED
-#define NRFX_SPI0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI1_ENABLED
-#define NRFX_SPI1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI2_ENABLED
-#define NRFX_SPI2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM0_ENABLED
-#define NRFX_SPIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM1_ENABLED
-#define NRFX_SPIM1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM2_ENABLED
-#define NRFX_SPIM2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM3_ENABLED
-#define NRFX_SPIM3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS0_ENABLED
-#define NRFX_SPIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS1_ENABLED
-#define NRFX_SPIS1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS2_ENABLED
-#define NRFX_SPIS2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER0_ENABLED
-#define NRFX_TIMER0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER1_ENABLED
-#define NRFX_TIMER1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER2_ENABLED
-#define NRFX_TIMER2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER3_ENABLED
-#define NRFX_TIMER3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER4_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER4_ENABLED
-#define NRFX_TIMER4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI_ENABLED
-#define NRFX_TWI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI_CONFIG_LOG_ENABLED
-#define NRFX_TWI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWI_CONFIG_LOG_LEVEL
-#define NRFX_TWI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWI0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI0_ENABLED
-#define NRFX_TWI0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI1_ENABLED
-#define NRFX_TWI1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM0_ENABLED
-#define NRFX_TWIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM1_ENABLED
-#define NRFX_TWIM1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY - Assume that any instance would be initialized
- * only once.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS0_ENABLED
-#define NRFX_TWIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS1_ENABLED
-#define NRFX_TWIS1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART_ENABLED
-#define NRFX_UART_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UART_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART_CONFIG_LOG_ENABLED
-#define NRFX_UART_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UART_CONFIG_LOG_LEVEL
-#define NRFX_UART_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UART0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART0_ENABLED
-#define NRFX_UART0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE0_ENABLED
-#define NRFX_UARTE0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE1_ENABLED
-#define NRFX_UARTE1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_USBD_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_USBD_ENABLED
-#define NRFX_USBD_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_USBD_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_USBD_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_USBD_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_USBD_CONFIG_DMASCHEDULER_ISO_BOOST - Give priority to isochronous transfers
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_USBD_CONFIG_DMASCHEDULER_ISO_BOOST
-#define NRFX_USBD_CONFIG_DMASCHEDULER_ISO_BOOST 1
-#endif
-
-/**
- * @brief NRFX_USBD_CONFIG_ISO_IN_ZLP - Respond to an IN token on ISO IN endpoint with ZLP when no
- * data is ready.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_USBD_CONFIG_ISO_IN_ZLP
-#define NRFX_USBD_CONFIG_ISO_IN_ZLP 0
-#endif
-
-/**
- * @brief NRFX_USBD_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_USBD_CONFIG_LOG_ENABLED
-#define NRFX_USBD_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_USBD_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_USBD_CONFIG_LOG_LEVEL
-#define NRFX_USBD_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-#endif // NRFX_CONFIG_NRF52833_H__
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf52840.h b/modules/hal_nordic/nrfx/nrfx_config_nrf52840.h
deleted file mode 100644
index 0c49a6e5474..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf52840.h
+++ /dev/null
@@ -1,1673 +0,0 @@
-/*
- * Copyright (c) 2017 - 2023, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF52840_H__
-#define NRFX_CONFIG_NRF52840_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- * - External Low Swing  = 131073
- * - External Full Swing = 196609
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_CT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_CT_ENABLED
-#define NRFX_CLOCK_CONFIG_CT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU0_ENABLED
-#define NRFX_EGU0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU1_ENABLED
-#define NRFX_EGU1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU2_ENABLED
-#define NRFX_EGU2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU3_ENABLED
-#define NRFX_EGU3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU4_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU4_ENABLED
-#define NRFX_EGU4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU5_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU5_ENABLED
-#define NRFX_EGU5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0 Maximum: 15
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 1
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0 Maximum: 5
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 4
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NVMC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NVMC_ENABLED
-#define NRFX_NVMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PPI_ENABLED
-#define NRFX_PPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PPI_CONFIG_LOG_ENABLED
-#define NRFX_PPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPI_CONFIG_LOG_LEVEL
-#define NRFX_PPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM0_ENABLED
-#define NRFX_PWM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM1_ENABLED
-#define NRFX_PWM1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM2_ENABLED
-#define NRFX_PWM2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM3_ENABLED
-#define NRFX_PWM3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QSPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QSPI_ENABLED
-#define NRFX_QSPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QSPI_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_QSPI_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QSPI_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RNG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RNG_ENABLED
-#define NRFX_RNG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RNG_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RNG_CONFIG_LOG_ENABLED
-#define NRFX_RNG_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RNG_CONFIG_LOG_LEVEL
-#define NRFX_RNG_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC0_ENABLED
-#define NRFX_RTC0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC1_ENABLED
-#define NRFX_RTC1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC2_ENABLED
-#define NRFX_RTC2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI_ENABLED
-#define NRFX_SPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPI_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI_CONFIG_LOG_ENABLED
-#define NRFX_SPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPI_CONFIG_LOG_LEVEL
-#define NRFX_SPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPI0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI0_ENABLED
-#define NRFX_SPI0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI1_ENABLED
-#define NRFX_SPI1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPI2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPI2_ENABLED
-#define NRFX_SPI2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM3_NRF52840_ANOMALY_198_WORKAROUND_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM3_NRF52840_ANOMALY_198_WORKAROUND_ENABLED
-#define NRFX_SPIM3_NRF52840_ANOMALY_198_WORKAROUND_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM0_ENABLED
-#define NRFX_SPIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM1_ENABLED
-#define NRFX_SPIM1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM2_ENABLED
-#define NRFX_SPIM2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM3_ENABLED
-#define NRFX_SPIM3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS0_ENABLED
-#define NRFX_SPIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS1_ENABLED
-#define NRFX_SPIS1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS2_ENABLED
-#define NRFX_SPIS2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER0_ENABLED
-#define NRFX_TIMER0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER1_ENABLED
-#define NRFX_TIMER1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER2_ENABLED
-#define NRFX_TIMER2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER3_ENABLED
-#define NRFX_TIMER3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER4_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER4_ENABLED
-#define NRFX_TIMER4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI_ENABLED
-#define NRFX_TWI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWI_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI_CONFIG_LOG_ENABLED
-#define NRFX_TWI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWI_CONFIG_LOG_LEVEL
-#define NRFX_TWI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWI0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI0_ENABLED
-#define NRFX_TWI0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWI1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWI1_ENABLED
-#define NRFX_TWI1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM0_ENABLED
-#define NRFX_TWIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM1_ENABLED
-#define NRFX_TWIM1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY - Assume that any instance would be initialized
- * only once.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS0_ENABLED
-#define NRFX_TWIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS1_ENABLED
-#define NRFX_TWIS1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART_ENABLED
-#define NRFX_UART_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UART_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UART_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART_CONFIG_LOG_ENABLED
-#define NRFX_UART_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UART_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UART_CONFIG_LOG_LEVEL
-#define NRFX_UART_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UART0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UART0_ENABLED
-#define NRFX_UART0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE0_ENABLED
-#define NRFX_UARTE0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE1_ENABLED
-#define NRFX_UARTE1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_USBD_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_USBD_ENABLED
-#define NRFX_USBD_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_USBD_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_USBD_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_USBD_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_USBD_CONFIG_DMASCHEDULER_ISO_BOOST - Give priority to isochronous transfers
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_USBD_CONFIG_DMASCHEDULER_ISO_BOOST
-#define NRFX_USBD_CONFIG_DMASCHEDULER_ISO_BOOST 1
-#endif
-
-/**
- * @brief NRFX_USBD_CONFIG_ISO_IN_ZLP - Respond to an IN token on ISO IN endpoint with ZLP when no
- * data is ready.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_USBD_CONFIG_ISO_IN_ZLP
-#define NRFX_USBD_CONFIG_ISO_IN_ZLP 0
-#endif
-
-/**
- * @brief NRFX_USBD_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_USBD_CONFIG_LOG_ENABLED
-#define NRFX_USBD_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_USBD_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_USBD_CONFIG_LOG_LEVEL
-#define NRFX_USBD_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-#endif // NRFX_CONFIG_NRF52840_H__
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf5340_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf5340_application.h
deleted file mode 100644
index ab04db03f15..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf5340_application.h
+++ /dev/null
@@ -1,1615 +0,0 @@
-/*
- * Copyright (c) 2019 - 2023, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF5340_APPLICATION_H__
-#define NRFX_CONFIG_NRF5340_APPLICATION_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-#define NRF_CLOCK        NRF_PERIPH(NRF_CLOCK)
-#define NRF_COMP         NRF_PERIPH(NRF_COMP)
-#define NRF_CTRLAP       NRF_PERIPH(NRF_CTRLAP)
-#define NRF_DCNF         NRF_PERIPH(NRF_DCNF)
-#define NRF_DPPIC        NRF_PERIPH(NRF_DPPIC)
-#define NRF_EGU0         NRF_PERIPH(NRF_EGU0)
-#define NRF_EGU1         NRF_PERIPH(NRF_EGU1)
-#define NRF_EGU2         NRF_PERIPH(NRF_EGU2)
-#define NRF_EGU3         NRF_PERIPH(NRF_EGU3)
-#define NRF_EGU4         NRF_PERIPH(NRF_EGU4)
-#define NRF_EGU5         NRF_PERIPH(NRF_EGU5)
-#define NRF_FPU          NRF_PERIPH(NRF_FPU)
-#define NRF_I2S0         NRF_PERIPH(NRF_I2S0)
-#define NRF_IPC          NRF_PERIPH(NRF_IPC)
-#define NRF_KMU          NRF_PERIPH(NRF_KMU)
-#define NRF_LPCOMP       NRF_PERIPH(NRF_LPCOMP)
-#define NRF_MUTEX        NRF_PERIPH(NRF_MUTEX)
-#define NRF_NFCT         NRF_PERIPH(NRF_NFCT)
-#define NRF_NVMC         NRF_PERIPH(NRF_NVMC)
-#define NRF_OSCILLATORS  NRF_PERIPH(NRF_OSCILLATORS)
-#define NRF_P0           NRF_PERIPH(NRF_P0)
-#define NRF_P1           NRF_PERIPH(NRF_P1)
-#define NRF_PDM0         NRF_PERIPH(NRF_PDM0)
-#define NRF_POWER        NRF_PERIPH(NRF_POWER)
-#define NRF_PWM0         NRF_PERIPH(NRF_PWM0)
-#define NRF_PWM1         NRF_PERIPH(NRF_PWM1)
-#define NRF_PWM2         NRF_PERIPH(NRF_PWM2)
-#define NRF_PWM3         NRF_PERIPH(NRF_PWM3)
-#define NRF_QDEC0        NRF_PERIPH(NRF_QDEC0)
-#define NRF_QDEC1        NRF_PERIPH(NRF_QDEC1)
-#define NRF_QSPI         NRF_PERIPH(NRF_QSPI)
-#define NRF_REGULATORS   NRF_PERIPH(NRF_REGULATORS)
-#define NRF_RESET        NRF_PERIPH(NRF_RESET)
-#define NRF_RTC0         NRF_PERIPH(NRF_RTC0)
-#define NRF_RTC1         NRF_PERIPH(NRF_RTC1)
-#define NRF_SAADC        NRF_PERIPH(NRF_SAADC)
-#define NRF_SPIM0        NRF_PERIPH(NRF_SPIM0)
-#define NRF_SPIM1        NRF_PERIPH(NRF_SPIM1)
-#define NRF_SPIM2        NRF_PERIPH(NRF_SPIM2)
-#define NRF_SPIM3        NRF_PERIPH(NRF_SPIM3)
-#define NRF_SPIM4        NRF_PERIPH(NRF_SPIM4)
-#define NRF_SPIS0        NRF_PERIPH(NRF_SPIS0)
-#define NRF_SPIS1        NRF_PERIPH(NRF_SPIS1)
-#define NRF_SPIS2        NRF_PERIPH(NRF_SPIS2)
-#define NRF_SPIS3        NRF_PERIPH(NRF_SPIS3)
-#define NRF_TIMER0       NRF_PERIPH(NRF_TIMER0)
-#define NRF_TIMER1       NRF_PERIPH(NRF_TIMER1)
-#define NRF_TIMER2       NRF_PERIPH(NRF_TIMER2)
-#define NRF_TWIM0        NRF_PERIPH(NRF_TWIM0)
-#define NRF_TWIM1        NRF_PERIPH(NRF_TWIM1)
-#define NRF_TWIM2        NRF_PERIPH(NRF_TWIM2)
-#define NRF_TWIM3        NRF_PERIPH(NRF_TWIM3)
-#define NRF_TWIS0        NRF_PERIPH(NRF_TWIS0)
-#define NRF_TWIS1        NRF_PERIPH(NRF_TWIS1)
-#define NRF_TWIS2        NRF_PERIPH(NRF_TWIS2)
-#define NRF_TWIS3        NRF_PERIPH(NRF_TWIS3)
-#define NRF_UARTE0       NRF_PERIPH(NRF_UARTE0)
-#define NRF_UARTE1       NRF_PERIPH(NRF_UARTE1)
-#define NRF_UARTE2       NRF_PERIPH(NRF_UARTE2)
-#define NRF_UARTE3       NRF_PERIPH(NRF_UARTE3)
-#define NRF_USBD         NRF_PERIPH(NRF_USBD)
-#define NRF_USBREGULATOR NRF_PERIPH(NRF_USBREGULATOR)
-#define NRF_VMC          NRF_PERIPH(NRF_VMC)
-#define NRF_WDT0         NRF_PERIPH(NRF_WDT0)
-#define NRF_WDT1         NRF_PERIPH(NRF_WDT1)
-
-/*
- * The following section provides the name translation for peripherals with
- * only one type of access available. For these peripherals, you cannot choose
- * between secure and non-secure mapping.
- */
-#if defined(NRF_TRUSTZONE_NONSECURE)
-#define NRF_GPIOTE       NRF_GPIOTE1
-#define NRF_GPIOTE1      NRF_GPIOTE1_NS
-#else
-#define NRF_CACHE        NRF_CACHE_S
-#define NRF_CACHEINFO    NRF_CACHEINFO_S
-#define NRF_CACHEDATA    NRF_CACHEDATA_S
-#define NRF_CRYPTOCELL   NRF_CRYPTOCELL_S
-#define NRF_CTI          NRF_CTI_S
-#define NRF_FICR         NRF_FICR_S
-#define NRF_GPIOTE       NRF_GPIOTE0
-#define NRF_GPIOTE0      NRF_GPIOTE0_S
-#define NRF_GPIOTE1      NRF_GPIOTE1_NS
-#define NRF_SPU          NRF_SPU_S
-#define NRF_TAD          NRF_TAD_S
-#define NRF_UICR         NRF_UICR_S
-#endif
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_HFCLK192M_SRC
- *
- * Integer value.
- * Supported values:
- * - HFINT = 0
- * - HFXO  = 1
- */
-#ifndef NRFX_CLOCK_CONFIG_HFCLK192M_SRC
-#define NRFX_CLOCK_CONFIG_HFCLK192M_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 1
- * - XTAL  = 2
- * - Synth = 3
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 2
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU0_ENABLED
-#define NRFX_EGU0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU1_ENABLED
-#define NRFX_EGU1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU2_ENABLED
-#define NRFX_EGU2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU3_ENABLED
-#define NRFX_EGU3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU4_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU4_ENABLED
-#define NRFX_EGU4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU5_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU5_ENABLED
-#define NRFX_EGU5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0 Maximum: 15
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 1
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_I2S0_ENABLED
-#define NRFX_I2S0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_IPC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_IPC_ENABLED
-#define NRFX_IPC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0 Maximum: 5
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 2
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NVMC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NVMC_ENABLED
-#define NRFX_NVMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM0_ENABLED
-#define NRFX_PDM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM0_ENABLED
-#define NRFX_PWM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM1_ENABLED
-#define NRFX_PWM1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM2_ENABLED
-#define NRFX_PWM2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM3_ENABLED
-#define NRFX_PWM3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC0_ENABLED
-#define NRFX_QDEC0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QDEC1_ENABLED
-#define NRFX_QDEC1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QSPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_QSPI_ENABLED
-#define NRFX_QSPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QSPI_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_QSPI_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QSPI_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC0_ENABLED
-#define NRFX_RTC0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC1_ENABLED
-#define NRFX_RTC1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM0_ENABLED
-#define NRFX_SPIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM1_ENABLED
-#define NRFX_SPIM1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM4_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM4_ENABLED
-#define NRFX_SPIM4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM2_ENABLED
-#define NRFX_SPIM2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM3_ENABLED
-#define NRFX_SPIM3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS0_ENABLED
-#define NRFX_SPIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS1_ENABLED
-#define NRFX_SPIS1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS2_ENABLED
-#define NRFX_SPIS2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS3_ENABLED
-#define NRFX_SPIS3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER0_ENABLED
-#define NRFX_TIMER0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER1_ENABLED
-#define NRFX_TIMER1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER2_ENABLED
-#define NRFX_TIMER2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM0_ENABLED
-#define NRFX_TWIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM1_ENABLED
-#define NRFX_TWIM1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM2_ENABLED
-#define NRFX_TWIM2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM3_ENABLED
-#define NRFX_TWIM3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY - Assume that any instance would be initialized
- * only once.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS0_ENABLED
-#define NRFX_TWIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS1_ENABLED
-#define NRFX_TWIS1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS2_ENABLED
-#define NRFX_TWIS2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS3_ENABLED
-#define NRFX_TWIS3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE0_ENABLED
-#define NRFX_UARTE0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE1_ENABLED
-#define NRFX_UARTE1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE2_ENABLED
-#define NRFX_UARTE2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE3_ENABLED
-#define NRFX_UARTE3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_USBD_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_USBD_ENABLED
-#define NRFX_USBD_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_USBD_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_USBD_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_USBD_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_USBD_CONFIG_DMASCHEDULER_ISO_BOOST - Give priority to isochronous transfers
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_USBD_CONFIG_DMASCHEDULER_ISO_BOOST
-#define NRFX_USBD_CONFIG_DMASCHEDULER_ISO_BOOST 1
-#endif
-
-/**
- * @brief NRFX_USBD_CONFIG_ISO_IN_ZLP - Respond to an IN token on ISO IN endpoint with ZLP when no
- * data is ready.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_USBD_CONFIG_ISO_IN_ZLP
-#define NRFX_USBD_CONFIG_ISO_IN_ZLP 0
-#endif
-
-/**
- * @brief NRFX_USBD_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_USBD_CONFIG_LOG_ENABLED
-#define NRFX_USBD_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_USBD_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_USBD_CONFIG_LOG_LEVEL
-#define NRFX_USBD_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_USBREG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_USBREG_ENABLED
-#define NRFX_USBREG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_USBREG_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_USBREG_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_USBREG_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT0_ENABLED
-#define NRFX_WDT0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT1_ENABLED
-#define NRFX_WDT1_ENABLED 0
-#endif
-
-#endif // NRFX_CONFIG_NRF5340_APPLICATION_H__
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf5340_network.h b/modules/hal_nordic/nrfx/nrfx_config_nrf5340_network.h
deleted file mode 100644
index 938172460fa..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf5340_network.h
+++ /dev/null
@@ -1,888 +0,0 @@
-/*
- * Copyright (c) 2019 - 2023, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF5340_NETWORK_H__
-#define NRFX_CONFIG_NRF5340_NETWORK_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-/*
- * The MDK provides macros for accessing the peripheral register structures
- * by using their secure and non-secure address mappings (with the names
- * containing the suffix _S or _NS, respectively). Because the nrfx drivers
- * use the macros without any suffixes, you must translate the names.
- * The following section provides configuration for the name translation.
- */
-#define NRF_AAR        NRF_AAR_NS
-#define NRF_ACL        NRF_ACL_NS
-#define NRF_CCM        NRF_CCM_NS
-#define NRF_CLOCK      NRF_CLOCK_NS
-#define NRF_CTI        NRF_CTI_NS
-#define NRF_CTRLAP     NRF_CTRLAP_NS
-#define NRF_DCNF       NRF_DCNF_NS
-#define NRF_DPPIC      NRF_DPPIC_NS
-#define NRF_ECB        NRF_ECB_NS
-#define NRF_EGU0       NRF_EGU0_NS
-#define NRF_FICR       NRF_FICR_NS
-#define NRF_GPIOTE     NRF_GPIOTE_NS
-#define NRF_IPC        NRF_IPC_NS
-#define NRF_NVMC       NRF_NVMC_NS
-#define NRF_P0         NRF_P0_NS
-#define NRF_P1         NRF_P1_NS
-#define NRF_POWER      NRF_POWER_NS
-#define NRF_RADIO      NRF_RADIO_NS
-#define NRF_RESET      NRF_RESET_NS
-#define NRF_RNG        NRF_RNG_NS
-#define NRF_RTC0       NRF_RTC0_NS
-#define NRF_RTC1       NRF_RTC1_NS
-#define NRF_SPIM0      NRF_SPIM0_NS
-#define NRF_SPIS0      NRF_SPIS0_NS
-#define NRF_SWI0       NRF_SWI0_NS
-#define NRF_SWI1       NRF_SWI1_NS
-#define NRF_SWI2       NRF_SWI2_NS
-#define NRF_SWI3       NRF_SWI3_NS
-#define NRF_TEMP       NRF_TEMP_NS
-#define NRF_TIMER0     NRF_TIMER0_NS
-#define NRF_TIMER1     NRF_TIMER1_NS
-#define NRF_TIMER2     NRF_TIMER2_NS
-#define NRF_TWIM0      NRF_TWIM0_NS
-#define NRF_TWIS0      NRF_TWIS0_NS
-#define NRF_UARTE0     NRF_UARTE0_NS
-#define NRF_UICR       NRF_UICR_NS
-#define NRF_VMC        NRF_VMC_NS
-#define NRF_VREQCTRL   NRF_VREQCTRL_NS
-#define NRF_WDT        NRF_WDT_NS
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 1
- * - XTAL  = 2
- * - Synth = 3
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 2
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU0_ENABLED
-#define NRFX_EGU0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0 Maximum: 15
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 1
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_IPC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_IPC_ENABLED
-#define NRFX_IPC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NVMC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NVMC_ENABLED
-#define NRFX_NVMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RNG_ENABLED
-#define NRFX_RNG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RNG_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RNG_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RNG_CONFIG_LOG_ENABLED
-#define NRFX_RNG_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RNG_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RNG_CONFIG_LOG_LEVEL
-#define NRFX_RNG_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC0_ENABLED
-#define NRFX_RTC0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC1_ENABLED
-#define NRFX_RTC1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM0_ENABLED
-#define NRFX_SPIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS0_ENABLED
-#define NRFX_SPIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER0_ENABLED
-#define NRFX_TIMER0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER1_ENABLED
-#define NRFX_TIMER1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER2_ENABLED
-#define NRFX_TIMER2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM0_ENABLED
-#define NRFX_TWIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY - Assume that any instance would be initialized
- * only once.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS0_ENABLED
-#define NRFX_TWIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE0_ENABLED
-#define NRFX_UARTE0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-#endif // NRFX_CONFIG_NRF5340_NETWORK_H__
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_application.h
deleted file mode 100644
index 3caed86c48b..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_application.h
+++ /dev/null
@@ -1,1947 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54H20_APPLICATION_H__
-#define NRFX_CONFIG_NRF54H20_APPLICATION_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_BELLBOARD_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD_ENABLED
-#define NRFX_BELLBOARD_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_BELLBOARD_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_BELLBOARD_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_BELLBOARD_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_BELLBOARD0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD0_ENABLED
-#define NRFX_BELLBOARD0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_BELLBOARD1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD1_ENABLED
-#define NRFX_BELLBOARD1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_BELLBOARD2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD2_ENABLED
-#define NRFX_BELLBOARD2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_BELLBOARD3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD3_ENABLED
-#define NRFX_BELLBOARD3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000f0
-#endif
-
-/**
- * @brief NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000001e
-#endif
-
-/**
- * @brief NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000020
-#endif
-
-/**
- * @brief NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000040
-#endif
-
-/**
- * @brief NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000081
-#endif
-
-/**
- * @brief NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000f
-#endif
-
-/**
- * @brief NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000e1
-#endif
-
-/**
- * @brief NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000df
-#endif
-
-/**
- * @brief NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000bf
-#endif
-
-/**
- * @brief NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000007e
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU130_ENABLED
-#define NRFX_EGU130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 1
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE130_ENABLED
-#define NRFX_GPIOTE130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 4
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x000000f0
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000003
-#endif
-
-/**
- * @brief NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000c
-#endif
-
-/**
- * @brief NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000c
-#endif
-
-/**
- * @brief NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000003
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_MVDMA_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_MVDMA_ENABLED
-#define NRFX_MVDMA_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_MVDMA120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_MVDMA120_ENABLED
-#define NRFX_MVDMA120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_6_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_6_ENABLED
-#define NRFX_PRS_BOX_6_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_7_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_7_ENABLED
-#define NRFX_PRS_BOX_7_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_8_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_8_ENABLED
-#define NRFX_PRS_BOX_8_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_9_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_9_ENABLED
-#define NRFX_PRS_BOX_9_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM120_ENABLED
-#define NRFX_PWM120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM130_ENABLED
-#define NRFX_PWM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM131_ENABLED
-#define NRFX_PWM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM132_ENABLED
-#define NRFX_PWM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM133_ENABLED
-#define NRFX_PWM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC130_ENABLED
-#define NRFX_QDEC130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC131_ENABLED
-#define NRFX_QDEC131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC130_ENABLED
-#define NRFX_RTC130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC131_ENABLED
-#define NRFX_RTC131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM120_ENABLED
-#define NRFX_SPIM120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM121_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM121_ENABLED
-#define NRFX_SPIM121_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM130_ENABLED
-#define NRFX_SPIM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM131_ENABLED
-#define NRFX_SPIM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM132_ENABLED
-#define NRFX_SPIM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM133_ENABLED
-#define NRFX_SPIM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM134_ENABLED
-#define NRFX_SPIM134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM135_ENABLED
-#define NRFX_SPIM135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM136_ENABLED
-#define NRFX_SPIM136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM137_ENABLED
-#define NRFX_SPIM137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS120_ENABLED
-#define NRFX_SPIS120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS130_ENABLED
-#define NRFX_SPIS130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS131_ENABLED
-#define NRFX_SPIS131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS132_ENABLED
-#define NRFX_SPIS132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS133_ENABLED
-#define NRFX_SPIS133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS134_ENABLED
-#define NRFX_SPIS134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS135_ENABLED
-#define NRFX_SPIS135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS136_ENABLED
-#define NRFX_SPIS136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS137_ENABLED
-#define NRFX_SPIS137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER120_ENABLED
-#define NRFX_TIMER120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER121_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER121_ENABLED
-#define NRFX_TIMER121_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER130_ENABLED
-#define NRFX_TIMER130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER131_ENABLED
-#define NRFX_TIMER131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER132_ENABLED
-#define NRFX_TIMER132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER133_ENABLED
-#define NRFX_TIMER133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER134_ENABLED
-#define NRFX_TIMER134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER135_ENABLED
-#define NRFX_TIMER135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER136_ENABLED
-#define NRFX_TIMER136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER137_ENABLED
-#define NRFX_TIMER137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM130_ENABLED
-#define NRFX_TWIM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM131_ENABLED
-#define NRFX_TWIM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM132_ENABLED
-#define NRFX_TWIM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM133_ENABLED
-#define NRFX_TWIM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM134_ENABLED
-#define NRFX_TWIM134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM135_ENABLED
-#define NRFX_TWIM135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM136_ENABLED
-#define NRFX_TWIM136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM137_ENABLED
-#define NRFX_TWIM137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY - Assume that any instance
- *        would be initialized only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS130_ENABLED
-#define NRFX_TWIS130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS131_ENABLED
-#define NRFX_TWIS131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS132_ENABLED
-#define NRFX_TWIS132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS133_ENABLED
-#define NRFX_TWIS133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS134_ENABLED
-#define NRFX_TWIS134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS135_ENABLED
-#define NRFX_TWIS135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS136_ENABLED
-#define NRFX_TWIS136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS137_ENABLED
-#define NRFX_TWIS137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG - If enabled, support for
- *        configuring GPIO pins is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG - If enabled, support for
- *        configuring PSEL registers is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking
- *        of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
-#define NRFX_UARTE_CONFIG_RX_CACHE_ENABLED 1
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE120_ENABLED
-#define NRFX_UARTE120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE130_ENABLED
-#define NRFX_UARTE130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE131_ENABLED
-#define NRFX_UARTE131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE132_ENABLED
-#define NRFX_UARTE132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE133_ENABLED
-#define NRFX_UARTE133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE134_ENABLED
-#define NRFX_UARTE134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE135_ENABLED
-#define NRFX_UARTE135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE136_ENABLED
-#define NRFX_UARTE136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE137_ENABLED
-#define NRFX_UARTE137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT010_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT010_ENABLED
-#define NRFX_WDT010_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT011_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT011_ENABLED
-#define NRFX_WDT011_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT131_ENABLED
-#define NRFX_WDT131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT132_ENABLED
-#define NRFX_WDT132_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54H20_APPLICATION_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_flpr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_flpr.h
deleted file mode 100644
index f5689f79a96..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_flpr.h
+++ /dev/null
@@ -1,1823 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54H20_FLPR_H__
-#define NRFX_CONFIG_NRF54H20_FLPR_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 0
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COREDEP_VPR_LEGACY
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COREDEP_VPR_LEGACY
-#define NRFX_COREDEP_VPR_LEGACY 0
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000030
-#endif
-
-/**
- * @brief NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000001e
-#endif
-
-/**
- * @brief NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000020
-#endif
-
-/**
- * @brief NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000040
-#endif
-
-/**
- * @brief NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000081
-#endif
-
-/**
- * @brief NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000c
-#endif
-
-/**
- * @brief NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000e1
-#endif
-
-/**
- * @brief NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000df
-#endif
-
-/**
- * @brief NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000bf
-#endif
-
-/**
- * @brief NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000007e
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU130_ENABLED
-#define NRFX_EGU130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 4
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000030
-#endif
-
-/**
- * @brief NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000c
-#endif
-
-/**
- * @brief NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000c0
-#endif
-
-/**
- * @brief NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000003
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_MVDMA_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_MVDMA_ENABLED
-#define NRFX_MVDMA_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_MVDMA120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_MVDMA120_ENABLED
-#define NRFX_MVDMA120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_6_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_6_ENABLED
-#define NRFX_PRS_BOX_6_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_7_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_7_ENABLED
-#define NRFX_PRS_BOX_7_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_8_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_8_ENABLED
-#define NRFX_PRS_BOX_8_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_9_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_9_ENABLED
-#define NRFX_PRS_BOX_9_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM120_ENABLED
-#define NRFX_PWM120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM130_ENABLED
-#define NRFX_PWM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM131_ENABLED
-#define NRFX_PWM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM132_ENABLED
-#define NRFX_PWM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM133_ENABLED
-#define NRFX_PWM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC130_ENABLED
-#define NRFX_QDEC130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC131_ENABLED
-#define NRFX_QDEC131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC130_ENABLED
-#define NRFX_RTC130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC131_ENABLED
-#define NRFX_RTC131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM120_ENABLED
-#define NRFX_SPIM120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM121_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM121_ENABLED
-#define NRFX_SPIM121_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM130_ENABLED
-#define NRFX_SPIM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM131_ENABLED
-#define NRFX_SPIM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM132_ENABLED
-#define NRFX_SPIM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM133_ENABLED
-#define NRFX_SPIM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM134_ENABLED
-#define NRFX_SPIM134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM135_ENABLED
-#define NRFX_SPIM135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM136_ENABLED
-#define NRFX_SPIM136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM137_ENABLED
-#define NRFX_SPIM137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS120_ENABLED
-#define NRFX_SPIS120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS130_ENABLED
-#define NRFX_SPIS130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS131_ENABLED
-#define NRFX_SPIS131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS132_ENABLED
-#define NRFX_SPIS132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS133_ENABLED
-#define NRFX_SPIS133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS134_ENABLED
-#define NRFX_SPIS134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS135_ENABLED
-#define NRFX_SPIS135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS136_ENABLED
-#define NRFX_SPIS136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS137_ENABLED
-#define NRFX_SPIS137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER120_ENABLED
-#define NRFX_TIMER120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER121_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER121_ENABLED
-#define NRFX_TIMER121_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER130_ENABLED
-#define NRFX_TIMER130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER131_ENABLED
-#define NRFX_TIMER131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER132_ENABLED
-#define NRFX_TIMER132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER133_ENABLED
-#define NRFX_TIMER133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER134_ENABLED
-#define NRFX_TIMER134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER135_ENABLED
-#define NRFX_TIMER135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER136_ENABLED
-#define NRFX_TIMER136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER137_ENABLED
-#define NRFX_TIMER137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM130_ENABLED
-#define NRFX_TWIM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM131_ENABLED
-#define NRFX_TWIM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM132_ENABLED
-#define NRFX_TWIM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM133_ENABLED
-#define NRFX_TWIM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM134_ENABLED
-#define NRFX_TWIM134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM135_ENABLED
-#define NRFX_TWIM135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM136_ENABLED
-#define NRFX_TWIM136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM137_ENABLED
-#define NRFX_TWIM137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY - Assume that any instance would be initialized
- *        only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS130_ENABLED
-#define NRFX_TWIS130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS131_ENABLED
-#define NRFX_TWIS131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS132_ENABLED
-#define NRFX_TWIS132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS133_ENABLED
-#define NRFX_TWIS133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS134_ENABLED
-#define NRFX_TWIS134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS135_ENABLED
-#define NRFX_TWIS135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS136_ENABLED
-#define NRFX_TWIS136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS137_ENABLED
-#define NRFX_TWIS137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG - If enabled, support for configuring GPIO pins is
- *        removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG - If enabled, support for configuring PSEL registers
- *        is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
-#define NRFX_UARTE_CONFIG_RX_CACHE_ENABLED 1
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE120_ENABLED
-#define NRFX_UARTE120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE130_ENABLED
-#define NRFX_UARTE130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE131_ENABLED
-#define NRFX_UARTE131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE132_ENABLED
-#define NRFX_UARTE132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE133_ENABLED
-#define NRFX_UARTE133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE134_ENABLED
-#define NRFX_UARTE134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE135_ENABLED
-#define NRFX_UARTE135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE136_ENABLED
-#define NRFX_UARTE136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE137_ENABLED
-#define NRFX_UARTE137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_VEVIF_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_VEVIF_ENABLED
-#define NRFX_VEVIF_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT131_ENABLED
-#define NRFX_WDT131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT132_ENABLED
-#define NRFX_WDT132_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54H20_FLPR_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_ppr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_ppr.h
deleted file mode 100644
index 35716978f28..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_ppr.h
+++ /dev/null
@@ -1,1884 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54H20_PPR_H__
-#define NRFX_CONFIG_NRF54H20_PPR_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 0
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COREDEP_VPR_LEGACY
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COREDEP_VPR_LEGACY
-#define NRFX_COREDEP_VPR_LEGACY 0
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000030
-#endif
-
-/**
- * @brief NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000001e
-#endif
-
-/**
- * @brief NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000020
-#endif
-
-/**
- * @brief NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000040
-#endif
-
-/**
- * @brief NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000081
-#endif
-
-/**
- * @brief NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000c
-#endif
-
-/**
- * @brief NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000e1
-#endif
-
-/**
- * @brief NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000df
-#endif
-
-/**
- * @brief NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000bf
-#endif
-
-/**
- * @brief NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000007e
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU130_ENABLED
-#define NRFX_EGU130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 1
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE130_ENABLED
-#define NRFX_GPIOTE130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 2
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x000000c0
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000c
-#endif
-
-/**
- * @brief NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000003
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_MVDMA_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_MVDMA_ENABLED
-#define NRFX_MVDMA_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_MVDMA120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_MVDMA120_ENABLED
-#define NRFX_MVDMA120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_6_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_6_ENABLED
-#define NRFX_PRS_BOX_6_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_7_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_7_ENABLED
-#define NRFX_PRS_BOX_7_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_8_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_8_ENABLED
-#define NRFX_PRS_BOX_8_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_9_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_9_ENABLED
-#define NRFX_PRS_BOX_9_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM120_ENABLED
-#define NRFX_PWM120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM130_ENABLED
-#define NRFX_PWM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM131_ENABLED
-#define NRFX_PWM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM132_ENABLED
-#define NRFX_PWM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM133_ENABLED
-#define NRFX_PWM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC130_ENABLED
-#define NRFX_QDEC130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC131_ENABLED
-#define NRFX_QDEC131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC130_ENABLED
-#define NRFX_RTC130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC131_ENABLED
-#define NRFX_RTC131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM120_ENABLED
-#define NRFX_SPIM120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM121_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM121_ENABLED
-#define NRFX_SPIM121_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM130_ENABLED
-#define NRFX_SPIM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM131_ENABLED
-#define NRFX_SPIM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM132_ENABLED
-#define NRFX_SPIM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM133_ENABLED
-#define NRFX_SPIM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM134_ENABLED
-#define NRFX_SPIM134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM135_ENABLED
-#define NRFX_SPIM135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM136_ENABLED
-#define NRFX_SPIM136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM137_ENABLED
-#define NRFX_SPIM137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS120_ENABLED
-#define NRFX_SPIS120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS130_ENABLED
-#define NRFX_SPIS130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS131_ENABLED
-#define NRFX_SPIS131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS132_ENABLED
-#define NRFX_SPIS132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS133_ENABLED
-#define NRFX_SPIS133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS134_ENABLED
-#define NRFX_SPIS134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS135_ENABLED
-#define NRFX_SPIS135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS136_ENABLED
-#define NRFX_SPIS136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS137_ENABLED
-#define NRFX_SPIS137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER120_ENABLED
-#define NRFX_TIMER120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER121_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER121_ENABLED
-#define NRFX_TIMER121_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER130_ENABLED
-#define NRFX_TIMER130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER131_ENABLED
-#define NRFX_TIMER131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER132_ENABLED
-#define NRFX_TIMER132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER133_ENABLED
-#define NRFX_TIMER133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER134_ENABLED
-#define NRFX_TIMER134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER135_ENABLED
-#define NRFX_TIMER135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER136_ENABLED
-#define NRFX_TIMER136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER137_ENABLED
-#define NRFX_TIMER137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM130_ENABLED
-#define NRFX_TWIM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM131_ENABLED
-#define NRFX_TWIM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM132_ENABLED
-#define NRFX_TWIM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM133_ENABLED
-#define NRFX_TWIM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM134_ENABLED
-#define NRFX_TWIM134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM135_ENABLED
-#define NRFX_TWIM135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM136_ENABLED
-#define NRFX_TWIM136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM137_ENABLED
-#define NRFX_TWIM137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY - Assume that any instance
- *        would be initialized only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS130_ENABLED
-#define NRFX_TWIS130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS131_ENABLED
-#define NRFX_TWIS131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS132_ENABLED
-#define NRFX_TWIS132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS133_ENABLED
-#define NRFX_TWIS133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS134_ENABLED
-#define NRFX_TWIS134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS135_ENABLED
-#define NRFX_TWIS135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS136_ENABLED
-#define NRFX_TWIS136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS137_ENABLED
-#define NRFX_TWIS137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG - If enabled, support for
- *        configuring GPIO pins is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG - If enabled, support for
- *        configuring PSEL registers is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking
- *        of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
-#define NRFX_UARTE_CONFIG_RX_CACHE_ENABLED 1
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE120_ENABLED
-#define NRFX_UARTE120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE130_ENABLED
-#define NRFX_UARTE130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE131_ENABLED
-#define NRFX_UARTE131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE132_ENABLED
-#define NRFX_UARTE132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE133_ENABLED
-#define NRFX_UARTE133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE134_ENABLED
-#define NRFX_UARTE134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE135_ENABLED
-#define NRFX_UARTE135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE136_ENABLED
-#define NRFX_UARTE136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE137_ENABLED
-#define NRFX_UARTE137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_VEVIF_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_VEVIF_ENABLED
-#define NRFX_VEVIF_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT131_ENABLED
-#define NRFX_WDT131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT132_ENABLED
-#define NRFX_WDT132_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54H20_PPR_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_radiocore.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_radiocore.h
deleted file mode 100644
index 5847cace47e..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54h20_radiocore.h
+++ /dev/null
@@ -1,2010 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54H20_RADIOCORE_H__
-#define NRFX_CONFIG_NRF54H20_RADIOCORE_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_BELLBOARD_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD_ENABLED
-#define NRFX_BELLBOARD_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_BELLBOARD_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_BELLBOARD_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_BELLBOARD_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_BELLBOARD0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD0_ENABLED
-#define NRFX_BELLBOARD0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_BELLBOARD1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD1_ENABLED
-#define NRFX_BELLBOARD1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_BELLBOARD2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD2_ENABLED
-#define NRFX_BELLBOARD2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_BELLBOARD3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD3_ENABLED
-#define NRFX_BELLBOARD3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI020_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI020_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI020_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000003
-#endif
-
-/**
- * @brief NRFX_DPPI030_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI030_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI030_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000003
-#endif
-
-/**
- * @brief NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000f0
-#endif
-
-/**
- * @brief NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000001e
-#endif
-
-/**
- * @brief NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000020
-#endif
-
-/**
- * @brief NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000040
-#endif
-
-/**
- * @brief NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000081
-#endif
-
-/**
- * @brief NRFX_DPPI020_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI020_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI020_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000c
-#endif
-
-/**
- * @brief NRFX_DPPI030_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI030_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI030_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000c
-#endif
-
-/**
- * @brief NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000f
-#endif
-
-/**
- * @brief NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000e1
-#endif
-
-/**
- * @brief NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000df
-#endif
-
-/**
- * @brief NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000bf
-#endif
-
-/**
- * @brief NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000007e
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU020_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU020_ENABLED
-#define NRFX_EGU020_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU130_ENABLED
-#define NRFX_EGU130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 1
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE130_ENABLED
-#define NRFX_GPIOTE130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 4
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x00000f00
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000030
-#endif
-
-/**
- * @brief NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000c
-#endif
-
-/**
- * @brief NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000c0
-#endif
-
-/**
- * @brief NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000003
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_MVDMA_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_MVDMA_ENABLED
-#define NRFX_MVDMA_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_MVDMA120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_MVDMA120_ENABLED
-#define NRFX_MVDMA120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_6_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_6_ENABLED
-#define NRFX_PRS_BOX_6_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_7_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_7_ENABLED
-#define NRFX_PRS_BOX_7_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_8_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_8_ENABLED
-#define NRFX_PRS_BOX_8_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_9_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_9_ENABLED
-#define NRFX_PRS_BOX_9_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM120_ENABLED
-#define NRFX_PWM120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM130_ENABLED
-#define NRFX_PWM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM131_ENABLED
-#define NRFX_PWM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM132_ENABLED
-#define NRFX_PWM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM133_ENABLED
-#define NRFX_PWM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC130_ENABLED
-#define NRFX_QDEC130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC131_ENABLED
-#define NRFX_QDEC131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC130_ENABLED
-#define NRFX_RTC130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC131_ENABLED
-#define NRFX_RTC131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM120_ENABLED
-#define NRFX_SPIM120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM121_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM121_ENABLED
-#define NRFX_SPIM121_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM130_ENABLED
-#define NRFX_SPIM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM131_ENABLED
-#define NRFX_SPIM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM132_ENABLED
-#define NRFX_SPIM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM133_ENABLED
-#define NRFX_SPIM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM134_ENABLED
-#define NRFX_SPIM134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM135_ENABLED
-#define NRFX_SPIM135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM136_ENABLED
-#define NRFX_SPIM136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM137_ENABLED
-#define NRFX_SPIM137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS120_ENABLED
-#define NRFX_SPIS120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS130_ENABLED
-#define NRFX_SPIS130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS131_ENABLED
-#define NRFX_SPIS131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS132_ENABLED
-#define NRFX_SPIS132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS133_ENABLED
-#define NRFX_SPIS133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS134_ENABLED
-#define NRFX_SPIS134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS135_ENABLED
-#define NRFX_SPIS135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS136_ENABLED
-#define NRFX_SPIS136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS137_ENABLED
-#define NRFX_SPIS137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER020_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER020_ENABLED
-#define NRFX_TIMER020_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER021_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER021_ENABLED
-#define NRFX_TIMER021_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER022_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER022_ENABLED
-#define NRFX_TIMER022_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER120_ENABLED
-#define NRFX_TIMER120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER121_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER121_ENABLED
-#define NRFX_TIMER121_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER130_ENABLED
-#define NRFX_TIMER130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER131_ENABLED
-#define NRFX_TIMER131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER132_ENABLED
-#define NRFX_TIMER132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER133_ENABLED
-#define NRFX_TIMER133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER134_ENABLED
-#define NRFX_TIMER134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER135_ENABLED
-#define NRFX_TIMER135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER136_ENABLED
-#define NRFX_TIMER136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER137_ENABLED
-#define NRFX_TIMER137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM130_ENABLED
-#define NRFX_TWIM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM131_ENABLED
-#define NRFX_TWIM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM132_ENABLED
-#define NRFX_TWIM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM133_ENABLED
-#define NRFX_TWIM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM134_ENABLED
-#define NRFX_TWIM134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM135_ENABLED
-#define NRFX_TWIM135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM136_ENABLED
-#define NRFX_TWIM136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM137_ENABLED
-#define NRFX_TWIM137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY - Assume that any instance
- *        would be initialized only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS130_ENABLED
-#define NRFX_TWIS130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS131_ENABLED
-#define NRFX_TWIS131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS132_ENABLED
-#define NRFX_TWIS132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS133_ENABLED
-#define NRFX_TWIS133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS134_ENABLED
-#define NRFX_TWIS134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS135_ENABLED
-#define NRFX_TWIS135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS136_ENABLED
-#define NRFX_TWIS136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS137_ENABLED
-#define NRFX_TWIS137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG - If enabled, support for
- *        configuring GPIO pins is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG - If enabled, support for
- *        configuring PSEL registers is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking
- *        of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
-#define NRFX_UARTE_CONFIG_RX_CACHE_ENABLED 1
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE120_ENABLED
-#define NRFX_UARTE120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE130_ENABLED
-#define NRFX_UARTE130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE131_ENABLED
-#define NRFX_UARTE131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE132_ENABLED
-#define NRFX_UARTE132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE133_ENABLED
-#define NRFX_UARTE133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE134_ENABLED
-#define NRFX_UARTE134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE135_ENABLED
-#define NRFX_UARTE135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE136_ENABLED
-#define NRFX_UARTE136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE137_ENABLED
-#define NRFX_UARTE137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT010_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT010_ENABLED
-#define NRFX_WDT010_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT011_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT011_ENABLED
-#define NRFX_WDT011_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT131_ENABLED
-#define NRFX_WDT131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT132_ENABLED
-#define NRFX_WDT132_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54H20_RADIOCORE_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l05_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l05_application.h
deleted file mode 100644
index 503405b49f6..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l05_application.h
+++ /dev/null
@@ -1,1775 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54L05_APPLICATION_H__
-#define NRFX_CONFIG_NRF54L05_APPLICATION_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI00_ENABLED
-#define NRFX_DPPI00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI10_ENABLED
-#define NRFX_DPPI10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI20_ENABLED
-#define NRFX_DPPI20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI30_ENABLED
-#define NRFX_DPPI30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU10_ENABLED
-#define NRFX_EGU10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU20_ENABLED
-#define NRFX_EGU20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE20_ENABLED
-#define NRFX_GPIOTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE30_ENABLED
-#define NRFX_GPIOTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 8
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x00000f0f
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S20_ENABLED
-#define NRFX_I2S20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM20_ENABLED
-#define NRFX_PDM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM21_ENABLED
-#define NRFX_PDM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PPIB_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_ENABLED
-#define NRFX_PPIB_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_ENABLED
-#define NRFX_PPIB_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_LEVEL
-#define NRFX_PPIB_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PPIB00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB00_ENABLED
-#define NRFX_PPIB00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB01_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB01_ENABLED
-#define NRFX_PPIB01_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB10_ENABLED
-#define NRFX_PPIB10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB11_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB11_ENABLED
-#define NRFX_PPIB11_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB20_ENABLED
-#define NRFX_PPIB20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB21_ENABLED
-#define NRFX_PPIB21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB22_ENABLED
-#define NRFX_PPIB22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB30_ENABLED
-#define NRFX_PPIB30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM20_ENABLED
-#define NRFX_PWM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM21_ENABLED
-#define NRFX_PWM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM22_ENABLED
-#define NRFX_PWM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC20_ENABLED
-#define NRFX_QDEC20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC21_ENABLED
-#define NRFX_QDEC21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_ENABLED
-#define NRFX_RRAMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
-#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
-#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC10_ENABLED
-#define NRFX_RTC10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC30_ENABLED
-#define NRFX_RTC30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM00_ENABLED
-#define NRFX_SPIM00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM20_ENABLED
-#define NRFX_SPIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM21_ENABLED
-#define NRFX_SPIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM22_ENABLED
-#define NRFX_SPIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM30_ENABLED
-#define NRFX_SPIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS00_ENABLED
-#define NRFX_SPIS00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS20_ENABLED
-#define NRFX_SPIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS21_ENABLED
-#define NRFX_SPIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS22_ENABLED
-#define NRFX_SPIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS30_ENABLED
-#define NRFX_SPIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER00_ENABLED
-#define NRFX_TIMER00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER10_ENABLED
-#define NRFX_TIMER10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER20_ENABLED
-#define NRFX_TIMER20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER21_ENABLED
-#define NRFX_TIMER21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER22_ENABLED
-#define NRFX_TIMER22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER23_ENABLED
-#define NRFX_TIMER23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER24_ENABLED
-#define NRFX_TIMER24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM20_ENABLED
-#define NRFX_TWIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM21_ENABLED
-#define NRFX_TWIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM22_ENABLED
-#define NRFX_TWIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM30_ENABLED
-#define NRFX_TWIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
- *        Assume that any instance would be initialized only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS20_ENABLED
-#define NRFX_TWIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS21_ENABLED
-#define NRFX_TWIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS22_ENABLED
-#define NRFX_TWIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS30_ENABLED
-#define NRFX_TWIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
- *        If enabled, support for configuring GPIO pins is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
- *        If enabled, support for configuring PSEL registers is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE00_ENABLED
-#define NRFX_UARTE00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE20_ENABLED
-#define NRFX_UARTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE21_ENABLED
-#define NRFX_UARTE21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE22_ENABLED
-#define NRFX_UARTE22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE30_ENABLED
-#define NRFX_UARTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT30_ENABLED
-#define NRFX_WDT30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT31_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT31_ENABLED
-#define NRFX_WDT31_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54L05_APPLICATION_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l05_flpr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l05_flpr.h
deleted file mode 100644
index 4d83d5cba22..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l05_flpr.h
+++ /dev/null
@@ -1,1784 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54L05_FLPR_H__
-#define NRFX_CONFIG_NRF54L05_FLPR_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COREDEP_VPR_LEGACY
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COREDEP_VPR_LEGACY
-#define NRFX_COREDEP_VPR_LEGACY 0
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI00_ENABLED
-#define NRFX_DPPI00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI10_ENABLED
-#define NRFX_DPPI10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI20_ENABLED
-#define NRFX_DPPI20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI30_ENABLED
-#define NRFX_DPPI30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU10_ENABLED
-#define NRFX_EGU10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU20_ENABLED
-#define NRFX_EGU20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE20_ENABLED
-#define NRFX_GPIOTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE30_ENABLED
-#define NRFX_GPIOTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 4
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x000000f0
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S20_ENABLED
-#define NRFX_I2S20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM20_ENABLED
-#define NRFX_PDM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM21_ENABLED
-#define NRFX_PDM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PPIB_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_ENABLED
-#define NRFX_PPIB_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_ENABLED
-#define NRFX_PPIB_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_LEVEL
-#define NRFX_PPIB_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PPIB00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB00_ENABLED
-#define NRFX_PPIB00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB01_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB01_ENABLED
-#define NRFX_PPIB01_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB10_ENABLED
-#define NRFX_PPIB10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB11_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB11_ENABLED
-#define NRFX_PPIB11_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB20_ENABLED
-#define NRFX_PPIB20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB21_ENABLED
-#define NRFX_PPIB21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB22_ENABLED
-#define NRFX_PPIB22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB30_ENABLED
-#define NRFX_PPIB30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM20_ENABLED
-#define NRFX_PWM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM21_ENABLED
-#define NRFX_PWM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM22_ENABLED
-#define NRFX_PWM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC20_ENABLED
-#define NRFX_QDEC20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC21_ENABLED
-#define NRFX_QDEC21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_ENABLED
-#define NRFX_RRAMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
-#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
-#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC10_ENABLED
-#define NRFX_RTC10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC30_ENABLED
-#define NRFX_RTC30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM00_ENABLED
-#define NRFX_SPIM00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM20_ENABLED
-#define NRFX_SPIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM21_ENABLED
-#define NRFX_SPIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM22_ENABLED
-#define NRFX_SPIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM30_ENABLED
-#define NRFX_SPIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS00_ENABLED
-#define NRFX_SPIS00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS20_ENABLED
-#define NRFX_SPIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS21_ENABLED
-#define NRFX_SPIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS22_ENABLED
-#define NRFX_SPIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS30_ENABLED
-#define NRFX_SPIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER00_ENABLED
-#define NRFX_TIMER00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER10_ENABLED
-#define NRFX_TIMER10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER20_ENABLED
-#define NRFX_TIMER20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER21_ENABLED
-#define NRFX_TIMER21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER22_ENABLED
-#define NRFX_TIMER22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER23_ENABLED
-#define NRFX_TIMER23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER24_ENABLED
-#define NRFX_TIMER24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM20_ENABLED
-#define NRFX_TWIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM21_ENABLED
-#define NRFX_TWIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM22_ENABLED
-#define NRFX_TWIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM30_ENABLED
-#define NRFX_TWIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
- *        Assume that any instance would be initialized only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS20_ENABLED
-#define NRFX_TWIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS21_ENABLED
-#define NRFX_TWIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS22_ENABLED
-#define NRFX_TWIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS30_ENABLED
-#define NRFX_TWIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
- *        If enabled, support for configuring GPIO pins is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
- *        If enabled, support for configuring PSEL registers is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE00_ENABLED
-#define NRFX_UARTE00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE20_ENABLED
-#define NRFX_UARTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE21_ENABLED
-#define NRFX_UARTE21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE22_ENABLED
-#define NRFX_UARTE22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE30_ENABLED
-#define NRFX_UARTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_VEVIF_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_VEVIF_ENABLED
-#define NRFX_VEVIF_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT30_ENABLED
-#define NRFX_WDT30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT31_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT31_ENABLED
-#define NRFX_WDT31_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54L05_FLPR_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l09_enga_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l09_enga_application.h
deleted file mode 100644
index 5f4ef95aa4b..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l09_enga_application.h
+++ /dev/null
@@ -1,1355 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54L09_ENGA_APPLICATION_H__
-#define NRFX_CONFIG_NRF54L09_ENGA_APPLICATION_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU00_ENABLED
-#define NRFX_EGU00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU10_ENABLED
-#define NRFX_EGU10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU20_ENABLED
-#define NRFX_EGU20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE20_ENABLED
-#define NRFX_GPIOTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE30_ENABLED
-#define NRFX_GPIOTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 8
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x00000f0f
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_ENABLED
-#define NRFX_RRAMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
-#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
-#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM20_ENABLED
-#define NRFX_SPIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM21_ENABLED
-#define NRFX_SPIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM23_ENABLED
-#define NRFX_SPIM23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM24_ENABLED
-#define NRFX_SPIM24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM30_ENABLED
-#define NRFX_SPIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS00_ENABLED
-#define NRFX_SPIS00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS20_ENABLED
-#define NRFX_SPIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS21_ENABLED
-#define NRFX_SPIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS22_ENABLED
-#define NRFX_SPIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS23_ENABLED
-#define NRFX_SPIS23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS24_ENABLED
-#define NRFX_SPIS24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS30_ENABLED
-#define NRFX_SPIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER00_ENABLED
-#define NRFX_TIMER00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER10_ENABLED
-#define NRFX_TIMER10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER20_ENABLED
-#define NRFX_TIMER20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER21_ENABLED
-#define NRFX_TIMER21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER22_ENABLED
-#define NRFX_TIMER22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER23_ENABLED
-#define NRFX_TIMER23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER24_ENABLED
-#define NRFX_TIMER24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM20_ENABLED
-#define NRFX_TWIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM21_ENABLED
-#define NRFX_TWIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM23_ENABLED
-#define NRFX_TWIM23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM24_ENABLED
-#define NRFX_TWIM24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM30_ENABLED
-#define NRFX_TWIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY - Assume that any instance would be initialized
- * only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS20_ENABLED
-#define NRFX_TWIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS21_ENABLED
-#define NRFX_TWIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS23_ENABLED
-#define NRFX_TWIS23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS24_ENABLED
-#define NRFX_TWIS24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS30_ENABLED
-#define NRFX_TWIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG - If enabled, support for configuring GPIO pins
- * is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG - If enabled, support for configuring PSEL registers
- * is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE20_ENABLED
-#define NRFX_UARTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE21_ENABLED
-#define NRFX_UARTE21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE23_ENABLED
-#define NRFX_UARTE23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE24_ENABLED
-#define NRFX_UARTE24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE30_ENABLED
-#define NRFX_UARTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT30_ENABLED
-#define NRFX_WDT30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT31_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT31_ENABLED
-#define NRFX_WDT31_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54L09_ENGA_APPLICATION_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l10_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l10_application.h
deleted file mode 100644
index ab781f507e5..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l10_application.h
+++ /dev/null
@@ -1,1775 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54L10_APPLICATION_H__
-#define NRFX_CONFIG_NRF54L10_APPLICATION_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI00_ENABLED
-#define NRFX_DPPI00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI10_ENABLED
-#define NRFX_DPPI10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI20_ENABLED
-#define NRFX_DPPI20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI30_ENABLED
-#define NRFX_DPPI30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU10_ENABLED
-#define NRFX_EGU10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU20_ENABLED
-#define NRFX_EGU20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE20_ENABLED
-#define NRFX_GPIOTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE30_ENABLED
-#define NRFX_GPIOTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 8
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x00000f0f
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S20_ENABLED
-#define NRFX_I2S20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM20_ENABLED
-#define NRFX_PDM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM21_ENABLED
-#define NRFX_PDM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PPIB_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_ENABLED
-#define NRFX_PPIB_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_ENABLED
-#define NRFX_PPIB_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_LEVEL
-#define NRFX_PPIB_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PPIB00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB00_ENABLED
-#define NRFX_PPIB00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB01_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB01_ENABLED
-#define NRFX_PPIB01_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB10_ENABLED
-#define NRFX_PPIB10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB11_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB11_ENABLED
-#define NRFX_PPIB11_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB20_ENABLED
-#define NRFX_PPIB20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB21_ENABLED
-#define NRFX_PPIB21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB22_ENABLED
-#define NRFX_PPIB22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB30_ENABLED
-#define NRFX_PPIB30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM20_ENABLED
-#define NRFX_PWM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM21_ENABLED
-#define NRFX_PWM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM22_ENABLED
-#define NRFX_PWM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC20_ENABLED
-#define NRFX_QDEC20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC21_ENABLED
-#define NRFX_QDEC21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_ENABLED
-#define NRFX_RRAMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
-#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
-#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC10_ENABLED
-#define NRFX_RTC10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC30_ENABLED
-#define NRFX_RTC30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM00_ENABLED
-#define NRFX_SPIM00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM20_ENABLED
-#define NRFX_SPIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM21_ENABLED
-#define NRFX_SPIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM22_ENABLED
-#define NRFX_SPIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM30_ENABLED
-#define NRFX_SPIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS00_ENABLED
-#define NRFX_SPIS00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS20_ENABLED
-#define NRFX_SPIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS21_ENABLED
-#define NRFX_SPIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS22_ENABLED
-#define NRFX_SPIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS30_ENABLED
-#define NRFX_SPIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER00_ENABLED
-#define NRFX_TIMER00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER10_ENABLED
-#define NRFX_TIMER10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER20_ENABLED
-#define NRFX_TIMER20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER21_ENABLED
-#define NRFX_TIMER21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER22_ENABLED
-#define NRFX_TIMER22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER23_ENABLED
-#define NRFX_TIMER23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER24_ENABLED
-#define NRFX_TIMER24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM20_ENABLED
-#define NRFX_TWIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM21_ENABLED
-#define NRFX_TWIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM22_ENABLED
-#define NRFX_TWIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM30_ENABLED
-#define NRFX_TWIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
- *        Assume that any instance would be initialized only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS20_ENABLED
-#define NRFX_TWIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS21_ENABLED
-#define NRFX_TWIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS22_ENABLED
-#define NRFX_TWIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS30_ENABLED
-#define NRFX_TWIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
- *        If enabled, support for configuring GPIO pins is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
- *        If enabled, support for configuring PSEL registers is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE00_ENABLED
-#define NRFX_UARTE00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE20_ENABLED
-#define NRFX_UARTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE21_ENABLED
-#define NRFX_UARTE21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE22_ENABLED
-#define NRFX_UARTE22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE30_ENABLED
-#define NRFX_UARTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT30_ENABLED
-#define NRFX_WDT30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT31_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT31_ENABLED
-#define NRFX_WDT31_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54L10_APPLICATION_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l10_flpr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l10_flpr.h
deleted file mode 100644
index 784cb0435a1..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l10_flpr.h
+++ /dev/null
@@ -1,1784 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54L10_FLPR_H__
-#define NRFX_CONFIG_NRF54L10_FLPR_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COREDEP_VPR_LEGACY
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COREDEP_VPR_LEGACY
-#define NRFX_COREDEP_VPR_LEGACY 0
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI00_ENABLED
-#define NRFX_DPPI00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI10_ENABLED
-#define NRFX_DPPI10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI20_ENABLED
-#define NRFX_DPPI20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI30_ENABLED
-#define NRFX_DPPI30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU10_ENABLED
-#define NRFX_EGU10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU20_ENABLED
-#define NRFX_EGU20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE20_ENABLED
-#define NRFX_GPIOTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE30_ENABLED
-#define NRFX_GPIOTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 4
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x000000f0
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S20_ENABLED
-#define NRFX_I2S20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM20_ENABLED
-#define NRFX_PDM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM21_ENABLED
-#define NRFX_PDM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PPIB_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_ENABLED
-#define NRFX_PPIB_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_ENABLED
-#define NRFX_PPIB_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_LEVEL
-#define NRFX_PPIB_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PPIB00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB00_ENABLED
-#define NRFX_PPIB00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB01_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB01_ENABLED
-#define NRFX_PPIB01_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB10_ENABLED
-#define NRFX_PPIB10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB11_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB11_ENABLED
-#define NRFX_PPIB11_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB20_ENABLED
-#define NRFX_PPIB20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB21_ENABLED
-#define NRFX_PPIB21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB22_ENABLED
-#define NRFX_PPIB22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB30_ENABLED
-#define NRFX_PPIB30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM20_ENABLED
-#define NRFX_PWM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM21_ENABLED
-#define NRFX_PWM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM22_ENABLED
-#define NRFX_PWM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC20_ENABLED
-#define NRFX_QDEC20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC21_ENABLED
-#define NRFX_QDEC21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_ENABLED
-#define NRFX_RRAMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
-#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
-#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC10_ENABLED
-#define NRFX_RTC10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC30_ENABLED
-#define NRFX_RTC30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM00_ENABLED
-#define NRFX_SPIM00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM20_ENABLED
-#define NRFX_SPIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM21_ENABLED
-#define NRFX_SPIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM22_ENABLED
-#define NRFX_SPIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM30_ENABLED
-#define NRFX_SPIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS00_ENABLED
-#define NRFX_SPIS00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS20_ENABLED
-#define NRFX_SPIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS21_ENABLED
-#define NRFX_SPIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS22_ENABLED
-#define NRFX_SPIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS30_ENABLED
-#define NRFX_SPIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER00_ENABLED
-#define NRFX_TIMER00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER10_ENABLED
-#define NRFX_TIMER10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER20_ENABLED
-#define NRFX_TIMER20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER21_ENABLED
-#define NRFX_TIMER21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER22_ENABLED
-#define NRFX_TIMER22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER23_ENABLED
-#define NRFX_TIMER23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER24_ENABLED
-#define NRFX_TIMER24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM20_ENABLED
-#define NRFX_TWIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM21_ENABLED
-#define NRFX_TWIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM22_ENABLED
-#define NRFX_TWIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM30_ENABLED
-#define NRFX_TWIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
- *        Assume that any instance would be initialized only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS20_ENABLED
-#define NRFX_TWIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS21_ENABLED
-#define NRFX_TWIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS22_ENABLED
-#define NRFX_TWIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS30_ENABLED
-#define NRFX_TWIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
- *        If enabled, support for configuring GPIO pins is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
- *        If enabled, support for configuring PSEL registers is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE00_ENABLED
-#define NRFX_UARTE00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE20_ENABLED
-#define NRFX_UARTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE21_ENABLED
-#define NRFX_UARTE21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE22_ENABLED
-#define NRFX_UARTE22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE30_ENABLED
-#define NRFX_UARTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_VEVIF_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_VEVIF_ENABLED
-#define NRFX_VEVIF_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT30_ENABLED
-#define NRFX_WDT30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT31_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT31_ENABLED
-#define NRFX_WDT31_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54L10_FLPR_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h
deleted file mode 100644
index cf49a5f4fa6..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_application.h
+++ /dev/null
@@ -1,1775 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54L15_APPLICATION_H__
-#define NRFX_CONFIG_NRF54L15_APPLICATION_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI00_ENABLED
-#define NRFX_DPPI00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI10_ENABLED
-#define NRFX_DPPI10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI20_ENABLED
-#define NRFX_DPPI20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI30_ENABLED
-#define NRFX_DPPI30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU10_ENABLED
-#define NRFX_EGU10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU20_ENABLED
-#define NRFX_EGU20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE20_ENABLED
-#define NRFX_GPIOTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE30_ENABLED
-#define NRFX_GPIOTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 8
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x00000f0f
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S20_ENABLED
-#define NRFX_I2S20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM20_ENABLED
-#define NRFX_PDM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM21_ENABLED
-#define NRFX_PDM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PPIB_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_ENABLED
-#define NRFX_PPIB_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_ENABLED
-#define NRFX_PPIB_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_LEVEL
-#define NRFX_PPIB_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PPIB00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB00_ENABLED
-#define NRFX_PPIB00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB01_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB01_ENABLED
-#define NRFX_PPIB01_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB10_ENABLED
-#define NRFX_PPIB10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB11_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB11_ENABLED
-#define NRFX_PPIB11_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB20_ENABLED
-#define NRFX_PPIB20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB21_ENABLED
-#define NRFX_PPIB21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB22_ENABLED
-#define NRFX_PPIB22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB30_ENABLED
-#define NRFX_PPIB30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM20_ENABLED
-#define NRFX_PWM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM21_ENABLED
-#define NRFX_PWM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM22_ENABLED
-#define NRFX_PWM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC20_ENABLED
-#define NRFX_QDEC20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC21_ENABLED
-#define NRFX_QDEC21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_ENABLED
-#define NRFX_RRAMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
-#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
-#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC10_ENABLED
-#define NRFX_RTC10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC30_ENABLED
-#define NRFX_RTC30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM00_ENABLED
-#define NRFX_SPIM00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM20_ENABLED
-#define NRFX_SPIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM21_ENABLED
-#define NRFX_SPIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM22_ENABLED
-#define NRFX_SPIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM30_ENABLED
-#define NRFX_SPIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS00_ENABLED
-#define NRFX_SPIS00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS20_ENABLED
-#define NRFX_SPIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS21_ENABLED
-#define NRFX_SPIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS22_ENABLED
-#define NRFX_SPIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS30_ENABLED
-#define NRFX_SPIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER00_ENABLED
-#define NRFX_TIMER00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER10_ENABLED
-#define NRFX_TIMER10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER20_ENABLED
-#define NRFX_TIMER20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER21_ENABLED
-#define NRFX_TIMER21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER22_ENABLED
-#define NRFX_TIMER22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER23_ENABLED
-#define NRFX_TIMER23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER24_ENABLED
-#define NRFX_TIMER24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM20_ENABLED
-#define NRFX_TWIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM21_ENABLED
-#define NRFX_TWIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM22_ENABLED
-#define NRFX_TWIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM30_ENABLED
-#define NRFX_TWIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
- *        Assume that any instance would be initialized only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS20_ENABLED
-#define NRFX_TWIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS21_ENABLED
-#define NRFX_TWIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS22_ENABLED
-#define NRFX_TWIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS30_ENABLED
-#define NRFX_TWIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
- *        If enabled, support for configuring GPIO pins is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
- *        If enabled, support for configuring PSEL registers is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE00_ENABLED
-#define NRFX_UARTE00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE20_ENABLED
-#define NRFX_UARTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE21_ENABLED
-#define NRFX_UARTE21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE22_ENABLED
-#define NRFX_UARTE22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE30_ENABLED
-#define NRFX_UARTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT30_ENABLED
-#define NRFX_WDT30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT31_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT31_ENABLED
-#define NRFX_WDT31_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54L15_APPLICATION_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h
deleted file mode 100644
index 4d506938337..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l15_flpr.h
+++ /dev/null
@@ -1,1784 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54L15_FLPR_H__
-#define NRFX_CONFIG_NRF54L15_FLPR_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COREDEP_VPR_LEGACY
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COREDEP_VPR_LEGACY
-#define NRFX_COREDEP_VPR_LEGACY 0
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI00_ENABLED
-#define NRFX_DPPI00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI10_ENABLED
-#define NRFX_DPPI10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI20_ENABLED
-#define NRFX_DPPI20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI30_ENABLED
-#define NRFX_DPPI30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU10_ENABLED
-#define NRFX_EGU10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU20_ENABLED
-#define NRFX_EGU20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE20_ENABLED
-#define NRFX_GPIOTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE30_ENABLED
-#define NRFX_GPIOTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
-#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 4
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x000000f0
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S20_ENABLED
-#define NRFX_I2S20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM20_ENABLED
-#define NRFX_PDM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM21_ENABLED
-#define NRFX_PDM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PPIB_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_ENABLED
-#define NRFX_PPIB_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_ENABLED
-#define NRFX_PPIB_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PPIB_CONFIG_LOG_LEVEL
-#define NRFX_PPIB_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PPIB00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB00_ENABLED
-#define NRFX_PPIB00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB01_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB01_ENABLED
-#define NRFX_PPIB01_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB10_ENABLED
-#define NRFX_PPIB10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB11_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB11_ENABLED
-#define NRFX_PPIB11_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB20_ENABLED
-#define NRFX_PPIB20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB21_ENABLED
-#define NRFX_PPIB21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB22_ENABLED
-#define NRFX_PPIB22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PPIB30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PPIB30_ENABLED
-#define NRFX_PPIB30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM20_ENABLED
-#define NRFX_PWM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM21_ENABLED
-#define NRFX_PWM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM22_ENABLED
-#define NRFX_PWM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC20_ENABLED
-#define NRFX_QDEC20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC21_ENABLED
-#define NRFX_QDEC21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_ENABLED
-#define NRFX_RRAMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
-#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
-#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC10_ENABLED
-#define NRFX_RTC10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC30_ENABLED
-#define NRFX_RTC30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM00_ENABLED
-#define NRFX_SPIM00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM20_ENABLED
-#define NRFX_SPIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM21_ENABLED
-#define NRFX_SPIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM22_ENABLED
-#define NRFX_SPIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM30_ENABLED
-#define NRFX_SPIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS00_ENABLED
-#define NRFX_SPIS00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS20_ENABLED
-#define NRFX_SPIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS21_ENABLED
-#define NRFX_SPIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS22_ENABLED
-#define NRFX_SPIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS30_ENABLED
-#define NRFX_SPIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER00_ENABLED
-#define NRFX_TIMER00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER10_ENABLED
-#define NRFX_TIMER10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER20_ENABLED
-#define NRFX_TIMER20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER21_ENABLED
-#define NRFX_TIMER21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER22_ENABLED
-#define NRFX_TIMER22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER23_ENABLED
-#define NRFX_TIMER23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER24_ENABLED
-#define NRFX_TIMER24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM20_ENABLED
-#define NRFX_TWIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM21_ENABLED
-#define NRFX_TWIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM22_ENABLED
-#define NRFX_TWIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM30_ENABLED
-#define NRFX_TWIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
- *        Assume that any instance would be initialized only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS20_ENABLED
-#define NRFX_TWIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS21_ENABLED
-#define NRFX_TWIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS22_ENABLED
-#define NRFX_TWIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS30_ENABLED
-#define NRFX_TWIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
- *        If enabled, support for configuring GPIO pins is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
- *        If enabled, support for configuring PSEL registers is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE00_ENABLED
-#define NRFX_UARTE00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE20_ENABLED
-#define NRFX_UARTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE21_ENABLED
-#define NRFX_UARTE21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE22_ENABLED
-#define NRFX_UARTE22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE30_ENABLED
-#define NRFX_UARTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_VEVIF_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_VEVIF_ENABLED
-#define NRFX_VEVIF_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT30_ENABLED
-#define NRFX_WDT30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT31_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT31_ENABLED
-#define NRFX_WDT31_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54L15_FLPR_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf54l20_enga_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf54l20_enga_application.h
deleted file mode 100644
index 91abb93393d..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf54l20_enga_application.h
+++ /dev/null
@@ -1,1604 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF54L20_ENGA_APPLICATION_H__
-#define NRFX_CONFIG_NRF54L20_ENGA_APPLICATION_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 0
- * - XTAL  = 1
- * - Synth = 2
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 1
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_CAL_ENABLED
-#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU00_ENABLED
-#define NRFX_EGU00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU10_ENABLED
-#define NRFX_EGU10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU20_ENABLED
-#define NRFX_EGU20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE20_ENABLED
-#define NRFX_GPIOTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE30_ENABLED
-#define NRFX_GPIOTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 1
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 8
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x00000f0f
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_NFCT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_ENABLED
-#define NRFX_NFCT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_NFCT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID - Timer instance used for workarounds in the driver.
- *
- * Integer value. Minimum: 0. Maximum: 5.
- */
-#ifndef NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID
-#define NRFX_NFCT_CONFIG_TIMER_INSTANCE_ID 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_ENABLED
-#define NRFX_NFCT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NFCT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_NFCT_CONFIG_LOG_LEVEL
-#define NRFX_NFCT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM20_ENABLED
-#define NRFX_PWM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM21_ENABLED
-#define NRFX_PWM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM22_ENABLED
-#define NRFX_PWM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC20_ENABLED
-#define NRFX_QDEC20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC21_ENABLED
-#define NRFX_QDEC21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_ENABLED
-#define NRFX_RRAMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RRAMC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_ENABLED
-#define NRFX_RRAMC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RRAMC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RRAMC_CONFIG_LOG_LEVEL
-#define NRFX_RRAMC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM00_ENABLED
-#define NRFX_SPIM00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM20_ENABLED
-#define NRFX_SPIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM21_ENABLED
-#define NRFX_SPIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM22_ENABLED
-#define NRFX_SPIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM23_ENABLED
-#define NRFX_SPIM23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM24_ENABLED
-#define NRFX_SPIM24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM30_ENABLED
-#define NRFX_SPIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS00_ENABLED
-#define NRFX_SPIS00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS20_ENABLED
-#define NRFX_SPIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS21_ENABLED
-#define NRFX_SPIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS22_ENABLED
-#define NRFX_SPIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS23_ENABLED
-#define NRFX_SPIS23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS24_ENABLED
-#define NRFX_SPIS24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS30_ENABLED
-#define NRFX_SPIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER00_ENABLED
-#define NRFX_TIMER00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER10_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER10_ENABLED
-#define NRFX_TIMER10_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER20_ENABLED
-#define NRFX_TIMER20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER21_ENABLED
-#define NRFX_TIMER21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER22_ENABLED
-#define NRFX_TIMER22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER23_ENABLED
-#define NRFX_TIMER23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER24_ENABLED
-#define NRFX_TIMER24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM20_ENABLED
-#define NRFX_TWIM20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM21_ENABLED
-#define NRFX_TWIM21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM22_ENABLED
-#define NRFX_TWIM22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM23_ENABLED
-#define NRFX_TWIM23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM24_ENABLED
-#define NRFX_TWIM24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM30_ENABLED
-#define NRFX_TWIM30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY - Assume that any instance would be initialized
- * only once.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS20_ENABLED
-#define NRFX_TWIS20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS21_ENABLED
-#define NRFX_TWIS21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS22_ENABLED
-#define NRFX_TWIS22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS23_ENABLED
-#define NRFX_TWIS23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS24_ENABLED
-#define NRFX_TWIS24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS30_ENABLED
-#define NRFX_TWIS30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG - If enabled, support for configuring GPIO pins
- * is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG - If enabled, support for configuring PSEL registers
- * is removed from the driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE00_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE00_ENABLED
-#define NRFX_UARTE00_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE20_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE20_ENABLED
-#define NRFX_UARTE20_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE21_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE21_ENABLED
-#define NRFX_UARTE21_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE22_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE22_ENABLED
-#define NRFX_UARTE22_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE23_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE23_ENABLED
-#define NRFX_UARTE23_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE24_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE24_ENABLED
-#define NRFX_UARTE24_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE30_ENABLED
-#define NRFX_UARTE30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT30_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT30_ENABLED
-#define NRFX_WDT30_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT31_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT31_ENABLED
-#define NRFX_WDT31_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF54L20_ENGA_APPLICATION_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf91.h b/modules/hal_nordic/nrfx/nrfx_config_nrf91.h
deleted file mode 100644
index b7c471789fa..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf91.h
+++ /dev/null
@@ -1,1229 +0,0 @@
-/*
- * Copyright (c) 2018 - 2023, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF91_H__
-#define NRFX_CONFIG_NRF91_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-#define NRF_CLOCK        NRF_PERIPH(NRF_CLOCK)
-#define NRF_DPPIC        NRF_PERIPH(NRF_DPPIC)
-#define NRF_EGU0         NRF_PERIPH(NRF_EGU0)
-#define NRF_EGU1         NRF_PERIPH(NRF_EGU1)
-#define NRF_EGU2         NRF_PERIPH(NRF_EGU2)
-#define NRF_EGU3         NRF_PERIPH(NRF_EGU3)
-#define NRF_EGU4         NRF_PERIPH(NRF_EGU4)
-#define NRF_EGU5         NRF_PERIPH(NRF_EGU5)
-#define NRF_FPU          NRF_PERIPH(NRF_FPU)
-#define NRF_I2S          NRF_PERIPH(NRF_I2S)
-#define NRF_IPC          NRF_PERIPH(NRF_IPC)
-#define NRF_KMU          NRF_PERIPH(NRF_KMU)
-#define NRF_NVMC         NRF_PERIPH(NRF_NVMC)
-#define NRF_P0           NRF_PERIPH(NRF_P0)
-#define NRF_PDM          NRF_PERIPH(NRF_PDM)
-#define NRF_POWER        NRF_PERIPH(NRF_POWER)
-#define NRF_PWM0         NRF_PERIPH(NRF_PWM0)
-#define NRF_PWM1         NRF_PERIPH(NRF_PWM1)
-#define NRF_PWM2         NRF_PERIPH(NRF_PWM2)
-#define NRF_PWM3         NRF_PERIPH(NRF_PWM3)
-#define NRF_REGULATORS   NRF_PERIPH(NRF_REGULATORS)
-#define NRF_RTC0         NRF_PERIPH(NRF_RTC0)
-#define NRF_RTC1         NRF_PERIPH(NRF_RTC1)
-#define NRF_SAADC        NRF_PERIPH(NRF_SAADC)
-#define NRF_SPIM0        NRF_PERIPH(NRF_SPIM0)
-#define NRF_SPIM1        NRF_PERIPH(NRF_SPIM1)
-#define NRF_SPIM2        NRF_PERIPH(NRF_SPIM2)
-#define NRF_SPIM3        NRF_PERIPH(NRF_SPIM3)
-#define NRF_SPIS0        NRF_PERIPH(NRF_SPIS0)
-#define NRF_SPIS1        NRF_PERIPH(NRF_SPIS1)
-#define NRF_SPIS2        NRF_PERIPH(NRF_SPIS2)
-#define NRF_SPIS3        NRF_PERIPH(NRF_SPIS3)
-#define NRF_TIMER0       NRF_PERIPH(NRF_TIMER0)
-#define NRF_TIMER1       NRF_PERIPH(NRF_TIMER1)
-#define NRF_TIMER2       NRF_PERIPH(NRF_TIMER2)
-#define NRF_TWIM0        NRF_PERIPH(NRF_TWIM0)
-#define NRF_TWIM1        NRF_PERIPH(NRF_TWIM1)
-#define NRF_TWIM2        NRF_PERIPH(NRF_TWIM2)
-#define NRF_TWIM3        NRF_PERIPH(NRF_TWIM3)
-#define NRF_TWIS0        NRF_PERIPH(NRF_TWIS0)
-#define NRF_TWIS1        NRF_PERIPH(NRF_TWIS1)
-#define NRF_TWIS2        NRF_PERIPH(NRF_TWIS2)
-#define NRF_TWIS3        NRF_PERIPH(NRF_TWIS3)
-#define NRF_UARTE0       NRF_PERIPH(NRF_UARTE0)
-#define NRF_UARTE1       NRF_PERIPH(NRF_UARTE1)
-#define NRF_UARTE2       NRF_PERIPH(NRF_UARTE2)
-#define NRF_UARTE3       NRF_PERIPH(NRF_UARTE3)
-#define NRF_VMC          NRF_PERIPH(NRF_VMC)
-#define NRF_WDT          NRF_PERIPH(NRF_WDT)
-
-/*
- * The following section provides the name translation for peripherals with
- * only one type of access available. For these peripherals, you cannot choose
- * between secure and non-secure mapping.
- */
-#if defined(NRF_TRUSTZONE_NONSECURE)
-#define NRF_GPIOTE       NRF_GPIOTE1
-#define NRF_GPIOTE1      NRF_GPIOTE1_NS
-#else
-#define NRF_CC_HOST_RGF  NRF_CC_HOST_RGF_S
-#define NRF_CRYPTOCELL   NRF_CRYPTOCELL_S
-#define NRF_CTRL_AP_PERI NRF_CTRL_AP_PERI_S
-#define NRF_FICR         NRF_FICR_S
-#define NRF_GPIOTE       NRF_GPIOTE0
-#define NRF_GPIOTE0      NRF_GPIOTE0_S
-#define NRF_GPIOTE1      NRF_GPIOTE1_NS
-#define NRF_SPU          NRF_SPU_S
-#define NRF_TAD          NRF_TAD_S
-#define NRF_UICR         NRF_UICR_S
-#endif
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_CLOCK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LF_SRC
- *
- * Integer value.
- * Supported values:
- * - RC    = 1
- * - XTAL  = 2
- */
-#ifndef NRFX_CLOCK_CONFIG_LF_SRC
-#define NRFX_CLOCK_CONFIG_LF_SRC 2
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED
-#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_ENABLED
-#define NRFX_CLOCK_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_CLOCK_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_CLOCK_CONFIG_LOG_LEVEL
-#define NRFX_CLOCK_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU0_ENABLED
-#define NRFX_EGU0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU1_ENABLED
-#define NRFX_EGU1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU2_ENABLED
-#define NRFX_EGU2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU3_ENABLED
-#define NRFX_EGU3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU4_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU4_ENABLED
-#define NRFX_EGU4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU5_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_EGU5_ENABLED
-#define NRFX_EGU5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0 Maximum: 15
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 1
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_IPC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_IPC_ENABLED
-#define NRFX_IPC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_NVMC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_NVMC_ENABLED
-#define NRFX_NVMC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_POWER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_POWER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM0_ENABLED
-#define NRFX_PWM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM1_ENABLED
-#define NRFX_PWM1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM2_ENABLED
-#define NRFX_PWM2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_PWM3_ENABLED
-#define NRFX_PWM3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC0_ENABLED
-#define NRFX_RTC0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_RTC1_ENABLED
-#define NRFX_RTC1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM0_ENABLED
-#define NRFX_SPIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM1_ENABLED
-#define NRFX_SPIM1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM2_ENABLED
-#define NRFX_SPIM2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIM3_ENABLED
-#define NRFX_SPIM3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS0_ENABLED
-#define NRFX_SPIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS1_ENABLED
-#define NRFX_SPIS1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS2_ENABLED
-#define NRFX_SPIS2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SPIS3_ENABLED
-#define NRFX_SPIS3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER0_ENABLED
-#define NRFX_TIMER0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER1_ENABLED
-#define NRFX_TIMER1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TIMER2_ENABLED
-#define NRFX_TIMER2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM0_ENABLED
-#define NRFX_TWIM0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM1_ENABLED
-#define NRFX_TWIM1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM2_ENABLED
-#define NRFX_TWIM2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIM3_ENABLED
-#define NRFX_TWIM3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY - Assume that any instance would be initialized
- * only once.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS0_ENABLED
-#define NRFX_TWIS0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS1_ENABLED
-#define NRFX_TWIS1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS2_ENABLED
-#define NRFX_TWIS2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_TWIS3_ENABLED
-#define NRFX_TWIS3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE0_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE0_ENABLED
-#define NRFX_UARTE0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE1_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE1_ENABLED
-#define NRFX_UARTE1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE2_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE2_ENABLED
-#define NRFX_UARTE2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE3_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_UARTE3_ENABLED
-#define NRFX_UARTE3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0 Maximum: 7
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-#endif /* NRFX_CONFIG_NRF91_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_application.h b/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_application.h
deleted file mode 100644
index 38ce6226468..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_application.h
+++ /dev/null
@@ -1,1964 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF9230_ENGB_APPLICATION_H__
-#define NRFX_CONFIG_NRF9230_ENGB_APPLICATION_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_BELLBOARD_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD_ENABLED
-#define NRFX_BELLBOARD_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_BELLBOARD_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_BELLBOARD_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_BELLBOARD_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_BELLBOARD0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD0_ENABLED
-#define NRFX_BELLBOARD0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_BELLBOARD1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD1_ENABLED
-#define NRFX_BELLBOARD1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_BELLBOARD2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD2_ENABLED
-#define NRFX_BELLBOARD2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_BELLBOARD3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD3_ENABLED
-#define NRFX_BELLBOARD3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000f0
-#endif
-
-/**
- * @brief NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000001e
-#endif
-
-/**
- * @brief NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000020
-#endif
-
-/**
- * @brief NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000040
-#endif
-
-/**
- * @brief NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000081
-#endif
-
-/**
- * @brief NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000f
-#endif
-
-/**
- * @brief NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000e1
-#endif
-
-/**
- * @brief NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000df
-#endif
-
-/**
- * @brief NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000bf
-#endif
-
-/**
- * @brief NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000007e
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU130_ENABLED
-#define NRFX_EGU130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE130_ENABLED
-#define NRFX_GPIOTE130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE131_ENABLED
-#define NRFX_GPIOTE131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 4
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x000000f0
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S130_ENABLED
-#define NRFX_I2S130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S131_ENABLED
-#define NRFX_I2S131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000003
-#endif
-
-/**
- * @brief NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000c
-#endif
-
-/**
- * @brief NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000c
-#endif
-
-/**
- * @brief NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000003
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_MVDMA_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_MVDMA_ENABLED
-#define NRFX_MVDMA_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_MVDMA120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_MVDMA120_ENABLED
-#define NRFX_MVDMA120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_MVDMA121_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_MVDMA121_ENABLED
-#define NRFX_MVDMA121_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_6_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_6_ENABLED
-#define NRFX_PRS_BOX_6_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_7_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_7_ENABLED
-#define NRFX_PRS_BOX_7_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_8_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_8_ENABLED
-#define NRFX_PRS_BOX_8_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_9_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_9_ENABLED
-#define NRFX_PRS_BOX_9_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM120_ENABLED
-#define NRFX_PWM120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM130_ENABLED
-#define NRFX_PWM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM131_ENABLED
-#define NRFX_PWM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM132_ENABLED
-#define NRFX_PWM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM133_ENABLED
-#define NRFX_PWM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC130_ENABLED
-#define NRFX_QDEC130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC131_ENABLED
-#define NRFX_QDEC131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC130_ENABLED
-#define NRFX_RTC130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC131_ENABLED
-#define NRFX_RTC131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM120_ENABLED
-#define NRFX_SPIM120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM121_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM121_ENABLED
-#define NRFX_SPIM121_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM130_ENABLED
-#define NRFX_SPIM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM131_ENABLED
-#define NRFX_SPIM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM132_ENABLED
-#define NRFX_SPIM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM133_ENABLED
-#define NRFX_SPIM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM134_ENABLED
-#define NRFX_SPIM134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM135_ENABLED
-#define NRFX_SPIM135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM136_ENABLED
-#define NRFX_SPIM136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM137_ENABLED
-#define NRFX_SPIM137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS120_ENABLED
-#define NRFX_SPIS120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS130_ENABLED
-#define NRFX_SPIS130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS131_ENABLED
-#define NRFX_SPIS131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS132_ENABLED
-#define NRFX_SPIS132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS133_ENABLED
-#define NRFX_SPIS133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS134_ENABLED
-#define NRFX_SPIS134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS135_ENABLED
-#define NRFX_SPIS135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS136_ENABLED
-#define NRFX_SPIS136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS137_ENABLED
-#define NRFX_SPIS137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER120_ENABLED
-#define NRFX_TIMER120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER121_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER121_ENABLED
-#define NRFX_TIMER121_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER130_ENABLED
-#define NRFX_TIMER130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER131_ENABLED
-#define NRFX_TIMER131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER132_ENABLED
-#define NRFX_TIMER132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER133_ENABLED
-#define NRFX_TIMER133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER134_ENABLED
-#define NRFX_TIMER134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER135_ENABLED
-#define NRFX_TIMER135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER136_ENABLED
-#define NRFX_TIMER136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER137_ENABLED
-#define NRFX_TIMER137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM130_ENABLED
-#define NRFX_TWIM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM131_ENABLED
-#define NRFX_TWIM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM132_ENABLED
-#define NRFX_TWIM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM133_ENABLED
-#define NRFX_TWIM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM134_ENABLED
-#define NRFX_TWIM134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM135_ENABLED
-#define NRFX_TWIM135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM136_ENABLED
-#define NRFX_TWIM136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM137_ENABLED
-#define NRFX_TWIM137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
- *
- * Assume that any instance would be initialized only once.
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS130_ENABLED
-#define NRFX_TWIS130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS131_ENABLED
-#define NRFX_TWIS131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS132_ENABLED
-#define NRFX_TWIS132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS133_ENABLED
-#define NRFX_TWIS133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS134_ENABLED
-#define NRFX_TWIS134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS135_ENABLED
-#define NRFX_TWIS135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS136_ENABLED
-#define NRFX_TWIS136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS137_ENABLED
-#define NRFX_TWIS137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
- *
- * If enabled, support for configuring GPIO pins is removed from the driver.
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
- *
- * If enabled, support for configuring PSEL registers is removed from the driver.
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
-#define NRFX_UARTE_CONFIG_RX_CACHE_ENABLED 1
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE120_ENABLED
-#define NRFX_UARTE120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE130_ENABLED
-#define NRFX_UARTE130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE131_ENABLED
-#define NRFX_UARTE131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE132_ENABLED
-#define NRFX_UARTE132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE133_ENABLED
-#define NRFX_UARTE133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE134_ENABLED
-#define NRFX_UARTE134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE135_ENABLED
-#define NRFX_UARTE135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE136_ENABLED
-#define NRFX_UARTE136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE137_ENABLED
-#define NRFX_UARTE137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT010_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT010_ENABLED
-#define NRFX_WDT010_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT011_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT011_ENABLED
-#define NRFX_WDT011_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT131_ENABLED
-#define NRFX_WDT131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT132_ENABLED
-#define NRFX_WDT132_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF9230_ENGB_APPLICATION_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_ppr.h b/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_ppr.h
deleted file mode 100644
index 9ae53d739e9..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_ppr.h
+++ /dev/null
@@ -1,1901 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF9230_ENGB_PPR_H__
-#define NRFX_CONFIG_NRF9230_ENGB_PPR_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 0
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_COREDEP_VPR_LEGACY
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COREDEP_VPR_LEGACY
-#define NRFX_COREDEP_VPR_LEGACY 0
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000030
-#endif
-
-/**
- * @brief NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000001e
-#endif
-
-/**
- * @brief NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000020
-#endif
-
-/**
- * @brief NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000040
-#endif
-
-/**
- * @brief NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000081
-#endif
-
-/**
- * @brief NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000c
-#endif
-
-/**
- * @brief NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000e1
-#endif
-
-/**
- * @brief NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000df
-#endif
-
-/**
- * @brief NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000bf
-#endif
-
-/**
- * @brief NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000007e
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU130_ENABLED
-#define NRFX_EGU130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE130_ENABLED
-#define NRFX_GPIOTE130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE131_ENABLED
-#define NRFX_GPIOTE131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 2
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x000000c0
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S130_ENABLED
-#define NRFX_I2S130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S131_ENABLED
-#define NRFX_I2S131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000c
-#endif
-
-/**
- * @brief NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000003
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_MVDMA_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_MVDMA_ENABLED
-#define NRFX_MVDMA_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_MVDMA120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_MVDMA120_ENABLED
-#define NRFX_MVDMA120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_MVDMA121_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_MVDMA121_ENABLED
-#define NRFX_MVDMA121_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_6_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_6_ENABLED
-#define NRFX_PRS_BOX_6_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_7_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_7_ENABLED
-#define NRFX_PRS_BOX_7_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_8_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_8_ENABLED
-#define NRFX_PRS_BOX_8_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_9_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_9_ENABLED
-#define NRFX_PRS_BOX_9_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM120_ENABLED
-#define NRFX_PWM120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM130_ENABLED
-#define NRFX_PWM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM131_ENABLED
-#define NRFX_PWM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM132_ENABLED
-#define NRFX_PWM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM133_ENABLED
-#define NRFX_PWM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC130_ENABLED
-#define NRFX_QDEC130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC131_ENABLED
-#define NRFX_QDEC131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC130_ENABLED
-#define NRFX_RTC130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC131_ENABLED
-#define NRFX_RTC131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM120_ENABLED
-#define NRFX_SPIM120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM121_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM121_ENABLED
-#define NRFX_SPIM121_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM130_ENABLED
-#define NRFX_SPIM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM131_ENABLED
-#define NRFX_SPIM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM132_ENABLED
-#define NRFX_SPIM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM133_ENABLED
-#define NRFX_SPIM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM134_ENABLED
-#define NRFX_SPIM134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM135_ENABLED
-#define NRFX_SPIM135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM136_ENABLED
-#define NRFX_SPIM136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM137_ENABLED
-#define NRFX_SPIM137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS120_ENABLED
-#define NRFX_SPIS120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS130_ENABLED
-#define NRFX_SPIS130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS131_ENABLED
-#define NRFX_SPIS131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS132_ENABLED
-#define NRFX_SPIS132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS133_ENABLED
-#define NRFX_SPIS133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS134_ENABLED
-#define NRFX_SPIS134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS135_ENABLED
-#define NRFX_SPIS135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS136_ENABLED
-#define NRFX_SPIS136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS137_ENABLED
-#define NRFX_SPIS137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER120_ENABLED
-#define NRFX_TIMER120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER121_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER121_ENABLED
-#define NRFX_TIMER121_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER130_ENABLED
-#define NRFX_TIMER130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER131_ENABLED
-#define NRFX_TIMER131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER132_ENABLED
-#define NRFX_TIMER132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER133_ENABLED
-#define NRFX_TIMER133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER134_ENABLED
-#define NRFX_TIMER134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER135_ENABLED
-#define NRFX_TIMER135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER136_ENABLED
-#define NRFX_TIMER136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER137_ENABLED
-#define NRFX_TIMER137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM130_ENABLED
-#define NRFX_TWIM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM131_ENABLED
-#define NRFX_TWIM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM132_ENABLED
-#define NRFX_TWIM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM133_ENABLED
-#define NRFX_TWIM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM134_ENABLED
-#define NRFX_TWIM134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM135_ENABLED
-#define NRFX_TWIM135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM136_ENABLED
-#define NRFX_TWIM136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM137_ENABLED
-#define NRFX_TWIM137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
- *
- * Assume that any instance would be initialized only once.
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS130_ENABLED
-#define NRFX_TWIS130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS131_ENABLED
-#define NRFX_TWIS131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS132_ENABLED
-#define NRFX_TWIS132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS133_ENABLED
-#define NRFX_TWIS133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS134_ENABLED
-#define NRFX_TWIS134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS135_ENABLED
-#define NRFX_TWIS135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS136_ENABLED
-#define NRFX_TWIS136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS137_ENABLED
-#define NRFX_TWIS137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
- *
- * If enabled, support for configuring GPIO pins is removed from the driver.
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
- *
- * If enabled, support for configuring PSEL registers is removed from the driver.
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
-#define NRFX_UARTE_CONFIG_RX_CACHE_ENABLED 1
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE120_ENABLED
-#define NRFX_UARTE120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE130_ENABLED
-#define NRFX_UARTE130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE131_ENABLED
-#define NRFX_UARTE131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE132_ENABLED
-#define NRFX_UARTE132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE133_ENABLED
-#define NRFX_UARTE133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE134_ENABLED
-#define NRFX_UARTE134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE135_ENABLED
-#define NRFX_UARTE135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE136_ENABLED
-#define NRFX_UARTE136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE137_ENABLED
-#define NRFX_UARTE137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_VEVIF_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_VEVIF_ENABLED
-#define NRFX_VEVIF_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 3.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT131_ENABLED
-#define NRFX_WDT131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT132_ENABLED
-#define NRFX_WDT132_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF9230_ENGB_PPR_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_radiocore.h b/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_radiocore.h
deleted file mode 100644
index 98d71e6b385..00000000000
--- a/modules/hal_nordic/nrfx/nrfx_config_nrf9230_engb_radiocore.h
+++ /dev/null
@@ -1,2031 +0,0 @@
-/*
- * Copyright (c) 2024, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NRFX_CONFIG_NRF9230_ENGB_RADIOCORE_H__
-#define NRFX_CONFIG_NRF9230_ENGB_RADIOCORE_H__
-
-#ifndef NRFX_CONFIG_H__
-#error "This file should not be included directly. Include nrfx_config.h instead."
-#endif
-
-#ifndef NRFX_RTC0_ENABLED
-#define NRFX_RTC0_ENABLED 1
-#endif
-
-/**
- * @brief NRFX_DEFAULT_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_DEFAULT_IRQ_PRIORITY
-#define NRFX_DEFAULT_IRQ_PRIORITY 7
-#endif
-
-/**
- * @brief NRFX_BELLBOARD_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD_ENABLED
-#define NRFX_BELLBOARD_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_BELLBOARD_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_BELLBOARD_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_BELLBOARD_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_BELLBOARD0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD0_ENABLED
-#define NRFX_BELLBOARD0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_BELLBOARD1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD1_ENABLED
-#define NRFX_BELLBOARD1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_BELLBOARD2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD2_ENABLED
-#define NRFX_BELLBOARD2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_BELLBOARD3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_BELLBOARD3_ENABLED
-#define NRFX_BELLBOARD3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_COMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_COMP_CONFIG_LOG_ENABLED
-#define NRFX_COMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_COMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_COMP_CONFIG_LOG_LEVEL
-#define NRFX_COMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_ENABLED
-#define NRFX_DPPI_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_ENABLED
-#define NRFX_DPPI_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_DPPI_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_DPPI_CONFIG_LOG_LEVEL
-#define NRFX_DPPI_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_DPPI020_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI020_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI020_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000003
-#endif
-
-/**
- * @brief NRFX_DPPI030_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI030_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI030_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000003
-#endif
-
-/**
- * @brief NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI120_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000f0
-#endif
-
-/**
- * @brief NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI130_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI131_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI132_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI133_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000001e
-#endif
-
-/**
- * @brief NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI134_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000020
-#endif
-
-/**
- * @brief NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI135_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000040
-#endif
-
-/**
- * @brief NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI136_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000081
-#endif
-
-/**
- * @brief NRFX_DPPI020_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI020_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI020_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000c
-#endif
-
-/**
- * @brief NRFX_DPPI030_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI030_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI030_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000c
-#endif
-
-/**
- * @brief NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI120_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000f
-#endif
-
-/**
- * @brief NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI130_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI131_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000ff
-#endif
-
-/**
- * @brief NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI132_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI133_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000e1
-#endif
-
-/**
- * @brief NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI134_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000df
-#endif
-
-/**
- * @brief NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI135_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000bf
-#endif
-
-/**
- * @brief NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_DPPI136_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000007e
-#endif
-
-/**
- * @brief NRFX_EGU_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU_ENABLED
-#define NRFX_EGU_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_EGU_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_EGU020_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU020_ENABLED
-#define NRFX_EGU020_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_EGU130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_EGU130_ENABLED
-#define NRFX_EGU130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
- *
- * Integer value. Minimum: 0. Maximum: 15.
- */
-#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS
-#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS 2
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_ENABLED
-#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GPIOTE_CONFIG_LOG_LEVEL
-#define NRFX_GPIOTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_GPIOTE130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE130_ENABLED
-#define NRFX_GPIOTE130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GPIOTE131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GPIOTE131_ENABLED
-#define NRFX_GPIOTE131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_ENABLED
-#define NRFX_GRTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
- *
- * Integer value.
- */
-#ifndef NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS 4
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
- */
-#ifndef NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK 0x00000f00
-#endif
-
-/**
- * @brief NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_GRTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_ENABLED
-#define NRFX_GRTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_GRTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_GRTC_CONFIG_LOG_LEVEL
-#define NRFX_GRTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_I2S_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S_CONFIG_LOG_ENABLED
-#define NRFX_I2S_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_I2S_CONFIG_LOG_LEVEL
-#define NRFX_I2S_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_I2S130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S130_ENABLED
-#define NRFX_I2S130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_I2S131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_I2S131_ENABLED
-#define NRFX_I2S131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000030
-#endif
-
-/**
- * @brief NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT120_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT130_PUB_CONFIG_ALLOWED_CHANNELS_MASK 0x0000000c
-#endif
-
-/**
- * @brief NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x000000c0
-#endif
-
-/**
- * @brief NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT120_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0
-#endif
-
-/**
- * @brief NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
- */
-#ifndef NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK
-#define NRFX_IPCT130_SUB_CONFIG_ALLOWED_CHANNELS_MASK 0x00000003
-#endif
-
-/**
- * @brief NRFX_LPCOMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_ENABLED
-#define NRFX_LPCOMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_LPCOMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_ENABLED
-#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_LPCOMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_LPCOMP_CONFIG_LOG_LEVEL
-#define NRFX_LPCOMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_MVDMA_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_MVDMA_ENABLED
-#define NRFX_MVDMA_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_MVDMA120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_MVDMA120_ENABLED
-#define NRFX_MVDMA120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_MVDMA121_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_MVDMA121_ENABLED
-#define NRFX_MVDMA121_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PDM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PDM_CONFIG_LOG_ENABLED
-#define NRFX_PDM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PDM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PDM_CONFIG_LOG_LEVEL
-#define NRFX_PDM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
-#define NRFX_PRS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
-#define NRFX_PRS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_0_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_0_ENABLED
-#define NRFX_PRS_BOX_0_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_1_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_1_ENABLED
-#define NRFX_PRS_BOX_1_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_2_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_2_ENABLED
-#define NRFX_PRS_BOX_2_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_3_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_3_ENABLED
-#define NRFX_PRS_BOX_3_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_4_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_4_ENABLED
-#define NRFX_PRS_BOX_4_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_5_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_5_ENABLED
-#define NRFX_PRS_BOX_5_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_6_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_6_ENABLED
-#define NRFX_PRS_BOX_6_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_7_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_7_ENABLED
-#define NRFX_PRS_BOX_7_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_8_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_8_ENABLED
-#define NRFX_PRS_BOX_8_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PRS_BOX_9_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PRS_BOX_9_ENABLED
-#define NRFX_PRS_BOX_9_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_ENABLED
-#define NRFX_PWM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_PWM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM_CONFIG_LOG_ENABLED
-#define NRFX_PWM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_PWM_CONFIG_LOG_LEVEL
-#define NRFX_PWM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_PWM120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM120_ENABLED
-#define NRFX_PWM120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM130_ENABLED
-#define NRFX_PWM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM131_ENABLED
-#define NRFX_PWM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM132_ENABLED
-#define NRFX_PWM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_PWM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_PWM133_ENABLED
-#define NRFX_PWM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_QDEC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_ENABLED
-#define NRFX_QDEC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_QDEC_CONFIG_LOG_LEVEL
-#define NRFX_QDEC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_QDEC130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC130_ENABLED
-#define NRFX_QDEC130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_QDEC131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_QDEC131_ENABLED
-#define NRFX_QDEC131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_RTC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC_CONFIG_LOG_ENABLED
-#define NRFX_RTC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_RTC_CONFIG_LOG_LEVEL
-#define NRFX_RTC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_RTC130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC130_ENABLED
-#define NRFX_RTC130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_RTC131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_RTC131_ENABLED
-#define NRFX_RTC131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SAADC_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_ENABLED
-#define NRFX_SAADC_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SAADC_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SAADC_CONFIG_LOG_LEVEL
-#define NRFX_SAADC_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_ENABLED
-#define NRFX_SPIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIM_CONFIG_LOG_LEVEL
-#define NRFX_SPIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIM120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM120_ENABLED
-#define NRFX_SPIM120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM121_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM121_ENABLED
-#define NRFX_SPIM121_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM130_ENABLED
-#define NRFX_SPIM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM131_ENABLED
-#define NRFX_SPIM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM132_ENABLED
-#define NRFX_SPIM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM133_ENABLED
-#define NRFX_SPIM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM134_ENABLED
-#define NRFX_SPIM134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM135_ENABLED
-#define NRFX_SPIM135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM136_ENABLED
-#define NRFX_SPIM136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIM137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIM137_ENABLED
-#define NRFX_SPIM137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_SPIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_ENABLED
-#define NRFX_SPIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_SPIS_CONFIG_LOG_LEVEL
-#define NRFX_SPIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_SPIS120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS120_ENABLED
-#define NRFX_SPIS120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS130_ENABLED
-#define NRFX_SPIS130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS131_ENABLED
-#define NRFX_SPIS131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS132_ENABLED
-#define NRFX_SPIS132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS133_ENABLED
-#define NRFX_SPIS133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS134_ENABLED
-#define NRFX_SPIS134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS135_ENABLED
-#define NRFX_SPIS135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS136_ENABLED
-#define NRFX_SPIS136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SPIS137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SPIS137_ENABLED
-#define NRFX_SPIS137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_SYSTICK_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_ENABLED
-#define NRFX_TEMP_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TEMP_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_ENABLED
-#define NRFX_TEMP_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TEMP_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TEMP_CONFIG_LOG_LEVEL
-#define NRFX_TEMP_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_ENABLED
-#define NRFX_TIMER_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TIMER_CONFIG_LOG_LEVEL
-#define NRFX_TIMER_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TIMER020_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER020_ENABLED
-#define NRFX_TIMER020_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER021_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER021_ENABLED
-#define NRFX_TIMER021_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER022_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER022_ENABLED
-#define NRFX_TIMER022_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER120_ENABLED
-#define NRFX_TIMER120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER121_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER121_ENABLED
-#define NRFX_TIMER121_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER130_ENABLED
-#define NRFX_TIMER130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER131_ENABLED
-#define NRFX_TIMER131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER132_ENABLED
-#define NRFX_TIMER132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER133_ENABLED
-#define NRFX_TIMER133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER134_ENABLED
-#define NRFX_TIMER134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER135_ENABLED
-#define NRFX_TIMER135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER136_ENABLED
-#define NRFX_TIMER136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TIMER137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TIMER137_ENABLED
-#define NRFX_TIMER137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_ENABLED
-#define NRFX_TWIM_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIM_CONFIG_LOG_LEVEL
-#define NRFX_TWIM_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIM130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM130_ENABLED
-#define NRFX_TWIM130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM131_ENABLED
-#define NRFX_TWIM131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM132_ENABLED
-#define NRFX_TWIM132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM133_ENABLED
-#define NRFX_TWIM133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM134_ENABLED
-#define NRFX_TWIM134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM135_ENABLED
-#define NRFX_TWIM135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM136_ENABLED
-#define NRFX_TWIM136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIM137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIM137_ENABLED
-#define NRFX_TWIM137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_ENABLED
-#define NRFX_TWIS_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
- *
- * Assume that any instance would be initialized only once.
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY
-#define NRFX_TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
-#endif
-
-/**
- * @brief NRFX_TWIS_NO_SYNC_MODE - Remove support for synchronous mode.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS_NO_SYNC_MODE
-#define NRFX_TWIS_NO_SYNC_MODE 0
-#endif
-
-/**
- * @brief NRFX_TWIS_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_TWIS_CONFIG_LOG_LEVEL
-#define NRFX_TWIS_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_TWIS130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS130_ENABLED
-#define NRFX_TWIS130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS131_ENABLED
-#define NRFX_TWIS131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS132_ENABLED
-#define NRFX_TWIS132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS133_ENABLED
-#define NRFX_TWIS133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS134_ENABLED
-#define NRFX_TWIS134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS135_ENABLED
-#define NRFX_TWIS135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS136_ENABLED
-#define NRFX_TWIS136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_TWIS137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_TWIS137_ENABLED
-#define NRFX_TWIS137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
- *
- * If enabled, support for configuring GPIO pins is removed from the driver.
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
- *
- * If enabled, support for configuring PSEL registers is removed from the driver.
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
-#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_TX_LINK - If enabled, driver supports linking of TX transfers.
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_TX_LINK
-#define NRFX_UARTE_CONFIG_TX_LINK 1
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
-#define NRFX_UARTE_CONFIG_RX_CACHE_ENABLED 1
-#endif
-
-/**
- * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
- *
- * Integer value. Minimum: 0. Maximum: 255.
- */
-#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
-#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
-#endif
-
-/**
- * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_ENABLED
-#define NRFX_UARTE_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_UARTE_CONFIG_LOG_LEVEL
-#define NRFX_UARTE_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_UARTE120_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE120_ENABLED
-#define NRFX_UARTE120_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE130_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE130_ENABLED
-#define NRFX_UARTE130_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE131_ENABLED
-#define NRFX_UARTE131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE132_ENABLED
-#define NRFX_UARTE132_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE133_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE133_ENABLED
-#define NRFX_UARTE133_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE134_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE134_ENABLED
-#define NRFX_UARTE134_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE135_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE135_ENABLED
-#define NRFX_UARTE135_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE136_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE136_ENABLED
-#define NRFX_UARTE136_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_UARTE137_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_UARTE137_ENABLED
-#define NRFX_UARTE137_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
- *
- * Integer value. Minimum: 0. Maximum: 7.
- */
-#ifndef NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY
-#define NRFX_WDT_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_NO_IRQ - Remove WDT IRQ handling from WDT driver
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_NO_IRQ
-#define NRFX_WDT_CONFIG_NO_IRQ 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT_CONFIG_LOG_ENABLED
-#define NRFX_WDT_CONFIG_LOG_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT_CONFIG_LOG_LEVEL
- *
- * Integer value.
- * Supported values:
- * - Off     = 0
- * - Error   = 1
- * - Warning = 2
- * - Info    = 3
- * - Debug   = 4
- */
-#ifndef NRFX_WDT_CONFIG_LOG_LEVEL
-#define NRFX_WDT_CONFIG_LOG_LEVEL 3
-#endif
-
-/**
- * @brief NRFX_WDT010_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT010_ENABLED
-#define NRFX_WDT010_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT011_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT011_ENABLED
-#define NRFX_WDT011_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT131_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT131_ENABLED
-#define NRFX_WDT131_ENABLED 0
-#endif
-
-/**
- * @brief NRFX_WDT132_ENABLED
- *
- * Boolean. Accepted values: 0 and 1.
- */
-#ifndef NRFX_WDT132_ENABLED
-#define NRFX_WDT132_ENABLED 0
-#endif
-
-#endif /* NRFX_CONFIG_NRF9230_ENGB_RADIOCORE_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_kconfig.h b/modules/hal_nordic/nrfx/nrfx_kconfig.h
new file mode 100644
index 00000000000..403e1566be3
--- /dev/null
+++ b/modules/hal_nordic/nrfx/nrfx_kconfig.h
@@ -0,0 +1,1109 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef NRFX_KCONFIG_H__
+#define NRFX_KCONFIG_H__
+
+#include <zephyr/devicetree.h>
+#include <zephyr/sys/util_macro.h>
+
+/*
+ * These are mappings of Kconfig options enabling nrfx drivers and particular
+ * peripheral instances to the corresponding symbols used inside of nrfx.
+ * Please note that only subsets of these entries are used for particular SoCs
+ * supported by nrfx (see the corresponding nrfx_config_*.h files).
+ */
+
+#ifdef CONFIG_NRFX_ADC
+#define NRFX_ADC_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_ADC_LOG
+#define NRFX_ADC_CONFIG_LOG_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_CLOCK
+#define NRFX_CLOCK_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_CLOCK_LOG
+#define NRFX_CLOCK_CONFIG_LOG_ENABLED 1
+#endif
+
+#ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC
+#if defined(CONFIG_SOC_SERIES_NRF91X) || defined(CONFIG_SOC_COMPATIBLE_NRF53X)
+#define NRFX_CLOCK_CONFIG_LF_SRC 1
+#else
+#define NRFX_CLOCK_CONFIG_LF_SRC 0
+#endif
+#endif
+
+#ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL
+#if defined(CONFIG_SOC_SERIES_NRF91X) || defined(CONFIG_SOC_COMPATIBLE_NRF53X)
+#define NRFX_CLOCK_CONFIG_LF_SRC 2
+#else
+#define NRFX_CLOCK_CONFIG_LF_SRC 1
+#endif
+#endif
+
+#ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_SYNTH
+#ifdef CONFIG_SOC_COMPATIBLE_NRF53X
+#define NRFX_CLOCK_CONFIG_LF_SRC 3
+#else
+#define NRFX_CLOCK_CONFIG_LF_SRC 2
+#endif
+#endif
+
+#ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_EXT_LOW_SWING
+#define NRFX_CLOCK_CONFIG_LF_SRC 131073
+#endif
+
+#ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_EXT_FULL_SWING
+#define NRFX_CLOCK_CONFIG_LF_SRC 196609
+#endif
+
+#ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC_CALIBRATION
+#define NRFX_CLOCK_CONFIG_LF_CAL_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_CLOCK_LFXO_TWO_STAGE_ENABLED
+#define NRFX_CLOCK_CONFIG_LFXO_TWO_STAGE_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_COMP
+#define NRFX_COMP_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_COMP_LOG
+#define NRFX_COMP_CONFIG_LOG_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_DPPI
+#define NRFX_DPPI_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI_LOG
+#define NRFX_DPPI_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI0
+#define NRFX_DPPI0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI00
+#define NRFX_DPPI00_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI10
+#define NRFX_DPPI10_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI20
+#define NRFX_DPPI20_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI30
+#define NRFX_DPPI30_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI020
+#define NRFX_DPPI020_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI120
+#define NRFX_DPPI120_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI130
+#define NRFX_DPPI130_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI131
+#define NRFX_DPPI131_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI132
+#define NRFX_DPPI132_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI133
+#define NRFX_DPPI133_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI134
+#define NRFX_DPPI134_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI135
+#define NRFX_DPPI135_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_DPPI136
+#define NRFX_DPPI136_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_EGU
+#define NRFX_EGU_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_EGU_LOG
+#define NRFX_EGU_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_EGU0
+#define NRFX_EGU0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_EGU1
+#define NRFX_EGU1_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_EGU2
+#define NRFX_EGU2_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_EGU3
+#define NRFX_EGU3_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_EGU4
+#define NRFX_EGU4_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_EGU5
+#define NRFX_EGU5_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_EGU10
+#define NRFX_EGU10_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_EGU20
+#define NRFX_EGU20_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_EGU020
+#define NRFX_EGU020_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_EGU130
+#define NRFX_EGU130_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_GRTC
+#define NRFX_GRTC_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_GRTC_LOG
+#define NRFX_GRTC_CONFIG_LOG_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT
+#define NRF_GRTC_HAS_EXTENDED 1
+#endif
+#ifdef CONFIG_NRF_GRTC_TIMER_AUTO_KEEP_ALIVE
+#define NRFX_GRTC_CONFIG_AUTOEN 1
+#endif
+#ifdef CONFIG_NRF_GRTC_START_SYSCOUNTER
+#define NRFX_GRTC_CONFIG_AUTOSTART 1
+#endif
+
+#ifdef CONFIG_NRFX_GPIOTE
+#define NRFX_GPIOTE_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_GPIOTE_LOG
+#define NRFX_GPIOTE_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_GPIOTE0
+#define NRFX_GPIOTE0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_GPIOTE1
+#define NRFX_GPIOTE1_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_GPIOTE20
+#define NRFX_GPIOTE20_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_GPIOTE30
+#define NRFX_GPIOTE30_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_GPIOTE130
+#define NRFX_GPIOTE130_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_GPIOTE131
+#define NRFX_GPIOTE131_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_GPIOTE_NUM_OF_EVT_HANDLERS
+#define NRFX_GPIOTE_CONFIG_NUM_OF_EVT_HANDLERS CONFIG_NRFX_GPIOTE_NUM_OF_EVT_HANDLERS
+#endif
+
+#ifdef CONFIG_NRFX_I2S
+#define NRFX_I2S_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_I2S_LOG
+#define NRFX_I2S_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_I2S0
+#define NRFX_I2S0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_I2S20
+#define NRFX_I2S20_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_IPC
+#define NRFX_IPC_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_IPC_LOG
+#define NRFX_IPC_CONFIG_LOG_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_LPCOMP
+#define NRFX_LPCOMP_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_LPCOMP_LOG
+#define NRFX_LPCOMP_CONFIG_LOG_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_NFCT
+#define NRFX_NFCT_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_NFCT_LOG
+#define NRFX_NFCT_CONFIG_LOG_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_NVMC
+#define NRFX_NVMC_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_NVMC_LOG
+#define NRFX_NVMC_CONFIG_LOG_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_PDM
+#define NRFX_PDM_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PDM_LOG
+#define NRFX_PDM_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PDM0
+#define NRFX_PDM0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PDM20
+#define NRFX_PDM20_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PDM21
+#define NRFX_PDM21_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_POWER
+#define NRFX_POWER_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_POWER_LOG
+#define NRFX_POWER_CONFIG_LOG_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_PPI
+#define NRFX_PPI_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPI_LOG
+#define NRFX_PPI_CONFIG_LOG_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_PPIB
+#define NRFX_PPIB_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPIB_LOG
+#define NRFX_PPIB_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPIB00
+#define NRFX_PPIB00_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPIB01
+#define NRFX_PPIB01_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPIB10
+#define NRFX_PPIB10_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPIB11
+#define NRFX_PPIB11_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPIB20
+#define NRFX_PPIB20_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPIB21
+#define NRFX_PPIB21_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPIB22
+#define NRFX_PPIB22_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PPIB30
+#define NRFX_PPIB30_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_PRS
+#define NRFX_PRS_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PRS_LOG
+#define NRFX_PRS_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PRS_BOX_0
+#define NRFX_PRS_BOX_0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PRS_BOX_1
+#define NRFX_PRS_BOX_1_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PRS_BOX_2
+#define NRFX_PRS_BOX_2_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PRS_BOX_3
+#define NRFX_PRS_BOX_3_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PRS_BOX_4
+#define NRFX_PRS_BOX_4_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_PWM
+#define NRFX_PWM_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PWM_LOG
+#define NRFX_PWM_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PWM0
+#define NRFX_PWM0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PWM1
+#define NRFX_PWM1_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PWM2
+#define NRFX_PWM2_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PWM3
+#define NRFX_PWM3_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PWM20
+#define NRFX_PWM20_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PWM21
+#define NRFX_PWM21_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PWM22
+#define NRFX_PWM22_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PWM120
+#define NRFX_PWM120_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PWM130
+#define NRFX_PWM130_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PWM131
+#define NRFX_PWM131_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PWM132
+#define NRFX_PWM132_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_PWM133
+#define NRFX_PWM133_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_QDEC
+#define NRFX_QDEC_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_QDEC_LOG
+#define NRFX_QDEC_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_QDEC0
+#define NRFX_QDEC0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_QDEC1
+#define NRFX_QDEC1_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_QDEC20
+#define NRFX_QDEC20_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_QDEC21
+#define NRFX_QDEC21_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_QDEC130
+#define NRFX_QDEC130_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_QDEC131
+#define NRFX_QDEC131_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_QSPI
+#define NRFX_QSPI_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_QSPI_LOG
+#define NRFX_QSPI_CONFIG_LOG_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_RNG
+#define NRFX_RNG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_RNG_LOG
+#define NRFX_RNG_CONFIG_LOG_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_RRAMC
+#define NRFX_RRAMC_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_RTC
+#define NRFX_RTC_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_RTC_LOG
+#define NRFX_RTC_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_RTC0
+#define NRFX_RTC0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_RTC1
+#define NRFX_RTC1_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_RTC2
+#define NRFX_RTC2_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_RTC130
+#define NRFX_RTC130_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_RTC131
+#define NRFX_RTC131_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_SAADC
+#define NRFX_SAADC_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SAADC_LOG
+#define NRFX_SAADC_CONFIG_LOG_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_SPI
+#define NRFX_SPI_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPI_LOG
+#define NRFX_SPI_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPI0
+#define NRFX_SPI0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPI1
+#define NRFX_SPI1_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPI2
+#define NRFX_SPI2_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_SPIM
+#define NRFX_SPIM_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM_LOG
+#define NRFX_SPIM_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM0
+#define NRFX_SPIM0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM1
+#define NRFX_SPIM1_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM2
+#define NRFX_SPIM2_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM3
+#define NRFX_SPIM3_ENABLED 1
+#ifdef CONFIG_NRF52_ANOMALY_198_WORKAROUND
+#define NRFX_SPIM3_NRF52840_ANOMALY_198_WORKAROUND_ENABLED 1
+#endif
+#endif
+#ifdef CONFIG_NRFX_SPIM4
+#define NRFX_SPIM4_ENABLED 1
+#endif
+
+#define NRFX_SPIM_DT_HAS_RX_DELAY(node) DT_PROP(node, rx_delay_supported) +
+
+#ifndef NRFX_SPIM_EXTENDED_ENABLED
+#if DT_FOREACH_STATUS_OKAY(nordic_nrf_spim, NRFX_SPIM_DT_HAS_RX_DELAY) 0
+#define NRFX_SPIM_EXTENDED_ENABLED 1
+#endif
+#endif
+
+#ifdef CONFIG_NRFX_SPIM00
+#define NRFX_SPIM00_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM20
+#define NRFX_SPIM20_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM21
+#define NRFX_SPIM21_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM22
+#define NRFX_SPIM22_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM30
+#define NRFX_SPIM30_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM120
+#define NRFX_SPIM120_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM121
+#define NRFX_SPIM121_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM130
+#define NRFX_SPIM130_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM131
+#define NRFX_SPIM131_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM132
+#define NRFX_SPIM132_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM133
+#define NRFX_SPIM133_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM134
+#define NRFX_SPIM134_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM135
+#define NRFX_SPIM135_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM136
+#define NRFX_SPIM136_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIM137
+#define NRFX_SPIM137_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_SPIS
+#define NRFX_SPIS_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS_LOG
+#define NRFX_SPIS_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS0
+#define NRFX_SPIS0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS1
+#define NRFX_SPIS1_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS2
+#define NRFX_SPIS2_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS3
+#define NRFX_SPIS3_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS00
+#define NRFX_SPIS00_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS20
+#define NRFX_SPIS20_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS21
+#define NRFX_SPIS21_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS22
+#define NRFX_SPIS22_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS30
+#define NRFX_SPIS30_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS120
+#define NRFX_SPIS120_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS130
+#define NRFX_SPIS130_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS131
+#define NRFX_SPIS131_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS132
+#define NRFX_SPIS132_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS133
+#define NRFX_SPIS133_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS134
+#define NRFX_SPIS134_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS135
+#define NRFX_SPIS135_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS136
+#define NRFX_SPIS136_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS137
+#define NRFX_SPIS137_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_SYSTICK
+#define NRFX_SYSTICK_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SYSTICK_LOG
+#define NRFX_SYSTICK_CONFIG_LOG_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_TBM
+#define NRFX_TBM_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_TEMP
+#define NRFX_TEMP_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TEMP_LOG
+#define NRFX_TEMP_CONFIG_LOG_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_TIMER
+#define NRFX_TIMER_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER_LOG
+#define NRFX_TIMER_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER0
+#define NRFX_TIMER0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER1
+#define NRFX_TIMER1_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER2
+#define NRFX_TIMER2_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER3
+#define NRFX_TIMER3_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER4
+#define NRFX_TIMER4_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER00
+#define NRFX_TIMER00_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER10
+#define NRFX_TIMER10_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER20
+#define NRFX_TIMER20_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER21
+#define NRFX_TIMER21_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER22
+#define NRFX_TIMER22_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER23
+#define NRFX_TIMER23_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER24
+#define NRFX_TIMER24_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER020
+#define NRFX_TIMER020_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER021
+#define NRFX_TIMER021_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER022
+#define NRFX_TIMER022_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER120
+#define NRFX_TIMER120_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER121
+#define NRFX_TIMER121_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER130
+#define NRFX_TIMER130_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER131
+#define NRFX_TIMER131_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER132
+#define NRFX_TIMER132_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER133
+#define NRFX_TIMER133_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER134
+#define NRFX_TIMER134_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER135
+#define NRFX_TIMER135_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER136
+#define NRFX_TIMER136_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TIMER137
+#define NRFX_TIMER137_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_TWI
+#define NRFX_TWI_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWI_LOG
+#define NRFX_TWI_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWI0
+#define NRFX_TWI0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWI1
+#define NRFX_TWI1_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_TWIM
+#define NRFX_TWIM_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIM_LOG
+#define NRFX_TWIM_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIM0
+#define NRFX_TWIM0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIM1
+#define NRFX_TWIM1_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIM2
+#define NRFX_TWIM2_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIM3
+#define NRFX_TWIM3_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIM20
+#define NRFX_TWIM20_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIM21
+#define NRFX_TWIM21_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIM22
+#define NRFX_TWIM22_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIM30
+#define NRFX_TWIM30_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIM120
+#define NRFX_TWIM120_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIM130
+#define NRFX_TWIM130_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIM131
+#define NRFX_TWIM131_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIM132
+#define NRFX_TWIM132_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIM133
+#define NRFX_TWIM133_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIM134
+#define NRFX_TWIM134_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIM135
+#define NRFX_TWIM135_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIM136
+#define NRFX_TWIM136_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIM137
+#define NRFX_TWIM137_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_TWIS
+#define NRFX_TWIS_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIS_LOG
+#define NRFX_TWIS_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIS0
+#define NRFX_TWIS0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIS1
+#define NRFX_TWIS1_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIS2
+#define NRFX_TWIS2_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIS3
+#define NRFX_TWIS3_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIS20
+#define NRFX_TWIS20_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIS21
+#define NRFX_TWIS21_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIS22
+#define NRFX_TWIS22_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIS30
+#define NRFX_TWIS30_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIS130
+#define NRFX_TWIS130_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIS131
+#define NRFX_TWIS131_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIS132
+#define NRFX_TWIS132_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIS133
+#define NRFX_TWIS133_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIS134
+#define NRFX_TWIS134_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIS135
+#define NRFX_TWIS135_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIS136
+#define NRFX_TWIS136_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_TWIS137
+#define NRFX_TWIS137_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_UART
+#define NRFX_UART_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UART_LOG
+#define NRFX_UART_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UART0
+#define NRFX_UART0_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_UARTE
+#define NRFX_UARTE_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE_LOG
+#define NRFX_UARTE_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE0
+#define NRFX_UARTE0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE1
+#define NRFX_UARTE1_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE2
+#define NRFX_UARTE2_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE3
+#define NRFX_UARTE3_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE00
+#define NRFX_UARTE00_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE20
+#define NRFX_UARTE20_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE21
+#define NRFX_UARTE21_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE22
+#define NRFX_UARTE22_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE30
+#define NRFX_UARTE30_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE120
+#define NRFX_UARTE120_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE130
+#define NRFX_UARTE130_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE131
+#define NRFX_UARTE131_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE132
+#define NRFX_UARTE132_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE133
+#define NRFX_UARTE133_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE134
+#define NRFX_UARTE134_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE135
+#define NRFX_UARTE135_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE136
+#define NRFX_UARTE136_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE137
+#define NRFX_UARTE137_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
+#define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 1
+#endif
+#ifdef CONFIG_NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG
+#define NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG 1
+#endif
+#ifdef CONFIG_NRFX_UARTE_CONFIG_TX_LINK
+#define NRFX_UARTE_CONFIG_TX_LINK 1
+#endif
+#ifdef CONFIG_NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
+#define NRFX_UARTE_CONFIG_RX_CACHE_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_USBREG
+#define NRFX_USBREG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_USBREG_LOG
+#define NRFX_USBREG_CONFIG_LOG_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRFX_WDT
+#define NRFX_WDT_ENABLED 1
+#endif
+#ifdef CONFIG_WDT_NRFX_NO_IRQ
+#define NRFX_WDT_CONFIG_NO_IRQ 1
+#endif
+#ifdef CONFIG_NRFX_WDT_LOG
+#define NRFX_WDT_CONFIG_LOG_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_WDT0
+#define NRFX_WDT0_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_WDT1
+#define NRFX_WDT1_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_WDT30
+#define NRFX_WDT30_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_WDT31
+#define NRFX_WDT31_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_WDT010
+#define NRFX_WDT010_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_WDT011
+#define NRFX_WDT011_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_WDT130
+#define NRFX_WDT130_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_WDT131
+#define NRFX_WDT131_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_WDT132
+#define NRFX_WDT132_ENABLED 1
+#endif
+
+#ifdef CONFIG_NRF52_ANOMALY_109_WORKAROUND
+#define NRFX_SPIM_NRF52_ANOMALY_109_WORKAROUND_ENABLED 1
+#define NRFX_SPIS_NRF52_ANOMALY_109_WORKAROUND_ENABLED 1
+#define NRFX_TWIM_NRF52_ANOMALY_109_WORKAROUND_ENABLED 1
+#define NRFX_PWM_NRF52_ANOMALY_109_WORKAROUND_ENABLED 1
+#define NRFX_PWM_NRF52_ANOMALY_109_EGU_INSTANCE \
+	CONFIG_NRF52_ANOMALY_109_WORKAROUND_EGU_INSTANCE
+#endif
+
+#if defined(CONFIG_SOC_SERIES_BSIM_NRFXX)
+#include "nrfx_config_bsim.h"
+#endif
+
+/*
+ * For chips with TrustZone support, MDK provides CMSIS-Core peripheral
+ * accessing symbols in two flavors, with secure and non-secure base address
+ * mappings. Their names contain the suffix _S or _NS, respectively.
+ * Because nrfx HALs and drivers require these peripheral accessing symbols
+ * without any suffixes, the following macro is provided that will translate
+ * their names according to the kind of the target that is built.
+ */
+#if defined(NRF_TRUSTZONE_NONSECURE)
+#define NRF_PERIPH(P) P##_NS
+#else
+#define NRF_PERIPH(P) P##_S
+#endif
+
+#define NRFX_CONFIG_BIT_DT(node_id, prop, idx) BIT(DT_PROP_BY_IDX(node_id, prop, idx))
+#define NRFX_CONFIG_MASK_DT(node_id, prop) \
+	(COND_CODE_1(DT_NODE_HAS_PROP(node_id, prop), \
+		(DT_FOREACH_PROP_ELEM_SEP(node_id, prop, NRFX_CONFIG_BIT_DT, (|))), \
+		(0)))
+
+/* If the GRTC system timer driver is to be used, prepare definitions required
+ * by the nrfx_grtc driver (NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK and
+ * NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS) based on information from devicetree.
+ */
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc)
+#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK \
+	(NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), owned_channels) & \
+	 ~NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), child_owned_channels))
+#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS \
+	(DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), owned_channels, 0) - \
+	 DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), child_owned_channels, 0))
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc) */
+
+/* If global of local DPPIC peripherals are used, provide the following macro
+ * definitions required by the interconnect/apb layer:
+ * - NRFX_DPPI_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
+ * - NRFX_DPPI_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
+ * - NRFX_DPPI_PUB_OR_SUB_MASK(inst_num)
+ * - NRFX_DPPI_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num)
+ * - NRFX_INTERCONNECT_APB_GLOBAL_DPPI_DEFINE
+ * - NRFX_INTERCONNECT_APB_LOCAL_DPPI_DEFINE
+ * based on information from devicetree.
+ */
+#if	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_global) || \
+	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_local)
+#ifndef NRFX_DPPI_ENABLED
+#define NRFX_DPPI_ENABLED 1
+#endif
+/* Source (publish) channels masks generation. */
+#define NRFX_DPPI_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
+	NRFX_CONFIG_MASK_DT(DT_NODELABEL(_CONCAT(dppic, inst_num)), source_channels)
+
+/* Sink (subscribe) channels masks generation. */
+#define NRFX_DPPI_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
+	NRFX_CONFIG_MASK_DT(DT_NODELABEL(_CONCAT(dppic, inst_num)), sink_channels)
+
+#define NRFX_DPPI_PUB_OR_SUB_MASK(inst_num) \
+	UTIL_OR(DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), source_channels), \
+		DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), sink_channels))
+
+/* Variables names generation. */
+#define NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(node_id) _CONCAT(_CONCAT(m_, node_id), _channels)
+#define NRFX_DPPI_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num) \
+	NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(DT_NODELABEL(_CONCAT(dppic, inst_num)))
+
+/* Variables entries generation. */
+#define NRFX_CONFIG_DPPI_CHANNELS_ENTRY(node_id) \
+	static nrfx_atomic_t NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(node_id) \
+		__attribute__((used)) = \
+		NRFX_CONFIG_MASK_DT(node_id, source_channels) | \
+		NRFX_CONFIG_MASK_DT(node_id, sink_channels);
+#define NRFX_INTERCONNECT_APB_GLOBAL_DPPI_DEFINE \
+	DT_FOREACH_STATUS_OKAY(nordic_nrf_dppic_global, NRFX_CONFIG_DPPI_CHANNELS_ENTRY)
+#define NRFX_INTERCONNECT_APB_LOCAL_DPPI_DEFINE \
+	DT_FOREACH_STATUS_OKAY(nordic_nrf_dppic_local, NRFX_CONFIG_DPPI_CHANNELS_ENTRY)
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_global) || ... */
+
+/* If local or global DPPIC peripherals are used, provide the following macro
+ * definitions required by the interconnect/ipct layer:
+ * - NRFX_IPCTx_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
+ * - NRFX_IPCTx_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
+ * - NRFX_IPCT_PUB_OR_SUB_MASK(inst_num)
+ * - NRFX_IPCTx_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num)
+ * - NRFX_INTERCONNECT_IPCT_GLOBAL_DEFINE
+ * - NRFX_INTERCONNECT_IPCT_LOCAL_DEFINE
+ * based on information from devicetree.
+ */
+#if	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_ipct_global) || \
+	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_ipct_local)
+/* Channels masks generation. */
+#define NRFX_CONFIG_IPCT_MASK_DT(node_id) \
+	COND_CODE_1(DT_NODE_HAS_PROP(node_id, owned_channels), \
+		(NRFX_CONFIG_MASK_DT(node_id, owned_channels)), \
+		(COND_CODE_1(DT_NODE_HAS_COMPAT(node_id, nordic_nrf_ipct_local), \
+			(BIT_MASK(DT_PROP(node_id, channels))), (0))))
+
+#if defined(NRF_APPLICATION)
+#define NRFX_CONFIG_IPCT_LOCAL_NODE DT_NODELABEL(cpuapp_ipct)
+#elif defined(NRF_RADIOCORE)
+#define NRFX_CONFIG_IPCT_LOCAL_NODE DT_NODELABEL(cpurad_ipct)
+#endif
+#define NRFX_CONFIG_IPCT_NODE_BY_INST_NUM(inst_num) \
+	COND_CODE_1(IS_EMPTY(inst_num), \
+		(NRFX_CONFIG_IPCT_LOCAL_NODE), \
+		(DT_NODELABEL(_CONCAT(ipct, inst_num))))
+
+#define NRFX_IPCTx_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
+	NRFX_CONFIG_IPCT_MASK_DT(NRFX_CONFIG_IPCT_NODE_BY_INST_NUM(inst_num))
+
+#define NRFX_IPCTx_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
+	NRFX_CONFIG_IPCT_MASK_DT(NRFX_CONFIG_IPCT_NODE_BY_INST_NUM(inst_num))
+
+#define NRFX_IPCT_PUB_OR_SUB_MASK(inst_num) \
+	COND_CODE_1(IS_EMPTY(inst_num), \
+		(DT_NODE_HAS_STATUS_OKAY(NRFX_CONFIG_IPCT_LOCAL_NODE)), \
+		(DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(ipct, inst_num)), owned_channels)))
+
+/* Variables names generation. */
+#define NRFX_CONFIG_IPCT_CHANNELS_ENTRY_NAME(node_id) _CONCAT(_CONCAT(m_, node_id), _channels)
+#define NRFX_IPCTx_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num) \
+	COND_CODE_1(IS_EMPTY(inst_num), \
+		(NRFX_CONFIG_IPCT_CHANNELS_ENTRY_NAME(NRFX_CONFIG_IPCT_LOCAL_NODE)), \
+		(NRFX_CONFIG_IPCT_CHANNELS_ENTRY_NAME(DT_NODELABEL(_CONCAT(ipct, inst_num)))))
+
+/* Variables entries generation. */
+#define NRFX_CONFIG_IPCT_CHANNELS_ENTRY(node_id) \
+	static nrfx_atomic_t NRFX_CONFIG_IPCT_CHANNELS_ENTRY_NAME(node_id) \
+		__attribute__((used)) = \
+		NRFX_CONFIG_IPCT_MASK_DT(node_id);
+#define NRFX_INTERCONNECT_IPCT_LOCAL_DEFINE \
+	DT_FOREACH_STATUS_OKAY(nordic_nrf_ipct_local, NRFX_CONFIG_IPCT_CHANNELS_ENTRY)
+#define NRFX_INTERCONNECT_IPCT_GLOBAL_DEFINE \
+	DT_FOREACH_STATUS_OKAY(nordic_nrf_ipct_global, NRFX_CONFIG_IPCT_CHANNELS_ENTRY)
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_ipct_global) || ... */
+
+#endif /* NRFX_KCONFIG_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_log.h b/modules/hal_nordic/nrfx/nrfx_log.h
index cfa363b4fc3..682388d7dd1 100644
--- a/modules/hal_nordic/nrfx/nrfx_log.h
+++ b/modules/hal_nordic/nrfx/nrfx_log.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 - 2020, Nordic Semiconductor ASA
+ * Copyright (c) 2017, Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h b/modules/hal_nordic/nrfx/nrfx_reserved_resources.h
similarity index 99%
rename from modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h
rename to modules/hal_nordic/nrfx/nrfx_reserved_resources.h
index c40e22c17d7..3515c69110f 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h
+++ b/modules/hal_nordic/nrfx/nrfx_reserved_resources.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef NRFX_CONFIG_RESERVED_RESOURCES_H__
-#define NRFX_CONFIG_RESERVED_RESOURCES_H__
+#ifndef NRFX_RESERVED_RESOURCES_H__
+#define NRFX_RESERVED_RESOURCES_H__
 
 /** @brief Bitmask that defines GPIOTE130 channels reserved for use outside
  *         of the nrfx library.
@@ -707,4 +707,4 @@
 	(NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR |                                              \
 	 NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV | NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL)
 
-#endif /* NRFX_CONFIG_RESERVED_RESOURCES_H__ */
+#endif /* NRFX_RESERVED_RESOURCES_H__ */

From 75ec3a10e375b0a262e330ccf4065ac70cbba7e5 Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Wed, 20 Nov 2024 14:45:37 +0100
Subject: [PATCH 2441/2913] [nrf fromtree] modules: hal_nordic: nrfx: cleanup

* Move all KConfig configuration from CMake to `nrfx_kconfig.h`
* Move macro utils from `nrfx_kconfig.h` to `nrfx_zephyr_utils.h`
* Move GRTC channels allocation from `nrfx_kconfig.h` to
  `nrfx_reserved_resources.h`

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
(cherry picked from commit 94589b784b4e268a4007614b9b79d3c4fb94e6e5)
---
 modules/hal_nordic/nrfx/CMakeLists.txt        |  10 --
 modules/hal_nordic/nrfx/nrfx_config.h         |  13 ++
 modules/hal_nordic/nrfx/nrfx_glue.h           |   8 --
 modules/hal_nordic/nrfx/nrfx_kconfig.h        |  85 ++---------
 .../hal_nordic/nrfx/nrfx_reserved_resources.h |  33 +++--
 modules/hal_nordic/nrfx/nrfx_zephyr_utils.h   | 132 ++++++++++++++++++
 .../nrf5/nrfx_glue/bt_ctlr_used_resources.h   |   8 +-
 .../ll_sw/nordic/hal/nrf5/radio/radio_nrf5.h  |   6 +-
 8 files changed, 187 insertions(+), 108 deletions(-)
 create mode 100644 modules/hal_nordic/nrfx/nrfx_zephyr_utils.h

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 91c694878ca..21f8b64c16f 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -188,16 +188,6 @@ if(CONFIG_SOC_NRF54L_CPUAPP_COMMON)
 	zephyr_compile_definitions("NRF_CONFIG_CPU_FREQ_MHZ=${clock_frequency_mhz}")
 endif()
 
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG NRF_SKIP_CLOCK_CONFIGURATION)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_DISABLE_FICR_TRIMCNF NRF_DISABLE_FICR_TRIMCNF)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE NRF_SKIP_GLITCHDETECTOR_DISABLE)
-
-# Inject code to skip TAMPC setup for nRF54L20 and nRF54L09. It is not supported for now.
-# It needs to be removed when support is provided.
-if(CONFIG_SOC_NRF54L20_ENGA_CPUAPP OR CONFIG_SOC_NRF54L09_ENGA_CPUAPP)
-  zephyr_compile_definitions(NRF_SKIP_TAMPC_SETUP)
-endif()
-
 if(CONFIG_SOC_COMPATIBLE_NRF54LX AND CONFIG_NRFX_GPPI)
   zephyr_library_sources(${HELPERS_DIR}/nrfx_gppi_dppi_ppib_lumos.c)
   zephyr_library_sources(${NRFX_DIR}/soc/interconnect/dppic_ppib/nrfx_interconnect_dppic_ppib.c)
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index a9de5dfeb78..6a337cd2588 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -12,9 +12,22 @@
 #define NRFX_CONFIG_API_VER_MINOR 8
 #define NRFX_CONFIG_API_VER_MICRO 0
 
+/* Macros used in zephyr-specific config files. */
+#include "nrfx_zephyr_utils.h"
+
 /* Define nrfx configuration based on Zephyrs KConfigs. */
 #include "nrfx_kconfig.h"
 
+/* Define resources reserved outside nrfx scope. */
+#ifdef CONFIG_NRFX_RESERVED_RESOURCES_HEADER
+#include CONFIG_NRFX_RESERVED_RESOURCES_HEADER
+#endif
+
+/* Include babble-sim configuration. */
+#if defined(CONFIG_SOC_SERIES_BSIM_NRFXX)
+#include "nrfx_config_bsim.h"
+#endif
+
 /* Use defaults for undefined symbols. */
 #include <templates/nrfx_config_common.h>
 #if defined(NRF51)
diff --git a/modules/hal_nordic/nrfx/nrfx_glue.h b/modules/hal_nordic/nrfx/nrfx_glue.h
index 8f1109f4a79..0fadfb61b02 100644
--- a/modules/hal_nordic/nrfx/nrfx_glue.h
+++ b/modules/hal_nordic/nrfx/nrfx_glue.h
@@ -312,14 +312,6 @@ void nrfx_busy_wait(uint32_t usec_to_wait);
 		(void)size;              \
 	} while (0)
 
-/*------------------------------------------------------------------------------*/
-
-#ifdef CONFIG_NRFX_RESERVED_RESOURCES_HEADER
-#include CONFIG_NRFX_RESERVED_RESOURCES_HEADER
-#endif
-
-//------------------------------------------------------------------------------
-
 /**
  * @brief Function helping to integrate nrfx IRQ handlers with IRQ_CONNECT.
  *
diff --git a/modules/hal_nordic/nrfx/nrfx_kconfig.h b/modules/hal_nordic/nrfx/nrfx_kconfig.h
index 403e1566be3..c93a8231e1d 100644
--- a/modules/hal_nordic/nrfx/nrfx_kconfig.h
+++ b/modules/hal_nordic/nrfx/nrfx_kconfig.h
@@ -7,9 +7,6 @@
 #ifndef NRFX_KCONFIG_H__
 #define NRFX_KCONFIG_H__
 
-#include <zephyr/devicetree.h>
-#include <zephyr/sys/util_macro.h>
-
 /*
  * These are mappings of Kconfig options enabling nrfx drivers and particular
  * peripheral instances to the corresponding symbols used inside of nrfx.
@@ -967,85 +964,31 @@
 	CONFIG_NRF52_ANOMALY_109_WORKAROUND_EGU_INSTANCE
 #endif
 
-#if defined(CONFIG_SOC_SERIES_BSIM_NRFXX)
-#include "nrfx_config_bsim.h"
+#ifdef CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG
+#define NRF_SKIP_CLOCK_CONFIGURATION
 #endif
 
-/*
- * For chips with TrustZone support, MDK provides CMSIS-Core peripheral
- * accessing symbols in two flavors, with secure and non-secure base address
- * mappings. Their names contain the suffix _S or _NS, respectively.
- * Because nrfx HALs and drivers require these peripheral accessing symbols
- * without any suffixes, the following macro is provided that will translate
- * their names according to the kind of the target that is built.
- */
-#if defined(NRF_TRUSTZONE_NONSECURE)
-#define NRF_PERIPH(P) P##_NS
-#else
-#define NRF_PERIPH(P) P##_S
+#ifdef CONFIG_SOC_NRF54LX_DISABLE_FICR_TRIMCNF
+#define NRF_DISABLE_FICR_TRIMCNF
 #endif
 
-#define NRFX_CONFIG_BIT_DT(node_id, prop, idx) BIT(DT_PROP_BY_IDX(node_id, prop, idx))
-#define NRFX_CONFIG_MASK_DT(node_id, prop) \
-	(COND_CODE_1(DT_NODE_HAS_PROP(node_id, prop), \
-		(DT_FOREACH_PROP_ELEM_SEP(node_id, prop, NRFX_CONFIG_BIT_DT, (|))), \
-		(0)))
+#ifdef CONFIG_SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE
+#define NRF_SKIP_GLITCHDETECTOR_DISABLE
+#endif
 
-/* If the GRTC system timer driver is to be used, prepare definitions required
- * by the nrfx_grtc driver (NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK and
- * NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS) based on information from devicetree.
- */
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc)
-#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK \
-	(NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), owned_channels) & \
-	 ~NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), child_owned_channels))
-#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS \
-	(DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), owned_channels, 0) - \
-	 DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), child_owned_channels, 0))
-#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc) */
-
-/* If global of local DPPIC peripherals are used, provide the following macro
- * definitions required by the interconnect/apb layer:
- * - NRFX_DPPI_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
- * - NRFX_DPPI_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
- * - NRFX_DPPI_PUB_OR_SUB_MASK(inst_num)
- * - NRFX_DPPI_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num)
- * - NRFX_INTERCONNECT_APB_GLOBAL_DPPI_DEFINE
- * - NRFX_INTERCONNECT_APB_LOCAL_DPPI_DEFINE
- * based on information from devicetree.
+/*
+ * Inject code to skip TAMPC setup for nRF54L20 and nRF54L09. It is not supported for now.
+ * It needs to be removed when support is provided.
  */
+#if defined(CONFIG_SOC_NRF54L20_ENGA_CPUAPP) || defined(CONFIG_SOC_NRF54L09_ENGA_CPUAPP)
+#define NRF_SKIP_TAMPC_SETUP
+#endif
+
 #if	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_global) || \
 	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_local)
 #ifndef NRFX_DPPI_ENABLED
 #define NRFX_DPPI_ENABLED 1
 #endif
-/* Source (publish) channels masks generation. */
-#define NRFX_DPPI_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
-	NRFX_CONFIG_MASK_DT(DT_NODELABEL(_CONCAT(dppic, inst_num)), source_channels)
-
-/* Sink (subscribe) channels masks generation. */
-#define NRFX_DPPI_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
-	NRFX_CONFIG_MASK_DT(DT_NODELABEL(_CONCAT(dppic, inst_num)), sink_channels)
-
-#define NRFX_DPPI_PUB_OR_SUB_MASK(inst_num) \
-	UTIL_OR(DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), source_channels), \
-		DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), sink_channels))
-
-/* Variables names generation. */
-#define NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(node_id) _CONCAT(_CONCAT(m_, node_id), _channels)
-#define NRFX_DPPI_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num) \
-	NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(DT_NODELABEL(_CONCAT(dppic, inst_num)))
-
-/* Variables entries generation. */
-#define NRFX_CONFIG_DPPI_CHANNELS_ENTRY(node_id) \
-	static nrfx_atomic_t NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(node_id) \
-		__attribute__((used)) = \
-		NRFX_CONFIG_MASK_DT(node_id, source_channels) | \
-		NRFX_CONFIG_MASK_DT(node_id, sink_channels);
-#define NRFX_INTERCONNECT_APB_GLOBAL_DPPI_DEFINE \
-	DT_FOREACH_STATUS_OKAY(nordic_nrf_dppic_global, NRFX_CONFIG_DPPI_CHANNELS_ENTRY)
-#define NRFX_INTERCONNECT_APB_LOCAL_DPPI_DEFINE \
-	DT_FOREACH_STATUS_OKAY(nordic_nrf_dppic_local, NRFX_CONFIG_DPPI_CHANNELS_ENTRY)
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_global) || ... */
 
 /* If local or global DPPIC peripherals are used, provide the following macro
diff --git a/modules/hal_nordic/nrfx/nrfx_reserved_resources.h b/modules/hal_nordic/nrfx/nrfx_reserved_resources.h
index 3515c69110f..9958699723f 100644
--- a/modules/hal_nordic/nrfx/nrfx_reserved_resources.h
+++ b/modules/hal_nordic/nrfx/nrfx_reserved_resources.h
@@ -31,6 +31,19 @@
  */
 #define NRFX_TIMERS_USED 0
 
+/* If the GRTC system timer driver is to be used, prepare definitions required
+ * by the nrfx_grtc driver (NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK and
+ * NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS) based on information from devicetree.
+ */
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc)
+#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK \
+	(NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), owned_channels) & \
+	 ~NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), child_owned_channels))
+#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS \
+	(DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), owned_channels, 0) - \
+	 DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), child_owned_channels, 0))
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc) */
+
 /*
  * The enabled Bluetooth controller subsystem is responsible for providing
  * definitions of the BT_CTLR_USED_* symbols used below in a file named
@@ -40,34 +53,32 @@
  */
 #if defined(CONFIG_BT_LL_SW_SPLIT)
 #include <bt_ctlr_used_resources.h>
-#if defined(DPPI_PRESENT)
-#if defined(NRF53_SERIES)
+#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_COMPATIBLE_NRF52X)
+#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
+#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
 #define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
 #define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
-#elif defined(NRF54L_SERIES)
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
 #define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
 #define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
 #endif
-#else /* defined(DPPI_PRESENT) */
-#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
-#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
-#endif /* defined(DPPI_PRESENT) */
 #endif /* defined(CONFIG_BT_LL_SW_SPLIT) */
 
 #if defined(CONFIG_NRF_802154_RADIO_DRIVER)
-#if defined(NRF52_SERIES)
+#if defined(CONFIG_SOC_COMPATIBLE_NRF52X)
 #include <../src/nrf_802154_peripherals_nrf52.h>
 #define NRFX_PPI_CHANNELS_USED_BY_802154_DRV NRF_802154_PPI_CHANNELS_USED_MASK
 #define NRFX_PPI_GROUPS_USED_BY_802154_DRV   NRF_802154_PPI_GROUPS_USED_MASK
-#elif defined(NRF53_SERIES)
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
 #include <../src/nrf_802154_peripherals_nrf53.h>
 #define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
 #define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
-#elif defined(NRF54L_SERIES)
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
 #include <../src/nrf_802154_peripherals_nrf54l.h>
 #define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
 #define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
-#elif defined(NRF54H_SERIES)
+#elif defined(CONFIG_SOC_SERIES_NRF54HX)
 #include <../src/nrf_802154_peripherals_nrf54h.h>
 #define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
 #define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
diff --git a/modules/hal_nordic/nrfx/nrfx_zephyr_utils.h b/modules/hal_nordic/nrfx/nrfx_zephyr_utils.h
new file mode 100644
index 00000000000..e1fa4d4c321
--- /dev/null
+++ b/modules/hal_nordic/nrfx/nrfx_zephyr_utils.h
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef NRFX_ZEPHYR_UTILS_H__
+#define NRFX_ZEPHYR_UTILS_H__
+
+#include <zephyr/devicetree.h>
+#include <zephyr/sys/util_macro.h>
+
+/*
+ * For chips with TrustZone support, MDK provides CMSIS-Core peripheral
+ * accessing symbols in two flavors, with secure and non-secure base address
+ * mappings. Their names contain the suffix _S or _NS, respectively.
+ * Because nrfx HALs and drivers require these peripheral accessing symbols
+ * without any suffixes, the following macro is provided that will translate
+ * their names according to the kind of the target that is built.
+ */
+#if defined(NRF_TRUSTZONE_NONSECURE)
+#define NRF_PERIPH(P) P##_NS
+#else
+#define NRF_PERIPH(P) P##_S
+#endif
+
+#define NRFX_CONFIG_BIT_DT(node_id, prop, idx) BIT(DT_PROP_BY_IDX(node_id, prop, idx))
+#define NRFX_CONFIG_MASK_DT(node_id, prop) \
+	(COND_CODE_1(DT_NODE_HAS_PROP(node_id, prop), \
+		(DT_FOREACH_PROP_ELEM_SEP(node_id, prop, NRFX_CONFIG_BIT_DT, (|))), \
+		(0)))
+
+/* If global of local DPPIC peripherals are used, provide the following macro
+ * definitions required by the interconnect/apb layer:
+ * - NRFX_DPPI_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
+ * - NRFX_DPPI_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
+ * - NRFX_DPPI_PUB_OR_SUB_MASK(inst_num)
+ * - NRFX_DPPI_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num)
+ * - NRFX_INTERCONNECT_APB_GLOBAL_DPPI_DEFINE
+ * - NRFX_INTERCONNECT_APB_LOCAL_DPPI_DEFINE
+ * based on information from devicetree.
+ */
+#if	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_global) || \
+	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_local)
+/* Source (publish) channels masks generation. */
+#define NRFX_DPPI_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
+	NRFX_CONFIG_MASK_DT(DT_NODELABEL(_CONCAT(dppic, inst_num)), source_channels)
+
+/* Sink (subscribe) channels masks generation. */
+#define NRFX_DPPI_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
+	NRFX_CONFIG_MASK_DT(DT_NODELABEL(_CONCAT(dppic, inst_num)), sink_channels)
+
+#define NRFX_DPPI_PUB_OR_SUB_MASK(inst_num) \
+	UTIL_OR(DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), source_channels), \
+		DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), sink_channels))
+
+/* Variables names generation. */
+#define NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(node_id) _CONCAT(_CONCAT(m_, node_id), _channels)
+#define NRFX_DPPI_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num) \
+	NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(DT_NODELABEL(_CONCAT(dppic, inst_num)))
+
+/* Variables entries generation. */
+#define NRFX_CONFIG_DPPI_CHANNELS_ENTRY(node_id) \
+	static nrfx_atomic_t NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(node_id) \
+		__attribute__((used)) = \
+		NRFX_CONFIG_MASK_DT(node_id, source_channels) | \
+		NRFX_CONFIG_MASK_DT(node_id, sink_channels);
+#define NRFX_INTERCONNECT_APB_GLOBAL_DPPI_DEFINE \
+	DT_FOREACH_STATUS_OKAY(nordic_nrf_dppic_global, NRFX_CONFIG_DPPI_CHANNELS_ENTRY)
+#define NRFX_INTERCONNECT_APB_LOCAL_DPPI_DEFINE \
+	DT_FOREACH_STATUS_OKAY(nordic_nrf_dppic_local, NRFX_CONFIG_DPPI_CHANNELS_ENTRY)
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_global) || ... */
+
+/* If local or global DPPIC peripherals are used, provide the following macro
+ * definitions required by the interconnect/ipct layer:
+ * - NRFX_IPCTx_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
+ * - NRFX_IPCTx_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
+ * - NRFX_IPCT_PUB_OR_SUB_MASK(inst_num)
+ * - NRFX_IPCTx_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num)
+ * - NRFX_INTERCONNECT_IPCT_GLOBAL_DEFINE
+ * - NRFX_INTERCONNECT_IPCT_LOCAL_DEFINE
+ * based on information from devicetree.
+ */
+#if	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_ipct_global) || \
+	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_ipct_local)
+/* Channels masks generation. */
+#define NRFX_CONFIG_IPCT_MASK_DT(node_id) \
+	COND_CODE_1(DT_NODE_HAS_PROP(node_id, owned_channels), \
+		(NRFX_CONFIG_MASK_DT(node_id, owned_channels)), \
+		(COND_CODE_1(DT_NODE_HAS_COMPAT(node_id, nordic_nrf_ipct_local), \
+			(BIT_MASK(DT_PROP(node_id, channels))), (0))))
+
+#if defined(NRF_APPLICATION)
+#define NRFX_CONFIG_IPCT_LOCAL_NODE DT_NODELABEL(cpuapp_ipct)
+#elif defined(NRF_RADIOCORE)
+#define NRFX_CONFIG_IPCT_LOCAL_NODE DT_NODELABEL(cpurad_ipct)
+#endif
+#define NRFX_CONFIG_IPCT_NODE_BY_INST_NUM(inst_num) \
+	COND_CODE_1(IS_EMPTY(inst_num), \
+		(NRFX_CONFIG_IPCT_LOCAL_NODE), \
+		(DT_NODELABEL(_CONCAT(ipct, inst_num))))
+
+#define NRFX_IPCTx_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
+	NRFX_CONFIG_IPCT_MASK_DT(NRFX_CONFIG_IPCT_NODE_BY_INST_NUM(inst_num))
+
+#define NRFX_IPCTx_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
+	NRFX_CONFIG_IPCT_MASK_DT(NRFX_CONFIG_IPCT_NODE_BY_INST_NUM(inst_num))
+
+#define NRFX_IPCT_PUB_OR_SUB_MASK(inst_num) \
+	COND_CODE_1(IS_EMPTY(inst_num), \
+		(DT_NODE_HAS_STATUS_OKAY(NRFX_CONFIG_IPCT_LOCAL_NODE)), \
+		(DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(ipct, inst_num)), owned_channels)))
+
+/* Variables names generation. */
+#define NRFX_CONFIG_IPCT_CHANNELS_ENTRY_NAME(node_id) _CONCAT(_CONCAT(m_, node_id), _channels)
+#define NRFX_IPCTx_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num) \
+	COND_CODE_1(IS_EMPTY(inst_num), \
+		(NRFX_CONFIG_IPCT_CHANNELS_ENTRY_NAME(NRFX_CONFIG_IPCT_LOCAL_NODE)), \
+		(NRFX_CONFIG_IPCT_CHANNELS_ENTRY_NAME(DT_NODELABEL(_CONCAT(ipct, inst_num)))))
+
+/* Variables entries generation. */
+#define NRFX_CONFIG_IPCT_CHANNELS_ENTRY(node_id) \
+	static nrfx_atomic_t NRFX_CONFIG_IPCT_CHANNELS_ENTRY_NAME(node_id) \
+		__attribute__((used)) = \
+		NRFX_CONFIG_IPCT_MASK_DT(node_id);
+#define NRFX_INTERCONNECT_IPCT_LOCAL_DEFINE \
+	DT_FOREACH_STATUS_OKAY(nordic_nrf_ipct_local, NRFX_CONFIG_IPCT_CHANNELS_ENTRY)
+#define NRFX_INTERCONNECT_IPCT_GLOBAL_DEFINE \
+	DT_FOREACH_STATUS_OKAY(nordic_nrf_ipct_global, NRFX_CONFIG_IPCT_CHANNELS_ENTRY)
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_ipct_global) || ... */
+
+#endif /* NRFX_ZEPHYR_UTILS_H__ */
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/nrfx_glue/bt_ctlr_used_resources.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/nrfx_glue/bt_ctlr_used_resources.h
index b40e14f516f..6275a72c0aa 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/nrfx_glue/bt_ctlr_used_resources.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/nrfx_glue/bt_ctlr_used_resources.h
@@ -12,10 +12,10 @@
  *       conditionally compile them based on feature Kconfig defines in those
  *       resources header file.
  */
-#ifdef DPPI_PRESENT
-#include "../radio/radio_nrf5_dppi_resources.h"
-#else
+#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_COMPATIBLE_NRF52X)
 #include "../radio/radio_nrf5_ppi_resources.h"
+#else
+#include "../radio/radio_nrf5_dppi_resources.h"
 #endif
 
 /* Mask with all (D)PPI channels used by the bluetooth controller. */
@@ -78,7 +78,7 @@
 #endif
 
 #if defined(CONFIG_BT_CTLR_DF_PHYEND_OFFSET_COMPENSATION_ENABLE)
-#ifdef DPPI_PRESENT
+#if !defined(CONFIG_SOC_SERIES_NRF51X) && !defined(CONFIG_SOC_COMPATIBLE_NRF52X)
 #define HAL_USED_PPI_CHANNELS_7 \
 	(BIT(HAL_SW_SWITCH_TIMER_PHYEND_DELAY_COMPENSATION_DISABLE_PPI))
 #else
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5.h
index 07c40bd566a..0afaa7d60bf 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5.h
@@ -77,16 +77,14 @@
 /* Include RTC/GRTC Compare Index used to Trigger Radio TXEN/RXEN */
 #include "hal/cntr.h"
 
-#if defined(PPI_PRESENT)
+#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_COMPATIBLE_NRF52X)
 #include <hal/nrf_ppi.h>
 #include "radio_nrf5_ppi_resources.h"
 #include "radio_nrf5_ppi.h"
-#elif defined(DPPI_PRESENT)
+#else
 #include <hal/nrf_dppi.h>
 #include "radio_nrf5_dppi_resources.h"
 #include "radio_nrf5_dppi.h"
-#else
-#error "PPI or DPPI abstractions missing."
 #endif
 
 #include "radio_nrf5_txp.h"

From 3c9c7af912ca46b651f67acff1ab5963e1c01746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= <rafal.kuznia@nordicsemi.no>
Date: Tue, 22 Oct 2024 08:55:47 +0200
Subject: [PATCH 2442/2913] [nrf noup] modules: hal_nordic: adjust nrfx
 reservations to NCS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added ncs-specific modules to nrfx_config_reserved_resources.
The modules are:
- mpsl
- nrfe

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
---
 modules/hal_nordic/nrfx/Kconfig               |   2 +-
 .../nrfx/nrfx_config_reserved_resources_ncs.h | 916 ++++++++++++++++++
 2 files changed, 917 insertions(+), 1 deletion(-)
 create mode 100644 modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h

diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 8e407038a9f..c73a155dc60 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -1211,6 +1211,6 @@ endmenu
 
 config NRFX_RESERVED_RESOURCES_HEADER
 	string
-	default "nrfx_reserved_resources.h"
+	default "nrfx_config_reserved_resources_ncs.h"
 
 endmenu # "nrfx drivers"
diff --git a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h
new file mode 100644
index 00000000000..554b049f29f
--- /dev/null
+++ b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h
@@ -0,0 +1,916 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef NRFX_CONFIG_RESERVED_RESOURCES_H__
+#define NRFX_CONFIG_RESERVED_RESOURCES_H__
+
+/** @brief Bitmask that defines GPIOTE130 channels reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_GPIOTE130_CHANNELS_USED                                                               \
+	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), owned_channels) |                           \
+	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), child_owned_channels))
+
+/** @brief Bitmask that defines GPIOTE131 channels reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_GPIOTE131_CHANNELS_USED                                                               \
+	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), owned_channels) |                           \
+	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), child_owned_channels))
+
+/** @brief Bitmask that defines EGU instances that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_EGUS_USED 0
+
+/** @brief Bitmask that defines TIMER instances that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_TIMERS_USED 0
+
+/*
+ * The enabled Bluetooth controller subsystem is responsible for providing
+ * definitions of the BT_CTLR_USED_* symbols used below in a file named
+ * bt_ctlr_used_resources.h and for adding its location to global include
+ * paths so that the file can be included here for all Zephyr libraries that
+ * are to be built.
+ */
+#if defined(CONFIG_BT_LL_SW_SPLIT)
+#include <bt_ctlr_used_resources.h>
+#if defined(DPPI_PRESENT)
+#if defined(NRF53_SERIES)
+#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
+#define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
+#elif defined(NRF54L_SERIES)
+#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
+#define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
+#endif
+#else /* defined(DPPI_PRESENT) */
+#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
+#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
+#endif /* defined(DPPI_PRESENT) */
+#endif /* defined(CONFIG_BT_LL_SW_SPLIT) */
+
+#if defined(CONFIG_BT_LL_SOFTDEVICE)
+#include <sdc_soc.h>
+#if defined(NRF52_SERIES)
+#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR SDC_PPI_CHANNELS_USED_MASK
+#elif defined(NRF53_SERIES)
+#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR SDC_DPPI_CHANNELS_USED_MASK
+#elif defined(NRF54L_SERIES)
+#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC10_CHANNELS_USED_MASK
+#define NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC00_CHANNELS_USED_MASK
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR                                                   \
+	(SDC_PPIB00_CHANNELS_USED_MASK | SDC_PPIB10_CHANNELS_USED_MASK)
+#elif defined(NRF54H_SERIES)
+#define NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC020_CHANNELS_USED_MASK
+#define NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC030_CHANNELS_USED_MASK
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR                                                 \
+	(SDC_PPIB020_CHANNELS_USED_MASK | SDC_PPIB030_CHANNELS_USED_MASK)
+#else
+#error Unsupported chip family
+#endif
+#endif /* defined(CONFIG_BT_LL_SOFTDEVICE) */
+
+#if defined(CONFIG_NRF_802154_RADIO_DRIVER)
+#if defined(NRF52_SERIES)
+#include <../src/nrf_802154_peripherals_nrf52.h>
+#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV NRF_802154_PPI_CHANNELS_USED_MASK
+#define NRFX_PPI_GROUPS_USED_BY_802154_DRV   NRF_802154_PPI_GROUPS_USED_MASK
+#elif defined(NRF53_SERIES)
+#include <../src/nrf_802154_peripherals_nrf53.h>
+#define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
+#define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
+#elif defined(NRF54L_SERIES)
+#include <../src/nrf_802154_peripherals_nrf54l.h>
+#define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
+#define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
+#elif defined(NRF54H_SERIES)
+#include <../src/nrf_802154_peripherals_nrf54h.h>
+#define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
+#define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
+#else
+#error Unsupported chip family
+#endif
+#endif /* CONFIG_NRF_802154_RADIO_DRIVER */
+
+#if defined(CONFIG_MPSL)
+#include <mpsl.h>
+#if defined(NRF52_SERIES)
+#define NRFX_PPI_CHANNELS_USED_BY_MPSL MPSL_PPI_CHANNELS_USED_MASK
+#elif defined(NRF53_SERIES)
+#define NRFX_DPPI0_CHANNELS_USED_BY_MPSL MPSL_DPPIC_CHANNELS_USED_MASK
+#elif defined(NRF54L_SERIES)
+#define NRFX_DPPI10_CHANNELS_USED_BY_MPSL MPSL_DPPIC10_CHANNELS_USED_MASK
+#define NRFX_DPPI20_CHANNELS_USED_BY_MPSL MPSL_DPPIC20_CHANNELS_USED_MASK
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL                                                      \
+	(MPSL_PPIB11_CHANNELS_USED_MASK | MPSL_PPIB21_CHANNELS_USED_MASK)
+#elif defined(NRF54H_SERIES)
+#define NRFX_DPPI020_CHANNELS_USED_BY_MPSL MPSL_DPPIC020_CHANNELS_USED_MASK
+#else
+#error Unsupported chip family
+#endif
+#endif
+
+#ifndef NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI0_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI0_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI0_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI0_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI0_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI00_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI00_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI00_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI00_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI00_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI00_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI10_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI10_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI10_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI10_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI10_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI20_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI20_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI20_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI20_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI20_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI20_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI30_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI30_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI30_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI30_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI30_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI30_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI020_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI020_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI020_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI020_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI020_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI030_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI030_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI030_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI030_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI030_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI030_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI120_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI120_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI120_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI120_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI120_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI120_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI130_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI130_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI130_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI130_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI130_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI130_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI131_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI131_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI131_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI131_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI131_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI131_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI132_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI132_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI132_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI132_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI132_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI132_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI133_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI133_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI133_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI133_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI133_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI133_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI134_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI134_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI134_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI134_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI134_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI134_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI135_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI135_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI135_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI135_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI135_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI135_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI136_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI136_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI136_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI136_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI136_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI136_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPI_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPI_GROUPS_USED_BY_BT_CTLR
+#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR 0
+#endif
+
+#ifndef NRFX_PPI_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPI_GROUPS_USED_BY_802154_DRV
+#define NRFX_PPI_GROUPS_USED_BY_802154_DRV 0
+#endif
+
+#ifndef NRFX_PPI_CHANNELS_USED_BY_MPSL
+#define NRFX_PPI_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_PPI_GROUPS_USED_BY_MPSL
+#define NRFX_PPI_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#if defined(NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL)
+
+BUILD_ASSERT((NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI0_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI0_GROUPS_USED_BY_802154_DRV & NRFX_DPPI0_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI00_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI00_GROUPS_USED_BY_802154_DRV & NRFX_DPPI00_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI10_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI10_GROUPS_USED_BY_802154_DRV & NRFX_DPPI10_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI20_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI20_GROUPS_USED_BY_802154_DRV & NRFX_DPPI20_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI30_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI30_GROUPS_USED_BY_802154_DRV & NRFX_DPPI30_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI020_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI020_GROUPS_USED_BY_802154_DRV & NRFX_DPPI020_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI030_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI030_GROUPS_USED_BY_802154_DRV & NRFX_DPPI030_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI120_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI120_GROUPS_USED_BY_802154_DRV & NRFX_DPPI120_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI130_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI130_GROUPS_USED_BY_802154_DRV & NRFX_DPPI130_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI131_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI131_GROUPS_USED_BY_802154_DRV & NRFX_DPPI131_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI132_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI132_GROUPS_USED_BY_802154_DRV & NRFX_DPPI132_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI133_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI133_GROUPS_USED_BY_802154_DRV & NRFX_DPPI133_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI134_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI134_GROUPS_USED_BY_802154_DRV & NRFX_DPPI134_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI135_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI135_GROUPS_USED_BY_802154_DRV & NRFX_DPPI135_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI136_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI136_GROUPS_USED_BY_802154_DRV & NRFX_DPPI136_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPI_CHANNELS_USED_BY_802154_DRV & NRFX_PPI_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPI_GROUPS_USED_BY_802154_DRV & NRFX_PPI_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+#endif /* NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL */
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI0_CHANNELS_USED                                                                   \
+	(NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI0_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI0_GROUPS_USED                                                                     \
+	(NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI0_GROUPS_USED_BY_802154_DRV |                \
+	 NRFX_DPPI0_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI00_CHANNELS_USED                                                                  \
+	(NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI00_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI00_GROUPS_USED                                                                    \
+	(NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI00_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI00_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI10_CHANNELS_USED                                                                  \
+	(NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI10_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI10_GROUPS_USED                                                                    \
+	(NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI10_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI10_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI20_CHANNELS_USED                                                                  \
+	(NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI20_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI20_GROUPS_USED                                                                    \
+	(NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI20_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI20_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI30_CHANNELS_USED                                                                  \
+	(NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI30_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI30_GROUPS_USED                                                                    \
+	(NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI30_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI30_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI020_CHANNELS_USED                                                                 \
+	(NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI020_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI020_GROUPS_USED                                                                   \
+	(NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI020_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI020_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI030_CHANNELS_USED                                                                 \
+	(NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI030_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI030_GROUPS_USED                                                                   \
+	(NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI030_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI030_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI120_CHANNELS_USED                                                                 \
+	(NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI120_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI120_GROUPS_USED                                                                   \
+	(NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI120_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI120_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI130_CHANNELS_USED                                                                 \
+	(NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI130_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI130_GROUPS_USED                                                                   \
+	(NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI130_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI130_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI131_CHANNELS_USED                                                                 \
+	(NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI131_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI131_GROUPS_USED                                                                   \
+	(NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI131_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI131_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI132_CHANNELS_USED                                                                 \
+	(NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI132_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI132_GROUPS_USED                                                                   \
+	(NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI132_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI132_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI133_CHANNELS_USED                                                                 \
+	(NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI133_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI133_GROUPS_USED                                                                   \
+	(NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI133_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI133_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI134_CHANNELS_USED                                                                 \
+	(NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI134_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI134_GROUPS_USED                                                                   \
+	(NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI134_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI134_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI135_CHANNELS_USED                                                                 \
+	(NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI135_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI135_GROUPS_USED                                                                   \
+	(NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI135_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI135_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI136_CHANNELS_USED                                                                 \
+	(NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI136_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI136_GROUPS_USED                                                                   \
+	(NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI136_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI136_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines PPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_PPI_CHANNELS_USED                                                                     \
+	(NRFX_PPI_CHANNELS_USED_BY_BT_CTLR | NRFX_PPI_CHANNELS_USED_BY_802154_DRV |                \
+	 NRFX_PPI_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_DPPI_CHANNELS_USED NRFX_DPPI0_CHANNELS_USED
+#define NRFX_DPPI_GROUPS_USED   NRFX_DPPI0_GROUPS_USED
+
+/** @brief Bitmask that defines PPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_PPI_GROUPS_USED                                                                       \
+	(NRFX_PPI_GROUPS_USED_BY_BT_CTLR | NRFX_PPI_GROUPS_USED_BY_802154_DRV |                    \
+	 NRFX_PPI_GROUPS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_00_10_CHANNELS_USED                                                 \
+	(NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_01_20_CHANNELS_USED                                                 \
+	(NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_11_21_CHANNELS_USED                                                 \
+	(NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_22_30_CHANNELS_USED                                                 \
+	(NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_02_03_CHANNELS_USED                                                 \
+	(NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_04_12_CHANNELS_USED                                                 \
+	(NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_020_030_CHANNELS_USED                                               \
+	(NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR |                                              \
+	 NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV | NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL)
+
+#endif /* NRFX_CONFIG_RESERVED_RESOURCES_H__ */

From cd491568be86a897941b3b539165569f6017e77c Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Wed, 12 Feb 2025 11:41:25 +0100
Subject: [PATCH 2443/2913] [nrf noup] modules: hal_nordic: use Kconfig symbols
 in NCS reservation

As nrfx_config is included before MDK, MDK-specific device symbols
cannot be used. Use Kconfig symbols instead.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
---
 .../nrfx/nrfx_config_reserved_resources_ncs.h | 59 +++++++++++++------
 1 file changed, 40 insertions(+), 19 deletions(-)

diff --git a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h
index 554b049f29f..dd53325b123 100644
--- a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h
+++ b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h
@@ -31,6 +31,19 @@
  */
 #define NRFX_TIMERS_USED 0
 
+/* If the GRTC system timer driver is to be used, prepare definitions required
+ * by the nrfx_grtc driver (NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK and
+ * NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS) based on information from devicetree.
+ */
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc)
+#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK \
+	(NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), owned_channels) & \
+	 ~NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), child_owned_channels))
+#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS \
+	(DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), owned_channels, 0) - \
+	 DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), child_owned_channels, 0))
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc) */
+
 /*
  * The enabled Bluetooth controller subsystem is responsible for providing
  * definitions of the BT_CTLR_USED_* symbols used below in a file named
@@ -40,32 +53,40 @@
  */
 #if defined(CONFIG_BT_LL_SW_SPLIT)
 #include <bt_ctlr_used_resources.h>
-#if defined(DPPI_PRESENT)
-#if defined(NRF53_SERIES)
+#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_COMPATIBLE_NRF52X)
+#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
+#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
 #define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
 #define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
-#elif defined(NRF54L_SERIES)
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
 #define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
 #define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
 #endif
-#else /* defined(DPPI_PRESENT) */
-#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
-#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
-#endif /* defined(DPPI_PRESENT) */
 #endif /* defined(CONFIG_BT_LL_SW_SPLIT) */
 
 #if defined(CONFIG_BT_LL_SOFTDEVICE)
+/* Define auxiliary symbols needed for SDC device dispatch. */
+#if defined(CONFIG_SOC_COMPATIBLE_NRF52X)
+#define NRF52_SERIES
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
+#define NRF53_SERIES
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
+#define NRF54L_SERIES
+#elif defined(CONFIG_SOC_SERIES_NRF54HX)
+#define NRF54H_SERIES
+#endif
 #include <sdc_soc.h>
-#if defined(NRF52_SERIES)
+#if defined(CONFIG_SOC_COMPATIBLE_NRF52X)
 #define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR SDC_PPI_CHANNELS_USED_MASK
-#elif defined(NRF53_SERIES)
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
 #define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR SDC_DPPI_CHANNELS_USED_MASK
-#elif defined(NRF54L_SERIES)
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
 #define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC10_CHANNELS_USED_MASK
 #define NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC00_CHANNELS_USED_MASK
 #define NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR                                                   \
 	(SDC_PPIB00_CHANNELS_USED_MASK | SDC_PPIB10_CHANNELS_USED_MASK)
-#elif defined(NRF54H_SERIES)
+#elif defined(CONFIG_SOC_SERIES_NRF54HX)
 #define NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC020_CHANNELS_USED_MASK
 #define NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC030_CHANNELS_USED_MASK
 #define NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR                                                 \
@@ -76,19 +97,19 @@
 #endif /* defined(CONFIG_BT_LL_SOFTDEVICE) */
 
 #if defined(CONFIG_NRF_802154_RADIO_DRIVER)
-#if defined(NRF52_SERIES)
+#if defined(CONFIG_SOC_COMPATIBLE_NRF52X)
 #include <../src/nrf_802154_peripherals_nrf52.h>
 #define NRFX_PPI_CHANNELS_USED_BY_802154_DRV NRF_802154_PPI_CHANNELS_USED_MASK
 #define NRFX_PPI_GROUPS_USED_BY_802154_DRV   NRF_802154_PPI_GROUPS_USED_MASK
-#elif defined(NRF53_SERIES)
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
 #include <../src/nrf_802154_peripherals_nrf53.h>
 #define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
 #define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
-#elif defined(NRF54L_SERIES)
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
 #include <../src/nrf_802154_peripherals_nrf54l.h>
 #define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
 #define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
-#elif defined(NRF54H_SERIES)
+#elif defined(CONFIG_SOC_SERIES_NRF54HX)
 #include <../src/nrf_802154_peripherals_nrf54h.h>
 #define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
 #define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
@@ -99,16 +120,16 @@
 
 #if defined(CONFIG_MPSL)
 #include <mpsl.h>
-#if defined(NRF52_SERIES)
+#if defined(CONFIG_SOC_COMPATIBLE_NRF52X)
 #define NRFX_PPI_CHANNELS_USED_BY_MPSL MPSL_PPI_CHANNELS_USED_MASK
-#elif defined(NRF53_SERIES)
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
 #define NRFX_DPPI0_CHANNELS_USED_BY_MPSL MPSL_DPPIC_CHANNELS_USED_MASK
-#elif defined(NRF54L_SERIES)
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
 #define NRFX_DPPI10_CHANNELS_USED_BY_MPSL MPSL_DPPIC10_CHANNELS_USED_MASK
 #define NRFX_DPPI20_CHANNELS_USED_BY_MPSL MPSL_DPPIC20_CHANNELS_USED_MASK
 #define NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL                                                      \
 	(MPSL_PPIB11_CHANNELS_USED_MASK | MPSL_PPIB21_CHANNELS_USED_MASK)
-#elif defined(NRF54H_SERIES)
+#elif defined(CONFIG_SOC_SERIES_NRF54HX)
 #define NRFX_DPPI020_CHANNELS_USED_BY_MPSL MPSL_DPPIC020_CHANNELS_USED_MASK
 #else
 #error Unsupported chip family

From 3ed21eddc173cbb64033efe5f92f95154df89fb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 16 Jan 2025 12:22:17 +0100
Subject: [PATCH 2444/2913] [nrf fromtree] modules: hal_nordic: nrfx: Move some
 defines back to CMakeLists
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

534916c2253 moved some defines from CMakeLists.txt to nrfx_kconfig.h
but those defines are used by MDK which does not include nrfx_kconfig.h
and that broke some nrf platforms (e.g. nrf54l20). Moving those
defines back to CMakeLists.txt.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 738549ed2778f0d24ad031bef7d629ffb4174d77)
---
 modules/hal_nordic/nrfx/CMakeLists.txt | 10 ++++++++++
 modules/hal_nordic/nrfx/nrfx_kconfig.h | 20 --------------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 21f8b64c16f..0954f111618 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -188,6 +188,16 @@ if(CONFIG_SOC_NRF54L_CPUAPP_COMMON)
 	zephyr_compile_definitions("NRF_CONFIG_CPU_FREQ_MHZ=${clock_frequency_mhz}")
 endif()
 
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG NRF_SKIP_CLOCK_CONFIGURATION)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_DISABLE_FICR_TRIMCNF NRF_DISABLE_FICR_TRIMCNF)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE NRF_SKIP_GLITCHDETECTOR_DISABLE)
+
+# Inject code to skip TAMPC setup for nRF54L20 and nRF54L09. It is not supported for now.
+# It needs to be removed when support is provided.
+if(CONFIG_SOC_NRF54L20_ENGA_CPUAPP OR CONFIG_SOC_NRF54L09_ENGA_CPUAPP)
+	  zephyr_compile_definitions(NRF_SKIP_TAMPC_SETUP)
+endif()
+
 if(CONFIG_SOC_COMPATIBLE_NRF54LX AND CONFIG_NRFX_GPPI)
   zephyr_library_sources(${HELPERS_DIR}/nrfx_gppi_dppi_ppib_lumos.c)
   zephyr_library_sources(${NRFX_DIR}/soc/interconnect/dppic_ppib/nrfx_interconnect_dppic_ppib.c)
diff --git a/modules/hal_nordic/nrfx/nrfx_kconfig.h b/modules/hal_nordic/nrfx/nrfx_kconfig.h
index c93a8231e1d..1eb51f99724 100644
--- a/modules/hal_nordic/nrfx/nrfx_kconfig.h
+++ b/modules/hal_nordic/nrfx/nrfx_kconfig.h
@@ -964,26 +964,6 @@
 	CONFIG_NRF52_ANOMALY_109_WORKAROUND_EGU_INSTANCE
 #endif
 
-#ifdef CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG
-#define NRF_SKIP_CLOCK_CONFIGURATION
-#endif
-
-#ifdef CONFIG_SOC_NRF54LX_DISABLE_FICR_TRIMCNF
-#define NRF_DISABLE_FICR_TRIMCNF
-#endif
-
-#ifdef CONFIG_SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE
-#define NRF_SKIP_GLITCHDETECTOR_DISABLE
-#endif
-
-/*
- * Inject code to skip TAMPC setup for nRF54L20 and nRF54L09. It is not supported for now.
- * It needs to be removed when support is provided.
- */
-#if defined(CONFIG_SOC_NRF54L20_ENGA_CPUAPP) || defined(CONFIG_SOC_NRF54L09_ENGA_CPUAPP)
-#define NRF_SKIP_TAMPC_SETUP
-#endif
-
 #if	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_global) || \
 	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_local)
 #ifndef NRFX_DPPI_ENABLED

From 16dc0c6c01401abcb069ec35139f490c2b13d907 Mon Sep 17 00:00:00 2001
From: Raffael Rostagno <raffael.rostagno@espressif.com>
Date: Wed, 8 Jan 2025 11:20:22 -0300
Subject: [PATCH 2445/2913] [nrf fromtree] tests: drivers: pwm: Update gpio
 config

Update gpio config for more correct handling.

Signed-off-by: Raffael Rostagno <raffael.rostagno@espressif.com>
(cherry picked from commit 931c671cc2e87670b4e49fa44807664721990426)
---
 .../drivers/pwm/pwm_gpio_loopback/src/main.c  | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/tests/drivers/pwm/pwm_gpio_loopback/src/main.c b/tests/drivers/pwm/pwm_gpio_loopback/src/main.c
index 16c2357f9b9..12218990634 100644
--- a/tests/drivers/pwm/pwm_gpio_loopback/src/main.c
+++ b/tests/drivers/pwm/pwm_gpio_loopback/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -97,22 +97,19 @@ static void setup_edge_detect(void)
 
 static void config_gpio(const struct gpio_dt_spec *gpio_dt)
 {
-	/* Configure GPIO pin for edge detection */
 	gpio_pin_configure_dt(gpio_dt, GPIO_INPUT);
-
-	gpio_cb.pin_mask = BIT(gpio_dt->pin);
-
-	gpio_init_callback(&gpio_cb, gpio_edge_isr, gpio_cb.pin_mask);
+	gpio_init_callback(&gpio_cb, gpio_edge_isr, BIT(gpio_dt->pin));
 	gpio_add_callback(gpio_dt->port, &gpio_cb);
-	gpio_pin_interrupt_configure(gpio_dt->port, gpio_dt->pin, GPIO_INT_EDGE_BOTH);
 }
 
-static void unconfig_gpio(const struct gpio_dt_spec *gpio_dt)
+static void enable_int_gpio(const struct gpio_dt_spec *gpio_dt, bool enable)
 {
-	/* Disable interrupt for already tested channel */
-	gpio_pin_interrupt_configure(gpio_dt->port, gpio_dt->pin, GPIO_INT_DISABLE);
-
-	gpio_cb.pin_mask &= ~BIT(gpio_dt->pin);
+	if (enable) {
+		gpio_pin_interrupt_configure(gpio_dt->port, gpio_dt->pin, GPIO_INT_EDGE_BOTH);
+		gpio_cb.pin_mask = BIT(gpio_dt->pin);
+	} else {
+		gpio_pin_interrupt_configure(gpio_dt->port, gpio_dt->pin, GPIO_INT_DISABLE);
+	}
 }
 
 static bool check_range(float refval, float measval)
@@ -207,11 +204,11 @@ static void test_run(const struct pwm_dt_spec *pwm_dt, const struct gpio_dt_spec
 		zassert_false(result, "Failed on pwm_set() call");
 	}
 
-	config_gpio(gpio_dt);
+	enable_int_gpio(gpio_dt, true);
 
 	result = check_timing(pwm_dt, gpio_dt, duty);
 
-	unconfig_gpio(gpio_dt);
+	enable_int_gpio(gpio_dt, false);
 
 	zassert_equal(result, TC_PASS, "Test case failed");
 }
@@ -220,7 +217,6 @@ ZTEST(pwm_gpio_loopback, test_pwm)
 {
 	for (int i = 0; i < TEST_PWM_COUNT; i++) {
 		zassert_true(device_is_ready(pwms_dt[i].dev), "PWM device is not ready");
-		zassert_true(device_is_ready(gpios_dt[i].port), "GPIO device is not ready");
 
 		/* Test case: [Duty: 25%] */
 		test_run(&pwms_dt[i], &gpios_dt[i], 25, true);
@@ -251,4 +247,18 @@ ZTEST(pwm_gpio_loopback, test_pwm_cross)
 	}
 }
 
-ZTEST_SUITE(pwm_gpio_loopback, NULL, NULL, NULL, NULL, NULL);
+static void *pwm_gpio_loopback_setup(void)
+{
+	for (int i = 0; i < TEST_GPIO_COUNT; i++) {
+		if (device_is_ready(gpios_dt[i].port)) {
+			/* Configure GPIO pin for edge detection */
+			config_gpio(&gpios_dt[i]);
+		} else {
+			TC_PRINT("GPIO device %s is not ready", gpios_dt[i].port->name);
+		}
+	}
+
+	return NULL;
+}
+
+ZTEST_SUITE(pwm_gpio_loopback, NULL, pwm_gpio_loopback_setup, NULL, NULL, NULL);

From b91aa4fec5484f6cd076c9333bb474a7f5c002c1 Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Mon, 17 Feb 2025 14:54:56 +0100
Subject: [PATCH 2446/2913] [nrf noup] soc: nrf54l: Non-XIP KMU reserved memory
 fix

nrf-squash! [nrf noup] soc: nrf54l: Add custom section for KMU

The linker script inclusion which places the KMU reserved
buffer on the top of RAM doesn't work for non-XIP builds.
The Zephyr linker script will firstly load the code for
an non-XIP build in RAM and then include this KMU related
linker script which results in an unpredictable placement
of the KMU reserved area and a failed build.

In order to support non-XIP builds the linker file is not
included and the a DTS reserved-memory entry should be used.

To limit the scope, the DTS reserved memory region
is currently only supported for non-XIP builds.

This is a noup since the KMU is not supported upstream.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 soc/nordic/nrf54l/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soc/nordic/nrf54l/CMakeLists.txt b/soc/nordic/nrf54l/CMakeLists.txt
index c8badc8d61d..d986fe9c20d 100644
--- a/soc/nordic/nrf54l/CMakeLists.txt
+++ b/soc/nordic/nrf54l/CMakeLists.txt
@@ -10,7 +10,7 @@ zephyr_include_directories(.)
 # We need a buffer in memory in a static location which can be used by
 # the KMU peripheral. The KMU has a static destination address, we chose
 # this address to be 0x20000000, which is the first address in the SRAM.
-if(NOT CONFIG_BUILD_WITH_TFM AND CONFIG_PSA_NEED_CRACEN_KMU_DRIVER)
+if(NOT CONFIG_BUILD_WITH_TFM AND CONFIG_PSA_NEED_CRACEN_KMU_DRIVER AND CONFIG_XIP)
 # Exclamation mark is printable character with the lowest number in ASCII table.
 # We are sure that this file will be included first.
 zephyr_linker_sources(RAM_SECTIONS SORT_KEY ! kmu_push_area_section.ld)

From cd78af582fee0167a0d0038b6197e86dba90272f Mon Sep 17 00:00:00 2001
From: Frode van der Meeren <frode.vandermeeren@nordicsemi.no>
Date: Fri, 24 Jan 2025 17:08:21 +0100
Subject: [PATCH 2447/2913] [nrf fromtree] tests: bluetooth: tester: Add PBP
 support

Implements the PBP commands of the BTP specs, in order to support
testing the PBP through autopts. This PR is in conjunction with the
following PR in AutoPTS: https://github.com/auto-pts/auto-pts/pull/1356

Signed-off-by: Frode van der Meeren <frode.vandermeeren@nordicsemi.no>
(cherry picked from commit 913012ab81aea056b87f052764b8a4cba36c4280)
Signed-off-by: Alexander Svensen <alexander.svensen@nordicsemi.no>
---
 tests/bluetooth/tester/overlay-le-audio.conf  |   3 +
 .../bluetooth/tester/src/audio/CMakeLists.txt |   4 +
 .../bluetooth/tester/src/audio/btp/btp_pbp.h  |  46 +++
 tests/bluetooth/tester/src/audio/btp_cap.c    |  53 ++--
 tests/bluetooth/tester/src/audio/btp_pbp.c    | 287 ++++++++++++++++++
 tests/bluetooth/tester/src/btp/btp.h          |   4 +-
 tests/bluetooth/tester/src/btp/bttester.h     |   3 +
 tests/bluetooth/tester/src/btp_core.c         |  13 +
 8 files changed, 384 insertions(+), 29 deletions(-)
 create mode 100644 tests/bluetooth/tester/src/audio/btp/btp_pbp.h
 create mode 100644 tests/bluetooth/tester/src/audio/btp_pbp.c

diff --git a/tests/bluetooth/tester/overlay-le-audio.conf b/tests/bluetooth/tester/overlay-le-audio.conf
index e6ada545978..e22151c9c57 100644
--- a/tests/bluetooth/tester/overlay-le-audio.conf
+++ b/tests/bluetooth/tester/overlay-le-audio.conf
@@ -166,3 +166,6 @@ CONFIG_BT_TBS_SUPPORTED_FEATURES=3
 
 # TMAP
 CONFIG_BT_TMAP=y
+
+# PBP
+CONFIG_BT_PBP=y
diff --git a/tests/bluetooth/tester/src/audio/CMakeLists.txt b/tests/bluetooth/tester/src/audio/CMakeLists.txt
index 072819eeca4..d6f2833d3da 100644
--- a/tests/bluetooth/tester/src/audio/CMakeLists.txt
+++ b/tests/bluetooth/tester/src/audio/CMakeLists.txt
@@ -67,3 +67,7 @@ endif()
 if(CONFIG_BT_TMAP)
     target_sources(app PRIVATE btp_tmap.c)
 endif()
+
+if(CONFIG_BT_PBP)
+    target_sources(app PRIVATE btp_pbp.c)
+endif()
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_pbp.h b/tests/bluetooth/tester/src/audio/btp/btp_pbp.h
new file mode 100644
index 00000000000..614d25e8296
--- /dev/null
+++ b/tests/bluetooth/tester/src/audio/btp/btp_pbp.h
@@ -0,0 +1,46 @@
+/* btp_pbp.c - Bluetooth PBP Tester */
+
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* This is main.h */
+
+#define BTP_PBP_READ_SUPPORTED_COMMANDS	0x01
+struct btp_pbp_read_supported_commands_rp {
+	uint8_t data[0];
+} __packed;
+
+#define BTP_PBP_SET_PUBLIC_BROADCAST_ANNOUNCEMENT 0x02
+struct btp_pbp_set_public_broadcast_announcement_cmd {
+	uint8_t features;
+	uint8_t metadata_len;
+	uint8_t metadata[];
+} __packed;
+
+#define BTP_PBP_SET_BROADCAST_NAME 0x03
+struct btp_pbp_set_broadcast_name_cmd {
+	uint8_t name_len;
+	uint8_t name[];
+} __packed;
+
+#define BTP_PBP_BROADCAST_SCAN_START 0x04
+struct btp_pbp_broadcast_scan_start_cmd {
+} __packed;
+
+#define BTP_PBP_BROADCAST_SCAN_STOP 0x05
+struct btp_pbp_broadcast_scan_stop_cmd {
+} __packed;
+
+#define BTP_PBP_EV_PUBLIC_BROADCAST_ANOUNCEMENT_FOUND 0x80
+struct btp_pbp_ev_public_broadcast_anouncement_found_rp {
+	bt_addr_le_t address;
+	uint8_t broadcast_id[BT_AUDIO_BROADCAST_ID_SIZE];
+	uint8_t advertiser_sid;
+	uint16_t padv_interval;
+	uint8_t pba_features;
+	uint8_t broadcast_name_len;
+	uint8_t broadcast_name[];
+} __packed;
diff --git a/tests/bluetooth/tester/src/audio/btp_cap.c b/tests/bluetooth/tester/src/audio/btp_cap.c
index 6563a761e7e..e0356aae097 100644
--- a/tests/bluetooth/tester/src/audio/btp_cap.c
+++ b/tests/bluetooth/tester/src/audio/btp_cap.c
@@ -533,40 +533,37 @@ static int cap_broadcast_source_adv_setup(struct btp_bap_broadcast_local_source
 					  uint32_t *gap_settings)
 {
 	int err;
-	struct bt_le_adv_param param = *BT_LE_EXT_ADV_NCONN;
-	uint32_t broadcast_id;
 
-	NET_BUF_SIMPLE_DEFINE(ad_buf, BT_UUID_SIZE_16 + BT_AUDIO_BROADCAST_ID_SIZE);
 	NET_BUF_SIMPLE_DEFINE(base_buf, 128);
 
 	/* Broadcast Audio Streaming Endpoint advertising data */
-	struct bt_data base_ad[2];
 	struct bt_data per_ad;
 
-	err = bt_rand(&broadcast_id, BT_AUDIO_BROADCAST_ID_SIZE);
-	if (err) {
-		printk("Unable to generate broadcast ID: %d\n", err);
-
-		return -EINVAL;
-	}
-
-	*gap_settings = BIT(BTP_GAP_SETTINGS_DISCOVERABLE) |
-			BIT(BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
-	/* Setup extended advertising data */
-	net_buf_simple_add_le16(&ad_buf, BT_UUID_BROADCAST_AUDIO_VAL);
-	net_buf_simple_add_le24(&ad_buf, source->broadcast_id);
-	base_ad[0].type = BT_DATA_SVC_DATA16;
-	base_ad[0].data_len = ad_buf.len;
-	base_ad[0].data = ad_buf.data;
-	base_ad[1].type = BT_DATA_NAME_COMPLETE;
-	base_ad[1].data_len = sizeof(CONFIG_BT_DEVICE_NAME) - 1;
-	base_ad[1].data = CONFIG_BT_DEVICE_NAME;
-	err = tester_gap_create_adv_instance(&param, BTP_GAP_ADDR_TYPE_IDENTITY, base_ad, 2, NULL,
-					     0, gap_settings);
-	if (err != 0) {
-		LOG_DBG("Failed to create extended advertising instance: %d", err);
-
-		return -EINVAL;
+	/* A more specialized adv instance may already have been created by another btp module */
+	if (tester_gap_ext_adv_get() == NULL) {
+		struct bt_le_adv_param param = *BT_LE_EXT_ADV_NCONN;
+		struct bt_data base_ad[2];
+
+		NET_BUF_SIMPLE_DEFINE(ad_buf, BT_UUID_SIZE_16 + BT_AUDIO_BROADCAST_ID_SIZE);
+		*gap_settings = BIT(BTP_GAP_SETTINGS_DISCOVERABLE) |
+				BIT(BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
+		/* Setup extended advertising data */
+		net_buf_simple_add_le16(&ad_buf, BT_UUID_BROADCAST_AUDIO_VAL);
+		net_buf_simple_add_le24(&ad_buf, source->broadcast_id);
+		base_ad[0].type = BT_DATA_SVC_DATA16;
+		base_ad[0].data_len = ad_buf.len;
+		base_ad[0].data = ad_buf.data;
+		base_ad[1].type = BT_DATA_NAME_COMPLETE;
+		base_ad[1].data_len = sizeof(CONFIG_BT_DEVICE_NAME) - 1;
+		base_ad[1].data = CONFIG_BT_DEVICE_NAME;
+
+		err = tester_gap_create_adv_instance(&param, BTP_GAP_ADDR_TYPE_IDENTITY, base_ad,
+						     2, NULL, 0, gap_settings);
+		if (err != 0) {
+			LOG_DBG("Failed to create extended advertising instance: %d", err);
+
+			return -EINVAL;
+		}
 	}
 
 	err = tester_gap_padv_configure(BT_LE_PER_ADV_PARAM(BT_GAP_PER_ADV_FAST_INT_MIN_2,
diff --git a/tests/bluetooth/tester/src/audio/btp_pbp.c b/tests/bluetooth/tester/src/audio/btp_pbp.c
new file mode 100644
index 00000000000..d3acfcbd807
--- /dev/null
+++ b/tests/bluetooth/tester/src/audio/btp_pbp.c
@@ -0,0 +1,287 @@
+/* btp_pbp.c - Bluetooth PBP Tester */
+
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "btp/btp.h"
+
+#include <zephyr/bluetooth/audio/bap.h>
+#include <zephyr/bluetooth/audio/pbp.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/util.h>
+#define LOG_MODULE_NAME bttester_pbp
+LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
+
+#define PBP_EXT_ADV_METADATA_LEN_MAX 128
+
+static uint8_t pbp_features_cached;
+static uint8_t pbp_metadata_cached[PBP_EXT_ADV_METADATA_LEN_MAX];
+static uint8_t pbp_metadata_cached_len;
+static uint8_t pbp_broadcast_name_cached[BT_AUDIO_BROADCAST_NAME_LEN_MAX];
+static uint8_t pbp_name_cached_len;
+
+static bool scan_get_broadcast_name_len(struct bt_data *data, void *user_data)
+{
+	uint8_t *broadcast_name_len = user_data;
+
+	switch (data->type) {
+	case BT_DATA_BROADCAST_NAME:
+		*broadcast_name_len = data->data_len;
+		return false;
+	default:
+		return true;
+	}
+}
+
+static bool scan_get_data(struct bt_data *data, void *user_data)
+{
+	enum bt_pbp_announcement_feature source_features;
+	uint32_t broadcast_id;
+	uint8_t *metadata;
+	struct bt_uuid_16 adv_uuid;
+	struct btp_pbp_ev_public_broadcast_anouncement_found_rp *ev = user_data;
+
+	switch (data->type) {
+	case BT_DATA_BROADCAST_NAME:
+		ev->broadcast_name_len = data->data_len;
+		memcpy(ev->broadcast_name, data->data, data->data_len);
+		return true;
+	case BT_DATA_SVC_DATA16:
+		if (!bt_uuid_create(&adv_uuid.uuid, data->data, BT_UUID_SIZE_16)) {
+			return true;
+		}
+		if (!bt_uuid_cmp(&adv_uuid.uuid, BT_UUID_BROADCAST_AUDIO)) {
+			broadcast_id = sys_get_le24(data->data + BT_UUID_SIZE_16);
+			sys_put_le24(broadcast_id, ev->broadcast_id);
+			return true;
+		}
+
+		int ret = bt_pbp_parse_announcement(data, &source_features, &metadata);
+
+		if (ret >= 0) {
+			ev->pba_features = source_features;
+			return true;
+		}
+
+		return true;
+	default:
+		return true;
+	}
+}
+
+static void pbp_scan_recv(const struct bt_le_scan_recv_info *info, struct net_buf_simple *ad)
+{
+	if ((info->adv_props & BT_GAP_ADV_PROP_CONNECTABLE) ||
+	    !(info->adv_props & BT_GAP_ADV_PROP_EXT_ADV) || info->interval == 0) {
+		return;
+	}
+
+	uint8_t broadcast_name_len = 0;
+	struct net_buf_simple ad_copy;
+
+	/* Initial parse to determine broadcast_name_len before allocating memory */
+	net_buf_simple_clone(ad, &ad_copy);
+	bt_data_parse(&ad_copy, scan_get_broadcast_name_len, &broadcast_name_len);
+
+	struct btp_pbp_ev_public_broadcast_anouncement_found_rp *ev_ptr;
+
+	tester_rsp_buffer_lock();
+	tester_rsp_buffer_allocate(sizeof(*ev_ptr) + broadcast_name_len, (uint8_t **)&ev_ptr);
+
+	sys_put_le24(BT_BAP_INVALID_BROADCAST_ID, ev_ptr->broadcast_id);
+	ev_ptr->pba_features = 0U;
+	ev_ptr->broadcast_name_len = 0U;
+
+	bt_addr_le_copy(&ev_ptr->address, info->addr);
+	ev_ptr->advertiser_sid = info->sid;
+	ev_ptr->padv_interval = info->interval;
+	bt_data_parse(ad, scan_get_data, ev_ptr);
+
+	if (sys_get_le24(ev_ptr->broadcast_id) != BT_BAP_INVALID_BROADCAST_ID &&
+	    ev_ptr->pba_features != 0U && ev_ptr->broadcast_name_len > 0) {
+		tester_event(BTP_SERVICE_ID_PBP, BTP_PBP_EV_PUBLIC_BROADCAST_ANOUNCEMENT_FOUND,
+			     ev_ptr, sizeof(*ev_ptr) + broadcast_name_len);
+	}
+
+	tester_rsp_buffer_free();
+	tester_rsp_buffer_unlock();
+}
+
+static struct bt_le_scan_cb pbp_scan_cb = {
+	.recv = pbp_scan_recv,
+};
+
+static uint8_t pbp_read_supported_commands(const void *cmd, uint16_t cmd_len, void *rsp,
+					   uint16_t *rsp_len)
+{
+	struct btp_pbp_read_supported_commands_rp *rp = rsp;
+
+	tester_set_bit(rp->data, BTP_PBP_READ_SUPPORTED_COMMANDS);
+	tester_set_bit(rp->data, BTP_PBP_SET_PUBLIC_BROADCAST_ANNOUNCEMENT);
+	tester_set_bit(rp->data, BTP_PBP_SET_BROADCAST_NAME);
+	tester_set_bit(rp->data, BTP_PBP_BROADCAST_SCAN_START);
+	tester_set_bit(rp->data, BTP_PBP_BROADCAST_SCAN_STOP);
+
+	*rsp_len = sizeof(*rp) + 1;
+
+	return BTP_STATUS_SUCCESS;
+}
+
+static int pbp_broadcast_source_adv_setup(void)
+{
+	struct bt_le_adv_param param =
+		BT_LE_ADV_PARAM_INIT(0, BT_GAP_ADV_FAST_INT_MIN_2, BT_GAP_ADV_FAST_INT_MAX_2, NULL);
+	uint32_t gap_settings = BIT(BTP_GAP_SETTINGS_DISCOVERABLE) |
+				BIT(BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
+	uint32_t broadcast_id;
+
+	NET_BUF_SIMPLE_DEFINE(ad_buf, BT_UUID_SIZE_16 + BT_AUDIO_BROADCAST_ID_SIZE);
+	NET_BUF_SIMPLE_DEFINE(pba_buf, BT_PBP_MIN_PBA_SIZE + pbp_metadata_cached_len);
+
+	int err = bt_rand(&broadcast_id, BT_AUDIO_BROADCAST_ID_SIZE);
+	struct bt_data ext_ad[3];
+
+	if (err) {
+		LOG_ERR("Unable to generate broadcast ID: %d\n", err);
+		return -EINVAL;
+	}
+
+	ext_ad[0].type = BT_DATA_BROADCAST_NAME;
+	ext_ad[0].data_len = pbp_name_cached_len;
+	ext_ad[0].data = pbp_broadcast_name_cached;
+	net_buf_simple_add_le16(&ad_buf, BT_UUID_BROADCAST_AUDIO_VAL);
+	net_buf_simple_add_le24(&ad_buf, broadcast_id);
+	ext_ad[1].type = BT_DATA_SVC_DATA16;
+	ext_ad[1].data_len = ad_buf.len;
+	ext_ad[1].data = ad_buf.data;
+	net_buf_simple_add_le16(&pba_buf, BT_UUID_PBA_VAL);
+	net_buf_simple_add_u8(&pba_buf, pbp_features_cached);
+	net_buf_simple_add_u8(&pba_buf, pbp_metadata_cached_len);
+	net_buf_simple_add_mem(&pba_buf, pbp_metadata_cached, pbp_metadata_cached_len);
+	ext_ad[2].type = BT_DATA_SVC_DATA16;
+	ext_ad[2].data_len = pba_buf.len;
+	ext_ad[2].data = pba_buf.data;
+
+	err = tester_gap_create_adv_instance(&param, BTP_GAP_ADDR_TYPE_IDENTITY, ext_ad,
+					     ARRAY_SIZE(ext_ad), NULL, 0, &gap_settings);
+	if (err) {
+		LOG_ERR("Could not set up extended advertisement: %d", err);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static uint8_t pbp_set_public_broadcast_announcement(const void *cmd, uint16_t cmd_len,
+						     void *rsp, uint16_t *rsp_len)
+{
+	const struct btp_pbp_set_public_broadcast_announcement_cmd *cp = cmd;
+	int err = -EINVAL;
+
+	if (cp->metadata_len <= PBP_EXT_ADV_METADATA_LEN_MAX) {
+		pbp_features_cached = cp->features;
+		pbp_metadata_cached_len = cp->metadata_len;
+		memcpy(pbp_metadata_cached, cp->metadata, cp->metadata_len);
+		err = pbp_broadcast_source_adv_setup();
+	} else {
+		LOG_ERR("Metadata too long: %d > %d", cp->metadata_len,
+			PBP_EXT_ADV_METADATA_LEN_MAX);
+	}
+
+	return BTP_STATUS_VAL(err);
+}
+
+static uint8_t pbp_set_broadcast_name(const void *cmd, uint16_t cmd_len, void *rsp,
+				      uint16_t *rsp_len)
+{
+	const struct btp_pbp_set_broadcast_name_cmd *cp = cmd;
+	int err = -EINVAL;
+
+	if (cp->name_len <= BT_AUDIO_BROADCAST_NAME_LEN_MAX) {
+		pbp_name_cached_len = cp->name_len;
+		memcpy(pbp_broadcast_name_cached, cp->name, cp->name_len);
+		err = pbp_broadcast_source_adv_setup();
+	} else {
+		LOG_ERR("Broadcast name too long: %d > %d", cp->name_len,
+			BT_AUDIO_BROADCAST_NAME_LEN_MAX);
+	}
+
+	return BTP_STATUS_VAL(err);
+}
+
+static uint8_t pbp_broadcast_scan_start(const void *cmd, uint16_t cmd_len, void *rsp,
+					uint16_t *rsp_len)
+{
+	int err;
+
+	err = bt_le_scan_start(BT_LE_SCAN_ACTIVE, NULL);
+	if (err != 0 && err != -EALREADY) {
+		LOG_DBG("Unable to start scan for broadcast sources: %d", err);
+
+		return BTP_STATUS_FAILED;
+	}
+
+	return BTP_STATUS_SUCCESS;
+}
+
+static uint8_t pbp_broadcast_scan_stop(const void *cmd, uint16_t cmd_len, void *rsp,
+				       uint16_t *rsp_len)
+{
+	int err;
+
+	err = bt_le_scan_stop();
+	if (err != 0) {
+		LOG_DBG("Failed to stop scan, %d", err);
+
+		return BTP_STATUS_FAILED;
+	}
+
+	return BTP_STATUS_SUCCESS;
+}
+
+static const struct btp_handler pbp_handlers[] = {
+	{
+		.opcode = BTP_PBP_READ_SUPPORTED_COMMANDS,
+		.index = BTP_INDEX_NONE,
+		.expect_len = 0,
+		.func = pbp_read_supported_commands
+	},
+	{
+		.opcode = BTP_PBP_SET_PUBLIC_BROADCAST_ANNOUNCEMENT,
+		.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
+		.func = pbp_set_public_broadcast_announcement
+	},
+	{
+		.opcode = BTP_PBP_SET_BROADCAST_NAME,
+		.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
+		.func = pbp_set_broadcast_name
+	},
+	{
+		.opcode = BTP_PBP_BROADCAST_SCAN_START,
+		.expect_len = sizeof(struct btp_pbp_broadcast_scan_start_cmd),
+		.func = pbp_broadcast_scan_start
+	},
+	{
+		.opcode = BTP_PBP_BROADCAST_SCAN_STOP,
+		.expect_len = sizeof(struct btp_pbp_broadcast_scan_stop_cmd),
+		.func = pbp_broadcast_scan_stop
+	}
+};
+
+uint8_t tester_init_pbp(void)
+{
+	tester_register_command_handlers(BTP_SERVICE_ID_PBP, pbp_handlers,
+					 ARRAY_SIZE(pbp_handlers));
+
+	bt_le_scan_cb_register(&pbp_scan_cb);
+
+	return BTP_STATUS_SUCCESS;
+}
+
+uint8_t tester_unregister_pbp(void)
+{
+	return BTP_STATUS_SUCCESS;
+}
diff --git a/tests/bluetooth/tester/src/btp/btp.h b/tests/bluetooth/tester/src/btp/btp.h
index c74d7bec452..06dc0788398 100644
--- a/tests/bluetooth/tester/src/btp/btp.h
+++ b/tests/bluetooth/tester/src/btp/btp.h
@@ -38,6 +38,7 @@
 #include "btp_tbs.h"
 #include "btp_tmap.h"
 #include "btp_ots.h"
+#include "btp_pbp.h"
 
 #define BTP_MTU 1024
 #define BTP_DATA_MAX_SIZE (BTP_MTU - sizeof(struct btp_hdr))
@@ -75,8 +76,9 @@
 #define BTP_SERVICE_ID_TBS      0x1b
 #define BTP_SERVICE_ID_TMAP     0x1c
 #define BTP_SERVICE_ID_OTS      0x1d
+#define BTP_SERVICE_ID_PBP      0x1e
 
-#define BTP_SERVICE_ID_MAX	BTP_SERVICE_ID_OTS
+#define BTP_SERVICE_ID_MAX	BTP_SERVICE_ID_PBP
 
 #define BTP_STATUS_SUCCESS	0x00
 #define BTP_STATUS_FAILED	0x01
diff --git a/tests/bluetooth/tester/src/btp/bttester.h b/tests/bluetooth/tester/src/btp/bttester.h
index d7ce2699310..c43725a0aaf 100644
--- a/tests/bluetooth/tester/src/btp/bttester.h
+++ b/tests/bluetooth/tester/src/btp/bttester.h
@@ -138,3 +138,6 @@ uint8_t tester_unregister_tmap(void);
 
 uint8_t tester_init_ots(void);
 uint8_t tester_unregister_ots(void);
+
+uint8_t tester_init_pbp(void);
+uint8_t tester_unregister_pbp(void);
diff --git a/tests/bluetooth/tester/src/btp_core.c b/tests/bluetooth/tester/src/btp_core.c
index 8b1b571792d..2da735f44ec 100644
--- a/tests/bluetooth/tester/src/btp_core.c
+++ b/tests/bluetooth/tester/src/btp_core.c
@@ -107,6 +107,9 @@ static uint8_t supported_services(const void *cmd, uint16_t cmd_len,
 #if defined(CONFIG_BT_TMAP)
 	tester_set_bit(rp->data, BTP_SERVICE_ID_TMAP);
 #endif /* CONFIG_BT_TMAP */
+#if defined(CONFIG_BT_PBP)
+	tester_set_bit(rp->data, BTP_SERVICE_ID_PBP);
+#endif /* CONFIG_BT_PBP */
 
 	*rsp_len = sizeof(*rp) + 2;
 
@@ -250,6 +253,11 @@ static uint8_t register_service(const void *cmd, uint16_t cmd_len,
 		status = tester_init_ots();
 		break;
 #endif /* CONFIG_BT_OTS */
+#if defined(CONFIG_BT_PBP)
+	case BTP_SERVICE_ID_PBP:
+		status = tester_init_pbp();
+		break;
+#endif /* CONFIG_BT_PBP */
 	default:
 		LOG_WRN("unknown id: 0x%02x", cp->id);
 		status = BTP_STATUS_FAILED;
@@ -397,6 +405,11 @@ static uint8_t unregister_service(const void *cmd, uint16_t cmd_len,
 		status = tester_unregister_ots();
 		break;
 #endif /* CONFIG_BT_OTS */
+#if defined(CONFIG_BT_PBP)
+	case BTP_SERVICE_ID_PBP:
+		status = tester_unregister_pbp();
+		break;
+#endif /* CONFIG_BT_PBP */
 	default:
 		LOG_WRN("unknown id: 0x%x", cp->id);
 		status = BTP_STATUS_FAILED;

From 0aa2141d605f3b39da2b541e2fe4595d58824080 Mon Sep 17 00:00:00 2001
From: Dominik Chat <dominik.chat@nordicsemi.no>
Date: Wed, 12 Feb 2025 09:44:27 +0100
Subject: [PATCH 2448/2913] [nrf fromlist] drivers: bluetooth: hci: Add retries
 for IPC interface

Add HCI IPC retry handling in case of full IPC
queue. This mechanism improves reliability.

The ipc_service_send can return -ENOMEM in case
of full queue. If this happens the retries are
executed in order to wait for queue to empty
and not drop messages.
If the retry mechanism reaches maximum then
the error code is passed back to the host.

The change should improve the handling of
passing messages to full ipc and reduce
dropping of packets.

Upstream PR #: 85649

Signed-off-by: Dominik Chat <dominik.chat@nordicsemi.no>
---
 drivers/bluetooth/hci/Kconfig | 18 ++++++++++++++++++
 drivers/bluetooth/hci/ipc.c   | 28 ++++++++++++++++++++++++++--
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/drivers/bluetooth/hci/Kconfig b/drivers/bluetooth/hci/Kconfig
index 6fa8177638e..2e96cb58372 100644
--- a/drivers/bluetooth/hci/Kconfig
+++ b/drivers/bluetooth/hci/Kconfig
@@ -40,6 +40,24 @@ config BT_HCI_IPC
 	  Bluetooth HCI driver for communication with another CPU
 	  using the IPC subsystem.
 
+config BT_HCI_IPC_SEND_RETRY_COUNT
+	int "HCI IPC send retry count"
+	depends on BT_HCI_IPC
+	default 3
+	help
+	  Number of times to retry sending a message via IPC.
+	  The retries occur in case of a failure to send a message
+	  through IPC (-ENOMEM returned by ipc_service_send).
+
+config BT_HCI_IPC_SEND_RETRY_DELAY_US
+	int "HCI IPC send retry delay (us)"
+	depends on BT_HCI_IPC
+	default 75
+	help
+	  Delay in microseconds between retries when sending a message via IPC.
+	  When a single tick (CONFIG_SYS_CLOCK_TICKS_PER_SEC) is bigger then
+	  the retry delay the k_busy_wait function is used. Set with care.
+
 config BT_SPI
 	bool
 	select SPI
diff --git a/drivers/bluetooth/hci/ipc.c b/drivers/bluetooth/hci/ipc.c
index d25f7c8af10..28b2a322f60 100644
--- a/drivers/bluetooth/hci/ipc.c
+++ b/drivers/bluetooth/hci/ipc.c
@@ -22,6 +22,14 @@ LOG_MODULE_REGISTER(bt_hci_driver);
 
 #define IPC_BOUND_TIMEOUT_IN_MS K_MSEC(1000)
 
+/* The retry of ipc_service_send function requires a small (tens of us) delay.
+ * In order to ensure proper delay k_usleep is used when the system clock is
+ * precise enough and available (CONFIG_SYS_CLOCK_TICKS_PER_SEC different than 0).
+ */
+#define USE_SLEEP_BETWEEN_IPC_RETRIES COND_CODE_0(CONFIG_SYS_CLOCK_TICKS_PER_SEC, \
+	(false), \
+	((USEC_PER_SEC / CONFIG_SYS_CLOCK_TICKS_PER_SEC) > CONFIG_BT_HCI_IPC_SEND_RETRY_DELAY_US))
+
 struct ipc_data {
 	bt_hci_recv_t recv;
 	struct ipc_ept hci_ept;
@@ -265,19 +273,35 @@ static int bt_ipc_send(const struct device *dev, struct net_buf *buf)
 		break;
 	default:
 		LOG_ERR("Unknown type %u", bt_buf_get_type(buf));
+		err = -ENOMSG;
 		goto done;
 	}
 	net_buf_push_u8(buf, pkt_indicator);
 
 	LOG_HEXDUMP_DBG(buf->data, buf->len, "Final HCI buffer:");
-	err = ipc_service_send(&data->hci_ept, buf->data, buf->len);
+
+	for (int retries = 0; retries < CONFIG_BT_HCI_IPC_SEND_RETRY_COUNT + 1; retries++) {
+		err = ipc_service_send(&data->hci_ept, buf->data, buf->len);
+		if ((err >= 0) || (err != -ENOMEM)) {
+			break;
+		}
+
+		if (USE_SLEEP_BETWEEN_IPC_RETRIES) {
+			k_usleep(CONFIG_BT_HCI_IPC_SEND_RETRY_DELAY_US);
+		} else {
+			k_busy_wait(CONFIG_BT_HCI_IPC_SEND_RETRY_DELAY_US);
+		}
+	}
+
 	if (err < 0) {
 		LOG_ERR("Failed to send (err %d)", err);
+	} else {
+		err = 0;
 	}
 
 done:
 	net_buf_unref(buf);
-	return 0;
+	return err;
 }
 
 static void hci_ept_bound(void *priv)

From 7bba252fbb6cccf85bd4dd7d5c5ff636434ad42c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 17 Feb 2025 13:06:21 +0100
Subject: [PATCH 2449/2913] Revert "[nrf noup] samples: bluetooth: update
 autoconf.h header path"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 40520509dae1ce09e277f68eadca8ee23621dd96.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 samples/bluetooth/bap_unicast_client/src/stream_tx.c        | 2 +-
 samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c   | 2 +-
 samples/bluetooth/cap_acceptor/src/main.c                   | 2 +-
 samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c | 2 +-
 samples/bluetooth/cap_initiator/src/main.c                  | 2 +-
 soc/nordic/nrf54l/soc.c                                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/samples/bluetooth/bap_unicast_client/src/stream_tx.c b/samples/bluetooth/bap_unicast_client/src/stream_tx.c
index 44c81f08749..ebdc01ab87f 100644
--- a/samples/bluetooth/bap_unicast_client/src/stream_tx.c
+++ b/samples/bluetooth/bap_unicast_client/src/stream_tx.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/autoconf.h>
+#include <autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c b/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
index b7f685d1d08..132ee499c87 100644
--- a/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
+++ b/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
@@ -7,7 +7,7 @@
  *  SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/autoconf.h>
+#include <autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_acceptor/src/main.c b/samples/bluetooth/cap_acceptor/src/main.c
index c84ab70e94a..37ba41d32ec 100644
--- a/samples/bluetooth/cap_acceptor/src/main.c
+++ b/samples/bluetooth/cap_acceptor/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/autoconf.h>
+#include <autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c b/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
index b30f34c6f99..25dba8cc16d 100644
--- a/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
+++ b/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/autoconf.h>
+#include <autoconf.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/samples/bluetooth/cap_initiator/src/main.c b/samples/bluetooth/cap_initiator/src/main.c
index 8eab76938bc..1b35ea7981f 100644
--- a/samples/bluetooth/cap_initiator/src/main.c
+++ b/samples/bluetooth/cap_initiator/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/autoconf.h>
+#include <autoconf.h>
 #include <stddef.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index eab3bf18a14..d7f3005d1f4 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -13,7 +13,7 @@
  */
 
 #ifdef __NRF_TFM__
-#include <zephyr/autoconf.h>
+#include <autoconf.h>
 #endif
 
 #include <zephyr/devicetree.h>

From a12ec546e0e413f2dfa898a4e7e6c2f28a7b46b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 17 Feb 2025 13:06:31 +0100
Subject: [PATCH 2450/2913] Revert "[nrf noup] soc: nordic: nrf54l Fix for wait
 lasting half expected time"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 482ff99a72787460dfd0d595aaf809ff3e820043.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 soc/nordic/nrf54l/soc.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index d7f3005d1f4..26248018f6b 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -48,13 +48,6 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 #define HFXO_NODE DT_NODELABEL(hfxo)
 #endif
 
-/* Building for cpuflpr with ns uses cpu_1 instead of cpu_0 */
-#if DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
-#define DEVICE_DT_CLOCK_FREQ DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
-#elif DT_PROP(DT_PATH(cpus, cpu_1), clock_frequency)
-#define DEVICE_DT_CLOCK_FREQ DT_PROP(DT_PATH(cpus, cpu_1), clock_frequency)
-#endif
-
 #if defined(NRF_APPLICATION)
 static inline void power_and_clock_configuration(void)
 {
@@ -179,18 +172,16 @@ int nordicsemi_nrf54l_init(void)
 	/* Update the SystemCoreClock global variable with current core clock
 	 * retrieved from hardware state.
 	 */
+#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(__NRF_TFM__)
+	/* Currently not supported for non-secure */
+	SystemCoreClockUpdate();
+#endif
 
 #ifdef __NRF_TFM__
 	/* TF-M enables the instruction cache from target_cfg.c, so we
 	 * don't need to enable it here.
 	 */
 #else
-
-	/* Update SystemCoreClock in Zephyr based on device tree to avoid SystemCoreClock
-	 * being overwritten with default value when initializing with TF-M
-	 */
-	SystemCoreClock = DEVICE_DT_CLOCK_FREQ;
-
 	/* Enable ICACHE */
 	sys_cache_instr_enable();
 #endif

From 938c4378539cc3a038682b51bdbc43e9641b2bc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 17 Feb 2025 13:06:40 +0100
Subject: [PATCH 2451/2913] Revert "[nrf noup] soc: nordic: nrf54l: Port Soc.c
 to be compatible with TFM"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 840fc4597d7b06e9291b74b352daf1bf6ecd0f6d.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 soc/nordic/nrf54l/soc.c | 66 +++++++++++------------------------------
 1 file changed, 17 insertions(+), 49 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index 26248018f6b..abb0f778ac3 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -12,21 +12,13 @@
  * for the Nordic Semiconductor nRF54L family processor.
  */
 
-#ifdef __NRF_TFM__
-#include <autoconf.h>
-#endif
-
 #include <zephyr/devicetree.h>
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 #include <zephyr/kernel.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
-
-#ifndef __NRF_TFM__
 #include <zephyr/cache.h>
-#endif
-
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 
 #if defined(NRF_APPLICATION)
@@ -48,9 +40,17 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 #define HFXO_NODE DT_NODELABEL(hfxo)
 #endif
 
-#if defined(NRF_APPLICATION)
-static inline void power_and_clock_configuration(void)
+static int nordicsemi_nrf54l_init(void)
 {
+	/* Update the SystemCoreClock global variable with current core clock
+	 * retrieved from hardware state.
+	 */
+	SystemCoreClockUpdate();
+
+#if defined(NRF_APPLICATION)
+	/* Enable ICACHE */
+	sys_cache_instr_enable();
+
 #if DT_ENUM_HAS_VALUE(LFXO_NODE, load_capacitors, internal)
 	uint32_t xosc32ktrim = NRF_FICR->XOSC32KTRIM;
 
@@ -77,16 +77,16 @@ static inline void power_and_clock_configuration(void)
 	 * NOTE: The desired capacitance value is used in encoded from in INTCAP calculation formula
 	 *       That is different than in case of HFXO.
 	 */
-	uint32_t cap_val_encoded =
-		(((DT_PROP(LFXO_NODE, load_capacitance_femtofarad) - 4000UL) * 2UL) / 1000UL);
+	uint32_t cap_val_encoded = (((DT_PROP(LFXO_NODE, load_capacitance_femtofarad) - 4000UL)
+				     * 2UL) / 1000UL);
 
 	/* Calculation of INTCAP code before rounding. Min that calculations here are done on
 	 * values multiplied by 2^9, e.g. 0.765625 * 2^9 = 392.
 	 * offset_k should be divided by 2^6, but to add it to value shifted by 2^9 we have to
 	 * multiply it be 2^3.
 	 */
-	uint32_t mid_val =
-		(cap_val_encoded - 4UL) * (uint32_t)(slope_k + 392UL) + (offset_k << 3UL);
+	uint32_t mid_val = (cap_val_encoded - 4UL) * (uint32_t)(slope_k + 392UL)
+			   + (offset_k << 3UL);
 
 	/* Get integer part of the INTCAP code */
 	uint32_t lfxo_intcap = mid_val >> 9UL;
@@ -132,9 +132,8 @@ static inline void power_and_clock_configuration(void)
 	 */
 	uint32_t cap_val_femto_f = DT_PROP(HFXO_NODE, load_capacitance_femtofarad);
 
-	uint32_t mid_val_intcap = (((cap_val_femto_f - 5500UL) * (uint32_t)(slope_m + 791UL)) +
-				   (offset_m << 2UL) * 1000UL) >>
-				  8UL;
+	uint32_t mid_val_intcap = (((cap_val_femto_f - 5500UL) * (uint32_t)(slope_m + 791UL))
+		 + (offset_m << 2UL) * 1000UL) >> 8UL;
 
 	/* Convert the calculated value to piko Farads */
 	uint32_t hfxo_intcap = mid_val_intcap / 1000;
@@ -164,39 +163,8 @@ static inline void power_and_clock_configuration(void)
 #endif
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);
 #endif
-}
-#endif /* NRF_APPLICATION */
 
-int nordicsemi_nrf54l_init(void)
-{
-	/* Update the SystemCoreClock global variable with current core clock
-	 * retrieved from hardware state.
-	 */
-#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(__NRF_TFM__)
-	/* Currently not supported for non-secure */
-	SystemCoreClockUpdate();
-#endif
-
-#ifdef __NRF_TFM__
-	/* TF-M enables the instruction cache from target_cfg.c, so we
-	 * don't need to enable it here.
-	 */
-#else
-	/* Enable ICACHE */
-	sys_cache_instr_enable();
-#endif
-
-	/* NRF_REGULATORS and NRF_OSCILLATORS are configured to be secure
-	 * as NRF_REGULATORS.POFCON is needed by the secure domain to
-	 * prevent glitches when the power supply is attacked.
-	 *
-	 * NRF_OSCILLATORS is also configured as secure because of a HW limitation
-	 * that requires them to be configured with the same security property.
-	 */
-#if (defined(NRF_APPLICATION) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)) ||                  \
-	defined(__NRF_TFM__)
-	power_and_clock_configuration();
-#endif
+#endif /* NRF_APPLICATION */
 
 	return 0;
 }

From 43f054e109faaec0d81bb2079783b898b3cb52b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 14 Jan 2025 10:58:58 +0100
Subject: [PATCH 2452/2913] [nrf fromtree] tests: kernel: timer: timer_api:
 Tweak test_timer_remaining
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test test_timer_remaining is comparing time captured by k_busy_wait and
k_timer_remaining_ticks. Test was accepting 1 tick difference between
those two. If system clock frequency is low (e.g. 100 Hz) 1 tick is a
long time but if system clock is high then 1 tick may not cover for
processing latency. Instead of using fixed 1 tick test is now converting
100 us to ticks (ceiling) to cover for cases where system clock is high.
100 us processing latency time is an arbitrary value.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 04e8d08e04deecccbf20557c56eff68b5d225cbc)
---
 tests/kernel/timer/timer_api/src/main.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/kernel/timer/timer_api/src/main.c b/tests/kernel/timer/timer_api/src/main.c
index b996baa72e3..899d2c92583 100644
--- a/tests/kernel/timer/timer_api/src/main.c
+++ b/tests/kernel/timer/timer_api/src/main.c
@@ -680,10 +680,20 @@ ZTEST_USER(timer_api, test_timer_remaining)
 	uint32_t dur_ticks = k_ms_to_ticks_ceil32(DURATION);
 	uint32_t target_rem_ticks = k_ms_to_ticks_ceil32(DURATION / 2);
 	uint32_t rem_ms, rem_ticks, exp_ticks;
+	uint32_t latency_ticks;
 	int32_t delta_ticks;
 	uint32_t slew_ticks;
 	uint64_t now;
 
+	/* Test is running in a user space thread so there is an additional latency
+	 * involved in executing k_busy_wait and k_timer_remaining_ticks. Due
+	 * to that latency, returned ticks won't be exact as expected even if
+	 * k_busy_wait is running using the same clock source as the system clock.
+	 * If system clock frequency is low (e.g. 100Hz) 1 tick will be enough but
+	 * for cases where clock frequency is much higher we need to accept higher
+	 * deviation (in ticks). Arbitrary value of 100 us processing overhead is used.
+	 */
+	latency_ticks = k_us_to_ticks_ceil32(100);
 
 	init_timer_data();
 	k_timer_start(&remain_timer, K_MSEC(DURATION), K_NO_WAIT);
@@ -713,7 +723,7 @@ ZTEST_USER(timer_api, test_timer_remaining)
 	 */
 	delta_ticks = (int32_t)(rem_ticks - target_rem_ticks);
 	slew_ticks = BUSY_SLEW_THRESHOLD_TICKS(DURATION * USEC_PER_MSEC / 2U);
-	zassert_true(abs(delta_ticks) <= MAX(slew_ticks, 1U),
+	zassert_true(abs(delta_ticks) <= MAX(slew_ticks, latency_ticks),
 		     "tick/busy slew %d larger than test threshold %u",
 		     delta_ticks, slew_ticks);
 

From 61c3d4787a41e6962ee34508e12b4715851cce5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 17 Jan 2025 06:01:28 +0100
Subject: [PATCH 2453/2913] [nrf fromtree] soc: nordic: nrf54l: Set
 SystemCoreClock using frequency from DT
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use cpu clock source frequency as system core clock.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit df32919a526e20fc9928a8431dc03c9443c3230a)
---
 soc/nordic/nrf54l/soc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index abb0f778ac3..5c24df49d54 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -32,6 +32,7 @@
 
 #include <nrf_erratas.h>
 #include <system_nrf54l.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 
 LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 
@@ -43,9 +44,9 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 static int nordicsemi_nrf54l_init(void)
 {
 	/* Update the SystemCoreClock global variable with current core clock
-	 * retrieved from hardware state.
+	 * retrieved from the DT.
 	 */
-	SystemCoreClockUpdate();
+	SystemCoreClock = NRF_PERIPH_GET_FREQUENCY(DT_NODELABEL(cpu));
 
 #if defined(NRF_APPLICATION)
 	/* Enable ICACHE */

From 9f0c5c9fce33231871b31dbb60a76207e829238a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 3 Jan 2025 11:51:50 +0100
Subject: [PATCH 2454/2913] [nrf fromtree] dts: common: nordic: nrf54l: Add
 clocks to cpu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add clocks property to CPUs. nRF54Lx series is using hfpll as clock
source for CPU (and fast peripherals). CPU clock frequency can be
derived from frequency of the source clock so clock-frequency property
is removed from cpu as it is redundant.

nrfx/MDK expects that NRF_CONFIG_CPU_FREQ_MHZ define is set to correct
CPU frequency. Modified nrfx CMakeLists.txt to use clock frequency of
hfpll instead of CPU clock-frequency property.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 43f442be462e95b68bebc7e56489200b01f97c81)
---
 dts/common/nordic/nrf54l09.dtsi        | 2 +-
 dts/common/nordic/nrf54l20.dtsi        | 2 +-
 dts/common/nordic/nrf54l_05_10_15.dtsi | 4 ++--
 modules/hal_nordic/nrfx/CMakeLists.txt | 5 ++++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dts/common/nordic/nrf54l09.dtsi b/dts/common/nordic/nrf54l09.dtsi
index e73a609a813..b86e4c9607e 100644
--- a/dts/common/nordic/nrf54l09.dtsi
+++ b/dts/common/nordic/nrf54l09.dtsi
@@ -27,7 +27,7 @@
 			compatible = "arm,cortex-m33f";
 			reg = <0>;
 			device_type = "cpu";
-			clock-frequency = <DT_FREQ_M(64)>;
+			clocks = <&hfpll>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			itm: itm@e0000000 {
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index a7f72bf5a30..7784342d121 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -23,7 +23,7 @@
 			compatible = "arm,cortex-m33f";
 			reg = <0>;
 			device_type = "cpu";
-			clock-frequency = <DT_FREQ_M(128)>;
+			clocks = <&hfpll>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			itm: itm@e0000000 {
diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi
index d4e0ee6df00..660b2b4769f 100644
--- a/dts/common/nordic/nrf54l_05_10_15.dtsi
+++ b/dts/common/nordic/nrf54l_05_10_15.dtsi
@@ -27,7 +27,7 @@
 			compatible = "arm,cortex-m33f";
 			reg = <0>;
 			device_type = "cpu";
-			clock-frequency = <DT_FREQ_M(128)>;
+			clocks = <&hfpll>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			itm: itm@e0000000 {
@@ -41,7 +41,7 @@
 			compatible = "nordic,vpr";
 			reg = <1>;
 			device_type = "cpu";
-			clock-frequency = <DT_FREQ_M(128)>;
+			clocks = <&hfpll>;
 			riscv,isa = "rv32emc";
 			nordic,bus-width = <32>;
 		};
diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 0954f111618..62262d31e87 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -183,7 +183,10 @@ if(DEFINED uicr_path)
 endif()
 
 if(CONFIG_SOC_NRF54L_CPUAPP_COMMON)
-	dt_prop(clock_frequency PATH "/cpus/cpu@0" PROPERTY "clock-frequency")
+	# Ideally, hfpll should taken as a phandle from clocks property from cpu but it
+	# seems that there is no such option in DT cmake functions. Assuming that nrf54l
+	# is using hfpll as CPU clock source (true for all existing devices).
+	dt_prop(clock_frequency PATH "/clocks/hfpll" PROPERTY "clock-frequency")
 	math(EXPR clock_frequency_mhz "${clock_frequency} / 1000000")
 	zephyr_compile_definitions("NRF_CONFIG_CPU_FREQ_MHZ=${clock_frequency_mhz}")
 endif()

From fdc20c97de0c7c937a2f431ce59f06ea2fa94892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 3 Jan 2025 11:56:54 +0100
Subject: [PATCH 2455/2913] [nrf fromtree] boards: nordic: Set 64M CPU
 frequency for nrf54l20pdk and nrf54l09pdk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

nrf54l20pdk and nrf54l09pdk must use 64 MHz for now. So far it was
done by using SOC_NRF54LX_SKIP_CLOCK_CONFIG Kconfig option which was
skipping oscillator configuration so that it was running the default
frequency (which is 64 MHz). This approach was a bit cryptic because
DT was indicating that CPU was running 128 MHz when actual frequency
was different (and it was relying on assumption that default frequency
is 64 MHz).

After adding hfpll as clock source for CPU Kconfig option can
be replaced with DT setting where actual frequency is correctly
indicated. Since hfpll is a clock source for fast peripherals (e.g.
TIMER00) it is possible to have single source of information
regarding frequency.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit d619fd607cbb3551b08dd6f3fa8796cd799f06ae)
---
 boards/nordic/nrf54l09pdk/Kconfig.defconfig           | 3 ---
 boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi | 5 +++++
 boards/nordic/nrf54l20pdk/Kconfig.defconfig           | 3 ---
 boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi | 5 +++++
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/boards/nordic/nrf54l09pdk/Kconfig.defconfig b/boards/nordic/nrf54l09pdk/Kconfig.defconfig
index e495d3e67ce..44589c9b35b 100644
--- a/boards/nordic/nrf54l09pdk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l09pdk/Kconfig.defconfig
@@ -9,9 +9,6 @@ config BT_CTLR
 config ROM_START_OFFSET
 	default 0x800 if BOOTLOADER_MCUBOOT
 
-config SOC_NRF54LX_SKIP_CLOCK_CONFIG
-	default y
-
 config SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE
 	default y
 
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi b/boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi
index 454996a405c..d3b0156e838 100644
--- a/boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi
@@ -27,6 +27,11 @@
 	status = "okay";
 };
 
+&hfpll {
+	/* For now use 64 MHz clock for CPU and fast peripherals. */
+	clock-frequency = <DT_FREQ_M(64)>;
+};
+
 &lfxo {
 	load-capacitors = "internal";
 	load-capacitance-femtofarad = <15500>;
diff --git a/boards/nordic/nrf54l20pdk/Kconfig.defconfig b/boards/nordic/nrf54l20pdk/Kconfig.defconfig
index f6987b80087..406a65c8826 100644
--- a/boards/nordic/nrf54l20pdk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l20pdk/Kconfig.defconfig
@@ -6,9 +6,6 @@ if BOARD_NRF54L20PDK_NRF54L20_CPUAPP
 config ROM_START_OFFSET
 	default 0x800 if BOOTLOADER_MCUBOOT
 
-config SOC_NRF54LX_SKIP_CLOCK_CONFIG
-	default y
-
 config SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE
 	default y
 
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
index ed9d76a6b19..ec6f2740648 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
@@ -27,6 +27,11 @@
 	status = "okay";
 };
 
+&hfpll {
+	/* For now use 64 MHz clock for CPU and fast peripherals. */
+	clock-frequency = <DT_FREQ_M(64)>;
+};
+
 &lfxo {
 	load-capacitors = "internal";
 	load-capacitance-femtofarad = <15500>;

From 8bd9e16e3d0489c21ded3fb8b56c576a09fe0020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 17 Feb 2025 13:31:24 +0100
Subject: [PATCH 2456/2913] [nrf fromlist] soc: nordic: nrf54l: Setup power and
 clock only on secure build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Setup regulators and oscillators only on cpuapp secure target.

Upstream PR #: 85870

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 soc/nordic/nrf54l/soc.c | 58 +++++++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index 5c24df49d54..b0f601448be 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -13,45 +13,38 @@
  */
 
 #include <zephyr/devicetree.h>
-#include <zephyr/dt-bindings/regulator/nrf5x.h>
 #include <zephyr/kernel.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/cache.h>
-#include <zephyr/dt-bindings/regulator/nrf5x.h>
+#include <soc/nrfx_coredep.h>
+#include <system_nrf54l.h>
+#include <soc.h>
+LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 
-#if defined(NRF_APPLICATION)
-#include <cmsis_core.h>
+#if (defined(NRF_APPLICATION) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)) || \
+	!defined(__ZEPHYR__)
+
+#include <nrf_erratas.h>
 #include <hal/nrf_glitchdet.h>
 #include <hal/nrf_oscillators.h>
 #include <hal/nrf_power.h>
 #include <hal/nrf_regulators.h>
-#endif
-#include <soc/nrfx_coredep.h>
-
-#include <nrf_erratas.h>
-#include <system_nrf54l.h>
-#include <zephyr/drivers/clock_control/nrf_clock_control.h>
-
-LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
+#include <zephyr/dt-bindings/regulator/nrf5x.h>
 
-#if defined(NRF_APPLICATION)
 #define LFXO_NODE DT_NODELABEL(lfxo)
 #define HFXO_NODE DT_NODELABEL(hfxo)
-#endif
 
-static int nordicsemi_nrf54l_init(void)
+static inline void power_and_clock_configuration(void)
 {
-	/* Update the SystemCoreClock global variable with current core clock
-	 * retrieved from the DT.
-	 */
-	SystemCoreClock = NRF_PERIPH_GET_FREQUENCY(DT_NODELABEL(cpu));
-
-#if defined(NRF_APPLICATION)
-	/* Enable ICACHE */
-	sys_cache_instr_enable();
-
+/* NRF_REGULATORS and NRF_OSCILLATORS are configured to be secure
+ * as NRF_REGULATORS.POFCON is needed by the secure image to
+ * prevent glitches when the power supply is attacked.
+ *
+ * NRF_OSCILLATORS is also configured as secure because of a HW limitation
+ * that requires them to be configured with the same security property.
+ */
 #if DT_ENUM_HAS_VALUE(LFXO_NODE, load_capacitors, internal)
 	uint32_t xosc32ktrim = NRF_FICR->XOSC32KTRIM;
 
@@ -165,7 +158,22 @@ static int nordicsemi_nrf54l_init(void)
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);
 #endif
 
-#endif /* NRF_APPLICATION */
+}
+#endif /* NRF_APPLICATION && !CONFIG_TRUSTED_EXECUTION_NONSECURE */
+
+int nordicsemi_nrf54l_init(void)
+{
+	/* Update the SystemCoreClock global variable with current core clock
+	 * retrieved from the DT.
+	 */
+	SystemCoreClock = NRF_PERIPH_GET_FREQUENCY(DT_NODELABEL(cpu));
+
+	sys_cache_instr_enable();
+
+#if (defined(NRF_APPLICATION) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)) || \
+	!defined(__ZEPHYR__)
+	power_and_clock_configuration();
+#endif
 
 	return 0;
 }

From d1d8c787df79886a493fc6405b9c5c167b38bd4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 17 Feb 2025 13:39:23 +0100
Subject: [PATCH 2457/2913] [nrf fromlist] soc: nordic: nrf54l: Explicitly
 include autoconf.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Include configuration file for cases when this file is complied
in special builds (e.g. TFM).

Upstream PR #: 85870

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 soc/nordic/nrf54l/soc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index b0f601448be..475615271cf 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -12,6 +12,9 @@
  * for the Nordic Semiconductor nRF54L family processor.
  */
 
+/* Include autoconf for cases when this file is used in special build (e.g. TFM) */
+#include <zephyr/autoconf.h>
+
 #include <zephyr/devicetree.h>
 #include <zephyr/kernel.h>
 #include <zephyr/devicetree.h>

From 00cfdc0e26558f16aa3315a5a5d90171448b3f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 18 Feb 2025 14:58:13 +0100
Subject: [PATCH 2458/2913] [nrf fromlist] drivers: clock_control: nrf: Move
 NRF_PERIPH_GET_FREQUENCY
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move macro from nrf_clock_control.h to soc_nrf_common.h. Clock control
header fetches many dependencies (e.g. onoff.h) so move macro to more
low level header.

Upstream PR #: 85870

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 drivers/counter/counter_nrfx_timer.c          |  1 +
 .../drivers/clock_control/nrf_clock_control.h | 19 -------------------
 soc/nordic/common/soc_nrf_common.h            | 19 +++++++++++++++++++
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/drivers/counter/counter_nrfx_timer.c b/drivers/counter/counter_nrfx_timer.c
index afbdb4ed1ad..6af5a31ad15 100644
--- a/drivers/counter/counter_nrfx_timer.c
+++ b/drivers/counter/counter_nrfx_timer.c
@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <soc.h>
 #include <zephyr/drivers/counter.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #include <zephyr/devicetree.h>
diff --git a/include/zephyr/drivers/clock_control/nrf_clock_control.h b/include/zephyr/drivers/clock_control/nrf_clock_control.h
index 866b4fe2ee1..acc74a85357 100644
--- a/include/zephyr/drivers/clock_control/nrf_clock_control.h
+++ b/include/zephyr/drivers/clock_control/nrf_clock_control.h
@@ -343,25 +343,6 @@ void nrf_clock_control_hfxo_release(void);
 
 #endif /* defined(CONFIG_CLOCK_CONTROL_NRF2) */
 
-/** @brief Get clock frequency that is used for the given node.
- *
- * Macro checks if node has clock property and if yes then if clock has clock_frequency property
- * then it is returned. If it has supported_clock_frequency property with the list of supported
- * frequencies then the last one is returned with assumption that they are ordered and the last
- * one is the highest. If node does not have clock then 16 MHz is returned which is the default
- * frequency.
- *
- * @param node Devicetree node.
- *
- * @return Frequency of the clock that is used for the node.
- */
-#define NRF_PERIPH_GET_FREQUENCY(node) \
-	COND_CODE_1(DT_CLOCKS_HAS_IDX(node, 0),							\
-		(COND_CODE_1(DT_NODE_HAS_PROP(DT_CLOCKS_CTLR(node), clock_frequency),		\
-			     (DT_PROP(DT_CLOCKS_CTLR(node), clock_frequency)),			\
-			     (DT_PROP_LAST(DT_CLOCKS_CTLR(node), supported_clock_frequency)))),	\
-		(NRFX_MHZ_TO_HZ(16)))
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/soc/nordic/common/soc_nrf_common.h b/soc/nordic/common/soc_nrf_common.h
index 1e5e603967b..dd6fb8866bf 100644
--- a/soc/nordic/common/soc_nrf_common.h
+++ b/soc/nordic/common/soc_nrf_common.h
@@ -236,6 +236,25 @@
 		     DT_PINCTRL_HAS_NAME(node_id, sleep),		       \
 		     DT_NODE_PATH(node_id) " defined without sleep state")
 
+/** @brief Get clock frequency that is used for the given node.
+ *
+ * Macro checks if node has clock property and if yes then if clock has clock_frequency property
+ * then it is returned. If it has supported_clock_frequency property with the list of supported
+ * frequencies then the last one is returned with assumption that they are ordered and the last
+ * one is the highest. If node does not have clock then 16 MHz is returned which is the default
+ * frequency.
+ *
+ * @param node Devicetree node.
+ *
+ * @return Frequency of the clock that is used for the node.
+ */
+#define NRF_PERIPH_GET_FREQUENCY(node) \
+	COND_CODE_1(DT_CLOCKS_HAS_IDX(node, 0),							\
+		(COND_CODE_1(DT_NODE_HAS_PROP(DT_CLOCKS_CTLR(node), clock_frequency),		\
+			     (DT_PROP(DT_CLOCKS_CTLR(node), clock_frequency)),			\
+			     (DT_PROP_LAST(DT_CLOCKS_CTLR(node), supported_clock_frequency)))),	\
+		(NRFX_MHZ_TO_HZ(16)))
+
 #endif /* !_ASMLANGUAGE */
 
 #endif

From 25cc8b5383dac638469c5f9e3a4f21889ace50e1 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Thu, 6 Feb 2025 12:47:39 +0100
Subject: [PATCH 2459/2913] [nrf fromtree] drivers: i2c: i2c_nrfx_twis: patch
 dma buf mem section

The macros placing the DMA memory buffer in the appropriate
section in RAM was malformed. This PR fixes it.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit bb2833de548d80100eab925e45a6413c180942b3)
---
 drivers/i2c/i2c_nrfx_twis.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/i2c_nrfx_twis.c b/drivers/i2c/i2c_nrfx_twis.c
index c70750286b6..9e2b0759f2a 100644
--- a/drivers/i2c/i2c_nrfx_twis.c
+++ b/drivers/i2c/i2c_nrfx_twis.c
@@ -32,13 +32,13 @@
 	DT_IRQ(SHIM_NRF_TWIS_NODE(id), priority)
 
 #define SHIM_NRF_TWIS_HAS_MEMORY_REGIONS(id) \
-	DT_NODE_HAS_PROP(id, memory_regions)
+	DT_NODE_HAS_PROP(SHIM_NRF_TWIS_NODE(id), memory_regions)
 
 #define SHIM_NRF_TWIS_LINKER_REGION_NAME(id) \
 	LINKER_DT_NODE_REGION_NAME(DT_PHANDLE(SHIM_NRF_TWIS_NODE(id), memory_regions))
 
 #define SHIM_NRF_TWIS_BUF_ATTR_SECTION(id) \
-	__attribute__((__section__(SHIM_NRF_TWIS_LINKER_REGION_NAME, ())))
+	__attribute__((__section__(SHIM_NRF_TWIS_LINKER_REGION_NAME(id))))
 
 #define SHIM_NRF_TWIS_BUF_ATTR(id)								\
 	COND_CODE_1(										\

From d6072d4f0944f033e381b69c8f9918d246ce333f Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Thu, 6 Feb 2025 12:48:49 +0100
Subject: [PATCH 2460/2913] [nrf fromtree] tests: drivers: i2c: target_api: add
 nrf54h20

Add nrf54h20 to test suite.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 37c3efc13b30251b20a27764e11e1c109198962c)
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.conf    |  4 +
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 78 +++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 tests/drivers/i2c/i2c_target_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 tests/drivers/i2c/i2c_target_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/tests/drivers/i2c/i2c_target_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/i2c/i2c_target_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..7dfef7da283
--- /dev/null
+++ b/tests/drivers/i2c/i2c_target_api/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_I2C_NRFX_TWIS_BUF_SIZE=256
diff --git a/tests/drivers/i2c/i2c_target_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/i2c/i2c_target_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..2fc033d534a
--- /dev/null
+++ b/tests/drivers/i2c/i2c_target_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * SDA = P2.8 and P2.9
+ * SCL = P1.2 and P1.3
+ */
+
+&pinctrl {
+	i2c130_default: i2c130_default {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 8)>,
+				<NRF_PSEL(TWIM_SCL, 1, 2)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c130_sleep: i2c130_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 8)>,
+				<NRF_PSEL(TWIM_SCL, 1, 2)>;
+			low-power-enable;
+		};
+	};
+
+	i2c131_default: i2c131_default {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 9)>,
+				<NRF_PSEL(TWIM_SCL, 1, 3)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c131_sleep: i2c131_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 9)>,
+				<NRF_PSEL(TWIM_SCL, 1, 3)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c130 {
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c130_default>;
+	pinctrl-1 = <&i2c130_sleep>;
+	pinctrl-names = "default", "sleep";
+	zephyr,concat-buf-size = <256>;
+	memory-regions = <&cpuapp_dma_region>;
+	status = "okay";
+
+	eeprom1: eeprom@56 {
+		compatible = "zephyr,i2c-target-eeprom";
+		reg = <0x56>;
+		address-width = <8>;
+		size = <256>;
+	};
+};
+
+&i2c131 {
+	compatible = "nordic,nrf-twis";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c131_default>;
+	pinctrl-1 = <&i2c131_sleep>;
+	pinctrl-names = "default", "sleep";
+	memory-regions = <&cpuapp_dma_region>;
+	status = "okay";
+
+	eeprom0: eeprom@54 {
+		compatible = "zephyr,i2c-target-eeprom";
+		reg = <0x54>;
+		address-width = <8>;
+		size = <256>;
+	};
+};

From 73c8d655713878a9b0769121fcd884f59157f2f2 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Thu, 6 Feb 2025 12:56:33 +0100
Subject: [PATCH 2461/2913] [nrf fromtree] tests: drivers: i2c: target_api: add
 nrf54l15 to test suite

Add nrf54l15 cpuapp to test suite.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 769936165d96003fbe7b13409d26f97b0a5a8658)
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.conf    |  4 +
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 74 +++++++++++++++++++
 .../drivers/i2c/i2c_target_api/testcase.yaml  |  3 +
 3 files changed, 81 insertions(+)
 create mode 100644 tests/drivers/i2c/i2c_target_api/boards/nrf54l15dk_nrf54l15_cpuapp.conf
 create mode 100644 tests/drivers/i2c/i2c_target_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/i2c/i2c_target_api/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/tests/drivers/i2c/i2c_target_api/boards/nrf54l15dk_nrf54l15_cpuapp.conf
new file mode 100644
index 00000000000..9a83d7afb81
--- /dev/null
+++ b/tests/drivers/i2c/i2c_target_api/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_I2C_NRFX_TWIS_BUF_SIZE=256
diff --git a/tests/drivers/i2c/i2c_target_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/i2c/i2c_target_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..dee8b41f048
--- /dev/null
+++ b/tests/drivers/i2c/i2c_target_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * SDA = P1.8 and P1.9
+ * SCL = P1.10 and P1.11
+ */
+
+&pinctrl {
+	i2c21_default: i2c21_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 8)>,
+				<NRF_PSEL(TWIS_SCL, 1, 10)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c21_sleep: i2c21_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 8)>,
+				<NRF_PSEL(TWIS_SCL, 1, 10)>;
+			low-power-enable;
+		};
+	};
+
+	i2c22_default: i2c22_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 9)>,
+				<NRF_PSEL(TWIS_SCL, 1, 11)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c22_sleep: i2c22_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 9)>,
+				<NRF_PSEL(TWIS_SCL, 1, 11)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c21 {
+	pinctrl-0 = <&i2c21_default>;
+	pinctrl-1 = <&i2c21_sleep>;
+	pinctrl-names = "default", "sleep";
+	zephyr,concat-buf-size = <256>;
+	status = "okay";
+
+	eeprom1: eeprom@56 {
+		compatible = "zephyr,i2c-target-eeprom";
+		reg = <0x56>;
+		address-width = <8>;
+		size = <256>;
+	};
+};
+
+&i2c22 {
+	compatible = "nordic,nrf-twis";
+	pinctrl-0 = <&i2c22_default>;
+	pinctrl-1 = <&i2c22_sleep>;
+	pinctrl-names = "default", "sleep";
+	status = "okay";
+
+	eeprom0: eeprom@54 {
+		compatible = "zephyr,i2c-target-eeprom";
+		reg = <0x54>;
+		address-width = <8>;
+		size = <256>;
+	};
+};
diff --git a/tests/drivers/i2c/i2c_target_api/testcase.yaml b/tests/drivers/i2c/i2c_target_api/testcase.yaml
index fe3efa19615..588b7f7a43d 100644
--- a/tests/drivers/i2c/i2c_target_api/testcase.yaml
+++ b/tests/drivers/i2c/i2c_target_api/testcase.yaml
@@ -54,5 +54,8 @@ tests:
       - max32675evkit
       - max32680evkit/max32680/m4
       - max32690evkit/max32690/m4
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
     integration_platforms:
       - max32690evkit/max32690/m4

From 5f86809a4a6e082e433d15bb6431ff1f55a63a06 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Tue, 11 Feb 2025 10:12:13 +0100
Subject: [PATCH 2462/2913] [nrf fromtree] drivers: i2c: nrfx_twim_rtio: fix
 dma buf section attr

The buffer used for the TWIM DMA needs to be allocated to the
section provided with the memory-regions dt prop. The macros for
doing this where malformed. This commit fixes and cleans up the
macros.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 62815dd9e711ce4f97532aa5f50fa367942749cb)
---
 drivers/i2c/i2c_nrfx_twim_rtio.c | 43 ++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/drivers/i2c/i2c_nrfx_twim_rtio.c b/drivers/i2c/i2c_nrfx_twim_rtio.c
index acc2576c1ba..3c7db82bd5b 100644
--- a/drivers/i2c/i2c_nrfx_twim_rtio.c
+++ b/drivers/i2c/i2c_nrfx_twim_rtio.c
@@ -15,6 +15,7 @@
 #include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 #include <nrfx_twim.h>
+#include <zephyr/linker/devicetree_regions.h>
 
 #include "i2c_nrfx_twim_common.h"
 
@@ -174,6 +175,31 @@ int i2c_nrfx_twim_rtio_init(const struct device *dev)
 	COND_CODE_0(CONCAT_BUF_SIZE(idx), (COND_CODE_0(FLASH_BUF_MAX_SIZE(idx), (0), (1))), (1))
 #define MSG_BUF_SIZE(idx) MAX(CONCAT_BUF_SIZE(idx), FLASH_BUF_MAX_SIZE(idx))
 
+#define MSG_BUF_HAS_MEMORY_REGIONS(idx) \
+	DT_NODE_HAS_PROP(I2C(idx), memory_regions)
+
+#define MSG_BUF_LINKER_REGION_NAME(idx) \
+	LINKER_DT_NODE_REGION_NAME(DT_PHANDLE(I2C(idx), memory_regions))
+
+#define MSG_BUF_ATTR_SECTION(idx) \
+	__attribute__((__section__(MSG_BUF_LINKER_REGION_NAME(idx))))
+
+#define MSG_BUF_ATTR(idx)                                                                          \
+	COND_CODE_1(                                                                               \
+		MSG_BUF_HAS_MEMORY_REGIONS(idx),                                                   \
+		(MSG_BUF_ATTR_SECTION(idx)),                                                       \
+		()                                                                                 \
+	)
+
+#define MSG_BUF_SYM(idx) \
+	_CONCAT_3(twim_, idx, _msg_buf)
+
+#define MSG_BUF_DEFINE(idx) \
+	static uint8_t MSG_BUF_SYM(idx)[MSG_BUF_SIZE(idx)] MSG_BUF_ATTR(idx)
+
+#define MAX_TRANSFER_SIZE(idx) \
+	BIT_MASK(DT_PROP(I2C(idx), easydma_maxcnt_bits))
+
 #define I2C_NRFX_TWIM_RTIO_DEVICE(idx)                                                             \
 	NRF_DT_CHECK_NODE_HAS_PINCTRL_SLEEP(I2C(idx));                                             \
 	BUILD_ASSERT(I2C_FREQUENCY(idx) != I2C_NRFX_TWIM_INVALID_FREQUENCY,                        \
@@ -183,9 +209,7 @@ int i2c_nrfx_twim_rtio_init(const struct device *dev)
 		IRQ_CONNECT(DT_IRQN(I2C(idx)), DT_IRQ(I2C(idx), priority), nrfx_isr,               \
 			    nrfx_twim_##idx##_irq_handler, 0);                                     \
 	}                                                                                          \
-	IF_ENABLED(                                                                                \
-		USES_MSG_BUF(idx),                                                                 \
-		(static uint8_t twim_##idx##_msg_buf[MSG_BUF_SIZE(idx)] I2C_MEMORY_SECTION(idx);)) \
+	IF_ENABLED(USES_MSG_BUF(idx), (MSG_BUF_DEFINE(idx);))                                      \
 	I2C_RTIO_DEFINE(_i2c##idx##_twim_rtio,                                                     \
 			DT_INST_PROP_OR(n, sq_size, CONFIG_I2C_RTIO_SQ_SIZE),                      \
 			DT_INST_PROP_OR(n, cq_size, CONFIG_I2C_RTIO_CQ_SIZE));                     \
@@ -204,22 +228,15 @@ int i2c_nrfx_twim_rtio_init(const struct device *dev)
 				.msg_buf_size = MSG_BUF_SIZE(idx),                                 \
 				.irq_connect = irq_connect##idx,                                   \
 				.pcfg = PINCTRL_DT_DEV_CONFIG_GET(I2C(idx)),                       \
-				IF_ENABLED(USES_MSG_BUF(idx), (.msg_buf = twim_##idx##_msg_buf,))  \
-					.max_transfer_size =                                       \
-					BIT_MASK(DT_PROP(I2C(idx), easydma_maxcnt_bits)),          \
+				IF_ENABLED(USES_MSG_BUF(idx), (.msg_buf = MSG_BUF_SYM(idx),))      \
+				.max_transfer_size = MAX_TRANSFER_SIZE(idx),                       \
 			},                                                                         \
 		.ctx = &_i2c##idx##_twim_rtio,                                                     \
 	};                                                                                         \
 	PM_DEVICE_DT_DEFINE(I2C(idx), twim_nrfx_pm_action, PM_DEVICE_ISR_SAFE);                    \
 	I2C_DEVICE_DT_DEFINE(I2C(idx), i2c_nrfx_twim_rtio_init, PM_DEVICE_DT_GET(I2C(idx)), NULL,  \
 			     &twim_##idx##z_config, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY,         \
-			     &i2c_nrfx_twim_driver_api)
-
-#define I2C_MEMORY_SECTION(idx)                                                                    \
-	COND_CODE_1(I2C_HAS_PROP(idx, memory_regions),                                             \
-		    (__attribute__((__section__(                                                   \
-			    LINKER_DT_NODE_REGION_NAME(DT_PHANDLE(I2C(idx), memory_regions)))))),  \
-		    ())
+			     &i2c_nrfx_twim_driver_api);
 
 #ifdef CONFIG_HAS_HW_NRF_TWIM0
 I2C_NRFX_TWIM_RTIO_DEVICE(0);

From 47a8e12370a5d4cceca510fbfdc2e60a723413aa Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Tue, 11 Feb 2025 10:37:35 +0100
Subject: [PATCH 2463/2913] [nrf fromtree] drivers: i2c: nrfx_twim_rtio: use
 msg_buf for rx if required

The DMA buffer needs to be used both for tx and rx if required.
Extend RTIO driver variant to use DMA buffer and copy received
data from it to user buffer.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 125752e7cccb4d6dd2f5f4124d7ef3b1cda360b4)
---
 drivers/i2c/i2c_nrfx_twim_rtio.c | 34 +++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/drivers/i2c/i2c_nrfx_twim_rtio.c b/drivers/i2c/i2c_nrfx_twim_rtio.c
index 3c7db82bd5b..da10e267b9c 100644
--- a/drivers/i2c/i2c_nrfx_twim_rtio.c
+++ b/drivers/i2c/i2c_nrfx_twim_rtio.c
@@ -26,6 +26,11 @@ struct i2c_nrfx_twim_rtio_config {
 	struct i2c_rtio *ctx;
 };
 
+struct i2c_nrfx_twim_rtio_data {
+	uint8_t *user_rx_buf;
+	uint16_t user_rx_buf_size;
+};
+
 static bool i2c_nrfx_twim_rtio_msg_start(const struct device *dev, uint8_t flags, uint8_t *buf,
 					 size_t buf_len, uint16_t i2c_addr)
 {
@@ -44,12 +49,28 @@ static bool i2c_nrfx_twim_rtio_msg_start(const struct device *dev, uint8_t flags
 static bool i2c_nrfx_twim_rtio_start(const struct device *dev)
 {
 	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
+	struct i2c_nrfx_twim_rtio_data *data = dev->data;
 	struct i2c_rtio *ctx = config->ctx;
 	struct rtio_sqe *sqe = &ctx->txn_curr->sqe;
 	struct i2c_dt_spec *dt_spec = sqe->iodev->data;
 
 	switch (sqe->op) {
 	case RTIO_OP_RX:
+		if (!nrf_dma_accessible_check(&config->common.twim, sqe->rx.buf)) {
+			if (sqe->rx.buf_len > config->common.msg_buf_size) {
+				return i2c_rtio_complete(ctx, -ENOSPC);
+			}
+
+			data->user_rx_buf = sqe->rx.buf;
+			data->user_rx_buf_size = sqe->rx.buf_len;
+			return i2c_nrfx_twim_rtio_msg_start(dev,
+							    I2C_MSG_READ | sqe->iodev_flags,
+							    config->common.msg_buf,
+							    data->user_rx_buf_size,
+							    dt_spec->addr);
+		}
+
+		data->user_rx_buf = NULL;
 		return i2c_nrfx_twim_rtio_msg_start(dev, I2C_MSG_READ | sqe->iodev_flags,
 						    sqe->rx.buf, sqe->rx.buf_len, dt_spec->addr);
 	case RTIO_OP_TINY_TX:
@@ -144,8 +165,14 @@ static void i2c_nrfx_twim_rtio_submit(const struct device *dev, struct rtio_iode
 static void event_handler(nrfx_twim_evt_t const *p_event, void *p_context)
 {
 	const struct device *dev = p_context;
+	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
+	struct i2c_nrfx_twim_rtio_data *data = dev->data;
 	int status = p_event->type == NRFX_TWIM_EVT_DONE ? 0 : -EIO;
 
+	if (data->user_rx_buf) {
+		memcpy(data->user_rx_buf, config->common.msg_buf, data->user_rx_buf_size);
+	}
+
 	i2c_nrfx_twim_rtio_complete(dev, status);
 }
 
@@ -214,6 +241,7 @@ int i2c_nrfx_twim_rtio_init(const struct device *dev)
 			DT_INST_PROP_OR(n, sq_size, CONFIG_I2C_RTIO_SQ_SIZE),                      \
 			DT_INST_PROP_OR(n, cq_size, CONFIG_I2C_RTIO_CQ_SIZE));                     \
 	PINCTRL_DT_DEFINE(I2C(idx));                                                               \
+	static struct i2c_nrfx_twim_rtio_data twim_##idx##z_data;                                  \
 	static const struct i2c_nrfx_twim_rtio_config twim_##idx##z_config = {                     \
 		.common =                                                                          \
 			{                                                                          \
@@ -234,9 +262,9 @@ int i2c_nrfx_twim_rtio_init(const struct device *dev)
 		.ctx = &_i2c##idx##_twim_rtio,                                                     \
 	};                                                                                         \
 	PM_DEVICE_DT_DEFINE(I2C(idx), twim_nrfx_pm_action, PM_DEVICE_ISR_SAFE);                    \
-	I2C_DEVICE_DT_DEFINE(I2C(idx), i2c_nrfx_twim_rtio_init, PM_DEVICE_DT_GET(I2C(idx)), NULL,  \
-			     &twim_##idx##z_config, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY,         \
-			     &i2c_nrfx_twim_driver_api);
+	I2C_DEVICE_DT_DEFINE(I2C(idx), i2c_nrfx_twim_rtio_init, PM_DEVICE_DT_GET(I2C(idx)),        \
+			     &twim_##idx##z_data, &twim_##idx##z_config, POST_KERNEL,              \
+			     CONFIG_I2C_INIT_PRIORITY, &i2c_nrfx_twim_driver_api);
 
 #ifdef CONFIG_HAS_HW_NRF_TWIM0
 I2C_NRFX_TWIM_RTIO_DEVICE(0);

From 90c036021423cab44dc3ecf015aa4215e67324b1 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Wed, 8 Jan 2025 13:32:47 +0100
Subject: [PATCH 2464/2913] [nrf fromtree] samples: drivers: i2c:
 rtio_loopback: add nrf boards

Add nRF boards to the rtio_loopback sample.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 7d5a912cedf73cf347d7c18bec61dfaed5555348)
---
 .../boards/nrf5340dk_nrf5340_cpuapp.conf      |  4 ++
 .../boards/nrf5340dk_nrf5340_cpuapp.overlay   | 43 ++++++++++++
 .../boards/nrf54l15dk_nrf54l15_cpuapp.conf    |  4 ++
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 67 +++++++++++++++++++
 samples/drivers/i2c/rtio_loopback/sample.yaml |  2 +
 5 files changed, 120 insertions(+)
 create mode 100644 samples/drivers/i2c/rtio_loopback/boards/nrf5340dk_nrf5340_cpuapp.conf
 create mode 100644 samples/drivers/i2c/rtio_loopback/boards/nrf5340dk_nrf5340_cpuapp.overlay
 create mode 100644 samples/drivers/i2c/rtio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.conf
 create mode 100644 samples/drivers/i2c/rtio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/samples/drivers/i2c/rtio_loopback/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/drivers/i2c/rtio_loopback/boards/nrf5340dk_nrf5340_cpuapp.conf
new file mode 100644
index 00000000000..64627ec8688
--- /dev/null
+++ b/samples/drivers/i2c/rtio_loopback/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_I2C_TARGET_BUFFER_MODE=y
diff --git a/samples/drivers/i2c/rtio_loopback/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/drivers/i2c/rtio_loopback/boards/nrf5340dk_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..21bf0e503a4
--- /dev/null
+++ b/samples/drivers/i2c/rtio_loopback/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * SDA = P0.26 and P1.2
+ * SCL = P0.25 and P1.3
+ */
+
+/ {
+	aliases {
+		i2c-controller = &i2c1;
+		i2c-controller-target = &i2c2;
+	};
+};
+
+&pinctrl {
+	i2c2_default: i2c2_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 0, 26)>,
+				<NRF_PSEL(TWIS_SCL, 0, 25)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c2_sleep: i2c2_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 0, 26)>,
+				<NRF_PSEL(TWIS_SCL, 0, 25)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c2 {
+	compatible = "nordic,nrf-twis";
+	pinctrl-0 = <&i2c2_default>;
+	pinctrl-1 = <&i2c2_sleep>;
+	pinctrl-names = "default", "sleep";
+	status = "okay";
+};
diff --git a/samples/drivers/i2c/rtio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/drivers/i2c/rtio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.conf
new file mode 100644
index 00000000000..9a83d7afb81
--- /dev/null
+++ b/samples/drivers/i2c/rtio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_I2C_NRFX_TWIS_BUF_SIZE=256
diff --git a/samples/drivers/i2c/rtio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/drivers/i2c/rtio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..4a7d2fe02a6
--- /dev/null
+++ b/samples/drivers/i2c/rtio_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * SDA = P1.8 and P1.9
+ * SCL = P1.10 and P1.11
+ */
+
+/ {
+	aliases {
+		i2c-controller = &i2c21;
+		i2c-controller-target = &i2c22;
+	};
+};
+
+&pinctrl {
+	i2c21_default: i2c21_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 8)>,
+				<NRF_PSEL(TWIS_SCL, 1, 10)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c21_sleep: i2c21_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 8)>,
+				<NRF_PSEL(TWIS_SCL, 1, 10)>;
+			low-power-enable;
+		};
+	};
+
+	i2c22_default: i2c22_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 9)>,
+				<NRF_PSEL(TWIS_SCL, 1, 11)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c22_sleep: i2c22_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 9)>,
+				<NRF_PSEL(TWIS_SCL, 1, 11)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c21 {
+	pinctrl-0 = <&i2c21_default>;
+	pinctrl-1 = <&i2c21_sleep>;
+	pinctrl-names = "default", "sleep";
+	zephyr,concat-buf-size = <256>;
+	status = "okay";
+};
+
+&i2c22 {
+	compatible = "nordic,nrf-twis";
+	pinctrl-0 = <&i2c22_default>;
+	pinctrl-1 = <&i2c22_sleep>;
+	pinctrl-names = "default", "sleep";
+	status = "okay";
+};
diff --git a/samples/drivers/i2c/rtio_loopback/sample.yaml b/samples/drivers/i2c/rtio_loopback/sample.yaml
index 6effc59a9f8..e7d5563f5b1 100644
--- a/samples/drivers/i2c/rtio_loopback/sample.yaml
+++ b/samples/drivers/i2c/rtio_loopback/sample.yaml
@@ -7,3 +7,5 @@ tests:
       - i2c_target
     platform_allow:
       - b_u585i_iot02a
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp

From a37c99ee8deeb795b3912d7d086cdb731fec2197 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Tue, 11 Feb 2025 10:40:38 +0100
Subject: [PATCH 2465/2913] [nrf fromtree] samples: drivers: i2c:
 rtio_loopback: add nrf54h20

Add nrf54h20 board support to the i2c rtio loopback sample.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 5c7f47de0fdeac237c420bc06070bf8d9d0dec03)
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.conf    |  4 ++
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 71 +++++++++++++++++++
 samples/drivers/i2c/rtio_loopback/sample.yaml |  1 +
 3 files changed, 76 insertions(+)
 create mode 100644 samples/drivers/i2c/rtio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 samples/drivers/i2c/rtio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/samples/drivers/i2c/rtio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/drivers/i2c/rtio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..9a83d7afb81
--- /dev/null
+++ b/samples/drivers/i2c/rtio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_I2C_NRFX_TWIS_BUF_SIZE=256
diff --git a/samples/drivers/i2c/rtio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/i2c/rtio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..928b52a66f5
--- /dev/null
+++ b/samples/drivers/i2c/rtio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * SDA = P2.8 and P2.9
+ * SCL = P1.2 and P1.3
+ */
+
+/ {
+	aliases {
+		i2c-controller = &i2c130;
+		i2c-controller-target = &i2c131;
+	};
+};
+
+&pinctrl {
+	i2c130_default: i2c130_default {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 8)>,
+				<NRF_PSEL(TWIM_SCL, 1, 2)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c130_sleep: i2c130_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 8)>,
+				<NRF_PSEL(TWIM_SCL, 1, 2)>;
+			low-power-enable;
+		};
+	};
+
+	i2c131_default: i2c131_default {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 9)>,
+				<NRF_PSEL(TWIM_SCL, 1, 3)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c131_sleep: i2c131_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 9)>,
+				<NRF_PSEL(TWIM_SCL, 1, 3)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c130 {
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c130_default>;
+	pinctrl-1 = <&i2c130_sleep>;
+	pinctrl-names = "default", "sleep";
+	zephyr,concat-buf-size = <256>;
+	memory-regions = <&cpuapp_dma_region>;
+	status = "okay";
+};
+
+&i2c131 {
+	compatible = "nordic,nrf-twis";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c131_default>;
+	pinctrl-1 = <&i2c131_sleep>;
+	pinctrl-names = "default", "sleep";
+	memory-regions = <&cpuapp_dma_region>;
+	status = "okay";
+};
diff --git a/samples/drivers/i2c/rtio_loopback/sample.yaml b/samples/drivers/i2c/rtio_loopback/sample.yaml
index e7d5563f5b1..5f495ad6312 100644
--- a/samples/drivers/i2c/rtio_loopback/sample.yaml
+++ b/samples/drivers/i2c/rtio_loopback/sample.yaml
@@ -9,3 +9,4 @@ tests:
       - b_u585i_iot02a
       - nrf5340dk/nrf5340/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp

From ca2d61ebb30ae2f6b3f2a220608f31e14e11e80a Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Thu, 9 Jan 2025 12:26:05 +0100
Subject: [PATCH 2466/2913] [nrf fromtree] drivers: i2c: nrfx_twim_rtio: cast
 buf to non-const

RTIO correctly declares tx buffers as const, however, the
existing I2C API and NRFX (SDK) drivers don't. Therefor cast the
const buf to non-const when passing the tx buf to the twim driver
from the RTIO call to avoid the const warning.

The tx buffer is being treated as const data naturally in the
NRFX driver, its just not declared as such since we reuse the
buffer for both RX and TX data.

Alternatively the SDK and "shim" drivers built on top of it need
to be updated, which is quite a bit of work :)

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 2e0092356fb834cca14114f35f31c450cd925efc)
---
 drivers/i2c/i2c_nrfx_twim_rtio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/i2c/i2c_nrfx_twim_rtio.c b/drivers/i2c/i2c_nrfx_twim_rtio.c
index da10e267b9c..8b5f2c625f8 100644
--- a/drivers/i2c/i2c_nrfx_twim_rtio.c
+++ b/drivers/i2c/i2c_nrfx_twim_rtio.c
@@ -96,7 +96,8 @@ static bool i2c_nrfx_twim_rtio_start(const struct device *dev)
 			sqe->tx.buf = config->common.msg_buf;
 		}
 		return i2c_nrfx_twim_rtio_msg_start(dev, I2C_MSG_WRITE | sqe->iodev_flags,
-						    sqe->tx.buf, sqe->tx.buf_len, dt_spec->addr);
+						    (uint8_t *)sqe->tx.buf, sqe->tx.buf_len,
+						    dt_spec->addr);
 	case RTIO_OP_I2C_CONFIGURE:
 		(void)i2c_nrfx_twim_configure(dev, sqe->i2c_config);
 		return false;

From 4cba24b9bc9de018f3dda9a3e0c7a7402bc68600 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Thu, 13 Feb 2025 13:56:59 +0100
Subject: [PATCH 2467/2913] [nrf fromtree] samples: drivers: i2c:
 rtio_loopback: add fixture

Add i2c_bus_short fixture to the rtio_loopback sample to ensure it
is only run on boards with the bus shorted. The i2c_bus_short
fixture is also used in the i2c_target_api test suite.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 846b4687154af5f57ba5a32610ec868d5f4ae61d)
---
 samples/drivers/i2c/rtio_loopback/sample.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/samples/drivers/i2c/rtio_loopback/sample.yaml b/samples/drivers/i2c/rtio_loopback/sample.yaml
index 5f495ad6312..68a752df947 100644
--- a/samples/drivers/i2c/rtio_loopback/sample.yaml
+++ b/samples/drivers/i2c/rtio_loopback/sample.yaml
@@ -5,6 +5,9 @@ tests:
     tags:
       - rtio
       - i2c_target
+    harness: ztest
+    harness_config:
+      fixture: i2c_bus_short
     platform_allow:
       - b_u585i_iot02a
       - nrf5340dk/nrf5340/cpuapp

From 50128e3d0e3257f3fbed40b3694cc8a9788ccf1c Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Thu, 20 Feb 2025 15:46:15 +0100
Subject: [PATCH 2468/2913] [nrf fromtree] samples: drivers: i2c:
 rtio_loopback: change harness to console

The harness was set to ztest, but the sample requires the console
harness to match on the "sample complete" line, its not actually
using ztest.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 7ee4011166ae0467d6830bccd337f9c8f583acda)
---
 samples/drivers/i2c/rtio_loopback/sample.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/samples/drivers/i2c/rtio_loopback/sample.yaml b/samples/drivers/i2c/rtio_loopback/sample.yaml
index 68a752df947..a9d41fbf8cd 100644
--- a/samples/drivers/i2c/rtio_loopback/sample.yaml
+++ b/samples/drivers/i2c/rtio_loopback/sample.yaml
@@ -5,9 +5,12 @@ tests:
     tags:
       - rtio
       - i2c_target
-    harness: ztest
+    harness: console
     harness_config:
       fixture: i2c_bus_short
+      type: one_line
+      regex:
+        - "sample complete"
     platform_allow:
       - b_u585i_iot02a
       - nrf5340dk/nrf5340/cpuapp

From a22f20f3fba9773487cdf5f76b9c6cf26a6e8a3a Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 20 Jan 2025 13:24:16 +0100
Subject: [PATCH 2469/2913] [nrf fromtree] manifest: Update bsim to version
 v2.5

Main changes since v2.4:
* libRandv2: New API to fill buffers & Wextra warning fixes
* libCryptov1: Add new AES-ECB API

Note: Like before, bsim remains fully backwards compatible

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit ebbdb1068d3fa6bfa2aeb78adf384c330994e256)
---
 west.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/west.yml b/west.yml
index 1931e30d741..a1fe7f2fb80 100644
--- a/west.yml
+++ b/west.yml
@@ -37,7 +37,7 @@ manifest:
       remote: babblesim
       repo-path: base
       path: tools/bsim/components
-      revision: 0cc70e78a88c1de9d8ec045a703b38134861e7e7
+      revision: 153101c61ce7106f6ba8b108b5c6488efdc1151a
       groups:
         - babblesim
     - name: babblesim_ext_2G4_channel_NtNcable
@@ -107,12 +107,12 @@ manifest:
       remote: babblesim
       repo-path: ext_libCryptov1
       path: tools/bsim/components/ext_libCryptov1
-      revision: 236309584c90be32ef12848077bd6de54e9f4deb
+      revision: da246018ebe031e4fe4a8228187fb459e9f3b2fa
       groups:
         - babblesim
     - name: bsim
       repo-path: babblesim-manifest
-      revision: 1f242f4ed7fc141fdfcfeca8d21c6d9e801179d7
+      revision: a88d3353451387ca490a6a7f7c478a90c4ee05b7
       path: tools/bsim
       groups:
         - babblesim

From 5d28a5eb210b8c59eee2b81f37ae939838f91c2f Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Thu, 23 Jan 2025 10:16:10 +0100
Subject: [PATCH 2470/2913] [nrf fromtree] doc boards nrfbsim: Update list of
 supported HW

The models include enough of the CRACEN to run the same
nrfx drivers as in Zephyr. So let's add it to the list.

Also let's remove the RTC from the list as the hal does not
expose it anymore for this platform as the GRTC is to be used
instead.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit a211999141833bba7dfd3336f8e3b9b135bb4627)
---
 boards/native/nrf_bsim/doc/nrf54l15bsim.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boards/native/nrf_bsim/doc/nrf54l15bsim.rst b/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
index ae8b29d2aec..3b527545503 100644
--- a/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
+++ b/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
@@ -40,6 +40,7 @@ This boards include models of some of the nRF54L15 SOC peripherals:
 * AAR (Accelerated Address Resolver)
 * CCM (AES CCM mode encryption)
 * CLOCK (Clock control)
+* CRACEN (Crypto Accelerator Engine)
 * DPPI (Distributed Programmable Peripheral Interconnect)
 * ECB (AES electronic codebook mode encryption)
 * EGU (Event Generator Unit)
@@ -49,7 +50,6 @@ This boards include models of some of the nRF54L15 SOC peripherals:
 * PPIB (PPI Bridge)
 * RADIO
 * RRAMC (Resistive RAM Controller)
-* RTC (Real Time Counter)
 * TEMP (Temperature sensor)
 * TIMER
 * UARTE (UART with Easy DMA)

From b2d201997ba422748eda8ca52b0d41811df11c47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 27 Jan 2025 09:38:11 +0100
Subject: [PATCH 2471/2913] [nrf fromtree] boards: nrf*_bsim: Detect attempt to
 configure not existing int
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Similar to 923d4fbad8. Prevent overrunning the irq vector table.
This is not happening today in tree, but coverity thinks it
does. Checking for it to prevent it is not a bad idea
anyhow, so let's do it.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit cd23fdf63fd3d15f38f29686fc29454b1d07a2ee)
---
 boards/native/nrf_bsim/irq_handler.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/boards/native/nrf_bsim/irq_handler.c b/boards/native/nrf_bsim/irq_handler.c
index 2d6ad4f66b7..74d0dc5889e 100644
--- a/boards/native/nrf_bsim/irq_handler.c
+++ b/boards/native/nrf_bsim/irq_handler.c
@@ -278,6 +278,11 @@ void posix_isr_declare(unsigned int irq_p, int flags, void isr_p(const void *),
  */
 void posix_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
 {
+	if (irq >= NHW_INTCTRL_MAX_INTLINES) {
+		bs_trace_error_time_line("Attempted to configure not existent interrupt %u\n",
+					 irq);
+		return;
+	}
 	hw_irq_ctrl_prio_set(CONFIG_NATIVE_SIMULATOR_MCU_N, irq, prio);
 }
 

From 9a6076a9a39ad7224f6f70096810f68155803b86 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Tue, 28 Jan 2025 10:21:58 +0100
Subject: [PATCH 2472/2913] [nrf fromtree] manifest: Update nRF hw models to
 latest and leave branch behind

Update the HW models module back to the main branch,
2570f4a697ce2d860ff39ec34afd91749bd66d3
leaving behind zephyr_2025_01_22
* 68df9ed Force build of cracen hal even if HAL is not 3.10

As the nordic HAL has been updated to be this version, we do not need
this hack in the HW models anymore to be able to build the CRACEN HW
models for the nrf54l15.

This update includes the following new commit in main:
* 2570f4a docs: Do not list the RTC as included for the 54L15

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit a2bb2bc848a50e5673b9f3fa570e82709bea9589)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index a1fe7f2fb80..117801531a6 100644
--- a/west.yml
+++ b/west.yml
@@ -315,7 +315,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: 68df9ed65dd9d93bb257bf8f295cb753ecf83cd8
+      revision: 2570f4a697ce2da860ff39ec34afd91749bd66d3
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
       revision: 0f53c9ebab526661131d5d7e73c7a6cb3b2d2e11

From 73d52ac5dbb69caad177abe8c753fc34c7eb0342 Mon Sep 17 00:00:00 2001
From: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Date: Mon, 27 Jan 2025 13:43:13 +0100
Subject: [PATCH 2473/2913] [nrf fromtree] boards: nrf52_bsim: Remove disabling
 of LOG_BACKEND_UART

There seems like there is no good reason for having it disabled.
For bsim boards CONFIG_SERIAL is disabled by default, there will
anyways not be any logging on the UART.

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
(cherry picked from commit a2d1b28ba0f78467de81b71167cbdc9be2e3180e)
---
 boards/native/nrf_bsim/nrf52_bsim_defconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/boards/native/nrf_bsim/nrf52_bsim_defconfig b/boards/native/nrf_bsim/nrf52_bsim_defconfig
index 0559b646712..38b42f7eb88 100644
--- a/boards/native/nrf_bsim/nrf52_bsim_defconfig
+++ b/boards/native/nrf_bsim/nrf52_bsim_defconfig
@@ -3,4 +3,3 @@
 
 CONFIG_CONSOLE=y
 CONFIG_NO_OPTIMIZATIONS=y
-CONFIG_LOG_BACKEND_UART=n

From dc87df4236e92fdd979dfadceb86a3824ef88d2e Mon Sep 17 00:00:00 2001
From: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Date: Mon, 27 Jan 2025 14:28:58 +0100
Subject: [PATCH 2474/2913] [nrf fromtree] boards: nrf_bsim: Set chosen console
 dts entry

This makes the bsim boards more similar to their corresponding DKs.
This makes it simpler to run samples and application requiring
the use of a console.

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
(cherry picked from commit 77de5935f2ff97948dc3c836d775e24d206171ec)
---
 boards/native/nrf_bsim/nrf52_bsim.dts                   | 1 +
 boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts   | 1 +
 boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts | 1 +
 3 files changed, 3 insertions(+)

diff --git a/boards/native/nrf_bsim/nrf52_bsim.dts b/boards/native/nrf_bsim/nrf52_bsim.dts
index ad3ac181ae7..9b5b5ba3786 100644
--- a/boards/native/nrf_bsim/nrf52_bsim.dts
+++ b/boards/native/nrf_bsim/nrf52_bsim.dts
@@ -36,6 +36,7 @@
 	chosen {
 		zephyr,ieee802154 = &ieee802154;
 		zephyr,flash = &flash0;
+		zephyr,console = &uart0;
 		/* UART used by the BT controller UART HCI driver by default: */
 		zephyr,bt-c2h-uart = &uart1;
 	};
diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
index 0273ee4d776..bdcd47f9440 100644
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
@@ -39,6 +39,7 @@
 	};
 
 	chosen {
+		zephyr,console = &uart0;
 		zephyr,entropy = &rng_hci;
 		zephyr,flash = &flash0;
 		zephyr,bt-hci = &bt_hci_ipc0;
diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
index 9a2d3e25c97..39cbc7bcbd8 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -15,6 +15,7 @@
 	compatible = "bsim,nrf54l15-bsim-nrf54l15-cpuapp", "bsim,nrf54";
 
 	chosen {
+		zephyr,console = &uart20;
 		zephyr,entropy = &rng;
 		zephyr,bt-c2h-uart = &uart20;
 		zephyr,flash-controller = &rram_controller;

From 63aa79c125728a7c89d58f27fc9367214db0545f Mon Sep 17 00:00:00 2001
From: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Date: Mon, 27 Jan 2025 14:33:45 +0100
Subject: [PATCH 2475/2913] [nrf fromtree] boards: nrf_bsim: Document how to
 use the console with bsim

This commit describes how to build and run applications using
the console. This documentation is added because it may
not be obvious how this is done. That is, sometimes a user
may believe that the terminal launching the application is the
the console which is not the case.

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
(cherry picked from commit 0f3e6fd3d624f3647005b8f2bc30bd477933a60a)
---
 boards/native/nrf_bsim/doc/nrf52_bsim.rst | 27 +++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/boards/native/nrf_bsim/doc/nrf52_bsim.rst b/boards/native/nrf_bsim/doc/nrf52_bsim.rst
index 01bd2c9f88e..3c94c82b534 100644
--- a/boards/native/nrf_bsim/doc/nrf52_bsim.rst
+++ b/boards/native/nrf_bsim/doc/nrf52_bsim.rst
@@ -171,6 +171,33 @@ Run them with ``-help`` for more information.
 You can find more information about how to run BabbleSim simulations in
 `this BabbleSim example <https://babblesim.github.io/example_2g4.html>`_.
 
+Running an application using the console
+========================================
+
+Some applications require the use of a console to interact with the user.
+These applications typically enable :kconfig:option:`CONFIG_CONSOLE_SUBSYS` and :kconfig:option:`CONFIG_CONSOLE_GETCHAR`.
+The UART console is disabled by default for BabbleSim boards, to enable it simply add the snippet :ref:`snippet-uart-console`.
+
+.. code-block:: console
+
+   west build -S serial-console [...]
+
+To view the output and interact with the application the user needs to connect a terminal to this pseudoterminal.
+
+.. code-block:: console
+
+   # Automatically attach to the terminal
+   ./build/zephyr/zephyr.exe --uart<uart_id>_pty_attach
+   # Use a custom command to attach to the terminal, for example 'xterm -e screen %s &'
+   ./build/zephyr/zephyr.exe --uart<uart_id>_attach_cmd=<cmd>
+   # Use a custom way to connect to the pseudoterminal
+   ./build/zephyr/zephyr.exe --uart<uart_id>_pty --uart_pty_wait
+   minicom -D /dev/pts/<pts_id>
+
+The command line option ``--uart_list`` prints out the mapping between ``uart_id`` and the UART peripherals.
+The overlay files describes which UART peripheral is being used as the console output.
+
+For more details about attaching to the UART output, refer to the output of the ``-help`` option of the executable.
 
 C library choice
 ****************

From 6b3d3472d2e03deb323d18e55b4deb13f923583f Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Tue, 11 Feb 2025 11:49:47 +0100
Subject: [PATCH 2476/2913] [nrf fromtree] manifest: Update nRF hw models to
 latest

Update the HW models module to:
5dc34b26662c6ec91edf1174d775d78590b1a05b

Including the following:
* 5dc34b2 CLOCK (52-54): Silly bugfix
* 4f622b7 CLOCK (52-54): Make TASK_*CLKSTOP instantaneous and clear
          LFCLK.STAT
* 07b1bdb RADIO 54: Correct 2 comments related the CCM trigger

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 58b95837d0b50913acc7f6dbe96fd6a61c978415)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 117801531a6..4a5701c11c7 100644
--- a/west.yml
+++ b/west.yml
@@ -315,7 +315,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: 2570f4a697ce2da860ff39ec34afd91749bd66d3
+      revision: 5dc34b26662c6ec91edf1174d775d78590b1a05b
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
       revision: 0f53c9ebab526661131d5d7e73c7a6cb3b2d2e11

From 072a6f748ee724506e182019200a6761bbdeb22f Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Thu, 13 Feb 2025 12:06:22 +0100
Subject: [PATCH 2477/2913] [nrf fromtree] manifest: Update nRF hw models to
 latest

Update the HW models module to
dcfcffeee5c3ad8718723df4b5297caec33c23e7

Including the following:
* dcfcffe UART: Support diffent clocks, correct UART00 clock and fix
          BAUDRATE model

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit aa6d4830ccda8c90588cd9e0b5a3d16f42f922de)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 4a5701c11c7..4e61bfd5cd2 100644
--- a/west.yml
+++ b/west.yml
@@ -315,7 +315,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: 5dc34b26662c6ec91edf1174d775d78590b1a05b
+      revision: dcfcffeee5c3ad8718723df4b5297caec33c23e7
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
       revision: 0f53c9ebab526661131d5d7e73c7a6cb3b2d2e11

From 912cca9e4ad3906ad4357a6fe133c602b187786a Mon Sep 17 00:00:00 2001
From: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Date: Mon, 17 Feb 2025 10:08:03 +0100
Subject: [PATCH 2478/2913] [nrf fromtree] manifest: Update nRF hw models to
 latest

Update the HW models module to
73a5d5827a94820be65b7d276d28173ec10bab9f

Including the following:
* 73a5d58 54 CCM: Fix UBSAN reported issue
          with zero size VLAs

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
(cherry picked from commit c031e127b0fde2f538113f60ff530743da3cbba2)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 4e61bfd5cd2..f1659924fb0 100644
--- a/west.yml
+++ b/west.yml
@@ -315,7 +315,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: dcfcffeee5c3ad8718723df4b5297caec33c23e7
+      revision: 73a5d5827a94820be65b7d276d28173ec10bab9f
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
       revision: 0f53c9ebab526661131d5d7e73c7a6cb3b2d2e11

From c7ceba7644fd84f4163a1df05164be23d5afd5cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Thu, 30 Jan 2025 11:13:01 +0100
Subject: [PATCH 2479/2913] [nrf fromtree] drivers: pwm: nrfx: 0/100% duty for
 PWM120
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fast PWM120 prevents GPIO from driving pin with low/high
state when PWM duty is 0% or 100%. In such case, regular
PWM signal generation needs to be used.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit a71f042a362fa1c2a1d567ac409ad7187bc5086d)
---
 drivers/pwm/pwm_nrfx.c | 51 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 47 insertions(+), 4 deletions(-)

diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index 410aa5c9348..8b853537375 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -46,8 +46,11 @@ LOG_MODULE_REGISTER(pwm_nrfx, CONFIG_PWM_LOG_LEVEL);
 		    (IS_EQ(DT_PHA(PWM(idx), power_domains, id), NRF_GPD_FAST_ACTIVE1)),	\
 		    (0))), (0))
 
-#if (NRFX_FOREACH_PRESENT(PWM, PWM_NRFX_IS_FAST, (||), (0))) && \
-	CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
+#if NRFX_FOREACH_PRESENT(PWM, PWM_NRFX_IS_FAST, (||), (0))
+#define PWM_NRFX_FAST_PRESENT 1
+#endif
+
+#if defined(PWM_NRFX_FAST_PRESENT) && CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
 #define PWM_NRFX_USE_CLOCK_CONTROL 1
 #endif
 
@@ -86,6 +89,18 @@ struct pwm_nrfx_data {
 #error "Current implementation supports maximum 8 channels."
 #endif
 
+#ifdef PWM_NRFX_FAST_PRESENT
+static bool pwm_is_fast(const struct pwm_nrfx_config *config)
+{
+	return config->clock_freq > MHZ(16);
+}
+#else
+static bool pwm_is_fast(const struct pwm_nrfx_config *config)
+{
+	return false;
+}
+#endif
+
 static uint16_t *seq_values_ptr_get(const struct device *dev)
 {
 	const struct pwm_nrfx_config *config = dev->config;
@@ -259,8 +274,20 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 			if (inverted) {
 				out_level ^= 1;
 			}
-
-			nrf_gpio_pin_write(psel, out_level);
+			/* Output of fast PWM instance is directly connected to GPIO pads,
+			 * thus it cannot controlled by GPIO. Use regular 0%/100% duty cycle
+			 * playback instead.
+			 */
+#ifdef PWM_NRFX_FAST_PRESENT
+			if (pwm_is_fast(config)) {
+				nrfx_pwm_simple_playback(&config->pwm, &config->seq, 1,
+							 NRFX_PWM_FLAG_NO_EVT_FINISHED);
+			} else {
+#else
+			{
+#endif
+				nrf_gpio_pin_write(psel, out_level);
+			}
 		}
 
 		data->pwm_needed &= ~BIT(channel);
@@ -275,6 +302,22 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 	 * registers and drives its outputs accordingly.
 	 */
 	if (data->pwm_needed == 0) {
+		if (pwm_is_fast(config)) {
+#if PWM_NRFX_USE_CLOCK_CONTROL
+			if (data->clock_requested) {
+				int ret = nrf_clock_control_release(config->clk_dev,
+							    &config->clk_spec);
+
+				if (ret < 0) {
+					LOG_ERR("Global HSFLL release failed: %d", ret);
+					return ret;
+				}
+
+				data->clock_requested = false;
+			}
+#endif
+			return 0;
+		}
 		int ret = stop_pwm(dev);
 
 		if (ret < 0) {

From 65d9b7d170b9c9a0a945780284ea5bc2ccf994e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= <rafal.kuznia@nordicsemi.no>
Date: Mon, 17 Feb 2025 15:49:07 +0100
Subject: [PATCH 2480/2913] [nrf fromlist] dts: common: nordic: Add power node
 to nRF54L20
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added the node representing the POWER peripheral on the nRF54L20.

Upstream PR #: 85883

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
---
 dts/common/nordic/nrf54l20.dtsi | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 7784342d121..12685c9dce0 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -684,6 +684,32 @@
 				status = "disabled";
 			};
 
+			power: power@10e000 {
+				compatible = "nordic,nrf-power";
+				reg = <0x10e000 0x1000>;
+				ranges = <0x0 0x10e000 0x1000>;
+				interrupts = <270 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				gpregret1: gpregret1@51c {
+					#address-cells = <1>;
+					#size-cells = <1>;
+					compatible = "nordic,nrf-gpregret";
+					reg = <0x51c 0x1>;
+					status = "disabled";
+				};
+
+				gpregret2: gpregret2@520 {
+					#address-cells = <1>;
+					#size-cells = <1>;
+					compatible = "nordic,nrf-gpregret";
+					reg = <0x520 0x1>;
+					status = "disabled";
+				};
+			};
+
 			regulators: regulator@120000 {
 				compatible = "nordic,nrf54l-regulators";
 				reg = <0x120000 0x1000>;

From 0b58ccd3beb0987e3dd7dccc6e4c78bd0a49c7c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= <rafal.kuznia@nordicsemi.no>
Date: Fri, 14 Feb 2025 12:30:17 +0100
Subject: [PATCH 2481/2913] [nrf fromlist] modules: hal_nordic: nrf_802154:
 enable constant latency
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To ensure that the accesses to the radio peripheral are done with
predictable timings, the constant latency must be enabled.
The constant latency mode is enabled alongside the HFXO.

Upstream PR #: 85883

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
---
 modules/hal_nordic/Kconfig                         |  7 +++++++
 .../platform/nrf_802154_clock_zephyr.c             | 14 ++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/modules/hal_nordic/Kconfig b/modules/hal_nordic/Kconfig
index 32ff1a6c74c..8053017170e 100644
--- a/modules/hal_nordic/Kconfig
+++ b/modules/hal_nordic/Kconfig
@@ -36,6 +36,13 @@ menuconfig NRF_802154_RADIO_DRIVER
 
 if NRF_802154_RADIO_DRIVER
 
+config NRF_802154_CONSTLAT_CONTROL
+	def_bool y
+	depends on SOC_SERIES_NRF54LX && NRF_802154_SL_OPENSOURCE
+	select NRF_SYS_EVENT
+	help
+	  Allows the nRF 802.15.4 radio driver to manage the constant latency state.
+
 config NRF_802154_MULTIPROTOCOL_SUPPORT
 	bool
 	help
diff --git a/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c b/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
index a55e63bc589..87aa85261e9 100644
--- a/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
+++ b/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
@@ -12,6 +12,7 @@
 #include <compiler_abstraction.h>
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <nrf_sys_event.h>
 
 static bool hfclk_is_running;
 
@@ -52,6 +53,14 @@ void nrf_802154_clock_hfclk_start(void)
 
 	sys_notify_init_callback(&hfclk_cli.notify, hfclk_on_callback);
 
+	/*
+	 * todo: replace constlat request with PM policy API when
+	 * controlling the event latency becomes possible.
+	 */
+	if (IS_ENABLED(CONFIG_NRF_802154_CONSTLAT_CONTROL)) {
+		nrf_sys_event_request_global_constlat();
+	}
+
 	int ret = onoff_request(mgr, &hfclk_cli);
 	__ASSERT_NO_MSG(ret >= 0);
 	(void)ret;
@@ -67,6 +76,11 @@ void nrf_802154_clock_hfclk_stop(void)
 	int ret = onoff_cancel_or_release(mgr, &hfclk_cli);
 	__ASSERT_NO_MSG(ret >= 0);
 	(void)ret;
+
+	if (IS_ENABLED(CONFIG_NRF_802154_CONSTLAT_CONTROL)) {
+		nrf_sys_event_release_global_constlat();
+	}
+
 	hfclk_is_running = false;
 }
 

From 2bdfddad7d634391aea7a04d5c807e2cab605079 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Thu, 20 Feb 2025 10:45:00 +0000
Subject: [PATCH 2482/2913] [nrf fromlist] cmake: reports: Fix report targets

Fixes report targets where tfm_* and bl2_* targets wrongly
generates a footprint file by having a common target which
consists of RAM and ROM report targets

Upstream PR #: 86067

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
---
 cmake/reports/CMakeLists.txt | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/cmake/reports/CMakeLists.txt b/cmake/reports/CMakeLists.txt
index c9d2783db3f..4383fcf53f0 100644
--- a/cmake/reports/CMakeLists.txt
+++ b/cmake/reports/CMakeLists.txt
@@ -11,7 +11,7 @@ elseif(DEFINED WEST_TOPDIR)
   set(workspace_arg "--workspace=${WEST_TOPDIR}")
 endif()
 
-foreach(report ram_report rom_report footprint)
+foreach(report ram_report rom_report)
   add_custom_target(
     ${report}
     ${PYTHON_EXECUTABLE}
@@ -29,8 +29,13 @@ foreach(report ram_report rom_report footprint)
     )
 endforeach()
 
+add_custom_target(
+  footprint
+  DEPENDS ram_report rom_report
+  )
+
 if(CONFIG_BUILD_WITH_TFM)
-  foreach(report ram_report rom_report footprint)
+  foreach(report ram_report rom_report)
     add_custom_target(
       tfm_${report}
       ${PYTHON_EXECUTABLE}
@@ -47,10 +52,15 @@ if(CONFIG_BUILD_WITH_TFM)
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       )
   endforeach()
+
+  add_custom_target(
+    tfm_footprint
+    DEPENDS tfm_ram_report tfm_rom_report
+    )
 endif()
 
 if(CONFIG_TFM_BL2)
-  foreach(report ram_report rom_report footprint)
+  foreach(report ram_report rom_report)
     add_custom_target(
       bl2_${report}
       ${PYTHON_EXECUTABLE}
@@ -67,6 +77,11 @@ if(CONFIG_TFM_BL2)
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       )
   endforeach()
+
+  add_custom_target(
+    bl2_footprint
+    DEPENDS bl2_ram_report bl2_rom_report
+    )
 endif()
 
 find_program(PUNCOVER puncover)

From dab6e4030986ddc4618a1d60b90a8d3d50b22628 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Thu, 20 Feb 2025 11:38:06 +0000
Subject: [PATCH 2483/2913] [nrf fromlist] cmake: reports: Fix file prefix for
 tfm/bl2

Fixes the prefix for these files to not have _report in them

Upstream PR #: 86067

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
---
 cmake/reports/CMakeLists.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmake/reports/CMakeLists.txt b/cmake/reports/CMakeLists.txt
index 4383fcf53f0..41c1b708732 100644
--- a/cmake/reports/CMakeLists.txt
+++ b/cmake/reports/CMakeLists.txt
@@ -35,9 +35,9 @@ add_custom_target(
   )
 
 if(CONFIG_BUILD_WITH_TFM)
-  foreach(report ram_report rom_report)
+  foreach(report ram rom)
     add_custom_target(
-      tfm_${report}
+      tfm_${report}_report
       ${PYTHON_EXECUTABLE}
       ${ZEPHYR_BASE}/scripts/footprint/size_report
       -k $<TARGET_PROPERTY:tfm,TFM_S_ELF_FILE>
@@ -46,7 +46,7 @@ if(CONFIG_BUILD_WITH_TFM)
       ${workspace_arg}
       -d ${report_depth}
       --json tfm_${report}.json
-      ${flag_for_${report}}
+      ${flag_for_${report}_report}
       DEPENDS tfm
       USES_TERMINAL
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
@@ -60,9 +60,9 @@ if(CONFIG_BUILD_WITH_TFM)
 endif()
 
 if(CONFIG_TFM_BL2)
-  foreach(report ram_report rom_report)
+  foreach(report ram rom)
     add_custom_target(
-      bl2_${report}
+      bl2_${report}_report
       ${PYTHON_EXECUTABLE}
       ${ZEPHYR_BASE}/scripts/footprint/size_report
       -k $<TARGET_PROPERTY:tfm,BL2_ELF_FILE>
@@ -71,7 +71,7 @@ if(CONFIG_TFM_BL2)
       ${workspace_arg}
       -d ${report_depth}
       --json bl2_${report}.json
-      ${flag_for_${report}}
+      ${flag_for_${report}_report}
       DEPENDS tfm
       USES_TERMINAL
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}

From 7b4d2ebd1efdb1397cb303638f34597e893d8d8c Mon Sep 17 00:00:00 2001
From: Magdalena Pastula <magdalena.pastula@nordicsemi.no>
Date: Wed, 19 Feb 2025 10:56:04 +0100
Subject: [PATCH 2484/2913] [nrf noup] tests: drivers: mspi: api: nRF54L15 fix
 frequency

nrf-squash! [nrf noup] tests: drivers: mspi: api: Add nRF54L15 overlay file

Fix device frequency for nRF54L15. SDP MSPI allows only a predefined
set of device frequencies.

Signed-off-by: Magdalena Pastula <magdalena.pastula@nordicsemi.no>
---
 .../drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 3d5db366dc5..96c6f5b3881 100644
--- a/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -18,7 +18,7 @@
 			status = "okay";
 			compatible = "zephyr,mspi-emul-device";
 			reg = <0x0>;
-			mspi-max-frequency = <48000000>;
+			mspi-max-frequency = <DT_FREQ_M(1)>;
 		};
 	};
 };

From 1eff55d390356f3f6b42306986f7a9e44c07db9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 22 Jan 2025 15:05:50 +0100
Subject: [PATCH 2485/2913] [nrf fromtree] logging: frontends: stmesp: Fix
 logging single argument log twice
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Macro was missing a break when single argument with non 32 bit
word argument was detect. Because of that, there were two
logging messages created for a single log entry.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 9b2532ab431b9d7dd5c67f72ab67b8ea271acec3)
---
 subsys/logging/frontends/stmesp/zephyr_custom_log.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/subsys/logging/frontends/stmesp/zephyr_custom_log.h b/subsys/logging/frontends/stmesp/zephyr_custom_log.h
index 9457123886d..62b949cd51f 100644
--- a/subsys/logging/frontends/stmesp/zephyr_custom_log.h
+++ b/subsys/logging/frontends/stmesp/zephyr_custom_log.h
@@ -69,7 +69,8 @@ extern "C" {
 		/* Do turbo logging only if argument fits in 32 bit word. */                       \
 		if (!Z_LOG_STMESP_1_ARG_CHECK(__VA_ARGS__)) {                                      \
 			COND_CODE_1(CONFIG_LOG_FRONTEND_STMESP_TURBO_DROP_OTHERS, (),              \
-				(Z_LOG(_level, __VA_ARGS__)));                             \
+				(Z_LOG(_level, __VA_ARGS__)));                                     \
+			break;                                                                     \
 		}                                                                                  \
 		if (!Z_LOG_LEVEL_ALL_CHECK(_level, __log_current_const_data, _source)) {           \
 			break;                                                                     \

From e95813f27b8f6c5a9a352a1c78d5c021308e4d98 Mon Sep 17 00:00:00 2001
From: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
Date: Tue, 25 Feb 2025 10:21:08 +0100
Subject: [PATCH 2486/2913] Revert "[nrf noup] samples: bluetooth: mesh:
 Disable secure storage for real targets."

This reverts commit 107f9f0cf5369c707282724f7484d708a99ed274.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
---
 samples/bluetooth/mesh/boards/qemu_x86.conf                 | 6 ------
 samples/bluetooth/mesh/prj.conf                             | 2 +-
 samples/bluetooth/mesh_demo/boards/qemu_x86.conf            | 6 ------
 samples/bluetooth/mesh_demo/prj.conf                        | 2 +-
 samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf     | 6 ------
 samples/bluetooth/mesh_provisioner/prj.conf                 | 2 +-
 samples/boards/nordic/mesh/onoff-app/prj.conf               | 2 +-
 .../nordic/mesh/onoff_level_lighting_vnd_app/prj.conf       | 2 +-
 8 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 samples/bluetooth/mesh/boards/qemu_x86.conf
 delete mode 100644 samples/bluetooth/mesh_demo/boards/qemu_x86.conf
 delete mode 100644 samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf

diff --git a/samples/bluetooth/mesh/boards/qemu_x86.conf b/samples/bluetooth/mesh/boards/qemu_x86.conf
deleted file mode 100644
index bfb57193b78..00000000000
--- a/samples/bluetooth/mesh/boards/qemu_x86.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# nrf_security only supports Cortex-M via PSA crypto libraries.
-# Enforcing usage of built-in Mbed TLS for native simulator.
-CONFIG_NRF_SECURITY=n
-CONFIG_MBEDTLS_ENABLE_HEAP=n
-CONFIG_TRUSTED_STORAGE=n
-CONFIG_SECURE_STORAGE=y
diff --git a/samples/bluetooth/mesh/prj.conf b/samples/bluetooth/mesh/prj.conf
index cd7d6532b61..14b19316a86 100644
--- a/samples/bluetooth/mesh/prj.conf
+++ b/samples/bluetooth/mesh/prj.conf
@@ -5,7 +5,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
-# CONFIG_SECURE_STORAGE=y
+CONFIG_SECURE_STORAGE=y
 CONFIG_HWINFO=y
 
 CONFIG_BT=y
diff --git a/samples/bluetooth/mesh_demo/boards/qemu_x86.conf b/samples/bluetooth/mesh_demo/boards/qemu_x86.conf
deleted file mode 100644
index bfb57193b78..00000000000
--- a/samples/bluetooth/mesh_demo/boards/qemu_x86.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# nrf_security only supports Cortex-M via PSA crypto libraries.
-# Enforcing usage of built-in Mbed TLS for native simulator.
-CONFIG_NRF_SECURITY=n
-CONFIG_MBEDTLS_ENABLE_HEAP=n
-CONFIG_TRUSTED_STORAGE=n
-CONFIG_SECURE_STORAGE=y
diff --git a/samples/bluetooth/mesh_demo/prj.conf b/samples/bluetooth/mesh_demo/prj.conf
index b7016b02c65..bcb738ae5bd 100644
--- a/samples/bluetooth/mesh_demo/prj.conf
+++ b/samples/bluetooth/mesh_demo/prj.conf
@@ -31,7 +31,7 @@ CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=600
-# CONFIG_SECURE_STORAGE=y
+CONFIG_SECURE_STORAGE=y
 
 # Limit the number of key slots in PSA Crypto core to reduce
 # RAM footprint
diff --git a/samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf b/samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf
deleted file mode 100644
index bfb57193b78..00000000000
--- a/samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# nrf_security only supports Cortex-M via PSA crypto libraries.
-# Enforcing usage of built-in Mbed TLS for native simulator.
-CONFIG_NRF_SECURITY=n
-CONFIG_MBEDTLS_ENABLE_HEAP=n
-CONFIG_TRUSTED_STORAGE=n
-CONFIG_SECURE_STORAGE=y
diff --git a/samples/bluetooth/mesh_provisioner/prj.conf b/samples/bluetooth/mesh_provisioner/prj.conf
index 24176780516..10949c5480d 100644
--- a/samples/bluetooth/mesh_provisioner/prj.conf
+++ b/samples/bluetooth/mesh_provisioner/prj.conf
@@ -45,7 +45,7 @@ CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=600
-# CONFIG_SECURE_STORAGE=y
+CONFIG_SECURE_STORAGE=y
 
 #CONFIG_BT_MESH_LOG_LEVEL_DBG=y
 #CONFIG_BT_MESH_SETTINGS_LOG_LEVEL_DBG=y
diff --git a/samples/boards/nordic/mesh/onoff-app/prj.conf b/samples/boards/nordic/mesh/onoff-app/prj.conf
index 0783579e795..0e67042b265 100644
--- a/samples/boards/nordic/mesh/onoff-app/prj.conf
+++ b/samples/boards/nordic/mesh/onoff-app/prj.conf
@@ -9,7 +9,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
-# CONFIG_SECURE_STORAGE=y
+CONFIG_SECURE_STORAGE=y
 
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=600
 
diff --git a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
index 96b5466b4a1..3bb984208c7 100644
--- a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
+++ b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
@@ -7,7 +7,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
-# CONFIG_SECURE_STORAGE=y
+CONFIG_SECURE_STORAGE=y
 
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_BROADCASTER=y

From d4452311ef53db6c7deff4c6fe2802bd88c310d9 Mon Sep 17 00:00:00 2001
From: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
Date: Tue, 25 Feb 2025 10:35:24 +0100
Subject: [PATCH 2487/2913] [nrf noup] samples: bluetooth: mesh: Disable secure
 storage for real targets.

Mesh currently works with trusted storage on real targets. Until secure
storage is supported by default disable it.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
---
 samples/bluetooth/mesh/boards/qemu_x86.conf                 | 6 ++++++
 samples/bluetooth/mesh/prj.conf                             | 2 +-
 samples/bluetooth/mesh_demo/boards/qemu_x86.conf            | 6 ++++++
 samples/bluetooth/mesh_demo/prj.conf                        | 2 +-
 samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf     | 6 ++++++
 samples/bluetooth/mesh_provisioner/prj.conf                 | 2 +-
 samples/boards/nordic/mesh/onoff-app/prj.conf               | 2 +-
 .../nordic/mesh/onoff_level_lighting_vnd_app/prj.conf       | 2 +-
 tests/bluetooth/mesh_shell/boards/qemu_x86.conf             | 6 ++++++
 tests/bluetooth/mesh_shell/prj.conf                         | 2 +-
 10 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 samples/bluetooth/mesh/boards/qemu_x86.conf
 create mode 100644 samples/bluetooth/mesh_demo/boards/qemu_x86.conf
 create mode 100644 samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf
 create mode 100644 tests/bluetooth/mesh_shell/boards/qemu_x86.conf

diff --git a/samples/bluetooth/mesh/boards/qemu_x86.conf b/samples/bluetooth/mesh/boards/qemu_x86.conf
new file mode 100644
index 00000000000..bfb57193b78
--- /dev/null
+++ b/samples/bluetooth/mesh/boards/qemu_x86.conf
@@ -0,0 +1,6 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_NRF_SECURITY=n
+CONFIG_MBEDTLS_ENABLE_HEAP=n
+CONFIG_TRUSTED_STORAGE=n
+CONFIG_SECURE_STORAGE=y
diff --git a/samples/bluetooth/mesh/prj.conf b/samples/bluetooth/mesh/prj.conf
index 14b19316a86..cd7d6532b61 100644
--- a/samples/bluetooth/mesh/prj.conf
+++ b/samples/bluetooth/mesh/prj.conf
@@ -5,7 +5,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 CONFIG_HWINFO=y
 
 CONFIG_BT=y
diff --git a/samples/bluetooth/mesh_demo/boards/qemu_x86.conf b/samples/bluetooth/mesh_demo/boards/qemu_x86.conf
new file mode 100644
index 00000000000..bfb57193b78
--- /dev/null
+++ b/samples/bluetooth/mesh_demo/boards/qemu_x86.conf
@@ -0,0 +1,6 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_NRF_SECURITY=n
+CONFIG_MBEDTLS_ENABLE_HEAP=n
+CONFIG_TRUSTED_STORAGE=n
+CONFIG_SECURE_STORAGE=y
diff --git a/samples/bluetooth/mesh_demo/prj.conf b/samples/bluetooth/mesh_demo/prj.conf
index bcb738ae5bd..b7016b02c65 100644
--- a/samples/bluetooth/mesh_demo/prj.conf
+++ b/samples/bluetooth/mesh_demo/prj.conf
@@ -31,7 +31,7 @@ CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=600
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 # Limit the number of key slots in PSA Crypto core to reduce
 # RAM footprint
diff --git a/samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf b/samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf
new file mode 100644
index 00000000000..bfb57193b78
--- /dev/null
+++ b/samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf
@@ -0,0 +1,6 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_NRF_SECURITY=n
+CONFIG_MBEDTLS_ENABLE_HEAP=n
+CONFIG_TRUSTED_STORAGE=n
+CONFIG_SECURE_STORAGE=y
diff --git a/samples/bluetooth/mesh_provisioner/prj.conf b/samples/bluetooth/mesh_provisioner/prj.conf
index 10949c5480d..24176780516 100644
--- a/samples/bluetooth/mesh_provisioner/prj.conf
+++ b/samples/bluetooth/mesh_provisioner/prj.conf
@@ -45,7 +45,7 @@ CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=600
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 #CONFIG_BT_MESH_LOG_LEVEL_DBG=y
 #CONFIG_BT_MESH_SETTINGS_LOG_LEVEL_DBG=y
diff --git a/samples/boards/nordic/mesh/onoff-app/prj.conf b/samples/boards/nordic/mesh/onoff-app/prj.conf
index 0e67042b265..0783579e795 100644
--- a/samples/boards/nordic/mesh/onoff-app/prj.conf
+++ b/samples/boards/nordic/mesh/onoff-app/prj.conf
@@ -9,7 +9,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=600
 
diff --git a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
index 3bb984208c7..96b5466b4a1 100644
--- a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
+++ b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
@@ -7,7 +7,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_BROADCASTER=y
diff --git a/tests/bluetooth/mesh_shell/boards/qemu_x86.conf b/tests/bluetooth/mesh_shell/boards/qemu_x86.conf
new file mode 100644
index 00000000000..bfb57193b78
--- /dev/null
+++ b/tests/bluetooth/mesh_shell/boards/qemu_x86.conf
@@ -0,0 +1,6 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_NRF_SECURITY=n
+CONFIG_MBEDTLS_ENABLE_HEAP=n
+CONFIG_TRUSTED_STORAGE=n
+CONFIG_SECURE_STORAGE=y
diff --git a/tests/bluetooth/mesh_shell/prj.conf b/tests/bluetooth/mesh_shell/prj.conf
index 2af60029568..aab2745d359 100644
--- a/tests/bluetooth/mesh_shell/prj.conf
+++ b/tests/bluetooth/mesh_shell/prj.conf
@@ -14,7 +14,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 CONFIG_BT=y
 CONFIG_BT_OBSERVER=y

From 097b37e74591b7ec0d18d910c94e9c53a35f1313 Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Fri, 3 Jan 2025 17:01:16 +0100
Subject: [PATCH 2488/2913] [nrf fromtree] Bluetooth: TMAP: Remove double
 definitions of TMAP roles support

Both the TMAP kconfig file and public header file defined
which roles were supported.

The Kconfig file options were recently added and were more
up to date (and correct), and allows for other Kconfig files
to use these values, thus allowing for more flexibility when
implementing applications.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit 48ac31c7a2b84ad8f3d12f8284d33d4af2db4cb1)
---
 include/zephyr/bluetooth/audio/tmap.h       | 33 +--------------------
 subsys/bluetooth/audio/shell/tmap.c         | 17 ++++++-----
 tests/bluetooth/tester/src/audio/btp_tmap.c | 16 ++++++----
 3 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/include/zephyr/bluetooth/audio/tmap.h b/include/zephyr/bluetooth/audio/tmap.h
index ad16aead2da..885ae27bea3 100644
--- a/include/zephyr/bluetooth/audio/tmap.h
+++ b/include/zephyr/bluetooth/audio/tmap.h
@@ -3,7 +3,7 @@
  * @brief Header for Bluetooth TMAP.
  *
  * Copyright 2023 NXP
- * Copyright (c) 2024 Nordic Semiconductor ASA
+ * Copyright (c) 2024-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -31,37 +31,6 @@
 #include <zephyr/sys/util.h>
 #include <zephyr/sys/util_macro.h>
 
-/** Call Gateway (CG) supported */
-#define BT_TMAP_CG_SUPPORTED                                                                       \
-	(IS_ENABLED(CONFIG_BT_CAP_INITIATOR) && IS_ENABLED(CONFIG_BT_BAP_UNICAST_CLIENT) &&        \
-	 IS_ENABLED(CONFIG_BT_TBS) && IS_ENABLED(CONFIG_BT_VCP_VOL_CTLR))
-
-/** Call Terminal (CT) supported */
-#define BT_TMAP_CT_SUPPORTED                                                                       \
-	(IS_ENABLED(CONFIG_BT_CAP_ACCEPTOR) && IS_ENABLED(CONFIG_BT_BAP_UNICAST_SERVER) &&         \
-	 IS_ENABLED(CONFIG_BT_TBS_CLIENT) &&                                                       \
-	 (IS_ENABLED(CONFIG_BT_ASCS_ASE_SNK) &&                                                    \
-	  IS_ENABLED(CONFIG_BT_VCP_VOL_REND) == IS_ENABLED(CONFIG_BT_ASCS_ASE_SNK)))
-
-/** Unicast Media Sender (UMS) supported */
-#define BT_TMAP_UMS_SUPPORTED                                                                      \
-	(IS_ENABLED(CONFIG_BT_CAP_INITIATOR) &&                                                    \
-	 IS_ENABLED(CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK) && IS_ENABLED(CONFIG_BT_VCP_VOL_CTLR) && \
-	 IS_ENABLED(CONFIG_BT_MCS))
-
-/** Unicast Media Receiver (UMR) supported */
-#define BT_TMAP_UMR_SUPPORTED                                                                      \
-	(IS_ENABLED(CONFIG_BT_CAP_ACCEPTOR) && IS_ENABLED(CONFIG_BT_ASCS_ASE_SNK) &&               \
-	 IS_ENABLED(CONFIG_BT_VCP_VOL_REND))
-
-/** Broadcast Media Sender (BMS) supported */
-#define BT_TMAP_BMS_SUPPORTED                                                                      \
-	(IS_ENABLED(CONFIG_BT_CAP_INITIATOR) && IS_ENABLED(CONFIG_BT_BAP_BROADCAST_SOURCE))
-
-/** Broadcast Media Receiver (BMR) supported */
-#define BT_TMAP_BMR_SUPPORTED                                                                      \
-	(IS_ENABLED(CONFIG_BT_CAP_ACCEPTOR) && IS_ENABLED(CONFIG_BT_BAP_BROADCAST_SINK))
-
 /** @brief TMAP Role characteristic */
 enum bt_tmap_role {
 	/**
diff --git a/subsys/bluetooth/audio/shell/tmap.c b/subsys/bluetooth/audio/shell/tmap.c
index e81141b8107..e0d62346063 100644
--- a/subsys/bluetooth/audio/shell/tmap.c
+++ b/subsys/bluetooth/audio/shell/tmap.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2023 Nordic Semiconductor ASA
+ * Copyright (c) 2023-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -13,22 +13,25 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <zephyr/autoconf.h>
 #include <zephyr/bluetooth/audio/tmap.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/kernel.h>
 #include <zephyr/shell/shell.h>
 #include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
 
 #include "host/shell/bt.h"
 
 static int cmd_tmap_init(const struct shell *sh, size_t argc, char **argv)
 {
-	const enum bt_tmap_role role = (BT_TMAP_CG_SUPPORTED ? BT_TMAP_ROLE_CG : 0U) |
-				       (BT_TMAP_CT_SUPPORTED ? BT_TMAP_ROLE_CT : 0U) |
-				       (BT_TMAP_UMS_SUPPORTED ? BT_TMAP_ROLE_UMS : 0U) |
-				       (BT_TMAP_UMR_SUPPORTED ? BT_TMAP_ROLE_UMR : 0U) |
-				       (BT_TMAP_BMS_SUPPORTED ? BT_TMAP_ROLE_BMS : 0U) |
-				       (BT_TMAP_BMR_SUPPORTED ? BT_TMAP_ROLE_BMR : 0U);
+	const enum bt_tmap_role role =
+		(IS_ENABLED(CONFIG_BT_TMAP_CG_SUPPORTED) ? BT_TMAP_ROLE_CG : 0U) |
+		(IS_ENABLED(CONFIG_BT_TMAP_CT_SUPPORTED) ? BT_TMAP_ROLE_CT : 0U) |
+		(IS_ENABLED(CONFIG_BT_TMAP_UMS_SUPPORTED) ? BT_TMAP_ROLE_UMS : 0U) |
+		(IS_ENABLED(CONFIG_BT_TMAP_UMR_SUPPORTED) ? BT_TMAP_ROLE_UMR : 0U) |
+		(IS_ENABLED(CONFIG_BT_TMAP_BMS_SUPPORTED) ? BT_TMAP_ROLE_BMS : 0U) |
+		(IS_ENABLED(CONFIG_BT_TMAP_BMR_SUPPORTED) ? BT_TMAP_ROLE_BMR : 0U);
 	int err;
 
 	shell_info(sh, "Registering TMAS with role: 0x%04X", role);
diff --git a/tests/bluetooth/tester/src/audio/btp_tmap.c b/tests/bluetooth/tester/src/audio/btp_tmap.c
index ca4d9466248..765b945c4a8 100644
--- a/tests/bluetooth/tester/src/audio/btp_tmap.c
+++ b/tests/bluetooth/tester/src/audio/btp_tmap.c
@@ -2,13 +2,16 @@
 
 /*
  * Copyright (c) 2024 Codecoup
+ * Copyright (c) 2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <zephyr/autoconf.h>
 #include <zephyr/bluetooth/audio/tmap.h>
 #include "btp/btp.h"
 
 #include <zephyr/logging/log.h>
+#include <zephyr/sys/util_macro.h>
 LOG_MODULE_REGISTER(bttester_tmap, CONFIG_BTTESTER_LOG_LEVEL);
 
 static uint8_t read_supported_commands(const void *cmd, uint16_t cmd_len, void *rsp,
@@ -81,12 +84,13 @@ static const struct btp_handler tmap_handlers[] = {
 
 uint8_t tester_init_tmap(void)
 {
-	const enum bt_tmap_role role = (BT_TMAP_CG_SUPPORTED ? BT_TMAP_ROLE_CG : 0U) |
-				       (BT_TMAP_CT_SUPPORTED ? BT_TMAP_ROLE_CT : 0U) |
-				       (BT_TMAP_UMS_SUPPORTED ? BT_TMAP_ROLE_UMS : 0U) |
-				       (BT_TMAP_UMR_SUPPORTED ? BT_TMAP_ROLE_UMR : 0U) |
-				       (BT_TMAP_BMS_SUPPORTED ? BT_TMAP_ROLE_BMS : 0U) |
-				       (BT_TMAP_BMR_SUPPORTED ? BT_TMAP_ROLE_BMR : 0U);
+	const enum bt_tmap_role role =
+		(IS_ENABLED(CONFIG_BT_TMAP_CG_SUPPORTED) ? BT_TMAP_ROLE_CG : 0U) |
+		(IS_ENABLED(CONFIG_BT_TMAP_CT_SUPPORTED) ? BT_TMAP_ROLE_CT : 0U) |
+		(IS_ENABLED(CONFIG_BT_TMAP_UMS_SUPPORTED) ? BT_TMAP_ROLE_UMS : 0U) |
+		(IS_ENABLED(CONFIG_BT_TMAP_UMR_SUPPORTED) ? BT_TMAP_ROLE_UMR : 0U) |
+		(IS_ENABLED(CONFIG_BT_TMAP_BMS_SUPPORTED) ? BT_TMAP_ROLE_BMS : 0U) |
+		(IS_ENABLED(CONFIG_BT_TMAP_BMR_SUPPORTED) ? BT_TMAP_ROLE_BMR : 0U);
 	int err;
 
 	err = bt_tmap_register(role);

From a1cfd81e820bde3c33a8912821f30cab2cf13dec Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Mon, 10 Feb 2025 10:40:55 +0100
Subject: [PATCH 2489/2913] [nrf fromtree] drivers: adc: nrf_saadc: add pm
 device support

Extend nrf saadc device driver with pm device runtime support.

To preserve previous behavior:

* if pm device is disabled, saadc is resumed on sampling start
  and suspended when sampling done.
* if pm device is enabled only, saadc does nothing on
  sampling start/stop. its resumed on init.
* if pm device runtime is enabled, saadc is got on
  sampling start, and put on sampling stop.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 96c3cd6cd3302f353e7fe9ace842d66d207a4424)
---
 drivers/adc/adc_nrfx_saadc.c | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index a1479ed2fd1..1418ae286f5 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -10,6 +10,8 @@
 #include <zephyr/dt-bindings/adc/nrf-saadc-v3.h>
 #include <zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h>
 #include <zephyr/linker/devicetree_regions.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
 
 #define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
 #include <zephyr/logging/log.h>
@@ -168,6 +170,26 @@ static int adc_convert_acq_time(uint16_t acquisition_time, nrf_saadc_acqtime_t *
 	return result;
 }
 
+static int saadc_pm_hook(const struct device *dev, enum pm_device_action action)
+{
+	ARG_UNUSED(dev);
+
+	switch (action) {
+	case PM_DEVICE_ACTION_SUSPEND:
+		nrf_saadc_disable(NRF_SAADC);
+		return 0;
+
+	case PM_DEVICE_ACTION_RESUME:
+		nrf_saadc_enable(NRF_SAADC);
+		return 0;
+
+	default:
+		break;
+	}
+
+	return -ENOTSUP;
+}
+
 /* Implementation of the ADC driver API function: adc_channel_setup. */
 static int adc_nrfx_channel_setup(const struct device *dev,
 				  const struct adc_channel_cfg *channel_cfg)
@@ -320,7 +342,11 @@ static int adc_nrfx_channel_setup(const struct device *dev,
 
 static void adc_context_start_sampling(struct adc_context *ctx)
 {
+#if defined(CONFIG_PM_DEVICE_RUNTIME)
+	pm_device_runtime_get(DEVICE_DT_INST_GET(0));
+#else
 	nrf_saadc_enable(NRF_SAADC);
+#endif
 
 	if (ctx->sequence.calibrate) {
 		nrf_saadc_task_trigger(NRF_SAADC,
@@ -623,7 +649,12 @@ static void saadc_irq_handler(const struct device *dev)
 		nrf_saadc_event_clear(NRF_SAADC, NRF_SAADC_EVENT_END);
 
 		nrf_saadc_task_trigger(NRF_SAADC, NRF_SAADC_TASK_STOP);
+
+#if defined(CONFIG_PM_DEVICE_RUNTIME)
+		pm_device_runtime_put(DEVICE_DT_INST_GET(0));
+#else
 		nrf_saadc_disable(NRF_SAADC);
+#endif
 
 		if (has_single_ended(&m_data.ctx.sequence)) {
 			correct_single_ended(&m_data.ctx.sequence);
@@ -663,7 +694,7 @@ static int init_saadc(const struct device *dev)
 
 	adc_context_unlock_unconditionally(&m_data.ctx);
 
-	return 0;
+	return pm_device_driver_init(dev, saadc_pm_hook);
 }
 
 static DEVICE_API(adc, adc_nrfx_driver_api) = {
@@ -693,9 +724,10 @@ static DEVICE_API(adc, adc_nrfx_driver_api) = {
 #define SAADC_INIT(inst)						\
 	BUILD_ASSERT((inst) == 0,					\
 		     "multiple instances not supported");		\
+	PM_DEVICE_DT_INST_DEFINE(0, saadc_pm_hook, 1);			\
 	DEVICE_DT_INST_DEFINE(0,					\
 			    init_saadc,					\
-			    NULL,					\
+			    PM_DEVICE_DT_INST_GET(0),			\
 			    NULL,					\
 			    NULL,					\
 			    POST_KERNEL,				\

From b36b947804ec61dde861efb509368f134b8b0a7f Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Mon, 10 Feb 2025 10:39:45 +0100
Subject: [PATCH 2490/2913] [nrf fromtree] dts: nordic,nrf-saadc: set pm device
 runtime auto

Set pm device runtime runtime auto flag to ensure saadc instances
are initialized correctly if pm device runtime is used.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit d01c93c120ff6e2e3428772d7af1936f2153f91f)
---
 dts/arm/nordic/nrf52805.dtsi                   | 1 +
 dts/arm/nordic/nrf52810.dtsi                   | 1 +
 dts/arm/nordic/nrf52811.dtsi                   | 1 +
 dts/arm/nordic/nrf52832.dtsi                   | 1 +
 dts/arm/nordic/nrf52833.dtsi                   | 1 +
 dts/arm/nordic/nrf52840.dtsi                   | 1 +
 dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi | 1 +
 dts/arm/nordic/nrf91_peripherals.dtsi          | 1 +
 dts/common/nordic/nrf54h20.dtsi                | 1 +
 dts/common/nordic/nrf54l09.dtsi                | 1 +
 dts/common/nordic/nrf54l20.dtsi                | 1 +
 dts/common/nordic/nrf54l_05_10_15.dtsi         | 1 +
 dts/common/nordic/nrf9280.dtsi                 | 1 +
 13 files changed, 13 insertions(+)

diff --git a/dts/arm/nordic/nrf52805.dtsi b/dts/arm/nordic/nrf52805.dtsi
index aa9061d4aab..238876e4255 100644
--- a/dts/arm/nordic/nrf52805.dtsi
+++ b/dts/arm/nordic/nrf52805.dtsi
@@ -166,6 +166,7 @@
 			interrupts = <7 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
 			#io-channel-cells = <1>;
+			zephyr,pm-device-runtime-auto;
 		};
 
 		timer0: timer@40008000 {
diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
index 8ed7a32bfec..0155485509e 100644
--- a/dts/arm/nordic/nrf52810.dtsi
+++ b/dts/arm/nordic/nrf52810.dtsi
@@ -170,6 +170,7 @@
 			interrupts = <7 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
 			#io-channel-cells = <1>;
+			zephyr,pm-device-runtime-auto;
 		};
 		timer0: timer@40008000 {
 			compatible = "nordic,nrf-timer";
diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi
index 4c5f4ca58f7..e22ce7b0742 100644
--- a/dts/arm/nordic/nrf52811.dtsi
+++ b/dts/arm/nordic/nrf52811.dtsi
@@ -201,6 +201,7 @@
 			interrupts = <7 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
 			#io-channel-cells = <1>;
+			zephyr,pm-device-runtime-auto;
 		};
 
 		timer0: timer@40008000 {
diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
index f09793f5020..693116c2ffd 100644
--- a/dts/arm/nordic/nrf52832.dtsi
+++ b/dts/arm/nordic/nrf52832.dtsi
@@ -213,6 +213,7 @@
 			interrupts = <7 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
 			#io-channel-cells = <1>;
+			zephyr,pm-device-runtime-auto;
 		};
 
 		timer0: timer@40008000 {
diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi
index a881898a8f3..2a240db0a44 100644
--- a/dts/arm/nordic/nrf52833.dtsi
+++ b/dts/arm/nordic/nrf52833.dtsi
@@ -227,6 +227,7 @@
 			interrupts = <7 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
 			#io-channel-cells = <1>;
+			zephyr,pm-device-runtime-auto;
 		};
 
 		timer0: timer@40008000 {
diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index e331e8b422f..eab9c8454ee 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -215,6 +215,7 @@
 			interrupts = <7 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
 			#io-channel-cells = <1>;
+			zephyr,pm-device-runtime-auto;
 		};
 
 		timer0: timer@40008000 {
diff --git a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
index 75c2eb9f99f..244459a0f16 100644
--- a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
@@ -287,6 +287,7 @@ adc: adc@e000 {
 	interrupts = <14 NRF_DEFAULT_IRQ_PRIORITY>;
 	status = "disabled";
 	#io-channel-cells = <1>;
+	zephyr,pm-device-runtime-auto;
 };
 
 timer0: timer@f000 {
diff --git a/dts/arm/nordic/nrf91_peripherals.dtsi b/dts/arm/nordic/nrf91_peripherals.dtsi
index 58cc3142bcf..476f8415853 100644
--- a/dts/arm/nordic/nrf91_peripherals.dtsi
+++ b/dts/arm/nordic/nrf91_peripherals.dtsi
@@ -26,6 +26,7 @@ adc: adc@e000 {
 	interrupts = <14 NRF_DEFAULT_IRQ_PRIORITY>;
 	status = "disabled";
 	#io-channel-cells = <1>;
+	zephyr,pm-device-runtime-auto;
 };
 
 dppic0: dppic: dppic@17000 {
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 77b8dc9fb55..0f972e8863a 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -888,6 +888,7 @@
 				status = "disabled";
 				#io-channel-cells = <1>;
 				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			comp: comparator@983000 {
diff --git a/dts/common/nordic/nrf54l09.dtsi b/dts/common/nordic/nrf54l09.dtsi
index b86e4c9607e..1646f7ce4a5 100644
--- a/dts/common/nordic/nrf54l09.dtsi
+++ b/dts/common/nordic/nrf54l09.dtsi
@@ -388,6 +388,7 @@
 				interrupts = <213 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				#io-channel-cells = <1>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			temp: temp@d7000 {
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 12685c9dce0..5e3ba49e7cf 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -459,6 +459,7 @@
 				interrupts = <213 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				#io-channel-cells = <1>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			nfct: nfct@d6000 {
diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi
index 660b2b4769f..0ecad83092e 100644
--- a/dts/common/nordic/nrf54l_05_10_15.dtsi
+++ b/dts/common/nordic/nrf54l_05_10_15.dtsi
@@ -500,6 +500,7 @@
 				interrupts = <213 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				#io-channel-cells = <1>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			nfct: nfct@d6000 {
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 2df403e78f2..0907be9d9a6 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -706,6 +706,7 @@
 				interrupts = <386 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				#io-channel-cells = <1>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			comp: comparator@983000 {

From a35da4f90d3a8acdb6c5afad946032d94f4bdb2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Battrel?= <theo.battrel@nordicsemi.no>
Date: Thu, 20 Feb 2025 08:42:15 +0100
Subject: [PATCH 2491/2913] [nrf fromlist] Bluetooth: Host: Use `memset` to
 initialize `psa_mac_operation_t`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In `db_hash_setup()` the state object for MAC operations was initialized
using `psa_mac_operation_init()`. This function was not always optimized
or inlined.

A way to reduce stack usage is to use `memset()` and set the object to
0. This is one of the option documented to initialize
`psa_mac_operation_t` object.

Upstream PR #: 86094

Signed-off-by: Théo Battrel <theo.battrel@nordicsemi.no>
---
 subsys/bluetooth/host/gatt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/bluetooth/host/gatt.c b/subsys/bluetooth/host/gatt.c
index 7ea10083d0f..688512b74f8 100644
--- a/subsys/bluetooth/host/gatt.c
+++ b/subsys/bluetooth/host/gatt.c
@@ -717,7 +717,7 @@ static int db_hash_setup(struct gen_hash_state *state, uint8_t *key)
 		LOG_ERR("Unable to import the key for AES CMAC %d", ret);
 		return -EIO;
 	}
-	state->operation = psa_mac_operation_init();
+	memset(&state->operation, 0, sizeof(state->operation));
 
 	ret = psa_mac_sign_setup(&(state->operation), state->key, PSA_ALG_CMAC);
 	if (ret != PSA_SUCCESS) {

From 454583293f36eca5bcdaaca8c65128945fe0c862 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Mon, 27 Jan 2025 13:19:24 +0100
Subject: [PATCH 2492/2913] [nrf fromtree] soc: nordic: nrf54h: gpd: yield() to
 not block if main is coop

The main thread, if configured with coop priority (don't do that :D)
breaks gpd since it has a non yielding while loop (also don't do that)

Add an explicit yield() to allow other threads to run if main or other
threads use gpd with coop prio.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 7e0e583f9e303f9f457f9e6310b8a8ed2cda07c1)
---
 soc/nordic/nrf54h/gpd/gpd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/soc/nordic/nrf54h/gpd/gpd.c b/soc/nordic/nrf54h/gpd/gpd.c
index 5c7efcf543a..5e5f0b2dae1 100644
--- a/soc/nordic/nrf54h/gpd/gpd.c
+++ b/soc/nordic/nrf54h/gpd/gpd.c
@@ -139,6 +139,8 @@ static int nrf_gpd_sync(struct gpd_onoff_manager *gpd_mgr)
 		if (atomic_test_bit(&gpd_service_status, GPD_SERVICE_REQ_OK)) {
 			return 0;
 		}
+
+		k_yield();
 	}
 
 	LOG_ERR("nRFs GDPWR request timed out");

From 1bf500b0c51d8e04336b76d39437d408e3348956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 24 Feb 2025 16:29:09 +0100
Subject: [PATCH 2493/2913] [nrf fromlist] drivers: mbox: nrf_vevif_event_tx:
 Fix errata 16 workaround
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pend until requested event is set before clearing it. Without that
check event could be cleared too early and APP core is not waken up.

Upstream PR #: 86249

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 drivers/mbox/mbox_nrf_vevif_event_tx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mbox/mbox_nrf_vevif_event_tx.c b/drivers/mbox/mbox_nrf_vevif_event_tx.c
index f7703c8d3b8..38898d37bf7 100644
--- a/drivers/mbox/mbox_nrf_vevif_event_tx.c
+++ b/drivers/mbox/mbox_nrf_vevif_event_tx.c
@@ -40,7 +40,7 @@ static int vevif_event_tx_send(const struct device *dev, uint32_t id, const stru
 	nrf_vpr_csr_vevif_events_trigger(BIT(id));
 
 #if defined(CONFIG_MBOX_NRF_VEVIF_EVENT_USE_54L_ERRATA_16)
-	while (!nrf_vpr_csr_vevif_events_get()) {
+	while (!(nrf_vpr_csr_vevif_events_get() & BIT(id))) {
 		;
 	}
 	nrf_vpr_csr_vevif_events_set(0);

From 7e1ff38ef6067e643960ba0dfd033cfbff6b86a5 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Wed, 26 Feb 2025 08:27:56 +0100
Subject: [PATCH 2494/2913] [nrf fromlist] drivers: clock_control: nrf fll16
 remove closed loop impl

Remove the closed loop mode implementation for the fll16m clock.
Closed loop causes a hardware bug resulting in increased current
consumption if SoC experiences high, but within spec, temperatures.

Upstream PR #: 86339

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 .../clock_control/clock_control_nrf2_fll16m.c | 27 +------------------
 dts/bindings/clock/nordic,nrf-fll16m.yaml     |  7 -----
 dts/common/nordic/nrf54h20.dtsi               |  1 -
 3 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/drivers/clock_control/clock_control_nrf2_fll16m.c b/drivers/clock_control/clock_control_nrf2_fll16m.c
index cbec791aa77..69b551e1a45 100644
--- a/drivers/clock_control/clock_control_nrf2_fll16m.c
+++ b/drivers/clock_control/clock_control_nrf2_fll16m.c
@@ -21,7 +21,7 @@ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
 #define FLAG_HFXO_STARTED BIT(FLAGS_COMMON_BITS)
 
 #define FLL16M_MODE_OPEN_LOOP   0
-#define FLL16M_MODE_CLOSED_LOOP 1
+#define FLL16M_MODE_CLOSED_LOOP 1 /* <-- DO NOT IMPLEMENT, CAN CAUSE HARDWARE BUG */
 #define FLL16M_MODE_BYPASS      2
 #define FLL16M_MODE_DEFAULT     FLL16M_MODE_OPEN_LOOP
 
@@ -29,7 +29,6 @@ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
 
 #define FLL16M_HFXO_ACCURACY DT_PROP(FLL16M_HFXO_NODE, accuracy_ppm)
 #define FLL16M_OPEN_LOOP_ACCURACY DT_INST_PROP(0, open_loop_accuracy_ppm)
-#define FLL16M_CLOSED_LOOP_BASE_ACCURACY DT_INST_PROP(0, closed_loop_base_accuracy_ppm)
 #define FLL16M_MAX_ACCURACY FLL16M_HFXO_ACCURACY
 
 #define BICR (NRF_BICR_Type *)DT_REG_ADDR(DT_NODELABEL(bicr))
@@ -43,9 +42,6 @@ static struct clock_options {
 		.accuracy = FLL16M_OPEN_LOOP_ACCURACY,
 		.mode = FLL16M_MODE_OPEN_LOOP,
 	},
-	{
-		.mode = FLL16M_MODE_CLOSED_LOOP,
-	},
 	{
 		/* Bypass mode uses HFXO */
 		.accuracy = FLL16M_HFXO_ACCURACY,
@@ -225,27 +221,6 @@ static int api_get_rate_fll16m(const struct device *dev,
 static int fll16m_init(const struct device *dev)
 {
 	struct fll16m_dev_data *dev_data = dev->data;
-	nrf_bicr_lfosc_mode_t lfosc_mode;
-
-	clock_options[1].accuracy = FLL16M_CLOSED_LOOP_BASE_ACCURACY;
-
-	/* Closed-loop mode uses LFXO as source if present, HFXO otherwise */
-	lfosc_mode = nrf_bicr_lfosc_mode_get(BICR);
-
-	if (lfosc_mode != NRF_BICR_LFOSC_MODE_UNCONFIGURED &&
-	    lfosc_mode != NRF_BICR_LFOSC_MODE_DISABLED) {
-		int ret;
-		uint16_t accuracy;
-
-		ret = lfosc_get_accuracy(&accuracy);
-		if (ret < 0) {
-			return ret;
-		}
-
-		clock_options[1].accuracy += accuracy;
-	} else {
-		clock_options[1].accuracy += FLL16M_HFXO_ACCURACY;
-	}
 
 	return clock_config_init(&dev_data->clk_cfg,
 				 ARRAY_SIZE(dev_data->clk_cfg.onoff),
diff --git a/dts/bindings/clock/nordic,nrf-fll16m.yaml b/dts/bindings/clock/nordic,nrf-fll16m.yaml
index eca813fbdbc..8c7187965ae 100644
--- a/dts/bindings/clock/nordic,nrf-fll16m.yaml
+++ b/dts/bindings/clock/nordic,nrf-fll16m.yaml
@@ -18,7 +18,6 @@ description: |
 
     fll16m {
             open-loop-accuracy-ppm = <20000>;
-            closed-loop-base-accuracy-ppm = <5000>;
             clocks = <&hfxo>, <&lfxo>;
             clock-names = "hfxo", "lfxo";
     };
@@ -34,9 +33,3 @@ properties:
   open-loop-accuracy-ppm:
     type: int
     description: Clock accuracy in parts per million if open-loop clock source is used.
-
-  closed-loop-base-accuracy-ppm:
-    type: int
-    description: |
-      Base clock accuracy in parts per million if closed-loop clock source is used.
-      The actual accuracy is this property plus the accuracy of the HFXO or LFXO.
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 0f972e8863a..cddcbcd0790 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -176,7 +176,6 @@
 			#clock-cells = <0>;
 			clock-frequency = <DT_FREQ_M(16)>;
 			open-loop-accuracy-ppm = <20000>;
-			closed-loop-base-accuracy-ppm = <5000>;
 			clocks = <&hfxo>, <&lfxo>;
 			clock-names = "hfxo", "lfxo";
 		};

From aaad8ca7aeb824253486d518bc87af77c35a8095 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Wed, 26 Feb 2025 09:01:28 +0100
Subject: [PATCH 2495/2913] [nrf fromlist] tests: drivers: clock_control:
 nrf_clock_control: update fll16m

Update the nrf clock control test suite to not attempt to set the
removed closed loop mode of the fll16m clock.

Upstream PR #: 86339

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 tests/drivers/clock_control/nrf_clock_control/src/main.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/drivers/clock_control/nrf_clock_control/src/main.c b/tests/drivers/clock_control/nrf_clock_control/src/main.c
index 1f12969eb3d..7d3305df5ce 100644
--- a/tests/drivers/clock_control/nrf_clock_control/src/main.c
+++ b/tests/drivers/clock_control/nrf_clock_control/src/main.c
@@ -41,11 +41,6 @@ const struct nrf_clock_spec test_clk_specs_fll16m[] = {
 		.accuracy = 20000,
 		.precision = NRF_CLOCK_CONTROL_PRECISION_DEFAULT,
 	},
-	{
-		.frequency = MHZ(16),
-		.accuracy = 5020,
-		.precision = NRF_CLOCK_CONTROL_PRECISION_DEFAULT,
-	},
 	{
 		.frequency = MHZ(16),
 		.accuracy = 30,

From a596b2d3591fb9c1cd604df080cf776d7c37bd6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 21 Feb 2025 12:23:42 +0100
Subject: [PATCH 2496/2913] [nrf fromlist] tests: kernel: usage:
 thread_runtime_stats: Improve test_all_stats_usage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Improve robustness of test_all_stats_usage test. Test was relying on a
fact that system did not go to idle before this test is run. It means
that it was assuming that it will be the first test which might not be
true. Additionally, on some targets there might be some idle waits
during system boot. Test is adjusted to validate gathered statistics
with an assumption that there might have been idle period prior to the
test.

Upstream PR #: 86139

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 .../src/test_thread_runtime_stats.c           | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/tests/kernel/usage/thread_runtime_stats/src/test_thread_runtime_stats.c b/tests/kernel/usage/thread_runtime_stats/src/test_thread_runtime_stats.c
index ff0ceeac7c8..be5a1fc9974 100644
--- a/tests/kernel/usage/thread_runtime_stats/src/test_thread_runtime_stats.c
+++ b/tests/kernel/usage/thread_runtime_stats/src/test_thread_runtime_stats.c
@@ -100,16 +100,16 @@ ZTEST(usage_api, test_all_stats_usage)
 
 	/*
 	 * Verify that before the system idles for 2 ticks that
-	 * [execution_cycles] is increasing, [total_cycles] matches
+	 * [execution_cycles] is increasing, [total_cycles + idle_cycles] matches
 	 * [execution_cycles] and [idle_cycles] is not changing (as the
-	 * system has been idle yet.
+	 * system is not going to idle during that test).
 	 */
 
 	zassert_true(stats2.execution_cycles > stats1.execution_cycles);
 	zassert_true(stats3.execution_cycles > stats2.execution_cycles);
-	zassert_true(stats1.execution_cycles == stats1.total_cycles);
-	zassert_true(stats2.execution_cycles == stats2.total_cycles);
-	zassert_true(stats3.execution_cycles == stats3.total_cycles);
+	zassert_true(stats1.execution_cycles == (stats1.total_cycles + stats1.idle_cycles));
+	zassert_true(stats2.execution_cycles == (stats2.total_cycles + stats2.idle_cycles));
+	zassert_true(stats3.execution_cycles == (stats3.total_cycles + stats3.idle_cycles));
 #ifdef CONFIG_SCHED_THREAD_USAGE_ALL
 	zassert_true(stats1.idle_cycles == stats2.idle_cycles);
 	zassert_true(stats1.idle_cycles == stats3.idle_cycles);
@@ -122,8 +122,8 @@ ZTEST(usage_api, test_all_stats_usage)
 	 * going idle.
 	 * 1. [current_cycles] increases.
 	 * 2. [peak_cycles] matches [current_cycles].
-	 * 3. [average_cycles] is 0 (because system has not gone idle yet)
-	 * 4. [current_cycles] matches [execution_cycles].
+	 * 3. [average_cycles] is 0 if system has not gone idle yet
+	 * 4. [current_cycles] matches [execution_cycles] if system has not gone idle yet
 	 */
 
 	zassert_true(stats2.current_cycles > stats1.current_cycles);
@@ -133,13 +133,19 @@ ZTEST(usage_api, test_all_stats_usage)
 	zassert_true(stats2.peak_cycles == stats2.current_cycles);
 	zassert_true(stats3.peak_cycles == stats3.current_cycles);
 
-	zassert_true(stats1.average_cycles == 0);
-	zassert_true(stats2.average_cycles == 0);
-	zassert_true(stats3.average_cycles == 0);
-
-	zassert_true(stats1.current_cycles == stats1.execution_cycles);
-	zassert_true(stats2.current_cycles == stats2.execution_cycles);
-	zassert_true(stats3.current_cycles == stats3.execution_cycles);
+	if (stats1.idle_cycles == 0) {
+		zassert_true(stats1.average_cycles == 0);
+		zassert_true(stats2.average_cycles == 0);
+		zassert_true(stats3.average_cycles == 0);
+
+		zassert_true(stats1.current_cycles == stats1.execution_cycles);
+		zassert_true(stats2.current_cycles == stats2.execution_cycles);
+		zassert_true(stats3.current_cycles == stats3.execution_cycles);
+	} else {
+		zassert_true(stats1.current_cycles < stats1.execution_cycles);
+		zassert_true(stats2.current_cycles < stats2.execution_cycles);
+		zassert_true(stats3.current_cycles < stats3.execution_cycles);
+	}
 #endif
 
 	/*
@@ -172,7 +178,7 @@ ZTEST(usage_api, test_all_stats_usage)
 					   stats3.peak_cycles, IDLE_EVENT_STATS_PRECISION), NULL);
 	zassert_true(stats4.peak_cycles == stats5.peak_cycles);
 
-	zassert_true(stats4.average_cycles > stats3.average_cycles);
+	zassert_true(stats4.average_cycles > 0);
 	zassert_true(stats5.average_cycles > stats4.average_cycles);
 #endif
 

From 6147494082221c0d8e03f0fc2190f0e1c15db233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 4 Feb 2025 07:59:33 +0100
Subject: [PATCH 2497/2913] [nrf fromlist] logging: frontend_stmesp: Fix string
 addresses from remote core
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When decoding logs from a remote core with memory that APP can
access, wrong address of an array with string addresses was used.
Log message contains index of a string and APP strings array was
used instead of remote core. Extend STMESP logging so that address
of string array of a remote core is send during startup to the APP
and APP is using this array to decode strings from remote cores.
Bug applies only to PPR and FLPR as APP has no access to RAD memory.

Upstream PR #: 86242

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 drivers/misc/coresight/nrf_etr.c              | 10 +--
 include/zephyr/logging/log_frontend_stmesp.h  |  9 +--
 .../logging/log_frontend_stmesp_demux.h       |  1 +
 .../logging/frontends/log_frontend_stmesp.c   |  3 +
 .../frontends/log_frontend_stmesp_demux.c     | 71 +++++++++++++++----
 5 files changed, 70 insertions(+), 24 deletions(-)

diff --git a/drivers/misc/coresight/nrf_etr.c b/drivers/misc/coresight/nrf_etr.c
index 11d2240d861..bf1aecd6f5b 100644
--- a/drivers/misc/coresight/nrf_etr.c
+++ b/drivers/misc/coresight/nrf_etr.c
@@ -203,13 +203,13 @@ static void trace_point_process(struct log_frontend_stmesp_demux_trace_point *pa
 	static const char *tp_d32 = "%d %08x";
 	const char *dname = stm_m_name[packet->major];
 	static const char *sname = "tp";
-	const char **lptr;
+	const char *lptr;
 
 	if (packet->id >= CONFIG_LOG_FRONTEND_STMESP_TURBO_LOG_BASE) {
-		TYPE_SECTION_GET(const char *, log_stmesp_ptr,
-				 packet->id - CONFIG_LOG_FRONTEND_STMESP_TURBO_LOG_BASE, &lptr);
-		uint8_t level = (uint8_t)((*lptr)[0]) - (uint8_t)'0';
-		const char *ptr = *lptr + 1;
+		lptr = log_frontend_stmesp_demux_str_get(packet->major,
+				packet->id - CONFIG_LOG_FRONTEND_STMESP_TURBO_LOG_BASE);
+		uint8_t level = (uint8_t)(lptr[0]) - (uint8_t)'0';
+		const char *ptr = lptr + 1;
 		static const union cbprintf_package_hdr desc0 = {
 			.desc = {.len = 2 /* hdr + fmt */}};
 		static const union cbprintf_package_hdr desc1 = {
diff --git a/include/zephyr/logging/log_frontend_stmesp.h b/include/zephyr/logging/log_frontend_stmesp.h
index e2b7a2159a5..38f33bf62f1 100644
--- a/include/zephyr/logging/log_frontend_stmesp.h
+++ b/include/zephyr/logging/log_frontend_stmesp.h
@@ -106,16 +106,17 @@ TYPE_SECTION_START_EXTERN(const char *, log_stmesp_ptr);
  * @param _source Pointer to the source structure.
  * @param ... String.
  */
+
 #define LOG_FRONTEND_STMESP_LOG0(_source, ...)                                                     \
 	do {                                                                                       \
 		static const char _str[] __in_section(_log_stmesp_str, static, _)                  \
 			__used __noasan __aligned(sizeof(uint32_t)) = GET_ARG_N(1, __VA_ARGS__);   \
 		static const char *_str_ptr __in_section(_log_stmesp_ptr, static, _)               \
 			__used __noasan = _str;                                                    \
-		uint32_t idx =                                                                     \
+		uint32_t _idx =                                                                    \
 			((uintptr_t)&_str_ptr - (uintptr_t)TYPE_SECTION_START(log_stmesp_ptr)) /   \
 			sizeof(void *);                                                            \
-		log_frontend_stmesp_log0(_source, idx);                                            \
+		log_frontend_stmesp_log0(_source, _idx);                                           \
 	} while (0)
 
 /** @brief Macro for handling a turbo log message with one argument.
@@ -129,10 +130,10 @@ TYPE_SECTION_START_EXTERN(const char *, log_stmesp_ptr);
 			__used __noasan __aligned(sizeof(uint32_t)) = GET_ARG_N(1, __VA_ARGS__);   \
 		static const char *_str_ptr __in_section(_log_stmesp_ptr, static, _)               \
 			__used __noasan = _str;                                                    \
-		uint32_t idx =                                                                     \
+		uint32_t _idx =                                                                    \
 			((uintptr_t)&_str_ptr - (uintptr_t)TYPE_SECTION_START(log_stmesp_ptr)) /   \
 			sizeof(void *);                                                            \
-		log_frontend_stmesp_log1(_source, idx, (uintptr_t)(GET_ARG_N(2, __VA_ARGS__)));    \
+		log_frontend_stmesp_log1(_source, _idx, (uintptr_t)(GET_ARG_N(2, __VA_ARGS__)));   \
 	} while (0)
 
 #ifdef __cplusplus
diff --git a/include/zephyr/logging/log_frontend_stmesp_demux.h b/include/zephyr/logging/log_frontend_stmesp_demux.h
index 728ce4011ff..1a32ff27218 100644
--- a/include/zephyr/logging/log_frontend_stmesp_demux.h
+++ b/include/zephyr/logging/log_frontend_stmesp_demux.h
@@ -290,6 +290,7 @@ void log_frontend_stmesp_demux_free(union log_frontend_stmesp_demux_packet packe
  *         cannot be retrieved.
  */
 const char *log_frontend_stmesp_demux_sname_get(uint32_t m_id, uint16_t s_id);
+const char *log_frontend_stmesp_demux_str_get(uint32_t m_id, uint16_t s_id);
 
 /** @brief Check if there are any started but not completed log messages.
  *
diff --git a/subsys/logging/frontends/log_frontend_stmesp.c b/subsys/logging/frontends/log_frontend_stmesp.c
index 4c6dd93dfe7..f9bfc4ddc07 100644
--- a/subsys/logging/frontends/log_frontend_stmesp.c
+++ b/subsys/logging/frontends/log_frontend_stmesp.c
@@ -589,10 +589,13 @@ void log_frontend_init(void)
 	TYPE_SECTION_START_EXTERN(struct log_source_const_data, log_const);
 	STMESP_Type *stm_esp;
 	uintptr_t log_const_start;
+	uintptr_t log_str_start;
 
 	(void)stmesp_get_port(CONFIG_LOG_FRONTEND_STPESP_TURBO_SOURCE_PORT_ID, &stm_esp);
 	log_const_start = (uintptr_t)TYPE_SECTION_START(log_const);
+	log_str_start = (uintptr_t)TYPE_SECTION_START(log_stmesp_ptr);
 	STM_D32(stm_esp, log_const_start, false, true);
+	STM_D32(stm_esp, log_str_start, false, true);
 #endif
 }
 
diff --git a/subsys/logging/frontends/log_frontend_stmesp_demux.c b/subsys/logging/frontends/log_frontend_stmesp_demux.c
index e46dadc652f..3f922b7417c 100644
--- a/subsys/logging/frontends/log_frontend_stmesp_demux.c
+++ b/subsys/logging/frontends/log_frontend_stmesp_demux.c
@@ -5,6 +5,7 @@
  */
 
 #include <zephyr/logging/log_frontend_stmesp_demux.h>
+#include <zephyr/logging/log_frontend_stmesp.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/sys/mpsc_pbuf.h>
 #include <zephyr/sys/__assert.h>
@@ -43,9 +44,25 @@ struct log_frontend_stmesp_demux_active_entry {
 	int off;
 };
 
-struct log_frontend_stmesp_coop_sources {
+/* Coprocessors (FLPR, PPR) sends location where APP can find strings and logging
+ * source names utilizing the fact that APP has access to FLPR/PPR memory if it is
+ * an owner of that coprocessor. During the initialization FLPR/PPR sends 2 DMTS32
+ * to the specific channel. First word is an address where logging source constant
+ * data section is located and second is where a section with addresses to constant
+ * strings used for logging is located.
+ */
+struct log_frontend_stmesp_coproc_sources {
 	uint32_t m_id;
-	const struct log_source_const_data *log_const;
+	uint32_t data_cnt;
+	union {
+		struct {
+			const struct log_source_const_data *log_const;
+			uintptr_t *log_str_section;
+		} data;
+		struct {
+			uintptr_t data[2];
+		} raw_data;
+	};
 };
 
 struct log_frontend_stmesp_demux {
@@ -72,7 +89,7 @@ struct log_frontend_stmesp_demux {
 
 	uint32_t dropped;
 
-	struct log_frontend_stmesp_coop_sources coop_sources[2];
+	struct log_frontend_stmesp_coproc_sources coproc_sources[2];
 };
 
 struct log_frontend_stmesp_entry_source_pair {
@@ -404,10 +421,33 @@ const char *log_frontend_stmesp_demux_sname_get(uint32_t m_id, uint16_t s_id)
 
 	if (demux.m_ids[m_id] == APP_M_ID) {
 		return log_source_name_get(0, s_id);
-	} else if (m_id == demux.coop_sources[0].m_id) {
-		return demux.coop_sources[0].log_const[s_id].name;
-	} else if (m_id == demux.coop_sources[1].m_id) {
-		return demux.coop_sources[1].log_const[s_id].name;
+	} else if (m_id == demux.coproc_sources[0].m_id) {
+		return demux.coproc_sources[0].data.log_const[s_id].name;
+	} else if (m_id == demux.coproc_sources[1].m_id) {
+		return demux.coproc_sources[1].data.log_const[s_id].name;
+	}
+
+	return "unknown";
+}
+
+const char *log_frontend_stmesp_demux_str_get(uint32_t m_id, uint16_t s_id)
+{
+	if (!IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_TURBO_LOG)) {
+		return "";
+	}
+
+	uintptr_t *log_str_start = NULL;
+
+	if (demux.m_ids[m_id] == APP_M_ID) {
+		log_str_start = (uintptr_t *)TYPE_SECTION_START(log_stmesp_ptr);
+	} else if (m_id == demux.coproc_sources[0].m_id) {
+		log_str_start = demux.coproc_sources[0].data.log_str_section;
+	} else if (m_id == demux.coproc_sources[1].m_id) {
+		log_str_start = demux.coproc_sources[1].data.log_str_section;
+	}
+
+	if (log_str_start) {
+		return (const char *)log_str_start[s_id];
 	}
 
 	return "unknown";
@@ -439,15 +479,16 @@ int log_frontend_stmesp_demux_packet_start(uint32_t *data, uint64_t *ts)
 
 	if (IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_TURBO_LOG) &&
 	    (ch == CONFIG_LOG_FRONTEND_STPESP_TURBO_SOURCE_PORT_ID)) {
-		if (demux.m_ids[m] == FLPR_M_ID) {
-			demux.coop_sources[0].m_id = m;
-			demux.coop_sources[0].log_const =
-				(const struct log_source_const_data *)(uintptr_t)*data;
-		} else if (demux.m_ids[m] == PPR_M_ID) {
-			demux.coop_sources[1].m_id = m;
-			demux.coop_sources[1].log_const =
-				(const struct log_source_const_data *)(uintptr_t)*data;
+		struct log_frontend_stmesp_coproc_sources *src =
+			&demux.coproc_sources[demux.m_ids[m] == FLPR_M_ID ? 0 : 1];
+
+		if (src->data_cnt >= 2) {
+			/* Unexpected packet. */
+			return -EINVAL;
 		}
+
+		src->m_id = m;
+		src->raw_data.data[src->data_cnt++] = (uintptr_t)*data;
 		return 0;
 	}
 

From 769a5736fdc342dfb6f51445fa3f3b590667af7c Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 20 Feb 2025 16:17:38 +0100
Subject: [PATCH 2498/2913] [nrf fromlist] ipc: ipc_service: Parametrize
 workqueue stack size

Add `IPC_SERVICE_BACKEND_ICBMSG_EP_BOUND_WORK_Q_STACK_SIZE` config
and parametrize its value depending on the optimization level.

Upstream PR #: 86103

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 subsys/ipc/ipc_service/backends/Kconfig.icbmsg | 8 ++++++++
 subsys/ipc/ipc_service/backends/ipc_icbmsg.c   | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/subsys/ipc/ipc_service/backends/Kconfig.icbmsg b/subsys/ipc/ipc_service/backends/Kconfig.icbmsg
index e31b5cadd77..3a34c63c06c 100644
--- a/subsys/ipc/ipc_service/backends/Kconfig.icbmsg
+++ b/subsys/ipc/ipc_service/backends/Kconfig.icbmsg
@@ -23,6 +23,14 @@ config IPC_SERVICE_BACKEND_ICBMSG_NUM_EP
 	  backend. The number of endpoints are applied to all the instances,
 	  so this value should be maximum number among all the instances.
 
+config IPC_SERVICE_BACKEND_ICBMSG_EP_BOUND_WORK_Q_STACK_SIZE
+	int "Workqueue stack size"
+	default 1024 if NO_OPTIMIZATIONS
+	default 512
+	help
+	  Workqueue stack size for bounding processing
+	  (this configuration is not optimized).
+
 module = IPC_SERVICE_BACKEND_ICBMSG
 module-str = ICMSG backend with separate buffers
 module-help = Sets log level for ICMsg backend with buffers
diff --git a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
index 7e985aa76de..f74aafc8ce2 100644
--- a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
+++ b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
@@ -118,7 +118,8 @@ LOG_MODULE_REGISTER(ipc_icbmsg,
 #define FLAG_EPT_COUNT_MASK 0xFFFF
 
 /** Workqueue stack size for bounding processing (this configuration is not optimized). */
-#define EP_BOUND_WORK_Q_STACK_SIZE (512U)
+#define EP_BOUND_WORK_Q_STACK_SIZE \
+	(CONFIG_IPC_SERVICE_BACKEND_ICBMSG_EP_BOUND_WORK_Q_STACK_SIZE)
 
 /** Workqueue priority for bounding processing. */
 #define EP_BOUND_WORK_Q_PRIORITY (CONFIG_SYSTEM_WORKQUEUE_PRIORITY)

From 71b0e2cc8bc457201fab47553febbec8849109e1 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 20 Feb 2025 16:23:00 +0100
Subject: [PATCH 2499/2913] [nrf fromlist] Revert "tests: arm_thread_swap: Add
 overlay for nRF54H20"

This reverts commit 28bd478a0b709774534adbec8060097bd87cf28c.

This commit can be reverted as the cause of test failure
has been removed in ipc service by increasing workqueue stack size.

Upstream PR #: 86103

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay            | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index f9615d1b35e..00000000000
--- a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-
-&cpusec_cpuapp_ipc {
-	status = "disabled";
-};
-
-&cpusec_bellboard {
-	status = "disabled";
-};

From acc00667947de741c4312ab3993b434b344cd811 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Fri, 24 Jan 2025 11:46:08 +0100
Subject: [PATCH 2500/2913] [nrf fromtree] soc: nordic: poweroff: remove
 disabling of emul l05/l10 unused RAM

Code is now incorporated into SystemInit() function of MDK 8.69.1,
which is integrated within nrfx 3.10.0.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 8b495dc31674a9bbc51b587d77536d76e2b4b791)
---
 soc/nordic/common/poweroff.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/soc/nordic/common/poweroff.c b/soc/nordic/common/poweroff.c
index 0aa19ca0adb..857b2f38078 100644
--- a/soc/nordic/common/poweroff.c
+++ b/soc/nordic/common/poweroff.c
@@ -50,14 +50,6 @@ void z_sys_poweroff(void)
 
 	/* Disable retention for all memory blocks */
 	nrfx_ram_ctrl_retention_enable_set(ram_start, ram_size, false);
-#if defined(DEVELOP_IN_NRF54L15) && defined(NRF54L05_XXAA)
-	nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 0, 0x1F8, false);
-	nrf_memconf_ramblock_ret2_mask_enable_set(NRF_MEMCONF, 0, 0x1F8, false);
-#endif
-#if defined(DEVELOP_IN_NRF54L15) && defined(NRF54L10_XXAA)
-	nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 0, 0x1C0, false);
-	nrf_memconf_ramblock_ret2_mask_enable_set(NRF_MEMCONF, 0, 0x1C0, false);
-#endif
 
 #endif /* defined(CONFIG_HAS_NORDIC_RAM_CTRL) */
 

From 9a75face3b82e852f80c3468e76a6849150206c4 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Fri, 24 Jan 2025 12:50:19 +0100
Subject: [PATCH 2501/2913] [nrf fromtree] soc: nordic: nrf53: kconfig: mark
 RAM CTRL as supported

nRF5340 SoC supports nrfx RAM control helper.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit c61a5178fe3896d057ff3853ebebb79370b55d1a)
---
 soc/nordic/nrf53/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/soc/nordic/nrf53/Kconfig b/soc/nordic/nrf53/Kconfig
index e63f93a3409..87cbf27e5cd 100644
--- a/soc/nordic/nrf53/Kconfig
+++ b/soc/nordic/nrf53/Kconfig
@@ -13,6 +13,7 @@ config SOC_SERIES_NRF53X
 	imply XIP
 	select HAS_NRFX
 	select HAS_NORDIC_DRIVERS
+	select HAS_NORDIC_RAM_CTRL
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select HAS_SWO
 	help

From c720f6214b2abca695478dc9a4cc50d903d0af14 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Fri, 24 Jan 2025 12:52:37 +0100
Subject: [PATCH 2502/2913] [nrf fromtree] tests: drivers: retained_mem: add
 support for nRF5340 DK

nRF5340 SoC supports retained_mem driver.
Add test configuration confirming this.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 34b14bbc4835461466038e793be005a732406f26)
---
 .../api/boards/nrf5340dk_nrf5340_cpuapp.conf  |  1 +
 .../boards/nrf5340dk_nrf5340_cpuapp.overlay   | 29 +++++++++++++++++++
 tests/drivers/retained_mem/api/testcase.yaml  |  1 +
 3 files changed, 31 insertions(+)
 create mode 100644 tests/drivers/retained_mem/api/boards/nrf5340dk_nrf5340_cpuapp.conf
 create mode 100644 tests/drivers/retained_mem/api/boards/nrf5340dk_nrf5340_cpuapp.overlay

diff --git a/tests/drivers/retained_mem/api/boards/nrf5340dk_nrf5340_cpuapp.conf b/tests/drivers/retained_mem/api/boards/nrf5340dk_nrf5340_cpuapp.conf
new file mode 100644
index 00000000000..4c12994e097
--- /dev/null
+++ b/tests/drivers/retained_mem/api/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_RETAINED_MEM_NRF_GPREGRET=n
diff --git a/tests/drivers/retained_mem/api/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/drivers/retained_mem/api/boards/nrf5340dk_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..de246574722
--- /dev/null
+++ b/tests/drivers/retained_mem/api/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,29 @@
+/ {
+	sram0_image@2006f000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x2006f000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RetainedMem";
+		status = "okay";
+
+		retainedmem0: retainedmem {
+			compatible = "zephyr,retained-ram";
+			status = "okay";
+		};
+	};
+
+	aliases {
+		retainedmemtestdevice = &retainedmem0;
+	};
+};
+
+&gpregret1 {
+	status = "disabled";
+};
+
+&gpregret2 {
+	status = "disabled";
+};
+
+&sram0_image {
+	reg = <0x20000000 DT_SIZE_K(444)>;
+};
diff --git a/tests/drivers/retained_mem/api/testcase.yaml b/tests/drivers/retained_mem/api/testcase.yaml
index bec7bed1321..2ad60f6e3b4 100644
--- a/tests/drivers/retained_mem/api/testcase.yaml
+++ b/tests/drivers/retained_mem/api/testcase.yaml
@@ -7,6 +7,7 @@ tests:
   drivers.retained_mem.api.ram:
     platform_allow:
       - qemu_cortex_m3
+      - nrf5340dk/nrf5340/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
       - nrf54l09pdk/nrf54l09/cpuapp

From 83d751b59753cdda8f06a0b781c8a88f21c3ed4c Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Fri, 24 Jan 2025 12:55:04 +0100
Subject: [PATCH 2503/2913] [nrf fromtree] samples: nordic: system_off: add
 retained_mem variant for nRF5340 DK

nRF5340 SoC supports retained_mem driver, which can be
utilized for RAM retention in System OFF sleep mode.
Add sample configuration confirming this.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 50f6142497770e9b6d84112ef11dcb6115c01dcb)
---
 .../boards/nrf5340dk_nrf5340_cpuapp.overlay   | 22 +++++++++++++++++++
 samples/boards/nordic/system_off/sample.yaml  |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 samples/boards/nordic/system_off/boards/nrf5340dk_nrf5340_cpuapp.overlay

diff --git a/samples/boards/nordic/system_off/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/boards/nordic/system_off/boards/nrf5340dk_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..383d9896bea
--- /dev/null
+++ b/samples/boards/nordic/system_off/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,22 @@
+/ {
+	sram0_image@2006f000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x2006f000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RetainedMem";
+		status = "okay";
+
+		retainedmem0: retainedmem {
+			compatible = "zephyr,retained-ram";
+			status = "okay";
+		};
+	};
+
+	aliases {
+		retainedmemdevice = &retainedmem0;
+	};
+};
+
+&sram0_image {
+	/* Shrink SRAM size to avoid overlap with retained memory region */
+	reg = <0x20000000 DT_SIZE_K(444)>;
+};
diff --git a/samples/boards/nordic/system_off/sample.yaml b/samples/boards/nordic/system_off/sample.yaml
index 47328714741..35483a81373 100644
--- a/samples/boards/nordic/system_off/sample.yaml
+++ b/samples/boards/nordic/system_off/sample.yaml
@@ -29,6 +29,7 @@ tests:
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
+      - nrf5340dk/nrf5340/cpuapp
       - nrf54l15dk/nrf54l05/cpuapp
       - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp

From afc1b467e330a873c15768af0a6d2b53efd54f6b Mon Sep 17 00:00:00 2001
From: Magdalena Pastula <magdalena.pastula@nordicsemi.no>
Date: Wed, 26 Feb 2025 14:45:20 +0100
Subject: [PATCH 2504/2913] [nrf noup] tests: drivers: mspi: api: fix for
 nRF54L15

nrf-squash! [nrf noup] tests: drivers: mspi: api: Add nRF54L15 overlay file

Fix the test for nRF54L15 after changing definition of external
flash in DTS.

Signed-off-by: Magdalena Pastula <magdalena.pastula@nordicsemi.no>
---
 .../api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 96c6f5b3881..2cbc36a10fc 100644
--- a/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -6,14 +6,23 @@
 
 / {
 	aliases {
-		mspi0 = &sdp_mspi;
+		mspi0 = &sdp_mspi_api;
 	};
 };
 
 &cpuflpr_vpr {
 	status = "okay";
 
-	sdp_mspi: sdp_mspi {
+	sdp_mspi_api: sdp_mspi_api {
+		compatible = "nordic,nrfe-mspi-controller";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		clock-frequency = <DT_FREQ_M(64)>;
+		pinctrl-0 = <&sdp_mspi_default>;
+		pinctrl-1 = <&sdp_mspi_sleep>;
+		pinctrl-names = "default", "sleep";
+		status = "okay";
+
 		mspi_device: mspi_device@0 {
 			status = "okay";
 			compatible = "zephyr,mspi-emul-device";

From b70deaa30124c336b1c81779c95715d33befff86 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@silabs.com>
Date: Fri, 21 Feb 2025 09:32:18 +0200
Subject: [PATCH 2505/2913] [nrf fromtree] Bluetooth: Host: Fix buffer
 allocation warnings in system workqueue

The buffer allocation in conn.c will trigger warnings if we try to use
anything else than K_NO_WAIT for the timeout when called from within the
system workqueue.

The calls in l2cap.c and att.c which may pass non-zero timeouts already
have proper handling for failed allocations, so make sure we use K_NO_WAIT
to avoid unnecessary warnings from conn.c.

Signed-off-by: Johan Hedberg <johan.hedberg@silabs.com>
Signed-off-by: Aleksandr Mirlenko <aleksandr.mirlenko@nordicsemi.no>
(cherry picked from commit 05b16b971bfad509206337a6ae22e8d7f5159ffd)
---
 subsys/bluetooth/host/att.c   | 6 +++++-
 subsys/bluetooth/host/l2cap.c | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c
index 974b8f78839..c3fd0a8a7cf 100644
--- a/subsys/bluetooth/host/att.c
+++ b/subsys/bluetooth/host/att.c
@@ -721,7 +721,11 @@ static struct net_buf *bt_att_chan_create_pdu(struct bt_att_chan *chan, uint8_t
 		timeout = BT_ATT_TIMEOUT;
 		break;
 	default:
-		timeout = K_FOREVER;
+		if (k_current_get() == k_work_queue_thread_get(&k_sys_work_q)) {
+			timeout = K_NO_WAIT;
+		} else {
+			timeout = K_FOREVER;
+		}
 	}
 
 	/* This will reserve headspace for lower layers */
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index dcaa70a7868..9a6de949733 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -674,6 +674,11 @@ struct net_buf *bt_l2cap_create_pdu_timeout(struct net_buf_pool *pool,
 					    size_t reserve,
 					    k_timeout_t timeout)
 {
+	if (!K_TIMEOUT_EQ(timeout, K_NO_WAIT) &&
+	    k_current_get() == k_work_queue_thread_get(&k_sys_work_q)) {
+		timeout = K_NO_WAIT;
+	}
+
 	return bt_conn_create_pdu_timeout(pool,
 					  sizeof(struct bt_l2cap_hdr) + reserve,
 					  timeout);

From 3850f2885d51edf9876bca19bdf08a49de7361f8 Mon Sep 17 00:00:00 2001
From: Maciej Meijer <maciej.meijer@nordicsemi.no>
Date: Fri, 28 Feb 2025 09:12:27 +0100
Subject: [PATCH 2506/2913] [nrf fromlist] mbox: temporary workaround for
 missing ic-msg

When a LD sends an ic-msg to SCFW - it happens that sometimes that SCFW
does not handle the request.
For the moment the problem is solved by sending a second vevif event
shortly after the initial request.

Upstream PR #: 86455

Signed-off-by: Maciej Meijer <maciej.meijer@nordicsemi.no>
---
 drivers/mbox/mbox_nrf_vevif_task_tx.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/mbox/mbox_nrf_vevif_task_tx.c b/drivers/mbox/mbox_nrf_vevif_task_tx.c
index 3d553d4b484..c8ee7a9484f 100644
--- a/drivers/mbox/mbox_nrf_vevif_task_tx.c
+++ b/drivers/mbox/mbox_nrf_vevif_task_tx.c
@@ -5,12 +5,14 @@
 
 #define DT_DRV_COMPAT nordic_nrf_vevif_task_tx
 
+#include <zephyr/kernel.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/mbox.h>
 
 #include <haly/nrfy_vpr.h>
 
 #define TASKS_IDX_MAX NRF_VPR_TASKS_TRIGGER_MAX
+#define VEVIF_RETRIGGER_DELAY	12
 
 struct mbox_vevif_task_tx_conf {
 	NRF_VPR_Type *vpr;
@@ -39,6 +41,10 @@ static int vevif_task_tx_send(const struct device *dev, uint32_t id, const struc
 
 	nrfy_vpr_task_trigger(config->vpr, nrfy_vpr_trigger_task_get(id));
 
+	k_busy_wait(VEVIF_RETRIGGER_DELAY);
+
+	nrfy_vpr_task_trigger(config->vpr, nrfy_vpr_trigger_task_get(id));
+
 	return 0;
 }
 

From 7fe2732d7bee0b6825fc30871e95c2a72e641475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Wed, 19 Feb 2025 14:36:33 +0100
Subject: [PATCH 2507/2913] [nrf fromlist] tests: drivers: spi: Tests SPI at 16
 and 32 MHz on nRF54 devices
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extend spi_loopback test on nRF54 chip family.
Add configurations to run this test at 8/16/32 MHz.

Upstream PR #: 86010

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
---
 .../nrf54h20dk_nrf54h20_cpuapp_fast.overlay   |  7 +++--
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |  9 ++++--
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       |  2 +-
 .../spi_loopback/boards/nrf_at_16mhz.overlay  | 10 +++++++
 .../spi_loopback/boards/nrf_at_32mhz.overlay  | 10 +++++++
 .../spi_loopback/boards/nrf_at_8mhz.overlay   | 10 +++++++
 tests/drivers/spi/spi_loopback/testcase.yaml  | 29 ++++++++++++++++++-
 7 files changed, 71 insertions(+), 6 deletions(-)
 create mode 100644 tests/drivers/spi/spi_loopback/boards/nrf_at_16mhz.overlay
 create mode 100644 tests/drivers/spi/spi_loopback/boards/nrf_at_32mhz.overlay
 create mode 100644 tests/drivers/spi/spi_loopback/boards/nrf_at_8mhz.overlay

diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
index de624ab3c66..0c7b1a73133 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
@@ -7,9 +7,12 @@
 &pinctrl {
 	spi120_default: spi120_default {
 		group1 {
+			psels = <NRF_PSEL(SPIM_MISO, 7, 6)>;
+		};
+		group2 {
 			psels = <NRF_PSEL(SPIM_SCK, 7, 3)>,
-				<NRF_PSEL(SPIM_MISO, 7, 6)>,
 				<NRF_PSEL(SPIM_MOSI, 7, 7)>;
+			nordic,drive-mode = <NRF_DRIVE_E0E1>;
 		};
 	};
 
@@ -40,7 +43,7 @@
 		reg = <0>;
 		spi-max-frequency = <DT_FREQ_M(4)>;
 	};
-	fast@0 {
+	dut_fast: fast@0 {
 		compatible = "test-spi-loopback-fast";
 		reg = <0>;
 		spi-max-frequency = <DT_FREQ_M(8)>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 8dcf6fd190d..de3eaf4514d 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -7,9 +7,12 @@
 &pinctrl {
 	spi00_default: spi00_default {
 		group1 {
+			psels = <NRF_PSEL(SPIM_MISO, 2, 9)>;
+		};
+		group2 {
 			psels = <NRF_PSEL(SPIM_SCK, 2, 6)>,
-				<NRF_PSEL(SPIM_MISO, 2, 9)>,
 				<NRF_PSEL(SPIM_MOSI, 2, 8)>;
+			nordic,drive-mode = <NRF_DRIVE_E0E1>;
 		};
 	};
 
@@ -23,6 +26,8 @@
 	};
 };
 
+/delete-node/ &mx25r64;
+
 &spi00 {
 	status = "okay";
 	pinctrl-0 = <&spi00_default>;
@@ -35,7 +40,7 @@
 		reg = <0>;
 		spi-max-frequency = <DT_FREQ_M(2)>;
 	};
-	fast@0 {
+	dut_fast: fast@0 {
 		compatible = "test-spi-loopback-fast";
 		reg = <0>;
 		spi-max-frequency = <DT_FREQ_M(4)>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
index 9dc27d1af05..48840969d8e 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -35,7 +35,7 @@
 		reg = <0>;
 		spi-max-frequency = <DT_FREQ_M(2)>;
 	};
-	fast@0 {
+	dut_fast: fast@0 {
 		compatible = "test-spi-loopback-fast";
 		reg = <0>;
 		spi-max-frequency = <DT_FREQ_M(4)>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf_at_16mhz.overlay b/tests/drivers/spi/spi_loopback/boards/nrf_at_16mhz.overlay
new file mode 100644
index 00000000000..b2cec530184
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/nrf_at_16mhz.overlay
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+&dut_fast {
+	spi-max-frequency = <DT_FREQ_M(16)>;
+};
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf_at_32mhz.overlay b/tests/drivers/spi/spi_loopback/boards/nrf_at_32mhz.overlay
new file mode 100644
index 00000000000..37d93f21a24
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/nrf_at_32mhz.overlay
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+&dut_fast {
+	spi-max-frequency = <DT_FREQ_M(32)>;
+};
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf_at_8mhz.overlay b/tests/drivers/spi/spi_loopback/boards/nrf_at_8mhz.overlay
new file mode 100644
index 00000000000..d01d89dc6ec
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/nrf_at_8mhz.overlay
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+&dut_fast {
+	spi-max-frequency = <DT_FREQ_M(8)>;
+};
diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml
index cca57977ee8..d0bdc59a8df 100644
--- a/tests/drivers/spi/spi_loopback/testcase.yaml
+++ b/tests/drivers/spi/spi_loopback/testcase.yaml
@@ -202,10 +202,37 @@ tests:
     filter: CONFIG_DT_HAS_NXP_FLEXIO_ENABLED and
             CONFIG_DT_HAS_NXP_FLEXIO_SPI_ENABLED
     platform_allow: mimxrt1064_evk
-  drivers.spi.nrf_fast:
+  drivers.spi.nrf54h_fast_8mhz:
     extra_args: DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
+  drivers.spi.nrf54h_fast_16mhz:
+    extra_args:
+      - DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
+      - EXTRA_DTC_OVERLAY_FILE="boards/nrf_at_16mhz.overlay"
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+  drivers.spi.nrf54h_fast_32mhz:
+    extra_args:
+      - DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
+      - EXTRA_DTC_OVERLAY_FILE="boards/nrf_at_32mhz.overlay"
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+  drivers.spi.nrf54l_8mhz:
+    extra_args: EXTRA_DTC_OVERLAY_FILE="boards/nrf_at_8mhz.overlay"
+    platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
+  drivers.spi.nrf54l_16mhz:
+    extra_args: EXTRA_DTC_OVERLAY_FILE="boards/nrf_at_16mhz.overlay"
+    platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
+  drivers.spi.nrf54l_32mhz:
+    extra_args: EXTRA_DTC_OVERLAY_FILE="boards/nrf_at_32mhz.overlay"
+    platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
   drivers.spi.ke1xz_flexio_spi.loopback:
     extra_args: DTC_OVERLAY_FILE="boards/frdm_ke1xz_flexio_spi.overlay"
     filter: CONFIG_DT_HAS_NXP_FLEXIO_ENABLED and

From e72a650be3ab0f98e1c2679209b1d606df682d6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Battrel?= <theo.battrel@nordicsemi.no>
Date: Fri, 28 Feb 2025 12:15:44 +0100
Subject: [PATCH 2508/2913] [nrf fromtree] Tests: Bluetooth: Fix stack overflow
 for tester
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Increase value of `CONFIG_BTTESTER_BTP_CMD_THREAD_STACK_SIZE` for
nrf54L15 board to avoid stack overflow.

Remove the config in the Mesh overlay as it's was also added for nrf54L15.

Signed-off-by: Théo Battrel <theo.battrel@nordicsemi.no>
(cherry picked from commit 75885e81de5cfec08b909403882e365ff5b08dc0)
---
 tests/bluetooth/tester/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 2 ++
 tests/bluetooth/tester/overlay-mesh.conf                      | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/bluetooth/tester/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/tests/bluetooth/tester/boards/nrf54l15dk_nrf54l15_cpuapp.conf
index 5bb1c4d8284..b6a71cd1e6d 100644
--- a/tests/bluetooth/tester/boards/nrf54l15dk_nrf54l15_cpuapp.conf
+++ b/tests/bluetooth/tester/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -22,3 +22,5 @@ CONFIG_LOG_DEFAULT_LEVEL=3
 CONFIG_BTTESTER_LOG_LEVEL_DBG=y
 
 CONFIG_UART_INTERRUPT_DRIVEN=y
+
+CONFIG_BTTESTER_BTP_CMD_THREAD_STACK_SIZE=3072
diff --git a/tests/bluetooth/tester/overlay-mesh.conf b/tests/bluetooth/tester/overlay-mesh.conf
index 1377d93639a..04e6c074e21 100644
--- a/tests/bluetooth/tester/overlay-mesh.conf
+++ b/tests/bluetooth/tester/overlay-mesh.conf
@@ -2,7 +2,6 @@
 # PSA key slots; in order to make sure there is always
 # enough key slots allocating 32 slots.
 CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=32
-CONFIG_BTTESTER_BTP_CMD_THREAD_STACK_SIZE=3072
 
 CONFIG_BT_MESH=y
 CONFIG_BT_MESH_RELAY=y

From f57f1717252eb38ab43b1dbe3f5bf7511da0604d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 17 Feb 2025 15:12:56 +0100
Subject: [PATCH 2509/2913] [nrf fromtree] drivers: clock_control: nrf: Add
 workaround for XO start anomaly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add workaround to HFCLK start and stop in nrf54l. In future workaround
will be in nrfx driver.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 2cb2cf226c0254d662794b8158dd05688eb8e57b)
---
 drivers/clock_control/clock_control_nrf.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/drivers/clock_control/clock_control_nrf.c b/drivers/clock_control/clock_control_nrf.c
index 03955d3fb7d..f807bdbb805 100644
--- a/drivers/clock_control/clock_control_nrf.c
+++ b/drivers/clock_control/clock_control_nrf.c
@@ -48,6 +48,14 @@ LOG_MODULE_REGISTER(clock_control, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
 #define INF(dev, subsys, ...) CLOCK_LOG(INF, dev, subsys, __VA_ARGS__)
 #define DBG(dev, subsys, ...) CLOCK_LOG(DBG, dev, subsys, __VA_ARGS__)
 
+#if defined(NRF54L05_XXAA) || defined(NRF54L10_XXAA) || defined(NRF54L15_XXAA)
+#if NRFX_RELEASE_VER_AT_LEAST(3, 11, 0)
+#error "Remove workaround for XOSTART as it is already done in the nrfx clock"
+#endif
+
+#define USE_WORKAROUND_FOR_CLOCK_XOSTART_ANOMALY 1
+#endif
+
 /* Clock subsys structure */
 struct nrf_clock_control_sub_data {
 	clock_control_cb_t cb;
@@ -235,6 +243,9 @@ static void hfclk_start(void)
 		hf_start_tstamp = k_uptime_get();
 	}
 
+#ifdef USE_WORKAROUND_FOR_CLOCK_XOSTART_ANOMALY
+	nrf_clock_task_trigger(NRF_CLOCK, NRF_CLOCK_TASK_PLLSTART);
+#endif
 	nrfx_clock_hfclk_start();
 }
 
@@ -245,6 +256,9 @@ static void hfclk_stop(void)
 	}
 
 	nrfx_clock_hfclk_stop();
+#ifdef USE_WORKAROUND_FOR_CLOCK_XOSTART_ANOMALY
+	nrf_clock_task_trigger(NRF_CLOCK, NRF_CLOCK_TASK_PLLSTOP);
+#endif
 }
 
 #if NRF_CLOCK_HAS_HFCLK192M

From b3d63c6f67c5aaedfdeb652496c4096e12e5526e Mon Sep 17 00:00:00 2001
From: Gordon Klaus <gordon.klaus@nordicsemi.no>
Date: Fri, 28 Feb 2025 12:27:22 +0100
Subject: [PATCH 2510/2913] [nrf noup] samples: bluetooth: hci_ipc: increase
 main stack size for Cracen driver on nRF54H20

A larger stack is needed to accomodate the Cracen driver.

Signed-off-by: Gordon Klaus <gordon.klaus@nordicsemi.no>
---
 .../bluetooth/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.conf    | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 samples/bluetooth/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.conf

diff --git a/samples/bluetooth/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.conf b/samples/bluetooth/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.conf
new file mode 100644
index 00000000000..296e6836638
--- /dev/null
+++ b/samples/bluetooth/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -0,0 +1,2 @@
+# Increase stack size for Cracen driver.
+CONFIG_MAIN_STACK_SIZE=1024

From 93f72adabdf28e4fb20e85f58ec99b8a6c8cfcb7 Mon Sep 17 00:00:00 2001
From: Mirko Covizzi <mirko.covizzi@nordicsemi.no>
Date: Mon, 17 Feb 2025 09:58:18 +0100
Subject: [PATCH 2511/2913] [nrf noup] include: net: socket_ncs: remove
 leftover

nrf-squash! [nrf noup] include: net: add NCS extensions

Removes leftover socket options `TLS_SESSION_CACHE_DISABLED`
and `TLS_SESSION_CACHE_ENABLED`. These exist already
in `socket.h`.

Signed-off-by: Mirko Covizzi <mirko.covizzi@nordicsemi.no>
---
 include/zephyr/net/socket_ncs.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/include/zephyr/net/socket_ncs.h b/include/zephyr/net/socket_ncs.h
index 4a198b5992b..75cc2d3da79 100644
--- a/include/zephyr/net/socket_ncs.h
+++ b/include/zephyr/net/socket_ncs.h
@@ -49,10 +49,6 @@ extern "C" {
  */
 #define TLS_DTLS_HANDSHAKE_STATUS 21
 
-/* Valid values for TLS_SESSION_CACHE option */
-#define TLS_SESSION_CACHE_DISABLED 0 /**< Disable TLS session caching. */
-#define TLS_SESSION_CACHE_ENABLED 1 /**< Enable TLS session caching. */
-
 /* Valid values for TLS_DTLS_HANDSHAKE_TIMEO option */
 #define TLS_DTLS_HANDSHAKE_TIMEO_NONE 0 /**< No timeout */
 #define TLS_DTLS_HANDSHAKE_TIMEO_1S 1 /**< 1 second */

From 10eb60b48111d529ab30bae2a344226accb3ded6 Mon Sep 17 00:00:00 2001
From: Mirko Covizzi <mirko.covizzi@nordicsemi.no>
Date: Mon, 17 Feb 2025 10:16:35 +0100
Subject: [PATCH 2512/2913] [nrf noup] include: net: socket_ncs: prevent
 overlaps

nrf-squash! [nrf noup] include: net: add NCS extensions

Adds a base value for NCS specific socket options to
prevent overlaps with Zephyr's socket options.

Signed-off-by: Mirko Covizzi <mirko.covizzi@nordicsemi.no>
---
 include/zephyr/net/socket_ncs.h | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/include/zephyr/net/socket_ncs.h b/include/zephyr/net/socket_ncs.h
index 75cc2d3da79..d94d55a087d 100644
--- a/include/zephyr/net/socket_ncs.h
+++ b/include/zephyr/net/socket_ncs.h
@@ -25,6 +25,10 @@ extern "C" {
 #define SOCK_NATIVE 0x80000000
 #define SOCK_NATIVE_TLS 0x40000000
 
+/** Define a base for NCS specific socket options to prevent overlaps with Zephyr's socket options.
+ */
+#define NET_SOCKET_NCS_BASE 1000000000
+
 /* NCS specific TLS level socket options */
 
 /** Socket option to set DTLS handshake timeout, specifically for nRF sockets.
@@ -32,22 +36,22 @@ extern "C" {
  *  including retransmissions, in seconds.
  *  Accepted values for the option are: 1, 3, 7, 15, 31, 63, 123.
  */
-#define TLS_DTLS_HANDSHAKE_TIMEO 18
+#define TLS_DTLS_HANDSHAKE_TIMEO (NET_SOCKET_NCS_BASE + 18)
 
 /** Socket option to save DTLS connection, specifically for nRF sockets.
  */
-#define TLS_DTLS_CONN_SAVE 19
+#define TLS_DTLS_CONN_SAVE (NET_SOCKET_NCS_BASE + 19)
 
 /** Socket option to load DTLS connection, specifically for nRF sockets.
  */
-#define TLS_DTLS_CONN_LOAD 20
+#define TLS_DTLS_CONN_LOAD (NET_SOCKET_NCS_BASE + 20)
 
 /** Socket option to get result of latest TLS/DTLS completed handshakes end status,
  *  specifically for nRF sockets.
  *  The option accepts an integer, indicating the setting.
  *  Accepted vaules for the option are: 0 and 1.
  */
-#define TLS_DTLS_HANDSHAKE_STATUS 21
+#define TLS_DTLS_HANDSHAKE_STATUS (NET_SOCKET_NCS_BASE + 21)
 
 /* Valid values for TLS_DTLS_HANDSHAKE_TIMEO option */
 #define TLS_DTLS_HANDSHAKE_TIMEO_NONE 0 /**< No timeout */
@@ -66,20 +70,20 @@ extern "C" {
 /* NCS specific socket options */
 
 /** sockopt: enable sending data as part of exceptional events */
-#define SO_EXCEPTIONAL_DATA 33
+#define SO_EXCEPTIONAL_DATA (NET_SOCKET_NCS_BASE + 33)
 /** sockopt: Keep socket open when its PDN connection is lost
  *           or the device is put into flight mode.
  */
-#define SO_KEEPOPEN 34
+#define SO_KEEPOPEN (NET_SOCKET_NCS_BASE + 34)
 /** sockopt: bind to PDN */
-#define SO_BINDTOPDN 40
+#define SO_BINDTOPDN (NET_SOCKET_NCS_BASE + 40)
 
 /** sockopt: Release assistance indication (RAI).
  *  The option accepts an integer, indicating the type of RAI.
  *  Accepted values for the option are: @ref RAI_NO_DATA, @ref RAI_LAST, @ref RAI_ONE_RESP,
  *  @ref RAI_ONGOING, @ref RAI_WAIT_MORE.
  */
-#define SO_RAI 61
+#define SO_RAI (NET_SOCKET_NCS_BASE + 61)
 
 /** Release assistance indication (RAI).
  *  Indicate that the application does not intend to send more data.
@@ -117,27 +121,27 @@ extern "C" {
 /** IPv4 and IPv6 protocol level (pseudo-val) for nRF sockets. */
 #define IPPROTO_ALL 512
 /** sockopt: disable all replies to unexpected traffics */
-#define SO_SILENCE_ALL 30
+#define SO_SILENCE_ALL (NET_SOCKET_NCS_BASE + 30)
 
 /* NCS specific IPPROTO_IP level socket options */
 
 /** sockopt: enable IPv4 ICMP replies */
-#define SO_IP_ECHO_REPLY 31
+#define SO_IP_ECHO_REPLY (NET_SOCKET_NCS_BASE + 31)
 
 /* NCS specific IPPROTO_IPV6 level socket options */
 
 /** sockopt: enable IPv6 ICMP replies */
-#define SO_IPV6_ECHO_REPLY 32
+#define SO_IPV6_ECHO_REPLY (NET_SOCKET_NCS_BASE + 32)
 
 /** sockopt: Delay IPv6 address refresh during power saving mode  */
-#define SO_IPV6_DELAYED_ADDR_REFRESH 62
+#define SO_IPV6_DELAYED_ADDR_REFRESH (NET_SOCKET_NCS_BASE + 62)
 
 /* NCS specific TCP level socket options */
 
 /** sockopt: Configurable TCP server session timeout in minutes.
  * Range is 0 to 135. 0 is no timeout and 135 is 2 h 15 min. Default is 0 (no timeout).
  */
-#define SO_TCP_SRV_SESSTIMEO 55
+#define SO_TCP_SRV_SESSTIMEO (NET_SOCKET_NCS_BASE + 55)
 
 /* NCS specific gettaddrinfo() flags */
 

From 6971f74b485e6ee311b8c17c6a972c4972c1a658 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Wed, 26 Feb 2025 12:02:08 +0100
Subject: [PATCH 2513/2913] [nrf fromlist] soc: nordic: nrf54l: Fix num of irq
 for nRF54L09

Change number of IRQ parameter for nRF54L09 devices.

Upstream PR #: 86350

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuapp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuapp b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuapp
index 95d2d43fca1..e81c3837300 100644
--- a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuapp
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuapp
@@ -6,7 +6,7 @@
 if SOC_NRF54L09_ENGA_CPUAPP
 
 config NUM_IRQS
-	default 274
+	default 271
 
 config IEEE802154_NRF5
 	default IEEE802154

From bda111b69cc2fb0a13580c34e4b1ba3dec11f841 Mon Sep 17 00:00:00 2001
From: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Date: Tue, 4 Mar 2025 14:50:56 +0100
Subject: [PATCH 2514/2913] [nrf fromlist] include: common: sys_bitops: Specify
 sign when bitshifting

When left-shifting '1' by 31, the result is undefined. This is
something ASAN detects.

Solve this by explicitly defining that the integer is unsigned.

Upstream PR #: 86624

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
---
 include/zephyr/arch/common/sys_bitops.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/zephyr/arch/common/sys_bitops.h b/include/zephyr/arch/common/sys_bitops.h
index 22bcfd56ca8..76f1fd88071 100644
--- a/include/zephyr/arch/common/sys_bitops.h
+++ b/include/zephyr/arch/common/sys_bitops.h
@@ -25,21 +25,21 @@ static ALWAYS_INLINE void sys_set_bit(mem_addr_t addr, unsigned int bit)
 {
 	uint32_t temp = *(volatile uint32_t *)addr;
 
-	*(volatile uint32_t *)addr = temp | (1 << bit);
+	*(volatile uint32_t *)addr = temp | (1U << bit);
 }
 
 static ALWAYS_INLINE void sys_clear_bit(mem_addr_t addr, unsigned int bit)
 {
 	uint32_t temp = *(volatile uint32_t *)addr;
 
-	*(volatile uint32_t *)addr = temp & ~(1 << bit);
+	*(volatile uint32_t *)addr = temp & ~(1U << bit);
 }
 
 static ALWAYS_INLINE int sys_test_bit(mem_addr_t addr, unsigned int bit)
 {
 	uint32_t temp = *(volatile uint32_t *)addr;
 
-	return temp & (1 << bit);
+	return temp & (1U << bit);
 }
 
 static ALWAYS_INLINE void sys_set_bits(mem_addr_t addr, unsigned int mask)
@@ -62,19 +62,19 @@ static ALWAYS_INLINE
 	/* Doing memory offsets in terms of 32-bit values to prevent
 	 * alignment issues
 	 */
-	sys_set_bit(addr + ((bit >> 5) << 2), bit & 0x1F);
+	sys_set_bit(addr + ((bit >> 5) << 2U), bit & 0x1F);
 }
 
 static ALWAYS_INLINE
 	void sys_bitfield_clear_bit(mem_addr_t addr, unsigned int bit)
 {
-	sys_clear_bit(addr + ((bit >> 5) << 2), bit & 0x1F);
+	sys_clear_bit(addr + ((bit >> 5U) << 2U), bit & 0x1F);
 }
 
 static ALWAYS_INLINE
 	int sys_bitfield_test_bit(mem_addr_t addr, unsigned int bit)
 {
-	return sys_test_bit(addr + ((bit >> 5) << 2), bit & 0x1F);
+	return sys_test_bit(addr + ((bit >> 5U) << 2U), bit & 0x1F);
 }
 
 static ALWAYS_INLINE

From 1299951cfb44faeb4ec67e15cf73f2461979417e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Thu, 26 Sep 2024 15:15:44 +0200
Subject: [PATCH 2515/2913] [nrf fromlist] dts: nordic: nrf54: add nRF54L20
 FLPR core
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added support for nRF54L20 FLPR core in devicetree.

Upstream PR #: 79355

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi    | 26 ++++++++
 dts/common/nordic/nrf54l20.dtsi             | 51 +++++++++++++++-
 dts/riscv/nordic/nrf54l20_enga_cpuflpr.dtsi | 67 +++++++++++++++++++++
 3 files changed, 141 insertions(+), 3 deletions(-)
 create mode 100644 dts/riscv/nordic/nrf54l20_enga_cpuflpr.dtsi

diff --git a/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi b/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
index 1444be3b57b..5c7e5db3001 100644
--- a/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
@@ -10,6 +10,11 @@ cpu: &cpuapp {};
 systick: &cpuapp_systick {};
 nvic: &cpuapp_nvic {};
 
+/delete-node/ &cpuflpr;
+/delete-node/ &cpuflpr_rram;
+/delete-node/ &cpuflpr_sram;
+/delete-node/ &cpuflpr_clic;
+
 / {
 	chosen {
 		zephyr,entropy = &prng;
@@ -32,6 +37,27 @@ nvic: &cpuapp_nvic {};
 	};
 };
 
+&cpuflpr_vpr {
+	cpuapp_vevif_rx: mailbox@1 {
+		compatible = "nordic,nrf-vevif-event-rx";
+		reg = <0x0 0x1000>;
+		status = "disabled";
+		interrupts = <76 NRF_DEFAULT_IRQ_PRIORITY>;
+		#mbox-cells = <1>;
+		nordic,events = <1>;
+		nordic,events-mask = <0x00100000>;
+	};
+
+	cpuapp_vevif_tx: mailbox@0 {
+		compatible = "nordic,nrf-vevif-task-tx";
+		reg = <0x0 0x1000>;
+		#mbox-cells = <1>;
+		nordic,tasks = <7>;
+		nordic,tasks-mask = <0x007f0000>;
+		status = "disabled";
+	};
+};
+
 &cpuapp_ppb {
 	compatible = "simple-bus";
 	ranges;
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 5e3ba49e7cf..d95ea80da26 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -11,6 +11,10 @@
 
 /delete-node/ &sw_pwm;
 
+/* Domain IDs. Can be used to specify channel links in IPCT nodes. */
+#define NRF_DOMAIN_ID_APPLICATION 0
+#define NRF_DOMAIN_ID_FLPR 1
+
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
@@ -32,6 +36,14 @@
 				swo-ref-frequency = <DT_FREQ_M(128)>;
 			};
 		};
+
+		cpuflpr: cpu@1 {
+			compatible = "nordic,vpr";
+			reg = <1>;
+			device_type = "cpu";
+			riscv,isa = "rv32emc";
+			nordic,bus-width = <64>;
+		};
 	};
 
 	clocks {
@@ -77,10 +89,18 @@
 
 		cpuapp_sram: memory@20000000 {
 			compatible = "mmio-sram";
-			reg = <0x20000000 DT_SIZE_K(511)>;
+			reg = <0x20000000 DT_SIZE_K(447)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x20000000 0x6fc00>;
+		};
+
+		cpuflpr_sram: memory@2006fc00 {
+			compatible = "mmio-sram";
+			reg = <0x2006fc00 DT_SIZE_K(64)>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0x0 0x20000000 0x7fc00>;
+			ranges = <0x0 0x2006fc00 0x10000>;
 		};
 
 		global_peripherals: peripheral@50000000 {
@@ -106,6 +126,24 @@
 				status = "disabled";
 			};
 
+			cpuflpr_vpr: vpr@4c000 {
+				compatible = "nordic,nrf-vpr-coprocessor";
+				reg = <0x4c000 0x1000>;
+				ranges = <0x0 0x4c000 0x1000>;
+				#address-cells = <1>;
+				#size-cells = <1>;
+				status = "disabled";
+
+				cpuflpr_clic: interrupt-controller@f0000000 {
+					compatible = "nordic,nrf-clic";
+					reg = <0xf0000000 0x143c>;
+					interrupt-controller;
+					#interrupt-cells = <2>;
+					#address-cells = <1>;
+					status = "disabled";
+				};
+			};
+
 			spi00: spi@4d000 {
 				/*
 				 * This spi node can be either SPIM or SPIS,
@@ -737,7 +775,14 @@
 
 			cpuapp_rram: rram@0 {
 				compatible = "soc-nv-flash";
-				reg = <0x0 DT_SIZE_K(2028)>;
+				reg = <0x0 DT_SIZE_K(1972)>;
+				erase-block-size = <4096>;
+				write-block-size = <16>;
+			};
+
+			cpuflpr_rram: rram@1ed000 {
+				compatible = "soc-nv-flash";
+				reg = <0x1ed000 DT_SIZE_K(64)>;
 				erase-block-size = <4096>;
 				write-block-size = <16>;
 			};
diff --git a/dts/riscv/nordic/nrf54l20_enga_cpuflpr.dtsi b/dts/riscv/nordic/nrf54l20_enga_cpuflpr.dtsi
new file mode 100644
index 00000000000..4bd1a179fbc
--- /dev/null
+++ b/dts/riscv/nordic/nrf54l20_enga_cpuflpr.dtsi
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <nordic/nrf54l20.dtsi>
+
+cpu: &cpuflpr {};
+clic: &cpuflpr_clic {};
+
+/delete-node/ &cpuapp;
+/delete-node/ &cpuapp_rram;
+/delete-node/ &cpuapp_ppb;
+/delete-node/ &cpuapp_sram;
+
+/ {
+	soc {
+		compatible = "simple-bus";
+		interrupt-parent = <&cpuflpr_clic>;
+		ranges;
+	};
+};
+
+&cpuflpr {
+	cpuflpr_vevif_rx: mailbox {
+		compatible = "nordic,nrf-vevif-task-rx";
+		status = "disabled";
+		interrupt-parent = <&cpuflpr_clic>;
+		interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <17 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <18 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <19 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <20 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <21 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <22 NRF_DEFAULT_IRQ_PRIORITY>;
+		#mbox-cells = <1>;
+		nordic,tasks = <7>;
+		nordic,tasks-mask = <0x007f0000>;
+	};
+};
+
+&cpuflpr_vpr {
+	cpuflpr_vevif_tx: mailbox {
+		compatible = "nordic,nrf-vevif-event-tx";
+		#mbox-cells = <1>;
+		nordic,events = <1>;
+		nordic,events-mask = <0x00100000>;
+		status = "disabled";
+	};
+};
+
+&cpuflpr_clic {
+	status = "okay";
+};
+
+&grtc {
+	interrupts = <226 NRF_DEFAULT_IRQ_PRIORITY>;
+};
+
+&gpiote20 {
+	interrupts = <218 NRF_DEFAULT_IRQ_PRIORITY>;
+};
+
+&gpiote30 {
+	interrupts = <268 NRF_DEFAULT_IRQ_PRIORITY>;
+};

From a7dfb72195c8ac4a100606cbf8292c973df5c163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Thu, 26 Sep 2024 15:18:40 +0200
Subject: [PATCH 2516/2913] [nrf fromlist] soc: nordic: nrf54: add nRF54L20
 FLPR core
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added support for nRF54L20 FLPR core in soc dir.

Upstream PR #: 79355

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 soc/nordic/common/vpr/Kconfig.sysbuild                |  2 +-
 soc/nordic/nrf54l/Kconfig                             |  3 +++
 .../nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuflpr    | 11 +++++++++++
 soc/nordic/nrf54l/Kconfig.soc                         |  6 ++++++
 soc/nordic/soc.yml                                    |  1 +
 soc/nordic/validate_base_addresses.c                  |  2 +-
 6 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuflpr

diff --git a/soc/nordic/common/vpr/Kconfig.sysbuild b/soc/nordic/common/vpr/Kconfig.sysbuild
index cfbd619f623..eb62e3708bf 100644
--- a/soc/nordic/common/vpr/Kconfig.sysbuild
+++ b/soc/nordic/common/vpr/Kconfig.sysbuild
@@ -4,7 +4,7 @@
 config VPR_LAUNCHER
 	bool "VPR launcher"
 	default y
-	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR)
+	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF9280_CPUPPR)
 	help
 	  Include VPR launcher in build.
 	  VPR launcher is a minimal sample built for an ARM core that starts given VPR core.
diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index b8b4d015e37..fe7afd55b16 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -46,6 +46,9 @@ config SOC_NRF54L15_CPUFLPR
 config SOC_NRF54L20_ENGA_CPUAPP
 	select SOC_NRF54L_CPUAPP_COMMON
 
+config SOC_NRF54L20_ENGA_CPUFLPR
+	select RISCV_CORE_NORDIC_VPR
+
 if SOC_SERIES_NRF54LX
 
 config SOC_NRF54LX_SKIP_CLOCK_CONFIG
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuflpr b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuflpr
new file mode 100644
index 00000000000..4da2c703660
--- /dev/null
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuflpr
@@ -0,0 +1,11 @@
+# Nordic Semiconductor nRF54L20 MCU
+
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_NRF54L20_ENGA_CPUFLPR
+
+config NUM_IRQS
+	default 287
+
+endif # SOC_NRF54L20_ENGA_CPUFLPR
diff --git a/soc/nordic/nrf54l/Kconfig.soc b/soc/nordic/nrf54l/Kconfig.soc
index e1feb7cdef1..f86b7bd4858 100644
--- a/soc/nordic/nrf54l/Kconfig.soc
+++ b/soc/nordic/nrf54l/Kconfig.soc
@@ -93,6 +93,12 @@ config SOC_NRF54L20_ENGA_CPUAPP
 	help
 	  NRF54L20 ENGA CPUAPP
 
+config SOC_NRF54L20_ENGA_CPUFLPR
+	bool
+	select SOC_NRF54L20_ENGA
+	help
+	  NRF54L20 ENGA CPUFLPR
+
 config SOC
 	default "nrf54l05" if SOC_NRF54L05
 	default "nrf54l09" if SOC_NRF54L09
diff --git a/soc/nordic/soc.yml b/soc/nordic/soc.yml
index b4c8ef5a034..1e9ecac5f28 100644
--- a/soc/nordic/soc.yml
+++ b/soc/nordic/soc.yml
@@ -39,6 +39,7 @@ family:
           - name: nrf54l20
             cpuclusters:
               - name: cpuapp
+              - name: cpuflpr
       - name: nrf54h
         socs:
           - name: nrf54h20
diff --git a/soc/nordic/validate_base_addresses.c b/soc/nordic/validate_base_addresses.c
index ef1dd194578..ac800f1cf00 100644
--- a/soc/nordic/validate_base_addresses.c
+++ b/soc/nordic/validate_base_addresses.c
@@ -339,7 +339,7 @@ CHECK_DT_REG(usbreg, NRF_USBREGULATOR);
 CHECK_DT_REG(vmc, NRF_VMC);
 CHECK_DT_REG(cpuflpr_clic, NRF_FLPR_VPRCLIC);
 CHECK_DT_REG(cpuppr_clic, NRF_PPR_VPRCLIC);
-#if defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || defined(CONFIG_SOC_NRF54L15)
+#if defined(CONFIG_SOC_SERIES_NRF54LX)
 CHECK_DT_REG(cpuflpr_vpr, NRF_VPR00);
 #elif defined(CONFIG_NRF_PLATFORM_HALTIUM)
 CHECK_DT_REG(cpuflpr_vpr, NRF_VPR121);

From 0cc20f2d9719f659ebe67ffd26326638ab78d7fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Thu, 26 Sep 2024 15:43:43 +0200
Subject: [PATCH 2517/2913] [nrf fromlist] modules: hal_nordic: nrfx: add
 nRF54L20 FLPR core
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added configuration files for nRF54L20 FLPR core.

Upstream PR #: 79355

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 modules/hal_nordic/nrfx/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 62262d31e87..686fdeabb69 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -61,6 +61,7 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54L15 NRF54L15_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54L15_CPUAPP NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA       NRF54L20_ENGA_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP NRF_APPLICATION)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUFLPR NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9120             NRF9120_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9160             NRF9160_XXAA)
 
@@ -241,6 +242,7 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUFLPR     nrf54l10_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP      nrf54l15_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR     nrf54l15_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54l20_enga_application.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUFLPR nrf54l20_enga_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9120              nrf9120.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9160              nrf9160.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9230_ENGB_CPUAPP  nrf9230_engb_application.svd)

From 9b95c91de050551eede1ac95666f264d694a4540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Fri, 27 Sep 2024 11:08:30 +0200
Subject: [PATCH 2518/2913] [nrf fromlist] boards: nordic: add FLPR core to
 nRF54L20pdk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added support for FLPR core in nRF54L20pdk board.

Upstream PR #: 79355

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk |  1 +
 boards/nordic/nrf54l20pdk/board.cmake         |  6 +-
 boards/nordic/nrf54l20pdk/board.yml           |  3 +
 boards/nordic/nrf54l20pdk/doc/index.rst       |  6 ++
 .../nrf54l20pdk/nrf54l20_cpuapp_common.dtsi   |  5 --
 .../nrf54l20pdk_nrf54l20-common.dtsi          | 12 ++++
 .../nrf54l20pdk_nrf54l20-pinctrl.dtsi         | 23 +++++++
 .../nrf54l20pdk_nrf54l20_cpuflpr.dts          | 68 +++++++++++++++++++
 .../nrf54l20pdk_nrf54l20_cpuflpr.yaml         | 14 ++++
 .../nrf54l20pdk_nrf54l20_cpuflpr_defconfig    | 19 ++++++
 10 files changed, 151 insertions(+), 6 deletions(-)
 create mode 100644 boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.dts
 create mode 100644 boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.yaml
 create mode 100644 boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr_defconfig

diff --git a/boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk b/boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk
index 09809ff7374..3ac84ee1ea3 100644
--- a/boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk
+++ b/boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk
@@ -3,3 +3,4 @@
 
 config BOARD_NRF54L20PDK
 	select SOC_NRF54L20_ENGA_CPUAPP if BOARD_NRF54L20PDK_NRF54L20_CPUAPP
+	select SOC_NRF54L20_ENGA_CPUFLPR if BOARD_NRF54L20PDK_NRF54L20_CPUFLPR
diff --git a/boards/nordic/nrf54l20pdk/board.cmake b/boards/nordic/nrf54l20pdk/board.cmake
index 5d36ac00a3e..3bb4e520198 100644
--- a/boards/nordic/nrf54l20pdk/board.cmake
+++ b/boards/nordic/nrf54l20pdk/board.cmake
@@ -1,7 +1,11 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
+if(CONFIG_BOARD_NRF54L20PDK_NRF54L20_CPUAPP)
+  board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
+elseif(CONFIG_BOARD_NRF54L20PDK_NRF54L20_CPUFLPR)
+  board_runner_args(jlink "--speed=4000")
+endif()
 
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf54l20pdk/board.yml b/boards/nordic/nrf54l20pdk/board.yml
index 4eaa66669fc..de39dcb4a3f 100644
--- a/boards/nordic/nrf54l20pdk/board.yml
+++ b/boards/nordic/nrf54l20pdk/board.yml
@@ -4,3 +4,6 @@ board:
   vendor: nordic
   socs:
   - name: nrf54l20
+    variants:
+    - name: xip
+      cpucluster: cpuflpr
diff --git a/boards/nordic/nrf54l20pdk/doc/index.rst b/boards/nordic/nrf54l20pdk/doc/index.rst
index aaed616ecce..7805d2ea9f9 100644
--- a/boards/nordic/nrf54l20pdk/doc/index.rst
+++ b/boards/nordic/nrf54l20pdk/doc/index.rst
@@ -65,6 +65,12 @@ built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
 building and running.
 
+Applications for the ``nrf54l20pdk/nrf54l20/cpuflpr`` board target need
+to be built using sysbuild to include the ``vpr_launcher`` image for the application core.
+
+Enter the following command to compile ``hello_world`` for the FLPR core::
+ west build -p -b nrf54l20pdk/nrf54l20/cpuflpr --sysbuild
+
 Flashing
 ========
 
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
index ec6f2740648..ed9d76a6b19 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
@@ -27,11 +27,6 @@
 	status = "okay";
 };
 
-&hfpll {
-	/* For now use 64 MHz clock for CPU and fast peripherals. */
-	clock-frequency = <DT_FREQ_M(64)>;
-};
-
 &lfxo {
 	load-capacitors = "internal";
 	load-capacitance-femtofarad = <15500>;
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi
index 35a434cda4b..6eb67fe1bb3 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi
@@ -91,3 +91,15 @@
 	pinctrl-1 = <&pwm20_sleep>;
 	pinctrl-names = "default", "sleep";
 };
+
+&uart30 {
+	current-speed = <115200>;
+	pinctrl-0 = <&uart30_default>;
+	pinctrl-1 = <&uart30_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&hfpll {
+	/* For now use 64 MHz clock for CPU and fast peripherals. */
+	clock-frequency = <DT_FREQ_M(64)>;
+};
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi
index 7dc2b77ae83..b70be2bfa5e 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi
@@ -34,4 +34,27 @@
 			low-power-enable;
 		};
 	};
+
+	/omit-if-no-ref/ uart30_default: uart30_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RTS, 0, 2)>;
+		};
+
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 0, 1)>,
+				<NRF_PSEL(UART_CTS, 0, 3)>;
+			bias-pull-up;
+		};
+	};
+
+	/omit-if-no-ref/ uart30_sleep: uart30_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RX, 0, 1)>,
+				<NRF_PSEL(UART_RTS, 0, 2)>,
+				<NRF_PSEL(UART_CTS, 0, 3)>;
+			low-power-enable;
+		};
+	};
 };
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.dts b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.dts
new file mode 100644
index 00000000000..ea3c5d6ff6a
--- /dev/null
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.dts
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf54l20_enga_cpuflpr.dtsi>
+#include "nrf54l20pdk_nrf54l20-common.dtsi"
+
+/ {
+	model = "Nordic nRF54L20 PDK nRF54L20 FLPR MCU";
+	compatible = "nordic,nrf54l20pdk_nrf54l20-cpuflpr";
+
+	chosen {
+		zephyr,console = &uart30;
+		zephyr,shell-uart = &uart30;
+		zephyr,code-partition = &cpuflpr_code_partition;
+		zephyr,flash = &cpuflpr_rram;
+		zephyr,sram = &cpuflpr_sram;
+	};
+};
+
+&cpuflpr_sram {
+	status = "okay";
+};
+
+&cpuflpr_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		cpuflpr_code_partition: partition@0 {
+			label = "image-0";
+			reg = <0x0 DT_SIZE_K(64)>;
+		};
+	};
+};
+
+&grtc {
+	owned-channels = <3 4>;
+	status = "okay";
+};
+
+&uart30 {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpiote30 {
+	status = "okay";
+};
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.yaml b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.yaml
new file mode 100644
index 00000000000..8a9524bfbe4
--- /dev/null
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.yaml
@@ -0,0 +1,14 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54l20pdk/nrf54l20/cpuflpr
+name: nRF54L20-PDK-nRF54L20-Fast-Lightweight-Peripheral-Processor
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+ram: 64
+flash: 64
+supported:
+  - counter
+  - gpio
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr_defconfig b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr_defconfig
new file mode 100644
index 00000000000..75f7c4386e3
--- /dev/null
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr_defconfig
@@ -0,0 +1,19 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+CONFIG_USE_DT_CODE_PARTITION=y
+
+# Execute from SRAM
+CONFIG_XIP=n
+
+CONFIG_RISCV_ALWAYS_SWITCH_THROUGH_ECALL=y

From d7581bffe55fe6bd6b40fbd1a87a5ac6dd0b5738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Thu, 10 Oct 2024 11:59:58 +0200
Subject: [PATCH 2519/2913] [nrf fromlist] snippets: add nRF54L20pdk FLPR core
 snippet
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add snippet to boot nRF54L20pdk FLPR from application core.

Upstream PR #: 79355

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 snippets/nordic-flpr/snippet.yml              |  3 ++
 .../nordic-flpr/soc/nrf54l20_cpuapp.overlay   | 39 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 snippets/nordic-flpr/soc/nrf54l20_cpuapp.overlay

diff --git a/snippets/nordic-flpr/snippet.yml b/snippets/nordic-flpr/snippet.yml
index f7578eccaac..dbeaf313df0 100644
--- a/snippets/nordic-flpr/snippet.yml
+++ b/snippets/nordic-flpr/snippet.yml
@@ -9,3 +9,6 @@ boards:
   /.*/nrf54h20/cpuapp/:
     append:
       EXTRA_DTC_OVERLAY_FILE: soc/nrf54h20_cpuapp.overlay
+  /.*/nrf54l20/cpuapp/:
+    append:
+      EXTRA_DTC_OVERLAY_FILE: soc/nrf54l20_cpuapp.overlay
diff --git a/snippets/nordic-flpr/soc/nrf54l20_cpuapp.overlay b/snippets/nordic-flpr/soc/nrf54l20_cpuapp.overlay
new file mode 100644
index 00000000000..1d36ba5ac48
--- /dev/null
+++ b/snippets/nordic-flpr/soc/nrf54l20_cpuapp.overlay
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	soc {
+		reserved-memory {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			cpuflpr_code_partition: image@1ed000 {
+				/* FLPR core code partition */
+				reg = <0x1ed000 DT_SIZE_K(64)>;
+			};
+		};
+
+		cpuflpr_sram_code_data: memory@2006fc00 {
+			compatible = "mmio-sram";
+			reg = <0x2006fc00 DT_SIZE_K(64)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x2006fc00 0x10000>;
+		};
+	};
+};
+
+&uart30 {
+	status = "reserved";
+};
+
+&cpuflpr_vpr {
+	execution-memory = <&cpuflpr_sram_code_data>;
+	source-memory = <&cpuflpr_code_partition>;
+};
+
+&cpuapp_vevif_tx {
+	status = "okay";
+};

From a7e820a3b7290ffafc258881f498e0ce748c999d Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Mon, 10 Feb 2025 12:03:54 +0100
Subject: [PATCH 2520/2913] [nrf fromlist] drivers: flash: spi_nor: add define
 for Quad Enable bit

Quad Enable bit is used to enable/disable 4x line IO in SPI.

Upstream PR #: 85520

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 drivers/flash/spi_nor.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/flash/spi_nor.h b/drivers/flash/spi_nor.h
index a918e0a99d0..141b67718ef 100644
--- a/drivers/flash/spi_nor.h
+++ b/drivers/flash/spi_nor.h
@@ -14,6 +14,7 @@
 /* Status register bits */
 #define SPI_NOR_WIP_BIT         BIT(0)  /* Write in progress */
 #define SPI_NOR_WEL_BIT         BIT(1)  /* Write enable latch */
+#define SPI_NOR_QE_BIT          BIT(6)  /* Quad enable */
 
 /* Flash opcodes */
 #define SPI_NOR_CMD_WRSR        0x01    /* Write status register */

From b44731ad30bc75e502040c3323bd514204797114 Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Fri, 7 Feb 2025 15:01:18 +0100
Subject: [PATCH 2521/2913] [nrf fromlist] drivers: flash: mspi_nor: support
 MODE_SINGLE and MODE_QUAD_1_4_4

Extend driver to support single lane and 1-4-4 IO modes.

Upstream PR #: 85520

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 drivers/flash/flash_mspi_nor.c | 349 ++++++++++++++++++++++++---------
 1 file changed, 256 insertions(+), 93 deletions(-)

diff --git a/drivers/flash/flash_mspi_nor.c b/drivers/flash/flash_mspi_nor.c
index 1f9f2c67ee9..d366ab1708a 100644
--- a/drivers/flash/flash_mspi_nor.c
+++ b/drivers/flash/flash_mspi_nor.c
@@ -28,6 +28,177 @@ struct flash_mspi_nor_data {
 	struct mspi_xfer xfer;
 };
 
+struct flash_mspi_nor_cmd {
+	enum mspi_xfer_direction dir;
+	uint32_t cmd;
+	uint16_t tx_dummy;
+	uint16_t rx_dummy;
+	uint8_t cmd_length;
+	uint8_t addr_length;
+};
+
+struct flash_mspi_nor_cmds {
+	struct flash_mspi_nor_cmd id;
+	struct flash_mspi_nor_cmd write_en;
+	struct flash_mspi_nor_cmd read;
+	struct flash_mspi_nor_cmd status;
+	struct flash_mspi_nor_cmd page_program;
+	struct flash_mspi_nor_cmd sector_erase;
+	struct flash_mspi_nor_cmd chip_erase;
+	struct flash_mspi_nor_cmd mode_change;
+	struct flash_mspi_nor_cmd sfdp;
+	uint8_t mode_payload;
+};
+
+static const struct flash_mspi_nor_cmds commands[] = {
+	[MSPI_IO_MODE_SINGLE] = {
+		.id = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_CMD_READ_ID,
+			.cmd_length = 1,
+		},
+		.write_en = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WREN,
+			.cmd_length = 1,
+		},
+		.read = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_READ,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.status = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_RDSR,
+			.cmd_length = 1,
+		},
+		.page_program = {
+			.dir  = MSPI_TX,
+			.cmd = SPI_NOR_CMD_PP,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.sector_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_SE,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.chip_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_CE,
+			.cmd_length = 1,
+		},
+	},
+	[MSPI_IO_MODE_QUAD_1_4_4] = {
+		.id = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_CMD_READ_ID,
+			.cmd_length = 1,
+		},
+		.write_en = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WREN,
+			.cmd_length = 1,
+		},
+		.read = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_4READ,
+			.cmd_length = 1,
+			.addr_length = 3,
+			.rx_dummy = 6,
+		},
+		.status = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_RDSR,
+			.cmd_length = 1,
+		},
+		.page_program = {
+			.dir  = MSPI_TX,
+			.cmd = SPI_NOR_CMD_PP_1_4_4,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.sector_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_SE,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.chip_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_CE,
+			.cmd_length = 1,
+		},
+		.mode_change = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WRSR,
+			.cmd_length = 1,
+		},
+		.mode_payload = SPI_NOR_QE_BIT,
+	},
+	[MSPI_IO_MODE_OCTAL] = {
+		.id = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_OCMD_READ_ID,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 4
+		},
+		.write_en = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_WREN,
+			.cmd_length = 2,
+		},
+		.read = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_OCMD_RD,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 20,
+		},
+		.status = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_OCMD_RDSR,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 4,
+		},
+		.page_program = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_PAGE_PRG,
+			.cmd_length = 2,
+			.addr_length = 4,
+		},
+		.sector_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_SE,
+			.cmd_length = 2,
+			.addr_length = 4,
+		},
+		.chip_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_CE,
+			.cmd_length = 2,
+		},
+		.sfdp = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_OCMD_READ_SFDP,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 20,
+		},
+		.mode_change = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WR_CFGREG2,
+			.cmd_length = 1,
+			.addr_length = 4,
+		},
+		.mode_payload = 0x01,
+	},
+};
+
 struct flash_mspi_nor_config {
 	const struct device *bus;
 	uint32_t flash_size;
@@ -45,6 +216,7 @@ struct flash_mspi_nor_config {
 	struct flash_pages_layout layout;
 #endif
 	uint8_t jedec_id[SPI_NOR_MAX_ID_LEN];
+	const struct flash_mspi_nor_cmds *jedec_cmds;
 };
 
 static int acquire(const struct device *dev)
@@ -97,6 +269,27 @@ static inline uint16_t dev_page_size(const struct device *dev)
 	return SPI_NOR_PAGE_SIZE;
 }
 
+static void command_set(const struct device *dev, const struct flash_mspi_nor_cmd *cmd)
+{
+	struct flash_mspi_nor_data *dev_data = dev->data;
+
+	memset(&dev_data->xfer, 0, sizeof(dev_data->xfer));
+	memset(&dev_data->packet, 0, sizeof(dev_data->packet));
+
+	dev_data->xfer.xfer_mode  = MSPI_PIO;
+	dev_data->xfer.packets    = &dev_data->packet;
+	dev_data->xfer.num_packet = 1;
+	dev_data->xfer.timeout    = 10;
+
+	dev_data->xfer.cmd_length = cmd->cmd_length;
+	dev_data->xfer.addr_length = cmd->addr_length;
+	dev_data->xfer.tx_dummy = cmd->tx_dummy;
+	dev_data->xfer.rx_dummy = cmd->rx_dummy;
+
+	dev_data->packet.dir = cmd->dir;
+	dev_data->packet.cmd = cmd->cmd;
+}
+
 static int api_read(const struct device *dev, off_t addr, void *dest,
 		    size_t size)
 {
@@ -119,11 +312,7 @@ static int api_read(const struct device *dev, off_t addr, void *dest,
 	}
 
 	/* TODO: get rid of all these hard-coded values for MX25Ux chips */
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 20;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = SPI_NOR_OCMD_RD;
+	command_set(dev, &dev_config->jedec_cmds->read);
 	dev_data->packet.address   = addr;
 	dev_data->packet.data_buf  = dest;
 	dev_data->packet.num_bytes = size;
@@ -133,35 +322,38 @@ static int api_read(const struct device *dev, off_t addr, void *dest,
 	release(dev);
 
 	if (rc < 0) {
-		LOG_ERR("SPI_NOR_OCMD_RD xfer failed: %d", rc);
+		LOG_ERR("Read xfer failed: %d", rc);
 		return rc;
 	}
 
 	return 0;
 }
 
-static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
+static int status_get(const struct device *dev, uint8_t *status)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
 	struct flash_mspi_nor_data *dev_data = dev->data;
-	uint8_t status_reg;
+
+	command_set(dev, &dev_config->jedec_cmds->status);
+	dev_data->packet.data_buf  = status;
+	dev_data->packet.num_bytes = sizeof(uint8_t);
+
+	return mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
+}
+
+static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
+{
 	int rc;
+	uint8_t status_reg;
 
 	while (true) {
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.addr_length = 4;
-		dev_data->xfer.rx_dummy    = 4;
-		dev_data->packet.dir       = MSPI_RX;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_RDSR;
-		dev_data->packet.address   = 0;
-		dev_data->packet.data_buf  = &status_reg;
-		dev_data->packet.num_bytes = sizeof(status_reg);
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
+		rc = status_get(dev, &status_reg);
+
 		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_RDSR xfer failed: %d", rc);
+			LOG_ERR("Status xfer failed: %d", rc);
 			return rc;
 		}
+
 		if (!(status_reg & SPI_NOR_WIP_BIT)) {
 			break;
 		}
@@ -172,6 +364,15 @@ static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
 	return 0;
 }
 
+static int write_enable(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+
+	command_set(dev, &dev_config->jedec_cmds->write_en);
+	return mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
+}
+
 static int api_write(const struct device *dev, off_t addr, const void *src,
 		     size_t size)
 {
@@ -200,29 +401,19 @@ static int api_write(const struct device *dev, off_t addr, const void *src,
 		uint16_t page_left = page_size - page_offset;
 		uint16_t to_write = (uint16_t)MIN(size, page_left);
 
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.tx_dummy    = 0;
-		dev_data->packet.dir       = MSPI_TX;
-
-		dev_data->xfer.addr_length = 0;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
-		dev_data->packet.num_bytes = 0;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
+		if (write_enable(dev) < 0) {
+			LOG_ERR("Write enable xfer failed: %d", rc);
 			break;
 		}
 
-		dev_data->xfer.addr_length = 4;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_PAGE_PRG;
+		command_set(dev, &dev_config->jedec_cmds->page_program);
 		dev_data->packet.address   = addr;
 		dev_data->packet.data_buf  = (uint8_t *)src;
 		dev_data->packet.num_bytes = to_write;
 		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_PAGE_PRG xfer failed: %d", rc);
+			LOG_ERR("Page program xfer failed: %d", rc);
 			break;
 		}
 
@@ -266,32 +457,20 @@ static int api_erase(const struct device *dev, off_t addr, size_t size)
 	}
 
 	while (size > 0) {
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.tx_dummy    = 0;
-		dev_data->packet.dir       = MSPI_TX;
-		dev_data->packet.num_bytes = 0;
-
-		dev_data->xfer.addr_length = 0;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
+		rc = write_enable(dev);
 		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
+			LOG_ERR("Write enable failed.");
 			break;
 		}
 
 		if (size == flash_size) {
 			/* Chip erase. */
-			dev_data->xfer.addr_length = 0;
-			dev_data->packet.cmd       = SPI_NOR_OCMD_CE;
-
+			command_set(dev, &dev_config->jedec_cmds->chip_erase);
 			size -= flash_size;
 		} else {
 			/* Sector erase. */
-			dev_data->xfer.addr_length = 4;
-			dev_data->packet.cmd       = SPI_NOR_OCMD_SE;
-			dev_data->packet.address   = addr;
-
+			command_set(dev, &dev_config->jedec_cmds->sector_erase);
+			dev_data->packet.address = addr;
 			addr += SPI_NOR_SECTOR_SIZE;
 			size -= SPI_NOR_SECTOR_SIZE;
 		}
@@ -333,19 +512,14 @@ static int read_jedec_id(const struct device *dev, uint8_t *id)
 	struct flash_mspi_nor_data *dev_data = dev->data;
 	int rc;
 
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 4;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_OCMD_READ_ID;
-	dev_data->packet.address   = 0;
+	command_set(dev, &dev_config->jedec_cmds->id);
 	dev_data->packet.data_buf  = id;
 	dev_data->packet.num_bytes = JESD216_READ_ID_LEN;
+
 	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 			     &dev_data->xfer);
 	if (rc < 0) {
-		printk("mspi_transceive() failed: %d\n", rc);
-		return rc;
+		LOG_ERR("mspi_transceive() failed: %d\n", rc);
 	}
 
 	return rc;
@@ -380,11 +554,8 @@ static int api_sfdp_read(const struct device *dev, off_t addr, void *dest,
 		return rc;
 	}
 
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 20;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_OCMD_READ_SFDP;
+
+	command_set(dev, &dev_config->jedec_cmds->sfdp);
 	dev_data->packet.address   = addr;
 	dev_data->packet.data_buf  = dest;
 	dev_data->packet.num_bytes = size;
@@ -450,53 +621,39 @@ static int flash_chip_init(const struct device *dev)
 		return rc;
 	}
 
-	dev_data->xfer.xfer_mode  = MSPI_PIO;
-	dev_data->xfer.packets    = &dev_data->packet;
-	dev_data->xfer.num_packet = 1;
-	dev_data->xfer.timeout    = 10;
-
-	dev_data->xfer.cmd_length  = 1;
-	dev_data->xfer.addr_length = 0;
-	dev_data->xfer.tx_dummy    = 0;
-	dev_data->xfer.rx_dummy    = 0;
-
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_CMD_READ_ID;
+	command_set(dev, &commands[MSPI_IO_MODE_SINGLE].id);
 	dev_data->packet.data_buf  = id;
 	dev_data->packet.num_bytes = sizeof(id);
+
 	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 			     &dev_data->xfer);
 	if (rc < 0) {
-		LOG_ERR("Failed to read JEDEC ID in single line mode: %d", rc);
+		LOG_ERR("Failed to read JEDEC ID in initial line mode: %d", rc);
 		return rc;
 	}
 
-	/*
+	/* For octal mode:
 	 * If the read ID does not match the one from DTS, assume the flash
 	 * is already in the Octa I/O mode, so switching it is not needed.
 	 */
-	if (memcmp(id, dev_config->jedec_id, sizeof(id)) == 0) {
-		static const uint8_t enable_sopi[] = { 0x01 };
-
-		dev_data->packet.dir       = MSPI_TX;
-		dev_data->packet.cmd       = SPI_NOR_CMD_WREN;
-		dev_data->packet.num_bytes = 0;
+	if (((dev_config->mspi_cfg.io_mode == MSPI_IO_MODE_OCTAL) &&
+	     (memcmp(id, dev_config->jedec_id, sizeof(id)) == 0)) ||
+	    (dev_config->mspi_cfg.io_mode == MSPI_IO_MODE_QUAD_1_4_4)) {
+		command_set(dev, &commands[MSPI_IO_MODE_SINGLE].write_en);
 		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("SPI_NOR_CMD_WREN xfer failed: %d", rc);
+			LOG_ERR("Failed to set write enable: %d", rc);
 			return rc;
 		}
 
-		dev_data->xfer.addr_length = 4;
-		dev_data->packet.cmd       = SPI_NOR_CMD_WR_CFGREG2;
-		dev_data->packet.address   = 0;
-		dev_data->packet.data_buf  = (uint8_t *)&enable_sopi;
-		dev_data->packet.num_bytes = sizeof(enable_sopi);
+		command_set(dev, &dev_config->jedec_cmds->mode_change);
+		dev_data->packet.data_buf  = (uint8_t *)&dev_config->jedec_cmds->mode_payload;
+		dev_data->packet.num_bytes = sizeof(dev_config->jedec_cmds->mode_payload);
 		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 				     &dev_data->xfer);
 		if (rc < 0) {
-			printk("SPI_NOR_CMD_WR_CFGREG2 xfer failed: %d\n", rc);
+			LOG_ERR("Failed to change IO mode: %d\n", rc);
 			return rc;
 		}
 	}
@@ -621,11 +778,16 @@ static DEVICE_API(flash, drv_api) = {
 };
 
 #define FLASH_SIZE_INST(inst) (DT_INST_PROP(inst, size) / 8)
+#define FLASH_CMDS(inst) &commands[DT_INST_ENUM_IDX(inst, mspi_io_mode)]
 
 #define FLASH_MSPI_NOR_INST(inst)						\
-	BUILD_ASSERT(DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
-		     MSPI_IO_MODE_OCTAL,					\
-		"Only Octal I/O mode is supported for now");			\
+	BUILD_ASSERT((DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		      MSPI_IO_MODE_SINGLE) ||					\
+		     (DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		      MSPI_IO_MODE_QUAD_1_4_4) ||				\
+		     (DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		      MSPI_IO_MODE_OCTAL),					\
+		"Only 1x, 1-4-4 and 8x I/O modes are supported for now");	\
 	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);			\
 	static struct flash_mspi_nor_data dev##inst##_data;			\
 	static const struct flash_mspi_nor_config dev##inst##_config = {	\
@@ -648,6 +810,7 @@ static DEVICE_API(flash, drv_api) = {
 				     / CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE,	\
 		},))								\
 		.jedec_id = DT_INST_PROP(inst, jedec_id),			\
+		.jedec_cmds = FLASH_CMDS(inst),					\
 	};									\
 	DEVICE_DT_INST_DEFINE(inst,						\
 		drv_init, PM_DEVICE_DT_INST_GET(inst),				\

From 6dc8dcd81d6e7ea2a628e31820744ab73d76424b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Thu, 6 Mar 2025 08:45:43 +0100
Subject: [PATCH 2522/2913] [nrf fromlist] dts: nordic: nrf54l09: add clocks to
 GRTC
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added clocks to GRTC node to allow GRTC output and
access to frequency property.

Upstream PR #: 86701

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 dts/common/nordic/nrf54l09.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dts/common/nordic/nrf54l09.dtsi b/dts/common/nordic/nrf54l09.dtsi
index 1646f7ce4a5..afaa8ff9980 100644
--- a/dts/common/nordic/nrf54l09.dtsi
+++ b/dts/common/nordic/nrf54l09.dtsi
@@ -48,6 +48,12 @@
 	};
 
 	clocks {
+		pclk: pclk {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <DT_FREQ_M(16)>;
+		};
+
 		lfxo: lfxo {
 			compatible = "nordic,nrf-lfxo";
 			#clock-cells = <0>;
@@ -420,6 +426,8 @@
 				compatible = "nordic,nrf-grtc";
 				reg = <0xe2000 0x1000>;
 				cc-num = <12>;
+				clocks = <&lfxo>, <&pclk>;
+				clock-names = "lfclock", "hfclock";
 				status = "disabled";
 			};
 

From c3407f07ae770b4280fca6ee3f9097a2a9863e0c Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Thu, 6 Mar 2025 15:25:31 +0100
Subject: [PATCH 2523/2913] Revert "[nrf fromlist] drivers: flash: mspi_nor:
 support MODE_SINGLE and MODE_QUAD_1_4_4"

This reverts commit b44731ad30bc75e502040c3323bd514204797114.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 drivers/flash/flash_mspi_nor.c | 349 +++++++++------------------------
 1 file changed, 93 insertions(+), 256 deletions(-)

diff --git a/drivers/flash/flash_mspi_nor.c b/drivers/flash/flash_mspi_nor.c
index d366ab1708a..1f9f2c67ee9 100644
--- a/drivers/flash/flash_mspi_nor.c
+++ b/drivers/flash/flash_mspi_nor.c
@@ -28,177 +28,6 @@ struct flash_mspi_nor_data {
 	struct mspi_xfer xfer;
 };
 
-struct flash_mspi_nor_cmd {
-	enum mspi_xfer_direction dir;
-	uint32_t cmd;
-	uint16_t tx_dummy;
-	uint16_t rx_dummy;
-	uint8_t cmd_length;
-	uint8_t addr_length;
-};
-
-struct flash_mspi_nor_cmds {
-	struct flash_mspi_nor_cmd id;
-	struct flash_mspi_nor_cmd write_en;
-	struct flash_mspi_nor_cmd read;
-	struct flash_mspi_nor_cmd status;
-	struct flash_mspi_nor_cmd page_program;
-	struct flash_mspi_nor_cmd sector_erase;
-	struct flash_mspi_nor_cmd chip_erase;
-	struct flash_mspi_nor_cmd mode_change;
-	struct flash_mspi_nor_cmd sfdp;
-	uint8_t mode_payload;
-};
-
-static const struct flash_mspi_nor_cmds commands[] = {
-	[MSPI_IO_MODE_SINGLE] = {
-		.id = {
-			.dir = MSPI_RX,
-			.cmd = JESD216_CMD_READ_ID,
-			.cmd_length = 1,
-		},
-		.write_en = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WREN,
-			.cmd_length = 1,
-		},
-		.read = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_CMD_READ,
-			.cmd_length = 1,
-			.addr_length = 3,
-		},
-		.status = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_CMD_RDSR,
-			.cmd_length = 1,
-		},
-		.page_program = {
-			.dir  = MSPI_TX,
-			.cmd = SPI_NOR_CMD_PP,
-			.cmd_length = 1,
-			.addr_length = 3,
-		},
-		.sector_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_SE,
-			.cmd_length = 1,
-			.addr_length = 3,
-		},
-		.chip_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_CE,
-			.cmd_length = 1,
-		},
-	},
-	[MSPI_IO_MODE_QUAD_1_4_4] = {
-		.id = {
-			.dir = MSPI_RX,
-			.cmd = JESD216_CMD_READ_ID,
-			.cmd_length = 1,
-		},
-		.write_en = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WREN,
-			.cmd_length = 1,
-		},
-		.read = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_CMD_4READ,
-			.cmd_length = 1,
-			.addr_length = 3,
-			.rx_dummy = 6,
-		},
-		.status = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_CMD_RDSR,
-			.cmd_length = 1,
-		},
-		.page_program = {
-			.dir  = MSPI_TX,
-			.cmd = SPI_NOR_CMD_PP_1_4_4,
-			.cmd_length = 1,
-			.addr_length = 3,
-		},
-		.sector_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_SE,
-			.cmd_length = 1,
-			.addr_length = 3,
-		},
-		.chip_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_CE,
-			.cmd_length = 1,
-		},
-		.mode_change = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WRSR,
-			.cmd_length = 1,
-		},
-		.mode_payload = SPI_NOR_QE_BIT,
-	},
-	[MSPI_IO_MODE_OCTAL] = {
-		.id = {
-			.dir = MSPI_RX,
-			.cmd = JESD216_OCMD_READ_ID,
-			.cmd_length = 2,
-			.addr_length = 4,
-			.rx_dummy = 4
-		},
-		.write_en = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_OCMD_WREN,
-			.cmd_length = 2,
-		},
-		.read = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_OCMD_RD,
-			.cmd_length = 2,
-			.addr_length = 4,
-			.rx_dummy = 20,
-		},
-		.status = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_OCMD_RDSR,
-			.cmd_length = 2,
-			.addr_length = 4,
-			.rx_dummy = 4,
-		},
-		.page_program = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_OCMD_PAGE_PRG,
-			.cmd_length = 2,
-			.addr_length = 4,
-		},
-		.sector_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_OCMD_SE,
-			.cmd_length = 2,
-			.addr_length = 4,
-		},
-		.chip_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_OCMD_CE,
-			.cmd_length = 2,
-		},
-		.sfdp = {
-			.dir = MSPI_RX,
-			.cmd = JESD216_OCMD_READ_SFDP,
-			.cmd_length = 2,
-			.addr_length = 4,
-			.rx_dummy = 20,
-		},
-		.mode_change = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WR_CFGREG2,
-			.cmd_length = 1,
-			.addr_length = 4,
-		},
-		.mode_payload = 0x01,
-	},
-};
-
 struct flash_mspi_nor_config {
 	const struct device *bus;
 	uint32_t flash_size;
@@ -216,7 +45,6 @@ struct flash_mspi_nor_config {
 	struct flash_pages_layout layout;
 #endif
 	uint8_t jedec_id[SPI_NOR_MAX_ID_LEN];
-	const struct flash_mspi_nor_cmds *jedec_cmds;
 };
 
 static int acquire(const struct device *dev)
@@ -269,27 +97,6 @@ static inline uint16_t dev_page_size(const struct device *dev)
 	return SPI_NOR_PAGE_SIZE;
 }
 
-static void command_set(const struct device *dev, const struct flash_mspi_nor_cmd *cmd)
-{
-	struct flash_mspi_nor_data *dev_data = dev->data;
-
-	memset(&dev_data->xfer, 0, sizeof(dev_data->xfer));
-	memset(&dev_data->packet, 0, sizeof(dev_data->packet));
-
-	dev_data->xfer.xfer_mode  = MSPI_PIO;
-	dev_data->xfer.packets    = &dev_data->packet;
-	dev_data->xfer.num_packet = 1;
-	dev_data->xfer.timeout    = 10;
-
-	dev_data->xfer.cmd_length = cmd->cmd_length;
-	dev_data->xfer.addr_length = cmd->addr_length;
-	dev_data->xfer.tx_dummy = cmd->tx_dummy;
-	dev_data->xfer.rx_dummy = cmd->rx_dummy;
-
-	dev_data->packet.dir = cmd->dir;
-	dev_data->packet.cmd = cmd->cmd;
-}
-
 static int api_read(const struct device *dev, off_t addr, void *dest,
 		    size_t size)
 {
@@ -312,7 +119,11 @@ static int api_read(const struct device *dev, off_t addr, void *dest,
 	}
 
 	/* TODO: get rid of all these hard-coded values for MX25Ux chips */
-	command_set(dev, &dev_config->jedec_cmds->read);
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 20;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = SPI_NOR_OCMD_RD;
 	dev_data->packet.address   = addr;
 	dev_data->packet.data_buf  = dest;
 	dev_data->packet.num_bytes = size;
@@ -322,38 +133,35 @@ static int api_read(const struct device *dev, off_t addr, void *dest,
 	release(dev);
 
 	if (rc < 0) {
-		LOG_ERR("Read xfer failed: %d", rc);
+		LOG_ERR("SPI_NOR_OCMD_RD xfer failed: %d", rc);
 		return rc;
 	}
 
 	return 0;
 }
 
-static int status_get(const struct device *dev, uint8_t *status)
+static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
 	struct flash_mspi_nor_data *dev_data = dev->data;
-
-	command_set(dev, &dev_config->jedec_cmds->status);
-	dev_data->packet.data_buf  = status;
-	dev_data->packet.num_bytes = sizeof(uint8_t);
-
-	return mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
-}
-
-static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
-{
-	int rc;
 	uint8_t status_reg;
+	int rc;
 
 	while (true) {
-		rc = status_get(dev, &status_reg);
-
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.addr_length = 4;
+		dev_data->xfer.rx_dummy    = 4;
+		dev_data->packet.dir       = MSPI_RX;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_RDSR;
+		dev_data->packet.address   = 0;
+		dev_data->packet.data_buf  = &status_reg;
+		dev_data->packet.num_bytes = sizeof(status_reg);
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("Status xfer failed: %d", rc);
+			LOG_ERR("SPI_NOR_OCMD_RDSR xfer failed: %d", rc);
 			return rc;
 		}
-
 		if (!(status_reg & SPI_NOR_WIP_BIT)) {
 			break;
 		}
@@ -364,15 +172,6 @@ static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
 	return 0;
 }
 
-static int write_enable(const struct device *dev)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-
-	command_set(dev, &dev_config->jedec_cmds->write_en);
-	return mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
-}
-
 static int api_write(const struct device *dev, off_t addr, const void *src,
 		     size_t size)
 {
@@ -401,19 +200,29 @@ static int api_write(const struct device *dev, off_t addr, const void *src,
 		uint16_t page_left = page_size - page_offset;
 		uint16_t to_write = (uint16_t)MIN(size, page_left);
 
-		if (write_enable(dev) < 0) {
-			LOG_ERR("Write enable xfer failed: %d", rc);
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.tx_dummy    = 0;
+		dev_data->packet.dir       = MSPI_TX;
+
+		dev_data->xfer.addr_length = 0;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
+		dev_data->packet.num_bytes = 0;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
 			break;
 		}
 
-		command_set(dev, &dev_config->jedec_cmds->page_program);
+		dev_data->xfer.addr_length = 4;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_PAGE_PRG;
 		dev_data->packet.address   = addr;
 		dev_data->packet.data_buf  = (uint8_t *)src;
 		dev_data->packet.num_bytes = to_write;
 		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("Page program xfer failed: %d", rc);
+			LOG_ERR("SPI_NOR_OCMD_PAGE_PRG xfer failed: %d", rc);
 			break;
 		}
 
@@ -457,20 +266,32 @@ static int api_erase(const struct device *dev, off_t addr, size_t size)
 	}
 
 	while (size > 0) {
-		rc = write_enable(dev);
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.tx_dummy    = 0;
+		dev_data->packet.dir       = MSPI_TX;
+		dev_data->packet.num_bytes = 0;
+
+		dev_data->xfer.addr_length = 0;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("Write enable failed.");
+			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
 			break;
 		}
 
 		if (size == flash_size) {
 			/* Chip erase. */
-			command_set(dev, &dev_config->jedec_cmds->chip_erase);
+			dev_data->xfer.addr_length = 0;
+			dev_data->packet.cmd       = SPI_NOR_OCMD_CE;
+
 			size -= flash_size;
 		} else {
 			/* Sector erase. */
-			command_set(dev, &dev_config->jedec_cmds->sector_erase);
-			dev_data->packet.address = addr;
+			dev_data->xfer.addr_length = 4;
+			dev_data->packet.cmd       = SPI_NOR_OCMD_SE;
+			dev_data->packet.address   = addr;
+
 			addr += SPI_NOR_SECTOR_SIZE;
 			size -= SPI_NOR_SECTOR_SIZE;
 		}
@@ -512,14 +333,19 @@ static int read_jedec_id(const struct device *dev, uint8_t *id)
 	struct flash_mspi_nor_data *dev_data = dev->data;
 	int rc;
 
-	command_set(dev, &dev_config->jedec_cmds->id);
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 4;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_OCMD_READ_ID;
+	dev_data->packet.address   = 0;
 	dev_data->packet.data_buf  = id;
 	dev_data->packet.num_bytes = JESD216_READ_ID_LEN;
-
 	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 			     &dev_data->xfer);
 	if (rc < 0) {
-		LOG_ERR("mspi_transceive() failed: %d\n", rc);
+		printk("mspi_transceive() failed: %d\n", rc);
+		return rc;
 	}
 
 	return rc;
@@ -554,8 +380,11 @@ static int api_sfdp_read(const struct device *dev, off_t addr, void *dest,
 		return rc;
 	}
 
-
-	command_set(dev, &dev_config->jedec_cmds->sfdp);
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 20;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_OCMD_READ_SFDP;
 	dev_data->packet.address   = addr;
 	dev_data->packet.data_buf  = dest;
 	dev_data->packet.num_bytes = size;
@@ -621,39 +450,53 @@ static int flash_chip_init(const struct device *dev)
 		return rc;
 	}
 
-	command_set(dev, &commands[MSPI_IO_MODE_SINGLE].id);
+	dev_data->xfer.xfer_mode  = MSPI_PIO;
+	dev_data->xfer.packets    = &dev_data->packet;
+	dev_data->xfer.num_packet = 1;
+	dev_data->xfer.timeout    = 10;
+
+	dev_data->xfer.cmd_length  = 1;
+	dev_data->xfer.addr_length = 0;
+	dev_data->xfer.tx_dummy    = 0;
+	dev_data->xfer.rx_dummy    = 0;
+
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_CMD_READ_ID;
 	dev_data->packet.data_buf  = id;
 	dev_data->packet.num_bytes = sizeof(id);
-
 	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 			     &dev_data->xfer);
 	if (rc < 0) {
-		LOG_ERR("Failed to read JEDEC ID in initial line mode: %d", rc);
+		LOG_ERR("Failed to read JEDEC ID in single line mode: %d", rc);
 		return rc;
 	}
 
-	/* For octal mode:
+	/*
 	 * If the read ID does not match the one from DTS, assume the flash
 	 * is already in the Octa I/O mode, so switching it is not needed.
 	 */
-	if (((dev_config->mspi_cfg.io_mode == MSPI_IO_MODE_OCTAL) &&
-	     (memcmp(id, dev_config->jedec_id, sizeof(id)) == 0)) ||
-	    (dev_config->mspi_cfg.io_mode == MSPI_IO_MODE_QUAD_1_4_4)) {
-		command_set(dev, &commands[MSPI_IO_MODE_SINGLE].write_en);
+	if (memcmp(id, dev_config->jedec_id, sizeof(id)) == 0) {
+		static const uint8_t enable_sopi[] = { 0x01 };
+
+		dev_data->packet.dir       = MSPI_TX;
+		dev_data->packet.cmd       = SPI_NOR_CMD_WREN;
+		dev_data->packet.num_bytes = 0;
 		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("Failed to set write enable: %d", rc);
+			LOG_ERR("SPI_NOR_CMD_WREN xfer failed: %d", rc);
 			return rc;
 		}
 
-		command_set(dev, &dev_config->jedec_cmds->mode_change);
-		dev_data->packet.data_buf  = (uint8_t *)&dev_config->jedec_cmds->mode_payload;
-		dev_data->packet.num_bytes = sizeof(dev_config->jedec_cmds->mode_payload);
+		dev_data->xfer.addr_length = 4;
+		dev_data->packet.cmd       = SPI_NOR_CMD_WR_CFGREG2;
+		dev_data->packet.address   = 0;
+		dev_data->packet.data_buf  = (uint8_t *)&enable_sopi;
+		dev_data->packet.num_bytes = sizeof(enable_sopi);
 		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("Failed to change IO mode: %d\n", rc);
+			printk("SPI_NOR_CMD_WR_CFGREG2 xfer failed: %d\n", rc);
 			return rc;
 		}
 	}
@@ -778,16 +621,11 @@ static DEVICE_API(flash, drv_api) = {
 };
 
 #define FLASH_SIZE_INST(inst) (DT_INST_PROP(inst, size) / 8)
-#define FLASH_CMDS(inst) &commands[DT_INST_ENUM_IDX(inst, mspi_io_mode)]
 
 #define FLASH_MSPI_NOR_INST(inst)						\
-	BUILD_ASSERT((DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
-		      MSPI_IO_MODE_SINGLE) ||					\
-		     (DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
-		      MSPI_IO_MODE_QUAD_1_4_4) ||				\
-		     (DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
-		      MSPI_IO_MODE_OCTAL),					\
-		"Only 1x, 1-4-4 and 8x I/O modes are supported for now");	\
+	BUILD_ASSERT(DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		     MSPI_IO_MODE_OCTAL,					\
+		"Only Octal I/O mode is supported for now");			\
 	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);			\
 	static struct flash_mspi_nor_data dev##inst##_data;			\
 	static const struct flash_mspi_nor_config dev##inst##_config = {	\
@@ -810,7 +648,6 @@ static DEVICE_API(flash, drv_api) = {
 				     / CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE,	\
 		},))								\
 		.jedec_id = DT_INST_PROP(inst, jedec_id),			\
-		.jedec_cmds = FLASH_CMDS(inst),					\
 	};									\
 	DEVICE_DT_INST_DEFINE(inst,						\
 		drv_init, PM_DEVICE_DT_INST_GET(inst),				\

From ee6cc76550d2fcbe62be273e0a85193db737f758 Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Fri, 7 Feb 2025 15:01:18 +0100
Subject: [PATCH 2524/2913] [nrf fromlist] drivers: flash: mspi_nor: support
 MODE_SINGLE and MODE_QUAD_1_4_4

Extend driver to support single lane and 1-4-4 IO modes.

Upstream PR #: 85520

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 drivers/flash/flash_mspi_nor.c | 396 ++++++++++++++++++++++++---------
 1 file changed, 290 insertions(+), 106 deletions(-)

diff --git a/drivers/flash/flash_mspi_nor.c b/drivers/flash/flash_mspi_nor.c
index 1f9f2c67ee9..d9eecaeb298 100644
--- a/drivers/flash/flash_mspi_nor.c
+++ b/drivers/flash/flash_mspi_nor.c
@@ -28,6 +28,183 @@ struct flash_mspi_nor_data {
 	struct mspi_xfer xfer;
 };
 
+struct flash_mspi_nor_cmd {
+	enum mspi_xfer_direction dir;
+	uint32_t cmd;
+	uint16_t tx_dummy;
+	uint16_t rx_dummy;
+	uint8_t cmd_length;
+	uint8_t addr_length;
+};
+
+struct flash_mspi_nor_cmds {
+	struct flash_mspi_nor_cmd id;
+	struct flash_mspi_nor_cmd write_en;
+	struct flash_mspi_nor_cmd read;
+	struct flash_mspi_nor_cmd status;
+	struct flash_mspi_nor_cmd page_program;
+	struct flash_mspi_nor_cmd sector_erase;
+	struct flash_mspi_nor_cmd chip_erase;
+	struct flash_mspi_nor_cmd mode_change;
+	struct flash_mspi_nor_cmd sfdp;
+	uint8_t mode_payload;
+};
+
+static const struct flash_mspi_nor_cmds commands[] = {
+	[MSPI_IO_MODE_SINGLE] = {
+		.id = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_CMD_READ_ID,
+			.cmd_length = 1,
+		},
+		.write_en = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WREN,
+			.cmd_length = 1,
+		},
+		.read = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_READ,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.status = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_RDSR,
+			.cmd_length = 1,
+		},
+		.page_program = {
+			.dir  = MSPI_TX,
+			.cmd = SPI_NOR_CMD_PP,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.sector_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_SE,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.chip_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_CE,
+			.cmd_length = 1,
+		},
+		.mode_change = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WRSR,
+			.cmd_length = 1,
+		},
+		.mode_payload = 0,
+	},
+	[MSPI_IO_MODE_QUAD_1_4_4] = {
+		.id = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_CMD_READ_ID,
+			.cmd_length = 1,
+		},
+		.write_en = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WREN,
+			.cmd_length = 1,
+		},
+		.read = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_4READ,
+			.cmd_length = 1,
+			.addr_length = 3,
+			.rx_dummy = 6,
+		},
+		.status = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_RDSR,
+			.cmd_length = 1,
+		},
+		.page_program = {
+			.dir  = MSPI_TX,
+			.cmd = SPI_NOR_CMD_PP_1_4_4,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.sector_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_SE,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.chip_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_CE,
+			.cmd_length = 1,
+		},
+		.mode_change = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WRSR,
+			.cmd_length = 1,
+		},
+		.mode_payload = SPI_NOR_QE_BIT,
+	},
+	[MSPI_IO_MODE_OCTAL] = {
+		.id = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_OCMD_READ_ID,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 4
+		},
+		.write_en = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_WREN,
+			.cmd_length = 2,
+		},
+		.read = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_OCMD_RD,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 20,
+		},
+		.status = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_OCMD_RDSR,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 4,
+		},
+		.page_program = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_PAGE_PRG,
+			.cmd_length = 2,
+			.addr_length = 4,
+		},
+		.sector_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_SE,
+			.cmd_length = 2,
+			.addr_length = 4,
+		},
+		.chip_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_CE,
+			.cmd_length = 2,
+		},
+		.sfdp = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_OCMD_READ_SFDP,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 20,
+		},
+		.mode_change = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WR_CFGREG2,
+			.cmd_length = 1,
+			.addr_length = 4,
+		},
+		.mode_payload = 0x01,
+	},
+};
+
 struct flash_mspi_nor_config {
 	const struct device *bus;
 	uint32_t flash_size;
@@ -45,6 +222,7 @@ struct flash_mspi_nor_config {
 	struct flash_pages_layout layout;
 #endif
 	uint8_t jedec_id[SPI_NOR_MAX_ID_LEN];
+	const struct flash_mspi_nor_cmds *jedec_cmds;
 };
 
 static int acquire(const struct device *dev)
@@ -97,6 +275,27 @@ static inline uint16_t dev_page_size(const struct device *dev)
 	return SPI_NOR_PAGE_SIZE;
 }
 
+static void command_set(const struct device *dev, const struct flash_mspi_nor_cmd *cmd)
+{
+	struct flash_mspi_nor_data *dev_data = dev->data;
+
+	memset(&dev_data->xfer, 0, sizeof(dev_data->xfer));
+	memset(&dev_data->packet, 0, sizeof(dev_data->packet));
+
+	dev_data->xfer.xfer_mode  = MSPI_PIO;
+	dev_data->xfer.packets    = &dev_data->packet;
+	dev_data->xfer.num_packet = 1;
+	dev_data->xfer.timeout    = 10;
+
+	dev_data->xfer.cmd_length = cmd->cmd_length;
+	dev_data->xfer.addr_length = cmd->addr_length;
+	dev_data->xfer.tx_dummy = cmd->tx_dummy;
+	dev_data->xfer.rx_dummy = cmd->rx_dummy;
+
+	dev_data->packet.dir = cmd->dir;
+	dev_data->packet.cmd = cmd->cmd;
+}
+
 static int api_read(const struct device *dev, off_t addr, void *dest,
 		    size_t size)
 {
@@ -119,11 +318,7 @@ static int api_read(const struct device *dev, off_t addr, void *dest,
 	}
 
 	/* TODO: get rid of all these hard-coded values for MX25Ux chips */
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 20;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = SPI_NOR_OCMD_RD;
+	command_set(dev, &dev_config->jedec_cmds->read);
 	dev_data->packet.address   = addr;
 	dev_data->packet.data_buf  = dest;
 	dev_data->packet.num_bytes = size;
@@ -133,35 +328,38 @@ static int api_read(const struct device *dev, off_t addr, void *dest,
 	release(dev);
 
 	if (rc < 0) {
-		LOG_ERR("SPI_NOR_OCMD_RD xfer failed: %d", rc);
+		LOG_ERR("Read xfer failed: %d", rc);
 		return rc;
 	}
 
 	return 0;
 }
 
-static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
+static int status_get(const struct device *dev, uint8_t *status)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
 	struct flash_mspi_nor_data *dev_data = dev->data;
-	uint8_t status_reg;
+
+	command_set(dev, &dev_config->jedec_cmds->status);
+	dev_data->packet.data_buf  = status;
+	dev_data->packet.num_bytes = sizeof(uint8_t);
+
+	return mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
+}
+
+static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
+{
 	int rc;
+	uint8_t status_reg;
 
 	while (true) {
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.addr_length = 4;
-		dev_data->xfer.rx_dummy    = 4;
-		dev_data->packet.dir       = MSPI_RX;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_RDSR;
-		dev_data->packet.address   = 0;
-		dev_data->packet.data_buf  = &status_reg;
-		dev_data->packet.num_bytes = sizeof(status_reg);
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
+		rc = status_get(dev, &status_reg);
+
 		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_RDSR xfer failed: %d", rc);
+			LOG_ERR("Status xfer failed: %d", rc);
 			return rc;
 		}
+
 		if (!(status_reg & SPI_NOR_WIP_BIT)) {
 			break;
 		}
@@ -172,6 +370,15 @@ static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
 	return 0;
 }
 
+static int write_enable(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+
+	command_set(dev, &dev_config->jedec_cmds->write_en);
+	return mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
+}
+
 static int api_write(const struct device *dev, off_t addr, const void *src,
 		     size_t size)
 {
@@ -200,29 +407,19 @@ static int api_write(const struct device *dev, off_t addr, const void *src,
 		uint16_t page_left = page_size - page_offset;
 		uint16_t to_write = (uint16_t)MIN(size, page_left);
 
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.tx_dummy    = 0;
-		dev_data->packet.dir       = MSPI_TX;
-
-		dev_data->xfer.addr_length = 0;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
-		dev_data->packet.num_bytes = 0;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
+		if (write_enable(dev) < 0) {
+			LOG_ERR("Write enable xfer failed: %d", rc);
 			break;
 		}
 
-		dev_data->xfer.addr_length = 4;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_PAGE_PRG;
+		command_set(dev, &dev_config->jedec_cmds->page_program);
 		dev_data->packet.address   = addr;
 		dev_data->packet.data_buf  = (uint8_t *)src;
 		dev_data->packet.num_bytes = to_write;
 		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_PAGE_PRG xfer failed: %d", rc);
+			LOG_ERR("Page program xfer failed: %d", rc);
 			break;
 		}
 
@@ -266,32 +463,20 @@ static int api_erase(const struct device *dev, off_t addr, size_t size)
 	}
 
 	while (size > 0) {
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.tx_dummy    = 0;
-		dev_data->packet.dir       = MSPI_TX;
-		dev_data->packet.num_bytes = 0;
-
-		dev_data->xfer.addr_length = 0;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
+		rc = write_enable(dev);
 		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
+			LOG_ERR("Write enable failed.");
 			break;
 		}
 
 		if (size == flash_size) {
 			/* Chip erase. */
-			dev_data->xfer.addr_length = 0;
-			dev_data->packet.cmd       = SPI_NOR_OCMD_CE;
-
+			command_set(dev, &dev_config->jedec_cmds->chip_erase);
 			size -= flash_size;
 		} else {
 			/* Sector erase. */
-			dev_data->xfer.addr_length = 4;
-			dev_data->packet.cmd       = SPI_NOR_OCMD_SE;
-			dev_data->packet.address   = addr;
-
+			command_set(dev, &dev_config->jedec_cmds->sector_erase);
+			dev_data->packet.address = addr;
 			addr += SPI_NOR_SECTOR_SIZE;
 			size -= SPI_NOR_SECTOR_SIZE;
 		}
@@ -333,19 +518,14 @@ static int read_jedec_id(const struct device *dev, uint8_t *id)
 	struct flash_mspi_nor_data *dev_data = dev->data;
 	int rc;
 
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 4;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_OCMD_READ_ID;
-	dev_data->packet.address   = 0;
+	command_set(dev, &dev_config->jedec_cmds->id);
 	dev_data->packet.data_buf  = id;
 	dev_data->packet.num_bytes = JESD216_READ_ID_LEN;
+
 	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 			     &dev_data->xfer);
 	if (rc < 0) {
-		printk("mspi_transceive() failed: %d\n", rc);
-		return rc;
+		LOG_ERR("mspi_transceive() failed: %d\n", rc);
 	}
 
 	return rc;
@@ -380,11 +560,8 @@ static int api_sfdp_read(const struct device *dev, off_t addr, void *dest,
 		return rc;
 	}
 
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 20;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_OCMD_READ_SFDP;
+
+	command_set(dev, &dev_config->jedec_cmds->sfdp);
 	dev_data->packet.address   = addr;
 	dev_data->packet.data_buf  = dest;
 	dev_data->packet.num_bytes = size;
@@ -432,6 +609,41 @@ static int dev_pm_action_cb(const struct device *dev,
 	return 0;
 }
 
+static int switch_mode(const struct device *dev, uint8_t *id)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+
+	/* For octal mode:
+	 * If the read ID does not match the one from DTS, assume the flash
+	 * is already in the Octa I/O mode, so switching it is not needed.
+	 */
+	if ((dev_config->mspi_cfg.io_mode == MSPI_IO_MODE_OCTAL) &&
+	     (memcmp(id, dev_config->jedec_id, JESD216_READ_ID_LEN) != 0)) {
+		return 0;
+	}
+
+	command_set(dev, &commands[MSPI_IO_MODE_SINGLE].write_en);
+	int rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		LOG_ERR("Failed to set write enable: %d", rc);
+		return rc;
+	}
+
+	command_set(dev, &dev_config->jedec_cmds->mode_change);
+	dev_data->packet.data_buf  = (uint8_t *)&dev_config->jedec_cmds->mode_payload;
+	dev_data->packet.num_bytes = sizeof(dev_config->jedec_cmds->mode_payload);
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		LOG_ERR("Failed to change IO mode: %d\n", rc);
+		return rc;
+	}
+
+	return 0;
+}
+
 static int flash_chip_init(const struct device *dev)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
@@ -450,55 +662,21 @@ static int flash_chip_init(const struct device *dev)
 		return rc;
 	}
 
-	dev_data->xfer.xfer_mode  = MSPI_PIO;
-	dev_data->xfer.packets    = &dev_data->packet;
-	dev_data->xfer.num_packet = 1;
-	dev_data->xfer.timeout    = 10;
-
-	dev_data->xfer.cmd_length  = 1;
-	dev_data->xfer.addr_length = 0;
-	dev_data->xfer.tx_dummy    = 0;
-	dev_data->xfer.rx_dummy    = 0;
-
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_CMD_READ_ID;
+	command_set(dev, &commands[MSPI_IO_MODE_SINGLE].id);
 	dev_data->packet.data_buf  = id;
 	dev_data->packet.num_bytes = sizeof(id);
+
 	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 			     &dev_data->xfer);
 	if (rc < 0) {
-		LOG_ERR("Failed to read JEDEC ID in single line mode: %d", rc);
+		LOG_ERR("Failed to read JEDEC ID in initial line mode: %d", rc);
 		return rc;
 	}
 
-	/*
-	 * If the read ID does not match the one from DTS, assume the flash
-	 * is already in the Octa I/O mode, so switching it is not needed.
-	 */
-	if (memcmp(id, dev_config->jedec_id, sizeof(id)) == 0) {
-		static const uint8_t enable_sopi[] = { 0x01 };
+	rc = switch_mode(dev, id);
 
-		dev_data->packet.dir       = MSPI_TX;
-		dev_data->packet.cmd       = SPI_NOR_CMD_WREN;
-		dev_data->packet.num_bytes = 0;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("SPI_NOR_CMD_WREN xfer failed: %d", rc);
-			return rc;
-		}
-
-		dev_data->xfer.addr_length = 4;
-		dev_data->packet.cmd       = SPI_NOR_CMD_WR_CFGREG2;
-		dev_data->packet.address   = 0;
-		dev_data->packet.data_buf  = (uint8_t *)&enable_sopi;
-		dev_data->packet.num_bytes = sizeof(enable_sopi);
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			printk("SPI_NOR_CMD_WR_CFGREG2 xfer failed: %d\n", rc);
-			return rc;
-		}
+	if (rc < 0) {
+		LOG_ERR("Failed to switch mode: %d", rc);
 	}
 
 	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
@@ -621,11 +799,16 @@ static DEVICE_API(flash, drv_api) = {
 };
 
 #define FLASH_SIZE_INST(inst) (DT_INST_PROP(inst, size) / 8)
+#define FLASH_CMDS(inst) &commands[DT_INST_ENUM_IDX(inst, mspi_io_mode)]
 
 #define FLASH_MSPI_NOR_INST(inst)						\
-	BUILD_ASSERT(DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
-		     MSPI_IO_MODE_OCTAL,					\
-		"Only Octal I/O mode is supported for now");			\
+	BUILD_ASSERT((DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		      MSPI_IO_MODE_SINGLE) ||					\
+		     (DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		      MSPI_IO_MODE_QUAD_1_4_4) ||				\
+		     (DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		      MSPI_IO_MODE_OCTAL),					\
+		"Only 1x, 1-4-4 and 8x I/O modes are supported for now");	\
 	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);			\
 	static struct flash_mspi_nor_data dev##inst##_data;			\
 	static const struct flash_mspi_nor_config dev##inst##_config = {	\
@@ -648,6 +831,7 @@ static DEVICE_API(flash, drv_api) = {
 				     / CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE,	\
 		},))								\
 		.jedec_id = DT_INST_PROP(inst, jedec_id),			\
+		.jedec_cmds = FLASH_CMDS(inst),					\
 	};									\
 	DEVICE_DT_INST_DEFINE(inst,						\
 		drv_init, PM_DEVICE_DT_INST_GET(inst),				\

From 96716d468619fefee429a08eee64ea2759179c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Thu, 6 Mar 2025 12:14:16 +0100
Subject: [PATCH 2525/2913] [nrf fromlist] soc: nordic: enable west commands
 for nRF54L20 Enga cpuflpr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enabled west flash and west erase for nRF54L20 PDK FLPR core.
Added missing reset qualifier for nRF54L20 and nRF54L09.

Upstream PR #: 79355

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 soc/nordic/soc.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/soc/nordic/soc.yml b/soc/nordic/soc.yml
index 1e9ecac5f28..252061fc008 100644
--- a/soc/nordic/soc.yml
+++ b/soc/nordic/soc.yml
@@ -119,6 +119,7 @@ runners:
               - nrf54l15/cpuflpr
           - qualifiers:
               - nrf54l20/cpuapp
+              - nrf54l20/cpuflpr
           - qualifiers:
               - nrf54h20/cpuapp
               - nrf54h20/cpurad
@@ -181,6 +182,7 @@ runners:
               - nrf54l15/cpuflpr
           - qualifiers:
               - nrf54l20/cpuapp
+              - nrf54l20/cpuflpr
           - qualifiers:
               - nrf54h20/cpuapp
               - nrf54h20/cpurad
@@ -233,12 +235,17 @@ runners:
           - qualifiers:
               - nrf54l05/cpuapp
               - nrf54l05/cpuflpr
+          - qualifiers:
+              - nrf54l09/cpuapp
           - qualifiers:
               - nrf54l10/cpuapp
               - nrf54l10/cpuflpr
           - qualifiers:
               - nrf54l15/cpuapp
               - nrf54l15/cpuflpr
+          - qualifiers:
+              - nrf54l20/cpuapp
+              - nrf54l20/cpuflpr
           - qualifiers:
               - nrf54h20/cpuapp
               - nrf54h20/cpurad

From c63d142fd807d7bc62c52f37abd94017ee3ae1da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Fri, 7 Mar 2025 09:02:31 +0100
Subject: [PATCH 2526/2913] [nrf noup] Revert "[nrf fromlist] boards: nordic:
 add FLPR core to nRF54L20pdk"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9b95c91de050551eede1ac95666f264d694a4540.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk |  1 -
 boards/nordic/nrf54l20pdk/board.cmake         |  6 +-
 boards/nordic/nrf54l20pdk/board.yml           |  3 -
 boards/nordic/nrf54l20pdk/doc/index.rst       |  6 --
 .../nrf54l20pdk/nrf54l20_cpuapp_common.dtsi   |  5 ++
 .../nrf54l20pdk_nrf54l20-common.dtsi          | 12 ----
 .../nrf54l20pdk_nrf54l20-pinctrl.dtsi         | 23 -------
 .../nrf54l20pdk_nrf54l20_cpuflpr.dts          | 68 -------------------
 .../nrf54l20pdk_nrf54l20_cpuflpr.yaml         | 14 ----
 .../nrf54l20pdk_nrf54l20_cpuflpr_defconfig    | 19 ------
 10 files changed, 6 insertions(+), 151 deletions(-)
 delete mode 100644 boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.dts
 delete mode 100644 boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.yaml
 delete mode 100644 boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr_defconfig

diff --git a/boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk b/boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk
index 3ac84ee1ea3..09809ff7374 100644
--- a/boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk
+++ b/boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk
@@ -3,4 +3,3 @@
 
 config BOARD_NRF54L20PDK
 	select SOC_NRF54L20_ENGA_CPUAPP if BOARD_NRF54L20PDK_NRF54L20_CPUAPP
-	select SOC_NRF54L20_ENGA_CPUFLPR if BOARD_NRF54L20PDK_NRF54L20_CPUFLPR
diff --git a/boards/nordic/nrf54l20pdk/board.cmake b/boards/nordic/nrf54l20pdk/board.cmake
index 3bb4e520198..5d36ac00a3e 100644
--- a/boards/nordic/nrf54l20pdk/board.cmake
+++ b/boards/nordic/nrf54l20pdk/board.cmake
@@ -1,11 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_BOARD_NRF54L20PDK_NRF54L20_CPUAPP)
-  board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
-elseif(CONFIG_BOARD_NRF54L20PDK_NRF54L20_CPUFLPR)
-  board_runner_args(jlink "--speed=4000")
-endif()
+board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
 
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf54l20pdk/board.yml b/boards/nordic/nrf54l20pdk/board.yml
index de39dcb4a3f..4eaa66669fc 100644
--- a/boards/nordic/nrf54l20pdk/board.yml
+++ b/boards/nordic/nrf54l20pdk/board.yml
@@ -4,6 +4,3 @@ board:
   vendor: nordic
   socs:
   - name: nrf54l20
-    variants:
-    - name: xip
-      cpucluster: cpuflpr
diff --git a/boards/nordic/nrf54l20pdk/doc/index.rst b/boards/nordic/nrf54l20pdk/doc/index.rst
index 7805d2ea9f9..aaed616ecce 100644
--- a/boards/nordic/nrf54l20pdk/doc/index.rst
+++ b/boards/nordic/nrf54l20pdk/doc/index.rst
@@ -65,12 +65,6 @@ built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
 building and running.
 
-Applications for the ``nrf54l20pdk/nrf54l20/cpuflpr`` board target need
-to be built using sysbuild to include the ``vpr_launcher`` image for the application core.
-
-Enter the following command to compile ``hello_world`` for the FLPR core::
- west build -p -b nrf54l20pdk/nrf54l20/cpuflpr --sysbuild
-
 Flashing
 ========
 
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
index ed9d76a6b19..ec6f2740648 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
@@ -27,6 +27,11 @@
 	status = "okay";
 };
 
+&hfpll {
+	/* For now use 64 MHz clock for CPU and fast peripherals. */
+	clock-frequency = <DT_FREQ_M(64)>;
+};
+
 &lfxo {
 	load-capacitors = "internal";
 	load-capacitance-femtofarad = <15500>;
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi
index 6eb67fe1bb3..35a434cda4b 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi
@@ -91,15 +91,3 @@
 	pinctrl-1 = <&pwm20_sleep>;
 	pinctrl-names = "default", "sleep";
 };
-
-&uart30 {
-	current-speed = <115200>;
-	pinctrl-0 = <&uart30_default>;
-	pinctrl-1 = <&uart30_sleep>;
-	pinctrl-names = "default", "sleep";
-};
-
-&hfpll {
-	/* For now use 64 MHz clock for CPU and fast peripherals. */
-	clock-frequency = <DT_FREQ_M(64)>;
-};
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi
index b70be2bfa5e..7dc2b77ae83 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi
@@ -34,27 +34,4 @@
 			low-power-enable;
 		};
 	};
-
-	/omit-if-no-ref/ uart30_default: uart30_default {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 0, 0)>,
-				<NRF_PSEL(UART_RTS, 0, 2)>;
-		};
-
-		group2 {
-			psels = <NRF_PSEL(UART_RX, 0, 1)>,
-				<NRF_PSEL(UART_CTS, 0, 3)>;
-			bias-pull-up;
-		};
-	};
-
-	/omit-if-no-ref/ uart30_sleep: uart30_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 0, 0)>,
-				<NRF_PSEL(UART_RX, 0, 1)>,
-				<NRF_PSEL(UART_RTS, 0, 2)>,
-				<NRF_PSEL(UART_CTS, 0, 3)>;
-			low-power-enable;
-		};
-	};
 };
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.dts b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.dts
deleted file mode 100644
index ea3c5d6ff6a..00000000000
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.dts
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2025 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-#include <nordic/nrf54l20_enga_cpuflpr.dtsi>
-#include "nrf54l20pdk_nrf54l20-common.dtsi"
-
-/ {
-	model = "Nordic nRF54L20 PDK nRF54L20 FLPR MCU";
-	compatible = "nordic,nrf54l20pdk_nrf54l20-cpuflpr";
-
-	chosen {
-		zephyr,console = &uart30;
-		zephyr,shell-uart = &uart30;
-		zephyr,code-partition = &cpuflpr_code_partition;
-		zephyr,flash = &cpuflpr_rram;
-		zephyr,sram = &cpuflpr_sram;
-	};
-};
-
-&cpuflpr_sram {
-	status = "okay";
-};
-
-&cpuflpr_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		cpuflpr_code_partition: partition@0 {
-			label = "image-0";
-			reg = <0x0 DT_SIZE_K(64)>;
-		};
-	};
-};
-
-&grtc {
-	owned-channels = <3 4>;
-	status = "okay";
-};
-
-&uart30 {
-	status = "okay";
-};
-
-&gpio0 {
-	status = "okay";
-};
-
-&gpio1 {
-	status = "okay";
-};
-
-&gpio2 {
-	status = "okay";
-};
-
-&gpiote20 {
-	status = "okay";
-};
-
-&gpiote30 {
-	status = "okay";
-};
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.yaml b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.yaml
deleted file mode 100644
index 8a9524bfbe4..00000000000
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2025 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54l20pdk/nrf54l20/cpuflpr
-name: nRF54L20-PDK-nRF54L20-Fast-Lightweight-Peripheral-Processor
-type: mcu
-arch: riscv
-toolchain:
-  - zephyr
-ram: 64
-flash: 64
-supported:
-  - counter
-  - gpio
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr_defconfig b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr_defconfig
deleted file mode 100644
index 75f7c4386e3..00000000000
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr_defconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2025 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-# Enable UART driver
-CONFIG_SERIAL=y
-
-# Enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-
-# Enable GPIO
-CONFIG_GPIO=y
-
-CONFIG_USE_DT_CODE_PARTITION=y
-
-# Execute from SRAM
-CONFIG_XIP=n
-
-CONFIG_RISCV_ALWAYS_SWITCH_THROUGH_ECALL=y

From 7f22cd3698ec83fc5c260f9bd7ba3deb093036dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Fri, 27 Sep 2024 11:08:30 +0200
Subject: [PATCH 2527/2913] [nrf fromlist] boards: nordic: add FLPR core to
 nRF54L20pdk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added support for FLPR core in nRF54L20pdk board.

Upstream PR #: 79355

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk |  1 +
 boards/nordic/nrf54l20pdk/board.cmake         |  6 +-
 boards/nordic/nrf54l20pdk/board.yml           |  3 +
 boards/nordic/nrf54l20pdk/doc/index.rst       |  6 ++
 .../nrf54l20pdk/nrf54l20_cpuapp_common.dtsi   |  5 --
 .../nrf54l20pdk_nrf54l20-common.dtsi          | 12 ++++
 .../nrf54l20pdk_nrf54l20-pinctrl.dtsi         | 23 +++++++
 .../nrf54l20pdk_nrf54l20_cpuflpr.dts          | 68 +++++++++++++++++++
 .../nrf54l20pdk_nrf54l20_cpuflpr.yaml         | 15 ++++
 .../nrf54l20pdk_nrf54l20_cpuflpr_defconfig    | 19 ++++++
 10 files changed, 152 insertions(+), 6 deletions(-)
 create mode 100644 boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.dts
 create mode 100644 boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.yaml
 create mode 100644 boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr_defconfig

diff --git a/boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk b/boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk
index 09809ff7374..3ac84ee1ea3 100644
--- a/boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk
+++ b/boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk
@@ -3,3 +3,4 @@
 
 config BOARD_NRF54L20PDK
 	select SOC_NRF54L20_ENGA_CPUAPP if BOARD_NRF54L20PDK_NRF54L20_CPUAPP
+	select SOC_NRF54L20_ENGA_CPUFLPR if BOARD_NRF54L20PDK_NRF54L20_CPUFLPR
diff --git a/boards/nordic/nrf54l20pdk/board.cmake b/boards/nordic/nrf54l20pdk/board.cmake
index 5d36ac00a3e..3bb4e520198 100644
--- a/boards/nordic/nrf54l20pdk/board.cmake
+++ b/boards/nordic/nrf54l20pdk/board.cmake
@@ -1,7 +1,11 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
+if(CONFIG_BOARD_NRF54L20PDK_NRF54L20_CPUAPP)
+  board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
+elseif(CONFIG_BOARD_NRF54L20PDK_NRF54L20_CPUFLPR)
+  board_runner_args(jlink "--speed=4000")
+endif()
 
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf54l20pdk/board.yml b/boards/nordic/nrf54l20pdk/board.yml
index 4eaa66669fc..de39dcb4a3f 100644
--- a/boards/nordic/nrf54l20pdk/board.yml
+++ b/boards/nordic/nrf54l20pdk/board.yml
@@ -4,3 +4,6 @@ board:
   vendor: nordic
   socs:
   - name: nrf54l20
+    variants:
+    - name: xip
+      cpucluster: cpuflpr
diff --git a/boards/nordic/nrf54l20pdk/doc/index.rst b/boards/nordic/nrf54l20pdk/doc/index.rst
index aaed616ecce..7805d2ea9f9 100644
--- a/boards/nordic/nrf54l20pdk/doc/index.rst
+++ b/boards/nordic/nrf54l20pdk/doc/index.rst
@@ -65,6 +65,12 @@ built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
 building and running.
 
+Applications for the ``nrf54l20pdk/nrf54l20/cpuflpr`` board target need
+to be built using sysbuild to include the ``vpr_launcher`` image for the application core.
+
+Enter the following command to compile ``hello_world`` for the FLPR core::
+ west build -p -b nrf54l20pdk/nrf54l20/cpuflpr --sysbuild
+
 Flashing
 ========
 
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
index ec6f2740648..ed9d76a6b19 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
@@ -27,11 +27,6 @@
 	status = "okay";
 };
 
-&hfpll {
-	/* For now use 64 MHz clock for CPU and fast peripherals. */
-	clock-frequency = <DT_FREQ_M(64)>;
-};
-
 &lfxo {
 	load-capacitors = "internal";
 	load-capacitance-femtofarad = <15500>;
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi
index 35a434cda4b..6eb67fe1bb3 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi
@@ -91,3 +91,15 @@
 	pinctrl-1 = <&pwm20_sleep>;
 	pinctrl-names = "default", "sleep";
 };
+
+&uart30 {
+	current-speed = <115200>;
+	pinctrl-0 = <&uart30_default>;
+	pinctrl-1 = <&uart30_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&hfpll {
+	/* For now use 64 MHz clock for CPU and fast peripherals. */
+	clock-frequency = <DT_FREQ_M(64)>;
+};
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi
index 7dc2b77ae83..b70be2bfa5e 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi
@@ -34,4 +34,27 @@
 			low-power-enable;
 		};
 	};
+
+	/omit-if-no-ref/ uart30_default: uart30_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RTS, 0, 2)>;
+		};
+
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 0, 1)>,
+				<NRF_PSEL(UART_CTS, 0, 3)>;
+			bias-pull-up;
+		};
+	};
+
+	/omit-if-no-ref/ uart30_sleep: uart30_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RX, 0, 1)>,
+				<NRF_PSEL(UART_RTS, 0, 2)>,
+				<NRF_PSEL(UART_CTS, 0, 3)>;
+			low-power-enable;
+		};
+	};
 };
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.dts b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.dts
new file mode 100644
index 00000000000..ea3c5d6ff6a
--- /dev/null
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.dts
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf54l20_enga_cpuflpr.dtsi>
+#include "nrf54l20pdk_nrf54l20-common.dtsi"
+
+/ {
+	model = "Nordic nRF54L20 PDK nRF54L20 FLPR MCU";
+	compatible = "nordic,nrf54l20pdk_nrf54l20-cpuflpr";
+
+	chosen {
+		zephyr,console = &uart30;
+		zephyr,shell-uart = &uart30;
+		zephyr,code-partition = &cpuflpr_code_partition;
+		zephyr,flash = &cpuflpr_rram;
+		zephyr,sram = &cpuflpr_sram;
+	};
+};
+
+&cpuflpr_sram {
+	status = "okay";
+};
+
+&cpuflpr_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		cpuflpr_code_partition: partition@0 {
+			label = "image-0";
+			reg = <0x0 DT_SIZE_K(64)>;
+		};
+	};
+};
+
+&grtc {
+	owned-channels = <3 4>;
+	status = "okay";
+};
+
+&uart30 {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpiote30 {
+	status = "okay";
+};
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.yaml b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.yaml
new file mode 100644
index 00000000000..ef6374d0f91
--- /dev/null
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.yaml
@@ -0,0 +1,15 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54l20pdk/nrf54l20/cpuflpr
+name: nRF54L20-PDK-nRF54L20-Fast-Lightweight-Peripheral-Processor
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 64
+flash: 64
+supported:
+  - counter
+  - gpio
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr_defconfig b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr_defconfig
new file mode 100644
index 00000000000..75f7c4386e3
--- /dev/null
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr_defconfig
@@ -0,0 +1,19 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+CONFIG_USE_DT_CODE_PARTITION=y
+
+# Execute from SRAM
+CONFIG_XIP=n
+
+CONFIG_RISCV_ALWAYS_SWITCH_THROUGH_ECALL=y

From 11ba5c5c11a404588553d2495f9da206f251af3a Mon Sep 17 00:00:00 2001
From: Jordan Yates <jordan@embeint.com>
Date: Sat, 11 Jan 2025 21:05:45 +1000
Subject: [PATCH 2528/2913] [nrf fromtree] boards: nordic: nRF91x1: update
 jlink device name

JLink now recognises the proper device names.

Signed-off-by: Jordan Yates <jordan@embeint.com>
(cherry picked from commit e7ccf82a2b78075315cc391d8690959e7933751a)
---
 boards/nordic/nrf9131ek/board.cmake | 3 +--
 boards/nordic/nrf9151dk/board.cmake | 3 +--
 boards/nordic/nrf9161dk/board.cmake | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/boards/nordic/nrf9131ek/board.cmake b/boards/nordic/nrf9131ek/board.cmake
index 8293a428b40..d67464ff5ae 100644
--- a/boards/nordic/nrf9131ek/board.cmake
+++ b/boards/nordic/nrf9131ek/board.cmake
@@ -8,7 +8,6 @@ if(CONFIG_TFM_FLASH_MERGED_BINARY)
   set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex)
 endif()
 
-# TODO: change to nRF9131_xxAA when such device is available in JLink
-board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+board_runner_args(jlink "--device=nRF9131_xxCA" "--speed=4000")
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf9151dk/board.cmake b/boards/nordic/nrf9151dk/board.cmake
index a3126c941d9..dc898e054b4 100644
--- a/boards/nordic/nrf9151dk/board.cmake
+++ b/boards/nordic/nrf9151dk/board.cmake
@@ -8,7 +8,6 @@ if(CONFIG_TFM_FLASH_MERGED_BINARY)
   set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex)
 endif()
 
-# TODO: change to nRF9151_xxAA when such device is available in JLink
-board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+board_runner_args(jlink "--device=nRF9151_xxCA" "--speed=4000")
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf9161dk/board.cmake b/boards/nordic/nrf9161dk/board.cmake
index 883208b7832..6581b639658 100644
--- a/boards/nordic/nrf9161dk/board.cmake
+++ b/boards/nordic/nrf9161dk/board.cmake
@@ -8,7 +8,6 @@ if(CONFIG_TFM_FLASH_MERGED_BINARY)
   set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex)
 endif()
 
-# TODO: change to nRF9161_xxAA when such device is available in JLink
-board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+board_runner_args(jlink "--device=nRF9161_xxCA" "--speed=4000")
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

From e12cd333b8ae6f2a32ed39869690b74c51f8efd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Cab=C3=A9?= <benjamin@zephyrproject.org>
Date: Mon, 17 Feb 2025 09:00:32 +0100
Subject: [PATCH 2529/2913] [nrf fromtree] doc: releases: introduce release
 notes and migration guide docs for 4.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This introduces the release notes and migration guide for Zephyr 4.2.0
earlier so that people have a placeholder to start adding content as
they line up pull requests for the 4.2 release.

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
(cherry picked from commit 3ef954085305b13585b6b4ae9827115a2b0a2475)
---
 doc/releases/migration-guide-4.2.rst | 48 ++++++++++++++
 doc/releases/release-notes-4.2.rst   | 94 ++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+)
 create mode 100644 doc/releases/migration-guide-4.2.rst
 create mode 100644 doc/releases/release-notes-4.2.rst

diff --git a/doc/releases/migration-guide-4.2.rst b/doc/releases/migration-guide-4.2.rst
new file mode 100644
index 00000000000..70cf72e0b03
--- /dev/null
+++ b/doc/releases/migration-guide-4.2.rst
@@ -0,0 +1,48 @@
+:orphan:
+
+..
+  See
+  https://docs.zephyrproject.org/latest/releases/index.html#migration-guides
+  for details of what is supposed to go into this document.
+
+.. _migration_4.2:
+
+Migration guide to Zephyr v4.2.0 (Working Draft)
+################################################
+
+This document describes the changes required when migrating your application from Zephyr v4.1.0 to
+Zephyr v4.2.0.
+
+Any other changes (not directly related to migrating applications) can be found in
+the :ref:`release notes<zephyr_4.2>`.
+
+.. contents::
+    :local:
+    :depth: 2
+
+Build System
+************
+
+Kernel
+******
+
+Boards
+******
+
+Device Drivers and Devicetree
+*****************************
+
+Bluetooth
+*********
+
+Networking
+**********
+
+Other subsystems
+****************
+
+Modules
+*******
+
+Architectures
+*************
diff --git a/doc/releases/release-notes-4.2.rst b/doc/releases/release-notes-4.2.rst
new file mode 100644
index 00000000000..08b9bac3709
--- /dev/null
+++ b/doc/releases/release-notes-4.2.rst
@@ -0,0 +1,94 @@
+:orphan:
+
+..
+  What goes here: removed/deprecated apis, new boards, new drivers, notable
+  features. If you feel like something new can be useful to a user, put it
+  under "Other Enhancements" in the first paragraph, if you feel like something
+  is worth mentioning in the project media (release blog post, release
+  livestream) put it under "Major enhancement".
+..
+  If you are describing a feature or functionality, consider adding it to the
+  actual project documentation rather than the release notes, so that the
+  information does not get lost in time.
+..
+  No list of bugfixes, minor changes, those are already in the git log, this is
+  not a changelog.
+..
+  Does the entry have a link that contains the details? Just add the link, if
+  you think it needs more details, put them in the content that shows up on the
+  link.
+..
+  Are you thinking about generating this? Don't put anything at all.
+..
+  Does the thing require the user to change their application? Put it on the
+  migration guide instead. (TODO: move the removed APIs section in the
+  migration guide)
+
+.. _zephyr_4.2:
+
+Zephyr 4.2.0 (Working Draft)
+############################
+
+We are pleased to announce the release of Zephyr version 4.2.0.
+
+Major enhancements with this release include:
+
+An overview of the changes required or recommended when migrating your application from Zephyr
+v4.1.0 to Zephyr v4.2.0 can be found in the separate :ref:`migration guide<migration_4.2>`.
+
+The following sections provide detailed lists of changes by component.
+
+Security Vulnerability Related
+******************************
+The following CVEs are addressed by this release:
+
+More detailed information can be found in:
+https://docs.zephyrproject.org/latest/security/vulnerabilities.html
+
+API Changes
+***********
+
+Removed APIs and options
+========================
+
+Deprecated APIs and options
+===========================
+
+New APIs and options
+====================
+
+..
+  Link to new APIs here, in a group if you think it's necessary, no need to get
+  fancy just list the link, that should contain the documentation. If you feel
+  like you need to add more details, add them in the API documentation code
+  instead.
+
+New Boards
+**********
+
+..
+  You may update this list as you contribute a new board during the release cycle, in order to make
+  it visible to people who might be looking at the working draft of the release notes. However, note
+  that this list will be recomputed at the time of the release, so you don't *have* to update it.
+  In any case, just link the board, further details go in the board description.
+
+New Drivers
+***********
+
+..
+  Same as above for boards, this will also be recomputed at the time of the release.
+  Just link the driver, further details go in the binding description
+
+New Samples
+***********
+
+..
+  Same as above for boards and drivers, this will also be recomputed at the time of the release.
+ Just link the sample, further details go in the sample documentation itself.
+
+Other notable changes
+*********************
+
+..
+  Any more descriptive subsystem or driver changes. Do you really want to write
+  a paragraph or is it enough to link to the api/driver/Kconfig/board page above?

From a72ee93ab45f0b935be6e408345cd4adfa47ce22 Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Thu, 6 Mar 2025 15:38:09 +0100
Subject: [PATCH 2530/2913] [nrf fromlist] boards: nrf: Default to nRF Util for
 flashing

Nordic has a new tool, nRF Util (`nrfutil`) which is replacing the
previous set of command-line tools (particularly `nrfjprog`) that Zephyr
had been using by default in many of the boards to flash the firmware
onto the device.

Since nRF Util is already mature and is going to be replacing the existing
tools, including `nrfjprog`, it is now a good time to change the default
flash tool to reflect this fact.

Note that `nrfjprog` support is not being removed at all, but this may
be a breaking change for users that do not have nRF Util installed. For
this reason we also add a note in the migration guide.

More info:
https://devzone.nordicsemi.com/nordic/nordic-blog/b/blog/posts/nrf-util-unified-command-line-utility

Installation:
https://www.nordicsemi.com/Products/Development-tools/nrf-util

Documentation:
https://docs.nordicsemi.com/bundle/nrfutil/page/README.html

Upstream PR #: 86729

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
---
 boards/aconno/acn52832/board.cmake                    | 2 ++
 boards/actinius/icarus/board.cmake                    | 1 +
 boards/actinius/icarus_bee/board.cmake                | 1 +
 boards/actinius/icarus_som/board.cmake                | 1 +
 boards/actinius/icarus_som_dk/board.cmake             | 1 +
 boards/adafruit/itsybitsy/board.cmake                 | 1 +
 boards/adafruit/nrf52_adafruit_feather/board.cmake    | 1 +
 boards/atmarktechno/degu_evk/board.cmake              | 1 +
 boards/bbc/microbit/board.cmake                       | 1 +
 boards/bbc/microbit_v2/board.cmake                    | 1 +
 boards/bcdevices/plt_demo_v2/board.cmake              | 1 +
 boards/circuitdojo/feather/board.cmake                | 1 +
 boards/contextualelectronics/abc/board.cmake          | 1 +
 boards/croxel/croxel_cx1825/board.cmake               | 1 +
 boards/ct/ctcc/board.cmake                            | 2 ++
 boards/ebyte/e73_tbb/board.cmake                      | 1 +
 boards/electronut/nrf52840_papyr/board.cmake          | 1 +
 boards/ezurio/bl5340_dvk/board.cmake                  | 2 +-
 boards/ezurio/bl652_dvk/board.cmake                   | 1 +
 boards/ezurio/bl653_dvk/board.cmake                   | 1 +
 boards/ezurio/bl654_dvk/board.cmake                   | 1 +
 boards/ezurio/bl654_sensor_board/board.cmake          | 1 +
 boards/ezurio/bt510/board.cmake                       | 1 +
 boards/ezurio/bt610/board.cmake                       | 1 +
 boards/ezurio/mg100/board.cmake                       | 1 +
 boards/ezurio/pinnacle_100_dvk/board.cmake            | 1 +
 boards/ezurio/rm1xx_dvk/board.cmake                   | 1 +
 boards/holyiot/yj16019/board.cmake                    | 1 +
 boards/innblue/innblue21/board.cmake                  | 1 +
 boards/innblue/innblue22/board.cmake                  | 1 +
 boards/makerdiary/nrf52840_mdk_usb_dongle/board.cmake | 1 +
 boards/nordic/nrf21540dk/board.cmake                  | 2 +-
 boards/nordic/nrf51dk/board.cmake                     | 2 +-
 boards/nordic/nrf51dongle/board.cmake                 | 2 +-
 boards/nordic/nrf52833dk/board.cmake                  | 2 +-
 boards/nordic/nrf52840dk/board.cmake                  | 2 +-
 boards/nordic/nrf52840dongle/board.cmake              | 1 +
 boards/nordic/nrf52dk/board.cmake                     | 2 +-
 boards/nordic/nrf5340_audio_dk/board.cmake            | 2 +-
 boards/nordic/nrf5340dk/board.cmake                   | 2 +-
 boards/nordic/nrf7002dk/board.cmake                   | 1 +
 boards/nordic/nrf9131ek/board.cmake                   | 1 +
 boards/nordic/nrf9151dk/board.cmake                   | 1 +
 boards/nordic/nrf9160dk/board.cmake                   | 4 ++--
 boards/nordic/nrf9161dk/board.cmake                   | 1 +
 boards/nordic/thingy52/board.cmake                    | 2 +-
 boards/nordic/thingy53/board.cmake                    | 2 +-
 boards/norik/octopus_io_board/board.cmake             | 1 +
 boards/norik/octopus_som/board.cmake                  | 1 +
 boards/panasonic/pan1770_evb/board.cmake              | 1 +
 boards/panasonic/pan1780_evb/board.cmake              | 1 +
 boards/panasonic/pan1781_evb/board.cmake              | 1 +
 boards/panasonic/pan1782_evb/board.cmake              | 1 +
 boards/panasonic/pan1783/board.cmake                  | 1 +
 boards/particle/argon/board.cmake                     | 1 +
 boards/particle/boron/board.cmake                     | 1 +
 boards/particle/xenon/board.cmake                     | 1 +
 boards/qorvo/decawave_dwm3001cdk/board.cmake          | 2 +-
 boards/rakwireless/rak4631/board.cmake                | 1 +
 boards/rakwireless/rak5010/board.cmake                | 1 +
 boards/raytac/mdbt50q_db_33/board.cmake               | 1 +
 boards/raytac/mdbt50q_db_40/board.cmake               | 1 +
 boards/raytac/mdbt53_db_40/board.cmake                | 2 +-
 boards/raytac/mdbt53v_db_40/board.cmake               | 2 +-
 boards/ruuvi/ruuvitag/board.cmake                     | 1 +
 boards/seeed/xiao_ble/board.cmake                     | 1 +
 boards/sparkfun/micromod/board.cmake                  | 1 +
 boards/sparkfun/thing_plus/board.cmake                | 1 +
 boards/u-blox/ubx_bmd300eval/board.cmake              | 1 +
 boards/u-blox/ubx_bmd330eval/board.cmake              | 1 +
 boards/u-blox/ubx_bmd340eval/board.cmake              | 1 +
 boards/u-blox/ubx_bmd345eval/board.cmake              | 1 +
 boards/u-blox/ubx_bmd360eval/board.cmake              | 1 +
 boards/u-blox/ubx_bmd380eval/board.cmake              | 1 +
 boards/u-blox/ubx_evkannab1/board.cmake               | 1 +
 boards/u-blox/ubx_evkninab1/board.cmake               | 1 +
 boards/u-blox/ubx_evkninab3/board.cmake               | 1 +
 boards/u-blox/ubx_evkninab4/board.cmake               | 1 +
 boards/waveshare/nrf51_ble400/board.cmake             | 1 +
 boards/we/ophelia1ev/board.cmake                      | 1 +
 boards/we/proteus2ev/board.cmake                      | 1 +
 boards/we/proteus3ev/board.cmake                      | 1 +
 doc/hardware/porting/board_porting.rst                | 4 +++-
 doc/releases/migration-guide-4.2.rst                  | 9 +++++++++
 84 files changed, 97 insertions(+), 17 deletions(-)

diff --git a/boards/aconno/acn52832/board.cmake b/boards/aconno/acn52832/board.cmake
index ddd57ab8839..69caa8667e3 100644
--- a/boards/aconno/acn52832/board.cmake
+++ b/boards/aconno/acn52832/board.cmake
@@ -2,5 +2,7 @@
 
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nrf52" "--speed=4000")
+
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/actinius/icarus/board.cmake b/boards/actinius/icarus/board.cmake
index 9c0c33243af..91aec43ebb5 100644
--- a/boards/actinius/icarus/board.cmake
+++ b/boards/actinius/icarus/board.cmake
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/actinius/icarus_bee/board.cmake b/boards/actinius/icarus_bee/board.cmake
index 9c0c33243af..91aec43ebb5 100644
--- a/boards/actinius/icarus_bee/board.cmake
+++ b/boards/actinius/icarus_bee/board.cmake
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/actinius/icarus_som/board.cmake b/boards/actinius/icarus_som/board.cmake
index 9c0c33243af..91aec43ebb5 100644
--- a/boards/actinius/icarus_som/board.cmake
+++ b/boards/actinius/icarus_som/board.cmake
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/actinius/icarus_som_dk/board.cmake b/boards/actinius/icarus_som_dk/board.cmake
index 9c0c33243af..91aec43ebb5 100644
--- a/boards/actinius/icarus_som_dk/board.cmake
+++ b/boards/actinius/icarus_som_dk/board.cmake
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/adafruit/itsybitsy/board.cmake b/boards/adafruit/itsybitsy/board.cmake
index 6366e4775ec..54b79bdf74b 100644
--- a/boards/adafruit/itsybitsy/board.cmake
+++ b/boards/adafruit/itsybitsy/board.cmake
@@ -3,6 +3,7 @@
 include(${ZEPHYR_BASE}/boards/common/bossac.board.cmake)
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/adafruit/nrf52_adafruit_feather/board.cmake b/boards/adafruit/nrf52_adafruit_feather/board.cmake
index 4ddbcf66fbe..ca393522464 100644
--- a/boards/adafruit/nrf52_adafruit_feather/board.cmake
+++ b/boards/adafruit/nrf52_adafruit_feather/board.cmake
@@ -2,6 +2,7 @@
 
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/atmarktechno/degu_evk/board.cmake b/boards/atmarktechno/degu_evk/board.cmake
index 33b72c2e969..028127e8ef0 100644
--- a/boards/atmarktechno/degu_evk/board.cmake
+++ b/boards/atmarktechno/degu_evk/board.cmake
@@ -2,5 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/bbc/microbit/board.cmake b/boards/bbc/microbit/board.cmake
index b6bae59502c..aad2286503c 100644
--- a/boards/bbc/microbit/board.cmake
+++ b/boards/bbc/microbit/board.cmake
@@ -9,6 +9,7 @@ set(OPENOCD_NRF5_SUBFAMILY "nrf51")
 set(OPENOCD_NRF5_INTERFACE "cmsis-dap")
 
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/bbc/microbit_v2/board.cmake b/boards/bbc/microbit_v2/board.cmake
index c94ffa16306..0dd45ff28f7 100644
--- a/boards/bbc/microbit_v2/board.cmake
+++ b/boards/bbc/microbit_v2/board.cmake
@@ -9,6 +9,7 @@ set(OPENOCD_NRF5_SUBFAMILY "nrf52")
 # in which case the following line should be removed to default back to "jlink" OpenOCD interface
 set(OPENOCD_NRF5_INTERFACE "cmsis-dap")
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/bcdevices/plt_demo_v2/board.cmake b/boards/bcdevices/plt_demo_v2/board.cmake
index 29355637973..ebf0cf5bffa 100644
--- a/boards/bcdevices/plt_demo_v2/board.cmake
+++ b/boards/bcdevices/plt_demo_v2/board.cmake
@@ -4,6 +4,7 @@ set(OPENOCD_NRF5_SUBFAMILY "nrf52")
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/circuitdojo/feather/board.cmake b/boards/circuitdojo/feather/board.cmake
index 9c0c33243af..91aec43ebb5 100644
--- a/boards/circuitdojo/feather/board.cmake
+++ b/boards/circuitdojo/feather/board.cmake
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/contextualelectronics/abc/board.cmake b/boards/contextualelectronics/abc/board.cmake
index 261663eef4e..1482c471b4c 100644
--- a/boards/contextualelectronics/abc/board.cmake
+++ b/boards/contextualelectronics/abc/board.cmake
@@ -3,6 +3,7 @@
 set(OPENOCD_NRF5_SUBFAMILY "nrf52")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/croxel/croxel_cx1825/board.cmake b/boards/croxel/croxel_cx1825/board.cmake
index f95878945be..506a1339840 100644
--- a/boards/croxel/croxel_cx1825/board.cmake
+++ b/boards/croxel/croxel_cx1825/board.cmake
@@ -2,6 +2,7 @@
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/ct/ctcc/board.cmake b/boards/ct/ctcc/board.cmake
index 11d0511404b..65f36c72e6c 100644
--- a/boards/ct/ctcc/board.cmake
+++ b/boards/ct/ctcc/board.cmake
@@ -3,6 +3,7 @@
 if(CONFIG_BOARD_CTCC_NRF52840)
   board_runner_args(nrfjprog "--softreset")
   board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+  include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
   include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
   include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 elseif(CONFIG_BOARD_CTCC_NRF9161 OR CONFIG_BOARD_CTCC_NRF9161_NS)
@@ -14,6 +15,7 @@ elseif(CONFIG_BOARD_CTCC_NRF9161 OR CONFIG_BOARD_CTCC_NRF9161_NS)
   endif()
   board_runner_args(nrfjprog "--softreset")
   board_runner_args(pyocd "--target=nrf9161" "--frequency=4000000")
+  include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
   include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
   include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 endif()
diff --git a/boards/ebyte/e73_tbb/board.cmake b/boards/ebyte/e73_tbb/board.cmake
index f99446d144d..5db65eede59 100644
--- a/boards/ebyte/e73_tbb/board.cmake
+++ b/boards/ebyte/e73_tbb/board.cmake
@@ -2,6 +2,7 @@
 
 board_runner_args(jlink "--device=nrf52" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/electronut/nrf52840_papyr/board.cmake b/boards/electronut/nrf52840_papyr/board.cmake
index 65580b0fef5..3ca8757d613 100644
--- a/boards/electronut/nrf52840_papyr/board.cmake
+++ b/boards/electronut/nrf52840_papyr/board.cmake
@@ -2,4 +2,5 @@
 
 board_runner_args(nrfjprog "--softreset")
 include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
diff --git a/boards/ezurio/bl5340_dvk/board.cmake b/boards/ezurio/bl5340_dvk/board.cmake
index 15aec8e6a36..41a597dead8 100644
--- a/boards/ezurio/bl5340_dvk/board.cmake
+++ b/boards/ezurio/bl5340_dvk/board.cmake
@@ -16,6 +16,6 @@ if(CONFIG_TFM_FLASH_MERGED_BINARY)
   set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex)
 endif()
 
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/ezurio/bl652_dvk/board.cmake b/boards/ezurio/bl652_dvk/board.cmake
index 9449b78cd47..29682197edc 100644
--- a/boards/ezurio/bl652_dvk/board.cmake
+++ b/boards/ezurio/bl652_dvk/board.cmake
@@ -2,5 +2,6 @@
 
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/ezurio/bl653_dvk/board.cmake b/boards/ezurio/bl653_dvk/board.cmake
index 12b0d2996be..a19979a7e27 100644
--- a/boards/ezurio/bl653_dvk/board.cmake
+++ b/boards/ezurio/bl653_dvk/board.cmake
@@ -3,6 +3,7 @@
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52833_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52833" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/ezurio/bl654_dvk/board.cmake b/boards/ezurio/bl654_dvk/board.cmake
index a99f3ce8693..32b02a35258 100644
--- a/boards/ezurio/bl654_dvk/board.cmake
+++ b/boards/ezurio/bl654_dvk/board.cmake
@@ -2,5 +2,6 @@
 
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/ezurio/bl654_sensor_board/board.cmake b/boards/ezurio/bl654_sensor_board/board.cmake
index c1ca3bd12cf..17046697832 100644
--- a/boards/ezurio/bl654_sensor_board/board.cmake
+++ b/boards/ezurio/bl654_sensor_board/board.cmake
@@ -4,5 +4,6 @@ board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/ezurio/bt510/board.cmake b/boards/ezurio/bt510/board.cmake
index c1ca3bd12cf..17046697832 100644
--- a/boards/ezurio/bt510/board.cmake
+++ b/boards/ezurio/bt510/board.cmake
@@ -4,5 +4,6 @@ board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/ezurio/bt610/board.cmake b/boards/ezurio/bt610/board.cmake
index 0a2feda9ee2..4d421a07db6 100644
--- a/boards/ezurio/bt610/board.cmake
+++ b/boards/ezurio/bt610/board.cmake
@@ -3,6 +3,7 @@
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/ezurio/mg100/board.cmake b/boards/ezurio/mg100/board.cmake
index 790ab533b4a..4a350c83167 100644
--- a/boards/ezurio/mg100/board.cmake
+++ b/boards/ezurio/mg100/board.cmake
@@ -3,6 +3,7 @@
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/ezurio/pinnacle_100_dvk/board.cmake b/boards/ezurio/pinnacle_100_dvk/board.cmake
index d5f3c19d784..829cac0ce82 100644
--- a/boards/ezurio/pinnacle_100_dvk/board.cmake
+++ b/boards/ezurio/pinnacle_100_dvk/board.cmake
@@ -3,6 +3,7 @@
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/ezurio/rm1xx_dvk/board.cmake b/boards/ezurio/rm1xx_dvk/board.cmake
index 677dc6bdf2b..1f0cea559d1 100644
--- a/boards/ezurio/rm1xx_dvk/board.cmake
+++ b/boards/ezurio/rm1xx_dvk/board.cmake
@@ -2,5 +2,6 @@
 
 board_runner_args(nrfjprog "--nrf-family=NRF51")
 board_runner_args(jlink "--device=nRF51822_xxAC" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/holyiot/yj16019/board.cmake b/boards/holyiot/yj16019/board.cmake
index 4ffa4da9578..6de15b50c29 100644
--- a/boards/holyiot/yj16019/board.cmake
+++ b/boards/holyiot/yj16019/board.cmake
@@ -1,4 +1,5 @@
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/innblue/innblue21/board.cmake b/boards/innblue/innblue21/board.cmake
index 12afc83afe3..641562c24c4 100644
--- a/boards/innblue/innblue21/board.cmake
+++ b/boards/innblue/innblue21/board.cmake
@@ -2,5 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/innblue/innblue22/board.cmake b/boards/innblue/innblue22/board.cmake
index 12afc83afe3..641562c24c4 100644
--- a/boards/innblue/innblue22/board.cmake
+++ b/boards/innblue/innblue22/board.cmake
@@ -2,5 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/makerdiary/nrf52840_mdk_usb_dongle/board.cmake b/boards/makerdiary/nrf52840_mdk_usb_dongle/board.cmake
index 1f43fd93827..895ec1a36bd 100644
--- a/boards/makerdiary/nrf52840_mdk_usb_dongle/board.cmake
+++ b/boards/makerdiary/nrf52840_mdk_usb_dongle/board.cmake
@@ -2,6 +2,7 @@
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/nordic/nrf21540dk/board.cmake b/boards/nordic/nrf21540dk/board.cmake
index f95878945be..1ebf652634f 100644
--- a/boards/nordic/nrf21540dk/board.cmake
+++ b/boards/nordic/nrf21540dk/board.cmake
@@ -2,8 +2,8 @@
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/nordic/nrf51dk/board.cmake b/boards/nordic/nrf51dk/board.cmake
index 1b08d95310e..b971cd7fb6b 100644
--- a/boards/nordic/nrf51dk/board.cmake
+++ b/boards/nordic/nrf51dk/board.cmake
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF51822_xxAC" "--speed=4000")
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/nordic/nrf51dongle/board.cmake b/boards/nordic/nrf51dongle/board.cmake
index 86ac5ef3be6..3bdb9b702c1 100644
--- a/boards/nordic/nrf51dongle/board.cmake
+++ b/boards/nordic/nrf51dongle/board.cmake
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF51822_xxAC" "--speed=4000")
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf52833dk/board.cmake b/boards/nordic/nrf52833dk/board.cmake
index f8c71dc5694..554146fe544 100644
--- a/boards/nordic/nrf52833dk/board.cmake
+++ b/boards/nordic/nrf52833dk/board.cmake
@@ -2,8 +2,8 @@
 
 board_runner_args(jlink "--device=nRF52833_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52833" "--frequency=4000000")
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/nordic/nrf52840dk/board.cmake b/boards/nordic/nrf52840dk/board.cmake
index f95878945be..1ebf652634f 100644
--- a/boards/nordic/nrf52840dk/board.cmake
+++ b/boards/nordic/nrf52840dk/board.cmake
@@ -2,8 +2,8 @@
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/nordic/nrf52840dongle/board.cmake b/boards/nordic/nrf52840dongle/board.cmake
index 1f43fd93827..895ec1a36bd 100644
--- a/boards/nordic/nrf52840dongle/board.cmake
+++ b/boards/nordic/nrf52840dongle/board.cmake
@@ -2,6 +2,7 @@
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/nordic/nrf52dk/board.cmake b/boards/nordic/nrf52dk/board.cmake
index f5b4011822a..f0434e83862 100644
--- a/boards/nordic/nrf52dk/board.cmake
+++ b/boards/nordic/nrf52dk/board.cmake
@@ -2,8 +2,8 @@
 
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000")
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/nordic/nrf5340_audio_dk/board.cmake b/boards/nordic/nrf5340_audio_dk/board.cmake
index b44ece9b7e5..cfbdc3ff52b 100644
--- a/boards/nordic/nrf5340_audio_dk/board.cmake
+++ b/boards/nordic/nrf5340_audio_dk/board.cmake
@@ -10,6 +10,6 @@ elseif(CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf5340dk/board.cmake b/boards/nordic/nrf5340dk/board.cmake
index 2a3f3cb43e4..ba7bf5c1185 100644
--- a/boards/nordic/nrf5340dk/board.cmake
+++ b/boards/nordic/nrf5340dk/board.cmake
@@ -16,6 +16,6 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET)
 board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf7002dk/board.cmake b/boards/nordic/nrf7002dk/board.cmake
index bea0dc92ea9..53193d460fd 100644
--- a/boards/nordic/nrf7002dk/board.cmake
+++ b/boards/nordic/nrf7002dk/board.cmake
@@ -21,5 +21,6 @@ if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf9131ek/board.cmake b/boards/nordic/nrf9131ek/board.cmake
index d67464ff5ae..204c8af33fc 100644
--- a/boards/nordic/nrf9131ek/board.cmake
+++ b/boards/nordic/nrf9131ek/board.cmake
@@ -9,5 +9,6 @@ if(CONFIG_TFM_FLASH_MERGED_BINARY)
 endif()
 
 board_runner_args(jlink "--device=nRF9131_xxCA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf9151dk/board.cmake b/boards/nordic/nrf9151dk/board.cmake
index dc898e054b4..02b6c782c0a 100644
--- a/boards/nordic/nrf9151dk/board.cmake
+++ b/boards/nordic/nrf9151dk/board.cmake
@@ -9,5 +9,6 @@ if(CONFIG_TFM_FLASH_MERGED_BINARY)
 endif()
 
 board_runner_args(jlink "--device=nRF9151_xxCA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf9160dk/board.cmake b/boards/nordic/nrf9160dk/board.cmake
index 8bb0e688183..678cfbe5c17 100644
--- a/boards/nordic/nrf9160dk/board.cmake
+++ b/boards/nordic/nrf9160dk/board.cmake
@@ -10,13 +10,13 @@ if(CONFIG_BOARD_NRF9160DK_NRF9160 OR CONFIG_BOARD_NRF9160DK_NRF9160_NS)
   endif()
 
   board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
-  include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
   include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+  include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
   include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 elseif(CONFIG_BOARD_NRF9160DK_NRF52840)
   board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
-  include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
   include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+  include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
   include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
   include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
 endif()
diff --git a/boards/nordic/nrf9161dk/board.cmake b/boards/nordic/nrf9161dk/board.cmake
index 6581b639658..5130159e744 100644
--- a/boards/nordic/nrf9161dk/board.cmake
+++ b/boards/nordic/nrf9161dk/board.cmake
@@ -9,5 +9,6 @@ if(CONFIG_TFM_FLASH_MERGED_BINARY)
 endif()
 
 board_runner_args(jlink "--device=nRF9161_xxCA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/thingy52/board.cmake b/boards/nordic/thingy52/board.cmake
index ee865440610..aa639b72df1 100644
--- a/boards/nordic/thingy52/board.cmake
+++ b/boards/nordic/thingy52/board.cmake
@@ -2,7 +2,7 @@
 
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/nordic/thingy53/board.cmake b/boards/nordic/thingy53/board.cmake
index dc63ca31895..916d982b65c 100644
--- a/boards/nordic/thingy53/board.cmake
+++ b/boards/nordic/thingy53/board.cmake
@@ -6,6 +6,6 @@ elseif(CONFIG_BOARD_THINGY53_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/norik/octopus_io_board/board.cmake b/boards/norik/octopus_io_board/board.cmake
index e1ae7b4e9b2..9440e9893ea 100644
--- a/boards/norik/octopus_io_board/board.cmake
+++ b/boards/norik/octopus_io_board/board.cmake
@@ -2,5 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/norik/octopus_som/board.cmake b/boards/norik/octopus_som/board.cmake
index e1ae7b4e9b2..9440e9893ea 100644
--- a/boards/norik/octopus_som/board.cmake
+++ b/boards/norik/octopus_som/board.cmake
@@ -2,5 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/panasonic/pan1770_evb/board.cmake b/boards/panasonic/pan1770_evb/board.cmake
index 73bcf6990b0..ff0e2b9f005 100644
--- a/boards/panasonic/pan1770_evb/board.cmake
+++ b/boards/panasonic/pan1770_evb/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(jlink "--device=nrf52" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/panasonic/pan1780_evb/board.cmake b/boards/panasonic/pan1780_evb/board.cmake
index 4137b270080..f9c2bc7fd06 100644
--- a/boards/panasonic/pan1780_evb/board.cmake
+++ b/boards/panasonic/pan1780_evb/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(jlink "--device=nrf52" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/panasonic/pan1781_evb/board.cmake b/boards/panasonic/pan1781_evb/board.cmake
index 1710d8db443..fe7bb7edcd8 100644
--- a/boards/panasonic/pan1781_evb/board.cmake
+++ b/boards/panasonic/pan1781_evb/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(jlink "--device=nrf52" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52820" "--frequency=4000000")
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/panasonic/pan1782_evb/board.cmake b/boards/panasonic/pan1782_evb/board.cmake
index ecf22a84df9..8b03593870a 100644
--- a/boards/panasonic/pan1782_evb/board.cmake
+++ b/boards/panasonic/pan1782_evb/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(jlink "--device=nrf52" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52833" "--frequency=4000000")
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/panasonic/pan1783/board.cmake b/boards/panasonic/pan1783/board.cmake
index 1a211bc95c9..0de36eb5bbc 100644
--- a/boards/panasonic/pan1783/board.cmake
+++ b/boards/panasonic/pan1783/board.cmake
@@ -8,5 +8,6 @@ if(CONFIG_SOC_NRF5340_CPUNET_QKAA)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/particle/argon/board.cmake b/boards/particle/argon/board.cmake
index 93142011fe3..2295627b311 100644
--- a/boards/particle/argon/board.cmake
+++ b/boards/particle/argon/board.cmake
@@ -7,5 +7,6 @@ board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/particle/boron/board.cmake b/boards/particle/boron/board.cmake
index 93142011fe3..2295627b311 100644
--- a/boards/particle/boron/board.cmake
+++ b/boards/particle/boron/board.cmake
@@ -7,5 +7,6 @@ board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/particle/xenon/board.cmake b/boards/particle/xenon/board.cmake
index bb9c46f26c1..e458fa5fd1c 100644
--- a/boards/particle/xenon/board.cmake
+++ b/boards/particle/xenon/board.cmake
@@ -8,5 +8,6 @@ board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/qorvo/decawave_dwm3001cdk/board.cmake b/boards/qorvo/decawave_dwm3001cdk/board.cmake
index f8c71dc5694..554146fe544 100644
--- a/boards/qorvo/decawave_dwm3001cdk/board.cmake
+++ b/boards/qorvo/decawave_dwm3001cdk/board.cmake
@@ -2,8 +2,8 @@
 
 board_runner_args(jlink "--device=nRF52833_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52833" "--frequency=4000000")
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/rakwireless/rak4631/board.cmake b/boards/rakwireless/rak4631/board.cmake
index 2f2c24e0c28..074044926bf 100644
--- a/boards/rakwireless/rak4631/board.cmake
+++ b/boards/rakwireless/rak4631/board.cmake
@@ -3,6 +3,7 @@
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/rakwireless/rak5010/board.cmake b/boards/rakwireless/rak5010/board.cmake
index d91b58c847d..2a2216ee259 100644
--- a/boards/rakwireless/rak5010/board.cmake
+++ b/boards/rakwireless/rak5010/board.cmake
@@ -3,6 +3,7 @@
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/raytac/mdbt50q_db_33/board.cmake b/boards/raytac/mdbt50q_db_33/board.cmake
index 51744ab31b9..f841bdde504 100644
--- a/boards/raytac/mdbt50q_db_33/board.cmake
+++ b/boards/raytac/mdbt50q_db_33/board.cmake
@@ -3,6 +3,7 @@
 
 board_runner_args(jlink "--device=nRF52833_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52833" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/raytac/mdbt50q_db_40/board.cmake b/boards/raytac/mdbt50q_db_40/board.cmake
index 667c8f5f999..8dc0bf1382b 100644
--- a/boards/raytac/mdbt50q_db_40/board.cmake
+++ b/boards/raytac/mdbt50q_db_40/board.cmake
@@ -2,6 +2,7 @@
 
 board_runner_args(jlink "--device=nrf52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/raytac/mdbt53_db_40/board.cmake b/boards/raytac/mdbt53_db_40/board.cmake
index e181f29ca44..bedb125bb9d 100644
--- a/boards/raytac/mdbt53_db_40/board.cmake
+++ b/boards/raytac/mdbt53_db_40/board.cmake
@@ -6,6 +6,6 @@ elseif(CONFIG_BOARD_RAYTAC_MDBT53_DB_40_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/raytac/mdbt53v_db_40/board.cmake b/boards/raytac/mdbt53v_db_40/board.cmake
index da45d8b8e83..41501725bd5 100644
--- a/boards/raytac/mdbt53v_db_40/board.cmake
+++ b/boards/raytac/mdbt53v_db_40/board.cmake
@@ -6,6 +6,6 @@ elseif(BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/ruuvi/ruuvitag/board.cmake b/boards/ruuvi/ruuvitag/board.cmake
index fd74f070016..e30d805406e 100644
--- a/boards/ruuvi/ruuvitag/board.cmake
+++ b/boards/ruuvi/ruuvitag/board.cmake
@@ -2,5 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/seeed/xiao_ble/board.cmake b/boards/seeed/xiao_ble/board.cmake
index a6aa2ac40a7..30caef58348 100644
--- a/boards/seeed/xiao_ble/board.cmake
+++ b/boards/seeed/xiao_ble/board.cmake
@@ -4,6 +4,7 @@ board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 board_runner_args(uf2 "--board-id=Seeed_XIAO_nRF52840_Sense")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/sparkfun/micromod/board.cmake b/boards/sparkfun/micromod/board.cmake
index 55900ba5975..6eed9c98a58 100644
--- a/boards/sparkfun/micromod/board.cmake
+++ b/boards/sparkfun/micromod/board.cmake
@@ -3,6 +3,7 @@
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/sparkfun/thing_plus/board.cmake b/boards/sparkfun/thing_plus/board.cmake
index a4f45e5cfdf..11ad52dbca6 100644
--- a/boards/sparkfun/thing_plus/board.cmake
+++ b/boards/sparkfun/thing_plus/board.cmake
@@ -2,5 +2,6 @@
 
 board_runner_args(nrfjprog "--nrf-family=NRF91")
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/u-blox/ubx_bmd300eval/board.cmake b/boards/u-blox/ubx_bmd300eval/board.cmake
index ff043e765a8..7a6bc33788d 100644
--- a/boards/u-blox/ubx_bmd300eval/board.cmake
+++ b/boards/u-blox/ubx_bmd300eval/board.cmake
@@ -5,6 +5,7 @@
 
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/u-blox/ubx_bmd330eval/board.cmake b/boards/u-blox/ubx_bmd330eval/board.cmake
index 6ba621fc8f5..156fb582e64 100644
--- a/boards/u-blox/ubx_bmd330eval/board.cmake
+++ b/boards/u-blox/ubx_bmd330eval/board.cmake
@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF52810_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/u-blox/ubx_bmd340eval/board.cmake b/boards/u-blox/ubx_bmd340eval/board.cmake
index 8d1e2b8b93d..ff0defdbc90 100644
--- a/boards/u-blox/ubx_bmd340eval/board.cmake
+++ b/boards/u-blox/ubx_bmd340eval/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/u-blox/ubx_bmd345eval/board.cmake b/boards/u-blox/ubx_bmd345eval/board.cmake
index 2588f9d09a4..df3db6f9d21 100644
--- a/boards/u-blox/ubx_bmd345eval/board.cmake
+++ b/boards/u-blox/ubx_bmd345eval/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/u-blox/ubx_bmd360eval/board.cmake b/boards/u-blox/ubx_bmd360eval/board.cmake
index f109b0318a5..597511273ad 100644
--- a/boards/u-blox/ubx_bmd360eval/board.cmake
+++ b/boards/u-blox/ubx_bmd360eval/board.cmake
@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF52811_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/u-blox/ubx_bmd380eval/board.cmake b/boards/u-blox/ubx_bmd380eval/board.cmake
index ebeb58f74fb..fde7182d10a 100644
--- a/boards/u-blox/ubx_bmd380eval/board.cmake
+++ b/boards/u-blox/ubx_bmd380eval/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/u-blox/ubx_evkannab1/board.cmake b/boards/u-blox/ubx_evkannab1/board.cmake
index 18747716bc1..98e9e3d7ae5 100644
--- a/boards/u-blox/ubx_evkannab1/board.cmake
+++ b/boards/u-blox/ubx_evkannab1/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/u-blox/ubx_evkninab1/board.cmake b/boards/u-blox/ubx_evkninab1/board.cmake
index 8546871b5f2..7eddd95a8c0 100644
--- a/boards/u-blox/ubx_evkninab1/board.cmake
+++ b/boards/u-blox/ubx_evkninab1/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/u-blox/ubx_evkninab3/board.cmake b/boards/u-blox/ubx_evkninab3/board.cmake
index ff8c1f01cf6..a92e93d80be 100644
--- a/boards/u-blox/ubx_evkninab3/board.cmake
+++ b/boards/u-blox/ubx_evkninab3/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/u-blox/ubx_evkninab4/board.cmake b/boards/u-blox/ubx_evkninab4/board.cmake
index f7373de1254..c7b3288d4fe 100644
--- a/boards/u-blox/ubx_evkninab4/board.cmake
+++ b/boards/u-blox/ubx_evkninab4/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52833_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52833" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/waveshare/nrf51_ble400/board.cmake b/boards/waveshare/nrf51_ble400/board.cmake
index e62f55b6a1d..3bdb9b702c1 100644
--- a/boards/waveshare/nrf51_ble400/board.cmake
+++ b/boards/waveshare/nrf51_ble400/board.cmake
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF51822_xxAC" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/we/ophelia1ev/board.cmake b/boards/we/ophelia1ev/board.cmake
index ffc9229c087..c55ce2f4da5 100644
--- a/boards/we/ophelia1ev/board.cmake
+++ b/boards/we/ophelia1ev/board.cmake
@@ -4,6 +4,7 @@
 board_runner_args(jlink "--device=nRF52805_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52805" "--frequency=4000000")
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/we/proteus2ev/board.cmake b/boards/we/proteus2ev/board.cmake
index 6b390dd00ba..468999481af 100644
--- a/boards/we/proteus2ev/board.cmake
+++ b/boards/we/proteus2ev/board.cmake
@@ -4,6 +4,7 @@
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000")
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/we/proteus3ev/board.cmake b/boards/we/proteus3ev/board.cmake
index 8d1cbeacc89..aa5959e4361 100644
--- a/boards/we/proteus3ev/board.cmake
+++ b/boards/we/proteus3ev/board.cmake
@@ -4,6 +4,7 @@
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/doc/hardware/porting/board_porting.rst b/doc/hardware/porting/board_porting.rst
index 503c5286d72..5d84c937c9d 100644
--- a/doc/hardware/porting/board_porting.rst
+++ b/doc/hardware/porting/board_porting.rst
@@ -696,11 +696,13 @@ example :file:`board.cmake`:
    board_runner_args(jlink "--device=nrf52" "--speed=4000")
    board_runner_args(pyocd "--target=nrf52" "--frequency=4000000")
 
+   include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
    include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
    include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
    include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 
-This example configures the ``nrfjprog``, ``jlink``, and ``pyocd`` runners.
+This example configures the ``nrfutil``, ``nrfjprog``, ``jlink``, and ``pyocd``
+runners.
 
 .. warning::
 
diff --git a/doc/releases/migration-guide-4.2.rst b/doc/releases/migration-guide-4.2.rst
index 70cf72e0b03..00e7da9d163 100644
--- a/doc/releases/migration-guide-4.2.rst
+++ b/doc/releases/migration-guide-4.2.rst
@@ -29,6 +29,15 @@ Kernel
 Boards
 ******
 
+* All boards based on Nordic ICs that used the ``nrfjprog`` Nordic command-line
+  tool for flashing by default have been modified to instead default to the new
+  nRF Util (``nrfutil``) tool. This means that you may need to `install nRF Util
+  <https://www.nordicsemi.com/Products/Development-tools/nrf-util>`_ or, if you
+  prefer to continue using ``nrfjprog``, you can do so by invoking west while
+  specfying the runner: ``west flash -r nrfjprog``. The full documentation for
+  nRF Util can be found
+  `here <https://docs.nordicsemi.com/bundle/nrfutil/page/README.html>`_.
+
 Device Drivers and Devicetree
 *****************************
 

From 499557232f6b6a57df80c951fb2b33f9e36af4e4 Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Fri, 7 Mar 2025 12:39:00 +0100
Subject: [PATCH 2531/2913] [nrf noup] tests: drivers: mpsi: api: remove SDP
 overlay

nrf-squash! [nrf noup] tests: drivers: mspi: api: Add nRF54L15 overlay file

Custom overlay is now in `nrf/tests/zephyr/...`

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 33 -------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 2cbc36a10fc..00000000000
--- a/tests/drivers/mspi/api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	aliases {
-		mspi0 = &sdp_mspi_api;
-	};
-};
-
-&cpuflpr_vpr {
-	status = "okay";
-
-	sdp_mspi_api: sdp_mspi_api {
-		compatible = "nordic,nrfe-mspi-controller";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		clock-frequency = <DT_FREQ_M(64)>;
-		pinctrl-0 = <&sdp_mspi_default>;
-		pinctrl-1 = <&sdp_mspi_sleep>;
-		pinctrl-names = "default", "sleep";
-		status = "okay";
-
-		mspi_device: mspi_device@0 {
-			status = "okay";
-			compatible = "zephyr,mspi-emul-device";
-			reg = <0x0>;
-			mspi-max-frequency = <DT_FREQ_M(1)>;
-		};
-	};
-};

From e0803fe26128f5ff84a4d0c29a2a88815103e9f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Thu, 6 Mar 2025 08:46:50 +0100
Subject: [PATCH 2532/2913] [nrf fromtree] samples: esp32c3: Add USB variant
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add USB variant config files for esp32c3 boards.

Signed-off-by: Raffael Rostagno <raffael.rostagno@espressif.com>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 8048a6ab6767298c3c45557ab470e86820851bc5)
---
 .../deep_sleep/socs/esp32c3_usb.conf          |  1 +
 .../deep_sleep/socs/esp32c3_usb.overlay       | 21 +++++++++++++++++++
 .../counter/alarm/socs/esp32c3_usb.overlay    |  3 +++
 samples/net/wifi/shell/socs/esp32c3_usb.conf  | 11 ++++++++++
 .../net/wifi/shell/socs/esp32c3_usb.overlay   |  9 ++++++++
 .../die_temp_polling/socs/esp32c3_usb.conf    |  1 +
 .../die_temp_polling/socs/esp32c3_usb.overlay | 11 ++++++++++
 samples/subsys/nvs/socs/esp32c3_usb.conf      |  1 +
 samples/subsys/settings/socs/esp32c3_usb.conf |  4 ++++
 9 files changed, 62 insertions(+)
 create mode 100644 samples/boards/espressif/deep_sleep/socs/esp32c3_usb.conf
 create mode 100644 samples/boards/espressif/deep_sleep/socs/esp32c3_usb.overlay
 create mode 100644 samples/drivers/counter/alarm/socs/esp32c3_usb.overlay
 create mode 100644 samples/net/wifi/shell/socs/esp32c3_usb.conf
 create mode 100644 samples/net/wifi/shell/socs/esp32c3_usb.overlay
 create mode 100644 samples/sensor/die_temp_polling/socs/esp32c3_usb.conf
 create mode 100644 samples/sensor/die_temp_polling/socs/esp32c3_usb.overlay
 create mode 100644 samples/subsys/nvs/socs/esp32c3_usb.conf
 create mode 100644 samples/subsys/settings/socs/esp32c3_usb.conf

diff --git a/samples/boards/espressif/deep_sleep/socs/esp32c3_usb.conf b/samples/boards/espressif/deep_sleep/socs/esp32c3_usb.conf
new file mode 100644
index 00000000000..2ce9f6b8f5c
--- /dev/null
+++ b/samples/boards/espressif/deep_sleep/socs/esp32c3_usb.conf
@@ -0,0 +1 @@
+CONFIG_EXAMPLE_GPIO_WAKEUP=y
diff --git a/samples/boards/espressif/deep_sleep/socs/esp32c3_usb.overlay b/samples/boards/espressif/deep_sleep/socs/esp32c3_usb.overlay
new file mode 100644
index 00000000000..6235a933aec
--- /dev/null
+++ b/samples/boards/espressif/deep_sleep/socs/esp32c3_usb.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		/* On ESP32-C3, only GPIO0~5 can be used
+		 * as wake-up sources
+		 */
+		wakeup-button = &sample_button;
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		sample_button: sample_button {
+			gpios = <&gpio0 0 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>;
+		};
+	};
+};
diff --git a/samples/drivers/counter/alarm/socs/esp32c3_usb.overlay b/samples/drivers/counter/alarm/socs/esp32c3_usb.overlay
new file mode 100644
index 00000000000..241947b0643
--- /dev/null
+++ b/samples/drivers/counter/alarm/socs/esp32c3_usb.overlay
@@ -0,0 +1,3 @@
+&timer0 {
+	status = "okay";
+};
diff --git a/samples/net/wifi/shell/socs/esp32c3_usb.conf b/samples/net/wifi/shell/socs/esp32c3_usb.conf
new file mode 100644
index 00000000000..a72fdf39efa
--- /dev/null
+++ b/samples/net/wifi/shell/socs/esp32c3_usb.conf
@@ -0,0 +1,11 @@
+CONFIG_WIFI=y
+
+CONFIG_NETWORKING=y
+CONFIG_NET_L2_ETHERNET=y
+
+CONFIG_NET_IPV6=n
+CONFIG_NET_IPV4=y
+CONFIG_NET_DHCPV4=y
+CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y
+
+CONFIG_NET_LOG=y
diff --git a/samples/net/wifi/shell/socs/esp32c3_usb.overlay b/samples/net/wifi/shell/socs/esp32c3_usb.overlay
new file mode 100644
index 00000000000..ea9865cf5f8
--- /dev/null
+++ b/samples/net/wifi/shell/socs/esp32c3_usb.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wifi {
+	status = "okay";
+};
diff --git a/samples/sensor/die_temp_polling/socs/esp32c3_usb.conf b/samples/sensor/die_temp_polling/socs/esp32c3_usb.conf
new file mode 100644
index 00000000000..5ab7306afeb
--- /dev/null
+++ b/samples/sensor/die_temp_polling/socs/esp32c3_usb.conf
@@ -0,0 +1 @@
+CONFIG_REQUIRES_FULL_LIBC=y
diff --git a/samples/sensor/die_temp_polling/socs/esp32c3_usb.overlay b/samples/sensor/die_temp_polling/socs/esp32c3_usb.overlay
new file mode 100644
index 00000000000..a1229102bf8
--- /dev/null
+++ b/samples/sensor/die_temp_polling/socs/esp32c3_usb.overlay
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2023, Hiroki Tada
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Application overlay for creating temperature sensor device instance
+ */
+
+&coretemp {
+	status = "okay";
+};
diff --git a/samples/subsys/nvs/socs/esp32c3_usb.conf b/samples/subsys/nvs/socs/esp32c3_usb.conf
new file mode 100644
index 00000000000..26d52701286
--- /dev/null
+++ b/samples/subsys/nvs/socs/esp32c3_usb.conf
@@ -0,0 +1 @@
+CONFIG_HEAP_MEM_POOL_SIZE=256
diff --git a/samples/subsys/settings/socs/esp32c3_usb.conf b/samples/subsys/settings/socs/esp32c3_usb.conf
new file mode 100644
index 00000000000..498fb072287
--- /dev/null
+++ b/samples/subsys/settings/socs/esp32c3_usb.conf
@@ -0,0 +1,4 @@
+CONFIG_HEAP_MEM_POOL_SIZE=256
+CONFIG_NVS=y
+CONFIG_SETTINGS_NVS=y
+CONFIG_MPU_ALLOW_FLASH_WRITE=y

From 353dcf929418004f6598275da8498a32dd99ba42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Wed, 19 Feb 2025 10:42:52 +0100
Subject: [PATCH 2533/2913] [nrf fromtree] samples: enable flash samples for
 s32z board
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enable flash samples for s32z board

Signed-off-by: Cong Nguyen Huu <cong.nguyenhuu@nxp.com>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 862706380eec4ea4b5833a0277a95fa4e00f148b)
---
 samples/subsys/fs/littlefs/sample.yaml                      | 4 ++++
 samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf | 5 +++++
 samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf | 5 +++++
 samples/subsys/settings/sample.yaml                         | 4 ++++
 samples/subsys/shell/fs/sample.yaml                         | 4 ++++
 5 files changed, 22 insertions(+)
 create mode 100644 samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf
 create mode 100644 samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf

diff --git a/samples/subsys/fs/littlefs/sample.yaml b/samples/subsys/fs/littlefs/sample.yaml
index 4d7f742dd85..85fa6468ee4 100644
--- a/samples/subsys/fs/littlefs/sample.yaml
+++ b/samples/subsys/fs/littlefs/sample.yaml
@@ -26,6 +26,10 @@ tests:
       - nrf54l15dk/nrf54l15/cpuapp
       - frdm_ke17z
       - frdm_ke17z512
+      - s32z2xxdc2/s32z270/rtu0
+      - s32z2xxdc2/s32z270/rtu1
+      - s32z2xxdc2@D/s32z270/rtu0
+      - s32z2xxdc2@D/s32z270/rtu1
     integration_platforms:
       - nrf52840dk/nrf52840
   sample.filesystem.littlefs.blk:
diff --git a/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf b/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf
new file mode 100644
index 00000000000..1535e4d46cd
--- /dev/null
+++ b/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf
@@ -0,0 +1,5 @@
+# Copyright 2024 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_NVS=y
+CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf b/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf
new file mode 100644
index 00000000000..1535e4d46cd
--- /dev/null
+++ b/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf
@@ -0,0 +1,5 @@
+# Copyright 2024 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_NVS=y
+CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/sample.yaml b/samples/subsys/settings/sample.yaml
index 58367465166..aafc61e555e 100644
--- a/samples/subsys/settings/sample.yaml
+++ b/samples/subsys/settings/sample.yaml
@@ -14,6 +14,10 @@ tests:
       - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
+      - s32z2xxdc2/s32z270/rtu0
+      - s32z2xxdc2/s32z270/rtu1
+      - s32z2xxdc2@D/s32z270/rtu0
+      - s32z2xxdc2@D/s32z270/rtu1
     integration_platforms:
       - native_sim
     harness: console
diff --git a/samples/subsys/shell/fs/sample.yaml b/samples/subsys/shell/fs/sample.yaml
index a0919b97af7..afba7ddf0e2 100644
--- a/samples/subsys/shell/fs/sample.yaml
+++ b/samples/subsys/shell/fs/sample.yaml
@@ -13,6 +13,10 @@ tests:
       - mimxrt1060_evk/mimxrt1062/qspi
       - mr_canhubk3
       - native_sim
+      - s32z2xxdc2/s32z270/rtu0
+      - s32z2xxdc2/s32z270/rtu1
+      - s32z2xxdc2@D/s32z270/rtu0
+      - s32z2xxdc2@D/s32z270/rtu1
     integration_platforms:
       - reel_board
   sample.filesystem.shell.fuse:

From 7e6bdc54c466cfe4ffad58bd205c5381ac08d767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Thu, 6 Mar 2025 08:50:01 +0100
Subject: [PATCH 2534/2913] [nrf fromtree] samples: settings: Enable NVS
 backend on mimxrt1020_evk board
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The tests for settings will not work properly with just provided config
file for mimxrt1020:
west build -p always -b mimxrt1020_evk samples/subsys/settings

as there the settings_save_one() would return -2 (-ENOENT) as by default
the CONFIG_SETTINGS_NONE is defined for mimxrt1020 configuration.

For proper operation (i.e. to have a memory medium to store settings
values) the NVS backend needs to be enabled.

Signed-off-by: Lukasz Majewski <lukma@denx.de>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 8719abaaa01d09ecf54f9c41caea755c2b97e992)
---
 samples/subsys/settings/boards/mimxrt1020_evk.conf | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 samples/subsys/settings/boards/mimxrt1020_evk.conf

diff --git a/samples/subsys/settings/boards/mimxrt1020_evk.conf b/samples/subsys/settings/boards/mimxrt1020_evk.conf
new file mode 100644
index 00000000000..3746c13c741
--- /dev/null
+++ b/samples/subsys/settings/boards/mimxrt1020_evk.conf
@@ -0,0 +1,2 @@
+CONFIG_NVS=y
+CONFIG_SETTINGS_NVS=y

From c91988c9553cff0ea86657dba0c44cf6d503680d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Thu, 6 Mar 2025 09:54:46 +0100
Subject: [PATCH 2535/2913] [nrf fromtree] samples: adc: esp32s2: Fix
 unsupported resolution
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

S2 has 12-bit ADC.

Signed-off-by: Marek Matej <marek.matej@espressif.com>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 37f2f7effded00e55dd69f6fc67102f3c0fbeb85)
---
 samples/drivers/adc/adc_dt/boards/esp32s2_saola.overlay | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/drivers/adc/adc_dt/boards/esp32s2_saola.overlay b/samples/drivers/adc/adc_dt/boards/esp32s2_saola.overlay
index 9bdf0584c32..d43209179f7 100644
--- a/samples/drivers/adc/adc_dt/boards/esp32s2_saola.overlay
+++ b/samples/drivers/adc/adc_dt/boards/esp32s2_saola.overlay
@@ -22,7 +22,7 @@
 		zephyr,gain = "ADC_GAIN_1_4";
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <13>;
+		zephyr,resolution = <12>;
 	};
 };
 
@@ -36,6 +36,6 @@
 		zephyr,gain = "ADC_GAIN_1_4";
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <13>;
+		zephyr,resolution = <12>;
 	};
 };

From 17e54e80845d0c35660c5227584f64d99b564333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Thu, 6 Mar 2025 09:57:20 +0100
Subject: [PATCH 2536/2913] [nrf fromtree] boards: esp32c3: remove invalid adc1
 entry.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove ADC2 support (identified as adc1 entry)
for additional ESP32-C3 based board targets.
Other boards have those instances already deleted.

Signed-off-by: Sylvio Alves <sylvio.alves@espressif.com>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 40b474c0cff87112a1f0b09a014f7e37e298f82d)
---
 .../adc/adc_dt/boards/esp32c3_devkitm.overlay  | 18 +-----------------
 .../adc_dt/boards/esp32c3_luatos_core.overlay  | 18 +-----------------
 .../esp32c3_luatos_core_esp32c3_usb.overlay    | 18 +-----------------
 3 files changed, 3 insertions(+), 51 deletions(-)

diff --git a/samples/drivers/adc/adc_dt/boards/esp32c3_devkitm.overlay b/samples/drivers/adc/adc_dt/boards/esp32c3_devkitm.overlay
index d43209179f7..272d0d7bcd9 100644
--- a/samples/drivers/adc/adc_dt/boards/esp32c3_devkitm.overlay
+++ b/samples/drivers/adc/adc_dt/boards/esp32c3_devkitm.overlay
@@ -6,9 +6,7 @@
 
 / {
 	zephyr,user {
-		io-channels =
-			<&adc0 0>,
-			<&adc1 0>;
+		io-channels = <&adc0 0>;
 	};
 };
 
@@ -25,17 +23,3 @@
 		zephyr,resolution = <12>;
 	};
 };
-
-&adc1 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
diff --git a/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core.overlay b/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core.overlay
index d43209179f7..272d0d7bcd9 100644
--- a/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core.overlay
+++ b/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core.overlay
@@ -6,9 +6,7 @@
 
 / {
 	zephyr,user {
-		io-channels =
-			<&adc0 0>,
-			<&adc1 0>;
+		io-channels = <&adc0 0>;
 	};
 };
 
@@ -25,17 +23,3 @@
 		zephyr,resolution = <12>;
 	};
 };
-
-&adc1 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
diff --git a/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core_esp32c3_usb.overlay b/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core_esp32c3_usb.overlay
index d43209179f7..272d0d7bcd9 100644
--- a/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core_esp32c3_usb.overlay
+++ b/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core_esp32c3_usb.overlay
@@ -6,9 +6,7 @@
 
 / {
 	zephyr,user {
-		io-channels =
-			<&adc0 0>,
-			<&adc1 0>;
+		io-channels = <&adc0 0>;
 	};
 };
 
@@ -25,17 +23,3 @@
 		zephyr,resolution = <12>;
 	};
 };
-
-&adc1 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};

From 3411e135220e696c1b2935b60194aa3c3002eeec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Thu, 6 Mar 2025 10:37:50 +0100
Subject: [PATCH 2537/2913] [nrf fromtree] samples: drivers: counter: add
 nRF54L09 config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added build configuration for nRF54L09.

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 5064401742513aa93f09f43533c842be32b9fe9f)
---
 .../alarm/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay     | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 samples/drivers/counter/alarm/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay

diff --git a/samples/drivers/counter/alarm/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay b/samples/drivers/counter/alarm/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
new file mode 100644
index 00000000000..0847233437b
--- /dev/null
+++ b/samples/drivers/counter/alarm/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
@@ -0,0 +1,9 @@
+/ {
+	chosen {
+		counter = &timer24;
+	};
+};
+
+&timer24 {
+	status = "okay";
+};

From 236d29b4ac89a51f28657ecbf5ca035f72124228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Thu, 6 Mar 2025 09:17:00 +0100
Subject: [PATCH 2538/2913] [nrf fromtree] samples: Simplify ESP32 overlays
 moving to socs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move overlays and conf from boards to socs in following samples :
- samples/drivers/adc/adc_dt
- samples/drivers/counter/alarm
- samples/drivers/dac
- samples/subsys/settings

Signed-off-by: Marek Matej <marek.matej@espressif.com>

add more samples

Signed-off-by: Marek Matej <marek.matej@espressif.com>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit b58c424946c6c0d3f03b98f6d94b76d7b854b83e)
---
 .../boards/esp32_devkitc_wroom_procpu.overlay | 41 -------------------
 .../esp32_devkitc_wrover_procpu.overlay       | 41 -------------------
 .../adc/adc_dt/boards/esp32s2_saola.overlay   | 41 -------------------
 .../boards/esp32s3_devkitm_procpu.overlay     | 41 -------------------
 .../boards/esp32s3_luatos_core_procpu.overlay | 41 -------------------
 .../esp32s3_luatos_core_procpu_usb.overlay    | 41 -------------------
 .../adc_dt/boards/xiao_esp32s3_procpu.overlay | 41 -------------------
 .../adc/adc_dt/boards/yd_esp32_procpu.overlay | 41 -------------------
 .../esp32_procpu.overlay}                     |  0
 .../esp32c3.overlay}                          |  0
 .../esp32s2.overlay}                          |  0
 .../esp32s3_procpu.overlay}                   |  3 +-
 .../boards/esp32s3_luatos_core_procpu.overlay |  3 --
 .../esp32s3_luatos_core_procpu_usb.overlay    |  3 --
 .../alarm/boards/yd_esp32_procpu.overlay      |  3 --
 .../esp32_procpu.overlay}                     |  0
 .../esp32s2.overlay}                          |  0
 .../esp32s3_procpu.overlay}                   |  0
 .../drivers/dac/boards/esp32s2_saola.overlay  | 17 --------
 .../dac/boards/yd_esp32_procpu.overlay        | 17 --------
 .../esp32_procpu.overlay}                     |  0
 .../esp32s2.overlay}                          |  0
 .../esp32s3_luatos_core_procpu_usb.conf       |  4 --
 .../esp32_procpu.conf}                        |  0
 .../esp32s2_saola.conf => socs/esp32c6.conf}  |  0
 .../esp32s2.conf}                             |  0
 .../esp32s3_procpu.conf}                      |  0
 27 files changed, 2 insertions(+), 376 deletions(-)
 delete mode 100644 samples/drivers/adc/adc_dt/boards/esp32_devkitc_wroom_procpu.overlay
 delete mode 100644 samples/drivers/adc/adc_dt/boards/esp32_devkitc_wrover_procpu.overlay
 delete mode 100644 samples/drivers/adc/adc_dt/boards/esp32s2_saola.overlay
 delete mode 100644 samples/drivers/adc/adc_dt/boards/esp32s3_devkitm_procpu.overlay
 delete mode 100644 samples/drivers/adc/adc_dt/boards/esp32s3_luatos_core_procpu.overlay
 delete mode 100644 samples/drivers/adc/adc_dt/boards/esp32s3_luatos_core_procpu_usb.overlay
 delete mode 100644 samples/drivers/adc/adc_dt/boards/xiao_esp32s3_procpu.overlay
 delete mode 100644 samples/drivers/adc/adc_dt/boards/yd_esp32_procpu.overlay
 rename samples/drivers/adc/adc_dt/{boards/esp32c3_devkitm.overlay => socs/esp32_procpu.overlay} (100%)
 rename samples/drivers/adc/adc_dt/{boards/esp32c3_luatos_core.overlay => socs/esp32c3.overlay} (100%)
 rename samples/drivers/adc/adc_dt/{boards/esp32c3_luatos_core_esp32c3_usb.overlay => socs/esp32s2.overlay} (100%)
 rename samples/drivers/adc/adc_dt/{boards/esp32s3_touch_lcd_1_28.overlay => socs/esp32s3_procpu.overlay} (87%)
 delete mode 100644 samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu.overlay
 delete mode 100644 samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu_usb.overlay
 delete mode 100644 samples/drivers/counter/alarm/boards/yd_esp32_procpu.overlay
 rename samples/drivers/counter/alarm/{boards/esp32_devkitc_wroom_procpu.overlay => socs/esp32_procpu.overlay} (100%)
 rename samples/drivers/counter/alarm/{boards/esp32s2_saola.overlay => socs/esp32s2.overlay} (100%)
 rename samples/drivers/counter/alarm/{boards/esp32s3_devkitm_procpu.overlay => socs/esp32s3_procpu.overlay} (100%)
 delete mode 100644 samples/drivers/dac/boards/esp32s2_saola.overlay
 delete mode 100644 samples/drivers/dac/boards/yd_esp32_procpu.overlay
 rename samples/drivers/dac/{boards/esp32_devkitc_wroom_procpu.overlay => socs/esp32_procpu.overlay} (100%)
 rename samples/drivers/dac/{boards/esp32_devkitc_wrover_procpu.overlay => socs/esp32s2.overlay} (100%)
 delete mode 100644 samples/subsys/settings/boards/esp32s3_luatos_core_procpu_usb.conf
 rename samples/subsys/settings/{boards/esp32_devkitc_wroom_procpu.conf => socs/esp32_procpu.conf} (100%)
 rename samples/subsys/settings/{boards/esp32s2_saola.conf => socs/esp32c6.conf} (100%)
 rename samples/subsys/settings/{boards/esp32s3_devkitm_procpu.conf => socs/esp32s2.conf} (100%)
 rename samples/subsys/settings/{boards/esp32s3_luatos_core_procpu.conf => socs/esp32s3_procpu.conf} (100%)

diff --git a/samples/drivers/adc/adc_dt/boards/esp32_devkitc_wroom_procpu.overlay b/samples/drivers/adc/adc_dt/boards/esp32_devkitc_wroom_procpu.overlay
deleted file mode 100644
index d43209179f7..00000000000
--- a/samples/drivers/adc/adc_dt/boards/esp32_devkitc_wroom_procpu.overlay
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2022 Wolter HV <wolterhv@gmx.de>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	zephyr,user {
-		io-channels =
-			<&adc0 0>,
-			<&adc1 0>;
-	};
-};
-
-&adc0 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
-
-&adc1 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
diff --git a/samples/drivers/adc/adc_dt/boards/esp32_devkitc_wrover_procpu.overlay b/samples/drivers/adc/adc_dt/boards/esp32_devkitc_wrover_procpu.overlay
deleted file mode 100644
index d43209179f7..00000000000
--- a/samples/drivers/adc/adc_dt/boards/esp32_devkitc_wrover_procpu.overlay
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2022 Wolter HV <wolterhv@gmx.de>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	zephyr,user {
-		io-channels =
-			<&adc0 0>,
-			<&adc1 0>;
-	};
-};
-
-&adc0 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
-
-&adc1 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
diff --git a/samples/drivers/adc/adc_dt/boards/esp32s2_saola.overlay b/samples/drivers/adc/adc_dt/boards/esp32s2_saola.overlay
deleted file mode 100644
index d43209179f7..00000000000
--- a/samples/drivers/adc/adc_dt/boards/esp32s2_saola.overlay
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2022 Wolter HV <wolterhv@gmx.de>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	zephyr,user {
-		io-channels =
-			<&adc0 0>,
-			<&adc1 0>;
-	};
-};
-
-&adc0 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
-
-&adc1 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
diff --git a/samples/drivers/adc/adc_dt/boards/esp32s3_devkitm_procpu.overlay b/samples/drivers/adc/adc_dt/boards/esp32s3_devkitm_procpu.overlay
deleted file mode 100644
index d43209179f7..00000000000
--- a/samples/drivers/adc/adc_dt/boards/esp32s3_devkitm_procpu.overlay
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2022 Wolter HV <wolterhv@gmx.de>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	zephyr,user {
-		io-channels =
-			<&adc0 0>,
-			<&adc1 0>;
-	};
-};
-
-&adc0 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
-
-&adc1 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
diff --git a/samples/drivers/adc/adc_dt/boards/esp32s3_luatos_core_procpu.overlay b/samples/drivers/adc/adc_dt/boards/esp32s3_luatos_core_procpu.overlay
deleted file mode 100644
index d43209179f7..00000000000
--- a/samples/drivers/adc/adc_dt/boards/esp32s3_luatos_core_procpu.overlay
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2022 Wolter HV <wolterhv@gmx.de>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	zephyr,user {
-		io-channels =
-			<&adc0 0>,
-			<&adc1 0>;
-	};
-};
-
-&adc0 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
-
-&adc1 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
diff --git a/samples/drivers/adc/adc_dt/boards/esp32s3_luatos_core_procpu_usb.overlay b/samples/drivers/adc/adc_dt/boards/esp32s3_luatos_core_procpu_usb.overlay
deleted file mode 100644
index d43209179f7..00000000000
--- a/samples/drivers/adc/adc_dt/boards/esp32s3_luatos_core_procpu_usb.overlay
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2022 Wolter HV <wolterhv@gmx.de>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	zephyr,user {
-		io-channels =
-			<&adc0 0>,
-			<&adc1 0>;
-	};
-};
-
-&adc0 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
-
-&adc1 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
diff --git a/samples/drivers/adc/adc_dt/boards/xiao_esp32s3_procpu.overlay b/samples/drivers/adc/adc_dt/boards/xiao_esp32s3_procpu.overlay
deleted file mode 100644
index d43209179f7..00000000000
--- a/samples/drivers/adc/adc_dt/boards/xiao_esp32s3_procpu.overlay
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2022 Wolter HV <wolterhv@gmx.de>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	zephyr,user {
-		io-channels =
-			<&adc0 0>,
-			<&adc1 0>;
-	};
-};
-
-&adc0 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
-
-&adc1 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
diff --git a/samples/drivers/adc/adc_dt/boards/yd_esp32_procpu.overlay b/samples/drivers/adc/adc_dt/boards/yd_esp32_procpu.overlay
deleted file mode 100644
index d43209179f7..00000000000
--- a/samples/drivers/adc/adc_dt/boards/yd_esp32_procpu.overlay
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2022 Wolter HV <wolterhv@gmx.de>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	zephyr,user {
-		io-channels =
-			<&adc0 0>,
-			<&adc1 0>;
-	};
-};
-
-&adc0 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
-
-&adc1 {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_4";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-	};
-};
diff --git a/samples/drivers/adc/adc_dt/boards/esp32c3_devkitm.overlay b/samples/drivers/adc/adc_dt/socs/esp32_procpu.overlay
similarity index 100%
rename from samples/drivers/adc/adc_dt/boards/esp32c3_devkitm.overlay
rename to samples/drivers/adc/adc_dt/socs/esp32_procpu.overlay
diff --git a/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core.overlay b/samples/drivers/adc/adc_dt/socs/esp32c3.overlay
similarity index 100%
rename from samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core.overlay
rename to samples/drivers/adc/adc_dt/socs/esp32c3.overlay
diff --git a/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core_esp32c3_usb.overlay b/samples/drivers/adc/adc_dt/socs/esp32s2.overlay
similarity index 100%
rename from samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core_esp32c3_usb.overlay
rename to samples/drivers/adc/adc_dt/socs/esp32s2.overlay
diff --git a/samples/drivers/adc/adc_dt/boards/esp32s3_touch_lcd_1_28.overlay b/samples/drivers/adc/adc_dt/socs/esp32s3_procpu.overlay
similarity index 87%
rename from samples/drivers/adc/adc_dt/boards/esp32s3_touch_lcd_1_28.overlay
rename to samples/drivers/adc/adc_dt/socs/esp32s3_procpu.overlay
index de057062019..272d0d7bcd9 100644
--- a/samples/drivers/adc/adc_dt/boards/esp32s3_touch_lcd_1_28.overlay
+++ b/samples/drivers/adc/adc_dt/socs/esp32s3_procpu.overlay
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2024 Joel Guittet
+ * Copyright (c) 2022 Wolter HV <wolterhv@gmx.de>
+ *
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu.overlay b/samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu.overlay
deleted file mode 100644
index 241947b0643..00000000000
--- a/samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu.overlay
+++ /dev/null
@@ -1,3 +0,0 @@
-&timer0 {
-	status = "okay";
-};
diff --git a/samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu_usb.overlay b/samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu_usb.overlay
deleted file mode 100644
index 241947b0643..00000000000
--- a/samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu_usb.overlay
+++ /dev/null
@@ -1,3 +0,0 @@
-&timer0 {
-	status = "okay";
-};
diff --git a/samples/drivers/counter/alarm/boards/yd_esp32_procpu.overlay b/samples/drivers/counter/alarm/boards/yd_esp32_procpu.overlay
deleted file mode 100644
index 241947b0643..00000000000
--- a/samples/drivers/counter/alarm/boards/yd_esp32_procpu.overlay
+++ /dev/null
@@ -1,3 +0,0 @@
-&timer0 {
-	status = "okay";
-};
diff --git a/samples/drivers/counter/alarm/boards/esp32_devkitc_wroom_procpu.overlay b/samples/drivers/counter/alarm/socs/esp32_procpu.overlay
similarity index 100%
rename from samples/drivers/counter/alarm/boards/esp32_devkitc_wroom_procpu.overlay
rename to samples/drivers/counter/alarm/socs/esp32_procpu.overlay
diff --git a/samples/drivers/counter/alarm/boards/esp32s2_saola.overlay b/samples/drivers/counter/alarm/socs/esp32s2.overlay
similarity index 100%
rename from samples/drivers/counter/alarm/boards/esp32s2_saola.overlay
rename to samples/drivers/counter/alarm/socs/esp32s2.overlay
diff --git a/samples/drivers/counter/alarm/boards/esp32s3_devkitm_procpu.overlay b/samples/drivers/counter/alarm/socs/esp32s3_procpu.overlay
similarity index 100%
rename from samples/drivers/counter/alarm/boards/esp32s3_devkitm_procpu.overlay
rename to samples/drivers/counter/alarm/socs/esp32s3_procpu.overlay
diff --git a/samples/drivers/dac/boards/esp32s2_saola.overlay b/samples/drivers/dac/boards/esp32s2_saola.overlay
deleted file mode 100644
index 4bb2651bd68..00000000000
--- a/samples/drivers/dac/boards/esp32s2_saola.overlay
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2022 Espressif (Shanghai)
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	zephyr,user {
-		dac = <&dac>;
-		dac-channel-id = <0>;
-		dac-resolution = <8>;
-	};
-};
-
-&dac {
-	status = "okay";
-};
diff --git a/samples/drivers/dac/boards/yd_esp32_procpu.overlay b/samples/drivers/dac/boards/yd_esp32_procpu.overlay
deleted file mode 100644
index 4bb2651bd68..00000000000
--- a/samples/drivers/dac/boards/yd_esp32_procpu.overlay
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2022 Espressif (Shanghai)
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	zephyr,user {
-		dac = <&dac>;
-		dac-channel-id = <0>;
-		dac-resolution = <8>;
-	};
-};
-
-&dac {
-	status = "okay";
-};
diff --git a/samples/drivers/dac/boards/esp32_devkitc_wroom_procpu.overlay b/samples/drivers/dac/socs/esp32_procpu.overlay
similarity index 100%
rename from samples/drivers/dac/boards/esp32_devkitc_wroom_procpu.overlay
rename to samples/drivers/dac/socs/esp32_procpu.overlay
diff --git a/samples/drivers/dac/boards/esp32_devkitc_wrover_procpu.overlay b/samples/drivers/dac/socs/esp32s2.overlay
similarity index 100%
rename from samples/drivers/dac/boards/esp32_devkitc_wrover_procpu.overlay
rename to samples/drivers/dac/socs/esp32s2.overlay
diff --git a/samples/subsys/settings/boards/esp32s3_luatos_core_procpu_usb.conf b/samples/subsys/settings/boards/esp32s3_luatos_core_procpu_usb.conf
deleted file mode 100644
index 498fb072287..00000000000
--- a/samples/subsys/settings/boards/esp32s3_luatos_core_procpu_usb.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_HEAP_MEM_POOL_SIZE=256
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/settings/boards/esp32_devkitc_wroom_procpu.conf b/samples/subsys/settings/socs/esp32_procpu.conf
similarity index 100%
rename from samples/subsys/settings/boards/esp32_devkitc_wroom_procpu.conf
rename to samples/subsys/settings/socs/esp32_procpu.conf
diff --git a/samples/subsys/settings/boards/esp32s2_saola.conf b/samples/subsys/settings/socs/esp32c6.conf
similarity index 100%
rename from samples/subsys/settings/boards/esp32s2_saola.conf
rename to samples/subsys/settings/socs/esp32c6.conf
diff --git a/samples/subsys/settings/boards/esp32s3_devkitm_procpu.conf b/samples/subsys/settings/socs/esp32s2.conf
similarity index 100%
rename from samples/subsys/settings/boards/esp32s3_devkitm_procpu.conf
rename to samples/subsys/settings/socs/esp32s2.conf
diff --git a/samples/subsys/settings/boards/esp32s3_luatos_core_procpu.conf b/samples/subsys/settings/socs/esp32s3_procpu.conf
similarity index 100%
rename from samples/subsys/settings/boards/esp32s3_luatos_core_procpu.conf
rename to samples/subsys/settings/socs/esp32s3_procpu.conf

From 9476b04c64cb5975f67b6b8eddc8ef0a4e9bd10c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Wed, 18 Dec 2024 14:14:56 +0100
Subject: [PATCH 2539/2913] [nrf fromtree] samples: settings: cleanup and use
 filters
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Almost all overlays only enable NVS and SETTINGS_NVS, something that
should be enabled in sample directly. Remove all overlays and make the
sample more genenric.

Use filter on storage partition to enable testing the sample on more
plaforms.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 270c4e4cab4a6282816b4f4d312eba52f945aee2)
---
 .../settings/boards/mimxrt1020_evk.conf       |  2 --
 .../subsys/settings/boards/mr_canhubk3.conf   |  8 -------
 .../subsys/settings/boards/native_sim.conf    |  5 -----
 .../subsys/settings/boards/native_sim.overlay | 22 -------------------
 .../settings/boards/native_sim_native_64.conf |  5 -----
 .../boards/native_sim_native_64.overlay       |  7 ------
 .../settings/boards/nrf52840dk_nrf52840.conf  |  3 ---
 .../settings/boards/nrf52dk_nrf52832.conf     |  3 ---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.conf    |  2 --
 .../boards/nrf54l15dk_nrf54l05_cpuapp.conf    |  2 --
 .../boards/nrf54l15dk_nrf54l10_cpuapp.conf    |  2 --
 .../boards/nrf54l15dk_nrf54l15_cpuapp.conf    |  2 --
 samples/subsys/settings/boards/qemu_x86.conf  |  2 --
 .../boards/s32z2xxdc2_s32z270_rtu0.conf       |  5 -----
 .../boards/s32z2xxdc2_s32z270_rtu1.conf       |  5 -----
 .../settings/boards/yd_esp32_procpu.conf      |  4 ----
 samples/subsys/settings/prj.conf              |  5 ++++-
 samples/subsys/settings/sample.yaml           | 16 +++-----------
 samples/subsys/settings/socs/cc1352p7.conf    |  1 -
 .../subsys/settings/socs/esp32_procpu.conf    |  4 ----
 samples/subsys/settings/socs/esp32c3.conf     |  4 ----
 samples/subsys/settings/socs/esp32c3_usb.conf |  4 ----
 samples/subsys/settings/socs/esp32c6.conf     |  4 ----
 samples/subsys/settings/socs/esp32s2.conf     |  4 ----
 .../subsys/settings/socs/esp32s3_procpu.conf  |  4 ----
 25 files changed, 7 insertions(+), 118 deletions(-)
 delete mode 100644 samples/subsys/settings/boards/mimxrt1020_evk.conf
 delete mode 100644 samples/subsys/settings/boards/mr_canhubk3.conf
 delete mode 100644 samples/subsys/settings/boards/native_sim.conf
 delete mode 100644 samples/subsys/settings/boards/native_sim.overlay
 delete mode 100644 samples/subsys/settings/boards/native_sim_native_64.conf
 delete mode 100644 samples/subsys/settings/boards/native_sim_native_64.overlay
 delete mode 100644 samples/subsys/settings/boards/nrf52840dk_nrf52840.conf
 delete mode 100644 samples/subsys/settings/boards/nrf52dk_nrf52832.conf
 delete mode 100644 samples/subsys/settings/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 delete mode 100644 samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf
 delete mode 100644 samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf
 delete mode 100644 samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf
 delete mode 100644 samples/subsys/settings/boards/qemu_x86.conf
 delete mode 100644 samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf
 delete mode 100644 samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf
 delete mode 100644 samples/subsys/settings/boards/yd_esp32_procpu.conf
 delete mode 100644 samples/subsys/settings/socs/cc1352p7.conf
 delete mode 100644 samples/subsys/settings/socs/esp32_procpu.conf
 delete mode 100644 samples/subsys/settings/socs/esp32c3.conf
 delete mode 100644 samples/subsys/settings/socs/esp32c3_usb.conf
 delete mode 100644 samples/subsys/settings/socs/esp32c6.conf
 delete mode 100644 samples/subsys/settings/socs/esp32s2.conf
 delete mode 100644 samples/subsys/settings/socs/esp32s3_procpu.conf

diff --git a/samples/subsys/settings/boards/mimxrt1020_evk.conf b/samples/subsys/settings/boards/mimxrt1020_evk.conf
deleted file mode 100644
index 3746c13c741..00000000000
--- a/samples/subsys/settings/boards/mimxrt1020_evk.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/mr_canhubk3.conf b/samples/subsys/settings/boards/mr_canhubk3.conf
deleted file mode 100644
index 6ca210a81ac..00000000000
--- a/samples/subsys/settings/boards/mr_canhubk3.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2023 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-# Use LittleFS file system as Settings backend
-CONFIG_FILE_SYSTEM=y
-CONFIG_FILE_SYSTEM_LITTLEFS=y
-CONFIG_SETTINGS_FILE=y
-CONFIG_SETTINGS_FILE_PATH="/ff/settings/run"
diff --git a/samples/subsys/settings/boards/native_sim.conf b/samples/subsys/settings/boards/native_sim.conf
deleted file mode 100644
index 21877f886f3..00000000000
--- a/samples/subsys/settings/boards/native_sim.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Enable the LittleFS file system.
-CONFIG_FILE_SYSTEM=y
-CONFIG_FILE_SYSTEM_LITTLEFS=y
-CONFIG_SETTINGS_FILE=y
-CONFIG_SETTINGS_FILE_PATH="/ff/settings/run"
diff --git a/samples/subsys/settings/boards/native_sim.overlay b/samples/subsys/settings/boards/native_sim.overlay
deleted file mode 100644
index 0e4839ad026..00000000000
--- a/samples/subsys/settings/boards/native_sim.overlay
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2019 Jan Van Winkel <jan.van_winkel@dxplore.eu>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/delete-node/ &storage_partition;
-/delete-node/ &scratch_partition;
-
-&flash0 {
-
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		storage_partition: partition@70000 {
-			label = "storage";
-			reg = <0x00070000 0x8000>;
-		};
-	};
-};
diff --git a/samples/subsys/settings/boards/native_sim_native_64.conf b/samples/subsys/settings/boards/native_sim_native_64.conf
deleted file mode 100644
index 21877f886f3..00000000000
--- a/samples/subsys/settings/boards/native_sim_native_64.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Enable the LittleFS file system.
-CONFIG_FILE_SYSTEM=y
-CONFIG_FILE_SYSTEM_LITTLEFS=y
-CONFIG_SETTINGS_FILE=y
-CONFIG_SETTINGS_FILE_PATH="/ff/settings/run"
diff --git a/samples/subsys/settings/boards/native_sim_native_64.overlay b/samples/subsys/settings/boards/native_sim_native_64.overlay
deleted file mode 100644
index e4994493dd6..00000000000
--- a/samples/subsys/settings/boards/native_sim_native_64.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "native_sim.overlay"
diff --git a/samples/subsys/settings/boards/nrf52840dk_nrf52840.conf b/samples/subsys/settings/boards/nrf52840dk_nrf52840.conf
deleted file mode 100644
index 248bc56424e..00000000000
--- a/samples/subsys/settings/boards/nrf52840dk_nrf52840.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_ARM_MPU=n
diff --git a/samples/subsys/settings/boards/nrf52dk_nrf52832.conf b/samples/subsys/settings/boards/nrf52dk_nrf52832.conf
deleted file mode 100644
index 248bc56424e..00000000000
--- a/samples/subsys/settings/boards/nrf52dk_nrf52832.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_ARM_MPU=n
diff --git a/samples/subsys/settings/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/subsys/settings/boards/nrf54h20dk_nrf54h20_cpuapp.conf
deleted file mode 100644
index 3746c13c741..00000000000
--- a/samples/subsys/settings/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf
deleted file mode 100644
index 3746c13c741..00000000000
--- a/samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf
deleted file mode 100644
index 3746c13c741..00000000000
--- a/samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf
deleted file mode 100644
index 3746c13c741..00000000000
--- a/samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/qemu_x86.conf b/samples/subsys/settings/boards/qemu_x86.conf
deleted file mode 100644
index 3746c13c741..00000000000
--- a/samples/subsys/settings/boards/qemu_x86.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf b/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf
deleted file mode 100644
index 1535e4d46cd..00000000000
--- a/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2024 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf b/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf
deleted file mode 100644
index 1535e4d46cd..00000000000
--- a/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2024 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/yd_esp32_procpu.conf b/samples/subsys/settings/boards/yd_esp32_procpu.conf
deleted file mode 100644
index 498fb072287..00000000000
--- a/samples/subsys/settings/boards/yd_esp32_procpu.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_HEAP_MEM_POOL_SIZE=256
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/settings/prj.conf b/samples/subsys/settings/prj.conf
index 25c66253846..d9ae787141a 100644
--- a/samples/subsys/settings/prj.conf
+++ b/samples/subsys/settings/prj.conf
@@ -1,6 +1,9 @@
 CONFIG_STDOUT_CONSOLE=y
 CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
-
 CONFIG_SETTINGS=y
 CONFIG_SETTINGS_RUNTIME=y
+CONFIG_NVS=y
+CONFIG_SETTINGS_NVS=y
+CONFIG_HEAP_MEM_POOL_SIZE=256
+CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/settings/sample.yaml b/samples/subsys/settings/sample.yaml
index aafc61e555e..7dcf6c45720 100644
--- a/samples/subsys/settings/sample.yaml
+++ b/samples/subsys/settings/sample.yaml
@@ -5,19 +5,9 @@ tests:
   sample.subsys.settings:
     tags: settings
     timeout: 10
-    platform_allow:
-      - qemu_x86
-      - native_sim
-      - native_sim/native/64
-      - mr_canhubk3
-      - nrf54l15dk/nrf54l05/cpuapp
-      - nrf54l15dk/nrf54l10/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54h20dk/nrf54h20/cpuapp
-      - s32z2xxdc2/s32z270/rtu0
-      - s32z2xxdc2/s32z270/rtu1
-      - s32z2xxdc2@D/s32z270/rtu0
-      - s32z2xxdc2@D/s32z270/rtu1
+    filter: dt_label_with_parent_compat_enabled("storage_partition", "fixed-partitions")
+    platform_exclude:
+      - qemu_cortex_m0/nrf51822
     integration_platforms:
       - native_sim
     harness: console
diff --git a/samples/subsys/settings/socs/cc1352p7.conf b/samples/subsys/settings/socs/cc1352p7.conf
deleted file mode 100644
index ca92a061c6a..00000000000
--- a/samples/subsys/settings/socs/cc1352p7.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NVS=y
diff --git a/samples/subsys/settings/socs/esp32_procpu.conf b/samples/subsys/settings/socs/esp32_procpu.conf
deleted file mode 100644
index 498fb072287..00000000000
--- a/samples/subsys/settings/socs/esp32_procpu.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_HEAP_MEM_POOL_SIZE=256
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/settings/socs/esp32c3.conf b/samples/subsys/settings/socs/esp32c3.conf
deleted file mode 100644
index 498fb072287..00000000000
--- a/samples/subsys/settings/socs/esp32c3.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_HEAP_MEM_POOL_SIZE=256
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/settings/socs/esp32c3_usb.conf b/samples/subsys/settings/socs/esp32c3_usb.conf
deleted file mode 100644
index 498fb072287..00000000000
--- a/samples/subsys/settings/socs/esp32c3_usb.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_HEAP_MEM_POOL_SIZE=256
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/settings/socs/esp32c6.conf b/samples/subsys/settings/socs/esp32c6.conf
deleted file mode 100644
index 498fb072287..00000000000
--- a/samples/subsys/settings/socs/esp32c6.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_HEAP_MEM_POOL_SIZE=256
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/settings/socs/esp32s2.conf b/samples/subsys/settings/socs/esp32s2.conf
deleted file mode 100644
index 498fb072287..00000000000
--- a/samples/subsys/settings/socs/esp32s2.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_HEAP_MEM_POOL_SIZE=256
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/settings/socs/esp32s3_procpu.conf b/samples/subsys/settings/socs/esp32s3_procpu.conf
deleted file mode 100644
index 498fb072287..00000000000
--- a/samples/subsys/settings/socs/esp32s3_procpu.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_HEAP_MEM_POOL_SIZE=256
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_MPU_ALLOW_FLASH_WRITE=y

From 163004a98b1a59583840215e25f1d876d09d2df5 Mon Sep 17 00:00:00 2001
From: Thomas Deppe <thomas.deppe@nordicsemi.no>
Date: Thu, 6 Mar 2025 16:07:47 +0100
Subject: [PATCH 2540/2913] [nrf fromlist] Bluetooth: Host: Fix Advertising
 Coding Selection as peripheral

Fix mistake in host implementation of Advertising Coding Selection.

The host should only try set the BT_LE_FEAT_BIT_ADV_CODING_SEL_HOST
when the observer role is enabled. If a broadcaster enables the
CONFIG_BT_EXT_ADV_CODING_SELECTION Kconfig option bluetooth will
fail to initialise.

Upstream PR #: 86731

Signed-off-by: Thomas Deppe <thomas.deppe@nordicsemi.no>
---
 subsys/bluetooth/host/hci_core.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index b01c49d3243..338cff5ba88 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -3684,6 +3684,7 @@ static int le_init(void)
 	}
 
 	if (IS_ENABLED(CONFIG_BT_EXT_ADV_CODING_SELECTION) &&
+	    IS_ENABLED(CONFIG_BT_OBSERVER) &&
 	    BT_FEAT_LE_ADV_CODING_SEL(bt_dev.le.features)) {
 		err = le_set_host_feature(BT_LE_FEAT_BIT_ADV_CODING_SEL_HOST, 1);
 		if (err) {

From 5715c89be1b39b4ecf6ec11e761be9c31c35f807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 6 Mar 2025 11:11:10 +0100
Subject: [PATCH 2541/2913] [nrf fromlist] logging: frontends: stmesp: Fix
 sending string location
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

String location information should only be sent for core which
do not append strings to the log message (PPR, FLPR). Without
this, cpurad was also sending that information and that was
redundant.

Upstream PR #: 86242

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 subsys/logging/frontends/log_frontend_stmesp.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/subsys/logging/frontends/log_frontend_stmesp.c b/subsys/logging/frontends/log_frontend_stmesp.c
index f9bfc4ddc07..0ede3cb4890 100644
--- a/subsys/logging/frontends/log_frontend_stmesp.c
+++ b/subsys/logging/frontends/log_frontend_stmesp.c
@@ -581,7 +581,8 @@ void log_frontend_panic(void)
 
 void log_frontend_init(void)
 {
-#if defined(CONFIG_LOG_FRONTEND_STPESP_TURBO_SOURCE_PORT_ID) && !defined(CONFIG_NRF_ETR)
+#if	defined(CONFIG_LOG_FRONTEND_STPESP_TURBO_SOURCE_PORT_ID) && !defined(CONFIG_NRF_ETR) && \
+	!defined(CONFIG_LOG_MSG_APPEND_RO_STRING_LOC)
 	/* Send location of section with constant source data. It is used by the
 	 * application core to retrieve source names of log messages coming from
 	 * coprocessors (FLPR and PPR).

From d50b6cd3557266f673f0b9b3c5885cc7b38c455e Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Thu, 27 Feb 2025 11:52:53 +0100
Subject: [PATCH 2542/2913] [nrf fromtree] manifest: Update nRF hw models to
 latest

Update the HW models module to:
b84bd7314a239f818e78f6927f5673247816df53

Including the following:
b84bd73 UART PTY backend: Correct a few comments
f945d62 RADIO 54: Fix reset value of TIMING register
9fd4133 MDK nrfx_erratas.h: Ensure backwards compatibility with old
        nrfx versions
85061b1 MDK: Provide empty replacement for nrf_erratas.h

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit b932e1433876de28c21241904b613f6205e08dad)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index f1659924fb0..32f7877754d 100644
--- a/west.yml
+++ b/west.yml
@@ -315,7 +315,7 @@ manifest:
       groups:
         - tools
     - name: nrf_hw_models
-      revision: 73a5d5827a94820be65b7d276d28173ec10bab9f
+      revision: b84bd7314a239f818e78f6927f5673247816df53
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
       revision: 0f53c9ebab526661131d5d7e73c7a6cb3b2d2e11

From 42c571895c798759fd0cb22d3129acc44680c8ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Thu, 13 Feb 2025 13:56:32 +0100
Subject: [PATCH 2543/2913] [nrf fromtree] boards: nordic: nrf54l20pdk: Add
 dmic to supported peripherals
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add dmic to the list of supported peripherals on nRF54L20pdk.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 0015571e7efde7dcd704b86701dc9528ba2f03b7)
---
 boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
index bb77373ffb3..02a47928373 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
@@ -15,6 +15,7 @@ flash: 449
 supported:
   - adc
   - counter
+  - dmic
   - gpio
   - i2c
   - pwm

From dc1318d80481f0a351bf4c03b0ffd9b598aa0546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Thu, 13 Feb 2025 14:00:51 +0100
Subject: [PATCH 2544/2913] [nrf fromtree] tests: drivers: audio: dmic_api:
 Enable test on nRF54L20pdk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add test configuration on DMIC nodes that are compatible
with 'nordic_nrf_pdm'.
Add missing DTS definitions in a board overlay.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 22d9f0c13f9807556af87746452a3d354e7a000e)
---
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       | 27 +++++++++++++++++++
 tests/drivers/audio/dmic_api/src/main.c       | 13 ++++++---
 2 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 tests/drivers/audio/dmic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay

diff --git a/tests/drivers/audio/dmic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/audio/dmic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 00000000000..440ef9828ae
--- /dev/null
+++ b/tests/drivers/audio/dmic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		dmic-dev = &pdm20;
+	};
+};
+
+&pinctrl {
+	pdm20_default_alt: pdm20_default_alt {
+		group1 {
+			psels = <NRF_PSEL(PDM_CLK, 1, 10)>,
+				<NRF_PSEL(PDM_DIN, 1, 11)>;
+		};
+	};
+};
+
+dmic_dev: &pdm20 {
+	status = "okay";
+	pinctrl-0 = <&pdm20_default_alt>;
+	pinctrl-names = "default";
+	clock-source = "PCLK32M";
+};
diff --git a/tests/drivers/audio/dmic_api/src/main.c b/tests/drivers/audio/dmic_api/src/main.c
index 488490e219c..7f697e4539b 100644
--- a/tests/drivers/audio/dmic_api/src/main.c
+++ b/tests/drivers/audio/dmic_api/src/main.c
@@ -21,14 +21,21 @@ static const struct device *dmic_dev = DEVICE_DT_GET(DT_ALIAS(dmic_dev));
 #define BYTES_PER_SAMPLE sizeof(int16_t)
 #define SLAB_ALIGN 4
 #define MAX_SAMPLE_RATE  48000
+#elif DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_pdm)
+#define PDM_CHANNELS 2
+#define SAMPLE_BIT_WIDTH 16
+#define BYTES_PER_SAMPLE sizeof(int16_t)
+#define SLAB_ALIGN 4
+#define MAX_SAMPLE_RATE  48000
+#else
+#error "Unsupported DMIC device"
+#endif
+
 /* Milliseconds to wait for a block to be read. */
 #define READ_TIMEOUT 1000
 /* Size of a block for 100 ms of audio data. */
 #define BLOCK_SIZE(_sample_rate, _number_of_channels) \
 	(BYTES_PER_SAMPLE * (_sample_rate / 10) * _number_of_channels)
-#else
-#error "Unsupported DMIC device"
-#endif
 
 /* Driver will allocate blocks from this slab to receive audio data into them.
  * Application, after getting a given block from the driver and processing its

From 47918947fcf9c9cdd7eb93018f6c8dbd2912d5d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Thu, 13 Feb 2025 14:02:20 +0100
Subject: [PATCH 2545/2913] [nrf fromtree] samples: drivers: aduio: dmic:
 Enable sample on nRF54L20pdk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enable execution of DMIC sample on nRF54L20pdk.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 773cf96944480e74ca2af7fe5cea54ff801a93ef)
---
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 samples/drivers/audio/dmic/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay

diff --git a/samples/drivers/audio/dmic/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/samples/drivers/audio/dmic/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 00000000000..3699a9e9563
--- /dev/null
+++ b/samples/drivers/audio/dmic/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	pdm20_default_alt: pdm20_default_alt {
+		group1 {
+			psels = <NRF_PSEL(PDM_CLK, 1, 10)>,
+				<NRF_PSEL(PDM_DIN, 1, 11)>;
+		};
+	};
+};
+
+dmic_dev: &pdm20 {
+	status = "okay";
+	pinctrl-0 = <&pdm20_default_alt>;
+	pinctrl-names = "default";
+	clock-source = "PCLK32M";
+};

From d9c1ff2912a0afcd2877735f24c36cec6e2083b6 Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Mon, 10 Mar 2025 13:16:29 +0100
Subject: [PATCH 2546/2913] Revert "[nrf fromlist] drivers: flash: mspi_nor:
 support MODE_SINGLE and MODE_QUAD_1_4_4"

This reverts commit ee6cc76550d2fcbe62be273e0a85193db737f758.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 drivers/flash/flash_mspi_nor.c | 396 +++++++++------------------------
 1 file changed, 106 insertions(+), 290 deletions(-)

diff --git a/drivers/flash/flash_mspi_nor.c b/drivers/flash/flash_mspi_nor.c
index d9eecaeb298..1f9f2c67ee9 100644
--- a/drivers/flash/flash_mspi_nor.c
+++ b/drivers/flash/flash_mspi_nor.c
@@ -28,183 +28,6 @@ struct flash_mspi_nor_data {
 	struct mspi_xfer xfer;
 };
 
-struct flash_mspi_nor_cmd {
-	enum mspi_xfer_direction dir;
-	uint32_t cmd;
-	uint16_t tx_dummy;
-	uint16_t rx_dummy;
-	uint8_t cmd_length;
-	uint8_t addr_length;
-};
-
-struct flash_mspi_nor_cmds {
-	struct flash_mspi_nor_cmd id;
-	struct flash_mspi_nor_cmd write_en;
-	struct flash_mspi_nor_cmd read;
-	struct flash_mspi_nor_cmd status;
-	struct flash_mspi_nor_cmd page_program;
-	struct flash_mspi_nor_cmd sector_erase;
-	struct flash_mspi_nor_cmd chip_erase;
-	struct flash_mspi_nor_cmd mode_change;
-	struct flash_mspi_nor_cmd sfdp;
-	uint8_t mode_payload;
-};
-
-static const struct flash_mspi_nor_cmds commands[] = {
-	[MSPI_IO_MODE_SINGLE] = {
-		.id = {
-			.dir = MSPI_RX,
-			.cmd = JESD216_CMD_READ_ID,
-			.cmd_length = 1,
-		},
-		.write_en = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WREN,
-			.cmd_length = 1,
-		},
-		.read = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_CMD_READ,
-			.cmd_length = 1,
-			.addr_length = 3,
-		},
-		.status = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_CMD_RDSR,
-			.cmd_length = 1,
-		},
-		.page_program = {
-			.dir  = MSPI_TX,
-			.cmd = SPI_NOR_CMD_PP,
-			.cmd_length = 1,
-			.addr_length = 3,
-		},
-		.sector_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_SE,
-			.cmd_length = 1,
-			.addr_length = 3,
-		},
-		.chip_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_CE,
-			.cmd_length = 1,
-		},
-		.mode_change = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WRSR,
-			.cmd_length = 1,
-		},
-		.mode_payload = 0,
-	},
-	[MSPI_IO_MODE_QUAD_1_4_4] = {
-		.id = {
-			.dir = MSPI_RX,
-			.cmd = JESD216_CMD_READ_ID,
-			.cmd_length = 1,
-		},
-		.write_en = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WREN,
-			.cmd_length = 1,
-		},
-		.read = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_CMD_4READ,
-			.cmd_length = 1,
-			.addr_length = 3,
-			.rx_dummy = 6,
-		},
-		.status = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_CMD_RDSR,
-			.cmd_length = 1,
-		},
-		.page_program = {
-			.dir  = MSPI_TX,
-			.cmd = SPI_NOR_CMD_PP_1_4_4,
-			.cmd_length = 1,
-			.addr_length = 3,
-		},
-		.sector_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_SE,
-			.cmd_length = 1,
-			.addr_length = 3,
-		},
-		.chip_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_CE,
-			.cmd_length = 1,
-		},
-		.mode_change = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WRSR,
-			.cmd_length = 1,
-		},
-		.mode_payload = SPI_NOR_QE_BIT,
-	},
-	[MSPI_IO_MODE_OCTAL] = {
-		.id = {
-			.dir = MSPI_RX,
-			.cmd = JESD216_OCMD_READ_ID,
-			.cmd_length = 2,
-			.addr_length = 4,
-			.rx_dummy = 4
-		},
-		.write_en = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_OCMD_WREN,
-			.cmd_length = 2,
-		},
-		.read = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_OCMD_RD,
-			.cmd_length = 2,
-			.addr_length = 4,
-			.rx_dummy = 20,
-		},
-		.status = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_OCMD_RDSR,
-			.cmd_length = 2,
-			.addr_length = 4,
-			.rx_dummy = 4,
-		},
-		.page_program = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_OCMD_PAGE_PRG,
-			.cmd_length = 2,
-			.addr_length = 4,
-		},
-		.sector_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_OCMD_SE,
-			.cmd_length = 2,
-			.addr_length = 4,
-		},
-		.chip_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_OCMD_CE,
-			.cmd_length = 2,
-		},
-		.sfdp = {
-			.dir = MSPI_RX,
-			.cmd = JESD216_OCMD_READ_SFDP,
-			.cmd_length = 2,
-			.addr_length = 4,
-			.rx_dummy = 20,
-		},
-		.mode_change = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WR_CFGREG2,
-			.cmd_length = 1,
-			.addr_length = 4,
-		},
-		.mode_payload = 0x01,
-	},
-};
-
 struct flash_mspi_nor_config {
 	const struct device *bus;
 	uint32_t flash_size;
@@ -222,7 +45,6 @@ struct flash_mspi_nor_config {
 	struct flash_pages_layout layout;
 #endif
 	uint8_t jedec_id[SPI_NOR_MAX_ID_LEN];
-	const struct flash_mspi_nor_cmds *jedec_cmds;
 };
 
 static int acquire(const struct device *dev)
@@ -275,27 +97,6 @@ static inline uint16_t dev_page_size(const struct device *dev)
 	return SPI_NOR_PAGE_SIZE;
 }
 
-static void command_set(const struct device *dev, const struct flash_mspi_nor_cmd *cmd)
-{
-	struct flash_mspi_nor_data *dev_data = dev->data;
-
-	memset(&dev_data->xfer, 0, sizeof(dev_data->xfer));
-	memset(&dev_data->packet, 0, sizeof(dev_data->packet));
-
-	dev_data->xfer.xfer_mode  = MSPI_PIO;
-	dev_data->xfer.packets    = &dev_data->packet;
-	dev_data->xfer.num_packet = 1;
-	dev_data->xfer.timeout    = 10;
-
-	dev_data->xfer.cmd_length = cmd->cmd_length;
-	dev_data->xfer.addr_length = cmd->addr_length;
-	dev_data->xfer.tx_dummy = cmd->tx_dummy;
-	dev_data->xfer.rx_dummy = cmd->rx_dummy;
-
-	dev_data->packet.dir = cmd->dir;
-	dev_data->packet.cmd = cmd->cmd;
-}
-
 static int api_read(const struct device *dev, off_t addr, void *dest,
 		    size_t size)
 {
@@ -318,7 +119,11 @@ static int api_read(const struct device *dev, off_t addr, void *dest,
 	}
 
 	/* TODO: get rid of all these hard-coded values for MX25Ux chips */
-	command_set(dev, &dev_config->jedec_cmds->read);
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 20;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = SPI_NOR_OCMD_RD;
 	dev_data->packet.address   = addr;
 	dev_data->packet.data_buf  = dest;
 	dev_data->packet.num_bytes = size;
@@ -328,38 +133,35 @@ static int api_read(const struct device *dev, off_t addr, void *dest,
 	release(dev);
 
 	if (rc < 0) {
-		LOG_ERR("Read xfer failed: %d", rc);
+		LOG_ERR("SPI_NOR_OCMD_RD xfer failed: %d", rc);
 		return rc;
 	}
 
 	return 0;
 }
 
-static int status_get(const struct device *dev, uint8_t *status)
+static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
 	struct flash_mspi_nor_data *dev_data = dev->data;
-
-	command_set(dev, &dev_config->jedec_cmds->status);
-	dev_data->packet.data_buf  = status;
-	dev_data->packet.num_bytes = sizeof(uint8_t);
-
-	return mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
-}
-
-static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
-{
-	int rc;
 	uint8_t status_reg;
+	int rc;
 
 	while (true) {
-		rc = status_get(dev, &status_reg);
-
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.addr_length = 4;
+		dev_data->xfer.rx_dummy    = 4;
+		dev_data->packet.dir       = MSPI_RX;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_RDSR;
+		dev_data->packet.address   = 0;
+		dev_data->packet.data_buf  = &status_reg;
+		dev_data->packet.num_bytes = sizeof(status_reg);
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("Status xfer failed: %d", rc);
+			LOG_ERR("SPI_NOR_OCMD_RDSR xfer failed: %d", rc);
 			return rc;
 		}
-
 		if (!(status_reg & SPI_NOR_WIP_BIT)) {
 			break;
 		}
@@ -370,15 +172,6 @@ static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
 	return 0;
 }
 
-static int write_enable(const struct device *dev)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-
-	command_set(dev, &dev_config->jedec_cmds->write_en);
-	return mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
-}
-
 static int api_write(const struct device *dev, off_t addr, const void *src,
 		     size_t size)
 {
@@ -407,19 +200,29 @@ static int api_write(const struct device *dev, off_t addr, const void *src,
 		uint16_t page_left = page_size - page_offset;
 		uint16_t to_write = (uint16_t)MIN(size, page_left);
 
-		if (write_enable(dev) < 0) {
-			LOG_ERR("Write enable xfer failed: %d", rc);
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.tx_dummy    = 0;
+		dev_data->packet.dir       = MSPI_TX;
+
+		dev_data->xfer.addr_length = 0;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
+		dev_data->packet.num_bytes = 0;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
 			break;
 		}
 
-		command_set(dev, &dev_config->jedec_cmds->page_program);
+		dev_data->xfer.addr_length = 4;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_PAGE_PRG;
 		dev_data->packet.address   = addr;
 		dev_data->packet.data_buf  = (uint8_t *)src;
 		dev_data->packet.num_bytes = to_write;
 		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("Page program xfer failed: %d", rc);
+			LOG_ERR("SPI_NOR_OCMD_PAGE_PRG xfer failed: %d", rc);
 			break;
 		}
 
@@ -463,20 +266,32 @@ static int api_erase(const struct device *dev, off_t addr, size_t size)
 	}
 
 	while (size > 0) {
-		rc = write_enable(dev);
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.tx_dummy    = 0;
+		dev_data->packet.dir       = MSPI_TX;
+		dev_data->packet.num_bytes = 0;
+
+		dev_data->xfer.addr_length = 0;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("Write enable failed.");
+			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
 			break;
 		}
 
 		if (size == flash_size) {
 			/* Chip erase. */
-			command_set(dev, &dev_config->jedec_cmds->chip_erase);
+			dev_data->xfer.addr_length = 0;
+			dev_data->packet.cmd       = SPI_NOR_OCMD_CE;
+
 			size -= flash_size;
 		} else {
 			/* Sector erase. */
-			command_set(dev, &dev_config->jedec_cmds->sector_erase);
-			dev_data->packet.address = addr;
+			dev_data->xfer.addr_length = 4;
+			dev_data->packet.cmd       = SPI_NOR_OCMD_SE;
+			dev_data->packet.address   = addr;
+
 			addr += SPI_NOR_SECTOR_SIZE;
 			size -= SPI_NOR_SECTOR_SIZE;
 		}
@@ -518,14 +333,19 @@ static int read_jedec_id(const struct device *dev, uint8_t *id)
 	struct flash_mspi_nor_data *dev_data = dev->data;
 	int rc;
 
-	command_set(dev, &dev_config->jedec_cmds->id);
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 4;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_OCMD_READ_ID;
+	dev_data->packet.address   = 0;
 	dev_data->packet.data_buf  = id;
 	dev_data->packet.num_bytes = JESD216_READ_ID_LEN;
-
 	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 			     &dev_data->xfer);
 	if (rc < 0) {
-		LOG_ERR("mspi_transceive() failed: %d\n", rc);
+		printk("mspi_transceive() failed: %d\n", rc);
+		return rc;
 	}
 
 	return rc;
@@ -560,8 +380,11 @@ static int api_sfdp_read(const struct device *dev, off_t addr, void *dest,
 		return rc;
 	}
 
-
-	command_set(dev, &dev_config->jedec_cmds->sfdp);
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 20;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_OCMD_READ_SFDP;
 	dev_data->packet.address   = addr;
 	dev_data->packet.data_buf  = dest;
 	dev_data->packet.num_bytes = size;
@@ -609,41 +432,6 @@ static int dev_pm_action_cb(const struct device *dev,
 	return 0;
 }
 
-static int switch_mode(const struct device *dev, uint8_t *id)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-
-	/* For octal mode:
-	 * If the read ID does not match the one from DTS, assume the flash
-	 * is already in the Octa I/O mode, so switching it is not needed.
-	 */
-	if ((dev_config->mspi_cfg.io_mode == MSPI_IO_MODE_OCTAL) &&
-	     (memcmp(id, dev_config->jedec_id, JESD216_READ_ID_LEN) != 0)) {
-		return 0;
-	}
-
-	command_set(dev, &commands[MSPI_IO_MODE_SINGLE].write_en);
-	int rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-			     &dev_data->xfer);
-	if (rc < 0) {
-		LOG_ERR("Failed to set write enable: %d", rc);
-		return rc;
-	}
-
-	command_set(dev, &dev_config->jedec_cmds->mode_change);
-	dev_data->packet.data_buf  = (uint8_t *)&dev_config->jedec_cmds->mode_payload;
-	dev_data->packet.num_bytes = sizeof(dev_config->jedec_cmds->mode_payload);
-	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-			     &dev_data->xfer);
-	if (rc < 0) {
-		LOG_ERR("Failed to change IO mode: %d\n", rc);
-		return rc;
-	}
-
-	return 0;
-}
-
 static int flash_chip_init(const struct device *dev)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
@@ -662,21 +450,55 @@ static int flash_chip_init(const struct device *dev)
 		return rc;
 	}
 
-	command_set(dev, &commands[MSPI_IO_MODE_SINGLE].id);
+	dev_data->xfer.xfer_mode  = MSPI_PIO;
+	dev_data->xfer.packets    = &dev_data->packet;
+	dev_data->xfer.num_packet = 1;
+	dev_data->xfer.timeout    = 10;
+
+	dev_data->xfer.cmd_length  = 1;
+	dev_data->xfer.addr_length = 0;
+	dev_data->xfer.tx_dummy    = 0;
+	dev_data->xfer.rx_dummy    = 0;
+
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_CMD_READ_ID;
 	dev_data->packet.data_buf  = id;
 	dev_data->packet.num_bytes = sizeof(id);
-
 	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 			     &dev_data->xfer);
 	if (rc < 0) {
-		LOG_ERR("Failed to read JEDEC ID in initial line mode: %d", rc);
+		LOG_ERR("Failed to read JEDEC ID in single line mode: %d", rc);
 		return rc;
 	}
 
-	rc = switch_mode(dev, id);
+	/*
+	 * If the read ID does not match the one from DTS, assume the flash
+	 * is already in the Octa I/O mode, so switching it is not needed.
+	 */
+	if (memcmp(id, dev_config->jedec_id, sizeof(id)) == 0) {
+		static const uint8_t enable_sopi[] = { 0x01 };
 
-	if (rc < 0) {
-		LOG_ERR("Failed to switch mode: %d", rc);
+		dev_data->packet.dir       = MSPI_TX;
+		dev_data->packet.cmd       = SPI_NOR_CMD_WREN;
+		dev_data->packet.num_bytes = 0;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_CMD_WREN xfer failed: %d", rc);
+			return rc;
+		}
+
+		dev_data->xfer.addr_length = 4;
+		dev_data->packet.cmd       = SPI_NOR_CMD_WR_CFGREG2;
+		dev_data->packet.address   = 0;
+		dev_data->packet.data_buf  = (uint8_t *)&enable_sopi;
+		dev_data->packet.num_bytes = sizeof(enable_sopi);
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			printk("SPI_NOR_CMD_WR_CFGREG2 xfer failed: %d\n", rc);
+			return rc;
+		}
 	}
 
 	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
@@ -799,16 +621,11 @@ static DEVICE_API(flash, drv_api) = {
 };
 
 #define FLASH_SIZE_INST(inst) (DT_INST_PROP(inst, size) / 8)
-#define FLASH_CMDS(inst) &commands[DT_INST_ENUM_IDX(inst, mspi_io_mode)]
 
 #define FLASH_MSPI_NOR_INST(inst)						\
-	BUILD_ASSERT((DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
-		      MSPI_IO_MODE_SINGLE) ||					\
-		     (DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
-		      MSPI_IO_MODE_QUAD_1_4_4) ||				\
-		     (DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
-		      MSPI_IO_MODE_OCTAL),					\
-		"Only 1x, 1-4-4 and 8x I/O modes are supported for now");	\
+	BUILD_ASSERT(DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		     MSPI_IO_MODE_OCTAL,					\
+		"Only Octal I/O mode is supported for now");			\
 	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);			\
 	static struct flash_mspi_nor_data dev##inst##_data;			\
 	static const struct flash_mspi_nor_config dev##inst##_config = {	\
@@ -831,7 +648,6 @@ static DEVICE_API(flash, drv_api) = {
 				     / CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE,	\
 		},))								\
 		.jedec_id = DT_INST_PROP(inst, jedec_id),			\
-		.jedec_cmds = FLASH_CMDS(inst),					\
 	};									\
 	DEVICE_DT_INST_DEFINE(inst,						\
 		drv_init, PM_DEVICE_DT_INST_GET(inst),				\

From 8b7a8421fab515f84cb706e85c7929cf941ec66b Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Mon, 10 Mar 2025 13:18:51 +0100
Subject: [PATCH 2547/2913] Revert "[nrf fromlist] samples:
 code_relocation_nocopy: Add configuration for nRF54H20 DK"

This reverts commit 664042f82d42173a6f52e3d92c061fbd361ce7dd.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.conf      |  1 -
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay   | 17 -----------------
 .../code_relocation_nocopy/linker_arm_nocopy.ld |  7 -------
 3 files changed, 25 deletions(-)
 delete mode 100644 samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 delete mode 100644 samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
deleted file mode 100644
index 83035081389..00000000000
--- a/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FLASH=y
diff --git a/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index ab53f12725d..00000000000
--- a/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,17 +0,0 @@
-&cpuapp_ram0x_region {
-	nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWXS>;
-};
-
-&xip_region {
-	status = "okay";
-	nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RX>;
-};
-
-&mx25uw63 {
-	read-command = <0xEC13>;
-	command-length = "INSTR_2_BYTE";
-	address-length = "ADDR_4_BYTE";
-	rx-dummy = <20>;
-
-	xip-config = <1 0 0x20000000 0>;
-};
diff --git a/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld b/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
index 0a11783cca2..a1467f8e264 100644
--- a/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
+++ b/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
@@ -47,13 +47,6 @@
 #define EXTFLASH_ADDR	DT_REG_ADDR(DT_INST(0, st_stm32_xspi_nor))
 #define EXTFLASH_SIZE	DT_REG_ADDR_BY_IDX(DT_INST(0, st_stm32_xspi_nor), 1)
 
-#elif defined(CONFIG_FLASH_MSPI_NOR) && defined(CONFIG_SOC_NRF54H20_CPUAPP)
-
-#define EXTFLASH_NODE	DT_INST(0, jedec_mspi_nor)
-#define EXTFLASH_ADDR	0x60000000
-#define EXTFLASH_SIZE	DT_PROP_OR(EXTFLASH_NODE, size_in_bytes, \
-				   DT_PROP(EXTFLASH_NODE, size) / 8)
-
 #else
 
 /*

From 08d8d95fe2a93ff9072ef710f4939a1028d6ecf2 Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Mon, 10 Mar 2025 13:19:28 +0100
Subject: [PATCH 2548/2913] Revert "[nrf fromlist] boards: nrf54h20dk: Add XIP
 region definition to memory map"

This reverts commit bd74349a2a0414d3b34a253ff5b5e1e2f5274bbe.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 .../nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi       | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index 165fa12ba80..8392389c0ad 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -174,15 +174,6 @@
 			zephyr,memory-region = "DMA_RAM3x_RAD";
 			zephyr,memory-attr = <( DT_MEM_DMA )>;
 		};
-
-		xip_region: memory@60000000 {
-			compatible = "nordic,owned-memory";
-			reg = <0x60000000 0x20000000>;
-			status = "disabled";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0x0 0x60000000 0x20000000>;
-		};
 	};
 };
 

From a333036b7b82f64be4812488849687f1041de3f4 Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Mon, 10 Mar 2025 13:20:23 +0100
Subject: [PATCH 2549/2913] Revert "[nrf fromlist] samples|tests: drivers:
 flash: Add support for "jedec,mspi-nor" devices"

This reverts commit 87a4e340b0426eaea9717b73bfbfaea001047034.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 .../jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay    | 9 ---------
 samples/drivers/jesd216/sample.yaml                      | 2 +-
 samples/drivers/jesd216/src/main.c                       | 4 +---
 .../spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay  | 9 ---------
 samples/drivers/spi_flash/sample.yaml                    | 2 +-
 samples/drivers/spi_flash/src/main.c                     | 2 --
 .../common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay     | 9 ---------
 tests/drivers/flash/common/src/main.c                    | 2 --
 8 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 delete mode 100644 samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 delete mode 100644 tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index b8f138ad2b2..00000000000
--- a/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&mx25uw63 {
-	status = "okay";
-};
diff --git a/samples/drivers/jesd216/sample.yaml b/samples/drivers/jesd216/sample.yaml
index 4be5e5defbb..0ea0dae331a 100644
--- a/samples/drivers/jesd216/sample.yaml
+++ b/samples/drivers/jesd216/sample.yaml
@@ -21,7 +21,7 @@ tests:
       - hifive_unmatched/fu740/u74
       - mimxrt1170_evk/mimxrt1176/cm7
       - mimxrt1170_evk/mimxrt1176/cm4
-    filter: dt_compat_enabled("jedec,spi-nor") or dt_compat_enabled("jedec,mspi-nor")
+    filter: dt_compat_enabled("jedec,spi-nor")
     depends_on: spi
   sample.drivers.jesd216.nrf52840dk_spi:
     extra_args:
diff --git a/samples/drivers/jesd216/src/main.c b/samples/drivers/jesd216/src/main.c
index b8dad485997..480649397b6 100644
--- a/samples/drivers/jesd216/src/main.c
+++ b/samples/drivers/jesd216/src/main.c
@@ -14,8 +14,6 @@
 
 #if DT_HAS_COMPAT_STATUS_OKAY(jedec_spi_nor)
 #define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_spi_nor)
-#elif DT_HAS_COMPAT_STATUS_OKAY(jedec_mspi_nor)
-#define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_mspi_nor)
 #elif DT_HAS_COMPAT_STATUS_OKAY(nordic_qspi_nor)
 #define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(nordic_qspi_nor)
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_qspi_nor)
@@ -203,7 +201,7 @@ static void summarize_dw15(const struct jesd216_param_header *php,
 		printf("0-4-4 Mode methods: entry 0x%01x ; exit 0x%02x\n",
 		       dw15.entry_044, dw15.exit_044);
 	} else {
-		printf("0-4-4 Mode: not supported\n");
+		printf("0-4-4 Mode: not supported");
 	}
 	printf("4-4-4 Mode sequences: enable 0x%02x ; disable 0x%01x\n",
 	       dw15.enable_444, dw15.disable_444);
diff --git a/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index b8f138ad2b2..00000000000
--- a/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&mx25uw63 {
-	status = "okay";
-};
diff --git a/samples/drivers/spi_flash/sample.yaml b/samples/drivers/spi_flash/sample.yaml
index 351e33997a0..a3b8cfed380 100644
--- a/samples/drivers/spi_flash/sample.yaml
+++ b/samples/drivers/spi_flash/sample.yaml
@@ -7,7 +7,7 @@ tests:
       - flash
     filter: dt_compat_enabled("jedec,spi-nor") or dt_compat_enabled("st,stm32-qspi-nor")
       or dt_compat_enabled("st,stm32-ospi-nor") or dt_compat_enabled("st,stm32-xspi-nor")
-      or dt_compat_enabled("nordic,qspi-nor") or dt_compat_enabled("jedec,mspi-nor")
+      or (dt_compat_enabled("nordic,qspi-nor") and CONFIG_NORDIC_QSPI_NOR)
     platform_exclude:
       - hifive_unmatched/fu740/s7
       - hifive_unmatched/fu740/u74
diff --git a/samples/drivers/spi_flash/src/main.c b/samples/drivers/spi_flash/src/main.c
index 52e8b6062b5..b84359ae05b 100644
--- a/samples/drivers/spi_flash/src/main.c
+++ b/samples/drivers/spi_flash/src/main.c
@@ -34,8 +34,6 @@
 
 #if DT_HAS_COMPAT_STATUS_OKAY(jedec_spi_nor)
 #define SPI_FLASH_COMPAT jedec_spi_nor
-#elif DT_HAS_COMPAT_STATUS_OKAY(jedec_mspi_nor)
-#define SPI_FLASH_COMPAT jedec_mspi_nor
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_qspi_nor)
 #define SPI_FLASH_COMPAT st_stm32_qspi_nor
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_ospi_nor)
diff --git a/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index b8f138ad2b2..00000000000
--- a/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&mx25uw63 {
-	status = "okay";
-};
diff --git a/tests/drivers/flash/common/src/main.c b/tests/drivers/flash/common/src/main.c
index 54b868a9234..e7552aaf177 100644
--- a/tests/drivers/flash/common/src/main.c
+++ b/tests/drivers/flash/common/src/main.c
@@ -14,8 +14,6 @@
 #define TEST_AREA_DEV_NODE	DT_INST(0, nordic_qspi_nor)
 #elif defined(CONFIG_SPI_NOR)
 #define TEST_AREA_DEV_NODE	DT_INST(0, jedec_spi_nor)
-#elif defined(CONFIG_FLASH_MSPI_NOR)
-#define TEST_AREA_DEV_NODE	DT_INST(0, jedec_mspi_nor)
 #else
 #define TEST_AREA	storage_partition
 #endif

From 1d116c8c21b0997d9bc39c6760cc0bc35af260cc Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Mon, 10 Mar 2025 13:21:30 +0100
Subject: [PATCH 2550/2913] Revert "[nrf fromlist] dts: nordic: Change
 compatible property for EXMIF node"

This reverts commit 3b45cae0e824a17d9886ad0221a3c0c58417108f.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 .../nrf54h20dk_nrf54h20-pinctrl.dtsi          | 27 +------------------
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts | 19 +++----------
 .../nrf9280pdk_nrf9280-pinctrl.dtsi           | 27 +------------------
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts  | 19 +++----------
 .../{mspi => spi}/nordic,nrf-exmif.yaml       |  6 ++++-
 dts/common/nordic/nrf54h20.dtsi               |  5 ++--
 dts/common/nordic/nrf9280.dtsi                |  5 ++--
 7 files changed, 21 insertions(+), 87 deletions(-)
 rename dts/bindings/{mspi => spi}/nordic,nrf-exmif.yaml (70%)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
index f62df87dfe2..9b574a18ec5 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
@@ -73,37 +73,12 @@
 	/omit-if-no-ref/ exmif_default: exmif_default {
 		group1 {
 			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
-				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
-				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
 				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
-				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
-				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
-				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
-				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
-				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
-				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
 			nordic,drive-mode = <NRF_DRIVE_H0H1>;
 		};
 	};
 
-	/omit-if-no-ref/ exmif_sleep: exmif_sleep {
-		group1 {
-			low-power-enable;
-			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
-				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
-				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
-				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
-				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
-				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
-				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
-				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
-				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
-				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
-		};
-	};
-
 	/omit-if-no-ref/ can120_default: can120_default {
 		group1 {
 			psels = <NRF_PSEL(CAN_RX, 9, 4)>,
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 06e642948f3..05d62c1057f 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -262,15 +262,15 @@ ipc0: &cpuapp_cpurad_ipc {
 };
 
 &exmif {
+	cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&exmif_default>;
-	pinctrl-1 = <&exmif_sleep>;
-	pinctrl-names = "default", "sleep";
+	pinctrl-names = "default";
 	status = "okay";
-
 	mx25uw63: mx25uw6345g@0 {
-		compatible = "jedec,mspi-nor";
+		compatible = "jedec,spi-nor";
 		status = "disabled";
 		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(48)>;
 		jedec-id = [c2 84 37];
 		sfdp-bfp = [
 			e5 20 8a ff  ff ff ff 03  00 ff 00 ff  00 ff 00 ff
@@ -283,17 +283,6 @@ ipc0: &cpuapp_cpurad_ipc {
 		has-dpd;
 		t-enter-dpd = <10000>;
 		t-exit-dpd = <30000>;
-		reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;
-		t-reset-pulse = <10000>;
-		t-reset-recovery = <35000>;
-
-		mspi-max-frequency = <DT_FREQ_M(50)>;
-		mspi-io-mode = "MSPI_IO_MODE_OCTAL";
-		mspi-data-rate = "MSPI_DATA_RATE_SINGLE";
-		mspi-hardware-ce-num = <1>;
-		mspi-cpp-mode = "MSPI_CPP_MODE_0";
-		mspi-endian = "MSPI_BIG_ENDIAN";
-		mspi-ce-polarity = "MSPI_CE_ACTIVE_LOW";
 	};
 };
 
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
index 143fd45f33e..48067a7052c 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
@@ -54,37 +54,12 @@
 	/omit-if-no-ref/ exmif_default: exmif_default {
 		group1 {
 			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
-				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
-				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
 				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
-				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
-				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
-				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
-				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
-				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
-				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
 			nordic,drive-mode = <NRF_DRIVE_H0H1>;
 		};
 	};
 
-	/omit-if-no-ref/ exmif_sleep: exmif_sleep {
-		group1 {
-			low-power-enable;
-			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
-				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
-				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
-				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
-				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
-				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
-				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
-				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
-				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
-				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
-		};
-	};
-
 	/omit-if-no-ref/ can120_default: can120_default {
 		group1 {
 			psels = <NRF_PSEL(CAN_RX, 9, 4)>,
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index 09bc9c554cc..3e16e45803f 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -249,15 +249,15 @@ ipc0: &cpuapp_cpurad_ipc {
 };
 
 &exmif {
+	cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&exmif_default>;
-	pinctrl-1 = <&exmif_sleep>;
-	pinctrl-names = "default", "sleep";
+	pinctrl-names = "default";
 	status = "okay";
-
 	mx25uw63: mx25uw6345g@0 {
-		compatible = "jedec,mspi-nor";
+		compatible = "jedec,spi-nor";
 		status = "disabled";
 		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(48)>;
 		jedec-id = [c2 84 37];
 		sfdp-bfp = [
 			e5 20 8a ff  ff ff ff 03  00 ff 00 ff  00 ff 00 ff
@@ -270,17 +270,6 @@ ipc0: &cpuapp_cpurad_ipc {
 		has-dpd;
 		t-enter-dpd = <10000>;
 		t-exit-dpd = <30000>;
-		reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;
-		t-reset-pulse = <10000>;
-		t-reset-recovery = <35000>;
-
-		mspi-max-frequency = <DT_FREQ_M(50)>;
-		mspi-io-mode = "MSPI_IO_MODE_OCTAL";
-		mspi-data-rate = "MSPI_DATA_RATE_SINGLE";
-		mspi-hardware-ce-num = <1>;
-		mspi-cpp-mode = "MSPI_CPP_MODE_0";
-		mspi-endian = "MSPI_BIG_ENDIAN";
-		mspi-ce-polarity = "MSPI_CE_ACTIVE_LOW";
 	};
 };
 
diff --git a/dts/bindings/mspi/nordic,nrf-exmif.yaml b/dts/bindings/spi/nordic,nrf-exmif.yaml
similarity index 70%
rename from dts/bindings/mspi/nordic,nrf-exmif.yaml
rename to dts/bindings/spi/nordic,nrf-exmif.yaml
index 294254aa60e..d2b8815046b 100644
--- a/dts/bindings/mspi/nordic,nrf-exmif.yaml
+++ b/dts/bindings/spi/nordic,nrf-exmif.yaml
@@ -5,4 +5,8 @@ description: Nordic External Memory Interface (EXMIF)
 
 compatible: "nordic,nrf-exmif"
 
-include: snps,designware-ssi.yaml
+include: snps,designware-spi.yaml
+
+properties:
+  reg:
+    required: true
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index cddcbcd0790..b0ceded8bcb 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -521,8 +521,8 @@
 				status = "disabled";
 			};
 
-			exmif: exmif@95000 {
-				compatible = "nordic,nrf-exmif", "snps,designware-ssi";
+			exmif: spi@95000 {
+				compatible = "nordic,nrf-exmif";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x95000 0x500 0x95500 0xb00>;
@@ -531,6 +531,7 @@
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 				clock-frequency = <DT_FREQ_M(400)>;
 				fifo-depth = <32>;
+				max-xfer-size = <16>;
 				status = "disabled";
 			};
 
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 0907be9d9a6..4c5dcefa801 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -375,8 +375,8 @@
 				status = "disabled";
 			};
 
-			exmif: exmif@95000 {
-				compatible = "nordic,nrf-exmif", "snps,designware-ssi";
+			exmif: spi@95000 {
+				compatible = "nordic,nrf-exmif";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x95000 0x500 0x95500 0xb00>;
@@ -384,6 +384,7 @@
 				interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>;
 				clock-frequency = <DT_FREQ_M(400)>;
 				fifo-depth = <32>;
+				max-xfer-size = <16>;
 				status = "disabled";
 			};
 

From 5b18b72620baf72a1340c9aa16f296b66a14784e Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Mon, 10 Mar 2025 15:27:49 +0100
Subject: [PATCH 2551/2913] Revert "[nrf noup] drivers: spi_dw: Bring back
 custom EXMIF peripheral handling"

This reverts commit 48b0ca5a97c2e19b1a786eed534d9be0b04548dc.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 drivers/pinctrl/pinctrl_nrf.c              |  3 +-
 drivers/spi/spi_dw.c                       | 32 +---------------------
 dts/bindings/spi/nordic,nrf-exmif-spi.yaml |  8 ------
 3 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 dts/bindings/spi/nordic,nrf-exmif-spi.yaml

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 2d4e580a14b..5c6de495624 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -390,8 +390,7 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_can) */
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) || \
-	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif_spi)
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
 		/* Pin routing is controlled by secure domain, via UICR */
 		case NRF_FUN_EXMIF_CK:
 		case NRF_FUN_EXMIF_DQ0:
diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
index e320aa39547..bb40deb1c85 100644
--- a/drivers/spi/spi_dw.c
+++ b/drivers/spi/spi_dw.c
@@ -41,14 +41,6 @@ LOG_MODULE_REGISTER(spi_dw);
 #include <zephyr/drivers/pinctrl.h>
 #endif
 
-#ifdef CONFIG_HAS_NRFX
-#include <nrfx.h>
-#endif
-
-#ifdef CONFIG_SOC_NRF54H20_GPD
-#include <nrf/gpd.h>
-#endif
-
 static inline bool spi_dw_is_slave(struct spi_dw_data *spi)
 {
 	return (IS_ENABLED(CONFIG_SPI_SLAVE) &&
@@ -266,7 +258,6 @@ static int spi_dw_configure(const struct device *dev,
 		/* Baud rate and Slave select, for master only */
 		write_baudr(dev, SPI_DW_CLK_DIVIDER(info->clock_frequency,
 						    config->frequency));
-		write_ser(dev, BIT(config->slave));
 	}
 
 	if (spi_dw_is_slave(spi)) {
@@ -509,10 +500,6 @@ void spi_dw_isr(const struct device *dev)
 	uint32_t int_status;
 	int error;
 
-#ifdef CONFIG_HAS_NRFX
-	NRF_EXMIF->EVENTS_CORE = 0;
-#endif
-
 	int_status = read_isr(dev);
 
 	LOG_DBG("SPI %p int_status 0x%x - (tx: %d, rx: %d)", dev, int_status,
@@ -561,18 +548,6 @@ int spi_dw_init(const struct device *dev)
 
 	DEVICE_MMIO_MAP(dev, K_MEM_CACHE_NONE);
 
-#ifdef CONFIG_HAS_NRFX
-	NRF_EXMIF->INTENSET = BIT(0);
-	NRF_EXMIF->TASKS_START = 1;
-
-#ifdef CONFIG_SOC_NRF54H20_GPD
-	err = nrf_gpd_request(NRF_GPD_FAST_ACTIVE1);
-	if (err < 0) {
-		return err;
-	}
-#endif
-#endif
-
 	info->config_func();
 
 	/* Masking interrupt and making sure controller is disabled */
@@ -591,11 +566,6 @@ int spi_dw_init(const struct device *dev)
 	return 0;
 }
 
-#define REG_ADDR(inst) \
-	COND_CODE_1(DT_NODE_HAS_COMPAT(DT_DRV_INST(inst), nordic_nrf_exmif_spi), \
-		    (Z_DEVICE_MMIO_NAMED_ROM_INITIALIZER(core, DT_DRV_INST(inst))), \
-		    (DEVICE_MMIO_ROM_INIT(DT_DRV_INST(inst))))
-
 #define SPI_CFG_IRQS_SINGLE_ERR_LINE(inst)					\
 		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(inst, rx_avail, irq),		\
 			    DT_INST_IRQ_BY_NAME(inst, rx_avail, priority),	\
@@ -668,7 +638,7 @@ COND_CODE_1(IS_EQ(DT_NUM_IRQS(DT_DRV_INST(inst)), 1),              \
 		SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(inst), ctx)                     \
 	};                                                                                  \
 	static const struct spi_dw_config spi_dw_config_##inst = {                          \
-		REG_ADDR(inst),                                                             \
+		DEVICE_MMIO_ROM_INIT(DT_DRV_INST(inst)),                                    \
 		.clock_frequency = COND_CODE_1(                                             \
 			DT_NODE_HAS_PROP(DT_INST_PHANDLE(inst, clocks), clock_frequency),   \
 			(DT_INST_PROP_BY_PHANDLE(inst, clocks, clock_frequency)),           \
diff --git a/dts/bindings/spi/nordic,nrf-exmif-spi.yaml b/dts/bindings/spi/nordic,nrf-exmif-spi.yaml
deleted file mode 100644
index d988b414687..00000000000
--- a/dts/bindings/spi/nordic,nrf-exmif-spi.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: Nordic External Memory Interface (EXMIF) used in SPI mode only
-
-compatible: "nordic,nrf-exmif-spi"
-
-include: snps,designware-spi.yaml

From 764fd0626e4569abebe491a99bae679ecc32edc3 Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Mon, 10 Mar 2025 15:28:18 +0100
Subject: [PATCH 2552/2913] Revert "[nrf noup] drivers: pinctrl_nrf: Add
 support for EXMIF pins"

This reverts commit bb3a457e82b253726a48e1769325208ced6f71f0.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 drivers/pinctrl/pinctrl_nrf.c                  | 18 ------------------
 .../zephyr/dt-bindings/pinctrl/nrf-pinctrl.h   |  2 --
 2 files changed, 20 deletions(-)

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 5c6de495624..d319b8fe288 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -390,24 +390,6 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_can) */
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
-		/* Pin routing is controlled by secure domain, via UICR */
-		case NRF_FUN_EXMIF_CK:
-		case NRF_FUN_EXMIF_DQ0:
-		case NRF_FUN_EXMIF_DQ1:
-		case NRF_FUN_EXMIF_DQ2:
-		case NRF_FUN_EXMIF_DQ3:
-		case NRF_FUN_EXMIF_DQ4:
-		case NRF_FUN_EXMIF_DQ5:
-		case NRF_FUN_EXMIF_DQ6:
-		case NRF_FUN_EXMIF_DQ7:
-		case NRF_FUN_EXMIF_CS0:
-		case NRF_FUN_EXMIF_CS1:
-		case NRF_FUN_EXMIF_RWDS:
-			dir = NRF_GPIO_PIN_DIR_INPUT;
-			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
-			break;
-#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) */
 #if defined(NRF_PSEL_TWIS)
 		case NRF_FUN_TWIS_SCL:
 			NRF_PSEL_TWIS(reg, SCL) = psel;
diff --git a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
index 81a7a8bc77d..25e56144bc8 100644
--- a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
@@ -166,8 +166,6 @@
 #define NRF_FUN_TWIS_SCL 48U
 /** TWIS SDA */
 #define NRF_FUN_TWIS_SDA 49U
-/** EXMIF RWDS */
-#define NRF_FUN_EXMIF_RWDS 50U
 /** GRTC fast clock output */
 #define NRF_FUN_GRTC_CLKOUT_FAST 55U
 /** GRTC slow clock output */

From 309817efba7ea407a32ef7e906cb84644a5153cd Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Mon, 10 Mar 2025 13:45:34 +0100
Subject: [PATCH 2553/2913] Revert "[nrf fromlist] drivers: flash: Add generic
 NOR flash driver for MSPI devices"

This reverts commit d869c3942e6d079a4def11d94cb1abc21bb94b40.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 drivers/flash/CMakeLists.txt         |   1 -
 drivers/flash/Kconfig.mspi           |  30 --
 drivers/flash/flash_mspi_nor.c       | 658 ---------------------------
 dts/bindings/mtd/jedec,mspi-nor.yaml |  24 -
 4 files changed, 713 deletions(-)
 delete mode 100644 drivers/flash/flash_mspi_nor.c
 delete mode 100644 dts/bindings/mtd/jedec,mspi-nor.yaml

diff --git a/drivers/flash/CMakeLists.txt b/drivers/flash/CMakeLists.txt
index d3bbf7ee2ff..617f1422a90 100644
--- a/drivers/flash/CMakeLists.txt
+++ b/drivers/flash/CMakeLists.txt
@@ -34,7 +34,6 @@ zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_MX25UM51345G flash_mcux_f
 zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_NOR flash_mcux_flexspi_nor.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_ATXP032 flash_mspi_atxp032.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_EMUL_DEVICE flash_mspi_emul_device.c)
-zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_NOR flash_mspi_nor.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_NOR flash_npcx_fiu_nor.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_QSPI flash_npcx_fiu_qspi.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_RPI_PICO flash_rpi_pico.c)
diff --git a/drivers/flash/Kconfig.mspi b/drivers/flash/Kconfig.mspi
index 5f4ade2473f..158fcefb528 100644
--- a/drivers/flash/Kconfig.mspi
+++ b/drivers/flash/Kconfig.mspi
@@ -28,34 +28,4 @@ config FLASH_MSPI_ATXP032
 	select FLASH_JESD216
 	select MSPI_AMBIQ_AP3 if SOC_SERIES_APOLLO3X
 
-menuconfig FLASH_MSPI_NOR
-	bool "Generic MSPI NOR Flash"
-	default y
-	depends on DT_HAS_JEDEC_MSPI_NOR_ENABLED
-	select FLASH_MSPI
-	select FLASH_HAS_EXPLICIT_ERASE
-	select FLASH_JESD216
-	select GPIO if $(dt_compat_any_has_prop,$(DT_COMPAT_JEDEC_MSPI_NOR),reset-gpios)
-
-if FLASH_MSPI_NOR
-
-config FLASH_MSPI_NOR_INIT_PRIORITY
-	int
-	default 80
-	help
-	  Device driver initialization priority.
-	  Device is connected to MSPI bus, it has to
-	  be initialized after MSPI driver.
-
-config FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE
-	int "Page size to use for FLASH_LAYOUT feature"
-	default 65536
-	help
-	  When CONFIG_FLASH_PAGE_LAYOUT is used this driver will support that
-	  API. By default the page size corresponds to the block size (65536).
-	  Other options include the 32K-byte erase size (32768), the sector
-	  size (4096), or any non-zero multiple of the sector size.
-
-endif # FLASH_MSPI_NOR
-
 endmenu
diff --git a/drivers/flash/flash_mspi_nor.c b/drivers/flash/flash_mspi_nor.c
deleted file mode 100644
index 1f9f2c67ee9..00000000000
--- a/drivers/flash/flash_mspi_nor.c
+++ /dev/null
@@ -1,658 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define DT_DRV_COMPAT jedec_mspi_nor
-
-#include <zephyr/drivers/flash.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/drivers/mspi.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/pm/device.h>
-#include <zephyr/pm/device_runtime.h>
-
-#include "jesd216.h"
-#include "spi_nor.h"
-
-LOG_MODULE_REGISTER(flash_mspi_nor, CONFIG_FLASH_LOG_LEVEL);
-
-#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios)
-#define WITH_RESET_GPIO 1
-#endif
-
-struct flash_mspi_nor_data {
-	struct k_sem acquired;
-	struct mspi_xfer_packet packet;
-	struct mspi_xfer xfer;
-};
-
-struct flash_mspi_nor_config {
-	const struct device *bus;
-	uint32_t flash_size;
-	struct mspi_dev_id mspi_id;
-	struct mspi_dev_cfg mspi_cfg;
-#if defined(CONFIG_MSPI_XIP)
-	struct mspi_xip_cfg xip_cfg;
-#endif
-#if defined(WITH_RESET_GPIO)
-	struct gpio_dt_spec reset;
-	uint32_t reset_pulse_us;
-	uint32_t reset_recovery_us;
-#endif
-#if defined(CONFIG_FLASH_PAGE_LAYOUT)
-	struct flash_pages_layout layout;
-#endif
-	uint8_t jedec_id[SPI_NOR_MAX_ID_LEN];
-};
-
-static int acquire(const struct device *dev)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	int rc;
-
-	k_sem_take(&dev_data->acquired, K_FOREVER);
-
-	rc = pm_device_runtime_get(dev_config->bus);
-	if (rc < 0) {
-		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
-		return rc;
-	}
-
-	/* This acquires the MSPI controller and configures it for the flash. */
-	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
-			     MSPI_DEVICE_CONFIG_ALL, &dev_config->mspi_cfg);
-	if (rc < 0) {
-		LOG_ERR("mspi_dev_config() failed: %d", rc);
-		return rc;
-	}
-
-	return 0;
-}
-
-static void release(const struct device *dev)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-
-	/* This releases the MSPI controller. */
-	(void)mspi_get_channel_status(dev_config->bus, 0);
-
-	(void)pm_device_runtime_put(dev_config->bus);
-
-	k_sem_give(&dev_data->acquired);
-}
-
-static inline uint32_t dev_flash_size(const struct device *dev)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-
-	return dev_config->flash_size;
-}
-
-static inline uint16_t dev_page_size(const struct device *dev)
-{
-	return SPI_NOR_PAGE_SIZE;
-}
-
-static int api_read(const struct device *dev, off_t addr, void *dest,
-		    size_t size)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	const uint32_t flash_size = dev_flash_size(dev);
-	int rc;
-
-	if (size == 0) {
-		return 0;
-	}
-
-	if ((addr < 0) || ((addr + size) > flash_size)) {
-		return -EINVAL;
-	}
-
-	rc = acquire(dev);
-	if (rc < 0) {
-		return rc;
-	}
-
-	/* TODO: get rid of all these hard-coded values for MX25Ux chips */
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 20;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = SPI_NOR_OCMD_RD;
-	dev_data->packet.address   = addr;
-	dev_data->packet.data_buf  = dest;
-	dev_data->packet.num_bytes = size;
-	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-			     &dev_data->xfer);
-
-	release(dev);
-
-	if (rc < 0) {
-		LOG_ERR("SPI_NOR_OCMD_RD xfer failed: %d", rc);
-		return rc;
-	}
-
-	return 0;
-}
-
-static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	uint8_t status_reg;
-	int rc;
-
-	while (true) {
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.addr_length = 4;
-		dev_data->xfer.rx_dummy    = 4;
-		dev_data->packet.dir       = MSPI_RX;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_RDSR;
-		dev_data->packet.address   = 0;
-		dev_data->packet.data_buf  = &status_reg;
-		dev_data->packet.num_bytes = sizeof(status_reg);
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_RDSR xfer failed: %d", rc);
-			return rc;
-		}
-		if (!(status_reg & SPI_NOR_WIP_BIT)) {
-			break;
-		}
-
-		k_sleep(poll_period);
-	}
-
-	return 0;
-}
-
-static int api_write(const struct device *dev, off_t addr, const void *src,
-		     size_t size)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	const uint32_t flash_size = dev_flash_size(dev);
-	const uint16_t page_size = dev_page_size(dev);
-	int rc;
-
-	if (size == 0) {
-		return 0;
-	}
-
-	if ((addr < 0) || ((addr + size) > flash_size)) {
-		return -EINVAL;
-	}
-
-	rc = acquire(dev);
-	if (rc < 0) {
-		return rc;
-	}
-
-	while (size > 0) {
-		/* Split write into parts, each within one page only. */
-		uint16_t page_offset = (uint16_t)(addr % page_size);
-		uint16_t page_left = page_size - page_offset;
-		uint16_t to_write = (uint16_t)MIN(size, page_left);
-
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.tx_dummy    = 0;
-		dev_data->packet.dir       = MSPI_TX;
-
-		dev_data->xfer.addr_length = 0;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
-		dev_data->packet.num_bytes = 0;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
-			break;
-		}
-
-		dev_data->xfer.addr_length = 4;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_PAGE_PRG;
-		dev_data->packet.address   = addr;
-		dev_data->packet.data_buf  = (uint8_t *)src;
-		dev_data->packet.num_bytes = to_write;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_PAGE_PRG xfer failed: %d", rc);
-			break;
-		}
-
-		addr += to_write;
-		src   = (const uint8_t *)src + to_write;
-		size -= to_write;
-
-		rc = wait_until_ready(dev, K_MSEC(1));
-		if (rc < 0) {
-			break;
-		}
-	}
-
-	release(dev);
-
-	return rc;
-}
-
-static int api_erase(const struct device *dev, off_t addr, size_t size)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	const uint32_t flash_size = dev_flash_size(dev);
-	int rc = 0;
-
-	if ((addr < 0) || ((addr + size) > flash_size)) {
-		return -EINVAL;
-	}
-
-	if (!SPI_NOR_IS_SECTOR_ALIGNED(addr)) {
-		return -EINVAL;
-	}
-
-	if ((size % SPI_NOR_SECTOR_SIZE) != 0) {
-		return -EINVAL;
-	}
-
-	rc = acquire(dev);
-	if (rc < 0) {
-		return rc;
-	}
-
-	while (size > 0) {
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.tx_dummy    = 0;
-		dev_data->packet.dir       = MSPI_TX;
-		dev_data->packet.num_bytes = 0;
-
-		dev_data->xfer.addr_length = 0;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
-			break;
-		}
-
-		if (size == flash_size) {
-			/* Chip erase. */
-			dev_data->xfer.addr_length = 0;
-			dev_data->packet.cmd       = SPI_NOR_OCMD_CE;
-
-			size -= flash_size;
-		} else {
-			/* Sector erase. */
-			dev_data->xfer.addr_length = 4;
-			dev_data->packet.cmd       = SPI_NOR_OCMD_SE;
-			dev_data->packet.address   = addr;
-
-			addr += SPI_NOR_SECTOR_SIZE;
-			size -= SPI_NOR_SECTOR_SIZE;
-		}
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("Erase command 0x%02x xfer failed: %d",
-				dev_data->packet.cmd, rc);
-			break;
-		}
-
-		rc = wait_until_ready(dev, K_MSEC(1));
-		if (rc < 0) {
-			break;
-		}
-	}
-
-	release(dev);
-
-	return rc;
-}
-
-static const
-struct flash_parameters *api_get_parameters(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	static const struct flash_parameters parameters = {
-		.write_block_size = 1,
-		.erase_value = 0xff,
-	};
-
-	return &parameters;
-}
-
-static int read_jedec_id(const struct device *dev, uint8_t *id)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	int rc;
-
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 4;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_OCMD_READ_ID;
-	dev_data->packet.address   = 0;
-	dev_data->packet.data_buf  = id;
-	dev_data->packet.num_bytes = JESD216_READ_ID_LEN;
-	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-			     &dev_data->xfer);
-	if (rc < 0) {
-		printk("mspi_transceive() failed: %d\n", rc);
-		return rc;
-	}
-
-	return rc;
-}
-
-#if defined(CONFIG_FLASH_PAGE_LAYOUT)
-static void api_page_layout(const struct device *dev,
-			     const struct flash_pages_layout **layout,
-			     size_t *layout_size)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-
-	*layout = &dev_config->layout;
-	*layout_size = 1;
-}
-#endif /* CONFIG_FLASH_PAGE_LAYOUT */
-
-#if defined(CONFIG_FLASH_JESD216_API)
-static int api_sfdp_read(const struct device *dev, off_t addr, void *dest,
-			 size_t size)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	int rc;
-
-	if (size == 0) {
-		return 0;
-	}
-
-	rc = acquire(dev);
-	if (rc < 0) {
-		return rc;
-	}
-
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 20;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_OCMD_READ_SFDP;
-	dev_data->packet.address   = addr;
-	dev_data->packet.data_buf  = dest;
-	dev_data->packet.num_bytes = size;
-	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-			     &dev_data->xfer);
-	if (rc < 0) {
-		printk("JESD216_OCMD_READ_SFDP xfer failed: %d\n", rc);
-		return rc;
-	}
-
-	release(dev);
-
-	return rc;
-}
-
-static int api_read_jedec_id(const struct device *dev, uint8_t *id)
-{
-	int rc = 0;
-
-	rc = acquire(dev);
-	if (rc < 0) {
-		return rc;
-	}
-
-	rc = read_jedec_id(dev, id);
-
-	release(dev);
-
-	return rc;
-}
-#endif /* CONFIG_FLASH_JESD216_API  */
-
-static int dev_pm_action_cb(const struct device *dev,
-			    enum pm_device_action action)
-{
-	switch (action) {
-	case PM_DEVICE_ACTION_SUSPEND:
-		break;
-	case PM_DEVICE_ACTION_RESUME:
-		break;
-	default:
-		return -ENOTSUP;
-	}
-
-	return 0;
-}
-
-static int flash_chip_init(const struct device *dev)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	struct mspi_dev_cfg init_dev_cfg = dev_config->mspi_cfg;
-	uint8_t id[JESD216_READ_ID_LEN] = {0};
-	int rc;
-
-	init_dev_cfg.freq = MHZ(1);
-	init_dev_cfg.io_mode = MSPI_IO_MODE_SINGLE;
-
-	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
-			     MSPI_DEVICE_CONFIG_ALL, &init_dev_cfg);
-	if (rc < 0) {
-		LOG_ERR("Failed to set initial device config: %d", rc);
-		return rc;
-	}
-
-	dev_data->xfer.xfer_mode  = MSPI_PIO;
-	dev_data->xfer.packets    = &dev_data->packet;
-	dev_data->xfer.num_packet = 1;
-	dev_data->xfer.timeout    = 10;
-
-	dev_data->xfer.cmd_length  = 1;
-	dev_data->xfer.addr_length = 0;
-	dev_data->xfer.tx_dummy    = 0;
-	dev_data->xfer.rx_dummy    = 0;
-
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_CMD_READ_ID;
-	dev_data->packet.data_buf  = id;
-	dev_data->packet.num_bytes = sizeof(id);
-	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-			     &dev_data->xfer);
-	if (rc < 0) {
-		LOG_ERR("Failed to read JEDEC ID in single line mode: %d", rc);
-		return rc;
-	}
-
-	/*
-	 * If the read ID does not match the one from DTS, assume the flash
-	 * is already in the Octa I/O mode, so switching it is not needed.
-	 */
-	if (memcmp(id, dev_config->jedec_id, sizeof(id)) == 0) {
-		static const uint8_t enable_sopi[] = { 0x01 };
-
-		dev_data->packet.dir       = MSPI_TX;
-		dev_data->packet.cmd       = SPI_NOR_CMD_WREN;
-		dev_data->packet.num_bytes = 0;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("SPI_NOR_CMD_WREN xfer failed: %d", rc);
-			return rc;
-		}
-
-		dev_data->xfer.addr_length = 4;
-		dev_data->packet.cmd       = SPI_NOR_CMD_WR_CFGREG2;
-		dev_data->packet.address   = 0;
-		dev_data->packet.data_buf  = (uint8_t *)&enable_sopi;
-		dev_data->packet.num_bytes = sizeof(enable_sopi);
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			printk("SPI_NOR_CMD_WR_CFGREG2 xfer failed: %d\n", rc);
-			return rc;
-		}
-	}
-
-	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
-			     MSPI_DEVICE_CONFIG_ALL, &dev_config->mspi_cfg);
-	if (rc < 0) {
-		LOG_ERR("Failed to set device config: %d", rc);
-		return rc;
-	}
-
-	rc = read_jedec_id(dev, id);
-	if (rc < 0) {
-		return rc;
-	}
-
-	if (memcmp(id, dev_config->jedec_id, sizeof(id)) != 0) {
-		LOG_ERR("JEDEC ID mismatch, read: %02x %02x %02x, "
-			"expected: %02x %02x %02x",
-			id[0], id[1], id[2],
-			dev_config->jedec_id[0],
-			dev_config->jedec_id[1],
-			dev_config->jedec_id[2]);
-		return -ENODEV;
-	}
-
-#if defined(CONFIG_MSPI_XIP)
-	/* Enable XIP access for this chip if specified so in DT. */
-	if (dev_config->xip_cfg.enable) {
-		rc = mspi_xip_config(dev_config->bus, &dev_config->mspi_id,
-				     &dev_config->xip_cfg);
-		if (rc < 0) {
-			return rc;
-		}
-	}
-#endif
-
-	return 0;
-}
-
-static int drv_init(const struct device *dev)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	int rc;
-
-	if (!device_is_ready(dev_config->bus)) {
-		LOG_ERR("Device %s is not ready", dev_config->bus->name);
-		return -ENODEV;
-	}
-
-#if defined(WITH_RESET_GPIO)
-	if (dev_config->reset.port) {
-		if (!gpio_is_ready_dt(&dev_config->reset)) {
-			LOG_ERR("Device %s is not ready",
-				dev_config->reset.port->name);
-			return -ENODEV;
-		}
-
-		rc = gpio_pin_configure_dt(&dev_config->reset,
-					   GPIO_OUTPUT_ACTIVE);
-		if (rc < 0) {
-			LOG_ERR("Failed to activate RESET: %d", rc);
-			return -EIO;
-		}
-
-		if (dev_config->reset_pulse_us != 0) {
-			k_busy_wait(dev_config->reset_pulse_us);
-		}
-
-		rc = gpio_pin_set_dt(&dev_config->reset, 0);
-		if (rc < 0) {
-			LOG_ERR("Failed to deactivate RESET: %d", rc);
-			return -EIO;
-		}
-
-		if (dev_config->reset_recovery_us != 0) {
-			k_busy_wait(dev_config->reset_recovery_us);
-		}
-	}
-#endif
-
-	rc = pm_device_runtime_get(dev_config->bus);
-	if (rc < 0) {
-		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
-		return rc;
-	}
-
-	/* Acquire the MSPI controller. */
-	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
-			     MSPI_DEVICE_CONFIG_NONE, NULL);
-	if (rc == 0) {
-		rc = flash_chip_init(dev);
-
-		/* Release the MSPI controller. */
-		(void)mspi_get_channel_status(dev_config->bus, 0);
-	}
-
-	(void)pm_device_runtime_put(dev_config->bus);
-
-	if (rc < 0) {
-		return rc;
-	}
-
-	k_sem_init(&dev_data->acquired, 1, K_SEM_MAX_LIMIT);
-
-	return pm_device_driver_init(dev, dev_pm_action_cb);
-}
-
-static DEVICE_API(flash, drv_api) = {
-	.read = api_read,
-	.write = api_write,
-	.erase = api_erase,
-	.get_parameters = api_get_parameters,
-#if defined(CONFIG_FLASH_PAGE_LAYOUT)
-	.page_layout = api_page_layout,
-#endif
-#if defined(CONFIG_FLASH_JESD216_API)
-	.sfdp_read = api_sfdp_read,
-	.read_jedec_id = api_read_jedec_id,
-#endif
-};
-
-#define FLASH_SIZE_INST(inst) (DT_INST_PROP(inst, size) / 8)
-
-#define FLASH_MSPI_NOR_INST(inst)						\
-	BUILD_ASSERT(DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
-		     MSPI_IO_MODE_OCTAL,					\
-		"Only Octal I/O mode is supported for now");			\
-	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);			\
-	static struct flash_mspi_nor_data dev##inst##_data;			\
-	static const struct flash_mspi_nor_config dev##inst##_config = {	\
-		.bus = DEVICE_DT_GET(DT_INST_BUS(inst)),			\
-		.flash_size = FLASH_SIZE_INST(inst),				\
-		.mspi_id = MSPI_DEVICE_ID_DT_INST(inst),			\
-		.mspi_cfg = MSPI_DEVICE_CONFIG_DT_INST(inst),			\
-	IF_ENABLED(CONFIG_MSPI_XIP,						\
-		(.xip_cfg = MSPI_XIP_CONFIG_DT_INST(inst),))			\
-	IF_ENABLED(WITH_RESET_GPIO,						\
-		(.reset = GPIO_DT_SPEC_INST_GET_OR(inst, reset_gpios, {0}),	\
-		.reset_pulse_us = DT_INST_PROP_OR(inst, t_reset_pulse, 0)	\
-				/ 1000,						\
-		.reset_recovery_us = DT_INST_PROP_OR(inst, t_reset_recovery, 0)	\
-				   / 1000,))					\
-	IF_ENABLED(CONFIG_FLASH_PAGE_LAYOUT,					\
-		(.layout = {							\
-			.pages_size = CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE,	\
-			.pages_count = FLASH_SIZE_INST(inst)			\
-				     / CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE,	\
-		},))								\
-		.jedec_id = DT_INST_PROP(inst, jedec_id),			\
-	};									\
-	DEVICE_DT_INST_DEFINE(inst,						\
-		drv_init, PM_DEVICE_DT_INST_GET(inst),				\
-		&dev##inst##_data, &dev##inst##_config,				\
-		POST_KERNEL, CONFIG_FLASH_MSPI_NOR_INIT_PRIORITY,		\
-		&drv_api);
-
-DT_INST_FOREACH_STATUS_OKAY(FLASH_MSPI_NOR_INST)
diff --git a/dts/bindings/mtd/jedec,mspi-nor.yaml b/dts/bindings/mtd/jedec,mspi-nor.yaml
deleted file mode 100644
index 5bad8f54b5d..00000000000
--- a/dts/bindings/mtd/jedec,mspi-nor.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: Generic NOR flash on MSPI bus
-
-compatible: "jedec,mspi-nor"
-
-include: [mspi-device.yaml, "jedec,spi-nor-common.yaml"]
-
-properties:
-  reset-gpios:
-    type: phandle-array
-    description: |
-      RESET line. If specified, the flash chip will be reset at initialization.
-
-  t-reset-pulse:
-    type: int
-    description: |
-      Minimum duration, in nanoseconds, of an active pulse on the RESET line.
-
-  t-reset-recovery:
-    type: int
-    description: |
-      Minimum time, in nanoseconds, the flash chip needs to recover after reset.

From ff9b79f4da00ac1889eea2e537baafeab5868b0e Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Mon, 10 Mar 2025 13:45:51 +0100
Subject: [PATCH 2554/2913] Revert "[nrf fromlist] drivers: mspi: Add driver
 for DesignWare SSI based controllers"

This reverts commit 9140a90bc0e07d1a6a5be46d257f417b3289bf38.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 drivers/mspi/CMakeLists.txt                |    1 -
 drivers/mspi/Kconfig                       |    1 -
 drivers/mspi/Kconfig.dw                    |    9 -
 drivers/mspi/mspi_dw.c                     | 1355 --------------------
 drivers/mspi/mspi_dw.h                     |  239 ----
 drivers/mspi/mspi_dw_vendor_specific.h     |   87 --
 dts/bindings/mspi/snps,designware-ssi.yaml |   45 -
 7 files changed, 1737 deletions(-)
 delete mode 100644 drivers/mspi/Kconfig.dw
 delete mode 100644 drivers/mspi/mspi_dw.c
 delete mode 100644 drivers/mspi/mspi_dw.h
 delete mode 100644 drivers/mspi/mspi_dw_vendor_specific.h
 delete mode 100644 dts/bindings/mspi/snps,designware-ssi.yaml

diff --git a/drivers/mspi/CMakeLists.txt b/drivers/mspi/CMakeLists.txt
index 78f704393f4..f248cb0b533 100644
--- a/drivers/mspi/CMakeLists.txt
+++ b/drivers/mspi/CMakeLists.txt
@@ -4,5 +4,4 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/mspi.h)
 
 zephyr_library()
 zephyr_library_sources_ifdef(CONFIG_MSPI_AMBIQ_AP3   mspi_ambiq_ap3.c)
-zephyr_library_sources_ifdef(CONFIG_MSPI_DW          mspi_dw.c)
 zephyr_library_sources_ifdef(CONFIG_MSPI_EMUL        mspi_emul.c)
diff --git a/drivers/mspi/Kconfig b/drivers/mspi/Kconfig
index 269d8d16f04..0adb2a34393 100644
--- a/drivers/mspi/Kconfig
+++ b/drivers/mspi/Kconfig
@@ -60,7 +60,6 @@ module-str = mspi
 source "subsys/logging/Kconfig.template.log_config"
 
 source "drivers/mspi/Kconfig.ambiq"
-source "drivers/mspi/Kconfig.dw"
 source "drivers/mspi/Kconfig.mspi_emul"
 
 endif # MSPI
diff --git a/drivers/mspi/Kconfig.dw b/drivers/mspi/Kconfig.dw
deleted file mode 100644
index 1ab82da0e85..00000000000
--- a/drivers/mspi/Kconfig.dw
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config MSPI_DW
-	bool "DesignWare SSI controller driver"
-	default y
-	depends on DT_HAS_SNPS_DESIGNWARE_SSI_ENABLED
-	select PINCTRL if $(dt_compat_any_has_prop,$(DT_COMPAT_SNPS_DESIGNWARE_SSI),pinctrl-0)
-	imply MSPI_XIP
diff --git a/drivers/mspi/mspi_dw.c b/drivers/mspi/mspi_dw.c
deleted file mode 100644
index 33fc2c36e15..00000000000
--- a/drivers/mspi/mspi_dw.c
+++ /dev/null
@@ -1,1355 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define DT_DRV_COMPAT snps_designware_ssi
-
-#include <zephyr/drivers/mspi.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/drivers/pinctrl.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/pm/device.h>
-#include <zephyr/pm/device_runtime.h>
-#include <zephyr/sys/byteorder.h>
-#include <zephyr/sys/util.h>
-
-#include "mspi_dw.h"
-#include "mspi_dw_vendor_specific.h"
-
-LOG_MODULE_REGISTER(mspi_dw, CONFIG_MSPI_LOG_LEVEL);
-
-#define DUMMY_BYTE 0xAA
-
-#if defined(CONFIG_MSPI_XIP)
-struct xip_params {
-	uint32_t read_cmd;
-	uint32_t write_cmd;
-	uint16_t rx_dummy;
-	uint16_t tx_dummy;
-	uint8_t cmd_length;
-	uint8_t addr_length;
-	enum mspi_io_mode io_mode;
-};
-
-struct xip_ctrl {
-	uint32_t read;
-	uint32_t write;
-};
-#endif
-
-struct mspi_dw_data {
-	const struct mspi_dev_id *dev_id;
-	uint32_t packets_done;
-	uint8_t *buf_pos;
-	const uint8_t *buf_end;
-
-	uint32_t ctrlr0;
-	uint32_t spi_ctrlr0;
-	uint32_t baudr;
-
-#if defined(CONFIG_MSPI_XIP)
-	uint32_t xip_freq;
-	struct xip_params xip_params_stored;
-	struct xip_params xip_params_active;
-	uint16_t xip_enabled;
-	enum mspi_cpp_mode xip_cpp;
-#endif
-
-	uint16_t dummy_bytes;
-	uint8_t bytes_to_discard;
-	uint8_t bytes_per_frame_exp;
-	bool standard_spi;
-
-	struct k_sem finished;
-	struct k_sem ctx_lock;
-	struct k_sem cfg_lock;
-	struct mspi_xfer xfer;
-};
-
-struct mspi_dw_config {
-	DEVICE_MMIO_ROM;
-	void (*irq_config)(void);
-	uint32_t clock_frequency;
-#if defined(CONFIG_PINCTRL)
-	const struct pinctrl_dev_config *pcfg;
-#endif
-	const struct gpio_dt_spec *ce_gpios;
-	uint8_t ce_gpios_len;
-	uint8_t tx_fifo_depth_minus_1;
-	uint8_t tx_fifo_threshold;
-	uint8_t rx_fifo_threshold;
-	DECLARE_REG_ACCESS();
-};
-
-/* Register access helpers. */
-#define DEFINE_MM_REG_RD_WR(reg, off) \
-	DEFINE_MM_REG_RD(reg, off) \
-	DEFINE_MM_REG_WR(reg, off)
-
-DEFINE_MM_REG_WR(ctrlr0,	0x00)
-DEFINE_MM_REG_WR(ctrlr1,	0x04)
-DEFINE_MM_REG_WR(ssienr,	0x08)
-DEFINE_MM_REG_WR(ser,		0x10)
-DEFINE_MM_REG_WR(baudr,		0x14)
-DEFINE_MM_REG_RD_WR(txftlr,	0x18)
-DEFINE_MM_REG_RD_WR(rxftlr,	0x1c)
-DEFINE_MM_REG_RD(txflr,		0x20)
-DEFINE_MM_REG_RD(rxflr,		0x24)
-DEFINE_MM_REG_RD(sr,		0x28)
-DEFINE_MM_REG_WR(imr,		0x2c)
-DEFINE_MM_REG_RD(isr,		0x30)
-DEFINE_MM_REG_RD_WR(dr,		0x60)
-DEFINE_MM_REG_WR(spi_ctrlr0,	0xf4)
-
-#if defined(CONFIG_MSPI_XIP)
-DEFINE_MM_REG_WR(xip_incr_inst,		0x100)
-DEFINE_MM_REG_WR(xip_wrap_inst,		0x104)
-DEFINE_MM_REG_WR(xip_ctrl,		0x108)
-DEFINE_MM_REG_WR(xip_write_incr_inst,	0x140)
-DEFINE_MM_REG_WR(xip_write_wrap_inst,	0x144)
-DEFINE_MM_REG_WR(xip_write_ctrl,	0x148)
-#endif
-
-static void tx_data(const struct device *dev,
-		    const struct mspi_xfer_packet *packet)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	const struct mspi_dw_config *dev_config = dev->config;
-	const uint8_t *buf_pos = dev_data->buf_pos;
-	const uint8_t *buf_end = dev_data->buf_end;
-	/* When the function is called, it is known that at least one item
-	 * can be written to the FIFO. The loop below writes to the FIFO
-	 * the number of items that is known to fit and then updates that
-	 * number basing on the actual FIFO level (because some data may get
-	 * sent while the FIFO is written; especially for high frequencies
-	 * this may often occur) and continues until the FIFO is filled up
-	 * or the buffer end is reached.
-	 */
-	uint32_t room = 1;
-	uint8_t bytes_per_frame_exp = dev_data->bytes_per_frame_exp;
-	uint8_t tx_fifo_depth = dev_config->tx_fifo_depth_minus_1 + 1;
-	uint32_t data;
-
-	do {
-		if (bytes_per_frame_exp == 2) {
-			data = sys_get_be32(buf_pos);
-			buf_pos += 4;
-		} else if (bytes_per_frame_exp == 1) {
-			data = sys_get_be16(buf_pos);
-			buf_pos += 2;
-		} else {
-			data = *buf_pos;
-			buf_pos += 1;
-		}
-		write_dr(dev, data);
-
-		if (buf_pos >= buf_end) {
-			write_txftlr(dev, 0);
-			break;
-		}
-
-		if (--room == 0) {
-			room = tx_fifo_depth
-			     - FIELD_GET(TXFLR_TXTFL_MASK, read_txflr(dev));
-		}
-	} while (room);
-
-	dev_data->buf_pos = (uint8_t *)buf_pos;
-}
-
-static bool make_rx_cycles(const struct device *dev)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	const struct mspi_dw_config *dev_config = dev->config;
-	uint16_t dummy_bytes = dev_data->dummy_bytes;
-	/* See tx_data(). */
-	uint32_t room = 1;
-	uint8_t tx_fifo_depth = dev_config->tx_fifo_depth_minus_1 + 1;
-
-	do {
-		write_dr(dev, DUMMY_BYTE);
-
-		--dummy_bytes;
-		if (!dummy_bytes) {
-			dev_data->dummy_bytes = 0;
-			return true;
-		}
-
-		if (--room == 0) {
-			room = tx_fifo_depth
-			     - FIELD_GET(TXFLR_TXTFL_MASK, read_txflr(dev));
-		}
-	} while (room);
-
-	dev_data->dummy_bytes = dummy_bytes;
-	return false;
-}
-
-static void read_rx_fifo(const struct device *dev,
-			 const struct mspi_xfer_packet *packet)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	const struct mspi_dw_config *dev_config = dev->config;
-	uint8_t bytes_to_discard = dev_data->bytes_to_discard;
-	uint8_t *buf_pos = dev_data->buf_pos;
-	const uint8_t *buf_end = &packet->data_buf[packet->num_bytes];
-	uint8_t bytes_per_frame_exp = dev_data->bytes_per_frame_exp;
-	/* See `room` in tx_data(). */
-	uint32_t in_fifo = 1;
-	uint32_t remaining_frames;
-
-	do {
-		uint32_t data = read_dr(dev);
-
-		if (bytes_to_discard) {
-			--bytes_to_discard;
-		} else {
-			if (bytes_per_frame_exp == 2) {
-				sys_put_be32(data, buf_pos);
-				buf_pos += 4;
-			} else if (bytes_per_frame_exp == 1) {
-				sys_put_be16(data, buf_pos);
-				buf_pos += 2;
-			} else {
-				*buf_pos = (uint8_t)data;
-				buf_pos += 1;
-			}
-
-			if (buf_pos >= buf_end) {
-				dev_data->bytes_to_discard = bytes_to_discard;
-				dev_data->buf_pos = buf_pos;
-				return;
-			}
-		}
-
-		if (--in_fifo == 0) {
-			in_fifo = FIELD_GET(RXFLR_RXTFL_MASK, read_rxflr(dev));
-		}
-	} while (in_fifo);
-
-	remaining_frames = (bytes_to_discard + buf_end - buf_pos)
-			   >> bytes_per_frame_exp;
-	if (remaining_frames - 1 < dev_config->rx_fifo_threshold) {
-		write_rxftlr(dev, remaining_frames - 1);
-	}
-
-	dev_data->bytes_to_discard = bytes_to_discard;
-	dev_data->buf_pos = buf_pos;
-}
-
-static void mspi_dw_isr(const struct device *dev)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	const struct mspi_xfer_packet *packet =
-		&dev_data->xfer.packets[dev_data->packets_done];
-	uint32_t int_status = read_isr(dev);
-
-	if (int_status & ISR_RXFIS_BIT) {
-		read_rx_fifo(dev, packet);
-	}
-
-	if (dev_data->buf_pos >= dev_data->buf_end) {
-		write_imr(dev, 0);
-		/* It may happen that at this point the controller is still
-		 * shifting out the last frame (the last interrupt occurs when
-		 * the TX FIFO is empty). Wait if it signals that it is busy.
-		 */
-		while (read_sr(dev) & SR_BUSY_BIT) {
-		}
-
-		k_sem_give(&dev_data->finished);
-	} else {
-		if (int_status & ISR_TXEIS_BIT) {
-			if (dev_data->dummy_bytes) {
-				if (make_rx_cycles(dev)) {
-					write_imr(dev, IMR_RXFIM_BIT);
-				}
-			} else {
-				tx_data(dev, packet);
-			}
-		}
-	}
-
-	vendor_specific_irq_clear(dev);
-}
-
-static int api_config(const struct mspi_dt_spec *spec)
-{
-	ARG_UNUSED(spec);
-
-	return -ENOTSUP;
-}
-
-static bool apply_io_mode(struct mspi_dw_data *dev_data,
-			  enum mspi_io_mode io_mode)
-{
-	dev_data->ctrlr0 &= ~CTRLR0_SPI_FRF_MASK;
-	dev_data->spi_ctrlr0 &= ~SPI_CTRLR0_TRANS_TYPE_MASK;
-
-	/* Frame format used for transferring data. */
-
-	if (io_mode == MSPI_IO_MODE_SINGLE) {
-		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
-					       CTRLR0_SPI_FRF_STANDARD);
-		dev_data->standard_spi = true;
-		return true;
-	}
-
-	dev_data->standard_spi = false;
-
-	switch (io_mode) {
-	case MSPI_IO_MODE_DUAL:
-	case MSPI_IO_MODE_DUAL_1_1_2:
-	case MSPI_IO_MODE_DUAL_1_2_2:
-		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
-					       CTRLR0_SPI_FRF_DUAL);
-		break;
-	case MSPI_IO_MODE_QUAD:
-	case MSPI_IO_MODE_QUAD_1_1_4:
-	case MSPI_IO_MODE_QUAD_1_4_4:
-		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
-					       CTRLR0_SPI_FRF_QUAD);
-		break;
-	case MSPI_IO_MODE_OCTAL:
-	case MSPI_IO_MODE_OCTAL_1_1_8:
-	case MSPI_IO_MODE_OCTAL_1_8_8:
-		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
-					       CTRLR0_SPI_FRF_OCTAL);
-		break;
-	default:
-		LOG_ERR("IO mode %d not supported", io_mode);
-		return false;
-	}
-
-	/* Transfer format used for Address and Instruction: */
-
-	switch (io_mode) {
-	case MSPI_IO_MODE_DUAL_1_1_2:
-	case MSPI_IO_MODE_QUAD_1_1_4:
-	case MSPI_IO_MODE_OCTAL_1_1_8:
-		/* - both sent in Standard SPI mode */
-		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_TRANS_TYPE_MASK,
-						   SPI_CTRLR0_TRANS_TYPE_TT0);
-		break;
-	case MSPI_IO_MODE_DUAL_1_2_2:
-	case MSPI_IO_MODE_QUAD_1_4_4:
-	case MSPI_IO_MODE_OCTAL_1_8_8:
-		/* - Instruction sent in Standard SPI mode,
-		 *   Address sent the same way as data
-		 */
-		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_TRANS_TYPE_MASK,
-						   SPI_CTRLR0_TRANS_TYPE_TT1);
-		break;
-	default:
-		/* - both sent the same way as data. */
-		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_TRANS_TYPE_MASK,
-						   SPI_CTRLR0_TRANS_TYPE_TT2);
-		break;
-	}
-
-	return true;
-}
-
-static bool apply_cmd_length(struct mspi_dw_data *dev_data, uint32_t cmd_length)
-{
-	switch (cmd_length) {
-	case 0:
-		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_INST_L_MASK,
-						   SPI_CTRLR0_INST_L0);
-		break;
-	case 1:
-		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_INST_L_MASK,
-						   SPI_CTRLR0_INST_L8);
-		break;
-	case 2:
-		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_INST_L_MASK,
-						   SPI_CTRLR0_INST_L16);
-		break;
-	default:
-		LOG_ERR("Command length %d not supported", cmd_length);
-		return false;
-	}
-
-	return true;
-}
-
-static bool apply_addr_length(struct mspi_dw_data *dev_data,
-			      uint32_t addr_length)
-{
-	dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_ADDR_L_MASK,
-					   addr_length * 2);
-
-	return true;
-}
-
-#if defined(CONFIG_MSPI_XIP)
-static bool apply_xip_io_mode(const struct mspi_dw_data *dev_data,
-			      struct xip_ctrl *ctrl)
-{
-	enum mspi_io_mode io_mode = dev_data->xip_params_active.io_mode;
-
-	/* Frame format used for transferring data. */
-
-	if (io_mode == MSPI_IO_MODE_SINGLE) {
-		LOG_ERR("XIP not available in single line mode");
-		return false;
-	}
-
-	switch (io_mode) {
-	case MSPI_IO_MODE_DUAL:
-	case MSPI_IO_MODE_DUAL_1_1_2:
-	case MSPI_IO_MODE_DUAL_1_2_2:
-		ctrl->read |= FIELD_PREP(XIP_CTRL_FRF_MASK,
-					 XIP_CTRL_FRF_DUAL);
-		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_FRF_MASK,
-					  XIP_WRITE_CTRL_FRF_DUAL);
-		break;
-	case MSPI_IO_MODE_QUAD:
-	case MSPI_IO_MODE_QUAD_1_1_4:
-	case MSPI_IO_MODE_QUAD_1_4_4:
-		ctrl->read |= FIELD_PREP(XIP_CTRL_FRF_MASK,
-					 XIP_CTRL_FRF_QUAD);
-		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_FRF_MASK,
-					  XIP_WRITE_CTRL_FRF_QUAD);
-		break;
-	case MSPI_IO_MODE_OCTAL:
-	case MSPI_IO_MODE_OCTAL_1_1_8:
-	case MSPI_IO_MODE_OCTAL_1_8_8:
-		ctrl->read |= FIELD_PREP(XIP_CTRL_FRF_MASK,
-					 XIP_CTRL_FRF_OCTAL);
-		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_FRF_MASK,
-					  XIP_WRITE_CTRL_FRF_OCTAL);
-		break;
-	default:
-		LOG_ERR("IO mode %d not supported", io_mode);
-		return false;
-	}
-
-	/* Transfer format used for Address and Instruction: */
-
-	switch (io_mode) {
-	case MSPI_IO_MODE_DUAL_1_1_2:
-	case MSPI_IO_MODE_QUAD_1_1_4:
-	case MSPI_IO_MODE_OCTAL_1_1_8:
-		/* - both sent in Standard SPI mode */
-		ctrl->read |= FIELD_PREP(XIP_CTRL_TRANS_TYPE_MASK,
-					 XIP_CTRL_TRANS_TYPE_TT0);
-		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_TRANS_TYPE_MASK,
-					  XIP_WRITE_CTRL_TRANS_TYPE_TT0);
-		break;
-	case MSPI_IO_MODE_DUAL_1_2_2:
-	case MSPI_IO_MODE_QUAD_1_4_4:
-	case MSPI_IO_MODE_OCTAL_1_8_8:
-		/* - Instruction sent in Standard SPI mode,
-		 *   Address sent the same way as data
-		 */
-		ctrl->read |= FIELD_PREP(XIP_CTRL_TRANS_TYPE_MASK,
-					 XIP_CTRL_TRANS_TYPE_TT1);
-		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_TRANS_TYPE_MASK,
-					  XIP_WRITE_CTRL_TRANS_TYPE_TT1);
-		break;
-	default:
-		/* - both sent the same way as data. */
-		ctrl->read |= FIELD_PREP(XIP_CTRL_TRANS_TYPE_MASK,
-					 XIP_CTRL_TRANS_TYPE_TT2);
-		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_TRANS_TYPE_MASK,
-					  XIP_WRITE_CTRL_TRANS_TYPE_TT2);
-		break;
-	}
-
-	return true;
-}
-
-static bool apply_xip_cmd_length(const struct mspi_dw_data *dev_data,
-				 struct xip_ctrl *ctrl)
-{
-	uint8_t cmd_length = dev_data->xip_params_active.cmd_length;
-
-	switch (cmd_length) {
-	case 0:
-		ctrl->read |= FIELD_PREP(XIP_CTRL_INST_L_MASK,
-					 XIP_CTRL_INST_L0);
-		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_INST_L_MASK,
-					  XIP_WRITE_CTRL_INST_L0);
-		break;
-	case 1:
-		ctrl->read |= XIP_CTRL_INST_EN_BIT
-			   |  FIELD_PREP(XIP_CTRL_INST_L_MASK,
-					 XIP_CTRL_INST_L8);
-		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_INST_L_MASK,
-					  XIP_WRITE_CTRL_INST_L8);
-		break;
-	case 2:
-		ctrl->read |= XIP_CTRL_INST_EN_BIT
-			   |  FIELD_PREP(XIP_CTRL_INST_L_MASK,
-					 XIP_CTRL_INST_L16);
-		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_INST_L_MASK,
-					  XIP_WRITE_CTRL_INST_L16);
-		break;
-	default:
-		LOG_ERR("Command length %d not supported", cmd_length);
-		return false;
-	}
-
-	return true;
-}
-
-static bool apply_xip_addr_length(const struct mspi_dw_data *dev_data,
-				  struct xip_ctrl *ctrl)
-{
-	uint8_t addr_length = dev_data->xip_params_active.addr_length;
-
-	ctrl->read |= FIELD_PREP(XIP_CTRL_ADDR_L_MASK, addr_length * 2);
-	ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_ADDR_L_MASK, addr_length * 2);
-
-	return true;
-}
-#endif /* defined(CONFIG_MSPI_XIP) */
-
-static int _api_dev_config(const struct device *dev,
-			   const enum mspi_dev_cfg_mask param_mask,
-			   const struct mspi_dev_cfg *cfg)
-{
-	const struct mspi_dw_config *dev_config = dev->config;
-	struct mspi_dw_data *dev_data = dev->data;
-
-	if (param_mask & MSPI_DEVICE_CONFIG_ENDIAN) {
-		if (cfg->endian != MSPI_XFER_BIG_ENDIAN) {
-			LOG_ERR("Only big endian transfers are supported.");
-			return -ENOTSUP;
-		}
-	}
-
-	if (param_mask & MSPI_DEVICE_CONFIG_CE_POL) {
-		if (cfg->ce_polarity != MSPI_CE_ACTIVE_LOW) {
-			LOG_ERR("Only active low CE is supported.");
-			return -ENOTSUP;
-		}
-	}
-
-	if (param_mask & MSPI_DEVICE_CONFIG_MEM_BOUND) {
-		if (cfg->mem_boundary) {
-			LOG_ERR("Auto CE break is not supported.");
-			return -ENOTSUP;
-		}
-	}
-
-	if (param_mask & MSPI_DEVICE_CONFIG_BREAK_TIME) {
-		if (cfg->time_to_break) {
-			LOG_ERR("Auto CE break is not supported.");
-			return -ENOTSUP;
-		}
-	}
-
-	if (param_mask & MSPI_DEVICE_CONFIG_IO_MODE) {
-#if defined(CONFIG_MSPI_XIP)
-		dev_data->xip_params_stored.io_mode = cfg->io_mode;
-#endif
-
-		if (!apply_io_mode(dev_data, cfg->io_mode)) {
-			return -EINVAL;
-		}
-	}
-
-	if (param_mask & MSPI_DEVICE_CONFIG_CPP) {
-#if defined(CONFIG_MSPI_XIP)
-		/* Make sure the new setting is compatible with the one used
-		 * for XIP if it is enabled.
-		 */
-		if (!dev_data->xip_enabled) {
-			dev_data->xip_cpp = cfg->cpp;
-		} else if (dev_data->xip_cpp != cfg->cpp) {
-			LOG_ERR("Conflict with configuration used for XIP.");
-			return -EINVAL;
-		}
-#endif
-
-		dev_data->ctrlr0 &= ~(CTRLR0_SCPOL_BIT | CTRLR0_SCPH_BIT);
-
-		switch (cfg->cpp) {
-		default:
-		case MSPI_CPP_MODE_0:
-			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 0) |
-					    FIELD_PREP(CTRLR0_SCPH_BIT,  0);
-			break;
-		case MSPI_CPP_MODE_1:
-			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 0) |
-					    FIELD_PREP(CTRLR0_SCPH_BIT,  1);
-			break;
-		case MSPI_CPP_MODE_2:
-			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 1) |
-					    FIELD_PREP(CTRLR0_SCPH_BIT,  0);
-			break;
-		case MSPI_CPP_MODE_3:
-			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 1) |
-					    FIELD_PREP(CTRLR0_SCPH_BIT,  1);
-			break;
-		}
-	}
-
-	if (param_mask & MSPI_DEVICE_CONFIG_FREQUENCY) {
-		if (cfg->freq > dev_config->clock_frequency / 2 ||
-		    cfg->freq < dev_config->clock_frequency / 65534) {
-			LOG_ERR("Invalid frequency: %u, MIN: %u, MAX: %u",
-				cfg->freq, dev_config->clock_frequency / 65534,
-				dev_config->clock_frequency / 2);
-			return -EINVAL;
-		}
-
-#if defined(CONFIG_MSPI_XIP)
-		/* Make sure the new setting is compatible with the one used
-		 * for XIP if it is enabled.
-		 */
-		if (!dev_data->xip_enabled) {
-			dev_data->xip_freq = cfg->freq;
-		} else if (dev_data->xip_freq != cfg->freq) {
-			LOG_ERR("Conflict with configuration used for XIP.");
-			return -EINVAL;
-		}
-#endif
-
-		dev_data->baudr = dev_config->clock_frequency / cfg->freq;
-	}
-
-	if (param_mask & MSPI_DEVICE_CONFIG_DATA_RATE) {
-		/* TODO: add support for DDR */
-		if (cfg->data_rate != MSPI_DATA_RATE_SINGLE) {
-			LOG_ERR("Only single data rate is supported.");
-			return -ENOTSUP;
-		}
-	}
-
-	if (param_mask & MSPI_DEVICE_CONFIG_DQS) {
-		/* TODO: add support for DQS */
-		if (cfg->dqs_enable) {
-			LOG_ERR("DQS line is not supported.");
-			return -ENOTSUP;
-		}
-	}
-
-#if defined(CONFIG_MSPI_XIP)
-	if (param_mask & MSPI_DEVICE_CONFIG_READ_CMD) {
-		dev_data->xip_params_stored.read_cmd = cfg->read_cmd;
-	}
-	if (param_mask & MSPI_DEVICE_CONFIG_WRITE_CMD) {
-		dev_data->xip_params_stored.write_cmd = cfg->write_cmd;
-	}
-	if (param_mask & MSPI_DEVICE_CONFIG_RX_DUMMY) {
-		dev_data->xip_params_stored.rx_dummy = cfg->rx_dummy;
-	}
-	if (param_mask & MSPI_DEVICE_CONFIG_TX_DUMMY) {
-		dev_data->xip_params_stored.tx_dummy = cfg->tx_dummy;
-	}
-	if (param_mask & MSPI_DEVICE_CONFIG_CMD_LEN) {
-		dev_data->xip_params_stored.cmd_length = cfg->cmd_length;
-	}
-	if (param_mask & MSPI_DEVICE_CONFIG_ADDR_LEN) {
-		dev_data->xip_params_stored.addr_length = cfg->addr_length;
-	}
-#endif
-
-	/* Always use Motorola SPI frame format. */
-	dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_FRF_MASK, CTRLR0_FRF_SPI);
-	/* Enable clock stretching. */
-	dev_data->spi_ctrlr0 |= SPI_CTRLR0_CLK_STRETCH_EN_BIT;
-
-	return 0;
-}
-
-static int api_dev_config(const struct device *dev,
-			  const struct mspi_dev_id *dev_id,
-			  const enum mspi_dev_cfg_mask param_mask,
-			  const struct mspi_dev_cfg *cfg)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	int rc;
-
-	if (dev_id != dev_data->dev_id) {
-		rc = k_sem_take(&dev_data->cfg_lock,
-				K_MSEC(CONFIG_MSPI_COMPLETION_TIMEOUT_TOLERANCE));
-		if (rc < 0) {
-			LOG_ERR("Failed to switch controller to device");
-			return -EBUSY;
-		}
-
-		dev_data->dev_id = dev_id;
-
-		if (param_mask == MSPI_DEVICE_CONFIG_NONE) {
-			return 0;
-		}
-	}
-
-	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
-
-	rc = _api_dev_config(dev, param_mask, cfg);
-
-	k_sem_give(&dev_data->ctx_lock);
-
-	if (rc < 0) {
-		dev_data->dev_id = NULL;
-		k_sem_give(&dev_data->cfg_lock);
-	}
-
-	return rc;
-}
-
-static int api_get_channel_status(const struct device *dev, uint8_t ch)
-{
-	ARG_UNUSED(ch);
-
-	struct mspi_dw_data *dev_data = dev->data;
-
-	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
-
-	dev_data->dev_id = NULL;
-	k_sem_give(&dev_data->cfg_lock);
-
-	k_sem_give(&dev_data->ctx_lock);
-
-	return 0;
-}
-
-static void tx_control_field(const struct device *dev,
-			     uint32_t field, uint8_t len)
-{
-	uint8_t shift = 8 * len;
-
-	do {
-		shift -= 8;
-		write_dr(dev, field >> shift);
-	} while (shift);
-}
-
-static int start_next_packet(const struct device *dev, k_timeout_t timeout)
-{
-	const struct mspi_dw_config *dev_config = dev->config;
-	struct mspi_dw_data *dev_data = dev->data;
-	const struct mspi_xfer_packet *packet =
-		&dev_data->xfer.packets[dev_data->packets_done];
-	bool xip_enabled = COND_CODE_1(CONFIG_MSPI_XIP,
-				       (dev_data->xip_enabled != 0),
-				       (false));
-	unsigned int key;
-	uint8_t tx_fifo_threshold;
-	uint32_t packet_frames;
-	uint32_t imr;
-	int rc = 0;
-
-	if (packet->num_bytes == 0 &&
-	    dev_data->xfer.cmd_length == 0 &&
-	    dev_data->xfer.addr_length == 0) {
-		return 0;
-	}
-
-	dev_data->dummy_bytes = 0;
-
-	dev_data->ctrlr0 &= ~CTRLR0_TMOD_MASK
-			 &  ~CTRLR0_DFS_MASK;
-
-	dev_data->spi_ctrlr0 &= ~SPI_CTRLR0_WAIT_CYCLES_MASK;
-
-	if (dev_data->standard_spi &&
-	    (dev_data->xfer.cmd_length != 0 ||
-	     dev_data->xfer.addr_length != 0)) {
-		dev_data->bytes_per_frame_exp = 0;
-		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 7);
-	} else {
-		if ((packet->num_bytes % 4) == 0) {
-			dev_data->bytes_per_frame_exp = 2;
-			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 31);
-		} else if ((packet->num_bytes % 2) == 0) {
-			dev_data->bytes_per_frame_exp = 1;
-			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 15);
-		} else {
-			dev_data->bytes_per_frame_exp = 0;
-			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 7);
-		}
-	}
-
-	packet_frames = packet->num_bytes >> dev_data->bytes_per_frame_exp;
-
-	if (packet_frames > UINT16_MAX + 1) {
-		LOG_ERR("Packet length (%u) exceeds supported maximum",
-			packet->num_bytes);
-		return -EINVAL;
-	}
-
-	if (packet->dir == MSPI_TX || packet->num_bytes == 0) {
-		imr = IMR_TXEIM_BIT;
-		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_TMOD_MASK,
-					       CTRLR0_TMOD_TX);
-		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_WAIT_CYCLES_MASK,
-						   dev_data->xfer.tx_dummy);
-
-		write_rxftlr(dev, 0);
-		tx_fifo_threshold = dev_config->tx_fifo_threshold;
-	} else {
-		uint32_t tmod;
-		uint8_t rx_fifo_threshold;
-
-		/* In Standard SPI Mode, the controller does not support
-		 * sending the command and address fields separately, they
-		 * need to be sent as data; hence, for RX packets with these
-		 * fields, the TX/RX transfer mode needs to be used and
-		 * consequently, dummy bytes need to be transmitted so that
-		 * clock cycles for the RX part are provided (the controller
-		 * does not do it automatically in the TX/RX mode).
-		 */
-		if (dev_data->standard_spi &&
-		    (dev_data->xfer.cmd_length != 0 ||
-		     dev_data->xfer.addr_length != 0)) {
-			uint32_t rx_total_bytes;
-
-			dev_data->bytes_to_discard = dev_data->xfer.cmd_length
-						   + dev_data->xfer.addr_length;
-			rx_total_bytes = dev_data->bytes_to_discard
-				       + packet->num_bytes;
-
-			dev_data->dummy_bytes = packet->num_bytes;
-
-			imr = IMR_TXEIM_BIT | IMR_RXFIM_BIT;
-			tmod = CTRLR0_TMOD_TX_RX;
-			tx_fifo_threshold = dev_config->tx_fifo_threshold;
-			/* For standard SPI, only 1-byte frames are used. */
-			rx_fifo_threshold = MIN(rx_total_bytes - 1,
-						dev_config->rx_fifo_threshold);
-		} else {
-			imr = IMR_RXFIM_BIT;
-			tmod = CTRLR0_TMOD_RX;
-			tx_fifo_threshold = 0;
-			rx_fifo_threshold = MIN(packet_frames - 1,
-						dev_config->rx_fifo_threshold);
-		}
-
-		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_TMOD_MASK, tmod);
-		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_WAIT_CYCLES_MASK,
-						   dev_data->xfer.rx_dummy);
-
-		write_rxftlr(dev, FIELD_PREP(RXFTLR_RFT_MASK,
-					     rx_fifo_threshold));
-	}
-
-	if (dev_data->dev_id->ce.port) {
-		rc = gpio_pin_set_dt(&dev_data->dev_id->ce, 1);
-		if (rc < 0) {
-			LOG_ERR("Failed to activate CE line (%d)", rc);
-			return rc;
-		}
-	}
-
-	if (xip_enabled) {
-		key = irq_lock();
-		write_ssienr(dev, 0);
-	}
-
-	/* These registers cannot be written when the controller is enabled,
-	 * that's why it is temporarily disabled above; with locked interrupts,
-	 * to prevent potential XIP transfers during that period.
-	 */
-	write_ctrlr0(dev, dev_data->ctrlr0);
-	write_ctrlr1(dev, packet_frames > 0
-		? FIELD_PREP(CTRLR1_NDF_MASK, packet_frames - 1)
-		: 0);
-	write_spi_ctrlr0(dev, dev_data->spi_ctrlr0);
-	write_baudr(dev, dev_data->baudr);
-	write_ser(dev, BIT(dev_data->dev_id->dev_idx));
-
-	if (xip_enabled) {
-		write_ssienr(dev, SSIENR_SSIC_EN_BIT);
-		irq_unlock(key);
-	}
-
-	dev_data->buf_pos = packet->data_buf;
-	dev_data->buf_end = &packet->data_buf[packet->num_bytes];
-
-	if ((imr & IMR_TXEIM_BIT) && dev_data->buf_pos < dev_data->buf_end) {
-		uint32_t start_level = tx_fifo_threshold;
-
-		if (dev_data->dummy_bytes) {
-			uint32_t tx_total = dev_data->bytes_to_discard
-					  + dev_data->dummy_bytes;
-
-			if (start_level > tx_total - 1) {
-				start_level = tx_total - 1;
-			}
-		}
-
-		write_txftlr(dev,
-			FIELD_PREP(TXFTLR_TXFTHR_MASK, start_level) |
-			FIELD_PREP(TXFTLR_TFT_MASK, tx_fifo_threshold));
-	} else {
-		write_txftlr(dev, 0);
-	}
-
-	/* Ensure that there will be no interrupt from the controller yet. */
-	write_imr(dev, 0);
-	/* Enable the controller. This must be done before DR is written. */
-	write_ssienr(dev, SSIENR_SSIC_EN_BIT);
-
-	if (dev_data->standard_spi) {
-		if (dev_data->xfer.cmd_length) {
-			tx_control_field(dev, packet->cmd,
-					 dev_data->xfer.cmd_length);
-		}
-
-		if (dev_data->xfer.addr_length) {
-			tx_control_field(dev, packet->address,
-					 dev_data->xfer.addr_length);
-		}
-	} else {
-		if (dev_data->xfer.cmd_length) {
-			write_dr(dev, packet->cmd);
-		}
-
-		if (dev_data->xfer.addr_length) {
-			write_dr(dev, packet->address);
-		}
-	}
-
-	if (dev_data->dummy_bytes) {
-		if (make_rx_cycles(dev)) {
-			imr = IMR_RXFIM_BIT;
-		}
-	} else if (packet->dir == MSPI_TX && packet->num_bytes) {
-		tx_data(dev, packet);
-	}
-
-	/* Enable interrupts now and wait until the packet is done. */
-	write_imr(dev, imr);
-
-	rc = k_sem_take(&dev_data->finished, timeout);
-	if (rc < 0) {
-		rc = -ETIMEDOUT;
-	}
-
-	/* Disable the controller. This will immediately halt the transfer
-	 * if it hasn't finished yet.
-	 */
-	if (xip_enabled) {
-		/* If XIP is enabled, the controller must be kept enabled,
-		 * so disable it only momentarily if there's a need to halt
-		 * a transfer that has timeout out.
-		 */
-		if (rc == -ETIMEDOUT) {
-			key = irq_lock();
-
-			write_ssienr(dev, 0);
-			write_ssienr(dev, SSIENR_SSIC_EN_BIT);
-
-			irq_unlock(key);
-		}
-	} else {
-		write_ssienr(dev, 0);
-	}
-
-	if (dev_data->dev_id->ce.port) {
-		int rc2;
-
-		/* Do not use `rc` to not overwrite potential timeout error. */
-		rc2 = gpio_pin_set_dt(&dev_data->dev_id->ce, 0);
-		if (rc2 < 0) {
-			LOG_ERR("Failed to deactivate CE line (%d)", rc2);
-			return rc2;
-		}
-	}
-
-	return rc;
-}
-
-static int _api_transceive(const struct device *dev,
-			   const struct mspi_xfer *req)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	int rc;
-
-	dev_data->spi_ctrlr0 &= ~SPI_CTRLR0_WAIT_CYCLES_MASK
-			     &  ~SPI_CTRLR0_INST_L_MASK
-			     &  ~SPI_CTRLR0_ADDR_L_MASK;
-
-	if (!apply_cmd_length(dev_data, req->cmd_length) ||
-	    !apply_addr_length(dev_data, req->addr_length)) {
-		return -EINVAL;
-	}
-
-	if (dev_data->standard_spi &&
-	    (req->rx_dummy != 0 || req->tx_dummy != 0)) {
-		LOG_ERR("Dummy cycles unsupported in single line mode");
-		return -EINVAL;
-	} else if (req->rx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX ||
-		   req->tx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX) {
-		LOG_ERR("Unsupported RX (%u) or TX (%u) dummy cycles",
-			req->rx_dummy, req->tx_dummy);
-		return -EINVAL;
-	}
-
-	dev_data->xfer = *req;
-
-	for (dev_data->packets_done = 0;
-	     dev_data->packets_done < dev_data->xfer.num_packet;
-	     dev_data->packets_done++) {
-		rc = start_next_packet(dev, K_MSEC(dev_data->xfer.timeout));
-		if (rc < 0) {
-			return rc;
-		}
-	}
-
-	return 0;
-}
-
-static int api_transceive(const struct device *dev,
-			  const struct mspi_dev_id *dev_id,
-			  const struct mspi_xfer *req)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	int rc, rc2;
-
-	if (dev_id != dev_data->dev_id) {
-		LOG_ERR("Controller is not configured for this device");
-		return -EINVAL;
-	}
-
-	/* TODO: add support for asynchronous transfers */
-	if (req->async) {
-		LOG_ERR("Asynchronous transfers are not supported");
-		return -ENOTSUP;
-	}
-
-	rc = pm_device_runtime_get(dev);
-	if (rc < 0) {
-		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
-		return rc;
-	}
-
-	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
-
-	rc = _api_transceive(dev, req);
-
-	k_sem_give(&dev_data->ctx_lock);
-
-	rc2 = pm_device_runtime_put(dev);
-	if (rc2 < 0) {
-		LOG_ERR("pm_device_runtime_put() failed: %d", rc2);
-		rc = (rc < 0 ? rc : rc2);
-	}
-
-	return rc;
-}
-
-#if defined(CONFIG_MSPI_XIP)
-static int _api_xip_config(const struct device *dev,
-			   const struct mspi_dev_id *dev_id,
-			   const struct mspi_xip_cfg *cfg)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	int rc;
-
-	if (!cfg->enable) {
-		rc = vendor_specific_xip_disable(dev, dev_id, cfg);
-		if (rc < 0) {
-			return rc;
-		}
-
-		dev_data->xip_enabled &= ~BIT(dev_id->dev_idx);
-
-		if (!dev_data->xip_enabled) {
-			write_ssienr(dev, 0);
-
-			/* Since XIP is disabled, it is okay for the controller
-			 * to be suspended.
-			 */
-			rc = pm_device_runtime_put(dev);
-			if (rc < 0) {
-				LOG_ERR("pm_device_runtime_put() failed: %d", rc);
-				return rc;
-			}
-		}
-
-		return 0;
-	}
-
-	if (!dev_data->xip_enabled) {
-		struct xip_params *params = &dev_data->xip_params_active;
-		struct xip_ctrl ctrl = {0};
-
-		*params = dev_data->xip_params_stored;
-
-		if (!apply_xip_io_mode(dev_data, &ctrl) ||
-		    !apply_xip_cmd_length(dev_data, &ctrl) ||
-		    !apply_xip_addr_length(dev_data, &ctrl)) {
-			return -EINVAL;
-		}
-
-		if (params->rx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX ||
-		    params->tx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX) {
-			LOG_ERR("Unsupported RX (%u) or TX (%u) dummy cycles",
-				params->rx_dummy, params->tx_dummy);
-			return -EINVAL;
-		}
-
-		/* Increase usage count additionally to prevent the controller
-		 * from being suspended as long as XIP is active.
-		 */
-		rc = pm_device_runtime_get(dev);
-		if (rc < 0) {
-			LOG_ERR("pm_device_runtime_get() failed: %d", rc);
-			return rc;
-		}
-
-		ctrl.read |= FIELD_PREP(XIP_CTRL_WAIT_CYCLES_MASK,
-					params->rx_dummy);
-		ctrl.write |= FIELD_PREP(XIP_WRITE_CTRL_WAIT_CYCLES_MASK,
-					 params->tx_dummy);
-
-		/* Make sure the baud rate and serial clock phase/polarity
-		 * registers are configured properly. They may not be if
-		 * non-XIP transfers have not been performed yet.
-		 */
-		write_ctrlr0(dev, dev_data->ctrlr0);
-		write_baudr(dev, dev_data->baudr);
-
-		write_xip_incr_inst(dev, params->read_cmd);
-		write_xip_wrap_inst(dev, params->read_cmd);
-		write_xip_ctrl(dev, ctrl.read);
-		write_xip_write_incr_inst(dev, params->write_cmd);
-		write_xip_write_wrap_inst(dev, params->write_cmd);
-		write_xip_write_ctrl(dev, ctrl.write);
-	} else if (dev_data->xip_params_active.read_cmd !=
-		   dev_data->xip_params_stored.read_cmd ||
-		   dev_data->xip_params_active.write_cmd !=
-		   dev_data->xip_params_stored.write_cmd ||
-		   dev_data->xip_params_active.cmd_length !=
-		   dev_data->xip_params_stored.cmd_length ||
-		   dev_data->xip_params_active.addr_length !=
-		   dev_data->xip_params_stored.addr_length ||
-		   dev_data->xip_params_active.rx_dummy !=
-		   dev_data->xip_params_stored.rx_dummy ||
-		   dev_data->xip_params_active.tx_dummy !=
-		   dev_data->xip_params_stored.tx_dummy) {
-		LOG_ERR("Conflict with configuration already used for XIP.");
-		return -EINVAL;
-	}
-
-	rc = vendor_specific_xip_enable(dev, dev_id, cfg);
-	if (rc < 0) {
-		return rc;
-	}
-
-	write_ssienr(dev, SSIENR_SSIC_EN_BIT);
-
-	dev_data->xip_enabled |= BIT(dev_id->dev_idx);
-
-	return 0;
-}
-
-static int api_xip_config(const struct device *dev,
-			  const struct mspi_dev_id *dev_id,
-			  const struct mspi_xip_cfg *cfg)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	int rc, rc2;
-
-	if (cfg->enable && dev_id != dev_data->dev_id) {
-		LOG_ERR("Controller is not configured for this device");
-		return -EINVAL;
-	}
-
-	rc = pm_device_runtime_get(dev);
-	if (rc < 0) {
-		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
-		return rc;
-	}
-
-	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
-
-	rc = _api_xip_config(dev, dev_id, cfg);
-
-	k_sem_give(&dev_data->ctx_lock);
-
-	rc2 = pm_device_runtime_put(dev);
-	if (rc2 < 0) {
-		LOG_ERR("pm_device_runtime_put() failed: %d", rc2);
-		rc = (rc < 0 ? rc : rc2);
-	}
-
-	return rc;
-}
-#endif /* defined(CONFIG_MSPI_XIP) */
-
-static int dev_pm_action_cb(const struct device *dev,
-			    enum pm_device_action action)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-
-	if (action == PM_DEVICE_ACTION_RESUME) {
-#if defined(CONFIG_PINCTRL)
-		const struct mspi_dw_config *dev_config = dev->config;
-		int rc = pinctrl_apply_state(dev_config->pcfg,
-					     PINCTRL_STATE_DEFAULT);
-
-		if (rc < 0) {
-			LOG_ERR("Cannot apply default pins state (%d)", rc);
-			return rc;
-		}
-#endif
-		vendor_specific_resume(dev);
-
-		k_sem_give(&dev_data->ctx_lock);
-
-		return 0;
-	}
-
-	if (IS_ENABLED(CONFIG_PM_DEVICE) &&
-	    action == PM_DEVICE_ACTION_SUSPEND) {
-		bool xip_enabled = COND_CODE_1(CONFIG_MSPI_XIP,
-					       (dev_data->xip_enabled != 0),
-					       (false));
-
-#if defined(CONFIG_PINCTRL)
-		const struct mspi_dw_config *dev_config = dev->config;
-		int rc = pinctrl_apply_state(dev_config->pcfg,
-					     PINCTRL_STATE_SLEEP);
-
-		if (rc < 0) {
-			LOG_ERR("Cannot apply sleep pins state (%d)", rc);
-			return rc;
-		}
-#endif
-		if (xip_enabled ||
-		    k_sem_take(&dev_data->ctx_lock, K_NO_WAIT) != 0) {
-			LOG_ERR("Controller in use, cannot be suspended");
-			return -EBUSY;
-		}
-
-		vendor_specific_suspend(dev);
-
-		return 0;
-	}
-
-	return -ENOTSUP;
-}
-
-static int dev_init(const struct device *dev)
-{
-	struct mspi_dw_data *dev_data = dev->data;
-	const struct mspi_dw_config *dev_config = dev->config;
-	const struct gpio_dt_spec *ce_gpio;
-	int rc;
-
-	DEVICE_MMIO_MAP(dev, K_MEM_CACHE_NONE);
-
-	vendor_specific_init(dev);
-
-	dev_config->irq_config();
-
-	k_sem_init(&dev_data->finished, 0, 1);
-	k_sem_init(&dev_data->cfg_lock, 1, 1);
-	/* This semaphore will be set to 1 after the device is resumed. */
-	k_sem_init(&dev_data->ctx_lock, 0, 1);
-
-	for (ce_gpio = dev_config->ce_gpios;
-	     ce_gpio < &dev_config->ce_gpios[dev_config->ce_gpios_len];
-	     ce_gpio++) {
-		if (!device_is_ready(ce_gpio->port)) {
-			LOG_ERR("CE GPIO port %s is not ready",
-				ce_gpio->port->name);
-			return -ENODEV;
-		}
-
-		rc = gpio_pin_configure_dt(ce_gpio, GPIO_OUTPUT_INACTIVE);
-		if (rc < 0) {
-			return rc;
-		}
-	}
-
-#if defined(CONFIG_PINCTRL)
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		rc = pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
-		if (rc < 0) {
-			LOG_ERR("Cannot apply sleep pins state (%d)", rc);
-			return rc;
-		}
-	}
-#endif
-
-	return pm_device_driver_init(dev, dev_pm_action_cb);
-}
-
-static DEVICE_API(mspi, drv_api) = {
-	.config             = api_config,
-	.dev_config         = api_dev_config,
-	.get_channel_status = api_get_channel_status,
-	.transceive         = api_transceive,
-#if defined(CONFIG_MSPI_XIP)
-	.xip_config         = api_xip_config,
-#endif
-};
-
-#define MSPI_DW_INST_IRQ(idx, inst)					\
-	IRQ_CONNECT(DT_INST_IRQ_BY_IDX(inst, idx, irq),			\
-		    DT_INST_IRQ_BY_IDX(inst, idx, priority),		\
-		    mspi_dw_isr, DEVICE_DT_INST_GET(inst), 0);		\
-	irq_enable(DT_INST_IRQ_BY_IDX(inst, idx, irq))
-
-#define MSPI_DW_MMIO_ROM_INIT(node_id)					\
-	COND_CODE_1(DT_REG_HAS_NAME(node_id, core),			\
-		(Z_DEVICE_MMIO_NAMED_ROM_INITIALIZER(core, node_id)),	\
-		(DEVICE_MMIO_ROM_INIT(node_id)))
-
-#define MSPI_DW_CLOCK_FREQUENCY(inst)					\
-	COND_CODE_1(DT_NODE_HAS_PROP(DT_INST_PHANDLE(inst, clocks),	\
-				     clock_frequency),			\
-		(DT_INST_PROP_BY_PHANDLE(inst, clocks,			\
-					 clock_frequency)),		\
-		(DT_INST_PROP(inst, clock_frequency)))
-
-#define MSPI_DW_DT_INST_PROP(inst, prop) .prop = DT_INST_PROP(inst, prop)
-
-#define FOREACH_CE_GPIOS_ELEM(inst)					\
-	DT_INST_FOREACH_PROP_ELEM_SEP(inst, ce_gpios,			\
-				      GPIO_DT_SPEC_GET_BY_IDX, (,))
-#define MSPI_DW_CE_GPIOS(inst)						\
-	.ce_gpios = (const struct gpio_dt_spec [])			\
-		{ FOREACH_CE_GPIOS_ELEM(inst) },			\
-	.ce_gpios_len = DT_INST_PROP_LEN(inst, ce_gpios)
-
-#define TX_FIFO_DEPTH(inst) DT_INST_PROP(inst, fifo_depth)
-#define RX_FIFO_DEPTH(inst) DT_INST_PROP_OR(inst, rx_fifo_depth,	\
-					    TX_FIFO_DEPTH(inst))
-#define MSPI_DW_FIFO_PROPS(inst)					\
-	.tx_fifo_depth_minus_1 = TX_FIFO_DEPTH(inst) - 1,		\
-	.tx_fifo_threshold =						\
-		DT_INST_PROP_OR(inst, tx_fifo_threshold,		\
-				7 * TX_FIFO_DEPTH(inst) / 8 - 1),	\
-	.rx_fifo_threshold =						\
-		DT_INST_PROP_OR(inst, rx_fifo_threshold,		\
-				1 * RX_FIFO_DEPTH(inst) / 8 - 1)
-
-#define MSPI_DW_INST(inst)						\
-	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);		\
-	IF_ENABLED(CONFIG_PINCTRL, (PINCTRL_DT_INST_DEFINE(inst);))	\
-	static void irq_config##inst(void)				\
-	{								\
-		LISTIFY(DT_INST_NUM_IRQS(inst),				\
-			MSPI_DW_INST_IRQ, (;), inst);			\
-	}								\
-	static struct mspi_dw_data dev##inst##_data;			\
-	static const struct mspi_dw_config dev##inst##_config = {	\
-		MSPI_DW_MMIO_ROM_INIT(DT_DRV_INST(inst)),		\
-		.irq_config = irq_config##inst,				\
-		.clock_frequency = MSPI_DW_CLOCK_FREQUENCY(inst),	\
-	IF_ENABLED(CONFIG_PINCTRL,					\
-		(.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),))	\
-	IF_ENABLED(DT_INST_NODE_HAS_PROP(inst, ce_gpios),		\
-		(MSPI_DW_CE_GPIOS(inst),))				\
-		MSPI_DW_FIFO_PROPS(inst),				\
-		DEFINE_REG_ACCESS(inst)					\
-	};								\
-	DEVICE_DT_INST_DEFINE(inst,					\
-		dev_init, PM_DEVICE_DT_INST_GET(inst),			\
-		&dev##inst##_data, &dev##inst##_config,			\
-		POST_KERNEL, CONFIG_MSPI_INIT_PRIORITY,			\
-		&drv_api);
-
-DT_INST_FOREACH_STATUS_OKAY(MSPI_DW_INST)
diff --git a/drivers/mspi/mspi_dw.h b/drivers/mspi/mspi_dw.h
deleted file mode 100644
index 6f4a2c5a981..00000000000
--- a/drivers/mspi/mspi_dw.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * This file is a part of mspi_dw.c extracted only for clarity.
- * It is not supposed to be included by any file other than mspi_dw.c.
- */
-
-/* CTRLR0 - Control Register 0 */
-#define CTRLR0_SPI_FRF_MASK	GENMASK(23, 22)
-#define CTRLR0_SPI_FRF_STANDARD	0UL
-#define CTRLR0_SPI_FRF_DUAL	1UL
-#define CTRLR0_SPI_FRF_QUAD	2UL
-#define CTRLR0_SPI_FRF_OCTAL	3UL
-#define CTRLR0_TMOD_MASK	GENMASK(11, 10)
-#define CTRLR0_TMOD_TX_RX	0UL
-#define CTRLR0_TMOD_TX		1UL
-#define CTRLR0_TMOD_RX		2UL
-#define CTRLR0_TMOD_EEPROM	3UL
-#define CTRLR0_SCPOL_BIT	BIT(9)
-#define CTRLR0_SCPH_BIT		BIT(8)
-#define CTRLR0_FRF_MASK		GENMASK(7, 6)
-#define CTRLR0_FRF_SPI		0UL
-#define CTRLR0_FRF_SSP		1UL
-#define CTRLR0_FRF_MICROWIRE	2UL
-#define CTRLR0_DFS_MASK		GENMASK(4, 0)
-
-/* CTRLR1- Control Register 1 */
-#define CTRLR1_NDF_MASK		GENMASK(15, 0)
-
-/* SSIENR - SSI Enable Register */
-#define SSIENR_SSIC_EN_BIT	BIT(0)
-
-/* TXFTLR - Transmit FIFO Threshold Level */
-#define TXFTLR_TXFTHR_MASK	GENMASK(23, 16)
-#define TXFTLR_TFT_MASK		GENMASK(7, 0)
-
-/* RXFTLR - Receive FIFO Threshold Level */
-#define RXFTLR_RFT_MASK		GENMASK(7, 0)
-
-/* TXFLR - Transmit FIFO Level Register */
-#define TXFLR_TXTFL_MASK	GENMASK(7, 0)
-
-/* RXFLR - Receive FIFO Level Register */
-#define RXFLR_RXTFL_MASK	GENMASK(7, 0)
-
-/* SR - Status Register */
-#define SR_BUSY_BIT	        BIT(0)
-
-/* IMR - Interrupt Mask Register */
-#define IMR_TXEIM_BIT		BIT(0)
-#define IMR_TXOIM_BIT		BIT(1)
-#define IMR_RXUIM_BIT		BIT(2)
-#define IMR_RXOIM_BIT		BIT(3)
-#define IMR_RXFIM_BIT		BIT(4)
-#define IMR_MSTIM_BIT		BIT(5)
-
-/* ISR - Interrupt Status Register */
-#define ISR_TXEIS_BIT		BIT(0)
-#define ISR_TXOIS_BIT		BIT(1)
-#define ISR_RXUIS_BIT		BIT(2)
-#define ISR_RXOIS_BIT		BIT(3)
-#define ISR_RXFIS_BIT		BIT(4)
-#define ISR_MSTIS_BIT		BIT(5)
-
-/* SPI_CTRLR0 - SPI Control Register */
-#define SPI_CTRLR0_CLK_STRETCH_EN_BIT		BIT(30)
-#define SPI_CTRLR0_XIP_PREFETCH_EN_BIT		BIT(29)
-#define SPI_CTRLR0_XIP_MBL_BIT			BIT(26)
-#define SPI_CTRLR0_SPI_RXDS_SIG_EN_BIT		BIT(25)
-#define SPI_CTRLR0_SPI_DM_EN_BIT		BIT(24)
-#define SPI_CTRLR0_RXDS_VL_EN_BIT		BIT(23)
-#define SPI_CTRLR0_SSIC_XIP_CONT_XFER_EN_BIT	BIT(21)
-#define SPI_CTRLR0_XIP_INST_EN_BIT		BIT(20)
-#define SPI_CTRLR0_XIP_DFS_HC_BIT		BIT(19)
-#define SPI_CTRLR0_SPI_RXDS_EN_BIT		BIT(18)
-#define SPI_CTRLR0_INST_DDR_EN_BIT		BIT(17)
-#define SPI_CTRLR0_SPI_DDR_EN_BIT		BIT(16)
-#define SPI_CTRLR0_WAIT_CYCLES_MASK		GENMASK(15, 11)
-#define SPI_CTRLR0_WAIT_CYCLES_MAX		BIT_MASK(5)
-#define SPI_CTRLR0_INST_L_MASK			GENMASK(9, 8)
-#define SPI_CTRLR0_INST_L0			0UL
-#define SPI_CTRLR0_INST_L4			1UL
-#define SPI_CTRLR0_INST_L8			2UL
-#define SPI_CTRLR0_INST_L16			3UL
-#define SPI_CTRLR0_XIP_MD_BIT_EN_BIT		BIT(7)
-#define SPI_CTRLR0_ADDR_L_MASK			GENMASK(5, 2)
-#define SPI_CTRLR0_TRANS_TYPE_MASK		GENMASK(1, 0)
-#define SPI_CTRLR0_TRANS_TYPE_TT0		0UL
-#define SPI_CTRLR0_TRANS_TYPE_TT1		1UL
-#define SPI_CTRLR0_TRANS_TYPE_TT2		2UL
-#define SPI_CTRLR0_TRANS_TYPE_TT3		3UL
-
-/* XIP_CTRL - XIP Control Register */
-#define XIP_CTRL_XIP_PREFETCH_EN_BIT	BIT(28)
-#define XIP_CTRL_XIP_MBL_MASK		GENMASK(27, 26)
-#define XIP_CTRL_XIP_MBL_2		0UL
-#define XIP_CTRL_XIP_MBL_4		1UL
-#define XIP_CTRL_XIP_MBL_8		2UL
-#define XIP_CTRL_XIP_MBL_16		3UL
-#define XIP_CTRL_RXDS_SIG_EN_BIT	BIT(25)
-#define XIP_CTRL_XIP_HYBERBUS_EN_BIT	BIT(24)
-#define XIP_CTRL_CONT_XFER_EN_BIT	BIT(23)
-#define XIP_CTRL_INST_EN_BIT		BIT(22)
-#define XIP_CTRL_RXDS_EN_BIT		BIT(21)
-#define XIP_CTRL_INST_DDR_EN_BIT	BIT(20)
-#define XIP_CTRL_DDR_EN_BIT		BIT(19)
-#define XIP_CTRL_DFS_HC_BIT		BIT(18)
-#define XIP_CTRL_WAIT_CYCLES_MASK	GENMASK(17, 13)
-#define XIP_CTRL_WAIT_CYCLES_MAX	BIT_MASK(5)
-#define XIP_CTRL_MD_BITS_EN_BIT		BIT(12)
-#define XIP_CTRL_INST_L_MASK		GENMASK(10, 9)
-#define XIP_CTRL_INST_L0		0UL
-#define XIP_CTRL_INST_L4		1UL
-#define XIP_CTRL_INST_L8		2UL
-#define XIP_CTRL_INST_L16		3UL
-#define XIP_CTRL_ADDR_L_MASK		GENMASK(7, 4)
-#define XIP_CTRL_TRANS_TYPE_MASK	GENMASK(3, 2)
-#define XIP_CTRL_TRANS_TYPE_TT0		0UL
-#define XIP_CTRL_TRANS_TYPE_TT1		1UL
-#define XIP_CTRL_TRANS_TYPE_TT2		2UL
-#define XIP_CTRL_FRF_MASK		GENMASK(1, 0)
-#define XIP_CTRL_FRF_DUAL		1UL
-#define XIP_CTRL_FRF_QUAD		2UL
-#define XIP_CTRL_FRF_OCTAL		3UL
-
-/* XIP_CTRL - XIP Control Register */
-#define XIP_CTRL_XIP_PREFETCH_EN_BIT	BIT(28)
-#define XIP_CTRL_XIP_MBL_MASK		GENMASK(27, 26)
-#define XIP_CTRL_XIP_MBL_2		0UL
-#define XIP_CTRL_XIP_MBL_4		1UL
-#define XIP_CTRL_XIP_MBL_8		2UL
-#define XIP_CTRL_XIP_MBL_16		3UL
-#define XIP_CTRL_XIP_HYBERBUS_EN_BIT	BIT(24)
-#define XIP_CTRL_CONT_XFER_EN_BIT	BIT(23)
-#define XIP_CTRL_INST_EN_BIT		BIT(22)
-#define XIP_CTRL_RXDS_EN_BIT		BIT(21)
-#define XIP_CTRL_INST_DDR_EN_BIT	BIT(20)
-#define XIP_CTRL_DDR_EN_BIT		BIT(19)
-#define XIP_CTRL_DFS_HC_BIT		BIT(18)
-
-/* XIP_WRITE_CTRL - XIP Write Control Register */
-#define XIP_WRITE_CTRL_WAIT_CYCLES_MASK	GENMASK(20, 16)
-#define XIP_WRITE_CTRL_WAIT_CYCLES_MAX	BIT_MASK(5)
-#define XIP_WRITE_CTRL_RXDS_SIG_EN_BIT	BIT(13)
-#define XIP_WRITE_CTRL_HYBERBUS_EN_BIT	BIT(12)
-#define XIP_WRITE_CTRL_INST_DDR_EN_BIT	BIT(11)
-#define XIP_WRITE_CTRL_SPI_DDR_EN_BIT	BIT(10)
-#define XIP_WRITE_CTRL_INST_L_MASK	GENMASK(9, 8)
-#define XIP_WRITE_CTRL_INST_L0		0UL
-#define XIP_WRITE_CTRL_INST_L4		1UL
-#define XIP_WRITE_CTRL_INST_L8		2UL
-#define XIP_WRITE_CTRL_INST_L16		3UL
-#define XIP_WRITE_CTRL_ADDR_L_MASK	GENMASK(7, 4)
-#define XIP_WRITE_CTRL_TRANS_TYPE_MASK	GENMASK(3, 2)
-#define XIP_WRITE_CTRL_TRANS_TYPE_TT0	0UL
-#define XIP_WRITE_CTRL_TRANS_TYPE_TT1	1UL
-#define XIP_WRITE_CTRL_TRANS_TYPE_TT2	2UL
-#define XIP_WRITE_CTRL_FRF_MASK		GENMASK(1, 0)
-#define XIP_WRITE_CTRL_FRF_DUAL		1UL
-#define XIP_WRITE_CTRL_FRF_QUAD		2UL
-#define XIP_WRITE_CTRL_FRF_OCTAL	3UL
-
-/* Register access helpers. */
-#define USES_AUX_REG(inst) + DT_INST_PROP(inst, aux_reg_enable)
-#define AUX_REG_INSTANCES (0 DT_INST_FOREACH_STATUS_OKAY(USES_AUX_REG))
-#define BASE_ADDR(dev) (mm_reg_t)DEVICE_MMIO_GET(dev)
-
-#if AUX_REG_INSTANCES != 0
-static uint32_t aux_reg_read(const struct device *dev, uint32_t off)
-{
-	return sys_in32(BASE_ADDR(dev) + off/4);
-}
-static void aux_reg_write(uint32_t data, const struct device *dev, uint32_t off)
-{
-	sys_out32(data, BASE_ADDR(dev) + off/4);
-}
-#endif
-
-#if AUX_REG_INSTANCES != DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT)
-static uint32_t reg_read(const struct device *dev, uint32_t off)
-{
-	return sys_read32(BASE_ADDR(dev) + off);
-}
-static void reg_write(uint32_t data, const struct device *dev, uint32_t off)
-{
-	sys_write32(data, BASE_ADDR(dev) + off);
-}
-#endif
-
-#if AUX_REG_INSTANCES == 0
-/* If no instance uses aux-reg access. */
-#define DECLARE_REG_ACCESS()
-#define DEFINE_REG_ACCESS(inst)
-#define DEFINE_MM_REG_RD(reg, off) \
-	static inline uint32_t read_##reg(const struct device *dev) \
-	{ return reg_read(dev, off); }
-#define DEFINE_MM_REG_WR(reg, off) \
-	static inline void write_##reg(const struct device *dev, uint32_t data) \
-	{ reg_write(data, dev, off); }
-
-#elif AUX_REG_INSTANCES == DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT)
-/* If all instances use aux-reg access. */
-#define DECLARE_REG_ACCESS()
-#define DEFINE_REG_ACCESS(inst)
-#define DEFINE_MM_REG_RD(reg, off) \
-	static inline uint32_t read_##reg(const struct device *dev) \
-	{ return aux_reg_read(dev, off); }
-#define DEFINE_MM_REG_WR(reg, off) \
-	static inline void write_##reg(const struct device *dev, uint32_t data) \
-	{ aux_reg_write(data, dev, off); }
-
-#else
-/* If register access varies by instance. */
-#define DECLARE_REG_ACCESS() \
-	uint32_t (*read)(const struct device *dev, uint32_t off); \
-	void (*write)(uint32_t data, const struct device *dev, uint32_t off)
-#define DEFINE_REG_ACCESS(inst) \
-	COND_CODE_1(DT_INST_PROP(inst, aux_reg_enable), \
-		(.read = aux_reg_read, \
-		.write = aux_reg_write,), \
-		(.read = reg_read, \
-		.write = reg_write,))
-#define DEFINE_MM_REG_RD(reg, off) \
-	static inline uint32_t read_##reg(const struct device *dev) \
-	{ \
-		const struct mspi_dw_config *dev_config = dev->config; \
-		return dev_config->read(dev, off); \
-	}
-#define DEFINE_MM_REG_WR(reg, off) \
-	static inline void write_##reg(const struct device *dev, uint32_t data) \
-	{ \
-		const struct mspi_dw_config *dev_config = dev->config; \
-		dev_config->write(data, dev, off); \
-	}
-#endif
diff --git a/drivers/mspi/mspi_dw_vendor_specific.h b/drivers/mspi/mspi_dw_vendor_specific.h
deleted file mode 100644
index 7255f926fa8..00000000000
--- a/drivers/mspi/mspi_dw_vendor_specific.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * This file is a part of mspi_dw.c extracted only for clarity.
- * It is not supposed to be included by any file other than mspi_dw.c.
- */
-
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
-
-#include <nrf.h>
-
-static void vendor_specific_init(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	NRF_EXMIF->EVENTS_CORE = 0;
-	NRF_EXMIF->INTENSET = BIT(EXMIF_INTENSET_CORE_Pos);
-}
-
-static void vendor_specific_suspend(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	NRF_EXMIF->TASKS_STOP = 1;
-}
-
-static void vendor_specific_resume(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	NRF_EXMIF->TASKS_START = 1;
-}
-
-static void vendor_specific_irq_clear(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	NRF_EXMIF->EVENTS_CORE = 0;
-}
-
-#if defined(CONFIG_MSPI_XIP)
-static int vendor_specific_xip_enable(const struct device *dev,
-				      const struct mspi_dev_id *dev_id,
-				      const struct mspi_xip_cfg *cfg)
-{
-	ARG_UNUSED(dev);
-
-	if (dev_id->dev_idx == 0) {
-		NRF_EXMIF->EXTCONF1.OFFSET = cfg->address_offset;
-		NRF_EXMIF->EXTCONF1.SIZE = cfg->address_offset
-					 + cfg->size - 1;
-		NRF_EXMIF->EXTCONF1.ENABLE = 1;
-	} else if (dev_id->dev_idx == 1) {
-		NRF_EXMIF->EXTCONF2.OFFSET = cfg->address_offset;
-		NRF_EXMIF->EXTCONF2.SIZE = cfg->address_offset
-					 + cfg->size - 1;
-		NRF_EXMIF->EXTCONF2.ENABLE = 1;
-	} else {
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-static int vendor_specific_xip_disable(const struct device *dev,
-				       const struct mspi_dev_id *dev_id,
-				       const struct mspi_xip_cfg *cfg)
-{
-	ARG_UNUSED(dev);
-
-	if (dev_id->dev_idx == 0) {
-		NRF_EXMIF->EXTCONF1.ENABLE = 0;
-	} else if (dev_id->dev_idx == 1) {
-		NRF_EXMIF->EXTCONF2.ENABLE = 0;
-	} else {
-		return -EINVAL;
-	}
-
-	return 0;
-}
-#endif /* defined(CONFIG_MSPI_XIP) */
-
-#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) */
diff --git a/dts/bindings/mspi/snps,designware-ssi.yaml b/dts/bindings/mspi/snps,designware-ssi.yaml
deleted file mode 100644
index fb516cb7835..00000000000
--- a/dts/bindings/mspi/snps,designware-ssi.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: Synopsys DesignWare Synchronous Serial Interface (SSI) node
-
-compatible: "snps,designware-ssi"
-
-include: [mspi-controller.yaml, pinctrl-device.yaml]
-
-properties:
-  reg:
-    required: true
-
-  interrupts:
-    required: true
-
-  aux-reg-enable:
-    type: boolean
-    description: |
-      Activates auxiliary register access that is needed on some platforms.
-
-  fifo-depth:
-    required: true
-    type: int
-    description: |
-      Number of items that can be stored in the TX FIFO. Range: 8-256.
-      If the RX FIFO depth is not specified separately in the rx-fifo-depth
-      property, this value specifies depth of both TX and RX FIFOs.
-
-  rx-fifo-depth:
-    type: int
-    description: |
-      Number of items that can be stored in the RX FIFO. Range: 8-256.
-
-  tx-fifo-threshold:
-    type: int
-    description: |
-      Number of entries in the TX FIFO above which the TX transfer is started.
-      Maximum value is the TX FIFO depth - 1.
-
-  rx-fifo-threshold:
-    type: int
-    description: |
-      Number of entries in the RX FIFO above which the controller gets an RX
-      interrupt. Maximum value is the RX FIFO depth - 1.

From b36fdd85423dabc750f974862c7fa511e1403122 Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Mon, 10 Mar 2025 15:18:15 +0100
Subject: [PATCH 2555/2913] Revert "[nrf noup] entropy: Add fake entropy nRF
 PRNG driver"

This reverts commit ac886cc886287031e90ec7a35f59c2205cb95265.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts |   6 --
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts |   5 -
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts  |   6 --
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts  |   5 -
 drivers/entropy/CMakeLists.txt                |   7 --
 drivers/entropy/Kconfig                       |   1 -
 drivers/entropy/Kconfig.nrf_prng              |  19 ----
 drivers/entropy/fake_entropy_nrf_prng.c       | 101 ------------------
 dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi      |   9 --
 dts/bindings/rng/nordic,nrf-prng.yaml         |   8 --
 10 files changed, 167 deletions(-)
 delete mode 100644 drivers/entropy/Kconfig.nrf_prng
 delete mode 100644 drivers/entropy/fake_entropy_nrf_prng.c
 delete mode 100644 dts/bindings/rng/nordic,nrf-prng.yaml

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 05d62c1057f..95d557bf944 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -26,7 +26,6 @@
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,canbus = &can120;
-		zephyr,entropy = &prng;
 	};
 
 	aliases {
@@ -107,11 +106,6 @@
 			pwms = <&pwm130 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
 		};
 	};
-
-	prng: prng {
-		compatible = "nordic,entropy-prng";
-		status = "okay";
-	};
 };
 
 &cpuapp_ram0x_region {
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
index 8734ff9f745..49ca847873f 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
@@ -27,11 +27,6 @@
 		zephyr,ieee802154 = &cpurad_ieee802154;
 		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
-		zephyr,entropy = &prng;
-	};
-	prng: prng {
-		compatible = "nordic,entropy-prng";
-		status = "okay";
 	};
 	aliases {
 		ipc-to-cpusys = &cpurad_cpusys_ipc;
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index 3e16e45803f..a380ac7473a 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -28,7 +28,6 @@
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,canbus = &can120;
-		zephyr,entropy = &prng;
 	};
 
 	aliases {
@@ -109,11 +108,6 @@
 			pwms = <&pwm130 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
 		};
 	};
-
-	prng: prng {
-		compatible = "nordic,entropy-prng";
-		status = "okay";
-	};
 };
 
 &cpuapp_ram0x_region {
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
index f1f3af54132..f9bfae09897 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
@@ -28,11 +28,6 @@
 		zephyr,ieee802154 = &cpurad_ieee802154;
 		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
-		zephyr,entropy = &prng;
-	};
-	prng: prng {
-		compatible = "nordic,entropy-prng";
-		status = "okay";
 	};
 	aliases {
 		ipc-to-cpusys = &cpurad_cpusys_ipc;
diff --git a/drivers/entropy/CMakeLists.txt b/drivers/entropy/CMakeLists.txt
index e23b558a6a9..d5588378f6f 100644
--- a/drivers/entropy/CMakeLists.txt
+++ b/drivers/entropy/CMakeLists.txt
@@ -36,11 +36,4 @@ zephyr_library_sources_ifdef(CONFIG_ENTROPY_NPCX_DRBG       entropy_npcx_drbg.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_MAX32_TRNG      entropy_max32.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_RENESAS_RA      entropy_renesas_ra.c)
 
-if (CONFIG_FAKE_ENTROPY_NRF_PRNG)
-  zephyr_library_sources(fake_entropy_nrf_prng.c)
-
-  message(WARNING "\nA nRF PRNG is used, which does not produce real random bits."
-  "This is not secure and should therefore never be used in a product.")
-endif()
-
 zephyr_library_link_libraries_ifdef(CONFIG_BUILD_WITH_TFM tfm_api)
diff --git a/drivers/entropy/Kconfig b/drivers/entropy/Kconfig
index 40571df47f1..debd0f8d7a1 100644
--- a/drivers/entropy/Kconfig
+++ b/drivers/entropy/Kconfig
@@ -38,7 +38,6 @@ source "drivers/entropy/Kconfig.psa_crypto"
 source "drivers/entropy/Kconfig.npcx"
 source "drivers/entropy/Kconfig.max32"
 source "drivers/entropy/Kconfig.renesas_ra"
-source "drivers/entropy/Kconfig.nrf_prng"
 
 config ENTROPY_HAS_DRIVER
 	bool
diff --git a/drivers/entropy/Kconfig.nrf_prng b/drivers/entropy/Kconfig.nrf_prng
deleted file mode 100644
index e81db4de4b1..00000000000
--- a/drivers/entropy/Kconfig.nrf_prng
+++ /dev/null
@@ -1,19 +0,0 @@
-# nRF fake entropy prng generator driver configuration
-
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if ENTROPY_GENERATOR
-
-config FAKE_ENTROPY_NRF_PRNG
-	bool "A fake nRF entropy driver"
-	default y
-	depends on DT_HAS_NORDIC_ENTROPY_PRNG_ENABLED
-	depends on (SOC_SERIES_NRF54HX || SOC_SERIES_NRF92X || SOC_SERIES_NRF54LX)
-	select ENTROPY_HAS_DRIVER
-	help
-	  This is a super simple PRNG driver that can be used on nRF platforms that
-	  do not have an entropy source.
-	  This is NOT SAFE to use for cryptographic operations!
-
-endif
diff --git a/drivers/entropy/fake_entropy_nrf_prng.c b/drivers/entropy/fake_entropy_nrf_prng.c
deleted file mode 100644
index 8624c844405..00000000000
--- a/drivers/entropy/fake_entropy_nrf_prng.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/init.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <zephyr/drivers/entropy.h>
-
-#define DT_DRV_COMPAT nordic_entropy_prng
-
-/* This file implements a pseudo-RNG
- * https://vigna.di.unimi.it/xorshift/xoshiro128plus.c
- */
-
-static uint32_t s[4];
-
-static inline uint32_t rotl(const uint32_t x, int k)
-{
-	return (x << k) | (x >> (32 - k));
-}
-
-static uint32_t rng_next(void)
-{
-	const uint32_t result = rotl(s[0] + s[3], 7) + s[0];
-
-	const uint32_t t = s[1] << 9;
-
-	s[2] ^= s[0];
-	s[3] ^= s[1];
-	s[1] ^= s[2];
-	s[0] ^= s[3];
-
-	s[2] ^= t;
-
-	s[3] = rotl(s[3], 11);
-
-	return result;
-}
-
-static int entropy_prng_get_entropy(const struct device *dev, uint8_t *buffer, uint16_t length)
-{
-	ARG_UNUSED(dev);
-
-	while (length) {
-		/*
-		 * Note that only 1 thread (Zephyr thread or HW models), runs at
-		 * a time, therefore there is no need to use random_r()
-		 */
-		uint32_t value = rng_next();
-
-		size_t to_copy = MIN(length, sizeof(long));
-
-		memcpy(buffer, &value, to_copy);
-		buffer += to_copy;
-		length -= to_copy;
-	}
-
-	return 0;
-}
-
-static int entropy_prng_get_entropy_isr(const struct device *dev, uint8_t *buf, uint16_t len,
-					uint32_t flags)
-{
-	ARG_UNUSED(flags);
-
-	int err;
-
-	/*
-	 * entropy_prng_get_entropy() is also safe for ISRs
-	 * and always produces data.
-	 */
-	err = entropy_prng_get_entropy(dev, buf, len);
-	if (err < 0) {
-		return err;
-	} else {
-		return len;
-	}
-}
-
-static int entropy_prng_init(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	/* Picked some arbitrary initial seed. */
-	s[0] = 0xAF568BC0;
-	s[1] = 0xAC34307E;
-	s[2] = 0x9B7F6DD1;
-	s[3] = 0xD84319FC;
-	return 0;
-}
-
-static const struct entropy_driver_api entropy_prng_api_funcs = {
-	.get_entropy = entropy_prng_get_entropy, .get_entropy_isr = entropy_prng_get_entropy_isr};
-
-DEVICE_DT_INST_DEFINE(0, entropy_prng_init, NULL, NULL, NULL, PRE_KERNEL_1,
-		      CONFIG_ENTROPY_INIT_PRIORITY, &entropy_prng_api_funcs);
diff --git a/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi b/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
index 5c7e5db3001..2df3fc59676 100644
--- a/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
@@ -16,10 +16,6 @@ nvic: &cpuapp_nvic {};
 /delete-node/ &cpuflpr_clic;
 
 / {
-	chosen {
-		zephyr,entropy = &prng;
-	};
-
 	soc {
 		compatible = "simple-bus";
 		interrupt-parent = <&cpuapp_nvic>;
@@ -30,11 +26,6 @@ nvic: &cpuapp_nvic {};
 		compatible = "zephyr,psa-crypto-rng";
 		status = "disabled";
 	};
-
-	prng: prng {
-		compatible = "nordic,entropy-prng";
-		status = "okay";
-	};
 };
 
 &cpuflpr_vpr {
diff --git a/dts/bindings/rng/nordic,nrf-prng.yaml b/dts/bindings/rng/nordic,nrf-prng.yaml
deleted file mode 100644
index 8936393a0b6..00000000000
--- a/dts/bindings/rng/nordic,nrf-prng.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
-
-description: This is a super simple PRNG
-
-compatible: "nordic,entropy-prng"
-
-include: base.yaml

From 9180bd0259fb4b8af9396ff5550a333e39701aa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 17 Oct 2024 14:22:45 +0200
Subject: [PATCH 2556/2913] [nrf fromtree] drivers: mspi: Add driver for
 DesignWare SSI based controllers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a generic driver for MSPI controllers based on the DesignWare
SSI core. With small vendor-specific adaptations covering integration
details, it should be possible to use the driver for various devices.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit b31eeb6c6e79f3418f8cf9b19558aa06a6d58a09)
---
 drivers/mspi/CMakeLists.txt                |    1 +
 drivers/mspi/Kconfig                       |    1 +
 drivers/mspi/Kconfig.dw                    |    9 +
 drivers/mspi/mspi_dw.c                     | 1374 ++++++++++++++++++++
 drivers/mspi/mspi_dw.h                     |  239 ++++
 drivers/mspi/mspi_dw_vendor_specific.h     |   88 ++
 dts/bindings/mspi/snps,designware-ssi.yaml |   45 +
 7 files changed, 1757 insertions(+)
 create mode 100644 drivers/mspi/Kconfig.dw
 create mode 100644 drivers/mspi/mspi_dw.c
 create mode 100644 drivers/mspi/mspi_dw.h
 create mode 100644 drivers/mspi/mspi_dw_vendor_specific.h
 create mode 100644 dts/bindings/mspi/snps,designware-ssi.yaml

diff --git a/drivers/mspi/CMakeLists.txt b/drivers/mspi/CMakeLists.txt
index f248cb0b533..78f704393f4 100644
--- a/drivers/mspi/CMakeLists.txt
+++ b/drivers/mspi/CMakeLists.txt
@@ -4,4 +4,5 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/mspi.h)
 
 zephyr_library()
 zephyr_library_sources_ifdef(CONFIG_MSPI_AMBIQ_AP3   mspi_ambiq_ap3.c)
+zephyr_library_sources_ifdef(CONFIG_MSPI_DW          mspi_dw.c)
 zephyr_library_sources_ifdef(CONFIG_MSPI_EMUL        mspi_emul.c)
diff --git a/drivers/mspi/Kconfig b/drivers/mspi/Kconfig
index 0adb2a34393..269d8d16f04 100644
--- a/drivers/mspi/Kconfig
+++ b/drivers/mspi/Kconfig
@@ -60,6 +60,7 @@ module-str = mspi
 source "subsys/logging/Kconfig.template.log_config"
 
 source "drivers/mspi/Kconfig.ambiq"
+source "drivers/mspi/Kconfig.dw"
 source "drivers/mspi/Kconfig.mspi_emul"
 
 endif # MSPI
diff --git a/drivers/mspi/Kconfig.dw b/drivers/mspi/Kconfig.dw
new file mode 100644
index 00000000000..1ab82da0e85
--- /dev/null
+++ b/drivers/mspi/Kconfig.dw
@@ -0,0 +1,9 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config MSPI_DW
+	bool "DesignWare SSI controller driver"
+	default y
+	depends on DT_HAS_SNPS_DESIGNWARE_SSI_ENABLED
+	select PINCTRL if $(dt_compat_any_has_prop,$(DT_COMPAT_SNPS_DESIGNWARE_SSI),pinctrl-0)
+	imply MSPI_XIP
diff --git a/drivers/mspi/mspi_dw.c b/drivers/mspi/mspi_dw.c
new file mode 100644
index 00000000000..39cf463f4be
--- /dev/null
+++ b/drivers/mspi/mspi_dw.c
@@ -0,0 +1,1374 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT snps_designware_ssi
+
+#include <zephyr/drivers/mspi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+
+#include "mspi_dw.h"
+#include "mspi_dw_vendor_specific.h"
+
+LOG_MODULE_REGISTER(mspi_dw, CONFIG_MSPI_LOG_LEVEL);
+
+#define DUMMY_BYTE 0xAA
+
+#if defined(CONFIG_MSPI_XIP)
+struct xip_params {
+	uint32_t read_cmd;
+	uint32_t write_cmd;
+	uint16_t rx_dummy;
+	uint16_t tx_dummy;
+	uint8_t cmd_length;
+	uint8_t addr_length;
+	enum mspi_io_mode io_mode;
+};
+
+struct xip_ctrl {
+	uint32_t read;
+	uint32_t write;
+};
+#endif
+
+struct mspi_dw_data {
+	const struct mspi_dev_id *dev_id;
+	uint32_t packets_done;
+	uint8_t *buf_pos;
+	const uint8_t *buf_end;
+
+	uint32_t ctrlr0;
+	uint32_t spi_ctrlr0;
+	uint32_t baudr;
+
+#if defined(CONFIG_MSPI_XIP)
+	uint32_t xip_freq;
+	struct xip_params xip_params_stored;
+	struct xip_params xip_params_active;
+	uint16_t xip_enabled;
+	enum mspi_cpp_mode xip_cpp;
+#endif
+
+	uint16_t dummy_bytes;
+	uint8_t bytes_to_discard;
+	uint8_t bytes_per_frame_exp;
+	bool standard_spi;
+	bool suspended;
+
+	struct k_sem finished;
+	/* For synchronization of API calls made from different contexts. */
+	struct k_sem ctx_lock;
+	/* For locking of controller configuration. */
+	struct k_sem cfg_lock;
+	struct mspi_xfer xfer;
+};
+
+struct mspi_dw_config {
+	DEVICE_MMIO_ROM;
+	void (*irq_config)(void);
+	uint32_t clock_frequency;
+#if defined(CONFIG_PINCTRL)
+	const struct pinctrl_dev_config *pcfg;
+#endif
+	const struct gpio_dt_spec *ce_gpios;
+	uint8_t ce_gpios_len;
+	uint8_t tx_fifo_depth_minus_1;
+	uint8_t tx_fifo_threshold;
+	uint8_t rx_fifo_threshold;
+	DECLARE_REG_ACCESS();
+	bool sw_multi_periph;
+};
+
+/* Register access helpers. */
+#define DEFINE_MM_REG_RD_WR(reg, off) \
+	DEFINE_MM_REG_RD(reg, off) \
+	DEFINE_MM_REG_WR(reg, off)
+
+DEFINE_MM_REG_WR(ctrlr0,	0x00)
+DEFINE_MM_REG_WR(ctrlr1,	0x04)
+DEFINE_MM_REG_WR(ssienr,	0x08)
+DEFINE_MM_REG_WR(ser,		0x10)
+DEFINE_MM_REG_WR(baudr,		0x14)
+DEFINE_MM_REG_RD_WR(txftlr,	0x18)
+DEFINE_MM_REG_RD_WR(rxftlr,	0x1c)
+DEFINE_MM_REG_RD(txflr,		0x20)
+DEFINE_MM_REG_RD(rxflr,		0x24)
+DEFINE_MM_REG_RD(sr,		0x28)
+DEFINE_MM_REG_WR(imr,		0x2c)
+DEFINE_MM_REG_RD(isr,		0x30)
+DEFINE_MM_REG_RD_WR(dr,		0x60)
+DEFINE_MM_REG_WR(spi_ctrlr0,	0xf4)
+
+#if defined(CONFIG_MSPI_XIP)
+DEFINE_MM_REG_WR(xip_incr_inst,		0x100)
+DEFINE_MM_REG_WR(xip_wrap_inst,		0x104)
+DEFINE_MM_REG_WR(xip_ctrl,		0x108)
+DEFINE_MM_REG_WR(xip_write_incr_inst,	0x140)
+DEFINE_MM_REG_WR(xip_write_wrap_inst,	0x144)
+DEFINE_MM_REG_WR(xip_write_ctrl,	0x148)
+#endif
+
+static void tx_data(const struct device *dev,
+		    const struct mspi_xfer_packet *packet)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_dw_config *dev_config = dev->config;
+	const uint8_t *buf_pos = dev_data->buf_pos;
+	const uint8_t *buf_end = dev_data->buf_end;
+	/* When the function is called, it is known that at least one item
+	 * can be written to the FIFO. The loop below writes to the FIFO
+	 * the number of items that is known to fit and then updates that
+	 * number basing on the actual FIFO level (because some data may get
+	 * sent while the FIFO is written; especially for high frequencies
+	 * this may often occur) and continues until the FIFO is filled up
+	 * or the buffer end is reached.
+	 */
+	uint32_t room = 1;
+	uint8_t bytes_per_frame_exp = dev_data->bytes_per_frame_exp;
+	uint8_t tx_fifo_depth = dev_config->tx_fifo_depth_minus_1 + 1;
+	uint32_t data;
+
+	do {
+		if (bytes_per_frame_exp == 2) {
+			data = sys_get_be32(buf_pos);
+			buf_pos += 4;
+		} else if (bytes_per_frame_exp == 1) {
+			data = sys_get_be16(buf_pos);
+			buf_pos += 2;
+		} else {
+			data = *buf_pos;
+			buf_pos += 1;
+		}
+		write_dr(dev, data);
+
+		if (buf_pos >= buf_end) {
+			write_txftlr(dev, 0);
+			break;
+		}
+
+		if (--room == 0) {
+			room = tx_fifo_depth
+			     - FIELD_GET(TXFLR_TXTFL_MASK, read_txflr(dev));
+		}
+	} while (room);
+
+	dev_data->buf_pos = (uint8_t *)buf_pos;
+}
+
+static bool make_rx_cycles(const struct device *dev)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_dw_config *dev_config = dev->config;
+	uint16_t dummy_bytes = dev_data->dummy_bytes;
+	/* See tx_data(). */
+	uint32_t room = 1;
+	uint8_t tx_fifo_depth = dev_config->tx_fifo_depth_minus_1 + 1;
+
+	do {
+		write_dr(dev, DUMMY_BYTE);
+
+		--dummy_bytes;
+		if (!dummy_bytes) {
+			dev_data->dummy_bytes = 0;
+			return true;
+		}
+
+		if (--room == 0) {
+			room = tx_fifo_depth
+			     - FIELD_GET(TXFLR_TXTFL_MASK, read_txflr(dev));
+		}
+	} while (room);
+
+	dev_data->dummy_bytes = dummy_bytes;
+	return false;
+}
+
+static void read_rx_fifo(const struct device *dev,
+			 const struct mspi_xfer_packet *packet)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_dw_config *dev_config = dev->config;
+	uint8_t bytes_to_discard = dev_data->bytes_to_discard;
+	uint8_t *buf_pos = dev_data->buf_pos;
+	const uint8_t *buf_end = &packet->data_buf[packet->num_bytes];
+	uint8_t bytes_per_frame_exp = dev_data->bytes_per_frame_exp;
+	/* See `room` in tx_data(). */
+	uint32_t in_fifo = 1;
+	uint32_t remaining_frames;
+
+	do {
+		uint32_t data = read_dr(dev);
+
+		if (bytes_to_discard) {
+			--bytes_to_discard;
+		} else {
+			if (bytes_per_frame_exp == 2) {
+				sys_put_be32(data, buf_pos);
+				buf_pos += 4;
+			} else if (bytes_per_frame_exp == 1) {
+				sys_put_be16(data, buf_pos);
+				buf_pos += 2;
+			} else {
+				*buf_pos = (uint8_t)data;
+				buf_pos += 1;
+			}
+
+			if (buf_pos >= buf_end) {
+				dev_data->bytes_to_discard = bytes_to_discard;
+				dev_data->buf_pos = buf_pos;
+				return;
+			}
+		}
+
+		if (--in_fifo == 0) {
+			in_fifo = FIELD_GET(RXFLR_RXTFL_MASK, read_rxflr(dev));
+		}
+	} while (in_fifo);
+
+	remaining_frames = (bytes_to_discard + buf_end - buf_pos)
+			   >> bytes_per_frame_exp;
+	if (remaining_frames - 1 < dev_config->rx_fifo_threshold) {
+		write_rxftlr(dev, remaining_frames - 1);
+	}
+
+	dev_data->bytes_to_discard = bytes_to_discard;
+	dev_data->buf_pos = buf_pos;
+}
+
+static void mspi_dw_isr(const struct device *dev)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_xfer_packet *packet =
+		&dev_data->xfer.packets[dev_data->packets_done];
+	uint32_t int_status = read_isr(dev);
+
+	if (int_status & ISR_RXFIS_BIT) {
+		read_rx_fifo(dev, packet);
+	}
+
+	if (dev_data->buf_pos >= dev_data->buf_end) {
+		write_imr(dev, 0);
+		/* It may happen that at this point the controller is still
+		 * shifting out the last frame (the last interrupt occurs when
+		 * the TX FIFO is empty). Wait if it signals that it is busy.
+		 */
+		while (read_sr(dev) & SR_BUSY_BIT) {
+		}
+
+		k_sem_give(&dev_data->finished);
+	} else {
+		if (int_status & ISR_TXEIS_BIT) {
+			if (dev_data->dummy_bytes) {
+				if (make_rx_cycles(dev)) {
+					write_imr(dev, IMR_RXFIM_BIT);
+				}
+			} else {
+				tx_data(dev, packet);
+			}
+		}
+	}
+
+	vendor_specific_irq_clear(dev);
+}
+
+static int api_config(const struct mspi_dt_spec *spec)
+{
+	ARG_UNUSED(spec);
+
+	return -ENOTSUP;
+}
+
+static bool apply_io_mode(struct mspi_dw_data *dev_data,
+			  enum mspi_io_mode io_mode)
+{
+	dev_data->ctrlr0 &= ~CTRLR0_SPI_FRF_MASK;
+	dev_data->spi_ctrlr0 &= ~SPI_CTRLR0_TRANS_TYPE_MASK;
+
+	/* Frame format used for transferring data. */
+
+	if (io_mode == MSPI_IO_MODE_SINGLE) {
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
+					       CTRLR0_SPI_FRF_STANDARD);
+		dev_data->standard_spi = true;
+		return true;
+	}
+
+	dev_data->standard_spi = false;
+
+	switch (io_mode) {
+	case MSPI_IO_MODE_DUAL:
+	case MSPI_IO_MODE_DUAL_1_1_2:
+	case MSPI_IO_MODE_DUAL_1_2_2:
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
+					       CTRLR0_SPI_FRF_DUAL);
+		break;
+	case MSPI_IO_MODE_QUAD:
+	case MSPI_IO_MODE_QUAD_1_1_4:
+	case MSPI_IO_MODE_QUAD_1_4_4:
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
+					       CTRLR0_SPI_FRF_QUAD);
+		break;
+	case MSPI_IO_MODE_OCTAL:
+	case MSPI_IO_MODE_OCTAL_1_1_8:
+	case MSPI_IO_MODE_OCTAL_1_8_8:
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
+					       CTRLR0_SPI_FRF_OCTAL);
+		break;
+	default:
+		LOG_ERR("IO mode %d not supported", io_mode);
+		return false;
+	}
+
+	/* Transfer format used for Address and Instruction: */
+
+	switch (io_mode) {
+	case MSPI_IO_MODE_DUAL_1_1_2:
+	case MSPI_IO_MODE_QUAD_1_1_4:
+	case MSPI_IO_MODE_OCTAL_1_1_8:
+		/* - both sent in Standard SPI mode */
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_TRANS_TYPE_MASK,
+						   SPI_CTRLR0_TRANS_TYPE_TT0);
+		break;
+	case MSPI_IO_MODE_DUAL_1_2_2:
+	case MSPI_IO_MODE_QUAD_1_4_4:
+	case MSPI_IO_MODE_OCTAL_1_8_8:
+		/* - Instruction sent in Standard SPI mode,
+		 *   Address sent the same way as data
+		 */
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_TRANS_TYPE_MASK,
+						   SPI_CTRLR0_TRANS_TYPE_TT1);
+		break;
+	default:
+		/* - both sent the same way as data. */
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_TRANS_TYPE_MASK,
+						   SPI_CTRLR0_TRANS_TYPE_TT2);
+		break;
+	}
+
+	return true;
+}
+
+static bool apply_cmd_length(struct mspi_dw_data *dev_data, uint32_t cmd_length)
+{
+	switch (cmd_length) {
+	case 0:
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_INST_L_MASK,
+						   SPI_CTRLR0_INST_L0);
+		break;
+	case 1:
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_INST_L_MASK,
+						   SPI_CTRLR0_INST_L8);
+		break;
+	case 2:
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_INST_L_MASK,
+						   SPI_CTRLR0_INST_L16);
+		break;
+	default:
+		LOG_ERR("Command length %d not supported", cmd_length);
+		return false;
+	}
+
+	return true;
+}
+
+static bool apply_addr_length(struct mspi_dw_data *dev_data,
+			      uint32_t addr_length)
+{
+	dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_ADDR_L_MASK,
+					   addr_length * 2);
+
+	return true;
+}
+
+#if defined(CONFIG_MSPI_XIP)
+static bool apply_xip_io_mode(const struct mspi_dw_data *dev_data,
+			      struct xip_ctrl *ctrl)
+{
+	enum mspi_io_mode io_mode = dev_data->xip_params_active.io_mode;
+
+	/* Frame format used for transferring data. */
+
+	if (io_mode == MSPI_IO_MODE_SINGLE) {
+		LOG_ERR("XIP not available in single line mode");
+		return false;
+	}
+
+	switch (io_mode) {
+	case MSPI_IO_MODE_DUAL:
+	case MSPI_IO_MODE_DUAL_1_1_2:
+	case MSPI_IO_MODE_DUAL_1_2_2:
+		ctrl->read |= FIELD_PREP(XIP_CTRL_FRF_MASK,
+					 XIP_CTRL_FRF_DUAL);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_FRF_MASK,
+					  XIP_WRITE_CTRL_FRF_DUAL);
+		break;
+	case MSPI_IO_MODE_QUAD:
+	case MSPI_IO_MODE_QUAD_1_1_4:
+	case MSPI_IO_MODE_QUAD_1_4_4:
+		ctrl->read |= FIELD_PREP(XIP_CTRL_FRF_MASK,
+					 XIP_CTRL_FRF_QUAD);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_FRF_MASK,
+					  XIP_WRITE_CTRL_FRF_QUAD);
+		break;
+	case MSPI_IO_MODE_OCTAL:
+	case MSPI_IO_MODE_OCTAL_1_1_8:
+	case MSPI_IO_MODE_OCTAL_1_8_8:
+		ctrl->read |= FIELD_PREP(XIP_CTRL_FRF_MASK,
+					 XIP_CTRL_FRF_OCTAL);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_FRF_MASK,
+					  XIP_WRITE_CTRL_FRF_OCTAL);
+		break;
+	default:
+		LOG_ERR("IO mode %d not supported", io_mode);
+		return false;
+	}
+
+	/* Transfer format used for Address and Instruction: */
+
+	switch (io_mode) {
+	case MSPI_IO_MODE_DUAL_1_1_2:
+	case MSPI_IO_MODE_QUAD_1_1_4:
+	case MSPI_IO_MODE_OCTAL_1_1_8:
+		/* - both sent in Standard SPI mode */
+		ctrl->read |= FIELD_PREP(XIP_CTRL_TRANS_TYPE_MASK,
+					 XIP_CTRL_TRANS_TYPE_TT0);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_TRANS_TYPE_MASK,
+					  XIP_WRITE_CTRL_TRANS_TYPE_TT0);
+		break;
+	case MSPI_IO_MODE_DUAL_1_2_2:
+	case MSPI_IO_MODE_QUAD_1_4_4:
+	case MSPI_IO_MODE_OCTAL_1_8_8:
+		/* - Instruction sent in Standard SPI mode,
+		 *   Address sent the same way as data
+		 */
+		ctrl->read |= FIELD_PREP(XIP_CTRL_TRANS_TYPE_MASK,
+					 XIP_CTRL_TRANS_TYPE_TT1);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_TRANS_TYPE_MASK,
+					  XIP_WRITE_CTRL_TRANS_TYPE_TT1);
+		break;
+	default:
+		/* - both sent the same way as data. */
+		ctrl->read |= FIELD_PREP(XIP_CTRL_TRANS_TYPE_MASK,
+					 XIP_CTRL_TRANS_TYPE_TT2);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_TRANS_TYPE_MASK,
+					  XIP_WRITE_CTRL_TRANS_TYPE_TT2);
+		break;
+	}
+
+	return true;
+}
+
+static bool apply_xip_cmd_length(const struct mspi_dw_data *dev_data,
+				 struct xip_ctrl *ctrl)
+{
+	uint8_t cmd_length = dev_data->xip_params_active.cmd_length;
+
+	switch (cmd_length) {
+	case 0:
+		ctrl->read |= FIELD_PREP(XIP_CTRL_INST_L_MASK,
+					 XIP_CTRL_INST_L0);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_INST_L_MASK,
+					  XIP_WRITE_CTRL_INST_L0);
+		break;
+	case 1:
+		ctrl->read |= XIP_CTRL_INST_EN_BIT
+			   |  FIELD_PREP(XIP_CTRL_INST_L_MASK,
+					 XIP_CTRL_INST_L8);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_INST_L_MASK,
+					  XIP_WRITE_CTRL_INST_L8);
+		break;
+	case 2:
+		ctrl->read |= XIP_CTRL_INST_EN_BIT
+			   |  FIELD_PREP(XIP_CTRL_INST_L_MASK,
+					 XIP_CTRL_INST_L16);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_INST_L_MASK,
+					  XIP_WRITE_CTRL_INST_L16);
+		break;
+	default:
+		LOG_ERR("Command length %d not supported", cmd_length);
+		return false;
+	}
+
+	return true;
+}
+
+static bool apply_xip_addr_length(const struct mspi_dw_data *dev_data,
+				  struct xip_ctrl *ctrl)
+{
+	uint8_t addr_length = dev_data->xip_params_active.addr_length;
+
+	ctrl->read |= FIELD_PREP(XIP_CTRL_ADDR_L_MASK, addr_length * 2);
+	ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_ADDR_L_MASK, addr_length * 2);
+
+	return true;
+}
+#endif /* defined(CONFIG_MSPI_XIP) */
+
+static int _api_dev_config(const struct device *dev,
+			   const enum mspi_dev_cfg_mask param_mask,
+			   const struct mspi_dev_cfg *cfg)
+{
+	const struct mspi_dw_config *dev_config = dev->config;
+	struct mspi_dw_data *dev_data = dev->data;
+
+	if (param_mask & MSPI_DEVICE_CONFIG_ENDIAN) {
+		if (cfg->endian != MSPI_XFER_BIG_ENDIAN) {
+			LOG_ERR("Only big endian transfers are supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_CE_POL) {
+		if (cfg->ce_polarity != MSPI_CE_ACTIVE_LOW) {
+			LOG_ERR("Only active low CE is supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_MEM_BOUND) {
+		if (cfg->mem_boundary) {
+			LOG_ERR("Auto CE break is not supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_BREAK_TIME) {
+		if (cfg->time_to_break) {
+			LOG_ERR("Auto CE break is not supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_IO_MODE) {
+#if defined(CONFIG_MSPI_XIP)
+		dev_data->xip_params_stored.io_mode = cfg->io_mode;
+#endif
+
+		if (!apply_io_mode(dev_data, cfg->io_mode)) {
+			return -EINVAL;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_CPP) {
+#if defined(CONFIG_MSPI_XIP)
+		/* Make sure the new setting is compatible with the one used
+		 * for XIP if it is enabled.
+		 */
+		if (!dev_data->xip_enabled) {
+			dev_data->xip_cpp = cfg->cpp;
+		} else if (dev_data->xip_cpp != cfg->cpp) {
+			LOG_ERR("Conflict with configuration used for XIP.");
+			return -EINVAL;
+		}
+#endif
+
+		dev_data->ctrlr0 &= ~(CTRLR0_SCPOL_BIT | CTRLR0_SCPH_BIT);
+
+		switch (cfg->cpp) {
+		default:
+		case MSPI_CPP_MODE_0:
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 0) |
+					    FIELD_PREP(CTRLR0_SCPH_BIT,  0);
+			break;
+		case MSPI_CPP_MODE_1:
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 0) |
+					    FIELD_PREP(CTRLR0_SCPH_BIT,  1);
+			break;
+		case MSPI_CPP_MODE_2:
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 1) |
+					    FIELD_PREP(CTRLR0_SCPH_BIT,  0);
+			break;
+		case MSPI_CPP_MODE_3:
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 1) |
+					    FIELD_PREP(CTRLR0_SCPH_BIT,  1);
+			break;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_FREQUENCY) {
+		if (cfg->freq > dev_config->clock_frequency / 2 ||
+		    cfg->freq < dev_config->clock_frequency / 65534) {
+			LOG_ERR("Invalid frequency: %u, MIN: %u, MAX: %u",
+				cfg->freq, dev_config->clock_frequency / 65534,
+				dev_config->clock_frequency / 2);
+			return -EINVAL;
+		}
+
+#if defined(CONFIG_MSPI_XIP)
+		/* Make sure the new setting is compatible with the one used
+		 * for XIP if it is enabled.
+		 */
+		if (!dev_data->xip_enabled) {
+			dev_data->xip_freq = cfg->freq;
+		} else if (dev_data->xip_freq != cfg->freq) {
+			LOG_ERR("Conflict with configuration used for XIP.");
+			return -EINVAL;
+		}
+#endif
+
+		dev_data->baudr = dev_config->clock_frequency / cfg->freq;
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_DATA_RATE) {
+		/* TODO: add support for DDR */
+		if (cfg->data_rate != MSPI_DATA_RATE_SINGLE) {
+			LOG_ERR("Only single data rate is supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_DQS) {
+		/* TODO: add support for DQS */
+		if (cfg->dqs_enable) {
+			LOG_ERR("DQS line is not supported.");
+			return -ENOTSUP;
+		}
+	}
+
+#if defined(CONFIG_MSPI_XIP)
+	if (param_mask & MSPI_DEVICE_CONFIG_READ_CMD) {
+		dev_data->xip_params_stored.read_cmd = cfg->read_cmd;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_WRITE_CMD) {
+		dev_data->xip_params_stored.write_cmd = cfg->write_cmd;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_RX_DUMMY) {
+		dev_data->xip_params_stored.rx_dummy = cfg->rx_dummy;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_TX_DUMMY) {
+		dev_data->xip_params_stored.tx_dummy = cfg->tx_dummy;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_CMD_LEN) {
+		dev_data->xip_params_stored.cmd_length = cfg->cmd_length;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_ADDR_LEN) {
+		dev_data->xip_params_stored.addr_length = cfg->addr_length;
+	}
+#endif
+
+	/* Always use Motorola SPI frame format. */
+	dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_FRF_MASK, CTRLR0_FRF_SPI);
+	/* Enable clock stretching. */
+	dev_data->spi_ctrlr0 |= SPI_CTRLR0_CLK_STRETCH_EN_BIT;
+
+	return 0;
+}
+
+static int api_dev_config(const struct device *dev,
+			  const struct mspi_dev_id *dev_id,
+			  const enum mspi_dev_cfg_mask param_mask,
+			  const struct mspi_dev_cfg *cfg)
+{
+	const struct mspi_dw_config *dev_config = dev->config;
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc;
+
+	if (dev_id != dev_data->dev_id) {
+		rc = k_sem_take(&dev_data->cfg_lock,
+				K_MSEC(CONFIG_MSPI_COMPLETION_TIMEOUT_TOLERANCE));
+		if (rc < 0) {
+			LOG_ERR("Failed to switch controller to device");
+			return -EBUSY;
+		}
+
+		dev_data->dev_id = dev_id;
+	}
+
+	if (param_mask == MSPI_DEVICE_CONFIG_NONE &&
+	    !dev_config->sw_multi_periph) {
+		return 0;
+	}
+
+	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
+
+	rc = _api_dev_config(dev, param_mask, cfg);
+
+	k_sem_give(&dev_data->ctx_lock);
+
+	if (rc < 0) {
+		dev_data->dev_id = NULL;
+		k_sem_give(&dev_data->cfg_lock);
+	}
+
+	return rc;
+}
+
+static int api_get_channel_status(const struct device *dev, uint8_t ch)
+{
+	ARG_UNUSED(ch);
+
+	struct mspi_dw_data *dev_data = dev->data;
+
+	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
+
+	dev_data->dev_id = NULL;
+	k_sem_give(&dev_data->cfg_lock);
+
+	k_sem_give(&dev_data->ctx_lock);
+
+	return 0;
+}
+
+static void tx_control_field(const struct device *dev,
+			     uint32_t field, uint8_t len)
+{
+	uint8_t shift = 8 * len;
+
+	do {
+		shift -= 8;
+		write_dr(dev, field >> shift);
+	} while (shift);
+}
+
+static int start_next_packet(const struct device *dev, k_timeout_t timeout)
+{
+	const struct mspi_dw_config *dev_config = dev->config;
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_xfer_packet *packet =
+		&dev_data->xfer.packets[dev_data->packets_done];
+	bool xip_enabled = COND_CODE_1(CONFIG_MSPI_XIP,
+				       (dev_data->xip_enabled != 0),
+				       (false));
+	unsigned int key;
+	uint8_t tx_fifo_threshold;
+	uint32_t packet_frames;
+	uint32_t imr;
+	int rc = 0;
+
+	if (packet->num_bytes == 0 &&
+	    dev_data->xfer.cmd_length == 0 &&
+	    dev_data->xfer.addr_length == 0) {
+		return 0;
+	}
+
+	dev_data->dummy_bytes = 0;
+
+	dev_data->ctrlr0 &= ~CTRLR0_TMOD_MASK
+			 &  ~CTRLR0_DFS_MASK;
+
+	dev_data->spi_ctrlr0 &= ~SPI_CTRLR0_WAIT_CYCLES_MASK;
+
+	if (dev_data->standard_spi &&
+	    (dev_data->xfer.cmd_length != 0 ||
+	     dev_data->xfer.addr_length != 0)) {
+		dev_data->bytes_per_frame_exp = 0;
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 7);
+	} else {
+		if ((packet->num_bytes % 4) == 0) {
+			dev_data->bytes_per_frame_exp = 2;
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 31);
+		} else if ((packet->num_bytes % 2) == 0) {
+			dev_data->bytes_per_frame_exp = 1;
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 15);
+		} else {
+			dev_data->bytes_per_frame_exp = 0;
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 7);
+		}
+	}
+
+	packet_frames = packet->num_bytes >> dev_data->bytes_per_frame_exp;
+
+	if (packet_frames > UINT16_MAX + 1) {
+		LOG_ERR("Packet length (%u) exceeds supported maximum",
+			packet->num_bytes);
+		return -EINVAL;
+	}
+
+	if (packet->dir == MSPI_TX || packet->num_bytes == 0) {
+		imr = IMR_TXEIM_BIT;
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_TMOD_MASK,
+					       CTRLR0_TMOD_TX);
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_WAIT_CYCLES_MASK,
+						   dev_data->xfer.tx_dummy);
+
+		write_rxftlr(dev, 0);
+		tx_fifo_threshold = dev_config->tx_fifo_threshold;
+	} else {
+		uint32_t tmod;
+		uint8_t rx_fifo_threshold;
+
+		/* In Standard SPI Mode, the controller does not support
+		 * sending the command and address fields separately, they
+		 * need to be sent as data; hence, for RX packets with these
+		 * fields, the TX/RX transfer mode needs to be used and
+		 * consequently, dummy bytes need to be transmitted so that
+		 * clock cycles for the RX part are provided (the controller
+		 * does not do it automatically in the TX/RX mode).
+		 */
+		if (dev_data->standard_spi &&
+		    (dev_data->xfer.cmd_length != 0 ||
+		     dev_data->xfer.addr_length != 0)) {
+			uint32_t rx_total_bytes;
+
+			dev_data->bytes_to_discard = dev_data->xfer.cmd_length
+						   + dev_data->xfer.addr_length;
+			rx_total_bytes = dev_data->bytes_to_discard
+				       + packet->num_bytes;
+
+			dev_data->dummy_bytes = packet->num_bytes;
+
+			imr = IMR_TXEIM_BIT | IMR_RXFIM_BIT;
+			tmod = CTRLR0_TMOD_TX_RX;
+			tx_fifo_threshold = dev_config->tx_fifo_threshold;
+			/* For standard SPI, only 1-byte frames are used. */
+			rx_fifo_threshold = MIN(rx_total_bytes - 1,
+						dev_config->rx_fifo_threshold);
+		} else {
+			imr = IMR_RXFIM_BIT;
+			tmod = CTRLR0_TMOD_RX;
+			tx_fifo_threshold = 0;
+			rx_fifo_threshold = MIN(packet_frames - 1,
+						dev_config->rx_fifo_threshold);
+		}
+
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_TMOD_MASK, tmod);
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_WAIT_CYCLES_MASK,
+						   dev_data->xfer.rx_dummy);
+
+		write_rxftlr(dev, FIELD_PREP(RXFTLR_RFT_MASK,
+					     rx_fifo_threshold));
+	}
+
+	if (dev_data->dev_id->ce.port) {
+		rc = gpio_pin_set_dt(&dev_data->dev_id->ce, 1);
+		if (rc < 0) {
+			LOG_ERR("Failed to activate CE line (%d)", rc);
+			return rc;
+		}
+	}
+
+	if (xip_enabled) {
+		key = irq_lock();
+		write_ssienr(dev, 0);
+	}
+
+	/* These registers cannot be written when the controller is enabled,
+	 * that's why it is temporarily disabled above; with locked interrupts,
+	 * to prevent potential XIP transfers during that period.
+	 */
+	write_ctrlr0(dev, dev_data->ctrlr0);
+	write_ctrlr1(dev, packet_frames > 0
+		? FIELD_PREP(CTRLR1_NDF_MASK, packet_frames - 1)
+		: 0);
+	write_spi_ctrlr0(dev, dev_data->spi_ctrlr0);
+	write_baudr(dev, dev_data->baudr);
+	write_ser(dev, BIT(dev_data->dev_id->dev_idx));
+
+	if (xip_enabled) {
+		write_ssienr(dev, SSIENR_SSIC_EN_BIT);
+		irq_unlock(key);
+	}
+
+	dev_data->buf_pos = packet->data_buf;
+	dev_data->buf_end = &packet->data_buf[packet->num_bytes];
+
+	if ((imr & IMR_TXEIM_BIT) && dev_data->buf_pos < dev_data->buf_end) {
+		uint32_t start_level = tx_fifo_threshold;
+
+		if (dev_data->dummy_bytes) {
+			uint32_t tx_total = dev_data->bytes_to_discard
+					  + dev_data->dummy_bytes;
+
+			if (start_level > tx_total - 1) {
+				start_level = tx_total - 1;
+			}
+		}
+
+		write_txftlr(dev,
+			FIELD_PREP(TXFTLR_TXFTHR_MASK, start_level) |
+			FIELD_PREP(TXFTLR_TFT_MASK, tx_fifo_threshold));
+	} else {
+		write_txftlr(dev, 0);
+	}
+
+	/* Ensure that there will be no interrupt from the controller yet. */
+	write_imr(dev, 0);
+	/* Enable the controller. This must be done before DR is written. */
+	write_ssienr(dev, SSIENR_SSIC_EN_BIT);
+
+	if (dev_data->standard_spi) {
+		if (dev_data->xfer.cmd_length) {
+			tx_control_field(dev, packet->cmd,
+					 dev_data->xfer.cmd_length);
+		}
+
+		if (dev_data->xfer.addr_length) {
+			tx_control_field(dev, packet->address,
+					 dev_data->xfer.addr_length);
+		}
+	} else {
+		if (dev_data->xfer.cmd_length) {
+			write_dr(dev, packet->cmd);
+		}
+
+		if (dev_data->xfer.addr_length) {
+			write_dr(dev, packet->address);
+		}
+	}
+
+	if (dev_data->dummy_bytes) {
+		if (make_rx_cycles(dev)) {
+			imr = IMR_RXFIM_BIT;
+		}
+	} else if (packet->dir == MSPI_TX && packet->num_bytes) {
+		tx_data(dev, packet);
+	}
+
+	/* Enable interrupts now and wait until the packet is done. */
+	write_imr(dev, imr);
+
+	rc = k_sem_take(&dev_data->finished, timeout);
+	if (rc < 0) {
+		rc = -ETIMEDOUT;
+	}
+
+	/* Disable the controller. This will immediately halt the transfer
+	 * if it hasn't finished yet.
+	 */
+	if (xip_enabled) {
+		/* If XIP is enabled, the controller must be kept enabled,
+		 * so disable it only momentarily if there's a need to halt
+		 * a transfer that has timeout out.
+		 */
+		if (rc == -ETIMEDOUT) {
+			key = irq_lock();
+
+			write_ssienr(dev, 0);
+			write_ssienr(dev, SSIENR_SSIC_EN_BIT);
+
+			irq_unlock(key);
+		}
+	} else {
+		write_ssienr(dev, 0);
+	}
+
+	if (dev_data->dev_id->ce.port) {
+		int rc2;
+
+		/* Do not use `rc` to not overwrite potential timeout error. */
+		rc2 = gpio_pin_set_dt(&dev_data->dev_id->ce, 0);
+		if (rc2 < 0) {
+			LOG_ERR("Failed to deactivate CE line (%d)", rc2);
+			return rc2;
+		}
+	}
+
+	return rc;
+}
+
+static int _api_transceive(const struct device *dev,
+			   const struct mspi_xfer *req)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc;
+
+	dev_data->spi_ctrlr0 &= ~SPI_CTRLR0_WAIT_CYCLES_MASK
+			     &  ~SPI_CTRLR0_INST_L_MASK
+			     &  ~SPI_CTRLR0_ADDR_L_MASK;
+
+	if (!apply_cmd_length(dev_data, req->cmd_length) ||
+	    !apply_addr_length(dev_data, req->addr_length)) {
+		return -EINVAL;
+	}
+
+	if (dev_data->standard_spi &&
+	    (req->rx_dummy != 0 || req->tx_dummy != 0)) {
+		LOG_ERR("Dummy cycles unsupported in single line mode");
+		return -EINVAL;
+	} else if (req->rx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX ||
+		   req->tx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX) {
+		LOG_ERR("Unsupported RX (%u) or TX (%u) dummy cycles",
+			req->rx_dummy, req->tx_dummy);
+		return -EINVAL;
+	}
+
+	dev_data->xfer = *req;
+
+	for (dev_data->packets_done = 0;
+	     dev_data->packets_done < dev_data->xfer.num_packet;
+	     dev_data->packets_done++) {
+		rc = start_next_packet(dev, K_MSEC(dev_data->xfer.timeout));
+		if (rc < 0) {
+			return rc;
+		}
+	}
+
+	return 0;
+}
+
+static int api_transceive(const struct device *dev,
+			  const struct mspi_dev_id *dev_id,
+			  const struct mspi_xfer *req)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc, rc2;
+
+	if (dev_id != dev_data->dev_id) {
+		LOG_ERR("Controller is not configured for this device");
+		return -EINVAL;
+	}
+
+	/* TODO: add support for asynchronous transfers */
+	if (req->async) {
+		LOG_ERR("Asynchronous transfers are not supported");
+		return -ENOTSUP;
+	}
+
+	rc = pm_device_runtime_get(dev);
+	if (rc < 0) {
+		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+		return rc;
+	}
+
+	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
+
+	if (dev_data->suspended) {
+		rc = -EFAULT;
+	} else {
+		rc = _api_transceive(dev, req);
+	}
+
+	k_sem_give(&dev_data->ctx_lock);
+
+	rc2 = pm_device_runtime_put(dev);
+	if (rc2 < 0) {
+		LOG_ERR("pm_device_runtime_put() failed: %d", rc2);
+		rc = (rc < 0 ? rc : rc2);
+	}
+
+	return rc;
+}
+
+#if defined(CONFIG_MSPI_XIP)
+static int _api_xip_config(const struct device *dev,
+			   const struct mspi_dev_id *dev_id,
+			   const struct mspi_xip_cfg *cfg)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc;
+
+	if (!cfg->enable) {
+		rc = vendor_specific_xip_disable(dev, dev_id, cfg);
+		if (rc < 0) {
+			return rc;
+		}
+
+		dev_data->xip_enabled &= ~BIT(dev_id->dev_idx);
+
+		if (!dev_data->xip_enabled) {
+			write_ssienr(dev, 0);
+
+			/* Since XIP is disabled, it is okay for the controller
+			 * to be suspended.
+			 */
+			rc = pm_device_runtime_put(dev);
+			if (rc < 0) {
+				LOG_ERR("pm_device_runtime_put() failed: %d", rc);
+				return rc;
+			}
+		}
+
+		return 0;
+	}
+
+	if (!dev_data->xip_enabled) {
+		struct xip_params *params = &dev_data->xip_params_active;
+		struct xip_ctrl ctrl = {0};
+
+		*params = dev_data->xip_params_stored;
+
+		if (!apply_xip_io_mode(dev_data, &ctrl) ||
+		    !apply_xip_cmd_length(dev_data, &ctrl) ||
+		    !apply_xip_addr_length(dev_data, &ctrl)) {
+			return -EINVAL;
+		}
+
+		if (params->rx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX ||
+		    params->tx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX) {
+			LOG_ERR("Unsupported RX (%u) or TX (%u) dummy cycles",
+				params->rx_dummy, params->tx_dummy);
+			return -EINVAL;
+		}
+
+		/* Increase usage count additionally to prevent the controller
+		 * from being suspended as long as XIP is active.
+		 */
+		rc = pm_device_runtime_get(dev);
+		if (rc < 0) {
+			LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+			return rc;
+		}
+
+		ctrl.read |= FIELD_PREP(XIP_CTRL_WAIT_CYCLES_MASK,
+					params->rx_dummy);
+		ctrl.write |= FIELD_PREP(XIP_WRITE_CTRL_WAIT_CYCLES_MASK,
+					 params->tx_dummy);
+
+		/* Make sure the baud rate and serial clock phase/polarity
+		 * registers are configured properly. They may not be if
+		 * non-XIP transfers have not been performed yet.
+		 */
+		write_ctrlr0(dev, dev_data->ctrlr0);
+		write_baudr(dev, dev_data->baudr);
+
+		write_xip_incr_inst(dev, params->read_cmd);
+		write_xip_wrap_inst(dev, params->read_cmd);
+		write_xip_ctrl(dev, ctrl.read);
+		write_xip_write_incr_inst(dev, params->write_cmd);
+		write_xip_write_wrap_inst(dev, params->write_cmd);
+		write_xip_write_ctrl(dev, ctrl.write);
+	} else if (dev_data->xip_params_active.read_cmd !=
+		   dev_data->xip_params_stored.read_cmd ||
+		   dev_data->xip_params_active.write_cmd !=
+		   dev_data->xip_params_stored.write_cmd ||
+		   dev_data->xip_params_active.cmd_length !=
+		   dev_data->xip_params_stored.cmd_length ||
+		   dev_data->xip_params_active.addr_length !=
+		   dev_data->xip_params_stored.addr_length ||
+		   dev_data->xip_params_active.rx_dummy !=
+		   dev_data->xip_params_stored.rx_dummy ||
+		   dev_data->xip_params_active.tx_dummy !=
+		   dev_data->xip_params_stored.tx_dummy) {
+		LOG_ERR("Conflict with configuration already used for XIP.");
+		return -EINVAL;
+	}
+
+	rc = vendor_specific_xip_enable(dev, dev_id, cfg);
+	if (rc < 0) {
+		return rc;
+	}
+
+	write_ssienr(dev, SSIENR_SSIC_EN_BIT);
+
+	dev_data->xip_enabled |= BIT(dev_id->dev_idx);
+
+	return 0;
+}
+
+static int api_xip_config(const struct device *dev,
+			  const struct mspi_dev_id *dev_id,
+			  const struct mspi_xip_cfg *cfg)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc, rc2;
+
+	if (cfg->enable && dev_id != dev_data->dev_id) {
+		LOG_ERR("Controller is not configured for this device");
+		return -EINVAL;
+	}
+
+	rc = pm_device_runtime_get(dev);
+	if (rc < 0) {
+		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+		return rc;
+	}
+
+	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
+
+	if (dev_data->suspended) {
+		rc = -EFAULT;
+	} else {
+		rc = _api_xip_config(dev, dev_id, cfg);
+	}
+
+	k_sem_give(&dev_data->ctx_lock);
+
+	rc2 = pm_device_runtime_put(dev);
+	if (rc2 < 0) {
+		LOG_ERR("pm_device_runtime_put() failed: %d", rc2);
+		rc = (rc < 0 ? rc : rc2);
+	}
+
+	return rc;
+}
+#endif /* defined(CONFIG_MSPI_XIP) */
+
+static int dev_pm_action_cb(const struct device *dev,
+			    enum pm_device_action action)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+
+	if (action == PM_DEVICE_ACTION_RESUME) {
+#if defined(CONFIG_PINCTRL)
+		const struct mspi_dw_config *dev_config = dev->config;
+		int rc = pinctrl_apply_state(dev_config->pcfg,
+					     PINCTRL_STATE_DEFAULT);
+
+		if (rc < 0) {
+			LOG_ERR("Cannot apply default pins state (%d)", rc);
+			return rc;
+		}
+#endif
+		vendor_specific_resume(dev);
+
+		dev_data->suspended = false;
+
+		return 0;
+	}
+
+	if (IS_ENABLED(CONFIG_PM_DEVICE) &&
+	    action == PM_DEVICE_ACTION_SUSPEND) {
+		bool xip_enabled = COND_CODE_1(CONFIG_MSPI_XIP,
+					       (dev_data->xip_enabled != 0),
+					       (false));
+
+#if defined(CONFIG_PINCTRL)
+		const struct mspi_dw_config *dev_config = dev->config;
+		int rc = pinctrl_apply_state(dev_config->pcfg,
+					     PINCTRL_STATE_SLEEP);
+
+		if (rc < 0) {
+			LOG_ERR("Cannot apply sleep pins state (%d)", rc);
+			return rc;
+		}
+#endif
+		if (xip_enabled ||
+		    k_sem_take(&dev_data->ctx_lock, K_NO_WAIT) != 0) {
+			LOG_ERR("Controller in use, cannot be suspended");
+			return -EBUSY;
+		}
+
+		dev_data->suspended = true;
+
+		vendor_specific_suspend(dev);
+
+		k_sem_give(&dev_data->ctx_lock);
+
+		return 0;
+	}
+
+	return -ENOTSUP;
+}
+
+static int dev_init(const struct device *dev)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_dw_config *dev_config = dev->config;
+	const struct gpio_dt_spec *ce_gpio;
+	int rc;
+
+	DEVICE_MMIO_MAP(dev, K_MEM_CACHE_NONE);
+
+	vendor_specific_init(dev);
+
+	dev_config->irq_config();
+
+	k_sem_init(&dev_data->finished, 0, 1);
+	k_sem_init(&dev_data->cfg_lock, 1, 1);
+	k_sem_init(&dev_data->ctx_lock, 1, 1);
+
+	for (ce_gpio = dev_config->ce_gpios;
+	     ce_gpio < &dev_config->ce_gpios[dev_config->ce_gpios_len];
+	     ce_gpio++) {
+		if (!device_is_ready(ce_gpio->port)) {
+			LOG_ERR("CE GPIO port %s is not ready",
+				ce_gpio->port->name);
+			return -ENODEV;
+		}
+
+		rc = gpio_pin_configure_dt(ce_gpio, GPIO_OUTPUT_INACTIVE);
+		if (rc < 0) {
+			return rc;
+		}
+	}
+
+#if defined(CONFIG_PINCTRL)
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		rc = pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
+		if (rc < 0) {
+			LOG_ERR("Cannot apply sleep pins state (%d)", rc);
+			return rc;
+		}
+	}
+#endif
+
+	return pm_device_driver_init(dev, dev_pm_action_cb);
+}
+
+static DEVICE_API(mspi, drv_api) = {
+	.config             = api_config,
+	.dev_config         = api_dev_config,
+	.get_channel_status = api_get_channel_status,
+	.transceive         = api_transceive,
+#if defined(CONFIG_MSPI_XIP)
+	.xip_config         = api_xip_config,
+#endif
+};
+
+#define MSPI_DW_INST_IRQ(idx, inst)					\
+	IRQ_CONNECT(DT_INST_IRQ_BY_IDX(inst, idx, irq),			\
+		    DT_INST_IRQ_BY_IDX(inst, idx, priority),		\
+		    mspi_dw_isr, DEVICE_DT_INST_GET(inst), 0);		\
+	irq_enable(DT_INST_IRQ_BY_IDX(inst, idx, irq))
+
+#define MSPI_DW_MMIO_ROM_INIT(node_id)					\
+	COND_CODE_1(DT_REG_HAS_NAME(node_id, core),			\
+		(Z_DEVICE_MMIO_NAMED_ROM_INITIALIZER(core, node_id)),	\
+		(DEVICE_MMIO_ROM_INIT(node_id)))
+
+#define MSPI_DW_CLOCK_FREQUENCY(inst)					\
+	COND_CODE_1(DT_NODE_HAS_PROP(DT_INST_PHANDLE(inst, clocks),	\
+				     clock_frequency),			\
+		(DT_INST_PROP_BY_PHANDLE(inst, clocks,			\
+					 clock_frequency)),		\
+		(DT_INST_PROP(inst, clock_frequency)))
+
+#define MSPI_DW_DT_INST_PROP(inst, prop) .prop = DT_INST_PROP(inst, prop)
+
+#define FOREACH_CE_GPIOS_ELEM(inst)					\
+	DT_INST_FOREACH_PROP_ELEM_SEP(inst, ce_gpios,			\
+				      GPIO_DT_SPEC_GET_BY_IDX, (,))
+#define MSPI_DW_CE_GPIOS(inst)						\
+	.ce_gpios = (const struct gpio_dt_spec [])			\
+		{ FOREACH_CE_GPIOS_ELEM(inst) },			\
+	.ce_gpios_len = DT_INST_PROP_LEN(inst, ce_gpios)
+
+#define TX_FIFO_DEPTH(inst) DT_INST_PROP(inst, fifo_depth)
+#define RX_FIFO_DEPTH(inst) DT_INST_PROP_OR(inst, rx_fifo_depth,	\
+					    TX_FIFO_DEPTH(inst))
+#define MSPI_DW_FIFO_PROPS(inst)					\
+	.tx_fifo_depth_minus_1 = TX_FIFO_DEPTH(inst) - 1,		\
+	.tx_fifo_threshold =						\
+		DT_INST_PROP_OR(inst, tx_fifo_threshold,		\
+				7 * TX_FIFO_DEPTH(inst) / 8 - 1),	\
+	.rx_fifo_threshold =						\
+		DT_INST_PROP_OR(inst, rx_fifo_threshold,		\
+				1 * RX_FIFO_DEPTH(inst) / 8 - 1)
+
+#define MSPI_DW_INST(inst)						\
+	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);		\
+	IF_ENABLED(CONFIG_PINCTRL, (PINCTRL_DT_INST_DEFINE(inst);))	\
+	static void irq_config##inst(void)				\
+	{								\
+		LISTIFY(DT_INST_NUM_IRQS(inst),				\
+			MSPI_DW_INST_IRQ, (;), inst);			\
+	}								\
+	static struct mspi_dw_data dev##inst##_data;			\
+	static const struct mspi_dw_config dev##inst##_config = {	\
+		MSPI_DW_MMIO_ROM_INIT(DT_DRV_INST(inst)),		\
+		.irq_config = irq_config##inst,				\
+		.clock_frequency = MSPI_DW_CLOCK_FREQUENCY(inst),	\
+	IF_ENABLED(CONFIG_PINCTRL,					\
+		(.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),))	\
+	IF_ENABLED(DT_INST_NODE_HAS_PROP(inst, ce_gpios),		\
+		(MSPI_DW_CE_GPIOS(inst),))				\
+		MSPI_DW_FIFO_PROPS(inst),				\
+		DEFINE_REG_ACCESS(inst)					\
+		.sw_multi_periph =					\
+			DT_INST_PROP(inst, software_multiperipheral),	\
+	};								\
+	DEVICE_DT_INST_DEFINE(inst,					\
+		dev_init, PM_DEVICE_DT_INST_GET(inst),			\
+		&dev##inst##_data, &dev##inst##_config,			\
+		POST_KERNEL, CONFIG_MSPI_INIT_PRIORITY,			\
+		&drv_api);
+
+DT_INST_FOREACH_STATUS_OKAY(MSPI_DW_INST)
diff --git a/drivers/mspi/mspi_dw.h b/drivers/mspi/mspi_dw.h
new file mode 100644
index 00000000000..bd81d061e09
--- /dev/null
+++ b/drivers/mspi/mspi_dw.h
@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * This header is part of mspi_dw.c extracted only for clarity.
+ * It is not supposed to be included by any file other than mspi_dw.c.
+ */
+
+/* CTRLR0 - Control Register 0 */
+#define CTRLR0_SPI_FRF_MASK	GENMASK(23, 22)
+#define CTRLR0_SPI_FRF_STANDARD	0UL
+#define CTRLR0_SPI_FRF_DUAL	1UL
+#define CTRLR0_SPI_FRF_QUAD	2UL
+#define CTRLR0_SPI_FRF_OCTAL	3UL
+#define CTRLR0_TMOD_MASK	GENMASK(11, 10)
+#define CTRLR0_TMOD_TX_RX	0UL
+#define CTRLR0_TMOD_TX		1UL
+#define CTRLR0_TMOD_RX		2UL
+#define CTRLR0_TMOD_EEPROM	3UL
+#define CTRLR0_SCPOL_BIT	BIT(9)
+#define CTRLR0_SCPH_BIT		BIT(8)
+#define CTRLR0_FRF_MASK		GENMASK(7, 6)
+#define CTRLR0_FRF_SPI		0UL
+#define CTRLR0_FRF_SSP		1UL
+#define CTRLR0_FRF_MICROWIRE	2UL
+#define CTRLR0_DFS_MASK		GENMASK(4, 0)
+
+/* CTRLR1- Control Register 1 */
+#define CTRLR1_NDF_MASK		GENMASK(15, 0)
+
+/* SSIENR - SSI Enable Register */
+#define SSIENR_SSIC_EN_BIT	BIT(0)
+
+/* TXFTLR - Transmit FIFO Threshold Level */
+#define TXFTLR_TXFTHR_MASK	GENMASK(23, 16)
+#define TXFTLR_TFT_MASK		GENMASK(7, 0)
+
+/* RXFTLR - Receive FIFO Threshold Level */
+#define RXFTLR_RFT_MASK		GENMASK(7, 0)
+
+/* TXFLR - Transmit FIFO Level Register */
+#define TXFLR_TXTFL_MASK	GENMASK(7, 0)
+
+/* RXFLR - Receive FIFO Level Register */
+#define RXFLR_RXTFL_MASK	GENMASK(7, 0)
+
+/* SR - Status Register */
+#define SR_BUSY_BIT	        BIT(0)
+
+/* IMR - Interrupt Mask Register */
+#define IMR_TXEIM_BIT		BIT(0)
+#define IMR_TXOIM_BIT		BIT(1)
+#define IMR_RXUIM_BIT		BIT(2)
+#define IMR_RXOIM_BIT		BIT(3)
+#define IMR_RXFIM_BIT		BIT(4)
+#define IMR_MSTIM_BIT		BIT(5)
+
+/* ISR - Interrupt Status Register */
+#define ISR_TXEIS_BIT		BIT(0)
+#define ISR_TXOIS_BIT		BIT(1)
+#define ISR_RXUIS_BIT		BIT(2)
+#define ISR_RXOIS_BIT		BIT(3)
+#define ISR_RXFIS_BIT		BIT(4)
+#define ISR_MSTIS_BIT		BIT(5)
+
+/* SPI_CTRLR0 - SPI Control Register */
+#define SPI_CTRLR0_CLK_STRETCH_EN_BIT		BIT(30)
+#define SPI_CTRLR0_XIP_PREFETCH_EN_BIT		BIT(29)
+#define SPI_CTRLR0_XIP_MBL_BIT			BIT(26)
+#define SPI_CTRLR0_SPI_RXDS_SIG_EN_BIT		BIT(25)
+#define SPI_CTRLR0_SPI_DM_EN_BIT		BIT(24)
+#define SPI_CTRLR0_RXDS_VL_EN_BIT		BIT(23)
+#define SPI_CTRLR0_SSIC_XIP_CONT_XFER_EN_BIT	BIT(21)
+#define SPI_CTRLR0_XIP_INST_EN_BIT		BIT(20)
+#define SPI_CTRLR0_XIP_DFS_HC_BIT		BIT(19)
+#define SPI_CTRLR0_SPI_RXDS_EN_BIT		BIT(18)
+#define SPI_CTRLR0_INST_DDR_EN_BIT		BIT(17)
+#define SPI_CTRLR0_SPI_DDR_EN_BIT		BIT(16)
+#define SPI_CTRLR0_WAIT_CYCLES_MASK		GENMASK(15, 11)
+#define SPI_CTRLR0_WAIT_CYCLES_MAX		BIT_MASK(5)
+#define SPI_CTRLR0_INST_L_MASK			GENMASK(9, 8)
+#define SPI_CTRLR0_INST_L0			0UL
+#define SPI_CTRLR0_INST_L4			1UL
+#define SPI_CTRLR0_INST_L8			2UL
+#define SPI_CTRLR0_INST_L16			3UL
+#define SPI_CTRLR0_XIP_MD_BIT_EN_BIT		BIT(7)
+#define SPI_CTRLR0_ADDR_L_MASK			GENMASK(5, 2)
+#define SPI_CTRLR0_TRANS_TYPE_MASK		GENMASK(1, 0)
+#define SPI_CTRLR0_TRANS_TYPE_TT0		0UL
+#define SPI_CTRLR0_TRANS_TYPE_TT1		1UL
+#define SPI_CTRLR0_TRANS_TYPE_TT2		2UL
+#define SPI_CTRLR0_TRANS_TYPE_TT3		3UL
+
+/* XIP_CTRL - XIP Control Register */
+#define XIP_CTRL_XIP_PREFETCH_EN_BIT	BIT(28)
+#define XIP_CTRL_XIP_MBL_MASK		GENMASK(27, 26)
+#define XIP_CTRL_XIP_MBL_2		0UL
+#define XIP_CTRL_XIP_MBL_4		1UL
+#define XIP_CTRL_XIP_MBL_8		2UL
+#define XIP_CTRL_XIP_MBL_16		3UL
+#define XIP_CTRL_RXDS_SIG_EN_BIT	BIT(25)
+#define XIP_CTRL_XIP_HYBERBUS_EN_BIT	BIT(24)
+#define XIP_CTRL_CONT_XFER_EN_BIT	BIT(23)
+#define XIP_CTRL_INST_EN_BIT		BIT(22)
+#define XIP_CTRL_RXDS_EN_BIT		BIT(21)
+#define XIP_CTRL_INST_DDR_EN_BIT	BIT(20)
+#define XIP_CTRL_DDR_EN_BIT		BIT(19)
+#define XIP_CTRL_DFS_HC_BIT		BIT(18)
+#define XIP_CTRL_WAIT_CYCLES_MASK	GENMASK(17, 13)
+#define XIP_CTRL_WAIT_CYCLES_MAX	BIT_MASK(5)
+#define XIP_CTRL_MD_BITS_EN_BIT		BIT(12)
+#define XIP_CTRL_INST_L_MASK		GENMASK(10, 9)
+#define XIP_CTRL_INST_L0		0UL
+#define XIP_CTRL_INST_L4		1UL
+#define XIP_CTRL_INST_L8		2UL
+#define XIP_CTRL_INST_L16		3UL
+#define XIP_CTRL_ADDR_L_MASK		GENMASK(7, 4)
+#define XIP_CTRL_TRANS_TYPE_MASK	GENMASK(3, 2)
+#define XIP_CTRL_TRANS_TYPE_TT0		0UL
+#define XIP_CTRL_TRANS_TYPE_TT1		1UL
+#define XIP_CTRL_TRANS_TYPE_TT2		2UL
+#define XIP_CTRL_FRF_MASK		GENMASK(1, 0)
+#define XIP_CTRL_FRF_DUAL		1UL
+#define XIP_CTRL_FRF_QUAD		2UL
+#define XIP_CTRL_FRF_OCTAL		3UL
+
+/* XIP_CTRL - XIP Control Register */
+#define XIP_CTRL_XIP_PREFETCH_EN_BIT	BIT(28)
+#define XIP_CTRL_XIP_MBL_MASK		GENMASK(27, 26)
+#define XIP_CTRL_XIP_MBL_2		0UL
+#define XIP_CTRL_XIP_MBL_4		1UL
+#define XIP_CTRL_XIP_MBL_8		2UL
+#define XIP_CTRL_XIP_MBL_16		3UL
+#define XIP_CTRL_XIP_HYBERBUS_EN_BIT	BIT(24)
+#define XIP_CTRL_CONT_XFER_EN_BIT	BIT(23)
+#define XIP_CTRL_INST_EN_BIT		BIT(22)
+#define XIP_CTRL_RXDS_EN_BIT		BIT(21)
+#define XIP_CTRL_INST_DDR_EN_BIT	BIT(20)
+#define XIP_CTRL_DDR_EN_BIT		BIT(19)
+#define XIP_CTRL_DFS_HC_BIT		BIT(18)
+
+/* XIP_WRITE_CTRL - XIP Write Control Register */
+#define XIP_WRITE_CTRL_WAIT_CYCLES_MASK	GENMASK(20, 16)
+#define XIP_WRITE_CTRL_WAIT_CYCLES_MAX	BIT_MASK(5)
+#define XIP_WRITE_CTRL_RXDS_SIG_EN_BIT	BIT(13)
+#define XIP_WRITE_CTRL_HYBERBUS_EN_BIT	BIT(12)
+#define XIP_WRITE_CTRL_INST_DDR_EN_BIT	BIT(11)
+#define XIP_WRITE_CTRL_SPI_DDR_EN_BIT	BIT(10)
+#define XIP_WRITE_CTRL_INST_L_MASK	GENMASK(9, 8)
+#define XIP_WRITE_CTRL_INST_L0		0UL
+#define XIP_WRITE_CTRL_INST_L4		1UL
+#define XIP_WRITE_CTRL_INST_L8		2UL
+#define XIP_WRITE_CTRL_INST_L16		3UL
+#define XIP_WRITE_CTRL_ADDR_L_MASK	GENMASK(7, 4)
+#define XIP_WRITE_CTRL_TRANS_TYPE_MASK	GENMASK(3, 2)
+#define XIP_WRITE_CTRL_TRANS_TYPE_TT0	0UL
+#define XIP_WRITE_CTRL_TRANS_TYPE_TT1	1UL
+#define XIP_WRITE_CTRL_TRANS_TYPE_TT2	2UL
+#define XIP_WRITE_CTRL_FRF_MASK		GENMASK(1, 0)
+#define XIP_WRITE_CTRL_FRF_DUAL		1UL
+#define XIP_WRITE_CTRL_FRF_QUAD		2UL
+#define XIP_WRITE_CTRL_FRF_OCTAL	3UL
+
+/* Register access helpers. */
+#define USES_AUX_REG(inst) + DT_INST_PROP(inst, aux_reg_enable)
+#define AUX_REG_INSTANCES (0 DT_INST_FOREACH_STATUS_OKAY(USES_AUX_REG))
+#define BASE_ADDR(dev) (mm_reg_t)DEVICE_MMIO_GET(dev)
+
+#if AUX_REG_INSTANCES != 0
+static uint32_t aux_reg_read(const struct device *dev, uint32_t off)
+{
+	return sys_in32(BASE_ADDR(dev) + off/4);
+}
+static void aux_reg_write(uint32_t data, const struct device *dev, uint32_t off)
+{
+	sys_out32(data, BASE_ADDR(dev) + off/4);
+}
+#endif
+
+#if AUX_REG_INSTANCES != DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT)
+static uint32_t reg_read(const struct device *dev, uint32_t off)
+{
+	return sys_read32(BASE_ADDR(dev) + off);
+}
+static void reg_write(uint32_t data, const struct device *dev, uint32_t off)
+{
+	sys_write32(data, BASE_ADDR(dev) + off);
+}
+#endif
+
+#if AUX_REG_INSTANCES == 0
+/* If no instance uses aux-reg access. */
+#define DECLARE_REG_ACCESS()
+#define DEFINE_REG_ACCESS(inst)
+#define DEFINE_MM_REG_RD(reg, off) \
+	static inline uint32_t read_##reg(const struct device *dev) \
+	{ return reg_read(dev, off); }
+#define DEFINE_MM_REG_WR(reg, off) \
+	static inline void write_##reg(const struct device *dev, uint32_t data) \
+	{ reg_write(data, dev, off); }
+
+#elif AUX_REG_INSTANCES == DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT)
+/* If all instances use aux-reg access. */
+#define DECLARE_REG_ACCESS()
+#define DEFINE_REG_ACCESS(inst)
+#define DEFINE_MM_REG_RD(reg, off) \
+	static inline uint32_t read_##reg(const struct device *dev) \
+	{ return aux_reg_read(dev, off); }
+#define DEFINE_MM_REG_WR(reg, off) \
+	static inline void write_##reg(const struct device *dev, uint32_t data) \
+	{ aux_reg_write(data, dev, off); }
+
+#else
+/* If register access varies by instance. */
+#define DECLARE_REG_ACCESS() \
+	uint32_t (*read)(const struct device *dev, uint32_t off); \
+	void (*write)(uint32_t data, const struct device *dev, uint32_t off)
+#define DEFINE_REG_ACCESS(inst) \
+	COND_CODE_1(DT_INST_PROP(inst, aux_reg_enable), \
+		(.read = aux_reg_read, \
+		.write = aux_reg_write,), \
+		(.read = reg_read, \
+		.write = reg_write,))
+#define DEFINE_MM_REG_RD(reg, off) \
+	static inline uint32_t read_##reg(const struct device *dev) \
+	{ \
+		const struct mspi_dw_config *dev_config = dev->config; \
+		return dev_config->read(dev, off); \
+	}
+#define DEFINE_MM_REG_WR(reg, off) \
+	static inline void write_##reg(const struct device *dev, uint32_t data) \
+	{ \
+		const struct mspi_dw_config *dev_config = dev->config; \
+		dev_config->write(data, dev, off); \
+	}
+#endif
diff --git a/drivers/mspi/mspi_dw_vendor_specific.h b/drivers/mspi/mspi_dw_vendor_specific.h
new file mode 100644
index 00000000000..4913e536c92
--- /dev/null
+++ b/drivers/mspi/mspi_dw_vendor_specific.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * This header is part of mspi_dw.c extracted only for clarity.
+ * It is not supposed to be included by any file other than mspi_dw.c.
+ */
+
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
+
+#include <nrf.h>
+
+static inline void vendor_specific_init(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	NRF_EXMIF->EVENTS_CORE = 0;
+	NRF_EXMIF->INTENSET = BIT(EXMIF_INTENSET_CORE_Pos);
+}
+
+static inline void vendor_specific_suspend(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	NRF_EXMIF->TASKS_STOP = 1;
+}
+
+static inline void vendor_specific_resume(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	NRF_EXMIF->TASKS_START = 1;
+}
+
+static inline void vendor_specific_irq_clear(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	NRF_EXMIF->EVENTS_CORE = 0;
+}
+
+#if defined(CONFIG_MSPI_XIP)
+static inline int vendor_specific_xip_enable(const struct device *dev,
+					     const struct mspi_dev_id *dev_id,
+					     const struct mspi_xip_cfg *cfg)
+{
+	ARG_UNUSED(dev);
+
+	if (dev_id->dev_idx == 0) {
+		NRF_EXMIF->EXTCONF1.OFFSET = cfg->address_offset;
+		NRF_EXMIF->EXTCONF1.SIZE = cfg->address_offset
+					 + cfg->size - 1;
+		NRF_EXMIF->EXTCONF1.ENABLE = 1;
+	} else if (dev_id->dev_idx == 1) {
+		NRF_EXMIF->EXTCONF2.OFFSET = cfg->address_offset;
+		NRF_EXMIF->EXTCONF2.SIZE = cfg->address_offset
+					 + cfg->size - 1;
+		NRF_EXMIF->EXTCONF2.ENABLE = 1;
+	} else {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static inline int vendor_specific_xip_disable(const struct device *dev,
+					      const struct mspi_dev_id *dev_id,
+					      const struct mspi_xip_cfg *cfg)
+{
+	ARG_UNUSED(dev);
+	ARG_UNUSED(cfg);
+
+	if (dev_id->dev_idx == 0) {
+		NRF_EXMIF->EXTCONF1.ENABLE = 0;
+	} else if (dev_id->dev_idx == 1) {
+		NRF_EXMIF->EXTCONF2.ENABLE = 0;
+	} else {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+#endif /* defined(CONFIG_MSPI_XIP) */
+
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) */
diff --git a/dts/bindings/mspi/snps,designware-ssi.yaml b/dts/bindings/mspi/snps,designware-ssi.yaml
new file mode 100644
index 00000000000..fb516cb7835
--- /dev/null
+++ b/dts/bindings/mspi/snps,designware-ssi.yaml
@@ -0,0 +1,45 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Synopsys DesignWare Synchronous Serial Interface (SSI) node
+
+compatible: "snps,designware-ssi"
+
+include: [mspi-controller.yaml, pinctrl-device.yaml]
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  aux-reg-enable:
+    type: boolean
+    description: |
+      Activates auxiliary register access that is needed on some platforms.
+
+  fifo-depth:
+    required: true
+    type: int
+    description: |
+      Number of items that can be stored in the TX FIFO. Range: 8-256.
+      If the RX FIFO depth is not specified separately in the rx-fifo-depth
+      property, this value specifies depth of both TX and RX FIFOs.
+
+  rx-fifo-depth:
+    type: int
+    description: |
+      Number of items that can be stored in the RX FIFO. Range: 8-256.
+
+  tx-fifo-threshold:
+    type: int
+    description: |
+      Number of entries in the TX FIFO above which the TX transfer is started.
+      Maximum value is the TX FIFO depth - 1.
+
+  rx-fifo-threshold:
+    type: int
+    description: |
+      Number of entries in the RX FIFO above which the controller gets an RX
+      interrupt. Maximum value is the RX FIFO depth - 1.

From 5d6b2c5a2efc05e892121eaa076187b453f33327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 17 Oct 2024 14:23:17 +0200
Subject: [PATCH 2557/2913] [nrf fromtree] drivers: flash: Add generic NOR
 flash driver for MSPI devices
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a flash driver intended to handle various flash devices
connected over MSPI bus as long as they support JEDEC SFDP.
This is an initial commit providing only basic operations
in Octal I/O mode with some hard-coded values for Macronix
MX25Ux series chips.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit 29f3061f32bc7f0f495d7aacd5e208a16b216c2b)
---
 drivers/flash/CMakeLists.txt         |   1 +
 drivers/flash/Kconfig.mspi           |  23 +
 drivers/flash/flash_mspi_nor.c       | 686 +++++++++++++++++++++++++++
 dts/bindings/mtd/jedec,mspi-nor.yaml |  24 +
 4 files changed, 734 insertions(+)
 create mode 100644 drivers/flash/flash_mspi_nor.c
 create mode 100644 dts/bindings/mtd/jedec,mspi-nor.yaml

diff --git a/drivers/flash/CMakeLists.txt b/drivers/flash/CMakeLists.txt
index 617f1422a90..d3bbf7ee2ff 100644
--- a/drivers/flash/CMakeLists.txt
+++ b/drivers/flash/CMakeLists.txt
@@ -34,6 +34,7 @@ zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_MX25UM51345G flash_mcux_f
 zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_NOR flash_mcux_flexspi_nor.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_ATXP032 flash_mspi_atxp032.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_EMUL_DEVICE flash_mspi_emul_device.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_NOR flash_mspi_nor.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_NOR flash_npcx_fiu_nor.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_QSPI flash_npcx_fiu_qspi.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_RPI_PICO flash_rpi_pico.c)
diff --git a/drivers/flash/Kconfig.mspi b/drivers/flash/Kconfig.mspi
index 158fcefb528..d699aa49309 100644
--- a/drivers/flash/Kconfig.mspi
+++ b/drivers/flash/Kconfig.mspi
@@ -28,4 +28,27 @@ config FLASH_MSPI_ATXP032
 	select FLASH_JESD216
 	select MSPI_AMBIQ_AP3 if SOC_SERIES_APOLLO3X
 
+menuconfig FLASH_MSPI_NOR
+	bool "Generic MSPI NOR Flash"
+	default y
+	depends on DT_HAS_JEDEC_MSPI_NOR_ENABLED
+	select FLASH_MSPI
+	select FLASH_HAS_EXPLICIT_ERASE
+	select FLASH_JESD216
+	select GPIO if $(dt_compat_any_has_prop,$(DT_COMPAT_JEDEC_MSPI_NOR),reset-gpios)
+
+if FLASH_MSPI_NOR
+
+config FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE
+	int "Page size to use for FLASH_LAYOUT feature"
+	depends on FLASH_PAGE_LAYOUT
+	default 65536
+	help
+	  When CONFIG_FLASH_PAGE_LAYOUT is used, this driver will support that
+	  API. By default the page size corresponds to the block size (65536).
+	  Other options include the 32K-byte erase size (32768), the sector
+	  size (4096), or any non-zero multiple of the sector size.
+
+endif # FLASH_MSPI_NOR
+
 endmenu
diff --git a/drivers/flash/flash_mspi_nor.c b/drivers/flash/flash_mspi_nor.c
new file mode 100644
index 00000000000..a5ced1e0070
--- /dev/null
+++ b/drivers/flash/flash_mspi_nor.c
@@ -0,0 +1,686 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT jedec_mspi_nor
+
+#include <zephyr/drivers/flash.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/mspi.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
+
+#include "jesd216.h"
+#include "spi_nor.h"
+
+LOG_MODULE_REGISTER(flash_mspi_nor, CONFIG_FLASH_LOG_LEVEL);
+
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios)
+#define WITH_RESET_GPIO 1
+#endif
+
+struct flash_mspi_nor_data {
+	struct k_sem acquired;
+	struct mspi_xfer_packet packet;
+	struct mspi_xfer xfer;
+};
+
+struct flash_mspi_nor_config {
+	const struct device *bus;
+	uint32_t flash_size;
+	struct mspi_dev_id mspi_id;
+	struct mspi_dev_cfg mspi_cfg;
+	enum mspi_dev_cfg_mask mspi_cfg_mask;
+#if defined(CONFIG_MSPI_XIP)
+	struct mspi_xip_cfg xip_cfg;
+#endif
+#if defined(WITH_RESET_GPIO)
+	struct gpio_dt_spec reset;
+	uint32_t reset_pulse_us;
+	uint32_t reset_recovery_us;
+#endif
+#if defined(CONFIG_FLASH_PAGE_LAYOUT)
+	struct flash_pages_layout layout;
+#endif
+	uint8_t jedec_id[SPI_NOR_MAX_ID_LEN];
+};
+
+static int acquire(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	int rc;
+
+	k_sem_take(&dev_data->acquired, K_FOREVER);
+
+	rc = pm_device_runtime_get(dev_config->bus);
+	if (rc < 0) {
+		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+	} else {
+		/* This acquires the MSPI controller and reconfigures it
+		 * if needed for the flash device.
+		 */
+		rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
+				     dev_config->mspi_cfg_mask,
+				     &dev_config->mspi_cfg);
+		if (rc < 0) {
+			LOG_ERR("mspi_dev_config() failed: %d", rc);
+		} else {
+			return 0;
+		}
+
+		(void)pm_device_runtime_put(dev_config->bus);
+	}
+
+	k_sem_give(&dev_data->acquired);
+	return rc;
+}
+
+static void release(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+
+	/* This releases the MSPI controller. */
+	(void)mspi_get_channel_status(dev_config->bus, 0);
+
+	(void)pm_device_runtime_put(dev_config->bus);
+
+	k_sem_give(&dev_data->acquired);
+}
+
+static inline uint32_t dev_flash_size(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+
+	return dev_config->flash_size;
+}
+
+static inline uint16_t dev_page_size(const struct device *dev)
+{
+	return SPI_NOR_PAGE_SIZE;
+}
+
+static int api_read(const struct device *dev, off_t addr, void *dest,
+		    size_t size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	const uint32_t flash_size = dev_flash_size(dev);
+	int rc;
+
+	if (size == 0) {
+		return 0;
+	}
+
+	if ((addr < 0) || ((addr + size) > flash_size)) {
+		return -EINVAL;
+	}
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	/* TODO: get rid of all these hard-coded values for MX25Ux chips */
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 20;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = SPI_NOR_OCMD_RD;
+	dev_data->packet.address   = addr;
+	dev_data->packet.data_buf  = dest;
+	dev_data->packet.num_bytes = size;
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+
+	release(dev);
+
+	if (rc < 0) {
+		LOG_ERR("SPI_NOR_OCMD_RD xfer failed: %d", rc);
+		return rc;
+	}
+
+	return 0;
+}
+
+static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	uint8_t status_reg;
+	int rc;
+
+	while (true) {
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.addr_length = 4;
+		dev_data->xfer.rx_dummy    = 4;
+		dev_data->packet.dir       = MSPI_RX;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_RDSR;
+		dev_data->packet.address   = 0;
+		dev_data->packet.data_buf  = &status_reg;
+		dev_data->packet.num_bytes = sizeof(status_reg);
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_RDSR xfer failed: %d", rc);
+			return rc;
+		}
+		if (!(status_reg & SPI_NOR_WIP_BIT)) {
+			break;
+		}
+
+		k_sleep(poll_period);
+	}
+
+	return 0;
+}
+
+static int api_write(const struct device *dev, off_t addr, const void *src,
+		     size_t size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	const uint32_t flash_size = dev_flash_size(dev);
+	const uint16_t page_size = dev_page_size(dev);
+	int rc;
+
+	if (size == 0) {
+		return 0;
+	}
+
+	if ((addr < 0) || ((addr + size) > flash_size)) {
+		return -EINVAL;
+	}
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	while (size > 0) {
+		/* Split write into parts, each within one page only. */
+		uint16_t page_offset = (uint16_t)(addr % page_size);
+		uint16_t page_left = page_size - page_offset;
+		uint16_t to_write = (uint16_t)MIN(size, page_left);
+
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.tx_dummy    = 0;
+		dev_data->packet.dir       = MSPI_TX;
+
+		dev_data->xfer.addr_length = 0;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
+		dev_data->packet.num_bytes = 0;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
+			break;
+		}
+
+		dev_data->xfer.addr_length = 4;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_PAGE_PRG;
+		dev_data->packet.address   = addr;
+		dev_data->packet.data_buf  = (uint8_t *)src;
+		dev_data->packet.num_bytes = to_write;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_PAGE_PRG xfer failed: %d", rc);
+			break;
+		}
+
+		addr += to_write;
+		src   = (const uint8_t *)src + to_write;
+		size -= to_write;
+
+		rc = wait_until_ready(dev, K_MSEC(1));
+		if (rc < 0) {
+			break;
+		}
+	}
+
+	release(dev);
+
+	return rc;
+}
+
+static int api_erase(const struct device *dev, off_t addr, size_t size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	const uint32_t flash_size = dev_flash_size(dev);
+	int rc = 0;
+
+	if ((addr < 0) || ((addr + size) > flash_size)) {
+		return -EINVAL;
+	}
+
+	if (!SPI_NOR_IS_SECTOR_ALIGNED(addr)) {
+		return -EINVAL;
+	}
+
+	if ((size % SPI_NOR_SECTOR_SIZE) != 0) {
+		return -EINVAL;
+	}
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	while (size > 0) {
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.tx_dummy    = 0;
+		dev_data->packet.dir       = MSPI_TX;
+		dev_data->packet.num_bytes = 0;
+
+		dev_data->xfer.addr_length = 0;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
+			break;
+		}
+
+		if (size == flash_size) {
+			/* Chip erase. */
+			dev_data->xfer.addr_length = 0;
+			dev_data->packet.cmd       = SPI_NOR_OCMD_CE;
+
+			size -= flash_size;
+		} else {
+			/* Sector erase. */
+			dev_data->xfer.addr_length = 4;
+			dev_data->packet.cmd       = SPI_NOR_OCMD_SE;
+			dev_data->packet.address   = addr;
+
+			addr += SPI_NOR_SECTOR_SIZE;
+			size -= SPI_NOR_SECTOR_SIZE;
+		}
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("Erase command 0x%02x xfer failed: %d",
+				dev_data->packet.cmd, rc);
+			break;
+		}
+
+		rc = wait_until_ready(dev, K_MSEC(1));
+		if (rc < 0) {
+			break;
+		}
+	}
+
+	release(dev);
+
+	return rc;
+}
+
+static const
+struct flash_parameters *api_get_parameters(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	static const struct flash_parameters parameters = {
+		.write_block_size = 1,
+		.erase_value = 0xff,
+	};
+
+	return &parameters;
+}
+
+static int read_jedec_id(const struct device *dev, uint8_t *id)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	int rc;
+
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 4;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_OCMD_READ_ID;
+	dev_data->packet.address   = 0;
+	dev_data->packet.data_buf  = id;
+	dev_data->packet.num_bytes = JESD216_READ_ID_LEN;
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		printk("mspi_transceive() failed: %d\n", rc);
+		return rc;
+	}
+
+	return rc;
+}
+
+#if defined(CONFIG_FLASH_PAGE_LAYOUT)
+static void api_page_layout(const struct device *dev,
+			     const struct flash_pages_layout **layout,
+			     size_t *layout_size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+
+	*layout = &dev_config->layout;
+	*layout_size = 1;
+}
+#endif /* CONFIG_FLASH_PAGE_LAYOUT */
+
+#if defined(CONFIG_FLASH_JESD216_API)
+static int api_sfdp_read(const struct device *dev, off_t addr, void *dest,
+			 size_t size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	int rc;
+
+	if (size == 0) {
+		return 0;
+	}
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 20;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_OCMD_READ_SFDP;
+	dev_data->packet.address   = addr;
+	dev_data->packet.data_buf  = dest;
+	dev_data->packet.num_bytes = size;
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		printk("JESD216_OCMD_READ_SFDP xfer failed: %d\n", rc);
+		return rc;
+	}
+
+	release(dev);
+
+	return rc;
+}
+
+static int api_read_jedec_id(const struct device *dev, uint8_t *id)
+{
+	int rc = 0;
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	rc = read_jedec_id(dev, id);
+
+	release(dev);
+
+	return rc;
+}
+#endif /* CONFIG_FLASH_JESD216_API  */
+
+static int dev_pm_action_cb(const struct device *dev,
+			    enum pm_device_action action)
+{
+	switch (action) {
+	case PM_DEVICE_ACTION_SUSPEND:
+		break;
+	case PM_DEVICE_ACTION_RESUME:
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+static int flash_chip_init(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	struct mspi_dev_cfg init_dev_cfg = dev_config->mspi_cfg;
+	uint8_t id[JESD216_READ_ID_LEN] = {0};
+	int rc;
+
+	init_dev_cfg.freq = MHZ(1);
+	init_dev_cfg.io_mode = MSPI_IO_MODE_SINGLE;
+
+	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
+			     MSPI_DEVICE_CONFIG_ALL, &init_dev_cfg);
+	if (rc < 0) {
+		LOG_ERR("Failed to set initial device config: %d", rc);
+		return rc;
+	}
+
+	dev_data->xfer.xfer_mode  = MSPI_PIO;
+	dev_data->xfer.packets    = &dev_data->packet;
+	dev_data->xfer.num_packet = 1;
+	dev_data->xfer.timeout    = 10;
+
+	dev_data->xfer.cmd_length  = 1;
+	dev_data->xfer.addr_length = 0;
+	dev_data->xfer.tx_dummy    = 0;
+	dev_data->xfer.rx_dummy    = 0;
+
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_CMD_READ_ID;
+	dev_data->packet.data_buf  = id;
+	dev_data->packet.num_bytes = sizeof(id);
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		LOG_ERR("Failed to read JEDEC ID in single line mode: %d", rc);
+		return rc;
+	}
+
+	/*
+	 * If the read ID does not match the one from DTS, assume the flash
+	 * is already in the Octa I/O mode, so switching it is not needed.
+	 */
+	if (memcmp(id, dev_config->jedec_id, sizeof(id)) == 0) {
+		static const uint8_t enable_sopi[] = { 0x01 };
+
+		dev_data->packet.dir       = MSPI_TX;
+		dev_data->packet.cmd       = SPI_NOR_CMD_WREN;
+		dev_data->packet.num_bytes = 0;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_CMD_WREN xfer failed: %d", rc);
+			return rc;
+		}
+
+		dev_data->xfer.addr_length = 4;
+		dev_data->packet.cmd       = SPI_NOR_CMD_WR_CFGREG2;
+		dev_data->packet.address   = 0;
+		dev_data->packet.data_buf  = (uint8_t *)&enable_sopi;
+		dev_data->packet.num_bytes = sizeof(enable_sopi);
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			printk("SPI_NOR_CMD_WR_CFGREG2 xfer failed: %d\n", rc);
+			return rc;
+		}
+	}
+
+	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
+			     MSPI_DEVICE_CONFIG_ALL, &dev_config->mspi_cfg);
+	if (rc < 0) {
+		LOG_ERR("Failed to set device config: %d", rc);
+		return rc;
+	}
+
+	rc = read_jedec_id(dev, id);
+	if (rc < 0) {
+		return rc;
+	}
+
+	if (memcmp(id, dev_config->jedec_id, sizeof(id)) != 0) {
+		LOG_ERR("JEDEC ID mismatch, read: %02x %02x %02x, "
+			"expected: %02x %02x %02x",
+			id[0], id[1], id[2],
+			dev_config->jedec_id[0],
+			dev_config->jedec_id[1],
+			dev_config->jedec_id[2]);
+		return -ENODEV;
+	}
+
+#if defined(CONFIG_MSPI_XIP)
+	/* Enable XIP access for this chip if specified so in DT. */
+	if (dev_config->xip_cfg.enable) {
+		rc = mspi_xip_config(dev_config->bus, &dev_config->mspi_id,
+				     &dev_config->xip_cfg);
+		if (rc < 0) {
+			return rc;
+		}
+	}
+#endif
+
+	return 0;
+}
+
+static int drv_init(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	int rc;
+
+	if (!device_is_ready(dev_config->bus)) {
+		LOG_ERR("Device %s is not ready", dev_config->bus->name);
+		return -ENODEV;
+	}
+
+#if defined(WITH_RESET_GPIO)
+	if (dev_config->reset.port) {
+		if (!gpio_is_ready_dt(&dev_config->reset)) {
+			LOG_ERR("Device %s is not ready",
+				dev_config->reset.port->name);
+			return -ENODEV;
+		}
+
+		rc = gpio_pin_configure_dt(&dev_config->reset,
+					   GPIO_OUTPUT_ACTIVE);
+		if (rc < 0) {
+			LOG_ERR("Failed to activate RESET: %d", rc);
+			return -EIO;
+		}
+
+		if (dev_config->reset_pulse_us != 0) {
+			k_busy_wait(dev_config->reset_pulse_us);
+		}
+
+		rc = gpio_pin_set_dt(&dev_config->reset, 0);
+		if (rc < 0) {
+			LOG_ERR("Failed to deactivate RESET: %d", rc);
+			return -EIO;
+		}
+
+		if (dev_config->reset_recovery_us != 0) {
+			k_busy_wait(dev_config->reset_recovery_us);
+		}
+	}
+#endif
+
+	rc = pm_device_runtime_get(dev_config->bus);
+	if (rc < 0) {
+		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+		return rc;
+	}
+
+	rc = flash_chip_init(dev);
+
+	/* Release the MSPI controller - it was acquired by the call to
+	 * mspi_dev_config() in flash_chip_init().
+	 */
+	(void)mspi_get_channel_status(dev_config->bus, 0);
+
+	(void)pm_device_runtime_put(dev_config->bus);
+
+	if (rc < 0) {
+		return rc;
+	}
+
+	k_sem_init(&dev_data->acquired, 1, K_SEM_MAX_LIMIT);
+
+	return pm_device_driver_init(dev, dev_pm_action_cb);
+}
+
+static DEVICE_API(flash, drv_api) = {
+	.read = api_read,
+	.write = api_write,
+	.erase = api_erase,
+	.get_parameters = api_get_parameters,
+#if defined(CONFIG_FLASH_PAGE_LAYOUT)
+	.page_layout = api_page_layout,
+#endif
+#if defined(CONFIG_FLASH_JESD216_API)
+	.sfdp_read = api_sfdp_read,
+	.read_jedec_id = api_read_jedec_id,
+#endif
+};
+
+#define FLASH_SIZE_INST(inst) (DT_INST_PROP(inst, size) / 8)
+
+#if defined(CONFIG_FLASH_PAGE_LAYOUT)
+BUILD_ASSERT((CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE % 4096) == 0,
+	"MSPI_NOR_FLASH_LAYOUT_PAGE_SIZE must be multiple of 4096");
+#define FLASH_PAGE_LAYOUT_DEFINE(inst) \
+	.layout = { \
+		.pages_size = CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE, \
+		.pages_count = FLASH_SIZE_INST(inst) \
+			     / CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE, \
+	},
+#define FLASH_PAGE_LAYOUT_CHECK(inst) \
+BUILD_ASSERT((FLASH_SIZE_INST(inst) % CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE) == 0, \
+	"MSPI_NOR_FLASH_LAYOUT_PAGE_SIZE incompatible with flash size, instance " #inst);
+#else
+#define FLASH_PAGE_LAYOUT_DEFINE(inst)
+#define FLASH_PAGE_LAYOUT_CHECK(inst)
+#endif
+
+/* MSPI bus must be initialized before this device. */
+#if (CONFIG_MSPI_INIT_PRIORITY < CONFIG_FLASH_INIT_PRIORITY)
+#define INIT_PRIORITY CONFIG_FLASH_INIT_PRIORITY
+#else
+#define INIT_PRIORITY UTIL_INC(CONFIG_MSPI_INIT_PRIORITY)
+#endif
+
+#define FLASH_MSPI_NOR_INST(inst)						\
+	BUILD_ASSERT(DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		     MSPI_IO_MODE_OCTAL,					\
+		"Only Octal I/O mode is supported for now");			\
+	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);			\
+	static struct flash_mspi_nor_data dev##inst##_data;			\
+	static const struct flash_mspi_nor_config dev##inst##_config = {	\
+		.bus = DEVICE_DT_GET(DT_INST_BUS(inst)),			\
+		.flash_size = FLASH_SIZE_INST(inst),				\
+		.mspi_id = MSPI_DEVICE_ID_DT_INST(inst),			\
+		.mspi_cfg = MSPI_DEVICE_CONFIG_DT_INST(inst),			\
+		.mspi_cfg_mask = DT_PROP(DT_INST_BUS(inst),			\
+					 software_multiperipheral)		\
+			       ? MSPI_DEVICE_CONFIG_ALL				\
+			       : MSPI_DEVICE_CONFIG_NONE,			\
+	IF_ENABLED(CONFIG_MSPI_XIP,						\
+		(.xip_cfg = MSPI_XIP_CONFIG_DT_INST(inst),))			\
+	IF_ENABLED(WITH_RESET_GPIO,						\
+		(.reset = GPIO_DT_SPEC_INST_GET_OR(inst, reset_gpios, {0}),	\
+		.reset_pulse_us = DT_INST_PROP_OR(inst, t_reset_pulse, 0)	\
+				/ 1000,						\
+		.reset_recovery_us = DT_INST_PROP_OR(inst, t_reset_recovery, 0)	\
+				   / 1000,))					\
+		FLASH_PAGE_LAYOUT_DEFINE(inst)					\
+		.jedec_id = DT_INST_PROP(inst, jedec_id),			\
+	};									\
+	FLASH_PAGE_LAYOUT_CHECK(inst)						\
+	DEVICE_DT_INST_DEFINE(inst,						\
+		drv_init, PM_DEVICE_DT_INST_GET(inst),				\
+		&dev##inst##_data, &dev##inst##_config,				\
+		POST_KERNEL, INIT_PRIORITY,					\
+		&drv_api);
+
+DT_INST_FOREACH_STATUS_OKAY(FLASH_MSPI_NOR_INST)
diff --git a/dts/bindings/mtd/jedec,mspi-nor.yaml b/dts/bindings/mtd/jedec,mspi-nor.yaml
new file mode 100644
index 00000000000..5bad8f54b5d
--- /dev/null
+++ b/dts/bindings/mtd/jedec,mspi-nor.yaml
@@ -0,0 +1,24 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Generic NOR flash on MSPI bus
+
+compatible: "jedec,mspi-nor"
+
+include: [mspi-device.yaml, "jedec,spi-nor-common.yaml"]
+
+properties:
+  reset-gpios:
+    type: phandle-array
+    description: |
+      RESET line. If specified, the flash chip will be reset at initialization.
+
+  t-reset-pulse:
+    type: int
+    description: |
+      Minimum duration, in nanoseconds, of an active pulse on the RESET line.
+
+  t-reset-recovery:
+    type: int
+    description: |
+      Minimum time, in nanoseconds, the flash chip needs to recover after reset.

From 1e15d207b52ef3936a71a8dd290b546ab380b3c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 17 Oct 2024 14:17:54 +0200
Subject: [PATCH 2558/2913] [nrf fromtree] drivers: pinctrl_nrf: Add support
 for EXMIF pins
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a follow-up to commit 45d827a51a708e54437f5681dc6c4fb77bfb4f52.

Although routing for those pins is configured via UICR, pinctrl still
needs to be involved so that it is possible to set desired drive mode
for them etc.
Add also the missing RWDS pin.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit 2e8c79f2efc9b4fe20c0ec8ba12d18a0de038a6e)
---
 drivers/pinctrl/pinctrl_nrf.c                  | 18 ++++++++++++++++++
 .../zephyr/dt-bindings/pinctrl/nrf-pinctrl.h   |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index d319b8fe288..5c6de495624 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -390,6 +390,24 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_can) */
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
+		/* Pin routing is controlled by secure domain, via UICR */
+		case NRF_FUN_EXMIF_CK:
+		case NRF_FUN_EXMIF_DQ0:
+		case NRF_FUN_EXMIF_DQ1:
+		case NRF_FUN_EXMIF_DQ2:
+		case NRF_FUN_EXMIF_DQ3:
+		case NRF_FUN_EXMIF_DQ4:
+		case NRF_FUN_EXMIF_DQ5:
+		case NRF_FUN_EXMIF_DQ6:
+		case NRF_FUN_EXMIF_DQ7:
+		case NRF_FUN_EXMIF_CS0:
+		case NRF_FUN_EXMIF_CS1:
+		case NRF_FUN_EXMIF_RWDS:
+			dir = NRF_GPIO_PIN_DIR_INPUT;
+			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
+			break;
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) */
 #if defined(NRF_PSEL_TWIS)
 		case NRF_FUN_TWIS_SCL:
 			NRF_PSEL_TWIS(reg, SCL) = psel;
diff --git a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
index 25e56144bc8..81a7a8bc77d 100644
--- a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
@@ -166,6 +166,8 @@
 #define NRF_FUN_TWIS_SCL 48U
 /** TWIS SDA */
 #define NRF_FUN_TWIS_SDA 49U
+/** EXMIF RWDS */
+#define NRF_FUN_EXMIF_RWDS 50U
 /** GRTC fast clock output */
 #define NRF_FUN_GRTC_CLKOUT_FAST 55U
 /** GRTC slow clock output */

From eeb989e1058237883de054d82688af0e998fe49b Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Date: Thu, 6 Feb 2025 13:55:49 +0100
Subject: [PATCH 2559/2913] [nrf fromtree] boards: nrf9280pdk: remove can
 enablement

CAN is not supported yet, so remove it from the board for now.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
(cherry picked from commit 2512d3d57e1c6b583ca3fcb15a76349c19f167d7)
---
 .../nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi |  7 -------
 .../nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts   | 11 -----------
 .../nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.yaml  |  1 -
 3 files changed, 19 deletions(-)

diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
index 48067a7052c..4cae3ba580f 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
@@ -60,13 +60,6 @@
 		};
 	};
 
-	/omit-if-no-ref/ can120_default: can120_default {
-		group1 {
-			psels = <NRF_PSEL(CAN_RX, 9, 4)>,
-				<NRF_PSEL(CAN_TX, 9, 5)>;
-		};
-	};
-
 	/omit-if-no-ref/ pwm130_default: pwm130_default {
 		group1 {
 			psels = <NRF_PSEL(PWM_OUT0, 9, 2)>;
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index a380ac7473a..11760974a11 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -27,7 +27,6 @@
 		zephyr,ieee802154 = &cpuapp_ieee802154;
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
-		zephyr,canbus = &can120;
 	};
 
 	aliases {
@@ -275,16 +274,6 @@ zephyr_udc0: &usbhs {
 	status = "okay";
 };
 
-&canpll {
-	status = "okay";
-};
-
-&can120 {
-	status = "okay";
-	pinctrl-0 = <&can120_default>;
-	pinctrl-names = "default";
-};
-
 &pwm130 {
 	status = "okay";
 	pinctrl-0 = <&pwm130_default>;
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.yaml b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.yaml
index 9c2aff88052..68babc33bcf 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.yaml
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.yaml
@@ -14,7 +14,6 @@ ram: 512
 flash: 1024
 supported:
   - adc
-  - can
   - counter
   - gpio
   - i2c

From 45a4bc3e61505075808f0f2b5345e60000afc9df Mon Sep 17 00:00:00 2001
From: Kamil Gawor <Kamil.Gawor@nordicsemi.no>
Date: Tue, 9 Apr 2024 14:24:34 +0200
Subject: [PATCH 2560/2913] [nrf noup] entropy: Add fake entropy nRF PRNG
 driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This adds temporary entropy driver simulation for
nRF54h20 device since final entropy source is not
available yet.

TODO: Remove this commit when proper solution will
be available.

Jira: NCSDK-25947

Signed-off-by: Kamil Gawor <Kamil.Gawor@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Andreas Moltumyr <andreas.moltumyr@nordicsemi.no>
Signed-off-by: Karol Lasończyk <karol.lasonczyk@nordicsemi.no>
(cherry picked from commit 0d8345e043b78b9cbea34abfe508eff0ae5fd7b1)
(cherry picked from commit ac886cc886287031e90ec7a35f59c2205cb95265)
---
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts |   6 ++
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts |   5 +
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts  |   6 ++
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts  |   5 +
 drivers/entropy/CMakeLists.txt                |   7 ++
 drivers/entropy/Kconfig                       |   1 +
 drivers/entropy/Kconfig.nrf_prng              |  19 ++++
 drivers/entropy/fake_entropy_nrf_prng.c       | 101 ++++++++++++++++++
 dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi      |   9 ++
 dts/bindings/rng/nordic,nrf-prng.yaml         |   8 ++
 10 files changed, 167 insertions(+)
 create mode 100644 drivers/entropy/Kconfig.nrf_prng
 create mode 100644 drivers/entropy/fake_entropy_nrf_prng.c
 create mode 100644 dts/bindings/rng/nordic,nrf-prng.yaml

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 95d557bf944..05d62c1057f 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -26,6 +26,7 @@
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,canbus = &can120;
+		zephyr,entropy = &prng;
 	};
 
 	aliases {
@@ -106,6 +107,11 @@
 			pwms = <&pwm130 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
 		};
 	};
+
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
+	};
 };
 
 &cpuapp_ram0x_region {
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
index 49ca847873f..8734ff9f745 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
@@ -27,6 +27,11 @@
 		zephyr,ieee802154 = &cpurad_ieee802154;
 		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
+		zephyr,entropy = &prng;
+	};
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
 	};
 	aliases {
 		ipc-to-cpusys = &cpurad_cpusys_ipc;
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index 11760974a11..71c3acaf8a1 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -27,6 +27,7 @@
 		zephyr,ieee802154 = &cpuapp_ieee802154;
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
+		zephyr,entropy = &prng;
 	};
 
 	aliases {
@@ -107,6 +108,11 @@
 			pwms = <&pwm130 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
 		};
 	};
+
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
+	};
 };
 
 &cpuapp_ram0x_region {
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
index f9bfae09897..f1f3af54132 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
@@ -28,6 +28,11 @@
 		zephyr,ieee802154 = &cpurad_ieee802154;
 		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
+		zephyr,entropy = &prng;
+	};
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
 	};
 	aliases {
 		ipc-to-cpusys = &cpurad_cpusys_ipc;
diff --git a/drivers/entropy/CMakeLists.txt b/drivers/entropy/CMakeLists.txt
index d5588378f6f..e23b558a6a9 100644
--- a/drivers/entropy/CMakeLists.txt
+++ b/drivers/entropy/CMakeLists.txt
@@ -36,4 +36,11 @@ zephyr_library_sources_ifdef(CONFIG_ENTROPY_NPCX_DRBG       entropy_npcx_drbg.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_MAX32_TRNG      entropy_max32.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_RENESAS_RA      entropy_renesas_ra.c)
 
+if (CONFIG_FAKE_ENTROPY_NRF_PRNG)
+  zephyr_library_sources(fake_entropy_nrf_prng.c)
+
+  message(WARNING "\nA nRF PRNG is used, which does not produce real random bits."
+  "This is not secure and should therefore never be used in a product.")
+endif()
+
 zephyr_library_link_libraries_ifdef(CONFIG_BUILD_WITH_TFM tfm_api)
diff --git a/drivers/entropy/Kconfig b/drivers/entropy/Kconfig
index debd0f8d7a1..40571df47f1 100644
--- a/drivers/entropy/Kconfig
+++ b/drivers/entropy/Kconfig
@@ -38,6 +38,7 @@ source "drivers/entropy/Kconfig.psa_crypto"
 source "drivers/entropy/Kconfig.npcx"
 source "drivers/entropy/Kconfig.max32"
 source "drivers/entropy/Kconfig.renesas_ra"
+source "drivers/entropy/Kconfig.nrf_prng"
 
 config ENTROPY_HAS_DRIVER
 	bool
diff --git a/drivers/entropy/Kconfig.nrf_prng b/drivers/entropy/Kconfig.nrf_prng
new file mode 100644
index 00000000000..e81db4de4b1
--- /dev/null
+++ b/drivers/entropy/Kconfig.nrf_prng
@@ -0,0 +1,19 @@
+# nRF fake entropy prng generator driver configuration
+
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if ENTROPY_GENERATOR
+
+config FAKE_ENTROPY_NRF_PRNG
+	bool "A fake nRF entropy driver"
+	default y
+	depends on DT_HAS_NORDIC_ENTROPY_PRNG_ENABLED
+	depends on (SOC_SERIES_NRF54HX || SOC_SERIES_NRF92X || SOC_SERIES_NRF54LX)
+	select ENTROPY_HAS_DRIVER
+	help
+	  This is a super simple PRNG driver that can be used on nRF platforms that
+	  do not have an entropy source.
+	  This is NOT SAFE to use for cryptographic operations!
+
+endif
diff --git a/drivers/entropy/fake_entropy_nrf_prng.c b/drivers/entropy/fake_entropy_nrf_prng.c
new file mode 100644
index 00000000000..8624c844405
--- /dev/null
+++ b/drivers/entropy/fake_entropy_nrf_prng.c
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/init.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <zephyr/drivers/entropy.h>
+
+#define DT_DRV_COMPAT nordic_entropy_prng
+
+/* This file implements a pseudo-RNG
+ * https://vigna.di.unimi.it/xorshift/xoshiro128plus.c
+ */
+
+static uint32_t s[4];
+
+static inline uint32_t rotl(const uint32_t x, int k)
+{
+	return (x << k) | (x >> (32 - k));
+}
+
+static uint32_t rng_next(void)
+{
+	const uint32_t result = rotl(s[0] + s[3], 7) + s[0];
+
+	const uint32_t t = s[1] << 9;
+
+	s[2] ^= s[0];
+	s[3] ^= s[1];
+	s[1] ^= s[2];
+	s[0] ^= s[3];
+
+	s[2] ^= t;
+
+	s[3] = rotl(s[3], 11);
+
+	return result;
+}
+
+static int entropy_prng_get_entropy(const struct device *dev, uint8_t *buffer, uint16_t length)
+{
+	ARG_UNUSED(dev);
+
+	while (length) {
+		/*
+		 * Note that only 1 thread (Zephyr thread or HW models), runs at
+		 * a time, therefore there is no need to use random_r()
+		 */
+		uint32_t value = rng_next();
+
+		size_t to_copy = MIN(length, sizeof(long));
+
+		memcpy(buffer, &value, to_copy);
+		buffer += to_copy;
+		length -= to_copy;
+	}
+
+	return 0;
+}
+
+static int entropy_prng_get_entropy_isr(const struct device *dev, uint8_t *buf, uint16_t len,
+					uint32_t flags)
+{
+	ARG_UNUSED(flags);
+
+	int err;
+
+	/*
+	 * entropy_prng_get_entropy() is also safe for ISRs
+	 * and always produces data.
+	 */
+	err = entropy_prng_get_entropy(dev, buf, len);
+	if (err < 0) {
+		return err;
+	} else {
+		return len;
+	}
+}
+
+static int entropy_prng_init(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	/* Picked some arbitrary initial seed. */
+	s[0] = 0xAF568BC0;
+	s[1] = 0xAC34307E;
+	s[2] = 0x9B7F6DD1;
+	s[3] = 0xD84319FC;
+	return 0;
+}
+
+static const struct entropy_driver_api entropy_prng_api_funcs = {
+	.get_entropy = entropy_prng_get_entropy, .get_entropy_isr = entropy_prng_get_entropy_isr};
+
+DEVICE_DT_INST_DEFINE(0, entropy_prng_init, NULL, NULL, NULL, PRE_KERNEL_1,
+		      CONFIG_ENTROPY_INIT_PRIORITY, &entropy_prng_api_funcs);
diff --git a/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi b/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
index 2df3fc59676..5c7e5db3001 100644
--- a/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
@@ -16,6 +16,10 @@ nvic: &cpuapp_nvic {};
 /delete-node/ &cpuflpr_clic;
 
 / {
+	chosen {
+		zephyr,entropy = &prng;
+	};
+
 	soc {
 		compatible = "simple-bus";
 		interrupt-parent = <&cpuapp_nvic>;
@@ -26,6 +30,11 @@ nvic: &cpuapp_nvic {};
 		compatible = "zephyr,psa-crypto-rng";
 		status = "disabled";
 	};
+
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
+	};
 };
 
 &cpuflpr_vpr {
diff --git a/dts/bindings/rng/nordic,nrf-prng.yaml b/dts/bindings/rng/nordic,nrf-prng.yaml
new file mode 100644
index 00000000000..8936393a0b6
--- /dev/null
+++ b/dts/bindings/rng/nordic,nrf-prng.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+
+description: This is a super simple PRNG
+
+compatible: "nordic,entropy-prng"
+
+include: base.yaml

From 21fc3ecfff77dfe9e895856abb5425fe12512a2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 17 Oct 2024 17:43:48 +0200
Subject: [PATCH 2561/2913] [nrf fromtree] dts: nordic: Change compatible
 property for EXMIF node
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a follow-up to commit cdf45cb234077522b5cef2da084869af43d42dc1.

Adjust the DTS node for the nRF EXMIF peripheral so that it is possible
to handle the peripheral with the generic MSPI driver for DW SSI based
controllers and use all its data lines in communication.
Also adjust the related board files accordingly.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit 271a41a4a5f1dd90837a7550c46d0f0bba28c5bb)
---
 .../nrf54h20dk_nrf54h20-pinctrl.dtsi          | 27 ++++++++++++++++++-
 .../nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts | 19 ++++++++++---
 .../nrf9280pdk_nrf9280-pinctrl.dtsi           | 27 ++++++++++++++++++-
 .../nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts  | 19 ++++++++++---
 .../{spi => mspi}/nordic,nrf-exmif.yaml       |  6 +----
 dts/common/nordic/nrf54h20.dtsi               |  5 ++--
 dts/common/nordic/nrf9280.dtsi                |  5 ++--
 7 files changed, 87 insertions(+), 21 deletions(-)
 rename dts/bindings/{spi => mspi}/nordic,nrf-exmif.yaml (70%)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
index 9b574a18ec5..f62df87dfe2 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
@@ -73,12 +73,37 @@
 	/omit-if-no-ref/ exmif_default: exmif_default {
 		group1 {
 			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
 				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
 			nordic,drive-mode = <NRF_DRIVE_H0H1>;
 		};
 	};
 
+	/omit-if-no-ref/ exmif_sleep: exmif_sleep {
+		group1 {
+			low-power-enable;
+			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
+				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
+		};
+	};
+
 	/omit-if-no-ref/ can120_default: can120_default {
 		group1 {
 			psels = <NRF_PSEL(CAN_RX, 9, 4)>,
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 05d62c1057f..06e642948f3 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -262,15 +262,15 @@ ipc0: &cpuapp_cpurad_ipc {
 };
 
 &exmif {
-	cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&exmif_default>;
-	pinctrl-names = "default";
+	pinctrl-1 = <&exmif_sleep>;
+	pinctrl-names = "default", "sleep";
 	status = "okay";
+
 	mx25uw63: mx25uw6345g@0 {
-		compatible = "jedec,spi-nor";
+		compatible = "jedec,mspi-nor";
 		status = "disabled";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(48)>;
 		jedec-id = [c2 84 37];
 		sfdp-bfp = [
 			e5 20 8a ff  ff ff ff 03  00 ff 00 ff  00 ff 00 ff
@@ -283,6 +283,17 @@ ipc0: &cpuapp_cpurad_ipc {
 		has-dpd;
 		t-enter-dpd = <10000>;
 		t-exit-dpd = <30000>;
+		reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;
+		t-reset-pulse = <10000>;
+		t-reset-recovery = <35000>;
+
+		mspi-max-frequency = <DT_FREQ_M(50)>;
+		mspi-io-mode = "MSPI_IO_MODE_OCTAL";
+		mspi-data-rate = "MSPI_DATA_RATE_SINGLE";
+		mspi-hardware-ce-num = <1>;
+		mspi-cpp-mode = "MSPI_CPP_MODE_0";
+		mspi-endian = "MSPI_BIG_ENDIAN";
+		mspi-ce-polarity = "MSPI_CE_ACTIVE_LOW";
 	};
 };
 
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
index 4cae3ba580f..709fda74f89 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
@@ -54,12 +54,37 @@
 	/omit-if-no-ref/ exmif_default: exmif_default {
 		group1 {
 			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
 				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
 			nordic,drive-mode = <NRF_DRIVE_H0H1>;
 		};
 	};
 
+	/omit-if-no-ref/ exmif_sleep: exmif_sleep {
+		group1 {
+			low-power-enable;
+			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
+				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
+		};
+	};
+
 	/omit-if-no-ref/ pwm130_default: pwm130_default {
 		group1 {
 			psels = <NRF_PSEL(PWM_OUT0, 9, 2)>;
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index 71c3acaf8a1..a7b61861bed 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -248,15 +248,15 @@ ipc0: &cpuapp_cpurad_ipc {
 };
 
 &exmif {
-	cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&exmif_default>;
-	pinctrl-names = "default";
+	pinctrl-1 = <&exmif_sleep>;
+	pinctrl-names = "default", "sleep";
 	status = "okay";
+
 	mx25uw63: mx25uw6345g@0 {
-		compatible = "jedec,spi-nor";
+		compatible = "jedec,mspi-nor";
 		status = "disabled";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(48)>;
 		jedec-id = [c2 84 37];
 		sfdp-bfp = [
 			e5 20 8a ff  ff ff ff 03  00 ff 00 ff  00 ff 00 ff
@@ -269,6 +269,17 @@ ipc0: &cpuapp_cpurad_ipc {
 		has-dpd;
 		t-enter-dpd = <10000>;
 		t-exit-dpd = <30000>;
+		reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;
+		t-reset-pulse = <10000>;
+		t-reset-recovery = <35000>;
+
+		mspi-max-frequency = <DT_FREQ_M(50)>;
+		mspi-io-mode = "MSPI_IO_MODE_OCTAL";
+		mspi-data-rate = "MSPI_DATA_RATE_SINGLE";
+		mspi-hardware-ce-num = <1>;
+		mspi-cpp-mode = "MSPI_CPP_MODE_0";
+		mspi-endian = "MSPI_BIG_ENDIAN";
+		mspi-ce-polarity = "MSPI_CE_ACTIVE_LOW";
 	};
 };
 
diff --git a/dts/bindings/spi/nordic,nrf-exmif.yaml b/dts/bindings/mspi/nordic,nrf-exmif.yaml
similarity index 70%
rename from dts/bindings/spi/nordic,nrf-exmif.yaml
rename to dts/bindings/mspi/nordic,nrf-exmif.yaml
index d2b8815046b..294254aa60e 100644
--- a/dts/bindings/spi/nordic,nrf-exmif.yaml
+++ b/dts/bindings/mspi/nordic,nrf-exmif.yaml
@@ -5,8 +5,4 @@ description: Nordic External Memory Interface (EXMIF)
 
 compatible: "nordic,nrf-exmif"
 
-include: snps,designware-spi.yaml
-
-properties:
-  reg:
-    required: true
+include: snps,designware-ssi.yaml
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index b0ceded8bcb..cddcbcd0790 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -521,8 +521,8 @@
 				status = "disabled";
 			};
 
-			exmif: spi@95000 {
-				compatible = "nordic,nrf-exmif";
+			exmif: exmif@95000 {
+				compatible = "nordic,nrf-exmif", "snps,designware-ssi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x95000 0x500 0x95500 0xb00>;
@@ -531,7 +531,6 @@
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 				clock-frequency = <DT_FREQ_M(400)>;
 				fifo-depth = <32>;
-				max-xfer-size = <16>;
 				status = "disabled";
 			};
 
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 4c5dcefa801..0907be9d9a6 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -375,8 +375,8 @@
 				status = "disabled";
 			};
 
-			exmif: spi@95000 {
-				compatible = "nordic,nrf-exmif";
+			exmif: exmif@95000 {
+				compatible = "nordic,nrf-exmif", "snps,designware-ssi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x95000 0x500 0x95500 0xb00>;
@@ -384,7 +384,6 @@
 				interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>;
 				clock-frequency = <DT_FREQ_M(400)>;
 				fifo-depth = <32>;
-				max-xfer-size = <16>;
 				status = "disabled";
 			};
 

From 6ee4929ed354e1681473bec43c184492c5052530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Fri, 18 Oct 2024 10:16:08 +0200
Subject: [PATCH 2562/2913] [nrf fromtree] samples|tests: drivers: flash: Add
 support for "jedec,mspi-nor" devices
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extend several flash samples and tests so that they can also be used
with "jedec,mspi-nor" devices.
Add configurations needed for the nrf54h20dk/nrf54h20/cpuapp target.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit 2d003e3ef4453295f8824557ab7a9f0fcb68df77)
---
 .../jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay    | 9 +++++++++
 samples/drivers/jesd216/sample.yaml                      | 2 +-
 samples/drivers/jesd216/src/main.c                       | 4 +++-
 .../spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay  | 9 +++++++++
 samples/drivers/spi_flash/sample.yaml                    | 2 +-
 samples/drivers/spi_flash/src/main.c                     | 2 ++
 .../common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay     | 9 +++++++++
 tests/drivers/flash/common/src/main.c                    | 2 ++
 8 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..b8f138ad2b2
--- /dev/null
+++ b/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&mx25uw63 {
+	status = "okay";
+};
diff --git a/samples/drivers/jesd216/sample.yaml b/samples/drivers/jesd216/sample.yaml
index 0ea0dae331a..4be5e5defbb 100644
--- a/samples/drivers/jesd216/sample.yaml
+++ b/samples/drivers/jesd216/sample.yaml
@@ -21,7 +21,7 @@ tests:
       - hifive_unmatched/fu740/u74
       - mimxrt1170_evk/mimxrt1176/cm7
       - mimxrt1170_evk/mimxrt1176/cm4
-    filter: dt_compat_enabled("jedec,spi-nor")
+    filter: dt_compat_enabled("jedec,spi-nor") or dt_compat_enabled("jedec,mspi-nor")
     depends_on: spi
   sample.drivers.jesd216.nrf52840dk_spi:
     extra_args:
diff --git a/samples/drivers/jesd216/src/main.c b/samples/drivers/jesd216/src/main.c
index 480649397b6..b8dad485997 100644
--- a/samples/drivers/jesd216/src/main.c
+++ b/samples/drivers/jesd216/src/main.c
@@ -14,6 +14,8 @@
 
 #if DT_HAS_COMPAT_STATUS_OKAY(jedec_spi_nor)
 #define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_spi_nor)
+#elif DT_HAS_COMPAT_STATUS_OKAY(jedec_mspi_nor)
+#define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_mspi_nor)
 #elif DT_HAS_COMPAT_STATUS_OKAY(nordic_qspi_nor)
 #define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(nordic_qspi_nor)
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_qspi_nor)
@@ -201,7 +203,7 @@ static void summarize_dw15(const struct jesd216_param_header *php,
 		printf("0-4-4 Mode methods: entry 0x%01x ; exit 0x%02x\n",
 		       dw15.entry_044, dw15.exit_044);
 	} else {
-		printf("0-4-4 Mode: not supported");
+		printf("0-4-4 Mode: not supported\n");
 	}
 	printf("4-4-4 Mode sequences: enable 0x%02x ; disable 0x%01x\n",
 	       dw15.enable_444, dw15.disable_444);
diff --git a/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..b8f138ad2b2
--- /dev/null
+++ b/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&mx25uw63 {
+	status = "okay";
+};
diff --git a/samples/drivers/spi_flash/sample.yaml b/samples/drivers/spi_flash/sample.yaml
index a3b8cfed380..351e33997a0 100644
--- a/samples/drivers/spi_flash/sample.yaml
+++ b/samples/drivers/spi_flash/sample.yaml
@@ -7,7 +7,7 @@ tests:
       - flash
     filter: dt_compat_enabled("jedec,spi-nor") or dt_compat_enabled("st,stm32-qspi-nor")
       or dt_compat_enabled("st,stm32-ospi-nor") or dt_compat_enabled("st,stm32-xspi-nor")
-      or (dt_compat_enabled("nordic,qspi-nor") and CONFIG_NORDIC_QSPI_NOR)
+      or dt_compat_enabled("nordic,qspi-nor") or dt_compat_enabled("jedec,mspi-nor")
     platform_exclude:
       - hifive_unmatched/fu740/s7
       - hifive_unmatched/fu740/u74
diff --git a/samples/drivers/spi_flash/src/main.c b/samples/drivers/spi_flash/src/main.c
index b84359ae05b..52e8b6062b5 100644
--- a/samples/drivers/spi_flash/src/main.c
+++ b/samples/drivers/spi_flash/src/main.c
@@ -34,6 +34,8 @@
 
 #if DT_HAS_COMPAT_STATUS_OKAY(jedec_spi_nor)
 #define SPI_FLASH_COMPAT jedec_spi_nor
+#elif DT_HAS_COMPAT_STATUS_OKAY(jedec_mspi_nor)
+#define SPI_FLASH_COMPAT jedec_mspi_nor
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_qspi_nor)
 #define SPI_FLASH_COMPAT st_stm32_qspi_nor
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_ospi_nor)
diff --git a/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..b8f138ad2b2
--- /dev/null
+++ b/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&mx25uw63 {
+	status = "okay";
+};
diff --git a/tests/drivers/flash/common/src/main.c b/tests/drivers/flash/common/src/main.c
index e7552aaf177..54b868a9234 100644
--- a/tests/drivers/flash/common/src/main.c
+++ b/tests/drivers/flash/common/src/main.c
@@ -14,6 +14,8 @@
 #define TEST_AREA_DEV_NODE	DT_INST(0, nordic_qspi_nor)
 #elif defined(CONFIG_SPI_NOR)
 #define TEST_AREA_DEV_NODE	DT_INST(0, jedec_spi_nor)
+#elif defined(CONFIG_FLASH_MSPI_NOR)
+#define TEST_AREA_DEV_NODE	DT_INST(0, jedec_mspi_nor)
 #else
 #define TEST_AREA	storage_partition
 #endif

From b8c061637f6a7e2133a4cff0ada148e66181bfd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Tue, 3 Dec 2024 17:51:51 +0100
Subject: [PATCH 2563/2913] [nrf fromtree] boards: nrf54h20dk: Add XIP region
 definition to memory map
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Access to this region must be requested through UICR by a local
domain that want to use the Execute In Place (XIP) feature of
the EXMIF peripheral.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit a2ef8a6a97d49a0ea3e51d0b44d68015f24be3d2)
---
 .../nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index 8392389c0ad..165fa12ba80 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -174,6 +174,15 @@
 			zephyr,memory-region = "DMA_RAM3x_RAD";
 			zephyr,memory-attr = <( DT_MEM_DMA )>;
 		};
+
+		xip_region: memory@60000000 {
+			compatible = "nordic,owned-memory";
+			reg = <0x60000000 0x20000000>;
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x60000000 0x20000000>;
+		};
 	};
 };
 

From b46c37f64161be569bd22258792517308b2a0105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Tue, 3 Dec 2024 18:02:10 +0100
Subject: [PATCH 2564/2913] [nrf fromtree] samples: code_relocation_nocopy: Add
 configuration for nRF54H20 DK
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add nRF54H20 DK specific entries to allow using the sample on this
board.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit ac3355ab97deff8dddea8b83fd1472afa3c6a2ed)
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.conf      |  1 +
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay   | 17 +++++++++++++++++
 .../code_relocation_nocopy/linker_arm_nocopy.ld |  7 +++++++
 3 files changed, 25 insertions(+)
 create mode 100644 samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..83035081389
--- /dev/null
+++ b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_FLASH=y
diff --git a/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..ab53f12725d
--- /dev/null
+++ b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,17 @@
+&cpuapp_ram0x_region {
+	nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWXS>;
+};
+
+&xip_region {
+	status = "okay";
+	nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RX>;
+};
+
+&mx25uw63 {
+	read-command = <0xEC13>;
+	command-length = "INSTR_2_BYTE";
+	address-length = "ADDR_4_BYTE";
+	rx-dummy = <20>;
+
+	xip-config = <1 0 0x20000000 0>;
+};
diff --git a/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld b/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
index a1467f8e264..0a11783cca2 100644
--- a/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
+++ b/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
@@ -47,6 +47,13 @@
 #define EXTFLASH_ADDR	DT_REG_ADDR(DT_INST(0, st_stm32_xspi_nor))
 #define EXTFLASH_SIZE	DT_REG_ADDR_BY_IDX(DT_INST(0, st_stm32_xspi_nor), 1)
 
+#elif defined(CONFIG_FLASH_MSPI_NOR) && defined(CONFIG_SOC_NRF54H20_CPUAPP)
+
+#define EXTFLASH_NODE	DT_INST(0, jedec_mspi_nor)
+#define EXTFLASH_ADDR	0x60000000
+#define EXTFLASH_SIZE	DT_PROP_OR(EXTFLASH_NODE, size_in_bytes, \
+				   DT_PROP(EXTFLASH_NODE, size) / 8)
+
 #else
 
 /*

From dd02c8607dd98dcfe5ae072f2ce2a25f940633e5 Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Fri, 7 Feb 2025 15:01:18 +0100
Subject: [PATCH 2565/2913] [nrf fromlist] drivers: flash: mspi_nor: support
 MODE_SINGLE and MODE_QUAD_1_4_4

Extend driver to support single lane and 1-4-4 IO modes.

Upstream PR #: 85520

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 drivers/flash/flash_mspi_nor.c | 396 ++++++++++++++++++++++++---------
 1 file changed, 290 insertions(+), 106 deletions(-)

diff --git a/drivers/flash/flash_mspi_nor.c b/drivers/flash/flash_mspi_nor.c
index a5ced1e0070..792596a9b1c 100644
--- a/drivers/flash/flash_mspi_nor.c
+++ b/drivers/flash/flash_mspi_nor.c
@@ -28,6 +28,183 @@ struct flash_mspi_nor_data {
 	struct mspi_xfer xfer;
 };
 
+struct flash_mspi_nor_cmd {
+	enum mspi_xfer_direction dir;
+	uint32_t cmd;
+	uint16_t tx_dummy;
+	uint16_t rx_dummy;
+	uint8_t cmd_length;
+	uint8_t addr_length;
+};
+
+struct flash_mspi_nor_cmds {
+	struct flash_mspi_nor_cmd id;
+	struct flash_mspi_nor_cmd write_en;
+	struct flash_mspi_nor_cmd read;
+	struct flash_mspi_nor_cmd status;
+	struct flash_mspi_nor_cmd page_program;
+	struct flash_mspi_nor_cmd sector_erase;
+	struct flash_mspi_nor_cmd chip_erase;
+	struct flash_mspi_nor_cmd mode_change;
+	struct flash_mspi_nor_cmd sfdp;
+	uint8_t mode_payload;
+};
+
+static const struct flash_mspi_nor_cmds commands[] = {
+	[MSPI_IO_MODE_SINGLE] = {
+		.id = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_CMD_READ_ID,
+			.cmd_length = 1,
+		},
+		.write_en = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WREN,
+			.cmd_length = 1,
+		},
+		.read = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_READ,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.status = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_RDSR,
+			.cmd_length = 1,
+		},
+		.page_program = {
+			.dir  = MSPI_TX,
+			.cmd = SPI_NOR_CMD_PP,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.sector_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_SE,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.chip_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_CE,
+			.cmd_length = 1,
+		},
+		.mode_change = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WRSR,
+			.cmd_length = 1,
+		},
+		.mode_payload = 0,
+	},
+	[MSPI_IO_MODE_QUAD_1_4_4] = {
+		.id = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_CMD_READ_ID,
+			.cmd_length = 1,
+		},
+		.write_en = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WREN,
+			.cmd_length = 1,
+		},
+		.read = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_4READ,
+			.cmd_length = 1,
+			.addr_length = 3,
+			.rx_dummy = 6,
+		},
+		.status = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_RDSR,
+			.cmd_length = 1,
+		},
+		.page_program = {
+			.dir  = MSPI_TX,
+			.cmd = SPI_NOR_CMD_PP_1_4_4,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.sector_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_SE,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.chip_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_CE,
+			.cmd_length = 1,
+		},
+		.mode_change = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WRSR,
+			.cmd_length = 1,
+		},
+		.mode_payload = SPI_NOR_QE_BIT,
+	},
+	[MSPI_IO_MODE_OCTAL] = {
+		.id = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_OCMD_READ_ID,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 4
+		},
+		.write_en = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_WREN,
+			.cmd_length = 2,
+		},
+		.read = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_OCMD_RD,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 20,
+		},
+		.status = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_OCMD_RDSR,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 4,
+		},
+		.page_program = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_PAGE_PRG,
+			.cmd_length = 2,
+			.addr_length = 4,
+		},
+		.sector_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_SE,
+			.cmd_length = 2,
+			.addr_length = 4,
+		},
+		.chip_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_CE,
+			.cmd_length = 2,
+		},
+		.sfdp = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_OCMD_READ_SFDP,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 20,
+		},
+		.mode_change = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WR_CFGREG2,
+			.cmd_length = 1,
+			.addr_length = 4,
+		},
+		.mode_payload = 0x01,
+	},
+};
+
 struct flash_mspi_nor_config {
 	const struct device *bus;
 	uint32_t flash_size;
@@ -46,6 +223,7 @@ struct flash_mspi_nor_config {
 	struct flash_pages_layout layout;
 #endif
 	uint8_t jedec_id[SPI_NOR_MAX_ID_LEN];
+	const struct flash_mspi_nor_cmds *jedec_cmds;
 };
 
 static int acquire(const struct device *dev)
@@ -104,6 +282,27 @@ static inline uint16_t dev_page_size(const struct device *dev)
 	return SPI_NOR_PAGE_SIZE;
 }
 
+static void command_set(const struct device *dev, const struct flash_mspi_nor_cmd *cmd)
+{
+	struct flash_mspi_nor_data *dev_data = dev->data;
+
+	memset(&dev_data->xfer, 0, sizeof(dev_data->xfer));
+	memset(&dev_data->packet, 0, sizeof(dev_data->packet));
+
+	dev_data->xfer.xfer_mode  = MSPI_PIO;
+	dev_data->xfer.packets    = &dev_data->packet;
+	dev_data->xfer.num_packet = 1;
+	dev_data->xfer.timeout    = 10;
+
+	dev_data->xfer.cmd_length = cmd->cmd_length;
+	dev_data->xfer.addr_length = cmd->addr_length;
+	dev_data->xfer.tx_dummy = cmd->tx_dummy;
+	dev_data->xfer.rx_dummy = cmd->rx_dummy;
+
+	dev_data->packet.dir = cmd->dir;
+	dev_data->packet.cmd = cmd->cmd;
+}
+
 static int api_read(const struct device *dev, off_t addr, void *dest,
 		    size_t size)
 {
@@ -126,11 +325,7 @@ static int api_read(const struct device *dev, off_t addr, void *dest,
 	}
 
 	/* TODO: get rid of all these hard-coded values for MX25Ux chips */
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 20;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = SPI_NOR_OCMD_RD;
+	command_set(dev, &dev_config->jedec_cmds->read);
 	dev_data->packet.address   = addr;
 	dev_data->packet.data_buf  = dest;
 	dev_data->packet.num_bytes = size;
@@ -140,35 +335,38 @@ static int api_read(const struct device *dev, off_t addr, void *dest,
 	release(dev);
 
 	if (rc < 0) {
-		LOG_ERR("SPI_NOR_OCMD_RD xfer failed: %d", rc);
+		LOG_ERR("Read xfer failed: %d", rc);
 		return rc;
 	}
 
 	return 0;
 }
 
-static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
+static int status_get(const struct device *dev, uint8_t *status)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
 	struct flash_mspi_nor_data *dev_data = dev->data;
-	uint8_t status_reg;
+
+	command_set(dev, &dev_config->jedec_cmds->status);
+	dev_data->packet.data_buf  = status;
+	dev_data->packet.num_bytes = sizeof(uint8_t);
+
+	return mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
+}
+
+static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
+{
 	int rc;
+	uint8_t status_reg;
 
 	while (true) {
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.addr_length = 4;
-		dev_data->xfer.rx_dummy    = 4;
-		dev_data->packet.dir       = MSPI_RX;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_RDSR;
-		dev_data->packet.address   = 0;
-		dev_data->packet.data_buf  = &status_reg;
-		dev_data->packet.num_bytes = sizeof(status_reg);
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
+		rc = status_get(dev, &status_reg);
+
 		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_RDSR xfer failed: %d", rc);
+			LOG_ERR("Status xfer failed: %d", rc);
 			return rc;
 		}
+
 		if (!(status_reg & SPI_NOR_WIP_BIT)) {
 			break;
 		}
@@ -179,6 +377,15 @@ static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
 	return 0;
 }
 
+static int write_enable(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+
+	command_set(dev, &dev_config->jedec_cmds->write_en);
+	return mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
+}
+
 static int api_write(const struct device *dev, off_t addr, const void *src,
 		     size_t size)
 {
@@ -207,29 +414,19 @@ static int api_write(const struct device *dev, off_t addr, const void *src,
 		uint16_t page_left = page_size - page_offset;
 		uint16_t to_write = (uint16_t)MIN(size, page_left);
 
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.tx_dummy    = 0;
-		dev_data->packet.dir       = MSPI_TX;
-
-		dev_data->xfer.addr_length = 0;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
-		dev_data->packet.num_bytes = 0;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
+		if (write_enable(dev) < 0) {
+			LOG_ERR("Write enable xfer failed: %d", rc);
 			break;
 		}
 
-		dev_data->xfer.addr_length = 4;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_PAGE_PRG;
+		command_set(dev, &dev_config->jedec_cmds->page_program);
 		dev_data->packet.address   = addr;
 		dev_data->packet.data_buf  = (uint8_t *)src;
 		dev_data->packet.num_bytes = to_write;
 		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_PAGE_PRG xfer failed: %d", rc);
+			LOG_ERR("Page program xfer failed: %d", rc);
 			break;
 		}
 
@@ -273,32 +470,20 @@ static int api_erase(const struct device *dev, off_t addr, size_t size)
 	}
 
 	while (size > 0) {
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.tx_dummy    = 0;
-		dev_data->packet.dir       = MSPI_TX;
-		dev_data->packet.num_bytes = 0;
-
-		dev_data->xfer.addr_length = 0;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
+		rc = write_enable(dev);
 		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
+			LOG_ERR("Write enable failed.");
 			break;
 		}
 
 		if (size == flash_size) {
 			/* Chip erase. */
-			dev_data->xfer.addr_length = 0;
-			dev_data->packet.cmd       = SPI_NOR_OCMD_CE;
-
+			command_set(dev, &dev_config->jedec_cmds->chip_erase);
 			size -= flash_size;
 		} else {
 			/* Sector erase. */
-			dev_data->xfer.addr_length = 4;
-			dev_data->packet.cmd       = SPI_NOR_OCMD_SE;
-			dev_data->packet.address   = addr;
-
+			command_set(dev, &dev_config->jedec_cmds->sector_erase);
+			dev_data->packet.address = addr;
 			addr += SPI_NOR_SECTOR_SIZE;
 			size -= SPI_NOR_SECTOR_SIZE;
 		}
@@ -340,19 +525,14 @@ static int read_jedec_id(const struct device *dev, uint8_t *id)
 	struct flash_mspi_nor_data *dev_data = dev->data;
 	int rc;
 
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 4;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_OCMD_READ_ID;
-	dev_data->packet.address   = 0;
+	command_set(dev, &dev_config->jedec_cmds->id);
 	dev_data->packet.data_buf  = id;
 	dev_data->packet.num_bytes = JESD216_READ_ID_LEN;
+
 	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 			     &dev_data->xfer);
 	if (rc < 0) {
-		printk("mspi_transceive() failed: %d\n", rc);
-		return rc;
+		LOG_ERR("mspi_transceive() failed: %d\n", rc);
 	}
 
 	return rc;
@@ -387,11 +567,8 @@ static int api_sfdp_read(const struct device *dev, off_t addr, void *dest,
 		return rc;
 	}
 
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 20;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_OCMD_READ_SFDP;
+
+	command_set(dev, &dev_config->jedec_cmds->sfdp);
 	dev_data->packet.address   = addr;
 	dev_data->packet.data_buf  = dest;
 	dev_data->packet.num_bytes = size;
@@ -439,6 +616,41 @@ static int dev_pm_action_cb(const struct device *dev,
 	return 0;
 }
 
+static int switch_mode(const struct device *dev, uint8_t *id)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+
+	/* For octal mode:
+	 * If the read ID does not match the one from DTS, assume the flash
+	 * is already in the Octa I/O mode, so switching it is not needed.
+	 */
+	if ((dev_config->mspi_cfg.io_mode == MSPI_IO_MODE_OCTAL) &&
+	     (memcmp(id, dev_config->jedec_id, JESD216_READ_ID_LEN) != 0)) {
+		return 0;
+	}
+
+	command_set(dev, &commands[MSPI_IO_MODE_SINGLE].write_en);
+	int rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		LOG_ERR("Failed to set write enable: %d", rc);
+		return rc;
+	}
+
+	command_set(dev, &dev_config->jedec_cmds->mode_change);
+	dev_data->packet.data_buf  = (uint8_t *)&dev_config->jedec_cmds->mode_payload;
+	dev_data->packet.num_bytes = sizeof(dev_config->jedec_cmds->mode_payload);
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		LOG_ERR("Failed to change IO mode: %d\n", rc);
+		return rc;
+	}
+
+	return 0;
+}
+
 static int flash_chip_init(const struct device *dev)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
@@ -457,55 +669,21 @@ static int flash_chip_init(const struct device *dev)
 		return rc;
 	}
 
-	dev_data->xfer.xfer_mode  = MSPI_PIO;
-	dev_data->xfer.packets    = &dev_data->packet;
-	dev_data->xfer.num_packet = 1;
-	dev_data->xfer.timeout    = 10;
-
-	dev_data->xfer.cmd_length  = 1;
-	dev_data->xfer.addr_length = 0;
-	dev_data->xfer.tx_dummy    = 0;
-	dev_data->xfer.rx_dummy    = 0;
-
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_CMD_READ_ID;
+	command_set(dev, &commands[MSPI_IO_MODE_SINGLE].id);
 	dev_data->packet.data_buf  = id;
 	dev_data->packet.num_bytes = sizeof(id);
+
 	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 			     &dev_data->xfer);
 	if (rc < 0) {
-		LOG_ERR("Failed to read JEDEC ID in single line mode: %d", rc);
+		LOG_ERR("Failed to read JEDEC ID in initial line mode: %d", rc);
 		return rc;
 	}
 
-	/*
-	 * If the read ID does not match the one from DTS, assume the flash
-	 * is already in the Octa I/O mode, so switching it is not needed.
-	 */
-	if (memcmp(id, dev_config->jedec_id, sizeof(id)) == 0) {
-		static const uint8_t enable_sopi[] = { 0x01 };
-
-		dev_data->packet.dir       = MSPI_TX;
-		dev_data->packet.cmd       = SPI_NOR_CMD_WREN;
-		dev_data->packet.num_bytes = 0;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("SPI_NOR_CMD_WREN xfer failed: %d", rc);
-			return rc;
-		}
+	rc = switch_mode(dev, id);
 
-		dev_data->xfer.addr_length = 4;
-		dev_data->packet.cmd       = SPI_NOR_CMD_WR_CFGREG2;
-		dev_data->packet.address   = 0;
-		dev_data->packet.data_buf  = (uint8_t *)&enable_sopi;
-		dev_data->packet.num_bytes = sizeof(enable_sopi);
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			printk("SPI_NOR_CMD_WR_CFGREG2 xfer failed: %d\n", rc);
-			return rc;
-		}
+	if (rc < 0) {
+		LOG_ERR("Failed to switch mode: %d", rc);
 	}
 
 	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
@@ -625,6 +803,7 @@ static DEVICE_API(flash, drv_api) = {
 };
 
 #define FLASH_SIZE_INST(inst) (DT_INST_PROP(inst, size) / 8)
+#define FLASH_CMDS(inst) &commands[DT_INST_ENUM_IDX(inst, mspi_io_mode)]
 
 #if defined(CONFIG_FLASH_PAGE_LAYOUT)
 BUILD_ASSERT((CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE % 4096) == 0,
@@ -651,9 +830,13 @@ BUILD_ASSERT((FLASH_SIZE_INST(inst) % CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE) ==
 #endif
 
 #define FLASH_MSPI_NOR_INST(inst)						\
-	BUILD_ASSERT(DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
-		     MSPI_IO_MODE_OCTAL,					\
-		"Only Octal I/O mode is supported for now");			\
+	BUILD_ASSERT((DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		      MSPI_IO_MODE_SINGLE) ||					\
+		     (DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		      MSPI_IO_MODE_QUAD_1_4_4) ||				\
+		     (DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		      MSPI_IO_MODE_OCTAL),					\
+		"Only 1x, 1-4-4 and 8x I/O modes are supported for now");	\
 	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);			\
 	static struct flash_mspi_nor_data dev##inst##_data;			\
 	static const struct flash_mspi_nor_config dev##inst##_config = {	\
@@ -675,6 +858,7 @@ BUILD_ASSERT((FLASH_SIZE_INST(inst) % CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE) ==
 				   / 1000,))					\
 		FLASH_PAGE_LAYOUT_DEFINE(inst)					\
 		.jedec_id = DT_INST_PROP(inst, jedec_id),			\
+		.jedec_cmds = FLASH_CMDS(inst),					\
 	};									\
 	FLASH_PAGE_LAYOUT_CHECK(inst)						\
 	DEVICE_DT_INST_DEFINE(inst,						\

From a17094ebfe168eb162ff4521748ce0222690ab96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Tue, 17 Dec 2024 21:45:47 +0100
Subject: [PATCH 2566/2913] [nrf noup] drivers: spi_dw: Bring back custom EXMIF
 peripheral handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit brings back modifications from these reverted commits:
- f68b2edaa2233cde29d955bc3d3b3dd75ff50334
- e606246f0fc3e9299cb5bdd3c1e34a091e5d85a1
slightly adjusted so that the EXMIF peripheral is still by default
handled by the mspi_dw driver, and in cases where this driver cannot
be used because something still does not work correctly, one can
switch to the old solution based on the tweaked spi_dw driver.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit 352fb6b750c90973396bd706fd1433801ee35317)
---
 drivers/pinctrl/pinctrl_nrf.c              |  3 +-
 drivers/spi/spi_dw.c                       | 32 +++++++++++++++++++++-
 dts/bindings/spi/nordic,nrf-exmif-spi.yaml |  8 ++++++
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 dts/bindings/spi/nordic,nrf-exmif-spi.yaml

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 5c6de495624..2d4e580a14b 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -390,7 +390,8 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_can) */
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) || \
+	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif_spi)
 		/* Pin routing is controlled by secure domain, via UICR */
 		case NRF_FUN_EXMIF_CK:
 		case NRF_FUN_EXMIF_DQ0:
diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
index bb40deb1c85..e320aa39547 100644
--- a/drivers/spi/spi_dw.c
+++ b/drivers/spi/spi_dw.c
@@ -41,6 +41,14 @@ LOG_MODULE_REGISTER(spi_dw);
 #include <zephyr/drivers/pinctrl.h>
 #endif
 
+#ifdef CONFIG_HAS_NRFX
+#include <nrfx.h>
+#endif
+
+#ifdef CONFIG_SOC_NRF54H20_GPD
+#include <nrf/gpd.h>
+#endif
+
 static inline bool spi_dw_is_slave(struct spi_dw_data *spi)
 {
 	return (IS_ENABLED(CONFIG_SPI_SLAVE) &&
@@ -258,6 +266,7 @@ static int spi_dw_configure(const struct device *dev,
 		/* Baud rate and Slave select, for master only */
 		write_baudr(dev, SPI_DW_CLK_DIVIDER(info->clock_frequency,
 						    config->frequency));
+		write_ser(dev, BIT(config->slave));
 	}
 
 	if (spi_dw_is_slave(spi)) {
@@ -500,6 +509,10 @@ void spi_dw_isr(const struct device *dev)
 	uint32_t int_status;
 	int error;
 
+#ifdef CONFIG_HAS_NRFX
+	NRF_EXMIF->EVENTS_CORE = 0;
+#endif
+
 	int_status = read_isr(dev);
 
 	LOG_DBG("SPI %p int_status 0x%x - (tx: %d, rx: %d)", dev, int_status,
@@ -548,6 +561,18 @@ int spi_dw_init(const struct device *dev)
 
 	DEVICE_MMIO_MAP(dev, K_MEM_CACHE_NONE);
 
+#ifdef CONFIG_HAS_NRFX
+	NRF_EXMIF->INTENSET = BIT(0);
+	NRF_EXMIF->TASKS_START = 1;
+
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	err = nrf_gpd_request(NRF_GPD_FAST_ACTIVE1);
+	if (err < 0) {
+		return err;
+	}
+#endif
+#endif
+
 	info->config_func();
 
 	/* Masking interrupt and making sure controller is disabled */
@@ -566,6 +591,11 @@ int spi_dw_init(const struct device *dev)
 	return 0;
 }
 
+#define REG_ADDR(inst) \
+	COND_CODE_1(DT_NODE_HAS_COMPAT(DT_DRV_INST(inst), nordic_nrf_exmif_spi), \
+		    (Z_DEVICE_MMIO_NAMED_ROM_INITIALIZER(core, DT_DRV_INST(inst))), \
+		    (DEVICE_MMIO_ROM_INIT(DT_DRV_INST(inst))))
+
 #define SPI_CFG_IRQS_SINGLE_ERR_LINE(inst)					\
 		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(inst, rx_avail, irq),		\
 			    DT_INST_IRQ_BY_NAME(inst, rx_avail, priority),	\
@@ -638,7 +668,7 @@ COND_CODE_1(IS_EQ(DT_NUM_IRQS(DT_DRV_INST(inst)), 1),              \
 		SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(inst), ctx)                     \
 	};                                                                                  \
 	static const struct spi_dw_config spi_dw_config_##inst = {                          \
-		DEVICE_MMIO_ROM_INIT(DT_DRV_INST(inst)),                                    \
+		REG_ADDR(inst),                                                             \
 		.clock_frequency = COND_CODE_1(                                             \
 			DT_NODE_HAS_PROP(DT_INST_PHANDLE(inst, clocks), clock_frequency),   \
 			(DT_INST_PROP_BY_PHANDLE(inst, clocks, clock_frequency)),           \
diff --git a/dts/bindings/spi/nordic,nrf-exmif-spi.yaml b/dts/bindings/spi/nordic,nrf-exmif-spi.yaml
new file mode 100644
index 00000000000..d988b414687
--- /dev/null
+++ b/dts/bindings/spi/nordic,nrf-exmif-spi.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Nordic External Memory Interface (EXMIF) used in SPI mode only
+
+compatible: "nordic,nrf-exmif-spi"
+
+include: snps,designware-spi.yaml

From 361d8cf5ac0f17dd9ae87525ebaef5c3ffea88b4 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 6 Mar 2025 11:17:46 +0100
Subject: [PATCH 2567/2913] [nrf fromlist] soc: nordic: nrf54h: Add SCB
 retention for s2ram

For the Suspend to RAM procedures the SCB content
also needs to be retained.

Upstream PR #: 86777

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 soc/nordic/nrf54h/pm_s2ram.c | 53 ++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/soc/nordic/nrf54h/pm_s2ram.c b/soc/nordic/nrf54h/pm_s2ram.c
index ea9e60973d1..a85572f3d7b 100644
--- a/soc/nordic/nrf54h/pm_s2ram.c
+++ b/soc/nordic/nrf54h/pm_s2ram.c
@@ -40,9 +40,26 @@ typedef struct {
 	uint32_t CTRL;
 } _mpu_context_t;
 
+typedef struct {
+	uint32_t ICSR;
+	uint32_t VTOR;
+	uint32_t AIRCR;
+	uint32_t SCR;
+	uint32_t CCR;
+	uint32_t SHPR[12U];
+	uint32_t SHCSR;
+	uint32_t CFSR;
+	uint32_t HFSR;
+	uint32_t DFSR;
+	uint32_t MMFAR;
+	uint32_t BFAR;
+	uint32_t AFSR;
+} _scb_context_t;
+
 struct backup {
 	_nvic_context_t nvic_context;
 	_mpu_context_t mpu_context;
+	_scb_context_t scb_context;
 };
 
 static __noinit struct backup backup_data;
@@ -107,10 +124,45 @@ static void nvic_resume(_nvic_context_t *backup)
 	memcpy((uint32_t *)NVIC->IPR, backup->IPR, sizeof(NVIC->IPR));
 }
 
+static void scb_suspend(_scb_context_t *backup)
+{
+	backup->ICSR = SCB->ICSR;
+	backup->VTOR = SCB->VTOR;
+	backup->AIRCR = SCB->AIRCR;
+	backup->SCR = SCB->SCR;
+	backup->CCR = SCB->CCR;
+	memcpy(backup->SHPR, (uint32_t *)SCB->SHPR, sizeof(SCB->SHPR));
+	backup->SHCSR = SCB->SHCSR;
+	backup->CFSR = SCB->CFSR;
+	backup->HFSR = SCB->HFSR;
+	backup->DFSR = SCB->DFSR;
+	backup->MMFAR = SCB->MMFAR;
+	backup->BFAR = SCB->BFAR;
+	backup->AFSR = SCB->AFSR;
+}
+
+static void scb_resume(_scb_context_t *backup)
+{
+	SCB->ICSR = backup->ICSR;
+	SCB->VTOR = backup->VTOR;
+	SCB->AIRCR = backup->AIRCR;
+	SCB->SCR = backup->SCR;
+	SCB->CCR = backup->CCR;
+	memcpy((uint32_t *)SCB->SHPR, backup->SHPR, sizeof(SCB->SHPR));
+	SCB->SHCSR = backup->SHCSR;
+	SCB->CFSR = backup->CFSR;
+	SCB->HFSR = backup->HFSR;
+	SCB->DFSR = backup->DFSR;
+	SCB->MMFAR = backup->MMFAR;
+	SCB->BFAR = backup->BFAR;
+	SCB->AFSR = backup->AFSR;
+}
+
 int soc_s2ram_suspend(pm_s2ram_system_off_fn_t system_off)
 {
 	int ret;
 
+	scb_suspend(&backup_data.scb_context);
 	nvic_suspend(&backup_data.nvic_context);
 	mpu_suspend(&backup_data.mpu_context);
 	ret = arch_pm_s2ram_suspend(system_off);
@@ -120,6 +172,7 @@ int soc_s2ram_suspend(pm_s2ram_system_off_fn_t system_off)
 
 	mpu_resume(&backup_data.mpu_context);
 	nvic_resume(&backup_data.nvic_context);
+	scb_resume(&backup_data.scb_context);
 
 	return ret;
 }

From b3585857860a6da330d77ed00c58315e949f313b Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 6 Feb 2025 13:51:04 +0100
Subject: [PATCH 2568/2913] [nrf fromlist] dts: nordic: nrf54: Add nRF54L09
 FLPR

Add nrF54L09 FLPR core support.

Upstream PR #: 85310

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 dts/common/nordic/nrf54l09.dtsi             | 10 +--
 dts/riscv/nordic/nrf54l09_enga_cpuflpr.dtsi | 67 +++++++++++++++++++++
 2 files changed, 72 insertions(+), 5 deletions(-)
 create mode 100644 dts/riscv/nordic/nrf54l09_enga_cpuflpr.dtsi

diff --git a/dts/common/nordic/nrf54l09.dtsi b/dts/common/nordic/nrf54l09.dtsi
index afaa8ff9980..a5b37fb4133 100644
--- a/dts/common/nordic/nrf54l09.dtsi
+++ b/dts/common/nordic/nrf54l09.dtsi
@@ -92,19 +92,19 @@
 		};
 
 		cpuapp_sram: memory@20000000 {
-			reg = <0x20000000 DT_SIZE_K(144)>;
-			ranges = <0x0 0x20000000 DT_SIZE_K(144)>;
+			reg = <0x20000000 DT_SIZE_K(143)>;
+			ranges = <0x0 0x20000000 DT_SIZE_K(143)>;
 			compatible = "mmio-sram";
 			#address-cells = <1>;
 			#size-cells = <1>;
 		};
 
-		cpuflpr_sram: memory@20024000 {
+		cpuflpr_sram: memory@20023c00 {
 			compatible = "mmio-sram";
-			reg = <0x20024000 DT_SIZE_K(48)>;
+			reg = <0x20023c00 DT_SIZE_K(48)>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0x0 0x20024000 DT_SIZE_K(48)>;
+			ranges = <0x0 0x20023c00 DT_SIZE_K(48)>;
 		};
 
  #ifdef USE_NON_SECURE_ADDRESS_MAP
diff --git a/dts/riscv/nordic/nrf54l09_enga_cpuflpr.dtsi b/dts/riscv/nordic/nrf54l09_enga_cpuflpr.dtsi
new file mode 100644
index 00000000000..7ae952e79f6
--- /dev/null
+++ b/dts/riscv/nordic/nrf54l09_enga_cpuflpr.dtsi
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <nordic/nrf54l09.dtsi>
+
+cpu: &cpuflpr {};
+clic: &cpuflpr_clic {};
+
+/delete-node/ &cpuapp;
+/delete-node/ &cpuapp_rram;
+/delete-node/ &cpuapp_ppb;
+/delete-node/ &cpuapp_sram;
+
+/ {
+	soc {
+		compatible = "simple-bus";
+		interrupt-parent = <&cpuflpr_clic>;
+		ranges;
+	};
+};
+
+&cpuflpr {
+	cpuflpr_vevif_rx: mailbox {
+		compatible = "nordic,nrf-vevif-task-rx";
+		status = "disabled";
+		interrupt-parent = <&cpuflpr_clic>;
+		interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <17 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <18 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <19 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <20 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <21 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <22 NRF_DEFAULT_IRQ_PRIORITY>;
+		#mbox-cells = <1>;
+		nordic,tasks = <7>;
+		nordic,tasks-mask = <0x007f0000>;
+	};
+};
+
+&cpuflpr_vpr {
+	cpuflpr_vevif_tx: mailbox {
+		compatible = "nordic,nrf-vevif-event-tx";
+		#mbox-cells = <1>;
+		nordic,events = <1>;
+		nordic,events-mask = <0x00100000>;
+		status = "disabled";
+	};
+};
+
+&cpuflpr_clic {
+	status = "okay";
+};
+
+&grtc {
+	interrupts = <226 NRF_DEFAULT_IRQ_PRIORITY>;
+};
+
+&gpiote20 {
+	interrupts = <218 NRF_DEFAULT_IRQ_PRIORITY>;
+};
+
+&gpiote30 {
+	interrupts = <268 NRF_DEFAULT_IRQ_PRIORITY>;
+};

From 79b52ed9eb93254d91a2797e5dc3938d0722c1c8 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 6 Feb 2025 13:53:39 +0100
Subject: [PATCH 2569/2913] [nrf fromlist] soc: nordic: Add nRF54L09 FLPR

Add nrF54L09 FLPR core support.

Upstream PR #: 85310

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 soc/nordic/common/vpr/Kconfig.sysbuild                |  2 +-
 soc/nordic/nrf54l/Kconfig                             |  3 +++
 .../nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuflpr    | 11 +++++++++++
 soc/nordic/nrf54l/Kconfig.soc                         |  7 +++++++
 soc/nordic/soc.yml                                    |  2 ++
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuflpr

diff --git a/soc/nordic/common/vpr/Kconfig.sysbuild b/soc/nordic/common/vpr/Kconfig.sysbuild
index eb62e3708bf..4dcc06face8 100644
--- a/soc/nordic/common/vpr/Kconfig.sysbuild
+++ b/soc/nordic/common/vpr/Kconfig.sysbuild
@@ -4,7 +4,7 @@
 config VPR_LAUNCHER
 	bool "VPR launcher"
 	default y
-	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF9280_CPUPPR)
+	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF9280_CPUPPR)
 	help
 	  Include VPR launcher in build.
 	  VPR launcher is a minimal sample built for an ARM core that starts given VPR core.
diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index fe7afd55b16..8f7297b75fe 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -37,6 +37,9 @@ config SOC_NRF54L15_CPUAPP
 config SOC_NRF54L05_CPUFLPR
 	select RISCV_CORE_NORDIC_VPR
 
+config SOC_NRF54L09_ENGA_CPUFLPR
+	select RISCV_CORE_NORDIC_VPR
+
 config SOC_NRF54L10_CPUFLPR
 	select RISCV_CORE_NORDIC_VPR
 
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuflpr b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuflpr
new file mode 100644
index 00000000000..c471e105db2
--- /dev/null
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuflpr
@@ -0,0 +1,11 @@
+# Nordic Semiconductor nRF54L09 MCU
+
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_NRF54L09_ENGA_CPUFLPR
+
+config NUM_IRQS
+	default 287
+
+endif # SOC_NRF54L09_ENGA_CPUFLPR
diff --git a/soc/nordic/nrf54l/Kconfig.soc b/soc/nordic/nrf54l/Kconfig.soc
index f86b7bd4858..80675b0ac37 100644
--- a/soc/nordic/nrf54l/Kconfig.soc
+++ b/soc/nordic/nrf54l/Kconfig.soc
@@ -39,6 +39,13 @@ config SOC_NRF54L09_ENGA_CPUAPP
 	help
 	  NRF54L09 ENGA CPUAPP
 
+config SOC_NRF54L09_ENGA_CPUFLPR
+	bool
+	select SOC_NRF54L09_ENGA
+	help
+	  NRF54L09 ENGA CPUFLPR
+
+
 config SOC_NRF54L10
 	bool
 	select SOC_SERIES_NRF54LX
diff --git a/soc/nordic/soc.yml b/soc/nordic/soc.yml
index 252061fc008..77511827ea7 100644
--- a/soc/nordic/soc.yml
+++ b/soc/nordic/soc.yml
@@ -28,6 +28,7 @@ family:
           - name: nrf54l09
             cpuclusters:
               - name: cpuapp
+              - name: cpuflpr
           - name: nrf54l10
             cpuclusters:
               - name: cpuapp
@@ -111,6 +112,7 @@ runners:
               - nrf54l05/cpuflpr
           - qualifiers:
               - nrf54l09/cpuapp
+              - nrf54l09/cpuflpr
           - qualifiers:
               - nrf54l10/cpuapp
               - nrf54l10/cpuflpr

From e2c01ec6b00692eac9b1f42cd1fb42ea9f491947 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 6 Feb 2025 13:56:27 +0100
Subject: [PATCH 2570/2913] [nrf fromlist] modules: hal_nordic: Add nRF54L09
 FLPR

Add nrF54L09 FLPR core support.

Upstream PR #: 85310

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 modules/hal_nordic/nrfx/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 686fdeabb69..cde936c8d3f 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -50,6 +50,7 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR    NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA       NRF54L09_ENGA_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUAPP NRF_APPLICATION)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUFLPR NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10            NRF54L10_XXAA
                                                                 DEVELOP_IN_NRF54L15)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10_CPUAPP     NRF_APPLICATION)
@@ -237,6 +238,7 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPURAD      nrf54h20_radiocore.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L05_CPUAPP      nrf54l05_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR     nrf54l05_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUAPP nrf54l09_enga_application.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUFLPR nrf54l09_enga_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUAPP      nrf54l10_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUFLPR     nrf54l10_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP      nrf54l15_application.svd)

From 3b020308b067bac1840164bff6a5246a53e0d2ac Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 6 Feb 2025 14:00:21 +0100
Subject: [PATCH 2571/2913] [nrf fromlist] boards: nordic: Add nRF54L09 FLPR

Add nrF54L09 FLPR core support.

Upstream PR #: 85310

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk |  1 +
 boards/nordic/nrf54l09pdk/board.cmake         |  6 +-
 boards/nordic/nrf54l09pdk/board.yml           |  3 +
 .../nrf54l09pdk_nrf54l09-common.dtsi          | 12 ++++
 .../nrf54l09pdk_nrf54l09-pinctrl.dtsi         | 22 +++++++
 .../nrf54l09pdk_nrf54l09_cpuflpr.dts          | 64 +++++++++++++++++++
 .../nrf54l09pdk_nrf54l09_cpuflpr.yaml         | 14 ++++
 .../nrf54l09pdk_nrf54l09_cpuflpr_defconfig    | 19 ++++++
 8 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100644 boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts
 create mode 100644 boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml
 create mode 100644 boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig

diff --git a/boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk b/boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk
index bc6aa676281..6fbd4a89c8f 100644
--- a/boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk
+++ b/boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk
@@ -3,3 +3,4 @@
 
 config BOARD_NRF54L09PDK
 	select SOC_NRF54L09_ENGA_CPUAPP if BOARD_NRF54L09PDK_NRF54L09_CPUAPP
+	select SOC_NRF54L09_ENGA_CPUFLPR if BOARD_NRF54L09PDK_NRF54L09_CPUFLPR
diff --git a/boards/nordic/nrf54l09pdk/board.cmake b/boards/nordic/nrf54l09pdk/board.cmake
index 5d36ac00a3e..f2dd60410ed 100644
--- a/boards/nordic/nrf54l09pdk/board.cmake
+++ b/boards/nordic/nrf54l09pdk/board.cmake
@@ -1,7 +1,11 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
+if (CONFIG_BOARD_NRF54L09PDK_NRF54L09_CPUAPP)
+  board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
+elseif (CONFIG_BOARD_NRF54L09PDK_NRF54L09_CPUFLPR)
+  board_runner_args(jlink "--speed=4000")
+endif()
 
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf54l09pdk/board.yml b/boards/nordic/nrf54l09pdk/board.yml
index b35f4c1fafe..bfa8419dff9 100644
--- a/boards/nordic/nrf54l09pdk/board.yml
+++ b/boards/nordic/nrf54l09pdk/board.yml
@@ -4,3 +4,6 @@ board:
   vendor: nordic
   socs:
   - name: nrf54l09
+    variants:
+    - name: xip
+      cpucluster: cpuflpr
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi
index 2bdb42b9653..5d23a1a9cac 100644
--- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi
@@ -60,3 +60,15 @@
 	pinctrl-1 = <&uart20_sleep>;
 	pinctrl-names = "default", "sleep";
 };
+
+&uart30 {
+	current-speed = <115200>;
+	pinctrl-0 = <&uart30_default>;
+	pinctrl-1 = <&uart30_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&hfpll {
+	/* For now use 64 MHz clock for CPU and fast peripherals. */
+	clock-frequency = <DT_FREQ_M(64)>;
+};
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi
index 83aa91d8a34..12b9aff7822 100644
--- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi
@@ -21,4 +21,26 @@
 			low-power-enable;
 		};
 	};
+
+	/omit-if-no-ref/ uart30_default: uart30_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RTS, 0, 2)>;
+		};
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 0, 1)>,
+				<NRF_PSEL(UART_CTS, 0, 3)>;
+			bias-pull-up;
+		};
+	};
+
+	/omit-if-no-ref/ uart30_sleep: uart30_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RX, 0, 1)>,
+				<NRF_PSEL(UART_RTS, 0, 2)>,
+				<NRF_PSEL(UART_CTS, 0, 3)>;
+			low-power-enable;
+		};
+	};
 };
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts
new file mode 100644
index 00000000000..3ae2dac9c5d
--- /dev/null
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf54l09_enga_cpuflpr.dtsi>
+#include "nrf54l09pdk_nrf54l09-common.dtsi"
+
+/ {
+	model = "Nordic nRF54L09 PDK nRF54L09 FLPR MCU";
+	compatible = "nordic,nrf54l09pdk_nrf54l09-cpuflpr";
+
+	chosen {
+		zephyr,console = &uart30;
+		zephyr,shell-uart = &uart30;
+		zephyr,code-partition = &cpuflpr_code_partition;
+		zephyr,flash = &cpuflpr_rram;
+		zephyr,sram = &cpuflpr_sram;
+	};
+};
+
+&cpuflpr_sram {
+	status = "okay";
+};
+
+&cpuflpr_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		cpuflpr_code_partition: partition@0 {
+			label = "image-0";
+			reg = <0x0 DT_SIZE_K(60)>;
+		};
+	};
+};
+
+&grtc {
+	owned-channels = <3 4>;
+	status = "okay";
+};
+
+&uart30 {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpiote30 {
+	status = "okay";
+};
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml
new file mode 100644
index 00000000000..47d03bb2ed9
--- /dev/null
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml
@@ -0,0 +1,14 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54l09pdk/nrf54l09/cpuflpr
+name: nRF54L09-PDK-nRF54L09-Fast-Lightweight-Peripheral-Processor
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+ram: 48
+flash: 60
+supported:
+  - counter
+  - gpio
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig
new file mode 100644
index 00000000000..75f7c4386e3
--- /dev/null
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig
@@ -0,0 +1,19 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+CONFIG_USE_DT_CODE_PARTITION=y
+
+# Execute from SRAM
+CONFIG_XIP=n
+
+CONFIG_RISCV_ALWAYS_SWITCH_THROUGH_ECALL=y

From 859d7c11f5e1d9895b78e5aede4ffbd4c92997da Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 6 Feb 2025 14:02:03 +0100
Subject: [PATCH 2572/2913] [nrf fromlist] snippets: nordic: Add nRF54L09 FLPR

Add nrF54L09 FLPR core support.

Upstream PR #: 85310

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 snippets/nordic-flpr/snippet.yml              |  3 ++
 .../nordic-flpr/soc/nrf54l09_cpuapp.overlay   | 38 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 snippets/nordic-flpr/soc/nrf54l09_cpuapp.overlay

diff --git a/snippets/nordic-flpr/snippet.yml b/snippets/nordic-flpr/snippet.yml
index dbeaf313df0..de84bffd093 100644
--- a/snippets/nordic-flpr/snippet.yml
+++ b/snippets/nordic-flpr/snippet.yml
@@ -12,3 +12,6 @@ boards:
   /.*/nrf54l20/cpuapp/:
     append:
       EXTRA_DTC_OVERLAY_FILE: soc/nrf54l20_cpuapp.overlay
+  /.*/nrf54l09/cpuapp/:
+    append:
+      EXTRA_DTC_OVERLAY_FILE: soc/nrf54l09_cpuapp.overlay
diff --git a/snippets/nordic-flpr/soc/nrf54l09_cpuapp.overlay b/snippets/nordic-flpr/soc/nrf54l09_cpuapp.overlay
new file mode 100644
index 00000000000..946349c3a88
--- /dev/null
+++ b/snippets/nordic-flpr/soc/nrf54l09_cpuapp.overlay
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	soc {
+		reserved-memory {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			cpuflpr_code_partition: image@ee000 {
+				/* FLPR core code partition */
+				reg = <0xee000 DT_SIZE_K(48)>;
+			};
+		};
+
+		cpuflpr_sram_code_data: memory@20023c00 {
+			compatible = "mmio-sram";
+			reg = <0x20023c00 DT_SIZE_K(48)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x20023c00 DT_SIZE_K(48)>;
+		};
+	};
+};
+
+&uart30 {
+	status = "reserved";
+};
+
+&cpuflpr_vpr {
+	execution-memory = <&cpuflpr_sram_code_data>;
+	source-memory = <&cpuflpr_code_partition>;
+};
+
+&cpuapp_vevif_tx {
+	status = "okay";
+};

From 4c92a5196886904143ebebec1d6ebfd9ff702e8a Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Fri, 14 Feb 2025 17:04:36 +0000
Subject: [PATCH 2573/2913] [nrf noup] samples: Fix smp_svr sample for external
 memory using PM

nrf-squash! [nrf noup] sample/smp_svr: nrf54l15dk test cases
nrf-squash! [nrf noup] samples/**/smp_svr: testcase of nrf54l15pdk with ext-flash DT

Add proper configs to sample.yaml.

Ref: NCSDK-31608

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
---
 samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 16526fdfe7b..ef6462b5cd7 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -174,8 +174,8 @@ tests:
       - DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
       - mcuboot_CONF_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.conf"
       - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
-    extra_configs:
-      - CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
+      - SB_CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
+      - SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15dk/nrf54l10/cpuapp

From 3fedc12521799313cc61776c5195432f462be842 Mon Sep 17 00:00:00 2001
From: Evgenii Kosenko <Evgenii.Kosenko@silabs.com>
Date: Fri, 7 Feb 2025 15:44:42 +0200
Subject: [PATCH 2574/2913] [nrf fromtree] bluetooth: tester: btp: refactors
 OOB legacy selection

Takes in use IS_ENABLED as preferred way of guarding Kconfig option for
forcing OOB legacy, CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY. It enables
compiling guarded code get warning/errors and not link it if not used. If
def macro is left in btp_handler structure to reduce code size when the
config is not present.

Signed-off-by: Evgenii Kosenko <Evgenii.Kosenko@silabs.com>
(cherry picked from commit fed55611301576c3910e8462c6b172cbe9469bec)
---
 tests/bluetooth/tester/src/btp_gap.c | 29 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/tests/bluetooth/tester/src/btp_gap.c b/tests/bluetooth/tester/src/btp_gap.c
index b344f76d19a..57370d681b7 100644
--- a/tests/bluetooth/tester/src/btp_gap.c
+++ b/tests/bluetooth/tester/src/btp_gap.c
@@ -45,10 +45,8 @@ static uint8_t oob_legacy_tk[16] = { 0 };
 
 static bool filter_list_in_use;
 
-#if !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)
 static struct bt_le_oob oob_sc_local = { 0 };
 static struct bt_le_oob oob_sc_remote = { 0 };
-#endif /* !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY) */
 
 /* connection parameters for rejection test */
 #define REJECT_INTERVAL_MIN 0x0C80
@@ -266,10 +264,10 @@ static uint8_t supported_commands(const void *cmd, uint16_t cmd_len,
 
 	/* octet 3 */
 	tester_set_bit(rp->data, BTP_GAP_OOB_LEGACY_SET_DATA);
-#if !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)
-	tester_set_bit(rp->data, BTP_GAP_OOB_SC_GET_LOCAL_DATA);
-	tester_set_bit(rp->data, BTP_GAP_OOB_SC_SET_REMOTE_DATA);
-#endif /* !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY) */
+	if (!IS_ENABLED(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)) {
+		tester_set_bit(rp->data, BTP_GAP_OOB_SC_GET_LOCAL_DATA);
+		tester_set_bit(rp->data, BTP_GAP_OOB_SC_SET_REMOTE_DATA);
+	}
 	tester_set_bit(rp->data, BTP_GAP_SET_MITM);
 	tester_set_bit(rp->data, BTP_GAP_SET_FILTER_LIST);
 #if defined(CONFIG_BT_EXT_ADV)
@@ -308,9 +306,9 @@ static uint8_t controller_info(const void *cmd, uint16_t cmd_len,
 	/*
 	 * Re-use the oob data read here in get_oob_sc_local_data()
 	 */
-#if !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)
-	oob_sc_local = oob_local;
-#endif /* !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY) */
+	if (!IS_ENABLED(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)) {
+		oob_sc_local = oob_local;
+	}
 
 	/*
 	 * If privacy is used, the device uses random type address, otherwise
@@ -339,9 +337,11 @@ static uint8_t controller_info(const void *cmd, uint16_t cmd_len,
 	return BTP_STATUS_SUCCESS;
 }
 
-#if !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)
 static const char *oob_config_str(int oob_config)
 {
+	if (!IS_ENABLED(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)) {
+		return "no";
+	}
 	switch (oob_config) {
 	case BT_CONN_OOB_LOCAL_ONLY:
 		return "Local";
@@ -354,7 +354,6 @@ static const char *oob_config_str(int oob_config)
 		return "no";
 	}
 }
-#endif /* !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY) */
 
 static void oob_data_request(struct bt_conn *conn,
 			     struct bt_conn_oob_info *oob_info)
@@ -371,9 +370,12 @@ static void oob_data_request(struct bt_conn *conn,
 	bt_addr_le_to_str(info.le.dst, addr, sizeof(addr));
 
 	switch (oob_info->type) {
-#if !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)
 	case BT_CONN_OOB_LE_SC:
 	{
+		if (!IS_ENABLED(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)) {
+			LOG_ERR("OOB LE SC not supported");
+			break;
+		}
 		LOG_DBG("Set %s OOB SC data for %s, ",
 			oob_config_str(oob_info->lesc.oob_config),
 			addr);
@@ -411,7 +413,6 @@ static void oob_data_request(struct bt_conn *conn,
 
 		break;
 	}
-#endif /* !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY) */
 
 #if !defined(CONFIG_BT_SMP_SC_PAIR_ONLY)
 	case BT_CONN_OOB_LE_LEGACY:
@@ -430,7 +431,7 @@ static void oob_data_request(struct bt_conn *conn,
 	}
 }
 
-#if !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)
+# if !defined (CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)
 static uint8_t get_oob_sc_local_data(const void *cmd, uint16_t cmd_len,
 				     void *rsp, uint16_t *rsp_len)
 {

From 84fc26da47811f9fbda2aaa6bc0b718304eb7719 Mon Sep 17 00:00:00 2001
From: Evgenii Kosenko <Evgenii.Kosenko@silabs.com>
Date: Fri, 7 Feb 2025 16:02:09 +0200
Subject: [PATCH 2575/2913] [nrf fromtree] bluetooth: tester: btp: refactors
 privacy selection

Takes in use IS_ENABLED as preferred way of guarding Kconfig option for
enabling privacy, CONFIG_BT_PRIVACY. It enables compiling guarded code get
warning/errors and not link it if not used.

Signed-off-by: Evgenii Kosenko <Evgenii.Kosenko@silabs.com>
(cherry picked from commit bf7dfc5e8d7cc6159804df144ee78b81a6627fd2)
---
 tests/bluetooth/tester/src/btp_gap.c | 52 ++++++++++++----------------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/tests/bluetooth/tester/src/btp_gap.c b/tests/bluetooth/tester/src/btp_gap.c
index 57370d681b7..55a00a4c181 100644
--- a/tests/bluetooth/tester/src/btp_gap.c
+++ b/tests/bluetooth/tester/src/btp_gap.c
@@ -54,23 +54,11 @@ static struct bt_le_oob oob_sc_remote = { 0 };
 #define REJECT_LATENCY 0x0000
 #define REJECT_SUPERVISION_TIMEOUT 0x0C80
 
-#if defined(CONFIG_BT_PRIVACY)
 static struct {
 	bt_addr_le_t addr;
 	bool supported;
 } cars[CONFIG_BT_MAX_PAIRED];
 
-static uint8_t read_car_cb(struct bt_conn *conn, uint8_t err,
-			  struct bt_gatt_read_params *params, const void *data,
-			  uint16_t length);
-
-static struct bt_gatt_read_params read_car_params = {
-		.func = read_car_cb,
-		.by_uuid.uuid = BT_UUID_CENTRAL_ADDR_RES,
-		.by_uuid.start_handle = BT_ATT_FIRST_ATTRIBUTE_HANDLE,
-		.by_uuid.end_handle = BT_ATT_LAST_ATTRIBUTE_HANDLE,
-};
-
 static uint8_t read_car_cb(struct bt_conn *conn, uint8_t err,
 			  struct bt_gatt_read_params *params, const void *data,
 			  uint16_t length)
@@ -98,7 +86,13 @@ static uint8_t read_car_cb(struct bt_conn *conn, uint8_t err,
 
 	return BT_GATT_ITER_STOP;
 }
-#endif
+
+static struct bt_gatt_read_params read_car_params = {
+	.func = read_car_cb,
+	.by_uuid.uuid = BT_UUID_CENTRAL_ADDR_RES,
+	.by_uuid.start_handle = BT_ATT_FIRST_ATTRIBUTE_HANDLE,
+	.by_uuid.end_handle = BT_ATT_LAST_ATTRIBUTE_HANDLE,
+};
 
 static void le_connected(struct bt_conn *conn, uint8_t err)
 {
@@ -314,11 +308,11 @@ static uint8_t controller_info(const void *cmd, uint16_t cmd_len,
 	 * If privacy is used, the device uses random type address, otherwise
 	 * static random or public type address is used.
 	 */
-#if !defined(CONFIG_BT_PRIVACY)
-	if (oob_local.addr.type == BT_ADDR_LE_RANDOM) {
-		atomic_set_bit(&current_settings, BTP_GAP_SETTINGS_STATIC_ADDRESS);
+	if (!IS_ENABLED(CONFIG_BT_PRIVACY)) {
+		if (oob_local.addr.type == BT_ADDR_LE_RANDOM) {
+			atomic_set_bit(&current_settings, BTP_GAP_SETTINGS_STATIC_ADDRESS);
+		}
 	}
-#endif /* CONFIG_BT_PRIVACY */
 
 	supported_settings = BIT(BTP_GAP_SETTINGS_POWERED);
 	supported_settings |= BIT(BTP_GAP_SETTINGS_CONNECTABLE);
@@ -642,20 +636,24 @@ int tester_gap_create_adv_instance(struct bt_le_adv_param *param, uint8_t own_ad
 	case BTP_GAP_ADDR_TYPE_IDENTITY:
 		param->options |= BT_LE_ADV_OPT_USE_IDENTITY;
 		break;
-#if defined(CONFIG_BT_PRIVACY)
 	case BTP_GAP_ADDR_TYPE_RESOLVABLE_PRIVATE:
+		if (!IS_ENABLED(CONFIG_BT_PRIVACY)) {
+			return -EINVAL;
+		}
 		/* RPA usage is controlled via privacy settings */
 		if (!atomic_test_bit(&current_settings, BTP_GAP_SETTINGS_PRIVACY)) {
 			return -EINVAL;
 		}
 		break;
 	case BTP_GAP_ADDR_TYPE_NON_RESOLVABLE_PRIVATE:
+		if (!IS_ENABLED(CONFIG_BT_PRIVACY)) {
+			return -EINVAL;
+		}
 		/* NRPA is used only for non-connectable advertising */
 		if (atomic_test_bit(&current_settings, BTP_GAP_SETTINGS_CONNECTABLE)) {
 			return -EINVAL;
 		}
 		break;
-#endif
 	default:
 		return -EINVAL;
 	}
@@ -786,8 +784,7 @@ static uint8_t start_directed_advertising(const void *cmd, uint16_t cmd_len,
 		adv_param.interval_min = BT_GAP_ADV_FAST_INT_MIN_2;
 	}
 
-	if (options & BTP_GAP_START_DIRECTED_ADV_PEER_RPA) {
-#if defined(CONFIG_BT_PRIVACY)
+	if (IS_ENABLED(CONFIG_BT_PRIVACY) && (options & BTP_GAP_START_DIRECTED_ADV_PEER_RPA)) {
 		/* check if peer supports Central Address Resolution */
 		for (int i = 0; i < CONFIG_BT_MAX_PAIRED; i++) {
 			if (bt_addr_le_eq(&cp->address, &cars[i].addr)) {
@@ -796,7 +793,6 @@ static uint8_t start_directed_advertising(const void *cmd, uint16_t cmd_len,
 				}
 			}
 		}
-#endif
 	}
 
 	if (bt_le_adv_start(&adv_param, NULL, 0, NULL, 0) < 0) {
@@ -1127,12 +1123,10 @@ void auth_pairing_failed(struct bt_conn *conn, enum bt_security_err reason)
 
 static void auth_pairing_complete(struct bt_conn *conn, bool bonded)
 {
-#if defined(CONFIG_BT_PRIVACY)
-	/* Read peer's Central Address Resolution if bonded */
-	if (bonded) {
+	if (IS_ENABLED(CONFIG_BT_PRIVACY) && bonded) {
+		/* Read peer's Central Address Resolution if bonded */
 		bt_gatt_read(conn, &read_car_params);
 	}
-#endif
 }
 
 static struct bt_conn_auth_info_cb auth_info_cb = {
@@ -1918,9 +1912,9 @@ uint8_t tester_init_gap(void)
 	atomic_set_bit(&current_settings, BTP_GAP_SETTINGS_CONNECTABLE);
 	atomic_set_bit(&current_settings, BTP_GAP_SETTINGS_BONDABLE);
 	atomic_set_bit(&current_settings, BTP_GAP_SETTINGS_LE);
-#if defined(CONFIG_BT_PRIVACY)
-	atomic_set_bit(&current_settings, BTP_GAP_SETTINGS_PRIVACY);
-#endif /* CONFIG_BT_PRIVACY */
+	if (IS_ENABLED(CONFIG_BT_PRIVACY)) {
+		atomic_set_bit(&current_settings, BTP_GAP_SETTINGS_PRIVACY);
+	}
 
 	bt_conn_cb_register(&conn_callbacks);
 	bt_conn_auth_info_cb_register(&auth_info_cb);

From 4559b50bbb9a57ed90c47203243219951e68a064 Mon Sep 17 00:00:00 2001
From: Evgenii Kosenko <Evgenii.Kosenko@silabs.com>
Date: Mon, 10 Feb 2025 11:20:12 +0200
Subject: [PATCH 2576/2913] [nrf fromtree] bluetooth: tester: btp: fixes ext
 adv selection

Disabling extended advertising, CONFIG_BT_EXT_ADV, fails to compile cause
references not guarded ext_adv variable when tester_gap_create_adv_instance
is called. Fixes by taking in use IS_ENABLED as preferred way of guarding
Kconfig option. It enables compiling guarded code to get warning/errors and
not to link if not used.

Signed-off-by: Evgenii Kosenko <Evgenii.Kosenko@silabs.com>
(cherry picked from commit 0b2fbf9903298acf0cee05e91bc57a2426a977a3)
---
 tests/bluetooth/tester/src/btp_gap.c | 40 ++++++++++++++++------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/tests/bluetooth/tester/src/btp_gap.c b/tests/bluetooth/tester/src/btp_gap.c
index 55a00a4c181..bdeb265000a 100644
--- a/tests/bluetooth/tester/src/btp_gap.c
+++ b/tests/bluetooth/tester/src/btp_gap.c
@@ -264,9 +264,9 @@ static uint8_t supported_commands(const void *cmd, uint16_t cmd_len,
 	}
 	tester_set_bit(rp->data, BTP_GAP_SET_MITM);
 	tester_set_bit(rp->data, BTP_GAP_SET_FILTER_LIST);
-#if defined(CONFIG_BT_EXT_ADV)
-	tester_set_bit(rp->data, BTP_GAP_SET_EXTENDED_ADVERTISING);
-#endif
+	if (IS_ENABLED(CONFIG_BT_EXT_ADV)) {
+		tester_set_bit(rp->data, BTP_GAP_SET_EXTENDED_ADVERTISING);
+	}
 
 	*rsp_len = sizeof(*rp) + 4;
 
@@ -425,7 +425,7 @@ static void oob_data_request(struct bt_conn *conn,
 	}
 }
 
-# if !defined (CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)
+#if !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)
 static uint8_t get_oob_sc_local_data(const void *cmd, uint16_t cmd_len,
 				     void *rsp, uint16_t *rsp_len)
 {
@@ -516,16 +516,22 @@ static struct bt_data ad[10] = {
 };
 static struct bt_data sd[10];
 
-#if defined(CONFIG_BT_EXT_ADV)
 static struct bt_le_ext_adv *ext_adv;
 
 struct bt_le_ext_adv *tester_gap_ext_adv_get(void)
 {
+	if (!IS_ENABLED(CONFIG_BT_EXT_ADV)) {
+		return NULL;
+	}
 	return ext_adv;
 }
 
 int tester_gap_start_ext_adv(void)
 {
+	if (!IS_ENABLED(CONFIG_BT_EXT_ADV)) {
+		return -ENOTSUP;
+	}
+
 	int err;
 
 	err = bt_le_ext_adv_start(ext_adv, BT_LE_EXT_ADV_START_DEFAULT);
@@ -542,6 +548,10 @@ int tester_gap_start_ext_adv(void)
 
 int tester_gap_stop_ext_adv(void)
 {
+	if (!IS_ENABLED(CONFIG_BT_EXT_ADV)) {
+		return -ENOTSUP;
+	}
+
 	int err;
 
 	err = bt_le_ext_adv_stop(ext_adv);
@@ -555,7 +565,6 @@ int tester_gap_stop_ext_adv(void)
 
 	return 0;
 }
-#endif /* defined(CONFIG_BT_EXT_ADV) */
 
 static uint8_t set_discoverable(const void *cmd, uint16_t cmd_len,
 			       void *rsp, uint16_t *rsp_len)
@@ -744,12 +753,9 @@ static uint8_t start_advertising(const void *cmd, uint16_t cmd_len,
 		return BTP_STATUS_FAILED;
 	}
 
-#if defined(CONFIG_BT_EXT_ADV)
-	if (atomic_test_bit(&current_settings, BTP_GAP_SETTINGS_EXTENDED_ADVERTISING)) {
+	if (IS_ENABLED(CONFIG_BT_EXT_ADV) &&
+	    atomic_test_bit(&current_settings, BTP_GAP_SETTINGS_EXTENDED_ADVERTISING)) {
 		err = bt_le_ext_adv_start(ext_adv, BT_LE_EXT_ADV_START_DEFAULT);
-#else
-	if (0) {
-#endif
 	} else {
 		err = bt_le_adv_start(&param, ad, adv_len, sd_len ? sd : NULL, sd_len);
 	}
@@ -1370,8 +1376,9 @@ static uint8_t set_filter_list(const void *cmd, uint16_t cmd_len,
 	return BTP_STATUS_SUCCESS;
 }
 
-static uint8_t set_extended_advertising(const void *cmd, uint16_t cmd_len,
-					void *rsp, uint16_t *rsp_len)
+#if defined(CONFIG_BT_EXT_ADV)
+static uint8_t set_extended_advertising(const void *cmd, uint16_t cmd_len, void *rsp,
+					uint16_t *rsp_len)
 {
 	const struct btp_gap_set_extended_advertising_cmd *cp = cmd;
 	struct btp_gap_set_extended_advertising_rp *rp = rsp;
@@ -1379,11 +1386,9 @@ static uint8_t set_extended_advertising(const void *cmd, uint16_t cmd_len,
 	LOG_DBG("ext adv settings: %u", cp->settings);
 
 	if (cp->settings != 0) {
-		atomic_set_bit(&current_settings,
-			       BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
+		atomic_set_bit(&current_settings, BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
 	} else {
-		atomic_clear_bit(&current_settings,
-				 BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
+		atomic_clear_bit(&current_settings, BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
 	}
 
 	rp->current_settings = sys_cpu_to_le32(current_settings);
@@ -1391,6 +1396,7 @@ static uint8_t set_extended_advertising(const void *cmd, uint16_t cmd_len,
 	*rsp_len = sizeof(*rp);
 	return BTP_STATUS_SUCCESS;
 }
+#endif /* defined(CONFIG_BT_EXT_ADV) */
 
 #if defined(CONFIG_BT_PER_ADV)
 static struct bt_data padv[10];

From f50821f39c88e4553e1b072d0058f24dee492122 Mon Sep 17 00:00:00 2001
From: Evgenii Kosenko <Evgenii.Kosenko@silabs.com>
Date: Mon, 10 Feb 2025 11:30:51 +0200
Subject: [PATCH 2577/2913] [nrf fromtree] bluetooth: tester: btp: refactors LE
 secure pairing selection

Takes in use IS_ENABLED as preferred way of guarding Kconfig option for
enabling legacy LE secure pairing, CONFIG_BT_SMP_SC_PAIR_ONLY. It enables
compiling guarded code get warning/errors and not link it if not used.

Signed-off-by: Evgenii Kosenko <Evgenii.Kosenko@silabs.com>
(cherry picked from commit 1633f98e265310141a621ec9185f0bd973411611)
---
 tests/bluetooth/tester/src/btp_gap.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/bluetooth/tester/src/btp_gap.c b/tests/bluetooth/tester/src/btp_gap.c
index bdeb265000a..3c6fc30c88f 100644
--- a/tests/bluetooth/tester/src/btp_gap.c
+++ b/tests/bluetooth/tester/src/btp_gap.c
@@ -336,6 +336,7 @@ static const char *oob_config_str(int oob_config)
 	if (!IS_ENABLED(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)) {
 		return "no";
 	}
+
 	switch (oob_config) {
 	case BT_CONN_OOB_LOCAL_ONLY:
 		return "Local";
@@ -366,10 +367,11 @@ static void oob_data_request(struct bt_conn *conn,
 	switch (oob_info->type) {
 	case BT_CONN_OOB_LE_SC:
 	{
-		if (!IS_ENABLED(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)) {
+		if (!IS_ENABLED(CONFIG_BT_SMP_SC_PAIR_ONLY)) {
 			LOG_ERR("OOB LE SC not supported");
 			break;
 		}
+
 		LOG_DBG("Set %s OOB SC data for %s, ",
 			oob_config_str(oob_info->lesc.oob_config),
 			addr);
@@ -408,8 +410,12 @@ static void oob_data_request(struct bt_conn *conn,
 		break;
 	}
 
-#if !defined(CONFIG_BT_SMP_SC_PAIR_ONLY)
 	case BT_CONN_OOB_LE_LEGACY:
+		if (!IS_ENABLED(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)) {
+			LOG_ERR("OOB LE Legacy not supported");
+			break;
+		}
+
 		LOG_DBG("Legacy OOB TK requested from remote %s", addr);
 
 		err = bt_le_oob_set_legacy_tk(conn, oob_legacy_tk);
@@ -418,7 +424,6 @@ static void oob_data_request(struct bt_conn *conn,
 		}
 
 		break;
-#endif /* !defined(CONFIG_BT_SMP_SC_PAIR_ONLY) */
 	default:
 		LOG_ERR("Unhandled OOB type %d", oob_info->type);
 		break;

From c2b3981b9f559966dd471cd7b0eaabbb55d7173d Mon Sep 17 00:00:00 2001
From: Evgenii Kosenko <Evgenii.Kosenko@silabs.com>
Date: Mon, 10 Feb 2025 11:50:48 +0200
Subject: [PATCH 2578/2913] [nrf fromtree] bluetooth: tester: btp: refactors
 periodic adv selection

Takes in use IS_ENABLED as preferred way of guarding Kconfig option for
enabling periodic advertising api, CONFIG_BT_PER_ADV. It enables compiling
guarded code get warning/errors and not link it if not used.

Signed-off-by: Evgenii Kosenko <Evgenii.Kosenko@silabs.com>
(cherry picked from commit d8f8dd4c14772ba984839842ae49ec0c5ea79d89)
---
 tests/bluetooth/tester/src/btp_gap.c | 77 +++++++++-------------------
 1 file changed, 24 insertions(+), 53 deletions(-)

diff --git a/tests/bluetooth/tester/src/btp_gap.c b/tests/bluetooth/tester/src/btp_gap.c
index 3c6fc30c88f..3d2ab7c7902 100644
--- a/tests/bluetooth/tester/src/btp_gap.c
+++ b/tests/bluetooth/tester/src/btp_gap.c
@@ -262,6 +262,7 @@ static uint8_t supported_commands(const void *cmd, uint16_t cmd_len,
 		tester_set_bit(rp->data, BTP_GAP_OOB_SC_GET_LOCAL_DATA);
 		tester_set_bit(rp->data, BTP_GAP_OOB_SC_SET_REMOTE_DATA);
 	}
+
 	tester_set_bit(rp->data, BTP_GAP_SET_MITM);
 	tester_set_bit(rp->data, BTP_GAP_SET_FILTER_LIST);
 	if (IS_ENABLED(CONFIG_BT_EXT_ADV)) {
@@ -528,6 +529,7 @@ struct bt_le_ext_adv *tester_gap_ext_adv_get(void)
 	if (!IS_ENABLED(CONFIG_BT_EXT_ADV)) {
 		return NULL;
 	}
+
 	return ext_adv;
 }
 
@@ -654,6 +656,7 @@ int tester_gap_create_adv_instance(struct bt_le_adv_param *param, uint8_t own_ad
 		if (!IS_ENABLED(CONFIG_BT_PRIVACY)) {
 			return -EINVAL;
 		}
+
 		/* RPA usage is controlled via privacy settings */
 		if (!atomic_test_bit(&current_settings, BTP_GAP_SETTINGS_PRIVACY)) {
 			return -EINVAL;
@@ -663,6 +666,7 @@ int tester_gap_create_adv_instance(struct bt_le_adv_param *param, uint8_t own_ad
 		if (!IS_ENABLED(CONFIG_BT_PRIVACY)) {
 			return -EINVAL;
 		}
+
 		/* NRPA is used only for non-connectable advertising */
 		if (atomic_test_bit(&current_settings, BTP_GAP_SETTINGS_CONNECTABLE)) {
 			return -EINVAL;
@@ -1403,12 +1407,14 @@ static uint8_t set_extended_advertising(const void *cmd, uint16_t cmd_len, void
 }
 #endif /* defined(CONFIG_BT_EXT_ADV) */
 
-#if defined(CONFIG_BT_PER_ADV)
-static struct bt_data padv[10];
 static struct bt_le_per_adv_sync *pa_sync;
 
 struct bt_le_per_adv_sync *tester_gap_padv_get(void)
 {
+	if (!IS_ENABLED(CONFIG_BT_PER_ADV)) {
+		return NULL;
+	}
+
 	return pa_sync;
 }
 
@@ -1453,6 +1459,9 @@ static struct bt_le_per_adv_sync_cb pa_sync_cb = {
 	.term = pa_sync_terminated_cb,
 };
 
+#if defined(CONFIG_BT_PER_ADV)
+static struct bt_data padv[10];
+
 int tester_gap_padv_configure(const struct bt_le_per_adv_param *param)
 {
 	int err;
@@ -1626,9 +1635,14 @@ static uint8_t padv_set_data(const void *cmd, uint16_t cmd_len,
 
 	return BTP_STATUS_VAL(err);
 }
+#endif /* defined(CONFIG_BT_PER_ADV) */
 
 int tester_gap_padv_create_sync(struct bt_le_per_adv_sync_param *create_params)
 {
+	if (!IS_ENABLED(CONFIG_BT_PER_ADV_SYNC)) {
+		return -ENOTSUP;
+	}
+
 	int err;
 
 	if (pa_sync != NULL) {
@@ -1646,6 +1660,10 @@ int tester_gap_padv_create_sync(struct bt_le_per_adv_sync_param *create_params)
 
 int tester_gap_padv_stop_sync(void)
 {
+	if (!IS_ENABLED(CONFIG_BT_PER_ADV_SYNC)) {
+		return -ENOTSUP;
+	}
+
 	int err;
 
 	if (pa_sync == NULL) {
@@ -1660,6 +1678,7 @@ int tester_gap_padv_stop_sync(void)
 	return err;
 }
 
+#if defined(CONFIG_BT_PER_ADV)
 static uint8_t padv_create_sync(const void *cmd, uint16_t cmd_len,
 				void *rsp, uint16_t *rsp_len)
 {
@@ -1685,39 +1704,6 @@ static uint8_t padv_create_sync(const void *cmd, uint16_t cmd_len,
 
 	return BTP_STATUS_VAL(err);
 }
-
-static uint8_t padv_sync_transfer_set_info(const void *cmd, uint16_t cmd_len,
-					   void *rsp, uint16_t *rsp_len)
-{
-	const struct btp_gap_padv_sync_transfer_set_info_cmd *cp = cmd;
-	(void)cp;
-
-	/* TODO */
-
-	return BTP_STATUS_FAILED;
-}
-
-static uint8_t padv_sync_transfer_start(const void *cmd, uint16_t cmd_len,
-					void *rsp, uint16_t *rsp_len)
-{
-	const struct btp_gap_padv_sync_transfer_start_cmd *cp = cmd;
-	(void)cp;
-
-	/* TODO */
-
-	return BTP_STATUS_FAILED;
-}
-
-static uint8_t padv_sync_transfer_recv(const void *cmd, uint16_t cmd_len,
-				       void *rsp, uint16_t *rsp_len)
-{
-	const struct btp_gap_padv_sync_transfer_recv_cmd *cp = cmd;
-	(void)cp;
-
-	/* TODO */
-
-	return BTP_STATUS_FAILED;
-}
 #endif /* defined(CONFIG_BT_PER_ADV) */
 
 static const struct btp_handler handlers[] = {
@@ -1882,21 +1868,6 @@ static const struct btp_handler handlers[] = {
 		.expect_len = sizeof(struct btp_gap_padv_create_sync_cmd),
 		.func = padv_create_sync,
 	},
-	{
-		.opcode = BTP_GAP_PADV_SYNC_TRANSFER_SET_INFO,
-		.expect_len = sizeof(struct btp_gap_padv_sync_transfer_set_info_cmd),
-		.func = padv_sync_transfer_set_info,
-	},
-	{
-		.opcode = BTP_GAP_PADV_SYNC_TRANSFER_START,
-		.expect_len = sizeof(struct btp_gap_padv_sync_transfer_start_cmd),
-		.func = padv_sync_transfer_start,
-	},
-	{
-		.opcode = BTP_GAP_PADV_SYNC_TRANSFER_RECV,
-		.expect_len = sizeof(struct btp_gap_padv_sync_transfer_recv_cmd),
-		.func = padv_sync_transfer_recv,
-	},
 #endif /* defined(CONFIG_BT_PER_ADV) */
 #endif /* defined(CONFIG_BT_EXT_ADV) */
 };
@@ -1930,9 +1901,9 @@ uint8_t tester_init_gap(void)
 	bt_conn_cb_register(&conn_callbacks);
 	bt_conn_auth_info_cb_register(&auth_info_cb);
 
-#if defined(CONFIG_BT_PER_ADV)
-	bt_le_per_adv_sync_cb_register(&pa_sync_cb);
-#endif /* defined(CONFIG_BT_PER_ADV) */
+	if (IS_ENABLED(CONFIG_BT_PER_ADV)) {
+		bt_le_per_adv_sync_cb_register(&pa_sync_cb);
+	}
 
 	tester_register_command_handlers(BTP_SERVICE_ID_GAP, handlers,
 					 ARRAY_SIZE(handlers));

From e3e3308b2256914a06668bef9ace8c47c2d74796 Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon.janc@codecoup.pl>
Date: Mon, 24 Feb 2025 12:24:00 +0100
Subject: [PATCH 2579/2913] [nrf fromtree] tests: bluetooth: tester: Fix
 invalid checks in oob_data_request

CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY disables all but legacy OOB
pairing (including LE SC) and is not intended for enabling/disabling
support for legacy OOB pairing. bt_le_oob_set_legacy_tk() depends on
CONFIG_BT_SMP_SC_PAIR_ONLY so just use same check here.

For BT_CONN_OOB_LE_SC only supported way to disable LE SC OOB is
to force BT_SMP_OOB_LEGACY_PAIR_ONLY which disables all pairing
except legacy OOB support.

Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl>
(cherry picked from commit c20bd87d3d0b89d333d580536bebe2f5188502f1)
---
 tests/bluetooth/tester/src/btp_gap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/bluetooth/tester/src/btp_gap.c b/tests/bluetooth/tester/src/btp_gap.c
index 3d2ab7c7902..350988fc4db 100644
--- a/tests/bluetooth/tester/src/btp_gap.c
+++ b/tests/bluetooth/tester/src/btp_gap.c
@@ -368,7 +368,7 @@ static void oob_data_request(struct bt_conn *conn,
 	switch (oob_info->type) {
 	case BT_CONN_OOB_LE_SC:
 	{
-		if (!IS_ENABLED(CONFIG_BT_SMP_SC_PAIR_ONLY)) {
+		if (IS_ENABLED(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)) {
 			LOG_ERR("OOB LE SC not supported");
 			break;
 		}
@@ -412,7 +412,7 @@ static void oob_data_request(struct bt_conn *conn,
 	}
 
 	case BT_CONN_OOB_LE_LEGACY:
-		if (!IS_ENABLED(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)) {
+		if (IS_ENABLED(CONFIG_BT_SMP_SC_PAIR_ONLY)) {
 			LOG_ERR("OOB LE Legacy not supported");
 			break;
 		}

From 3985512d4584c88cb2872b3f87b6a98a6a41de70 Mon Sep 17 00:00:00 2001
From: Alexander Svensen <alexander.svensen@nordicsemi.no>
Date: Tue, 4 Mar 2025 15:40:19 +0100
Subject: [PATCH 2580/2913] [nrf fromtree] tests: bluetooth: tester: Make
 brcst_source_stop synchronous

- Add semaphore to make sure source is stopped before proceeding
- This ensures source can be released after this command is finished

Signed-off-by: Alexander Svensen <alexander.svensen@nordicsemi.no>
(cherry picked from commit 6d19fc2b864f4382c54df631f54d1b3ecec90239)
---
 tests/bluetooth/tester/src/audio/btp_cap.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/bluetooth/tester/src/audio/btp_cap.c b/tests/bluetooth/tester/src/audio/btp_cap.c
index e0356aae097..c8e8e22aa91 100644
--- a/tests/bluetooth/tester/src/audio/btp_cap.c
+++ b/tests/bluetooth/tester/src/audio/btp_cap.c
@@ -22,6 +22,8 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 
 static struct btp_bap_unicast_group *u_group;
 
+static K_SEM_DEFINE(source_stopped_sem, 0U, CONFIG_BT_BAP_BROADCAST_SRC_COUNT);
+
 extern struct bt_csip_set_coordinator_set_member *btp_csip_set_members[CONFIG_BT_MAX_CONN];
 
 static struct bt_bap_stream *stream_unicast_to_bap(struct btp_bap_unicast_stream *stream)
@@ -139,11 +141,19 @@ static void unicast_stop_complete_cb(int err, struct bt_conn *conn)
 					       BTP_CAP_UNICAST_START_STATUS_SUCCESS);
 }
 
+static void broadcast_stopped_cb(struct bt_cap_broadcast_source *source, uint8_t reason)
+{
+	LOG_DBG("");
+
+	k_sem_give(&source_stopped_sem);
+}
+
 static struct bt_cap_initiator_cb cap_cb = {
 	.unicast_discovery_complete = cap_discovery_complete_cb,
 	.unicast_start_complete = unicast_start_complete_cb,
 	.unicast_update_complete = unicast_update_complete_cb,
 	.unicast_stop_complete = unicast_stop_complete_cb,
+	.broadcast_stopped = broadcast_stopped_cb,
 };
 
 static uint8_t btp_cap_supported_commands(const void *cmd, uint16_t cmd_len,
@@ -804,6 +814,14 @@ static uint8_t btp_cap_broadcast_source_stop(const void *cmd, uint16_t cmd_len,
 		return BTP_STATUS_FAILED;
 	}
 
+	/* Make sure source is stopped before proceeding */
+	err = k_sem_take(&source_stopped_sem, K_SECONDS(1));
+	if (err) {
+		LOG_ERR("Semaphore timed out: %d", err);
+
+		return BTP_STATUS_FAILED;
+	}
+
 	return BTP_STATUS_SUCCESS;
 }
 

From ff01b5fcc22333ff6f7bafebe79464d4d85c01fd Mon Sep 17 00:00:00 2001
From: Graham Wacey <graham.wacey@nordicsemi.no>
Date: Thu, 30 Jan 2025 14:01:01 +0000
Subject: [PATCH 2581/2913] [nrf fromtree] tests: bluetooth: tester: Implement
 BAP/BSRC/SCC/BV-38-C

 - Make ext_adv and per_adv into arrays for multiple BIGs
 - Create bap_broadcast-source_setup_v2 command
  - Handles broadcast_id as an input

Signed-off-by: Graham Wacey <graham.wacey@nordicsemi.no>
Signed-off-by: Alexander Svensen <alexander.svensen@nordicsemi.no>
(cherry picked from commit fb620ef59c17f6fccd84e4dfdb340dcbeb130ce7)
Signed-off-by: Alexander Svensen <alexander.svensen@nordicsemi.no>
---
 tests/bluetooth/tester/hci_ipc_cpunet.conf    |  10 +
 tests/bluetooth/tester/overlay-le-audio.conf  |   3 +
 .../bluetooth/tester/src/audio/btp/btp_bap.h  |  21 ++
 tests/bluetooth/tester/src/audio/btp_bap.c    |  11 +-
 .../tester/src/audio/btp_bap_broadcast.c      | 294 +++++++++++++++---
 .../tester/src/audio/btp_bap_broadcast.h      |  10 +-
 tests/bluetooth/tester/src/audio/btp_cap.c    | 139 ++++++---
 tests/bluetooth/tester/src/audio/btp_pbp.c    |   3 +-
 tests/bluetooth/tester/src/btp/btp_gap.h      |  18 +-
 tests/bluetooth/tester/src/btp_gap.c          | 122 ++++++--
 10 files changed, 504 insertions(+), 127 deletions(-)

diff --git a/tests/bluetooth/tester/hci_ipc_cpunet.conf b/tests/bluetooth/tester/hci_ipc_cpunet.conf
index 58876f4c002..8823c19e651 100644
--- a/tests/bluetooth/tester/hci_ipc_cpunet.conf
+++ b/tests/bluetooth/tester/hci_ipc_cpunet.conf
@@ -6,3 +6,13 @@ CONFIG_BT_MAX_CONN=3
 # PTS tests specific tweaks
 CONFIG_BT_CTLR_PERIPHERAL_ISO_EARLY_CIG_START=y
 CONFIG_BT_CTLR_ISOAL_PSN_IGNORE=y
+
+CONFIG_BT_ISO_MAX_BIG=2
+CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
+
+CONFIG_BT_CTLR_ADV_ISO_SET=2
+CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=4
+CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=4
+
+CONFIG_BT_CTLR_ISOAL_SOURCES=4
+CONFIG_BT_CTLR_ISO_TX_BUFFERS=8
diff --git a/tests/bluetooth/tester/overlay-le-audio.conf b/tests/bluetooth/tester/overlay-le-audio.conf
index e22151c9c57..be5004d49e4 100644
--- a/tests/bluetooth/tester/overlay-le-audio.conf
+++ b/tests/bluetooth/tester/overlay-le-audio.conf
@@ -11,6 +11,7 @@ CONFIG_BT_ISO_BROADCASTER=y
 CONFIG_BT_PER_ADV_SYNC=y
 CONFIG_BT_ISO_SYNC_RECEIVER=y
 CONFIG_BT_EXT_ADV=y
+CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
 CONFIG_BT_BAP_UNICAST_SERVER=y
 CONFIG_BT_BAP_UNICAST_CLIENT=y
 CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT=2
@@ -48,10 +49,12 @@ CONFIG_BT_MICP_MIC_CTLR_MAX_AICS_INST=1
 
 # Broadcast Source
 CONFIG_BT_BAP_BROADCAST_SOURCE=y
+CONFIG_BT_BAP_BROADCAST_SRC_COUNT=2
 CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT=2
 CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT=2
 CONFIG_BT_ISO_TX_BUF_COUNT=4
 CONFIG_BT_BAP_BROADCAST_ASSISTANT=y
+CONFIG_BT_ISO_MAX_BIG=2
 
 # Broadcast Sink
 CONFIG_BT_BAP_SCAN_DELEGATOR=y
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_bap.h b/tests/bluetooth/tester/src/audio/btp/btp_bap.h
index 002ef1d5d65..cfce8eb4151 100644
--- a/tests/bluetooth/tester/src/audio/btp/btp_bap.h
+++ b/tests/bluetooth/tester/src/audio/btp/btp_bap.h
@@ -176,6 +176,27 @@ struct btp_bap_send_past_cmd {
 	uint8_t src_id;
 } __packed;
 
+#define BTP_BAP_BROADCAST_SOURCE_SETUP_V2	0x19
+struct btp_bap_broadcast_source_setup_v2_cmd {
+	uint8_t broadcast_id[BT_AUDIO_BROADCAST_ID_SIZE];
+	uint8_t streams_per_subgroup;
+	uint8_t subgroups;
+	uint8_t sdu_interval[3];
+	uint8_t framing;
+	uint16_t max_sdu;
+	uint8_t retransmission_num;
+	uint16_t max_transport_latency;
+	uint8_t presentation_delay[3];
+	uint8_t coding_format;
+	uint16_t vid;
+	uint16_t cid;
+	uint8_t cc_ltvs_len;
+	uint8_t cc_ltvs[];
+} __packed;
+struct btp_bap_broadcast_source_setup_v2_rp {
+	uint32_t gap_settings;
+} __packed;
+
 /* BAP events */
 #define BTP_BAP_EV_DISCOVERY_COMPLETED		0x80
 struct btp_bap_discovery_completed_ev {
diff --git a/tests/bluetooth/tester/src/audio/btp_bap.c b/tests/bluetooth/tester/src/audio/btp_bap.c
index ab999875778..c816f654abf 100644
--- a/tests/bluetooth/tester/src/audio/btp_bap.c
+++ b/tests/bluetooth/tester/src/audio/btp_bap.c
@@ -332,6 +332,8 @@ static uint8_t btp_bap_supported_commands(const void *cmd, uint16_t cmd_len,
 
 	/* octet 0 */
 	tester_set_bit(rp->data, BTP_BAP_READ_SUPPORTED_COMMANDS);
+	tester_set_bit(rp->data, BTP_BAP_DISCOVER);
+	tester_set_bit(rp->data, BTP_BAP_SEND);
 
 	*rsp_len = sizeof(*rp) + 1;
 
@@ -369,12 +371,17 @@ static const struct btp_handler bap_handlers[] = {
 		.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
 		.func = btp_bap_audio_stream_send,
 	},
-#if defined(CONFIG_BT_BAP_BROADCAST_SINK) || defined(CONFIG_BT_BAP_BROADCAST_SINK)
+#if defined(CONFIG_BT_BAP_BROADCAST_SOURCE) || defined(CONFIG_BT_BAP_BROADCAST_SINK)
 	{
 		.opcode = BTP_BAP_BROADCAST_SOURCE_SETUP,
 		.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
 		.func = btp_bap_broadcast_source_setup,
 	},
+	{
+		.opcode = BTP_BAP_BROADCAST_SOURCE_SETUP_V2,
+		.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
+		.func = btp_bap_broadcast_source_setup_v2,
+	},
 	{
 		.opcode = BTP_BAP_BROADCAST_SOURCE_RELEASE,
 		.expect_len = sizeof(struct btp_bap_broadcast_source_release_cmd),
@@ -475,7 +482,7 @@ static const struct btp_handler bap_handlers[] = {
 		.expect_len = sizeof(struct btp_bap_send_past_cmd),
 		.func = btp_bap_broadcast_assistant_send_past,
 	},
-#endif /* CONFIG_BT_BAP_BROADCAST_SINK || CONFIG_BT_BAP_BROADCAST_SINK */
+#endif /* CONFIG_BT_BAP_BROADCAST_SOURCE || CONFIG_BT_BAP_BROADCAST_SINK */
 };
 
 uint8_t tester_init_pacs(void)
diff --git a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
index 29105d66ae8..e0e942b17b5 100644
--- a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
+++ b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
@@ -27,10 +27,11 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 #include "btp_bap_audio_stream.h"
 #include "btp_bap_broadcast.h"
 
-static K_SEM_DEFINE(sem_stream_stopped, 0U, CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT);
+static K_SEM_DEFINE(sem_stream_stopped, 0U,
+		    (CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT * CONFIG_BT_BAP_BROADCAST_SRC_COUNT));
 
 static struct btp_bap_broadcast_remote_source remote_broadcast_sources[1];
-static struct btp_bap_broadcast_local_source local_source;
+static struct btp_bap_broadcast_local_source local_sources[CONFIG_BT_BAP_BROADCAST_SRC_COUNT];
 /* Only one PA sync supported for now. */
 static struct btp_bap_broadcast_remote_source *broadcast_source_to_sync;
 /* A mask for the maximum BIS we can sync to. +1 since the BIS indexes start from 1. */
@@ -52,12 +53,72 @@ static inline struct bt_bap_stream *stream_broadcast_to_bap(struct btp_bap_broad
 	return &stream->audio_stream.cap_stream.bap_stream;
 }
 
-struct btp_bap_broadcast_local_source *btp_bap_broadcast_local_source_get(uint8_t source_id)
+uint8_t btp_bap_broadcast_local_source_idx_get(struct btp_bap_broadcast_local_source *source)
 {
-	/* Only one local broadcast source supported for now */
-	(void) source_id;
+	return ARRAY_INDEX(local_sources, source);
+}
+
+struct btp_bap_broadcast_local_source *btp_bap_broadcast_local_source_allocate(
+	uint32_t broadcast_id)
+{
+	for (size_t i = 0; i < ARRAY_SIZE(local_sources); i++) {
+		if (local_sources[i].broadcast_id == broadcast_id) {
+			LOG_ERR("Local source already allocated for broadcast id %d", broadcast_id);
+
+			return NULL;
+		}
+	}
 
-	return &local_source;
+	for (size_t i = 0; i < ARRAY_SIZE(local_sources); i++) {
+		if (!local_sources[i].allocated) {
+			local_sources[i].allocated = true;
+			local_sources[i].source_id = i;
+			local_sources[i].broadcast_id = broadcast_id;
+
+			return &local_sources[i];
+		}
+	}
+
+	return NULL;
+}
+
+static int btp_bap_broadcast_local_source_free(struct btp_bap_broadcast_local_source *source)
+{
+	if (source == NULL) {
+		return -EINVAL;
+	}
+
+	memset(&source, 0, sizeof(*source));
+
+	return 0;
+}
+
+struct btp_bap_broadcast_local_source *btp_bap_broadcast_local_source_from_src_id_get(
+	uint32_t source_id)
+{
+	for (size_t i = 0; i < ARRAY_SIZE(local_sources); i++) {
+		if (local_sources[i].source_id == source_id) {
+			return &local_sources[i];
+		}
+	}
+
+	LOG_ERR("No local source found with source id %u", source_id);
+
+	return NULL;
+}
+
+static struct btp_bap_broadcast_local_source *btp_bap_broadcast_local_source_from_brcst_id_get(
+	uint32_t broadcast_id)
+{
+	for (size_t i = 0; i < ARRAY_SIZE(local_sources); i++) {
+		if (local_sources[i].broadcast_id == broadcast_id) {
+			return &local_sources[i];
+		}
+	}
+
+	LOG_ERR("No local source found with broadcast id 0x%06X", broadcast_id);
+
+	return NULL;
 }
 
 static struct btp_bap_broadcast_remote_source *remote_broadcaster_alloc(void)
@@ -282,15 +343,14 @@ static int setup_broadcast_source(uint8_t streams_per_subgroup,	uint8_t subgroup
 	create_param.encryption = false;
 	create_param.packing = BT_ISO_PACKING_SEQUENTIAL;
 
-	LOG_DBG("Creating broadcast source with %zu subgroups with %zu streams",
-		subgroups, subgroups * streams_per_subgroup);
+	LOG_DBG("Creating broadcast source (%u) with %zu subgroups with %zu streams",
+		source->source_id, subgroups, subgroups * streams_per_subgroup);
 
 	if (source->bap_broadcast == NULL) {
 		err = bt_bap_broadcast_source_create(&create_param,
 						     &source->bap_broadcast);
 		if (err != 0) {
 			LOG_DBG("Unable to create broadcast source: %d", err);
-
 			return err;
 		}
 	} else {
@@ -298,7 +358,6 @@ static int setup_broadcast_source(uint8_t streams_per_subgroup,	uint8_t subgroup
 						       &create_param);
 		if (err != 0) {
 			LOG_DBG("Unable to reconfig broadcast source: %d", err);
-
 			return err;
 		}
 	}
@@ -326,8 +385,13 @@ uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 	struct btp_bap_broadcast_source_setup_rp *rp = rsp;
 	uint32_t broadcast_id;
 
-	/* Only one local source/BIG supported for now */
-	struct btp_bap_broadcast_local_source *source = &local_source;
+	err = bt_rand(&broadcast_id, BT_AUDIO_BROADCAST_ID_SIZE);
+	if (err != 0) {
+		LOG_DBG("Failed to generate broadcast id: %d", err);
+		return BTP_STATUS_FAILED;
+	}
+
+	struct btp_bap_broadcast_local_source *source;
 
 	uint32_t gap_settings = BIT(BTP_GAP_SETTINGS_DISCOVERABLE) |
 				BIT(BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
@@ -337,7 +401,7 @@ uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 
 	/* Broadcast Audio Streaming Endpoint advertising data */
 	struct bt_data base_ad[2];
-	struct bt_data per_ad;
+	struct bt_data *per_ad;
 
 	LOG_DBG("");
 
@@ -348,6 +412,12 @@ uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 	codec_cfg.data_len = cp->cc_ltvs_len;
 	memcpy(codec_cfg.data, cp->cc_ltvs, cp->cc_ltvs_len);
 
+	source = btp_bap_broadcast_local_source_allocate(broadcast_id);
+	if (source == NULL) {
+		LOG_DBG("No more free local source items");
+		return BTP_STATUS_FAILED;
+	}
+
 	source->qos.phy = BT_BAP_QOS_CFG_2M;
 	source->qos.framing = cp->framing;
 	source->qos.rtn = cp->retransmission_num;
@@ -361,14 +431,121 @@ uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 	err = setup_broadcast_source(cp->streams_per_subgroup, cp->subgroups, source, &codec_cfg);
 	if (err != 0) {
 		LOG_DBG("Unable to setup broadcast source: %d", err);
+		return BTP_STATUS_FAILED;
+	}
+
+	/* Setup extended advertising data */
+	net_buf_simple_add_le16(&ad_buf, BT_UUID_BROADCAST_AUDIO_VAL);
+	net_buf_simple_add_le24(&ad_buf, broadcast_id);
+	base_ad[0].type = BT_DATA_SVC_DATA16;
+	base_ad[0].data_len = ad_buf.len;
+	base_ad[0].data = ad_buf.data;
+	base_ad[1].type = BT_DATA_NAME_COMPLETE;
+	base_ad[1].data_len = sizeof(CONFIG_BT_DEVICE_NAME) - 1;
+	base_ad[1].data = CONFIG_BT_DEVICE_NAME;
 
+	err = tester_gap_create_adv_instance(&ext_adv_param, BTP_GAP_ADDR_TYPE_IDENTITY,
+					     base_ad, ARRAY_SIZE(base_ad), NULL, 0, &gap_settings,
+					     &source->ext_adv);
+	if (err != 0) {
+		LOG_DBG("Failed to create extended advertising instance: %d", err);
 		return BTP_STATUS_FAILED;
 	}
 
-	err = bt_rand(&broadcast_id, BT_AUDIO_BROADCAST_ID_SIZE);
-	if (err) {
-		LOG_DBG("Unable to generate broadcast ID: %d\n", err);
+	err = tester_gap_padv_configure(source->ext_adv, &per_adv_param);
+	if (err != 0) {
+		LOG_DBG("Failed to configure periodic advertising: %d", err);
+		return BTP_STATUS_FAILED;
+	}
+
+	err = bt_bap_broadcast_source_get_base(source->bap_broadcast, &base_buf);
+	if (err != 0) {
+		LOG_DBG("Failed to get encoded BASE: %d\n", err);
+		return BTP_STATUS_FAILED;
+	}
+
+	per_ad = &source->per_adv_local;
+	per_ad->type = BT_DATA_SVC_DATA16;
+	per_ad->data_len = base_buf.len;
+	per_ad->data = base_buf.data;
+	err = tester_gap_padv_set_data(source->ext_adv, per_ad, 1);
+	if (err != 0) {
+		return BTP_STATUS_FAILED;
+	}
+
+	rp->gap_settings = gap_settings;
+	sys_put_le24(broadcast_id, rp->broadcast_id);
+	*rsp_len = sizeof(*rp) + 1;
+
+	return BTP_STATUS_SUCCESS;
+}
 
+uint8_t btp_bap_broadcast_source_setup_v2(const void *cmd, uint16_t cmd_len,
+					  void *rsp, uint16_t *rsp_len)
+{
+	struct bt_le_per_adv_param per_adv_param =
+		*BT_LE_PER_ADV_PARAM(BT_GAP_MS_TO_PER_ADV_INTERVAL(150),
+				     BT_GAP_MS_TO_PER_ADV_INTERVAL(150), BT_LE_PER_ADV_OPT_NONE);
+	/* Zephyr Controller works best while Extended Advertising interval is a multiple
+	 * of the ISO Interval minus 10 ms (max. advertising random delay). This is
+	 * required to place the AUX_ADV_IND PDUs in a non-overlapping interval with the
+	 * Broadcast ISO radio events.
+	 */
+	struct bt_le_adv_param ext_adv_param =
+		*BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV, BT_GAP_MS_TO_ADV_INTERVAL(140),
+				 BT_GAP_MS_TO_ADV_INTERVAL(140), NULL);
+	int err;
+	struct bt_audio_codec_cfg codec_cfg;
+	const struct btp_bap_broadcast_source_setup_v2_cmd *cp = cmd;
+	struct btp_bap_broadcast_source_setup_v2_rp *rp = rsp;
+
+	if ((cmd_len < sizeof(*cp)) ||
+	    (cmd_len != sizeof(*cp) + cp->cc_ltvs_len)) {
+		return BTP_STATUS_FAILED;
+	}
+
+	uint32_t broadcast_id = sys_get_le24(cp->broadcast_id);
+
+	struct btp_bap_broadcast_local_source *source;
+
+	uint32_t gap_settings = BIT(BTP_GAP_SETTINGS_DISCOVERABLE) |
+				BIT(BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
+
+	NET_BUF_SIMPLE_DEFINE(ad_buf, BT_UUID_SIZE_16 + BT_AUDIO_BROADCAST_ID_SIZE);
+	NET_BUF_SIMPLE_DEFINE(base_buf, 128);
+
+	/* Broadcast Audio Streaming Endpoint advertising data */
+	struct bt_data base_ad[2];
+	struct bt_data *per_ad;
+
+	LOG_DBG("");
+
+	memset(&codec_cfg, 0, sizeof(codec_cfg));
+	codec_cfg.id = cp->coding_format;
+	codec_cfg.vid = cp->vid;
+	codec_cfg.cid = cp->cid;
+	codec_cfg.data_len = cp->cc_ltvs_len;
+	memcpy(codec_cfg.data, cp->cc_ltvs, cp->cc_ltvs_len);
+
+	source = btp_bap_broadcast_local_source_allocate(broadcast_id);
+	if (source == NULL) {
+		LOG_DBG("No more free local source items");
+		return BTP_STATUS_FAILED;
+	}
+
+	source->qos.phy = BT_BAP_QOS_CFG_2M;
+	source->qos.framing = cp->framing;
+	source->qos.rtn = cp->retransmission_num;
+	source->qos.latency = sys_le16_to_cpu(cp->max_transport_latency);
+	source->qos.interval = sys_get_le24(cp->sdu_interval);
+	source->qos.pd = sys_get_le24(cp->presentation_delay);
+	source->qos.sdu = sys_le16_to_cpu(cp->max_sdu);
+
+	source->stream_count = cp->subgroups * cp->streams_per_subgroup;
+
+	err = setup_broadcast_source(cp->streams_per_subgroup, cp->subgroups, source, &codec_cfg);
+	if (err != 0) {
+		LOG_DBG("Unable to setup broadcast source: %d", err);
 		return BTP_STATUS_FAILED;
 	}
 
@@ -381,38 +558,38 @@ uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 	base_ad[1].type = BT_DATA_NAME_COMPLETE;
 	base_ad[1].data_len = sizeof(CONFIG_BT_DEVICE_NAME) - 1;
 	base_ad[1].data = CONFIG_BT_DEVICE_NAME;
-	err = tester_gap_create_adv_instance(&ext_adv_param, BTP_GAP_ADDR_TYPE_IDENTITY, base_ad, 2,
-					     NULL, 0, &gap_settings);
+
+	err = tester_gap_create_adv_instance(&ext_adv_param, BTP_GAP_ADDR_TYPE_IDENTITY,
+					     base_ad, ARRAY_SIZE(base_ad), NULL, 0, &gap_settings,
+					     &source->ext_adv);
 	if (err != 0) {
 		LOG_DBG("Failed to create extended advertising instance: %d", err);
-
 		return BTP_STATUS_FAILED;
 	}
 
-	err = tester_gap_padv_configure(&per_adv_param);
+	err = tester_gap_padv_configure(source->ext_adv, &per_adv_param);
 	if (err != 0) {
 		LOG_DBG("Failed to configure periodic advertising: %d", err);
-
 		return BTP_STATUS_FAILED;
 	}
 
 	err = bt_bap_broadcast_source_get_base(source->bap_broadcast, &base_buf);
 	if (err != 0) {
-		LOG_DBG("Failed to get encoded BASE: %d\n", err);
-
+		LOG_DBG("Failed to get encoded BASE: %d", err);
 		return BTP_STATUS_FAILED;
 	}
 
-	per_ad.type = BT_DATA_SVC_DATA16;
-	per_ad.data_len = base_buf.len;
-	per_ad.data = base_buf.data;
-	err = tester_gap_padv_set_data(&per_ad, 1);
+	per_ad = &source->per_adv_local;
+	per_ad->type = BT_DATA_SVC_DATA16;
+	per_ad->data_len = base_buf.len;
+	per_ad->data = base_buf.data;
+	err = tester_gap_padv_set_data(source->ext_adv, per_ad, 1);
 	if (err != 0) {
+		LOG_DBG("Failed to set periodic advertising data: %d", err);
 		return BTP_STATUS_FAILED;
 	}
 
 	rp->gap_settings = gap_settings;
-	sys_put_le24(broadcast_id, rp->broadcast_id);
 	*rsp_len = sizeof(*rp) + 1;
 
 	return BTP_STATUS_SUCCESS;
@@ -422,7 +599,14 @@ uint8_t btp_bap_broadcast_source_release(const void *cmd, uint16_t cmd_len,
 					 void *rsp, uint16_t *rsp_len)
 {
 	int err;
-	struct btp_bap_broadcast_local_source *source = &local_source;
+	const struct btp_bap_broadcast_source_release_cmd *cp = cmd;
+	uint32_t broadcast_id = sys_get_le24(cp->broadcast_id);
+	struct btp_bap_broadcast_local_source *source =
+		btp_bap_broadcast_local_source_from_brcst_id_get(broadcast_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
 
 	LOG_DBG("");
 
@@ -433,7 +617,7 @@ uint8_t btp_bap_broadcast_source_release(const void *cmd, uint16_t cmd_len,
 		return BTP_STATUS_FAILED;
 	}
 
-	memset(source, 0, sizeof(*source));
+	btp_bap_broadcast_local_source_free(source);
 
 	return BTP_STATUS_SUCCESS;
 }
@@ -442,20 +626,27 @@ uint8_t btp_bap_broadcast_adv_start(const void *cmd, uint16_t cmd_len,
 				    void *rsp, uint16_t *rsp_len)
 {
 	int err;
-	struct bt_le_ext_adv *ext_adv = tester_gap_ext_adv_get();
+	const struct btp_bap_broadcast_adv_start_cmd *cp = cmd;
+	uint32_t broadcast_id = sys_get_le24(cp->broadcast_id);
+	struct btp_bap_broadcast_local_source *source =
+		btp_bap_broadcast_local_source_from_brcst_id_get(broadcast_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
 
 	LOG_DBG("");
 
-	if (ext_adv == NULL) {
+	if (source->ext_adv == NULL) {
 		return BTP_STATUS_FAILED;
 	}
 
-	err = tester_gap_start_ext_adv();
+	err = tester_gap_start_ext_adv(source->ext_adv);
 	if (err != 0) {
 		return BTP_STATUS_FAILED;
 	}
 
-	err = tester_gap_padv_start();
+	err = tester_gap_padv_start(source->ext_adv);
 	if (err != 0) {
 		LOG_DBG("Unable to start periodic advertising: %d", err);
 
@@ -469,15 +660,23 @@ uint8_t btp_bap_broadcast_adv_stop(const void *cmd, uint16_t cmd_len,
 				   void *rsp, uint16_t *rsp_len)
 {
 	int err;
+	const struct btp_bap_broadcast_adv_stop_cmd *cp = cmd;
+	uint32_t broadcast_id = sys_get_le24(cp->broadcast_id);
+	struct btp_bap_broadcast_local_source *source =
+		btp_bap_broadcast_local_source_from_brcst_id_get(broadcast_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
 
 	LOG_DBG("");
 
-	err = tester_gap_padv_stop();
+	err = tester_gap_padv_stop(source->ext_adv);
 	if (err != 0) {
 		return BTP_STATUS_FAILED;
 	}
 
-	err = tester_gap_stop_ext_adv();
+	err = tester_gap_stop_ext_adv(source->ext_adv);
 
 	return BTP_STATUS_VAL(err);
 }
@@ -486,16 +685,22 @@ uint8_t btp_bap_broadcast_source_start(const void *cmd, uint16_t cmd_len,
 				       void *rsp, uint16_t *rsp_len)
 {
 	int err;
-	struct btp_bap_broadcast_local_source *source = &local_source;
-	struct bt_le_ext_adv *ext_adv = tester_gap_ext_adv_get();
+	const struct btp_bap_broadcast_source_start_cmd *cp = cmd;
+	uint32_t broadcast_id = sys_get_le24(cp->broadcast_id);
+	struct btp_bap_broadcast_local_source *source =
+		btp_bap_broadcast_local_source_from_brcst_id_get(broadcast_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
 
 	LOG_DBG("");
 
-	if (ext_adv == NULL) {
+	if (source->ext_adv == NULL) {
 		return BTP_STATUS_FAILED;
 	}
 
-	err = bt_bap_broadcast_source_start(source->bap_broadcast, ext_adv);
+	err = bt_bap_broadcast_source_start(source->bap_broadcast, source->ext_adv);
 	if (err != 0) {
 		LOG_DBG("Unable to start broadcast source: %d", err);
 
@@ -509,7 +714,14 @@ uint8_t btp_bap_broadcast_source_stop(const void *cmd, uint16_t cmd_len,
 				      void *rsp, uint16_t *rsp_len)
 {
 	int err;
-	struct btp_bap_broadcast_local_source *source = &local_source;
+	const struct btp_bap_broadcast_source_stop_cmd *cp = cmd;
+	uint32_t broadcast_id = sys_get_le24(cp->broadcast_id);
+	struct btp_bap_broadcast_local_source *source =
+		btp_bap_broadcast_local_source_from_brcst_id_get(broadcast_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
 
 	LOG_DBG("");
 
diff --git a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
index acb49bee864..a10198cf232 100644
--- a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
+++ b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
@@ -41,11 +41,15 @@ struct btp_bap_broadcast_remote_source {
 };
 
 struct btp_bap_broadcast_local_source {
+	bool allocated;
+	uint8_t source_id;
+	struct bt_le_ext_adv *ext_adv;
 	uint32_t broadcast_id;
 	struct bt_bap_qos_cfg qos;
 	struct btp_bap_broadcast_stream streams[CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT];
 	struct bt_audio_codec_cfg subgroup_codec_cfg[CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT];
 	uint8_t stream_count;
+	struct bt_data per_adv_local;
 	/* Only for BTP BAP commands */
 	struct bt_bap_broadcast_source *bap_broadcast;
 	/* Only for BTP CAP commands */
@@ -53,12 +57,16 @@ struct btp_bap_broadcast_local_source {
 };
 
 int btp_bap_broadcast_init(void);
-struct btp_bap_broadcast_local_source *btp_bap_broadcast_local_source_get(uint8_t source_id);
+struct btp_bap_broadcast_local_source *btp_bap_broadcast_local_source_from_src_id_get(
+	uint32_t source_id);
+uint8_t btp_bap_broadcast_local_source_idx_get(struct btp_bap_broadcast_local_source *source);
 struct btp_bap_broadcast_stream *btp_bap_broadcast_stream_alloc(
 	struct btp_bap_broadcast_local_source *source);
 
 uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 				       void *rsp, uint16_t *rsp_len);
+uint8_t btp_bap_broadcast_source_setup_v2(const void *cmd, uint16_t cmd_len,
+					  void *rsp, uint16_t *rsp_len);
 uint8_t btp_bap_broadcast_source_release(const void *cmd, uint16_t cmd_len,
 					 void *rsp, uint16_t *rsp_len);
 uint8_t btp_bap_broadcast_adv_start(const void *cmd, uint16_t cmd_len,
diff --git a/tests/bluetooth/tester/src/audio/btp_cap.c b/tests/bluetooth/tester/src/audio/btp_cap.c
index c8e8e22aa91..a847e8e0658 100644
--- a/tests/bluetooth/tester/src/audio/btp_cap.c
+++ b/tests/bluetooth/tester/src/audio/btp_cap.c
@@ -24,6 +24,18 @@ static struct btp_bap_unicast_group *u_group;
 
 static K_SEM_DEFINE(source_stopped_sem, 0U, CONFIG_BT_BAP_BROADCAST_SRC_COUNT);
 
+struct cap_initiator_broadcast_params {
+	struct bt_cap_initiator_broadcast_subgroup_param
+		cap_subgroup_params[CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT];
+	struct bt_cap_initiator_broadcast_stream_param
+		cap_stream_params[CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT]
+				 [CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT];
+};
+
+static struct cap_initiator_broadcast_params
+	cap_broadcast_params[CONFIG_BT_BAP_BROADCAST_SRC_COUNT];
+
+
 extern struct bt_csip_set_coordinator_set_member *btp_csip_set_members[CONFIG_BT_MAX_CONN];
 
 static struct bt_bap_stream *stream_unicast_to_bap(struct btp_bap_unicast_stream *stream)
@@ -460,12 +472,6 @@ static uint8_t btp_cap_unicast_audio_stop(const void *cmd, uint16_t cmd_len,
 	return BTP_STATUS_SUCCESS;
 }
 
-static struct bt_cap_initiator_broadcast_subgroup_param
-	cap_subgroup_params[CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT];
-static struct bt_cap_initiator_broadcast_stream_param
-	cap_stream_params[CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT]
-		     [CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT];
-
 static uint8_t btp_cap_broadcast_source_setup_stream(const void *cmd, uint16_t cmd_len,
 						     void *rsp, uint16_t *rsp_len)
 {
@@ -473,7 +479,12 @@ static uint8_t btp_cap_broadcast_source_setup_stream(const void *cmd, uint16_t c
 	struct btp_bap_broadcast_stream *stream;
 	const struct btp_cap_broadcast_source_setup_stream_cmd *cp = cmd;
 	struct btp_bap_broadcast_local_source *source =
-		btp_bap_broadcast_local_source_get(cp->source_id);
+		btp_bap_broadcast_local_source_from_src_id_get(cp->source_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
+
 	struct bt_audio_codec_cfg *codec_cfg;
 
 	stream = btp_bap_broadcast_stream_alloc(source);
@@ -510,15 +521,29 @@ static uint8_t btp_cap_broadcast_source_setup_subgroup(const void *cmd, uint16_t
 	struct bt_audio_codec_cfg *codec_cfg;
 	const struct btp_cap_broadcast_source_setup_subgroup_cmd *cp = cmd;
 	struct btp_bap_broadcast_local_source *source =
-		btp_bap_broadcast_local_source_get(cp->source_id);
+		btp_bap_broadcast_local_source_from_src_id_get(cp->source_id);
 
-	if (cp->subgroup_id >= sizeof(cap_subgroup_params)) {
+	if (source == NULL) {
 		return BTP_STATUS_FAILED;
 	}
 
-	cap_subgroup_params[cp->subgroup_id].codec_cfg =
-		&source->subgroup_codec_cfg[cp->subgroup_id];
-	codec_cfg = cap_subgroup_params[cp->subgroup_id].codec_cfg;
+	if (cp->subgroup_id >= ARRAY_SIZE(cap_broadcast_params[0].cap_subgroup_params)) {
+		return BTP_STATUS_FAILED;
+	}
+
+	uint8_t idx = btp_bap_broadcast_local_source_idx_get(source);
+
+	if (idx >= ARRAY_SIZE(cap_broadcast_params)) {
+		return BTP_STATUS_FAILED;
+	}
+
+	struct bt_cap_initiator_broadcast_subgroup_param *subgroup_param =
+		&cap_broadcast_params[idx].cap_subgroup_params[cp->subgroup_id];
+
+	subgroup_param->codec_cfg = &source->subgroup_codec_cfg[cp->subgroup_id];
+
+	codec_cfg = subgroup_param->codec_cfg;
+
 	memset(codec_cfg, 0, sizeof(*codec_cfg));
 	codec_cfg->id = cp->coding_format;
 	codec_cfg->vid = cp->vid;
@@ -550,7 +575,7 @@ static int cap_broadcast_source_adv_setup(struct btp_bap_broadcast_local_source
 	struct bt_data per_ad;
 
 	/* A more specialized adv instance may already have been created by another btp module */
-	if (tester_gap_ext_adv_get() == NULL) {
+	if (source->ext_adv == NULL) {
 		struct bt_le_adv_param param = *BT_LE_EXT_ADV_NCONN;
 		struct bt_data base_ad[2];
 
@@ -567,16 +592,17 @@ static int cap_broadcast_source_adv_setup(struct btp_bap_broadcast_local_source
 		base_ad[1].data_len = sizeof(CONFIG_BT_DEVICE_NAME) - 1;
 		base_ad[1].data = CONFIG_BT_DEVICE_NAME;
 
-		err = tester_gap_create_adv_instance(&param, BTP_GAP_ADDR_TYPE_IDENTITY, base_ad,
-						     2, NULL, 0, gap_settings);
+		err = tester_gap_create_adv_instance(&param, BTP_GAP_ADDR_TYPE_IDENTITY,
+						     base_ad, 2, NULL, 0, gap_settings,
+						     &source->ext_adv);
 		if (err != 0) {
 			LOG_DBG("Failed to create extended advertising instance: %d", err);
-
 			return -EINVAL;
 		}
 	}
 
-	err = tester_gap_padv_configure(BT_LE_PER_ADV_PARAM(BT_GAP_PER_ADV_FAST_INT_MIN_2,
+	err = tester_gap_padv_configure(source->ext_adv,
+					BT_LE_PER_ADV_PARAM(BT_GAP_PER_ADV_FAST_INT_MIN_2,
 							    BT_GAP_PER_ADV_FAST_INT_MAX_2,
 							    BT_LE_PER_ADV_OPT_NONE));
 	if (err != 0) {
@@ -595,7 +621,7 @@ static int cap_broadcast_source_adv_setup(struct btp_bap_broadcast_local_source
 	per_ad.type = BT_DATA_SVC_DATA16;
 	per_ad.data_len = base_buf.len;
 	per_ad.data = base_buf.data;
-	err = tester_gap_padv_set_data(&per_ad, 1);
+	err = tester_gap_padv_set_data(source->ext_adv, &per_ad, 1);
 	if (err != 0) {
 		return -EINVAL;
 	}
@@ -612,7 +638,15 @@ static uint8_t btp_cap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 	const struct btp_cap_broadcast_source_setup_cmd *cp = cmd;
 	struct btp_cap_broadcast_source_setup_rp *rp = rsp;
 	struct btp_bap_broadcast_local_source *source =
-		btp_bap_broadcast_local_source_get(cp->source_id);
+		btp_bap_broadcast_local_source_from_src_id_get(cp->source_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
+
+	struct cap_initiator_broadcast_params *cap_params =
+		&cap_broadcast_params[cp->source_id];
+
 	struct bt_bap_qos_cfg *qos = &source->qos;
 
 	LOG_DBG("");
@@ -622,7 +656,6 @@ static uint8_t btp_cap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 	for (size_t i = 0; i < ARRAY_SIZE(source->streams); i++) {
 		struct btp_bap_broadcast_stream *stream = &source->streams[i];
 		struct bt_cap_initiator_broadcast_stream_param *stream_param;
-		struct bt_cap_initiator_broadcast_subgroup_param *subgroup_param;
 		uint8_t bis_id;
 
 		if (!stream->in_use) {
@@ -630,9 +663,9 @@ static uint8_t btp_cap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 			break;
 		}
 
-		subgroup_param = &cap_subgroup_params[stream->subgroup_id];
-		bis_id = subgroup_param->stream_count++;
-		stream_param = &cap_stream_params[stream->subgroup_id][bis_id];
+		bis_id = cap_params->cap_subgroup_params[stream->subgroup_id].stream_count++;
+		stream_param = &cap_params->cap_stream_params[stream->subgroup_id][bis_id];
+
 		stream_param->stream = stream_broadcast_to_cap(stream);
 
 		if (cp->flags & BTP_CAP_BROADCAST_SOURCE_SETUP_FLAG_SUBGROUP_CODEC) {
@@ -644,13 +677,13 @@ static uint8_t btp_cap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 		}
 	}
 
-	for (size_t i = 0; i < ARRAY_SIZE(cap_subgroup_params); i++) {
-		if (cap_subgroup_params[i].stream_count == 0) {
+	for (size_t i = 0; i < ARRAY_SIZE(cap_params->cap_subgroup_params); i++) {
+		if (cap_params->cap_subgroup_params[i].stream_count == 0) {
 			/* No gaps allowed */
 			break;
 		}
 
-		cap_subgroup_params[i].stream_params = cap_stream_params[i];
+		cap_params->cap_subgroup_params[i].stream_params = cap_params->cap_stream_params[i];
 		create_param.subgroup_count++;
 	}
 
@@ -667,14 +700,14 @@ static uint8_t btp_cap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 	qos->interval = sys_get_le24(cp->sdu_interval);
 	qos->pd = sys_get_le24(cp->presentation_delay);
 
-	create_param.subgroup_params = cap_subgroup_params;
+	create_param.subgroup_params = cap_params->cap_subgroup_params;
 	create_param.qos = qos;
 	create_param.packing = BT_ISO_PACKING_SEQUENTIAL;
 	create_param.encryption = cp->flags & BTP_CAP_BROADCAST_SOURCE_SETUP_FLAG_ENCRYPTION;
 	memcpy(create_param.broadcast_code, cp->broadcast_code, sizeof(cp->broadcast_code));
 
 	err = bt_cap_initiator_broadcast_audio_create(&create_param, &source->cap_broadcast);
-	memset(cap_subgroup_params, 0, sizeof(cap_subgroup_params));
+	memset(&cap_params->cap_subgroup_params, 0, sizeof(cap_params->cap_subgroup_params));
 	memset(&create_param, 0, sizeof(create_param));
 	if (err != 0) {
 		LOG_ERR("Failed to create audio source: %d", err);
@@ -700,7 +733,7 @@ static uint8_t btp_cap_broadcast_source_release(const void *cmd, uint16_t cmd_le
 	int err;
 	const struct btp_cap_broadcast_source_release_cmd *cp = cmd;
 	struct btp_bap_broadcast_local_source *source =
-		btp_bap_broadcast_local_source_get(cp->source_id);
+		btp_bap_broadcast_local_source_from_src_id_get(cp->source_id);
 
 	LOG_DBG("");
 
@@ -725,20 +758,24 @@ static uint8_t btp_cap_broadcast_adv_start(const void *cmd, uint16_t cmd_len,
 					   void *rsp, uint16_t *rsp_len)
 {
 	int err;
-	struct bt_le_ext_adv *ext_adv = tester_gap_ext_adv_get();
+	const struct btp_cap_broadcast_adv_start_cmd *cp = cmd;
+	struct btp_bap_broadcast_local_source *source =
+		btp_bap_broadcast_local_source_from_src_id_get(cp->source_id);
 
-	LOG_DBG("");
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
 
-	if (ext_adv == NULL) {
+	if (source->ext_adv == NULL) {
 		return BTP_STATUS_FAILED;
 	}
 
-	err = tester_gap_start_ext_adv();
+	err = tester_gap_start_ext_adv(source->ext_adv);
 	if (err != 0) {
 		return BTP_STATUS_FAILED;
 	}
 
-	err = tester_gap_padv_start();
+	err = tester_gap_padv_start(source->ext_adv);
 	if (err != 0) {
 		LOG_DBG("Unable to start periodic advertising: %d", err);
 
@@ -752,10 +789,18 @@ static uint8_t btp_cap_broadcast_adv_stop(const void *cmd, uint16_t cmd_len,
 					  void *rsp, uint16_t *rsp_len)
 {
 	int err;
+	const struct btp_cap_broadcast_adv_stop_cmd *cp = cmd;
 
 	LOG_DBG("");
 
-	err = tester_gap_padv_stop();
+	struct btp_bap_broadcast_local_source *source =
+		btp_bap_broadcast_local_source_from_src_id_get(cp->source_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
+
+	err = tester_gap_padv_stop(source->ext_adv);
 	if (err == -ESRCH) {
 		/* Ext adv hasn't been created yet */
 		return BTP_STATUS_SUCCESS;
@@ -764,7 +809,7 @@ static uint8_t btp_cap_broadcast_adv_stop(const void *cmd, uint16_t cmd_len,
 		return BTP_STATUS_FAILED;
 	}
 
-	err = tester_gap_stop_ext_adv();
+	err = tester_gap_stop_ext_adv(source->ext_adv);
 
 	return BTP_STATUS_VAL(err);
 }
@@ -775,16 +820,19 @@ static uint8_t btp_cap_broadcast_source_start(const void *cmd, uint16_t cmd_len,
 	int err;
 	const struct btp_cap_broadcast_source_start_cmd *cp = cmd;
 	struct btp_bap_broadcast_local_source *source =
-		btp_bap_broadcast_local_source_get(cp->source_id);
-	struct bt_le_ext_adv *ext_adv = tester_gap_ext_adv_get();
+		btp_bap_broadcast_local_source_from_src_id_get(cp->source_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
 
 	LOG_DBG("");
 
-	if (ext_adv == NULL) {
+	if (source->ext_adv == NULL) {
 		return BTP_STATUS_FAILED;
 	}
 
-	err = bt_cap_initiator_broadcast_audio_start(source->cap_broadcast, ext_adv);
+	err = bt_cap_initiator_broadcast_audio_start(source->cap_broadcast, source->ext_adv);
 	if (err != 0) {
 		LOG_ERR("Failed to start audio source: %d", err);
 
@@ -800,7 +848,7 @@ static uint8_t btp_cap_broadcast_source_stop(const void *cmd, uint16_t cmd_len,
 	int err;
 	const struct btp_cap_broadcast_source_stop_cmd *cp = cmd;
 	struct btp_bap_broadcast_local_source *source =
-		btp_bap_broadcast_local_source_get(cp->source_id);
+		btp_bap_broadcast_local_source_from_src_id_get(cp->source_id);
 
 	/* If no source has been started yet, there is nothing to stop */
 	if (source == NULL || source->cap_broadcast == NULL) {
@@ -832,7 +880,12 @@ static uint8_t btp_cap_broadcast_source_update(const void *cmd, uint16_t cmd_len
 	struct bt_data per_ad;
 	const struct btp_cap_broadcast_source_update_cmd *cp = cmd;
 	struct btp_bap_broadcast_local_source *source =
-		btp_bap_broadcast_local_source_get(cp->source_id);
+		btp_bap_broadcast_local_source_from_src_id_get(cp->source_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
+
 	NET_BUF_SIMPLE_DEFINE(base_buf, 128);
 
 	LOG_DBG("");
@@ -859,7 +912,7 @@ static uint8_t btp_cap_broadcast_source_update(const void *cmd, uint16_t cmd_len
 	per_ad.type = BT_DATA_SVC_DATA16;
 	per_ad.data_len = base_buf.len;
 	per_ad.data = base_buf.data;
-	err = tester_gap_padv_set_data(&per_ad, 1);
+	err = tester_gap_padv_set_data(source->ext_adv, &per_ad, 1);
 	if (err != 0) {
 		return -EINVAL;
 	}
diff --git a/tests/bluetooth/tester/src/audio/btp_pbp.c b/tests/bluetooth/tester/src/audio/btp_pbp.c
index d3acfcbd807..b3a5d8b0c2a 100644
--- a/tests/bluetooth/tester/src/audio/btp_pbp.c
+++ b/tests/bluetooth/tester/src/audio/btp_pbp.c
@@ -143,6 +143,7 @@ static int pbp_broadcast_source_adv_setup(void)
 
 	int err = bt_rand(&broadcast_id, BT_AUDIO_BROADCAST_ID_SIZE);
 	struct bt_data ext_ad[3];
+	struct bt_le_ext_adv *ext_adv = NULL;
 
 	if (err) {
 		LOG_ERR("Unable to generate broadcast ID: %d\n", err);
@@ -166,7 +167,7 @@ static int pbp_broadcast_source_adv_setup(void)
 	ext_ad[2].data = pba_buf.data;
 
 	err = tester_gap_create_adv_instance(&param, BTP_GAP_ADDR_TYPE_IDENTITY, ext_ad,
-					     ARRAY_SIZE(ext_ad), NULL, 0, &gap_settings);
+					     ARRAY_SIZE(ext_ad), NULL, 0, &gap_settings, &ext_adv);
 	if (err) {
 		LOG_ERR("Could not set up extended advertisement: %d", err);
 		return -EINVAL;
diff --git a/tests/bluetooth/tester/src/btp/btp_gap.h b/tests/bluetooth/tester/src/btp/btp_gap.h
index fd7826aab0f..4ae2e53f8a2 100644
--- a/tests/bluetooth/tester/src/btp/btp_gap.h
+++ b/tests/bluetooth/tester/src/btp/btp_gap.h
@@ -448,17 +448,19 @@ struct bt_le_per_adv_param;
 struct bt_le_per_adv_sync_param;
 struct bt_le_adv_param;
 struct bt_data;
-struct bt_le_ext_adv *tester_gap_ext_adv_get(void);
+struct bt_le_ext_adv *tester_gap_ext_adv_get(uint8_t ext_adv_idx);
 struct bt_le_per_adv_sync *tester_gap_padv_get(void);
 int tester_gap_create_adv_instance(struct bt_le_adv_param *param, uint8_t own_addr_type,
 				   const struct bt_data *ad, size_t ad_len,
-				   const struct bt_data *sd, size_t sd_len, uint32_t *settings);
-int tester_gap_stop_ext_adv(void);
-int tester_gap_start_ext_adv(void);
-int tester_gap_padv_configure(const struct bt_le_per_adv_param *param);
-int tester_gap_padv_set_data(struct bt_data *per_ad, uint8_t ad_len);
-int tester_gap_padv_start(void);
-int tester_gap_padv_stop(void);
+				   const struct bt_data *sd, size_t sd_len,
+				   uint32_t *settings, struct bt_le_ext_adv **ext_adv);
+int tester_gap_stop_ext_adv(struct bt_le_ext_adv *ext_adv);
+int tester_gap_start_ext_adv(struct bt_le_ext_adv *ext_adv);
+int tester_gap_padv_configure(struct bt_le_ext_adv *ext_adv,
+			      const struct bt_le_per_adv_param *param);
+int tester_gap_padv_set_data(struct bt_le_ext_adv *ext_adv, struct bt_data *per_ad, uint8_t ad_len);
+int tester_gap_padv_start(struct bt_le_ext_adv *ext_adv);
+int tester_gap_padv_stop(struct bt_le_ext_adv *ext_adv);
 int tester_gap_padv_create_sync(struct bt_le_per_adv_sync_param *create_params);
 int tester_gap_padv_stop_sync(void);
 #endif /* defined(CONFIG_BT_EXT_ADV) */
diff --git a/tests/bluetooth/tester/src/btp_gap.c b/tests/bluetooth/tester/src/btp_gap.c
index 350988fc4db..547400d912c 100644
--- a/tests/bluetooth/tester/src/btp_gap.c
+++ b/tests/bluetooth/tester/src/btp_gap.c
@@ -522,18 +522,42 @@ static struct bt_data ad[10] = {
 };
 static struct bt_data sd[10];
 
-static struct bt_le_ext_adv *ext_adv;
+#if CONFIG_BT_EXT_ADV
+static struct bt_le_ext_adv *ext_adv_sets[CONFIG_BT_EXT_ADV_MAX_ADV_SET];
+#else
+static struct bt_le_ext_adv *ext_adv_sets[1];
+#endif
 
-struct bt_le_ext_adv *tester_gap_ext_adv_get(void)
+struct bt_le_ext_adv *tester_gap_ext_adv_get(uint8_t ext_adv_idx)
 {
 	if (!IS_ENABLED(CONFIG_BT_EXT_ADV)) {
 		return NULL;
 	}
 
-	return ext_adv;
+	if (ext_adv_idx >= ARRAY_SIZE(ext_adv_sets)) {
+		LOG_ERR("Invalid ext_adv_id: %d", ext_adv_idx);
+		return NULL;
+	}
+
+	return ext_adv_sets[ext_adv_idx];
 }
 
-int tester_gap_start_ext_adv(void)
+static int tester_gap_ext_adv_idx_free_get(void)
+{
+	if (!IS_ENABLED(CONFIG_BT_EXT_ADV)) {
+		return -ENOTSUP;
+	}
+
+	for (int i = 0; i < ARRAY_SIZE(ext_adv_sets); i++) {
+		if (ext_adv_sets[i] == NULL) {
+			return i;
+		}
+	}
+
+	return -ENOMEM;
+}
+
+int tester_gap_start_ext_adv(struct bt_le_ext_adv *ext_adv)
 {
 	if (!IS_ENABLED(CONFIG_BT_EXT_ADV)) {
 		return -ENOTSUP;
@@ -541,10 +565,14 @@ int tester_gap_start_ext_adv(void)
 
 	int err;
 
+	if (ext_adv == NULL) {
+		LOG_ERR("Invalid ext_adv");
+		return -EINVAL;
+	}
+
 	err = bt_le_ext_adv_start(ext_adv, BT_LE_EXT_ADV_START_DEFAULT);
 	if (err != 0) {
 		LOG_ERR("Failed to start advertising");
-
 		return -EINVAL;
 	}
 
@@ -553,7 +581,7 @@ int tester_gap_start_ext_adv(void)
 	return 0;
 }
 
-int tester_gap_stop_ext_adv(void)
+int tester_gap_stop_ext_adv(struct bt_le_ext_adv *ext_adv)
 {
 	if (!IS_ENABLED(CONFIG_BT_EXT_ADV)) {
 		return -ENOTSUP;
@@ -561,6 +589,11 @@ int tester_gap_stop_ext_adv(void)
 
 	int err;
 
+	if (ext_adv == NULL) {
+		LOG_ERR("Invalid ext_adv");
+		return -EINVAL;
+	}
+
 	err = bt_le_ext_adv_stop(ext_adv);
 	if (err != 0) {
 		LOG_ERR("Failed to stop advertising");
@@ -625,10 +658,10 @@ static uint8_t set_bondable(const void *cmd, uint16_t cmd_len,
 	return BTP_STATUS_SUCCESS;
 }
 
-int tester_gap_create_adv_instance(struct bt_le_adv_param *param, uint8_t own_addr_type,
-				   const struct bt_data *ad, size_t ad_len,
-				   const struct bt_data *sd, size_t sd_len,
-				   uint32_t *settings)
+int tester_gap_create_adv_instance(struct bt_le_adv_param *param,
+				   uint8_t own_addr_type, const struct bt_data *ad, size_t ad_len,
+				   const struct bt_data *sd, size_t sd_len, uint32_t *settings,
+				   struct bt_le_ext_adv **ext_adv)
 {
 	int err = 0;
 
@@ -678,27 +711,41 @@ int tester_gap_create_adv_instance(struct bt_le_adv_param *param, uint8_t own_ad
 
 	if (IS_ENABLED(CONFIG_BT_EXT_ADV) && atomic_test_bit(&current_settings,
 	    BTP_GAP_SETTINGS_EXTENDED_ADVERTISING)) {
+
 		param->options |= BT_LE_ADV_OPT_EXT_ADV;
-		if (ext_adv != NULL) {
-			err = bt_le_ext_adv_stop(ext_adv);
+		if (*ext_adv) {
+			err = bt_le_ext_adv_stop(*ext_adv);
 			if (err != 0) {
 				return err;
 			}
 
-			err = bt_le_ext_adv_delete(ext_adv);
+			err = bt_le_ext_adv_delete(*ext_adv);
 			if (err != 0) {
 				return err;
 			}
 
-			ext_adv = NULL;
+			*ext_adv = NULL;
+		}
+
+		int index = tester_gap_ext_adv_idx_free_get();
+
+		if (index < 0) {
+			LOG_ERR("No free ext_adv index");
+			return -ENOMEM;
 		}
 
-		err = bt_le_ext_adv_create(param, NULL, &ext_adv);
+		/* Set the set_id to be matching the index of the ext_adv set */
+		param->sid = index;
+
+		err = bt_le_ext_adv_create(param, NULL, &ext_adv_sets[index]);
 		if (err != 0) {
 			return BTP_STATUS_FAILED;
 		}
 
-		err = bt_le_ext_adv_set_data(ext_adv, ad, ad_len, sd_len ? sd : NULL, sd_len);
+		err = bt_le_ext_adv_set_data(ext_adv_sets[index], ad, ad_len, sd_len ?
+					     sd : NULL, sd_len);
+
+		*ext_adv = ext_adv_sets[index];
 	}
 
 	return err;
@@ -757,7 +804,10 @@ static uint8_t start_advertising(const void *cmd, uint16_t cmd_len,
 		i += sd[sd_len].data_len;
 	}
 
-	err = tester_gap_create_adv_instance(&param, own_addr_type, ad, adv_len, sd, sd_len, NULL);
+	struct bt_le_ext_adv *ext_adv = NULL;
+
+	err = tester_gap_create_adv_instance(&param, own_addr_type, ad, adv_len, sd,
+					     sd_len, NULL, &ext_adv);
 	if (err != 0) {
 		return BTP_STATUS_FAILED;
 	}
@@ -1462,7 +1512,8 @@ static struct bt_le_per_adv_sync_cb pa_sync_cb = {
 #if defined(CONFIG_BT_PER_ADV)
 static struct bt_data padv[10];
 
-int tester_gap_padv_configure(const struct bt_le_per_adv_param *param)
+int tester_gap_padv_configure(struct bt_le_ext_adv *ext_adv,
+			      const struct bt_le_per_adv_param *param)
 {
 	int err;
 	struct bt_le_adv_param ext_adv_param =
@@ -1471,8 +1522,9 @@ int tester_gap_padv_configure(const struct bt_le_per_adv_param *param)
 	if (ext_adv == NULL) {
 		current_settings = BIT(BTP_GAP_SETTINGS_DISCOVERABLE) |
 				   BIT(BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
-		err = tester_gap_create_adv_instance(&ext_adv_param, BTP_GAP_ADDR_TYPE_IDENTITY, ad,
-						     1, NULL, 0, NULL);
+		err = tester_gap_create_adv_instance(&ext_adv_param,
+						     BTP_GAP_ADDR_TYPE_IDENTITY, ad, 1, NULL, 0,
+						     NULL, &ext_adv);
 		if (err != 0) {
 			return -EINVAL;
 		}
@@ -1501,9 +1553,11 @@ static uint8_t padv_configure(const void *cmd, uint16_t cmd_len,
 		options |= BT_LE_PER_ADV_OPT_USE_TX_POWER;
 	}
 
-	err = tester_gap_padv_configure(BT_LE_PER_ADV_PARAM(sys_le16_to_cpu(cp->interval_min),
-							    sys_le16_to_cpu(cp->interval_max),
-							    options));
+	struct bt_le_ext_adv *ext_adv = tester_gap_ext_adv_get(0);
+
+	err = tester_gap_padv_configure(ext_adv,
+					BT_LE_PER_ADV_PARAM(sys_le16_to_cpu(cp->interval_min),
+					sys_le16_to_cpu(cp->interval_max), options));
 	if (err) {
 		return BTP_STATUS_FAILED;
 	}
@@ -1515,7 +1569,7 @@ static uint8_t padv_configure(const void *cmd, uint16_t cmd_len,
 	return BTP_STATUS_SUCCESS;
 }
 
-int tester_gap_padv_start(void)
+int tester_gap_padv_start(struct bt_le_ext_adv *ext_adv)
 {
 	int err;
 
@@ -1524,7 +1578,7 @@ int tester_gap_padv_start(void)
 	}
 
 	if (!atomic_test_bit(&current_settings, BTP_GAP_SETTINGS_ADVERTISING)) {
-		err = tester_gap_start_ext_adv();
+		err = tester_gap_start_ext_adv(ext_adv);
 		if (err != 0) {
 			return -EINVAL;
 		}
@@ -1545,7 +1599,9 @@ static uint8_t padv_start(const void *cmd, uint16_t cmd_len,
 	int err;
 	struct btp_gap_padv_start_rp *rp = rsp;
 
-	err = tester_gap_padv_start();
+	struct bt_le_ext_adv *ext_adv = tester_gap_ext_adv_get(0);
+
+	err = tester_gap_padv_start(ext_adv);
 
 	if (err) {
 		return BTP_STATUS_FAILED;
@@ -1558,7 +1614,7 @@ static uint8_t padv_start(const void *cmd, uint16_t cmd_len,
 	return BTP_STATUS_SUCCESS;
 }
 
-int tester_gap_padv_stop(void)
+int tester_gap_padv_stop(struct bt_le_ext_adv *ext_adv)
 {
 	int err;
 
@@ -1581,8 +1637,9 @@ static uint8_t padv_stop(const void *cmd, uint16_t cmd_len,
 {
 	int err;
 	struct btp_gap_padv_stop_rp *rp = rsp;
+	struct bt_le_ext_adv *ext_adv = tester_gap_ext_adv_get(0);
 
-	err = tester_gap_padv_stop();
+	err = tester_gap_padv_stop(ext_adv);
 
 	if (err) {
 		return BTP_STATUS_FAILED;
@@ -1595,7 +1652,7 @@ static uint8_t padv_stop(const void *cmd, uint16_t cmd_len,
 	return BTP_STATUS_SUCCESS;
 }
 
-int tester_gap_padv_set_data(struct bt_data *per_ad, uint8_t ad_len)
+int tester_gap_padv_set_data(struct bt_le_ext_adv *ext_adv, struct bt_data *per_ad, uint8_t ad_len)
 {
 	int err;
 
@@ -1616,9 +1673,10 @@ static uint8_t padv_set_data(const void *cmd, uint16_t cmd_len,
 			     void *rsp, uint16_t *rsp_len)
 {
 	int err;
-	uint8_t padv_len = 0U;
 	const struct btp_gap_padv_set_data_cmd *cp = cmd;
 
+	uint8_t padv_len = 0U;
+
 	for (uint8_t i = 0; i < cp->data_len; padv_len++) {
 		if (padv_len >= ARRAY_SIZE(padv)) {
 			LOG_ERR("padv[] Out of memory");
@@ -1631,7 +1689,9 @@ static uint8_t padv_set_data(const void *cmd, uint16_t cmd_len,
 		i += padv[padv_len].data_len;
 	}
 
-	err = tester_gap_padv_set_data(padv, padv_len);
+	struct bt_le_ext_adv *ext_adv = tester_gap_ext_adv_get(0);
+
+	err = tester_gap_padv_set_data(ext_adv, padv, padv_len);
 
 	return BTP_STATUS_VAL(err);
 }

From a49a1ebe44620057550899e67bcd6017a837853c Mon Sep 17 00:00:00 2001
From: Sergei Ovchinnikov <sergei.ovchinnikov@nordicsemi.no>
Date: Fri, 10 Jan 2025 10:33:58 +0100
Subject: [PATCH 2582/2913] [nrf fromtree] drivers: regulator: npm1300:
 workaround for LDO HW bug

There is a HW bug in nPM1300 LDO which causes the LDO output voltage to
reach its target very slowly in specific cases. This is worked around by
performing an additional i2c read shortly after an LDO is enabled.

Signed-off-by: Sergei Ovchinnikov <sergei.ovchinnikov@nordicsemi.no>
(cherry picked from commit 2d343589bb0a747b601a84a21eaa0ef9d87c27e8)
---
 drivers/regulator/regulator_npm1300.c         | 24 ++++++++++++++++---
 .../regulator/nordic,npm1300-regulator.yaml   |  9 +++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/drivers/regulator/regulator_npm1300.c b/drivers/regulator/regulator_npm1300.c
index ff4fcb5df43..c44339ccabf 100644
--- a/drivers/regulator/regulator_npm1300.c
+++ b/drivers/regulator/regulator_npm1300.c
@@ -87,6 +87,7 @@ struct regulator_npm1300_config {
 	struct gpio_dt_spec retention_gpios;
 	struct gpio_dt_spec pwm_gpios;
 	uint8_t soft_start;
+	bool ldo_disable_workaround;
 };
 
 struct regulator_npm1300_data {
@@ -357,6 +358,7 @@ int regulator_npm1300_set_mode(const struct device *dev, regulator_mode_t mode)
 int regulator_npm1300_enable(const struct device *dev)
 {
 	const struct regulator_npm1300_config *config = dev->config;
+	int ret;
 
 	switch (config->source) {
 	case NPM1300_SOURCE_BUCK1:
@@ -364,12 +366,27 @@ int regulator_npm1300_enable(const struct device *dev)
 	case NPM1300_SOURCE_BUCK2:
 		return mfd_npm1300_reg_write(config->mfd, BUCK_BASE, BUCK_OFFSET_EN_SET + 2U, 1U);
 	case NPM1300_SOURCE_LDO1:
-		return mfd_npm1300_reg_write(config->mfd, LDSW_BASE, LDSW_OFFSET_EN_SET, 1U);
+		ret = mfd_npm1300_reg_write(config->mfd, LDSW_BASE, LDSW_OFFSET_EN_SET, 1U);
+		break;
 	case NPM1300_SOURCE_LDO2:
-		return mfd_npm1300_reg_write(config->mfd, LDSW_BASE, LDSW_OFFSET_EN_SET + 2U, 1U);
+		ret = mfd_npm1300_reg_write(config->mfd, LDSW_BASE, LDSW_OFFSET_EN_SET + 2U, 1U);
+		break;
 	default:
 		return 0;
 	}
+
+	if (ret < 0) {
+		return ret;
+	}
+
+	if (!config->ldo_disable_workaround) {
+		uint8_t unused;
+
+		k_msleep(2);
+		return mfd_npm1300_reg_read(config->mfd, LDSW_BASE, LDSW_OFFSET_STATUS, &unused);
+	}
+
+	return ret;
 }
 
 int regulator_npm1300_disable(const struct device *dev)
@@ -655,7 +672,8 @@ static DEVICE_API(regulator, api) = {
 		.soft_start = DT_ENUM_IDX_OR(node_id, soft_start_microamp, UINT8_MAX),             \
 		.enable_gpios = GPIO_DT_SPEC_GET_OR(node_id, enable_gpios, {0}),                   \
 		.retention_gpios = GPIO_DT_SPEC_GET_OR(node_id, retention_gpios, {0}),             \
-		.pwm_gpios = GPIO_DT_SPEC_GET_OR(node_id, pwm_gpios, {0})};                        \
+		.pwm_gpios = GPIO_DT_SPEC_GET_OR(node_id, pwm_gpios, {0}),                         \
+		.ldo_disable_workaround = DT_PROP(node_id, nordic_ldo_disable_workaround)};        \
                                                                                                    \
 	DEVICE_DT_DEFINE(node_id, regulator_npm1300_init, NULL, &data_##id, &config_##id,          \
 			 POST_KERNEL, CONFIG_REGULATOR_NPM1300_INIT_PRIORITY, &api);
diff --git a/dts/bindings/regulator/nordic,npm1300-regulator.yaml b/dts/bindings/regulator/nordic,npm1300-regulator.yaml
index cdb0999b23a..2f514b686fc 100644
--- a/dts/bindings/regulator/nordic,npm1300-regulator.yaml
+++ b/dts/bindings/regulator/nordic,npm1300-regulator.yaml
@@ -96,3 +96,12 @@ child-binding:
         - 50000
       description: |
         Soft start current limit in microamps.
+
+    nordic,ldo-disable-workaround:
+      type: boolean
+      description: |
+        Disable the SW workaround for LDO bug.
+        When nPM1300 is in ULP mode, LDO is supplied from VSYS and
+        then LDO is enabled, it can take long time until the LDO
+        output has reached its target voltage. To avoid this, an i2c
+        read is performed shortly after an LDO is enabled.

From 1f9ba420d4deac00673fb474b7ea659b5d97a1ca Mon Sep 17 00:00:00 2001
From: Sergei Ovchinnikov <sergei.ovchinnikov@nordicsemi.no>
Date: Thu, 13 Feb 2025 11:38:21 +0100
Subject: [PATCH 2583/2913] [nrf fromtree] drivers: regulator: npm1300: add
 reference to anomaly 38

Added reference to nPM1300 anomaly 38 replacing generic "LDO bug"

Signed-off-by: Sergei Ovchinnikov <sergei.ovchinnikov@nordicsemi.no>
(cherry picked from commit b432a01c2384910cdc79c5e1327125cc31a3464e)
---
 drivers/regulator/regulator_npm1300.c                | 2 +-
 dts/bindings/regulator/nordic,npm1300-regulator.yaml | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/regulator/regulator_npm1300.c b/drivers/regulator/regulator_npm1300.c
index c44339ccabf..e049fab8d9d 100644
--- a/drivers/regulator/regulator_npm1300.c
+++ b/drivers/regulator/regulator_npm1300.c
@@ -673,7 +673,7 @@ static DEVICE_API(regulator, api) = {
 		.enable_gpios = GPIO_DT_SPEC_GET_OR(node_id, enable_gpios, {0}),                   \
 		.retention_gpios = GPIO_DT_SPEC_GET_OR(node_id, retention_gpios, {0}),             \
 		.pwm_gpios = GPIO_DT_SPEC_GET_OR(node_id, pwm_gpios, {0}),                         \
-		.ldo_disable_workaround = DT_PROP(node_id, nordic_ldo_disable_workaround)};        \
+		.ldo_disable_workaround = DT_PROP(node_id, nordic_anomaly38_disable_workaround)};  \
                                                                                                    \
 	DEVICE_DT_DEFINE(node_id, regulator_npm1300_init, NULL, &data_##id, &config_##id,          \
 			 POST_KERNEL, CONFIG_REGULATOR_NPM1300_INIT_PRIORITY, &api);
diff --git a/dts/bindings/regulator/nordic,npm1300-regulator.yaml b/dts/bindings/regulator/nordic,npm1300-regulator.yaml
index 2f514b686fc..4db6aa9718d 100644
--- a/dts/bindings/regulator/nordic,npm1300-regulator.yaml
+++ b/dts/bindings/regulator/nordic,npm1300-regulator.yaml
@@ -97,11 +97,12 @@ child-binding:
       description: |
         Soft start current limit in microamps.
 
-    nordic,ldo-disable-workaround:
+    nordic,anomaly38-disable-workaround:
       type: boolean
       description: |
-        Disable the SW workaround for LDO bug.
+        Disable the SW workaround for nPM1300 anomaly #38.
         When nPM1300 is in ULP mode, LDO is supplied from VSYS and
         then LDO is enabled, it can take long time until the LDO
         output has reached its target voltage. To avoid this, an i2c
         read is performed shortly after an LDO is enabled.
+        See nPM1300 Errata manual for more details.

From 3d1d0af12d1d4799da7468291e6e10cf27ef0bc2 Mon Sep 17 00:00:00 2001
From: Mirko Covizzi <mirko.covizzi@nordicsemi.no>
Date: Tue, 4 Mar 2025 09:52:13 +0100
Subject: [PATCH 2584/2913] [nrf noup] include: net: socket_ncs: reduce
 NCS_BASE

nrf-squash! [nrf noup] include: net: add NCS extensions

Reduces the NCS_BASE to a lower number to simplify
those use cases where certain applications would let
the user input the socket option name by number.
The base is still high enough to prevent collisions
with Zephyr's own socket options for many years.

Signed-off-by: Mirko Covizzi <mirko.covizzi@nordicsemi.no>
---
 include/zephyr/net/socket_ncs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/zephyr/net/socket_ncs.h b/include/zephyr/net/socket_ncs.h
index d94d55a087d..92a8447c47f 100644
--- a/include/zephyr/net/socket_ncs.h
+++ b/include/zephyr/net/socket_ncs.h
@@ -27,7 +27,7 @@ extern "C" {
 
 /** Define a base for NCS specific socket options to prevent overlaps with Zephyr's socket options.
  */
-#define NET_SOCKET_NCS_BASE 1000000000
+#define NET_SOCKET_NCS_BASE 1000
 
 /* NCS specific TLS level socket options */
 

From b869365e5489d0c0486a182add568fbf34c88db6 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 2585/2913] [nrf fromtree] modules: hal_nordic: Adding SWEXT
 service

Adding support for SWEXT (SWitch EXTernal) peripheral.

Signed-off-by: Rafal Dyla <rafal.dyla@nordicsemi.no>
(cherry picked from commit 2e44835b2185987bd5815f8cd49e45077b3644ea)
---
 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 32f7877754d..4b88234dcd7 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

From affbd0cbcae6f8c3ccb07f62bb37252aeb669bfc Mon Sep 17 00:00:00 2001
From: Johann Fischer <johann.fischer@nordicsemi.no>
Date: Thu, 20 Feb 2025 13:29:26 +0100
Subject: [PATCH 2586/2913] [nrf fromtree] modules: hal_nordic: update version
 to include USBREG fix

Update version to include USBREG HAL driver fix.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit f00d42f1de3e91490112be2ed3a401cae42ae897)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 4b88234dcd7..2397d9a1c56 100644
--- a/west.yml
+++ b/west.yml
@@ -193,7 +193,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 1e1048562ff98563d492c8dcab1ee85775547abc
+      revision: 37ca068d7b013fb65a2acc9306bffa48a3e72839
       path: modules/hal/nordic
       groups:
         - hal

From 1e249049fddcab2cc0ba065c6b623b0f99be2033 Mon Sep 17 00:00:00 2001
From: Johann Fischer <johann.fischer@nordicsemi.no>
Date: Thu, 20 Feb 2025 13:38:16 +0100
Subject: [PATCH 2587/2913] [nrf fromtree] drivers: usb: do not enabled nRF
 USBREG interrupt

The drivers still use the USBREG HAL driver which enables/disables the
interrupt by itself.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit a05fd621193e2d1917306163ba8bec82ce9f17d8)
---
 drivers/usb/device/usb_dc_nrfx.c | 1 -
 drivers/usb/udc/udc_nrf.c        | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/drivers/usb/device/usb_dc_nrfx.c b/drivers/usb/device/usb_dc_nrfx.c
index c8442cb8f64..d7e56167120 100644
--- a/drivers/usb/device/usb_dc_nrfx.c
+++ b/drivers/usb/device/usb_dc_nrfx.c
@@ -1892,7 +1892,6 @@ static int usb_init(void)
 	IRQ_CONNECT(USBREGULATOR_IRQn,
 		    DT_IRQ(DT_INST(0, nordic_nrf_clock), priority),
 		    nrfx_isr, nrfx_usbreg_irq_handler, 0);
-	irq_enable(USBREGULATOR_IRQn);
 #endif
 
 	static const nrfx_power_config_t power_config = {
diff --git a/drivers/usb/udc/udc_nrf.c b/drivers/usb/udc/udc_nrf.c
index e7229174463..255895f23d8 100644
--- a/drivers/usb/udc/udc_nrf.c
+++ b/drivers/usb/udc/udc_nrf.c
@@ -817,7 +817,6 @@ static int udc_nrf_init(const struct device *dev)
 	IRQ_CONNECT(USBREGULATOR_IRQn,
 		    DT_IRQ(DT_INST(0, nordic_nrf_clock), priority),
 		    nrfx_isr, nrfx_usbreg_irq_handler, 0);
-	irq_enable(USBREGULATOR_IRQn);
 #endif
 
 	IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority),
@@ -838,9 +837,6 @@ static int udc_nrf_shutdown(const struct device *dev)
 
 	nrfx_power_usbevt_disable();
 	nrfx_power_usbevt_uninit();
-#ifdef CONFIG_HAS_HW_NRF_USBREG
-	irq_disable(USBREGULATOR_IRQn);
-#endif
 
 	return 0;
 }

From 8a381aec5c7546759b55401ec45e2d0738d44e7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Wed, 12 Mar 2025 08:18:35 +0100
Subject: [PATCH 2588/2913] [nrf noup] Revert "[nrf fromlist] modules:
 hal_nordic: nrfx: add nRF54L20 FLPR core"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0cc20f2d9719f659ebe67ffd26326638ab78d7fe.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 modules/hal_nordic/nrfx/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index cde936c8d3f..277a0d183d2 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -62,7 +62,6 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54L15 NRF54L15_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54L15_CPUAPP NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA       NRF54L20_ENGA_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP NRF_APPLICATION)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUFLPR NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9120             NRF9120_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9160             NRF9160_XXAA)
 
@@ -244,7 +243,6 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUFLPR     nrf54l10_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP      nrf54l15_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR     nrf54l15_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54l20_enga_application.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUFLPR nrf54l20_enga_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9120              nrf9120.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9160              nrf9160.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9230_ENGB_CPUAPP  nrf9230_engb_application.svd)

From b717237137eed32a7788a9dc3912fc899f08950f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Wed, 12 Mar 2025 08:19:41 +0100
Subject: [PATCH 2589/2913] [nrf noup] Revert "[nrf fromlist] modules:
 hal_nordic: Add nRF54L09 FLPR"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e2c01ec6b00692eac9b1f42cd1fb42ea9f491947.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 modules/hal_nordic/nrfx/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 277a0d183d2..62262d31e87 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -50,7 +50,6 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR    NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA       NRF54L09_ENGA_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUAPP NRF_APPLICATION)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUFLPR NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10            NRF54L10_XXAA
                                                                 DEVELOP_IN_NRF54L15)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10_CPUAPP     NRF_APPLICATION)
@@ -237,7 +236,6 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPURAD      nrf54h20_radiocore.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L05_CPUAPP      nrf54l05_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR     nrf54l05_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUAPP nrf54l09_enga_application.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUFLPR nrf54l09_enga_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUAPP      nrf54l10_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUFLPR     nrf54l10_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP      nrf54l15_application.svd)

From 1bcbe9dd869139bf9cb524417fcbbb68f44f6792 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Mon, 24 Feb 2025 14:03:31 +0100
Subject: [PATCH 2590/2913] [nrf fromlist] manifest: update hal_nordic revision
 to integrate nrfx 3.11.0

New nrfx version integrates MDK 8.70.0.

Upstream PR #: 86703

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 2397d9a1c56..1c13e7c2d08 100644
--- a/west.yml
+++ b/west.yml
@@ -193,7 +193,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 37ca068d7b013fb65a2acc9306bffa48a3e72839
+      revision: 35bf3ca665122ddfe8c0c38cec8f19deef2ff62d
       path: modules/hal/nordic
       groups:
         - hal

From 6f10bfe07b7bb55764f161d2f0e446bd5dd9ba2a Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Mon, 24 Feb 2025 14:05:21 +0100
Subject: [PATCH 2591/2913] [nrf fromlist] Revert "drivers: clock_control: nrf:
 Add workaround for XO start anomaly"

This reverts commit 2cb2cf226c0254d662794b8158dd05688eb8e57b.

Upstream PR #: 86703

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
---
 drivers/clock_control/clock_control_nrf.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/drivers/clock_control/clock_control_nrf.c b/drivers/clock_control/clock_control_nrf.c
index f807bdbb805..03955d3fb7d 100644
--- a/drivers/clock_control/clock_control_nrf.c
+++ b/drivers/clock_control/clock_control_nrf.c
@@ -48,14 +48,6 @@ LOG_MODULE_REGISTER(clock_control, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
 #define INF(dev, subsys, ...) CLOCK_LOG(INF, dev, subsys, __VA_ARGS__)
 #define DBG(dev, subsys, ...) CLOCK_LOG(DBG, dev, subsys, __VA_ARGS__)
 
-#if defined(NRF54L05_XXAA) || defined(NRF54L10_XXAA) || defined(NRF54L15_XXAA)
-#if NRFX_RELEASE_VER_AT_LEAST(3, 11, 0)
-#error "Remove workaround for XOSTART as it is already done in the nrfx clock"
-#endif
-
-#define USE_WORKAROUND_FOR_CLOCK_XOSTART_ANOMALY 1
-#endif
-
 /* Clock subsys structure */
 struct nrf_clock_control_sub_data {
 	clock_control_cb_t cb;
@@ -243,9 +235,6 @@ static void hfclk_start(void)
 		hf_start_tstamp = k_uptime_get();
 	}
 
-#ifdef USE_WORKAROUND_FOR_CLOCK_XOSTART_ANOMALY
-	nrf_clock_task_trigger(NRF_CLOCK, NRF_CLOCK_TASK_PLLSTART);
-#endif
 	nrfx_clock_hfclk_start();
 }
 
@@ -256,9 +245,6 @@ static void hfclk_stop(void)
 	}
 
 	nrfx_clock_hfclk_stop();
-#ifdef USE_WORKAROUND_FOR_CLOCK_XOSTART_ANOMALY
-	nrf_clock_task_trigger(NRF_CLOCK, NRF_CLOCK_TASK_PLLSTOP);
-#endif
 }
 
 #if NRF_CLOCK_HAS_HFCLK192M

From f5d8367eef5296af330b1258a4304d9f4e17d237 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Mon, 24 Feb 2025 14:09:10 +0100
Subject: [PATCH 2592/2913] [nrf fromlist] modules: hal_nordic: nrfx: align
 nRF54L09/L20 symbols to new scheme

MDK 8.70.0 introduced following changes in the device naming:
- renamed nRF54L20 Eng A to nRF54LM20A Eng A
- renamed nRF54L09 Eng A to nRF54LV10A Eng A
Actual SoC renaming will happen in followup PR.

Upstream PR #: 86703

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
---
 modules/hal_nordic/nrfx/CMakeLists.txt |  8 ++++----
 modules/hal_nordic/nrfx/nrfx_config.h  | 20 ++++++++------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 62262d31e87..8210323f767 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -48,7 +48,7 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05            NRF54L05_XXAA
                                                                 DEVELOP_IN_NRF54L15)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR    NRF_FLPR)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA       NRF54L09_ENGA_XXAA)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA       NRF54LV10A_ENGA_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUAPP NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10            NRF54L10_XXAA
                                                                 DEVELOP_IN_NRF54L15)
@@ -59,7 +59,7 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR    NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54L15 NRF54L15_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54L15_CPUAPP NRF_APPLICATION)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA       NRF54L20_ENGA_XXAA)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA       NRF54LM20A_ENGA_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9120             NRF9120_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9160             NRF9160_XXAA)
@@ -235,12 +235,12 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR     nrf54h20_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPURAD      nrf54h20_radiocore.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L05_CPUAPP      nrf54l05_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR     nrf54l05_flpr.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUAPP nrf54l09_enga_application.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUAPP nrf54lv10a_enga_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUAPP      nrf54l10_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUFLPR     nrf54l10_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP      nrf54l15_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR     nrf54l15_flpr.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54l20_enga_application.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54lm20a_enga_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9120              nrf9120.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9160              nrf9160.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9230_ENGB_CPUAPP  nrf9230_engb_application.svd)
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index 6a337cd2588..4a2d5af18b6 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -78,10 +78,6 @@
     #include <templates/nrfx_config_nrf54l05_application.h>
 #elif defined(NRF54L05_XXAA) && defined(NRF_FLPR)
     #include <templates/nrfx_config_nrf54l05_flpr.h>
-#elif defined(NRF54L09_ENGA_XXAA) && defined(NRF_APPLICATION)
-    #include <templates/nrfx_config_nrf54l09_enga_application.h>
-#elif defined(NRF54L09_ENGA_XXAA) && defined(NRF_FLPR)
-    #include <templates/nrfx_config_nrf54l09_enga_flpr.h>
 #elif defined(NRF54L10_XXAA) && defined(NRF_APPLICATION)
     #include <templates/nrfx_config_nrf54l10_application.h>
 #elif defined(NRF54L10_XXAA) && defined(NRF_FLPR)
@@ -90,14 +86,14 @@
     #include <templates/nrfx_config_nrf54l15_application.h>
 #elif defined(NRF54L15_XXAA) && defined(NRF_FLPR)
     #include <templates/nrfx_config_nrf54l15_flpr.h>
-#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_APPLICATION)
-    #include <templates/nrfx_config_nrf54l15_enga_application.h>
-#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_FLPR)
-    #include <templates/nrfx_config_nrf54l15_enga_flpr.h>
-#elif defined(NRF54L20_ENGA_XXAA) && defined(NRF_APPLICATION)
-    #include <templates/nrfx_config_nrf54l20_enga_application.h>
-#elif defined(NRF54L20_ENGA_XXAA) && defined(NRF_FLPR)
-    #include <templates/nrfx_config_nrf54l20_enga_flpr.h>
+#elif defined(NRF54LM20A_ENGA_XXAA) && defined(NRF_APPLICATION)
+    #include <templates/nrfx_config_nrf54lm20a_enga_application.h>
+#elif defined(NRF54LM20A_ENGA_XXAA) && defined(NRF_FLPR)
+    #include <templates/nrfx_config_nrf54lm20a_enga_flpr.h>
+#elif defined(NRF54LV10A_ENGA_XXAA) && defined(NRF_APPLICATION)
+    #include <templates/nrfx_config_nrf54lv10a_enga_application.h>
+#elif defined(NRF54LV10A_ENGA_XXAA) && defined(NRF_FLPR)
+    #include <templates/nrfx_config_nrf54lv10a_enga_flpr.h>
 #elif defined(NRF9120_XXAA) || defined(NRF9160_XXAA)
     #include <templates/nrfx_config_nrf91.h>
 #elif defined(NRF9230_ENGB_XXAA) && defined(NRF_APPLICATION)

From ead6f9073138367efab5656ed14271c8420cf41e Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Tue, 25 Feb 2025 11:59:39 +0100
Subject: [PATCH 2593/2913] [nrf fromlist] drivers: clock_control: nrf: ifdef
 optional events

Some of the CLOCK events are associated with features
not available on every nRF device.

Upstream PR #: 86703

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
---
 drivers/clock_control/clock_control_nrf.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/clock_control/clock_control_nrf.c b/drivers/clock_control/clock_control_nrf.c
index 03955d3fb7d..d829a945be7 100644
--- a/drivers/clock_control/clock_control_nrf.c
+++ b/drivers/clock_control/clock_control_nrf.c
@@ -629,6 +629,7 @@ static void clock_event_handler(nrfx_clock_evt_type_t event)
 		}
 		clkstarted_handle(dev, CLOCK_CONTROL_NRF_TYPE_LFCLK);
 		break;
+#if NRF_CLOCK_HAS_CALIBRATION
 	case NRFX_CLOCK_EVT_CAL_DONE:
 		if (IS_ENABLED(CONFIG_CLOCK_CONTROL_NRF_DRIVER_CALIBRATION)) {
 			z_nrf_clock_calibration_done_handler();
@@ -637,7 +638,10 @@ static void clock_event_handler(nrfx_clock_evt_type_t event)
 			__ASSERT_NO_MSG(false);
 		}
 		break;
+#endif
+#if NRF_CLOCK_HAS_PLL
 	case NRFX_CLOCK_EVT_PLL_STARTED:
+#endif
 #if NRF_CLOCK_HAS_XO_TUNE
 	case NRFX_CLOCK_EVT_XO_TUNED:
 	case NRFX_CLOCK_EVT_XO_TUNE_ERROR:

From 6081aacb63e84703b503bd38f0778d189efb88a4 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Wed, 26 Feb 2025 09:18:52 +0100
Subject: [PATCH 2594/2913] [nrf fromlist] drivers: serial: nrf: set default
 frame size and endianess

Setting frame size and endianess is now supported in UARTE HAL,
so these settings must have default values configured
to avoid compiler warnings about uninitialized fields.

Upstream PR #: 86703

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
---
 drivers/serial/uart_nrfx_uarte.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index b973ce9fd7a..6728ec8fbbf 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -605,6 +605,12 @@ static int uarte_nrfx_configure(const struct device *dev,
 #ifdef UARTE_HAS_FRAME_TIMEOUT
 	uarte_cfg.frame_timeout = NRF_UARTE_FRAME_TIMEOUT_EN;
 #endif
+
+#if NRF_UARTE_HAS_FRAME_SIZE
+	uarte_cfg.frame_size = NRF_UARTE_FRAME_SIZE_8_BIT;
+	uarte_cfg.endian = NRF_UARTE_ENDIAN_MSB;
+#endif
+
 	nrf_uarte_configure(get_uarte_instance(dev), &uarte_cfg);
 
 	data->uart_config = *cfg;

From fe6447b4acb205c45bd55b5b1ac23231811d5748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Wed, 12 Mar 2025 08:24:05 +0100
Subject: [PATCH 2595/2913] [nrf noup] modules: hal_nordic: nrfx: align nRF54L
 FLPR naming to nrfx 3.11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To be reverted or overwritten once full renamig of
nRF54L09 and nRF54L20 comes into NCS.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 modules/hal_nordic/nrfx/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 8210323f767..431ae0ff070 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -50,6 +50,7 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR    NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA       NRF54LV10A_ENGA_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUAPP NRF_APPLICATION)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUFLPR NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10            NRF54L10_XXAA
                                                                 DEVELOP_IN_NRF54L15)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10_CPUAPP     NRF_APPLICATION)
@@ -61,6 +62,7 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54L15 NRF54L15_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54L15_CPUAPP NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA       NRF54LM20A_ENGA_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP NRF_APPLICATION)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUFLPR NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9120             NRF9120_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9160             NRF9160_XXAA)
 
@@ -236,11 +238,13 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPURAD      nrf54h20_radiocore.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L05_CPUAPP      nrf54l05_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR     nrf54l05_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUAPP nrf54lv10a_enga_application.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUFLPR nrf54lv10a_enga_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUAPP      nrf54l10_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUFLPR     nrf54l10_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP      nrf54l15_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR     nrf54l15_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54lm20a_enga_application.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUFLPR nrf54lm20a_enga_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9120              nrf9120.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9160              nrf9160.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9230_ENGB_CPUAPP  nrf9230_engb_application.svd)

From 71f3da0ecc570edd94acbd9fcc1960cf477cffae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Mon, 18 Nov 2024 17:42:52 +0100
Subject: [PATCH 2596/2913] [nrf fromtree] drivers: serial: nrfx_uarte:
 Deprecate non-legacy shim
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some time ago a new shim for nRF UARTE was added (uart_nrfx_uarte2.c)
which used nrfx_uarte.c driver underneath. It was supposed to support
nrf54x platforms. However, later on legacy driver (uart_nrfx_uarte.c)
was extended to support nrf54x platforms and it takes less code size,
has better performance and more features. Shim uart_nrfx_uarte2 will
no longer be supported. As new shim is the default and there is a
Kconfig to pick the legacy shim (CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y)
it cannot be deprecated in the normal way. Additional Kconfig option
is created (DEPRECATED_UART_NRFX_UARTE_LEGACY_SHIM) which is enabled
if CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=n and it selects DEPRECATED.
A warning was also added to the CMakeLists.txt.

Patch removes use CONFIG_UART_NRFX_UARTE_LEGACY_SHIM in tests.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 70118c06a59dff10ce877a9162b810b1862fbf7b)
---
 drivers/serial/CMakeLists.txt                      |  2 ++
 drivers/serial/Kconfig.nrfx                        |  2 ++
 soc/nordic/Kconfig                                 |  5 +++++
 tests/drivers/uart/uart_async_api/testcase.yaml    | 14 --------------
 .../boards/nrf5340dk_nrf5340_cpuapp.conf           |  1 -
 tests/drivers/uart/uart_pm/testcase.yaml           |  9 ++-------
 6 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 tests/drivers/uart/uart_elementary/boards/nrf5340dk_nrf5340_cpuapp.conf

diff --git a/drivers/serial/CMakeLists.txt b/drivers/serial/CMakeLists.txt
index 161a7454ac9..dcae664944d 100644
--- a/drivers/serial/CMakeLists.txt
+++ b/drivers/serial/CMakeLists.txt
@@ -91,6 +91,8 @@ if (CONFIG_UART_NRFX_UARTE)
   if (CONFIG_UART_NRFX_UARTE_LEGACY_SHIM)
     zephyr_library_sources(uart_nrfx_uarte.c)
   else()
+    message(DEPRECATION
+	    "Do not set CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=n as this option is deprecated.")
     zephyr_library_sources(uart_nrfx_uarte2.c)
   endif()
 endif()
diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx
index d6f561967cf..b46991c6cff 100644
--- a/drivers/serial/Kconfig.nrfx
+++ b/drivers/serial/Kconfig.nrfx
@@ -32,6 +32,8 @@ config UART_NRFX_UARTE_LEGACY_SHIM
 	bool "Legacy UARTE shim"
 	depends on UART_NRFX_UARTE
 	default y
+	help
+	  Disabling this option is deprecated.
 
 config UART_NRFX_UARTE_ENHANCED_RX
 	bool "Enhanced RX handling"
diff --git a/soc/nordic/Kconfig b/soc/nordic/Kconfig
index f380eb64bb6..e1e8982e27d 100644
--- a/soc/nordic/Kconfig
+++ b/soc/nordic/Kconfig
@@ -197,4 +197,9 @@ config NRF_PLATFORM_HALTIUM
 	  this option. This allows to easily enable common functionality on
 	  SoCs based on the Haltium platform.
 
+config DEPRECATED_UART_NRFX_UARTE_LEGACY_SHIM
+	bool
+	default y if !UART_NRFX_UARTE_LEGACY_SHIM
+	select DEPRECATED
+
 endif # SOC_FAMILY_NORDIC_NRF
diff --git a/tests/drivers/uart/uart_async_api/testcase.yaml b/tests/drivers/uart/uart_async_api/testcase.yaml
index e0f14c3a492..c6ff52a515f 100644
--- a/tests/drivers/uart/uart_async_api/testcase.yaml
+++ b/tests/drivers/uart/uart_async_api/testcase.yaml
@@ -25,20 +25,6 @@ tests:
     platform_allow: nucleo_h743zi
     integration_platforms:
       - nucleo_h743zi
-  drivers.uart.async_api.nrf_uarte_new:
-    platform_allow:
-      - nrf52840dk/nrf52840
-      - nrf52_bsim
-      - nrf5340bsim/nrf5340/cpuapp
-      - nrf54l20pdk/nrf54l20/cpuapp
-      - nrf54l15bsim/nrf54l15/cpuapp
-    filter: CONFIG_SERIAL_SUPPORT_ASYNC
-    harness: ztest
-    harness_config:
-      fixture: gpio_loopback
-    depends_on: gpio
-    extra_configs:
-      - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=n
   drivers.uart.async_api.nrf_uart:
     filter: CONFIG_SERIAL_SUPPORT_ASYNC
     harness: ztest
diff --git a/tests/drivers/uart/uart_elementary/boards/nrf5340dk_nrf5340_cpuapp.conf b/tests/drivers/uart/uart_elementary/boards/nrf5340dk_nrf5340_cpuapp.conf
deleted file mode 100644
index 064e78b6f74..00000000000
--- a/tests/drivers/uart/uart_elementary/boards/nrf5340dk_nrf5340_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=n
diff --git a/tests/drivers/uart/uart_pm/testcase.yaml b/tests/drivers/uart/uart_pm/testcase.yaml
index ca61df4645a..46bf61d11be 100644
--- a/tests/drivers/uart/uart_pm/testcase.yaml
+++ b/tests/drivers/uart/uart_pm/testcase.yaml
@@ -22,27 +22,26 @@ tests:
       - CONFIG_UART_INTERRUPT_DRIVEN=n
       - CONFIG_UART_ASYNC_API=n
       - CONFIG_UART_0_ENHANCED_POLL_OUT=n
-      - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
 
   drivers.uart.pm.no_rxpin:
     extra_configs:
       - CONFIG_UART_INTERRUPT_DRIVEN=n
       - CONFIG_UART_ASYNC_API=n
       - CONFIG_UART_0_ENHANCED_POLL_OUT=n
-      - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     extra_args: DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840.overlay;nrf_rx_disable.overlay"
     platform_exclude:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54l15bsim/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
+      - nrf52_bsim
+      - nrf5340bsim/nrf5340/cpuapp
 
   drivers.uart.pm.enhanced_poll:
     extra_configs:
       - CONFIG_UART_INTERRUPT_DRIVEN=n
       - CONFIG_UART_ASYNC_API=n
       - CONFIG_UART_0_ENHANCED_POLL_OUT=y
-      - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     platform_exclude:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
@@ -54,7 +53,6 @@ tests:
       - CONFIG_UART_0_INTERRUPT_DRIVEN=y
       - CONFIG_UART_ASYNC_API=n
       - CONFIG_UART_0_ENHANCED_POLL_OUT=n
-      - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
 
   drivers.uart.pm.int_driven.enhanced_poll:
     extra_configs:
@@ -62,7 +60,6 @@ tests:
       - CONFIG_UART_0_INTERRUPT_DRIVEN=y
       - CONFIG_UART_ASYNC_API=n
       - CONFIG_UART_0_ENHANCED_POLL_OUT=y
-      - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     platform_exclude:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
@@ -74,7 +71,6 @@ tests:
       - CONFIG_UART_ASYNC_API=y
       - CONFIG_UART_0_ASYNC=y
       - CONFIG_UART_0_ENHANCED_POLL_OUT=n
-      - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
 
   drivers.uart.pm.async.enhanced_poll:
     extra_configs:
@@ -82,7 +78,6 @@ tests:
       - CONFIG_UART_ASYNC_API=y
       - CONFIG_UART_0_ASYNC=y
       - CONFIG_UART_0_ENHANCED_POLL_OUT=y
-      - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     platform_exclude:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp

From 4b905a37ad1c87c21953a05eb8d681dff2c283fe Mon Sep 17 00:00:00 2001
From: Piotr Pryga <piotr.pryga@nordicsemi.no>
Date: Fri, 7 Mar 2025 07:53:23 +0100
Subject: [PATCH 2597/2913] [nrf fromtree] drivers: hci: ipc: Make IPC endpoint
 bound timeout configurable

The HCI IPC endpoint bound timeout value was hardcoded and set
to 1000 ms. This value may be differ between platforms, for
exampel due to extended boot time.
The default value used was a bit short for multicore SoCs
that usually may wait for some other service reposnes for
similar time. That may lead to timeout error while other
end of an endpoint was slightly late. Change the default
duration to 2000 ms to give more room for possible delays.

Signed-off-by: Piotr Pryga <piotr.pryga@nordicsemi.no>
(cherry picked from commit ceb4298566c8703dc1e6ac07ee10deb56260cccd)
Signed-off-by: Piotr Pryga <piotr.pryga@nordicsemi.no>
---
 drivers/bluetooth/hci/Kconfig | 8 ++++++++
 drivers/bluetooth/hci/ipc.c   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/bluetooth/hci/Kconfig b/drivers/bluetooth/hci/Kconfig
index 2e96cb58372..76fd043d249 100644
--- a/drivers/bluetooth/hci/Kconfig
+++ b/drivers/bluetooth/hci/Kconfig
@@ -58,6 +58,14 @@ config BT_HCI_IPC_SEND_RETRY_DELAY_US
 	  When a single tick (CONFIG_SYS_CLOCK_TICKS_PER_SEC) is bigger then
 	  the retry delay the k_busy_wait function is used. Set with care.
 
+config BT_HCI_IPC_ENDPOINT_BOUND_TIMEOUT_MS
+	int "HCI IPC binding timeout value in milliseconds"
+	depends on BT_HCI_IPC
+	default 2000
+	help
+	  Timeout value that HCI will wait for an IPC endpoint to be bound,
+	  in milliseconds.
+
 config BT_SPI
 	bool
 	select SPI
diff --git a/drivers/bluetooth/hci/ipc.c b/drivers/bluetooth/hci/ipc.c
index 28b2a322f60..1dcfdc915d9 100644
--- a/drivers/bluetooth/hci/ipc.c
+++ b/drivers/bluetooth/hci/ipc.c
@@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(bt_hci_driver);
 
 #define DT_DRV_COMPAT zephyr_bt_hci_ipc
 
-#define IPC_BOUND_TIMEOUT_IN_MS K_MSEC(1000)
+#define IPC_BOUND_TIMEOUT_IN_MS K_MSEC(CONFIG_BT_HCI_IPC_ENDPOINT_BOUND_TIMEOUT_MS)
 
 /* The retry of ipc_service_send function requires a small (tens of us) delay.
  * In order to ensure proper delay k_usleep is used when the system clock is

From 9f33ae8a561a41151e34817e4d626d8a1f437fd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Mon, 24 Feb 2025 11:26:16 +0100
Subject: [PATCH 2598/2913] [nrf fromtree] tests: drivers: watchdog: Add test
 for initialization of .bss and .data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In some configurations, code is copied from non-volatile memory
to RAM before a core (using that code) is booted.
When that core is reset by expired watchdog, variables shall be
restored to "initial" values.

This is problematic because the core is aware of copy in RAM.
It may not know address in non-volatile memory, where "original"
code is stored.

Add tests which verifiest that .bss and .data sections are
correct when core boots from reset caused by expired watchdog.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 81df84ae252deb3860257f0095ad790c8f54a847)
---
 .../watchdog/wdt_variables/CMakeLists.txt     |   9 ++
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |   9 ++
 .../nrf54h20dk_nrf54h20_cpuflpr.overlay       |  15 ++
 .../boards/nrf54h20dk_nrf54h20_cpuppr.overlay |  15 ++
 .../nrf54l09pdk_nrf54l09_cpuapp.overlay       |   9 ++
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |   9 ++
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       |   9 ++
 tests/drivers/watchdog/wdt_variables/prj.conf |   3 +
 .../drivers/watchdog/wdt_variables/src/main.c | 130 ++++++++++++++++++
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  15 ++
 .../sysbuild/vpr_launcher/prj.conf            |   1 +
 .../watchdog/wdt_variables/testcase.yaml      |  29 ++++
 12 files changed, 253 insertions(+)
 create mode 100644 tests/drivers/watchdog/wdt_variables/CMakeLists.txt
 create mode 100644 tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuflpr.overlay
 create mode 100644 tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
 create mode 100644 tests/drivers/watchdog/wdt_variables/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
 create mode 100644 tests/drivers/watchdog/wdt_variables/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/drivers/watchdog/wdt_variables/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
 create mode 100644 tests/drivers/watchdog/wdt_variables/prj.conf
 create mode 100644 tests/drivers/watchdog/wdt_variables/src/main.c
 create mode 100644 tests/drivers/watchdog/wdt_variables/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/drivers/watchdog/wdt_variables/sysbuild/vpr_launcher/prj.conf
 create mode 100644 tests/drivers/watchdog/wdt_variables/testcase.yaml

diff --git a/tests/drivers/watchdog/wdt_variables/CMakeLists.txt b/tests/drivers/watchdog/wdt_variables/CMakeLists.txt
new file mode 100644
index 00000000000..3b4655e9b00
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/CMakeLists.txt
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+project(wdt_variables)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..917b7c228fd
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt010 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuflpr.overlay b/tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuflpr.overlay
new file mode 100644
index 00000000000..721769461b8
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuflpr.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		watchdog0 = &wdt132;
+	};
+};
+
+&wdt132 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
new file mode 100644
index 00000000000..5daf343a59f
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		watchdog0 = &wdt131;
+	};
+};
+
+&wdt131 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_variables/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay b/tests/drivers/watchdog/wdt_variables/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
new file mode 100644
index 00000000000..dc1ea1a9ddc
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_variables/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/watchdog/wdt_variables/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..dc1ea1a9ddc
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_variables/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/watchdog/wdt_variables/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 00000000000..dc1ea1a9ddc
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_variables/prj.conf b/tests/drivers/watchdog/wdt_variables/prj.conf
new file mode 100644
index 00000000000..9caba55af52
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/prj.conf
@@ -0,0 +1,3 @@
+CONFIG_LOG=y
+CONFIG_LOG_MODE_IMMEDIATE=y
+CONFIG_WATCHDOG=y
diff --git a/tests/drivers/watchdog/wdt_variables/src/main.c b/tests/drivers/watchdog/wdt_variables/src/main.c
new file mode 100644
index 00000000000..e81780ea8d9
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/src/main.c
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(wdt_vars, LOG_LEVEL_INF);
+
+#include <zephyr/kernel.h>
+#include <zephyr/cache.h>
+#include <zephyr/drivers/watchdog.h>
+
+#define WDT_WINDOW_MAX	(500)
+
+/* Watchdog related variables */
+static const struct device *const my_wdt_device = DEVICE_DT_GET(DT_ALIAS(watchdog0));
+static struct wdt_timeout_cfg m_cfg_wdt0;
+
+/* No init section will contain WDT_HAS_FIRED if watchdog has fired */
+#define WDT_HAS_FIRED	(12345678U)
+#define TEST_VALUE		(2U)
+
+#define NOINIT_SECTION ".noinit.test_wdt"
+static volatile uint32_t wdt_status __attribute__((section(NOINIT_SECTION)));
+
+/* Global variables to verify */
+static int global_tmp_0;
+static int global_tmp_1 = TEST_VALUE;
+
+
+static void wdt_int_cb(const struct device *wdt_dev, int channel_id)
+{
+	ARG_UNUSED(wdt_dev);
+	ARG_UNUSED(channel_id);
+	wdt_status = WDT_HAS_FIRED;
+
+	/* Flush cache as reboot may invalidate all lines. */
+	sys_cache_data_flush_range((void *) &wdt_status, sizeof(wdt_status));
+}
+
+int main(void)
+{
+	int ret;
+	static int tmp_0;
+	static int tmp_1 = TEST_VALUE;
+
+	LOG_INF("wdt_variables test on %s", CONFIG_BOARD_TARGET);
+
+	global_tmp_0++;
+	global_tmp_1++;
+	tmp_0++;
+	tmp_1++;
+
+	LOG_DBG("global_tmp_0 = %d", global_tmp_0);
+	LOG_DBG("global_tmp_1 = %d", global_tmp_1);
+	LOG_DBG("tmp_0 = %d", tmp_0);
+	LOG_DBG("tmp_1 = %d", tmp_1);
+
+	/* When watchdog fires, variable wdt_status is set to the value of WDT_HAS_FIRED
+	 * in WDT callback wdt_int_cb(). Then, target is reset.
+	 * Check value of wdt_status to prevent reset loop.
+	 */
+	if (wdt_status != WDT_HAS_FIRED) {
+
+		LOG_INF("Reset wasn't due to watchdog.");
+
+		if (!device_is_ready(my_wdt_device)) {
+			LOG_ERR("WDT device %s is not ready", my_wdt_device->name);
+			return 1;
+		}
+
+		/* Configure Watchdog */
+		m_cfg_wdt0.callback = wdt_int_cb;
+		m_cfg_wdt0.flags = WDT_FLAG_RESET_SOC;
+		m_cfg_wdt0.window.min = 0U;
+		m_cfg_wdt0.window.max = WDT_WINDOW_MAX;
+		ret = wdt_install_timeout(my_wdt_device, &m_cfg_wdt0);
+		if (ret < 0) {
+			LOG_ERR("wdt_install_timeout() returned %d", ret);
+			return 1;
+		}
+
+		/* Start Watchdog */
+		ret = wdt_setup(my_wdt_device, WDT_OPT_PAUSE_HALTED_BY_DBG);
+		if (ret < 0) {
+			LOG_ERR("wdt_setup() returned %d", ret);
+			return 1;
+		}
+
+		LOG_INF("Watchdog shall fire in ~%u miliseconds", WDT_WINDOW_MAX);
+		k_sleep(K_FOREVER);
+	} else {
+		bool test_passing = true;
+
+		LOG_INF("Watchod has fired");
+
+		if (global_tmp_0 != 1) {
+			LOG_ERR("global_tmp_0 is %d instead of 1", global_tmp_0);
+			test_passing = false;
+		}
+
+		if (global_tmp_1 != (TEST_VALUE + 1)) {
+			LOG_ERR("global_tmp_1 is %d instead of %d", global_tmp_1, TEST_VALUE + 1);
+			test_passing = false;
+		}
+
+		if (tmp_0 != 1) {
+			LOG_ERR("tmp_0 is %d instead of 1", tmp_0);
+			test_passing = false;
+		}
+
+		if (tmp_1 != (TEST_VALUE + 1)) {
+			LOG_ERR("tmp_1 is %d instead of %d", tmp_1, TEST_VALUE + 1);
+			test_passing = false;
+		}
+
+		/* Cleanup */
+		wdt_status = 0;
+		sys_cache_data_flush_range((void *) &wdt_status, sizeof(wdt_status));
+
+		if (test_passing) {
+			LOG_INF("Test completed successfully");
+		} else {
+			LOG_INF("Test failed");
+		}
+	}
+
+	return 0;
+}
diff --git a/tests/drivers/watchdog/wdt_variables/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/watchdog/wdt_variables/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..2416f23cf71
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt131 {
+	status = "reserved";
+	interrupt-parent = <&cpuppr_clic>;
+};
+
+&wdt132 {
+	status = "reserved";
+	interrupt-parent = <&cpuflpr_clic>;
+};
diff --git a/tests/drivers/watchdog/wdt_variables/sysbuild/vpr_launcher/prj.conf b/tests/drivers/watchdog/wdt_variables/sysbuild/vpr_launcher/prj.conf
new file mode 100644
index 00000000000..b2a4ba59104
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/sysbuild/vpr_launcher/prj.conf
@@ -0,0 +1 @@
+# nothing here
diff --git a/tests/drivers/watchdog/wdt_variables/testcase.yaml b/tests/drivers/watchdog/wdt_variables/testcase.yaml
new file mode 100644
index 00000000000..3f230886acd
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/testcase.yaml
@@ -0,0 +1,29 @@
+common:
+  timeout: 10
+  tags:
+    - drivers
+    - watchdog
+  harness: console
+  harness_config:
+    type: one_line
+    regex:
+      - "Test completed successfully"
+
+tests:
+  drivers.watchdog.wdt_variables.default:
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpuppr
+      - nrf54l09pdk/nrf54l09/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
+    integration_platforms:
+      - nrf54l15dk/nrf54l15/cpuapp
+
+  drivers.watchdog.wdt_variables.54h_flpr:
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuflpr
+    extra_args:
+      - vpr_launcher_SNIPPET=nordic-log-stm
+      - vpr_launcher_CONFIG_BOOT_BANNER=n
+      - SNIPPET=nordic-log-stm

From 67872be7062d5c4bcb472bcb5f0a1e7b7b2b18d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 14 Jan 2025 11:02:10 +0100
Subject: [PATCH 2599/2913] [nrf fromtree] tests: kernel: timer:
 timer_behavior: Reduce tick frequency(nrf54l09pdk)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 Test test_one_tick_timer_train was failing due not being able to
 execute enough 1 tick timeouts. Decrease system ticks frequency
 to make the test pass.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 5e2b9980bc611a9310d67212e0e6ff5f1c56050a)
---
 .../timer/timer_behavior/boards/nrf54l09pdk_nrf54l09_cpuapp.conf | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 tests/kernel/timer/timer_behavior/boards/nrf54l09pdk_nrf54l09_cpuapp.conf

diff --git a/tests/kernel/timer/timer_behavior/boards/nrf54l09pdk_nrf54l09_cpuapp.conf b/tests/kernel/timer/timer_behavior/boards/nrf54l09pdk_nrf54l09_cpuapp.conf
new file mode 100644
index 00000000000..4b13bc80c7f
--- /dev/null
+++ b/tests/kernel/timer/timer_behavior/boards/nrf54l09pdk_nrf54l09_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SYS_CLOCK_TICKS_PER_SEC=10000

From ec9f2e77c0b03a4fec836c207661badec3a9aa4a Mon Sep 17 00:00:00 2001
From: Audun Korneliussen <audun.korneliussen@nordicsemi.no>
Date: Fri, 3 Jan 2025 17:07:01 +0100
Subject: [PATCH 2600/2913] [nrf fromtree] drivers: mfd: npm2100: Fix shiphold
 flag

Fix checking of shiphold active level.

Signed-off-by: Audun Korneliussen <audun.korneliussen@nordicsemi.no>
(cherry picked from commit db4d24df530ce13101aa8f80a11c28504abafa40)
---
 drivers/mfd/mfd_npm2100.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mfd/mfd_npm2100.c b/drivers/mfd/mfd_npm2100.c
index 316687da1e9..ae5faf6b2f3 100644
--- a/drivers/mfd/mfd_npm2100.c
+++ b/drivers/mfd/mfd_npm2100.c
@@ -218,7 +218,7 @@ static int config_shphold(const struct device *dev)
 	}
 
 	reg = config->shiphold_hibernate_wakeup ? WAKEUP_HIBERNATE_PIN : WAKEUP_HIBERNATE_NOPIN;
-	if ((config->shiphold_flags & GPIO_ACTIVE_HIGH) != 0U) {
+	if ((config->shiphold_flags & GPIO_ACTIVE_LOW) == 0U) {
 		reg |= WAKEUP_EDGE_RISING;
 	}
 

From 8c3c19c8dea1964d871a8e065b293c15112ef043 Mon Sep 17 00:00:00 2001
From: Audun Korneliussen <audun.korneliussen@nordicsemi.no>
Date: Fri, 3 Jan 2025 17:20:42 +0100
Subject: [PATCH 2601/2913] [nrf fromtree] drivers: mfd: npm2100: Add
 hibernate_pt mode support

Extend mfd_npm2100_hibernate function with pass_through argument,
which is used to differentiate between hibernate and hibernate_pt
modes.

Signed-off-by: Audun Korneliussen <audun.korneliussen@nordicsemi.no>
(cherry picked from commit 7fd3472231eba6ff5f6118c3977ad104d79ed176)
---
 drivers/mfd/mfd_npm2100.c            | 6 ++++--
 include/zephyr/drivers/mfd/npm2100.h | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/mfd/mfd_npm2100.c b/drivers/mfd/mfd_npm2100.c
index ae5faf6b2f3..6f66a368d5b 100644
--- a/drivers/mfd/mfd_npm2100.c
+++ b/drivers/mfd/mfd_npm2100.c
@@ -26,6 +26,7 @@
 #define SHPHLD_WAKEUP         0xC1U
 #define SHPHLD_SHPHLD         0xC2U
 #define HIBERNATE_TASKS_HIBER 0xC8U
+#define HIBERNATE_TASKS_HIBERPT 0xC9U
 #define RESET_TASKS_RESET     0xD0U
 #define RESET_BUTTON          0xD2U
 #define RESET_PIN             0xD3U
@@ -337,7 +338,7 @@ int mfd_npm2100_reset(const struct device *dev)
 	return i2c_reg_write_byte_dt(&config->i2c, RESET_TASKS_RESET, 1U);
 }
 
-int mfd_npm2100_hibernate(const struct device *dev, uint32_t time_ms)
+int mfd_npm2100_hibernate(const struct device *dev, uint32_t time_ms, bool pass_through)
 {
 	const struct mfd_npm2100_config *config = dev->config;
 	int ret;
@@ -365,7 +366,8 @@ int mfd_npm2100_hibernate(const struct device *dev, uint32_t time_ms)
 		return ret;
 	}
 
-	return i2c_reg_write_byte_dt(&config->i2c, HIBERNATE_TASKS_HIBER, 1U);
+	return i2c_reg_write_byte_dt(
+		&config->i2c, pass_through ? HIBERNATE_TASKS_HIBERPT : HIBERNATE_TASKS_HIBER, 1U);
 }
 
 int mfd_npm2100_add_callback(const struct device *dev, struct gpio_callback *callback)
diff --git a/include/zephyr/drivers/mfd/npm2100.h b/include/zephyr/drivers/mfd/npm2100.h
index 8a45925af99..0344d2eed4b 100644
--- a/include/zephyr/drivers/mfd/npm2100.h
+++ b/include/zephyr/drivers/mfd/npm2100.h
@@ -92,15 +92,18 @@ int mfd_npm2100_reset(const struct device *dev);
  * @brief npm2100 hibernate
  *
  * Enters low power state, and wakes after specified time or "shphld" pin signal.
+ * Pass-through mode can be used when the battery voltage is high enough to supply the pmic directly
+ * without boosting. This lowers the power consumption of the pmic when hibernate mode is active.
  *
  * @param dev npm2100 mfd device
  * @param time_ms timer value in ms. Set to 0 to disable timer.
+ * @param pass_through set to use pass-through hibernate mode.
  * @retval 0 If successful
  * @retval -EINVAL if time value is too large
  * @retval -EBUSY if the timer is already in use.
  * @retval -errno In case of any bus error (see i2c_write_dt())
  */
-int mfd_npm2100_hibernate(const struct device *dev, uint32_t time_ms);
+int mfd_npm2100_hibernate(const struct device *dev, uint32_t time_ms, bool pass_through);
 
 /**
  * @brief Add npm2100 event callback

From c8e0a243ae3da0d41b8bcb63fc99909f93caf241 Mon Sep 17 00:00:00 2001
From: Sergei Ovchinnikov <sergei.ovchinnikov@nordicsemi.no>
Date: Tue, 7 Jan 2025 13:49:20 +0100
Subject: [PATCH 2602/2913] [nrf fromtree] drivers: mfd: npm2100: align
 formatting

Align formatting of defines at the top of the mfd_npm2100.c file

Signed-off-by: Sergei Ovchinnikov <sergei.ovchinnikov@nordicsemi.no>
(cherry picked from commit 5aeae417d872cd2a361338795b87449572a43f01)
---
 drivers/mfd/mfd_npm2100.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/mfd/mfd_npm2100.c b/drivers/mfd/mfd_npm2100.c
index 6f66a368d5b..dd6f32c4aa8 100644
--- a/drivers/mfd/mfd_npm2100.c
+++ b/drivers/mfd/mfd_npm2100.c
@@ -14,24 +14,24 @@
 #include <zephyr/drivers/gpio/gpio_utils.h>
 #include <zephyr/drivers/mfd/npm2100.h>
 
-#define EVENTS_SET            0x00U
-#define EVENTS_CLR            0x05U
-#define INTEN_SET             0x0AU
-#define GPIO_CONFIG           0x80U
-#define GPIO_USAGE            0x83U
-#define TIMER_TASKS_START     0xB0U
-#define TIMER_CONFIG          0xB3U
-#define TIMER_TARGET          0xB4U
-#define TIMER_STATUS          0xB7U
-#define SHPHLD_WAKEUP         0xC1U
-#define SHPHLD_SHPHLD         0xC2U
-#define HIBERNATE_TASKS_HIBER 0xC8U
+#define EVENTS_SET              0x00U
+#define EVENTS_CLR              0x05U
+#define INTEN_SET               0x0AU
+#define GPIO_CONFIG             0x80U
+#define GPIO_USAGE              0x83U
+#define TIMER_TASKS_START       0xB0U
+#define TIMER_CONFIG            0xB3U
+#define TIMER_TARGET            0xB4U
+#define TIMER_STATUS            0xB7U
+#define SHPHLD_WAKEUP           0xC1U
+#define SHPHLD_SHPHLD           0xC2U
+#define HIBERNATE_TASKS_HIBER   0xC8U
 #define HIBERNATE_TASKS_HIBERPT 0xC9U
-#define RESET_TASKS_RESET     0xD0U
-#define RESET_BUTTON          0xD2U
-#define RESET_PIN             0xD3U
-#define RESET_WRITESTICKY     0xDBU
-#define RESET_STROBESTICKY    0xDCU
+#define RESET_TASKS_RESET       0xD0U
+#define RESET_BUTTON            0xD2U
+#define RESET_PIN               0xD3U
+#define RESET_WRITESTICKY       0xDBU
+#define RESET_STROBESTICKY      0xDCU
 
 #define SHPHLD_RESISTOR_MASK     0x03U
 #define SHPHLD_RESISTOR_PULLUP   0x00U

From a676c713c56ca9bd7f319d773179198d7d1df450 Mon Sep 17 00:00:00 2001
From: Sergei Ovchinnikov <sergei.ovchinnikov@nordicsemi.no>
Date: Tue, 7 Jan 2025 11:53:56 +0100
Subject: [PATCH 2603/2913] [nrf fromtree] drivers: npm2100: remove SHPHLD
 button reconfiguration

Do not reconfigure the SHPHLD button behavior by writing to the sticky
register in drivers: mfd, regulator: npm2100. This is removed to avoid
unexpected behaviors during or after the ship or hibernation modes.

Signed-off-by: Sergei Ovchinnikov <sergei.ovchinnikov@nordicsemi.no>
(cherry picked from commit 1d8ef88b95d149aabe4f2dd008d13e4d1e675dcb)
---
 drivers/mfd/mfd_npm2100.c             | 11 -----------
 drivers/regulator/regulator_npm2100.c | 12 ------------
 2 files changed, 23 deletions(-)

diff --git a/drivers/mfd/mfd_npm2100.c b/drivers/mfd/mfd_npm2100.c
index dd6f32c4aa8..78049dff56e 100644
--- a/drivers/mfd/mfd_npm2100.c
+++ b/drivers/mfd/mfd_npm2100.c
@@ -355,17 +355,6 @@ int mfd_npm2100_hibernate(const struct device *dev, uint32_t time_ms, bool pass_
 		}
 	}
 
-	/* Ensure shiphold button is enabled so that wakeup will work */
-	ret = i2c_reg_write_byte_dt(&config->i2c, RESET_WRITESTICKY, 0);
-	if (ret < 0) {
-		return ret;
-	}
-
-	ret = i2c_reg_write_byte_dt(&config->i2c, RESET_STROBESTICKY, 1U);
-	if (ret < 0) {
-		return ret;
-	}
-
 	return i2c_reg_write_byte_dt(
 		&config->i2c, pass_through ? HIBERNATE_TASKS_HIBERPT : HIBERNATE_TASKS_HIBER, 1U);
 }
diff --git a/drivers/regulator/regulator_npm2100.c b/drivers/regulator/regulator_npm2100.c
index afad574c767..0797d115368 100644
--- a/drivers/regulator/regulator_npm2100.c
+++ b/drivers/regulator/regulator_npm2100.c
@@ -642,18 +642,6 @@ static int regulator_npm2100_ship_mode(const struct device *dev)
 {
 	const struct regulator_npm2100_pconfig *pconfig = dev->config;
 
-	/* Ensure shiphold button is enabled so that wakeup will work */
-	int ret = i2c_reg_write_byte_dt(&pconfig->i2c, RESET_WRITESTICKY, 0);
-
-	if (ret < 0) {
-		return ret;
-	}
-
-	ret = i2c_reg_write_byte_dt(&pconfig->i2c, RESET_STROBESTICKY, 1U);
-	if (ret < 0) {
-		return ret;
-	}
-
 	return i2c_reg_write_byte_dt(&pconfig->i2c, SHIP_TASK_SHIP, 1U);
 }
 

From faf28c05d32808c6114bcb0a7005d6b2e9a01f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Thu, 13 Mar 2025 10:25:37 +0100
Subject: [PATCH 2604/2913] [nrf fromtree] drivers: audio: dmic_nrfx:
 improvements to driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added queue for memory slab addresses to ensure that they
are released in correct order. Improved formula for frequency
scaling for nRF54H20. Fixed alternative channel mapping.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 8260e1ff5cc4f25ef9f54a8717917016015df707)
---
 drivers/audio/dmic_nrfx_pdm.c | 66 +++++++++++++++++++++++++----------
 1 file changed, 47 insertions(+), 19 deletions(-)

diff --git a/drivers/audio/dmic_nrfx_pdm.c b/drivers/audio/dmic_nrfx_pdm.c
index b7ea336b9f9..ea78330deb5 100644
--- a/drivers/audio/dmic_nrfx_pdm.c
+++ b/drivers/audio/dmic_nrfx_pdm.c
@@ -16,9 +16,11 @@
 LOG_MODULE_REGISTER(dmic_nrfx_pdm, CONFIG_AUDIO_DMIC_LOG_LEVEL);
 
 #if CONFIG_SOC_SERIES_NRF54HX
-#define DMIC_NRFX_CLOCK_FREQ 8*1000*1000UL
+#define DMIC_NRFX_CLOCK_FREQ MHZ(16)
+#define DMIC_NRFX_CLOCK_FACTOR 8192
 #else
-#define DMIC_NRFX_CLOCK_FREQ 32*1000*1000UL
+#define DMIC_NRFX_CLOCK_FREQ MHZ(32)
+#define DMIC_NRFX_CLOCK_FACTOR 4096
 #endif
 
 struct dmic_nrfx_pdm_drv_data {
@@ -26,8 +28,8 @@ struct dmic_nrfx_pdm_drv_data {
 	struct onoff_manager *clk_mgr;
 	struct onoff_client clk_cli;
 	struct k_mem_slab *mem_slab;
-	void *mem_slab_buffer;
 	uint32_t block_size;
+	struct k_msgq mem_slab_queue;
 	struct k_msgq rx_queue;
 	bool request_clock : 1;
 	bool configured    : 1;
@@ -47,10 +49,10 @@ struct dmic_nrfx_pdm_drv_cfg {
 	void *mem_reg;
 };
 
-static void free_buffer(struct dmic_nrfx_pdm_drv_data *drv_data)
+static void free_buffer(struct dmic_nrfx_pdm_drv_data *drv_data, void *buffer)
 {
-	k_mem_slab_free(drv_data->mem_slab, drv_data->mem_slab_buffer);
-	LOG_DBG("Freed buffer %p", drv_data->mem_slab_buffer);
+	k_mem_slab_free(drv_data->mem_slab, buffer);
+	LOG_DBG("Freed buffer %p", buffer);
 }
 
 static void stop_pdm(struct dmic_nrfx_pdm_drv_data *drv_data)
@@ -65,20 +67,29 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 	const struct dmic_nrfx_pdm_drv_cfg *drv_cfg = dev->config;
 	int ret;
 	bool stop = false;
+	void *mem_slab_buffer;
 
 	if (evt->buffer_requested) {
 		void *buffer;
 		nrfx_err_t err;
 
-		ret = k_mem_slab_alloc(drv_data->mem_slab, &drv_data->mem_slab_buffer, K_NO_WAIT);
+		ret = k_mem_slab_alloc(drv_data->mem_slab, &mem_slab_buffer, K_NO_WAIT);
 		if (ret < 0) {
 			LOG_ERR("Failed to allocate buffer: %d", ret);
 			stop = true;
 		} else {
-			ret = dmm_buffer_in_prepare(drv_cfg->mem_reg, drv_data->mem_slab_buffer,
+			ret = dmm_buffer_in_prepare(drv_cfg->mem_reg, mem_slab_buffer,
 						    drv_data->block_size, &buffer);
 			if (ret < 0) {
 				LOG_ERR("Failed to prepare buffer: %d", ret);
+				free_buffer(drv_data, mem_slab_buffer);
+				stop_pdm(drv_data);
+				return;
+			}
+			ret = k_msgq_put(&drv_data->mem_slab_queue, &mem_slab_buffer, K_NO_WAIT);
+			if (ret < 0) {
+				LOG_ERR("Unable to put mem slab in queue");
+				free_buffer(drv_data, mem_slab_buffer);
 				stop_pdm(drv_data);
 				return;
 			}
@@ -92,14 +103,18 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 
 	if (drv_data->stopping) {
 		if (evt->buffer_released) {
-			ret = dmm_buffer_in_release(drv_cfg->mem_reg, drv_data->mem_slab_buffer,
+			ret = k_msgq_get(&drv_data->mem_slab_queue, &mem_slab_buffer, K_NO_WAIT);
+			if (ret < 0) {
+				LOG_ERR("No buffers to free");
+				return;
+			}
+			ret = dmm_buffer_in_release(drv_cfg->mem_reg, mem_slab_buffer,
 						    drv_data->block_size, evt->buffer_released);
 			if (ret < 0) {
 				LOG_ERR("Failed to release buffer: %d", ret);
-				stop_pdm(drv_data);
 				return;
 			}
-			free_buffer(drv_data);
+			free_buffer(drv_data, mem_slab_buffer);
 		}
 
 		if (drv_data->active) {
@@ -109,7 +124,13 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 			}
 		}
 	} else if (evt->buffer_released) {
-		ret = dmm_buffer_in_release(drv_cfg->mem_reg, drv_data->mem_slab_buffer,
+		ret = k_msgq_get(&drv_data->mem_slab_queue, &mem_slab_buffer, K_NO_WAIT);
+		if (ret < 0) {
+			LOG_ERR("No buffers to free");
+			stop_pdm(drv_data);
+			return;
+		}
+		ret = dmm_buffer_in_release(drv_cfg->mem_reg, mem_slab_buffer,
 					    drv_data->block_size, evt->buffer_released);
 		if (ret < 0) {
 			LOG_ERR("Failed to release buffer: %d", ret);
@@ -117,12 +138,12 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 			return;
 		}
 		ret = k_msgq_put(&drv_data->rx_queue,
-				 &drv_data->mem_slab_buffer,
+				 &mem_slab_buffer,
 				 K_NO_WAIT);
 		if (ret < 0) {
 			LOG_ERR("No room in RX queue");
 			stop = true;
-			free_buffer(drv_data);
+			free_buffer(drv_data, mem_slab_buffer);
 		} else {
 			LOG_DBG("Queued buffer %p", evt->buffer_released);
 		}
@@ -234,7 +255,7 @@ static bool check_pdm_frequencies(const struct dmic_nrfx_pdm_drv_cfg *drv_cfg,
 
 		if (is_in_freq_range(act_freq, pdm_cfg) &&
 		    is_better(act_freq, ratio, req_rate, best_diff, best_rate, best_freq)) {
-			config->clock_freq = clk_factor * 4096;
+			config->clock_freq = clk_factor * DMIC_NRFX_CLOCK_FACTOR;
 
 			better_found = true;
 		}
@@ -403,7 +424,6 @@ static int dmic_nrfx_pdm_configure(const struct device *dev,
 
 	channel->act_num_streams = 1;
 	channel->act_chan_map_hi = 0;
-	channel->act_chan_map_lo = def_map;
 
 	if (channel->req_num_streams != 1 ||
 	    channel->req_num_chan > 2 ||
@@ -434,9 +454,13 @@ static int dmic_nrfx_pdm_configure(const struct device *dev,
 	nrfx_cfg.mode = channel->req_num_chan == 1
 		      ? NRF_PDM_MODE_MONO
 		      : NRF_PDM_MODE_STEREO;
-	nrfx_cfg.edge = channel->req_chan_map_lo == def_map
-		      ? NRF_PDM_EDGE_LEFTFALLING
-		      : NRF_PDM_EDGE_LEFTRISING;
+	if (channel->req_chan_map_lo == def_map) {
+		nrfx_cfg.edge = NRF_PDM_EDGE_LEFTFALLING;
+		channel->act_chan_map_lo = def_map;
+	} else {
+		nrfx_cfg.edge = NRF_PDM_EDGE_LEFTRISING;
+		channel->act_chan_map_lo = alt_map;
+	}
 #if NRF_PDM_HAS_MCLKCONFIG
 	nrfx_cfg.mclksrc = drv_cfg->clk_src == ACLK
 			 ? NRF_PDM_MCLKSRC_ACLK
@@ -633,6 +657,7 @@ static const struct _dmic_ops dmic_ops = {
 
 #define PDM_NRFX_DEVICE(idx)						     \
 	static void *rx_msgs##idx[DT_PROP(PDM(idx), queue_size)];	     \
+	static void *mem_slab_msgs##idx[DT_PROP(PDM(idx), queue_size)];	     \
 	static struct dmic_nrfx_pdm_drv_data dmic_nrfx_pdm_data##idx;	     \
 	static const nrfx_pdm_t dmic_nrfx_pdm##idx = NRFX_PDM_INSTANCE(idx); \
 	static int pdm_nrfx_init##idx(const struct device *dev)		     \
@@ -649,6 +674,9 @@ static const struct _dmic_ops dmic_ops = {
 		k_msgq_init(&dmic_nrfx_pdm_data##idx.rx_queue,		     \
 			    (char *)rx_msgs##idx, sizeof(void *),	     \
 			    ARRAY_SIZE(rx_msgs##idx));			     \
+		k_msgq_init(&dmic_nrfx_pdm_data##idx.mem_slab_queue,	     \
+			    (char *)mem_slab_msgs##idx, sizeof(void *),	     \
+			    ARRAY_SIZE(mem_slab_msgs##idx));		     \
 		IF_ENABLED(CONFIG_CLOCK_CONTROL_NRF,			     \
 			   (init_clock_manager(dev);))			     \
 		return 0;						     \

From 3cccc7cdc918a621b4582a1e259551091d52d274 Mon Sep 17 00:00:00 2001
From: Olivier Lesage <olivier.lesage@nordicsemi.no>
Date: Fri, 21 Feb 2025 11:04:27 +0100
Subject: [PATCH 2605/2913] [nrf fromtree] bluetooth: Host: Rename CS tone
 antenna configurations

Improves readability by removing the need to check the table
to figure out how many antennas devices A and B are using.

Signed-off-by: Olivier Lesage <olivier.lesage@nordicsemi.no>
(cherry picked from commit 6f33793b41012c0aaa0e860b1b2e2feb168dc7ea)
---
 doc/releases/migration-guide-4.2.rst             |  7 +++++++
 include/zephyr/bluetooth/conn.h                  | 16 ++++++++--------
 .../channel_sounding/include/cs_test_params.h    |  2 +-
 .../src/connected_cs_initiator.c                 |  2 +-
 subsys/bluetooth/host/shell/cs.c                 |  4 ++--
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/doc/releases/migration-guide-4.2.rst b/doc/releases/migration-guide-4.2.rst
index 00e7da9d163..6fca3d64f5c 100644
--- a/doc/releases/migration-guide-4.2.rst
+++ b/doc/releases/migration-guide-4.2.rst
@@ -44,6 +44,13 @@ Device Drivers and Devicetree
 Bluetooth
 *********
 
+Bluetooth Host
+==============
+
+* The symbols ``BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_<NUMBER>`` in
+  :zephyr_file:`include/zephyr/bluetooth/conn.h` have been renamed
+  to ``BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A<NUMBER>_B<NUMBER>``.
+
 Networking
 **********
 
diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index 73a14b09ab9..da72b2b506d 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -1558,14 +1558,14 @@ enum bt_conn_le_cs_procedure_enable_state {
  *  - 2:2 configuration, where both A and B support 2 antennas and N_AP = 4
  */
 enum bt_conn_le_cs_tone_antenna_config_selection {
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE = BT_HCI_OP_LE_CS_ACI_0,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_TWO = BT_HCI_OP_LE_CS_ACI_1,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_THREE = BT_HCI_OP_LE_CS_ACI_2,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_FOUR = BT_HCI_OP_LE_CS_ACI_3,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_FIVE = BT_HCI_OP_LE_CS_ACI_4,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_SIX = BT_HCI_OP_LE_CS_ACI_5,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_SEVEN = BT_HCI_OP_LE_CS_ACI_6,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_EIGHT = BT_HCI_OP_LE_CS_ACI_7,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1 = BT_HCI_OP_LE_CS_ACI_0,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A2_B1 = BT_HCI_OP_LE_CS_ACI_1,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A3_B1 = BT_HCI_OP_LE_CS_ACI_2,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A4_B1 = BT_HCI_OP_LE_CS_ACI_3,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B2 = BT_HCI_OP_LE_CS_ACI_4,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B3 = BT_HCI_OP_LE_CS_ACI_5,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B4 = BT_HCI_OP_LE_CS_ACI_6,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A2_B2 = BT_HCI_OP_LE_CS_ACI_7,
 };
 
 struct bt_conn_le_cs_procedure_enable_complete {
diff --git a/samples/bluetooth/channel_sounding/include/cs_test_params.h b/samples/bluetooth/channel_sounding/include/cs_test_params.h
index 1171ea1ee1e..84931c4533f 100644
--- a/samples/bluetooth/channel_sounding/include/cs_test_params.h
+++ b/samples/bluetooth/channel_sounding/include/cs_test_params.h
@@ -31,7 +31,7 @@ static struct bt_le_cs_test_param test_params_get(enum bt_conn_le_cs_role role)
 	params.t_fcs_time = 150;
 	params.t_pm_time = 40;
 	params.t_sw_time = 0;
-	params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
+	params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1;
 
 	params.initiator_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
 	params.reflector_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
diff --git a/samples/bluetooth/channel_sounding/src/connected_cs_initiator.c b/samples/bluetooth/channel_sounding/src/connected_cs_initiator.c
index 13f23d3c8e0..1a012665c75 100644
--- a/samples/bluetooth/channel_sounding/src/connected_cs_initiator.c
+++ b/samples/bluetooth/channel_sounding/src/connected_cs_initiator.c
@@ -329,7 +329,7 @@ int main(void)
 		.max_procedure_count = 0,
 		.min_subevent_len = 6750,
 		.max_subevent_len = 6750,
-		.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE,
+		.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1,
 		.phy = BT_LE_CS_PROCEDURE_PHY_1M,
 		.tx_power_delta = 0x80,
 		.preferred_peer_antenna = BT_LE_CS_PROCEDURE_PREFERRED_PEER_ANTENNA_1,
diff --git a/subsys/bluetooth/host/shell/cs.c b/subsys/bluetooth/host/shell/cs.c
index 2597063cbed..87ce5b082fe 100644
--- a/subsys/bluetooth/host/shell/cs.c
+++ b/subsys/bluetooth/host/shell/cs.c
@@ -220,7 +220,7 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	params.t_fcs_time = 120;
 	params.t_pm_time = 20;
 	params.t_sw_time = 0;
-	params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
+	params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1;
 	params.initiator_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
 	params.reflector_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
 	params.drbg_nonce = 0x1234;
@@ -638,7 +638,7 @@ static int cmd_set_procedure_parameters(const struct shell *sh, size_t argc, cha
 	params.max_procedure_count = 1;
 	params.min_subevent_len = 5000;
 	params.max_subevent_len = 4000000;
-	params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
+	params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1;
 	params.phy = 0x01;
 	params.tx_power_delta = 0x80;
 	params.preferred_peer_antenna = 1;

From dab498614cd47d28158119bb1e67d1b70d8f0a9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Mon, 3 Mar 2025 14:10:59 +0100
Subject: [PATCH 2606/2913] [nrf fromtree] tests: boards: nrf: hwinfo: Extend
 test with RESET_CPU_LOCKUP
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extend test code with scenario that checks if:
- RESET_CPU_LOCKUP is detected;
- RESET_CPU_LOCKUP can be cleared.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit ee9d6b7af3be28d9f5606038313391d01475b544)
---
 tests/boards/nrf/hwinfo/reset_cause/prj.conf  |  1 +
 .../boards/nrf/hwinfo/reset_cause/src/main.c  | 58 ++++++++++++++++++-
 .../nrf/hwinfo/reset_cause/testcase.yaml      |  7 ++-
 3 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/tests/boards/nrf/hwinfo/reset_cause/prj.conf b/tests/boards/nrf/hwinfo/reset_cause/prj.conf
index edd86844963..7acdbdd1740 100644
--- a/tests/boards/nrf/hwinfo/reset_cause/prj.conf
+++ b/tests/boards/nrf/hwinfo/reset_cause/prj.conf
@@ -5,3 +5,4 @@ CONFIG_REBOOT=y
 
 CONFIG_LOG=y
 CONFIG_LOG_MODE_MINIMAL=y
+CONFIG_ASSERT=y
diff --git a/tests/boards/nrf/hwinfo/reset_cause/src/main.c b/tests/boards/nrf/hwinfo/reset_cause/src/main.c
index 1e07f679114..150a77da7d9 100644
--- a/tests/boards/nrf/hwinfo/reset_cause/src/main.c
+++ b/tests/boards/nrf/hwinfo/reset_cause/src/main.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 
 #include <zephyr/logging/log.h>
+#include <zephyr/logging/log_ctrl.h>
 LOG_MODULE_REGISTER(resetreason, LOG_LEVEL_INF);
 
 static const struct device *const my_wdt_device = DEVICE_DT_GET(DT_ALIAS(watchdog0));
@@ -22,13 +23,15 @@ volatile uint32_t machine_state __attribute__((section(NOINIT_SECTION)));
 volatile uint32_t supported __attribute__((section(NOINIT_SECTION)));
 volatile uint32_t wdt_status __attribute__((section(NOINIT_SECTION)));
 volatile uint32_t reboot_status __attribute__((section(NOINIT_SECTION)));
+volatile uint32_t cpu_lockup_status __attribute__((section(NOINIT_SECTION)));
 
 /* Value used to indicate that the watchdog has fired. */
 #define WDT_HAS_FIRED (0x12345678U)
 #define REBOOT_WAS_DONE (0x87654321U)
+#define CPU_LOCKUP_WAS_DONE (0x19283746U)
 
 /* Highest value in the switch statement in the main() */
-#define LAST_STATE (2)
+#define LAST_STATE (3)
 
 static void wdt_int_cb(const struct device *wdt_dev, int channel_id)
 {
@@ -236,7 +239,7 @@ void test_reset_software(uint32_t cause)
 		if (reboot_status != REBOOT_WAS_DONE) {
 			/* If software reset hasn't happen yet, do it. */
 			reboot_status = REBOOT_WAS_DONE;
-			LOG_INF("Test RESET_SOFTWARE - Rebooting");
+			LOG_INF("Test RESET_SOFTWARE");
 
 			/* Flush cache as reboot may invalidate all lines. */
 			sys_cache_data_flush_range((void *) &machine_state, sizeof(machine_state));
@@ -316,6 +319,49 @@ void test_reset_watchdog(uint32_t cause)
 	}
 }
 
+void k_sys_fatal_error_handler(unsigned int reason, const struct arch_esf *pEsf)
+{
+	LOG_INF("%s(%d)", __func__, reason);
+	LOG_PANIC();
+
+	/* Assert inside Assert handler - shall result in reset due to cpu lockup. */
+	__ASSERT(0, "Intentionally failed assert inside kernel panic");
+}
+
+void test_reset_cpu_lockup(uint32_t cause)
+{
+	/* Check that reset cause from cpu lockup is detected. */
+	if (supported & RESET_CPU_LOCKUP) {
+		if (cpu_lockup_status != CPU_LOCKUP_WAS_DONE) {
+			/* If reset due to cpu lockup hasn't happen yet, do it. */
+			cpu_lockup_status = CPU_LOCKUP_WAS_DONE;
+			LOG_INF("Test RESET_CPU_LOCKUP");
+
+			/* Flush cache as reboot may invalidate all lines. */
+			sys_cache_data_flush_range((void *) &machine_state, sizeof(machine_state));
+			sys_cache_data_flush_range((void *) &cpu_lockup_status,
+				sizeof(cpu_lockup_status));
+			__ASSERT(0, "Intentionally failed assertion");
+		} else {
+			/* Reset due to CPU Lockup was done */
+			LOG_INF("TEST that RESET_CPU_LOCKUP was detected");
+			if (cause & RESET_CPU_LOCKUP) {
+				LOG_INF("PASS: RESET_CPU_LOCKUP detected");
+				print_bar();
+				/* Check RESET_SOFTWARE can be cleared */
+				test_clear_reset_cause();
+			} else {
+				LOG_ERR("FAIL: RESET_CPU_LOCKUP not set");
+				print_bar();
+			}
+			/* Cleanup */
+			cpu_lockup_status = 0;
+			sys_cache_data_flush_range((void *) &cpu_lockup_status,
+				sizeof(cpu_lockup_status));
+		}
+	}
+}
+
 int main(void)
 {
 	uint32_t cause;
@@ -327,6 +373,9 @@ int main(void)
 	if (reboot_status == REBOOT_WAS_DONE) {
 		LOG_INF("This boot is due to expected software reset");
 	}
+	if (cpu_lockup_status == CPU_LOCKUP_WAS_DONE) {
+		LOG_INF("This boot is due to expected cpu lockup reset");
+	}
 	print_bar();
 
 	/* Test relies on REST_PIN to correctly start. */
@@ -340,12 +389,14 @@ int main(void)
 		machine_state = 0;
 		reboot_status = 0;
 		wdt_status = 0;
+		cpu_lockup_status = 0;
 	}
 
 	while (machine_state <= LAST_STATE) {
 		LOG_DBG("machine_state = %u", machine_state);
 		LOG_DBG("reboot_status = %u", reboot_status);
 		LOG_DBG("wdt_status = %u", wdt_status);
+		LOG_DBG("cpu_lockup_status = %u", cpu_lockup_status);
 
 		switch (machine_state) {
 		case 0: /* Print (an store) which reset causes are supported. */
@@ -358,6 +409,9 @@ int main(void)
 		case 2: /* Test RESET_WATCHDOG. */
 			test_reset_watchdog(cause);
 			machine_state++;
+		case 3: /* Test CPU_LOCKUP. */
+			test_reset_cpu_lockup(cause);
+			machine_state++;
 		}
 	}
 
diff --git a/tests/boards/nrf/hwinfo/reset_cause/testcase.yaml b/tests/boards/nrf/hwinfo/reset_cause/testcase.yaml
index 0ec999ee713..8837f999bdb 100644
--- a/tests/boards/nrf/hwinfo/reset_cause/testcase.yaml
+++ b/tests/boards/nrf/hwinfo/reset_cause/testcase.yaml
@@ -20,14 +20,19 @@ tests:
         - "RESET_DEBUG is supported"
         - "RESET_LOW_POWER_WAKE is supported"
         - "RESET_CPU_LOCKUP is supported"
-        - "Rebooting"
         - "HW Info reset reason test on"
+        - "This boot is due to expected software reset"
         - "PASS: RESET_SOFTWARE detected"
         - "PASS: reset causes were cleared"
         - "Watchdog shall fire"
         - "HW Info reset reason test on"
+        - "This boot is due to expected watchdog reset"
         - "PASS: RESET_WATCHDOG detected"
         - "PASS: reset causes were cleared"
+        - "HW Info reset reason test on"
+        - "This boot is due to expected cpu lockup reset"
+        - "PASS: RESET_CPU_LOCKUP detected"
+        - "PASS: reset causes were cleared"
         - "All tests done"
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp

From 7e66910e6a5af4bd5245d7b24a4d2b9c28443068 Mon Sep 17 00:00:00 2001
From: Karsten Koenig <karsten.koenig@nordicsemi.no>
Date: Mon, 10 Mar 2025 10:10:00 +0100
Subject: [PATCH 2607/2913] Revert "[nrf noup] moduled: hal_nordic: require
 nrf-regtool"

This reverts commit c8aea90f09265465244b6881a5c4a93486c5eef0.

Signed-off-by: Karsten Koenig <karsten.koenig@nordicsemi.no>
---
 modules/hal_nordic/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt
index 53bbca02494..02d72437734 100644
--- a/modules/hal_nordic/CMakeLists.txt
+++ b/modules/hal_nordic/CMakeLists.txt
@@ -12,7 +12,7 @@ if(CONFIG_NRF_REGTOOL_GENERATE_UICR)
   list(APPEND nrf_regtool_components GENERATE:UICR)
 endif()
 if(DEFINED nrf_regtool_components)
-  find_package(nrf-regtool 8.1.2 REQUIRED
+  find_package(nrf-regtool 8.1.2
     COMPONENTS ${nrf_regtool_components}
     PATHS ${CMAKE_CURRENT_LIST_DIR}/nrf-regtool
     NO_CMAKE_PATH

From 6015fd3b978c261624294fc48e7de45ff8e20f67 Mon Sep 17 00:00:00 2001
From: Karsten Koenig <karsten.koenig@nordicsemi.no>
Date: Thu, 27 Feb 2025 13:14:47 +0100
Subject: [PATCH 2608/2913] [nrf fromtree] modules: hal_nordic: bump regtool to
 8.1.3

Added additional analog channels for ADC and COMP/LPCOMP and new pin
functionality mapping for TDM.

Signed-off-by: Karsten Koenig <karsten.koenig@nordicsemi.no>

(cherry picked from commit b900ed561f76fb956e71e861b6aa403efa2a660c)
---
 modules/hal_nordic/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt
index 02d72437734..1b1aeee7669 100644
--- a/modules/hal_nordic/CMakeLists.txt
+++ b/modules/hal_nordic/CMakeLists.txt
@@ -12,7 +12,7 @@ if(CONFIG_NRF_REGTOOL_GENERATE_UICR)
   list(APPEND nrf_regtool_components GENERATE:UICR)
 endif()
 if(DEFINED nrf_regtool_components)
-  find_package(nrf-regtool 8.1.2
+  find_package(nrf-regtool 8.1.3
     COMPONENTS ${nrf_regtool_components}
     PATHS ${CMAKE_CURRENT_LIST_DIR}/nrf-regtool
     NO_CMAKE_PATH

From 6ec9d10bc8816edd0011c4b76a13ae4896bf6236 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Wed, 30 Oct 2024 16:37:13 +0100
Subject: [PATCH 2609/2913] [nrf noup] moduled: hal_nordic: require nrf-regtool

Upstream not ready yet, revert once applied there.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
Signed-off-by: Karsten Koenig <karsten.koenig@nordicsemi.no>

(cherry picked from commit 6384b5876f5b4c4c16a343d396de14d6ce52b4fe)
---
 modules/hal_nordic/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt
index 1b1aeee7669..4510212b277 100644
--- a/modules/hal_nordic/CMakeLists.txt
+++ b/modules/hal_nordic/CMakeLists.txt
@@ -12,7 +12,7 @@ if(CONFIG_NRF_REGTOOL_GENERATE_UICR)
   list(APPEND nrf_regtool_components GENERATE:UICR)
 endif()
 if(DEFINED nrf_regtool_components)
-  find_package(nrf-regtool 8.1.3
+  find_package(nrf-regtool 8.1.3 REQUIRED
     COMPONENTS ${nrf_regtool_components}
     PATHS ${CMAKE_CURRENT_LIST_DIR}/nrf-regtool
     NO_CMAKE_PATH

From 3dc343520373f844e5ec3da607111f149589c9c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Tue, 18 Feb 2025 12:02:09 +0100
Subject: [PATCH 2610/2913] [nrf fromtree] boards: nordic: nrf54l20pdk: Add SPI
 to the supported peripherals
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enable Twister tests of SPI peripheral on nRF54L20pdk.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 321fcaf44dd27955e57b88c909e02cf24d34cce9)
---
 boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml | 1 +
 tests/drivers/spi/spi_controller_peripheral/testcase.yaml  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
index 02a47928373..d4bc7828822 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
@@ -19,4 +19,5 @@ supported:
   - gpio
   - i2c
   - pwm
+  - spi
   - watchdog
diff --git a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
index 6584c3e4440..6bc5644d770 100644
--- a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
+++ b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
@@ -9,6 +9,7 @@ common:
   platform_allow:
     - nrf52840dk/nrf52840
     - nrf54l15dk/nrf54l15/cpuapp
+    - nrf54l20pdk/nrf54l20/cpuapp
     - nrf54h20dk/nrf54h20/cpuapp
     - nrf54h20dk/nrf54h20/cpurad
     - nrf54h20dk/nrf54h20/cpuppr

From 5ace1dcccde6a13b7ae24528d7a0ccc636f4d667 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Tue, 3 Dec 2024 07:23:20 +0100
Subject: [PATCH 2611/2913] [nrf fromtree] tests: drivers: audio: dmic_api:
 Enable test execution on nrf54l15
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enable execution of dmic_api test on nrf54l15:
- add 'dmic' to the list of supported peripherals;
- add overlay for nrf54l15;
- align Nordic's implementation of PDM driver to pass the test.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 2e23dfd40163e93383f0b12add4d14120f63a6b1)
---
 .../nrf54l15dk_nrf54l15_cpuapp.yaml           |  1 +
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 tests/drivers/audio/dmic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.yaml b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.yaml
index a3ddb5db1c6..4da5c7e9951 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.yaml
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.yaml
@@ -15,6 +15,7 @@ flash: 324
 supported:
   - adc
   - counter
+  - dmic
   - gpio
   - i2c
   - pwm
diff --git a/tests/drivers/audio/dmic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/audio/dmic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..a77b6baf38f
--- /dev/null
+++ b/tests/drivers/audio/dmic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		dmic-dev = &pdm20;
+	};
+};
+
+&pinctrl {
+	pdm20_default_alt: pdm20_default_alt {
+		group1 {
+			psels = <NRF_PSEL(PDM_CLK, 1, 12)>,
+				<NRF_PSEL(PDM_DIN, 1, 13)>;
+		};
+	};
+};
+
+dmic_dev: &pdm20 {
+	status = "okay";
+	pinctrl-0 = <&pdm20_default_alt>;
+	pinctrl-names = "default";
+	clock-source = "PCLK32M";
+};

From 5319cfc0718146a1bb21a856415d9b50abbf979e Mon Sep 17 00:00:00 2001
From: Emanuele Di Santo <emdi@nordicsemi.no>
Date: Fri, 7 Mar 2025 12:14:01 +0100
Subject: [PATCH 2612/2913] [nrf fromtree] drivers: timer: nrf_rtc_timer: do
 not start LFCLK unless CLOCK_CONTROL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Do not start the LF clock unless CONFIG_CLOCK_CONTROL_NRF is enabled.
This is similar to how it's done in Nordic's GRTC driver.

Authored-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
Signed-off-by: Emanuele Di Santo <emdi@nordicsemi.no>
(cherry picked from commit cdc2f2a52cecec08f5399addc8a2ba744cda849f)
---
 drivers/timer/nrf_rtc_timer.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/timer/nrf_rtc_timer.c b/drivers/timer/nrf_rtc_timer.c
index e0584a3c8b3..d45d9229d31 100644
--- a/drivers/timer/nrf_rtc_timer.c
+++ b/drivers/timer/nrf_rtc_timer.c
@@ -726,13 +726,6 @@ void sys_clock_disable(void)
 
 static int sys_clock_driver_init(void)
 {
-	static const enum nrf_lfclk_start_mode mode =
-		IS_ENABLED(CONFIG_SYSTEM_CLOCK_NO_WAIT) ?
-			CLOCK_CONTROL_NRF_LF_START_NOWAIT :
-			(IS_ENABLED(CONFIG_SYSTEM_CLOCK_WAIT_FOR_AVAILABILITY) ?
-			CLOCK_CONTROL_NRF_LF_START_AVAILABLE :
-			CLOCK_CONTROL_NRF_LF_START_STABLE);
-
 	int_event_disable_rtc();
 
 	/* TODO: replace with counter driver to access RTC */
@@ -763,7 +756,16 @@ static int sys_clock_driver_init(void)
 
 	compare_set(0, initial_timeout, sys_clock_timeout_handler, NULL, false);
 
+#if defined(CONFIG_CLOCK_CONTROL_NRF)
+	static const enum nrf_lfclk_start_mode mode =
+		IS_ENABLED(CONFIG_SYSTEM_CLOCK_NO_WAIT) ?
+			CLOCK_CONTROL_NRF_LF_START_NOWAIT :
+			(IS_ENABLED(CONFIG_SYSTEM_CLOCK_WAIT_FOR_AVAILABILITY) ?
+			CLOCK_CONTROL_NRF_LF_START_AVAILABLE :
+			CLOCK_CONTROL_NRF_LF_START_STABLE);
+
 	z_nrf_clock_control_lf_on(mode);
+#endif
 
 	return 0;
 }

From 34f8850d5c313cac12f46fe95470f83bc9d18985 Mon Sep 17 00:00:00 2001
From: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Date: Thu, 13 Mar 2025 12:26:13 +0100
Subject: [PATCH 2613/2913] [nrf fromlist] mcumgr/img_mgmt: Allow erase pending
 image by default

Allows erasing secondary slot which is marked for test or confirmed.
This is safe as bootloader doesn't make any action on boot-setup yet.

Erase of such pending image might considered like the case when it
was never downloaded as well.

This allow user to not stuck with pending irremovable image.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

Upstream PR #: 87042
---
 subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig b/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
index e05169b625b..684588a47d6 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
@@ -85,6 +85,7 @@ config MCUMGR_GRP_IMG_ALLOW_CONFIRM_NON_ACTIVE_IMAGE_ANY
 if !MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP
 config MCUMGR_GRP_IMG_ALLOW_ERASE_PENDING
 	bool "Allow to erase pending slot"
+	default y
 	help
 	  Allows erasing secondary slot which is marked for test or confirmed; this allows
 	  erasing slots that have been set for next boot but the device has not

From f59e0f1192e8b4da4cba6c29ea7e327c75bd9758 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 20 Feb 2025 11:30:49 +0100
Subject: [PATCH 2614/2913] Revert "[nrf noup] drivers: pinctrl: Add SDP MSPI
 pin configuration"

This reverts commit 169707448c7ca8c806025c65dcbe7836f059e2a5.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 drivers/pinctrl/pinctrl_nrf.c                 | 29 -------------------
 .../zephyr/dt-bindings/pinctrl/nrf-pinctrl.h  | 28 ------------------
 2 files changed, 57 deletions(-)

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 2d4e580a14b..7b4f31421ce 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -108,13 +108,6 @@ static const nrf_gpio_pin_drive_t drive_modes[NRF_DRIVE_COUNT] = {
 #endif
 #endif
 
-#if defined(CONFIG_SOC_NRF54L15_CPUAPP)
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller) || defined(CONFIG_MSPI_NRFE)
-#define NRF_PSEL_SDP_MSPI(psel)                                                                    \
-	nrf_gpio_pin_control_select(psel, NRF_GPIO_PIN_SEL_VPR);
-#endif
-#endif
-
 int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			   uintptr_t reg)
 {
@@ -427,28 +420,6 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
 #endif /* defined(NRF_PSEL_TWIS) */
-#if defined(CONFIG_SOC_NRF54L15_CPUAPP)
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller)
-		case NRF_FUN_SDP_MSPI_CS0:
-		case NRF_FUN_SDP_MSPI_CS1:
-		case NRF_FUN_SDP_MSPI_CS2:
-		case NRF_FUN_SDP_MSPI_CS3:
-		case NRF_FUN_SDP_MSPI_CS4:
-		case NRF_FUN_SDP_MSPI_SCK:
-		case NRF_FUN_SDP_MSPI_DQ0:
-		case NRF_FUN_SDP_MSPI_DQ1:
-		case NRF_FUN_SDP_MSPI_DQ2:
-		case NRF_FUN_SDP_MSPI_DQ3:
-		case NRF_FUN_SDP_MSPI_DQ4:
-		case NRF_FUN_SDP_MSPI_DQ5:
-		case NRF_FUN_SDP_MSPI_DQ6:
-		case NRF_FUN_SDP_MSPI_DQ7:
-			NRF_PSEL_SDP_MSPI(psel);
-			dir = NRF_GPIO_PIN_DIR_OUTPUT;
-			input = NRF_GPIO_PIN_INPUT_CONNECT;
-			break;
-#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller) */
-#endif /* CONFIG_SOC_NRF54L15_CPUAPP */
 		default:
 			return -ENOTSUP;
 		}
diff --git a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
index 81a7a8bc77d..7d75f0d7109 100644
--- a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
@@ -172,34 +172,6 @@
 #define NRF_FUN_GRTC_CLKOUT_FAST 55U
 /** GRTC slow clock output */
 #define NRF_FUN_GRTC_CLKOUT_32K  56U
-/** SDP_MSPI CK */
-#define NRF_FUN_SDP_MSPI_SCK 57U
-/** SDP_MSPI DQ0 */
-#define NRF_FUN_SDP_MSPI_DQ0 58U
-/** SDP_MSPI DQ1 */
-#define NRF_FUN_SDP_MSPI_DQ1 59U
-/** SDP_MSPI DQ2 */
-#define NRF_FUN_SDP_MSPI_DQ2 60U
-/** SDP_MSPI DQ3 */
-#define NRF_FUN_SDP_MSPI_DQ3 61U
-/** SDP_MSPI DQ4 */
-#define NRF_FUN_SDP_MSPI_DQ4 62U
-/** SDP_MSPI DQ5 */
-#define NRF_FUN_SDP_MSPI_DQ5 63U
-/** SDP_MSPI DQ6 */
-#define NRF_FUN_SDP_MSPI_DQ6 64U
-/** SDP_MSPI DQ7 */
-#define NRF_FUN_SDP_MSPI_DQ7 65U
-/** SDP_MSPI CS0 */
-#define NRF_FUN_SDP_MSPI_CS0 66U
-/** SDP_MSPI CS1 */
-#define NRF_FUN_SDP_MSPI_CS1 67U
-/** SDP_MSPI CS2 */
-#define NRF_FUN_SDP_MSPI_CS2 68U
-/** SDP_MSPI CS3 */
-#define NRF_FUN_SDP_MSPI_CS3 69U
-/** SDP_MSPI CS4 */
-#define NRF_FUN_SDP_MSPI_CS4 70U
 
 /** @} */
 

From cdd7b6bdad3bd7d7f0df7ab7e160d181757613f1 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Wed, 27 Nov 2024 15:47:30 +0100
Subject: [PATCH 2615/2913] [nrf fromlist] soc: nordic_nrf: add support for TDM

Add Kconfig options for TDM130 and TDM131.

Upstream PR #: 82144

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 soc/nordic/common/Kconfig.peripherals | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/soc/nordic/common/Kconfig.peripherals b/soc/nordic/common/Kconfig.peripherals
index 9ea6ebc45c5..451a534d101 100644
--- a/soc/nordic/common/Kconfig.peripherals
+++ b/soc/nordic/common/Kconfig.peripherals
@@ -389,6 +389,15 @@ config HAS_HW_NRF_SWI4
 config HAS_HW_NRF_SWI5
 	def_bool $(dt_nodelabel_enabled_with_compat,swi5,$(DT_COMPAT_NORDIC_NRF_SWI))
 
+config HAS_HW_NRF_TDM
+	def_bool $(dt_nodelabel_enabled_with_compat,tdm,$(DT_COMPAT_NORDIC_NRF_TDM))
+
+config HAS_HW_NRF_TDM130
+	def_bool $(dt_nodelabel_enabled_with_compat,tdm130,$(DT_COMPAT_NORDIC_NRF_TDM))
+
+config HAS_HW_NRF_TDM131
+	def_bool $(dt_nodelabel_enabled_with_compat,tdm131,$(DT_COMPAT_NORDIC_NRF_TDM))
+
 config HAS_HW_NRF_TEMP
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_TEMP))
 

From 812f9328e0b8290f248d456fac2f8132ce34818f Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Wed, 27 Nov 2024 15:51:39 +0100
Subject: [PATCH 2616/2913] [nrf fromlist] modules: hal_nordic: add support for
 TDM

Add HAL glue Kconfig options for TDM130 and TDM131.

Upstream PR #: 82144

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 modules/hal_nordic/nrfx/Kconfig | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index c73a155dc60..eb79e1e5464 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -693,6 +693,19 @@ config NRFX_TBM
 	bool "TBM driver"
 	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_TBM))
 
+config NRFX_TDM
+	bool
+
+config NRFX_TDM130
+	bool "TDM130 driver instance"
+	depends on $(dt_nodelabel_has_compat,tdm130,$(DT_COMPAT_NORDIC_NRF_TDM))
+	select NRFX_TDM
+
+config NRFX_TDM131
+	bool "TDM131 driver instance"
+	depends on $(dt_nodelabel_has_compat,tdm131,$(DT_COMPAT_NORDIC_NRF_TDM))
+	select NRFX_TDM
+
 config NRFX_TEMP
 	bool "TEMP driver"
 	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_TEMP))

From 0377f37fd54a179932cef9b355d8528ed35e07f3 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Wed, 27 Nov 2024 16:00:56 +0100
Subject: [PATCH 2617/2913] [nrf fromlist] drivers: pinctrl: nrf: Add support
 for TDM peripheral

Add support for configuring pins of the nRF TDM peripheral.

Upstream PR #: 82144

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 drivers/pinctrl/pinctrl_nrf.c                 | 45 +++++++++++++++++++
 .../zephyr/dt-bindings/pinctrl/nrf-pinctrl.h  | 14 ++++++
 2 files changed, 59 insertions(+)

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 7b4f31421ce..6d9d52cd93b 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -108,6 +108,10 @@ static const nrf_gpio_pin_drive_t drive_modes[NRF_DRIVE_COUNT] = {
 #endif
 #endif
 
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_tdm)
+#define NRF_PSEL_TDM(reg, line) ((NRF_TDM_Type *)reg)->PSEL.line
+#endif
+
 int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			   uintptr_t reg)
 {
@@ -354,6 +358,47 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
 			break;
 #endif /* defined(NRF_PSEL_QSPI) */
+#if defined(NRF_PSEL_TDM)
+		case NRF_FUN_TDM_SCK_M:
+			NRF_PSEL_TDM(reg, SCK) = psel;
+			write = 0U;
+			dir = NRF_GPIO_PIN_DIR_OUTPUT;
+			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
+			break;
+		case NRF_FUN_TDM_SCK_S:
+			NRF_PSEL_TDM(reg, SCK) = psel;
+			dir = NRF_GPIO_PIN_DIR_INPUT;
+			input = NRF_GPIO_PIN_INPUT_CONNECT;
+			break;
+		case NRF_FUN_TDM_FSYNC_M:
+			NRF_PSEL_TDM(reg, FSYNC) = psel;
+			write = 0U;
+			dir = NRF_GPIO_PIN_DIR_OUTPUT;
+			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
+			break;
+		case NRF_FUN_TDM_FSYNC_S:
+			NRF_PSEL_TDM(reg, FSYNC) = psel;
+			dir = NRF_GPIO_PIN_DIR_INPUT;
+			input = NRF_GPIO_PIN_INPUT_CONNECT;
+			break;
+		case NRF_FUN_TDM_SDIN:
+			NRF_PSEL_TDM(reg, SDIN) = psel;
+			dir = NRF_GPIO_PIN_DIR_INPUT;
+			input = NRF_GPIO_PIN_INPUT_CONNECT;
+			break;
+		case NRF_FUN_TDM_SDOUT:
+			NRF_PSEL_TDM(reg, SDOUT) = psel;
+			write = 0U;
+			dir = NRF_GPIO_PIN_DIR_OUTPUT;
+			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
+			break;
+		case NRF_FUN_TDM_MCK:
+			NRF_PSEL_TDM(reg, MCK) = psel;
+			write = 0U;
+			dir = NRF_GPIO_PIN_DIR_OUTPUT;
+			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
+			break;
+#endif /* defined(NRF_PSEL_TDM) */
 #if defined(NRF_GRTC_CLKOUT_FAST)
 		case NRF_FUN_GRTC_CLKOUT_FAST:
 #if NRF_GPIO_HAS_SEL && defined(GPIO_PIN_CNF_CTRLSEL_GRTC)
diff --git a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
index 7d75f0d7109..9de74061e8d 100644
--- a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
@@ -172,6 +172,20 @@
 #define NRF_FUN_GRTC_CLKOUT_FAST 55U
 /** GRTC slow clock output */
 #define NRF_FUN_GRTC_CLKOUT_32K  56U
+/** TDM SCK in master mode */
+#define NRF_FUN_TDM_SCK_M        71U
+/** TDM SCK in slave mode */
+#define NRF_FUN_TDM_SCK_S        72U
+/** TDM LRCK in master mode */
+#define NRF_FUN_TDM_FSYNC_M      73U
+/** TDM LRCK in slave mode */
+#define NRF_FUN_TDM_FSYNC_S      74U
+/** TDM SDIN */
+#define NRF_FUN_TDM_SDIN         75U
+/** TDM SDOUT */
+#define NRF_FUN_TDM_SDOUT        76U
+/** TDM MCK */
+#define NRF_FUN_TDM_MCK          77U
 
 /** @} */
 

From 7d44195bccf5158e9e13d3e4f38582b5c2670753 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Wed, 27 Nov 2024 16:06:44 +0100
Subject: [PATCH 2618/2913] [nrf fromlist] dts: nordic: nrf54: add TDM support
 for nRF54

Add TDM support for nRF54H20 and nRF54L20

Upstream PR #: 82144

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 dts/bindings/i2s/nordic,nrf-tdm.yaml | 48 ++++++++++++++++++++++++++++
 dts/common/nordic/nrf54h20.dtsi      | 28 ++++++++++++++++
 dts/common/nordic/nrf54l20.dtsi      | 19 +++++++++++
 3 files changed, 95 insertions(+)
 create mode 100644 dts/bindings/i2s/nordic,nrf-tdm.yaml

diff --git a/dts/bindings/i2s/nordic,nrf-tdm.yaml b/dts/bindings/i2s/nordic,nrf-tdm.yaml
new file mode 100644
index 00000000000..82f51147848
--- /dev/null
+++ b/dts/bindings/i2s/nordic,nrf-tdm.yaml
@@ -0,0 +1,48 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Nordic TDM (Time division multiplexed audio interface)
+
+compatible: "nordic,nrf-tdm"
+
+include: [i2s-controller.yaml, pinctrl-device.yaml, nordic-clockpin.yaml, "memory-region.yaml"]
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  mck-frequency:
+    type: int
+    description: |
+      Frequency of the MCK clock. Configured independently of SCK.
+
+  pinctrl-0:
+    required: true
+
+  pinctrl-names:
+    required: true
+
+  easydma-maxcnt-bits:
+    type: int
+    required: true
+    description: |
+      Maximum number of bits available in the EasyDMA MAXCNT register. This
+      property must be set at SoC level DTS files.
+
+  clock-source:
+    type: string
+    default: "PCLK"
+    description: |
+      Clock source to be used by the TDM peripheral. The following options
+      are available:
+      - "PCLK": Peripheral clock
+      - "ACLK": Audio PLL clock with configurable frequency (frequency for
+        this clock must be set via the "hfclkaudio-frequency" property
+        in the "nordic,nrf-clock" node); this clock source is only available
+        in the nRF53 Series SoCs and it requires the use of HFXO
+    enum:
+      - "PCLK"
+      - "ACLK"
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index cddcbcd0790..bdf8c3fcc0e 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -1491,6 +1491,34 @@
 				endtx-stoptx-supported;
 				frame-timeout-supported;
 			};
+
+			tdm130: tdm@992000 {
+				compatible = "nordic,nrf-tdm";
+				easydma-maxcnt-bits = <15>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0x992000 0x1000>;
+				interrupts = <402 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
+				nordic,clockpin-enable = <NRF_FUN_TDM_SCK_M>,
+							 <NRF_FUN_TDM_MCK>;
+			};
+
+			tdm131: tdm@997000 {
+				compatible = "nordic,nrf-tdm";
+				easydma-maxcnt-bits = <15>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0x997000 0x1000>;
+				interrupts = <407 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
+				nordic,clockpin-enable = <NRF_FUN_TDM_SCK_M>,
+							 <NRF_FUN_TDM_MCK>;
+			};
 		};
 	};
 
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index d95ea80da26..2d8f892e07e 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -53,6 +53,12 @@
 			clock-frequency = <DT_FREQ_M(16)>;
 		};
 
+		pclk32m: pclk32m {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <DT_FREQ_M(32)>;
+		};
+
 		lfxo: lfxo {
 			compatible = "nordic,nrf-lfxo";
 			#clock-cells = <0>;
@@ -684,6 +690,19 @@
 				frame-timeout-supported;
 			};
 
+			tdm: tdm@e8000 {
+				compatible = "nordic,nrf-tdm";
+				easydma-maxcnt-bits = <15>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xe8000 0x1000>;
+				interrupts = <232 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				clocks = <&pclk32m>;
+				nordic,clockpin-enable = <NRF_FUN_TDM_SCK_M>,
+							 <NRF_FUN_TDM_MCK>;
+			};
+
 			wdt30: watchdog@108000 {
 				compatible = "nordic,nrf-wdt";
 				reg = <0x108000 0x620>;

From a4e63c80ca707673097c21ce87af02e6c4e137f6 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Wed, 27 Nov 2024 16:19:17 +0100
Subject: [PATCH 2619/2913] [nrf fromlist] drivers: i2s: Add support for nRF
 TDM peripherals

Add a shim that allows using the nRF TDM
(Time division multiplexed audio interface) HAL by I2S Zephyr API.

Upstream PR #: 82144

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 drivers/i2s/CMakeLists.txt |    1 +
 drivers/i2s/Kconfig.nrfx   |   21 +
 drivers/i2s/i2s_nrfx_tdm.c | 1109 ++++++++++++++++++++++++++++++++++++
 3 files changed, 1131 insertions(+)
 create mode 100644 drivers/i2s/i2s_nrfx_tdm.c

diff --git a/drivers/i2s/CMakeLists.txt b/drivers/i2s/CMakeLists.txt
index 7857b6e863b..29a9da412ce 100644
--- a/drivers/i2s/CMakeLists.txt
+++ b/drivers/i2s/CMakeLists.txt
@@ -11,6 +11,7 @@ zephyr_library_sources_ifdef(CONFIG_I2S_STM32		i2s_ll_stm32.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_LITEX		i2s_litex.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_MCUX_FLEXCOMM	i2s_mcux_flexcomm.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_NRFX		i2s_nrfx.c)
+zephyr_library_sources_ifdef(CONFIG_TDM_NRFX		i2s_nrfx_tdm.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_MCUX_SAI	i2s_mcux_sai.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_ESP32		i2s_esp32.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_TEST		i2s_test.c)
diff --git a/drivers/i2s/Kconfig.nrfx b/drivers/i2s/Kconfig.nrfx
index b36f3eb9c64..4b7a9f6177a 100644
--- a/drivers/i2s/Kconfig.nrfx
+++ b/drivers/i2s/Kconfig.nrfx
@@ -22,3 +22,24 @@ config I2S_NRFX_TX_BLOCK_COUNT
 	default 4
 
 endif # I2S_NRFX
+
+menuconfig TDM_NRFX
+	bool "nRF TDM nrfx driver"
+	default y
+	depends on DT_HAS_NORDIC_NRF_TDM_ENABLED
+	select NRFX_TDM130 if HAS_HW_NRF_TDM130
+	select PINCTRL
+	help
+	  Enable support for nrfx TDM driver for nRF MCU series.
+
+if TDM_NRFX
+
+config TDM_NRFX_RX_BLOCK_COUNT
+	int "RX queue length"
+	default 4
+
+config TDM_NRFX_TX_BLOCK_COUNT
+	int "TX queue length"
+	default 4
+
+endif # TDM_NRFX
diff --git a/drivers/i2s/i2s_nrfx_tdm.c b/drivers/i2s/i2s_nrfx_tdm.c
new file mode 100644
index 00000000000..0482fa732f6
--- /dev/null
+++ b/drivers/i2s/i2s_nrfx_tdm.c
@@ -0,0 +1,1109 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <stdlib.h>
+#include <zephyr/drivers/i2s.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <soc.h>
+#include <dmm.h>
+#include <hal/nrf_tdm.h>
+#include <haly/nrfy_gpio.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/irq.h>
+LOG_MODULE_REGISTER(tdm_nrfx, CONFIG_I2S_LOG_LEVEL);
+
+/* The application must provide buffers that are to be used in the next
+ * part of the transfer.
+ */
+#define NRFX_TDM_STATUS_NEXT_BUFFERS_NEEDED BIT(0)
+
+/* The TDM peripheral has been stopped and all buffers that were passed
+ * to the driver have been released.
+ */
+#define NRFX_TDM_STATUS_TRANSFER_STOPPED BIT(1)
+
+typedef struct {
+	uint32_t *p_rx_buffer;
+	uint32_t const *p_tx_buffer;
+	void *p_tx_mem_slab;
+	void *p_rx_mem_slab;
+	uint16_t buffer_size;
+} tdm_buffers_t;
+
+typedef void (*tdm_data_handler_t)(tdm_buffers_t const *p_released, uint32_t status);
+
+typedef struct {
+	tdm_data_handler_t handler;
+	bool use_rx: 1;
+	bool use_tx: 1;
+	bool rx_ready: 1;
+	bool tx_ready: 1;
+	bool buffers_needed: 1;
+	bool buffers_reused: 1;
+	tdm_buffers_t next_buffers;
+	tdm_buffers_t current_buffers;
+} tdm_ctrl_t;
+
+struct stream_cfg {
+	struct i2s_config cfg;
+	nrf_tdm_config_t nrfx_cfg;
+};
+
+struct tdm_buf {
+	void *mem_block;
+	size_t size;
+	void *dmm_buf;
+};
+
+struct tdm_drv_cfg {
+	tdm_data_handler_t data_handler;
+	const struct pinctrl_dev_config *pcfg;
+	NRF_TDM_Type *p_reg;
+	void *mem_reg;
+	tdm_ctrl_t *control_data;
+	uint32_t mck_frequency;
+	uint32_t pclk_frequency;
+	enum clock_source {
+		PCLK,
+		ACLK
+	} clk_src;
+};
+
+struct tdm_drv_data {
+	struct onoff_manager *clk_mgr;
+	struct onoff_client clk_cli;
+	struct stream_cfg tx;
+	struct k_msgq tx_queue;
+	struct stream_cfg rx;
+	struct k_msgq rx_queue;
+	const struct tdm_drv_cfg *drv_cfg;
+	const uint32_t *last_tx_buffer;
+	void *last_tx_mem_slab;
+	enum i2s_state state;
+	enum i2s_dir active_dir;
+	bool stop;       /* stop after the current (TX or RX) block */
+	bool discard_rx; /* discard further RX blocks */
+	volatile bool next_tx_buffer_needed;
+	bool tx_configured: 1;
+	bool rx_configured: 1;
+	bool request_clock: 1;
+};
+
+void tdm_irq_handler(const struct device *dev)
+{
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+	NRF_TDM_Type *p_reg = drv_cfg->p_reg;
+	tdm_ctrl_t *ctrl_data = drv_cfg->control_data;
+	uint32_t event_mask = 0;
+
+	if (nrf_tdm_event_check(p_reg, NRF_TDM_EVENT_MAXCNT)) {
+		nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_MAXCNT);
+	}
+	if (nrf_tdm_event_check(p_reg, NRF_TDM_EVENT_TXPTRUPD)) {
+		nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_TXPTRUPD);
+		event_mask |= NRFY_EVENT_TO_INT_BITMASK(NRF_TDM_EVENT_TXPTRUPD);
+		ctrl_data->tx_ready = true;
+		if (ctrl_data->use_tx && ctrl_data->buffers_needed) {
+			ctrl_data->buffers_reused = true;
+		}
+	}
+	if (nrf_tdm_event_check(p_reg, NRF_TDM_EVENT_RXPTRUPD)) {
+		nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_RXPTRUPD);
+		event_mask |= NRFY_EVENT_TO_INT_BITMASK(NRF_TDM_EVENT_RXPTRUPD);
+		ctrl_data->rx_ready = true;
+		if (ctrl_data->use_rx && ctrl_data->buffers_needed) {
+			ctrl_data->buffers_reused = true;
+		}
+	}
+	if (nrf_tdm_event_check(p_reg, NRF_TDM_EVENT_STOPPED)) {
+		nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_STOPPED);
+		event_mask |= NRFY_EVENT_TO_INT_BITMASK(NRF_TDM_EVENT_STOPPED);
+		nrf_tdm_int_disable(p_reg, NRF_TDM_INT_STOPPED_MASK_MASK);
+		nrf_tdm_disable(p_reg);
+		/* When stopped, release all buffers, including these scheduled for
+		 * the next part of the transfer, and signal that the transfer has
+		 * finished.
+		 */
+		ctrl_data->handler(&ctrl_data->current_buffers, 0);
+		ctrl_data->handler(&ctrl_data->next_buffers, NRFX_TDM_STATUS_TRANSFER_STOPPED);
+	} else {
+		/* Check if the requested transfer has been completed:
+		 * - full-duplex mode
+		 */
+		if ((ctrl_data->use_tx && ctrl_data->use_rx && ctrl_data->tx_ready &&
+		     ctrl_data->rx_ready) ||
+		    /* - TX only mode */
+		    (!ctrl_data->use_rx && ctrl_data->tx_ready) ||
+		    /* - RX only mode */
+		    (!ctrl_data->use_tx && ctrl_data->rx_ready)) {
+			ctrl_data->tx_ready = false;
+			ctrl_data->rx_ready = false;
+
+			/* If the application did not supply the buffers for the next
+			 * part of the transfer until this moment, the current buffers
+			 * cannot be released, since the I2S peripheral already started
+			 * using them. Signal this situation to the application by
+			 * passing NULL instead of the structure with released buffers.
+			 */
+			if (ctrl_data->buffers_reused) {
+				ctrl_data->buffers_reused = false;
+				/* This will most likely be set at this point. However, there is
+				 * a small time window between TXPTRUPD and RXPTRUPD events,
+				 * and it is theoretically possible that next buffers will be
+				 * set in this window, so to be sure this flag is set to true,
+				 * set it explicitly.
+				 */
+				ctrl_data->buffers_needed = true;
+				ctrl_data->handler(NULL, NRFX_TDM_STATUS_NEXT_BUFFERS_NEEDED);
+			} else {
+				/* Buffers that have been used by the I2S peripheral (current)
+				 * are now released and will be returned to the application,
+				 * and the ones scheduled to be used as next become the current
+				 * ones.
+				 */
+				tdm_buffers_t released_buffers = ctrl_data->current_buffers;
+
+				ctrl_data->current_buffers = ctrl_data->next_buffers;
+				ctrl_data->next_buffers.p_rx_buffer = NULL;
+				ctrl_data->next_buffers.p_tx_buffer = NULL;
+				ctrl_data->buffers_needed = true;
+				ctrl_data->handler(&released_buffers,
+						   NRFX_TDM_STATUS_NEXT_BUFFERS_NEEDED);
+			}
+		}
+	}
+}
+
+static uint32_t div_calculate(uint32_t src_freq, uint32_t requested_clk_freq)
+{
+	enum {
+		MCKCONST = 1048576
+	};
+	/* As specified in the PS:
+	 *
+	 * DIV = 4096 * floor(f_MCK * 1048576 /
+	 *                        (f_source + f_MCK / 2))
+	 * f_actual = f_source /
+	 *            floor(1048576 * 4096 / DIV)
+	 */
+
+	uint32_t ck_div = (uint32_t)(((uint64_t)requested_clk_freq * MCKCONST) /
+				     (src_freq + requested_clk_freq / 2));
+	return (ck_div * 4096);
+}
+
+static bool get_next_tx_buffer(struct tdm_drv_data *drv_data, tdm_buffers_t *buffers)
+{
+	struct tdm_buf buf;
+	int ret = k_msgq_get(&drv_data->tx_queue, &buf, K_NO_WAIT);
+
+	if (ret != 0) {
+		return false;
+	}
+	buffers->p_tx_buffer = buf.dmm_buf;
+	buffers->p_tx_mem_slab = buf.mem_block;
+	buffers->buffer_size = buf.size / sizeof(uint32_t);
+	return true;
+}
+
+static bool get_next_rx_buffer(struct tdm_drv_data *drv_data, tdm_buffers_t *buffers)
+{
+	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
+	int ret = k_mem_slab_alloc(drv_data->rx.cfg.mem_slab, &buffers->p_rx_mem_slab, K_NO_WAIT);
+
+	if (ret < 0) {
+		LOG_ERR("Failed to allocate next RX buffer: %d", ret);
+		return false;
+	}
+	ret = dmm_buffer_in_prepare(drv_cfg->mem_reg, buffers->p_rx_mem_slab,
+				    buffers->buffer_size * sizeof(uint32_t),
+				    (void **)&buffers->p_rx_buffer);
+	if (ret < 0) {
+		LOG_ERR("Failed to prepare buffer: %d", ret);
+		return false;
+	}
+
+	return true;
+}
+
+static void free_tx_buffer(struct tdm_drv_data *drv_data, struct tdm_buf *buf)
+{
+	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
+
+	(void)dmm_buffer_out_release(drv_cfg->mem_reg, buf->dmm_buf);
+	k_mem_slab_free(drv_data->tx.cfg.mem_slab, buf->mem_block);
+	LOG_DBG("Freed TX %p", buf->mem_block);
+}
+
+static void free_rx_buffer(struct tdm_drv_data *drv_data, struct tdm_buf *buf)
+{
+	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
+
+	(void)dmm_buffer_in_release(drv_cfg->mem_reg, buf->mem_block, buf->size, buf->dmm_buf);
+	k_mem_slab_free(drv_data->rx.cfg.mem_slab, buf->mem_block);
+	LOG_DBG("Freed RX %p", buf->mem_block);
+}
+
+static void tdm_start(struct tdm_drv_data *drv_data, tdm_buffers_t const *p_initial_buffers)
+{
+	NRF_TDM_Type *p_reg = drv_data->drv_cfg->p_reg;
+	tdm_ctrl_t *ctrl_data = drv_data->drv_cfg->control_data;
+
+	__ASSERT_NO_MSG(p_initial_buffers->p_rx_buffer != NULL ||
+			p_initial_buffers->p_tx_buffer != NULL);
+	ctrl_data->use_rx = (p_initial_buffers->p_rx_buffer != NULL);
+	ctrl_data->use_tx = (p_initial_buffers->p_tx_buffer != NULL);
+	ctrl_data->rx_ready = false;
+	ctrl_data->tx_ready = false;
+	ctrl_data->buffers_needed = false;
+
+	ctrl_data->next_buffers = *p_initial_buffers;
+	ctrl_data->current_buffers.p_rx_buffer = NULL;
+	ctrl_data->current_buffers.p_tx_buffer = NULL;
+	nrf_tdm_enable(p_reg);
+
+	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_RXPTRUPD);
+	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_TXPTRUPD);
+
+	nrf_tdm_int_enable(
+		p_reg,
+		(p_initial_buffers->p_rx_buffer ? NRF_TDM_INT_RXPTRUPD_MASK_MASK : 0UL) |
+			(p_initial_buffers->p_tx_buffer ? NRF_TDM_INT_TXPTRUPD_MASK_MASK : 0UL) |
+			NRF_TDM_INT_STOPPED_MASK_MASK);
+
+	nrf_tdm_tx_count_set(p_reg, p_initial_buffers->buffer_size);
+	nrf_tdm_rx_count_set(p_reg, p_initial_buffers->buffer_size);
+	nrf_tdm_rx_buffer_set(p_reg, p_initial_buffers->p_rx_buffer);
+	nrf_tdm_tx_buffer_set(p_reg, p_initial_buffers->p_tx_buffer);
+	nrf_tdm_task_trigger(p_reg, NRF_TDM_TASK_START);
+}
+
+static void tdm_stop(NRF_TDM_Type *p_reg)
+{
+	nrf_tdm_int_disable(p_reg, NRF_TDM_INT_RXPTRUPD_MASK_MASK | NRF_TDM_INT_TXPTRUPD_MASK_MASK);
+
+	nrf_tdm_task_trigger(p_reg, NRF_TDM_TASK_STOP);
+}
+
+static bool next_buffers_set(struct tdm_drv_data *drv_data, tdm_buffers_t const *p_buffers)
+{
+	NRF_TDM_Type *p_reg = drv_data->drv_cfg->p_reg;
+	tdm_ctrl_t *ctrl_data = drv_data->drv_cfg->control_data;
+	nrf_tdm_rxtxen_t dir = NRF_TDM_RXTXEN_DUPLEX;
+
+	__ASSERT_NO_MSG(p_buffers->p_rx_buffer != NULL || p_buffers->p_tx_buffer != NULL);
+
+	if (!ctrl_data->buffers_needed) {
+		return false;
+	}
+
+	nrf_tdm_tx_count_set(p_reg, p_buffers->buffer_size);
+	nrf_tdm_rx_count_set(p_reg, p_buffers->buffer_size);
+	nrf_tdm_rx_buffer_set(p_reg, p_buffers->p_rx_buffer);
+	nrf_tdm_tx_buffer_set(p_reg, p_buffers->p_tx_buffer);
+
+	if (p_buffers->p_rx_buffer == NULL) {
+		dir = NRF_TDM_RXTXEN_TX;
+	} else if (p_buffers->p_tx_buffer == NULL) {
+		dir = NRF_TDM_RXTXEN_RX;
+	}
+	nrf_tdm_transfer_direction_set(p_reg, dir);
+
+	ctrl_data->next_buffers = *p_buffers;
+	ctrl_data->buffers_needed = false;
+
+	return true;
+}
+
+static bool supply_next_buffers(struct tdm_drv_data *drv_data, tdm_buffers_t *next)
+{
+	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
+
+	if (drv_data->active_dir != I2S_DIR_TX) { /* -> RX active */
+		if (!get_next_rx_buffer(drv_data, next)) {
+			drv_data->state = I2S_STATE_ERROR;
+			tdm_stop(drv_cfg->p_reg);
+			return false;
+		}
+		/* Set buffer size if there is no TX buffer (which effectively
+		 * controls how many bytes will be received).
+		 */
+		if (drv_data->active_dir == I2S_DIR_RX) {
+			next->buffer_size = drv_data->rx.cfg.block_size / sizeof(uint32_t);
+		}
+	}
+
+	drv_data->last_tx_buffer = next->p_tx_buffer;
+	drv_data->last_tx_mem_slab = next->p_tx_mem_slab;
+
+	LOG_DBG("Next buffers: %p/%p", next->p_tx_buffer, next->p_rx_buffer);
+	return next_buffers_set(drv_data, next);
+}
+
+static void purge_queue(const struct device *dev, enum i2s_dir dir)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	struct tdm_buf buf;
+
+	if (dir == I2S_DIR_TX || dir == I2S_DIR_BOTH) {
+		while (k_msgq_get(&drv_data->tx_queue, &buf, K_NO_WAIT) == 0) {
+			free_tx_buffer(drv_data, &buf);
+		}
+	}
+
+	if (dir == I2S_DIR_RX || dir == I2S_DIR_BOTH) {
+		while (k_msgq_get(&drv_data->rx_queue, &buf, K_NO_WAIT) == 0) {
+			free_rx_buffer(drv_data, &buf);
+		}
+	}
+}
+
+static void tdm_uninit(struct tdm_drv_data *drv_data)
+{
+	NRF_TDM_Type *p_reg = drv_data->drv_cfg->p_reg;
+
+	tdm_stop(p_reg);
+	NRFX_IRQ_DISABLE(nrfx_get_irq_number(p_reg));
+}
+
+static int tdm_nrfx_configure(const struct device *dev, enum i2s_dir dir,
+			      const struct i2s_config *tdm_cfg)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+	nrf_tdm_config_t nrfx_cfg;
+	uint32_t chan_mask = 0;
+
+	if (drv_data->state != I2S_STATE_READY) {
+		LOG_ERR("Cannot configure in state: %d", drv_data->state);
+		return -EINVAL;
+	}
+
+	if (tdm_cfg->frame_clk_freq == 0) { /* -> reset state */
+		purge_queue(dev, dir);
+		if (dir == I2S_DIR_TX || dir == I2S_DIR_BOTH) {
+			drv_data->tx_configured = false;
+			memset(&drv_data->tx, 0, sizeof(drv_data->tx));
+		}
+		if (dir == I2S_DIR_RX || dir == I2S_DIR_BOTH) {
+			drv_data->rx_configured = false;
+			memset(&drv_data->rx, 0, sizeof(drv_data->rx));
+		}
+		return 0;
+	}
+
+	__ASSERT_NO_MSG(tdm_cfg->mem_slab != NULL && tdm_cfg->block_size != 0);
+
+	if ((tdm_cfg->block_size % sizeof(uint32_t)) != 0) {
+		LOG_ERR("This device can transfer only full 32-bit words");
+		return -EINVAL;
+	}
+
+	switch (tdm_cfg->word_size) {
+	case 8:
+		nrfx_cfg.sample_width = NRF_TDM_SWIDTH_8BIT;
+		break;
+	case 16:
+		nrfx_cfg.sample_width = NRF_TDM_SWIDTH_16BIT;
+		break;
+	case 24:
+		nrfx_cfg.sample_width = NRF_TDM_SWIDTH_24BIT;
+		break;
+	case 32:
+		nrfx_cfg.sample_width = NRF_TDM_SWIDTH_32BIT;
+		break;
+	default:
+		LOG_ERR("Unsupported word size: %u", tdm_cfg->word_size);
+		return -EINVAL;
+	}
+
+	switch (tdm_cfg->format & I2S_FMT_DATA_FORMAT_MASK) {
+	case I2S_FMT_DATA_FORMAT_I2S:
+		nrfx_cfg.alignment = NRF_TDM_ALIGN_LEFT;
+		nrfx_cfg.fsync_polarity = NRF_TDM_POLARITY_NEGEDGE;
+		nrfx_cfg.sck_polarity = NRF_TDM_POLARITY_POSEDGE;
+		nrfx_cfg.fsync_duration = NRF_TDM_FSYNC_DURATION_CHANNEL;
+		nrfx_cfg.channel_delay = NRF_TDM_CHANNEL_DELAY_1CK;
+		break;
+	case I2S_FMT_DATA_FORMAT_LEFT_JUSTIFIED:
+		nrfx_cfg.alignment = NRF_TDM_ALIGN_LEFT;
+		nrfx_cfg.fsync_polarity = NRF_TDM_POLARITY_POSEDGE;
+		nrfx_cfg.sck_polarity = NRF_TDM_POLARITY_POSEDGE;
+		nrfx_cfg.fsync_duration = NRF_TDM_FSYNC_DURATION_CHANNEL;
+		nrfx_cfg.channel_delay = NRF_TDM_CHANNEL_DELAY_NONE;
+		break;
+	case I2S_FMT_DATA_FORMAT_RIGHT_JUSTIFIED:
+		nrfx_cfg.alignment = NRF_TDM_ALIGN_RIGHT;
+		nrfx_cfg.fsync_polarity = NRF_TDM_POLARITY_POSEDGE;
+		nrfx_cfg.sck_polarity = NRF_TDM_POLARITY_POSEDGE;
+		nrfx_cfg.fsync_duration = NRF_TDM_FSYNC_DURATION_CHANNEL;
+		nrfx_cfg.channel_delay = NRF_TDM_CHANNEL_DELAY_NONE;
+		break;
+	default:
+		LOG_ERR("Unsupported data format: 0x%02x", tdm_cfg->format);
+		return -EINVAL;
+	}
+
+	if ((tdm_cfg->format & I2S_FMT_DATA_ORDER_LSB) || (tdm_cfg->format & I2S_FMT_BIT_CLK_INV) ||
+	    (tdm_cfg->format & I2S_FMT_FRAME_CLK_INV)) {
+		LOG_ERR("Unsupported stream format: 0x%02x", tdm_cfg->format);
+		return -EINVAL;
+	}
+
+	if (tdm_cfg->channels == 2) {
+		nrfx_cfg.num_of_channels = NRF_TDM_CHANNELS_COUNT_2;
+	} else if (tdm_cfg->channels == 1) {
+		nrfx_cfg.num_of_channels = NRF_TDM_CHANNELS_COUNT_1;
+	} else {
+		LOG_ERR("Unsupported number of channels: %u", tdm_cfg->channels);
+		return -EINVAL;
+	}
+	chan_mask = BIT_MASK(tdm_cfg->channels);
+
+	if ((tdm_cfg->options & I2S_OPT_BIT_CLK_SLAVE) &&
+	    (tdm_cfg->options & I2S_OPT_FRAME_CLK_SLAVE)) {
+		nrfx_cfg.mode = NRF_TDM_MODE_SLAVE;
+	} else if (!(tdm_cfg->options & I2S_OPT_BIT_CLK_SLAVE) &&
+		   !(tdm_cfg->options & I2S_OPT_FRAME_CLK_SLAVE)) {
+		nrfx_cfg.mode = NRF_TDM_MODE_MASTER;
+	} else {
+		LOG_ERR("Unsupported operation mode: 0x%02x", tdm_cfg->options);
+		return -EINVAL;
+	}
+
+	nrfx_cfg.mck_setup = 0;
+	if (nrfx_cfg.mode == NRF_TDM_MODE_MASTER) {
+		uint32_t sck = tdm_cfg->word_size * tdm_cfg->frame_clk_freq * tdm_cfg->channels;
+		const uint32_t src_freq =
+			(drv_cfg->clk_src == ACLK)
+				? DT_PROP_OR(DT_NODELABEL(clock), hfclkaudio_frequency, 0)
+				: drv_cfg->pclk_frequency;
+
+		/* Unless the PCLK source is used,
+		 * it is required to request the proper clock to be running
+		 * before starting the transfer itself.
+		 */
+		drv_data->request_clock = (drv_cfg->clk_src != PCLK);
+		nrfx_cfg.sck_setup = div_calculate(src_freq, sck);
+
+		if (((nrf_tdm_mck_pin_get(drv_cfg->p_reg) & TDM_PSEL_MCK_CONNECT_Msk) ==
+		     TDM_PSEL_MCK_CONNECT_Connected << TDM_PSEL_MCK_CONNECT_Pos) &&
+		    drv_cfg->mck_frequency != 0) {
+			nrfx_cfg.mck_setup = div_calculate(src_freq, drv_cfg->mck_frequency);
+		}
+	} else {
+		drv_data->request_clock = false;
+	}
+
+	if ((tdm_cfg->options & I2S_OPT_LOOPBACK) || (tdm_cfg->options & I2S_OPT_PINGPONG)) {
+		LOG_ERR("Unsupported options: 0x%02x", tdm_cfg->options);
+		return -EINVAL;
+	}
+
+	if (dir == I2S_DIR_TX || dir == I2S_DIR_BOTH) {
+		nrfx_cfg.channels = (chan_mask << TDM_CONFIG_CHANNEL_MASK_Tx0Enable_Pos);
+		drv_data->tx.cfg = *tdm_cfg;
+		drv_data->tx.nrfx_cfg = nrfx_cfg;
+		drv_data->tx_configured = true;
+	}
+
+	if (dir == I2S_DIR_RX || dir == I2S_DIR_BOTH) {
+		nrfx_cfg.channels = (chan_mask << TDM_CONFIG_CHANNEL_MASK_Rx0Enable_Pos);
+		drv_data->rx.cfg = *tdm_cfg;
+		drv_data->rx.nrfx_cfg = nrfx_cfg;
+		drv_data->rx_configured = true;
+	}
+	return 0;
+}
+
+static const struct i2s_config *tdm_nrfx_config_get(const struct device *dev, enum i2s_dir dir)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+
+	if (dir == I2S_DIR_TX && drv_data->tx_configured) {
+		return &drv_data->tx.cfg;
+	}
+	if (dir == I2S_DIR_RX && drv_data->rx_configured) {
+		return &drv_data->rx.cfg;
+	}
+
+	return NULL;
+}
+
+static int tdm_nrfx_read(const struct device *dev, void **mem_block, size_t *size)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
+	struct tdm_buf buf;
+	int ret;
+
+	if (!drv_data->rx_configured) {
+		LOG_ERR("Device is not configured");
+		return -EIO;
+	}
+	ret = k_msgq_get(&drv_data->rx_queue, &buf,
+			 (drv_data->state == I2S_STATE_ERROR)
+				 ? K_NO_WAIT
+				 : SYS_TIMEOUT_MS(drv_data->rx.cfg.timeout));
+	if (ret == -ENOMSG) {
+		return -EIO;
+	}
+
+	LOG_DBG("Released RX %p", buf.mem_block);
+
+	if (ret == 0) {
+		(void)dmm_buffer_in_release(drv_cfg->mem_reg, buf.mem_block, buf.size, buf.dmm_buf);
+		*mem_block = buf.mem_block;
+		*size = buf.size;
+	}
+	return ret;
+}
+
+static int tdm_nrfx_write(const struct device *dev, void *mem_block, size_t size)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+	struct tdm_buf buf = {.mem_block = mem_block, .size = size};
+	int ret;
+
+	if (!drv_data->tx_configured) {
+		LOG_ERR("Device is not configured");
+		return -EIO;
+	}
+
+	if (drv_data->state != I2S_STATE_RUNNING && drv_data->state != I2S_STATE_READY) {
+		LOG_ERR("Cannot write in state: %d", drv_data->state);
+		return -EIO;
+	}
+
+	if (size > drv_data->tx.cfg.block_size || size < sizeof(uint32_t)) {
+		LOG_ERR("This device can only write blocks up to %u bytes",
+			drv_data->tx.cfg.block_size);
+		return -EIO;
+	}
+	ret = dmm_buffer_out_prepare(drv_cfg->mem_reg, buf.mem_block, buf.size,
+				     (void **)&buf.dmm_buf);
+	ret = k_msgq_put(&drv_data->tx_queue, &buf, SYS_TIMEOUT_MS(drv_data->tx.cfg.timeout));
+	if (ret < 0) {
+		return ret;
+	}
+
+	/* Check if interrupt wanted to get next TX buffer before current buffer
+	 * was queued. Do not move this check before queuing because doing so
+	 * opens the possibility for a race condition between this function and
+	 * data_handler() that is called in interrupt context.
+	 */
+	if (drv_data->state == I2S_STATE_RUNNING && drv_data->next_tx_buffer_needed) {
+		tdm_buffers_t next = {0};
+
+		if (!get_next_tx_buffer(drv_data, &next)) {
+			/* Log error because this is definitely unexpected.
+			 * Do not return error because the caller is no longer
+			 * responsible for releasing the buffer.
+			 */
+			LOG_ERR("Cannot reacquire queued buffer");
+			return 0;
+		}
+
+		drv_data->next_tx_buffer_needed = false;
+
+		LOG_DBG("Next TX %p", next.p_tx_buffer);
+
+		if (!supply_next_buffers(drv_data, &next)) {
+			LOG_ERR("Cannot supply buffer");
+			return -EIO;
+		}
+	}
+	return 0;
+}
+
+static int start_transfer(struct tdm_drv_data *drv_data)
+{
+	tdm_buffers_t initial_buffers = {0};
+	int ret = 0;
+
+	if (drv_data->active_dir != I2S_DIR_RX && /* -> TX to be started */
+	    !get_next_tx_buffer(drv_data, &initial_buffers)) {
+		LOG_ERR("No TX buffer available");
+		ret = -ENOMEM;
+	} else if (drv_data->active_dir != I2S_DIR_TX && /* -> RX to be started */
+		   !get_next_rx_buffer(drv_data, &initial_buffers)) {
+		/* Failed to allocate next RX buffer */
+		ret = -ENOMEM;
+	} else {
+		/* It is necessary to set buffer size here only for I2S_DIR_RX,
+		 * because only then the get_next_tx_buffer() call in the if
+		 * condition above gets short-circuited.
+		 */
+		if (drv_data->active_dir == I2S_DIR_RX) {
+			initial_buffers.buffer_size =
+				drv_data->rx.cfg.block_size / sizeof(uint32_t);
+		}
+
+		drv_data->last_tx_buffer = initial_buffers.p_tx_buffer;
+		drv_data->last_tx_mem_slab = initial_buffers.p_tx_mem_slab;
+
+		tdm_start(drv_data, &initial_buffers);
+	}
+	if (ret < 0) {
+		tdm_uninit(drv_data);
+		if (drv_data->request_clock) {
+			(void)onoff_release(drv_data->clk_mgr);
+		}
+
+		if (initial_buffers.p_tx_buffer) {
+			struct tdm_buf buf = {.mem_block = (void *)initial_buffers.p_tx_mem_slab,
+					      .dmm_buf = (void *)initial_buffers.p_tx_buffer,
+					      .size = initial_buffers.buffer_size *
+						      sizeof(uint32_t)};
+			free_tx_buffer(drv_data, &buf);
+		}
+		if (initial_buffers.p_rx_buffer) {
+			struct tdm_buf buf = {.mem_block = initial_buffers.p_rx_mem_slab,
+					      .dmm_buf = (void *)initial_buffers.p_rx_buffer,
+					      .size = initial_buffers.buffer_size *
+						      sizeof(uint32_t)};
+			free_rx_buffer(drv_data, &buf);
+		}
+
+		drv_data->state = I2S_STATE_ERROR;
+	}
+	return ret;
+}
+
+static void tdm_init(struct tdm_drv_data *drv_data, nrf_tdm_config_t const *p_config,
+		     tdm_data_handler_t handler)
+{
+	tdm_ctrl_t *ctrl_data = drv_data->drv_cfg->control_data;
+	NRF_TDM_Type *p_reg = drv_data->drv_cfg->p_reg;
+
+	nrf_tdm_configure(p_reg, p_config);
+	nrf_tdm_mck_set(p_reg, p_config->mck_setup != 0);
+
+	ctrl_data->handler = handler;
+
+	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_RXPTRUPD);
+	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_TXPTRUPD);
+	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_STOPPED);
+	NRFX_IRQ_ENABLE(nrfx_get_irq_number(p_reg));
+}
+
+static void clock_started_callback(struct onoff_manager *mgr, struct onoff_client *cli,
+				   uint32_t state, int res)
+{
+	struct tdm_drv_data *drv_data = CONTAINER_OF(cli, struct tdm_drv_data, clk_cli);
+
+	/* The driver state can be set back to READY at this point if the DROP
+	 * command was triggered before the clock has started. Do not start
+	 * the actual transfer in such case.
+	 */
+	if (drv_data->state == I2S_STATE_READY) {
+		tdm_uninit(drv_data);
+		(void)onoff_release(drv_data->clk_mgr);
+	} else {
+		(void)start_transfer(drv_data);
+	}
+}
+
+static int trigger_start(const struct device *dev)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+	int ret;
+	const nrf_tdm_config_t *nrfx_cfg = (drv_data->active_dir == I2S_DIR_TX)
+						   ? &drv_data->tx.nrfx_cfg
+						   : &drv_data->rx.nrfx_cfg;
+
+	tdm_init(drv_data, nrfx_cfg, drv_cfg->data_handler);
+
+	drv_data->state = I2S_STATE_RUNNING;
+
+	nrf_tdm_sck_configure(drv_cfg->p_reg,
+			      drv_cfg->clk_src == ACLK ? NRF_TDM_SRC_ACLK : NRF_TDM_SRC_PCLK32M,
+			      false);
+
+	nrf_tdm_mck_configure(drv_cfg->p_reg,
+			      drv_cfg->clk_src == ACLK ? NRF_TDM_SRC_ACLK : NRF_TDM_SRC_PCLK32M,
+			      false);
+	/* If it is required to use certain HF clock, request it to be running
+	 * first. If not, start the transfer directly.
+	 */
+	if (drv_data->request_clock) {
+		sys_notify_init_callback(&drv_data->clk_cli.notify, clock_started_callback);
+		ret = onoff_request(drv_data->clk_mgr, &drv_data->clk_cli);
+		if (ret < 0) {
+			tdm_uninit(drv_data);
+			drv_data->state = I2S_STATE_READY;
+
+			LOG_ERR("Failed to request clock: %d", ret);
+			return -EIO;
+		}
+	} else {
+		ret = start_transfer(drv_data);
+		if (ret < 0) {
+			return ret;
+		}
+	}
+
+	return 0;
+}
+
+static int tdm_nrfx_trigger(const struct device *dev, enum i2s_dir dir, enum i2s_trigger_cmd cmd)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+	bool configured = false;
+	bool cmd_allowed;
+
+	/* This driver does not use the I2S_STATE_NOT_READY value.
+	 * Instead, if a given stream is not configured, the respective
+	 * flag (tx_configured or rx_configured) is cleared.
+	 */
+	drv_data->tx.nrfx_cfg.channels |= drv_data->rx.nrfx_cfg.channels;
+	drv_data->rx.nrfx_cfg.channels |= drv_data->tx.nrfx_cfg.channels;
+	if (dir == I2S_DIR_BOTH) {
+
+		configured = drv_data->tx_configured && drv_data->rx_configured;
+	} else if (dir == I2S_DIR_TX) {
+		configured = drv_data->tx_configured;
+	} else if (dir == I2S_DIR_RX) {
+		configured = drv_data->rx_configured;
+	}
+
+	if (!configured) {
+		LOG_ERR("Device is not configured");
+		return -EIO;
+	}
+
+	if (dir == I2S_DIR_BOTH && (memcmp(&drv_data->tx.nrfx_cfg, &drv_data->rx.nrfx_cfg,
+					   sizeof(drv_data->rx.nrfx_cfg)) != 0 ||
+				    (drv_data->tx.cfg.block_size != drv_data->rx.cfg.block_size))) {
+		LOG_ERR("TX and RX configurations are different");
+		return -EIO;
+	}
+
+	switch (cmd) {
+	case I2S_TRIGGER_START:
+		cmd_allowed = (drv_data->state == I2S_STATE_READY);
+		break;
+	case I2S_TRIGGER_STOP:
+	case I2S_TRIGGER_DRAIN:
+		cmd_allowed = (drv_data->state == I2S_STATE_RUNNING);
+		break;
+	case I2S_TRIGGER_DROP:
+		cmd_allowed = configured;
+		break;
+	case I2S_TRIGGER_PREPARE:
+		cmd_allowed = (drv_data->state == I2S_STATE_ERROR);
+		break;
+	default:
+		LOG_ERR("Invalid trigger: %d", cmd);
+		return -EINVAL;
+	}
+
+	if (!cmd_allowed) {
+		LOG_ERR("Not allowed");
+		return -EIO;
+	}
+
+	/* For triggers applicable to the RUNNING state (i.e. STOP, DRAIN,
+	 * and DROP), ensure that the command is applied to the streams
+	 * that are currently active (this device cannot e.g. stop only TX
+	 * without stopping RX).
+	 */
+	if (drv_data->state == I2S_STATE_RUNNING && drv_data->active_dir != dir) {
+		LOG_ERR("Inappropriate trigger (%d/%d), active stream(s): %d", cmd, dir,
+			drv_data->active_dir);
+		return -EINVAL;
+	}
+
+	switch (cmd) {
+	case I2S_TRIGGER_START:
+		drv_data->stop = false;
+		drv_data->discard_rx = false;
+		drv_data->active_dir = dir;
+		drv_data->next_tx_buffer_needed = false;
+		return trigger_start(dev);
+
+	case I2S_TRIGGER_STOP:
+		drv_data->state = I2S_STATE_STOPPING;
+		drv_data->stop = true;
+		return 0;
+
+	case I2S_TRIGGER_DRAIN:
+		drv_data->state = I2S_STATE_STOPPING;
+		/* If only RX is active, DRAIN is equivalent to STOP. */
+		drv_data->stop = (drv_data->active_dir == I2S_DIR_RX);
+		return 0;
+
+	case I2S_TRIGGER_DROP:
+		if (drv_data->state != I2S_STATE_READY) {
+			drv_data->discard_rx = true;
+			tdm_stop(drv_cfg->p_reg);
+		}
+		purge_queue(dev, dir);
+		drv_data->state = I2S_STATE_READY;
+		return 0;
+
+	case I2S_TRIGGER_PREPARE:
+		purge_queue(dev, dir);
+		drv_data->state = I2S_STATE_READY;
+		return 0;
+
+	default:
+		LOG_ERR("Invalid trigger: %d", cmd);
+		return -EINVAL;
+	}
+}
+
+#if CONFIG_CLOCK_CONTROL_NRF
+static void init_clock_manager(const struct device *dev)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	clock_control_subsys_t subsys;
+
+#if NRF_CLOCK_HAS_HFCLKAUDIO
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+
+	if (drv_cfg->clk_src == ACLK) {
+		subsys = CLOCK_CONTROL_NRF_SUBSYS_HFAUDIO;
+	} else {
+		subsys = CLOCK_CONTROL_NRF_SUBSYS_HF;
+	}
+#else
+	subsys = CLOCK_CONTROL_NRF_SUBSYS_HF;
+#endif
+
+	drv_data->clk_mgr = z_nrf_clock_control_get_onoff(subsys);
+	__ASSERT_NO_MSG(drv_data->clk_mgr != NULL);
+}
+#endif /* CONFIG_CLOCK_CONTROL_NRF */
+
+static void data_handler(const struct device *dev, const tdm_buffers_t *released, uint32_t status)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+	bool stop_transfer = false;
+	struct tdm_buf buf = {.mem_block = NULL, .dmm_buf = NULL, .size = 0};
+
+	if (released != NULL) {
+		buf.size = released->buffer_size * sizeof(uint32_t);
+	}
+
+	if (status & NRFX_TDM_STATUS_TRANSFER_STOPPED) {
+		if (drv_data->state == I2S_STATE_STOPPING) {
+			drv_data->state = I2S_STATE_READY;
+		}
+		if (drv_data->last_tx_buffer) {
+			/* Usually, these pointers are equal, i.e. the last TX
+			 * buffer that were to be transferred is released by the
+			 * driver after it stops. The last TX buffer pointer is
+			 * then set to NULL here so that the buffer can be freed
+			 * below, just as any other TX buffer released by the
+			 * driver. However, it may happen that the buffer is not
+			 * released this way, for example, when the transfer
+			 * ends with an error because an RX buffer allocation
+			 * fails. In such case, the last TX buffer needs to be
+			 * freed here.
+			 */
+
+			if ((released != NULL) != 0 &&
+			    (drv_data->last_tx_buffer != released->p_tx_buffer)) {
+				buf.dmm_buf = (void *)drv_data->last_tx_buffer;
+				buf.mem_block = (void *)drv_data->last_tx_mem_slab;
+				free_tx_buffer(drv_data, &buf);
+			}
+			drv_data->last_tx_buffer = NULL;
+		}
+		tdm_uninit(drv_data);
+		if (drv_data->request_clock) {
+			(void)onoff_release(drv_data->clk_mgr);
+		}
+	}
+
+	if (released == NULL) {
+		/* This means that buffers for the next part of the transfer
+		 * were not supplied and the previous ones cannot be released
+		 * yet, as pointers to them were latched in the I2S registers.
+		 * It is not an error when the transfer is to be stopped (those
+		 * buffers will be released after the transfer actually stops).
+		 */
+		if (drv_data->state != I2S_STATE_STOPPING) {
+			drv_data->state = I2S_STATE_ERROR;
+		}
+		tdm_stop(drv_cfg->p_reg);
+		return;
+	}
+	if (released->p_rx_buffer) {
+		buf.mem_block = (void *)released->p_rx_mem_slab;
+		buf.dmm_buf = (void *)released->p_rx_buffer;
+		if (drv_data->discard_rx) {
+			free_rx_buffer(drv_data, &buf);
+		} else {
+			int ret = k_msgq_put(&drv_data->rx_queue, &buf, K_NO_WAIT);
+
+			if (ret < 0) {
+				LOG_ERR("No room in RX queue");
+				drv_data->state = I2S_STATE_ERROR;
+				stop_transfer = true;
+
+				free_rx_buffer(drv_data, &buf);
+			} else {
+
+				/* If the TX direction is not active and
+				 * the transfer should be stopped after
+				 * the current block, stop the reception.
+				 */
+				if (drv_data->active_dir == I2S_DIR_RX && drv_data->stop) {
+					drv_data->discard_rx = true;
+					stop_transfer = true;
+				}
+			}
+		}
+	}
+
+	if (released->p_tx_buffer) {
+		buf.mem_block = (void *)released->p_tx_mem_slab;
+		buf.dmm_buf = (void *)released->p_tx_buffer;
+		/* If the last buffer that was to be transferred has just been
+		 * released, it is time to stop the transfer.
+		 */
+		if (released->p_tx_buffer == drv_data->last_tx_buffer) {
+			drv_data->discard_rx = true;
+			stop_transfer = true;
+		} else {
+			free_tx_buffer(drv_data, &buf);
+		}
+	}
+
+	if (stop_transfer) {
+		tdm_stop(drv_cfg->p_reg);
+	} else if (status & NRFX_TDM_STATUS_NEXT_BUFFERS_NEEDED) {
+		tdm_buffers_t next = {0};
+
+		if (drv_data->active_dir != I2S_DIR_RX) { /* -> TX active */
+			if (drv_data->stop) {
+				/* If the stream is to be stopped, don't get
+				 * the next TX buffer from the queue, instead
+				 * supply the one used last time (it won't be
+				 * transferred, the stream will stop right
+				 * before this buffer would be started again).
+				 */
+				next.p_tx_buffer = drv_data->last_tx_buffer;
+				next.p_tx_mem_slab = drv_data->last_tx_mem_slab;
+				next.buffer_size = 1;
+			} else if (get_next_tx_buffer(drv_data, &next)) {
+				/* Next TX buffer successfully retrieved from
+				 * the queue, nothing more to do here.
+				 */
+			} else if (drv_data->state == I2S_STATE_STOPPING) {
+				/* If there are no more TX blocks queued and
+				 * the current state is STOPPING (so the DRAIN
+				 * command was triggered) it is time to finish
+				 * the transfer.
+				 */
+				drv_data->stop = true;
+				/* Supply the same buffer as last time; it will
+				 * not be transferred anyway, as the transfer
+				 * will be stopped earlier.
+				 */
+				next.p_tx_buffer = drv_data->last_tx_buffer;
+				next.p_tx_mem_slab = drv_data->last_tx_mem_slab;
+				next.buffer_size = 1;
+			} else {
+				/* Next TX buffer cannot be supplied now.
+				 * Defer it to when the user writes more data.
+				 */
+				drv_data->next_tx_buffer_needed = true;
+				return;
+			}
+		}
+		(void)supply_next_buffers(drv_data, &next);
+	}
+}
+
+static int data_init(const struct device *dev)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+
+	drv_data->state = I2S_STATE_READY;
+	int err = pinctrl_apply_state(drv_cfg->pcfg, PINCTRL_STATE_DEFAULT);
+
+	if (err < 0) {
+		return err;
+	}
+	drv_data->drv_cfg = drv_cfg;
+	IF_ENABLED(CONFIG_CLOCK_CONTROL_NRF, (init_clock_manager(dev);))
+	return err;
+}
+
+static const struct i2s_driver_api tdm_nrf_drv_api = {
+	.configure = tdm_nrfx_configure,
+	.config_get = tdm_nrfx_config_get,
+	.read = tdm_nrfx_read,
+	.write = tdm_nrfx_write,
+	.trigger = tdm_nrfx_trigger,
+};
+
+#define TDM(idx)         DT_NODELABEL(tdm##idx)
+#define TDM_CLK_SRC(idx) DT_STRING_TOKEN(TDM(idx), clock_source)
+#define PCLK_NODE(idx)   DT_CLOCKS_CTLR(TDM(idx))
+
+#define TDM_NRFX_DEVICE(idx)                                                                       \
+	static tdm_ctrl_t tdm##idx##data;                                                          \
+	static struct tdm_buf tx_msgs##idx[CONFIG_TDM_NRFX_TX_BLOCK_COUNT];                        \
+	static struct tdm_buf rx_msgs##idx[CONFIG_TDM_NRFX_RX_BLOCK_COUNT];                        \
+	static void tdm_##idx##_irq_handler(const struct device *dev)                              \
+	{                                                                                          \
+		tdm_irq_handler(dev);                                                              \
+	}                                                                                          \
+	static void tdm_##idx##data_handler(tdm_buffers_t const *p_released, uint32_t status)      \
+	{                                                                                          \
+		data_handler(DEVICE_DT_GET(TDM(idx)), p_released, status);                         \
+	}                                                                                          \
+	PINCTRL_DT_DEFINE(TDM(idx));                                                               \
+	static const struct tdm_drv_cfg tdm_nrfx_cfg##idx = {                                      \
+		.data_handler = tdm_##idx##data_handler,                                           \
+		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(TDM(idx)),                                       \
+		.clk_src = TDM_CLK_SRC(idx),                                                       \
+		.mck_frequency = DT_PROP_OR(TDM(idx), mck_frequency, 0),                           \
+		.pclk_frequency = DT_PROP(PCLK_NODE(idx), clock_frequency),                        \
+		.p_reg = NRF_TDM##idx,                                                             \
+		.control_data = &tdm##idx##data,                                                   \
+		.mem_reg = DMM_DEV_TO_REG(TDM(idx)),                                               \
+	};                                                                                         \
+	static struct tdm_drv_data tdm_nrfx_data##idx;                                             \
+	static int tdm_nrfx_init##idx(const struct device *dev)                                    \
+	{                                                                                          \
+		IRQ_CONNECT(DT_IRQN(TDM(idx)), DT_IRQ(TDM(idx), priority),                         \
+			    tdm_##idx##_irq_handler, DEVICE_DT_GET(TDM(idx)), 0);                  \
+                                                                                                   \
+		int err = data_init(dev);                                                          \
+		if (err < 0) {                                                                     \
+			return err;                                                                \
+		}                                                                                  \
+		k_msgq_init(&tdm_nrfx_data##idx.tx_queue, (char *)tx_msgs##idx,                    \
+			    sizeof(struct tdm_buf), ARRAY_SIZE(tx_msgs##idx));                     \
+		k_msgq_init(&tdm_nrfx_data##idx.rx_queue, (char *)rx_msgs##idx,                    \
+			    sizeof(struct tdm_buf), ARRAY_SIZE(rx_msgs##idx));                     \
+		return 0;                                                                          \
+	}                                                                                          \
+	BUILD_ASSERT(TDM_CLK_SRC(idx) != ACLK, "Clock source ACLK is currently not supported. ");  \
+	DEVICE_DT_DEFINE(TDM(idx), tdm_nrfx_init##idx, NULL, &tdm_nrfx_data##idx,                  \
+			 &tdm_nrfx_cfg##idx, POST_KERNEL, CONFIG_I2S_INIT_PRIORITY,                \
+			 &tdm_nrf_drv_api);
+
+/* Execute macro f(x) for all instances. */
+#define TDM_FOR_EACH_INSTANCE(f, sep, off_code, ...)                                               \
+	NRFX_FOREACH_PRESENT(TDM, f, sep, off_code, __VA_ARGS__)
+
+#define COND_TDM_NRFX_DEVICE(unused, prefix, i, _)                                                 \
+	IF_ENABLED(CONFIG_HAS_HW_NRF_TDM##prefix##i, (TDM_NRFX_DEVICE(prefix##i);))
+
+TDM_FOR_EACH_INSTANCE(COND_TDM_NRFX_DEVICE, (), ())

From 3c0b18489134cb3a3dc7882e6034d55a73604b3b Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 14 Jan 2025 14:26:06 +0100
Subject: [PATCH 2620/2913] [nrf fromlist] tests: drivers: i2s: Align tests to
 TDM peripheral

Some of nRF54's has TDM peripheral instead of I2S.

Upstream PR #: 82144

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 .../nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml     |  1 +
 .../nrf54l20pdk_nrf54l20_cpuapp.yaml          |  1 +
 tests/drivers/i2s/i2s_api/Kconfig             |  6 ++--
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 31 +++++++++++++++++++
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       | 30 ++++++++++++++++++
 tests/drivers/i2s/i2s_speed/Kconfig           |  6 ++--
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 31 +++++++++++++++++++
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       | 30 ++++++++++++++++++
 8 files changed, 130 insertions(+), 6 deletions(-)
 create mode 100644 tests/drivers/i2s/i2s_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/drivers/i2s/i2s_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
 create mode 100644 tests/drivers/i2s/i2s_speed/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/drivers/i2s/i2s_speed/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
index a64f8cf6398..02acf129ef1 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
@@ -18,6 +18,7 @@ supported:
   - counter
   - gpio
   - i2c
+  - i2s
   - pwm
   - retained_mem
   - spi
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
index d4bc7828822..2f3e9d15fb3 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
@@ -18,6 +18,7 @@ supported:
   - dmic
   - gpio
   - i2c
+  - i2s
   - pwm
   - spi
   - watchdog
diff --git a/tests/drivers/i2s/i2s_api/Kconfig b/tests/drivers/i2s/i2s_api/Kconfig
index 538157f8a79..ff78064206e 100644
--- a/tests/drivers/i2s/i2s_api/Kconfig
+++ b/tests/drivers/i2s/i2s_api/Kconfig
@@ -15,7 +15,7 @@ config I2S_TEST_SEPARATE_DEVICES
 
 config I2S_TEST_USE_I2S_DIR_BOTH
 	bool "Use I2S_DIR_BOTH value to perform RX/TX transfers"
-	default y if DT_HAS_NORDIC_NRF_I2S_ENABLED
+	default y if DT_HAS_NORDIC_NRF_I2S_ENABLED || DT_HAS_NORDIC_NRF_TDM_ENABLED
 	help
 	  Use the I2S_DIR_BOTH enumeration value to trigger commands in test
 	  cases involving both reception and transmission. Use of this option
@@ -24,7 +24,7 @@ config I2S_TEST_USE_I2S_DIR_BOTH
 
 config I2S_TEST_USE_GPIO_LOOPBACK
 	bool "Use GPIO loopback"
-	default y if DT_HAS_NORDIC_NRF_I2S_ENABLED
+	default y if DT_HAS_NORDIC_NRF_I2S_ENABLED || DT_HAS_NORDIC_NRF_TDM_ENABLED
 	help
 	  Use wiring between the data-out and data-in pins for looping back
 	  data. This option is intended to be used for devices that do not
@@ -32,7 +32,7 @@ config I2S_TEST_USE_GPIO_LOOPBACK
 
 config I2S_TEST_ALLOWED_DATA_OFFSET
 	int "Allowed offset in received data"
-	default 2 if DT_HAS_NORDIC_NRF_I2S_ENABLED
+	default 10 if DT_HAS_NORDIC_NRF_I2S_ENABLED || DT_HAS_NORDIC_NRF_TDM_ENABLED
 	default 0
 	help
 	  Maximum allowed offset between sent and received samples. Non-zero
diff --git a/tests/drivers/i2s/i2s_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/i2s/i2s_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..0625be930fa
--- /dev/null
+++ b/tests/drivers/i2s/i2s_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* i2s-node0 is the transmitter/receiver */
+
+/ {
+	aliases {
+		i2s-node0 = &tdm130;
+	};
+};
+
+&pinctrl {
+	tdm130_default_alt: tdm130_default_alt {
+		group1 {
+			psels = <NRF_PSEL(TDM_SCK_M, 1, 3)>,
+				<NRF_PSEL(TDM_FSYNC_M, 1, 6)>,
+				<NRF_PSEL(TDM_SDOUT, 1, 4)>,
+				<NRF_PSEL(TDM_SDIN, 1, 5)>;
+		};
+	};
+};
+
+&tdm130 {
+	status = "okay";
+	pinctrl-0 = <&tdm130_default_alt>;
+	pinctrl-names = "default";
+	memory-regions = <&cpuapp_dma_region>;
+};
diff --git a/tests/drivers/i2s/i2s_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/i2s/i2s_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 00000000000..09a2cb0459c
--- /dev/null
+++ b/tests/drivers/i2s/i2s_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* i2s-node0 is the transmitter/receiver */
+
+/ {
+	aliases {
+		i2s-node0 = &tdm;
+	};
+};
+
+&pinctrl {
+	tdm_default_alt: tdm_default_alt {
+		group1 {
+			psels = <NRF_PSEL(TDM_SCK_M, 1, 3)>,
+				<NRF_PSEL(TDM_FSYNC_M, 1, 6)>,
+				<NRF_PSEL(TDM_SDOUT, 1, 14)>,
+				<NRF_PSEL(TDM_SDIN, 1, 15)>;
+		};
+	};
+};
+
+&tdm {
+	status = "okay";
+	pinctrl-0 = <&tdm_default_alt>;
+	pinctrl-names = "default";
+};
diff --git a/tests/drivers/i2s/i2s_speed/Kconfig b/tests/drivers/i2s/i2s_speed/Kconfig
index 7f9e54efacc..005ab795277 100644
--- a/tests/drivers/i2s/i2s_speed/Kconfig
+++ b/tests/drivers/i2s/i2s_speed/Kconfig
@@ -15,7 +15,7 @@ config I2S_TEST_SEPARATE_DEVICES
 
 config I2S_TEST_USE_I2S_DIR_BOTH
 	bool "Use I2S_DIR_BOTH value to perform RX/TX transfers"
-	default y if DT_HAS_NORDIC_NRF_I2S_ENABLED
+	default y if DT_HAS_NORDIC_NRF_I2S_ENABLED || DT_HAS_NORDIC_NRF_TDM_ENABLED
 	help
 	  Use the I2S_DIR_BOTH enumeration value to trigger commands in test
 	  cases involving both reception and transmission. Use of this option
@@ -24,7 +24,7 @@ config I2S_TEST_USE_I2S_DIR_BOTH
 
 config I2S_TEST_USE_GPIO_LOOPBACK
 	bool "Use GPIO loopback"
-	default y if DT_HAS_NORDIC_NRF_I2S_ENABLED
+	default y if DT_HAS_NORDIC_NRF_I2S_ENABLED || DT_HAS_NORDIC_NRF_TDM_ENABLED
 	help
 	  Use wiring between the data-out and data-in pins for looping back
 	  data. This option is intended to be used for devices that do not
@@ -32,7 +32,7 @@ config I2S_TEST_USE_GPIO_LOOPBACK
 
 config I2S_TEST_ALLOWED_DATA_OFFSET
 	int "Allowed offset in received data"
-	default 2 if DT_HAS_NORDIC_NRF_I2S_ENABLED
+	default 2 if DT_HAS_NORDIC_NRF_I2S_ENABLED || DT_HAS_NORDIC_NRF_TDM_ENABLED
 	default 0
 	help
 	  Maximum allowed offset between sent and received samples. Non-zero
diff --git a/tests/drivers/i2s/i2s_speed/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/i2s/i2s_speed/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..0625be930fa
--- /dev/null
+++ b/tests/drivers/i2s/i2s_speed/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* i2s-node0 is the transmitter/receiver */
+
+/ {
+	aliases {
+		i2s-node0 = &tdm130;
+	};
+};
+
+&pinctrl {
+	tdm130_default_alt: tdm130_default_alt {
+		group1 {
+			psels = <NRF_PSEL(TDM_SCK_M, 1, 3)>,
+				<NRF_PSEL(TDM_FSYNC_M, 1, 6)>,
+				<NRF_PSEL(TDM_SDOUT, 1, 4)>,
+				<NRF_PSEL(TDM_SDIN, 1, 5)>;
+		};
+	};
+};
+
+&tdm130 {
+	status = "okay";
+	pinctrl-0 = <&tdm130_default_alt>;
+	pinctrl-names = "default";
+	memory-regions = <&cpuapp_dma_region>;
+};
diff --git a/tests/drivers/i2s/i2s_speed/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/i2s/i2s_speed/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 00000000000..09a2cb0459c
--- /dev/null
+++ b/tests/drivers/i2s/i2s_speed/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* i2s-node0 is the transmitter/receiver */
+
+/ {
+	aliases {
+		i2s-node0 = &tdm;
+	};
+};
+
+&pinctrl {
+	tdm_default_alt: tdm_default_alt {
+		group1 {
+			psels = <NRF_PSEL(TDM_SCK_M, 1, 3)>,
+				<NRF_PSEL(TDM_FSYNC_M, 1, 6)>,
+				<NRF_PSEL(TDM_SDOUT, 1, 14)>,
+				<NRF_PSEL(TDM_SDIN, 1, 15)>;
+		};
+	};
+};
+
+&tdm {
+	status = "okay";
+	pinctrl-0 = <&tdm_default_alt>;
+	pinctrl-names = "default";
+};

From 6fa629bb966782cbe157de90513073dfcec57267 Mon Sep 17 00:00:00 2001
From: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
Date: Mon, 25 Nov 2024 14:14:40 +0100
Subject: [PATCH 2621/2913] [nrf noup] drivers: pinctrl: Add SDP MSPI pin
 configuration

Configure SDP MSPI pins to switch their control to VPR core

Signed-off-by: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
(cherry picked from commit 2540f7b5b204c54738e32f694bbddf43b35aae28)
---
 drivers/pinctrl/pinctrl_nrf.c                 | 29 +++++++++++++++++++
 .../zephyr/dt-bindings/pinctrl/nrf-pinctrl.h  | 28 ++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 6d9d52cd93b..3f909b3e990 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -112,6 +112,13 @@ static const nrf_gpio_pin_drive_t drive_modes[NRF_DRIVE_COUNT] = {
 #define NRF_PSEL_TDM(reg, line) ((NRF_TDM_Type *)reg)->PSEL.line
 #endif
 
+#if defined(CONFIG_SOC_NRF54L15_CPUAPP)
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller) || defined(CONFIG_MSPI_NRFE)
+#define NRF_PSEL_SDP_MSPI(psel)                                                                    \
+	nrf_gpio_pin_control_select(psel, NRF_GPIO_PIN_SEL_VPR);
+#endif
+#endif
+
 int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			   uintptr_t reg)
 {
@@ -465,6 +472,28 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
 #endif /* defined(NRF_PSEL_TWIS) */
+#if defined(CONFIG_SOC_NRF54L15_CPUAPP)
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller)
+		case NRF_FUN_SDP_MSPI_CS0:
+		case NRF_FUN_SDP_MSPI_CS1:
+		case NRF_FUN_SDP_MSPI_CS2:
+		case NRF_FUN_SDP_MSPI_CS3:
+		case NRF_FUN_SDP_MSPI_CS4:
+		case NRF_FUN_SDP_MSPI_SCK:
+		case NRF_FUN_SDP_MSPI_DQ0:
+		case NRF_FUN_SDP_MSPI_DQ1:
+		case NRF_FUN_SDP_MSPI_DQ2:
+		case NRF_FUN_SDP_MSPI_DQ3:
+		case NRF_FUN_SDP_MSPI_DQ4:
+		case NRF_FUN_SDP_MSPI_DQ5:
+		case NRF_FUN_SDP_MSPI_DQ6:
+		case NRF_FUN_SDP_MSPI_DQ7:
+			NRF_PSEL_SDP_MSPI(psel);
+			dir = NRF_GPIO_PIN_DIR_OUTPUT;
+			input = NRF_GPIO_PIN_INPUT_CONNECT;
+			break;
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller) */
+#endif /* CONFIG_SOC_NRF54L15_CPUAPP */
 		default:
 			return -ENOTSUP;
 		}
diff --git a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
index 9de74061e8d..3f88e45f369 100644
--- a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
@@ -172,6 +172,34 @@
 #define NRF_FUN_GRTC_CLKOUT_FAST 55U
 /** GRTC slow clock output */
 #define NRF_FUN_GRTC_CLKOUT_32K  56U
+/** SDP_MSPI CK */
+#define NRF_FUN_SDP_MSPI_SCK 57U
+/** SDP_MSPI DQ0 */
+#define NRF_FUN_SDP_MSPI_DQ0 58U
+/** SDP_MSPI DQ1 */
+#define NRF_FUN_SDP_MSPI_DQ1 59U
+/** SDP_MSPI DQ2 */
+#define NRF_FUN_SDP_MSPI_DQ2 60U
+/** SDP_MSPI DQ3 */
+#define NRF_FUN_SDP_MSPI_DQ3 61U
+/** SDP_MSPI DQ4 */
+#define NRF_FUN_SDP_MSPI_DQ4 62U
+/** SDP_MSPI DQ5 */
+#define NRF_FUN_SDP_MSPI_DQ5 63U
+/** SDP_MSPI DQ6 */
+#define NRF_FUN_SDP_MSPI_DQ6 64U
+/** SDP_MSPI DQ7 */
+#define NRF_FUN_SDP_MSPI_DQ7 65U
+/** SDP_MSPI CS0 */
+#define NRF_FUN_SDP_MSPI_CS0 66U
+/** SDP_MSPI CS1 */
+#define NRF_FUN_SDP_MSPI_CS1 67U
+/** SDP_MSPI CS2 */
+#define NRF_FUN_SDP_MSPI_CS2 68U
+/** SDP_MSPI CS3 */
+#define NRF_FUN_SDP_MSPI_CS3 69U
+/** SDP_MSPI CS4 */
+#define NRF_FUN_SDP_MSPI_CS4 70U
 /** TDM SCK in master mode */
 #define NRF_FUN_TDM_SCK_M        71U
 /** TDM SCK in slave mode */

From 16f9163acc38fe70bfe92614b1acfbfe09ce34fc Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Sun, 12 Jan 2025 20:18:56 +0100
Subject: [PATCH 2622/2913] [nrf fromtree] scripts: runners: nrfutil: Switch to
 command-line args instead of JSON

Instead of pre-generating the JSON batch to then execute it, use
command-line arguments and --x-append-batch to generate the JSON file
tht will then be passed to x-execute-batch.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit 6e9e8391953d8dcf606824c43c00077750581b11)
---
 scripts/west_commands/runners/nrf_common.py | 120 ++++++++++----------
 scripts/west_commands/runners/nrfjprog.py   |  30 ++---
 scripts/west_commands/runners/nrfutil.py    |  41 +++++--
 scripts/west_commands/tests/test_nrf.py     |  92 +++++++--------
 4 files changed, 151 insertions(+), 132 deletions(-)

diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index 1593f98828e..d8a17702369 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -32,20 +32,20 @@
 ErrVerify = 25
 
 UICR_RANGES = {
-    'NRF53_FAMILY': {
-        'NRFDL_DEVICE_CORE_APPLICATION': (0x00FF8000, 0x00FF8800),
-        'NRFDL_DEVICE_CORE_NETWORK': (0x01FF8000, 0x01FF8800),
+    'nrf53': {
+        'Application': (0x00FF8000, 0x00FF8800),
+        'Network': (0x01FF8000, 0x01FF8800),
     },
-    'NRF54H_FAMILY': {
-        'NRFDL_DEVICE_CORE_APPLICATION': (0x0FFF8000, 0x0FFF8800),
-        'NRFDL_DEVICE_CORE_NETWORK': (0x0FFFA000, 0x0FFFA800),
+    'nrf54h': {
+        'Application': (0x0FFF8000, 0x0FFF8800),
+        'Network': (0x0FFFA000, 0x0FFFA800),
     },
-    'NRF91_FAMILY': {
-        'NRFDL_DEVICE_CORE_APPLICATION': (0x00FF8000, 0x00FF8800),
+    'nrf91': {
+        'Application': (0x00FF8000, 0x00FF8800),
     },
-    'NRF92_FAMILY': {
-        'NRFDL_DEVICE_CORE_APPLICATION': (0x0FFF8000, 0x0FFF8800),
-        'NRFDL_DEVICE_CORE_NETWORK': (0x0FFFA000, 0x0FFFA800),
+    'nrf92': {
+        'Application': (0x0FFF8000, 0x0FFF8800),
+        'Network': (0x0FFFA000, 0x0FFFA800),
     },
 }
 
@@ -79,9 +79,8 @@ def __init__(self, cfg, family, softreset, dev_id, erase=False,
                  reset=True, tool_opt=None, force=False, recover=False):
         super().__init__(cfg)
         self.hex_ = cfg.hex_file
-        if family and not family.endswith('_FAMILY'):
-            family = f'{family}_FAMILY'
-        self.family = family
+        # The old --nrf-family options takes upper-case family names
+        self.family = family.lower() if family else None
         self.softreset = softreset
         self.dev_id = dev_id
         self.erase = bool(erase)
@@ -214,19 +213,19 @@ def ensure_family(self):
             return
 
         if self.build_conf.getboolean('CONFIG_SOC_SERIES_NRF51X'):
-            self.family = 'NRF51_FAMILY'
+            self.family = 'nrf51'
         elif self.build_conf.getboolean('CONFIG_SOC_SERIES_NRF52X'):
-            self.family = 'NRF52_FAMILY'
+            self.family = 'nrf52'
         elif self.build_conf.getboolean('CONFIG_SOC_SERIES_NRF53X'):
-            self.family = 'NRF53_FAMILY'
+            self.family = 'nrf53'
         elif self.build_conf.getboolean('CONFIG_SOC_SERIES_NRF54LX'):
-            self.family = 'NRF54L_FAMILY'
+            self.family = 'nrf54l'
         elif self.build_conf.getboolean('CONFIG_SOC_SERIES_NRF54HX'):
-            self.family = 'NRF54H_FAMILY'
+            self.family = 'nrf54h'
         elif self.build_conf.getboolean('CONFIG_SOC_SERIES_NRF91X'):
-            self.family = 'NRF91_FAMILY'
+            self.family = 'nrf91'
         elif self.build_conf.getboolean('CONFIG_SOC_SERIES_NRF92X'):
-            self.family = 'NRF92_FAMILY'
+            self.family = 'nrf92'
         else:
             raise RuntimeError(f'unknown nRF; update {__file__}')
 
@@ -251,7 +250,7 @@ def flush(self, force=False):
             self.flush_ops(force=force)
         except subprocess.CalledProcessError as cpe:
             if cpe.returncode == ErrNotAvailableBecauseProtection:
-                if self.family == 'NRF53_FAMILY':
+                if self.family == 'nrf53':
                     family_help = (
                         '  Note: your target is an nRF53; all flash memory '
                         'for both the network and application cores will be '
@@ -278,7 +277,7 @@ def flush(self, force=False):
 
 
     def recover_target(self):
-        if self.family in ('NRF53_FAMILY', 'NRF54H_FAMILY', 'NRF92_FAMILY'):
+        if self.family in ('nrf53', 'nrf54h', 'nrf92'):
             self.logger.info(
                 'Recovering and erasing flash memory for both the network '
                 'and application cores.')
@@ -291,8 +290,8 @@ def recover_target(self):
         # keeps the debug access port open, recovering the network core last
         # would result in that small image being deleted from the app core.
         # In the case of the 54H, the order is indifferent.
-        if self.family in ('NRF53_FAMILY', 'NRF54H_FAMILY', 'NRF92_FAMILY'):
-            self.exec_op('recover', core='NRFDL_DEVICE_CORE_NETWORK')
+        if self.family in ('nrf53', 'nrf54h', 'nrf92'):
+            self.exec_op('recover', core='Network')
 
         self.exec_op('recover')
 
@@ -303,7 +302,7 @@ def program_hex(self):
         # What type of erase/core arguments should we pass to the tool?
         core = None
 
-        if self.family in ('NRF54H_FAMILY', 'NRF92_FAMILY'):
+        if self.family in ('nrf54h', 'nrf92'):
             erase_arg = 'ERASE_NONE'
 
             cpuapp = (
@@ -317,9 +316,9 @@ def program_hex(self):
             generated_uicr = self.build_conf.getboolean('CONFIG_NRF_REGTOOL_GENERATE_UICR')
 
             if cpuapp:
-                core = 'NRFDL_DEVICE_CORE_APPLICATION'
+                core = 'Application'
             elif cpurad:
-                core = 'NRFDL_DEVICE_CORE_NETWORK'
+                core = 'Network'
 
             if generated_uicr and not self.hex_get_uicrs().get(core):
                 raise RuntimeError(
@@ -329,8 +328,8 @@ def program_hex(self):
                 )
 
             if self.erase:
-                self.exec_op('erase', core='NRFDL_DEVICE_CORE_APPLICATION')
-                self.exec_op('erase', core='NRFDL_DEVICE_CORE_NETWORK')
+                self.exec_op('erase', core='Application')
+                self.exec_op('erase', core='Network')
 
             # Manage SUIT artifacts.
             # This logic should be executed only once per build.
@@ -354,7 +353,7 @@ def program_hex(self):
                             'ERASE_NONE',
                             None,
                             defer=True,
-                            core='NRFDL_DEVICE_CORE_APPLICATION',
+                            core='Application',
                         )
                     if os.path.exists(rad_mpi_hex_file):
                         self.op_program(
@@ -362,7 +361,7 @@ def program_hex(self):
                             'ERASE_NONE',
                             None,
                             defer=True,
-                            core='NRFDL_DEVICE_CORE_NETWORK',
+                            core='Network',
                         )
 
                 # Handle SUIT root manifest if application manifests are not used.
@@ -378,41 +377,38 @@ def program_hex(self):
                             'ERASE_NONE',
                             None,
                             defer=True,
-                            core='NRFDL_DEVICE_CORE_APPLICATION',
+                            core='Application',
                         )
 
             if not self.erase and generated_uicr:
                 self.exec_op('erase', core=core, option={'chip_erase_mode': 'ERASE_UICR',
-                                                         'qspi_erase_mode': 'ERASE_NONE'})
+                                                         'ext_mem_erase_mode': 'ERASE_NONE'})
         else:
             if self.erase:
                 erase_arg = 'ERASE_ALL'
             else:
-                if self.family == 'NRF52_FAMILY':
-                    erase_arg = 'ERASE_PAGES_INCLUDING_UICR'
-                else:
-                    erase_arg = 'ERASE_PAGES'
+                erase_arg = 'ERASE_RANGES_TOUCHED_BY_FIRMWARE'
 
         xip_ranges = {
-            'NRF52_FAMILY': (0x12000000, 0x19FFFFFF),
-            'NRF53_FAMILY': (0x10000000, 0x1FFFFFFF),
+            'nrf52': (0x12000000, 0x19FFFFFF),
+            'nrf53': (0x10000000, 0x1FFFFFFF),
         }
-        qspi_erase_opt = None
+        ext_mem_erase_opt = None
         if self.family in xip_ranges:
             xip_start, xip_end = xip_ranges[self.family]
             if self.hex_refers_region(xip_start, xip_end):
-                qspi_erase_opt = 'ERASE_ALL'
+                ext_mem_erase_opt = 'ERASE_ALL'
 
         # What tool commands do we need to flash this target?
-        if self.family == 'NRF53_FAMILY':
+        if self.family == 'nrf53':
             # nRF53 requires special treatment due to the extra coprocessor.
-            self.program_hex_nrf53(erase_arg, qspi_erase_opt)
+            self.program_hex_nrf53(erase_arg, ext_mem_erase_opt)
         else:
-            self.op_program(self.hex_, erase_arg, qspi_erase_opt, defer=True, core=core)
+            self.op_program(self.hex_, erase_arg, ext_mem_erase_opt, defer=True, core=core)
 
         self.flush(force=False)
 
-    def program_hex_nrf53(self, erase_arg, qspi_erase_opt):
+    def program_hex_nrf53(self, erase_arg, ext_mem_erase_opt):
         # program_hex() helper for nRF53.
 
         # *********************** NOTE *******************************
@@ -442,8 +438,8 @@ def program_hex_nrf53(self, erase_arg, qspi_erase_opt):
         # If there is nothing in the hex file for the network core,
         # only the application core is programmed.
         if not self.hex_refers_region(net_flash_start, net_flash_end):
-            self.op_program(self.hex_, erase_arg, qspi_erase_opt, defer=True,
-                            core='NRFDL_DEVICE_CORE_APPLICATION')
+            self.op_program(self.hex_, erase_arg, ext_mem_erase_opt, defer=True,
+                            core='Application')
         # If there is some content that addresses a region beyond the network
         # core flash range, two hex files are generated and the two cores
         # are programmed one by one.
@@ -473,22 +469,22 @@ def program_hex_nrf53(self, erase_arg, qspi_erase_opt):
             app_hex.write_hex_file(app_hex_file)
 
             self.op_program(net_hex_file, erase_arg, None, defer=True,
-                            core='NRFDL_DEVICE_CORE_NETWORK')
-            self.op_program(app_hex_file, erase_arg, qspi_erase_opt, defer=True,
-                            core='NRFDL_DEVICE_CORE_APPLICATION')
+                            core='Network')
+            self.op_program(app_hex_file, erase_arg, ext_mem_erase_opt, defer=True,
+                            core='Application')
         # Otherwise, only the network core is programmed.
         else:
             self.op_program(self.hex_, erase_arg, None, defer=True,
-                            core='NRFDL_DEVICE_CORE_NETWORK')
+                            core='Network')
 
     def reset_target(self):
-        if self.family == 'NRF52_FAMILY' and not self.softreset:
+        if self.family == 'nrf52' and not self.softreset:
             self.exec_op('pinreset-enable')
 
         if self.softreset:
-            self.exec_op('reset', option="RESET_SYSTEM")
+            self.exec_op('reset', kind="RESET_SYSTEM")
         else:
-            self.exec_op('reset', option="RESET_PIN")
+            self.exec_op('reset', kind="RESET_PIN")
 
     @abc.abstractmethod
     def do_require(self):
@@ -506,15 +502,15 @@ def _check_suit_starter(self, op):
 
         return file
 
-    def op_program(self, hex_file, erase, qspi_erase, defer=False, core=None):
-        args = self._op_program(hex_file, erase, qspi_erase)
+    def op_program(self, hex_file, erase, ext_mem_erase, defer=False, core=None):
+        args = self._op_program(hex_file, erase, ext_mem_erase)
         self.exec_op('program', defer, core, **args)
 
-    def _op_program(self, hex_file, erase, qspi_erase):
+    def _op_program(self, hex_file, erase, ext_mem_erase):
         args = {'firmware': {'file': hex_file},
-                'chip_erase_mode': erase, 'verify': 'VERIFY_READ'}
-        if qspi_erase:
-            args['qspi_erase_mode'] = qspi_erase
+                'options': {'chip_erase_mode': erase, 'verify': 'VERIFY_READ'}}
+        if ext_mem_erase:
+            args['options']['ext_mem_erase_mode'] = ext_mem_erase
 
         return args
 
@@ -533,7 +529,7 @@ def _exec_op(op, defer=False, core=None, **kwargs):
 
         _op = _exec_op(op, defer, core, **kwargs)
         # Check if the suit manifest starter needs programming
-        if self.suit_starter and self.family == 'NRF54H_FAMILY':
+        if self.suit_starter and self.family == 'nrf54h':
             file = self._check_suit_starter(_op)
             if file:
                 args = self._op_program(file, 'ERASE_NONE', None)
diff --git a/scripts/west_commands/runners/nrfjprog.py b/scripts/west_commands/runners/nrfjprog.py
index c4e06efcd88..4268b68794e 100644
--- a/scripts/west_commands/runners/nrfjprog.py
+++ b/scripts/west_commands/runners/nrfjprog.py
@@ -58,11 +58,11 @@ def do_exec_op(self, op, force=False):
         self.logger.debug(f'Executing op: {op}')
         # Translate the op
 
-        families = {'NRF51_FAMILY': 'NRF51', 'NRF52_FAMILY': 'NRF52',
-                    'NRF53_FAMILY': 'NRF53', 'NRF54L_FAMILY': 'NRF54L',
-                    'NRF91_FAMILY': 'NRF91'}
-        cores = {'NRFDL_DEVICE_CORE_APPLICATION': 'CP_APPLICATION',
-                 'NRFDL_DEVICE_CORE_NETWORK': 'CP_NETWORK'}
+        families = {'nrf51': 'NRF51', 'nrf52': 'NRF52',
+                    'nrf53': 'NRF53', 'nrf54l': 'NRF54L',
+                    'nrf91': 'NRF91'}
+        cores = {'Application': 'CP_APPLICATION',
+                 'Network': 'CP_NETWORK'}
 
         core_opt = ['--coprocessor', cores[op['core']]] \
                    if op.get('core') else []
@@ -76,22 +76,24 @@ def do_exec_op(self, op, force=False):
         elif op_type == 'program':
             cmd.append('--program')
             cmd.append(_op['firmware']['file'])
-            erase = _op['chip_erase_mode']
+            opts = _op['options']
+            erase = opts['chip_erase_mode']
             if erase == 'ERASE_ALL':
                 cmd.append('--chiperase')
-            elif erase == 'ERASE_PAGES':
-                cmd.append('--sectorerase')
-            elif erase == 'ERASE_PAGES_INCLUDING_UICR':
-                cmd.append('--sectoranduicrerase')
+            elif erase == 'ERASE_RANGES_TOUCHED_BY_FIRMWARE':
+                if self.family == 'nrf52':
+                    cmd.append('--sectoranduicrerase')
+                else:
+                    cmd.append('--sectorerase')
             elif erase == 'NO_ERASE':
                 pass
             else:
                 raise RuntimeError(f'Invalid erase mode: {erase}')
 
-            if _op.get('qspi_erase_mode'):
+            if opts.get('ext_mem_erase_mode'):
                 # In the future there might be multiple QSPI erase modes
                 cmd.append('--qspisectorerase')
-            if _op.get('verify'):
+            if opts.get('verify'):
                 # In the future there might be multiple verify modes
                 cmd.append('--verify')
             if self.qspi_ini:
@@ -100,9 +102,9 @@ def do_exec_op(self, op, force=False):
         elif op_type == 'recover':
             cmd.append('--recover')
         elif op_type == 'reset':
-            if _op['option'] == 'RESET_SYSTEM':
+            if _op['kind'] == 'RESET_SYSTEM':
                 cmd.append('--reset')
-            if _op['option'] == 'RESET_PIN':
+            if _op['kind'] == 'RESET_PIN':
                 cmd.append('--pinreset')
         elif op_type == 'erasepage':
             cmd.append('--erasepage')
diff --git a/scripts/west_commands/runners/nrfutil.py b/scripts/west_commands/runners/nrfutil.py
index ced68d2e952..9bab2accb4a 100644
--- a/scripts/west_commands/runners/nrfutil.py
+++ b/scripts/west_commands/runners/nrfutil.py
@@ -5,7 +5,6 @@
 '''Runner for flashing with nrfutil.'''
 
 import json
-import os
 import subprocess
 import sys
 from pathlib import Path
@@ -102,17 +101,37 @@ def _insert_op(self, op):
         self._op_id += 1
         self._ops.append(op)
 
-    def _exec_batch(self):
-        # prepare the dictionary and convert to JSON
-        batch = json.dumps({'family': f'{self.family}',
-                            'operations': [op for op in self._ops]},
-                            indent=4) + '\n'
-
-        hex_dir = Path(self.hex_).parent
-        json_file = os.fspath(hex_dir / 'generated_nrfutil_batch.json')
+    def _append_batch(self, op, json_file):
+        _op = op['operation']
+        op_type = _op['type']
+
+        cmd = [f'{op_type}']
+
+        if op_type == 'program':
+            cmd += ['--firmware', _op['firmware']['file']]
+            opts = _op['options']
+            # populate the options
+            cmd.append('--options')
+            cli_opts = f"chip_erase_mode={opts['chip_erase_mode']}"
+            if opts.get('ext_mem_erase_mode'):
+                cli_opts += f",ext_mem_erase_mode={opts['ext_mem_erase_mode']}"
+            if opts.get('verify'):
+                cli_opts += f",verify={opts['verify']}"
+            cmd.append(cli_opts)
+        elif op_type == 'reset':
+            cmd += ['--reset-kind', _op['kind']]
+
+        cmd += ['--core', op['core']] if op.get('core') else []
+        cmd += ['--x-family', f'{self.family}']
+        cmd += ['--x-append-batch', f'{json_file}']
+        self._exec(cmd)
 
-        with open(json_file, "w") as f:
-            f.write(batch)
+    def _exec_batch(self):
+        # Use x-append-batch to get the JSON from nrfutil itself
+        json_file = Path(self.hex_).parent / 'generated_nrfutil_batch.json'
+        json_file.unlink(missing_ok=True)
+        for op in self._ops:
+            self._append_batch(op, json_file)
 
         # reset first in case an exception is thrown
         self._ops = []
diff --git a/scripts/west_commands/tests/test_nrf.py b/scripts/west_commands/tests/test_nrf.py
index d3f429ef775..907756d2e0c 100644
--- a/scripts/west_commands/tests/test_nrf.py
+++ b/scripts/west_commands/tests/test_nrf.py
@@ -83,45 +83,45 @@ class TC(typing.NamedTuple):    # 'TestCase'
     # NRF51
     #
     #  family          CP    recov  soft   snr    erase  tool_opt
-    TC('NRF51_FAMILY', None, False, False, False, False, False):
+    TC('nrf51', None, False, False, False, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF51',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF51', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF51_FAMILY', None, False, False, False, True, False):
+    TC('nrf51', None, False, False, False, True, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF51',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF51', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF51_FAMILY', None, False, False, True, False, False):
+    TC('nrf51', None, False, False, True, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF51',
       '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF51', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
-    TC('NRF51_FAMILY', None, False, True, False, False, False):
+    TC('nrf51', None, False, True, False, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF51',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF51', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF51_FAMILY', None, True, False, False, False, False):
+    TC('nrf51', None, True, False, False, False, False):
     ((['nrfjprog', '--recover', '-f', 'NRF51', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF51',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF51', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF51_FAMILY', None, True, True, True, True, False):
+    TC('nrf51', None, True, True, True, True, False):
     ((['nrfjprog', '--recover', '-f', 'NRF51', '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF51',
       '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF51', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
-    TC('NRF51_FAMILY', None, True, True, True, True, True):
+    TC('nrf51', None, True, True, True, True, True):
     ((['nrfjprog', '--recover', '-f', 'NRF51', '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
      ['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF51',
       '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
@@ -132,34 +132,34 @@ class TC(typing.NamedTuple):    # 'TestCase'
     # NRF52
     #
     #  family          CP    recov  soft   snr    erase  tool_opt
-    TC('NRF52_FAMILY', None, False, False, False, False, False):
+    TC('nrf52', None, False, False, False, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectoranduicrerase',
       '--verify', '-f', 'NRF52', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinresetenable', '-f', 'NRF52', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF52', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF52_FAMILY', None, False, False, False, True, False):
+    TC('nrf52', None, False, False, False, True, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF52',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinresetenable', '-f', 'NRF52', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF52', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF52_FAMILY', None, False, False, True, False, False):
+    TC('nrf52', None, False, False, True, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectoranduicrerase',
       '--verify', '-f', 'NRF52', '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--pinresetenable', '-f', 'NRF52', '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF52', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
-    TC('NRF52_FAMILY', None, False, True, False, False, False):
+    TC('nrf52', None, False, True, False, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectoranduicrerase',
       '--verify', '-f', 'NRF52', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF52', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF52_FAMILY', None, True, False, False, False, False):
+    TC('nrf52', None, True, False, False, False, False):
     ((['nrfjprog', '--recover', '-f', 'NRF52', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--program', RC_KERNEL_HEX, '--sectoranduicrerase',
       '--verify', '-f', 'NRF52', '--snr', TEST_DEF_SNR],
@@ -167,14 +167,14 @@ class TC(typing.NamedTuple):    # 'TestCase'
      ['nrfjprog', '--pinreset', '-f', 'NRF52', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF52_FAMILY', None, True, True, True, True, False):
+    TC('nrf52', None, True, True, True, True, False):
     ((['nrfjprog', '--recover', '-f', 'NRF52', '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF52',
       '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF52', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
-    TC('NRF52_FAMILY', None, True, True, True, True, True):
+    TC('nrf52', None, True, True, True, True, True):
     ((['nrfjprog', '--recover', '-f', 'NRF52', '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
      ['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF52',
       '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
@@ -185,31 +185,31 @@ class TC(typing.NamedTuple):    # 'TestCase'
     # NRF53 APP only
     #
     #  family          CP     recov  soft   snr    erase  tool_opt
-    TC('NRF53_FAMILY', 'APP', False, False, False, False, False):
+    TC('nrf53', 'APP', False, False, False, False, False):
     ((['nrfjprog', '--program', NRF5340_APP_ONLY_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_APPLICATION', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF53_FAMILY', 'APP', False, False, False, True, False):
+    TC('nrf53', 'APP', False, False, False, True, False):
     ((['nrfjprog', '--program', NRF5340_APP_ONLY_HEX, '--chiperase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_APPLICATION', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF53_FAMILY', 'APP', False, False, True, False, False):
+    TC('nrf53', 'APP', False, False, True, False, False):
     ((['nrfjprog', '--program', NRF5340_APP_ONLY_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_APPLICATION', '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
-    TC('NRF53_FAMILY', 'APP', False, True, False, False, False):
+    TC('nrf53', 'APP', False, True, False, False, False):
     ((['nrfjprog', '--program', NRF5340_APP_ONLY_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_APPLICATION', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF53_FAMILY', 'APP', True, False, False, False, False):
+    TC('nrf53', 'APP', True, False, False, False, False):
     ((['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_DEF_SNR],
@@ -218,7 +218,7 @@ class TC(typing.NamedTuple):    # 'TestCase'
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF53_FAMILY', 'APP', True, True, True, True, False):
+    TC('nrf53', 'APP', True, True, True, True, False):
     ((['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
       '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_OVR_SNR],
@@ -231,31 +231,31 @@ class TC(typing.NamedTuple):    # 'TestCase'
     # NRF53 NET only
     #
     #  family          CP     recov  soft   snr    erase  tool_opt
-    TC('NRF53_FAMILY', 'NET', False, False, False, False, False):
+    TC('nrf53', 'NET', False, False, False, False, False):
     ((['nrfjprog', '--program', NRF5340_NET_ONLY_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF53_FAMILY', 'NET', False, False, False, True, False):
+    TC('nrf53', 'NET', False, False, False, True, False):
     ((['nrfjprog', '--program', NRF5340_NET_ONLY_HEX, '--chiperase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF53_FAMILY', 'NET', False, False, True, False, False):
+    TC('nrf53', 'NET', False, False, True, False, False):
     ((['nrfjprog', '--program', NRF5340_NET_ONLY_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK', '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
-    TC('NRF53_FAMILY', 'NET', False, True, False, False, False):
+    TC('nrf53', 'NET', False, True, False, False, False):
     ((['nrfjprog', '--program', NRF5340_NET_ONLY_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF53_FAMILY', 'NET', True, False, False, False, False):
+    TC('nrf53', 'NET', True, False, False, False, False):
     ((['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_DEF_SNR],
@@ -264,7 +264,7 @@ class TC(typing.NamedTuple):    # 'TestCase'
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF53_FAMILY', 'NET', True, True, True, True, False):
+    TC('nrf53', 'NET', True, True, True, True, False):
     ((['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
       '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_OVR_SNR],
@@ -277,7 +277,7 @@ class TC(typing.NamedTuple):    # 'TestCase'
     # NRF53 APP+NET
     #
     #  family          CP         recov  soft   snr    erase  tool_opt
-    TC('NRF53_FAMILY', 'APP+NET', False, False, False, False, False):
+    TC('nrf53', 'APP+NET', False, False, False, False, False):
     ((lambda tmpdir, infile: \
         (['nrfjprog',
           '--program',
@@ -292,7 +292,7 @@ class TC(typing.NamedTuple):    # 'TestCase'
          ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR])),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF53_FAMILY', 'APP+NET', False, False, False, True, False):
+    TC('nrf53', 'APP+NET', False, False, False, True, False):
     ((lambda tmpdir, infile: \
         (['nrfjprog',
           '--program',
@@ -307,7 +307,7 @@ class TC(typing.NamedTuple):    # 'TestCase'
          ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR])),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF53_FAMILY', 'APP+NET', False, False, True, False, False):
+    TC('nrf53', 'APP+NET', False, False, True, False, False):
     ((lambda tmpdir, infile: \
         (['nrfjprog',
           '--program',
@@ -322,7 +322,7 @@ class TC(typing.NamedTuple):    # 'TestCase'
          ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_OVR_SNR])),
      (TEST_OVR_SNR, None)),
 
-    TC('NRF53_FAMILY', 'APP+NET', False, True, False, False, False):
+    TC('nrf53', 'APP+NET', False, True, False, False, False):
     ((lambda tmpdir, infile: \
         (['nrfjprog',
           '--program',
@@ -337,7 +337,7 @@ class TC(typing.NamedTuple):    # 'TestCase'
          ['nrfjprog', '--reset', '-f', 'NRF53', '--snr', TEST_DEF_SNR])),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF53_FAMILY', 'APP+NET', True, False, False, False, False):
+    TC('nrf53', 'APP+NET', True, False, False, False, False):
     ((lambda tmpdir, infile: \
         (['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
           '--snr', TEST_DEF_SNR],
@@ -355,7 +355,7 @@ class TC(typing.NamedTuple):    # 'TestCase'
          ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR])),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF53_FAMILY', 'APP+NET', True, True, True, True, False):
+    TC('nrf53', 'APP+NET', True, True, True, True, False):
     ((lambda tmpdir, infile: \
         (['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
           '--snr', TEST_OVR_SNR],
@@ -373,7 +373,7 @@ class TC(typing.NamedTuple):    # 'TestCase'
          ['nrfjprog', '--reset', '-f', 'NRF53', '--snr', TEST_OVR_SNR])),
      (TEST_OVR_SNR, None)),
 
-    TC('NRF53_FAMILY', 'APP+NET', True, True, True, True, True):
+    TC('nrf53', 'APP+NET', True, True, True, True, True):
     ((lambda tmpdir, infile: \
         (['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
           '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
@@ -396,45 +396,45 @@ class TC(typing.NamedTuple):    # 'TestCase'
     # NRF91
     #
     #  family          CP    recov  soft   snr    erase  tool_opt
-    TC('NRF91_FAMILY', None, False, False, False, False, False):
+    TC('nrf91', None, False, False, False, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF91',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF91', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF91_FAMILY', None, False, False, False, True, False):
+    TC('nrf91', None, False, False, False, True, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF91',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF91', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF91_FAMILY', None, False, False, True, False, False):
+    TC('nrf91', None, False, False, True, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF91',
       '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF91', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
-    TC('NRF91_FAMILY', None, False, True, False, False, False):
+    TC('nrf91', None, False, True, False, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF91',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF91', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF91_FAMILY', None, True, False, False, False, False):
+    TC('nrf91', None, True, False, False, False, False):
     ((['nrfjprog', '--recover', '-f', 'NRF91', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF91',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF91', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('NRF91_FAMILY', None, True, True, True, True, False):
+    TC('nrf91', None, True, True, True, True, False):
     ((['nrfjprog', '--recover', '-f', 'NRF91', '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF91',
       '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF91', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
-    TC('NRF91_FAMILY', None, True, True, True, True, True):
+    TC('nrf91', None, True, True, True, True, True):
     ((['nrfjprog', '--recover', '-f', 'NRF91', '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
      ['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF91',
       '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
@@ -491,11 +491,11 @@ def fix_up_runner_config(test_case, runner_config, tmpdir):
     dotconfig = os.fspath(zephyr / '.config')
     with open(dotconfig, 'w') as f:
         f.write(f'''
-CONFIG_SOC_SERIES_{test_case.family[:5]}X=y
+CONFIG_SOC_SERIES_{test_case.family.upper()}X=y
 ''')
     to_replace['build_dir'] = tmpdir
 
-    if test_case.family != 'NRF53_FAMILY':
+    if test_case.family != 'nrf53':
         return runner_config._replace(**to_replace)
 
     if test_case.coprocessor == 'APP':
@@ -517,10 +517,12 @@ def check_expected(tool, test_case, check_fn, get_snr, tmpdir, runner_config):
 
     expected = EXPECTED_RESULTS[test_case][EXPECTED_MAP[tool]]
     if tool == 'nrfutil':
-        assert len(check_fn.call_args_list) == 1
-        assert len(check_fn.call_args_list[0].args) == 1
+        # Skip the preparation calls for now
+        assert len(check_fn.call_args_list) >= 1
+        xi = len(check_fn.call_args_list) - 1
+        assert len(check_fn.call_args_list[xi].args) == 1
         # Extract filename
-        nrfutil_args = check_fn.call_args_list[0].args[0]
+        nrfutil_args = check_fn.call_args_list[xi].args[0]
         tmpfile = nrfutil_args[nrfutil_args.index('--batch-path') + 1]
         cmds = (['nrfutil', '--json', 'device', 'x-execute-batch', '--batch-path',
                  tmpfile, '--serial-number', expected[0]],)

From 9278113ae5839732a37cf0c9a922b8cccfd55dd8 Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Wed, 29 Jan 2025 10:30:21 +0100
Subject: [PATCH 2623/2913] [nrf fromtree] scripts: runners: nrf: Fix a missing
 indirection

In commit 6e9e8391953d8dcf606824c43c00077750581b11, an indirection via
the new `options` dictionary was missed in the SUIT handling.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit 51661efae633433adc83846d06275f659b1e3cdd)
---
 scripts/west_commands/runners/nrf_common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index d8a17702369..0be270d351e 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -494,7 +494,7 @@ def _check_suit_starter(self, op):
         op = op['operation']
         if op['type'] not in ('erase', 'recover', 'program'):
             return None
-        if op['type'] == 'program' and op['chip_erase_mode'] != "ERASE_UICR":
+        if op['type'] == 'program' and op['options']['chip_erase_mode'] != "ERASE_UICR":
             return None
 
         file = _get_suit_starter()

From ae8acbd2bddf03630b5b9a01e0fc387e4a3e95f7 Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Tue, 28 Jan 2025 13:58:15 +0100
Subject: [PATCH 2624/2913] [nrf fromtree] scripts: runners: nrf: Remove the
 nRF5340 special handling

This is no longer necessary, because thanks to sysbuild we no longer
invoke a runner with a .hex file that is the result of merging builds
for more than one core.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit aaefaad8988bbe32d46c41919d92c26d03e53fbe)
---
 scripts/west_commands/runners/nrf_common.py   | 112 +++--------
 scripts/west_commands/tests/nrf/README.rst    |   1 -
 .../tests/nrf/nrf5340_app_and_net.hex         |   5 -
 .../tests/nrf/nrf5340_app_only.hex            |   2 -
 .../tests/nrf/nrf5340_net_only.hex            |   3 -
 scripts/west_commands/tests/test_nrf.py       | 178 ++----------------
 6 files changed, 41 insertions(+), 260 deletions(-)
 delete mode 100644 scripts/west_commands/tests/nrf/README.rst
 delete mode 100644 scripts/west_commands/tests/nrf/nrf5340_app_and_net.hex
 delete mode 100644 scripts/west_commands/tests/nrf/nrf5340_app_only.hex
 delete mode 100644 scripts/west_commands/tests/nrf/nrf5340_net_only.hex

diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index 0be270d351e..b02c5b3ad5f 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -295,31 +295,37 @@ def recover_target(self):
 
         self.exec_op('recover')
 
+    def _get_core(self):
+        if self.family in ('nrf54h', 'nrf92'):
+            if (self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPUAPP') or
+                self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPUAPP')):
+                return 'Application'
+            if (self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPURAD') or
+                self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPURAD')):
+                return 'Network'
+            raise RuntimeError(f'Core not found for family: {self.family}')
+
+        if self.family in ('nrf53'):
+            if self.build_conf.getboolean('CONFIG_SOC_NRF5340_CPUAPP'):
+                return 'Application'
+            if self.build_conf.getboolean('CONFIG_SOC_NRF5340_CPUNET'):
+                return 'Network'
+            raise RuntimeError(f'Core not found for family: {self.family}')
+
+        return None
+
     def program_hex(self):
         # Get the command use to actually program self.hex_.
         self.logger.info(f'Flashing file: {self.hex_}')
 
         # What type of erase/core arguments should we pass to the tool?
-        core = None
+        core = self._get_core()
 
         if self.family in ('nrf54h', 'nrf92'):
             erase_arg = 'ERASE_NONE'
 
-            cpuapp = (
-                self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPUAPP') or
-                self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPUAPP')
-            )
-            cpurad = (
-                self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPURAD') or
-                self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPURAD')
-            )
             generated_uicr = self.build_conf.getboolean('CONFIG_NRF_REGTOOL_GENERATE_UICR')
 
-            if cpuapp:
-                core = 'Application'
-            elif cpurad:
-                core = 'Network'
-
             if generated_uicr and not self.hex_get_uicrs().get(core):
                 raise RuntimeError(
                     f"Expected a UICR to be contained in: {self.hex_}\n"
@@ -367,7 +373,7 @@ def program_hex(self):
                 # Handle SUIT root manifest if application manifests are not used.
                 # If an application firmware is built, the root envelope is merged
                 # with other application manifests as well as the output HEX file.
-                if not cpuapp and self.sysbuild_conf.get('SB_CONFIG_SUIT_ENVELOPE'):
+                if core != 'Application' and self.sysbuild_conf.get('SB_CONFIG_SUIT_ENVELOPE'):
                     app_root_envelope_hex_file = os.fspath(
                         mpi_hex_dir / 'suit_installed_envelopes_application_merged.hex'
                     )
@@ -399,83 +405,9 @@ def program_hex(self):
             if self.hex_refers_region(xip_start, xip_end):
                 ext_mem_erase_opt = 'ERASE_ALL'
 
-        # What tool commands do we need to flash this target?
-        if self.family == 'nrf53':
-            # nRF53 requires special treatment due to the extra coprocessor.
-            self.program_hex_nrf53(erase_arg, ext_mem_erase_opt)
-        else:
-            self.op_program(self.hex_, erase_arg, ext_mem_erase_opt, defer=True, core=core)
-
+        self.op_program(self.hex_, erase_arg, ext_mem_erase_opt, defer=True, core=core)
         self.flush(force=False)
 
-    def program_hex_nrf53(self, erase_arg, ext_mem_erase_opt):
-        # program_hex() helper for nRF53.
-
-        # *********************** NOTE *******************************
-        # self.hex_ can contain code for both the application core and
-        # the network core.
-        #
-        # We can't assume, for example, that
-        # CONFIG_SOC_NRF5340_CPUAPP=y means self.hex_ only contains
-        # data for the app core's flash: the user can put arbitrary
-        # addresses into one of the files in HEX_FILES_TO_MERGE.
-        #
-        # Therefore, on this family, we may need to generate two new
-        # hex files, one for each core, and flash them individually
-        # with the correct '--coprocessor' arguments.
-        #
-        # Kind of hacky, but it works, and the tools are not capable of
-        # flashing to both cores at once. If self.hex_ only affects
-        # one core's flash, then we skip the extra work to save time.
-        # ************************************************************
-
-        # Address range of the network coprocessor's flash. From nRF5340 OPS.
-        # We should get this from DTS instead if multiple values are possible,
-        # but this is fine for now.
-        net_flash_start = 0x01000000
-        net_flash_end   = 0x0103FFFF
-
-        # If there is nothing in the hex file for the network core,
-        # only the application core is programmed.
-        if not self.hex_refers_region(net_flash_start, net_flash_end):
-            self.op_program(self.hex_, erase_arg, ext_mem_erase_opt, defer=True,
-                            core='Application')
-        # If there is some content that addresses a region beyond the network
-        # core flash range, two hex files are generated and the two cores
-        # are programmed one by one.
-        elif self.hex_contents.minaddr() < net_flash_start or \
-             self.hex_contents.maxaddr() > net_flash_end:
-
-            net_hex, app_hex = IntelHex(), IntelHex()
-            for start, end in self.hex_contents.segments():
-                if net_flash_start <= start <= net_flash_end:
-                    net_hex.merge(self.hex_contents[start:end])
-                else:
-                    app_hex.merge(self.hex_contents[start:end])
-
-            hex_path = Path(self.hex_)
-            hex_dir, hex_name = hex_path.parent, hex_path.name
-
-            net_hex_file = os.fspath(
-                hex_dir / f'GENERATED_CP_NETWORK_{hex_name}')
-            app_hex_file = os.fspath(
-                hex_dir / f'GENERATED_CP_APPLICATION_{hex_name}')
-
-            self.logger.info(
-                f'{self.hex_} targets both nRF53 coprocessors; '
-                f'splitting it into: {net_hex_file} and {app_hex_file}')
-
-            net_hex.write_hex_file(net_hex_file)
-            app_hex.write_hex_file(app_hex_file)
-
-            self.op_program(net_hex_file, erase_arg, None, defer=True,
-                            core='Network')
-            self.op_program(app_hex_file, erase_arg, ext_mem_erase_opt, defer=True,
-                            core='Application')
-        # Otherwise, only the network core is programmed.
-        else:
-            self.op_program(self.hex_, erase_arg, None, defer=True,
-                            core='Network')
 
     def reset_target(self):
         if self.family == 'nrf52' and not self.softreset:
diff --git a/scripts/west_commands/tests/nrf/README.rst b/scripts/west_commands/tests/nrf/README.rst
deleted file mode 100644
index 2b1c35fde08..00000000000
--- a/scripts/west_commands/tests/nrf/README.rst
+++ /dev/null
@@ -1 +0,0 @@
-This directory contains test data files for test_nrf.py.
diff --git a/scripts/west_commands/tests/nrf/nrf5340_app_and_net.hex b/scripts/west_commands/tests/nrf/nrf5340_app_and_net.hex
deleted file mode 100644
index 2dda35e1110..00000000000
--- a/scripts/west_commands/tests/nrf/nrf5340_app_and_net.hex
+++ /dev/null
@@ -1,5 +0,0 @@
-:020000040000FA
-:0100000001FE
-:020000040100F9
-:0100000001FE
-:00000001FF
diff --git a/scripts/west_commands/tests/nrf/nrf5340_app_only.hex b/scripts/west_commands/tests/nrf/nrf5340_app_only.hex
deleted file mode 100644
index d3641b39051..00000000000
--- a/scripts/west_commands/tests/nrf/nrf5340_app_only.hex
+++ /dev/null
@@ -1,2 +0,0 @@
-:0100000001FE
-:00000001FF
diff --git a/scripts/west_commands/tests/nrf/nrf5340_net_only.hex b/scripts/west_commands/tests/nrf/nrf5340_net_only.hex
deleted file mode 100644
index 68cefd69a03..00000000000
--- a/scripts/west_commands/tests/nrf/nrf5340_net_only.hex
+++ /dev/null
@@ -1,3 +0,0 @@
-:020000040100F9
-:0100000001FE
-:00000001FF
diff --git a/scripts/west_commands/tests/test_nrf.py b/scripts/west_commands/tests/test_nrf.py
index 907756d2e0c..683a813c8b8 100644
--- a/scripts/west_commands/tests/test_nrf.py
+++ b/scripts/west_commands/tests/test_nrf.py
@@ -7,9 +7,7 @@
 import functools
 import io
 import os
-from pathlib import Path
 import shlex
-import shutil
 import typing
 from unittest.mock import patch, call
 
@@ -30,14 +28,6 @@
 TEST_TOOL_OPT = '--ip 192.168.1.10'
 TEST_TOOL_OPT_L = shlex.split(TEST_TOOL_OPT)
 
-# nRF53 flashing is special in that we have different results
-# depending on the input hex file. For that reason, we test it with
-# real hex files.
-TEST_DIR = Path(__file__).parent / 'nrf'
-NRF5340_APP_ONLY_HEX = os.fspath(TEST_DIR / 'nrf5340_app_only.hex')
-NRF5340_NET_ONLY_HEX = os.fspath(TEST_DIR / 'nrf5340_net_only.hex')
-NRF5340_APP_AND_NET_HEX = os.fspath(TEST_DIR / 'nrf5340_app_and_net.hex')
-
 CLASS_MAP = {'nrfjprog': NrfJprogBinaryRunner, 'nrfutil': NrfUtilBinaryRunner}
 
 #
@@ -182,29 +172,29 @@ class TC(typing.NamedTuple):    # 'TestCase'
      (TEST_OVR_SNR, None)),
 
     # -------------------------------------------------------------------------
-    # NRF53 APP only
+    # NRF53 APP
     #
     #  family          CP     recov  soft   snr    erase  tool_opt
     TC('nrf53', 'APP', False, False, False, False, False):
-    ((['nrfjprog', '--program', NRF5340_APP_ONLY_HEX, '--sectorerase',
+    ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_APPLICATION', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
     TC('nrf53', 'APP', False, False, False, True, False):
-    ((['nrfjprog', '--program', NRF5340_APP_ONLY_HEX, '--chiperase',
+    ((['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_APPLICATION', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
     TC('nrf53', 'APP', False, False, True, False, False):
-    ((['nrfjprog', '--program', NRF5340_APP_ONLY_HEX, '--sectorerase',
+    ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_APPLICATION', '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
     TC('nrf53', 'APP', False, True, False, False, False):
-    ((['nrfjprog', '--program', NRF5340_APP_ONLY_HEX, '--sectorerase',
+    ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_APPLICATION', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
@@ -213,7 +203,7 @@ class TC(typing.NamedTuple):    # 'TestCase'
     ((['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_DEF_SNR],
-     ['nrfjprog', '--program', NRF5340_APP_ONLY_HEX, '--sectorerase',
+     ['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_APPLICATION', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
@@ -222,35 +212,35 @@ class TC(typing.NamedTuple):    # 'TestCase'
     ((['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
       '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_OVR_SNR],
-     ['nrfjprog', '--program', NRF5340_APP_ONLY_HEX, '--chiperase',
+     ['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_APPLICATION', '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF53', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
     # -------------------------------------------------------------------------
-    # NRF53 NET only
+    # NRF53 NET
     #
     #  family          CP     recov  soft   snr    erase  tool_opt
     TC('nrf53', 'NET', False, False, False, False, False):
-    ((['nrfjprog', '--program', NRF5340_NET_ONLY_HEX, '--sectorerase',
+    ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
     TC('nrf53', 'NET', False, False, False, True, False):
-    ((['nrfjprog', '--program', NRF5340_NET_ONLY_HEX, '--chiperase',
+    ((['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
     TC('nrf53', 'NET', False, False, True, False, False):
-    ((['nrfjprog', '--program', NRF5340_NET_ONLY_HEX, '--sectorerase',
+    ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK', '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
     TC('nrf53', 'NET', False, True, False, False, False):
-    ((['nrfjprog', '--program', NRF5340_NET_ONLY_HEX, '--sectorerase',
+    ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
@@ -259,7 +249,7 @@ class TC(typing.NamedTuple):    # 'TestCase'
     ((['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_DEF_SNR],
-     ['nrfjprog', '--program', NRF5340_NET_ONLY_HEX, '--sectorerase',
+     ['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
@@ -268,130 +258,11 @@ class TC(typing.NamedTuple):    # 'TestCase'
     ((['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
       '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_OVR_SNR],
-     ['nrfjprog', '--program', NRF5340_NET_ONLY_HEX, '--chiperase',
+     ['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK', '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF53', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
-    # -------------------------------------------------------------------------
-    # NRF53 APP+NET
-    #
-    #  family          CP         recov  soft   snr    erase  tool_opt
-    TC('nrf53', 'APP+NET', False, False, False, False, False):
-    ((lambda tmpdir, infile: \
-        (['nrfjprog',
-          '--program',
-          os.fspath(tmpdir / 'GENERATED_CP_NETWORK_' + Path(infile).name),
-          '--sectorerase', '--verify', '-f', 'NRF53',
-          '--coprocessor', 'CP_NETWORK', '--snr', TEST_DEF_SNR],
-         ['nrfjprog',
-          '--program',
-          os.fspath(tmpdir / 'GENERATED_CP_APPLICATION_' + Path(infile).name),
-          '--sectorerase', '--verify', '-f', 'NRF53',
-          '--coprocessor', 'CP_APPLICATION', '--snr', TEST_DEF_SNR],
-         ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR])),
-     (TEST_DEF_SNR, None)),
-
-    TC('nrf53', 'APP+NET', False, False, False, True, False):
-    ((lambda tmpdir, infile: \
-        (['nrfjprog',
-          '--program',
-          os.fspath(tmpdir / 'GENERATED_CP_NETWORK_' + Path(infile).name),
-          '--chiperase', '--verify', '-f', 'NRF53',
-          '--coprocessor', 'CP_NETWORK', '--snr', TEST_DEF_SNR],
-         ['nrfjprog',
-          '--program',
-          os.fspath(tmpdir / 'GENERATED_CP_APPLICATION_' + Path(infile).name),
-          '--chiperase', '--verify', '-f', 'NRF53',
-          '--coprocessor', 'CP_APPLICATION', '--snr', TEST_DEF_SNR],
-         ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR])),
-     (TEST_DEF_SNR, None)),
-
-    TC('nrf53', 'APP+NET', False, False, True, False, False):
-    ((lambda tmpdir, infile: \
-        (['nrfjprog',
-          '--program',
-          os.fspath(tmpdir / 'GENERATED_CP_NETWORK_' + Path(infile).name),
-          '--sectorerase', '--verify', '-f', 'NRF53',
-          '--coprocessor', 'CP_NETWORK', '--snr', TEST_OVR_SNR],
-         ['nrfjprog',
-          '--program',
-          os.fspath(tmpdir / 'GENERATED_CP_APPLICATION_' + Path(infile).name),
-          '--sectorerase', '--verify', '-f', 'NRF53',
-          '--coprocessor', 'CP_APPLICATION', '--snr', TEST_OVR_SNR],
-         ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_OVR_SNR])),
-     (TEST_OVR_SNR, None)),
-
-    TC('nrf53', 'APP+NET', False, True, False, False, False):
-    ((lambda tmpdir, infile: \
-        (['nrfjprog',
-          '--program',
-          os.fspath(tmpdir / 'GENERATED_CP_NETWORK_' + Path(infile).name),
-          '--sectorerase', '--verify', '-f', 'NRF53',
-          '--coprocessor', 'CP_NETWORK', '--snr', TEST_DEF_SNR],
-         ['nrfjprog',
-          '--program',
-          os.fspath(tmpdir / 'GENERATED_CP_APPLICATION_' + Path(infile).name),
-          '--sectorerase', '--verify', '-f', 'NRF53',
-          '--coprocessor', 'CP_APPLICATION', '--snr', TEST_DEF_SNR],
-         ['nrfjprog', '--reset', '-f', 'NRF53', '--snr', TEST_DEF_SNR])),
-     (TEST_DEF_SNR, None)),
-
-    TC('nrf53', 'APP+NET', True, False, False, False, False):
-    ((lambda tmpdir, infile: \
-        (['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
-          '--snr', TEST_DEF_SNR],
-         ['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_DEF_SNR],
-         ['nrfjprog',
-          '--program',
-          os.fspath(tmpdir / 'GENERATED_CP_NETWORK_' + Path(infile).name),
-          '--sectorerase', '--verify', '-f', 'NRF53',
-          '--coprocessor', 'CP_NETWORK', '--snr', TEST_DEF_SNR],
-         ['nrfjprog',
-          '--program',
-          os.fspath(tmpdir / 'GENERATED_CP_APPLICATION_' + Path(infile).name),
-          '--sectorerase', '--verify', '-f', 'NRF53',
-          '--coprocessor', 'CP_APPLICATION', '--snr', TEST_DEF_SNR],
-         ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR])),
-     (TEST_DEF_SNR, None)),
-
-    TC('nrf53', 'APP+NET', True, True, True, True, False):
-    ((lambda tmpdir, infile: \
-        (['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
-          '--snr', TEST_OVR_SNR],
-         ['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_OVR_SNR],
-         ['nrfjprog',
-          '--program',
-          os.fspath(tmpdir / 'GENERATED_CP_NETWORK_' + Path(infile).name),
-          '--chiperase', '--verify', '-f', 'NRF53',
-          '--coprocessor', 'CP_NETWORK', '--snr', TEST_OVR_SNR],
-         ['nrfjprog',
-          '--program',
-          os.fspath(tmpdir / 'GENERATED_CP_APPLICATION_' + Path(infile).name),
-          '--chiperase', '--verify', '-f', 'NRF53',
-          '--coprocessor', 'CP_APPLICATION', '--snr', TEST_OVR_SNR],
-         ['nrfjprog', '--reset', '-f', 'NRF53', '--snr', TEST_OVR_SNR])),
-     (TEST_OVR_SNR, None)),
-
-    TC('nrf53', 'APP+NET', True, True, True, True, True):
-    ((lambda tmpdir, infile: \
-        (['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
-          '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
-         ['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
-         ['nrfjprog',
-          '--program',
-          os.fspath(tmpdir / 'GENERATED_CP_NETWORK_' + Path(infile).name),
-          '--chiperase', '--verify', '-f', 'NRF53',
-          '--coprocessor', 'CP_NETWORK', '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
-         ['nrfjprog',
-          '--program',
-          os.fspath(tmpdir / 'GENERATED_CP_APPLICATION_' + Path(infile).name),
-          '--chiperase', '--verify', '-f', 'NRF53',
-          '--coprocessor', 'CP_APPLICATION', '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
-         ['nrfjprog', '--reset', '-f', 'NRF53', '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L)),
-     (TEST_OVR_SNR, None)),
-
-
     # -------------------------------------------------------------------------
     # NRF91
     #
@@ -493,23 +364,12 @@ def fix_up_runner_config(test_case, runner_config, tmpdir):
         f.write(f'''
 CONFIG_SOC_SERIES_{test_case.family.upper()}X=y
 ''')
-    to_replace['build_dir'] = tmpdir
+        if test_case.family == 'nrf53':
+            f.write(f'''
+CONFIG_SOC_NRF5340_CPU{test_case.coprocessor}=y
+''')
 
-    if test_case.family != 'nrf53':
-        return runner_config._replace(**to_replace)
-
-    if test_case.coprocessor == 'APP':
-        to_replace['hex_file'] = NRF5340_APP_ONLY_HEX
-    elif test_case.coprocessor == 'NET':
-        to_replace['hex_file'] = NRF5340_NET_ONLY_HEX
-    elif test_case.coprocessor == 'APP+NET':
-        # Since the runner is going to generate files next to its input
-        # file, we need to stash a copy in a tmpdir it can use.
-        outfile = tmpdir / Path(NRF5340_APP_AND_NET_HEX).name
-        shutil.copyfile(NRF5340_APP_AND_NET_HEX, outfile)
-        to_replace['hex_file'] = os.fspath(outfile)
-    else:
-        assert False, f'bad test case {test_case}'
+    to_replace['build_dir'] = tmpdir
 
     return runner_config._replace(**to_replace)
 

From 471b1d0c8ae20fe6c662d5cdbf77645747744c14 Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Tue, 28 Jan 2025 20:14:41 +0100
Subject: [PATCH 2625/2913] [nrf fromtree] scripts: runners: nrf: Add UICR
 ranges for nRF54L

These are used to detect if the firmware image contains any values
inside the UICR for additional handling.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit fa66984c2bdbe43fa4d7c7bd9fd2c903e6721f92)
---
 scripts/west_commands/runners/nrf_common.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index b02c5b3ad5f..e6576ca2455 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -40,6 +40,9 @@
         'Application': (0x0FFF8000, 0x0FFF8800),
         'Network': (0x0FFFA000, 0x0FFFA800),
     },
+    'nrf54l': {
+        'Application': (0x00FFD000, 0x00FFDA00),
+    },
     'nrf91': {
         'Application': (0x00FF8000, 0x00FF8800),
     },

From 11a055b34fbec8fa62f55e7a0487cdd25aab1c5c Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Thu, 30 Jan 2025 10:04:39 +0100
Subject: [PATCH 2626/2913] [nrf fromtree] scripts: runners: nrfjprog: Remove
 erasepage handling

This is no longer used at all.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit 4e8ec169fbdadf9cdfbeade466c7bb8aa9c79ccd)
---
 scripts/west_commands/runners/nrfjprog.py | 3 ---
 scripts/west_commands/runners/nrfutil.py  | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/west_commands/runners/nrfjprog.py b/scripts/west_commands/runners/nrfjprog.py
index 4268b68794e..f8f1a404520 100644
--- a/scripts/west_commands/runners/nrfjprog.py
+++ b/scripts/west_commands/runners/nrfjprog.py
@@ -106,9 +106,6 @@ def do_exec_op(self, op, force=False):
                 cmd.append('--reset')
             if _op['kind'] == 'RESET_PIN':
                 cmd.append('--pinreset')
-        elif op_type == 'erasepage':
-            cmd.append('--erasepage')
-            cmd.append(f"0x{_op['page']:08x}")
         else:
             raise RuntimeError(f'Invalid operation: {op_type}')
 
diff --git a/scripts/west_commands/runners/nrfutil.py b/scripts/west_commands/runners/nrfutil.py
index 9bab2accb4a..a943c3ddd4f 100644
--- a/scripts/west_commands/runners/nrfutil.py
+++ b/scripts/west_commands/runners/nrfutil.py
@@ -120,6 +120,9 @@ def _append_batch(self, op, json_file):
             cmd.append(cli_opts)
         elif op_type == 'reset':
             cmd += ['--reset-kind', _op['kind']]
+        elif op_type == 'erase':
+            cmd += ['--reset-kind', _op['kind']]
+
 
         cmd += ['--core', op['core']] if op.get('core') else []
         cmd += ['--x-family', f'{self.family}']

From d04e8a3263292e0adf97c618136ec55319ce0031 Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Thu, 30 Jan 2025 13:23:38 +0100
Subject: [PATCH 2627/2913] [nrf fromtree] scripts: runners: nrf: Implement the
 erase command

The `erase` command was being used but there was no "backend"
implementation for it in nrfutil nor nrfjprog. Simplify the syntax and
implement it for both tools.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit dc7d8bbe16a253588bc1a55c19f550e4f78a5bf7)
---
 scripts/west_commands/runners/nrf_common.py | 3 +--
 scripts/west_commands/runners/nrfjprog.py   | 2 ++
 scripts/west_commands/runners/nrfutil.py    | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index e6576ca2455..55ff3741aa9 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -390,8 +390,7 @@ def program_hex(self):
                         )
 
             if not self.erase and generated_uicr:
-                self.exec_op('erase', core=core, option={'chip_erase_mode': 'ERASE_UICR',
-                                                         'ext_mem_erase_mode': 'ERASE_NONE'})
+                self.exec_op('erase', core=core, kind='uicr')
         else:
             if self.erase:
                 erase_arg = 'ERASE_ALL'
diff --git a/scripts/west_commands/runners/nrfjprog.py b/scripts/west_commands/runners/nrfjprog.py
index f8f1a404520..941a6d18f55 100644
--- a/scripts/west_commands/runners/nrfjprog.py
+++ b/scripts/west_commands/runners/nrfjprog.py
@@ -106,6 +106,8 @@ def do_exec_op(self, op, force=False):
                 cmd.append('--reset')
             if _op['kind'] == 'RESET_PIN':
                 cmd.append('--pinreset')
+        elif op_type == 'erase':
+            cmd.append(f'--erase{_op["kind"]}')
         else:
             raise RuntimeError(f'Invalid operation: {op_type}')
 
diff --git a/scripts/west_commands/runners/nrfutil.py b/scripts/west_commands/runners/nrfutil.py
index a943c3ddd4f..e9c27c9ed16 100644
--- a/scripts/west_commands/runners/nrfutil.py
+++ b/scripts/west_commands/runners/nrfutil.py
@@ -121,8 +121,7 @@ def _append_batch(self, op, json_file):
         elif op_type == 'reset':
             cmd += ['--reset-kind', _op['kind']]
         elif op_type == 'erase':
-            cmd += ['--reset-kind', _op['kind']]
-
+            cmd.append(f'--{_op["kind"]}')
 
         cmd += ['--core', op['core']] if op.get('core') else []
         cmd += ['--x-family', f'{self.family}']

From 3446a62ce4882b17272c0a2240ae2506eae1fd91 Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Tue, 4 Feb 2025 10:42:06 +0100
Subject: [PATCH 2628/2913] [nrf fromtree] scripts: runners: nrf: Fix missing
 kind in erase operations

Commit dc7d8bb introduced the requirement to provide the erase kind when
executing the corresponding op, but it was forgotten in this particular
spot.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit 706689b37687ef320a1d530905dda7c9eff0e5c2)
---
 scripts/west_commands/runners/nrf_common.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index 55ff3741aa9..982d1279673 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -337,8 +337,8 @@ def program_hex(self):
                 )
 
             if self.erase:
-                self.exec_op('erase', core='Application')
-                self.exec_op('erase', core='Network')
+                self.exec_op('erase', core='Application', kind='all')
+                self.exec_op('erase', core='Network', kind='all')
 
             # Manage SUIT artifacts.
             # This logic should be executed only once per build.

From 54ddea481d5c2d17994cb28ea4b31a7f83496460 Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Thu, 30 Jan 2025 18:55:00 +0100
Subject: [PATCH 2629/2913] [nrf fromtree] scripts: runners: nrf: Default to
 soft reset for the nRF52 series

The Nordic nRF52 series have a peculiarity that is not shared with any
other Nordic families of SoCs: the reset pin can be reconfigured as a
regular GPIO. This has an unintended consequence: if the user has
reconfigured the pin in Devicetree to be a GPIO, `west flash` will
override that and configure the IC to use it as a reset pin, and the
firmware at boot won't be able to switch it back to GPIO, because that
requires a UICR erase. This behavior is very confusing to users, because
the GPIO does not work at all, since it is now just a reset line.

With this patch, `west flash` defaults to using soft reset instead of
pin reset for the nRF52 family of devices, to avoid overwriting the
reset pin configuration that the user includes in the image.

In order to be able to continue to use pin reset for users that so
desire it, a new option `--pinreset` is added that forces the use of pin
reset. The existing `--softreset` option is left exactly as it was, but
it is now applicable only to families other than the nRF52.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit 17a671ca0013fbbbe9468c1cefeaa8d292a5b07c)
---
 doc/releases/migration-guide-4.1.rst        |  4 +
 scripts/west_commands/runners/nrf_common.py | 29 +++++--
 scripts/west_commands/runners/nrfjprog.py   |  6 +-
 scripts/west_commands/runners/nrfutil.py    |  6 +-
 scripts/west_commands/tests/test_nrf.py     | 93 +++++++++++----------
 5 files changed, 81 insertions(+), 57 deletions(-)

diff --git a/doc/releases/migration-guide-4.1.rst b/doc/releases/migration-guide-4.1.rst
index 0d4f16db084..868f7511aad 100644
--- a/doc/releases/migration-guide-4.1.rst
+++ b/doc/releases/migration-guide-4.1.rst
@@ -42,6 +42,10 @@ Boards
   the required configuration by using ``mikroe_weather_click_i2c`` or ``mikroe_weather_click_spi``
   instead of ``mikroe_weather_click``.
 
+* All nRF52-based boards will now default to soft (system) reset
+  instead of pin reset when flashing with ``west flash``. If you want to keep
+  using pin reset on the nRF52 family of ICs you can use ``west flash --pinreset``.
+
 Devicetree
 **********
 
diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index 982d1279673..48aac645be9 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -78,13 +78,14 @@ def _get_suit_starter():
 class NrfBinaryRunner(ZephyrBinaryRunner):
     '''Runner front-end base class for nrf tools.'''
 
-    def __init__(self, cfg, family, softreset, dev_id, erase=False,
+    def __init__(self, cfg, family, softreset, pinreset, dev_id, erase=False,
                  reset=True, tool_opt=None, force=False, recover=False):
         super().__init__(cfg)
         self.hex_ = cfg.hex_file
         # The old --nrf-family options takes upper-case family names
         self.family = family.lower() if family else None
         self.softreset = softreset
+        self.pinreset = pinreset
         self.dev_id = dev_id
         self.erase = bool(erase)
         self.reset = bool(reset)
@@ -117,9 +118,14 @@ def do_add_parser(cls, parser):
                                      'NRF54H', 'NRF91', 'NRF92'],
                             help='''MCU family; still accepted for
                             compatibility only''')
+        # Not using a mutual exclusive group for softreset and pinreset due to
+        # the way dump_runner_option_help() works in run_common.py
         parser.add_argument('--softreset', required=False,
                             action='store_true',
-                            help='use reset instead of pinreset')
+                            help='use softreset instead of pinreset')
+        parser.add_argument('--pinreset', required=False,
+                            action='store_true',
+                            help='use pinreset instead of softreset')
         parser.add_argument('--snr', required=False, dest='dev_id',
                             help='obsolete synonym for -i/--dev-id')
         parser.add_argument('--force', required=False,
@@ -412,13 +418,18 @@ def program_hex(self):
 
 
     def reset_target(self):
-        if self.family == 'nrf52' and not self.softreset:
+        # Default to soft reset on nRF52 only, because ICs in these series can
+        # reconfigure the reset pin as a regular GPIO
+        default = "RESET_SYSTEM" if self.family == 'nrf52' else "RESET_PIN"
+        kind = ("RESET_SYSTEM" if self.softreset else "RESET_PIN" if
+               self.pinreset else default)
+
+        if self.family == 'nrf52' and kind == "RESET_PIN":
+            # Write to the UICR enabling nRESET in the corresponding pin
             self.exec_op('pinreset-enable')
 
-        if self.softreset:
-            self.exec_op('reset', kind="RESET_SYSTEM")
-        else:
-            self.exec_op('reset', kind="RESET_PIN")
+        self.logger.debug(f'Reset kind: {kind}')
+        self.exec_op('reset', kind=kind)
 
     @abc.abstractmethod
     def do_require(self):
@@ -488,6 +499,10 @@ def flush_ops(self, force=True):
     def do_run(self, command, **kwargs):
         self.do_require()
 
+        if self.softreset and self.pinreset:
+            raise RuntimeError('Options --softreset and --pinreset are mutually '
+                               'exclusive.')
+
         self.ensure_output('hex')
         if IntelHex is None:
             raise RuntimeError('Python dependency intelhex was missing; '
diff --git a/scripts/west_commands/runners/nrfjprog.py b/scripts/west_commands/runners/nrfjprog.py
index 941a6d18f55..c7e003824a3 100644
--- a/scripts/west_commands/runners/nrfjprog.py
+++ b/scripts/west_commands/runners/nrfjprog.py
@@ -17,11 +17,11 @@
 class NrfJprogBinaryRunner(NrfBinaryRunner):
     '''Runner front-end for nrfjprog.'''
 
-    def __init__(self, cfg, family, softreset, dev_id, erase=False,
+    def __init__(self, cfg, family, softreset, pinreset, dev_id, erase=False,
                  reset=True, tool_opt=None, force=False, recover=False,
                  qspi_ini=None):
 
-        super().__init__(cfg, family, softreset, dev_id, erase, reset,
+        super().__init__(cfg, family, softreset, pinreset, dev_id, erase, reset,
                          tool_opt, force, recover)
 
         self.qspi_ini = qspi_ini
@@ -37,7 +37,7 @@ def tool_opt_help(cls) -> str:
     @classmethod
     def do_create(cls, cfg, args):
         return NrfJprogBinaryRunner(cfg, args.nrf_family, args.softreset,
-                                    args.dev_id, erase=args.erase,
+                                    args.pinreset, args.dev_id, erase=args.erase,
                                     reset=args.reset,
                                     tool_opt=args.tool_opt, force=args.force,
                                     recover=args.recover, qspi_ini=args.qspi_ini)
diff --git a/scripts/west_commands/runners/nrfutil.py b/scripts/west_commands/runners/nrfutil.py
index e9c27c9ed16..a4f17282259 100644
--- a/scripts/west_commands/runners/nrfutil.py
+++ b/scripts/west_commands/runners/nrfutil.py
@@ -16,11 +16,11 @@
 class NrfUtilBinaryRunner(NrfBinaryRunner):
     '''Runner front-end for nrfutil.'''
 
-    def __init__(self, cfg, family, softreset, dev_id, erase=False,
+    def __init__(self, cfg, family, softreset, pinreset, dev_id, erase=False,
                  reset=True, tool_opt=None, force=False, recover=False,
                  suit_starter=False):
 
-        super().__init__(cfg, family, softreset, dev_id, erase, reset,
+        super().__init__(cfg, family, softreset, pinreset, dev_id, erase, reset,
                          tool_opt, force, recover)
 
         self.suit_starter = suit_starter
@@ -39,7 +39,7 @@ def tool_opt_help(cls) -> str:
     @classmethod
     def do_create(cls, cfg, args):
         return NrfUtilBinaryRunner(cfg, args.nrf_family, args.softreset,
-                                   args.dev_id, erase=args.erase,
+                                   args.pinreset, args.dev_id, erase=args.erase,
                                    reset=args.reset,
                                    tool_opt=args.tool_opt, force=args.force,
                                    recover=args.recover,
diff --git a/scripts/west_commands/tests/test_nrf.py b/scripts/west_commands/tests/test_nrf.py
index 683a813c8b8..767739ef9e2 100644
--- a/scripts/west_commands/tests/test_nrf.py
+++ b/scripts/west_commands/tests/test_nrf.py
@@ -56,6 +56,9 @@ class TC(typing.NamedTuple):    # 'TestCase'
     # Use --reset instead of --pinreset if True
     softreset: bool
 
+    # Use --pinreset instead of --reset if True
+    pinreset: bool
+
     # --snr TEST_OVR_SNR if True, --snr TEST_DEF_SNR if False
     snr: bool
 
@@ -72,46 +75,46 @@ class TC(typing.NamedTuple):    # 'TestCase'
     # -------------------------------------------------------------------------
     # NRF51
     #
-    #  family          CP    recov  soft   snr    erase  tool_opt
-    TC('nrf51', None, False, False, False, False, False):
+    #  family   CP    recov  soft   pin    snr    erase  tool_opt
+    TC('nrf51', None, False, False, False, False, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF51',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF51', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf51', None, False, False, False, True, False):
+    TC('nrf51', None, False, False, False, False, True, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF51',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF51', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf51', None, False, False, True, False, False):
+    TC('nrf51', None, False, False, True, True, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF51',
       '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF51', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
-    TC('nrf51', None, False, True, False, False, False):
+    TC('nrf51', None, False, True, False, False, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF51',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF51', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf51', None, True, False, False, False, False):
+    TC('nrf51', None, True, False, True, False, False, False):
     ((['nrfjprog', '--recover', '-f', 'NRF51', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF51',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF51', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf51', None, True, True, True, True, False):
+    TC('nrf51', None, True, True, False, True, True, False):
     ((['nrfjprog', '--recover', '-f', 'NRF51', '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF51',
       '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF51', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
-    TC('nrf51', None, True, True, True, True, True):
+    TC('nrf51', None, True, True, False, True, True, True):
     ((['nrfjprog', '--recover', '-f', 'NRF51', '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
      ['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF51',
       '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
@@ -121,35 +124,33 @@ class TC(typing.NamedTuple):    # 'TestCase'
     # -------------------------------------------------------------------------
     # NRF52
     #
-    #  family          CP    recov  soft   snr    erase  tool_opt
-    TC('nrf52', None, False, False, False, False, False):
+    #  family   CP    recov  soft   pin    snr    erase  tool_opt
+    TC('nrf52', None, False, False, False, False, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectoranduicrerase',
       '--verify', '-f', 'NRF52', '--snr', TEST_DEF_SNR],
-     ['nrfjprog', '--pinresetenable', '-f', 'NRF52', '--snr', TEST_DEF_SNR],
-     ['nrfjprog', '--pinreset', '-f', 'NRF52', '--snr', TEST_DEF_SNR]),
+     ['nrfjprog', '--reset', '-f', 'NRF52', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf52', None, False, False, False, True, False):
+    TC('nrf52', None, False, False, True, False, True, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF52',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinresetenable', '-f', 'NRF52', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF52', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf52', None, False, False, True, False, False):
+    TC('nrf52', None, False, False, False, True, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectoranduicrerase',
       '--verify', '-f', 'NRF52', '--snr', TEST_OVR_SNR],
-     ['nrfjprog', '--pinresetenable', '-f', 'NRF52', '--snr', TEST_OVR_SNR],
-     ['nrfjprog', '--pinreset', '-f', 'NRF52', '--snr', TEST_OVR_SNR]),
+     ['nrfjprog', '--reset', '-f', 'NRF52', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
-    TC('nrf52', None, False, True, False, False, False):
+    TC('nrf52', None, False, True, False, False, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectoranduicrerase',
       '--verify', '-f', 'NRF52', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF52', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf52', None, True, False, False, False, False):
+    TC('nrf52', None, True, False, True, False, False, False):
     ((['nrfjprog', '--recover', '-f', 'NRF52', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--program', RC_KERNEL_HEX, '--sectoranduicrerase',
       '--verify', '-f', 'NRF52', '--snr', TEST_DEF_SNR],
@@ -157,14 +158,14 @@ class TC(typing.NamedTuple):    # 'TestCase'
      ['nrfjprog', '--pinreset', '-f', 'NRF52', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf52', None, True, True, True, True, False):
+    TC('nrf52', None, True, True, False, True, True, False):
     ((['nrfjprog', '--recover', '-f', 'NRF52', '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF52',
       '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF52', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
-    TC('nrf52', None, True, True, True, True, True):
+    TC('nrf52', None, True, True, False, True, True, True):
     ((['nrfjprog', '--recover', '-f', 'NRF52', '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
      ['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF52',
       '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
@@ -174,32 +175,32 @@ class TC(typing.NamedTuple):    # 'TestCase'
     # -------------------------------------------------------------------------
     # NRF53 APP
     #
-    #  family          CP     recov  soft   snr    erase  tool_opt
-    TC('nrf53', 'APP', False, False, False, False, False):
+    #  family   CP     recov  soft   pin    snr    erase  tool_opt
+    TC('nrf53', 'APP', False, False, False, False, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_APPLICATION', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf53', 'APP', False, False, False, True, False):
+    TC('nrf53', 'APP', False, False, True, False, True, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_APPLICATION', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf53', 'APP', False, False, True, False, False):
+    TC('nrf53', 'APP', False, False, False, True, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_APPLICATION', '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
-    TC('nrf53', 'APP', False, True, False, False, False):
+    TC('nrf53', 'APP', False, True, False, False, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_APPLICATION', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf53', 'APP', True, False, False, False, False):
+    TC('nrf53', 'APP', True, False, True, False, False, False):
     ((['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_DEF_SNR],
@@ -208,7 +209,7 @@ class TC(typing.NamedTuple):    # 'TestCase'
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf53', 'APP', True, True, True, True, False):
+    TC('nrf53', 'APP', True, True, False, True, True, False):
     ((['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
       '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_OVR_SNR],
@@ -220,32 +221,32 @@ class TC(typing.NamedTuple):    # 'TestCase'
     # -------------------------------------------------------------------------
     # NRF53 NET
     #
-    #  family          CP     recov  soft   snr    erase  tool_opt
-    TC('nrf53', 'NET', False, False, False, False, False):
+    #  family   CP     recov  soft   pin    snr    erase  tool_opt
+    TC('nrf53', 'NET', False, False, False, False, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf53', 'NET', False, False, False, True, False):
+    TC('nrf53', 'NET', False, False, True, False, True, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf53', 'NET', False, False, True, False, False):
+    TC('nrf53', 'NET', False, False, False, True, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK', '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
-    TC('nrf53', 'NET', False, True, False, False, False):
+    TC('nrf53', 'NET', False, True, False, False, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
       '--verify', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf53', 'NET', True, False, False, False, False):
+    TC('nrf53', 'NET', True, False, True, False, False, False):
     ((['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_DEF_SNR],
@@ -254,7 +255,7 @@ class TC(typing.NamedTuple):    # 'TestCase'
      ['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf53', 'NET', True, True, True, True, False):
+    TC('nrf53', 'NET', True, True, False, True, True, False):
     ((['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
       '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_OVR_SNR],
@@ -266,46 +267,46 @@ class TC(typing.NamedTuple):    # 'TestCase'
     # -------------------------------------------------------------------------
     # NRF91
     #
-    #  family          CP    recov  soft   snr    erase  tool_opt
-    TC('nrf91', None, False, False, False, False, False):
+    #  family   CP    recov  soft   pin    snr    erase  tool_opt
+    TC('nrf91', None, False, False, False, False, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF91',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF91', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf91', None, False, False, False, True, False):
+    TC('nrf91', None, False, False, True, False, True, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF91',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF91', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf91', None, False, False, True, False, False):
+    TC('nrf91', None, False, False, False, True, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF91',
       '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF91', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
-    TC('nrf91', None, False, True, False, False, False):
+    TC('nrf91', None, False, True, False, False, False, False):
     ((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF91',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF91', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf91', None, True, False, False, False, False):
+    TC('nrf91', None, True, False, True, False, False, False):
     ((['nrfjprog', '--recover', '-f', 'NRF91', '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF91',
       '--snr', TEST_DEF_SNR],
      ['nrfjprog', '--pinreset', '-f', 'NRF91', '--snr', TEST_DEF_SNR]),
      (TEST_DEF_SNR, None)),
 
-    TC('nrf91', None, True, True, True, True, False):
+    TC('nrf91', None, True, True, False, True, True, False):
     ((['nrfjprog', '--recover', '-f', 'NRF91', '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF91',
       '--snr', TEST_OVR_SNR],
      ['nrfjprog', '--reset', '-f', 'NRF91', '--snr', TEST_OVR_SNR]),
      (TEST_OVR_SNR, None)),
 
-    TC('nrf91', None, True, True, True, True, True):
+    TC('nrf91', None, True, True, False, True, True, True):
     ((['nrfjprog', '--recover', '-f', 'NRF91', '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
      ['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF91',
       '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
@@ -341,13 +342,14 @@ def id_fn(test_case):
         cp = ''
     else:
         cp = f'-{test_case.coprocessor}'
-    s = 'soft_reset' if test_case.softreset else 'pin_reset'
+    s = 'soft_reset' if test_case.softreset else 'no_soft_reset'
+    p = 'pin_reset' if test_case.pinreset else 'no_pin_reset'
     sn = 'default_snr' if test_case.snr else 'override_snr'
     e = 'chip_erase' if test_case.erase else 'sector[anduicr]_erase'
     r = 'recover' if test_case.recover else 'no_recover'
     t = 'tool_opt' if test_case.tool_opt else 'no_tool_opt'
 
-    return f'{test_case.family[:5]}{cp}-{s}-{sn}-{e}-{r}-{t}'
+    return f'{test_case.family[:5]}{cp}-{s}-{p}-{sn}-{e}-{r}-{t}'
 
 def fix_up_runner_config(test_case, runner_config, tmpdir):
     # Helper that adjusts the common runner_config fixture for our
@@ -421,6 +423,7 @@ def test_init(check_call, popen, get_snr, require, tool, test_case,
     runner = cls(runner_config,
                  test_case.family,
                  test_case.softreset,
+                 test_case.pinreset,
                  snr,
                  erase=test_case.erase,
                  tool_opt=tool_opt,
@@ -451,6 +454,8 @@ def test_create(check_call, popen, get_snr, require, tool, test_case,
     args = []
     if test_case.softreset:
         args.append('--softreset')
+    if test_case.pinreset:
+        args.append('--pinreset')
     if test_case.snr:
         args.extend(['--dev-id', TEST_OVR_SNR])
     if test_case.erase:

From 90e94f4785c09cc535edfeedbdea381bfb236054 Mon Sep 17 00:00:00 2001
From: Alexander Svensen <alexander.svensen@nordicsemi.no>
Date: Thu, 13 Mar 2025 12:37:03 +0100
Subject: [PATCH 2630/2913] [nrf fromtree] test: bluetooth: tester: Fix
 regression in PBP

- Allocate source in PBP first time adv is created
- Only set_adv_data in adv_setup if ext_adv already exists
- Fixes regression in PTS for PBP tests

Signed-off-by: Alexander Svensen <alexander.svensen@nordicsemi.no>
(cherry picked from commit 33b4faed9c852b24576b961554d6ba9f9f284e14)
Signed-off-by: Alexander Svensen <alexander.svensen@nordicsemi.no>
---
 tests/bluetooth/tester/hci_ipc_cpunet.conf    |  1 -
 .../tester/src/audio/btp_bap_broadcast.c      |  1 -
 .../tester/src/audio/btp_bap_broadcast.h      |  2 ++
 tests/bluetooth/tester/src/audio/btp_pbp.c    | 31 +++++++++++++++----
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/tests/bluetooth/tester/hci_ipc_cpunet.conf b/tests/bluetooth/tester/hci_ipc_cpunet.conf
index 8823c19e651..e14b9815424 100644
--- a/tests/bluetooth/tester/hci_ipc_cpunet.conf
+++ b/tests/bluetooth/tester/hci_ipc_cpunet.conf
@@ -10,7 +10,6 @@ CONFIG_BT_CTLR_ISOAL_PSN_IGNORE=y
 CONFIG_BT_ISO_MAX_BIG=2
 CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
 
-CONFIG_BT_CTLR_ADV_ISO_SET=2
 CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=4
 CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=4
 
diff --git a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
index e0e942b17b5..b2f496b7a1b 100644
--- a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
+++ b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
@@ -24,7 +24,6 @@
 #define LOG_MODULE_NAME bttester_bap_broadcast
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 #include "btp/btp.h"
-#include "btp_bap_audio_stream.h"
 #include "btp_bap_broadcast.h"
 
 static K_SEM_DEFINE(sem_stream_stopped, 0U,
diff --git a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
index a10198cf232..7bf1967bed7 100644
--- a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
+++ b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
@@ -8,6 +8,8 @@
 
 #include <zephyr/bluetooth/audio/cap.h>
 
+#include "btp_bap_audio_stream.h"
+
 struct btp_bap_broadcast_stream {
 	struct btp_bap_audio_stream audio_stream;
 	struct bt_audio_codec_cfg codec_cfg;
diff --git a/tests/bluetooth/tester/src/audio/btp_pbp.c b/tests/bluetooth/tester/src/audio/btp_pbp.c
index b3a5d8b0c2a..7906b8f3762 100644
--- a/tests/bluetooth/tester/src/audio/btp_pbp.c
+++ b/tests/bluetooth/tester/src/audio/btp_pbp.c
@@ -10,11 +10,14 @@
 
 #include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/audio/pbp.h>
+#include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/util.h>
 #define LOG_MODULE_NAME bttester_pbp
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 
+#include "btp_bap_broadcast.h"
+
 #define PBP_EXT_ADV_METADATA_LEN_MAX 128
 
 static uint8_t pbp_features_cached;
@@ -143,7 +146,6 @@ static int pbp_broadcast_source_adv_setup(void)
 
 	int err = bt_rand(&broadcast_id, BT_AUDIO_BROADCAST_ID_SIZE);
 	struct bt_data ext_ad[3];
-	struct bt_le_ext_adv *ext_adv = NULL;
 
 	if (err) {
 		LOG_ERR("Unable to generate broadcast ID: %d\n", err);
@@ -166,13 +168,30 @@ static int pbp_broadcast_source_adv_setup(void)
 	ext_ad[2].data_len = pba_buf.len;
 	ext_ad[2].data = pba_buf.data;
 
-	err = tester_gap_create_adv_instance(&param, BTP_GAP_ADDR_TYPE_IDENTITY, ext_ad,
-					     ARRAY_SIZE(ext_ad), NULL, 0, &gap_settings, &ext_adv);
-	if (err) {
-		LOG_ERR("Could not set up extended advertisement: %d", err);
-		return -EINVAL;
+	struct btp_bap_broadcast_local_source *source;
+
+	source = btp_bap_broadcast_local_source_from_src_id_get(0);
+
+	if (source->ext_adv == NULL) {
+		err = tester_gap_create_adv_instance(&param, BTP_GAP_ADDR_TYPE_IDENTITY, ext_ad,
+						     ARRAY_SIZE(ext_ad), NULL, 0, &gap_settings,
+						     &source->ext_adv);
+		if (err != 0) {
+			LOG_ERR("Could not set up extended advertisement: %d", err);
+			return -EINVAL;
+		}
+	} else {
+		err = bt_le_ext_adv_set_data(source->ext_adv, ext_ad, ARRAY_SIZE(ext_ad), NULL, 0);
+
+		if (err != 0) {
+			LOG_ERR("Could not set extended advertisement data: %d", err);
+			return -EINVAL;
+		}
 	}
 
+	source->broadcast_id = broadcast_id;
+	source->allocated = true;
+
 	return 0;
 }
 

From 7ee4bc9242920cce48b1f5f1dfd6d57a1214068f Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Thu, 6 Feb 2025 11:08:31 +0100
Subject: [PATCH 2631/2913] [nrf fromtree] scripts: runners: nrf: Fix flashing
 of FLPR/PPR on nRF54H20

After commit aaefaad, flashing of the FLPR and PPR cores in the nRF54H20
was broken due to those cores missing from the _get_core() function that
retrieves the core to program, triggering an exception. Fix it by
referencing those cores and mapping them to the application core.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit 7254a615307d732cf5b4535baf5c6360261c03fa)
---
 scripts/west_commands/runners/nrf_common.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index 48aac645be9..60fc96bf392 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -307,6 +307,8 @@ def recover_target(self):
     def _get_core(self):
         if self.family in ('nrf54h', 'nrf92'):
             if (self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPUAPP') or
+                self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPUFLPR') or
+                self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPUPPR') or
                 self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPUAPP')):
                 return 'Application'
             if (self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPURAD') or

From 3efacf193d2fcc345a1eaea16f732160b6c8ab09 Mon Sep 17 00:00:00 2001
From: Triveni Danda <triveni.danda@nordicsemi.no>
Date: Wed, 12 Mar 2025 13:22:57 +0530
Subject: [PATCH 2632/2913] [nrf fromtree] shell: Set default max argc count
 when WiFi shell is enabled

Set the default maximum argument count for the shell to 30
when the Wi-Fi shell is enabled, to ensure all Wi-Fi
commands work without failure.

Signed-off-by: Triveni Danda <triveni.danda@nordicsemi.no>
(cherry picked from commit e7a65ac9b4baae332bbe642e244fa845a9a53c8e)
---
 subsys/shell/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/subsys/shell/Kconfig b/subsys/shell/Kconfig
index 067386ec52f..e8165a712fd 100644
--- a/subsys/shell/Kconfig
+++ b/subsys/shell/Kconfig
@@ -108,6 +108,7 @@ config SHELL_DEFAULT_TERMINAL_HEIGHT
 config SHELL_ARGC_MAX
 	int "Maximum arguments in shell command"
 	range 3 $(UINT8_MAX)
+	default 30 if NET_L2_WIFI_SHELL
 	default 20
 	help
 	  Maximum number of arguments that can build a command.

From 6bf2702919b980f7a825f6fdc965cfaf81d9ac70 Mon Sep 17 00:00:00 2001
From: Triveni Danda <triveni.danda@nordicsemi.no>
Date: Thu, 13 Mar 2025 13:15:59 +0530
Subject: [PATCH 2633/2913] [nrf fromtree] drivers: nrf_wifi: Set default stack
 size of net_mgmt thread

Fixes overflow issue in the net_mgmt thread
during network interface state changes.

Signed-off-by: Triveni Danda <triveni.danda@nordicsemi.no>
(cherry picked from commit 3a3f4ab3ea3ffb0c617ac75f5ac5fa15cea55abe)
---
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index f77e56a170a..cb3d7e7ba36 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -160,6 +160,7 @@ config NRF70_REG_DOMAIN
 # stack requirements.
 config NET_MGMT_EVENT_STACK_SIZE
 	default 2048 if !WIFI_NM_WPA_SUPPLICANT
+	default 4600
 
 config NRF70_LOG_VERBOSE
 	bool "Maintains the verbosity of information in logs"

From 004da6d2a1e485efe865ee32e9ecc1b60e6d37c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Fri, 14 Mar 2025 09:16:44 +0100
Subject: [PATCH 2634/2913] [nrf fromtree] soc: nordic: allow use of TWIM
 frequency workaround
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added Kconfig options to allow use of TWIM frequency
workaround in NRFX for nRF52 and nRF53.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit def5f8ee07a6bf159481a9006d09aa0947d2ef76)
---
 modules/hal_nordic/nrfx/nrfx_kconfig.h | 6 ++++++
 soc/nordic/nrf52/Kconfig               | 8 ++++++++
 soc/nordic/nrf53/Kconfig               | 8 ++++++++
 3 files changed, 22 insertions(+)

diff --git a/modules/hal_nordic/nrfx/nrfx_kconfig.h b/modules/hal_nordic/nrfx/nrfx_kconfig.h
index 1eb51f99724..1eaafa91781 100644
--- a/modules/hal_nordic/nrfx/nrfx_kconfig.h
+++ b/modules/hal_nordic/nrfx/nrfx_kconfig.h
@@ -772,6 +772,12 @@
 #ifdef CONFIG_NRFX_TWIM137
 #define NRFX_TWIM137_ENABLED 1
 #endif
+#ifdef CONFIG_NRF52_ANOMALY_219_WORKAROUND
+#define NRFX_TWIM_NRF52_ANOMALY_219_WORKAROUND_ENABLED 1
+#endif
+#ifdef CONFIG_SOC_NRF53_ANOMALY_47_WORKAROUND
+#define NRFX_TWIM_NRF53_ANOMALY_47_WORKAROUND_ENABLED 1
+#endif
 
 #ifdef CONFIG_NRFX_TWIS
 #define NRFX_TWIS_ENABLED 1
diff --git a/soc/nordic/nrf52/Kconfig b/soc/nordic/nrf52/Kconfig
index edc2b70d667..9e68fe0df2c 100644
--- a/soc/nordic/nrf52/Kconfig
+++ b/soc/nordic/nrf52/Kconfig
@@ -120,4 +120,12 @@ config NRF52_ANOMALY_109_WORKAROUND_EGU_INSTANCE
 	help
 	  EGU instance used by the nRF52 Anomaly 109 workaround for PWM.
 
+config NRF52_ANOMALY_219_WORKAROUND
+	bool "Anomaly 219 workaround"
+	depends on NRFX_TWIM
+	help
+	  Due to Anomaly 219 the low period of SCL clock is too short to meet
+	  the I2C specification at 400 kHz. This workaround configures the I2C
+	  frequency to 390 kHz instead of 400 kHz.
+
 endif # SOC_SERIES_NRF52X
diff --git a/soc/nordic/nrf53/Kconfig b/soc/nordic/nrf53/Kconfig
index 87cbf27e5cd..5ec26603056 100644
--- a/soc/nordic/nrf53/Kconfig
+++ b/soc/nordic/nrf53/Kconfig
@@ -41,6 +41,14 @@ if SOC_SERIES_NRF53X
 VREGMAIN_PATH := $(dt_nodelabel_path,vregmain)
 VREGRADIO_PATH := $(dt_nodelabel_path,vregradio)
 
+config SOC_NRF53_ANOMALY_47_WORKAROUND
+	bool "Anomaly 47 workaround"
+	depends on NRFX_TWIM
+	help
+	  Due to Anomaly 47 the low period of SCL clock is too short to meet
+	  the I2C specification at 400 kHz. This workaround configures the I2C
+	  frequency to 390 kHz instead of 400 kHz.
+
 config SOC_NRF53_ANOMALY_160_WORKAROUND_NEEDED
 	bool "Workaround for nRF5340 anomaly 160"
 	imply SOC_NRF53_ANOMALY_160_WORKAROUND

From 56bea0285a4892ead9a0a9d9f880c4fc53ebba64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Tue, 4 Feb 2025 10:58:07 +0100
Subject: [PATCH 2635/2913] [nrf fromtree] tests: drivers: i2s: Add tests at
 typical audio sample rates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add short transfer test at 8000, 16000, 32000, 44100, 48000, 88200
and 96000 frame clock frequency.

Add KConfigs to skip test cases based on value of sample rate.

Add configuration for nrf5340dk where i2s peripheral is clocked
from ACLK.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit c42513a134da3478b6ee27b4b138deb1c9727c55)
---
 tests/drivers/i2s/i2s_speed/Kconfig           |  42 +++
 .../nrf5340dk_nrf5340_cpuapp_aclk.overlay     |   9 +
 .../i2s/i2s_speed/src/test_i2s_speed.c        | 260 +++++++++++++++---
 tests/drivers/i2s/i2s_speed/testcase.yaml     |  13 +
 4 files changed, 290 insertions(+), 34 deletions(-)
 create mode 100644 tests/drivers/i2s/i2s_speed/boards/nrf5340dk_nrf5340_cpuapp_aclk.overlay

diff --git a/tests/drivers/i2s/i2s_speed/Kconfig b/tests/drivers/i2s/i2s_speed/Kconfig
index 005ab795277..4e074f18c10 100644
--- a/tests/drivers/i2s/i2s_speed/Kconfig
+++ b/tests/drivers/i2s/i2s_speed/Kconfig
@@ -37,3 +37,45 @@ config I2S_TEST_ALLOWED_DATA_OFFSET
 	help
 	  Maximum allowed offset between sent and received samples. Non-zero
 	  value of this option may be needed when GPIO loopback is used.
+
+config I2S_TEST_SKIP_SAMPLERATE_8000
+	bool "Skip short transfer tests at 8000 samples per socond"
+	help
+	  When set to 'y', short transfer tests at 8000 samples per second
+	  will be skipped.
+
+config I2S_TEST_SKIP_SAMPLERATE_16000
+	bool "Skip short transfer tests at 16000 samples per socond"
+	help
+	  When set to 'y', short transfer tests at 16000 samples per second
+	  will be skipped.
+
+config I2S_TEST_SKIP_SAMPLERATE_32000
+	bool "Skip short transfer tests at 32000 samples per socond"
+	help
+	  When set to 'y', short transfer tests at 32000 samples per second
+	  will be skipped.
+
+config I2S_TEST_SKIP_SAMPLERATE_44100
+	bool "Skip short transfer tests at 44100 samples per socond"
+	help
+	  When set to 'y', short transfer tests at 44100 samples per second
+	  will be skipped.
+
+config I2S_TEST_SKIP_SAMPLERATE_48000
+	bool "Skip short transfer tests at 48000 samples per socond"
+	help
+	  When set to 'y', short transfer tests at 48000 samples per second
+	  will be skipped.
+
+config I2S_TEST_SKIP_SAMPLERATE_88200
+	bool "Skip short transfer tests at 88200 samples per socond"
+	help
+	  When set to 'y', short transfer tests at 88200 samples per second
+	  will be skipped.
+
+config I2S_TEST_SKIP_SAMPLERATE_96000
+	bool "Skip short transfer tests at 96000 samples per socond"
+	help
+	  When set to 'y', short transfer tests at 96000 samples per second
+	  will be skipped.
diff --git a/tests/drivers/i2s/i2s_speed/boards/nrf5340dk_nrf5340_cpuapp_aclk.overlay b/tests/drivers/i2s/i2s_speed/boards/nrf5340dk_nrf5340_cpuapp_aclk.overlay
new file mode 100644
index 00000000000..e262ca8d8a8
--- /dev/null
+++ b/tests/drivers/i2s/i2s_speed/boards/nrf5340dk_nrf5340_cpuapp_aclk.overlay
@@ -0,0 +1,9 @@
+/* Drive i2s peripheral from ACLK. */
+
+&clock {
+	hfclkaudio-frequency = <11289600>;
+};
+
+&i2s0 {
+	clock-source = "ACLK";
+};
diff --git a/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c b/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c
index 9851f480b23..a27a8465d1f 100644
--- a/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c
+++ b/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c
@@ -125,9 +125,8 @@ static int verify_buf(int16_t *rx_block, int att)
 }
 
 #define TIMEOUT          2000
-#define FRAME_CLK_FREQ   44000
 
-static int configure_stream(const struct device *dev_i2s, enum i2s_dir dir)
+static int configure_stream(const struct device *dev_i2s, enum i2s_dir dir, uint32_t frame_clk_freq)
 {
 	int ret;
 	struct i2s_config i2s_cfg;
@@ -135,7 +134,7 @@ static int configure_stream(const struct device *dev_i2s, enum i2s_dir dir)
 	i2s_cfg.word_size = 16U;
 	i2s_cfg.channels = 2U;
 	i2s_cfg.format = I2S_FMT_DATA_FORMAT_I2S;
-	i2s_cfg.frame_clk_freq = FRAME_CLK_FREQ;
+	i2s_cfg.frame_clk_freq = frame_clk_freq;
 	i2s_cfg.block_size = BLOCK_SIZE;
 	i2s_cfg.timeout = TIMEOUT;
 
@@ -179,16 +178,7 @@ static int configure_stream(const struct device *dev_i2s, enum i2s_dir dir)
 	return TC_PASS;
 }
 
-
-/** @brief Short I2S transfer.
- *
- * - TX stream START trigger starts transmission.
- * - RX stream START trigger starts reception.
- * - sending / receiving a short sequence of data returns success.
- * - TX stream DRAIN trigger empties the transmit queue.
- * - RX stream STOP trigger stops reception.
- */
-ZTEST(drivers_i2s_speed, test_i2s_transfer_short)
+static void i2s_transfer_short(uint32_t frame_clk_freq)
 {
 	if (IS_ENABLED(CONFIG_I2S_TEST_USE_I2S_DIR_BOTH)) {
 		TC_PRINT("RX/TX transfer requires use of I2S_DIR_BOTH.\n");
@@ -201,6 +191,12 @@ ZTEST(drivers_i2s_speed, test_i2s_transfer_short)
 	size_t rx_size;
 	int ret;
 
+	/* Configure I2S TX and I2S RX transfer. */
+	ret = configure_stream(dev_i2s_tx, I2S_DIR_TX, frame_clk_freq);
+	zassert_equal(ret, TC_PASS);
+	ret = configure_stream(dev_i2s_rx, I2S_DIR_RX, frame_clk_freq);
+	zassert_equal(ret, TC_PASS);
+
 	/* Prefill TX queue */
 	for (int i = 0; i < 3; i++) {
 		ret = k_mem_slab_alloc(&tx_0_mem_slab, &tx_block, K_FOREVER);
@@ -258,6 +254,111 @@ ZTEST(drivers_i2s_speed, test_i2s_transfer_short)
 	TC_PRINT("%d<-OK\n", 3);
 }
 
+/** @brief Short I2S transfer at 8000 samples per second.
+ *
+ * - TX stream START trigger starts transmission.
+ * - RX stream START trigger starts reception.
+ * - sending / receiving a short sequence of data returns success.
+ * - TX stream DRAIN trigger empties the transmit queue.
+ * - RX stream STOP trigger stops reception.
+ */
+ZTEST(drivers_i2s_speed, test_i2s_transfer_short_08000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_8000);
+
+	i2s_transfer_short(8000);
+}
+
+/** @brief Short I2S transfer at 16000 samples per second.
+ *
+ * - TX stream START trigger starts transmission.
+ * - RX stream START trigger starts reception.
+ * - sending / receiving a short sequence of data returns success.
+ * - TX stream DRAIN trigger empties the transmit queue.
+ * - RX stream STOP trigger stops reception.
+ */
+ZTEST(drivers_i2s_speed, test_i2s_transfer_short_16000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_16000);
+
+	i2s_transfer_short(16000);
+}
+
+/** @brief Short I2S transfer at 32000 samples per second.
+ *
+ * - TX stream START trigger starts transmission.
+ * - RX stream START trigger starts reception.
+ * - sending / receiving a short sequence of data returns success.
+ * - TX stream DRAIN trigger empties the transmit queue.
+ * - RX stream STOP trigger stops reception.
+ */
+ZTEST(drivers_i2s_speed, test_i2s_transfer_short_32000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_32000);
+
+	i2s_transfer_short(32000);
+}
+
+/** @brief Short I2S transfer at 44100 samples per second.
+ *
+ * - TX stream START trigger starts transmission.
+ * - RX stream START trigger starts reception.
+ * - sending / receiving a short sequence of data returns success.
+ * - TX stream DRAIN trigger empties the transmit queue.
+ * - RX stream STOP trigger stops reception.
+ */
+ZTEST(drivers_i2s_speed, test_i2s_transfer_short_44100)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_44100);
+
+	i2s_transfer_short(44100);
+}
+
+/** @brief Short I2S transfer at 48000 samples per second.
+ *
+ * - TX stream START trigger starts transmission.
+ * - RX stream START trigger starts reception.
+ * - sending / receiving a short sequence of data returns success.
+ * - TX stream DRAIN trigger empties the transmit queue.
+ * - RX stream STOP trigger stops reception.
+ */
+ZTEST(drivers_i2s_speed, test_i2s_transfer_short_48000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_48000);
+
+	i2s_transfer_short(48000);
+}
+
+/** @brief Short I2S transfer at 88200 samples per second.
+ *
+ * - TX stream START trigger starts transmission.
+ * - RX stream START trigger starts reception.
+ * - sending / receiving a short sequence of data returns success.
+ * - TX stream DRAIN trigger empties the transmit queue.
+ * - RX stream STOP trigger stops reception.
+ */
+ZTEST(drivers_i2s_speed, test_i2s_transfer_short_88200)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_88200);
+
+	i2s_transfer_short(88200);
+}
+
+/** @brief Short I2S transfer at 96000 samples per second.
+ *
+ * - TX stream START trigger starts transmission.
+ * - RX stream START trigger starts reception.
+ * - sending / receiving a short sequence of data returns success.
+ * - TX stream DRAIN trigger empties the transmit queue.
+ * - RX stream STOP trigger stops reception.
+ */
+ZTEST(drivers_i2s_speed, test_i2s_transfer_short_96000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_96000);
+
+	i2s_transfer_short(96000);
+}
+
 /** @brief Long I2S transfer.
  *
  * - TX stream START trigger starts transmission.
@@ -266,7 +367,7 @@ ZTEST(drivers_i2s_speed, test_i2s_transfer_short)
  * - TX stream DRAIN trigger empties the transmit queue.
  * - RX stream STOP trigger stops reception.
  */
-ZTEST(drivers_i2s_speed, test_i2s_transfer_long)
+ZTEST(drivers_i2s_speed, test_i2s_transfer_long_44100)
 {
 	if (IS_ENABLED(CONFIG_I2S_TEST_USE_I2S_DIR_BOTH)) {
 		TC_PRINT("RX/TX transfer requires use of I2S_DIR_BOTH.\n");
@@ -281,6 +382,13 @@ ZTEST(drivers_i2s_speed, test_i2s_transfer_long)
 	int rx_idx = 0;
 	int num_verified;
 	int ret;
+	uint32_t frame_clk_freq = 44100;
+
+	/* Configure I2S TX and I2S RX transfer. */
+	ret = configure_stream(dev_i2s_tx, I2S_DIR_TX, frame_clk_freq);
+	zassert_equal(ret, TC_PASS);
+	ret = configure_stream(dev_i2s_rx, I2S_DIR_RX, frame_clk_freq);
+	zassert_equal(ret, TC_PASS);
 
 	/* Prepare TX data blocks */
 	for (tx_idx = 0; tx_idx < NUM_BLOCKS; tx_idx++) {
@@ -349,14 +457,7 @@ ZTEST(drivers_i2s_speed, test_i2s_transfer_long)
 	zassert_equal(num_verified, NUM_BLOCKS, "Invalid RX blocks received");
 }
 
-
-/** @brief Short I2S transfer using I2S_DIR_BOTH.
- *
- * - START trigger starts both the transmission and reception.
- * - Sending / receiving a short sequence of data returns success.
- * - DRAIN trigger empties the transmit queue and stops both streams.
- */
-ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short)
+static void i2s_dir_both_transfer_short(uint32_t frame_clk_freq)
 {
 	if (!dir_both_supported) {
 		TC_PRINT("I2S_DIR_BOTH value is not supported.\n");
@@ -369,6 +470,10 @@ ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short)
 	size_t rx_size;
 	int ret;
 
+	/* Configure I2S Dir Both transfer. */
+	ret = configure_stream(dev_i2s_rxtx, I2S_DIR_BOTH, frame_clk_freq);
+	zassert_equal(ret, TC_PASS);
+
 	/* Prefill TX queue */
 	for (int i = 0; i < 3; i++) {
 		ret = k_mem_slab_alloc(&tx_0_mem_slab, &tx_block, K_FOREVER);
@@ -417,13 +522,104 @@ ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short)
 	TC_PRINT("%d<-OK\n", 3);
 }
 
+/** @brief Short I2S transfer using I2S_DIR_BOTH and sample rate of 8000.
+ *
+ * - START trigger starts both the transmission and reception.
+ * - Sending / receiving a short sequence of data returns success.
+ * - DRAIN trigger empties the transmit queue and stops both streams.
+ */
+ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short_08000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_8000);
+
+	i2s_dir_both_transfer_short(8000);
+}
+
+/** @brief Short I2S transfer using I2S_DIR_BOTH and sample rate of 16000.
+ *
+ * - START trigger starts both the transmission and reception.
+ * - Sending / receiving a short sequence of data returns success.
+ * - DRAIN trigger empties the transmit queue and stops both streams.
+ */
+ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short_16000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_16000);
+
+	i2s_dir_both_transfer_short(16000);
+}
+
+/** @brief Short I2S transfer using I2S_DIR_BOTH and sample rate of 32000.
+ *
+ * - START trigger starts both the transmission and reception.
+ * - Sending / receiving a short sequence of data returns success.
+ * - DRAIN trigger empties the transmit queue and stops both streams.
+ */
+ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short_32000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_32000);
+
+	i2s_dir_both_transfer_short(32000);
+}
+
+/** @brief Short I2S transfer using I2S_DIR_BOTH and sample rate of 44100.
+ *
+ * - START trigger starts both the transmission and reception.
+ * - Sending / receiving a short sequence of data returns success.
+ * - DRAIN trigger empties the transmit queue and stops both streams.
+ */
+ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short_44100)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_44100);
+
+	i2s_dir_both_transfer_short(44100);
+}
+
+/** @brief Short I2S transfer using I2S_DIR_BOTH and sample rate of 48000.
+ *
+ * - START trigger starts both the transmission and reception.
+ * - Sending / receiving a short sequence of data returns success.
+ * - DRAIN trigger empties the transmit queue and stops both streams.
+ */
+ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short_48000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_48000);
+
+	i2s_dir_both_transfer_short(48000);
+}
+
+/** @brief Short I2S transfer using I2S_DIR_BOTH and sample rate of 88200.
+ *
+ * - START trigger starts both the transmission and reception.
+ * - Sending / receiving a short sequence of data returns success.
+ * - DRAIN trigger empties the transmit queue and stops both streams.
+ */
+ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short_88200)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_88200);
+
+	i2s_dir_both_transfer_short(88200);
+}
+
+/** @brief Short I2S transfer using I2S_DIR_BOTH and sample rate of 96000.
+ *
+ * - START trigger starts both the transmission and reception.
+ * - Sending / receiving a short sequence of data returns success.
+ * - DRAIN trigger empties the transmit queue and stops both streams.
+ */
+ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short_96000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_96000);
+
+	i2s_dir_both_transfer_short(96000);
+}
+
 /** @brief Long I2S transfer using I2S_DIR_BOTH.
  *
  * - START trigger starts both the transmission and reception.
  * - Sending / receiving a long sequence of data returns success.
  * - DRAIN trigger empties the transmit queue and stops both streams.
  */
-ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_long)
+ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_long_44100)
 {
 	if (!dir_both_supported) {
 		TC_PRINT("I2S_DIR_BOTH value is not supported.\n");
@@ -438,6 +634,11 @@ ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_long)
 	int rx_idx = 0;
 	int num_verified;
 	int ret;
+	uint32_t frame_clk_freq = 44100;
+
+	/* Configure I2S Dir Both transfer. */
+	ret = configure_stream(dev_i2s_rxtx, I2S_DIR_BOTH, frame_clk_freq);
+	zassert_equal(ret, TC_PASS);
 
 	/* Prepare TX data blocks */
 	for (tx_idx = 0; tx_idx < NUM_BLOCKS; tx_idx++) {
@@ -499,24 +700,15 @@ ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_long)
 
 static void *test_i2s_speed_configure(void)
 {
-	/* Configure I2S TX transfer. */
-	int ret;
-
+	/* Check if I2S TX and I2S RX devices are ready. */
 	dev_i2s_tx = DEVICE_DT_GET_OR_NULL(I2S_DEV_NODE_TX);
 	zassert_not_null(dev_i2s_tx, "transfer device not found");
 	zassert(device_is_ready(dev_i2s_tx), "transfer device not ready");
 
-	ret = configure_stream(dev_i2s_tx, I2S_DIR_TX);
-	zassert_equal(ret, TC_PASS);
-
-	/* Configure I2S RX transfer. */
 	dev_i2s_rx = DEVICE_DT_GET_OR_NULL(I2S_DEV_NODE_RX);
 	zassert_not_null(dev_i2s_rx, "receive device not found");
 	zassert(device_is_ready(dev_i2s_rx), "receive device not ready");
 
-	ret = configure_stream(dev_i2s_rx, I2S_DIR_RX);
-	zassert_equal(ret, TC_PASS);
-
 	return 0;
 }
 
@@ -529,7 +721,7 @@ static void *test_i2s_speed_rxtx_configure(void)
 	zassert_not_null(dev_i2s_rxtx, "receive device not found");
 	zassert(device_is_ready(dev_i2s_rxtx), "receive device not ready");
 
-	ret = configure_stream(dev_i2s_rxtx, I2S_DIR_BOTH);
+	ret = configure_stream(dev_i2s_rxtx, I2S_DIR_BOTH, 44100);
 	zassert_equal(ret, TC_PASS);
 
 	/* Check if the tested driver supports the I2S_DIR_BOTH value.
diff --git a/tests/drivers/i2s/i2s_speed/testcase.yaml b/tests/drivers/i2s/i2s_speed/testcase.yaml
index 9f8601d21c0..6bc15a41364 100644
--- a/tests/drivers/i2s/i2s_speed/testcase.yaml
+++ b/tests/drivers/i2s/i2s_speed/testcase.yaml
@@ -16,3 +16,16 @@ tests:
     harness: ztest
     harness_config:
       fixture: gpio_loopback
+  drivers.i2s.speed.gpio_loopback.aclk:
+    depends_on:
+      - i2s
+      - gpio
+    tags:
+      - drivers
+      - i2s
+    filter: CONFIG_I2S_TEST_USE_GPIO_LOOPBACK
+    harness: ztest
+    harness_config:
+      fixture: gpio_loopback
+    extra_args: EXTRA_DTC_OVERLAY_FILE="boards/nrf5340dk_nrf5340_cpuapp_aclk.overlay"
+    platform_allow: nrf5340dk/nrf5340/cpuapp

From 70f9032a2066b6c2a608902dbe50886f3a72627e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 13 Feb 2025 08:36:02 +0100
Subject: [PATCH 2636/2913] [nrf fromtree] drivers: adc: nrfx_saadc: Add
 support for AIN8-AIN13 on nrf54h20
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extend support in dt bindings and in the driver to allow use of
AIN8 to AIN13 analog inputs.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit f2e1ac0da5e7a1da724624dc98a0dc9cb1595683)
---
 drivers/adc/adc_nrfx_saadc.c                  |  9 ++++++++-
 dts/common/nordic/nrf54h20.dtsi               |  2 +-
 dts/common/nordic/nrf9280.dtsi                |  2 +-
 .../dt-bindings/adc/nrf-saadc-haltium.h       | 19 +++++++++++++++++++
 4 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 include/zephyr/dt-bindings/adc/nrf-saadc-haltium.h

diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index 1418ae286f5..22a839a5f35 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -9,6 +9,7 @@
 #include <haly/nrfy_saadc.h>
 #include <zephyr/dt-bindings/adc/nrf-saadc-v3.h>
 #include <zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h>
+#include <zephyr/dt-bindings/adc/nrf-saadc-haltium.h>
 #include <zephyr/linker/devicetree_regions.h>
 #include <zephyr/pm/device.h>
 #include <zephyr/pm/device_runtime.h>
@@ -23,7 +24,7 @@ LOG_MODULE_REGISTER(adc_nrfx_saadc);
 #if (NRF_SAADC_HAS_AIN_AS_PIN)
 
 #if defined(CONFIG_NRF_PLATFORM_HALTIUM)
-static const uint8_t saadc_psels[NRF_SAADC_AIN7 + 1] = {
+static const uint32_t saadc_psels[NRF_SAADC_AIN13 + 1] = {
 	[NRF_SAADC_AIN0] = NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
 	[NRF_SAADC_AIN1] = NRF_PIN_PORT_TO_PIN_NUMBER(1U, 1),
 	[NRF_SAADC_AIN2] = NRF_PIN_PORT_TO_PIN_NUMBER(2U, 1),
@@ -32,6 +33,12 @@ static const uint8_t saadc_psels[NRF_SAADC_AIN7 + 1] = {
 	[NRF_SAADC_AIN5] = NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
 	[NRF_SAADC_AIN6] = NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
 	[NRF_SAADC_AIN7] = NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
+	[NRF_SAADC_AIN8] = NRF_PIN_PORT_TO_PIN_NUMBER(0U, 9),
+	[NRF_SAADC_AIN9] = NRF_PIN_PORT_TO_PIN_NUMBER(1U, 9),
+	[NRF_SAADC_AIN10] = NRF_PIN_PORT_TO_PIN_NUMBER(2U, 9),
+	[NRF_SAADC_AIN11] = NRF_PIN_PORT_TO_PIN_NUMBER(3U, 9),
+	[NRF_SAADC_AIN12] = NRF_PIN_PORT_TO_PIN_NUMBER(4U, 9),
+	[NRF_SAADC_AIN13] = NRF_PIN_PORT_TO_PIN_NUMBER(5U, 9),
 };
 #elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
 static const uint32_t saadc_psels[NRF_SAADC_DVDD + 1] = {
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index bdf8c3fcc0e..bfce794ff3c 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -7,7 +7,7 @@
 #include <mem.h>
 #include <nordic/nrf_common.dtsi>
 
-#include <zephyr/dt-bindings/adc/nrf-saadc.h>
+#include <zephyr/dt-bindings/adc/nrf-saadc-haltium.h>
 #include <zephyr/dt-bindings/misc/nordic-nrf-ficr-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-domain-id-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-owner-id-nrf54h20.h>
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 0907be9d9a6..7166f9a4f6b 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -6,7 +6,7 @@
 
 #include <mem.h>
 #include <nordic/nrf_common.dtsi>
-#include <zephyr/dt-bindings/adc/nrf-saadc.h>
+#include <zephyr/dt-bindings/adc/nrf-saadc-haltium.h>
 #include <zephyr/dt-bindings/misc/nordic-nrf-ficr-nrf9230-engb.h>
 #include <zephyr/dt-bindings/misc/nordic-domain-id-nrf9230.h>
 #include <zephyr/dt-bindings/misc/nordic-owner-id-nrf9230.h>
diff --git a/include/zephyr/dt-bindings/adc/nrf-saadc-haltium.h b/include/zephyr/dt-bindings/adc/nrf-saadc-haltium.h
new file mode 100644
index 00000000000..e0552297522
--- /dev/null
+++ b/include/zephyr/dt-bindings/adc/nrf-saadc-haltium.h
@@ -0,0 +1,19 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_HALTIUM_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_HALTIUM_H_
+
+#include <zephyr/dt-bindings/adc/nrf-saadc.h>
+
+#define NRF_SAADC_AIN8 9
+#define NRF_SAADC_AIN9 10
+#define NRF_SAADC_AIN10 11
+#define NRF_SAADC_AIN11 12
+#define NRF_SAADC_AIN12 13
+#define NRF_SAADC_AIN13 14
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_HALTIUM_H_ */

From 567d10c3a5ffa708c335c9daddd3f5239fc74f85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 6 Mar 2025 12:04:37 +0100
Subject: [PATCH 2637/2913] [nrf fromtree] samples: drivers: adc: adc_sequence:
 Update nrf54h20 configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add AIN9 pin in nrf54h20dk to verify AIN8-AIN13 inputs.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit a5d023a496b4a2fa7009d92dcb9966620caa1612)
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay        | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index 5f7e20136b4..bf53616d928 100644
--- a/samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -12,7 +12,7 @@
 
 / {
 	zephyr,user {
-		io-channels = <&adc 0>, <&adc 1>, <&adc 7>;
+		io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 7>;
 	};
 };
 
@@ -39,6 +39,16 @@
 		zephyr,oversampling = <8>;
 	};
 
+	channel@2 {
+		reg = <2>;
+		zephyr,gain = "ADC_GAIN_1_2";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN9>; /* P9.01 */
+		zephyr,resolution = <12>;
+		zephyr,oversampling = <8>;
+	};
+
 	channel@7 {
 		reg = <7>;
 		zephyr,gain = "ADC_GAIN_1_2";

From dcda1a73b3bdc5cf5f9a17503cead92b3a32cd07 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 18 Feb 2025 10:10:00 +0100
Subject: [PATCH 2638/2913] [nrf fromlist] drivers: timer: nrf_grtc_timer: Move
 up GRTC clock selection

Selection of the LF clock source for the GRTC should be performed
as early as possible, before starting GRTC.

Upstream PR #: 87199

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 drivers/timer/nrf_grtc_timer.c | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/drivers/timer/nrf_grtc_timer.c b/drivers/timer/nrf_grtc_timer.c
index 05779038142..609a32b406a 100644
--- a/drivers/timer/nrf_grtc_timer.c
+++ b/drivers/timer/nrf_grtc_timer.c
@@ -429,13 +429,6 @@ int z_nrf_grtc_wakeup_prepare(uint64_t wake_time_us)
 		nrfy_grtc_timeout_get(NRF_GRTC) * CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC / 32768 +
 		MAX_CC_LATCH_WAIT_TIME_US;
 	k_busy_wait(wait_time);
-#if NRF_GRTC_HAS_CLKSEL
-#if defined(CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC)
-	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFLPRC);
-#elif DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lfxo))
-	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFXO);
-#endif
-#endif
 	k_spin_unlock(&lock, key);
 	return 0;
 }
@@ -475,6 +468,18 @@ static int sys_clock_driver_init(void)
 	IRQ_CONNECT(DT_IRQN(GRTC_NODE), DT_IRQ(GRTC_NODE, priority), nrfx_isr,
 		    nrfx_grtc_irq_handler, 0);
 
+#if defined(CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT) && NRF_GRTC_HAS_CLKSEL
+#if defined(CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC)
+	/* Switch to LFPRC as the low-frequency clock source. */
+	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFLPRC);
+#elif DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lfxo))
+	/* Switch to LFXO as the low-frequency clock source. */
+	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFXO);
+#else
+	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFCLK);
+#endif
+#endif
+
 	err_code = nrfx_grtc_init(0);
 	if (err_code != NRFX_SUCCESS) {
 		return -EPERM;
@@ -508,16 +513,6 @@ static int sys_clock_driver_init(void)
 	z_nrf_clock_control_lf_on(mode);
 #endif
 
-#if defined(CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT) && NRF_GRTC_HAS_CLKSEL
-#if defined(CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC)
-	/* Switch to LFPRC as the low-frequency clock source. */
-	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFLPRC);
-#elif DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lfxo))
-	/* Switch to LFXO as the low-frequency clock source. */
-	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFXO);
-#endif
-#endif
-
 #if defined(CONFIG_NRF_GRTC_ALWAYS_ON)
 	nrfx_grtc_active_request_set(true);
 #endif

From e109db3bbd8dd8237e7ab0763f2530cc57a8f08e Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Mon, 17 Mar 2025 12:38:43 +0100
Subject: [PATCH 2639/2913] [nrf fromlist] modules: hal_nordic: nrfx: switch
 off auto clksel for GRTC

Disable automatic LFCLK selection for GRTC during driver initialization.
For Zephyr applications it is selected by `sys_clock_driver_init()`
depending on configuration and DTS.

Upstream PR #: 87199

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 modules/hal_nordic/nrfx/nrfx_kconfig.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/hal_nordic/nrfx/nrfx_kconfig.h b/modules/hal_nordic/nrfx/nrfx_kconfig.h
index 1eaafa91781..871c66ac325 100644
--- a/modules/hal_nordic/nrfx/nrfx_kconfig.h
+++ b/modules/hal_nordic/nrfx/nrfx_kconfig.h
@@ -170,6 +170,7 @@
 
 #ifdef CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT
 #define NRF_GRTC_HAS_EXTENDED 1
+#define NRFX_GRTC_CONFIG_LFCLK_SELECT_AT_INIT 0
 #endif
 #ifdef CONFIG_NRF_GRTC_TIMER_AUTO_KEEP_ALIVE
 #define NRFX_GRTC_CONFIG_AUTOEN 1

From 4ba36f2e6f4e9ba5384c664b398d5186c9a1252b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20St=C4=99pnicki?=
 <lukasz.stepnicki@nordicsemi.no>
Date: Wed, 12 Mar 2025 13:32:10 +0100
Subject: [PATCH 2640/2913] [nrf fromtree] nrfs: added audiopll service
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added configuration for new audio PLL service.
Pull in new service implementation in new hal nordic.

Signed-off-by: Łukasz Stępnicki <lukasz.stepnicki@nordicsemi.no>
(cherry picked from commit 2bac5eec848d9479cb0ab17e36444f7ddf89e617)
---
 modules/hal_nordic/nrfs/CMakeLists.txt | 1 +
 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, 16 insertions(+), 1 deletion(-)

diff --git a/modules/hal_nordic/nrfs/CMakeLists.txt b/modules/hal_nordic/nrfs/CMakeLists.txt
index cf738fe5bf2..d94c2da32a8 100644
--- a/modules/hal_nordic/nrfs/CMakeLists.txt
+++ b/modules/hal_nordic/nrfs/CMakeLists.txt
@@ -22,6 +22,7 @@ if(CONFIG_NRFS)
     zephyr_library_sources(${HELPERS_DIR}/dvfs_oppoint.c)
 
     if(CONFIG_NRFS_LOCAL_DOMAIN)
+        zephyr_library_sources_ifdef(CONFIG_NRFS_AUDIOPLL_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_audiopll.c)
         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)
diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig
index 0684ec222be..f5d4e92f94d 100644
--- a/modules/hal_nordic/nrfs/Kconfig
+++ b/modules/hal_nordic/nrfs/Kconfig
@@ -7,6 +7,9 @@ config HAS_NRFS
 menu "nRF Services"
 	depends on HAS_NRFS
 
+config NRFS_HAS_AUDIOPLL_SERVICE
+	bool
+
 config NRFS_HAS_CLOCK_SERVICE
 	bool
 
@@ -133,6 +136,11 @@ config NRFS_SWEXT_SERVICE_ENABLED
 	depends on NRFS_HAS_SWEXT_SERVICE
 	default y
 
+config NRFS_AUDIOPLL_SERVICE_ENABLED
+	bool "Audio PLL service"
+	depends on NRFS_HAS_AUDIOPLL_SERVICE
+	default y if SOC_NRF54H20_CPUAPP
+
 endmenu
 
 rsource "backends/Kconfig"
diff --git a/modules/hal_nordic/nrfs/nrfs_config.h b/modules/hal_nordic/nrfs/nrfs_config.h
index da3cc1ada1b..9d1a9b7b6b3 100644
--- a/modules/hal_nordic/nrfs/nrfs_config.h
+++ b/modules/hal_nordic/nrfs/nrfs_config.h
@@ -56,6 +56,10 @@
 #define NRFS_SWEXT_SERVICE_ENABLED
 #endif
 
+#ifdef CONFIG_NRFS_AUDIOPLL_SERVICE_ENABLED
+#define NRFS_AUDIOPLL_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 fa4ca5eb9bc..842e0e33807 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -23,6 +23,7 @@ config SOC_NRF54H20_CPUAPP_COMMON
 	select HAS_NORDIC_DMM
 	select HAS_NORDIC_RAM_CTRL
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
+	select NRFS_HAS_AUDIOPLL_SERVICE
 	select NRFS_HAS_CLOCK_SERVICE
 	select NRFS_HAS_DVFS_SERVICE
 	select NRFS_HAS_GDFS_SERVICE
@@ -49,6 +50,7 @@ config SOC_NRF54H20_CPURAD_COMMON
 	select CPU_HAS_FPU
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
+	select NRFS_HAS_AUDIOPLL_SERVICE
 	select NRFS_HAS_CLOCK_SERVICE
 	select NRFS_HAS_GDFS_SERVICE
 	select NRFS_HAS_GDPWR_SERVICE
diff --git a/west.yml b/west.yml
index 1c13e7c2d08..d9ad7fd8e01 100644
--- a/west.yml
+++ b/west.yml
@@ -193,7 +193,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 35bf3ca665122ddfe8c0c38cec8f19deef2ff62d
+      revision: 7440d573d36953b80cb6fb6438b147acb21bf753
       path: modules/hal/nordic
       groups:
         - hal

From f937fc6cf013f49d966da397b6fe5a13c5bfa7e3 Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Mon, 10 Mar 2025 22:06:13 +0100
Subject: [PATCH 2641/2913] [nrf fromtree] bluetooth: mesh: set subscription
 address on response

This fixes an issue where a subsequent Config Model Subscription Add
message with the same virtual address UUID would result in a Config
Model Subscription Status message with the Address field incorrectly set
to 0.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit d3997c6eb07e8ae38456f7006ed8c5c6bd0edf6e)
---
 subsys/bluetooth/mesh/cfg_srv.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/subsys/bluetooth/mesh/cfg_srv.c b/subsys/bluetooth/mesh/cfg_srv.c
index 5ffb4c303c8..48ac63760c2 100644
--- a/subsys/bluetooth/mesh/cfg_srv.c
+++ b/subsys/bluetooth/mesh/cfg_srv.c
@@ -1429,6 +1429,7 @@ static int mod_sub_va_add(const struct bt_mesh_model *model,
 		/* Tried to add existing subscription */
 		status = STATUS_SUCCESS;
 		(void)bt_mesh_va_del(va->uuid);
+		sub_addr = va->addr;
 		goto send_status;
 	}
 

From d1c3e7e87a2adc9296bc3028b49d81cfcbcfc0b2 Mon Sep 17 00:00:00 2001
From: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Date: Thu, 6 Feb 2025 11:56:36 +0100
Subject: [PATCH 2642/2913] [nrf fromtree] openthread: Add Kconfig to set PSA
 ITS non-volatile offset

The offset value in the PSA ITS non-volatile space is dedicated to
OpenThread key reference IDs. This offset must not overwrite any
other ranges already in use within the PSA ITS non-volatile space.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
(cherry picked from commit ba9f6279f50a982c503e1d358c9118102d5f3a06)
---
 modules/openthread/Kconfig.thread                      |  8 ++++++++
 .../platform/openthread-core-zephyr-config.h           | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/modules/openthread/Kconfig.thread b/modules/openthread/Kconfig.thread
index 2bababd4fee..81c0ab20afc 100644
--- a/modules/openthread/Kconfig.thread
+++ b/modules/openthread/Kconfig.thread
@@ -250,3 +250,11 @@ config OPENTHREAD_MLE_CHILD_TIMEOUT
 	default 240
 	help
 	  The value of MLE child timeout in seconds.
+
+config OPENTHREAD_PSA_ITS_NVM_OFFSET
+	hex "NVM offset while using key refs"
+	default 0x20000
+	help
+	  The offset value in the PSA ITS non-volatile space is dedicated to OpenThread
+	  key reference IDs. This offset must not overwrite any other ranges already in
+	  use within the PSA ITS non-volatile space.
diff --git a/modules/openthread/platform/openthread-core-zephyr-config.h b/modules/openthread/platform/openthread-core-zephyr-config.h
index dc2e46b1e70..c495c8ca4ef 100644
--- a/modules/openthread/platform/openthread-core-zephyr-config.h
+++ b/modules/openthread/platform/openthread-core-zephyr-config.h
@@ -510,4 +510,14 @@
 #define OPENTHREAD_CONFIG_MLE_CHILD_TIMEOUT_DEFAULT CONFIG_OPENTHREAD_MLE_CHILD_TIMEOUT
 #endif
 
+/**
+ * @def OPENTHREAD_CONFIG_PSA_ITS_NVM_OFFSET
+ *
+ * NVM offset while using key refs.
+ *
+ */
+#ifdef CONFIG_OPENTHREAD_PSA_ITS_NVM_OFFSET
+#define OPENTHREAD_CONFIG_PSA_ITS_NVM_OFFSET CONFIG_OPENTHREAD_PSA_ITS_NVM_OFFSET
+#endif
+
 #endif  /* OPENTHREAD_CORE_ZEPHYR_CONFIG_H_ */

From c041c2938a5e6d47a95d5f17fc245439cb8c5060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Battrel?= <theo.battrel@nordicsemi.no>
Date: Wed, 19 Mar 2025 08:05:25 +0100
Subject: [PATCH 2643/2913] Revert "[nrf noup] Bluetooth: update experimental
 for qualification"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f1f6bc0f98f77e042ca8454caef1eaef498a5aed.

Signed-off-by: Théo Battrel <theo.battrel@nordicsemi.no>
---
 subsys/bluetooth/controller/Kconfig | 4 +---
 subsys/bluetooth/host/Kconfig.l2cap | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
index 3360db0abc1..46f70f2c414 100644
--- a/subsys/bluetooth/controller/Kconfig
+++ b/subsys/bluetooth/controller/Kconfig
@@ -143,12 +143,10 @@ config BT_CTLR
 	  the HAS_BT_CTLR option.
 
 config BT_LL_SW_SPLIT
-	bool "Software-based BLE Link Layer [EXPERIMENTAL]"
+	bool "Software-based BLE Link Layer"
 	default y
 	depends on DT_HAS_ZEPHYR_BT_HCI_LL_SW_SPLIT_ENABLED
 	select HAS_BT_CTLR
-	select EXPERIMENTAL
-	select ENTROPY_GENERATOR
 	help
 	  Use Zephyr software BLE Link Layer ULL LLL split implementation.
 
diff --git a/subsys/bluetooth/host/Kconfig.l2cap b/subsys/bluetooth/host/Kconfig.l2cap
index 34e862378c5..2841e7d8a12 100644
--- a/subsys/bluetooth/host/Kconfig.l2cap
+++ b/subsys/bluetooth/host/Kconfig.l2cap
@@ -52,7 +52,7 @@ config BT_L2CAP_DYNAMIC_CHANNEL
 	  allowing the creation of dynamic L2CAP Channels.
 
 config BT_L2CAP_ECRED
-	bool "L2CAP Enhanced Credit Based Flow Control support [EXPERIMENTAL]"
+	bool "L2CAP Enhanced Credit Based Flow Control support"
 	depends on BT_L2CAP_DYNAMIC_CHANNEL
 	help
 	  This option enables support for LE Connection oriented Channels with

From 184dff2e11bb72e26b4bfde2585158323cd29e3a Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Mon, 10 Feb 2025 08:47:45 +0100
Subject: [PATCH 2644/2913] [nrf fromtree] Bluetooth: Rename BLE to Bluetooth
 (LE) where applicable

The BLE acronym is not an official description of Bluetooth
LE, and the Bluetooth SIG only ever refers to it as Bluetooth
Low Energy or Bluetooth LE, so Zephyr should as well.

This commit does not change any board or vendor specific
documentation, and the term BLE may still be used in those.
It will be up to the vendors to update it if they want,
since many of them are using the term BLE in their
products.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit 571f26cf1a7c5d7b60b2cb4ccc3158e36e01effd)
---
 drivers/bluetooth/hci/spi.c                        |  4 ++--
 drivers/flash/Kconfig.nrf                          |  2 +-
 drivers/flash/Kconfig.nrf_rram                     |  2 +-
 drivers/hwinfo/hwinfo_nrf.c                        |  2 +-
 include/zephyr/bluetooth/hci_types.h               |  2 +-
 include/zephyr/bluetooth/mesh/statistic.h          |  4 ++--
 include/zephyr/logging/log_backend_ble.h           | 10 +++++-----
 include/zephyr/mgmt/mcumgr/transport/smp.h         |  6 +++---
 subsys/bluetooth/controller/Kconfig                | 14 +++++++-------
 subsys/bluetooth/controller/Kconfig.ll_sw_split    | 10 +++++-----
 .../controller/ll_sw/nordic/hal/nrf5/radio/radio.c |  4 ++--
 subsys/bluetooth/host/Kconfig                      |  2 +-
 subsys/bluetooth/host/uuid.c                       |  2 +-
 subsys/bluetooth/mesh/Kconfig                      |  8 ++++----
 subsys/bluetooth/mesh/crypto_psa.c                 | 10 +++++-----
 subsys/bluetooth/services/ots/ots_l2cap.c          |  2 +-
 subsys/logging/backends/Kconfig.ble                |  2 +-
 subsys/logging/backends/log_backend_ble.c          |  8 ++++----
 .../df/connectionless_cte_chains/CMakeLists.txt    |  2 +-
 .../host/adv/extended/tests_scripts/ext_adv.sh     |  2 +-
 tests/bsim/bluetooth/ll/edtt/README.txt            |  4 ++--
 tests/bsim/bluetooth/mesh/src/main.c               |  2 +-
 .../mesh/tests_scripts/advertiser/disable.sh       |  2 +-
 23 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/drivers/bluetooth/hci/spi.c b/drivers/bluetooth/hci/spi.c
index 73ac224200b..3ce62548ea0 100644
--- a/drivers/bluetooth/hci/spi.c
+++ b/drivers/bluetooth/hci/spi.c
@@ -377,7 +377,7 @@ static int bt_spi_open(const struct device *dev, bt_hci_recv_t recv)
 	struct bt_spi_data *hci = dev->data;
 	int err;
 
-	/* Configure RST pin and hold BLE in Reset */
+	/* Configure RST pin and hold Bluetooth LE in Reset */
 	err = gpio_pin_configure_dt(&rst_gpio, GPIO_OUTPUT_ACTIVE);
 	if (err) {
 		return err;
@@ -403,7 +403,7 @@ static int bt_spi_open(const struct device *dev, bt_hci_recv_t recv)
 
 	hci->recv = recv;
 
-	/* Take BLE out of reset */
+	/* Take Bluetooth LE out of reset */
 	k_sleep(K_MSEC(DT_INST_PROP_OR(0, reset_assert_duration_ms, 0)));
 	gpio_pin_set_dt(&rst_gpio, 0);
 
diff --git a/drivers/flash/Kconfig.nrf b/drivers/flash/Kconfig.nrf
index 48c4e0d3fb9..6e29ef952ca 100644
--- a/drivers/flash/Kconfig.nrf
+++ b/drivers/flash/Kconfig.nrf
@@ -37,7 +37,7 @@ config SOC_FLASH_NRF_RADIO_SYNC_TICKER
 	depends on BT_LL_SW_SPLIT
 	help
 	  Enable synchronization between flash memory driver and radio using
-	  BLE LL controller ticker API.
+	  Bluetooth LE LL controller ticker API.
 
 config SOC_FLASH_NRF_RADIO_SYNC_NONE
 	bool "none"
diff --git a/drivers/flash/Kconfig.nrf_rram b/drivers/flash/Kconfig.nrf_rram
index 1e433b66d1e..a59560e86a4 100644
--- a/drivers/flash/Kconfig.nrf_rram
+++ b/drivers/flash/Kconfig.nrf_rram
@@ -50,7 +50,7 @@ config SOC_FLASH_NRF_RADIO_SYNC_TICKER
 	depends on BT_LL_SW_SPLIT
 	help
 	  Enable synchronization between flash memory driver and radio using
-	  BLE LL controller ticker API.
+	  Bluetooth LE LL controller ticker API.
 
 config SOC_FLASH_NRF_RADIO_SYNC_NONE
 	bool "none"
diff --git a/drivers/hwinfo/hwinfo_nrf.c b/drivers/hwinfo/hwinfo_nrf.c
index b045912dd6b..f5a6ed38a20 100644
--- a/drivers/hwinfo/hwinfo_nrf.c
+++ b/drivers/hwinfo/hwinfo_nrf.c
@@ -41,7 +41,7 @@ ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 	buf[1] = nrf_ficr_deviceid_get(NRF_FICR, 1);
 #endif
 #elif NRF_FICR_HAS_DEVICE_ADDR || NRF_FICR_HAS_BLE_ADDR
-	/* DEVICEID is not accessible, use device/ble address instead.
+	/* DEVICEID is not accessible, use device/Bluetooth LE address instead.
 	 * Assume that it is always accessible from the non-secure image.
 	 */
 	buf[0] = nrf_ficr_deviceaddr_get(NRF_FICR, 0);
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 9717e8ed736..1a732790077 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -1028,7 +1028,7 @@ struct bt_hci_rp_read_encryption_key_size {
 	uint8_t  key_size;
 } __packed;
 
-/* BLE */
+/* Bluetooth LE */
 
 #define BT_HCI_OP_LE_SET_EVENT_MASK             BT_OP(BT_OGF_LE, 0x0001) /* 0x2001 */
 struct bt_hci_cp_le_set_event_mask {
diff --git a/include/zephyr/bluetooth/mesh/statistic.h b/include/zephyr/bluetooth/mesh/statistic.h
index c5403d2fd54..288cd77ff8f 100644
--- a/include/zephyr/bluetooth/mesh/statistic.h
+++ b/include/zephyr/bluetooth/mesh/statistic.h
@@ -1,5 +1,5 @@
 /** @file
- *  @brief BLE mesh statistic APIs.
+ *  @brief Bluetooth Mesh statistic APIs.
  */
 
 /*
@@ -51,7 +51,7 @@ struct bt_mesh_statistic {
 
 /** @brief Get mesh frame handling statistic.
  *
- *  @param st   BLE mesh statistic.
+ *  @param st   Bluetooh Mesh statistic.
  */
 void bt_mesh_stat_get(struct bt_mesh_statistic *st);
 
diff --git a/include/zephyr/logging/log_backend_ble.h b/include/zephyr/logging/log_backend_ble.h
index ea6752de747..b544c3e2d77 100644
--- a/include/zephyr/logging/log_backend_ble.h
+++ b/include/zephyr/logging/log_backend_ble.h
@@ -9,7 +9,7 @@
 
 #include <stdbool.h>
 /**
- * @brief Raw adv UUID data to add the ble backend for the use with apps
+ * @brief Raw adv UUID data to add the Bluetooth backend for the use with apps
  *        such as the NRF Toolbox
  *
  */
@@ -19,7 +19,7 @@
 		0x6E
 
 /**
- * @brief Hook for application to know when the ble backend
+ * @brief Hook for application to know when the Bluetooth backend
  *        is enabled or disabled.
  * @param backend_status True if the backend is enabled or false if disabled
  * @param ctx User context
@@ -28,10 +28,10 @@
 typedef void (*logger_backend_ble_hook)(bool backend_status, void *ctx);
 
 /**
- * @brief Allows application to add a hook for the status of the BLE
+ * @brief Allows application to add a hook for the status of the Bluetooth
  *        logger backend.
- * @details The BLE logger backend is enabled or disabled auomatically by
- *          the subscription of the notification characteristic of this BLE
+ * @details The Bluetooth logger backend is enabled or disabled auomatically by
+ *          the subscription of the notification characteristic of this Bluetooth
  *          Logger backend service.
  *
  * @param hook The hook that will be called when the status of the backend changes
diff --git a/include/zephyr/mgmt/mcumgr/transport/smp.h b/include/zephyr/mgmt/mcumgr/transport/smp.h
index 38aa1b0e0c2..a6542845d94 100644
--- a/include/zephyr/mgmt/mcumgr/transport/smp.h
+++ b/include/zephyr/mgmt/mcumgr/transport/smp.h
@@ -42,7 +42,7 @@ typedef int (*smp_transport_out_fn)(struct net_buf *nb);
  * The supplied net_buf should contain a request received from the peer whose
  * MTU is being queried.  This function takes a net_buf parameter because some
  * transports store connection-specific information in the net_buf user header
- * (e.g., the BLE transport stores the peer address).
+ * (e.g., the Bluetooth transport stores the peer address).
  *
  * @param nb                    Contains a request from the relevant peer.
  *
@@ -55,7 +55,7 @@ typedef uint16_t (*smp_transport_get_mtu_fn)(const struct net_buf *nb);
  * @brief SMP copy user_data callback
  *
  * The supplied src net_buf should contain a user_data that cannot be copied
- * using regular memcpy function (e.g., the BLE transport net_buf user_data
+ * using regular memcpy function (e.g., the Bluetooth transport net_buf user_data
  * stores the connection reference that has to be incremented when is going
  * to be used by another buffer).
  *
@@ -71,7 +71,7 @@ typedef int (*smp_transport_ud_copy_fn)(struct net_buf *dst,
  * @brief SMP free user_data callback
  *
  * This function frees net_buf user data, because some transports store
- * connection-specific information in the net_buf user data (e.g., the BLE
+ * connection-specific information in the net_buf user data (e.g., the Bluetooth
  * transport stores the connection reference that has to be decreased).
  *
  * @param ud                    Contains a user_data pointer to be freed.
diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
index 46f70f2c414..84195a78346 100644
--- a/subsys/bluetooth/controller/Kconfig
+++ b/subsys/bluetooth/controller/Kconfig
@@ -143,12 +143,12 @@ config BT_CTLR
 	  the HAS_BT_CTLR option.
 
 config BT_LL_SW_SPLIT
-	bool "Software-based BLE Link Layer"
+	bool "Software-based Bluetooth LE Link Layer"
 	default y
 	depends on DT_HAS_ZEPHYR_BT_HCI_LL_SW_SPLIT_ENABLED
 	select HAS_BT_CTLR
 	help
-	  Use Zephyr software BLE Link Layer ULL LLL split implementation.
+	  Use Zephyr software Bluetooth LE Link Layer ULL LLL split implementation.
 
 config BT_CTLR_HCI
 	bool "Host Controller Interface (HCI)"
@@ -161,7 +161,7 @@ config BT_CTLR_HCI
 
 if HAS_BT_CTLR
 
-comment "BLE Controller configuration"
+comment "Bluetooth Controller configuration"
 
 config BT_CTLR_ENTROPY
 	bool "Random number generation in Controller"
@@ -216,7 +216,7 @@ config BT_CTLR_DUP_FILTER_LEN
 	depends on BT_LL_SW_SPLIT
 	default 16
 	help
-	  Set the number of unique BLE addresses that can be filtered as
+	  Set the number of unique Bluetooth LE addresses that can be filtered as
 	  duplicates while scanning.
 
 config BT_CTLR_DUP_FILTER_ADV_SET_MAX
@@ -322,7 +322,7 @@ choice BT_CTLR_TX_PWR
 	default BT_CTLR_TX_PWR_0
 	depends on BT_CTLR_TX_PWR_ANTENNA = 0 || BT_LL_SW_SPLIT
 	help
-	  Select a supported BLE Radio transmit power level in dBm.
+	  Select a supported Bluetooth LE Radio transmit power level in dBm.
 	  Only values supported natively by the SoC are available.
 	  The value set here represents the actual default power level fed
 	  to the antenna.
@@ -499,7 +499,7 @@ config BT_CTLR_TX_PWR_DYNAMIC_CONTROL
 	  Provides HCI VS commands to set and get the current Tx
 	  power on an individual role/connection basis.
 
-comment "BLE Controller features"
+comment "Bluetooth Controller features"
 
 if BT_CONN
 
@@ -1125,6 +1125,6 @@ config BT_CTLR_DEBUG_PINS_CPUAPP
 	bool "Bluetooth Controller Debug Pins"
 	depends on BOARD_NRF5340DK_NRF5340_CPUAPP
 	help
-	  Route debug GPIO toggling for the BLE Controller. Enable this when
+	  Route debug GPIO toggling for the Bluetooth Controller. Enable this when
 	  using Bluetooth Controller Debug Pins in co-processor and the main
 	  processor needs to setup and/or route the signals.
diff --git a/subsys/bluetooth/controller/Kconfig.ll_sw_split b/subsys/bluetooth/controller/Kconfig.ll_sw_split
index b4572c05d3b..886edbfe180 100644
--- a/subsys/bluetooth/controller/Kconfig.ll_sw_split
+++ b/subsys/bluetooth/controller/Kconfig.ll_sw_split
@@ -95,7 +95,7 @@ config BT_LLL_VENDOR_OPENISA
 	  Use OpenISA Lower Link Layer implementation.
 
 # BT_CTLR_DF_SUPPORT is a wrapper for all DF features. Here we select features that are supported by
-# Zephyr's BLE Controller.
+# Zephyr's Bluetooth LE Controller.
 config BT_CTLR_DF_SUPPORT
 	depends on BT_LL_SW_SPLIT && !BT_CTLR_TIFS_HW
 	select BT_CTLR_DF_CTE_TX_SUPPORT
@@ -973,11 +973,11 @@ config BT_CTLR_SW_SWITCH_SINGLE_TIMER
 					  SOC_COMPATIBLE_NRF54LX)
 	help
 	  Implement the tIFS Trx SW switch with the same TIMER
-	  instance, as the one used for BLE event timing. Requires
+	  instance, as the one used for Bluetooth event timing. Requires
 	  SW switching be enabled. Using a single TIMER:
 	  (+) frees up one TIMER instance
 	  (+) removes jitter for HCTO implementation
-	  (-) introduces drifting to the absolute time inside BLE
+	  (-) introduces drifting to the absolute time inside Bluetooth
 	  events, that increases linearly with the number of
 	  packets exchanged in the event
 	  (-) makes it impossible to use most of the pre-programmed
@@ -1413,7 +1413,7 @@ endchoice
 
 source "subsys/bluetooth/controller/coex/Kconfig"
 
-comment "BLE Controller debug configuration"
+comment "Bluetooth LE Controller debug configuration"
 
 config BT_CTLR_PROFILE_ISR
 	bool "Profile radio ISR"
@@ -1427,7 +1427,7 @@ config BT_CTLR_DEBUG_PINS
 	bool "Bluetooth Controller Debug Pins"
 	depends on BOARD_NRF51DK_NRF51822 || BOARD_NRF52DK_NRF52832 || BOARD_NRF52DK_NRF52810 || BOARD_NRF52840DK_NRF52840 || BOARD_NRF52833DK_NRF52833 || BOARD_NRF5340DK_NRF5340_CPUNET || BOARD_RV32M1_VEGA
 	help
-	  Turn on debug GPIO toggling for the BLE Controller. This is useful
+	  Turn on debug GPIO toggling for the Bluetooth LE Controller. This is useful
 	  when debugging with a logic analyzer or profiling certain sections of
 	  the code.
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
index fab5618a4d8..83c250923f2 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
@@ -2098,7 +2098,7 @@ static void *radio_ccm_ext_rx_pkt_set(struct ccm *cnf, uint8_t phy, uint8_t pdu_
 	       CCM_MODE_MODE_Msk;
 
 #if defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
-	/* Enable CCM Protocol Mode BLE */
+	/* Enable CCM Protocol Mode Bluetooth LE */
 	mode |= (CCM_MODE_PROTOCOL_Ble << CCM_MODE_PROTOCOL_Pos) &
 		CCM_MODE_PROTOCOL_Msk;
 
@@ -2342,7 +2342,7 @@ static void *radio_ccm_ext_tx_pkt_set(struct ccm *cnf, uint8_t pdu_type, void *p
 		CCM_MODE_DATARATE_Msk;
 
 #elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
-	/* Enable CCM Protocol Mode BLE */
+	/* Enable CCM Protocol Mode Bluetooth LE */
 	mode |= (CCM_MODE_PROTOCOL_Ble << CCM_MODE_PROTOCOL_Pos) &
 		CCM_MODE_PROTOCOL_Msk;
 
diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index ee1b50d3e62..d49ea5c8fde 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -287,7 +287,7 @@ config BT_FILTER_ACCEPT_LIST
 	bool "Filter accept list support"
 	help
 	  This option enables the filter accept list API. This takes advantage of the
-	  filtering feature of a BLE controller.
+	  filtering feature of a Bluetooth LE controller.
 	  The filter accept list is a global list and the same list is used
 	  by both scanner and advertiser. The filter accept list cannot be modified while
 	  it is in use.
diff --git a/subsys/bluetooth/host/uuid.c b/subsys/bluetooth/host/uuid.c
index 56aaaad462b..9995487db59 100644
--- a/subsys/bluetooth/host/uuid.c
+++ b/subsys/bluetooth/host/uuid.c
@@ -15,7 +15,7 @@
 
 #define UUID_16_BASE_OFFSET 12
 
-/* TODO: Decide whether to continue using BLE format or switch to RFC 4122 */
+/* TODO: Decide whether to continue using Bluetooth LE format or switch to RFC 4122 */
 
 /* Base UUID : 0000[0000]-0000-1000-8000-00805F9B34FB
  * 0x2800    : 0000[2800]-0000-1000-8000-00805F9B34FB
diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 367744d91a2..23a6b87c1df 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -1551,14 +1551,14 @@ endchoice
 if BT_MESH_USES_MBEDTLS_PSA || BT_MESH_USES_TFM_PSA
 
 config BT_MESH_PSA_KEY_ID_USER_MIN_OFFSET
-	int "Offset of BLE Mesh key id range regarding PSA_KEY_ID_USER_MIN"
+	int "Offset of Bluetooth Mesh key id range regarding PSA_KEY_ID_USER_MIN"
 	default 0
 	help
 	  The PSA specification mandates to set key identifiers for keys
 	  with persistent lifetime. The users of the PSA API is responsible
-	  (BLE Mesh is user of PSA API) to provide correct and unique identifiers.
-	  The BLE Mesh identifier range should be between PSA_KEY_ID_USER_MIN and
-	  PSA_KEY_ID_USER_MAX. BLE Mesh requires two ids for each subnetwork, two ids
+	  (Bluetooth Mesh is user of PSA API) to provide correct and unique identifiers.
+	  The Bluetooth Mesh identifier range should be between PSA_KEY_ID_USER_MIN and
+	  PSA_KEY_ID_USER_MAX. Bluetooth Mesh requires two ids for each subnetwork, two ids
 	  for each application key, and two ids for the device key and device key candidate.
 	  It should consider the Mesh Configuration Database instances if database enabled.
 
diff --git a/subsys/bluetooth/mesh/crypto_psa.c b/subsys/bluetooth/mesh/crypto_psa.c
index 587c367a6bd..7267f064bc8 100644
--- a/subsys/bluetooth/mesh/crypto_psa.c
+++ b/subsys/bluetooth/mesh/crypto_psa.c
@@ -32,7 +32,7 @@ LOG_MODULE_REGISTER(bt_mesh_crypto_psa);
 		CONFIG_BT_MESH_PSA_KEY_ID_USER_MIN_OFFSET)
 
 BUILD_ASSERT(BT_MESH_PSA_KEY_ID_USER_MIN + BT_MESH_KEY_ID_RANGE_SIZE <= PSA_KEY_ID_USER_MAX,
-	"BLE Mesh PSA key id range overlaps maximum allowed boundary.");
+	     "Bluetooth Mesh PSA key id range overlaps maximum allowed boundary.");
 
 BUILD_ASSERT(PSA_MAC_LENGTH(PSA_KEY_TYPE_AES, 128, PSA_ALG_CMAC) == 16,
 	"MAC length should be 16 bytes for 128-bits key for CMAC-AES");
@@ -286,12 +286,12 @@ const uint8_t *bt_mesh_pub_key_get(void)
 	return dh_pair.is_ready ? dh_pair.public_key_be + 1 : NULL;
 }
 
-BUILD_ASSERT(PSA_RAW_KEY_AGREEMENT_OUTPUT_SIZE(
-	PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_SECP_R1), 256) == DH_KEY_SIZE,
-	"Diffie-Hellman shared secret size should be the same in PSA and BLE Mesh");
+BUILD_ASSERT(PSA_RAW_KEY_AGREEMENT_OUTPUT_SIZE(PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_SECP_R1),
+					       256) == DH_KEY_SIZE,
+	     "Diffie-Hellman shared secret size should be the same in PSA and Bluetooth Mesh");
 
 BUILD_ASSERT(PSA_KEY_EXPORT_ECC_PUBLIC_KEY_MAX_SIZE(256) == PUB_KEY_SIZE + 1,
-	"Exported PSA public key should be 1 byte larger than BLE Mesh public key");
+	     "Exported PSA public key should be 1 byte larger than Bluetooth Mesh public key");
 
 int bt_mesh_dhkey_gen(const uint8_t *pub_key, const uint8_t *priv_key, uint8_t *dhkey)
 {
diff --git a/subsys/bluetooth/services/ots/ots_l2cap.c b/subsys/bluetooth/services/ots/ots_l2cap.c
index 47834336b87..3d6a114d300 100644
--- a/subsys/bluetooth/services/ots/ots_l2cap.c
+++ b/subsys/bluetooth/services/ots/ots_l2cap.c
@@ -28,7 +28,7 @@ LOG_MODULE_DECLARE(bt_ots, CONFIG_BT_OTS_LOG_LEVEL);
 LOG_MODULE_REGISTER(bt_ots, CONFIG_BT_OTS_CLIENT_LOG_LEVEL);
 #endif
 
-/* According to BLE specification Assigned Numbers that are used in the
+/* According to Bluetooth specification Assigned Numbers that are used in the
  * Logical Link Control for protocol/service multiplexers.
  */
 #define BT_GATT_OTS_L2CAP_PSM	0x0025
diff --git a/subsys/logging/backends/Kconfig.ble b/subsys/logging/backends/Kconfig.ble
index 378577891f7..915cd90c856 100644
--- a/subsys/logging/backends/Kconfig.ble
+++ b/subsys/logging/backends/Kconfig.ble
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config LOG_BACKEND_BLE
-	bool "Bluetooth Low Energy (BLE) backend"
+	bool "Bluetooth Low Energy (LE) backend"
 	depends on BT
 	depends on LOG_PROCESS_THREAD_STACK_SIZE>=2048
 	select EXPERIMENTAL
diff --git a/subsys/logging/backends/log_backend_ble.c b/subsys/logging/backends/log_backend_ble.c
index ec41aebc590..179cf851b45 100644
--- a/subsys/logging/backends/log_backend_ble.c
+++ b/subsys/logging/backends/log_backend_ble.c
@@ -27,7 +27,7 @@ static void log_backend_ble_connect(struct bt_conn *conn, uint8_t err);
 static void log_backend_ble_disconnect(struct bt_conn *conn, uint8_t reason);
 
 /**
- * @brief Callback for the subscription to the ble logger notification characteristic
+ * @brief Callback for the subscription to the Bluetooth logger notification characteristic
  * @details This callback enables/disables automatically the logger when the notification
  *			is subscribed.
  *  @param attr   The attribute that's changed value
@@ -35,7 +35,7 @@ static void log_backend_ble_disconnect(struct bt_conn *conn, uint8_t reason);
  */
 static void log_notify_changed(const struct bt_gatt_attr *attr, uint16_t value);
 
-/** BLE Logger based on the UUIDs for the NRF Connect SDK NUS service
+/** Bluetooth Logger based on the UUIDs for the NRF Connect SDK NUS service
  *	https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.3.0/nrf/libraries/bluetooth_services/services/nus.html
  */
 #define NUS_SERVICE_UUID                                                                           \
@@ -55,7 +55,7 @@ BT_CONN_CB_DEFINE(log_backend_ble) = {
 };
 
 /**
- * @brief BLE Service that represents this backend
+ * @brief Bluetooth Service that represents this backend
  * @note Only transmission characteristic is used. The RX characteristic
  *       is added to make the backend usable with the NRF toolbox app
  *       which expects both characteristics.
@@ -175,7 +175,7 @@ static void panic(struct log_backend const *const backend)
 }
 
 /**
- * @brief Backend ready function for ble logger
+ * @brief Backend ready function for Bluetooth logger
  * @details After initialization of the logger, this function avoids
  *          the logger subys to enable it. The logger is enabled automatically
  *          via the notification changed callback.
diff --git a/tests/bluetooth/df/connectionless_cte_chains/CMakeLists.txt b/tests/bluetooth/df/connectionless_cte_chains/CMakeLists.txt
index 1eed35ac7d2..a925179d4c1 100644
--- a/tests/bluetooth/df/connectionless_cte_chains/CMakeLists.txt
+++ b/tests/bluetooth/df/connectionless_cte_chains/CMakeLists.txt
@@ -12,7 +12,7 @@ SET(common_sources ${CMAKE_CURRENT_SOURCE_DIR}/../common/src/radio_df_stub.c)
 
 target_sources(app PRIVATE ${common_sources} ${app_sources})
 
-# Include paths to allow access to functions implemented in BLE controller
+# Include paths to allow access to functions implemented in Bluetooth LE controller
 target_include_directories(app PRIVATE
 			   ${CMAKE_CURRENT_SOURCE_DIR}/../common/include)
 target_include_directories(app PRIVATE
diff --git a/tests/bsim/bluetooth/host/adv/extended/tests_scripts/ext_adv.sh b/tests/bsim/bluetooth/host/adv/extended/tests_scripts/ext_adv.sh
index d164626e420..268cbbabb8a 100755
--- a/tests/bsim/bluetooth/host/adv/extended/tests_scripts/ext_adv.sh
+++ b/tests/bsim/bluetooth/host/adv/extended/tests_scripts/ext_adv.sh
@@ -4,7 +4,7 @@
 
 # Extended advertising test:
 #
-# - Broadcasting Only: a BLE broadcaster advertises with extended
+# - Broadcasting Only: a Bluetooth LE broadcaster advertises with extended
 #   advertising, and a scanner scans the extended advertisement packets.
 
 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
diff --git a/tests/bsim/bluetooth/ll/edtt/README.txt b/tests/bsim/bluetooth/ll/edtt/README.txt
index 8978a328ebf..f9c225b937c 100644
--- a/tests/bsim/bluetooth/ll/edtt/README.txt
+++ b/tests/bsim/bluetooth/ll/edtt/README.txt
@@ -1,14 +1,14 @@
 Intro
 #####
 
-This is the embedded side of the BLE conformance tests which are part of the
+This is the embedded side of the Bluetooth conformance tests which are part of the
 EDTT (Embedded Device Test Tool).
 
 Much more info about the tool can be found in https://github.com/EDTTool/EDTT
 and in its `doc/` folder.
 
 In very short, there is 2 applications in this folder:
-1.) A controller only build of the BLE stack, where the HCI, and a few extra
+1.) A controller only build of the Bluetooth LE stack, where the HCI, and a few extra
     interfaces are exposed to the EDTT.
 2.) An application which implements the test GATT services specified by BT SIG
     in GATT_Test_Databases.xlsm, with an EDTT interface which allows the EDTT
diff --git a/tests/bsim/bluetooth/mesh/src/main.c b/tests/bsim/bluetooth/mesh/src/main.c
index 7ce3a990d46..18f0393222d 100644
--- a/tests/bsim/bluetooth/mesh/src/main.c
+++ b/tests/bsim/bluetooth/mesh/src/main.c
@@ -96,7 +96,7 @@ int main(void)
 	k_thread_create(&bsim_mesh_thread, bsim_mesh_thread_stack,
 			K_KERNEL_STACK_SIZEOF(bsim_mesh_thread_stack), bsim_mesh_entry_point, NULL,
 			NULL, NULL, K_PRIO_COOP(1), 0, K_NO_WAIT);
-	k_thread_name_set(&bsim_mesh_thread, "BabbleSim BLE Mesh tests");
+	k_thread_name_set(&bsim_mesh_thread, "BabbleSim Bluetooth Mesh tests");
 
 	return 0;
 }
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/disable.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/disable.sh
index d0288a3964b..48291830572 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/disable.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/disable.sh
@@ -7,7 +7,7 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # The test checks that both advertisers, the legacy and the extended, behave identically.
 # In particular:
 # - `bt_mesh_send_cb.end` callback with error code `0` is called for the advertisement that the
-#   advertiser already pushed to the ble host (called `bt_mesh_send_cb.start`),
+#   advertiser already pushed to the Bluetooth Host (called `bt_mesh_send_cb.start`),
 # - `bt_mesh_send_cb.start` callback with error `-ENODEV` is called for every advertisement that
 #   was pushed to the mesh advertiser using `bt_mesh_adv_send` function,
 # - `bt_mesh_adv_create` returns NULL when attempting to create a new advertisement while the stack

From 56b5600ecef0c1287a36d66cd642dc83dcf13832 Mon Sep 17 00:00:00 2001
From: Joakim Andersson <joakim.andersson@nordicsemi.no>
Date: Fri, 20 Nov 2020 14:44:03 +0100
Subject: [PATCH 2645/2913] [nrf noup] Bluetooth: update experimental for
 qualification
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update Kconfig options for qualification:
 - Remove experimental on qualified feature.
 - Add experimental on unqualified feature.
 - BT_L2CAP_ECRED is not marked as experimental upstream and we qualify it
   downstream.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Signed-off-by: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Signed-off-by: Herman Berget <herman.berget@nordicsemi.no>
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
Signed-off-by: Théo Battrel <theo.battrel@nordicsemi.no>
(cherry picked from commit e92e87d7790ce93101dc6038b4831e660757501e)
---
 subsys/bluetooth/controller/Kconfig | 4 +++-
 subsys/bluetooth/host/Kconfig.l2cap | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
index 84195a78346..f1ef0786d3f 100644
--- a/subsys/bluetooth/controller/Kconfig
+++ b/subsys/bluetooth/controller/Kconfig
@@ -143,10 +143,12 @@ config BT_CTLR
 	  the HAS_BT_CTLR option.
 
 config BT_LL_SW_SPLIT
-	bool "Software-based Bluetooth LE Link Layer"
+	bool "Software-based Bluetooth LE Link Layer [EXPERIMENTAL]"
 	default y
 	depends on DT_HAS_ZEPHYR_BT_HCI_LL_SW_SPLIT_ENABLED
 	select HAS_BT_CTLR
+	select EXPERIMENTAL
+	select ENTROPY_GENERATOR
 	help
 	  Use Zephyr software Bluetooth LE Link Layer ULL LLL split implementation.
 
diff --git a/subsys/bluetooth/host/Kconfig.l2cap b/subsys/bluetooth/host/Kconfig.l2cap
index 2841e7d8a12..34e862378c5 100644
--- a/subsys/bluetooth/host/Kconfig.l2cap
+++ b/subsys/bluetooth/host/Kconfig.l2cap
@@ -52,7 +52,7 @@ config BT_L2CAP_DYNAMIC_CHANNEL
 	  allowing the creation of dynamic L2CAP Channels.
 
 config BT_L2CAP_ECRED
-	bool "L2CAP Enhanced Credit Based Flow Control support"
+	bool "L2CAP Enhanced Credit Based Flow Control support [EXPERIMENTAL]"
 	depends on BT_L2CAP_DYNAMIC_CHANNEL
 	help
 	  This option enables support for LE Connection oriented Channels with

From 8f435448a8e4e253b979b9fa8793bea12d5506ee Mon Sep 17 00:00:00 2001
From: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Date: Tue, 11 Feb 2025 12:59:46 +0200
Subject: [PATCH 2646/2913] [nrf fromtree] secure_storage: add a global
 registry header file for PSA key IDs

We need to make sure that within Zephyr different users of the PSA APIs
don't interfere with each other because of using the same numerical IDs
for persistent assets.

This takes care of the PSA key IDs when using persistent keys through
the PSA Crypto API.
See the comments in `<zephyr/psa/key_ids.h>` for more information.

This removes the recently-introduced Kconfig options that allowed changing
the base IDs subsystems were using for their persistent keys.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
(cherry picked from commit 0c368e85b117272df8397d8258da088ebea11f5c)
---
 MAINTAINERS.yml                               |  1 +
 include/zephyr/psa/key_ids.h                  | 51 +++++++++++++++++++
 modules/openthread/Kconfig.thread             |  8 ---
 .../platform/openthread-core-zephyr-config.h  |  5 +-
 samples/psa/persistent_key/src/main.c         |  3 +-
 subsys/bluetooth/mesh/Kconfig                 | 16 ------
 subsys/bluetooth/mesh/crypto_psa.c            | 31 +++++------
 subsys/net/lib/wifi_credentials/Kconfig       | 12 -----
 .../wifi_credentials_backend_psa.c            | 17 +++----
 .../bluetooth/mesh/src/distribute_keyid.c     | 32 ++++++------
 .../CMakeLists.txt                            |  1 -
 .../wifi_credentials_backend_psa/src/main.c   | 14 +++--
 .../secure_storage/psa/crypto/src/main.c      |  3 +-
 13 files changed, 103 insertions(+), 91 deletions(-)
 create mode 100644 include/zephyr/psa/key_ids.h

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index bd36809edf2..f5e76e43935 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -4251,6 +4251,7 @@ Secure storage:
     - tomi-font
   files:
     - subsys/secure_storage/
+    - include/zephyr/psa/
     - samples/psa/
     - doc/services/secure_storage.rst
     - tests/subsys/secure_storage/
diff --git a/include/zephyr/psa/key_ids.h b/include/zephyr/psa/key_ids.h
new file mode 100644
index 00000000000..851d1349812
--- /dev/null
+++ b/include/zephyr/psa/key_ids.h
@@ -0,0 +1,51 @@
+/* Copyright (c) 2025 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ZEPHYR_PSA_KEY_IDS_H_
+#define ZEPHYR_PSA_KEY_IDS_H_
+
+/**
+ * @file zephyr/psa/key_ids.h
+ *
+ * @brief This file defines the key ID ranges of the existing users of the PSA Crypto API.
+ *
+ * In addition to the application, different subsystems store and use persistent keys through the
+ * PSA Crypto API. Because they are not aware of each other, collisions are avoided by having them
+ * use different ID ranges.
+ * This file acts as the registry of all the allocated PSA key ID ranges within Zephyr.
+ *
+ * The end-user application also has a dedicated range, `ZEPHYR_PSA_APPLICATION_KEY_ID_RANGE_BEGIN`.
+ *
+ * Some of the IDs below are based on previously existing and used values, while others
+ * are chosen to be somewhere in the PSA user key ID range to try to avoid collisions
+ * (avoiding, for example, the very beginning of the range).
+ */
+
+#include <stdint.h>
+typedef uint32_t psa_key_id_t;
+
+/** PSA key ID range to be used by OpenThread. The base ID is equal to the default value upstream:
+ *  https://github.com/openthread/openthread/blob/thread-reference-20230706/src/core/config/platform.h#L138
+ */
+#define ZEPHYR_PSA_OPENTHREAD_KEY_ID_RANGE_BEGIN (psa_key_id_t)0x20000
+#define ZEPHYR_PSA_OPENTHREAD_KEY_ID_RANGE_SIZE  0x10000 /* 64 Ki */
+
+/** PSA key ID range to be used by Matter. The base ID is equal to the default value upstream:
+ * https://github.com/project-chip/connectedhomeip/blob/v1.4.0.0/src/crypto/CHIPCryptoPALPSA.h#L55
+ */
+#define ZEPHYR_PSA_MATTER_KEY_ID_RANGE_BEGIN (psa_key_id_t)0x30000
+#define ZEPHYR_PSA_MATTER_KEY_ID_RANGE_SIZE  0x10000 /* 64 Ki */
+
+/** PSA key ID range to be used by Bluetooth Mesh. */
+#define ZEPHYR_PSA_BT_MESH_KEY_ID_RANGE_BEGIN (psa_key_id_t)0x20000000
+#define ZEPHYR_PSA_BT_MESH_KEY_ID_RANGE_SIZE  0xC000 /* 48 Ki */
+
+/** PSA key ID range to be used by Wi-Fi credentials management. */
+#define ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN (psa_key_id_t)0x20010000
+#define ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_SIZE  0x100 /* 256 */
+
+/** PSA key ID range to be used by the end-user application. */
+#define ZEPHYR_PSA_APPLICATION_KEY_ID_RANGE_BEGIN (psa_key_id_t)0x30000000
+#define ZEPHYR_PSA_APPLICATION_KEY_ID_RANGE_SIZE  0x100000 /* 1 Mi */
+
+#endif /* ZEPHYR_PSA_KEY_IDS_H_ */
diff --git a/modules/openthread/Kconfig.thread b/modules/openthread/Kconfig.thread
index 81c0ab20afc..2bababd4fee 100644
--- a/modules/openthread/Kconfig.thread
+++ b/modules/openthread/Kconfig.thread
@@ -250,11 +250,3 @@ config OPENTHREAD_MLE_CHILD_TIMEOUT
 	default 240
 	help
 	  The value of MLE child timeout in seconds.
-
-config OPENTHREAD_PSA_ITS_NVM_OFFSET
-	hex "NVM offset while using key refs"
-	default 0x20000
-	help
-	  The offset value in the PSA ITS non-volatile space is dedicated to OpenThread
-	  key reference IDs. This offset must not overwrite any other ranges already in
-	  use within the PSA ITS non-volatile space.
diff --git a/modules/openthread/platform/openthread-core-zephyr-config.h b/modules/openthread/platform/openthread-core-zephyr-config.h
index c495c8ca4ef..15688bf67a2 100644
--- a/modules/openthread/platform/openthread-core-zephyr-config.h
+++ b/modules/openthread/platform/openthread-core-zephyr-config.h
@@ -14,6 +14,7 @@
 #define OPENTHREAD_CORE_ZEPHYR_CONFIG_H_
 
 #include <zephyr/devicetree.h>
+#include <zephyr/psa/key_ids.h>
 #include <zephyr/toolchain.h>
 
 /**
@@ -516,8 +517,6 @@
  * NVM offset while using key refs.
  *
  */
-#ifdef CONFIG_OPENTHREAD_PSA_ITS_NVM_OFFSET
-#define OPENTHREAD_CONFIG_PSA_ITS_NVM_OFFSET CONFIG_OPENTHREAD_PSA_ITS_NVM_OFFSET
-#endif
+#define OPENTHREAD_CONFIG_PSA_ITS_NVM_OFFSET ZEPHYR_PSA_OPENTHREAD_KEY_ID_RANGE_BEGIN
 
 #endif  /* OPENTHREAD_CORE_ZEPHYR_CONFIG_H_ */
diff --git a/samples/psa/persistent_key/src/main.c b/samples/psa/persistent_key/src/main.c
index c79d8184f94..2f010a012ea 100644
--- a/samples/psa/persistent_key/src/main.c
+++ b/samples/psa/persistent_key/src/main.c
@@ -3,10 +3,11 @@
  */
 #include <psa/crypto.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/psa/key_ids.h>
 
 LOG_MODULE_REGISTER(persistent_key);
 
-#define SAMPLE_KEY_ID   PSA_KEY_ID_USER_MIN
+#define SAMPLE_KEY_ID   ZEPHYR_PSA_APPLICATION_KEY_ID_RANGE_BEGIN
 #define SAMPLE_KEY_TYPE PSA_KEY_TYPE_AES
 #define SAMPLE_ALG      PSA_ALG_CTR
 #define SAMPLE_KEY_BITS 256
diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 23a6b87c1df..8a7e572f782 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -1548,22 +1548,6 @@ config BT_MESH_USES_TFM_PSA
 
 endchoice
 
-if BT_MESH_USES_MBEDTLS_PSA || BT_MESH_USES_TFM_PSA
-
-config BT_MESH_PSA_KEY_ID_USER_MIN_OFFSET
-	int "Offset of Bluetooth Mesh key id range regarding PSA_KEY_ID_USER_MIN"
-	default 0
-	help
-	  The PSA specification mandates to set key identifiers for keys
-	  with persistent lifetime. The users of the PSA API is responsible
-	  (Bluetooth Mesh is user of PSA API) to provide correct and unique identifiers.
-	  The Bluetooth Mesh identifier range should be between PSA_KEY_ID_USER_MIN and
-	  PSA_KEY_ID_USER_MAX. Bluetooth Mesh requires two ids for each subnetwork, two ids
-	  for each application key, and two ids for the device key and device key candidate.
-	  It should consider the Mesh Configuration Database instances if database enabled.
-
-endif # BT_MESH_USES_MBEDTLS_PSA || BT_MESH_USES_TFM_PSA
-
 menu "Beacons"
 
 config BT_MESH_BEACON_ENABLED
diff --git a/subsys/bluetooth/mesh/crypto_psa.c b/subsys/bluetooth/mesh/crypto_psa.c
index 7267f064bc8..cc43293a3df 100644
--- a/subsys/bluetooth/mesh/crypto_psa.c
+++ b/subsys/bluetooth/mesh/crypto_psa.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 
 #include <zephyr/bluetooth/mesh.h>
+#include <zephyr/psa/key_ids.h>
 #include <zephyr/sys/check.h>
 
 #define LOG_LEVEL CONFIG_BT_MESH_CRYPTO_LOG_LEVEL
@@ -26,13 +27,13 @@ LOG_MODULE_REGISTER(bt_mesh_crypto_psa);
 #else
 #define BT_MESH_CDB_KEY_ID_RANGE_SIZE  0
 #endif
-#define BT_MESH_KEY_ID_RANGE_SIZE (2 * CONFIG_BT_MESH_SUBNET_COUNT + \
-		2 * CONFIG_BT_MESH_APP_KEY_COUNT + 2 + BT_MESH_CDB_KEY_ID_RANGE_SIZE)
-#define BT_MESH_PSA_KEY_ID_USER_MIN (PSA_KEY_ID_USER_MIN + \
-		CONFIG_BT_MESH_PSA_KEY_ID_USER_MIN_OFFSET)
 
-BUILD_ASSERT(BT_MESH_PSA_KEY_ID_USER_MIN + BT_MESH_KEY_ID_RANGE_SIZE <= PSA_KEY_ID_USER_MAX,
-	     "Bluetooth Mesh PSA key id range overlaps maximum allowed boundary.");
+#define BT_MESH_PSA_KEY_ID_MIN ZEPHYR_PSA_BT_MESH_KEY_ID_RANGE_BEGIN
+
+#define BT_MESH_PSA_KEY_ID_RANGE_SIZE (2 * CONFIG_BT_MESH_SUBNET_COUNT + \
+		2 * CONFIG_BT_MESH_APP_KEY_COUNT + 2 + BT_MESH_CDB_KEY_ID_RANGE_SIZE)
+BUILD_ASSERT(BT_MESH_PSA_KEY_ID_RANGE_SIZE <= ZEPHYR_PSA_BT_MESH_KEY_ID_RANGE_SIZE,
+	"PSA key ID range exceeds officially allocated range.");
 
 BUILD_ASSERT(PSA_MAC_LENGTH(PSA_KEY_TYPE_AES, 128, PSA_ALG_CMAC) == 16,
 	"MAC length should be 16 bytes for 128-bits key for CMAC-AES");
@@ -46,7 +47,7 @@ static struct {
 	uint8_t public_key_be[PUB_KEY_SIZE + 1];
 } dh_pair;
 
-static ATOMIC_DEFINE(pst_keys, BT_MESH_KEY_ID_RANGE_SIZE);
+static ATOMIC_DEFINE(pst_keys, BT_MESH_PSA_KEY_ID_RANGE_SIZE);
 
 int bt_mesh_crypto_init(void)
 {
@@ -354,10 +355,10 @@ int bt_mesh_dhkey_gen(const uint8_t *pub_key, const uint8_t *priv_key, uint8_t *
 
 __weak psa_key_id_t bt_mesh_user_keyid_alloc(void)
 {
-	for (int i = 0; i < BT_MESH_KEY_ID_RANGE_SIZE; i++) {
+	for (int i = 0; i < BT_MESH_PSA_KEY_ID_RANGE_SIZE; i++) {
 		if (!atomic_test_bit(pst_keys, i)) {
 			atomic_set_bit(pst_keys, i);
-			return BT_MESH_PSA_KEY_ID_USER_MIN + i;
+			return BT_MESH_PSA_KEY_ID_MIN + i;
 		}
 	}
 
@@ -366,9 +367,9 @@ __weak psa_key_id_t bt_mesh_user_keyid_alloc(void)
 
 __weak int bt_mesh_user_keyid_free(psa_key_id_t key_id)
 {
-	if (IN_RANGE(key_id, BT_MESH_PSA_KEY_ID_USER_MIN,
-			BT_MESH_PSA_KEY_ID_USER_MIN + BT_MESH_KEY_ID_RANGE_SIZE - 1)) {
-		atomic_clear_bit(pst_keys, key_id - BT_MESH_PSA_KEY_ID_USER_MIN);
+	if (IN_RANGE(key_id, BT_MESH_PSA_KEY_ID_MIN,
+			BT_MESH_PSA_KEY_ID_MIN + BT_MESH_PSA_KEY_ID_RANGE_SIZE - 1)) {
+		atomic_clear_bit(pst_keys, key_id - BT_MESH_PSA_KEY_ID_MIN);
 		return 0;
 	}
 
@@ -377,9 +378,9 @@ __weak int bt_mesh_user_keyid_free(psa_key_id_t key_id)
 
 __weak void bt_mesh_user_keyid_assign(psa_key_id_t key_id)
 {
-	if (IN_RANGE(key_id, BT_MESH_PSA_KEY_ID_USER_MIN,
-				BT_MESH_PSA_KEY_ID_USER_MIN + BT_MESH_KEY_ID_RANGE_SIZE - 1)) {
-		atomic_set_bit(pst_keys, key_id - BT_MESH_PSA_KEY_ID_USER_MIN);
+	if (IN_RANGE(key_id, BT_MESH_PSA_KEY_ID_MIN,
+				BT_MESH_PSA_KEY_ID_MIN + BT_MESH_PSA_KEY_ID_RANGE_SIZE - 1)) {
+		atomic_set_bit(pst_keys, key_id - BT_MESH_PSA_KEY_ID_MIN);
 	}
 }
 
diff --git a/subsys/net/lib/wifi_credentials/Kconfig b/subsys/net/lib/wifi_credentials/Kconfig
index 3cfe87c29f2..2fc002f00b8 100644
--- a/subsys/net/lib/wifi_credentials/Kconfig
+++ b/subsys/net/lib/wifi_credentials/Kconfig
@@ -75,18 +75,6 @@ endif # WIFI_CREDENTIALS_CONNECT_STORED
 
 endif # WIFI_CREDENTIALS
 
-if WIFI_CREDENTIALS_BACKEND_PSA
-
-config WIFI_CREDENTIALS_BACKEND_PSA_OFFSET
-	int "PSA_KEY_ID range offset"
-	default 0
-	help
-	  The PSA specification mandates to set key identifiers for keys
-	  with persistent lifetime. The users of the PSA API are responsible (WIFI credentials
-	  management is user of PSA API) to provide correct and unique identifiers.
-
-endif # WIFI_CREDENTIALS_BACKEND_PSA
-
 config WIFI_CREDENTIALS_STATIC
 	bool "Static Wi-Fi network configuration"
 
diff --git a/subsys/net/lib/wifi_credentials/wifi_credentials_backend_psa.c b/subsys/net/lib/wifi_credentials/wifi_credentials_backend_psa.c
index bf82ee72577..7ec3ae1056d 100644
--- a/subsys/net/lib/wifi_credentials/wifi_credentials_backend_psa.c
+++ b/subsys/net/lib/wifi_credentials/wifi_credentials_backend_psa.c
@@ -6,18 +6,15 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/psa/key_ids.h>
 #include "psa/crypto.h"
 
 #include "wifi_credentials_internal.h"
 
 LOG_MODULE_REGISTER(wifi_credentials_backend, CONFIG_WIFI_CREDENTIALS_LOG_LEVEL);
 
-#define WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN                                               \
-	(PSA_KEY_ID_USER_MIN + CONFIG_WIFI_CREDENTIALS_BACKEND_PSA_OFFSET)
-
-BUILD_ASSERT((WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN + CONFIG_WIFI_CREDENTIALS_MAX_ENTRIES) <=
-		     PSA_KEY_ID_USER_MAX,
-	     "WIFI credentials management PSA key id range exceeds PSA_KEY_ID_USER_MAX.");
+BUILD_ASSERT(CONFIG_WIFI_CREDENTIALS_MAX_ENTRIES <= ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_SIZE,
+	     "Wi-Fi credentials management PSA key ID range exceeds officially allocated range.");
 
 int wifi_credentials_backend_init(void)
 {
@@ -26,7 +23,7 @@ int wifi_credentials_backend_init(void)
 
 	for (size_t i = 0; i < CONFIG_WIFI_CREDENTIALS_MAX_ENTRIES; ++i) {
 		size_t length_read = 0;
-		size_t key_id = i + WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN;
+		size_t key_id = i + ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN;
 
 		ret = psa_export_key(key_id, buf, ARRAY_SIZE(buf), &length_read);
 		if (ret == PSA_SUCCESS && length_read == ENTRY_MAX_LEN) {
@@ -46,7 +43,7 @@ int wifi_credentials_store_entry(size_t idx, const void *buf, size_t buf_len)
 	psa_key_attributes_t key_attributes = {0};
 	psa_key_id_t key_id;
 
-	psa_set_key_id(&key_attributes, idx + WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN);
+	psa_set_key_id(&key_attributes, idx + ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN);
 	psa_set_key_usage_flags(&key_attributes, PSA_KEY_USAGE_EXPORT);
 	psa_set_key_lifetime(&key_attributes, PSA_KEY_LIFETIME_PERSISTENT);
 	psa_set_key_algorithm(&key_attributes, PSA_ALG_NONE);
@@ -67,7 +64,7 @@ int wifi_credentials_store_entry(size_t idx, const void *buf, size_t buf_len)
 
 int wifi_credentials_delete_entry(size_t idx)
 {
-	psa_status_t ret = psa_destroy_key(idx + WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN);
+	psa_status_t ret = psa_destroy_key(idx + ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN);
 
 	if (ret != PSA_SUCCESS) {
 		LOG_ERR("psa_destroy_key failed, err: %d", ret);
@@ -80,7 +77,7 @@ int wifi_credentials_delete_entry(size_t idx)
 int wifi_credentials_load_entry(size_t idx, void *buf, size_t buf_len)
 {
 	size_t length_read = 0;
-	size_t key_id = idx + WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN;
+	size_t key_id = idx + ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN;
 	psa_status_t ret;
 
 	ret = psa_export_key(key_id, buf, buf_len, &length_read);
diff --git a/tests/bsim/bluetooth/mesh/src/distribute_keyid.c b/tests/bsim/bluetooth/mesh/src/distribute_keyid.c
index 8bfb0f6ced1..54a9a8feae2 100644
--- a/tests/bsim/bluetooth/mesh/src/distribute_keyid.c
+++ b/tests/bsim/bluetooth/mesh/src/distribute_keyid.c
@@ -6,6 +6,7 @@
 
 #include <errno.h>
 #include <zephyr/bluetooth/mesh.h>
+#include <zephyr/psa/key_ids.h>
 #include "argparse.h"
 #include "mesh/crypto.h"
 
@@ -22,24 +23,23 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #else
 #define BT_MESH_CDB_KEY_ID_RANGE_SIZE  0
 #endif
-#define BT_MESH_KEY_ID_RANGE_SIZE (2 * CONFIG_BT_MESH_SUBNET_COUNT + \
-		2 * CONFIG_BT_MESH_APP_KEY_COUNT + 1 + BT_MESH_CDB_KEY_ID_RANGE_SIZE)
-#define BT_MESH_PSA_KEY_ID_USER_MIN (PSA_KEY_ID_USER_MIN + \
-		CONFIG_BT_MESH_PSA_KEY_ID_USER_MIN_OFFSET)
-#define BT_MESH_TEST_PSA_KEY_ID_USER_MIN (BT_MESH_PSA_KEY_ID_USER_MIN + \
-		BT_MESH_KEY_ID_RANGE_SIZE * get_device_nbr())
 
-static ATOMIC_DEFINE(pst_keys, BT_MESH_KEY_ID_RANGE_SIZE);
+#define BT_MESH_PSA_KEY_ID_RANGE_SIZE (2 * CONFIG_BT_MESH_SUBNET_COUNT + \
+		2 * CONFIG_BT_MESH_APP_KEY_COUNT + 2 + BT_MESH_CDB_KEY_ID_RANGE_SIZE)
+#define BT_MESH_TEST_PSA_KEY_ID_MIN (ZEPHYR_PSA_BT_MESH_KEY_ID_RANGE_BEGIN + \
+		BT_MESH_PSA_KEY_ID_RANGE_SIZE * get_device_nbr())
+
+static ATOMIC_DEFINE(pst_keys, BT_MESH_PSA_KEY_ID_RANGE_SIZE);
 
 psa_key_id_t bt_mesh_user_keyid_alloc(void)
 {
-	for (int i = 0; i < BT_MESH_KEY_ID_RANGE_SIZE; i++) {
+	for (int i = 0; i < BT_MESH_PSA_KEY_ID_RANGE_SIZE; i++) {
 		if (!atomic_test_bit(pst_keys, i)) {
 			atomic_set_bit(pst_keys, i);
 
-			LOG_INF("key id %d is allocated", BT_MESH_TEST_PSA_KEY_ID_USER_MIN + i);
+			LOG_INF("key id %d is allocated", BT_MESH_TEST_PSA_KEY_ID_MIN + i);
 
-			return BT_MESH_TEST_PSA_KEY_ID_USER_MIN + i;
+			return BT_MESH_TEST_PSA_KEY_ID_MIN + i;
 		}
 	}
 
@@ -48,9 +48,9 @@ psa_key_id_t bt_mesh_user_keyid_alloc(void)
 
 int bt_mesh_user_keyid_free(psa_key_id_t key_id)
 {
-	if (IN_RANGE(key_id, BT_MESH_TEST_PSA_KEY_ID_USER_MIN,
-			BT_MESH_TEST_PSA_KEY_ID_USER_MIN + BT_MESH_KEY_ID_RANGE_SIZE - 1)) {
-		atomic_clear_bit(pst_keys, key_id - BT_MESH_TEST_PSA_KEY_ID_USER_MIN);
+	if (IN_RANGE(key_id, BT_MESH_TEST_PSA_KEY_ID_MIN,
+			BT_MESH_TEST_PSA_KEY_ID_MIN + BT_MESH_PSA_KEY_ID_RANGE_SIZE - 1)) {
+		atomic_clear_bit(pst_keys, key_id - BT_MESH_TEST_PSA_KEY_ID_MIN);
 
 		LOG_INF("key id %d is freed", key_id);
 
@@ -62,9 +62,9 @@ int bt_mesh_user_keyid_free(psa_key_id_t key_id)
 
 void bt_mesh_user_keyid_assign(psa_key_id_t key_id)
 {
-	if (IN_RANGE(key_id, BT_MESH_TEST_PSA_KEY_ID_USER_MIN,
-			BT_MESH_TEST_PSA_KEY_ID_USER_MIN + BT_MESH_KEY_ID_RANGE_SIZE - 1)) {
-		atomic_set_bit(pst_keys, key_id - BT_MESH_TEST_PSA_KEY_ID_USER_MIN);
+	if (IN_RANGE(key_id, BT_MESH_TEST_PSA_KEY_ID_MIN,
+			BT_MESH_TEST_PSA_KEY_ID_MIN + BT_MESH_PSA_KEY_ID_RANGE_SIZE - 1)) {
+		atomic_set_bit(pst_keys, key_id - BT_MESH_TEST_PSA_KEY_ID_MIN);
 		LOG_INF("key id %d is assigned", key_id);
 	} else {
 		LOG_WRN("key id %d is out of the reserved id range", key_id);
diff --git a/tests/net/lib/wifi_credentials_backend_psa/CMakeLists.txt b/tests/net/lib/wifi_credentials_backend_psa/CMakeLists.txt
index 6ff95328fff..15bd547a82d 100644
--- a/tests/net/lib/wifi_credentials_backend_psa/CMakeLists.txt
+++ b/tests/net/lib/wifi_credentials_backend_psa/CMakeLists.txt
@@ -27,7 +27,6 @@ target_compile_options(app
   -DCONFIG_WIFI_CREDENTIALS_MAX_ENTRIES=2
   -DCONFIG_WIFI_CREDENTIALS_SAE_PASSWORD_LENGTH=128
   -DCONFIG_WIFI_CREDENTIALS_LOG_LEVEL=4
-  -DCONFIG_WIFI_CREDENTIALS_BACKEND_PSA_OFFSET=5
 )
 
 set_property(
diff --git a/tests/net/lib/wifi_credentials_backend_psa/src/main.c b/tests/net/lib/wifi_credentials_backend_psa/src/main.c
index f0b2b6804ab..5e89079e116 100644
--- a/tests/net/lib/wifi_credentials_backend_psa/src/main.c
+++ b/tests/net/lib/wifi_credentials_backend_psa/src/main.c
@@ -10,6 +10,7 @@
 #include <string.h>
 #include <zephyr/kernel.h>
 #include <zephyr/init.h>
+#include <zephyr/psa/key_ids.h>
 
 #include <zephyr/fff.h>
 
@@ -31,9 +32,6 @@
 #define BSSID2    NULL
 #define FLAGS2    0
 
-#define WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN                                               \
-	(PSA_KEY_ID_USER_MIN + CONFIG_WIFI_CREDENTIALS_BACKEND_PSA_OFFSET)
-
 DEFINE_FFF_GLOBALS;
 
 K_MUTEX_DEFINE(wifi_credentials_mutex);
@@ -83,7 +81,7 @@ psa_status_t custom_psa_export_key(mbedtls_svc_key_id_t key, uint8_t *data, size
 
 static void custom_psa_set_key_id(psa_key_attributes_t *attributes, mbedtls_svc_key_id_t key)
 {
-	zassert_equal(idx + WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN, key, "Key ID mismatch");
+	zassert_equal(idx + ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN, key, "Key ID mismatch");
 }
 
 void custom_psa_set_key_bits(psa_key_attributes_t *attributes, size_t bits)
@@ -175,7 +173,7 @@ ZTEST(wifi_credentials_backend_psa, test_add)
 ZTEST(wifi_credentials_backend_psa, test_get)
 {
 	int ret;
-	psa_key_id_t key_id = idx + WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN;
+	psa_key_id_t key_id = idx + ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN;
 	uint8_t buf[ENTRY_MAX_LEN];
 
 	ret = wifi_credentials_load_entry(idx, buf, ARRAY_SIZE(buf));
@@ -186,7 +184,7 @@ ZTEST(wifi_credentials_backend_psa, test_get)
 	zassert_equal(psa_export_key_fake.arg2_val, ARRAY_SIZE(buf), "Export key arg2 mismatch");
 
 	idx++;
-	key_id = idx + WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN;
+	key_id = idx + ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN;
 
 	ret = wifi_credentials_load_entry(idx, buf, ARRAY_SIZE(buf));
 
@@ -205,7 +203,7 @@ ZTEST(wifi_credentials_backend_psa, test_delete)
 	ret = wifi_credentials_delete_entry(idx);
 
 	zassert_equal(0, ret, "Delete entry failed");
-	zassert_equal(psa_destroy_key_fake.arg0_val, WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN,
+	zassert_equal(psa_destroy_key_fake.arg0_val, ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN,
 		      "Destroy key arg0 mismatch");
 
 	idx++;
@@ -214,7 +212,7 @@ ZTEST(wifi_credentials_backend_psa, test_delete)
 
 	zassert_equal(0, ret, "Delete entry failed");
 	zassert_equal(psa_destroy_key_fake.arg0_val,
-		      idx + WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN,
+		      idx + ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN,
 		      "Destroy key arg0 mismatch");
 
 	zassert_equal(psa_destroy_key_fake.call_count, 2, "Destroy key call count mismatch");
diff --git a/tests/subsys/secure_storage/psa/crypto/src/main.c b/tests/subsys/secure_storage/psa/crypto/src/main.c
index 08a6c4a6760..a81f131f4f7 100644
--- a/tests/subsys/secure_storage/psa/crypto/src/main.c
+++ b/tests/subsys/secure_storage/psa/crypto/src/main.c
@@ -2,6 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/ztest.h>
+#include <zephyr/psa/key_ids.h>
 #include <zephyr/sys/util.h>
 #include <psa/crypto.h>
 #include <psa/internal_trusted_storage.h>
@@ -9,7 +10,7 @@
 
 ZTEST_SUITE(secure_storage_psa_crypto, NULL, NULL, NULL, NULL, NULL);
 
-#define ID       PSA_KEY_ID_USER_MIN
+#define ID       ZEPHYR_PSA_APPLICATION_KEY_ID_RANGE_BEGIN
 #define KEY_TYPE PSA_KEY_TYPE_AES
 #define ALG      PSA_ALG_CBC_NO_PADDING
 #define KEY_BITS 256

From cf0254eefbe005fa4fecddc8cf4f043a055395c5 Mon Sep 17 00:00:00 2001
From: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
Date: Wed, 12 Feb 2025 15:28:26 +0100
Subject: [PATCH 2647/2913] [nrf fromtree] Bluetooth: Mesh: remove weak
 attribute and rename functions

Commit removes weak attribute and renames some functions
in crypto_psa.c since there is no centralized distribution
of the PSA key ID in bsim tests and no necessity to
reimplement native mesh approach.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
(cherry picked from commit acc752fce4140ad6fd66c035cc03ff5ca786d63d)
---
 subsys/bluetooth/mesh/crypto_psa.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/subsys/bluetooth/mesh/crypto_psa.c b/subsys/bluetooth/mesh/crypto_psa.c
index cc43293a3df..f2010afbd7d 100644
--- a/subsys/bluetooth/mesh/crypto_psa.c
+++ b/subsys/bluetooth/mesh/crypto_psa.c
@@ -353,7 +353,7 @@ int bt_mesh_dhkey_gen(const uint8_t *pub_key, const uint8_t *priv_key, uint8_t *
 	return err;
 }
 
-__weak psa_key_id_t bt_mesh_user_keyid_alloc(void)
+static psa_key_id_t bt_mesh_psa_keyid_alloc(void)
 {
 	for (int i = 0; i < BT_MESH_PSA_KEY_ID_RANGE_SIZE; i++) {
 		if (!atomic_test_bit(pst_keys, i)) {
@@ -365,7 +365,7 @@ __weak psa_key_id_t bt_mesh_user_keyid_alloc(void)
 	return PSA_KEY_ID_NULL;
 }
 
-__weak int bt_mesh_user_keyid_free(psa_key_id_t key_id)
+static int bt_mesh_psa_keyid_free(psa_key_id_t key_id)
 {
 	if (IN_RANGE(key_id, BT_MESH_PSA_KEY_ID_MIN,
 			BT_MESH_PSA_KEY_ID_MIN + BT_MESH_PSA_KEY_ID_RANGE_SIZE - 1)) {
@@ -376,7 +376,7 @@ __weak int bt_mesh_user_keyid_free(psa_key_id_t key_id)
 	return -EIO;
 }
 
-__weak void bt_mesh_user_keyid_assign(psa_key_id_t key_id)
+static void bt_mesh_psa_keyid_assign(psa_key_id_t key_id)
 {
 	if (IN_RANGE(key_id, BT_MESH_PSA_KEY_ID_MIN,
 				BT_MESH_PSA_KEY_ID_MIN + BT_MESH_PSA_KEY_ID_RANGE_SIZE - 1)) {
@@ -412,7 +412,7 @@ int bt_mesh_key_import(enum bt_mesh_key_type type, const uint8_t in[16], struct
 		break;
 	case BT_MESH_KEY_TYPE_NET:
 		if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-			key_id = bt_mesh_user_keyid_alloc();
+			key_id = bt_mesh_psa_keyid_alloc();
 
 			if (key_id == PSA_KEY_ID_NULL) {
 				return -ENOMEM;
@@ -428,7 +428,7 @@ int bt_mesh_key_import(enum bt_mesh_key_type type, const uint8_t in[16], struct
 	case BT_MESH_KEY_TYPE_APP:
 	case BT_MESH_KEY_TYPE_DEV:
 		if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-			key_id = bt_mesh_user_keyid_alloc();
+			key_id = bt_mesh_psa_keyid_alloc();
 
 			if (key_id == PSA_KEY_ID_NULL) {
 				return -ENOMEM;
@@ -456,7 +456,7 @@ int bt_mesh_key_import(enum bt_mesh_key_type type, const uint8_t in[16], struct
 		status == PSA_ERROR_ALREADY_EXISTS ? -EALREADY : -EIO;
 
 	if (err && key_id != PSA_KEY_ID_NULL) {
-		bt_mesh_user_keyid_free(key_id);
+		bt_mesh_psa_keyid_free(key_id);
 	}
 
 	psa_reset_key_attributes(&key_attributes);
@@ -483,7 +483,7 @@ void bt_mesh_key_assign(struct bt_mesh_key *dst, const struct bt_mesh_key *src)
 {
 	memcpy(dst, src, sizeof(struct bt_mesh_key));
 	if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-		bt_mesh_user_keyid_assign(dst->key);
+		bt_mesh_psa_keyid_assign(dst->key);
 	}
 }
 
@@ -494,7 +494,7 @@ int bt_mesh_key_destroy(const struct bt_mesh_key *key)
 	}
 
 	if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-		return bt_mesh_user_keyid_free(key->key);
+		return bt_mesh_psa_keyid_free(key->key);
 	}
 
 	return 0;

From 835e24cf8ee61b778c1d905c536c521b5b6840b2 Mon Sep 17 00:00:00 2001
From: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
Date: Thu, 20 Feb 2025 12:49:49 +0100
Subject: [PATCH 2648/2913] [nrf fromtree] Bluetooth: Mesh: remove api prefix
 for static functions

Commit removes api prefix for static functions
in crypto psa.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
(cherry picked from commit e075e081959d4f2fa1477108eb45ac7b5bd2ccea)
---
 subsys/bluetooth/mesh/crypto_psa.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/subsys/bluetooth/mesh/crypto_psa.c b/subsys/bluetooth/mesh/crypto_psa.c
index f2010afbd7d..8d95ed912ec 100644
--- a/subsys/bluetooth/mesh/crypto_psa.c
+++ b/subsys/bluetooth/mesh/crypto_psa.c
@@ -353,7 +353,7 @@ int bt_mesh_dhkey_gen(const uint8_t *pub_key, const uint8_t *priv_key, uint8_t *
 	return err;
 }
 
-static psa_key_id_t bt_mesh_psa_keyid_alloc(void)
+static psa_key_id_t keyid_alloc(void)
 {
 	for (int i = 0; i < BT_MESH_PSA_KEY_ID_RANGE_SIZE; i++) {
 		if (!atomic_test_bit(pst_keys, i)) {
@@ -365,7 +365,7 @@ static psa_key_id_t bt_mesh_psa_keyid_alloc(void)
 	return PSA_KEY_ID_NULL;
 }
 
-static int bt_mesh_psa_keyid_free(psa_key_id_t key_id)
+static int keyid_free(psa_key_id_t key_id)
 {
 	if (IN_RANGE(key_id, BT_MESH_PSA_KEY_ID_MIN,
 			BT_MESH_PSA_KEY_ID_MIN + BT_MESH_PSA_KEY_ID_RANGE_SIZE - 1)) {
@@ -376,7 +376,7 @@ static int bt_mesh_psa_keyid_free(psa_key_id_t key_id)
 	return -EIO;
 }
 
-static void bt_mesh_psa_keyid_assign(psa_key_id_t key_id)
+static void keyid_assign(psa_key_id_t key_id)
 {
 	if (IN_RANGE(key_id, BT_MESH_PSA_KEY_ID_MIN,
 				BT_MESH_PSA_KEY_ID_MIN + BT_MESH_PSA_KEY_ID_RANGE_SIZE - 1)) {
@@ -412,7 +412,7 @@ int bt_mesh_key_import(enum bt_mesh_key_type type, const uint8_t in[16], struct
 		break;
 	case BT_MESH_KEY_TYPE_NET:
 		if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-			key_id = bt_mesh_psa_keyid_alloc();
+			key_id = keyid_alloc();
 
 			if (key_id == PSA_KEY_ID_NULL) {
 				return -ENOMEM;
@@ -428,7 +428,7 @@ int bt_mesh_key_import(enum bt_mesh_key_type type, const uint8_t in[16], struct
 	case BT_MESH_KEY_TYPE_APP:
 	case BT_MESH_KEY_TYPE_DEV:
 		if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-			key_id = bt_mesh_psa_keyid_alloc();
+			key_id = keyid_alloc();
 
 			if (key_id == PSA_KEY_ID_NULL) {
 				return -ENOMEM;
@@ -456,7 +456,7 @@ int bt_mesh_key_import(enum bt_mesh_key_type type, const uint8_t in[16], struct
 		status == PSA_ERROR_ALREADY_EXISTS ? -EALREADY : -EIO;
 
 	if (err && key_id != PSA_KEY_ID_NULL) {
-		bt_mesh_psa_keyid_free(key_id);
+		keyid_free(key_id);
 	}
 
 	psa_reset_key_attributes(&key_attributes);
@@ -483,7 +483,7 @@ void bt_mesh_key_assign(struct bt_mesh_key *dst, const struct bt_mesh_key *src)
 {
 	memcpy(dst, src, sizeof(struct bt_mesh_key));
 	if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-		bt_mesh_psa_keyid_assign(dst->key);
+		keyid_assign(dst->key);
 	}
 }
 
@@ -494,7 +494,7 @@ int bt_mesh_key_destroy(const struct bt_mesh_key *key)
 	}
 
 	if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-		return bt_mesh_psa_keyid_free(key->key);
+		return keyid_free(key->key);
 	}
 
 	return 0;

From b1ef3bf9532c1271889049e3d3041307cc3de610 Mon Sep 17 00:00:00 2001
From: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
Date: Wed, 12 Feb 2025 15:16:58 +0100
Subject: [PATCH 2649/2913] [nrf fromtree] tests: Bluetooth: Mesh: remove key
 id distribution

Commit removes centralized PSA key ID distribution
in mesh bsim tests since secure storage is
instantiated on every simulated device.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
(cherry picked from commit 6a9802e818b15b1cd3c7ec75fc0913f0219c37c6)
---
 tests/bsim/bluetooth/mesh/CMakeLists.txt      |  6 --
 .../bluetooth/mesh/src/distribute_keyid.c     | 72 -------------------
 2 files changed, 78 deletions(-)
 delete mode 100644 tests/bsim/bluetooth/mesh/src/distribute_keyid.c

diff --git a/tests/bsim/bluetooth/mesh/CMakeLists.txt b/tests/bsim/bluetooth/mesh/CMakeLists.txt
index 7271af88810..76a8a041795 100644
--- a/tests/bsim/bluetooth/mesh/CMakeLists.txt
+++ b/tests/bsim/bluetooth/mesh/CMakeLists.txt
@@ -26,12 +26,6 @@ if(CONFIG_SETTINGS)
   src/test_brg.c
 )
 
-if(CONFIG_BT_MESH_USES_MBEDTLS_PSA)
- target_sources(app PRIVATE
-  src/distribute_keyid.c
- )
-endif()
-
 if(CONFIG_BT_MESH_GATT_PROXY AND CONFIG_BT_MESH_PROXY_SOLICITATION)
  target_sources(app PRIVATE
   src/test_proxy_sol.c
diff --git a/tests/bsim/bluetooth/mesh/src/distribute_keyid.c b/tests/bsim/bluetooth/mesh/src/distribute_keyid.c
deleted file mode 100644
index 54a9a8feae2..00000000000
--- a/tests/bsim/bluetooth/mesh/src/distribute_keyid.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <errno.h>
-#include <zephyr/bluetooth/mesh.h>
-#include <zephyr/psa/key_ids.h>
-#include "argparse.h"
-#include "mesh/crypto.h"
-
-#define LOG_MODULE_NAME distribute_keys
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(LOG_MODULE_NAME);
-
-/* Mesh requires to keep in persistent memory network keys (2 keys per subnetwork),
- * application keys (2 real keys per 1 configured) and device key + device key candidate.
- */
-#if defined CONFIG_BT_MESH_CDB
-#define BT_MESH_CDB_KEY_ID_RANGE_SIZE (2 * SUBNET_COUNT + \
-		2 * APP_KEY_COUNT + NODE_COUNT)
-#else
-#define BT_MESH_CDB_KEY_ID_RANGE_SIZE  0
-#endif
-
-#define BT_MESH_PSA_KEY_ID_RANGE_SIZE (2 * CONFIG_BT_MESH_SUBNET_COUNT + \
-		2 * CONFIG_BT_MESH_APP_KEY_COUNT + 2 + BT_MESH_CDB_KEY_ID_RANGE_SIZE)
-#define BT_MESH_TEST_PSA_KEY_ID_MIN (ZEPHYR_PSA_BT_MESH_KEY_ID_RANGE_BEGIN + \
-		BT_MESH_PSA_KEY_ID_RANGE_SIZE * get_device_nbr())
-
-static ATOMIC_DEFINE(pst_keys, BT_MESH_PSA_KEY_ID_RANGE_SIZE);
-
-psa_key_id_t bt_mesh_user_keyid_alloc(void)
-{
-	for (int i = 0; i < BT_MESH_PSA_KEY_ID_RANGE_SIZE; i++) {
-		if (!atomic_test_bit(pst_keys, i)) {
-			atomic_set_bit(pst_keys, i);
-
-			LOG_INF("key id %d is allocated", BT_MESH_TEST_PSA_KEY_ID_MIN + i);
-
-			return BT_MESH_TEST_PSA_KEY_ID_MIN + i;
-		}
-	}
-
-	return PSA_KEY_ID_NULL;
-}
-
-int bt_mesh_user_keyid_free(psa_key_id_t key_id)
-{
-	if (IN_RANGE(key_id, BT_MESH_TEST_PSA_KEY_ID_MIN,
-			BT_MESH_TEST_PSA_KEY_ID_MIN + BT_MESH_PSA_KEY_ID_RANGE_SIZE - 1)) {
-		atomic_clear_bit(pst_keys, key_id - BT_MESH_TEST_PSA_KEY_ID_MIN);
-
-		LOG_INF("key id %d is freed", key_id);
-
-		return 0;
-	}
-
-	return -EIO;
-}
-
-void bt_mesh_user_keyid_assign(psa_key_id_t key_id)
-{
-	if (IN_RANGE(key_id, BT_MESH_TEST_PSA_KEY_ID_MIN,
-			BT_MESH_TEST_PSA_KEY_ID_MIN + BT_MESH_PSA_KEY_ID_RANGE_SIZE - 1)) {
-		atomic_set_bit(pst_keys, key_id - BT_MESH_TEST_PSA_KEY_ID_MIN);
-		LOG_INF("key id %d is assigned", key_id);
-	} else {
-		LOG_WRN("key id %d is out of the reserved id range", key_id);
-	}
-}

From 5eb043e4c97e8203d0431dcff108268808ce3ab0 Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Fri, 14 Mar 2025 15:27:44 +0100
Subject: [PATCH 2650/2913] [nrf fromtree] west: runners: jlink: Avoid running
 logic when another runner is used

The logic to detect the default JLink location was placed at the top of
the script, executing whenever the script was imported. The west
extension command framework loads all runners when initializing, and so
this logic was being executed even when using another runner.

Move the logic to a function that is only executed when the JLink runner
is selected, to avoid executing it at all times.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit 4c12a8c7829694090eb83c528877e276b0589d54)
---
 scripts/west_commands/runners/jlink.py | 68 ++++++++++++++------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/scripts/west_commands/runners/jlink.py b/scripts/west_commands/runners/jlink.py
index f2c3bc21d90..99bb44b79cc 100644
--- a/scripts/west_commands/runners/jlink.py
+++ b/scripts/west_commands/runners/jlink.py
@@ -26,37 +26,8 @@
 except ImportError:
     MISSING_REQUIREMENTS = True
 
-if sys.platform == 'win32':
-    # JLink.exe can collide with the JDK executable of the same name
-    # Look in the usual locations before falling back to $PATH
-    for root in [os.environ["ProgramFiles"], os.environ["ProgramFiles(x86)"], str(Path.home())]: # noqa SIM112
-        # SEGGER folder can contain a single "JLink" folder
-        _direct = Path(root) / "SEGGER" / "JLink" / "JLink.exe"
-        if _direct.exists():
-            DEFAULT_JLINK_EXE = str(_direct)
-            del _direct
-        else:
-            # SEGGER folder can contain multiple versions such as:
-            #   JLink_V796b
-            #   JLink_V796t
-            #   JLink_V798c
-            # Find the latest version
-            _versions = glob.glob(str(Path(root) / "SEGGER" / "JLink_V*"))
-            if len(_versions) == 0:
-                continue
-            _expected_jlink = Path(_versions[-1]) / "JLink.exe"
-            if not _expected_jlink.exists():
-                continue
-            DEFAULT_JLINK_EXE = str(_expected_jlink)
-            # Cleanup variables
-            del _versions
-            del _expected_jlink
-        break
-    else:
-        # Not found in the normal locations, hope that $PATH is correct
-        DEFAULT_JLINK_EXE = "JLink.exe"
-else:
-    DEFAULT_JLINK_EXE = "JLinkExe"
+# Populated in do_add_parser()
+DEFAULT_JLINK_EXE = None
 DEFAULT_JLINK_GDB_PORT = 2331
 DEFAULT_JLINK_RTT_PORT = 19021
 
@@ -138,8 +109,43 @@ def dev_id_help(cls) -> str:
     def tool_opt_help(cls) -> str:
         return "Additional options for JLink Commander, e.g. '-autoconnect 1'"
 
+    @staticmethod
+    def find_jlink():
+        global DEFAULT_JLINK_EXE
+
+        if sys.platform == 'win32':
+            # JLink.exe can collide with the JDK executable of the same name
+            # Look in the usual locations before falling back to $PATH
+            for root in [os.environ["ProgramFiles"], os.environ["ProgramFiles(x86)"], str(Path.home())]: # noqa SIM112
+                # SEGGER folder can contain a single "JLink" folder
+                _direct = Path(root) / "SEGGER" / "JLink" / "JLink.exe"
+                if _direct.exists():
+                    DEFAULT_JLINK_EXE = str(_direct)
+                else:
+                    # SEGGER folder can contain multiple versions such as:
+                    #   JLink_V796b
+                    #   JLink_V796t
+                    #   JLink_V798c
+                    # Find the latest version
+                    _versions = glob.glob(str(Path(root) / "SEGGER" / "JLink_V*"))
+                    if len(_versions) == 0:
+                        continue
+                    _expected_jlink = Path(_versions[-1]) / "JLink.exe"
+                    if not _expected_jlink.exists():
+                        continue
+                    DEFAULT_JLINK_EXE = str(_expected_jlink)
+                break
+            else:
+                # Not found in the normal locations, hope that $PATH is correct
+                DEFAULT_JLINK_EXE = "JLink.exe"
+        else:
+            DEFAULT_JLINK_EXE = "JLinkExe"
+
     @classmethod
     def do_add_parser(cls, parser):
+
+        cls.find_jlink()
+
         # Required:
         parser.add_argument('--device', required=True, help='device name')
 

From a2aa12bb3dcc1e9fac6ce451692f326bf6a6467c Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Fri, 14 Mar 2025 18:29:45 +0100
Subject: [PATCH 2651/2913] [nrf fromtree] west: runners: jlink: Use registry
 to locate JLink executable

Instead of hardcoding a set of paths and trying to find the JLink
executable in them, use the corresponding Windows registry to locate it:

`HKEY_CURRENT_USER\\Software\\SEGGER\\J-Link`

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit bb1794bf3a444223ff9b8303caa67d4e7d1d2f86)
---
 scripts/west_commands/runners/jlink.py | 43 +++++++++++---------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/scripts/west_commands/runners/jlink.py b/scripts/west_commands/runners/jlink.py
index 99bb44b79cc..ed1b942e9b9 100644
--- a/scripts/west_commands/runners/jlink.py
+++ b/scripts/west_commands/runners/jlink.py
@@ -5,7 +5,6 @@
 '''Runner for debugging with J-Link.'''
 
 import argparse
-import glob
 import ipaddress
 import logging
 import os
@@ -110,33 +109,25 @@ def tool_opt_help(cls) -> str:
         return "Additional options for JLink Commander, e.g. '-autoconnect 1'"
 
     @staticmethod
-    def find_jlink():
+    def default_jlink():
         global DEFAULT_JLINK_EXE
 
         if sys.platform == 'win32':
             # JLink.exe can collide with the JDK executable of the same name
-            # Look in the usual locations before falling back to $PATH
-            for root in [os.environ["ProgramFiles"], os.environ["ProgramFiles(x86)"], str(Path.home())]: # noqa SIM112
-                # SEGGER folder can contain a single "JLink" folder
-                _direct = Path(root) / "SEGGER" / "JLink" / "JLink.exe"
-                if _direct.exists():
-                    DEFAULT_JLINK_EXE = str(_direct)
-                else:
-                    # SEGGER folder can contain multiple versions such as:
-                    #   JLink_V796b
-                    #   JLink_V796t
-                    #   JLink_V798c
-                    # Find the latest version
-                    _versions = glob.glob(str(Path(root) / "SEGGER" / "JLink_V*"))
-                    if len(_versions) == 0:
-                        continue
-                    _expected_jlink = Path(_versions[-1]) / "JLink.exe"
-                    if not _expected_jlink.exists():
-                        continue
-                    DEFAULT_JLINK_EXE = str(_expected_jlink)
-                break
-            else:
-                # Not found in the normal locations, hope that $PATH is correct
+            # Locate the executable using the registry
+            try:
+                import winreg
+
+                # Note that when multiple JLink versions are installed on the
+                # machine this points to the one that was installed
+                # last, and not to the latest version.
+                key = winreg.OpenKeyEx(
+                    winreg.HKEY_CURRENT_USER, r"Software\SEGGER\J-Link")
+                DEFAULT_JLINK_EXE = (
+                    Path(winreg.QueryValueEx(key, "InstallPath")[0])
+                    / "JLink.exe")
+            except Exception:
+                # Not found via the registry, hope that $PATH is correct
                 DEFAULT_JLINK_EXE = "JLink.exe"
         else:
             DEFAULT_JLINK_EXE = "JLinkExe"
@@ -144,7 +135,8 @@ def find_jlink():
     @classmethod
     def do_add_parser(cls, parser):
 
-        cls.find_jlink()
+        # Find the default JLink executable
+        cls.default_jlink()
 
         # Required:
         parser.add_argument('--device', required=True, help='device name')
@@ -287,6 +279,7 @@ def do_run(self, command, **kwargs):
         # version of the tools we're using.
         self.commander = os.fspath(
             Path(self.require(self.commander)).resolve())
+        self.logger.debug(f'JLink executable: {self.commander}')
         self.logger.info(f'JLink version: {self.jlink_version_str}')
 
         rtos = self.thread_info_enabled and self.supports_thread_info

From bf0aa6a3f7435d272ef139439da29153283f869a Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Tue, 11 Feb 2025 18:39:06 +0530
Subject: [PATCH 2652/2913] [nrf fromtree] drivers: nrf_wifi: Disable mgmt
 buffer offload

During raw scan, Need to disable NRF_WIFI_MGMT_BUFF_OFFLOAD.
UMAC will send beacon and probe responses directly to the host,
regardless of the mgmt_buff_offload flag's value.
Host needs to resubmit buffers to LMAC.

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit 1179014e10ba93333fbb6c5e0a75af74eb9b13ac)
---
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index cb3d7e7ba36..126688d9a47 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -758,6 +758,8 @@ endchoice
 
 config NRF_WIFI_MGMT_BUFF_OFFLOAD
 	bool "Management buffer offload"
+	# Raw scan results need host based refilling
+	depends on !WIFI_MGMT_RAW_SCAN_RESULTS
 	default y
 	help
 	  This option offloads the refilling of management buffers to the UMAC, saving the host

From 7d7d1d8393ba1907d4461ee95122270d9754afe2 Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Tue, 11 Mar 2025 15:12:01 +0530
Subject: [PATCH 2653/2913] [nrf fromtree] drivers: wifi: Set reorder buffer
 size to half of RX buffers

For different values of reorder buffer throughputs are consistent,
Setting reorder buffer size to half of the RX buffers configured.

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit 9f7307fe842701a832cb72da6e3b1637112edc07)
---
 drivers/wifi/nrf_wifi/src/fmac_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/wifi/nrf_wifi/src/fmac_main.c b/drivers/wifi/nrf_wifi/src/fmac_main.c
index 470be6c8055..341d4c15a55 100644
--- a/drivers/wifi/nrf_wifi/src/fmac_main.c
+++ b/drivers/wifi/nrf_wifi/src/fmac_main.c
@@ -76,7 +76,7 @@ BUILD_ASSERT(CONFIG_NRF70_TX_MAX_DATA_SIZE >= MAX_TX_FRAME_SIZE,
 static const unsigned char aggregation = 1;
 static const unsigned char max_num_tx_agg_sessions = 4;
 static const unsigned char max_num_rx_agg_sessions = 8;
-static const unsigned char reorder_buf_size = 16;
+static const unsigned char reorder_buf_size = CONFIG_NRF70_RX_NUM_BUFS / 2;
 static const unsigned char max_rxampdu_size = MAX_RX_AMPDU_SIZE_64KB;
 
 static const unsigned char max_tx_aggregation = CONFIG_NRF70_MAX_TX_AGGREGATION;

From 83390163009bfb440f9d811bd99a58970d286f9a Mon Sep 17 00:00:00 2001
From: Tomasz Tyzenhauz <tomasz.tyzenhauz@nordicsemi.no>
Date: Wed, 19 Mar 2025 15:22:08 +0100
Subject: [PATCH 2654/2913] [nrf noup] ci: remove Sidewalk from test-spec

Sidewalk becomes NCS Add-on.
There is no need to trigger Sidewalk tests.

Signed-off-by: Tomasz Tyzenhauz <tomasz.tyzenhauz@nordicsemi.no>
---
 .github/test-spec.yml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/.github/test-spec.yml b/.github/test-spec.yml
index bf09724ea49..8dc91bbb492 100644
--- a/.github/test-spec.yml
+++ b/.github/test-spec.yml
@@ -302,19 +302,6 @@
   - "subsys/net/l2/wifi/**/*"
   - "subsys/net/l2/ethernet/**/*"
 
-"CI-sidewalk-test":
-  - "include/dfu/**/*"
-  - "include/mgmt/mcumgr/**/*"
-  - "soc/nordic/**/*"
-  - "subsys/dfu/**/*"
-  - "subsys/settings/**/*"
-  - "subsys/mgmt/mcumgr/**/*"
-  - "samples/bluetooth/hci_ipc/**/*"
-  - any:
-      - "subsys/bluetooth/**/*"
-      - "!subsys/bluetooth/mesh/**/*"
-      - "!subsys/bluetooth/audio/**/*"
-
 "CI-audio-test":
   - "boards/nordic/nrf5340_audio_dk/**/*"
   - "drivers/flash/**/*"

From d97d77dbd5815f2769d391960516354cc17100ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Thu, 20 Mar 2025 09:57:01 +0100
Subject: [PATCH 2655/2913] [nrf fromlist] tests: drivers: counter: basic_api:
 Add nRF54L20 FLPR
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added common overlay for nRF54L20 cores.

Upstream PR #: 87388

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 .../boards/nrf54l20pdk_nrf54l20_common.dtsi   | 36 +++++++++++++++++++
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       | 35 ++----------------
 .../nrf54l20pdk_nrf54l20_cpuflpr.overlay      |  3 ++
 3 files changed, 41 insertions(+), 33 deletions(-)
 create mode 100644 tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_common.dtsi
 create mode 100644 tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay

diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_common.dtsi b/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_common.dtsi
new file mode 100644
index 00000000000..72941675287
--- /dev/null
+++ b/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_common.dtsi
@@ -0,0 +1,36 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&timer00 {
+	prescaler = <6>;
+	status = "okay";
+};
+
+&timer10 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer20 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer21 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer22 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer23 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer24 {
+	prescaler = <4>;
+	status = "okay";
+};
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
index 54b47926164..42b2852a09f 100644
--- a/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
+++ b/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -1,34 +1,3 @@
-&timer00 {
-	prescaler = <6>;
-	status = "okay";
-};
+/* SPDX-License-Identifier: Apache-2.0 */
 
-&timer10 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer20 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer21 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer22 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer23 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer24 {
-	prescaler = <4>;
-	status = "okay";
-};
+#include "nrf54l20pdk_nrf54l20_common.dtsi"
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay
new file mode 100644
index 00000000000..42b2852a09f
--- /dev/null
+++ b/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#include "nrf54l20pdk_nrf54l20_common.dtsi"

From 7684f5879a4373cff03f8f3abf4378ec8643cadf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Wed, 12 Mar 2025 14:35:19 +0100
Subject: [PATCH 2656/2913] [nrf fromtree] tests: drivers: counter: basic_api:
 Add nrf54l15dk_nrf54l15_cpuflpr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add overlay for nrf54l15dk_nrf54l15_cpuflpr target.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit bec4a8474934ef6ad4fd4154314cd8234786a279)
---
 .../boards/nrf54l15dk_nrf54l15_common.dtsi    | 36 +++++++++++++++++++
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 35 ++----------------
 .../nrf54l15dk_nrf54l15_cpuflpr.overlay       |  3 ++
 3 files changed, 41 insertions(+), 33 deletions(-)
 create mode 100644 tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_common.dtsi
 create mode 100644 tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay

diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_common.dtsi b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_common.dtsi
new file mode 100644
index 00000000000..72941675287
--- /dev/null
+++ b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_common.dtsi
@@ -0,0 +1,36 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&timer00 {
+	prescaler = <6>;
+	status = "okay";
+};
+
+&timer10 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer20 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer21 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer22 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer23 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer24 {
+	prescaler = <4>;
+	status = "okay";
+};
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 54b47926164..6683b77837a 100644
--- a/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -1,34 +1,3 @@
-&timer00 {
-	prescaler = <6>;
-	status = "okay";
-};
+/* SPDX-License-Identifier: Apache-2.0 */
 
-&timer10 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer20 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer21 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer22 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer23 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer24 {
-	prescaler = <4>;
-	status = "okay";
-};
+#include "nrf54l15dk_nrf54l15_common.dtsi"
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
new file mode 100644
index 00000000000..6683b77837a
--- /dev/null
+++ b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#include "nrf54l15dk_nrf54l15_common.dtsi"

From fbc220f29bdeb98b68fa83426fa936ceb6e6ffd9 Mon Sep 17 00:00:00 2001
From: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
Date: Mon, 24 Feb 2025 13:13:28 +0100
Subject: [PATCH 2657/2913] [nrf fromtree] samples: boards: nrf: system_off:
 Print reset reason.

Add printing reset reason at the beginning of the sample. Makes it easier
to determine if sample correctly wakes up from LP mode.

Signed-off-by: Bartlomiej Buczek <bartlomiej.buczek@nordicsemi.no>
(cherry picked from commit c08edf7a723f58c295e056a29d2aae95496c2983)
---
 samples/boards/nordic/system_off/prj.conf    |  1 +
 samples/boards/nordic/system_off/sample.yaml |  2 ++
 samples/boards/nordic/system_off/src/main.c  | 17 +++++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/samples/boards/nordic/system_off/prj.conf b/samples/boards/nordic/system_off/prj.conf
index 3849b9c2746..04450d5a22d 100644
--- a/samples/boards/nordic/system_off/prj.conf
+++ b/samples/boards/nordic/system_off/prj.conf
@@ -2,3 +2,4 @@ CONFIG_PM_DEVICE=y
 CONFIG_GPIO=y
 CONFIG_CRC=y
 CONFIG_POWEROFF=y
+CONFIG_HWINFO=y
diff --git a/samples/boards/nordic/system_off/sample.yaml b/samples/boards/nordic/system_off/sample.yaml
index 35483a81373..6b953645138 100644
--- a/samples/boards/nordic/system_off/sample.yaml
+++ b/samples/boards/nordic/system_off/sample.yaml
@@ -68,6 +68,7 @@ tests:
         - "Retained data not supported"
         - "Entering system off; wait 2 seconds to restart"
         - "system off demo"
+        - "Wakeup from System OFF by GRTC."
         - "Retained data not supported"
         - "Entering system off; wait 2 seconds to restart"
   sample.boards.nrf.system_off.retained_mem.grtc_wakeup:
@@ -97,6 +98,7 @@ tests:
         - "Off count: 1"
         - "Active Ticks:"
         - "Entering system off; wait 2 seconds to restart"
+        - "Wakeup from System OFF by GRTC."
   sample.boards.nrf.system_off.lpcomp_wakeup:
     extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_comparator.overlay"
     platform_allow:
diff --git a/samples/boards/nordic/system_off/src/main.c b/samples/boards/nordic/system_off/src/main.c
index e8617be2c5f..0b0cbf3cb0b 100644
--- a/samples/boards/nordic/system_off/src/main.c
+++ b/samples/boards/nordic/system_off/src/main.c
@@ -11,6 +11,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/hwinfo.h>
 #include <zephyr/drivers/comparator.h>
 #include <zephyr/kernel.h>
 #include <zephyr/pm/device.h>
@@ -28,6 +29,20 @@ static const struct gpio_dt_spec sw0 = GPIO_DT_SPEC_GET(DT_ALIAS(sw0), gpios);
 static const struct device *comp_dev = DEVICE_DT_GET(DT_NODELABEL(comp));
 #endif
 
+void print_reset_cause(void)
+{
+	uint32_t reset_cause;
+
+	hwinfo_get_reset_cause(&reset_cause);
+	if (reset_cause & RESET_DEBUG) {
+		printf("Reset by debugger.\n");
+	} else if (reset_cause & RESET_CLOCK) {
+		printf("Wakeup from System OFF by GRTC.\n");
+	} else  {
+		printf("Other wake up cause 0x%08X.\n", reset_cause);
+	}
+}
+
 int main(void)
 {
 	int rc;
@@ -39,6 +54,7 @@ int main(void)
 	}
 
 	printf("\n%s system off demo\n", CONFIG_BOARD);
+	print_reset_cause();
 
 	if (IS_ENABLED(CONFIG_APP_USE_RETAINED_MEM)) {
 		bool retained_ok = retained_validate();
@@ -98,6 +114,7 @@ int main(void)
 		retained_update();
 	}
 
+	hwinfo_clear_reset_cause();
 	sys_poweroff();
 
 	return 0;

From 094a92bd3963c5ddfa5033932f7388a48f8fdfda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Thu, 20 Mar 2025 10:32:38 +0100
Subject: [PATCH 2658/2913] Revert "[nrf fromlist] dts: nordic: nrf54: add TDM
 support for nRF54"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7d44195bccf5158e9e13d3e4f38582b5c2670753.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 dts/bindings/i2s/nordic,nrf-tdm.yaml | 48 ----------------------------
 dts/common/nordic/nrf54h20.dtsi      | 28 ----------------
 dts/common/nordic/nrf54l20.dtsi      | 19 -----------
 3 files changed, 95 deletions(-)
 delete mode 100644 dts/bindings/i2s/nordic,nrf-tdm.yaml

diff --git a/dts/bindings/i2s/nordic,nrf-tdm.yaml b/dts/bindings/i2s/nordic,nrf-tdm.yaml
deleted file mode 100644
index 82f51147848..00000000000
--- a/dts/bindings/i2s/nordic,nrf-tdm.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: Nordic TDM (Time division multiplexed audio interface)
-
-compatible: "nordic,nrf-tdm"
-
-include: [i2s-controller.yaml, pinctrl-device.yaml, nordic-clockpin.yaml, "memory-region.yaml"]
-
-properties:
-  reg:
-    required: true
-
-  interrupts:
-    required: true
-
-  mck-frequency:
-    type: int
-    description: |
-      Frequency of the MCK clock. Configured independently of SCK.
-
-  pinctrl-0:
-    required: true
-
-  pinctrl-names:
-    required: true
-
-  easydma-maxcnt-bits:
-    type: int
-    required: true
-    description: |
-      Maximum number of bits available in the EasyDMA MAXCNT register. This
-      property must be set at SoC level DTS files.
-
-  clock-source:
-    type: string
-    default: "PCLK"
-    description: |
-      Clock source to be used by the TDM peripheral. The following options
-      are available:
-      - "PCLK": Peripheral clock
-      - "ACLK": Audio PLL clock with configurable frequency (frequency for
-        this clock must be set via the "hfclkaudio-frequency" property
-        in the "nordic,nrf-clock" node); this clock source is only available
-        in the nRF53 Series SoCs and it requires the use of HFXO
-    enum:
-      - "PCLK"
-      - "ACLK"
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index bfce794ff3c..9ddb657c4da 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -1491,34 +1491,6 @@
 				endtx-stoptx-supported;
 				frame-timeout-supported;
 			};
-
-			tdm130: tdm@992000 {
-				compatible = "nordic,nrf-tdm";
-				easydma-maxcnt-bits = <15>;
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0x992000 0x1000>;
-				interrupts = <402 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
-				nordic,clockpin-enable = <NRF_FUN_TDM_SCK_M>,
-							 <NRF_FUN_TDM_MCK>;
-			};
-
-			tdm131: tdm@997000 {
-				compatible = "nordic,nrf-tdm";
-				easydma-maxcnt-bits = <15>;
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0x997000 0x1000>;
-				interrupts = <407 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				clocks = <&fll16m>;
-				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
-				nordic,clockpin-enable = <NRF_FUN_TDM_SCK_M>,
-							 <NRF_FUN_TDM_MCK>;
-			};
 		};
 	};
 
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 2d8f892e07e..d95ea80da26 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -53,12 +53,6 @@
 			clock-frequency = <DT_FREQ_M(16)>;
 		};
 
-		pclk32m: pclk32m {
-			compatible = "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <DT_FREQ_M(32)>;
-		};
-
 		lfxo: lfxo {
 			compatible = "nordic,nrf-lfxo";
 			#clock-cells = <0>;
@@ -690,19 +684,6 @@
 				frame-timeout-supported;
 			};
 
-			tdm: tdm@e8000 {
-				compatible = "nordic,nrf-tdm";
-				easydma-maxcnt-bits = <15>;
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0xe8000 0x1000>;
-				interrupts = <232 NRF_DEFAULT_IRQ_PRIORITY>;
-				status = "disabled";
-				clocks = <&pclk32m>;
-				nordic,clockpin-enable = <NRF_FUN_TDM_SCK_M>,
-							 <NRF_FUN_TDM_MCK>;
-			};
-
 			wdt30: watchdog@108000 {
 				compatible = "nordic,nrf-wdt";
 				reg = <0x108000 0x620>;

From a59d8b57d1d84efa2b7f5ac2f0c9d1fa823d58f7 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Wed, 27 Nov 2024 16:06:44 +0100
Subject: [PATCH 2659/2913] [nrf fromlist] dts: nordic: nrf54: add TDM support
 for nRF54

Add TDM support for nRF54H20 and nRF54L20

Upstream PR #: 82144

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 dts/bindings/i2s/nordic,nrf-tdm.yaml | 48 ++++++++++++++++++++++++++++
 dts/common/nordic/nrf54h20.dtsi      | 28 ++++++++++++++++
 dts/common/nordic/nrf54l20.dtsi      | 19 +++++++++++
 3 files changed, 95 insertions(+)
 create mode 100644 dts/bindings/i2s/nordic,nrf-tdm.yaml

diff --git a/dts/bindings/i2s/nordic,nrf-tdm.yaml b/dts/bindings/i2s/nordic,nrf-tdm.yaml
new file mode 100644
index 00000000000..82f51147848
--- /dev/null
+++ b/dts/bindings/i2s/nordic,nrf-tdm.yaml
@@ -0,0 +1,48 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Nordic TDM (Time division multiplexed audio interface)
+
+compatible: "nordic,nrf-tdm"
+
+include: [i2s-controller.yaml, pinctrl-device.yaml, nordic-clockpin.yaml, "memory-region.yaml"]
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  mck-frequency:
+    type: int
+    description: |
+      Frequency of the MCK clock. Configured independently of SCK.
+
+  pinctrl-0:
+    required: true
+
+  pinctrl-names:
+    required: true
+
+  easydma-maxcnt-bits:
+    type: int
+    required: true
+    description: |
+      Maximum number of bits available in the EasyDMA MAXCNT register. This
+      property must be set at SoC level DTS files.
+
+  clock-source:
+    type: string
+    default: "PCLK"
+    description: |
+      Clock source to be used by the TDM peripheral. The following options
+      are available:
+      - "PCLK": Peripheral clock
+      - "ACLK": Audio PLL clock with configurable frequency (frequency for
+        this clock must be set via the "hfclkaudio-frequency" property
+        in the "nordic,nrf-clock" node); this clock source is only available
+        in the nRF53 Series SoCs and it requires the use of HFXO
+    enum:
+      - "PCLK"
+      - "ACLK"
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 9ddb657c4da..bfce794ff3c 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -1491,6 +1491,34 @@
 				endtx-stoptx-supported;
 				frame-timeout-supported;
 			};
+
+			tdm130: tdm@992000 {
+				compatible = "nordic,nrf-tdm";
+				easydma-maxcnt-bits = <15>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0x992000 0x1000>;
+				interrupts = <402 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
+				nordic,clockpin-enable = <NRF_FUN_TDM_SCK_M>,
+							 <NRF_FUN_TDM_MCK>;
+			};
+
+			tdm131: tdm@997000 {
+				compatible = "nordic,nrf-tdm";
+				easydma-maxcnt-bits = <15>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0x997000 0x1000>;
+				interrupts = <407 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
+				nordic,clockpin-enable = <NRF_FUN_TDM_SCK_M>,
+							 <NRF_FUN_TDM_MCK>;
+			};
 		};
 	};
 
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index d95ea80da26..8377e1cebca 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -53,6 +53,12 @@
 			clock-frequency = <DT_FREQ_M(16)>;
 		};
 
+		pclk32m: pclk32m {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <DT_FREQ_M(32)>;
+		};
+
 		lfxo: lfxo {
 			compatible = "nordic,nrf-lfxo";
 			#clock-cells = <0>;
@@ -555,6 +561,19 @@
 				status = "disabled";
 			};
 
+			tdm: tdm@e8000 {
+				compatible = "nordic,nrf-tdm";
+				easydma-maxcnt-bits = <15>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xe8000 0x1000>;
+				interrupts = <232 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				clocks = <&pclk32m>;
+				nordic,clockpin-enable = <NRF_FUN_TDM_SCK_M>,
+							 <NRF_FUN_TDM_MCK>;
+			};
+
 			i2c23: i2c@ed000 {
 				compatible = "nordic,nrf-twim";
 				#address-cells = <1>;

From c9113a87822e123bd287568c957d92b35502e5d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Wed, 19 Mar 2025 15:31:26 +0100
Subject: [PATCH 2660/2913] [nrf fromlist] dts: nordic: nrf54l20: add
 comparator node
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added missing comparator node to nRF54L20 devicetree.

Upstream PR #: 87352

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 dts/common/nordic/nrf54l20.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 8377e1cebca..3dc439394ff 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -703,6 +703,17 @@
 				frame-timeout-supported;
 			};
 
+			comp: comparator@106000 {
+				/*
+				 * Use compatible "nordic,nrf-comp" to configure as COMP
+				 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
+				 */
+				compatible = "nordic,nrf-comp";
+				reg = <0x106000 0x1000>;
+				status = "disabled";
+				interrupts = <262 NRF_DEFAULT_IRQ_PRIORITY>;
+			};
+
 			wdt30: watchdog@108000 {
 				compatible = "nordic,nrf-wdt";
 				reg = <0x108000 0x620>;

From fcdc9f40c22461fe9de9657da39817ae815690bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 16 Jan 2025 12:41:22 +0100
Subject: [PATCH 2661/2913] [nrf fromtree] boards: nordic: nrf54l09pdk: Change
 pin used for led0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

P1.7 used for led 0 was not passing gpio_api_1pin test (probably
shortened with another pin in the test setup. Use different pin
that passes the gpio_api_1pin test. At current stage this PDK is
'virtual' so this pin is not attached to any LED and it can be
changed.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit b298faa5e35e48dd6137f260946bc0eff1b1bbd4)
---
 boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi
index 5d23a1a9cac..f1e9ee9afd8 100644
--- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi
@@ -10,7 +10,7 @@
 	leds {
 		compatible = "gpio-leds";
 		led0: led_0 {
-			gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
 			label = "Green LED 1";
 		};
 		led1: led_1 {

From b4fa7f15ef1b2e2fdebc97ba11d340347c817451 Mon Sep 17 00:00:00 2001
From: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Date: Thu, 13 Feb 2025 16:30:42 +0200
Subject: [PATCH 2662/2913] Revert "[nrf noup] samples: psa: Fix issues"

This reverts commit 8a64a2e4ab24379765dde83c2a50044c0d615541.

We shouldn't have noups to fix things that can
and should be fixed elsewhere/differently.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
---
 samples/psa/its/overlay-secure_storage.conf            | 3 ---
 samples/psa/its/sample.yaml                            | 2 --
 samples/psa/persistent_key/overlay-secure_storage.conf | 3 ---
 samples/psa/persistent_key/sample.yaml                 | 3 ---
 4 files changed, 11 deletions(-)

diff --git a/samples/psa/its/overlay-secure_storage.conf b/samples/psa/its/overlay-secure_storage.conf
index 8ff0c17ebcb..3473ae38910 100644
--- a/samples/psa/its/overlay-secure_storage.conf
+++ b/samples/psa/its/overlay-secure_storage.conf
@@ -3,9 +3,6 @@
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 
-# native_sim requires ECB cipher to be enabled
-CONFIG_PSA_WANT_ALG_ECB_NO_PADDING=y
-
 # The default stack size (1024) is not enough for the PSA Crypto core.
 # On top of that, the ITS implementation uses the stack for buffers.
 CONFIG_MAIN_STACK_SIZE=3072
diff --git a/samples/psa/its/sample.yaml b/samples/psa/its/sample.yaml
index 024c065ba74..c4ee3543696 100644
--- a/samples/psa/its/sample.yaml
+++ b/samples/psa/its/sample.yaml
@@ -13,8 +13,6 @@ common:
 tests:
   sample.psa.its.tfm:
     filter: CONFIG_BUILD_WITH_TFM
-    extra_args:
-      - CONFIG_TFM_PROFILE_TYPE_MEDIUM=y
     tags:
       - trusted-firmware-m
   sample.psa.its.secure_storage.entropy_driver:
diff --git a/samples/psa/persistent_key/overlay-secure_storage.conf b/samples/psa/persistent_key/overlay-secure_storage.conf
index 8ff0c17ebcb..3473ae38910 100644
--- a/samples/psa/persistent_key/overlay-secure_storage.conf
+++ b/samples/psa/persistent_key/overlay-secure_storage.conf
@@ -3,9 +3,6 @@
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 
-# native_sim requires ECB cipher to be enabled
-CONFIG_PSA_WANT_ALG_ECB_NO_PADDING=y
-
 # The default stack size (1024) is not enough for the PSA Crypto core.
 # On top of that, the ITS implementation uses the stack for buffers.
 CONFIG_MAIN_STACK_SIZE=3072
diff --git a/samples/psa/persistent_key/sample.yaml b/samples/psa/persistent_key/sample.yaml
index 89ced48f5b4..01cf9f450d1 100644
--- a/samples/psa/persistent_key/sample.yaml
+++ b/samples/psa/persistent_key/sample.yaml
@@ -13,9 +13,6 @@ common:
 tests:
   sample.psa.persistent_key.tfm:
     filter: CONFIG_BUILD_WITH_TFM
-    extra_args:
-      - CONFIG_TFM_PROFILE_TYPE_MEDIUM=y
-      - CONFIG_PSA_WANT_GENERATE_RANDOM=y
     tags:
       - trusted-firmware-m
   sample.psa.persistent_key.secure_storage.entropy_driver:

From 999055a6e562541e1d3ec44ed9a2b0a4508d45cd Mon Sep 17 00:00:00 2001
From: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Date: Thu, 13 Feb 2025 16:30:52 +0200
Subject: [PATCH 2663/2913] Revert "[nrf noup] tests: secure_storage: Fix
 issues"

This reverts commit fcb4238dbd1ac2d030d38031f3297947e993afda.

We shouldn't have noups to fix things that can
and should be fixed elsewhere/differently.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
---
 tests/subsys/secure_storage/psa/crypto/prj.conf            | 3 ---
 tests/subsys/secure_storage/psa/crypto/src/main.c          | 7 +------
 tests/subsys/secure_storage/psa/crypto/testcase.yaml       | 3 ---
 .../secure_storage/psa/its/overlay-secure_storage.conf     | 4 ----
 tests/subsys/secure_storage/psa/its/overlay-tfm.conf       | 3 +--
 tests/subsys/secure_storage/psa/its/prj.conf               | 1 -
 6 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/tests/subsys/secure_storage/psa/crypto/prj.conf b/tests/subsys/secure_storage/psa/crypto/prj.conf
index bc7ec5fdbb9..d512b2fd70a 100644
--- a/tests/subsys/secure_storage/psa/crypto/prj.conf
+++ b/tests/subsys/secure_storage/psa/crypto/prj.conf
@@ -2,6 +2,3 @@ CONFIG_ZTEST=y
 
 CONFIG_PSA_WANT_KEY_TYPE_AES=y
 CONFIG_PSA_WANT_ALG_CBC_NO_PADDING=y
-
-# native_sim requires ECB cipher to be enabled
-CONFIG_PSA_WANT_ALG_ECB_NO_PADDING=y
diff --git a/tests/subsys/secure_storage/psa/crypto/src/main.c b/tests/subsys/secure_storage/psa/crypto/src/main.c
index a81f131f4f7..04a29435cab 100644
--- a/tests/subsys/secure_storage/psa/crypto/src/main.c
+++ b/tests/subsys/secure_storage/psa/crypto/src/main.c
@@ -77,12 +77,7 @@ ZTEST(secure_storage_psa_crypto, test_its_caller_isolation)
 
 	ret = psa_get_key_attributes(ID, &retrieved_key_attributes);
 	zassert_equal(ret, PSA_SUCCESS);
-	zassert_equal(key_attributes.private_bits, retrieved_key_attributes.private_bits);
-	zassert_equal(key_attributes.private_id, retrieved_key_attributes.private_id);
-	zassert_equal(key_attributes.private_lifetime, retrieved_key_attributes.private_lifetime);
-	zassert_mem_equal(&key_attributes.private_policy, &retrieved_key_attributes.private_policy,
-			  sizeof(key_attributes.private_policy));
-
+	zassert_mem_equal(&retrieved_key_attributes, &key_attributes, sizeof(key_attributes));
 	ret = psa_destroy_key(ID);
 	zassert_equal(ret, PSA_SUCCESS);
 	ret = psa_get_key_attributes(ID, &retrieved_key_attributes);
diff --git a/tests/subsys/secure_storage/psa/crypto/testcase.yaml b/tests/subsys/secure_storage/psa/crypto/testcase.yaml
index df8a5b5d364..ce369fc1013 100644
--- a/tests/subsys/secure_storage/psa/crypto/testcase.yaml
+++ b/tests/subsys/secure_storage/psa/crypto/testcase.yaml
@@ -10,8 +10,5 @@ tests:
       - nrf54l15dk/nrf54l15/cpuapp
   secure_storage.psa.crypto.tfm:
     filter: CONFIG_BUILD_WITH_TFM
-    extra_args:
-      - CONFIG_TFM_PROFILE_TYPE_MEDIUM=y
-      - CONFIG_PSA_WANT_GENERATE_RANDOM=y
     integration_platforms:
       - nrf9151dk/nrf9151/ns
diff --git a/tests/subsys/secure_storage/psa/its/overlay-secure_storage.conf b/tests/subsys/secure_storage/psa/its/overlay-secure_storage.conf
index 8a81a4a4f9a..3ca9fdabcf2 100644
--- a/tests/subsys/secure_storage/psa/its/overlay-secure_storage.conf
+++ b/tests/subsys/secure_storage/psa/its/overlay-secure_storage.conf
@@ -2,7 +2,3 @@ CONFIG_ZTEST_STACK_SIZE=3072
 CONFIG_MAIN_STACK_SIZE=2048
 
 CONFIG_SECURE_STORAGE=y
-
-# native_sim requires ECB cipher to be enabled
-CONFIG_PSA_WANT_ALG_ECB_NO_PADDING=y
-CONFIG_PSA_WANT_KEY_TYPE_AES=y
diff --git a/tests/subsys/secure_storage/psa/its/overlay-tfm.conf b/tests/subsys/secure_storage/psa/its/overlay-tfm.conf
index 969d32669e4..78762d8afa3 100644
--- a/tests/subsys/secure_storage/psa/its/overlay-tfm.conf
+++ b/tests/subsys/secure_storage/psa/its/overlay-tfm.conf
@@ -1,3 +1,2 @@
 CONFIG_TFM_ITS_MAX_ASSET_SIZE_OVERRIDE=y
-CONFIG_TFM_ITS_MAX_ASSET_SIZE=512
-CONFIG_TFM_PROFILE_TYPE_MEDIUM=y
+CONFIG_TFM_ITS_MAX_ASSET_SIZE=256
diff --git a/tests/subsys/secure_storage/psa/its/prj.conf b/tests/subsys/secure_storage/psa/its/prj.conf
index 444328072a4..9467c292689 100644
--- a/tests/subsys/secure_storage/psa/its/prj.conf
+++ b/tests/subsys/secure_storage/psa/its/prj.conf
@@ -1,2 +1 @@
 CONFIG_ZTEST=y
-CONFIG_ZTEST_STACK_SIZE=3072

From 90eaff325af551463469d46bb10f4df849bec839 Mon Sep 17 00:00:00 2001
From: Sadik Ozer <sadik.ozer@analog.com>
Date: Thu, 16 Jan 2025 14:05:22 +0300
Subject: [PATCH 2664/2913] [nrf fromtree] tests: subsys: secure_storage: Add
 filter for small profile

TF-M small profile does not support secure storage (know as Protected
storage), this commit add filter for tfm test case to pass it
incase of small profile been set, see tf-m profiles in below link

https://tf-m-user-guide.trustedfirmware.org/configuration/profiles/index.html

Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit 6932885996ae36d43603633381373b4f13de503a)
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
---
 tests/subsys/secure_storage/psa/crypto/testcase.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/subsys/secure_storage/psa/crypto/testcase.yaml b/tests/subsys/secure_storage/psa/crypto/testcase.yaml
index ce369fc1013..06606fae02a 100644
--- a/tests/subsys/secure_storage/psa/crypto/testcase.yaml
+++ b/tests/subsys/secure_storage/psa/crypto/testcase.yaml
@@ -9,6 +9,6 @@ tests:
       - native_sim
       - nrf54l15dk/nrf54l15/cpuapp
   secure_storage.psa.crypto.tfm:
-    filter: CONFIG_BUILD_WITH_TFM
+    filter: CONFIG_BUILD_WITH_TFM and not CONFIG_TFM_PROFILE_TYPE_SMALL
     integration_platforms:
       - nrf9151dk/nrf9151/ns

From a25514b7ce9dc26c007cca7ce0ea2c805ac49c73 Mon Sep 17 00:00:00 2001
From: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Date: Thu, 13 Feb 2025 16:18:58 +0200
Subject: [PATCH 2665/2913] [nrf fromtree] secure_storage: improve tests'
 compatibility in TF-M-enabled scenarios

Explicitly set the TF-M profile to not rely on the build system defaults
which might differ.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
(cherry picked from commit 62fe34dd02f053fc2fe0feb44dd5cb874a9c1a37)
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
---
 samples/psa/its/overlay-tfm.conf                        | 3 +++
 samples/psa/its/sample.yaml                             | 3 ++-
 samples/psa/persistent_key/overlay-tfm.conf             | 3 +++
 samples/psa/persistent_key/sample.yaml                  | 3 ++-
 tests/subsys/secure_storage/psa/crypto/overlay-tfm.conf | 1 +
 tests/subsys/secure_storage/psa/crypto/testcase.yaml    | 3 ++-
 tests/subsys/secure_storage/psa/its/overlay-tfm.conf    | 2 ++
 7 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 samples/psa/its/overlay-tfm.conf
 create mode 100644 samples/psa/persistent_key/overlay-tfm.conf
 create mode 100644 tests/subsys/secure_storage/psa/crypto/overlay-tfm.conf

diff --git a/samples/psa/its/overlay-tfm.conf b/samples/psa/its/overlay-tfm.conf
new file mode 100644
index 00000000000..5379af81ede
--- /dev/null
+++ b/samples/psa/its/overlay-tfm.conf
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
diff --git a/samples/psa/its/sample.yaml b/samples/psa/its/sample.yaml
index c4ee3543696..b556dc64e8e 100644
--- a/samples/psa/its/sample.yaml
+++ b/samples/psa/its/sample.yaml
@@ -13,6 +13,7 @@ common:
 tests:
   sample.psa.its.tfm:
     filter: CONFIG_BUILD_WITH_TFM
+    extra_args: EXTRA_CONF_FILE=overlay-tfm.conf
     tags:
       - trusted-firmware-m
   sample.psa.its.secure_storage.entropy_driver:
@@ -25,7 +26,7 @@ tests:
   sample.psa.its.secure_storage.entropy_not_secure:
     filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE
             and not CONFIG_ENTROPY_HAS_DRIVER
-    extra_args: EXTRA_CONF_FILE="overlay-secure_storage.conf;overlay-entropy_not_secure.conf"
+    extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-entropy_not_secure.conf
     tags:
       - random
       - settings
diff --git a/samples/psa/persistent_key/overlay-tfm.conf b/samples/psa/persistent_key/overlay-tfm.conf
new file mode 100644
index 00000000000..5379af81ede
--- /dev/null
+++ b/samples/psa/persistent_key/overlay-tfm.conf
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
diff --git a/samples/psa/persistent_key/sample.yaml b/samples/psa/persistent_key/sample.yaml
index 01cf9f450d1..13c67337fdb 100644
--- a/samples/psa/persistent_key/sample.yaml
+++ b/samples/psa/persistent_key/sample.yaml
@@ -13,6 +13,7 @@ common:
 tests:
   sample.psa.persistent_key.tfm:
     filter: CONFIG_BUILD_WITH_TFM
+    extra_args: EXTRA_CONF_FILE=overlay-tfm.conf
     tags:
       - trusted-firmware-m
   sample.psa.persistent_key.secure_storage.entropy_driver:
@@ -25,7 +26,7 @@ tests:
   sample.psa.persistent_key.secure_storage.entropy_not_secure:
     filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE
             and not CONFIG_ENTROPY_HAS_DRIVER
-    extra_args: EXTRA_CONF_FILE="overlay-secure_storage.conf;overlay-entropy_not_secure.conf"
+    extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-entropy_not_secure.conf
     tags:
       - random
       - settings
diff --git a/tests/subsys/secure_storage/psa/crypto/overlay-tfm.conf b/tests/subsys/secure_storage/psa/crypto/overlay-tfm.conf
new file mode 100644
index 00000000000..516f4d9eb78
--- /dev/null
+++ b/tests/subsys/secure_storage/psa/crypto/overlay-tfm.conf
@@ -0,0 +1 @@
+CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
diff --git a/tests/subsys/secure_storage/psa/crypto/testcase.yaml b/tests/subsys/secure_storage/psa/crypto/testcase.yaml
index 06606fae02a..1482d23cb6c 100644
--- a/tests/subsys/secure_storage/psa/crypto/testcase.yaml
+++ b/tests/subsys/secure_storage/psa/crypto/testcase.yaml
@@ -9,6 +9,7 @@ tests:
       - native_sim
       - nrf54l15dk/nrf54l15/cpuapp
   secure_storage.psa.crypto.tfm:
-    filter: CONFIG_BUILD_WITH_TFM and not CONFIG_TFM_PROFILE_TYPE_SMALL
+    filter: CONFIG_BUILD_WITH_TFM
+    extra_args: EXTRA_CONF_FILE=overlay-tfm.conf
     integration_platforms:
       - nrf9151dk/nrf9151/ns
diff --git a/tests/subsys/secure_storage/psa/its/overlay-tfm.conf b/tests/subsys/secure_storage/psa/its/overlay-tfm.conf
index 78762d8afa3..e908573fb39 100644
--- a/tests/subsys/secure_storage/psa/its/overlay-tfm.conf
+++ b/tests/subsys/secure_storage/psa/its/overlay-tfm.conf
@@ -1,2 +1,4 @@
+CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
+
 CONFIG_TFM_ITS_MAX_ASSET_SIZE_OVERRIDE=y
 CONFIG_TFM_ITS_MAX_ASSET_SIZE=256

From 7ea87192dda83a5b92098952eb7e27d8cee19325 Mon Sep 17 00:00:00 2001
From: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Date: Thu, 13 Feb 2025 16:23:02 +0200
Subject: [PATCH 2666/2913] [nrf fromtree] tests: secure_storage: psa: crypto:
 improve compatibility

The psa_key_attributes_t type is implementation-defined according to
the PSA Crypto spec.
Compare its fields individually instead of doing a memcmp() over the
entire struct.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
(cherry picked from commit 744e9f70f44af3386be079e79189f946465f8517)
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
---
 tests/subsys/secure_storage/psa/crypto/src/main.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/subsys/secure_storage/psa/crypto/src/main.c b/tests/subsys/secure_storage/psa/crypto/src/main.c
index 04a29435cab..974a931583b 100644
--- a/tests/subsys/secure_storage/psa/crypto/src/main.c
+++ b/tests/subsys/secure_storage/psa/crypto/src/main.c
@@ -26,6 +26,16 @@ static void fill_key_attributes(psa_key_attributes_t *key_attributes)
 	psa_set_key_bits(key_attributes, KEY_BITS);
 }
 
+static void compare_key_attributes(const psa_key_attributes_t *l, const psa_key_attributes_t *r)
+{
+	zassert_equal(psa_get_key_lifetime(l), psa_get_key_lifetime(r));
+	zassert_equal(psa_get_key_usage_flags(l), psa_get_key_usage_flags(r));
+	zassert_equal(psa_get_key_id(l), psa_get_key_id(r));
+	zassert_equal(psa_get_key_type(l), psa_get_key_type(r));
+	zassert_equal(psa_get_key_algorithm(l), psa_get_key_algorithm(r));
+	zassert_equal(psa_get_key_bits(l), psa_get_key_bits(r));
+}
+
 static void fill_data(uint8_t *data, size_t size)
 {
 	zassert_equal(psa_generate_random(data, size), PSA_SUCCESS);
@@ -77,7 +87,7 @@ ZTEST(secure_storage_psa_crypto, test_its_caller_isolation)
 
 	ret = psa_get_key_attributes(ID, &retrieved_key_attributes);
 	zassert_equal(ret, PSA_SUCCESS);
-	zassert_mem_equal(&retrieved_key_attributes, &key_attributes, sizeof(key_attributes));
+	compare_key_attributes(&retrieved_key_attributes, &key_attributes);
 	ret = psa_destroy_key(ID);
 	zassert_equal(ret, PSA_SUCCESS);
 	ret = psa_get_key_attributes(ID, &retrieved_key_attributes);

From e572e3ab8755ca6ef6b212b2e669402b475d1a90 Mon Sep 17 00:00:00 2001
From: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Date: Fri, 14 Feb 2025 15:25:22 +0200
Subject: [PATCH 2667/2913] [nrf fromtree] secure_storage: enable
 CONFIG_ENTROPY_GENERATOR in samples/tests

Explicitly enable CONFIG_ENTROPY_GENERATOR instead of relying on the
build system's defaults.

This:
- Makes sure the filtering works properly between entropy_driver and
entropy_not_secure test scenarios for the samples.
- Helps with TF-M builds in certain scenarios where key generation (via
`psa_generate_key()`) would fail due to the RNG functionality being
disabled.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
(cherry picked from commit 25ad578694b7e3f6eb74a78f7e219a576845ea24)
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
---
 samples/psa/its/overlay-entropy_driver.conf             | 3 ---
 samples/psa/its/prj.conf                                | 2 ++
 samples/psa/its/sample.yaml                             | 2 +-
 samples/psa/persistent_key/overlay-entropy_driver.conf  | 3 ---
 samples/psa/persistent_key/prj.conf                     | 2 ++
 samples/psa/persistent_key/sample.yaml                  | 2 +-
 tests/subsys/secure_storage/psa/crypto/overlay-tfm.conf | 2 ++
 7 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 samples/psa/its/overlay-entropy_driver.conf
 delete mode 100644 samples/psa/persistent_key/overlay-entropy_driver.conf

diff --git a/samples/psa/its/overlay-entropy_driver.conf b/samples/psa/its/overlay-entropy_driver.conf
deleted file mode 100644
index 0feb3ad0949..00000000000
--- a/samples/psa/its/overlay-entropy_driver.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/psa/its/prj.conf b/samples/psa/its/prj.conf
index 4c214a79a52..9ab1f303a6a 100644
--- a/samples/psa/its/prj.conf
+++ b/samples/psa/its/prj.conf
@@ -2,3 +2,5 @@
 
 CONFIG_LOG=y
 CONFIG_LOG_DEFAULT_LEVEL=3
+
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/psa/its/sample.yaml b/samples/psa/its/sample.yaml
index b556dc64e8e..8d67cddd157 100644
--- a/samples/psa/its/sample.yaml
+++ b/samples/psa/its/sample.yaml
@@ -19,7 +19,7 @@ tests:
   sample.psa.its.secure_storage.entropy_driver:
     filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE
             and CONFIG_ENTROPY_HAS_DRIVER
-    extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-entropy_driver.conf
+    extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf
     tags:
       - drivers.entropy
       - settings
diff --git a/samples/psa/persistent_key/overlay-entropy_driver.conf b/samples/psa/persistent_key/overlay-entropy_driver.conf
deleted file mode 100644
index 0feb3ad0949..00000000000
--- a/samples/psa/persistent_key/overlay-entropy_driver.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/psa/persistent_key/prj.conf b/samples/psa/persistent_key/prj.conf
index 9e78a182bf4..af300c0c334 100644
--- a/samples/psa/persistent_key/prj.conf
+++ b/samples/psa/persistent_key/prj.conf
@@ -4,5 +4,7 @@ CONFIG_LOG=y
 CONFIG_LOG_DEFAULT_LEVEL=3
 CONFIG_ASSERT=y
 
+CONFIG_ENTROPY_GENERATOR=y
+
 CONFIG_PSA_WANT_KEY_TYPE_AES=y
 CONFIG_PSA_WANT_ALG_CTR=y
diff --git a/samples/psa/persistent_key/sample.yaml b/samples/psa/persistent_key/sample.yaml
index 13c67337fdb..490f2ea8f15 100644
--- a/samples/psa/persistent_key/sample.yaml
+++ b/samples/psa/persistent_key/sample.yaml
@@ -19,7 +19,7 @@ tests:
   sample.psa.persistent_key.secure_storage.entropy_driver:
     filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE
             and CONFIG_ENTROPY_HAS_DRIVER
-    extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-entropy_driver.conf
+    extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf
     tags:
       - drivers.entropy
       - settings
diff --git a/tests/subsys/secure_storage/psa/crypto/overlay-tfm.conf b/tests/subsys/secure_storage/psa/crypto/overlay-tfm.conf
index 516f4d9eb78..bb6403a96c2 100644
--- a/tests/subsys/secure_storage/psa/crypto/overlay-tfm.conf
+++ b/tests/subsys/secure_storage/psa/crypto/overlay-tfm.conf
@@ -1 +1,3 @@
 CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
+
+CONFIG_ENTROPY_GENERATOR=y

From 3cffea3f9b2c930e7a06c52c3651a73ada60d69e Mon Sep 17 00:00:00 2001
From: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Date: Fri, 14 Feb 2025 16:26:59 +0200
Subject: [PATCH 2668/2913] [nrf fromtree] secure_storage: use hybrid key store
 in samples/tests

Use dynamic allocation for key material for
better compatibility as a fully static key store is a new
feature that not all PSA Crypto implementations support.

Explicitly enable CONFIG_MBEDTLS_ENABLE_HEAP to ensure that Mbed TLS uses
heap for the PSA keys' data (instead of failing at runtime).
This will turn off CONFIG_MBEDTLS_PSA_STATIC_KEY_SLOTS, making the
implementation default to dynamic key slots.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
(cherry picked from commit eb1ed1205fbd2898b6b67988483bbbdd0449a5a9)
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
---
 samples/psa/persistent_key/overlay-secure_storage.conf        | 2 ++
 .../secure_storage/psa/crypto/overlay-secure_storage.conf     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/samples/psa/persistent_key/overlay-secure_storage.conf b/samples/psa/persistent_key/overlay-secure_storage.conf
index 3473ae38910..7c1d782c4c2 100644
--- a/samples/psa/persistent_key/overlay-secure_storage.conf
+++ b/samples/psa/persistent_key/overlay-secure_storage.conf
@@ -2,6 +2,8 @@
 
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
+CONFIG_MBEDTLS_ENABLE_HEAP=y
+CONFIG_MBEDTLS_HEAP_SIZE=1024
 
 # The default stack size (1024) is not enough for the PSA Crypto core.
 # On top of that, the ITS implementation uses the stack for buffers.
diff --git a/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf b/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf
index ed84c304328..7f891e65cce 100644
--- a/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf
+++ b/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf
@@ -5,9 +5,9 @@ CONFIG_MBEDTLS=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_TIMER_RANDOM_GENERATOR=y
 CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG_ALLOW_NON_CSPRNG=y
-# PSA Crypto needs some heap, but MINIMAL_LIBC has none by default.
-CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=2048
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
+CONFIG_MBEDTLS_ENABLE_HEAP=y
+CONFIG_MBEDTLS_HEAP_SIZE=1024
 
 CONFIG_SECURE_STORAGE=y
 # For testing isolation between the different callers of the ITS.

From 3fccf78c9fbecdcbc55689e4776dddec2cef3e65 Mon Sep 17 00:00:00 2001
From: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Date: Fri, 14 Feb 2025 16:34:02 +0200
Subject: [PATCH 2669/2913] [nrf fromtree] modules: mbedtls: add promptless
 CONFIG_MBEDTLS_PSA_CRYPTO_STORAGE_C

Add a Kconfig option to match the Mbed TLS define
instead of defining it based on CONFIG_SECURE_STORAGE.

This gives more flexibility regarding the potential re-definition of the
CONFIG_MBEDTLS_PSA_CRYPTO_STORAGE_C Kconfig option.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
(cherry picked from commit 8627250d3ce537593ae986b76c95ed35200cb5b9)
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
---
 modules/mbedtls/Kconfig.tls-generic          | 3 +++
 modules/mbedtls/configs/config-tls-generic.h | 5 ++---
 subsys/secure_storage/Kconfig                | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/mbedtls/Kconfig.tls-generic b/modules/mbedtls/Kconfig.tls-generic
index 01a0eebb630..f2e73ffaf25 100644
--- a/modules/mbedtls/Kconfig.tls-generic
+++ b/modules/mbedtls/Kconfig.tls-generic
@@ -613,6 +613,9 @@ config MBEDTLS_PSA_P256M_DRIVER_RAW
 	  Warning: Usage of this Kconfig option is prohibited in Zephyr's codebase.
 	           Users can enable it in case of very memory-constrained devices, but be aware that the p256-m interface is absolutely not guaranted to remain stable over time.
 
+config MBEDTLS_PSA_CRYPTO_STORAGE_C
+	bool
+
 config MBEDTLS_PSA_STATIC_KEY_SLOTS
 	bool "Use statically allocated key buffers to store key material"
 	default y if !MBEDTLS_ENABLE_HEAP
diff --git a/modules/mbedtls/configs/config-tls-generic.h b/modules/mbedtls/configs/config-tls-generic.h
index eb3f943a458..9d46e3be482 100644
--- a/modules/mbedtls/configs/config-tls-generic.h
+++ b/modules/mbedtls/configs/config-tls-generic.h
@@ -477,17 +477,16 @@
 #if defined(CONFIG_MBEDTLS_PSA_CRYPTO_C)
 #define MBEDTLS_PSA_CRYPTO_C
 #define MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS
+#endif
 
 #if defined(CONFIG_MBEDTLS_PSA_P256M_DRIVER_ENABLED)
 #define MBEDTLS_PSA_P256M_DRIVER_ENABLED
 #endif
 
-#if defined(CONFIG_SECURE_STORAGE)
+#if defined(CONFIG_MBEDTLS_PSA_CRYPTO_STORAGE_C)
 #define MBEDTLS_PSA_CRYPTO_STORAGE_C
 #endif
 
-#endif /* CONFIG_MBEDTLS_PSA_CRYPTO_C */
-
 #if defined(CONFIG_MBEDTLS_PSA_STATIC_KEY_SLOTS)
 #define MBEDTLS_PSA_STATIC_KEY_SLOTS
 #endif
diff --git a/subsys/secure_storage/Kconfig b/subsys/secure_storage/Kconfig
index 11e78a7dbd2..11986cf0747 100644
--- a/subsys/secure_storage/Kconfig
+++ b/subsys/secure_storage/Kconfig
@@ -4,6 +4,7 @@
 menuconfig SECURE_STORAGE
 	bool "Secure storage subsystem"
 	depends on !BUILD_WITH_TFM
+	select MBEDTLS_PSA_CRYPTO_STORAGE_C if MBEDTLS_PSA_CRYPTO_C
 	select EXPERIMENTAL
 	help
 	  The secure storage subsystem provides an implementation of the PSA Secure Storage API

From 207a2bbcf1c10243bc12fbe55a3fece2b498164c Mon Sep 17 00:00:00 2001
From: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Date: Mon, 3 Mar 2025 14:04:23 +0200
Subject: [PATCH 2670/2913] [nrf fromtree] tests: secure_storage: its: increase
 stack sizes

Some implementations require more stack than others.
Increase the Ztest and main stack sizes to accommodate them.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
(cherry picked from commit f50c3d9d261f4a3c82ffc262936396136ca062fd)
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
---
 .../subsys/secure_storage/psa/its/overlay-secure_storage.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/subsys/secure_storage/psa/its/overlay-secure_storage.conf b/tests/subsys/secure_storage/psa/its/overlay-secure_storage.conf
index 3ca9fdabcf2..3810764eb95 100644
--- a/tests/subsys/secure_storage/psa/its/overlay-secure_storage.conf
+++ b/tests/subsys/secure_storage/psa/its/overlay-secure_storage.conf
@@ -1,4 +1,4 @@
-CONFIG_ZTEST_STACK_SIZE=3072
-CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_ZTEST_STACK_SIZE=4096
+CONFIG_MAIN_STACK_SIZE=3072
 
 CONFIG_SECURE_STORAGE=y

From ee5c856800af608bcc29881df5628a90199e33c5 Mon Sep 17 00:00:00 2001
From: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Date: Mon, 3 Mar 2025 14:47:02 +0200
Subject: [PATCH 2671/2913] [nrf fromtree] tests: secure_storage: enable
 entropy driver if available

On top of enabling and allowing test entropy sources, enable
CONFIG_ENTROPY_GENERATOR so that a real driver and entropy source gets
used if available.
This is needed for some PSA Crypto implementations that have random number
generation conditionally compiled in.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
(cherry picked from commit b920686812042da84bb485a91a2b7810ea5530b4)
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
---
 .../subsys/secure_storage/psa/crypto/overlay-secure_storage.conf | 1 +
 .../subsys/secure_storage/psa/its/overlay-transform_default.conf | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf b/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf
index 7f891e65cce..66d62e83c9c 100644
--- a/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf
+++ b/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf
@@ -2,6 +2,7 @@ CONFIG_ZTEST_STACK_SIZE=3072
 CONFIG_MAIN_STACK_SIZE=2048
 
 CONFIG_MBEDTLS=y
+CONFIG_ENTROPY_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_TIMER_RANDOM_GENERATOR=y
 CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG_ALLOW_NON_CSPRNG=y
diff --git a/tests/subsys/secure_storage/psa/its/overlay-transform_default.conf b/tests/subsys/secure_storage/psa/its/overlay-transform_default.conf
index 7ed936966ba..945da7e9f8b 100644
--- a/tests/subsys/secure_storage/psa/its/overlay-transform_default.conf
+++ b/tests/subsys/secure_storage/psa/its/overlay-transform_default.conf
@@ -1,4 +1,5 @@
 CONFIG_MBEDTLS=y
+CONFIG_ENTROPY_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_TIMER_RANDOM_GENERATOR=y
 CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG_ALLOW_NON_CSPRNG=y

From 6698705ae6f5871d31d9fb39ba50f244ac458200 Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Tue, 11 Feb 2025 21:41:47 +0100
Subject: [PATCH 2672/2913] [nrf fromtree] bluetooth: host: smp: fix deadlock
 when public key generation fails

When `bt_le_oob_get_local` or `bt_le_ext_adv_oob_get_local` is called
and SMP is enabled, `bt_smp_le_oob_generate_sc_data` is called to
generate a Random Number and a Confirmation Value needed for OOB data.
These values are based on the device's public key.

The public key is generated only once when `bt_smp_init` is called.
If public key generation fails, the callback passed to `bt_pub_key_get`
is called with `pkey` set to NULL. The `bt_smp_pkey_ready` callback
gets called, but it doesn't release the `sc_local_pkey_ready` semaphore
thus leaving `bt_smp_le_oob_generate_sc_data` wait for semaphore with
`K_FOREVER`.

This commit replaces the semaphore with a conditional variable and
requests a public key again if the key is NULL thus solving 2 issues:
- handling the case where the callback was triggered notifying about the
  completion of the public key request, but the key was not generated,
- handling the case where multiple threads trying to acquire the same
  sempahore.

The timeout is used instead of K_FOREVER to avoid cases when callback
has never been triggered.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit 9757ffa5fa46612737bc4814d373443ba0d043a1)
---
 subsys/bluetooth/host/smp.c | 73 ++++++++++++++++++++++++++++++++-----
 1 file changed, 64 insertions(+), 9 deletions(-)

diff --git a/subsys/bluetooth/host/smp.c b/subsys/bluetooth/host/smp.c
index db936b28fdf..d439024d5c5 100644
--- a/subsys/bluetooth/host/smp.c
+++ b/subsys/bluetooth/host/smp.c
@@ -284,7 +284,19 @@ static bool sc_oobd_present;
 static bool legacy_oobd_present;
 static bool sc_supported;
 static const uint8_t *sc_public_key;
-static K_SEM_DEFINE(sc_local_pkey_ready, 0, 1);
+
+static void bt_smp_pkey_ready(const uint8_t *pkey);
+static struct {
+	struct k_mutex lock;
+	struct k_condvar condvar;
+	struct bt_pub_key_cb cb;
+} pub_key_gen = {
+	.lock = Z_MUTEX_INITIALIZER(pub_key_gen.lock),
+	.condvar = Z_CONDVAR_INITIALIZER(pub_key_gen.condvar),
+	.cb = {
+		.func = bt_smp_pkey_ready,
+	},
+};
 
 /* Pointer to internal data is used to mark that callbacks of given SMP channel are not initialized.
  * Value of NULL represents no authentication capabilities and cannot be used for that purpose.
@@ -4627,6 +4639,21 @@ static int bt_smp_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 	return 0;
 }
 
+static void pub_key_ready_notify(void)
+{
+	int err;
+
+	ARG_UNUSED(err);
+
+	err = k_mutex_lock(&pub_key_gen.lock, K_FOREVER);
+	__ASSERT_NO_MSG(err == 0);
+
+	(void)k_condvar_broadcast(&pub_key_gen.condvar);
+
+	err = k_mutex_unlock(&pub_key_gen.lock);
+	__ASSERT_NO_MSG(err == 0);
+}
+
 static void bt_smp_pkey_ready(const uint8_t *pkey)
 {
 	int i;
@@ -4635,13 +4662,13 @@ static void bt_smp_pkey_ready(const uint8_t *pkey)
 
 	sc_public_key = pkey;
 
+	pub_key_ready_notify();
+
 	if (!pkey) {
 		LOG_WRN("Public key not available");
 		return;
 	}
 
-	k_sem_give(&sc_local_pkey_ready);
-
 	for (i = 0; i < ARRAY_SIZE(bt_smp_pool); i++) {
 		struct bt_smp *smp = &bt_smp_pool[i];
 		uint8_t err;
@@ -5663,10 +5690,42 @@ int bt_smp_le_oob_generate_sc_data(struct bt_le_oob_sc_data *le_sc_oob)
 	}
 
 	if (!sc_public_key) {
-		err = k_sem_take(&sc_local_pkey_ready, K_FOREVER);
+		/* Public key request has not been finished yet, or finished, but generation failed.
+		 * Retrying.
+		 */
+		err = k_mutex_lock(&pub_key_gen.lock, K_FOREVER);
+		__ASSERT_NO_MSG(err == 0);
+
+		err = bt_pub_key_gen(&pub_key_gen.cb);
+		if (err && err != -EALREADY) {
+			LOG_WRN("Public key re-generation request failed (%d)", err);
+
+			int mutex_err;
+
+			mutex_err = k_mutex_unlock(&pub_key_gen.lock);
+			__ASSERT_NO_MSG(mutex_err == 0);
+
+			return err;
+		}
+
+		/* 30 seconds is an arbitrary number. Increase if fails earlier on certain
+		 * platforms.
+		 */
+		err = k_condvar_wait(&pub_key_gen.condvar,
+				     &pub_key_gen.lock,
+				     K_SECONDS(30));
 		if (err) {
+			LOG_WRN("Public key generation timeout");
 			return err;
 		}
+
+		err = k_mutex_unlock(&pub_key_gen.lock);
+		__ASSERT_NO_MSG(err == 0);
+
+		/* Public key has been re-requested but generation failed. */
+		if (!sc_public_key) {
+			return -EAGAIN;
+		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_OOB_DATA_FIXED)) {
@@ -6077,10 +6136,6 @@ BT_L2CAP_BR_CHANNEL_DEFINE(smp_br_fixed_chan, BT_L2CAP_CID_BR_SMP,
 
 int bt_smp_init(void)
 {
-	static struct bt_pub_key_cb pub_key_cb = {
-		.func           = bt_smp_pkey_ready,
-	};
-
 	sc_supported = le_sc_supported();
 	if (IS_ENABLED(CONFIG_BT_SMP_SC_PAIR_ONLY) && !sc_supported) {
 		LOG_ERR("SC Pair Only Mode selected but LE SC not supported");
@@ -6095,7 +6150,7 @@ int bt_smp_init(void)
 	LOG_DBG("LE SC %s", sc_supported ? "enabled" : "disabled");
 
 	if (!IS_ENABLED(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)) {
-		bt_pub_key_gen(&pub_key_cb);
+		bt_pub_key_gen(&pub_key_gen.cb);
 	}
 
 	return smp_self_test();

From 39548ec6938dc8c9c9608ba08dac2e24a55b1e75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Cab=C3=A9?= <benjamin@zephyrproject.org>
Date: Mon, 17 Feb 2025 18:00:30 +0100
Subject: [PATCH 2673/2913] [nrf fromtree] Bluetooth: Host: drop deprecated
 BT_LE_SCAN_OPT_FILTER_WHITELIST macro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Macro has been deprecated since 2.7 LTS(!) and is using non-inclusive
terminology. Drop it.

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
(cherry picked from commit 110c49fc47b170d9e184f768799103c025578db2)
---
 include/zephyr/bluetooth/bluetooth.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/zephyr/bluetooth/bluetooth.h b/include/zephyr/bluetooth/bluetooth.h
index d1618f98a3a..d724ba3b2f8 100644
--- a/include/zephyr/bluetooth/bluetooth.h
+++ b/include/zephyr/bluetooth/bluetooth.h
@@ -2169,8 +2169,6 @@ enum {
 	BT_LE_SCAN_OPT_NO_1M = BIT(3),
 };
 
-#define BT_LE_SCAN_OPT_FILTER_WHITELIST __DEPRECATED_MACRO BT_LE_SCAN_OPT_FILTER_ACCEPT_LIST
-
 enum {
 	/** Scan without requesting additional information from advertisers. */
 	BT_LE_SCAN_TYPE_PASSIVE = 0x00,

From 48be13424e0055ab6f2b8af191f73060bef6311e Mon Sep 17 00:00:00 2001
From: Jens Rehhoff Thomsen <jthm@demant.com>
Date: Tue, 18 Feb 2025 12:46:30 +0100
Subject: [PATCH 2674/2913] [nrf fromtree] Bluetooth: host: Fix bug in scan
 start

When scanning is started on bt_bap_broadcast_assistant_scan_start then
BAP_BA_FLAG_SCANNING flag for the broadcast assistant instance should
not be cleared.

Fixes #85937

Signed-off-by: Jens Rehhoff Thomsen <jthm@demant.com>
(cherry picked from commit c44334374eac27c7f3ab99c5c67901b29708ac89)
---
 subsys/bluetooth/audio/bap_broadcast_assistant.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/subsys/bluetooth/audio/bap_broadcast_assistant.c b/subsys/bluetooth/audio/bap_broadcast_assistant.c
index 4d38b9307fd..5c3973a57f1 100644
--- a/subsys/bluetooth/audio/bap_broadcast_assistant.c
+++ b/subsys/bluetooth/audio/bap_broadcast_assistant.c
@@ -1172,7 +1172,6 @@ int bt_bap_broadcast_assistant_scan_start(struct bt_conn *conn, bool start_scan)
 
 	cp->opcode = BT_BAP_BASS_OP_SCAN_START;
 
-	atomic_clear_bit(inst->flags, BAP_BA_FLAG_SCANNING);
 	err = bt_bap_broadcast_assistant_common_cp(conn, &att_buf);
 	if (err != 0 && start_scan) {
 		/* bt_bap_broadcast_assistant_common_cp clears the busy flag on error */

From de6651fc963ff7fcc6bf74ba0e736f3154583fc2 Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Mon, 13 Jan 2025 15:34:05 +0100
Subject: [PATCH 2675/2913] [nrf fromtree] Bluetooth: Host: Remove nested
 allocation of HCI command buffer

Remove nested allocation of HCI command buffer so that one
less HCI command buffer is needed starting extended
advertising with privacy enabled.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit cc1b53445c2766b173aed910c40db5776b49ad44)
---
 subsys/bluetooth/host/adv.c | 38 +++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/subsys/bluetooth/host/adv.c b/subsys/bluetooth/host/adv.c
index d99144a420d..d2e0c255e12 100644
--- a/subsys/bluetooth/host/adv.c
+++ b/subsys/bluetooth/host/adv.c
@@ -1127,10 +1127,25 @@ static int le_ext_adv_param_set(struct bt_le_ext_adv *adv,
 	uint16_t size;
 	bool dir_adv = param->peer != NULL, scannable;
 	struct net_buf *buf, *rsp;
+	uint8_t own_addr_type;
 	int err;
 	enum adv_name_type name_type;
 	uint16_t props = 0;
 
+	adv->options = param->options;
+
+	err = bt_id_set_adv_own_addr(adv, param->options, dir_adv,
+				     &own_addr_type);
+	if (err) {
+		return err;
+	}
+
+	if (dir_adv) {
+		bt_addr_le_copy(&adv->target_addr, param->peer);
+	} else {
+		bt_addr_le_copy(&adv->target_addr, BT_ADDR_LE_ANY);
+	}
+
 	if (IS_ENABLED(CONFIG_BT_EXT_ADV_CODING_SELECTION) &&
 	    BT_FEAT_LE_ADV_CODING_SEL(bt_dev.le.features)) {
 		opcode = BT_HCI_OP_LE_SET_EXT_ADV_PARAM_V2;
@@ -1148,31 +1163,15 @@ static int le_ext_adv_param_set(struct bt_le_ext_adv *adv,
 	cp = net_buf_add(buf, size);
 	(void)memset(cp, 0, size);
 
-	adv->options = param->options;
-
-	err = bt_id_set_adv_own_addr(adv, param->options, dir_adv,
-				     &cp->own_addr_type);
-	if (err) {
-		net_buf_unref(buf);
-		return err;
-	}
-
-	if (dir_adv) {
-		bt_addr_le_copy(&adv->target_addr, param->peer);
-	} else {
-		bt_addr_le_copy(&adv->target_addr, BT_ADDR_LE_ANY);
-	}
-
-	name_type = get_adv_name_type_param(param);
-
 	cp->handle = adv->handle;
 	sys_put_le24(param->interval_min, cp->prim_min_interval);
 	sys_put_le24(param->interval_max, cp->prim_max_interval);
 	cp->prim_channel_map = get_adv_channel_map(param->options);
+	cp->own_addr_type = own_addr_type;
 	cp->filter_policy = get_filter_policy(param->options);
 	cp->tx_power = BT_HCI_LE_ADV_TX_POWER_NO_PREF;
-
 	cp->prim_adv_phy = BT_HCI_LE_PHY_1M;
+
 	if ((param->options & BT_LE_ADV_OPT_EXT_ADV) &&
 	    !(param->options & BT_LE_ADV_OPT_NO_2M)) {
 		cp->sec_adv_phy = BT_HCI_LE_PHY_2M;
@@ -1229,6 +1228,8 @@ static int le_ext_adv_param_set(struct bt_le_ext_adv *adv,
 		}
 	}
 
+	name_type = get_adv_name_type_param(param);
+
 	if ((param->options & BT_LE_ADV_OPT_SCANNABLE) || has_scan_data ||
 	    (name_type == ADV_NAME_TYPE_SD)) {
 		props |= BT_HCI_LE_ADV_PROP_SCAN;
@@ -1250,6 +1251,7 @@ static int le_ext_adv_param_set(struct bt_le_ext_adv *adv,
 	cp->sec_adv_max_skip = param->secondary_max_skip;
 
 	cp->props = sys_cpu_to_le16(props);
+
 	err = bt_hci_cmd_send_sync(opcode, buf, &rsp);
 	if (err) {
 		return err;

From 52a032284a62fd628876de4e9ff589c93ddf279c Mon Sep 17 00:00:00 2001
From: Kyra Lengfeld <kyra.lengfeld@nordicsemi.no>
Date: Wed, 26 Feb 2025 14:01:00 +0100
Subject: [PATCH 2676/2913] [nrf fromtree] Bluetooth: Host: improve GATT
 documentation

The gatt docs are very sparce, this commit adds imrpovements for the
GATT server API part. Others will follow.

Signed-off-by: Kyra Lengfeld <kyra.lengfeld@nordicsemi.no>
(cherry picked from commit 775cc352361dcd01419e8689481d1d7f27d52e26)
---
 include/zephyr/bluetooth/gatt.h | 100 +++++++++++++++++++++++++-------
 1 file changed, 80 insertions(+), 20 deletions(-)

diff --git a/include/zephyr/bluetooth/gatt.h b/include/zephyr/bluetooth/gatt.h
index 5a20771e725..12b5b284df9 100644
--- a/include/zephyr/bluetooth/gatt.h
+++ b/include/zephyr/bluetooth/gatt.h
@@ -573,14 +573,14 @@ void bt_gatt_cb_register(struct bt_gatt_cb *cb);
  *
  *  @param cb Callback struct.
  *
- *  @return Zero on success or negative error code otherwise
+ *  @return Zero on success or negative error code otherwise.
  */
 int bt_gatt_authorization_cb_register(const struct bt_gatt_authorization_cb *cb);
 
 /** @brief Register GATT service.
  *
- *  Register GATT service. Applications can make use of
- *  macros such as ``BT_GATT_PRIMARY_SERVICE``, ``BT_GATT_CHARACTERISTIC``,
+ *  To register a GATT service, applications can make use of macros such as
+ *  ``BT_GATT_PRIMARY_SERVICE``, ``BT_GATT_CHARACTERISTIC``,
  *  ``BT_GATT_DESCRIPTOR``, etc.
  *
  *  When using @kconfig{CONFIG_BT_SETTINGS} then all services that should have
@@ -621,6 +621,9 @@ int bt_gatt_service_unregister(struct bt_gatt_service *svc);
  */
 bool bt_gatt_service_is_registered(const struct bt_gatt_service *svc);
 
+/** @brief to be used as return values for @ref bt_gatt_attr_func_t and @ref bt_gatt_read_func_t
+ *  type callbacks.
+ */
 enum {
 	BT_GATT_ITER_STOP = 0,
 	BT_GATT_ITER_CONTINUE,
@@ -645,7 +648,8 @@ typedef uint8_t (*bt_gatt_attr_func_t)(const struct bt_gatt_attr *attr,
  *  Iterate attributes in the given range matching given UUID and/or data.
  *
  *  @param start_handle Start handle.
- *  @param end_handle End handle.
+ *  @param end_handle End handle. Often set to start_handle + attr_count or
+ *  BT_ATT_LAST_ATTRIBUTE_HANDLE.
  *  @param uuid UUID to match, passing NULL skips UUID matching.
  *  @param attr_data Attribute data to match, passing NULL skips data matching.
  *  @param num_matches Number matches, passing 0 makes it unlimited.
@@ -892,6 +896,16 @@ ssize_t bt_gatt_attr_read_chrc(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, void *buf,
 			       uint16_t len, uint16_t offset);
 
+/** @brief Gatt Characterisitc Initialization Macro.
+ *
+ *  Helper macro used within the @ref BT_GATT_CHARACTERISTIC macro in the GATT attribute declaration
+ *  to set the attribute user data.
+ *
+ *  @param _uuid Characteristic attribute uuid.
+ *  @param _handle Characcteristic attribute handle at init.
+ *  @param _props Characteristic attribute properties,
+ *                a bitmap of ``BT_GATT_CHRC_*`` macros.
+ */
 #define BT_GATT_CHRC_INIT(_uuid, _handle, _props) \
 {                                                 \
 	.uuid = _uuid,                            \
@@ -924,6 +938,17 @@ ssize_t bt_gatt_attr_read_chrc(struct bt_conn *conn,
 						   })),                         \
 	BT_GATT_ATTRIBUTE(_uuid, _perm, _read, _write, _user_data)
 
+/**
+ *  @brief BT_GATT_CCC_MAX is defined depending on whether
+ *  @kconfig{CONFIG_BT_SETTINGS_CCC_LAZY_LOADING} or @kconfig{CONFIG_BT_CONN} is set.
+ *
+ *  @kconfig{CONFIG_BT_SETTINGS_CCC_LAZY_LOADING} will set BT_GATT_CCC_MAX to
+ *  @kconfig{CONFIG_BT_MAX_CONN}
+ *  @kconfig{CONFIG_BT_CONN} will set BT_GATT_CCC_MAX to @kconfig{CONFIG_BT_MAX_PAIRED} +
+ *  @kconfig{CONFIG_BT_MAX_CONN}
+ *  If neither are set, BT_GATT_CCC_MAX is 0.
+ *
+ */
 #if defined(CONFIG_BT_SETTINGS_CCC_LAZY_LOADING)
 	#define BT_GATT_CCC_MAX (CONFIG_BT_MAX_CONN)
 #elif defined(CONFIG_BT_CONN)
@@ -932,13 +957,21 @@ ssize_t bt_gatt_attr_read_chrc(struct bt_conn *conn,
 	#define BT_GATT_CCC_MAX 0
 #endif
 
-/** @brief GATT CCC configuration entry. */
+/** @brief GATT CCC configuration entry.
+ *
+ *  bt_gatt_ccc_cfg is used within @ref bt_gatt_attr_read_ccc and @ref bt_gatt_attr_write_ccc to
+ *  read and write the ccc configurations respectively.
+ *
+ */
 struct bt_gatt_ccc_cfg {
 	/** Local identity, BT_ID_DEFAULT in most cases. */
 	uint8_t id;
 	/** Remote peer address. */
 	bt_addr_le_t peer;
-	/** Configuration value. */
+	/** @brief Configuration value
+	 * Value used to enable or disable notifications or indications for a specific
+	 * characteristic.
+	 */
 	uint16_t value;
 };
 
@@ -989,8 +1022,6 @@ struct _bt_gatt_ccc {
  *  Read CCC attribute value from local database storing the result into buffer
  *  after encoding it.
  *
- *  @note Only use this with attributes which user_data is a _bt_gatt_ccc.
- *
  *  @param conn Connection object.
  *  @param attr Attribute to read.
  *  @param buf Buffer to store the value read.
@@ -1000,6 +1031,11 @@ struct _bt_gatt_ccc {
  *  @return number of bytes read in case of success or negative values in
  *          case of error.
  */
+/** @cond INTERNAL_HIDDEN
+ *  @note Only use this with attributes which user_data is a _bt_gatt_ccc.
+ *  _bt_gatt_ccc being the internal representation of CCC value.
+ */
+ /** @endcond */
 ssize_t bt_gatt_attr_read_ccc(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
 			      uint16_t len, uint16_t offset);
@@ -1008,8 +1044,6 @@ ssize_t bt_gatt_attr_read_ccc(struct bt_conn *conn,
  *
  *  Write value in the buffer into CCC attribute.
  *
- *  @note Only use this with attributes which user_data is a _bt_gatt_ccc.
- *
  *  @param conn Connection object.
  *  @param attr Attribute to read.
  *  @param buf Buffer to store the value read.
@@ -1020,6 +1054,11 @@ ssize_t bt_gatt_attr_read_ccc(struct bt_conn *conn,
  *  @return number of bytes written in case of success or negative values in
  *          case of error.
  */
+/** @cond INTERNAL_HIDDEN
+ *  @note Only use this with attributes which user_data is a _bt_gatt_ccc.
+ *  _bt_gatt_ccc being the internal representation of CCC value.
+ */
+ /** @endcond */
 ssize_t bt_gatt_attr_write_ccc(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, const void *buf,
 			       uint16_t len, uint16_t offset, uint8_t flags);
@@ -1139,7 +1178,7 @@ ssize_t bt_gatt_attr_read_cud(struct bt_conn *conn,
  *  Read CPF attribute value from local database storing the result into buffer
  *  after encoding it.
  *
- *  @note Only use this with attributes which user_data is a bt_gatt_pf.
+ *  @note Only use this with attributes which user_data is a @ref bt_gatt_cpf.
  *
  *  @param conn Connection object
  *  @param attr Attribute to read
@@ -1211,6 +1250,10 @@ ssize_t bt_gatt_attr_read_cpf(struct bt_conn *conn,
  */
 typedef void (*bt_gatt_complete_func_t) (struct bt_conn *conn, void *user_data);
 
+/** @brief GATT notification parameters
+ *
+ *  See also @ref bt_gatt_notify_cb and @ref bt_gatt_notify_multiple, using this parameter.
+ */
 struct bt_gatt_notify_params {
 	/** @brief Notification Attribute UUID type
 	 *
@@ -1232,7 +1275,8 @@ struct bt_gatt_notify_params {
 	bt_gatt_complete_func_t func;
 	/** Notification Value callback user data */
 	void *user_data;
-#if defined(CONFIG_BT_EATT)
+#if defined(CONFIG_BT_EATT) || defined(__DOXYGEN__)
+	/** Att channel options. */
 	enum bt_att_chan_opt chan_opt;
 #endif /* CONFIG_BT_EATT */
 };
@@ -1406,10 +1450,22 @@ typedef void (*bt_gatt_indicate_func_t)(struct bt_conn *conn,
 					struct bt_gatt_indicate_params *params,
 					uint8_t err);
 
+/** @typedef bt_gatt_indicate_params_destroy_t
+ *  @brief Callback to destroy or clean up the GATT Indicate Value parameters.
+ *
+ *  This callback function is invoked to clean up any resources associated with the
+ *  `bt_gatt_indicate_params` structure once the GATT indication operation is completed.
+ *
+ *  @param params Pointer to the GATT Indicate parameters structure to be cleaned up.
+ */
 typedef void (*bt_gatt_indicate_params_destroy_t)(
 		struct bt_gatt_indicate_params *params);
 
-/** @brief GATT Indicate Value parameters */
+/** @brief GATT Indicate Value parameters
+ *
+ *  See also @ref bt_gatt_indicate, using this parameter.
+ *
+ */
 struct bt_gatt_indicate_params {
 	/** @brief Indicate Attribute UUID type
 	 *
@@ -1433,7 +1489,8 @@ struct bt_gatt_indicate_params {
 	uint16_t len;
 	/** Private reference counter */
 	uint8_t _ref;
-#if defined(CONFIG_BT_EATT)
+#if defined(CONFIG_BT_EATT) || defined(__DOXYGEN__)
+	/** Att channel options. */
 	enum bt_att_chan_opt chan_opt;
 #endif /* CONFIG_BT_EATT */
 };
@@ -1466,10 +1523,9 @@ struct bt_gatt_indicate_params {
 int bt_gatt_indicate(struct bt_conn *conn,
 		     struct bt_gatt_indicate_params *params);
 
-
 /** @brief Check if connection have subscribed to attribute
  *
- *  Check if connection has subscribed to attribute value change.
+ *  Check if the connection has subscribed to an attribute value change.
  *
  *  The attribute object can be the so called Characteristic Declaration,
  *  which is usually declared with BT_GATT_CHARACTERISTIC followed
@@ -1684,7 +1740,8 @@ struct bt_gatt_discover_params {
 	/** Only for stack-internal use, used for automatic discovery. */
 	struct bt_gatt_subscribe_params *sub_params;
 #endif /* defined(CONFIG_BT_GATT_AUTO_DISCOVER_CCC) || defined(__DOXYGEN__) */
-#if defined(CONFIG_BT_EATT)
+#if defined(CONFIG_BT_EATT) || defined(__DOXYGEN__)
+	/** Att channel options. */
 	enum bt_att_chan_opt chan_opt;
 #endif /* CONFIG_BT_EATT */
 };
@@ -1791,7 +1848,8 @@ struct bt_gatt_read_params {
 			const struct bt_uuid *uuid;
 		} by_uuid;
 	};
-#if defined(CONFIG_BT_EATT)
+#if defined(CONFIG_BT_EATT) || defined(__DOXYGEN__)
+	/** Att channel options. */
 	enum bt_att_chan_opt chan_opt;
 #endif /* CONFIG_BT_EATT */
 	/** Internal */
@@ -1866,7 +1924,8 @@ struct bt_gatt_write_params {
 	const void *data;
 	/** Length of the data */
 	uint16_t length;
-#if defined(CONFIG_BT_EATT)
+#if defined(CONFIG_BT_EATT) || defined(__DOXYGEN__)
+	/** Att channel options. */
 	enum bt_att_chan_opt chan_opt;
 #endif /* CONFIG_BT_EATT */
 };
@@ -2074,7 +2133,8 @@ struct bt_gatt_subscribe_params {
 	ATOMIC_DEFINE(flags, BT_GATT_SUBSCRIBE_NUM_FLAGS);
 
 	sys_snode_t node;
-#if defined(CONFIG_BT_EATT)
+#if defined(CONFIG_BT_EATT) || defined(__DOXYGEN__)
+	/** Att channel options. */
 	enum bt_att_chan_opt chan_opt;
 #endif /* CONFIG_BT_EATT */
 };

From ada90accc039b140586d15296a913677d9b208ec Mon Sep 17 00:00:00 2001
From: Kyra Lengfeld <kyra.lengfeld@nordicsemi.no>
Date: Thu, 27 Feb 2025 07:45:46 +0100
Subject: [PATCH 2677/2913] [nrf fromtree] Bluetooth: Host: Fix deadlock when
 failing to alloc on BT RX thread

This commit alignes the timeout value for allocating buffers within att
on the BT RX thread, making it consistent within att.c, see
bt_att_req_alloc.

We are inferring in many bt_gatt_* functions that if called from a BT RX
thread (which is inherently the case if called from a callback when
running a Bluetooth application), we don't block and instead return
-ENOMEM when the ATT request queue is full, avoiding a deadlock.
This promise is fulfilled within bt_att_req_alloc, where the timeout for
allocation of the request slab is set to K_NO_WAIT if we are on the BT
RX thread. Unfortunately, we break this promise in
bt_att_chan_create_pdu, where the timeout for allocation of the att pool
is still K_FOREVER and deadlocks can (and do) occur when too many
requests are sent yet the pool is depleted.

Note: Both req_slab and att_pool sizes are defined by
CONFIG_BT_ATT_TX_COUNT. If applications start getting -ENOMEM with this
change, they were at risk of such a deadlock, and may increase
CONFIG_BT_ATT_TX_COUNT to allocate the att pool for their requests.

Note: This possible deadlock has been flying under the radar, as
att_pools are freed when the HCI driver has sent it to the controller
(instead of when receiving the response, as it happens with req_slabs)
and due to the att_pool and the req_slab being both sized by
CONFIG_BT_ATT_TX_COUNT, and req_slab being allocated before and
returning -ENOMEM already if there is no space, it takes a more specific
situation to deplete the att_pool but not the req_slab pool at this
point.

Note: Ideally, we don't want functions to behave differently depending
on which thread they are running, and while this commit makes it more
consistent, it should be considered a workaround solution.

Signed-off-by: Kyra Lengfeld <kyra.lengfeld@nordicsemi.no>
(cherry picked from commit 6464ffa3f94eb9d9203b56518cf53b141b1feea5)
---
 subsys/bluetooth/host/att.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c
index c3fd0a8a7cf..9d83ba688d9 100644
--- a/subsys/bluetooth/host/att.c
+++ b/subsys/bluetooth/host/att.c
@@ -721,7 +721,13 @@ static struct net_buf *bt_att_chan_create_pdu(struct bt_att_chan *chan, uint8_t
 		timeout = BT_ATT_TIMEOUT;
 		break;
 	default:
-		if (k_current_get() == k_work_queue_thread_get(&k_sys_work_q)) {
+		k_tid_t current_thread = k_current_get();
+
+		if (current_thread == k_work_queue_thread_get(&k_sys_work_q)) {
+			/* No blocking in the sysqueue. */
+			timeout = K_NO_WAIT;
+		} else if (current_thread == att_handle_rsp_thread) {
+			/* Blocking would cause deadlock. */
 			timeout = K_NO_WAIT;
 		} else {
 			timeout = K_FOREVER;

From a80371e72d7a08cf2d7cf2fb6ad2bb7f159e004f Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Tue, 14 Jan 2025 14:23:46 +0100
Subject: [PATCH 2678/2913] [nrf fromtree] Bluetooth: GATT: Change get_handle
 function of find_by_uuid

bt_gatt_find_by_uuid used bt_gatt_attr_value_handle but that
function only works to get the value handle of a characteristic
declaration, i.e. if the UUID is not BT_UUID_GATT_CHRC then it
would always return handle = 0. This meant that
bt_gatt_find_by_uuid would always use handle = 0 as the starting
handle for non-BT_UUID_GATT_CHRC attributes, instead of the handle
of the provided attr.

This was not an issue for any UUIDs that may only exist once on a
GATT server, which is most UUIDs, but for UUIDs like the
BT_UUID_TBS_* UUIDs that may be multiple instances of, it would
always return the first attribute rather than the one starting
from the provided start attr.

This commit also ensures that we do not overflow the `end_handle`
when adding 2 uint16_t values.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit e4c5bb99b098ad8d4115da30ce8b9b785bd265da)
---
 include/zephyr/bluetooth/gatt.h               |  3 ++-
 subsys/bluetooth/host/gatt.c                  | 21 ++++++++++++++-----
 .../host/gatt/ccc_store/src/peripheral.c      |  7 ++-----
 .../host/security/ccc_update/src/peripheral.c |  8 ++-----
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/include/zephyr/bluetooth/gatt.h b/include/zephyr/bluetooth/gatt.h
index 12b5b284df9..f9a0712546c 100644
--- a/include/zephyr/bluetooth/gatt.h
+++ b/include/zephyr/bluetooth/gatt.h
@@ -721,7 +721,8 @@ uint16_t bt_gatt_attr_get_handle(const struct bt_gatt_attr *attr);
  *
  * @param attr A Characteristic Attribute.
  *
- * @note The ``user_data`` of the attribute must of type @ref bt_gatt_chrc.
+ * @note The ``user_data`` of the attribute must of type @ref bt_gatt_chrc and the ``uuid`` shall be
+ * BT_UUID_GATT_CHRC
  *
  * @return the handle of the corresponding Characteristic Value. The value will
  *         be zero (the invalid handle) if @p attr was not a characteristic
diff --git a/subsys/bluetooth/host/gatt.c b/subsys/bluetooth/host/gatt.c
index 688512b74f8..fa8fb1c7bd6 100644
--- a/subsys/bluetooth/host/gatt.c
+++ b/subsys/bluetooth/host/gatt.c
@@ -7,6 +7,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdint.h>
+
+#include <zephyr/bluetooth/att.h>
 #include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
@@ -2859,12 +2862,20 @@ struct bt_gatt_attr *bt_gatt_find_by_uuid(const struct bt_gatt_attr *attr,
 					  const struct bt_uuid *uuid)
 {
 	struct bt_gatt_attr *found = NULL;
-	uint16_t start_handle = bt_gatt_attr_value_handle(attr);
-	uint16_t end_handle = start_handle && attr_count ?
-			      start_handle + attr_count : 0xffff;
+	uint16_t start_handle = bt_gatt_attr_get_handle(attr);
+	uint16_t end_handle = start_handle && attr_count
+				      ? MIN(start_handle + attr_count, BT_ATT_LAST_ATTRIBUTE_HANDLE)
+				      : BT_ATT_LAST_ATTRIBUTE_HANDLE;
+
+	if (attr != NULL && start_handle == 0U) {
+		/* If start_handle is 0 then `attr` is not in our database, and should not be used
+		 * as a starting point for the search
+		 */
+		LOG_DBG("Could not find handle of attr %p", attr);
+		return NULL;
+	}
 
-	bt_gatt_foreach_attr_type(start_handle, end_handle, uuid, NULL, 1,
-				  find_next, &found);
+	bt_gatt_foreach_attr_type(start_handle, end_handle, uuid, NULL, 1, find_next, &found);
 
 	return found;
 }
diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/src/peripheral.c b/tests/bsim/bluetooth/host/gatt/ccc_store/src/peripheral.c
index 0df6d2b7f9f..fe12cb3c0e2 100644
--- a/tests/bsim/bluetooth/host/gatt/ccc_store/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/gatt/ccc_store/src/peripheral.c
@@ -230,11 +230,8 @@ static void check_ccc_handle(void)
 	__ASSERT(actual_val_handle == VAL_HANDLE,
 		 "Please update the VAL_HANDLE define (actual_val_handle=%d)", actual_val_handle);
 
-	struct bt_gatt_attr attr = {
-		.uuid = BT_UUID_GATT_CHRC,
-		.user_data = &(struct bt_gatt_chrc){ .value_handle = actual_val_handle }};
-
-	struct bt_gatt_attr *ccc_attr = bt_gatt_find_by_uuid(&attr, 0, BT_UUID_GATT_CCC);
+	struct bt_gatt_attr *ccc_attr =
+		bt_gatt_find_by_uuid(service_notify_attr, 0, BT_UUID_GATT_CCC);
 	uint16_t actual_ccc_handle = bt_gatt_attr_get_handle(ccc_attr);
 
 	__ASSERT(actual_ccc_handle == CCC_HANDLE,
diff --git a/tests/bsim/bluetooth/host/security/ccc_update/src/peripheral.c b/tests/bsim/bluetooth/host/security/ccc_update/src/peripheral.c
index 10cb4210c22..0f686e2d87c 100644
--- a/tests/bsim/bluetooth/host/security/ccc_update/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/security/ccc_update/src/peripheral.c
@@ -271,12 +271,8 @@ static void check_ccc_handle(void)
 	struct bt_gatt_attr *service_notify_attr =
 		bt_gatt_find_by_uuid(NULL, 0, &notify_characteristic_uuid.uuid);
 
-	struct bt_gatt_attr attr = {
-		.uuid = BT_UUID_GATT_CHRC,
-		.user_data = &(struct bt_gatt_chrc){
-			.value_handle = bt_gatt_attr_get_handle(service_notify_attr)}};
-
-	struct bt_gatt_attr *ccc_attr = bt_gatt_find_by_uuid(&attr, 0, BT_UUID_GATT_CCC);
+	struct bt_gatt_attr *ccc_attr =
+		bt_gatt_find_by_uuid(service_notify_attr, 0, BT_UUID_GATT_CCC);
 	uint16_t actual_ccc_handle = bt_gatt_attr_get_handle(ccc_attr);
 
 	__ASSERT(actual_ccc_handle == CCC_HANDLE,

From ba29fe8bc9f8cbb1368bfdc44be377aeb8fa54b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5vard=20Reierstad?= <haavard.reierstad@nordicsemi.no>
Date: Fri, 28 Feb 2025 08:36:57 +0100
Subject: [PATCH 2679/2913] [nrf fromtree] Bluetooth: Host: Improve more GATT
 documentation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds improvement to the GATT API documentation by providing examples of
where (and how) certain structs are used, and adds specification
references to the fields of bt_gatt_cpf to clarify their purpose.

Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit c7a19da8ca1abefa8eac41e704e7c678af0282a9)
---
 doc/connectivity/bluetooth/api/gatt.rst |  17 ++-
 include/zephyr/bluetooth/gatt.h         | 143 ++++++++++++++++++------
 2 files changed, 117 insertions(+), 43 deletions(-)

diff --git a/doc/connectivity/bluetooth/api/gatt.rst b/doc/connectivity/bluetooth/api/gatt.rst
index bb4487f57dd..58920cdcb65 100644
--- a/doc/connectivity/bluetooth/api/gatt.rst
+++ b/doc/connectivity/bluetooth/api/gatt.rst
@@ -4,10 +4,18 @@
 Generic Attribute Profile (GATT)
 ################################
 
-GATT layer manages the service database providing APIs for service registration
-and attribute declaration.
+The GATT layer manages the service database providing APIs for service
+registration and attribute declaration.
 
-Services can be registered using :c:func:`bt_gatt_service_register` API
+The GATT Client initiates commands and requests towards the GATT Server, and can
+receive responses, indications and notifications sent by the server. It is
+enabled through the configuration option:
+:kconfig:option:`CONFIG_BT_GATT_CLIENT`
+
+The GATT Server accepts incoming commands and requests from the GATT Client, and
+sends responses, indications and notifications to the client.
+
+Services can be registered using the :c:func:`bt_gatt_service_register` API
 which takes the :c:struct:`bt_gatt_service` struct that provides the list of
 attributes the service contains. The helper macro :c:macro:`BT_GATT_SERVICE()`
 can be used to declare a service.
@@ -61,9 +69,6 @@ pass a callback to be called when it is necessary to know the exact instant when
 the data has been transmitted over the air. Indications are supported by
 :c:func:`bt_gatt_indicate` API.
 
-Client procedures can be enabled with the configuration option:
-:kconfig:option:`CONFIG_BT_GATT_CLIENT`
-
 Discover procedures can be initiated with the use of
 :c:func:`bt_gatt_discover` API which takes the
 :c:struct:`bt_gatt_discover_params` struct which describes the type of
diff --git a/include/zephyr/bluetooth/gatt.h b/include/zephyr/bluetooth/gatt.h
index f9a0712546c..9e4ec0db993 100644
--- a/include/zephyr/bluetooth/gatt.h
+++ b/include/zephyr/bluetooth/gatt.h
@@ -12,6 +12,9 @@
 
 /**
  * @brief Generic Attribute Profile (GATT)
+ * @details The GATT layer manages the service database by providing APIs for
+ *          service registration and attribute declaration. For more
+ *          information, see @ref bt_gatt_client and @ref bt_gatt_server.
  * @defgroup bt_gatt Generic Attribute Profile (GATT)
  * @ingroup bluetooth
  * @{
@@ -222,9 +225,9 @@ typedef ssize_t (*bt_gatt_attr_write_func_t)(struct bt_conn *conn,
  *  pass the pointer to GATT server APIs.
  */
 struct bt_gatt_attr {
-	/** @brief Attribute Type, aka. "UUID"
+	/** @brief Attribute Type
 	 *
-	 *  The Attribute Type determines the interface that can
+	 *  The Attribute Type is a UUID which determines the interface that can
 	 *  be expected from the read() and write() methods and
 	 *  the possible permission configurations.
 	 *
@@ -275,16 +278,13 @@ struct bt_gatt_attr {
 	 */
 	void *user_data;
 
-	/** @brief Attribute Handle or zero, maybe?
+	/** @brief Attribute Handle
 	 *
-	 *  The meaning of this field varies and is not specified here.
-	 *  Some APIs use this field as input/output. It does not always
-	 *  contain the Attribute Handle.
+	 *  The Attribute Handle is an index corresponding to a specific
+	 *  Attribute in the ATT database.
 	 *
 	 *  @note Use bt_gatt_attr_get_handle() for attributes in the
 	 *  local ATT database.
-	 *
-	 *  @sa bt_gatt_discover_func_t about this field.
 	 */
 	uint16_t handle;
 
@@ -294,8 +294,6 @@ struct bt_gatt_attr {
 	 *
 	 *  The permissions are security requirements that must be
 	 *  satisfied before calling read() or write().
-	 *
-	 *  @sa bt_gatt_discover_func_t about this field.
 	 */
 	uint16_t perm: 15;
 
@@ -311,7 +309,12 @@ struct bt_gatt_attr {
 	/** @endcond */
 };
 
-/** @brief GATT Service structure */
+/** @brief Static GATT Service structure
+ *
+ *  Allows the user the declare static GATT Services with the aim of reducing the
+ *  used RAM. The @ref BT_GATT_SERVICE_DEFINE macro can be used to statically
+ *  define and register a service.
+ */
 struct bt_gatt_service_static {
 	/** Service Attributes */
 	const struct bt_gatt_attr *attrs;
@@ -319,31 +322,48 @@ struct bt_gatt_service_static {
 	size_t attr_count;
 };
 
-/** @brief GATT Service structure */
+/** @brief GATT Service structure
+ *
+ *  This structure is used to define GATT services which can be registered and
+ *  unregistered at runtime. See @ref bt_gatt_service_register for when services
+ *  should be registered.
+ */
 struct bt_gatt_service {
 	/** Service Attributes */
 	struct bt_gatt_attr *attrs;
 	/** Service Attribute count */
 	size_t attr_count;
-
+	/** @cond INTERNAL_HIDDEN
+	 *  Field used for list handling.
+	 */
 	sys_snode_t node;
+	/** @endcond */
 };
 
-/** @brief Service Attribute Value. */
+/** @brief Service Attribute Value.
+ *
+ *  This is the data described by the Attribute Type and indexed by the
+ *  Attribute Handle in the database.
+ */
 struct bt_gatt_service_val {
 	/** Service UUID. */
 	const struct bt_uuid *uuid;
-	/** Service end handle. */
+	/** Handle of the last Attribute within the Service. */
 	uint16_t end_handle;
 };
 
-/** @brief Include Attribute Value. */
+/** @brief Include Attribute Value.
+ *
+ *  This structure represents an included service attribute in the GATT
+ *  server. An included service is a service that is referenced within another
+ *  service, allowing for the reuse of common service definitions.
+ */
 struct bt_gatt_include {
 	/** Service UUID. */
 	const struct bt_uuid *uuid;
-	/** Service start handle. */
+	/** Handle of the first attribute within the included service. */
 	uint16_t start_handle;
-	/** Service end handle. */
+	/** Handle of the last attribute within the included service. */
 	uint16_t end_handle;
 };
 
@@ -360,7 +380,11 @@ struct bt_gatt_cb {
 	 */
 	void (*att_mtu_updated)(struct bt_conn *conn, uint16_t tx, uint16_t rx);
 
+	/** @cond INTERNAL_HIDDEN
+	 *  Field used for list handling.
+	 */
 	sys_snode_t node;
+	/** @endcond */
 };
 
 /** @brief GATT authorization callback structure. */
@@ -448,13 +472,17 @@ struct bt_gatt_authorization_cb {
  */
 #define BT_GATT_CHRC_EXT_PROP			0x80
 
-/** @brief Characteristic Attribute Value. */
+/** @brief Attribute Value of a Characteristic Declaration.
+ *
+ *  This is the data associated with the characteristic, and can be read from or
+ *  written to by a GATT client depending on the characteristic properties.
+ */
 struct bt_gatt_chrc {
 	/** Characteristic UUID. */
 	const struct bt_uuid *uuid;
 	/** Characteristic Value handle. */
 	uint16_t value_handle;
-	/** Characteristic properties. */
+	/** Characteristic properties, a bitmap of ``BT_GATT_CHRC_*`` macros. */
 	uint8_t	properties;
 };
 
@@ -462,9 +490,15 @@ struct bt_gatt_chrc {
 #define BT_GATT_CEP_RELIABLE_WRITE		0x0001
 #define BT_GATT_CEP_WRITABLE_AUX		0x0002
 
-/** @brief Characteristic Extended Properties Attribute Value. */
+/** @brief Characteristic Extended Properties Attribute Value.
+ *
+ *  Used in the discovery of standard characteristic descriptor values. Shall
+ *  exist if the @ref BT_GATT_CHRC_EXT_PROP bit is set in the characteristic
+ *  properties. Can be used with the @ref BT_GATT_CEP macro to declare the CEP
+ *  descriptor.
+ */
 struct bt_gatt_cep {
-	/** Characteristic Extended properties */
+	/** Characteristic Extended properties, a bitmap of ``BT_GATT_CEP_*`` macros. */
 	uint16_t properties;
 };
 
@@ -483,9 +517,12 @@ struct bt_gatt_cep {
  */
 #define BT_GATT_CCC_INDICATE			0x0002
 
-/** Client Characteristic Configuration Attribute Value */
+/** @brief Client Characteristic Configuration Attribute Value
+ *
+ *  Used in the discovery of standard characteristic descriptor values.
+ */
 struct bt_gatt_ccc {
-	/** Client Characteristic Configuration flags */
+	/** Client Characteristic Configuration flags, a bitmap of ``BT_GATT_CCC_*`` macros. */
 	uint16_t flags;
 };
 
@@ -499,25 +536,52 @@ struct bt_gatt_ccc {
  */
 #define BT_GATT_SCC_BROADCAST                   0x0001
 
-/** Server Characteristic Configuration Attribute Value */
+/** @brief Server Characteristic Configuration Attribute Value
+ *
+ *  Used in the discovery of standard characteristic descriptor values.
+ */
 struct bt_gatt_scc {
-	/** Server Characteristic Configuration flags */
+	/** Server Characteristic Configuration flags, a bitmap of ``BT_GATT_SCC_*`` macros. */
 	uint16_t flags;
 };
 
-/** @brief GATT Characteristic Presentation Format Attribute Value. */
+/** @brief GATT Characteristic Presentation Format Attribute Value.
+ *
+ *  Used in the discovery of standard characteristic descriptor values. Can be
+ *  used with the @ref BT_GATT_CPF macro to declare the CPF descriptor.
+ */
 struct bt_gatt_cpf {
-	/** Format of the value of the characteristic */
+	/** @brief Format of the value of the characteristic.
+	 *
+	 *  The format types can be found in section 2.4.1 of the Bluetooth SIG
+	 *  Assigned Numbers document.
+	 */
 	uint8_t format;
-	/** Exponent field to determine how the value of this characteristic is
-	 * further formatted
+	/** @brief Exponent field for value formatting.
+	 *
+	 *  Only used on integer format types.
+	 *  actual value = Characteristic Value x 10^Exponent
 	 */
 	int8_t exponent;
-	/** Unit of the characteristic */
+	/** @brief UUID of the unit of the characteristic.
+	 *
+	 *  The units can be found in section 3.5 of the Bluetooth SIG Assigned
+	 *  Numbers document.
+	 */
 	uint16_t unit;
-	/** Name space of the description */
+	/** @brief Name space of the description.
+	 *
+	 *  Used to identify the organization that is responsible for defining
+	 *  the enumerations for the description field. See section 2.4.2 of the
+	 *  Bluetooth SIG Assigned Numbers document.
+	 */
 	uint8_t name_space;
-	/** Description of the characteristic as defined in a higher layer profile */
+	/** @brief Description of the characteristic as defined in a higher layer profile.
+	 *
+	 *  An enumerated value defined by the organization identified by the
+	 *  name_space field. See section 2.4.2.1 of the Bluetooth SIG Assigned
+	 *  Numbers document.
+	 */
 	uint16_t description;
 };
 
@@ -721,8 +785,8 @@ uint16_t bt_gatt_attr_get_handle(const struct bt_gatt_attr *attr);
  *
  * @param attr A Characteristic Attribute.
  *
- * @note The ``user_data`` of the attribute must of type @ref bt_gatt_chrc and the ``uuid`` shall be
- * BT_UUID_GATT_CHRC
+ * @note The ``user_data`` of the attribute must be of type @ref bt_gatt_chrc and the ``uuid`` shall
+ * be BT_UUID_GATT_CHRC.
  *
  * @return the handle of the corresponding Characteristic Value. The value will
  *         be zero (the invalid handle) if @p attr was not a characteristic
@@ -1722,6 +1786,7 @@ struct bt_gatt_discover_params {
 	/** Discover attribute callback */
 	bt_gatt_discover_func_t func;
 	union {
+		/** See @ref bt_gatt_include for more on included services. */
 		struct {
 			/** Include service attribute declaration handle */
 			uint16_t attr_handle;
@@ -1841,9 +1906,9 @@ struct bt_gatt_read_params {
 			bool variable;
 		} multiple;
 		struct {
-			/** First requested handle number. */
+			/** Attribute handle to start reading from. */
 			uint16_t start_handle;
-			/** Last requested handle number. */
+			/** Attribute handle to stop reading at. */
 			uint16_t end_handle;
 			/** 2 or 16 octet UUID. */
 			const struct bt_uuid *uuid;
@@ -2133,7 +2198,11 @@ struct bt_gatt_subscribe_params {
 	/** Subscription flags */
 	ATOMIC_DEFINE(flags, BT_GATT_SUBSCRIBE_NUM_FLAGS);
 
+	/** @cond INTERNAL_HIDDEN
+	 *  Field used for list handling.
+	 */
 	sys_snode_t node;
+	/** @endcond */
 #if defined(CONFIG_BT_EATT) || defined(__DOXYGEN__)
 	/** Att channel options. */
 	enum bt_att_chan_opt chan_opt;

From d0409e08056ca39427e57a6eb5fb1ddf07803d99 Mon Sep 17 00:00:00 2001
From: Kyra Lengfeld <kyra.lengfeld@nordicsemi.no>
Date: Mon, 3 Mar 2025 13:33:55 +0100
Subject: [PATCH 2680/2913] =?UTF-8?q?[nrf=20fromtree]=20Bluetooth:=20Host:?=
 =?UTF-8?q?=20improve=20more=C2=B2=20GATT=20documentation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit adds improvements for the
GATT client API part.

Signed-off-by: Kyra Lengfeld <kyra.lengfeld@nordicsemi.no>
(cherry picked from commit b136f6da555b27a2a985aa71a8947306d3d2b645)
---
 include/zephyr/bluetooth/gatt.h | 94 +++++++++++++--------------------
 1 file changed, 37 insertions(+), 57 deletions(-)

diff --git a/include/zephyr/bluetooth/gatt.h b/include/zephyr/bluetooth/gatt.h
index 9e4ec0db993..54022b3c651 100644
--- a/include/zephyr/bluetooth/gatt.h
+++ b/include/zephyr/bluetooth/gatt.h
@@ -103,7 +103,7 @@ enum bt_gatt_perm {
 #define BT_GATT_ERR(_att_err) (-(_att_err))
 
 /** GATT attribute write flags */
-enum {
+enum bt_gatt_attr_write_flag {
 	/** @brief Attribute prepare write flag
 	 *
 	 * If set, write callback should only check if the device is
@@ -198,7 +198,7 @@ typedef ssize_t (*bt_gatt_attr_read_func_t)(struct bt_conn *conn,
  *  @param buf    Buffer with the data to write
  *  @param len    Number of bytes in the buffer
  *  @param offset Offset to start writing from
- *  @param flags  Flags (``BT_GATT_WRITE_FLAG_*``)
+ *  @param flags  Flags of type @ref bt_gatt_attr_write_flag
  *
  *  @return Number of bytes written, or in case of an error
  *          ``BT_GATT_ERR()`` with a specific ``BT_ATT_ERR_*`` error code.
@@ -1114,7 +1114,7 @@ ssize_t bt_gatt_attr_read_ccc(struct bt_conn *conn,
  *  @param buf Buffer to store the value read.
  *  @param len Buffer length.
  *  @param offset Start offset.
- *  @param flags Write flags.
+ *  @param flags Write flags, see @ref bt_gatt_attr_write_flag.
  *
  *  @return number of bytes written in case of success or negative values in
  *          case of error.
@@ -1123,12 +1123,11 @@ ssize_t bt_gatt_attr_read_ccc(struct bt_conn *conn,
  *  @note Only use this with attributes which user_data is a _bt_gatt_ccc.
  *  _bt_gatt_ccc being the internal representation of CCC value.
  */
- /** @endcond */
+/** @endcond */
 ssize_t bt_gatt_attr_write_ccc(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, const void *buf,
 			       uint16_t len, uint16_t offset, uint8_t flags);
 
-
 /**
  *  @brief Initialize Client Characteristic Configuration Declaration Macro.
  *
@@ -1645,26 +1644,30 @@ uint16_t bt_gatt_get_uatt_mtu(struct bt_conn *conn);
  * @{
  */
 
-/** @brief GATT Exchange MTU parameters */
+/** @brief GATT Exchange MTU parameters
+ *
+ *  Used with @ref bt_gatt_exchange_mtu() to initiate an MTU exchange. The
+ *  response is handled in the callback @p func, which is called upon
+ *  completion from the 'config BT_RECV_CONTEXT' context.
+ *
+ *  @p params must remain valid until the callback executes.
+ */
 struct bt_gatt_exchange_params {
-	/** Response callback */
+	/** Callback for MTU exchange response */
 	void (*func)(struct bt_conn *conn, uint8_t err,
 		     struct bt_gatt_exchange_params *params);
 };
 
 /** @brief Exchange MTU
  *
- *  This client procedure can be used to set the MTU to the maximum possible
- *  size the buffers can hold.
- *
- *  @note Shall only be used once per connection.
- *
- *  The Response comes in callback @p params->func. The callback is run from
- *  the context specified by 'config BT_RECV_CONTEXT'.
- *  @p params must remain valid until start of callback.
+ *  Once per connection, this client procedure can be used to set the MTU to
+ *  the maximum possible size the buffers can hold.
  *
- *  This function will block while the ATT request queue is full, except when
- *  called from the BT RX thread, as this would cause a deadlock.
+ *  As the response comes in callback @p params->func, for example
+ *  @ref bt_gatt_get_mtu can be invoked in the mtu_exchange-callback to read
+ *  out the new negotiated ATT connection MTU. The callback is run from the
+ *  context specified by 'config BT_RECV_CONTEXT' and @p params must remain
+ *  valid until start of callback.
  *
  *  @param conn Connection object.
  *  @param params Exchange MTU parameters.
@@ -1674,7 +1677,7 @@ struct bt_gatt_exchange_params {
  *
  *  @retval -ENOMEM ATT request queue is full and blocking would cause deadlock.
  *  Allow a pending request to resolve before retrying, or call this function
- *  outside the BT RX thread to get blocking behavior. Queue size is controlled
+ *  from a separate thread to get blocking behavior. Queue size is controlled
  *  by @kconfig{CONFIG_BT_ATT_TX_COUNT}.
  *
  *  @retval -EALREADY The MTU exchange procedure has been already performed.
@@ -1733,7 +1736,7 @@ typedef uint8_t (*bt_gatt_discover_func_t)(struct bt_conn *conn,
 					struct bt_gatt_discover_params *params);
 
 /** GATT Discover types */
-enum {
+enum bt_gatt_discover_type {
 	/** Discover Primary Services. */
 	BT_GATT_DISCOVER_PRIMARY,
 	/** Discover Secondary Services. */
@@ -1834,9 +1837,6 @@ struct bt_gatt_discover_params {
  *  the BT RX thread. @p params must remain valid until start of callback where
  *  iter `attr` is `NULL` or callback will return `BT_GATT_ITER_STOP`.
  *
- *  This function will block while the ATT request queue is full, except when
- *  called from the BT RX thread, as this would cause a deadlock.
- *
  *  @param conn Connection object.
  *  @param params Discover parameters.
  *
@@ -1845,7 +1845,7 @@ struct bt_gatt_discover_params {
  *
  *  @retval -ENOMEM ATT request queue is full and blocking would cause deadlock.
  *  Allow a pending request to resolve before retrying, or call this function
- *  outside the BT RX thread to get blocking behavior. Queue size is controlled
+ *  from a separate thread to get blocking behavior. Queue size is controlled
  *  by @kconfig{CONFIG_BT_ATT_TX_COUNT}.
  */
 int bt_gatt_discover(struct bt_conn *conn,
@@ -1924,11 +1924,11 @@ struct bt_gatt_read_params {
 
 /** @brief Read Attribute Value by handle
  *
- *  This procedure read the attribute value and return it to the callback.
+ *  This procedure reads the attribute value and returns it to the callback.
  *
  *  When reading attributes by UUID the callback can be called multiple times
- *  depending on how many instances of given the UUID exists with the
- *  start_handle being updated for each instance.
+ *  depending on how many instances of a given UUID exists with the start_handle
+ *  being updated for each instance.
  *
  *  To perform a GATT Long Read procedure, start with a Characteristic Value
  *  Read (by setting @c offset @c 0 and @c handle_count @c 1) and then return
@@ -1950,9 +1950,6 @@ struct bt_gatt_read_params {
  *  the context specified by 'config BT_RECV_CONTEXT'.
  *  @p params must remain valid until start of callback.
  *
- *  This function will block while the ATT request queue is full, except when
- *  called from the BT RX thread, as this would cause a deadlock.
- *
  *  @param conn Connection object.
  *  @param params Read parameters.
  *
@@ -1961,7 +1958,7 @@ struct bt_gatt_read_params {
  *
  *  @retval -ENOMEM ATT request queue is full and blocking would cause deadlock.
  *  Allow a pending request to resolve before retrying, or call this function
- *  outside the BT RX thread to get blocking behavior. Queue size is controlled
+ *  from a separate thread to get blocking behavior. Queue size is controlled
  *  by @kconfig{CONFIG_BT_ATT_TX_COUNT}.
  */
 int bt_gatt_read(struct bt_conn *conn, struct bt_gatt_read_params *params);
@@ -2002,11 +1999,6 @@ struct bt_gatt_write_params {
  *  the context specified by 'config BT_RECV_CONTEXT'.
  *  @p params must remain valid until start of callback.
  *
- *  This function will block while the ATT request queue is full, except when
- *  called from Bluetooth event context. When called from Bluetooth context,
- *  this function will instead instead return `-ENOMEM` if it would block to
- *  avoid a deadlock.
- *
  *  @param conn Connection object.
  *  @param params Write parameters.
  *
@@ -2015,8 +2007,8 @@ struct bt_gatt_write_params {
  *
  *  @retval -ENOMEM ATT request queue is full and blocking would cause deadlock.
  *  Allow a pending request to resolve before retrying, or call this function
- *  outside Bluetooth event context to get blocking behavior. Queue size is
- *  controlled by @kconfig{CONFIG_BT_ATT_TX_COUNT}.
+ *  from a separate thread to get blocking behavior. Queue size is controlled
+ *  by @kconfig{CONFIG_BT_ATT_TX_COUNT}.
  */
 int bt_gatt_write(struct bt_conn *conn, struct bt_gatt_write_params *params);
 
@@ -2032,14 +2024,11 @@ int bt_gatt_write(struct bt_conn *conn, struct bt_gatt_write_params *params);
  *  The number of pending callbacks can be increased with the
  *  @kconfig{CONFIG_BT_CONN_TX_MAX} option.
  *
- *  This function will block while the ATT request queue is full, except when
- *  called from the BT RX thread, as this would cause a deadlock.
- *
  *  @param conn Connection object.
  *  @param handle Attribute handle.
  *  @param data Data to be written.
  *  @param length Data length.
- *  @param sign Whether to sign data
+ *  @param sign Whether to sign data.
  *  @param func Transmission complete callback.
  *  @param user_data User data to be passed back to callback.
  *
@@ -2047,7 +2036,7 @@ int bt_gatt_write(struct bt_conn *conn, struct bt_gatt_write_params *params);
  *
  *  @retval -ENOMEM ATT request queue is full and blocking would cause deadlock.
  *  Allow a pending request to resolve before retrying, or call this function
- *  outside the BT RX thread to get blocking behavior. Queue size is controlled
+ *  from a separate thread to get blocking behavior. Queue size is controlled
  *  by @kconfig{CONFIG_BT_ATT_TX_COUNT}.
  */
 int bt_gatt_write_without_response_cb(struct bt_conn *conn, uint16_t handle,
@@ -2060,20 +2049,17 @@ int bt_gatt_write_without_response_cb(struct bt_conn *conn, uint16_t handle,
  *  This procedure write the attribute value without requiring an
  *  acknowledgment that the write was successfully performed
  *
- *  This function will block while the ATT request queue is full, except when
- *  called from the BT RX thread, as this would cause a deadlock.
- *
  *  @param conn Connection object.
  *  @param handle Attribute handle.
  *  @param data Data to be written.
  *  @param length Data length.
- *  @param sign Whether to sign data
+ *  @param sign Whether to sign data.
  *
  *  @retval 0 Successfully queued request.
  *
  *  @retval -ENOMEM ATT request queue is full and blocking would cause deadlock.
  *  Allow a pending request to resolve before retrying, or call this function
- *  outside the BT RX thread to get blocking behavior. Queue size is controlled
+ *  from a separate thread to get blocking behavior. Queue size is controlled
  *  by @kconfig{CONFIG_BT_ATT_TX_COUNT}.
  */
 static inline int bt_gatt_write_without_response(struct bt_conn *conn,
@@ -2117,7 +2103,7 @@ typedef void (*bt_gatt_subscribe_func_t)(struct bt_conn *conn, uint8_t err,
 					 struct bt_gatt_subscribe_params *params);
 
 /** Subscription flags */
-enum {
+enum bt_gatt_sub_flag {
 	/** @brief Persistence flag
 	 *
 	 *  If set, indicates that the subscription is not saved
@@ -2195,7 +2181,7 @@ struct bt_gatt_subscribe_params {
 	 */
 	bt_security_t min_security;
 #endif
-	/** Subscription flags */
+	/** Subscription flags, see @ref bt_gatt_sub_flag */
 	ATOMIC_DEFINE(flags, BT_GATT_SUBSCRIBE_NUM_FLAGS);
 
 	/** @cond INTERNAL_HIDDEN
@@ -2227,9 +2213,6 @@ struct bt_gatt_subscribe_params {
  *        valid while subscribed and cannot be reused for additional subscriptions
  *        whilst active.
  *
- *  This function will block while the ATT request queue is full, except when
- *  called from the BT RX thread, as this would cause a deadlock.
- *
  *  @param conn Connection object.
  *  @param params Subscribe parameters.
  *
@@ -2238,7 +2221,7 @@ struct bt_gatt_subscribe_params {
  *
  *  @retval -ENOMEM ATT request queue is full and blocking would cause deadlock.
  *  Allow a pending request to resolve before retrying, or call this function
- *  outside the BT RX thread to get blocking behavior. Queue size is controlled
+ *  from a separate thread to get blocking behavior. Queue size is controlled
  *  by @kconfig{CONFIG_BT_ATT_TX_COUNT}.
  *
  *  @retval -EALREADY if there already exist a subscription using the @p params.
@@ -2278,9 +2261,6 @@ int bt_gatt_resubscribe(uint8_t id, const bt_addr_le_t *peer,
  *  The Response comes in callback @p params->func. The callback is run from
  *  the BT RX thread.
  *
- *  This function will block while the ATT request queue is full, except when
- *  called from the BT RX thread, as this would cause a deadlock.
- *
  *  @param conn Connection object.
  *  @param params Subscribe parameters. The parameters shall be a @ref bt_gatt_subscribe_params from
  *                a previous call to bt_gatt_subscribe().
@@ -2290,7 +2270,7 @@ int bt_gatt_resubscribe(uint8_t id, const bt_addr_le_t *peer,
  *
  *  @retval -ENOMEM ATT request queue is full and blocking would cause deadlock.
  *  Allow a pending request to resolve before retrying, or call this function
- *  outside the BT RX thread to get blocking behavior. Queue size is controlled
+ *  from a separate thread to get blocking behavior. Queue size is controlled
  *  by @kconfig{CONFIG_BT_ATT_TX_COUNT}.
  */
 int bt_gatt_unsubscribe(struct bt_conn *conn,

From 7cf67d93cd5e3290144db8614112d4a9e90f5de5 Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Thu, 20 Feb 2025 14:43:52 +0100
Subject: [PATCH 2681/2913] [nrf fromtree] Bluetooth: Host: Add API for reading
 LE controller features

The function supports reading multiple controller-based values.
It is effectively a copy of struct bt_dev_le but in a more
application-oriented definition.

It was chosen to keep the features as an array rather than a
64-bit value, as the comparison macros work on arrays and that
there already exists new bits > 64 in the core spec which is not
yet supported by Zephyr.

It is being smoke tested in a generic GATT client test,
as the individual values may depend on several Kconfig options.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit 44c5c1da3d6134ba468fa403e3ed4f8124cdb532)
---
 doc/releases/release-notes-4.2.rst            |  6 ++
 include/zephyr/bluetooth/bluetooth.h          | 80 +++++++++++++++++++
 include/zephyr/bluetooth/hci_types.h          |  6 +-
 subsys/bluetooth/host/hci_core.c              | 27 ++++++-
 subsys/bluetooth/host/hci_core.h              |  6 +-
 .../host/gatt/general/src/gatt_client_test.c  |  9 +++
 6 files changed, 129 insertions(+), 5 deletions(-)

diff --git a/doc/releases/release-notes-4.2.rst b/doc/releases/release-notes-4.2.rst
index 08b9bac3709..67c5919cd96 100644
--- a/doc/releases/release-notes-4.2.rst
+++ b/doc/releases/release-notes-4.2.rst
@@ -63,6 +63,12 @@ New APIs and options
   like you need to add more details, add them in the API documentation code
   instead.
 
+* Bluetooth
+
+  * Host
+
+    * :c:func:`bt_le_get_local_features`
+
 New Boards
 **********
 
diff --git a/include/zephyr/bluetooth/bluetooth.h b/include/zephyr/bluetooth/bluetooth.h
index d724ba3b2f8..1a7888182f4 100644
--- a/include/zephyr/bluetooth/bluetooth.h
+++ b/include/zephyr/bluetooth/bluetooth.h
@@ -19,6 +19,7 @@
  */
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <string.h>
 
 #include <zephyr/sys/util.h>
@@ -48,6 +49,13 @@ extern "C" {
  */
 #define BT_ID_DEFAULT 0
 
+/**
+ * @brief Number of octets for local supported
+ *
+ * The value of 8 correspond to page 0 in the LE Controller supported features
+ */
+#define BT_LE_LOCAL_SUPPORTED_FEATURES_SIZE 8
+
 /** Opaque type representing an advertiser. */
 struct bt_le_ext_adv;
 
@@ -517,6 +525,78 @@ size_t bt_data_get_len(const struct bt_data data[], size_t data_count);
  */
 size_t bt_data_serialize(const struct bt_data *input, uint8_t *output);
 
+struct bt_le_local_features {
+	/**
+	 * @brief Local LE controller supported features.
+	 *
+	 * Refer to BT_LE_FEAT_BIT_* for values.
+	 * Refer to the BT_FEAT_LE_* macros for value comparionson.
+	 * See Bluetooth Core Specification, Vol 6, Part B, Section 4.6.
+	 */
+	uint8_t features[BT_LE_LOCAL_SUPPORTED_FEATURES_SIZE];
+
+	/**
+	 * @brief Local LE controller supported states
+	 *
+	 * Refer to BT_LE_STATES_* for values.
+	 * See Bluetooth Core Specification 6.0, Vol 4, Part E, Section 7.8.27
+	 */
+	uint64_t states;
+
+	/**
+	 * @brief ACL data packet length
+	 *
+	 * This represents the maximum ACL HCI Data packet which can be sent from the Host to the
+	 * Controller.
+	 * The Host may support L2CAP and ATT MTUs larger than this value.
+	 * See Bluetooth Core Specification, Vol 6, Part E, Section 7.8.2.
+	 */
+	uint16_t acl_mtu;
+	/** Total number of ACL data packets */
+	uint8_t acl_pkts;
+
+	/**
+	 * @brief ISO data packet length
+	 *
+	 * This represents the maximum ISO HCI Data packet which can be sent from the Host to the
+	 * Controller.
+	 * ISO SDUs above this size can be fragmented assuming that the number of
+	 * @ref bt_le_local_features.iso_pkts support the maximum size.
+	 */
+	uint16_t iso_mtu;
+	/** Total number of ISO data packets */
+	uint8_t iso_pkts;
+
+	/**
+	 * @brief Maximum size of the controller resolving list.
+	 *
+	 * See Bluetooth Core Specification, Vol 6, Part E, Section 7.8.41.
+	 */
+	uint8_t rl_size;
+
+	/**
+	 * @brief Maximum advertising data length
+	 *
+	 * @note The maximum advertising data length also depends on advertising type.
+	 *
+	 * See Bluetooth Core Specification, Vol 6, Part E, Section 7.8.57.
+	 */
+	uint16_t max_adv_data_len;
+};
+
+/**
+ * @brief Get local Bluetooth LE controller features
+ *
+ * Can only be called after bt_enable()
+ *
+ * @param local_features Local features struct to be populated with information.
+ *
+ * @retval 0 Success
+ * @retval -EAGAIN The information is not yet available.
+ * @retval -EINVAL @p local_features is NULL.
+ */
+int bt_le_get_local_features(struct bt_le_local_features *local_features);
+
 /** Advertising options */
 enum {
 	/** Convenience value when no options are specified. */
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 1a732790077..580385b4127 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -200,12 +200,14 @@ struct bt_hci_cmd_hdr {
 #define BT_LE_FEAT_BIT_CHANNEL_CLASSIFICATION   39
 #define BT_LE_FEAT_BIT_ADV_CODING_SEL           40
 #define BT_LE_FEAT_BIT_ADV_CODING_SEL_HOST      41
-
+#define BT_LE_FEAT_BIT_DECISION_ADV_FILTER      42
 #define BT_LE_FEAT_BIT_PAWR_ADVERTISER          43
 #define BT_LE_FEAT_BIT_PAWR_SCANNER             44
-
+#define BT_LE_FEAT_BIT_UNSEG_FRAMED_MODE        45
 #define BT_LE_FEAT_BIT_CHANNEL_SOUNDING         46
 #define BT_LE_FEAT_BIT_CHANNEL_SOUNDING_HOST    47
+#define BT_LE_FEAT_BIT_CHANNEL_SOUNDING_TONE_QUAL_IND    48
+#define BT_LE_FEAT_BIT_LL_EXTENDED_FEAT_SET     63
 
 #define BT_LE_FEAT_TEST(feat, n)                (feat[(n) >> 3] & \
 						 BIT((n) & 7))
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index 338cff5ba88..3f685ba9c78 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -1,12 +1,14 @@
 /* hci_core.c - HCI core Bluetooth handling */
 
 /*
- * Copyright (c) 2017-2021 Nordic Semiconductor ASA
+ * Copyright (c) 2017-2025 Nordic Semiconductor ASA
  * Copyright (c) 2015-2016 Intel Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/autoconf.h>
+
 #include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/kernel.h>
 #include <string.h>
@@ -4509,6 +4511,29 @@ int bt_set_appearance(uint16_t appearance)
 }
 #endif
 
+int bt_le_get_local_features(struct bt_le_local_features *remote_info)
+{
+	if (remote_info == NULL) {
+		return -EINVAL;
+	}
+
+	if (!atomic_test_bit(bt_dev.flags, BT_DEV_READY)) {
+		return -EAGAIN;
+	}
+
+	memcpy(remote_info->features, bt_dev.le.features, sizeof(remote_info->features));
+	remote_info->states = bt_dev.le.states;
+	remote_info->acl_mtu = COND_CODE_1(CONFIG_BT_CONN, (bt_dev.le.acl_mtu), (0));
+	remote_info->acl_pkts = COND_CODE_1(CONFIG_BT_CONN, (bt_dev.le.acl_pkts.limit), (0));
+	remote_info->iso_mtu = COND_CODE_1(CONFIG_BT_ISO, (bt_dev.le.iso_mtu), (0));
+	remote_info->iso_pkts = COND_CODE_1(CONFIG_BT_ISO, (bt_dev.le.iso_limit), (0));
+	remote_info->rl_size = COND_CODE_1(CONFIG_BT_SMP, (bt_dev.le.rl_size), (0));
+	remote_info->max_adv_data_len =
+		COND_CODE_1(CONFIG_BT_BROADCASTER, (bt_dev.le.max_adv_data_len), (0));
+
+	return 0;
+}
+
 bool bt_addr_le_is_bonded(uint8_t id, const bt_addr_le_t *addr)
 {
 	if (IS_ENABLED(CONFIG_BT_SMP)) {
diff --git a/subsys/bluetooth/host/hci_core.h b/subsys/bluetooth/host/hci_core.h
index e501ae1d5fe..6502be80c3f 100644
--- a/subsys/bluetooth/host/hci_core.h
+++ b/subsys/bluetooth/host/hci_core.h
@@ -1,12 +1,14 @@
 /* hci_core.h - Bluetooth HCI core access */
 
 /*
- * Copyright (c) 2021 Nordic Semiconductor ASA
+ * Copyright (c) 2021-2025 Nordic Semiconductor ASA
  * Copyright (c) 2015-2016 Intel Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <stdint.h>
 
+#include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/devicetree.h>
 
 /* LL connection parameters */
@@ -271,7 +273,7 @@ struct bt_le_per_adv_sync {
 
 struct bt_dev_le {
 	/* LE features */
-	uint8_t			features[8];
+	uint8_t features[BT_LE_LOCAL_SUPPORTED_FEATURES_SIZE];
 	/* LE states */
 	uint64_t			states;
 
diff --git a/tests/bsim/bluetooth/host/gatt/general/src/gatt_client_test.c b/tests/bsim/bluetooth/host/gatt/general/src/gatt_client_test.c
index a754f08649f..e4b609aba42 100644
--- a/tests/bsim/bluetooth/host/gatt/general/src/gatt_client_test.c
+++ b/tests/bsim/bluetooth/host/gatt/general/src/gatt_client_test.c
@@ -6,6 +6,7 @@
 
 #include <zephyr/kernel.h>
 
+#include <zephyr/sys/byteorder.h>
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
@@ -363,6 +364,7 @@ static void gatt_read(uint16_t handle, uint8_t expect_att_err)
 
 static void test_main(void)
 {
+	struct bt_le_local_features local_features;
 	int err;
 
 	bt_conn_cb_register(&conn_callbacks);
@@ -372,6 +374,13 @@ static void test_main(void)
 		TEST_FAIL("Bluetooth discover failed (err %d)", err);
 	}
 
+	err = bt_le_get_local_features(&local_features);
+	TEST_ASSERT(err == 0, "Failed to get local features");
+	TEST_ASSERT(local_features.acl_mtu > 0U, "Invalid ACL MTU");
+	TEST_ASSERT(local_features.acl_pkts > 0U, "Invalid ACL packet count");
+	TEST_ASSERT(sys_get_le64(local_features.features) > 0U, "Invalid features");
+	TEST_ASSERT(local_features.states > 0U, "Invalid states");
+
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
 	if (err != 0) {
 		TEST_FAIL("Scanning failed to start (err %d)", err);

From 7eed9450683b5f182c7d52c54634658021730e7d Mon Sep 17 00:00:00 2001
From: Axel Le Bourhis <axel.lebourhis@nxp.com>
Date: Mon, 24 Feb 2025 16:26:51 +0100
Subject: [PATCH 2682/2913] [nrf fromtree] drivers: bluetooth: hci_nxp: fix
 nomem handling

When allocation fails in `hci_rx_cb`, we should return immediately
instead of continuing the execution of the function.

Also, we need to free the allocated buffer from the heap when sending
to the message queue fails to avoid memory leak.

Signed-off-by: Axel Le Bourhis <axel.lebourhis@nxp.com>
(cherry picked from commit 0034e12599934a2b98545d43e6f72265d175a3c2)
---
 drivers/bluetooth/hci/hci_nxp.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/bluetooth/hci/hci_nxp.c b/drivers/bluetooth/hci/hci_nxp.c
index ad2dbfb9ec7..240924baf77 100644
--- a/drivers/bluetooth/hci/hci_nxp.c
+++ b/drivers/bluetooth/hci/hci_nxp.c
@@ -368,19 +368,23 @@ K_THREAD_DEFINE(nxp_hci_rx_thread, CONFIG_BT_DRV_RX_STACK_SIZE, bt_rx_thread, NU
 static void hci_rx_cb(uint8_t packetType, uint8_t *data, uint16_t len)
 {
 	struct hci_data hci_rx_frame;
+	int ret;
 
 	hci_rx_frame.packetType = packetType;
 	hci_rx_frame.data = k_malloc(len);
 
 	if (!hci_rx_frame.data) {
 		LOG_ERR("Failed to allocate RX buffer");
+		return;
 	}
 
 	memcpy(hci_rx_frame.data, data, len);
 	hci_rx_frame.len = len;
 
-	if (k_msgq_put(&rx_msgq, &hci_rx_frame, K_NO_WAIT) < 0) {
-		LOG_ERR("Failed to push RX data to message queue");
+	ret = k_msgq_put(&rx_msgq, &hci_rx_frame, K_NO_WAIT);
+	if (ret < 0) {
+		LOG_ERR("Failed to push RX data to message queue: %d", ret);
+		k_free(hci_rx_frame.data);
 	}
 }
 

From 42fda4d8ad29eb531482a14bf111f7eea615705a Mon Sep 17 00:00:00 2001
From: Axel Le Bourhis <axel.lebourhis@nxp.com>
Date: Fri, 21 Feb 2025 10:52:15 +0100
Subject: [PATCH 2683/2913] [nrf fromtree] drivers: bluetooth: hci_nxp: fix
 unexpected command complete event

As the previous version of the MCXW71 BLE Controller wasn't sending a
command complete event after setting the BD address, we used a
workaround to directly send the HCI command without using zephyr's API.
Now, on the latest version of MCXW72 and MCXW71, this issue is fixed,
so we need to use `bt_hci_cmd_send_sync` to properly expect the
command complete event.

Signed-off-by: Axel Le Bourhis <axel.lebourhis@nxp.com>
(cherry picked from commit e5a1c0bbe477bb52eff64f4255ff8fb79ddac0db)
---
 drivers/bluetooth/hci/hci_nxp.c | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/drivers/bluetooth/hci/hci_nxp.c b/drivers/bluetooth/hci/hci_nxp.c
index 240924baf77..e66affeb933 100644
--- a/drivers/bluetooth/hci/hci_nxp.c
+++ b/drivers/bluetooth/hci/hci_nxp.c
@@ -79,7 +79,8 @@ LOG_MODULE_REGISTER(bt_driver);
 /*                             Private functions                              */
 /* -------------------------------------------------------------------------- */
 
-#if defined(CONFIG_HCI_NXP_ENABLE_AUTO_SLEEP) || defined(CONFIG_HCI_NXP_SET_CAL_DATA)
+#if defined(CONFIG_HCI_NXP_ENABLE_AUTO_SLEEP) || defined(CONFIG_HCI_NXP_SET_CAL_DATA) ||\
+	defined(CONFIG_BT_HCI_SET_PUBLIC_ADDR)
 static int nxp_bt_send_vs_command(uint16_t opcode, const uint8_t *params, uint8_t params_len)
 {
 	if (IS_ENABLED(CONFIG_BT_HCI_HOST)) {
@@ -101,7 +102,7 @@ static int nxp_bt_send_vs_command(uint16_t opcode, const uint8_t *params, uint8_
 		return 0;
 	}
 }
-#endif /* CONFIG_HCI_NXP_ENABLE_AUTO_SLEEP || CONFIG_HCI_NXP_SET_CAL_DATA */
+#endif
 
 #if defined(CONFIG_HCI_NXP_ENABLE_AUTO_SLEEP)
 static int nxp_bt_enable_controller_autosleep(void)
@@ -170,7 +171,10 @@ static int bt_nxp_set_mac_address(const bt_addr_t *public_addr)
 	uint8_t addrOUI[BD_ADDR_OUI_PART_SIZE] = {BD_ADDR_OUI};
 	uint8_t uid[16] = {0};
 	uint8_t uuidLen;
-	uint8_t hciBuffer[12];
+	uint8_t params[HCI_CMD_BT_HOST_SET_MAC_ADDR_PARAM_LENGTH] = {
+		BT_USER_BD,
+		0x06U
+	};
 
 	/* If no public address is provided by the user, use a unique address made
 	 * from the device's UID (unique ID)
@@ -190,18 +194,12 @@ static int bt_nxp_set_mac_address(const bt_addr_t *public_addr)
 		bt_addr_copy((bt_addr_t *)bleDeviceAddress, public_addr);
 	}
 
-	hciBuffer[0] = BT_HCI_H4_CMD;
-	memcpy((void *)&hciBuffer[1], (const void *)&opcode, 2U);
-	/* Set HCI parameter length */
-	hciBuffer[3] = HCI_CMD_BT_HOST_SET_MAC_ADDR_PARAM_LENGTH;
-	/* Set command parameter ID */
-	hciBuffer[4] = BT_USER_BD;
-	/* Set command parameter length */
-	hciBuffer[5] = (uint8_t)6U;
-	memcpy(hciBuffer + 6U, (const void *)bleDeviceAddress,
-	       BD_ADDR_UUID_PART_SIZE + BD_ADDR_OUI_PART_SIZE);
+	memcpy(&params[2], (const void *)bleDeviceAddress,
+		BD_ADDR_UUID_PART_SIZE + BD_ADDR_OUI_PART_SIZE);
+
 	/* Send the command */
-	return PLATFORM_SendHciMessage(hciBuffer, 12U);
+	return nxp_bt_send_vs_command(opcode, params,
+					HCI_CMD_BT_HOST_SET_MAC_ADDR_PARAM_LENGTH);
 }
 #endif /* CONFIG_BT_HCI_SET_PUBLIC_ADDR */
 

From b70ec03896534a408b16c632b49e3eb25b0a48e2 Mon Sep 17 00:00:00 2001
From: Ying Zhang <ying.zhang_2@nxp.com>
Date: Fri, 28 Feb 2025 09:53:51 +0100
Subject: [PATCH 2684/2913] [nrf fromtree] drivers: Bluetooth: nxp: not power
 off BLE controller when bt disable

remove the power off BLE controller function since the hci_reset cmd
is enough, also for wifi-ble coex scenario, need to maintain BLE controller
for some info in SMU region

Signed-off-by: Ying Zhang <ying.zhang_2@nxp.com>
(cherry picked from commit 6b16d103426999dbac6ce576dd6e99d876b6d520)
---
 drivers/bluetooth/hci/hci_nxp.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/bluetooth/hci/hci_nxp.c b/drivers/bluetooth/hci/hci_nxp.c
index e66affeb933..70d640c1bd2 100644
--- a/drivers/bluetooth/hci/hci_nxp.c
+++ b/drivers/bluetooth/hci/hci_nxp.c
@@ -513,12 +513,6 @@ static int bt_nxp_close(const struct device *dev)
 		if (ret) {
 			LOG_ERR("Failed to reset BLE controller");
 		}
-		k_sleep(K_SECONDS(1));
-
-		ret = PLATFORM_TerminateBle();
-		if (ret < 0) {
-			LOG_ERR("Failed to shutdown BLE controller");
-		}
 	}
 	hci->recv = NULL;
 

From aab91dc0811dbbb76c9cd60d1262a5561a36e67c Mon Sep 17 00:00:00 2001
From: Nirav Agrawal <nirav.agrawal@nxp.com>
Date: Wed, 5 Mar 2025 21:13:57 +0530
Subject: [PATCH 2685/2913] [nrf fromtree] bluetooth: host: perform hci-reset
 in bt_disable()

- added HCI command to send hci-reset in bt_disable() func, and
  remove its call from the driver close() call.
- remove rsp buf pass to 'hci_reset_complete()' func as status is
  already checked under 'bt_hci_cmd_send_sync()'.

Signed-off-by: Nirav Agrawal <nirav.agrawal@nxp.com>
(cherry picked from commit 438701fdd5133cb84b20b754334d149d805776b9)
---
 drivers/bluetooth/hci/hci_nxp.c  | 10 ++--------
 drivers/bluetooth/hci/ipc.c      |  9 +--------
 subsys/bluetooth/host/hci_core.c | 28 +++++++++++++++++-----------
 3 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/drivers/bluetooth/hci/hci_nxp.c b/drivers/bluetooth/hci/hci_nxp.c
index 70d640c1bd2..1b9eb60b229 100644
--- a/drivers/bluetooth/hci/hci_nxp.c
+++ b/drivers/bluetooth/hci/hci_nxp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 NXP
+ * Copyright 2023-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -507,13 +507,7 @@ static int bt_nxp_close(const struct device *dev)
 {
 	struct bt_nxp_data *hci = dev->data;
 	int ret = 0;
-	/* Reset the Controller */
-	if (IS_ENABLED(CONFIG_BT_HCI_HOST)) {
-		ret = bt_hci_cmd_send_sync(BT_HCI_OP_RESET, NULL, NULL);
-		if (ret) {
-			LOG_ERR("Failed to reset BLE controller");
-		}
-	}
+
 	hci->recv = NULL;
 
 	return ret;
diff --git a/drivers/bluetooth/hci/ipc.c b/drivers/bluetooth/hci/ipc.c
index 1dcfdc915d9..f7091e207c3 100644
--- a/drivers/bluetooth/hci/ipc.c
+++ b/drivers/bluetooth/hci/ipc.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2019 Nordic Semiconductor ASA
+ * Copyright 2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -372,14 +373,6 @@ static int bt_ipc_close(const struct device *dev)
 	struct ipc_data *ipc = dev->data;
 	int err;
 
-	if (IS_ENABLED(CONFIG_BT_HCI_HOST)) {
-		err = bt_hci_cmd_send_sync(BT_HCI_OP_RESET, NULL, NULL);
-		if (err) {
-			LOG_ERR("Sending reset command failed with: %d", err);
-			return err;
-		}
-	}
-
 	err = ipc_service_deregister_endpoint(&ipc->hci_ept);
 	if (err) {
 		LOG_ERR("Deregistering HCI endpoint failed with: %d", err);
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index 3f685ba9c78..aa22f31b570 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -3,6 +3,7 @@
 /*
  * Copyright (c) 2017-2025 Nordic Semiconductor ASA
  * Copyright (c) 2015-2016 Intel Corporation
+ * Copyright 2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -2389,17 +2390,10 @@ static void le_ltk_request(struct net_buf *buf)
 }
 #endif /* CONFIG_BT_SMP */
 
-static void hci_reset_complete(struct net_buf *buf)
+static void hci_reset_complete(void)
 {
-	uint8_t status = buf->data[0];
 	atomic_t flags;
 
-	LOG_DBG("status 0x%02x %s", status, bt_hci_err_to_str(status));
-
-	if (status) {
-		return;
-	}
-
 	if (IS_ENABLED(CONFIG_BT_OBSERVER)) {
 		bt_scan_reset();
 	}
@@ -3255,12 +3249,12 @@ static int common_init(void)
 
 	if (!drv_quirk_no_reset()) {
 		/* Send HCI_RESET */
-		err = bt_hci_cmd_send_sync(BT_HCI_OP_RESET, NULL, &rsp);
+		err = bt_hci_cmd_send_sync(BT_HCI_OP_RESET, NULL, NULL);
 		if (err) {
 			return err;
 		}
-		hci_reset_complete(rsp);
-		net_buf_unref(rsp);
+
+		hci_reset_complete();
 	}
 
 	/* Read Local Supported Features */
@@ -4384,6 +4378,18 @@ int bt_disable(void)
 	disconnected_handles_reset();
 #endif /* CONFIG_BT_CONN */
 
+	/* Reset the Controller */
+	if (!drv_quirk_no_reset()) {
+
+		err = bt_hci_cmd_send_sync(BT_HCI_OP_RESET, NULL, NULL);
+		if (err) {
+			LOG_ERR("Failed to reset BLE controller");
+			return err;
+		}
+
+		hci_reset_complete();
+	}
+
 	err = bt_hci_close(bt_dev.hci);
 	if (err == -ENOSYS) {
 		atomic_clear_bit(bt_dev.flags, BT_DEV_DISABLE);

From 7610829a5a7f6e4443d33daa8690180a1aba2a8b Mon Sep 17 00:00:00 2001
From: Kyra Lengfeld <kyra.lengfeld@nordicsemi.no>
Date: Mon, 10 Mar 2025 15:43:11 +0100
Subject: [PATCH 2686/2913] [nrf fromtree] Bluetooth: Host: improve GATT
 documentation

Clarifying `bt_gatt_attr` docs.

Signed-off-by: Kyra Lengfeld <kyra.lengfeld@nordicsemi.no>
(cherry picked from commit c31b96274326ab151b3cec8827ffc02f18a37b97)
---
 include/zephyr/bluetooth/gatt.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/zephyr/bluetooth/gatt.h b/include/zephyr/bluetooth/gatt.h
index 54022b3c651..a2d553ad3ed 100644
--- a/include/zephyr/bluetooth/gatt.h
+++ b/include/zephyr/bluetooth/gatt.h
@@ -217,12 +217,6 @@ typedef ssize_t (*bt_gatt_attr_write_func_t)(struct bt_conn *conn,
  *  While the formed GATT service is registered with the local
  *  GATT server, pointers to this type can typically be given to
  *  GATT server APIs, like bt_gatt_notify().
- *
- *  @note This type is given as an argument to the
- *  bt_gatt_discover() application callback, but it's not a
- *  proper object of this type. The field @ref perm, and methods
- *  read() and write() are not available, and it's unsound to
- *  pass the pointer to GATT server APIs.
  */
 struct bt_gatt_attr {
 	/** @brief Attribute Type
@@ -235,7 +229,8 @@ struct bt_gatt_attr {
 	 *  GATT Characteristic Presentation Format descriptor as
 	 *  specified in Core Specification 3.G.3.3.3.5.
 	 *
-	 *  You can define a new Attribute Type.
+	 *  You can define a new Attirubute Type for your application specific
+	 *  use by generating a new UUID for it.
 	 */
 	const struct bt_uuid *uuid;
 
@@ -1700,6 +1695,11 @@ struct bt_gatt_discover_params;
  *
  *  The attribute object as well as its UUID and value objects are temporary and
  *  must be copied to in order to cache its information.
+ *
+ *  @note @ref bt_gatt_attr is given as an argument to bt_gatt_discover(), but
+ *  it's not a proper object of this type. @ref bt_gatt_attr.perm, and methods
+ *  bt_gatt_attr.read() and bt_gatt_attr.write() are not available, and it's
+ *  unsound to pass the pointer to GATT server APIs.
  *  Only the following fields of the attribute contains valid information:
  *   - uuid      UUID representing the type of attribute.
  *   - handle    Handle in the remote database.

From f6bd90a18084a0cb78f698c9b2ea7dfe2ac15989 Mon Sep 17 00:00:00 2001
From: Kyra Lengfeld <kyra.lengfeld@nordicsemi.no>
Date: Wed, 12 Mar 2025 12:51:57 +0100
Subject: [PATCH 2687/2913] [nrf fromtree] Bluetooth: Host: Improve bluetooth
 documentation

This commit adds more detailed description to the "Bluetooth APIs" and
"GAP" group within the bluetooth header.

Signed-off-by: Kyra Lengfeld <kyra.lengfeld@nordicsemi.no>
(cherry picked from commit 35707831fa5c920780cfe5a27b2349f50b6289d4)
---
 include/zephyr/bluetooth/bluetooth.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/include/zephyr/bluetooth/bluetooth.h b/include/zephyr/bluetooth/bluetooth.h
index 1a7888182f4..d04dbfdd7c8 100644
--- a/include/zephyr/bluetooth/bluetooth.h
+++ b/include/zephyr/bluetooth/bluetooth.h
@@ -13,6 +13,12 @@
 
 /**
  * @brief Bluetooth APIs
+ * @details The Bluetooth Subsystem Core APIs provide essential functionalities
+ *          to use and manage Bluetooth based communication. These APIs include
+ *          APIs for Bluetooth stack initialization, device discovery,
+ *          connection management, data transmission, profiles and services.
+ *          These APIs support both classic Bluetooth and Bluetooth Low Energy
+ *          (LE) operations.
  * @defgroup bluetooth Bluetooth APIs
  * @ingroup connectivity
  * @{
@@ -35,6 +41,13 @@ extern "C" {
 
 /**
  * @brief Generic Access Profile (GAP)
+ * @details The Generic Access Profile (GAP) defines fundamental Bluetooth
+ *          operations, including device discovery, pairing, and connection
+ *          management. Zephyr's GAP implementation supports both classic
+ *          Bluetooth and Bluetooth Low Energy (LE) functionalities, enabling
+ *          roles such as Broadcaster, Observer, Peripheral, and Central. These
+ *          roles define the device's behavior in advertising, scanning, and
+ *          establishing connections within Bluetooth networks.
  * @defgroup bt_gap Generic Access Profile (GAP)
  * @since 1.0
  * @version 1.0.0

From 91f539136a04ae3cfbba0bf384e3fe861832bc64 Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Tue, 4 Mar 2025 21:04:56 +0100
Subject: [PATCH 2688/2913] [nrf fromtree] bluetooth: host: ecc: Change log
 level debug

This commit changes log level for already registered callback from
warning to debug as this is cause unnecessary noise and doesn't indicate
actual issue. Caller gets a certain error code for this case which can
be handled properly.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit 886fabaf87dd1b874c53373838765f3d30bbdaf8)
---
 subsys/bluetooth/host/ecc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/bluetooth/host/ecc.c b/subsys/bluetooth/host/ecc.c
index 6efc4f2baa9..d06af6a52e0 100644
--- a/subsys/bluetooth/host/ecc.c
+++ b/subsys/bluetooth/host/ecc.c
@@ -265,7 +265,7 @@ int bt_pub_key_gen(struct bt_pub_key_cb *new_cb)
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&pub_key_cb_slist, cb, node) {
 		if (cb == new_cb) {
-			LOG_WRN("Callback already registered");
+			LOG_DBG("Callback already registered");
 			return -EALREADY;
 		}
 	}

From da53b57e0466ffd74f3d318790b5f9ada3dbbf9a Mon Sep 17 00:00:00 2001
From: Herman Berget <herman.berget@nordicsemi.no>
Date: Wed, 12 Mar 2025 16:26:58 +0100
Subject: [PATCH 2689/2913] [nrf fromtree] Bluetooth: Host: Remove experimental
 label from PAwR

The api has not changed since its introduction some time ago,
mark it as stable.

Signed-off-by: Herman Berget <herman.berget@nordicsemi.no>
(cherry picked from commit 8b909b4403a2bd07e81d7ae1b95eafa20a25cb50)
---
 subsys/bluetooth/Kconfig.adv | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/subsys/bluetooth/Kconfig.adv b/subsys/bluetooth/Kconfig.adv
index 28e1dea61a2..486d7f1eded 100644
--- a/subsys/bluetooth/Kconfig.adv
+++ b/subsys/bluetooth/Kconfig.adv
@@ -44,8 +44,7 @@ config BT_PER_ADV
 	  to periodically get the data.
 
 config BT_PER_ADV_RSP
-	bool "Periodic Advertising with Responses support [EXPERIMENTAL]"
-	select EXPERIMENTAL
+	bool "Periodic Advertising with Responses support"
 	depends on BT_PER_ADV
 	help
 	  Select this to enable Periodic Advertising with Responses
@@ -61,8 +60,7 @@ config BT_PER_ADV_SYNC
 	  manner.
 
 config BT_PER_ADV_SYNC_RSP
-	bool "Periodic Advertising with Responses sync support [EXPERIMENTAL]"
-	select EXPERIMENTAL
+	bool "Periodic Advertising with Responses sync support"
 	depends on BT_OBSERVER
 	help
 	  Select this to enable Periodic Advertising with Responses Sync

From c8ceb3b13e34e08c566228a97a6f604748fbddf8 Mon Sep 17 00:00:00 2001
From: Timothy Keys <timothy.keys@nordicsemi.no>
Date: Thu, 13 Mar 2025 08:29:22 +0000
Subject: [PATCH 2690/2913] [nrf fromtree] bluetooth: host: Remove experimental
 flag from LE Connection Subrating

The API has not changed since it was introduced so should no longer be
considered experimental.

Signed-off-by: Timothy Keys <timothy.keys@nordicsemi.no>
(cherry picked from commit 7ef8116969a79adc4601ddc8916d00382f429142)
---
 doc/releases/release-notes-4.2.rst | 2 ++
 subsys/bluetooth/Kconfig           | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/releases/release-notes-4.2.rst b/doc/releases/release-notes-4.2.rst
index 67c5919cd96..c43e03d1af7 100644
--- a/doc/releases/release-notes-4.2.rst
+++ b/doc/releases/release-notes-4.2.rst
@@ -69,6 +69,8 @@ New APIs and options
 
     * :c:func:`bt_le_get_local_features`
 
+    * LE Connection Subrating is no longer experimental.
+
 New Boards
 **********
 
diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig
index 1665059ce33..93c867547a0 100644
--- a/subsys/bluetooth/Kconfig
+++ b/subsys/bluetooth/Kconfig
@@ -182,8 +182,7 @@ config BT_PATH_LOSS_MONITORING
 	  Bluetooth Core specification, Version 5.4 | Vol 6, Part B, Section 4.6.32.
 
 config BT_SUBRATING
-	bool "LE Connection Subrating [EXPERIMENTAL]"
-	select EXPERIMENTAL
+	bool "LE Connection Subrating"
 	depends on !HAS_BT_CTLR || BT_CTLR_SUBRATING_SUPPORT
 	help
 	  Enable support for LE Connection Subrating feature that is defined in the

From e62a93187ea703f861e4befcf470da926289d597 Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 17 Mar 2025 09:33:43 +0100
Subject: [PATCH 2691/2913] [nrf fromtree] Bluetooth: Host: ATT: Fix build
 warning with clang

Fix the following warning
att.c:734:3: warning: label followed by a declaration is a C23 extension
[-Wc23-extensions]
  734 |                 k_tid_t current_thread = k_current_get();
      |                 ^
By wrapping that code as a compound statement

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 1dab77b49f52cc956d60793d29d9d774b7e490e3)
---
 subsys/bluetooth/host/att.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c
index 9d83ba688d9..8ba9957d3a3 100644
--- a/subsys/bluetooth/host/att.c
+++ b/subsys/bluetooth/host/att.c
@@ -720,7 +720,7 @@ static struct net_buf *bt_att_chan_create_pdu(struct bt_att_chan *chan, uint8_t
 		/* Use a timeout only when responding/confirming */
 		timeout = BT_ATT_TIMEOUT;
 		break;
-	default:
+	default: {
 		k_tid_t current_thread = k_current_get();
 
 		if (current_thread == k_work_queue_thread_get(&k_sys_work_q)) {
@@ -733,6 +733,7 @@ static struct net_buf *bt_att_chan_create_pdu(struct bt_att_chan *chan, uint8_t
 			timeout = K_FOREVER;
 		}
 	}
+	}
 
 	/* This will reserve headspace for lower layers */
 	buf = bt_l2cap_create_pdu_timeout(&att_pool, 0, timeout);

From 02dc89c8c8fd8c9ff9b58e7ad00bf9979e593faf Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Tue, 18 Mar 2025 13:14:44 +0100
Subject: [PATCH 2692/2913] [nrf fromlist] cmake: support directory as argument
 to zephyr_library_amend()

Extend `zephyr_library_amend()` to support an optional directory
argument.
The current `zephyr_library_amend()` works well when used inside a
Zephyr module with same structure, but fails when the macro is called
from Zephyr module integration code is located in a Zephyr
`MODULE_EXT_ROOT` because in this case the CMake code being executed
is not present in the Zephyr module itself, in which case the dir name
creation based on relative to module dir give wrong result.

For this use-case then support a base directory.
This also allows for use-cases in Zephyr modules where the directory
structure matching Zephyr's own structure is placed in a sub-folder.

Upstream PR #: 87274

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
---
 cmake/modules/extensions.cmake | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index 6ad4a169567..e23043022e6 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -463,9 +463,18 @@ endmacro()
 
 # Provides amend functionality to a Zephyr library for out-of-tree usage.
 #
+# Usage:
+#   zephyr_library_amend([<dir>])
+#
 # When called from a Zephyr module, the corresponding zephyr library defined
 # within Zephyr will be looked up.
 #
+# <dir>: Use '<dir>' as out-of-tree base directory from where the Zephyr
+#        library name shall be generated.
+#        <dir> can be used in cases where the structure for the library is not
+#        placed directly at the ZEPHYR_MODULE's root directory or for cases
+#        where the module integration file is located in a 'MODULE_EXT_ROOT'.
+#
 # Note, in order to ensure correct library when amending, the folder structure in the
 # Zephyr module must resemble the structure used in Zephyr, as example:
 #
@@ -496,7 +505,11 @@ macro(zephyr_library_amend)
     message(FATAL_ERROR "Function only available for Zephyr modules.")
   endif()
 
-  zephyr_library_get_current_dir_lib_name(${ZEPHYR_CURRENT_MODULE_DIR} lib_name)
+  if(${ARGC} EQUAL 1)
+    zephyr_library_get_current_dir_lib_name(${ARGV0} lib_name)
+  else()
+    zephyr_library_get_current_dir_lib_name(${ZEPHYR_CURRENT_MODULE_DIR} lib_name)
+  endif()
 
   set(ZEPHYR_CURRENT_LIBRARY ${lib_name})
 endmacro()

From bd1cf27b22f1003d58ecf4af81961722e1eb9949 Mon Sep 17 00:00:00 2001
From: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Date: Fri, 21 Mar 2025 14:43:43 +0100
Subject: [PATCH 2693/2913] [nrf noup] tests: crypto: Set size for PSA slot

noup since this option does not exist upstream.

The Oberon PSA core has an option to manually set
the buffer size of the PSA key slots in bytes.

This option here:
MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE

This option has a default value of 16 since it
directly affects the memory usage.

The crypto tests use a secp256r1 key and thus since
the public key for this key is 65 bytes long we need
to set the option in the sample.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
---
 tests/crypto/secp256r1/mbedtls.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/crypto/secp256r1/mbedtls.conf b/tests/crypto/secp256r1/mbedtls.conf
index bbc2eb0e656..c4ea620de55 100644
--- a/tests/crypto/secp256r1/mbedtls.conf
+++ b/tests/crypto/secp256r1/mbedtls.conf
@@ -1,6 +1,7 @@
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_MBEDTLS_PSA_P256M_DRIVER_ENABLED=y
+CONFIG_MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE=65
 CONFIG_MBEDTLS_PSA_STATIC_KEY_SLOTS=y
 CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=2
 

From 839908128ce86fd09a6da8c8d19feef2f709fd94 Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Wed, 19 Mar 2025 15:54:13 +0100
Subject: [PATCH 2694/2913] Revert "[nrf fromlist] drivers: flash: mspi_nor:
 support MODE_SINGLE and MODE_QUAD_1_4_4"

This reverts commit dd02c8607dd98dcfe5ae072f2ce2a25f940633e5.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 drivers/flash/flash_mspi_nor.c | 396 +++++++++------------------------
 1 file changed, 106 insertions(+), 290 deletions(-)

diff --git a/drivers/flash/flash_mspi_nor.c b/drivers/flash/flash_mspi_nor.c
index 792596a9b1c..a5ced1e0070 100644
--- a/drivers/flash/flash_mspi_nor.c
+++ b/drivers/flash/flash_mspi_nor.c
@@ -28,183 +28,6 @@ struct flash_mspi_nor_data {
 	struct mspi_xfer xfer;
 };
 
-struct flash_mspi_nor_cmd {
-	enum mspi_xfer_direction dir;
-	uint32_t cmd;
-	uint16_t tx_dummy;
-	uint16_t rx_dummy;
-	uint8_t cmd_length;
-	uint8_t addr_length;
-};
-
-struct flash_mspi_nor_cmds {
-	struct flash_mspi_nor_cmd id;
-	struct flash_mspi_nor_cmd write_en;
-	struct flash_mspi_nor_cmd read;
-	struct flash_mspi_nor_cmd status;
-	struct flash_mspi_nor_cmd page_program;
-	struct flash_mspi_nor_cmd sector_erase;
-	struct flash_mspi_nor_cmd chip_erase;
-	struct flash_mspi_nor_cmd mode_change;
-	struct flash_mspi_nor_cmd sfdp;
-	uint8_t mode_payload;
-};
-
-static const struct flash_mspi_nor_cmds commands[] = {
-	[MSPI_IO_MODE_SINGLE] = {
-		.id = {
-			.dir = MSPI_RX,
-			.cmd = JESD216_CMD_READ_ID,
-			.cmd_length = 1,
-		},
-		.write_en = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WREN,
-			.cmd_length = 1,
-		},
-		.read = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_CMD_READ,
-			.cmd_length = 1,
-			.addr_length = 3,
-		},
-		.status = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_CMD_RDSR,
-			.cmd_length = 1,
-		},
-		.page_program = {
-			.dir  = MSPI_TX,
-			.cmd = SPI_NOR_CMD_PP,
-			.cmd_length = 1,
-			.addr_length = 3,
-		},
-		.sector_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_SE,
-			.cmd_length = 1,
-			.addr_length = 3,
-		},
-		.chip_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_CE,
-			.cmd_length = 1,
-		},
-		.mode_change = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WRSR,
-			.cmd_length = 1,
-		},
-		.mode_payload = 0,
-	},
-	[MSPI_IO_MODE_QUAD_1_4_4] = {
-		.id = {
-			.dir = MSPI_RX,
-			.cmd = JESD216_CMD_READ_ID,
-			.cmd_length = 1,
-		},
-		.write_en = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WREN,
-			.cmd_length = 1,
-		},
-		.read = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_CMD_4READ,
-			.cmd_length = 1,
-			.addr_length = 3,
-			.rx_dummy = 6,
-		},
-		.status = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_CMD_RDSR,
-			.cmd_length = 1,
-		},
-		.page_program = {
-			.dir  = MSPI_TX,
-			.cmd = SPI_NOR_CMD_PP_1_4_4,
-			.cmd_length = 1,
-			.addr_length = 3,
-		},
-		.sector_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_SE,
-			.cmd_length = 1,
-			.addr_length = 3,
-		},
-		.chip_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_CE,
-			.cmd_length = 1,
-		},
-		.mode_change = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WRSR,
-			.cmd_length = 1,
-		},
-		.mode_payload = SPI_NOR_QE_BIT,
-	},
-	[MSPI_IO_MODE_OCTAL] = {
-		.id = {
-			.dir = MSPI_RX,
-			.cmd = JESD216_OCMD_READ_ID,
-			.cmd_length = 2,
-			.addr_length = 4,
-			.rx_dummy = 4
-		},
-		.write_en = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_OCMD_WREN,
-			.cmd_length = 2,
-		},
-		.read = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_OCMD_RD,
-			.cmd_length = 2,
-			.addr_length = 4,
-			.rx_dummy = 20,
-		},
-		.status = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_OCMD_RDSR,
-			.cmd_length = 2,
-			.addr_length = 4,
-			.rx_dummy = 4,
-		},
-		.page_program = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_OCMD_PAGE_PRG,
-			.cmd_length = 2,
-			.addr_length = 4,
-		},
-		.sector_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_OCMD_SE,
-			.cmd_length = 2,
-			.addr_length = 4,
-		},
-		.chip_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_OCMD_CE,
-			.cmd_length = 2,
-		},
-		.sfdp = {
-			.dir = MSPI_RX,
-			.cmd = JESD216_OCMD_READ_SFDP,
-			.cmd_length = 2,
-			.addr_length = 4,
-			.rx_dummy = 20,
-		},
-		.mode_change = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WR_CFGREG2,
-			.cmd_length = 1,
-			.addr_length = 4,
-		},
-		.mode_payload = 0x01,
-	},
-};
-
 struct flash_mspi_nor_config {
 	const struct device *bus;
 	uint32_t flash_size;
@@ -223,7 +46,6 @@ struct flash_mspi_nor_config {
 	struct flash_pages_layout layout;
 #endif
 	uint8_t jedec_id[SPI_NOR_MAX_ID_LEN];
-	const struct flash_mspi_nor_cmds *jedec_cmds;
 };
 
 static int acquire(const struct device *dev)
@@ -282,27 +104,6 @@ static inline uint16_t dev_page_size(const struct device *dev)
 	return SPI_NOR_PAGE_SIZE;
 }
 
-static void command_set(const struct device *dev, const struct flash_mspi_nor_cmd *cmd)
-{
-	struct flash_mspi_nor_data *dev_data = dev->data;
-
-	memset(&dev_data->xfer, 0, sizeof(dev_data->xfer));
-	memset(&dev_data->packet, 0, sizeof(dev_data->packet));
-
-	dev_data->xfer.xfer_mode  = MSPI_PIO;
-	dev_data->xfer.packets    = &dev_data->packet;
-	dev_data->xfer.num_packet = 1;
-	dev_data->xfer.timeout    = 10;
-
-	dev_data->xfer.cmd_length = cmd->cmd_length;
-	dev_data->xfer.addr_length = cmd->addr_length;
-	dev_data->xfer.tx_dummy = cmd->tx_dummy;
-	dev_data->xfer.rx_dummy = cmd->rx_dummy;
-
-	dev_data->packet.dir = cmd->dir;
-	dev_data->packet.cmd = cmd->cmd;
-}
-
 static int api_read(const struct device *dev, off_t addr, void *dest,
 		    size_t size)
 {
@@ -325,7 +126,11 @@ static int api_read(const struct device *dev, off_t addr, void *dest,
 	}
 
 	/* TODO: get rid of all these hard-coded values for MX25Ux chips */
-	command_set(dev, &dev_config->jedec_cmds->read);
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 20;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = SPI_NOR_OCMD_RD;
 	dev_data->packet.address   = addr;
 	dev_data->packet.data_buf  = dest;
 	dev_data->packet.num_bytes = size;
@@ -335,38 +140,35 @@ static int api_read(const struct device *dev, off_t addr, void *dest,
 	release(dev);
 
 	if (rc < 0) {
-		LOG_ERR("Read xfer failed: %d", rc);
+		LOG_ERR("SPI_NOR_OCMD_RD xfer failed: %d", rc);
 		return rc;
 	}
 
 	return 0;
 }
 
-static int status_get(const struct device *dev, uint8_t *status)
+static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
 	struct flash_mspi_nor_data *dev_data = dev->data;
-
-	command_set(dev, &dev_config->jedec_cmds->status);
-	dev_data->packet.data_buf  = status;
-	dev_data->packet.num_bytes = sizeof(uint8_t);
-
-	return mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
-}
-
-static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
-{
-	int rc;
 	uint8_t status_reg;
+	int rc;
 
 	while (true) {
-		rc = status_get(dev, &status_reg);
-
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.addr_length = 4;
+		dev_data->xfer.rx_dummy    = 4;
+		dev_data->packet.dir       = MSPI_RX;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_RDSR;
+		dev_data->packet.address   = 0;
+		dev_data->packet.data_buf  = &status_reg;
+		dev_data->packet.num_bytes = sizeof(status_reg);
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("Status xfer failed: %d", rc);
+			LOG_ERR("SPI_NOR_OCMD_RDSR xfer failed: %d", rc);
 			return rc;
 		}
-
 		if (!(status_reg & SPI_NOR_WIP_BIT)) {
 			break;
 		}
@@ -377,15 +179,6 @@ static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
 	return 0;
 }
 
-static int write_enable(const struct device *dev)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-
-	command_set(dev, &dev_config->jedec_cmds->write_en);
-	return mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
-}
-
 static int api_write(const struct device *dev, off_t addr, const void *src,
 		     size_t size)
 {
@@ -414,19 +207,29 @@ static int api_write(const struct device *dev, off_t addr, const void *src,
 		uint16_t page_left = page_size - page_offset;
 		uint16_t to_write = (uint16_t)MIN(size, page_left);
 
-		if (write_enable(dev) < 0) {
-			LOG_ERR("Write enable xfer failed: %d", rc);
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.tx_dummy    = 0;
+		dev_data->packet.dir       = MSPI_TX;
+
+		dev_data->xfer.addr_length = 0;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
+		dev_data->packet.num_bytes = 0;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
 			break;
 		}
 
-		command_set(dev, &dev_config->jedec_cmds->page_program);
+		dev_data->xfer.addr_length = 4;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_PAGE_PRG;
 		dev_data->packet.address   = addr;
 		dev_data->packet.data_buf  = (uint8_t *)src;
 		dev_data->packet.num_bytes = to_write;
 		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("Page program xfer failed: %d", rc);
+			LOG_ERR("SPI_NOR_OCMD_PAGE_PRG xfer failed: %d", rc);
 			break;
 		}
 
@@ -470,20 +273,32 @@ static int api_erase(const struct device *dev, off_t addr, size_t size)
 	}
 
 	while (size > 0) {
-		rc = write_enable(dev);
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.tx_dummy    = 0;
+		dev_data->packet.dir       = MSPI_TX;
+		dev_data->packet.num_bytes = 0;
+
+		dev_data->xfer.addr_length = 0;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("Write enable failed.");
+			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
 			break;
 		}
 
 		if (size == flash_size) {
 			/* Chip erase. */
-			command_set(dev, &dev_config->jedec_cmds->chip_erase);
+			dev_data->xfer.addr_length = 0;
+			dev_data->packet.cmd       = SPI_NOR_OCMD_CE;
+
 			size -= flash_size;
 		} else {
 			/* Sector erase. */
-			command_set(dev, &dev_config->jedec_cmds->sector_erase);
-			dev_data->packet.address = addr;
+			dev_data->xfer.addr_length = 4;
+			dev_data->packet.cmd       = SPI_NOR_OCMD_SE;
+			dev_data->packet.address   = addr;
+
 			addr += SPI_NOR_SECTOR_SIZE;
 			size -= SPI_NOR_SECTOR_SIZE;
 		}
@@ -525,14 +340,19 @@ static int read_jedec_id(const struct device *dev, uint8_t *id)
 	struct flash_mspi_nor_data *dev_data = dev->data;
 	int rc;
 
-	command_set(dev, &dev_config->jedec_cmds->id);
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 4;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_OCMD_READ_ID;
+	dev_data->packet.address   = 0;
 	dev_data->packet.data_buf  = id;
 	dev_data->packet.num_bytes = JESD216_READ_ID_LEN;
-
 	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 			     &dev_data->xfer);
 	if (rc < 0) {
-		LOG_ERR("mspi_transceive() failed: %d\n", rc);
+		printk("mspi_transceive() failed: %d\n", rc);
+		return rc;
 	}
 
 	return rc;
@@ -567,8 +387,11 @@ static int api_sfdp_read(const struct device *dev, off_t addr, void *dest,
 		return rc;
 	}
 
-
-	command_set(dev, &dev_config->jedec_cmds->sfdp);
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 20;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_OCMD_READ_SFDP;
 	dev_data->packet.address   = addr;
 	dev_data->packet.data_buf  = dest;
 	dev_data->packet.num_bytes = size;
@@ -616,41 +439,6 @@ static int dev_pm_action_cb(const struct device *dev,
 	return 0;
 }
 
-static int switch_mode(const struct device *dev, uint8_t *id)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-
-	/* For octal mode:
-	 * If the read ID does not match the one from DTS, assume the flash
-	 * is already in the Octa I/O mode, so switching it is not needed.
-	 */
-	if ((dev_config->mspi_cfg.io_mode == MSPI_IO_MODE_OCTAL) &&
-	     (memcmp(id, dev_config->jedec_id, JESD216_READ_ID_LEN) != 0)) {
-		return 0;
-	}
-
-	command_set(dev, &commands[MSPI_IO_MODE_SINGLE].write_en);
-	int rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-			     &dev_data->xfer);
-	if (rc < 0) {
-		LOG_ERR("Failed to set write enable: %d", rc);
-		return rc;
-	}
-
-	command_set(dev, &dev_config->jedec_cmds->mode_change);
-	dev_data->packet.data_buf  = (uint8_t *)&dev_config->jedec_cmds->mode_payload;
-	dev_data->packet.num_bytes = sizeof(dev_config->jedec_cmds->mode_payload);
-	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-			     &dev_data->xfer);
-	if (rc < 0) {
-		LOG_ERR("Failed to change IO mode: %d\n", rc);
-		return rc;
-	}
-
-	return 0;
-}
-
 static int flash_chip_init(const struct device *dev)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
@@ -669,21 +457,55 @@ static int flash_chip_init(const struct device *dev)
 		return rc;
 	}
 
-	command_set(dev, &commands[MSPI_IO_MODE_SINGLE].id);
+	dev_data->xfer.xfer_mode  = MSPI_PIO;
+	dev_data->xfer.packets    = &dev_data->packet;
+	dev_data->xfer.num_packet = 1;
+	dev_data->xfer.timeout    = 10;
+
+	dev_data->xfer.cmd_length  = 1;
+	dev_data->xfer.addr_length = 0;
+	dev_data->xfer.tx_dummy    = 0;
+	dev_data->xfer.rx_dummy    = 0;
+
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_CMD_READ_ID;
 	dev_data->packet.data_buf  = id;
 	dev_data->packet.num_bytes = sizeof(id);
-
 	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 			     &dev_data->xfer);
 	if (rc < 0) {
-		LOG_ERR("Failed to read JEDEC ID in initial line mode: %d", rc);
+		LOG_ERR("Failed to read JEDEC ID in single line mode: %d", rc);
 		return rc;
 	}
 
-	rc = switch_mode(dev, id);
+	/*
+	 * If the read ID does not match the one from DTS, assume the flash
+	 * is already in the Octa I/O mode, so switching it is not needed.
+	 */
+	if (memcmp(id, dev_config->jedec_id, sizeof(id)) == 0) {
+		static const uint8_t enable_sopi[] = { 0x01 };
+
+		dev_data->packet.dir       = MSPI_TX;
+		dev_data->packet.cmd       = SPI_NOR_CMD_WREN;
+		dev_data->packet.num_bytes = 0;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_CMD_WREN xfer failed: %d", rc);
+			return rc;
+		}
 
-	if (rc < 0) {
-		LOG_ERR("Failed to switch mode: %d", rc);
+		dev_data->xfer.addr_length = 4;
+		dev_data->packet.cmd       = SPI_NOR_CMD_WR_CFGREG2;
+		dev_data->packet.address   = 0;
+		dev_data->packet.data_buf  = (uint8_t *)&enable_sopi;
+		dev_data->packet.num_bytes = sizeof(enable_sopi);
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			printk("SPI_NOR_CMD_WR_CFGREG2 xfer failed: %d\n", rc);
+			return rc;
+		}
 	}
 
 	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
@@ -803,7 +625,6 @@ static DEVICE_API(flash, drv_api) = {
 };
 
 #define FLASH_SIZE_INST(inst) (DT_INST_PROP(inst, size) / 8)
-#define FLASH_CMDS(inst) &commands[DT_INST_ENUM_IDX(inst, mspi_io_mode)]
 
 #if defined(CONFIG_FLASH_PAGE_LAYOUT)
 BUILD_ASSERT((CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE % 4096) == 0,
@@ -830,13 +651,9 @@ BUILD_ASSERT((FLASH_SIZE_INST(inst) % CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE) ==
 #endif
 
 #define FLASH_MSPI_NOR_INST(inst)						\
-	BUILD_ASSERT((DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
-		      MSPI_IO_MODE_SINGLE) ||					\
-		     (DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
-		      MSPI_IO_MODE_QUAD_1_4_4) ||				\
-		     (DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
-		      MSPI_IO_MODE_OCTAL),					\
-		"Only 1x, 1-4-4 and 8x I/O modes are supported for now");	\
+	BUILD_ASSERT(DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		     MSPI_IO_MODE_OCTAL,					\
+		"Only Octal I/O mode is supported for now");			\
 	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);			\
 	static struct flash_mspi_nor_data dev##inst##_data;			\
 	static const struct flash_mspi_nor_config dev##inst##_config = {	\
@@ -858,7 +675,6 @@ BUILD_ASSERT((FLASH_SIZE_INST(inst) % CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE) ==
 				   / 1000,))					\
 		FLASH_PAGE_LAYOUT_DEFINE(inst)					\
 		.jedec_id = DT_INST_PROP(inst, jedec_id),			\
-		.jedec_cmds = FLASH_CMDS(inst),					\
 	};									\
 	FLASH_PAGE_LAYOUT_CHECK(inst)						\
 	DEVICE_DT_INST_DEFINE(inst,						\

From 999e700d8c226f6ea05f8b685516d7df7c608dc5 Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Fri, 7 Feb 2025 15:01:18 +0100
Subject: [PATCH 2695/2913] [nrf fromlist] drivers: flash: mspi_nor: support
 MODE_SINGLE and MODE_QUAD_1_4_4

Extend driver to support single lane and 1-4-4 IO modes.

Upstream PR #: 85520

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 drivers/flash/flash_mspi_nor.c | 525 +++++++++++++++++++++++++--------
 1 file changed, 394 insertions(+), 131 deletions(-)

diff --git a/drivers/flash/flash_mspi_nor.c b/drivers/flash/flash_mspi_nor.c
index a5ced1e0070..455076a7a9b 100644
--- a/drivers/flash/flash_mspi_nor.c
+++ b/drivers/flash/flash_mspi_nor.c
@@ -22,18 +22,206 @@ LOG_MODULE_REGISTER(flash_mspi_nor, CONFIG_FLASH_LOG_LEVEL);
 #define WITH_RESET_GPIO 1
 #endif
 
+#define FLASH_MX25R_LH_MASK BIT(1)
+
+static uint8_t hp_payload[3] = {SPI_NOR_QE_BIT, 0x0, FLASH_MX25R_LH_MASK};
+
 struct flash_mspi_nor_data {
 	struct k_sem acquired;
 	struct mspi_xfer_packet packet;
 	struct mspi_xfer xfer;
 };
 
+struct flash_mspi_nor_cmd {
+	enum mspi_xfer_direction dir;
+	uint32_t cmd;
+	uint16_t tx_dummy;
+	uint16_t rx_dummy;
+	uint8_t cmd_length;
+	uint8_t addr_length;
+	bool force_single;
+};
+
+struct flash_mspi_nor_cmds {
+	struct flash_mspi_nor_cmd id;
+	struct flash_mspi_nor_cmd write_en;
+	struct flash_mspi_nor_cmd read;
+	struct flash_mspi_nor_cmd status;
+	struct flash_mspi_nor_cmd page_program;
+	struct flash_mspi_nor_cmd sector_erase;
+	struct flash_mspi_nor_cmd chip_erase;
+	struct flash_mspi_nor_cmd mode_change;
+	struct flash_mspi_nor_cmd sfdp;
+	uint8_t mode_payload;
+};
+
+static const struct flash_mspi_nor_cmds commands[] = {
+	[MSPI_IO_MODE_SINGLE] = {
+		.id = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_CMD_READ_ID,
+			.cmd_length = 1,
+		},
+		.write_en = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WREN,
+			.cmd_length = 1,
+		},
+		.read = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_READ_FAST,
+			.cmd_length = 1,
+			.addr_length = 3,
+			.rx_dummy = 8,
+		},
+		.status = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_RDSR,
+			.cmd_length = 1,
+		},
+		.page_program = {
+			.dir  = MSPI_TX,
+			.cmd = SPI_NOR_CMD_PP,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.sector_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_SE,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.chip_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_CE,
+			.cmd_length = 1,
+		},
+		.mode_change = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WRSR,
+			.cmd_length = 1,
+		},
+		.mode_payload = 0,
+	},
+	[MSPI_IO_MODE_QUAD_1_4_4] = {
+		.id = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_CMD_READ_ID,
+			.cmd_length = 1,
+			.force_single = true,
+		},
+		.write_en = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WREN,
+			.cmd_length = 1,
+		},
+		.read = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_4READ,
+			.cmd_length = 1,
+			.addr_length = 3,
+			.rx_dummy = 6,
+		},
+		.status = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_RDSR,
+			.cmd_length = 1,
+			.force_single = true,
+		},
+		.page_program = {
+			.dir  = MSPI_TX,
+			.cmd = SPI_NOR_CMD_PP_1_4_4,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.sector_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_SE,
+			.cmd_length = 1,
+			.addr_length = 3,
+			.force_single = true,
+		},
+		.chip_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_CE,
+			.cmd_length = 1,
+		},
+		.mode_change = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WRSR,
+			.cmd_length = 1,
+			.force_single = true,
+		},
+		.mode_payload = SPI_NOR_QE_BIT,
+	},
+	[MSPI_IO_MODE_OCTAL] = {
+		.id = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_OCMD_READ_ID,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 4
+		},
+		.write_en = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_WREN,
+			.cmd_length = 2,
+		},
+		.read = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_OCMD_RD,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 20,
+		},
+		.status = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_OCMD_RDSR,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 4,
+		},
+		.page_program = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_PAGE_PRG,
+			.cmd_length = 2,
+			.addr_length = 4,
+		},
+		.sector_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_SE,
+			.cmd_length = 2,
+			.addr_length = 4,
+		},
+		.chip_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_CE,
+			.cmd_length = 2,
+		},
+		.sfdp = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_OCMD_READ_SFDP,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 20,
+		},
+		.mode_change = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WR_CFGREG2,
+			.cmd_length = 1,
+			.addr_length = 4,
+		},
+		.mode_payload = 0x01,
+	},
+};
+
 struct flash_mspi_nor_config {
 	const struct device *bus;
 	uint32_t flash_size;
 	struct mspi_dev_id mspi_id;
-	struct mspi_dev_cfg mspi_cfg;
-	enum mspi_dev_cfg_mask mspi_cfg_mask;
+	struct mspi_dev_cfg mspi_nor_cfg;
+	struct mspi_dev_cfg mspi_nor_init_cfg;
+	enum mspi_dev_cfg_mask mspi_nor_cfg_mask;
 #if defined(CONFIG_MSPI_XIP)
 	struct mspi_xip_cfg xip_cfg;
 #endif
@@ -46,9 +234,22 @@ struct flash_mspi_nor_config {
 	struct flash_pages_layout layout;
 #endif
 	uint8_t jedec_id[SPI_NOR_MAX_ID_LEN];
+	const struct flash_mspi_nor_cmds *jedec_cmds;
 };
 
-static int acquire(const struct device *dev)
+static int dev_cfg_apply(const struct device *dev, const struct mspi_dev_cfg *cfg)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+
+	int rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
+				 dev_config->mspi_nor_cfg_mask, cfg);
+	if (rc < 0) {
+		LOG_ERR("Failed to set device config: %p error: %d", cfg, rc);
+	}
+	return rc;
+}
+
+static int acquire(const struct device *dev, const struct mspi_dev_cfg *cfg)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
 	struct flash_mspi_nor_data *dev_data = dev->data;
@@ -63,12 +264,8 @@ static int acquire(const struct device *dev)
 		/* This acquires the MSPI controller and reconfigures it
 		 * if needed for the flash device.
 		 */
-		rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
-				     dev_config->mspi_cfg_mask,
-				     &dev_config->mspi_cfg);
-		if (rc < 0) {
-			LOG_ERR("mspi_dev_config() failed: %d", rc);
-		} else {
+		rc = dev_cfg_apply(dev, cfg);
+		if (rc == 0) {
 			return 0;
 		}
 
@@ -104,6 +301,30 @@ static inline uint16_t dev_page_size(const struct device *dev)
 	return SPI_NOR_PAGE_SIZE;
 }
 
+static void command_set(const struct device *dev, const struct flash_mspi_nor_cmd *cmd)
+{
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+
+	memset(&dev_data->xfer, 0, sizeof(dev_data->xfer));
+	memset(&dev_data->packet, 0, sizeof(dev_data->packet));
+
+	dev_data->xfer.xfer_mode  = MSPI_PIO;
+	dev_data->xfer.packets    = &dev_data->packet;
+	dev_data->xfer.num_packet = 1;
+	dev_data->xfer.timeout    = 10;
+
+	dev_data->xfer.cmd_length = cmd->cmd_length;
+	dev_data->xfer.addr_length = cmd->addr_length;
+	dev_data->xfer.tx_dummy = (cmd->dir == MSPI_TX) ?
+				  cmd->tx_dummy : dev_config->mspi_nor_cfg.tx_dummy;
+	dev_data->xfer.rx_dummy = (cmd->dir == MSPI_RX) ?
+				  cmd->rx_dummy : dev_config->mspi_nor_cfg.rx_dummy;
+
+	dev_data->packet.dir = cmd->dir;
+	dev_data->packet.cmd = cmd->cmd;
+}
+
 static int api_read(const struct device *dev, off_t addr, void *dest,
 		    size_t size)
 {
@@ -120,17 +341,13 @@ static int api_read(const struct device *dev, off_t addr, void *dest,
 		return -EINVAL;
 	}
 
-	rc = acquire(dev);
+	rc = acquire(dev, &dev_config->mspi_nor_cfg);
 	if (rc < 0) {
 		return rc;
 	}
 
 	/* TODO: get rid of all these hard-coded values for MX25Ux chips */
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 20;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = SPI_NOR_OCMD_RD;
+	command_set(dev, &dev_config->jedec_cmds->read);
 	dev_data->packet.address   = addr;
 	dev_data->packet.data_buf  = dest;
 	dev_data->packet.num_bytes = size;
@@ -140,35 +357,67 @@ static int api_read(const struct device *dev, off_t addr, void *dest,
 	release(dev);
 
 	if (rc < 0) {
-		LOG_ERR("SPI_NOR_OCMD_RD xfer failed: %d", rc);
+		LOG_ERR("Read xfer failed: %d", rc);
 		return rc;
 	}
 
 	return 0;
 }
 
-static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
+static int status_get(const struct device *dev, const struct mspi_dev_cfg *curr_cfg,
+		      uint8_t *status)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
 	struct flash_mspi_nor_data *dev_data = dev->data;
-	uint8_t status_reg;
 	int rc;
 
+	/* Enter command mode */
+	if (curr_cfg != &dev_config->mspi_nor_init_cfg) {
+		rc = dev_cfg_apply(dev, &dev_config->mspi_nor_init_cfg);
+
+		if (rc < 0) {
+			LOG_ERR("Switching to initial dev_cfg failed: %d", rc);
+			return rc;
+		}
+	}
+
+	command_set(dev, &dev_config->jedec_cmds->status);
+	dev_data->packet.data_buf  = status;
+	dev_data->packet.num_bytes = sizeof(uint8_t);
+
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
+
+	if (rc < 0) {
+		LOG_ERR("Status xfer failed: %d", rc);
+		return rc;
+	}
+
+	/* Exit command mode */
+	if (curr_cfg != &dev_config->mspi_nor_init_cfg) {
+		rc = dev_cfg_apply(dev, &dev_config->mspi_nor_cfg);
+
+		if (rc < 0) {
+			LOG_ERR("Switching to default dev_cfg failed: %d", rc);
+		}
+	}
+
+	return rc;
+}
+
+static int wait_until_ready(const struct device *dev, const struct mspi_dev_cfg *curr_cfg,
+			    k_timeout_t poll_period)
+{
+	int rc;
+	uint8_t status_reg;
+
 	while (true) {
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.addr_length = 4;
-		dev_data->xfer.rx_dummy    = 4;
-		dev_data->packet.dir       = MSPI_RX;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_RDSR;
-		dev_data->packet.address   = 0;
-		dev_data->packet.data_buf  = &status_reg;
-		dev_data->packet.num_bytes = sizeof(status_reg);
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
+		rc = status_get(dev, curr_cfg, &status_reg);
+
 		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_RDSR xfer failed: %d", rc);
+			LOG_ERR("Status xfer failed: %d", rc);
 			return rc;
 		}
+
 		if (!(status_reg & SPI_NOR_WIP_BIT)) {
 			break;
 		}
@@ -179,6 +428,15 @@ static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
 	return 0;
 }
 
+static int write_enable(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+
+	command_set(dev, &dev_config->jedec_cmds->write_en);
+	return mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
+}
+
 static int api_write(const struct device *dev, off_t addr, const void *src,
 		     size_t size)
 {
@@ -196,7 +454,7 @@ static int api_write(const struct device *dev, off_t addr, const void *src,
 		return -EINVAL;
 	}
 
-	rc = acquire(dev);
+	rc = acquire(dev, &dev_config->mspi_nor_cfg);
 	if (rc < 0) {
 		return rc;
 	}
@@ -207,29 +465,19 @@ static int api_write(const struct device *dev, off_t addr, const void *src,
 		uint16_t page_left = page_size - page_offset;
 		uint16_t to_write = (uint16_t)MIN(size, page_left);
 
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.tx_dummy    = 0;
-		dev_data->packet.dir       = MSPI_TX;
-
-		dev_data->xfer.addr_length = 0;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
-		dev_data->packet.num_bytes = 0;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
+		if (write_enable(dev) < 0) {
+			LOG_ERR("Write enable xfer failed: %d", rc);
 			break;
 		}
 
-		dev_data->xfer.addr_length = 4;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_PAGE_PRG;
+		command_set(dev, &dev_config->jedec_cmds->page_program);
 		dev_data->packet.address   = addr;
 		dev_data->packet.data_buf  = (uint8_t *)src;
 		dev_data->packet.num_bytes = to_write;
 		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_PAGE_PRG xfer failed: %d", rc);
+			LOG_ERR("Page program xfer failed: %d", rc);
 			break;
 		}
 
@@ -237,7 +485,7 @@ static int api_write(const struct device *dev, off_t addr, const void *src,
 		src   = (const uint8_t *)src + to_write;
 		size -= to_write;
 
-		rc = wait_until_ready(dev, K_MSEC(1));
+		rc = wait_until_ready(dev, &dev_config->mspi_nor_cfg, K_MSEC(1));
 		if (rc < 0) {
 			break;
 		}
@@ -267,38 +515,26 @@ static int api_erase(const struct device *dev, off_t addr, size_t size)
 		return -EINVAL;
 	}
 
-	rc = acquire(dev);
+	rc = acquire(dev, &dev_config->mspi_nor_init_cfg);
 	if (rc < 0) {
 		return rc;
 	}
 
 	while (size > 0) {
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.tx_dummy    = 0;
-		dev_data->packet.dir       = MSPI_TX;
-		dev_data->packet.num_bytes = 0;
-
-		dev_data->xfer.addr_length = 0;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
+		rc = write_enable(dev);
 		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
+			LOG_ERR("Write enable failed.");
 			break;
 		}
 
 		if (size == flash_size) {
 			/* Chip erase. */
-			dev_data->xfer.addr_length = 0;
-			dev_data->packet.cmd       = SPI_NOR_OCMD_CE;
-
+			command_set(dev, &dev_config->jedec_cmds->chip_erase);
 			size -= flash_size;
 		} else {
 			/* Sector erase. */
-			dev_data->xfer.addr_length = 4;
-			dev_data->packet.cmd       = SPI_NOR_OCMD_SE;
-			dev_data->packet.address   = addr;
-
+			command_set(dev, &dev_config->jedec_cmds->sector_erase);
+			dev_data->packet.address = addr;
 			addr += SPI_NOR_SECTOR_SIZE;
 			size -= SPI_NOR_SECTOR_SIZE;
 		}
@@ -310,7 +546,7 @@ static int api_erase(const struct device *dev, off_t addr, size_t size)
 			break;
 		}
 
-		rc = wait_until_ready(dev, K_MSEC(1));
+		rc = wait_until_ready(dev, &dev_config->mspi_nor_init_cfg, K_MSEC(1));
 		if (rc < 0) {
 			break;
 		}
@@ -340,19 +576,14 @@ static int read_jedec_id(const struct device *dev, uint8_t *id)
 	struct flash_mspi_nor_data *dev_data = dev->data;
 	int rc;
 
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 4;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_OCMD_READ_ID;
-	dev_data->packet.address   = 0;
+	command_set(dev, &dev_config->jedec_cmds->id);
 	dev_data->packet.data_buf  = id;
 	dev_data->packet.num_bytes = JESD216_READ_ID_LEN;
+
 	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 			     &dev_data->xfer);
 	if (rc < 0) {
-		printk("mspi_transceive() failed: %d\n", rc);
-		return rc;
+		LOG_ERR("mspi_transceive() failed: %d\n", rc);
 	}
 
 	return rc;
@@ -382,16 +613,13 @@ static int api_sfdp_read(const struct device *dev, off_t addr, void *dest,
 		return 0;
 	}
 
-	rc = acquire(dev);
+	rc = acquire(dev, dev_config->jedec_cmds->sfdp.force_single ?
+			  &dev_config->mspi_nor_init_cfg : &dev_config->mspi_nor_cfg);
 	if (rc < 0) {
 		return rc;
 	}
 
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 20;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_OCMD_READ_SFDP;
+	command_set(dev, &dev_config->jedec_cmds->sfdp);
 	dev_data->packet.address   = addr;
 	dev_data->packet.data_buf  = dest;
 	dev_data->packet.num_bytes = size;
@@ -409,9 +637,10 @@ static int api_sfdp_read(const struct device *dev, off_t addr, void *dest,
 
 static int api_read_jedec_id(const struct device *dev, uint8_t *id)
 {
-	int rc = 0;
+	const struct flash_mspi_nor_config *dev_config = dev->config;
 
-	rc = acquire(dev);
+	int rc = acquire(dev, dev_config->jedec_cmds->id.force_single ?
+			      &dev_config->mspi_nor_init_cfg : &dev_config->mspi_nor_cfg);
 	if (rc < 0) {
 		return rc;
 	}
@@ -439,77 +668,91 @@ static int dev_pm_action_cb(const struct device *dev,
 	return 0;
 }
 
+static int switch_mode(const struct device *dev, uint8_t *id)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+
+	/* For octal mode:
+	 * If the read ID does not match the one from DTS, assume the flash
+	 * is already in the Octa I/O mode, so switching it is not needed.
+	 */
+	if ((dev_config->mspi_nor_cfg.io_mode == MSPI_IO_MODE_OCTAL) &&
+	     (memcmp(id, dev_config->jedec_id, JESD216_READ_ID_LEN) != 0)) {
+		return 0;
+	}
+
+	command_set(dev, &commands[MSPI_IO_MODE_SINGLE].write_en);
+	int rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		LOG_ERR("Failed to set write enable: %d", rc);
+		return rc;
+	}
+
+	command_set(dev, &dev_config->jedec_cmds->mode_change);
+
+	/* MX25R specific:
+	 * For quad io mode above 8 MHz and single io mode above 33 MHz,
+	 * high performance mode needs to be enabled.
+	 */
+	if (((dev_config->mspi_nor_cfg.io_mode == MSPI_IO_MODE_QUAD_1_4_4) &&
+	     (dev_config->mspi_nor_cfg.freq > MHZ(8))) ||
+	    ((dev_config->mspi_nor_cfg.io_mode == MSPI_IO_MODE_SINGLE) &&
+	     (dev_config->mspi_nor_cfg.freq > MHZ(33)))) {
+		dev_data->packet.data_buf  = hp_payload;
+		dev_data->packet.num_bytes = sizeof(hp_payload);
+	} else {
+		dev_data->packet.data_buf  = (uint8_t *)&dev_config->jedec_cmds->mode_payload;
+		dev_data->packet.num_bytes = sizeof(dev_config->jedec_cmds->mode_payload);
+	}
+
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
+
+	if (rc < 0) {
+		LOG_ERR("Failed to change IO mode: %d\n", rc);
+		return rc;
+	}
+
+	return 0;
+}
+
 static int flash_chip_init(const struct device *dev)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
 	struct flash_mspi_nor_data *dev_data = dev->data;
-	struct mspi_dev_cfg init_dev_cfg = dev_config->mspi_cfg;
 	uint8_t id[JESD216_READ_ID_LEN] = {0};
 	int rc;
 
-	init_dev_cfg.freq = MHZ(1);
-	init_dev_cfg.io_mode = MSPI_IO_MODE_SINGLE;
-
 	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
-			     MSPI_DEVICE_CONFIG_ALL, &init_dev_cfg);
+			     MSPI_DEVICE_CONFIG_ALL, &dev_config->mspi_nor_init_cfg);
 	if (rc < 0) {
 		LOG_ERR("Failed to set initial device config: %d", rc);
 		return rc;
 	}
 
-	dev_data->xfer.xfer_mode  = MSPI_PIO;
-	dev_data->xfer.packets    = &dev_data->packet;
-	dev_data->xfer.num_packet = 1;
-	dev_data->xfer.timeout    = 10;
-
-	dev_data->xfer.cmd_length  = 1;
-	dev_data->xfer.addr_length = 0;
-	dev_data->xfer.tx_dummy    = 0;
-	dev_data->xfer.rx_dummy    = 0;
-
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_CMD_READ_ID;
+	command_set(dev, &commands[MSPI_IO_MODE_SINGLE].id);
 	dev_data->packet.data_buf  = id;
 	dev_data->packet.num_bytes = sizeof(id);
+
 	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 			     &dev_data->xfer);
 	if (rc < 0) {
-		LOG_ERR("Failed to read JEDEC ID in single line mode: %d", rc);
+		LOG_ERR("Failed to read JEDEC ID in initial line mode: %d", rc);
 		return rc;
 	}
 
-	/*
-	 * If the read ID does not match the one from DTS, assume the flash
-	 * is already in the Octa I/O mode, so switching it is not needed.
-	 */
-	if (memcmp(id, dev_config->jedec_id, sizeof(id)) == 0) {
-		static const uint8_t enable_sopi[] = { 0x01 };
-
-		dev_data->packet.dir       = MSPI_TX;
-		dev_data->packet.cmd       = SPI_NOR_CMD_WREN;
-		dev_data->packet.num_bytes = 0;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			LOG_ERR("SPI_NOR_CMD_WREN xfer failed: %d", rc);
-			return rc;
-		}
+	rc = switch_mode(dev, id);
 
-		dev_data->xfer.addr_length = 4;
-		dev_data->packet.cmd       = SPI_NOR_CMD_WR_CFGREG2;
-		dev_data->packet.address   = 0;
-		dev_data->packet.data_buf  = (uint8_t *)&enable_sopi;
-		dev_data->packet.num_bytes = sizeof(enable_sopi);
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
-		if (rc < 0) {
-			printk("SPI_NOR_CMD_WR_CFGREG2 xfer failed: %d\n", rc);
-			return rc;
-		}
+	if (rc < 0) {
+		LOG_ERR("Failed to switch mode: %d", rc);
+		return rc;
 	}
 
 	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
-			     MSPI_DEVICE_CONFIG_ALL, &dev_config->mspi_cfg);
+			     MSPI_DEVICE_CONFIG_ALL,
+			     dev_config->jedec_cmds->id.force_single ?
+			     &dev_config->mspi_nor_init_cfg : &dev_config->mspi_nor_cfg);
 	if (rc < 0) {
 		LOG_ERR("Failed to set device config: %d", rc);
 		return rc;
@@ -517,6 +760,7 @@ static int flash_chip_init(const struct device *dev)
 
 	rc = read_jedec_id(dev, id);
 	if (rc < 0) {
+		LOG_ERR("Failed to read JEDEC ID in final line mode: %d", rc);
 		return rc;
 	}
 
@@ -624,7 +868,20 @@ static DEVICE_API(flash, drv_api) = {
 #endif
 };
 
+#define FLASH_INITIAL_CONFIG(inst)					\
+{									\
+	.ce_num = DT_INST_PROP_OR(inst, mspi_hardware_ce_num, 0),	\
+	.freq = MIN(DT_INST_PROP(inst, mspi_max_frequency), MHZ(50)),	\
+	.io_mode = MSPI_IO_MODE_SINGLE,					\
+	.data_rate = MSPI_DATA_RATE_SINGLE,				\
+	.cpp = MSPI_CPP_MODE_0,						\
+	.endian = MSPI_XFER_BIG_ENDIAN,					\
+	.ce_polarity = MSPI_CE_ACTIVE_LOW,				\
+	.dqs_enable = false,						\
+}
+
 #define FLASH_SIZE_INST(inst) (DT_INST_PROP(inst, size) / 8)
+#define FLASH_CMDS(inst) &commands[DT_INST_ENUM_IDX(inst, mspi_io_mode)]
 
 #if defined(CONFIG_FLASH_PAGE_LAYOUT)
 BUILD_ASSERT((CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE % 4096) == 0,
@@ -651,17 +908,22 @@ BUILD_ASSERT((FLASH_SIZE_INST(inst) % CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE) ==
 #endif
 
 #define FLASH_MSPI_NOR_INST(inst)						\
-	BUILD_ASSERT(DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
-		     MSPI_IO_MODE_OCTAL,					\
-		"Only Octal I/O mode is supported for now");			\
+	BUILD_ASSERT((DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		      MSPI_IO_MODE_SINGLE) ||					\
+		     (DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		      MSPI_IO_MODE_QUAD_1_4_4) ||				\
+		     (DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		      MSPI_IO_MODE_OCTAL),					\
+		"Only 1x, 1-4-4 and 8x I/O modes are supported for now");	\
 	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);			\
 	static struct flash_mspi_nor_data dev##inst##_data;			\
 	static const struct flash_mspi_nor_config dev##inst##_config = {	\
 		.bus = DEVICE_DT_GET(DT_INST_BUS(inst)),			\
 		.flash_size = FLASH_SIZE_INST(inst),				\
 		.mspi_id = MSPI_DEVICE_ID_DT_INST(inst),			\
-		.mspi_cfg = MSPI_DEVICE_CONFIG_DT_INST(inst),			\
-		.mspi_cfg_mask = DT_PROP(DT_INST_BUS(inst),			\
+		.mspi_nor_cfg = MSPI_DEVICE_CONFIG_DT_INST(inst),		\
+		.mspi_nor_init_cfg = FLASH_INITIAL_CONFIG(inst),		\
+		.mspi_nor_cfg_mask = DT_PROP(DT_INST_BUS(inst),			\
 					 software_multiperipheral)		\
 			       ? MSPI_DEVICE_CONFIG_ALL				\
 			       : MSPI_DEVICE_CONFIG_NONE,			\
@@ -675,6 +937,7 @@ BUILD_ASSERT((FLASH_SIZE_INST(inst) % CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE) ==
 				   / 1000,))					\
 		FLASH_PAGE_LAYOUT_DEFINE(inst)					\
 		.jedec_id = DT_INST_PROP(inst, jedec_id),			\
+		.jedec_cmds = FLASH_CMDS(inst),					\
 	};									\
 	FLASH_PAGE_LAYOUT_CHECK(inst)						\
 	DEVICE_DT_INST_DEFINE(inst,						\

From 61e584957b91c603bfeeb295ae8fbded8f1e9b7f Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Fri, 14 Mar 2025 14:58:09 +0200
Subject: [PATCH 2696/2913] [nrf fromtree] modem: modem_cellular: Configurable
 MTU for CMUX

Allow configuring MTU for CMUX.
Some AT manual and specification define this as a
frame size. Linux ldattach default to 127 bytes,
3GPP TS 27.010 defaults to 31.

We should limit our CMUX frames to a size that
remote end is capable of handling.
Linux silently drops oversized frames.

Also, remove MODEM_CELLULAR_CMUX_MAX_FRAME_SIZE as
this was only limiting a buffer sizes, and resulted
CMUX frames to be capped to same value.
Use MODEM_CMUX_WORK_BUFFER_SIZE and MODEM_CMUX_MTU instead.

Also rename CONFIG_MODEM_CELLULAR_CHAT_BUFFER_SIZES to
CONFIG_MODEM_CELLULAR_CHAT_BUFFER_SIZE as it is now
only used as a Chat module. DLCI pipes use
CONFIG_MODEM_CMUX_WORK_BUFFER_SIZE.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit c78081e5cfe8412f43e8851d4060cbb4c93f5546)
---
 drivers/modem/Kconfig.cellular                | 11 ++------
 drivers/modem/modem_cellular.c                | 10 +++----
 samples/net/cellular_modem/boards/mg100.conf  |  1 -
 .../boards/nrf9160dk_nrf52840.conf            |  1 -
 .../boards/nrf9160dk_nrf9160_ns.conf          |  1 -
 .../boards/pinnacle_100_dvk.conf              |  1 -
 subsys/modem/Kconfig                          | 28 +++++++++++++++++--
 subsys/modem/modem_cmux.c                     | 21 ++++++++++++--
 tests/subsys/modem/modem_cmux/prj.conf        |  1 +
 tests/subsys/modem/modem_cmux/src/main.c      | 22 +++++++++++++++
 tests/subsys/modem/modem_cmux_pair/prj.conf   |  1 +
 11 files changed, 75 insertions(+), 23 deletions(-)

diff --git a/drivers/modem/Kconfig.cellular b/drivers/modem/Kconfig.cellular
index 5e1a38b99dd..adc66f574b7 100644
--- a/drivers/modem/Kconfig.cellular
+++ b/drivers/modem/Kconfig.cellular
@@ -42,15 +42,8 @@ config MODEM_CELLULAR_UART_BUFFER_SIZES
 	int "The UART receive and transmit buffer sizes in bytes."
 	default 512
 
-config MODEM_CELLULAR_CMUX_MAX_FRAME_SIZE
-	int "The maximum CMUX frame size in bytes."
-	default 32 if DT_HAS_U_BLOX_LARA_R6_ENABLED
-	default 128
-	help
-	  This value affects the size of buffers used to receive and transmit CMUX frames.
-
-config MODEM_CELLULAR_CHAT_BUFFER_SIZES
-	int "The size of the buffers used for the chat scripts in bytes."
+config MODEM_CELLULAR_CHAT_BUFFER_SIZE
+	int "The size of the buffer used for the chat scripts in bytes."
 	default 128
 
 config MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES
diff --git a/drivers/modem/modem_cellular.c b/drivers/modem/modem_cellular.c
index 317c76dd847..826240beab9 100644
--- a/drivers/modem/modem_cellular.c
+++ b/drivers/modem/modem_cellular.c
@@ -90,8 +90,8 @@ struct modem_cellular_data {
 
 	/* CMUX */
 	struct modem_cmux cmux;
-	uint8_t cmux_receive_buf[CONFIG_MODEM_CELLULAR_CMUX_MAX_FRAME_SIZE];
-	uint8_t cmux_transmit_buf[2 * CONFIG_MODEM_CELLULAR_CMUX_MAX_FRAME_SIZE];
+	uint8_t cmux_receive_buf[CONFIG_MODEM_CMUX_WORK_BUFFER_SIZE];
+	uint8_t cmux_transmit_buf[CONFIG_MODEM_CMUX_WORK_BUFFER_SIZE];
 
 	struct modem_cmux_dlci dlci1;
 	struct modem_cmux_dlci dlci2;
@@ -99,13 +99,13 @@ struct modem_cellular_data {
 	struct modem_pipe *dlci2_pipe;
 	/* Points to dlci2_pipe or NULL. Used for shutdown script if not NULL */
 	struct modem_pipe *cmd_pipe;
-	uint8_t dlci1_receive_buf[CONFIG_MODEM_CELLULAR_CMUX_MAX_FRAME_SIZE];
+	uint8_t dlci1_receive_buf[CONFIG_MODEM_CMUX_WORK_BUFFER_SIZE];
 	/* DLCI 2 is only used for chat scripts. */
-	uint8_t dlci2_receive_buf[CONFIG_MODEM_CELLULAR_CHAT_BUFFER_SIZES];
+	uint8_t dlci2_receive_buf[CONFIG_MODEM_CMUX_WORK_BUFFER_SIZE];
 
 	/* Modem chat */
 	struct modem_chat chat;
-	uint8_t chat_receive_buf[CONFIG_MODEM_CELLULAR_CHAT_BUFFER_SIZES];
+	uint8_t chat_receive_buf[CONFIG_MODEM_CELLULAR_CHAT_BUFFER_SIZE];
 	uint8_t *chat_delimiter;
 	uint8_t *chat_filter;
 	uint8_t *chat_argv[32];
diff --git a/samples/net/cellular_modem/boards/mg100.conf b/samples/net/cellular_modem/boards/mg100.conf
index 3b6ae6e7d57..636c416d838 100644
--- a/samples/net/cellular_modem/boards/mg100.conf
+++ b/samples/net/cellular_modem/boards/mg100.conf
@@ -1,3 +1,2 @@
 CONFIG_MODEM_HL7800=n
-CONFIG_MODEM_CELLULAR_CMUX_MAX_FRAME_SIZE=255
 CONFIG_NET_BUF_TX_COUNT=32
diff --git a/samples/net/cellular_modem/boards/nrf9160dk_nrf52840.conf b/samples/net/cellular_modem/boards/nrf9160dk_nrf52840.conf
index 78e64e0c4c9..226ce728a19 100644
--- a/samples/net/cellular_modem/boards/nrf9160dk_nrf52840.conf
+++ b/samples/net/cellular_modem/boards/nrf9160dk_nrf52840.conf
@@ -3,7 +3,6 @@ CONFIG_UART_1_ASYNC=y
 CONFIG_UART_1_INTERRUPT_DRIVEN=n
 
 # Align with the Serial LTE Modem (SLM) application.
-CONFIG_MODEM_CELLULAR_CMUX_MAX_FRAME_SIZE=1500
 CONFIG_MODEM_CELLULAR_UART_BUFFER_SIZES=6000
 
 # Print logs and printk() output on uart0.
diff --git a/samples/net/cellular_modem/boards/nrf9160dk_nrf9160_ns.conf b/samples/net/cellular_modem/boards/nrf9160dk_nrf9160_ns.conf
index c0586115e19..907cc9baed1 100644
--- a/samples/net/cellular_modem/boards/nrf9160dk_nrf9160_ns.conf
+++ b/samples/net/cellular_modem/boards/nrf9160dk_nrf9160_ns.conf
@@ -3,7 +3,6 @@ CONFIG_UART_1_ASYNC=y
 CONFIG_UART_1_INTERRUPT_DRIVEN=n
 
 # Align with the Serial LTE Modem (SLM) application.
-CONFIG_MODEM_CELLULAR_CMUX_MAX_FRAME_SIZE=1500
 CONFIG_MODEM_CELLULAR_UART_BUFFER_SIZES=6000
 
 # Prevent sockets getting offloaded to the modem.
diff --git a/samples/net/cellular_modem/boards/pinnacle_100_dvk.conf b/samples/net/cellular_modem/boards/pinnacle_100_dvk.conf
index 3b6ae6e7d57..636c416d838 100644
--- a/samples/net/cellular_modem/boards/pinnacle_100_dvk.conf
+++ b/samples/net/cellular_modem/boards/pinnacle_100_dvk.conf
@@ -1,3 +1,2 @@
 CONFIG_MODEM_HL7800=n
-CONFIG_MODEM_CELLULAR_CMUX_MAX_FRAME_SIZE=255
 CONFIG_NET_BUF_TX_COUNT=32
diff --git a/subsys/modem/Kconfig b/subsys/modem/Kconfig
index 90a4ded36e7..211c5fa084f 100644
--- a/subsys/modem/Kconfig
+++ b/subsys/modem/Kconfig
@@ -29,10 +29,34 @@ config MODEM_CMUX
 
 if MODEM_CMUX
 
+config MODEM_CMUX_DEFAULT_MTU_127
+	bool
+	default y if (DT_HAS_QUECTEL_BG95_ENABLED || DT_HAS_QUECTEL_EG25_G_ENABLED || \
+		      DT_HAS_SIMCOM_SIM7080_ENABLED || DT_HAS_U_BLOX_SARA_R4_ENABLED || \
+		      DT_HAS_U_BLOX_SARA_R5_ENABLED || DT_HAS_SWIR_HL7800_ENABLED || \
+		      DT_HAS_TELIT_ME910G1_ENABLED || DT_HAS_TELIT_ME310G1_ENABLED || \
+		      DT_HAS_SQN_GM02S_ENABLED)
+	help
+	  Use the default MTU size of 127 bytes for the CMUX module on certain modems.
+	  This must match the AT+CMUX commands in the modem_cellular driver.
+
+config MODEM_CMUX_MTU
+	int "CMUX MTU size in bytes"
+	range 16 1500
+	default 127 if MODEM_CMUX_DEFAULT_MTU_127
+	default 31
+	help
+	  Maximum Transmission Unit (MTU) size for the CMUX module.
+	  Linux ldattach defaults to 127 bytes, 3GPP TS 27.010 to 31.
+
 config MODEM_CMUX_WORK_BUFFER_SIZE
 	int "CMUX module work buffer size in bytes"
-	range 16 1500
-	default 64
+	range 23 1507
+	default 134 if MODEM_CMUX_DEFAULT_MTU_127
+	default 38
+	help
+	  Size of the work buffer used by the CMUX module.
+	  Recommended size is MODEM_CMUX_MTU + 7 (CMUX header size).
 
 module = MODEM_CMUX
 module-str = modem_cmux
diff --git a/subsys/modem/modem_cmux.c b/subsys/modem/modem_cmux.c
index 7a78b06a8f3..74542aeda66 100644
--- a/subsys/modem/modem_cmux.c
+++ b/subsys/modem/modem_cmux.c
@@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(modem_cmux, CONFIG_MODEM_CMUX_LOG_LEVEL);
 #define MODEM_CMUX_EA				(0x01)
 #define MODEM_CMUX_CR				(0x02)
 #define MODEM_CMUX_PF				(0x10)
-#define MODEM_CMUX_FRAME_SIZE_MAX		(0x08)
+#define MODEM_CMUX_FRAME_SIZE_MAX		(0x07)
 #define MODEM_CMUX_DATA_SIZE_MIN		(0x08)
 #define MODEM_CMUX_DATA_FRAME_SIZE_MIN		(MODEM_CMUX_FRAME_SIZE_MAX + \
 						 MODEM_CMUX_DATA_SIZE_MIN)
@@ -274,6 +274,7 @@ static uint16_t modem_cmux_transmit_frame(struct modem_cmux *cmux,
 
 	space = ring_buf_space_get(&cmux->transmit_rb) - MODEM_CMUX_FRAME_SIZE_MAX;
 	data_len = MIN(space, frame->data_len);
+	data_len = MIN(data_len, CONFIG_MODEM_CMUX_MTU);
 
 	/* SOF */
 	buf[0] = 0xF9;
@@ -797,6 +798,12 @@ static void modem_cmux_process_received_byte(struct modem_cmux *cmux, uint8_t by
 			break;
 		}
 
+		if (cmux->frame.data_len > CONFIG_MODEM_CMUX_MTU) {
+			LOG_ERR("Too large frame");
+			cmux->receive_state = MODEM_CMUX_RECEIVE_STATE_DROP;
+			break;
+		}
+
 		/* Check if no data field */
 		if (cmux->frame.data_len == 0) {
 			/* Await FCS */
@@ -816,6 +823,12 @@ static void modem_cmux_process_received_byte(struct modem_cmux *cmux, uint8_t by
 		/* Get last 8 bits of data length */
 		cmux->frame.data_len |= ((uint16_t)byte) << 7;
 
+		if (cmux->frame.data_len > CONFIG_MODEM_CMUX_MTU) {
+			LOG_ERR("Too large frame");
+			cmux->receive_state = MODEM_CMUX_RECEIVE_STATE_DROP;
+			break;
+		}
+
 		if (cmux->frame.data_len > cmux->receive_buf_size) {
 			LOG_ERR("Indicated frame data length %u exceeds receive buffer size %u",
 				cmux->frame.data_len, cmux->receive_buf_size);
@@ -1239,9 +1252,11 @@ void modem_cmux_init(struct modem_cmux *cmux, const struct modem_cmux_config *co
 	__ASSERT_NO_MSG(cmux != NULL);
 	__ASSERT_NO_MSG(config != NULL);
 	__ASSERT_NO_MSG(config->receive_buf != NULL);
-	__ASSERT_NO_MSG(config->receive_buf_size >= 126);
+	__ASSERT_NO_MSG(config->receive_buf_size >=
+			(CONFIG_MODEM_CMUX_MTU + MODEM_CMUX_FRAME_SIZE_MAX));
 	__ASSERT_NO_MSG(config->transmit_buf != NULL);
-	__ASSERT_NO_MSG(config->transmit_buf_size >= 148);
+	__ASSERT_NO_MSG(config->transmit_buf_size >=
+			(CONFIG_MODEM_CMUX_MTU + MODEM_CMUX_FRAME_SIZE_MAX));
 
 	memset(cmux, 0x00, sizeof(*cmux));
 	cmux->callback = config->callback;
diff --git a/tests/subsys/modem/modem_cmux/prj.conf b/tests/subsys/modem/modem_cmux/prj.conf
index 905fe8235d6..55e5ef14f85 100644
--- a/tests/subsys/modem/modem_cmux/prj.conf
+++ b/tests/subsys/modem/modem_cmux/prj.conf
@@ -5,5 +5,6 @@ CONFIG_NO_OPTIMIZATIONS=y
 
 CONFIG_MODEM_MODULES=y
 CONFIG_MODEM_CMUX=y
+CONFIG_MODEM_CMUX_MTU=64
 
 CONFIG_ZTEST=y
diff --git a/tests/subsys/modem/modem_cmux/src/main.c b/tests/subsys/modem/modem_cmux/src/main.c
index 579dbb8635e..b1adce37cc4 100644
--- a/tests/subsys/modem/modem_cmux/src/main.c
+++ b/tests/subsys/modem/modem_cmux/src/main.c
@@ -27,6 +27,8 @@
 #define EVENT_CMUX_DLCI1_CLOSED		BIT(7)
 #define EVENT_CMUX_DLCI2_CLOSED		BIT(8)
 #define EVENT_CMUX_DISCONNECTED		BIT(9)
+#define CMUX_BASIC_HRD_SMALL_SIZE	6
+#define CMUX_BASIC_HRD_LARGE_SIZE	7
 
 /*************************************************************************************************/
 /*                                          Instances                                            */
@@ -195,6 +197,8 @@ static uint8_t cmux_frame_data_dlci2_ppp_18[] = {0x7E, 0xFF, 0x7D, 0x23, 0xC0, 0
 						 0x7D, 0x22, 0x7D, 0x21, 0x7D, 0x20,
 						 0x7D, 0x24, 0x7D, 0x3C, 0x90, 0x7E};
 
+static uint8_t cmux_frame_data_large[127] = { [0 ... 126] = 0xAA };
+
 const static struct modem_backend_mock_transaction transaction_control_cld = {
 	.get = cmux_frame_control_cld_cmd,
 	.get_size = sizeof(cmux_frame_control_cld_cmd),
@@ -864,4 +868,22 @@ ZTEST(modem_cmux, test_modem_drop_frames_with_invalid_length)
 		     "Incorrect data received");
 }
 
+ZTEST(modem_cmux, test_modem_cmux_split_large_data)
+{
+	int ret;
+	uint32_t events;
+
+	ret = modem_pipe_transmit(dlci2_pipe, cmux_frame_data_large,
+				  sizeof(cmux_frame_data_large));
+	zassert_true(ret == CONFIG_MODEM_CMUX_MTU, "Failed to split large data %d", ret);
+
+	events = k_event_wait(&cmux_event, EVENT_CMUX_DLCI2_TRANSMIT_IDLE, false, K_MSEC(200));
+	zassert_equal(events, EVENT_CMUX_DLCI2_TRANSMIT_IDLE,
+		      "Transmit idle event not received for DLCI2 pipe");
+
+	ret = modem_backend_mock_get(&bus_mock, buffer2, sizeof(buffer2));
+	zassert_true(ret == CONFIG_MODEM_CMUX_MTU + CMUX_BASIC_HRD_SMALL_SIZE,
+		     "Incorrect number of bytes transmitted %d", ret);
+}
+
 ZTEST_SUITE(modem_cmux, NULL, test_modem_cmux_setup, test_modem_cmux_before, NULL, NULL);
diff --git a/tests/subsys/modem/modem_cmux_pair/prj.conf b/tests/subsys/modem/modem_cmux_pair/prj.conf
index bf21fcb42ac..57838ca67e3 100644
--- a/tests/subsys/modem/modem_cmux_pair/prj.conf
+++ b/tests/subsys/modem/modem_cmux_pair/prj.conf
@@ -5,5 +5,6 @@ CONFIG_NO_OPTIMIZATIONS=y
 
 CONFIG_MODEM_MODULES=y
 CONFIG_MODEM_CMUX=y
+CONFIG_MODEM_CMUX_MTU=64
 
 CONFIG_ZTEST=y

From 89fe459c07368c8cefc16eb8e49858a091390507 Mon Sep 17 00:00:00 2001
From: Seppo Takalo <seppo.takalo@nordicsemi.no>
Date: Tue, 18 Mar 2025 16:39:59 +0200
Subject: [PATCH 2697/2913] [nrf fromtree] modem: cmux: Do not return error on
 low buffer space

If we end up writing zero bytes to cmux output, we can return
zero instead of -ENOMEM as it would break various modules when
using small buffers. For example modem_chat.c does not tolerate
-ENOMEM but handles zero OK.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
(cherry picked from commit 15b0f9033b3e5f820547fa291d72c23304aa0c7c)
---
 subsys/modem/modem_cmux.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/subsys/modem/modem_cmux.c b/subsys/modem/modem_cmux.c
index 74542aeda66..48498f5b72c 100644
--- a/subsys/modem/modem_cmux.c
+++ b/subsys/modem/modem_cmux.c
@@ -359,15 +359,15 @@ static int16_t modem_cmux_transmit_data_frame(struct modem_cmux *cmux,
 	space = ring_buf_space_get(&cmux->transmit_rb);
 
 	/*
-	 * Two command frames are reserved for command channel, and we shall prefer
+	 * One command frame is reserved for command channel, and we shall prefer
 	 * waiting for more than MODEM_CMUX_DATA_FRAME_SIZE_MIN bytes available in the
 	 * transmit buffer rather than transmitting a few bytes at a time. This avoids
 	 * excessive wrapping overhead, since transmitting a single byte will require 8
 	 * bytes of wrapping.
 	 */
-	if (space < ((MODEM_CMUX_CMD_FRAME_SIZE_MAX * 2) + MODEM_CMUX_DATA_FRAME_SIZE_MIN)) {
+	if (space < (MODEM_CMUX_CMD_FRAME_SIZE_MAX + MODEM_CMUX_DATA_FRAME_SIZE_MIN)) {
 		k_mutex_unlock(&cmux->transmit_rb_lock);
-		return -ENOMEM;
+		return 0;
 	}
 
 	modem_cmux_log_transmit_frame(frame);

From be4499b5dcb7737877643967d93c1e73c07d9460 Mon Sep 17 00:00:00 2001
From: Pisit Sawangvonganan <pisit@ndrsolution.com>
Date: Fri, 3 Jan 2025 15:16:31 +0700
Subject: [PATCH 2698/2913] [nrf fromtree] bluetooth: shell: move
 `bt_shell_private.c` to `common` folder

Relocated `bt_shell_private.c` to the `common` folder to enable
independent use between `BT_SHELL` and `BT_MESH_SHELL`.

Signed-off-by: Pisit Sawangvonganan <pisit@ndrsolution.com>
(cherry picked from commit eeda631ee582355f9ea4368a465e36c38423ad83)
---
 subsys/bluetooth/Kconfig                                   | 1 +
 subsys/bluetooth/common/CMakeLists.txt                     | 1 +
 subsys/bluetooth/common/Kconfig                            | 4 ++++
 subsys/bluetooth/{host/shell => common}/bt_shell_private.c | 0
 subsys/bluetooth/{host/shell => common}/bt_shell_private.h | 0
 subsys/bluetooth/host/shell/CMakeLists.txt                 | 5 +----
 subsys/bluetooth/host/shell/bt.c                           | 2 +-
 subsys/bluetooth/host/shell/cs.c                           | 2 +-
 subsys/bluetooth/host/shell/gatt.c                         | 2 +-
 subsys/bluetooth/host/shell/iso.c                          | 2 +-
 subsys/bluetooth/host/shell/l2cap.c                        | 2 +-
 11 files changed, 12 insertions(+), 9 deletions(-)
 rename subsys/bluetooth/{host/shell => common}/bt_shell_private.c (100%)
 rename subsys/bluetooth/{host/shell => common}/bt_shell_private.h (100%)

diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig
index 93c867547a0..f61598d4194 100644
--- a/subsys/bluetooth/Kconfig
+++ b/subsys/bluetooth/Kconfig
@@ -235,6 +235,7 @@ rsource "Kconfig.logging"
 config BT_SHELL
 	bool "Bluetooth shell"
 	select SHELL
+	select BT_PRIVATE_SHELL
 	select BT_TICKER_NEXT_SLOT_GET if BT_LL_SW_SPLIT
 	help
 	  Activate shell module that provides Bluetooth commands to the
diff --git a/subsys/bluetooth/common/CMakeLists.txt b/subsys/bluetooth/common/CMakeLists.txt
index 2138b23c7d5..d088d366cff 100644
--- a/subsys/bluetooth/common/CMakeLists.txt
+++ b/subsys/bluetooth/common/CMakeLists.txt
@@ -7,5 +7,6 @@ zephyr_library_sources(dummy.c)
 zephyr_library_sources(bt_str.c)
 
 zephyr_library_sources_ifdef(CONFIG_BT_RPA   rpa.c)
+zephyr_library_sources_ifdef(CONFIG_BT_PRIVATE_SHELL bt_shell_private.c)
 
 zephyr_library_link_libraries(subsys__bluetooth)
diff --git a/subsys/bluetooth/common/Kconfig b/subsys/bluetooth/common/Kconfig
index afba64312ef..a9c17ebceec 100644
--- a/subsys/bluetooth/common/Kconfig
+++ b/subsys/bluetooth/common/Kconfig
@@ -244,6 +244,10 @@ config BT_RPA
 	bool
 	depends on BT_HOST_CRYPTO || BT_CTLR_CRYPTO
 
+config BT_PRIVATE_SHELL
+	bool
+	default n
+
 config BT_ASSERT
 	bool "Custom Bluetooth assert implementation"
 	default y
diff --git a/subsys/bluetooth/host/shell/bt_shell_private.c b/subsys/bluetooth/common/bt_shell_private.c
similarity index 100%
rename from subsys/bluetooth/host/shell/bt_shell_private.c
rename to subsys/bluetooth/common/bt_shell_private.c
diff --git a/subsys/bluetooth/host/shell/bt_shell_private.h b/subsys/bluetooth/common/bt_shell_private.h
similarity index 100%
rename from subsys/bluetooth/host/shell/bt_shell_private.h
rename to subsys/bluetooth/common/bt_shell_private.h
diff --git a/subsys/bluetooth/host/shell/CMakeLists.txt b/subsys/bluetooth/host/shell/CMakeLists.txt
index 73ff18086f3..98f1e6ac2a5 100644
--- a/subsys/bluetooth/host/shell/CMakeLists.txt
+++ b/subsys/bluetooth/host/shell/CMakeLists.txt
@@ -1,10 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_library()
-zephyr_library_sources(
-  bt.c
-  bt_shell_private.c
-  )
+zephyr_library_sources(bt.c)
 zephyr_library_sources_ifdef(CONFIG_BT_CONN gatt.c)
 zephyr_library_sources_ifdef(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL l2cap.c)
 zephyr_library_sources_ifdef(CONFIG_BT_ISO iso.c)
diff --git a/subsys/bluetooth/host/shell/bt.c b/subsys/bluetooth/host/shell/bt.c
index 50847d3c7b9..45a58603445 100644
--- a/subsys/bluetooth/host/shell/bt.c
+++ b/subsys/bluetooth/host/shell/bt.c
@@ -35,7 +35,7 @@
 #include <zephyr/bluetooth/ead.h>
 
 #include <zephyr/shell/shell.h>
-#include "bt_shell_private.h"
+#include "common/bt_shell_private.h"
 
 #include "audio/shell/audio.h"
 #include "controller/ll_sw/shell/ll.h"
diff --git a/subsys/bluetooth/host/shell/cs.c b/subsys/bluetooth/host/shell/cs.c
index 87ce5b082fe..adacd94bca9 100644
--- a/subsys/bluetooth/host/shell/cs.c
+++ b/subsys/bluetooth/host/shell/cs.c
@@ -25,7 +25,7 @@
 #include <errno.h>
 
 #include "host/shell/bt.h"
-#include "host/shell/bt_shell_private.h"
+#include "common/bt_shell_private.h"
 
 static int check_cs_sync_antenna_selection_input(uint16_t input)
 {
diff --git a/subsys/bluetooth/host/shell/gatt.c b/subsys/bluetooth/host/shell/gatt.c
index 080361cc29b..35543a0e285 100644
--- a/subsys/bluetooth/host/shell/gatt.c
+++ b/subsys/bluetooth/host/shell/gatt.c
@@ -27,7 +27,7 @@
 #include <zephyr/shell/shell.h>
 
 #include "host/shell/bt.h"
-#include "host/shell/bt_shell_private.h"
+#include "common/bt_shell_private.h"
 
 #if defined(CONFIG_BT_GATT_CLIENT) || defined(CONFIG_BT_GATT_DYNAMIC_DB)
 extern uint8_t selected_id;
diff --git a/subsys/bluetooth/host/shell/iso.c b/subsys/bluetooth/host/shell/iso.c
index 43e8fb80c26..3b6340c5e9c 100644
--- a/subsys/bluetooth/host/shell/iso.c
+++ b/subsys/bluetooth/host/shell/iso.c
@@ -23,7 +23,7 @@
 #include <zephyr/bluetooth/iso.h>
 
 #include "host/shell/bt.h"
-#include "host/shell/bt_shell_private.h"
+#include "common/bt_shell_private.h"
 
 #if defined(CONFIG_BT_ISO_TX)
 #define DEFAULT_IO_QOS                                                                             \
diff --git a/subsys/bluetooth/host/shell/l2cap.c b/subsys/bluetooth/host/shell/l2cap.c
index 48c568c11a0..07fc465163c 100644
--- a/subsys/bluetooth/host/shell/l2cap.c
+++ b/subsys/bluetooth/host/shell/l2cap.c
@@ -30,7 +30,7 @@
 #include <zephyr/shell/shell.h>
 
 #include "host/shell/bt.h"
-#include "host/shell/bt_shell_private.h"
+#include "common/bt_shell_private.h"
 
 #define CREDITS			10
 #define DATA_MTU		(23 * CREDITS)

From 191d7cd174d2d0b72039c74101b31c1c956d74c2 Mon Sep 17 00:00:00 2001
From: Pisit Sawangvonganan <pisit@ndrsolution.com>
Date: Fri, 3 Jan 2025 15:26:34 +0700
Subject: [PATCH 2699/2913] [nrf fromtree] bluetooth: audio: shell: eliminate
 `ctx_shell` usage

This change aims to eliminate the dependency on `ctx_shell` in
the Bluetooth `audio/shell/*`, making the code more maintainable.
Replaced `shell_*` functions that depended on `ctx_shell` with
the appropriate `bt_shell_*` functions.

Signed-off-by: Pisit Sawangvonganan <pisit@ndrsolution.com>
(cherry picked from commit f1516c960aa30558b9b35baa6c934eaa895f1e28)
---
 subsys/bluetooth/audio/shell/audio.h          | 355 +++++++++---------
 subsys/bluetooth/audio/shell/bap.c            | 316 ++++++++--------
 .../audio/shell/bap_broadcast_assistant.c     | 108 +++---
 .../audio/shell/bap_scan_delegator.c          |  71 ++--
 subsys/bluetooth/audio/shell/cap_acceptor.c   |  18 +-
 subsys/bluetooth/audio/shell/cap_commander.c  |  44 +--
 subsys/bluetooth/audio/shell/cap_initiator.c  |  53 ++-
 .../audio/shell/csip_set_coordinator.c        |  54 ++-
 .../bluetooth/audio/shell/csip_set_member.c   |  18 +-
 subsys/bluetooth/audio/shell/gmap.c           |  15 +-
 subsys/bluetooth/audio/shell/has.c            |   3 +-
 subsys/bluetooth/audio/shell/has_client.c     |  27 +-
 subsys/bluetooth/audio/shell/mcc.c            | 208 +++++-----
 .../bluetooth/audio/shell/media_controller.c  | 203 +++++-----
 subsys/bluetooth/audio/shell/micp_mic_ctlr.c  |  92 ++---
 subsys/bluetooth/audio/shell/micp_mic_dev.c   |  52 ++-
 subsys/bluetooth/audio/shell/mpl.c            |   4 -
 subsys/bluetooth/audio/shell/pbp.c            |   6 +-
 subsys/bluetooth/audio/shell/tmap.c           |   9 +-
 subsys/bluetooth/audio/shell/vcp_vol_ctlr.c   | 147 +++-----
 subsys/bluetooth/audio/shell/vcp_vol_rend.c   |  80 ++--
 21 files changed, 846 insertions(+), 1037 deletions(-)

diff --git a/subsys/bluetooth/audio/shell/audio.h b/subsys/bluetooth/audio/shell/audio.h
index a02724bd75f..82865453eca 100644
--- a/subsys/bluetooth/audio/shell/audio.h
+++ b/subsys/bluetooth/audio/shell/audio.h
@@ -33,6 +33,7 @@
 #include <zephyr/sys_clock.h>
 
 #include "host/shell/bt.h"
+#include "common/bt_shell_private.h"
 
 #define SHELL_PRINT_INDENT_LEVEL_SIZE 2
 #define MAX_CODEC_FRAMES_PER_SDU      4U
@@ -233,21 +234,19 @@ int cap_ac_unicast(const struct shell *sh, const struct bap_unicast_ac_param *pa
 #endif /* CONFIG_BT_BAP_UNICAST_CLIENT */
 #endif /* CONFIG_BT_BAP_UNICAST */
 
-static inline void print_qos(const struct shell *sh, const struct bt_bap_qos_cfg *qos)
+static inline void print_qos(const struct bt_bap_qos_cfg *qos)
 {
 #if defined(CONFIG_BT_BAP_BROADCAST_SOURCE) || defined(CONFIG_BT_BAP_UNICAST)
-	shell_print(sh,
-		    "QoS: interval %u framing 0x%02x phy 0x%02x sdu %u rtn %u latency %u pd %u",
-		    qos->interval, qos->framing, qos->phy, qos->sdu, qos->rtn, qos->latency,
-		    qos->pd);
+	bt_shell_print("QoS: interval %u framing 0x%02x phy 0x%02x sdu %u rtn %u latency %u pd %u",
+		       qos->interval, qos->framing, qos->phy, qos->sdu, qos->rtn, qos->latency,
+		       qos->pd);
 #else
-	shell_print(sh, "QoS: interval %u framing 0x%02x phy 0x%02x sdu %u rtn %u pd %u",
-		    qos->interval, qos->framing, qos->phy, qos->sdu, qos->rtn, qos->pd);
+	bt_shell_print("QoS: interval %u framing 0x%02x phy 0x%02x sdu %u rtn %u pd %u",
+		       qos->interval, qos->framing, qos->phy, qos->sdu, qos->rtn, qos->pd);
 #endif /* CONFIG_BT_BAP_BROADCAST_SOURCE || CONFIG_BT_BAP_UNICAST */
 }
 
 struct print_ltv_info {
-	const struct shell *sh;
 	size_t indent;
 	size_t cnt;
 };
@@ -257,27 +256,25 @@ static bool print_ltv_elem(struct bt_data *data, void *user_data)
 	struct print_ltv_info *ltv_info = user_data;
 	const size_t elem_indent = ltv_info->indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 
-	shell_print(ltv_info->sh, "%*s#%zu: type 0x%02x value_len %u", ltv_info->indent, "",
-		    ltv_info->cnt, data->type, data->data_len);
+	bt_shell_print("%*s#%zu: type 0x%02x value_len %u", ltv_info->indent, "",
+		       ltv_info->cnt, data->type, data->data_len);
 
-	shell_fprintf(ltv_info->sh, SHELL_NORMAL, "%*s", elem_indent, "");
+	bt_shell_fprintf_print("%*s", elem_indent, "");
 
 	for (uint8_t i = 0U; i < data->data_len; i++) {
-		shell_fprintf(ltv_info->sh, SHELL_NORMAL, "%02X", data->data[i]);
+		bt_shell_fprintf_print("%02X", data->data[i]);
 	}
 
-	shell_fprintf(ltv_info->sh, SHELL_NORMAL, "\n");
+	bt_shell_fprintf_print("\n");
 
 	ltv_info->cnt++;
 
 	return true;
 }
 
-static void print_ltv_array(const struct shell *sh, size_t indent, const uint8_t *ltv_data,
-			    size_t ltv_data_len)
+static void print_ltv_array(size_t indent, const uint8_t *ltv_data, size_t ltv_data_len)
 {
 	struct print_ltv_info ltv_info = {
-		.sh = sh,
 		.cnt = 0U,
 		.indent = indent,
 	};
@@ -285,14 +282,13 @@ static void print_ltv_array(const struct shell *sh, size_t indent, const uint8_t
 
 	err = bt_audio_data_parse(ltv_data, ltv_data_len, print_ltv_elem, &ltv_info);
 	if (err != 0 && err != -ECANCELED) {
-		shell_error(sh, "%*sInvalid LTV data: %d", indent, "", err);
+		bt_shell_error("%*sInvalid LTV data: %d", indent, "", err);
 	}
 }
 
-static inline void print_codec_meta_pref_context(const struct shell *sh, size_t indent,
-						 enum bt_audio_context context)
+static inline void print_codec_meta_pref_context(size_t indent, enum bt_audio_context context)
 {
-	shell_print(sh, "%*sPreferred audio contexts:", indent, "");
+	bt_shell_print("%*sPreferred audio contexts:", indent, "");
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 
@@ -301,16 +297,15 @@ static inline void print_codec_meta_pref_context(const struct shell *sh, size_t
 		const uint16_t bit_val = BIT(i);
 
 		if (context & bit_val) {
-			shell_print(sh, "%*s%s (0x%04X)", indent, "",
-				    bt_audio_context_bit_to_str(bit_val), bit_val);
+			bt_shell_print("%*s%s (0x%04X)", indent, "",
+				       bt_audio_context_bit_to_str(bit_val), bit_val);
 		}
 	}
 }
 
-static inline void print_codec_meta_stream_context(const struct shell *sh, size_t indent,
-						   enum bt_audio_context context)
+static inline void print_codec_meta_stream_context(size_t indent, enum bt_audio_context context)
 {
-	shell_print(sh, "%*sStreaming audio contexts:", indent, "");
+	bt_shell_print("%*sStreaming audio contexts:", indent, "");
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 
@@ -319,121 +314,118 @@ static inline void print_codec_meta_stream_context(const struct shell *sh, size_
 		const uint16_t bit_val = BIT(i);
 
 		if (context & bit_val) {
-			shell_print(sh, "%*s%s (0x%04X)", indent, "",
-				    bt_audio_context_bit_to_str(bit_val), bit_val);
+			bt_shell_print("%*s%s (0x%04X)", indent, "",
+				       bt_audio_context_bit_to_str(bit_val), bit_val);
 		}
 	}
 }
 
-static inline void print_codec_meta_program_info(const struct shell *sh, size_t indent,
-						 const uint8_t *program_info,
+static inline void print_codec_meta_program_info(size_t indent, const uint8_t *program_info,
 						 uint8_t program_info_len)
 {
-	shell_print(sh, "%*sProgram info:", indent, "");
+	bt_shell_print("%*sProgram info:", indent, "");
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 
-	shell_fprintf(sh, SHELL_NORMAL, "%*s", indent, "");
+	bt_shell_fprintf_print("%*s", indent, "");
 	for (uint8_t i = 0U; i < program_info_len; i++) {
-		shell_fprintf(sh, SHELL_NORMAL, "%c", (char)program_info[i]);
+		bt_shell_fprintf_print("%c", (char)program_info[i]);
 	}
 
-	shell_fprintf(sh, SHELL_NORMAL, "\n");
+	bt_shell_fprintf_print("\n");
 }
 
-static inline void print_codec_meta_language(const struct shell *sh, size_t indent,
+static inline void print_codec_meta_language(size_t indent,
 					     const uint8_t lang[BT_AUDIO_LANG_SIZE])
 {
-	shell_print(sh, "%*sLanguage: %c%c%c", indent, "", (char)lang[0], (char)lang[1],
-		    (char)lang[2]);
+	bt_shell_print("%*sLanguage: %c%c%c", indent, "", (char)lang[0], (char)lang[1],
+		       (char)lang[2]);
 }
 
-static inline void print_codec_meta_ccid_list(const struct shell *sh, size_t indent,
-					      const uint8_t *ccid_list, uint8_t ccid_list_len)
+static inline void print_codec_meta_ccid_list(size_t indent, const uint8_t *ccid_list,
+					      uint8_t ccid_list_len)
 {
-	shell_print(sh, "%*sCCID list:", indent, "");
+	bt_shell_print("%*sCCID list:", indent, "");
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 
 	/* There can be up to 16 bits set in the field */
 	for (uint8_t i = 0U; i < ccid_list_len; i++) {
-		shell_print(sh, "%*s0x%02X ", indent, "", ccid_list[i]);
+		bt_shell_print("%*s0x%02X ", indent, "", ccid_list[i]);
 	}
 }
 
-static inline void print_codec_meta_parental_rating(const struct shell *sh, size_t indent,
+static inline void print_codec_meta_parental_rating(size_t indent,
 						    enum bt_audio_parental_rating parental_rating)
 {
-	shell_print(sh, "%*sRating: %s (0x%02X)", indent, "",
-		    bt_audio_parental_rating_to_str(parental_rating), (uint8_t)parental_rating);
+	bt_shell_print("%*sRating: %s (0x%02X)", indent, "",
+		       bt_audio_parental_rating_to_str(parental_rating), (uint8_t)parental_rating);
 }
 
-static inline void print_codec_meta_program_info_uri(const struct shell *sh, size_t indent,
+static inline void print_codec_meta_program_info_uri(size_t indent,
 						     const uint8_t *program_info_uri,
 						     uint8_t program_info_uri_len)
 {
-	shell_print(sh, "%*sProgram info URI:", indent, "");
+	bt_shell_print("%*sProgram info URI:", indent, "");
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 
-	shell_fprintf(sh, SHELL_NORMAL, "%*s", indent, "");
+	bt_shell_fprintf_print("%*s", indent, "");
 
 	for (uint8_t i = 0U; i < program_info_uri_len; i++) {
-		shell_fprintf(sh, SHELL_NORMAL, "%c", (char)program_info_uri[i]);
+		bt_shell_fprintf_print("%c", (char)program_info_uri[i]);
 	}
 
-	shell_fprintf(sh, SHELL_NORMAL, "\n");
+	bt_shell_fprintf_print("\n");
 }
 
-static inline void print_codec_meta_audio_active_state(const struct shell *sh, size_t indent,
+static inline void print_codec_meta_audio_active_state(size_t indent,
 						       enum bt_audio_active_state state)
 {
-	shell_print(sh, "%*sAudio active state: %s (0x%02X)", indent, "",
-		    bt_audio_active_state_to_str(state), (uint8_t)state);
+	bt_shell_print("%*sAudio active state: %s (0x%02X)", indent, "",
+		       bt_audio_active_state_to_str(state), (uint8_t)state);
 }
 
-static inline void print_codec_meta_bcast_audio_immediate_rend_flag(const struct shell *sh,
-								    size_t indent)
+static inline void print_codec_meta_bcast_audio_immediate_rend_flag(size_t indent)
 {
-	shell_print(sh, "%*sBroadcast audio immediate rendering flag set", indent, "");
+	bt_shell_print("%*sBroadcast audio immediate rendering flag set", indent, "");
 }
 
-static inline void print_codec_meta_extended(const struct shell *sh, size_t indent,
-					     const uint8_t *extended_meta, size_t extended_meta_len)
+static inline void print_codec_meta_extended(size_t indent, const uint8_t *extended_meta,
+					     size_t extended_meta_len)
 {
-	shell_print(sh, "%*sExtended metadata:", indent, "");
+	bt_shell_print("%*sExtended metadata:", indent, "");
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 
-	shell_fprintf(sh, SHELL_NORMAL, "%*s", indent, "");
+	bt_shell_fprintf_print("%*s", indent, "");
 
 	for (uint8_t i = 0U; i < extended_meta_len; i++) {
-		shell_fprintf(sh, SHELL_NORMAL, "%u", (uint8_t)extended_meta[i]);
+		bt_shell_fprintf_print("%u", (uint8_t)extended_meta[i]);
 	}
 
-	shell_fprintf(sh, SHELL_NORMAL, "\n");
+	bt_shell_fprintf_print("\n");
 }
 
-static inline void print_codec_meta_vendor(const struct shell *sh, size_t indent,
-					   const uint8_t *vendor_meta, size_t vender_meta_len)
+static inline void print_codec_meta_vendor(size_t indent, const uint8_t *vendor_meta,
+					   size_t vender_meta_len)
 {
-	shell_print(sh, "%*sVendor metadata:", indent, "");
+	bt_shell_print("%*sVendor metadata:", indent, "");
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 
-	shell_fprintf(sh, SHELL_NORMAL, "%*s", indent, "");
+	bt_shell_fprintf_print("%*s", indent, "");
 
 	for (uint8_t i = 0U; i < vender_meta_len; i++) {
-		shell_fprintf(sh, SHELL_NORMAL, "%u", (uint8_t)vendor_meta[i]);
+		bt_shell_fprintf_print("%u", (uint8_t)vendor_meta[i]);
 	}
 
-	shell_fprintf(sh, SHELL_NORMAL, "\n");
+	bt_shell_fprintf_print("\n");
 }
 
-static inline void print_codec_cap_freq(const struct shell *sh, size_t indent,
-					enum bt_audio_codec_cap_freq freq)
+static inline void print_codec_cap_freq(size_t indent, enum bt_audio_codec_cap_freq freq)
 {
-	shell_print(sh, "%*sSupported sampling frequencies:", indent, "");
+	bt_shell_print("%*sSupported sampling frequencies:", indent, "");
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 	/* There can be up to 16 bits set in the field */
@@ -441,16 +433,16 @@ static inline void print_codec_cap_freq(const struct shell *sh, size_t indent,
 		const uint16_t bit_val = BIT(i);
 
 		if (freq & bit_val) {
-			shell_print(sh, "%*s%s (0x%04X)", indent, "",
-				    bt_audio_codec_cap_freq_bit_to_str(bit_val), bit_val);
+			bt_shell_print("%*s%s (0x%04X)", indent, "",
+				       bt_audio_codec_cap_freq_bit_to_str(bit_val), bit_val);
 		}
 	}
 }
 
-static inline void print_codec_cap_frame_dur(const struct shell *sh, size_t indent,
+static inline void print_codec_cap_frame_dur(size_t indent,
 					     enum bt_audio_codec_cap_frame_dur frame_dur)
 {
-	shell_print(sh, "%*sSupported frame durations:", indent, "");
+	bt_shell_print("%*sSupported frame durations:", indent, "");
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 	/* There can be up to 8 bits set in the field */
@@ -458,16 +450,16 @@ static inline void print_codec_cap_frame_dur(const struct shell *sh, size_t inde
 		const uint8_t bit_val = BIT(i);
 
 		if (frame_dur & bit_val) {
-			shell_print(sh, "%*s%s (0x%02X)", indent, "",
-				    bt_audio_codec_cap_frame_dur_bit_to_str(bit_val), bit_val);
+			bt_shell_print("%*s%s (0x%02X)", indent, "",
+				       bt_audio_codec_cap_frame_dur_bit_to_str(bit_val), bit_val);
 		}
 	}
 }
 
-static inline void print_codec_cap_chan_count(const struct shell *sh, size_t indent,
+static inline void print_codec_cap_chan_count(size_t indent,
 					      enum bt_audio_codec_cap_chan_count chan_count)
 {
-	shell_print(sh, "%*sSupported channel counts:", indent, "");
+	bt_shell_print("%*sSupported channel counts:", indent, "");
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 	/* There can be up to 8 bits set in the field */
@@ -475,82 +467,80 @@ static inline void print_codec_cap_chan_count(const struct shell *sh, size_t ind
 		const uint8_t bit_val = BIT(i);
 
 		if (chan_count & bit_val) {
-			shell_print(sh, "%*s%s (0x%02X)", indent, "",
-				    bt_audio_codec_cap_chan_count_bit_to_str(bit_val), bit_val);
+			bt_shell_print("%*s%s (0x%02X)", indent, "",
+				       bt_audio_codec_cap_chan_count_bit_to_str(bit_val), bit_val);
 		}
 	}
 }
 
 static inline void print_codec_cap_octets_per_codec_frame(
-	const struct shell *sh, size_t indent,
-	const struct bt_audio_codec_octets_per_codec_frame *codec_frame)
+	size_t indent, const struct bt_audio_codec_octets_per_codec_frame *codec_frame)
 {
-	shell_print(sh, "%*sSupported octets per codec frame counts:", indent, "");
+	bt_shell_print("%*sSupported octets per codec frame counts:", indent, "");
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
-	shell_print(sh, "%*sMin: %u", indent, "", codec_frame->min);
-	shell_print(sh, "%*sMax: %u", indent, "", codec_frame->max);
+	bt_shell_print("%*sMin: %u", indent, "", codec_frame->min);
+	bt_shell_print("%*sMax: %u", indent, "", codec_frame->max);
 }
 
-static inline void print_codec_cap_max_codec_frames_per_sdu(const struct shell *sh, size_t indent,
+static inline void print_codec_cap_max_codec_frames_per_sdu(size_t indent,
 							    uint8_t codec_frames_per_sdu)
 {
-	shell_print(sh, "%*sSupported max codec frames per SDU: %u", indent, "",
-		    codec_frames_per_sdu);
+	bt_shell_print("%*sSupported max codec frames per SDU: %u", indent, "",
+		       codec_frames_per_sdu);
 }
 
-static inline void print_codec_cap(const struct shell *sh, size_t indent,
-				   const struct bt_audio_codec_cap *codec_cap)
+static inline void print_codec_cap(size_t indent, const struct bt_audio_codec_cap *codec_cap)
 {
-	shell_print(sh, "%*scodec cap id 0x%02x cid 0x%04x vid 0x%04x", indent, "", codec_cap->id,
-		    codec_cap->cid, codec_cap->vid);
+	bt_shell_print("%*scodec cap id 0x%02x cid 0x%04x vid 0x%04x", indent, "", codec_cap->id,
+		       codec_cap->cid, codec_cap->vid);
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 
 #if CONFIG_BT_AUDIO_CODEC_CAP_MAX_DATA_SIZE > 0
-	shell_print(sh, "%*sCodec specific capabilities:", indent, "");
+	bt_shell_print("%*sCodec specific capabilities:", indent, "");
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 	if (codec_cap->data_len == 0U) {
-		shell_print(sh, "%*sNone", indent, "");
+		bt_shell_print("%*sNone", indent, "");
 	} else if (codec_cap->id == BT_HCI_CODING_FORMAT_LC3) {
 		struct bt_audio_codec_octets_per_codec_frame codec_frame;
 		int ret;
 
 		ret = bt_audio_codec_cap_get_freq(codec_cap);
 		if (ret >= 0) {
-			print_codec_cap_freq(sh, indent, (enum bt_audio_codec_cap_freq)ret);
+			print_codec_cap_freq(indent, (enum bt_audio_codec_cap_freq)ret);
 		}
 
 		ret = bt_audio_codec_cap_get_frame_dur(codec_cap);
 		if (ret >= 0) {
-			print_codec_cap_frame_dur(sh, indent,
+			print_codec_cap_frame_dur(indent,
 						  (enum bt_audio_codec_cap_frame_dur)ret);
 		}
 
 		ret = bt_audio_codec_cap_get_supported_audio_chan_counts(codec_cap, true);
 		if (ret >= 0) {
-			print_codec_cap_chan_count(sh, indent,
+			print_codec_cap_chan_count(indent,
 						   (enum bt_audio_codec_cap_chan_count)ret);
 		}
 
 		ret = bt_audio_codec_cap_get_octets_per_frame(codec_cap, &codec_frame);
 		if (ret >= 0) {
-			print_codec_cap_octets_per_codec_frame(sh, indent, &codec_frame);
+			print_codec_cap_octets_per_codec_frame(indent, &codec_frame);
 		}
 
 		ret = bt_audio_codec_cap_get_max_codec_frames_per_sdu(codec_cap, true);
 		if (ret >= 0) {
-			print_codec_cap_max_codec_frames_per_sdu(sh, indent, (uint8_t)ret);
+			print_codec_cap_max_codec_frames_per_sdu(indent, (uint8_t)ret);
 		}
 	} else { /* If not LC3, we cannot assume it's LTV */
-		shell_fprintf(sh, SHELL_NORMAL, "%*s", indent, "");
+		bt_shell_fprintf_print("%*s", indent, "");
 
 		for (uint8_t i = 0U; i < codec_cap->data_len; i++) {
-			shell_fprintf(sh, SHELL_NORMAL, "%*s%02X", indent, "", codec_cap->data[i]);
+			bt_shell_fprintf_print("%*s%02X", indent, "", codec_cap->data[i]);
 		}
 
-		shell_fprintf(sh, SHELL_NORMAL, "\n");
+		bt_shell_fprintf_print("\n");
 	}
 
 	/* Reduce for metadata*/
@@ -558,169 +548,166 @@ static inline void print_codec_cap(const struct shell *sh, size_t indent,
 #endif /* CONFIG_BT_AUDIO_CODEC_CAP_MAX_DATA_SIZE > 0 */
 
 #if CONFIG_BT_AUDIO_CODEC_CAP_MAX_METADATA_SIZE > 0
-	shell_print(sh, "%*sCodec capabilities metadata:", indent, "");
+	bt_shell_print("%*sCodec capabilities metadata:", indent, "");
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 	if (codec_cap->meta_len == 0U) {
-		shell_print(sh, "%*sNone", indent, "");
+		bt_shell_print("%*sNone", indent, "");
 	} else {
 		const uint8_t *data;
 		int ret;
 
 		ret = bt_audio_codec_cap_meta_get_pref_context(codec_cap);
 		if (ret >= 0) {
-			print_codec_meta_pref_context(sh, indent, (enum bt_audio_context)ret);
+			print_codec_meta_pref_context(indent, (enum bt_audio_context)ret);
 		}
 
 		ret = bt_audio_codec_cap_meta_get_stream_context(codec_cap);
 		if (ret >= 0) {
-			print_codec_meta_stream_context(sh, indent, (enum bt_audio_context)ret);
+			print_codec_meta_stream_context(indent, (enum bt_audio_context)ret);
 		}
 
 		ret = bt_audio_codec_cap_meta_get_program_info(codec_cap, &data);
 		if (ret >= 0) {
-			print_codec_meta_program_info(sh, indent, data, (uint8_t)ret);
+			print_codec_meta_program_info(indent, data, (uint8_t)ret);
 		}
 
 		ret = bt_audio_codec_cap_meta_get_lang(codec_cap, &data);
 		if (ret >= 0) {
-			print_codec_meta_language(sh, indent, data);
+			print_codec_meta_language(indent, data);
 		}
 
 		ret = bt_audio_codec_cap_meta_get_ccid_list(codec_cap, &data);
 		if (ret >= 0) {
-			print_codec_meta_ccid_list(sh, indent, data, (uint8_t)ret);
+			print_codec_meta_ccid_list(indent, data, (uint8_t)ret);
 		}
 
 		ret = bt_audio_codec_cap_meta_get_parental_rating(codec_cap);
 		if (ret >= 0) {
-			print_codec_meta_parental_rating(sh, indent,
+			print_codec_meta_parental_rating(indent,
 							 (enum bt_audio_parental_rating)ret);
 		}
 
 		ret = bt_audio_codec_cap_meta_get_audio_active_state(codec_cap);
 		if (ret >= 0) {
-			print_codec_meta_audio_active_state(sh, indent,
+			print_codec_meta_audio_active_state(indent,
 							    (enum bt_audio_active_state)ret);
 		}
 
 		ret = bt_audio_codec_cap_meta_get_bcast_audio_immediate_rend_flag(codec_cap);
 		if (ret >= 0) {
-			print_codec_meta_bcast_audio_immediate_rend_flag(sh, indent);
+			print_codec_meta_bcast_audio_immediate_rend_flag(indent);
 		}
 
 		ret = bt_audio_codec_cap_meta_get_extended(codec_cap, &data);
 		if (ret >= 0) {
-			print_codec_meta_extended(sh, indent, data, (uint8_t)ret);
+			print_codec_meta_extended(indent, data, (uint8_t)ret);
 		}
 
 		ret = bt_audio_codec_cap_meta_get_vendor(codec_cap, &data);
 		if (ret >= 0) {
-			print_codec_meta_vendor(sh, indent, data, (uint8_t)ret);
+			print_codec_meta_vendor(indent, data, (uint8_t)ret);
 		}
 	}
 #endif /* CONFIG_BT_AUDIO_CODEC_CAP_MAX_METADATA_SIZE > 0 */
 }
 
-static inline void print_codec_cfg_freq(const struct shell *sh, size_t indent,
-					enum bt_audio_codec_cfg_freq freq)
+static inline void print_codec_cfg_freq(size_t indent, enum bt_audio_codec_cfg_freq freq)
 {
-	shell_print(sh, "%*sSampling frequency: %u Hz (0x%04X)", indent, "",
-		    bt_audio_codec_cfg_freq_to_freq_hz(freq), (uint16_t)freq);
+	bt_shell_print("%*sSampling frequency: %u Hz (0x%04X)", indent, "",
+		       bt_audio_codec_cfg_freq_to_freq_hz(freq), (uint16_t)freq);
 }
 
-static inline void print_codec_cfg_frame_dur(const struct shell *sh, size_t indent,
+static inline void print_codec_cfg_frame_dur(size_t indent,
 					     enum bt_audio_codec_cfg_frame_dur frame_dur)
 {
-	shell_print(sh, "%*sFrame duration: %u us (0x%02X)", indent, "",
-		    bt_audio_codec_cfg_frame_dur_to_frame_dur_us(frame_dur), (uint8_t)frame_dur);
+	bt_shell_print("%*sFrame duration: %u us (0x%02X)", indent, "",
+		       bt_audio_codec_cfg_frame_dur_to_frame_dur_us(frame_dur), (uint8_t)frame_dur);
 }
 
-static inline void print_codec_cfg_chan_allocation(const struct shell *sh, size_t indent,
+static inline void print_codec_cfg_chan_allocation(size_t indent,
 						   enum bt_audio_location chan_allocation)
 {
-	shell_print(sh, "%*sChannel allocation:", indent, "");
+	bt_shell_print("%*sChannel allocation:", indent, "");
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 
 	if (chan_allocation == BT_AUDIO_LOCATION_MONO_AUDIO) {
-		shell_print(sh, "%*s Mono", indent, "");
+		bt_shell_print("%*s Mono", indent, "");
 	} else {
 		/* There can be up to 32 bits set in the field */
 		for (size_t i = 0; i < 32; i++) {
 			const uint8_t bit_val = BIT(i);
 
 			if (chan_allocation & bit_val) {
-				shell_print(sh, "%*s%s (0x%08X)", indent, "",
-					    bt_audio_location_bit_to_str(bit_val), bit_val);
+				bt_shell_print("%*s%s (0x%08X)", indent, "",
+					       bt_audio_location_bit_to_str(bit_val), bit_val);
 			}
 		}
 	}
 }
 
-static inline void print_codec_cfg_octets_per_frame(const struct shell *sh, size_t indent,
-						    uint16_t octets_per_frame)
+static inline void print_codec_cfg_octets_per_frame(size_t indent, uint16_t octets_per_frame)
 {
-	shell_print(sh, "%*sOctets per codec frame: %u", indent, "", octets_per_frame);
+	bt_shell_print("%*sOctets per codec frame: %u", indent, "", octets_per_frame);
 }
 
-static inline void print_codec_cfg_frame_blocks_per_sdu(const struct shell *sh, size_t indent,
+static inline void print_codec_cfg_frame_blocks_per_sdu(size_t indent,
 							uint8_t frame_blocks_per_sdu)
 {
-	shell_print(sh, "%*sCodec frame blocks per SDU: %u", indent, "", frame_blocks_per_sdu);
+	bt_shell_print("%*sCodec frame blocks per SDU: %u", indent, "", frame_blocks_per_sdu);
 }
 
-static inline void print_codec_cfg(const struct shell *sh, size_t indent,
-				   const struct bt_audio_codec_cfg *codec_cfg)
+static inline void print_codec_cfg(size_t indent, const struct bt_audio_codec_cfg *codec_cfg)
 {
-	shell_print(sh, "%*scodec cfg id 0x%02x cid 0x%04x vid 0x%04x count %u", indent, "",
-		    codec_cfg->id, codec_cfg->cid, codec_cfg->vid, codec_cfg->data_len);
+	bt_shell_print("%*scodec cfg id 0x%02x cid 0x%04x vid 0x%04x count %u", indent, "",
+		       codec_cfg->id, codec_cfg->cid, codec_cfg->vid, codec_cfg->data_len);
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 
 #if CONFIG_BT_AUDIO_CODEC_CFG_MAX_DATA_SIZE > 0
-	shell_print(sh, "%*sCodec specific configuration:", indent, "");
+	bt_shell_print("%*sCodec specific configuration:", indent, "");
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 	if (codec_cfg->data_len == 0U) {
-		shell_print(sh, "%*sNone", indent, "");
+		bt_shell_print("%*sNone", indent, "");
 	} else if (codec_cfg->id == BT_HCI_CODING_FORMAT_LC3) {
 		enum bt_audio_location chan_allocation;
 		int ret;
 
 		ret = bt_audio_codec_cfg_get_freq(codec_cfg);
 		if (ret >= 0) {
-			print_codec_cfg_freq(sh, indent, (enum bt_audio_codec_cfg_freq)ret);
+			print_codec_cfg_freq(indent, (enum bt_audio_codec_cfg_freq)ret);
 		}
 
 		ret = bt_audio_codec_cfg_get_frame_dur(codec_cfg);
 		if (ret >= 0) {
-			print_codec_cfg_frame_dur(sh, indent,
+			print_codec_cfg_frame_dur(indent,
 						  (enum bt_audio_codec_cfg_frame_dur)ret);
 		}
 
 		ret = bt_audio_codec_cfg_get_chan_allocation(codec_cfg, &chan_allocation, false);
 		if (ret == 0) {
-			print_codec_cfg_chan_allocation(sh, indent, chan_allocation);
+			print_codec_cfg_chan_allocation(indent, chan_allocation);
 		}
 
 		ret = bt_audio_codec_cfg_get_octets_per_frame(codec_cfg);
 		if (ret >= 0) {
-			print_codec_cfg_octets_per_frame(sh, indent, (uint16_t)ret);
+			print_codec_cfg_octets_per_frame(indent, (uint16_t)ret);
 		}
 
 		ret = bt_audio_codec_cfg_get_frame_blocks_per_sdu(codec_cfg, false);
 		if (ret >= 0) {
-			print_codec_cfg_frame_blocks_per_sdu(sh, indent, (uint8_t)ret);
+			print_codec_cfg_frame_blocks_per_sdu(indent, (uint8_t)ret);
 		}
 	} else { /* If not LC3, we cannot assume it's LTV */
-		shell_fprintf(sh, SHELL_NORMAL, "%*s", indent, "");
+		bt_shell_fprintf_print("%*s", indent, "");
 
 		for (uint8_t i = 0U; i < codec_cfg->data_len; i++) {
-			shell_fprintf(sh, SHELL_NORMAL, "%*s%02X", indent, "", codec_cfg->data[i]);
+			bt_shell_fprintf_print("%*s%02X", indent, "", codec_cfg->data[i]);
 		}
 
-		shell_fprintf(sh, SHELL_NORMAL, "\n");
+		bt_shell_fprintf_print("\n");
 	}
 
 	/* Reduce for metadata*/
@@ -728,65 +715,65 @@ static inline void print_codec_cfg(const struct shell *sh, size_t indent,
 #endif /* CONFIG_BT_AUDIO_CODEC_CFG_MAX_DATA_SIZE > 0 */
 
 #if CONFIG_BT_AUDIO_CODEC_CFG_MAX_METADATA_SIZE > 0
-	shell_print(sh, "%*sCodec specific metadata:", indent, "");
+	bt_shell_print("%*sCodec specific metadata:", indent, "");
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 	if (codec_cfg->meta_len == 0U) {
-		shell_print(sh, "%*sNone", indent, "");
+		bt_shell_print("%*sNone", indent, "");
 	} else {
 		const uint8_t *data;
 		int ret;
 
 		ret = bt_audio_codec_cfg_meta_get_pref_context(codec_cfg, true);
 		if (ret >= 0) {
-			print_codec_meta_pref_context(sh, indent, (enum bt_audio_context)ret);
+			print_codec_meta_pref_context(indent, (enum bt_audio_context)ret);
 		}
 
 		ret = bt_audio_codec_cfg_meta_get_stream_context(codec_cfg);
 		if (ret >= 0) {
-			print_codec_meta_stream_context(sh, indent, (enum bt_audio_context)ret);
+			print_codec_meta_stream_context(indent, (enum bt_audio_context)ret);
 		}
 
 		ret = bt_audio_codec_cfg_meta_get_program_info(codec_cfg, &data);
 		if (ret >= 0) {
-			print_codec_meta_program_info(sh, indent, data, (uint8_t)ret);
+			print_codec_meta_program_info(indent, data, (uint8_t)ret);
 		}
 
 		ret = bt_audio_codec_cfg_meta_get_lang(codec_cfg, &data);
 		if (ret >= 0) {
-			print_codec_meta_language(sh, indent, data);
+			print_codec_meta_language(indent, data);
 		}
 
 		ret = bt_audio_codec_cfg_meta_get_ccid_list(codec_cfg, &data);
 		if (ret >= 0) {
-			print_codec_meta_ccid_list(sh, indent, data, (uint8_t)ret);
+			print_codec_meta_ccid_list(indent, data, (uint8_t)ret);
 		}
 
 		ret = bt_audio_codec_cfg_meta_get_parental_rating(codec_cfg);
 		if (ret >= 0) {
-			print_codec_meta_parental_rating(sh, indent,
+			print_codec_meta_parental_rating(indent,
 							 (enum bt_audio_parental_rating)ret);
 		}
 
 		ret = bt_audio_codec_cfg_meta_get_audio_active_state(codec_cfg);
 		if (ret >= 0) {
-			print_codec_meta_audio_active_state(sh, indent,
+			print_codec_meta_audio_active_state(indent,
 							    (enum bt_audio_active_state)ret);
 		}
 
 		ret = bt_audio_codec_cfg_meta_get_bcast_audio_immediate_rend_flag(codec_cfg);
 		if (ret >= 0) {
-			print_codec_meta_bcast_audio_immediate_rend_flag(sh, indent);
+			print_codec_meta_bcast_audio_immediate_rend_flag(indent);
 		}
 
 		ret = bt_audio_codec_cfg_meta_get_extended(codec_cfg, &data);
 		if (ret >= 0) {
-			print_codec_meta_extended(sh, indent, data, (uint8_t)ret);
+			print_codec_meta_extended(indent, data, (uint8_t)ret);
 		}
 
 		ret = bt_audio_codec_cfg_meta_get_vendor(codec_cfg, &data);
 		if (ret >= 0) {
-			print_codec_meta_vendor(sh, indent, data, (uint8_t)ret);
+			print_codec_meta_vendor(indent, data, (uint8_t)ret);
 		}
 	}
 #endif /* CONFIG_BT_AUDIO_CODEC_CFG_MAX_METADATA_SIZE > 0 */
@@ -813,7 +800,7 @@ static inline bool print_base_subgroup_bis_cb(const struct bt_bap_base_subgroup_
 	size_t indent = 2 * SHELL_PRINT_INDENT_LEVEL_SIZE;
 	struct bt_bap_base_codec_id *codec_id = user_data;
 
-	shell_print(ctx_shell, "%*sBIS index: 0x%02X", indent, "", bis->index);
+	bt_shell_print("%*sBIS index: 0x%02X", indent, "", bis->index);
 
 	indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 
@@ -828,22 +815,22 @@ static inline bool print_base_subgroup_bis_cb(const struct bt_bap_base_subgroup_
 
 		err = bt_bap_base_subgroup_bis_codec_to_codec_cfg(bis, &codec_cfg);
 		if (err == 0) {
-			print_codec_cfg(ctx_shell, indent, &codec_cfg);
+			print_codec_cfg(indent, &codec_cfg);
 		} else {
-			shell_print(ctx_shell, "%*sCodec specific configuration:", indent, "");
-			print_ltv_array(ctx_shell, indent, bis->data, bis->data_len);
+			bt_shell_print("%*sCodec specific configuration:", indent, "");
+			print_ltv_array(indent, bis->data, bis->data_len);
 		}
 	} else { /* If not LC3, we cannot assume it's LTV */
-		shell_print(ctx_shell, "%*sCodec specific configuration:", indent, "");
+		bt_shell_print("%*sCodec specific configuration:", indent, "");
 
 		indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
-		shell_fprintf(ctx_shell, SHELL_NORMAL, "%*s", indent, "");
+		bt_shell_fprintf_print("%*s", indent, "");
 
 		for (uint8_t i = 0U; i < bis->data_len; i++) {
-			shell_fprintf(ctx_shell, SHELL_NORMAL, "%02X", bis->data[i]);
+			bt_shell_fprintf_print("%02X", bis->data[i]);
 		}
 
-		shell_fprintf(ctx_shell, SHELL_NORMAL, "\n");
+		bt_shell_fprintf_print("\n");
 	}
 
 	return true;
@@ -858,20 +845,20 @@ static inline bool print_base_subgroup_cb(const struct bt_bap_base_subgroup *sub
 	uint8_t *data;
 	int ret;
 
-	shell_print(ctx_shell, "Subgroup %p:", subgroup);
+	bt_shell_print("Subgroup %p:", subgroup);
 
 	ret = bt_bap_base_get_subgroup_codec_id(subgroup, &codec_id);
 	if (ret < 0) {
 		return false;
 	}
 
-	shell_print(ctx_shell, "%*sCodec Format: 0x%02X", indent, "", codec_id.id);
-	shell_print(ctx_shell, "%*sCompany ID  : 0x%04X", indent, "", codec_id.cid);
-	shell_print(ctx_shell, "%*sVendor ID   : 0x%04X", indent, "", codec_id.vid);
+	bt_shell_print("%*sCodec Format: 0x%02X", indent, "", codec_id.id);
+	bt_shell_print("%*sCompany ID  : 0x%04X", indent, "", codec_id.cid);
+	bt_shell_print("%*sVendor ID   : 0x%04X", indent, "", codec_id.vid);
 
 	ret = bt_bap_base_subgroup_codec_to_codec_cfg(subgroup, &codec_cfg);
 	if (ret == 0) {
-		print_codec_cfg(ctx_shell, indent, &codec_cfg);
+		print_codec_cfg(indent, &codec_cfg);
 	} else {
 		/* If we cannot store it in a codec_cfg, then we cannot easily print it as such */
 		ret = bt_bap_base_get_subgroup_codec_data(subgroup, &data);
@@ -879,20 +866,20 @@ static inline bool print_base_subgroup_cb(const struct bt_bap_base_subgroup *sub
 			return false;
 		}
 
-		shell_print(ctx_shell, "%*sCodec specific configuration:", indent, "");
+		bt_shell_print("%*sCodec specific configuration:", indent, "");
 		indent += SHELL_PRINT_INDENT_LEVEL_SIZE;
 
 		/* Print CC data */
 		if (codec_id.id == BT_HCI_CODING_FORMAT_LC3) {
-			print_ltv_array(ctx_shell, indent, data, (uint8_t)ret);
+			print_ltv_array(indent, data, (uint8_t)ret);
 		} else { /* If not LC3, we cannot assume it's LTV */
-			shell_fprintf(ctx_shell, SHELL_NORMAL, "%*s", indent, "");
+			bt_shell_fprintf_print("%*s", indent, "");
 
 			for (uint8_t i = 0U; i < (uint8_t)ret; i++) {
-				shell_fprintf(ctx_shell, SHELL_NORMAL, "%c", data[i]);
+				bt_shell_fprintf_print("%c", data[i]);
 			}
 
-			shell_fprintf(ctx_shell, SHELL_NORMAL, "\n");
+			bt_shell_fprintf_print("\n");
 		}
 
 		ret = bt_bap_base_get_subgroup_codec_meta(subgroup, &data);
@@ -900,21 +887,21 @@ static inline bool print_base_subgroup_cb(const struct bt_bap_base_subgroup *sub
 			return false;
 		}
 
-		shell_print(ctx_shell,
-			    "%*sCodec specific metadata:", indent - SHELL_PRINT_INDENT_LEVEL_SIZE,
-			    "");
+		bt_shell_print(
+			"%*sCodec specific metadata:", indent - SHELL_PRINT_INDENT_LEVEL_SIZE,
+			"");
 
 		/* Print metadata */
 		if (codec_id.id == BT_HCI_CODING_FORMAT_LC3) {
-			print_ltv_array(ctx_shell, indent, data, (uint8_t)ret);
+			print_ltv_array(indent, data, (uint8_t)ret);
 		} else { /* If not LC3, we cannot assume it's LTV */
-			shell_fprintf(ctx_shell, SHELL_NORMAL, "%*s", indent, "");
+			bt_shell_fprintf_print("%*s", indent, "");
 
 			for (uint8_t i = 0U; i < (uint8_t)ret; i++) {
-				shell_fprintf(ctx_shell, SHELL_NORMAL, "%c", data[i]);
+				bt_shell_fprintf_print("%c", data[i]);
 			}
 
-			shell_fprintf(ctx_shell, SHELL_NORMAL, "\n");
+			bt_shell_fprintf_print("\n");
 		}
 	}
 
@@ -930,12 +917,12 @@ static inline void print_base(const struct bt_bap_base *base)
 {
 	int err;
 
-	shell_print(ctx_shell, "Presentation delay: %d", bt_bap_base_get_pres_delay(base));
-	shell_print(ctx_shell, "Subgroup count: %d", bt_bap_base_get_subgroup_count(base));
+	bt_shell_print("Presentation delay: %d", bt_bap_base_get_pres_delay(base));
+	bt_shell_print("Subgroup count: %d", bt_bap_base_get_subgroup_count(base));
 
 	err = bt_bap_base_foreach_subgroup(base, print_base_subgroup_cb, NULL);
 	if (err < 0) {
-		shell_info(ctx_shell, "Invalid BASE: %d", err);
+		bt_shell_info("Invalid BASE: %d", err);
 	}
 }
 
diff --git a/subsys/bluetooth/audio/shell/bap.c b/subsys/bluetooth/audio/shell/bap.c
index d06d055318d..492c90e9024 100644
--- a/subsys/bluetooth/audio/shell/bap.c
+++ b/subsys/bluetooth/audio/shell/bap.c
@@ -294,23 +294,23 @@ static int16_t lc3_tx_buf[LC3_MAX_NUM_SAMPLES_MONO];
 static int init_lc3_encoder(struct shell_stream *sh_stream)
 {
 	if (sh_stream == NULL) {
-		shell_error(ctx_shell, "NULL stream to init LC3");
+		bt_shell_error("NULL stream to init LC3");
 		return -EINVAL;
 	}
 
 	if (!sh_stream->is_tx) {
-		shell_error(ctx_shell, "Invalid stream to init LC3 encoder");
+		bt_shell_error("Invalid stream to init LC3 encoder");
 		return -EINVAL;
 	}
 
 	if (sh_stream->tx.lc3_encoder != NULL) {
-		shell_error(ctx_shell, "Already initialized");
+		bt_shell_error("Already initialized");
 		return -EALREADY;
 	}
 
 	if (sh_stream->lc3_freq_hz == 0 || sh_stream->lc3_frame_duration_us == 0) {
-		shell_error(ctx_shell, "Invalid freq (%u) or frame duration (%u)",
-			    sh_stream->lc3_freq_hz, sh_stream->lc3_frame_duration_us);
+		bt_shell_error("Invalid freq (%u) or frame duration (%u)",
+			       sh_stream->lc3_freq_hz, sh_stream->lc3_frame_duration_us);
 
 		return -EINVAL;
 	}
@@ -319,25 +319,25 @@ static int init_lc3_encoder(struct shell_stream *sh_stream)
 		const size_t frame_size = bap_usb_get_frame_size(sh_stream);
 
 		if (frame_size > sizeof(lc3_tx_buf)) {
-			shell_error(ctx_shell, "Cannot put %u octets in lc3_tx_buf of size %zu",
-				    frame_size, sizeof(lc3_tx_buf));
+			bt_shell_error("Cannot put %u octets in lc3_tx_buf of size %zu",
+				       frame_size, sizeof(lc3_tx_buf));
 
 			return -EINVAL;
 		}
 	}
 
-	shell_print(ctx_shell,
-		    "Initializing LC3 encoder for BAP stream %p with %u us duration and %u Hz "
-		    "frequency",
-		    bap_stream_from_shell_stream(sh_stream), sh_stream->lc3_frame_duration_us,
-		    sh_stream->lc3_freq_hz);
+	bt_shell_print(
+		"Initializing LC3 encoder for BAP stream %p with %u us duration and %u Hz "
+		"frequency",
+		bap_stream_from_shell_stream(sh_stream), sh_stream->lc3_frame_duration_us,
+		sh_stream->lc3_freq_hz);
 
 	sh_stream->tx.lc3_encoder =
 		lc3_setup_encoder(sh_stream->lc3_frame_duration_us, sh_stream->lc3_freq_hz,
 				  IS_ENABLED(CONFIG_USB_DEVICE_AUDIO) ? USB_SAMPLE_RATE : 0,
 				  &sh_stream->tx.lc3_encoder_mem);
 	if (sh_stream->tx.lc3_encoder == NULL) {
-		shell_error(ctx_shell, "Failed to setup LC3 encoder - wrong parameters?\n");
+		bt_shell_error("Failed to setup LC3 encoder - wrong parameters?\n");
 		return -EINVAL;
 	}
 
@@ -391,15 +391,15 @@ static bool encode_frame(struct shell_stream *sh_stream, uint8_t index, size_t f
 	}
 
 	if ((sh_stream->tx.encoded_cnt % bap_stats_interval) == 0) {
-		shell_print(ctx_shell, "[%zu]: Encoding frame of size %u (%u/%u)",
-			    sh_stream->tx.encoded_cnt, octets_per_frame, frame_cnt + 1,
-			    total_frames);
+		bt_shell_print("[%zu]: Encoding frame of size %u (%u/%u)",
+			       sh_stream->tx.encoded_cnt, octets_per_frame, frame_cnt + 1,
+			       total_frames);
 	}
 
 	lc3_ret = lc3_encode(sh_stream->tx.lc3_encoder, LC3_PCM_FORMAT_S16, lc3_tx_buf, 1,
 			     octets_per_frame, net_buf_tail(out_buf));
 	if (lc3_ret == -1) {
-		shell_error(ctx_shell, "LC3 encoder failed - wrong parameters?: %d", lc3_ret);
+		bt_shell_error("LC3 encoder failed - wrong parameters?: %d", lc3_ret);
 
 		return false;
 	}
@@ -456,22 +456,22 @@ static void lc3_audio_send_data(struct shell_stream *sh_stream)
 	}
 
 	if (sh_stream->tx.lc3_encoder == NULL) {
-		shell_error(ctx_shell, "LC3 encoder not setup, cannot encode data");
+		bt_shell_error("LC3 encoder not setup, cannot encode data");
 		return;
 	}
 
 	if (bap_stream == NULL || bap_stream->qos == NULL) {
-		shell_error(ctx_shell, "invalid stream, aborting");
+		bt_shell_error("invalid stream, aborting");
 		return;
 	}
 
 	if (tx_sdu_len == 0U || tx_sdu_len > SINE_TX_POOL_SIZE) {
-		shell_error(ctx_shell,
-			    "Cannot send %u length SDU (from frame blocks per sdu %u, channel "
-			    "count %u and %u octets per frame) for pool size %d",
-			    tx_sdu_len, sh_stream->lc3_frame_blocks_per_sdu,
-			    sh_stream->lc3_chan_cnt, sh_stream->lc3_octets_per_frame,
-			    SINE_TX_POOL_SIZE);
+		bt_shell_error(
+			"Cannot send %u length SDU (from frame blocks per sdu %u, channel "
+			"count %u and %u octets per frame) for pool size %d",
+			tx_sdu_len, sh_stream->lc3_frame_blocks_per_sdu,
+			sh_stream->lc3_chan_cnt, sh_stream->lc3_octets_per_frame,
+			SINE_TX_POOL_SIZE);
 		return;
 	}
 
@@ -487,16 +487,16 @@ static void lc3_audio_send_data(struct shell_stream *sh_stream)
 
 	err = bt_bap_stream_send(bap_stream, buf, sh_stream->tx.seq_num);
 	if (err < 0) {
-		shell_error(ctx_shell, "Failed to send LC3 audio data (%d)", err);
+		bt_shell_error("Failed to send LC3 audio data (%d)", err);
 		net_buf_unref(buf);
 
 		return;
 	}
 
 	if ((sh_stream->tx.lc3_sdu_cnt % bap_stats_interval) == 0U) {
-		shell_info(ctx_shell, "[%zu]: stream %p : TX LC3: %zu (seq_num %u)",
-			   sh_stream->tx.lc3_sdu_cnt, bap_stream, tx_sdu_len,
-			   sh_stream->tx.seq_num);
+		bt_shell_info("[%zu]: stream %p : TX LC3: %zu (seq_num %u)",
+			      sh_stream->tx.lc3_sdu_cnt, bap_stream, tx_sdu_len,
+			      sh_stream->tx.seq_num);
 	}
 
 	sh_stream->tx.lc3_sdu_cnt++;
@@ -587,7 +587,7 @@ static void set_unicast_stream(struct bt_bap_stream *stream)
 
 	for (size_t i = 0U; i < ARRAY_SIZE(unicast_streams); i++) {
 		if (stream == bap_stream_from_shell_stream(&unicast_streams[i])) {
-			shell_print(ctx_shell, "Default stream: %u", i + 1);
+			bt_shell_print("Default stream: %u", i + 1);
 		}
 	}
 }
@@ -639,20 +639,20 @@ static int lc3_config(struct bt_conn *conn, const struct bt_bap_ep *ep, enum bt_
 		      const struct bt_audio_codec_cfg *codec_cfg, struct bt_bap_stream **stream,
 		      struct bt_bap_qos_cfg_pref *const pref, struct bt_bap_ascs_rsp *rsp)
 {
-	shell_print(ctx_shell, "ASE Codec Config: conn %p ep %p dir %u", conn, ep, dir);
+	bt_shell_print("ASE Codec Config: conn %p ep %p dir %u", conn, ep, dir);
 
-	print_codec_cfg(ctx_shell, 0, codec_cfg);
+	print_codec_cfg(0, codec_cfg);
 
 	*stream = stream_alloc();
 	if (*stream == NULL) {
-		shell_print(ctx_shell, "No unicast_streams available");
+		bt_shell_print("No unicast_streams available");
 
 		*rsp = BT_BAP_ASCS_RSP(BT_BAP_ASCS_RSP_CODE_NO_MEM, BT_BAP_ASCS_REASON_NONE);
 
 		return -ENOMEM;
 	}
 
-	shell_print(ctx_shell, "ASE Codec Config stream %p", *stream);
+	bt_shell_print("ASE Codec Config stream %p", *stream);
 
 	set_unicast_stream(*stream);
 
@@ -665,9 +665,9 @@ static int lc3_reconfig(struct bt_bap_stream *stream, enum bt_audio_dir dir,
 			const struct bt_audio_codec_cfg *codec_cfg,
 			struct bt_bap_qos_cfg_pref *const pref, struct bt_bap_ascs_rsp *rsp)
 {
-	shell_print(ctx_shell, "ASE Codec Reconfig: stream %p", stream);
+	bt_shell_print("ASE Codec Reconfig: stream %p", stream);
 
-	print_codec_cfg(ctx_shell, 0, codec_cfg);
+	print_codec_cfg(0, codec_cfg);
 
 	if (default_stream == NULL) {
 		set_unicast_stream(stream);
@@ -681,9 +681,9 @@ static int lc3_reconfig(struct bt_bap_stream *stream, enum bt_audio_dir dir,
 static int lc3_qos(struct bt_bap_stream *stream, const struct bt_bap_qos_cfg *qos,
 		   struct bt_bap_ascs_rsp *rsp)
 {
-	shell_print(ctx_shell, "QoS: stream %p %p", stream, qos);
+	bt_shell_print("QoS: stream %p %p", stream, qos);
 
-	print_qos(ctx_shell, qos);
+	print_qos(qos);
 
 	return 0;
 }
@@ -691,20 +691,18 @@ static int lc3_qos(struct bt_bap_stream *stream, const struct bt_bap_qos_cfg *qo
 static int lc3_enable(struct bt_bap_stream *stream, const uint8_t meta[], size_t meta_len,
 		      struct bt_bap_ascs_rsp *rsp)
 {
-	shell_print(ctx_shell, "Enable: stream %p meta_len %zu", stream,
-		    meta_len);
+	bt_shell_print("Enable: stream %p meta_len %zu", stream, meta_len);
 
 	return 0;
 }
 
 static int lc3_start(struct bt_bap_stream *stream, struct bt_bap_ascs_rsp *rsp)
 {
-	shell_print(ctx_shell, "Start: stream %p", stream);
+	bt_shell_print("Start: stream %p", stream);
 
 	return 0;
 }
 
-
 static bool meta_data_func_cb(struct bt_data *data, void *user_data)
 {
 	struct bt_bap_ascs_rsp *rsp = (struct bt_bap_ascs_rsp *)user_data;
@@ -721,29 +719,28 @@ static bool meta_data_func_cb(struct bt_data *data, void *user_data)
 static int lc3_metadata(struct bt_bap_stream *stream, const uint8_t meta[], size_t meta_len,
 			struct bt_bap_ascs_rsp *rsp)
 {
-	shell_print(ctx_shell, "Metadata: stream %p meta_len %zu", stream,
-		    meta_len);
+	bt_shell_print("Metadata: stream %p meta_len %zu", stream, meta_len);
 
 	return bt_audio_data_parse(meta, meta_len, meta_data_func_cb, rsp);
 }
 
 static int lc3_disable(struct bt_bap_stream *stream, struct bt_bap_ascs_rsp *rsp)
 {
-	shell_print(ctx_shell, "Disable: stream %p", stream);
+	bt_shell_print("Disable: stream %p", stream);
 
 	return 0;
 }
 
 static int lc3_stop(struct bt_bap_stream *stream, struct bt_bap_ascs_rsp *rsp)
 {
-	shell_print(ctx_shell, "Stop: stream %p", stream);
+	bt_shell_print("Stop: stream %p", stream);
 
 	return 0;
 }
 
 static int lc3_release(struct bt_bap_stream *stream, struct bt_bap_ascs_rsp *rsp)
 {
-	shell_print(ctx_shell, "Release: stream %p", stream);
+	bt_shell_print("Release: stream %p", stream);
 
 	if (stream == default_stream) {
 		default_stream = NULL;
@@ -913,10 +910,9 @@ static void print_remote_codec_cap(const struct bt_conn *conn,
 				   const struct bt_audio_codec_cap *codec_cap,
 				   enum bt_audio_dir dir)
 {
-	shell_print(ctx_shell, "conn %p: codec_cap %p dir 0x%02x", conn, codec_cap,
-		    dir);
+	bt_shell_print("conn %p: codec_cap %p dir 0x%02x", conn, codec_cap, dir);
 
-	print_codec_cap(ctx_shell, 0, codec_cap);
+	print_codec_cap(0, codec_cap);
 }
 
 #if CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT > 0
@@ -926,14 +922,14 @@ static void add_sink(const struct bt_conn *conn, struct bt_bap_ep *ep)
 
 	for (size_t i = 0U; i < ARRAY_SIZE(snks[conn_index]); i++) {
 		if (snks[conn_index][i] == NULL) {
-			shell_print(ctx_shell, "Conn: %p, Sink #%zu: ep %p", conn, i, ep);
+			bt_shell_print("Conn: %p, Sink #%zu: ep %p", conn, i, ep);
 
 			snks[conn_index][i] = ep;
 			return;
 		}
 	}
 
-	shell_error(ctx_shell, "Could not add more sink endpoints");
+	bt_shell_error("Could not add more sink endpoints");
 }
 #endif /* CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT > 0 */
 
@@ -944,14 +940,14 @@ static void add_source(const struct bt_conn *conn, struct bt_bap_ep *ep)
 
 	for (size_t i = 0U; i < ARRAY_SIZE(srcs[conn_index]); i++) {
 		if (srcs[conn_index][i] == NULL) {
-			shell_print(ctx_shell, "Conn: %p, Source #%zu: ep %p", conn, i, ep);
+			bt_shell_print("Conn: %p, Source #%zu: ep %p", conn, i, ep);
 
 			srcs[conn_index][i] = ep;
 			return;
 		}
 	}
 
-	shell_error(ctx_shell, "Could not add more sink endpoints");
+	bt_shell_error("Could not add more sink endpoints");
 }
 #endif /* CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SRC_COUNT > 0 */
 
@@ -978,7 +974,7 @@ static void endpoint_cb(struct bt_conn *conn, enum bt_audio_dir dir, struct bt_b
 
 static void discover_cb(struct bt_conn *conn, int err, enum bt_audio_dir dir)
 {
-	shell_print(ctx_shell, "Discover complete: err %d", err);
+	bt_shell_print("Discover complete: err %d", err);
 }
 
 static void discover_all(struct bt_conn *conn, int err, enum bt_audio_dir dir)
@@ -990,30 +986,30 @@ static void discover_all(struct bt_conn *conn, int err, enum bt_audio_dir dir)
 
 		err = bt_bap_unicast_client_discover(default_conn, dir);
 		if (err) {
-			shell_error(ctx_shell, "bt_bap_unicast_client_discover err %d", err);
+			bt_shell_error("bt_bap_unicast_client_discover err %d", err);
 		}
 	}
 }
 
 static void unicast_client_location_cb(struct bt_conn *conn,
-				      enum bt_audio_dir dir,
-				      enum bt_audio_location loc)
+				       enum bt_audio_dir dir,
+				       enum bt_audio_location loc)
 {
-	shell_print(ctx_shell, "dir %u loc %X\n", dir, loc);
+	bt_shell_print("dir %u loc %X\n", dir, loc);
 }
 
 static void available_contexts_cb(struct bt_conn *conn,
 				  enum bt_audio_context snk_ctx,
 				  enum bt_audio_context src_ctx)
 {
-	shell_print(ctx_shell, "snk ctx %u src ctx %u\n", snk_ctx, src_ctx);
+	bt_shell_print("snk ctx %u src ctx %u\n", snk_ctx, src_ctx);
 }
 
 static void config_cb(struct bt_bap_stream *stream, enum bt_bap_ascs_rsp_code rsp_code,
 		      enum bt_bap_ascs_reason reason)
 {
-	shell_print(ctx_shell, "stream %p config operation rsp_code %u reason %u",
-		    stream, rsp_code, reason);
+	bt_shell_print("stream %p config operation rsp_code %u reason %u",
+		       stream, rsp_code, reason);
 
 	if (default_stream == NULL) {
 		default_stream = stream;
@@ -1023,50 +1019,50 @@ static void config_cb(struct bt_bap_stream *stream, enum bt_bap_ascs_rsp_code rs
 static void qos_cb(struct bt_bap_stream *stream, enum bt_bap_ascs_rsp_code rsp_code,
 		   enum bt_bap_ascs_reason reason)
 {
-	shell_print(ctx_shell, "stream %p qos operation rsp_code %u reason %u",
-		    stream, rsp_code, reason);
+	bt_shell_print("stream %p qos operation rsp_code %u reason %u",
+		       stream, rsp_code, reason);
 }
 
 static void enable_cb(struct bt_bap_stream *stream, enum bt_bap_ascs_rsp_code rsp_code,
 		      enum bt_bap_ascs_reason reason)
 {
-	shell_print(ctx_shell, "stream %p enable operation rsp_code %u reason %u",
-		    stream, rsp_code, reason);
+	bt_shell_print("stream %p enable operation rsp_code %u reason %u",
+		       stream, rsp_code, reason);
 }
 
 static void start_cb(struct bt_bap_stream *stream, enum bt_bap_ascs_rsp_code rsp_code,
 		     enum bt_bap_ascs_reason reason)
 {
-	shell_print(ctx_shell, "stream %p start operation rsp_code %u reason %u",
-		    stream, rsp_code, reason);
+	bt_shell_print("stream %p start operation rsp_code %u reason %u",
+		       stream, rsp_code, reason);
 }
 
 static void stop_cb(struct bt_bap_stream *stream, enum bt_bap_ascs_rsp_code rsp_code,
 		    enum bt_bap_ascs_reason reason)
 {
-	shell_print(ctx_shell, "stream %p stop operation rsp_code %u reason %u",
-		    stream, rsp_code, reason);
+	bt_shell_print("stream %p stop operation rsp_code %u reason %u",
+		       stream, rsp_code, reason);
 }
 
 static void disable_cb(struct bt_bap_stream *stream, enum bt_bap_ascs_rsp_code rsp_code,
 		       enum bt_bap_ascs_reason reason)
 {
-	shell_print(ctx_shell, "stream %p disable operation rsp_code %u reason %u",
-		    stream, rsp_code, reason);
+	bt_shell_print("stream %p disable operation rsp_code %u reason %u",
+		       stream, rsp_code, reason);
 }
 
 static void metadata_cb(struct bt_bap_stream *stream, enum bt_bap_ascs_rsp_code rsp_code,
 			enum bt_bap_ascs_reason reason)
 {
-	shell_print(ctx_shell, "stream %p metadata operation rsp_code %u reason %u",
-		    stream, rsp_code, reason);
+	bt_shell_print("stream %p metadata operation rsp_code %u reason %u",
+		       stream, rsp_code, reason);
 }
 
 static void release_cb(struct bt_bap_stream *stream, enum bt_bap_ascs_rsp_code rsp_code,
 		       enum bt_bap_ascs_reason reason)
 {
-	shell_print(ctx_shell, "stream %p release operation rsp_code %u reason %u",
-		    stream, rsp_code, reason);
+	bt_shell_print("stream %p release operation rsp_code %u reason %u",
+		       stream, rsp_code, reason);
 }
 
 static struct bt_bap_unicast_client_cb unicast_client_cbs = {
@@ -2337,8 +2333,8 @@ static int cmd_preset(const struct shell *sh, size_t argc, char *argv[])
 
 	shell_print(sh, "%s", named_preset->name);
 
-	print_codec_cfg(ctx_shell, 0, &named_preset->preset.codec_cfg);
-	print_qos(ctx_shell, &named_preset->preset.qos);
+	print_codec_cfg(0, &named_preset->preset.codec_cfg);
+	print_qos(&named_preset->preset.qos);
 
 	return 0;
 }
@@ -2454,8 +2450,8 @@ static void broadcast_scan_recv(const struct bt_le_scan_recv_info *info, struct
 		auto_scan.broadcast_info.broadcast_id = sr_info.broadcast_id;
 		identified_broadcast = true;
 
-		shell_print(ctx_shell, "Found matched broadcast name '%s' with address %s",
-			    sr_info.broadcast_name, addr_str);
+		bt_shell_print("Found matched broadcast name '%s' with address %s",
+			       sr_info.broadcast_name, addr_str);
 	}
 
 	if (identified_broadcast && (auto_scan.broadcast_sink != NULL) &&
@@ -2463,13 +2459,13 @@ static void broadcast_scan_recv(const struct bt_le_scan_recv_info *info, struct
 		struct bt_le_per_adv_sync_param create_params = {0};
 		int err;
 
-		shell_print(ctx_shell,
-			    "Found broadcaster with ID 0x%06X and addr %s and sid 0x%02X ",
-			    sr_info.broadcast_id, addr_str, info->sid);
+		bt_shell_print(
+			"Found broadcaster with ID 0x%06X and addr %s and sid 0x%02X ",
+			sr_info.broadcast_id, addr_str, info->sid);
 
 		err = bt_le_scan_stop();
 		if (err != 0) {
-			shell_error(ctx_shell, "Could not stop scan: %d", err);
+			bt_shell_error("Could not stop scan: %d", err);
 		}
 
 		bt_addr_le_copy(&create_params.addr, info->addr);
@@ -2478,10 +2474,10 @@ static void broadcast_scan_recv(const struct bt_le_scan_recv_info *info, struct
 		create_params.skip = PA_SYNC_SKIP;
 		create_params.timeout = interval_to_sync_timeout(info->interval);
 
-		shell_print(ctx_shell, "Attempting to PA sync to the broadcaster");
+		bt_shell_print("Attempting to PA sync to the broadcaster");
 		err = bt_le_per_adv_sync_create(&create_params, auto_scan.out_sync);
 		if (err != 0) {
-			shell_error(ctx_shell, "Could not create Broadcast PA sync: %d", err);
+			bt_shell_error("Could not create Broadcast PA sync: %d", err);
 		} else {
 			auto_scan.broadcast_sink->pa_sync = *auto_scan.out_sync;
 		}
@@ -2494,7 +2490,7 @@ static void base_recv(struct bt_bap_broadcast_sink *sink, const struct bt_bap_ba
 	/* Don't print duplicates */
 	if (base_size != default_broadcast_sink.base_size ||
 	    memcmp(base, &default_broadcast_sink.received_base, base_size) != 0) {
-		shell_print(ctx_shell, "Received BASE from sink %p:", sink);
+		bt_shell_print("Received BASE from sink %p:", sink);
 		(void)memcpy(&default_broadcast_sink.received_base, base, base_size);
 		default_broadcast_sink.base_size = base_size;
 
@@ -2509,8 +2505,8 @@ static void syncable(struct bt_bap_broadcast_sink *sink, const struct bt_iso_big
 			return;
 		}
 
-		shell_print(ctx_shell, "Sink %p is ready to sync %s encryption", sink,
-			    biginfo->encryption ? "with" : "without");
+		bt_shell_print("Sink %p is ready to sync %s encryption", sink,
+			       biginfo->encryption ? "with" : "without");
 		default_broadcast_sink.syncable = true;
 	}
 }
@@ -2520,21 +2516,21 @@ static void bap_pa_sync_synced_cb(struct bt_le_per_adv_sync *sync,
 {
 	if (auto_scan.broadcast_sink != NULL && auto_scan.out_sync != NULL &&
 	    sync == *auto_scan.out_sync) {
-		shell_print(ctx_shell, "PA synced to broadcast with broadcast ID 0x%06x",
-			    auto_scan.broadcast_info.broadcast_id);
+		bt_shell_print("PA synced to broadcast with broadcast ID 0x%06x",
+			       auto_scan.broadcast_info.broadcast_id);
 
 		if (auto_scan.broadcast_sink->bap_sink == NULL) {
-			shell_print(ctx_shell, "Attempting to create the sink");
+			bt_shell_print("Attempting to create the sink");
 			int err;
 
 			err = bt_bap_broadcast_sink_create(sync,
 							   auto_scan.broadcast_info.broadcast_id,
 							   &auto_scan.broadcast_sink->bap_sink);
 			if (err != 0) {
-				shell_error(ctx_shell, "Could not create broadcast sink: %d", err);
+				bt_shell_error("Could not create broadcast sink: %d", err);
 			}
 		} else {
-			shell_print(ctx_shell, "Sink is already created");
+			bt_shell_print("Sink is already created");
 		}
 	}
 
@@ -2555,7 +2551,7 @@ static void bap_pa_sync_terminated_cb(struct bt_le_per_adv_sync *sync,
 
 static void broadcast_scan_timeout_cb(void)
 {
-	shell_print(ctx_shell, "Scan timeout");
+	bt_shell_print("Scan timeout");
 
 	clear_auto_scan();
 }
@@ -2609,37 +2605,36 @@ static struct shell_stream *usb_right_stream;
 static int init_lc3_decoder(struct shell_stream *sh_stream)
 {
 	if (sh_stream == NULL) {
-		shell_error(ctx_shell, "NULL stream to init LC3 decoder");
+		bt_shell_error("NULL stream to init LC3 decoder");
 		return -EINVAL;
 	}
 
 	if (!sh_stream->is_rx) {
-		shell_error(ctx_shell, "Invalid stream to init LC3 decoder");
+		bt_shell_error("Invalid stream to init LC3 decoder");
 		return -EINVAL;
 	}
 
 	if (sh_stream->rx.lc3_decoder != NULL) {
-		shell_error(ctx_shell, "Already initialized");
+		bt_shell_error("Already initialized");
 		return -EALREADY;
 	}
 
 	if (sh_stream->lc3_freq_hz == 0 || sh_stream->lc3_frame_duration_us == 0) {
-		shell_error(ctx_shell, "Invalid freq (%u) or frame duration (%u)",
-			    sh_stream->lc3_freq_hz, sh_stream->lc3_frame_duration_us);
+		bt_shell_error("Invalid freq (%u) or frame duration (%u)",
+			       sh_stream->lc3_freq_hz, sh_stream->lc3_frame_duration_us);
 
 		return -EINVAL;
 	}
 
-	shell_print(ctx_shell,
-		    "Initializing the LC3 decoder with %u us duration and %u Hz frequency",
-		    sh_stream->lc3_frame_duration_us, sh_stream->lc3_freq_hz);
+	bt_shell_print("Initializing the LC3 decoder with %u us duration and %u Hz frequency",
+		       sh_stream->lc3_frame_duration_us, sh_stream->lc3_freq_hz);
 	/* Create the decoder instance. This shall complete before stream_started() is called. */
 	sh_stream->rx.lc3_decoder =
 		lc3_setup_decoder(sh_stream->lc3_frame_duration_us, sh_stream->lc3_freq_hz,
 				  IS_ENABLED(CONFIG_USB_DEVICE_AUDIO) ? USB_SAMPLE_RATE : 0,
 				  &sh_stream->rx.lc3_decoder_mem);
 	if (sh_stream->rx.lc3_decoder == NULL) {
-		shell_error(ctx_shell, "Failed to setup LC3 decoder - wrong parameters?\n");
+		bt_shell_error("Failed to setup LC3 decoder - wrong parameters?\n");
 		return -EINVAL;
 	}
 
@@ -2659,7 +2654,7 @@ static bool decode_frame(struct lc3_data *data, size_t frame_cnt)
 		iso_data = NULL; /* perform PLC */
 
 		if ((sh_stream->rx.decoded_cnt % bap_stats_interval) == 0) {
-			shell_print(ctx_shell, "[%zu]: Performing PLC", sh_stream->rx.decoded_cnt);
+			bt_shell_print("[%zu]: Performing PLC", sh_stream->rx.decoded_cnt);
 		}
 
 		data->do_plc = false; /* clear flag */
@@ -2667,17 +2662,17 @@ static bool decode_frame(struct lc3_data *data, size_t frame_cnt)
 		iso_data = net_buf_pull_mem(data->buf, octets_per_frame);
 
 		if ((sh_stream->rx.decoded_cnt % bap_stats_interval) == 0) {
-			shell_print(ctx_shell, "[%zu]: Decoding frame of size %u (%u/%u)",
-				    sh_stream->rx.decoded_cnt, octets_per_frame, frame_cnt + 1,
-				    total_frames);
+			bt_shell_print("[%zu]: Decoding frame of size %u (%u/%u)",
+				       sh_stream->rx.decoded_cnt, octets_per_frame, frame_cnt + 1,
+				       total_frames);
 		}
 	}
 
 	err = lc3_decode(sh_stream->rx.lc3_decoder, iso_data, octets_per_frame, LC3_PCM_FORMAT_S16,
 			 lc3_rx_buf, 1);
 	if (err < 0) {
-		shell_error(ctx_shell, "Failed to decode LC3 data (%u/%u - %u/%u)", frame_cnt + 1,
-			    total_frames, octets_per_frame * frame_cnt, buf->len);
+		bt_shell_error("Failed to decode LC3 data (%u/%u - %u/%u)", frame_cnt + 1,
+			       total_frames, octets_per_frame * frame_cnt, buf->len);
 		return false;
 	}
 
@@ -2768,7 +2763,7 @@ static void lc3_decoder_thread_func(void *arg1, void *arg2, void *arg3)
 		struct shell_stream *sh_stream = data->sh_stream;
 
 		if (sh_stream->is_rx && sh_stream->rx.lc3_decoder == NULL) {
-			shell_warn(ctx_shell, "Decoder is NULL, discarding data from FIFO");
+			bt_shell_warn("Decoder is NULL, discarding data from FIFO");
 			k_mem_slab_free(&lc3_data_slab, (void *)data);
 			continue; /* Wait for new data */
 		}
@@ -2818,14 +2813,14 @@ static void audio_recv(struct bt_bap_stream *stream,
 	}
 
 	if ((sh_stream->rx.rx_cnt % bap_stats_interval) == 0) {
-		shell_print(ctx_shell,
-			    "[%zu]: Incoming audio on stream %p len %u ts %u seq_num %u flags %u "
-			    "(valid %zu, dup ts %zu, dup psn %zu, err_pkts %zu, lost_pkts %zu, "
-			    "empty SDUs %zu)",
-			    sh_stream->rx.rx_cnt, stream, buf->len, info->ts, info->seq_num,
-			    info->flags, sh_stream->rx.valid_sdu_pkts, sh_stream->rx.dup_ts,
-			    sh_stream->rx.dup_psn, sh_stream->rx.err_pkts, sh_stream->rx.lost_pkts,
-			    sh_stream->rx.empty_sdu_pkts);
+		bt_shell_print(
+			"[%zu]: Incoming audio on stream %p len %u ts %u seq_num %u flags %u "
+			"(valid %zu, dup ts %zu, dup psn %zu, err_pkts %zu, lost_pkts %zu, "
+			"empty SDUs %zu)",
+			sh_stream->rx.rx_cnt, stream, buf->len, info->ts, info->seq_num,
+			info->flags, sh_stream->rx.valid_sdu_pkts, sh_stream->rx.dup_ts,
+			sh_stream->rx.dup_psn, sh_stream->rx.err_pkts, sh_stream->rx.lost_pkts,
+			sh_stream->rx.empty_sdu_pkts);
 	}
 
 	(void)memcpy(&sh_stream->rx.last_info, info, sizeof(sh_stream->rx.last_info));
@@ -2842,7 +2837,7 @@ static void audio_recv(struct bt_bap_stream *stream,
 		 * in a FIFO
 		 */
 		if (k_mem_slab_alloc(&lc3_data_slab, (void **)&data, K_NO_WAIT)) {
-			shell_warn(ctx_shell, "Could not allocate LC3 data item");
+			bt_shell_warn("Could not allocate LC3 data item");
 
 			return;
 		}
@@ -2851,8 +2846,7 @@ static void audio_recv(struct bt_bap_stream *stream,
 			data->do_plc = true;
 		} else if (buf->len != (octets_per_frame * chan_cnt * frame_blocks_per_sdu)) {
 			if (buf->len != 0U) {
-				shell_error(
-					ctx_shell,
+				bt_shell_error(
 					"Expected %u frame blocks with %u channels of size %u, but "
 					"length is %u",
 					frame_blocks_per_sdu, chan_cnt, octets_per_frame, buf->len);
@@ -2878,7 +2872,7 @@ static void audio_recv(struct bt_bap_stream *stream,
 #if defined(CONFIG_BT_BAP_UNICAST)
 static void stream_enabled_cb(struct bt_bap_stream *stream)
 {
-	shell_print(ctx_shell, "Stream %p enabled", stream);
+	bt_shell_print("Stream %p enabled", stream);
 
 	if (IS_ENABLED(CONFIG_BT_BAP_UNICAST_SERVER)) {
 		struct bt_bap_ep_info ep_info;
@@ -2887,7 +2881,7 @@ static void stream_enabled_cb(struct bt_bap_stream *stream)
 
 		err = bt_conn_get_info(stream->conn, &conn_info);
 		if (err != 0) {
-			shell_error(ctx_shell, "Failed to get conn info: %d", err);
+			bt_shell_error("Failed to get conn info: %d", err);
 			return;
 		}
 
@@ -2897,7 +2891,7 @@ static void stream_enabled_cb(struct bt_bap_stream *stream)
 
 		err = bt_bap_ep_get_info(stream->ep, &ep_info);
 		if (err != 0) {
-			shell_error(ctx_shell, "Failed to get ep info: %d", err);
+			bt_shell_error("Failed to get ep info: %d", err);
 			return;
 		}
 
@@ -2906,7 +2900,7 @@ static void stream_enabled_cb(struct bt_bap_stream *stream)
 			err = bt_bap_stream_start(stream);
 
 			if (err != 0) {
-				shell_error(ctx_shell, "Failed to start stream: %d", err);
+				bt_shell_error("Failed to start stream: %d", err);
 				return;
 			}
 		}
@@ -2924,7 +2918,7 @@ static void stream_started_cb(struct bt_bap_stream *bap_stream)
 
 	ret = bt_bap_ep_get_info(bap_stream->ep, &info);
 	if (ret != 0) {
-		shell_error(ctx_shell, "Failed to get EP info: %d", ret);
+		bt_shell_error("Failed to get EP info: %d", ret);
 		return;
 	}
 
@@ -2949,16 +2943,15 @@ static void stream_started_cb(struct bt_bap_stream *bap_stream)
 				    ret == 48000) {
 					sh_stream->lc3_freq_hz = (uint32_t)ret;
 				} else {
-					shell_error(ctx_shell, "Unsupported frequency for LC3: %d",
-						    ret);
+					bt_shell_error("Unsupported frequency for LC3: %d", ret);
 					sh_stream->lc3_freq_hz = 0U;
 				}
 			} else {
-				shell_error(ctx_shell, "Invalid frequency: %d", ret);
+				bt_shell_error("Invalid frequency: %d", ret);
 				sh_stream->lc3_freq_hz = 0U;
 			}
 		} else {
-			shell_error(ctx_shell, "Could not get frequency: %d", ret);
+			bt_shell_error("Could not get frequency: %d", ret);
 			sh_stream->lc3_freq_hz = 0U;
 		}
 
@@ -2968,11 +2961,11 @@ static void stream_started_cb(struct bt_bap_stream *bap_stream)
 			if (ret > 0) {
 				sh_stream->lc3_frame_duration_us = (uint32_t)ret;
 			} else {
-				shell_error(ctx_shell, "Invalid frame duration: %d", ret);
+				bt_shell_error("Invalid frame duration: %d", ret);
 				sh_stream->lc3_frame_duration_us = 0U;
 			}
 		} else {
-			shell_error(ctx_shell, "Could not get frame duration: %d", ret);
+			bt_shell_error("Could not get frame duration: %d", ret);
 			sh_stream->lc3_frame_duration_us = 0U;
 		}
 
@@ -2982,7 +2975,7 @@ static void stream_started_cb(struct bt_bap_stream *bap_stream)
 			sh_stream->lc3_chan_cnt =
 				bt_audio_get_chan_count(sh_stream->lc3_chan_allocation);
 		} else {
-			shell_error(ctx_shell, "Could not get channel allocation: %d", ret);
+			bt_shell_error("Could not get channel allocation: %d", ret);
 			sh_stream->lc3_chan_allocation = BT_AUDIO_LOCATION_MONO_AUDIO;
 			sh_stream->lc3_chan_cnt = 1U;
 		}
@@ -2991,7 +2984,7 @@ static void stream_started_cb(struct bt_bap_stream *bap_stream)
 		if (ret >= 0) {
 			sh_stream->lc3_frame_blocks_per_sdu = (uint8_t)ret;
 		} else {
-			shell_error(ctx_shell, "Could not get frame blocks per SDU: %d", ret);
+			bt_shell_error("Could not get frame blocks per SDU: %d", ret);
 			sh_stream->lc3_frame_blocks_per_sdu = 0U;
 		}
 
@@ -2999,7 +2992,7 @@ static void stream_started_cb(struct bt_bap_stream *bap_stream)
 		if (ret >= 0) {
 			sh_stream->lc3_octets_per_frame = (uint16_t)ret;
 		} else {
-			shell_error(ctx_shell, "Could not get octets per frame: %d", ret);
+			bt_shell_error("Could not get octets per frame: %d", ret);
 			sh_stream->lc3_octets_per_frame = 0U;
 		}
 
@@ -3008,7 +3001,7 @@ static void stream_started_cb(struct bt_bap_stream *bap_stream)
 			const int err = init_lc3_encoder(sh_stream);
 
 			if (err != 0) {
-				shell_error(ctx_shell, "Failed to init LC3 encoder: %d", err);
+				bt_shell_error("Failed to init LC3 encoder: %d", err);
 
 				return;
 			}
@@ -3026,8 +3019,7 @@ static void stream_started_cb(struct bt_bap_stream *bap_stream)
 				const int err = init_lc3_decoder(sh_stream);
 
 				if (err != 0) {
-					shell_error(ctx_shell, "Failed to init LC3 decoder: %d",
-						    err);
+					bt_shell_error("Failed to init LC3 decoder: %d", err);
 
 					return;
 				}
@@ -3039,26 +3031,22 @@ static void stream_started_cb(struct bt_bap_stream *bap_stream)
 				if ((sh_stream->lc3_chan_allocation &
 				     BT_AUDIO_LOCATION_FRONT_LEFT) != 0) {
 					if (usb_left_stream == NULL) {
-						shell_info(ctx_shell,
-							   "Setting USB left stream to %p",
-							   sh_stream);
+						bt_shell_info("Setting USB left stream to %p",
+							      sh_stream);
 						usb_left_stream = sh_stream;
 					} else {
-						shell_warn(ctx_shell,
-							   "Multiple left streams started");
+						bt_shell_warn("Multiple left streams started");
 					}
 				}
 
 				if ((sh_stream->lc3_chan_allocation &
 				     BT_AUDIO_LOCATION_FRONT_RIGHT) != 0) {
 					if (usb_right_stream == NULL) {
-						shell_info(ctx_shell,
-							   "Setting USB right stream to %p",
-							   sh_stream);
+						bt_shell_info("Setting USB right stream to %p",
+							      sh_stream);
 						usb_right_stream = sh_stream;
 					} else {
-						shell_warn(ctx_shell,
-							   "Multiple right streams started");
+						bt_shell_warn("Multiple right streams started");
 					}
 				}
 			}
@@ -3094,13 +3082,13 @@ static void update_usb_streams_cb(struct shell_stream *sh_stream, void *user_dat
 	if (sh_stream->is_rx) {
 		if (usb_left_stream == NULL &&
 		    (sh_stream->lc3_chan_allocation & BT_AUDIO_LOCATION_FRONT_LEFT) != 0) {
-			shell_info(ctx_shell, "Setting new USB left stream to %p", sh_stream);
+			bt_shell_info("Setting new USB left stream to %p", sh_stream);
 			usb_left_stream = sh_stream;
 		}
 
 		if (usb_right_stream == NULL &&
 		    (sh_stream->lc3_chan_allocation & BT_AUDIO_LOCATION_FRONT_RIGHT) != 0) {
-			shell_info(ctx_shell, "Setting new USB right stream to %p", sh_stream);
+			bt_shell_info("Setting new USB right stream to %p", sh_stream);
 			usb_right_stream = sh_stream;
 		}
 	}
@@ -3110,12 +3098,12 @@ static void update_usb_streams(struct shell_stream *sh_stream)
 {
 	if (sh_stream->is_rx) {
 		if (sh_stream == usb_left_stream) {
-			shell_info(ctx_shell, "Clearing USB left stream (%p)", usb_left_stream);
+			bt_shell_info("Clearing USB left stream (%p)", usb_left_stream);
 			usb_left_stream = NULL;
 		}
 
 		if (sh_stream == usb_right_stream) {
-			shell_info(ctx_shell, "Clearing USB right stream (%p)", usb_right_stream);
+			bt_shell_info("Clearing USB right stream (%p)", usb_right_stream);
 			usb_right_stream = NULL;
 		}
 
@@ -3177,14 +3165,14 @@ static void stream_stopped_cb(struct bt_bap_stream *stream, uint8_t reason)
 static void stream_configured_cb(struct bt_bap_stream *stream,
 				 const struct bt_bap_qos_cfg_pref *pref)
 {
-	shell_print(ctx_shell, "Stream %p configured\n", stream);
+	bt_shell_print("Stream %p configured\n", stream);
 }
 
 static void stream_released_cb(struct bt_bap_stream *stream)
 {
 	struct shell_stream *sh_stream = shell_stream_from_bap_stream(stream);
 
-	shell_print(ctx_shell, "Stream %p released\n", stream);
+	bt_shell_print("Stream %p released\n", stream);
 
 #if defined(CONFIG_BT_BAP_UNICAST_CLIENT)
 	if (default_unicast_group != NULL) {
@@ -3210,12 +3198,12 @@ static void stream_released_cb(struct bt_bap_stream *stream)
 		if (group_can_be_deleted) {
 			int err;
 
-			shell_print(ctx_shell, "All streams released, deleting group\n");
+			bt_shell_print("All streams released, deleting group\n");
 
 			err = bt_bap_unicast_group_delete(default_unicast_group);
 
 			if (err != 0) {
-				shell_error(ctx_shell, "Failed to delete unicast group: %d", err);
+				bt_shell_error("Failed to delete unicast group: %d", err);
 			} else {
 				default_unicast_group = NULL;
 			}
@@ -3694,7 +3682,7 @@ static int cmd_set_loc(const struct shell *sh, size_t argc, char *argv[])
 
 	err = bt_pacs_set_location(dir, loc);
 	if (err) {
-		shell_error(ctx_shell, "Set available contexts err %d", err);
+		shell_error(sh, "Set available contexts err %d", err);
 		return -ENOEXEC;
 	}
 
@@ -3741,13 +3729,13 @@ static int cmd_context(const struct shell *sh, size_t argc, char *argv[])
 
 		err = bt_pacs_set_supported_contexts(dir, ctx);
 		if (err) {
-			shell_error(ctx_shell, "Set supported contexts err %d", err);
+			shell_error(sh, "Set supported contexts err %d", err);
 			return err;
 		}
 	} else if (!strcmp(argv[3], "available")) {
 		err = bt_pacs_set_available_contexts(dir, ctx);
 		if (err) {
-			shell_error(ctx_shell, "Set available contexts err %d", err);
+			shell_error(sh, "Set available contexts err %d", err);
 			return err;
 		}
 	} else {
@@ -3762,8 +3750,6 @@ static int cmd_init(const struct shell *sh, size_t argc, char *argv[])
 {
 	int err, i;
 
-	ctx_shell = sh;
-
 	if (initialized) {
 		shell_print(sh, "Already initialized");
 		return -ENOEXEC;
@@ -4124,7 +4110,7 @@ static int cmd_print_ase_info(const struct shell *sh, size_t argc, char *argv[])
 
 #define HELP_CFG_META                                                                              \
 	"\n[meta" HELP_SEP "[pref_ctx <context>]" HELP_SEP "[stream_ctx <context>]" HELP_SEP       \
-	"[program_info <program info>]" HELP_SEP "[lang <ISO 639-3 lang>]" HELP_SEP         \
+	"[program_info <program info>]" HELP_SEP "[lang <ISO 639-3 lang>]" HELP_SEP                \
 	"[ccid_list <ccids>]" HELP_SEP "[parental_rating <rating>]" HELP_SEP                       \
 	"[program_info_uri <URI>]" HELP_SEP "[audio_active_state <state>]" HELP_SEP                \
 	"[bcast_flag]" HELP_SEP "[extended <meta>]" HELP_SEP "[vendor <meta>]]"
@@ -4273,7 +4259,7 @@ static ssize_t connectable_ad_data_add(struct bt_data *data_array,
 		size_t uuid16_size;
 
 		if (data_array_size <= ad_len) {
-			shell_warn(ctx_shell, "No space for AD_UUID16");
+			bt_shell_warn("No space for AD_UUID16");
 			return ad_len;
 		}
 
@@ -4347,7 +4333,7 @@ static ssize_t nonconnectable_ad_data_add(struct bt_data *data_array,
 
 	if (ARRAY_SIZE(ad_ext_uuid16) > 0) {
 		if (data_array_size <= ad_len) {
-			shell_warn(ctx_shell, "No space for AD_UUID16");
+			bt_shell_warn("No space for AD_UUID16");
 			return ad_len;
 		}
 
diff --git a/subsys/bluetooth/audio/shell/bap_broadcast_assistant.c b/subsys/bluetooth/audio/shell/bap_broadcast_assistant.c
index d492330b5ea..279a5062345 100644
--- a/subsys/bluetooth/audio/shell/bap_broadcast_assistant.c
+++ b/subsys/bluetooth/audio/shell/bap_broadcast_assistant.c
@@ -65,7 +65,7 @@ static bool pa_decode_base(struct bt_data *data, void *user_data)
 
 	base_size = bt_bap_base_get_size(base);
 	if (base_size < 0) {
-		shell_error(ctx_shell, "BASE get size failed (%d)", base_size);
+		bt_shell_error("BASE get size failed (%d)", base_size);
 
 		return true;
 	}
@@ -93,12 +93,10 @@ static void bap_broadcast_assistant_discover_cb(struct bt_conn *conn, int err,
 						uint8_t recv_state_count)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "BASS discover failed (%d)", err);
+		bt_shell_error("BASS discover failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "BASS discover done with %u recv states",
-			    recv_state_count);
+		bt_shell_print("BASS discover done with %u recv states", recv_state_count);
 	}
-
 }
 
 static void bap_broadcast_assistant_scan_cb(const struct bt_le_scan_recv_info *info,
@@ -107,8 +105,7 @@ static void bap_broadcast_assistant_scan_cb(const struct bt_le_scan_recv_info *i
 	char le_addr[BT_ADDR_LE_STR_LEN];
 
 	bt_addr_le_to_str(info->addr, le_addr, sizeof(le_addr));
-	shell_print(
-		ctx_shell,
+	bt_shell_print(
 		"[DEVICE]: %s, broadcast_id 0x%06X, interval (ms) %u (0x%04x)), SID 0x%x, RSSI %i",
 		le_addr, broadcast_id, BT_GAP_PER_ADV_INTERVAL_TO_MS(info->interval),
 		info->interval, info->sid, info->rssi);
@@ -120,8 +117,8 @@ static bool metadata_entry(struct bt_data *data, void *user_data)
 
 	bin2hex(data->data, data->data_len, metadata, sizeof(metadata));
 
-	shell_print(ctx_shell, "\t\tMetadata length %u, type %u, data: %s",
-		    data->data_len, data->type, metadata);
+	bt_shell_print("\t\tMetadata length %u, type %u, data: %s",
+		       data->data_len, data->type, metadata);
 
 	return true;
 }
@@ -135,7 +132,7 @@ static void bap_broadcast_assistant_recv_state_cb(
 	bool is_bad_code;
 
 	if (err != 0) {
-		shell_error(ctx_shell, "BASS recv state read failed (%d)", err);
+		bt_shell_error("BASS recv state read failed (%d)", err);
 		return;
 	}
 
@@ -143,26 +140,25 @@ static void bap_broadcast_assistant_recv_state_cb(
 	bin2hex(state->bad_code, BT_ISO_BROADCAST_CODE_SIZE, bad_code, sizeof(bad_code));
 
 	is_bad_code = state->encrypt_state == BT_BAP_BIG_ENC_STATE_BAD_CODE;
-	shell_print(ctx_shell,
-		    "BASS recv state: src_id %u, addr %s, sid %u, broadcast_id 0x%06X, sync_state "
-		    "%u, encrypt_state %u%s%s",
-		    state->src_id, le_addr, state->adv_sid, state->broadcast_id,
-		    state->pa_sync_state, state->encrypt_state, is_bad_code ? ", bad code" : "",
-		    is_bad_code ? bad_code : "");
+	bt_shell_print(
+		"BASS recv state: src_id %u, addr %s, sid %u, broadcast_id 0x%06X, sync_state "
+		"%u, encrypt_state %u%s%s",
+		state->src_id, le_addr, state->adv_sid, state->broadcast_id,
+		state->pa_sync_state, state->encrypt_state, is_bad_code ? ", bad code" : "",
+		is_bad_code ? bad_code : "");
 
 	for (int i = 0; i < state->num_subgroups; i++) {
 		const struct bt_bap_bass_subgroup *subgroup = &state->subgroups[i];
 		struct net_buf_simple buf;
 
-		shell_print(ctx_shell, "\t[%d]: BIS sync 0x%04X, metadata_len %zu", i,
-			    subgroup->bis_sync, subgroup->metadata_len);
+		bt_shell_print("\t[%d]: BIS sync 0x%04X, metadata_len %zu", i,
+			       subgroup->bis_sync, subgroup->metadata_len);
 
 		net_buf_simple_init_with_data(&buf, (void *)subgroup->metadata,
 					      subgroup->metadata_len);
 		bt_data_parse(&buf, metadata_entry, NULL);
 	}
 
-
 	if (state->pa_sync_state == BT_BAP_PA_STATE_INFO_REQ) {
 		struct bt_le_per_adv_sync *per_adv_sync = NULL;
 		struct bt_le_ext_adv *ext_adv = NULL;
@@ -172,21 +168,20 @@ static void bap_broadcast_assistant_recv_state_cb(
 			if (per_adv_syncs[i] != NULL &&
 			    bt_addr_le_eq(&per_adv_syncs[i]->addr, &state->addr)) {
 				per_adv_sync = per_adv_syncs[i];
-				shell_print(ctx_shell, "Found matching PA sync [%zu]", i);
+				bt_shell_print("Found matching PA sync [%zu]", i);
 				break;
 			}
 		}
 
 		if (per_adv_sync && IS_ENABLED(CONFIG_BT_PER_ADV_SYNC_TRANSFER_SENDER)) {
-			shell_print(ctx_shell, "Sending PAST");
+			bt_shell_print("Sending PAST");
 
 			err = bt_le_per_adv_sync_transfer(per_adv_sync,
 							  conn,
 							  BT_UUID_BASS_VAL);
 
 			if (err != 0) {
-				shell_error(ctx_shell, "Could not transfer periodic adv sync: %d",
-					    err);
+				bt_shell_error("Could not transfer periodic adv sync: %d", err);
 			}
 
 			return;
@@ -204,9 +199,7 @@ static void bap_broadcast_assistant_recv_state_cb(
 							  &oob_local);
 
 			if (err != 0) {
-				shell_error(ctx_shell,
-					    "Could not get local OOB %d",
-					    err);
+				bt_shell_error("Could not get local OOB %d", err);
 				return;
 			}
 
@@ -218,61 +211,58 @@ static void bap_broadcast_assistant_recv_state_cb(
 
 		if (ext_adv != NULL && IS_ENABLED(CONFIG_BT_PER_ADV) &&
 		    IS_ENABLED(CONFIG_BT_PER_ADV_SYNC_TRANSFER_SENDER)) {
-			shell_print(ctx_shell, "Sending local PAST");
+			bt_shell_print("Sending local PAST");
 
 			err = bt_le_per_adv_set_info_transfer(ext_adv, conn,
 							      BT_UUID_BASS_VAL);
 
 			if (err != 0) {
-				shell_error(ctx_shell,
-					    "Could not transfer per adv set info: %d",
-					    err);
+				bt_shell_error("Could not transfer per adv set info: %d", err);
 			}
 		} else {
-			shell_error(ctx_shell,
-				    "Could not send PA to Scan Delegator");
+			bt_shell_error("Could not send PA to Scan Delegator");
 		}
 	}
 }
 
 static void bap_broadcast_assistant_recv_state_removed_cb(struct bt_conn *conn, uint8_t src_id)
 {
-	shell_print(ctx_shell, "BASS recv state %u removed", src_id);
+	bt_shell_print("BASS recv state %u removed", src_id);
 }
 
 static void bap_broadcast_assistant_scan_start_cb(struct bt_conn *conn, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "BASS scan start failed (%d)", err);
+		bt_shell_error("BASS scan start failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "BASS scan start successful");
+		bt_shell_print("BASS scan start successful");
 	}
 }
 
 static void bap_broadcast_assistant_scan_stop_cb(struct bt_conn *conn, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "BASS scan stop failed (%d)", err);
+		bt_shell_error("BASS scan stop failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "BASS scan stop successful");
+		bt_shell_print("BASS scan stop successful");
 	}
 }
 
 static void bap_broadcast_assistant_add_src_cb(struct bt_conn *conn, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "BASS add source failed (%d)", err);
+		bt_shell_error("BASS add source failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "BASS add source successful");
+		bt_shell_print("BASS add source successful");
 	}
 }
 
 static void bap_broadcast_assistant_mod_src_cb(struct bt_conn *conn, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "BASS modify source failed (%d)", err);
+		bt_shell_error("BASS modify source failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "BASS modify source successful");
+		bt_shell_print("BASS modify source successful");
 	}
 }
 
@@ -280,18 +270,18 @@ static void bap_broadcast_assistant_broadcast_code_cb(struct bt_conn *conn,
 						      int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "BASS broadcast code failed (%d)", err);
+		bt_shell_error("BASS broadcast code failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "BASS broadcast code successful");
+		bt_shell_print("BASS broadcast code successful");
 	}
 }
 
 static void bap_broadcast_assistant_rem_src_cb(struct bt_conn *conn, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "BASS remove source failed (%d)", err);
+		bt_shell_error("BASS remove source failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "BASS remove source successful");
+		bt_shell_print("BASS remove source successful");
 	}
 }
 
@@ -551,18 +541,18 @@ static void scan_recv_cb(const struct bt_le_scan_recv_info *info,
 		    is_substring(auto_scan.broadcast_name, sr_info.broadcast_name)) {
 			identified_broadcast = true;
 
-			shell_print(ctx_shell, "Found matched broadcast name '%s' with address %s",
-				    sr_info.broadcast_name, addr_str);
+			bt_shell_print("Found matched broadcast name '%s' with address %s",
+				       sr_info.broadcast_name, addr_str);
 		}
 
 		if (identified_broadcast) {
-			shell_print(ctx_shell,
-				    "Found BAP broadcast source with address %s and ID 0x%06X\n",
-				    addr_str, sr_info.broadcast_id);
+			bt_shell_print(
+				"Found BAP broadcast source with address %s and ID 0x%06X\n",
+				addr_str, sr_info.broadcast_id);
 
 			err = bt_le_scan_stop();
 			if (err) {
-				shell_error(ctx_shell, "Failed to stop scan: %d", err);
+				bt_shell_error("Failed to stop scan: %d", err);
 			}
 
 			bt_addr_le_copy(&param.addr, info->addr);
@@ -575,7 +565,7 @@ static void scan_recv_cb(const struct bt_le_scan_recv_info *info,
 
 			err = bt_bap_broadcast_assistant_add_src(default_conn, &param);
 			if (err) {
-				shell_print(ctx_shell, "Failed to add source: %d", err);
+				bt_shell_print("Failed to add source: %d", err);
 			}
 
 			memset(&auto_scan, 0, sizeof(auto_scan));
@@ -586,7 +576,7 @@ static void scan_recv_cb(const struct bt_le_scan_recv_info *info,
 
 static void scan_timeout_cb(void)
 {
-	shell_print(ctx_shell, "Scan timeout");
+	bt_shell_print("Scan timeout");
 
 	memset(&auto_scan, 0, sizeof(auto_scan));
 	auto_scan.broadcast_id = BT_BAP_INVALID_BROADCAST_ID;
@@ -891,8 +881,8 @@ static inline bool add_pa_sync_base_subgroup_cb(const struct bt_bap_base_subgrou
 	int ret;
 
 	if (param->num_subgroups == CONFIG_BT_BAP_BASS_MAX_SUBGROUPS) {
-		shell_warn(ctx_shell, "Cannot fit all subgroups param with size %d",
-			   CONFIG_BT_BAP_BASS_MAX_SUBGROUPS);
+		bt_shell_warn("Cannot fit all subgroups param with size %d",
+			      CONFIG_BT_BAP_BASS_MAX_SUBGROUPS);
 
 		return true; /* return true to avoid returning -ECANCELED as this is OK */
 	}
@@ -905,8 +895,8 @@ static inline bool add_pa_sync_base_subgroup_cb(const struct bt_bap_base_subgrou
 	subgroup_param = &param->subgroups[param->num_subgroups];
 
 	if (ret > ARRAY_SIZE(subgroup_param->metadata)) {
-		shell_info(ctx_shell, "Cannot fit %d octets into subgroup param with size %zu", ret,
-			   ARRAY_SIZE(subgroup_param->metadata));
+		bt_shell_info("Cannot fit %d octets into subgroup param with size %zu", ret,
+			      ARRAY_SIZE(subgroup_param->metadata));
 		return false;
 	}
 
@@ -1001,7 +991,7 @@ static int cmd_bap_broadcast_assistant_add_pa_sync(const struct shell *sh,
 		err = bt_bap_base_foreach_subgroup((const struct bt_bap_base *)received_base,
 						   add_pa_sync_base_subgroup_cb, &param);
 		if (err < 0) {
-			shell_error(ctx_shell, "Could not add BASE to params %d", err);
+			shell_error(sh, "Could not add BASE to params %d", err);
 
 			return -ENOEXEC;
 		}
@@ -1023,7 +1013,7 @@ static int cmd_bap_broadcast_assistant_add_pa_sync(const struct shell *sh,
 	if ((subgroups_bis_sync & bis_bitfield_req) != bis_bitfield_req) {
 		/* bis_sync of all subgroups should contain at least all the bits in request */
 		/* Otherwise Command will be rejected */
-		shell_error(ctx_shell, "Cannot set BIS index 0x%06X when BASE subgroups only "
+		shell_error(sh, "Cannot set BIS index 0x%06X when BASE subgroups only "
 			    "supports %d", bis_bitfield_req, subgroups_bis_sync);
 		return -ENOEXEC;
 	}
diff --git a/subsys/bluetooth/audio/shell/bap_scan_delegator.c b/subsys/bluetooth/audio/shell/bap_scan_delegator.c
index a4a515a0db5..e88b153c332 100644
--- a/subsys/bluetooth/audio/shell/bap_scan_delegator.c
+++ b/subsys/bluetooth/audio/shell/bap_scan_delegator.c
@@ -33,6 +33,7 @@
 
 #include <audio/bap_internal.h>
 #include "host/shell/bt.h"
+#include "common/bt_shell_private.h"
 
 #define PA_SYNC_INTERVAL_TO_TIMEOUT_RATIO 20 /* Set the timeout relative to interval */
 #define PA_SYNC_SKIP              5
@@ -185,7 +186,7 @@ static void pa_timer_handler(struct k_work *work)
 		bt_bap_scan_delegator_set_pa_state(state->recv_state->src_id,
 						   pa_state);
 
-		shell_info(ctx_shell, "PA timeout for %p", state->recv_state);
+		bt_shell_info("PA timeout for %p", state->recv_state);
 	}
 }
 
@@ -202,9 +203,9 @@ static int pa_sync_past(struct bt_conn *conn,
 
 	err = bt_le_per_adv_sync_transfer_subscribe(conn, &param);
 	if (err != 0) {
-		shell_info(ctx_shell, "Could not do PAST subscribe: %d", err);
+		bt_shell_info("Could not do PAST subscribe: %d", err);
 	} else {
-		shell_info(ctx_shell, "Syncing with PAST: %d", err);
+		bt_shell_info("Syncing with PAST: %d", err);
 		state->pa_syncing = true;
 		k_work_init_delayable(&state->pa_timer, pa_timer_handler);
 		(void)k_work_reschedule(&state->pa_timer,
@@ -235,12 +236,12 @@ static int pa_sync_no_past(struct sync_state *state,
 	 */
 	err = bt_le_per_adv_sync_create(&param, &state->pa_sync);
 	if (err != 0) {
-		shell_info(ctx_shell, "Could not sync per adv: %d", err);
+		bt_shell_info("Could not sync per adv: %d", err);
 	} else {
 		char addr_str[BT_ADDR_LE_STR_LEN];
 
 		bt_addr_le_to_str(&recv_state->addr, addr_str, sizeof(addr_str));
-		shell_info(ctx_shell, "PA sync pending for addr %s", addr_str);
+		bt_shell_info("PA sync pending for addr %s", addr_str);
 		state->pa_syncing = true;
 		k_work_init_delayable(&state->pa_timer, pa_timer_handler);
 		(void)k_work_reschedule(&state->pa_timer,
@@ -260,12 +261,11 @@ static int pa_sync_term(struct sync_state *state)
 		return -1;
 	}
 
-	shell_info(ctx_shell, "Deleting PA sync");
+	bt_shell_info("Deleting PA sync");
 
 	err = bt_le_per_adv_sync_delete(state->pa_sync);
 	if (err != 0) {
-		shell_error(ctx_shell, "Could not delete per adv sync: %d",
-			    err);
+		bt_shell_error("Could not delete per adv sync: %d", err);
 	} else {
 		state->pa_syncing = false;
 		state->pa_sync = NULL;
@@ -277,7 +277,7 @@ static int pa_sync_term(struct sync_state *state)
 static void recv_state_updated_cb(struct bt_conn *conn,
 				  const struct bt_bap_scan_delegator_recv_state *recv_state)
 {
-	shell_info(ctx_shell, "Receive state with ID %u updated", recv_state->src_id);
+	bt_shell_info("Receive state with ID %u updated", recv_state->src_id);
 }
 
 static int pa_sync_req_cb(struct bt_conn *conn,
@@ -286,14 +286,13 @@ static int pa_sync_req_cb(struct bt_conn *conn,
 {
 	struct sync_state *state;
 
-	shell_info(ctx_shell,
-		   "PA Sync request: past_avail %u, broadcast_id 0x%06X, pa_interval 0x%04x: %p",
-		   past_avail, recv_state->broadcast_id, pa_interval,
-		   recv_state);
+	bt_shell_info(
+		"PA Sync request: past_avail %u, broadcast_id 0x%06X, pa_interval 0x%04x: %p",
+		past_avail, recv_state->broadcast_id, pa_interval, recv_state);
 
 	state = sync_state_get_or_new(recv_state);
 	if (state == NULL) {
-		shell_error(ctx_shell, "Could not get state");
+		bt_shell_error("Could not get state");
 
 		return -1;
 	}
@@ -323,11 +322,11 @@ static int pa_sync_term_req_cb(struct bt_conn *conn,
 {
 	struct sync_state *state;
 
-	shell_info(ctx_shell, "PA Sync term request for %p", recv_state);
+	bt_shell_info("PA Sync term request for %p", recv_state);
 
 	state = sync_state_get(recv_state);
 	if (state == NULL) {
-		shell_error(ctx_shell, "Could not get state");
+		bt_shell_error("Could not get state");
 
 		return -1;
 	}
@@ -341,12 +340,12 @@ static void broadcast_code_cb(struct bt_conn *conn,
 {
 	struct sync_state *state;
 
-	shell_info(ctx_shell, "Broadcast code received for %p", recv_state);
-	shell_hexdump(ctx_shell, broadcast_code, BT_ISO_BROADCAST_CODE_SIZE);
+	bt_shell_info("Broadcast code received for %p", recv_state);
+	bt_shell_hexdump(broadcast_code, BT_ISO_BROADCAST_CODE_SIZE);
 
 	state = sync_state_get(recv_state);
 	if (state == NULL) {
-		shell_error(ctx_shell, "Could not get state");
+		bt_shell_error("Could not get state");
 
 		return;
 	}
@@ -380,7 +379,7 @@ static void pa_synced_cb(struct bt_le_per_adv_sync *sync,
 {
 	struct sync_state *state;
 
-	shell_info(ctx_shell, "PA %p synced", sync);
+	bt_shell_info("PA %p synced", sync);
 
 	if (info->conn == NULL) {
 		state = sync_state_get_by_pa(sync);
@@ -390,9 +389,7 @@ static void pa_synced_cb(struct bt_le_per_adv_sync *sync,
 	}
 
 	if (state == NULL) {
-		shell_info(ctx_shell,
-			   "Could not get sync state from PA sync %p",
-			   sync);
+		bt_shell_info("Could not get sync state from PA sync %p", sync);
 		return;
 	}
 
@@ -409,13 +406,11 @@ static void pa_term_cb(struct bt_le_per_adv_sync *sync,
 {
 	struct sync_state *state;
 
-	shell_info(ctx_shell, "PA %p sync terminated", sync);
+	bt_shell_info("PA %p sync terminated", sync);
 
 	state = sync_state_get_by_pa(sync);
 	if (state == NULL) {
-		shell_error(ctx_shell,
-			    "Could not get sync state from PA sync %p",
-			    sync);
+		bt_shell_error("Could not get sync state from PA sync %p", sync);
 		return;
 	}
 
@@ -427,7 +422,7 @@ static void pa_term_cb(struct bt_le_per_adv_sync *sync,
 	k_work_cancel_delayable(&state->pa_timer);
 }
 
-static struct bt_le_per_adv_sync_cb pa_sync_cb =  {
+static struct bt_le_per_adv_sync_cb pa_sync_cb = {
 	.synced = pa_synced_cb,
 	.term = pa_term_cb,
 };
@@ -500,7 +495,7 @@ static int cmd_bap_scan_delegator_sync_pa(const struct shell *sh, size_t argc,
 
 	state = sync_state_get_by_src_id((uint8_t)src_id);
 	if (state == NULL) {
-		shell_error(ctx_shell, "Could not get state");
+		shell_error(sh, "Could not get state");
 
 		return -ENOEXEC;
 	}
@@ -563,14 +558,14 @@ static int cmd_bap_scan_delegator_term_pa(const struct shell *sh, size_t argc,
 
 	state = sync_state_get_by_src_id((uint8_t)src_id);
 	if (state == NULL) {
-		shell_error(ctx_shell, "Could not get state");
+		shell_error(sh, "Could not get state");
 
 		return -ENOEXEC;
 	}
 
 	err = pa_sync_term(state);
 	if (err != 0) {
-		shell_error(ctx_shell, "Failed to terminate PA sync: %d", err);
+		shell_error(sh, "Failed to terminate PA sync: %d", err);
 
 		return -ENOEXEC;
 	}
@@ -673,7 +668,7 @@ static int cmd_bap_scan_delegator_add_src(const struct shell *sh, size_t argc, c
 
 	state = sync_state_new();
 	if (state == NULL) {
-		shell_error(ctx_shell, "Could not get new state");
+		shell_error(sh, "Could not get new state");
 
 		return -ENOEXEC;
 	}
@@ -684,7 +679,7 @@ static int cmd_bap_scan_delegator_add_src(const struct shell *sh, size_t argc, c
 
 	err = bt_bap_scan_delegator_add_src(&param);
 	if (err < 0) {
-		shell_error(ctx_shell, "Failed to add source: %d", err);
+		shell_error(sh, "Failed to add source: %d", err);
 
 		return -ENOEXEC;
 	}
@@ -778,7 +773,7 @@ static int cmd_bap_scan_delegator_add_src_by_pa_sync(const struct shell *sh, siz
 
 	state = sync_state_new();
 	if (state == NULL) {
-		shell_error(ctx_shell, "Could not get new state");
+		shell_error(sh, "Could not get new state");
 
 		return -ENOEXEC;
 	}
@@ -789,7 +784,7 @@ static int cmd_bap_scan_delegator_add_src_by_pa_sync(const struct shell *sh, siz
 
 	err = bt_bap_scan_delegator_add_src(&param);
 	if (err < 0) {
-		shell_error(ctx_shell, "Failed to add source: %d", err);
+		shell_error(sh, "Failed to add source: %d", err);
 
 		return -ENOEXEC;
 	}
@@ -885,7 +880,6 @@ static int cmd_bap_scan_delegator_mod_src(const struct shell *sh, size_t argc,
 		subgroup_param->metadata_len = 0U;
 	}
 
-
 	param.src_id = (uint8_t)src_id;
 	param.encrypt_state = (enum bt_bap_big_enc_state)enc_state;
 	param.broadcast_id = broadcast_id;
@@ -893,7 +887,7 @@ static int cmd_bap_scan_delegator_mod_src(const struct shell *sh, size_t argc,
 
 	err = bt_bap_scan_delegator_mod_src(&param);
 	if (err < 0) {
-		shell_error(ctx_shell, "Failed to modify source: %d", err);
+		shell_error(sh, "Failed to modify source: %d", err);
 
 		return -ENOEXEC;
 	}
@@ -924,8 +918,7 @@ static int cmd_bap_scan_delegator_rem_src(const struct shell *sh, size_t argc,
 
 	err = bt_bap_scan_delegator_rem_src((uint8_t)src_id);
 	if (err < 0) {
-		shell_error(ctx_shell, "Failed to remove source source: %d",
-			    err);
+		shell_error(sh, "Failed to remove source source: %d", err);
 
 		return -ENOEXEC;
 	}
diff --git a/subsys/bluetooth/audio/shell/cap_acceptor.c b/subsys/bluetooth/audio/shell/cap_acceptor.c
index 2116943d2a1..15b3c89c887 100644
--- a/subsys/bluetooth/audio/shell/cap_acceptor.c
+++ b/subsys/bluetooth/audio/shell/cap_acceptor.c
@@ -28,6 +28,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/audio/cap.h>
 #include "host/shell/bt.h"
+#include "common/bt_shell_private.h"
 
 static size_t ad_cap_announcement_data_add(struct bt_data data[], size_t data_size)
 {
@@ -45,7 +46,6 @@ static size_t ad_cap_announcement_data_add(struct bt_data data[], size_t data_si
 }
 
 #if defined(CONFIG_BT_CAP_ACCEPTOR_SET_MEMBER)
-extern const struct shell *ctx_shell;
 static struct bt_csip_set_member_svc_inst *cap_csip_svc_inst;
 static uint8_t sirk_read_rsp = BT_CSIP_READ_SIRK_REQ_RSP_ACCEPT;
 
@@ -54,15 +54,15 @@ static void locked_cb(struct bt_conn *conn,
 		      bool locked)
 {
 	if (conn == NULL) {
-		shell_error(ctx_shell, "Server %s the device",
-			    locked ? "locked" : "released");
+		bt_shell_error("Server %s the device",
+			       locked ? "locked" : "released");
 	} else {
 		char addr[BT_ADDR_LE_STR_LEN];
 
 		conn_addr_str(conn, addr, sizeof(addr));
 
-		shell_print(ctx_shell, "Client %s %s the device",
-			    addr, locked ? "locked" : "released");
+		bt_shell_print("Client %s %s the device",
+			       addr, locked ? "locked" : "released");
 	}
 }
 
@@ -76,8 +76,8 @@ static uint8_t sirk_read_req_cb(struct bt_conn *conn,
 
 	conn_addr_str(conn, addr, sizeof(addr));
 
-	shell_print(ctx_shell, "Client %s requested to read the sirk. "
-		    "Responding with %s", addr, rsp_strings[sirk_read_rsp]);
+	bt_shell_print("Client %s requested to read the sirk. Responding with %s",
+		       addr, rsp_strings[sirk_read_rsp]);
 
 	return sirk_read_rsp;
 }
@@ -353,12 +353,12 @@ size_t cap_acceptor_ad_data_add(struct bt_data data[], size_t data_size, bool di
 		 */
 		if (IS_ENABLED(CONFIG_BT_PRIVACY) &&
 		    !IS_ENABLED(CONFIG_BT_CSIP_SET_MEMBER_ENC_SIRK_SUPPORT)) {
-			shell_warn(ctx_shell, "RSI derived from unencrypted SIRK");
+			bt_shell_warn("RSI derived from unencrypted SIRK");
 		}
 
 		err = bt_csip_set_member_generate_rsi(cap_csip_svc_inst, ad_rsi);
 		if (err != 0) {
-			shell_error(ctx_shell, "Failed to generate RSI (err %d)", err);
+			bt_shell_error("Failed to generate RSI (err %d)", err);
 
 			return err;
 		}
diff --git a/subsys/bluetooth/audio/shell/cap_commander.c b/subsys/bluetooth/audio/shell/cap_commander.c
index d100cfeb1ed..c746cc886db 100644
--- a/subsys/bluetooth/audio/shell/cap_commander.c
+++ b/subsys/bluetooth/audio/shell/cap_commander.c
@@ -29,42 +29,42 @@ static void cap_discover_cb(struct bt_conn *conn, int err,
 			    const struct bt_csip_set_coordinator_csis_inst *csis_inst)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "discover failed (%d)", err);
+		bt_shell_error("discover failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "discovery completed%s", csis_inst == NULL ? "" : " with CSIS");
+	bt_shell_print("discovery completed%s", csis_inst == NULL ? "" : " with CSIS");
 }
 
 #if defined(CONFIG_BT_VCP_VOL_CTLR)
 static void cap_volume_changed_cb(struct bt_conn *conn, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Volume change failed (%d)", err);
+		bt_shell_error("Volume change failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Volume change completed");
+	bt_shell_print("Volume change completed");
 }
 
 static void cap_volume_mute_changed_cb(struct bt_conn *conn, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Volume mute change failed (%d)", err);
+		bt_shell_error("Volume mute change failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Volume mute change completed");
+	bt_shell_print("Volume mute change completed");
 }
 #if defined(CONFIG_BT_VCP_VOL_CTLR_VOCS)
 static void cap_volume_offset_changed_cb(struct bt_conn *conn, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Volume offset change failed (%d)", err);
+		bt_shell_error("Volume offset change failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Volume offset change completed");
+	bt_shell_print("Volume offset change completed");
 }
 #endif /* CONFIG_BT_VCP_VOL_CTLR_VOCS */
 #endif /* CONFIG_BT_VCP_VOL_CTLR */
@@ -73,22 +73,22 @@ static void cap_volume_offset_changed_cb(struct bt_conn *conn, int err)
 static void cap_microphone_mute_changed_cb(struct bt_conn *conn, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Microphone mute change failed (%d)", err);
+		bt_shell_error("Microphone mute change failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Microphone mute change completed");
+	bt_shell_print("Microphone mute change completed");
 }
 
 #if defined(CONFIG_BT_MICP_MIC_CTLR_AICS)
 static void cap_microphone_gain_changed_cb(struct bt_conn *conn, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Microphone gain change failed (%d)", err);
+		bt_shell_error("Microphone gain change failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Microphone gain change completed");
+	bt_shell_print("Microphone gain change completed");
 }
 #endif /* CONFIG_BT_MICP_MIC_CTLR_AICS */
 #endif /* CONFIG_BT_MICP_MIC_CTLR */
@@ -97,33 +97,33 @@ static void cap_microphone_gain_changed_cb(struct bt_conn *conn, int err)
 static void cap_broadcast_reception_start_cb(struct bt_conn *conn, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Broadcast reception start failed (%d)", err);
+		bt_shell_error("Broadcast reception start failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Broadcast reception start completed");
+	bt_shell_print("Broadcast reception start completed");
 }
 
 static void cap_broadcast_reception_stop_cb(struct bt_conn *conn, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Broadcast reception stop failed (%d) for conn %p", err,
-			    (void *)conn);
+		bt_shell_error("Broadcast reception stop failed (%d) for conn %p", err,
+			       (void *)conn);
 		return;
 	}
 
-	shell_print(ctx_shell, "Broadcast reception stop completed");
+	bt_shell_print("Broadcast reception stop completed");
 }
 
 static void cap_distribute_broadcast_code_cb(struct bt_conn *conn, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Distribute broadcast code failed (%d) for conn %p", err,
-			    (void *)conn);
+		bt_shell_error("Distribute broadcast code failed (%d) for conn %p", err,
+			       (void *)conn);
 		return;
 	}
 
-	shell_print(ctx_shell, "Distribute broadcast code completed");
+	bt_shell_error("Distribute broadcast code completed");
 }
 #endif
 
@@ -172,10 +172,6 @@ static int cmd_cap_commander_discover(const struct shell *sh, size_t argc, char
 		return -ENOEXEC;
 	}
 
-	if (ctx_shell == NULL) {
-		ctx_shell = sh;
-	}
-
 	if (!cbs_registered) {
 		bt_cap_commander_register_cb(&cbs);
 		cbs_registered = true;
diff --git a/subsys/bluetooth/audio/shell/cap_initiator.c b/subsys/bluetooth/audio/shell/cap_initiator.c
index b55cee3ad28..1a7dcc2e479 100644
--- a/subsys/bluetooth/audio/shell/cap_initiator.c
+++ b/subsys/bluetooth/audio/shell/cap_initiator.c
@@ -47,51 +47,50 @@ static void cap_discover_cb(struct bt_conn *conn, int err,
 			    const struct bt_csip_set_coordinator_csis_inst *csis_inst)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "discover failed (%d)", err);
+		bt_shell_error("discover failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "discovery completed%s",
-		    csis_inst == NULL ? "" : " with CSIS");
+	bt_shell_print("discovery completed%s",
+		       csis_inst == NULL ? "" : " with CSIS");
 }
 
 static void cap_unicast_start_complete_cb(int err, struct bt_conn *conn)
 {
 	if (err == -ECANCELED) {
-		shell_print(ctx_shell, "Unicast start was cancelled for conn %p", conn);
+		bt_shell_print("Unicast start was cancelled for conn %p", conn);
 	} else if (err != 0) {
-		shell_error(ctx_shell, "Unicast start failed for conn %p (%d)", conn, err);
+		bt_shell_error("Unicast start failed for conn %p (%d)", conn, err);
 	} else {
-		shell_print(ctx_shell, "Unicast start completed");
+		bt_shell_print("Unicast start completed");
 	}
 }
 
 static void unicast_update_complete_cb(int err, struct bt_conn *conn)
 {
 	if (err == -ECANCELED) {
-		shell_print(ctx_shell, "Unicast update was cancelled for conn %p", conn);
+		bt_shell_print("Unicast update was cancelled for conn %p", conn);
 	} else if (err != 0) {
-		shell_error(ctx_shell, "Unicast update failed for conn %p (%d)",
-			    conn, err);
+		bt_shell_error("Unicast update failed for conn %p (%d)", conn, err);
 	} else {
-		shell_print(ctx_shell, "Unicast updated completed");
+		bt_shell_print("Unicast updated completed");
 	}
 }
 
 static void unicast_stop_complete_cb(int err, struct bt_conn *conn)
 {
 	if (err == -ECANCELED) {
-		shell_print(ctx_shell, "Unicast stop was cancelled for conn %p", conn);
+		bt_shell_print("Unicast stop was cancelled for conn %p", conn);
 	} else if (err != 0) {
-		shell_error(ctx_shell, "Unicast stop failed for conn %p (%d)", conn, err);
+		bt_shell_error("Unicast stop failed for conn %p (%d)", conn, err);
 	} else {
-		shell_print(ctx_shell, "Unicast stop completed");
+		bt_shell_print("Unicast stop completed");
 
 		if (default_unicast_group != NULL) {
 			err = bt_bap_unicast_group_delete(default_unicast_group);
 			if (err != 0) {
-				shell_error(ctx_shell, "Failed to delete unicast group %p: %d",
-					    default_unicast_group, err);
+				bt_shell_error("Failed to delete unicast group %p: %d",
+					       default_unicast_group, err);
 			} else {
 				default_unicast_group = NULL;
 			}
@@ -117,10 +116,6 @@ static int cmd_cap_initiator_discover(const struct shell *sh, size_t argc,
 		return -ENOEXEC;
 	}
 
-	if (ctx_shell == NULL) {
-		ctx_shell = sh;
-	}
-
 	if (!cbs_registered) {
 		bt_cap_initiator_register_cb(&cbs);
 		cbs_registered = true;
@@ -580,8 +575,7 @@ static int cap_ac_unicast_start(const struct bap_unicast_ac_param *param,
 		for (size_t j = 0U; j < param->snk_cnt[i]; j++) {
 			snk_eps[snk_ep_cnt] = snks[bt_conn_index(connected_conns[i])][j];
 			if (snk_eps[snk_ep_cnt] == NULL) {
-				shell_error(ctx_shell, "No sink[%zu][%zu] endpoint available", i,
-					    j);
+				bt_shell_error("No sink[%zu][%zu] endpoint available", i, j);
 
 				return -ENOEXEC;
 			}
@@ -593,8 +587,7 @@ static int cap_ac_unicast_start(const struct bap_unicast_ac_param *param,
 		for (size_t j = 0U; j < param->src_cnt[i]; j++) {
 			src_eps[src_ep_cnt] = srcs[bt_conn_index(connected_conns[i])][j];
 			if (src_eps[src_ep_cnt] == NULL) {
-				shell_error(ctx_shell, "No source[%zu][%zu] endpoint available", i,
-					    j);
+				bt_shell_error("No source[%zu][%zu] endpoint available", i, j);
 
 				return -ENOEXEC;
 			}
@@ -604,15 +597,15 @@ static int cap_ac_unicast_start(const struct bap_unicast_ac_param *param,
 	}
 
 	if (snk_ep_cnt != snk_cnt) {
-		shell_error(ctx_shell, "Sink endpoint and stream count mismatch: %zu != %zu",
-			    snk_ep_cnt, snk_cnt);
+		bt_shell_error("Sink endpoint and stream count mismatch: %zu != %zu",
+			       snk_ep_cnt, snk_cnt);
 
 		return -ENOEXEC;
 	}
 
 	if (src_ep_cnt != src_cnt) {
-		shell_error(ctx_shell, "Source  endpoint and stream count mismatch: %zu != %zu",
-			    src_ep_cnt, src_cnt);
+		bt_shell_error("Source  endpoint and stream count mismatch: %zu != %zu",
+			       src_ep_cnt, src_cnt);
 
 		return -ENOEXEC;
 	}
@@ -831,10 +824,6 @@ int cap_ac_unicast(const struct shell *sh, const struct bap_unicast_ac_param *pa
 		}
 	}
 
-	if (!ctx_shell) {
-		ctx_shell = sh;
-	}
-
 	err = bap_ac_create_unicast_group(param, snk_uni_streams, snk_cnt, src_uni_streams,
 					  src_cnt);
 	if (err != 0) {
@@ -1230,7 +1219,7 @@ static int cmd_broadcast_delete(const struct shell *sh, size_t argc, char *argv[
 }
 
 int cap_ac_broadcast(const struct shell *sh, size_t argc, char **argv,
-			    const struct bap_broadcast_ac_param *param)
+		     const struct bap_broadcast_ac_param *param)
 {
 	/* TODO: Use CAP API when the CAP shell has broadcast support */
 	struct bt_cap_initiator_broadcast_stream_param stream_params[BAP_UNICAST_AC_MAX_SRC] = {0};
diff --git a/subsys/bluetooth/audio/shell/csip_set_coordinator.c b/subsys/bluetooth/audio/shell/csip_set_coordinator.c
index 45928934254..c2bb032f5b5 100644
--- a/subsys/bluetooth/audio/shell/csip_set_coordinator.c
+++ b/subsys/bluetooth/audio/shell/csip_set_coordinator.c
@@ -32,6 +32,7 @@
 #include <zephyr/shell/shell.h>
 
 #include "host/shell/bt.h"
+#include "common/bt_shell_private.h"
 
 static uint8_t members_found;
 static struct k_work_delayable discover_members_timer;
@@ -59,19 +60,18 @@ static void connected_cb(struct bt_conn *conn, uint8_t err)
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
 
 	if (err != 0) {
-		shell_error(ctx_shell, "Failed to connect to %s (%u)",
-			    addr, err);
+		bt_shell_error("Failed to connect to %s (%u)", addr, err);
 		return;
 	}
 
 	conn_index = bt_conn_index(conn);
 
-	shell_print(ctx_shell, "[%u]: Connected to %s", conn_index, addr);
+	bt_shell_print("[%u]: Connected to %s", conn_index, addr);
 
 	/* TODO: Handle RPAs */
 
 	conns[conn_index] = bt_conn_ref(conn);
-	shell_print(ctx_shell, "Member[%u] connected", conn_index);
+	bt_shell_print("Member[%u] connected", conn_index);
 }
 
 static void disconnected_cb(struct bt_conn *conn, uint8_t reason)
@@ -94,25 +94,24 @@ static void csip_discover_cb(struct bt_conn *conn,
 	uint8_t conn_index;
 
 	if (err != 0) {
-		shell_error(ctx_shell, "discover failed (%d)", err);
+		bt_shell_error("discover failed (%d)", err);
 		return;
 	}
 
 	if (set_count == 0) {
-		shell_warn(ctx_shell, "Device has no sets");
+		bt_shell_warn("Device has no sets");
 		return;
 	}
 
 	conn_index = bt_conn_index(conn);
 
-	shell_print(ctx_shell, "Found %zu sets on member[%u]",
-		    set_count, conn_index);
+	bt_shell_print("Found %zu sets on member[%u]", set_count, conn_index);
 
 	for (size_t i = 0U; i < set_count; i++) {
-		shell_print(ctx_shell, "CSIS[%zu]: %p", i, &member->insts[i]);
-		shell_print(ctx_shell, "\tRank: %u", member->insts[i].info.rank);
-		shell_print(ctx_shell, "\tSet Size: %u", member->insts[i].info.set_size);
-		shell_print(ctx_shell, "\tLockable: %u", member->insts[i].info.lockable);
+		bt_shell_print("CSIS[%zu]: %p", i, &member->insts[i]);
+		bt_shell_print("\tRank: %u", member->insts[i].info.rank);
+		bt_shell_print("\tSet Size: %u", member->insts[i].info.set_size);
+		bt_shell_print("\tLockable: %u", member->insts[i].info.lockable);
 	}
 
 	set_members[conn_index] = member;
@@ -121,21 +120,21 @@ static void csip_discover_cb(struct bt_conn *conn,
 static void csip_set_coordinator_lock_set_cb(int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Lock sets failed (%d)", err);
+		bt_shell_error("Lock sets failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Set locked");
+	bt_shell_print("Set locked");
 }
 
 static void csip_set_coordinator_release_set_cb(int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Lock sets failed (%d)", err);
+		bt_shell_error("Lock sets failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Set released");
+	bt_shell_print("Set released");
 }
 
 static void csip_set_coordinator_ordered_access_cb(
@@ -197,19 +196,18 @@ static bool csip_found(struct bt_data *data, void *user_data)
 		char addr_str[BT_ADDR_LE_STR_LEN];
 
 		bt_addr_le_to_str(addr, addr_str, sizeof(addr_str));
-		shell_print(ctx_shell, "Found CSIP advertiser with address %s",
-			    addr_str);
+		bt_shell_print("Found CSIP advertiser with address %s", addr_str);
 
 		if (is_discovered(addr)) {
-			shell_print(ctx_shell, "Set member already found");
+			bt_shell_print("Set member already found");
 			/* Stop parsing */
 			return false;
 		}
 
 		bt_addr_le_copy(&addr_found[members_found++], addr);
 
-		shell_print(ctx_shell, "Found member (%u / %u)",
-			    members_found, cur_inst->info.set_size);
+		bt_shell_print("Found member (%u / %u)",
+			       members_found, cur_inst->info.set_size);
 
 		if (members_found == cur_inst->info.set_size) {
 			int err;
@@ -220,9 +218,7 @@ static bool csip_found(struct bt_data *data, void *user_data)
 
 			err = bt_le_scan_stop();
 			if (err != 0) {
-				shell_error(ctx_shell,
-					    "Failed to stop scan: %d",
-					    err);
+				bt_shell_error("Failed to stop scan: %d", err);
 			}
 		}
 
@@ -237,14 +233,14 @@ static void discover_members_timer_handler(struct k_work *work)
 {
 	int err;
 
-	shell_error(ctx_shell, "Could not find all members (%u / %u)",
-		    members_found, cur_inst->info.set_size);
+	bt_shell_error("Could not find all members (%u / %u)",
+		       members_found, cur_inst->info.set_size);
 
 	bt_le_scan_cb_unregister(&csip_set_coordinator_scan_callbacks);
 
 	err = bt_le_scan_stop();
 	if (err != 0) {
-		shell_error(ctx_shell, "Failed to stop scan: %d", err);
+		bt_shell_error("Failed to stop scan: %d", err);
 	}
 }
 
@@ -281,10 +277,6 @@ static int cmd_csip_set_coordinator_discover(const struct shell *sh,
 		}
 	}
 
-	if (ctx_shell == NULL) {
-		ctx_shell = sh;
-	}
-
 	conn = conns[member_index];
 
 	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
diff --git a/subsys/bluetooth/audio/shell/csip_set_member.c b/subsys/bluetooth/audio/shell/csip_set_member.c
index 246483513a9..23078149767 100644
--- a/subsys/bluetooth/audio/shell/csip_set_member.c
+++ b/subsys/bluetooth/audio/shell/csip_set_member.c
@@ -30,8 +30,8 @@
 #include <zephyr/shell/shell.h>
 
 #include "host/shell/bt.h"
+#include "common/bt_shell_private.h"
 
-extern const struct shell *ctx_shell;
 struct bt_csip_set_member_svc_inst *svc_inst;
 static uint8_t sirk_read_rsp = BT_CSIP_READ_SIRK_REQ_RSP_ACCEPT;
 
@@ -40,15 +40,15 @@ static void locked_cb(struct bt_conn *conn,
 		      bool locked)
 {
 	if (conn == NULL) {
-		shell_error(ctx_shell, "Server %s the device",
-			    locked ? "locked" : "released");
+		bt_shell_error("Server %s the device",
+			       locked ? "locked" : "released");
 	} else {
 		char addr[BT_ADDR_LE_STR_LEN];
 
 		conn_addr_str(conn, addr, sizeof(addr));
 
-		shell_print(ctx_shell, "Client %s %s the device",
-			    addr, locked ? "locked" : "released");
+		bt_shell_print("Client %s %s the device",
+			       addr, locked ? "locked" : "released");
 	}
 }
 
@@ -62,8 +62,8 @@ static uint8_t sirk_read_req_cb(struct bt_conn *conn,
 
 	conn_addr_str(conn, addr, sizeof(addr));
 
-	shell_print(ctx_shell, "Client %s requested to read the sirk. "
-		    "Responding with %s", addr, rsp_strings[sirk_read_rsp]);
+	bt_shell_print("Client %s requested to read the sirk. Responding with %s",
+		       addr, rsp_strings[sirk_read_rsp]);
 
 	return sirk_read_rsp;
 }
@@ -327,12 +327,12 @@ ssize_t csis_ad_data_add(struct bt_data *data_array, const size_t data_array_siz
 		 */
 		if (IS_ENABLED(CONFIG_BT_PRIVACY) &&
 		    !IS_ENABLED(CONFIG_BT_CSIP_SET_MEMBER_ENC_SIRK_SUPPORT)) {
-			shell_warn(ctx_shell, "RSI derived from unencrypted SIRK");
+			bt_shell_warn("RSI derived from unencrypted SIRK");
 		}
 
 		err = bt_csip_set_member_generate_rsi(svc_inst, ad_rsi);
 		if (err != 0) {
-			shell_error(ctx_shell, "Failed to generate RSI (err %d)", err);
+			bt_shell_error("Failed to generate RSI (err %d)", err);
 			return err;
 		}
 
diff --git a/subsys/bluetooth/audio/shell/gmap.c b/subsys/bluetooth/audio/shell/gmap.c
index 0e8514e0563..93f3fe19f2f 100644
--- a/subsys/bluetooth/audio/shell/gmap.c
+++ b/subsys/bluetooth/audio/shell/gmap.c
@@ -66,15 +66,14 @@ static void gmap_discover_cb(struct bt_conn *conn, int err, enum bt_gmap_role ro
 			     struct bt_gmap_feat features)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "gmap discovery (err %d)", err);
+		bt_shell_error("gmap discovery (err %d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell,
-		    "gmap discovered for conn %p:\n\trole 0x%02x\n\tugg_feat 0x%02x\n\tugt_feat "
-		    "0x%02x\n\tbgs_feat 0x%02x\n\tbgr_feat 0x%02x",
-		    conn, role, features.ugg_feat, features.ugt_feat, features.bgs_feat,
-		    features.bgr_feat);
+	bt_shell_print("gmap discovered for conn %p:\n\trole 0x%02x\n\tugg_feat 0x%02x\n\tugt_feat "
+		       "0x%02x\n\tbgs_feat 0x%02x\n\tbgr_feat 0x%02x",
+		       conn, role, features.ugg_feat, features.ugt_feat, features.bgs_feat,
+		       features.bgr_feat);
 }
 
 static const struct bt_gmap_cb gmap_cb = {
@@ -199,10 +198,6 @@ static int cmd_gmap_discover(const struct shell *sh, size_t argc, char **argv)
 		return -ENOEXEC;
 	}
 
-	if (!ctx_shell) {
-		ctx_shell = sh;
-	}
-
 	err = bt_gmap_discover(default_conn);
 	if (err != 0) {
 		shell_error(sh, "bt_gmap_discover (err %d)", err);
diff --git a/subsys/bluetooth/audio/shell/has.c b/subsys/bluetooth/audio/shell/has.c
index e2b9a78ce61..9f92ab7f2c7 100644
--- a/subsys/bluetooth/audio/shell/has.c
+++ b/subsys/bluetooth/audio/shell/has.c
@@ -21,6 +21,7 @@
 #include <zephyr/shell/shell_string_conv.h>
 
 #include "host/shell/bt.h"
+#include "common/bt_shell_private.h"
 
 static int preset_select(uint8_t index, bool sync)
 {
@@ -29,7 +30,7 @@ static int preset_select(uint8_t index, bool sync)
 
 static void preset_name_changed(uint8_t index, const char *name)
 {
-	shell_print(ctx_shell, "Preset name changed index %u name %s", index, name);
+	bt_shell_print("Preset name changed index %u name %s", index, name);
 }
 
 static const struct bt_has_preset_ops preset_ops = {
diff --git a/subsys/bluetooth/audio/shell/has_client.c b/subsys/bluetooth/audio/shell/has_client.c
index 3db8ff59ee1..b396b7be521 100644
--- a/subsys/bluetooth/audio/shell/has_client.c
+++ b/subsys/bluetooth/audio/shell/has_client.c
@@ -21,6 +21,7 @@
 #include <zephyr/shell/shell_string_conv.h>
 
 #include "host/shell/bt.h"
+#include "common/bt_shell_private.h"
 
 static struct bt_has *inst;
 
@@ -29,12 +30,12 @@ static void has_client_discover_cb(struct bt_conn *conn, int err, struct bt_has
 				   enum bt_has_capabilities caps)
 {
 	if (err) {
-		shell_error(ctx_shell, "HAS discovery (err %d)", err);
+		bt_shell_error("HAS discovery (err %d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "HAS discovered %p type 0x%02x caps 0x%02x for conn %p",
-		    has, type, caps, conn);
+	bt_shell_print("HAS discovered %p type 0x%02x caps 0x%02x for conn %p",
+		       has, type, caps, conn);
 
 	inst = has;
 }
@@ -42,9 +43,9 @@ static void has_client_discover_cb(struct bt_conn *conn, int err, struct bt_has
 static void has_client_preset_switch_cb(struct bt_has *has, int err, uint8_t index)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "HAS %p preset switch error (err %d)", has, err);
+		bt_shell_error("HAS %p preset switch error (err %d)", has, err);
 	} else {
-		shell_print(ctx_shell, "HAS %p preset switch index 0x%02x", has, index);
+		bt_shell_print("HAS %p preset switch index 0x%02x", has, index);
 	}
 }
 
@@ -52,15 +53,15 @@ static void has_client_preset_read_rsp_cb(struct bt_has *has, int err,
 					  const struct bt_has_preset_record *record, bool is_last)
 {
 	if (err) {
-		shell_error(ctx_shell, "Preset Read operation failed (err %d)", err);
+		bt_shell_error("Preset Read operation failed (err %d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Preset Index: 0x%02x\tProperties: 0x%02x\tName: %s",
-		    record->index, record->properties, record->name);
+	bt_shell_print("Preset Index: 0x%02x\tProperties: 0x%02x\tName: %s",
+		       record->index, record->properties, record->name);
 
 	if (is_last) {
-		shell_print(ctx_shell, "Preset Read operation complete");
+		bt_shell_print("Preset Read operation complete");
 	}
 }
 
@@ -74,10 +75,6 @@ static int cmd_has_client_init(const struct shell *sh, size_t argc, char **argv)
 {
 	int err;
 
-	if (!ctx_shell) {
-		ctx_shell = sh;
-	}
-
 	err = bt_has_client_cb_register(&has_client_cb);
 	if (err != 0) {
 		shell_error(sh, "bt_has_client_cb_register (err %d)", err);
@@ -95,10 +92,6 @@ static int cmd_has_client_discover(const struct shell *sh, size_t argc, char **a
 		return -ENOEXEC;
 	}
 
-	if (!ctx_shell) {
-		ctx_shell = sh;
-	}
-
 	err = bt_has_client_discover(default_conn);
 	if (err != 0) {
 		shell_error(sh, "bt_has_client_discover (err %d)", err);
diff --git a/subsys/bluetooth/audio/shell/mcc.c b/subsys/bluetooth/audio/shell/mcc.c
index b49c49ce78f..c1474dc2739 100644
--- a/subsys/bluetooth/audio/shell/mcc.c
+++ b/subsys/bluetooth/audio/shell/mcc.c
@@ -29,6 +29,7 @@
 #include <zephyr/sys/util.h>
 
 #include "host/shell/bt.h"
+#include "common/bt_shell_private.h"
 
 #include "../media_proxy_internal.h"
 
@@ -53,21 +54,21 @@ static struct object_ids_t obj_ids;
 static void mcc_discover_mcs_cb(struct bt_conn *conn, int err)
 {
 	if (err) {
-		shell_error(ctx_shell, "Discovery failed (%d)", err);
+		bt_shell_error("Discovery failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Discovery complete");
+	bt_shell_print("Discovery complete");
 }
 
 static void mcc_read_player_name_cb(struct bt_conn *conn, int err, const char *name)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player Name read failed (%d)", err);
+		bt_shell_error("Player Name read failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player name: %s", name);
+	bt_shell_print("Player name: %s", name);
 }
 
 #ifdef CONFIG_BT_MCC_OTS
@@ -76,12 +77,12 @@ static void mcc_read_icon_obj_id_cb(struct bt_conn *conn, int err, uint64_t id)
 	char str[BT_OTS_OBJ_ID_STR_LEN];
 
 	if (err) {
-		shell_error(ctx_shell, "Icon Object ID read failed (%d)", err);
+		bt_shell_error("Icon Object ID read failed (%d)", err);
 		return;
 	}
 
 	(void)bt_ots_obj_id_to_str(id, str, sizeof(str));
-	shell_print(ctx_shell, "Icon object ID: %s", str);
+	bt_shell_print("Icon object ID: %s", str);
 
 	obj_ids.icon_obj_id = id;
 }
@@ -91,11 +92,11 @@ static void mcc_read_icon_obj_id_cb(struct bt_conn *conn, int err, uint64_t id)
 static void mcc_read_icon_url_cb(struct bt_conn *conn, int err, const char *url)
 {
 	if (err) {
-		shell_error(ctx_shell, "Icon URL read failed (%d)", err);
+		bt_shell_error("Icon URL read failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Icon URL: 0x%s", url);
+	bt_shell_print("Icon URL: 0x%s", url);
 }
 #endif /* defined(CONFIG_BT_MCC_READ_MEDIA_PLAYER_ICON_URL) */
 
@@ -103,33 +104,33 @@ static void mcc_read_icon_url_cb(struct bt_conn *conn, int err, const char *url)
 static void mcc_read_track_title_cb(struct bt_conn *conn, int err, const char *title)
 {
 	if (err) {
-		shell_error(ctx_shell, "Track title read failed (%d)", err);
+		bt_shell_error("Track title read failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Track title: %s", title);
+	bt_shell_print("Track title: %s", title);
 }
 #endif /* defined(CONFIG_BT_MCC_READ_TRACK_TITLE) */
 
 static void mcc_track_changed_ntf_cb(struct bt_conn *conn, int err)
 {
 	if (err) {
-		shell_error(ctx_shell, "Track changed notification failed (%d)", err);
+		bt_shell_error("Track changed notification failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Track changed");
+	bt_shell_print("Track changed");
 }
 
 #if defined(CONFIG_BT_MCC_READ_TRACK_DURATION)
 static void mcc_read_track_duration_cb(struct bt_conn *conn, int err, int32_t dur)
 {
 	if (err) {
-		shell_error(ctx_shell, "Track duration read failed (%d)", err);
+		bt_shell_error("Track duration read failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Track duration: %d", dur);
+	bt_shell_print("Track duration: %d", dur);
 }
 #endif /* defined(CONFIG_BT_MCC_READ_TRACK_DURATION) */
 
@@ -137,11 +138,11 @@ static void mcc_read_track_duration_cb(struct bt_conn *conn, int err, int32_t du
 static void mcc_read_track_position_cb(struct bt_conn *conn, int err, int32_t pos)
 {
 	if (err) {
-		shell_error(ctx_shell, "Track position read failed (%d)", err);
+		bt_shell_error("Track position read failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Track Position: %d", pos);
+	bt_shell_print("Track Position: %d", pos);
 }
 #endif /* defined(CONFIG_BT_MCC_READ_TRACK_POSITION) */
 
@@ -149,11 +150,11 @@ static void mcc_read_track_position_cb(struct bt_conn *conn, int err, int32_t po
 static void mcc_set_track_position_cb(struct bt_conn *conn, int err, int32_t pos)
 {
 	if (err) {
-		shell_error(ctx_shell, "Track Position set failed (%d)", err);
+		bt_shell_error("Track Position set failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Track Position: %d", pos);
+	bt_shell_print("Track Position: %d", pos);
 }
 #endif /* defined(CONFIG_BT_MCC_SET_TRACK_POSITION) */
 
@@ -162,11 +163,11 @@ static void mcc_read_playback_speed_cb(struct bt_conn *conn, int err,
 				       int8_t speed)
 {
 	if (err) {
-		shell_error(ctx_shell, "Playback speed read failed (%d)", err);
+		bt_shell_error("Playback speed read failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Playback speed: %d", speed);
+	bt_shell_print("Playback speed: %d", speed);
 }
 #endif /* defined (CONFIG_BT_MCC_READ_PLAYBACK_SPEED) */
 
@@ -174,11 +175,11 @@ static void mcc_read_playback_speed_cb(struct bt_conn *conn, int err,
 static void mcc_set_playback_speed_cb(struct bt_conn *conn, int err, int8_t speed)
 {
 	if (err) {
-		shell_error(ctx_shell, "Playback speed set failed (%d)", err);
+		bt_shell_error("Playback speed set failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Playback speed: %d", speed);
+	bt_shell_print("Playback speed: %d", speed);
 }
 #endif /* defined (CONFIG_BT_MCC_SET_PLAYBACK_SPEED) */
 
@@ -187,11 +188,11 @@ static void mcc_read_seeking_speed_cb(struct bt_conn *conn, int err,
 				      int8_t speed)
 {
 	if (err) {
-		shell_error(ctx_shell, "Seeking speed read failed (%d)", err);
+		bt_shell_error("Seeking speed read failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Seeking speed: %d", speed);
+	bt_shell_print("Seeking speed: %d", speed);
 }
 #endif /* defined (CONFIG_BT_MCC_READ_SEEKING_SPEED) */
 
@@ -203,13 +204,12 @@ static void mcc_read_segments_obj_id_cb(struct bt_conn *conn, int err,
 	char str[BT_OTS_OBJ_ID_STR_LEN];
 
 	if (err) {
-		shell_error(ctx_shell,
-			    "Track Segments Object ID read failed (%d)", err);
+		bt_shell_error("Track Segments Object ID read failed (%d)", err);
 		return;
 	}
 
 	(void)bt_ots_obj_id_to_str(id, str, sizeof(str));
-	shell_print(ctx_shell, "Track Segments Object ID: %s", str);
+	bt_shell_print("Track Segments Object ID: %s", str);
 
 	obj_ids.track_segments_obj_id = id;
 }
@@ -221,13 +221,12 @@ static void mcc_read_current_track_obj_id_cb(struct bt_conn *conn, int err,
 	char str[BT_OTS_OBJ_ID_STR_LEN];
 
 	if (err) {
-		shell_error(ctx_shell, "Current Track Object ID read failed (%d)",
-			    err);
+		bt_shell_error("Current Track Object ID read failed (%d)", err);
 		return;
 	}
 
 	(void)bt_ots_obj_id_to_str(id, str, sizeof(str));
-	shell_print(ctx_shell, "Current Track Object ID: %s", str);
+	bt_shell_print("Current Track Object ID: %s", str);
 
 	obj_ids.current_track_obj_id = id;
 }
@@ -239,12 +238,12 @@ static void mcc_set_current_track_obj_id_cb(struct bt_conn *conn, int err,
 	char str[BT_OTS_OBJ_ID_STR_LEN];
 
 	if (err) {
-		shell_error(ctx_shell, "Current Track Object ID set failed (%d)", err);
+		bt_shell_error("Current Track Object ID set failed (%d)", err);
 		return;
 	}
 
 	(void)bt_ots_obj_id_to_str(id, str, sizeof(str));
-	shell_print(ctx_shell, "Current Track Object ID written: %s", str);
+	bt_shell_print("Current Track Object ID written: %s", str);
 }
 
 
@@ -254,16 +253,15 @@ static void mcc_read_next_track_obj_id_cb(struct bt_conn *conn, int err,
 	char str[BT_OTS_OBJ_ID_STR_LEN];
 
 	if (err) {
-		shell_error(ctx_shell, "Next Track Object ID read failed (%d)",
-			    err);
+		bt_shell_error("Next Track Object ID read failed (%d)", err);
 		return;
 	}
 
 	if (id == MPL_NO_TRACK_ID) {
-		shell_print(ctx_shell, "Next Track Object ID is empty");
+		bt_shell_print("Next Track Object ID is empty");
 	} else {
 		(void)bt_ots_obj_id_to_str(id, str, sizeof(str));
-		shell_print(ctx_shell, "Next Track Object ID: %s", str);
+		bt_shell_print("Next Track Object ID: %s", str);
 	}
 
 	obj_ids.next_track_obj_id = id;
@@ -276,12 +274,12 @@ static void mcc_set_next_track_obj_id_cb(struct bt_conn *conn, int err,
 	char str[BT_OTS_OBJ_ID_STR_LEN];
 
 	if (err) {
-		shell_error(ctx_shell, "Next Track Object ID set failed (%d)", err);
+		bt_shell_error("Next Track Object ID set failed (%d)", err);
 		return;
 	}
 
 	(void)bt_ots_obj_id_to_str(id, str, sizeof(str));
-	shell_print(ctx_shell, "Next Track Object ID written: %s", str);
+	bt_shell_print("Next Track Object ID written: %s", str);
 }
 
 
@@ -291,13 +289,12 @@ static void mcc_read_parent_group_obj_id_cb(struct bt_conn *conn, int err,
 	char str[BT_OTS_OBJ_ID_STR_LEN];
 
 	if (err) {
-		shell_error(ctx_shell,
-			    "Parent Group Object ID read failed (%d)", err);
+		bt_shell_error("Parent Group Object ID read failed (%d)", err);
 		return;
 	}
 
 	(void)bt_ots_obj_id_to_str(id, str, sizeof(str));
-	shell_print(ctx_shell, "Parent Group Object ID: %s", str);
+	bt_shell_print("Parent Group Object ID: %s", str);
 
 	obj_ids.parent_group_obj_id = id;
 }
@@ -309,13 +306,12 @@ static void mcc_read_current_group_obj_id_cb(struct bt_conn *conn, int err,
 	char str[BT_OTS_OBJ_ID_STR_LEN];
 
 	if (err) {
-		shell_error(ctx_shell,
-			    "Current Group Object ID read failed (%d)", err);
+		bt_shell_error("Current Group Object ID read failed (%d)", err);
 		return;
 	}
 
 	(void)bt_ots_obj_id_to_str(id, str, sizeof(str));
-	shell_print(ctx_shell, "Current Group Object ID: %s", str);
+	bt_shell_print("Current Group Object ID: %s", str);
 
 	obj_ids.current_group_obj_id = id;
 }
@@ -326,12 +322,12 @@ static void mcc_set_current_group_obj_id_cb(struct bt_conn *conn, int err,
 	char str[BT_OTS_OBJ_ID_STR_LEN];
 
 	if (err) {
-		shell_error(ctx_shell, "Current Group Object ID set failed (%d)", err);
+		bt_shell_error("Current Group Object ID set failed (%d)", err);
 		return;
 	}
 
 	(void)bt_ots_obj_id_to_str(id, str, sizeof(str));
-	shell_print(ctx_shell, "Current Group Object ID written: %s", str);
+	bt_shell_print("Current Group Object ID written: %s", str);
 }
 #endif /* CONFIG_BT_MCC_OTS */
 
@@ -340,11 +336,11 @@ static void mcc_set_current_group_obj_id_cb(struct bt_conn *conn, int err,
 static void mcc_read_playing_order_cb(struct bt_conn *conn, int err, uint8_t order)
 {
 	if (err) {
-		shell_error(ctx_shell, "Playing order read failed (%d)", err);
+		bt_shell_error("Playing order read failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Playing order: %d", order);
+	bt_shell_print("Playing order: %d", order);
 }
 #endif /* defined(CONFIG_BT_MCC_READ_PLAYING_ORDER) */
 
@@ -352,11 +348,11 @@ static void mcc_read_playing_order_cb(struct bt_conn *conn, int err, uint8_t ord
 static void mcc_set_playing_order_cb(struct bt_conn *conn, int err, uint8_t order)
 {
 	if (err) {
-		shell_error(ctx_shell, "Playing order set failed (%d)", err);
+		bt_shell_error("Playing order set failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Playing order: %d", order);
+	bt_shell_print("Playing order: %d", order);
 }
 #endif /* defined(CONFIG_BT_MCC_SET_PLAYING_ORDER) */
 
@@ -365,12 +361,11 @@ static void mcc_read_playing_orders_supported_cb(struct bt_conn *conn, int err,
 						 uint16_t orders)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "Playing orders supported read failed (%d)", err);
+		bt_shell_error("Playing orders supported read failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Playing orders supported: %d", orders);
+	bt_shell_print("Playing orders supported: %d", orders);
 }
 #endif /* defined(CONFIG_BT_MCC_READ_PLAYING_ORDER_SUPPORTED) */
 
@@ -378,11 +373,11 @@ static void mcc_read_playing_orders_supported_cb(struct bt_conn *conn, int err,
 static void mcc_read_media_state_cb(struct bt_conn *conn, int err, uint8_t state)
 {
 	if (err) {
-		shell_error(ctx_shell, "Media State read failed (%d)", err);
+		bt_shell_error("Media State read failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Media State: %d", state);
+	bt_shell_print("Media State: %d", state);
 }
 #endif /* defined(CONFIG_BT_MCC_READ_MEDIA_STATE) */
 
@@ -390,13 +385,12 @@ static void mcc_read_media_state_cb(struct bt_conn *conn, int err, uint8_t state
 static void mcc_send_cmd_cb(struct bt_conn *conn, int err, const struct mpl_cmd *cmd)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "Command send failed (%d) - opcode: %d, param: %d",
-			    err, cmd->opcode, cmd->param);
+		bt_shell_error("Command send failed (%d) - opcode: %d, param: %d",
+			       err, cmd->opcode, cmd->param);
 		return;
 	}
 
-	shell_print(ctx_shell, "Command opcode: %d, param: %d", cmd->opcode, cmd->param);
+	bt_shell_print("Command opcode: %d, param: %d", cmd->opcode, cmd->param);
 }
 #endif /* defined(CONFIG_BT_MCC_SET_MEDIA_CONTROL_POINT) */
 
@@ -404,14 +398,13 @@ static void mcc_cmd_ntf_cb(struct bt_conn *conn, int err,
 			   const struct mpl_cmd_ntf *ntf)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "Command notification error (%d) - opcode: %d, result: %d",
-			    err, ntf->requested_opcode, ntf->result_code);
+		bt_shell_error("Command notification error (%d) - opcode: %d, result: %d",
+			       err, ntf->requested_opcode, ntf->result_code);
 		return;
 	}
 
-	shell_print(ctx_shell, "Command opcode: %d, result: %d",
-		    ntf->requested_opcode, ntf->result_code);
+	bt_shell_print("Command opcode: %d, result: %d",
+		       ntf->requested_opcode, ntf->result_code);
 }
 
 #if defined(CONFIG_BT_MCC_READ_MEDIA_CONTROL_POINT_OPCODES_SUPPORTED)
@@ -419,12 +412,11 @@ static void mcc_read_opcodes_supported_cb(struct bt_conn *conn, int err,
 					    uint32_t opcodes)
 {
 	if (err) {
-		shell_error(ctx_shell, "Opcodes supported read failed (%d)",
-			    err);
+		bt_shell_error("Opcodes supported read failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Opcodes supported: %d", opcodes);
+	bt_shell_print("Opcodes supported: %d", opcodes);
 }
 #endif /* defined(CONFIG_BT_MCC_READ_MEDIA_CONTROL_POINT_OPCODES_SUPPORTED) */
 
@@ -433,25 +425,22 @@ static void mcc_send_search_cb(struct bt_conn *conn, int err,
 			       const struct mpl_search *search)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "Search send failed (%d)", err);
+		bt_shell_error("Search send failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Search sent");
+	bt_shell_print("Search sent");
 }
 
 static void mcc_search_ntf_cb(struct bt_conn *conn, int err, uint8_t result_code)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "Search notification error (%d), result code: %d",
-			    err, result_code);
+		bt_shell_error("Search notification error (%d), result code: %d",
+			       err, result_code);
 		return;
 	}
 
-	shell_print(ctx_shell, "Search notification result code: %d",
-		    result_code);
+	bt_shell_print("Search notification result code: %d", result_code);
 }
 
 static void mcc_read_search_results_obj_id_cb(struct bt_conn *conn, int err,
@@ -460,16 +449,15 @@ static void mcc_read_search_results_obj_id_cb(struct bt_conn *conn, int err,
 	char str[BT_OTS_OBJ_ID_STR_LEN];
 
 	if (err) {
-		shell_error(ctx_shell,
-			    "Search Results Object ID read failed (%d)", err);
+		bt_shell_error("Search Results Object ID read failed (%d)", err);
 		return;
 	}
 
 	if (id == 0) {
-		shell_print(ctx_shell, "Search Results Object ID: 0x000000000000");
+		bt_shell_print("Search Results Object ID: 0x000000000000");
 	} else {
 		(void)bt_ots_obj_id_to_str(id, str, sizeof(str));
-		shell_print(ctx_shell, "Search Results Object ID: %s", str);
+		bt_shell_print("Search Results Object ID: %s", str);
 	}
 
 	obj_ids.search_results_obj_id = id;
@@ -480,11 +468,11 @@ static void mcc_read_search_results_obj_id_cb(struct bt_conn *conn, int err,
 static void mcc_read_content_control_id_cb(struct bt_conn *conn, int err, uint8_t ccid)
 {
 	if (err) {
-		shell_error(ctx_shell, "Content Control ID read failed (%d)", err);
+		bt_shell_error("Content Control ID read failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Content Control ID: %d", ccid);
+	bt_shell_print("Content Control ID: %d", ccid);
 }
 #endif /* defined(CONFIG_BT_MCC_READ_CONTENT_CONTROL_ID) */
 
@@ -493,36 +481,33 @@ static void mcc_read_content_control_id_cb(struct bt_conn *conn, int err, uint8_
 static void mcc_otc_obj_selected_cb(struct bt_conn *conn, int err)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "Error in selecting object (err %d)", err);
+		bt_shell_error("Error in selecting object (err %d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Selecting object succeeded");
+	bt_shell_print("Selecting object succeeded");
 }
 
 static void mcc_otc_obj_metadata_cb(struct bt_conn *conn, int err)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "Error in reading object metadata (err %d)", err);
+		bt_shell_error("Error in reading object metadata (err %d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Reading object metadata succeeded\n");
+	bt_shell_print("Reading object metadata succeeded\n");
 }
 
 static void mcc_icon_object_read_cb(struct bt_conn *conn, int err,
 				    struct net_buf_simple *buf)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "Icon Object read failed (%d)", err);
+		bt_shell_error("Icon Object read failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Icon content (%d octets)", buf->len);
-	shell_hexdump(ctx_shell, buf->data, buf->len);
+	bt_shell_print("Icon content (%d octets)", buf->len);
+	bt_shell_hexdump(buf->data, buf->len);
 }
 
 /* TODO: May want to use a parsed type, instead of the raw buf, here */
@@ -530,65 +515,60 @@ static void mcc_track_segments_object_read_cb(struct bt_conn *conn, int err,
 					      struct net_buf_simple *buf)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "Track Segments Object read failed (%d)", err);
+		bt_shell_error("Track Segments Object read failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Track Segments content (%d octets)", buf->len);
-	shell_hexdump(ctx_shell, buf->data, buf->len);
+	bt_shell_print("Track Segments content (%d octets)", buf->len);
+	bt_shell_hexdump(buf->data, buf->len);
 }
 
 static void mcc_otc_read_current_track_object_cb(struct bt_conn *conn, int err,
 						 struct net_buf_simple *buf)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "Current Track Object read failed (%d)", err);
+		bt_shell_error("Current Track Object read failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Current Track content (%d octets)", buf->len);
-	shell_hexdump(ctx_shell, buf->data, buf->len);
+	bt_shell_print("Current Track content (%d octets)", buf->len);
+	bt_shell_hexdump(buf->data, buf->len);
 }
 
 static void mcc_otc_read_next_track_object_cb(struct bt_conn *conn, int err,
-						 struct net_buf_simple *buf)
+					      struct net_buf_simple *buf)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "Next Track Object read failed (%d)", err);
+		bt_shell_error("Next Track Object read failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Next Track content (%d octets)", buf->len);
-	shell_hexdump(ctx_shell, buf->data, buf->len);
+	bt_shell_print("Next Track content (%d octets)", buf->len);
+	bt_shell_hexdump(buf->data, buf->len);
 }
 
 static void mcc_otc_read_parent_group_object_cb(struct bt_conn *conn, int err,
 						struct net_buf_simple *buf)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "Parent Group Object read failed (%d)", err);
+		bt_shell_error("Parent Group Object read failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Parent Group content (%d octets)", buf->len);
-	shell_hexdump(ctx_shell, buf->data, buf->len);
+	bt_shell_print("Parent Group content (%d octets)", buf->len);
+	bt_shell_hexdump(buf->data, buf->len);
 }
 
 static void mcc_otc_read_current_group_object_cb(struct bt_conn *conn, int err,
 						 struct net_buf_simple *buf)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "Current Group Object read failed (%d)", err);
+		bt_shell_error("Current Group Object read failed (%d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Current Group content (%d octets)", buf->len);
-	shell_hexdump(ctx_shell, buf->data, buf->len);
+	bt_shell_print("Current Group content (%d octets)", buf->len);
+	bt_shell_hexdump(buf->data, buf->len);
 }
 
 #endif /* CONFIG_BT_MCC_OTS */
@@ -598,10 +578,6 @@ static int cmd_mcc_init(const struct shell *sh, size_t argc, char **argv)
 {
 	int result;
 
-	if (!ctx_shell) {
-		ctx_shell = sh;
-	}
-
 	/* Set up the callbacks */
 	cb.discover_mcs                  = mcc_discover_mcs_cb;
 	cb.read_player_name              = mcc_read_player_name_cb;
diff --git a/subsys/bluetooth/audio/shell/media_controller.c b/subsys/bluetooth/audio/shell/media_controller.c
index d27fa3d932b..e2fdc2bd298 100644
--- a/subsys/bluetooth/audio/shell/media_controller.c
+++ b/subsys/bluetooth/audio/shell/media_controller.c
@@ -29,6 +29,7 @@
 #include "../media_proxy_internal.h" /* For MPL_NO_TRACK_ID - TODO: Fix */
 
 #include "host/shell/bt.h"
+#include "common/bt_shell_private.h"
 
 LOG_MODULE_REGISTER(bt_media_controller_shell, CONFIG_BT_MCS_LOG_LEVEL);
 
@@ -46,12 +47,12 @@ static struct media_player *current_player;
 static void local_player_instance_cb(struct media_player *plr, int err)
 {
 	if (err) {
-		shell_error(ctx_shell, "Local player instance failed (%d)", err);
+		bt_shell_error("Local player instance failed (%d)", err);
 		return;
 	}
 
 	local_player = plr;
-	shell_print(ctx_shell, "Local player instance: %p", local_player);
+	bt_shell_print("Local player instance: %p", local_player);
 
 	if (!current_player) {
 		current_player = local_player;
@@ -62,12 +63,12 @@ static void local_player_instance_cb(struct media_player *plr, int err)
 static void discover_player_cb(struct media_player *plr, int err)
 {
 	if (err) {
-		shell_error(ctx_shell, "Discover player failed (%d)", err);
+		bt_shell_error("Discover player failed (%d)", err);
 		return;
 	}
 
 	remote_player = plr;
-	shell_print(ctx_shell, "Discovered player instance: %p", remote_player);
+	bt_shell_print("Discovered player instance: %p", remote_player);
 
 	/* Assuming that since discovery was called, the remote player is wanted */
 	current_player = remote_player;
@@ -77,11 +78,11 @@ static void discover_player_cb(struct media_player *plr, int err)
 static void player_name_cb(struct media_player *plr, int err, const char *name)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Player name failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Player name failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Player name: %s", plr, name);
+	bt_shell_print("Player: %p, Player name: %s", plr, name);
 }
 
 static void icon_id_cb(struct media_player *plr, int err, uint64_t id)
@@ -89,102 +90,102 @@ static void icon_id_cb(struct media_player *plr, int err, uint64_t id)
 	char str[BT_OTS_OBJ_ID_STR_LEN];
 
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Icon ID failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Icon ID failed (%d)", plr, err);
 		return;
 	}
 
 	(void)bt_ots_obj_id_to_str(id, str, sizeof(str));
-	shell_print(ctx_shell, "Player: %p, Icon Object ID: %s", plr, str);
+	bt_shell_print("Player: %p, Icon Object ID: %s", plr, str);
 }
 
 static void icon_url_cb(struct media_player *plr, int err, const char *url)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Icon URL failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Icon URL failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Icon URL: %s", plr, url);
+	bt_shell_print("Player: %p, Icon URL: %s", plr, url);
 }
 
 static void track_changed_cb(struct media_player *plr, int err)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Track change failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Track change failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Track changed", plr);
+	bt_shell_print("Player: %p, Track changed", plr);
 }
 
 static void track_title_cb(struct media_player *plr, int err, const char *title)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Track title failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Track title failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Track title: %s", plr, title);
+	bt_shell_print("Player: %p, Track title: %s", plr, title);
 }
 
 static void track_duration_cb(struct media_player *plr, int err, int32_t duration)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Track duration failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Track duration failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Track duration: %d", plr, duration);
+	bt_shell_print("Player: %p, Track duration: %d", plr, duration);
 }
 
 static void track_position_recv_cb(struct media_player *plr, int err, int32_t position)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Track position receive failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Track position receive failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Track Position received: %d", plr, position);
+	bt_shell_print("Player: %p, Track Position received: %d", plr, position);
 }
 
 static void track_position_write_cb(struct media_player *plr, int err, int32_t position)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Track position write failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Track position write failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Track Position write: %d", plr, position);
+	bt_shell_print("Player: %p, Track Position write: %d", plr, position);
 }
 
 static void playback_speed_recv_cb(struct media_player *plr, int err, int8_t speed)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Playback speed receive failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Playback speed receive failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Playback speed received: %d", plr, speed);
+	bt_shell_print("Player: %p, Playback speed received: %d", plr, speed);
 }
 
 static void playback_speed_write_cb(struct media_player *plr, int err, int8_t speed)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Playback speed write failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Playback speed write failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Playback speed write: %d", plr, speed);
+	bt_shell_print("Player: %p, Playback speed write: %d", plr, speed);
 }
 
 static void seeking_speed_cb(struct media_player *plr, int err, int8_t speed)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Seeking speed failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Seeking speed failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Seeking speed: %d", plr, speed);
+	bt_shell_print("Player: %p, Seeking speed: %d", plr, speed);
 }
 
 #ifdef CONFIG_BT_OTS
@@ -193,12 +194,12 @@ static void track_segments_id_cb(struct media_player *plr, int err, uint64_t id)
 	char str[BT_OTS_OBJ_ID_STR_LEN];
 
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Track segments ID failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Track segments ID failed (%d)", plr, err);
 		return;
 	}
 
 	(void)bt_ots_obj_id_to_str(id, str, sizeof(str));
-	shell_print(ctx_shell, "Player: %p, Track Segments Object ID: %s", plr, str);
+	bt_shell_print("Player: %p, Track Segments Object ID: %s", plr, str);
 }
 
 static void current_track_id_cb(struct media_player *plr, int err, uint64_t id)
@@ -206,12 +207,12 @@ static void current_track_id_cb(struct media_player *plr, int err, uint64_t id)
 	char str[BT_OTS_OBJ_ID_STR_LEN];
 
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Current track ID failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Current track ID failed (%d)", plr, err);
 		return;
 	}
 
 	(void)bt_ots_obj_id_to_str(id, str, sizeof(str));
-	shell_print(ctx_shell, "Player: %p, Current Track Object ID: %s", plr, str);
+	bt_shell_print("Player: %p, Current Track Object ID: %s", plr, str);
 }
 
 static void next_track_id_cb(struct media_player *plr, int err, uint64_t id)
@@ -219,15 +220,15 @@ static void next_track_id_cb(struct media_player *plr, int err, uint64_t id)
 	char str[BT_OTS_OBJ_ID_STR_LEN];
 
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Next track ID failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Next track ID failed (%d)", plr, err);
 		return;
 	}
 
 	if (id == MPL_NO_TRACK_ID) {
-		shell_print(ctx_shell, "Player: %p, Next Track Object ID is empty", plr);
+		bt_shell_print("Player: %p, Next Track Object ID is empty", plr);
 	} else {
 		(void)bt_ots_obj_id_to_str(id, str, sizeof(str));
-		shell_print(ctx_shell, "Player: %p, Next Track Object ID: %s", plr, str);
+		bt_shell_print("Player: %p, Next Track Object ID: %s", plr, str);
 	}
 }
 
@@ -236,12 +237,12 @@ static void current_group_id_cb(struct media_player *plr, int err, uint64_t id)
 	char str[BT_OTS_OBJ_ID_STR_LEN];
 
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Current group ID failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Current group ID failed (%d)", plr, err);
 		return;
 	}
 
 	(void)bt_ots_obj_id_to_str(id, str, sizeof(str));
-	shell_print(ctx_shell, "Player: %p, Current Group Object ID: %s", plr, str);
+	bt_shell_print("Player: %p, Current Group Object ID: %s", plr, str);
 }
 
 static void parent_group_id_cb(struct media_player *plr, int err, uint64_t id)
@@ -249,87 +250,87 @@ static void parent_group_id_cb(struct media_player *plr, int err, uint64_t id)
 	char str[BT_OTS_OBJ_ID_STR_LEN];
 
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Parent group ID failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Parent group ID failed (%d)", plr, err);
 		return;
 	}
 
 	(void)bt_ots_obj_id_to_str(id, str, sizeof(str));
-	shell_print(ctx_shell, "Player: %p, Parent Group Object ID: %s", plr, str);
+	bt_shell_print("Player: %p, Parent Group Object ID: %s", plr, str);
 }
 #endif /* CONFIG_BT_OTS */
 
 static void playing_order_recv_cb(struct media_player *plr, int err, uint8_t order)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Playing order receive_failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Playing order receive_failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Playing received: %u", plr, order);
+	bt_shell_print("Player: %p, Playing received: %u", plr, order);
 }
 
 static void playing_order_write_cb(struct media_player *plr, int err, uint8_t order)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Playing order write_failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Playing order write_failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Playing written: %u", plr, order);
+	bt_shell_print("Player: %p, Playing written: %u", plr, order);
 }
 
 static void playing_orders_supported_cb(struct media_player *plr, int err, uint16_t orders)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Playing orders supported failed (%d)",
+		bt_shell_error("Player: %p, Playing orders supported failed (%d)",
 			    plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Playing orders supported: %u", plr, orders);
+	bt_shell_print("Player: %p, Playing orders supported: %u", plr, orders);
 	/* TODO: Parse bitmap and output list of playing orders */
 }
 
 static void media_state_cb(struct media_player *plr, int err, uint8_t state)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Media state failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Media state failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Media State: %u", plr, state);
+	bt_shell_print("Player: %p, Media State: %u", plr, state);
 	/* TODO: Parse state and output state name (e.g. "Playing") */
 }
 
 static void command_send_cb(struct media_player *plr, int err, const struct mpl_cmd *cmd)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Command send failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Command send failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Command opcode sent: %u", plr, cmd->opcode);
+	bt_shell_print("Player: %p, Command opcode sent: %u", plr, cmd->opcode);
 }
 
 static void command_recv_cb(struct media_player *plr, int err, const struct mpl_cmd_ntf *cmd_ntf)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Command failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Command failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Command opcode: %u, result: %u",
+	bt_shell_print("Player: %p, Command opcode: %u, result: %u",
 		    plr, cmd_ntf->requested_opcode, cmd_ntf->result_code);
 }
 
 static void commands_supported_cb(struct media_player *plr, int err, uint32_t opcodes)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Commands supported failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Commands supported failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Command opcodes supported: %u", plr, opcodes);
+	bt_shell_print("Player: %p, Command opcodes supported: %u", plr, opcodes);
 	/* TODO: Parse bitmap and output list of opcodes */
 }
 
@@ -337,21 +338,21 @@ static void commands_supported_cb(struct media_player *plr, int err, uint32_t op
 static void search_send_cb(struct media_player *plr, int err, const struct mpl_search *search)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Search send failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Search send failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Search sent with len %u", plr, search->len);
+	bt_shell_print("Player: %p, Search sent with len %u", plr, search->len);
 }
 
 static void search_recv_cb(struct media_player *plr, int err, uint8_t result_code)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Search failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Search failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Search result code: %u", plr, result_code);
+	bt_shell_print("Player: %p, Search result code: %u", plr, result_code);
 }
 
 static void search_results_id_cb(struct media_player *plr, int err, uint64_t id)
@@ -359,40 +360,36 @@ static void search_results_id_cb(struct media_player *plr, int err, uint64_t id)
 	char str[BT_OTS_OBJ_ID_STR_LEN];
 
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Search results ID failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Search results ID failed (%d)", plr, err);
 		return;
 	}
 
 	if (id == 0) {
-		shell_print(ctx_shell, "Player: %p, Search result not available", plr);
+		bt_shell_print("Player: %p, Search result not available", plr);
 	}
 
 	(void)bt_ots_obj_id_to_str(id, str, sizeof(str));
-	shell_print(ctx_shell, "Player: %p, Search Results Object ID: %s", plr, str);
+	bt_shell_print("Player: %p, Search Results Object ID: %s", plr, str);
 }
 #endif /* CONFIG_BT_OTS */
 
 static void content_ctrl_id_cb(struct media_player *plr, int err, uint8_t ccid)
 {
 	if (err) {
-		shell_error(ctx_shell, "Player: %p, Content control ID failed (%d)", plr, err);
+		bt_shell_error("Player: %p, Content control ID failed (%d)", plr, err);
 		return;
 	}
 
-	shell_print(ctx_shell, "Player: %p, Content Control ID: %u", plr, ccid);
+	bt_shell_print("Player: %p, Content Control ID: %u", plr, ccid);
 }
 
 static int cmd_media_init(const struct shell *sh, size_t argc, char *argv[])
 {
 	int err;
 
-	if (!ctx_shell) {
-		ctx_shell = sh;
-	}
-
 	err = media_proxy_pl_init();  /* TODO: Fix direct call to player */
 	if (err) {
-		shell_error(ctx_shell, "Could not init mpl");
+		shell_error(sh, "Could not init mpl");
 	}
 
 	/* Set up the callback structure */
@@ -434,7 +431,7 @@ static int cmd_media_init(const struct shell *sh, size_t argc, char *argv[])
 
 	err = media_proxy_ctrl_register(&cbs);
 	if (err) {
-		shell_error(ctx_shell, "Could not register media shell as controller");
+		shell_error(sh, "Could not register media shell as controller");
 	}
 
 	return err;
@@ -445,46 +442,44 @@ static int cmd_media_set_player(const struct shell *sh, size_t argc, char *argv[
 	if (!strcmp(argv[1], "local")) {
 		if (local_player) {
 			current_player = local_player;
-			shell_print(ctx_shell, "Current player set to local player: %p",
+			shell_print(sh, "Current player set to local player: %p",
 				    current_player);
 			return 0;
 		}
 
-		shell_print(ctx_shell, "No local player");
+		shell_print(sh, "No local player");
 		return -EOPNOTSUPP;
 
 	} else if (!strcmp(argv[1], "remote")) {
 		if (remote_player) {
 			current_player = remote_player;
-			shell_print(ctx_shell, "Current player set to remote player: %p",
+			shell_print(sh, "Current player set to remote player: %p",
 				    current_player);
 			return 0;
 		}
 
-		shell_print(ctx_shell, "No remote player");
+		shell_print(sh, "No remote player");
 		return -EOPNOTSUPP;
 
 	} else {
-		shell_error(ctx_shell, "Input argument must be either \"local\" or \"remote\"");
+		shell_error(sh, "Input argument must be either \"local\" or \"remote\"");
 		return -EINVAL;
 	}
 }
 
 static int cmd_media_show_players(const struct shell *sh, size_t argc, char *argv[])
 {
-	shell_print(ctx_shell, "Local player: %p", local_player);
-	shell_print(ctx_shell, "Remote player: %p", remote_player);
+	shell_print(sh, "Local player: %p", local_player);
+	shell_print(sh, "Remote player: %p", remote_player);
 
 	if (current_player == NULL) {
-		shell_print(ctx_shell, "Current player is not set");
+		shell_print(sh, "Current player is not set");
 	} else if (current_player == local_player) {
-		shell_print(ctx_shell, "Current player is set to local player: %p",
-			    current_player);
+		shell_print(sh, "Current player is set to local player: %p", current_player);
 	} else if (current_player == remote_player) {
-		shell_print(ctx_shell, "Current player is set to remote player: %p",
-			    current_player);
+		shell_print(sh, "Current player is set to remote player: %p", current_player);
 	} else {
-		shell_print(ctx_shell, "Current player is not set to valid player");
+		shell_print(sh, "Current player is not set to valid player");
 	}
 
 	return 0;
@@ -496,7 +491,7 @@ static int cmd_media_discover_player(const struct shell *sh, size_t argc, char *
 	int err = media_proxy_ctrl_discover_player(default_conn);
 
 	if (err) {
-		shell_error(ctx_shell, "Discover player failed (%d)", err);
+		shell_error(sh, "Discover player failed (%d)", err);
 	}
 
 	return err;
@@ -508,7 +503,7 @@ static int cmd_media_read_player_name(const struct shell *sh, size_t argc, char
 	int err = media_proxy_ctrl_get_player_name(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Player name get failed (%d)", err);
+		shell_error(sh, "Player name get failed (%d)", err);
 	}
 
 	return err;
@@ -520,7 +515,7 @@ static int cmd_media_read_icon_obj_id(const struct shell *sh, size_t argc, char
 	int err = media_proxy_ctrl_get_icon_id(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Icon ID get failed (%d)", err);
+		shell_error(sh, "Icon ID get failed (%d)", err);
 	}
 
 	return err;
@@ -532,7 +527,7 @@ static int cmd_media_read_icon_url(const struct shell *sh, size_t argc, char *ar
 	int err = media_proxy_ctrl_get_icon_url(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Icon URL get failed (%d)", err);
+		shell_error(sh, "Icon URL get failed (%d)", err);
 	}
 
 	return err;
@@ -543,7 +538,7 @@ static int cmd_media_read_track_title(const struct shell *sh, size_t argc, char
 	int err = media_proxy_ctrl_get_track_title(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Track title get failed (%d)", err);
+		shell_error(sh, "Track title get failed (%d)", err);
 	}
 
 	return err;
@@ -554,7 +549,7 @@ static int cmd_media_read_track_duration(const struct shell *sh, size_t argc, ch
 	int err = media_proxy_ctrl_get_track_duration(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Track duration get failed (%d)", err);
+		shell_error(sh, "Track duration get failed (%d)", err);
 	}
 
 	return err;
@@ -565,7 +560,7 @@ static int cmd_media_read_track_position(const struct shell *sh, size_t argc, ch
 	int err = media_proxy_ctrl_get_track_position(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Track position get failed (%d)", err);
+		shell_error(sh, "Track position get failed (%d)", err);
 	}
 
 	return err;
@@ -592,7 +587,7 @@ static int cmd_media_set_track_position(const struct shell *sh, size_t argc,
 
 	err = media_proxy_ctrl_set_track_position(current_player, position);
 	if (err) {
-		shell_error(ctx_shell, "Track position set failed (%d)", err);
+		shell_error(sh, "Track position set failed (%d)", err);
 	}
 
 	return err;
@@ -603,7 +598,7 @@ static int cmd_media_read_playback_speed(const struct shell *sh, size_t argc, ch
 	int err = media_proxy_ctrl_get_playback_speed(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Playback speed get failed (%d)", err);
+		shell_error(sh, "Playback speed get failed (%d)", err);
 	}
 
 	return err;
@@ -630,7 +625,7 @@ static int cmd_media_set_playback_speed(const struct shell *sh, size_t argc, cha
 
 	err = media_proxy_ctrl_set_playback_speed(current_player, speed);
 	if (err) {
-		shell_error(ctx_shell, "Playback speed set failed (%d)", err);
+		shell_error(sh, "Playback speed set failed (%d)", err);
 	}
 
 	return err;
@@ -641,7 +636,7 @@ static int cmd_media_read_seeking_speed(const struct shell *sh, size_t argc, cha
 	int err = media_proxy_ctrl_get_seeking_speed(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Seeking speed get failed (%d)", err);
+		shell_error(sh, "Seeking speed get failed (%d)", err);
 	}
 
 	return err;
@@ -653,7 +648,7 @@ static int cmd_media_read_track_segments_obj_id(const struct shell *sh, size_t a
 	int err = media_proxy_ctrl_get_track_segments_id(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Track segments ID get failed (%d)", err);
+		shell_error(sh, "Track segments ID get failed (%d)", err);
 	}
 
 	return err;
@@ -664,7 +659,7 @@ static int cmd_media_read_current_track_obj_id(const struct shell *sh, size_t ar
 	int err = media_proxy_ctrl_get_current_track_id(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Current track ID get failed (%d)", err);
+		shell_error(sh, "Current track ID get failed (%d)", err);
 	}
 
 	return err;
@@ -677,7 +672,7 @@ static int cmd_media_read_next_track_obj_id(const struct shell *sh, size_t argc,
 	int err = media_proxy_ctrl_get_next_track_id(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Next track ID get failed (%d)", err);
+		shell_error(sh, "Next track ID get failed (%d)", err);
 	}
 
 	return err;
@@ -688,7 +683,7 @@ static int cmd_media_read_current_group_obj_id(const struct shell *sh, size_t ar
 	int err = media_proxy_ctrl_get_current_group_id(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Current group ID get failed (%d)", err);
+		shell_error(sh, "Current group ID get failed (%d)", err);
 
 	}
 
@@ -700,7 +695,7 @@ static int cmd_media_read_parent_group_obj_id(const struct shell *sh, size_t arg
 	int err = media_proxy_ctrl_get_parent_group_id(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Parent group ID get failed (%d)", err);
+		shell_error(sh, "Parent group ID get failed (%d)", err);
 	}
 
 	return err;
@@ -712,7 +707,7 @@ static int cmd_media_read_playing_order(const struct shell *sh, size_t argc, cha
 	int err = media_proxy_ctrl_get_playing_order(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Playing order get failed (%d)", err);
+		shell_error(sh, "Playing order get failed (%d)", err);
 	}
 
 	return err;
@@ -738,7 +733,7 @@ static int cmd_media_set_playing_order(const struct shell *sh, size_t argc, char
 
 	err = media_proxy_ctrl_set_playing_order(current_player, order);
 	if (err) {
-		shell_error(ctx_shell, "Playing order set failed (%d)", err);
+		shell_error(sh, "Playing order set failed (%d)", err);
 	}
 
 	return err;
@@ -750,7 +745,7 @@ static int cmd_media_read_playing_orders_supported(const struct shell *sh, size_
 	int err = media_proxy_ctrl_get_playing_orders_supported(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Icon URL get failed (%d)", err);
+		shell_error(sh, "Icon URL get failed (%d)", err);
 	}
 
 	return err;
@@ -761,7 +756,7 @@ static int cmd_media_read_media_state(const struct shell *sh, size_t argc, char
 	int err = media_proxy_ctrl_get_media_state(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Icon URL get failed (%d)", err);
+		shell_error(sh, "Icon URL get failed (%d)", err);
 	}
 
 	return err;
@@ -1224,7 +1219,7 @@ static int cmd_media_read_commands_supported(const struct shell *sh, size_t argc
 	int err = media_proxy_ctrl_get_commands_supported(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Commands supported read failed (%d)", err);
+		shell_error(sh, "Commands supported read failed (%d)", err);
 	}
 
 	return err;
@@ -1253,7 +1248,7 @@ static int cmd_media_set_search(const struct shell *sh, size_t argc, char *argv[
 
 	err = media_proxy_ctrl_send_search(current_player, &search);
 	if (err) {
-		shell_error(ctx_shell, "Search send failed (%d)", err);
+		shell_error(sh, "Search send failed (%d)", err);
 	}
 
 	return err;
@@ -1265,7 +1260,7 @@ static int cmd_media_read_search_results_obj_id(const struct shell *sh, size_t a
 	int err = media_proxy_ctrl_get_search_results_id(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Search results ID get failed (%d)", err);
+		shell_error(sh, "Search results ID get failed (%d)", err);
 	}
 
 	return err;
@@ -1278,7 +1273,7 @@ static int cmd_media_read_content_control_id(const struct shell *sh, size_t argc
 	int err = media_proxy_ctrl_get_content_ctrl_id(current_player);
 
 	if (err) {
-		shell_error(ctx_shell, "Content control ID get failed (%d)", err);
+		shell_error(sh, "Content control ID get failed (%d)", err);
 	}
 
 	return err;
@@ -1286,7 +1281,7 @@ static int cmd_media_read_content_control_id(const struct shell *sh, size_t argc
 
 static int cmd_media(const struct shell *sh, size_t argc, char **argv)
 {
-	shell_error(ctx_shell, "%s unknown parameter: %s", argv[0], argv[1]);
+	shell_error(sh, "%s unknown parameter: %s", argv[0], argv[1]);
 
 	return -ENOEXEC;
 }
diff --git a/subsys/bluetooth/audio/shell/micp_mic_ctlr.c b/subsys/bluetooth/audio/shell/micp_mic_ctlr.c
index bcc28dc2321..92163f92a34 100644
--- a/subsys/bluetooth/audio/shell/micp_mic_ctlr.c
+++ b/subsys/bluetooth/audio/shell/micp_mic_ctlr.c
@@ -22,6 +22,7 @@
 #include <zephyr/types.h>
 
 #include "host/shell/bt.h"
+#include "common/bt_shell_private.h"
 
 static struct bt_micp_mic_ctlr *micp_mic_ctlr;
 #if defined(CONFIG_BT_MICP_MIC_CTLR_AICS)
@@ -32,15 +33,14 @@ static void micp_mic_ctlr_discover_cb(struct bt_micp_mic_ctlr *mic_ctlr,
 				      int err, uint8_t aics_count)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Discovery failed (%d)", err);
+		bt_shell_error("Discovery failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "Discovery done with %u AICS",
-			    aics_count);
+		bt_shell_print("Discovery done with %u AICS", aics_count);
 
 #if defined(CONFIG_BT_MICP_MIC_CTLR_AICS)
 		if (bt_micp_mic_ctlr_included_get(mic_ctlr,
 						  &micp_included) != 0) {
-			shell_error(ctx_shell, "Could not get included services");
+			bt_shell_error("Could not get included services");
 		}
 #endif /* CONFIG_BT_MICP_MIC_CTLR_AICS */
 	}
@@ -50,9 +50,9 @@ static void micp_mic_ctlr_mute_written_cb(struct bt_micp_mic_ctlr *mic_ctlr,
 					  int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Mute write failed (%d)", err);
+		bt_shell_error("Mute write failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "Mute write completed");
+		bt_shell_print("Mute write completed");
 	}
 }
 
@@ -60,9 +60,9 @@ static void micp_mic_ctlr_unmute_written_cb(struct bt_micp_mic_ctlr *mic_ctlr,
 					    int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Unmute write failed (%d)", err);
+		bt_shell_error("Unmute write failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "Unmute write completed");
+		bt_shell_print("Unmute write completed");
 	}
 }
 
@@ -70,9 +70,9 @@ static void micp_mic_ctlr_mute_cb(struct bt_micp_mic_ctlr *mic_ctlr, int err,
 				  uint8_t mute)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Mute get failed (%d)", err);
+		bt_shell_error("Mute get failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "Mute value %u", mute);
+		bt_shell_print("Mute value %u", mute);
 	}
 }
 
@@ -82,53 +82,45 @@ static struct bt_micp_included micp_included;
 static void micp_mic_ctlr_aics_set_gain_cb(struct bt_aics *inst, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Set gain failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("Set gain failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "Gain set for inst %p", inst);
+		bt_shell_print("Gain set for inst %p", inst);
 	}
 }
 
 static void micp_mic_ctlr_aics_unmute_cb(struct bt_aics *inst, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Unmute failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("Unmute failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "Unmuted inst %p", inst);
+		bt_shell_print("Unmuted inst %p", inst);
 	}
 }
 
 static void micp_mic_ctlr_aics_mute_cb(struct bt_aics *inst, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Mute failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("Mute failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "Muted inst %p", inst);
+		bt_shell_print("Muted inst %p", inst);
 	}
 }
 
 static void micp_mic_ctlr_aics_set_manual_mode_cb(struct bt_aics *inst, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell,
-			    "Set manual mode failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("Set manual mode failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "Manual mode set for inst %p", inst);
+		bt_shell_print("Manual mode set for inst %p", inst);
 	}
 }
 
 static void micp_mic_ctlr_aics_automatic_mode_cb(struct bt_aics *inst, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell,
-			    "Set automatic mode failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("Set automatic mode failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "Automatic mode set for inst %p",
-			    inst);
+		bt_shell_print("Automatic mode set for inst %p", inst);
 	}
 }
 
@@ -136,13 +128,12 @@ static void micp_mic_ctlr_aics_state_cb(struct bt_aics *inst, int err,
 					int8_t gain, uint8_t mute, uint8_t mode)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "AICS state get failed (%d) for "
-			    "inst %p", err, inst);
+		bt_shell_error("AICS state get failed (%d) for inst %p",
+			       err, inst);
 	} else {
-		shell_print(ctx_shell, "AICS inst %p state gain %d, mute %u, "
-			    "mode %u", inst, gain, mute, mode);
+		bt_shell_print("AICS inst %p state gain %d, mute %u, mode %u",
+			       inst, gain, mute, mode);
 	}
-
 }
 
 static void micp_mic_ctlr_aics_gain_setting_cb(struct bt_aics *inst, int err,
@@ -150,51 +141,42 @@ static void micp_mic_ctlr_aics_gain_setting_cb(struct bt_aics *inst, int err,
 					       int8_t maximum)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "AICS gain settings get failed (%d) for "
-			    "inst %p", err, inst);
+		bt_shell_error("AICS gain settings get failed (%d) for inst %p",
+			       err, inst);
 	} else {
-		shell_print(ctx_shell, "AICS inst %p gain settings units %u, "
-			    "min %d, max %d", inst, units, minimum,
-			    maximum);
+		bt_shell_print("AICS inst %p gain settings units %u, min %d, max %d",
+			       inst, units, minimum, maximum);
 	}
-
 }
 
 static void micp_mic_ctlr_aics_input_type_cb(struct bt_aics *inst, int err,
 					     uint8_t input_type)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "AICS input type get failed (%d) for "
-			    "inst %p", err, inst);
+		bt_shell_error("AICS input type get failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "AICS inst %p input type %u",
-			    inst, input_type);
+		bt_shell_print("AICS inst %p input type %u", inst, input_type);
 	}
-
 }
 
 static void micp_mic_ctlr_aics_status_cb(struct bt_aics *inst, int err,
 					 bool active)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "AICS status get failed (%d) for "
-			    "inst %p", err, inst);
+		bt_shell_error("AICS status get failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "AICS inst %p status %s",
-			    inst, active ? "active" : "inactive");
+		bt_shell_print("AICS inst %p status %s",
+			       inst, active ? "active" : "inactive");
 	}
-
 }
 
 static void micp_mic_ctlr_aics_description_cb(struct bt_aics *inst, int err,
 					      char *description)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "AICS description get failed (%d) for "
-			    "inst %p", err, inst);
+		bt_shell_error("AICS description get failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "AICS inst %p description %s",
-			    inst, description);
+		bt_shell_print("AICS inst %p description %s", inst, description);
 	}
 }
 #endif /* CONFIG_BT_MICP_MIC_CTLR_AICS */
@@ -227,10 +209,6 @@ static int cmd_micp_mic_ctlr_discover(const struct shell *sh, size_t argc,
 {
 	int result;
 
-	if (ctx_shell == NULL) {
-		ctx_shell = sh;
-	}
-
 	result = bt_micp_mic_ctlr_cb_register(&micp_cbs);
 	if (result != 0) {
 		shell_print(sh, "Failed to register callbacks: %d", result);
diff --git a/subsys/bluetooth/audio/shell/micp_mic_dev.c b/subsys/bluetooth/audio/shell/micp_mic_dev.c
index a39740c30f0..fb5dd734dfe 100644
--- a/subsys/bluetooth/audio/shell/micp_mic_dev.c
+++ b/subsys/bluetooth/audio/shell/micp_mic_dev.c
@@ -24,10 +24,11 @@
 #include <zephyr/types.h>
 
 #include "host/shell/bt.h"
+#include "common/bt_shell_private.h"
 
 static void micp_mic_dev_mute_cb(uint8_t mute)
 {
-	shell_print(ctx_shell, "Mute value %u", mute);
+	bt_shell_print("Mute value %u", mute);
 }
 
 static struct bt_micp_mic_dev_cb micp_mic_dev_cbs = {
@@ -41,61 +42,56 @@ static void micp_mic_dev_aics_state_cb(struct bt_aics *inst, int err,
 				       int8_t gain, uint8_t mute, uint8_t mode)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "AICS state get failed (%d) for "
-			    "inst %p", err, inst);
+		bt_shell_error("AICS state get failed (%d) for inst %p",
+			       err, inst);
 	} else {
-		shell_print(ctx_shell, "AICS inst %p state gain %d, mute %u, "
-			    "mode %u", inst, gain, mute, mode);
+		bt_shell_print("AICS inst %p state gain %d, mute %u, mode %u",
+			       inst, gain, mute, mode);
 	}
-
 }
 static void micp_mic_dev_aics_gain_setting_cb(struct bt_aics *inst, int err,
 					      uint8_t units, int8_t minimum,
 					      int8_t maximum)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "AICS gain settings get failed (%d) for "
-			    "inst %p", err, inst);
+		bt_shell_error("AICS gain settings get failed (%d) for inst %p",
+			       err, inst);
 	} else {
-		shell_print(ctx_shell, "AICS inst %p gain settings units %u, "
-			    "min %d, max %d", inst, units, minimum,
-			    maximum);
+		bt_shell_print("AICS inst %p gain settings units %u, min %d, max %d",
+			       inst, units, minimum, maximum);
 	}
-
 }
 static void micp_mic_dev_aics_input_type_cb(struct bt_aics *inst, int err,
 					    uint8_t input_type)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "AICS input type get failed (%d) for "
-			    "inst %p", err, inst);
+		bt_shell_error("AICS input type get failed (%d) for inst %p",
+			       err, inst);
 	} else {
-		shell_print(ctx_shell, "AICS inst %p input type %u",
-			    inst, input_type);
+		bt_shell_print("AICS inst %p input type %u",
+			       inst, input_type);
 	}
-
 }
 static void micp_mic_dev_aics_status_cb(struct bt_aics *inst, int err,
 					bool active)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "AICS status get failed (%d) for "
-			    "inst %p", err, inst);
+		bt_shell_error("AICS status get failed (%d) for inst %p",
+			       err, inst);
 	} else {
-		shell_print(ctx_shell, "AICS inst %p status %s",
-			    inst, active ? "active" : "inactive");
+		bt_shell_print("AICS inst %p status %s",
+			       inst, active ? "active" : "inactive");
 	}
-
 }
 static void micp_mic_dev_aics_description_cb(struct bt_aics *inst, int err,
 					     char *description)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "AICS description get failed (%d) for "
-			    "inst %p", err, inst);
+		bt_shell_error("AICS description get failed (%d) for inst %p",
+			       err, inst);
 	} else {
-		shell_print(ctx_shell, "AICS inst %p description %s",
-			    inst, description);
+		bt_shell_print("AICS inst %p description %s",
+			       inst, description);
 	}
 }
 
@@ -114,10 +110,6 @@ static int cmd_micp_mic_dev_param(const struct shell *sh, size_t argc,
 	int result;
 	struct bt_micp_mic_dev_register_param micp_param;
 
-	if (ctx_shell == NULL) {
-		ctx_shell = sh;
-	}
-
 	(void)memset(&micp_param, 0, sizeof(micp_param));
 
 #if defined(CONFIG_BT_MICP_MIC_DEV_AICS)
diff --git a/subsys/bluetooth/audio/shell/mpl.c b/subsys/bluetooth/audio/shell/mpl.c
index c37e69c2494..3051164859c 100644
--- a/subsys/bluetooth/audio/shell/mpl.c
+++ b/subsys/bluetooth/audio/shell/mpl.c
@@ -77,10 +77,6 @@ int cmd_mpl_debug_dump_state(const struct shell *sh, size_t argc,
 
 int cmd_media_proxy_pl_init(const struct shell *sh, size_t argc, char *argv[])
 {
-	if (!ctx_shell) {
-		ctx_shell = sh;
-	}
-
 	int err = media_proxy_pl_init();
 
 	if (err) {
diff --git a/subsys/bluetooth/audio/shell/pbp.c b/subsys/bluetooth/audio/shell/pbp.c
index 8f03512efd2..697490236b5 100644
--- a/subsys/bluetooth/audio/shell/pbp.c
+++ b/subsys/bluetooth/audio/shell/pbp.c
@@ -24,6 +24,7 @@
 #include <zephyr/sys/util.h>
 
 #include "host/shell/bt.h"
+#include "common/bt_shell_private.h"
 
 #define PBS_DEMO                'P', 'B', 'P'
 
@@ -35,7 +36,6 @@ const uint8_t pba_metadata[] = {
 NET_BUF_SIMPLE_DEFINE_STATIC(pbp_ad_buf, BT_PBP_MIN_PBA_SIZE + ARRAY_SIZE(pba_metadata));
 
 enum bt_pbp_announcement_feature pbp_features;
-extern const struct shell *ctx_shell;
 
 static int cmd_pbp_set_features(const struct shell *sh, size_t argc, char **argv)
 {
@@ -66,9 +66,9 @@ size_t pbp_ad_data_add(struct bt_data data[], size_t data_size)
 				      &pbp_ad_buf);
 
 	if (err != 0) {
-		shell_info(ctx_shell, "Create Public Broadcast Announcement");
+		bt_shell_info("Create Public Broadcast Announcement");
 	} else {
-		shell_error(ctx_shell, "Failed to create Public Broadcast Announcement: %d", err);
+		bt_shell_error("Failed to create Public Broadcast Announcement: %d", err);
 	}
 
 	__ASSERT(data_size > 0, "No space for Public Broadcast Announcement");
diff --git a/subsys/bluetooth/audio/shell/tmap.c b/subsys/bluetooth/audio/shell/tmap.c
index e0d62346063..ed03ab46fca 100644
--- a/subsys/bluetooth/audio/shell/tmap.c
+++ b/subsys/bluetooth/audio/shell/tmap.c
@@ -22,6 +22,7 @@
 #include <zephyr/sys/util_macro.h>
 
 #include "host/shell/bt.h"
+#include "common/bt_shell_private.h"
 
 static int cmd_tmap_init(const struct shell *sh, size_t argc, char **argv)
 {
@@ -49,11 +50,11 @@ static int cmd_tmap_init(const struct shell *sh, size_t argc, char **argv)
 static void tmap_discover_cb(enum bt_tmap_role role, struct bt_conn *conn, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "tmap discovery (err %d)", err);
+		bt_shell_error("tmap discovery (err %d)", err);
 		return;
 	}
 
-	shell_print(ctx_shell, "tmap discovered for conn %p: role 0x%04x", conn, role);
+	bt_shell_print("tmap discovered for conn %p: role 0x%04x", conn, role);
 }
 
 static const struct bt_tmap_cb tmap_cb = {
@@ -70,10 +71,6 @@ static int cmd_tmap_discover(const struct shell *sh, size_t argc, char **argv)
 		return -ENOEXEC;
 	}
 
-	if (!ctx_shell) {
-		ctx_shell = sh;
-	}
-
 	err = bt_tmap_discover(default_conn, &tmap_cb);
 	if (err != 0) {
 		shell_error(sh, "bt_tmap_discover (err %d)", err);
diff --git a/subsys/bluetooth/audio/shell/vcp_vol_ctlr.c b/subsys/bluetooth/audio/shell/vcp_vol_ctlr.c
index 651dff25cbb..89cee4343fa 100644
--- a/subsys/bluetooth/audio/shell/vcp_vol_ctlr.c
+++ b/subsys/bluetooth/audio/shell/vcp_vol_ctlr.c
@@ -23,6 +23,7 @@
 #include <zephyr/types.h>
 
 #include "host/shell/bt.h"
+#include "common/bt_shell_private.h"
 
 static struct bt_vcp_vol_ctlr *vcp_vol_ctlr;
 static struct bt_vcp_included vcp_included;
@@ -31,13 +32,13 @@ static void vcs_discover_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err,
 			    uint8_t vocs_count, uint8_t aics_count)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "VCP discover failed (%d)", err);
+		bt_shell_error("VCP discover failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "VCP discover done with %u VOCS and %u AICS", vocs_count,
-			    aics_count);
+		bt_shell_print("VCP discover done with %u VOCS and %u AICS", vocs_count,
+			       aics_count);
 
 		if (bt_vcp_vol_ctlr_included_get(vol_ctlr, &vcp_included)) {
-			shell_error(ctx_shell, "Could not get VCP context");
+			bt_shell_error("Could not get VCP context");
 		}
 	}
 }
@@ -45,63 +46,63 @@ static void vcs_discover_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err,
 static void vcs_vol_down_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "VCP vol_down failed (%d)", err);
+		bt_shell_error("VCP vol_down failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "VCP vol_down done");
+		bt_shell_print("VCP vol_down done");
 	}
 }
 
 static void vcs_vol_up_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "VCP vol_up failed (%d)", err);
+		bt_shell_error("VCP vol_up failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "VCP vol_up done");
+		bt_shell_print("VCP vol_up done");
 	}
 }
 
 static void vcs_mute_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "VCP mute failed (%d)", err);
+		bt_shell_error("VCP mute failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "VCP mute done");
+		bt_shell_print("VCP mute done");
 	}
 }
 
 static void vcs_unmute_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "VCP unmute failed (%d)", err);
+		bt_shell_error("VCP unmute failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "VCP unmute done");
+		bt_shell_print("VCP unmute done");
 	}
 }
 
 static void vcs_vol_down_unmute_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "VCP vol_down_unmute failed (%d)", err);
+		bt_shell_error("VCP vol_down_unmute failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "VCP vol_down_unmute done");
+		bt_shell_print("VCP vol_down_unmute done");
 	}
 }
 
 static void vcs_vol_up_unmute_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "VCP vol_up_unmute failed (%d)", err);
+		bt_shell_error("VCP vol_up_unmute failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "VCP vol_up_unmute done");
+		bt_shell_print("VCP vol_up_unmute done");
 	}
 }
 
 static void vcs_vol_set_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "VCP vol_set failed (%d)", err);
+		bt_shell_error("VCP vol_set failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "VCP vol_set done");
+		bt_shell_print("VCP vol_set done");
 	}
 }
 
@@ -109,9 +110,9 @@ static void vcs_state_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err,
 			 uint8_t volume, uint8_t mute)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "VCP state get failed (%d)", err);
+		bt_shell_error("VCP state get failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "VCP volume %u, mute %u", volume, mute);
+		bt_shell_print("VCP volume %u, mute %u", volume, mute);
 	}
 }
 
@@ -119,9 +120,9 @@ static void vcs_flags_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err,
 			 uint8_t flags)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "VCP flags get failed (%d)", err);
+		bt_shell_error("VCP flags get failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "VCP flags 0x%02X", flags);
+		bt_shell_print("VCP flags 0x%02X", flags);
 	}
 }
 
@@ -129,53 +130,45 @@ static void vcs_flags_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err,
 static void vcs_aics_set_gain_cb(struct bt_aics *inst, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Set gain failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("Set gain failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "Gain set for inst %p", inst);
+		bt_shell_print("Gain set for inst %p", inst);
 	}
 }
 
 static void vcs_aics_unmute_cb(struct bt_aics *inst, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Unmute failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("Unmute failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "Unmuted inst %p", inst);
+		bt_shell_print("Unmuted inst %p", inst);
 	}
 }
 
 static void vcs_aics_mute_cb(struct bt_aics *inst, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Mute failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("Mute failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "Muted inst %p", inst);
+		bt_shell_print("Muted inst %p", inst);
 	}
 }
 
 static void vcs_aics_set_manual_mode_cb(struct bt_aics *inst, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell,
-			    "Set manual mode failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("Set manual mode failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "Manual mode set for inst %p", inst);
+		bt_shell_print("Manual mode set for inst %p", inst);
 	}
 }
 
 static void vcs_aics_automatic_mode_cb(struct bt_aics *inst, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell,
-			    "Set automatic mode failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("Set automatic mode failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "Automatic mode set for inst %p",
-			    inst);
+		bt_shell_print("Automatic mode set for inst %p", inst);
 	}
 }
 
@@ -183,12 +176,11 @@ static void vcs_aics_state_cb(struct bt_aics *inst, int err, int8_t gain,
 			      uint8_t mute, uint8_t mode)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "AICS state get failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("AICS state get failed (%d) for inst %p",
+			       err, inst);
 	} else {
-		shell_print(ctx_shell,
-			    "AICS inst %p state gain %d, mute %u, mode %u",
-			    inst, gain, mute, mode);
+		bt_shell_print("AICS inst %p state gain %d, mute %u, mode %u",
+			       inst, gain, mute, mode);
 	}
 }
 
@@ -197,13 +189,11 @@ static void vcs_aics_gain_setting_cb(struct bt_aics *inst, int err,
 				     int8_t maximum)
 {
 	if (err != 0) {
-		shell_error(ctx_shell,
-			    "AICS gain settings get failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("AICS gain settings get failed (%d) for inst %p",
+			       err, inst);
 	} else {
-		shell_print(ctx_shell,
-			    "AICS inst %p gain settings units %u, min %d, max %d",
-			    inst, units, minimum, maximum);
+		bt_shell_print("AICS inst %p gain settings units %u, min %d, max %d",
+			       inst, units, minimum, maximum);
 	}
 }
 
@@ -211,37 +201,31 @@ static void vcs_aics_input_type_cb(struct bt_aics *inst, int err,
 				   uint8_t input_type)
 {
 	if (err != 0) {
-		shell_error(ctx_shell,
-			    "AICS input type get failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("AICS input type get failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "AICS inst %p input type %u",
-			    inst, input_type);
+		bt_shell_print("AICS inst %p input type %u", inst, input_type);
 	}
 }
 
 static void vcs_aics_status_cb(struct bt_aics *inst, int err, bool active)
 {
 	if (err != 0) {
-		shell_error(ctx_shell,
-			    "AICS status get failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("AICS status get failed (%d) for inst %p",
+			       err, inst);
 	} else {
-		shell_print(ctx_shell, "AICS inst %p status %s",
-			    inst, active ? "active" : "inactive");
+		bt_shell_print("AICS inst %p status %s",
+			       inst, active ? "active" : "inactive");
 	}
-
 }
 static void vcs_aics_description_cb(struct bt_aics *inst, int err,
 				    char *description)
 {
 	if (err != 0) {
-		shell_error(ctx_shell,
-			    "AICS description get failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("AICS description get failed (%d) for inst %p",
+			       err, inst);
 	} else {
-		shell_print(ctx_shell, "AICS inst %p description %s",
-			    inst, description);
+		bt_shell_print("AICS inst %p description %s",
+			       inst, description);
 	}
 }
 #endif /* CONFIG_BT_VCP_VOL_CTLR_MAX_AICS_INST > 0 */
@@ -250,20 +234,18 @@ static void vcs_aics_description_cb(struct bt_aics *inst, int err,
 static void vcs_vocs_set_offset_cb(struct bt_vocs *inst, int err)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "Set offset failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("Set offset failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "Offset set for inst %p", inst);
+		bt_shell_print("Offset set for inst %p", inst);
 	}
 }
 
 static void vcs_vocs_state_cb(struct bt_vocs *inst, int err, int16_t offset)
 {
 	if (err != 0) {
-		shell_error(ctx_shell, "VOCS state get failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("VOCS state get failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "VOCS inst %p offset %d", inst, offset);
+		bt_shell_print("VOCS inst %p offset %d", inst, offset);
 	}
 }
 
@@ -271,12 +253,9 @@ static void vcs_vocs_location_cb(struct bt_vocs *inst, int err,
 				 uint32_t location)
 {
 	if (err != 0) {
-		shell_error(ctx_shell,
-			    "VOCS location get failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("VOCS location get failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "VOCS inst %p location %u",
-			    inst, location);
+		bt_shell_print("VOCS inst %p location %u", inst, location);
 	}
 }
 
@@ -284,12 +263,9 @@ static void vcs_vocs_description_cb(struct bt_vocs *inst, int err,
 				    char *description)
 {
 	if (err != 0) {
-		shell_error(ctx_shell,
-			    "VOCS description get failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("VOCS description get failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "VOCS inst %p description %s",
-			    inst, description);
+		bt_shell_print("VOCS inst %p description %s", inst, description);
 	}
 }
 #endif /* CONFIG_BT_VCP_VOL_CTLR_MAX_VOCS_INST > 0 */
@@ -338,10 +314,6 @@ static int cmd_vcp_vol_ctlr_discover(const struct shell *sh, size_t argc,
 	static bool cb_registered;
 	int result;
 
-	if (!ctx_shell) {
-		ctx_shell = sh;
-	}
-
 	if (!cb_registered) {
 		result = bt_vcp_vol_ctlr_cb_register(&vcp_cbs);
 		if (result != 0) {
@@ -646,7 +618,6 @@ static int cmd_vcp_vol_ctlr_vocs_location_set(const struct shell *sh,
 	if (location > UINT32_MAX) {
 		shell_error(sh, "Invalid location %lu", location);
 		return -ENOEXEC;
-
 	}
 
 	result = bt_vocs_location_set(vcp_included.vocs[index], location);
diff --git a/subsys/bluetooth/audio/shell/vcp_vol_rend.c b/subsys/bluetooth/audio/shell/vcp_vol_rend.c
index be2dab918d1..95db550d292 100644
--- a/subsys/bluetooth/audio/shell/vcp_vol_rend.c
+++ b/subsys/bluetooth/audio/shell/vcp_vol_rend.c
@@ -25,24 +25,25 @@
 #include <zephyr/sys/util_macro.h>
 
 #include "host/shell/bt.h"
+#include "common/bt_shell_private.h"
 
 static struct bt_vcp_included vcp_included;
 
 static void vcp_vol_rend_state_cb(struct bt_conn *conn, int err, uint8_t volume, uint8_t mute)
 {
 	if (err) {
-		shell_error(ctx_shell, "VCP state get failed (%d)", err);
+		bt_shell_error("VCP state get failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "VCP volume %u, mute %u", volume, mute);
+		bt_shell_print("VCP volume %u, mute %u", volume, mute);
 	}
 }
 
 static void vcp_vol_rend_flags_cb(struct bt_conn *conn, int err, uint8_t flags)
 {
 	if (err) {
-		shell_error(ctx_shell, "VCP flags get failed (%d)", err);
+		bt_shell_error("VCP flags get failed (%d)", err);
 	} else {
-		shell_print(ctx_shell, "VCP flags 0x%02X", flags);
+		bt_shell_print("VCP flags 0x%02X", flags);
 	}
 }
 
@@ -50,13 +51,11 @@ static void aics_state_cb(struct bt_aics *inst, int err, int8_t gain,
 			  uint8_t mute, uint8_t mode)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "AICS state get failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("AICS state get failed (%d) for inst %p",
+			       err, inst);
 	} else {
-		shell_print(ctx_shell,
-			    "AICS inst %p state gain %d, mute %u, mode %u",
-			    inst, gain, mute, mode);
+		bt_shell_print("AICS inst %p state gain %d, mute %u, mode %u",
+			       inst, gain, mute, mode);
 	}
 }
 
@@ -64,13 +63,11 @@ static void aics_gain_setting_cb(struct bt_aics *inst, int err, uint8_t units,
 				 int8_t minimum, int8_t maximum)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "AICS gain settings get failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("AICS gain settings get failed (%d) for inst %p",
+			       err, inst);
 	} else {
-		shell_print(ctx_shell,
-			    "AICS inst %p gain settings units %u, min %d, max %d",
-			    inst, units, minimum, maximum);
+		bt_shell_print("AICS inst %p gain settings units %u, min %d, max %d",
+			       inst, units, minimum, maximum);
 	}
 }
 
@@ -78,60 +75,52 @@ static void aics_input_type_cb(struct bt_aics *inst, int err,
 			       uint8_t input_type)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "AICS input type get failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("AICS input type get failed (%d) for inst %p",
+			       err, inst);
 	} else {
-		shell_print(ctx_shell, "AICS inst %p input type %u",
-			    inst, input_type);
+		bt_shell_print("AICS inst %p input type %u",
+			       inst, input_type);
 	}
 }
 
 static void aics_status_cb(struct bt_aics *inst, int err, bool active)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "AICS status get failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("AICS status get failed (%d) for inst %p",
+			       err, inst);
 	} else {
-		shell_print(ctx_shell, "AICS inst %p status %s",
-			    inst, active ? "active" : "inactive");
+		bt_shell_print("AICS inst %p status %s",
+			       inst, active ? "active" : "inactive");
 	}
-
 }
 
 static void aics_description_cb(struct bt_aics *inst, int err,
 				char *description)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "AICS description get failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("AICS description get failed (%d) for inst %p",
+			       err, inst);
 	} else {
-		shell_print(ctx_shell, "AICS inst %p description %s",
-			    inst, description);
+		bt_shell_print("AICS inst %p description %s",
+			       inst, description);
 	}
 }
 
 static void vocs_state_cb(struct bt_vocs *inst, int err, int16_t offset)
 {
 	if (err) {
-		shell_error(ctx_shell, "VOCS state get failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("VOCS state get failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "VOCS inst %p offset %d", inst, offset);
+		bt_shell_print("VOCS inst %p offset %d", inst, offset);
 	}
 }
 
 static void vocs_location_cb(struct bt_vocs *inst, int err, uint32_t location)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "VOCS location get failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("VOCS location get failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "VOCS inst %p location %u",
-			    inst, location);
+		bt_shell_print("VOCS inst %p location %u", inst, location);
 	}
 }
 
@@ -139,12 +128,9 @@ static void vocs_description_cb(struct bt_vocs *inst, int err,
 				char *description)
 {
 	if (err) {
-		shell_error(ctx_shell,
-			    "VOCS description get failed (%d) for inst %p",
-			    err, inst);
+		bt_shell_error("VOCS description get failed (%d) for inst %p", err, inst);
 	} else {
-		shell_print(ctx_shell, "VOCS inst %p description %s",
-			    inst, description);
+		bt_shell_print("VOCS inst %p description %s", inst, description);
 	}
 }
 
@@ -176,10 +162,6 @@ static int cmd_vcp_vol_rend_init(const struct shell *sh, size_t argc,
 	char output_desc[CONFIG_BT_VCP_VOL_REND_VOCS_INSTANCE_COUNT][16];
 	static const char assignment_operator[] = "=";
 
-	if (!ctx_shell) {
-		ctx_shell = sh;
-	}
-
 	memset(&vcp_register_param, 0, sizeof(vcp_register_param));
 
 	if (IS_ENABLED(CONFIG_BT_VCP_VOL_REND_VOCS)) {

From 74fb04b455d51187ffa62ba3ace382927ef259aa Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Mon, 13 Jan 2025 15:58:13 +0100
Subject: [PATCH 2700/2913] [nrf fromtree] tests: Bluetooth: CSIP: Change the
 rs values of CSIP tests

Instead of using rs=1,2,3 and 4 we make it 10, 20, 30, 40 as the
other values could cause some connection issues.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit 7d24771edc3a48d3a42c4392fd114dee748c1a2f)
---
 tests/bsim/bluetooth/audio/test_scripts/ccp.sh            | 2 +-
 tests/bsim/bluetooth/audio/test_scripts/csip.sh           | 8 ++++----
 .../bluetooth/audio/test_scripts/csip_encrypted_sirk.sh   | 8 ++++----
 .../bluetooth/audio/test_scripts/csip_forced_release.sh   | 8 ++++----
 tests/bsim/bluetooth/audio/test_scripts/csip_new_sirk.sh  | 8 ++++----
 tests/bsim/bluetooth/audio/test_scripts/csip_no_lock.sh   | 8 ++++----
 tests/bsim/bluetooth/audio/test_scripts/csip_no_rank.sh   | 8 ++++----
 tests/bsim/bluetooth/audio/test_scripts/csip_no_size.sh   | 8 ++++----
 8 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/tests/bsim/bluetooth/audio/test_scripts/ccp.sh b/tests/bsim/bluetooth/audio/test_scripts/ccp.sh
index cac742afbd8..ed5d1021e4a 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/ccp.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/ccp.sh
@@ -13,7 +13,7 @@ cd ${BSIM_OUT_PATH}/bin
 SIMULATION_ID="ccp"
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
-  -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=ccp_call_control_server -rs=1 -D=1
+  -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=ccp_call_control_server -rs=10 -D=1
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip.sh b/tests/bsim/bluetooth/audio/test_scripts/csip.sh
index 8d2c4380dc5..dc64d437516 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip.sh
@@ -18,19 +18,19 @@ SIMULATION_ID="csip"
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=csip_set_coordinator \
-  -RealEncryption=1 -rs=1 -D=4
+  -RealEncryption=1 -rs=10 -D=4
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member \
-  -RealEncryption=1 -rs=2 -D=4 -argstest rank 1
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member \
-  -RealEncryption=1 -rs=3 -D=4 -argstest rank 2
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member \
-  -RealEncryption=1 -rs=4 -D=4 -argstest rank 3
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_encrypted_sirk.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_encrypted_sirk.sh
index 08e5ed82d62..7c38e405eac 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip_encrypted_sirk.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_encrypted_sirk.sh
@@ -18,19 +18,19 @@ SIMULATION_ID="csip_sirk_encrypted"
 printf "\n\n======== Running test with SIRK encrypted ========\n\n"
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=csip_set_coordinator \
-  -RealEncryption=1 -rs=1 -D=4
+  -RealEncryption=1 -rs=10 -D=4
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member_enc \
-  -RealEncryption=1 -rs=2 -D=4 -argstest rank 1
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member_enc \
-  -RealEncryption=1 -rs=3 -D=4 -argstest rank 2
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member_enc \
-  -RealEncryption=1 -rs=4 -D=4 -argstest rank 3
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_forced_release.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_forced_release.sh
index d7cd32365e8..d02329b3c75 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip_forced_release.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_forced_release.sh
@@ -18,19 +18,19 @@ SIMULATION_ID="csip_forced_release"
 printf "\n\n======== Running test with forced release of lock ========\n\n"
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=csip_set_coordinator \
-  -RealEncryption=1 -rs=1 -D=4
+  -RealEncryption=1 -rs=10 -D=4
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member \
-  -RealEncryption=1 -rs=2 -D=4 -argstest rank 1
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member \
-  -RealEncryption=1 -rs=3 -D=4 -argstest rank 2
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member_release \
-  -RealEncryption=1 -rs=4 -D=4 -argstest rank 3
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_new_sirk.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_new_sirk.sh
index 84c36fc674f..8502c802789 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip_new_sirk.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_new_sirk.sh
@@ -18,19 +18,19 @@ SIMULATION_ID="csip_new_sirk"
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=csip_set_coordinator_new_sirk \
-  -RealEncryption=1 -rs=1 -D=4
+  -RealEncryption=1 -rs=10 -D=4
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member_new_sirk \
-  -RealEncryption=1 -rs=2 -D=4 -argstest rank 1
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member_new_sirk \
-  -RealEncryption=1 -rs=3 -D=4 -argstest rank 2
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member_new_sirk \
-  -RealEncryption=1 -rs=4 -D=4 -argstest rank 3
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_no_lock.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_no_lock.sh
index 17fe61052a7..5a3a807cd0a 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip_no_lock.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_no_lock.sh
@@ -17,19 +17,19 @@ SIMULATION_ID="csip_no_lock"
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=csip_set_coordinator \
-  -RealEncryption=1 -rs=1 -D=4 -argstest no-lock
+  -RealEncryption=1 -rs=10 -D=4 -argstest no-lock
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member \
-  -RealEncryption=1 -rs=2 -D=4 -argstest rank 1 not-lockable
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1 not-lockable
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member \
-  -RealEncryption=1 -rs=3 -D=4 -argstest rank 2 not-lockable
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2 not-lockable
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member \
-  -RealEncryption=1 -rs=4 -D=4 -argstest rank 3 not-lockable
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3 not-lockable
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_no_rank.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_no_rank.sh
index 54adbad5692..61b2cac707a 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip_no_rank.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_no_rank.sh
@@ -17,19 +17,19 @@ SIMULATION_ID="csip_no_rank"
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=csip_set_coordinator \
-  -RealEncryption=1 -rs=1 -D=4 -argstest no-rank no-lock
+  -RealEncryption=1 -rs=10 -D=4 -argstest no-rank no-lock
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member \
-  -RealEncryption=1 -rs=2 -D=4 -argstest rank 0 not-lockable
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 0 not-lockable
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member \
-  -RealEncryption=1 -rs=3 -D=4 -argstest rank 0 not-lockable
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 0 not-lockable
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member \
-  -RealEncryption=1 -rs=4 -D=4 -argstest rank 0 not-lockable
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 0 not-lockable
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_no_size.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_no_size.sh
index bd04c4c3968..dea6ac9874d 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip_no_size.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_no_size.sh
@@ -17,19 +17,19 @@ SIMULATION_ID="csip_no_size"
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=csip_set_coordinator \
-  -RealEncryption=1 -rs=1 -D=4 -argstest no-size
+  -RealEncryption=1 -rs=10 -D=4 -argstest no-size
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member \
-  -RealEncryption=1 -rs=2 -D=4 -argstest rank 1 size 0
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1 size 0
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member \
-  -RealEncryption=1 -rs=3 -D=4 -argstest rank 2 size 0
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2 size 0
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member \
-  -RealEncryption=1 -rs=4 -D=4 -argstest rank 3s size 0
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3s size 0
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \

From dc58d9d9343448ddceb5ec876d98a18ab1a1e66f Mon Sep 17 00:00:00 2001
From: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Date: Thu, 16 Jan 2025 07:08:22 +0100
Subject: [PATCH 2701/2913] [nrf fromtree] tests: bsim: Bluetooth: Workaround
 overlapping ACL in BAP broadcast sink

Workaround by using `-start_offset` to ensure that the ACL
established does not overlap the sink being established.

The behavior between nrf52_bsim and nrf54l15bsim is
different where in the two device are starting to
advertising at the same time in nrf54l15bsim where as
there is an offset already in nrf52_bsim test.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 490da9ec9613b5db547c1c87b66c5375a701e2b6)
---
 .../audio/test_scripts/bap_broadcast_audio_assistant.sh        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh b/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh
index f6333809f42..30ec2da7313 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh
@@ -24,7 +24,8 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 \
-  -testid=broadcast_source -RealEncryption=1 -rs=69 -D=3
+  -testid=broadcast_source -RealEncryption=1 -rs=69 -D=3 \
+  -start_offset=5e3
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -D=3 -sim_length=60e6 $@

From 30582fab7b671c41a64e2f9cbc1eb7fdd9ab2e6f Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Mon, 9 Dec 2024 12:21:17 +0100
Subject: [PATCH 2702/2913] [nrf fromtree] tests: Bluetooth: BAP: Add
 verification of receive state for the BA

The broadcast assistant will now validate the content of the
received receive states.

Some modifications were done to the tests to properly
pass these new validations.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit b361c9589ff02629cafd976255f2e7e9efc14b63)
---
 .../audio/src/bap_broadcast_assistant_test.c  | 196 +++++++++++++++---
 .../audio/src/bap_broadcast_sink_test.c       |  17 +-
 .../audio/src/bap_scan_delegator_test.c       |  29 ++-
 .../bluetooth/audio/src/cap_acceptor_test.c   |   4 +-
 tests/bsim/bluetooth/audio/src/common.h       |  10 +-
 .../bluetooth/audio/test_scripts/_bap_bass.sh |  14 +-
 .../bap_broadcast_audio_assistant.sh          |   4 +-
 7 files changed, 221 insertions(+), 53 deletions(-)

diff --git a/tests/bsim/bluetooth/audio/src/bap_broadcast_assistant_test.c b/tests/bsim/bluetooth/audio/src/bap_broadcast_assistant_test.c
index cb1a3296df0..430ab7f950a 100644
--- a/tests/bsim/bluetooth/audio/src/bap_broadcast_assistant_test.c
+++ b/tests/bsim/bluetooth/audio/src/bap_broadcast_assistant_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023 Nordic Semiconductor ASA
+ * Copyright (c) 2021-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -33,16 +33,15 @@
 extern enum bst_result_t bst_result;
 
 /* BASS variables */
-static volatile uint8_t g_src_id;
 static volatile uint32_t g_broadcast_id;
 static volatile uint8_t g_recv_state_count;
+static struct bt_bap_scan_delegator_recv_state recv_state;
 CREATE_FLAG(flag_discovery_complete);
 CREATE_FLAG(flag_write_complete);
 CREATE_FLAG(flag_cb_called);
 CREATE_FLAG(flag_broadcaster_found);
 CREATE_FLAG(flag_pa_synced);
 CREATE_FLAG(flag_pa_terminated);
-CREATE_FLAG(flag_state_synced);
 CREATE_FLAG(flag_mtu_exchanged);
 CREATE_FLAG(flag_recv_state_read);
 CREATE_FLAG(flag_recv_state_updated);
@@ -135,7 +134,7 @@ static void bap_broadcast_assistant_recv_state_cb(
 	printk("BASS recv state: src_id %u, addr %s, sid %u, sync_state %u, encrypt_state %u%s%s\n",
 	       state->src_id, le_addr, state->adv_sid, state->pa_sync_state, state->encrypt_state,
 	       state->encrypt_state == BT_BAP_BIG_ENC_STATE_BAD_CODE ? ", bad code: " : "",
-	       bad_code);
+	       state->encrypt_state == BT_BAP_BIG_ENC_STATE_BAD_CODE ? bad_code : "");
 
 	if (state->encrypt_state == BT_BAP_BIG_ENC_STATE_BCODE_REQ) {
 		SET_FLAG(flag_broadcast_code_requested);
@@ -143,7 +142,7 @@ static void bap_broadcast_assistant_recv_state_cb(
 		SET_FLAG(flag_incorrect_broadcast_code);
 		if (memcmp(state->bad_code, INCORRECT_BROADCAST_CODE, BT_ISO_BROADCAST_CODE_SIZE) !=
 		    0) {
-			FAIL("Bad code is not what we sent");
+			FAIL("Bad code is not what we sent\n");
 			return;
 		}
 
@@ -151,7 +150,7 @@ static void bap_broadcast_assistant_recv_state_cb(
 			const struct bt_bap_bass_subgroup *subgroup = &state->subgroups[i];
 
 			if (subgroup->bis_sync != BT_BAP_BIS_SYNC_FAILED) {
-				FAIL("Invalid BIS sync value 0x%08X for failed sync",
+				FAIL("Invalid BIS sync value 0x%08X for failed sync\n",
 				     subgroup->bis_sync);
 				return;
 			}
@@ -185,13 +184,8 @@ static void bap_broadcast_assistant_recv_state_cb(
 	}
 #endif /* CONFIG_BT_PER_ADV_SYNC_TRANSFER_SENDER */
 
-	if (state->pa_sync_state == BT_BAP_PA_STATE_SYNCED) {
-		SET_FLAG(flag_state_synced);
-	}
-
-	g_src_id = state->src_id;
+	memcpy(&recv_state, state, sizeof(recv_state));
 	SET_FLAG(flag_cb_called);
-
 	SET_FLAG(flag_recv_state_updated);
 }
 
@@ -451,39 +445,150 @@ static void test_bass_add_source(void)
 		return;
 	}
 
+	WAIT_FOR_FLAG(flag_recv_state_updated);
+
+	if (!bt_addr_le_eq(&recv_state.addr, &add_src_param.addr)) {
+		char addr[BT_ADDR_LE_STR_LEN];
+		char expected_addr[BT_ADDR_LE_STR_LEN];
+
+		bt_addr_le_to_str(&recv_state.addr, addr, sizeof(addr));
+		bt_addr_le_to_str(&add_src_param.addr, expected_addr, sizeof(expected_addr));
+
+		FAIL("Unexpected addr %s != %s\n", addr, expected_addr);
+		return;
+	}
+
+	if (recv_state.adv_sid != add_src_param.adv_sid) {
+		FAIL("Unexpected SID: %u\n", recv_state.adv_sid);
+		return;
+	}
+
+	if (recv_state.pa_sync_state != BT_BAP_PA_STATE_NOT_SYNCED) {
+		FAIL("Unexpected PA sync state: %d\n", recv_state.pa_sync_state);
+		return;
+	}
+
+	if (recv_state.encrypt_state != BT_BAP_BIG_ENC_STATE_NO_ENC) {
+		FAIL("Unexpected BIG encryption state: %d\n", recv_state.pa_sync_state);
+		return;
+	}
+
+	if (recv_state.broadcast_id != add_src_param.broadcast_id) {
+		FAIL("Unexpected broadcast ID: 0x%06X != 0x%06X\n", recv_state.broadcast_id,
+		     add_src_param.broadcast_id);
+		return;
+	}
+
+	if (recv_state.num_subgroups != add_src_param.num_subgroups) {
+		FAIL("Unexpected number of subgroups: %u\n", recv_state.num_subgroups);
+		return;
+	}
+
 	WAIT_FOR_FLAG(flag_cb_called);
 	WAIT_FOR_FLAG(flag_write_complete);
+
 	printk("Source added\n");
 }
 
-static void test_bass_mod_source(void)
+static void test_bass_mod_source(uint32_t bis_sync)
 {
 	int err;
 	struct bt_bap_broadcast_assistant_mod_src_param mod_src_param = { 0 };
-	struct bt_bap_bass_subgroup subgroup = { 0 };
+	struct bt_bap_bass_subgroup subgroup = {0};
+	uint32_t remote_bis_sync;
 
 	printk("Modify source\n");
 	UNSET_FLAG(flag_cb_called);
 	UNSET_FLAG(flag_write_complete);
-	mod_src_param.src_id = g_src_id;
+	UNSET_FLAG(flag_recv_state_updated);
+	mod_src_param.src_id = recv_state.src_id;
 	mod_src_param.num_subgroups = 1;
 	mod_src_param.pa_sync = true;
 	mod_src_param.subgroups = &subgroup;
 	mod_src_param.pa_interval = g_broadcaster_info.interval;
-	subgroup.bis_sync = BT_ISO_BIS_INDEX_BIT(1) | BT_ISO_BIS_INDEX_BIT(2); /* Indexes 1 and 2 */
-	subgroup.metadata_len = 0;
+	subgroup.bis_sync = bis_sync;
+
+	/* Leave metadata as is */
+	subgroup.metadata_len = recv_state.subgroups[0].metadata_len;
+	memcpy(subgroup.metadata, recv_state.subgroups[0].metadata, sizeof(metadata));
 
 	err = bt_bap_broadcast_assistant_mod_src(default_conn, &mod_src_param);
 	if (err != 0) {
 		FAIL("Could not modify source (err %d)\n", err);
 		return;
 	}
+	printk("Source modified, waiting for server to PA sync\n");
+
+	WAIT_FOR_AND_CLEAR_FLAG(flag_recv_state_updated);
+
+	if (recv_state.pa_sync_state == BT_BAP_PA_STATE_INFO_REQ) {
+		/* Wait for PAST to finish and then a new receive state */
+		printk("Waiting for PAST sync\n");
+		WAIT_FOR_AND_CLEAR_FLAG(flag_recv_state_updated);
+	}
+
+	if (recv_state.pa_sync_state != BT_BAP_PA_STATE_SYNCED) {
+		FAIL("Unexpected PA sync state: %d\n", recv_state.pa_sync_state);
+		return;
+	}
+
+	if (recv_state.encrypt_state != BT_BAP_BIG_ENC_STATE_NO_ENC) {
+		FAIL("Unexpected BIG encryption state: %d\n", recv_state.pa_sync_state);
+		return;
+	}
+
+	if (recv_state.num_subgroups != mod_src_param.num_subgroups) {
+		FAIL("Unexpected number of subgroups: %u\n", recv_state.num_subgroups);
+		return;
+	}
+
+	/* Wait for another notification that updates the metadata of the subgroups */
+	if (recv_state.subgroups[0].metadata_len == 0U) {
+		printk("Waiting for another receive state update with metadata\n");
+		WAIT_FOR_AND_CLEAR_FLAG(flag_recv_state_updated);
+	}
+
+	remote_bis_sync = recv_state.subgroups[0].bis_sync;
+	if (subgroup.bis_sync == 0) {
+		if (remote_bis_sync != 0U) {
+			FAIL("Unexpected BIS sync value: %u\n", remote_bis_sync);
+			return;
+		}
+	} else {
+		printk("Waiting for BIS sync\n");
+
+		if (remote_bis_sync == 0U &&
+		    recv_state.encrypt_state == BT_BAP_BIG_ENC_STATE_NO_ENC) {
+			/* Wait for another notification, which will either request a broadcast code
+			 * for encrypted broadcasts, or have the BIS sync values set
+			 */
+			printk("Waiting for another receive state update with BIS sync\n");
+			WAIT_FOR_AND_CLEAR_FLAG(flag_recv_state_updated);
+			remote_bis_sync = recv_state.subgroups[0].bis_sync;
+		}
+
+		if (recv_state.encrypt_state == BT_BAP_BIG_ENC_STATE_BCODE_REQ) {
+			printk("Remote is requesting broadcast code\n");
+			if (remote_bis_sync != 0U) {
+				FAIL("Unexpected BIS sync value: %u", remote_bis_sync);
+				return;
+			}
+		} else if (recv_state.encrypt_state == BT_BAP_BIG_ENC_STATE_BAD_CODE) {
+			printk("Remote responded with bad code\n");
+			if (remote_bis_sync != 0U) {
+				FAIL("Unexpected BIS sync value: %u", remote_bis_sync);
+				return;
+			}
+		} else if (remote_bis_sync != subgroup.bis_sync) {
+			FAIL("Unexpected BIS sync value: %u != %u\n", remote_bis_sync,
+			     subgroup.bis_sync);
+			return;
+		}
+	}
 
 	WAIT_FOR_FLAG(flag_cb_called);
 	WAIT_FOR_FLAG(flag_write_complete);
-	printk("Source added, waiting for server to PA sync\n");
-	WAIT_FOR_FLAG(flag_state_synced)
-	printk("Server PA synced\n");
+	printk("Source modified\n");
 }
 
 static void test_bass_mod_source_long_meta(void)
@@ -491,16 +596,18 @@ static void test_bass_mod_source_long_meta(void)
 	int err;
 	struct bt_bap_broadcast_assistant_mod_src_param mod_src_param = { 0 };
 	struct bt_bap_bass_subgroup subgroup = { 0 };
+	uint32_t remote_bis_sync;
 
 	printk("Long write\n");
 	UNSET_FLAG(flag_cb_called);
 	UNSET_FLAG(flag_write_complete);
-	mod_src_param.src_id = g_src_id;
+	UNSET_FLAG(flag_recv_state_updated);
+	mod_src_param.src_id = recv_state.src_id;
 	mod_src_param.num_subgroups = 1;
 	mod_src_param.pa_sync = true;
 	mod_src_param.subgroups = &subgroup;
 	mod_src_param.pa_interval = g_broadcaster_info.interval;
-	subgroup.bis_sync = BT_ISO_BIS_INDEX_BIT(1) | BT_ISO_BIS_INDEX_BIT(2);
+	subgroup.bis_sync = recv_state.subgroups[0].bis_sync;
 
 	subgroup.metadata_len = sizeof(metadata);
 	memcpy(subgroup.metadata, metadata, sizeof(metadata));
@@ -509,12 +616,41 @@ static void test_bass_mod_source_long_meta(void)
 		FAIL("Could not modify source (err %d)\n", err);
 		return;
 	}
+	printk("Source modified, waiting for receive state\n");
+
+	WAIT_FOR_FLAG(flag_recv_state_updated);
+
+	remote_bis_sync = recv_state.subgroups[0].bis_sync;
+	if (recv_state.pa_sync_state != BT_BAP_PA_STATE_SYNCED) {
+		FAIL("Unexpected PA sync state: %d\n", recv_state.pa_sync_state);
+		return;
+	}
+
+	if (recv_state.encrypt_state != BT_BAP_BIG_ENC_STATE_NO_ENC) {
+		FAIL("Unexpected BIG encryption state: %d\n", recv_state.pa_sync_state);
+		return;
+	}
+
+	if (recv_state.num_subgroups != mod_src_param.num_subgroups) {
+		FAIL("Unexpected number of subgroups: %u\n", recv_state.num_subgroups);
+		return;
+	}
+
+	if (remote_bis_sync != 0U && remote_bis_sync != subgroup.bis_sync) {
+		FAIL("Unexpected BIS sync value: %u\n", remote_bis_sync);
+		return;
+	}
+
+	if (memcmp(recv_state.subgroups[0].metadata, subgroup.metadata, subgroup.metadata_len) !=
+	    0) {
+		FAIL("Unexpected metadata (len %u / %u)\n", recv_state.subgroups[0].metadata_len,
+		     subgroup.metadata_len);
+		return;
+	}
 
 	WAIT_FOR_FLAG(flag_cb_called);
 	WAIT_FOR_FLAG(flag_write_complete);
-	printk("Source added, waiting for server to PA sync\n");
-	WAIT_FOR_FLAG(flag_state_synced)
-	printk("Server PA synced\n");
+	printk("Source modified with long meta\n");
 }
 
 static void test_bass_broadcast_code(const uint8_t broadcast_code[BT_ISO_BROADCAST_CODE_SIZE])
@@ -523,7 +659,8 @@ static void test_bass_broadcast_code(const uint8_t broadcast_code[BT_ISO_BROADCA
 
 	printk("Adding broadcast code\n");
 	UNSET_FLAG(flag_write_complete);
-	err = bt_bap_broadcast_assistant_set_broadcast_code(default_conn, g_src_id, broadcast_code);
+	err = bt_bap_broadcast_assistant_set_broadcast_code(default_conn, recv_state.src_id,
+							    broadcast_code);
 	if (err != 0) {
 		FAIL("Could not add broadcast code (err %d)\n", err);
 		return;
@@ -540,7 +677,7 @@ static void test_bass_remove_source(void)
 	printk("Removing source\n");
 	UNSET_FLAG(flag_cb_called);
 	UNSET_FLAG(flag_write_complete);
-	err = bt_bap_broadcast_assistant_rem_src(default_conn, g_src_id);
+	err = bt_bap_broadcast_assistant_rem_src(default_conn, recv_state.src_id);
 	if (err != 0) {
 		FAIL("Could not remove source (err %d)\n", err);
 		return;
@@ -599,8 +736,9 @@ static void test_main_client_sync(void)
 	test_bass_scan_stop();
 	test_bass_create_pa_sync();
 	test_bass_add_source();
-	test_bass_mod_source();
+	test_bass_mod_source(0);
 	test_bass_mod_source_long_meta();
+	test_bass_mod_source(BT_ISO_BIS_INDEX_BIT(1) | BT_ISO_BIS_INDEX_BIT(2));
 	test_bass_broadcast_code(BROADCAST_CODE);
 
 	printk("Waiting for receive state with BIS sync\n");
@@ -625,7 +763,7 @@ static void test_main_client_sync_incorrect_code(void)
 	test_bass_scan_stop();
 	test_bass_create_pa_sync();
 	test_bass_add_source();
-	test_bass_mod_source();
+	test_bass_mod_source(BT_ISO_BIS_INDEX_BIT(1));
 	WAIT_FOR_FLAG(flag_broadcast_code_requested);
 	test_bass_broadcast_code(INCORRECT_BROADCAST_CODE);
 	WAIT_FOR_FLAG(flag_incorrect_broadcast_code);
diff --git a/tests/bsim/bluetooth/audio/src/bap_broadcast_sink_test.c b/tests/bsim/bluetooth/audio/src/bap_broadcast_sink_test.c
index 6450bea3d57..9e82d99a64f 100644
--- a/tests/bsim/bluetooth/audio/src/bap_broadcast_sink_test.c
+++ b/tests/bsim/bluetooth/audio/src/bap_broadcast_sink_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2024 Nordic Semiconductor ASA
+ * Copyright (c) 2021-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -251,7 +251,18 @@ static void base_recv_cb(struct bt_bap_broadcast_sink *sink, const struct bt_bap
 		return;
 	}
 
-	bis_index_bitfield = base_bis_index_bitfield & bis_index_mask;
+	if (requested_bis_sync == 0) {
+		bis_index_bitfield = base_bis_index_bitfield & bis_index_mask;
+	} else {
+		if ((requested_bis_sync & base_bis_index_bitfield) != requested_bis_sync) {
+			FAIL("Assistant has request BIS indexes 0x%08x that is not in the BASE "
+			     "0x%08x\n",
+			     requested_bis_sync, base_bis_index_bitfield);
+			return;
+		}
+
+		bis_index_bitfield = requested_bis_sync & bis_index_mask;
+	}
 
 	SET_FLAG(flag_base_received);
 }
@@ -771,7 +782,7 @@ static void test_broadcast_sync(const uint8_t broadcast_code[BT_ISO_BROADCAST_CO
 {
 	int err;
 
-	printk("Syncing sink %p\n", g_sink);
+	printk("Syncing sink %p to 0x%08x\n", g_sink, bis_index_bitfield);
 	err = bt_bap_broadcast_sink_sync(g_sink, bis_index_bitfield, streams, broadcast_code);
 	if (err != 0) {
 		FAIL("Unable to sync the sink: %d\n", err);
diff --git a/tests/bsim/bluetooth/audio/src/bap_scan_delegator_test.c b/tests/bsim/bluetooth/audio/src/bap_scan_delegator_test.c
index a904c4a5cda..267c03809f8 100644
--- a/tests/bsim/bluetooth/audio/src/bap_scan_delegator_test.c
+++ b/tests/bsim/bluetooth/audio/src/bap_scan_delegator_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Nordic Semiconductor ASA
+ * Copyright (c) 2021-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -648,17 +648,18 @@ static void remove_all_sources(void)
 static int sync_broadcast(struct sync_state *state)
 {
 	int err;
-	uint32_t bis_sync[CONFIG_BT_BAP_BASS_MAX_SUBGROUPS];
 
 	UNSET_FLAG(flag_recv_state_updated);
 
-	for (size_t i = 0U; i < CONFIG_BT_BAP_BASS_MAX_SUBGROUPS; i++) {
-		bis_sync[i] = BT_ISO_BIS_INDEX_BIT(i + 1);
+	if (!TEST_FLAG(flag_bis_sync_requested)) {
+		/* If we have not received a sync request, set a value ourselves */
+		for (size_t i = 0U; i < ARRAY_SIZE(state->bis_sync_req); i++) {
+			state->bis_sync_req[i] = BIT(i);
+		}
 	}
 
 	/* We don't actually need to sync to the BIG/BISes */
-	err = bt_bap_scan_delegator_set_bis_sync_state(state->src_id, bis_sync);
-
+	err = bt_bap_scan_delegator_set_bis_sync_state(state->src_id, state->bis_sync_req);
 	if (err) {
 		return err;
 	}
@@ -733,21 +734,25 @@ static void test_main_client_sync(void)
 	}
 
 	/* Wait for broadcast assistant to request us to sync to PA */
+	printk("Waiting for flag_pa_synced\n");
 	WAIT_FOR_FLAG(flag_pa_synced);
 
-	/* Wait for broadcast assistant to send us broadcast code */
-	WAIT_FOR_FLAG(flag_broadcast_code_received);
-
 	/* Mod all sources by modifying the metadata */
 	mod_all_sources();
 
 	/* Wait for broadcast assistant to tell us to BIS sync */
+	printk("Waiting for flag_bis_sync_requested\n");
 	WAIT_FOR_FLAG(flag_bis_sync_requested);
 
 	/* Set the BIS sync state */
 	sync_all_broadcasts();
 
+	/* Wait for broadcast assistant to send us broadcast code */
+	printk("Waiting for flag_broadcast_code_received\n");
+	WAIT_FOR_FLAG(flag_broadcast_code_received);
+
 	/* Wait for broadcast assistant to remove source and terminate PA sync */
+	printk("Waiting for flag_pa_terminated\n");
 	WAIT_FOR_FLAG(flag_pa_terminated);
 
 	PASS("BAP Scan Delegator Client Sync passed\n");
@@ -772,12 +777,14 @@ static void test_main_server_sync_client_rem(void)
 	}
 
 	/* Wait for PA to sync */
+	printk("Waiting for flag_pa_synced\n");
 	WAIT_FOR_FLAG(flag_pa_synced);
 
 	/* Add PAs as receive state sources */
 	add_all_sources();
 
 	/* Wait for broadcast assistant to send us broadcast code */
+	printk("Waiting for flag_broadcast_code_received\n");
 	WAIT_FOR_FLAG(flag_broadcast_code_received);
 
 	/* Mod all sources by modifying the metadata */
@@ -787,6 +794,7 @@ static void test_main_server_sync_client_rem(void)
 	sync_all_broadcasts();
 
 	/* For for client to remove source and thus terminate the PA */
+	printk("Waiting for flag_pa_terminated\n");
 	WAIT_FOR_FLAG(flag_pa_terminated);
 
 	PASS("BAP Scan Delegator Server Sync Client Remove passed\n");
@@ -811,12 +819,14 @@ static void test_main_server_sync_server_rem(void)
 	}
 
 	/* Wait for PA to sync */
+	printk("Waiting for flag_pa_synced\n");
 	WAIT_FOR_FLAG(flag_pa_synced);
 
 	/* Add PAs as receive state sources */
 	add_all_sources();
 
 	/* Wait for broadcast assistant to send us broadcast code */
+	printk("Waiting for flag_broadcast_code_received\n");
 	WAIT_FOR_FLAG(flag_broadcast_code_received);
 
 	/* Mod all sources by modifying the metadata */
@@ -829,6 +839,7 @@ static void test_main_server_sync_server_rem(void)
 	remove_all_sources();
 
 	/* Wait for PA sync to be terminated */
+	printk("Waiting for flag_pa_terminated\n");
 	WAIT_FOR_FLAG(flag_pa_terminated);
 
 	PASS("BAP Scan Delegator Server Sync Server Remove passed\n");
diff --git a/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c b/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c
index 034c5b22c60..f21f83739c9 100644
--- a/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c
+++ b/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Nordic Semiconductor ASA
+ * Copyright (c) 2022-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -966,7 +966,7 @@ static void create_and_sync_sink(struct bt_bap_stream *bap_streams[], size_t *st
 		bap_streams[i] = bap_stream_from_audio_test_stream(&broadcast_sink_streams[i]);
 	}
 
-	printk("Syncing the sink\n");
+	printk("Syncing the sink to 0x%08x\n", bis_index_bitfield);
 	*stream_count = 0;
 	for (int i = 1; i < BT_ISO_MAX_GROUP_ISO_COUNT; i++) {
 		if ((bis_index_bitfield & BIT(i)) != 0) {
diff --git a/tests/bsim/bluetooth/audio/src/common.h b/tests/bsim/bluetooth/audio/src/common.h
index 9e9b8a354b8..157aa695a84 100644
--- a/tests/bsim/bluetooth/audio/src/common.h
+++ b/tests/bsim/bluetooth/audio/src/common.h
@@ -80,9 +80,13 @@ static const uint8_t mock_iso_data[] = {
 #define SET_FLAG(flag) (void)atomic_set(&flag, (atomic_t)true)
 #define UNSET_FLAG(flag) (void)atomic_clear(&flag)
 #define TEST_FLAG(flag) (atomic_get(&flag) == (atomic_t)true)
-#define WAIT_FOR_FLAG(flag) \
-	while (!(bool)atomic_get(&flag)) { \
-		(void)k_sleep(K_MSEC(1)); \
+#define WAIT_FOR_FLAG(flag)                                                                        \
+	while (!(bool)atomic_get(&flag)) {                                                         \
+		(void)k_sleep(K_MSEC(1));                                                          \
+	}
+#define WAIT_FOR_AND_CLEAR_FLAG(flag)                                                              \
+	while (!(bool)atomic_clear(&flag)) {                                                       \
+		(void)k_sleep(K_MSEC(1));                                                          \
 	}
 #define WAIT_FOR_UNSET_FLAG(flag) \
 	while (atomic_get(&flag) != (atomic_t)false) { \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/_bap_bass.sh b/tests/bsim/bluetooth/audio/test_scripts/_bap_bass.sh
index ad73f02e383..818b63d657d 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/_bap_bass.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/_bap_bass.sh
@@ -1,13 +1,17 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2022 Nordic Semiconductor ASA
+# Copyright (c) 2022-2025 Nordic Semiconductor ASA
 #
 # SPDX-License-Identifier: Apache-2.0
 
 dir_path=$(dirname "$0")
 
-$dir_path/bap_bass_client_sync.sh
+set -e # Exit on error
 
-$dir_path/bap_bass_server_sync_client_rem.sh
-
-$dir_path/bap_bass_server_sync_server_rem.sh
+# Run all bap_bass* tests
+for file in "$dir_path"/bap_bass*.sh; do
+    if [ -f "$file" ]; then
+        echo "Running $file"
+        $file
+    fi
+done
diff --git a/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh b/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh
index 30ec2da7313..4b2bc395429 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2023 Nordic Semiconductor ASA
+# Copyright (c) 2023-2025 Nordic Semiconductor ASA
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -25,7 +25,7 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 \
   -testid=broadcast_source -RealEncryption=1 -rs=69 -D=3 \
-  -start_offset=5e3
+  -start_offset=5e3 -argstest subgroup_cnt 1 streams_per_subgroup_cnt 2
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -D=3 -sim_length=60e6 $@

From 5b4a5fe92f159f7b3a78edeb669c20954251f42b Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Thu, 9 Jan 2025 21:42:30 +0100
Subject: [PATCH 2703/2913] [nrf fromtree] tests: Bluetooth: Audio: Use ext adv
 for all connectable adv

Most specs require the use of extended advertising, and most
tests used legacy advertising.

Implement a common function to create and start an extended
advertising set to reduce code duplication.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit 0e9a3e0e6c484456fab5e0071cb76692c28c399f)
---
 .../audio/src/bap_broadcast_sink_test.c       | 40 +-------
 .../audio/src/bap_scan_delegator_test.c       |  9 +-
 .../audio/src/bap_unicast_server_test.c       | 51 +---------
 .../bluetooth/audio/src/cap_acceptor_test.c   | 51 +---------
 tests/bsim/bluetooth/audio/src/common.c       | 80 +++++++++++++--
 tests/bsim/bluetooth/audio/src/common.h       | 22 ++++-
 .../audio/src/csip_notify_server_test.c       | 28 ++----
 .../audio/src/csip_set_coordinator_test.c     | 18 ++--
 .../audio/src/csip_set_member_test.c          | 13 +--
 .../bsim/bluetooth/audio/src/gmap_ugg_test.c  | 97 ++++++++++---------
 .../bsim/bluetooth/audio/src/gmap_ugt_test.c  | 14 +--
 tests/bsim/bluetooth/audio/src/has_test.c     | 10 +-
 tests/bsim/bluetooth/audio/src/ias_test.c     |  9 +-
 tests/bsim/bluetooth/audio/src/mcs_test.c     | 26 +++--
 .../audio/src/media_controller_test.c         |  8 +-
 .../bluetooth/audio/src/micp_mic_dev_test.c   | 10 +-
 .../audio/src/pacs_notify_server_test.c       | 51 ++++------
 .../bluetooth/audio/src/tbs_client_test.c     |  7 +-
 .../bluetooth/audio/src/tmap_client_test.c    |  1 +
 .../bluetooth/audio/src/tmap_server_test.c    | 35 +------
 .../bluetooth/audio/src/vcp_vol_rend_test.c   |  9 +-
 21 files changed, 222 insertions(+), 367 deletions(-)

diff --git a/tests/bsim/bluetooth/audio/src/bap_broadcast_sink_test.c b/tests/bsim/bluetooth/audio/src/bap_broadcast_sink_test.c
index 9e82d99a64f..27ec575e56b 100644
--- a/tests/bsim/bluetooth/audio/src/bap_broadcast_sink_test.c
+++ b/tests/bsim/bluetooth/audio/src/bap_broadcast_sink_test.c
@@ -59,7 +59,6 @@ static uint32_t broadcaster_broadcast_id;
 static struct audio_test_stream broadcast_sink_streams[CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT];
 static struct bt_bap_stream *streams[ARRAY_SIZE(broadcast_sink_streams)];
 static uint32_t requested_bis_sync;
-static struct bt_le_ext_adv *ext_adv;
 static const struct bt_bap_scan_delegator_recv_state *req_recv_state;
 static uint8_t recv_state_broadcast_code[BT_ISO_BROADCAST_CODE_SIZE];
 
@@ -908,39 +907,6 @@ static void test_broadcast_delete_inval(void)
 	}
 }
 
-static void test_start_adv(void)
-{
-	const struct bt_data ad[] = {
-		BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
-		BT_DATA_BYTES(BT_DATA_UUID16_ALL, BT_UUID_16_ENCODE(BT_UUID_BASS_VAL),
-			      BT_UUID_16_ENCODE(BT_UUID_PACS_VAL)),
-		BT_DATA_BYTES(BT_DATA_SVC_DATA16, BT_UUID_16_ENCODE(BT_UUID_BASS_VAL)),
-	};
-	int err;
-
-	/* Create a connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, NULL, &ext_adv);
-	if (err != 0) {
-		FAIL("Failed to create advertising set (err %d)\n", err);
-
-		return;
-	}
-
-	err = bt_le_ext_adv_set_data(ext_adv, ad, ARRAY_SIZE(ad), NULL, 0);
-	if (err != 0) {
-		FAIL("Failed to set advertising data (err %d)\n", err);
-
-		return;
-	}
-
-	err = bt_le_ext_adv_start(ext_adv, BT_LE_EXT_ADV_START_DEFAULT);
-	if (err != 0) {
-		FAIL("Failed to start advertising set (err %d)\n", err);
-
-		return;
-	}
-}
-
 static void test_common(void)
 {
 	int err;
@@ -1155,6 +1121,7 @@ static void test_sink_encrypted_incorrect_code(void)
 
 static void broadcast_sink_with_assistant(void)
 {
+	struct bt_le_ext_adv *ext_adv;
 	int err;
 
 	err = init();
@@ -1163,7 +1130,7 @@ static void broadcast_sink_with_assistant(void)
 		return;
 	}
 
-	test_start_adv();
+	setup_connectable_adv(&ext_adv);
 	WAIT_FOR_FLAG(flag_connected);
 
 	printk("Waiting for PA sync request\n");
@@ -1211,6 +1178,7 @@ static void broadcast_sink_with_assistant(void)
 
 static void broadcast_sink_with_assistant_incorrect_code(void)
 {
+	struct bt_le_ext_adv *ext_adv;
 	int err;
 
 	err = init();
@@ -1219,7 +1187,7 @@ static void broadcast_sink_with_assistant_incorrect_code(void)
 		return;
 	}
 
-	test_start_adv();
+	setup_connectable_adv(&ext_adv);
 	WAIT_FOR_FLAG(flag_connected);
 
 	printk("Waiting for PA sync request\n");
diff --git a/tests/bsim/bluetooth/audio/src/bap_scan_delegator_test.c b/tests/bsim/bluetooth/audio/src/bap_scan_delegator_test.c
index 267c03809f8..640f2bd58dd 100644
--- a/tests/bsim/bluetooth/audio/src/bap_scan_delegator_test.c
+++ b/tests/bsim/bluetooth/audio/src/bap_scan_delegator_test.c
@@ -692,6 +692,7 @@ static void sync_all_broadcasts(void)
 
 static int common_init(void)
 {
+	struct bt_le_ext_adv *ext_adv;
 	int err;
 
 	err = bt_enable(NULL);
@@ -710,13 +711,7 @@ static int common_init(void)
 
 	bt_le_per_adv_sync_cb_register(&pa_sync_cb);
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, AD_SIZE, NULL, 0);
-	if (err) {
-		FAIL("Advertising failed to start (err %d)\n", err);
-		return err;
-	}
-
-	printk("Advertising successfully started\n");
+	setup_connectable_adv(&ext_adv);
 
 	WAIT_FOR_FLAG(flag_connected);
 
diff --git a/tests/bsim/bluetooth/audio/src/bap_unicast_server_test.c b/tests/bsim/bluetooth/audio/src/bap_unicast_server_test.c
index f8f7205a9b0..406a1ce822c 100644
--- a/tests/bsim/bluetooth/audio/src/bap_unicast_server_test.c
+++ b/tests/bsim/bluetooth/audio/src/bap_unicast_server_test.c
@@ -70,19 +70,6 @@ static struct audio_test_stream
 static const struct bt_bap_qos_cfg_pref qos_pref =
 	BT_BAP_QOS_CFG_PREF(true, BT_GAP_LE_PHY_2M, 0x02, 10, 40000, 40000, 40000, 40000);
 
-static uint8_t unicast_server_addata[] = {
-	BT_UUID_16_ENCODE(BT_UUID_ASCS_VAL),    /* ASCS UUID */
-	BT_AUDIO_UNICAST_ANNOUNCEMENT_TARGETED, /* Target Announcement */
-	BT_BYTES_LIST_LE16(PREF_CONTEXT),
-	BT_BYTES_LIST_LE16(PREF_CONTEXT),
-	0x00, /* Metadata length */
-};
-
-static const struct bt_data unicast_server_ad[] = {
-	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
-	BT_DATA_BYTES(BT_DATA_UUID16_ALL, BT_UUID_16_ENCODE(BT_UUID_ASCS_VAL)),
-	BT_DATA(BT_DATA_SVC_DATA16, unicast_server_addata, ARRAY_SIZE(unicast_server_addata)),
-};
 static struct bt_le_ext_adv *ext_adv;
 
 CREATE_FLAG(flag_stream_configured);
@@ -460,26 +447,7 @@ static void init(void)
 					  &stream_ops);
 	}
 
-	/* Create a connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, NULL, &ext_adv);
-	if (err != 0) {
-		FAIL("Failed to create advertising set (err %d)\n", err);
-		return;
-	}
-
-	err = bt_le_ext_adv_set_data(ext_adv, unicast_server_ad, ARRAY_SIZE(unicast_server_ad),
-				     NULL, 0);
-	if (err != 0) {
-		FAIL("Failed to set advertising data (err %d)\n", err);
-		return;
-	}
-
-	err = bt_le_ext_adv_start(ext_adv, BT_LE_EXT_ADV_START_DEFAULT);
-	if (err != 0) {
-		FAIL("Failed to start advertising set (err %d)\n", err);
-		return;
-	}
-	printk("Advertising started\n");
+	setup_connectable_adv(&ext_adv);
 }
 
 static void test_main(void)
@@ -540,22 +508,7 @@ static void test_main_acl_disconnect(void)
 	 * bt_conn object is properly unref'ed by the stack
 	 */
 	for (size_t i = 0U; i < ARRAY_SIZE(dummy_ext_adv); i++) {
-		const struct bt_le_adv_param param = BT_LE_ADV_PARAM_INIT(
-			(BT_LE_ADV_OPT_EXT_ADV | BT_LE_ADV_OPT_CONN), BT_GAP_ADV_SLOW_INT_MAX,
-			BT_GAP_ADV_SLOW_INT_MAX, NULL);
-		int err;
-
-		err = bt_le_ext_adv_create(&param, NULL, &dummy_ext_adv[i]);
-		if (err != 0) {
-			FAIL("Failed to create advertising set[%zu] (err %d)\n", i, err);
-			return;
-		}
-
-		err = bt_le_ext_adv_start(dummy_ext_adv[i], BT_LE_EXT_ADV_START_DEFAULT);
-		if (err != 0) {
-			FAIL("Failed to start advertising set[%zu] (err %d)\n", i, err);
-			return;
-		}
+		setup_connectable_adv(&dummy_ext_adv[i]);
 	}
 
 	bt_conn_cb_register(&conn_callbacks);
diff --git a/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c b/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c
index f21f83739c9..f33a34b9f3b 100644
--- a/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c
+++ b/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c
@@ -53,11 +53,6 @@
 
 extern enum bst_result_t bst_result;
 
-#define SINK_CONTEXT                                                                               \
-	(BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED | BT_AUDIO_CONTEXT_TYPE_MEDIA |                         \
-	 BT_AUDIO_CONTEXT_TYPE_CONVERSATIONAL)
-#define SOURCE_CONTEXT (BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED | BT_AUDIO_CONTEXT_TYPE_NOTIFICATIONS)
-
 CREATE_FLAG(flag_broadcaster_found);
 CREATE_FLAG(flag_broadcast_code);
 CREATE_FLAG(flag_base_received);
@@ -415,27 +410,6 @@ static struct bt_bap_scan_delegator_cb scan_delegator_cbs = {
 	.broadcast_code = broadcast_code_cb,
 };
 
-/* TODO: Expand with CAP service data */
-static const struct bt_data cap_acceptor_ad[] = {
-	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
-	BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1),
-	BT_DATA_BYTES(BT_DATA_UUID16_SOME, BT_UUID_16_ENCODE(BT_UUID_ASCS_VAL),
-		      BT_UUID_16_ENCODE(BT_UUID_CAS_VAL)),
-	BT_DATA_BYTES(BT_DATA_SVC_DATA16, BT_UUID_16_ENCODE(BT_UUID_CAS_VAL),
-		      BT_AUDIO_UNICAST_ANNOUNCEMENT_TARGETED),
-	IF_ENABLED(CONFIG_BT_BAP_UNICAST_SERVER,
-		   (BT_DATA_BYTES(BT_DATA_SVC_DATA16,
-				  BT_UUID_16_ENCODE(BT_UUID_ASCS_VAL),
-				  BT_AUDIO_UNICAST_ANNOUNCEMENT_TARGETED,
-				  BT_BYTES_LIST_LE16(SINK_CONTEXT),
-				  BT_BYTES_LIST_LE16(SOURCE_CONTEXT),
-				  0x00, /* Metadata length */),
-	))
-	IF_ENABLED(CONFIG_BT_BAP_SCAN_DELEGATOR,
-		   (BT_DATA_BYTES(BT_DATA_SVC_DATA16, BT_UUID_16_ENCODE(BT_UUID_BASS_VAL)),
-	))
-};
-
 static struct bt_csip_set_member_svc_inst *csip_set_member;
 
 static struct bt_bap_stream *unicast_stream_alloc(void)
@@ -636,32 +610,9 @@ static int set_supported_contexts(void)
 
 void test_start_adv(void)
 {
-	int err;
 	struct bt_le_ext_adv *ext_adv;
 
-	/* Create a connectable non-scannable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN_CUSTOM, NULL, &ext_adv);
-	if (err != 0) {
-		FAIL("Failed to create advertising set (err %d)\n", err);
-
-		return;
-	}
-
-	/* Add cap acceptor advertising data */
-	err = bt_le_ext_adv_set_data(ext_adv, cap_acceptor_ad, ARRAY_SIZE(cap_acceptor_ad), NULL,
-				     0);
-	if (err != 0) {
-		FAIL("Failed to set advertising data (err %d)\n", err);
-
-		return;
-	}
-
-	err = bt_le_ext_adv_start(ext_adv, BT_LE_EXT_ADV_START_DEFAULT);
-	if (err != 0) {
-		FAIL("Failed to start advertising set (err %d)\n", err);
-
-		return;
-	}
+	setup_connectable_adv(&ext_adv);
 }
 
 static void set_available_contexts(void)
diff --git a/tests/bsim/bluetooth/audio/src/common.c b/tests/bsim/bluetooth/audio/src/common.c
index 7fcac688a13..085a57700cc 100644
--- a/tests/bsim/bluetooth/audio/src/common.c
+++ b/tests/bsim/bluetooth/audio/src/common.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2019 Bose Corporation
- * Copyright (c) 2020-2021 Nordic Semiconductor ASA
+ * Copyright (c) 2020-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -9,17 +9,24 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <zephyr/autoconf.h>
 #include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/audio/audio.h>
 #include <zephyr/bluetooth/audio/bap.h>
+#include <zephyr/bluetooth/audio/csip.h>
+#include <zephyr/bluetooth/audio/tmap.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/byteorder.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/gap.h>
+#include <zephyr/bluetooth/uuid.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net_buf.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/sys/atomic_types.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
 
 #include "bs_cmd_line.h"
 #include "bs_dynargs.h"
@@ -37,9 +44,37 @@ atomic_t flag_disconnected;
 atomic_t flag_conn_updated;
 atomic_t flag_audio_received;
 volatile bt_security_t security_level;
-
-const struct bt_data ad[AD_SIZE] = {
-	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR))
+#if defined(CONFIG_BT_CSIP_SET_MEMBER)
+uint8_t csip_rsi[BT_CSIP_RSI_SIZE];
+#endif /* CONFIG_BT_CSIP_SET_MEMBER */
+
+static const struct bt_data connectable_ad[] = {
+	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
+	BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1),
+	BT_DATA_BYTES(BT_DATA_UUID16_SOME, BT_UUID_16_ENCODE(BT_UUID_ASCS_VAL),
+		      BT_UUID_16_ENCODE(BT_UUID_CAS_VAL)),
+	BT_DATA_BYTES(BT_DATA_UUID16_ALL, BT_UUID_16_ENCODE(BT_UUID_BASS_VAL),
+		      BT_UUID_16_ENCODE(BT_UUID_PACS_VAL)),
+#if defined(CONFIG_BT_CAP_ACCEPTOR)
+	BT_DATA_BYTES(BT_DATA_SVC_DATA16, BT_UUID_16_ENCODE(BT_UUID_CAS_VAL),
+		      BT_AUDIO_UNICAST_ANNOUNCEMENT_TARGETED),
+#endif /* CONFIG_BT_CAP_ACCEPTOR */
+#if defined(CONFIG_BT_BAP_UNICAST_SERVER)
+	BT_DATA_BYTES(BT_DATA_SVC_DATA16, BT_UUID_16_ENCODE(BT_UUID_ASCS_VAL),
+		      BT_AUDIO_UNICAST_ANNOUNCEMENT_TARGETED, BT_BYTES_LIST_LE16(SINK_CONTEXT),
+		      BT_BYTES_LIST_LE16(SOURCE_CONTEXT), 0x00,
+		      /* Metadata length */),
+#endif /* CONFIG_BT_BAP_UNICAST_SERVER */
+#if defined(CONFIG_BT_BAP_SCAN_DELEGATOR)
+	BT_DATA_BYTES(BT_DATA_SVC_DATA16, BT_UUID_16_ENCODE(BT_UUID_BASS_VAL)),
+#endif /* CONFIG_BT_BAP_SCAN_DELEGATOR */
+#if defined(CONFIG_BT_CSIP_SET_MEMBER)
+	BT_DATA(BT_DATA_CSIS_RSI, csip_rsi, BT_CSIP_RSI_SIZE),
+#endif /* CONFIG_BT_CSIP_SET_MEMBER */
+#if defined(CONFIG_BT_TMAP)
+	BT_DATA_BYTES(BT_DATA_SVC_DATA16, BT_UUID_16_ENCODE(BT_UUID_TMAS_VAL),
+		      BT_UUID_16_ENCODE(TMAP_ROLE_SUPPORTED)),
+#endif /* CONFIG_BT_TMAP */
 };
 
 static void device_found(const struct bt_le_scan_recv_info *info, struct net_buf_simple *ad_buf)
@@ -51,8 +86,9 @@ static void device_found(const struct bt_le_scan_recv_info *info, struct net_buf
 		return;
 	}
 
-	/* We're only interested in connectable events */
-	if ((info->adv_props & BT_GAP_ADV_PROP_CONNECTABLE) == 0) {
+	/* We're only interested in extended advertising connectable events */
+	if (((info->adv_props & BT_GAP_ADV_PROP_EXT_ADV) == 0U ||
+	     (info->adv_props & BT_GAP_ADV_PROP_CONNECTABLE) == 0U)) {
 		return;
 	}
 
@@ -150,6 +186,38 @@ BT_CONN_CB_DEFINE(conn_callbacks) = {
 	.security_changed = security_changed_cb,
 };
 
+void setup_connectable_adv(struct bt_le_ext_adv **ext_adv)
+{
+	int err;
+
+	/* Create a non-connectable advertising set */
+	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, NULL, ext_adv);
+	if (err != 0) {
+		FAIL("Unable to create extended advertising set: %d\n", err);
+		return;
+	}
+
+	err = bt_le_ext_adv_set_data(*ext_adv, connectable_ad, ARRAY_SIZE(connectable_ad), NULL, 0);
+	if (err != 0) {
+		FAIL("Unable to set extended advertising data: %d\n", err);
+
+		bt_le_ext_adv_delete(*ext_adv);
+
+		return;
+	}
+
+	err = bt_le_ext_adv_start(*ext_adv, BT_LE_EXT_ADV_START_DEFAULT);
+	if (err != 0) {
+		FAIL("Failed to start advertising set (err %d)\n", err);
+
+		bt_le_ext_adv_delete(*ext_adv);
+
+		return;
+	}
+
+	printk("Advertising started\n");
+}
+
 void test_tick(bs_time_t HW_device_time)
 {
 	if (bst_result != Passed) {
diff --git a/tests/bsim/bluetooth/audio/src/common.h b/tests/bsim/bluetooth/audio/src/common.h
index 157aa695a84..dff8597ae48 100644
--- a/tests/bsim/bluetooth/audio/src/common.h
+++ b/tests/bsim/bluetooth/audio/src/common.h
@@ -17,6 +17,7 @@
 #include <zephyr/bluetooth/audio/audio.h>
 #include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/audio/cap.h>
+#include <zephyr/bluetooth/audio/csip.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/conn.h>
@@ -26,6 +27,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/sys/atomic_types.h>
 #include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
 #include <zephyr/sys_clock.h>
 #include <zephyr/types.h>
 
@@ -106,23 +108,37 @@ extern enum bst_result_t bst_result;
 		bs_trace_info_time(1, "PASSED: " __VA_ARGS__); \
 	} while (0)
 
-#define AD_SIZE 1
-
 #define PA_SYNC_INTERVAL_TO_TIMEOUT_RATIO 20 /* Set the timeout relative to interval */
 #define PA_SYNC_SKIP         5
 
 #define PBP_STREAMS_TO_SEND 2
 
+#define SINK_CONTEXT                                                                               \
+	(BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED | BT_AUDIO_CONTEXT_TYPE_MEDIA |                         \
+	 BT_AUDIO_CONTEXT_TYPE_CONVERSATIONAL)
+#define SOURCE_CONTEXT                                                                             \
+	(BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED | BT_AUDIO_CONTEXT_TYPE_CONVERSATIONAL |                \
+	 BT_AUDIO_CONTEXT_TYPE_NOTIFICATIONS)
+
+#define TMAP_ROLE_SUPPORTED                                                                        \
+	((IS_ENABLED(CONFIG_BT_TMAP_CG_SUPPORTED) ? BT_TMAP_ROLE_CG : 0U) |                        \
+	 (IS_ENABLED(CONFIG_BT_TMAP_CT_SUPPORTED) ? BT_TMAP_ROLE_CT : 0U) |                        \
+	 (IS_ENABLED(CONFIG_BT_TMAP_UMS_SUPPORTED) ? BT_TMAP_ROLE_UMS : 0U) |                      \
+	 (IS_ENABLED(CONFIG_BT_TMAP_UMR_SUPPORTED) ? BT_TMAP_ROLE_UMR : 0U) |                      \
+	 (IS_ENABLED(CONFIG_BT_TMAP_BMS_SUPPORTED) ? BT_TMAP_ROLE_BMS : 0U) |                      \
+	 (IS_ENABLED(CONFIG_BT_TMAP_BMR_SUPPORTED) ? BT_TMAP_ROLE_BMR : 0U))
+
 extern struct bt_le_scan_cb common_scan_cb;
-extern const struct bt_data ad[AD_SIZE];
 extern struct bt_conn *default_conn;
 extern atomic_t flag_connected;
 extern atomic_t flag_disconnected;
 extern atomic_t flag_conn_updated;
 extern atomic_t flag_audio_received;
 extern volatile bt_security_t security_level;
+extern uint8_t csip_rsi[BT_CSIP_RSI_SIZE];
 
 void disconnected(struct bt_conn *conn, uint8_t reason);
+void setup_connectable_adv(struct bt_le_ext_adv **ext_adv);
 void test_tick(bs_time_t HW_device_time);
 void test_init(void);
 uint16_t get_dev_cnt(void);
diff --git a/tests/bsim/bluetooth/audio/src/csip_notify_server_test.c b/tests/bsim/bluetooth/audio/src/csip_notify_server_test.c
index 0f804ed15c9..f1254e9822d 100644
--- a/tests/bsim/bluetooth/audio/src/csip_notify_server_test.c
+++ b/tests/bsim/bluetooth/audio/src/csip_notify_server_test.c
@@ -52,15 +52,13 @@ static struct bt_csip_set_member_cb csip_cb = {
 static void test_main(void)
 {
 	int err;
-	const struct bt_data ad[] = {
-		BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
-	};
 	struct bt_csip_set_member_register_param csip_params = {
 		.set_size = 1,
 		.rank = 1,
 		.lockable = true,
-		.cb       = &csip_cb,
+		.cb = &csip_cb,
 	};
+	struct bt_le_ext_adv *ext_adv;
 
 	printk("Enabling Bluetooth\n");
 	err = bt_enable(NULL);
@@ -77,12 +75,7 @@ static void test_main(void)
 		return;
 	}
 
-	printk("Start Advertising\n");
-	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
-	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)\n", err);
-		return;
-	}
+	setup_connectable_adv(&ext_adv);
 
 	printk("Waiting to be connected\n");
 	WAIT_FOR_FLAG(flag_connected);
@@ -100,17 +93,11 @@ static void test_main(void)
 		return;
 	}
 
-	/* Now wait for client to disconnect, then stop adv so it does not reconnect */
+	/* Now wait for client to disconnect */
 	printk("Wait for client disconnect\n");
 	WAIT_FOR_UNSET_FLAG(flag_connected);
 	printk("Client disconnected\n");
 
-	err = bt_le_adv_stop();
-	if (err != 0) {
-		FAIL("Advertising failed to stop (err %d)\n", err);
-		return;
-	}
-
 	/* Trigger changes while device is disconnected */
 	err = bt_csip_set_member_lock(svc_inst, false, false);
 	if (err != 0) {
@@ -119,9 +106,12 @@ static void test_main(void)
 	}
 
 	printk("Start Advertising\n");
-	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_ext_adv_start(ext_adv, BT_LE_EXT_ADV_START_DEFAULT);
 	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)\n", err);
+		FAIL("Failed to start advertising set (err %d)\n", err);
+
+		bt_le_ext_adv_delete(ext_adv);
+
 		return;
 	}
 
diff --git a/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c b/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c
index f312fe44b7e..fc07b2e681e 100644
--- a/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c
+++ b/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c
@@ -185,7 +185,8 @@ static bool is_discovered(const bt_addr_le_t *addr)
 
 static bool csip_found(struct bt_data *data, void *user_data)
 {
-	if (bt_csip_set_coordinator_is_set_member(primary_inst->info.sirk, data)) {
+	if (primary_inst == NULL ||
+	    bt_csip_set_coordinator_is_set_member(primary_inst->info.sirk, data)) {
 		const bt_addr_le_t *addr = user_data;
 		char addr_str[BT_ADDR_LE_STR_LEN];
 
@@ -200,7 +201,7 @@ static bool csip_found(struct bt_data *data, void *user_data)
 
 		bt_addr_le_copy(&addr_found[members_found++], addr);
 
-		if (primary_inst->info.set_size == 0) {
+		if (primary_inst == NULL || primary_inst->info.set_size == 0) {
 			printk("Found member %u\n", members_found);
 		} else {
 			printk("Found member (%u / %u)\n", members_found,
@@ -218,16 +219,9 @@ static void csip_set_coordinator_scan_recv(const struct bt_le_scan_recv_info *in
 					   struct net_buf_simple *ad)
 {
 	/* We're only interested in connectable events */
-	if (info->adv_props & BT_GAP_ADV_PROP_CONNECTABLE) {
-		if (primary_inst == NULL) {
-			/* Scanning for the first device */
-			if (members_found == 0) {
-				bt_addr_le_copy(&addr_found[members_found++],
-						info->addr);
-			}
-		} else { /* Scanning for set members */
-			bt_data_parse(ad, csip_found, (void *)info->addr);
-		}
+	if ((info->adv_props & BT_GAP_ADV_PROP_EXT_ADV) != 0U &&
+	    (info->adv_props & BT_GAP_ADV_PROP_CONNECTABLE) != 0U) {
+		bt_data_parse(ad, csip_found, (void *)info->addr);
 	}
 }
 
diff --git a/tests/bsim/bluetooth/audio/src/csip_set_member_test.c b/tests/bsim/bluetooth/audio/src/csip_set_member_test.c
index e144866ab32..e09f96060f4 100644
--- a/tests/bsim/bluetooth/audio/src/csip_set_member_test.c
+++ b/tests/bsim/bluetooth/audio/src/csip_set_member_test.c
@@ -53,11 +53,7 @@ static struct bt_csip_set_member_cb csip_cbs = {
 
 static void bt_ready(int err)
 {
-	uint8_t rsi[BT_CSIP_RSI_SIZE];
-	struct bt_data ad[] = {
-		BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
-		BT_CSIP_DATA_RSI(rsi),
-	};
+	struct bt_le_ext_adv *ext_adv;
 
 	if (err != 0) {
 		FAIL("Bluetooth init failed (err %d)\n", err);
@@ -74,16 +70,13 @@ static void bt_ready(int err)
 		return;
 	}
 
-	err = bt_csip_set_member_generate_rsi(svc_inst, rsi);
+	err = bt_csip_set_member_generate_rsi(svc_inst, csip_rsi);
 	if (err != 0) {
 		FAIL("Failed to generate RSI (err %d)\n", err);
 		return;
 	}
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
-	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)\n", err);
-	}
+	setup_connectable_adv(&ext_adv);
 }
 
 static void test_sirk(void)
diff --git a/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c b/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c
index 6d9b735f834..744930b76d3 100644
--- a/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c
+++ b/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c
@@ -21,6 +21,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/byteorder.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/crypto.h>
 #include <zephyr/bluetooth/gap.h>
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/bluetooth/hci_types.h>
@@ -424,6 +425,49 @@ static const struct bt_gmap_cb gmap_cb = {
 	.discover = gmap_discover_cb,
 };
 
+static void scan_recv_cb(const struct bt_le_scan_recv_info *info, struct net_buf_simple *buf)
+{
+	char addr_str[BT_ADDR_LE_STR_LEN];
+	struct bt_conn *conn;
+	int err;
+
+	/* Check for connectable, extended advertising */
+	if (((info->adv_props & BT_GAP_ADV_PROP_EXT_ADV) == 0) ||
+	    ((info->adv_props & BT_GAP_ADV_PROP_CONNECTABLE)) == 0) {
+		/* We're only interested in connectable extended advertising */
+	}
+
+	conn = bt_conn_lookup_addr_le(BT_ID_DEFAULT, info->addr);
+	if (conn != NULL) {
+		/* Already connected to this device */
+		bt_conn_unref(conn);
+		return;
+	}
+
+	bt_addr_le_to_str(info->addr, addr_str, sizeof(addr_str));
+	printk("Device found: %s (RSSI %d)\n", addr_str, info->rssi);
+
+	/* connect only to devices in close proximity */
+	if (info->rssi < -70) {
+		FAIL("RSSI too low");
+		return;
+	}
+
+	printk("Stopping scan\n");
+	if (bt_le_scan_stop()) {
+		FAIL("Could not stop scan");
+		return;
+	}
+
+	err = bt_conn_le_create(info->addr, BT_CONN_LE_CREATE_CONN,
+				BT_LE_CONN_PARAM(BT_GAP_INIT_CONN_INT_MIN, BT_GAP_INIT_CONN_INT_MIN,
+						 0, BT_GAP_MS_TO_CONN_TIMEOUT(4000)),
+				&connected_conns[connected_conn_cnt]);
+	if (err != 0) {
+		FAIL("Could not connect to peer: %d", err);
+	}
+}
+
 static void init(void)
 {
 	const struct bt_gmap_feat features = {
@@ -431,6 +475,9 @@ static void init(void)
 			     BT_GMAP_UGG_FEAT_MULTISINK),
 	};
 	const enum bt_gmap_role role = BT_GMAP_ROLE_UGG;
+	static struct bt_le_scan_cb scan_cb = {
+		.recv = scan_recv_cb,
+	};
 	int err;
 
 	err = bt_enable(NULL);
@@ -443,6 +490,11 @@ static void init(void)
 	bap_stream_tx_init();
 
 	bt_gatt_cb_register(&gatt_callbacks);
+	err = bt_le_scan_cb_register(&scan_cb);
+	if (err != 0) {
+		FAIL("Failed to register scan callbacks (err %d)\n", err);
+		return;
+	}
 
 	err = bt_bap_unicast_client_register_cb(&unicast_client_cbs);
 	if (err != 0) {
@@ -480,56 +532,13 @@ static void init(void)
 	}
 }
 
-static void gmap_device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
-			      struct net_buf_simple *ad)
-{
-	char addr_str[BT_ADDR_LE_STR_LEN];
-	struct bt_conn *conn;
-	int err;
-
-	/* We're only interested in connectable events */
-	if (type != BT_HCI_ADV_IND && type != BT_HCI_ADV_DIRECT_IND) {
-		return;
-	}
-
-	conn = bt_conn_lookup_addr_le(BT_ID_DEFAULT, addr);
-	if (conn != NULL) {
-		/* Already connected to this device */
-		bt_conn_unref(conn);
-		return;
-	}
-
-	bt_addr_le_to_str(addr, addr_str, sizeof(addr_str));
-	printk("Device found: %s (RSSI %d)\n", addr_str, rssi);
-
-	/* connect only to devices in close proximity */
-	if (rssi < -70) {
-		FAIL("RSSI too low");
-		return;
-	}
-
-	printk("Stopping scan\n");
-	if (bt_le_scan_stop()) {
-		FAIL("Could not stop scan");
-		return;
-	}
-
-	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN,
-				BT_LE_CONN_PARAM(BT_GAP_INIT_CONN_INT_MIN, BT_GAP_INIT_CONN_INT_MIN,
-						 0, BT_GAP_MS_TO_CONN_TIMEOUT(4000)),
-				&connected_conns[connected_conn_cnt]);
-	if (err) {
-		FAIL("Could not connect to peer: %d", err);
-	}
-}
-
 static void scan_and_connect(void)
 {
 	int err;
 
 	UNSET_FLAG(flag_connected);
 
-	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, gmap_device_found);
+	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, NULL);
 	if (err != 0) {
 		FAIL("Scanning failed to start (err %d)\n", err);
 		return;
diff --git a/tests/bsim/bluetooth/audio/src/gmap_ugt_test.c b/tests/bsim/bluetooth/audio/src/gmap_ugt_test.c
index d5ba537596f..d8c259199ca 100644
--- a/tests/bsim/bluetooth/audio/src/gmap_ugt_test.c
+++ b/tests/bsim/bluetooth/audio/src/gmap_ugt_test.c
@@ -88,12 +88,6 @@ static struct bt_bap_stream_ops unicast_stream_ops = {
 	.started = unicast_stream_started_cb,
 };
 
-/* TODO: Expand with GMAP service data */
-static const struct bt_data gmap_acceptor_ad[] = {
-	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
-	BT_DATA_BYTES(BT_DATA_UUID16_ALL, BT_UUID_16_ENCODE(BT_UUID_CAS_VAL)),
-};
-
 static struct bt_csip_set_member_svc_inst *csip_set_member;
 
 static struct bt_bap_stream *unicast_stream_alloc(void)
@@ -368,6 +362,7 @@ static void test_main(void)
 	static struct bt_pacs_cap unicast_cap = {
 		.codec_cap = &codec_cap,
 	};
+	struct bt_le_ext_adv *ext_adv;
 	int err;
 
 	err = bt_enable(NULL);
@@ -445,12 +440,7 @@ static void test_main(void)
 		return;
 	}
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, gmap_acceptor_ad, ARRAY_SIZE(gmap_acceptor_ad),
-			      NULL, 0);
-	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)\n", err);
-		return;
-	}
+	setup_connectable_adv(&ext_adv);
 
 	WAIT_FOR_FLAG(flag_connected);
 
diff --git a/tests/bsim/bluetooth/audio/src/has_test.c b/tests/bsim/bluetooth/audio/src/has_test.c
index ca74bb5d345..83a73367369 100644
--- a/tests/bsim/bluetooth/audio/src/has_test.c
+++ b/tests/bsim/bluetooth/audio/src/has_test.c
@@ -41,15 +41,9 @@ static const struct bt_has_preset_ops preset_ops = {
 
 static void start_adv(void)
 {
-	int err;
-
-	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, AD_SIZE, NULL, 0);
-	if (err) {
-		FAIL("Advertising failed to start (err %d)\n", err);
-		return;
-	}
+	struct bt_le_ext_adv *ext_adv;
 
-	LOG_DBG("Advertising successfully started");
+	setup_connectable_adv(&ext_adv);
 }
 
 static void test_common(void)
diff --git a/tests/bsim/bluetooth/audio/src/ias_test.c b/tests/bsim/bluetooth/audio/src/ias_test.c
index b7c93af20d4..a951a5f57f3 100644
--- a/tests/bsim/bluetooth/audio/src/ias_test.c
+++ b/tests/bsim/bluetooth/audio/src/ias_test.c
@@ -50,6 +50,7 @@ BT_IAS_CB_DEFINE(ias_callbacks) = {
 
 static void test_main(void)
 {
+	struct bt_le_ext_adv *ext_adv;
 	int err;
 
 	err = bt_enable(NULL);
@@ -58,13 +59,7 @@ static void test_main(void)
 		return;
 	}
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, AD_SIZE, NULL, 0);
-	if (err) {
-		FAIL("Advertising failed to start (err %d)\n", err);
-		return;
-	}
-
-	printk("Advertising successfully started\n");
+	setup_connectable_adv(&ext_adv);
 
 	WAIT_FOR_FLAG(flag_connected);
 
diff --git a/tests/bsim/bluetooth/audio/src/mcs_test.c b/tests/bsim/bluetooth/audio/src/mcs_test.c
index c049bc911d7..d87d0560f60 100644
--- a/tests/bsim/bluetooth/audio/src/mcs_test.c
+++ b/tests/bsim/bluetooth/audio/src/mcs_test.c
@@ -16,21 +16,9 @@
 #ifdef CONFIG_BT_MCS
 extern enum bst_result_t bst_result;
 
-static void start_adv(void)
-{
-	int err;
-
-	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, AD_SIZE, NULL, 0);
-	if (err) {
-		FAIL("Advertising failed to start (err %d)\n", err);
-		return;
-	}
-
-	printk("Advertising successfully started\n");
-}
-
 static void test_main(void)
 {
+	struct bt_le_ext_adv *ext_adv;
 	int err;
 
 	printk("Media Control Server test application.  Board: %s\n", CONFIG_BOARD);
@@ -50,12 +38,22 @@ static void test_main(void)
 	}
 	printk("Bluetooth initialized\n");
 
+	setup_connectable_adv(&ext_adv);
+
 	PASS("MCS passed\n");
 
 	while (1) {
-		start_adv();
 		WAIT_FOR_FLAG(flag_connected);
 		WAIT_FOR_UNSET_FLAG(flag_connected);
+
+		err = bt_le_ext_adv_start(ext_adv, BT_LE_EXT_ADV_START_DEFAULT);
+		if (err != 0) {
+			FAIL("Failed to start advertising set (err %d)\n", err);
+
+			bt_le_ext_adv_delete(ext_adv);
+
+			return;
+		}
 	}
 }
 
diff --git a/tests/bsim/bluetooth/audio/src/media_controller_test.c b/tests/bsim/bluetooth/audio/src/media_controller_test.c
index 34faffc0dbb..5a307de3789 100644
--- a/tests/bsim/bluetooth/audio/src/media_controller_test.c
+++ b/tests/bsim/bluetooth/audio/src/media_controller_test.c
@@ -1649,16 +1649,14 @@ void test_media_controller_local_player(void)
 /* BabbleSim entry point for remote player test */
 void test_media_controller_remote_player(void)
 {
-	int err;
+	struct bt_le_ext_adv *ext_adv;
+
 	printk("Media Control remote player test application.  Board: %s\n", CONFIG_BOARD);
 
 	initialize_bluetooth();
 	initialize_media();
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, AD_SIZE, NULL, 0);
-	if (err) {
-		FAIL("Advertising failed to start (err %d)\n", err);
-	}
+	setup_connectable_adv(&ext_adv);
 
 	WAIT_FOR_FLAG(flag_connected);
 
diff --git a/tests/bsim/bluetooth/audio/src/micp_mic_dev_test.c b/tests/bsim/bluetooth/audio/src/micp_mic_dev_test.c
index bc8c820b702..b6281b7f6a6 100644
--- a/tests/bsim/bluetooth/audio/src/micp_mic_dev_test.c
+++ b/tests/bsim/bluetooth/audio/src/micp_mic_dev_test.c
@@ -385,6 +385,7 @@ static void test_main(void)
 {
 	int err;
 	struct bt_micp_mic_dev_register_param micp_param;
+	struct bt_le_ext_adv *ext_adv;
 
 	err = bt_enable(NULL);
 	if (err != 0) {
@@ -431,14 +432,7 @@ static void test_main(void)
 	}
 
 	printk("MICP initialized\n");
-
-	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, AD_SIZE, NULL, 0);
-	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)\n", err);
-		return;
-	}
-
-	printk("Advertising successfully started\n");
+	setup_connectable_adv(&ext_adv);
 
 	WAIT_FOR_FLAG(flag_connected);
 
diff --git a/tests/bsim/bluetooth/audio/src/pacs_notify_server_test.c b/tests/bsim/bluetooth/audio/src/pacs_notify_server_test.c
index cbd4fc75111..a9ebce0e73d 100644
--- a/tests/bsim/bluetooth/audio/src/pacs_notify_server_test.c
+++ b/tests/bsim/bluetooth/audio/src/pacs_notify_server_test.c
@@ -158,9 +158,7 @@ static void test_main(void)
 {
 	int err;
 	enum bt_audio_context available, available_for_conn;
-	const struct bt_data ad[] = {
-		BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
-	};
+	struct bt_le_ext_adv *ext_adv;
 
 	LOG_DBG("Enabling Bluetooth");
 	err = bt_enable(NULL);
@@ -191,11 +189,7 @@ static void test_main(void)
 	}
 
 	LOG_DBG("Start Advertising");
-	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
-	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)", err);
-		return;
-	}
+	setup_connectable_adv(&ext_adv);
 
 	LOG_DBG("Waiting to be connected");
 	WAIT_FOR_FLAG(flag_connected);
@@ -210,24 +204,21 @@ static void test_main(void)
 	LOG_INF("Trigger changes while device is connected");
 	trigger_notifications();
 
-	/* Now wait for client to disconnect, then stop adv so it does not reconnect */
+	/* Now wait for client to disconnect */
 	LOG_DBG("Wait for client disconnect");
 	WAIT_FOR_UNSET_FLAG(flag_connected);
 	LOG_DBG("Client disconnected");
 
-	err = bt_le_adv_stop();
-	if (err != 0) {
-		FAIL("Advertising failed to stop (err %d)", err);
-		return;
-	}
-
 	LOG_INF("Trigger changes while device is disconnected");
 	trigger_notifications();
 
 	LOG_DBG("Start Advertising");
-	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_ext_adv_start(ext_adv, BT_LE_EXT_ADV_START_DEFAULT);
 	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)", err);
+		FAIL("Failed to start advertising set (err %d)\n", err);
+
+		bt_le_ext_adv_delete(ext_adv);
+
 		return;
 	}
 
@@ -235,16 +226,13 @@ static void test_main(void)
 	WAIT_FOR_UNSET_FLAG(flag_connected);
 	LOG_DBG("Client disconnected");
 
-	err = bt_le_adv_stop();
-	if (err != 0) {
-		FAIL("Advertising failed to stop (err %d)", err);
-		return;
-	}
-
 	LOG_DBG("Start Advertising");
-	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_ext_adv_start(ext_adv, BT_LE_EXT_ADV_START_DEFAULT);
 	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)", err);
+		FAIL("Failed to start advertising set (err %d)\n", err);
+
+		bt_le_ext_adv_delete(ext_adv);
+
 		return;
 	}
 
@@ -269,16 +257,13 @@ static void test_main(void)
 	WAIT_FOR_UNSET_FLAG(flag_connected);
 	LOG_DBG("Client disconnected");
 
-	err = bt_le_adv_stop();
-	if (err != 0) {
-		FAIL("Advertising failed to stop (err %d)", err);
-		return;
-	}
-
 	LOG_DBG("Start Advertising");
-	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_ext_adv_start(ext_adv, BT_LE_EXT_ADV_START_DEFAULT);
 	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)", err);
+		FAIL("Failed to start advertising set (err %d)\n", err);
+
+		bt_le_ext_adv_delete(ext_adv);
+
 		return;
 	}
 
diff --git a/tests/bsim/bluetooth/audio/src/tbs_client_test.c b/tests/bsim/bluetooth/audio/src/tbs_client_test.c
index 6c1c91b42e3..d0bfd06d7ad 100644
--- a/tests/bsim/bluetooth/audio/src/tbs_client_test.c
+++ b/tests/bsim/bluetooth/audio/src/tbs_client_test.c
@@ -481,6 +481,7 @@ static void discover_tbs(void)
 
 static void test_main(void)
 {
+	struct bt_le_ext_adv *ext_adv;
 	int err;
 	int index = 0;
 
@@ -503,11 +504,7 @@ static void test_main(void)
 
 	printk("Audio Server: Bluetooth discovered\n");
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, AD_SIZE, NULL, 0);
-	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)\n", err);
-		return;
-	}
+	setup_connectable_adv(&ext_adv);
 
 	printk("Advertising successfully started\n");
 
diff --git a/tests/bsim/bluetooth/audio/src/tmap_client_test.c b/tests/bsim/bluetooth/audio/src/tmap_client_test.c
index ba5bbb02ee8..69abd58f239 100644
--- a/tests/bsim/bluetooth/audio/src/tmap_client_test.c
+++ b/tests/bsim/bluetooth/audio/src/tmap_client_test.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2023 NXP
+ * Copyright (c) 2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/tests/bsim/bluetooth/audio/src/tmap_server_test.c b/tests/bsim/bluetooth/audio/src/tmap_server_test.c
index 57d5d3ab274..61e3405748f 100644
--- a/tests/bsim/bluetooth/audio/src/tmap_server_test.c
+++ b/tests/bsim/bluetooth/audio/src/tmap_server_test.c
@@ -24,21 +24,10 @@
 #ifdef CONFIG_BT_TMAP
 extern enum bst_result_t bst_result;
 
-static uint8_t tmap_addata[] = {
-	BT_UUID_16_ENCODE(BT_UUID_TMAS_VAL), /* TMAS UUID */
-	(BT_TMAP_ROLE_UMR | BT_TMAP_ROLE_CT), 0x00, /* TMAP Role  */
-};
-
-static const struct bt_data ad_tmas[] = {
-	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
-	BT_DATA_BYTES(BT_DATA_GAP_APPEARANCE, 0x09, 0x41), /* Appearance - Earbud  */
-	BT_DATA(BT_DATA_SVC_DATA16, tmap_addata, ARRAY_SIZE(tmap_addata)),
-};
-
 static void test_main(void)
 {
 	int err;
-	struct bt_le_ext_adv *adv;
+	struct bt_le_ext_adv *ext_adv;
 
 	err = bt_enable(NULL);
 	if (err != 0) {
@@ -48,31 +37,13 @@ static void test_main(void)
 
 	printk("Bluetooth initialized\n");
 	/* Initialize TMAP */
-	err = bt_tmap_register(BT_TMAP_ROLE_CT | BT_TMAP_ROLE_UMR);
+	err = bt_tmap_register(TMAP_ROLE_SUPPORTED);
 	if (err != 0) {
 		return;
 	}
 	printk("TMAP initialized. Start advertising...\n");
-	/* Create a connectable extended advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, NULL, &adv);
-	if (err) {
-		printk("Failed to create advertising set (err %d)\n", err);
-		return;
-	}
-
-	err = bt_le_ext_adv_set_data(adv, ad_tmas, ARRAY_SIZE(ad_tmas), NULL, 0);
-	if (err) {
-		printk("Failed to set advertising data (err %d)\n", err);
-		return;
-	}
-
-	err = bt_le_ext_adv_start(adv, BT_LE_EXT_ADV_START_DEFAULT);
-	if (err) {
-		printk("Failed to start advertising set (err %d)\n", err);
-		return;
-	}
+	setup_connectable_adv(&ext_adv);
 
-	printk("Advertising successfully started\n");
 	WAIT_FOR_FLAG(flag_connected);
 	printk("Connected!\n");
 
diff --git a/tests/bsim/bluetooth/audio/src/vcp_vol_rend_test.c b/tests/bsim/bluetooth/audio/src/vcp_vol_rend_test.c
index 59575f37144..dbadaba57a0 100644
--- a/tests/bsim/bluetooth/audio/src/vcp_vol_rend_test.c
+++ b/tests/bsim/bluetooth/audio/src/vcp_vol_rend_test.c
@@ -1029,6 +1029,7 @@ static void test_standalone(void)
 
 static void test_main(void)
 {
+	struct bt_le_ext_adv *ext_adv;
 	int err;
 
 	err = bt_enable(NULL);
@@ -1044,13 +1045,7 @@ static void test_main(void)
 
 	printk("VCP initialized\n");
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, AD_SIZE, NULL, 0);
-	if (err != 0) {
-		FAIL("Advertising failed to start (err %d)\n", err);
-		return;
-	}
-
-	printk("Advertising successfully started\n");
+	setup_connectable_adv(&ext_adv);
 
 	WAIT_FOR_FLAG(flag_connected);
 

From 787933fc93582685eb1a3b94082d9ab8787b5007 Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Thu, 7 Nov 2024 18:43:13 +0100
Subject: [PATCH 2704/2913] [nrf fromtree] Bluetooth: BAP: Add a set of
 suggested intervals to use with BAP

Add a selection of interval values that are suitable for BAP,
which will allow better coexistence between ISO and ACL,
for both broadcast and unicast. Some of these are defined
by the BAP spec, and some are defined by Zephyr, since they
do have a suggested value from BAP.

Samples and tests have been updated to use these new values.
Peripheral samples have also been updated with
CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS so that the connection
parameters from the centrals aren't updated to something else
shortly after.

The shell has also been updated to use the LE Audio (BAP) values
if audio is enabled, and the audio.conf file has disabled automatic
updating of the connection parameters as the peripheral, as we rarely
(if ever) want to do that.

Due to the connection interval change, CI hit an issue
with test_bass_broadcast_code in test_main_client_sync, where
the reading of the long receive state did not finish before we
attempted to do another procedure, so the function was updated to have
a retry.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit 9d4cc4b49b96edf82269c5c7f15448c24190d06c)
---
 doc/releases/release-notes-4.2.rst            | 12 +++
 include/zephyr/bluetooth/audio/bap.h          | 95 +++++++++++++++++++
 .../bap_broadcast_assistant/src/main.c        |  3 +-
 samples/bluetooth/bap_broadcast_sink/prj.conf |  6 ++
 .../bluetooth/bap_broadcast_sink/src/main.c   |  2 +-
 .../bluetooth/bap_broadcast_source/src/main.c | 18 +---
 .../bluetooth/bap_unicast_client/src/main.c   |  3 +-
 samples/bluetooth/bap_unicast_server/prj.conf |  6 ++
 .../bluetooth/bap_unicast_server/src/main.c   |  2 +-
 samples/bluetooth/cap_acceptor/prj.conf       |  6 ++
 samples/bluetooth/cap_acceptor/src/main.c     |  3 +-
 .../src/cap_initiator_broadcast.c             |  6 +-
 .../cap_initiator/src/cap_initiator_unicast.c |  3 +-
 samples/bluetooth/hap_ha/prj.conf             |  6 ++
 samples/bluetooth/hap_ha/src/main.c           |  2 +-
 .../pbp_public_broadcast_source/src/main.c    |  4 +-
 .../bluetooth/tmap_bms/src/cap_initiator.c    |  4 +-
 samples/bluetooth/tmap_central/src/main.c     |  3 +-
 samples/bluetooth/tmap_peripheral/prj.conf    |  6 ++
 samples/bluetooth/tmap_peripheral/src/main.c  |  2 +-
 subsys/bluetooth/host/shell/bt.c              | 12 ++-
 tests/bluetooth/shell/audio.conf              |  8 +-
 tests/bluetooth/tester/overlay-le-audio.conf  |  6 ++
 .../tester/src/audio/btp_bap_broadcast.c      | 22 ++---
 tests/bluetooth/tester/src/btp_gap.c          | 21 ++--
 tests/bsim/bluetooth/audio/prj.conf           |  5 +
 .../audio/src/bap_bass_broadcaster_test.c     | 18 +---
 .../audio/src/bap_broadcast_assistant_test.c  | 37 +++++---
 .../audio/src/bap_broadcast_source_test.c     | 20 +---
 tests/bsim/bluetooth/audio/src/bap_common.h   |  4 +
 .../audio/src/bap_unicast_client_test.c       | 20 ++--
 .../bluetooth/audio/src/cap_acceptor_test.c   | 11 ---
 .../bluetooth/audio/src/cap_commander_test.c  |  4 +-
 .../audio/src/cap_initiator_broadcast_test.c  | 36 +------
 .../audio/src/cap_initiator_unicast_test.c    |  4 +-
 tests/bsim/bluetooth/audio/src/common.c       | 33 ++++++-
 tests/bsim/bluetooth/audio/src/common.h       |  1 +
 .../audio/src/csip_set_coordinator_test.c     |  5 +-
 .../bsim/bluetooth/audio/src/gmap_ugg_test.c  | 33 +------
 .../src/pbp_public_broadcast_source_test.c    | 29 +-----
 .../bluetooth/audio/src/tmap_client_test.c    |  4 +-
 .../bluetooth/audio/src/tmap_server_test.c    |  1 +
 .../bap_broadcast_audio_assistant.sh          |  2 +-
 .../src/unicast_client_sample_test.c          |  2 +-
 44 files changed, 297 insertions(+), 233 deletions(-)

diff --git a/doc/releases/release-notes-4.2.rst b/doc/releases/release-notes-4.2.rst
index c43e03d1af7..c4c73c07da3 100644
--- a/doc/releases/release-notes-4.2.rst
+++ b/doc/releases/release-notes-4.2.rst
@@ -65,6 +65,18 @@ New APIs and options
 
 * Bluetooth
 
+  * Audio
+
+    * :c:macro:`BT_BAP_ADV_PARAM_CONN_QUICK`
+    * :c:macro:`BT_BAP_ADV_PARAM_CONN_REDUCED`
+    * :c:macro:`BT_BAP_CONN_PARAM_SHORT_7_5`
+    * :c:macro:`BT_BAP_CONN_PARAM_SHORT_10`
+    * :c:macro:`BT_BAP_CONN_PARAM_RELAXED`
+    * :c:macro:`BT_BAP_ADV_PARAM_BROADCAST_FAST`
+    * :c:macro:`BT_BAP_ADV_PARAM_BROADCAST_SLOW`
+    * :c:macro:`BT_BAP_PER_ADV_PARAM_BROADCAST_FAST`
+    * :c:macro:`BT_BAP_PER_ADV_PARAM_BROADCAST_SLOW`
+
   * Host
 
     * :c:func:`bt_le_get_local_features`
diff --git a/include/zephyr/bluetooth/audio/bap.h b/include/zephyr/bluetooth/audio/bap.h
index 17e53ca6c14..0c530f93bd8 100644
--- a/include/zephyr/bluetooth/audio/bap.h
+++ b/include/zephyr/bluetooth/audio/bap.h
@@ -32,6 +32,7 @@
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gap.h>
 #include <zephyr/bluetooth/iso.h>
 #include <zephyr/net_buf.h>
 #include <zephyr/sys/slist.h>
@@ -50,6 +51,100 @@ extern "C" {
 /** An invalid Broadcast ID */
 #define BT_BAP_INVALID_BROADCAST_ID 0xFFFFFFFFU
 
+/**
+ * @brief Recommended connectable advertising parameters
+ *
+ * If connection has not been established after 30 seconds, the device should switch to
+ * @ref BT_BAP_ADV_PARAM_CONN_REDUCED
+ *
+ * Defined by Table 8.1 in BAP 1.0.2
+ */
+#define BT_BAP_ADV_PARAM_CONN_QUICK                                                                \
+	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONN | BT_LE_ADV_OPT_EXT_ADV, BT_GAP_MS_TO_ADV_INTERVAL(20), \
+			BT_GAP_MS_TO_ADV_INTERVAL(30), NULL)
+
+/**
+ * @brief Reduced connectable advertising parameters
+ *
+ * Defined by Table 8.1 in BAP 1.0.2
+ */
+#define BT_BAP_ADV_PARAM_CONN_REDUCED                                                              \
+	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONN | BT_LE_ADV_OPT_EXT_ADV,                                \
+			BT_GAP_MS_TO_ADV_INTERVAL(150), BT_GAP_MS_TO_ADV_INTERVAL(150), NULL)
+
+/**
+ * @brief Recommended connection parameters for initial connection request for 7.5 ms SDU interval
+ *
+ * Once service discovery has completed and a stream is setup, it is recommended to switch to
+ * @ref BT_BAP_CONN_PARAM_RELAXED
+ *
+ * Defined by Table 8.3 in BAP 1.0.2
+ */
+#define BT_BAP_CONN_PARAM_SHORT_7_5                                                                \
+	BT_LE_CONN_PARAM(BT_GAP_US_TO_CONN_INTERVAL(7500), BT_GAP_MS_TO_CONN_INTERVAL(30), 0,      \
+			 BT_GAP_MS_TO_CONN_TIMEOUT(4000))
+
+/**
+ * @brief Recommended connection parameters for initial connection request for 10 ms SDU interval
+ *
+ * Once service discovery has completed and a stream is setup, it is recommended to switch to
+ * @ref BT_BAP_CONN_PARAM_RELAXED
+ *
+ * Defined by Table 8.3 in BAP 1.0.2
+ */
+#define BT_BAP_CONN_PARAM_SHORT_10                                                                 \
+	BT_LE_CONN_PARAM(BT_GAP_MS_TO_CONN_INTERVAL(10), BT_GAP_MS_TO_CONN_INTERVAL(30), 0,        \
+			 BT_GAP_MS_TO_CONN_TIMEOUT(4000))
+
+/**
+ * @brief Recommended connection parameters for coexistence of ACL and ISO
+ *
+ * Defined by Table 8.3 in BAP 1.0.2
+ */
+#define BT_BAP_CONN_PARAM_RELAXED                                                                  \
+	BT_LE_CONN_PARAM(BT_GAP_MS_TO_CONN_INTERVAL(50), BT_GAP_MS_TO_CONN_INTERVAL(70), 0,        \
+			 BT_GAP_MS_TO_CONN_TIMEOUT(4000))
+
+/**
+ * @brief Fast advertising parameters for broadcast audio
+ *
+ * This is suitable for both 7.5 ms and 10 ms SDU intervals, but prioritizes lower time to
+ * synchronize over coexistence with ISO and power consumption.
+ */
+#define BT_BAP_ADV_PARAM_BROADCAST_FAST                                                            \
+	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV, BT_GAP_MS_TO_ADV_INTERVAL(60),                      \
+			BT_GAP_MS_TO_ADV_INTERVAL(60), NULL)
+
+/**
+ * @brief Slow advertising parameters for broadcast audio
+ *
+ * This is suitable for both 7.5 ms and 10 ms SDU intervals, but prioritizes coexistence with ISO
+ * and power consumption over lower time to synchronize.
+ */
+#define BT_BAP_ADV_PARAM_BROADCAST_SLOW                                                            \
+	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV, BT_GAP_MS_TO_ADV_INTERVAL(150),                     \
+			BT_GAP_MS_TO_ADV_INTERVAL(150), NULL)
+
+/**
+ * @brief Fast advertising parameters for broadcast audio
+ *
+ * This is suitable for both 7.5 ms and 10 ms SDU intervals, but prioritizes lower time to
+ * synchronize over coexistence with ISO and power consumption.
+ */
+#define BT_BAP_PER_ADV_PARAM_BROADCAST_FAST                                                        \
+	BT_LE_PER_ADV_PARAM(BT_GAP_MS_TO_PER_ADV_INTERVAL(60), BT_GAP_MS_TO_PER_ADV_INTERVAL(60),  \
+			    BT_LE_PER_ADV_OPT_NONE)
+
+/**
+ * @brief Slow advertising parameters for broadcast audio
+ *
+ * This is suitable for both 7.5 ms and 10 ms SDU intervals, but prioritizes coexistence with ISO
+ * and power consumption over lower time to synchronize.
+ */
+#define BT_BAP_PER_ADV_PARAM_BROADCAST_SLOW                                                        \
+	BT_LE_PER_ADV_PARAM(BT_GAP_MS_TO_PER_ADV_INTERVAL(150),                                    \
+			    BT_GAP_MS_TO_PER_ADV_INTERVAL(150), BT_LE_PER_ADV_OPT_NONE)
+
 /**
  * @brief Check if a BAP BASS BIS_Sync bitfield is valid
  *
diff --git a/samples/bluetooth/bap_broadcast_assistant/src/main.c b/samples/bluetooth/bap_broadcast_assistant/src/main.c
index 49b630d1dbb..a0471f2ee6f 100644
--- a/samples/bluetooth/bap_broadcast_assistant/src/main.c
+++ b/samples/bluetooth/bap_broadcast_assistant/src/main.c
@@ -383,8 +383,7 @@ static void scan_recv_cb(const struct bt_le_scan_recv_info *info,
 			printk("Connecting to Broadcast Sink: %s\n", sr_info.bt_name);
 
 			err = bt_conn_le_create(info->addr, BT_CONN_LE_CREATE_CONN,
-						BT_LE_CONN_PARAM_DEFAULT,
-						&broadcast_sink_conn);
+						BT_BAP_CONN_PARAM_RELAXED, &broadcast_sink_conn);
 			if (err != 0) {
 				printk("Failed creating connection (err=%u)\n", err);
 				scan_for_broadcast_sink();
diff --git a/samples/bluetooth/bap_broadcast_sink/prj.conf b/samples/bluetooth/bap_broadcast_sink/prj.conf
index 69c57526703..def80a0c1ba 100644
--- a/samples/bluetooth/bap_broadcast_sink/prj.conf
+++ b/samples/bluetooth/bap_broadcast_sink/prj.conf
@@ -4,6 +4,12 @@ CONFIG_BT_AUDIO=y
 CONFIG_BT_SMP=y
 CONFIG_BT_PAC_SNK=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
+# Set preferred values based on BT_BAP_CONN_PARAM_RELAXED
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=50
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=70
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_EXT_ADV=y
diff --git a/samples/bluetooth/bap_broadcast_sink/src/main.c b/samples/bluetooth/bap_broadcast_sink/src/main.c
index 902670aaee5..c10c9329447 100644
--- a/samples/bluetooth/bap_broadcast_sink/src/main.c
+++ b/samples/bluetooth/bap_broadcast_sink/src/main.c
@@ -1395,7 +1395,7 @@ static int start_adv(void)
 	int err;
 
 	/* Create a connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, NULL, &ext_adv);
+	err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_CONN_REDUCED, NULL, &ext_adv);
 	if (err != 0) {
 		printk("Failed to create advertising set (err %d)\n", err);
 
diff --git a/samples/bluetooth/bap_broadcast_source/src/main.c b/samples/bluetooth/bap_broadcast_source/src/main.c
index 0df0773cbf8..9448f91e330 100644
--- a/samples/bluetooth/bap_broadcast_source/src/main.c
+++ b/samples/bluetooth/bap_broadcast_source/src/main.c
@@ -29,20 +29,6 @@
 
 BUILD_ASSERT(strlen(CONFIG_BROADCAST_CODE) <= BT_ISO_BROADCAST_CODE_SIZE, "Invalid broadcast code");
 
-/* Zephyr Controller works best while Extended Advertising interval to be a multiple
- * of the ISO Interval minus 10 ms (max. advertising random delay). This is
- * required to place the AUX_ADV_IND PDUs in a non-overlapping interval with the
- * Broadcast ISO radio events.
- *
- * I.e. for a 7.5 ms ISO interval use 90 ms minus 10 ms ==> 80 ms advertising
- * interval.
- * And, for 10 ms ISO interval, can use 90 ms minus 10 ms ==> 80 ms advertising
- * interval.
- */
-#define BT_LE_EXT_ADV_CUSTOM                                                                       \
-	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV, BT_GAP_MS_TO_ADV_INTERVAL(80),                      \
-			BT_GAP_MS_TO_ADV_INTERVAL(80), NULL)
-
 /* When BROADCAST_ENQUEUE_COUNT > 1 we can enqueue enough buffers to ensure that
  * the controller is never idle
  */
@@ -517,14 +503,14 @@ int main(void)
 		uint32_t broadcast_id;
 
 		/* Create a connectable advertising set */
-		err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CUSTOM, NULL, &adv);
+		err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_BROADCAST_FAST, NULL, &adv);
 		if (err != 0) {
 			printk("Unable to create extended advertising set: %d\n", err);
 			return 0;
 		}
 
 		/* Set periodic advertising parameters */
-		err = bt_le_per_adv_set_param(adv, BT_LE_PER_ADV_DEFAULT);
+		err = bt_le_per_adv_set_param(adv, BT_BAP_PER_ADV_PARAM_BROADCAST_FAST);
 		if (err) {
 			printk("Failed to set periodic advertising parameters (err %d)\n", err);
 			return 0;
diff --git a/samples/bluetooth/bap_unicast_client/src/main.c b/samples/bluetooth/bap_unicast_client/src/main.c
index 082b9fe7d52..fdc0ed249ff 100644
--- a/samples/bluetooth/bap_unicast_client/src/main.c
+++ b/samples/bluetooth/bap_unicast_client/src/main.c
@@ -162,8 +162,7 @@ static bool check_audio_support_and_connect(struct bt_data *data,
 	printk("Audio server found with type %u, contexts 0x%08x and meta_len %u; connecting\n",
 	       announcement_type, audio_contexts, meta_len);
 
-	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN,
-				BT_LE_CONN_PARAM_DEFAULT,
+	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_BAP_CONN_PARAM_RELAXED,
 				&default_conn);
 	if (err != 0) {
 		printk("Create conn to failed (%u)\n", err);
diff --git a/samples/bluetooth/bap_unicast_server/prj.conf b/samples/bluetooth/bap_unicast_server/prj.conf
index a102747bf04..103858af574 100644
--- a/samples/bluetooth/bap_unicast_server/prj.conf
+++ b/samples/bluetooth/bap_unicast_server/prj.conf
@@ -2,6 +2,12 @@ CONFIG_BT=y
 CONFIG_LOG=y
 CONFIG_BT_SMP=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
+# Set preferred values based on BT_BAP_CONN_PARAM_RELAXED
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=50
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=70
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 CONFIG_BT_ISO_PERIPHERAL=y
 CONFIG_BT_AUDIO=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
diff --git a/samples/bluetooth/bap_unicast_server/src/main.c b/samples/bluetooth/bap_unicast_server/src/main.c
index af31df408a1..c3e310b35d8 100644
--- a/samples/bluetooth/bap_unicast_server/src/main.c
+++ b/samples/bluetooth/bap_unicast_server/src/main.c
@@ -765,7 +765,7 @@ int main(void)
 	}
 
 	/* Create a connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, NULL, &adv);
+	err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_CONN_QUICK, NULL, &adv);
 	if (err) {
 		printk("Failed to create advertising set (err %d)\n", err);
 		return 0;
diff --git a/samples/bluetooth/cap_acceptor/prj.conf b/samples/bluetooth/cap_acceptor/prj.conf
index 816ed1dcc9a..b2f6b49d671 100644
--- a/samples/bluetooth/cap_acceptor/prj.conf
+++ b/samples/bluetooth/cap_acceptor/prj.conf
@@ -1,6 +1,12 @@
 CONFIG_BT=y
 CONFIG_LOG=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
+# Set preferred values based on BT_BAP_CONN_PARAM_RELAXED
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=50
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=70
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_EXT_ADV=y
diff --git a/samples/bluetooth/cap_acceptor/src/main.c b/samples/bluetooth/cap_acceptor/src/main.c
index 37ba41d32ec..c7652551c01 100644
--- a/samples/bluetooth/cap_acceptor/src/main.c
+++ b/samples/bluetooth/cap_acceptor/src/main.c
@@ -12,6 +12,7 @@
 
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/audio/cap.h>
 #include <zephyr/bluetooth/audio/lc3.h>
 #include <zephyr/bluetooth/audio/pacs.h>
@@ -104,7 +105,7 @@ static int advertise(void)
 {
 	int err;
 
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, NULL, &adv);
+	err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_CONN_QUICK, NULL, &adv);
 	if (err) {
 		LOG_ERR("Failed to create advertising set: %d", err);
 
diff --git a/samples/bluetooth/cap_initiator/src/cap_initiator_broadcast.c b/samples/bluetooth/cap_initiator/src/cap_initiator_broadcast.c
index d55f0f6c3b7..f6c9d81f9dc 100644
--- a/samples/bluetooth/cap_initiator/src/cap_initiator_broadcast.c
+++ b/samples/bluetooth/cap_initiator/src/cap_initiator_broadcast.c
@@ -72,16 +72,14 @@ static int setup_extended_adv(struct bt_le_ext_adv **adv)
 	int err;
 
 	/* Create a non-connectable non-scannable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN, NULL, adv);
+	err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_BROADCAST_FAST, NULL, adv);
 	if (err != 0) {
 		LOG_ERR("Unable to create extended advertising set: %d", err);
 		return err;
 	}
 
 	/* Set periodic advertising parameters */
-	err = bt_le_per_adv_set_param(*adv, BT_LE_PER_ADV_PARAM(BT_GAP_PER_ADV_FAST_INT_MIN_2,
-								BT_GAP_PER_ADV_FAST_INT_MAX_2,
-								BT_LE_PER_ADV_OPT_NONE));
+	err = bt_le_per_adv_set_param(*adv, BT_BAP_PER_ADV_PARAM_BROADCAST_FAST);
 	if (err != 0) {
 		LOG_ERR("Failed to set periodic advertising parameters: %d", err);
 		return err;
diff --git a/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c b/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
index 25dba8cc16d..df45dfcadaa 100644
--- a/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
+++ b/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
@@ -599,7 +599,8 @@ static bool check_audio_support_and_connect_cb(struct bt_data *data, void *user_
 		return false;
 	}
 
-	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT, &peer.conn);
+	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_BAP_CONN_PARAM_RELAXED,
+				&peer.conn);
 	if (err != 0) {
 		LOG_WRN("Create conn to failed: %d, restarting scan", err);
 		start_scan();
diff --git a/samples/bluetooth/hap_ha/prj.conf b/samples/bluetooth/hap_ha/prj.conf
index 8260f2cb12a..964280e8d94 100644
--- a/samples/bluetooth/hap_ha/prj.conf
+++ b/samples/bluetooth/hap_ha/prj.conf
@@ -1,5 +1,11 @@
 CONFIG_BT=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
+# Set preferred values based on BT_BAP_CONN_PARAM_RELAXED
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=50
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=70
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 CONFIG_BT_ISO_PERIPHERAL=y
 CONFIG_BT_PRIVACY=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
diff --git a/samples/bluetooth/hap_ha/src/main.c b/samples/bluetooth/hap_ha/src/main.c
index 586ed600469..04c865b984d 100644
--- a/samples/bluetooth/hap_ha/src/main.c
+++ b/samples/bluetooth/hap_ha/src/main.c
@@ -101,7 +101,7 @@ static void adv_work_handler(struct k_work *work)
 
 	if (ext_adv == NULL) {
 		/* Create a connectable advertising set */
-		err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, &adv_cb, &ext_adv);
+		err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_CONN_QUICK, &adv_cb, &ext_adv);
 		if (err) {
 			printk("Failed to create advertising set (err %d)\n", err);
 		}
diff --git a/samples/bluetooth/pbp_public_broadcast_source/src/main.c b/samples/bluetooth/pbp_public_broadcast_source/src/main.c
index 364adf0454f..00e12d95b9d 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/src/main.c
+++ b/samples/bluetooth/pbp_public_broadcast_source/src/main.c
@@ -149,7 +149,7 @@ static int setup_extended_adv(struct bt_le_ext_adv **adv)
 	int err;
 
 	/* Create a non-connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN, NULL, adv);
+	err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_BROADCAST_FAST, NULL, adv);
 	if (err != 0) {
 		printk("Unable to create extended advertising set: %d\n", err);
 
@@ -165,7 +165,7 @@ static int setup_extended_adv(struct bt_le_ext_adv **adv)
 	}
 
 	/* Set periodic advertising parameters */
-	err = bt_le_per_adv_set_param(*adv, BT_LE_PER_ADV_DEFAULT);
+	err = bt_le_per_adv_set_param(*adv, BT_BAP_PER_ADV_PARAM_BROADCAST_FAST);
 	if (err) {
 		printk("Failed to set periodic advertising parameters: %d\n", err);
 
diff --git a/samples/bluetooth/tmap_bms/src/cap_initiator.c b/samples/bluetooth/tmap_bms/src/cap_initiator.c
index 5ea8f88475b..b7553d7d652 100644
--- a/samples/bluetooth/tmap_bms/src/cap_initiator.c
+++ b/samples/bluetooth/tmap_bms/src/cap_initiator.c
@@ -136,7 +136,7 @@ static int setup_extended_adv(struct bt_le_ext_adv **adv)
 	int err;
 
 	/* Create a non-connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN, NULL, adv);
+	err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_BROADCAST_FAST, NULL, adv);
 	if (err != 0) {
 		printk("Unable to create extended advertising set: %d\n", err);
 		return err;
@@ -150,7 +150,7 @@ static int setup_extended_adv(struct bt_le_ext_adv **adv)
 	}
 
 	/* Set periodic advertising parameters */
-	err = bt_le_per_adv_set_param(*adv, BT_LE_PER_ADV_DEFAULT);
+	err = bt_le_per_adv_set_param(*adv, BT_BAP_PER_ADV_PARAM_BROADCAST_FAST);
 	if (err) {
 		printk("Failed to set periodic advertising parameters: %d\n",
 		       err);
diff --git a/samples/bluetooth/tmap_central/src/main.c b/samples/bluetooth/tmap_central/src/main.c
index 4c47e232bc0..a4f426f9276 100644
--- a/samples/bluetooth/tmap_central/src/main.c
+++ b/samples/bluetooth/tmap_central/src/main.c
@@ -188,8 +188,7 @@ static bool check_audio_support_and_connect(struct bt_data *data, void *user_dat
 		return false;
 	}
 
-	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN,
-				BT_LE_CONN_PARAM_DEFAULT,
+	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_BAP_CONN_PARAM_RELAXED,
 				&default_conn);
 	if (err != 0) {
 		printk("Create conn to failed (%u)\n", err);
diff --git a/samples/bluetooth/tmap_peripheral/prj.conf b/samples/bluetooth/tmap_peripheral/prj.conf
index cf40172576a..837e3d4807f 100644
--- a/samples/bluetooth/tmap_peripheral/prj.conf
+++ b/samples/bluetooth/tmap_peripheral/prj.conf
@@ -1,6 +1,12 @@
 CONFIG_BT=y
 CONFIG_LOG=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
+# Set preferred values based on BT_BAP_CONN_PARAM_RELAXED
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=50
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=70
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 CONFIG_BT_ISO_PERIPHERAL=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
diff --git a/samples/bluetooth/tmap_peripheral/src/main.c b/samples/bluetooth/tmap_peripheral/src/main.c
index 30a1855493f..f26d65767f9 100644
--- a/samples/bluetooth/tmap_peripheral/src/main.c
+++ b/samples/bluetooth/tmap_peripheral/src/main.c
@@ -252,7 +252,7 @@ int main(void)
 	}
 	printk("BAP initialized\n");
 
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, &adv_cb, &adv);
+	err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_CONN_QUICK, &adv_cb, &adv);
 	if (err) {
 		printk("Failed to create advertising set (err %d)\n", err);
 		return err;
diff --git a/subsys/bluetooth/host/shell/bt.c b/subsys/bluetooth/host/shell/bt.c
index 45a58603445..7386e14f0d1 100644
--- a/subsys/bluetooth/host/shell/bt.c
+++ b/subsys/bluetooth/host/shell/bt.c
@@ -12,6 +12,9 @@
  */
 
 #include <errno.h>
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/audio/bap.h>
+#include <zephyr/bluetooth/gap.h>
 #include <zephyr/types.h>
 #include <ctype.h>
 #include <stddef.h>
@@ -3247,11 +3250,18 @@ static int cmd_subrate_request(const struct shell *sh, size_t argc, char *argv[]
 #if defined(CONFIG_BT_CENTRAL)
 static int bt_do_connect_le(int *ercd, size_t argc, char *argv[])
 {
+	struct bt_le_conn_param conn_param;
 	int err;
 	bt_addr_le_t addr;
 	struct bt_conn *conn = NULL;
 	uint32_t options = 0;
 
+	if (IS_ENABLED(CONFIG_BT_BAP_UNICAST) || IS_ENABLED(CONFIG_BT_BAP_BROADCAST_ASSISTANT)) {
+		conn_param = *BT_BAP_CONN_PARAM_RELAXED;
+	} else {
+		conn_param = *BT_LE_CONN_PARAM_DEFAULT;
+	}
+
 	*ercd = 0;
 
 	/* When no arguments are specified, connect to the last scanned device. */
@@ -3288,7 +3298,7 @@ static int bt_do_connect_le(int *ercd, size_t argc, char *argv[])
 					BT_GAP_SCAN_FAST_INTERVAL,
 					BT_GAP_SCAN_FAST_INTERVAL);
 
-	err = bt_conn_le_create(&addr, create_params, BT_LE_CONN_PARAM_DEFAULT, &conn);
+	err = bt_conn_le_create(&addr, create_params, &conn_param, &conn);
 	if (err) {
 		*ercd = err;
 		return -ENOEXEC;
diff --git a/tests/bluetooth/shell/audio.conf b/tests/bluetooth/shell/audio.conf
index f09705ac681..2f7e82b7817 100644
--- a/tests/bluetooth/shell/audio.conf
+++ b/tests/bluetooth/shell/audio.conf
@@ -40,7 +40,6 @@ CONFIG_BT_KEYS_OVERWRITE_OLDEST=y
 CONFIG_BT_L2CAP_TX_MTU=128
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
-
 CONFIG_BT_SETTINGS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
@@ -53,6 +52,13 @@ CONFIG_BT_AUTO_DATA_LEN_UPDATE=y
 CONFIG_BT_USER_PHY_UPDATE=y
 CONFIG_BT_AUTO_PHY_UPDATE=y
 
+CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
+# Set preferred values based on BT_BAP_CONN_PARAM_RELAXED
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=50
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=70
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
+
 CONFIG_BT_PER_ADV_SYNC_TRANSFER_RECEIVER=y
 CONFIG_BT_PER_ADV_SYNC_TRANSFER_SENDER=y
 
diff --git a/tests/bluetooth/tester/overlay-le-audio.conf b/tests/bluetooth/tester/overlay-le-audio.conf
index be5004d49e4..4b18c651be2 100644
--- a/tests/bluetooth/tester/overlay-le-audio.conf
+++ b/tests/bluetooth/tester/overlay-le-audio.conf
@@ -1,5 +1,11 @@
 CONFIG_BT_AUDIO=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
+# Set preferred values based on BT_BAP_CONN_PARAM_RELAXED
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=50
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=70
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
diff --git a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
index b2f496b7a1b..f42eaa2340c 100644
--- a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
+++ b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
@@ -16,6 +16,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/sys/ring_buffer.h>
 #include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/gap.h>
 
 #include "bap_endpoint.h"
@@ -367,17 +368,8 @@ static int setup_broadcast_source(uint8_t streams_per_subgroup,	uint8_t subgroup
 uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 				       void *rsp, uint16_t *rsp_len)
 {
-	struct bt_le_per_adv_param per_adv_param =
-		*BT_LE_PER_ADV_PARAM(BT_GAP_MS_TO_PER_ADV_INTERVAL(150),
-				     BT_GAP_MS_TO_PER_ADV_INTERVAL(150), BT_LE_PER_ADV_OPT_NONE);
-	/* Zephyr Controller works best while Extended Advertising interval is a multiple
-	 * of the ISO Interval minus 10 ms (max. advertising random delay). This is
-	 * required to place the AUX_ADV_IND PDUs in a non-overlapping interval with the
-	 * Broadcast ISO radio events.
-	 */
-	struct bt_le_adv_param ext_adv_param =
-		*BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV, BT_GAP_MS_TO_ADV_INTERVAL(140),
-				 BT_GAP_MS_TO_ADV_INTERVAL(140), NULL);
+	struct bt_le_per_adv_param per_adv_param = *BT_BAP_PER_ADV_PARAM_BROADCAST_SLOW;
+	struct bt_le_adv_param ext_adv_param = *BT_BAP_ADV_PARAM_BROADCAST_SLOW;
 	int err;
 	struct bt_audio_codec_cfg codec_cfg;
 	const struct btp_bap_broadcast_source_setup_cmd *cp = cmd;
@@ -404,6 +396,14 @@ uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 
 	LOG_DBG("");
 
+	/* Zephyr Controller works best while Extended Advertising interval is a multiple
+	 * of the ISO Interval minus 10 ms (max. advertising random delay). This is
+	 * required to place the AUX_ADV_IND PDUs in a non-overlapping interval with the
+	 * Broadcast ISO radio events.
+	 */
+	ext_adv_param.interval_min -= BT_GAP_MS_TO_ADV_INTERVAL(10U);
+	ext_adv_param.interval_max -= BT_GAP_MS_TO_ADV_INTERVAL(10U);
+
 	memset(&codec_cfg, 0, sizeof(codec_cfg));
 	codec_cfg.id = cp->coding_format;
 	codec_cfg.vid = cp->vid;
diff --git a/tests/bluetooth/tester/src/btp_gap.c b/tests/bluetooth/tester/src/btp_gap.c
index 547400d912c..bbd41e91092 100644
--- a/tests/bluetooth/tester/src/btp_gap.c
+++ b/tests/bluetooth/tester/src/btp_gap.c
@@ -7,9 +7,11 @@
  */
 #include <stdint.h>
 
+#include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/gap.h>
 #include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util_macro.h>
 #include <zephyr/types.h>
 #include <string.h>
 
@@ -1060,20 +1062,21 @@ static uint8_t stop_discovery(const void *cmd, uint16_t cmd_len,
 static uint8_t connect(const void *cmd, uint16_t cmd_len,
 		       void *rsp, uint16_t *rsp_len)
 {
-	/* The conn interval is set to 60ms (0x30). This is to better support test cases where we
-	 * need to connect to multiple peripherals (up to 3). The connection interval should also be
-	 * a multiple of 30ms, as that is ideal to support both 7.5ms and 10ms ISO intervals
-	 */
-	const uint16_t interval = BT_GAP_MS_TO_CONN_INTERVAL(60U);
-	const struct bt_le_conn_param *conn_param =
-		BT_LE_CONN_PARAM(interval, interval, 0U, BT_GAP_MS_TO_CONN_TIMEOUT(4000U));
+	struct bt_le_conn_param conn_param;
+
+	if (IS_ENABLED(CONFIG_BT_BAP_UNICAST) || IS_ENABLED(CONFIG_BT_BAP_BROADCAST_ASSISTANT)) {
+		conn_param = *BT_BAP_CONN_PARAM_RELAXED;
+	} else {
+		conn_param = *BT_LE_CONN_PARAM_DEFAULT;
+	}
+
 	const struct btp_gap_connect_cmd *cp = cmd;
 	int err;
 
 	if (!bt_addr_le_eq(&cp->address, BT_ADDR_LE_ANY)) {
 		struct bt_conn *conn = NULL;
 
-		err = bt_conn_le_create(&cp->address, BT_CONN_LE_CREATE_CONN, conn_param, &conn);
+		err = bt_conn_le_create(&cp->address, BT_CONN_LE_CREATE_CONN, &conn_param, &conn);
 		if (err) {
 			LOG_ERR("Failed to create connection (%d)", err);
 			return BTP_STATUS_FAILED;
@@ -1081,7 +1084,7 @@ static uint8_t connect(const void *cmd, uint16_t cmd_len,
 
 		bt_conn_unref(conn);
 	} else {
-		err = bt_conn_le_create_auto(BT_CONN_LE_CREATE_CONN, conn_param);
+		err = bt_conn_le_create_auto(BT_CONN_LE_CREATE_CONN, &conn_param);
 		if (err) {
 			LOG_ERR("Failed to create auto connection (%d)", err);
 			return BTP_STATUS_FAILED;
diff --git a/tests/bsim/bluetooth/audio/prj.conf b/tests/bsim/bluetooth/audio/prj.conf
index aa571104fa7..b6775740309 100644
--- a/tests/bsim/bluetooth/audio/prj.conf
+++ b/tests/bsim/bluetooth/audio/prj.conf
@@ -54,6 +54,11 @@ CONFIG_BT_ISO_RX_MTU=310
 CONFIG_BT_ISO_RX_BUF_COUNT=4
 
 CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
+# Set preferred values based on BT_BAP_CONN_PARAM_RELAXED
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=50
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=70
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 # Needed for Periodic Advertising Sync Transfer
 CONFIG_BT_PER_ADV_SYNC_TRANSFER_RECEIVER=y
diff --git a/tests/bsim/bluetooth/audio/src/bap_bass_broadcaster_test.c b/tests/bsim/bluetooth/audio/src/bap_bass_broadcaster_test.c
index 68894d7a320..fb1da4e6904 100644
--- a/tests/bsim/bluetooth/audio/src/bap_bass_broadcaster_test.c
+++ b/tests/bsim/bluetooth/audio/src/bap_bass_broadcaster_test.c
@@ -7,6 +7,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/byteorder.h>
 #include <zephyr/bluetooth/gap.h>
@@ -29,8 +30,7 @@ static void test_main(void)
 	struct bt_le_ext_adv *adv;
 	struct bt_data ad[2] = {
 		BT_DATA_BYTES(BT_DATA_FLAGS, BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR),
-		BT_DATA_BYTES(BT_DATA_SVC_DATA16,
-			      BT_UUID_16_ENCODE(BT_UUID_BROADCAST_AUDIO_VAL),
+		BT_DATA_BYTES(BT_DATA_SVC_DATA16, BT_UUID_16_ENCODE(BT_UUID_BROADCAST_AUDIO_VAL),
 			      BT_BYTES_LIST_LE24(broadcast_id)),
 	};
 
@@ -42,19 +42,7 @@ static void test_main(void)
 
 	printk("Bluetooth initialized\n");
 
-	/* Create a non-connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN, NULL, &adv);
-	if (err) {
-		FAIL("Failed to create advertising set (err %d)\n", err);
-		return;
-	}
-
-	/* Set periodic advertising parameters */
-	err = bt_le_per_adv_set_param(adv, BT_LE_PER_ADV_DEFAULT);
-	if (err) {
-		FAIL("Failed to set periodic advertising parameters (err %d)\n", err);
-		return;
-	}
+	setup_broadcast_adv(&adv);
 
 	/* Set adv data */
 	err = bt_le_ext_adv_set_data(adv, ad, ARRAY_SIZE(ad), NULL, 0);
diff --git a/tests/bsim/bluetooth/audio/src/bap_broadcast_assistant_test.c b/tests/bsim/bluetooth/audio/src/bap_broadcast_assistant_test.c
index 430ab7f950a..bb8f44c5b90 100644
--- a/tests/bsim/bluetooth/audio/src/bap_broadcast_assistant_test.c
+++ b/tests/bsim/bluetooth/audio/src/bap_broadcast_assistant_test.c
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <errno.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
@@ -27,6 +28,7 @@
 #include "common.h"
 #include "bap_common.h"
 #include "bstests.h"
+#include "syscalls/kernel.h"
 
 #ifdef CONFIG_BT_BAP_BROADCAST_ASSISTANT
 
@@ -517,9 +519,12 @@ static void test_bass_mod_source(uint32_t bis_sync)
 		FAIL("Could not modify source (err %d)\n", err);
 		return;
 	}
-	printk("Source modified, waiting for server to PA sync\n");
 
-	WAIT_FOR_AND_CLEAR_FLAG(flag_recv_state_updated);
+	if (recv_state.pa_sync_state == BT_BAP_PA_STATE_NOT_SYNCED) {
+		printk("Source modified, waiting for server to PA sync\n");
+
+		WAIT_FOR_AND_CLEAR_FLAG(flag_recv_state_updated);
+	}
 
 	if (recv_state.pa_sync_state == BT_BAP_PA_STATE_INFO_REQ) {
 		/* Wait for PAST to finish and then a new receive state */
@@ -579,10 +584,13 @@ static void test_bass_mod_source(uint32_t bis_sync)
 				FAIL("Unexpected BIS sync value: %u", remote_bis_sync);
 				return;
 			}
-		} else if (remote_bis_sync != subgroup.bis_sync) {
-			FAIL("Unexpected BIS sync value: %u != %u\n", remote_bis_sync,
-			     subgroup.bis_sync);
-			return;
+		} else {
+			WAIT_FOR_FLAG(flag_recv_state_updated_with_bis_sync);
+			if (remote_bis_sync != subgroup.bis_sync) {
+				FAIL("Unexpected BIS sync value: %u != %u\n", remote_bis_sync,
+				     subgroup.bis_sync);
+				return;
+			}
 		}
 	}
 
@@ -659,12 +667,17 @@ static void test_bass_broadcast_code(const uint8_t broadcast_code[BT_ISO_BROADCA
 
 	printk("Adding broadcast code\n");
 	UNSET_FLAG(flag_write_complete);
-	err = bt_bap_broadcast_assistant_set_broadcast_code(default_conn, recv_state.src_id,
-							    broadcast_code);
-	if (err != 0) {
-		FAIL("Could not add broadcast code (err %d)\n", err);
-		return;
-	}
+
+	do {
+		err = bt_bap_broadcast_assistant_set_broadcast_code(default_conn, recv_state.src_id,
+								    broadcast_code);
+		if (err == -EBUSY) {
+			k_sleep(BAP_RETRY_WAIT);
+		} else if (err != 0) {
+			FAIL("Could not add broadcast code (err %d)\n", err);
+			return;
+		}
+	} while (err == -EBUSY);
 
 	WAIT_FOR_FLAG(flag_write_complete);
 	printk("Broadcast code added\n");
diff --git a/tests/bsim/bluetooth/audio/src/bap_broadcast_source_test.c b/tests/bsim/bluetooth/audio/src/bap_broadcast_source_test.c
index d53da1c5fec..838eab27f2e 100644
--- a/tests/bsim/bluetooth/audio/src/bap_broadcast_source_test.c
+++ b/tests/bsim/bluetooth/audio/src/bap_broadcast_source_test.c
@@ -334,30 +334,14 @@ static void test_broadcast_source_get_base(struct bt_bap_broadcast_source *sourc
 static int setup_extended_adv(struct bt_bap_broadcast_source *source, struct bt_le_ext_adv **adv)
 {
 	/* Broadcast Audio Streaming Endpoint advertising data */
-	NET_BUF_SIMPLE_DEFINE(ad_buf,
-			      BT_UUID_SIZE_16 + BT_AUDIO_BROADCAST_ID_SIZE);
-	struct bt_le_adv_param adv_param = BT_LE_ADV_PARAM_INIT(
-		BT_LE_ADV_OPT_EXT_ADV, 0x80, 0x80, NULL);
+	NET_BUF_SIMPLE_DEFINE(ad_buf, BT_UUID_SIZE_16 + BT_AUDIO_BROADCAST_ID_SIZE);
 	NET_BUF_SIMPLE_DEFINE(base_buf, 128);
 	struct bt_data ext_ad;
 	struct bt_data per_ad;
 	uint32_t broadcast_id;
 	int err;
 
-	/* Create a non-connectable advertising set */
-	err = bt_le_ext_adv_create(&adv_param, NULL, adv);
-	if (err != 0) {
-		printk("Unable to create extended advertising set: %d\n", err);
-		return err;
-	}
-
-	/* Set periodic advertising parameters */
-	err = bt_le_per_adv_set_param(*adv, BT_LE_PER_ADV_DEFAULT);
-	if (err) {
-		printk("Failed to set periodic advertising parameters: %d\n",
-		       err);
-		return err;
-	}
+	setup_broadcast_adv(adv);
 
 	err = bt_rand(&broadcast_id, BT_AUDIO_BROADCAST_ID_SIZE);
 	if (err) {
diff --git a/tests/bsim/bluetooth/audio/src/bap_common.h b/tests/bsim/bluetooth/audio/src/bap_common.h
index 1a6e2f3a1bc..88f445cddc4 100644
--- a/tests/bsim/bluetooth/audio/src/bap_common.h
+++ b/tests/bsim/bluetooth/audio/src/bap_common.h
@@ -16,6 +16,7 @@
 #include <zephyr/bluetooth/audio/bap_lc3_preset.h>
 #include <zephyr/bluetooth/audio/cap.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/kernel.h>
 
 #define LONG_META 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, \
 		  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, \
@@ -43,6 +44,9 @@
 #define INCORRECT_BROADCAST_CODE                                                                   \
 	((uint8_t[]){0xDE, 0xAD, 0xBE, 0xEF, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, \
 		     0xdd, 0xee, 0xff})
+
+#define BAP_RETRY_WAIT K_MSEC(100)
+
 struct unicast_stream {
 	struct bt_cap_stream stream;
 	struct bt_audio_codec_cfg codec_cfg;
diff --git a/tests/bsim/bluetooth/audio/src/bap_unicast_client_test.c b/tests/bsim/bluetooth/audio/src/bap_unicast_client_test.c
index 6563185249e..a00dff69e4b 100644
--- a/tests/bsim/bluetooth/audio/src/bap_unicast_client_test.c
+++ b/tests/bsim/bluetooth/audio/src/bap_unicast_client_test.c
@@ -37,8 +37,6 @@
 
 #if defined(CONFIG_BT_BAP_UNICAST_CLIENT)
 
-#define BAP_STREAM_RETRY_WAIT K_MSEC(100)
-
 extern enum bst_result_t bst_result;
 
 static struct audio_test_stream test_streams[CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT];
@@ -426,7 +424,7 @@ static bool parse_ascs_ad_data(struct bt_data *data, void *user_data)
 		return false;
 	}
 
-	err = bt_conn_le_create(info->addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT,
+	err = bt_conn_le_create(info->addr, BT_CONN_LE_CREATE_CONN, BT_BAP_CONN_PARAM_RELAXED,
 				&default_conn);
 	if (err) {
 		FAIL("Could not connect to peer: %d", err);
@@ -582,7 +580,7 @@ static int codec_configure_stream(struct bt_bap_stream *stream, struct bt_bap_ep
 
 		err = bt_bap_stream_config(default_conn, stream, ep, codec_cfg);
 		if (err == -EBUSY) {
-			k_sleep(BAP_STREAM_RETRY_WAIT);
+			k_sleep(BAP_RETRY_WAIT);
 		} else if (err != 0) {
 			FAIL("Could not configure stream %p: %d\n", stream, err);
 			return err;
@@ -632,7 +630,7 @@ static void qos_configure_streams(struct bt_bap_unicast_group *unicast_group,
 	do {
 		err = bt_bap_stream_qos(default_conn, unicast_group);
 		if (err == -EBUSY) {
-			k_sleep(BAP_STREAM_RETRY_WAIT);
+			k_sleep(BAP_RETRY_WAIT);
 		} else if (err != 0) {
 			FAIL("Unable to QoS configure streams: %d\n", err);
 			return;
@@ -653,7 +651,7 @@ static int enable_stream(struct bt_bap_stream *stream)
 	do {
 		err = bt_bap_stream_enable(stream, NULL, 0);
 		if (err == -EBUSY) {
-			k_sleep(BAP_STREAM_RETRY_WAIT);
+			k_sleep(BAP_RETRY_WAIT);
 		} else if (err != 0) {
 			FAIL("Could not enable stream %p: %d\n", stream, err);
 			return err;
@@ -692,7 +690,7 @@ static int metadata_update_stream(struct bt_bap_stream *stream)
 	do {
 		err = bt_bap_stream_metadata(stream, new_meta, ARRAY_SIZE(new_meta));
 		if (err == -EBUSY) {
-			k_sleep(BAP_STREAM_RETRY_WAIT);
+			k_sleep(BAP_RETRY_WAIT);
 		} else if (err != 0) {
 			FAIL("Could not metadata update stream %p: %d\n", stream, err);
 			return err;
@@ -786,7 +784,7 @@ static int start_stream(struct bt_bap_stream *stream)
 	do {
 		err = bt_bap_stream_start(stream);
 		if (err == -EBUSY) {
-			k_sleep(BAP_STREAM_RETRY_WAIT);
+			k_sleep(BAP_RETRY_WAIT);
 		} else if (err != 0) {
 			FAIL("Could not start stream %p: %d\n", stream, err);
 			return err;
@@ -851,7 +849,7 @@ static void disable_streams(size_t stream_cnt)
 			err = bt_bap_stream_disable(
 				bap_stream_from_audio_test_stream(&test_streams[i]));
 			if (err == -EBUSY) {
-				k_sleep(BAP_STREAM_RETRY_WAIT);
+				k_sleep(BAP_RETRY_WAIT);
 			} else if (err != 0) {
 				FAIL("Could not disable stream: %d\n", err);
 				return;
@@ -885,7 +883,7 @@ static void stop_streams(size_t stream_cnt)
 		do {
 			err = bt_bap_stream_stop(source_stream);
 			if (err == -EBUSY) {
-				k_sleep(BAP_STREAM_RETRY_WAIT);
+				k_sleep(BAP_RETRY_WAIT);
 			} else if (err != 0) {
 				FAIL("Could not stop stream: %d\n", err);
 				return;
@@ -911,7 +909,7 @@ static void release_streams(size_t stream_cnt)
 			err = bt_bap_stream_release(
 				bap_stream_from_audio_test_stream(&test_streams[i]));
 			if (err == -EBUSY) {
-				k_sleep(BAP_STREAM_RETRY_WAIT);
+				k_sleep(BAP_RETRY_WAIT);
 			} else if (err != 0) {
 				FAIL("Could not release stream: %d\n", err);
 				return;
diff --git a/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c b/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c
index f33a34b9f3b..a081326baea 100644
--- a/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c
+++ b/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c
@@ -40,17 +40,6 @@
 #include "bap_common.h"
 
 #if defined(CONFIG_BT_CAP_ACCEPTOR)
-/* Zephyr Controller works best while Extended Advertising interval to be a multiple
- * of the ISO Interval minus 10 ms (max. advertising random delay). This is
- * required to place the AUX_ADV_IND PDUs in a non-overlapping interval with the
- * Broadcast ISO radio events.
- */
-#define BT_LE_EXT_ADV_CONN_CUSTOM \
-		BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV | BT_LE_ADV_OPT_CONN, \
-				BT_GAP_MS_TO_ADV_INTERVAL(140), \
-				BT_GAP_MS_TO_ADV_INTERVAL(140), \
-				NULL)
-
 extern enum bst_result_t bst_result;
 
 CREATE_FLAG(flag_broadcaster_found);
diff --git a/tests/bsim/bluetooth/audio/src/cap_commander_test.c b/tests/bsim/bluetooth/audio/src/cap_commander_test.c
index 63f3ad61ef4..de623142a09 100644
--- a/tests/bsim/bluetooth/audio/src/cap_commander_test.c
+++ b/tests/bsim/bluetooth/audio/src/cap_commander_test.c
@@ -585,9 +585,7 @@ static bool check_audio_support_and_connect_cb(struct bt_data *data, void *user_
 		return false;
 	}
 
-	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN,
-				BT_LE_CONN_PARAM(BT_GAP_INIT_CONN_INT_MIN, BT_GAP_INIT_CONN_INT_MIN,
-						 0, BT_GAP_MS_TO_CONN_TIMEOUT(4000)),
+	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_BAP_CONN_PARAM_RELAXED,
 				&connected_conns[connected_conn_cnt]);
 	if (err != 0) {
 		FAIL("Could not connect to peer: %d", err);
diff --git a/tests/bsim/bluetooth/audio/src/cap_initiator_broadcast_test.c b/tests/bsim/bluetooth/audio/src/cap_initiator_broadcast_test.c
index 209560af009..abd43e98f79 100644
--- a/tests/bsim/bluetooth/audio/src/cap_initiator_broadcast_test.c
+++ b/tests/bsim/bluetooth/audio/src/cap_initiator_broadcast_test.c
@@ -36,19 +36,6 @@
 #if defined(CONFIG_BT_CAP_INITIATOR) && defined(CONFIG_BT_BAP_BROADCAST_SOURCE)
 CREATE_FLAG(flag_source_started);
 
-/* Zephyr Controller works best while Extended Advertising interval to be a multiple
- * of the ISO Interval minus 10 ms (max. advertising random delay). This is
- * required to place the AUX_ADV_IND PDUs in a non-overlapping interval with the
- * Broadcast ISO radio events.
- */
-#define BT_LE_EXT_ADV_CUSTOM                                                                       \
-	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV, BT_GAP_MS_TO_ADV_INTERVAL(140),                     \
-			BT_GAP_MS_TO_ADV_INTERVAL(140), NULL)
-
-#define BT_LE_PER_ADV_CUSTOM                                                                       \
-	BT_LE_PER_ADV_PARAM(BT_GAP_MS_TO_PER_ADV_INTERVAL(150),                                    \
-			    BT_GAP_MS_TO_PER_ADV_INTERVAL(150), BT_LE_PER_ADV_OPT_NONE)
-
 #define BROADCAST_STREMT_CNT    CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT
 #define CAP_AC_MAX_STREAM       2
 #define LOCATION                (BT_AUDIO_LOCATION_FRONT_LEFT | BT_AUDIO_LOCATION_FRONT_RIGHT)
@@ -214,25 +201,6 @@ static void init(void)
 	}
 }
 
-static void setup_extended_adv(struct bt_le_ext_adv **adv)
-{
-	int err;
-
-	/* Create a non-connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CUSTOM, NULL, adv);
-	if (err != 0) {
-		FAIL("Unable to create extended advertising set: %d\n", err);
-		return;
-	}
-
-	/* Set periodic advertising parameters */
-	err = bt_le_per_adv_set_param(*adv, BT_LE_PER_ADV_CUSTOM);
-	if (err) {
-		FAIL("Failed to set periodic advertising parameters: %d\n", err);
-		return;
-	}
-}
-
 static void setup_extended_adv_data(struct bt_cap_broadcast_source *source,
 				    struct bt_le_ext_adv *adv)
 {
@@ -653,7 +621,7 @@ static void test_main_cap_initiator_broadcast(void)
 
 	init();
 
-	setup_extended_adv(&adv);
+	setup_broadcast_adv(&adv);
 
 	test_broadcast_audio_create_inval();
 	test_broadcast_audio_create(&broadcast_source);
@@ -743,7 +711,7 @@ static int test_cap_initiator_ac(const struct cap_initiator_ac_param *param)
 	create_param.qos = &qos;
 
 	init();
-	setup_extended_adv(&adv);
+	setup_broadcast_adv(&adv);
 
 	err = bt_cap_initiator_broadcast_audio_create(&create_param, &broadcast_source);
 	if (err != 0) {
diff --git a/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c b/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c
index 1c6b44e80ba..fdf6eb909ab 100644
--- a/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c
+++ b/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c
@@ -402,9 +402,7 @@ static bool check_audio_support_and_connect_cb(struct bt_data *data, void *user_
 		return false;
 	}
 
-	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN,
-				BT_LE_CONN_PARAM(BT_GAP_INIT_CONN_INT_MIN, BT_GAP_INIT_CONN_INT_MIN,
-						 0, BT_GAP_MS_TO_CONN_TIMEOUT(4000)),
+	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_BAP_CONN_PARAM_RELAXED,
 				&connected_conns[connected_conn_cnt]);
 	if (err != 0) {
 		FAIL("Could not connect to peer: %d", err);
diff --git a/tests/bsim/bluetooth/audio/src/common.c b/tests/bsim/bluetooth/audio/src/common.c
index 085a57700cc..c842b2b91e8 100644
--- a/tests/bsim/bluetooth/audio/src/common.c
+++ b/tests/bsim/bluetooth/audio/src/common.c
@@ -107,7 +107,7 @@ static void device_found(const struct bt_le_scan_recv_info *info, struct net_buf
 		return;
 	}
 
-	err = bt_conn_le_create(info->addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT,
+	err = bt_conn_le_create(info->addr, BT_CONN_LE_CREATE_CONN, BT_BAP_CONN_PARAM_RELAXED,
 				&default_conn);
 	if (err) {
 		FAIL("Could not connect to peer: %d", err);
@@ -186,12 +186,13 @@ BT_CONN_CB_DEFINE(conn_callbacks) = {
 	.security_changed = security_changed_cb,
 };
 
+
 void setup_connectable_adv(struct bt_le_ext_adv **ext_adv)
 {
 	int err;
 
 	/* Create a non-connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, NULL, ext_adv);
+	err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_CONN_QUICK, NULL, ext_adv);
 	if (err != 0) {
 		FAIL("Unable to create extended advertising set: %d\n", err);
 		return;
@@ -218,6 +219,34 @@ void setup_connectable_adv(struct bt_le_ext_adv **ext_adv)
 	printk("Advertising started\n");
 }
 
+void setup_broadcast_adv(struct bt_le_ext_adv **adv)
+{
+	struct bt_le_adv_param ext_adv_param = *BT_BAP_ADV_PARAM_BROADCAST_SLOW;
+	int err;
+
+	/* Zephyr Controller works best while Extended Advertising interval is a multiple
+	 * of the ISO Interval minus 10 ms (max. advertising random delay). This is
+	 * required to place the AUX_ADV_IND PDUs in a non-overlapping interval with the
+	 * Broadcast ISO radio events.
+	 */
+	ext_adv_param.interval_min -= BT_GAP_MS_TO_ADV_INTERVAL(10U);
+	ext_adv_param.interval_max -= BT_GAP_MS_TO_ADV_INTERVAL(10U);
+
+	/* Create a non-connectable advertising set */
+	err = bt_le_ext_adv_create(&ext_adv_param, NULL, adv);
+	if (err != 0) {
+		FAIL("Unable to create extended advertising set: %d\n", err);
+		return;
+	}
+
+	/* Set periodic advertising parameters */
+	err = bt_le_per_adv_set_param(*adv, BT_BAP_PER_ADV_PARAM_BROADCAST_SLOW);
+	if (err) {
+		FAIL("Failed to set periodic advertising parameters: %d\n", err);
+		return;
+	}
+}
+
 void test_tick(bs_time_t HW_device_time)
 {
 	if (bst_result != Passed) {
diff --git a/tests/bsim/bluetooth/audio/src/common.h b/tests/bsim/bluetooth/audio/src/common.h
index dff8597ae48..8584b7ea91a 100644
--- a/tests/bsim/bluetooth/audio/src/common.h
+++ b/tests/bsim/bluetooth/audio/src/common.h
@@ -139,6 +139,7 @@ extern uint8_t csip_rsi[BT_CSIP_RSI_SIZE];
 
 void disconnected(struct bt_conn *conn, uint8_t reason);
 void setup_connectable_adv(struct bt_le_ext_adv **ext_adv);
+void setup_broadcast_adv(struct bt_le_ext_adv **adv);
 void test_tick(bs_time_t HW_device_time);
 void test_init(void);
 uint16_t get_dev_cnt(void);
diff --git a/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c b/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c
index fc07b2e681e..44121ef6bdb 100644
--- a/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c
+++ b/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c
@@ -10,6 +10,7 @@
 #include <string.h>
 
 #include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/audio/csip.h>
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
@@ -328,8 +329,8 @@ static void connect_set(void)
 	}
 
 	bt_addr_le_to_str(&addr_found[0], addr, sizeof(addr));
-	err = bt_conn_le_create(&addr_found[0], BT_CONN_LE_CREATE_CONN,
-				BT_LE_CONN_PARAM_DEFAULT, &conns[0]);
+	err = bt_conn_le_create(&addr_found[0], BT_CONN_LE_CREATE_CONN, BT_BAP_CONN_PARAM_RELAXED,
+				&conns[0]);
 	if (err != 0) {
 		FAIL("Failed to connect to %s: %d\n", err);
 
diff --git a/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c b/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c
index 744930b76d3..0e048416a13 100644
--- a/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c
+++ b/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c
@@ -41,18 +41,6 @@
 #include "bap_common.h"
 
 #if defined(CONFIG_BT_GMAP)
-/* Zephyr Controller works best while Extended Advertising interval to be a multiple
- * of the ISO Interval minus 10 ms (max. advertising random delay). This is
- * required to place the AUX_ADV_IND PDUs in a non-overlapping interval with the
- * Broadcast ISO radio events.
- */
-#define BT_LE_EXT_ADV_CUSTOM                                                                       \
-	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV, BT_GAP_MS_TO_ADV_INTERVAL(80),                      \
-			BT_GAP_MS_TO_ADV_INTERVAL(80), NULL)
-
-#define BT_LE_PER_ADV_CUSTOM                                                                       \
-	BT_LE_PER_ADV_PARAM(BT_GAP_MS_TO_PER_ADV_INTERVAL(90), BT_GAP_MS_TO_PER_ADV_INTERVAL(90),  \
-			    BT_LE_PER_ADV_OPT_NONE)
 
 #define UNICAST_SINK_SUPPORTED (CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT > 0)
 #define UNICAST_SRC_SUPPORTED  (CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SRC_COUNT > 0)
@@ -1002,25 +990,6 @@ static void test_gmap_ugg_unicast_ac(const struct gmap_unicast_ac_param *param)
 	     param->src_named_preset != NULL ? param->src_named_preset->name : "None");
 }
 
-static void setup_extended_adv(struct bt_le_ext_adv **adv)
-{
-	int err;
-
-	/* Create a non-connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CUSTOM, NULL, adv);
-	if (err != 0) {
-		FAIL("Unable to create extended advertising set: %d\n", err);
-		return;
-	}
-
-	/* Set periodic advertising parameters */
-	err = bt_le_per_adv_set_param(*adv, BT_LE_PER_ADV_CUSTOM);
-	if (err) {
-		FAIL("Failed to set periodic advertising parameters: %d\n", err);
-		return;
-	}
-}
-
 static void setup_extended_adv_data(struct bt_cap_broadcast_source *source,
 				    struct bt_le_ext_adv *adv)
 {
@@ -1207,7 +1176,7 @@ static int test_gmap_ugg_broadcast_ac(const struct gmap_broadcast_ac_param *para
 	create_param.qos = &qos;
 
 	init();
-	setup_extended_adv(&adv);
+	setup_broadcast_adv(&adv);
 
 	err = bt_cap_initiator_broadcast_audio_create(&create_param, &broadcast_source);
 	if (err != 0) {
diff --git a/tests/bsim/bluetooth/audio/src/pbp_public_broadcast_source_test.c b/tests/bsim/bluetooth/audio/src/pbp_public_broadcast_source_test.c
index 65f49f675b6..9bce5941be4 100644
--- a/tests/bsim/bluetooth/audio/src/pbp_public_broadcast_source_test.c
+++ b/tests/bsim/bluetooth/audio/src/pbp_public_broadcast_source_test.c
@@ -197,29 +197,6 @@ static int start_extended_adv(struct bt_le_ext_adv *adv)
 	return 0;
 }
 
-static int setup_extended_adv(struct bt_le_ext_adv **adv)
-{
-	int err;
-
-	/* Create a non-connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN, NULL, adv);
-	if (err != 0) {
-		printk("Unable to create extended advertising set: %d\n", err);
-
-		return err;
-	}
-
-	/* Set periodic advertising parameters */
-	err = bt_le_per_adv_set_param(*adv, BT_LE_PER_ADV_DEFAULT);
-	if (err) {
-		printk("Failed to set periodic advertising parameters: %d\n", err);
-
-		return err;
-	}
-
-	return 0;
-}
-
 static int stop_extended_adv(struct bt_le_ext_adv *adv)
 {
 	int err;
@@ -291,11 +268,7 @@ static void test_main(void)
 		k_sem_reset(&sem_started);
 		k_sem_reset(&sem_stopped);
 
-		err = setup_extended_adv(&adv);
-		if (err != 0) {
-			printk("Unable to setup extended advertiser: %d\n", err);
-			FAIL("Public Broadcast source failed\n");
-		}
+		setup_broadcast_adv(&adv);
 
 		err = bt_cap_initiator_broadcast_audio_create(&create_param, &broadcast_source);
 		if (err != 0) {
diff --git a/tests/bsim/bluetooth/audio/src/tmap_client_test.c b/tests/bsim/bluetooth/audio/src/tmap_client_test.c
index 69abd58f239..2aebbb0e0f1 100644
--- a/tests/bsim/bluetooth/audio/src/tmap_client_test.c
+++ b/tests/bsim/bluetooth/audio/src/tmap_client_test.c
@@ -10,6 +10,7 @@
 #include <stddef.h>
 
 #include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/audio/tmap.h>
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
@@ -87,8 +88,7 @@ static bool check_audio_support_and_connect(struct bt_data *data, void *user_dat
 		return false;
 	}
 
-	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN,
-				BT_LE_CONN_PARAM_DEFAULT,
+	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_BAP_CONN_PARAM_RELAXED,
 				&default_conn);
 	if (err != 0) {
 		printk("Create conn to failed (%u)\n", err);
diff --git a/tests/bsim/bluetooth/audio/src/tmap_server_test.c b/tests/bsim/bluetooth/audio/src/tmap_server_test.c
index 61e3405748f..1be606ed61d 100644
--- a/tests/bsim/bluetooth/audio/src/tmap_server_test.c
+++ b/tests/bsim/bluetooth/audio/src/tmap_server_test.c
@@ -7,6 +7,7 @@
 #include <stdint.h>
 
 #include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/audio/tmap.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/gap.h>
diff --git a/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh b/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh
index 4b2bc395429..45bbba49f3f 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh
@@ -25,7 +25,7 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 \
   -testid=broadcast_source -RealEncryption=1 -rs=69 -D=3 \
-  -start_offset=5e3 -argstest subgroup_cnt 1 streams_per_subgroup_cnt 2
+  -start_offset=2e3 -argstest subgroup_cnt 1 streams_per_subgroup_cnt 2
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -D=3 -sim_length=60e6 $@
diff --git a/tests/bsim/bluetooth/audio_samples/bap_unicast_client/src/unicast_client_sample_test.c b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/src/unicast_client_sample_test.c
index da47934e1f9..50aaece72fe 100644
--- a/tests/bsim/bluetooth/audio_samples/bap_unicast_client/src/unicast_client_sample_test.c
+++ b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/src/unicast_client_sample_test.c
@@ -11,7 +11,7 @@
 #include "time_machine.h"
 #include "bstests.h"
 
-#define WAIT_TIME 10 /* Seconds */
+#define WAIT_TIME 20 /* Seconds */
 
 #define PASS_THRESHOLD 100 /* Audio packets */
 

From fb0c502f7d251788754d077eda179d3b8fbf420a Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Fri, 7 Mar 2025 12:37:19 +0100
Subject: [PATCH 2705/2913] [nrf fromtree] Bluetooth: CSIP: Rename
 BT_CSIP_SET_MEMBER_NOTIFIABLE

Renamed BT_CSIP_SET_MEMBER_NOTIFIABLE to
BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE to be more specific.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit 501b95ff9b0974cfa6b14dc72f096f5b6eab2e34)
---
 doc/connectivity/bluetooth/shell/audio/cap.rst  |  2 +-
 doc/connectivity/bluetooth/shell/audio/csip.rst |  2 +-
 doc/releases/migration-guide-4.2.rst            |  6 ++++++
 subsys/bluetooth/audio/Kconfig.csip             |  2 +-
 subsys/bluetooth/audio/csip_set_member.c        | 10 +++++-----
 tests/bsim/bluetooth/audio/prj.conf             |  2 +-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/doc/connectivity/bluetooth/shell/audio/cap.rst b/doc/connectivity/bluetooth/shell/audio/cap.rst
index f7b34930d62..d1fcf583df5 100644
--- a/doc/connectivity/bluetooth/shell/audio/cap.rst
+++ b/doc/connectivity/bluetooth/shell/audio/cap.rst
@@ -40,7 +40,7 @@ Setting a new SIRK
 
 This command can modify the currently used SIRK. To get the new RSI to advertise on air,
 :code:`bt adv-data` or :code:`bt advertise` must be called again to set the new advertising data.
-If :code:`CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE` is enabled, this will also notify connected
+If :code:`CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE` is enabled, this will also notify connected
 clients.
 
 .. code-block:: console
diff --git a/doc/connectivity/bluetooth/shell/audio/csip.rst b/doc/connectivity/bluetooth/shell/audio/csip.rst
index 25e725fa838..f70b52d3502 100644
--- a/doc/connectivity/bluetooth/shell/audio/csip.rst
+++ b/doc/connectivity/bluetooth/shell/audio/csip.rst
@@ -171,7 +171,7 @@ Setting a new SIRK
 
 This command can modify the currently used SIRK. To get the new RSI to advertise on air,
 :code:`bt adv-data` or :code:`bt advertise` must be called again to set the new advertising data.
-If :code:`CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE` is enabled, this will also notify connected
+If :code:`CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE` is enabled, this will also notify connected
 clients.
 
 .. code-block:: console
diff --git a/doc/releases/migration-guide-4.2.rst b/doc/releases/migration-guide-4.2.rst
index 6fca3d64f5c..fdcf721d453 100644
--- a/doc/releases/migration-guide-4.2.rst
+++ b/doc/releases/migration-guide-4.2.rst
@@ -44,6 +44,12 @@ Device Drivers and Devicetree
 Bluetooth
 *********
 
+Bluetooth Audio
+===============
+
+* ``CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE`` has been renamed to
+  :kconfig:option:`CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE``. (:github:`86763``)
+
 Bluetooth Host
 ==============
 
diff --git a/subsys/bluetooth/audio/Kconfig.csip b/subsys/bluetooth/audio/Kconfig.csip
index 7ca25770c0f..9b344e14f35 100644
--- a/subsys/bluetooth/audio/Kconfig.csip
+++ b/subsys/bluetooth/audio/Kconfig.csip
@@ -46,7 +46,7 @@ config BT_CSIP_SET_MEMBER_MAX_INSTANCE_COUNT
 	  Enabling BT_CAP_ACCEPTOR_SET_MEMBER will take one of the allocated
 	  instances.
 
-config BT_CSIP_SET_MEMBER_NOTIFIABLE
+config BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE
 	bool "SIRK notifiable Support"
 	help
 	  This option enables support for clients to be notified on SIRK changes.
diff --git a/subsys/bluetooth/audio/csip_set_member.c b/subsys/bluetooth/audio/csip_set_member.c
index f3e91beb8a5..f4978f0de2f 100644
--- a/subsys/bluetooth/audio/csip_set_member.c
+++ b/subsys/bluetooth/audio/csip_set_member.c
@@ -291,12 +291,12 @@ static ssize_t read_sirk(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 				 sirk, sizeof(*sirk));
 }
 
-#if defined(CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE)
+#if defined(CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE)
 static void sirk_cfg_changed(const struct bt_gatt_attr *attr, uint16_t value)
 {
 	LOG_DBG("value 0x%04x", value);
 }
-#endif /* CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE */
+#endif /* CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE */
 
 static ssize_t read_set_size(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr,
@@ -620,7 +620,7 @@ static struct bt_conn_auth_info_cb auth_callbacks = {
 	.bond_deleted = csip_bond_deleted
 };
 
-#if defined(CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE)
+#if defined(CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE)
 #define BT_CSIS_CHR_SIRK(_csip)                                                                    \
 	BT_AUDIO_CHRC(BT_UUID_CSIS_SIRK, BT_GATT_CHRC_READ | BT_GATT_CHRC_NOTIFY,                  \
 		      BT_GATT_PERM_READ_ENCRYPT, read_sirk, NULL, &_csip),                         \
@@ -629,7 +629,7 @@ static struct bt_conn_auth_info_cb auth_callbacks = {
 #define BT_CSIS_CHR_SIRK(_csip)                                                                    \
 	BT_AUDIO_CHRC(BT_UUID_CSIS_SIRK, BT_GATT_CHRC_READ, BT_GATT_PERM_READ_ENCRYPT, read_sirk,  \
 		      NULL, &_csip)
-#endif /* CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE */
+#endif /* CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE */
 
 #define BT_CSIP_SERVICE_DEFINITION(_csip) {\
 	BT_GATT_PRIMARY_SERVICE(BT_UUID_CSIS), \
@@ -775,7 +775,7 @@ static void notify_cb(struct bt_conn *conn, void *data)
 			       sizeof(svc_inst->set_lock));
 		}
 
-		if (IS_ENABLED(CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE) &&
+		if (IS_ENABLED(CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE) &&
 		    atomic_test_and_clear_bit(client->flags, FLAG_NOTIFY_SIRK)) {
 			notify(svc_inst, conn, BT_UUID_CSIS_SIRK, &svc_inst->sirk,
 			       sizeof(svc_inst->sirk));
diff --git a/tests/bsim/bluetooth/audio/prj.conf b/tests/bsim/bluetooth/audio/prj.conf
index b6775740309..c1aeee542a5 100644
--- a/tests/bsim/bluetooth/audio/prj.conf
+++ b/tests/bsim/bluetooth/audio/prj.conf
@@ -88,7 +88,7 @@ CONFIG_BT_MICP_MIC_CTLR_MAX_AICS_INST=2
 # Coordinated Set Identification
 CONFIG_BT_CSIP_SET_MEMBER=y
 CONFIG_BT_CSIP_SET_MEMBER_TEST_SAMPLE_DATA=y
-CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE=y
+CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE=y
 CONFIG_BT_CSIP_SET_COORDINATOR=y
 CONFIG_BT_CSIP_SET_COORDINATOR_TEST_SAMPLE_DATA=y
 

From 3fef3bd6ec5cc3eb18776de621326ff2eb0ea0bb Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Sun, 9 Mar 2025 22:32:10 +0100
Subject: [PATCH 2706/2913] [nrf fromtree] Bluetooth: CSIP: Add support for
 dynamically setting set size

The set size can now be dynamically set and notified.
The rank is added as a argument in the case that changing
the set size, also affects the device's rank, as ranks
in a coordinated set needs to be continuous.

The set coordinator implementation has been updated
to support receiving the new set size, and providing
this information to the upper layers.

This commit adds a babblesim test for the new API,
as well as a shell command.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
(cherry picked from commit d19abff47665165243c78aa8801ab302968487fa)
---
 .../bluetooth/shell/audio/csip.rst            |  51 ++++++---
 doc/releases/release-notes-4.2.rst            |   2 +
 include/zephyr/bluetooth/audio/csip.h         |  85 ++++++++++++++
 subsys/bluetooth/audio/Kconfig.csip           |   5 +
 subsys/bluetooth/audio/csip_set_coordinator.c |  19 ++-
 subsys/bluetooth/audio/csip_set_member.c      | 108 +++++++++++++++---
 .../audio/shell/csip_set_coordinator.c        |  24 +++-
 .../bluetooth/audio/shell/csip_set_member.c   |  82 +++++++++++--
 tests/bluetooth/shell/audio.conf              |   2 +
 tests/bsim/bluetooth/audio/prj.conf           |   1 +
 .../audio/src/csip_set_coordinator_test.c     |  35 ++++++
 .../audio/src/csip_set_member_test.c          |  93 ++++++++++++++-
 .../bsim/bluetooth/audio/test_scripts/csip.sh |   6 +-
 .../audio/test_scripts/csip_encrypted_sirk.sh |   6 +-
 .../audio/test_scripts/csip_forced_release.sh |   6 +-
 .../audio/test_scripts/csip_new_sirk.sh       |   6 +-
 .../test_scripts/csip_new_size_and_rank.sh    |  31 +++++
 .../audio/test_scripts/csip_no_lock.sh        |   6 +-
 .../audio/test_scripts/csip_no_rank.sh        |   6 +-
 .../audio/test_scripts/csip_no_size.sh        |   2 +-
 20 files changed, 513 insertions(+), 63 deletions(-)
 create mode 100755 tests/bsim/bluetooth/audio/test_scripts/csip_new_size_and_rank.sh

diff --git a/doc/connectivity/bluetooth/shell/audio/csip.rst b/doc/connectivity/bluetooth/shell/audio/csip.rst
index f70b52d3502..27613463442 100644
--- a/doc/connectivity/bluetooth/shell/audio/csip.rst
+++ b/doc/connectivity/bluetooth/shell/audio/csip.rst
@@ -144,15 +144,18 @@ Using the Set Member
 
    csip_set_member --help
    csip_set_member - Bluetooth CSIP set member shell commands
-   Subcommands:
-      register      :Initialize the service and register callbacks [size <int>]
-                     [rank <int>] [not-lockable] [sirk <data>]
-      lock          :Lock the set
-      release       :Release the set [force]
-      sirk          :Set the currently used SIRK <sirk>
-      get_sirk      :Get the currently used SIRK
-      sirk_rsp      :Set the response used in SIRK requests <accept, accept_enc,
-                     reject, oob>
+      Subcommands:
+      register           : Initialize the service and register callbacks [size
+                           <int>] [rank <int>] [not-lockable] [sirk <data>]
+      lock               : Lock the set
+      release            : Release the set [force]
+      sirk               : Set the currently used SIRK <sirk>
+      set_size_and_rank  : Set the currently used size and rank <size> <rank>
+      get_info           : Get service info
+      sirk_rsp           : Set the response used in SIRK requests <accept,
+                           accept_enc, reject, oob>
+
+
 
 Example Usage
 =============
@@ -179,14 +182,32 @@ clients.
    uart:~$ csip_set_member sirk 00112233445566778899aabbccddeeff
    SIRK updated
 
-Getting the current SIRK
+Setting a new set size and rank
+-------------------------------
+
+This command can modify the set size and rank of a service instance.
+This shall be done for all device in the set at the same time,
+and all devices shall have the same set size.
+The rank will be ignored if the set is not lockable, else the rank shall be <= the set size,
+and shall be unique for this device in the set.
+
+.. code-block:: console
+
+   uart:~$ csip_set_member set_size_and_rank 1 1
+   Set size and rank updated to 1 and 1
+
+Getting the current info
 ------------------------
 
-This command can get the currently used SIRK.
+This command can get the currently used set info.
 
 .. code-block:: console
 
-   uart:~$ csip_set_member get_sirk
-   SIRK
-   36 04 9a dc 66 3a a1 a1 |6...f:..
-   1d 9a 2f 41 01 73 3e 01 |../A.s>.
+   uart:~$ csip_set_member get_info
+   Info for 0x2003b0c8
+           SIRK
+   00000000: 20 37 0a 00 95 c4 04 20  00 00 00 00 f1 79 09 00 | 7.....  .....y..|
+           Set size: 2
+           Rank: 1
+           Lockable: true
+           Locked: false
diff --git a/doc/releases/release-notes-4.2.rst b/doc/releases/release-notes-4.2.rst
index c4c73c07da3..2885a7bfeea 100644
--- a/doc/releases/release-notes-4.2.rst
+++ b/doc/releases/release-notes-4.2.rst
@@ -76,6 +76,8 @@ New APIs and options
     * :c:macro:`BT_BAP_ADV_PARAM_BROADCAST_SLOW`
     * :c:macro:`BT_BAP_PER_ADV_PARAM_BROADCAST_FAST`
     * :c:macro:`BT_BAP_PER_ADV_PARAM_BROADCAST_SLOW`
+    * :c:func:`bt_csip_set_member_set_size_and_rank`
+    * :c:func:`bt_csip_set_member_get_info`
 
   * Host
 
diff --git a/include/zephyr/bluetooth/audio/csip.h b/include/zephyr/bluetooth/audio/csip.h
index e5e059d3e68..48540c6f5ee 100644
--- a/include/zephyr/bluetooth/audio/csip.h
+++ b/include/zephyr/bluetooth/audio/csip.h
@@ -32,6 +32,7 @@
 #include <stdint.h>
 
 #include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/gap.h>
@@ -237,6 +238,70 @@ int bt_csip_set_member_sirk(struct bt_csip_set_member_svc_inst *svc_inst,
 int bt_csip_set_member_get_sirk(struct bt_csip_set_member_svc_inst *svc_inst,
 				uint8_t sirk[BT_CSIP_SIRK_SIZE]);
 
+/**
+ * @brief Set a new size and rank for a service instance
+ *
+ * This function can be used to dynamically change the size and rank of a service instance.
+ * It is important to note that a set cannot have multiple devices with the same rank in a set,
+ * and it is up to the caller of this function to ensure that.
+ * Similarly, it is important that the size is updated on all devices in the set at the same time.
+ *
+ * If @kconfig{CONFIG_BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE} is enabled, this will also send a
+ * notification to all connected or bonded clients.
+ *
+ * @param svc_inst The service instance.
+ * @param size The new set size.
+ * @param rank The new rank. Ignored if the @p svc_inst is not lockable.
+ *
+ * @retval -EINVAL @p svc_inst is NULL, @p size is less than 1, @p rank is less than 1 or higher
+ *                 than @p size for a lockable @p svc_inst.
+ * @retval -EALREADY @p size and @p rank are already the provided values.
+ * @retval 0 Success.
+ */
+int bt_csip_set_member_set_size_and_rank(struct bt_csip_set_member_svc_inst *svc_inst, uint8_t size,
+					 uint8_t rank);
+
+/** Struct to hold information about a service instance */
+struct bt_csip_set_member_set_info {
+	/** The 16-octet SIRK */
+	uint8_t sirk[BT_CSIP_SIRK_SIZE];
+
+	/** The set size */
+	uint8_t set_size;
+
+	/**
+	 * @brief The rank
+	 *
+	 * May be 0 if the set is not lockable
+	 */
+	uint8_t rank;
+
+	/** Whether the set is lockable  */
+	bool lockable: 1;
+
+	/** Whether the set is currently locked */
+	bool locked: 1;
+
+	/**
+	 * @brief The address of the client that currently holds the lock
+	 *
+	 * Will be @ref BT_ADDR_LE_NONE if the server holds the lock
+	 */
+	bt_addr_le_t lock_client_addr;
+};
+
+/**
+ * @brief Get information about a service instances
+ *
+ * @param svc_inst The service instance.
+ * @param info Pointer to a struct to store the information in.
+ *
+ * @retval -EINVAL @p svc_inst or @p info is NULL.
+ * @retval 0 Success.
+ */
+int bt_csip_set_member_get_info(const struct bt_csip_set_member_svc_inst *svc_inst,
+				struct bt_csip_set_member_set_info *info);
+
 /**
  * @brief Generate the Resolvable Set Identifier (RSI) value.
  *
@@ -382,6 +447,24 @@ typedef void (*bt_csip_set_coordinator_lock_changed_cb)(
 typedef void (*bt_csip_set_coordinator_sirk_changed_cb)(
 	struct bt_csip_set_coordinator_csis_inst *inst);
 
+/**
+ * @typedef bt_csip_set_coordinator_size_changed_cb
+ * @brief Callback when the size of a set of a connected device changes.
+ *
+ * Since all devices in a set shall have the same set size value.
+ * Each connected device may send the same new size set in a notification,
+ * assuming that the remote device supports notifications of the set size.
+ *
+ * The rank of each device in the set may also change as part of this, so it is advisable to call
+ * bt_csip_set_coordinator_discover() to rediscover and read the characteristic values of the sets
+ * on each device.
+ *
+ * @param inst    The Coordinated Set Identification Service instance that was changed.
+ *                The new size is stored in the @p inst->info.size.
+ */
+typedef void (*bt_csip_set_coordinator_size_changed_cb)(
+	struct bt_conn *conn, const struct bt_csip_set_coordinator_csis_inst *inst);
+
 /**
  * @typedef bt_csip_set_coordinator_ordered_access_cb_t
  * @brief Callback for bt_csip_set_coordinator_ordered_access()
@@ -417,6 +500,8 @@ struct bt_csip_set_coordinator_cb {
 	bt_csip_set_coordinator_lock_changed_cb lock_changed;
 	/** Callback when a set's SIRK has changed */
 	bt_csip_set_coordinator_sirk_changed_cb sirk_changed;
+	/** Callback when a set's size has changed */
+	bt_csip_set_coordinator_size_changed_cb size_changed;
 	/** Callback for the ordered access procedure */
 	bt_csip_set_coordinator_ordered_access_cb_t ordered_access;
 
diff --git a/subsys/bluetooth/audio/Kconfig.csip b/subsys/bluetooth/audio/Kconfig.csip
index 9b344e14f35..b0a09606bcf 100644
--- a/subsys/bluetooth/audio/Kconfig.csip
+++ b/subsys/bluetooth/audio/Kconfig.csip
@@ -51,6 +51,11 @@ config BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE
 	help
 	  This option enables support for clients to be notified on SIRK changes.
 
+config BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE
+	bool "Set Size notifiable support"
+	help
+	  This option enables support for clients to be notified on Set Size changes.
+
 endif # BT_CSIP_SET_MEMBER
 
 #################### Coordinated Set Identification Client ####################
diff --git a/subsys/bluetooth/audio/csip_set_coordinator.c b/subsys/bluetooth/audio/csip_set_coordinator.c
index a56ee7d5456..e5f29b9526c 100644
--- a/subsys/bluetooth/audio/csip_set_coordinator.c
+++ b/subsys/bluetooth/audio/csip_set_coordinator.c
@@ -317,6 +317,17 @@ static void sirk_changed(struct bt_csip_set_coordinator_csis_inst *inst)
 	}
 }
 
+static void size_changed(struct bt_conn *conn, struct bt_csip_set_coordinator_csis_inst *inst)
+{
+	struct bt_csip_set_coordinator_cb *listener;
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&csip_set_coordinator_cbs, listener, _node) {
+		if (listener->size_changed != NULL) {
+			listener->size_changed(conn, inst);
+		}
+	}
+}
+
 static void release_set_complete(int err)
 {
 	struct bt_csip_set_coordinator_cb *listener;
@@ -473,17 +484,19 @@ static uint8_t size_notify_func(struct bt_conn *conn,
 
 	if (svc_inst != NULL) {
 		if (length == sizeof(set_size)) {
-			struct bt_csip_set_coordinator_inst *client;
 			struct bt_csip_set_coordinator_set_info *set_info;
+			struct bt_csip_set_coordinator_csis_inst *inst;
+			struct bt_csip_set_coordinator_inst *client;
 
 			client = &client_insts[bt_conn_index(conn)];
-			set_info = &client->set_member.insts[svc_inst->idx].info;
+			inst = &client->set_member.insts[svc_inst->idx];
+			set_info = &inst->info;
 
 			(void)memcpy(&set_size, data, length);
 			LOG_DBG("Set size updated from %u to %u", set_info->set_size, set_size);
 
 			set_info->set_size = set_size;
-			/* TODO: Notify app */
+			size_changed(conn, inst);
 		} else {
 			LOG_DBG("Invalid length %u", length);
 		}
diff --git a/subsys/bluetooth/audio/csip_set_member.c b/subsys/bluetooth/audio/csip_set_member.c
index f4978f0de2f..d86d54c2d63 100644
--- a/subsys/bluetooth/audio/csip_set_member.c
+++ b/subsys/bluetooth/audio/csip_set_member.c
@@ -57,6 +57,7 @@ enum csip_flag {
 	FLAG_ACTIVE,
 	FLAG_NOTIFY_LOCK,
 	FLAG_NOTIFY_SIRK,
+	FLAG_NOTIFY_SIZE,
 	FLAG_NUM,
 };
 
@@ -72,6 +73,7 @@ struct bt_csip_set_member_svc_inst {
 	uint8_t set_size;
 	uint8_t set_lock;
 	uint8_t rank;
+	bool lockable;
 	struct bt_csip_set_member_cb *cb;
 	struct k_work_delayable set_lock_timer;
 	bt_addr_le_t lock_client_addr;
@@ -80,7 +82,6 @@ struct bt_csip_set_member_svc_inst {
 };
 
 static struct bt_csip_set_member_svc_inst svc_insts[CONFIG_BT_CSIP_SET_MEMBER_MAX_INSTANCE_COUNT];
-static bt_addr_le_t server_dummy_addr; /* 0'ed address */
 
 static void deferred_nfy_work_handler(struct k_work *work);
 
@@ -93,8 +94,7 @@ static bool is_last_client_to_write(const struct bt_csip_set_member_svc_inst *sv
 		return bt_addr_le_eq(bt_conn_get_dst(conn),
 				     &svc_inst->lock_client_addr);
 	} else {
-		return bt_addr_le_eq(&server_dummy_addr,
-				     &svc_inst->lock_client_addr);
+		return bt_addr_le_eq(BT_ADDR_LE_NONE, &svc_inst->lock_client_addr);
 	}
 }
 
@@ -311,11 +311,13 @@ static ssize_t read_set_size(struct bt_conn *conn,
 				 sizeof(svc_inst->set_size));
 }
 
+#if defined(CONFIG_BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE)
 static void set_size_cfg_changed(const struct bt_gatt_attr *attr,
 				 uint16_t value)
 {
 	LOG_DBG("value 0x%04x", value);
 }
+#endif /* CONFIG_BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE */
 
 static ssize_t read_set_lock(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr,
@@ -373,8 +375,7 @@ static uint8_t set_lock(struct bt_conn *conn,
 		(void)k_work_reschedule(&svc_inst->set_lock_timer,
 					CSIP_SET_LOCK_TIMER_VALUE);
 	} else {
-		(void)memset(&svc_inst->lock_client_addr, 0,
-			     sizeof(svc_inst->lock_client_addr));
+		bt_addr_le_copy(&svc_inst->lock_client_addr, BT_ADDR_LE_NONE);
 		(void)k_work_cancel_delayable(&svc_inst->set_lock_timer);
 	}
 
@@ -495,8 +496,7 @@ static void handle_csip_disconnect(struct bt_csip_set_member_svc_inst *svc_inst,
 {
 	LOG_DBG("Non-bonded device");
 	if (is_last_client_to_write(svc_inst, conn)) {
-		(void)memset(&svc_inst->lock_client_addr, 0,
-			     sizeof(svc_inst->lock_client_addr));
+		bt_addr_le_copy(&svc_inst->lock_client_addr, BT_ADDR_LE_NONE);
 		svc_inst->set_lock = BT_CSIP_RELEASE_VALUE;
 		notify_clients(svc_inst, NULL, FLAG_NOTIFY_LOCK);
 
@@ -631,14 +631,21 @@ static struct bt_conn_auth_info_cb auth_callbacks = {
 		      NULL, &_csip)
 #endif /* CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE */
 
+#if defined(CONFIG_BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE)
+#define BT_CSIS_CHR_SIZE(_csip)                                                                    \
+	BT_AUDIO_CHRC(BT_UUID_CSIS_SET_SIZE, BT_GATT_CHRC_READ | BT_GATT_CHRC_NOTIFY,              \
+		      BT_GATT_PERM_READ_ENCRYPT, read_set_size, NULL, &_csip),                     \
+		BT_AUDIO_CCC(set_size_cfg_changed)
+#else
+#define BT_CSIS_CHR_SIZE(_csip)                                                                    \
+	BT_AUDIO_CHRC(BT_UUID_CSIS_SET_SIZE, BT_GATT_CHRC_READ, BT_GATT_PERM_READ_ENCRYPT,         \
+		      read_set_size, NULL, &_csip)
+#endif /* CONFIG_BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE */
+
 #define BT_CSIP_SERVICE_DEFINITION(_csip) {\
 	BT_GATT_PRIMARY_SERVICE(BT_UUID_CSIS), \
 	BT_CSIS_CHR_SIRK(_csip), \
-	BT_AUDIO_CHRC(BT_UUID_CSIS_SET_SIZE, \
-		      BT_GATT_CHRC_READ | BT_GATT_CHRC_NOTIFY, \
-		      BT_GATT_PERM_READ_ENCRYPT, \
-		      read_set_size, NULL, &_csip), \
-	BT_AUDIO_CCC(set_size_cfg_changed), \
+	BT_CSIS_CHR_SIZE(_csip), \
 	BT_AUDIO_CHRC(BT_UUID_CSIS_SET_LOCK, \
 		      BT_GATT_CHRC_READ | BT_GATT_CHRC_NOTIFY | BT_GATT_CHRC_WRITE, \
 		      BT_GATT_PERM_READ_ENCRYPT | BT_GATT_PERM_WRITE_ENCRYPT, \
@@ -780,6 +787,12 @@ static void notify_cb(struct bt_conn *conn, void *data)
 			notify(svc_inst, conn, BT_UUID_CSIS_SIRK, &svc_inst->sirk,
 			       sizeof(svc_inst->sirk));
 		}
+
+		if (IS_ENABLED(CONFIG_BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE) &&
+		    atomic_test_and_clear_bit(client->flags, FLAG_NOTIFY_SIZE)) {
+			notify(svc_inst, conn, BT_UUID_CSIS_SET_SIZE, &svc_inst->set_size,
+			       sizeof(svc_inst->set_size));
+		}
 	}
 }
 
@@ -877,6 +890,8 @@ int bt_csip_set_member_register(const struct bt_csip_set_member_register_param *
 	inst->set_lock = BT_CSIP_RELEASE_VALUE;
 	inst->sirk.type = BT_CSIP_SIRK_TYPE_PLAIN;
 	inst->cb = param->cb;
+	inst->lockable = param->lockable;
+	bt_addr_le_copy(&inst->lock_client_addr, BT_ADDR_LE_NONE);
 
 	if (IS_ENABLED(CONFIG_BT_CSIP_SET_MEMBER_TEST_SAMPLE_DATA)) {
 		uint8_t test_sirk[] = {
@@ -928,9 +943,13 @@ int bt_csip_set_member_sirk(struct bt_csip_set_member_svc_inst *svc_inst,
 		return -EINVAL;
 	}
 
-	memcpy(svc_inst->sirk.value, sirk, BT_CSIP_SIRK_SIZE);
+	if (memcmp(sirk, svc_inst->sirk.value, BT_CSIP_SIRK_SIZE) != 0) {
+		memcpy(svc_inst->sirk.value, sirk, BT_CSIP_SIRK_SIZE);
 
-	notify_clients(svc_inst, NULL, FLAG_NOTIFY_SIRK);
+		if (IS_ENABLED(CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE)) {
+			notify_clients(svc_inst, NULL, FLAG_NOTIFY_SIRK);
+		}
+	}
 
 	return 0;
 }
@@ -953,6 +972,67 @@ int bt_csip_set_member_get_sirk(struct bt_csip_set_member_svc_inst *svc_inst,
 	return 0;
 }
 
+int bt_csip_set_member_set_size_and_rank(struct bt_csip_set_member_svc_inst *svc_inst, uint8_t size,
+					 uint8_t rank)
+{
+	if (svc_inst == NULL) {
+		LOG_DBG("svc_inst is NULL");
+		return -EINVAL;
+	}
+
+	if (size < 1U) {
+		LOG_DBG("Invalid set size %u", size);
+		return -EINVAL;
+	}
+
+	if (!svc_inst->lockable && rank != 0U) {
+		LOG_DBG("Invalid rank %u for non-lockable service", rank);
+		return -EINVAL;
+	}
+
+	if (svc_inst->lockable && !IN_RANGE(rank, 1U, size)) {
+		LOG_DBG("Invalid rank: %u for size %u", rank, size);
+		return -EINVAL;
+	}
+
+	if (svc_inst->set_size == size && svc_inst->rank == rank) {
+		LOG_DBG("Set size %u and rank %u is already set", size, rank);
+		return -EALREADY;
+	}
+
+	svc_inst->set_size = size;
+	svc_inst->rank = svc_inst->lockable ? rank : 0U;
+
+	if (IS_ENABLED(CONFIG_BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE)) {
+		notify_clients(svc_inst, NULL, FLAG_NOTIFY_SIZE);
+	}
+
+	return 0;
+}
+
+int bt_csip_set_member_get_info(const struct bt_csip_set_member_svc_inst *svc_inst,
+				struct bt_csip_set_member_set_info *info)
+{
+	if (svc_inst == NULL) {
+		LOG_DBG("svc_inst is NULL");
+		return -EINVAL;
+	}
+
+	if (info == NULL) {
+		LOG_DBG("info is NULL");
+		return -EINVAL;
+	}
+
+	info->lockable = svc_inst->lockable;
+	info->locked = svc_inst->set_lock == BT_CSIP_LOCK_VALUE;
+	info->rank = svc_inst->rank;
+	info->set_size = svc_inst->set_size;
+	memcpy(info->sirk, svc_inst->sirk.value, BT_CSIP_SIRK_SIZE);
+	bt_addr_le_copy(&info->lock_client_addr, &svc_inst->lock_client_addr);
+
+	return 0;
+}
+
 int bt_csip_set_member_lock(struct bt_csip_set_member_svc_inst *svc_inst,
 			    bool lock, bool force)
 {
diff --git a/subsys/bluetooth/audio/shell/csip_set_coordinator.c b/subsys/bluetooth/audio/shell/csip_set_coordinator.c
index c2bb032f5b5..72baa43d6a8 100644
--- a/subsys/bluetooth/audio/shell/csip_set_coordinator.c
+++ b/subsys/bluetooth/audio/shell/csip_set_coordinator.c
@@ -151,11 +151,33 @@ static void csip_set_coordinator_ordered_access_cb(
 	}
 }
 
+static void csip_set_coordinator_lock_changed_cb(struct bt_csip_set_coordinator_csis_inst *inst,
+						 bool locked)
+{
+	bt_shell_print("Inst %p %s\n", inst, locked ? "locked" : "released");
+}
+
+static void csip_set_coordinator_sirk_changed_cb(struct bt_csip_set_coordinator_csis_inst *inst)
+{
+	bt_shell_print("Inst %p SIRK changed\n", inst);
+	bt_shell_hexdump(inst->info.sirk, BT_CSIP_SIRK_SIZE);
+}
+
+static void
+csip_set_coordinator_size_changed_cb(struct bt_conn *conn,
+				     const struct bt_csip_set_coordinator_csis_inst *inst)
+{
+	bt_shell_print("Inst %p size changed: %u\n", inst, inst->info.set_size);
+}
+
 static struct bt_csip_set_coordinator_cb cbs = {
 	.lock_set = csip_set_coordinator_lock_set_cb,
 	.release_set = csip_set_coordinator_release_set_cb,
 	.discover = csip_discover_cb,
-	.ordered_access = csip_set_coordinator_ordered_access_cb
+	.ordered_access = csip_set_coordinator_ordered_access_cb,
+	.lock_changed = csip_set_coordinator_lock_changed_cb,
+	.sirk_changed = csip_set_coordinator_sirk_changed_cb,
+	.size_changed = csip_set_coordinator_size_changed_cb,
 };
 
 static bool csip_set_coordinator_oap_cb(const struct bt_csip_set_coordinator_set_info *set_info,
diff --git a/subsys/bluetooth/audio/shell/csip_set_member.c b/subsys/bluetooth/audio/shell/csip_set_member.c
index 23078149767..03a19820aba 100644
--- a/subsys/bluetooth/audio/shell/csip_set_member.c
+++ b/subsys/bluetooth/audio/shell/csip_set_member.c
@@ -199,8 +199,65 @@ static int cmd_csip_set_member_sirk(const struct shell *sh, size_t argc, char *a
 	return 0;
 }
 
-static int cmd_csip_set_member_get_sirk(const struct shell *sh, size_t argc, char *argv[])
+static int cmd_csip_set_member_set_size_and_rank(const struct shell *sh, size_t argc, char *argv[])
 {
+	struct bt_csip_set_member_set_info info;
+	unsigned long set_size;
+	unsigned long rank;
+	int err = 0;
+
+	if (svc_inst == NULL) {
+		shell_error(sh, "CSIP set member not registered yet");
+
+		return -ENOEXEC;
+	}
+
+	set_size = shell_strtoul(argv[1], 0, &err);
+	if (err != 0) {
+		shell_error(sh, "Could not parse set size from %s: %d", argv[1], err);
+
+		return -ENOEXEC;
+	}
+
+	rank = shell_strtoul(argv[2], 0, &err);
+	if (err != 0) {
+		shell_error(sh, "Could not parse rank from %s: %d", argv[2], err);
+
+		return -ENOEXEC;
+	}
+
+	err = bt_csip_set_member_get_info(svc_inst, &info);
+	if (err != 0) {
+		shell_error(sh, "Failed to get SIRK: %d", err);
+		return -ENOEXEC;
+	}
+
+	if (!IN_RANGE(set_size, 1, UINT8_MAX)) {
+		shell_error(sh, "Invalid set size: %lu", set_size);
+
+		return -ENOEXEC;
+	}
+
+	if (info.lockable && !IN_RANGE(rank, 1, rank)) {
+		shell_error(sh, "Invalid rank: %lu", rank);
+
+		return -ENOEXEC;
+	}
+
+	err = bt_csip_set_member_set_size_and_rank(svc_inst, (uint8_t)set_size, (uint8_t)rank);
+	if (err != 0) {
+		shell_error(sh, "Failed to set set size and rank: %d", err);
+		return -ENOEXEC;
+	}
+
+	shell_print(sh, "Set size and rank updated to %lu and %lu", set_size, rank);
+
+	return 0;
+}
+
+static int cmd_csip_set_member_get_info(const struct shell *sh, size_t argc, char *argv[])
+{
+	struct bt_csip_set_member_set_info info;
 	uint8_t sirk[BT_CSIP_SIRK_SIZE];
 	int err;
 
@@ -210,14 +267,25 @@ static int cmd_csip_set_member_get_sirk(const struct shell *sh, size_t argc, cha
 		return -ENOEXEC;
 	}
 
-	err = bt_csip_set_member_get_sirk(svc_inst, sirk);
+	err = bt_csip_set_member_get_info(svc_inst, &info);
 	if (err != 0) {
 		shell_error(sh, "Failed to get SIRK: %d", err);
 		return -ENOEXEC;
 	}
 
-	shell_print(sh, "SIRK");
+	shell_print(sh, "Info for %p", svc_inst);
+	shell_print(sh, "\tSIRK");
 	shell_hexdump(sh, sirk, sizeof(sirk));
+	shell_print(sh, "\tSet size: %u", info.set_size);
+	shell_print(sh, "\tRank: %u", info.rank);
+	shell_print(sh, "\tLockable: %s", info.lockable ? "true" : "false");
+	shell_print(sh, "\tLocked: %s", info.locked ? "true" : "false");
+	if (info.locked) {
+		char addr_str[BT_ADDR_LE_STR_LEN];
+
+		bt_addr_le_to_str(&info.lock_client_addr, addr_str, sizeof(addr_str));
+		shell_print(sh, "\tLock owner: %s", addr_str);
+	}
 
 	return 0;
 }
@@ -299,14 +367,14 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 	SHELL_CMD_ARG(release, NULL, "Release the set [force]", cmd_csip_set_member_release, 1, 1),
 	SHELL_CMD_ARG(sirk, NULL, "Set the currently used SIRK <sirk>", cmd_csip_set_member_sirk, 2,
 		      0),
-	SHELL_CMD_ARG(get_sirk, NULL, "Get the currently used SIRK", cmd_csip_set_member_get_sirk,
-		      1, 0),
+	SHELL_CMD_ARG(set_size_and_rank, NULL, "Set the currently used size and rank <size> <rank>",
+		      cmd_csip_set_member_set_size_and_rank, 3, 0),
+	SHELL_CMD_ARG(get_info, NULL, "Get service info", cmd_csip_set_member_get_info, 1, 0),
 	SHELL_CMD_ARG(sirk_rsp, NULL,
 		      "Set the response used in SIRK requests "
 		      "<accept, accept_enc, reject, oob>",
 		      cmd_csip_set_member_sirk_rsp, 2, 0),
-	SHELL_SUBCMD_SET_END
-);
+	SHELL_SUBCMD_SET_END);
 
 SHELL_CMD_ARG_REGISTER(csip_set_member, &csip_set_member_cmds,
 		       "Bluetooth CSIP set member shell commands",
diff --git a/tests/bluetooth/shell/audio.conf b/tests/bluetooth/shell/audio.conf
index 2f7e82b7817..697f3be4352 100644
--- a/tests/bluetooth/shell/audio.conf
+++ b/tests/bluetooth/shell/audio.conf
@@ -117,6 +117,8 @@ CONFIG_BT_MICP_MIC_CTLR_MAX_AICS_INST=1
 
 # Coordinated Set Identification
 CONFIG_BT_CSIP_SET_MEMBER=y
+CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE=y
+CONFIG_BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE=y
 CONFIG_BT_CSIP_SET_COORDINATOR=y
 CONFIG_BT_CSIP_SET_COORDINATOR_MAX_CSIS_INSTANCES=2
 
diff --git a/tests/bsim/bluetooth/audio/prj.conf b/tests/bsim/bluetooth/audio/prj.conf
index c1aeee542a5..aa9911e5be6 100644
--- a/tests/bsim/bluetooth/audio/prj.conf
+++ b/tests/bsim/bluetooth/audio/prj.conf
@@ -89,6 +89,7 @@ CONFIG_BT_MICP_MIC_CTLR_MAX_AICS_INST=2
 CONFIG_BT_CSIP_SET_MEMBER=y
 CONFIG_BT_CSIP_SET_MEMBER_TEST_SAMPLE_DATA=y
 CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE=y
+CONFIG_BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE=y
 CONFIG_BT_CSIP_SET_COORDINATOR=y
 CONFIG_BT_CSIP_SET_COORDINATOR_TEST_SAMPLE_DATA=y
 
diff --git a/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c b/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c
index 44121ef6bdb..294002ec307 100644
--- a/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c
+++ b/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c
@@ -40,6 +40,7 @@ static volatile bool ordered_access_locked;
 static volatile bool ordered_access_unlocked;
 static const struct bt_csip_set_coordinator_csis_inst *primary_inst;
 CREATE_FLAG(flag_sirk_changed);
+CREATE_FLAG(flag_size_changed);
 
 static uint8_t connected_member_count;
 static uint8_t members_found;
@@ -139,6 +140,14 @@ static void csip_sirk_changed_cb(struct bt_csip_set_coordinator_csis_inst *inst)
 	SET_FLAG(flag_sirk_changed);
 }
 
+static void csip_size_changed_cb(struct bt_conn *conn,
+				 const struct bt_csip_set_coordinator_csis_inst *inst)
+{
+	printk("Inst %p size changed: %u\n", inst, inst->info.set_size);
+
+	SET_FLAG(flag_size_changed);
+}
+
 static void csip_set_coordinator_ordered_access_cb(
 	const struct bt_csip_set_coordinator_set_info *set_info, int err,
 	bool locked,  struct bt_csip_set_coordinator_set_member *member)
@@ -160,6 +169,7 @@ static struct bt_csip_set_coordinator_cb cbs = {
 	.discover = csip_discover_cb,
 	.lock_changed = csip_lock_changed_cb,
 	.sirk_changed = csip_sirk_changed_cb,
+	.size_changed = csip_size_changed_cb,
 	.ordered_access = csip_set_coordinator_ordered_access_cb,
 };
 
@@ -514,6 +524,24 @@ static void test_new_sirk(void)
 	PASS("All members disconnected\n");
 }
 
+static void test_new_size_and_rank(void)
+{
+	init();
+	connect_set();
+
+	backchannel_sync_send_all();
+	backchannel_sync_wait_all();
+
+	/* We won't get a new rank in a notification. For this test we only verify that we get a new
+	 * size
+	 */
+	WAIT_FOR_FLAG(flag_size_changed);
+
+	disconnect_set();
+
+	PASS("All members disconnected\n");
+}
+
 static void test_args(int argc, char *argv[])
 {
 	for (int argn = 0; argn < argc; argn++) {
@@ -546,6 +574,13 @@ static const struct bst_test_instance test_connect[] = {
 		.test_main_f = test_new_sirk,
 		.test_args_f = test_args,
 	},
+	{
+		.test_id = "csip_set_coordinator_new_size_and_rank",
+		.test_pre_init_f = test_init,
+		.test_tick_f = test_tick,
+		.test_main_f = test_new_size_and_rank,
+		.test_args_f = test_args,
+	},
 	BSTEST_END_MARKER,
 };
 
diff --git a/tests/bsim/bluetooth/audio/src/csip_set_member_test.c b/tests/bsim/bluetooth/audio/src/csip_set_member_test.c
index e09f96060f4..faa7dbdaff5 100644
--- a/tests/bsim/bluetooth/audio/src/csip_set_member_test.c
+++ b/tests/bsim/bluetooth/audio/src/csip_set_member_test.c
@@ -24,12 +24,10 @@ extern enum bst_result_t bst_result;
 static volatile bool g_locked;
 static uint8_t sirk_read_req_rsp = BT_CSIP_READ_SIRK_REQ_RSP_ACCEPT;
 struct bt_csip_set_member_register_param param = {
-	.set_size = 3,
-	.rank = 1,
 	.lockable = true,
 	/* Using the CSIS test sample SIRK */
-	.sirk = { 0xcd, 0xcc, 0x72, 0xdd, 0x86, 0x8c, 0xcd, 0xce,
-		  0x22, 0xfd, 0xa1, 0x21, 0x09, 0x7d, 0x7d, 0x45 },
+	.sirk = {0xcd, 0xcc, 0x72, 0xdd, 0x86, 0x8c, 0xcd, 0xce, 0x22, 0xfd, 0xa1, 0x21, 0x09, 0x7d,
+		 0x7d, 0x45},
 };
 
 static void csip_lock_changed_cb(struct bt_conn *conn,
@@ -108,6 +106,56 @@ static void test_sirk(void)
 	printk("New SIRK correctly set and retrieved\n");
 }
 
+static void update_set_size_and_rank(void)
+{
+	struct bt_csip_set_member_set_info info;
+	uint8_t old_set_size;
+	uint8_t old_rank;
+	uint8_t new_set_size;
+	uint8_t new_rank;
+	int err;
+
+	err = bt_csip_set_member_get_info(svc_inst, &info);
+	if (err != 0) {
+		FAIL("Failed to get SIRK: %d\n", err);
+		return;
+	}
+
+	/* Simulate a new device being added as rank 1 to the set, making the set size increase by 1
+	 * and this device's rank increase by 1
+	 */
+	old_set_size = info.set_size;
+	old_rank = info.rank;
+	new_set_size = old_set_size + 1U;
+	new_rank = old_rank + 1U;
+
+	printk("Setting new SIRK\n");
+	err = bt_csip_set_member_set_size_and_rank(svc_inst, new_set_size, new_rank);
+	if (err != 0) {
+		FAIL("Failed to set new size and rank: %d\n", err);
+		return;
+	}
+
+	printk("Getting new SIRK\n");
+	err = bt_csip_set_member_get_info(svc_inst, &info);
+	if (err != 0) {
+		FAIL("Failed to get SIRK: %d\n", err);
+		return;
+	}
+
+	if (info.set_size != new_set_size) {
+		FAIL("Unexpected set size %u != %u\n", info.set_size, new_set_size);
+		return;
+	}
+
+	if (info.rank != new_rank) {
+		FAIL("Unexpected rank %u != %u\n", info.rank, new_rank);
+		return;
+	}
+
+	printk("New size correctly set and retrieved\n");
+}
+
 static void test_main(void)
 {
 	int err;
@@ -210,6 +258,36 @@ static void test_new_sirk(void)
 	PASS("CSIP Set member passed: Client successfully disconnected\n");
 }
 
+static void test_new_set_size_and_rank(void)
+{
+	int err;
+
+	err = bt_enable(bt_ready);
+
+	if (err != 0) {
+		FAIL("Bluetooth init failed (err %d)\n", err);
+		return;
+	}
+
+	WAIT_FOR_FLAG(flag_connected);
+
+	backchannel_sync_send_all();
+	backchannel_sync_wait_all();
+
+	update_set_size_and_rank();
+
+	WAIT_FOR_UNSET_FLAG(flag_connected);
+
+	err = bt_csip_set_member_unregister(svc_inst);
+	if (err != 0) {
+		FAIL("Could not unregister CSIP (err %d)\n", err);
+		return;
+	}
+	svc_inst = NULL;
+
+	PASS("CSIP Set member passed: Client successfully disconnected\n");
+}
+
 static void test_args(int argc, char *argv[])
 {
 	for (size_t argn = 0; argn < argc; argn++) {
@@ -267,6 +345,13 @@ static const struct bst_test_instance test_connect[] = {
 		.test_main_f = test_new_sirk,
 		.test_args_f = test_args,
 	},
+	{
+		.test_id = "csip_set_member_new_size_and_rank",
+		.test_pre_init_f = test_init,
+		.test_tick_f = test_tick,
+		.test_main_f = test_new_set_size_and_rank,
+		.test_args_f = test_args,
+	},
 	BSTEST_END_MARKER,
 };
 
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip.sh b/tests/bsim/bluetooth/audio/test_scripts/csip.sh
index dc64d437516..99c88c6eb11 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip.sh
@@ -22,15 +22,15 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member \
-  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1 size 3
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member \
-  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2 size 3
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member \
-  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3 size 3
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_encrypted_sirk.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_encrypted_sirk.sh
index 7c38e405eac..b4898ee8958 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip_encrypted_sirk.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_encrypted_sirk.sh
@@ -22,15 +22,15 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member_enc \
-  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1 size 3
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member_enc \
-  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2 size 3
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member_enc \
-  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3 size 3
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_forced_release.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_forced_release.sh
index d02329b3c75..f151a37e933 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip_forced_release.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_forced_release.sh
@@ -22,15 +22,15 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member \
-  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1 size 3
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member \
-  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2 size 3
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member_release \
-  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3 size 3
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_new_sirk.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_new_sirk.sh
index 8502c802789..b5e98a0b147 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip_new_sirk.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_new_sirk.sh
@@ -22,15 +22,15 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member_new_sirk \
-  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1 size 3
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member_new_sirk \
-  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2 size 3
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member_new_sirk \
-  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3 size 3
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_new_size_and_rank.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_new_size_and_rank.sh
new file mode 100755
index 00000000000..3488018cc09
--- /dev/null
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_new_size_and_rank.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# CSIP test where a set coordinator connects a set members and then waits for a set size
+# notification
+
+source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
+
+VERBOSITY_LEVEL=2
+EXECUTE_TIMEOUT=20
+
+cd ${BSIM_OUT_PATH}/bin
+
+SIMULATION_ID="csip_new_size"
+
+Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
+  -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=csip_set_coordinator_new_size_and_rank \
+  -RealEncryption=1 -rs=10 -D=2
+
+Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
+  -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member_new_size_and_rank \
+  -RealEncryption=1 -rs=20 -D=2 -argstest rank 1 size 1
+
+# Simulation time should be larger than the WAIT_TIME in common.h
+Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
+  -D=2 -sim_length=20e6 $@
+
+wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_no_lock.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_no_lock.sh
index 5a3a807cd0a..453409cb574 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip_no_lock.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_no_lock.sh
@@ -21,15 +21,15 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member \
-  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1 not-lockable
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1 size 3 not-lockable
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member \
-  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2 not-lockable
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2 size 3 not-lockable
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member \
-  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3 not-lockable
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3 size 3 not-lockable
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_no_rank.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_no_rank.sh
index 61b2cac707a..bb82e2a0a41 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip_no_rank.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_no_rank.sh
@@ -21,15 +21,15 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member \
-  -RealEncryption=1 -rs=20 -D=4 -argstest rank 0 not-lockable
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 0 size 3 not-lockable
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member \
-  -RealEncryption=1 -rs=30 -D=4 -argstest rank 0 not-lockable
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 0 size 3 not-lockable
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member \
-  -RealEncryption=1 -rs=40 -D=4 -argstest rank 0 not-lockable
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 0 size 3 not-lockable
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_no_size.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_no_size.sh
index dea6ac9874d..75a71bc3a41 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip_no_size.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_no_size.sh
@@ -29,7 +29,7 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member \
-  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3s size 0
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3 size 0
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \

From 0be38cf51b12c9f9699fa3a45c74ad25997a8eb5 Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Wed, 22 Jan 2025 15:47:59 +0000
Subject: [PATCH 2707/2913] [nrf fromtree] modules: mbedtls: Provide
 CONFIG_MBEDTLS_ASN1_PARSE_C

The commit exports control of MBEDTLS_ASN1_PARSE_C, in mbedTLS
module, via Kconfig.
This allows applications to use ASN1 parser independently from
other functions.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit e8589d232b0d050edbb8709aab8391a50eb0b3b1)
---
 modules/mbedtls/Kconfig.tls-generic          | 4 ++++
 modules/mbedtls/configs/config-tls-generic.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/mbedtls/Kconfig.tls-generic b/modules/mbedtls/Kconfig.tls-generic
index f2e73ffaf25..f19171be33d 100644
--- a/modules/mbedtls/Kconfig.tls-generic
+++ b/modules/mbedtls/Kconfig.tls-generic
@@ -149,6 +149,7 @@ config MBEDTLS_ECDH_C
 config MBEDTLS_ECDSA_C
 	bool "Elliptic curve DSA library"
 	depends on MBEDTLS_ECP_C
+	select MBEDTLS_ASN1_PARSE_C
 
 config MBEDTLS_ECJPAKE_C
 	bool "Elliptic curve J-PAKE library"
@@ -402,6 +403,9 @@ endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
 config MBEDTLS_GENPRIME_ENABLED
 	bool "prime-number generation code."
 
+config MBEDTLS_ASN1_PARSE_C
+	bool "Support for ASN1 parser functions"
+
 config MBEDTLS_PEM_CERTIFICATE_FORMAT
 	bool "Support for PEM certificate format"
 	help
diff --git a/modules/mbedtls/configs/config-tls-generic.h b/modules/mbedtls/configs/config-tls-generic.h
index 9d46e3be482..a605257668d 100644
--- a/modules/mbedtls/configs/config-tls-generic.h
+++ b/modules/mbedtls/configs/config-tls-generic.h
@@ -431,7 +431,7 @@
 #define MBEDTLS_PK_C
 #endif
 
-#if defined(MBEDTLS_ECDSA_C) || defined(MBEDTLS_X509_USE_C)
+#if defined(CONFIG_MBEDTLS_ASN1_PARSE_C) || defined(MBEDTLS_X509_USE_C)
 #define MBEDTLS_ASN1_PARSE_C
 #endif
 

From 8b5f3489c3d3e64723c7538e3346a7e0c1c9f3cf Mon Sep 17 00:00:00 2001
From: Dominik Ermel <dominik.ermel@nordicsemi.no>
Date: Fri, 14 Mar 2025 17:39:41 +0000
Subject: [PATCH 2708/2913] [nrf fromlist] modules: mbedtls: Expose
 MBEDTLS_PLATFORM_NO_STD_FUNCTIONS

The commit adds Kconfig options that allows users to select
 - MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
 - MBEDTLS_PLATFORM_SNPRINTF_ALT
allowing Mbed TLS to use alternative definitions of STD functions.

Upstream PR #: 87135

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
---
 modules/mbedtls/Kconfig.tls-generic          | 22 ++++++++++++++++++++
 modules/mbedtls/configs/config-tls-generic.h |  8 +++++++
 2 files changed, 30 insertions(+)

diff --git a/modules/mbedtls/Kconfig.tls-generic b/modules/mbedtls/Kconfig.tls-generic
index f19171be33d..9214d3878ca 100644
--- a/modules/mbedtls/Kconfig.tls-generic
+++ b/modules/mbedtls/Kconfig.tls-generic
@@ -406,6 +406,28 @@ config MBEDTLS_GENPRIME_ENABLED
 config MBEDTLS_ASN1_PARSE_C
 	bool "Support for ASN1 parser functions"
 
+config MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+	bool "Remove usage of standard libc functions"
+	help
+	  This prevents Mbed TLS from linking against the following standard functions
+	  from libc: `snprintf`, `vsnprintf`, `printf`, `fprintf`, `calloc`, `free`, `setbuf`, `exit`
+	  and `time`. By default Mbed TLS will use stub functions for all these functions.
+	  These stubs are just meant to return successfully, but they don't implement
+	  the required functionality.
+	  Users can individually override each of these stubs by calling
+	  `mbedtls_platform_set_xxx()` to set the their implementation of `xxx()` function
+	  at runtime.
+
+if MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+
+config MBEDTLS_PLATFORM_SNPRINTF_ALT
+	bool "Allow setting custom snprintf at run-time"
+	help
+	  Allow setting a custom `snprintf()` function with `mbedtls_platform_set_snprintf()`.
+	  Include `mbedtls/platform.h` for the prototype of this function.
+
+endif # MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+
 config MBEDTLS_PEM_CERTIFICATE_FORMAT
 	bool "Support for PEM certificate format"
 	help
diff --git a/modules/mbedtls/configs/config-tls-generic.h b/modules/mbedtls/configs/config-tls-generic.h
index a605257668d..1165314f118 100644
--- a/modules/mbedtls/configs/config-tls-generic.h
+++ b/modules/mbedtls/configs/config-tls-generic.h
@@ -23,6 +23,14 @@
 #define MBEDTLS_PLATFORM_ZEROIZE_ALT
 #endif
 
+#if defined(CONFIG_MBEDTLS_PLATFORM_NO_STD_FUNCTIONS)
+#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+#endif /* defined(MBEDTLS_PLATFORM_NO_STD_FUNCTIONS) */
+
+#if defined(CONFIG_MBEDTLS_PLATFORM_SNPRINTF_ALT)
+#define MBEDTLS_PLATFORM_SNPRINTF_ALT
+#endif /* defined(MBEDTLS_PLATFORM_SNPRINTF_ALT) */
+
 #if defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR)
 #define MBEDTLS_ENTROPY_HARDWARE_ALT
 #else

From 60cd202d25ddbf615f9e542e91eb2b4effb06bcf Mon Sep 17 00:00:00 2001
From: Eduardo Montoya <eduardo.montoya@nordicsemi.no>
Date: Mon, 24 Mar 2025 12:34:10 +0100
Subject: [PATCH 2709/2913] [nrf noup] ci: remove `CI-zigbee-test`

`CI-zigbee-test` not to be triggered anymore.

nrf-squash! [nrf noup] ci: add .github/test-spec.yml

Signed-off-by: Eduardo Montoya <eduardo.montoya@nordicsemi.no>
---
 .github/test-spec.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/test-spec.yml b/.github/test-spec.yml
index 8dc91bbb492..23f653a0ac6 100644
--- a/.github/test-spec.yml
+++ b/.github/test-spec.yml
@@ -94,12 +94,6 @@
   - "tests/bluetooth/mesh/**/*"
   - "tests/bluetooth/mesh_shell/**/*"
 
-"CI-zigbee-test":
-  - "subsys/mgmt/mcumgr/**/*"
-  - "subsys/dfu/**/*"
-  - "include/mgmt/mcumgr/**/*"
-  - "include/dfu/**/*"
-
 "CI-thingy91-test":
   - "boards/nordic/nrf9160dk/**/*"
   - "arch/x86/core/**/*"

From 9c961c0238657970b5681d1ad63fe1caa51de4dc Mon Sep 17 00:00:00 2001
From: Sergei Ovchinnikov <sergei.ovchinnikov@nordicsemi.no>
Date: Tue, 18 Mar 2025 11:05:39 +0100
Subject: [PATCH 2710/2913] [nrf fromtree] drivers: mfd: mfd_npm2100: add open
 drain and pull up config to int pin

Add possibility to configure open drain and pull up on nPM2100's
interrupt output through DTS flags.

Signed-off-by: Sergei Ovchinnikov <sergei.ovchinnikov@nordicsemi.no>
(cherry picked from commit 32b79cfd1ce96b9e1571d3ddcc88801516eb8b24)
---
 drivers/mfd/mfd_npm2100.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/drivers/mfd/mfd_npm2100.c b/drivers/mfd/mfd_npm2100.c
index 78049dff56e..6cbe0e070ae 100644
--- a/drivers/mfd/mfd_npm2100.c
+++ b/drivers/mfd/mfd_npm2100.c
@@ -55,9 +55,11 @@
 
 #define EVENTS_SIZE 5U
 
-#define GPIO_USAGE_INTLO   0x01U
-#define GPIO_USAGE_INTHI   0x02U
-#define GPIO_CONFIG_OUTPUT 0x02U
+#define GPIO_USAGE_INTLO      0x01U
+#define GPIO_USAGE_INTHI      0x02U
+#define GPIO_CONFIG_OUTPUT    0x02U
+#define GPIO_CONFIG_OPENDRAIN 0x04U
+#define GPIO_CONFIG_PULLUP    0x10U
 
 #define RESET_STICKY_PWRBUT 0x04U
 
@@ -171,10 +173,17 @@ static int config_pmic_int(const struct device *dev)
 {
 	const struct mfd_npm2100_config *config = dev->config;
 	uint8_t usage = GPIO_USAGE_INTHI;
+	uint8_t gpio_config = GPIO_CONFIG_OUTPUT;
 
 	if (config->pmic_int_flags & GPIO_ACTIVE_LOW) {
 		usage = GPIO_USAGE_INTLO;
 	}
+	if ((config->pmic_int_flags & GPIO_SINGLE_ENDED) != 0U) {
+		gpio_config |= GPIO_CONFIG_OPENDRAIN;
+	}
+	if (config->pmic_int_flags & GPIO_PULL_UP) {
+		gpio_config |= GPIO_CONFIG_PULLUP;
+	}
 
 	/* Set specified PMIC pin to be interrupt output */
 	int ret = i2c_reg_write_byte_dt(&config->i2c, GPIO_USAGE + config->pmic_int_pin, usage);
@@ -184,8 +193,7 @@ static int config_pmic_int(const struct device *dev)
 	}
 
 	/* Configure PMIC output pin */
-	return i2c_reg_write_byte_dt(&config->i2c, GPIO_CONFIG + config->pmic_int_pin,
-				     GPIO_CONFIG_OUTPUT);
+	return i2c_reg_write_byte_dt(&config->i2c, GPIO_CONFIG + config->pmic_int_pin, gpio_config);
 }
 
 static int config_shphold(const struct device *dev)

From 81ed7e711ee30961aee3a74ac983a8fe727ad433 Mon Sep 17 00:00:00 2001
From: Mariusz Skamra <mariusz.skamra@codecoup.pl>
Date: Thu, 6 Feb 2025 11:54:15 +0100
Subject: [PATCH 2711/2913] [nrf fromtree] Bluetooth: monitor: Fix SEGGER RTT
 compilation error

This fixes out of scope IRQ lock key by using SEGGER_RTT_Write
version that locks the IRQ by itself.

Signed-off-by: Mariusz Skamra <mariusz.skamra@codecoup.pl>
(cherry picked from commit 27c18adf28a08de4fa04f1dde8afee6ce185dee3)
---
 subsys/bluetooth/host/monitor.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/subsys/bluetooth/host/monitor.c b/subsys/bluetooth/host/monitor.c
index a02f115c966..10f18c3435d 100644
--- a/subsys/bluetooth/host/monitor.c
+++ b/subsys/bluetooth/host/monitor.c
@@ -126,13 +126,12 @@ static void monitor_send(const void *data, size_t len)
 	}
 
 	if (!drop) {
-		if (!panic_mode) {
-			SEGGER_RTT_LOCK();
-		}
-		cnt = SEGGER_RTT_WriteNoLock(CONFIG_BT_DEBUG_MONITOR_RTT_BUFFER,
-					     rtt_buf, rtt_buf_offset);
-		if (!panic_mode) {
-			SEGGER_RTT_UNLOCK();
+		if (panic_mode) {
+			cnt = SEGGER_RTT_WriteNoLock(CONFIG_BT_DEBUG_MONITOR_RTT_BUFFER,
+						     rtt_buf, rtt_buf_offset);
+		} else {
+			cnt = SEGGER_RTT_Write(CONFIG_BT_DEBUG_MONITOR_RTT_BUFFER,
+					       rtt_buf, rtt_buf_offset);
 		}
 	}
 

From 6dd077969d74ec33b4a401d5c5f9579cfab15be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Thu, 13 Feb 2025 14:56:03 +0100
Subject: [PATCH 2712/2913] [nrf fromtree] tests: boards: nrf: qdec: Add
 nRF54L20pdk to platform_allow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enable test execution on nRF54L20pdk.
Overlay was already added.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 0d7f6d156cacef454a7fbb88ba0d18f461910596)
---
 tests/boards/nrf/qdec/testcase.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/boards/nrf/qdec/testcase.yaml b/tests/boards/nrf/qdec/testcase.yaml
index 26cfd9901a5..31f6260726f 100644
--- a/tests/boards/nrf/qdec/testcase.yaml
+++ b/tests/boards/nrf/qdec/testcase.yaml
@@ -4,6 +4,7 @@ common:
     - nrf5340dk/nrf5340/cpuapp
     - nrf54l15dk/nrf54l15/cpuapp
     - nrf54l15dk/nrf54l15/cpuflpr
+    - nrf54l20pdk/nrf54l20/cpuapp
     - nrf54h20dk/nrf54h20/cpuapp
   integration_platforms:
     - nrf52840dk/nrf52840

From 41edd7788aa7139e304e2b6237255443c5065459 Mon Sep 17 00:00:00 2001
From: Ivan Iushkov <ivan.iushkov@nordicsemi.no>
Date: Mon, 24 Mar 2025 17:05:24 +0100
Subject: [PATCH 2713/2913] [nrf fromtree] bluetooth: CS: add
 bt_le_cs_get_antenna_path()

added function to calculate antenna path
based on the antenna permutation index and
total number of antenna paths

Signed-off-by: Ivan Iushkov <ivan.iushkov@nordicsemi.no>
(cherry picked from commit ded9c1f44d4a537a77c0e46b77d99b1899977977)
---
 include/zephyr/bluetooth/cs.h |  21 +++++++
 subsys/bluetooth/host/cs.c    | 100 ++++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+)

diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index 6e712627a06..dfb744bdbcd 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -878,6 +878,27 @@ int bt_le_cs_write_cached_remote_supported_capabilities(
  */
 int bt_le_cs_write_cached_remote_fae_table(struct bt_conn *conn, int8_t remote_fae_table[72]);
 
+/** @brief Get antenna path used for the CS tone exchange
+ *	   when using multiple antenna paths for mode-2 or mode-3
+ *	   CS procedure.
+ *
+ *	   The function implements antenna path permutation defined in
+ *	   Bluetooth Core Specification 6.0, Vol. 6, Part H, Section 4.7.5.
+ *
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ *
+ * @param n_ap				 The number of antenna paths, range: [1, 4].
+ * @param antenna_path_permutation_index Antenna Path Permutation Index.
+ * @param tone_index			 Index of the tone in the CS step, range [0, n_ap].
+ *					 tone_index = n_ap corresponds to extension slot.
+ *
+ * @return Antenna path used to exchange CS tones, range: [0, 3].
+ * @return -EINVAL if arguments are invalid.
+ */
+int bt_le_cs_get_antenna_path(uint8_t n_ap,
+			      uint8_t antenna_path_permutation_index,
+			      uint8_t tone_index);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index da2480739d1..8114659d822 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -22,6 +22,11 @@ LOG_MODULE_REGISTER(bt_cs);
 static struct bt_le_cs_test_cb cs_test_callbacks;
 #endif
 
+#define A1 (0)
+#define A2 (1)
+#define A3 (2)
+#define A4 (3)
+
 struct reassembly_buf_meta_data {
 	uint16_t conn_handle;
 };
@@ -1344,4 +1349,99 @@ void bt_le_cs_step_data_parse(struct net_buf_simple *step_data_buf,
 	}
 }
 
+/* Bluetooth Core Specification 6.0, Table 4.13, Antenna Path Permutation for N_AP=2.
+ * The last element corresponds to extension slot
+ */
+static const uint8_t antenna_path_lut_n_ap_2[2][3] = {
+	{A1, A2, A2},
+	{A2, A1, A1},
+};
+
+/* Bluetooth Core Specification 6.0, Table 4.14, Antenna Path Permutation for N_AP=3.
+ * The last element corresponds to extension slot
+ */
+static const uint8_t antenna_path_lut_n_ap_3[6][4] = {
+	{A1, A2, A3, A3},
+	{A2, A1, A3, A3},
+	{A1, A3, A2, A2},
+	{A3, A1, A2, A2},
+	{A3, A2, A1, A1},
+	{A2, A3, A1, A1},
+};
+
+/* Bluetooth Core Specification 6.0, Table 4.15, Antenna Path Permutation for N_AP=4.
+ * The last element corresponds to extension slot
+ */
+static const uint8_t antenna_path_lut_n_ap_4[24][5] = {
+	{A1, A2, A3, A4, A4},
+	{A2, A1, A3, A4, A4},
+	{A1, A3, A2, A4, A4},
+	{A3, A1, A2, A4, A4},
+	{A3, A2, A1, A4, A4},
+	{A2, A3, A1, A4, A4},
+	{A1, A2, A4, A3, A3},
+	{A2, A1, A4, A3, A3},
+	{A1, A4, A2, A3, A3},
+	{A4, A1, A2, A3, A3},
+	{A4, A2, A1, A3, A3},
+	{A2, A4, A1, A3, A3},
+	{A1, A4, A3, A2, A2},
+	{A4, A1, A3, A2, A2},
+	{A1, A3, A4, A2, A2},
+	{A3, A1, A4, A2, A2},
+	{A3, A4, A1, A2, A2},
+	{A4, A3, A1, A2, A2},
+	{A4, A2, A3, A1, A1},
+	{A2, A4, A3, A1, A1},
+	{A4, A3, A2, A1, A1},
+	{A3, A4, A2, A1, A1},
+	{A3, A2, A4, A1, A1},
+	{A2, A3, A4, A1, A1},
+};
+
+int bt_le_cs_get_antenna_path(uint8_t n_ap,
+			      uint8_t antenna_path_permutation_index,
+			      uint8_t tone_index)
+{
+	switch (n_ap) {
+	case 1:
+	{
+		uint8_t antenna_path_permutations = 1;
+		uint8_t num_tones = n_ap + 1; /* one additional tone extension slot */
+
+		if (antenna_path_permutation_index >= antenna_path_permutations ||
+		    tone_index >= num_tones) {
+			return -EINVAL;
+		}
+		return A1;
+	}
+	case 2:
+	{
+		if (antenna_path_permutation_index >= ARRAY_SIZE(antenna_path_lut_n_ap_2) ||
+		    tone_index >= ARRAY_SIZE(antenna_path_lut_n_ap_2[0])) {
+			return -EINVAL;
+		}
+		return antenna_path_lut_n_ap_2[antenna_path_permutation_index][tone_index];
+	}
+	case 3:
+	{
+		if (antenna_path_permutation_index >= ARRAY_SIZE(antenna_path_lut_n_ap_3) ||
+		    tone_index >= ARRAY_SIZE(antenna_path_lut_n_ap_3[0])) {
+			return -EINVAL;
+		}
+		return antenna_path_lut_n_ap_3[antenna_path_permutation_index][tone_index];
+	}
+	case 4:
+	{
+		if (antenna_path_permutation_index >= ARRAY_SIZE(antenna_path_lut_n_ap_4) ||
+		    tone_index >= ARRAY_SIZE(antenna_path_lut_n_ap_4[0])) {
+			return -EINVAL;
+		}
+		return antenna_path_lut_n_ap_4[antenna_path_permutation_index][tone_index];
+	}
+	default:
+		return -EINVAL;
+	}
+}
+
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */

From 060c3f43e430d34d3fc188b7c6bd524c3a3334f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Thu, 20 Mar 2025 15:22:00 +0100
Subject: [PATCH 2714/2913] [nrf fromtree] tests: drivers: flash: extend
 support for nRF54L09 and nRF54L20
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added missing nodes, configurations and filters in
testcase.yaml.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit 1e972956222ab0f4c472b78ca6c13c4628d5b1d9)
---
 boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi        | 4 ++++
 .../flash/common/boards/nrf54l09pdk_nrf54l09_cpuapp.conf     | 4 ++++
 .../flash/common/boards/nrf54l20pdk_nrf54l20_cpuapp.conf     | 4 ++++
 tests/drivers/flash/common/testcase.yaml                     | 1 +
 tests/drivers/flash/negative_tests/src/main.c                | 5 +----
 tests/drivers/flash/negative_tests/testcase.yaml             | 1 +
 6 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 tests/drivers/flash/common/boards/nrf54l09pdk_nrf54l09_cpuapp.conf
 create mode 100644 tests/drivers/flash/common/boards/nrf54l20pdk_nrf54l20_cpuapp.conf

diff --git a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
index ed9d76a6b19..16bcd4d6f36 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
@@ -69,6 +69,10 @@
 			label = "image-1-nonsecure";
 			reg = <0x160c00 DT_SIZE_K(449)>;
 		};
+		storage_partition: partition@1d1000 {
+			label = "storage";
+			reg = <0x1d1000 DT_SIZE_K(36)>;
+		};
 	};
 };
 
diff --git a/tests/drivers/flash/common/boards/nrf54l09pdk_nrf54l09_cpuapp.conf b/tests/drivers/flash/common/boards/nrf54l09pdk_nrf54l09_cpuapp.conf
new file mode 100644
index 00000000000..821a5e77e5b
--- /dev/null
+++ b/tests/drivers/flash/common/boards/nrf54l09pdk_nrf54l09_cpuapp.conf
@@ -0,0 +1,4 @@
+CONFIG_FCB=y
+CONFIG_FLASH_MAP=y
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_FCB=y
diff --git a/tests/drivers/flash/common/boards/nrf54l20pdk_nrf54l20_cpuapp.conf b/tests/drivers/flash/common/boards/nrf54l20pdk_nrf54l20_cpuapp.conf
new file mode 100644
index 00000000000..821a5e77e5b
--- /dev/null
+++ b/tests/drivers/flash/common/boards/nrf54l20pdk_nrf54l20_cpuapp.conf
@@ -0,0 +1,4 @@
+CONFIG_FCB=y
+CONFIG_FLASH_MAP=y
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_FCB=y
diff --git a/tests/drivers/flash/common/testcase.yaml b/tests/drivers/flash/common/testcase.yaml
index 700c411066c..9f847204d64 100644
--- a/tests/drivers/flash/common/testcase.yaml
+++ b/tests/drivers/flash/common/testcase.yaml
@@ -46,6 +46,7 @@ tests:
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
   drivers.flash.common.tfm_ns:
     build_only: true
diff --git a/tests/drivers/flash/negative_tests/src/main.c b/tests/drivers/flash/negative_tests/src/main.c
index bd6a6557c26..38f38f4ccf4 100644
--- a/tests/drivers/flash/negative_tests/src/main.c
+++ b/tests/drivers/flash/negative_tests/src/main.c
@@ -26,10 +26,7 @@
 #define TEST_AREA_SIZE   FIXED_PARTITION_SIZE(TEST_AREA)
 #define TEST_AREA_DEVICE FIXED_PARTITION_DEVICE(TEST_AREA)
 
-#if defined(CONFIG_SOC_NRF54L05) || \
-	defined(CONFIG_SOC_NRF54L09) || \
-	defined(CONFIG_SOC_NRF54L10) || \
-	defined(CONFIG_SOC_NRF54L15)
+#if defined(CONFIG_SOC_SERIES_NRF54LX)
 #define TEST_FLASH_START (DT_REG_ADDR(DT_MEM_FROM_FIXED_PARTITION(DT_NODELABEL(TEST_AREA))))
 #define TEST_FLASH_SIZE  (DT_REG_SIZE(DT_MEM_FROM_FIXED_PARTITION(DT_NODELABEL(TEST_AREA))))
 #elif defined(CONFIG_SOC_NRF54H20)
diff --git a/tests/drivers/flash/negative_tests/testcase.yaml b/tests/drivers/flash/negative_tests/testcase.yaml
index 3a795e4a2da..11a669c981f 100644
--- a/tests/drivers/flash/negative_tests/testcase.yaml
+++ b/tests/drivers/flash/negative_tests/testcase.yaml
@@ -7,4 +7,5 @@ tests:
     platform_allow:
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp

From aa42184dfddc991ae93dfab05411c6e54639b89b Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Thu, 6 Mar 2025 12:40:40 +0100
Subject: [PATCH 2715/2913] [nrf fromtree] drivers: spi: nrfx_spis: impl pm
 device runtime

Implement PM device runtime in nrx spis device driver.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
(cherry picked from commit 7e9301697d859733771211bc48229b1b6c8d700e)
---
 drivers/spi/spi_nrfx_spis.c | 71 ++++++++++++++++++++++++++++++-------
 1 file changed, 59 insertions(+), 12 deletions(-)

diff --git a/drivers/spi/spi_nrfx_spis.c b/drivers/spi/spi_nrfx_spis.c
index 431d011433f..50d37d0dc06 100644
--- a/drivers/spi/spi_nrfx_spis.c
+++ b/drivers/spi/spi_nrfx_spis.c
@@ -10,6 +10,8 @@
 #include <zephyr/drivers/gpio.h>
 #include <soc.h>
 #include <nrfx_spis.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
 
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
@@ -175,6 +177,8 @@ static int transceive(const struct device *dev,
 	const struct spi_buf *rx_buf = rx_bufs ? rx_bufs->buffers : NULL;
 	int error;
 
+	pm_device_runtime_get(dev);
+
 	spi_context_lock(&dev_data->ctx, asynchronous, cb, userdata, spi_cfg);
 
 	error = configure(dev, spi_cfg);
@@ -282,7 +286,49 @@ static void event_handler(const nrfx_spis_evt_t *p_event, void *p_context)
 	if (p_event->evt_type == NRFX_SPIS_XFER_DONE) {
 		spi_context_complete(&dev_data->ctx, dev_data->dev,
 				     p_event->rx_amount);
+
+		pm_device_runtime_put(dev_data->dev);
+	}
+}
+
+static void spi_nrfx_suspend(const struct device *dev)
+{
+	const struct spi_nrfx_config *dev_config = dev->config;
+
+	if (dev_config->wake_gpio.port == NULL) {
+		nrf_spis_disable(dev_config->spis.p_reg);
+	}
+
+	(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
+}
+
+static void spi_nrfx_resume(const struct device *dev)
+{
+	const struct spi_nrfx_config *dev_config = dev->config;
+
+	(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_DEFAULT);
+
+	if (dev_config->wake_gpio.port == NULL) {
+		nrf_spis_enable(dev_config->spis.p_reg);
+	}
+}
+
+static int spi_nrfx_pm_action(const struct device *dev, enum pm_device_action action)
+{
+	switch (action) {
+	case PM_DEVICE_ACTION_SUSPEND:
+		spi_nrfx_suspend(dev);
+		return 0;
+
+	case PM_DEVICE_ACTION_RESUME:
+		spi_nrfx_resume(dev);
+		return 0;
+
+	default:
+		break;
 	}
+
+	return -ENOTSUP;
 }
 
 static int spi_nrfx_init(const struct device *dev)
@@ -308,6 +354,16 @@ static int spi_nrfx_init(const struct device *dev)
 		return -EBUSY;
 	}
 
+	/* When the WAKE line is used, the SPIS peripheral is enabled
+	 * only after the master signals that it wants to perform a
+	 * transfer and it is disabled right after the transfer is done.
+	 * Waiting for the WAKE line to go high, what can be done using
+	 * the GPIO PORT event, instead of just waiting for the transfer
+	 * with the SPIS peripheral enabled, significantly reduces idle
+	 * power consumption.
+	 */
+	nrf_spis_disable(dev_config->spis.p_reg);
+
 	if (dev_config->wake_gpio.port) {
 		if (!gpio_is_ready_dt(&dev_config->wake_gpio)) {
 			return -ENODEV;
@@ -332,21 +388,11 @@ static int spi_nrfx_init(const struct device *dev)
 		if (err < 0) {
 			return err;
 		}
-
-		/* When the WAKE line is used, the SPIS peripheral is enabled
-		 * only after the master signals that it wants to perform a
-		 * transfer and it is disabled right after the transfer is done.
-		 * Waiting for the WAKE line to go high, what can be done using
-		 * the GPIO PORT event, instead of just waiting for the transfer
-		 * with the SPIS peripheral enabled, significantly reduces idle
-		 * power consumption.
-		 */
-		nrf_spis_disable(dev_config->spis.p_reg);
 	}
 
 	spi_context_unlock_unconditionally(&dev_data->ctx);
 
-	return 0;
+	return pm_device_driver_init(dev, spi_nrfx_pm_action);
 }
 
 /*
@@ -394,9 +440,10 @@ static int spi_nrfx_init(const struct device *dev)
 	BUILD_ASSERT(!DT_NODE_HAS_PROP(SPIS(idx), wake_gpios) ||	       \
 		     !(DT_GPIO_FLAGS(SPIS(idx), wake_gpios) & GPIO_ACTIVE_LOW),\
 		     "WAKE line must be configured as active high");	       \
+	PM_DEVICE_DT_DEFINE(SPIS(idx), spi_nrfx_pm_action, 1);		       \
 	SPI_DEVICE_DT_DEFINE(SPIS(idx),					       \
 			    spi_nrfx_init,				       \
-			    NULL,					       \
+			    PM_DEVICE_DT_GET(SPIS(idx)),		       \
 			    &spi_##idx##_data,				       \
 			    &spi_##idx##z_config,			       \
 			    POST_KERNEL,				       \

From 17ec97d0aa9b60f69c440a445f8de119f9065139 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Date: Fri, 21 Feb 2025 17:18:55 +0100
Subject: [PATCH 2716/2913] [nrf fromtree] scripts: kconfig: introduce
 dt_nodelabel_exists

Add a new function to check if a nodelabel exists in devicetree.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
(cherry picked from commit b99ae6c7d9af9246c2421b5bc59bc882f9203d37)
---
 doc/build/kconfig/preprocessor-functions.rst |  1 +
 scripts/kconfig/kconfigfunctions.py          | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/doc/build/kconfig/preprocessor-functions.rst b/doc/build/kconfig/preprocessor-functions.rst
index e3cd282f925..9de5110bfdb 100644
--- a/doc/build/kconfig/preprocessor-functions.rst
+++ b/doc/build/kconfig/preprocessor-functions.rst
@@ -65,6 +65,7 @@ while the ``*_hex`` version returns a hexadecimal value starting with ``0x``.
    $(dt_nodelabel_bool_prop,<node label>,<prop>)
    $(dt_nodelabel_enabled,<node label>)
    $(dt_nodelabel_enabled_with_compat,<node label>,<compatible string>)
+   $(dt_nodelabel_exists,<node label>)
    $(dt_nodelabel_has_compat,<node label>,<compatible string>)
    $(dt_nodelabel_has_prop,<node label>,<prop>)
    $(dt_nodelabel_path,<node label>)
diff --git a/scripts/kconfig/kconfigfunctions.py b/scripts/kconfig/kconfigfunctions.py
index 81411a9d7a1..04dab9ca2e5 100644
--- a/scripts/kconfig/kconfigfunctions.py
+++ b/scripts/kconfig/kconfigfunctions.py
@@ -149,6 +149,18 @@ def dt_node_enabled(kconf, name, node):
     return "y" if node and node.status == "okay" else "n"
 
 
+def dt_nodelabel_exists(kconf, _, label):
+    """
+    This function returns "y" if a nodelabel exists and "n" otherwise.
+    """
+    if doc_mode or edt is None:
+        return "n"
+
+    node = edt.label2node.get(label)
+
+    return "y" if node else "n"
+
+
 def dt_nodelabel_enabled(kconf, _, label):
     """
     This function is like dt_node_enabled(), but the 'label' argument
@@ -1030,6 +1042,7 @@ def inc_dec(kconf, name, *args):
         "dt_chosen_has_compat": (dt_chosen_has_compat, 2, 2),
         "dt_path_enabled": (dt_node_enabled, 1, 1),
         "dt_alias_enabled": (dt_node_enabled, 1, 1),
+        "dt_nodelabel_exists": (dt_nodelabel_exists, 1, 1),
         "dt_nodelabel_enabled": (dt_nodelabel_enabled, 1, 1),
         "dt_nodelabel_enabled_with_compat": (dt_nodelabel_enabled_with_compat, 2, 2),
         "dt_chosen_reg_addr_int": (dt_chosen_reg, 1, 3),

From 113af6497f6716c2b016323850a37d28d301f79e Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Date: Fri, 21 Feb 2025 17:19:33 +0100
Subject: [PATCH 2717/2913] [nrf fromtree] modules: hal_nordic: nrfx: use
 dt_nodelabel_exists

As of today, nrfx components are selectable depending if devicetree has
a certain compatible or not, and in case of IP that can operate in
multiple modes, nodelabel+compatible. An example of the later is:

```
config NRFX_SPI0
    bool "SPI0 driver instance"
    depends on $(dt_nodelabel_has_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPI))
    select NRFX_SPI

config NRFX_SPIM0
    bool "SPIM0 driver instance"
    depends on $(dt_nodelabel_has_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPIM))
    select NRFX_SPIM

config NRFX_SPIS0
    bool "SPIS0 driver instance"
    depends on $(dt_nodelabel_has_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPIS))
    select NRFX_SPIS
```

These symbols are later selected by e.g. SPI driver if `spi0` node is
enabled. While this works in the Zephyr context, it can be a problem in
applications using nrfx directly in the application layer, unless they
tweak devicetree. For example, if devicetree `spi0` node defaults to
`compatible = "nordic,nrf-spim"`, NRFX_SPI0 or NRFX_SPIS0 won't be
selectable, but an application using nrfx directly doesn't really care
about what is defined in devicetree as it is effectively bypassing it.
It just wants to select e.g. `CONFIG_NRFX_SPI0=y` and forget about the
rest.

This patch fixes this problem by just checking for the existence of
certain nodelabels.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
(cherry picked from commit f23b4fdb2d754ecb6bb301720a170378c3067862)
---
 modules/hal_nordic/nrfx/Kconfig | 429 ++++++++++++++++----------------
 1 file changed, 213 insertions(+), 216 deletions(-)

diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index eb79e1e5464..d510d1111ac 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -11,11 +11,11 @@ rsource "Kconfig.logging"
 
 config NRFX_ADC
 	bool "ADC driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_ADC))
+	depends on $(dt_nodelabel_exists,adc) && SOC_SERIES_NRF51X
 
 config NRFX_CLOCK
 	bool "CLOCK driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_CLOCK))
+	depends on $(dt_nodelabel_exists,clock)
 
 config NRFX_CLOCK_LFXO_TWO_STAGE_ENABLED
 	bool "Two stage start sequence of the low frequency clock"
@@ -23,7 +23,7 @@ config NRFX_CLOCK_LFXO_TWO_STAGE_ENABLED
 
 config NRFX_COMP
 	bool "COMP driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_COMP))
+	depends on $(dt_nodelabel_exists,comp)
 
 config NRFX_DPPI
 	bool
@@ -31,85 +31,85 @@ config NRFX_DPPI
 config NRFX_DPPI0
 	bool "DPPI0 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic0,$(DT_COMPAT_NORDIC_NRF_DPPIC))
+	depends on $(dt_nodelabel_exists,dppic0)
 	select NRFX_DPPI
 
 config NRFX_DPPI00
 	bool "DPPI00 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic00,$(DT_COMPAT_NORDIC_NRF_DPPIC))
+	depends on $(dt_nodelabel_exists,dppic00)
 	select NRFX_DPPI
 
 config NRFX_DPPI10
 	bool "DPPI10 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic10,$(DT_COMPAT_NORDIC_NRF_DPPIC))
+	depends on $(dt_nodelabel_exists,dppic10)
 	select NRFX_DPPI
 
 config NRFX_DPPI20
 	bool "DPPI20 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic20,$(DT_COMPAT_NORDIC_NRF_DPPIC))
+	depends on $(dt_nodelabel_exists,dppic20)
 	select NRFX_DPPI
 
 config NRFX_DPPI30
 	bool "DPPI30 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic30,$(DT_COMPAT_NORDIC_NRF_DPPIC))
+	depends on $(dt_nodelabel_exists,dppic30)
 	select NRFX_DPPI
 
 config NRFX_DPPI020
 	bool "DPPI020 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic020,$(DT_COMPAT_NORDIC_NRF_DPPIC_LOCAL))
+	depends on $(dt_nodelabel_exists,dppic020)
 	select NRFX_DPPI
 
 config NRFX_DPPI120
 	bool "DPPI120 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic120,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	depends on $(dt_nodelabel_exists,dppic120)
 	select NRFX_DPPI
 
 config NRFX_DPPI130
 	bool "DPPI130 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic130,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	depends on $(dt_nodelabel_exists,dppic130)
 	select NRFX_DPPI
 
 config NRFX_DPPI131
 	bool "DPPI131 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic131,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	depends on $(dt_nodelabel_exists,dppic131)
 	select NRFX_DPPI
 
 config NRFX_DPPI132
 	bool "DPPI132 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic132,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	depends on $(dt_nodelabel_exists,dppic132)
 	select NRFX_DPPI
 
 config NRFX_DPPI133
 	bool "DPPI133 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic133,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	depends on $(dt_nodelabel_exists,dppic133)
 	select NRFX_DPPI
 
 config NRFX_DPPI134
 	bool "DPPI134 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic134,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	depends on $(dt_nodelabel_exists,dppic134)
 	select NRFX_DPPI
 
 config NRFX_DPPI135
 	bool "DPPI135 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic135,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	depends on $(dt_nodelabel_exists,dppic135)
 	select NRFX_DPPI
 
 config NRFX_DPPI136
 	bool "DPPI136 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic136,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	depends on $(dt_nodelabel_exists,dppic136)
 	select NRFX_DPPI
 
 config NRFX_EGU
@@ -117,52 +117,52 @@ config NRFX_EGU
 
 config NRFX_EGU0
 	bool "EGU0 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu0,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu0)
 	select NRFX_EGU
 
 config NRFX_EGU1
 	bool "EGU1 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu1,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu1)
 	select NRFX_EGU
 
 config NRFX_EGU2
 	bool "EGU2 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu2,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu2)
 	select NRFX_EGU
 
 config NRFX_EGU3
 	bool "EGU3 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu3,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu3)
 	select NRFX_EGU
 
 config NRFX_EGU4
 	bool "EGU4 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu4,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu4)
 	select NRFX_EGU
 
 config NRFX_EGU5
 	bool "EGU5 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu5,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu5)
 	select NRFX_EGU
 
 config NRFX_EGU10
 	bool "EGU10 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu10,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu10)
 	select NRFX_EGU
 
 config NRFX_EGU20
 	bool "EGU20 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu20,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu20)
 	select NRFX_EGU
 
 config NRFX_EGU020
 	bool "EGU020 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu020,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu020)
 	select NRFX_EGU
 
 config NRFX_EGU130
 	bool "EGU130 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu130,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu130)
 	select NRFX_EGU
 
 config NRFX_GPIOTE
@@ -170,32 +170,32 @@ config NRFX_GPIOTE
 
 config NRFX_GPIOTE0
 	bool "GPIOTE0 driver instance"
-	depends on $(dt_nodelabel_has_compat,gpiote0,$(DT_COMPAT_NORDIC_NRF_GPIOTE))
+	depends on $(dt_nodelabel_exists,gpiote0)
 	select NRFX_GPIOTE
 
 config NRFX_GPIOTE1
 	bool "GPIOTE1 driver instance"
-	depends on $(dt_nodelabel_has_compat,gpiote1,$(DT_COMPAT_NORDIC_NRF_GPIOTE))
+	depends on $(dt_nodelabel_exists,gpiote1)
 	select NRFX_GPIOTE
 
 config NRFX_GPIOTE20
 	bool "NRFX_GPIOTE20 driver instance"
-	depends on $(dt_nodelabel_has_compat,gpiote20,$(DT_COMPAT_NORDIC_NRF_GPIOTE))
+	depends on $(dt_nodelabel_exists,gpiote20)
 	select NRFX_GPIOTE
 
 config NRFX_GPIOTE30
 	bool "NRFX_GPIOTE30 driver instance"
-	depends on $(dt_nodelabel_has_compat,gpiote30,$(DT_COMPAT_NORDIC_NRF_GPIOTE))
+	depends on $(dt_nodelabel_exists,gpiote30)
 	select NRFX_GPIOTE
 
 config NRFX_GPIOTE130
 	bool "NRFX_GPIOTE130 driver instance"
-	depends on $(dt_nodelabel_has_compat,gpiote130,$(DT_COMPAT_NORDIC_NRF_GPIOTE))
+	depends on $(dt_nodelabel_exists,gpiote130)
 	select NRFX_GPIOTE
 
 config NRFX_GPIOTE131
 	bool "NRFX_GPIOTE131 driver instance"
-	depends on $(dt_nodelabel_has_compat,gpiote131,$(DT_COMPAT_NORDIC_NRF_GPIOTE))
+	depends on $(dt_nodelabel_exists,gpiote131)
 	select NRFX_GPIOTE
 
 config NRFX_GPIOTE_NUM_OF_EVT_HANDLERS
@@ -214,71 +214,68 @@ config NRFX_GPPI
 
 config NRFX_GRTC
 	bool "GRTC driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_GRTC))
+	depends on $(dt_nodelabel_exists,grtc)
 
 config NRFX_I2S
 	bool
 
 config NRFX_I2S0
 	bool "I2S0 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2s0,$(DT_COMPAT_NORDIC_NRF_I2S))
+	depends on $(dt_nodelabel_exists,i2s0)
 	select NRFX_I2S
 
 config NRFX_I2S20
 	bool "I2S20 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2s20,$(DT_COMPAT_NORDIC_NRF_I2S))
+	depends on $(dt_nodelabel_exists,i2s20)
 	select NRFX_I2S
 
 config NRFX_IPC
 	bool "IPC driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_IPC))
+	depends on $(dt_nodelabel_exists,ipc)
 
 config NRFX_LPCOMP
 	bool "LPCOMP driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_LPCOMP))
+	depends on $(dt_nodelabel_exists,comp) && !SOC_NRF52810 && !SOC_NRF52811 && !SOC_NRF52820
 
 config NRFX_NFCT
 	bool "NFCT driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_NFCT))
+	depends on $(dt_nodelabel_exists,nfct)
 	select NRFX_TIMER4 if SOC_SERIES_NRF52X
 	select NRFX_TIMER2 if SOC_SERIES_NRF53X
 
 config NRFX_NVMC
 	bool "NVMC driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF51_FLASH_CONTROLLER)) \
-		|| $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF52_FLASH_CONTROLLER)) \
-		|| $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF53_FLASH_CONTROLLER)) \
-		|| $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF91_FLASH_CONTROLLER))
+	depends on $(dt_nodelabel_exists,flash_controller)
 
 config NRFX_PDM
 	bool
 
 config NRFX_PDM0
 	bool "PDM0 driver instance"
-	depends on $(dt_nodelabel_has_compat,pdm0,$(DT_COMPAT_NORDIC_NRF_PDM))
+	depends on $(dt_nodelabel_exists,pdm0)
 	select NRFX_PDM
 
 config NRFX_PDM20
 	bool "PDM20 driver instance"
-	depends on $(dt_nodelabel_has_compat,pdm20,$(DT_COMPAT_NORDIC_NRF_PDM))
+	depends on $(dt_nodelabel_exists,pdm20)
 	select NRFX_PDM
 
 config NRFX_PDM21
 	bool "PDM21 driver instance"
-	depends on $(dt_nodelabel_has_compat,pdm21,$(DT_COMPAT_NORDIC_NRF_PDM))
+	depends on $(dt_nodelabel_exists,pdm21)
 	select NRFX_PDM
 
 config NRFX_POWER
 	bool "POWER driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_POWER))
+	depends on $(dt_nodelabel_exists,power)
 	# On SoCs featuring the USBREG peripheral, the POWER driver uses
 	# internally the USBREG driver.
-	select NRFX_USBREG if $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_USBREG))
+	select NRFX_USBREG if $(dt_nodelabel_exists,usbreg)
 
 config NRFX_PPI
 	bool "PPI allocator"
 	default y if NRFX_GPPI
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_PPI))
+	depends on $(dt_nodelabel_exists,ppi)
 
 config NRFX_PPIB
 	bool
@@ -286,49 +283,49 @@ config NRFX_PPIB
 config NRFX_PPIB00
 	bool "PPIB00 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,ppib00,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	depends on $(dt_nodelabel_exists,ppib00)
 	select NRFX_PPIB
 
 config NRFX_PPIB01
 	bool "PPIB01 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,ppib01,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	depends on $(dt_nodelabel_exists,ppib01)
 	select NRFX_PPIB
 
 config NRFX_PPIB10
 	bool "PPIB10 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,ppib10,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	depends on $(dt_nodelabel_exists,ppib10)
 	select NRFX_PPIB
 
 config NRFX_PPIB11
 	bool "PPIB11 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,ppib11,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	depends on $(dt_nodelabel_exists,ppib11)
 	select NRFX_PPIB
 
 config NRFX_PPIB20
 	bool "PPIB20 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,ppib20,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	depends on $(dt_nodelabel_exists,ppib20)
 	select NRFX_PPIB
 
 config NRFX_PPIB21
 	bool "PPIB21 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,ppib21,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	depends on $(dt_nodelabel_exists,ppib21)
 	select NRFX_PPIB
 
 config NRFX_PPIB22
 	bool "PPIB22 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,ppib22,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	depends on $(dt_nodelabel_exists,ppib22)
 	select NRFX_PPIB
 
 config NRFX_PPIB30
 	bool "PPIB30 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,ppib30,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	depends on $(dt_nodelabel_exists,ppib30)
 	select NRFX_PPIB
 
 config NRFX_PWM
@@ -336,62 +333,62 @@ config NRFX_PWM
 
 config NRFX_PWM0
 	bool "PWM0 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm0,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm0)
 	select NRFX_PWM
 
 config NRFX_PWM1
 	bool "PWM1 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm1,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm1)
 	select NRFX_PWM
 
 config NRFX_PWM2
 	bool "PWM2 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm2,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm2)
 	select NRFX_PWM
 
 config NRFX_PWM3
 	bool "PWM3 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm3,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm3)
 	select NRFX_PWM
 
 config NRFX_PWM20
 	bool "PWM20 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm20,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm20)
 	select NRFX_PWM
 
 config NRFX_PWM21
 	bool "PWM21 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm21,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm21)
 	select NRFX_PWM
 
 config NRFX_PWM22
 	bool "PWM22 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm22,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm22)
 	select NRFX_PWM
 
 config NRFX_PWM120
 	bool "PWM120 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm120,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm120)
 	select NRFX_PWM
 
 config NRFX_PWM130
 	bool "PWM130 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm130,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm130)
 	select NRFX_PWM
 
 config NRFX_PWM131
 	bool "PWM131 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm131,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm131)
 	select NRFX_PWM
 
 config NRFX_PWM132
 	bool "PWM132 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm132,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm132)
 	select NRFX_PWM
 
 config NRFX_PWM133
 	bool "PWM133 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm133,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm133)
 	select NRFX_PWM
 
 config NRFX_QDEC
@@ -399,94 +396,94 @@ config NRFX_QDEC
 
 config NRFX_QDEC0
 	bool "QDEC0 driver instance"
-	depends on $(dt_nodelabel_has_compat,qdec0,$(DT_COMPAT_NORDIC_NRF_QDEC))
+	depends on $(dt_nodelabel_exists,qdec0)
 	select NRFX_QDEC
 
 config NRFX_QDEC1
 	bool "QDEC1 driver instance"
-	depends on $(dt_nodelabel_has_compat,qdec1,$(DT_COMPAT_NORDIC_NRF_QDEC))
+	depends on $(dt_nodelabel_exists,qdec1)
 	select NRFX_QDEC
 
 config NRFX_QDEC20
 	bool "QDEC20 driver instance"
-	depends on $(dt_nodelabel_has_compat,qdec20,$(DT_COMPAT_NORDIC_NRF_QDEC))
+	depends on $(dt_nodelabel_exists,qdec20)
 	select NRFX_QDEC
 
 config NRFX_QDEC21
 	bool "QDEC21 driver instance"
-	depends on $(dt_nodelabel_has_compat,qdec21,$(DT_COMPAT_NORDIC_NRF_QDEC))
+	depends on $(dt_nodelabel_exists,qdec21)
 	select NRFX_QDEC
 
 config NRFX_QDEC130
 	bool "QDEC130 driver instance"
-	depends on $(dt_nodelabel_has_compat,qdec130,$(DT_COMPAT_NORDIC_NRF_QDEC))
+	depends on $(dt_nodelabel_exists,qdec130)
 	select NRFX_QDEC
 
 config NRFX_QDEC131
 	bool "QDEC131 driver instance"
-	depends on $(dt_nodelabel_has_compat,qdec131,$(DT_COMPAT_NORDIC_NRF_QDEC))
+	depends on $(dt_nodelabel_exists,qdec131)
 	select NRFX_QDEC
 
 config NRFX_QSPI
 	bool "QSPI driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_QSPI))
+	depends on $(dt_nodelabel_exists,qspi)
 
 config NRFX_RNG
 	bool "RNG driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_RNG))
+	depends on $(dt_nodelabel_exists,rng)
 
 config NRFX_RRAMC
 	bool "RRAMC driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_RRAM_CONTROLLER))
+	depends on $(dt_nodelabel_exists,rram_controller)
 
 config NRFX_RTC
 	bool
 
 config NRFX_RTC0
 	bool "RTC0 driver instance"
-	depends on $(dt_nodelabel_has_compat,rtc0,$(DT_COMPAT_NORDIC_NRF_RTC))
+	depends on $(dt_nodelabel_exists,rtc0)
 	select NRFX_RTC
 
 config NRFX_RTC1
 	bool "RTC1 driver instance"
-	depends on $(dt_nodelabel_has_compat,rtc1,$(DT_COMPAT_NORDIC_NRF_RTC))
+	depends on $(dt_nodelabel_exists,rtc1)
 	select NRFX_RTC
 
 config NRFX_RTC2
 	bool "RTC2 driver instance"
-	depends on $(dt_nodelabel_has_compat,rtc2,$(DT_COMPAT_NORDIC_NRF_RTC))
+	depends on $(dt_nodelabel_exists,rtc2)
 	select NRFX_RTC
 
 config NRFX_RTC130
 	bool "RTC130 driver instance"
-	depends on $(dt_nodelabel_has_compat,rtc130,$(DT_COMPAT_NORDIC_NRF_RTC))
+	depends on $(dt_nodelabel_exists,rtc130)
 	select NRFX_RTC
 
 config NRFX_RTC131
 	bool "RTC131 driver instance"
-	depends on $(dt_nodelabel_has_compat,rtc131,$(DT_COMPAT_NORDIC_NRF_RTC))
+	depends on $(dt_nodelabel_exists,rtc131)
 	select NRFX_RTC
 
 config NRFX_SAADC
 	bool "SAADC driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_SAADC))
+	depends on $(dt_nodelabel_exists,adc) && !SOC_SERIES_NRF51X
 
 config NRFX_SPI
 	bool
 
 config NRFX_SPI0
 	bool "SPI0 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPI))
+	depends on $(dt_nodelabel_exists,spi0) && (SOC_SERIES_NRF51X || SOC_SERIES_NRF52X)
 	select NRFX_SPI
 
 config NRFX_SPI1
 	bool "SPI1 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi1,$(DT_COMPAT_NORDIC_NRF_SPI))
+	depends on $(dt_nodelabel_exists,spi1) && (SOC_SERIES_NRF51X || SOC_SERIES_NRF52X)
 	select NRFX_SPI
 
 config NRFX_SPI2
 	bool "SPI2 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi2,$(DT_COMPAT_NORDIC_NRF_SPI))
+	depends on $(dt_nodelabel_exists,spi2) && SOC_SERIES_NRF52X
 	select NRFX_SPI
 
 config NRFX_SPIM
@@ -494,102 +491,102 @@ config NRFX_SPIM
 
 config NRFX_SPIM0
 	bool "SPIM0 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi0) && !SOC_SERIES_NRF51X
 	select NRFX_SPIM
 
 config NRFX_SPIM1
 	bool "SPIM1 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi1,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi1) && !SOC_SERIES_NRF51X
 	select NRFX_SPIM
 
 config NRFX_SPIM2
 	bool "SPIM2 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi2,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi2)
 	select NRFX_SPIM
 
 config NRFX_SPIM3
 	bool "SPIM3 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi3,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi3)
 	select NRFX_SPIM
 
 config NRFX_SPIM4
 	bool "SPIM4 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi4,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi4)
 	select NRFX_SPIM
 
 config NRFX_SPIM00
 	bool "SPIM00 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi00,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi00)
 	select NRFX_SPIM
 
 config NRFX_SPIM20
 	bool "SPIM20 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi20,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi20)
 	select NRFX_SPIM
 
 config NRFX_SPIM21
 	bool "SPIM21 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi21,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi21)
 	select NRFX_SPIM
 
 config NRFX_SPIM22
 	bool "SPIM22 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi22,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi22)
 	select NRFX_SPIM
 
 config NRFX_SPIM30
 	bool "SPIM30 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi30,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi30)
 	select NRFX_SPIM
 
 config NRFX_SPIM120
 	bool "SPIM120 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi120,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi120)
 	select NRFX_SPIM
 
 config NRFX_SPIM121
 	bool "SPIM121 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi121,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi121)
 	select NRFX_SPIM
 
 config NRFX_SPIM130
 	bool "SPIM130 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi130,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi130)
 	select NRFX_SPIM
 
 config NRFX_SPIM131
 	bool "SPIM131 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi131,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi131)
 	select NRFX_SPIM
 
 config NRFX_SPIM132
 	bool "SPIM132 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi132,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi132)
 	select NRFX_SPIM
 
 config NRFX_SPIM133
 	bool "SPIM133 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi133,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi133)
 	select NRFX_SPIM
 
 config NRFX_SPIM134
 	bool "SPIM134 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi134,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi134)
 	select NRFX_SPIM
 
 config NRFX_SPIM135
 	bool "SPIM135 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi135,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi135)
 	select NRFX_SPIM
 
 config NRFX_SPIM136
 	bool "SPIM136 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi136,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi136)
 	select NRFX_SPIM
 
 config NRFX_SPIM137
 	bool "SPIM137 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi137,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi137)
 	select NRFX_SPIM
 
 config NRFX_SPIS
@@ -597,92 +594,92 @@ config NRFX_SPIS
 
 config NRFX_SPIS0
 	bool "SPIS0 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi0) && !SOC_SERIES_NRF51X
 	select NRFX_SPIS
 
 config NRFX_SPIS1
 	bool "SPIS1 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi1,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi1)
 	select NRFX_SPIS
 
 config NRFX_SPIS2
 	bool "SPIS2 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi2,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi2)
 	select NRFX_SPIS
 
 config NRFX_SPIS3
 	bool "SPIS3 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi3,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi3)
 	select NRFX_SPIS
 
 config NRFX_SPIS00
 	bool "SPIS00 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi00,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi00)
 	select NRFX_SPIS
 
 config NRFX_SPIS20
 	bool "SPIS20 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi20,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi20)
 	select NRFX_SPIS
 
 config NRFX_SPIS21
 	bool "SPIS21 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi21,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi21)
 	select NRFX_SPIS
 
 config NRFX_SPIS22
 	bool "SPIS22 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi22,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi22)
 	select NRFX_SPIS
 
 config NRFX_SPIS30
 	bool "SPIS30 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi30,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi30)
 	select NRFX_SPIS
 
 config NRFX_SPIS120
 	bool "SPIS120 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi120,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi120)
 	select NRFX_SPIS
 
 config NRFX_SPIS130
 	bool "SPIS130 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi130,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi130)
 	select NRFX_SPIS
 
 config NRFX_SPIS131
 	bool "SPIS131 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi131,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi131)
 	select NRFX_SPIS
 
 config NRFX_SPIS132
 	bool "SPIS132 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi132,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi132)
 	select NRFX_SPIS
 
 config NRFX_SPIS133
 	bool "SPIS133 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi133,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi133)
 	select NRFX_SPIS
 
 config NRFX_SPIS134
 	bool "SPIS134 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi134,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi134)
 	select NRFX_SPIS
 
 config NRFX_SPIS135
 	bool "SPIS135 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi135,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi135)
 	select NRFX_SPIS
 
 config NRFX_SPIS136
 	bool "SPIS136 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi136,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi136)
 	select NRFX_SPIS
 
 config NRFX_SPIS137
 	bool "SPIS137 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi137,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi137)
 	select NRFX_SPIS
 
 config NRFX_SYSTICK
@@ -691,7 +688,7 @@ config NRFX_SYSTICK
 
 config NRFX_TBM
 	bool "TBM driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_TBM))
+	depends on $(dt_nodelabel_exists,tbm)
 
 config NRFX_TDM
 	bool
@@ -708,134 +705,134 @@ config NRFX_TDM131
 
 config NRFX_TEMP
 	bool "TEMP driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_TEMP))
+	depends on $(dt_nodelabel_exists,temp)
 
 config NRFX_TIMER
 	bool
 
 config NRFX_TIMER0
 	bool "TIMER0 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer0,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer0)
 	select NRFX_TIMER
 
 config NRFX_TIMER1
 	bool "TIMER1 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer1,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer1)
 	select NRFX_TIMER
 
 config NRFX_TIMER2
 	bool "TIMER2 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer2,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer2)
 	select NRFX_TIMER
 
 config NRFX_TIMER3
 	bool "TIMER3 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer3,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer3)
 	select NRFX_TIMER
 
 config NRFX_TIMER4
 	bool "TIMER4 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer4,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer4)
 	select NRFX_TIMER
 
 config NRFX_TIMER00
 	bool "TIMER00 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer00,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer00)
 	select NRFX_TIMER
 
 config NRFX_TIMER10
 	bool "TIMER10 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer10,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer10)
 	select NRFX_TIMER
 
 config NRFX_TIMER20
 	bool "TIMER20 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer20,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer20)
 	select NRFX_TIMER
 
 config NRFX_TIMER21
 	bool "TIMER21 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer21,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer21)
 	select NRFX_TIMER
 
 config NRFX_TIMER22
 	bool "TIMER22 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer22,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer22)
 	select NRFX_TIMER
 
 config NRFX_TIMER23
 	bool "TIMER23 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer23,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer23)
 	select NRFX_TIMER
 
 config NRFX_TIMER24
 	bool "TIMER24 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer24,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer24)
 	select NRFX_TIMER
 
 config NRFX_TIMER020
 	bool "TIMER020 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer020,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer020)
 	select NRFX_TIMER
 
 config NRFX_TIMER021
 	bool "TIMER021 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer021,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer021)
 	select NRFX_TIMER
 
 config NRFX_TIMER022
 	bool "TIMER022 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer022,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer022)
 	select NRFX_TIMER
 
 config NRFX_TIMER120
 	bool "TIMER120 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer120,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer120)
 	select NRFX_TIMER
 
 config NRFX_TIMER121
 	bool "TIMER121 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer121,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer121)
 	select NRFX_TIMER
 
 config NRFX_TIMER130
 	bool "TIMER130 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer130,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer130)
 	select NRFX_TIMER
 
 config NRFX_TIMER131
 	bool "TIMER131 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer131,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer131)
 	select NRFX_TIMER
 
 config NRFX_TIMER132
 	bool "TIMER132 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer132,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer132)
 	select NRFX_TIMER
 
 config NRFX_TIMER133
 	bool "TIMER133 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer133,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer133)
 	select NRFX_TIMER
 
 config NRFX_TIMER134
 	bool "TIMER134 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer134,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer134)
 	select NRFX_TIMER
 
 config NRFX_TIMER135
 	bool "TIMER135 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer135,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer135)
 	select NRFX_TIMER
 
 config NRFX_TIMER136
 	bool "TIMER136 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer136,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer136)
 	select NRFX_TIMER
 
 config NRFX_TIMER137
 	bool "TIMER137 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer137,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer137)
 	select NRFX_TIMER
 
 config NRFX_TWI
@@ -843,12 +840,12 @@ config NRFX_TWI
 
 config NRFX_TWI0
 	bool "TWI0 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c0,$(DT_COMPAT_NORDIC_NRF_TWI))
+	depends on $(dt_nodelabel_exists,i2c0) && (SOC_SERIES_NRF51X || SOC_SERIES_NRF52X)
 	select NRFX_TWI
 
 config NRFX_TWI1
 	bool "TWI1 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c1,$(DT_COMPAT_NORDIC_NRF_TWI))
+	depends on $(dt_nodelabel_exists,i2c1) && (SOC_SERIES_NRF51X || SOC_SERIES_NRF52X)
 	select NRFX_TWI
 
 config NRFX_TWIM
@@ -856,87 +853,87 @@ config NRFX_TWIM
 
 config NRFX_TWIM0
 	bool "TWIM0 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c0,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c0) && !SOC_SERIES_NRF51X
 	select NRFX_TWIM
 
 config NRFX_TWIM1
 	bool "TWIM1 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c1,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c1) && !SOC_SERIES_NRF51X
 	select NRFX_TWIM
 
 config NRFX_TWIM2
 	bool "TWIM2 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c2,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c2)
 	select NRFX_TWIM
 
 config NRFX_TWIM3
 	bool "TWIM3 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c3,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c3)
 	select NRFX_TWIM
 
 config NRFX_TWIM20
 	bool "TWIM20 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c20,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c20)
 	select NRFX_TWIM
 
 config NRFX_TWIM21
 	bool "TWIM21 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c21,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c21)
 	select NRFX_TWIM
 
 config NRFX_TWIM22
 	bool "TWIM22 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c22,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c22)
 	select NRFX_TWIM
 
 config NRFX_TWIM30
 	bool "TWIM30 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c30,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c30)
 	select NRFX_TWIM
 
 config NRFX_TWIM120
 	bool "TWIM120 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c120,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c120)
 	select NRFX_TWIM
 
 config NRFX_TWIM130
 	bool "TWIM130 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c130,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c130)
 	select NRFX_TWIM
 
 config NRFX_TWIM131
 	bool "TWIM131 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c131,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c131)
 	select NRFX_TWIM
 
 config NRFX_TWIM132
 	bool "TWIM132 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c132,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c132)
 	select NRFX_TWIM
 
 config NRFX_TWIM133
 	bool "TWIM133 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c133,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c133)
 	select NRFX_TWIM
 
 config NRFX_TWIM134
 	bool "TWIM134 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c134,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c134)
 	select NRFX_TWIM
 
 config NRFX_TWIM135
 	bool "TWIM135 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c135,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c135)
 	select NRFX_TWIM
 
 config NRFX_TWIM136
 	bool "TWIM136 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c136,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c136)
 	select NRFX_TWIM
 
 config NRFX_TWIM137
 	bool "TWIM137 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c137,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c137)
 	select NRFX_TWIM
 
 config NRFX_TWIS
@@ -944,82 +941,82 @@ config NRFX_TWIS
 
 config NRFX_TWIS0
 	bool "TWIS0 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c0,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c0) && !SOC_SERIES_NRF51X
 	select NRFX_TWIS
 
 config NRFX_TWIS1
 	bool "TWIS1 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c1,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c1) && !SOC_SERIES_NRF51X
 	select NRFX_TWIS
 
 config NRFX_TWIS2
 	bool "TWIS2 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c2,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c2)
 	select NRFX_TWIS
 
 config NRFX_TWIS3
 	bool "TWIS3 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c3,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c3)
 	select NRFX_TWIS
 
 config NRFX_TWIS20
 	bool "TWIS20 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c20,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c20)
 	select NRFX_TWIS
 
 config NRFX_TWIS21
 	bool "TWIS21 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c21,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c21)
 	select NRFX_TWIS
 
 config NRFX_TWIS22
 	bool "TWIS22 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c22,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c22)
 	select NRFX_TWIS
 
 config NRFX_TWIS30
 	bool "TWIS30 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c30,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c30)
 	select NRFX_TWIS
 
 config NRFX_TWIS130
 	bool "TWIS130 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c130,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c130)
 	select NRFX_TWIS
 
 config NRFX_TWIS131
 	bool "TWIS131 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c131,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c131)
 	select NRFX_TWIS
 
 config NRFX_TWIS132
 	bool "TWIS132 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c132,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c132)
 	select NRFX_TWIS
 
 config NRFX_TWIS133
 	bool "TWIS133 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c133,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c133)
 	select NRFX_TWIS
 
 config NRFX_TWIS134
 	bool "TWIS134 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c134,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c134)
 	select NRFX_TWIS
 
 config NRFX_TWIS135
 	bool "TWIS135 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c135,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c135)
 	select NRFX_TWIS
 
 config NRFX_TWIS136
 	bool "TWIS136 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c136,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c136)
 	select NRFX_TWIS
 
 config NRFX_TWIS137
 	bool "TWIS137 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c137,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c137)
 	select NRFX_TWIS
 
 config NRFX_UART
@@ -1027,7 +1024,7 @@ config NRFX_UART
 
 config NRFX_UART0
 	bool "UART0 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart0,$(DT_COMPAT_NORDIC_NRF_UART))
+	depends on $(dt_nodelabel_exists,uart0) && (SOC_SERIES_NRF51X || SOC_SERIES_NRF52X)
 	select NRFX_UART
 
 config NRFX_UARTE
@@ -1035,92 +1032,92 @@ config NRFX_UARTE
 
 config NRFX_UARTE0
 	bool "UARTE0 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart0,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart0)
 	select NRFX_UARTE
 
 config NRFX_UARTE1
 	bool "UARTE1 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart1,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart1)
 	select NRFX_UARTE
 
 config NRFX_UARTE2
 	bool "UARTE2 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart2,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart2)
 	select NRFX_UARTE
 
 config NRFX_UARTE3
 	bool "UARTE3 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart3,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart3)
 	select NRFX_UARTE
 
 config NRFX_UARTE00
 	bool "UARTE00 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart00,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart00)
 	select NRFX_UARTE
 
 config NRFX_UARTE20
 	bool "UARTE20 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart20,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart20)
 	select NRFX_UARTE
 
 config NRFX_UARTE21
 	bool "UARTE21 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart21,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart21)
 	select NRFX_UARTE
 
 config NRFX_UARTE22
 	bool "UARTE22 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart22,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart22)
 	select NRFX_UARTE
 
 config NRFX_UARTE30
 	bool "UARTE30 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart30,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart30)
 	select NRFX_UARTE
 
 config NRFX_UARTE120
 	bool "UARTE120 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart120,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart120)
 	select NRFX_UARTE
 
 config NRFX_UARTE130
 	bool "UARTE130 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart130,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart130)
 	select NRFX_UARTE
 
 config NRFX_UARTE131
 	bool "UARTE131 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart131,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart131)
 	select NRFX_UARTE
 
 config NRFX_UARTE132
 	bool "UARTE132 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart132,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart132)
 	select NRFX_UARTE
 
 config NRFX_UARTE133
 	bool "UARTE133 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart133,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart133)
 	select NRFX_UARTE
 
 config NRFX_UARTE134
 	bool "UARTE134 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart134,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart134)
 	select NRFX_UARTE
 
 config NRFX_UARTE135
 	bool "UARTE135 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart135,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart135)
 	select NRFX_UARTE
 
 config NRFX_UARTE136
 	bool "UARTE136 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart136,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart136)
 	select NRFX_UARTE
 
 config NRFX_UARTE137
 	bool "UARTE137 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart137,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart137)
 	select NRFX_UARTE
 
 config NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
@@ -1145,54 +1142,54 @@ config NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
 
 config NRFX_USBREG
 	bool "USBREG driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_USBREG))
+	depends on $(dt_nodelabel_exists,usbreg)
 
 config NRFX_WDT
 	bool
 
 config NRFX_WDT0
 	bool "WDT0 driver instance"
-	depends on $(dt_nodelabel_has_compat,wdt0,$(DT_COMPAT_NORDIC_NRF_WDT))
+	depends on $(dt_nodelabel_exists,wdt0)
 	select NRFX_WDT
 
 config NRFX_WDT1
 	bool "WDT1 driver instance"
-	depends on $(dt_nodelabel_has_compat,wdt1,$(DT_COMPAT_NORDIC_NRF_WDT))
+	depends on $(dt_nodelabel_exists,wdt1)
 	select NRFX_WDT
 
 config NRFX_WDT30
 	bool "WDT30 driver instance"
-	depends on $(dt_nodelabel_has_compat,wdt30,$(DT_COMPAT_NORDIC_NRF_WDT))
+	depends on $(dt_nodelabel_exists,wdt30)
 	select NRFX_WDT
 
 config NRFX_WDT31
 	bool "WDT31 driver instance"
-	depends on $(dt_nodelabel_has_compat,wdt31,$(DT_COMPAT_NORDIC_NRF_WDT))
+	depends on $(dt_nodelabel_exists,wdt31)
 	select NRFX_WDT
 
 config NRFX_WDT010
 	bool "WDT010 driver instance"
-	depends on $(dt_nodelabel_has_compat,wdt010,$(DT_COMPAT_NORDIC_NRF_WDT))
+	depends on $(dt_nodelabel_exists,wdt010)
 	select NRFX_WDT
 
 config NRFX_WDT011
 	bool "WDT011 driver instance"
-	depends on $(dt_nodelabel_has_compat,wdt011,$(DT_COMPAT_NORDIC_NRF_WDT))
+	depends on $(dt_nodelabel_exists,wdt011)
 	select NRFX_WDT
 
 config NRFX_WDT130
 	bool "WDT130 driver instance"
-	depends on $(dt_nodelabel_has_compat,wdt130,$(DT_COMPAT_NORDIC_NRF_WDT))
+	depends on $(dt_nodelabel_exists,wdt130)
 	select NRFX_WDT
 
 config NRFX_WDT131
 	bool "WDT131 driver instance"
-	depends on $(dt_nodelabel_has_compat,wdt131,$(DT_COMPAT_NORDIC_NRF_WDT))
+	depends on $(dt_nodelabel_exists,wdt131)
 	select NRFX_WDT
 
 config NRFX_WDT132
 	bool "WDT132 driver instance"
-	depends on $(dt_nodelabel_has_compat,wdt132,$(DT_COMPAT_NORDIC_NRF_WDT))
+	depends on $(dt_nodelabel_exists,wdt132)
 	select NRFX_WDT
 
 menu "Peripheral Resource Sharing module"

From 09c09548db878c9d7c51933a4f112b825802a28f Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Fri, 28 Feb 2025 13:01:05 +0100
Subject: [PATCH 2718/2913] [nrf fromtree] soc: nordic: add support for SPIS120
 instance

It is defined as spis120 rather than spi120,
because spi120 is already used for SPIM120 hardware instance,
but their base address is different.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit d8506af12aff17e5a86c1f8b457723eb104ea6c0)
---
 dts/common/nordic/nrf54h20.dtsi       | 20 ++++++++++++++++----
 modules/hal_nordic/nrfx/Kconfig       |  2 +-
 soc/nordic/common/Kconfig.peripherals |  2 +-
 soc/nordic/validate_base_addresses.c  |  1 +
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index bfce794ff3c..1fe345e33f2 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -661,6 +661,20 @@
 				#pwm-cells = <3>;
 			};
 
+			spis120: spi@8e5000 {
+				compatible = "nordic,nrf-spis";
+				reg = <0x8e5000 0x1000>;
+				status = "disabled";
+				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
+				easydma-maxcnt-bits = <15>;
+				interrupts = <229 NRF_DEFAULT_IRQ_PRIORITY>;
+				clocks = <&hsfll120>;
+				max-frequency = <DT_FREQ_M(32)>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				nordic,clockpin-enable = <NRF_FUN_SPIS_SCK>;
+			};
+
 			spi120: spi@8e6000 {
 				compatible = "nordic,nrf-spim";
 				reg = <0x8e6000 0x1000>;
@@ -674,8 +688,7 @@
 				#size-cells = <0>;
 				rx-delay-supported;
 				rx-delay = <1>;
-				nordic,clockpin-enable = <NRF_FUN_SPIM_SCK>,
-							 <NRF_FUN_SPIS_SCK>;
+				nordic,clockpin-enable = <NRF_FUN_SPIM_SCK>;
 			};
 
 			uart120: uart@8e6000 {
@@ -702,8 +715,7 @@
 				#size-cells = <0>;
 				rx-delay-supported;
 				rx-delay = <1>;
-				nordic,clockpin-enable = <NRF_FUN_SPIM_SCK>,
-							 <NRF_FUN_SPIS_SCK>;
+				nordic,clockpin-enable = <NRF_FUN_SPIM_SCK>;
 			};
 
 			cpuppr_vpr: vpr@908000 {
diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index d510d1111ac..1e9f717e4bc 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -639,7 +639,7 @@ config NRFX_SPIS30
 
 config NRFX_SPIS120
 	bool "SPIS120 driver instance"
-	depends on $(dt_nodelabel_exists,spi120)
+	depends on $(dt_nodelabel_exists,spis120)
 	select NRFX_SPIS
 
 config NRFX_SPIS130
diff --git a/soc/nordic/common/Kconfig.peripherals b/soc/nordic/common/Kconfig.peripherals
index 451a534d101..b9f582375d6 100644
--- a/soc/nordic/common/Kconfig.peripherals
+++ b/soc/nordic/common/Kconfig.peripherals
@@ -342,7 +342,7 @@ config HAS_HW_NRF_SPIS30
 	def_bool $(dt_nodelabel_enabled_with_compat,spi30,$(DT_COMPAT_NORDIC_NRF_SPIS))
 
 config HAS_HW_NRF_SPIS120
-	def_bool $(dt_nodelabel_enabled_with_compat,spi120,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	def_bool $(dt_nodelabel_enabled_with_compat,spis120,$(DT_COMPAT_NORDIC_NRF_SPIS))
 
 config HAS_HW_NRF_SPIS130
 	def_bool $(dt_nodelabel_enabled_with_compat,spi130,$(DT_COMPAT_NORDIC_NRF_SPIS))
diff --git a/soc/nordic/validate_base_addresses.c b/soc/nordic/validate_base_addresses.c
index ac800f1cf00..9de947a5c7f 100644
--- a/soc/nordic/validate_base_addresses.c
+++ b/soc/nordic/validate_base_addresses.c
@@ -277,6 +277,7 @@ CHECK_DT_REG(spi134, NRF_SPIM134);
 CHECK_DT_REG(spi135, NRF_SPIM135);
 CHECK_DT_REG(spi136, NRF_SPIM136);
 CHECK_DT_REG(spi137, NRF_SPIM137);
+CHECK_DT_REG(spis120, NRF_SPIS120);
 CHECK_DT_REG(spu, NRF_SPU);
 CHECK_DT_REG(swi0, NRF_SWI0);
 CHECK_DT_REG(swi1, NRF_SWI1);

From 70a97dbc130448ef08d242bd1bf2e58c1d17f1ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Tue, 11 Mar 2025 15:59:30 +0100
Subject: [PATCH 2719/2913] [nrf fromtree] drivers: spi: nrfx_spis: Extend
 support for device runtime PM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extend runtime PM to support fast instance (spis120) which requires
additional action in suspend/resume phase.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 125e5d83349ac63bfea28c379694f23a914eab4b)
---
 drivers/spi/spi_nrfx_spis.c | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/drivers/spi/spi_nrfx_spis.c b/drivers/spi/spi_nrfx_spis.c
index 50d37d0dc06..daa382c4137 100644
--- a/drivers/spi/spi_nrfx_spis.c
+++ b/drivers/spi/spi_nrfx_spis.c
@@ -19,6 +19,10 @@ LOG_MODULE_REGISTER(spi_nrfx_spis, CONFIG_SPI_LOG_LEVEL);
 
 #include "spi_context.h"
 
+#ifdef CONFIG_SOC_NRF54H20_GPD
+#include <nrf/gpd.h>
+#endif
+
 struct spi_nrfx_data {
 	struct spi_context ctx;
 	const struct device *dev;
@@ -31,6 +35,9 @@ struct spi_nrfx_config {
 	nrfx_spis_config_t config;
 	void (*irq_connect)(void);
 	uint16_t max_buf_len;
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	bool gpd_ctrl;
+#endif
 	const struct pinctrl_dev_config *pcfg;
 	struct gpio_dt_spec wake_gpio;
 };
@@ -299,6 +306,12 @@ static void spi_nrfx_suspend(const struct device *dev)
 		nrf_spis_disable(dev_config->spis.p_reg);
 	}
 
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	if (dev_config->gpd_ctrl) {
+		nrf_gpd_retain_pins_set(dev_config->pcfg, true);
+	}
+#endif
+
 	(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
 }
 
@@ -308,6 +321,12 @@ static void spi_nrfx_resume(const struct device *dev)
 
 	(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_DEFAULT);
 
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	if (dev_config->gpd_ctrl) {
+		nrf_gpd_retain_pins_set(dev_config->pcfg, false);
+	}
+#endif
+
 	if (dev_config->wake_gpio.port == NULL) {
 		nrf_spis_enable(dev_config->spis.p_reg);
 	}
@@ -338,11 +357,6 @@ static int spi_nrfx_init(const struct device *dev)
 	nrfx_err_t result;
 	int err;
 
-	err = pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_DEFAULT);
-	if (err < 0) {
-		return err;
-	}
-
 	/* This sets only default values of mode and bit order. The ones to be
 	 * actually used are set in configure() when a transfer is prepared.
 	 */
@@ -435,6 +449,9 @@ static int spi_nrfx_init(const struct device *dev)
 		.irq_connect = irq_connect##idx,			       \
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(SPIS(idx)),		       \
 		.max_buf_len = BIT_MASK(SPIS_PROP(idx, easydma_maxcnt_bits)),  \
+		IF_ENABLED(CONFIG_SOC_NRF54H20_GPD,			       \
+			(.gpd_ctrl = NRF_PERIPH_GET_FREQUENCY(SPIS(idx)) >     \
+				NRFX_MHZ_TO_HZ(16UL),))			       \
 		.wake_gpio = GPIO_DT_SPEC_GET_OR(SPIS(idx), wake_gpios, {0}),  \
 	};								       \
 	BUILD_ASSERT(!DT_NODE_HAS_PROP(SPIS(idx), wake_gpios) ||	       \

From 7077ffd9a7b72b26642bb762b9c91117be9b5808 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Fri, 28 Feb 2025 13:04:04 +0100
Subject: [PATCH 2720/2913] [nrf fromtree] drivers: spi: nrf: add support for
 SPIS120 instance

SPIS120 is a SPI slave device with >8 MHz SCK compatibility.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit f13c8a59e2888a9a921b6cf43e65e3f60a8d77c0)
---
 drivers/spi/spi_nrfx_spis.c | 57 +++++++++++++++++++++++++++++++++----
 1 file changed, 51 insertions(+), 6 deletions(-)

diff --git a/drivers/spi/spi_nrfx_spis.c b/drivers/spi/spi_nrfx_spis.c
index daa382c4137..049154f791d 100644
--- a/drivers/spi/spi_nrfx_spis.c
+++ b/drivers/spi/spi_nrfx_spis.c
@@ -8,6 +8,7 @@
 #include <zephyr/drivers/spi/rtio.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/gpio.h>
+#include <dmm.h>
 #include <soc.h>
 #include <nrfx_spis.h>
 #include <zephyr/pm/device.h>
@@ -40,6 +41,7 @@ struct spi_nrfx_config {
 #endif
 	const struct pinctrl_dev_config *pcfg;
 	struct gpio_dt_spec wake_gpio;
+	void *mem_reg;
 };
 
 static inline nrf_spis_mode_t get_nrf_spis_mode(uint16_t operation)
@@ -125,7 +127,11 @@ static int prepare_for_transfer(const struct device *dev,
 				uint8_t *rx_buf, size_t rx_buf_len)
 {
 	const struct spi_nrfx_config *dev_config = dev->config;
+	struct spi_nrfx_data *dev_data = dev->data;
 	nrfx_err_t result;
+	uint8_t *dmm_tx_buf;
+	uint8_t *dmm_rx_buf;
+	int err;
 
 	if (tx_buf_len > dev_config->max_buf_len ||
 	    rx_buf_len > dev_config->max_buf_len) {
@@ -134,14 +140,36 @@ static int prepare_for_transfer(const struct device *dev,
 		return -EINVAL;
 	}
 
+	err = dmm_buffer_out_prepare(dev_config->mem_reg, tx_buf, tx_buf_len, (void **)&dmm_tx_buf);
+	if (err != 0) {
+		LOG_ERR("DMM TX allocation failed err=%d", err);
+		goto out_alloc_failed;
+	}
+
+	/* Keep user RX buffer address to copy data from DMM RX buffer on transfer completion. */
+	dev_data->ctx.rx_buf = rx_buf;
+	err = dmm_buffer_in_prepare(dev_config->mem_reg, rx_buf, rx_buf_len, (void **)&dmm_rx_buf);
+	if (err != 0) {
+		LOG_ERR("DMM RX allocation failed err=%d", err);
+		goto in_alloc_failed;
+	}
+
 	result = nrfx_spis_buffers_set(&dev_config->spis,
-				       tx_buf, tx_buf_len,
-				       rx_buf, rx_buf_len);
+				       dmm_tx_buf, tx_buf_len,
+				       dmm_rx_buf, rx_buf_len);
 	if (result != NRFX_SUCCESS) {
-		return -EIO;
+		err = -EIO;
+		goto buffers_set_failed;
 	}
 
 	return 0;
+
+buffers_set_failed:
+	dmm_buffer_in_release(dev_config->mem_reg, rx_buf, rx_buf_len, rx_buf);
+in_alloc_failed:
+	dmm_buffer_out_release(dev_config->mem_reg, (void *)tx_buf);
+out_alloc_failed:
+	return err;
 }
 
 static void wake_callback(const struct device *dev, struct gpio_callback *cb,
@@ -288,9 +316,22 @@ static DEVICE_API(spi, spi_nrfx_driver_api) = {
 
 static void event_handler(const nrfx_spis_evt_t *p_event, void *p_context)
 {
-	struct spi_nrfx_data *dev_data = p_context;
+	const struct device *dev = p_context;
+	struct spi_nrfx_data *dev_data = dev->data;
+	const struct spi_nrfx_config *dev_config = dev->config;
 
 	if (p_event->evt_type == NRFX_SPIS_XFER_DONE) {
+		int err;
+
+
+		err = dmm_buffer_out_release(dev_config->mem_reg, p_event->p_tx_buf);
+		(void)err;
+		__ASSERT_NO_MSG(err == 0);
+
+		err = dmm_buffer_in_release(dev_config->mem_reg, dev_data->ctx.rx_buf,
+				      p_event->rx_amount, p_event->p_rx_buf);
+		__ASSERT_NO_MSG(err == 0);
+
 		spi_context_complete(&dev_data->ctx, dev_data->dev,
 				     p_event->rx_amount);
 
@@ -361,7 +402,7 @@ static int spi_nrfx_init(const struct device *dev)
 	 * actually used are set in configure() when a transfer is prepared.
 	 */
 	result = nrfx_spis_init(&dev_config->spis, &dev_config->config,
-				event_handler, dev_data);
+				event_handler, (void *)dev);
 
 	if (result != NRFX_SUCCESS) {
 		LOG_ERR("Failed to initialize device: %s", dev->name);
@@ -416,7 +457,10 @@ static int spi_nrfx_init(const struct device *dev)
  * - Name-based HAL IRQ handlers, e.g. nrfx_spis_0_irq_handler
  */
 
-#define SPIS(idx) DT_NODELABEL(spi##idx)
+#define SPIS_NODE(idx) COND_CODE_1(IS_EQ(idx, 120), (spis##idx), (spi##idx))
+
+#define SPIS(idx) DT_NODELABEL(SPIS_NODE(idx))
+
 #define SPIS_PROP(idx, prop) DT_PROP(SPIS(idx), prop)
 
 #define SPI_NRFX_SPIS_DEFINE(idx)					       \
@@ -453,6 +497,7 @@ static int spi_nrfx_init(const struct device *dev)
 			(.gpd_ctrl = NRF_PERIPH_GET_FREQUENCY(SPIS(idx)) >     \
 				NRFX_MHZ_TO_HZ(16UL),))			       \
 		.wake_gpio = GPIO_DT_SPEC_GET_OR(SPIS(idx), wake_gpios, {0}),  \
+		.mem_reg = DMM_DEV_TO_REG(SPIS(idx)),			       \
 	};								       \
 	BUILD_ASSERT(!DT_NODE_HAS_PROP(SPIS(idx), wake_gpios) ||	       \
 		     !(DT_GPIO_FLAGS(SPIS(idx), wake_gpios) & GPIO_ACTIVE_LOW),\

From f4a7530fa645f9efa49675150738d1b969348012 Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Fri, 28 Feb 2025 13:06:22 +0100
Subject: [PATCH 2721/2913] [nrf fromtree] tests: drivers: spi: add test case
 for nRF54H20 SPIS120

New test case is for building an application simultaneously
utilizing SPIM120, SPIM120, SPIS120 and SPIS13x.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 8b77098ca1357b7d998ae83e3cf10baf9560d4a3)
---
 ...f54h20dk_nrf54h20_cpuapp_fast_spis.overlay | 138 ++++++++++++++++++
 .../spi_controller_peripheral/testcase.yaml   |  12 ++
 2 files changed, 150 insertions(+)
 create mode 100644 tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast_spis.overlay

diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast_spis.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast_spis.overlay
new file mode 100644
index 00000000000..36b5dcb0629
--- /dev/null
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast_spis.overlay
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	spis120_default_alt: spis120_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 6, 0)>,
+				<NRF_PSEL(SPIS_MISO, 6, 3)>,
+				<NRF_PSEL(SPIS_MOSI, 6, 4)>,
+				<NRF_PSEL(SPIS_CSN, 6, 9)>;
+		};
+	};
+
+	spis120_sleep_alt: spis120_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 6, 0)>,
+				<NRF_PSEL(SPIS_MISO, 6, 3)>,
+				<NRF_PSEL(SPIS_MOSI, 6, 4)>,
+				<NRF_PSEL(SPIS_CSN, 6, 9)>;
+			low-power-enable;
+		};
+	};
+
+	spi120_default_alt: spi120_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 7, 3)>,
+				<NRF_PSEL(SPIM_MISO, 7, 6)>,
+				<NRF_PSEL(SPIM_MOSI, 7, 7)>;
+		};
+	};
+
+	spi120_sleep_alt: spi120_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 7, 3)>,
+				<NRF_PSEL(SPIM_MISO, 7, 6)>,
+				<NRF_PSEL(SPIM_MOSI, 7, 7)>;
+			low-power-enable;
+		};
+	};
+
+	spi121_default_alt: spi121_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 7, 2)>,
+				<NRF_PSEL(SPIM_MISO, 7, 0)>,
+				<NRF_PSEL(SPIM_MOSI, 7, 1)>;
+		};
+	};
+
+	spi121_sleep_alt: spi121_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 7, 2)>,
+				<NRF_PSEL(SPIM_MISO, 7, 0)>,
+				<NRF_PSEL(SPIM_MOSI, 7, 1)>;
+			low-power-enable;
+		};
+	};
+
+	spis131_default_alt: spis131_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 1, 0)>,
+				<NRF_PSEL(SPIS_MISO, 1, 9)>,
+				<NRF_PSEL(SPIS_MOSI, 1, 5)>,
+				<NRF_PSEL(SPIS_CSN, 0, 11)>;
+		};
+	};
+
+	spis131_sleep_alt: spis131_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 1, 0)>,
+				<NRF_PSEL(SPIS_MISO, 1, 9)>,
+				<NRF_PSEL(SPIS_MOSI, 1, 5)>,
+				<NRF_PSEL(SPIS_CSN, 0, 11)>;
+			low-power-enable;
+		};
+	};
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&dma_fast_region {
+	status = "okay";
+};
+
+&spis120 {
+	compatible = "nordic,nrf-spis";
+	status = "okay";
+	def-char = <0x00>;
+	pinctrl-0 = <&spis120_default_alt>;
+	pinctrl-1 = <&spis120_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	memory-regions = <&dma_fast_region>;
+};
+
+&spi120 {
+	compatible = "nordic,nrf-spim";
+	status = "okay";
+	pinctrl-0 = <&spi120_default_alt>;
+	pinctrl-1 = <&spi120_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	overrun-character = <0x00>;
+	memory-regions = <&dma_fast_region>;
+	cs-gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
+	dut_spi_dt: test-spi-dev@0 {
+		compatible = "vnd,spi-device";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(8)>;
+	};
+};
+
+&spi121 {
+	compatible = "nordic,nrf-spim";
+	status = "okay";
+	pinctrl-0 = <&spi121_default_alt>;
+	pinctrl-1 = <&spi121_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	overrun-character = <0x00>;
+	memory-regions = <&dma_fast_region>;
+	cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
+};
+
+dut_spis: &spi131 {
+	compatible = "nordic,nrf-spis";
+	status = "okay";
+	def-char = <0x00>;
+	pinctrl-0 = <&spis131_default_alt>;
+	pinctrl-1 = <&spis131_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	memory-regions = <&cpuapp_dma_region>;
+	/delete-property/rx-delay-supported;
+	/delete-property/rx-delay;
+};
diff --git a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
index 6bc5644d770..ca153293f57 100644
--- a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
+++ b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
@@ -66,6 +66,18 @@ tests:
       - nrf54h20dk/nrf54h20/cpuppr
       - nrf54l20pdk/nrf54l20/cpuapp
 
+  drivers.spi.spis_fast:
+    # SPIS120 instance occupies P6 which is not available on nRF54H20 DK pin headers
+    # It is added only to check the compilation.
+    build_only: true
+    extra_args: DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast_spis.overlay"
+    platform_exclude:
+      - nrf52840dk/nrf52840
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54h20dk/nrf54h20/cpurad
+      - nrf54h20dk/nrf54h20/cpuppr
+      - nrf54l20pdk/nrf54l20/cpuapp
+
   drivers.spi.pm_runtime:
     extra_configs:
       - CONFIG_PM_DEVICE=y

From 772d12bfa05c12c4062c6ae20a6cf65bac8e8013 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Wed, 26 Mar 2025 10:40:07 +0100
Subject: [PATCH 2722/2913] Revert "[nrf fromlist] boards: nordic: Add nRF54L09
 FLPR"

This reverts commit 3b020308b067bac1840164bff6a5246a53e0d2ac.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk |  1 -
 boards/nordic/nrf54l09pdk/board.cmake         |  6 +-
 boards/nordic/nrf54l09pdk/board.yml           |  3 -
 .../nrf54l09pdk_nrf54l09-common.dtsi          | 12 ----
 .../nrf54l09pdk_nrf54l09-pinctrl.dtsi         | 22 -------
 .../nrf54l09pdk_nrf54l09_cpuflpr.dts          | 64 -------------------
 .../nrf54l09pdk_nrf54l09_cpuflpr.yaml         | 14 ----
 .../nrf54l09pdk_nrf54l09_cpuflpr_defconfig    | 19 ------
 8 files changed, 1 insertion(+), 140 deletions(-)
 delete mode 100644 boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts
 delete mode 100644 boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml
 delete mode 100644 boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig

diff --git a/boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk b/boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk
index 6fbd4a89c8f..bc6aa676281 100644
--- a/boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk
+++ b/boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk
@@ -3,4 +3,3 @@
 
 config BOARD_NRF54L09PDK
 	select SOC_NRF54L09_ENGA_CPUAPP if BOARD_NRF54L09PDK_NRF54L09_CPUAPP
-	select SOC_NRF54L09_ENGA_CPUFLPR if BOARD_NRF54L09PDK_NRF54L09_CPUFLPR
diff --git a/boards/nordic/nrf54l09pdk/board.cmake b/boards/nordic/nrf54l09pdk/board.cmake
index f2dd60410ed..5d36ac00a3e 100644
--- a/boards/nordic/nrf54l09pdk/board.cmake
+++ b/boards/nordic/nrf54l09pdk/board.cmake
@@ -1,11 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if (CONFIG_BOARD_NRF54L09PDK_NRF54L09_CPUAPP)
-  board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
-elseif (CONFIG_BOARD_NRF54L09PDK_NRF54L09_CPUFLPR)
-  board_runner_args(jlink "--speed=4000")
-endif()
+board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
 
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf54l09pdk/board.yml b/boards/nordic/nrf54l09pdk/board.yml
index bfa8419dff9..b35f4c1fafe 100644
--- a/boards/nordic/nrf54l09pdk/board.yml
+++ b/boards/nordic/nrf54l09pdk/board.yml
@@ -4,6 +4,3 @@ board:
   vendor: nordic
   socs:
   - name: nrf54l09
-    variants:
-    - name: xip
-      cpucluster: cpuflpr
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi
index f1e9ee9afd8..769b776aa1f 100644
--- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi
@@ -60,15 +60,3 @@
 	pinctrl-1 = <&uart20_sleep>;
 	pinctrl-names = "default", "sleep";
 };
-
-&uart30 {
-	current-speed = <115200>;
-	pinctrl-0 = <&uart30_default>;
-	pinctrl-1 = <&uart30_sleep>;
-	pinctrl-names = "default", "sleep";
-};
-
-&hfpll {
-	/* For now use 64 MHz clock for CPU and fast peripherals. */
-	clock-frequency = <DT_FREQ_M(64)>;
-};
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi
index 12b9aff7822..83aa91d8a34 100644
--- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi
@@ -21,26 +21,4 @@
 			low-power-enable;
 		};
 	};
-
-	/omit-if-no-ref/ uart30_default: uart30_default {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 0, 0)>,
-				<NRF_PSEL(UART_RTS, 0, 2)>;
-		};
-		group2 {
-			psels = <NRF_PSEL(UART_RX, 0, 1)>,
-				<NRF_PSEL(UART_CTS, 0, 3)>;
-			bias-pull-up;
-		};
-	};
-
-	/omit-if-no-ref/ uart30_sleep: uart30_sleep {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 0, 0)>,
-				<NRF_PSEL(UART_RX, 0, 1)>,
-				<NRF_PSEL(UART_RTS, 0, 2)>,
-				<NRF_PSEL(UART_CTS, 0, 3)>;
-			low-power-enable;
-		};
-	};
 };
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts
deleted file mode 100644
index 3ae2dac9c5d..00000000000
--- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2025 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-#include <nordic/nrf54l09_enga_cpuflpr.dtsi>
-#include "nrf54l09pdk_nrf54l09-common.dtsi"
-
-/ {
-	model = "Nordic nRF54L09 PDK nRF54L09 FLPR MCU";
-	compatible = "nordic,nrf54l09pdk_nrf54l09-cpuflpr";
-
-	chosen {
-		zephyr,console = &uart30;
-		zephyr,shell-uart = &uart30;
-		zephyr,code-partition = &cpuflpr_code_partition;
-		zephyr,flash = &cpuflpr_rram;
-		zephyr,sram = &cpuflpr_sram;
-	};
-};
-
-&cpuflpr_sram {
-	status = "okay";
-};
-
-&cpuflpr_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		cpuflpr_code_partition: partition@0 {
-			label = "image-0";
-			reg = <0x0 DT_SIZE_K(60)>;
-		};
-	};
-};
-
-&grtc {
-	owned-channels = <3 4>;
-	status = "okay";
-};
-
-&uart30 {
-	status = "okay";
-};
-
-&gpio0 {
-	status = "okay";
-};
-
-&gpio1 {
-	status = "okay";
-};
-
-&gpiote20 {
-	status = "okay";
-};
-
-&gpiote30 {
-	status = "okay";
-};
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml
deleted file mode 100644
index 47d03bb2ed9..00000000000
--- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2025 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: nrf54l09pdk/nrf54l09/cpuflpr
-name: nRF54L09-PDK-nRF54L09-Fast-Lightweight-Peripheral-Processor
-type: mcu
-arch: riscv
-toolchain:
-  - zephyr
-ram: 48
-flash: 60
-supported:
-  - counter
-  - gpio
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig
deleted file mode 100644
index 75f7c4386e3..00000000000
--- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2025 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-# Enable UART driver
-CONFIG_SERIAL=y
-
-# Enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-
-# Enable GPIO
-CONFIG_GPIO=y
-
-CONFIG_USE_DT_CODE_PARTITION=y
-
-# Execute from SRAM
-CONFIG_XIP=n
-
-CONFIG_RISCV_ALWAYS_SWITCH_THROUGH_ECALL=y

From 72a47b66522ffcb55301ea399af2e029aa72e736 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Wed, 26 Mar 2025 10:41:10 +0100
Subject: [PATCH 2723/2913] Revert "[nrf fromlist] soc: nordic: Add nRF54L09
 FLPR"

This reverts commit 79b52ed9eb93254d91a2797e5dc3938d0722c1c8.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 soc/nordic/common/vpr/Kconfig.sysbuild                |  2 +-
 soc/nordic/nrf54l/Kconfig                             |  3 ---
 .../nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuflpr    | 11 -----------
 soc/nordic/nrf54l/Kconfig.soc                         |  7 -------
 soc/nordic/soc.yml                                    |  2 --
 5 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuflpr

diff --git a/soc/nordic/common/vpr/Kconfig.sysbuild b/soc/nordic/common/vpr/Kconfig.sysbuild
index 4dcc06face8..eb62e3708bf 100644
--- a/soc/nordic/common/vpr/Kconfig.sysbuild
+++ b/soc/nordic/common/vpr/Kconfig.sysbuild
@@ -4,7 +4,7 @@
 config VPR_LAUNCHER
 	bool "VPR launcher"
 	default y
-	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF9280_CPUPPR)
+	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF9280_CPUPPR)
 	help
 	  Include VPR launcher in build.
 	  VPR launcher is a minimal sample built for an ARM core that starts given VPR core.
diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index 8f7297b75fe..fe7afd55b16 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -37,9 +37,6 @@ config SOC_NRF54L15_CPUAPP
 config SOC_NRF54L05_CPUFLPR
 	select RISCV_CORE_NORDIC_VPR
 
-config SOC_NRF54L09_ENGA_CPUFLPR
-	select RISCV_CORE_NORDIC_VPR
-
 config SOC_NRF54L10_CPUFLPR
 	select RISCV_CORE_NORDIC_VPR
 
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuflpr b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuflpr
deleted file mode 100644
index c471e105db2..00000000000
--- a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuflpr
+++ /dev/null
@@ -1,11 +0,0 @@
-# Nordic Semiconductor nRF54L09 MCU
-
-# Copyright (c) 2025 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_NRF54L09_ENGA_CPUFLPR
-
-config NUM_IRQS
-	default 287
-
-endif # SOC_NRF54L09_ENGA_CPUFLPR
diff --git a/soc/nordic/nrf54l/Kconfig.soc b/soc/nordic/nrf54l/Kconfig.soc
index 80675b0ac37..f86b7bd4858 100644
--- a/soc/nordic/nrf54l/Kconfig.soc
+++ b/soc/nordic/nrf54l/Kconfig.soc
@@ -39,13 +39,6 @@ config SOC_NRF54L09_ENGA_CPUAPP
 	help
 	  NRF54L09 ENGA CPUAPP
 
-config SOC_NRF54L09_ENGA_CPUFLPR
-	bool
-	select SOC_NRF54L09_ENGA
-	help
-	  NRF54L09 ENGA CPUFLPR
-
-
 config SOC_NRF54L10
 	bool
 	select SOC_SERIES_NRF54LX
diff --git a/soc/nordic/soc.yml b/soc/nordic/soc.yml
index 77511827ea7..252061fc008 100644
--- a/soc/nordic/soc.yml
+++ b/soc/nordic/soc.yml
@@ -28,7 +28,6 @@ family:
           - name: nrf54l09
             cpuclusters:
               - name: cpuapp
-              - name: cpuflpr
           - name: nrf54l10
             cpuclusters:
               - name: cpuapp
@@ -112,7 +111,6 @@ runners:
               - nrf54l05/cpuflpr
           - qualifiers:
               - nrf54l09/cpuapp
-              - nrf54l09/cpuflpr
           - qualifiers:
               - nrf54l10/cpuapp
               - nrf54l10/cpuflpr

From bab6d31fe9cbf8c3b1bab355bdf6bb1a0cf35eeb Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 6 Feb 2025 13:53:39 +0100
Subject: [PATCH 2724/2913] [nrf fromlist] soc: nordic: Add nRF54L09 FLPR

Add nrF54L09 FLPR core support.

Upstream PR #: 85310

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 soc/nordic/common/vpr/Kconfig.sysbuild                |  2 +-
 soc/nordic/nrf54l/Kconfig                             |  3 +++
 .../nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuflpr    | 11 +++++++++++
 soc/nordic/nrf54l/Kconfig.soc                         |  6 ++++++
 soc/nordic/soc.yml                                    |  4 ++++
 5 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuflpr

diff --git a/soc/nordic/common/vpr/Kconfig.sysbuild b/soc/nordic/common/vpr/Kconfig.sysbuild
index eb62e3708bf..4dcc06face8 100644
--- a/soc/nordic/common/vpr/Kconfig.sysbuild
+++ b/soc/nordic/common/vpr/Kconfig.sysbuild
@@ -4,7 +4,7 @@
 config VPR_LAUNCHER
 	bool "VPR launcher"
 	default y
-	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF9280_CPUPPR)
+	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF9280_CPUPPR)
 	help
 	  Include VPR launcher in build.
 	  VPR launcher is a minimal sample built for an ARM core that starts given VPR core.
diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index fe7afd55b16..8f7297b75fe 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -37,6 +37,9 @@ config SOC_NRF54L15_CPUAPP
 config SOC_NRF54L05_CPUFLPR
 	select RISCV_CORE_NORDIC_VPR
 
+config SOC_NRF54L09_ENGA_CPUFLPR
+	select RISCV_CORE_NORDIC_VPR
+
 config SOC_NRF54L10_CPUFLPR
 	select RISCV_CORE_NORDIC_VPR
 
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuflpr b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuflpr
new file mode 100644
index 00000000000..c471e105db2
--- /dev/null
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuflpr
@@ -0,0 +1,11 @@
+# Nordic Semiconductor nRF54L09 MCU
+
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_NRF54L09_ENGA_CPUFLPR
+
+config NUM_IRQS
+	default 287
+
+endif # SOC_NRF54L09_ENGA_CPUFLPR
diff --git a/soc/nordic/nrf54l/Kconfig.soc b/soc/nordic/nrf54l/Kconfig.soc
index f86b7bd4858..5fd8260b9bb 100644
--- a/soc/nordic/nrf54l/Kconfig.soc
+++ b/soc/nordic/nrf54l/Kconfig.soc
@@ -39,6 +39,12 @@ config SOC_NRF54L09_ENGA_CPUAPP
 	help
 	  NRF54L09 ENGA CPUAPP
 
+config SOC_NRF54L09_ENGA_CPUFLPR
+	bool
+	select SOC_NRF54L09_ENGA
+	help
+	  NRF54L09 ENGA CPUFLPR
+
 config SOC_NRF54L10
 	bool
 	select SOC_SERIES_NRF54LX
diff --git a/soc/nordic/soc.yml b/soc/nordic/soc.yml
index 252061fc008..105ad7d506a 100644
--- a/soc/nordic/soc.yml
+++ b/soc/nordic/soc.yml
@@ -28,6 +28,7 @@ family:
           - name: nrf54l09
             cpuclusters:
               - name: cpuapp
+              - name: cpuflpr
           - name: nrf54l10
             cpuclusters:
               - name: cpuapp
@@ -111,6 +112,7 @@ runners:
               - nrf54l05/cpuflpr
           - qualifiers:
               - nrf54l09/cpuapp
+              - nrf54l09/cpuflpr
           - qualifiers:
               - nrf54l10/cpuapp
               - nrf54l10/cpuflpr
@@ -174,6 +176,7 @@ runners:
               - nrf54l05/cpuflpr
           - qualifiers:
               - nrf54l09/cpuapp
+              - nrf54l09/cpuflpr
           - qualifiers:
               - nrf54l10/cpuapp
               - nrf54l10/cpuflpr
@@ -237,6 +240,7 @@ runners:
               - nrf54l05/cpuflpr
           - qualifiers:
               - nrf54l09/cpuapp
+              - nrf54l09/cpuflpr
           - qualifiers:
               - nrf54l10/cpuapp
               - nrf54l10/cpuflpr

From a80a94e07ab07ff2597060c0d711b7344018333b Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Thu, 6 Feb 2025 14:00:21 +0100
Subject: [PATCH 2725/2913] [nrf fromlist] boards: nordic: Add nRF54L09 FLPR

Add nrF54L09 FLPR core support.

Upstream PR #: 85310

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk |  1 +
 boards/nordic/nrf54l09pdk/board.cmake         |  6 +-
 .../nrf54l09pdk_nrf54l09-common.dtsi          | 12 ++++
 .../nrf54l09pdk_nrf54l09-pinctrl.dtsi         | 23 +++++++
 .../nrf54l09pdk_nrf54l09_cpuflpr.dts          | 64 +++++++++++++++++++
 .../nrf54l09pdk_nrf54l09_cpuflpr.yaml         | 15 +++++
 .../nrf54l09pdk_nrf54l09_cpuflpr_defconfig    | 17 +++++
 7 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100644 boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts
 create mode 100644 boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml
 create mode 100644 boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig

diff --git a/boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk b/boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk
index bc6aa676281..6fbd4a89c8f 100644
--- a/boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk
+++ b/boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk
@@ -3,3 +3,4 @@
 
 config BOARD_NRF54L09PDK
 	select SOC_NRF54L09_ENGA_CPUAPP if BOARD_NRF54L09PDK_NRF54L09_CPUAPP
+	select SOC_NRF54L09_ENGA_CPUFLPR if BOARD_NRF54L09PDK_NRF54L09_CPUFLPR
diff --git a/boards/nordic/nrf54l09pdk/board.cmake b/boards/nordic/nrf54l09pdk/board.cmake
index 5d36ac00a3e..89977a4cef6 100644
--- a/boards/nordic/nrf54l09pdk/board.cmake
+++ b/boards/nordic/nrf54l09pdk/board.cmake
@@ -1,7 +1,11 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
+if(CONFIG_BOARD_NRF54L09PDK_NRF54L09_CPUAPP)
+  board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
+elseif(CONFIG_BOARD_NRF54L09PDK_NRF54L09_CPUFLPR)
+  board_runner_args(jlink "--speed=4000")
+endif()
 
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi
index 769b776aa1f..f1e9ee9afd8 100644
--- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi
@@ -60,3 +60,15 @@
 	pinctrl-1 = <&uart20_sleep>;
 	pinctrl-names = "default", "sleep";
 };
+
+&uart30 {
+	current-speed = <115200>;
+	pinctrl-0 = <&uart30_default>;
+	pinctrl-1 = <&uart30_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&hfpll {
+	/* For now use 64 MHz clock for CPU and fast peripherals. */
+	clock-frequency = <DT_FREQ_M(64)>;
+};
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi
index 83aa91d8a34..ac08b201f93 100644
--- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi
@@ -21,4 +21,27 @@
 			low-power-enable;
 		};
 	};
+
+	/omit-if-no-ref/ uart30_default: uart30_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RTS, 0, 2)>;
+		};
+
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 0, 1)>,
+				<NRF_PSEL(UART_CTS, 0, 3)>;
+			bias-pull-up;
+		};
+	};
+
+	/omit-if-no-ref/ uart30_sleep: uart30_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RX, 0, 1)>,
+				<NRF_PSEL(UART_RTS, 0, 2)>,
+				<NRF_PSEL(UART_CTS, 0, 3)>;
+			low-power-enable;
+		};
+	};
 };
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts
new file mode 100644
index 00000000000..3a1e3c7dd51
--- /dev/null
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf54l09_enga_cpuflpr.dtsi>
+#include "nrf54l09pdk_nrf54l09-common.dtsi"
+
+/ {
+	model = "Nordic nRF54L09 PDK nRF54L09 FLPR MCU";
+	compatible = "nordic,nrf54l09pdk_nrf54l09-cpuflpr";
+
+	chosen {
+		zephyr,console = &uart30;
+		zephyr,shell-uart = &uart30;
+		zephyr,code-partition = &cpuflpr_code_partition;
+		zephyr,flash = &cpuflpr_rram;
+		zephyr,sram = &cpuflpr_sram;
+	};
+};
+
+&cpuflpr_sram {
+	status = "okay";
+};
+
+&cpuflpr_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		cpuflpr_code_partition: partition@0 {
+			label = "image-0";
+			reg = <0x0 DT_SIZE_K(48)>;
+		};
+	};
+};
+
+&grtc {
+	owned-channels = <3 4>;
+	status = "okay";
+};
+
+&uart30 {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpiote30 {
+	status = "okay";
+};
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml
new file mode 100644
index 00000000000..01e5c9ffbee
--- /dev/null
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml
@@ -0,0 +1,15 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54l09pdk/nrf54l09/cpuflpr
+name: nRF54L09-PDK-nRF54L09-Fast-Lightweight-Peripheral-Processor
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 48
+flash: 48
+supported:
+  - counter
+  - gpio
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig
new file mode 100644
index 00000000000..90cf13bdee5
--- /dev/null
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig
@@ -0,0 +1,17 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+CONFIG_USE_DT_CODE_PARTITION=y
+
+# Execute from SRAM
+CONFIG_XIP=n

From 65aacb40eafb6c381fac83510381d4a09722a491 Mon Sep 17 00:00:00 2001
From: Luca Burelli <l.burelli@arduino.cc>
Date: Thu, 17 Oct 2024 10:47:40 +0200
Subject: [PATCH 2726/2913] [nrf fromtree] cmake: yaml: refactor yaml_set()
 list operations

This introductory commit refactors the `yaml_set` function separating
the bodies of list operations into internal functions while preserving
their original behavior.

The conditions that cause the value to be interpreted as a list are also
verified only once, avoiding multiple checks.

Signed-off-by: Luca Burelli <l.burelli@arduino.cc>
(cherry picked from commit cf5607fb0193e2a15ba16c4b0341feae3fcb95e3)
---
 cmake/modules/yaml.cmake | 55 ++++++++++++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 14 deletions(-)

diff --git a/cmake/modules/yaml.cmake b/cmake/modules/yaml.cmake
index 9ab9b333fa4..b5631c43dff 100644
--- a/cmake/modules/yaml.cmake
+++ b/cmake/modules/yaml.cmake
@@ -72,6 +72,29 @@ function(internal_yaml_context_free)
   endif()
 endfunction()
 
+# Internal helper function to provide the correct initializer for a list in the
+# JSON content.
+function(internal_yaml_list_initializer var)
+  set(${var} "[]" PARENT_SCOPE)
+endfunction()
+
+# Internal helper function to append items to a list in the JSON content.
+# Unassigned arguments are the values to be appended.
+function(internal_yaml_list_append var key)
+  set(json_content "${${var}}")
+  string(JSON subjson GET "${json_content}" ${key})
+  string(JSON index LENGTH "${subjson}")
+  list(LENGTH ARGN length)
+  math(EXPR stop "${index} + ${length} - 1")
+  if(NOT length EQUAL 0)
+    foreach(i RANGE ${index} ${stop})
+      list(POP_FRONT ARGN value)
+      string(JSON json_content SET "${json_content}" ${key} ${i} "\"${value}\"")
+    endforeach()
+  endif()
+  set(${var} "${json_content}" PARENT_SCOPE)
+endfunction()
+
 # Usage
 #   yaml_context(EXISTS NAME <name> <result>)
 #
@@ -265,6 +288,18 @@ function(yaml_set)
 
   zephyr_get_scoped(json_content ${ARG_YAML_NAME} JSON)
 
+  if(DEFINED ARG_YAML_LIST
+     OR LIST IN_LIST ARG_YAML_KEYWORDS_MISSING_VALUES)
+    set(key_is_list TRUE)
+  endif()
+
+  if(ARG_YAML_APPEND AND NOT key_is_list)
+    message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION}(APPEND ...) can only be used with argument: LIST")
+  endif()
+
+  zephyr_get_scoped(json_content ${ARG_YAML_NAME} JSON)
+  zephyr_get_scoped(genex ${ARG_YAML_NAME} GENEX)
+
   set(yaml_key_undefined ${ARG_YAML_KEY})
   foreach(k ${yaml_key_undefined})
     list(REMOVE_AT yaml_key_undefined 0)
@@ -281,8 +316,8 @@ function(yaml_set)
 
   list(REVERSE yaml_key_undefined)
   if(NOT "${yaml_key_undefined}" STREQUAL "")
-    if(ARG_YAML_APPEND)
-      set(json_string "[]")
+    if(key_is_list)
+      internal_yaml_list_initializer(json_string)
     else()
       set(json_string "\"\"")
     endif()
@@ -295,21 +330,13 @@ function(yaml_set)
     )
   endif()
 
-  if(DEFINED ARG_YAML_LIST OR LIST IN_LIST ARG_YAML_KEYWORDS_MISSING_VALUES)
+  if(key_is_list)
     if(NOT ARG_YAML_APPEND)
-      string(JSON json_content SET "${json_content}" ${ARG_YAML_KEY} "[]")
+      internal_yaml_list_initializer(json_string)
+      string(JSON json_content SET "${json_content}" ${ARG_YAML_KEY} "${json_string}")
     endif()
 
-    string(JSON subjson GET "${json_content}" ${ARG_YAML_KEY})
-    string(JSON index LENGTH "${subjson}")
-    list(LENGTH ARG_YAML_LIST length)
-    math(EXPR stop "${index} + ${length} - 1")
-    if(NOT length EQUAL 0)
-      foreach(i RANGE ${index} ${stop})
-        list(POP_FRONT ARG_YAML_LIST value)
-        string(JSON json_content SET "${json_content}" ${ARG_YAML_KEY} ${i} "\"${value}\"")
-      endforeach()
-    endif()
+    internal_yaml_list_append(json_content "${ARG_YAML_KEY}" ${ARG_YAML_LIST})
   else()
     string(JSON json_content SET "${json_content}" ${ARG_YAML_KEY} "\"${ARG_YAML_VALUE}\"")
   endif()

From 1ee5fdf998610753e307e00e96ac5802e20024e6 Mon Sep 17 00:00:00 2001
From: Luca Burelli <l.burelli@arduino.cc>
Date: Wed, 11 Dec 2024 11:20:27 +0100
Subject: [PATCH 2727/2913] [nrf fromtree] cmake: yaml: add support for
 generator expressions

This commit adds support for generator expressions in values and lists
to the yaml module.

Generator expressions can only be expanded by CMake after all
configuration code has been executed and the final values of the project
properties are defined. This means that contexts that contain generator
expressions are written twice:

 - immediately, during the 'yaml_save()' call, a comment with the raw
   unexpanded string is saved instead of the key that uses generator
   expressions in the YAML file;

 - after the configuration step, a custom command updates the YAML file
   contents with the fully expanded values.

This two-step process also allows to overcome the issue of lists that
are extracted from generator expressions, whose elements would be
expanded into a single string if written directly to the YAML file.
Instead, the lists are stored in their CMake string format with a
special marker, expanded by CMake into a temporary JSON file, and the
conversion to a proper list is performed during the build step.

If the saved YAML file for context <name> is needed by further build
steps in this project, the target '<name>_yaml_saved' must be added as a
dependency to ensure the final contents are ready.

Note that when generator expressions are used in the context, the GENEX
keyword must be provided to yaml_set(). This is necessary to avoid
storing the genexes as raw strings in the YAML.

Signed-off-by: Luca Burelli <l.burelli@arduino.cc>
(cherry picked from commit cdc7f05cc95219f3f949dfabe78b55aac3e5f13c)
---
 cmake/modules/yaml.cmake | 164 ++++++++++++++++++++++++++++++++-------
 cmake/yaml-filter.cmake  |  35 +++++++++
 2 files changed, 171 insertions(+), 28 deletions(-)
 create mode 100644 cmake/yaml-filter.cmake

diff --git a/cmake/modules/yaml.cmake b/cmake/modules/yaml.cmake
index b5631c43dff..83394d93051 100644
--- a/cmake/modules/yaml.cmake
+++ b/cmake/modules/yaml.cmake
@@ -74,23 +74,48 @@ endfunction()
 
 # Internal helper function to provide the correct initializer for a list in the
 # JSON content.
-function(internal_yaml_list_initializer var)
-  set(${var} "[]" PARENT_SCOPE)
+function(internal_yaml_list_initializer var genex)
+  if(genex)
+    set(${var} "\"@YAML-LIST@\"" PARENT_SCOPE)
+  else()
+    set(${var} "[]" PARENT_SCOPE)
+  endif()
 endfunction()
 
 # Internal helper function to append items to a list in the JSON content.
 # Unassigned arguments are the values to be appended.
-function(internal_yaml_list_append var key)
+function(internal_yaml_list_append var genex key)
   set(json_content "${${var}}")
   string(JSON subjson GET "${json_content}" ${key})
-  string(JSON index LENGTH "${subjson}")
-  list(LENGTH ARGN length)
-  math(EXPR stop "${index} + ${length} - 1")
-  if(NOT length EQUAL 0)
-    foreach(i RANGE ${index} ${stop})
-      list(POP_FRONT ARGN value)
-      string(JSON json_content SET "${json_content}" ${key} ${i} "\"${value}\"")
-    endforeach()
+  if(genex)
+    # new lists are stored in CMake string format, but those imported via
+    # yaml_load() are proper JSON arrays. When an append is requested, those
+    # must be converted back to a CMake list.
+    string(JSON type TYPE "${json_content}" ${key})
+    if(type STREQUAL ARRAY)
+      string(JSON arraylength LENGTH "${subjson}")
+      internal_yaml_list_initializer(subjson TRUE)
+      if(${arraylength} GREATER 0)
+        math(EXPR arraystop "${arraylength} - 1")
+        foreach(i RANGE 0 ${arraystop})
+          string(JSON item GET "${json_content}" ${key} ${i})
+          list(APPEND subjson ${item})
+        endforeach()
+      endif()
+    endif()
+    list(APPEND subjson ${ARGN})
+    string(JSON json_content SET "${json_content}" ${key} "\"${subjson}\"")
+  else()
+    # lists are stored as JSON arrays
+    string(JSON index LENGTH "${subjson}")
+    list(LENGTH ARGN length)
+    math(EXPR stop "${index} + ${length} - 1")
+    if(NOT length EQUAL 0)
+      foreach(i RANGE ${index} ${stop})
+        list(POP_FRONT ARGN value)
+        string(JSON json_content SET "${json_content}" ${key} ${i} "\"${value}\"")
+      endforeach()
+    endif()
   endif()
   set(${var} "${json_content}" PARENT_SCOPE)
 endfunction()
@@ -148,6 +173,7 @@ function(yaml_create)
   if(DEFINED ARG_YAML_FILE)
     zephyr_set(FILE ${ARG_YAML_FILE} SCOPE ${ARG_YAML_NAME})
   endif()
+  zephyr_set(GENEX FALSE SCOPE ${ARG_YAML_NAME})
   zephyr_set(JSON "{}" SCOPE ${ARG_YAML_NAME})
 endfunction()
 
@@ -172,7 +198,7 @@ function(yaml_load)
   zephyr_set(FILE ${ARG_YAML_FILE} SCOPE ${ARG_YAML_NAME})
 
   execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
-    "import json; import yaml; print(json.dumps(yaml.safe_load(open('${ARG_YAML_FILE}'))))"
+    "import json; import yaml; print(json.dumps(yaml.safe_load(open('${ARG_YAML_FILE}')) or {}))"
     OUTPUT_VARIABLE json_load_out
     ERROR_VARIABLE json_load_error
     RESULT_VARIABLE json_load_result
@@ -184,6 +210,7 @@ function(yaml_load)
     )
   endif()
 
+  zephyr_set(GENEX FALSE SCOPE ${ARG_YAML_NAME})
   zephyr_set(JSON "${json_load_out}" SCOPE ${ARG_YAML_NAME})
 endfunction()
 
@@ -264,8 +291,8 @@ function(yaml_length out_var)
 endfunction()
 
 # Usage:
-#   yaml_set(NAME <name> KEY <key>... VALUE <value>)
-#   yaml_set(NAME <name> KEY <key>... [APPEND] LIST <value>...)
+#   yaml_set(NAME <name> KEY <key>... [GENEX] VALUE <value>)
+#   yaml_set(NAME <name> KEY <key>... [APPEND] [GENEX] LIST <value>...)
 #
 # Set a value or a list of values to given key.
 #
@@ -275,18 +302,22 @@ endfunction()
 # NAME <name>  : Name of the YAML context.
 # KEY <key>... : Name of key.
 # VALUE <value>: New value for the key.
-# List <values>: New list of values for the key.
+# LIST <values>: New list of values for the key.
 # APPEND       : Append the list of values to the list of values for the key.
+# GENEX        : The value(s) contain generator expressions. When using this
+#                option, also see the notes in the yaml_save() function.
 #
 function(yaml_set)
-  cmake_parse_arguments(ARG_YAML "APPEND" "NAME;VALUE" "KEY;LIST" ${ARGN})
+  cmake_parse_arguments(ARG_YAML "APPEND;GENEX" "NAME;VALUE" "KEY;LIST" ${ARGN})
 
   zephyr_check_arguments_required_all(${CMAKE_CURRENT_FUNCTION} ARG_YAML NAME KEY)
   zephyr_check_arguments_required_allow_empty(${CMAKE_CURRENT_FUNCTION} ARG_YAML VALUE LIST)
   zephyr_check_arguments_exclusive(${CMAKE_CURRENT_FUNCTION} ARG_YAML VALUE LIST)
   internal_yaml_context_required(NAME ${ARG_YAML_NAME})
 
-  zephyr_get_scoped(json_content ${ARG_YAML_NAME} JSON)
+  if(ARG_YAML_GENEX)
+    zephyr_set(GENEX TRUE SCOPE ${ARG_YAML_NAME})
+  endif()
 
   if(DEFINED ARG_YAML_LIST
      OR LIST IN_LIST ARG_YAML_KEYWORDS_MISSING_VALUES)
@@ -317,7 +348,7 @@ function(yaml_set)
   list(REVERSE yaml_key_undefined)
   if(NOT "${yaml_key_undefined}" STREQUAL "")
     if(key_is_list)
-      internal_yaml_list_initializer(json_string)
+      internal_yaml_list_initializer(json_string ${genex})
     else()
       set(json_string "\"\"")
     endif()
@@ -332,11 +363,11 @@ function(yaml_set)
 
   if(key_is_list)
     if(NOT ARG_YAML_APPEND)
-      internal_yaml_list_initializer(json_string)
+      internal_yaml_list_initializer(json_string ${genex})
       string(JSON json_content SET "${json_content}" ${ARG_YAML_KEY} "${json_string}")
     endif()
 
-    internal_yaml_list_append(json_content "${ARG_YAML_KEY}" ${ARG_YAML_LIST})
+    internal_yaml_list_append(json_content ${genex} "${ARG_YAML_KEY}" ${ARG_YAML_LIST})
   else()
     string(JSON json_content SET "${json_content}" ${ARG_YAML_KEY} "\"${ARG_YAML_VALUE}\"")
   endif()
@@ -372,8 +403,12 @@ endfunction()
 # Usage:
 #   yaml_save(NAME <name> [FILE <file>])
 #
-# Write the YAML context <name> to the file which were given with the earlier
-# 'yaml_load()' or 'yaml_create()' call.
+# Write the YAML context <name> to <file>, or the one given with the earlier
+# 'yaml_load()' or 'yaml_create()' call. This will be performed immediately if
+# the context does not use generator expressions; otherwise, keys that include
+# a generator expression will initially be written as comments, and the full
+# contents will be available at build time. Build steps that depend on the file
+# being complete must depend on the '<name>_yaml_saved' target.
 #
 # NAME <name>: Name of the YAML context
 # FILE <file>: Path to file to write the context.
@@ -391,22 +426,67 @@ function(yaml_save)
   if(NOT yaml_file)
     zephyr_check_arguments_required(${CMAKE_CURRENT_FUNCTION} ARG_YAML FILE)
   endif()
-
-  zephyr_get_scoped(json_content ${ARG_YAML_NAME} JSON)
-  to_yaml("${json_content}" 0 yaml_out)
-
   if(DEFINED ARG_YAML_FILE)
     set(yaml_file ${ARG_YAML_FILE})
   else()
     zephyr_get_scoped(yaml_file ${ARG_YAML_NAME} FILE)
   endif()
+
+  zephyr_get_scoped(genex ${ARG_YAML_NAME} GENEX)
+  zephyr_get_scoped(json_content ${ARG_YAML_NAME} JSON)
+  to_yaml("${json_content}" 0 yaml_out ${genex})
+
   if(EXISTS ${yaml_file})
     FILE(RENAME ${yaml_file} ${yaml_file}.bak)
   endif()
   FILE(WRITE ${yaml_file} "${yaml_out}")
+
+  set(save_target ${ARG_YAML_NAME}_yaml_saved)
+  if (NOT TARGET ${save_target})
+    # Create a target for the completion of the YAML save operation.
+    # This will be a dummy unless genexes are used.
+    add_custom_target(${save_target} ALL DEPENDS ${yaml_file})
+    set_target_properties(${save_target} PROPERTIES
+      genex_save_count 0
+      temp_files ""
+    )
+  endif()
+
+  if (genex)
+    get_property(genex_save_count TARGET ${save_target} PROPERTY genex_save_count)
+    if (${genex_save_count} EQUAL 0)
+      # First yaml_save() for this context with genexes enabled
+      add_custom_command(
+        OUTPUT ${yaml_file}
+        DEPENDS $<TARGET_PROPERTY:${save_target},json_file>
+        COMMAND ${CMAKE_COMMAND}
+                -DJSON_FILE="$<TARGET_PROPERTY:${save_target},json_file>"
+                -DYAML_FILE="${yaml_file}"
+                -DTEMP_FILES="$<TARGET_PROPERTY:${save_target},temp_files>"
+                -P ${ZEPHYR_BASE}/cmake/yaml-filter.cmake
+      )
+    endif()
+
+    math(EXPR genex_save_count "${genex_save_count} + 1")
+    set_property(TARGET ${save_target} PROPERTY genex_save_count ${genex_save_count})
+
+    cmake_path(SET yaml_path "${yaml_file}")
+    cmake_path(GET yaml_path STEM yaml_file_no_ext)
+    set(json_file ${yaml_file_no_ext}_${genex_save_count}.json)
+    set_property(TARGET ${save_target} PROPERTY json_file ${json_file})
+
+    # comment this to keep the temporary JSON files
+    get_property(temp_files TARGET ${save_target} PROPERTY temp_files)
+    list(APPEND temp_files ${json_file})
+    set_property(TARGET ${save_target} PROPERTY temp_files ${temp_files})
+
+    FILE(GENERATE OUTPUT ${json_file}
+      CONTENT "${json_content}"
+    )
+  endif()
 endfunction()
 
-function(to_yaml json level yaml)
+function(to_yaml json level yaml genex)
   if(level GREATER 0)
     math(EXPR level_dec "${level} - 1")
     set(indent_${level} "${indent_${level_dec}}  ")
@@ -425,10 +505,12 @@ function(to_yaml json level yaml)
     string(JSON type TYPE "${json}" ${member})
     string(JSON subjson GET "${json}" ${member})
     if(type STREQUAL OBJECT)
+      # JSON object -> YAML dictionary
       set(${yaml} "${${yaml}}${indent_${level}}${member}:\n")
       math(EXPR sublevel "${level} + 1")
-      to_yaml("${subjson}" ${sublevel} ${yaml})
+      to_yaml("${subjson}" ${sublevel} ${yaml} ${genex})
     elseif(type STREQUAL ARRAY)
+      # JSON array -> YAML list
       set(${yaml} "${${yaml}}${indent_${level}}${member}:")
       string(JSON arraylength LENGTH "${subjson}")
       if(${arraylength} LESS 1)
@@ -441,7 +523,33 @@ function(to_yaml json level yaml)
           set(${yaml} "${${yaml}}${indent_${level}} - ${item}\n")
         endforeach()
       endif()
+    elseif(type STREQUAL STRING)
+      # JSON string maps to multiple YAML types:
+      # - with unexpanded generator expressions: save as YAML comment
+      # - if it matches the special prefix: convert to YAML list
+      # - otherwise: save as YAML scalar
+      if (subjson MATCHES "\\$<.*>" AND ${genex})
+        # Yet unexpanded generator expression: save as comment
+        string(SUBSTRING ${indent_${level}} 1 -1 short_indent)
+        set(${yaml} "${${yaml}}#${short_indent}${member}: ${subjson}\n")
+      elseif(subjson MATCHES "^@YAML-LIST@")
+        # List-as-string: convert to list
+        set(${yaml} "${${yaml}}${indent_${level}}${member}:")
+        list(POP_FRONT subjson)
+        if(subjson STREQUAL "")
+          set(${yaml} "${${yaml}} []\n")
+        else()
+          set(${yaml} "${${yaml}}\n")
+          foreach(item ${subjson})
+            set(${yaml} "${${yaml}}${indent_${level}} - ${item}\n")
+          endforeach()
+        endif()
+      else()
+        # Raw strings: save as is
+        set(${yaml} "${${yaml}}${indent_${level}}${member}: ${subjson}\n")
+      endif()
     else()
+      # Other JSON data type -> YAML scalar, as-is
       set(${yaml} "${${yaml}}${indent_${level}}${member}: ${subjson}\n")
     endif()
   endforeach()
diff --git a/cmake/yaml-filter.cmake b/cmake/yaml-filter.cmake
new file mode 100644
index 00000000000..c7733be6485
--- /dev/null
+++ b/cmake/yaml-filter.cmake
@@ -0,0 +1,35 @@
+# Copyright (c) 2024 Arduino SA
+# SPDX-License-Identifier: Apache-2.0
+
+# Simple second stage filter for YAML generation, used when generator
+# expressions have been used for some of the data and the conversion to
+# YAML needs to happen after cmake has completed processing.
+#
+# This scripts expects as input:
+# - JSON_FILE: the name of the input file, in JSON format, that contains
+#              the expanded generator expressions.
+# - YAML_FILE: the name of the final output YAML file.
+# - TEMP_FILES: a list of temporary files that need to be removed after
+#               the conversion is done.
+#
+# This script loads the Zephyr yaml module and reuses its `to_yaml()`
+# function to convert the fully expanded JSON content to YAML, taking
+# into account the special format that was used to store lists.
+# Temporary files are then removed.
+
+cmake_minimum_required(VERSION 3.20.0)
+
+set(ZEPHYR_BASE ${CMAKE_CURRENT_LIST_DIR}/../)
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules")
+include(yaml)
+
+file(READ ${JSON_FILE} json_content)
+to_yaml("${json_content}" 0 yaml_out TRUE)
+file(WRITE ${YAML_FILE} "${yaml_out}")
+
+# Remove unused temporary files. JSON_FILE needs to be kept, or the
+# build system will complain there is no rule to rebuild it
+list(REMOVE_ITEM TEMP_FILES ${JSON_FILE})
+foreach(file ${TEMP_FILES})
+  file(REMOVE ${file})
+endforeach()

From c6377b39c67d51eff11aa86cd1c3e524016491e2 Mon Sep 17 00:00:00 2001
From: Luca Burelli <l.burelli@arduino.cc>
Date: Thu, 30 Jan 2025 15:28:25 +0100
Subject: [PATCH 2728/2913] [nrf fromtree] cmake: yaml: use APPEND PROPERTY to
 shorten code

Use a more concise way to append to a list property, as suggested in a
previous PR review.

Signed-off-by: Luca Burelli <l.burelli@arduino.cc>
(cherry picked from commit 8e66848418750a53d48ceb28986915d2e88ad9bd)
---
 cmake/modules/yaml.cmake | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cmake/modules/yaml.cmake b/cmake/modules/yaml.cmake
index 83394d93051..2396e3f08d7 100644
--- a/cmake/modules/yaml.cmake
+++ b/cmake/modules/yaml.cmake
@@ -476,9 +476,7 @@ function(yaml_save)
     set_property(TARGET ${save_target} PROPERTY json_file ${json_file})
 
     # comment this to keep the temporary JSON files
-    get_property(temp_files TARGET ${save_target} PROPERTY temp_files)
-    list(APPEND temp_files ${json_file})
-    set_property(TARGET ${save_target} PROPERTY temp_files ${temp_files})
+    set_property(TARGET ${save_target} APPEND PROPERTY temp_files ${json_file})
 
     FILE(GENERATE OUTPUT ${json_file}
       CONTENT "${json_content}"

From 687c5cc8911d1f498bf3f3e7a1505dccdfce3996 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Wed, 8 Jan 2025 14:50:03 +0100
Subject: [PATCH 2729/2913] [nrf fromtree] cmake: store board directories in
 build_info

The schema for build info already contained a `board:path` sequence tag
definition, but boards.cmake did not populate this in the generated
build_info.yml.

Fix this by correctly populating the `board:path` with list of board
directories.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit b78c269c0bfc654e322fed91fbc2af001e391cc7)
---
 cmake/modules/boards.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmake/modules/boards.cmake b/cmake/modules/boards.cmake
index 2b78845482a..3f086dca948 100644
--- a/cmake/modules/boards.cmake
+++ b/cmake/modules/boards.cmake
@@ -357,3 +357,4 @@ build_info(board name VALUE ${BOARD})
 string(REGEX REPLACE "^/" "" qualifiers "${BOARD_QUALIFIERS}")
 build_info(board qualifiers VALUE ${qualifiers})
 build_info(board revision VALUE ${BOARD_REVISION})
+build_info(board path PATH ${BOARD_DIRECTORIES})

From 7b8c9a29a044c4b927dd67740f52081ccce5a580 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Fri, 10 Jan 2025 13:33:08 +0100
Subject: [PATCH 2730/2913] [nrf fromtree] cmake: support array of maps in yaml
 module

This commit introduce support for maps in a yaml list.

The yaml_set() function has been extended with the following signature:
> yaml_set(NAME <name> KEY <key>...
>          [APPEND] LIST MAP <map1> MAP <map2> MAP ...
> )

where a `MAP <map>` has the form:
`MAP "<key1>: <value1>, <key2>: <value2>, ...`

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 0828d0b0ef30a27f558aa27e4ddfda2b1ab34935)
---
 cmake/modules/yaml.cmake        |  96 ++++++++++++++++---
 tests/cmake/yaml/CMakeLists.txt | 164 ++++++++++++++++++++++++++++++++
 tests/cmake/yaml/test.yaml      |   5 +
 3 files changed, 250 insertions(+), 15 deletions(-)

diff --git a/cmake/modules/yaml.cmake b/cmake/modules/yaml.cmake
index 2396e3f08d7..ec12a04bec5 100644
--- a/cmake/modules/yaml.cmake
+++ b/cmake/modules/yaml.cmake
@@ -19,6 +19,13 @@
 #  - foo2
 #  - foo3
 #
+# Support for list of maps, like:
+# foo:
+#  - bar: val1
+#    baz: val1
+#  - bar: val2
+#    baz: val2
+#
 # All of above can be combined, for example like:
 # foo:
 #   bar: baz
@@ -28,14 +35,6 @@
 #      - beta
 #      - gamma
 # fred: thud
-#
-# Support for list of objects are currently experimental and not guranteed to work.
-# For example:
-# foo:
-#  - bar: val1
-#    baz: val1
-#  - bar: val2
-#    baz: val2
 
 include_guard(GLOBAL)
 
@@ -97,6 +96,13 @@ function(internal_yaml_list_append var genex key)
       internal_yaml_list_initializer(subjson TRUE)
       if(${arraylength} GREATER 0)
         math(EXPR arraystop "${arraylength} - 1")
+        list(GET ARG_YAML_LIST 0 entry_0)
+        if(entry_0 STREQUAL MAP)
+          message(FATAL_ERROR "${function}(GENEX ${argument} ) is not valid at this position.\n"
+                    "Syntax is 'LIST MAP \"key1: value1.1, ...\" MAP \"key1: value1.2, ...\""
+            )
+        endif()
+
         foreach(i RANGE 0 ${arraystop})
           string(JSON item GET "${json_content}" ${key} ${i})
           list(APPEND subjson ${item})
@@ -109,12 +115,49 @@ function(internal_yaml_list_append var genex key)
     # lists are stored as JSON arrays
     string(JSON index LENGTH "${subjson}")
     list(LENGTH ARGN length)
-    math(EXPR stop "${index} + ${length} - 1")
     if(NOT length EQUAL 0)
-      foreach(i RANGE ${index} ${stop})
-        list(POP_FRONT ARGN value)
-        string(JSON json_content SET "${json_content}" ${key} ${i} "\"${value}\"")
-      endforeach()
+      list(GET ARG_YAML_LIST 0 entry_0)
+      if(entry_0 STREQUAL MAP)
+        math(EXPR length "${length} / 2")
+        math(EXPR stop "${index} + ${length} - 1")
+        foreach(i RANGE ${index} ${stop})
+          list(POP_FRONT ARG_YAML_LIST argument)
+          if(NOT argument STREQUAL MAP)
+            message(FATAL_ERROR "yaml_set(${argument} ) is not valid at this position.\n"
+                    "Syntax is 'LIST MAP \"key1: value1.1, ...\" MAP \"key1: value1.2, ...\""
+            )
+          endif()
+          list(POP_FRONT ARG_YAML_LIST map_value)
+          string(REGEX REPLACE "([^\\])," "\\1;" pair_list "${map_value}")
+          set(qouted_map_value)
+          foreach(pair ${pair_list})
+            if(NOT pair MATCHES "[^ ]*:[^ ]*")
+              message(FATAL_ERROR "yaml_set(MAP ${map_value} ) is malformed.\n"
+                    "Syntax is 'LIST MAP \"key1: value1.1, ...\" MAP \"key1: value1.2, ...\"\n"
+                    "If value contains comma ',' then ensure the value field is properly qouted "
+                    "and escaped"
+              )
+            endif()
+            string(REGEX MATCH "^[^:]*" map_key "${pair}")
+            string(REGEX REPLACE "^${map_key}:[ ]*" "" value "${pair}")
+            string(STRIP "${map_key}" map_key)
+            if(value MATCHES "," AND NOT (value MATCHES "\\\\," AND value MATCHES "'.*'"))
+              message(FATAL_ERROR "value: ${value} is not properly quoted")
+            endif()
+            string(REGEX REPLACE "\\\\," "," value "${value}")
+            list(APPEND qouted_map_value "\"${map_key}\": \"${value}\"")
+          endforeach()
+          list(JOIN qouted_map_value "," qouted_map_value)
+          string(JSON json_content SET "${json_content}" ${key} ${i} "{${qouted_map_value}}")
+        endforeach()
+      else()
+        math(EXPR stop "${index} + ${length} - 1")
+        list(GET ARG_YAML_LIST 0 entry_0)
+          foreach(i RANGE ${index} ${stop})
+            list(POP_FRONT ARGN value)
+            string(JSON json_content SET "${json_content}" ${key} ${i} "\"${value}\"")
+          endforeach()
+      endif()
     endif()
   endif()
   set(${var} "${json_content}" PARENT_SCOPE)
@@ -293,6 +336,7 @@ endfunction()
 # Usage:
 #   yaml_set(NAME <name> KEY <key>... [GENEX] VALUE <value>)
 #   yaml_set(NAME <name> KEY <key>... [APPEND] [GENEX] LIST <value>...)
+#   yaml_set(NAME <name> KEY <key>... [APPEND] LIST MAP <map1> MAP <map2> MAP ...)
 #
 # Set a value or a list of values to given key.
 #
@@ -306,6 +350,14 @@ endfunction()
 # APPEND       : Append the list of values to the list of values for the key.
 # GENEX        : The value(s) contain generator expressions. When using this
 #                option, also see the notes in the yaml_save() function.
+# MAP <map>    : Map, with key-value pairs where key-value is separated by ':',
+#                and pairs separated by ','.
+#                Format example: "<key1>: <value1>, <key2>: <value2>, ..."
+#                MAP can be given multiple times to separate maps when adding them to a list.
+#                LIST MAP cannot be used with GENEX.
+#
+#                Note: if a map value contains commas, ',', then the value string must be quoted in
+#                      single quotes and commas must be double escaped, like this: 'A \\,string'
 #
 function(yaml_set)
   cmake_parse_arguments(ARG_YAML "APPEND;GENEX" "NAME;VALUE" "KEY;LIST" ${ARGN})
@@ -328,6 +380,10 @@ function(yaml_set)
     message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION}(APPEND ...) can only be used with argument: LIST")
   endif()
 
+  if(ARG_YAML_GENEX AND MAP IN_LIST ARG_YAML_LIST)
+    message(FATAL_ERROR "${function}(GENEX ...) cannot be used with argument: LIST MAP")
+  endif()
+
   zephyr_get_scoped(json_content ${ARG_YAML_NAME} JSON)
   zephyr_get_scoped(genex ${ARG_YAML_NAME} GENEX)
 
@@ -366,7 +422,6 @@ function(yaml_set)
       internal_yaml_list_initializer(json_string ${genex})
       string(JSON json_content SET "${json_content}" ${ARG_YAML_KEY} "${json_string}")
     endif()
-
     internal_yaml_list_append(json_content ${genex} "${ARG_YAML_KEY}" ${ARG_YAML_LIST})
   else()
     string(JSON json_content SET "${json_content}" ${ARG_YAML_KEY} "\"${ARG_YAML_VALUE}\"")
@@ -518,7 +573,18 @@ function(to_yaml json level yaml genex)
         math(EXPR arraystop "${arraylength} - 1")
         foreach(i RANGE 0 ${arraystop})
           string(JSON item GET "${json}" ${member} ${i})
-          set(${yaml} "${${yaml}}${indent_${level}} - ${item}\n")
+          # Check the length of item. Only OBJECT and ARRAY may have length, so a length at this
+          # level means `to_yaml()` should be called recursively.
+          string(JSON length ERROR_VARIABLE ignore LENGTH "${item}")
+          if(length)
+            set(non_indent_yaml)
+            to_yaml("${item}" 0 non_indent_yaml FALSE)
+            string(REGEX REPLACE "\n$" "" non_indent_yaml "${non_indent_yaml}")
+            string(REPLACE "\n" "\n${indent_${level}}   " indent_yaml "${non_indent_yaml}")
+            set(${yaml} "${${yaml}}${indent_${level}} - ${indent_yaml}\n")
+          else()
+            set(${yaml} "${${yaml}}${indent_${level}} - ${item}\n")
+          endif()
         endforeach()
       endif()
     elseif(type STREQUAL STRING)
diff --git a/tests/cmake/yaml/CMakeLists.txt b/tests/cmake/yaml/CMakeLists.txt
index 04873efa9a9..97cf10ecefc 100644
--- a/tests/cmake/yaml/CMakeLists.txt
+++ b/tests/cmake/yaml/CMakeLists.txt
@@ -99,6 +99,25 @@ function(test_reading_int)
   )
 endfunction()
 
+function(test_reading_map_list_entry)
+  set(expected_length 2)
+  set(expected_name "MapEntry1")
+  set(expected_int  5)
+  yaml_length(actual_length NAME yaml-test KEY cmake test map-list)
+  yaml_get(actual_name NAME yaml-test KEY cmake test map-list 0 map-entry-name)
+  yaml_get(actual_int NAME yaml-test KEY cmake test map-list 0 map-entry-int)
+
+  test_assert(TEST ${expected_length} EQUAL ${actual_length}
+              COMMENT "yaml key value does not match expectation."
+  )
+  test_assert(TEST ${expected_name} STREQUAL ${actual_name}
+              COMMENT "yaml key value does not match expectation."
+  )
+  test_assert(TEST ${expected_int} EQUAL ${actual_int}
+              COMMENT "yaml key value does not match expectation."
+  )
+endfunction()
+
 function(test_reading_not_found)
   set(expected cmake-missing-NOTFOUND)
   yaml_get(actual NAME yaml-test KEY cmake missing test key)
@@ -126,6 +145,15 @@ function(test_reading_not_array)
   )
 endfunction()
 
+function(test_reading_not_found_map_list_entry)
+  set(expected cmake-test-map-list-3-NOTFOUND)
+  yaml_get(actual NAME yaml-test KEY cmake test map-list 3 map-entry-name)
+
+  test_assert(TEST ${expected} STREQUAL ${actual}
+              COMMENT "Expected -NOTFOUND, but something was found."
+  )
+endfunction()
+
 function(test_save_new_file)
   yaml_save(NAME yaml-test FILE ${CMAKE_BINARY_DIR}/${CMAKE_CURRENT_FUNCTION}_test_save.yaml)
 
@@ -260,6 +288,137 @@ function(test_setting_list_int)
   endforeach()
 endfunction()
 
+function(test_setting_map_list_entry)
+  yaml_create(FILE ${CMAKE_BINARY_DIR}/${CMAKE_CURRENT_FUNCTION}_test_create.yaml
+              NAME ${CMAKE_CURRENT_FUNCTION}_yaml-create
+  )
+
+  set(new_entry_name_0 MapEntryNew1)
+  set(new_entry_int_0  42)
+  set(new_entry_name_1 MapEntryNew2)
+  set(new_entry_int_1  24)
+  set(new_entry_name_2 MapEntryNew3)
+  set(new_entry_int_2  4224)
+  yaml_set(actual NAME ${CMAKE_CURRENT_FUNCTION}_yaml-create
+           KEY cmake test set map-list LIST
+           MAP "map-entry-name: ${new_entry_name_0}, map-entry-int: ${new_entry_int_0}"
+           MAP "map-entry-name: ${new_entry_name_1}, map-entry-int: ${new_entry_int_1}"
+           MAP "map-entry-name: ${new_entry_name_2}, map-entry-int: ${new_entry_int_2}"
+  )
+
+  yaml_save(NAME ${CMAKE_CURRENT_FUNCTION}_yaml-create)
+
+  # Read-back the yaml and verify the values.
+  yaml_load(FILE ${CMAKE_BINARY_DIR}/${CMAKE_CURRENT_FUNCTION}_test_create.yaml
+            NAME ${CMAKE_CURRENT_FUNCTION}_readback
+  )
+
+  yaml_length(readback NAME ${CMAKE_CURRENT_FUNCTION}_readback KEY cmake test set map-list)
+
+  test_assert(TEST 3 EQUAL ${readback}
+              COMMENT "readback yaml list length does not match original."
+  )
+
+  foreach(index 0 1 2)
+    yaml_get(readback_name NAME ${CMAKE_CURRENT_FUNCTION}_readback KEY cmake test set map-list ${index} map-entry-name)
+    yaml_get(readback_int  NAME ${CMAKE_CURRENT_FUNCTION}_readback KEY cmake test set map-list ${index} map-entry-int)
+
+    test_assert(TEST "${readback_name}" STREQUAL "${new_entry_name_${index}}"
+                COMMENT "list values mismatch."
+    )
+    test_assert(TEST "${readback_int}" EQUAL "${new_entry_int_${index}}"
+                COMMENT "list values mismatch."
+    )
+  endforeach()
+endfunction()
+
+function(test_setting_map_list_entry_windows)
+  yaml_create(FILE ${CMAKE_BINARY_DIR}/${CMAKE_CURRENT_FUNCTION}_test_create.yaml
+              NAME ${CMAKE_CURRENT_FUNCTION}_yaml-create
+  )
+
+  set(new_entry_name_0 MapEntryWindowsPath1)
+  set(new_entry_path_0  "c:/tmp/zephyr")
+  set(new_entry_name_1 MapEntryWindowsPath2)
+  set(new_entry_path_1  "c:/program files/space")
+  set(new_entry_name_2 MapEntryWindowsPath3)
+  set(new_entry_path_2  "D:/alternative/drive")
+  yaml_set(actual NAME ${CMAKE_CURRENT_FUNCTION}_yaml-create
+           KEY cmake test set map-list LIST
+           MAP "map-entry-name: ${new_entry_name_0}, map-entry-path: ${new_entry_path_0}"
+           MAP "map-entry-name: ${new_entry_name_1}, map-entry-path: ${new_entry_path_1}"
+           MAP "map-entry-name: ${new_entry_name_2}, map-entry-path: ${new_entry_path_2}"
+  )
+
+  yaml_save(NAME ${CMAKE_CURRENT_FUNCTION}_yaml-create)
+
+  # Read-back the yaml and verify the values.
+  yaml_load(FILE ${CMAKE_BINARY_DIR}/${CMAKE_CURRENT_FUNCTION}_test_create.yaml
+            NAME ${CMAKE_CURRENT_FUNCTION}_readback
+  )
+
+  yaml_length(readback NAME ${CMAKE_CURRENT_FUNCTION}_readback KEY cmake test set map-list)
+
+  test_assert(TEST 3 EQUAL ${readback}
+              COMMENT "readback yaml list length does not match original."
+  )
+
+  foreach(index 0 1 2)
+    yaml_get(readback_name NAME ${CMAKE_CURRENT_FUNCTION}_readback KEY cmake test set map-list ${index} map-entry-name)
+    yaml_get(readback_path  NAME ${CMAKE_CURRENT_FUNCTION}_readback KEY cmake test set map-list ${index} map-entry-path)
+
+    test_assert(TEST "${readback_name}" STREQUAL "${new_entry_name_${index}}"
+                COMMENT "list values mismatch."
+    )
+    test_assert(TEST "${readback_path}" STREQUAL "${new_entry_path_${index}}"
+                COMMENT "list values mismatch."
+    )
+  endforeach()
+endfunction()
+
+function(test_setting_map_list_entry_commas)
+  yaml_create(FILE ${CMAKE_BINARY_DIR}/${CMAKE_CURRENT_FUNCTION}_test_create.yaml
+              NAME ${CMAKE_CURRENT_FUNCTION}_yaml-create
+  )
+
+  set(new_entry_name_0 TestString1)
+  set(new_entry_str_0  "'A\\,string'")
+  set(new_entry_name_1 TestString2)
+  set(new_entry_str_1  "'\\, is first'")
+  set(new_entry_name_2 TestString3)
+  set(new_entry_str_2  "'\\, and : is\\,everywhere\\,'")
+  yaml_set(actual NAME ${CMAKE_CURRENT_FUNCTION}_yaml-create
+           KEY cmake test set map-list LIST
+           MAP "map-entry-name: ${new_entry_name_0}, map-entry-str: ${new_entry_str_0}"
+           MAP "map-entry-name: ${new_entry_name_1}, map-entry-str: ${new_entry_str_1}"
+           MAP "map-entry-name: ${new_entry_name_2}, map-entry-str: ${new_entry_str_2}"
+  )
+
+  yaml_save(NAME ${CMAKE_CURRENT_FUNCTION}_yaml-create)
+
+  # Read-back the yaml and verify the values.
+  yaml_load(FILE ${CMAKE_BINARY_DIR}/${CMAKE_CURRENT_FUNCTION}_test_create.yaml
+            NAME ${CMAKE_CURRENT_FUNCTION}_readback
+  )
+
+  yaml_length(readback NAME ${CMAKE_CURRENT_FUNCTION}_readback KEY cmake test set map-list)
+
+  test_assert(TEST 3 EQUAL ${readback}
+              COMMENT "readback yaml list length does not match original."
+  )
+
+  foreach(index 0 1 2)
+    yaml_get(readback_name NAME ${CMAKE_CURRENT_FUNCTION}_readback KEY cmake test set map-list ${index} map-entry-name)
+    yaml_get(readback_str  NAME ${CMAKE_CURRENT_FUNCTION}_readback KEY cmake test set map-list ${index} map-entry-str)
+
+    test_assert(TEST "${readback_name}" STREQUAL "${new_entry_name_${index}}"
+                COMMENT "list values mismatch."
+    )
+    test_assert(TEST "'${readback_str}'" STREQUAL "${new_entry_str_${index}}"
+                COMMENT "list values mismatch."
+    )
+  endforeach()
+endfunction()
 function(test_setting_empty_value)
   yaml_create(FILE ${CMAKE_BINARY_DIR}/${CMAKE_CURRENT_FUNCTION}_test_create.yaml
               NAME ${CMAKE_CURRENT_FUNCTION}_yaml-create
@@ -384,9 +543,11 @@ test_reading_string()
 test_reading_int()
 test_reading_list_strings()
 test_reading_list_int()
+test_reading_map_list_entry()
 test_reading_not_found()
 test_reading_not_found_array()
 test_reading_not_array()
+test_reading_not_found_map_list_entry()
 
 test_save_new_file()
 
@@ -394,6 +555,9 @@ test_setting_int()
 test_setting_string()
 test_setting_list_strings()
 test_setting_list_int()
+test_setting_map_list_entry()
+test_setting_map_list_entry_windows()
+test_setting_map_list_entry_commas()
 
 test_setting_empty_value()
 test_setting_empty_list()
diff --git a/tests/cmake/yaml/test.yaml b/tests/cmake/yaml/test.yaml
index 4f21cff2c2a..f106a360ed8 100644
--- a/tests/cmake/yaml/test.yaml
+++ b/tests/cmake/yaml/test.yaml
@@ -11,3 +11,8 @@ cmake:
       - "list"
       - "of"
       - "strings"
+    map-list:
+      - map-entry-name: "MapEntry1"
+        map-entry-int: 5
+      - map-entry-name: "MapEntry2"
+        map-entry-int: 4

From 9a88142ddbeb3beae640c2bb1df60e861f83289f Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Tue, 14 Jan 2025 13:44:25 +0100
Subject: [PATCH 2731/2913] [nrf fromtree] scripts: support list of images in
 build info

Add 'images' as valid list in build info schema.
This allow sysbuild and regular Zephyr images to populate build_info.yml
with images included in the build.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 4061311da3ee2ad8f048bf3e94cfb42a8681b6b1)
---
 scripts/schemas/build-schema.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/schemas/build-schema.yml b/scripts/schemas/build-schema.yml
index 5086afbb25b..93e78d5bc6b 100644
--- a/scripts/schemas/build-schema.yml
+++ b/scripts/schemas/build-schema.yml
@@ -56,6 +56,17 @@ mapping:
             type: seq
             sequence:
               - type: str
+      images:
+        type: seq
+        sequence:
+          - type: map
+            mapping:
+              name:
+                type: str
+              source-dir:
+                type: str
+              type:
+                type: str
       kconfig:
         type: map
         mapping:

From 69a40deed86d8374ca3ba987d8ed991d2af08da5 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Tue, 14 Jan 2025 13:46:40 +0100
Subject: [PATCH 2732/2913] [nrf fromtree] sysbuild: populate build_info with
 list of images

Populate the build_info.yml created by sysbuild CMake with list of
images and write the build info file afterwards.

This allows users and external tools to examine which images was
included in the build even if one or more of those images fails CMake
configure or generate stage.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 642e9484e3aba2c10276cdc868137509f26d0fe7)
---
 .../cmake/modules/sysbuild_images.cmake       | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/share/sysbuild/cmake/modules/sysbuild_images.cmake b/share/sysbuild/cmake/modules/sysbuild_images.cmake
index eb73ec99448..7115567b8d9 100644
--- a/share/sysbuild/cmake/modules/sysbuild_images.cmake
+++ b/share/sysbuild/cmake/modules/sysbuild_images.cmake
@@ -5,6 +5,26 @@
 # This module is responsible for including images into sysbuild and to call
 # pre and post hooks.
 
+# Internal function to update build info with list of images abnd write the file.
+# Main reason for using an internal function is to properly scope variable usage.
+# Function takes a list of images.
+function(sysbuild_info_image images)
+  set(info_image_list)
+  foreach(image ${images})
+    ExternalProject_Get_Property(${image} SOURCE_DIR)
+    get_target_property(type ${image} APP_TYPE)
+    if(type)
+      list(APPEND info_image_list MAP "name: ${image}, source-dir: ${SOURCE_DIR}, type: ${type}")
+    else()
+      list(APPEND info_image_list MAP "name: ${image}, source-dir: ${source_dir}")
+    endif()
+  endforeach()
+  build_info(images VALUE ${info_image_list})
+  # Save current state of build info. This allow external tools to fetch sysbuild controlled images
+  # even in the event that one or more image fails configuration stage.
+  yaml_save(NAME build_info)
+endfunction()
+
 get_filename_component(APP_DIR  ${APP_DIR} ABSOLUTE)
 get_filename_component(app_name ${APP_DIR} NAME)
 set(DEFAULT_IMAGE "${app_name}")
@@ -15,6 +35,9 @@ sysbuild_add_subdirectory(${sysbuild_toplevel_SOURCE_DIR}/images sysbuild/images
 get_property(IMAGES GLOBAL PROPERTY sysbuild_images)
 sysbuild_module_call(PRE_CMAKE MODULES ${SYSBUILD_MODULE_NAMES} IMAGES ${IMAGES})
 sysbuild_images_order(IMAGES_CONFIGURATION_ORDER CONFIGURE IMAGES ${IMAGES})
+
+sysbuild_info_image("${IMAGES}")
+
 foreach(image ${IMAGES_CONFIGURATION_ORDER})
   sysbuild_module_call(PRE_IMAGE_CMAKE MODULES ${SYSBUILD_MODULE_NAMES} IMAGES ${IMAGES} IMAGE ${image})
   ExternalZephyrProject_Cmake(APPLICATION ${image})

From f3c0afb873ddb48a737ad5df9600703be3ec9c22 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Wed, 19 Feb 2025 12:07:34 +0100
Subject: [PATCH 2733/2913] [nrf fromtree] cmake: escape json input string

Escape the json input string given to `to_yaml()` function and the
content given to `yaml_set()` function.

This ensures that a string like `foo\bar` becomes `foo\\bar` during
internal CMake json processing and when written to the file it becomes
`foo\bar`.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit cdbe424ecae0ea6332bf06722d65bea7be5f76b6)
---
 cmake/modules/extensions.cmake | 21 ++++++++++++++++++++-
 cmake/modules/yaml.cmake       |  9 ++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index e23043022e6..fd43a8067ce 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -3073,6 +3073,16 @@ endfunction()
 # This function extends the CMake string function by providing additional
 # manipulation arguments to CMake string.
 #
+# ESCAPE:   Ensure that any single '\' in the input string is escaped with the
+#           escape char '\'. For example the string 'foo\bar' will be escaped
+#           so that it becomes 'foo\\bar'.
+#           Backslashes which are already escaped will not be escaped further,
+#           for example 'foo\\bar' will not be modified.
+#           This is useful for handling of windows path separator in strings or
+#           when strings contains newline escapes such as '\n' and this can
+#           cause issues when writing to a file where a '\n' is desired in the
+#           string instead of a newline.
+#
 # SANITIZE: Ensure that the output string does not contain any special
 #           characters. Special characters, such as -, +, =, $, etc. are
 #           converted to underscores '_'.
@@ -3084,9 +3094,11 @@ endfunction()
 #
 # returns the updated string
 function(zephyr_string)
-  set(options SANITIZE TOUPPER)
+  set(options SANITIZE TOUPPER ESCAPE)
   cmake_parse_arguments(ZEPHYR_STRING "${options}" "" "" ${ARGN})
 
+  zephyr_check_flags_exclusive(${CMAKE_CURRENT_FUNCTION} ZEPHYR_STRING SANITIZE ESCAPE)
+
   if (NOT ZEPHYR_STRING_UNPARSED_ARGUMENTS)
     message(FATAL_ERROR "Function zephyr_string() called without a return variable")
   endif()
@@ -3104,6 +3116,13 @@ function(zephyr_string)
     string(TOUPPER ${work_string} work_string)
   endif()
 
+  if(ZEPHYR_STRING_ESCAPE)
+    # If a single '\' is discovered, such as 'foo\bar', then it must be escaped like: 'foo\\bar'
+    # \\1 and \\2 are keeping the match patterns, the \\\\ --> \\ meaning an escaped '\',
+    # which then becomes a single '\' in the final string.
+    string(REGEX REPLACE "([^\\][\\])([^\\])" "\\1\\\\\\2" work_string "${ZEPHYR_STRING_UNPARSED_ARGUMENTS}")
+  endif()
+
   set(${return_arg} ${work_string} PARENT_SCOPE)
 endfunction()
 
diff --git a/cmake/modules/yaml.cmake b/cmake/modules/yaml.cmake
index ec12a04bec5..a509567bc5d 100644
--- a/cmake/modules/yaml.cmake
+++ b/cmake/modules/yaml.cmake
@@ -422,9 +422,11 @@ function(yaml_set)
       internal_yaml_list_initializer(json_string ${genex})
       string(JSON json_content SET "${json_content}" ${ARG_YAML_KEY} "${json_string}")
     endif()
-    internal_yaml_list_append(json_content ${genex} "${ARG_YAML_KEY}" ${ARG_YAML_LIST})
+    zephyr_string(ESCAPE escape_list "${ARG_YAML_LIST}")
+    internal_yaml_list_append(json_content ${genex} "${ARG_YAML_KEY}" ${escape_list})
   else()
-    string(JSON json_content SET "${json_content}" ${ARG_YAML_KEY} "\"${ARG_YAML_VALUE}\"")
+    zephyr_string(ESCAPE escape_value "${ARG_YAML_VALUE}")
+    string(JSON json_content SET "${json_content}" ${ARG_YAML_KEY} "\"${escape_value}\"")
   endif()
 
   zephyr_set(JSON "${json_content}" SCOPE ${ARG_YAML_NAME})
@@ -539,7 +541,8 @@ function(yaml_save)
   endif()
 endfunction()
 
-function(to_yaml json level yaml genex)
+function(to_yaml in_json level yaml genex)
+  zephyr_string(ESCAPE json "${in_json}")
   if(level GREATER 0)
     math(EXPR level_dec "${level} - 1")
     set(indent_${level} "${indent_${level_dec}}  ")

From eab01fb8cf13c103ed83c0279cbf19bb0c46a387 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Mon, 24 Feb 2025 15:13:31 +0100
Subject: [PATCH 2734/2913] [nrf fromtree] cmake: do not double escape double
 quote

Do not escape single escaped quote '\"'.
A single escape quote in CMake indicates the use of literal '"'.
Escaping those results in '\\"' which is a literal '\' and a quote which
encapsulates a string.
This is a result we do not want.
Therefore, exempt the '\"' sequence from further escaping.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 991396c54a25c7b7a4eb1e05c31c29ad1015edad)
---
 cmake/modules/extensions.cmake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index fd43a8067ce..d33f3cdf187 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -3073,9 +3073,9 @@ endfunction()
 # This function extends the CMake string function by providing additional
 # manipulation arguments to CMake string.
 #
-# ESCAPE:   Ensure that any single '\' in the input string is escaped with the
-#           escape char '\'. For example the string 'foo\bar' will be escaped
-#           so that it becomes 'foo\\bar'.
+# ESCAPE:   Ensure that any single '\', except '\"', in the input string is
+#           escaped with the escape char '\'. For example the string 'foo\bar'
+#           will be escaped so that it becomes 'foo\\bar'.
 #           Backslashes which are already escaped will not be escaped further,
 #           for example 'foo\\bar' will not be modified.
 #           This is useful for handling of windows path separator in strings or
@@ -3120,7 +3120,7 @@ function(zephyr_string)
     # If a single '\' is discovered, such as 'foo\bar', then it must be escaped like: 'foo\\bar'
     # \\1 and \\2 are keeping the match patterns, the \\\\ --> \\ meaning an escaped '\',
     # which then becomes a single '\' in the final string.
-    string(REGEX REPLACE "([^\\][\\])([^\\])" "\\1\\\\\\2" work_string "${ZEPHYR_STRING_UNPARSED_ARGUMENTS}")
+    string(REGEX REPLACE "([^\\][\\])([^\\\"])" "\\1\\\\\\2" work_string "${ZEPHYR_STRING_UNPARSED_ARGUMENTS}")
   endif()
 
   set(${return_arg} ${work_string} PARENT_SCOPE)

From 3b583c2e89004df9b6564a96b8fc91143298fdb2 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Mon, 10 Mar 2025 15:43:24 +0100
Subject: [PATCH 2735/2913] [nrf fromlist] cmake: add tfm / tfa image
 information to build info

Support for list of images in build info was added with commit
4061311da3ee2ad8f048bf3e94cfb42a8681b6b1 and is used by sysbuild.

Zephyr itself also uses CMake's External Project feature when including
TF-M or TF-A in a Zephyr build.

Populate build info with TF-M / TF-A information when said image is
included in the build.

Upstream PR #: 86881

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
---
 modules/trusted-firmware-a/CMakeLists.txt | 3 +++
 modules/trusted-firmware-m/CMakeLists.txt | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/modules/trusted-firmware-a/CMakeLists.txt b/modules/trusted-firmware-a/CMakeLists.txt
index 72c1ea5c75a..0c0230174f0 100644
--- a/modules/trusted-firmware-a/CMakeLists.txt
+++ b/modules/trusted-firmware-a/CMakeLists.txt
@@ -8,6 +8,9 @@ if (CONFIG_BUILD_WITH_TFA)
 
   include(ExternalProject)
 
+  set(tfa_image_info MAP "name: tfa, source-dir: ${ZEPHYR_TRUSTED_FIRMWARE_A_MODULE_DIR}")
+  build_info(images VALUE ${tfa_image_info})
+
   ExternalProject_Add(
     tfa
     SOURCE_DIR ${ZEPHYR_TRUSTED_FIRMWARE_A_MODULE_DIR}
diff --git a/modules/trusted-firmware-m/CMakeLists.txt b/modules/trusted-firmware-m/CMakeLists.txt
index fff2be36070..a34ed5fc709 100644
--- a/modules/trusted-firmware-m/CMakeLists.txt
+++ b/modules/trusted-firmware-m/CMakeLists.txt
@@ -296,6 +296,9 @@ if (CONFIG_BUILD_WITH_TFM)
 	# threads. Which is num_cores+2 on Ninja and MAKEFLAGS with Make.
   endif()
 
+  set(tfm_image_info MAP "name: tfm, source-dir: ${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}")
+  build_info(images VALUE ${tfm_image_info})
+
   ExternalProject_Add(
     tfm
     SOURCE_DIR ${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}

From 1b05ede87a9434fcf5fc20e9479ebf65b75b788b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20St=C4=99pnicki?=
 <lukasz.stepnicki@nordicsemi.no>
Date: Fri, 24 Jan 2025 13:31:11 +0100
Subject: [PATCH 2736/2913] [nrf fromtree] modules: hal_nordic: nrfs: improve
 error handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added option to retry message send over ipc when for example
there is -ENOMEM error (shared memory buffer full).
Number of max retries and delay between them are Kconfigs.
Fixed nrfs error reporting when sending directly over
ipc service, status was not correct when negative value
was returned from ipc service send function.

Signed-off-by: Łukasz Stępnicki <lukasz.stepnicki@nordicsemi.no>
(cherry picked from commit e62ebd898551d03bf74ae713e31463ce80c873a4)
---
 modules/hal_nordic/nrfs/backends/Kconfig      | 15 +++++++
 .../nrfs/backends/nrfs_backend_ipc_service.c  | 43 +++++++++++++++++--
 .../nrfs/backends/nrfs_backend_ipc_service.h  |  1 +
 3 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/modules/hal_nordic/nrfs/backends/Kconfig b/modules/hal_nordic/nrfs/backends/Kconfig
index 2dc97ea63ce..34cd5c847c5 100644
--- a/modules/hal_nordic/nrfs/backends/Kconfig
+++ b/modules/hal_nordic/nrfs/backends/Kconfig
@@ -25,4 +25,19 @@ config NRFS_BACKEND_TX_MSG_QUEUE_SIZE
 	range 1 16
 	default 8
 
+config NRFS_SEND_RETRY_DELAY
+	int "Delay in us"
+	range 1 100
+	default 1
+	help
+	  Delay when waiting for next message send retry in case of send error.
+
+config NRFS_SEND_RETRY_MAX_COUNT
+	int "Max number of send retries"
+	range 0 100
+	default 5
+	help
+	  How many times nrfs will try to send message over ipc service until
+	  error will be reported. For example when shared ipc memory is full.
+
 endmenu
diff --git a/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c b/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c
index bf5dec9fe16..a3e7ff22100 100644
--- a/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c
+++ b/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c
@@ -80,6 +80,10 @@ __weak void nrfs_backend_error_handler(enum nrfs_backend_error error_id, int err
 		LOG_ERR("IPC register endpoint failure with error: %d", error);
 		break;
 
+	case NRFS_ERROR_SEND_DATA_FROM_QUEUE:
+		LOG_ERR("IPC backend sent data failed.");
+		break;
+
 	default:
 		LOG_ERR("Undefined error id: %d, error cause: %d", error_id, error);
 		break;
@@ -120,14 +124,45 @@ static void ipc_sysctrl_ept_recv(const void *data, size_t size, void *priv)
 	}
 }
 
+/**
+ * @brief This function will try to send data directly using ipc service
+ *        In case of errors it will retry if configured.
+ *
+ * @param message Pointer to the buffer to send.
+ * @param size Number of bytes to send.
+ * @retval NRFS_SUCCESS Message sent successfully.
+ * @retval NRFS_ERR_IPC Backend returned error during message sending.
+ */
+static nrfs_err_t nrfs_backend_try_send_directly_over_ipc_service(void *message, size_t size)
+{
+	size_t retry_count = CONFIG_NRFS_SEND_RETRY_MAX_COUNT + 1;
+	int ret = 0;
+
+	do {
+		ret = ipc_service_send(&ipc_cpusys_channel_config.ipc_ept, message, size);
+		if (ret < (int)size) {
+			k_usleep(CONFIG_NRFS_SEND_RETRY_DELAY);
+		} else {
+			return NRFS_SUCCESS;
+		}
+	} while (--retry_count);
+
+	return NRFS_ERR_IPC;
+}
+
 static void nrfs_backend_send_work(struct k_work *item)
 {
 	struct ipc_data_packet data_to_send;
 
 	LOG_DBG("Sending data from workqueue");
 	while (k_msgq_get(&ipc_transmit_msgq, &data_to_send, K_NO_WAIT) == 0) {
-		ipc_service_send(&ipc_cpusys_channel_config.ipc_ept, &data_to_send.data,
-				 data_to_send.size);
+
+		nrfs_err_t ret = nrfs_backend_try_send_directly_over_ipc_service(&data_to_send.data,
+										 data_to_send.size);
+
+		if (ret != NRFS_SUCCESS) {
+			nrfs_backend_error_handler(NRFS_ERROR_SEND_DATA_FROM_QUEUE, 0, true);
+		}
 	}
 }
 
@@ -177,8 +212,8 @@ nrfs_err_t nrfs_backend_send(void *message, size_t size)
 nrfs_err_t nrfs_backend_send_ex(void *message, size_t size, k_timeout_t timeout, bool high_prio)
 {
 	if (!k_is_in_isr() && nrfs_backend_connected()) {
-		return ipc_service_send(&ipc_cpusys_channel_config.ipc_ept, message, size) ?
-			NRFS_SUCCESS : NRFS_ERR_IPC;
+		return nrfs_backend_try_send_directly_over_ipc_service(message, size);
+
 	} else if (size <= MAX_PACKET_DATA_SIZE) {
 		int err;
 		struct ipc_data_packet tx_data;
diff --git a/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.h b/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.h
index 572c05e864c..015d3f99643 100644
--- a/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.h
+++ b/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.h
@@ -36,6 +36,7 @@ enum nrfs_backend_error {
 	NRFS_ERROR_IPC_OPEN_INSTANCE,
 	NRFS_ERROR_IPC_REGISTER_ENDPOINT,
 	NRFS_ERROR_BACKEND_NOT_CONNECTED,
+	NRFS_ERROR_SEND_DATA_FROM_QUEUE,
 	NRFS_ERROR_COUNT
 };
 

From ba87527c9ae6714d66dd51c398cf4cdb3185dcd9 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Thu, 6 Mar 2025 09:31:49 +0100
Subject: [PATCH 2737/2913] [nrf fromtree] scripts: support number of jobs and
 verbosity in west build.

Calling `west build --build-opt="-v" --build-opt="-j=<n>"`
passes the build options to `cmake --build ... -- <build-opt>` which
again is passed to the native build tool, such as ninja or make.

However, when ExternalProjects are used in CMake, such as in TF-M or
sysbuild builds then those extra build options are only passed to the
first image build and not those build as external projects.

CMake supports environment variables for those flags, so translate
verbosity and number of jobs to those environment variables and thereby
support those flags for all images when specified by the user.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 63cf79bd9979e27e7f6dd318e499b1ad1531fb06)
---
 scripts/west_commands/zcmake.py | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/scripts/west_commands/zcmake.py b/scripts/west_commands/zcmake.py
index aad616aadd4..1b6770196ff 100644
--- a/scripts/west_commands/zcmake.py
+++ b/scripts/west_commands/zcmake.py
@@ -10,6 +10,7 @@
 '''
 
 from collections import OrderedDict
+import argparse
 import os.path
 import re
 import subprocess
@@ -26,7 +27,7 @@
 '''Name of the default CMake generator.'''
 
 
-def run_cmake(args, cwd=None, capture_output=False, dry_run=False):
+def run_cmake(args, cwd=None, capture_output=False, dry_run=False, env=None):
     '''Run cmake to (re)generate a build system, a script, etc.
 
     :param args: arguments to pass to CMake
@@ -36,6 +37,7 @@ def run_cmake(args, cwd=None, capture_output=False, dry_run=False):
                            dry_run is also True)
     :param dry_run: don't actually execute the command, just print what
                     would have been run
+    :param env: used adjusted environment when running CMake
 
     If capture_output is set to True, returns the output of the command instead
     of displaying it on stdout/stderr..'''
@@ -60,7 +62,7 @@ def run_cmake(args, cwd=None, capture_output=False, dry_run=False):
         return None
 
     log.dbg('Running CMake:', quote_sh_list(cmd), level=log.VERBOSE_NORMAL)
-    p = subprocess.Popen(cmd, **kwargs)
+    p = subprocess.Popen(cmd, env=env, **kwargs)
     out, _ = p.communicate()
     if p.returncode == 0:
         if out:
@@ -82,8 +84,29 @@ def run_build(build_directory, **kwargs):
 
     Any additional keyword arguments are passed as-is to run_cmake().
     '''
+    cmake_env = None
     extra_args = kwargs.pop('extra_args', [])
-    return run_cmake(['--build', build_directory] + extra_args, **kwargs)
+
+    try:
+        index = extra_args.index('--') + 1
+        build_opt_parser = argparse.ArgumentParser(allow_abbrev=False)
+        build_opt_parser.add_argument('-j', '--jobs')
+        build_opt_parser.add_argument('-v', '--verbose', action='store_true')
+        build_opts, native_args = build_opt_parser.parse_known_args(extra_args[index:])
+        extra_args = extra_args[:index] + native_args
+
+        if build_opts:
+            cmake_env = os.environ.copy()
+            if build_opts.jobs:
+                cmake_env["CMAKE_BUILD_PARALLEL_LEVEL"] = build_opts.jobs
+
+            if build_opts.verbose:
+                cmake_env["VERBOSE"] = "1"
+
+    except ValueError:
+        pass # Ignore, no presence of '--' so nothing to do.
+
+    return run_cmake(['--build', build_directory] + extra_args, env=cmake_env, **kwargs)
 
 
 def make_c_identifier(string):

From c95fb4e1ce868b280593c56c767e9b25a5bdbb06 Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Thu, 6 Mar 2025 12:17:17 +0100
Subject: [PATCH 2738/2913] [nrf fromtree] doc: document
 CMAKE_BUILD_PARALLEL_LEVEL and VERBOSE env variables

Sysbuild may include several images and when using ninja as build tools
then build options like `ninja -v` or `ninja -j <n>` is only consumed
by the top-level build folder, which is sysbuild itself.

CMake supports setting number of jobs or verbosity using environment
variables.

Document this feature in the Building with sysbuild section.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit e270fd46897d1ae74d979833cff9b5cd89cc660c)
---
 doc/build/sysbuild/index.rst | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/build/sysbuild/index.rst b/doc/build/sysbuild/index.rst
index 4d11d5a1fa3..6618194baa6 100644
--- a/doc/build/sysbuild/index.rst
+++ b/doc/build/sysbuild/index.rst
@@ -143,6 +143,25 @@ As mentioned above, you can run sysbuild via ``west build`` or ``cmake``.
       an extra CMake argument. ``APP_DIR`` is the path to the main Zephyr
       application managed by sysbuild.
 
+      .. tip::
+
+         The environment variables, ``CMAKE_BUILD_PARALLEL_LEVEL`` and ``VERBOSE``, can be used to
+         control the build process when using sysbuild with CMake and ninja.
+
+         To set number of jobs for ninja for all sysbuild images, set the CMAKE_BUILD_PARALLEL_LEVEL
+         environment variable and invoke the build with ``cmake --build``, for example:
+
+         .. code-block:: shell
+
+            CMAKE_BUILD_PARALLEL_LEVEL=<n> cmake --build .
+
+         For verbose output of all images, use:
+
+         .. code-block:: shell
+
+            VERBOSE=1 cmake --build .
+
+
 Configuration namespacing
 *************************
 

From 71f956c312ed2be6ba233e3946855691a0019ffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Fri, 7 Feb 2025 08:35:02 +0100
Subject: [PATCH 2739/2913] [nrf fromtree] drivers: udc: Do not allow
 lock/unlock to fail
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

USB stack does not check api->lock() and api->unlock() return value and
all UDC drivers block without timeout in its lock() and unlock() api
implementations. There is no realistic way to handle lock() and unlock()
errors without making USB device stack API unnecessarily complex.

Remove the return type from lock() and unlock() to make it clear that
the functions must not fail.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 23232e6bb23fea1a1271ad58cbf58e877ac103ed)
---
 drivers/usb/udc/udc_ambiq.c       | 8 ++++----
 drivers/usb/udc/udc_dwc2.c        | 8 ++++----
 drivers/usb/udc/udc_it82xx2.c     | 8 ++++----
 drivers/usb/udc/udc_kinetis.c     | 8 ++++----
 drivers/usb/udc/udc_mcux_ehci.c   | 8 ++++----
 drivers/usb/udc/udc_mcux_ip3511.c | 8 ++++----
 drivers/usb/udc/udc_nrf.c         | 8 ++++----
 drivers/usb/udc/udc_numaker.c     | 8 ++++----
 drivers/usb/udc/udc_renesas_ra.c  | 8 ++++----
 drivers/usb/udc/udc_rpi_pico.c    | 8 ++++----
 drivers/usb/udc/udc_skeleton.c    | 8 ++++----
 drivers/usb/udc/udc_smartbond.c   | 8 ++++----
 drivers/usb/udc/udc_stm32.c       | 8 ++++----
 drivers/usb/udc/udc_virtual.c     | 8 ++++----
 include/zephyr/drivers/usb/udc.h  | 4 ++--
 15 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/drivers/usb/udc/udc_ambiq.c b/drivers/usb/udc/udc_ambiq.c
index ffc84c0413d..f6f342fc21c 100644
--- a/drivers/usb/udc/udc_ambiq.c
+++ b/drivers/usb/udc/udc_ambiq.c
@@ -594,14 +594,14 @@ static int udc_ambiq_shutdown(const struct device *dev)
 	return 0;
 }
 
-static int udc_ambiq_lock(const struct device *dev)
+static void udc_ambiq_lock(const struct device *dev)
 {
-	return udc_lock_internal(dev, K_FOREVER);
+	udc_lock_internal(dev, K_FOREVER);
 }
 
-static int udc_ambiq_unlock(const struct device *dev)
+static void udc_ambiq_unlock(const struct device *dev)
 {
-	return udc_unlock_internal(dev);
+	udc_unlock_internal(dev);
 }
 
 static void ambiq_handle_evt_setup(const struct device *dev)
diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index d1fc555d839..13aa6c1738a 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -2316,14 +2316,14 @@ static int dwc2_driver_preinit(const struct device *dev)
 	return 0;
 }
 
-static int udc_dwc2_lock(const struct device *dev)
+static void udc_dwc2_lock(const struct device *dev)
 {
-	return udc_lock_internal(dev, K_FOREVER);
+	udc_lock_internal(dev, K_FOREVER);
 }
 
-static int udc_dwc2_unlock(const struct device *dev)
+static void udc_dwc2_unlock(const struct device *dev)
 {
-	return udc_unlock_internal(dev);
+	udc_unlock_internal(dev);
 }
 
 static void dwc2_on_bus_reset(const struct device *dev)
diff --git a/drivers/usb/udc/udc_it82xx2.c b/drivers/usb/udc/udc_it82xx2.c
index 6affd349e72..0c61b7b17db 100644
--- a/drivers/usb/udc/udc_it82xx2.c
+++ b/drivers/usb/udc/udc_it82xx2.c
@@ -1495,14 +1495,14 @@ static int it82xx2_shutdown(const struct device *dev)
 	return 0;
 }
 
-static int it82xx2_lock(const struct device *dev)
+static void it82xx2_lock(const struct device *dev)
 {
-	return udc_lock_internal(dev, K_FOREVER);
+	udc_lock_internal(dev, K_FOREVER);
 }
 
-static int it82xx2_unlock(const struct device *dev)
+static void it82xx2_unlock(const struct device *dev)
 {
-	return udc_unlock_internal(dev);
+	udc_unlock_internal(dev);
 }
 
 static const struct udc_api it82xx2_api = {
diff --git a/drivers/usb/udc/udc_kinetis.c b/drivers/usb/udc/udc_kinetis.c
index c471fb15ebd..70fae41b487 100644
--- a/drivers/usb/udc/udc_kinetis.c
+++ b/drivers/usb/udc/udc_kinetis.c
@@ -1069,14 +1069,14 @@ static int usbfsotg_shutdown(const struct device *dev)
 	return 0;
 }
 
-static int usbfsotg_lock(const struct device *dev)
+static void usbfsotg_lock(const struct device *dev)
 {
-	return udc_lock_internal(dev, K_FOREVER);
+	udc_lock_internal(dev, K_FOREVER);
 }
 
-static int usbfsotg_unlock(const struct device *dev)
+static void usbfsotg_unlock(const struct device *dev)
 {
-	return udc_unlock_internal(dev);
+	udc_unlock_internal(dev);
 }
 
 static int usbfsotg_driver_preinit(const struct device *dev)
diff --git a/drivers/usb/udc/udc_mcux_ehci.c b/drivers/usb/udc/udc_mcux_ehci.c
index 179e9282b18..489540a9d15 100644
--- a/drivers/usb/udc/udc_mcux_ehci.c
+++ b/drivers/usb/udc/udc_mcux_ehci.c
@@ -64,14 +64,14 @@ struct udc_mcux_event {
 K_MEM_SLAB_DEFINE(udc_event_slab, sizeof(struct udc_mcux_event),
 		  CONFIG_UDC_NXP_EVENT_COUNT, sizeof(void *));
 
-static int udc_mcux_lock(const struct device *dev)
+static void udc_mcux_lock(const struct device *dev)
 {
-	return udc_lock_internal(dev, K_FOREVER);
+	udc_lock_internal(dev, K_FOREVER);
 }
 
-static int udc_mcux_unlock(const struct device *dev)
+static void udc_mcux_unlock(const struct device *dev)
 {
-	return udc_unlock_internal(dev);
+	udc_unlock_internal(dev);
 }
 
 static int udc_mcux_control(const struct device *dev, usb_device_control_type_t command,
diff --git a/drivers/usb/udc/udc_mcux_ip3511.c b/drivers/usb/udc/udc_mcux_ip3511.c
index 7aa751a3113..f8db1221e07 100644
--- a/drivers/usb/udc/udc_mcux_ip3511.c
+++ b/drivers/usb/udc/udc_mcux_ip3511.c
@@ -64,14 +64,14 @@ struct udc_mcux_event {
 K_MEM_SLAB_DEFINE(udc_event_slab, sizeof(struct udc_mcux_event),
 		  CONFIG_UDC_NXP_EVENT_COUNT, sizeof(void *));
 
-static int udc_mcux_lock(const struct device *dev)
+static void udc_mcux_lock(const struct device *dev)
 {
-	return udc_lock_internal(dev, K_FOREVER);
+	udc_lock_internal(dev, K_FOREVER);
 }
 
-static int udc_mcux_unlock(const struct device *dev)
+static void udc_mcux_unlock(const struct device *dev)
 {
-	return udc_unlock_internal(dev);
+	udc_unlock_internal(dev);
 }
 
 static int udc_mcux_control(const struct device *dev, usb_device_control_type_t command,
diff --git a/drivers/usb/udc/udc_nrf.c b/drivers/usb/udc/udc_nrf.c
index 255895f23d8..cafe3fbd19f 100644
--- a/drivers/usb/udc/udc_nrf.c
+++ b/drivers/usb/udc/udc_nrf.c
@@ -909,14 +909,14 @@ static int udc_nrf_driver_init(const struct device *dev)
 	return 0;
 }
 
-static int udc_nrf_lock(const struct device *dev)
+static void udc_nrf_lock(const struct device *dev)
 {
-	return udc_lock_internal(dev, K_FOREVER);
+	udc_lock_internal(dev, K_FOREVER);
 }
 
-static int udc_nrf_unlock(const struct device *dev)
+static void udc_nrf_unlock(const struct device *dev)
 {
-	return udc_unlock_internal(dev);
+	udc_unlock_internal(dev);
 }
 
 static const struct udc_nrf_config udc_nrf_cfg = {
diff --git a/drivers/usb/udc/udc_numaker.c b/drivers/usb/udc/udc_numaker.c
index 2fba252371f..5545132944d 100644
--- a/drivers/usb/udc/udc_numaker.c
+++ b/drivers/usb/udc/udc_numaker.c
@@ -1622,14 +1622,14 @@ static int udc_numaker_shutdown(const struct device *dev)
 	return 0;
 }
 
-static int udc_numaker_lock(const struct device *dev)
+static void udc_numaker_lock(const struct device *dev)
 {
-	return udc_lock_internal(dev, K_FOREVER);
+	udc_lock_internal(dev, K_FOREVER);
 }
 
-static int udc_numaker_unlock(const struct device *dev)
+static void udc_numaker_unlock(const struct device *dev)
 {
-	return udc_unlock_internal(dev);
+	udc_unlock_internal(dev);
 }
 
 static int udc_numaker_driver_preinit(const struct device *dev)
diff --git a/drivers/usb/udc/udc_renesas_ra.c b/drivers/usb/udc/udc_renesas_ra.c
index a8b127a3510..66f3ae30840 100644
--- a/drivers/usb/udc/udc_renesas_ra.c
+++ b/drivers/usb/udc/udc_renesas_ra.c
@@ -641,14 +641,14 @@ static int udc_renesas_ra_driver_preinit(const struct device *dev)
 	return 0;
 }
 
-static int udc_renesas_ra_lock(const struct device *dev)
+static void udc_renesas_ra_lock(const struct device *dev)
 {
-	return udc_lock_internal(dev, K_FOREVER);
+	udc_lock_internal(dev, K_FOREVER);
 }
 
-static int udc_renesas_ra_unlock(const struct device *dev)
+static void udc_renesas_ra_unlock(const struct device *dev)
 {
-	return udc_unlock_internal(dev);
+	udc_unlock_internal(dev);
 }
 
 static const struct udc_api udc_renesas_ra_api = {
diff --git a/drivers/usb/udc/udc_rpi_pico.c b/drivers/usb/udc/udc_rpi_pico.c
index f109418baa9..4065f4555b1 100644
--- a/drivers/usb/udc/udc_rpi_pico.c
+++ b/drivers/usb/udc/udc_rpi_pico.c
@@ -1050,14 +1050,14 @@ static int udc_rpi_pico_driver_preinit(const struct device *dev)
 	return 0;
 }
 
-static int udc_rpi_pico_lock(const struct device *dev)
+static void udc_rpi_pico_lock(const struct device *dev)
 {
-	return udc_lock_internal(dev, K_FOREVER);
+	udc_lock_internal(dev, K_FOREVER);
 }
 
-static int udc_rpi_pico_unlock(const struct device *dev)
+static void udc_rpi_pico_unlock(const struct device *dev)
 {
-	return udc_unlock_internal(dev);
+	udc_unlock_internal(dev);
 }
 
 static const struct udc_api udc_rpi_pico_api = {
diff --git a/drivers/usb/udc/udc_skeleton.c b/drivers/usb/udc/udc_skeleton.c
index f8870c87f58..cba2016572c 100644
--- a/drivers/usb/udc/udc_skeleton.c
+++ b/drivers/usb/udc/udc_skeleton.c
@@ -323,14 +323,14 @@ static int udc_skeleton_driver_preinit(const struct device *dev)
 	return 0;
 }
 
-static int udc_skeleton_lock(const struct device *dev)
+static void udc_skeleton_lock(const struct device *dev)
 {
-	return udc_lock_internal(dev, K_FOREVER);
+	udc_lock_internal(dev, K_FOREVER);
 }
 
-static int udc_skeleton_unlock(const struct device *dev)
+static void udc_skeleton_unlock(const struct device *dev)
 {
-	return udc_unlock_internal(dev);
+	udc_unlock_internal(dev);
 }
 
 /*
diff --git a/drivers/usb/udc/udc_smartbond.c b/drivers/usb/udc/udc_smartbond.c
index 3a214e1b60f..dd5a2aa782a 100644
--- a/drivers/usb/udc/udc_smartbond.c
+++ b/drivers/usb/udc/udc_smartbond.c
@@ -1695,14 +1695,14 @@ static int udc_smartbond_init(const struct device *dev)
 	return 0;
 }
 
-static int udc_smartbond_lock(const struct device *dev)
+static void udc_smartbond_lock(const struct device *dev)
 {
-	return udc_lock_internal(dev, K_FOREVER);
+	udc_lock_internal(dev, K_FOREVER);
 }
 
-static int udc_smartbond_unlock(const struct device *dev)
+static void udc_smartbond_unlock(const struct device *dev)
 {
-	return udc_unlock_internal(dev);
+	udc_unlock_internal(dev);
 }
 
 static const struct udc_api udc_smartbond_api = {
diff --git a/drivers/usb/udc/udc_stm32.c b/drivers/usb/udc/udc_stm32.c
index 627d2299756..d95c6fb0afd 100644
--- a/drivers/usb/udc/udc_stm32.c
+++ b/drivers/usb/udc/udc_stm32.c
@@ -60,14 +60,14 @@ struct udc_stm32_config {
 	uint16_t ep_mps;
 };
 
-static int udc_stm32_lock(const struct device *dev)
+static void udc_stm32_lock(const struct device *dev)
 {
-	return udc_lock_internal(dev, K_FOREVER);
+	udc_lock_internal(dev, K_FOREVER);
 }
 
-static int udc_stm32_unlock(const struct device *dev)
+static void udc_stm32_unlock(const struct device *dev)
 {
-	return udc_unlock_internal(dev);
+	udc_unlock_internal(dev);
 }
 
 #define hpcd2data(hpcd) CONTAINER_OF(hpcd, struct udc_stm32_data, pcd);
diff --git a/drivers/usb/udc/udc_virtual.c b/drivers/usb/udc/udc_virtual.c
index cc21649ad67..c729aa08cd7 100644
--- a/drivers/usb/udc/udc_virtual.c
+++ b/drivers/usb/udc/udc_virtual.c
@@ -612,14 +612,14 @@ static int udc_vrt_driver_preinit(const struct device *dev)
 	return 0;
 }
 
-static int udc_vrt_lock(const struct device *dev)
+static void udc_vrt_lock(const struct device *dev)
 {
-	return udc_lock_internal(dev, K_FOREVER);
+	udc_lock_internal(dev, K_FOREVER);
 }
 
-static int udc_vrt_unlock(const struct device *dev)
+static void udc_vrt_unlock(const struct device *dev)
 {
-	return udc_unlock_internal(dev);
+	udc_unlock_internal(dev);
 }
 
 static const struct udc_api udc_vrt_api = {
diff --git a/include/zephyr/drivers/usb/udc.h b/include/zephyr/drivers/usb/udc.h
index cd1e0385133..7e9d66bc638 100644
--- a/include/zephyr/drivers/usb/udc.h
+++ b/include/zephyr/drivers/usb/udc.h
@@ -249,8 +249,8 @@ struct udc_api {
 	int (*disable)(const struct device *dev);
 	int (*init)(const struct device *dev);
 	int (*shutdown)(const struct device *dev);
-	int (*lock)(const struct device *dev);
-	int (*unlock)(const struct device *dev);
+	void (*lock)(const struct device *dev);
+	void (*unlock)(const struct device *dev);
 };
 
 /**

From 3d114bd7b84261e041ee9fa767b30d24000d9c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Thu, 6 Feb 2025 15:20:52 +0100
Subject: [PATCH 2740/2913] [nrf fromtree] drivers: udc_dwc2: Avoid unnecessary
 context switches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

DWC2 thread must acquire UDC mutex before accessing shared resources
(peripheral registers and software data structures). Whenever software
enqueues a buffer, the caller first obtains mutex, adds the buffer to
the list, posts event to wake up DWC2 thread and releases mutex. If DWC2
thread has higher priority than the task currently holding a mutex,
there will be two completely unnecessary task switches: DWC2 will switch
in, try to obtain mutex, and then the control will be returned to the
mutex holder.

Avoid the unnecessary task switches by locking scheduler prior to
obtaining the mutex and unlocking scheduler after releasing the mutex.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 962a53ef8eb7c6cf32bf8e25b74075eec680b575)
---
 drivers/usb/udc/udc_dwc2.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 13aa6c1738a..0b014d13cb0 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -2318,12 +2318,14 @@ static int dwc2_driver_preinit(const struct device *dev)
 
 static void udc_dwc2_lock(const struct device *dev)
 {
+	k_sched_lock();
 	udc_lock_internal(dev, K_FOREVER);
 }
 
 static void udc_dwc2_unlock(const struct device *dev)
 {
 	udc_unlock_internal(dev);
+	k_sched_unlock();
 }
 
 static void dwc2_on_bus_reset(const struct device *dev)

From 7383e86157d02bf0ba91a8a9071be07648c9b48e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Thu, 13 Mar 2025 14:28:31 +0100
Subject: [PATCH 2741/2913] [nrf fromtree] drivers: udc_dwc2: Disable endpoint
 while hibernated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When the endpoint is disabled while the core is hibernated, there are
timeouts waiting for interrupts. It is not clear how the stack should
behave when class and/or application wants to disable the endpoint while
device is suspended. The problem was originally observed when the
endpoints were disabled as a result of usbd_disable() call.

Avoid the timeouts by modifying the backup values instead of the real
registers (which are not accessible when hibernated).

Split the 32-bit txf_set variable into two 16-bit variables (txf_set and
pending_tx_flush) because maximum number of TxFIFO instances is 16.
The txf_set variable is used as-is, while the pending_tx_flush is used
to keep track of TxFIFOs that have to be flushed on hibernation exit.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 2be960ad2b33ce1e5af50a2337de80600ab5eea5)
---
 drivers/usb/udc/udc_dwc2.c | 46 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 0b014d13cb0..72d2323d579 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -110,11 +110,12 @@ struct udc_dwc2_data {
 	struct k_event xfer_finished;
 	struct dwc2_reg_backup backup;
 	uint32_t ghwcfg1;
-	uint32_t txf_set;
 	uint32_t max_xfersize;
 	uint32_t max_pktcnt;
 	uint32_t tx_len[16];
 	uint32_t rx_siz[16];
+	uint16_t txf_set;
+	uint16_t pending_tx_flush;
 	uint16_t dfifodepth;
 	uint16_t rxfifo_depth;
 	uint16_t max_txfifo_depth[16];
@@ -1484,6 +1485,7 @@ static int dwc2_unset_dedicated_fifo(const struct device *dev,
 static void udc_dwc2_ep_disable(const struct device *dev,
 				struct udc_ep_config *const cfg, bool stall)
 {
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
 	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
 	mem_addr_t dxepctl_reg;
@@ -1493,6 +1495,40 @@ static void udc_dwc2_ep_disable(const struct device *dev,
 	dxepctl_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
 	dxepctl = sys_read32(dxepctl_reg);
 
+	if (priv->hibernated) {
+		/* Currently USB stack calls this function while hibernated,
+		 * for example if usbd_disable() is called. We cannot access the
+		 * real registers when hibernated, so just modify backup values
+		 * that will be restored on hibernation exit.
+		 */
+		if (USB_EP_DIR_IS_OUT(cfg->addr)) {
+			dxepctl = priv->backup.doepctl[ep_idx];
+
+			dxepctl &= ~USB_DWC2_DEPCTL_EPENA;
+			if (stall) {
+				dxepctl |= USB_DWC2_DEPCTL_STALL;
+			} else {
+				dxepctl |= USB_DWC2_DEPCTL_SNAK;
+			}
+
+			priv->backup.doepctl[ep_idx] = dxepctl;
+		} else {
+			dxepctl = priv->backup.diepctl[ep_idx];
+
+			dxepctl &= ~USB_DWC2_DEPCTL_EPENA;
+			dxepctl |= USB_DWC2_DEPCTL_SNAK;
+			if (stall) {
+				dxepctl |= USB_DWC2_DEPCTL_STALL;
+			}
+
+			priv->backup.diepctl[ep_idx] = dxepctl;
+
+			priv->pending_tx_flush |= BIT(usb_dwc2_get_depctl_txfnum(dxepctl));
+		}
+
+		return;
+	}
+
 	if (!is_iso && (dxepctl & USB_DWC2_DEPCTL_NAKSTS)) {
 		/* Endpoint already sends forced NAKs. STALL if necessary. */
 		if (stall) {
@@ -2162,6 +2198,7 @@ static int udc_dwc2_disable(const struct device *dev)
 	if (priv->hibernated) {
 		dwc2_exit_hibernation(dev, false, true);
 		priv->hibernated = 0;
+		priv->pending_tx_flush = 0;
 	}
 
 	sys_clear_bits((mem_addr_t)&base->gahbcfg, USB_DWC2_GAHBCFG_GLBINTRMASK);
@@ -2926,6 +2963,13 @@ static void dwc2_handle_hibernation_exit(const struct device *dev,
 			k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
 		}
 	}
+
+	while (priv->pending_tx_flush) {
+		unsigned int fifo = find_lsb_set(priv->pending_tx_flush) - 1;
+
+		priv->pending_tx_flush &= ~BIT(fifo);
+		dwc2_flush_tx_fifo(dev, fifo);
+	}
 }
 
 static uint8_t pull_next_ep_from_bitmap(uint32_t *bitmap)

From a4741f2817d34ce7b3f4261304921ed14a13b5b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Thu, 13 Mar 2025 14:31:14 +0100
Subject: [PATCH 2742/2913] [nrf fromtree] drivers: udc_dwc2: Ensure
 overlapping USBHS reset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Wait for PHY clock before triggering START task to ensure overlapped
reset for PHY and DWC2 core.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 437983e2c957541f052facc2795e03b0071c738f)
---
 drivers/usb/udc/udc_dwc2_vendor_quirks.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/udc/udc_dwc2_vendor_quirks.h b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
index f45404c2b84..0a102188139 100644
--- a/drivers/usb/udc/udc_dwc2_vendor_quirks.h
+++ b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
@@ -199,6 +199,11 @@ static inline int usbhs_enable_core(const struct device *dev)
 	}
 
 	wrapper->ENABLE = USBHS_ENABLE_PHY_Msk | USBHS_ENABLE_CORE_Msk;
+
+	/* Wait for PHY clock to start */
+	k_busy_wait(45);
+
+	/* Release DWC2 reset */
 	wrapper->TASKS_START = 1UL;
 
 	/* Wait for clock to start to avoid hang on too early register read */
@@ -218,7 +223,6 @@ static inline int usbhs_disable_core(const struct device *dev)
 	wrapper->INTENCLR = 1UL;
 
 	wrapper->ENABLE = 0UL;
-	wrapper->TASKS_START = 1UL;
 
 	return 0;
 }

From 1ebfcf3e2adb5045ba9dacafbc4cbf4f36cec1df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Mon, 10 Mar 2025 10:09:39 +0100
Subject: [PATCH 2743/2913] [nrf fromtree] drivers: udc_dwc2: Reset core on
 shutdown
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OUT endpoint 0 cannot be disabled and therefore the only way to forcibly
reclaim the buffer is to reset the core. The reset does not finish if
PHY clock is not running, but just triggering the reset seems to be
enough to be able to reclaim the buffer.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 2395452656099afee86d642c063b582df6b0d6c9)
---
 drivers/usb/udc/udc_dwc2.c | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 72d2323d579..bc5d9881dbe 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -1661,15 +1661,6 @@ static int udc_dwc2_ep_deactivate(const struct device *dev,
 	sys_write32(dxepctl, dxepctl_reg);
 	dwc2_set_epint(dev, cfg, false);
 
-	if (cfg->addr == USB_CONTROL_EP_OUT) {
-		struct net_buf *buf = udc_buf_get_all(dev, cfg->addr);
-
-		/* Release the buffer allocated in dwc2_ctrl_feed_dout() */
-		if (buf) {
-			net_buf_unref(buf);
-		}
-	}
-
 	return 0;
 }
 
@@ -1875,10 +1866,16 @@ static int dwc2_core_soft_reset(const struct device *dev)
 		}
 
 		k_busy_wait(1);
+
+		if (dwc2_quirk_is_phy_clk_off(dev)) {
+			/* Software reset won't finish without PHY clock */
+			return -EIO;
+		}
 	} while (sys_read32(grstctl_reg) & USB_DWC2_GRSTCTL_CSFTRST &&
 		 !(sys_read32(grstctl_reg) & USB_DWC2_GRSTCTL_CSFTRSTDONE));
 
-	sys_clear_bits(grstctl_reg, USB_DWC2_GRSTCTL_CSFTRST | USB_DWC2_GRSTCTL_CSFTRSTDONE);
+	/* CSFTRSTDONE is W1C so the write must have the bit set to clear it */
+	sys_clear_bits(grstctl_reg, USB_DWC2_GRSTCTL_CSFTRST);
 
 	return 0;
 }
@@ -2177,10 +2174,9 @@ static int udc_dwc2_disable(const struct device *dev)
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
 	mem_addr_t dctl_reg = (mem_addr_t)&base->dctl;
+	struct net_buf *buf;
 	int err;
 
-	/* Enable soft disconnect */
-	sys_set_bits(dctl_reg, USB_DWC2_DCTL_SFTDISCON);
 	LOG_DBG("Disable device %p", dev);
 
 	if (udc_ep_disable_internal(dev, USB_CONTROL_EP_OUT)) {
@@ -2203,6 +2199,22 @@ static int udc_dwc2_disable(const struct device *dev)
 
 	sys_clear_bits((mem_addr_t)&base->gahbcfg, USB_DWC2_GAHBCFG_GLBINTRMASK);
 
+	/* Enable soft disconnect */
+	sys_set_bits(dctl_reg, USB_DWC2_DCTL_SFTDISCON);
+
+	/* OUT endpoint 0 cannot be disabled by software. The buffer allocated
+	 * in dwc2_ctrl_feed_dout() can only be freed after core reset if the
+	 * core was in Buffer DMA mode.
+	 *
+	 * Soft Reset does timeout if PHY clock is not running. However, just
+	 * triggering Soft Reset seems to be enough on shutdown clean up.
+	 */
+	dwc2_core_soft_reset(dev);
+	buf = udc_buf_get_all(dev, USB_CONTROL_EP_OUT);
+	if (buf) {
+		net_buf_unref(buf);
+	}
+
 	err = dwc2_quirk_disable(dev);
 	if (err) {
 		LOG_ERR("Quirk disable failed %d", err);

From cdaa790ee591f9af3191e9bef7b1253edf9c3c97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Thu, 20 Mar 2025 11:00:12 +0100
Subject: [PATCH 2744/2913] [nrf fromtree] drivers: udc_dwc2: Optimize endpoint
 event clear
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There is no point in calling k_event_test() to determine what events are
posted and then passing that value to k_event_clear(). Simply pass
UINT32_MAX to k_event_clear() and use the return value to slightly
reduce overhead.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 2aa26ad2615297c3c69649cfd89b345838413c75)
---
 drivers/usb/udc/udc_dwc2.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index bc5d9881dbe..8860f69ee36 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -3026,8 +3026,7 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 
 		if (!priv->hibernated) {
 			LOG_DBG("New transfer(s) in the queue");
-			eps = k_event_test(&priv->xfer_new, UINT32_MAX);
-			k_event_clear(&priv->xfer_new, eps);
+			eps = k_event_clear(&priv->xfer_new, UINT32_MAX);
 		} else {
 			/* Events will be handled after hibernation exit */
 			eps = 0;
@@ -3049,8 +3048,7 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
 
 		if (!priv->hibernated) {
-			eps = k_event_test(&priv->xfer_finished, UINT32_MAX);
-			k_event_clear(&priv->xfer_finished, eps);
+			eps = k_event_clear(&priv->xfer_finished, UINT32_MAX);
 		} else {
 			/* Events will be handled after hibernation exit */
 			eps = 0;

From 8277f97d3c968b8aedd7ebcab3d54edbec2f6540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Mon, 10 Mar 2025 14:59:22 +0100
Subject: [PATCH 2745/2913] [nrf fromtree] drivers: udc_dwc2: Set control
 endpoint CNAK only when necessary
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SETUP data is unconditionally ACKed by the controller. Other DATA
packets sent to OUT control endpoint 0 (i.e. OUT Data Stage packets
and OUT Status Stage packet) are ACKed by the device only if the
endpoint was enabled with CNAK bit set.

In Buffer DMA mode controller will lock up in following scenario:
  * OUT EP0 is not enabled, e.g. OUT Status Stage has finished
  * Host starts Control Write transfer, i.e. sends SETUP DATA0 and
    device ACKs (regardless if endpoint is enabled or not)
  * host sends OUT Data Stage (OUT DATA1)
      - software enables endpoint to be able to receive next SETUP data
	while host is transmitting the OUT token. If CNAK bit is set
        alongside the EPENA bit, the device will ACK the OUT Data Stage.
        If CNAK bit is not set, the device will NAK the OUT Data Stage.

When the lockup occurs, from host perspective the OUT Data Stage packet
was successfully transmitted. This can result in host starting IN Status
Stage if there was only one OUT Data Stage packet. This in turn results
in device never getting the DOEPTINT0 SetUp interrupt. Besides just not
getting the SetUp interrupt, any subsequent control transfer won't be
noticed by device at all.

The lockup was first observed while stress testing. The host was issuing
endless sequence of Control Write, Control Read, Control Write, Control
Read, ... commands. When the controller did lock up in Buffer DMA mode,
from host perspective the device was timing out all control transfers.

Avoid the Buffer DMA lockup by setting CNAK bit only when necessary.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 6e3f8d4967e1e55257ba82ffd889604746d8facf)
---
 drivers/usb/udc/udc_dwc2.c | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 8860f69ee36..feccd3d8662 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -669,7 +669,32 @@ static void dwc2_prep_rx(const struct device *dev, struct net_buf *buf,
 
 	/* Clear NAK and set endpoint enable */
 	doepctl = sys_read32(doepctl_reg);
-	doepctl |= USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_CNAK;
+	doepctl |= USB_DWC2_DEPCTL_EPENA;
+	if (cfg->addr == USB_CONTROL_EP_OUT) {
+		struct udc_data *data = dev->data;
+
+		/* During OUT Data Stage every packet has to have CNAK set.
+		 * In Buffer DMA mode the OUT endpoint is armed during IN Data
+		 * Stage to accept either Status stage or new SETUP token. The
+		 * Status stage (premature or not) can only be received if CNAK
+		 * was set. In Completer mode the OUT endpoint armed during OUT
+		 * Status stage needs CNAK.
+		 *
+		 * Setting CNAK in other cases opens up possibility for Buffer
+		 * DMA controller to lock up completely if the endpoint is
+		 * enabled (to receive SETUP data) when the host is transmitting
+		 * subsequent control transfer OUT Data Stage packet (SETUP DATA
+		 * is unconditionally ACKed regardless of software state).
+		 */
+		if (data->stage == CTRL_PIPE_STAGE_DATA_OUT ||
+		    data->stage == CTRL_PIPE_STAGE_DATA_IN ||
+		    data->stage == CTRL_PIPE_STAGE_STATUS_OUT) {
+			doepctl |= USB_DWC2_DEPCTL_CNAK;
+		}
+	} else {
+		/* Non-control endpoint, set CNAK for all transfers */
+		doepctl |= USB_DWC2_DEPCTL_CNAK;
+	}
 
 	if (dwc2_ep_is_iso(cfg)) {
 		xfersize = USB_MPS_TO_TPL(cfg->mps);

From 56cfdce7bf4b8b5382287e0ef4f3e28007ecd3e0 Mon Sep 17 00:00:00 2001
From: Johann Fischer <johann.fischer@nordicsemi.no>
Date: Wed, 20 Nov 2024 23:56:10 +0100
Subject: [PATCH 2746/2913] [nrf fromtree] usb: device_next: fix
 cdc_acm_send_notification()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix "warning: 'cdc_acm_send_notification' defined but not used"
when Kconfig option UART_USE_RUNTIME_CONFIGURE is not used and
properly handle enqueue error.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit 7b344567be8dbb10d53e8177b7f28c97b6fee1dd)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
---
 subsys/usb/device_next/class/usbd_cdc_acm.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/subsys/usb/device_next/class/usbd_cdc_acm.c b/subsys/usb/device_next/class/usbd_cdc_acm.c
index 3327db43d52..514883864c9 100644
--- a/subsys/usb/device_next/class/usbd_cdc_acm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_acm.c
@@ -493,8 +493,8 @@ static int usbd_cdc_acm_init(struct usbd_class_data *const c_data)
 	return 0;
 }
 
-static int cdc_acm_send_notification(const struct device *dev,
-				     const uint16_t serial_state)
+static inline int cdc_acm_send_notification(const struct device *dev,
+					    const uint16_t serial_state)
 {
 	struct cdc_acm_notification notification = {
 		.bmRequestType = 0xA1,
@@ -528,7 +528,11 @@ static int cdc_acm_send_notification(const struct device *dev,
 
 	net_buf_add_mem(buf, &notification, sizeof(struct cdc_acm_notification));
 	ret = usbd_ep_enqueue(c_data, buf);
-	/* FIXME: support for sync transfers */
+	if (ret) {
+		net_buf_unref(buf);
+		return ret;
+	}
+
 	k_sem_take(&data->notif_sem, K_FOREVER);
 
 	return ret;

From 7de7359fd62c518086ab7dcb68680c73b40c7000 Mon Sep 17 00:00:00 2001
From: Johann Fischer <johann.fischer@nordicsemi.no>
Date: Mon, 18 Nov 2024 16:58:22 +0100
Subject: [PATCH 2747/2913] [nrf fromtree] usb: device_next: allow CDC ACM UART
 to be initialized and enabled at boot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There are some boards and samples in the tree that use the CDC ACM UART
as the default serial backend, just like a real UART controller would.
The new device stack requires more detailed configuration than the old
one. In order to use the CDC ACM UART as the serial backend with the new
device stack in the same way as with the legacy stack, we need to
provide a solution to initialise and enable the CDC ACM UART at boot
time. We cannot use snippets as they do not support Kconfig files or
source code. Shields would be an option, but they cannot be used for
virtual devices such as the CDC ACM UART. The remaining solution is to
put the code and Kconfig file for it in the subsys directory.

Allow CDC ACM UART instance and USB device stack to be initialized and
enabled at boot time and to use it as serial backend for logging or
shell.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit 7ffa6203e1154cbd8d407ee53516914ad504b7eb)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
---
 subsys/usb/device_next/CMakeLists.txt         |   2 +
 subsys/usb/device_next/Kconfig                |   1 +
 subsys/usb/device_next/app/CMakeLists.txt     |   4 +
 .../device_next/app/Kconfig.cdc_acm_serial    |  57 ++++++++
 subsys/usb/device_next/app/cdc_acm_serial.c   | 131 ++++++++++++++++++
 subsys/usb/device_next/class/Kconfig.cdc_acm  |   1 +
 6 files changed, 196 insertions(+)
 create mode 100644 subsys/usb/device_next/app/CMakeLists.txt
 create mode 100644 subsys/usb/device_next/app/Kconfig.cdc_acm_serial
 create mode 100644 subsys/usb/device_next/app/cdc_acm_serial.c

diff --git a/subsys/usb/device_next/CMakeLists.txt b/subsys/usb/device_next/CMakeLists.txt
index 7ef32c4dcdb..ffd60042fa2 100644
--- a/subsys/usb/device_next/CMakeLists.txt
+++ b/subsys/usb/device_next/CMakeLists.txt
@@ -17,6 +17,8 @@ zephyr_library_sources(
 	usbd_msg.c
 )
 
+add_subdirectory(app)
+
 zephyr_library_sources_ifdef(
 	CONFIG_USBD_SHELL
 	usbd_shell.c
diff --git a/subsys/usb/device_next/Kconfig b/subsys/usb/device_next/Kconfig
index a38823db71a..52ce9d99085 100644
--- a/subsys/usb/device_next/Kconfig
+++ b/subsys/usb/device_next/Kconfig
@@ -56,5 +56,6 @@ config USBD_MSG_WORK_DELAY
 	  yet ready to publish the message. The delay unit is milliseconds.
 
 rsource "class/Kconfig"
+rsource "app/Kconfig.cdc_acm_serial"
 
 endif # USB_DEVICE_STACK_NEXT
diff --git a/subsys/usb/device_next/app/CMakeLists.txt b/subsys/usb/device_next/app/CMakeLists.txt
new file mode 100644
index 00000000000..116d422def3
--- /dev/null
+++ b/subsys/usb/device_next/app/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_sources_ifdef(CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT cdc_acm_serial.c)
diff --git a/subsys/usb/device_next/app/Kconfig.cdc_acm_serial b/subsys/usb/device_next/app/Kconfig.cdc_acm_serial
new file mode 100644
index 00000000000..dba212ba9ba
--- /dev/null
+++ b/subsys/usb/device_next/app/Kconfig.cdc_acm_serial
@@ -0,0 +1,57 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# This file contains Kconfig options and defaults for configuring the USB
+# device stack and CDC ACM instance to be used as the default serial backend
+# for logging or shell.
+
+
+menuconfig CDC_ACM_SERIAL_INITIALIZE_AT_BOOT
+	bool "Initialize USB device and CDC ACM UART at boot"
+	depends on USBD_CDC_ACM_CLASS
+	help
+	  This is intended for use with cdc-acm-snippet or as a default serial
+	  backend only in applications where no other USB features are
+	  required, configured, and enabled.
+
+if CDC_ACM_SERIAL_INITIALIZE_AT_BOOT
+
+config CDC_ACM_SERIAL_MANUFACTURER_STRING
+	string "USB device manufacturer string descriptor"
+	default "Zephyr Project"
+	help
+	  USB device manufacturer string descriptor.
+
+config CDC_ACM_SERIAL_PRODUCT_STRING
+	string "USB device product string descriptor"
+	default "CDC ACM serial backend"
+	help
+	  USB device product string descriptor.
+
+config CDC_ACM_SERIAL_VID
+	hex "USB device Vendor ID"
+	default 0x2fe3
+	help
+	  You must use your own VID for samples and applications outside of
+	  Zephyr Project.
+
+config CDC_ACM_SERIAL_PID
+	hex "USB device Product ID"
+	default 0x0004
+	help
+	  You must use your own PID for samples and applications outside of
+	  Zephyr Project.
+
+config CDC_ACM_SERIAL_SELF_POWERED
+	bool "USB device Self-powered attribute"
+	help
+	  Set the Self-powered attribute in the configuration.
+
+config CDC_ACM_SERIAL_MAX_POWER
+	int "USB device bMaxPower value"
+	default 125
+	range 0 250
+	help
+	  bMaxPower value in the configuration in 2 mA units.
+
+endif #CDC_ACM_SERIAL_INITIALIZE_AT_BOOT
diff --git a/subsys/usb/device_next/app/cdc_acm_serial.c b/subsys/usb/device_next/app/cdc_acm_serial.c
new file mode 100644
index 00000000000..9402722c6b0
--- /dev/null
+++ b/subsys/usb/device_next/app/cdc_acm_serial.c
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdint.h>
+
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/usb/usbd.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(cdc_acm_serial, LOG_LEVEL_DBG);
+
+/*
+ * This is intended for use with cdc-acm-snippet or as a default serial backend
+ * only in applications where no other USB features are required, configured,
+ * and enabled. This code only registers the first CDC-ACM instance.
+ */
+
+USBD_DEVICE_DEFINE(cdc_acm_serial,
+		   DEVICE_DT_GET(DT_NODELABEL(zephyr_udc0)),
+		   CONFIG_CDC_ACM_SERIAL_VID, CONFIG_CDC_ACM_SERIAL_PID);
+
+USBD_DESC_LANG_DEFINE(cdc_acm_serial_lang);
+USBD_DESC_MANUFACTURER_DEFINE(cdc_acm_serial_mfr, CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING);
+USBD_DESC_PRODUCT_DEFINE(cdc_acm_serial_product, CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING);
+USBD_DESC_SERIAL_NUMBER_DEFINE(cdc_acm_serial_sn);
+
+USBD_DESC_CONFIG_DEFINE(fs_cfg_desc, "FS Configuration");
+USBD_DESC_CONFIG_DEFINE(hs_cfg_desc, "HS Configuration");
+
+static const uint8_t attributes = IS_ENABLED(CONFIG_CDC_ACM_SERIAL_SELF_POWERED) ?
+				  USB_SCD_SELF_POWERED : 0;
+
+USBD_CONFIGURATION_DEFINE(cdc_acm_serial_fs_config,
+			  attributes,
+			  CONFIG_CDC_ACM_SERIAL_MAX_POWER, &fs_cfg_desc);
+
+USBD_CONFIGURATION_DEFINE(cdc_acm_serial_hs_config,
+			  attributes,
+			  CONFIG_CDC_ACM_SERIAL_MAX_POWER, &hs_cfg_desc);
+
+
+static int register_cdc_acm_0(struct usbd_context *const uds_ctx,
+			      const enum usbd_speed speed)
+{
+	struct usbd_config_node *cfg_nd;
+	int err;
+
+	if (speed == USBD_SPEED_HS) {
+		cfg_nd = &cdc_acm_serial_hs_config;
+	} else {
+		cfg_nd = &cdc_acm_serial_fs_config;
+	}
+
+	err = usbd_add_configuration(uds_ctx, speed, cfg_nd);
+	if (err) {
+		LOG_ERR("Failed to add configuration");
+		return err;
+	}
+
+	err = usbd_register_class(&cdc_acm_serial, "cdc_acm_0", speed, 1);
+	if (err) {
+		LOG_ERR("Failed to register classes");
+		return err;
+	}
+
+	return usbd_device_set_code_triple(uds_ctx, speed,
+					   USB_BCC_MISCELLANEOUS, 0x02, 0x01);
+}
+
+
+static int cdc_acm_serial_init_device(void)
+{
+	int err;
+
+	err = usbd_add_descriptor(&cdc_acm_serial, &cdc_acm_serial_lang);
+	if (err) {
+		LOG_ERR("Failed to initialize language descriptor (%d)", err);
+		return err;
+	}
+
+	err = usbd_add_descriptor(&cdc_acm_serial, &cdc_acm_serial_mfr);
+	if (err) {
+		LOG_ERR("Failed to initialize manufacturer descriptor (%d)", err);
+		return err;
+	}
+
+	err = usbd_add_descriptor(&cdc_acm_serial, &cdc_acm_serial_product);
+	if (err) {
+		LOG_ERR("Failed to initialize product descriptor (%d)", err);
+		return err;
+	}
+
+	err = usbd_add_descriptor(&cdc_acm_serial, &cdc_acm_serial_sn);
+	if (err) {
+		LOG_ERR("Failed to initialize SN descriptor (%d)", err);
+		return err;
+	}
+
+	if (usbd_caps_speed(&cdc_acm_serial) == USBD_SPEED_HS) {
+		err = register_cdc_acm_0(&cdc_acm_serial, USBD_SPEED_HS);
+		if (err) {
+			return err;
+		}
+	}
+
+	err = register_cdc_acm_0(&cdc_acm_serial, USBD_SPEED_FS);
+	if (err) {
+		return err;
+	}
+
+	err = usbd_init(&cdc_acm_serial);
+	if (err) {
+		LOG_ERR("Failed to initialize device support");
+		return err;
+	}
+
+	err = usbd_enable(&cdc_acm_serial);
+	if (err) {
+		LOG_ERR("Failed to enable device support");
+		return err;
+	}
+
+	return 0;
+}
+
+SYS_INIT(cdc_acm_serial_init_device, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY);
diff --git a/subsys/usb/device_next/class/Kconfig.cdc_acm b/subsys/usb/device_next/class/Kconfig.cdc_acm
index 997ded105f4..3d282560b1d 100644
--- a/subsys/usb/device_next/class/Kconfig.cdc_acm
+++ b/subsys/usb/device_next/class/Kconfig.cdc_acm
@@ -10,6 +10,7 @@ config USBD_CDC_ACM_CLASS
 	select SERIAL_SUPPORT_INTERRUPT
 	select RING_BUFFER
 	select UART_INTERRUPT_DRIVEN
+	default y
 	help
 	  USB device CDC ACM class implementation.
 

From 1354027ee7c08003f3fa67194806936786ab9751 Mon Sep 17 00:00:00 2001
From: Johann Fischer <johann.fischer@nordicsemi.no>
Date: Thu, 6 Feb 2025 12:16:23 +0100
Subject: [PATCH 2748/2913] [nrf fromtree] samples: usb: add console sample for
 the new USB device stack
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add sample to shows how to use the CDC ACM UART provided by the new
experimental USB device stack as a serial backend for the console.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit be5e666eb3b8dcfe1eb5d4865e6946d906c44087)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
---
 .../subsys/usb/console-next/CMakeLists.txt    |  8 ++++
 samples/subsys/usb/console-next/README.rst    | 39 +++++++++++++++++++
 samples/subsys/usb/console-next/app.overlay   | 17 ++++++++
 samples/subsys/usb/console-next/prj.conf      | 10 +++++
 samples/subsys/usb/console-next/sample.yaml   | 10 +++++
 samples/subsys/usb/console-next/src/main.c    | 30 ++++++++++++++
 6 files changed, 114 insertions(+)
 create mode 100644 samples/subsys/usb/console-next/CMakeLists.txt
 create mode 100644 samples/subsys/usb/console-next/README.rst
 create mode 100644 samples/subsys/usb/console-next/app.overlay
 create mode 100644 samples/subsys/usb/console-next/prj.conf
 create mode 100644 samples/subsys/usb/console-next/sample.yaml
 create mode 100644 samples/subsys/usb/console-next/src/main.c

diff --git a/samples/subsys/usb/console-next/CMakeLists.txt b/samples/subsys/usb/console-next/CMakeLists.txt
new file mode 100644
index 00000000000..d8de1e746af
--- /dev/null
+++ b/samples/subsys/usb/console-next/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(console-next)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/samples/subsys/usb/console-next/README.rst b/samples/subsys/usb/console-next/README.rst
new file mode 100644
index 00000000000..1ca2063640b
--- /dev/null
+++ b/samples/subsys/usb/console-next/README.rst
@@ -0,0 +1,39 @@
+.. zephyr:code-sample:: usbd-cdc-acm-console
+   :name: Console over USB CDC ACM
+   :relevant-api: usbd_api uart_interface
+
+   Output "Hello World!" to the console over USB CDC ACM.
+
+Overview
+********
+
+This example application shows how to use the CDC ACM UART provided by the new
+experimental USB device stack as a serial backend for the console.
+
+Requirements
+************
+
+This project requires an experimental USB device driver (UDC API).
+
+Building and Running
+********************
+
+This sample can be built for multiple boards, in this example we will build it
+for the reel_board board:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/subsys/usb/console-next
+   :board: reel_board
+   :goals: flash
+   :compact:
+
+Plug the board into a host device, for sample, a PC running Linux OS.
+The board will be detected as a CDC ACM serial device. To see the console output
+from the sample, use a command similar to :command:`minicom -D /dev/ttyACM1`.
+
+.. code-block:: console
+
+   Hello World! arm
+   Hello World! arm
+   Hello World! arm
+   Hello World! arm
diff --git a/samples/subsys/usb/console-next/app.overlay b/samples/subsys/usb/console-next/app.overlay
new file mode 100644
index 00000000000..47b52ce7d6d
--- /dev/null
+++ b/samples/subsys/usb/console-next/app.overlay
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+	};
+};
diff --git a/samples/subsys/usb/console-next/prj.conf b/samples/subsys/usb/console-next/prj.conf
new file mode 100644
index 00000000000..fe0b2be7270
--- /dev/null
+++ b/samples/subsys/usb/console-next/prj.conf
@@ -0,0 +1,10 @@
+CONFIG_SERIAL=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_STDOUT_CONSOLE=y
+CONFIG_UART_LINE_CTRL=y
+
+CONFIG_USB_DEVICE_STACK_NEXT=y
+CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y
+CONFIG_CDC_ACM_SERIAL_PID=0x0004
+CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="USBD console sample"
diff --git a/samples/subsys/usb/console-next/sample.yaml b/samples/subsys/usb/console-next/sample.yaml
new file mode 100644
index 00000000000..f12969623c2
--- /dev/null
+++ b/samples/subsys/usb/console-next/sample.yaml
@@ -0,0 +1,10 @@
+sample:
+  name: Console over CDC ACM serial
+tests:
+  sample.usbd.console:
+    depends_on:
+      - usbd
+    tags: usb
+    harness: console
+    harness_config:
+      fixture: fixture_usb_cdc
diff --git a/samples/subsys/usb/console-next/src/main.c b/samples/subsys/usb/console-next/src/main.c
new file mode 100644
index 00000000000..7bb05059818
--- /dev/null
+++ b/samples/subsys/usb/console-next/src/main.c
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2016 Intel Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/drivers/uart.h>
+
+BUILD_ASSERT(DT_NODE_HAS_COMPAT(DT_CHOSEN(zephyr_console), zephyr_cdc_acm_uart),
+	     "Console device is not ACM CDC UART device");
+
+int main(void)
+{
+	const struct device *const dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
+	uint32_t dtr = 0;
+
+	/* Poll if the DTR flag was set */
+	while (!dtr) {
+		uart_line_ctrl_get(dev, UART_LINE_CTRL_DTR, &dtr);
+		/* Give CPU resources to low priority threads. */
+		k_sleep(K_MSEC(100));
+	}
+
+	while (1) {
+		printk("Hello World! %s\n", CONFIG_ARCH);
+		k_sleep(K_SECONDS(1));
+	}
+}

From 399363aaf63296522c721c2e1dec31295525b1fb Mon Sep 17 00:00:00 2001
From: Johann Fischer <johann.fischer@nordicsemi.no>
Date: Thu, 6 Feb 2025 12:23:28 +0100
Subject: [PATCH 2749/2913] [nrf fromtree] samples: usb: clean up legacy USB
 CDC ACM console sample
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove the configuration for the new USB device stack, as there is now a
separate sample that demonstrates how to use it with Kconfig option
CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(cherry picked from commit 591413185276f28f02af241b1fe6f9bd74d161d1)
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
---
 samples/subsys/usb/console/Kconfig            |  9 ------
 samples/subsys/usb/console/src/main.c         | 30 -------------------
 samples/subsys/usb/console/usbd_next_prj.conf | 13 --------
 3 files changed, 52 deletions(-)
 delete mode 100644 samples/subsys/usb/console/Kconfig
 delete mode 100644 samples/subsys/usb/console/usbd_next_prj.conf

diff --git a/samples/subsys/usb/console/Kconfig b/samples/subsys/usb/console/Kconfig
deleted file mode 100644
index 96c54558948..00000000000
--- a/samples/subsys/usb/console/Kconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2023 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-# Source common USB sample options used to initialize new experimental USB
-# device stack. The scope of these options is limited to USB samples in project
-# tree, you cannot use them in your own application.
-source "samples/subsys/usb/common/Kconfig.sample_usbd"
-
-source "Kconfig.zephyr"
diff --git a/samples/subsys/usb/console/src/main.c b/samples/subsys/usb/console/src/main.c
index bf2230687e1..59296591ac5 100644
--- a/samples/subsys/usb/console/src/main.c
+++ b/samples/subsys/usb/console/src/main.c
@@ -4,52 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sample_usbd.h>
-
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/usb/usb_device.h>
-#include <zephyr/usb/usbd.h>
 #include <zephyr/drivers/uart.h>
 
 BUILD_ASSERT(DT_NODE_HAS_COMPAT(DT_CHOSEN(zephyr_console), zephyr_cdc_acm_uart),
 	     "Console device is not ACM CDC UART device");
 
-#if defined(CONFIG_USB_DEVICE_STACK_NEXT)
-static struct usbd_context *sample_usbd;
-
-static int enable_usb_device_next(void)
-{
-	int err;
-
-	sample_usbd = sample_usbd_init_device(NULL);
-	if (sample_usbd == NULL) {
-		return -ENODEV;
-	}
-
-	err = usbd_enable(sample_usbd);
-	if (err) {
-		return err;
-	}
-
-	return 0;
-}
-#endif /* defined(CONFIG_USB_DEVICE_STACK_NEXT) */
-
 int main(void)
 {
 	const struct device *const dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
 	uint32_t dtr = 0;
 
-#if defined(CONFIG_USB_DEVICE_STACK_NEXT)
-	if (enable_usb_device_next()) {
-		return 0;
-	}
-#else
 	if (usb_enable(NULL)) {
 		return 0;
 	}
-#endif
 
 	/* Poll if the DTR flag was set */
 	while (!dtr) {
diff --git a/samples/subsys/usb/console/usbd_next_prj.conf b/samples/subsys/usb/console/usbd_next_prj.conf
deleted file mode 100644
index 841bffbf012..00000000000
--- a/samples/subsys/usb/console/usbd_next_prj.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-CONFIG_USB_DEVICE_STACK_NEXT=y
-
-CONFIG_STDOUT_CONSOLE=y
-CONFIG_SERIAL=y
-CONFIG_UART_LINE_CTRL=y
-CONFIG_USBD_CDC_ACM_CLASS=y
-
-CONFIG_LOG=y
-CONFIG_USBD_LOG_LEVEL_WRN=y
-CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y
-
-CONFIG_SAMPLE_USBD_PID=0x0004
-CONFIG_SAMPLE_USBD_PRODUCT="USBD console sample"

From 9442059bfd79de2f8e8ad858e7ad064694493bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Fri, 28 Feb 2025 08:34:07 +0100
Subject: [PATCH 2750/2913] [nrf fromtree] usb: device_next: Do not add serial
 number without HWINFO
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For many devices iSerialNumber is not required. The only device class
currently supported in Zephyr that requires iSerialNumber is MSC. If the
serial number is not available then iSerialNumber must be 0. Failure to
read the string descriptor for non-zero iSerialNumber fails USB Command
Verifier Chapter 9 tests.

When USBD_DESC_SERIAL_NUMBER_DEFINE() was used without CONFIG_HWINFO
then it did lead to runtime failure when requesting the string (thus
failing certification).

Fail USBD_DESC_SERIAL_NUMBER_DEFINE() at build-time if CONFIG_HWINFO is
not set to prevent the surprise at runtime. Only define serial number
descriptors if CONFIG_HWINFO is enabled.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 75109707e3e43034d49b647f7ae1afff646cc3c2)
---
 include/zephyr/usb/usbd.h                    | 1 +
 samples/subsys/usb/common/sample_usbd_init.c | 7 +++++--
 subsys/usb/device_next/app/cdc_acm_serial.c  | 6 ++++--
 subsys/usb/device_next/usbd_shell.c          | 6 ++++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/include/zephyr/usb/usbd.h b/include/zephyr/usb/usbd.h
index b588d7087d2..7d125dfdf23 100644
--- a/include/zephyr/usb/usbd.h
+++ b/include/zephyr/usb/usbd.h
@@ -631,6 +631,7 @@ static inline void *usbd_class_get_private(const struct usbd_class_data *const c
  * @param d_name   String descriptor node identifier.
  */
 #define USBD_DESC_SERIAL_NUMBER_DEFINE(d_name)					\
+	BUILD_ASSERT(IS_ENABLED(CONFIG_HWINFO), "HWINFO not enabled");		\
 	static struct usbd_desc_node d_name = {					\
 		.str = {							\
 			.utype = USBD_DUT_STRING_SERIAL_NUMBER,			\
diff --git a/samples/subsys/usb/common/sample_usbd_init.c b/samples/subsys/usb/common/sample_usbd_init.c
index fb5b8e0dc32..25e3a455546 100644
--- a/samples/subsys/usb/common/sample_usbd_init.c
+++ b/samples/subsys/usb/common/sample_usbd_init.c
@@ -30,7 +30,8 @@ USBD_DEVICE_DEFINE(sample_usbd,
 USBD_DESC_LANG_DEFINE(sample_lang);
 USBD_DESC_MANUFACTURER_DEFINE(sample_mfr, CONFIG_SAMPLE_USBD_MANUFACTURER);
 USBD_DESC_PRODUCT_DEFINE(sample_product, CONFIG_SAMPLE_USBD_PRODUCT);
-USBD_DESC_SERIAL_NUMBER_DEFINE(sample_sn);
+IF_ENABLED(CONFIG_HWINFO, (USBD_DESC_SERIAL_NUMBER_DEFINE(sample_sn)));
+
 /* doc string instantiation end */
 
 USBD_DESC_CONFIG_DEFINE(fs_cfg_desc, "FS Configuration");
@@ -109,7 +110,9 @@ struct usbd_context *sample_usbd_setup_device(usbd_msg_cb_t msg_cb)
 		return NULL;
 	}
 
-	err = usbd_add_descriptor(&sample_usbd, &sample_sn);
+	IF_ENABLED(CONFIG_HWINFO, (
+		err = usbd_add_descriptor(&sample_usbd, &sample_sn);
+	))
 	if (err) {
 		LOG_ERR("Failed to initialize SN descriptor (%d)", err);
 		return NULL;
diff --git a/subsys/usb/device_next/app/cdc_acm_serial.c b/subsys/usb/device_next/app/cdc_acm_serial.c
index 9402722c6b0..6f8e64b3c8c 100644
--- a/subsys/usb/device_next/app/cdc_acm_serial.c
+++ b/subsys/usb/device_next/app/cdc_acm_serial.c
@@ -27,7 +27,7 @@ USBD_DEVICE_DEFINE(cdc_acm_serial,
 USBD_DESC_LANG_DEFINE(cdc_acm_serial_lang);
 USBD_DESC_MANUFACTURER_DEFINE(cdc_acm_serial_mfr, CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING);
 USBD_DESC_PRODUCT_DEFINE(cdc_acm_serial_product, CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING);
-USBD_DESC_SERIAL_NUMBER_DEFINE(cdc_acm_serial_sn);
+IF_ENABLED(CONFIG_HWINFO, (USBD_DESC_SERIAL_NUMBER_DEFINE(cdc_acm_serial_sn)));
 
 USBD_DESC_CONFIG_DEFINE(fs_cfg_desc, "FS Configuration");
 USBD_DESC_CONFIG_DEFINE(hs_cfg_desc, "HS Configuration");
@@ -95,7 +95,9 @@ static int cdc_acm_serial_init_device(void)
 		return err;
 	}
 
-	err = usbd_add_descriptor(&cdc_acm_serial, &cdc_acm_serial_sn);
+	IF_ENABLED(CONFIG_HWINFO, (
+		err = usbd_add_descriptor(&cdc_acm_serial, &cdc_acm_serial_sn);
+	))
 	if (err) {
 		LOG_ERR("Failed to initialize SN descriptor (%d)", err);
 		return err;
diff --git a/subsys/usb/device_next/usbd_shell.c b/subsys/usb/device_next/usbd_shell.c
index 758094c7407..6b321204a24 100644
--- a/subsys/usb/device_next/usbd_shell.c
+++ b/subsys/usb/device_next/usbd_shell.c
@@ -43,7 +43,7 @@ static struct usbd_shell_speed {
 USBD_DESC_LANG_DEFINE(lang);
 USBD_DESC_MANUFACTURER_DEFINE(mfr, "ZEPHYR");
 USBD_DESC_PRODUCT_DEFINE(product, "Zephyr USBD foobaz");
-USBD_DESC_SERIAL_NUMBER_DEFINE(sn);
+IF_ENABLED(CONFIG_HWINFO, (USBD_DESC_SERIAL_NUMBER_DEFINE(sn)));
 
 /* Default device descriptors and context used in the shell. */
 USBD_DEVICE_DEFINE(sh_uds_ctx, DEVICE_DT_GET(DT_NODELABEL(zephyr_udc0)),
@@ -117,7 +117,9 @@ static int cmd_usbd_default_strings(const struct shell *sh,
 	err = usbd_add_descriptor(my_uds_ctx, &lang);
 	err |= usbd_add_descriptor(my_uds_ctx, &mfr);
 	err |= usbd_add_descriptor(my_uds_ctx, &product);
-	err |= usbd_add_descriptor(my_uds_ctx, &sn);
+	IF_ENABLED(CONFIG_HWINFO, (
+		err |= usbd_add_descriptor(my_uds_ctx, &sn);
+	))
 
 	if (err) {
 		shell_error(sh, "dev: Failed to add default string descriptors, %d", err);

From ef311e1088ee50dbbeff33b32ced16afd3fc3c46 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 19 Dec 2024 16:09:04 +0100
Subject: [PATCH 2751/2913] [nrf fromtree] net: mqtt: Add Kconfig to select
 maximum supported MQTT version

It should be possible to select maximum supported MQTT version, so that
for example MQTT 5.0 features can be compiled-out in case they're not
needed.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit f31a45f57c3cd3ec1b964a53984c05edd317d02b)
---
 subsys/net/lib/mqtt/Kconfig | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/subsys/net/lib/mqtt/Kconfig b/subsys/net/lib/mqtt/Kconfig
index 11e59b527e9..5d9eca49e67 100644
--- a/subsys/net/lib/mqtt/Kconfig
+++ b/subsys/net/lib/mqtt/Kconfig
@@ -17,6 +17,29 @@ module-str=Log level for MQTT
 module-help=Enables mqtt debug messages.
 source "subsys/net/Kconfig.template.log_config.net"
 
+choice MQTT_VERSION_SUPPORT
+	prompt "Maximum MQTT protocol version supported"
+	default MQTT_VERSION_3_1_1
+	help
+	  Maximum MQTT protocol version supported by the library.
+
+config MQTT_VERSION_3_1_1
+	bool "Support up to version 3.1.1 of the MQTT protocol"
+	help
+	  The MQTT version 3.1.1 will be the default library choice. Applications
+	  will still be able to choose to use an older MQTT protocol version
+	  with respective runtime MQTT client configuration.
+
+config MQTT_VERSION_5_0
+	bool "Support up to version 5.0 of the MQTT protocol [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	help
+	  The MQTT version 5.0 will be the default library choice. Applications
+	  will still be able to choose to use an older MQTT protocol version
+	  with respective runtime MQTT client configuration.
+
+endchoice
+
 config MQTT_KEEPALIVE
 	int "Maximum number of clients Keep alive time for MQTT (in seconds)"
 	default 60

From 5f20389497d6a2100236e28b2f60ec1722efcdf0 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 19 Dec 2024 16:09:04 +0100
Subject: [PATCH 2752/2913] [nrf fromtree] tests: net: lib: mqtt: v3_1_1: Add
 test variant with MQTT 5.0 enabled

Add test variant which enables MQTT 5.0 support. MQTT 3.1.1 should still
work just fine in such case, so it needs to be verified that's the case.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 08f8e2f956bdb96efb5f5678039c794ce4081d5c)
---
 tests/net/lib/mqtt/v3_1_1/mqtt_client/prj.conf    |  1 +
 .../net/lib/mqtt/v3_1_1/mqtt_client/testcase.yaml |  3 +++
 tests/net/lib/mqtt/v3_1_1/mqtt_packet/prj.conf    |  1 +
 .../net/lib/mqtt/v3_1_1/mqtt_packet/testcase.yaml | 15 +++++++++------
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/tests/net/lib/mqtt/v3_1_1/mqtt_client/prj.conf b/tests/net/lib/mqtt/v3_1_1/mqtt_client/prj.conf
index 3a5f7c771cc..7060b3c2245 100644
--- a/tests/net/lib/mqtt/v3_1_1/mqtt_client/prj.conf
+++ b/tests/net/lib/mqtt/v3_1_1/mqtt_client/prj.conf
@@ -16,6 +16,7 @@ CONFIG_NET_PKT_RX_COUNT=16
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_TIME_WAIT_DELAY=0
 CONFIG_MQTT_LIB=y
+CONFIG_MQTT_VERSION_3_1_1=y
 
 CONFIG_MAIN_STACK_SIZE=2048
 CONFIG_ZTEST_STACK_SIZE=2048
diff --git a/tests/net/lib/mqtt/v3_1_1/mqtt_client/testcase.yaml b/tests/net/lib/mqtt/v3_1_1/mqtt_client/testcase.yaml
index d96ed8fda59..eb371eddfbd 100644
--- a/tests/net/lib/mqtt/v3_1_1/mqtt_client/testcase.yaml
+++ b/tests/net/lib/mqtt/v3_1_1/mqtt_client/testcase.yaml
@@ -11,3 +11,6 @@ tests:
   net.mqtt.client.preempt:
     extra_configs:
       - CONFIG_NET_TC_THREAD_PREEMPTIVE=y
+  net.mqtt.client.mqtt_5_0:
+    extra_configs:
+      - CONFIG_MQTT_VERSION_5_0=y
diff --git a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/prj.conf b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/prj.conf
index 1c4a907a155..44ec7a64aaa 100644
--- a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/prj.conf
+++ b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/prj.conf
@@ -8,6 +8,7 @@ CONFIG_TEST_RANDOM_GENERATOR=y
 
 # enable the MQTT lib
 CONFIG_MQTT_LIB=y
+CONFIG_MQTT_VERSION_3_1_1=y
 CONFIG_ZTEST=y
 CONFIG_TEST_USERSPACE=y
 CONFIG_MAIN_STACK_SIZE=1280
diff --git a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/testcase.yaml b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/testcase.yaml
index af39e89499a..fdb05ed97ad 100644
--- a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/testcase.yaml
+++ b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/testcase.yaml
@@ -1,9 +1,12 @@
 common:
+  tags:
+    - mqtt
+    - net
+    - userspace
+  min_ram: 16
   depends_on: netif
 tests:
-  net.mqtt.packet:
-    min_ram: 16
-    tags:
-      - mqtt
-      - net
-      - userspace
+  net.mqtt.packet: {}
+  net.mqtt.packet.mqtt_5_0:
+    extra_configs:
+      - CONFIG_MQTT_VERSION_5_0=y

From 070f6fa2c5c7c64b9b6a8cbd3148d3c9fab4f486 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 19 Dec 2024 16:09:06 +0100
Subject: [PATCH 2753/2913] [nrf fromtree] net: mqtt: Fix helper macro for
 encoded binary data length

The macro did not take into account the 2-byte binary data length
encoded before the actual binary data.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 1eb9a5c241bf2fe362d0322ce5d2c51a0b8e7e6a)
---
 subsys/net/lib/mqtt/mqtt_internal.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsys/net/lib/mqtt/mqtt_internal.h b/subsys/net/lib/mqtt/mqtt_internal.h
index e64bac87f4b..d1a69019dd1 100644
--- a/subsys/net/lib/mqtt/mqtt_internal.h
+++ b/subsys/net/lib/mqtt/mqtt_internal.h
@@ -76,7 +76,7 @@ extern "C" {
 #define GET_UT8STR_BUFFER_SIZE(STR) (sizeof(uint16_t) + (STR)->size)
 
 /**@brief Computes total size needed to pack a binary stream. */
-#define GET_BINSTR_BUFFER_SIZE(STR) ((STR)->len)
+#define GET_BINSTR_BUFFER_SIZE(STR) (sizeof(uint16_t) + (STR)->len)
 
 /**@brief Sets MQTT Client's state with one indicated in 'STATE'. */
 #define MQTT_SET_STATE(CLIENT, STATE) ((CLIENT)->internal.state |= (STATE))

From 0b35979610e5d97352a41b4746ad2468ffa00c65 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 19 Dec 2024 16:09:07 +0100
Subject: [PATCH 2754/2913] [nrf fromtree] net: mqtt: Add MQTT 5.0 support for
 CONNECT

Add support for CONNECT message specified in MQTT 5.0, along with
property encoders required to encode MQTT properties which is a new
concept in MQTT 5.0. Connect and will properties can be specified by the
application in the mqtt_client structure before connecting.

Introduce a helper function which allows to verify whether MQTT 5.0 is
used or not, so that it's still possible to use MQTT 3.1 even if MQTT
5.0 support is enabled in Kconfig.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 8fe2965500988aa25f9c64839d21c22bbdcb4aee)
---
 include/zephyr/net/mqtt.h           |  65 +++-
 subsys/net/lib/mqtt/Kconfig         |  27 ++
 subsys/net/lib/mqtt/mqtt.c          |   3 +-
 subsys/net/lib/mqtt/mqtt_encoder.c  | 509 ++++++++++++++++++++++++++--
 subsys/net/lib/mqtt/mqtt_internal.h |  35 ++
 5 files changed, 616 insertions(+), 23 deletions(-)

diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index 9c09069b107..c661674035d 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -84,7 +84,8 @@ enum mqtt_evt_type {
 /** @brief MQTT version protocol level. */
 enum mqtt_version {
 	MQTT_VERSION_3_1_0 = 3, /**< Protocol level for 3.1.0. */
-	MQTT_VERSION_3_1_1 = 4  /**< Protocol level for 3.1.1. */
+	MQTT_VERSION_3_1_1 = 4, /**< Protocol level for 3.1.1. */
+	MQTT_VERSION_5_0 = 5,   /**< Protocol level for 5.0. */
 };
 
 /** @brief MQTT Quality of Service types. */
@@ -185,6 +186,13 @@ struct mqtt_topic {
 	uint8_t qos;
 };
 
+/** @brief Abstracts MQTT UTF-8 encoded string pair.
+ */
+struct mqtt_utf8_pair {
+	struct mqtt_utf8 name;
+	struct mqtt_utf8 value;
+};
+
 /** @brief Parameters for a publish message. */
 struct mqtt_publish_message {
 	struct mqtt_topic topic;     /**< Topic on which data was published. */
@@ -523,6 +531,32 @@ struct mqtt_client {
 	 */
 	struct mqtt_utf8 *password;
 
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	/** MQTT 5.0 Will properties. */
+	struct {
+		/** MQTT 5.0, chapter 3.1.3.2.8 User Property. */
+		struct mqtt_utf8_pair user_prop[CONFIG_MQTT_USER_PROPERTIES_MAX];
+
+		/** MQTT 5.0, chapter 3.1.3.2.5 Content Type. */
+		struct mqtt_utf8 content_type;
+
+		/** MQTT 5.0, chapter 3.1.3.2.6 Response Topic. */
+		struct mqtt_utf8 response_topic;
+
+		/** MQTT 5.0, chapter 3.1.3.2.7 Correlation Data. */
+		struct mqtt_binstr correlation_data;
+
+		/** MQTT 5.0, chapter 3.1.3.2.2 Will Delay Interval. */
+		uint32_t will_delay_interval;
+
+		/** MQTT 5.0, chapter 3.1.3.2.4 Message Expiry Interval. */
+		uint32_t message_expiry_interval;
+
+		/** MQTT 5.0, chapter 3.1.3.2.3 Payload Format Indicator. */
+		uint8_t payload_format_indicator;
+	} will_prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
 	/** Will topic and QoS. Can be NULL. */
 	struct mqtt_topic *will_topic;
 
@@ -558,6 +592,35 @@ struct mqtt_client {
 	/** Unanswered PINGREQ count on this connection. */
 	int8_t unacked_ping;
 
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	/** MQTT 5.0 properties. */
+	struct {
+		/** MQTT 5.0, chapter 3.1.2.11.8 User Property. */
+		struct mqtt_utf8_pair user_prop[CONFIG_MQTT_USER_PROPERTIES_MAX];
+
+		/** MQTT 5.0, chapter 3.1.2.11.9 Authentication Method. */
+		struct mqtt_utf8 auth_method;
+
+		/** MQTT 5.0, chapter 3.1.2.11.10 Authentication Data. */
+		struct mqtt_binstr auth_data;
+
+		/** MQTT 5.0, chapter 3.1.2.11.2 Session Expiry Interval. */
+		uint32_t session_expiry_interval;
+
+		/** MQTT 5.0, chapter 3.1.2.11.4 Maximum Packet Size. */
+		uint32_t maximum_packet_size;
+
+		/** MQTT 5.0, chapter 3.1.2.11.3 Receive Maximum. */
+		uint16_t receive_maximum;
+
+		/** MQTT 5.0, chapter 3.1.2.11.6 Request Response Information. */
+		bool request_response_info;
+
+		/** MQTT 5.0, chapter 3.1.2.11.7 Request Response Information. */
+		bool request_problem_info;
+	} prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
 	/** Will retain flag, 1 if will message shall be retained persistently.
 	 */
 	uint8_t will_retain : 1;
diff --git a/subsys/net/lib/mqtt/Kconfig b/subsys/net/lib/mqtt/Kconfig
index 5d9eca49e67..83d7f669a69 100644
--- a/subsys/net/lib/mqtt/Kconfig
+++ b/subsys/net/lib/mqtt/Kconfig
@@ -81,4 +81,31 @@ config MQTT_CLEAN_SESSION
 	  the client. Setting this flag to 0 allows the client to create a
 	  persistent session.
 
+#if MQTT_VERSION_5_0
+
+config MQTT_USER_PROPERTIES_MAX
+	int "Maximum number of user properties in a packet"
+	default 1
+	range 1 $(UINT16_MAX)
+	help
+	  Maximum number of user properties that the client can include in a
+	  packet or parse on input.
+
+config MQTT_TOPIC_ALIAS_MAX
+	int "Maximum number of supported topic aliases"
+	default 5
+	range 0 $(UINT16_MAX)
+	help
+	  Maximum number of supported topic aliases used in PUBLISH packets.
+	  If set to 0, topic aliasing is disabled.
+
+config MQTT_TOPIC_ALIAS_STRING_MAX
+	int "The longest topic name that can be aliased"
+	default 64
+	range 8 $(UINT16_MAX)
+	help
+	  Specifies a size of a buffer for storing aliased topics.
+
+#endif # MQTT_VERSION_5_0
+
 endif # MQTT_LIB
diff --git a/subsys/net/lib/mqtt/mqtt.c b/subsys/net/lib/mqtt/mqtt.c
index 1b8d31280ba..113d2a75427 100644
--- a/subsys/net/lib/mqtt/mqtt.c
+++ b/subsys/net/lib/mqtt/mqtt.c
@@ -176,7 +176,8 @@ void mqtt_client_init(struct mqtt_client *client)
 	MQTT_STATE_INIT(client);
 	mqtt_mutex_init(client);
 
-	client->protocol_version = MQTT_VERSION_3_1_1;
+	client->protocol_version = IS_ENABLED(CONFIG_MQTT_VERSION_5_0) ?
+				   MQTT_VERSION_5_0 : MQTT_VERSION_3_1_1;
 	client->clean_session = MQTT_CLEAN_SESSION;
 	client->keepalive = MQTT_KEEPALIVE;
 }
diff --git a/subsys/net/lib/mqtt/mqtt_encoder.c b/subsys/net/lib/mqtt/mqtt_encoder.c
index 7297e8226ff..40a2a414e07 100644
--- a/subsys/net/lib/mqtt/mqtt_encoder.c
+++ b/subsys/net/lib/mqtt/mqtt_encoder.c
@@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(net_mqtt_enc, CONFIG_MQTT_LOG_LEVEL);
 static const struct mqtt_utf8 mqtt_3_1_0_proto_desc =
 	MQTT_UTF8_LITERAL("MQIsdp");
 
-static const struct mqtt_utf8 mqtt_3_1_1_proto_desc =
+static const struct mqtt_utf8 mqtt_proto_desc =
 	MQTT_UTF8_LITERAL("MQTT");
 
 /** Never changing ping request, needed for Keep Alive. */
@@ -118,10 +118,9 @@ static int pack_utf8_str(const struct mqtt_utf8 *str, struct buf_ctx *buf)
 }
 
 /**
- * @brief Computes and encodes length for the MQTT fixed header.
+ * @brief Computes and encodes variable length integer.
  *
- * @note The remaining length is not packed as a fixed unsigned 32 bit integer.
- *       Instead it is packed on algorithm below:
+ * @note The variable length integer is based on algorithm below:
  *
  * @code
  * do
@@ -135,36 +134,40 @@ static int pack_utf8_str(const struct mqtt_utf8 *str, struct buf_ctx *buf)
  *       while ( X > 0 )
  * @endcode
  *
- * @param[in] length Length of variable header and payload in the MQTT message.
+ * @param[in] value Integer value to encode.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
  *                   buffer position. May be NULL (in this case function will
  *                   only calculate number of bytes needed).
  *
- * @return Number of bytes needed to encode length value.
+ * @return Number of bytes needed to encode integer or a negative error code.
  */
-static uint8_t packet_length_encode(uint32_t length, struct buf_ctx *buf)
+static int pack_variable_int(uint32_t value, struct buf_ctx *buf)
 {
-	uint8_t encoded_bytes = 0U;
+	int encoded_bytes = 0U;
 
-	NET_DBG(">> length:0x%08x cur:%p, end:%p", length,
+	NET_DBG(">> value:0x%08x cur:%p, end:%p", value,
 		 (buf == NULL) ? 0 : (void *)buf->cur, (buf == NULL) ? 0 : (void *)buf->end);
 
 	do {
 		encoded_bytes++;
 
 		if (buf != NULL) {
-			*(buf->cur) = length & MQTT_LENGTH_VALUE_MASK;
+			if (buf->cur >= buf->end) {
+				return -ENOMEM;
+			}
+
+			*(buf->cur) = value & MQTT_LENGTH_VALUE_MASK;
 		}
 
-		length >>= MQTT_LENGTH_SHIFT;
+		value >>= MQTT_LENGTH_SHIFT;
 
 		if (buf != NULL) {
-			if (length > 0) {
+			if (value > 0) {
 				*(buf->cur) |= MQTT_LENGTH_CONTINUATION_BIT;
 			}
 			buf->cur++;
 		}
-	} while (length > 0);
+	} while (value > 0);
 
 	return encoded_bytes;
 }
@@ -202,7 +205,7 @@ static uint32_t mqtt_encode_fixed_header(uint8_t message_type, uint8_t *start,
 
 	NET_DBG("<< msg type:0x%02x length:0x%08x", message_type, length);
 
-	fixed_header_length = packet_length_encode(length, NULL);
+	fixed_header_length = pack_variable_int(length, NULL);
 	fixed_header_length += sizeof(uint8_t);
 
 	NET_DBG("Fixed header length = %02x", fixed_header_length);
@@ -211,7 +214,7 @@ static uint32_t mqtt_encode_fixed_header(uint8_t message_type, uint8_t *start,
 	buf->cur = start - fixed_header_length;
 
 	(void)pack_uint8(message_type, buf);
-	(void)packet_length_encode(length, buf);
+	(void)pack_variable_int(length, buf);
 
 	/* Set the cur pointer back at the start of the frame,
 	 * and end pointer to the end of the frame.
@@ -273,31 +276,479 @@ static int mqtt_message_id_only_enc(uint8_t message_type, uint16_t message_id,
 	return mqtt_encode_fixed_header(message_type, start, buf);
 }
 
+#if defined(CONFIG_MQTT_VERSION_5_0)
+/**
+ * @brief Packs unsigned 32 bit value to the buffer at the offset requested.
+ *
+ * @param[in] val Value to be packed.
+ * @param[inout] buf A pointer to the buf_ctx structure containing current
+ *                   buffer position.
+ *
+ * @retval 0 if the procedure is successful.
+ * @retval -ENOMEM if there is no place in the buffer to store the value.
+ */
+static int pack_uint32(uint32_t val, struct buf_ctx *buf)
+{
+	uint8_t *cur = buf->cur;
+	uint8_t *end = buf->end;
+
+	if ((end - cur) < sizeof(uint32_t)) {
+		return -ENOMEM;
+	}
+
+	/* Pack value. */
+	sys_put_be32(val, cur);
+	buf->cur = (cur + sizeof(uint32_t));
+
+	return 0;
+}
+
+/**
+ * @brief Packs binary data to the buffer at the offset requested.
+ *
+ * @param[in] bin Binary data and its length to be packed.
+ * @param[inout] buf A pointer to the buf_ctx structure containing current
+ *                   buffer position.
+ *
+ * @retval 0 if the procedure is successful.
+ * @retval -ENOMEM if there is no place in the buffer to store the data.
+ */
+static int pack_bin_data(const struct mqtt_binstr *bin, struct buf_ctx *buf)
+{
+	if ((buf->end - buf->cur) < GET_BINSTR_BUFFER_SIZE(bin)) {
+		return -ENOMEM;
+	}
+
+	/* Pack length followed by binary data. */
+	(void)pack_uint16(bin->len, buf);
+
+	memcpy(buf->cur, bin->data, bin->len);
+	buf->cur += bin->len;
+
+	return 0;
+}
+
+static uint8_t get_uint8_property_default(uint8_t prop)
+{
+	if (prop == MQTT_PROP_REQUEST_PROBLEM_INFORMATION) {
+		return 1;
+	}
+
+	return 0;
+}
+
+static size_t uint8_property_length(uint8_t prop, uint8_t value)
+{
+	uint8_t prop_default = get_uint8_property_default(prop);
+
+	if (value == prop_default) {
+		return 0;
+	}
+
+	return sizeof(uint8_t) + sizeof(uint8_t);
+}
+
+static int encode_uint8_property(uint8_t prop, uint8_t value, struct buf_ctx *buf)
+{
+	uint8_t prop_default = get_uint8_property_default(prop);
+	int err;
+
+	if (value == prop_default) {
+		return 0;
+	}
+
+	err = pack_uint8(prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return pack_uint8(value, buf);
+}
+
+static size_t uint16_property_length(uint16_t value)
+{
+	if (value == 0) {
+		return 0;
+	}
+
+	return sizeof(uint8_t) + sizeof(uint16_t);
+}
+
+static int encode_uint16_property(uint8_t prop, uint16_t value,
+				  struct buf_ctx *buf)
+{
+	int err;
+
+	if (value == 0) {
+		return 0;
+	}
+
+	err = pack_uint8(prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return pack_uint16(value, buf);
+}
+
+static size_t uint32_property_length(uint32_t value)
+{
+	if (value == 0) {
+		return 0;
+	}
+
+	return sizeof(uint8_t) + sizeof(uint32_t);
+}
+
+static int encode_uint32_property(uint8_t prop, uint32_t value,
+				  struct buf_ctx *buf)
+{
+	int err;
+
+	if (value == 0) {
+		return 0;
+	}
+
+	err = pack_uint8(prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return pack_uint32(value, buf);
+}
+
+static size_t string_property_length(const struct mqtt_utf8 *str)
+{
+	if (str->size == 0) {
+		return 0;
+	}
+
+	return sizeof(uint8_t) + GET_UT8STR_BUFFER_SIZE(str);
+}
+
+static int encode_string_property(uint8_t prop, const struct mqtt_utf8 *str,
+				  struct buf_ctx *buf)
+{
+	int err;
+
+	if (str->size == 0) {
+		return 0;
+	}
+
+	err = pack_uint8(prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return pack_utf8_str(str, buf);
+}
+
+static size_t string_pair_property_length(const struct mqtt_utf8 *name,
+					  const struct mqtt_utf8 *value)
+{
+	if ((name->size == 0) || (value->size == 0)) {
+		return 0;
+	}
+
+	return sizeof(uint8_t) + GET_UT8STR_BUFFER_SIZE(name) +
+	       GET_UT8STR_BUFFER_SIZE(value);
+}
+
+static int encode_string_pair_property(uint8_t prop, const struct mqtt_utf8 *name,
+				       const struct mqtt_utf8 *value,
+				       struct buf_ctx *buf)
+{
+	int err;
+
+	if ((name->size == 0) || (value->size == 0)) {
+		return 0;
+	}
+
+	err = pack_uint8(prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = pack_utf8_str(name, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return pack_utf8_str(value, buf);
+}
+
+static size_t binary_property_length(const struct mqtt_binstr *bin)
+{
+	if (bin->len == 0) {
+		return 0;
+	}
+
+	return sizeof(uint8_t) + GET_BINSTR_BUFFER_SIZE(bin);
+}
+
+static int encode_binary_property(uint8_t prop, const struct mqtt_binstr *bin,
+				  struct buf_ctx *buf)
+{
+	int err;
+
+	if (bin->len == 0) {
+		return 0;
+	}
+
+	err = pack_uint8(prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return pack_bin_data(bin, buf);
+}
+
+static size_t user_properties_length(const struct mqtt_utf8_pair *user_props)
+{
+	size_t total_len = 0;
+	size_t len;
+
+	for (int i = 0; i < CONFIG_MQTT_USER_PROPERTIES_MAX; i++) {
+		len = string_pair_property_length(&user_props[i].name,
+						  &user_props[i].value);
+		if (len == 0) {
+			break;
+		}
+
+		total_len += len;
+	}
+
+	return total_len;
+}
+
+static int encode_user_properties(const struct mqtt_utf8_pair *user_props,
+				  struct buf_ctx *buf)
+{
+	size_t len;
+	int err;
+
+	for (int i = 0; i < CONFIG_MQTT_USER_PROPERTIES_MAX; i++) {
+		len = string_pair_property_length(&user_props[i].name,
+						  &user_props[i].value);
+
+		if (len == 0) {
+			break;
+		}
+
+		err = encode_string_pair_property(MQTT_PROP_USER_PROPERTY,
+						  &user_props[i].name,
+						  &user_props[i].value, buf);
+		if (err < 0) {
+			return err;
+		}
+	}
+
+	return 0;
+}
+
+static uint32_t connect_properties_length(const struct mqtt_client *client)
+{
+	return uint32_property_length(client->prop.session_expiry_interval) +
+	       uint16_property_length(client->prop.receive_maximum) +
+	       uint32_property_length(client->prop.maximum_packet_size) +
+	       uint16_property_length(CONFIG_MQTT_TOPIC_ALIAS_MAX) +
+	       uint8_property_length(MQTT_PROP_REQUEST_RESPONSE_INFORMATION,
+				     client->prop.request_response_info ? 1U : 0U) +
+	       uint8_property_length(MQTT_PROP_REQUEST_PROBLEM_INFORMATION,
+				     client->prop.request_problem_info ? 1U : 0U) +
+	       user_properties_length(client->prop.user_prop) +
+	       string_property_length(&client->prop.auth_method) +
+	       binary_property_length(&client->prop.auth_data);
+}
+
+static int connect_properties_encode(const struct mqtt_client *client,
+				     struct buf_ctx *buf)
+{
+	uint32_t properties_len;
+	int err;
+
+	/* Precalculate total properties length */
+	properties_len = connect_properties_length(client);
+	err = pack_variable_int(properties_len, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint32_property(MQTT_PROP_SESSION_EXPIRY_INTERVAL,
+				     client->prop.session_expiry_interval, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint16_property(MQTT_PROP_RECEIVE_MAXIMUM,
+				     client->prop.receive_maximum, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint32_property(MQTT_PROP_MAXIMUM_PACKET_SIZE,
+				     client->prop.maximum_packet_size, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint16_property(MQTT_PROP_TOPIC_ALIAS_MAXIMUM,
+				     CONFIG_MQTT_TOPIC_ALIAS_MAX, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint8_property(MQTT_PROP_REQUEST_RESPONSE_INFORMATION,
+				    client->prop.request_response_info ? 1U : 0U,
+				    buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint8_property(MQTT_PROP_REQUEST_PROBLEM_INFORMATION,
+				    client->prop.request_problem_info ? 1U : 0U,
+				    buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_user_properties(client->prop.user_prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_string_property(MQTT_PROP_AUTHENTICATION_METHOD,
+				     &client->prop.auth_method, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_binary_property(MQTT_PROP_AUTHENTICATION_DATA,
+				     &client->prop.auth_data, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return 0;
+}
+
+static uint32_t will_properties_length(const struct mqtt_client *client)
+{
+	return uint32_property_length(client->will_prop.will_delay_interval) +
+	       uint8_property_length(MQTT_PROP_PAYLOAD_FORMAT_INDICATOR,
+				     client->will_prop.payload_format_indicator) +
+	       uint32_property_length(client->will_prop.message_expiry_interval) +
+	       string_property_length(&client->will_prop.content_type) +
+	       string_property_length(&client->will_prop.response_topic) +
+	       binary_property_length(&client->will_prop.correlation_data) +
+	       user_properties_length(client->will_prop.user_prop);
+}
+
+static int will_properties_encode(const struct mqtt_client *client,
+				  struct buf_ctx *buf)
+{
+	uint32_t properties_len;
+	int err;
+
+	/* Precalculate total properties length */
+	properties_len = will_properties_length(client);
+	err = pack_variable_int(properties_len, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint32_property(MQTT_PROP_WILL_DELAY_INTERVAL,
+				     client->will_prop.will_delay_interval, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint8_property(MQTT_PROP_PAYLOAD_FORMAT_INDICATOR,
+				    client->will_prop.payload_format_indicator,
+				    buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint32_property(MQTT_PROP_MESSAGE_EXPIRY_INTERVAL,
+				     client->will_prop.message_expiry_interval,
+				     buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_string_property(MQTT_PROP_CONTENT_TYPE,
+				     &client->will_prop.content_type, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_string_property(MQTT_PROP_RESPONSE_TOPIC,
+				     &client->will_prop.response_topic, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_binary_property(MQTT_PROP_CORRELATION_DATA,
+				     &client->will_prop.correlation_data, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_user_properties(client->will_prop.user_prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return 0;
+}
+
+#else
+static int connect_properties_encode(const struct mqtt_client *client,
+				     struct buf_ctx *buf)
+{
+	ARG_UNUSED(client);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+
+static int will_properties_encode(const struct mqtt_client *client,
+				  struct buf_ctx *buf)
+{
+	ARG_UNUSED(client);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
 int connect_request_encode(const struct mqtt_client *client,
 			   struct buf_ctx *buf)
 {
 	uint8_t connect_flags = client->clean_session << 1;
 	const uint8_t message_type =
 			MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_CONNECT, 0, 0, 0);
-	const struct mqtt_utf8 *mqtt_proto_desc;
+	const struct mqtt_utf8 *proto_desc;
 	uint8_t *connect_flags_pos;
 	int err_code;
 	uint8_t *start;
 
-	if (client->protocol_version == MQTT_VERSION_3_1_1) {
-		mqtt_proto_desc = &mqtt_3_1_1_proto_desc;
+	if (client->protocol_version == MQTT_VERSION_3_1_0) {
+		proto_desc = &mqtt_3_1_0_proto_desc;
 	} else {
-		mqtt_proto_desc = &mqtt_3_1_0_proto_desc;
+		/* MQTT 3.1.1 and newer share the same protocol prefix. */
+		proto_desc = &mqtt_proto_desc;
 	}
 
 	/* Reserve space for fixed header. */
 	buf->cur += MQTT_FIXED_HEADER_MAX_SIZE;
 	start = buf->cur;
 
-	NET_HEXDUMP_DBG(mqtt_proto_desc->utf8, mqtt_proto_desc->size,
+	NET_HEXDUMP_DBG(proto_desc->utf8, proto_desc->size,
 			 "Encoding Protocol Description.");
 
-	err_code = pack_utf8_str(mqtt_proto_desc, buf);
+	err_code = pack_utf8_str(proto_desc, buf);
 	if (err_code != 0) {
 		return err_code;
 	}
@@ -324,6 +775,14 @@ int connect_request_encode(const struct mqtt_client *client,
 		return err_code;
 	}
 
+	/* Properties (MQTT 5.0 only) */
+	if (mqtt_is_version_5_0(client)) {
+		err_code = connect_properties_encode(client, buf);
+		if (err_code != 0) {
+			return err_code;
+		}
+	}
+
 	NET_HEXDUMP_DBG(client->client_id.utf8, client->client_id.size,
 			 "Encoding Client Id.");
 	err_code = pack_utf8_str(&client->client_id, buf);
@@ -338,6 +797,14 @@ int connect_request_encode(const struct mqtt_client *client,
 		connect_flags |= ((client->will_topic->qos & 0x03) << 3);
 		connect_flags |= client->will_retain << 5;
 
+		/* Will properties (MQTT 5.0 only) */
+		if (mqtt_is_version_5_0(client)) {
+			err_code = will_properties_encode(client, buf);
+			if (err_code != 0) {
+				return err_code;
+			}
+		}
+
 		NET_HEXDUMP_DBG(client->will_topic->topic.utf8,
 				 client->will_topic->topic.size,
 				 "Encoding Will Topic.");
diff --git a/subsys/net/lib/mqtt/mqtt_internal.h b/subsys/net/lib/mqtt/mqtt_internal.h
index d1a69019dd1..92816faa1aa 100644
--- a/subsys/net/lib/mqtt/mqtt_internal.h
+++ b/subsys/net/lib/mqtt/mqtt_internal.h
@@ -55,6 +55,35 @@ extern "C" {
 #define MQTT_PKT_TYPE_PINGRSP     0xD0
 #define MQTT_PKT_TYPE_DISCONNECT  0xE0
 
+/**@brief MQTT Property Types. */
+#define MQTT_PROP_PAYLOAD_FORMAT_INDICATOR          0x01
+#define MQTT_PROP_MESSAGE_EXPIRY_INTERVAL           0x02
+#define MQTT_PROP_CONTENT_TYPE                      0x03
+#define MQTT_PROP_RESPONSE_TOPIC                    0x08
+#define MQTT_PROP_CORRELATION_DATA                  0x09
+#define MQTT_PROP_SUBSCRIPTION_IDENTIFIER           0x0B
+#define MQTT_PROP_SESSION_EXPIRY_INTERVAL           0x11
+#define MQTT_PROP_ASSIGNED_CLIENT_IDENTIFIER        0x12
+#define MQTT_PROP_SERVER_KEEP_ALIVE                 0x13
+#define MQTT_PROP_AUTHENTICATION_METHOD             0x15
+#define MQTT_PROP_AUTHENTICATION_DATA               0x16
+#define MQTT_PROP_REQUEST_PROBLEM_INFORMATION       0x17
+#define MQTT_PROP_WILL_DELAY_INTERVAL               0x18
+#define MQTT_PROP_REQUEST_RESPONSE_INFORMATION      0x19
+#define MQTT_PROP_RESPONSE_INFORMATION              0x1A
+#define MQTT_PROP_SERVER_REFERENCE                  0x1C
+#define MQTT_PROP_REASON_STRING                     0x1F
+#define MQTT_PROP_RECEIVE_MAXIMUM                   0x21
+#define MQTT_PROP_TOPIC_ALIAS_MAXIMUM               0x22
+#define MQTT_PROP_TOPIC_ALIAS                       0x23
+#define MQTT_PROP_MAXIMUM_QOS                       0x24
+#define MQTT_PROP_RETAIN_AVAILABLE                  0x25
+#define MQTT_PROP_USER_PROPERTY                     0x26
+#define MQTT_PROP_MAXIMUM_PACKET_SIZE               0x27
+#define MQTT_PROP_WILDCARD_SUBSCRIPTION_AVAILABLE   0x28
+#define MQTT_PROP_SUBSCRIPTION_IDENTIFIER_AVAILABLE 0x29
+#define MQTT_PROP_SHARED_SUBSCRIPTION_AVAILABLE     0x2A
+
 /**@brief Masks for MQTT header flags. */
 #define MQTT_HEADER_DUP_MASK     0x08
 #define MQTT_HEADER_QOS_MASK     0x06
@@ -147,6 +176,12 @@ enum mqtt_state {
 	MQTT_STATE_CONNECTED            = 0x00000004,
 };
 
+static inline int mqtt_is_version_5_0(const struct mqtt_client *client)
+{
+	return (IS_ENABLED(CONFIG_MQTT_VERSION_5_0) &&
+		client->protocol_version == MQTT_VERSION_5_0);
+}
+
 /**@brief Notify application about MQTT event.
  *
  * @param[in] client Identifies the client for which event occurred.

From cb3591a8627302195d0c6fb3822bec1ca32fcde2 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 19 Dec 2024 16:09:13 +0100
Subject: [PATCH 2755/2913] [nrf fromtree] net: mqtt: Add MQTT 5.0 support for
 CONNACK

Add support for CONNACK message specified in MQTT 5.0, along with
property decoders required to decode MQTT properties. Decoded properties
are provided to the application within mqtt_connack_param structure,
accompanying the CONNACK event.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 6038676b834952a2729ccd7004c7ff3567c1e06b)
---
 include/zephyr/net/mqtt.h          | 125 +++++++-
 subsys/net/lib/mqtt/mqtt_decoder.c | 472 +++++++++++++++++++++++++++--
 subsys/net/lib/mqtt/mqtt_rx.c      |   5 +-
 3 files changed, 577 insertions(+), 25 deletions(-)

diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index c661674035d..402b5cf6db1 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -107,7 +107,7 @@ enum mqtt_qos {
 	MQTT_QOS_2_EXACTLY_ONCE  = 0x02
 };
 
-/** @brief MQTT CONNACK return codes. */
+/** @brief MQTT 3.1 CONNACK return codes. */
 enum mqtt_conn_return_code {
 	/** Connection accepted. */
 	MQTT_CONNECTION_ACCEPTED                = 0x00,
@@ -134,6 +134,32 @@ enum mqtt_conn_return_code {
 	MQTT_NOT_AUTHORIZED                     = 0x05
 };
 
+/** @brief MQTT 5.0 CONNACK reason codes (MQTT 5.0, chapter 3.2.2.2). */
+enum mqtt_connack_reason_code {
+	MQTT_CONNACK_SUCCESS = 0,
+	MQTT_CONNACK_UNSPECIFIED_ERROR = 128,
+	MQTT_CONNACK_MALFORMED_PACKET = 129,
+	MQTT_CONNACK_PROTOCOL_ERROR = 130,
+	MQTT_CONNACK_IMPL_SPECIFIC_ERROR = 131,
+	MQTT_CONNACK_UNSUPPORTED_PROTO_ERROR = 132,
+	MQTT_CONNACK_CLIENT_ID_NOT_VALID = 133,
+	MQTT_CONNACK_BAD_USERNAME_OR_PASS = 134,
+	MQTT_CONNACK_NOT_AUTHORIZED = 135,
+	MQTT_CONNACK_SERVER_UNAVAILABLE = 136,
+	MQTT_CONNACK_SERVER_BUSY = 137,
+	MQTT_CONNACK_BANNED = 138,
+	MQTT_CONNACK_BAD_AUTH_METHOD = 140,
+	MQTT_CONNACK_TOPIC_NAME_INVALID = 144,
+	MQTT_CONNACK_PACKET_TOO_LARGE = 149,
+	MQTT_CONNACK_QUOTA_EXCEEDED = 151,
+	MQTT_CONNACK_PAYLOAD_FORMAT_INVALID = 153,
+	MQTT_CONNACK_RETAIN_NOT_SUPPORTED = 154,
+	MQTT_CONNACK_QOS_NOT_SUPPORTED = 155,
+	MQTT_CONNACK_USE_ANOTHER_SERVER = 156,
+	MQTT_CONNACK_SERVER_MOVED = 157,
+	MQTT_CONNACK_CONNECTION_RATE_EXCEEDED = 159,
+};
+
 /** @brief MQTT SUBACK return codes. */
 enum mqtt_suback_return_code {
 	/** Subscription with QoS 0 succeeded. */
@@ -209,8 +235,103 @@ struct mqtt_connack_param {
 
 	/** The appropriate non-zero Connect return code indicates if the Server
 	 *  is unable to process a connection request for some reason.
+	 *  MQTT 3.1 - Return codes specified in @ref mqtt_conn_return_code
+	 *  MQTT 5.0 - Reason codes specified in @ref mqtt_connack_reason_code
 	 */
-	enum mqtt_conn_return_code return_code;
+	uint8_t return_code;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	struct {
+		/** MQTT 5.0, chapter 3.2.2.3.10 User Property. */
+		struct mqtt_utf8_pair user_prop[CONFIG_MQTT_USER_PROPERTIES_MAX];
+
+		/** MQTT 5.0, chapter 3.2.2.3.7 Assigned Client Identifier. */
+		struct mqtt_utf8 assigned_client_id;
+
+		/** MQTT 5.0, chapter 3.2.2.3.9 Reason String. */
+		struct mqtt_utf8 reason_string;
+
+		/** MQTT 5.0, chapter 3.2.2.3.15 Response Information. */
+		struct mqtt_utf8 response_information;
+
+		/** MQTT 5.0, chapter 3.2.2.3.16 Server Reference. */
+		struct mqtt_utf8 server_reference;
+
+		/** MQTT 5.0, chapter 3.2.2.3.17 Authentication Method. */
+		struct mqtt_utf8 auth_method;
+
+		/** MQTT 5.0, chapter 3.2.2.3.18 Authentication Data. */
+		struct mqtt_binstr auth_data;
+
+		/** MQTT 5.0, chapter 3.2.2.3.2 Session Expiry Interval. */
+		uint32_t session_expiry_interval;
+
+		/** MQTT 5.0, chapter 3.2.2.3.6 Maximum Packet Size. */
+		uint32_t maximum_packet_size;
+
+		/** MQTT 5.0, chapter 3.3.2.3.3 Receive Maximum. */
+		uint16_t receive_maximum;
+
+		/** MQTT 5.0, chapter 3.2.2.3.8 Topic Alias Maximum. */
+		uint16_t topic_alias_maximum;
+
+		/** MQTT 5.0, chapter 3.2.2.3.14 Server Keep Alive. */
+		uint16_t server_keep_alive;
+
+		/** MQTT 5.0, chapter 3.2.2.3.4 Maximum QoS. */
+		uint8_t maximum_qos;
+
+		/** MQTT 5.0, chapter 3.2.2.3.5 Retain Available. */
+		uint8_t retain_available;
+
+		/** MQTT 5.0, chapter 3.2.2.3.11 Wildcard Subscription Available. */
+		uint8_t wildcard_sub_available;
+
+		/** MQTT 5.0, chapter 3.2.2.3.12 Subscription Identifiers Available. */
+		uint8_t subscription_ids_available;
+
+		/** MQTT 5.0, chapter 3.2.2.3.13 Shared Subscription Available. */
+		uint8_t shared_sub_available;
+
+		/** Flags indicating whether given property was present in received packet. */
+		struct {
+			/** Session Expiry Interval property was present. */
+			bool has_session_expiry_interval;
+			/** Receive Maximum property was present. */
+			bool has_receive_maximum;
+			/** Maximum QoS property was present. */
+			bool has_maximum_qos;
+			/** Retain Available property was present. */
+			bool has_retain_available;
+			/** Maximum Packet Size property was present. */
+			bool has_maximum_packet_size;
+			/** Assigned Client Identifier property was present. */
+			bool has_assigned_client_id;
+			/** Topic Alias Maximum property was present. */
+			bool has_topic_alias_maximum;
+			/** Reason String property was present. */
+			bool has_reason_string;
+			/** User Property property was present. */
+			bool has_user_prop;
+			/** Wildcard Subscription Available property was present. */
+			bool has_wildcard_sub_available;
+			/** Subscription Identifiers Available property was present. */
+			bool has_subscription_ids_available;
+			/** Shared Subscription Available property was present. */
+			bool has_shared_sub_available;
+			/** Server Keep Alive property was present. */
+			bool has_server_keep_alive;
+			/** Response Information property was present. */
+			bool has_response_information;
+			/** Server Reference property was present. */
+			bool has_server_reference;
+			/** Authentication Method property was present. */
+			bool has_auth_method;
+			/** Authentication Data property was present. */
+			bool has_auth_data;
+		} rx;
+	} prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief Parameters for MQTT publish acknowledgment (PUBACK). */
diff --git a/subsys/net/lib/mqtt/mqtt_decoder.c b/subsys/net/lib/mqtt/mqtt_decoder.c
index 678546b2f11..9ad4adb8abb 100644
--- a/subsys/net/lib/mqtt/mqtt_decoder.c
+++ b/subsys/net/lib/mqtt/mqtt_decoder.c
@@ -119,7 +119,8 @@ static int unpack_utf8_str(struct buf_ctx *buf, struct mqtt_utf8 *str)
 }
 
 /**
- * @brief Unpacks binary string from the buffer from the offset requested.
+ * @brief Unpacks binary string from the buffer from the offset requested with
+ *        the length provided.
  *
  * @param[in] length Binary string length.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
@@ -130,8 +131,8 @@ static int unpack_utf8_str(struct buf_ctx *buf, struct mqtt_utf8 *str)
  * @retval 0 if the procedure is successful.
  * @retval -EINVAL if the buffer would be exceeded during the read
  */
-static int unpack_data(uint32_t length, struct buf_ctx *buf,
-		       struct mqtt_binstr *str)
+static int unpack_raw_data(uint32_t length, struct buf_ctx *buf,
+			   struct mqtt_binstr *str)
 {
 	NET_DBG(">> cur:%p, end:%p", (void *)buf->cur, (void *)buf->end);
 
@@ -154,23 +155,24 @@ static int unpack_data(uint32_t length, struct buf_ctx *buf,
 	return 0;
 }
 
-/**@brief Decode MQTT Packet Length in the MQTT fixed header.
+/**
+ * @brief Unpacks variable length integer from the buffer from the offset
+ *        requested.
  *
  * @param[inout] buf A pointer to the buf_ctx structure containing current
  *                   buffer position.
- * @param[out] length Length of variable header and payload in the
- *                              MQTT message.
+ * @param[out] val Memory where the value is to be unpacked.
  *
- * @retval 0 if the procedure is successful.
+ * @retval Number of bytes parsed if the procedure is successful.
  * @retval -EINVAL if the length decoding would use more that 4 bytes.
  * @retval -EAGAIN if the buffer would be exceeded during the read.
  */
-static int packet_length_decode(struct buf_ctx *buf, uint32_t *length)
+static int unpack_variable_int(struct buf_ctx *buf, uint32_t *val)
 {
 	uint8_t shift = 0U;
-	uint8_t bytes = 0U;
+	int bytes = 0;
 
-	*length = 0U;
+	*val = 0U;
 	do {
 		if (bytes >= MQTT_MAX_LENGTH_BYTES) {
 			return -EINVAL;
@@ -180,19 +182,19 @@ static int packet_length_decode(struct buf_ctx *buf, uint32_t *length)
 			return -EAGAIN;
 		}
 
-		*length += ((uint32_t)*(buf->cur) & MQTT_LENGTH_VALUE_MASK)
+		*val += ((uint32_t)*(buf->cur) & MQTT_LENGTH_VALUE_MASK)
 								<< shift;
 		shift += MQTT_LENGTH_SHIFT;
 		bytes++;
 	} while ((*(buf->cur++) & MQTT_LENGTH_CONTINUATION_BIT) != 0U);
 
-	if (*length > MQTT_MAX_PAYLOAD_SIZE) {
+	if (*val > MQTT_MAX_PAYLOAD_SIZE) {
 		return -EINVAL;
 	}
 
-	NET_DBG("length:0x%08x", *length);
+	NET_DBG("variable int:0x%08x", *val);
 
-	return 0;
+	return bytes;
 }
 
 int fixed_header_decode(struct buf_ctx *buf, uint8_t *type_and_flags,
@@ -205,9 +207,427 @@ int fixed_header_decode(struct buf_ctx *buf, uint8_t *type_and_flags,
 		return err_code;
 	}
 
-	return packet_length_decode(buf, length);
+	err_code = unpack_variable_int(buf, length);
+	if (err_code < 0) {
+		return err_code;
+	}
+
+	return 0;
+}
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+/**
+ * @brief Unpacks unsigned 32 bit value from the buffer from the offset
+ *        requested.
+ *
+ * @param[inout] buf A pointer to the buf_ctx structure containing current
+ *                   buffer position.
+ * @param[out] val Memory where the value is to be unpacked.
+ *
+ * @retval 0 if the procedure is successful.
+ * @retval -EINVAL if the buffer would be exceeded during the read
+ */
+static int unpack_uint32(struct buf_ctx *buf, uint32_t *val)
+{
+	uint8_t *cur = buf->cur;
+	uint8_t *end = buf->end;
+
+	NET_DBG(">> cur:%p, end:%p", (void *)cur, (void *)end);
+
+	if ((end - cur) < sizeof(uint32_t)) {
+		return -EINVAL;
+	}
+
+	*val = sys_get_be32(cur);
+	buf->cur = (cur + sizeof(uint32_t));
+
+	NET_DBG("<< val:%08x", *val);
+
+	return 0;
+}
+
+/**
+ * @brief Unpacks binary string from the buffer from the offset requested.
+ *        Binary string length is decoded from the first two bytes of the buffer.
+ *
+ * @param[inout] buf A pointer to the buf_ctx structure containing current
+ *                   buffer position.
+ * @param[out] bin Pointer to a binary string that will hold the binary string
+ *                 location in the buffer.
+ *
+ * @retval 0 if the procedure is successful.
+ * @retval -EINVAL if the buffer would be exceeded during the read
+ */
+static int unpack_binary_data(struct buf_ctx *buf, struct mqtt_binstr *bin)
+{
+	uint16_t len;
+	int err;
+
+	NET_DBG(">> cur:%p, end:%p", (void *)buf->cur, (void *)buf->end);
+
+	err = unpack_uint16(buf, &len);
+	if (err != 0) {
+		return err;
+	}
+
+	if ((buf->end - buf->cur) < len) {
+		return -EINVAL;
+	}
+
+	bin->len = len;
+	/* Zero length binary strings are permitted. */
+	if (len > 0) {
+		bin->data = buf->cur;
+		buf->cur += len;
+	} else {
+		bin->data = NULL;
+	}
+
+	NET_DBG("<< bin len:%08x", GET_BINSTR_BUFFER_SIZE(bin));
+
+	return 0;
+}
+
+struct property_decoder {
+	void *data;
+	bool *found;
+	uint8_t type;
+};
+
+int decode_uint32_property(struct property_decoder *prop,
+			   uint32_t *remaining_len,
+			   struct buf_ctx *buf)
+{
+	uint32_t *value = prop->data;
+
+	if (*remaining_len < sizeof(uint32_t)) {
+		return -EBADMSG;
+	}
+
+	if (unpack_uint32(buf, value) < 0) {
+		return -EBADMSG;
+	}
+
+	*remaining_len -= sizeof(uint32_t);
+	*prop->found = true;
+
+	return 0;
+}
+
+int decode_uint16_property(struct property_decoder *prop,
+			   uint32_t *remaining_len,
+			   struct buf_ctx *buf)
+{
+	uint16_t *value = prop->data;
+
+	if (*remaining_len < sizeof(uint16_t)) {
+		return -EBADMSG;
+	}
+
+	if (unpack_uint16(buf, value) < 0) {
+		return -EBADMSG;
+	}
+
+	*remaining_len -= sizeof(uint16_t);
+	*prop->found = true;
+
+	return 0;
+}
+
+int decode_uint8_property(struct property_decoder *prop,
+			   uint32_t *remaining_len,
+			   struct buf_ctx *buf)
+{
+	uint8_t *value = prop->data;
+
+	if (*remaining_len < sizeof(uint8_t)) {
+		return -EBADMSG;
+	}
+
+	if (unpack_uint8(buf, value) < 0) {
+		return -EBADMSG;
+	}
+
+	*remaining_len -= sizeof(uint8_t);
+	*prop->found = true;
+
+	return 0;
+}
+
+int decode_string_property(struct property_decoder *prop,
+			   uint32_t *remaining_len,
+			   struct buf_ctx *buf)
+{
+	struct mqtt_utf8 *str = prop->data;
+
+	if (unpack_utf8_str(buf, str) < 0) {
+		return -EBADMSG;
+	}
+
+	if (*remaining_len < sizeof(uint16_t) + str->size) {
+		return -EBADMSG;
+	}
+
+	*remaining_len -= sizeof(uint16_t) + str->size;
+	*prop->found = true;
+
+	return 0;
 }
 
+int decode_binary_property(struct property_decoder *prop,
+			   uint32_t *remaining_len,
+			   struct buf_ctx *buf)
+{
+	struct mqtt_binstr *bin = prop->data;
+
+	if (unpack_binary_data(buf, bin) < 0) {
+		return -EBADMSG;
+	}
+
+	if (*remaining_len < sizeof(uint16_t) + bin->len) {
+		return -EBADMSG;
+	}
+
+	*remaining_len -= sizeof(uint16_t) + bin->len;
+	*prop->found = true;
+
+	return 0;
+}
+
+int decode_user_property(struct property_decoder *prop,
+			   uint32_t *remaining_len,
+			   struct buf_ctx *buf)
+{
+	struct mqtt_utf8_pair *user_prop = prop->data;
+	struct mqtt_utf8_pair *chosen = NULL;
+	struct mqtt_utf8_pair temp = { 0 };
+	size_t prop_len;
+
+	if (unpack_utf8_str(buf, &temp.name) < 0) {
+		return -EBADMSG;
+	}
+
+	if (unpack_utf8_str(buf, &temp.value) < 0) {
+		return -EBADMSG;
+	}
+
+	prop_len = (2 * sizeof(uint16_t)) + temp.name.size + temp.value.size;
+	if (*remaining_len < prop_len) {
+		return -EBADMSG;
+	}
+
+	*remaining_len -= prop_len;
+	*prop->found = true;
+
+	for (int i = 0; i < CONFIG_MQTT_USER_PROPERTIES_MAX; i++) {
+		if (user_prop[i].name.utf8 == NULL) {
+			chosen = &user_prop[i];
+			break;
+		}
+	}
+
+	if (chosen == NULL) {
+		NET_DBG("Cannot parse all user properties, ignore excess");
+	} else {
+		memcpy(chosen, &temp, sizeof(struct mqtt_utf8_pair));
+	}
+
+	return 0;
+}
+
+static int properties_decode(struct property_decoder *prop, uint8_t cnt,
+			     struct buf_ctx *buf)
+{
+	uint32_t properties_len;
+	int bytes;
+	int err;
+
+	bytes = unpack_variable_int(buf, &properties_len);
+	if (bytes < 0) {
+		return -EBADMSG;
+	}
+
+	bytes += (int)properties_len;
+
+	while (properties_len > 0) {
+		struct property_decoder *current_prop = NULL;
+		uint8_t type;
+
+		/* Decode property type */
+		err = unpack_uint8(buf, &type);
+		if (err < 0) {
+			return -EBADMSG;
+		}
+
+		properties_len--;
+
+		/* Search if the property is supported in the provided property
+		 * array.
+		 */
+		for (int i = 0; i < cnt; i++) {
+			if (type == prop[i].type) {
+				current_prop = &prop[i];
+			}
+		}
+
+		if (current_prop == NULL) {
+			NET_DBG("Unsupported property %u", type);
+			return -EBADMSG;
+		}
+
+		/* Decode property value. */
+		switch (type) {
+		case MQTT_PROP_SESSION_EXPIRY_INTERVAL:
+		case MQTT_PROP_MAXIMUM_PACKET_SIZE:
+			err = decode_uint32_property(current_prop,
+						     &properties_len, buf);
+			break;
+		case MQTT_PROP_RECEIVE_MAXIMUM:
+		case MQTT_PROP_TOPIC_ALIAS_MAXIMUM:
+		case MQTT_PROP_SERVER_KEEP_ALIVE:
+			err = decode_uint16_property(current_prop,
+						     &properties_len, buf);
+			break;
+		case MQTT_PROP_MAXIMUM_QOS:
+		case MQTT_PROP_RETAIN_AVAILABLE:
+		case MQTT_PROP_WILDCARD_SUBSCRIPTION_AVAILABLE:
+		case MQTT_PROP_SUBSCRIPTION_IDENTIFIER_AVAILABLE:
+		case MQTT_PROP_SHARED_SUBSCRIPTION_AVAILABLE:
+			err = decode_uint8_property(current_prop,
+						    &properties_len, buf);
+			break;
+		case MQTT_PROP_ASSIGNED_CLIENT_IDENTIFIER:
+		case MQTT_PROP_REASON_STRING:
+		case MQTT_PROP_RESPONSE_INFORMATION:
+		case MQTT_PROP_SERVER_REFERENCE:
+		case MQTT_PROP_AUTHENTICATION_METHOD:
+			err = decode_string_property(current_prop,
+						     &properties_len, buf);
+			break;
+		case MQTT_PROP_USER_PROPERTY:
+			err = decode_user_property(current_prop,
+						   &properties_len, buf);
+			break;
+		case MQTT_PROP_AUTHENTICATION_DATA:
+			err = decode_binary_property(current_prop,
+						     &properties_len, buf);
+			break;
+		default:
+			err = -ENOTSUP;
+		}
+
+		if (err < 0) {
+			return -EBADMSG;
+		}
+	}
+
+	return bytes;
+}
+
+static int connack_properties_decode(struct buf_ctx *buf,
+				     struct mqtt_connack_param *param)
+{
+	struct property_decoder prop[] = {
+		{
+			&param->prop.session_expiry_interval,
+			&param->prop.rx.has_session_expiry_interval,
+			MQTT_PROP_SESSION_EXPIRY_INTERVAL
+		},
+		{
+			&param->prop.receive_maximum,
+			&param->prop.rx.has_receive_maximum,
+			MQTT_PROP_RECEIVE_MAXIMUM
+		},
+		{
+			&param->prop.maximum_qos,
+			&param->prop.rx.has_maximum_qos,
+			MQTT_PROP_MAXIMUM_QOS
+		},
+		{
+			&param->prop.retain_available,
+			&param->prop.rx.has_retain_available,
+			MQTT_PROP_RETAIN_AVAILABLE
+		},
+		{
+			&param->prop.maximum_packet_size,
+			&param->prop.rx.has_maximum_packet_size,
+			MQTT_PROP_MAXIMUM_PACKET_SIZE
+		},
+		{
+			&param->prop.assigned_client_id,
+			&param->prop.rx.has_assigned_client_id,
+			MQTT_PROP_ASSIGNED_CLIENT_IDENTIFIER
+		},
+		{
+			&param->prop.topic_alias_maximum,
+			&param->prop.rx.has_topic_alias_maximum,
+			MQTT_PROP_TOPIC_ALIAS_MAXIMUM
+		},
+		{
+			&param->prop.reason_string,
+			&param->prop.rx.has_reason_string,
+			MQTT_PROP_REASON_STRING
+		},
+		{
+			&param->prop.user_prop,
+			&param->prop.rx.has_user_prop,
+			MQTT_PROP_USER_PROPERTY
+		},
+		{
+			&param->prop.wildcard_sub_available,
+			&param->prop.rx.has_wildcard_sub_available,
+			MQTT_PROP_WILDCARD_SUBSCRIPTION_AVAILABLE
+		},
+		{
+			&param->prop.subscription_ids_available,
+			&param->prop.rx.has_subscription_ids_available,
+			MQTT_PROP_SUBSCRIPTION_IDENTIFIER_AVAILABLE
+		},
+		{
+			&param->prop.shared_sub_available,
+			&param->prop.rx.has_shared_sub_available,
+			MQTT_PROP_SHARED_SUBSCRIPTION_AVAILABLE
+		},
+		{
+			&param->prop.server_keep_alive,
+			&param->prop.rx.has_server_keep_alive,
+			MQTT_PROP_SERVER_KEEP_ALIVE
+		},
+		{
+			&param->prop.response_information,
+			&param->prop.rx.has_response_information,
+			MQTT_PROP_RESPONSE_INFORMATION
+		},
+		{
+			&param->prop.server_reference,
+			&param->prop.rx.has_server_reference,
+			MQTT_PROP_SERVER_REFERENCE
+		},
+		{
+			&param->prop.auth_method,
+			&param->prop.rx.has_auth_method,
+			MQTT_PROP_AUTHENTICATION_METHOD
+		},
+		{
+			&param->prop.auth_data,
+			&param->prop.rx.has_auth_data,
+			MQTT_PROP_AUTHENTICATION_DATA
+		}
+	};
+
+	return properties_decode(prop, ARRAY_SIZE(prop), buf);
+}
+#else
+static int connack_properties_decode(struct buf_ctx *buf,
+				     struct mqtt_connack_param *param)
+{
+	ARG_UNUSED(param);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
 int connect_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 		       struct mqtt_connack_param *param)
 {
@@ -224,16 +644,24 @@ int connect_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 		return err_code;
 	}
 
-	if (client->protocol_version == MQTT_VERSION_3_1_1) {
-		param->session_present_flag =
-			flags & MQTT_CONNACK_FLAG_SESSION_PRESENT;
+	param->return_code = ret_code;
 
-		NET_DBG("[CID %p]: session_present_flag: %d", client,
-			 param->session_present_flag);
+	if (client->protocol_version == MQTT_VERSION_3_1_0) {
+		goto out;
 	}
 
-	param->return_code = (enum mqtt_conn_return_code)ret_code;
+	param->session_present_flag = flags & MQTT_CONNACK_FLAG_SESSION_PRESENT;
+	NET_DBG("[CID %p]: session_present_flag: %d", client,
+		param->session_present_flag);
+
+	if (mqtt_is_version_5_0(client)) {
+		err_code = connack_properties_decode(buf, param);
+		if (err_code < 0) {
+			return err_code;
+		}
+	}
 
+out:
 	return 0;
 }
 
@@ -306,7 +734,7 @@ int subscribe_ack_decode(struct buf_ctx *buf, struct mqtt_suback_param *param)
 		return err_code;
 	}
 
-	return unpack_data(buf->end - buf->cur, buf, &param->return_codes);
+	return unpack_raw_data(buf->end - buf->cur, buf, &param->return_codes);
 }
 
 int unsubscribe_ack_decode(struct buf_ctx *buf,
diff --git a/subsys/net/lib/mqtt/mqtt_rx.c b/subsys/net/lib/mqtt/mqtt_rx.c
index 27fa2410d2c..fee4e253173 100644
--- a/subsys/net/lib/mqtt/mqtt_rx.c
+++ b/subsys/net/lib/mqtt/mqtt_rx.c
@@ -23,7 +23,7 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 {
 	int err_code = 0;
 	bool notify_event = true;
-	struct mqtt_evt evt;
+	struct mqtt_evt evt = { 0 };
 
 	/* Success by default, overwritten in special cases. */
 	evt.result = 0;
@@ -38,6 +38,9 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 			NET_DBG("[CID %p]: return_code: %d", client,
 				 evt.param.connack.return_code);
 
+			/* For MQTT 5.0 this is still valid as MQTT_CONNACK_SUCCESS
+			 * is encoded as 0 as well.
+			 */
 			if (evt.param.connack.return_code ==
 						MQTT_CONNECTION_ACCEPTED) {
 				/* Set state. */

From 00d256e0bbb7baa5bfdd814894eb2f0e334333e7 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 19 Dec 2024 16:09:07 +0100
Subject: [PATCH 2756/2913] [nrf fromtree] net: mqtt: Add MQTT 5.0 support for
 PUBLISH

Add support for PUBLISH message specified in MQTT 5.0. The message
encoder and decoder were updated to support MQTT properties.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 15ad90aceba7465ae73aacb5aad5b98576685870)
---
 include/zephyr/net/mqtt.h                     |  49 +++++++
 subsys/net/lib/mqtt/Kconfig                   |   8 ++
 subsys/net/lib/mqtt/mqtt.c                    |   2 +-
 subsys/net/lib/mqtt/mqtt_decoder.c            | 134 ++++++++++++++++--
 subsys/net/lib/mqtt/mqtt_encoder.c            |  94 +++++++++++-
 subsys/net/lib/mqtt/mqtt_internal.h           |  22 ++-
 subsys/net/lib/mqtt/mqtt_rx.c                 |  41 +++++-
 .../mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c |   6 +-
 8 files changed, 332 insertions(+), 24 deletions(-)

diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index 402b5cf6db1..c56574c7893 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -393,6 +393,55 @@ struct mqtt_publish_param {
 	 *  by the broker.
 	 */
 	uint8_t retain_flag : 1;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	/** MQTT 5.0 properties. */
+	struct {
+		/** MQTT 5.0, chapter 3.3.2.3.7 User Property. */
+		struct mqtt_utf8_pair user_prop[CONFIG_MQTT_USER_PROPERTIES_MAX];
+
+		/** MQTT 5.0, chapter 3.3.2.3.5 Response Topic. */
+		struct mqtt_utf8 response_topic;
+
+		/** MQTT 5.0, chapter 3.3.2.3.6 Correlation Data. */
+		struct mqtt_binstr correlation_data;
+
+		/** MQTT 5.0, chapter 3.3.2.3.9 Content Type. */
+		struct mqtt_utf8 content_type;
+
+		/** MQTT 5.0, chapter 3.3.2.3.8 Subscription Identifier. */
+		uint32_t subscription_identifier[CONFIG_MQTT_SUBSCRIPTION_ID_PROPERTIES_MAX];
+
+		/** MQTT 5.0, chapter 3.3.2.3.3 Message Expiry Interval. */
+		uint32_t message_expiry_interval;
+
+		/** MQTT 5.0, chapter 3.3.2.3.4 Topic Alias. */
+		uint16_t topic_alias;
+
+		/** MQTT 5.0, chapter 3.3.2.3.2 Payload Format Indicator. */
+		uint8_t payload_format_indicator;
+
+		/** Flags indicating whether given property was present in received packet. */
+		struct {
+			/** Payload Format Indicator property was present. */
+			bool has_payload_format_indicator;
+			/** Message Expiry Interval property was present. */
+			bool has_message_expiry_interval;
+			/** Topic Alias property was present. */
+			bool has_topic_alias;
+			/** Response Topic property was present. */
+			bool has_response_topic;
+			/** Correlation Data property was present. */
+			bool has_correlation_data;
+			/** User Property property was present. */
+			bool has_user_prop;
+			/** Subscription Identifier property was present. */
+			bool has_subscription_identifier;
+			/** Content Type property was present. */
+			bool has_content_type;
+		} rx;
+	} prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief List of topics in a subscription request. */
diff --git a/subsys/net/lib/mqtt/Kconfig b/subsys/net/lib/mqtt/Kconfig
index 83d7f669a69..6257e0d2b06 100644
--- a/subsys/net/lib/mqtt/Kconfig
+++ b/subsys/net/lib/mqtt/Kconfig
@@ -91,6 +91,14 @@ config MQTT_USER_PROPERTIES_MAX
 	  Maximum number of user properties that the client can include in a
 	  packet or parse on input.
 
+config MQTT_SUBSCRIPTION_ID_PROPERTIES_MAX
+	int "Maximum number of Subscription ID properties in a Publish packet"
+	default 1
+	range 1 32
+	help
+	  Maximum number of Subscription ID properties that the client can
+	  parse when processing Publish message.
+
 config MQTT_TOPIC_ALIAS_MAX
 	int "Maximum number of supported topic aliases"
 	default 5
diff --git a/subsys/net/lib/mqtt/mqtt.c b/subsys/net/lib/mqtt/mqtt.c
index 113d2a75427..f74bc915049 100644
--- a/subsys/net/lib/mqtt/mqtt.c
+++ b/subsys/net/lib/mqtt/mqtt.c
@@ -262,7 +262,7 @@ int mqtt_publish(struct mqtt_client *client,
 		goto error;
 	}
 
-	err_code = publish_encode(param, &packet);
+	err_code = publish_encode(client, param, &packet);
 	if (err_code < 0) {
 		goto error;
 	}
diff --git a/subsys/net/lib/mqtt/mqtt_decoder.c b/subsys/net/lib/mqtt/mqtt_decoder.c
index 9ad4adb8abb..9172d887378 100644
--- a/subsys/net/lib/mqtt/mqtt_decoder.c
+++ b/subsys/net/lib/mqtt/mqtt_decoder.c
@@ -155,19 +155,7 @@ static int unpack_raw_data(uint32_t length, struct buf_ctx *buf,
 	return 0;
 }
 
-/**
- * @brief Unpacks variable length integer from the buffer from the offset
- *        requested.
- *
- * @param[inout] buf A pointer to the buf_ctx structure containing current
- *                   buffer position.
- * @param[out] val Memory where the value is to be unpacked.
- *
- * @retval Number of bytes parsed if the procedure is successful.
- * @retval -EINVAL if the length decoding would use more that 4 bytes.
- * @retval -EAGAIN if the buffer would be exceeded during the read.
- */
-static int unpack_variable_int(struct buf_ctx *buf, uint32_t *val)
+int unpack_variable_int(struct buf_ctx *buf, uint32_t *val)
 {
 	uint8_t shift = 0U;
 	int bytes = 0;
@@ -435,6 +423,43 @@ int decode_user_property(struct property_decoder *prop,
 	return 0;
 }
 
+int decode_sub_id_property(struct property_decoder *prop,
+			   uint32_t *remaining_len,
+			   struct buf_ctx *buf)
+{
+	uint32_t *sub_id_array = prop->data;
+	uint32_t *chosen = NULL;
+	uint32_t value;
+	int bytes;
+
+	bytes = unpack_variable_int(buf, &value);
+	if (bytes < 0) {
+		return -EINVAL;
+	}
+
+	if (*remaining_len < bytes) {
+		return -EINVAL;
+	}
+
+	*remaining_len -= bytes;
+	*prop->found = true;
+
+	for (int i = 0; i < CONFIG_MQTT_SUBSCRIPTION_ID_PROPERTIES_MAX; i++) {
+		if (sub_id_array[i] == 0) {
+			chosen = &sub_id_array[i];
+			break;
+		}
+	}
+
+	if (chosen == NULL) {
+		NET_DBG("Cannot parse all subscription id properties, ignore excess");
+	} else {
+		*chosen = value;
+	}
+
+	return 0;
+}
+
 static int properties_decode(struct property_decoder *prop, uint8_t cnt,
 			     struct buf_ctx *buf)
 {
@@ -479,12 +504,14 @@ static int properties_decode(struct property_decoder *prop, uint8_t cnt,
 		switch (type) {
 		case MQTT_PROP_SESSION_EXPIRY_INTERVAL:
 		case MQTT_PROP_MAXIMUM_PACKET_SIZE:
+		case MQTT_PROP_MESSAGE_EXPIRY_INTERVAL:
 			err = decode_uint32_property(current_prop,
 						     &properties_len, buf);
 			break;
 		case MQTT_PROP_RECEIVE_MAXIMUM:
 		case MQTT_PROP_TOPIC_ALIAS_MAXIMUM:
 		case MQTT_PROP_SERVER_KEEP_ALIVE:
+		case MQTT_PROP_TOPIC_ALIAS:
 			err = decode_uint16_property(current_prop,
 						     &properties_len, buf);
 			break;
@@ -493,6 +520,7 @@ static int properties_decode(struct property_decoder *prop, uint8_t cnt,
 		case MQTT_PROP_WILDCARD_SUBSCRIPTION_AVAILABLE:
 		case MQTT_PROP_SUBSCRIPTION_IDENTIFIER_AVAILABLE:
 		case MQTT_PROP_SHARED_SUBSCRIPTION_AVAILABLE:
+		case MQTT_PROP_PAYLOAD_FORMAT_INDICATOR:
 			err = decode_uint8_property(current_prop,
 						    &properties_len, buf);
 			break;
@@ -501,6 +529,8 @@ static int properties_decode(struct property_decoder *prop, uint8_t cnt,
 		case MQTT_PROP_RESPONSE_INFORMATION:
 		case MQTT_PROP_SERVER_REFERENCE:
 		case MQTT_PROP_AUTHENTICATION_METHOD:
+		case MQTT_PROP_RESPONSE_TOPIC:
+		case MQTT_PROP_CONTENT_TYPE:
 			err = decode_string_property(current_prop,
 						     &properties_len, buf);
 			break;
@@ -509,9 +539,14 @@ static int properties_decode(struct property_decoder *prop, uint8_t cnt,
 						   &properties_len, buf);
 			break;
 		case MQTT_PROP_AUTHENTICATION_DATA:
+		case MQTT_PROP_CORRELATION_DATA:
 			err = decode_binary_property(current_prop,
 						     &properties_len, buf);
 			break;
+		case MQTT_PROP_SUBSCRIPTION_IDENTIFIER:
+			err = decode_sub_id_property(current_prop,
+						     &properties_len, buf);
+			break;
 		default:
 			err = -ENOTSUP;
 		}
@@ -665,7 +700,68 @@ int connect_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 	return 0;
 }
 
-int publish_decode(uint8_t flags, uint32_t var_length, struct buf_ctx *buf,
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static int publish_properties_decode(struct buf_ctx *buf,
+				     struct mqtt_publish_param *param)
+{
+	struct property_decoder prop[] = {
+		{
+			&param->prop.payload_format_indicator,
+			&param->prop.rx.has_payload_format_indicator,
+			MQTT_PROP_PAYLOAD_FORMAT_INDICATOR
+		},
+		{
+			&param->prop.message_expiry_interval,
+			&param->prop.rx.has_message_expiry_interval,
+			MQTT_PROP_MESSAGE_EXPIRY_INTERVAL
+		},
+		{
+			&param->prop.topic_alias,
+			&param->prop.rx.has_topic_alias,
+			MQTT_PROP_TOPIC_ALIAS
+		},
+		{
+			&param->prop.response_topic,
+			&param->prop.rx.has_response_topic,
+			MQTT_PROP_RESPONSE_TOPIC
+		},
+		{
+			&param->prop.correlation_data,
+			&param->prop.rx.has_correlation_data,
+			MQTT_PROP_CORRELATION_DATA
+		},
+		{
+			&param->prop.user_prop,
+			&param->prop.rx.has_user_prop,
+			MQTT_PROP_USER_PROPERTY
+		},
+		{
+			&param->prop.subscription_identifier,
+			&param->prop.rx.has_subscription_identifier,
+			MQTT_PROP_SUBSCRIPTION_IDENTIFIER
+		},
+		{
+			&param->prop.content_type,
+			&param->prop.rx.has_content_type,
+			MQTT_PROP_CONTENT_TYPE
+		}
+	};
+
+	return properties_decode(prop, ARRAY_SIZE(prop), buf);
+}
+#else
+static int publish_properties_decode(struct buf_ctx *buf,
+				     struct mqtt_publish_param *param)
+{
+	ARG_UNUSED(param);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
+int publish_decode(const struct mqtt_client *client, uint8_t flags,
+		   uint32_t var_length, struct buf_ctx *buf,
 		   struct mqtt_publish_param *param)
 {
 	int err_code;
@@ -691,6 +787,16 @@ int publish_decode(uint8_t flags, uint32_t var_length, struct buf_ctx *buf,
 		var_header_length += sizeof(uint16_t);
 	}
 
+	if (mqtt_is_version_5_0(client)) {
+		err_code = publish_properties_decode(buf, param);
+		if (err_code < 0) {
+			return err_code;
+		}
+
+		/* Add parsed properties length */
+		var_header_length += err_code;
+	}
+
 	if (var_length < var_header_length) {
 		NET_ERR("Corrupted PUBLISH message, header length (%u) larger "
 			 "than total length (%u)", var_header_length,
diff --git a/subsys/net/lib/mqtt/mqtt_encoder.c b/subsys/net/lib/mqtt/mqtt_encoder.c
index 40a2a414e07..68e432ebf4e 100644
--- a/subsys/net/lib/mqtt/mqtt_encoder.c
+++ b/subsys/net/lib/mqtt/mqtt_encoder.c
@@ -862,7 +862,92 @@ int connect_request_encode(const struct mqtt_client *client,
 	return mqtt_encode_fixed_header(message_type, start, buf);
 }
 
-int publish_encode(const struct mqtt_publish_param *param, struct buf_ctx *buf)
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static uint32_t publish_properties_length(const struct mqtt_publish_param *param)
+{
+	return uint8_property_length(MQTT_PROP_PAYLOAD_FORMAT_INDICATOR,
+				     param->prop.payload_format_indicator) +
+	       uint32_property_length(param->prop.message_expiry_interval) +
+	       uint16_property_length(param->prop.topic_alias) +
+	       string_property_length(&param->prop.response_topic) +
+	       binary_property_length(&param->prop.correlation_data) +
+	       user_properties_length(param->prop.user_prop) +
+	       /* Client does not include Subscription Identifier in any case. */
+	       string_property_length(&param->prop.content_type);
+}
+
+static int publish_properties_encode(const struct mqtt_publish_param *param,
+				     struct buf_ctx *buf)
+{
+	uint32_t properties_len;
+	int err;
+
+	/* Precalculate total properties length */
+	properties_len = publish_properties_length(param);
+	err = pack_variable_int(properties_len, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint8_property(MQTT_PROP_PAYLOAD_FORMAT_INDICATOR,
+				    param->prop.payload_format_indicator, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint32_property(MQTT_PROP_MESSAGE_EXPIRY_INTERVAL,
+				     param->prop.message_expiry_interval, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint16_property(MQTT_PROP_TOPIC_ALIAS,
+				     param->prop.topic_alias, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_string_property(MQTT_PROP_RESPONSE_TOPIC,
+				     &param->prop.response_topic, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_binary_property(MQTT_PROP_CORRELATION_DATA,
+				     &param->prop.correlation_data, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_user_properties(param->prop.user_prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	/* Client does not include Subscription Identifier in any case. */
+
+	err = encode_string_property(MQTT_PROP_CONTENT_TYPE,
+				     &param->prop.content_type, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return 0;
+}
+#else
+static int publish_properties_encode(const struct mqtt_publish_param *param,
+				     struct buf_ctx *buf)
+{
+	ARG_UNUSED(param);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
+int publish_encode(const struct mqtt_client *client,
+		   const struct mqtt_publish_param *param,
+		   struct buf_ctx *buf)
 {
 	const uint8_t message_type = MQTT_MESSAGES_OPTIONS(
 			MQTT_PKT_TYPE_PUBLISH, param->dup_flag,
@@ -891,6 +976,13 @@ int publish_encode(const struct mqtt_publish_param *param, struct buf_ctx *buf)
 		}
 	}
 
+	if (mqtt_is_version_5_0(client)) {
+		err_code = publish_properties_encode(param, buf);
+		if (err_code != 0) {
+			return err_code;
+		}
+	}
+
 	/* Do not copy payload. We move the buffer pointer to ensure that
 	 * message length in fixed header is encoded correctly.
 	 */
diff --git a/subsys/net/lib/mqtt/mqtt_internal.h b/subsys/net/lib/mqtt/mqtt_internal.h
index 92816faa1aa..e4ced482a73 100644
--- a/subsys/net/lib/mqtt/mqtt_internal.h
+++ b/subsys/net/lib/mqtt/mqtt_internal.h
@@ -224,7 +224,9 @@ int connect_request_encode(const struct mqtt_client *client,
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_encode(const struct mqtt_publish_param *param, struct buf_ctx *buf);
+int publish_encode(const struct mqtt_client *client,
+		   const struct mqtt_publish_param *param,
+		   struct buf_ctx *buf);
 
 /**@brief Constructs/encodes Publish Ack packet.
  *
@@ -352,6 +354,7 @@ int connect_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 
 /**@brief Decode MQTT Publish packet.
  *
+ * @param[in] MQTT client for which packet is decoded.
  * @param[in] flags Byte containing message type and flags.
  * @param[in] var_length Length of the variable part of the message.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
@@ -360,7 +363,8 @@ int connect_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_decode(uint8_t flags, uint32_t var_length, struct buf_ctx *buf,
+int publish_decode(const struct mqtt_client *client, uint8_t flags,
+		   uint32_t var_length, struct buf_ctx *buf,
 		   struct mqtt_publish_param *param);
 
 /**@brief Decode MQTT Publish Ack packet.
@@ -428,6 +432,20 @@ int subscribe_ack_decode(struct buf_ctx *buf,
 int unsubscribe_ack_decode(struct buf_ctx *buf,
 			   struct mqtt_unsuback_param *param);
 
+/**
+ * @brief Unpacks variable length integer from the buffer from the offset
+ *        requested.
+ *
+ * @param[inout] buf A pointer to the buf_ctx structure containing current
+ *                   buffer position.
+ * @param[out] val Memory where the value is to be unpacked.
+ *
+ * @retval Number of bytes parsed if the procedure is successful.
+ * @retval -EINVAL if the length decoding would use more that 4 bytes.
+ * @retval -EAGAIN if the buffer would be exceeded during the read.
+ */
+int unpack_variable_int(struct buf_ctx *buf, uint32_t *val);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/subsys/net/lib/mqtt/mqtt_rx.c b/subsys/net/lib/mqtt/mqtt_rx.c
index fee4e253173..e23e726ed12 100644
--- a/subsys/net/lib/mqtt/mqtt_rx.c
+++ b/subsys/net/lib/mqtt/mqtt_rx.c
@@ -60,8 +60,8 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 		NET_DBG("[CID %p]: Received MQTT_PKT_TYPE_PUBLISH", client);
 
 		evt.type = MQTT_EVT_PUBLISH;
-		err_code = publish_decode(type_and_flags, var_length, buf,
-					  &evt.param.publish);
+		err_code = publish_decode(client, type_and_flags, var_length,
+					  buf, &evt.param.publish);
 		evt.result = err_code;
 
 		client->internal.remaining_payload =
@@ -221,7 +221,42 @@ static int mqtt_read_publish_var_header(struct mqtt_client *client,
 		variable_header_length += sizeof(uint16_t);
 	}
 
-	/* Now we can read the whole header. */
+	if (mqtt_is_version_5_0(client)) {
+		struct buf_ctx backup;
+		uint8_t var_len = 1;
+		uint32_t prop_len = 0;
+
+		while (true) {
+			err_code = mqtt_read_message_chunk(
+				client, buf, variable_header_length + var_len);
+			if (err_code < 0) {
+				return err_code;
+			}
+
+			backup = *buf;
+			buf->cur += variable_header_length;
+
+			/* Try to decode variable integer, in case integer is
+			 * not complete, read more bytes from the stream and retry.
+			 */
+			err_code = unpack_variable_int(buf, &prop_len);
+			if (err_code >= 0) {
+				break;
+			}
+
+			if (err_code != -EAGAIN) {
+				return err_code;
+			}
+
+			/* Try again. */
+			var_len++;
+			*buf = backup;
+		}
+
+		*buf = backup;
+		variable_header_length += var_len + prop_len;
+	}
+
 	err_code = mqtt_read_message_chunk(client, buf,
 					   variable_header_length);
 	if (err_code < 0) {
diff --git a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
index b6cf7390d7f..ae45bb026e3 100644
--- a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
+++ b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
@@ -773,7 +773,7 @@ static int eval_msg_publish(struct mqtt_test *mqtt_test)
 	buf.cur = client.tx_buf;
 	buf.end = client.tx_buf + client.tx_buf_size;
 
-	rc = publish_encode(param, &buf);
+	rc = publish_encode(&client, param, &buf);
 
 	/* Payload is not copied, copy it manually just after the header.*/
 	memcpy(buf.end, param->message.payload.data,
@@ -791,7 +791,7 @@ static int eval_msg_publish(struct mqtt_test *mqtt_test)
 
 	zassert_false(rc, "fixed_header_decode failed");
 
-	rc = publish_decode(type_and_flags, length, &buf, &dec_param);
+	rc = publish_decode(&client, type_and_flags, length, &buf, &dec_param);
 
 	/**TESTPOINT: Check publish_decode function*/
 	zassert_false(rc, "publish_decode failed");
@@ -830,7 +830,7 @@ static int eval_msg_corrupted_publish(struct mqtt_test *mqtt_test)
 	rc = fixed_header_decode(buf, &type_and_flags, &length);
 	zassert_equal(rc, 0, "fixed_header_decode failed");
 
-	rc = publish_decode(type_and_flags, length, buf, &dec_param);
+	rc = publish_decode(&client, type_and_flags, length, buf, &dec_param);
 	zassert_equal(rc, -EINVAL, "publish_decode should fail");
 
 	return TC_PASS;

From 0276e28c2396f60925af6efe2579572b30538117 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 19 Dec 2024 16:09:08 +0100
Subject: [PATCH 2757/2913] [nrf fromtree] net: mqtt: Add MQTT 5.0 support for
 PUBLISH ACKs

Add support for PUBACK, PUBREC, PUBREL and PUBCOMP specified in MQTT
5.0. As all of these acknowledgment packets have similar format,
introduced a common encoder/decoder to handle ACK packets.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit c21e64251bf8871590aadf6cd1356bbe73d3d543)
---
 include/zephyr/net/mqtt.h                     |  49 +++++
 subsys/net/lib/mqtt/mqtt.c                    |   8 +-
 subsys/net/lib/mqtt/mqtt_decoder.c            | 123 ++++++++++-
 subsys/net/lib/mqtt/mqtt_encoder.c            | 199 ++++++++++++++----
 subsys/net/lib/mqtt/mqtt_internal.h           |  25 ++-
 subsys/net/lib/mqtt/mqtt_rx.c                 |  11 +-
 .../mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c |  16 +-
 7 files changed, 357 insertions(+), 74 deletions(-)

diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index c56574c7893..fcbf0a20b4c 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -334,28 +334,77 @@ struct mqtt_connack_param {
 #endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
+/** @brief Common MQTT 5.0 properties shared across all ack-type messages. */
+struct mqtt_common_ack_properties {
+	/** MQTT 5.0, chapter 3.4.2.2.3 User Property. */
+	struct mqtt_utf8_pair user_prop[CONFIG_MQTT_USER_PROPERTIES_MAX];
+
+	/** MQTT 5.0, chapter 3.4.2.2.2 Reason String. */
+	struct mqtt_utf8 reason_string;
+
+	/** Flags indicating whether given property was present in received packet. */
+	struct {
+		/** Reason String property was present. */
+		bool has_reason_string;
+		/** User Property property was present. */
+		bool has_user_prop;
+	} rx;
+};
+
 /** @brief Parameters for MQTT publish acknowledgment (PUBACK). */
 struct mqtt_puback_param {
 	/** Message id of the PUBLISH message being acknowledged */
 	uint16_t message_id;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	/** MQTT 5.0 reason code. */
+	uint8_t reason_code;
+
+	/** MQTT 5.0 properties. */
+	struct mqtt_common_ack_properties prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief Parameters for MQTT publish receive (PUBREC). */
 struct mqtt_pubrec_param {
 	/** Message id of the PUBLISH message being acknowledged */
 	uint16_t message_id;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	/** MQTT 5.0 reason code. */
+	uint8_t reason_code;
+
+	/** MQTT 5.0 properties. */
+	struct mqtt_common_ack_properties prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief Parameters for MQTT publish release (PUBREL). */
 struct mqtt_pubrel_param {
 	/** Message id of the PUBREC message being acknowledged */
 	uint16_t message_id;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	/** MQTT 5.0 reason code. */
+	uint8_t reason_code;
+
+	/** MQTT 5.0 properties. */
+	struct mqtt_common_ack_properties prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief Parameters for MQTT publish complete (PUBCOMP). */
 struct mqtt_pubcomp_param {
 	/** Message id of the PUBREL message being acknowledged */
 	uint16_t message_id;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	/** MQTT 5.0 reason code. */
+	uint8_t reason_code;
+
+	/** MQTT 5.0 properties. */
+	struct mqtt_common_ack_properties prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief Parameters for MQTT subscription acknowledgment (SUBACK). */
diff --git a/subsys/net/lib/mqtt/mqtt.c b/subsys/net/lib/mqtt/mqtt.c
index f74bc915049..a1194f479b2 100644
--- a/subsys/net/lib/mqtt/mqtt.c
+++ b/subsys/net/lib/mqtt/mqtt.c
@@ -309,7 +309,7 @@ int mqtt_publish_qos1_ack(struct mqtt_client *client,
 		goto error;
 	}
 
-	err_code = publish_ack_encode(param, &packet);
+	err_code = publish_ack_encode(client, param, &packet);
 	if (err_code < 0) {
 		goto error;
 	}
@@ -346,7 +346,7 @@ int mqtt_publish_qos2_receive(struct mqtt_client *client,
 		goto error;
 	}
 
-	err_code = publish_receive_encode(param, &packet);
+	err_code = publish_receive_encode(client, param, &packet);
 	if (err_code < 0) {
 		goto error;
 	}
@@ -383,7 +383,7 @@ int mqtt_publish_qos2_release(struct mqtt_client *client,
 		goto error;
 	}
 
-	err_code = publish_release_encode(param, &packet);
+	err_code = publish_release_encode(client, param, &packet);
 	if (err_code < 0) {
 		goto error;
 	}
@@ -420,7 +420,7 @@ int mqtt_publish_qos2_complete(struct mqtt_client *client,
 		goto error;
 	}
 
-	err_code = publish_complete_encode(param, &packet);
+	err_code = publish_complete_encode(client, param, &packet);
 	if (err_code < 0) {
 		goto error;
 	}
diff --git a/subsys/net/lib/mqtt/mqtt_decoder.c b/subsys/net/lib/mqtt/mqtt_decoder.c
index 9172d887378..6b3db4aab41 100644
--- a/subsys/net/lib/mqtt/mqtt_decoder.c
+++ b/subsys/net/lib/mqtt/mqtt_decoder.c
@@ -810,25 +810,132 @@ int publish_decode(const struct mqtt_client *client, uint8_t flags,
 	return 0;
 }
 
-int publish_ack_decode(struct buf_ctx *buf, struct mqtt_puback_param *param)
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static int common_ack_properties_decode(struct buf_ctx *buf,
+					struct mqtt_common_ack_properties *prop)
 {
-	return unpack_uint16(buf, &param->message_id);
+	struct property_decoder prop_dec[] = {
+		{
+			&prop->reason_string,
+			&prop->rx.has_reason_string,
+			MQTT_PROP_REASON_STRING
+		},
+		{
+			&prop->user_prop,
+			&prop->rx.has_user_prop,
+			MQTT_PROP_USER_PROPERTY
+		}
+	};
+
+	return properties_decode(prop_dec, ARRAY_SIZE(prop_dec), buf);
+}
+#else
+static int common_ack_properties_decode(struct buf_ctx *buf,
+					struct mqtt_common_ack_properties *prop)
+{
+	ARG_UNUSED(prop);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
 }
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 
-int publish_receive_decode(struct buf_ctx *buf, struct mqtt_pubrec_param *param)
+static int common_pub_ack_decode(struct buf_ctx *buf, uint16_t *message_id,
+				 uint8_t *reason_code,
+				 struct mqtt_common_ack_properties *prop)
 {
-	return unpack_uint16(buf, &param->message_id);
+	size_t remaining_len;
+	int err;
+
+	err = unpack_uint16(buf, message_id);
+	if (err < 0) {
+		return err;
+	}
+
+	remaining_len = buf->end - buf->cur;
+
+	/* For MQTT < 5.0 properties are NULL. */
+	if (prop != NULL && reason_code != NULL) {
+		if (remaining_len > 0) {
+			err = unpack_uint8(buf, reason_code);
+			if (err < 0) {
+				return err;
+			}
+		}
+
+		if (remaining_len > 1) {
+			err = common_ack_properties_decode(buf, prop);
+			if (err < 0) {
+				return err;
+			}
+		}
+	}
+
+	return 0;
 }
 
-int publish_release_decode(struct buf_ctx *buf, struct mqtt_pubrel_param *param)
+int publish_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
+		       struct mqtt_puback_param *param)
 {
-	return unpack_uint16(buf, &param->message_id);
+	struct mqtt_common_ack_properties *prop = NULL;
+	uint8_t *reason_code = NULL;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	if (mqtt_is_version_5_0(client)) {
+		prop = &param->prop;
+		reason_code = &param->reason_code;
+	}
+#endif
+
+	return common_pub_ack_decode(buf, &param->message_id, reason_code, prop);
+}
+
+int publish_receive_decode(const struct mqtt_client *client, struct buf_ctx *buf,
+			   struct mqtt_pubrec_param *param)
+{
+	struct mqtt_common_ack_properties *prop = NULL;
+	uint8_t *reason_code = NULL;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	if (mqtt_is_version_5_0(client)) {
+		prop = &param->prop;
+		reason_code = &param->reason_code;
+	}
+#endif
+
+	return common_pub_ack_decode(buf, &param->message_id, reason_code, prop);
 }
 
-int publish_complete_decode(struct buf_ctx *buf,
+int publish_release_decode(const struct mqtt_client *client, struct buf_ctx *buf,
+			   struct mqtt_pubrel_param *param)
+{
+	struct mqtt_common_ack_properties *prop = NULL;
+	uint8_t *reason_code = NULL;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	if (mqtt_is_version_5_0(client)) {
+		prop = &param->prop;
+		reason_code = &param->reason_code;
+	}
+#endif
+
+	return common_pub_ack_decode(buf, &param->message_id, reason_code, prop);
+}
+
+int publish_complete_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 			    struct mqtt_pubcomp_param *param)
 {
-	return unpack_uint16(buf, &param->message_id);
+	struct mqtt_common_ack_properties *prop = NULL;
+	uint8_t *reason_code = NULL;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	if (mqtt_is_version_5_0(client)) {
+		prop = &param->prop;
+		reason_code = &param->reason_code;
+	}
+#endif
+
+	return common_ack_decode(buf, &param->message_id, reason_code, prop);
 }
 
 int subscribe_ack_decode(struct buf_ctx *buf, struct mqtt_suback_param *param)
diff --git a/subsys/net/lib/mqtt/mqtt_encoder.c b/subsys/net/lib/mqtt/mqtt_encoder.c
index 68e432ebf4e..44733c4f2dd 100644
--- a/subsys/net/lib/mqtt/mqtt_encoder.c
+++ b/subsys/net/lib/mqtt/mqtt_encoder.c
@@ -242,40 +242,6 @@ static int zero_len_str_encode(struct buf_ctx *buf)
 	return pack_uint16(0x0000, buf);
 }
 
-/**
- * @brief Encodes and sends messages that contain only message id in
- *        the variable header.
- *
- * @param[in] message_type Message type and reserved bit fields.
- * @param[in] message_id Message id to be encoded in the variable header.
- * @param[inout] buf_ctx Pointer to the buffer context structure,
- *                       containing buffer for the encoded message.
- *
- * @retval 0 or an error code indicating a reason for failure.
- */
-static int mqtt_message_id_only_enc(uint8_t message_type, uint16_t message_id,
-				    struct buf_ctx *buf)
-{
-	int err_code;
-	uint8_t *start;
-
-	/* Message id zero is not permitted by spec. */
-	if (message_id == 0U) {
-		return -EINVAL;
-	}
-
-	/* Reserve space for fixed header. */
-	buf->cur += MQTT_FIXED_HEADER_MAX_SIZE;
-	start = buf->cur;
-
-	err_code = pack_uint16(message_id, buf);
-	if (err_code != 0) {
-		return err_code;
-	}
-
-	return mqtt_encode_fixed_header(message_type, start, buf);
-}
-
 #if defined(CONFIG_MQTT_VERSION_5_0)
 /**
  * @brief Packs unsigned 32 bit value to the buffer at the offset requested.
@@ -998,40 +964,189 @@ int publish_encode(const struct mqtt_client *client,
 	return 0;
 }
 
-int publish_ack_encode(const struct mqtt_puback_param *param,
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static uint32_t common_ack_properties_length(
+	const struct mqtt_common_ack_properties *prop)
+{
+	return user_properties_length(prop->user_prop) +
+	       string_property_length(&prop->reason_string);
+}
+
+static int common_ack_properties_encode(
+	const struct mqtt_common_ack_properties *prop,
+	struct buf_ctx *buf)
+{
+	uint32_t properties_len;
+	int err;
+
+	/* Precalculate total properties length */
+	properties_len = common_ack_properties_length(prop);
+	/* Properties length can be omitted if equal to 0. */
+	if (properties_len == 0) {
+		return 0;
+	}
+
+	err = pack_variable_int(properties_len, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_user_properties(prop->user_prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_string_property(MQTT_PROP_REASON_STRING,
+				     &prop->reason_string, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return 0;
+}
+#else /* CONFIG_MQTT_VERSION_5_0 */
+static uint32_t common_ack_properties_length(
+	const struct mqtt_common_ack_properties *prop)
+{
+	return 0;
+}
+
+static int common_ack_properties_encode(
+	const struct mqtt_common_ack_properties *prop,
+	struct buf_ctx *buf)
+{
+	ARG_UNUSED(prop);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
+static int common_ack_encode(
+	uint8_t message_type, uint16_t message_id,  uint8_t reason_code,
+	const struct mqtt_common_ack_properties *prop,
+	struct buf_ctx *buf)
+{
+	int err_code;
+	uint8_t *start;
+
+	/* Message id zero is not permitted by spec. */
+	if (message_id == 0U) {
+		return -EINVAL;
+	}
+
+	/* Reserve space for fixed header. */
+	buf->cur += MQTT_FIXED_HEADER_MAX_SIZE;
+	start = buf->cur;
+
+	err_code = pack_uint16(message_id, buf);
+	if (err_code != 0) {
+		return err_code;
+	}
+
+	/* For MQTT < 5.0 properties are NULL. */
+	if (prop != NULL) {
+		/* The Reason Code and Property Length can be omitted if the
+		 * Reason Code is 0x00 (Success) and there are no Properties.
+		 */
+		if (common_ack_properties_length(prop) == 0 &&
+		    reason_code == 0) {
+			goto out;
+		}
+
+		err_code = pack_uint8(reason_code, buf);
+		if (err_code != 0) {
+			return err_code;
+		}
+
+		err_code = common_ack_properties_encode(prop, buf);
+		if (err_code != 0) {
+			return err_code;
+		}
+	}
+
+out:
+	return mqtt_encode_fixed_header(message_type, start, buf);
+}
+
+int publish_ack_encode(const struct mqtt_client *client,
+		       const struct mqtt_puback_param *param,
 		       struct buf_ctx *buf)
 {
 	const uint8_t message_type =
 		MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_PUBACK, 0, 0, 0);
+	const struct mqtt_common_ack_properties *prop = NULL;
+	uint8_t reason_code = 0;
 
-	return mqtt_message_id_only_enc(message_type, param->message_id, buf);
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	if (mqtt_is_version_5_0(client)) {
+		prop = &param->prop;
+		reason_code = param->reason_code;
+	}
+#endif
+
+	return common_ack_encode(message_type, param->message_id,
+				 reason_code, prop, buf);
 }
 
-int publish_receive_encode(const struct mqtt_pubrec_param *param,
+int publish_receive_encode(const struct mqtt_client *client,
+			   const struct mqtt_pubrec_param *param,
 			   struct buf_ctx *buf)
 {
 	const uint8_t message_type =
 		MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_PUBREC, 0, 0, 0);
+	const struct mqtt_common_ack_properties *prop = NULL;
+	uint8_t reason_code = 0;
 
-	return mqtt_message_id_only_enc(message_type, param->message_id, buf);
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	if (mqtt_is_version_5_0(client)) {
+		prop = &param->prop;
+		reason_code = param->reason_code;
+	}
+#endif
+
+	return common_ack_encode(message_type, param->message_id,
+				 reason_code, prop, buf);
 }
 
-int publish_release_encode(const struct mqtt_pubrel_param *param,
+int publish_release_encode(const struct mqtt_client *client,
+			   const struct mqtt_pubrel_param *param,
 			   struct buf_ctx *buf)
 {
 	const uint8_t message_type =
 		MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_PUBREL, 0, 1, 0);
+	const struct mqtt_common_ack_properties *prop = NULL;
+	uint8_t reason_code = 0;
 
-	return mqtt_message_id_only_enc(message_type, param->message_id, buf);
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	if (mqtt_is_version_5_0(client)) {
+		prop = &param->prop;
+		reason_code = param->reason_code;
+	}
+#endif
+
+	return common_ack_encode(message_type, param->message_id,
+				 reason_code, prop, buf);
 }
 
-int publish_complete_encode(const struct mqtt_pubcomp_param *param,
+int publish_complete_encode(const struct mqtt_client *client,
+			    const struct mqtt_pubcomp_param *param,
 			    struct buf_ctx *buf)
 {
 	const uint8_t message_type =
 		MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_PUBCOMP, 0, 0, 0);
+	const struct mqtt_common_ack_properties *prop = NULL;
+	uint8_t reason_code = 0;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	if (mqtt_is_version_5_0(client)) {
+		prop = &param->prop;
+		reason_code = param->reason_code;
+	}
+#endif
 
-	return mqtt_message_id_only_enc(message_type, param->message_id, buf);
+	return common_ack_encode(message_type, param->message_id,
+				 reason_code, prop, buf);
 }
 
 int disconnect_encode(struct buf_ctx *buf)
diff --git a/subsys/net/lib/mqtt/mqtt_internal.h b/subsys/net/lib/mqtt/mqtt_internal.h
index e4ced482a73..80af6c981d7 100644
--- a/subsys/net/lib/mqtt/mqtt_internal.h
+++ b/subsys/net/lib/mqtt/mqtt_internal.h
@@ -238,7 +238,8 @@ int publish_encode(const struct mqtt_client *client,
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_ack_encode(const struct mqtt_puback_param *param,
+int publish_ack_encode(const struct mqtt_client *client,
+		       const struct mqtt_puback_param *param,
 		       struct buf_ctx *buf);
 
 /**@brief Constructs/encodes Publish Receive packet.
@@ -251,7 +252,8 @@ int publish_ack_encode(const struct mqtt_puback_param *param,
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_receive_encode(const struct mqtt_pubrec_param *param,
+int publish_receive_encode(const struct mqtt_client *client,
+			   const struct mqtt_pubrec_param *param,
 			   struct buf_ctx *buf);
 
 /**@brief Constructs/encodes Publish Release packet.
@@ -264,7 +266,8 @@ int publish_receive_encode(const struct mqtt_pubrec_param *param,
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_release_encode(const struct mqtt_pubrel_param *param,
+int publish_release_encode(const struct mqtt_client *client,
+			   const struct mqtt_pubrel_param *param,
 			   struct buf_ctx *buf);
 
 /**@brief Constructs/encodes Publish Complete packet.
@@ -277,7 +280,8 @@ int publish_release_encode(const struct mqtt_pubrel_param *param,
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_complete_encode(const struct mqtt_pubcomp_param *param,
+int publish_complete_encode(const struct mqtt_client *client,
+			    const struct mqtt_pubcomp_param *param,
 			    struct buf_ctx *buf);
 
 /**@brief Constructs/encodes Disconnect packet.
@@ -369,45 +373,50 @@ int publish_decode(const struct mqtt_client *client, uint8_t flags,
 
 /**@brief Decode MQTT Publish Ack packet.
  *
+ * @param[in] MQTT client for which packet is decoded.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
  *                   buffer position.
  * @param[out] param Pointer to buffer for decoded Publish Ack parameters.
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_ack_decode(struct buf_ctx *buf, struct mqtt_puback_param *param);
+int publish_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
+		       struct mqtt_puback_param *param);
 
 /**@brief Decode MQTT Publish Receive packet.
  *
+ * @param[in] MQTT client for which packet is decoded.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
  *                   buffer position.
  * @param[out] param Pointer to buffer for decoded Publish Receive parameters.
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_receive_decode(struct buf_ctx *buf,
+int publish_receive_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 			   struct mqtt_pubrec_param *param);
 
 /**@brief Decode MQTT Publish Release packet.
  *
+ * @param[in] MQTT client for which packet is decoded.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
  *                   buffer position.
  * @param[out] param Pointer to buffer for decoded Publish Release parameters.
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_release_decode(struct buf_ctx *buf,
+int publish_release_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 			   struct mqtt_pubrel_param *param);
 
 /**@brief Decode MQTT Publish Complete packet.
  *
+ * @param[in] MQTT client for which packet is decoded.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
  *                   buffer position.
  * @param[out] param Pointer to buffer for decoded Publish Complete parameters.
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_complete_decode(struct buf_ctx *buf,
+int publish_complete_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 			    struct mqtt_pubcomp_param *param);
 
 /**@brief Decode MQTT Subscribe packet.
diff --git a/subsys/net/lib/mqtt/mqtt_rx.c b/subsys/net/lib/mqtt/mqtt_rx.c
index e23e726ed12..15dfca8bc85 100644
--- a/subsys/net/lib/mqtt/mqtt_rx.c
+++ b/subsys/net/lib/mqtt/mqtt_rx.c
@@ -78,7 +78,7 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 		NET_DBG("[CID %p]: Received MQTT_PKT_TYPE_PUBACK!", client);
 
 		evt.type = MQTT_EVT_PUBACK;
-		err_code = publish_ack_decode(buf, &evt.param.puback);
+		err_code = publish_ack_decode(client, buf, &evt.param.puback);
 		evt.result = err_code;
 		break;
 
@@ -86,7 +86,8 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 		NET_DBG("[CID %p]: Received MQTT_PKT_TYPE_PUBREC!", client);
 
 		evt.type = MQTT_EVT_PUBREC;
-		err_code = publish_receive_decode(buf, &evt.param.pubrec);
+		err_code = publish_receive_decode(client, buf,
+						  &evt.param.pubrec);
 		evt.result = err_code;
 		break;
 
@@ -94,7 +95,8 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 		NET_DBG("[CID %p]: Received MQTT_PKT_TYPE_PUBREL!", client);
 
 		evt.type = MQTT_EVT_PUBREL;
-		err_code = publish_release_decode(buf, &evt.param.pubrel);
+		err_code = publish_release_decode(client, buf,
+						  &evt.param.pubrel);
 		evt.result = err_code;
 		break;
 
@@ -102,7 +104,8 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 		NET_DBG("[CID %p]: Received MQTT_PKT_TYPE_PUBCOMP!", client);
 
 		evt.type = MQTT_EVT_PUBCOMP;
-		err_code = publish_complete_decode(buf, &evt.param.pubcomp);
+		err_code = publish_complete_decode(client, buf,
+						   &evt.param.pubcomp);
 		evt.result = err_code;
 		break;
 
diff --git a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
index ae45bb026e3..3e1ab19cf59 100644
--- a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
+++ b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
@@ -927,7 +927,7 @@ static int eval_msg_puback(struct mqtt_test *mqtt_test)
 	buf.cur = client.tx_buf;
 	buf.end = client.tx_buf + client.tx_buf_size;
 
-	rc = publish_ack_encode(param, &buf);
+	rc = publish_ack_encode(&client, param, &buf);
 
 	/**TESTPOINTS: Check publish_ack_encode functions*/
 	zassert_false(rc, "publish_ack_encode failed");
@@ -940,7 +940,7 @@ static int eval_msg_puback(struct mqtt_test *mqtt_test)
 
 	zassert_false(rc, "fixed_header_decode failed");
 
-	rc = publish_ack_decode(&buf, &dec_param);
+	rc = publish_ack_decode(&client, &buf, &dec_param);
 
 	zassert_false(rc, "publish_ack_decode failed");
 
@@ -965,7 +965,7 @@ static int eval_msg_pubcomp(struct mqtt_test *mqtt_test)
 	buf.cur = client.tx_buf;
 	buf.end = client.tx_buf + client.tx_buf_size;
 
-	rc = publish_complete_encode(param, &buf);
+	rc = publish_complete_encode(&client, param, &buf);
 
 	/**TESTPOINTS: Check publish_complete_encode functions*/
 	zassert_false(rc, "publish_complete_encode failed");
@@ -978,7 +978,7 @@ static int eval_msg_pubcomp(struct mqtt_test *mqtt_test)
 
 	zassert_false(rc, "fixed_header_decode failed");
 
-	rc = publish_complete_decode(&buf, &dec_param);
+	rc = publish_complete_decode(&client, &buf, &dec_param);
 
 	zassert_false(rc, "publish_complete_decode failed");
 
@@ -1003,7 +1003,7 @@ static int eval_msg_pubrec(struct mqtt_test *mqtt_test)
 	buf.cur = client.tx_buf;
 	buf.end = client.tx_buf + client.tx_buf_size;
 
-	rc = publish_receive_encode(param, &buf);
+	rc = publish_receive_encode(&client, param, &buf);
 
 	/**TESTPOINTS: Check publish_receive_encode functions*/
 	zassert_false(rc, "publish_receive_encode failed");
@@ -1016,7 +1016,7 @@ static int eval_msg_pubrec(struct mqtt_test *mqtt_test)
 
 	zassert_false(rc, "fixed_header_decode failed");
 
-	rc = publish_receive_decode(&buf, &dec_param);
+	rc = publish_receive_decode(&client, &buf, &dec_param);
 
 	zassert_false(rc, "publish_receive_decode failed");
 
@@ -1041,7 +1041,7 @@ static int eval_msg_pubrel(struct mqtt_test *mqtt_test)
 	buf.cur = client.tx_buf;
 	buf.end = client.tx_buf + client.tx_buf_size;
 
-	rc = publish_release_encode(param, &buf);
+	rc = publish_release_encode(&client, param, &buf);
 
 	/**TESTPOINTS: Check publish_release_encode functions*/
 	zassert_false(rc, "publish_release_encode failed");
@@ -1054,7 +1054,7 @@ static int eval_msg_pubrel(struct mqtt_test *mqtt_test)
 
 	zassert_false(rc, "fixed_header_decode failed");
 
-	rc = publish_release_decode(&buf, &dec_param);
+	rc = publish_release_decode(&client, &buf, &dec_param);
 
 	zassert_false(rc, "publish_release_decode failed");
 

From ef64e186637802fe8765e2647269e5a7709161be Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 19 Dec 2024 16:09:09 +0100
Subject: [PATCH 2758/2913] [nrf fromtree] net: mqtt: Add MQTT 5.0 support for
 SUBSCRIBE/UNSUBSCRIBE

Add support for SUBSCRIBE/UNSUBSCRIBE messages specified in MQTT 5.0.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit efd795b06627eb8c8aef50f03168d9a76b675196)
---
 include/zephyr/net/mqtt.h                     |  15 +-
 subsys/net/lib/mqtt/mqtt.c                    |   4 +-
 subsys/net/lib/mqtt/mqtt_encoder.c            | 130 +++++++++++++++++-
 subsys/net/lib/mqtt/mqtt_internal.h           |   6 +-
 .../mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c |   2 +-
 5 files changed, 149 insertions(+), 8 deletions(-)

diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index fcbf0a20b4c..a8ed29e7b33 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -493,7 +493,7 @@ struct mqtt_publish_param {
 #endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
-/** @brief List of topics in a subscription request. */
+/** @brief Parameters for subscribe/unsubscribe message. */
 struct mqtt_subscription_list {
 	/** Array containing topics along with QoS for each. */
 	struct mqtt_topic *list;
@@ -503,6 +503,19 @@ struct mqtt_subscription_list {
 
 	/** Message id used to identify subscription request. */
 	uint16_t message_id;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	/** MQTT 5.0 properties. */
+	struct {
+		/** MQTT 5.0, chapter 3.8.2.1.3 / 3.10.2.1.2 User Property. */
+		struct mqtt_utf8_pair user_prop[CONFIG_MQTT_USER_PROPERTIES_MAX];
+
+		/** MQTT 5.0, chapter 3.8.2.1.2 Subscription Identifier.
+		 *  Ignored for UNSUBSCRIBE requests.
+		 */
+		uint32_t subscription_identifier;
+	} prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /**
diff --git a/subsys/net/lib/mqtt/mqtt.c b/subsys/net/lib/mqtt/mqtt.c
index a1194f479b2..11861247c37 100644
--- a/subsys/net/lib/mqtt/mqtt.c
+++ b/subsys/net/lib/mqtt/mqtt.c
@@ -495,7 +495,7 @@ int mqtt_subscribe(struct mqtt_client *client,
 		goto error;
 	}
 
-	err_code = subscribe_encode(param, &packet);
+	err_code = subscribe_encode(client, param, &packet);
 	if (err_code < 0) {
 		goto error;
 	}
@@ -529,7 +529,7 @@ int mqtt_unsubscribe(struct mqtt_client *client,
 		goto error;
 	}
 
-	err_code = unsubscribe_encode(param, &packet);
+	err_code = unsubscribe_encode(client, param, &packet);
 	if (err_code < 0) {
 		goto error;
 	}
diff --git a/subsys/net/lib/mqtt/mqtt_encoder.c b/subsys/net/lib/mqtt/mqtt_encoder.c
index 44733c4f2dd..44cbb2ba7ac 100644
--- a/subsys/net/lib/mqtt/mqtt_encoder.c
+++ b/subsys/net/lib/mqtt/mqtt_encoder.c
@@ -383,6 +383,32 @@ static int encode_uint32_property(uint8_t prop, uint32_t value,
 	return pack_uint32(value, buf);
 }
 
+static size_t var_int_property_length(uint32_t value)
+{
+	if (value == 0) {
+		return 0;
+	}
+
+	return sizeof(uint8_t) + (size_t)pack_variable_int(value, NULL);
+}
+
+static int encode_var_int_property(uint8_t prop, uint32_t value,
+				   struct buf_ctx *buf)
+{
+	int err;
+
+	if (value == 0) {
+		return 0;
+	}
+
+	err = pack_uint8(prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return pack_variable_int(value, buf);
+}
+
 static size_t string_property_length(const struct mqtt_utf8 *str)
 {
 	if (str->size == 0) {
@@ -1164,7 +1190,54 @@ int disconnect_encode(struct buf_ctx *buf)
 	return 0;
 }
 
-int subscribe_encode(const struct mqtt_subscription_list *param,
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static uint32_t subscribe_properties_length(
+			const struct mqtt_subscription_list *param)
+{
+	return var_int_property_length(param->prop.subscription_identifier) +
+	       user_properties_length(param->prop.user_prop);
+}
+
+static int subscribe_properties_encode(const struct mqtt_subscription_list *param,
+				       struct buf_ctx *buf)
+{
+	uint32_t properties_len;
+	int err;
+
+	/* Precalculate total properties length */
+	properties_len = subscribe_properties_length(param);
+	err = pack_variable_int(properties_len, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_var_int_property(MQTT_PROP_SUBSCRIPTION_IDENTIFIER,
+				      param->prop.subscription_identifier,
+				      buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_user_properties(param->prop.user_prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return 0;
+}
+#else
+static int subscribe_properties_encode(const struct mqtt_subscription_list *param,
+				       struct buf_ctx *buf)
+{
+	ARG_UNUSED(param);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
+int subscribe_encode(const struct mqtt_client *client,
+		     const struct mqtt_subscription_list *param,
 		     struct buf_ctx *buf)
 {
 	const uint8_t message_type = MQTT_MESSAGES_OPTIONS(
@@ -1186,6 +1259,13 @@ int subscribe_encode(const struct mqtt_subscription_list *param,
 		return err_code;
 	}
 
+	if (mqtt_is_version_5_0(client)) {
+		err_code = subscribe_properties_encode(param, buf);
+		if (err_code != 0) {
+			return err_code;
+		}
+	}
+
 	for (i = 0; i < param->list_count; i++) {
 		err_code = pack_utf8_str(&param->list[i].topic, buf);
 		if (err_code != 0) {
@@ -1201,7 +1281,46 @@ int subscribe_encode(const struct mqtt_subscription_list *param,
 	return mqtt_encode_fixed_header(message_type, start, buf);
 }
 
-int unsubscribe_encode(const struct mqtt_subscription_list *param,
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static uint32_t unsubscribe_properties_length(
+			const struct mqtt_subscription_list *param)
+{
+	return user_properties_length(param->prop.user_prop);
+}
+
+static int unsubscribe_properties_encode(
+		const struct mqtt_subscription_list *param, struct buf_ctx *buf)
+{
+	uint32_t properties_len;
+	int err;
+
+	/* Precalculate total properties length */
+	properties_len = unsubscribe_properties_length(param);
+	err = pack_variable_int(properties_len, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_user_properties(param->prop.user_prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return 0;
+}
+#else
+static int unsubscribe_properties_encode(
+		const struct mqtt_subscription_list *param, struct buf_ctx *buf)
+{
+	ARG_UNUSED(param);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
+int unsubscribe_encode(const struct mqtt_client *client,
+		       const struct mqtt_subscription_list *param,
 		       struct buf_ctx *buf)
 {
 	const uint8_t message_type = MQTT_MESSAGES_OPTIONS(
@@ -1218,6 +1337,13 @@ int unsubscribe_encode(const struct mqtt_subscription_list *param,
 		return err_code;
 	}
 
+	if (mqtt_is_version_5_0(client)) {
+		err_code = unsubscribe_properties_encode(param, buf);
+		if (err_code != 0) {
+			return err_code;
+		}
+	}
+
 	for (i = 0; i < param->list_count; i++) {
 		err_code = pack_utf8_str(&param->list[i].topic, buf);
 		if (err_code != 0) {
diff --git a/subsys/net/lib/mqtt/mqtt_internal.h b/subsys/net/lib/mqtt/mqtt_internal.h
index 80af6c981d7..f6874cc56d8 100644
--- a/subsys/net/lib/mqtt/mqtt_internal.h
+++ b/subsys/net/lib/mqtt/mqtt_internal.h
@@ -305,7 +305,8 @@ int disconnect_encode(struct buf_ctx *buf);
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int subscribe_encode(const struct mqtt_subscription_list *param,
+int subscribe_encode(const struct mqtt_client *client,
+		     const struct mqtt_subscription_list *param,
 		     struct buf_ctx *buf);
 
 /**@brief Constructs/encodes Unsubscribe packet.
@@ -318,7 +319,8 @@ int subscribe_encode(const struct mqtt_subscription_list *param,
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int unsubscribe_encode(const struct mqtt_subscription_list *param,
+int unsubscribe_encode(const struct mqtt_client *client,
+		       const struct mqtt_subscription_list *param,
 		       struct buf_ctx *buf);
 
 /**@brief Constructs/encodes Ping Request packet.
diff --git a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
index 3e1ab19cf59..2af20e258fa 100644
--- a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
+++ b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
@@ -846,7 +846,7 @@ static int eval_msg_subscribe(struct mqtt_test *mqtt_test)
 	buf.cur = client.tx_buf;
 	buf.end = client.tx_buf + client.tx_buf_size;
 
-	rc = subscribe_encode(param, &buf);
+	rc = subscribe_encode(&client, param, &buf);
 
 	/**TESTPOINT: Check subscribe_encode function*/
 	zassert_false(rc, "subscribe_encode failed");

From 6427aca42a779adacb7fb3d322756a85df640403 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 19 Dec 2024 16:09:09 +0100
Subject: [PATCH 2759/2913] [nrf fromtree] net: mqtt: Add MQTT 5.0 support for
 SUBACK/UNSUBACK

Add support for SUBACK/UNSUBACK messaged specified in MQTT 5.0.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 2459ffae4137acb0f8733b59190bb24c1c60cf49)
---
 include/zephyr/net/mqtt.h                     | 20 +++++-
 subsys/net/lib/mqtt/mqtt_decoder.c            | 68 +++++++++++++++++--
 subsys/net/lib/mqtt/mqtt_internal.h           |  6 +-
 subsys/net/lib/mqtt/mqtt_rx.c                 |  5 +-
 .../mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c |  4 +-
 5 files changed, 91 insertions(+), 12 deletions(-)

diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index a8ed29e7b33..270f002de80 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -411,16 +411,32 @@ struct mqtt_pubcomp_param {
 struct mqtt_suback_param {
 	/** Message id of the SUBSCRIBE message being acknowledged */
 	uint16_t message_id;
-	/** Return codes indicating maximum QoS level granted for each topic
-	 *  in the subscription list.
+
+	/** MQTT 3.1 - Return codes indicating maximum QoS level granted for
+	 *  each topic in the subscription list.
+	 *  MQTT 5.0 - Reason codes corresponding to each topic in the
+	 *  subscription list.
 	 */
 	struct mqtt_binstr return_codes;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	/** MQTT 5.0 properties. */
+	struct mqtt_common_ack_properties prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief Parameters for MQTT unsubscribe acknowledgment (UNSUBACK). */
 struct mqtt_unsuback_param {
 	/** Message id of the UNSUBSCRIBE message being acknowledged */
 	uint16_t message_id;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	/** Reason codes corresponding to each topic in the unsubscription list. */
+	struct mqtt_binstr reason_codes;
+
+	/** MQTT 5.0 properties. */
+	struct mqtt_common_ack_properties prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief Parameters for a publish message (PUBLISH). */
diff --git a/subsys/net/lib/mqtt/mqtt_decoder.c b/subsys/net/lib/mqtt/mqtt_decoder.c
index 6b3db4aab41..13f24670414 100644
--- a/subsys/net/lib/mqtt/mqtt_decoder.c
+++ b/subsys/net/lib/mqtt/mqtt_decoder.c
@@ -935,10 +935,28 @@ int publish_complete_decode(const struct mqtt_client *client, struct buf_ctx *bu
 	}
 #endif
 
-	return common_ack_decode(buf, &param->message_id, reason_code, prop);
+	return common_pub_ack_decode(buf, &param->message_id, reason_code, prop);
 }
 
-int subscribe_ack_decode(struct buf_ctx *buf, struct mqtt_suback_param *param)
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static int suback_properties_decode(struct buf_ctx *buf,
+				    struct mqtt_suback_param *param)
+{
+	return common_ack_properties_decode(buf, &param->prop);
+}
+#else
+static int suback_properties_decode(struct buf_ctx *buf,
+				    struct mqtt_suback_param *param)
+{
+	ARG_UNUSED(param);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
+int subscribe_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
+			 struct mqtt_suback_param *param)
 {
 	int err_code;
 
@@ -947,11 +965,53 @@ int subscribe_ack_decode(struct buf_ctx *buf, struct mqtt_suback_param *param)
 		return err_code;
 	}
 
+	if (mqtt_is_version_5_0(client)) {
+		err_code = suback_properties_decode(buf, param);
+		if (err_code < 0) {
+			return err_code;
+		}
+	}
+
 	return unpack_raw_data(buf->end - buf->cur, buf, &param->return_codes);
 }
 
-int unsubscribe_ack_decode(struct buf_ctx *buf,
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static int unsuback_5_0_decode(struct buf_ctx *buf,
+			       struct mqtt_unsuback_param *param)
+{
+	int err;
+
+	err = common_ack_properties_decode(buf, &param->prop);
+	if (err < 0) {
+		return err;
+	}
+
+	return unpack_raw_data(buf->end - buf->cur, buf, &param->reason_codes);
+}
+#else
+static int unsuback_5_0_decode(struct buf_ctx *buf,
+			       struct mqtt_unsuback_param *param)
+{
+	ARG_UNUSED(param);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
+int unsubscribe_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 			   struct mqtt_unsuback_param *param)
 {
-	return unpack_uint16(buf, &param->message_id);
+	int err;
+
+	err = unpack_uint16(buf, &param->message_id);
+	if (err < 0) {
+		return 0;
+	}
+
+	if (mqtt_is_version_5_0(client)) {
+		return unsuback_5_0_decode(buf, param);
+	}
+
+	return 0;
 }
diff --git a/subsys/net/lib/mqtt/mqtt_internal.h b/subsys/net/lib/mqtt/mqtt_internal.h
index f6874cc56d8..ab9fc9bc9c2 100644
--- a/subsys/net/lib/mqtt/mqtt_internal.h
+++ b/subsys/net/lib/mqtt/mqtt_internal.h
@@ -423,24 +423,26 @@ int publish_complete_decode(const struct mqtt_client *client, struct buf_ctx *bu
 
 /**@brief Decode MQTT Subscribe packet.
  *
+ * @param[in] MQTT client for which packet is decoded.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
  *                   buffer position.
  * @param[out] param Pointer to buffer for decoded Subscribe parameters.
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int subscribe_ack_decode(struct buf_ctx *buf,
+int subscribe_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 			 struct mqtt_suback_param *param);
 
 /**@brief Decode MQTT Unsubscribe packet.
  *
+ * @param[in] MQTT client for which packet is decoded.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
  *                   buffer position.
  * @param[out] param Pointer to buffer for decoded Unsubscribe parameters.
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int unsubscribe_ack_decode(struct buf_ctx *buf,
+int unsubscribe_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 			   struct mqtt_unsuback_param *param);
 
 /**
diff --git a/subsys/net/lib/mqtt/mqtt_rx.c b/subsys/net/lib/mqtt/mqtt_rx.c
index 15dfca8bc85..740987997bd 100644
--- a/subsys/net/lib/mqtt/mqtt_rx.c
+++ b/subsys/net/lib/mqtt/mqtt_rx.c
@@ -113,7 +113,7 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 		NET_DBG("[CID %p]: Received MQTT_PKT_TYPE_SUBACK!", client);
 
 		evt.type = MQTT_EVT_SUBACK;
-		err_code = subscribe_ack_decode(buf, &evt.param.suback);
+		err_code = subscribe_ack_decode(client, buf, &evt.param.suback);
 		evt.result = err_code;
 		break;
 
@@ -121,7 +121,8 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 		NET_DBG("[CID %p]: Received MQTT_PKT_TYPE_UNSUBACK!", client);
 
 		evt.type = MQTT_EVT_UNSUBACK;
-		err_code = unsubscribe_ack_decode(buf, &evt.param.unsuback);
+		err_code = unsubscribe_ack_decode(client, buf,
+						  &evt.param.unsuback);
 		evt.result = err_code;
 		break;
 
diff --git a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
index 2af20e258fa..d6f45ea56e1 100644
--- a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
+++ b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
@@ -874,7 +874,7 @@ static int eval_msg_suback(struct mqtt_test *mqtt_test)
 
 	zassert_false(rc, "fixed_header_decode failed");
 
-	rc = subscribe_ack_decode(&buf, &dec_param);
+	rc = subscribe_ack_decode(&client, &buf, &dec_param);
 
 	/**TESTPOINT: Check subscribe_ack_decode function*/
 	zassert_false(rc, "subscribe_ack_decode failed");
@@ -1083,7 +1083,7 @@ static int eval_msg_unsuback(struct mqtt_test *mqtt_test)
 
 	zassert_false(rc, "fixed_header_decode failed");
 
-	rc = unsubscribe_ack_decode(&buf, &dec_param);
+	rc = unsubscribe_ack_decode(&client, &buf, &dec_param);
 
 	zassert_false(rc, "unsubscribe_ack_decode failed");
 

From 9f6b55f8f06fff096abc8ea6b01634d43ec16a13 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 19 Dec 2024 16:09:11 +0100
Subject: [PATCH 2760/2913] [nrf fromtree] net: mqtt: Add MQTT 5.0 support for
 DISCONNECT

Add support for DICONNECT message specified in MQTT 5.0.
As with MQTT 5.0, the disconnect can now also be initiated by the
broker, it was needed to add decoder support for the message.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 55e1c108944a4fa01add8f24d731b3217a8a5877)
---
 include/zephyr/net/mqtt.h                     |  78 ++++++++++-
 samples/net/cloud/aws_iot_mqtt/src/main.c     |   2 +-
 samples/net/mqtt_publisher/src/main.c         |   2 +-
 .../src/mqtt_client.c                         |   2 +-
 subsys/net/lib/mqtt/mqtt.c                    |  22 ++--
 subsys/net/lib/mqtt/mqtt_decoder.c            |  64 +++++++++
 subsys/net/lib/mqtt/mqtt_encoder.c            | 122 +++++++++++++++++-
 subsys/net/lib/mqtt/mqtt_internal.h           |  28 +++-
 subsys/net/lib/mqtt/mqtt_rx.c                 |  18 +++
 subsys/shell/backends/shell_mqtt.c            |   2 +-
 .../lib/mqtt/v3_1_1/mqtt_client/src/main.c    |   2 +-
 .../mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c |   2 +-
 12 files changed, 320 insertions(+), 24 deletions(-)

diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index 270f002de80..373fe1e36e5 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -175,6 +175,39 @@ enum mqtt_suback_return_code {
 	MQTT_SUBACK_FAILURE = 0x80
 };
 
+/** @brief MQTT Disconnect reason codes (MQTT 5.0, chapter 3.14.2.1). */
+enum mqtt_disconnect_reason_code {
+	MQTT_DISCONNECT_NORMAL = 0,
+	MQTT_DISCONNECT_WITH_WILL_MSG = 4,
+	MQTT_DISCONNECT_UNSPECIFIED_ERROR = 128,
+	MQTT_DISCONNECT_MALFORMED_PACKET = 129,
+	MQTT_DISCONNECT_PROTOCOL_ERROR = 130,
+	MQTT_DISCONNECT_IMPL_SPECIFIC_ERROR = 131,
+	MQTT_DISCONNECT_NOT_AUTHORIZED = 135,
+	MQTT_DISCONNECT_SERVER_BUSY = 137,
+	MQTT_DISCONNECT_SERVER_SHUTTING_DOWN = 139,
+	MQTT_DISCONNECT_KEEP_ALIVE_TIMEOUT = 141,
+	MQTT_DISCONNECT_SESSION_TAKE_OVER = 142,
+	MQTT_DISCONNECT_TOPIC_FILTER_INVALID = 143,
+	MQTT_DISCONNECT_TOPIC_NAME_INVALID = 144,
+	MQTT_DISCONNECT_RECV_MAX_EXCEEDED = 147,
+	MQTT_DISCONNECT_TOPIC_ALIAS_INVALID = 148,
+	MQTT_DISCONNECT_PACKET_TOO_LARGE = 149,
+	MQTT_DISCONNECT_MESSAGE_RATE_TOO_HIGH = 150,
+	MQTT_DISCONNECT_QUOTA_EXCEEDED = 151,
+	MQTT_DISCONNECT_ADMIN_ACTION = 152,
+	MQTT_DISCONNECT_PAYLOAD_FORMAT_INVALID = 153,
+	MQTT_DISCONNECT_RETAIN_NOT_SUPPORTED = 154,
+	MQTT_DISCONNECT_QOS_NOT_SUPPORTED = 155,
+	MQTT_DISCONNECT_USE_ANOTHER_SERVER = 156,
+	MQTT_DISCONNECT_SERVER_MOVED = 157,
+	MQTT_DISCONNECT_SHARED_SUB_NOT_SUPPORTED = 158,
+	MQTT_DISCONNECT_CONNECTION_RATE_EXCEEDED = 159,
+	MQTT_DISCONNECT_MAX_CONNECT_TIME = 160,
+	MQTT_DISCONNECT_SUB_ID_NOT_SUPPORTED = 161,
+	MQTT_DISCONNECT_WILDCARD_SUB_NOT_SUPPORTED = 162,
+};
+
 /** @brief Abstracts UTF-8 encoded strings. */
 struct mqtt_utf8 {
 	const uint8_t *utf8;       /**< Pointer to UTF-8 string. */
@@ -534,6 +567,41 @@ struct mqtt_subscription_list {
 #endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
+/** @brief Parameters for disconnect message. */
+struct mqtt_disconnect_param {
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	/* MQTT 5.0 Disconnect reason code. */
+	enum mqtt_disconnect_reason_code reason_code;
+
+	/** MQTT 5.0 properties. */
+	struct {
+		/** MQTT 5.0, chapter 3.14.2.2.4 User Property. */
+		struct mqtt_utf8_pair user_prop[CONFIG_MQTT_USER_PROPERTIES_MAX];
+
+		/** MQTT 5.0, chapter 3.14.2.2.3 Reason String. */
+		struct mqtt_utf8 reason_string;
+
+		/** MQTT 5.0, chapter 3.14.2.2.5 Server Reference. */
+		struct mqtt_utf8 server_reference;
+
+		/** MQTT 5.0, chapter 3.14.2.2.2 Session Expiry Interval. */
+		uint32_t session_expiry_interval;
+
+		/** Flags indicating whether given property was present in received packet. */
+		struct {
+			/** Session Expiry Interval property was present. */
+			bool has_session_expiry_interval;
+			/** Reason String property was present. */
+			bool has_reason_string;
+			/** User Property property was present. */
+			bool has_user_prop;
+			/** Server Reference property was present. */
+			bool has_server_reference;
+		} rx;
+	} prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+};
+
 /**
  * @brief Defines event parameters notified along with asynchronous events
  *        to the application.
@@ -567,6 +635,11 @@ union mqtt_evt_param {
 
 	/** Parameters accompanying MQTT_EVT_UNSUBACK event. */
 	struct mqtt_unsuback_param unsuback;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	/** Parameters accompanying MQTT_EVT_DISCONNECT event. */
+	struct mqtt_disconnect_param disconnect;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief Defines MQTT asynchronous event notified to the application. */
@@ -1042,10 +1115,13 @@ int mqtt_ping(struct mqtt_client *client);
  *
  * @param[in] client Identifies client instance for which procedure is
  *                   requested.
+ * @param[in] param Optional Disconnect parameters. May be NULL.
+ *                  Ignored if MQTT 3.1.1 is used.
  *
  * @return 0 or a negative error code (errno.h) indicating reason of failure.
  */
-int mqtt_disconnect(struct mqtt_client *client);
+int mqtt_disconnect(struct mqtt_client *client,
+		    const struct mqtt_disconnect_param *param);
 
 /**
  * @brief API to abort MQTT connection. This will close the corresponding
diff --git a/samples/net/cloud/aws_iot_mqtt/src/main.c b/samples/net/cloud/aws_iot_mqtt/src/main.c
index c03f250bcaa..4bb226ea97a 100644
--- a/samples/net/cloud/aws_iot_mqtt/src/main.c
+++ b/samples/net/cloud/aws_iot_mqtt/src/main.c
@@ -413,7 +413,7 @@ void aws_client_loop(void)
 	}
 
 cleanup:
-	mqtt_disconnect(&client_ctx);
+	mqtt_disconnect(&client_ctx, NULL);
 
 	close(fds.fd);
 	fds.fd = -1;
diff --git a/samples/net/mqtt_publisher/src/main.c b/samples/net/mqtt_publisher/src/main.c
index faa96e33b5c..7ae967058e3 100644
--- a/samples/net/mqtt_publisher/src/main.c
+++ b/samples/net/mqtt_publisher/src/main.c
@@ -475,7 +475,7 @@ static int publisher(void)
 		r = 0;
 	}
 
-	rc = mqtt_disconnect(&client_ctx);
+	rc = mqtt_disconnect(&client_ctx, NULL);
 	PRINT_RESULT("mqtt_disconnect", rc);
 
 	LOG_INF("Bye!");
diff --git a/samples/net/secure_mqtt_sensor_actuator/src/mqtt_client.c b/samples/net/secure_mqtt_sensor_actuator/src/mqtt_client.c
index 3fdb6f3abf4..df515b2e5b2 100644
--- a/samples/net/secure_mqtt_sensor_actuator/src/mqtt_client.c
+++ b/samples/net/secure_mqtt_sensor_actuator/src/mqtt_client.c
@@ -402,7 +402,7 @@ void app_mqtt_run(struct mqtt_client *client)
 		}
 	}
 	/* Gracefully close connection */
-	mqtt_disconnect(client);
+	mqtt_disconnect(client, NULL);
 }
 
 void app_mqtt_connect(struct mqtt_client *client)
diff --git a/subsys/net/lib/mqtt/mqtt.c b/subsys/net/lib/mqtt/mqtt.c
index 11861247c37..e8f51bdbd79 100644
--- a/subsys/net/lib/mqtt/mqtt.c
+++ b/subsys/net/lib/mqtt/mqtt.c
@@ -46,8 +46,7 @@ void event_notify(struct mqtt_client *client, const struct mqtt_evt *evt)
 	}
 }
 
-static void client_disconnect(struct mqtt_client *client, int result,
-			      bool notify)
+void mqtt_client_disconnect(struct mqtt_client *client, int result, bool notify)
 {
 	int err_code;
 
@@ -105,7 +104,7 @@ static int client_connect(struct mqtt_client *client)
 	return 0;
 
 error:
-	client_disconnect(client, err_code, false);
+	mqtt_client_disconnect(client, err_code, false);
 	return err_code;
 }
 
@@ -119,7 +118,7 @@ static int client_read(struct mqtt_client *client)
 
 	err_code = mqtt_handle_rx(client);
 	if (err_code < 0) {
-		client_disconnect(client, err_code, true);
+		mqtt_client_disconnect(client, err_code, true);
 	}
 
 	return err_code;
@@ -136,7 +135,7 @@ static int client_write(struct mqtt_client *client, const uint8_t *data,
 	if (err_code < 0) {
 		NET_ERR("Transport write failed, err_code = %d, "
 			 "closing connection", err_code);
-		client_disconnect(client, err_code, true);
+		mqtt_client_disconnect(client, err_code, true);
 		return err_code;
 	}
 
@@ -157,7 +156,7 @@ static int client_write_msg(struct mqtt_client *client,
 	if (err_code < 0) {
 		NET_ERR("Transport write failed, err_code = %d, "
 			 "closing connection", err_code);
-		client_disconnect(client, err_code, true);
+		mqtt_client_disconnect(client, err_code, true);
 		return err_code;
 	}
 
@@ -439,7 +438,8 @@ int mqtt_publish_qos2_complete(struct mqtt_client *client,
 	return err_code;
 }
 
-int mqtt_disconnect(struct mqtt_client *client)
+int mqtt_disconnect(struct mqtt_client *client,
+		    const struct mqtt_disconnect_param *param)
 {
 	int err_code;
 	struct buf_ctx packet;
@@ -455,7 +455,7 @@ int mqtt_disconnect(struct mqtt_client *client)
 		goto error;
 	}
 
-	err_code = disconnect_encode(&packet);
+	err_code = disconnect_encode(client, param, &packet);
 	if (err_code < 0) {
 		goto error;
 	}
@@ -465,7 +465,7 @@ int mqtt_disconnect(struct mqtt_client *client)
 		goto error;
 	}
 
-	client_disconnect(client, 0, true);
+	mqtt_client_disconnect(client, 0, true);
 
 error:
 	mqtt_mutex_unlock(client);
@@ -584,7 +584,7 @@ int mqtt_abort(struct mqtt_client *client)
 	mqtt_mutex_lock(client);
 
 	if (client->internal.state != MQTT_STATE_IDLE) {
-		client_disconnect(client, -ECONNABORTED, true);
+		mqtt_client_disconnect(client, -ECONNABORTED, true);
 	}
 
 	mqtt_mutex_unlock(client);
@@ -686,7 +686,7 @@ static int read_publish_payload(struct mqtt_client *client, void *buffer,
 			ret = -ENOTCONN;
 		}
 
-		client_disconnect(client, ret, true);
+		mqtt_client_disconnect(client, ret, true);
 		goto exit;
 	}
 
diff --git a/subsys/net/lib/mqtt/mqtt_decoder.c b/subsys/net/lib/mqtt/mqtt_decoder.c
index 13f24670414..674d19798fc 100644
--- a/subsys/net/lib/mqtt/mqtt_decoder.c
+++ b/subsys/net/lib/mqtt/mqtt_decoder.c
@@ -1015,3 +1015,67 @@ int unsubscribe_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf
 
 	return 0;
 }
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static int disconnect_properties_decode(struct buf_ctx *buf,
+					struct mqtt_disconnect_param *param)
+{
+	struct property_decoder prop[] = {
+		{
+			&param->prop.session_expiry_interval,
+			&param->prop.rx.has_session_expiry_interval,
+			MQTT_PROP_SESSION_EXPIRY_INTERVAL
+		},
+		{
+			&param->prop.reason_string,
+			&param->prop.rx.has_reason_string,
+			MQTT_PROP_REASON_STRING
+		},
+		{
+			&param->prop.user_prop,
+			&param->prop.rx.has_user_prop,
+			MQTT_PROP_USER_PROPERTY
+		},
+		{
+			&param->prop.server_reference,
+			&param->prop.rx.has_server_reference,
+			MQTT_PROP_SERVER_REFERENCE
+		}
+	};
+
+	return properties_decode(prop, ARRAY_SIZE(prop), buf);
+}
+
+int disconnect_decode(const struct mqtt_client *client, struct buf_ctx *buf,
+		      struct mqtt_disconnect_param *param)
+{
+
+	size_t remaining_len;
+	uint8_t reason_code;
+	int err;
+
+	if (!mqtt_is_version_5_0(client)) {
+		return -ENOTSUP;
+	}
+
+	remaining_len = buf->end - buf->cur;
+
+	if (remaining_len > 0) {
+		err = unpack_uint8(buf, &reason_code);
+		if (err < 0) {
+			return err;
+		}
+
+		param->reason_code = reason_code;
+	}
+
+	if (remaining_len > 1) {
+		err = disconnect_properties_decode(buf, param);
+		if (err < 0) {
+			return err;
+		}
+	}
+
+	return 0;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
diff --git a/subsys/net/lib/mqtt/mqtt_encoder.c b/subsys/net/lib/mqtt/mqtt_encoder.c
index 44cbb2ba7ac..fc355570274 100644
--- a/subsys/net/lib/mqtt/mqtt_encoder.c
+++ b/subsys/net/lib/mqtt/mqtt_encoder.c
@@ -28,7 +28,7 @@ static const uint8_t ping_packet[MQTT_FIXED_HEADER_MIN_SIZE] = {
 };
 
 /** Never changing disconnect request. */
-static const uint8_t disc_packet[MQTT_FIXED_HEADER_MIN_SIZE] = {
+static const uint8_t empty_disc_packet[MQTT_FIXED_HEADER_MIN_SIZE] = {
 	MQTT_PKT_TYPE_DISCONNECT,
 	0x00
 };
@@ -1175,21 +1175,133 @@ int publish_complete_encode(const struct mqtt_client *client,
 				 reason_code, prop, buf);
 }
 
-int disconnect_encode(struct buf_ctx *buf)
+static int empty_disconnect_encode(struct buf_ctx *buf)
 {
 	uint8_t *cur = buf->cur;
 	uint8_t *end = buf->end;
 
-	if ((end - cur) < sizeof(disc_packet)) {
+	if ((end - cur) < sizeof(empty_disc_packet)) {
 		return -ENOMEM;
 	}
 
-	memcpy(cur, disc_packet, sizeof(disc_packet));
-	buf->end = (cur + sizeof(disc_packet));
+	memcpy(cur, empty_disc_packet, sizeof(empty_disc_packet));
+	buf->end = (cur + sizeof(empty_disc_packet));
 
 	return 0;
 }
 
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static uint32_t disconnect_properties_length(const struct mqtt_disconnect_param *param)
+{
+	return uint32_property_length(param->prop.session_expiry_interval) +
+	       string_property_length(&param->prop.reason_string) +
+	       user_properties_length(param->prop.user_prop) +
+	       string_property_length(&param->prop.server_reference);
+}
+
+static int disconnect_properties_encode(const struct mqtt_disconnect_param *param,
+					struct buf_ctx *buf)
+{
+	uint32_t properties_len;
+	int err;
+
+	/* Precalculate total properties length */
+	properties_len = disconnect_properties_length(param);
+	/* Disconnect properties length can be omitted if equal to 0. */
+	if (properties_len == 0) {
+		return 0;
+	}
+
+	err = pack_variable_int(properties_len, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint32_property(MQTT_PROP_SESSION_EXPIRY_INTERVAL,
+				     param->prop.session_expiry_interval, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_string_property(MQTT_PROP_REASON_STRING,
+				     &param->prop.reason_string, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_user_properties(param->prop.user_prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_string_property(MQTT_PROP_SERVER_REFERENCE,
+				     &param->prop.server_reference, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return 0;
+}
+
+static int disconnect_5_0_encode(const struct mqtt_disconnect_param *param,
+				 struct buf_ctx *buf)
+{
+	const uint8_t message_type =
+		MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_DISCONNECT, 0, 0, 0);
+	uint8_t *start;
+	int err;
+
+	/* The Reason Code and Property Length can be omitted if the Reason Code
+	 * is 0x00 (Normal disconnecton) and there are no Properties.
+	 */
+	if ((param->reason_code == MQTT_DISCONNECT_NORMAL) &&
+	    (disconnect_properties_length(param) == 0U)) {
+		return empty_disconnect_encode(buf);
+	}
+
+	/* Reserve space for fixed header. */
+	buf->cur += MQTT_FIXED_HEADER_MAX_SIZE;
+	start = buf->cur;
+
+	err = pack_uint8(param->reason_code, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = disconnect_properties_encode(param, buf);
+	if (err != 0) {
+		return err;
+	}
+
+	err = mqtt_encode_fixed_header(message_type, start, buf);
+	if (err != 0) {
+		return err;
+	}
+
+	return 0;
+}
+#else
+static int disconnect_5_0_encode(const struct mqtt_disconnect_param *param,
+				 struct buf_ctx *buf)
+{
+	ARG_UNUSED(param);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
+int disconnect_encode(const struct mqtt_client *client,
+		      const struct mqtt_disconnect_param *param,
+		      struct buf_ctx *buf)
+{
+	if (!mqtt_is_version_5_0(client) || param == NULL) {
+		return empty_disconnect_encode(buf);
+	}
+
+	return disconnect_5_0_encode(param, buf);
+}
+
 #if defined(CONFIG_MQTT_VERSION_5_0)
 static uint32_t subscribe_properties_length(
 			const struct mqtt_subscription_list *param)
diff --git a/subsys/net/lib/mqtt/mqtt_internal.h b/subsys/net/lib/mqtt/mqtt_internal.h
index ab9fc9bc9c2..7eee82f9f1e 100644
--- a/subsys/net/lib/mqtt/mqtt_internal.h
+++ b/subsys/net/lib/mqtt/mqtt_internal.h
@@ -197,6 +197,16 @@ void event_notify(struct mqtt_client *client, const struct mqtt_evt *evt);
  */
 int mqtt_handle_rx(struct mqtt_client *client);
 
+/**@brief Disconnect MQTT client.
+ *
+ * @param[in] client Identifies the client which disconnects.
+ * @param[in] result Disconnect reason.
+ * @param[in] notify Whether to notify the app or not.
+
+ * @return 0 if the procedure is successful, an error code otherwise.
+ */
+void mqtt_client_disconnect(struct mqtt_client *client, int result, bool notify);
+
 /**@brief Constructs/encodes Connect packet.
  *
  * @param[in] client Identifies the client for which the procedure is requested.
@@ -293,7 +303,9 @@ int publish_complete_encode(const struct mqtt_client *client,
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int disconnect_encode(struct buf_ctx *buf);
+int disconnect_encode(const struct mqtt_client *client,
+		      const struct mqtt_disconnect_param *param,
+		      struct buf_ctx *buf);
 
 /**@brief Constructs/encodes Subscribe packet.
  *
@@ -445,6 +457,20 @@ int subscribe_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 int unsubscribe_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 			   struct mqtt_unsuback_param *param);
 
+#if defined(CONFIG_MQTT_VERSION_5_0)
+/**@brief Decode MQTT Disconnect packet.
+ *
+ * @param[in] MQTT client for which packet is decoded.
+ * @param[inout] buf A pointer to the buf_ctx structure containing current
+ *                   buffer position.
+ * @param[out] param Pointer to buffer for decoded Disconnect parameters.
+ *
+ * @return 0 if the procedure is successful, an error code otherwise.
+ */
+int disconnect_decode(const struct mqtt_client *client, struct buf_ctx *buf,
+		      struct mqtt_disconnect_param *param);
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
 /**
  * @brief Unpacks variable length integer from the buffer from the offset
  *        requested.
diff --git a/subsys/net/lib/mqtt/mqtt_rx.c b/subsys/net/lib/mqtt/mqtt_rx.c
index 740987997bd..0c33f66c2cb 100644
--- a/subsys/net/lib/mqtt/mqtt_rx.c
+++ b/subsys/net/lib/mqtt/mqtt_rx.c
@@ -139,6 +139,24 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 		evt.type = MQTT_EVT_PINGRESP;
 		break;
 
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	case MQTT_PKT_TYPE_DISCONNECT:
+		evt.type = MQTT_EVT_DISCONNECT;
+		err_code = disconnect_decode(client, buf, &evt.param.disconnect);
+		if (err_code == 0) {
+			evt.result = evt.param.disconnect.reason_code;
+			/* Don't notify yet, the code below will handle this. */
+			mqtt_client_disconnect(client, evt.result, false);
+		} else {
+			/* Again, don't notify yet, error handling code will
+			 * disconnect and report error.
+			 */
+			notify_event = false;
+		}
+
+		break;
+#endif
+
 	default:
 		/* Nothing to notify. */
 		notify_event = false;
diff --git a/subsys/shell/backends/shell_mqtt.c b/subsys/shell/backends/shell_mqtt.c
index 9b474436fd4..d94c43f144e 100644
--- a/subsys/shell/backends/shell_mqtt.c
+++ b/subsys/shell/backends/shell_mqtt.c
@@ -166,7 +166,7 @@ static void sh_mqtt_close_and_cleanup(void)
 	 */
 	if ((sh_mqtt->network_state == SHELL_MQTT_NETWORK_CONNECTED) &&
 	    (sh_mqtt->transport_state == SHELL_MQTT_TRANSPORT_CONNECTED)) {
-		rc = mqtt_disconnect(&sh_mqtt->mqtt_cli);
+		rc = mqtt_disconnect(&sh_mqtt->mqtt_cli, NULL);
 	}
 
 	/* If network/mqtt disconnected, or mqtt_disconnect failed, do mqtt_abort */
diff --git a/tests/net/lib/mqtt/v3_1_1/mqtt_client/src/main.c b/tests/net/lib/mqtt/v3_1_1/mqtt_client/src/main.c
index 12c9eb31740..164546161c7 100644
--- a/tests/net/lib/mqtt/v3_1_1/mqtt_client/src/main.c
+++ b/tests/net/lib/mqtt/v3_1_1/mqtt_client/src/main.c
@@ -693,7 +693,7 @@ static void test_disconnect(void)
 {
 	int ret;
 
-	ret = mqtt_disconnect(&client_ctx);
+	ret = mqtt_disconnect(&client_ctx, NULL);
 	zassert_ok(ret, "MQTT client failed to disconnect (%d)", ret);
 	broker_process(MQTT_PKT_TYPE_DISCONNECT);
 
diff --git a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
index d6f45ea56e1..6a47b4c3a81 100644
--- a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
+++ b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
@@ -746,7 +746,7 @@ static int eval_msg_disconnect(struct mqtt_test *mqtt_test)
 	buf.cur = client.tx_buf;
 	buf.end = client.tx_buf + client.tx_buf_size;
 
-	rc = disconnect_encode(&buf);
+	rc = disconnect_encode(&client, NULL, &buf);
 
 	/**TESTPOINTS: Check disconnect_encode functions*/
 	zassert_false(rc, "disconnect_encode failed");

From 5f8ba7d8d83d5e988204d3e1aa5b630bec968fb3 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 19 Dec 2024 16:09:12 +0100
Subject: [PATCH 2761/2913] [nrf fromtree] net: mqtt: Add support for MQTT 5.0
 AUTH packet

Add support for a new AUTH message introduced in MQTT 5.0.
This is a new mechanism specified by MQTT 5.0, which allows clients and
brokers for enhanced authentication in between CONNECT and CONNACK
exchange. An additional MQTT event (MQTT_EVT_AUTH) was specified which
is triggered when the AUTH packet arrives from the broker.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 1d743fa65ac6f19dc690e1c9dda757b5b322ee1c)
---
 include/zephyr/net/mqtt.h           |  60 ++++++++++++++++
 subsys/net/lib/mqtt/mqtt.c          |  52 ++++++++++++++
 subsys/net/lib/mqtt/mqtt_decoder.c  |  61 ++++++++++++++++
 subsys/net/lib/mqtt/mqtt_encoder.c  | 106 ++++++++++++++++++++++++++++
 subsys/net/lib/mqtt/mqtt_internal.h |  27 +++++++
 subsys/net/lib/mqtt/mqtt_rx.c       |  11 +++
 6 files changed, 317 insertions(+)

diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index 373fe1e36e5..c6892aa904b 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -79,6 +79,9 @@ enum mqtt_evt_type {
 
 	/** Ping Response from server. */
 	MQTT_EVT_PINGRESP,
+
+	/** Authentication packet received from server. MQTT 5.0 only. */
+	MQTT_EVT_AUTH,
 };
 
 /** @brief MQTT version protocol level. */
@@ -208,6 +211,13 @@ enum mqtt_disconnect_reason_code {
 	MQTT_DISCONNECT_WILDCARD_SUB_NOT_SUPPORTED = 162,
 };
 
+/** @brief MQTT Authenticate reason codes (MQTT 5.0, chapter 3.15.2.1). */
+enum mqtt_auth_reason_code {
+	MQTT_AUTH_SUCCESS = 0,
+	MQTT_AUTH_CONTINUE_AUTHENTICATION = 24,
+	MQTT_AUTH_RE_AUTHENTICATE = 25,
+};
+
 /** @brief Abstracts UTF-8 encoded strings. */
 struct mqtt_utf8 {
 	const uint8_t *utf8;       /**< Pointer to UTF-8 string. */
@@ -602,6 +612,39 @@ struct mqtt_disconnect_param {
 #endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
+#if defined(CONFIG_MQTT_VERSION_5_0)
+struct mqtt_auth_param {
+	/* MQTT 5.0, chapter 3.15.2.1 Authenticate Reason Code */
+	enum mqtt_auth_reason_code reason_code;
+
+	struct {
+		/** MQTT 5.0, chapter 3.15.2.2.5 User Property. */
+		struct mqtt_utf8_pair user_prop[CONFIG_MQTT_USER_PROPERTIES_MAX];
+
+		/** MQTT 5.0, chapter 3.15.2.2.2 Authentication Method. */
+		struct mqtt_utf8 auth_method;
+
+		/** MQTT 5.0, chapter 3.15.2.2.3 Authentication Data. */
+		struct mqtt_binstr auth_data;
+
+		/** MQTT 5.0, chapter 3.15.2.2.4 Reason String. */
+		struct mqtt_utf8 reason_string;
+
+		/** Flags indicating whether given property was present in received packet. */
+		struct {
+			/** Authentication Method property was present. */
+			bool has_auth_method;
+			/** Authentication Data property was present. */
+			bool has_auth_data;
+			/** Reason String property was present. */
+			bool has_reason_string;
+			/** User Property property was present. */
+			bool has_user_prop;
+		} rx;
+	} prop;
+};
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
 /**
  * @brief Defines event parameters notified along with asynchronous events
  *        to the application.
@@ -639,6 +682,9 @@ union mqtt_evt_param {
 #if defined(CONFIG_MQTT_VERSION_5_0)
 	/** Parameters accompanying MQTT_EVT_DISCONNECT event. */
 	struct mqtt_disconnect_param disconnect;
+
+	/** Parameters accompanying MQTT_EVT_AUTH event. */
+	struct mqtt_auth_param auth;
 #endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
@@ -1123,6 +1169,20 @@ int mqtt_ping(struct mqtt_client *client);
 int mqtt_disconnect(struct mqtt_client *client,
 		    const struct mqtt_disconnect_param *param);
 
+#if defined(CONFIG_MQTT_VERSION_5_0)
+/**
+ * @brief API to send an authentication packet to the server.
+ *
+ * @param[in] client Client instance for which the procedure is requested.
+ *                   Shall not be NULL.
+ * @param[in] param Parameters to be used for the auth message.
+ *                  Shall not be NULL.
+ *
+ * @return 0 or a negative error code (errno.h) indicating reason of failure.
+ */
+int mqtt_auth(struct mqtt_client *client, const struct mqtt_auth_param *param);
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
 /**
  * @brief API to abort MQTT connection. This will close the corresponding
  *        transport without closing the connection gracefully at the MQTT level
diff --git a/subsys/net/lib/mqtt/mqtt.c b/subsys/net/lib/mqtt/mqtt.c
index e8f51bdbd79..d5cc23571ef 100644
--- a/subsys/net/lib/mqtt/mqtt.c
+++ b/subsys/net/lib/mqtt/mqtt.c
@@ -577,6 +577,58 @@ int mqtt_ping(struct mqtt_client *client)
 	return err_code;
 }
 
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static int verify_auth_state(const struct mqtt_client *client)
+{
+	/* Enhanced authentication is only allowed when connecting at MQTT
+	 * level (before CONNACK is received).
+	 */
+	if (MQTT_HAS_STATE(client, MQTT_STATE_TCP_CONNECTED) &&
+	    !MQTT_HAS_STATE(client, MQTT_STATE_CONNECTED)) {
+		return 0;
+	}
+
+	/* Return generic protocol error */
+	return -EPROTO;
+}
+
+int mqtt_auth(struct mqtt_client *client, const struct mqtt_auth_param *param)
+{
+	int err_code;
+	struct buf_ctx packet;
+
+	NULL_PARAM_CHECK(client);
+	NULL_PARAM_CHECK(param);
+
+	mqtt_mutex_lock(client);
+
+	if (!mqtt_is_version_5_0(client)) {
+		NET_ERR("Auth packet only supported in MQTT 5.0");
+		err_code = -ENOTSUP;
+		goto error;
+	}
+
+	tx_buf_init(client, &packet);
+
+	err_code = verify_auth_state(client);
+	if (err_code < 0) {
+		goto error;
+	}
+
+	err_code = auth_encode(param, &packet);
+	if (err_code < 0) {
+		goto error;
+	}
+
+	err_code = client_write(client, packet.cur, packet.end - packet.cur);
+
+error:
+	mqtt_mutex_unlock(client);
+
+	return err_code;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
 int mqtt_abort(struct mqtt_client *client)
 {
 	NULL_PARAM_CHECK(client);
diff --git a/subsys/net/lib/mqtt/mqtt_decoder.c b/subsys/net/lib/mqtt/mqtt_decoder.c
index 674d19798fc..08dc71a7e64 100644
--- a/subsys/net/lib/mqtt/mqtt_decoder.c
+++ b/subsys/net/lib/mqtt/mqtt_decoder.c
@@ -1078,4 +1078,65 @@ int disconnect_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 
 	return 0;
 }
+
+static int auth_properties_decode(struct buf_ctx *buf,
+				  struct mqtt_auth_param *param)
+{
+	struct property_decoder prop[] = {
+		{
+			&param->prop.auth_method,
+			&param->prop.rx.has_auth_method,
+			MQTT_PROP_AUTHENTICATION_METHOD
+		},
+		{
+			&param->prop.auth_data,
+			&param->prop.rx.has_auth_data,
+			MQTT_PROP_AUTHENTICATION_DATA
+		},
+		{
+			&param->prop.reason_string,
+			&param->prop.rx.has_reason_string,
+			MQTT_PROP_REASON_STRING
+		},
+		{
+			&param->prop.user_prop,
+			&param->prop.rx.has_user_prop,
+			MQTT_PROP_USER_PROPERTY
+		}
+	};
+
+	return properties_decode(prop, ARRAY_SIZE(prop), buf);
+}
+
+int auth_decode(const struct mqtt_client *client, struct buf_ctx *buf,
+		struct mqtt_auth_param *param)
+{
+	size_t remaining_len;
+	uint8_t reason_code;
+	int err;
+
+	if (!mqtt_is_version_5_0(client)) {
+		return -ENOTSUP;
+	}
+
+	remaining_len = buf->end - buf->cur;
+
+	if (remaining_len > 0) {
+		err = unpack_uint8(buf, &reason_code);
+		if (err < 0) {
+			return err;
+		}
+
+		param->reason_code = reason_code;
+	}
+
+	if (remaining_len > 1) {
+		err = auth_properties_decode(buf, param);
+		if (err < 0) {
+			return err;
+		}
+	}
+
+	return 0;
+}
 #endif /* CONFIG_MQTT_VERSION_5_0 */
diff --git a/subsys/net/lib/mqtt/mqtt_encoder.c b/subsys/net/lib/mqtt/mqtt_encoder.c
index fc355570274..4d43e3d0397 100644
--- a/subsys/net/lib/mqtt/mqtt_encoder.c
+++ b/subsys/net/lib/mqtt/mqtt_encoder.c
@@ -1480,3 +1480,109 @@ int ping_request_encode(struct buf_ctx *buf)
 
 	return 0;
 }
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static uint32_t auth_properties_length(const struct mqtt_auth_param *param)
+{
+	return string_property_length(&param->prop.auth_method) +
+	       binary_property_length(&param->prop.auth_data) +
+	       string_property_length(&param->prop.reason_string) +
+	       user_properties_length(param->prop.user_prop);
+}
+
+static int auth_properties_encode(const struct mqtt_auth_param *param,
+				  struct buf_ctx *buf)
+{
+	uint32_t properties_len;
+	int err;
+
+	/* Precalculate total properties length */
+	properties_len = auth_properties_length(param);
+	if (properties_len == 0) {
+		return 0;
+	}
+
+	err = pack_variable_int(properties_len, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_string_property(MQTT_PROP_AUTHENTICATION_METHOD,
+				     &param->prop.auth_method, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_binary_property(MQTT_PROP_AUTHENTICATION_DATA,
+				     &param->prop.auth_data, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_string_property(MQTT_PROP_REASON_STRING,
+				     &param->prop.reason_string, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_user_properties(param->prop.user_prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return 0;
+}
+
+static int empty_auth_encode(struct buf_ctx *buf)
+{
+	const uint8_t empty_auth_packet[] = {
+		MQTT_PKT_TYPE_AUTH,
+		0x00
+	};
+	uint8_t *cur = buf->cur;
+	uint8_t *end = buf->end;
+
+	if ((end - cur) < sizeof(empty_auth_packet)) {
+		return -ENOMEM;
+	}
+
+	memcpy(cur, empty_auth_packet, sizeof(empty_auth_packet));
+	buf->end = (cur + sizeof(empty_auth_packet));
+
+	return 0;
+}
+
+int auth_encode(const struct mqtt_auth_param *param, struct buf_ctx *buf)
+{
+	const uint8_t message_type =
+		MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_AUTH, 0, 0, 0);
+	uint8_t *start;
+	int err;
+
+	/* Reserve space for fixed header. */
+	buf->cur += MQTT_FIXED_HEADER_MAX_SIZE;
+	start = buf->cur;
+
+	if ((param->reason_code == MQTT_AUTH_SUCCESS) &&
+	    (auth_properties_length(param) == 0U)) {
+		return empty_auth_encode(buf);
+	}
+
+	err = pack_uint8(param->reason_code, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = auth_properties_encode(param, buf);
+	if (err != 0) {
+		return err;
+	}
+
+	err = mqtt_encode_fixed_header(message_type, start, buf);
+	if (err != 0) {
+		return err;
+	}
+
+	return 0;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
diff --git a/subsys/net/lib/mqtt/mqtt_internal.h b/subsys/net/lib/mqtt/mqtt_internal.h
index 7eee82f9f1e..28f836882f8 100644
--- a/subsys/net/lib/mqtt/mqtt_internal.h
+++ b/subsys/net/lib/mqtt/mqtt_internal.h
@@ -54,6 +54,7 @@ extern "C" {
 #define MQTT_PKT_TYPE_PINGREQ     0xC0
 #define MQTT_PKT_TYPE_PINGRSP     0xD0
 #define MQTT_PKT_TYPE_DISCONNECT  0xE0
+#define MQTT_PKT_TYPE_AUTH        0xF0
 
 /**@brief MQTT Property Types. */
 #define MQTT_PROP_PAYLOAD_FORMAT_INDICATOR          0x01
@@ -346,6 +347,20 @@ int unsubscribe_encode(const struct mqtt_client *client,
  */
 int ping_request_encode(struct buf_ctx *buf);
 
+#if defined(CONFIG_MQTT_VERSION_5_0)
+/**@brief Constructs/encodes Authenticate packet.
+ *
+ * @param[in] param Authenticate message parameters.
+ * @param[inout] buf_ctx Pointer to the buffer context structure,
+ *                       containing buffer for the encoded message.
+ *                       As output points to the beginning and end of
+ *                       the frame.
+ *
+ * @return 0 if the procedure is successful, an error code otherwise.
+ */
+int auth_encode(const struct mqtt_auth_param *param, struct buf_ctx *buf);
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
 /**@brief Decode MQTT Packet Type and Length in the MQTT fixed header.
  *
  * @param[inout] buf A pointer to the buf_ctx structure containing current
@@ -469,6 +484,18 @@ int unsubscribe_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf
  */
 int disconnect_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 		      struct mqtt_disconnect_param *param);
+
+/**@brief Decode MQTT Auth packet.
+ *
+ * @param[in] MQTT client for which packet is decoded.
+ * @param[inout] buf A pointer to the buf_ctx structure containing current
+ *                   buffer position.
+ * @param[out] param Pointer to buffer for decoded Auth parameters.
+ *
+ * @return 0 if the procedure is successful, an error code otherwise.
+ */
+int auth_decode(const struct mqtt_client *client, struct buf_ctx *buf,
+		struct mqtt_auth_param *param);
 #endif /* CONFIG_MQTT_VERSION_5_0 */
 
 /**
diff --git a/subsys/net/lib/mqtt/mqtt_rx.c b/subsys/net/lib/mqtt/mqtt_rx.c
index 0c33f66c2cb..057bccce9cb 100644
--- a/subsys/net/lib/mqtt/mqtt_rx.c
+++ b/subsys/net/lib/mqtt/mqtt_rx.c
@@ -154,6 +154,17 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 			notify_event = false;
 		}
 
+		break;
+
+	case MQTT_PKT_TYPE_AUTH:
+		evt.type = MQTT_EVT_AUTH;
+		err_code = auth_decode(client, buf, &evt.param.auth);
+		if (err_code == 0) {
+			evt.result = evt.param.auth.reason_code;
+		} else {
+			notify_event = false;
+		}
+
 		break;
 #endif
 

From a3cdc17d1eb76c333b67311891723a346693edf2 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Fri, 7 Mar 2025 12:23:55 +0100
Subject: [PATCH 2762/2913] [nrf fromtree] net: mqtt: Add support for MQTT 5.0
 topic aliases

Add support for handling topic aliases received from the broker.
The MQTT client implementation will store received topic for further use
in case consecutive PUBLISH received from the broker contains no topic
but alias only.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit e9da3b3e0c960322e949d0afcdde0a0229ca7d7c)
---
 include/zephyr/net/mqtt.h           | 14 ++++++
 subsys/net/lib/mqtt/mqtt_decoder.c  | 66 ++++++++++++++++++++++++++++-
 subsys/net/lib/mqtt/mqtt_internal.h |  4 +-
 3 files changed, 81 insertions(+), 3 deletions(-)

diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index c6892aa904b..6ab89ab0fb3 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -242,6 +242,15 @@ struct mqtt_binstr {
 	uint32_t len;              /**< Length of binary stream. */
 };
 
+/** @brief Abstracts aliased topic. */
+struct mqtt_topic_alias {
+	/** UTF-8 encoded topic name. */
+	uint8_t topic_buf[CONFIG_MQTT_TOPIC_ALIAS_STRING_MAX];
+
+	/** Topic name size. */
+	uint16_t topic_size;
+};
+
 /** @brief Abstracts MQTT UTF-8 encoded topic that can be subscribed
  *         to or published.
  */
@@ -866,6 +875,11 @@ struct mqtt_internal {
 
 	/** Internal. Remaining payload length to read. */
 	uint32_t remaining_payload;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	/** Internal. MQTT 5.0 topic alias mapping. */
+	struct mqtt_topic_alias topic_aliases[CONFIG_MQTT_TOPIC_ALIAS_MAX];
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /**
diff --git a/subsys/net/lib/mqtt/mqtt_decoder.c b/subsys/net/lib/mqtt/mqtt_decoder.c
index 08dc71a7e64..5b4aa4f6de4 100644
--- a/subsys/net/lib/mqtt/mqtt_decoder.c
+++ b/subsys/net/lib/mqtt/mqtt_decoder.c
@@ -749,6 +749,56 @@ static int publish_properties_decode(struct buf_ctx *buf,
 
 	return properties_decode(prop, ARRAY_SIZE(prop), buf);
 }
+
+static int publish_topic_alias_check(struct mqtt_client *client,
+				     struct mqtt_publish_param *param)
+{
+	uint16_t alias = param->prop.topic_alias;
+	struct mqtt_utf8 *topic_str = &param->message.topic.topic;
+	struct mqtt_topic_alias *topic_alias;
+
+	/* Topic alias must not exceed configured CONFIG_MQTT_TOPIC_ALIAS_MAX */
+	if (alias > CONFIG_MQTT_TOPIC_ALIAS_MAX) {
+		return -EBADMSG;
+	}
+
+	if (topic_str->size == 0) {
+		/* In case there's no topic, topic alias must be set */
+		if (alias == 0) {
+			return -EBADMSG;
+		}
+
+		/* Topic alias number corresponds to the aliases array index. */
+		topic_alias = &client->internal.topic_aliases[alias - 1];
+
+		/* In case topic alias has not been configured yet, report an error. */
+		if (topic_alias->topic_size == 0) {
+			return -EBADMSG;
+		}
+
+		topic_str->utf8 = topic_alias->topic_buf;
+		topic_str->size = topic_alias->topic_size;
+
+		return 0;
+	}
+
+	/* If topic is present and topic alias is set, configure the alias locally. */
+	if (alias > 0) {
+		topic_alias = &client->internal.topic_aliases[alias - 1];
+
+		if (topic_str->size > ARRAY_SIZE(topic_alias->topic_buf)) {
+			NET_ERR("Topic too long (%d bytes) to store, increase "
+				"CONFIG_MQTT_TOPIC_ALIAS_STRING_MAX",
+				topic_str->size);
+			return -EBADMSG;
+		}
+
+		memcpy(topic_alias->topic_buf, topic_str->utf8, topic_str->size);
+		topic_alias->topic_size = topic_str->size;
+	}
+
+	return 0;
+}
 #else
 static int publish_properties_decode(struct buf_ctx *buf,
 				     struct mqtt_publish_param *param)
@@ -758,9 +808,18 @@ static int publish_properties_decode(struct buf_ctx *buf,
 
 	return -ENOTSUP;
 }
+
+static int publish_topic_alias_check(struct mqtt_client *client,
+				     struct mqtt_publish_param *param)
+{
+	ARG_UNUSED(client);
+	ARG_UNUSED(param);
+
+	return -ENOTSUP;
+}
 #endif /* CONFIG_MQTT_VERSION_5_0 */
 
-int publish_decode(const struct mqtt_client *client, uint8_t flags,
+int publish_decode(struct mqtt_client *client, uint8_t flags,
 		   uint32_t var_length, struct buf_ctx *buf,
 		   struct mqtt_publish_param *param)
 {
@@ -795,6 +854,11 @@ int publish_decode(const struct mqtt_client *client, uint8_t flags,
 
 		/* Add parsed properties length */
 		var_header_length += err_code;
+
+		err_code = publish_topic_alias_check(client, param);
+		if (err_code < 0) {
+			return err_code;
+		}
 	}
 
 	if (var_length < var_header_length) {
diff --git a/subsys/net/lib/mqtt/mqtt_internal.h b/subsys/net/lib/mqtt/mqtt_internal.h
index 28f836882f8..0eedec56aee 100644
--- a/subsys/net/lib/mqtt/mqtt_internal.h
+++ b/subsys/net/lib/mqtt/mqtt_internal.h
@@ -387,7 +387,7 @@ int connect_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 
 /**@brief Decode MQTT Publish packet.
  *
- * @param[in] MQTT client for which packet is decoded.
+ * @param[inout] MQTT client for which packet is decoded.
  * @param[in] flags Byte containing message type and flags.
  * @param[in] var_length Length of the variable part of the message.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
@@ -396,7 +396,7 @@ int connect_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_decode(const struct mqtt_client *client, uint8_t flags,
+int publish_decode(struct mqtt_client *client, uint8_t flags,
 		   uint32_t var_length, struct buf_ctx *buf,
 		   struct mqtt_publish_param *param);
 

From 25834fff1c3ef8018fe6cb94e19517192976df63 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Fri, 7 Mar 2025 12:23:58 +0100
Subject: [PATCH 2763/2913] [nrf fromtree] net: mqtt: Improve disconnect error
 notification for MQTT 5.0

As MQTT 5.0 allows to specify the disconnect reason in the Disconnect
packet, use this new feature to improve error notification to the
broker, according to the error guidelines in the MQTT 5.0 spec.
For most cases, a generic arbitrary mapping between errno values and
reason codes is used, however the parser can specify the disconnect
reason code manually to better handle certain corner cases (like invalid
topic alias used).

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 8935579d0aff21784ffdc7ddd5ac66c2881ea91f)
---
 include/zephyr/net/mqtt.h           |  3 ++
 subsys/net/lib/mqtt/mqtt.c          | 57 +++++++++++++++++++++++++++++
 subsys/net/lib/mqtt/mqtt_decoder.c  | 36 +++++++++---------
 subsys/net/lib/mqtt/mqtt_internal.h | 22 +++++++++++
 4 files changed, 101 insertions(+), 17 deletions(-)

diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index 6ab89ab0fb3..3fdabf51ecb 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -879,6 +879,9 @@ struct mqtt_internal {
 #if defined(CONFIG_MQTT_VERSION_5_0)
 	/** Internal. MQTT 5.0 topic alias mapping. */
 	struct mqtt_topic_alias topic_aliases[CONFIG_MQTT_TOPIC_ALIAS_MAX];
+
+	/** Internal. MQTT 5.0 disconnect reason set in case of processing errors. */
+	enum mqtt_disconnect_reason_code disconnect_reason;
 #endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
diff --git a/subsys/net/lib/mqtt/mqtt.c b/subsys/net/lib/mqtt/mqtt.c
index d5cc23571ef..3af78b13f01 100644
--- a/subsys/net/lib/mqtt/mqtt.c
+++ b/subsys/net/lib/mqtt/mqtt.c
@@ -108,6 +108,58 @@ static int client_connect(struct mqtt_client *client)
 	return err_code;
 }
 
+static int client_write(struct mqtt_client *client, const uint8_t *data,
+			uint32_t datalen);
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static void disconnect_5_0_notify(struct mqtt_client *client, int err)
+{
+	struct mqtt_disconnect_param param = { };
+	struct buf_ctx packet;
+
+	/* Parser might've set custom failure reason, in such case skip generic
+	 * mapping from errno to reason code.
+	 */
+	if (client->internal.disconnect_reason != MQTT_DISCONNECT_NORMAL) {
+		param.reason_code = client->internal.disconnect_reason;
+	} else {
+		switch (err) {
+		case ECONNREFUSED:
+		case ENOTCONN:
+			/* Connection rejected/closed, skip disconnect. */
+			return;
+		case EINVAL:
+			param.reason_code = MQTT_DISCONNECT_MALFORMED_PACKET;
+			break;
+		case EBADMSG:
+			param.reason_code = MQTT_DISCONNECT_PROTOCOL_ERROR;
+			break;
+		case ENOMEM:
+			param.reason_code = MQTT_DISCONNECT_PACKET_TOO_LARGE;
+			break;
+		default:
+			param.reason_code = MQTT_DISCONNECT_UNSPECIFIED_ERROR;
+			break;
+		}
+	}
+
+	tx_buf_init(client, &packet);
+
+	if (disconnect_encode(client, &param, &packet) < 0) {
+		return;
+	}
+
+	(void)client_write(client, packet.cur, packet.end - packet.cur);
+}
+#else
+static void disconnect_5_0_notify(struct mqtt_client *client, int err)
+{
+	ARG_UNUSED(client);
+	ARG_UNUSED(err);
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
+
 static int client_read(struct mqtt_client *client)
 {
 	int err_code;
@@ -118,6 +170,11 @@ static int client_read(struct mqtt_client *client)
 
 	err_code = mqtt_handle_rx(client);
 	if (err_code < 0) {
+		if (mqtt_is_version_5_0(client)) {
+			/* Best effort send, if it fails just shut the connection. */
+			disconnect_5_0_notify(client, -err_code);
+		}
+
 		mqtt_client_disconnect(client, err_code, true);
 	}
 
diff --git a/subsys/net/lib/mqtt/mqtt_decoder.c b/subsys/net/lib/mqtt/mqtt_decoder.c
index 5b4aa4f6de4..2670ff7bc99 100644
--- a/subsys/net/lib/mqtt/mqtt_decoder.c
+++ b/subsys/net/lib/mqtt/mqtt_decoder.c
@@ -289,11 +289,11 @@ int decode_uint32_property(struct property_decoder *prop,
 	uint32_t *value = prop->data;
 
 	if (*remaining_len < sizeof(uint32_t)) {
-		return -EBADMSG;
+		return -EINVAL;
 	}
 
 	if (unpack_uint32(buf, value) < 0) {
-		return -EBADMSG;
+		return -EINVAL;
 	}
 
 	*remaining_len -= sizeof(uint32_t);
@@ -309,11 +309,11 @@ int decode_uint16_property(struct property_decoder *prop,
 	uint16_t *value = prop->data;
 
 	if (*remaining_len < sizeof(uint16_t)) {
-		return -EBADMSG;
+		return -EINVAL;
 	}
 
 	if (unpack_uint16(buf, value) < 0) {
-		return -EBADMSG;
+		return -EINVAL;
 	}
 
 	*remaining_len -= sizeof(uint16_t);
@@ -329,11 +329,11 @@ int decode_uint8_property(struct property_decoder *prop,
 	uint8_t *value = prop->data;
 
 	if (*remaining_len < sizeof(uint8_t)) {
-		return -EBADMSG;
+		return -EINVAL;
 	}
 
 	if (unpack_uint8(buf, value) < 0) {
-		return -EBADMSG;
+		return -EINVAL;
 	}
 
 	*remaining_len -= sizeof(uint8_t);
@@ -349,11 +349,11 @@ int decode_string_property(struct property_decoder *prop,
 	struct mqtt_utf8 *str = prop->data;
 
 	if (unpack_utf8_str(buf, str) < 0) {
-		return -EBADMSG;
+		return -EINVAL;
 	}
 
 	if (*remaining_len < sizeof(uint16_t) + str->size) {
-		return -EBADMSG;
+		return -EINVAL;
 	}
 
 	*remaining_len -= sizeof(uint16_t) + str->size;
@@ -369,11 +369,11 @@ int decode_binary_property(struct property_decoder *prop,
 	struct mqtt_binstr *bin = prop->data;
 
 	if (unpack_binary_data(buf, bin) < 0) {
-		return -EBADMSG;
+		return -EINVAL;
 	}
 
 	if (*remaining_len < sizeof(uint16_t) + bin->len) {
-		return -EBADMSG;
+		return -EINVAL;
 	}
 
 	*remaining_len -= sizeof(uint16_t) + bin->len;
@@ -392,16 +392,16 @@ int decode_user_property(struct property_decoder *prop,
 	size_t prop_len;
 
 	if (unpack_utf8_str(buf, &temp.name) < 0) {
-		return -EBADMSG;
+		return -EINVAL;
 	}
 
 	if (unpack_utf8_str(buf, &temp.value) < 0) {
-		return -EBADMSG;
+		return -EINVAL;
 	}
 
 	prop_len = (2 * sizeof(uint16_t)) + temp.name.size + temp.value.size;
 	if (*remaining_len < prop_len) {
-		return -EBADMSG;
+		return -EINVAL;
 	}
 
 	*remaining_len -= prop_len;
@@ -469,7 +469,7 @@ static int properties_decode(struct property_decoder *prop, uint8_t cnt,
 
 	bytes = unpack_variable_int(buf, &properties_len);
 	if (bytes < 0) {
-		return -EBADMSG;
+		return -EINVAL;
 	}
 
 	bytes += (int)properties_len;
@@ -481,7 +481,7 @@ static int properties_decode(struct property_decoder *prop, uint8_t cnt,
 		/* Decode property type */
 		err = unpack_uint8(buf, &type);
 		if (err < 0) {
-			return -EBADMSG;
+			return -EINVAL;
 		}
 
 		properties_len--;
@@ -552,7 +552,7 @@ static int properties_decode(struct property_decoder *prop, uint8_t cnt,
 		}
 
 		if (err < 0) {
-			return -EBADMSG;
+			return err;
 		}
 	}
 
@@ -759,6 +759,7 @@ static int publish_topic_alias_check(struct mqtt_client *client,
 
 	/* Topic alias must not exceed configured CONFIG_MQTT_TOPIC_ALIAS_MAX */
 	if (alias > CONFIG_MQTT_TOPIC_ALIAS_MAX) {
+		set_disconnect_reason(client, MQTT_DISCONNECT_TOPIC_ALIAS_INVALID);
 		return -EBADMSG;
 	}
 
@@ -790,7 +791,8 @@ static int publish_topic_alias_check(struct mqtt_client *client,
 			NET_ERR("Topic too long (%d bytes) to store, increase "
 				"CONFIG_MQTT_TOPIC_ALIAS_STRING_MAX",
 				topic_str->size);
-			return -EBADMSG;
+			set_disconnect_reason(client, MQTT_DISCONNECT_IMPL_SPECIFIC_ERROR);
+			return -ENOMEM;
 		}
 
 		memcpy(topic_alias->topic_buf, topic_str->utf8, topic_str->size);
diff --git a/subsys/net/lib/mqtt/mqtt_internal.h b/subsys/net/lib/mqtt/mqtt_internal.h
index 0eedec56aee..a065712fe5f 100644
--- a/subsys/net/lib/mqtt/mqtt_internal.h
+++ b/subsys/net/lib/mqtt/mqtt_internal.h
@@ -496,6 +496,28 @@ int disconnect_decode(const struct mqtt_client *client, struct buf_ctx *buf,
  */
 int auth_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 		struct mqtt_auth_param *param);
+
+/**@brief Set MQTT 5.0 disconnect reason.
+ *
+ * Packet parser can use this function to set a custom disconnect reason code,
+ * if not set, the client will use the default mapping between errno values and
+ * reason codes.
+ *
+ * @param[inout] MQTT client.
+ * @param[in] reason MQTT 5.0 disconnect reason code.
+ */
+static inline void set_disconnect_reason(struct mqtt_client *client,
+					 enum mqtt_disconnect_reason_code reason)
+{
+	client->internal.disconnect_reason = reason;
+}
+#else
+static inline void set_disconnect_reason(struct mqtt_client *client,
+					 enum mqtt_disconnect_reason_code reason)
+{
+	ARG_UNUSED(client);
+	ARG_UNUSED(reason);
+}
 #endif /* CONFIG_MQTT_VERSION_5_0 */
 
 /**

From 5b09052b99373bfbb270d3f675c853e4e7080d7d Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Fri, 7 Mar 2025 12:23:22 +0100
Subject: [PATCH 2764/2913] [nrf fromtree] tests: net: mqtt: Add MQTT 5.0
 packet encoder/decoder tests

Add new test suite covering MQTT 5.0 packet format.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 347653e72a61417a7f6c907ed324daf8c80982a4)
---
 .../lib/mqtt/v5_0/mqtt_packet/CMakeLists.txt  |   12 +
 tests/net/lib/mqtt/v5_0/mqtt_packet/prj.conf  |    7 +
 .../mqtt/v5_0/mqtt_packet/src/mqtt_packet.c   | 2068 +++++++++++++++++
 .../lib/mqtt/v5_0/mqtt_packet/testcase.yaml   |    9 +
 4 files changed, 2096 insertions(+)
 create mode 100644 tests/net/lib/mqtt/v5_0/mqtt_packet/CMakeLists.txt
 create mode 100644 tests/net/lib/mqtt/v5_0/mqtt_packet/prj.conf
 create mode 100644 tests/net/lib/mqtt/v5_0/mqtt_packet/src/mqtt_packet.c
 create mode 100644 tests/net/lib/mqtt/v5_0/mqtt_packet/testcase.yaml

diff --git a/tests/net/lib/mqtt/v5_0/mqtt_packet/CMakeLists.txt b/tests/net/lib/mqtt/v5_0/mqtt_packet/CMakeLists.txt
new file mode 100644
index 00000000000..7d7d86b29a9
--- /dev/null
+++ b/tests/net/lib/mqtt/v5_0/mqtt_packet/CMakeLists.txt
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(mqtt_5_packet)
+
+target_include_directories(app PRIVATE
+  ${ZEPHYR_BASE}/subsys/net/lib/mqtt
+)
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/net/lib/mqtt/v5_0/mqtt_packet/prj.conf b/tests/net/lib/mqtt/v5_0/mqtt_packet/prj.conf
new file mode 100644
index 00000000000..60552beb0b2
--- /dev/null
+++ b/tests/net/lib/mqtt/v5_0/mqtt_packet/prj.conf
@@ -0,0 +1,7 @@
+CONFIG_ZTEST=y
+CONFIG_NET_TEST=y
+CONFIG_NETWORKING=y
+CONFIG_ENTROPY_GENERATOR=y
+CONFIG_TEST_RANDOM_GENERATOR=y
+CONFIG_MQTT_LIB=y
+CONFIG_MQTT_VERSION_5_0=y
diff --git a/tests/net/lib/mqtt/v5_0/mqtt_packet/src/mqtt_packet.c b/tests/net/lib/mqtt/v5_0/mqtt_packet/src/mqtt_packet.c
new file mode 100644
index 00000000000..80eb96738d6
--- /dev/null
+++ b/tests/net/lib/mqtt/v5_0/mqtt_packet/src/mqtt_packet.c
@@ -0,0 +1,2068 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/ztest.h>
+
+#include "mqtt_internal.h"
+
+static uint8_t auth_data[] = { 0x01, 0x02, 0x03, 0x04 };
+static uint8_t correlation_data[] = { 0x11, 0x12, 0x13, 0x14, 0x15, 0x16 };
+static uint8_t test_payload[] = { 't', 'e', 's', 't', '_', 'p', 'a', 'y', 'l',
+				  'o', 'a', 'd' };
+
+#define BUFFER_SIZE 256
+#define CLIENTID MQTT_UTF8_LITERAL("test_id")
+#define WILL_TOPIC MQTT_UTF8_LITERAL("test_will")
+#define WILL_MSG MQTT_UTF8_LITERAL("test_will_msg")
+#define USER_PROP_NAME MQTT_UTF8_LITERAL("test_name")
+#define USER_PROP_VALUE MQTT_UTF8_LITERAL("test_value")
+#define AUTH_METHOD MQTT_UTF8_LITERAL("test_authentication")
+#define AUTH_DATA (struct mqtt_binstr) { auth_data, sizeof(auth_data) }
+#define CONTENT_TYPE MQTT_UTF8_LITERAL("test_content_type")
+#define RESPONSE_TOPIC MQTT_UTF8_LITERAL("test_response_topic")
+#define CORRELATION_DATA (struct mqtt_binstr) { correlation_data, sizeof(correlation_data) }
+#define TEST_TOPIC MQTT_UTF8_LITERAL("test_topic")
+#define TEST_PAYLOAD (struct mqtt_binstr) { test_payload, sizeof(test_payload) }
+#define TEST_MSG_ID 0x1234
+
+static uint8_t rx_buffer[BUFFER_SIZE];
+static uint8_t tx_buffer[BUFFER_SIZE];
+static struct mqtt_client client;
+
+struct mqtt_test {
+	/* Test name */
+	const char *test_name;
+
+	/* Test context, for example `struct mqtt_publish_param *` */
+	void *ctx;
+
+	/* Test function */
+	void (*test_fcn)(struct mqtt_test *tests);
+
+	/* Expected encoded packet */
+	uint8_t *expected;
+
+	/* Length packet length */
+	uint16_t expected_len;
+};
+
+static void run_packet_tests(struct mqtt_test *tests, size_t count)
+{
+	for (size_t i = 0; i < count; i++) {
+		struct mqtt_test *test = &tests[i];
+
+		TC_PRINT("Test #%u - %s\n", i + 1, test->test_name != NULL ?
+			test->test_name : "");
+
+		test->test_fcn(test);
+	};
+}
+
+static void print_buffer(const uint8_t *buf, uint16_t size)
+{
+	TC_PRINT("\n");
+	for (uint16_t i = 0U; i < size; i++) {
+		TC_PRINT("%02x ", buf[i]);
+		if ((i + 1) % 8 == 0U) {
+			TC_PRINT("\n");
+		}
+	}
+	TC_PRINT("\n");
+}
+
+static int validate_buffers(const struct buf_ctx *buf, const uint8_t *expected,
+			     uint16_t len)
+{
+	if (buf->end - buf->cur != len) {
+		goto fail;
+	}
+
+	if (memcmp(expected, buf->cur, buf->end - buf->cur) != 0) {
+		goto fail;
+	}
+
+	return 0;
+
+fail:
+	TC_PRINT("Computed:");
+	print_buffer(buf->cur, buf->end - buf->cur);
+	TC_PRINT("Expected:");
+	print_buffer(expected, len);
+
+	return -EBADMSG;
+}
+
+static int validate_structs(const void *computed, const void *expected,
+			    size_t struct_size)
+{
+	if (memcmp(expected, computed, struct_size) != 0) {
+		goto fail;
+	}
+
+	return 0;
+
+fail:
+	TC_PRINT("Computed:");
+	print_buffer(computed, struct_size);
+	TC_PRINT("Expected:");
+	print_buffer(expected, struct_size);
+
+	return -EBADMSG;
+}
+
+static void test_msg_connect(struct mqtt_test *test)
+{
+	struct mqtt_client *test_client;
+	struct buf_ctx buf;
+	int ret;
+
+	test_client = (struct mqtt_client *)test->ctx;
+
+	client.client_id = test_client->client_id;
+	client.will_topic = test_client->will_topic;
+	client.prop = test_client->prop;
+	client.will_retain = test_client->will_retain;
+	client.will_message = test_client->will_message;
+	client.will_prop = test_client->will_prop;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = connect_request_encode(&client, &buf);
+	zassert_ok(ret, "connect_request_encode failed");
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+}
+
+#define ENCODED_MID 0x12, 0x34
+#define ENCODED_PROP_DEFAULT_TOPIC_ALIAS_MAXIMUM 0x22, 0x00, 0x05
+#define ENCODED_PROP_DEFAULT_REQUEST_PROBLEM_INFORMATION 0x17, 0x00
+#define ENCODED_PROP_USER_PROPERTY \
+	0x26, 0x00, 0x09, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, \
+	0x00, 0x0a, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65
+#define ENCODED_PROP_REASON_STRING \
+	0x1f, 0x00, 0x12, 0x74, 0x65, 0x73, 0x74, 0x5F, 0x72, 0x65, 0x61, 0x73, \
+	0x6F, 0x6E, 0x5F, 0x73, 0x74, 0x72, 0x69, 0x6E, 0x67
+#define ENCODED_PROP_SESSION_EXPIRY_INTERVAL 0x11, 0x00, 0x00, 0x03, 0xe8
+#define ENCODED_PROP_RECEIVE_MAXIMUM 0x21, 0x00, 0x0a
+#define ENCODED_PROP_MAXIMUM_PACKET_SIZE 0x27, 0x00, 0x00, 0x03, 0xe8
+#define ENCODED_PROP_REQUEST_RESPONSE_INFORMATION 0x19, 0x01
+#define ENCODED_PROP_AUTHENTICATION_METHOD \
+	0x15, 0x00, 0x13, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x75, 0x74, 0x68, \
+	0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e
+#define ENCODED_PROP_AUTHENTICATION_DATA \
+	0x16, 0x00, 0x04, 0x01, 0x02, 0x03, 0x04
+#define ENCODED_PROP_WILL_DELAY_INTERVAL 0x18, 0x00, 0x00, 0x00, 0x64
+#define ENCODED_PROP_PAYLOAD_FORMAT_INDICATOR 0x01, 0x01
+#define ENCODED_PROP_MESSAGE_EXPIRY_INTERVAL 0x02, 0x00, 0x00, 0x03, 0xe8
+#define ENCODED_PROP_CONTENT_TYPE \
+	0x03, 0x00, 0x11, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x74, \
+	0x65, 0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65
+#define ENCODED_PROP_RESPONSE_TOPIC \
+	0x08, 0x00, 0x13, 0x74, 0x65, 0x73, 0x74, 0x5F, 0x72, 0x65, 0x73, 0x70, \
+	0x6F, 0x6E, 0x73, 0x65, 0x5F, 0x74, 0x6F, 0x70, 0x69, 0x63
+#define ENCODED_PROP_CORRELATION_DATA \
+	0x09, 0x00, 0x06, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16
+#define ENCODED_PROP_MAXIMUM_QOS 0x24, 0x01
+#define ENCODED_PROP_RETAIN_AVAILABLE 0x25, 0x01
+#define ENCODED_PROP_ASSIGNED_CLIENT_ID \
+	0x12, 0x00, 0x07, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64
+#define ENCODED_PROP_TOPIC_ALIAS_MAXIMUM 0x22, 0x00, 0x0a
+#define ENCODED_PROP_WILDCARD_SUB_AVAILABLE 0x28, 0x01
+#define ENCODED_PROP_SUBSCRIPTION_IDS_AVAILABLE 0x29, 0x01
+#define ENCODED_PROP_SHARED_SUB_AVAILABLE 0x2a, 0x01
+#define ENCODED_PROP_SERVER_KEEP_ALIVE 0x13, 0x00, 0x64
+#define ENCODED_PROP_RESPONSE_INFORMATION \
+	0x1a, 0x00, 0x09, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f
+#define ENCODED_PROP_SERVER_REFERENCE \
+	0x1c, 0x00, 0x0e, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x66, 0x65, \
+	0x72, 0x65, 0x6e, 0x63, 0x65
+#define ENCODED_PROP_TOPIC_ALIAS 0x23, 0x00, 0x04
+#define ENCODED_PROP_CORRELATION_DATA \
+	0x09, 0x00, 0x06, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16
+#define ENCODED_PROP_SUBSCRIPTION_IDENTIFIER 0x0b, 0xe8, 0x07
+
+#define TEST_PROP_SESSION_EXPIRY_INTERVAL 1000
+#define TEST_PROP_RECEIVE_MAXIMUM 10
+#define TEST_PROP_MAXIMUM_PACKET_SIZE 1000
+#define TEST_PROP_WILL_DELAY_INTERVAL 100
+#define TEST_PROP_PAYLOAD_FORMAT_INDICATOR 1
+#define TEST_PROP_MESSAGE_EXPIRY_INTERVAL 1000
+#define TEST_PROP_MAXIMUM_QOS 1
+#define TEST_PROP_RETAIN_AVAILABLE 1
+#define TEST_PROP_TOPIC_ALIAS_MAXIMUM 10
+#define TEST_PROP_WILDCARD_SUB_AVAILABLE 1
+#define TEST_PROP_SUBSCRIPTION_IDS_AVAILABLE 1
+#define TEST_PROP_SHARED_SUB_AVAILABLE 1
+#define TEST_PROP_SERVER_KEEP_ALIVE 100
+#define TEST_PROP_SUBSCRIPTION_IDENTIFIER 1000
+
+#define ENCODED_CONNECT_VAR_HEADER_COMMON \
+	0x00, 0x04, 0x4d, 0x51, 0x54, 0x54, 0x05, 0x00, 0x00, 0x3c
+#define ENCODED_CONNECT_PROPERTIES_DEFAULT \
+	0x05, 0x22, 0x00, 0x05, 0x17, 0x00
+#define ENCODED_CONNECT_CLIENT_ID \
+	0x00, 0x07, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64
+
+static uint8_t expect_connect_default[] = {
+	0x10, 0x19, ENCODED_CONNECT_VAR_HEADER_COMMON,
+	ENCODED_CONNECT_PROPERTIES_DEFAULT,
+	ENCODED_CONNECT_CLIENT_ID,
+};
+static struct mqtt_client client_connect_default = {
+	.client_id = CLIENTID,
+};
+
+static uint8_t expect_connect_prop_sei[] = {
+	0x10, 0x1e, ENCODED_CONNECT_VAR_HEADER_COMMON,
+	/* Properties */
+	0x0a, ENCODED_PROP_SESSION_EXPIRY_INTERVAL,
+	ENCODED_PROP_DEFAULT_TOPIC_ALIAS_MAXIMUM,
+	ENCODED_PROP_DEFAULT_REQUEST_PROBLEM_INFORMATION,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+};
+static struct mqtt_client client_connect_prop_sei = {
+	.client_id = CLIENTID,
+	.prop.session_expiry_interval = TEST_PROP_SESSION_EXPIRY_INTERVAL,
+};
+
+static uint8_t expect_connect_prop_rm[] = {
+	0x10, 0x1c, ENCODED_CONNECT_VAR_HEADER_COMMON,
+	/* Properties */
+	0x08, ENCODED_PROP_RECEIVE_MAXIMUM,
+	ENCODED_PROP_DEFAULT_TOPIC_ALIAS_MAXIMUM,
+	ENCODED_PROP_DEFAULT_REQUEST_PROBLEM_INFORMATION,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+};
+static struct mqtt_client client_connect_prop_rm = {
+	.client_id = CLIENTID,
+	.prop.receive_maximum = TEST_PROP_RECEIVE_MAXIMUM,
+};
+
+static uint8_t expect_connect_prop_mps[] = {
+	0x10, 0x1e, ENCODED_CONNECT_VAR_HEADER_COMMON,
+	/* Properties */
+	0x0a, ENCODED_PROP_MAXIMUM_PACKET_SIZE,
+	ENCODED_PROP_DEFAULT_TOPIC_ALIAS_MAXIMUM,
+	ENCODED_PROP_DEFAULT_REQUEST_PROBLEM_INFORMATION,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+
+};
+static struct mqtt_client client_connect_prop_mps = {
+	.client_id = CLIENTID,
+	.prop.maximum_packet_size = TEST_PROP_MAXIMUM_PACKET_SIZE,
+};
+
+static uint8_t expect_connect_prop_rri[] = {
+	0x10, 0x1b, ENCODED_CONNECT_VAR_HEADER_COMMON,
+	/* Properties */
+	0x07, ENCODED_PROP_DEFAULT_TOPIC_ALIAS_MAXIMUM,
+	ENCODED_PROP_REQUEST_RESPONSE_INFORMATION,
+	ENCODED_PROP_DEFAULT_REQUEST_PROBLEM_INFORMATION,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+};
+static struct mqtt_client client_connect_prop_rri = {
+	.client_id = CLIENTID,
+	.prop.request_response_info = true,
+};
+
+static uint8_t expect_connect_prop_rpi[] = {
+	0x10, 0x17, ENCODED_CONNECT_VAR_HEADER_COMMON,
+	/* Properties */
+	0x03, ENCODED_PROP_DEFAULT_TOPIC_ALIAS_MAXIMUM,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+};
+static struct mqtt_client client_connect_prop_rpi = {
+	.client_id = CLIENTID,
+	/* True is MQTT default so property should be omitted. */
+	.prop.request_problem_info = true,
+};
+
+static uint8_t expect_connect_prop_up[] = {
+	0x10, 0x31, ENCODED_CONNECT_VAR_HEADER_COMMON,
+	/* Properties */
+	0x1d, ENCODED_PROP_DEFAULT_TOPIC_ALIAS_MAXIMUM,
+	ENCODED_PROP_DEFAULT_REQUEST_PROBLEM_INFORMATION,
+	ENCODED_PROP_USER_PROPERTY,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+};
+static struct mqtt_client client_connect_prop_up = {
+	.client_id = CLIENTID,
+	.prop.user_prop[0] = {
+		.name = USER_PROP_NAME,
+		.value = USER_PROP_VALUE,
+	},
+};
+
+static uint8_t expect_connect_prop_am_ad[] = {
+	0x10, 0x36, ENCODED_CONNECT_VAR_HEADER_COMMON,
+	/* Properties */
+	0x22, ENCODED_PROP_DEFAULT_TOPIC_ALIAS_MAXIMUM,
+	ENCODED_PROP_DEFAULT_REQUEST_PROBLEM_INFORMATION,
+	ENCODED_PROP_AUTHENTICATION_METHOD,
+	ENCODED_PROP_AUTHENTICATION_DATA,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+};
+static struct mqtt_client client_connect_prop_am_ad = {
+	.client_id = CLIENTID,
+	.prop.auth_method = AUTH_METHOD,
+	.prop.auth_data = AUTH_DATA,
+};
+
+static struct mqtt_utf8 will_msg = WILL_MSG;
+static struct mqtt_topic will_topic = {
+	.qos = 0,
+	.topic = WILL_TOPIC,
+};
+
+#define CONNECT_WILL_COMMON \
+	.client_id = CLIENTID, \
+	.will_topic = &will_topic, \
+	.will_message = &will_msg \
+
+#define ENCODED_CONNECT_WILL_VAR_HEADER_COMMON \
+	0x00, 0x04, 0x4d, 0x51, 0x54, 0x54, 0x05, 0x04, 0x00, 0x3c
+#define ENCODED_CONNECT_WILL_TOPIC_AND_PAYLOAD \
+	0x00, 0x09, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x77, 0x69, 0x6c, 0x6c, \
+	0x00, 0x0d, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x77, 0x69, 0x6c, 0x6c, 0x5f, \
+	0x6d, 0x73, 0x67
+
+static uint8_t expect_connect_will_default[] = {
+	0x10, 0x34, ENCODED_CONNECT_WILL_VAR_HEADER_COMMON,
+	ENCODED_CONNECT_PROPERTIES_DEFAULT,
+	ENCODED_CONNECT_CLIENT_ID,
+	/* Will properties */
+	0x00,
+	ENCODED_CONNECT_WILL_TOPIC_AND_PAYLOAD,
+};
+static struct mqtt_client client_connect_will_default = {
+	CONNECT_WILL_COMMON,
+};
+
+static uint8_t expect_connect_will_prop_di[] = {
+	0x10, 0x39, ENCODED_CONNECT_WILL_VAR_HEADER_COMMON,
+	/* Properties */
+	ENCODED_CONNECT_PROPERTIES_DEFAULT,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+	/* Will properties */
+	0x05, ENCODED_PROP_WILL_DELAY_INTERVAL,
+	ENCODED_CONNECT_WILL_TOPIC_AND_PAYLOAD,
+};
+static struct mqtt_client client_connect_will_prop_di = {
+	CONNECT_WILL_COMMON,
+	.will_prop.will_delay_interval = TEST_PROP_WILL_DELAY_INTERVAL,
+};
+
+static uint8_t expect_connect_will_prop_pfi[] = {
+	0x10, 0x36, ENCODED_CONNECT_WILL_VAR_HEADER_COMMON,
+	/* Properties */
+	ENCODED_CONNECT_PROPERTIES_DEFAULT,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+	/* Will properties */
+	0x02, ENCODED_PROP_PAYLOAD_FORMAT_INDICATOR,
+	ENCODED_CONNECT_WILL_TOPIC_AND_PAYLOAD,
+};
+static struct mqtt_client client_connect_will_prop_pfi = {
+	CONNECT_WILL_COMMON,
+	.will_prop.payload_format_indicator = TEST_PROP_PAYLOAD_FORMAT_INDICATOR,
+};
+
+static uint8_t expect_connect_will_prop_mei[] = {
+	0x10, 0x39, ENCODED_CONNECT_WILL_VAR_HEADER_COMMON,
+	/* Properties */
+	ENCODED_CONNECT_PROPERTIES_DEFAULT,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+	/* Will properties */
+	0x05, ENCODED_PROP_MESSAGE_EXPIRY_INTERVAL,
+	ENCODED_CONNECT_WILL_TOPIC_AND_PAYLOAD,
+};
+static struct mqtt_client client_connect_will_prop_mei = {
+	CONNECT_WILL_COMMON,
+	.will_prop.message_expiry_interval = TEST_PROP_MESSAGE_EXPIRY_INTERVAL,
+};
+
+static uint8_t expect_connect_will_prop_ct[] = {
+	0x10, 0x48, ENCODED_CONNECT_WILL_VAR_HEADER_COMMON,
+	/* Properties */
+	ENCODED_CONNECT_PROPERTIES_DEFAULT,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+	/* Will properties */
+	0x14, ENCODED_PROP_CONTENT_TYPE,
+	ENCODED_CONNECT_WILL_TOPIC_AND_PAYLOAD,
+};
+static struct mqtt_client client_connect_will_prop_ct = {
+	CONNECT_WILL_COMMON,
+	.will_prop.content_type = CONTENT_TYPE,
+};
+
+static uint8_t expect_connect_will_prop_rt[] = {
+	0x10, 0x4a, ENCODED_CONNECT_WILL_VAR_HEADER_COMMON,
+	/* Properties */
+	ENCODED_CONNECT_PROPERTIES_DEFAULT,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+	/* Will properties */
+	0x16, ENCODED_PROP_RESPONSE_TOPIC,
+	ENCODED_CONNECT_WILL_TOPIC_AND_PAYLOAD,
+};
+static struct mqtt_client client_connect_will_prop_rt = {
+	CONNECT_WILL_COMMON,
+	.will_prop.response_topic = RESPONSE_TOPIC,
+};
+
+static uint8_t expect_connect_will_prop_cd[] = {
+	0x10, 0x3d, ENCODED_CONNECT_WILL_VAR_HEADER_COMMON,
+	/* Properties */
+	ENCODED_CONNECT_PROPERTIES_DEFAULT,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+	/* Will properties */
+	0x09, ENCODED_PROP_CORRELATION_DATA,
+	ENCODED_CONNECT_WILL_TOPIC_AND_PAYLOAD,
+};
+static struct mqtt_client client_connect_will_prop_cd = {
+	CONNECT_WILL_COMMON,
+	.will_prop.correlation_data = CORRELATION_DATA,
+};
+
+static uint8_t expect_connect_will_prop_up[] = {
+	0x10, 0x4c, ENCODED_CONNECT_WILL_VAR_HEADER_COMMON,
+	/* Properties */
+	ENCODED_CONNECT_PROPERTIES_DEFAULT,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+	/* Will properties */
+	0x18, ENCODED_PROP_USER_PROPERTY,
+	ENCODED_CONNECT_WILL_TOPIC_AND_PAYLOAD,
+};
+static struct mqtt_client client_connect_will_prop_up = {
+	CONNECT_WILL_COMMON,
+	.will_prop.user_prop[0] = {
+		.name = USER_PROP_NAME,
+		.value = USER_PROP_VALUE,
+	},
+};
+
+static struct mqtt_test connect_tests[] = {
+	{ .test_name = "CONNECT, default",
+	  .ctx = &client_connect_default, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_default,
+	  .expected_len = sizeof(expect_connect_default) },
+	{ .test_name = "CONNECT, property Session Expiry Interval",
+	  .ctx = &client_connect_prop_sei, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_prop_sei,
+	  .expected_len = sizeof(expect_connect_prop_sei) },
+	{ .test_name = "CONNECT, property Receive Maximum",
+	  .ctx = &client_connect_prop_rm, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_prop_rm,
+	  .expected_len = sizeof(expect_connect_prop_rm) },
+	{ .test_name = "CONNECT, property Maximum Packet Size",
+	  .ctx = &client_connect_prop_mps, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_prop_mps,
+	  .expected_len = sizeof(expect_connect_prop_mps) },
+	{ .test_name = "CONNECT, property Request Response Information",
+	  .ctx = &client_connect_prop_rri, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_prop_rri,
+	  .expected_len = sizeof(expect_connect_prop_rri) },
+	{ .test_name = "CONNECT, property Request Problem Information",
+	  .ctx = &client_connect_prop_rpi, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_prop_rpi,
+	  .expected_len = sizeof(expect_connect_prop_rpi) },
+	{ .test_name = "CONNECT, property User Property",
+	  .ctx = &client_connect_prop_up, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_prop_up,
+	  .expected_len = sizeof(expect_connect_prop_up) },
+	{ .test_name = "CONNECT, property Authentication Method and Data",
+	  .ctx = &client_connect_prop_am_ad, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_prop_am_ad,
+	  .expected_len = sizeof(expect_connect_prop_am_ad) },
+	{ .test_name = "CONNECT, WILL default",
+	  .ctx = &client_connect_will_default, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_will_default,
+	  .expected_len = sizeof(expect_connect_will_default) },
+	{ .test_name = "CONNECT, WILL property Will Delay Interval",
+	  .ctx = &client_connect_will_prop_di, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_will_prop_di,
+	  .expected_len = sizeof(expect_connect_will_prop_di) },
+	{ .test_name = "CONNECT, WILL property Payload Format Indicator",
+	  .ctx = &client_connect_will_prop_pfi, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_will_prop_pfi,
+	  .expected_len = sizeof(expect_connect_will_prop_pfi) },
+	{ .test_name = "CONNECT, WILL property Message Expiry Interval",
+	  .ctx = &client_connect_will_prop_mei, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_will_prop_mei,
+	  .expected_len = sizeof(expect_connect_will_prop_mei) },
+	{ .test_name = "CONNECT, WILL property Content Type",
+	  .ctx = &client_connect_will_prop_ct, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_will_prop_ct,
+	  .expected_len = sizeof(expect_connect_will_prop_ct) },
+	{ .test_name = "CONNECT, WILL property Response Topic",
+	  .ctx = &client_connect_will_prop_rt, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_will_prop_rt,
+	  .expected_len = sizeof(expect_connect_will_prop_rt) },
+	{ .test_name = "CONNECT, WILL property Correlation Data",
+	  .ctx = &client_connect_will_prop_cd, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_will_prop_cd,
+	  .expected_len = sizeof(expect_connect_will_prop_cd) },
+	{ .test_name = "CONNECT, WILL property User Property",
+	  .ctx = &client_connect_will_prop_up, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_will_prop_up,
+	  .expected_len = sizeof(expect_connect_will_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_connect)
+{
+	run_packet_tests(connect_tests, ARRAY_SIZE(connect_tests));
+}
+
+static void test_msg_connack(struct mqtt_test *test)
+{
+	struct mqtt_connack_param *exp_param =
+			(struct mqtt_connack_param *)test->ctx;
+	struct mqtt_connack_param dec_param = { 0 };
+	int ret;
+	uint8_t type_and_flags;
+	uint32_t length;
+	struct buf_ctx buf;
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_CONNACK,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = connect_ack_decode(&client, &buf, &dec_param);
+	zassert_ok(ret, "connect_ack_decode failed");
+	zassert_ok(validate_structs(&dec_param, exp_param, sizeof(dec_param)),
+		   "Incorrect CONNACK params decoded");
+}
+
+static uint8_t expect_connack_default[] = {
+	0x20, 0x03, 0x01, 0x00, 0x00,
+};
+static struct mqtt_connack_param connack_default = {
+	.session_present_flag = true,
+	.return_code = MQTT_CONNACK_SUCCESS,
+};
+
+static uint8_t expect_connack_error[] = {
+	0x20, 0x03, 0x00, 0x80, 0x00,
+};
+static struct mqtt_connack_param connack_error = {
+	.return_code = MQTT_CONNACK_UNSPECIFIED_ERROR,
+};
+
+static uint8_t expect_connack_prop_sei[] = {
+	0x20, 0x08, 0x00, 0x00,
+	/* Properties */
+	0x05, ENCODED_PROP_SESSION_EXPIRY_INTERVAL,
+};
+static struct mqtt_connack_param connack_prop_sei = {
+	.prop.rx.has_session_expiry_interval = true,
+	.prop.session_expiry_interval = TEST_PROP_SESSION_EXPIRY_INTERVAL,
+};
+
+static uint8_t expect_connack_prop_rm[] = {
+	0x20, 0x06, 0x00, 0x00,
+	/* Properties */
+	0x03, ENCODED_PROP_RECEIVE_MAXIMUM,
+};
+static struct mqtt_connack_param connack_prop_rm = {
+	.prop.rx.has_receive_maximum = true,
+	.prop.receive_maximum = TEST_PROP_RECEIVE_MAXIMUM,
+};
+
+static uint8_t expect_connack_prop_mqos[] = {
+	0x20, 0x05, 0x00, 0x00,
+	/* Properties */
+	0x02, ENCODED_PROP_MAXIMUM_QOS,
+};
+static struct mqtt_connack_param connack_prop_mqos = {
+	.prop.rx.has_maximum_qos = true,
+	.prop.maximum_qos = TEST_PROP_MAXIMUM_QOS,
+};
+
+static uint8_t expect_connack_prop_ra[] = {
+	0x20, 0x05, 0x00, 0x00,
+	/* Properties */
+	0x02, ENCODED_PROP_RETAIN_AVAILABLE,
+};
+static struct mqtt_connack_param connack_prop_ra = {
+	.prop.rx.has_retain_available = true,
+	.prop.retain_available = TEST_PROP_RETAIN_AVAILABLE,
+};
+
+static uint8_t expect_connack_prop_mps[] = {
+	0x20, 0x08, 0x00, 0x00,
+	/* Properties */
+	0x05, ENCODED_PROP_MAXIMUM_PACKET_SIZE,
+};
+static struct mqtt_connack_param connack_prop_mps = {
+	.prop.rx.has_maximum_packet_size = true,
+	.prop.maximum_packet_size = TEST_PROP_MAXIMUM_PACKET_SIZE,
+};
+
+static uint8_t expect_connack_prop_aci[] = {
+	0x20, 0x0d, 0x00, 0x00,
+	/* Properties */
+	0x0a, ENCODED_PROP_ASSIGNED_CLIENT_ID,
+};
+static struct mqtt_connack_param connack_prop_aci = {
+	.prop.rx.has_assigned_client_id = true,
+	.prop.assigned_client_id.utf8 = expect_connack_prop_aci + 8,
+	.prop.assigned_client_id.size = 7,
+};
+
+static uint8_t expect_connack_prop_tam[] = {
+	0x20, 0x06, 0x00, 0x00,
+	/* Properties */
+	0x03, ENCODED_PROP_TOPIC_ALIAS_MAXIMUM,
+};
+static struct mqtt_connack_param connack_prop_tam = {
+	.prop.rx.has_topic_alias_maximum = true,
+	.prop.topic_alias_maximum = TEST_PROP_TOPIC_ALIAS_MAXIMUM,
+};
+
+static uint8_t expect_connack_prop_rs[] = {
+	0x20, 0x18, 0x00, 0x00,
+	/* Properties */
+	0x15, ENCODED_PROP_REASON_STRING,
+};
+static struct mqtt_connack_param connack_prop_rs = {
+	.prop.rx.has_reason_string = true,
+	.prop.reason_string.utf8 = expect_connack_prop_rs + 8,
+	.prop.reason_string.size = 18,
+};
+
+static uint8_t expect_connack_prop_up[] = {
+	0x20, 0x1b, 0x00, 0x00,
+	/* Properties */
+	0x18, ENCODED_PROP_USER_PROPERTY,
+};
+static struct mqtt_connack_param connack_prop_up = {
+	.prop.rx.has_user_prop = true,
+	.prop.user_prop[0].name.utf8 = expect_connack_prop_up + 8,
+	.prop.user_prop[0].name.size = 9,
+	.prop.user_prop[0].value.utf8 = expect_connack_prop_up + 19,
+	.prop.user_prop[0].value.size = 10,
+};
+
+static uint8_t expect_connack_prop_wsa[] = {
+	0x20, 0x05, 0x00, 0x00,
+	/* Properties */
+	0x02, ENCODED_PROP_WILDCARD_SUB_AVAILABLE,
+};
+static struct mqtt_connack_param connack_prop_wsa = {
+	.prop.rx.has_wildcard_sub_available = true,
+	.prop.wildcard_sub_available = TEST_PROP_WILDCARD_SUB_AVAILABLE,
+};
+
+static uint8_t expect_connack_prop_sia[] = {
+	0x20, 0x05, 0x00, 0x00,
+	/* Properties */
+	0x02, ENCODED_PROP_SUBSCRIPTION_IDS_AVAILABLE,
+};
+static struct mqtt_connack_param connack_prop_sia = {
+	.prop.rx.has_subscription_ids_available = true,
+	.prop.subscription_ids_available = TEST_PROP_SUBSCRIPTION_IDS_AVAILABLE,
+};
+
+static uint8_t expect_connack_prop_ssa[] = {
+	0x20, 0x05, 0x00, 0x00,
+	/* Properties */
+	0x02, ENCODED_PROP_SHARED_SUB_AVAILABLE,
+};
+static struct mqtt_connack_param connack_prop_ssa = {
+	.prop.rx.has_shared_sub_available = true,
+	.prop.shared_sub_available = TEST_PROP_SHARED_SUB_AVAILABLE,
+};
+
+static uint8_t expect_connack_prop_ska[] = {
+	0x20, 0x06, 0x00, 0x00,
+	/* Properties */
+	0x03, ENCODED_PROP_SERVER_KEEP_ALIVE,
+};
+static struct mqtt_connack_param connack_prop_ska = {
+	.prop.rx.has_server_keep_alive = true,
+	.prop.server_keep_alive = TEST_PROP_SERVER_KEEP_ALIVE,
+};
+
+static uint8_t expect_connack_prop_ri[] = {
+	0x20, 0x0f, 0x00, 0x00,
+	/* Properties */
+	0x0c, ENCODED_PROP_RESPONSE_INFORMATION,
+};
+static struct mqtt_connack_param connack_prop_ri = {
+	.prop.rx.has_response_information = true,
+	.prop.response_information.utf8 = expect_connack_prop_ri + 8,
+	.prop.response_information.size = 9,
+};
+
+static uint8_t expect_connack_prop_sr[] = {
+	0x20, 0x14, 0x00, 0x00,
+	/* Properties */
+	0x11, ENCODED_PROP_SERVER_REFERENCE,
+};
+static struct mqtt_connack_param connack_prop_sr = {
+	.prop.rx.has_server_reference = true,
+	.prop.server_reference.utf8 = expect_connack_prop_sr + 8,
+	.prop.server_reference.size = 14,
+};
+
+static uint8_t expect_connack_prop_am_ad[] = {
+	0x20, 0x20, 0x00, 0x00,
+	/* Properties */
+	0x1d, ENCODED_PROP_AUTHENTICATION_METHOD,
+	ENCODED_PROP_AUTHENTICATION_DATA
+};
+static struct mqtt_connack_param connack_prop_am_ad = {
+	.prop.rx.has_auth_method = true,
+	.prop.auth_method.utf8 = expect_connack_prop_am_ad + 8,
+	.prop.auth_method.size = 19,
+	.prop.rx.has_auth_data = true,
+	.prop.auth_data.data = expect_connack_prop_am_ad + 30,
+	.prop.auth_data.len = 4,
+};
+
+static struct mqtt_test connack_tests[] = {
+	{ .test_name = "CONNACK, default",
+	  .ctx = &connack_default, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_default,
+	  .expected_len = sizeof(expect_connack_default) },
+	{ .test_name = "CONNACK, error",
+	  .ctx = &connack_error, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_error,
+	  .expected_len = sizeof(expect_connack_error) },
+	{ .test_name = "CONNACK, property Session Expiry Interval",
+	  .ctx = &connack_prop_sei, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_sei,
+	  .expected_len = sizeof(expect_connack_prop_sei) },
+	{ .test_name = "CONNACK, property Receive Maximum",
+	  .ctx = &connack_prop_rm, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_rm,
+	  .expected_len = sizeof(expect_connack_prop_rm) },
+	{ .test_name = "CONNACK, property Maximum QoS",
+	  .ctx = &connack_prop_mqos, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_mqos,
+	  .expected_len = sizeof(expect_connack_prop_mqos) },
+	{ .test_name = "CONNACK, property Retain Available",
+	  .ctx = &connack_prop_ra, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_ra,
+	  .expected_len = sizeof(expect_connack_prop_ra) },
+	{ .test_name = "CONNACK, property Maximum Packet Size",
+	  .ctx = &connack_prop_mps, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_mps,
+	  .expected_len = sizeof(expect_connack_prop_mps) },
+	{ .test_name = "CONNACK, property Assigned Client Identifier",
+	  .ctx = &connack_prop_aci, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_aci,
+	  .expected_len = sizeof(expect_connack_prop_aci) },
+	{ .test_name = "CONNACK, property Topic Alias Maximum",
+	  .ctx = &connack_prop_tam, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_tam,
+	  .expected_len = sizeof(expect_connack_prop_tam) },
+	{ .test_name = "CONNACK, property Reason String",
+	  .ctx = &connack_prop_rs, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_rs,
+	  .expected_len = sizeof(expect_connack_prop_rs) },
+	{ .test_name = "CONNACK, property User Property",
+	  .ctx = &connack_prop_up, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_up,
+	  .expected_len = sizeof(expect_connack_prop_up) },
+	{ .test_name = "CONNACK, property Wildcard Subscription Available",
+	  .ctx = &connack_prop_wsa, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_wsa,
+	  .expected_len = sizeof(expect_connack_prop_wsa) },
+	{ .test_name = "CONNACK, property Subscription Identifiers Available",
+	  .ctx = &connack_prop_sia, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_sia,
+	  .expected_len = sizeof(expect_connack_prop_sia) },
+	{ .test_name = "CONNACK, property Shared Subscription Available",
+	  .ctx = &connack_prop_ssa, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_ssa,
+	  .expected_len = sizeof(expect_connack_prop_ssa) },
+	{ .test_name = "CONNACK, property Server Keep Alive",
+	  .ctx = &connack_prop_ska, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_ska,
+	  .expected_len = sizeof(expect_connack_prop_ska) },
+	{ .test_name = "CONNACK, property Response Information",
+	  .ctx = &connack_prop_ri, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_ri,
+	  .expected_len = sizeof(expect_connack_prop_ri) },
+	{ .test_name = "CONNACK, property Server Reference",
+	  .ctx = &connack_prop_sr, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_sr,
+	  .expected_len = sizeof(expect_connack_prop_sr) },
+	{ .test_name = "CONNACK, property Authentication Method and Data",
+	  .ctx = &connack_prop_am_ad, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_am_ad,
+	  .expected_len = sizeof(expect_connack_prop_am_ad) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_connack)
+{
+	run_packet_tests(connack_tests, ARRAY_SIZE(connack_tests));
+}
+
+static void test_msg_publish_dec_only(struct mqtt_test *test)
+{
+	struct mqtt_publish_param *exp_param =
+			(struct mqtt_publish_param *)test->ctx;
+	struct mqtt_publish_param dec_param = { 0 };
+	uint8_t type_and_flags;
+	uint32_t length;
+	struct buf_ctx buf;
+	int ret;
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_PUBLISH,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = publish_decode(&client, type_and_flags, length, &buf, &dec_param);
+	zassert_ok(ret, "publish_decode failed");
+
+	zassert_equal(dec_param.message_id, exp_param->message_id,
+		      "Incorrect message_id");
+	zassert_equal(dec_param.dup_flag, exp_param->dup_flag,
+		      "Incorrect dup flag");
+	zassert_equal(dec_param.retain_flag, exp_param->retain_flag,
+		      "Incorrect retain flag");
+	zassert_equal(dec_param.message.topic.qos, exp_param->message.topic.qos,
+		      "Incorrect topic qos");
+	zassert_equal(dec_param.message.topic.topic.size,
+		      exp_param->message.topic.topic.size,
+		      "Incorrect topic len");
+	zassert_mem_equal(dec_param.message.topic.topic.utf8,
+			  exp_param->message.topic.topic.utf8,
+			  dec_param.message.topic.topic.size,
+			  "Incorrect topic content");
+	zassert_equal(dec_param.message.payload.len,
+		      exp_param->message.payload.len,
+		      "Incorrect payload len");
+	zassert_ok(validate_structs(&dec_param.prop, &(exp_param->prop),
+		   sizeof(dec_param.prop)),
+		   "Incorrect PUBLISH properties decoded");
+}
+
+static void test_msg_publish(struct mqtt_test *test)
+{
+	struct mqtt_publish_param *exp_param =
+			(struct mqtt_publish_param *)test->ctx;
+	struct buf_ctx buf;
+	int ret;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = publish_encode(&client, exp_param, &buf);
+	zassert_ok(ret, "publish_encode failed");
+
+	/* Payload is not copied, copy it manually just after the header.*/
+	memcpy(buf.end, exp_param->message.payload.data,
+		exp_param->message.payload.len);
+	buf.end += exp_param->message.payload.len;
+
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+
+	test_msg_publish_dec_only(test);
+}
+
+#define PUBLISH_COMMON \
+	.message.topic.qos = MQTT_QOS_1_AT_LEAST_ONCE, \
+	.message.topic.topic = TEST_TOPIC, \
+	.message.payload = TEST_PAYLOAD, \
+	.message_id = TEST_MSG_ID
+
+#define ENCODED_PUBLISH_TOPIC \
+	0x00, 0x0a, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x6f, 0x70, 0x69, 0x63
+#define ENCODED_PUBLISH_PAYLOAD \
+	0x74, 0x65, 0x73, 0x74, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64
+
+static uint8_t expect_publish_default[] = {
+	0x32, 0x1b, ENCODED_PUBLISH_TOPIC, ENCODED_MID,
+	/* No properties */
+	0x00,
+	/* Payload */
+	ENCODED_PUBLISH_PAYLOAD,
+};
+static struct mqtt_publish_param publish_default = {
+	PUBLISH_COMMON,
+};
+
+static uint8_t expect_publish_prop_pfi[] = {
+	0x32, 0x1d, ENCODED_PUBLISH_TOPIC, ENCODED_MID,
+	/* Properties */
+	0x02, ENCODED_PROP_PAYLOAD_FORMAT_INDICATOR,
+	/* Payload */
+	ENCODED_PUBLISH_PAYLOAD,
+};
+static struct mqtt_publish_param publish_prop_pfi = {
+	PUBLISH_COMMON,
+	.prop.rx.has_payload_format_indicator = true,
+	.prop.payload_format_indicator = TEST_PROP_PAYLOAD_FORMAT_INDICATOR,
+};
+
+static uint8_t expect_publish_prop_mei[] = {
+	0x32, 0x20, ENCODED_PUBLISH_TOPIC, ENCODED_MID,
+	/* Properties */
+	0x05, ENCODED_PROP_MESSAGE_EXPIRY_INTERVAL,
+	/* Payload */
+	ENCODED_PUBLISH_PAYLOAD,
+};
+static struct mqtt_publish_param publish_prop_mei = {
+	PUBLISH_COMMON,
+	.prop.rx.has_message_expiry_interval = true,
+	.prop.message_expiry_interval = TEST_PROP_MESSAGE_EXPIRY_INTERVAL,
+};
+
+static uint8_t expect_publish_prop_ta[] = {
+	0x32, 0x1e, ENCODED_PUBLISH_TOPIC, ENCODED_MID,
+	/* Properties */
+	0x03, ENCODED_PROP_TOPIC_ALIAS,
+	/* Payload */
+	ENCODED_PUBLISH_PAYLOAD,
+};
+static struct mqtt_publish_param publish_prop_ta = {
+	PUBLISH_COMMON,
+	.prop.rx.has_topic_alias = true,
+	.prop.topic_alias = 4,
+};
+
+static uint8_t expect_publish_prop_rt[] = {
+	0x32, 0x31, ENCODED_PUBLISH_TOPIC, ENCODED_MID,
+	/* Properties */
+	0x16, ENCODED_PROP_RESPONSE_TOPIC,
+	/* Payload */
+	ENCODED_PUBLISH_PAYLOAD,
+};
+static struct mqtt_publish_param publish_prop_rt = {
+	PUBLISH_COMMON,
+	.prop.rx.has_response_topic = true,
+	.prop.response_topic.utf8 = expect_publish_prop_rt + 20,
+	.prop.response_topic.size = 19,
+};
+
+static uint8_t expect_publish_prop_cd[] = {
+	0x32, 0x24, ENCODED_PUBLISH_TOPIC, ENCODED_MID,
+	/* Properties */
+	0x09, ENCODED_PROP_CORRELATION_DATA,
+	/* Payload */
+	ENCODED_PUBLISH_PAYLOAD,
+};
+static struct mqtt_publish_param publish_prop_cd = {
+	PUBLISH_COMMON,
+	.prop.rx.has_correlation_data = true,
+	.prop.correlation_data.data = expect_publish_prop_cd + 20,
+	.prop.correlation_data.len = 6,
+};
+
+static uint8_t expect_publish_prop_up[] = {
+	0x32, 0x33, ENCODED_PUBLISH_TOPIC, ENCODED_MID,
+	/* Properties */
+	0x18, ENCODED_PROP_USER_PROPERTY,
+	/* Payload */
+	ENCODED_PUBLISH_PAYLOAD,
+};
+static struct mqtt_publish_param publish_prop_up = {
+	PUBLISH_COMMON,
+	.prop.rx.has_user_prop = true,
+	.prop.user_prop[0].name.utf8 = expect_publish_prop_up + 20,
+	.prop.user_prop[0].name.size = 9,
+	.prop.user_prop[0].value.utf8 = expect_publish_prop_up + 31,
+	.prop.user_prop[0].value.size = 10,
+};
+
+static uint8_t expect_publish_prop_si[] = {
+	0x32, 0x1e, ENCODED_PUBLISH_TOPIC, ENCODED_MID,
+	/* Properties */
+	0x03, ENCODED_PROP_SUBSCRIPTION_IDENTIFIER,
+	/* Payload */
+	ENCODED_PUBLISH_PAYLOAD,
+};
+static struct mqtt_publish_param publish_prop_si = {
+	PUBLISH_COMMON,
+	.prop.rx.has_subscription_identifier = true,
+	.prop.subscription_identifier[0] = TEST_PROP_SUBSCRIPTION_IDENTIFIER,
+};
+
+static uint8_t expect_publish_prop_ct[] = {
+	0x32, 0x2f, ENCODED_PUBLISH_TOPIC, ENCODED_MID,
+	/* Properties */
+	0x14, ENCODED_PROP_CONTENT_TYPE,
+	/* Payload */
+	ENCODED_PUBLISH_PAYLOAD,
+};
+static struct mqtt_publish_param publish_prop_ct = {
+	PUBLISH_COMMON,
+	.prop.rx.has_content_type = true,
+	.prop.content_type.utf8 = expect_publish_prop_ct + 20,
+	.prop.content_type.size = 17,
+};
+
+static struct mqtt_test publish_tests[] = {
+	{ .test_name = "PUBLISH, default",
+	  .ctx = &publish_default, .test_fcn = test_msg_publish,
+	  .expected = expect_publish_default,
+	  .expected_len = sizeof(expect_publish_default) },
+	{ .test_name = "PUBLISH, property Payload Format Indicator",
+	  .ctx = &publish_prop_pfi, .test_fcn = test_msg_publish,
+	  .expected = expect_publish_prop_pfi,
+	  .expected_len = sizeof(expect_publish_prop_pfi) },
+	{ .test_name = "PUBLISH, property Message Expiry Interval",
+	  .ctx = &publish_prop_mei, .test_fcn = test_msg_publish,
+	  .expected = expect_publish_prop_mei,
+	  .expected_len = sizeof(expect_publish_prop_mei) },
+	{ .test_name = "PUBLISH, property Topic Alias",
+	  .ctx = &publish_prop_ta, .test_fcn = test_msg_publish,
+	  .expected = expect_publish_prop_ta,
+	  .expected_len = sizeof(expect_publish_prop_ta) },
+	{ .test_name = "PUBLISH, property Response Topic",
+	  .ctx = &publish_prop_rt, .test_fcn = test_msg_publish,
+	  .expected = expect_publish_prop_rt,
+	  .expected_len = sizeof(expect_publish_prop_rt) },
+	{ .test_name = "PUBLISH, property Correlation Data",
+	  .ctx = &publish_prop_cd, .test_fcn = test_msg_publish,
+	  .expected = expect_publish_prop_cd,
+	  .expected_len = sizeof(expect_publish_prop_cd) },
+	{ .test_name = "PUBLISH, property User Property",
+	  .ctx = &publish_prop_up, .test_fcn = test_msg_publish,
+	  .expected = expect_publish_prop_up,
+	  .expected_len = sizeof(expect_publish_prop_up) },
+	{ .test_name = "PUBLISH, property Subscription Identifier",
+	  .ctx = &publish_prop_si, .test_fcn = test_msg_publish_dec_only,
+	  .expected = expect_publish_prop_si,
+	  .expected_len = sizeof(expect_publish_prop_si) },
+	{ .test_name = "PUBLISH, property Content Type",
+	  .ctx = &publish_prop_ct, .test_fcn = test_msg_publish,
+	  .expected = expect_publish_prop_ct,
+	  .expected_len = sizeof(expect_publish_prop_ct) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_publish)
+{
+	run_packet_tests(publish_tests, ARRAY_SIZE(publish_tests));
+}
+
+static void test_msg_puback(struct mqtt_test *test)
+{
+	struct mqtt_puback_param *exp_param =
+			(struct mqtt_puback_param *)test->ctx;
+	struct mqtt_puback_param dec_param = { 0 };
+	uint8_t type_and_flags;
+	uint32_t length;
+	struct buf_ctx buf;
+	int ret;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = publish_ack_encode(&client, exp_param, &buf);
+	zassert_ok(ret, "publish_ack_encode failed");
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_PUBACK,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = publish_ack_decode(&client, &buf, &dec_param);
+	zassert_ok(ret, "publish_ack_decode failed");
+	zassert_ok(validate_structs(&dec_param, exp_param, sizeof(dec_param)),
+		   "Incorrect PUBACK params decoded");
+}
+
+#define ENCODED_COMMON_ACK_DEFAULT 0x02, ENCODED_MID
+#define COMMON_ACK_DEFAULT \
+	.message_id = TEST_MSG_ID
+
+static uint8_t expect_puback_default[] = {
+	0x40, ENCODED_COMMON_ACK_DEFAULT,
+};
+static struct mqtt_puback_param puback_default = {
+	COMMON_ACK_DEFAULT,
+};
+
+#define ENCODED_COMMON_ACK_ERROR 0x03, ENCODED_MID, 0x80
+#define COMMON_ACK_ERROR \
+	.message_id = TEST_MSG_ID, \
+	.reason_code = 0x80
+
+static uint8_t expect_puback_error[] = {
+	0x40, ENCODED_COMMON_ACK_ERROR,
+};
+static struct mqtt_puback_param puback_error = {
+	COMMON_ACK_ERROR,
+};
+
+#define ENCODED_COMMON_ACK_REASON_STRING \
+	0x19, ENCODED_MID, 0x80, \
+	0x15, ENCODED_PROP_REASON_STRING
+
+#define COMMON_ACK_REASON_STRING(exp_payload) \
+	.message_id = TEST_MSG_ID, \
+	.reason_code = 0x80, \
+	.prop.rx.has_reason_string = true, \
+	.prop.reason_string.utf8 = exp_payload + 9, \
+	.prop.reason_string.size = 18
+
+static uint8_t expect_puback_prop_rs[] = {
+	0x40, ENCODED_COMMON_ACK_REASON_STRING,
+};
+static struct mqtt_puback_param puback_prop_rs = {
+	COMMON_ACK_REASON_STRING(expect_puback_prop_rs),
+};
+
+#define ENCODED_COMMON_ACK_USER_PROP \
+	0x1c, ENCODED_MID, 0x00, \
+	0x18, ENCODED_PROP_USER_PROPERTY
+
+#define COMMON_ACK_USER_PROP(exp_payload) \
+	.message_id = TEST_MSG_ID, \
+	.prop.rx.has_user_prop = true, \
+	.prop.user_prop[0].name.utf8 = exp_payload + 9, \
+	.prop.user_prop[0].name.size = 9, \
+	.prop.user_prop[0].value.utf8 = exp_payload + 20, \
+	.prop.user_prop[0].value.size = 10
+
+static uint8_t expect_puback_prop_up[] = {
+	0x40, ENCODED_COMMON_ACK_USER_PROP,
+};
+static struct mqtt_puback_param puback_prop_up = {
+	COMMON_ACK_USER_PROP(expect_puback_prop_up),
+};
+
+static struct mqtt_test puback_tests[] = {
+	{ .test_name = "PUBACK, default",
+	  .ctx = &puback_default, .test_fcn = test_msg_puback,
+	  .expected = expect_puback_default,
+	  .expected_len = sizeof(expect_puback_default) },
+	{ .test_name = "PUBACK, error",
+	  .ctx = &puback_error, .test_fcn = test_msg_puback,
+	  .expected = expect_puback_error,
+	  .expected_len = sizeof(expect_puback_error) },
+	{ .test_name = "PUBACK, property Reason String",
+	  .ctx = &puback_prop_rs, .test_fcn = test_msg_puback,
+	  .expected = expect_puback_prop_rs,
+	  .expected_len = sizeof(expect_puback_prop_rs) },
+	{ .test_name = "PUBACK, property User Property",
+	  .ctx = &puback_prop_up, .test_fcn = test_msg_puback,
+	  .expected = expect_puback_prop_up,
+	  .expected_len = sizeof(expect_puback_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_puback)
+{
+	run_packet_tests(puback_tests, ARRAY_SIZE(puback_tests));
+}
+
+static void test_msg_pubrec(struct mqtt_test *test)
+{
+	struct mqtt_pubrec_param *exp_param =
+			(struct mqtt_pubrec_param *)test->ctx;
+	struct mqtt_pubrec_param dec_param = { 0 };
+	uint8_t type_and_flags;
+	uint32_t length;
+	struct buf_ctx buf;
+	int ret;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = publish_receive_encode(&client, exp_param, &buf);
+	zassert_ok(ret, "publish_receive_encode failed");
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_PUBREC,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = publish_receive_decode(&client, &buf, &dec_param);
+	zassert_ok(ret, "publish_receive_decode failed");
+	zassert_ok(validate_structs(&dec_param, exp_param, sizeof(dec_param)),
+		   "Incorrect PUBREC params decoded");
+}
+
+static uint8_t expect_pubrec_default[] = {
+	0x50, ENCODED_COMMON_ACK_DEFAULT,
+};
+static struct mqtt_pubrec_param pubrec_default = {
+	COMMON_ACK_DEFAULT,
+};
+
+static uint8_t expect_pubrec_error[] = {
+	0x50, ENCODED_COMMON_ACK_ERROR,
+};
+static struct mqtt_pubrec_param pubrec_error = {
+	COMMON_ACK_ERROR,
+};
+
+static uint8_t expect_pubrec_prop_rs[] = {
+	0x50, ENCODED_COMMON_ACK_REASON_STRING,
+};
+static struct mqtt_pubrec_param pubrec_prop_rs = {
+	COMMON_ACK_REASON_STRING(expect_pubrec_prop_rs),
+};
+
+static uint8_t expect_pubrec_prop_up[] = {
+	0x50, ENCODED_COMMON_ACK_USER_PROP,
+};
+static struct mqtt_pubrec_param pubrec_prop_up = {
+	COMMON_ACK_USER_PROP(expect_pubrec_prop_up),
+};
+
+static struct mqtt_test pubrec_tests[] = {
+	{ .test_name = "PUBREC, default",
+	  .ctx = &pubrec_default, .test_fcn = test_msg_pubrec,
+	  .expected = expect_pubrec_default,
+	  .expected_len = sizeof(expect_pubrec_default) },
+	{ .test_name = "PUBREC, error",
+	  .ctx = &pubrec_error, .test_fcn = test_msg_pubrec,
+	  .expected = expect_pubrec_error,
+	  .expected_len = sizeof(expect_pubrec_error) },
+	{ .test_name = "PUBREC, property Reason String",
+	  .ctx = &pubrec_prop_rs, .test_fcn = test_msg_pubrec,
+	  .expected = expect_pubrec_prop_rs,
+	  .expected_len = sizeof(expect_pubrec_prop_rs) },
+	{ .test_name = "PUBREC, property User Property",
+	  .ctx = &pubrec_prop_up, .test_fcn = test_msg_pubrec,
+	  .expected = expect_pubrec_prop_up,
+	  .expected_len = sizeof(expect_pubrec_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_pubrec)
+{
+	run_packet_tests(pubrec_tests, ARRAY_SIZE(pubrec_tests));
+}
+
+static void test_msg_pubrel(struct mqtt_test *test)
+{
+	struct mqtt_pubrel_param *exp_param =
+			(struct mqtt_pubrel_param *)test->ctx;
+	struct mqtt_pubrel_param dec_param = { 0 };
+	uint8_t type_and_flags;
+	uint32_t length;
+	struct buf_ctx buf;
+	int ret;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = publish_release_encode(&client, exp_param, &buf);
+	zassert_ok(ret, "publish_release_encode failed");
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_PUBREL,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = publish_release_decode(&client, &buf, &dec_param);
+	zassert_ok(ret, "publish_release_decode failed");
+	zassert_ok(validate_structs(&dec_param, exp_param, sizeof(dec_param)),
+		   "Incorrect PUBREL params decoded");
+}
+
+static uint8_t expect_pubrel_default[] = {
+	0x62, ENCODED_COMMON_ACK_DEFAULT,
+};
+static struct mqtt_pubrel_param pubrel_default = {
+	COMMON_ACK_DEFAULT,
+};
+
+static uint8_t expect_pubrel_error[] = {
+	0x62, ENCODED_COMMON_ACK_ERROR,
+};
+static struct mqtt_pubrel_param pubrel_error = {
+	COMMON_ACK_ERROR,
+};
+
+static uint8_t expect_pubrel_prop_rs[] = {
+	0x62, ENCODED_COMMON_ACK_REASON_STRING,
+};
+static struct mqtt_pubrel_param pubrel_prop_rs = {
+	COMMON_ACK_REASON_STRING(expect_pubrel_prop_rs),
+};
+
+static uint8_t expect_pubrel_prop_up[] = {
+	0x62, ENCODED_COMMON_ACK_USER_PROP,
+};
+static struct mqtt_pubrel_param pubrel_prop_up = {
+	COMMON_ACK_USER_PROP(expect_pubrel_prop_up),
+};
+
+static struct mqtt_test pubrel_tests[] = {
+	{ .test_name = "PUBREL, default",
+	  .ctx = &pubrel_default, .test_fcn = test_msg_pubrel,
+	  .expected = expect_pubrel_default,
+	  .expected_len = sizeof(expect_pubrel_default) },
+	{ .test_name = "PUBREL, error",
+	  .ctx = &pubrel_error, .test_fcn = test_msg_pubrel,
+	  .expected = expect_pubrel_error,
+	  .expected_len = sizeof(expect_pubrel_error) },
+	{ .test_name = "PUBREL, property Reason String",
+	  .ctx = &pubrel_prop_rs, .test_fcn = test_msg_pubrel,
+	  .expected = expect_pubrel_prop_rs,
+	  .expected_len = sizeof(expect_pubrel_prop_rs) },
+	{ .test_name = "PUBREL, property User Property",
+	  .ctx = &pubrel_prop_up, .test_fcn = test_msg_pubrel,
+	  .expected = expect_pubrel_prop_up,
+	  .expected_len = sizeof(expect_pubrel_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_pubrel)
+{
+	run_packet_tests(pubrel_tests, ARRAY_SIZE(pubrel_tests));
+}
+
+static void test_msg_pubcomp(struct mqtt_test *test)
+{
+	struct mqtt_pubcomp_param *exp_param =
+			(struct mqtt_pubcomp_param *)test->ctx;
+	struct mqtt_pubcomp_param dec_param = { 0 };
+	uint8_t type_and_flags;
+	uint32_t length;
+	struct buf_ctx buf;
+	int ret;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = publish_complete_encode(&client, exp_param, &buf);
+	zassert_ok(ret, "publish_complete_encode failed");
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_PUBCOMP,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = publish_complete_decode(&client, &buf, &dec_param);
+	zassert_ok(ret, "publish_complete_decode failed");
+	zassert_ok(validate_structs(&dec_param, exp_param, sizeof(dec_param)),
+		   "Incorrect PUBCOMP params decoded");
+}
+
+static uint8_t expect_pubcomp_default[] = {
+	0x70, ENCODED_COMMON_ACK_DEFAULT,
+};
+static struct mqtt_pubcomp_param pubcomp_default = {
+	COMMON_ACK_DEFAULT,
+};
+
+static uint8_t expect_pubcomp_error[] = {
+	0x70, ENCODED_COMMON_ACK_ERROR,
+};
+static struct mqtt_pubcomp_param pubcomp_error = {
+	COMMON_ACK_ERROR,
+};
+
+static uint8_t expect_pubcomp_prop_rs[] = {
+	0x70, ENCODED_COMMON_ACK_REASON_STRING,
+};
+static struct mqtt_pubcomp_param pubcomp_prop_rs = {
+	COMMON_ACK_REASON_STRING(expect_pubcomp_prop_rs),
+};
+
+static uint8_t expect_pubcomp_prop_up[] = {
+	0x70, ENCODED_COMMON_ACK_USER_PROP,
+};
+static struct mqtt_pubcomp_param pubcomp_prop_up = {
+	COMMON_ACK_USER_PROP(expect_pubcomp_prop_up),
+};
+
+static struct mqtt_test pubcomp_tests[] = {
+	{ .test_name = "PUBCOMP, default",
+	  .ctx = &pubcomp_default, .test_fcn = test_msg_pubcomp,
+	  .expected = expect_pubcomp_default,
+	  .expected_len = sizeof(expect_pubcomp_default) },
+	{ .test_name = "PUBCOMP, error",
+	  .ctx = &pubcomp_error, .test_fcn = test_msg_pubcomp,
+	  .expected = expect_pubcomp_error,
+	  .expected_len = sizeof(expect_pubcomp_error) },
+	{ .test_name = "PUBCOMP, property Reason String",
+	  .ctx = &pubcomp_prop_rs, .test_fcn = test_msg_pubcomp,
+	  .expected = expect_pubcomp_prop_rs,
+	  .expected_len = sizeof(expect_pubcomp_prop_rs) },
+	{ .test_name = "PUBCOMP, property User Property",
+	  .ctx = &pubcomp_prop_up, .test_fcn = test_msg_pubcomp,
+	  .expected = expect_pubcomp_prop_up,
+	  .expected_len = sizeof(expect_pubcomp_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_pubcomp)
+{
+	run_packet_tests(pubcomp_tests, ARRAY_SIZE(pubcomp_tests));
+}
+
+static void test_msg_subscribe(struct mqtt_test *test)
+{
+	struct mqtt_subscription_list *exp_param =
+		(struct mqtt_subscription_list *)test->ctx;
+	struct buf_ctx buf;
+	int ret;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = subscribe_encode(&client, exp_param, &buf);
+	zassert_ok(ret, "subscribe_encode failed");
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+}
+
+static struct mqtt_topic test_sub_topic = {
+	.qos = MQTT_QOS_1_AT_LEAST_ONCE,
+	.topic = TEST_TOPIC,
+};
+
+#define SUBSCRIBE_COMMON \
+	.list = &test_sub_topic, \
+	.list_count = 1, \
+	.message_id = TEST_MSG_ID
+
+#define ENCODED_SUBSCRIBE_TOPIC \
+	0x00, 0x0a, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x6f, 0x70, 0x69, 0x63, \
+	0x01
+
+static uint8_t expect_subscribe_default[] = {
+	0x82, 0x10, ENCODED_MID,
+	/* No properties */
+	0x00,
+	/* Payload */
+	ENCODED_SUBSCRIBE_TOPIC,
+};
+static struct mqtt_subscription_list subscribe_default = {
+	SUBSCRIBE_COMMON,
+};
+
+static uint8_t expect_subscribe_prop_si[] = {
+	0x82, 0x13, ENCODED_MID,
+	/* Properties */
+	0x03, ENCODED_PROP_SUBSCRIPTION_IDENTIFIER,
+	/* Payload */
+	ENCODED_SUBSCRIBE_TOPIC,
+};
+static struct mqtt_subscription_list subscribe_prop_si = {
+	SUBSCRIBE_COMMON,
+	.prop.subscription_identifier = 1000,
+};
+
+static uint8_t expect_subscribe_prop_up[] = {
+	0x82, 0x28, ENCODED_MID,
+	/* Properties */
+	0x18, ENCODED_PROP_USER_PROPERTY,
+	/* Payload */
+	ENCODED_SUBSCRIBE_TOPIC,
+};
+static struct mqtt_subscription_list subscribe_prop_up = {
+	SUBSCRIBE_COMMON,
+	.prop.user_prop[0] = {
+		.name = USER_PROP_NAME,
+		.value = USER_PROP_VALUE,
+	},
+};
+
+static struct mqtt_test subscribe_tests[] = {
+	{ .test_name = "SUBSCRIBE, default",
+	  .ctx = &subscribe_default, .test_fcn = test_msg_subscribe,
+	  .expected = expect_subscribe_default,
+	  .expected_len = sizeof(expect_subscribe_default) },
+	{ .test_name = "SUBSCRIBE, property Subscription Identifier",
+	  .ctx = &subscribe_prop_si, .test_fcn = test_msg_subscribe,
+	  .expected = expect_subscribe_prop_si,
+	  .expected_len = sizeof(expect_subscribe_prop_si) },
+	{ .test_name = "SUBSCRIBE, property User Property",
+	  .ctx = &subscribe_prop_up, .test_fcn = test_msg_subscribe,
+	  .expected = expect_subscribe_prop_up,
+	  .expected_len = sizeof(expect_subscribe_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_subscribe)
+{
+	run_packet_tests(subscribe_tests, ARRAY_SIZE(subscribe_tests));
+}
+
+static void test_msg_suback(struct mqtt_test *test)
+{
+	struct mqtt_suback_param *exp_param =
+			(struct mqtt_suback_param *)test->ctx;
+	struct mqtt_suback_param dec_param = { 0 };
+	int ret;
+	uint8_t type_and_flags;
+	uint32_t length;
+	struct buf_ctx buf;
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_SUBACK,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = subscribe_ack_decode(&client, &buf, &dec_param);
+	zassert_ok(ret, "subscribe_ack_decode failed");
+	zassert_ok(validate_structs(&dec_param, exp_param, sizeof(dec_param)),
+		   "Incorrect SUBACK params decoded");
+}
+
+static uint8_t expect_suback_default[] = {
+	0x90, 0x05, ENCODED_MID,
+	/* No properties */
+	0x00,
+	/* Payload */
+	0x01, 0x02,
+};
+static struct mqtt_suback_param suback_default = {
+	.message_id = TEST_MSG_ID,
+	.return_codes.data = expect_suback_default + 5,
+	.return_codes.len = 2,
+};
+
+static uint8_t expect_suback_prop_rs[] = {
+	0x90, 0x1a, ENCODED_MID,
+	/* Properties */
+	0x15, ENCODED_PROP_REASON_STRING,
+	/* Payload */
+	0x01, 0x02,
+};
+static struct mqtt_suback_param suback_prop_rs = {
+	.message_id = TEST_MSG_ID,
+	.prop.rx.has_reason_string = true,
+	.prop.reason_string.utf8 = expect_suback_prop_rs + 8,
+	.prop.reason_string.size = 18,
+	.return_codes.data = expect_suback_prop_rs + 26,
+	.return_codes.len = 2,
+};
+
+static uint8_t expect_suback_prop_up[] = {
+	0x90, 0x1d, ENCODED_MID,
+	/* Properties */
+	0x18, ENCODED_PROP_USER_PROPERTY,
+	/* Payload */
+	0x01, 0x02,
+};
+static struct mqtt_suback_param suback_prop_up = {
+	.message_id = TEST_MSG_ID,
+	.prop.rx.has_user_prop = true,
+	.prop.user_prop[0].name.utf8 = expect_suback_prop_up + 8,
+	.prop.user_prop[0].name.size = 9,
+	.prop.user_prop[0].value.utf8 = expect_suback_prop_up + 19,
+	.prop.user_prop[0].value.size = 10,
+	.return_codes.data = expect_suback_prop_up + 29,
+	.return_codes.len = 2,
+};
+
+static struct mqtt_test suback_tests[] = {
+	{ .test_name = "SUBACK, default",
+	  .ctx = &suback_default, .test_fcn = test_msg_suback,
+	  .expected = expect_suback_default,
+	  .expected_len = sizeof(expect_suback_default) },
+	{ .test_name = "SUBACK, property Reason String",
+	  .ctx = &suback_prop_rs, .test_fcn = test_msg_suback,
+	  .expected = expect_suback_prop_rs,
+	  .expected_len = sizeof(expect_suback_prop_rs) },
+	{ .test_name = "SUBACK, property User Property",
+	  .ctx = &suback_prop_up, .test_fcn = test_msg_suback,
+	  .expected = expect_suback_prop_up,
+	  .expected_len = sizeof(expect_suback_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_suback)
+{
+	run_packet_tests(suback_tests, ARRAY_SIZE(suback_tests));
+}
+
+static void test_msg_unsubscribe(struct mqtt_test *test)
+{
+	struct mqtt_subscription_list *exp_param =
+		(struct mqtt_subscription_list *)test->ctx;
+	struct buf_ctx buf;
+	int ret;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = unsubscribe_encode(&client, exp_param, &buf);
+	zassert_ok(ret, "unsubscribe_encode failed");
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+}
+
+static struct mqtt_topic test_unsub_topic = {
+	.qos = MQTT_QOS_1_AT_LEAST_ONCE,
+	.topic = TEST_TOPIC,
+};
+
+#define UNSUBSCRIBE_COMMON \
+	.list = &test_unsub_topic, \
+	.list_count = 1, \
+	.message_id = TEST_MSG_ID
+
+#define ENCODED_UNSUBSCRIBE_TOPIC \
+	0x00, 0x0a, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x6f, 0x70, 0x69, 0x63
+
+static uint8_t expect_unsubscribe_default[] = {
+	0xa2, 0x0f, ENCODED_MID,
+	/* No properties */
+	0x00,
+	/* Payload */
+	ENCODED_UNSUBSCRIBE_TOPIC,
+};
+static struct mqtt_subscription_list unsubscribe_default = {
+	UNSUBSCRIBE_COMMON,
+};
+
+static uint8_t expect_unsubscribe_prop_up[] = {
+	0xa2, 0x27, ENCODED_MID,
+	/* Properties */
+	0x18, ENCODED_PROP_USER_PROPERTY,
+	/* Payload */
+	ENCODED_UNSUBSCRIBE_TOPIC,
+};
+static struct mqtt_subscription_list unsubscribe_prop_up = {
+	UNSUBSCRIBE_COMMON,
+	.prop.user_prop[0] = {
+		.name = USER_PROP_NAME,
+		.value = USER_PROP_VALUE,
+	},
+};
+
+static struct mqtt_test unsubscribe_tests[] = {
+	{ .test_name = "UNSUBSCRIBE, default",
+	  .ctx = &unsubscribe_default, .test_fcn = test_msg_unsubscribe,
+	  .expected = expect_unsubscribe_default,
+	  .expected_len = sizeof(expect_unsubscribe_default) },
+	{ .test_name = "UNSUBSCRIBE, property User Property",
+	  .ctx = &unsubscribe_prop_up, .test_fcn = test_msg_unsubscribe,
+	  .expected = expect_unsubscribe_prop_up,
+	  .expected_len = sizeof(expect_unsubscribe_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_unsubscribe)
+{
+	run_packet_tests(unsubscribe_tests, ARRAY_SIZE(unsubscribe_tests));
+}
+
+static void test_msg_unsuback(struct mqtt_test *test)
+{
+	struct mqtt_unsuback_param *exp_param =
+			(struct mqtt_unsuback_param *)test->ctx;
+	struct mqtt_unsuback_param dec_param = { 0 };
+	int ret;
+	uint8_t type_and_flags;
+	uint32_t length;
+	struct buf_ctx buf;
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_UNSUBACK,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = unsubscribe_ack_decode(&client, &buf, &dec_param);
+	zassert_ok(ret, "unsubscribe_ack_decode failed");
+	zassert_ok(validate_structs(&dec_param, exp_param, sizeof(dec_param)),
+		   "Incorrect UNSUBACK params decoded");
+}
+
+static uint8_t expect_unsuback_default[] = {
+	0xb0, 0x05, ENCODED_MID,
+	/* No properties */
+	0x00,
+	/* Payload */
+	0x00, 0x00,
+};
+static struct mqtt_unsuback_param unsuback_default = {
+	.message_id = TEST_MSG_ID,
+	.reason_codes.data = expect_unsuback_default + 5,
+	.reason_codes.len = 2,
+};
+
+static uint8_t expect_unsuback_prop_rs[] = {
+	0xb0, 0x19, ENCODED_MID,
+	/* Properties */
+	0x15, ENCODED_PROP_REASON_STRING,
+	/* Payload */
+	0x00,
+};
+static struct mqtt_unsuback_param unsuback_prop_rs = {
+	.message_id = TEST_MSG_ID,
+	.prop.rx.has_reason_string = true,
+	.prop.reason_string.utf8 = expect_unsuback_prop_rs + 8,
+	.prop.reason_string.size = 18,
+	.reason_codes.data = expect_unsuback_prop_rs + 26,
+	.reason_codes.len = 1,
+};
+
+static uint8_t expect_unsuback_prop_up[] = {
+	0xb0, 0x1c, ENCODED_MID,
+	/* Properties */
+	0x18, ENCODED_PROP_USER_PROPERTY,
+	/* Payload */
+	0x00,
+};
+static struct mqtt_unsuback_param unsuback_prop_up = {
+	.message_id = TEST_MSG_ID,
+	.prop.rx.has_user_prop = true,
+	.prop.user_prop[0].name.utf8 = expect_unsuback_prop_up + 8,
+	.prop.user_prop[0].name.size = 9,
+	.prop.user_prop[0].value.utf8 = expect_unsuback_prop_up + 19,
+	.prop.user_prop[0].value.size = 10,
+	.reason_codes.data = expect_unsuback_prop_up + 29,
+	.reason_codes.len = 1,
+};
+
+static struct mqtt_test unsuback_tests[] = {
+	{ .test_name = "UNSUBACK, default",
+	  .ctx = &unsuback_default, .test_fcn = test_msg_unsuback,
+	  .expected = expect_unsuback_default,
+	  .expected_len = sizeof(expect_unsuback_default) },
+	{ .test_name = "UNSUBACK, property Reason String",
+	  .ctx = &unsuback_prop_rs, .test_fcn = test_msg_unsuback,
+	  .expected = expect_unsuback_prop_rs,
+	  .expected_len = sizeof(expect_unsuback_prop_rs) },
+	{ .test_name = "UNSUBACK, property User Property",
+	  .ctx = &unsuback_prop_up, .test_fcn = test_msg_unsuback,
+	  .expected = expect_unsuback_prop_up,
+	  .expected_len = sizeof(expect_unsuback_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_unsuback)
+{
+	run_packet_tests(unsuback_tests, ARRAY_SIZE(unsuback_tests));
+}
+
+static void test_msg_disconnect(struct mqtt_test *test)
+{
+	struct mqtt_disconnect_param *exp_param =
+			(struct mqtt_disconnect_param *)test->ctx;
+	struct mqtt_disconnect_param dec_param = { 0 };
+	uint8_t type_and_flags;
+	struct buf_ctx buf;
+	uint32_t length;
+	int ret;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = disconnect_encode(&client, exp_param, &buf);
+	zassert_ok(ret, "disconnect_encode failed");
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_DISCONNECT,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = disconnect_decode(&client, &buf, &dec_param);
+	zassert_ok(ret, "disconnect_decode failed");
+	zassert_ok(validate_structs(&dec_param, exp_param, sizeof(dec_param)),
+		   "Incorrect DISCONNECT params decoded");
+}
+
+static uint8_t expect_disconnect_default[] = {
+	0xe0, 0x00,
+};
+static struct mqtt_disconnect_param disconnect_default = {
+	.reason_code = MQTT_DISCONNECT_NORMAL,
+};
+
+static uint8_t expect_disconnect_error[] = {
+	0xe0, 0x01, 0x82,
+};
+static struct mqtt_disconnect_param disconnect_error = {
+	.reason_code = MQTT_DISCONNECT_PROTOCOL_ERROR,
+};
+
+static uint8_t expect_disconnect_prop_sei[] = {
+	0xe0, 0x07, 0x00,
+	/* Properties */
+	0x05, ENCODED_PROP_SESSION_EXPIRY_INTERVAL,
+};
+static struct mqtt_disconnect_param disconnect_prop_sei = {
+	.reason_code = MQTT_DISCONNECT_NORMAL,
+	.prop.rx.has_session_expiry_interval = true,
+	.prop.session_expiry_interval = TEST_PROP_SESSION_EXPIRY_INTERVAL,
+};
+
+static uint8_t expect_disconnect_prop_rs[] = {
+	0xe0, 0x17, 0x82,
+	/* Properties */
+	0x15, ENCODED_PROP_REASON_STRING,
+};
+static struct mqtt_disconnect_param disconnect_prop_rs = {
+	.reason_code = MQTT_DISCONNECT_PROTOCOL_ERROR,
+	.prop.rx.has_reason_string = true,
+	.prop.reason_string.utf8 = expect_disconnect_prop_rs + 7,
+	.prop.reason_string.size = 18,
+};
+
+static uint8_t expect_disconnect_prop_up[] = {
+	0xe0, 0x1a, 0x00,
+	/* Properties */
+	0x18, ENCODED_PROP_USER_PROPERTY,
+};
+static struct mqtt_disconnect_param disconnect_prop_up = {
+	.reason_code = MQTT_DISCONNECT_NORMAL,
+	.prop.rx.has_user_prop = true,
+	.prop.user_prop[0].name.utf8 = expect_disconnect_prop_up + 7,
+	.prop.user_prop[0].name.size = 9,
+	.prop.user_prop[0].value.utf8 = expect_disconnect_prop_up + 18,
+	.prop.user_prop[0].value.size = 10,
+};
+
+static uint8_t expect_disconnect_prop_sr[] = {
+	0xe0, 0x13, 0x00,
+	/* Properties */
+	0x11, ENCODED_PROP_SERVER_REFERENCE,
+};
+static struct mqtt_disconnect_param disconnect_prop_sr = {
+	.reason_code = MQTT_DISCONNECT_NORMAL,
+	.prop.rx.has_server_reference = true,
+	.prop.server_reference.utf8 = expect_disconnect_prop_sr + 7,
+	.prop.server_reference.size = 14,
+};
+
+static struct mqtt_test disconnect_tests[] = {
+	{ .test_name = "DISCONNECT, default",
+	  .ctx = &disconnect_default, .test_fcn = test_msg_disconnect,
+	  .expected = expect_disconnect_default,
+	  .expected_len = sizeof(expect_disconnect_default) },
+	{ .test_name = "DISCONNECT, error",
+	  .ctx = &disconnect_error, .test_fcn = test_msg_disconnect,
+	  .expected = expect_disconnect_error,
+	  .expected_len = sizeof(expect_disconnect_error) },
+	{ .test_name = "DISCONNECT, property Session Expiry Interval",
+	  .ctx = &disconnect_prop_sei, .test_fcn = test_msg_disconnect,
+	  .expected = expect_disconnect_prop_sei,
+	  .expected_len = sizeof(expect_disconnect_prop_sei) },
+	{ .test_name = "DISCONNECT, property Reason String",
+	  .ctx = &disconnect_prop_rs, .test_fcn = test_msg_disconnect,
+	  .expected = expect_disconnect_prop_rs,
+	  .expected_len = sizeof(expect_disconnect_prop_rs) },
+	{ .test_name = "DISCONNECT, property User Property",
+	  .ctx = &disconnect_prop_up, .test_fcn = test_msg_disconnect,
+	  .expected = expect_disconnect_prop_up,
+	  .expected_len = sizeof(expect_disconnect_prop_up) },
+	{ .test_name = "DISCONNECT, property Server Reference",
+	  .ctx = &disconnect_prop_sr, .test_fcn = test_msg_disconnect,
+	  .expected = expect_disconnect_prop_sr,
+	  .expected_len = sizeof(expect_disconnect_prop_sr) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_disconnect)
+{
+	run_packet_tests(disconnect_tests, ARRAY_SIZE(disconnect_tests));
+}
+
+static void test_msg_auth(struct mqtt_test *test)
+{
+	struct mqtt_auth_param *exp_param =
+			(struct mqtt_auth_param *)test->ctx;
+	struct mqtt_auth_param dec_param = { 0 };
+	uint8_t type_and_flags;
+	struct buf_ctx buf;
+	uint32_t length;
+	int ret;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = auth_encode(exp_param, &buf);
+	zassert_ok(ret, "auth_encode failed");
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_AUTH,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = auth_decode(&client, &buf, &dec_param);
+	zassert_ok(ret, "auth_decode failed");
+	zassert_ok(validate_structs(&dec_param, exp_param, sizeof(dec_param)),
+		   "Incorrect AUTH params decoded");
+}
+
+static uint8_t expect_auth_default[] = {
+	0xf0, 0x00,
+};
+static struct mqtt_auth_param auth_default = {
+	.reason_code = MQTT_AUTH_SUCCESS,
+};
+
+static uint8_t expect_auth_reason[] = {
+	0xf0, 0x01, 0x18,
+};
+static struct mqtt_auth_param auth_reason = {
+	.reason_code = MQTT_AUTH_CONTINUE_AUTHENTICATION,
+};
+
+static uint8_t expect_auth_prop_am_ad[] = {
+	0xf0, 0x1f, 0x00,
+	/* Properties */
+	0x1d, ENCODED_PROP_AUTHENTICATION_METHOD,
+	ENCODED_PROP_AUTHENTICATION_DATA,
+};
+static struct mqtt_auth_param auth_prop_am_ad = {
+	.reason_code = MQTT_AUTH_SUCCESS,
+	.prop.rx.has_auth_method = true,
+	.prop.auth_method.utf8 = expect_auth_prop_am_ad + 7,
+	.prop.auth_method.size = 19,
+	.prop.rx.has_auth_data = true,
+	.prop.auth_data.data = expect_auth_prop_am_ad + 29,
+	.prop.auth_data.len = 4,
+};
+
+static uint8_t expect_auth_prop_rs[] = {
+	0xf0, 0x17, 0x18,
+	/* Properties */
+	0x15, ENCODED_PROP_REASON_STRING,
+};
+static struct mqtt_auth_param auth_prop_rs = {
+	.reason_code = MQTT_AUTH_CONTINUE_AUTHENTICATION,
+	.prop.rx.has_reason_string = true,
+	.prop.reason_string.utf8 = expect_auth_prop_rs + 7,
+	.prop.reason_string.size = 18,
+};
+
+static uint8_t expect_auth_prop_up[] = {
+	0xf0, 0x1a, 0x00,
+	/* Properties */
+	0x18, ENCODED_PROP_USER_PROPERTY,
+};
+static struct mqtt_auth_param auth_prop_up = {
+	.reason_code = MQTT_AUTH_SUCCESS,
+	.prop.rx.has_user_prop = true,
+	.prop.user_prop[0].name.utf8 = expect_auth_prop_up + 7,
+	.prop.user_prop[0].name.size = 9,
+	.prop.user_prop[0].value.utf8 = expect_auth_prop_up + 18,
+	.prop.user_prop[0].value.size = 10,
+};
+
+static struct mqtt_test auth_tests[] = {
+	{ .test_name = "AUTH, default",
+	  .ctx = &auth_default, .test_fcn = test_msg_auth,
+	  .expected = expect_auth_default,
+	  .expected_len = sizeof(expect_auth_default) },
+	{ .test_name = "AUTH, reason code",
+	  .ctx = &auth_reason, .test_fcn = test_msg_auth,
+	  .expected = expect_auth_reason,
+	  .expected_len = sizeof(expect_auth_reason) },
+	{ .test_name = "AUTH, property Authentication Method and Data",
+	  .ctx = &auth_prop_am_ad, .test_fcn = test_msg_auth,
+	  .expected = expect_auth_prop_am_ad,
+	  .expected_len = sizeof(expect_auth_prop_am_ad) },
+	{ .test_name = "AUTH, property Reason String",
+	  .ctx = &auth_prop_rs, .test_fcn = test_msg_auth,
+	  .expected = expect_auth_prop_rs,
+	  .expected_len = sizeof(expect_auth_prop_rs) },
+	{ .test_name = "AUTH, property User Property",
+	  .ctx = &auth_prop_up, .test_fcn = test_msg_auth,
+	  .expected = expect_auth_prop_up,
+	  .expected_len = sizeof(expect_auth_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_auth)
+{
+	run_packet_tests(auth_tests, ARRAY_SIZE(auth_tests));
+}
+
+static void packet_tests_before(void *fixture)
+{
+	ARG_UNUSED(fixture);
+
+	mqtt_client_init(&client);
+	client.protocol_version = MQTT_VERSION_5_0;
+	client.rx_buf = rx_buffer;
+	client.rx_buf_size = sizeof(rx_buffer);
+	client.tx_buf = tx_buffer;
+	client.tx_buf_size = sizeof(tx_buffer);
+}
+
+static void packet_tests_after(void *fixture)
+{
+	ARG_UNUSED(fixture);
+
+	memset(&client, 0, sizeof(client));
+}
+
+ZTEST_SUITE(mqtt_5_packet, NULL, NULL, packet_tests_before, packet_tests_after, NULL);
diff --git a/tests/net/lib/mqtt/v5_0/mqtt_packet/testcase.yaml b/tests/net/lib/mqtt/v5_0/mqtt_packet/testcase.yaml
new file mode 100644
index 00000000000..8c639e76cef
--- /dev/null
+++ b/tests/net/lib/mqtt/v5_0/mqtt_packet/testcase.yaml
@@ -0,0 +1,9 @@
+common:
+  tags:
+    - mqtt
+    - net
+    - userspace
+  min_ram: 16
+  depends_on: netif
+tests:
+  net.mqtt_5.packet: {}

From c4bef301dcf1008abddf146fad4722f3e877a8c0 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Wed, 19 Mar 2025 14:53:04 +0100
Subject: [PATCH 2765/2913] [nrf fromtree] net: mqtt: Make sure MQTT 5.0 is
 visible in API documentation

Make sure conditionally compiled parts of the public header related to
MQTT 5.0 support are rendered by doxygen.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit f9b4e278561964c162247ac5b18341aeae2fa589)
---
 include/zephyr/net/mqtt.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index 3fdabf51ecb..431ee52e2ab 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -292,7 +292,7 @@ struct mqtt_connack_param {
 	 */
 	uint8_t return_code;
 
-#if defined(CONFIG_MQTT_VERSION_5_0)
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 	struct {
 		/** MQTT 5.0, chapter 3.2.2.3.10 User Property. */
 		struct mqtt_utf8_pair user_prop[CONFIG_MQTT_USER_PROPERTIES_MAX];
@@ -408,7 +408,7 @@ struct mqtt_puback_param {
 	/** Message id of the PUBLISH message being acknowledged */
 	uint16_t message_id;
 
-#if defined(CONFIG_MQTT_VERSION_5_0)
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 	/** MQTT 5.0 reason code. */
 	uint8_t reason_code;
 
@@ -422,7 +422,7 @@ struct mqtt_pubrec_param {
 	/** Message id of the PUBLISH message being acknowledged */
 	uint16_t message_id;
 
-#if defined(CONFIG_MQTT_VERSION_5_0)
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 	/** MQTT 5.0 reason code. */
 	uint8_t reason_code;
 
@@ -436,7 +436,7 @@ struct mqtt_pubrel_param {
 	/** Message id of the PUBREC message being acknowledged */
 	uint16_t message_id;
 
-#if defined(CONFIG_MQTT_VERSION_5_0)
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 	/** MQTT 5.0 reason code. */
 	uint8_t reason_code;
 
@@ -450,7 +450,7 @@ struct mqtt_pubcomp_param {
 	/** Message id of the PUBREL message being acknowledged */
 	uint16_t message_id;
 
-#if defined(CONFIG_MQTT_VERSION_5_0)
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 	/** MQTT 5.0 reason code. */
 	uint8_t reason_code;
 
@@ -471,7 +471,7 @@ struct mqtt_suback_param {
 	 */
 	struct mqtt_binstr return_codes;
 
-#if defined(CONFIG_MQTT_VERSION_5_0)
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 	/** MQTT 5.0 properties. */
 	struct mqtt_common_ack_properties prop;
 #endif /* CONFIG_MQTT_VERSION_5_0 */
@@ -482,7 +482,7 @@ struct mqtt_unsuback_param {
 	/** Message id of the UNSUBSCRIBE message being acknowledged */
 	uint16_t message_id;
 
-#if defined(CONFIG_MQTT_VERSION_5_0)
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 	/** Reason codes corresponding to each topic in the unsubscription list. */
 	struct mqtt_binstr reason_codes;
 
@@ -511,7 +511,7 @@ struct mqtt_publish_param {
 	 */
 	uint8_t retain_flag : 1;
 
-#if defined(CONFIG_MQTT_VERSION_5_0)
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 	/** MQTT 5.0 properties. */
 	struct {
 		/** MQTT 5.0, chapter 3.3.2.3.7 User Property. */
@@ -572,7 +572,7 @@ struct mqtt_subscription_list {
 	/** Message id used to identify subscription request. */
 	uint16_t message_id;
 
-#if defined(CONFIG_MQTT_VERSION_5_0)
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 	/** MQTT 5.0 properties. */
 	struct {
 		/** MQTT 5.0, chapter 3.8.2.1.3 / 3.10.2.1.2 User Property. */
@@ -588,7 +588,7 @@ struct mqtt_subscription_list {
 
 /** @brief Parameters for disconnect message. */
 struct mqtt_disconnect_param {
-#if defined(CONFIG_MQTT_VERSION_5_0)
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 	/* MQTT 5.0 Disconnect reason code. */
 	enum mqtt_disconnect_reason_code reason_code;
 
@@ -621,7 +621,7 @@ struct mqtt_disconnect_param {
 #endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
-#if defined(CONFIG_MQTT_VERSION_5_0)
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 struct mqtt_auth_param {
 	/* MQTT 5.0, chapter 3.15.2.1 Authenticate Reason Code */
 	enum mqtt_auth_reason_code reason_code;
@@ -688,7 +688,7 @@ union mqtt_evt_param {
 	/** Parameters accompanying MQTT_EVT_UNSUBACK event. */
 	struct mqtt_unsuback_param unsuback;
 
-#if defined(CONFIG_MQTT_VERSION_5_0)
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 	/** Parameters accompanying MQTT_EVT_DISCONNECT event. */
 	struct mqtt_disconnect_param disconnect;
 
@@ -876,7 +876,7 @@ struct mqtt_internal {
 	/** Internal. Remaining payload length to read. */
 	uint32_t remaining_payload;
 
-#if defined(CONFIG_MQTT_VERSION_5_0)
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 	/** Internal. MQTT 5.0 topic alias mapping. */
 	struct mqtt_topic_alias topic_aliases[CONFIG_MQTT_TOPIC_ALIAS_MAX];
 
@@ -915,7 +915,7 @@ struct mqtt_client {
 	 */
 	struct mqtt_utf8 *password;
 
-#if defined(CONFIG_MQTT_VERSION_5_0)
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 	/** MQTT 5.0 Will properties. */
 	struct {
 		/** MQTT 5.0, chapter 3.1.3.2.8 User Property. */
@@ -976,7 +976,7 @@ struct mqtt_client {
 	/** Unanswered PINGREQ count on this connection. */
 	int8_t unacked_ping;
 
-#if defined(CONFIG_MQTT_VERSION_5_0)
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 	/** MQTT 5.0 properties. */
 	struct {
 		/** MQTT 5.0, chapter 3.1.2.11.8 User Property. */
@@ -1186,7 +1186,7 @@ int mqtt_ping(struct mqtt_client *client);
 int mqtt_disconnect(struct mqtt_client *client,
 		    const struct mqtt_disconnect_param *param);
 
-#if defined(CONFIG_MQTT_VERSION_5_0)
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 /**
  * @brief API to send an authentication packet to the server.
  *

From 415c5af40cefd0bb567903afd790118805e51b9d Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Wed, 19 Mar 2025 15:25:15 +0100
Subject: [PATCH 2766/2913] [nrf fromtree] doc: mqtt: Add mention of MQTT 5.0
 support

MQTT 5.0 is now supported so reflect this in the library documentation.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit e3804731b07b8af7daad944d0cb0aa43c9ff6dfa)
---
 doc/connectivity/networking/api/mqtt.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/connectivity/networking/api/mqtt.rst b/doc/connectivity/networking/api/mqtt.rst
index 79da5abe57b..3d222d53816 100644
--- a/doc/connectivity/networking/api/mqtt.rst
+++ b/doc/connectivity/networking/api/mqtt.rst
@@ -18,7 +18,7 @@ For more information about the protocol itself, see http://mqtt.org/.
 Zephyr provides an MQTT client library built on top of BSD sockets API. The
 library can be enabled with :kconfig:option:`CONFIG_MQTT_LIB` Kconfig option and
 is configurable at a per-client basis, with support for MQTT versions
-3.1.0 and 3.1.1. The Zephyr MQTT implementation can be used with either plain
+3.1.0, 3.1.1 and 5.0. The Zephyr MQTT implementation can be used with either plain
 sockets communicating over TCP, or with secure sockets communicating over
 TLS. See :ref:`bsd_sockets_interface` for more information about Zephyr sockets.
 

From 1a2d42b0aa3b4bc2148d4c1ae2ccc977cf6282c5 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 27 Mar 2025 11:32:29 +0100
Subject: [PATCH 2767/2913] [nrf fromlist] net: lib: mqtt: Add extra MQTT 5.0
 ifdefs to prevent compile errors

Upstream PR #: 87741

Add some extra ifdefs around MQTT 5.0 specific structures to prevent
compiler errors due to undefined symbols in certain configurations.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
---
 include/zephyr/net/mqtt.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index 431ee52e2ab..b06c743201b 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -80,8 +80,10 @@ enum mqtt_evt_type {
 	/** Ping Response from server. */
 	MQTT_EVT_PINGRESP,
 
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 	/** Authentication packet received from server. MQTT 5.0 only. */
 	MQTT_EVT_AUTH,
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief MQTT version protocol level. */
@@ -244,11 +246,13 @@ struct mqtt_binstr {
 
 /** @brief Abstracts aliased topic. */
 struct mqtt_topic_alias {
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 	/** UTF-8 encoded topic name. */
 	uint8_t topic_buf[CONFIG_MQTT_TOPIC_ALIAS_STRING_MAX];
 
 	/** Topic name size. */
 	uint16_t topic_size;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief Abstracts MQTT UTF-8 encoded topic that can be subscribed
@@ -388,6 +392,7 @@ struct mqtt_connack_param {
 
 /** @brief Common MQTT 5.0 properties shared across all ack-type messages. */
 struct mqtt_common_ack_properties {
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 	/** MQTT 5.0, chapter 3.4.2.2.3 User Property. */
 	struct mqtt_utf8_pair user_prop[CONFIG_MQTT_USER_PROPERTIES_MAX];
 
@@ -401,6 +406,7 @@ struct mqtt_common_ack_properties {
 		/** User Property property was present. */
 		bool has_user_prop;
 	} rx;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief Parameters for MQTT publish acknowledgment (PUBACK). */
@@ -621,8 +627,9 @@ struct mqtt_disconnect_param {
 #endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
-#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+/** @brief Parameters for auth message. */
 struct mqtt_auth_param {
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
 	/* MQTT 5.0, chapter 3.15.2.1 Authenticate Reason Code */
 	enum mqtt_auth_reason_code reason_code;
 
@@ -651,8 +658,8 @@ struct mqtt_auth_param {
 			bool has_user_prop;
 		} rx;
 	} prop;
-};
 #endif /* CONFIG_MQTT_VERSION_5_0 */
+};
 
 /**
  * @brief Defines event parameters notified along with asynchronous events

From db413b6428b12346eaae230e3579f1cc8337bf43 Mon Sep 17 00:00:00 2001
From: Andrzej Kuros <andrzej.kuros@nordicsemi.no>
Date: Mon, 24 Mar 2025 13:10:54 +0100
Subject: [PATCH 2768/2913] [nrf fromtree] drivers: i2c_nrfx_twim: add
 exclusive access API

This commit provides an extension to the i2c_nrfx_twim driver.
It introduces possibility to acquire/release exclusive access to the
i2c bus. While the exclusive access to the i2c bus is acquired
you can access the underlying nrfx_twim driver directly.

Signed-off-by: Andrzej Kuros <andrzej.kuros@nordicsemi.no>
(cherry picked from commit d15c9fe9a613e2f9f6741f25209ef1a5fb9d4326)
---
 drivers/i2c/i2c_nrfx_twim.c                   |  32 +++-
 include/zephyr/drivers/i2c/i2c_nrfx_twim.h    |  34 ++++
 .../drivers/i2c/i2c_nrfx_twim/CMakeLists.txt  |   8 +
 .../boards/nrf5340dk_nrf5340_cpuapp.overlay   |  49 ++++++
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay |  72 ++++++++
 .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay |  68 ++++++++
 tests/drivers/i2c/i2c_nrfx_twim/prj.conf      |  11 ++
 .../i2c_nrfx_twim/src/test_i2c_nrfx_twim.c    | 165 ++++++++++++++++++
 tests/drivers/i2c/i2c_nrfx_twim/testcase.yaml |  18 ++
 9 files changed, 451 insertions(+), 6 deletions(-)
 create mode 100644 include/zephyr/drivers/i2c/i2c_nrfx_twim.h
 create mode 100644 tests/drivers/i2c/i2c_nrfx_twim/CMakeLists.txt
 create mode 100644 tests/drivers/i2c/i2c_nrfx_twim/boards/nrf5340dk_nrf5340_cpuapp.overlay
 create mode 100644 tests/drivers/i2c/i2c_nrfx_twim/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
 create mode 100644 tests/drivers/i2c/i2c_nrfx_twim/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
 create mode 100644 tests/drivers/i2c/i2c_nrfx_twim/prj.conf
 create mode 100644 tests/drivers/i2c/i2c_nrfx_twim/src/test_i2c_nrfx_twim.c
 create mode 100644 tests/drivers/i2c/i2c_nrfx_twim/testcase.yaml

diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c
index 6be4b1c1050..953a03a7b73 100644
--- a/drivers/i2c/i2c_nrfx_twim.c
+++ b/drivers/i2c/i2c_nrfx_twim.c
@@ -5,6 +5,7 @@
  */
 
 #include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c/i2c_nrfx_twim.h>
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/pm/device.h>
 #include <zephyr/pm/device_runtime.h>
@@ -33,6 +34,29 @@ struct i2c_nrfx_twim_data {
 	volatile nrfx_err_t res;
 };
 
+int i2c_nrfx_twim_exclusive_access_acquire(const struct device *dev, k_timeout_t timeout)
+{
+	struct i2c_nrfx_twim_data *dev_data = dev->data;
+	int ret;
+
+	ret = k_sem_take(&dev_data->transfer_sync, timeout);
+
+	if (ret == 0) {
+		(void)pm_device_runtime_get(dev);
+	}
+
+	return ret;
+}
+
+void i2c_nrfx_twim_exclusive_access_release(const struct device *dev)
+{
+	struct i2c_nrfx_twim_data *dev_data = dev->data;
+
+	(void)pm_device_runtime_put(dev);
+
+	k_sem_give(&dev_data->transfer_sync);
+}
+
 static int i2c_nrfx_twim_transfer(const struct device *dev,
 				  struct i2c_msg *msgs,
 				  uint8_t num_msgs, uint16_t addr)
@@ -46,13 +70,11 @@ static int i2c_nrfx_twim_transfer(const struct device *dev,
 	uint8_t *buf;
 	uint16_t buf_len;
 
-	k_sem_take(&dev_data->transfer_sync, K_FOREVER);
+	(void)i2c_nrfx_twim_exclusive_access_acquire(dev, K_FOREVER);
 
 	/* Dummy take on completion_sync sem to be sure that it is empty */
 	k_sem_take(&dev_data->completion_sync, K_NO_WAIT);
 
-	(void)pm_device_runtime_get(dev);
-
 	for (size_t i = 0; i < num_msgs; i++) {
 		if (I2C_MSG_ADDR_10_BITS & msgs[i].flags) {
 			ret = -ENOTSUP;
@@ -164,9 +186,7 @@ static int i2c_nrfx_twim_transfer(const struct device *dev,
 		msg_buf_used = 0;
 	}
 
-	(void)pm_device_runtime_put(dev);
-
-	k_sem_give(&dev_data->transfer_sync);
+	i2c_nrfx_twim_exclusive_access_release(dev);
 
 	return ret;
 }
diff --git a/include/zephyr/drivers/i2c/i2c_nrfx_twim.h b/include/zephyr/drivers/i2c/i2c_nrfx_twim.h
new file mode 100644
index 00000000000..37b4a65a84b
--- /dev/null
+++ b/include/zephyr/drivers/i2c/i2c_nrfx_twim.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_I2C_NRFX_TWIM_H
+#define ZEPHYR_INCLUDE_DRIVERS_I2C_NRFX_TWIM_H
+
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/i2c.h>
+
+/** @brief Acquires exclusive access to the i2c bus controller.
+ *
+ * @param dev      Pointer to the device structure for an I2C controller
+ *                 driver configured in controller mode.
+ * @param timeout  Timeout for waiting to acquire exclusive access.
+ *
+ * @retval 0       If successful.
+ * @retval -EBUSY  Returned without waiting.
+ * @retval -EAGAIN Waiting period timed out,
+ *                 or the underlying semaphore was reset during the waiting period.
+ */
+int i2c_nrfx_twim_exclusive_access_acquire(const struct device *dev, k_timeout_t timeout);
+
+/** @brief Releases exclusive access to the i2c bus controller.
+ *
+ * @param dev      Pointer to the device structure for an I2C controller
+ *                 driver on which @ref i2c_nrfx_twim_exclusive_access_acquire
+ *                 has been successfully called.
+ */
+void i2c_nrfx_twim_exclusive_access_release(const struct device *dev);
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_I2C_NRFX_TWIM_H */
diff --git a/tests/drivers/i2c/i2c_nrfx_twim/CMakeLists.txt b/tests/drivers/i2c/i2c_nrfx_twim/CMakeLists.txt
new file mode 100644
index 00000000000..65eaa7adcb1
--- /dev/null
+++ b/tests/drivers/i2c/i2c_nrfx_twim/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(i2c_api)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/drivers/i2c/i2c_nrfx_twim/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/drivers/i2c/i2c_nrfx_twim/boards/nrf5340dk_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..99a22ba075f
--- /dev/null
+++ b/tests/drivers/i2c/i2c_nrfx_twim/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * SDA = P0.26 and P1.2
+ * SCL = P0.25 and P1.3
+ */
+
+/ {
+	aliases {
+		i2c-controller = &i2c1;
+		i2c-controller-target = &i2c2;
+	};
+};
+
+&pinctrl {
+	i2c2_default: i2c2_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 0, 26)>,
+				<NRF_PSEL(TWIS_SCL, 0, 25)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c2_sleep: i2c2_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 0, 26)>,
+				<NRF_PSEL(TWIS_SCL, 0, 25)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c2 {
+	compatible = "nordic,nrf-twis";
+	pinctrl-0 = <&i2c2_default>;
+	pinctrl-1 = <&i2c2_sleep>;
+	pinctrl-names = "default", "sleep";
+	status = "okay";
+};
+
+&i2c1 {
+	compatible = "nordic,nrf-twim";
+	zephyr,concat-buf-size = <256>;
+	status = "okay";
+};
diff --git a/tests/drivers/i2c/i2c_nrfx_twim/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/i2c/i2c_nrfx_twim/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..cbe5db62983
--- /dev/null
+++ b/tests/drivers/i2c/i2c_nrfx_twim/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * SDA = P2.8 and P2.9
+ * SCL = P1.2 and P1.3
+ */
+
+/ {
+	aliases {
+		i2c-controller = &i2c130;
+		i2c-controller-target = &i2c131;
+	};
+};
+
+&pinctrl {
+	i2c130_default: i2c130_default {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 8)>,
+				<NRF_PSEL(TWIM_SCL, 1, 2)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c130_sleep: i2c130_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 8)>,
+				<NRF_PSEL(TWIM_SCL, 1, 2)>;
+			low-power-enable;
+		};
+	};
+
+	i2c131_default: i2c131_default {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 9)>,
+				<NRF_PSEL(TWIM_SCL, 1, 3)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c131_sleep: i2c131_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 9)>,
+				<NRF_PSEL(TWIM_SCL, 1, 3)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c130 {
+	compatible = "nordic,nrf-twim";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c130_default>;
+	pinctrl-1 = <&i2c130_sleep>;
+	pinctrl-names = "default", "sleep";
+	zephyr,concat-buf-size = <256>;
+	memory-regions = <&cpuapp_dma_region>;
+	status = "okay";
+};
+
+&i2c131 {
+	compatible = "nordic,nrf-twis";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c131_default>;
+	pinctrl-1 = <&i2c131_sleep>;
+	pinctrl-names = "default", "sleep";
+	memory-regions = <&cpuapp_dma_region>;
+	status = "okay";
+};
diff --git a/tests/drivers/i2c/i2c_nrfx_twim/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/i2c/i2c_nrfx_twim/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 00000000000..f24477f4102
--- /dev/null
+++ b/tests/drivers/i2c/i2c_nrfx_twim/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * SDA = P1.8 and P1.9
+ * SCL = P1.10 and P1.11
+ */
+
+/ {
+	aliases {
+		i2c-controller = &i2c21;
+		i2c-controller-target = &i2c22;
+	};
+};
+
+&pinctrl {
+	i2c21_default: i2c21_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 8)>,
+				<NRF_PSEL(TWIS_SCL, 1, 10)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c21_sleep: i2c21_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 8)>,
+				<NRF_PSEL(TWIS_SCL, 1, 10)>;
+			low-power-enable;
+		};
+	};
+
+	i2c22_default: i2c22_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 9)>,
+				<NRF_PSEL(TWIS_SCL, 1, 11)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c22_sleep: i2c22_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 9)>,
+				<NRF_PSEL(TWIS_SCL, 1, 11)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c21 {
+	compatible = "nordic,nrf-twim";
+	pinctrl-0 = <&i2c21_default>;
+	pinctrl-1 = <&i2c21_sleep>;
+	pinctrl-names = "default", "sleep";
+	zephyr,concat-buf-size = <256>;
+	status = "okay";
+};
+
+&i2c22 {
+	compatible = "nordic,nrf-twis";
+	pinctrl-0 = <&i2c22_default>;
+	pinctrl-1 = <&i2c22_sleep>;
+	pinctrl-names = "default", "sleep";
+	status = "okay";
+};
diff --git a/tests/drivers/i2c/i2c_nrfx_twim/prj.conf b/tests/drivers/i2c/i2c_nrfx_twim/prj.conf
new file mode 100644
index 00000000000..f14696bf38b
--- /dev/null
+++ b/tests/drivers/i2c/i2c_nrfx_twim/prj.conf
@@ -0,0 +1,11 @@
+CONFIG_ZTEST=y
+CONFIG_BOOT_BANNER=n
+
+CONFIG_LOG=y
+CONFIG_I2C_LOG_LEVEL_INF=y
+CONFIG_I2C=y
+CONFIG_I2C_TARGET=y
+CONFIG_I2C_TARGET_BUFFER_MODE=y
+CONFIG_I2C_NRFX_TWIS_BUF_SIZE=256
+
+CONFIG_ZERO_LATENCY_IRQS=y
diff --git a/tests/drivers/i2c/i2c_nrfx_twim/src/test_i2c_nrfx_twim.c b/tests/drivers/i2c/i2c_nrfx_twim/src/test_i2c_nrfx_twim.c
new file mode 100644
index 00000000000..f6256609fc0
--- /dev/null
+++ b/tests/drivers/i2c/i2c_nrfx_twim/src/test_i2c_nrfx_twim.c
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c/i2c_nrfx_twim.h>
+#include <zephyr/kernel.h>
+#include <zephyr/ztest.h>
+
+#define I2C_CONTROLLER_NODE              DT_ALIAS(i2c_controller)
+#define I2C_CONTROLLER_TARGET_NODE       DT_ALIAS(i2c_controller_target)
+#define I2C_CONTROLLER_DEVICE_GET        DEVICE_DT_GET(I2C_CONTROLLER_NODE)
+#define I2C_CONTROLLER_TARGET_DEVICE_GET DEVICE_DT_GET(I2C_CONTROLLER_TARGET_NODE)
+#define I2C_TARGET_ADDR                  0x0A
+
+static const struct device *sample_i2c_controller = I2C_CONTROLLER_DEVICE_GET;
+static const struct device *sample_i2c_controller_target = I2C_CONTROLLER_TARGET_DEVICE_GET;
+
+#define TEST_TRANSFER_BUF_SIZE           16
+#define TARGET_RECEIVED_BUFFERS_CAPACITY 4
+
+typedef struct {
+	uint32_t len;
+	uint8_t buf[TEST_TRANSFER_BUF_SIZE];
+} test_transfer_buf_t;
+
+static uint32_t target_received_buffers_count;
+static test_transfer_buf_t target_received_buffers[TARGET_RECEIVED_BUFFERS_CAPACITY];
+
+static void test_target_received_buffers_reset(void)
+{
+	target_received_buffers_count = 0;
+	memset(target_received_buffers, 0, sizeof(target_received_buffers));
+}
+
+BUILD_ASSERT(IS_ENABLED(CONFIG_I2C_TARGET_BUFFER_MODE),
+	     "CONFIG_I2C_TARGET_BUFFER_MODE must be enabled");
+
+#ifdef CONFIG_I2C_TARGET_BUFFER_MODE
+static void sample_i2c_controller_target_buf_write_received_cb(struct i2c_target_config *config,
+							       uint8_t *ptr, uint32_t len)
+{
+	if (target_received_buffers_count >= TARGET_RECEIVED_BUFFERS_CAPACITY) {
+		return;
+	}
+
+	test_transfer_buf_t *transfer_buf = &target_received_buffers[target_received_buffers_count];
+
+	transfer_buf->len = len;
+	memcpy(transfer_buf->buf, ptr, MIN(len, TEST_TRANSFER_BUF_SIZE));
+	target_received_buffers_count++;
+}
+
+static int sample_i2c_controller_target_buf_read_requested_cb(struct i2c_target_config *config,
+							      uint8_t **ptr, uint32_t *len)
+{
+	zassert_true(false, "Call to target_buf_read_requested_cb was unexpected");
+	return -EIO;
+}
+#endif /* CONFIG_I2C_TARGET_BUFFER_MODE */
+
+static const struct i2c_target_callbacks sample_i2c_controller_target_callbacks = {
+#ifdef CONFIG_I2C_TARGET_BUFFER_MODE
+	.buf_write_received = sample_i2c_controller_target_buf_write_received_cb,
+	.buf_read_requested = sample_i2c_controller_target_buf_read_requested_cb,
+#endif
+};
+
+static struct i2c_target_config sample_i2c_controller_target_config = {
+	.address = I2C_TARGET_ADDR, .callbacks = &sample_i2c_controller_target_callbacks};
+
+static void test_prepare(void)
+{
+	int ret;
+	bool ret_bool;
+
+	ret_bool = device_is_ready(sample_i2c_controller_target);
+	zassert_true(ret_bool, "sample_i2c_controller_target device is not ready");
+
+	ret = i2c_target_register(sample_i2c_controller_target,
+				  &sample_i2c_controller_target_config);
+	zassert_equal(ret, 0, "sample_i2c_controller_target can't register target");
+
+	ret_bool = device_is_ready(sample_i2c_controller);
+	zassert_true(ret_bool, "sample_i2c_controller device is not ready");
+
+	test_target_received_buffers_reset();
+}
+
+#define SOME_OTHER_I2C_ACCESSING_THREAD_STACK_SIZE 1024
+static K_THREAD_STACK_DEFINE(some_other_i2c_accessing_thread_stack,
+			     SOME_OTHER_I2C_ACCESSING_THREAD_STACK_SIZE);
+static struct k_thread some_other_i2c_accessing_thread_data;
+static K_SEM_DEFINE(some_other_i2c_accessing_thread_execute_sem, 0, 1);
+
+static void some_other_i2c_accessing_thread(void *param1, void *dummy2, void *dummy3)
+{
+	ARG_UNUSED(dummy2);
+	ARG_UNUSED(dummy3);
+
+	while (true) {
+		if (k_sem_take(&some_other_i2c_accessing_thread_execute_sem, K_FOREVER) == 0) {
+			int ret;
+			test_transfer_buf_t *tx_buf = (test_transfer_buf_t *)param1;
+
+			ret = i2c_write(sample_i2c_controller, tx_buf->buf, tx_buf->len,
+					I2C_TARGET_ADDR);
+			zassert_equal(ret, 0, "i2c_write failed");
+		}
+	}
+}
+
+static void some_other_i2c_accessing_thread_start(test_transfer_buf_t *tx_buf)
+{
+	(void)k_thread_create(&some_other_i2c_accessing_thread_data,
+			      some_other_i2c_accessing_thread_stack,
+			      K_THREAD_STACK_SIZEOF(some_other_i2c_accessing_thread_stack),
+			      some_other_i2c_accessing_thread, tx_buf, NULL, NULL,
+			      CONFIG_ZTEST_THREAD_PRIORITY, 0, K_NO_WAIT);
+}
+
+ZTEST(i2c_nrfx_twim_async, test_01_i2c_nrfx_twim_exclusive_access)
+{
+	int ret;
+
+	test_prepare();
+
+	static test_transfer_buf_t some_other_thread_tx_buf = {
+		.len = 3,
+		.buf = {0xE1, 0xE2, 0xE3},
+	};
+
+	some_other_i2c_accessing_thread_start(&some_other_thread_tx_buf);
+
+	ret = i2c_nrfx_twim_exclusive_access_acquire(sample_i2c_controller, K_FOREVER);
+	zassert_equal(ret, 0, "i2c_nrfx_twim_exclusive_access_acquire failed");
+
+	/* While we are holding exclusive access to the sample_i2c_controller,
+	 * let the some_other_i2c_accessing_thread attempt to perform an i2c_write.
+	 */
+
+	k_sem_give(&some_other_i2c_accessing_thread_execute_sem);
+
+	/* Let the some_other_i2c_accessing_thread run for a while. */
+	k_sleep(K_MSEC(100));
+
+	/* We are still holding the exclusive access so the some_other_i2c_accessing_thread
+	 * waits on semaphore. No i2c transfer should occur.
+	 */
+	zassert_equal(target_received_buffers_count, 0);
+
+	i2c_nrfx_twim_exclusive_access_release(sample_i2c_controller);
+
+	/* Let the some_other_i2c_accessing_thread finally perform the i2c_write. */
+	k_sleep(K_MSEC(100));
+
+	zassert_equal(target_received_buffers_count, 1);
+	zassert_equal(target_received_buffers[0].len, some_other_thread_tx_buf.len);
+	zassert_mem_equal(some_other_thread_tx_buf.buf, target_received_buffers[0].buf,
+			  some_other_thread_tx_buf.len);
+}
+
+ZTEST_SUITE(i2c_nrfx_twim_async, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/drivers/i2c/i2c_nrfx_twim/testcase.yaml b/tests/drivers/i2c/i2c_nrfx_twim/testcase.yaml
new file mode 100644
index 00000000000..e35dd49dbb7
--- /dev/null
+++ b/tests/drivers/i2c/i2c_nrfx_twim/testcase.yaml
@@ -0,0 +1,18 @@
+common:
+  depends_on: i2c
+  tags:
+    - drivers
+    - i2c
+  harness: ztest
+  harness_config:
+    fixture: i2c_bus_short
+
+tests:
+  drivers.i2c.nrfx_twim_async_api:
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+    integration_platforms:
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp

From 4e19f54332f616a0e64b7b8bad79a03f573b9d2a Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Mon, 31 Mar 2025 07:46:54 +0200
Subject: [PATCH 2769/2913] [nrf noup] tests: bluetooth: tester: Increment
 peripheral count value

This is needed for privacy tests. Specifically, this fixes
GAP/PRIV/CONN/BV-10-C and GAP/CONN/UCON/BV-06-C on nRF54H20.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
---
 tests/bluetooth/tester/hci_ipc_cpunet.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/bluetooth/tester/hci_ipc_cpunet.conf b/tests/bluetooth/tester/hci_ipc_cpunet.conf
index e14b9815424..0c7f26c2602 100644
--- a/tests/bluetooth/tester/hci_ipc_cpunet.conf
+++ b/tests/bluetooth/tester/hci_ipc_cpunet.conf
@@ -15,3 +15,5 @@ CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=4
 
 CONFIG_BT_CTLR_ISOAL_SOURCES=4
 CONFIG_BT_CTLR_ISO_TX_BUFFERS=8
+
+CONFIG_BT_CTLR_SDC_PERIPHERAL_COUNT=2

From e8ec95ee95761d353a59f36683cbf337642bf00c Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Thu, 20 Mar 2025 12:11:53 +0100
Subject: [PATCH 2770/2913] [nrf fromtree] bluetooth: mesh: pb_adv: Fix
 resending Generic Transaction Ack PDU

The Generic Provisioning protocol requires that a transaction must be
acknowledged before the next Generic Provisioning PDU is processed
(section 5.3.3, MshPRT_v1.1).

In the current PB-ADV implementation, if there is an ongoing transaction
(link.tx.adv points to a valid advertisement), any received Generic
Provisioning Start and Continuation PDUs are ignored.

This creates a scenario where a remote device misses the Transaction
Acknowledgment PDU and retransmits the last PDUs, but they are ignored
by the local device because the local device has already started sending
the next Provisioning PDU.

In particular, in the observed failure, the Provisioner missed the
Generic Transaction Acknowledgment PDU during the transmission of the
Provisioning Data PDU.

This commit modifies the processing logic for Generic Provisioning Start
and Continuation PDUs by checking if the received PDU has already been
received. If so, it attempts to re-send the Generic Transaction
Acknowledgment PDU.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
(cherry picked from commit 7592b049ef3fd1b1ef927c626c0e3c1a2175e99f)
Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
---
 subsys/bluetooth/mesh/pb_adv.c | 42 ++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/subsys/bluetooth/mesh/pb_adv.c b/subsys/bluetooth/mesh/pb_adv.c
index 86f20497704..3984b29c708 100644
--- a/subsys/bluetooth/mesh/pb_adv.c
+++ b/subsys/bluetooth/mesh/pb_adv.c
@@ -482,14 +482,16 @@ static void gen_prov_cont(struct prov_rx *rx, struct net_buf_simple *buf)
 {
 	uint8_t seg = CONT_SEG_INDEX(rx->gpc);
 
-	if (link.tx.adv[0]) {
-		LOG_DBG("Ongoing tx transaction has not been completed yet");
-		return;
-	}
-
 	LOG_DBG("len %u, seg_index %u", buf->len, seg);
 
+	/* When link.rx.seg is zero for a valid link.rx.id, this means that transaction
+	 * has already been received. The other device probably missed the Transaction
+	 * Acknowledgment PDU, so we need to resend it regardless of the active transmission.
+	 */
 	if (!link.rx.seg && link.rx.id == rx->xact_id) {
+		/* Send ack if another ack is NOT pending for transmission. Otherwise, skip sending
+		 * this ack for now.
+		 */
 		if (!ack_pending()) {
 			LOG_DBG("Resending ack");
 			gen_prov_ack_send(rx->xact_id);
@@ -498,6 +500,11 @@ static void gen_prov_cont(struct prov_rx *rx, struct net_buf_simple *buf)
 		return;
 	}
 
+	if (link.tx.adv[0]) {
+		LOG_DBG("Ongoing tx transaction has not been completed yet");
+		return;
+	}
+
 	if (!link.rx.seg &&
 	    next_transaction_id(link.rx.id) == rx->xact_id) {
 		LOG_DBG("Start segment lost");
@@ -575,21 +582,28 @@ static void gen_prov_start(struct prov_rx *rx, struct net_buf_simple *buf)
 {
 	uint8_t seg = SEG_NVAL;
 
+	/* When link.rx.seg is zero for a valid link.rx.id, this means that transaction
+	 * has already been received. The other device probably missed the Transaction
+	 * Acknowledgment PDU, so we need to resend it regardless of the active transmission.
+	 */
+	if (rx->xact_id == link.rx.id && !link.rx.seg) {
+		/* Send ack if another ack is NOT pending for transmission. Otherwise, skip sending
+		 * this ack for now.
+		 */
+		if (!ack_pending()) {
+			LOG_DBG("Resending ack");
+			gen_prov_ack_send(rx->xact_id);
+		}
+
+		return;
+	}
+
 	if (link.tx.adv[0]) {
 		LOG_DBG("Ongoing tx transaction has not been completed yet");
 		return;
 	}
 
 	if (rx->xact_id == link.rx.id) {
-		if (!link.rx.seg) {
-			if (!ack_pending()) {
-				LOG_DBG("Resending ack");
-				gen_prov_ack_send(rx->xact_id);
-			}
-
-			return;
-		}
-
 		if (!(link.rx.seg & BIT(0))) {
 			LOG_DBG("Ignoring duplicate segment");
 			return;

From d32adbd6347ee5271ee022eb9146a1809376d017 Mon Sep 17 00:00:00 2001
From: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
Date: Thu, 20 Mar 2025 13:37:45 +0100
Subject: [PATCH 2771/2913] [nrf fromtree] Bluetooth: Mesh: Fix proxy
 advertiser handling with GATT server enabled

When the GATT server is enabled the proxy advertiser
server need to be stopped. This solved a bug where the
Mesh Proxy Service is not restared.
This fix is done to fix several failing PTS test that
was failing when CONFIG_BT_MESH_ADV_EXT_GATT_SEPARATE
was enabled. Calling the stop_proxy_adv was left out
in a prevouis commit when doing code cleanup.

Signed-off-by: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
(cherry picked from commit a65a16424b21ce326b4327abebb38bc838e8c7bc)
Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
---
 subsys/bluetooth/mesh/adv_ext.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index 05593a3b60e..02dffc35413 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -342,12 +342,17 @@ static void start_proxy_sol_or_proxy_adv(struct bt_mesh_ext_adv *ext_adv)
 		}
 	}
 
-	if (IS_ENABLED(CONFIG_BT_MESH_GATT_SERVER) &&
-	    !atomic_test_and_set_bit(ext_adv->flags, ADV_FLAG_PROXY)) {
-		if (bt_mesh_adv_gatt_send()) {
-			atomic_clear_bit(ext_adv->flags, ADV_FLAG_PROXY);
+	if (IS_ENABLED(CONFIG_BT_MESH_GATT_SERVER)) {
+		if (stop_proxy_adv(ext_adv)) {
 			return;
 		}
+
+		if (!atomic_test_and_set_bit(ext_adv->flags, ADV_FLAG_PROXY)) {
+			if (bt_mesh_adv_gatt_send()) {
+				atomic_clear_bit(ext_adv->flags, ADV_FLAG_PROXY);
+				return;
+			}
+		}
 	}
 }
 

From 49810c1906d7019b8eb6a92350c637290f9c669e Mon Sep 17 00:00:00 2001
From: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
Date: Thu, 20 Mar 2025 12:06:22 +0100
Subject: [PATCH 2772/2913] [nrf fromtree] Bluetooth: Mesh: to not set valid
 state if mesh is not valid yet

Commit sets valid state when mesh is actualy provisioned.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
(cherry picked from commit 928208cf36838836263c14b104b81fda02a218b9)
Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
---
 subsys/bluetooth/mesh/main.c | 41 ++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/subsys/bluetooth/mesh/main.c b/subsys/bluetooth/mesh/main.c
index c9b6a283c08..e29fd87adc5 100644
--- a/subsys/bluetooth/mesh/main.c
+++ b/subsys/bluetooth/mesh/main.c
@@ -62,7 +62,7 @@ int bt_mesh_provision(const uint8_t net_key[16], uint16_t net_idx,
 	LOG_INF("Primary Element: 0x%04x", addr);
 	LOG_DBG("net_idx 0x%04x flags 0x%02x iv_index 0x%04x", net_idx, flags, iv_index);
 
-	if (atomic_test_and_set_bit(bt_mesh.flags, BT_MESH_VALID)) {
+	if (atomic_test_bit(bt_mesh.flags, BT_MESH_VALID)) {
 		return -EALREADY;
 	}
 
@@ -74,14 +74,12 @@ int bt_mesh_provision(const uint8_t net_key[16], uint16_t net_idx,
 		comp = bt_mesh_comp_get();
 		if (comp == NULL) {
 			LOG_ERR("Failed to get node composition");
-			atomic_clear_bit(bt_mesh.flags, BT_MESH_VALID);
 			return -EINVAL;
 		}
 
 		subnet = bt_mesh_cdb_subnet_get(net_idx);
 		if (!subnet) {
 			LOG_ERR("No subnet with idx %d", net_idx);
-			atomic_clear_bit(bt_mesh.flags, BT_MESH_VALID);
 			return -ENOENT;
 		}
 
@@ -90,7 +88,6 @@ int bt_mesh_provision(const uint8_t net_key[16], uint16_t net_idx,
 					      comp->elem_count, net_idx);
 		if (node == NULL) {
 			LOG_ERR("Failed to allocate database node");
-			atomic_clear_bit(bt_mesh.flags, BT_MESH_VALID);
 			return -ENOMEM;
 		}
 
@@ -108,9 +105,8 @@ int bt_mesh_provision(const uint8_t net_key[16], uint16_t net_idx,
 						    net_key);
 		if (err) {
 			LOG_ERR("Failed to import cdb network key");
-			goto end;
+			goto error_exit;
 		}
-		bt_mesh_cdb_subnet_store(subnet);
 
 		addr = node->addr;
 		bt_mesh_cdb_iv_update(iv_index, BT_MESH_IV_UPDATE(flags));
@@ -118,32 +114,34 @@ int bt_mesh_provision(const uint8_t net_key[16], uint16_t net_idx,
 		err = bt_mesh_cdb_node_key_import(node, dev_key);
 		if (err) {
 			LOG_ERR("Failed to import cdb device key");
-			goto end;
-		}
-
-		if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-			bt_mesh_cdb_node_store(node);
+			goto error_exit;
 		}
 	}
 
 	err = bt_mesh_key_import(BT_MESH_KEY_TYPE_DEV, dev_key, &mesh_dev_key);
 	if (err) {
 		LOG_ERR("Failed to import device key");
-		goto end;
+		goto error_exit;
 	}
 	is_dev_key_valid = true;
 
 	err = bt_mesh_key_import(BT_MESH_KEY_TYPE_NET, net_key, &mesh_net_key);
 	if (err) {
 		LOG_ERR("Failed to import network key");
-		goto end;
+		goto error_exit;
 	}
 	is_net_key_valid = true;
 
 	err = bt_mesh_net_create(net_idx, flags, &mesh_net_key, iv_index);
 	if (err) {
-		atomic_clear_bit(bt_mesh.flags, BT_MESH_VALID);
-		goto end;
+		LOG_ERR("Failed to create network");
+		goto error_exit;
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_CDB) &&
+	    atomic_test_bit(bt_mesh_cdb.flags, BT_MESH_CDB_VALID)) {
+		bt_mesh_cdb_subnet_store(subnet);
+		bt_mesh_cdb_node_store(node);
 	}
 
 	bt_mesh_net_settings_commit();
@@ -163,18 +161,21 @@ int bt_mesh_provision(const uint8_t net_key[16], uint16_t net_idx,
 		bt_mesh_net_store();
 	}
 
+	atomic_set_bit(bt_mesh.flags, BT_MESH_VALID);
 	bt_mesh_start();
 
-end:
-	if (err && node != NULL && IS_ENABLED(CONFIG_BT_MESH_CDB)) {
-		bt_mesh_cdb_node_del(node, true);
+	return 0;
+
+error_exit:
+	if (node != NULL && IS_ENABLED(CONFIG_BT_MESH_CDB)) {
+		bt_mesh_cdb_node_del(node, false);
 	}
 
-	if (err && is_dev_key_valid) {
+	if (is_dev_key_valid) {
 		bt_mesh_key_destroy(&mesh_dev_key);
 	}
 
-	if (err && is_net_key_valid) {
+	if (is_net_key_valid) {
 		bt_mesh_key_destroy(&mesh_net_key);
 	}
 

From 38b6df5d7e5268707ae25f49a278fa3920660440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5vard=20Reierstad?= <haavard.reierstad@nordicsemi.no>
Date: Tue, 25 Mar 2025 08:03:14 +0100
Subject: [PATCH 2773/2913] [nrf fromtree] Bluetooth: Mesh: Disable prov
 bearers on link
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously, PB-GATT unprovisioned advs would continue being sent if a
device is provisioned or in the process of being provisioned (an active
provisioning link) over PB-ADV.

This commit introduces the `link_cancel` callback for the `prov_bearer`
struct. When a provisioning link is established over a prov bearer, all
other (active) prov bearers will be suspended through this callback, and
re-enabled when the link is closed. An exception is made for PB-REMOTE,
which can utilize the other bearers.

The call to `bt_mesh_pb_gatt_srv_disable` in settings.c is removed. This
is called in `mesh_commit`, and is not needed as this is only used
during boot, at which point the Mesh provisioning service has not yet
been enabled/registered, meaning the function does nothing.

Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 200628e8d0e8abc620442fa37746c150691c42a4)
Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
---
 subsys/bluetooth/mesh/pb_adv.c      |  7 +++
 subsys/bluetooth/mesh/pb_gatt.c     |  6 +++
 subsys/bluetooth/mesh/prov_bearer.h |  6 +++
 subsys/bluetooth/mesh/provisionee.c | 67 +++++++++++++++++++++++++++--
 subsys/bluetooth/mesh/rpr_srv.c     |  7 +++
 subsys/bluetooth/mesh/settings.c    |  4 --
 6 files changed, 89 insertions(+), 8 deletions(-)

diff --git a/subsys/bluetooth/mesh/pb_adv.c b/subsys/bluetooth/mesh/pb_adv.c
index 3984b29c708..c6b3f778165 100644
--- a/subsys/bluetooth/mesh/pb_adv.c
+++ b/subsys/bluetooth/mesh/pb_adv.c
@@ -1071,6 +1071,12 @@ static int prov_link_accept(const struct prov_bearer_cb *cb, void *cb_data)
 	return 0;
 }
 
+static void prov_link_cancel(void)
+{
+	bt_mesh_beacon_disable();
+	bt_mesh_scan_disable();
+}
+
 static void prov_link_close(enum prov_bearer_link_status status)
 {
 	int err;
@@ -1109,6 +1115,7 @@ const struct prov_bearer bt_mesh_pb_adv = {
 	.type = BT_MESH_PROV_ADV,
 	.link_open = prov_link_open,
 	.link_accept = prov_link_accept,
+	.link_cancel = prov_link_cancel,
 	.link_close = prov_link_close,
 	.send = prov_send_adv,
 	.clear_tx = prov_clear_tx,
diff --git a/subsys/bluetooth/mesh/pb_gatt.c b/subsys/bluetooth/mesh/pb_gatt.c
index 849914f4b5f..44b77f53f3e 100644
--- a/subsys/bluetooth/mesh/pb_gatt.c
+++ b/subsys/bluetooth/mesh/pb_gatt.c
@@ -198,6 +198,11 @@ static int link_accept(const struct prov_bearer_cb *cb, void *cb_data)
 
 	return 0;
 }
+
+static void link_cancel(void)
+{
+	(void)bt_mesh_pb_gatt_srv_disable();
+}
 #endif
 
 static void buf_send_end(struct bt_conn *conn, void *user_data)
@@ -246,6 +251,7 @@ const struct prov_bearer bt_mesh_pb_gatt = {
 #endif
 #if defined(CONFIG_BT_MESH_PB_GATT)
 	.link_accept = link_accept,
+	.link_cancel = link_cancel,
 #endif
 	.send = buf_send,
 	.clear_tx = clear_tx,
diff --git a/subsys/bluetooth/mesh/prov_bearer.h b/subsys/bluetooth/mesh/prov_bearer.h
index 45885226dcd..fd6aa89e34e 100644
--- a/subsys/bluetooth/mesh/prov_bearer.h
+++ b/subsys/bluetooth/mesh/prov_bearer.h
@@ -76,6 +76,12 @@ struct prov_bearer {
 	 */
 	int (*link_accept)(const struct prov_bearer_cb *cb, void *cb_data);
 
+	/** @brief Disable link establishment as a provisionee.
+	 *
+	 *  Stops accepting link open messages and sending unprovisioned beacons.
+	 */
+	void (*link_cancel)(void);
+
 	/** @brief Send a packet on an established link.
 	 *
 	 *  @param buf     Payload buffer. Requires @ref
diff --git a/subsys/bluetooth/mesh/provisionee.c b/subsys/bluetooth/mesh/provisionee.c
index 76581727455..59cc20fbd5a 100644
--- a/subsys/bluetooth/mesh/provisionee.c
+++ b/subsys/bluetooth/mesh/provisionee.c
@@ -468,12 +468,24 @@ static void prov_confirm(const uint8_t *data)
 	send_confirm();
 }
 
-static inline bool is_pb_gatt(void)
+static bool is_pb_gatt(void)
 {
 	return bt_mesh_prov_link.bearer &&
 	       bt_mesh_prov_link.bearer->type == BT_MESH_PROV_GATT;
 }
 
+static bool is_pb_adv(void)
+{
+	return bt_mesh_prov_link.bearer &&
+	       bt_mesh_prov_link.bearer->type == BT_MESH_PROV_ADV;
+}
+
+static bool is_pb_remote(void)
+{
+	return bt_mesh_prov_link.bearer &&
+	       bt_mesh_prov_link.bearer->type == BT_MESH_PROV_REMOTE;
+}
+
 static bool refresh_is_valid(const uint8_t *netkey, uint16_t net_idx,
 			     uint32_t iv_index)
 {
@@ -641,6 +653,8 @@ static void local_input_complete(void)
 	}
 }
 
+static bt_mesh_prov_bearer_t active_bearers;
+
 static void prov_link_closed(enum prov_bearer_link_status status)
 {
 	if (IS_ENABLED(CONFIG_BT_MESH_RPR_SRV) &&
@@ -657,6 +671,28 @@ static void prov_link_closed(enum prov_bearer_link_status status)
 	}
 
 	bt_mesh_prov_reset_state();
+
+	/* Restore provisioning bearers stopped in prov_link_opened. If the device was provisioned,
+	 * only re-enable the PB-Remote bearer.
+	 */
+	if (IS_ENABLED(CONFIG_BT_MESH_RPR_SRV) && !is_pb_remote() &&
+	    (active_bearers & BT_MESH_PROV_REMOTE)) {
+		pb_remote_srv.link_accept(bt_mesh_prov_bearer_cb_get(), NULL);
+	}
+
+	if (bt_mesh_is_provisioned()) {
+		return;
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT) && !is_pb_gatt() &&
+	    (active_bearers & BT_MESH_PROV_GATT)) {
+		bt_mesh_pb_gatt.link_accept(bt_mesh_prov_bearer_cb_get(), NULL);
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_PB_ADV) && !is_pb_adv() &&
+	    (active_bearers & BT_MESH_PROV_ADV)) {
+		bt_mesh_pb_adv.link_accept(bt_mesh_prov_bearer_cb_get(), NULL);
+	}
 }
 
 static void prov_link_opened(void)
@@ -665,6 +701,22 @@ static void prov_link_opened(void)
 	if (IS_ENABLED(CONFIG_BT_MESH_RPR_SRV) && bt_mesh_is_provisioned()) {
 		atomic_set_bit(bt_mesh_prov_link.flags, REPROVISION);
 	}
+
+	/* Stop other provisioning bearers for the duration of the prov link. */
+	if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT) && is_pb_adv() &&
+	    (active_bearers & BT_MESH_PROV_GATT)) {
+		bt_mesh_pb_gatt.link_cancel();
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_PB_ADV) && is_pb_gatt() &&
+	    (active_bearers & BT_MESH_PROV_ADV)) {
+		bt_mesh_pb_adv.link_cancel();
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_RPR_SRV) && !is_pb_remote() &&
+	    (active_bearers & BT_MESH_PROV_REMOTE)) {
+		pb_remote_srv.link_cancel();
+	}
 }
 
 static const struct bt_mesh_prov_role role_device = {
@@ -717,6 +769,7 @@ int bt_mesh_prov_enable(bt_mesh_prov_bearer_t bearers)
 
 role_init:
 	bt_mesh_prov_link.role = &role_device;
+	active_bearers |= bearers;
 
 	return 0;
 }
@@ -733,14 +786,20 @@ int bt_mesh_prov_disable(bt_mesh_prov_bearer_t bearers)
 
 	if (IS_ENABLED(CONFIG_BT_MESH_PB_ADV) &&
 	    (bearers & BT_MESH_PROV_ADV)) {
-		bt_mesh_beacon_disable();
-		bt_mesh_scan_disable();
+		bt_mesh_pb_adv.link_cancel();
 	}
 
 	if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT) &&
 	    (bearers & BT_MESH_PROV_GATT)) {
-		(void)bt_mesh_pb_gatt_srv_disable();
+		bt_mesh_pb_gatt.link_cancel();
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_RPR_SRV) &&
+	    (bearers & BT_MESH_PROV_REMOTE)) {
+		pb_remote_srv.link_cancel();
 	}
 
+	active_bearers &= ~bearers;
+
 	return 0;
 }
diff --git a/subsys/bluetooth/mesh/rpr_srv.c b/subsys/bluetooth/mesh/rpr_srv.c
index ed8d87f3c04..96d94bae15a 100644
--- a/subsys/bluetooth/mesh/rpr_srv.c
+++ b/subsys/bluetooth/mesh/rpr_srv.c
@@ -1359,6 +1359,12 @@ static int node_refresh_link_accept(const struct prov_bearer_cb *cb,
 	return 0;
 }
 
+static void node_refresh_link_cancel(void)
+{
+	srv.refresh.cb = NULL;
+	srv.refresh.cb_data = NULL;
+}
+
 static void node_refresh_tx_complete(int err, void *cb_data)
 {
 	if (err) {
@@ -1408,6 +1414,7 @@ const struct prov_bearer pb_remote_srv = {
 	.type = BT_MESH_PROV_REMOTE,
 
 	.link_accept = node_refresh_link_accept,
+	.link_cancel = node_refresh_link_cancel,
 	.send = node_refresh_buf_send,
 	.clear_tx = node_refresh_clear_tx,
 };
diff --git a/subsys/bluetooth/mesh/settings.c b/subsys/bluetooth/mesh/settings.c
index f02672e6d66..d746baf1258 100644
--- a/subsys/bluetooth/mesh/settings.c
+++ b/subsys/bluetooth/mesh/settings.c
@@ -104,10 +104,6 @@ static int mesh_commit(void)
 		return 0;
 	}
 
-	if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT)) {
-		(void)bt_mesh_pb_gatt_srv_disable();
-	}
-
 	bt_mesh_net_settings_commit();
 	bt_mesh_model_settings_commit();
 

From dabfec65f129cb2d2a352f431d9902e5ca100c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5vard=20Reierstad?= <haavard.reierstad@nordicsemi.no>
Date: Tue, 25 Mar 2025 08:07:44 +0100
Subject: [PATCH 2774/2913] [nrf fromtree] Bluetooth: Mesh: Fix typo in prov
 bsim
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changes Brearer --> Bearer.

Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 062fdc30bd714389928c54165a6847884bd8c185)
Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
---
 tests/bsim/bluetooth/mesh/src/test_provision.c              | 2 +-
 .../mesh/tests_scripts/provision/pb_remote_parallel.sh      | 4 ++--
 .../mesh/tests_scripts/provision/pb_remote_reprovision.sh   | 4 ++--
 .../mesh/tests_scripts/provision/pb_remote_timeout.sh       | 4 ++--
 .../bluetooth/mesh/tests_scripts/provision/prov_multi.sh    | 6 +++---
 .../bluetooth/mesh/tests_scripts/provision/prov_no_oob.sh   | 6 +++---
 .../mesh/tests_scripts/provision/prov_oob_auth_ib_pk.sh     | 6 +++---
 .../tests_scripts/provision/prov_oob_auth_ignore_oob_pk.sh  | 6 +++---
 .../mesh/tests_scripts/provision/prov_oob_auth_oob_pk.sh    | 6 +++---
 .../mesh/tests_scripts/provision/prov_reprovision.sh        | 6 +++---
 10 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/tests/bsim/bluetooth/mesh/src/test_provision.c b/tests/bsim/bluetooth/mesh/src/test_provision.c
index 126b63f6b81..6354004b341 100644
--- a/tests/bsim/bluetooth/mesh/src/test_provision.c
+++ b/tests/bsim/bluetooth/mesh/src/test_provision.c
@@ -105,7 +105,7 @@ static void test_args_parse(int argc, char *argv[])
 			.dest = &prov_bearer,
 			.type = 'i',
 			.name = "{invalid, PB-ADV, PB-GATT}",
-			.option = "prov-brearer",
+			.option = "prov-bearer",
 			.descript = "Provisioning bearer that is to be used."
 		},
 	};
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh
index 815df506d5f..536e15b9dc4 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh
@@ -16,7 +16,7 @@ RunTest mesh_prov_pb_remote_parallel \
 	prov_device_pb_remote_server_unproved \
 	prov_device_no_oob \
 	prov_device_no_oob \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_remote_parallel_psa \
@@ -24,4 +24,4 @@ RunTest mesh_prov_pb_remote_parallel_psa \
 	prov_device_pb_remote_server_unproved \
 	prov_device_no_oob \
 	prov_device_no_oob \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh
index 1e5da310bd3..e2a98272955 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh
@@ -16,11 +16,11 @@ RunTest mesh_prov_pb_remote_reprovision \
 	prov_provisioner_pb_remote_client_reprovision \
 	prov_device_pb_remote_server_unproved \
 	prov_device_reprovision \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_remote_reprovision_psa \
 	prov_provisioner_pb_remote_client_reprovision \
 	prov_device_pb_remote_server_unproved \
 	prov_device_reprovision \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh
index b332b1987ad..74d2b3fff8b 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh
@@ -27,10 +27,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 RunTest mesh_prov_pb_remote_provisioning_timeout \
 	prov_provisioner_pb_remote_client_provision_timeout \
 	prov_device_pb_remote_server_unproved_unresponsive \
-	prov_device_unresponsive -- -argstest prov-brearer=1
+	prov_device_unresponsive -- -argstest prov-bearer=1
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_remote_provisioning_timeout_psa \
 	prov_provisioner_pb_remote_client_provision_timeout \
 	prov_device_pb_remote_server_unproved_unresponsive \
-	prov_device_unresponsive -- -argstest prov-brearer=1
+	prov_device_unresponsive -- -argstest prov-bearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_multi.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_multi.sh
index bed577add24..f6ac20c38f0 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_multi.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_multi.sh
@@ -12,7 +12,7 @@ RunTest mesh_prov_pb_adv_multi \
 	prov_device_no_oob \
 	prov_device_no_oob \
 	prov_device_no_oob \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
 
 overlay=overlay_gatt_conf_overlay_psa_conf
 RunTest mesh_prov_pb_gatt_multi \
@@ -20,7 +20,7 @@ RunTest mesh_prov_pb_gatt_multi \
 	prov_device_no_oob \
 	prov_device_no_oob \
 	prov_device_no_oob \
-	-- -argstest prov-brearer=2
+	-- -argstest prov-bearer=2
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_adv_multi_psa \
@@ -28,4 +28,4 @@ RunTest mesh_prov_pb_adv_multi_psa \
 	prov_device_no_oob \
 	prov_device_no_oob \
 	prov_device_no_oob \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_no_oob.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_no_oob.sh
index 4f633b91c2c..c5e4c8d1649 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_no_oob.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_no_oob.sh
@@ -7,16 +7,16 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 RunTest mesh_prov_pb_adv_on_oob \
 	prov_device_no_oob \
 	prov_provisioner_no_oob \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
 
 overlay=overlay_gatt_conf_overlay_psa_conf
 RunTest mesh_prov_pb_gatt_on_oob \
 	prov_device_no_oob \
 	prov_provisioner_no_oob \
-	-- -argstest prov-brearer=2
+	-- -argstest prov-bearer=2
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_adv_on_oob_psa \
 	prov_device_no_oob \
 	prov_provisioner_no_oob \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ib_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ib_pk.sh
index e53c6b5f254..342433a6db9 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ib_pk.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ib_pk.sh
@@ -7,14 +7,14 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # Test provisioning with OOB authentication and with inband public key
 RunTest mesh_prov_pb_adv_oob_auth \
 	prov_device_oob_auth prov_provisioner_oob_auth \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
 
 overlay=overlay_gatt_conf_overlay_psa_conf
 RunTest mesh_prov_pb_gatt_oob_auth \
 	prov_device_oob_auth prov_provisioner_oob_auth \
-	-- -argstest prov-brearer=2
+	-- -argstest prov-bearer=2
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_adv_oob_auth_psa \
 	prov_device_oob_auth prov_provisioner_oob_auth \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ignore_oob_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ignore_oob_pk.sh
index 7ac6b5f4d75..ea746e75e99 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ignore_oob_pk.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ignore_oob_pk.sh
@@ -8,14 +8,14 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # but provisioner doesn't have OOB public key
 RunTest mesh_prov_pb_adv_device_w_oob_pk_prvnr_wt_pk \
 	prov_device_oob_public_key prov_provisioner_oob_auth_no_oob_public_key \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
 
 overlay=overlay_gatt_conf_overlay_psa_conf
 RunTest mesh_prov_pb_gatt_device_w_oob_pk_prvnr_wt_pk \
 	prov_device_oob_public_key prov_provisioner_oob_auth_no_oob_public_key \
-	-- -argstest prov-brearer=2
+	-- -argstest prov-bearer=2
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_adv_device_w_oob_pk_prvnr_wt_pk_psa \
 	prov_device_oob_public_key prov_provisioner_oob_auth_no_oob_public_key \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_oob_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_oob_pk.sh
index 90375f81a50..78b9a25d99a 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_oob_pk.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_oob_pk.sh
@@ -7,14 +7,14 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # Test provisioning with OOB authentication and with OOB public key
 RunTest mesh_prov_pb_adv_oob_public_key \
 	prov_device_oob_public_key prov_provisioner_oob_public_key \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
 
 overlay=overlay_gatt_conf_overlay_psa_conf
 RunTest mesh_prov_pb_gatt_oob_public_key \
 	prov_device_oob_public_key prov_provisioner_oob_public_key \
-	-- -argstest prov-brearer=2
+	-- -argstest prov-bearer=2
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_adv_oob_public_key_psa \
 	prov_device_oob_public_key prov_provisioner_oob_public_key \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_reprovision.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_reprovision.sh
index 0143ef20c45..d629f631f4d 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_reprovision.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_reprovision.sh
@@ -7,16 +7,16 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 RunTest mesh_prov_pb_adv_repr \
 	prov_device_reprovision \
 	prov_provisioner_reprovision \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
 
 overlay=overlay_gatt_conf_overlay_psa_conf
 RunTest mesh_prov_pb_gatt_repr \
 	prov_device_reprovision \
 	prov_provisioner_reprovision \
-	-- -argstest prov-brearer=2
+	-- -argstest prov-bearer=2
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_adv_repr_psa \
 	prov_device_reprovision \
 	prov_provisioner_reprovision \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1

From 670f9eb35a79d5947071ef1971effc78c9fc4633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5vard=20Reierstad?= <haavard.reierstad@nordicsemi.no>
Date: Tue, 25 Mar 2025 12:17:48 +0100
Subject: [PATCH 2775/2913] [nrf fromtree] Bluetooth: Mesh: Test pb cancelling
 in bsim
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds a provision test to check that provisioning bearers are cancelled
when a provisioning link is opened. Modifies the functionality for
receiving unprovisioned beacons to fail the test if a unprovisioned
beacon is received from the current provisionee after a threshold.

Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit acccd46306b2de026add59ea3d75c4a1b81cfc44)
Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
---
 .../bsim/bluetooth/mesh/src/test_provision.c  | 115 +++++++++++++++++-
 .../mesh/tests_scripts/provision/pb_cancel.sh |  27 ++++
 2 files changed, 138 insertions(+), 4 deletions(-)
 create mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_cancel.sh

diff --git a/tests/bsim/bluetooth/mesh/src/test_provision.c b/tests/bsim/bluetooth/mesh/src/test_provision.c
index 6354004b341..b98fe1d89ad 100644
--- a/tests/bsim/bluetooth/mesh/src/test_provision.c
+++ b/tests/bsim/bluetooth/mesh/src/test_provision.c
@@ -38,6 +38,8 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #define WAIT_TIME 120 /*seconds*/
 #define IS_RPR_PRESENT  (CONFIG_BT_MESH_RPR_SRV && CONFIG_BT_MESH_RPR_CLI)
 #define IMPOSTER_MODEL_ID 0xe000
+/* Rough estimate of the time it should take the provisionee to stop sending unprov beacons. */
+#define PROV_DELTA_THRESH_MS 100
 
 enum test_flags {
 	IS_PROVISIONER,
@@ -97,6 +99,7 @@ static uint32_t link_close_timestamp;
 
 /* Set prov_bearer to non-zero invalid value. */
 static bt_mesh_prov_bearer_t prov_bearer = 0xF8;
+static bt_mesh_prov_bearer_t prov_to_use;
 
 static void test_args_parse(int argc, char *argv[])
 {
@@ -104,10 +107,18 @@ static void test_args_parse(int argc, char *argv[])
 		{
 			.dest = &prov_bearer,
 			.type = 'i',
-			.name = "{invalid, PB-ADV, PB-GATT}",
+			.name = "{invalid, PB-ADV, PB-GATT, (PB-ADV | PB-GATT)}",
 			.option = "prov-bearer",
 			.descript = "Provisioning bearer that is to be used."
 		},
+		{
+			.dest = &prov_to_use,
+			.type = 'i',
+			.name = "{PB-ADV, PB-GATT}",
+			.option = "prov-to-use",
+			.descript = "Provisioning bearer that is to be used in the case that "
+				    "multiple provisioning bearers are enabled in prov_bearer."
+		},
 	};
 
 	bs_args_parse_all_cmd_line(argc, argv, args_struct);
@@ -275,6 +286,42 @@ static void test_terminate(void)
 	}
 }
 
+static uint64_t prov_started_time_ms;
+static uint8_t prov_uuid[16];
+
+static void provision(uint8_t uuid[16], bt_mesh_prov_bearer_t bearer)
+{
+	int err;
+
+	switch (bearer) {
+	case BT_MESH_PROV_ADV:
+		err = bt_mesh_provision_adv(uuid, 0, prov_addr, 0);
+		break;
+	case BT_MESH_PROV_GATT:
+		err = bt_mesh_provision_gatt(uuid, 0, prov_addr, 0);
+		break;
+	default:
+		err = -ENOTSUP;
+	}
+
+	if (!err) {
+		LOG_INF("Provisioning over %s started.",
+			bearer == BT_MESH_PROV_ADV ? "PB-ADV" : "PB-GATT");
+		prov_started_time_ms = k_uptime_get();
+		memcpy(prov_uuid, uuid, 16);
+	}
+}
+
+static void provisionee_beacon_check(uint8_t uuid[16], bt_mesh_prov_bearer_t bearer)
+{
+	if (memcmp(uuid, prov_uuid, 16) == 0) {
+		ASSERT_FALSE_MSG((prov_started_time_ms &&
+				  (k_uptime_delta(&prov_started_time_ms) > PROV_DELTA_THRESH_MS)),
+				 "Received %s beacon from provisionee after provisioning started.",
+				 bearer == BT_MESH_PROV_ADV ? "PB-ADV" : "PB-GATT");
+	}
+}
+
 static void unprovisioned_beacon(uint8_t uuid[16],
 				 bt_mesh_prov_oob_info_t oob_info,
 				 uint32_t *uri_hash)
@@ -286,7 +333,12 @@ static void unprovisioned_beacon(uint8_t uuid[16],
 	if (uuid_to_provision && memcmp(uuid, uuid_to_provision, 16)) {
 		return;
 	}
-	bt_mesh_provision_adv(uuid, 0, prov_addr, 0);
+
+	provisionee_beacon_check(uuid, BT_MESH_PROV_ADV);
+
+	if (!prov_to_use || prov_to_use == BT_MESH_PROV_ADV) {
+		provision(uuid, BT_MESH_PROV_ADV);
+	}
 }
 
 static void unprovisioned_beacon_gatt(uint8_t uuid[16], bt_mesh_prov_oob_info_t oob_info)
@@ -299,7 +351,11 @@ static void unprovisioned_beacon_gatt(uint8_t uuid[16], bt_mesh_prov_oob_info_t
 		return;
 	}
 
-	bt_mesh_provision_gatt(uuid, 0, prov_addr, 0);
+	provisionee_beacon_check(uuid, BT_MESH_PROV_GATT);
+
+	if (!prov_to_use || prov_to_use == BT_MESH_PROV_GATT) {
+		provision(uuid, BT_MESH_PROV_GATT);
+	}
 }
 
 static void prov_complete(uint16_t net_idx, uint16_t addr)
@@ -324,6 +380,8 @@ static void prov_node_added(uint16_t net_idx, uint8_t uuid[16], uint16_t addr,
 {
 	LOG_INF("Device 0x%04x provisioned", prov_addr);
 	current_dev_addr = prov_addr++;
+	prov_started_time_ms = 0;
+	memset(prov_uuid, 0, 16);
 	k_sem_give(&prov_sem);
 }
 
@@ -340,6 +398,7 @@ static void prov_reset(void)
 
 static bt_mesh_input_action_t gact;
 static uint8_t gsize;
+static bool oob_wait_unprov_int;
 static int input(bt_mesh_input_action_t act, uint8_t size)
 {
 	/* The test system requests the input OOB data earlier than
@@ -350,7 +409,9 @@ static int input(bt_mesh_input_action_t act, uint8_t size)
 	gact = act;
 	gsize = size;
 
-	k_work_reschedule(&oob_timer, K_SECONDS(1));
+	k_work_reschedule(&oob_timer, oob_wait_unprov_int
+					      ? K_SECONDS(CONFIG_BT_MESH_UNPROV_BEACON_INT + 1)
+					      : K_SECONDS(1));
 
 	return 0;
 }
@@ -734,6 +795,49 @@ static void test_provisioner_oob_auth_no_oob_public_key(void)
 	PASS();
 }
 
+static void test_provisioner_pb_cancel(void)
+{
+	k_sem_init(&prov_sem, 0, 1);
+
+	bt_mesh_device_setup(&prov, &comp);
+
+	ASSERT_OK(bt_mesh_cdb_create(test_net_key));
+
+	ASSERT_OK(bt_mesh_provision(test_net_key, 0, 0, 0, 0x0001, dev_key));
+
+	prov.static_val = 0;
+	prov.static_val_len = 0;
+	prov.output_size = 0;
+	prov.output_actions = 0;
+	prov.input_size = 8;
+	prov.input_actions = BT_MESH_ENTER_NUMBER;
+
+	ASSERT_OK(k_sem_take(&prov_sem, K_SECONDS(20)));
+
+	PASS();
+}
+
+static void test_device_pb_cancel(void)
+{
+	oob_wait_unprov_int = true;
+	k_sem_init(&prov_sem, 0, 1);
+
+	bt_mesh_device_setup(&prov, &comp);
+
+	prov.static_val = 0;
+	prov.static_val_len = 0;
+	prov.output_size = 0;
+	prov.output_actions = 0;
+	prov.input_size = 8;
+	prov.input_actions = BT_MESH_ENTER_NUMBER;
+
+	ASSERT_OK(bt_mesh_prov_enable(prov_bearer));
+
+	ASSERT_OK(k_sem_take(&prov_sem, K_SECONDS(20)));
+
+	PASS();
+}
+
 /** @brief Verify that the provisioner can provision multiple devices in a row
  */
 static void test_provisioner_multi(void)
@@ -1798,6 +1902,7 @@ static const struct bst_test_instance test_connect[] = {
 	TEST_CASE_WBACKCHANNEL(device, oob_public_key,
 			       "Device: provisioning use oob public key"),
 	TEST_CASE(device, reprovision, "Device: provisioning, reprovision"),
+	TEST_CASE_WBACKCHANNEL(device, pb_cancel, "Device: provisioning, cancel prov bearers."),
 #if IS_RPR_PRESENT
 	TEST_CASE(device, pb_remote_server_unproved,
 		  "Device: used for remote provisioning, starts unprovisioned"),
@@ -1828,6 +1933,8 @@ static const struct bst_test_instance test_connect[] = {
 	TEST_CASE(
 		provisioner, reprovision,
 		"Provisioner: provisioning, resetting and reprovisioning multiple times."),
+	TEST_CASE_WBACKCHANNEL(
+		provisioner, pb_cancel, "Provisioner: provisioning, cancel prov bearers."),
 #if IS_RPR_PRESENT
 	TEST_CASE(provisioner, pb_remote_client_reprovision,
 		  "Provisioner: pb-remote provisioning, resetting and reprov-ing multiple times."),
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_cancel.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_cancel.sh
new file mode 100755
index 00000000000..df2723a2270
--- /dev/null
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_cancel.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# Copyright 2025 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
+
+# Test that PB-ADV and PB-GATT unprovisioned beacons are cancelled when a provisioning link is
+# opened.
+# Test procedure:
+# 1. The provisioner self-provisions and starts scanning for unprovisioned devices.
+# 2. The provisionee enables both the PB-ADV and PB-GATT bearers.
+# 3. The provisioner finds the unprovisioned device and provisions it with OOB authentication.
+#    The OOB authentication is delayed by CONFIG_BT_MESH_UNPROV_BEACON_INT + 1 seconds to ensure
+#    that the provisioner has time observe that PB-ADV and PB-GATT beacons are cancelled.
+# 4. The provisioning procedure completes.
+
+overlay=overlay_gatt_conf_overlay_psa_conf
+RunTest mesh_prov_pb_cancel_adv \
+	prov_provisioner_pb_cancel \
+	prov_device_pb_cancel \
+	-- -argstest prov-bearer=3 prov-to-use=1
+
+overlay=overlay_gatt_conf_overlay_psa_conf
+RunTest mesh_prov_pb_cancel_gatt \
+	prov_provisioner_pb_cancel \
+	prov_device_pb_cancel \
+	-- -argstest prov-bearer=3 prov-to-use=2

From 1788c60697b44142accebe37dee9191de4582a22 Mon Sep 17 00:00:00 2001
From: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
Date: Tue, 25 Mar 2025 10:57:55 +0100
Subject: [PATCH 2776/2913] [nrf fromtree] Bluetooth: Mesh: Fix proxy after
 board reboot

When the board has been provisioned and the board is rebooted
it was not possible to connect to the board through the proxy
servcie. This fixes that the Mesh Proxy servive is restarted
after the board is rebooted.

Signed-off-by: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
(cherry picked from commit db84181c228ecf2054fd79470b00d9cce468f064)
Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
---
 subsys/bluetooth/mesh/proxy_srv.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/subsys/bluetooth/mesh/proxy_srv.c b/subsys/bluetooth/mesh/proxy_srv.c
index 8863a5ce52f..7d16a42a86e 100644
--- a/subsys/bluetooth/mesh/proxy_srv.c
+++ b/subsys/bluetooth/mesh/proxy_srv.c
@@ -983,6 +983,8 @@ int bt_mesh_proxy_gatt_enable(void)
 		}
 	}
 
+	bt_mesh_adv_gatt_update();
+
 	return 0;
 }
 

From 95fb969a73a24d4708e8a1dd8eae0bbb6ede5db2 Mon Sep 17 00:00:00 2001
From: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
Date: Wed, 26 Mar 2025 14:14:33 +0100
Subject: [PATCH 2777/2913] [nrf fromtree] Bluetooth: Mesh: remove device key
 candidate

Commit removes device key candidate if provisionee failed
during device key refresh procedure or mesh reset has been
called in between. Otherwise, device key candidate gets
stuck in the internal trusted storage of crypto library.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
(cherry picked from commit bf22fa697b5c5f0aa8ad9600f4930ec19ed14191)
Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
---
 subsys/bluetooth/mesh/main.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/subsys/bluetooth/mesh/main.c b/subsys/bluetooth/mesh/main.c
index e29fd87adc5..16e66532058 100644
--- a/subsys/bluetooth/mesh/main.c
+++ b/subsys/bluetooth/mesh/main.c
@@ -237,6 +237,8 @@ void bt_mesh_dev_key_cand_remove(void)
 	}
 
 	LOG_DBG("");
+	bt_mesh_key_destroy(&bt_mesh.dev_key_cand);
+	memset(&bt_mesh.dev_key_cand, 0, sizeof(struct bt_mesh_key));
 
 	if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
 		bt_mesh_net_dev_key_cand_store();
@@ -398,6 +400,10 @@ void bt_mesh_reset(void)
 	bt_mesh_key_destroy(&bt_mesh.dev_key);
 	memset(&bt_mesh.dev_key, 0, sizeof(bt_mesh.dev_key));
 
+	if (IS_ENABLED(CONFIG_BT_MESH_RPR_SRV)) {
+		bt_mesh_dev_key_cand_remove();
+	}
+
 	bt_mesh_beacon_disable();
 
 	bt_mesh_comp_unprovision();

From 26e29e1dcb2822b7fa5fc3d37cb77856c8a240df Mon Sep 17 00:00:00 2001
From: Jaakko Rautiainen <jaakko.rautiainen@bittium.com>
Date: Mon, 12 Aug 2024 14:53:49 +0300
Subject: [PATCH 2778/2913] [nrf fromtree] drivers: sensor: ti: tmp435: added
 driver for TMP435

The TMP435 is a remote temperature sensor monitor
with a built-in local temperature sensor.

Signed-off-by: Jaakko Rautiainen <jaakko.rautiainen@bittium.com>
(cherry picked from commit 516e5d61c6a4870658839d4dc0c89ac2a6536877)
---
 drivers/sensor/ti/CMakeLists.txt        |   1 +
 drivers/sensor/ti/Kconfig               |   1 +
 drivers/sensor/ti/tmp435/CMakeLists.txt |   7 +
 drivers/sensor/ti/tmp435/Kconfig        |  11 ++
 drivers/sensor/ti/tmp435/tmp435.c       | 214 ++++++++++++++++++++++++
 drivers/sensor/ti/tmp435/tmp435.h       |  44 +++++
 dts/bindings/sensor/ti,tmp435.yaml      |  36 ++++
 tests/drivers/build_all/sensor/i2c.dtsi |   9 +-
 8 files changed, 322 insertions(+), 1 deletion(-)
 create mode 100644 drivers/sensor/ti/tmp435/CMakeLists.txt
 create mode 100644 drivers/sensor/ti/tmp435/Kconfig
 create mode 100644 drivers/sensor/ti/tmp435/tmp435.c
 create mode 100644 drivers/sensor/ti/tmp435/tmp435.h
 create mode 100644 dts/bindings/sensor/ti,tmp435.yaml

diff --git a/drivers/sensor/ti/CMakeLists.txt b/drivers/sensor/ti/CMakeLists.txt
index 452d0e8e37a..8a497df2948 100644
--- a/drivers/sensor/ti/CMakeLists.txt
+++ b/drivers/sensor/ti/CMakeLists.txt
@@ -20,4 +20,5 @@ add_subdirectory_ifdef(CONFIG_TMP108 tmp108)
 add_subdirectory_ifdef(CONFIG_TMP112 tmp112)
 add_subdirectory_ifdef(CONFIG_TMP114 tmp114)
 add_subdirectory_ifdef(CONFIG_TMP116 tmp116)
+add_subdirectory_ifdef(CONFIG_TMP435 tmp435)
 # zephyr-keep-sorted-stop
diff --git a/drivers/sensor/ti/Kconfig b/drivers/sensor/ti/Kconfig
index f0655981a4c..7e9f0e95f29 100644
--- a/drivers/sensor/ti/Kconfig
+++ b/drivers/sensor/ti/Kconfig
@@ -20,4 +20,5 @@ source "drivers/sensor/ti/tmp108/Kconfig"
 source "drivers/sensor/ti/tmp112/Kconfig"
 source "drivers/sensor/ti/tmp114/Kconfig"
 source "drivers/sensor/ti/tmp116/Kconfig"
+source "drivers/sensor/ti/tmp435/Kconfig"
 # zephyr-keep-sorted-stop
diff --git a/drivers/sensor/ti/tmp435/CMakeLists.txt b/drivers/sensor/ti/tmp435/CMakeLists.txt
new file mode 100644
index 00000000000..c84b5c95445
--- /dev/null
+++ b/drivers/sensor/ti/tmp435/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Bittium Corporation
+# SPDX-License-Identifier: Apache-2.0
+#
+
+zephyr_library()
+
+zephyr_library_sources(tmp435.c)
diff --git a/drivers/sensor/ti/tmp435/Kconfig b/drivers/sensor/ti/tmp435/Kconfig
new file mode 100644
index 00000000000..dfbd455fcc5
--- /dev/null
+++ b/drivers/sensor/ti/tmp435/Kconfig
@@ -0,0 +1,11 @@
+# Copyright (c) 2024 Bittium Corporation
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config TMP435
+	bool "TMP435 temperature sensor"
+	default y
+	depends on DT_HAS_TI_TMP435_ENABLED
+	select I2C
+	help
+	  Enable the driver for the TMP435 temperature sensor
diff --git a/drivers/sensor/ti/tmp435/tmp435.c b/drivers/sensor/ti/tmp435/tmp435.c
new file mode 100644
index 00000000000..54cda9f402f
--- /dev/null
+++ b/drivers/sensor/ti/tmp435/tmp435.c
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2024 Bittium Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT ti_tmp435
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
+#include "tmp435.h"
+
+LOG_MODULE_REGISTER(TMP435, CONFIG_SENSOR_LOG_LEVEL);
+
+static inline int tmp435_reg_read(const struct tmp435_config *cfg, uint8_t reg, uint8_t *buf,
+				  uint32_t size)
+{
+	return i2c_burst_read_dt(&cfg->i2c, reg, buf, size);
+}
+
+static inline int tmp435_reg_write(const struct tmp435_config *cfg, uint8_t reg, uint8_t *buf,
+				   uint32_t size)
+{
+	return i2c_burst_write_dt(&cfg->i2c, reg, buf, size);
+}
+
+static inline int tmp435_get_status(const struct tmp435_config *cfg, uint8_t *status)
+{
+	return tmp435_reg_read(cfg, TMP435_STATUS_REG, status, 1);
+}
+
+static int tmp435_one_shot(const struct device *dev)
+{
+	uint8_t data = 0;
+	uint8_t status = 0;
+	int ret = 0;
+	const struct tmp435_config *cfg = dev->config;
+
+	data = 1; /* write anything to start */
+	ret = tmp435_reg_write(cfg, TMP435_ONE_SHOT_START_REG, &data, 1);
+	for (uint16_t i = 0; i < TMP435_CONV_LOOP_LIMIT; i++) {
+		ret = tmp435_get_status(cfg, &status);
+		if (ret < 0) {
+			LOG_DBG("Failed to read TMP435_STATUS_REG, ret:%d", ret);
+		} else {
+			if (status & TMP435_STATUS_REG_BUSY) {
+				/* conversion not ready */
+				k_msleep(10);
+			} else {
+				LOG_DBG("conv over, loops:%d status:%x", i, status);
+				break;
+			}
+		}
+	}
+	return ret;
+}
+
+static int tmp435_sample_fetch(const struct device *dev, enum sensor_channel chan)
+{
+	int ret = 0;
+	uint8_t value = 0;
+	int32_t temp = 0;
+	const struct tmp435_config *cfg = dev->config;
+	struct tmp435_data *data = dev->data;
+
+	if (chan != SENSOR_CHAN_ALL && chan != SENSOR_CHAN_DIE_TEMP &&
+	    chan != SENSOR_CHAN_AMBIENT_TEMP) {
+		return -ENOTSUP;
+	}
+	tmp435_one_shot(dev); /* start conversion */
+	if ((chan == SENSOR_CHAN_ALL) || (chan == SENSOR_CHAN_DIE_TEMP)) {
+		ret = tmp435_reg_read(cfg, TMP435_LOCAL_TEMP_H_REG, &value, sizeof(value));
+		if (ret < 0) {
+			LOG_ERR("Failed to read TMP435_LOCAL_TEMP_H_REG, ret:%d", ret);
+			return ret;
+		}
+		temp = value;
+		ret = tmp435_reg_read(cfg, TMP435_LOCAL_TEMP_L_REG, &value, sizeof(value));
+		if (ret < 0) {
+			LOG_ERR("Failed to read TMP435_LOCAL_TEMP_L_REG, ret:%d", ret);
+			return ret;
+		}
+		if (value > TMP435_FRACTION_INC) {
+			temp++;
+		}
+		data->temp_die = temp + tmp435_temp_offset;
+	}
+
+	if ((chan == SENSOR_CHAN_ALL) || (chan == SENSOR_CHAN_AMBIENT_TEMP)) {
+		if (!(cfg->external_channel)) {
+			return 0; /* not enabled, just return */
+		}
+		ret = tmp435_reg_read(cfg, TMP435_REMOTE_TEMP_H_REG, &value, sizeof(value));
+		if (ret < 0) {
+			LOG_ERR("Failed to read TMP435_REMOTE_TEMP_H_REG ret:%d", ret);
+			return ret;
+		}
+		temp = value;
+		ret = tmp435_reg_read(cfg, TMP435_REMOTE_TEMP_L_REG, &value, sizeof(value));
+		if (ret < 0) {
+			LOG_ERR("Failed to read TMP435_REMOTE_TEMP_L_REG, ret:%d", ret);
+			return ret;
+		}
+		if (value > TMP435_FRACTION_INC) {
+			temp++;
+		}
+		data->temp_ambient = temp + tmp435_temp_offset;
+	}
+	return 0;
+}
+
+static int tmp435_channel_get(const struct device *dev, enum sensor_channel chan,
+			      struct sensor_value *val)
+{
+	int ret = 0;
+	struct tmp435_data *data = dev->data;
+	const struct tmp435_config *cfg = dev->config;
+
+	switch (chan) {
+
+	case SENSOR_CHAN_DIE_TEMP:
+		val->val1 = data->temp_die;
+		val->val2 = 0;
+		break;
+	case SENSOR_CHAN_AMBIENT_TEMP:
+		if (cfg->external_channel) {
+			val->val1 = data->temp_ambient;
+			val->val2 = 0;
+		} else {
+			ret = -ENOTSUP;
+		}
+		break;
+	default:
+		ret = -ENOTSUP;
+		break;
+	}
+	return ret;
+}
+
+static const struct sensor_driver_api tmp435_driver_api = {
+	.sample_fetch = tmp435_sample_fetch,
+	.channel_get = tmp435_channel_get,
+};
+
+static int tmp435_init(const struct device *dev)
+{
+	uint8_t data = 0;
+	int ret = 0;
+	const struct tmp435_config *cfg = dev->config;
+
+	if (!(i2c_is_ready_dt(&cfg->i2c))) {
+		LOG_ERR("I2C dev not ready");
+		return -ENODEV;
+	}
+
+	data = 1; /* write anything to reset */
+	ret = tmp435_reg_write(cfg, TMP435_SOFTWARE_RESET_REG, &data, 1);
+	if (ret < 0) {
+		LOG_ERR("Failed to write TMP435_SOFTWARE_RESET_REG ret:%d", ret);
+		return ret;
+	}
+
+	data = TMP435_CONF_REG_1_DATA;
+	ret = tmp435_reg_write(cfg, TMP435_CONF_REG_1, &data, 1);
+	if (ret < 0) {
+		LOG_ERR("Failed to write TMP435_CONF_REG_1 ret:%d", ret);
+		return ret;
+	}
+
+	data = TMP435_CONF_REG_2_DATA;
+	if (cfg->external_channel) {
+		data = data + TMP435_CONF_REG_2_REN;
+	}
+	if (cfg->resistance_correction) {
+		data = data + TMP435_CONF_REG_2_RC;
+	}
+	ret = tmp435_reg_write(cfg, TMP435_CONF_REG_2, &data, 1);
+	if (ret < 0) {
+		LOG_ERR("Failed to write TMP435_CONF_REG_2 ret:%d", ret);
+		return ret;
+	}
+
+	data = cfg->beta_compensation;
+	ret = tmp435_reg_write(cfg, TMP435_BETA_RANGE_REG, &data, 1);
+	if (ret < 0) {
+		LOG_ERR("Failed to write TMP435_BETA_RANGE_REG ret:%d", ret);
+		return ret;
+	}
+	return 0;
+}
+
+/*
+ * Device creation macros
+ */
+
+#define TMP435_INST(inst)                                                                          \
+	static struct tmp435_data tmp435_data_##inst;                                              \
+	static const struct tmp435_config tmp435_config_##inst = {                                 \
+		.i2c = I2C_DT_SPEC_INST_GET(inst),                                                 \
+		.external_channel = DT_INST_PROP(inst, external_channel),                          \
+		.resistance_correction = DT_INST_PROP(inst, resistance_correction),                \
+		.beta_compensation = DT_INST_PROP(inst, beta_compensation),                        \
+	};                                                                                         \
+	SENSOR_DEVICE_DT_INST_DEFINE(inst, tmp435_init, NULL, &tmp435_data_##inst,                 \
+				     &tmp435_config_##inst, POST_KERNEL,                           \
+				     CONFIG_SENSOR_INIT_PRIORITY, &tmp435_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(TMP435_INST)
diff --git a/drivers/sensor/ti/tmp435/tmp435.h b/drivers/sensor/ti/tmp435/tmp435.h
new file mode 100644
index 00000000000..f138e15f37b
--- /dev/null
+++ b/drivers/sensor/ti/tmp435/tmp435.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2024 Bittium Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_TMP435_H_
+#define ZEPHYR_DRIVERS_SENSOR_TMP435_H_
+
+#define TMP435_CONF_REG_1         0x03
+#define TMP435_CONF_REG_1_DATA    0xc4
+/* [7]=1 ALERT Masked, [6]=1 Shut Down (one shot mode), [2]=1 −55 C to +150 C */
+#define TMP435_CONF_REG_2         0x1a
+#define TMP435_CONF_REG_2_REN     0x10 /* [4]=1 External channel 1 enabled */
+#define TMP435_CONF_REG_2_RC      0x04 /* [2]=1 Resistance correction enabled */
+#define TMP435_CONF_REG_2_DATA    0x08 /* [3]=1 Local channel enabled */
+#define TMP435_BETA_RANGE_REG     0x25
+#define TMP435_STATUS_REG         0x02
+#define TMP435_STATUS_REG_BUSY    0x80 /* conv not ready */
+#define TMP435_SOFTWARE_RESET_REG 0xfc
+#define TMP435_ONE_SHOT_START_REG 0x0f
+#define TMP435_LOCAL_TEMP_H_REG   0x00
+#define TMP435_LOCAL_TEMP_L_REG   0x15
+#define TMP435_REMOTE_TEMP_H_REG  0x01
+#define TMP435_REMOTE_TEMP_L_REG  0x10
+
+#define TMP435_CONV_LOOP_LIMIT 50   /* max 50*10 ms */
+#define TMP435_FRACTION_INC    0x80 /* 0.5000 */
+
+static const int32_t tmp435_temp_offset = -64;
+
+struct tmp435_data {
+	int32_t temp_die;     /* Celsius degrees */
+	int32_t temp_ambient; /* Celsius degrees */
+};
+
+struct tmp435_config {
+	struct i2c_dt_spec i2c;
+	bool external_channel;
+	bool resistance_correction;
+	uint8_t beta_compensation;
+};
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_TMP435_H_ */
diff --git a/dts/bindings/sensor/ti,tmp435.yaml b/dts/bindings/sensor/ti,tmp435.yaml
new file mode 100644
index 00000000000..5dc71b49f09
--- /dev/null
+++ b/dts/bindings/sensor/ti,tmp435.yaml
@@ -0,0 +1,36 @@
+#
+# Copyright (c) 2024 Bittium Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+description: Texas Instruments TMP435 temperature sensor
+
+compatible: "ti,tmp435"
+
+bus: tmp435
+
+include: [sensor-device.yaml, i2c-device.yaml]
+
+properties:
+  external-channel:
+    description: External temperature measurement is enabled
+    type: boolean
+  resistance-correction:
+    description: |
+      Resistance correction feature for the external
+      temperature channel. If not enabled then conversion
+      is faster but with lower accuracy.
+    type: boolean
+  beta-compensation:
+    description: |
+      Beta Compensation Configuration, see Table 8
+      from TMP435 data sheet, some common values.
+      0x0f, Automatically selected range 7 (beta > 27.0) or
+      Automatically detected diode connected sensor
+      0x07, Manually disabled beta correction
+      Default is common value for general purpose transistors.
+    type: int
+    default: 0x0f
+    enum: [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+           0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f]
diff --git a/tests/drivers/build_all/sensor/i2c.dtsi b/tests/drivers/build_all/sensor/i2c.dtsi
index 9a84104e1ed..b852447b1c9 100644
--- a/tests/drivers/build_all/sensor/i2c.dtsi
+++ b/tests/drivers/build_all/sensor/i2c.dtsi
@@ -1207,7 +1207,14 @@ test_i2c_tmag3001: tmag3001@a8 {
 	status = "okay";
 	reg = <0xa8>;
 	int-gpios = <&test_gpio 15 1>;
-
 	operation-mode = <TMAG5273_DT_OPER_MODE_CONTINUOUS>;
 	angle-magnitude-axis = <TMAG5273_DT_ANGLE_MAG_XY>;
 };
+
+test_i2c_tmp435: tmp435@a9 {
+	compatible = "ti,tmp435";
+	reg = <0xa9>;
+	external-channel;
+	resistance-correction;
+	beta-compensation = <0x0f>;
+};

From 604fb7615ce600f0e1cc11b8c29c8f13ed191776 Mon Sep 17 00:00:00 2001
From: Camille BAUD <mail@massdriver.space>
Date: Tue, 5 Nov 2024 12:02:06 +0100
Subject: [PATCH 2779/2913] [nrf fromtree] sensor: Introduce Phosense XBR818
 Driver

This Introduces a driver for the i2c interface of Phosense XBR818.
XBR818 is a 10.525Ghz Radar chip with builtin detection algorithm.

Signed-off-by: Camille BAUD <mail@massdriver.space>
(cherry picked from commit 637686695c5496d56ad7806b6311ae4e7d83a067)
---
 drivers/sensor/CMakeLists.txt            |   1 +
 drivers/sensor/Kconfig                   |   1 +
 drivers/sensor/xbr818/CMakeLists.txt     |   5 +
 drivers/sensor/xbr818/Kconfig            |  10 +
 drivers/sensor/xbr818/xbr818.c           | 434 +++++++++++++++++++++++
 drivers/sensor/xbr818/xbr818.h           |  97 +++++
 dts/bindings/sensor/phosense,xbr818.yaml |  19 +
 dts/bindings/vendor-prefixes.txt         |   1 +
 include/zephyr/drivers/sensor/xbr818.h   |  44 +++
 tests/drivers/build_all/sensor/i2c.dtsi  |   7 +
 10 files changed, 619 insertions(+)
 create mode 100644 drivers/sensor/xbr818/CMakeLists.txt
 create mode 100644 drivers/sensor/xbr818/Kconfig
 create mode 100644 drivers/sensor/xbr818/xbr818.c
 create mode 100644 drivers/sensor/xbr818/xbr818.h
 create mode 100644 dts/bindings/sensor/phosense,xbr818.yaml
 create mode 100644 include/zephyr/drivers/sensor/xbr818.h

diff --git a/drivers/sensor/CMakeLists.txt b/drivers/sensor/CMakeLists.txt
index ca65a412800..679d9c3c6e4 100644
--- a/drivers/sensor/CMakeLists.txt
+++ b/drivers/sensor/CMakeLists.txt
@@ -62,6 +62,7 @@ add_subdirectory_ifdef(CONFIG_TH02 th02)
 add_subdirectory_ifdef(CONFIG_TSIC_XX6 tsic_xx6)
 add_subdirectory_ifdef(CONFIG_VEAA_X_3 veaa_x_3)
 add_subdirectory_ifdef(CONFIG_VOLTAGE_DIVIDER voltage_divider)
+add_subdirectory_ifdef(CONFIG_XBR818 xbr818)
 add_subdirectory_ifdef(CONFIG_TACH_ENE_KB1200 ene_tach_kb1200)
 
 zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/sensor.h)
diff --git a/drivers/sensor/Kconfig b/drivers/sensor/Kconfig
index 452d8182eb7..4c6bfc3c413 100644
--- a/drivers/sensor/Kconfig
+++ b/drivers/sensor/Kconfig
@@ -146,6 +146,7 @@ source "drivers/sensor/th02/Kconfig"
 source "drivers/sensor/tsic_xx6/Kconfig"
 source "drivers/sensor/veaa_x_3/Kconfig"
 source "drivers/sensor/voltage_divider/Kconfig"
+source "drivers/sensor/xbr818/Kconfig"
 source "drivers/sensor/ene_tach_kb1200/Kconfig"
 
 endif # SENSOR
diff --git a/drivers/sensor/xbr818/CMakeLists.txt b/drivers/sensor/xbr818/CMakeLists.txt
new file mode 100644
index 00000000000..96d6c578d64
--- /dev/null
+++ b/drivers/sensor/xbr818/CMakeLists.txt
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+
+zephyr_library_sources_ifdef(CONFIG_XBR818 xbr818.c)
diff --git a/drivers/sensor/xbr818/Kconfig b/drivers/sensor/xbr818/Kconfig
new file mode 100644
index 00000000000..75b91c758ac
--- /dev/null
+++ b/drivers/sensor/xbr818/Kconfig
@@ -0,0 +1,10 @@
+# Copyright (c) 2024 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+config XBR818
+	bool "XBR818 Radar"
+	default y
+	depends on DT_HAS_PHOSENSE_XBR818_ENABLED
+	select I2C
+	help
+	  Enable driver for the Phosense XBR818 Radar Sensor
diff --git a/drivers/sensor/xbr818/xbr818.c b/drivers/sensor/xbr818/xbr818.c
new file mode 100644
index 00000000000..be396ec620e
--- /dev/null
+++ b/drivers/sensor/xbr818/xbr818.c
@@ -0,0 +1,434 @@
+/*
+ * Copyright (c) 2024 MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT phosense_xbr818
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(XBR818, CONFIG_SENSOR_LOG_LEVEL);
+
+#include "xbr818.h"
+#include <zephyr/drivers/sensor/xbr818.h>
+
+static int xbr818_enable_i2c(const struct device *dev)
+{
+	const struct xbr818_config *config = dev->config;
+	int ret;
+
+	if (config->i2c_en.port) {
+		ret = gpio_pin_set_dt(&config->i2c_en, 1);
+		if (ret != 0) {
+			LOG_ERR("%s: could not set i2c_en pin", dev->name);
+		}
+		k_usleep(10);
+		return ret;
+	}
+	return 0;
+}
+
+static int xbr818_disable_i2c(const struct device *dev)
+{
+	const struct xbr818_config *config = dev->config;
+	int ret;
+
+	if (config->i2c_en.port) {
+		ret = gpio_pin_set_dt(&config->i2c_en, 0);
+		if (ret != 0) {
+			LOG_ERR("%s: could not unset i2c_en pin", dev->name);
+		}
+		return ret;
+	}
+	return 0;
+}
+
+static int xbr818_sample_fetch(const struct device *dev, enum sensor_channel chan)
+{
+	const struct xbr818_config *config = dev->config;
+	struct xbr818_data *data = dev->data;
+	int ret;
+
+	if (chan != SENSOR_CHAN_PROX && chan != SENSOR_CHAN_ALL) {
+		LOG_ERR("%s: requesting unsupported channel %i", dev->name, chan);
+		return -ENOTSUP;
+	}
+
+	ret = gpio_pin_get_dt(&config->io_val);
+	if (ret < 0) {
+		return ret;
+	}
+	data->value = (ret == 1 ? true : false);
+
+	return 0;
+}
+
+static int xbr818_channel_get(const struct device *dev, enum sensor_channel chan,
+			      struct sensor_value *val)
+{
+	struct xbr818_data *data = dev->data;
+
+	if (chan != SENSOR_CHAN_PROX) {
+		LOG_ERR("%s: requesting unsupported channel %i", dev->name, chan);
+		return -ENOTSUP;
+	}
+
+	val->val1 = (data->value ? 1 : 0);
+	val->val2 = 0;
+
+	return 0;
+}
+
+static int xbr818_attr_set(const struct device *dev, enum sensor_channel chan,
+			   enum sensor_attribute attr, const struct sensor_value *val)
+{
+	const struct xbr818_config *config = dev->config;
+	int ret;
+	uint8_t tmp[3];
+	uint64_t tmpf;
+
+	if (chan != SENSOR_CHAN_PROX) {
+		LOG_ERR("%s: requesting unsupported channel %i", dev->name, chan);
+		return -ENOTSUP;
+	}
+
+	if (val->val1 < 0) {
+		return -EINVAL;
+	}
+
+	ret = xbr818_enable_i2c(dev);
+	if (ret != 0) {
+		return ret;
+	}
+
+	if (attr == SENSOR_ATTR_LOWER_THRESH) {
+		if (val->val1 > 0xFFFF || val->val1 < 0) {
+			return -EINVAL;
+		}
+		tmp[0] = val->val1 & 0xFF;
+		tmp[1] = (val->val1 & 0xFF00) >> 8;
+		ret = i2c_burst_write_dt(&config->i2c, XBR818_THRESHOLD_1, tmp, 2);
+	} else if ((enum sensor_attribute_xbr818)attr == SENSOR_ATTR_XBR818_NOISE_FLOOR) {
+		if (val->val1 > 0xFFFF || val->val1 < 0) {
+			return -EINVAL;
+		}
+		tmp[0] = val->val1 & 0xFF;
+		tmp[1] = (val->val1 & 0xFF00) >> 8;
+		ret = i2c_burst_write_dt(&config->i2c, XBR818_THRESHOLD_NOISE_1, tmp, 2);
+	} else if ((enum sensor_attribute_xbr818)attr == SENSOR_ATTR_XBR818_DELAY_TIME) {
+		if (val->val1 < 0 || val->val2 < 0) {
+			return -EINVAL;
+		}
+		tmpf = (uint64_t)val->val1 * 1000000 + (uint64_t)val->val2;
+		tmpf = (tmpf * SENSOR_XBR818_CLOCKRATE) / 1000000;
+		if (tmpf > 0xFFFFFF) {
+			return -EINVAL;
+		}
+		tmp[0] = tmpf & 0xFF;
+		tmp[1] = (tmpf & 0xFF00) >> 8;
+		tmp[2] = (tmpf & 0xFF0000) >> 16;
+		ret = i2c_burst_write_dt(&config->i2c, XBR818_DELAY_TIME_1, tmp, 3);
+	} else if ((enum sensor_attribute_xbr818)attr == SENSOR_ATTR_XBR818_LOCK_TIME) {
+		if (val->val1 < 0 || val->val2 < 0) {
+			return -EINVAL;
+		}
+		tmpf = (uint64_t)val->val1 * 1000000 + (uint64_t)val->val2;
+		tmpf = (tmpf * SENSOR_XBR818_CLOCKRATE) / 1000000;
+		if (tmpf > 0xFFFFFF) {
+			return -EINVAL;
+		}
+		tmp[0] = tmpf & 0xFF;
+		tmp[1] = (tmpf & 0xFF00) >> 8;
+		tmp[2] = (tmpf & 0xFF0000) >> 16;
+		ret = i2c_burst_write_dt(&config->i2c, XBR818_LOCK_TIME_1, tmp, 3);
+	} else if ((enum sensor_attribute_xbr818)attr == SENSOR_ATTR_XBR818_RF_POWER) {
+		if (val->val1 > 0x7 || val->val1 < 0) {
+			return -EINVAL;
+		}
+		tmp[0] = val->val1 & 0x7;
+		ret = i2c_reg_write_byte_dt(&config->i2c, XBR818_RF_POWER, tmp[0]);
+	} else if (attr == SENSOR_ATTR_SAMPLING_FREQUENCY) {
+		if (val->val1 > SENSOR_XBR818_CLOCKRATE || val->val1 <= 0) {
+			return -EINVAL;
+		}
+		tmp[0] = SENSOR_XBR818_CLOCKRATE / val->val1;
+		if (tmp[0] > 0xFF) {
+			return -EINVAL;
+		}
+		ret = i2c_reg_write_byte_dt(&config->i2c, XBR818_SAMPLE_RATE_DIVIDER, tmp[0]);
+	} else {
+		ret = xbr818_disable_i2c(dev);
+		if (ret != 0) {
+			return ret;
+		}
+		return -ENODEV;
+	}
+
+	if (ret != 0) {
+		return ret;
+	}
+
+	ret = xbr818_disable_i2c(dev);
+
+	return ret;
+}
+
+static int xbr818_attr_get(const struct device *dev, enum sensor_channel chan,
+			   enum sensor_attribute attr, struct sensor_value *val)
+{
+	const struct xbr818_config *config = dev->config;
+	int ret;
+	uint8_t tmp[3];
+	uint64_t tmpf;
+
+	if (chan != SENSOR_CHAN_PROX) {
+		LOG_ERR("%s: requesting unsupported channel %i", dev->name, chan);
+		return -ENOTSUP;
+	}
+
+	ret = xbr818_enable_i2c(dev);
+	if (ret != 0) {
+		return ret;
+	}
+
+	if (attr == SENSOR_ATTR_LOWER_THRESH) {
+		ret = i2c_burst_read_dt(&config->i2c, XBR818_THRESHOLD_1, tmp, 2);
+		if (ret != 0) {
+			return ret;
+		}
+		val->val1 = tmp[0] & 0xFF;
+		val->val1 |= (uint32_t)tmp[1] << 8;
+	} else if ((enum sensor_attribute_xbr818)attr == SENSOR_ATTR_XBR818_NOISE_FLOOR) {
+		ret = i2c_burst_read_dt(&config->i2c, XBR818_THRESHOLD_NOISE_1, tmp, 2);
+		if (ret != 0) {
+			return ret;
+		}
+		val->val1 = tmp[0] & 0xFF;
+		val->val1 |= (uint32_t)tmp[1] << 8;
+	} else if ((enum sensor_attribute_xbr818)attr == SENSOR_ATTR_XBR818_DELAY_TIME) {
+		ret = i2c_burst_read_dt(&config->i2c, XBR818_DELAY_TIME_1, tmp, 3);
+		if (ret != 0) {
+			return ret;
+		}
+		val->val1 = tmp[0] & 0xFF;
+		val->val1 |= (uint32_t)tmp[1] << 8;
+		val->val1 |= (uint32_t)tmp[2] << 16;
+		tmpf = (uint64_t)val->val1 * 1000000;
+		tmpf /= SENSOR_XBR818_CLOCKRATE;
+		val->val1 = tmpf / 1000000;
+		val->val2 = tmpf - val->val1 * 1000000;
+	} else if ((enum sensor_attribute_xbr818)attr == SENSOR_ATTR_XBR818_LOCK_TIME) {
+		ret = i2c_burst_read_dt(&config->i2c, XBR818_LOCK_TIME_1, tmp, 3);
+		if (ret != 0) {
+			return ret;
+		}
+		val->val1 = tmp[0] & 0xFF;
+		val->val1 |= (uint32_t)tmp[1] << 8;
+		val->val1 |= (uint32_t)tmp[2] << 16;
+		tmpf = (uint64_t)val->val1 * 1000000;
+		tmpf /= SENSOR_XBR818_CLOCKRATE;
+		val->val1 = tmpf / 1000000;
+		val->val2 = tmpf - val->val1 * 1000000;
+	} else if ((enum sensor_attribute_xbr818)attr == SENSOR_ATTR_XBR818_RF_POWER) {
+		ret = i2c_reg_read_byte_dt(&config->i2c, XBR818_RF_POWER, tmp);
+		if (ret != 0) {
+			return ret;
+		}
+		val->val1 = *tmp & 0x7;
+	} else if (attr == SENSOR_ATTR_SAMPLING_FREQUENCY) {
+		ret = i2c_reg_read_byte_dt(&config->i2c, XBR818_SAMPLE_RATE_DIVIDER, tmp);
+		if (ret != 0) {
+			return ret;
+		}
+		val->val1 = SENSOR_XBR818_CLOCKRATE / *tmp;
+	} else {
+		ret = xbr818_disable_i2c(dev);
+		if (ret != 0) {
+			return ret;
+		}
+		return -ENODEV;
+	}
+
+	ret = xbr818_disable_i2c(dev);
+
+	return ret;
+}
+
+static void xbr818_work(struct k_work *work)
+{
+	struct xbr818_data *data = CONTAINER_OF(work, struct xbr818_data, work);
+
+	if (likely(data->handler != NULL)) {
+		data->handler(data->dev, data->trigger);
+	}
+}
+
+static void xbr818_gpio_callback(const struct device *dev, struct gpio_callback *cb, uint32_t pins)
+{
+	struct xbr818_data *data = CONTAINER_OF(cb, struct xbr818_data, gpio_cb);
+
+	k_work_submit(&data->work);
+}
+
+static int xbr818_trigger_set(const struct device *dev, const struct sensor_trigger *trig,
+			      sensor_trigger_handler_t handler)
+{
+	const struct xbr818_config *config = dev->config;
+	struct xbr818_data *data = dev->data;
+	int ret;
+
+	if (trig->chan != SENSOR_CHAN_PROX) {
+		LOG_ERR("%s: requesting unsupported channel %i", dev->name, trig->chan);
+		return -ENOTSUP;
+	}
+
+	if (trig->type != SENSOR_TRIG_MOTION) {
+		LOG_ERR("%s: requesting unsupported trigger %i", dev->name, trig->type);
+		return -ENOTSUP;
+	}
+
+	data->handler = handler;
+	data->trigger = trig;
+	ret = gpio_pin_interrupt_configure_dt(&config->io_val, GPIO_INT_EDGE_RISING);
+	if (ret < 0) {
+		return ret;
+	}
+
+	if (handler) {
+		ret = gpio_add_callback(config->io_val.port, &data->gpio_cb);
+	} else {
+		ret = gpio_remove_callback(config->io_val.port, &data->gpio_cb);
+	}
+
+	return ret;
+}
+
+static int xbr818_init_defaults(const struct device *dev)
+{
+	const struct xbr818_config *config = dev->config;
+	int ret = 0;
+	uint8_t data[3];
+
+	ret |= i2c_reg_write_byte_dt(&config->i2c, XBR818_IO_ACTIVE_VALUE_REG, 0x03);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_IO_ACTIVE_VALUE_REG");
+	ret |= i2c_reg_write_byte_dt(&config->i2c, XBR818_RF_EN_SEL, 0x20);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_RF_EN_SEL");
+	ret |= i2c_reg_write_byte_dt(&config->i2c, XBR818_SAMPLE_RATE_DIVIDER, 0x20);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_SAMPLE_RATE_DIVIDER");
+	ret |= i2c_reg_write_byte_dt(&config->i2c, XBR818_RF_POWER, 0x45);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_RF_POWER");
+	ret |= i2c_reg_write_byte_dt(&config->i2c, XBR818_TIMER_CTRL, 0x21);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_TIMER_CTRL");
+
+	data[0] = 0x5a;
+	data[1] = 0x01;
+	ret |= i2c_burst_write_dt(&config->i2c, XBR818_THRESHOLD_1, data, 2);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_THRESHOLD");
+
+	data[0] = 0x55;
+	data[1] = 0x01;
+	ret |= i2c_burst_write_dt(&config->i2c, XBR818_THRESHOLD_NOISE_1, data, 2);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_THRESHOLD_NOISE");
+
+	/* 0.1 seconds */
+	data[0] = 0x80;
+	data[1] = 0x0C;
+	data[2] = 0x00;
+	ret |= i2c_burst_write_dt(&config->i2c, XBR818_DELAY_TIME_1, data, 3);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_DELAY_TIME");
+
+	/* 0.5 seconds */
+	data[0] = 0x80;
+	data[1] = 0x3E;
+	data[2] = 0x00;
+	ret |= i2c_burst_write_dt(&config->i2c, XBR818_LOCK_TIME_1, data, 3);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_LOCK_TIME");
+
+	ret |= i2c_reg_write_byte_dt(&config->i2c, XBR818_PIN_SETTINGS, 0x0C);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_PIN_SETTINGS");
+
+	ret |= i2c_reg_write_byte_dt(&config->i2c, XBR818_I2C_OUT, 0x1);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_I2C_OUT");
+
+	return ret;
+}
+
+static int xbr818_init(const struct device *dev)
+{
+	const struct xbr818_config *config = dev->config;
+	struct xbr818_data *data = dev->data;
+	int ret;
+
+	if (!i2c_is_ready_dt(&config->i2c)) {
+		LOG_ERR("I2C device not ready");
+		return -ENODEV;
+	}
+
+	data->dev = dev;
+	data->work.handler = xbr818_work;
+
+	ret = gpio_pin_configure_dt(&config->io_val, GPIO_INPUT);
+	if (ret != 0) {
+		LOG_ERR("%s: could not configure io_val(int) pin", dev->name);
+		return ret;
+	}
+
+	if (config->i2c_en.port) {
+		ret = gpio_pin_configure_dt(&config->i2c_en, GPIO_OUTPUT);
+		if (ret != 0) {
+			LOG_ERR("%s: could not configure i2c_en pin", dev->name);
+			return ret;
+		}
+	}
+
+	ret = xbr818_enable_i2c(dev);
+	if (ret != 0) {
+		return ret;
+	}
+
+	ret = xbr818_init_defaults(dev);
+	if (ret != 0) {
+		LOG_ERR("%s: unable to configure", dev->name);
+	}
+
+	ret = xbr818_disable_i2c(dev);
+	if (ret != 0) {
+		return ret;
+	}
+
+	ret = gpio_pin_interrupt_configure_dt(&config->io_val, GPIO_INT_DISABLE);
+	if (ret) {
+		LOG_ERR("%s: failed to configure gpio interrupt: %d", dev->name, ret);
+		return ret;
+	}
+
+	gpio_init_callback(&data->gpio_cb, xbr818_gpio_callback, BIT(config->io_val.pin));
+
+	return ret;
+}
+
+static const struct sensor_driver_api xbr818_api = {
+	.sample_fetch = xbr818_sample_fetch,
+	.channel_get = xbr818_channel_get,
+	.attr_set = xbr818_attr_set,
+	.attr_get = xbr818_attr_get,
+	.trigger_set = xbr818_trigger_set,
+};
+
+#define XBR818_INIT(inst)                                                                          \
+	static const struct xbr818_config xbr818_##inst##_config = {                               \
+		.i2c = I2C_DT_SPEC_INST_GET(inst),                                                 \
+		.i2c_en = GPIO_DT_SPEC_GET_OR(DT_INST(inst, phosense_xbr818), i2c_en_gpios, {0}),  \
+		.io_val = GPIO_DT_SPEC_GET(DT_INST(inst, phosense_xbr818), int_gpios),             \
+	};                                                                                         \
+                                                                                                   \
+	static struct xbr818_data xbr818_##inst##_data;                                            \
+                                                                                                   \
+	SENSOR_DEVICE_DT_INST_DEFINE(inst, xbr818_init, NULL, &xbr818_##inst##_data,               \
+				     &xbr818_##inst##_config, POST_KERNEL,                         \
+				     CONFIG_SENSOR_INIT_PRIORITY, &xbr818_api);
+
+DT_INST_FOREACH_STATUS_OKAY(XBR818_INIT);
diff --git a/drivers/sensor/xbr818/xbr818.h b/drivers/sensor/xbr818/xbr818.h
new file mode 100644
index 00000000000..f30f6d5ed0d
--- /dev/null
+++ b/drivers/sensor/xbr818/xbr818.h
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2024 MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_XBR818_XBR818_H_
+#define ZEPHYR_DRIVERS_SENSOR_XBR818_XBR818_H_
+
+#include <stdint.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+
+/* 32Khz clockrate, most time values are multiple of this */
+#define SENSOR_XBR818_CLOCKRATE 32000
+
+struct xbr818_config {
+	struct i2c_dt_spec i2c;
+	struct gpio_dt_spec i2c_en;
+	struct gpio_dt_spec io_val;
+};
+
+struct xbr818_data {
+	bool value;
+	uint32_t trigger_type;
+	sensor_trigger_handler_t handler;
+	struct gpio_callback gpio_cb;
+	const struct sensor_trigger *trigger;
+	const struct device *dev;
+	struct k_work work;
+};
+
+/* reference rd-04 module manual for more information */
+/* [0-2]: power of PA
+ * [4-6]: mixer trim
+ */
+#define XBR818_RF_POWER            0x03
+#define XBR818_RF_EN_SEL           0x04
+/* minimum value of 2 */
+#define XBR818_SAMPLE_RATE_DIVIDER 0x10
+/* [0]: enable detection
+ * [1-2]: readable data. 0: det_dc_sum 1: det_ac_sum 2: det_dc_used 3: det_noise
+ * [3]: enable read on 0x28-0x29
+ * [4]: signal detection threshold. 0: auto by pin 1: register
+ * [7]: enable read on 0x26-0x29
+ */
+#define XBR818_I2C_OUT             0x13
+/* Threshold for detection
+ * [0-7]
+ */
+#define XBR818_THRESHOLD_1         0x18
+/* [8-15] */
+#define XBR818_THRESHOLD_2         0x19
+/* Threshold for noise
+ * [0-7]
+ */
+#define XBR818_THRESHOLD_NOISE_1   0x1A
+/* [8-15] */
+#define XBR818_THRESHOLD_NOISE_2   0x1B
+/* Delay Time (in 1/32000 seconds)
+ * [0-7]
+ */
+#define XBR818_DELAY_TIME_1        0x1D
+/* [8-15] */
+#define XBR818_DELAY_TIME_2        0x1E
+/* [16-23] */
+#define XBR818_DELAY_TIME_3        0x1F
+/* [0]: enable
+ * [1-2]: light sensor timer. 0: disabled 1: 4 sec 2: 1 minute 3: 1 hour
+ * [3-4]: output timer. 0: 1 sec 1: 1 minute 2: 1 hour 3: 1 day
+ * [5]: delay time. 0: 'configure by pin' 1: configure by register
+ */
+#define XBR818_TIMER_CTRL          0x1C
+/* Lock Time (in 1/32000 seconds)
+ * [0-7]
+ */
+#define XBR818_LOCK_TIME_1         0x20
+/* [8-15] */
+#define XBR818_LOCK_TIME_2         0x21
+/* [16-23] */
+#define XBR818_LOCK_TIME_3         0x22
+/* Pin settings
+ * [0-3]: IO_VAL pin
+ * 0xc: io_value_out, 0xd: io_value_out inverted, 0xf: GPIO
+ * [4-7]: INT_IRQ pin
+ * 0x0: t3_int_irq, 0x9: io_value_out, 0xa: io_value_out inverted, 0xf: GPIO
+ */
+#define XBR818_PIN_SETTINGS        0x23
+/* [0]: ADC1 is configured for VCO trimming. 0: enable, 1: disable
+ * [1]: Low power mode is pin or register. 0: pin 1: register
+ * [2]: If IO_VAL pin is GPIO, output. 0: no 1: yes
+ * [3]: if INT_IRQ pin is GPIO, output. 0:no 1:yes
+ */
+#define XBR818_IO_ACTIVE_VALUE_REG 0x24
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_XBR818_XBR818_H_ */
diff --git a/dts/bindings/sensor/phosense,xbr818.yaml b/dts/bindings/sensor/phosense,xbr818.yaml
new file mode 100644
index 00000000000..9eeedba0584
--- /dev/null
+++ b/dts/bindings/sensor/phosense,xbr818.yaml
@@ -0,0 +1,19 @@
+# Copyright (c) 2024 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    Phosense XBR818 I2C-capable 10 GHz Radar Sensor
+
+compatible: "phosense,xbr818"
+
+include: [sensor-device.yaml, i2c-device.yaml]
+
+properties:
+  int-gpios:
+    type: phandle-array
+    required: true
+    description: GPIO pin connected to IO pin (IO_VAL)
+
+  i2c-en-gpios:
+    type: phandle-array
+    description: GPIO pin connected to I2C enable (I2C_EN)
diff --git a/dts/bindings/vendor-prefixes.txt b/dts/bindings/vendor-prefixes.txt
index ee115b920f6..1d06e4b8201 100644
--- a/dts/bindings/vendor-prefixes.txt
+++ b/dts/bindings/vendor-prefixes.txt
@@ -508,6 +508,7 @@ pda	Precision Design Associates, Inc.
 pericom	Pericom Technology Inc.
 pervasive	Pervasive Displays, Inc.
 phicomm	PHICOMM Co., Ltd.
+phosense	Beijing Phosense Electronic Technology Co., Ltd.
 phytec	PHYTEC
 picochip	Picochip Ltd
 pine64	Pine64
diff --git a/include/zephyr/drivers/sensor/xbr818.h b/include/zephyr/drivers/sensor/xbr818.h
new file mode 100644
index 00000000000..06cac96cbde
--- /dev/null
+++ b/include/zephyr/drivers/sensor/xbr818.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2024, MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief Extended public API for Phosense XBR818 10 GHz Radar
+ *
+ * This exposes 4 additional attributes used to configure the IC
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_SENSOR_XBR818_H_
+#define ZEPHYR_INCLUDE_DRIVERS_SENSOR_XBR818_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum sensor_attribute_xbr818 {
+	/*!
+	 * Time of received activity before output is triggered, in seconds
+	 */
+	SENSOR_ATTR_XBR818_DELAY_TIME = SENSOR_ATTR_PRIV_START,
+	/*!
+	 * How long output stays triggered after no more activity is detected, in seconds
+	 */
+	SENSOR_ATTR_XBR818_LOCK_TIME,
+	/*!
+	 * Noise floor Threshold for Radar, 16 first LSBs of the integer part.
+	 */
+	SENSOR_ATTR_XBR818_NOISE_FLOOR,
+	/*!
+	 * RF Power for Radar, 0 to 7, LSB of the integer part.
+	 */
+	SENSOR_ATTR_XBR818_RF_POWER
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_SENSOR_XBR818_H_ */
diff --git a/tests/drivers/build_all/sensor/i2c.dtsi b/tests/drivers/build_all/sensor/i2c.dtsi
index b852447b1c9..89ceaa58fa5 100644
--- a/tests/drivers/build_all/sensor/i2c.dtsi
+++ b/tests/drivers/build_all/sensor/i2c.dtsi
@@ -1218,3 +1218,10 @@ test_i2c_tmp435: tmp435@a9 {
 	resistance-correction;
 	beta-compensation = <0x0f>;
 };
+
+test_i2c_xbr818: xbr818@aa {
+	compatible = "phosense,xbr818";
+	reg = <0xaa>;
+	int-gpios = <&test_gpio 0 0>;
+	i2c-en-gpios = <&test_gpio 0 0>;
+};

From aff9ae6abaec375ccf72a0711ab5c58223db2dbb Mon Sep 17 00:00:00 2001
From: Andreas Klinger <ak@it-klinger.de>
Date: Thu, 16 Jan 2025 19:25:01 +0100
Subject: [PATCH 2780/2913] [nrf fromtree] drivers: sensor: add vishay veml6031
 ambient light sensor

- add driver for Vishay VEML6031 High Accuracy Ambient Light Sensor.
- add new compatible "vishay,veml6031".
- read and write consecutive 8 bit registers as bulk operation.
- add driver to build all test of sensors.
- support fetch and get.
- triggered mode and interrupt is not yet supported.

Signed-off-by: Andreas Klinger <ak@it-klinger.de>
(cherry picked from commit 72b2f012988b885a4acbb5f716895b86228bc986)
---
 drivers/sensor/vishay/CMakeLists.txt          |   1 +
 drivers/sensor/vishay/Kconfig                 |   1 +
 drivers/sensor/vishay/veml6031/CMakeLists.txt |   5 +
 drivers/sensor/vishay/veml6031/Kconfig        |  12 +
 drivers/sensor/vishay/veml6031/veml6031.c     | 617 ++++++++++++++++++
 dts/bindings/sensor/vishay,veml6031.yaml      |  10 +
 include/zephyr/drivers/sensor/veml6031.h      | 159 +++++
 tests/drivers/build_all/sensor/i2c.dtsi       |   5 +
 8 files changed, 810 insertions(+)
 create mode 100644 drivers/sensor/vishay/veml6031/CMakeLists.txt
 create mode 100644 drivers/sensor/vishay/veml6031/Kconfig
 create mode 100644 drivers/sensor/vishay/veml6031/veml6031.c
 create mode 100644 dts/bindings/sensor/vishay,veml6031.yaml
 create mode 100644 include/zephyr/drivers/sensor/veml6031.h

diff --git a/drivers/sensor/vishay/CMakeLists.txt b/drivers/sensor/vishay/CMakeLists.txt
index 51f0b77fde7..c0462dba862 100644
--- a/drivers/sensor/vishay/CMakeLists.txt
+++ b/drivers/sensor/vishay/CMakeLists.txt
@@ -4,5 +4,6 @@
 # zephyr-keep-sorted-start
 add_subdirectory_ifdef(CONFIG_VCNL36825T vcnl36825t)
 add_subdirectory_ifdef(CONFIG_VCNL4040 vcnl4040)
+add_subdirectory_ifdef(CONFIG_VEML6031 veml6031)
 add_subdirectory_ifdef(CONFIG_VEML7700 veml7700)
 # zephyr-keep-sorted-stop
diff --git a/drivers/sensor/vishay/Kconfig b/drivers/sensor/vishay/Kconfig
index e11eb201193..564a9740c9c 100644
--- a/drivers/sensor/vishay/Kconfig
+++ b/drivers/sensor/vishay/Kconfig
@@ -4,5 +4,6 @@
 # zephyr-keep-sorted-start
 source "drivers/sensor/vishay/vcnl36825t/Kconfig"
 source "drivers/sensor/vishay/vcnl4040/Kconfig"
+source "drivers/sensor/vishay/veml6031/Kconfig"
 source "drivers/sensor/vishay/veml7700/Kconfig"
 # zephyr-keep-sorted-stop
diff --git a/drivers/sensor/vishay/veml6031/CMakeLists.txt b/drivers/sensor/vishay/veml6031/CMakeLists.txt
new file mode 100644
index 00000000000..c5439bd757b
--- /dev/null
+++ b/drivers/sensor/vishay/veml6031/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Andreas Klinger
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+zephyr_library_sources(veml6031.c)
diff --git a/drivers/sensor/vishay/veml6031/Kconfig b/drivers/sensor/vishay/veml6031/Kconfig
new file mode 100644
index 00000000000..48914702933
--- /dev/null
+++ b/drivers/sensor/vishay/veml6031/Kconfig
@@ -0,0 +1,12 @@
+# Copyright (c) 2025 Andreas Klinger
+# SPDX-License-Identifier: Apache-2.0
+
+# Vishay VEML6031 ambient light sensor driver options.
+
+config VEML6031
+	bool "Vishay VEML6031 ambient light sensor"
+	default y
+	depends on DT_HAS_VISHAY_VEML6031_ENABLED
+	select I2C
+	help
+	  Enable Vishay VEML6031 ambient light sensor driver.
diff --git a/drivers/sensor/vishay/veml6031/veml6031.c b/drivers/sensor/vishay/veml6031/veml6031.c
new file mode 100644
index 00000000000..897c43e7eef
--- /dev/null
+++ b/drivers/sensor/vishay/veml6031/veml6031.c
@@ -0,0 +1,617 @@
+/*
+ * Copyright (c) 2025 Andreas Klinger
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT vishay_veml6031
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/byteorder.h>
+
+#include <zephyr/drivers/sensor/veml6031.h>
+
+LOG_MODULE_REGISTER(VEML6031, CONFIG_SENSOR_LOG_LEVEL);
+
+/*
+ * ID code of device
+ */
+#define VEML6031_DEFAULT_ID 0x01
+
+/*
+ * Bit mask to check for data ready in single measurement.
+ */
+#define VEML6031_ALS_AF_DATA_READY BIT(3)
+
+/*
+ * Maximum value of ALS data which also means that the sensor is in saturation
+ * and that the measured value might be wrong.
+ * In such a case the user program should reduce one or more of the following
+ * attributes to get a relyable value:
+ *   gain
+ *   integration time
+ *   effective photodiode size
+ *
+ */
+#define VEML6031_ALS_DATA_OVERFLOW 0xFFFF
+
+/*
+ * 16-bit command register addresses
+ */
+#define VEML6031_CMDCODE_ALS_CONF_0 0x00
+#define VEML6031_CMDCODE_ALS_CONF_1 0x01
+#define VEML6031_CMDCODE_ALS_WH_L   0x04
+#define VEML6031_CMDCODE_ALS_WH_H   0x05
+#define VEML6031_CMDCODE_ALS_WL_L   0x06
+#define VEML6031_CMDCODE_ALS_WL_H   0x07
+#define VEML6031_CMDCODE_ALS_DATA_L 0x10
+#define VEML6031_CMDCODE_ALS_DATA_H 0x11
+#define VEML6031_CMDCODE_IR_DATA_L  0x12
+#define VEML6031_CMDCODE_IR_DATA_H  0x13
+#define VEML6031_CMDCODE_ID_L       0x14
+#define VEML6031_CMDCODE_ID_H       0x15
+#define VEML6031_CMDCODE_ALS_INT    0x17
+
+/*
+ * ALS integration time struct.
+ */
+struct veml6031_it_data {
+	enum veml6031_it num;
+	uint8_t val;
+	int us;
+};
+
+/*
+ * ALS integration time setting values.
+ *
+ * The enumerators of <tt>enum veml6031_it</tt> provide
+ * indices into this array to get the related value for the
+ * ALS_IT configuration bits.
+ */
+static const struct veml6031_it_data veml6031_it_values[] = {
+	{VEML6031_IT_3_125, 0x00, 3125}, /*   3.125 - 0b0000 */
+	{VEML6031_IT_6_25, 0x01, 6250},  /*   6.25  - 0b0001 */
+	{VEML6031_IT_12_5, 0x02, 12500}, /*  12.5   - 0b0010 */
+	{VEML6031_IT_25, 0x03, 25000},   /*  25     - 0b0011 */
+	{VEML6031_IT_50, 0x04, 50000},   /*  50     - 0b0100 */
+	{VEML6031_IT_100, 0x05, 100000}, /* 100     - 0b0101 */
+	{VEML6031_IT_200, 0x06, 200000}, /* 200     - 0b0110 */
+	{VEML6031_IT_400, 0x07, 400000}, /* 400     - 0b0111 */
+};
+
+/*
+ * Resolution matrix for values to convert between data provided
+ * by the sensor ("counts") and lux.
+ *
+ * These values depend on the current size, gain and integration time settings.
+ * The enumerators of <tt>enum veml6031_div4</tt>, <tt>enum veml6031_gain</tt>
+ * and <tt>enum veml6031_als_it</tt> are used for indices into this matrix.
+ */
+static const float
+	veml6031_resolution[VEML6031_DIV4_COUNT][VEML6031_GAIN_COUNT][VEML6031_IT_COUNT] = {
+		/*3.125ms   6.25ms   12.5ms     25ms     50ms    100ms    200ms     400ms IT */
+		/* size 4/4 */
+		{
+			{0.8704f, 0.4352f, 0.2176f, 0.1088f, 0.0544f, 0.0272f, 0.0136f,
+			 0.0068f}, /* Gain 1    */
+			{0.4352f, 0.2176f, 0.1088f, 0.0544f, 0.0272f, 0.0136f, 0.0068f,
+			 0.0034f}, /* Gain 2    */
+			{1.3188f, 0.6504f, 0.3297f, 0.1648f, 0.0824f, 0.0412f, 0.0206f,
+			 0.0103f}, /* Gain 0.66 */
+			{1.7408f, 0.8704f, 0.4352f, 0.2176f, 0.1088f, 0.0544f, 0.0272f,
+			 0.0136f}, /* Gain 0.5  */
+		},
+		{
+			/* size 1/4 */
+			{3.4816f, 1.7408f, 0.8704f, 0.4352f, 0.2176f, 0.1088f, 0.0544f,
+			 0.0272f}, /* Gain 1    */
+			{1.7408f, 0.8704f, 0.4352f, 0.2176f, 0.1088f, 0.0544f, 0.0272f,
+			 0.0136f}, /* Gain 2    */
+			{5.2752f, 2.6376f, 1.3188f, 0.6594f, 0.3297f, 0.1648f, 0.0824f,
+			 0.0412f}, /* Gain 0.66 */
+			{6.9632f, 3.4816f, 1.7408f, 0.8704f, 0.4352f, 0.2176f, 0.1088f,
+			 0.0544f}, /* Gain 0.5  */
+		},
+};
+
+struct veml6031_config {
+	struct i2c_dt_spec bus;
+};
+
+struct veml6031_data {
+	uint8_t sd;              /* Band gap and LDO shutdown */
+	uint8_t int_en;          /* ALS interrupt enable */
+	uint8_t trig;            /* ALS active force trigger */
+	uint8_t af;              /* Active force mode */
+	uint8_t ir_sd;           /* ALS and IR channel shutdown */
+	uint8_t cal;             /* Power on ready */
+	enum veml6031_div4 div4; /* effective photodiode size */
+	enum veml6031_gain gain; /* gain selection */
+	enum veml6031_it itim;   /* ALS integration time */
+	enum veml6031_pers pers; /* ALS persistens protect */
+	uint16_t thresh_high;
+	uint16_t thresh_low;
+	uint16_t als_data;
+	uint32_t als_lux;
+	uint16_t ir_data;
+	uint32_t int_flags;
+};
+
+static void veml6031_sleep_by_integration_time(const struct veml6031_data *data)
+{
+	k_sleep(K_USEC(veml6031_it_values[data->itim].us));
+}
+
+static int veml6031_check_gain(const struct sensor_value *val)
+{
+	return val->val1 >= VEML6031_GAIN_1 && val->val1 <= VEML6031_GAIN_0_5;
+}
+
+static int veml6031_check_it(const struct sensor_value *val)
+{
+	return val->val1 >= VEML6031_IT_3_125 && val->val1 <= VEML6031_IT_400;
+}
+
+static int veml6031_check_div4(const struct sensor_value *val)
+{
+	return val->val1 >= VEML6031_SIZE_4_4 && val->val1 <= VEML6031_SIZE_1_4;
+}
+
+static int veml6031_check_pers(const struct sensor_value *val)
+{
+	return val->val1 >= VEML6031_PERS_1 && val->val1 <= VEML6031_PERS_8;
+}
+
+static int veml6031_read(const struct device *dev, uint8_t cmd, uint8_t *data)
+{
+	const struct veml6031_config *conf = dev->config;
+
+	uint8_t recv_buf;
+	int ret;
+
+	ret = i2c_reg_read_byte_dt(&conf->bus, cmd, &recv_buf);
+	if (ret < 0) {
+		return ret;
+	}
+
+	*data = recv_buf;
+
+	return 0;
+}
+
+static int veml6031_read16(const struct device *dev, uint8_t cmd, uint8_t *data)
+{
+	const struct veml6031_config *conf = dev->config;
+	int ret;
+
+	ret = i2c_burst_read_dt(&conf->bus, cmd, data, 2);
+	if (ret < 0) {
+		return ret;
+	}
+
+	return 0;
+}
+
+static int veml6031_write16(const struct device *dev, uint8_t cmd, uint8_t *data)
+{
+	const struct veml6031_config *conf = dev->config;
+
+	return i2c_burst_write_dt(&conf->bus, cmd, data, 2);
+}
+
+static int veml6031_write_conf(const struct device *dev)
+{
+	int ret;
+	struct veml6031_data *data = dev->data;
+	uint8_t conf[2] = {0, 0};
+
+	/* Bits 7 -> ALS and IR channel shutdown */
+	conf[1] |= data->ir_sd << 7;
+	/* Bits 6 -> Effective photodiode size */
+	conf[1] |= data->div4 << 6;
+	/* Bit 5 -> reserved */
+	/* Bits 4:3 -> Gain selection */
+	conf[1] |= data->gain << 3;
+	/* Bits 2:1 -> ALS persistence protect number */
+	conf[1] |= data->pers << 1;
+	/* Bit 0 -> Power on ready */
+	if (data->cal) {
+		conf[1] |= BIT(0);
+	}
+	/* Bit 7 -> reserved, have to be 0 */
+	/* Bits 6:4 -> integration time (ALS_IT) */
+	conf[0] |= data->itim << 4;
+	/* Bit 3 -> Active force mode enable */
+	if (data->af) {
+		conf[0] |= BIT(3);
+	}
+	/* Bit 2 -> ALS active force trigger */
+	if (data->trig) {
+		conf[0] |= BIT(2);
+	}
+	/* Bit 1 -> ALS interrupt enable */
+	if (data->int_en) {
+		conf[0] |= BIT(1);
+	}
+	/* Bit 0 -> shut down setting (SD) */
+	if (data->sd) {
+		conf[0] |= BIT(0);
+	}
+
+	ret = veml6031_write16(dev, VEML6031_CMDCODE_ALS_CONF_0, conf);
+	if (ret) {
+		LOG_ERR("Error while writing conf[0] ret: %d", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int veml6031_write_thresh_high(const struct device *dev)
+{
+	int ret;
+	const struct veml6031_data *data = dev->data;
+	uint8_t val[2];
+
+	val[0] = data->thresh_high & 0xFF;
+	val[1] = data->thresh_high >> 8;
+
+	LOG_DBG("Writing high threshold counts: %d", data->thresh_high);
+	ret = veml6031_write16(dev, VEML6031_CMDCODE_ALS_WH_L, val);
+	if (ret) {
+		return ret;
+	}
+
+	return 0;
+}
+
+static int veml6031_write_thresh_low(const struct device *dev)
+{
+	int ret;
+	const struct veml6031_data *data = dev->data;
+	uint8_t val[2];
+
+	val[0] = data->thresh_low & 0xFF;
+	val[1] = data->thresh_low >> 8;
+
+	LOG_DBG("Writing low threshold counts: %d", data->thresh_low);
+	ret = veml6031_write16(dev, VEML6031_CMDCODE_ALS_WL_L, val);
+	if (ret) {
+		return ret;
+	}
+
+	return 0;
+}
+
+static int veml6031_fetch(const struct device *dev)
+{
+	struct veml6031_data *data = dev->data;
+	int ret;
+
+	ret = veml6031_read16(dev, VEML6031_CMDCODE_ALS_DATA_L, (uint8_t *)&data->als_data);
+	if (ret < 0) {
+		return ret;
+	}
+	data->als_data = sys_le16_to_cpu(data->als_data);
+
+	ret = veml6031_read16(dev, VEML6031_CMDCODE_IR_DATA_L, (uint8_t *)&data->ir_data);
+	if (ret < 0) {
+		return ret;
+	}
+	data->ir_data = sys_le16_to_cpu(data->ir_data);
+
+	data->als_lux = data->als_data * veml6031_resolution[data->div4][data->gain][data->itim];
+
+	LOG_DBG("Read ALS measurement: counts=%d, lux=%d ir=%d", data->als_data, data->als_lux,
+		data->ir_data);
+
+	if (data->als_data == VEML6031_ALS_DATA_OVERFLOW) {
+		return -E2BIG;
+	}
+
+	return 0;
+}
+
+static int veml6031_attr_set(const struct device *dev, enum sensor_channel chan,
+			     enum sensor_attribute attr, const struct sensor_value *val)
+{
+	struct veml6031_data *data = dev->data;
+
+	if (chan != SENSOR_CHAN_LIGHT) {
+		return -ENOTSUP;
+	}
+
+	/* SENSOR_ATTR_.*_THRESH are not in enum sensor_attribute_veml6031 */
+	switch ((int)attr) {
+	case SENSOR_ATTR_VEML6031_IT:
+		if (veml6031_check_it(val)) {
+			data->itim = (enum veml6031_it)val->val1;
+		} else {
+			return -EINVAL;
+		}
+		break;
+	case SENSOR_ATTR_VEML6031_DIV4:
+		if (veml6031_check_div4(val)) {
+			data->div4 = (enum veml6031_div4)val->val1;
+		} else {
+			return -EINVAL;
+		}
+		break;
+	case SENSOR_ATTR_VEML6031_GAIN:
+		if (veml6031_check_gain(val)) {
+			data->gain = (enum veml6031_gain)val->val1;
+		} else {
+			return -EINVAL;
+		}
+		break;
+	case SENSOR_ATTR_VEML6031_PERS:
+		if (veml6031_check_pers(val)) {
+			data->pers = (enum veml6031_pers)val->val1;
+		} else {
+			return -EINVAL;
+		}
+		break;
+	case SENSOR_ATTR_LOWER_THRESH:
+		data->thresh_low =
+			val->val1 / veml6031_resolution[data->div4][data->gain][data->itim];
+		return veml6031_write_thresh_low(dev);
+	case SENSOR_ATTR_UPPER_THRESH:
+		data->thresh_high =
+			val->val1 / veml6031_resolution[data->div4][data->gain][data->itim];
+		return veml6031_write_thresh_high(dev);
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+static int veml6031_attr_get(const struct device *dev, enum sensor_channel chan,
+			     enum sensor_attribute attr, struct sensor_value *val)
+{
+	struct veml6031_data *data = dev->data;
+
+	if (chan != SENSOR_CHAN_LIGHT) {
+		return -ENOTSUP;
+	}
+
+	/* SENSOR_ATTR_.*_THRESH are not in enum sensor_attribute_veml6031 */
+	switch ((int)attr) {
+	case SENSOR_ATTR_VEML6031_IT:
+		val->val1 = data->itim;
+		break;
+	case SENSOR_ATTR_VEML6031_DIV4:
+		val->val1 = data->div4;
+		break;
+	case SENSOR_ATTR_VEML6031_GAIN:
+		val->val1 = data->gain;
+		break;
+	case SENSOR_ATTR_VEML6031_PERS:
+		val->val1 = data->pers;
+		break;
+	case SENSOR_ATTR_LOWER_THRESH:
+		val->val1 = data->thresh_low;
+		break;
+	case SENSOR_ATTR_UPPER_THRESH:
+		val->val1 = data->thresh_high;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	val->val2 = 0;
+
+	return 0;
+}
+
+static int veml6031_perform_single_measurement(const struct device *dev)
+{
+	struct veml6031_data *data = dev->data;
+	int ret;
+	uint8_t val;
+	int cnt = 0;
+
+	data->ir_sd = 0;
+	data->cal = 1;
+	data->af = 1;
+	data->trig = 1;
+	data->int_en = 0;
+	data->sd = 0;
+
+	ret = veml6031_write_conf(dev);
+	if (ret) {
+		return ret;
+	}
+
+	ret = veml6031_read(dev, VEML6031_CMDCODE_ALS_INT, &val);
+
+	veml6031_sleep_by_integration_time(data);
+
+	while (1) {
+		ret = veml6031_read(dev, VEML6031_CMDCODE_ALS_INT, &val);
+		if (ret) {
+			return ret;
+		}
+
+		if (val & VEML6031_ALS_AF_DATA_READY) {
+			break;
+		}
+
+		k_sleep(K_MSEC(1));
+
+		cnt++;
+	}
+
+	LOG_DBG("read VEML6031_CMDCODE_ALS_INT: %02X (%d)", val, cnt);
+
+	return 0;
+}
+
+static int veml6031_sample_fetch(const struct device *dev, enum sensor_channel chan)
+{
+	int ret;
+
+	/* Start sensor for new measurement */
+	if (chan == SENSOR_CHAN_LIGHT || chan == SENSOR_CHAN_ALL) {
+		ret = veml6031_perform_single_measurement(dev);
+		if (ret < 0) {
+			return ret;
+		}
+
+		return veml6031_fetch(dev);
+	} else {
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+static int veml6031_channel_get(const struct device *dev, enum sensor_channel chan,
+				struct sensor_value *val)
+{
+	struct veml6031_data *data = dev->data;
+
+	switch ((int)chan) {
+	case SENSOR_CHAN_LIGHT:
+		val->val1 = data->als_lux;
+		break;
+	case SENSOR_CHAN_VEML6031_ALS_RAW_COUNTS:
+		val->val1 = data->als_data;
+		break;
+	case SENSOR_CHAN_VEML6031_IR_RAW_COUNTS:
+		val->val1 = data->ir_data;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	val->val2 = 0;
+
+	return 0;
+}
+
+#ifdef CONFIG_PM_DEVICE
+
+static int veml6031_set_shutdown_flag(const struct device *dev, uint8_t new_val)
+{
+	struct veml6031_data *data = dev->data;
+	uint8_t prev_sd;
+	uint8_t prev_ir_sd;
+	int ret;
+
+	prev_sd = data->sd;
+	prev_ir_sd = data->ir_sd;
+	data->sd = new_val;
+	data->ir_sd = new_val;
+
+	ret = veml6031_write_conf(dev);
+	if (ret < 0) {
+		data->ir_sd = prev_ir_sd;
+		data->sd = prev_sd;
+	}
+	return ret;
+}
+
+static int veml6031_pm_action(const struct device *dev, enum pm_device_action action)
+{
+	struct veml6031_data *data = dev->data;
+
+	if (!data->sd) {
+		switch (action) {
+		case PM_DEVICE_ACTION_SUSPEND:
+			return veml6031_set_shutdown_flag(dev, 1);
+
+		case PM_DEVICE_ACTION_RESUME:
+			return veml6031_set_shutdown_flag(dev, 0);
+
+		default:
+			return -ENOTSUP;
+		}
+	}
+
+	return 0;
+}
+
+#endif /* CONFIG_PM_DEVICE */
+
+static int veml6031_init(const struct device *dev)
+{
+	const struct veml6031_config *conf = dev->config;
+	int ret;
+	uint8_t val8;
+
+	if (!i2c_is_ready_dt(&conf->bus)) {
+		LOG_ERR("VEML device not ready");
+		return -ENODEV;
+	}
+
+	ret = veml6031_read(dev, VEML6031_CMDCODE_ID_L, &val8);
+	if (ret < 0) {
+		LOG_ERR("Error while reading ID low. ret: %d", ret);
+		return ret;
+	}
+	if (val8 != VEML6031_DEFAULT_ID) {
+		LOG_ERR("Device ID wrong: %d", val8);
+		return -EIO;
+	}
+	ret = veml6031_read(dev, VEML6031_CMDCODE_ID_H, &val8);
+	if (ret < 0) {
+		LOG_ERR("Error while reading ID high. ret: %d", ret);
+		return ret;
+	}
+	LOG_DBG("veml6031 found package: %02d address: %02X version: %3s", val8 >> 6,
+		val8 >> 4 & 0x03 ? 0x10 : 0x29, val8 & 0x0F ? "XXX" : "A01");
+
+	/* Initialize sensor configuration */
+	ret = veml6031_write_thresh_low(dev);
+	if (ret < 0) {
+		LOG_ERR("Error while writing thresh low. ret: %d", ret);
+		return ret;
+	}
+
+	ret = veml6031_write_thresh_high(dev);
+	if (ret < 0) {
+		LOG_ERR("Error while writing thresh high. ret: %d", ret);
+		return ret;
+	}
+
+	ret = veml6031_write_conf(dev);
+	if (ret < 0) {
+		LOG_ERR("Error while writing conf. ret: %d", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static DEVICE_API(sensor, veml6031_api) = {
+	.sample_fetch = veml6031_sample_fetch,
+	.channel_get = veml6031_channel_get,
+	.attr_set = veml6031_attr_set,
+	.attr_get = veml6031_attr_get,
+};
+
+#define VEML6031_INIT(n)                                                                           \
+	static struct veml6031_data veml6031_data_##n = {.trig = 1,                                \
+							 .af = 1,                                  \
+							 .div4 = VEML6031_SIZE_4_4,                \
+							 .gain = VEML6031_GAIN_1,                  \
+							 .itim = VEML6031_IT_100,                  \
+							 .pers = VEML6031_PERS_1,                  \
+							 .thresh_high = 0xFFFF};                   \
+                                                                                                   \
+	static const struct veml6031_config veml6031_config_##n = {                                \
+		.bus = I2C_DT_SPEC_INST_GET(n)};                                                   \
+                                                                                                   \
+	PM_DEVICE_DT_INST_DEFINE(n, veml6031_pm_action);                                           \
+                                                                                                   \
+	SENSOR_DEVICE_DT_INST_DEFINE(n, veml6031_init, PM_DEVICE_DT_INST_GET(n),                   \
+				     &veml6031_data_##n, &veml6031_config_##n, POST_KERNEL,        \
+				     CONFIG_SENSOR_INIT_PRIORITY, &veml6031_api);
+
+DT_INST_FOREACH_STATUS_OKAY(VEML6031_INIT)
diff --git a/dts/bindings/sensor/vishay,veml6031.yaml b/dts/bindings/sensor/vishay,veml6031.yaml
new file mode 100644
index 00000000000..4ebc5d25bcc
--- /dev/null
+++ b/dts/bindings/sensor/vishay,veml6031.yaml
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 Andreas Klinger
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    Vishay VEML6031 High Accuracy Ambient Light Sensor With I2C Interface.
+    See: https://www.vishay.com/docs/80007/veml6031x00.pdf
+
+compatible: "vishay,veml6031"
+
+include: [sensor-device.yaml, i2c-device.yaml]
diff --git a/include/zephyr/drivers/sensor/veml6031.h b/include/zephyr/drivers/sensor/veml6031.h
new file mode 100644
index 00000000000..fe867a72a52
--- /dev/null
+++ b/include/zephyr/drivers/sensor/veml6031.h
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2025 Andreas Klinger
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_SENSOR_VEML6031_H_
+#define ZEPHYR_INCLUDE_DRIVERS_SENSOR_VEML6031_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief ALS integration time settings in veml6031_it
+ */
+#define VEML6031_IT_COUNT 8
+
+/**
+ * @brief Effective photodiode size in enum veml6031_size.
+ */
+#define VEML6031_DIV4_COUNT 2
+
+/**
+ * @brief Gain selections in enum veml6031_gain.
+ */
+#define VEML6031_GAIN_COUNT 4
+
+/**
+ * @brief VEML6031 integration time options for ambient light measurements.
+ */
+enum veml6031_it {
+	VEML6031_IT_3_125,
+	VEML6031_IT_6_25,
+	VEML6031_IT_12_5,
+	VEML6031_IT_25,
+	VEML6031_IT_50,
+	VEML6031_IT_100,
+	VEML6031_IT_200,
+	VEML6031_IT_400,
+};
+
+/**
+ * @brief VEML6031 size options for ambient light measurements.
+ */
+enum veml6031_div4 {
+	VEML6031_SIZE_4_4 = 0x00, /* 0b0 */
+	VEML6031_SIZE_1_4 = 0x01, /* 0b1 */
+};
+
+/**
+ * @brief VEML6031 gain options for ambient light measurements.
+ */
+enum veml6031_gain {
+	VEML6031_GAIN_1 = 0x00,    /* 0b00 */
+	VEML6031_GAIN_2 = 0x01,    /* 0b01 */
+	VEML6031_GAIN_0_66 = 0x02, /* 0b10 */
+	VEML6031_GAIN_0_5 = 0x03,  /* 0b11 */
+};
+
+/**
+ * @brief VEML6031 ALS interrupt persistence protect number options.
+ */
+enum veml6031_pers {
+	VEML6031_PERS_1 = 0x00, /* 0b00 */
+	VEML6031_PERS_2 = 0x01, /* 0b01 */
+	VEML6031_PERS_4 = 0x02, /* 0b10 */
+	VEML6031_PERS_8 = 0x03, /* 0b11 */
+};
+
+/**
+ * @brief VEML6031 specific sensor attributes.
+ *
+ * For high and low threshold window settings (ALS_WH_L, ALS_WH_H, ALS_WL_L and
+ * ALS_WL_H) use the generic attributes <tt>SENSOR_ATTR_UPPER_THRESH</tt> and
+ * <tt>SENSOR_ATTR_LOWER_THRESH</tt> with 16-bit unsigned integer values. Both
+ * threshold settings are in lux and converted by the driver to a value
+ * compatible with the sensor. This conversion depends on the current gain,
+ * integration time and effective photodiode size settings. So a change in
+ * gain, integration time or effective photodiode size usually requires an
+ * update of threshold window settings. To get the correct threshold values
+ * into the sensor update the thresholds -after- a change of gain or
+ * integration time.
+ *
+ * All attributes must be set for the <tt>SENSOR_CHAN_LIGHT</tt> channel.
+ *
+ * When the sensor goes into saturation <tt>-E2BIG</tt> is returned. This
+ * happens when the maximum value <tt>0xFFFF</tt> is returned as raw ALS value.
+ * In this case it's up to the user to reduce one or more of the following
+ * attributes to come back into the optimal measurement range of the sensor:
+ *  <tt>SENSOR_ATTR_VEML6031_GAIN</tt> (gain)
+ *  <tt>SENSOR_ATTR_VEML6031_IT</tt> (integration time)
+ *  <tt>SENSOR_ATTR_VEML6031_DIV4</tt> (effective photodiode size)
+ */
+enum sensor_attribute_veml6031 {
+	/**
+	 * @brief Integration time setting for ALS measurements (IT).
+	 *
+	 * Use enum veml6031_it for attribute values.
+	 */
+	SENSOR_ATTR_VEML6031_IT = SENSOR_ATTR_PRIV_START,
+	/**
+	 * @brief Effective photodiode size (DIV4)
+	 *
+	 * Use enum veml6031_div4 for attribute values.
+	 */
+	SENSOR_ATTR_VEML6031_DIV4,
+	/**
+	 * @brief Gain setting for ALS measurements (GAIN).
+	 *
+	 * Use enum veml6031_gain for attribute values.
+	 */
+	SENSOR_ATTR_VEML6031_GAIN,
+	/**
+	 * @brief ALS persistence protect number setting (PERS).
+	 *
+	 * Use enum veml6031_pers for attribute values.
+	 */
+	SENSOR_ATTR_VEML6031_PERS,
+};
+
+/**
+ * @brief VEML6031 specific sensor channels.
+ */
+enum sensor_channel_veml6031 {
+	/**
+	 * @brief Channel for raw ALS sensor values.
+	 *
+	 * This channel represents the raw measurement counts provided by the
+	 * sensor ALS register. It is useful for estimating good values for
+	 * integration time, effective photodiode size and gain attributes in
+	 * fetch and get mode.
+	 *
+	 * For future implementations with triggers it can also be used to
+	 * estimate the threshold window attributes for the sensor interrupt
+	 * handling.
+	 *
+	 * It cannot be fetched directly. Instead, this channel's value is
+	 * fetched implicitly using <tt>SENSOR_CHAN_LIGHT</tt>. Trying to call
+	 * <tt>sensor_channel_fetch_chan()</tt> with this enumerator as an
+	 * argument will result in a <tt>-ENOTSUP</tt>.
+	 */
+	SENSOR_CHAN_VEML6031_ALS_RAW_COUNTS = SENSOR_CHAN_PRIV_START,
+
+	/**
+	 * @brief Channel for IR sensor values.
+	 *
+	 * This channel is the raw IR Channel count output of the sensor. About
+	 * fetching the same as for
+	 * <tt>SENSOR_CHAN_VEML6031_ALS_RAW_COUNTS</tt> applies.
+	 */
+	SENSOR_CHAN_VEML6031_IR_RAW_COUNTS,
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_SENSOR_VEML6031_H_ */
diff --git a/tests/drivers/build_all/sensor/i2c.dtsi b/tests/drivers/build_all/sensor/i2c.dtsi
index 89ceaa58fa5..e61016db372 100644
--- a/tests/drivers/build_all/sensor/i2c.dtsi
+++ b/tests/drivers/build_all/sensor/i2c.dtsi
@@ -1225,3 +1225,8 @@ test_i2c_xbr818: xbr818@aa {
 	int-gpios = <&test_gpio 0 0>;
 	i2c-en-gpios = <&test_gpio 0 0>;
 };
+
+test_i2c_veml6031: veml6031@ab {
+	compatible = "vishay,veml6031";
+	reg = <0xab>;
+};

From d23213eca098209a74f6f5fc12d61aa5d90b0d3c Mon Sep 17 00:00:00 2001
From: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
Date: Tue, 4 Feb 2025 18:40:41 +0100
Subject: [PATCH 2781/2913] [nrf fromtree] drivers: sensor: add Bosch BMM350
 magnetometer driver

Add driver for Bosch BMM350 magnetometer sensor.

Signed-off-by: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
(cherry picked from commit 878ab536984253b57aa31b52697f87110fea8a11)
---
 drivers/sensor/bosch/CMakeLists.txt           |   1 +
 drivers/sensor/bosch/Kconfig                  |   1 +
 drivers/sensor/bosch/bmm350/CMakeLists.txt    |   7 +
 drivers/sensor/bosch/bmm350/Kconfig           |  22 +
 drivers/sensor/bosch/bmm350/bmm350.c          | 988 ++++++++++++++++++
 drivers/sensor/bosch/bmm350/bmm350.h          | 497 +++++++++
 drivers/sensor/bosch/bmm350/bmm350_i2c.c      |  28 +
 drivers/sensor/bosch/bmm350/bmm350_trigger.c  | 141 +++
 dts/bindings/sensor/bosch,bmm350-i2c.yaml     |  11 +
 dts/bindings/sensor/bosch,bmm350.yaml         |  12 +
 tests/drivers/build_all/sensor/i2c.dtsi       |   6 +
 .../sensor/sensors_trigger_none.conf          |   1 +
 .../build_all/sensor/sensors_trigger_own.conf |   1 +
 13 files changed, 1716 insertions(+)
 create mode 100644 drivers/sensor/bosch/bmm350/CMakeLists.txt
 create mode 100644 drivers/sensor/bosch/bmm350/Kconfig
 create mode 100644 drivers/sensor/bosch/bmm350/bmm350.c
 create mode 100644 drivers/sensor/bosch/bmm350/bmm350.h
 create mode 100644 drivers/sensor/bosch/bmm350/bmm350_i2c.c
 create mode 100644 drivers/sensor/bosch/bmm350/bmm350_trigger.c
 create mode 100644 dts/bindings/sensor/bosch,bmm350-i2c.yaml
 create mode 100644 dts/bindings/sensor/bosch,bmm350.yaml

diff --git a/drivers/sensor/bosch/CMakeLists.txt b/drivers/sensor/bosch/CMakeLists.txt
index 4125ab1e7ed..8c1207bfa20 100644
--- a/drivers/sensor/bosch/CMakeLists.txt
+++ b/drivers/sensor/bosch/CMakeLists.txt
@@ -13,6 +13,7 @@ add_subdirectory_ifdef(CONFIG_BMI160 bmi160)
 add_subdirectory_ifdef(CONFIG_BMI270 bmi270)
 add_subdirectory_ifdef(CONFIG_BMI323 bmi323)
 add_subdirectory_ifdef(CONFIG_BMM150 bmm150)
+add_subdirectory_ifdef(CONFIG_BMM350 bmm350)
 add_subdirectory_ifdef(CONFIG_BMP180 bmp180)
 add_subdirectory_ifdef(CONFIG_BMP388 bmp388)
 add_subdirectory_ifdef(CONFIG_BMP581 bmp581)
diff --git a/drivers/sensor/bosch/Kconfig b/drivers/sensor/bosch/Kconfig
index 795284d3a2d..b0232edfce0 100644
--- a/drivers/sensor/bosch/Kconfig
+++ b/drivers/sensor/bosch/Kconfig
@@ -13,6 +13,7 @@ source "drivers/sensor/bosch/bmi160/Kconfig"
 source "drivers/sensor/bosch/bmi270/Kconfig"
 source "drivers/sensor/bosch/bmi323/Kconfig"
 source "drivers/sensor/bosch/bmm150/Kconfig"
+source "drivers/sensor/bosch/bmm350/Kconfig"
 source "drivers/sensor/bosch/bmp180/Kconfig"
 source "drivers/sensor/bosch/bmp388/Kconfig"
 source "drivers/sensor/bosch/bmp581/Kconfig"
diff --git a/drivers/sensor/bosch/bmm350/CMakeLists.txt b/drivers/sensor/bosch/bmm350/CMakeLists.txt
new file mode 100644
index 00000000000..3ccf040f8b8
--- /dev/null
+++ b/drivers/sensor/bosch/bmm350/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Bosch Sensortec GmbH
+
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+zephyr_library_sources(bmm350.c bmm350_i2c.c)
+zephyr_library_sources_ifdef(CONFIG_BMM350_TRIGGER bmm350_trigger.c)
diff --git a/drivers/sensor/bosch/bmm350/Kconfig b/drivers/sensor/bosch/bmm350/Kconfig
new file mode 100644
index 00000000000..1280f009a70
--- /dev/null
+++ b/drivers/sensor/bosch/bmm350/Kconfig
@@ -0,0 +1,22 @@
+# BMM350 Geomagnetic sensor configuration options
+
+# Copyright (c) 2024 Bosch Sensortec GmbH
+
+# SPDX-License-Identifier: Apache-2.0
+
+menuconfig BMM350
+	bool "BMM350 I2C Geomagnetic Chip"
+	default y
+	depends on DT_HAS_BOSCH_BMM350_ENABLED
+	select I2C
+	help
+	  Enable driver for BMM350 I2C-based Geomagnetic sensor.
+
+if BMM350
+
+module = BMM350
+thread_priority = 10
+thread_stack_size = 1024
+source "drivers/sensor/Kconfig.trigger_template"
+
+endif # BMM350
diff --git a/drivers/sensor/bosch/bmm350/bmm350.c b/drivers/sensor/bosch/bmm350/bmm350.c
new file mode 100644
index 00000000000..901d3ffa734
--- /dev/null
+++ b/drivers/sensor/bosch/bmm350/bmm350.c
@@ -0,0 +1,988 @@
+/*
+ * Copyright (c) 2024 Bosch Sensortec GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Bus-specific functionality for BMM350s accessed via I2C.
+ * version 1.0.0
+ */
+
+#include <zephyr/logging/log.h>
+#include "bmm350.h"
+
+LOG_MODULE_REGISTER(BMM350, CONFIG_SENSOR_LOG_LEVEL);
+
+static inline int bmm350_bus_check(const struct device *dev)
+{
+	const struct bmm350_config *cfg = dev->config;
+
+	return cfg->bus_io->check(&cfg->bus);
+}
+
+static inline int bmm350_reg_read(const struct device *dev, uint8_t start, uint8_t *buf, int size)
+{
+	const struct bmm350_config *cfg = dev->config;
+
+	return cfg->bus_io->read(&cfg->bus, start, buf, size);
+}
+
+int bmm350_reg_write(const struct device *dev, uint8_t reg, uint8_t val)
+{
+	const struct bmm350_config *cfg = dev->config;
+
+	return cfg->bus_io->write(&cfg->bus, reg, val);
+}
+
+static int8_t bmm350_read_otp_word(const struct device *dev, uint8_t addr, uint16_t *lsb_msb)
+{
+	int8_t ret = 0;
+	uint8_t tx_buf = 0;
+	uint8_t rx_buf[3] = {0x00};
+	uint8_t otp_status = 0;
+	uint8_t otp_err = BMM350_OTP_STATUS_NO_ERROR;
+	uint8_t lsb = 0, msb = 0;
+
+	if (lsb_msb) {
+		/* Set OTP command at specified address */
+		tx_buf = BMM350_OTP_CMD_DIR_READ | (addr & BMM350_OTP_WORD_ADDR_MSK);
+		ret = bmm350_reg_write(dev, BMM350_REG_OTP_CMD_REG, tx_buf);
+		if (ret) {
+			LOG_ERR("i2c xfer failed! read addr = 0x%02x, ret = %d\n", tx_buf, ret);
+			return ret;
+		}
+
+		do {
+			/* Get OTP status */
+			ret += bmm350_reg_read(dev, BMM350_REG_OTP_STATUS_REG, &rx_buf[0], 3);
+			otp_status = rx_buf[2];
+			otp_err = BMM350_OTP_STATUS_ERROR(otp_status);
+			if (otp_err != BMM350_OTP_STATUS_NO_ERROR) {
+				break;
+			}
+		} while ((!(otp_status & BMM350_OTP_STATUS_CMD_DONE)) && (ret == BMM350_OK));
+
+		if (otp_err != BMM350_OTP_STATUS_NO_ERROR) {
+			LOG_ERR("OTP error code: 0x%02x\n", otp_err);
+			return -EIO;
+		}
+
+		/* Get OTP L/MSB data */
+		ret += bmm350_reg_read(dev, BMM350_REG_OTP_DATA_MSB_REG, &rx_buf[0], 3);
+		msb = rx_buf[2];
+		ret += bmm350_reg_read(dev, BMM350_REG_OTP_DATA_LSB_REG, &rx_buf[0], 3);
+		lsb = rx_buf[2];
+		*lsb_msb = ((uint16_t)(msb << 8) | lsb) & 0xFFFF;
+	}
+
+	return ret;
+}
+
+static int32_t fix_sign(uint32_t inval, int8_t number_of_bits)
+{
+	int32_t ret = 0;
+	int32_t power = 0;
+
+	switch ((enum bmm350_signed_bit)number_of_bits) {
+	case BMM350_SIGNED_8_BIT:
+		power = 128; /* 2^7 */
+		break;
+	case BMM350_SIGNED_12_BIT:
+		power = 2048; /* 2^11 */
+		break;
+	case BMM350_SIGNED_16_BIT:
+		power = 32768; /* 2^15 */
+		break;
+	case BMM350_SIGNED_21_BIT:
+		power = 1048576; /* 2^20 */
+		break;
+	case BMM350_SIGNED_24_BIT:
+		power = 8388608; /* 2^23 */
+		break;
+	default:
+		power = 0;
+		break;
+	}
+
+	ret = (int32_t)inval;
+	if (ret >= power) {
+		ret = ret - (power * 2);
+	}
+
+	return ret;
+}
+
+static void bmm350_update_mag_off_sens(struct bmm350_data *data)
+{
+	uint16_t off_x_lsb_msb, off_y_lsb_msb, off_z_lsb_msb, t_off = 0;
+	uint8_t sens_x, sens_y, sens_z, t_sens = 0;
+	uint8_t tco_x, tco_y, tco_z = 0;
+	uint8_t tcs_x, tcs_y, tcs_z = 0;
+	uint8_t cross_x_y, cross_y_x, cross_z_x, cross_z_y = 0;
+
+	off_x_lsb_msb = data->otp_data[BMM350_MAG_OFFSET_X] & 0x0FFF;
+	off_y_lsb_msb = ((data->otp_data[BMM350_MAG_OFFSET_X] & 0xF000) >> 4) +
+			(data->otp_data[BMM350_MAG_OFFSET_Y] & BMM350_LSB_MASK);
+	off_z_lsb_msb = (data->otp_data[BMM350_MAG_OFFSET_Y] & 0x0F00) +
+			(data->otp_data[BMM350_MAG_OFFSET_Z] & BMM350_LSB_MASK);
+	t_off = data->otp_data[BMM350_TEMP_OFF_SENS] & BMM350_LSB_MASK;
+
+	data->mag_comp.dut_offset_coef.offset_x = fix_sign(off_x_lsb_msb, BMM350_SIGNED_12_BIT);
+	data->mag_comp.dut_offset_coef.offset_y = fix_sign(off_y_lsb_msb, BMM350_SIGNED_12_BIT);
+	data->mag_comp.dut_offset_coef.offset_z = fix_sign(off_z_lsb_msb, BMM350_SIGNED_12_BIT);
+	data->mag_comp.dut_offset_coef.t_offs =
+		fix_sign(t_off, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.dut_offset_coef.t_offs = data->mag_comp.dut_offset_coef.t_offs / 5;
+
+	sens_x = (data->otp_data[BMM350_MAG_SENS_X] & BMM350_MSB_MASK) >> 8;
+	sens_y = (data->otp_data[BMM350_MAG_SENS_Y] & BMM350_LSB_MASK);
+	sens_z = (data->otp_data[BMM350_MAG_SENS_Z] & BMM350_MSB_MASK) >> 8;
+	t_sens = (data->otp_data[BMM350_TEMP_OFF_SENS] & BMM350_MSB_MASK) >> 8;
+
+	data->mag_comp.dut_sensit_coef.sens_x =
+		fix_sign(sens_x, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.dut_sensit_coef.sens_y =
+		fix_sign(sens_y, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.dut_sensit_coef.sens_z =
+		fix_sign(sens_z, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.dut_sensit_coef.t_sens =
+		fix_sign(t_sens, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+
+	data->mag_comp.dut_sensit_coef.sens_x = (data->mag_comp.dut_sensit_coef.sens_x / 256);
+	data->mag_comp.dut_sensit_coef.sens_y = (data->mag_comp.dut_sensit_coef.sens_y / 256);
+	data->mag_comp.dut_sensit_coef.sens_z = (data->mag_comp.dut_sensit_coef.sens_z / 256);
+	data->mag_comp.dut_sensit_coef.t_sens = (data->mag_comp.dut_sensit_coef.t_sens / 512);
+
+	tco_x = (data->otp_data[BMM350_MAG_TCO_X] & BMM350_LSB_MASK);
+	tco_y = (data->otp_data[BMM350_MAG_TCO_Y] & BMM350_LSB_MASK);
+	tco_z = (data->otp_data[BMM350_MAG_TCO_Z] & BMM350_LSB_MASK);
+
+	data->mag_comp.dut_tco.tco_x =
+		fix_sign(tco_x, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.dut_tco.tco_y =
+		fix_sign(tco_y, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.dut_tco.tco_z =
+		fix_sign(tco_z, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+
+	data->mag_comp.dut_tco.tco_x = (data->mag_comp.dut_tco.tco_x / 32);
+	data->mag_comp.dut_tco.tco_y = (data->mag_comp.dut_tco.tco_y / 32);
+	data->mag_comp.dut_tco.tco_z = (data->mag_comp.dut_tco.tco_z / 32);
+
+	tcs_x = (data->otp_data[BMM350_MAG_TCS_X] & BMM350_MSB_MASK) >> 8;
+	tcs_y = (data->otp_data[BMM350_MAG_TCS_Y] & BMM350_MSB_MASK) >> 8;
+	tcs_z = (data->otp_data[BMM350_MAG_TCS_Z] & BMM350_MSB_MASK) >> 8;
+
+	data->mag_comp.dut_tcs.tcs_x =
+		fix_sign(tcs_x, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.dut_tcs.tcs_y =
+		fix_sign(tcs_y, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.dut_tcs.tcs_z =
+		fix_sign(tcs_z, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+
+	data->mag_comp.dut_tcs.tcs_x = (data->mag_comp.dut_tcs.tcs_x / 16384);
+	data->mag_comp.dut_tcs.tcs_y = (data->mag_comp.dut_tcs.tcs_y / 16384);
+	data->mag_comp.dut_tcs.tcs_z = (data->mag_comp.dut_tcs.tcs_z / 16384);
+
+	data->mag_comp.dut_t0 =
+		(fix_sign(data->otp_data[BMM350_MAG_DUT_T_0], BMM350_SIGNED_16_BIT) / 512) + 23;
+
+	cross_x_y = (data->otp_data[BMM350_CROSS_X_Y] & BMM350_LSB_MASK);
+	cross_y_x = (data->otp_data[BMM350_CROSS_Y_X] & BMM350_MSB_MASK) >> 8;
+	cross_z_x = (data->otp_data[BMM350_CROSS_Z_X] & BMM350_LSB_MASK);
+	cross_z_y = (data->otp_data[BMM350_CROSS_Z_Y] & BMM350_MSB_MASK) >> 8;
+
+	data->mag_comp.cross_axis.cross_x_y =
+		fix_sign(cross_x_y, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.cross_axis.cross_y_x =
+		fix_sign(cross_y_x, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.cross_axis.cross_z_x =
+		fix_sign(cross_z_x, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.cross_axis.cross_z_y =
+		fix_sign(cross_z_y, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+
+	data->mag_comp.cross_axis.cross_x_y = (data->mag_comp.cross_axis.cross_x_y / 800);
+	data->mag_comp.cross_axis.cross_y_x = (data->mag_comp.cross_axis.cross_y_x / 800);
+	data->mag_comp.cross_axis.cross_z_x = (data->mag_comp.cross_axis.cross_z_x / 800);
+	data->mag_comp.cross_axis.cross_z_y = (data->mag_comp.cross_axis.cross_z_y / 800);
+}
+
+static int bmm350_otp_dump_after_boot(const struct device *dev)
+{
+	struct bmm350_data *data = dev->data;
+	int ret = 0;
+	uint16_t otp_word = 0;
+
+	for (uint8_t idx = 0; idx < BMM350_OTP_DATA_LENGTH; idx++) {
+		ret = bmm350_read_otp_word(dev, idx, &otp_word);
+		data->otp_data[idx] = otp_word;
+	}
+
+	data->var_id = (data->otp_data[30] & 0x7f00) >> 9;
+	/* Set the default auto bit reset configuration */
+	data->enable_auto_br = ((data->var_id > BMM350_CURRENT_SHUTTLE_VARIANT_ID) ? BMM350_DISABLE
+										   : BMM350_ENABLE);
+
+	LOG_DBG("bmm350 Find the var id %d\n", data->var_id);
+	/* Update magnetometer offset and sensitivity data. */
+	bmm350_update_mag_off_sens(data);
+
+	if (ret) {
+		LOG_ERR("i2c xfer failed, ret = %d\n", ret);
+	}
+
+	return ret;
+}
+
+/*!
+ * @brief This API gets the PMU command status 0 value
+ */
+static int8_t bmm350_get_pmu_cmd_status_0(const struct device *dev,
+					  struct bmm350_pmu_cmd_status_0 *pmu_cmd_stat_0)
+{
+	/* Variable to store the function result */
+	int8_t ret;
+	uint8_t rx_buf[3] = {0x00};
+
+	if (pmu_cmd_stat_0 != NULL) {
+		/* Get PMU command status 0 data */
+		ret = bmm350_reg_read(dev, BMM350_REG_PMU_CMD_STATUS_0, &rx_buf[0], 3);
+		LOG_DBG("pmu cmd status 0:0x%x\n", rx_buf[2]);
+		if (ret == BMM350_OK) {
+			pmu_cmd_stat_0->pmu_cmd_busy =
+				BMM350_GET_BITS_POS_0(rx_buf[2], BMM350_PMU_CMD_BUSY);
+			pmu_cmd_stat_0->odr_ovwr = BMM350_GET_BITS(rx_buf[2], BMM350_ODR_OVWR);
+			pmu_cmd_stat_0->avr_ovwr = BMM350_GET_BITS(rx_buf[2], BMM350_AVG_OVWR);
+			pmu_cmd_stat_0->pwr_mode_is_normal =
+				BMM350_GET_BITS(rx_buf[2], BMM350_PWR_MODE_IS_NORMAL);
+			pmu_cmd_stat_0->cmd_is_illegal =
+				BMM350_GET_BITS(rx_buf[2], BMM350_CMD_IS_ILLEGAL);
+			pmu_cmd_stat_0->pmu_cmd_value =
+				BMM350_GET_BITS(rx_buf[2], BMM350_PMU_CMD_VALUE);
+		}
+	} else {
+		ret = -EINVAL;
+	}
+	return ret;
+}
+
+/*!
+ * @brief This internal API is used to switch from suspend mode to normal mode or forced mode.
+ */
+static int8_t set_powermode(const struct device *dev, enum bmm350_power_modes powermode)
+{
+	/* Variable to store the function result */
+	int8_t ret = 0;
+	uint8_t rx_buf[3] = {0x00};
+	uint8_t reg_data = powermode;
+
+	/* Array to store suspend to forced mode delay */
+	uint32_t sus_to_forced_mode[4] = {
+		BMM350_SUS_TO_FORCEDMODE_NO_AVG_DELAY, BMM350_SUS_TO_FORCEDMODE_AVG_2_DELAY,
+		BMM350_SUS_TO_FORCEDMODE_AVG_4_DELAY, BMM350_SUS_TO_FORCEDMODE_AVG_8_DELAY};
+
+	/* Array to store suspend to forced mode fast delay */
+	uint32_t sus_to_forced_mode_fast[4] = {BMM350_SUS_TO_FORCEDMODE_FAST_NO_AVG_DELAY,
+					       BMM350_SUS_TO_FORCEDMODE_FAST_AVG_2_DELAY,
+					       BMM350_SUS_TO_FORCEDMODE_FAST_AVG_4_DELAY,
+					       BMM350_SUS_TO_FORCEDMODE_FAST_AVG_8_DELAY};
+
+	uint8_t avg = 0;
+	uint32_t delay_us = 0;
+
+	if (ret == BMM350_OK) {
+		/* Get average configuration */
+		ret = bmm350_reg_read(dev, BMM350_REG_PMU_CMD_AGGR_SET, &rx_buf[0], 3);
+		/* Mask the average value */
+		avg = ((rx_buf[2] & BMM350_AVG_MSK) >> BMM350_AVG_POS);
+		if (ret == BMM350_OK) {
+			/* Get average configuration */
+			if (powermode == BMM350_NORMAL_MODE) {
+				delay_us = BMM350_SUSPEND_TO_NORMAL_DELAY;
+			}
+
+			/* Check if desired power mode is forced mode */
+			if (powermode == BMM350_FORCED_MODE) {
+				/* Store delay based on averaging mode */
+				delay_us = sus_to_forced_mode[avg];
+			}
+
+			/* Check if desired power mode is forced mode fast */
+			if (powermode == BMM350_FORCED_MODE_FAST) {
+				/* Store delay based on averaging mode */
+				delay_us = sus_to_forced_mode_fast[avg];
+			}
+
+			/* Set PMU command configuration to desired power mode */
+			ret = bmm350_reg_write(dev, BMM350_REG_PMU_CMD, reg_data);
+			k_usleep(delay_us);
+		}
+	}
+
+	LOG_DBG("pmu cmd agget set powermode %d\n", powermode);
+
+	return ret;
+}
+
+/*!
+ * @brief This API is used to set the power mode of the sensor
+ */
+static int8_t bmm350_set_powermode(const struct device *dev, enum bmm350_power_modes powermode)
+{
+	/* Variable to store the function result */
+	int8_t ret = 0;
+	uint8_t rx_buf[3] = {0x00};
+
+	if (ret == BMM350_OK) {
+		ret = bmm350_reg_read(dev, BMM350_REG_PMU_CMD, &rx_buf[0], 3);
+		if (ret == BMM350_OK) {
+			if (rx_buf[2] > BMM350_PMU_CMD_NM_TC) {
+				ret = -EINVAL;
+			}
+
+			if ((ret == BMM350_OK) && ((rx_buf[2] == BMM350_PMU_CMD_NM) ||
+						   (rx_buf[2] == BMM350_PMU_CMD_UPD_OAE))) {
+				/* Set PMU command configuration */
+				ret = bmm350_reg_write(dev, BMM350_REG_PMU_CMD, BMM350_PMU_CMD_SUS);
+			}
+
+			if (ret == BMM350_OK) {
+				ret = set_powermode(dev, powermode);
+			}
+		}
+	}
+
+	return ret;
+}
+
+/*!
+ * used to perform the magnetic reset of the sensor
+ * which is necessary after a field shock ( 400mT field applied to sensor )
+ */
+static int8_t bmm350_magnetic_reset_and_wait(const struct device *dev)
+{
+	/* Variable to store the function result */
+	int8_t ret = 0;
+	struct bmm350_pmu_cmd_status_0 pmu_cmd_stat_0 = {0};
+	uint8_t restore_normal = BMM350_DISABLE;
+
+	/* Read PMU CMD status */
+	ret = bmm350_get_pmu_cmd_status_0(dev, &pmu_cmd_stat_0);
+	LOG_DBG("get status result 0:%d\n", ret);
+
+	/* Check the powermode is normal before performing magnetic reset */
+	if ((ret == BMM350_OK) && (pmu_cmd_stat_0.pwr_mode_is_normal == BMM350_ENABLE)) {
+		restore_normal = BMM350_ENABLE;
+		/* Reset can only be triggered in suspend */
+		ret = bmm350_set_powermode(dev, BMM350_SUSPEND_MODE);
+		LOG_DBG("set power mode 0:%d\n", ret);
+	}
+	if (ret == BMM350_OK) {
+		/* Set BR to PMU_CMD register */
+		ret = bmm350_reg_write(dev, BMM350_REG_PMU_CMD, BMM350_PMU_CMD_BR);
+		k_usleep(BMM350_BR_DELAY);
+	}
+
+	if (ret == BMM350_OK) {
+		/* Verify if PMU_CMD_STATUS_0 register has BR set */
+		ret = bmm350_get_pmu_cmd_status_0(dev, &pmu_cmd_stat_0);
+		LOG_DBG("get status result 1:%d\n", ret);
+		if ((ret == BMM350_OK) &&
+		    (pmu_cmd_stat_0.pmu_cmd_value != BMM350_PMU_CMD_STATUS_0_BR)) {
+			ret = -EIO;
+		}
+	}
+
+	if (ret == BMM350_OK) {
+		/* Set FGR to PMU_CMD register */
+		ret = bmm350_reg_write(dev, BMM350_REG_PMU_CMD, BMM350_PMU_CMD_FGR);
+		k_usleep(BMM350_FGR_DELAY);
+	}
+	if (ret == BMM350_OK) {
+		/* Verify if PMU_CMD_STATUS_0 register has FGR set */
+		ret = bmm350_get_pmu_cmd_status_0(dev, &pmu_cmd_stat_0);
+		LOG_DBG("get status result 2:%d\n", ret);
+
+		if ((ret == BMM350_OK) &&
+		    (pmu_cmd_stat_0.pmu_cmd_value != BMM350_PMU_CMD_STATUS_0_FGR)) {
+			ret = -EIO;
+		}
+	}
+
+	if ((ret == BMM350_OK) && (restore_normal == BMM350_ENABLE)) {
+		ret = bmm350_set_powermode(dev, BMM350_NORMAL_MODE);
+		LOG_DBG("set power mode 1:%d\n", ret);
+	} else {
+		if (ret == BMM350_OK) {
+			/* Reset PMU_CMD register */
+			ret = bmm350_reg_write(dev, BMM350_REG_PMU_CMD, 0x00);
+		}
+	}
+	return ret;
+}
+/*!
+ * @brief This API is used to read uncompensated mag and temperature data.
+ */
+int8_t bmm350_read_uncomp_mag_temp_data(const struct device *dev,
+					struct bmm350_raw_mag_data *raw_data)
+{
+	struct bmm350_data *data = dev->data;
+	int8_t rslt = BMM350_OK;
+	uint8_t mag_data[14] = {0};
+	uint32_t raw_mag_x, raw_mag_y, raw_mag_z, raw_temp;
+
+	if (raw_data != NULL) {
+		/* Get uncompensated mag data */
+		rslt = bmm350_reg_read(dev, BMM350_REG_MAG_X_XLSB, mag_data, 14);
+
+		if (rslt == BMM350_OK) {
+			raw_mag_x = (uint32_t)mag_data[2] + ((uint32_t)mag_data[3] << 8) +
+				    ((uint32_t)mag_data[4] << 16);
+			raw_mag_y = (uint32_t)mag_data[5] + ((uint32_t)mag_data[6] << 8) +
+				    ((uint32_t)mag_data[7] << 16);
+			raw_mag_z = (uint32_t)mag_data[8] + ((uint32_t)mag_data[9] << 8) +
+				    ((uint32_t)mag_data[10] << 16);
+			raw_temp = (uint32_t)mag_data[11] + ((uint32_t)mag_data[12] << 8) +
+				   ((uint32_t)mag_data[13] << 16);
+
+			if ((data->axis_en & BMM350_EN_X_MSK) == BMM350_DISABLE) {
+				raw_data->raw_xdata = BMM350_DISABLE;
+			} else {
+				raw_data->raw_xdata = fix_sign(raw_mag_x, BMM350_SIGNED_24_BIT);
+			}
+
+			if ((data->axis_en & BMM350_EN_Y_MSK) == BMM350_DISABLE) {
+				raw_data->raw_ydata = BMM350_DISABLE;
+			} else {
+				raw_data->raw_ydata = fix_sign(raw_mag_y, BMM350_SIGNED_24_BIT);
+			}
+
+			if ((data->axis_en & BMM350_EN_Z_MSK) == BMM350_DISABLE) {
+				raw_data->raw_zdata = BMM350_DISABLE;
+			} else {
+				raw_data->raw_zdata = fix_sign(raw_mag_z, BMM350_SIGNED_24_BIT);
+			}
+
+			raw_data->raw_data_temp = fix_sign(raw_temp, BMM350_SIGNED_24_BIT);
+		}
+	} else {
+		rslt = -EINVAL;
+	}
+
+	return rslt;
+}
+static int8_t read_out_raw_data(const struct device *dev, int32_t *out_data)
+{
+	int8_t rslt = BMM350_OK;
+	int32_t temp = 0;
+	struct bmm350_raw_mag_data raw_data = {0};
+
+	if (out_data != NULL) {
+		rslt = bmm350_read_uncomp_mag_temp_data(dev, &raw_data);
+
+		if (rslt == BMM350_OK) {
+			/* Convert mag lsb to uT and temp lsb to degC */
+			out_data[0] = ((raw_data.raw_xdata * BMM350_LSB_TO_UT_XY_COEFF) /
+				       BMM350_LSB_TO_UT_COEFF_DIV);
+			out_data[1] = ((raw_data.raw_ydata * BMM350_LSB_TO_UT_XY_COEFF) /
+				       BMM350_LSB_TO_UT_COEFF_DIV);
+			out_data[2] = ((raw_data.raw_zdata * BMM350_LSB_TO_UT_Z_COEFF) /
+				       BMM350_LSB_TO_UT_COEFF_DIV);
+			out_data[3] = ((raw_data.raw_data_temp * BMM350_LSB_TO_UT_TEMP_COEFF) /
+				       BMM350_LSB_TO_UT_COEFF_DIV);
+
+			if (out_data[3] > 0) {
+				temp = (out_data[3] - (2549 / 100));
+			} else if (out_data[3] < 0) {
+				temp = (out_data[3] + (2549 / 100));
+			} else {
+				temp = out_data[3];
+			}
+
+			out_data[3] = temp;
+		}
+	} else {
+		rslt = -EINVAL;
+	}
+
+	return rslt;
+}
+
+int8_t bmm350_get_compensated_mag_xyz_temp_data_fixed(const struct device *dev,
+						      struct bmm350_mag_temp_data *mag_temp_data)
+{
+	struct bmm350_data *data = dev->data;
+	int8_t rslt = BMM350_OK;
+	uint8_t indx;
+	int32_t out_data[4] = {0};
+	int32_t dut_offset_coef[3], dut_sensit_coef[3], dut_tco[3], dut_tcs[3];
+	int32_t cr_ax_comp_x, cr_ax_comp_y, cr_ax_comp_z;
+
+	if (mag_temp_data != NULL) {
+		/* Reads raw magnetic x,y and z axis along with temperature */
+		rslt = read_out_raw_data(dev, out_data);
+
+		if (rslt == BMM350_OK) {
+			/* Apply compensation to temperature reading */
+			out_data[3] = (((BMM350_MAG_COMP_COEFF_SCALING +
+					 data->mag_comp.dut_sensit_coef.t_sens) *
+					out_data[3]) +
+				       data->mag_comp.dut_offset_coef.t_offs) /
+				      BMM350_MAG_COMP_COEFF_SCALING;
+
+			/* Store magnetic compensation structure to an array */
+			dut_offset_coef[0] = data->mag_comp.dut_offset_coef.offset_x;
+			dut_offset_coef[1] = data->mag_comp.dut_offset_coef.offset_y;
+			dut_offset_coef[2] = data->mag_comp.dut_offset_coef.offset_z;
+
+			dut_sensit_coef[0] = data->mag_comp.dut_sensit_coef.sens_x;
+			dut_sensit_coef[1] = data->mag_comp.dut_sensit_coef.sens_y;
+			dut_sensit_coef[2] = data->mag_comp.dut_sensit_coef.sens_z;
+
+			dut_tco[0] = data->mag_comp.dut_tco.tco_x;
+			dut_tco[1] = data->mag_comp.dut_tco.tco_y;
+			dut_tco[2] = data->mag_comp.dut_tco.tco_z;
+
+			dut_tcs[0] = data->mag_comp.dut_tcs.tcs_x;
+			dut_tcs[1] = data->mag_comp.dut_tcs.tcs_y;
+			dut_tcs[2] = data->mag_comp.dut_tcs.tcs_z;
+
+			/* Compensate raw magnetic data */
+			for (indx = 0; indx < 3; indx++) {
+				out_data[indx] = (out_data[indx] * (BMM350_MAG_COMP_COEFF_SCALING +
+								    dut_sensit_coef[indx])) /
+						 BMM350_MAG_COMP_COEFF_SCALING;
+				out_data[indx] = (out_data[indx] + dut_offset_coef[indx]);
+				out_data[indx] =
+					((out_data[indx] * BMM350_MAG_COMP_COEFF_SCALING) +
+					 (dut_tco[indx] * (out_data[3] - data->mag_comp.dut_t0))) /
+					BMM350_MAG_COMP_COEFF_SCALING;
+				out_data[indx] =
+					(out_data[indx] * BMM350_MAG_COMP_COEFF_SCALING) /
+					(BMM350_MAG_COMP_COEFF_SCALING +
+					 (dut_tcs[indx] * (out_data[3] - data->mag_comp.dut_t0)));
+			}
+
+			cr_ax_comp_x =
+				((((out_data[0] * BMM350_MAG_COMP_COEFF_SCALING) -
+				   (data->mag_comp.cross_axis.cross_x_y * out_data[1])) *
+				  BMM350_MAG_COMP_COEFF_SCALING) /
+				 ((BMM350_MAG_COMP_COEFF_SCALING * BMM350_MAG_COMP_COEFF_SCALING) -
+				  (data->mag_comp.cross_axis.cross_y_x *
+				   data->mag_comp.cross_axis.cross_x_y)));
+
+			cr_ax_comp_y =
+				((((out_data[1] * BMM350_MAG_COMP_COEFF_SCALING) -
+				   (data->mag_comp.cross_axis.cross_y_x * out_data[0])) *
+				  BMM350_MAG_COMP_COEFF_SCALING) /
+				 ((BMM350_MAG_COMP_COEFF_SCALING * BMM350_MAG_COMP_COEFF_SCALING) -
+				  (data->mag_comp.cross_axis.cross_y_x *
+				   data->mag_comp.cross_axis.cross_x_y)));
+
+			cr_ax_comp_z =
+				(out_data[2] +
+				 (((out_data[0] * ((data->mag_comp.cross_axis.cross_y_x *
+						    data->mag_comp.cross_axis.cross_z_y) -
+						   (data->mag_comp.cross_axis.cross_z_x *
+						    BMM350_MAG_COMP_COEFF_SCALING))) -
+				   (out_data[1] * ((data->mag_comp.cross_axis.cross_z_y *
+						    BMM350_MAG_COMP_COEFF_SCALING) -
+						   (data->mag_comp.cross_axis.cross_x_y *
+						    data->mag_comp.cross_axis.cross_z_x))))) /
+					 (((BMM350_MAG_COMP_COEFF_SCALING *
+					    BMM350_MAG_COMP_COEFF_SCALING) -
+					   data->mag_comp.cross_axis.cross_y_x *
+						   data->mag_comp.cross_axis.cross_x_y)));
+
+			out_data[0] = (int32_t)cr_ax_comp_x;
+			out_data[1] = (int32_t)cr_ax_comp_y;
+			out_data[2] = (int32_t)cr_ax_comp_z;
+		}
+		LOG_DBG("mag data %d %d %d\n", out_data[0], out_data[1], out_data[2]);
+
+		if (rslt == BMM350_OK) {
+			if ((data->axis_en & BMM350_EN_X_MSK) == BMM350_DISABLE) {
+				mag_temp_data->x = BMM350_DISABLE;
+			} else {
+				mag_temp_data->x = out_data[0];
+			}
+
+			if ((data->axis_en & BMM350_EN_Y_MSK) == BMM350_DISABLE) {
+				mag_temp_data->y = BMM350_DISABLE;
+			} else {
+				mag_temp_data->y = out_data[1];
+			}
+
+			if ((data->axis_en & BMM350_EN_Z_MSK) == BMM350_DISABLE) {
+				mag_temp_data->z = BMM350_DISABLE;
+			} else {
+				mag_temp_data->z = out_data[2];
+			}
+			mag_temp_data->temperature = out_data[3];
+		}
+	} else {
+		rslt = -EINVAL;
+	}
+	return rslt;
+}
+
+static int bmm350_sample_fetch(const struct device *dev, enum sensor_channel chan)
+{
+	struct bmm350_data *drv_data = dev->data;
+	struct bmm350_mag_temp_data mag_temp_data;
+
+	if (bmm350_get_compensated_mag_xyz_temp_data_fixed(dev, &mag_temp_data) < 0) {
+		LOG_ERR("failed to read sample");
+		return -EIO;
+	}
+	drv_data->mag_temp_data.x = mag_temp_data.x;
+	drv_data->mag_temp_data.y = mag_temp_data.y;
+	drv_data->mag_temp_data.z = mag_temp_data.z;
+	return 0;
+}
+
+/*
+ * ut change to Gauss
+ */
+static void bmm350_convert(struct sensor_value *val, int raw_val)
+{
+	val->val1 = raw_val / 100;
+	val->val2 = (raw_val % 100) * 10000;
+}
+
+static int bmm350_channel_get(const struct device *dev, enum sensor_channel chan,
+			      struct sensor_value *val)
+{
+	struct bmm350_data *drv_data = dev->data;
+
+	switch (chan) {
+	case SENSOR_CHAN_MAGN_X:
+		bmm350_convert(val, drv_data->mag_temp_data.x);
+		break;
+	case SENSOR_CHAN_MAGN_Y:
+		bmm350_convert(val, drv_data->mag_temp_data.y);
+		break;
+	case SENSOR_CHAN_MAGN_Z:
+		bmm350_convert(val, drv_data->mag_temp_data.z);
+		break;
+	case SENSOR_CHAN_MAGN_XYZ:
+		bmm350_convert(val, drv_data->mag_temp_data.x);
+		bmm350_convert(val + 1, drv_data->mag_temp_data.y);
+		bmm350_convert(val + 2, drv_data->mag_temp_data.z);
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+static uint8_t acc_odr_to_reg(const struct sensor_value *val)
+{
+	double odr = sensor_value_to_double((struct sensor_value *)val);
+
+	uint8_t reg = BMM350_DATA_RATE_100HZ;
+
+	if ((odr >= 0.78125) && (odr <= 1.5625)) {
+		reg = BMM350_DATA_RATE_1_5625HZ;
+	} else if ((odr > 1.5625) && (odr <= 3.125)) {
+		reg = BMM350_DATA_RATE_3_125HZ;
+	} else if ((odr > 3.125) && (odr <= 6.25)) {
+		reg = BMM350_DATA_RATE_6_25HZ;
+	} else if ((odr > 6.25) && (odr <= 12.5)) {
+		reg = BMM350_DATA_RATE_12_5HZ;
+	} else if ((odr > 12.5) && (odr <= 25.0)) {
+		reg = BMM350_DATA_RATE_25HZ;
+	} else if ((odr > 25.0) && (odr <= 50.0)) {
+		reg = BMM350_DATA_RATE_50HZ;
+	} else if ((odr > 50.0) && (odr <= 100.0)) {
+		reg = BMM350_DATA_RATE_100HZ;
+	} else if ((odr > 100.0) && (odr <= 200.0)) {
+		reg = BMM350_DATA_RATE_200HZ;
+	} else if ((odr > 200.0) && (odr <= 400.0)) {
+		reg = BMM350_DATA_RATE_400HZ;
+	} else if (odr > 400.0) {
+		reg = BMM350_DATA_RATE_400HZ;
+	}
+	return reg;
+}
+
+static uint8_t acc_osr_to_reg(const struct sensor_value *val)
+{
+	switch (val->val1) {
+	case 0:
+		return BMM350_NO_AVERAGING;
+	case 2:
+		return BMM350_AVERAGING_2;
+	case 4:
+		return BMM350_AVERAGING_4;
+	case 8:
+		return BMM350_AVERAGING_8;
+	default:
+		return 0xFF;
+	}
+}
+
+/*!
+ * @brief This API sets the ODR and averaging factor.
+ */
+int8_t bmm350_set_odr_performance(enum bmm350_data_rates odr,
+				  enum bmm350_performance_parameters performance,
+				  const struct device *dev)
+{
+	/* Variable to store the function result */
+	int8_t rslt = 0x00;
+	/* Variable to get PMU command */
+	uint8_t reg_data = 0;
+	enum bmm350_performance_parameters performance_fix = performance;
+
+	/* Reduce the performance setting when too high for the chosen ODR */
+	if ((odr == BMM350_DATA_RATE_400HZ) && (performance >= BMM350_AVERAGING_2)) {
+		performance_fix = BMM350_NO_AVERAGING;
+	} else if ((odr == BMM350_DATA_RATE_200HZ) && (performance >= BMM350_AVERAGING_4)) {
+		performance_fix = BMM350_AVERAGING_2;
+	} else if ((odr == BMM350_DATA_RATE_100HZ) && (performance >= BMM350_AVERAGING_8)) {
+		performance_fix = BMM350_AVERAGING_4;
+	}
+	if (performance_fix != performance) {
+		LOG_WRN("performance adjusted to %d", performance_fix);
+	}
+
+	/* ODR is an enum taking the generated constants from the register map */
+	reg_data = ((uint8_t)odr & BMM350_ODR_MSK);
+	/* AVG / performance is an enum taking the generated constants from the register map */
+	reg_data = BMM350_SET_BITS(reg_data, BMM350_AVG, (uint8_t)performance_fix);
+	/* Set PMU command configurations for ODR and performance */
+	rslt = bmm350_reg_write(dev, BMM350_REG_PMU_CMD_AGGR_SET, reg_data);
+	LOG_DBG("odr index %d odr_reg_data 0x%x", odr, reg_data);
+
+	if (rslt == BMM350_OK) {
+		/* Set PMU command configurations to update odr and average */
+		reg_data = BMM350_PMU_CMD_UPD_OAE;
+		/* Set PMU command configuration */
+		rslt = bmm350_reg_write(dev, BMM350_REG_PMU_CMD, reg_data);
+		if (rslt == BMM350_OK) {
+			k_usleep(BMM350_UPD_OAE_DELAY);
+		}
+	}
+
+	return rslt;
+}
+static int set_mag_odr_osr(const struct device *dev, const struct sensor_value *odr,
+			   const struct sensor_value *osr)
+{
+	int ret;
+	uint8_t rx_buf[3] = {0x00};
+	uint8_t osr_bits;
+	uint8_t odr_bits;
+
+	/* read current state */
+	ret = bmm350_reg_read(dev, BMM350_REG_PMU_CMD_AGGR_SET, &rx_buf[0], 3);
+	if (ret < 0) {
+		LOG_ERR("failed to read PMU_CMD_AGGR_SET");
+		return -EIO;
+	}
+	osr_bits = ((rx_buf[2] & BMM350_AVG_MSK) >> BMM350_AVG_POS);
+	odr_bits = ((rx_buf[2] & BMM350_ODR_MSK) >> BMM350_ODR_POS);
+
+	/* to change sampling rate, device needs to suspend first */
+	ret = bmm350_set_powermode(dev, BMM350_SUSPEND_MODE);
+	if (ret < 0) {
+		LOG_ERR("failed to set suspend mode");
+		return -EIO;
+	}
+
+	if (odr) {
+		odr_bits = acc_odr_to_reg(odr);
+	}
+	if (osr) {
+		osr_bits = acc_osr_to_reg(osr);
+		if (osr_bits == 0xFF) {
+			LOG_ERR("unsupported oversampling rate");
+			return -EINVAL;
+		}
+	}
+	if (bmm350_set_odr_performance((enum bmm350_data_rates)odr_bits, osr_bits, dev) < 0) {
+		LOG_ERR("bmm350_set_odr_performance failed");
+		return -EIO;
+	}
+
+	/* go to normal mode now, measurements are requested. */
+	ret = bmm350_set_powermode(dev, BMM350_NORMAL_MODE);
+	if (ret < 0) {
+		LOG_ERR("failed to set suspend mode");
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int bmm350_attr_set(const struct device *dev, enum sensor_channel chan,
+			   enum sensor_attribute attr, const struct sensor_value *val)
+{
+	switch (attr) {
+	case SENSOR_ATTR_SAMPLING_FREQUENCY:
+		if (set_mag_odr_osr(dev, val, NULL) < 0) {
+			return -EIO;
+		}
+		break;
+	case SENSOR_ATTR_OVERSAMPLING:
+		if (set_mag_odr_osr(dev, NULL, val) < 0) {
+			return -EIO;
+		}
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+static DEVICE_API(sensor, bmm350_api_funcs) = {
+	.attr_set = bmm350_attr_set,
+	.sample_fetch = bmm350_sample_fetch,
+	.channel_get = bmm350_channel_get,
+#ifdef CONFIG_BMM350_TRIGGER
+	.trigger_set = bmm350_trigger_set,
+#endif
+};
+
+static int bmm350_init_chip(const struct device *dev)
+{
+	struct bmm350_pmu_cmd_status_0 pmu_cmd_stat_0 = {0};
+	/* Variable to store soft-reset command */
+	uint8_t soft_reset;
+	uint8_t rx_buf[3] = {0x00};
+	uint8_t chip_id[3] = {0x00};
+	int ret = 0;
+	/* Read chip ID (can only be read in sleep mode)*/
+	if (bmm350_reg_read(dev, BMM350_REG_CHIP_ID, &chip_id[0], 3) < 0) {
+		LOG_ERR("failed reading chip id");
+		goto err_poweroff;
+	}
+	if (chip_id[2] != BMM350_CHIP_ID) {
+		LOG_ERR("invalid chip id 0x%x", chip_id[2]);
+		goto err_poweroff;
+	}
+	/* Soft-reset */
+	soft_reset = BMM350_CMD_SOFTRESET;
+
+	/* Set the command in the command register */
+	ret = bmm350_reg_write(dev, BMM350_REG_CMD, soft_reset);
+	k_usleep(BMM350_SOFT_RESET_DELAY);
+	/* Read chip ID (can only be read in sleep mode)*/
+	if (bmm350_reg_read(dev, BMM350_REG_CHIP_ID, &chip_id[0], 3) < 0) {
+		LOG_ERR("failed reading chip id");
+		goto err_poweroff;
+	}
+	if (chip_id[2] != BMM350_CHIP_ID) {
+		LOG_ERR("invalid chip id 0x%x", chip_id[2]);
+		goto err_poweroff;
+	}
+	ret = bmm350_otp_dump_after_boot(dev);
+	LOG_DBG("bmm350 chip_id 0x%x otp dump after boot %d\n", chip_id[2], ret);
+
+	if (bmm350_reg_write(dev, BMM350_REG_OTP_CMD_REG, BMM350_OTP_CMD_PWR_OFF_OTP) < 0) {
+		LOG_ERR("failed to set REP");
+		goto err_poweroff;
+	}
+
+	ret += bmm350_magnetic_reset_and_wait(dev);
+
+	LOG_DBG("bmm350 setup result %d\n", ret);
+
+	ret += bmm350_get_pmu_cmd_status_0(dev, &pmu_cmd_stat_0);
+	ret += bmm350_reg_read(dev, BMM350_REG_ERR_REG, &rx_buf[0], 3);
+	if (ret != 0) {
+		LOG_ERR("%s %d", __func__, ret);
+	}
+
+	return 0;
+
+err_poweroff:
+	ret = bmm350_set_powermode(dev, BMM350_SUSPEND_MODE);
+	if (ret != 0) {
+		return -EIO;
+	}
+	return -EIO;
+}
+
+#ifdef CONFIG_PM_DEVICE
+static int pm_action(const struct device *dev, enum pm_device_action action)
+{
+	int ret;
+
+	switch (action) {
+	case PM_DEVICE_ACTION_RESUME:
+		ret = bmm350_set_powermode(dev, BMM350_NORMAL_MODE);
+		if (ret != 0) {
+			LOG_ERR("failed to enter normal mode: %d", ret);
+		}
+		break;
+	case PM_DEVICE_ACTION_SUSPEND:
+		ret = bmm350_set_powermode(dev, BMM350_SUSPEND_MODE);
+		if (ret != 0) {
+			LOG_ERR("failed to enter suspend mode: %d", ret);
+		}
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	return ret;
+}
+#endif
+
+static int bmm350_init(const struct device *dev)
+{
+	int err = 0;
+	struct bmm350_data *data = dev->data;
+	const struct sensor_value odr = {100, 0};
+	const struct sensor_value osr = {2, 0};
+
+	err = bmm350_bus_check(dev);
+	if (err < 0) {
+		LOG_ERR("bus check failed: %d", err);
+		return err;
+	}
+
+	if (bmm350_init_chip(dev) < 0) {
+		LOG_ERR("failed to initialize chip");
+		return -EIO;
+	}
+
+#ifdef CONFIG_BMM350_TRIGGER
+	if (bmm350_trigger_mode_init(dev) < 0) {
+		LOG_ERR("Cannot set up trigger mode.");
+		return -EINVAL;
+	}
+#endif
+
+	/* Assign axis_en with all axis enabled (BMM350_EN_XYZ_MSK) */
+	data->axis_en = BMM350_EN_XYZ_MSK;
+
+	/* Initialize to 100Hz, averaging between 2 samples by default */
+	if (set_mag_odr_osr(dev, &odr, &osr) < 0) {
+		return -EIO;
+	}
+
+	return 0;
+}
+
+/* Initializes a struct bmm350_config for an instance on an I2C bus. */
+#define BMM350_CONFIG_I2C(inst) .bus.i2c = I2C_DT_SPEC_INST_GET(inst), .bus_io = &bmm350_bus_io_i2c,
+#define BMM350_INT_CFG(inst)    .drdy_int = GPIO_DT_SPEC_INST_GET_OR(inst, drdy_gpios, {0}),
+
+#define BMM350_DEFINE(inst)                                                                        \
+	static struct bmm350_data bmm350_data_##inst;                                              \
+	static const struct bmm350_config bmm350_config_##inst = {                                 \
+		.bus.i2c = I2C_DT_SPEC_INST_GET(inst),                                             \
+		.bus_io = &bmm350_bus_io_i2c,                                                      \
+		BMM350_INT_CFG(inst)};                                                             \
+                                                                                                   \
+	PM_DEVICE_DT_INST_DEFINE(inst, pm_action);                                                 \
+                                                                                                   \
+	SENSOR_DEVICE_DT_INST_DEFINE(inst, bmm350_init, PM_DEVICE_DT_INST_GET(inst),               \
+				     &bmm350_data_##inst, &bmm350_config_##inst, POST_KERNEL,      \
+				     CONFIG_SENSOR_INIT_PRIORITY, &bmm350_api_funcs);
+
+/* Create the struct device for every status "okay" node in the devicetree. */
+DT_INST_FOREACH_STATUS_OKAY(BMM350_DEFINE)
diff --git a/drivers/sensor/bosch/bmm350/bmm350.h b/drivers/sensor/bosch/bmm350/bmm350.h
new file mode 100644
index 00000000000..adf23a068e8
--- /dev/null
+++ b/drivers/sensor/bosch/bmm350/bmm350.h
@@ -0,0 +1,497 @@
+/*
+ * Copyright (c) 2024 Bosch Sensortec GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Bus-specific functionality for BMM350s accessed via I2C.
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_BMM350_BMM350_H_
+#define ZEPHYR_DRIVERS_SENSOR_BMM350_BMM350_H_
+
+#include <zephyr/types.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/i2c.h>
+
+#define DT_DRV_COMPAT bosch_bmm350
+
+#define BMM350_BUS_I2C DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
+
+struct bmm350_bus {
+	struct i2c_dt_spec i2c;
+};
+
+typedef int (*bmm350_bus_check_fn)(const struct bmm350_bus *bus);
+typedef int (*bmm350_reg_read_fn)(const struct bmm350_bus *bus, uint8_t start, uint8_t *buf,
+				  int size);
+typedef int (*bmm350_reg_write_fn)(const struct bmm350_bus *bus, uint8_t reg, uint8_t val);
+
+struct bmm350_bus_io {
+	bmm350_bus_check_fn check;
+	bmm350_reg_read_fn read;
+	bmm350_reg_write_fn write;
+};
+
+extern const struct bmm350_bus_io bmm350_bus_io_i2c;
+
+#include <zephyr/types.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/drivers/gpio.h>
+
+#define DT_DRV_COMPAT  bosch_bmm350
+#define BMM350_OK      (0)
+#define BMM350_DISABLE UINT8_C(0x0)
+#define BMM350_ENABLE  UINT8_C(0x1)
+
+#define BMM350_REG_CHIP_ID           UINT8_C(0x00)
+#define BMM350_REG_REV_ID            UINT8_C(0x01)
+#define BMM350_REG_ERR_REG           UINT8_C(0x02)
+#define BMM350_REG_PAD_CTRL          UINT8_C(0x03)
+#define BMM350_REG_PMU_CMD_AGGR_SET  UINT8_C(0x04)
+#define BMM350_REG_PMU_CMD_AXIS_EN   UINT8_C(0x05)
+#define BMM350_REG_PMU_CMD           UINT8_C(0x06)
+#define BMM350_REG_PMU_CMD_STATUS_0  UINT8_C(0x07)
+#define BMM350_REG_PMU_CMD_STATUS_1  UINT8_C(0x08)
+#define BMM350_REG_I3C_ERR           UINT8_C(0x09)
+#define BMM350_REG_I2C_WDT_SET       UINT8_C(0x0A)
+#define BMM350_REG_TRSDCR_REV_ID     UINT8_C(0x0D)
+#define BMM350_REG_TC_SYNC_TU        UINT8_C(0x21)
+#define BMM350_REG_TC_SYNC_ODR       UINT8_C(0x22)
+#define BMM350_REG_TC_SYNC_TPH_1     UINT8_C(0x23)
+#define BMM350_REG_TC_SYNC_TPH_2     UINT8_C(0x24)
+#define BMM350_REG_TC_SYNC_DT        UINT8_C(0x25)
+#define BMM350_REG_TC_SYNC_ST_0      UINT8_C(0x26)
+#define BMM350_REG_TC_SYNC_ST_1      UINT8_C(0x27)
+#define BMM350_REG_TC_SYNC_ST_2      UINT8_C(0x28)
+#define BMM350_REG_TC_SYNC_STATUS    UINT8_C(0x29)
+#define BMM350_REG_INT_CTRL          UINT8_C(0x2E)
+#define BMM350_REG_INT_CTRL_IBI      UINT8_C(0x2F)
+#define BMM350_REG_INT_STATUS        UINT8_C(0x30)
+#define BMM350_REG_MAG_X_XLSB        UINT8_C(0x31)
+#define BMM350_REG_MAG_X_LSB         UINT8_C(0x32)
+#define BMM350_REG_MAG_X_MSB         UINT8_C(0x33)
+#define BMM350_REG_MAG_Y_XLSB        UINT8_C(0x34)
+#define BMM350_REG_MAG_Y_LSB         UINT8_C(0x35)
+#define BMM350_REG_MAG_Y_MSB         UINT8_C(0x36)
+#define BMM350_REG_MAG_Z_XLSB        UINT8_C(0x37)
+#define BMM350_REG_MAG_Z_LSB         UINT8_C(0x38)
+#define BMM350_REG_MAG_Z_MSB         UINT8_C(0x39)
+#define BMM350_REG_TEMP_XLSB         UINT8_C(0x3A)
+#define BMM350_REG_TEMP_LSB          UINT8_C(0x3B)
+#define BMM350_REG_TEMP_MSB          UINT8_C(0x3C)
+#define BMM350_REG_SENSORTIME_XLSB   UINT8_C(0x3D)
+#define BMM350_REG_SENSORTIME_LSB    UINT8_C(0x3E)
+#define BMM350_REG_SENSORTIME_MSB    UINT8_C(0x3F)
+#define BMM350_REG_OTP_CMD_REG       UINT8_C(0x50)
+#define BMM350_REG_OTP_DATA_MSB_REG  UINT8_C(0x52)
+#define BMM350_REG_OTP_DATA_LSB_REG  UINT8_C(0x53)
+#define BMM350_REG_OTP_STATUS_REG    UINT8_C(0x55)
+#define BMM350_REG_TMR_SELFTEST_USER UINT8_C(0x60)
+#define BMM350_REG_CTRL_USER         UINT8_C(0x61)
+#define BMM350_REG_CMD               UINT8_C(0x7E)
+
+/************************* Sensor Shuttle Variant **************************/
+#define BMM350_LEGACY_SHUTTLE_VARIANT_ID  UINT8_C(0x10)
+#define BMM350_CURRENT_SHUTTLE_VARIANT_ID UINT8_C(0x11)
+
+/********************* Sensor interface success code **********************/
+#define BMM350_INTF_RET_SUCCESS INT8_C(0)
+
+/* default value */
+#define BMM350_CHIP_ID                 UINT8_C(0x33)
+#define BMM350_REV_ID                  UINT8_C(0x00)
+#define BMM350_OTP_CMD_DIR_READ        UINT8_C(0x20)
+#define BMM350_OTP_WORD_ADDR_MSK       UINT8_C(0x1F)
+#define BMM350_OTP_STATUS_ERROR_MSK    UINT8_C(0xE0)
+#define BMM350_OTP_STATUS_ERROR(val)   (val & BMM350_OTP_STATUS_ERROR_MSK)
+#define BMM350_OTP_STATUS_NO_ERROR     UINT8_C(0x00)
+#define BMM350_OTP_STATUS_BOOT_ERR     (0x20)
+#define BMM350_OTP_STATUS_PAGE_RD_ERR  (0x40)
+#define BMM350_OTP_STATUS_PAGE_PRG_ERR (0x60)
+#define BMM350_OTP_STATUS_SIGN_ERR     (0x80)
+#define BMM350_OTP_STATUS_INV_CMD_ERR  (0xA0)
+#define BMM350_OTP_STATUS_CMD_DONE     UINT8_C(0x01)
+#define BMM350_CMD_SOFTRESET           UINT8_C(0xB6)
+
+/****************************** OTP indices ***************************/
+#define BMM350_TEMP_OFF_SENS UINT8_C(0x0D)
+#define BMM350_MAG_OFFSET_X  UINT8_C(0x0E)
+#define BMM350_MAG_OFFSET_Y  UINT8_C(0x0F)
+#define BMM350_MAG_OFFSET_Z  UINT8_C(0x10)
+
+#define BMM350_MAG_SENS_X UINT8_C(0x10)
+#define BMM350_MAG_SENS_Y UINT8_C(0x11)
+#define BMM350_MAG_SENS_Z UINT8_C(0x11)
+
+#define BMM350_MAG_TCO_X UINT8_C(0x12)
+#define BMM350_MAG_TCO_Y UINT8_C(0x13)
+#define BMM350_MAG_TCO_Z UINT8_C(0x14)
+
+#define BMM350_MAG_TCS_X UINT8_C(0x12)
+#define BMM350_MAG_TCS_Y UINT8_C(0x13)
+#define BMM350_MAG_TCS_Z UINT8_C(0x14)
+
+#define BMM350_MAG_DUT_T_0 UINT8_C(0x18)
+
+#define BMM350_CROSS_X_Y UINT8_C(0x15)
+#define BMM350_CROSS_Y_X UINT8_C(0x15)
+#define BMM350_CROSS_Z_X UINT8_C(0x16)
+#define BMM350_CROSS_Z_Y UINT8_C(0x16)
+
+/**************************** Signed bit macros **********************/
+enum bmm350_signed_bit {
+	BMM350_SIGNED_8_BIT = 8,
+	BMM350_SIGNED_12_BIT = 12,
+	BMM350_SIGNED_16_BIT = 16,
+	BMM350_SIGNED_21_BIT = 21,
+	BMM350_SIGNED_24_BIT = 24
+};
+
+/********************* Power modes *************************/
+#define BMM350_PMU_CMD_SUS        0x00
+#define BMM350_PMU_CMD_NM         0x01
+#define BMM350_PMU_CMD_UPD_OAE    UINT8_C(0x02)
+#define BMM350_PMU_CMD_FM         0x03
+#define BMM350_PMU_CMD_FM_FAST    0x04
+#define BMM350_PMU_CMD_FGR        UINT8_C(0x05)
+#define BMM350_PMU_CMD_FGR_FAST   UINT8_C(0x06)
+#define BMM350_PMU_CMD_BR         UINT8_C(0x07)
+#define BMM350_PMU_CMD_BR_FAST    UINT8_C(0x08)
+#define BMM350_PMU_CMD_ENABLE_XYZ UINT8_C(0x70)
+#define BMM350_PMU_STATUS_0       UINT8_C(0x00)
+
+/**************************** PMU command status 0 macros **********************/
+#define BMM350_PMU_CMD_STATUS_0_SUS      UINT8_C(0x00)
+#define BMM350_PMU_CMD_STATUS_0_NM       UINT8_C(0x01)
+#define BMM350_PMU_CMD_STATUS_0_UPD_OAE  UINT8_C(0x02)
+#define BMM350_PMU_CMD_STATUS_0_FM       UINT8_C(0x03)
+#define BMM350_PMU_CMD_STATUS_0_FM_FAST  UINT8_C(0x04)
+#define BMM350_PMU_CMD_STATUS_0_FGR      UINT8_C(0x05)
+#define BMM350_PMU_CMD_STATUS_0_FGR_FAST UINT8_C(0x06)
+#define BMM350_PMU_CMD_STATUS_0_BR       UINT8_C(0x07)
+#define BMM350_PMU_CMD_STATUS_0_BR_FAST  UINT8_C(0x07)
+
+/*********************** Macros for bit masking ***************************/
+#define BMM350_AVG_MSK                (0x30)
+#define BMM350_AVG_POS                UINT8_C(0x04)
+#define BMM350_PMU_CMD_BUSY_MSK       UINT8_C(0x01)
+#define BMM350_PMU_CMD_BUSY_POS       UINT8_C(0x00)
+#define BMM350_ODR_OVWR_MSK           UINT8_C(0x02)
+#define BMM350_ODR_OVWR_POS           UINT8_C(0x01)
+#define BMM350_AVG_OVWR_MSK           UINT8_C(0x04)
+#define BMM350_AVG_OVWR_POS           UINT8_C(0x02)
+#define BMM350_PWR_MODE_IS_NORMAL_MSK UINT8_C(0x08)
+#define BMM350_PWR_MODE_IS_NORMAL_POS UINT8_C(0x03)
+#define BMM350_CMD_IS_ILLEGAL_MSK     UINT8_C(0x10)
+#define BMM350_CMD_IS_ILLEGAL_POS     UINT8_C(0x04)
+#define BMM350_PMU_CMD_VALUE_MSK      UINT8_C(0xE0)
+#define BMM350_PMU_CMD_VALUE_POS      UINT8_C(0x05)
+
+/**************************** Self-test macros **********************/
+#define BMM350_SELF_TEST_DISABLE UINT8_C(0x00)
+#define BMM350_SELF_TEST_POS_X   UINT8_C(0x0D)
+#define BMM350_SELF_TEST_NEG_X   UINT8_C(0x0B)
+#define BMM350_SELF_TEST_POS_Y   UINT8_C(0x15)
+#define BMM350_SELF_TEST_NEG_Y   UINT8_C(0x13)
+
+/************************* Sensor delay time settings in microseconds **************************/
+#define BMM350_SOFT_RESET_DELAY       UINT32_C(24000)
+#define BMM350_MAGNETIC_RESET_DELAY   UINT32_C(40000)
+#define BMM350_START_UP_TIME_FROM_POR UINT32_C(3000)
+
+#define BMM350_GOTO_SUSPEND_DELAY      UINT32_C(6000)
+#define BMM350_SUSPEND_TO_NORMAL_DELAY UINT32_C(38000)
+
+#define BMM350_SUS_TO_FORCEDMODE_NO_AVG_DELAY (15000)
+#define BMM350_SUS_TO_FORCEDMODE_AVG_2_DELAY  (17000)
+#define BMM350_SUS_TO_FORCEDMODE_AVG_4_DELAY  (20000)
+#define BMM350_SUS_TO_FORCEDMODE_AVG_8_DELAY  (28000)
+
+#define BMM350_SUS_TO_FORCEDMODE_FAST_NO_AVG_DELAY (4000)
+#define BMM350_SUS_TO_FORCEDMODE_FAST_AVG_2_DELAY  (5000)
+#define BMM350_SUS_TO_FORCEDMODE_FAST_AVG_4_DELAY  (9000)
+#define BMM350_SUS_TO_FORCEDMODE_FAST_AVG_8_DELAY  (16000)
+
+#define BMM350_PMU_CMD_NM_TC       UINT8_C(0x09)
+#define BMM350_OTP_DATA_LENGTH     UINT8_C(32)
+#define BMM350_READ_BUFFER_LENGTH  UINT8_C(127)
+#define BMM350_MAG_TEMP_DATA_LEN   UINT8_C(12)
+#define BMM350_OTP_CMD_PWR_OFF_OTP UINT8_C(0x80)
+#define BMM350_UPD_OAE_DELAY       UINT16_C(1000)
+
+#define BMM350_BR_DELAY         UINT16_C(14000)
+#define BMM350_FGR_DELAY        UINT16_C(18000)
+#define BMM350_SOFT_RESET_DELAY UINT32_C(24000)
+
+#define BMM350_LSB_MASK UINT16_C(0x00FF)
+#define BMM350_MSB_MASK UINT16_C(0xFF00)
+
+#define BMM350_LSB_TO_UT_XY_COEFF     71
+#define BMM350_LSB_TO_UT_Z_COEFF      72
+#define BMM350_LSB_TO_UT_TEMP_COEFF   10
+#define BMM350_LSB_TO_UT_COEFF_DIV    10000
+#define BMM350_MAG_COMP_COEFF_SCALING 1000
+
+#define BMM350_SENS_CORR_Y 1
+#define BMM350_TCS_CORR_Z  1
+
+#define BMM350_EN_X_MSK            UINT8_C(0x01)
+#define BMM350_EN_X_POS            UINT8_C(0x0)
+#define BMM350_EN_Y_MSK            UINT8_C(0x02)
+#define BMM350_EN_Y_POS            UINT8_C(0x1)
+#define BMM350_EN_Z_MSK            UINT8_C(0x04)
+#define BMM350_EN_Z_POS            UINT8_C(0x2)
+#define BMM350_EN_XYZ_MSK          UINT8_C(0x7)
+#define BMM350_EN_XYZ_POS          UINT8_C(0x0)
+/************************ Averaging macros **********************/
+#define BMM350_AVG_NO_AVG          0x0
+#define BMM350_AVG_2               0x1
+#define BMM350_AVG_4               0x2
+#define BMM350_AVG_8               0x3
+/******************************* ODR **************************/
+#define BMM350_ODR_400HZ           UINT8_C(0x2)
+#define BMM350_ODR_200HZ           UINT8_C(0x3)
+#define BMM350_ODR_100HZ           UINT8_C(0x4)
+#define BMM350_ODR_50HZ            UINT8_C(0x5)
+#define BMM350_ODR_25HZ            UINT8_C(0x6)
+#define BMM350_ODR_12_5HZ          UINT8_C(0x7)
+#define BMM350_ODR_6_25HZ          UINT8_C(0x8)
+#define BMM350_ODR_3_125HZ         UINT8_C(0x9)
+#define BMM350_ODR_1_5625HZ        UINT8_C(0xA)
+#define BMM350_ODR_MSK             UINT8_C(0xf)
+#define BMM350_ODR_POS             UINT8_C(0x0)
+#define BMM350_DATA_READY_INT_CTRL UINT8_C(0x8e)
+
+/* Macro to SET and GET BITS of a register*/
+#define BMM350_SET_BITS(reg_data, bitname, data)                                                   \
+	((reg_data & ~(bitname##_MSK)) | ((data << bitname##_POS) & bitname##_MSK))
+
+#define BMM350_GET_BITS(reg_data, bitname) ((reg_data & (bitname##_MSK)) >> (bitname##_POS))
+
+#define BMM350_GET_BITS_POS_0(reg_data, bitname) (reg_data & (bitname##_MSK))
+
+#define BMM350_SET_BITS_POS_0(reg_data, bitname, data)                                             \
+	((reg_data & ~(bitname##_MSK)) | (data & bitname##_MSK))
+
+enum bmm350_power_modes {
+	BMM350_SUSPEND_MODE = BMM350_PMU_CMD_SUS,
+	BMM350_NORMAL_MODE = BMM350_PMU_CMD_NM,
+	BMM350_FORCED_MODE = BMM350_PMU_CMD_FM,
+	BMM350_FORCED_MODE_FAST = BMM350_PMU_CMD_FM_FAST
+};
+
+enum bmm350_data_rates {
+	BMM350_DATA_RATE_400HZ = 2,    /* BMM350_ODR_400HZ */
+	BMM350_DATA_RATE_200HZ = 3,    /* BMM350_ODR_200HZ */
+	BMM350_DATA_RATE_100HZ = 4,    /* BMM350_ODR_100HZ */
+	BMM350_DATA_RATE_50HZ = 5,     /* BMM350_ODR_50HZ */
+	BMM350_DATA_RATE_25HZ = 6,     /* BMM350_ODR_25HZ */
+	BMM350_DATA_RATE_12_5HZ = 7,   /* BMM350_ODR_12_5HZ */
+	BMM350_DATA_RATE_6_25HZ = 8,   /* BMM350_ODR_6_25HZ */
+	BMM350_DATA_RATE_3_125HZ = 9,  /* BMM350_ODR_3_125HZ */
+	BMM350_DATA_RATE_1_5625HZ = 10 /* BMM350_ODR_1_5625HZ */
+};
+enum bmm350_performance_parameters {
+	BMM350_NO_AVERAGING = BMM350_AVG_NO_AVG,
+	BMM350_AVERAGING_2 = BMM350_AVG_2,
+	BMM350_AVERAGING_4 = BMM350_AVG_4,
+	BMM350_AVERAGING_8 = BMM350_AVG_8,
+	BMM350_ULTRALOWNOISE = BMM350_AVG_8,
+	BMM350_LOWNOISE = BMM350_AVG_4,
+	BMM350_REGULARPOWER = BMM350_AVG_2,
+	BMM350_LOWPOWER = BMM350_AVG_NO_AVG
+};
+
+/*!
+ * @brief bmm350 compensated magnetometer data and temperature data
+ */
+struct bmm350_mag_temp_data {
+	/*! Compensated mag X data */
+	int32_t x;
+
+	/*! Compensated mag Y data */
+	int32_t y;
+
+	/*! Compensated mag Z data */
+	int32_t z;
+
+	/*! Temperature */
+	int32_t temperature;
+};
+
+/*!
+ * @brief bmm350 magnetometer dut offset coefficient structure
+ */
+struct bmm350_dut_offset_coef {
+	/*! Temperature offset */
+	int32_t t_offs;
+
+	/*! Offset x-axis */
+	int32_t offset_x;
+
+	/*! Offset y-axis */
+	int32_t offset_y;
+
+	/*! Offset z-axis */
+	int32_t offset_z;
+};
+
+/*!
+ * @brief bmm350 magnetometer dut sensitivity coefficient structure
+ */
+struct bmm350_dut_sensit_coef {
+	/*! Temperature sensitivity */
+	int32_t t_sens;
+
+	/*! Sensitivity x-axis */
+	int32_t sens_x;
+
+	/*! Sensitivity y-axis */
+	int32_t sens_y;
+
+	/*! Sensitivity z-axis */
+	int32_t sens_z;
+};
+
+/*!
+ * @brief bmm350 magnetometer dut tco structure
+ */
+struct bmm350_dut_tco {
+	int32_t tco_x;
+	int32_t tco_y;
+	int32_t tco_z;
+};
+
+/*!
+ * @brief bmm350 magnetometer dut tcs structure
+ */
+struct bmm350_dut_tcs {
+	int32_t tcs_x;
+	int32_t tcs_y;
+	int32_t tcs_z;
+};
+
+/*!
+ * @brief bmm350 magnetometer cross axis compensation structure
+ */
+struct bmm350_cross_axis {
+	int32_t cross_x_y;
+	int32_t cross_y_x;
+	int32_t cross_z_x;
+	int32_t cross_z_y;
+};
+struct mag_compensate {
+	/*! Structure to store dut offset coefficient */
+	struct bmm350_dut_offset_coef dut_offset_coef;
+
+	/*! Structure to store dut sensitivity coefficient */
+	struct bmm350_dut_sensit_coef dut_sensit_coef;
+
+	/*! Structure to store dut tco */
+	struct bmm350_dut_tco dut_tco;
+
+	/*! Structure to store dut tcs */
+	struct bmm350_dut_tcs dut_tcs;
+
+	/*! Initialize T0_reading parameter */
+	int32_t dut_t0;
+
+	/*! Structure to define cross axis compensation */
+	struct bmm350_cross_axis cross_axis;
+};
+
+struct bmm350_pmu_cmd_status_0 {
+	/*! The previous PMU CMD is still in processing */
+	uint8_t pmu_cmd_busy;
+
+	/*! The previous PMU_CMD_AGGR_SET.odr has been overwritten */
+	uint8_t odr_ovwr;
+
+	/*! The previous PMU_CMD_AGGR_SET.avg has been overwritten */
+	uint8_t avr_ovwr;
+
+	/*! The chip is in normal power mode */
+	uint8_t pwr_mode_is_normal;
+
+	/*! CMD value is not allowed */
+	uint8_t cmd_is_illegal;
+
+	/*! Stores the latest PMU_CMD code processed */
+	uint8_t pmu_cmd_value;
+};
+
+/*!
+ * @brief bmm350 un-compensated (raw) magnetometer data, signed integer
+ */
+struct bmm350_raw_mag_data {
+	/*! Raw mag X data */
+	int32_t raw_xdata;
+
+	/*! Raw mag Y data */
+	int32_t raw_ydata;
+
+	/*! Raw mag Z data */
+	int32_t raw_zdata;
+
+	/*! Raw mag temperature value */
+	int32_t raw_data_temp;
+};
+
+struct bmm350_config {
+	struct bmm350_bus bus;
+	const struct bmm350_bus_io *bus_io;
+	struct gpio_dt_spec drdy_int;
+};
+
+struct bmm350_data {
+
+	/*! Variable to store status of axes enabled */
+	uint8_t axis_en;
+	struct mag_compensate mag_comp;
+	/*! Array to store OTP data */
+	uint16_t otp_data[BMM350_OTP_DATA_LENGTH];
+	/*! Variant ID */
+	uint8_t var_id;
+	/*! Variable to enable/disable xy bit reset */
+	uint8_t enable_auto_br;
+	struct bmm350_mag_temp_data mag_temp_data;
+
+#ifdef CONFIG_BMM350_TRIGGER
+	struct gpio_callback gpio_cb;
+#endif
+
+#ifdef CONFIG_BMM350_TRIGGER_OWN_THREAD
+	struct k_sem sem;
+#endif
+
+#ifdef CONFIG_BMM350_TRIGGER_GLOBAL_THREAD
+	struct k_work work;
+#endif
+
+#if defined(CONFIG_BMM350_TRIGGER_GLOBAL_THREAD)
+	const struct device *dev;
+#endif
+
+#ifdef CONFIG_BMM350_TRIGGER
+	const struct sensor_trigger *drdy_trigger;
+	sensor_trigger_handler_t drdy_handler;
+#endif /* CONFIG_BMM350_TRIGGER */
+};
+
+int bmm350_trigger_mode_init(const struct device *dev);
+
+int bmm350_trigger_set(const struct device *dev, const struct sensor_trigger *trig,
+		       sensor_trigger_handler_t handler);
+int bmm350_reg_write(const struct device *dev, uint8_t reg, uint8_t val);
+#endif /* __SENSOR_BMM350_H__ */
diff --git a/drivers/sensor/bosch/bmm350/bmm350_i2c.c b/drivers/sensor/bosch/bmm350/bmm350_i2c.c
new file mode 100644
index 00000000000..5c230d0e809
--- /dev/null
+++ b/drivers/sensor/bosch/bmm350/bmm350_i2c.c
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2024 Bosch Sensortec GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "bmm350.h"
+
+static int bmm350_bus_check_i2c(const struct bmm350_bus *bus)
+{
+	return i2c_is_ready_dt(&bus->i2c) ? 0 : -ENODEV;
+}
+
+static int bmm350_reg_read_i2c(const struct bmm350_bus *bus, uint8_t start, uint8_t *buf, int size)
+{
+	return i2c_burst_read_dt(&bus->i2c, start, buf, size);
+}
+
+static int bmm350_reg_write_i2c(const struct bmm350_bus *bus, uint8_t reg, uint8_t val)
+{
+	return i2c_reg_write_byte_dt(&bus->i2c, reg, val);
+}
+
+const struct bmm350_bus_io bmm350_bus_io_i2c = {
+	.check = bmm350_bus_check_i2c,
+	.read = bmm350_reg_read_i2c,
+	.write = bmm350_reg_write_i2c,
+};
diff --git a/drivers/sensor/bosch/bmm350/bmm350_trigger.c b/drivers/sensor/bosch/bmm350/bmm350_trigger.c
new file mode 100644
index 00000000000..f5e0cb04a4f
--- /dev/null
+++ b/drivers/sensor/bosch/bmm350/bmm350_trigger.c
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2024 Bosch Sensortec GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Bus-specific functionality for BMM350s accessed via I2C.
+ */
+#include <zephyr/kernel.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/logging/log.h>
+
+#include "bmm350.h"
+
+LOG_MODULE_DECLARE(BMM350, CONFIG_SENSOR_LOG_LEVEL);
+
+static void bmm350_handle_interrupts(const void *arg)
+{
+	const struct device *dev = (const struct device *)arg;
+	struct bmm350_data *data = dev->data;
+
+	if (data->drdy_handler) {
+		data->drdy_handler(dev, data->drdy_trigger);
+	}
+}
+
+#ifdef CONFIG_BMM350_TRIGGER_OWN_THREAD
+static K_THREAD_STACK_DEFINE(bmm350_thread_stack, CONFIG_BMM350_THREAD_STACK_SIZE);
+static struct k_thread bmm350_thread;
+
+static void bmm350_thread_main(void *arg1, void *unused1, void *unused2)
+{
+	ARG_UNUSED(unused1);
+	ARG_UNUSED(unused2);
+	const struct device *dev = (const struct device *)arg1;
+	struct bmm350_data *data = dev->data;
+
+	while (1) {
+		k_sem_take(&data->sem, K_FOREVER);
+		bmm350_handle_interrupts(dev);
+	}
+}
+#endif
+
+#ifdef CONFIG_BMM350_TRIGGER_GLOBAL_THREAD
+static void bmm350_work_handler(struct k_work *work)
+{
+	struct bmm350_data *data = CONTAINER_OF(work, struct bmm350_data, work);
+
+	bmm350_handle_interrupts(data->dev);
+}
+#endif
+
+static void bmm350_gpio_callback(const struct device *port, struct gpio_callback *cb, uint32_t pin)
+{
+	struct bmm350_data *data = CONTAINER_OF(cb, struct bmm350_data, gpio_cb);
+
+	ARG_UNUSED(port);
+	ARG_UNUSED(pin);
+
+#if defined(CONFIG_BMM350_TRIGGER_OWN_THREAD)
+	k_sem_give(&data->sem);
+#elif defined(CONFIG_BMM350_TRIGGER_GLOBAL_THREAD)
+	k_work_submit(&data->work);
+#endif
+}
+
+int bmm350_trigger_set(const struct device *dev, const struct sensor_trigger *trig,
+		       sensor_trigger_handler_t handler)
+{
+	struct bmm350_data *data = dev->data;
+	int ret = 0;
+
+#ifdef CONFIG_PM_DEVICE
+	enum pm_device_state state;
+
+	(void)pm_device_state_get(dev, &state);
+	if (state != PM_DEVICE_STATE_ACTIVE) {
+		return -EBUSY;
+	}
+#endif
+
+	if (trig->type != SENSOR_TRIG_DATA_READY) {
+		return -ENOTSUP;
+	}
+
+	data->drdy_trigger = trig;
+	data->drdy_handler = handler;
+
+	/* Set PMU command configuration */
+	ret = bmm350_reg_write(dev, BMM350_REG_INT_CTRL, BMM350_DATA_READY_INT_CTRL);
+	if (ret < 0) {
+		return ret;
+	}
+	return 0;
+}
+
+int bmm350_trigger_mode_init(const struct device *dev)
+{
+	struct bmm350_data *data = dev->data;
+	const struct bmm350_config *cfg = dev->config;
+	int ret;
+
+	if (!device_is_ready(cfg->drdy_int.port)) {
+		LOG_ERR("INT device is not ready");
+		return -ENODEV;
+	}
+
+#if defined(CONFIG_BMM350_TRIGGER_OWN_THREAD)
+	k_sem_init(&data->sem, 0, 1);
+	k_thread_create(&bmm350_thread, bmm350_thread_stack, CONFIG_BMM350_THREAD_STACK_SIZE,
+			bmm350_thread_main, (void *)dev, NULL, NULL,
+			K_PRIO_COOP(CONFIG_BMM350_THREAD_PRIORITY), 0, K_NO_WAIT);
+#elif defined(CONFIG_BMM350_TRIGGER_GLOBAL_THREAD)
+	k_work_init(&data->work, bmm350_work_handler);
+#endif
+
+#if defined(CONFIG_BMM350_TRIGGER_GLOBAL_THREAD)
+	data->dev = dev;
+#endif
+
+	ret = gpio_pin_configure_dt(&cfg->drdy_int, GPIO_INPUT);
+	if (ret < 0) {
+		return ret;
+	}
+
+	gpio_init_callback(&data->gpio_cb, bmm350_gpio_callback, BIT(cfg->drdy_int.pin));
+
+	ret = gpio_add_callback(cfg->drdy_int.port, &data->gpio_cb);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = gpio_pin_interrupt_configure_dt(&cfg->drdy_int, GPIO_INT_EDGE_TO_ACTIVE);
+	if (ret < 0) {
+		return ret;
+	}
+
+	return 0;
+}
diff --git a/dts/bindings/sensor/bosch,bmm350-i2c.yaml b/dts/bindings/sensor/bosch,bmm350-i2c.yaml
new file mode 100644
index 00000000000..35434f69b54
--- /dev/null
+++ b/dts/bindings/sensor/bosch,bmm350-i2c.yaml
@@ -0,0 +1,11 @@
+# Copyright (c) 2024, Bosch Sensortec GmbH
+
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    Bosch BMM350 Geomagnetic sensor.  See more info at:
+    https://www.bosch-sensortec.com/products/motion-sensors/magnetometers/bmm350/
+
+compatible: "bosch,bmm350"
+
+include: [i2c-device.yaml, "bosch,bmm350.yaml"]
diff --git a/dts/bindings/sensor/bosch,bmm350.yaml b/dts/bindings/sensor/bosch,bmm350.yaml
new file mode 100644
index 00000000000..35206be2d2e
--- /dev/null
+++ b/dts/bindings/sensor/bosch,bmm350.yaml
@@ -0,0 +1,12 @@
+# Copyright (c) 2024, Bosch Sensortec GmbH
+
+# SPDX-License-Identifier: Apache-2.0
+
+include: sensor-device.yaml
+
+properties:
+  drdy-gpios:
+    type: phandle-array
+    description: |
+      This property specifies the connection for data ready pin.
+      The polarity default is active high when sensor data is ready.
diff --git a/tests/drivers/build_all/sensor/i2c.dtsi b/tests/drivers/build_all/sensor/i2c.dtsi
index e61016db372..8a3c23883f1 100644
--- a/tests/drivers/build_all/sensor/i2c.dtsi
+++ b/tests/drivers/build_all/sensor/i2c.dtsi
@@ -1230,3 +1230,9 @@ test_i2c_veml6031: veml6031@ab {
 	compatible = "vishay,veml6031";
 	reg = <0xab>;
 };
+
+test_i2c_bmm350: bmm350@ac {
+	compatible = "bosch,bmm350";
+	reg = <0xac>;
+	drdy-gpios = <&test_gpio 0 0>;
+};
diff --git a/tests/drivers/build_all/sensor/sensors_trigger_none.conf b/tests/drivers/build_all/sensor/sensors_trigger_none.conf
index 7343e805654..855d058a892 100644
--- a/tests/drivers/build_all/sensor/sensors_trigger_none.conf
+++ b/tests/drivers/build_all/sensor/sensors_trigger_none.conf
@@ -12,6 +12,7 @@ CONFIG_BMI08X_GYRO_TRIGGER_NONE=y
 CONFIG_BMI160_TRIGGER_NONE=y
 CONFIG_BMI270_TRIGGER_NONE=y
 CONFIG_BMM150_TRIGGER_NONE=y
+CONFIG_BMM350_TRIGGER_NONE=y
 CONFIG_BMP388_TRIGGER_NONE=y
 CONFIG_BQ274XX_TRIGGER_NONE=y
 CONFIG_CCS811_TRIGGER_NONE=y
diff --git a/tests/drivers/build_all/sensor/sensors_trigger_own.conf b/tests/drivers/build_all/sensor/sensors_trigger_own.conf
index d206014b183..71a55a71791 100644
--- a/tests/drivers/build_all/sensor/sensors_trigger_own.conf
+++ b/tests/drivers/build_all/sensor/sensors_trigger_own.conf
@@ -11,6 +11,7 @@ CONFIG_BMI08X_GYRO_TRIGGER_OWN_THREAD=y
 CONFIG_BMI160_TRIGGER_OWN_THREAD=y
 CONFIG_BMI270_TRIGGER_OWN_THREAD=y
 CONFIG_BMM150_TRIGGER_OWN_THREAD=y
+CONFIG_BMM350_TRIGGER_OWN_THREAD=y
 CONFIG_BMP388_TRIGGER_OWN_THREAD=y
 CONFIG_BQ274XX_TRIGGER_OWN_THREAD=y
 CONFIG_CCS811_TRIGGER_OWN_THREAD=y

From d624fe96ec67f62d3b6235a906d9f4884d15802d Mon Sep 17 00:00:00 2001
From: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
Date: Tue, 25 Mar 2025 17:43:23 +0100
Subject: [PATCH 2782/2913] [nrf fromtree] lib: tls_credentials: return size
 even if too big

The simple backend returns the size of the credential,
even if it is too big.
The secure backend should do the same,
our libraries depend on this behaviour.

Signed-off-by: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
(cherry picked from commit 916897f59e78e840c91f02a9abd72e8c024d5842)
---
 subsys/net/lib/tls_credentials/tls_credentials_trusted.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/subsys/net/lib/tls_credentials/tls_credentials_trusted.c b/subsys/net/lib/tls_credentials/tls_credentials_trusted.c
index 1a99ad08441..6b46b0b7680 100644
--- a/subsys/net/lib/tls_credentials/tls_credentials_trusted.c
+++ b/subsys/net/lib/tls_credentials/tls_credentials_trusted.c
@@ -401,6 +401,7 @@ int tls_credential_get(sec_tag_t tag, enum tls_credential_type type,
 
 	if (info.size > *credlen) {
 		ret = -EFBIG;
+		*credlen = info.size;
 		goto cleanup;
 	}
 

From 99bbeff21583f245dab9e56afe73c488d93e271f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20Amundsen?= <haakon.amundsen@nordicsemi.no>
Date: Wed, 19 Mar 2025 15:11:32 +0100
Subject: [PATCH 2783/2913] [nrf fromlist] boards: nordic: add 'iron' board
 variant
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is needed for next generation Secure Domain firmware.

Upstream PR #: 87749

Signed-off-by: Håkon Amundsen <haakon.amundsen@nordicsemi.no>
---
 boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk   |  4 ++-
 boards/nordic/nrf54h20dk/board.yml            |  2 ++
 .../nrf54h20dk_nrf54h20_cpuapp_iron.dts       | 36 +++++++++++++++++++
 ...nrf54h20dk_nrf54h20_cpuapp_iron_0_9_0.yaml | 25 +++++++++++++
 .../nrf54h20dk_nrf54h20_cpuapp_iron_defconfig | 31 ++++++++++++++++
 .../nrf54h20dk_nrf54h20_cpuapp_iron.overlay   |  8 +++++
 scripts/west_commands/runners/nrf_common.py   |  7 ++--
 soc/nordic/nrf54h/Kconfig.soc                 |  5 +++
 .../nrf54h20dk_nrf54h20_cpuapp_iron.overlay   |  6 ++++
 .../nrf54h20dk_nrf54h20_cpuapp_iron.conf      |  2 ++
 .../nrf54h20dk_nrf54h20_cpuapp_iron.overlay   |  8 +++++
 11 files changed, 131 insertions(+), 3 deletions(-)
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron.dts
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron_0_9_0.yaml
 create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron_defconfig
 create mode 100644 samples/drivers/watchdog/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay
 create mode 100644 tests/drivers/adc/adc_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay
 create mode 100644 tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf
 create mode 100644 tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay

diff --git a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
index 62ad7a0d21c..de513858e9c 100644
--- a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
+++ b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
@@ -2,9 +2,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF54H20DK
-	select SOC_NRF54H20_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP
+	select SOC_NRF54H20_CPUAPP if (BOARD_NRF54H20DK_NRF54H20_CPUAPP || \
+				       BOARD_NRF54H20DK_NRF54H20_CPUAPP_IRON)
 	select SOC_NRF54H20_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD
 	select SOC_NRF54H20_CPUPPR if (BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
 				       BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP)
 	select SOC_NRF54H20_CPUFLPR if (BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
 				        BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP)
+	select SOC_NRF54H20_IRON if BOARD_NRF54H20DK_NRF54H20_CPUAPP_IRON
diff --git a/boards/nordic/nrf54h20dk/board.yml b/boards/nordic/nrf54h20dk/board.yml
index 2d3d40c20e0..2009cc6130b 100644
--- a/boards/nordic/nrf54h20dk/board.yml
+++ b/boards/nordic/nrf54h20dk/board.yml
@@ -9,6 +9,8 @@ board:
       cpucluster: cpuppr
     - name: xip
       cpucluster: cpuflpr
+    - name: iron
+      cpucluster: cpuapp
   revision:
     format: major.minor.patch
     default: "0.9.0"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron.dts
new file mode 100644
index 00000000000..bbc03608412
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron.dts
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54h20dk_nrf54h20_cpuapp.dts"
+
+/delete-node/&cpurad_rx_partitions;
+/delete-node/&cpuapp_rx_partitions;
+/delete-node/&cpusec_cpuapp_ipc;
+
+/* This is not yet an exhaustive memory map, and contain only a minimum required to boot
+ * the application core.
+ */
+
+&mram1x {
+	cpuapp_rx_partitions: cpuapp-rx-partitions {
+		compatible = "nordic,owned-partitions", "fixed-partitions";
+		nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RXS>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		cpuapp_slot0_partition: partition@2c000 {
+			reg = <0x2c000 DT_SIZE_K(480)>;
+		};
+
+		cpuppr_code_partition: partition@a4000 {
+			reg = <0xa4000 DT_SIZE_K(64)>;
+		};
+
+		cpuflpr_code_partition: partition@b4000 {
+			reg = <0xb4000 DT_SIZE_K(48)>;
+		};
+	};
+};
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron_0_9_0.yaml
new file mode 100644
index 00000000000..eefca56fe0c
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron_0_9_0.yaml
@@ -0,0 +1,25 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54h20dk/nrf54h20/cpuapp/iron
+name: nRF54H20-DK-nRF54H20-Application (IRONside compatible) (revision 0.9.0)
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+sysbuild: true
+ram: 256
+flash: 480
+supported:
+  - adc
+  - can
+  - counter
+  - gpio
+  - i2c
+  - pwm
+  - retained_mem
+  - spi
+  - watchdog
+  - usbd
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron_defconfig b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron_defconfig
new file mode 100644
index 00000000000..4667d1cbc3a
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron_defconfig
@@ -0,0 +1,31 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+CONFIG_USE_DT_CODE_PARTITION=y
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# MPU-based null-pointer dereferencing detection cannot be applied
+# as the (0x0 - 0x400) region is unmapped for this target.
+CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
+
+# Enable cache
+CONFIG_CACHE_MANAGEMENT=y
+CONFIG_EXTERNAL_CACHE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# UICR generation is not supported, and when reintroduced will not use nrf-regtool.
+CONFIG_NRF_REGTOOL_GENERATE_UICR=n
diff --git a/samples/drivers/watchdog/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay b/samples/drivers/watchdog/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay
new file mode 100644
index 00000000000..102abfc8ef2
--- /dev/null
+++ b/samples/drivers/watchdog/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt010 {
+	status = "okay";
+};
diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index 60fc96bf392..4c944eeea79 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -345,8 +345,11 @@ def program_hex(self):
                 )
 
             if self.erase:
-                self.exec_op('erase', core='Application', kind='all')
-                self.exec_op('erase', core='Network', kind='all')
+                if self.build_conf.get('CONFIG_SOC_NRF54H20_IRON'):
+                    self.exec_op('erase', kind='all')
+                else:
+                    self.exec_op('erase', core='Application', kind='all')
+                    self.exec_op('erase', core='Network', kind='all')
 
             # Manage SUIT artifacts.
             # This logic should be executed only once per build.
diff --git a/soc/nordic/nrf54h/Kconfig.soc b/soc/nordic/nrf54h/Kconfig.soc
index 459854e13b2..ac9101c177c 100644
--- a/soc/nordic/nrf54h/Kconfig.soc
+++ b/soc/nordic/nrf54h/Kconfig.soc
@@ -33,5 +33,10 @@ config SOC_NRF54H20_CPUFLPR
 	help
 	  nRF54H20 CPUFLPR
 
+config SOC_NRF54H20_IRON
+	bool
+	help
+	  Indicates that local domain firmware is compatible with Nordic IRONside SE.
+
 config SOC
 	default "nrf54h20" if SOC_NRF54H20
diff --git a/tests/drivers/adc/adc_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay b/tests/drivers/adc/adc_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay
new file mode 100644
index 00000000000..0e01ff40bb9
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay
@@ -0,0 +1,6 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54h20dk_nrf54h20_common.dtsi"
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf
new file mode 100644
index 00000000000..45e31e2fae4
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf
@@ -0,0 +1,2 @@
+# Disable dcache
+CONFIG_DCACHE=n
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay
new file mode 100644
index 00000000000..102abfc8ef2
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt010 {
+	status = "okay";
+};

From 34633fc20295224704648f0e6edb7bf004fa42b9 Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Thu, 27 Mar 2025 17:04:49 +0530
Subject: [PATCH 2784/2913] [nrf fromtree] wifi: utils: Fix crash for scan

The check for index out of bound is missing, It turns into a crash
for input channel more than WIFI_MGMT_SCAN_CHAN_MAX_MANUAL.

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit 6f9dbbd54fc246e709ec71b766274d75b2a4ecf1)
---
 subsys/net/l2/wifi/wifi_utils.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/subsys/net/l2/wifi/wifi_utils.c b/subsys/net/l2/wifi/wifi_utils.c
index 69df08916db..d90d6ab4264 100644
--- a/subsys/net/l2/wifi/wifi_utils.c
+++ b/subsys/net/l2/wifi/wifi_utils.c
@@ -175,6 +175,10 @@ static int wifi_utils_get_all_chans_in_range(uint8_t chan_start,
 			}
 
 			if (start) {
+				if (idx > WIFI_MGMT_SCAN_CHAN_MAX_MANUAL) {
+					*chan_idx = idx;
+					break;
+				}
 				band_chan[idx].band = band_idx;
 				band_chan[idx].channel = valid_5g_chans_20mhz[i];
 				idx++;

From 3377c6f6a795acd60a30c0e40ea2bfaa7a00cda5 Mon Sep 17 00:00:00 2001
From: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Date: Tue, 1 Apr 2025 15:36:21 +0200
Subject: [PATCH 2785/2913] Revert "[nrf noup] boards: nordic: nrf7002dk: Bring
 back NS variants"

This reverts commit fdf281511b1253c6625bc6d0ce61eb31d76c710e.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
---
 boards/nordic/nrf7002dk/CMakeLists.txt        | 11 ---
 boards/nordic/nrf7002dk/Kconfig               |  6 +-
 boards/nordic/nrf7002dk/Kconfig.defconfig     | 76 -------------------
 boards/nordic/nrf7002dk/Kconfig.nrf7002dk     |  4 +-
 boards/nordic/nrf7002dk/board.cmake           | 13 +---
 boards/nordic/nrf7002dk/board.yml             |  4 -
 .../nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts   | 39 ----------
 .../nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml  | 19 -----
 ...7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig | 27 -------
 .../nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts | 40 ----------
 .../nrf7002dk_nrf5340_cpuapp_ns.yaml          | 19 -----
 .../nrf7002dk_nrf5340_cpuapp_ns_defconfig     | 26 -------
 12 files changed, 3 insertions(+), 281 deletions(-)
 delete mode 100644 boards/nordic/nrf7002dk/CMakeLists.txt
 delete mode 100644 boards/nordic/nrf7002dk/Kconfig.defconfig
 delete mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
 delete mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml
 delete mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig
 delete mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
 delete mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml
 delete mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig

diff --git a/boards/nordic/nrf7002dk/CMakeLists.txt b/boards/nordic/nrf7002dk/CMakeLists.txt
deleted file mode 100644
index db20255712b..00000000000
--- a/boards/nordic/nrf7002dk/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if((CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR
-    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
-    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 OR
-    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS) AND
-   CONFIG_BOARD_ENABLE_CPUNET)
-  zephyr_library()
-  zephyr_library_sources(nrf5340_cpunet_reset.c)
-endif()
diff --git a/boards/nordic/nrf7002dk/Kconfig b/boards/nordic/nrf7002dk/Kconfig
index bf5b239c98c..e599cbcce07 100644
--- a/boards/nordic/nrf7002dk/Kconfig
+++ b/boards/nordic/nrf7002dk/Kconfig
@@ -10,9 +10,7 @@ config MBOX_NRFX_IPC
 	default MBOX
 
 if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
 
 config BT_HCI_IPC
 	default y if BT
@@ -40,9 +38,7 @@ config BT_ECC
 config DOMAIN_CPUAPP_BOARD
 	string
 	default "nrf7002dk/nrf5340/cpuapp" if BOARD_NRF7002DK_NRF5340_CPUAPP
-	default "nrf7002dk/nrf5340/cpuapp/ns" if BOARD_NRF7002DK_NRF5340_CPUAPP_NS
 	default "nrf7002dk/nrf5340/cpuapp/nrf7001" if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
-	default "nrf7002dk/nrf5340/cpuapp/nrf7001/ns" if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
 	help
 	  The board which will be used for CPUAPP domain when creating a multi
 	  image application where one or more images should be located on
diff --git a/boards/nordic/nrf7002dk/Kconfig.defconfig b/boards/nordic/nrf7002dk/Kconfig.defconfig
deleted file mode 100644
index a6357ae50b2..00000000000
--- a/boards/nordic/nrf7002dk/Kconfig.defconfig
+++ /dev/null
@@ -1,76 +0,0 @@
-# nRF5340 DK nRF5340 board configuration
-
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-# By default, if we build for a Non-Secure version of the board,
-# force building with TF-M as the Secure Execution Environment.
-config BUILD_WITH_TFM
-	default y if BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-if BUILD_WITH_TFM
-
-# By default, if we build with TF-M, instruct build system to
-# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
-config TFM_FLASH_MERGED_BINARY
-	bool
-	default y
-
-endif # BUILD_WITH_TFM
-
-# Code Partition:
-#
-# For the secure version of the board the firmware is linked at the beginning
-# of the flash, or into the code-partition defined in DT if it is intended to
-# be loaded by MCUboot. If the secure firmware is to be combined with a non-
-# secure image (TRUSTED_EXECUTION_SECURE=y), the secure FW image shall always
-# be restricted to the size of its code partition.
-#
-# For the non-secure version of the board, the firmware
-# must be linked into the code-partition (non-secure) defined in DT, regardless.
-# Apply this configuration below by setting the Kconfig symbols used by
-# the linker according to the information extracted from DT partitions.
-
-# SRAM Partition:
-#
-# If the secure firmware is to be combined with a non-secure image
-# (TRUSTED_EXECUTION_SECURE=y), the secure FW image SRAM shall always
-# be restricted to the secure image SRAM partition (sram-secure-partition).
-# Otherwise (if TRUSTED_EXECUTION_SECURE is not set) the whole zephyr,sram
-# may be used by the image.
-#
-# For the non-secure version of the board, the firmware image SRAM is
-# always restricted to the allocated non-secure SRAM partition.
-#
-# Workaround for not being able to have commas in macro arguments
-DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
-DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
-
-if (BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001) && \
-	TRUSTED_EXECUTION_SECURE
-
-config FLASH_LOAD_SIZE
-	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-config SRAM_SIZE
-	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM_PARTITION),0,K)
-
-endif
-
-if BOARD_NRF7002DK_NRF5340_CPUAPP_NS || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-config FLASH_LOAD_OFFSET
-	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-config FLASH_LOAD_SIZE
-	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-endif
-
-endif
diff --git a/boards/nordic/nrf7002dk/Kconfig.nrf7002dk b/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
index 91f52ee6f08..61b9e818f36 100644
--- a/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
+++ b/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
@@ -4,6 +4,4 @@
 config BOARD_NRF7002DK
 	select SOC_NRF5340_CPUNET_QKAA if BOARD_NRF7002DK_NRF5340_CPUNET
 	select SOC_NRF5340_CPUAPP_QKAA if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-					  BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
diff --git a/boards/nordic/nrf7002dk/board.cmake b/boards/nordic/nrf7002dk/board.cmake
index 53193d460fd..d3afa4bb8ca 100644
--- a/boards/nordic/nrf7002dk/board.cmake
+++ b/boards/nordic/nrf7002dk/board.cmake
@@ -1,22 +1,11 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
-   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS)
-  set(TFM_PUBLIC_KEY_FORMAT "full")
-endif()
-
 if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR
-   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
-   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 OR
-   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS)
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001)
   board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
 endif()
 
-if(CONFIG_TFM_FLASH_MERGED_BINARY)
-  set_property(TARGET runners_yaml_props_target PROPERTY hex_file "${CMAKE_BINARY_DIR}/zephyr/tfm_merged.hex")
-endif()
-
 if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
diff --git a/boards/nordic/nrf7002dk/board.yml b/boards/nordic/nrf7002dk/board.yml
index 39db5dcfa3a..4f41341e442 100644
--- a/boards/nordic/nrf7002dk/board.yml
+++ b/boards/nordic/nrf7002dk/board.yml
@@ -5,9 +5,5 @@ board:
   socs:
     - name: nrf5340
       variants:
-        - name: ns
-          cpucluster: cpuapp
         - name: nrf7001
           cpucluster: cpuapp
-          variants:
-            - name: ns
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
deleted file mode 100644
index 5ff28accf3f..00000000000
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-#include <nordic/nrf5340_cpuappns_qkaa.dtsi>
-#include "nrf5340_cpuapp_common.dtsi"
-
-/ {
-	model = "Nordic NRF5340 DK NRF5340 Application";
-	compatible = "nordic,nrf5340-dk-nrf5340-cpuapp";
-
-	chosen {
-		zephyr,sram = &sram0_ns;
-		zephyr,flash = &flash0;
-		zephyr,code-partition = &slot0_ns_partition;
-		zephyr,entropy = &psa_rng;
-		zephyr,wifi = &wlan0;
-	};
-
-	psa_rng: psa-rng {
-		compatible = "zephyr,psa-crypto-rng";
-		status = "okay";
-	};
-};
-
-&qspi {
-	nrf70: nrf7001@1 {
-		compatible = "nordic,nrf7001-qspi";
-		status = "okay";
-		reg = <1>;
-		qspi-frequency = <24000000>;
-		qspi-quad-mode;
-
-		#include "nrf70_common.dtsi"
-	};
-};
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml
deleted file mode 100644
index 16575969126..00000000000
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-identifier: nrf7002dk/nrf5340/cpuapp/nrf7001/ns
-name: NRF7002-DK-NRF7001-NRF5340-application-MCU-Non-Secure
-type: mcu
-arch: arm
-toolchain:
-  - gnuarmemb
-  - xtools
-  - zephyr
-ram: 192
-flash: 192
-supported:
-  - gpio
-  - i2c
-  - pwm
-  - watchdog
-  - usbd
-  - usb_device
-  - netif:openthread
-vendor: nordic
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig
deleted file mode 100644
index c536aae767d..00000000000
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-# Enable MPU
-CONFIG_ARM_MPU=y
-
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
-# Enable TrustZone-M
-CONFIG_ARM_TRUSTZONE_M=y
-
-# This Board implies building Non-Secure firmware
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
-
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PINCTRL
-CONFIG_PINCTRL=y
-
-# Enable uart driver
-CONFIG_SERIAL=y
-
-# enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
deleted file mode 100644
index 0deb8ccc1bf..00000000000
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-#include <nordic/nrf5340_cpuappns_qkaa.dtsi>
-#include "nrf5340_cpuapp_common.dtsi"
-
-/ {
-	model = "Nordic NRF5340 DK NRF5340 Application";
-	compatible = "nordic,nrf5340-dk-nrf5340-cpuapp";
-
-	chosen {
-		zephyr,sram = &sram0_ns_app;
-		zephyr,flash = &flash0;
-		zephyr,code-partition = &slot0_ns_partition;
-		zephyr,entropy = &psa_rng;
-		zephyr,wifi = &wlan0;
-	};
-
-	psa_rng: psa-rng {
-		compatible = "zephyr,psa-crypto-rng";
-		status = "okay";
-	};
-};
-
-&qspi {
-	nrf70: nrf7002@1 {
-		compatible = "nordic,nrf7002-qspi";
-		status = "okay";
-		reg = <1>;
-		qspi-frequency = <24000000>;
-		qspi-quad-mode;
-
-		#include "nrf70_common.dtsi"
-		#include "nrf70_common_5g.dtsi"
-	};
-};
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml
deleted file mode 100644
index ea43785b455..00000000000
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-identifier: nrf7002dk/nrf5340/cpuapp/ns
-name: NRF7002-DK-NRF5340-application-MCU-Non-Secure
-type: mcu
-arch: arm
-toolchain:
-  - gnuarmemb
-  - xtools
-  - zephyr
-ram: 192
-flash: 192
-supported:
-  - gpio
-  - i2c
-  - pwm
-  - watchdog
-  - usbd
-  - usb_device
-  - netif:openthread
-vendor: nordic
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig
deleted file mode 100644
index c5b2eaadc16..00000000000
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-# Enable MPU
-CONFIG_ARM_MPU=y
-
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
-# Enable TrustZone-M
-CONFIG_ARM_TRUSTZONE_M=y
-
-# This Board implies building Non-Secure firmware
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
-
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PINCTRL
-CONFIG_PINCTRL=y
-
-# Enable uart driver
-CONFIG_SERIAL=y
-
-# enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y

From 50832316b8e9d6480b462733242d45c3862c3cfc Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Tue, 21 Jan 2025 08:21:03 +0000
Subject: [PATCH 2786/2913] [nrf fromtree] boards: nordic: Fix some CMake
 inconsistencies

Fixes some oddities with CMake code

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 4fa91b5c35c087d9a69317a0f3761da2b93702d9)
---
 boards/nordic/nrf5340dk/board.cmake  | 4 ++--
 boards/nordic/nrf54l15dk/board.cmake | 6 ++----
 boards/nordic/nrf7002dk/board.cmake  | 7 ++-----
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/boards/nordic/nrf5340dk/board.cmake b/boards/nordic/nrf5340dk/board.cmake
index ba7bf5c1185..3634697dd77 100644
--- a/boards/nordic/nrf5340dk/board.cmake
+++ b/boards/nordic/nrf5340dk/board.cmake
@@ -5,7 +5,7 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP_NS)
 endif()
 
 if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP_NS)
-board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
+  board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
 endif()
 
 if(CONFIG_TFM_FLASH_MERGED_BINARY)
@@ -13,7 +13,7 @@ if(CONFIG_TFM_FLASH_MERGED_BINARY)
 endif()
 
 if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET)
-board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
+  board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
diff --git a/boards/nordic/nrf54l15dk/board.cmake b/boards/nordic/nrf54l15dk/board.cmake
index 81af434c648..1d700816356 100644
--- a/boards/nordic/nrf54l15dk/board.cmake
+++ b/boards/nordic/nrf54l15dk/board.cmake
@@ -1,11 +1,9 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_SOC_NRF54L05_CPUAPP OR CONFIG_SOC_NRF54L10_CPUAPP OR
-		CONFIG_SOC_NRF54L15_CPUAPP)
+if(CONFIG_SOC_NRF54L05_CPUAPP OR CONFIG_SOC_NRF54L10_CPUAPP OR CONFIG_SOC_NRF54L15_CPUAPP)
   board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
-elseif(CONFIG_SOC_NRF54L05_CPUFLPR OR CONFIG_SOC_NRF54L10_CPUFLPR OR
-		CONFIG_SOC_NRF54L15_CPUFLPR)
+elseif(CONFIG_SOC_NRF54L05_CPUFLPR OR CONFIG_SOC_NRF54L10_CPUFLPR OR CONFIG_SOC_NRF54L15_CPUFLPR)
   set(JLINKSCRIPTFILE ${CMAKE_CURRENT_LIST_DIR}/support/nrf54l_05_10_15_cpuflpr.JLinkScript)
   board_runner_args(jlink "--device=RISC-V" "--speed=4000" "-if SW" "--tool-opt=-jlinkscriptfile ${JLINKSCRIPTFILE}")
 endif()
diff --git a/boards/nordic/nrf7002dk/board.cmake b/boards/nordic/nrf7002dk/board.cmake
index d3afa4bb8ca..56982511034 100644
--- a/boards/nordic/nrf7002dk/board.cmake
+++ b/boards/nordic/nrf7002dk/board.cmake
@@ -1,12 +1,9 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR
-   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001)
+if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001)
   board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
-endif()
-
-if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
+elseif(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 

From ed5b670cd5797a0ec84273814e1c1ac6d60d37bb Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Mon, 3 Feb 2025 12:22:47 +0100
Subject: [PATCH 2787/2913] [nrf fromtree] scripts: runners: nrf: Honor the
 --erase flag for external memory

Both backends supported as runners for nRF ICs, nrfjprog and nrfutil,
support erasing external memory as part of the programming operation.
Before this patch, and when the firmware was detected to be partially or
fully placed in external flash by inspecting the .hex address range, the
runner would instruct the backend tool to fully erase the external
flash (but the nrfjprog runner would ignore that, always erasing only
the sectors required). Instead, correctly default to erasing only the
sectors that are required to program the new firmware image in both tools,
and erase it completely only when the --erase flag is provided by the user.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit f20168fe892e86b3a1a6dfbdf659fd8e3c51a80f)
---
 doc/releases/migration-guide-4.1.rst        | 7 +++++++
 scripts/west_commands/runners/nrf_common.py | 2 +-
 scripts/west_commands/runners/nrfjprog.py   | 7 +++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/doc/releases/migration-guide-4.1.rst b/doc/releases/migration-guide-4.1.rst
index 868f7511aad..ab6355ed77d 100644
--- a/doc/releases/migration-guide-4.1.rst
+++ b/doc/releases/migration-guide-4.1.rst
@@ -46,6 +46,13 @@ Boards
   instead of pin reset when flashing with ``west flash``. If you want to keep
   using pin reset on the nRF52 family of ICs you can use ``west flash --pinreset``.
 
+* Erasing the external memory when programming a new firmware image with ``west
+  flash`` on the nRF52 and nRF53 series now always correctly honors the
+  ``--erase`` flag (and its absence) both when using the ``nrfjprog`` and
+  ``nrfutil`` backends.  Prior to this release, the ``nrjfprog`` backend would
+  always erase only the sectors of the external flash used by the new firmware,
+  and the ``nrfutil`` one would always erase the whole external flash.
+
 Devicetree
 **********
 
diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index 4c944eeea79..75d39b271c9 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -416,7 +416,7 @@ def program_hex(self):
         if self.family in xip_ranges:
             xip_start, xip_end = xip_ranges[self.family]
             if self.hex_refers_region(xip_start, xip_end):
-                ext_mem_erase_opt = 'ERASE_ALL'
+                ext_mem_erase_opt = erase_arg
 
         self.op_program(self.hex_, erase_arg, ext_mem_erase_opt, defer=True, core=core)
         self.flush(force=False)
diff --git a/scripts/west_commands/runners/nrfjprog.py b/scripts/west_commands/runners/nrfjprog.py
index c7e003824a3..36461b7236d 100644
--- a/scripts/west_commands/runners/nrfjprog.py
+++ b/scripts/west_commands/runners/nrfjprog.py
@@ -91,8 +91,11 @@ def do_exec_op(self, op, force=False):
                 raise RuntimeError(f'Invalid erase mode: {erase}')
 
             if opts.get('ext_mem_erase_mode'):
-                # In the future there might be multiple QSPI erase modes
-                cmd.append('--qspisectorerase')
+                if opts['ext_mem_erase_mode'] == 'ERASE_RANGES_TOUCHED_BY_FIRMWARE':
+                    cmd.append('--qspisectorerase')
+                elif opts['ext_mem_erase_mode'] == 'ERASE_ALL':
+                    cmd.append('--qspichiperase')
+
             if opts.get('verify'):
                 # In the future there might be multiple verify modes
                 cmd.append('--verify')

From 956e0a32df287b107155df8ef632fc09820f5433 Mon Sep 17 00:00:00 2001
From: Carles Cufi <carles.cufi@nordicsemi.no>
Date: Mon, 3 Feb 2025 14:28:00 +0100
Subject: [PATCH 2788/2913] [nrf fromtree] scripts: runners: nrfutil: Add a new
 external memory config param

This acts in a similar way to nrfjprog's --qspiini parameter introduced
in 7eb364b, but works slightly differently in nrfutil: it requires a
config file in JSON format instead of .ini, and it is passed along to
the `execute-batch` command instead of providing it together with the
`program` command.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
(cherry picked from commit 2effae5594fa602ef3dd80fc9137079aab74ee54)
---
 scripts/west_commands/runners/nrfutil.py | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/scripts/west_commands/runners/nrfutil.py b/scripts/west_commands/runners/nrfutil.py
index a4f17282259..f937da74c07 100644
--- a/scripts/west_commands/runners/nrfutil.py
+++ b/scripts/west_commands/runners/nrfutil.py
@@ -18,12 +18,13 @@ class NrfUtilBinaryRunner(NrfBinaryRunner):
 
     def __init__(self, cfg, family, softreset, pinreset, dev_id, erase=False,
                  reset=True, tool_opt=None, force=False, recover=False,
-                 suit_starter=False):
+                 suit_starter=False, ext_mem_config_file=None):
 
         super().__init__(cfg, family, softreset, pinreset, dev_id, erase, reset,
                          tool_opt, force, recover)
 
         self.suit_starter = suit_starter
+        self.ext_mem_config_file = ext_mem_config_file
 
         self._ops = []
         self._op_id = 1
@@ -43,7 +44,8 @@ def do_create(cls, cfg, args):
                                    reset=args.reset,
                                    tool_opt=args.tool_opt, force=args.force,
                                    recover=args.recover,
-                                   suit_starter=args.suit_manifest_starter)
+                                   suit_starter=args.suit_manifest_starter,
+                                   ext_mem_config_file=args.ext_mem_config_file)
 
     @classmethod
     def do_add_parser(cls, parser):
@@ -51,6 +53,10 @@ def do_add_parser(cls, parser):
         parser.add_argument('--suit-manifest-starter', required=False,
                             action='store_true',
                             help='Use the SUIT manifest starter file')
+        parser.add_argument('--ext-mem-config-file', required=False,
+                            dest='ext_mem_config_file',
+                            help='path to an JSON file with external memory configuration')
+
 
     def _exec(self, args):
         jout_all = []
@@ -139,8 +145,13 @@ def _exec_batch(self):
         self._ops = []
         self._op_id = 1
         self.logger.debug(f'Executing batch in: {json_file}')
-        self._exec(['x-execute-batch', '--batch-path', f'{json_file}',
-                    '--serial-number', f'{self.dev_id}'])
+        precmd = []
+        if self.ext_mem_config_file:
+            # This needs to be prepended, as it's a global option
+            precmd = ['--x-ext-mem-config-file', self.ext_mem_config_file]
+
+        self._exec(precmd + ['x-execute-batch', '--batch-path', f'{json_file}',
+                             '--serial-number', f'{self.dev_id}'])
 
     def do_exec_op(self, op, force=False):
         self.logger.debug(f'Executing op: {op}')

From bf353ee20110e87943cba540940140c2dbf38382 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Mon, 31 Mar 2025 11:15:18 +0100
Subject: [PATCH 2789/2913] [nrf fromlist] boards: nordic: nrf7002dk: Add SPI
 nrfutil config

Adds a configuration file which is used with nrfutil to allow
programming the SPI flash on the device

Upstream PR #: 86985

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
---
 boards/nordic/nrf7002dk/board.cmake             |  1 +
 .../nrf7002dk/nrf7002dk_spi_nrfutil_config.json | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_spi_nrfutil_config.json

diff --git a/boards/nordic/nrf7002dk/board.cmake b/boards/nordic/nrf7002dk/board.cmake
index 56982511034..77b78fdd1a7 100644
--- a/boards/nordic/nrf7002dk/board.cmake
+++ b/boards/nordic/nrf7002dk/board.cmake
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001)
+  board_runner_args(nrfutil "--ext-mem-config-file=${BOARD_DIR}/nrf7002dk_spi_nrfutil_config.json")
   board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
 elseif(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_spi_nrfutil_config.json b/boards/nordic/nrf7002dk/nrf7002dk_spi_nrfutil_config.json
new file mode 100644
index 00000000000..af668581877
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_spi_nrfutil_config.json
@@ -0,0 +1,17 @@
+{
+  "firmware_config": {
+    "peripheral": "SPIM0"
+  },
+  "pins": {
+    "sck": 8,
+    "csn": 11,
+    "io0": 9,
+    "io1": 10,
+    "io2": 4294967295,
+    "io3": 4294967295
+  },
+  "flash_size": 8388608,
+  "page_size": 4096,
+  "sck_frequency": 8000000,
+  "address_mode": "MODE24BIT"
+}

From 988e2e79056bc1c491e291ff1305ac6bc34d6216 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Wed, 12 Mar 2025 11:40:29 +0000
Subject: [PATCH 2790/2913] [nrf fromlist] boards: nordic: thingy53: Add QSPI
 nrfutil config

Adds a configuration file which is used with nrfutil to allow
programming QSPI on the device

Upstream PR #: 86985

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
---
 boards/nordic/thingy53/board.cmake            |  1 +
 .../thingy53_qspi_nrfutil_config.json         | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 boards/nordic/thingy53/thingy53_qspi_nrfutil_config.json

diff --git a/boards/nordic/thingy53/board.cmake b/boards/nordic/thingy53/board.cmake
index 916d982b65c..f03b026d9fb 100644
--- a/boards/nordic/thingy53/board.cmake
+++ b/boards/nordic/thingy53/board.cmake
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(CONFIG_BOARD_THINGY53_NRF5340_CPUAPP OR CONFIG_BOARD_THINGY53_NRF5340_CPUAPP_NS)
+  board_runner_args(nrfutil "--ext-mem-config-file=${BOARD_DIR}/thingy53_qspi_nrfutil_config.json")
   board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
 elseif(CONFIG_BOARD_THINGY53_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
diff --git a/boards/nordic/thingy53/thingy53_qspi_nrfutil_config.json b/boards/nordic/thingy53/thingy53_qspi_nrfutil_config.json
new file mode 100644
index 00000000000..8138801cd91
--- /dev/null
+++ b/boards/nordic/thingy53/thingy53_qspi_nrfutil_config.json
@@ -0,0 +1,22 @@
+{
+  "firmware_config": {
+    "peripheral": "QSPI"
+  },
+  "pins": {
+    "sck": 17,
+    "csn": 18,
+    "io0": 13,
+    "io1": 14,
+    "io2": 15,
+    "io3": 16
+  },
+  "flash_size": 67108864,
+  "sck_frequency": 8000000,
+  "address_mode": "MODE24BIT",
+  "readoc": "READ2IO",
+  "writeoc": "PP",
+  "pp_size": "PPSIZE256",
+  "sck_delay": 128,
+  "rx_delay": 2,
+  "page_size": 4096
+}

From 9ec6585407fc97aedc799f500c2f6f9ae621b94b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 8 Jan 2025 11:15:56 +0100
Subject: [PATCH 2791/2913] [nrf noup] boards: nordic: nrf7002dk: Bring back NS
 variants
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Non-secure variants for nRF7002 DK were removed from upstream
in commit 10d49736cffa14d3798e615e70d58b3be8ee2cfc. Revert these
changes downstream, so that the NS variants are still available.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 boards/nordic/nrf7002dk/CMakeLists.txt        | 11 +++
 boards/nordic/nrf7002dk/Kconfig               |  6 +-
 boards/nordic/nrf7002dk/Kconfig.defconfig     | 76 +++++++++++++++++++
 boards/nordic/nrf7002dk/Kconfig.nrf7002dk     |  4 +-
 boards/nordic/nrf7002dk/board.cmake           | 18 ++++-
 boards/nordic/nrf7002dk/board.yml             |  4 +
 .../nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts   | 39 ++++++++++
 .../nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml  | 19 +++++
 ...7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig | 27 +++++++
 .../nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts | 40 ++++++++++
 .../nrf7002dk_nrf5340_cpuapp_ns.yaml          | 19 +++++
 .../nrf7002dk_nrf5340_cpuapp_ns_defconfig     | 26 +++++++
 12 files changed, 285 insertions(+), 4 deletions(-)
 create mode 100644 boards/nordic/nrf7002dk/CMakeLists.txt
 create mode 100644 boards/nordic/nrf7002dk/Kconfig.defconfig
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig

diff --git a/boards/nordic/nrf7002dk/CMakeLists.txt b/boards/nordic/nrf7002dk/CMakeLists.txt
new file mode 100644
index 00000000000..db20255712b
--- /dev/null
+++ b/boards/nordic/nrf7002dk/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if((CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR
+    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
+    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 OR
+    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS) AND
+   CONFIG_BOARD_ENABLE_CPUNET)
+  zephyr_library()
+  zephyr_library_sources(nrf5340_cpunet_reset.c)
+endif()
diff --git a/boards/nordic/nrf7002dk/Kconfig b/boards/nordic/nrf7002dk/Kconfig
index e599cbcce07..bf5b239c98c 100644
--- a/boards/nordic/nrf7002dk/Kconfig
+++ b/boards/nordic/nrf7002dk/Kconfig
@@ -10,7 +10,9 @@ config MBOX_NRFX_IPC
 	default MBOX
 
 if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
 
 config BT_HCI_IPC
 	default y if BT
@@ -38,7 +40,9 @@ config BT_ECC
 config DOMAIN_CPUAPP_BOARD
 	string
 	default "nrf7002dk/nrf5340/cpuapp" if BOARD_NRF7002DK_NRF5340_CPUAPP
+	default "nrf7002dk/nrf5340/cpuapp/ns" if BOARD_NRF7002DK_NRF5340_CPUAPP_NS
 	default "nrf7002dk/nrf5340/cpuapp/nrf7001" if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
+	default "nrf7002dk/nrf5340/cpuapp/nrf7001/ns" if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
 	help
 	  The board which will be used for CPUAPP domain when creating a multi
 	  image application where one or more images should be located on
diff --git a/boards/nordic/nrf7002dk/Kconfig.defconfig b/boards/nordic/nrf7002dk/Kconfig.defconfig
new file mode 100644
index 00000000000..a6357ae50b2
--- /dev/null
+++ b/boards/nordic/nrf7002dk/Kconfig.defconfig
@@ -0,0 +1,76 @@
+# nRF5340 DK nRF5340 board configuration
+
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+# By default, if we build for a Non-Secure version of the board,
+# force building with TF-M as the Secure Execution Environment.
+config BUILD_WITH_TFM
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+if BUILD_WITH_TFM
+
+# By default, if we build with TF-M, instruct build system to
+# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
+config TFM_FLASH_MERGED_BINARY
+	bool
+	default y
+
+endif # BUILD_WITH_TFM
+
+# Code Partition:
+#
+# For the secure version of the board the firmware is linked at the beginning
+# of the flash, or into the code-partition defined in DT if it is intended to
+# be loaded by MCUboot. If the secure firmware is to be combined with a non-
+# secure image (TRUSTED_EXECUTION_SECURE=y), the secure FW image shall always
+# be restricted to the size of its code partition.
+#
+# For the non-secure version of the board, the firmware
+# must be linked into the code-partition (non-secure) defined in DT, regardless.
+# Apply this configuration below by setting the Kconfig symbols used by
+# the linker according to the information extracted from DT partitions.
+
+# SRAM Partition:
+#
+# If the secure firmware is to be combined with a non-secure image
+# (TRUSTED_EXECUTION_SECURE=y), the secure FW image SRAM shall always
+# be restricted to the secure image SRAM partition (sram-secure-partition).
+# Otherwise (if TRUSTED_EXECUTION_SECURE is not set) the whole zephyr,sram
+# may be used by the image.
+#
+# For the non-secure version of the board, the firmware image SRAM is
+# always restricted to the allocated non-secure SRAM partition.
+#
+# Workaround for not being able to have commas in macro arguments
+DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
+DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
+
+if (BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001) && \
+	TRUSTED_EXECUTION_SECURE
+
+config FLASH_LOAD_SIZE
+	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+config SRAM_SIZE
+	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM_PARTITION),0,K)
+
+endif
+
+if BOARD_NRF7002DK_NRF5340_CPUAPP_NS || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+config FLASH_LOAD_OFFSET
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+config FLASH_LOAD_SIZE
+	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+endif
+
+endif
diff --git a/boards/nordic/nrf7002dk/Kconfig.nrf7002dk b/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
index 61b9e818f36..91f52ee6f08 100644
--- a/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
+++ b/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
@@ -4,4 +4,6 @@
 config BOARD_NRF7002DK
 	select SOC_NRF5340_CPUNET_QKAA if BOARD_NRF7002DK_NRF5340_CPUNET
 	select SOC_NRF5340_CPUAPP_QKAA if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
+					  BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
diff --git a/boards/nordic/nrf7002dk/board.cmake b/boards/nordic/nrf7002dk/board.cmake
index 77b78fdd1a7..c4f86afedf7 100644
--- a/boards/nordic/nrf7002dk/board.cmake
+++ b/boards/nordic/nrf7002dk/board.cmake
@@ -1,10 +1,24 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001)
+if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS)
+  set(TFM_PUBLIC_KEY_FORMAT "full")
+endif()
+
+if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS)
   board_runner_args(nrfutil "--ext-mem-config-file=${BOARD_DIR}/nrf7002dk_spi_nrfutil_config.json")
   board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
-elseif(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
+endif()
+
+if(CONFIG_TFM_FLASH_MERGED_BINARY)
+  set_property(TARGET runners_yaml_props_target PROPERTY hex_file "${CMAKE_BINARY_DIR}/zephyr/tfm_merged.hex")
+endif()
+
+if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
diff --git a/boards/nordic/nrf7002dk/board.yml b/boards/nordic/nrf7002dk/board.yml
index 4f41341e442..39db5dcfa3a 100644
--- a/boards/nordic/nrf7002dk/board.yml
+++ b/boards/nordic/nrf7002dk/board.yml
@@ -5,5 +5,9 @@ board:
   socs:
     - name: nrf5340
       variants:
+        - name: ns
+          cpucluster: cpuapp
         - name: nrf7001
           cpucluster: cpuapp
+          variants:
+            - name: ns
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
new file mode 100644
index 00000000000..5ff28accf3f
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf5340_cpuappns_qkaa.dtsi>
+#include "nrf5340_cpuapp_common.dtsi"
+
+/ {
+	model = "Nordic NRF5340 DK NRF5340 Application";
+	compatible = "nordic,nrf5340-dk-nrf5340-cpuapp";
+
+	chosen {
+		zephyr,sram = &sram0_ns;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_ns_partition;
+		zephyr,entropy = &psa_rng;
+		zephyr,wifi = &wlan0;
+	};
+
+	psa_rng: psa-rng {
+		compatible = "zephyr,psa-crypto-rng";
+		status = "okay";
+	};
+};
+
+&qspi {
+	nrf70: nrf7001@1 {
+		compatible = "nordic,nrf7001-qspi";
+		status = "okay";
+		reg = <1>;
+		qspi-frequency = <24000000>;
+		qspi-quad-mode;
+
+		#include "nrf70_common.dtsi"
+	};
+};
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml
new file mode 100644
index 00000000000..16575969126
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml
@@ -0,0 +1,19 @@
+identifier: nrf7002dk/nrf5340/cpuapp/nrf7001/ns
+name: NRF7002-DK-NRF7001-NRF5340-application-MCU-Non-Secure
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+ram: 192
+flash: 192
+supported:
+  - gpio
+  - i2c
+  - pwm
+  - watchdog
+  - usbd
+  - usb_device
+  - netif:openthread
+vendor: nordic
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig
new file mode 100644
index 00000000000..c536aae767d
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig
@@ -0,0 +1,27 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Enable TrustZone-M
+CONFIG_ARM_TRUSTZONE_M=y
+
+# This Board implies building Non-Secure firmware
+CONFIG_TRUSTED_EXECUTION_NONSECURE=y
+
+# enable GPIO
+CONFIG_GPIO=y
+
+# enable PINCTRL
+CONFIG_PINCTRL=y
+
+# Enable uart driver
+CONFIG_SERIAL=y
+
+# enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
new file mode 100644
index 00000000000..0deb8ccc1bf
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf5340_cpuappns_qkaa.dtsi>
+#include "nrf5340_cpuapp_common.dtsi"
+
+/ {
+	model = "Nordic NRF5340 DK NRF5340 Application";
+	compatible = "nordic,nrf5340-dk-nrf5340-cpuapp";
+
+	chosen {
+		zephyr,sram = &sram0_ns_app;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_ns_partition;
+		zephyr,entropy = &psa_rng;
+		zephyr,wifi = &wlan0;
+	};
+
+	psa_rng: psa-rng {
+		compatible = "zephyr,psa-crypto-rng";
+		status = "okay";
+	};
+};
+
+&qspi {
+	nrf70: nrf7002@1 {
+		compatible = "nordic,nrf7002-qspi";
+		status = "okay";
+		reg = <1>;
+		qspi-frequency = <24000000>;
+		qspi-quad-mode;
+
+		#include "nrf70_common.dtsi"
+		#include "nrf70_common_5g.dtsi"
+	};
+};
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml
new file mode 100644
index 00000000000..ea43785b455
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml
@@ -0,0 +1,19 @@
+identifier: nrf7002dk/nrf5340/cpuapp/ns
+name: NRF7002-DK-NRF5340-application-MCU-Non-Secure
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+ram: 192
+flash: 192
+supported:
+  - gpio
+  - i2c
+  - pwm
+  - watchdog
+  - usbd
+  - usb_device
+  - netif:openthread
+vendor: nordic
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig
new file mode 100644
index 00000000000..c5b2eaadc16
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Enable TrustZone-M
+CONFIG_ARM_TRUSTZONE_M=y
+
+# This Board implies building Non-Secure firmware
+CONFIG_TRUSTED_EXECUTION_NONSECURE=y
+
+# enable GPIO
+CONFIG_GPIO=y
+
+# enable PINCTRL
+CONFIG_PINCTRL=y
+
+# Enable uart driver
+CONFIG_SERIAL=y
+
+# enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y

From 6447cfb8aef2bd0c2d48eba2776e5843e4828a04 Mon Sep 17 00:00:00 2001
From: Triveni Danda <triveni.danda@nordicsemi.no>
Date: Tue, 25 Mar 2025 13:03:01 +0530
Subject: [PATCH 2792/2913] [nrf fromtree] include: zephyr: net: Fix docstrings
 in wifi_credentials header

Fix all docstrings in header to ensure compliance
with Zephyr's documentation guidelines.

Signed-off-by: Triveni Danda <triveni.danda@nordicsemi.no>
(cherry picked from commit c9821ff2c4b324e64969f47634b18411a10581f0)
---
 include/zephyr/net/wifi_credentials.h | 80 +++++++++++++++++++--------
 1 file changed, 58 insertions(+), 22 deletions(-)

diff --git a/include/zephyr/net/wifi_credentials.h b/include/zephyr/net/wifi_credentials.h
index 0241930e97d..4fc4e217059 100644
--- a/include/zephyr/net/wifi_credentials.h
+++ b/include/zephyr/net/wifi_credentials.h
@@ -11,18 +11,19 @@
 #include <zephyr/net/wifi.h>
 #include <zephyr/kernel.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
+ * @brief Library that provides a way to store and load Wi-Fi credentials.
  * @defgroup wifi_credentials Wi-Fi credentials library
  * @ingroup networking
  * @since 4.0
  * @version 0.1.0
  * @{
- * @brief Library that provides a way to store and load Wi-Fi credentials.
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /* this entry contains a BSSID */
 #define WIFI_CREDENTIALS_FLAG_BSSID        BIT(0)
@@ -37,6 +38,7 @@ extern "C" {
 /* this entry disables management frame protection */
 #define WIFI_CREDENTIALS_FLAG_MFP_DISABLED BIT(5)
 
+/* Maximum length of the password */
 #define WIFI_CREDENTIALS_MAX_PASSWORD_LEN                                                          \
 	MAX(WIFI_PSK_MAX_LEN, CONFIG_WIFI_CREDENTIALS_SAE_PASSWORD_LENGTH)
 
@@ -49,13 +51,26 @@ extern "C" {
  *
  */
 struct wifi_credentials_header {
-	enum wifi_security_type type;     /**< Wi-Fi security type */
-	char ssid[WIFI_SSID_MAX_LEN];     /**< SSID (Service Set Identifier) */
-	size_t ssid_len;                  /**< Length of the SSID */
-	uint32_t flags;                   /**< Flags for controlling detail settings */
-	uint32_t timeout;                 /**< Timeout for connecting to the network */
-	uint8_t bssid[WIFI_MAC_ADDR_LEN]; /**< BSSID (Basic Service Set Identifier) */
-	uint8_t channel;                  /**< Channel on which the network operates */
+	/** Wi-Fi security type */
+	enum wifi_security_type type;
+
+	/** SSID (Service Set Identifier) */
+	char ssid[WIFI_SSID_MAX_LEN];
+
+	/** Length of the SSID */
+	size_t ssid_len;
+
+	/** Flags for controlling detail settings */
+	uint32_t flags;
+
+	/** Timeout for connecting to the network */
+	uint32_t timeout;
+
+	/** BSSID (Basic Service Set Identifier) */
+	uint8_t bssid[WIFI_MAC_ADDR_LEN];
+
+	/** Channel on which the network operates */
+	uint8_t channel;
 };
 
 /**
@@ -67,9 +82,14 @@ struct wifi_credentials_header {
  *
  */
 struct wifi_credentials_personal {
-	struct wifi_credentials_header header;            /**< Header */
-	char password[WIFI_CREDENTIALS_MAX_PASSWORD_LEN]; /**< Password/PSK */
-	size_t password_len;                              /**< Length of the password */
+	/** Header */
+	struct wifi_credentials_header header;
+
+	/** Password/PSK */
+	char password[WIFI_CREDENTIALS_MAX_PASSWORD_LEN];
+
+	/** Length of the password */
+	size_t password_len;
 };
 
 /**
@@ -77,14 +97,29 @@ struct wifi_credentials_personal {
  * @note This functionality is not yet implemented.
  */
 struct wifi_credentials_enterprise {
-	struct wifi_credentials_header header; /**< Header */
-	size_t identity_len;                   /**< Length of the identity */
-	size_t anonymous_identity_len;         /**< Length of the anonymous identity */
-	size_t password_len;                   /**< Length of the password */
-	size_t ca_cert_len;                    /**< Length of the CA certificate */
-	size_t client_cert_len;                /**< Length of the client certificate */
-	size_t private_key_len;                /**< Length of the private key */
-	size_t private_key_pw_len;             /**< Length of the private key password */
+	/** Header */
+	struct wifi_credentials_header header;
+
+	/** Length of the identity */
+	size_t identity_len;
+
+	/** Length of the anonymous identity */
+	size_t anonymous_identity_len;
+
+	/** Length of the password */
+	size_t password_len;
+
+	/** Length of the CA certificate */
+	size_t ca_cert_len;
+
+	/** Length of the client certificate */
+	size_t client_cert_len;
+
+	/** Length of the private key */
+	size_t private_key_len;
+
+	/** Length of the private key password */
+	size_t private_key_pw_len;
 };
 
 /**
@@ -194,6 +229,7 @@ int wifi_credentials_delete_all(void);
 
 /**
  * @brief Callback type for wifi_credentials_for_each_ssid.
+ *
  * @param[in] cb_arg      arguments for the callback function. Appropriate cb_arg is
  *                        transferred by wifi_credentials_for_each_ssid.
  * @param[in] ssid        SSID

From fb81ddbdc8f132c762538aa82a41d96e345b2209 Mon Sep 17 00:00:00 2001
From: Triveni Danda <triveni.danda@nordicsemi.no>
Date: Tue, 11 Mar 2025 15:14:24 +0530
Subject: [PATCH 2793/2913] [nrf fromtree] net: lib: wifi_credentials: Use
 getopt API for adding network options

Use getopt API to process arguments for `cred add` command.

Signed-off-by: Triveni Danda <triveni.danda@nordicsemi.no>
(cherry picked from commit 7b6f2572e5ef5816878a3d8913a96b0f74491c18)
---
 include/zephyr/net/wifi_credentials.h         |  22 +-
 subsys/net/lib/wifi_credentials/Kconfig       |   2 +
 .../wifi_credentials/wifi_credentials_shell.c | 365 ++++++++++--------
 3 files changed, 219 insertions(+), 170 deletions(-)

diff --git a/include/zephyr/net/wifi_credentials.h b/include/zephyr/net/wifi_credentials.h
index 4fc4e217059..8b00d67b199 100644
--- a/include/zephyr/net/wifi_credentials.h
+++ b/include/zephyr/net/wifi_credentials.h
@@ -33,10 +33,16 @@ extern "C" {
 #define WIFI_CREDENTIALS_FLAG_2_4GHz       BIT(2)
 /* this entry can use the 5 GHz band */
 #define WIFI_CREDENTIALS_FLAG_5GHz         BIT(3)
+/* this entry can use the 6 GHz band */
+#define WIFI_CREDENTIALS_FLAG_6GHz         BIT(4)
 /* this entry requires management frame protection */
-#define WIFI_CREDENTIALS_FLAG_MFP_REQUIRED BIT(4)
+#define WIFI_CREDENTIALS_FLAG_MFP_REQUIRED BIT(5)
 /* this entry disables management frame protection */
-#define WIFI_CREDENTIALS_FLAG_MFP_DISABLED BIT(5)
+#define WIFI_CREDENTIALS_FLAG_MFP_DISABLED BIT(6)
+/* this entry has anonymous identity configured */
+#define WIFI_CREDENTIALS_FLAG_ANONYMOUS_IDENTITY  BIT(7)
+/* this entry has key password configured */
+#define WIFI_CREDENTIALS_FLAG_KEY_PASSWORD  BIT(8)
 
 /* Maximum length of the password */
 #define WIFI_CREDENTIALS_MAX_PASSWORD_LEN                                                          \
@@ -71,6 +77,18 @@ struct wifi_credentials_header {
 
 	/** Channel on which the network operates */
 	uint8_t channel;
+
+	/** Anonymous identifier (Limited to 16 bytes due to settings subsystem overflow) */
+	char anon_id[16];
+
+	/** Length of the Anonymous identifier */
+	uint8_t aid_length;
+
+	/** Password/PSK (Limited to 16 bytes due to settings subsystem overflow) */
+	char key_passwd[16];
+
+	/** Length of the Password */
+	uint8_t key_passwd_length;
 };
 
 /**
diff --git a/subsys/net/lib/wifi_credentials/Kconfig b/subsys/net/lib/wifi_credentials/Kconfig
index 2fc002f00b8..f50e210b080 100644
--- a/subsys/net/lib/wifi_credentials/Kconfig
+++ b/subsys/net/lib/wifi_credentials/Kconfig
@@ -57,6 +57,8 @@ config WIFI_CREDENTIALS_SHELL
 	bool "Shell commands to manage Wi-Fi credentials"
 	default y
 	depends on SHELL
+	select SHELL_GETOPT
+	select GETOPT_LONG
 	depends on !WIFI_CREDENTIALS_BACKEND_NONE
 
 config WIFI_CREDENTIALS_CONNECT_STORED
diff --git a/subsys/net/lib/wifi_credentials/wifi_credentials_shell.c b/subsys/net/lib/wifi_credentials/wifi_credentials_shell.c
index c9652ba390c..0e37046e494 100644
--- a/subsys/net/lib/wifi_credentials/wifi_credentials_shell.c
+++ b/subsys/net/lib/wifi_credentials/wifi_credentials_shell.c
@@ -15,12 +15,14 @@
 
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/wifi_mgmt.h>
+#include <zephyr/net/wifi_utils.h>
 #include <zephyr/net/net_event.h>
 #include <zephyr/net/net_l2.h>
 #include <zephyr/net/ethernet.h>
 
 #include <zephyr/net/wifi_credentials.h>
 
+#define MAX_BANDS_STR_LEN 64
 #define MACSTR "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx"
 
 static void print_network_info(void *cb_arg, const char *ssid, size_t ssid_len)
@@ -88,183 +90,183 @@ static void print_network_info(void *cb_arg, const char *ssid, size_t ssid_len)
 	shell_fprintf(sh, SHELL_VT100_COLOR_DEFAULT, "\n");
 }
 
-static enum wifi_security_type parse_sec_type(const char *s)
-{
-	if (strcmp("OPEN", s) == 0) {
-		return WIFI_SECURITY_TYPE_NONE;
-	}
-
-	if (strcmp("WPA2-PSK", s) == 0) {
-		return WIFI_SECURITY_TYPE_PSK;
-	}
-
-	if (strcmp("WPA2-PSK-SHA256", s) == 0) {
-		return WIFI_SECURITY_TYPE_PSK_SHA256;
-	}
-
-	if (strcmp("WPA3-SAE", s) == 0) {
-		return WIFI_SECURITY_TYPE_SAE;
-	}
-
-	if (strcmp("WPA-PSK", s) == 0) {
-		return WIFI_SECURITY_TYPE_WPA_PSK;
-	}
-
-	return WIFI_SECURITY_TYPE_UNKNOWN;
-}
-
-static enum wifi_frequency_bands parse_band(const char *s)
-{
-	if (strcmp("2.4GHz", s) == 0) {
-		return WIFI_FREQ_BAND_2_4_GHZ;
-	}
-
-	if (strcmp("5GHz", s) == 0) {
-		return WIFI_FREQ_BAND_5_GHZ;
-	}
-
-	if (strcmp("6GHz", s) == 0) {
-		return WIFI_FREQ_BAND_6_GHZ;
-	}
-
-	return WIFI_FREQ_BAND_UNKNOWN;
-}
-
 static int cmd_add_network(const struct shell *sh, size_t argc, char *argv[])
 {
-	int ret;
-
-	if (argc < 3) {
-		goto help;
-	}
-
-	if (strnlen(argv[1], WIFI_SSID_MAX_LEN + 1) > WIFI_SSID_MAX_LEN) {
-		shell_error(sh, "SSID too long");
-		goto help;
-	}
-
-	struct wifi_credentials_personal creds = {
-		.header.ssid_len = strlen(argv[1]),
-		.header.type = parse_sec_type(argv[2]),
-	};
-
-	memcpy(creds.header.ssid, argv[1], creds.header.ssid_len);
-
-	if (creds.header.type == WIFI_SECURITY_TYPE_UNKNOWN) {
-		shell_error(sh, "Cannot parse security type");
-		goto help;
-	}
-
-	size_t arg_idx = 3;
-
-	if (creds.header.type == WIFI_SECURITY_TYPE_PSK ||
-	    creds.header.type == WIFI_SECURITY_TYPE_PSK_SHA256 ||
-	    creds.header.type == WIFI_SECURITY_TYPE_SAE ||
-	    creds.header.type == WIFI_SECURITY_TYPE_WPA_PSK) {
-		/* parse passphrase */
-		if (argc < 4) {
-			shell_error(sh, "Missing password");
-			goto help;
-		}
-		creds.password_len = strlen(argv[3]);
-		if (creds.password_len < WIFI_PSK_MIN_LEN) {
-			shell_error(sh, "Passphrase should be minimum %d characters",
-				    WIFI_PSK_MIN_LEN);
-			goto help;
-		}
-		if ((creds.password_len > CONFIG_WIFI_CREDENTIALS_SAE_PASSWORD_LENGTH &&
-		     creds.header.type == WIFI_SECURITY_TYPE_SAE) ||
-		    (creds.password_len > WIFI_PSK_MAX_LEN &&
-		     creds.header.type != WIFI_SECURITY_TYPE_SAE)) {
-			shell_error(sh, "Password is too long for this security type");
-			goto help;
-		}
-		memcpy(creds.password, argv[3], creds.password_len);
-		++arg_idx;
-	}
+	int opt;
+	int opt_index = 0;
+	struct getopt_state *state;
+	static const struct option long_options[] = {
+		{"ssid", required_argument, 0, 's'},	 {"passphrase", required_argument, 0, 'p'},
+		{"key-mgmt", required_argument, 0, 'k'}, {"ieee-80211w", required_argument, 0, 'w'},
+		{"bssid", required_argument, 0, 'm'},	 {"band", required_argument, 0, 'b'},
+		{"channel", required_argument, 0, 'c'},	 {"timeout", required_argument, 0, 't'},
+		{"identity", required_argument, 0, 'a'}, {"key-passwd", required_argument, 0, 'K'},
+		{"help", no_argument, 0, 'h'},		 {0, 0, 0, 0}};
+	char *endptr;
+	bool secure_connection = false;
+	uint8_t band;
+	struct wifi_credentials_personal creds = {0};
 
-	if (arg_idx < argc) {
-		/* look for bssid */
-		ret = sscanf(argv[arg_idx], MACSTR, &creds.header.bssid[0], &creds.header.bssid[1],
-			     &creds.header.bssid[2], &creds.header.bssid[3], &creds.header.bssid[4],
-			     &creds.header.bssid[5]);
-		if (ret == 6) {
+	const uint8_t all_bands[] = {WIFI_FREQ_BAND_2_4_GHZ, WIFI_FREQ_BAND_5_GHZ,
+				     WIFI_FREQ_BAND_6_GHZ};
+	bool found = false;
+	char bands_str[MAX_BANDS_STR_LEN] = {0};
+	size_t offset = 0;
+	long channel;
+	long mfp = WIFI_MFP_OPTIONAL;
+
+	while ((opt = getopt_long(argc, argv, "s:p:k:w:b:c:m:t:a:K:h", long_options, &opt_index)) !=
+	       -1) {
+		state = getopt_state_get();
+		switch (opt) {
+		case 's':
+			creds.header.ssid_len = strlen(state->optarg);
+			if (creds.header.ssid_len > WIFI_SSID_MAX_LEN) {
+				shell_warn(sh, "SSID too long (max %d characters)\n",
+					   WIFI_SSID_MAX_LEN);
+				return -EINVAL;
+			}
+			memcpy(creds.header.ssid, state->optarg, creds.header.ssid_len);
+			break;
+		case 'k':
+			creds.header.type = atoi(state->optarg);
+			if (creds.header.type) {
+				secure_connection = true;
+			}
+			break;
+		case 'p':
+			creds.password_len = strlen(state->optarg);
+			if (creds.password_len < WIFI_PSK_MIN_LEN) {
+				shell_warn(sh, "Passphrase should be minimum %d characters\n",
+					   WIFI_PSK_MIN_LEN);
+				return -EINVAL;
+			}
+			if (creds.password_len > WIFI_PSK_MAX_LEN) {
+				shell_warn(sh, "Passphrase too long (max %d characters)\n",
+					   WIFI_PSK_MAX_LEN);
+				return -EINVAL;
+			}
+			memcpy(creds.password, state->optarg, creds.password_len);
+			break;
+		case 'c':
+			channel = strtol(state->optarg, &endptr, 10);
+			if (*endptr != '\0') {
+				shell_error(sh, "Invalid channel: %s\n", state->optarg);
+				return -EINVAL;
+			}
+
+			for (band = 0; band < ARRAY_SIZE(all_bands); band++) {
+				offset += snprintf(bands_str + offset, sizeof(bands_str) - offset,
+						   "%s%s", band ? "," : "",
+						   wifi_band_txt(all_bands[band]));
+				if (offset >= sizeof(bands_str)) {
+					shell_error(sh,
+						    "Failed to parse channel: %ld: "
+						    "band string too long\n",
+						    channel);
+					return -EINVAL;
+				}
+
+				if (wifi_utils_validate_chan(all_bands[band], channel)) {
+					found = true;
+					break;
+				}
+			}
+
+			if (!found) {
+				shell_error(sh, "Invalid channel: %ld, checked bands: %s\n",
+					    channel, bands_str);
+				return -EINVAL;
+			}
+
+			creds.header.channel = channel;
+			break;
+		case 'b':
+			switch (atoi(state->optarg)) {
+			case 2:
+				creds.header.flags |= WIFI_CREDENTIALS_FLAG_2_4GHz;
+				break;
+			case 5:
+				creds.header.flags |= WIFI_CREDENTIALS_FLAG_5GHz;
+				break;
+			case 6:
+				creds.header.flags |= WIFI_CREDENTIALS_FLAG_6GHz;
+				break;
+			default:
+				shell_error(sh, "Invalid band: %d\n", atoi(state->optarg));
+				return -EINVAL;
+			}
+			break;
+		case 'w':
+			if (creds.header.type == WIFI_SECURITY_TYPE_NONE ||
+			    creds.header.type == WIFI_SECURITY_TYPE_WPA_PSK) {
+				shell_error(sh, "MFP not supported for security type %s",
+					    wifi_security_txt(creds.header.type));
+				return -ENOTSUP;
+			}
+			mfp = strtol(state->optarg, &endptr, 10);
+			if (*endptr != '\0') {
+				shell_error(sh, "Invalid IEEE 802.11w value: %s", state->optarg);
+				return -EINVAL;
+			}
+			if (mfp == WIFI_MFP_DISABLE) {
+				creds.header.flags |= WIFI_CREDENTIALS_FLAG_MFP_DISABLED;
+			} else if (mfp == WIFI_MFP_REQUIRED) {
+				creds.header.flags |= WIFI_CREDENTIALS_FLAG_MFP_REQUIRED;
+			} else if (mfp > 2) {
+				shell_error(sh, "Invalid IEEE 802.11w value: %s",
+					    state->optarg);
+				return -EINVAL;
+			}
+			break;
+		case 'm':
+			if (net_bytes_from_str(creds.header.bssid, sizeof(creds.header.bssid),
+					       state->optarg) < 0) {
+				shell_warn(sh, "Invalid MAC address\n");
+				return -EINVAL;
+			}
 			creds.header.flags |= WIFI_CREDENTIALS_FLAG_BSSID;
-			++arg_idx;
+			break;
+		case 'a':
+			creds.header.aid_length = strlen(state->optarg);
+			if (creds.header.aid_length > WIFI_ENT_IDENTITY_MAX_LEN) {
+				shell_warn(sh, "anon_id too long (max %d characters)\n",
+					   WIFI_ENT_IDENTITY_MAX_LEN);
+				return -EINVAL;
+			}
+			memcpy(creds.header.anon_id, state->optarg, creds.header.aid_length);
+			creds.header.flags |= WIFI_CREDENTIALS_FLAG_ANONYMOUS_IDENTITY;
+			break;
+		case 'K':
+			creds.header.key_passwd_length = strlen(state->optarg);
+			if (creds.header.key_passwd_length > WIFI_ENT_PSWD_MAX_LEN) {
+				shell_warn(sh, "key_passwd too long (max %d characters)\n",
+					   WIFI_ENT_PSWD_MAX_LEN);
+				return -EINVAL;
+			}
+			memcpy(creds.header.key_passwd, state->optarg,
+			       creds.header.key_passwd_length);
+			creds.header.flags |= WIFI_CREDENTIALS_FLAG_KEY_PASSWORD;
+			break;
+		case 'h':
+			shell_help(sh);
+			return -ENOEXEC;
+		default:
+			shell_error(sh, "Invalid option %c\n", state->optopt);
+			return -EINVAL;
 		}
 	}
-
-	if (arg_idx < argc) {
-		/* look for band */
-		enum wifi_frequency_bands band = parse_band(argv[arg_idx]);
-
-		if (band == WIFI_FREQ_BAND_2_4_GHZ) {
-			creds.header.flags |= WIFI_CREDENTIALS_FLAG_2_4GHz;
-			++arg_idx;
-		}
-		if (band == WIFI_FREQ_BAND_5_GHZ) {
-			creds.header.flags |= WIFI_CREDENTIALS_FLAG_5GHz;
-			++arg_idx;
-		}
+	if (creds.password_len > 0 && !secure_connection) {
+		shell_warn(sh, "Passphrase provided without security configuration\n");
 	}
 
-	if (arg_idx < argc) {
-		/* look for channel */
-		char *end;
-
-		creds.header.channel = strtol(argv[arg_idx], &end, 10);
-		if (*end == '\0') {
-			++arg_idx;
-		}
-	}
-
-	if (arg_idx < argc) {
-		/* look for favorite flag */
-		if (strncmp("favorite", argv[arg_idx], strlen("favorite")) == 0) {
-			creds.header.flags |= WIFI_CREDENTIALS_FLAG_FAVORITE;
-			++arg_idx;
-		}
-	}
-
-	if (arg_idx < argc) {
-		/* look for mfp_disabled flag */
-		if (strncmp("mfp_disabled", argv[arg_idx], strlen("mfp_disabled")) == 0) {
-			creds.header.flags |= WIFI_CREDENTIALS_FLAG_MFP_DISABLED;
-			++arg_idx;
-		} else if (strncmp("mfp_required", argv[arg_idx], strlen("mfp_required")) == 0) {
-			creds.header.flags |= WIFI_CREDENTIALS_FLAG_MFP_REQUIRED;
-			++arg_idx;
-		}
-	}
-
-	if (arg_idx < argc) {
-		/* look for timeout */
-		char *end;
-
-		creds.header.timeout = strtol(argv[arg_idx], &end, 10);
-		if (*end == '\0') {
-			++arg_idx;
-		}
-	}
-
-	if (arg_idx != argc) {
-		for (size_t i = arg_idx; i < argc; ++i) {
-			shell_warn(sh, "Unparsed arg: [%s]", argv[i]);
-		}
+	if (creds.header.ssid_len == 0) {
+		shell_error(sh, "SSID not provided\n");
+		shell_help(sh);
+		return -EINVAL;
 	}
 
 	return wifi_credentials_set_personal_struct(&creds);
-help:
-	shell_print(sh, "Usage: wifi_cred add \"network name\""
-			" {OPEN, WPA2-PSK, WPA2-PSK-SHA256, WPA3-SAE, WPA-PSK}"
-			" [psk/password]"
-			" [bssid]"
-			" [{2.4GHz, 5GHz}]"
-			" [channel]"
-			" [favorite]"
-			" [mfp_disabled|mfp_required]"
-			" [timeout]");
-	return -EINVAL;
 }
 
 static int cmd_delete_network(const struct shell *sh, size_t argc, char *argv[])
@@ -309,8 +311,35 @@ static int cmd_auto_connect(const struct shell *sh, size_t argc, char *argv[])
 
 SHELL_STATIC_SUBCMD_SET_CREATE(sub_wifi_cred,
 	SHELL_CMD_ARG(add, NULL,
-		      "Add network to storage.\n",
-		      cmd_add_network, 0, 0),
+		      "Add network to storage.\n"
+		      "<-s --ssid \"<SSID>\">: SSID.\n"
+		      "[-c --channel]: Channel that needs to be scanned for connection. 0:any channel.\n"
+		      "[-b, --band] 0: any band (2:2.4GHz, 5:5GHz, 6:6GHz]\n"
+		      "[-p, --passphrase]: Passphrase (valid only for secure SSIDs)\n"
+		      "[-k, --key-mgmt]: Key Management type (valid only for secure SSIDs)\n"
+		      "0:None, 1:WPA2-PSK, 2:WPA2-PSK-256, 3:SAE-HNP, 4:SAE-H2E, 5:SAE-AUTO, 6:WAPI,"
+		      " 7:EAP-TLS, 8:WEP, 9: WPA-PSK, 10: WPA-Auto-Personal, 11: DPP\n"
+		      "12: EAP-PEAP-MSCHAPv2, 13: EAP-PEAP-GTC, 14: EAP-TTLS-MSCHAPv2,\n"
+		      "15: EAP-PEAP-TLS, 20: SAE-EXT-KEY\n"
+		      "[-w, --ieee-80211w]: MFP (optional: needs security type to be specified)\n"
+		      ": 0:Disable, 1:Optional, 2:Required.\n"
+		      "[-m, --bssid]: MAC address of the AP (BSSID).\n"
+		      "[-t, --timeout]: Timeout for the connection attempt (in seconds).\n"
+		      "[-a, --anon-id]: Anonymous identity for enterprise mode.\n"
+		      "[-K, --key1-pwd for eap phase1 or --key2-pwd for eap phase2]:\n"
+		      "Private key passwd for enterprise mode. Default no password for private key.\n"
+		      "[-S, --wpa3-enterprise]: WPA3 enterprise mode:\n"
+		      "Default 0: Not WPA3 enterprise mode.\n"
+		      "1:Suite-b mode, 2:Suite-b-192-bit mode, 3:WPA3-enterprise-only mode.\n"
+		      "[-T, --TLS-cipher]: 0:TLS-NONE, 1:TLS-ECC-P384, 2:TLS-RSA-3K.\n"
+		      "[-V, --eap-version]: 0 or 1. Default 1: eap version 1.\n"
+		      "[-I, --eap-id1]: Client Identity. Default no eap identity.\n"
+		      "[-P, --eap-pwd1]: Client Password.\n"
+		      "Default no password for eap user.\n"
+		      "[-R, --ieee-80211r]: Use IEEE80211R fast BSS transition connect."
+		      "[-h, --help]: Print out the help for the add network command.\n",
+		      cmd_add_network,
+		      2, 12),
 	SHELL_CMD_ARG(delete, NULL,
 		      "Delete network from storage.\n",
 		      cmd_delete_network,

From 03986a42ccac5a905c63e2390545f1477050dbd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 20 Mar 2025 13:22:10 +0100
Subject: [PATCH 2794/2913] [nrf fromlist] drivers: adc: nrfx_saadc: Add
 validation of channel configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On nrf54h20 there are additional analog pins (AIN8+). When differential
mode is used they must not be mixed with AIN0-AIN7. Add build time
validation which detects if configuration is invalid.

Upstream PR #: 87405

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 drivers/adc/adc_nrfx_saadc.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index 22a839a5f35..5692f910cbb 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -719,6 +719,29 @@ static DEVICE_API(adc, adc_nrfx_driver_api) = {
 #endif
 };
 
+#ifdef NRF_SAADC_AIN8
+/* AIN8-AIN14 inputs are on 3v3 GPIO port and they cannot be mixed with other
+ * analog inputs (from 1v8 ports) in differential mode.
+ */
+#define CH_IS_3V3(val) (val >= NRF_SAADC_AIN8)
+
+#define CH_IS_DIFF(node) DT_PROP(node, zephyr_differential)
+
+#define CH_MIX_3V3_1V8_CHECK(node)					\
+	(!CH_IS_DIFF(node) ||						\
+	 !(CH_IS_3V3(DT_PROP_OR(node, zephyr_input_positive, 0)) ^	\
+	   CH_IS_3V3(DT_PROP_OR(node, zephyr_input_negative, 0))))
+#else
+#define CH_MIX_3V3_1V8_CHECK(node) true
+#endif
+
+#define VALIDATE_CHANNEL_CONFIG(node)					\
+	BUILD_ASSERT(CH_MIX_3V3_1V8_CHECK(node) == true,		\
+		     "1v8 inputs cannot be mixed with 3v3 inputs");
+
+/* Validate configuration of all channels. */
+#define VALIDATE_CHANNELS_CONFIG(inst) DT_FOREACH_CHILD(DT_DRV_INST(inst), VALIDATE_CHANNEL_CONFIG)
+
 /*
  * There is only one instance on supported SoCs, so inst is guaranteed
  * to be 0 if any instance is okay. (We use adc_0 above, so the driver
@@ -731,6 +754,7 @@ static DEVICE_API(adc, adc_nrfx_driver_api) = {
 #define SAADC_INIT(inst)						\
 	BUILD_ASSERT((inst) == 0,					\
 		     "multiple instances not supported");		\
+	VALIDATE_CHANNELS_CONFIG(inst)					\
 	PM_DEVICE_DT_INST_DEFINE(0, saadc_pm_hook, 1);			\
 	DEVICE_DT_INST_DEFINE(0,					\
 			    init_saadc,					\

From 97e4675b64e39a6cf4eb5a104c77614ff619e556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 20 Mar 2025 13:49:57 +0100
Subject: [PATCH 2795/2913] [nrf fromlist] samples: drivers: adc: adc_sequence:
 Do not overwrite vref_mv
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Sample is reading vref-mv property to get reference voltage and then if
reference source is set to ADC_REF_INTERNAL this value is overwritten.
If vref-mv property is provided then it should not be overwritten.

Upstream PR #: 87405

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 samples/drivers/adc/adc_sequence/src/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/drivers/adc/adc_sequence/src/main.c b/samples/drivers/adc/adc_sequence/src/main.c
index 60bde60650d..084dbf428f3 100644
--- a/samples/drivers/adc/adc_sequence/src/main.c
+++ b/samples/drivers/adc/adc_sequence/src/main.c
@@ -60,7 +60,7 @@ int main(void)
 			printf("Could not setup channel #%d (%d)\n", i, err);
 			return 0;
 		}
-		if (channel_cfgs[i].reference == ADC_REF_INTERNAL) {
+		if ((vrefs_mv[i] == 0) && (channel_cfgs[i].reference == ADC_REF_INTERNAL)) {
 			vrefs_mv[i] = adc_ref_internal(adc);
 		}
 	}

From 566a50b944351d6469241d6fdb91fc12a3ddc0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 20 Mar 2025 13:52:43 +0100
Subject: [PATCH 2796/2913] [nrf fromlist] samples: drivers: adc: adc_sequence:
 Fix nrf54h20dk configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

AIN9 source needs special handling (all from AIN8-AIN14). Conversion
result needs to be scaled up by 3.6 additionally to gain and reference
voltage. In order to achieve correct value in the sample vref-mv is
used as reference voltage instead of predefined internal reference
source.

Upstream PR #: 87405

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 .../adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuapp.overlay   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index bf53616d928..24cce679375 100644
--- a/samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -45,6 +45,7 @@
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,input-positive = <NRF_SAADC_AIN9>; /* P9.01 */
+		zephyr,vref-mv = <3686>; /* 3.6V * 1024 */
 		zephyr,resolution = <12>;
 		zephyr,oversampling = <8>;
 	};

From d4e9fac5aa8a86acdaf009e4a18ea5941099cc62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= <sebastian.glab@nordicsemi.no>
Date: Thu, 27 Mar 2025 08:11:16 +0100
Subject: [PATCH 2797/2913] [nrf fromtree] tests: drivers: i2c: i2c_target_api:
 Enable test on nRF54L20 cpuapp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add Overlay required to run the test on
nrf54l20pdk/nrf54l20/cpuapp.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit f2cf2662c94a0c63172d08fdc25f3f663aa83017)
---
 .../boards/nrf54l20pdk_nrf54l20_cpuapp.conf   |  1 +
 .../nrf54l20pdk_nrf54l20_cpuapp.overlay       | 68 +++++++++++++++++++
 .../drivers/i2c/i2c_target_api/testcase.yaml  |  1 +
 3 files changed, 70 insertions(+)
 create mode 100644 tests/drivers/i2c/i2c_target_api/boards/nrf54l20pdk_nrf54l20_cpuapp.conf
 create mode 100644 tests/drivers/i2c/i2c_target_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay

diff --git a/tests/drivers/i2c/i2c_target_api/boards/nrf54l20pdk_nrf54l20_cpuapp.conf b/tests/drivers/i2c/i2c_target_api/boards/nrf54l20pdk_nrf54l20_cpuapp.conf
new file mode 100644
index 00000000000..2510d6673c1
--- /dev/null
+++ b/tests/drivers/i2c/i2c_target_api/boards/nrf54l20pdk_nrf54l20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_I2C_NRFX_TWIS_BUF_SIZE=256
diff --git a/tests/drivers/i2c/i2c_target_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/i2c/i2c_target_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 00000000000..f04022cf8f3
--- /dev/null
+++ b/tests/drivers/i2c/i2c_target_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,68 @@
+/*
+ * SDA = P1.8 and P1.9
+ * SCL = P1.14 and P1.15
+ */
+
+&pinctrl {
+	i2c21_default: i2c21_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 8)>,
+				<NRF_PSEL(TWIS_SCL, 1, 14)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c21_sleep: i2c21_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 8)>,
+				<NRF_PSEL(TWIS_SCL, 1, 14)>;
+			low-power-enable;
+		};
+	};
+
+	i2c22_default: i2c22_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 9)>,
+				<NRF_PSEL(TWIS_SCL, 1, 15)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c22_sleep: i2c22_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 9)>,
+				<NRF_PSEL(TWIS_SCL, 1, 15)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c21 {
+	pinctrl-0 = <&i2c21_default>;
+	pinctrl-1 = <&i2c21_sleep>;
+	pinctrl-names = "default", "sleep";
+	zephyr,concat-buf-size = <256>;
+	status = "okay";
+
+	eeprom1: eeprom@56 {
+		compatible = "zephyr,i2c-target-eeprom";
+		reg = <0x56>;
+		address-width = <8>;
+		size = <256>;
+	};
+};
+
+&i2c22 {
+	compatible = "nordic,nrf-twis";
+	pinctrl-0 = <&i2c22_default>;
+	pinctrl-1 = <&i2c22_sleep>;
+	pinctrl-names = "default", "sleep";
+	status = "okay";
+
+	eeprom0: eeprom@54 {
+		compatible = "zephyr,i2c-target-eeprom";
+		reg = <0x54>;
+		address-width = <8>;
+		size = <256>;
+	};
+};
diff --git a/tests/drivers/i2c/i2c_target_api/testcase.yaml b/tests/drivers/i2c/i2c_target_api/testcase.yaml
index 588b7f7a43d..4237b60b2dc 100644
--- a/tests/drivers/i2c/i2c_target_api/testcase.yaml
+++ b/tests/drivers/i2c/i2c_target_api/testcase.yaml
@@ -57,5 +57,6 @@ tests:
       - nrf5340dk/nrf5340/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
     integration_platforms:
       - max32690evkit/max32690/m4

From 8975456ff8a79c05e8b9db49528da3fab2a12352 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 25 Feb 2025 11:18:58 +0100
Subject: [PATCH 2798/2913] [nrf fromlist] dts: nordic: Add channels property
 for local DPPI

Add number of channels implemented by the local DPPIC instances.

Upstream PR #: 85853

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 dts/bindings/misc/nordic,nrf-dppic-local.yaml | 6 ++++++
 dts/common/nordic/nrf54h20.dtsi               | 1 +
 dts/common/nordic/nrf9280.dtsi                | 1 +
 3 files changed, 8 insertions(+)

diff --git a/dts/bindings/misc/nordic,nrf-dppic-local.yaml b/dts/bindings/misc/nordic,nrf-dppic-local.yaml
index 41029bb3062..a96b5a994c9 100644
--- a/dts/bindings/misc/nordic,nrf-dppic-local.yaml
+++ b/dts/bindings/misc/nordic,nrf-dppic-local.yaml
@@ -11,3 +11,9 @@ description: |
 compatible: "nordic,nrf-dppic-local"
 
 include: ["nordic,nrf-dppic.yaml", "nordic,nrf-dppic-links.yaml"]
+
+properties:
+  channels:
+    type: int
+    required: true
+    description: Number of channels implemented by the DPPIC instance.
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 1fe345e33f2..dadd8c7ef54 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -359,6 +359,7 @@
 			dppic020: dppic@22000 {
 				compatible = "nordic,nrf-dppic-local";
 				reg = <0x22000 0x1000>;
+				channels = <32>;
 				status = "disabled";
 			};
 
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index 7166f9a4f6b..ae3a59c6c0c 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -250,6 +250,7 @@
 			dppic020: dppic@22000 {
 				compatible = "nordic,nrf-dppic-local";
 				reg = <0x22000 0x1000>;
+				channels = <32>;
 				status = "disabled";
 			};
 

From cfc35c9a76a80229f49bd18807da1eb40e862c37 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Mon, 17 Feb 2025 09:00:25 +0100
Subject: [PATCH 2799/2913] [nrf fromlist] modules: hal_nordic: nrfx: Use
 owned-channels property for DPPIC

The `owned-channels` property specifies which channels are assigned to
a given target. Additionally, the `source-channels` or `sink-channels`
property defines channels that can be used to forward an event outside
the DPPI domain, otherwise they can only be used within it.

Upstream PR #: 85853

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 modules/hal_nordic/nrfx/nrfx_zephyr_utils.h | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules/hal_nordic/nrfx/nrfx_zephyr_utils.h b/modules/hal_nordic/nrfx/nrfx_zephyr_utils.h
index e1fa4d4c321..a7f05ca372d 100644
--- a/modules/hal_nordic/nrfx/nrfx_zephyr_utils.h
+++ b/modules/hal_nordic/nrfx/nrfx_zephyr_utils.h
@@ -34,7 +34,7 @@
  * definitions required by the interconnect/apb layer:
  * - NRFX_DPPI_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
  * - NRFX_DPPI_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
- * - NRFX_DPPI_PUB_OR_SUB_MASK(inst_num)
+ * - NRFX_DPPI_OWNED_MASK(inst_num)
  * - NRFX_DPPI_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num)
  * - NRFX_INTERCONNECT_APB_GLOBAL_DPPI_DEFINE
  * - NRFX_INTERCONNECT_APB_LOCAL_DPPI_DEFINE
@@ -42,6 +42,14 @@
  */
 #if	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_global) || \
 	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_local)
+
+/* Channels masks generation. */
+#define NRFX_CONFIG_DPPI_MASK_DT(node_id) \
+	COND_CODE_1(DT_NODE_HAS_PROP(node_id, owned_channels), \
+		(NRFX_CONFIG_MASK_DT(node_id, owned_channels)), \
+		(COND_CODE_1(DT_NODE_HAS_COMPAT(node_id, nordic_nrf_dppic_local), \
+			(BIT64_MASK(DT_PROP(node_id, channels))), (0))))
+
 /* Source (publish) channels masks generation. */
 #define NRFX_DPPI_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
 	NRFX_CONFIG_MASK_DT(DT_NODELABEL(_CONCAT(dppic, inst_num)), source_channels)
@@ -50,9 +58,9 @@
 #define NRFX_DPPI_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
 	NRFX_CONFIG_MASK_DT(DT_NODELABEL(_CONCAT(dppic, inst_num)), sink_channels)
 
-#define NRFX_DPPI_PUB_OR_SUB_MASK(inst_num) \
-	UTIL_OR(DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), source_channels), \
-		DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), sink_channels))
+#define NRFX_DPPI_OWNED_MASK(inst_num) \
+	UTIL_OR(DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), owned_channels), \
+		DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), channels))
 
 /* Variables names generation. */
 #define NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(node_id) _CONCAT(_CONCAT(m_, node_id), _channels)
@@ -62,9 +70,7 @@
 /* Variables entries generation. */
 #define NRFX_CONFIG_DPPI_CHANNELS_ENTRY(node_id) \
 	static nrfx_atomic_t NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(node_id) \
-		__attribute__((used)) = \
-		NRFX_CONFIG_MASK_DT(node_id, source_channels) | \
-		NRFX_CONFIG_MASK_DT(node_id, sink_channels);
+		__attribute__((used)) = (uint32_t)NRFX_CONFIG_DPPI_MASK_DT(node_id);
 #define NRFX_INTERCONNECT_APB_GLOBAL_DPPI_DEFINE \
 	DT_FOREACH_STATUS_OKAY(nordic_nrf_dppic_global, NRFX_CONFIG_DPPI_CHANNELS_ENTRY)
 #define NRFX_INTERCONNECT_APB_LOCAL_DPPI_DEFINE \

From 0e70699f9d6aa3335a6943463f54dab09bed0f79 Mon Sep 17 00:00:00 2001
From: Sven Ginka <s.ginka@sensry.de>
Date: Tue, 10 Dec 2024 15:29:07 +0100
Subject: [PATCH 2800/2913] [nrf fromtree] soc: sensry: add pinctrl

Add pin control support for the sy1xx soc.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 804e3f649762f56cd565729623c38aa3652dcb7e)
Signed-off-by: Sven Ginka <s.ginka@sensry.de>
---
 drivers/pinctrl/CMakeLists.txt                |  1 +
 drivers/pinctrl/Kconfig                       |  1 +
 drivers/pinctrl/Kconfig.sy1xx                 |  9 +++
 drivers/pinctrl/pinctrl_sy1xx.c               | 59 +++++++++++++++
 .../pinctrl/sensry,sy1xx-pinctrl.yaml         | 74 +++++++++++++++++++
 .../dt-bindings/pinctrl/sy1xx-pinctrl.h       | 70 ++++++++++++++++++
 soc/sensry/ganymed/sy1xx/common/pinctrl_soc.h | 72 ++++++++++++++++++
 7 files changed, 286 insertions(+)
 create mode 100644 drivers/pinctrl/Kconfig.sy1xx
 create mode 100644 drivers/pinctrl/pinctrl_sy1xx.c
 create mode 100644 dts/bindings/pinctrl/sensry,sy1xx-pinctrl.yaml
 create mode 100644 include/zephyr/dt-bindings/pinctrl/sy1xx-pinctrl.h
 create mode 100644 soc/sensry/ganymed/sy1xx/common/pinctrl_soc.h

diff --git a/drivers/pinctrl/CMakeLists.txt b/drivers/pinctrl/CMakeLists.txt
index d2834504eb2..0a27a2d4786 100644
--- a/drivers/pinctrl/CMakeLists.txt
+++ b/drivers/pinctrl/CMakeLists.txt
@@ -42,5 +42,6 @@ zephyr_library_sources_ifdef(CONFIG_PINCTRL_MAX32 pinctrl_max32.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_IMX_SCMI pinctrl_imx_scmi.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_MCHP_MEC5 pinctrl_mchp_mec5.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_WCH_AFIO pinctrl_wch_afio.c)
+zephyr_library_sources_ifdef(CONFIG_PINCTRL_SY1XX pinctrl_sy1xx.c)
 
 add_subdirectory(renesas)
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index d8621e7ad9e..d5872387090 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -69,6 +69,7 @@ source "drivers/pinctrl/Kconfig.zynqmp"
 source "drivers/pinctrl/Kconfig.max32"
 source "drivers/pinctrl/Kconfig.mec5"
 source "drivers/pinctrl/Kconfig.wch_afio"
+source "drivers/pinctrl/Kconfig.sy1xx"
 
 rsource "renesas/Kconfig"
 
diff --git a/drivers/pinctrl/Kconfig.sy1xx b/drivers/pinctrl/Kconfig.sy1xx
new file mode 100644
index 00000000000..857920bf9d8
--- /dev/null
+++ b/drivers/pinctrl/Kconfig.sy1xx
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2024 sensry.io
+
+config PINCTRL_SY1XX
+	bool "Sensry sy1xx pin controller driver"
+	default y
+	depends on DT_HAS_SENSRY_SY1XX_PINCTRL_ENABLED
+	help
+	  Sensry pin controller driver is used on sy1xx SoC series
diff --git a/drivers/pinctrl/pinctrl_sy1xx.c b/drivers/pinctrl/pinctrl_sy1xx.c
new file mode 100644
index 00000000000..1343ba2c987
--- /dev/null
+++ b/drivers/pinctrl/pinctrl_sy1xx.c
@@ -0,0 +1,59 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright (c) 2024 sensry.io
+ */
+
+#define DT_DRV_COMPAT sensry_sy1xx_pinctrl
+
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+
+#include <zephyr/arch/common/sys_io.h>
+
+static uint32_t pinctrl0_base_addr = DT_REG_ADDR(DT_NODELABEL(pinctrl));
+static uint32_t pinctrl0_base_mask = DT_REG_SIZE(DT_NODELABEL(pinctrl)) - 1;
+
+/**
+ * @brief Configure a pin.
+ *
+ * @param pin The pin to configure.
+ */
+static int pinctrl_configure_pin(const pinctrl_soc_pin_t *pin)
+{
+	uint32_t addr = (pin->addr & pinctrl0_base_mask) | pinctrl0_base_addr;
+
+	switch (pin->iro) {
+	case 0:
+	case 8:
+	case 16:
+	case 24:
+		/* fall through */
+		break;
+	default:
+		/* invalid inter address offset */
+		return -EINVAL;
+	}
+
+	uint32_t reg = ~(0xFFUL << pin->iro) & sys_read32(addr);
+
+	reg |= FIELD_PREP((0xFFUL << pin->iro), pin->cfg);
+	sys_write32(reg, addr);
+
+	return 0;
+}
+
+int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, uintptr_t reg)
+{
+	ARG_UNUSED(reg);
+
+	for (uint8_t i = 0U; i < pin_cnt; i++) {
+		int ret = pinctrl_configure_pin(pins++);
+
+		if (ret < 0) {
+			return ret;
+		}
+	}
+
+	return 0;
+}
diff --git a/dts/bindings/pinctrl/sensry,sy1xx-pinctrl.yaml b/dts/bindings/pinctrl/sensry,sy1xx-pinctrl.yaml
new file mode 100644
index 00000000000..776f561f4c4
--- /dev/null
+++ b/dts/bindings/pinctrl/sensry,sy1xx-pinctrl.yaml
@@ -0,0 +1,74 @@
+# Copyright (c) 2024 sensry.io
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  The sensry SY1xx pin controller is a single node responsible for controlling
+  pin configuration, such as pull-up, pull-down, tri-state, ...
+
+  The node has the 'pinctrl0' node label set in your SoC's devicetree,
+  so you can modify it like this:
+
+    &pinctrl0 {
+            /* your modifications go here */
+    };
+
+  For example:
+    &pinctrl0 {
+
+      /* UART0 */
+      uart0_tx: uart0_tx {
+        pinmux = <SY1XX_UART0_PAD_CFG0 SY1XX_PAD(0)>;
+      };
+
+      uart0_rx: uart0_rx {
+        pinmux = <SY1XX_UART0_PAD_CFG0 SY1XX_PAD(1)>;
+        input-enable;
+      };
+    }
+
+  Then define the uart:
+    &uart0 {
+      pinctrl-0 = <&uart0_tx &uart0_rx>;
+      pinctrl-names = "default";
+    };
+
+  Every pin configuration will be configured in a 32bit register. The configuration
+  itself is 8bit wide. So we have a number of 4 pin configurations per 32bit register.
+
+  The pinmux describes the registers address and the offset [0, 8, 16, 24] for
+  the individual configuration.
+
+  Allowed modifiers for each pin are:
+  - bias-high-impedance
+  - bias-pull-down
+  - bias-pull-up
+  - input-enable
+  - input-schmitt-enable
+
+compatible: "sensry,sy1xx-pinctrl"
+
+include: base.yaml
+
+properties:
+  reg:
+    required: true
+
+child-binding:
+  description: Each child node defines the configuration of a particular state.
+
+  include:
+    - name: pincfg-node.yaml
+      property-allowlist:
+        - bias-high-impedance
+        - bias-pull-down
+        - bias-pull-up
+        - input-enable
+        - input-schmitt-enable
+
+  properties:
+    pinmux:
+      required: true
+      type: array
+      description: |
+        Pin mux selection. See the SOC level pinctrl header
+        for a defined list of these options.
diff --git a/include/zephyr/dt-bindings/pinctrl/sy1xx-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/sy1xx-pinctrl.h
new file mode 100644
index 00000000000..deee135bd60
--- /dev/null
+++ b/include/zephyr/dt-bindings/pinctrl/sy1xx-pinctrl.h
@@ -0,0 +1,70 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright (c) 2024 sensry.io
+ */
+
+#ifndef _ZEPHYR_DT_BINDINGS_PINCTRL_SY1XX_PINCTRL_
+#define _ZEPHYR_DT_BINDINGS_PINCTRL_SY1XX_PINCTRL_
+
+#define SY1XX_PAD(pad) (pad * 8)
+
+#define SY1XX_UART0_PAD_CFG0 0x0020
+#define SY1XX_UART1_PAD_CFG0 0x0024
+#define SY1XX_UART2_PAD_CFG0 0x0028
+
+#define SY1XX_SPI0_PAD_CFG0 0x002c
+#define SY1XX_SPI0_PAD_CFG1 0x0030
+
+#define SY1XX_SPI1_PAD_CFG0 0x0034
+#define SY1XX_SPI1_PAD_CFG1 0x0038
+
+#define SY1XX_SPI2_PAD_CFG0 0x003c
+#define SY1XX_SPI2_PAD_CFG1 0x0040
+
+#define SY1XX_SPI3_PAD_CFG0 0x0044
+#define SY1XX_SPI3_PAD_CFG1 0x0048
+
+#define SY1XX_SPI4_PAD_CFG0 0x004c
+#define SY1XX_SPI4_PAD_CFG1 0x0050
+
+#define SY1XX_SPI5_PAD_CFG0 0x0054
+#define SY1XX_SPI5_PAD_CFG1 0x0058
+
+#define SY1XX_SPI6_PAD_CFG0 0x005c
+#define SY1XX_SPI6_PAD_CFG1 0x0060
+
+#define SY1XX_I2C0_PAD_CFG0 0x0100
+#define SY1XX_I2C1_PAD_CFG0 0x0104
+#define SY1XX_I2C2_PAD_CFG0 0x0108
+#define SY1XX_I2C3_PAD_CFG0 0x010c
+
+#define SY1XX_GPIO0_PAD_CFG0 0x0110
+#define SY1XX_GPIO0_PAD_CFG1 0x0114
+#define SY1XX_GPIO0_PAD_CFG2 0x0118
+#define SY1XX_GPIO0_PAD_CFG3 0x011c
+#define SY1XX_GPIO0_PAD_CFG4 0x0120
+#define SY1XX_GPIO0_PAD_CFG5 0x0124
+#define SY1XX_GPIO0_PAD_CFG6 0x0128
+#define SY1XX_GPIO0_PAD_CFG7 0x012c
+
+#define SY1XX_RGMII0_PAD_CFG0 0x0130
+#define SY1XX_RGMII0_PAD_CFG1 0x0134
+#define SY1XX_RGMII0_PAD_CFG2 0x0138
+#define SY1XX_RGMII0_PAD_CFG3 0x013c
+
+#define SY1XX_CAN0_PAD_CFG0 0x0140
+
+#define SY1XX_I2S0_PAD_CFG0 0x0144
+#define SY1XX_I2S1_PAD_CFG0 0x0148
+#define SY1XX_I2S2_PAD_CFG0 0x014c
+#define SY1XX_I2S3_PAD_CFG0 0x0150
+
+#define SY1XX_HBUS0_PAD_CFG0 0x0154
+#define SY1XX_HBUS0_PAD_CFG1 0x0158
+#define SY1XX_HBUS0_PAD_CFG2 0x015c
+#define SY1XX_HBUS0_PAD_CFG3 0x0160
+
+#define SY1XX_QSPI0_PAD_CFG0 0x0164
+#define SY1XX_QSPI0_PAD_CFG1 0x0168
+
+#endif /* _ZEPHYR_DT_BINDINGS_PINCTRL_SY1XX_PINCTRL_ */
diff --git a/soc/sensry/ganymed/sy1xx/common/pinctrl_soc.h b/soc/sensry/ganymed/sy1xx/common/pinctrl_soc.h
new file mode 100644
index 00000000000..5a124fa0783
--- /dev/null
+++ b/soc/sensry/ganymed/sy1xx/common/pinctrl_soc.h
@@ -0,0 +1,72 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright (c) 2024 sensry.io
+ */
+
+#ifndef GANYMED_SY1XX_PINCTRL_SOC_H
+#define GANYMED_SY1XX_PINCTRL_SOC_H
+
+#include <stdint.h>
+
+#include <zephyr/devicetree.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define SY1XX_SCHMITT_ENABLE   1U
+#define SY1XX_PULL_UP_ENABLE   1U
+#define SY1XX_PULL_DOWN_ENABLE 1U
+#define SY1XX_TRISTATE_ENABLE  1U
+#define SY1XX_OUTPUT_ENABLE    1U
+
+#define SY1XX_PAD_SCHMITT_OFFS   7
+#define SY1XX_PAD_PULL_UP_OFFS   5
+#define SY1XX_PAD_PULL_DOWN_OFFS 4
+#define SY1XX_PAD_DRIVE_OFFS     2
+#define SY1XX_PAD_TRISTATE_OFFS  1
+#define SY1XX_PAD_DIR_OFFS       0
+
+/** Type for SY1XX pin. */
+typedef struct {
+	/** address of pin config register */
+	uint32_t addr;
+	/** intra register offset (8bit cfg per pin) */
+	uint32_t iro;
+	/** config for pin (8bit), describes pull-up/down, ... */
+	uint32_t cfg;
+} pinctrl_soc_pin_t;
+
+#define Z_PINCTRL_CFG(node)                                                                        \
+	(                                                                                          \
+                                                                                                   \
+		(SY1XX_SCHMITT_ENABLE * DT_PROP(node, input_schmitt_enable))                       \
+			<< SY1XX_PAD_SCHMITT_OFFS |                                                \
+		(SY1XX_PULL_UP_ENABLE * DT_PROP(node, bias_pull_up)) << SY1XX_PAD_PULL_UP_OFFS |   \
+		(SY1XX_PULL_DOWN_ENABLE * DT_PROP(node, bias_pull_down))                           \
+			<< SY1XX_PAD_PULL_DOWN_OFFS |                                              \
+		(SY1XX_TRISTATE_ENABLE * DT_PROP(node, bias_high_impedance))                       \
+			<< SY1XX_PAD_TRISTATE_OFFS |                                               \
+		(SY1XX_OUTPUT_ENABLE & (1 - DT_PROP(node, input_enable))) << SY1XX_PAD_DIR_OFFS    \
+                                                                                                   \
+	)
+
+#define Z_PINCTRL_STATE_PIN_INIT(node, pr, idx)                                                    \
+	{                                                                                          \
+                                                                                                   \
+		.addr = DT_PROP_BY_IDX(DT_PHANDLE_BY_IDX(node, pr, idx), pinmux, 0),               \
+		.iro = DT_PROP_BY_IDX(DT_PHANDLE_BY_IDX(node, pr, idx), pinmux, 1),                \
+		.cfg = Z_PINCTRL_CFG(DT_PHANDLE_BY_IDX(node, pr, idx))                             \
+                                                                                                   \
+	},
+
+#define Z_PINCTRL_STATE_PINS_INIT(node_id, prop)                                                   \
+	{                                                                                          \
+		DT_FOREACH_PROP_ELEM(node_id, prop, Z_PINCTRL_STATE_PIN_INIT)                      \
+	}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GANYMED_SY1XX_PINCTRL_SOC_H */

From f69c046c0f53e8b5891204ed9fe24c345bb3a55e Mon Sep 17 00:00:00 2001
From: Sven Ginka <s.ginka@sensry.de>
Date: Tue, 10 Dec 2024 16:15:21 +0100
Subject: [PATCH 2801/2913] [nrf fromtree] dts: sensry: add pinctrl

Add pin ctrl to the sy1xx device tree.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit fb53ea024a2fd7a7c49c799aca67b79eeb670c8e)
Signed-off-by: Sven Ginka <s.ginka@sensry.de>
---
 dts/riscv/sensry/ganymed-sy1xx.dtsi | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/dts/riscv/sensry/ganymed-sy1xx.dtsi b/dts/riscv/sensry/ganymed-sy1xx.dtsi
index ad2df617b28..5e652c56a15 100644
--- a/dts/riscv/sensry/ganymed-sy1xx.dtsi
+++ b/dts/riscv/sensry/ganymed-sy1xx.dtsi
@@ -38,18 +38,18 @@
 
 	soc {
 		#address-cells = <1>;
-		#size-cells = <0>;
+		#size-cells = <1>;
 
 		event0: interrupt-controller@1000 {
 			compatible = "sensry,sy1xx-event-unit";
-			reg = <0x1000>;
+			reg = <0x1000 0x40>;
 			interrupt-controller;
 			#interrupt-cells = <1>;
 		};
 
 		systick: timer@1a10b040 {
 			compatible = "sensry,sy1xx-sys-timer";
-			reg = <0x1a10b040>;
+			reg = <0x1a10b040 0x04>;
 			interrupt-parent = <&event0>;
 			interrupts = <10 0>;
 			ticks_us = <1000>;
@@ -57,7 +57,7 @@
 
 		timer1: timer@1a10b044 {
 			compatible = "sensry,sy1xx-sys-timer";
-			reg = <0x1a10b044>;
+			reg = <0x1a10b044 0x04>;
 			interrupt-parent = <&event0>;
 			interrupts = <11 0>;
 			ticks_us = <1000>;
@@ -65,7 +65,7 @@
 
 		uart0: uart@1a102000 {
 			compatible = "sensry,sy1xx-uart";
-			reg = <0x1a102000>;
+			reg = <0x1a102000 0x80>;
 			instance = <0>;
 			current-speed = <1000000>;
 			status = "okay";
@@ -73,7 +73,7 @@
 
 		uart1: uart@1a102080 {
 			compatible = "sensry,sy1xx-uart";
-			reg = <0x1a102080>;
+			reg = <0x1a102080 0x80>;
 			instance = <1>;
 			current-speed = <1000000>;
 			status = "okay";
@@ -81,11 +81,17 @@
 
 		uart2: uart@1a102100 {
 			compatible = "sensry,sy1xx-uart";
-			reg = <0x1a102100>;
+			reg = <0x1a102100 0x80>;
 			instance = <2>;
 			current-speed = <1000000>;
 			status = "okay";
 		};
 
+		pinctrl: pinctrl@1a104000 {
+			compatible = "sensry,sy1xx-pinctrl";
+			reg = <0x1a104000 0x1000>;
+			status = "okay";
+		};
+
 	};
 };

From f1f4dbc173dc26306b1d94b50904c22f0237ee6b Mon Sep 17 00:00:00 2001
From: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
Date: Fri, 22 Nov 2024 16:54:13 +0800
Subject: [PATCH 2802/2913] [nrf fromtree] soc: realrek: ec: Add Realtek
 RTS5912 SoC

Add support for Realtek RTS5912 embedded controller (EC).

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit b83501e6cc8932950c4bd4803ad6f40dda72faf1)
Signed-off-by: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
---
 soc/realtek/ec/CMakeLists.txt                 |   7 +
 soc/realtek/ec/Kconfig                        |  34 ++++
 soc/realtek/ec/Kconfig.defconfig              |  10 ++
 soc/realtek/ec/Kconfig.soc                    |  13 ++
 soc/realtek/ec/common/CMakeLists.txt          |  18 ++
 .../ec/common/rts5912_imgtool/img_gen.py      | 161 ++++++++++++++++++
 soc/realtek/ec/rts5912/CMakeLists.txt         |  15 ++
 soc/realtek/ec/rts5912/Kconfig                |  25 +++
 .../ec/rts5912/Kconfig.defconfig.rts5912      |  24 +++
 .../ec/rts5912/Kconfig.defconfig.series       |  13 ++
 soc/realtek/ec/rts5912/Kconfig.soc            |  20 +++
 soc/realtek/ec/rts5912/device_power.c         |  25 +++
 soc/realtek/ec/rts5912/device_power.h         |  14 ++
 soc/realtek/ec/rts5912/power.c                |  88 ++++++++++
 soc/realtek/ec/rts5912/soc.c                  |  28 +++
 soc/realtek/ec/rts5912/soc.h                  |  13 ++
 soc/realtek/ec/soc.yml                        |   2 +
 17 files changed, 510 insertions(+)
 create mode 100644 soc/realtek/ec/CMakeLists.txt
 create mode 100644 soc/realtek/ec/Kconfig
 create mode 100644 soc/realtek/ec/Kconfig.defconfig
 create mode 100644 soc/realtek/ec/Kconfig.soc
 create mode 100644 soc/realtek/ec/common/CMakeLists.txt
 create mode 100644 soc/realtek/ec/common/rts5912_imgtool/img_gen.py
 create mode 100644 soc/realtek/ec/rts5912/CMakeLists.txt
 create mode 100644 soc/realtek/ec/rts5912/Kconfig
 create mode 100644 soc/realtek/ec/rts5912/Kconfig.defconfig.rts5912
 create mode 100644 soc/realtek/ec/rts5912/Kconfig.defconfig.series
 create mode 100644 soc/realtek/ec/rts5912/Kconfig.soc
 create mode 100644 soc/realtek/ec/rts5912/device_power.c
 create mode 100644 soc/realtek/ec/rts5912/device_power.h
 create mode 100644 soc/realtek/ec/rts5912/power.c
 create mode 100644 soc/realtek/ec/rts5912/soc.c
 create mode 100644 soc/realtek/ec/rts5912/soc.h
 create mode 100644 soc/realtek/ec/soc.yml

diff --git a/soc/realtek/ec/CMakeLists.txt b/soc/realtek/ec/CMakeLists.txt
new file mode 100644
index 00000000000..9953afd14f4
--- /dev/null
+++ b/soc/realtek/ec/CMakeLists.txt
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+add_subdirectory(${SOC_SERIES})
+add_subdirectory(common)
diff --git a/soc/realtek/ec/Kconfig b/soc/realtek/ec/Kconfig
new file mode 100644
index 00000000000..a759cb44c37
--- /dev/null
+++ b/soc/realtek/ec/Kconfig
@@ -0,0 +1,34 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+if SOC_FAMILY_REALTEK_EC
+
+menuconfig REALTEK_RTS5912_BOOTROM_HEADER
+	bool "Create BOOTROM header for RTS5912"
+	help
+	  The RTS5912 BOOTROM needs the information about boot up progress.
+	  Invoke the 'rts5912_imgtool' to generates the RTS5912 bootrom header.
+
+if REALTEK_RTS5912_BOOTROM_HEADER
+
+config REALTEK_HEADER_CHIP
+	string
+	default "RTS5912" if SOC_RTS5912
+
+DT_CHOSEN_Z_FLASH := zephyr,flash
+FLASH_BASE := $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH))
+
+config REALTEK_RTS5912_BOOTROM_HEADER_LOAD_ADDRESS
+	string "Set the address for BOOTROM"
+	default "$(FLASH_BASE) - 0x20"
+	help
+	  This address will be used by the RTS5912 BOOTROM to decide where firmware image start.
+
+endif # REALTEK_RTS5912_BOOTROM_HEADER
+
+# Select SoC Part No. and configuration options
+rsource "*/Kconfig"
+
+endif # SOC_FAMILY_REALTEK_EC
diff --git a/soc/realtek/ec/Kconfig.defconfig b/soc/realtek/ec/Kconfig.defconfig
new file mode 100644
index 00000000000..effe686675a
--- /dev/null
+++ b/soc/realtek/ec/Kconfig.defconfig
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+if SOC_FAMILY_REALTEK_EC
+
+rsource "*/Kconfig.defconfig.series"
+
+endif # SOC_FAMILY_REALTEK_EC
diff --git a/soc/realtek/ec/Kconfig.soc b/soc/realtek/ec/Kconfig.soc
new file mode 100644
index 00000000000..fd19689cb07
--- /dev/null
+++ b/soc/realtek/ec/Kconfig.soc
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+config SOC_FAMILY_REALTEK_EC
+	bool
+
+config SOC_FAMILY
+	string
+	default "realtek_ec" if SOC_FAMILY_REALTEK_EC
+
+rsource "*/Kconfig.soc"
diff --git a/soc/realtek/ec/common/CMakeLists.txt b/soc/realtek/ec/common/CMakeLists.txt
new file mode 100644
index 00000000000..de4a266ee39
--- /dev/null
+++ b/soc/realtek/ec/common/CMakeLists.txt
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+zephyr_include_directories(.)
+
+if (DEFINED CONFIG_REALTEK_RTS5912_BOOTROM_HEADER)
+  math(EXPR adjustment "${CONFIG_REALTEK_RTS5912_BOOTROM_HEADER_LOAD_ADDRESS}" OUTPUT_FORMAT DECIMAL)
+  set(RTS5912_BIN_NAME ${CONFIG_KERNEL_BIN_NAME}.rts5912.bin)
+  set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+    COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/soc/realtek/ec/common/rts5912_imgtool/img_gen.py
+    -L ${adjustment}
+    -I ${KERNEL_BIN_NAME}
+    -O ${RTS5912_BIN_NAME}
+    -V
+  )
+endif()
diff --git a/soc/realtek/ec/common/rts5912_imgtool/img_gen.py b/soc/realtek/ec/common/rts5912_imgtool/img_gen.py
new file mode 100644
index 00000000000..53fcefb916e
--- /dev/null
+++ b/soc/realtek/ec/common/rts5912_imgtool/img_gen.py
@@ -0,0 +1,161 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+# Author: Dylan Hsieh <dylan.hsieh@realtek.com>
+
+"""
+The RTS5912 specific image header shows the bootROM how to
+load the image from flash to internal SRAM, this script obtains
+the header to original BIN and output a new BIN file.
+"""
+
+import argparse
+import os
+import struct
+
+IMAGE_MAGIC = 0x524C544B  # ASCII 'RLTK'
+IMAGE_HDR_SIZE = 32
+RAM_LOAD = 0x0000020
+FREQ_50M = 0
+FREQ_25M = 1
+FREQ_12P5M = 2
+FREQ_6P25M = 3
+NORMAL_read = "0x03"
+DUAL_read = "0x3B"
+QUAD_read = "0x6B"
+
+
+def parse_args():
+    """
+    Parsing the arguments
+    """
+    parser = argparse.ArgumentParser(allow_abbrev=False)
+
+    parser.add_argument(
+        "-L",
+        "--load-addr",
+        type=int,
+        dest="load_addr",
+        help="Load address for image when it should run from RAM.",
+    )
+
+    parser.add_argument(
+        "-I",
+        "--input",
+        type=str,
+        dest="original_bin",
+        default="zephyr.bin",
+        help="Input bin file path",
+    )
+
+    parser.add_argument(
+        "-O",
+        "--output",
+        type=str,
+        dest="signed_bin",
+        default="zephyr.rts5912.bin",
+        help="Output bin file path",
+    )
+
+    parser.add_argument(
+        "-F",
+        "--spi-freq",
+        type=int,
+        dest="spi_freq",
+        choices=[FREQ_50M, FREQ_25M, FREQ_12P5M, FREQ_6P25M],
+        default=FREQ_6P25M,
+        help="Specify the frequency of SPI I/F.",
+    )
+
+    parser.add_argument(
+        "-R",
+        "--spi-rdcmd",
+        type=str,
+        dest="spi_rdcmd",
+        choices=[NORMAL_read, DUAL_read, QUAD_read],
+        default=NORMAL_read,
+        help="Specify the command for flash read.",
+    )
+
+    parser.add_argument("-V", "--verbose", action="count", default=0, help="Verbose Output")
+
+    ret_args = parser.parse_args()
+    return ret_args
+
+
+def img_gen(load_addr, spi_freq, spi_rdcmd, original_bin, signed_bin):
+    """
+    To obtain the RTS5912 image header and output a new BIN file
+    """
+    img_size = os.path.getsize(original_bin)
+    payload = bytearray(0)
+    img_size = os.path.getsize(original_bin)
+
+    fmt = (
+        "<"
+        +
+        # type ImageHdr struct {
+        "I"  # Magic    uint32
+        + "I"  # LoadAddr uint32
+        + "H"  # HdrSz    uint16
+        + "H"  # reserved uint16
+        + "I"  # ImgSz    uint32
+        + "I"  # Flags    uint32
+        + "I"  # reserved uint32
+        + "I"  # reserved uint32
+        + "B"  # SpiFmt   uint8
+        + "B"  # SpiRdCmd uint8
+        + "H"  # reserved uint16
+    )  # }
+
+    header = struct.pack(
+        fmt,
+        IMAGE_MAGIC,
+        load_addr,
+        IMAGE_HDR_SIZE,
+        0,
+        img_size,
+        RAM_LOAD,
+        0,
+        0,
+        0 + (int(spi_freq) << 2),
+        int(spi_rdcmd, 0),
+        0,
+    )
+
+    payload[: len(header)] = header
+
+    with open(signed_bin, "wb") as signed:
+        signed.write(payload)
+        signed.flush()
+        signed.close()
+
+    with open(signed_bin, "ab") as signed, open(original_bin, "rb") as original:
+        signed.write(original.read())
+        signed.flush()
+        signed.close()
+        original.close()
+
+
+def main():
+    """
+    Image generateor tool entry point
+    """
+    args = parse_args()
+    if args.verbose:
+        print(f"  Input = {args.original_bin}")
+        print(f"  Output = {args.signed_bin}")
+        print(f"  Load Address = {hex(args.load_addr)}")
+        print(f"  SPI Frequency = {args.spi_freq}")
+        print(f"  SPI Read Command = {args.spi_rdcmd}")
+    img_gen(
+        args.load_addr,
+        args.spi_freq,
+        args.spi_rdcmd,
+        args.original_bin,
+        args.signed_bin,
+    )
+
+
+if __name__ == "__main__":
+    main()
diff --git a/soc/realtek/ec/rts5912/CMakeLists.txt b/soc/realtek/ec/rts5912/CMakeLists.txt
new file mode 100644
index 00000000000..335d40578ba
--- /dev/null
+++ b/soc/realtek/ec/rts5912/CMakeLists.txt
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+zephyr_include_directories(${ZEPHYR_BASE}/drivers)
+zephyr_sources(soc.c)
+zephyr_include_directories(.)
+
+zephyr_sources_ifdef(CONFIG_PM
+  device_power.c
+  power.c
+  )
+
+set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/realtek/ec/rts5912/Kconfig b/soc/realtek/ec/rts5912/Kconfig
new file mode 100644
index 00000000000..aebac7b3d00
--- /dev/null
+++ b/soc/realtek/ec/rts5912/Kconfig
@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+config SOC_SERIES_RTS5912
+	select ARM
+	select CPU_CORTEX_M33
+	select SYS_CLOCK_EXISTS
+	select DYNAMIC_INTERRUPTS
+	select SOC_EARLY_INIT_HOOK
+
+if SOC_SERIES_RTS5912
+
+config RTS5912_ON_ENTER_CPU_IDLE_HOOK
+	bool "CPU idle hook enable"
+	default y
+	imply ARM_ON_ENTER_CPU_IDLE_HOOK
+	help
+	  Enables a hook (z_arm_on_enter_cpu_idle()) that is called when
+	  the CPU is made idle (by k_cpu_idle() or k_cpu_atomic_idle()).
+	  If needed, this hook can be used to prevent the CPU from actually
+	  entering sleep by skipping the WFE/WFI instruction.
+
+endif # SOC_SERIES_RTS5912
diff --git a/soc/realtek/ec/rts5912/Kconfig.defconfig.rts5912 b/soc/realtek/ec/rts5912/Kconfig.defconfig.rts5912
new file mode 100644
index 00000000000..5ff22637497
--- /dev/null
+++ b/soc/realtek/ec/rts5912/Kconfig.defconfig.rts5912
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+if SOC_RTS5912
+
+if REALTEK_RTS5912_RTMR
+
+config PM
+	default y
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default 32768
+
+config SYS_CLOCK_TICKS_PER_SEC
+	default 32768
+
+config ARCH_HAS_CUSTOM_BUSY_WAIT
+	default y
+
+endif # REALTEK_RTS5912_RTMR
+
+endif # SOC_RTS5912
diff --git a/soc/realtek/ec/rts5912/Kconfig.defconfig.series b/soc/realtek/ec/rts5912/Kconfig.defconfig.series
new file mode 100644
index 00000000000..429dbd9c788
--- /dev/null
+++ b/soc/realtek/ec/rts5912/Kconfig.defconfig.series
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+if SOC_SERIES_RTS5912
+
+config NUM_IRQS
+	default 240
+
+rsource "Kconfig.defconfig.rts5912"
+
+endif # SOC_SERIES_RTS5912
diff --git a/soc/realtek/ec/rts5912/Kconfig.soc b/soc/realtek/ec/rts5912/Kconfig.soc
new file mode 100644
index 00000000000..cf86fe3bcb7
--- /dev/null
+++ b/soc/realtek/ec/rts5912/Kconfig.soc
@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+config SOC_SERIES_RTS5912
+	bool
+	select SOC_FAMILY_REALTEK_EC
+	help
+	  Enable support for REALTEK EC MCU series
+
+config SOC_SERIES
+	default "rts5912" if SOC_SERIES_RTS5912
+
+config SOC_RTS5912
+	bool
+	select SOC_SERIES_RTS5912
+
+config SOC
+	default "rts5912" if SOC_RTS5912
diff --git a/soc/realtek/ec/rts5912/device_power.c b/soc/realtek/ec/rts5912/device_power.c
new file mode 100644
index 00000000000..b346cafd156
--- /dev/null
+++ b/soc/realtek/ec/rts5912/device_power.c
@@ -0,0 +1,25 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
+ */
+
+#include <zephyr/logging/log.h>
+#include <zephyr/kernel.h>
+
+#include <reg/reg_system.h>
+#include "device_power.h"
+
+void before_rts5912_sleep(void)
+{
+	__disable_irq();
+	__set_BASEPRI(0);
+	__ISB();
+}
+
+void after_rts5912_sleep(void)
+{
+	__enable_irq();
+	__ISB();
+}
diff --git a/soc/realtek/ec/rts5912/device_power.h b/soc/realtek/ec/rts5912/device_power.h
new file mode 100644
index 00000000000..6a2817fa79f
--- /dev/null
+++ b/soc/realtek/ec/rts5912/device_power.h
@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
+ */
+
+#ifndef ZEPHYR_SOC_REALTEK_RTS5912_DEVICE_POWER_H
+#define ZEPHYR_SOC_REALTEK_RTS5912_DEVICE_POWER_H
+
+void before_rts5912_sleep(void);
+void after_rts5912_sleep(void);
+
+#endif /* ZEPHYR_SOC_REALTEK_RTS5912_DEVICE_POWER_H */
diff --git a/soc/realtek/ec/rts5912/power.c b/soc/realtek/ec/rts5912/power.c
new file mode 100644
index 00000000000..d0702bc4ada
--- /dev/null
+++ b/soc/realtek/ec/rts5912/power.c
@@ -0,0 +1,88 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/pm/pm.h>
+
+#include <reg/reg_system.h>
+#include "device_power.h"
+
+#define RTS5912_SCCON_REG_BASE ((SYSTEM_Type *)(DT_REG_ADDR(DT_NODELABEL(sccon))))
+
+static void realtek_WFI(void)
+{
+	__DSB();
+	__WFI();
+}
+
+static void rts5912_light_sleep(void)
+{
+	SYSTEM_Type *sys_reg = RTS5912_SCCON_REG_BASE;
+
+	before_rts5912_sleep();
+
+	sys_reg->SLPCTRL &= ~SYSTEM_SLPCTRL_SLPMDSEL_Msk;
+
+	realtek_WFI();
+
+	after_rts5912_sleep();
+}
+
+static void rts5912_heavy_sleep(void)
+{
+	SYSTEM_Type *sys_reg = RTS5912_SCCON_REG_BASE;
+	int main_clk_src_record = sys_reg->SYSCLK;
+	int PLL_en_record = sys_reg->PLLCTRL;
+
+	before_rts5912_sleep();
+
+	if ((main_clk_src_record & SYSTEM_SYSCLK_SRC_Msk) == 0x0) {
+		if ((PLL_en_record & SYSTEM_PLLCTRL_EN_Msk) == 0x0) {
+			sys_reg->PLLCTRL |= SYSTEM_PLLCTRL_EN_Msk; /* Force to enable PLL */
+			while ((sys_reg->PLLCTRL & SYSTEM_PLLCTRL_RDY_Msk) == 0x00) {
+				; /* Wait until PLL is ready */
+			}
+		}
+		sys_reg->SYSCLK |= SYSTEM_SYSCLK_SRC_Msk; /* Switch system clock to PLL */
+	}
+
+	sys_reg->SLPCTRL |= SYSTEM_SLPCTRL_SLPMDSEL_Msk; /* Heavy Sleep mode */
+
+	realtek_WFI();
+
+	if ((main_clk_src_record & SYSTEM_SYSCLK_SRC_Msk) == 0) {
+		sys_reg->SYSCLK &= ~SYSTEM_SYSCLK_SRC_Msk; /* Return system clock to 25M */
+		if ((PLL_en_record & SYSTEM_PLLCTRL_EN_Msk) == 0x0) {
+			sys_reg->PLLCTRL &= ~SYSTEM_PLLCTRL_EN_Msk; /* Disable PLL */
+		}
+	}
+
+	after_rts5912_sleep();
+}
+
+void pm_state_set(enum pm_state state, uint8_t substate_id)
+{
+
+	switch (state) {
+	case PM_STATE_SUSPEND_TO_IDLE:
+		rts5912_light_sleep();
+		break;
+	case PM_STATE_SUSPEND_TO_RAM:
+		rts5912_heavy_sleep();
+		break;
+	default:
+		break;
+	}
+}
+
+void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
+{
+	ARG_UNUSED(state);
+	ARG_UNUSED(substate_id);
+
+	irq_unlock(0);
+}
diff --git a/soc/realtek/ec/rts5912/soc.c b/soc/realtek/ec/rts5912/soc.c
new file mode 100644
index 00000000000..adb28d75864
--- /dev/null
+++ b/soc/realtek/ec/rts5912/soc.c
@@ -0,0 +1,28 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Lin Yu-Cheng <lin_yu_cheng@realtek.com> / Titan Chen
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+
+#if defined(CONFIG_RTS5912_ON_ENTER_CPU_IDLE_HOOK)
+bool z_arm_on_enter_cpu_idle(void)
+{
+	/* Returning false prevent device goes to sleep mode */
+	return false;
+}
+#endif
+
+/**
+ * @brief Perform basic hardware initialization at boot.
+ *
+ * This needs to be run from the very beginning.
+ */
+void soc_early_init_hook(void)
+{
+	/* Apply device related preinit configuration */
+}
diff --git a/soc/realtek/ec/rts5912/soc.h b/soc/realtek/ec/rts5912/soc.h
new file mode 100644
index 00000000000..3824ae900fb
--- /dev/null
+++ b/soc/realtek/ec/rts5912/soc.h
@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
+ */
+
+#ifndef SOC_REALTEK_RTS5912_H_
+#define SOC_REALTEK_RTS5912_H_
+
+#include <cmsis_core_m_defaults.h>
+
+#endif /* SOC_REALTEK_RTS5912_H_ */
diff --git a/soc/realtek/ec/soc.yml b/soc/realtek/ec/soc.yml
new file mode 100644
index 00000000000..928ceedb635
--- /dev/null
+++ b/soc/realtek/ec/soc.yml
@@ -0,0 +1,2 @@
+socs:
+- name: rts5912

From eb345e34fa88f74bda81f26fb42da5cf39934e5f Mon Sep 17 00:00:00 2001
From: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
Date: Fri, 22 Nov 2024 16:57:25 +0800
Subject: [PATCH 2803/2913] [nrf fromtree] dts: realtek: Add RTS5912 device
 tree files

Add Realtek RTS5912 chip and driver device tree files.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 041bf2e4c6324b87989586d214f6168036204939)
Signed-off-by: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
---
 dts/arm/realtek/ec/rts5912.dtsi | 62 +++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 dts/arm/realtek/ec/rts5912.dtsi

diff --git a/dts/arm/realtek/ec/rts5912.dtsi b/dts/arm/realtek/ec/rts5912.dtsi
new file mode 100644
index 00000000000..9167e0e8514
--- /dev/null
+++ b/dts/arm/realtek/ec/rts5912.dtsi
@@ -0,0 +1,62 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ *
+ */
+
+#include <arm/armv8-m.dtsi>
+#include <zephyr/dt-bindings/clock/rts5912_clock.h>
+#include <zephyr/dt-bindings/gpio/realtek-gpio.h>
+
+/ {
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			compatible = "arm,cortex-m33f";
+			reg = <0>;
+			cpu-power-states = <&idle &suspend_to_ram>;
+		};
+
+		power-states {
+			idle: idle {
+				compatible = "zephyr,power-state";
+				power-state-name = "suspend-to-idle";
+				min-residency-us = <100000>;
+			};
+
+			suspend_to_ram: suspend_to_ram {
+				compatible = "zephyr,power-state";
+				power-state-name = "suspend-to-ram";
+				min-residency-us = <250000>;
+			};
+		};
+	};
+
+	flash0: flash@20000400 {
+		reg = <0x20000400 0x4FC00>;
+	};
+
+	sram0: memory@20050000 {
+		compatible = "mmio-sram";
+		reg = <0x20050000 0x8000>;
+	};
+
+	soc {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "simple-bus";
+		interrupt-parent = <&nvic>;
+		ranges;
+	};
+};
+
+&nvic {
+	arm,num-irq-priority-bits = <3>;
+};
+
+&systick {
+	status = "disabled";
+};

From 7a0cde3da586e3224ed727944867b524f58bb700 Mon Sep 17 00:00:00 2001
From: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
Date: Fri, 22 Nov 2024 17:01:05 +0800
Subject: [PATCH 2804/2913] [nrf fromtree] driver: clock_control: Add clock
 controller initial version of RTS5912.

Add clock controller driver for Realtek RTS5912.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 6ea7560ce26514727d89563540559dc289050e61)
Signed-off-by: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
---
 drivers/clock_control/CMakeLists.txt          |   1 +
 drivers/clock_control/Kconfig                 |   2 +
 drivers/clock_control/Kconfig.rts5912         |  10 +
 .../clock_control_rts5912_sccon.c             | 247 +++++++++++++
 dts/arm/realtek/ec/rts5912.dtsi               |  22 ++
 dts/bindings/clock/realtek,rts5912-sccon.yaml |  21 ++
 .../clock_control/clock_control_rts5912.h     |  20 +
 .../zephyr/dt-bindings/clock/rts5912_clock.h  | 343 ++++++++++++++++++
 soc/realtek/ec/rts5912/reg/reg_system.h       | 335 +++++++++++++++++
 9 files changed, 1001 insertions(+)
 create mode 100644 drivers/clock_control/Kconfig.rts5912
 create mode 100644 drivers/clock_control/clock_control_rts5912_sccon.c
 create mode 100644 dts/bindings/clock/realtek,rts5912-sccon.yaml
 create mode 100644 include/zephyr/drivers/clock_control/clock_control_rts5912.h
 create mode 100644 include/zephyr/dt-bindings/clock/rts5912_clock.h
 create mode 100644 soc/realtek/ec/rts5912/reg/reg_system.h

diff --git a/drivers/clock_control/CMakeLists.txt b/drivers/clock_control/CMakeLists.txt
index 057f4463247..8c451149a58 100644
--- a/drivers/clock_control/CMakeLists.txt
+++ b/drivers/clock_control/CMakeLists.txt
@@ -38,6 +38,7 @@ zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_AMBIQ               clock_cont
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_PWM                 clock_control_pwm.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RPI_PICO            clock_control_rpi_pico.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL   clock_control_nrf2_global_hsfll.c)
+zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RTS5912_SCCON       clock_control_rts5912_sccon.c)
 
 if(CONFIG_CLOCK_CONTROL_NRF2)
   zephyr_library_sources(clock_control_nrf2_common.c)
diff --git a/drivers/clock_control/Kconfig b/drivers/clock_control/Kconfig
index 040dab163c2..eec9b11c188 100644
--- a/drivers/clock_control/Kconfig
+++ b/drivers/clock_control/Kconfig
@@ -56,6 +56,8 @@ source "drivers/clock_control/Kconfig.npcx"
 
 source "drivers/clock_control/Kconfig.rv32m1"
 
+source "drivers/clock_control/Kconfig.rts5912"
+
 source "drivers/clock_control/Kconfig.esp32"
 
 source "drivers/clock_control/Kconfig.litex"
diff --git a/drivers/clock_control/Kconfig.rts5912 b/drivers/clock_control/Kconfig.rts5912
new file mode 100644
index 00000000000..ec5547cb91d
--- /dev/null
+++ b/drivers/clock_control/Kconfig.rts5912
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+config CLOCK_CONTROL_RTS5912_SCCON
+	bool "Realtek RTS5912 system clock controller driver"
+	default y if DT_HAS_REALTEK_RTS5912_SCCON_ENABLED
+	help
+	  Enable support for RTS5912 system clock controller driver
diff --git a/drivers/clock_control/clock_control_rts5912_sccon.c b/drivers/clock_control/clock_control_rts5912_sccon.c
new file mode 100644
index 00000000000..686c47a4904
--- /dev/null
+++ b/drivers/clock_control/clock_control_rts5912_sccon.c
@@ -0,0 +1,247 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
+ */
+
+#define DT_DRV_COMPAT realtek_rts5912_sccon
+
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/clock_control/clock_control_rts5912.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/dt-bindings/clock/rts5912_clock.h>
+
+#include <reg/reg_system.h>
+
+LOG_MODULE_REGISTER(sccon, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
+
+#define RC25M_FREQ DT_PROP(DT_INST_CLOCKS_CTLR_BY_NAME(0, rc25m), clock_frequency)
+#define PLL_FREQ   DT_PROP(DT_INST_CLOCKS_CTLR_BY_NAME(0, pll), clock_frequency)
+
+struct rts5912_sccon_config {
+	uint32_t reg_base;
+	uint8_t sysclk_src;
+	uint8_t sysclk_div;
+};
+
+static int rts5912_periph_clock_control(const struct device *dev, clock_control_subsys_t sub_system,
+					bool on_off)
+{
+	const struct rts5912_sccon_config *const config = dev->config;
+	struct rts5912_sccon_subsys *subsys = (struct rts5912_sccon_subsys *)sub_system;
+
+	SYSTEM_Type *sys_reg = (SYSTEM_Type *)config->reg_base;
+
+	uint32_t clk_grp = subsys->clk_grp;
+	uint32_t clk_idx = subsys->clk_idx;
+
+	uint32_t module_idx;
+
+	switch (clk_grp) {
+	case RTS5912_SCCON_I2C:
+		module_idx = (clk_idx - I2C0_CLKPWR) >> 2;
+
+		if (on_off) {
+			sys_reg->I2CCLK |= BIT(clk_idx);
+		} else {
+			sys_reg->I2CCLK &= ~BIT(clk_idx);
+		}
+
+		LOG_DBG("Turn I2C%d clock <%s>", module_idx, on_off ? "ON" : "OFF");
+		break;
+	case RTS5912_SCCON_UART:
+		if (on_off) {
+			sys_reg->UARTCLK = BIT(clk_idx);
+		} else {
+			sys_reg->UARTCLK &= ~BIT(clk_idx);
+		}
+
+		LOG_DBG("Turn UART0 clock <%s>", on_off ? "ON" : "OFF");
+		break;
+	case RTS5912_SCCON_ADC:
+		if (on_off) {
+			sys_reg->ADCCLK = BIT(clk_idx);
+		} else {
+			sys_reg->ADCCLK &= ~BIT(clk_idx);
+		}
+
+		LOG_DBG("Turn ADC clock <%s>", on_off ? "ON" : "OFF");
+		break;
+	case RTS5912_SCCON_PERIPH_GRP0:
+		if (on_off) {
+			sys_reg->PERICLKPWR0 |= BIT(clk_idx);
+		} else {
+			sys_reg->PERICLKPWR0 &= ~BIT(clk_idx);
+		}
+
+		LOG_DBG("Turn GRP0-%d clock <%s>", clk_idx, on_off ? "ON" : "OFF");
+		break;
+	case RTS5912_SCCON_PERIPH_GRP1:
+		if (on_off) {
+			sys_reg->PERICLKPWR1 |= BIT(clk_idx);
+		} else {
+			sys_reg->PERICLKPWR1 &= ~BIT(clk_idx);
+		}
+
+		LOG_DBG("Turn GRP1-%d clock <%s>", clk_idx, on_off ? "ON" : "OFF");
+		break;
+	case RTS5912_SCCON_PERIPH_GRP2:
+		if (on_off) {
+			sys_reg->PERICLKPWR2 |= BIT(clk_idx);
+		} else {
+			sys_reg->PERICLKPWR2 &= ~BIT(clk_idx);
+		}
+
+		LOG_DBG("Turn GRP2-%d clock <%s>", clk_idx, on_off ? "ON" : "OFF");
+		break;
+	case RTS5912_SCCON_SYS:
+		LOG_ERR("Not support peripheral group #%d-%d", clk_grp, clk_idx);
+		return -ENOTSUP;
+	default:
+		LOG_ERR("Unknown peripheral group #%d", clk_grp);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int rts5912_clock_control_on(const struct device *dev, clock_control_subsys_t sub_system)
+{
+	return rts5912_periph_clock_control(dev, sub_system, true);
+}
+
+static int rts5912_clock_control_off(const struct device *dev, clock_control_subsys_t sub_system)
+{
+	return rts5912_periph_clock_control(dev, sub_system, false);
+}
+
+static int rts5912_clock_control_get_rate(const struct device *dev,
+					  clock_control_subsys_t sub_system, uint32_t *rate)
+{
+	const struct rts5912_sccon_config *const config = dev->config;
+	struct rts5912_sccon_subsys *subsys = (struct rts5912_sccon_subsys *)sub_system;
+
+	SYSTEM_Type *sys_reg = (SYSTEM_Type *)config->reg_base;
+
+	uint32_t clk_grp = subsys->clk_grp;
+	uint32_t clk_idx = subsys->clk_idx;
+	uint32_t module_idx;
+
+	uint32_t offset;
+	uint32_t src, divide, freq = 0;
+
+	switch (clk_grp) {
+	case RTS5912_SCCON_I2C:
+		module_idx = (clk_idx - I2C0_CLKPWR) >> 2;
+
+		offset = (SYSTEM_I2CCLK_I2C1CLKSRC_Pos - SYSTEM_I2CCLK_I2C0CLKSRC_Pos) * module_idx;
+		src = ((sys_reg->I2CCLK >> offset) & SYSTEM_I2CCLK_I2C0CLKSRC_Msk) ? PLL_FREQ
+										   : RC25M_FREQ;
+
+		offset = SYSTEM_I2CCLK_I2C0CLKDIV_Pos;
+		offset += (SYSTEM_I2CCLK_I2C1CLKDIV_Pos - SYSTEM_I2CCLK_I2C0CLKDIV_Pos) *
+			   module_idx;
+		divide = (sys_reg->I2CCLK >> offset) & SYSTEM_I2CCLK_I2C0CLKDIV_Msk;
+
+		freq = src >> divide;
+
+		LOG_DBG("I2C%d: src<%s> divide<%ld> freq<%d>", module_idx,
+			(src == PLL_FREQ) ? "PLL" : "RC25M", BIT(divide), freq);
+		break;
+	case RTS5912_SCCON_UART:
+		src = (sys_reg->UARTCLK & SYSTEM_UARTCLK_SRC_Msk) ? PLL_FREQ : RC25M_FREQ;
+		divide = (sys_reg->UARTCLK & SYSTEM_UARTCLK_DIV_Msk) >> SYSTEM_UARTCLK_DIV_Pos;
+		freq = src >> divide;
+
+		LOG_DBG("UART0: src<%s> divide<%ld> freq<%d>", (src == PLL_FREQ) ? "PLL" : "RC25M",
+			BIT(divide), freq);
+		break;
+	case RTS5912_SCCON_ADC:
+		src = (sys_reg->ADCCLK & SYSTEM_ADCCLK_SRC_Msk) ? RC25M_FREQ : PLL_FREQ;
+		divide = (sys_reg->ADCCLK & SYSTEM_ADCCLK_DIV_Msk) >> SYSTEM_ADCCLK_DIV_Pos;
+
+		switch (divide) {
+		case 0:
+			__fallthrough;
+		case 1:
+			__fallthrough;
+		case 2:
+			__fallthrough;
+		case 3:
+			divide += 1;
+			freq = src / divide;
+			break;
+		case 4:
+			freq = src / 6;
+			divide = 6;
+			break;
+		case 5:
+			freq = src / 8;
+			divide = 8;
+			break;
+		case 6:
+			freq = src / 12;
+			divide = 12;
+			break;
+		case 7:
+			freq = src / 16;
+			divide = 16;
+			break;
+		default:
+			return -EINVAL;
+		}
+
+		LOG_DBG("ADC0: src<%s> divide<%d> freq<%d>", (src == PLL_FREQ) ? "PLL" : "RC25M",
+			divide, freq);
+		break;
+	case RTS5912_SCCON_SYS:
+		src = (sys_reg->SYSCLK & SYSTEM_SYSCLK_SRC_Msk) ? PLL_FREQ : RC25M_FREQ;
+		divide = (sys_reg->SYSCLK & SYSTEM_SYSCLK_DIV_Msk) ? 0x01ul : 0x00ul;
+		freq = src >> divide;
+
+		LOG_DBG("System Clock: src<%s> divide<%d> freq<%d>",
+			(src == PLL_FREQ) ? "PLL" : "RC25M", divide, freq);
+		break;
+	case RTS5912_SCCON_PERIPH_GRP0:
+		__fallthrough;
+	case RTS5912_SCCON_PERIPH_GRP1:
+		__fallthrough;
+	case RTS5912_SCCON_PERIPH_GRP2:
+		LOG_ERR("Not support peripheral group #%d-%d", clk_grp, clk_idx);
+		return -ENOTSUP;
+	default:
+		LOG_ERR("Unknown peripheral group #%d", clk_grp);
+		return -EINVAL;
+	}
+
+	*rate = freq;
+	return 0;
+}
+
+static DEVICE_API(clock_control, rts5912_clock_control_api) = {
+	.on = rts5912_clock_control_on,
+	.off = rts5912_clock_control_off,
+	.get_rate = rts5912_clock_control_get_rate,
+};
+
+static int rts5912_clock_control_init(const struct device *dev)
+{
+	const struct rts5912_sccon_config *const config = dev->config;
+	SYSTEM_Type *sys_reg = (SYSTEM_Type *)config->reg_base;
+
+	/* Setup system clock */
+	sys_reg->SYSCLK = (config->sysclk_src << SYSTEM_SYSCLK_SRC_Pos) |
+			   (config->sysclk_div << SYSTEM_SYSCLK_DIV_Pos);
+
+	return 0;
+}
+
+const struct rts5912_sccon_config rts5912_sccon_config = {
+	.reg_base = DT_INST_REG_ADDR_BY_IDX(0, 0),
+	.sysclk_src = 1,
+	.sysclk_div = 0,
+};
+
+DEVICE_DT_INST_DEFINE(0, &rts5912_clock_control_init, NULL, NULL, &rts5912_sccon_config,
+		      PRE_KERNEL_1, CONFIG_CLOCK_CONTROL_INIT_PRIORITY, &rts5912_clock_control_api);
diff --git a/dts/arm/realtek/ec/rts5912.dtsi b/dts/arm/realtek/ec/rts5912.dtsi
index 9167e0e8514..78115d654fb 100644
--- a/dts/arm/realtek/ec/rts5912.dtsi
+++ b/dts/arm/realtek/ec/rts5912.dtsi
@@ -44,12 +44,34 @@
 		reg = <0x20050000 0x8000>;
 	};
 
+	clocks {
+		rc25m: rc25m {
+			compatible = "fixed-clock";
+			clock-frequency = <25000000>;
+			#clock-cells = <0>;
+		};
+
+		pll: pll {
+			compatible = "fixed-clock";
+			clock-frequency = <100000000>;
+			#clock-cells = <0>;
+		};
+	};
+
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "simple-bus";
 		interrupt-parent = <&nvic>;
 		ranges;
+
+		sccon: clock-controller@40020000 {
+			compatible = "realtek,rts5912-sccon";
+			reg = <0x40020000 0xf0>;
+			#clock-cells = <2>;
+			clocks = <&rc25m>, <&pll>;
+			clock-names = "rc25m", "pll";
+		};
 	};
 };
 
diff --git a/dts/bindings/clock/realtek,rts5912-sccon.yaml b/dts/bindings/clock/realtek,rts5912-sccon.yaml
new file mode 100644
index 00000000000..594c0095235
--- /dev/null
+++ b/dts/bindings/clock/realtek,rts5912-sccon.yaml
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+description: Realtek RTS5912 System Clock Controller (SCCON)
+
+compatible: "realtek,rts5912-sccon"
+
+include: [clock-controller.yaml, base.yaml]
+
+properties:
+  reg:
+    required: true
+
+  "#clock-cells":
+    const: 2
+
+clock-cells:
+  - clk-grp
+  - clk-idx
diff --git a/include/zephyr/drivers/clock_control/clock_control_rts5912.h b/include/zephyr/drivers/clock_control/clock_control_rts5912.h
new file mode 100644
index 00000000000..381502bf7c1
--- /dev/null
+++ b/include/zephyr/drivers/clock_control/clock_control_rts5912.h
@@ -0,0 +1,20 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
+ */
+
+#include <stdint.h>
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_RTS5912_H_
+#define ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_RTS5912_H_
+
+struct rts5912_sccon_subsys {
+	uint32_t clk_grp;
+	uint32_t clk_idx;
+	uint32_t clk_src;
+	uint32_t clk_div;
+};
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_RTS591X_H_ */
diff --git a/include/zephyr/dt-bindings/clock/rts5912_clock.h b/include/zephyr/dt-bindings/clock/rts5912_clock.h
new file mode 100644
index 00000000000..ef754602dd6
--- /dev/null
+++ b/include/zephyr/dt-bindings/clock/rts5912_clock.h
@@ -0,0 +1,343 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_RTS5912_CLOCK_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_RTS5912_CLOCK_H_
+
+/* ====================================================================================== */
+/* =====================================  I2CCLK  ======================================= */
+#define I2CCLK_I2C0CLKPWR_Pos         (0)          /*!< I2C0CLKPWR (Bit 0)                 */
+#define I2CCLK_I2C0CLKPWR_Msk         (0x1)        /*!< I2C0CLKPWR (Bitfield-Mask: 0x01)   */
+#define I2CCLK_I2C0CLKSRC_Pos         (1)          /*!< I2C0CLKSRC (Bit 1)                 */
+#define I2CCLK_I2C0CLKSRC_Msk         (0x2)        /*!< I2C0CLKSRC (Bitfield-Mask: 0x01)   */
+#define I2CCLK_I2C0CLKDIV_Pos         (2)          /*!< I2C0CLKDIV (Bit 2)                 */
+#define I2CCLK_I2C0CLKDIV_Msk         (0xc)        /*!< I2C0CLKDIV (Bitfield-Mask: 0x03)   */
+#define I2CCLK_I2C1CLKPWR_Pos         (4)          /*!< I2C1CLKPWR (Bit 4)                 */
+#define I2CCLK_I2C1CLKPWR_Msk         (0x10)       /*!< I2C1CLKPWR (Bitfield-Mask: 0x01)   */
+#define I2CCLK_I2C1CLKSRC_Pos         (5)          /*!< I2C1CLKSRC (Bit 5)                 */
+#define I2CCLK_I2C1CLKSRC_Msk         (0x20)       /*!< I2C1CLKSRC (Bitfield-Mask: 0x01)   */
+#define I2CCLK_I2C1CLKDIV_Pos         (6)          /*!< I2C1CLKDIV (Bit 6)                 */
+#define I2CCLK_I2C1CLKDIV_Msk         (0xc0)       /*!< I2C1CLKDIV (Bitfield-Mask: 0x03)   */
+#define I2CCLK_I2C2CLKPWR_Pos         (8)          /*!< I2C2CLKPWR (Bit 8)                 */
+#define I2CCLK_I2C2CLKPWR_Msk         (0x100)      /*!< I2C2CLKPWR (Bitfield-Mask: 0x01)   */
+#define I2CCLK_I2C2CLKSRC_Pos         (9)          /*!< I2C2CLKSRC (Bit 9)                 */
+#define I2CCLK_I2C2CLKSRC_Msk         (0x200)      /*!< I2C2CLKSRC (Bitfield-Mask: 0x01)   */
+#define I2CCLK_I2C2CLKDIV_Pos         (10)         /*!< I2C2CLKDIV (Bit 10)                */
+#define I2CCLK_I2C2CLKDIV_Msk         (0xc00)      /*!< I2C2CLKDIV (Bitfield-Mask: 0x03)   */
+#define I2CCLK_I2C3CLKPWR_Pos         (12)         /*!< I2C3CLKPWR (Bit 12)                */
+#define I2CCLK_I2C3CLKPWR_Msk         (0x1000)     /*!< I2C3CLKPWR (Bitfield-Mask: 0x01)   */
+#define I2CCLK_I2C3CLKSRC_Pos         (13)         /*!< I2C3CLKSRC (Bit 13)                */
+#define I2CCLK_I2C3CLKSRC_Msk         (0x2000)     /*!< I2C3CLKSRC (Bitfield-Mask: 0x01)   */
+#define I2CCLK_I2C3CLKDIV_Pos         (14)         /*!< I2C3CLKDIV (Bit 14)                */
+#define I2CCLK_I2C3CLKDIV_Msk         (0xc000)     /*!< I2C3CLKDIV (Bitfield-Mask: 0x03)   */
+#define I2CCLK_I2C4CLKPWR_Pos         (16)         /*!< I2C4CLKPWR (Bit 16)                */
+#define I2CCLK_I2C4CLKPWR_Msk         (0x10000)    /*!< I2C4CLKPWR (Bitfield-Mask: 0x01)   */
+#define I2CCLK_I2C4CLKSRC_Pos         (17)         /*!< I2C4CLKSRC (Bit 17)                */
+#define I2CCLK_I2C4CLKSRC_Msk         (0x20000)    /*!< I2C4CLKSRC (Bitfield-Mask: 0x01)   */
+#define I2CCLK_I2C4CLKDIV_Pos         (18)         /*!< I2C4CLKDIV (Bit 18)                */
+#define I2CCLK_I2C4CLKDIV_Msk         (0xc0000)    /*!< I2C4CLKDIV (Bitfield-Mask: 0x03)   */
+#define I2CCLK_I2C5CLKPWR_Pos         (20)         /*!< I2C5CLKPWR (Bit 20)                */
+#define I2CCLK_I2C5CLKPWR_Msk         (0x100000)   /*!< I2C5CLKPWR (Bitfield-Mask: 0x01)   */
+#define I2CCLK_I2C5CLKSRC_Pos         (21)         /*!< I2C5CLKSRC (Bit 21)                */
+#define I2CCLK_I2C5CLKSRC_Msk         (0x200000)   /*!< I2C5CLKSRC (Bitfield-Mask: 0x01)   */
+#define I2CCLK_I2C5CLKDIV_Pos         (22)         /*!< I2C5CLKDIV (Bit 22)                */
+#define I2CCLK_I2C5CLKDIV_Msk         (0xc00000)   /*!< I2C5CLKDIV (Bitfield-Mask: 0x03)   */
+#define I2CCLK_I2C6CLKPWR_Pos         (24)         /*!< I2C6CLKPWR (Bit 24)                */
+#define I2CCLK_I2C6CLKPWR_Msk         (0x1000000)  /*!< I2C6CLKPWR (Bitfield-Mask: 0x01)   */
+#define I2CCLK_I2C6CLKSRC_Pos         (25)         /*!< I2C6CLKSRC (Bit 25)                */
+#define I2CCLK_I2C6CLKSRC_Msk         (0x2000000)  /*!< I2C6CLKSRC (Bitfield-Mask: 0x01)   */
+#define I2CCLK_I2C6CLKDIV_Pos         (26)         /*!< I2C6CLKDIV (Bit 26)                */
+#define I2CCLK_I2C6CLKDIV_Msk         (0xc000000)  /*!< I2C6CLKDIV (Bitfield-Mask: 0x03)   */
+#define I2CCLK_I2C7CLKPWR_Pos         (28)         /*!< I2C7CLKPWR (Bit 28)                */
+#define I2CCLK_I2C7CLKPWR_Msk         (0x10000000) /*!< I2C7CLKPWR (Bitfield-Mask: 0x01)   */
+#define I2CCLK_I2C7CLKSRC_Pos         (29)         /*!< I2C7CLKSRC (Bit 29)                */
+#define I2CCLK_I2C7CLKSRC_Msk         (0x20000000) /*!< I2C7CLKSRC (Bitfield-Mask: 0x01)   */
+#define I2CCLK_I2C7CLKDIV_Pos         (30)         /*!< I2C7CLKDIV (Bit 30)                */
+#define I2CCLK_I2C7CLKDIV_Msk         (0xc0000000) /*!< I2C7CLKDIV (Bitfield-Mask: 0x03)   */
+/* ===================================  PERICLKPWR0  ==================================== */
+#define PERICLKPWR0_GPIOCLKPWR_Pos    (0)          /*!< GPIOCLKPWR (Bit 0)                 */
+#define PERICLKPWR0_GPIOCLKPWR_Msk    (0x1)        /*!< GPIOCLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR0_TACHO0CLKPWR_Pos  (1)          /*!< TACHO0CLKPWR (Bit 1)               */
+#define PERICLKPWR0_TACHO0CLKPWR_Msk  (0x2)        /*!< TACHO0CLKPWR (Bitfield-Mask: 0x01) */
+#define PERICLKPWR0_TACHO1CLKPWR_Pos  (2)          /*!< TACHO1CLKPWR (Bit 2)               */
+#define PERICLKPWR0_TACHO1CLKPWR_Msk  (0x4)        /*!< TACHO1CLKPWR (Bitfield-Mask: 0x01) */
+#define PERICLKPWR0_TACHO2CLKPWR_Pos  (3)          /*!< TACHO2CLKPWR (Bit 3)               */
+#define PERICLKPWR0_TACHO2CLKPWR_Msk  (0x8)        /*!< TACHO2CLKPWR (Bitfield-Mask: 0x01) */
+#define PERICLKPWR0_TACHO3CLKPWR_Pos  (4)          /*!< TACHO3CLKPWR (Bit 4)               */
+#define PERICLKPWR0_TACHO3CLKPWR_Msk  (0x10)       /*!< TACHO3CLKPWR (Bitfield-Mask: 0x01) */
+#define PERICLKPWR0_PS2CLKPWR_Pos     (5)          /*!< PS2CLKPWR (Bit 5)                  */
+#define PERICLKPWR0_PS2CLKPWR_Msk     (0x20)       /*!< PS2CLKPWR (Bitfield-Mask: 0x01)    */
+#define PERICLKPWR0_KBMCLKPWR_Pos     (6)          /*!< KBMCLKPWR (Bit 6)                  */
+#define PERICLKPWR0_KBMCLKPWR_Msk     (0x40)       /*!< KBMCLKPWR (Bitfield-Mask: 0x01)    */
+#define PERICLKPWR0_PECICLKPWR_Pos    (7)          /*!< PECICLKPWR (Bit 7)                 */
+#define PERICLKPWR0_PECICLKPWR_Msk    (0x80)       /*!< PECICLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR0_PL0CLKPWR_Pos     (8)          /*!< PL0CLKPWR (Bit 8)                  */
+#define PERICLKPWR0_PL0CLKPWR_Msk     (0x100)      /*!< PL0CLKPWR (Bitfield-Mask: 0x01)    */
+#define PERICLKPWR0_PL1CLKPWR_Pos     (9)          /*!< PL1CLKPWR (Bit 9)                  */
+#define PERICLKPWR0_PL1CLKPWR_Msk     (0x200)      /*!< PL1CLKPWR (Bitfield-Mask: 0x01)    */
+#define PERICLKPWR0_PWM0CLKPWR_Pos    (10)         /*!< PWM0CLKPWR (Bit 10)                */
+#define PERICLKPWR0_PWM0CLKPWR_Msk    (0x400)      /*!< PWM0CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR0_PWM1CLKPWR_Pos    (11)         /*!< PWM1CLKPWR (Bit 11)                */
+#define PERICLKPWR0_PWM1CLKPWR_Msk    (0x800)      /*!< PWM1CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR0_PWM2CLKPWR_Pos    (12)         /*!< PWM2CLKPWR (Bit 12)                */
+#define PERICLKPWR0_PWM2CLKPWR_Msk    (0x1000)     /*!< PWM2CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR0_PWM3CLKPWR_Pos    (13)         /*!< PWM3CLKPWR (Bit 13)                */
+#define PERICLKPWR0_PWM3CLKPWR_Msk    (0x2000)     /*!< PWM3CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR0_PWM4CLKPWR_Pos    (14)         /*!< PWM4CLKPWR (Bit 14)                */
+#define PERICLKPWR0_PWM4CLKPWR_Msk    (0x4000)     /*!< PWM4CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR0_PWM5CLKPWR_Pos    (15)         /*!< PWM5CLKPWR (Bit 15)                */
+#define PERICLKPWR0_PWM5CLKPWR_Msk    (0x8000)     /*!< PWM5CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR0_PWM6CLKPWR_Pos    (16)         /*!< PWM6CLKPWR (Bit 16)                */
+#define PERICLKPWR0_PWM6CLKPWR_Msk    (0x10000)    /*!< PWM6CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR0_PWM7CLKPWR_Pos    (17)         /*!< PWM7CLKPWR (Bit 17)                */
+#define PERICLKPWR0_PWM7CLKPWR_Msk    (0x20000)    /*!< PWM7CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR0_PWM8CLKPWR_Pos    (18)         /*!< PWM8CLKPWR (Bit 18)                */
+#define PERICLKPWR0_PWM8CLKPWR_Msk    (0x40000)    /*!< PWM8CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR0_PWM9CLKPWR_Pos    (19)         /*!< PWM9CLKPWR (Bit 19)                */
+#define PERICLKPWR0_PWM9CLKPWR_Msk    (0x80000)    /*!< PWM9CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR0_PWM10CLKPWR_Pos   (20)         /*!< PWM10CLKPWR (Bit 20)               */
+#define PERICLKPWR0_PWM10CLKPWR_Msk   (0x100000)   /*!< PWM10CLKPWR (Bitfield-Mask: 0x01)  */
+#define PERICLKPWR0_PWM11CLKPWR_Pos   (21)         /*!< PWM11CLKPWR (Bit 21)               */
+#define PERICLKPWR0_PWM11CLKPWR_Msk   (0x200000)   /*!< PWM11CLKPWR (Bitfield-Mask: 0x01)  */
+#define PERICLKPWR0_ESPICLKPWR_Pos    (22)         /*!< ESPICLKPWR (Bit 22)                */
+#define PERICLKPWR0_ESPICLKPWR_Msk    (0x400000)   /*!< ESPICLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR0_KBCCLKPWR_Pos     (23)         /*!< KBCCLKPWR (Bit 23)                 */
+#define PERICLKPWR0_KBCCLKPWR_Msk     (0x800000)   /*!< KBCCLKPWR (Bitfield-Mask: 0x01)    */
+#define PERICLKPWR0_ACPICLKPWR_Pos    (24)         /*!< ACPICLKPWR (Bit 24)                */
+#define PERICLKPWR0_ACPICLKPWR_Msk    (0x1000000)  /*!< ACPICLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR0_PMPORT0CLKPWR_Pos (25)         /*!< PMPORT0CLKPWR (Bit 25)             */
+#define PERICLKPWR0_PMPORT0CLKPWR_Msk (0x2000000)  /*!< PMPORT0CLKPWR (Bitfield-Mask: 0x01)*/
+#define PERICLKPWR0_PMPORT1CLKPWR_Pos (26)         /*!< PMPORT1CLKPWR (Bit 26)             */
+#define PERICLKPWR0_PMPORT1CLKPWR_Msk (0x4000000)  /*!< PMPORT1CLKPWR (Bitfield-Mask: 0x01)*/
+#define PERICLKPWR0_PMPORT2CLKPWR_Pos (27)         /*!< PMPORT2CLKPWR (Bit 27)             */
+#define PERICLKPWR0_PMPORT2CLKPWR_Msk (0x8000000)  /*!< PMPORT2CLKPWR (Bitfield-Mask: 0x01)*/
+#define PERICLKPWR0_PMPORT3CLKPWR_Pos (28)         /*!< PMPORT3CLKPWR (Bit 28)             */
+#define PERICLKPWR0_PMPORT3CLKPWR_Msk (0x10000000) /*!< PMPORT3CLKPWR (Bitfield-Mask: 0x01)*/
+#define PERICLKPWR0_P80CLKPWR_Pos     (29)         /*!< P80CLKPWR (Bit 29)                 */
+#define PERICLKPWR0_P80CLKPWR_Msk     (0x20000000) /*!< P80CLKPWR (Bitfield-Mask: 0x01)    */
+#define PERICLKPWR0_EMI0CLKPWR_Pos    (30)         /*!< EMI0CLKPWR (Bit 30)                */
+#define PERICLKPWR0_EMI0CLKPWR_Msk    (0x40000000) /*!< EMI0CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR0_EMI1CLKPWR_Pos    (31)         /*!< EMI1CLKPWR (Bit 31)                */
+#define PERICLKPWR0_EMI1CLKPWR_Msk    (0x80000000) /*!< EMI1CLKPWR (Bitfield-Mask: 0x01)   */
+/* =====================================  UARTCLK  ====================================== */
+#define UARTCLK_PWR_Pos               (0)   /*!< PWR (Bit 0)                        */
+#define UARTCLK_PWR_Msk               (0x1) /*!< PWR (Bitfield-Mask: 0x01)          */
+#define UARTCLK_SRC_Pos               (1)   /*!< SRC (Bit 1)                        */
+#define UARTCLK_SRC_Msk               (0x2) /*!< SRC (Bitfield-Mask: 0x01)          */
+#define UARTCLK_DIV_Pos               (2)   /*!< DIV (Bit 2)                        */
+#define UARTCLK_DIV_Msk               (0xc) /*!< DIV (Bitfield-Mask: 0x03)          */
+/* =====================================  ADCCLK  ======================================= */
+#define ADCCLK_PWR_Pos                (0)    /*!< PWR (Bit 0)                        */
+#define ADCCLK_PWR_Msk                (0x1)  /*!< PWR (Bitfield-Mask: 0x01)          */
+#define ADCCLK_SRC_Pos                (1)    /*!< SRC (Bit 1)                        */
+#define ADCCLK_SRC_Msk                (0x2)  /*!< SRC (Bitfield-Mask: 0x01)          */
+#define ADCCLK_DIV_Pos                (2)    /*!< DIV (Bit 2)                        */
+#define ADCCLK_DIV_Msk                (0x1c) /*!< DIV (Bitfield-Mask: 0x07)          */
+/* ===================================  PERICLKPWR1  ==================================== */
+#define PERICLKPWR1_EMI2CLKPWR_Pos    (0)        /*!< EMI2CLKPWR (Bit 0)                 */
+#define PERICLKPWR1_EMI2CLKPWR_Msk    (0x1)      /*!< EMI2CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR1_EMI3CLKPWR_Pos    (1)        /*!< EMI3CLKPWR (Bit 1)                 */
+#define PERICLKPWR1_EMI3CLKPWR_Msk    (0x2)      /*!< EMI3CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR1_EMI4CLKPWR_Pos    (2)        /*!< EMI4CLKPWR (Bit 2)                 */
+#define PERICLKPWR1_EMI4CLKPWR_Msk    (0x4)      /*!< EMI4CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR1_EMI5CLKPWR_Pos    (3)        /*!< EMI5CLKPWR (Bit 3)                 */
+#define PERICLKPWR1_EMI5CLKPWR_Msk    (0x8)      /*!< EMI5CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR1_EMI6CLKPWR_Pos    (4)        /*!< EMI6CLKPWR (Bit 4)                 */
+#define PERICLKPWR1_EMI6CLKPWR_Msk    (0x10)     /*!< EMI6CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR1_EMI7CLKPWR_Pos    (5)        /*!< EMI7CLKPWR (Bit 5)                 */
+#define PERICLKPWR1_EMI7CLKPWR_Msk    (0x20)     /*!< EMI7CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR1_I3C0CLKPWR_Pos    (9)        /*!< I3C0CLKPWR (Bit 9)                 */
+#define PERICLKPWR1_I3C0CLKPWR_Msk    (0x200)    /*!< I3C0CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR1_I3C1CLKPWR_Pos    (10)       /*!< I3C1CLKPWR (Bit 10)                */
+#define PERICLKPWR1_I3C1CLKPWR_Msk    (0x400)    /*!< I3C1CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR1_I2CAUTOCLKPWR_Pos (11)       /*!< I2CAUTOCLKPWR (Bit 11)             */
+#define PERICLKPWR1_I2CAUTOCLKPWR_Msk (0x800)    /*!< I2CAUTOCLKPWR (Bitfield-Mask: 0x01)*/
+#define PERICLKPWR1_MCCLKPWR_Pos      (12)       /*!< MCCLKPWR (Bit 12)                  */
+#define PERICLKPWR1_MCCLKPWR_Msk      (0x1000)   /*!< MCCLKPWR (Bitfield-Mask: 0x01)     */
+#define PERICLKPWR1_TMR0CLKPWR_Pos    (13)       /*!< TMR0CLKPWR (Bit 13)                */
+#define PERICLKPWR1_TMR0CLKPWR_Msk    (0x2000)   /*!< TMR0CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR1_TMR1CLKPWR_Pos    (14)       /*!< TMR1CLKPWR (Bit 14)                */
+#define PERICLKPWR1_TMR1CLKPWR_Msk    (0x4000)   /*!< TMR1CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR1_TMR2CLKPWR_Pos    (15)       /*!< TMR2CLKPWR (Bit 15)                */
+#define PERICLKPWR1_TMR2CLKPWR_Msk    (0x8000)   /*!< TMR2CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR1_TMR3CLKPWR_Pos    (16)       /*!< TMR3CLKPWR (Bit 16)                */
+#define PERICLKPWR1_TMR3CLKPWR_Msk    (0x10000)  /*!< TMR3CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR1_TMR4CLKPWR_Pos    (17)       /*!< TMR4CLKPWR (Bit 17)                */
+#define PERICLKPWR1_TMR4CLKPWR_Msk    (0x20000)  /*!< TMR4CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR1_TMR5CLKPWR_Pos    (18)       /*!< TMR5CLKPWR (Bit 18)                */
+#define PERICLKPWR1_TMR5CLKPWR_Msk    (0x40000)  /*!< TMR5CLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR1_RTMRCLKPWR_Pos    (19)       /*!< RTMRCLKPWR (Bit 19)                */
+#define PERICLKPWR1_RTMRCLKPWR_Msk    (0x80000)  /*!< RTMRCLKPWR (Bitfield-Mask: 0x01)   */
+#define PERICLKPWR1_SLWTMR0CLKPWR_Pos (20)       /*!< SLWTMR0CLKPWR (Bit 20)             */
+#define PERICLKPWR1_SLWTMR0CLKPWR_Msk (0x100000) /*!< SLWTMR0CLKPWR (Bitfield-Mask: 0x01)*/
+#define PERICLKPWR1_SLWTMR1CLKPWR_Pos (21)       /*!< SLWTMR1CLKPWR (Bit 21)             */
+#define PERICLKPWR1_SLWTMR1CLKPWR_Msk (0x200000) /*!< SLWTMR1CLKPWR (Bitfield-Mask: 0x01)*/
+/* ===================================  PERICLKPWR2  ==================================== */
+#define PERICLKPWR2_RTCCLKPWR_Pos     (0)          /*!< RTCCLKPWR (Bit 0)                  */
+#define PERICLKPWR2_RTCCLKPWR_Msk     (0x1)        /*!< RTCCLKPWR (Bitfield-Mask: 0x01)    */
+#define PERICLKPWR2_WDTCLKPWR_Pos     (1)          /*!< WDTCLKPWR (Bit 1)                  */
+#define PERICLKPWR2_WDTCLKPWR_Msk     (0x2)        /*!< WDTCLKPWR (Bitfield-Mask: 0x01)    */
+#define PERICLKPWR2_PWRBTNCLKPWR_Pos  (2)          /*!< PWRBTNCLKPWR (Bit 2)               */
+#define PERICLKPWR2_PWRBTNCLKPWR_Msk  (0x4)        /*!< PWRBTNCLKPWR (Bitfield-Mask: 0x01) */
+#define PERICLKPWR2_RC32KSRC_Pos      (30)         /*!< RC32KSRC (Bit 30)                  */
+#define PERICLKPWR2_RC32KSRC_Msk      (0xc0000000) /*!< RC32KSRC (Bitfield-Mask: 0x03)     */
+/* ====================================================================================== */
+
+#define RTS5912_SCCON_SYS         (0)
+#define RTS5912_SCCON_I2C         (2)
+#define RTS5912_SCCON_UART        (3)
+#define RTS5912_SCCON_ADC         (4)
+#define RTS5912_SCCON_PERIPH_GRP0 (5)
+#define RTS5912_SCCON_PERIPH_GRP1 (6)
+#define RTS5912_SCCON_PERIPH_GRP2 (7)
+
+#define I2C0_CLKPWR (I2CCLK_I2C0CLKPWR_Pos)
+#define I2C1_CLKPWR (I2CCLK_I2C1CLKPWR_Pos)
+#define I2C2_CLKPWR (I2CCLK_I2C2CLKPWR_Pos)
+#define I2C3_CLKPWR (I2CCLK_I2C3CLKPWR_Pos)
+#define I2C4_CLKPWR (I2CCLK_I2C4CLKPWR_Pos)
+#define I2C5_CLKPWR (I2CCLK_I2C5CLKPWR_Pos)
+#define I2C6_CLKPWR (I2CCLK_I2C6CLKPWR_Pos)
+#define I2C7_CLKPWR (I2CCLK_I2C7CLKPWR_Pos)
+
+#define I2C0_PLL   (0x0 << I2CCLK_I2C0CLKSRC_Pos)
+#define I2C0_RC25M (0x1 << I2CCLK_I2C0CLKSRC_Pos)
+#define I2C1_PLL   (0x0 << I2CCLK_I2C1CLKSRC_Pos)
+#define I2C1_RC25M (0x1 << I2CCLK_I2C1CLKSRC_Pos)
+#define I2C2_PLL   (0x0 << I2CCLK_I2C2CLKSRC_Pos)
+#define I2C2_RC25M (0x1 << I2CCLK_I2C2CLKSRC_Pos)
+#define I2C3_PLL   (0x0 << I2CCLK_I2C3CLKSRC_Pos)
+#define I2C3_RC25M (0x1 << I2CCLK_I2C3CLKSRC_Pos)
+#define I2C4_PLL   (0x0 << I2CCLK_I2C4CLKSRC_Pos)
+#define I2C4_RC25M (0x1 << I2CCLK_I2C4CLKSRC_Pos)
+#define I2C5_PLL   (0x0 << I2CCLK_I2C5CLKSRC_Pos)
+#define I2C5_RC25M (0x1 << I2CCLK_I2C5CLKSRC_Pos)
+#define I2C6_PLL   (0x0 << I2CCLK_I2C6CLKSRC_Pos)
+#define I2C6_RC25M (0x1 << I2CCLK_I2C6CLKSRC_Pos)
+#define I2C7_PLL   (0x0 << I2CCLK_I2C7CLKSRC_Pos)
+#define I2C7_RC25M (0x1 << I2CCLK_I2C7CLKSRC_Pos)
+
+#define I2C0_CLKDIV1 (0 << I2CCLK_I2C0CLKDIV_Pos)
+#define I2C0_CLKDIV2 (1 << I2CCLK_I2C0CLKDIV_Pos)
+#define I2C0_CLKDIV4 (2 << I2CCLK_I2C0CLKDIV_Pos)
+#define I2C0_CLKDIV8 (3 << I2CCLK_I2C0CLKDIV_Pos)
+
+#define I2C1_CLKDIV1 (0 << I2CCLK_I2C1CLKDIV_Pos)
+#define I2C1_CLKDIV2 (1 << I2CCLK_I2C1CLKDIV_Pos)
+#define I2C1_CLKDIV4 (2 << I2CCLK_I2C1CLKDIV_Pos)
+#define I2C1_CLKDIV8 (3 << I2CCLK_I2C1CLKDIV_Pos)
+
+#define I2C2_CLKDIV1 (0 << I2CCLK_I2C2CLKDIV_Pos)
+#define I2C2_CLKDIV2 (1 << I2CCLK_I2C2CLKDIV_Pos)
+#define I2C2_CLKDIV4 (2 << I2CCLK_I2C2CLKDIV_Pos)
+#define I2C2_CLKDIV8 (3 << I2CCLK_I2C2CLKDIV_Pos)
+
+#define I2C3_CLKDIV1 (0 << I2CCLK_I2C3CLKDIV_Pos)
+#define I2C3_CLKDIV2 (1 << I2CCLK_I2C3CLKDIV_Pos)
+#define I2C3_CLKDIV4 (2 << I2CCLK_I2C3CLKDIV_Pos)
+#define I2C3_CLKDIV8 (3 << I2CCLK_I2C3CLKDIV_Pos)
+
+#define I2C4_CLKDIV1 (0 << I2CCLK_I2C4CLKDIV_Pos)
+#define I2C4_CLKDIV2 (1 << I2CCLK_I2C4CLKDIV_Pos)
+#define I2C4_CLKDIV4 (2 << I2CCLK_I2C4CLKDIV_Pos)
+#define I2C4_CLKDIV8 (3 << I2CCLK_I2C4CLKDIV_Pos)
+
+#define I2C5_CLKDIV1 (0 << I2CCLK_I2C5CLKDIV_Pos)
+#define I2C5_CLKDIV2 (1 << I2CCLK_I2C5CLKDIV_Pos)
+#define I2C5_CLKDIV4 (2 << I2CCLK_I2C5CLKDIV_Pos)
+#define I2C5_CLKDIV8 (3 << I2CCLK_I2C5CLKDIV_Pos)
+
+#define I2C6_CLKDIV1 (0 << I2CCLK_I2C6CLKDIV_Pos)
+#define I2C6_CLKDIV2 (1 << I2CCLK_I2C6CLKDIV_Pos)
+#define I2C6_CLKDIV4 (2 << I2CCLK_I2C6CLKDIV_Pos)
+#define I2C6_CLKDIV8 (3 << I2CCLK_I2C6CLKDIV_Pos)
+
+#define I2C7_CLKDIV1 (0 << I2CCLK_I2C7CLKDIV_Pos)
+#define I2C7_CLKDIV2 (1 << I2CCLK_I2C7CLKDIV_Pos)
+#define I2C7_CLKDIV4 (2 << I2CCLK_I2C7CLKDIV_Pos)
+#define I2C7_CLKDIV8 (3 << I2CCLK_I2C7CLKDIV_Pos)
+
+#define UART0_CLKPWR (UARTCLK_PWR_Pos)
+
+#define UART0_RC25M (0x0 << UARTCLK_SRC_Pos)
+#define UART0_PLL   (0x1 << UARTCLK_SRC_Pos)
+
+#define UART0_CLKDIV1 (0 << UARTCLK_DIV_Pos)
+#define UART0_CLKDIV2 (1 << UARTCLK_DIV_Pos)
+#define UART0_CLKDIV4 (2 << UARTCLK_DIV_Pos)
+#define UART0_CLKDIV8 (3 << UARTCLK_DIV_Pos)
+
+#define ADC0_CLKPWR (ADCCLK_PWR_Pos)
+
+#define ADC0_RC25M (0x0 << ADCCLK_SRC_Pos)
+#define ADC0_PLL   (0x1 << ADCCLK_SRC_Pos)
+
+#define ADC0_CLKDIV1 (0 << ADCCLK_DIV_Pos)
+#define ADC0_CLKDIV2 (1 << ADCCLK_DIV_Pos)
+#define ADC0_CLKDIV3 (2 << ADCCLK_DIV_Pos)
+#define ADC0_CLKDIV4 (3 << ADCCLK_DIV_Pos)
+#define ADC0_CLKDIV6 (4 << ADCCLK_DIV_Pos)
+#define ADC0_CLKDIV8 (5 << ADCCLK_DIV_Pos)
+
+#define PERIPH_GRP0_GPIO_CLKPWR    (PERICLKPWR0_GPIOCLKPWR_Pos)
+#define PERIPH_GRP0_TACH0_CLKPWR   (PERICLKPWR0_TACHO0CLKPWR_Pos)
+#define PERIPH_GRP0_TACH1_CLKPWR   (PERICLKPWR0_TACHO1CLKPWR_Pos)
+#define PERIPH_GRP0_TACH2_CLKPWR   (PERICLKPWR0_TACHO2CLKPWR_Pos)
+#define PERIPH_GRP0_TACH3_CLKPWR   (PERICLKPWR0_TACHO3CLKPWR_Pos)
+#define PERIPH_GRP0_PS2_CLKPWR     (PERICLKPWR0_PS2CLKPWR_Pos)
+#define PERIPH_GRP0_KBM_CLKPWR     (PERICLKPWR0_KBMCLKPWR_Pos)
+#define PERIPH_GRP0_PECI_CLKPWR    (PERICLKPWR0_PECICLKPWR_Pos)
+#define PERIPH_GRP0_LEDPWM0_CLKPWR (PERICLKPWR0_PL0CLKPWR_Pos)
+#define PERIPH_GRP0_LEDPWM1_CLKPWR (PERICLKPWR0_PL1CLKPWR_Pos)
+#define PERIPH_GRP0_PWM0_CLKPWR    (PERICLKPWR0_PWM0CLKPWR_Pos)
+#define PERIPH_GRP0_PWM1_CLKPWR    (PERICLKPWR0_PWM1CLKPWR_Pos)
+#define PERIPH_GRP0_PWM2_CLKPWR    (PERICLKPWR0_PWM2CLKPWR_Pos)
+#define PERIPH_GRP0_PWM3_CLKPWR    (PERICLKPWR0_PWM3CLKPWR_Pos)
+#define PERIPH_GRP0_PWM4_CLKPWR    (PERICLKPWR0_PWM4CLKPWR_Pos)
+#define PERIPH_GRP0_PWM5_CLKPWR    (PERICLKPWR0_PWM5CLKPWR_Pos)
+#define PERIPH_GRP0_PWM6_CLKPWR    (PERICLKPWR0_PWM6CLKPWR_Pos)
+#define PERIPH_GRP0_PWM7_CLKPWR    (PERICLKPWR0_PWM7CLKPWR_Pos)
+#define PERIPH_GRP0_PWM8_CLKPWR    (PERICLKPWR0_PWM8CLKPWR_Pos)
+#define PERIPH_GRP0_PWM9_CLKPWR    (PERICLKPWR0_PWM9CLKPWR_Pos)
+#define PERIPH_GRP0_PWM10_CLKPWR   (PERICLKPWR0_PWM10CLKPWR_Pos)
+#define PERIPH_GRP0_PWM11_CLKPWR   (PERICLKPWR0_PWM11CLKPWR_Pos)
+#define PERIPH_GRP0_ESPI_CLKPWR    (PERICLKPWR0_ESPICLKPWR_Pos)
+#define PERIPH_GRP0_KBC_CLKPWR     (PERICLKPWR0_KBCCLKPWR_Pos)
+#define PERIPH_GRP0_ACPI_CLKPWR    (PERICLKPWR0_ACPICLKPWR_Pos)
+#define PERIPH_GRP0_PMPORT0_CLKPWR (PERICLKPWR0_PMPORT0CLKPWR_Pos)
+#define PERIPH_GRP0_PMPORT1_CLKPWR (PERICLKPWR0_PMPORT1CLKPWR_Pos)
+#define PERIPH_GRP0_PMPORT2_CLKPWR (PERICLKPWR0_PMPORT2CLKPWR_Pos)
+#define PERIPH_GRP0_PMPORT3_CLKPWR (PERICLKPWR0_PMPORT3CLKPWR_Pos)
+#define PERIPH_GRP0_P80_CLKPWR     (PERICLKPWR0_P80CLKPWR_Pos)
+#define PERIPH_GRP0_EMI0_CLKPWR    (PERICLKPWR0_EMI0CLKPWR_Pos)
+#define PERIPH_GRP0_EMI1_CLKPWR    (PERICLKPWR0_EMI1CLKPWR_Pos)
+
+#define PERIPH_GRP1_EMI2_CLKPWR    (PERICLKPWR1_EMI2CLKPWR_Pos)
+#define PERIPH_GRP1_EMI3_CLKPWR    (PERICLKPWR1_EMI3CLKPWR_Pos)
+#define PERIPH_GRP1_EMI4_CLKPWR    (PERICLKPWR1_EMI4CLKPWR_Pos)
+#define PERIPH_GRP1_EMI5_CLKPWR    (PERICLKPWR1_EMI5CLKPWR_Pos)
+#define PERIPH_GRP1_EMI6_CLKPWR    (PERICLKPWR1_EMI6CLKPWR_Pos)
+#define PERIPH_GRP1_EMI7_CLKPWR    (PERICLKPWR1_EMI7CLKPWR_Pos)
+#define PERIPH_GRP1_I3C0_CLKPWR    (PERICLKPWR1_I3C0CLKPWR_Pos)
+#define PERIPH_GRP1_I3C1_CLKPWR    (PERICLKPWR1_I3C1CLKPWR_Pos)
+#define PERIPH_GRP1_I2CAUTO_CLKPWR (PERICLKPWR1_I2CAUTOCLKPWR_Pos)
+#define PERIPH_GRP1_MC_CLKPWR      (PERICLKPWR1_MCCLKPWR_Pos)
+#define PERIPH_GRP1_TMR0_CLKPWR    (PERICLKPWR1_TMR0CLKPWR_Pos)
+#define PERIPH_GRP1_TMR1_CLKPWR    (PERICLKPWR1_TMR1CLKPWR_Pos)
+#define PERIPH_GRP1_TMR2_CLKPWR    (PERICLKPWR1_TMR2CLKPWR_Pos)
+#define PERIPH_GRP1_TMR3_CLKPWR    (PERICLKPWR1_TMR3CLKPWR_Pos)
+#define PERIPH_GRP1_TMR4_CLKPWR    (PERICLKPWR1_TMR4CLKPWR_Pos)
+#define PERIPH_GRP1_TMR5_CLKPWR    (PERICLKPWR1_TMR5CLKPWR_Pos)
+#define PERIPH_GRP1_RTMR_CLKPWR    (PERICLKPWR1_RTMRCLKPWR_Pos)
+#define PERIPH_GRP1_SLWTMR0_CLKPWR (PERICLKPWR1_SLWTMR0CLKPWR_Pos)
+#define PERIPH_GRP1_SLWTMR1_CLKPWR (PERICLKPWR1_SLWTMR1CLKPWR_Pos)
+
+#define PERIPH_GRP2_RTC_CLKPWR       (PERICLKPWR2_RTCCLKPWR_Pos)
+#define PERIPH_GRP2_WDT_CLKPWR       (PERICLKPWR2_WDTCLKPWR_Pos)
+#define PERIPH_GRP2_WDTPWRBTN_CLKPWR (PERICLKPWR2_PWRBTNCLKPWR_Pos)
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_RTS5912_CLOCK_H_ */
diff --git a/soc/realtek/ec/rts5912/reg/reg_system.h b/soc/realtek/ec/rts5912/reg/reg_system.h
new file mode 100644
index 00000000000..673baf4ac35
--- /dev/null
+++ b/soc/realtek/ec/rts5912/reg/reg_system.h
@@ -0,0 +1,335 @@
+/*
+ * Copyright (c) 2023 Realtek, SIBG-SD7
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_REALTEK_RTS5912_REG_SYSTEM_H
+#define ZEPHYR_SOC_REALTEK_RTS5912_REG_SYSTEM_H
+
+/*
+ * @brief System Controller (SYSTEM)
+ */
+typedef struct {
+	union {
+		volatile uint32_t I3CCLK;
+		volatile uint32_t TMRRST;
+	};
+	volatile uint32_t I2CCLK;
+	volatile uint32_t TMRCLK;
+	volatile uint32_t PERICLKPWR0;
+	volatile uint32_t UARTCLK;
+	volatile uint32_t SYSCLK;
+	volatile uint32_t ADCCLK;
+	volatile uint32_t PERICLKPWR1;
+	volatile const uint32_t RESERVED[24];
+	volatile uint32_t SLPCTRL;
+	volatile const uint32_t RESERVED1[7];
+	volatile uint32_t VIVOCTRL;
+	volatile uint32_t LDOCTRL;
+	volatile uint32_t RC25MCTRL;
+	volatile uint32_t PLLCTRL;
+	volatile const uint32_t RESERVED2[12];
+	volatile uint32_t RC32KCTRL;
+	volatile const uint32_t RESERVED3;
+	volatile uint32_t PERICLKPWR2;
+} SYSTEM_Type;
+
+/* I3CCLK */
+#define SYSTEM_I3CCLK_I3C0DIV_Pos            (0UL)
+#define SYSTEM_I3CCLK_I3C0DIV_Msk            GENMASK(1, 0)
+#define SYSTEM_I3CCLK_I3C1DIV_Pos            (2UL)
+#define SYSTEM_I3CCLK_I3C1DIV_Msk            GENMASK(3, 2)
+/* TMRRST */
+#define SYSTEM_TMRRST_TMR0RST_Pos            (4UL)
+#define SYSTEM_TMRRST_TMR0RST_Msk            BIT(SYSTEM_TMRRST_TMR0RST_Pos)
+#define SYSTEM_TMRRST_TMR1RST_Pos            (5UL)
+#define SYSTEM_TMRRST_TMR1RST_Msk            BIT(SYSTEM_TMRRST_TMR1RST_Pos)
+#define SYSTEM_TMRRST_TMR2RST_Pos            (6UL)
+#define SYSTEM_TMRRST_TMR2RST_Msk            BIT(SYSTEM_TMRRST_TMR2RST_Pos)
+#define SYSTEM_TMRRST_TMR3RST_Pos            (7UL)
+#define SYSTEM_TMRRST_TMR3RST_Msk            BIT(SYSTEM_TMRRST_TMR3RST_Pos)
+#define SYSTEM_TMRRST_TMR4RST_Pos            (8UL)
+#define SYSTEM_TMRRST_TMR4RST_Msk            BIT(SYSTEM_TMRRST_TMR4RST_Pos)
+#define SYSTEM_TMRRST_TMR5RST_Pos            (9UL)
+#define SYSTEM_TMRRST_TMR5RST_Msk            BIT(SYSTEM_TMRRST_TMR5RST_Pos)
+/* I2CCLK */
+#define SYSTEM_I2CCLK_I2C0CLKPWR_Pos         (0UL)
+#define SYSTEM_I2CCLK_I2C0CLKPWR_Msk         BIT(SYSTEM_I2CCLK_I2C0CLKPWR_Pos)
+#define SYSTEM_I2CCLK_I2C0CLKSRC_Pos         (1UL)
+#define SYSTEM_I2CCLK_I2C0CLKSRC_Msk         BIT(SYSTEM_I2CCLK_I2C0CLKSRC_Pos)
+#define SYSTEM_I2CCLK_I2C0CLKDIV_Pos         (2UL)
+#define SYSTEM_I2CCLK_I2C0CLKDIV_Msk         GENMASK(3, 2)
+#define SYSTEM_I2CCLK_I2C1CLKPWR_Pos         (4UL)
+#define SYSTEM_I2CCLK_I2C1CLKPWR_Msk         BIT(SYSTEM_I2CCLK_I2C1CLKPWR_Pos)
+#define SYSTEM_I2CCLK_I2C1CLKSRC_Pos         (5UL)
+#define SYSTEM_I2CCLK_I2C1CLKSRC_Msk         BIT(SYSTEM_I2CCLK_I2C1CLKSRC_Pos)
+#define SYSTEM_I2CCLK_I2C1CLKDIV_Pos         (6UL)
+#define SYSTEM_I2CCLK_I2C1CLKDIV_Msk         GENMASK(7, 6)
+#define SYSTEM_I2CCLK_I2C2CLKPWR_Pos         (8UL)
+#define SYSTEM_I2CCLK_I2C2CLKPWR_Msk         BIT(SYSTEM_I2CCLK_I2C2CLKPWR_Pos)
+#define SYSTEM_I2CCLK_I2C2CLKSRC_Pos         (9UL)
+#define SYSTEM_I2CCLK_I2C2CLKSRC_Msk         BIT(SYSTEM_I2CCLK_I2C2CLKSRC_Pos)
+#define SYSTEM_I2CCLK_I2C2CLKDIV_Pos         (10UL)
+#define SYSTEM_I2CCLK_I2C2CLKDIV_Msk         GENMASK(11, 10)
+#define SYSTEM_I2CCLK_I2C3CLKPWR_Pos         (12UL)
+#define SYSTEM_I2CCLK_I2C3CLKPWR_Msk         BIT(SYSTEM_I2CCLK_I2C3CLKPWR_Pos)
+#define SYSTEM_I2CCLK_I2C3CLKSRC_Pos         (13UL)
+#define SYSTEM_I2CCLK_I2C3CLKSRC_Msk         BIT(SYSTEM_I2CCLK_I2C3CLKSRC_Pos)
+#define SYSTEM_I2CCLK_I2C3CLKDIV_Pos         (14UL)
+#define SYSTEM_I2CCLK_I2C3CLKDIV_Msk         GENMASK(15, 14)
+#define SYSTEM_I2CCLK_I2C4CLKPWR_Pos         (16UL)
+#define SYSTEM_I2CCLK_I2C4CLKPWR_Msk         BIT(SYSTEM_I2CCLK_I2C4CLKPWR_Pos)
+#define SYSTEM_I2CCLK_I2C4CLKSRC_Pos         (17UL)
+#define SYSTEM_I2CCLK_I2C4CLKSRC_Msk         BIT(SYSTEM_I2CCLK_I2C4CLKSRC_Pos)
+#define SYSTEM_I2CCLK_I2C4CLKDIV_Pos         (18UL)
+#define SYSTEM_I2CCLK_I2C4CLKDIV_Msk         GENMASK(19, 18)
+#define SYSTEM_I2CCLK_I2C5CLKPWR_Pos         (20UL)
+#define SYSTEM_I2CCLK_I2C5CLKPWR_Msk         BIT(SYSTEM_I2CCLK_I2C5CLKPWR_Pos)
+#define SYSTEM_I2CCLK_I2C5CLKSRC_Pos         (21UL)
+#define SYSTEM_I2CCLK_I2C5CLKSRC_Msk         BIT(SYSTEM_I2CCLK_I2C5CLKSRC_Pos)
+#define SYSTEM_I2CCLK_I2C5CLKDIV_Pos         (22UL)
+#define SYSTEM_I2CCLK_I2C5CLKDIV_Msk         GENMASK(23, 22)
+#define SYSTEM_I2CCLK_I2C6CLKPWR_Pos         (24UL)
+#define SYSTEM_I2CCLK_I2C6CLKPWR_Msk         BIT(SYSTEM_I2CCLK_I2C6CLKPWR_Pos)
+#define SYSTEM_I2CCLK_I2C6CLKSRC_Pos         (25UL)
+#define SYSTEM_I2CCLK_I2C6CLKSRC_Msk         BIT(SYSTEM_I2CCLK_I2C6CLKSRC_Pos)
+#define SYSTEM_I2CCLK_I2C6CLKDIV_Pos         (26UL)
+#define SYSTEM_I2CCLK_I2C6CLKDIV_Msk         GENMASK(27, 26)
+#define SYSTEM_I2CCLK_I2C7CLKPWR_Pos         (28UL)
+#define SYSTEM_I2CCLK_I2C7CLKPWR_Msk         BIT(SYSTEM_I2CCLK_I2C7CLKPWR_Pos)
+#define SYSTEM_I2CCLK_I2C7CLKSRC_Pos         (29UL)
+#define SYSTEM_I2CCLK_I2C7CLKSRC_Msk         BIT(SYSTEM_I2CCLK_I2C7CLKSRC_Pos)
+#define SYSTEM_I2CCLK_I2C7CLKDIV_Pos         (30UL)
+#define SYSTEM_I2CCLK_I2C7CLKDIV_Msk         GENMASK(31, 30)
+/* TMRCLK */
+#define SYSTEM_TMRCLK_TMR0DIV_Pos            (0UL)
+#define SYSTEM_TMRCLK_TMR0DIV_Msk            GENMASK(3, 0)
+#define SYSTEM_TMRCLK_TMR1DIV_Pos            (4UL)
+#define SYSTEM_TMRCLK_TMR1DIV_Msk            GENMASK(7, 4)
+#define SYSTEM_TMRCLK_TMR2DIV_Pos            (8UL)
+#define SYSTEM_TMRCLK_TMR2DIV_Msk            GENMASK(11, 8)
+#define SYSTEM_TMRCLK_TMR3DIV_Pos            (12UL)
+#define SYSTEM_TMRCLK_TMR3DIV_Msk            GENMASK(15, 12)
+#define SYSTEM_TMRCLK_TMR4DIV_Pos            (16UL)
+#define SYSTEM_TMRCLK_TMR4DIV_Msk            GENMASK(19, 16)
+#define SYSTEM_TMRCLK_TMR5DIV_Pos            (20UL)
+#define SYSTEM_TMRCLK_TMR5DIV_Msk            GENMASK(23, 20)
+#define SYSTEM_TMRCLK_TMR0PAUSE_Pos          (24UL)
+#define SYSTEM_TMRCLK_TMR0PAUSE_Msk          BIT(SYSTEM_TMRCLK_TMR0PAUSE_Pos)
+#define SYSTEM_TMRCLK_TMR1PAUSE_Pos          (25UL)
+#define SYSTEM_TMRCLK_TMR1PAUSE_Msk          BIT(SYSTEM_TMRCLK_TMR1PAUSE_Pos)
+#define SYSTEM_TMRCLK_TMR2PAUSE_Pos          (26UL)
+#define SYSTEM_TMRCLK_TMR2PAUSE_Msk          BIT(SYSTEM_TMRCLK_TMR2PAUSE_Pos)
+#define SYSTEM_TMRCLK_TMR3PAUSE_Pos          (27UL)
+#define SYSTEM_TMRCLK_TMR3PAUSE_Msk          BIT(SYSTEM_TMRCLK_TMR3PAUSE_Pos)
+#define SYSTEM_TMRCLK_TMR4PAUSE_Pos          (28UL)
+#define SYSTEM_TMRCLK_TMR4PAUSE_Msk          BIT(SYSTEM_TMRCLK_TMR4PAUSE_Pos)
+#define SYSTEM_TMRCLK_TMR5PAUSE_Pos          (29UL)
+#define SYSTEM_TMRCLK_TMR5PAUSE_Msk          BIT(SYSTEM_TMRCLK_TMR5PAUSE_Pos)
+/* PERICLKPWR0 */
+#define SYSTEM_PERICLKPWR0_GPIOCLKPWR_Pos    (0UL)
+#define SYSTEM_PERICLKPWR0_GPIOCLKPWR_Msk    BIT(SYSTEM_PERICLKPWR0_GPIOCLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_TACHO0CLKPWR_Pos  (1UL)
+#define SYSTEM_PERICLKPWR0_TACHO0CLKPWR_Msk  BIT(SYSTEM_PERICLKPWR0_TACHO0CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_TACHO1CLKPWR_Pos  (2UL)
+#define SYSTEM_PERICLKPWR0_TACHO1CLKPWR_Msk  BIT(SYSTEM_PERICLKPWR0_TACHO1CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_TACHO2CLKPWR_Pos  (3UL)
+#define SYSTEM_PERICLKPWR0_TACHO2CLKPWR_Msk  BIT(SYSTEM_PERICLKPWR0_TACHO2CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_TACHO3CLKPWR_Pos  (4UL)
+#define SYSTEM_PERICLKPWR0_TACHO3CLKPWR_Msk  BIT(SYSTEM_PERICLKPWR0_TACHO3CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PS2CLKPWR_Pos     (5UL)
+#define SYSTEM_PERICLKPWR0_PS2CLKPWR_Msk     BIT(SYSTEM_PERICLKPWR0_PS2CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_KBMCLKPWR_Pos     (6UL)
+#define SYSTEM_PERICLKPWR0_KBMCLKPWR_Msk     BIT(SYSTEM_PERICLKPWR0_KBMCLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PECICLKPWR_Pos    (7UL)
+#define SYSTEM_PERICLKPWR0_PECICLKPWR_Msk    BIT(SYSTEM_PERICLKPWR0_PECICLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PL0CLKPWR_Pos     (8UL)
+#define SYSTEM_PERICLKPWR0_PL0CLKPWR_Msk     BIT(SYSTEM_PERICLKPWR0_PL0CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PL1CLKPWR_Pos     (9UL)
+#define SYSTEM_PERICLKPWR0_PL1CLKPWR_Msk     BIT(SYSTEM_PERICLKPWR0_PL1CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PWM0CLKPWR_Pos    (10UL)
+#define SYSTEM_PERICLKPWR0_PWM0CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR0_PWM0CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PWM1CLKPWR_Pos    (11UL)
+#define SYSTEM_PERICLKPWR0_PWM1CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR0_PWM1CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PWM2CLKPWR_Pos    (12UL)
+#define SYSTEM_PERICLKPWR0_PWM2CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR0_PWM2CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PWM3CLKPWR_Pos    (13UL)
+#define SYSTEM_PERICLKPWR0_PWM3CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR0_PWM3CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PWM4CLKPWR_Pos    (14UL)
+#define SYSTEM_PERICLKPWR0_PWM4CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR0_PWM4CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PWM5CLKPWR_Pos    (15UL)
+#define SYSTEM_PERICLKPWR0_PWM5CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR0_PWM5CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PWM6CLKPWR_Pos    (16UL)
+#define SYSTEM_PERICLKPWR0_PWM6CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR0_PWM6CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PWM7CLKPWR_Pos    (17UL)
+#define SYSTEM_PERICLKPWR0_PWM7CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR0_PWM7CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PWM8CLKPWR_Pos    (18UL)
+#define SYSTEM_PERICLKPWR0_PWM8CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR0_PWM8CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PWM9CLKPWR_Pos    (19UL)
+#define SYSTEM_PERICLKPWR0_PWM9CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR0_PWM9CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PWM10CLKPWR_Pos   (20UL)
+#define SYSTEM_PERICLKPWR0_PWM10CLKPWR_Msk   BIT(SYSTEM_PERICLKPWR0_PWM10CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PWM11CLKPWR_Pos   (21UL)
+#define SYSTEM_PERICLKPWR0_PWM11CLKPWR_Msk   BIT(SYSTEM_PERICLKPWR0_PWM11CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_ESPICLKPWR_Pos    (22UL)
+#define SYSTEM_PERICLKPWR0_ESPICLKPWR_Msk    BIT(SYSTEM_PERICLKPWR0_ESPICLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_KBCCLKPWR_Pos     (23UL)
+#define SYSTEM_PERICLKPWR0_KBCCLKPWR_Msk     BIT(SYSTEM_PERICLKPWR0_KBCCLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_ACPICLKPWR_Pos    (24UL)
+#define SYSTEM_PERICLKPWR0_ACPICLKPWR_Msk    BIT(SYSTEM_PERICLKPWR0_ACPICLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PMPORT0CLKPWR_Pos (25UL)
+#define SYSTEM_PERICLKPWR0_PMPORT0CLKPWR_Msk BIT(SYSTEM_PERICLKPWR0_PMPORT0CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PMPORT1CLKPWR_Pos (26UL)
+#define SYSTEM_PERICLKPWR0_PMPORT1CLKPWR_Msk BIT(SYSTEM_PERICLKPWR0_PMPORT1CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PMPORT2CLKPWR_Pos (27UL)
+#define SYSTEM_PERICLKPWR0_PMPORT2CLKPWR_Msk BIT(SYSTEM_PERICLKPWR0_PMPORT2CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_PMPORT3CLKPWR_Pos (28UL)
+#define SYSTEM_PERICLKPWR0_PMPORT3CLKPWR_Msk BIT(SYSTEM_PERICLKPWR0_PMPORT3CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_P80CLKPWR_Pos     (29UL)
+#define SYSTEM_PERICLKPWR0_P80CLKPWR_Msk     BIT(SYSTEM_PERICLKPWR0_P80CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_EMI0CLKPWR_Pos    (30UL)
+#define SYSTEM_PERICLKPWR0_EMI0CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR0_EMI0CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR0_EMI1CLKPWR_Pos    (31UL)
+#define SYSTEM_PERICLKPWR0_EMI1CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR0_EMI1CLKPWR_Pos)
+/* UARTCLK */
+#define SYSTEM_UARTCLK_PWR_Pos               (0UL)
+#define SYSTEM_UARTCLK_PWR_Msk               BIT(SYSTEM_UARTCLK_PWR_Pos)
+#define SYSTEM_UARTCLK_SRC_Pos               (1UL)
+#define SYSTEM_UARTCLK_SRC_Msk               BIT(SYSTEM_UARTCLK_SRC_Pos)
+#define SYSTEM_UARTCLK_DIV_Pos               (2UL)
+#define SYSTEM_UARTCLK_DIV_Msk               GENMASK(3, 2)
+/* SYSCLK */
+#define SYSTEM_SYSCLK_SRC_Pos                (1UL)
+#define SYSTEM_SYSCLK_SRC_Msk                BIT(SYSTEM_SYSCLK_SRC_Pos)
+#define SYSTEM_SYSCLK_DIV_Pos                (2UL)
+#define SYSTEM_SYSCLK_DIV_Msk                BIT(SYSTEM_SYSCLK_DIV_Pos)
+/* ADCCLK */
+#define SYSTEM_ADCCLK_PWR_Pos                (0UL)
+#define SYSTEM_ADCCLK_PWR_Msk                BIT(SYSTEM_ADCCLK_PWR_Pos)
+#define SYSTEM_ADCCLK_SRC_Pos                (1UL)
+#define SYSTEM_ADCCLK_SRC_Msk                BIT(SYSTEM_ADCCLK_SRC_Pos)
+#define SYSTEM_ADCCLK_DIV_Pos                (2UL)
+#define SYSTEM_ADCCLK_DIV_Msk                GENMASK(4, 2)
+/* PERICLKPWR1 */
+#define SYSTEM_PERICLKPWR1_EMI2CLKPWR_Pos    (0UL)
+#define SYSTEM_PERICLKPWR1_EMI2CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR1_EMI2CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR1_EMI3CLKPWR_Pos    (1UL)
+#define SYSTEM_PERICLKPWR1_EMI3CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR1_EMI3CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR1_EMI4CLKPWR_Pos    (2UL)
+#define SYSTEM_PERICLKPWR1_EMI4CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR1_EMI4CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR1_EMI5CLKPWR_Pos    (3UL)
+#define SYSTEM_PERICLKPWR1_EMI5CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR1_EMI5CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR1_EMI6CLKPWR_Pos    (4UL)
+#define SYSTEM_PERICLKPWR1_EMI6CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR1_EMI6CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR1_EMI7CLKPWR_Pos    (5UL)
+#define SYSTEM_PERICLKPWR1_EMI7CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR1_EMI7CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR1_I3C0CLKPWR_Pos    (9UL)
+#define SYSTEM_PERICLKPWR1_I3C0CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR1_I3C0CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR1_I3C1CLKPWR_Pos    (10UL)
+#define SYSTEM_PERICLKPWR1_I3C1CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR1_I3C1CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR1_I2CAUTOCLKPWR_Pos (11UL)
+#define SYSTEM_PERICLKPWR1_I2CAUTOCLKPWR_Msk BIT(SYSTEM_PERICLKPWR1_I2CAUTOCLKPWR_Pos)
+#define SYSTEM_PERICLKPWR1_MCCLKPWR_Pos      (12UL)
+#define SYSTEM_PERICLKPWR1_MCCLKPWR_Msk      BIT(SYSTEM_PERICLKPWR1_MCCLKPWR_Pos)
+#define SYSTEM_PERICLKPWR1_TMR0CLKPWR_Pos    (13UL)
+#define SYSTEM_PERICLKPWR1_TMR0CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR1_TMR0CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR1_TMR1CLKPWR_Pos    (14UL)
+#define SYSTEM_PERICLKPWR1_TMR1CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR1_TMR1CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR1_TMR2CLKPWR_Pos    (15UL)
+#define SYSTEM_PERICLKPWR1_TMR2CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR1_TMR2CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR1_TMR3CLKPWR_Pos    (16UL)
+#define SYSTEM_PERICLKPWR1_TMR3CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR1_TMR3CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR1_TMR4CLKPWR_Pos    (17UL)
+#define SYSTEM_PERICLKPWR1_TMR4CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR1_TMR4CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR1_TMR5CLKPWR_Pos    (18UL)
+#define SYSTEM_PERICLKPWR1_TMR5CLKPWR_Msk    BIT(SYSTEM_PERICLKPWR1_TMR5CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR1_RTMRCLKPWR_Pos    (19UL)
+#define SYSTEM_PERICLKPWR1_RTMRCLKPWR_Msk    BIT(SYSTEM_PERICLKPWR1_RTMRCLKPWR_Pos)
+#define SYSTEM_PERICLKPWR1_SLWTMR0CLKPWR_Pos (20UL)
+#define SYSTEM_PERICLKPWR1_SLWTMR0CLKPWR_Msk BIT(SYSTEM_PERICLKPWR1_SLWTMR0CLKPWR_Pos)
+#define SYSTEM_PERICLKPWR1_SLWTMR1CLKPWR_Pos (21UL)
+#define SYSTEM_PERICLKPWR1_SLWTMR1CLKPWR_Msk BIT(SYSTEM_PERICLKPWR1_SLWTMR1CLKPWR_Pos)
+/* SLPCTRL */
+#define SYSTEM_SLPCTRL_SLPMDSEL_Pos          (1UL)
+#define SYSTEM_SLPCTRL_SLPMDSEL_Msk          BIT(SYSTEM_SLPCTRL_SLPMDSEL_Pos)
+#define SYSTEM_SLPCTRL_ESPIWKEN_Pos          (2UL)
+#define SYSTEM_SLPCTRL_ESPIWKEN_Msk          BIT(SYSTEM_SLPCTRL_ESPIWKEN_Pos)
+#define SYSTEM_SLPCTRL_PS2WKEN_Pos           (3UL)
+#define SYSTEM_SLPCTRL_PS2WKEN_Msk           BIT(SYSTEM_SLPCTRL_PS2WKEN_Pos)
+#define SYSTEM_SLPCTRL_I2CWKEN_Pos           (4UL)
+#define SYSTEM_SLPCTRL_I2CWKEN_Msk           BIT(SYSTEM_SLPCTRL_I2CWKEN_Pos)
+#define SYSTEM_SLPCTRL_GPIOWKEN_Pos          (5UL)
+#define SYSTEM_SLPCTRL_GPIOWKEN_Msk          BIT(SYSTEM_SLPCTRL_GPIOWKEN_Pos)
+/* VIVOCTRL */
+#define SYSTEM_VIVOCTRL_VIN0MD_Pos           (0UL)
+#define SYSTEM_VIVOCTRL_VIN0MD_Msk           BIT(SYSTEM_VIVOCTRL_VIN0MD_Pos)
+#define SYSTEM_VIVOCTRL_VIN1MD_Pos           (1UL)
+#define SYSTEM_VIVOCTRL_VIN1MD_Msk           BIT(SYSTEM_VIVOCTRL_VIN1MD_Pos)
+#define SYSTEM_VIVOCTRL_VIN2MD_Pos           (2UL)
+#define SYSTEM_VIVOCTRL_VIN2MD_Msk           BIT(SYSTEM_VIVOCTRL_VIN2MD_Pos)
+#define SYSTEM_VIVOCTRL_VIN3MD_Pos           (3UL)
+#define SYSTEM_VIVOCTRL_VIN3MD_Msk           BIT(SYSTEM_VIVOCTRL_VIN3MD_Pos)
+#define SYSTEM_VIVOCTRL_VIN4MD_Pos           (4UL)
+#define SYSTEM_VIVOCTRL_VIN4MD_Msk           BIT(SYSTEM_VIVOCTRL_VIN4MD_Pos)
+#define SYSTEM_VIVOCTRL_VIN5MD_Pos           (5UL)
+#define SYSTEM_VIVOCTRL_VIN5MD_Msk           BIT(SYSTEM_VIVOCTRL_VIN5MD_Pos)
+#define SYSTEM_VIVOCTRL_VIN0STS_Pos          (6UL)
+#define SYSTEM_VIVOCTRL_VIN0STS_Msk          BIT(SYSTEM_VIVOCTRL_VIN0STS_Pos)
+#define SYSTEM_VIVOCTRL_VIN1STS_Pos          (7UL)
+#define SYSTEM_VIVOCTRL_VIN1STS_Msk          BIT(SYSTEM_VIVOCTRL_VIN1STS_Pos)
+#define SYSTEM_VIVOCTRL_VIN2STS_Pos          (8UL)
+#define SYSTEM_VIVOCTRL_VIN2STS_Msk          BIT(SYSTEM_VIVOCTRL_VIN2STS_Pos)
+#define SYSTEM_VIVOCTRL_VIN3STS_Pos          (9UL)
+#define SYSTEM_VIVOCTRL_VIN3STS_Msk          BIT(SYSTEM_VIVOCTRL_VIN3STS_Pos)
+#define SYSTEM_VIVOCTRL_VIN4STS_Pos          (10UL)
+#define SYSTEM_VIVOCTRL_VIN4STS_Msk          BIT(SYSTEM_VIVOCTRL_VIN4STS_Pos)
+#define SYSTEM_VIVOCTRL_VIN5STS_Pos          (11UL)
+#define SYSTEM_VIVOCTRL_VIN5STS_Msk          BIT(SYSTEM_VIVOCTRL_VIN5STS_Pos)
+#define SYSTEM_VIVOCTRL_VIN0POL_Pos          (12UL)
+#define SYSTEM_VIVOCTRL_VIN0POL_Msk          BIT(SYSTEM_VIVOCTRL_VIN0POL_Pos)
+#define SYSTEM_VIVOCTRL_VIN1POL_Pos          (13UL)
+#define SYSTEM_VIVOCTRL_VIN1POL_Msk          BIT(SYSTEM_VIVOCTRL_VIN1POL_Pos)
+#define SYSTEM_VIVOCTRL_VIN2POL_Pos          (14UL)
+#define SYSTEM_VIVOCTRL_VIN2POL_Msk          BIT(SYSTEM_VIVOCTRL_VIN2POL_Pos)
+#define SYSTEM_VIVOCTRL_VIN3POL_Pos          (15UL)
+#define SYSTEM_VIVOCTRL_VIN3POL_Msk          BIT(SYSTEM_VIVOCTRL_VIN3POL_Pos)
+#define SYSTEM_VIVOCTRL_VIN4POL_Pos          (16UL)
+#define SYSTEM_VIVOCTRL_VIN4POL_Msk          BIT(SYSTEM_VIVOCTRL_VIN4POL_Pos)
+#define SYSTEM_VIVOCTRL_VIN5POL_Pos          (17UL)
+#define SYSTEM_VIVOCTRL_VIN5POL_Msk          BIT(SYSTEM_VIVOCTRL_VIN5POL_Pos)
+#define SYSTEM_VIVOCTRL_REGWREN_Pos          (30UL)
+#define SYSTEM_VIVOCTRL_REGWREN_Msk          BIT(SYSTEM_VIVOCTRL_REGWREN_Pos)
+#define SYSTEM_VIVOCTRL_VOUTMD_Pos           (31UL)
+#define SYSTEM_VIVOCTRL_VOUTMD_Msk           BIT(SYSTEM_VIVOCTRL_VOUTMD_Pos)
+/* LDOCTRL */
+#define SYSTEM_LDOCTRL_LDO2EN_Pos            (3UL)
+#define SYSTEM_LDOCTRL_LDO2EN_Msk            BIT(SYSTEM_LDOCTRL_LDO2EN_Pos)
+#define SYSTEM_LDOCTRL_LDO3EN_Pos            (7UL)
+#define SYSTEM_LDOCTRL_LDO3EN_Msk            BIT(SYSTEM_LDOCTRL_LDO3EN_Pos)
+/* RC25MCTRL */
+#define SYSTEM_RC25MCTRL_EN_Pos              (0UL)
+#define SYSTEM_RC25MCTRL_EN_Msk              BIT(SYSTEM_RC25MCTRL_EN_Pos)
+#define SYSTEM_RC25MCTRL_CALCURR_Pos         (1UL)
+#define SYSTEM_RC25MCTRL_CALCURR_Msk         GENMASK(7, 1)
+/* PLLCTRL */
+#define SYSTEM_PLLCTRL_EN_Pos                (0UL)
+#define SYSTEM_PLLCTRL_EN_Msk                BIT(SYSTEM_PLLCTRL_EN_Pos)
+#define SYSTEM_PLLCTRL_RDY_Pos               (19UL)
+#define SYSTEM_PLLCTRL_RDY_Msk               BIT(SYSTEM_PLLCTRL_RDY_Pos)
+/* RC32KCTRL */
+#define SYSTEM_RC32KCTRL_EN_Pos              (0UL)
+#define SYSTEM_RC32KCTRL_EN_Msk              BIT(SYSTEM_RC32KCTRL_EN_Pos)
+#define SYSTEM_RC32KCTRL_CAL_Pos             (1UL)
+#define SYSTEM_RC32KCTRL_CAL_Msk             GENMASK(7, 1)
+/* PERICLKPWR2 */
+#define SYSTEM_PERICLKPWR2_RTCCLKPWR_Pos     (0UL)
+#define SYSTEM_PERICLKPWR2_RTCCLKPWR_Msk     BIT(SYSTEM_PERICLKPWR2_RTCCLKPWR_Pos)
+#define SYSTEM_PERICLKPWR2_WDTCLKPWR_Pos     (1UL)
+#define SYSTEM_PERICLKPWR2_WDTCLKPWR_Msk     BIT(SYSTEM_PERICLKPWR2_WDTCLKPWR_Pos)
+#define SYSTEM_PERICLKPWR2_PWRBTNCLKPWR_Pos  (2UL)
+#define SYSTEM_PERICLKPWR2_PWRBTNCLKPWR_Msk  BIT(SYSTEM_PERICLKPWR2_PWRBTNCLKPWR_Pos)
+#define SYSTEM_PERICLKPWR2_RC32KSRC_Pos      (30UL)
+#define SYSTEM_PERICLKPWR2_RC32KSRC_Msk      GENMASK(31, 30)
+
+#endif /* ZEPHYR_SOC_REALTEK_RTS5912_REG_SYSTEM_H */

From 80f4c1f21d1c8a0c223e38b847a06d6a403ec9ff Mon Sep 17 00:00:00 2001
From: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
Date: Fri, 22 Nov 2024 17:07:43 +0800
Subject: [PATCH 2805/2913] [nrf fromtree] driver: pinctrl: Add pinctrl initial
 version of RTS5912.

Add pinctrl driver for Realtek RTS5912.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 2c25182572fce020f5cf3bb2e432cba156009f4d)
Signed-off-by: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
---
 drivers/pinctrl/CMakeLists.txt                |   1 +
 drivers/pinctrl/Kconfig                       |   1 +
 drivers/pinctrl/Kconfig.realtek_rts5912       |  10 +
 drivers/pinctrl/pinctrl_realtek_rts5912.c     |  38 ++
 dts/arm/realtek/ec/rts5912-pinctrl.dtsi       | 645 ++++++++++++++++++
 dts/arm/realtek/ec/rts5912.dtsi               |   7 +
 .../pinctrl/realtek,rts5912-pinctrl.yaml      |  54 ++
 .../pinctrl/realtek-rts5912-pinctrl.h         |  48 ++
 soc/realtek/ec/common/pinctrl_soc.h           |  63 ++
 9 files changed, 867 insertions(+)
 create mode 100644 drivers/pinctrl/Kconfig.realtek_rts5912
 create mode 100644 drivers/pinctrl/pinctrl_realtek_rts5912.c
 create mode 100644 dts/arm/realtek/ec/rts5912-pinctrl.dtsi
 create mode 100644 dts/bindings/pinctrl/realtek,rts5912-pinctrl.yaml
 create mode 100644 include/zephyr/dt-bindings/pinctrl/realtek-rts5912-pinctrl.h
 create mode 100644 soc/realtek/ec/common/pinctrl_soc.h

diff --git a/drivers/pinctrl/CMakeLists.txt b/drivers/pinctrl/CMakeLists.txt
index 0a27a2d4786..e56922d083e 100644
--- a/drivers/pinctrl/CMakeLists.txt
+++ b/drivers/pinctrl/CMakeLists.txt
@@ -43,5 +43,6 @@ zephyr_library_sources_ifdef(CONFIG_PINCTRL_IMX_SCMI pinctrl_imx_scmi.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_MCHP_MEC5 pinctrl_mchp_mec5.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_WCH_AFIO pinctrl_wch_afio.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_SY1XX pinctrl_sy1xx.c)
+zephyr_library_sources_ifdef(CONFIG_PINCTRL_REALTEK_RTS5912 pinctrl_realtek_rts5912.c)
 
 add_subdirectory(renesas)
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index d5872387090..299372eea7f 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -70,6 +70,7 @@ source "drivers/pinctrl/Kconfig.max32"
 source "drivers/pinctrl/Kconfig.mec5"
 source "drivers/pinctrl/Kconfig.wch_afio"
 source "drivers/pinctrl/Kconfig.sy1xx"
+source "drivers/pinctrl/Kconfig.realtek_rts5912"
 
 rsource "renesas/Kconfig"
 
diff --git a/drivers/pinctrl/Kconfig.realtek_rts5912 b/drivers/pinctrl/Kconfig.realtek_rts5912
new file mode 100644
index 00000000000..12b926b3f52
--- /dev/null
+++ b/drivers/pinctrl/Kconfig.realtek_rts5912
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+config PINCTRL_REALTEK_RTS5912
+	bool "Pin controller driver for REALTEK RTS MCUs"
+	default y if DT_HAS_REALTEK_RTS5912_PINCTRL_ENABLED
+	help
+	  Enable pin controller driver for REALTEK RTS MCUs
diff --git a/drivers/pinctrl/pinctrl_realtek_rts5912.c b/drivers/pinctrl/pinctrl_realtek_rts5912.c
new file mode 100644
index 00000000000..5764a73f086
--- /dev/null
+++ b/drivers/pinctrl/pinctrl_realtek_rts5912.c
@@ -0,0 +1,38 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
+ */
+
+#define DT_DRV_COMPAT realtek_rts5912_pinctrl
+
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/realtek-rts5912-pinctrl.h>
+
+#include <reg/reg_gpio.h>
+
+#define REALTEK_RTS5912_PINMUX_GET_GPIO_PIN(n)                                                     \
+	(((((n) >> REALTEK_RTS5912_GPIO_LOW_POS) & REALTEK_RTS5912_GPIO_LOW_MSK)) |                \
+	 (((((n) >> REALTEK_RTS5912_GPIO_HIGH_POS) & REALTEK_RTS5912_GPIO_HIGH_MSK)) << 5))
+
+#define PURE_PINMUX_MASK                   (GENMASK(31, 24) | GENMASK(17, 8) | GENMASK(2, 0))
+#define REALTEK_RTS5912_GET_PURE_PINMUX(n) (n & PURE_PINMUX_MASK)
+
+static volatile GPIO_Type *pinctrl_base =
+	(volatile GPIO_Type *)(DT_REG_ADDR(DT_NODELABEL(pinctrl)));
+
+int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, uintptr_t reg)
+{
+	ARG_UNUSED(reg);
+	uint32_t pin, pinmux, func;
+
+	for (uint8_t i = 0U; i < pin_cnt; i++) {
+		pinmux = (uint32_t)pins[i];
+		pin = REALTEK_RTS5912_PINMUX_GET_GPIO_PIN(pinmux);
+		func = REALTEK_RTS5912_GET_PURE_PINMUX(pinmux);
+		pinctrl_base->GCR[pin] = func;
+	}
+
+	return 0;
+}
diff --git a/dts/arm/realtek/ec/rts5912-pinctrl.dtsi b/dts/arm/realtek/ec/rts5912-pinctrl.dtsi
new file mode 100644
index 00000000000..3ac81a34862
--- /dev/null
+++ b/dts/arm/realtek/ec/rts5912-pinctrl.dtsi
@@ -0,0 +1,645 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ *
+ */
+
+#include <zephyr/dt-bindings/pinctrl/realtek-rts5912-pinctrl.h>
+
+&pinctrl
+{
+	/* ADC PINCTRL SETTING START */
+	/omit-if-no-ref/ adc0_gpio074: adc0_gpio074 {
+			pinmux = <REALTEK_RTS5912_PINMUX(74, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ adc1_gpio075: adc1_gpio075 {
+			pinmux = <REALTEK_RTS5912_PINMUX(75, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ adc2_gpio076: adc2_gpio076 {
+			pinmux = <REALTEK_RTS5912_PINMUX(76, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ adc3_gpio077: adc3_gpio077 {
+			pinmux = <REALTEK_RTS5912_PINMUX(77, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ adc4_gpio078: adc4_gpio078 {
+			pinmux = <REALTEK_RTS5912_PINMUX(78, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ adc5_gpio079: adc5_gpio079 {
+			pinmux = <REALTEK_RTS5912_PINMUX(79, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ adc6_gpio080: adc6_gpio080 {
+			pinmux = <REALTEK_RTS5912_PINMUX(80, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ adc7_gpio081: adc7_gpio081 {
+			pinmux = <REALTEK_RTS5912_PINMUX(81, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ adc8_gpio082: adc8_gpio082 {
+			pinmux = <REALTEK_RTS5912_PINMUX(82, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ adc9_gpio054: adc9_gpio054 {
+			pinmux = <REALTEK_RTS5912_PINMUX(54, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ adc10_gpio098: adc10_gpio098 {
+			pinmux = <REALTEK_RTS5912_PINMUX(98, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ adc11_gpio024: adc11_gpio024 {
+			pinmux = <REALTEK_RTS5912_PINMUX(24, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/* ADC PINCTRL SETTING END */
+	/* ESPI PINCTRL SETTING START */
+	/omit-if-no-ref/ espi_alert_gpio003: espi_alert_gpio003 {
+			pinmux = <REALTEK_RTS5912_PINMUX(3, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ espi_cs_gpio004: espi_cs_gpio004 {
+			pinmux = <REALTEK_RTS5912_PINMUX(4, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ espi_io3_gpio005: espi_io3_gpio005 {
+			pinmux = <REALTEK_RTS5912_PINMUX(5, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ espi_io2_gpio006: espi_io2_gpio006 {
+			pinmux = <REALTEK_RTS5912_PINMUX(6, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ espi_io1_gpio007: espi_io1_gpio007 {
+			pinmux = <REALTEK_RTS5912_PINMUX(7, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ espi_io0_gpio008: espi_io0_gpio008 {
+			pinmux = <REALTEK_RTS5912_PINMUX(8, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ espi_clk_gpio009: espi_clk_gpio009 {
+			pinmux = <REALTEK_RTS5912_PINMUX(9, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ espi_reset_gpio020: espi_reset_gpio020 {
+			pinmux = <REALTEK_RTS5912_PINMUX(20, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/* ESPI PINCTRL SETTING END */
+	/* I2C PINCTRL SETTING START */
+	/omit-if-no-ref/ i2c00_clk_gpio094: i2c00_clk_gpio094 {
+			pinmux = <REALTEK_RTS5912_PINMUX(94, FUNC2)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ i2c00_data_gpio095: i2c00_data_gpio095 {
+			pinmux = <REALTEK_RTS5912_PINMUX(95, FUNC2)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ i2c00_clk_gpio115: i2c00_clk_gpio115 {
+			pinmux = <REALTEK_RTS5912_PINMUX(115, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ i2c00_data_gpio131: i2c00_data_gpio131 {
+			pinmux = <REALTEK_RTS5912_PINMUX(131, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ i2c01_clk_gpio118: i2c01_clk_gpio118 {
+			pinmux = <REALTEK_RTS5912_PINMUX(118, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ i2c01_data_gpio119: i2c01_data_gpio119 {
+			pinmux = <REALTEK_RTS5912_PINMUX(119, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ i2c02_clk_gpio014: i2c02_clk_gpio014 {
+			pinmux = <REALTEK_RTS5912_PINMUX(14, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ i2c02_data_gpio121: i2c02_data_gpio121 {
+			pinmux = <REALTEK_RTS5912_PINMUX(121, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ i2c03_clk_gpio100: i2c03_clk_gpio100 {
+			pinmux = <REALTEK_RTS5912_PINMUX(100, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ i2c03_data_gpio101: i2c03_data_gpio101 {
+			pinmux = <REALTEK_RTS5912_PINMUX(101, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ i2c04_clk_gpio017: i2c04_clk_gpio017 {
+			pinmux = <REALTEK_RTS5912_PINMUX(17, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ i2c04_data_gpio018: i2c04_data_gpio018 {
+			pinmux = <REALTEK_RTS5912_PINMUX(18, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ i2c05_clk_gpio027: i2c05_clk_gpio027 {
+			pinmux = <REALTEK_RTS5912_PINMUX(27, FUNC2)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ i2c05_data_gpio028: i2c05_data_gpio028 {
+			pinmux = <REALTEK_RTS5912_PINMUX(28, FUNC2)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ i2c05_clk_gpio128: i2c05_clk_gpio128 {
+			pinmux = <REALTEK_RTS5912_PINMUX(128, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ i2c05_data_gpio130: i2c05_data_gpio130 {
+			pinmux = <REALTEK_RTS5912_PINMUX(130, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ i2c06_clk_gpio036: i2c06_clk_gpio036 {
+			pinmux = <REALTEK_RTS5912_PINMUX(36, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ i2c06_data_gpio037: i2c06_data_gpio037 {
+			pinmux = <REALTEK_RTS5912_PINMUX(37, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ i2c07_clk_gpio038: i2c07_clk_gpio038 {
+			pinmux = <REALTEK_RTS5912_PINMUX(38, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ i2c07_data_gpio039: i2c07_data_gpio039 {
+			pinmux = <REALTEK_RTS5912_PINMUX(39, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/* I2C PINCTRL SETTING END */
+	/* JTAG PINCTRL SETTING START */
+	/omit-if-no-ref/ jtag_tdi_gpio87: jtag_tdi_gpio87 {
+			pinmux = <REALTEK_RTS5912_PINMUX(87, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ jtag_tdo_gpio88: jtag_tdo_gpio88 {
+			pinmux = <REALTEK_RTS5912_PINMUX(88, FUNC3)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ jtag_rst_gpio89: jtag_rst_gpio89 {
+			pinmux = <REALTEK_RTS5912_PINMUX(89, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ jtag_clk_gpio90: jtag_clk_gpio90 {
+			pinmux = <REALTEK_RTS5912_PINMUX(90, FUNC2)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ jtag_tms_gpio91: jtag_tms_gpio91 {
+			pinmux = <REALTEK_RTS5912_PINMUX(91, FUNC2)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/* JTAG PINCTRL SETTING END */
+	/* KSM PINCTRL SETTING START */
+	/* KSO PINCTRL SETTING START */
+	/omit-if-no-ref/ kso0_gpio041: kso0_gpio041 {
+			pinmux = <REALTEK_RTS5912_PINMUX(41, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ kso1_gpio042: kso1_gpio042 {
+			pinmux = <REALTEK_RTS5912_PINMUX(42, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ kso2_gpio043: kso2_gpio043 {
+			pinmux = <REALTEK_RTS5912_PINMUX(43, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ kso3_gpio044: kso3_gpio044 {
+			pinmux = <REALTEK_RTS5912_PINMUX(44, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ kso4_gpio045: kso4_gpio045 {
+			pinmux = <REALTEK_RTS5912_PINMUX(45, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ kso5_gpio046: kso5_gpio046 {
+			pinmux = <REALTEK_RTS5912_PINMUX(46, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ kso6_gpio047: kso6_gpio047 {
+			pinmux = <REALTEK_RTS5912_PINMUX(47, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ kso7_gpio048: kso7_gpio048 {
+			pinmux = <REALTEK_RTS5912_PINMUX(48, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ kso8_gpio049: kso8_gpio049 {
+			pinmux = <REALTEK_RTS5912_PINMUX(49, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ kso9_gpio050: kso9_gpio050 {
+			pinmux = <REALTEK_RTS5912_PINMUX(50, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ kso10_gpio051: kso10_gpio051 {
+			pinmux = <REALTEK_RTS5912_PINMUX(51, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ kso11_gpio055: kso11_gpio055 {
+			pinmux = <REALTEK_RTS5912_PINMUX(55, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ kso12_gpio056: kso12_gpio056 {
+			pinmux = <REALTEK_RTS5912_PINMUX(56, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ kso13_gpio057: kso13_gpio057 {
+			pinmux = <REALTEK_RTS5912_PINMUX(57, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ kso14_gpio058: kso14_gpio058 {
+			pinmux = <REALTEK_RTS5912_PINMUX(58, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ kso15_gpio059: kso15_gpio059 {
+			pinmux = <REALTEK_RTS5912_PINMUX(59, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ kso16_gpio060: kso16_gpio060 {
+			pinmux = <REALTEK_RTS5912_PINMUX(60, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ kso17_gpio061: kso17_gpio061 {
+			pinmux = <REALTEK_RTS5912_PINMUX(61, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ kso18_gpio092: kso18_gpio092 {
+			pinmux = <REALTEK_RTS5912_PINMUX(92, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ kso19_gpio093: kso19_gpio093 {
+			pinmux = <REALTEK_RTS5912_PINMUX(93, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/* KSO PINCTRL SETTING END */
+	/* KSI PINCTRL SETTING START */
+	/omit-if-no-ref/ ksi0_gpio064: ksi0_gpio064 {
+			pinmux = <REALTEK_RTS5912_PINMUX(64, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ ksi1_gpio065: ksi1_gpio065 {
+			pinmux = <REALTEK_RTS5912_PINMUX(65, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ ksi2_gpio066: ksi2_gpio066 {
+			pinmux = <REALTEK_RTS5912_PINMUX(66, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ ksi3_gpio067: ksi3_gpio067 {
+			pinmux = <REALTEK_RTS5912_PINMUX(67, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ ksi4_gpio068: ksi4_gpio068 {
+			pinmux = <REALTEK_RTS5912_PINMUX(68, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ ksi5_gpio069: ksi5_gpio069 {
+			pinmux = <REALTEK_RTS5912_PINMUX(69, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ ksi6_gpio070: ksi6_gpio070 {
+			pinmux = <REALTEK_RTS5912_PINMUX(70, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ ksi7_gpio071: ksi7_gpio071 {
+			pinmux = <REALTEK_RTS5912_PINMUX(71, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ ksi8_gpio054: ksi8_gpio054 {
+			pinmux = <REALTEK_RTS5912_PINMUX(54, FUNC3)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ ksi9_gpio098: ksi9_gpio098 {
+			pinmux = <REALTEK_RTS5912_PINMUX(98, FUNC2)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/* KSO PINCTRL SETTING END */
+	/* KSM PINCTRL SETTING END */
+	/* PS2 PINCTRL SETTING START */
+	/omit-if-no-ref/ ps2clk0_gpio092: ps2clk0_gpio092 {
+			pinmux = <REALTEK_RTS5912_PINMUX(92, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ ps2data0_gpio093: ps2data0_gpio093 {
+			pinmux = <REALTEK_RTS5912_PINMUX(93, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ ps2clk0_gpio096: ps2clk0_gpio096 {
+			pinmux = <REALTEK_RTS5912_PINMUX(96, FUNC2)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ ps2data0_gpio097: ps2data0_gpio097 {
+			pinmux = <REALTEK_RTS5912_PINMUX(97, FUNC2)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/* PS2 PINCTRL SETTING END */
+	/* PWM PINCTRL SETTING START */
+	/omit-if-no-ref/ pwm0_gpio022: pwm0_gpio022 {
+			pinmux = <REALTEK_RTS5912_PINMUX(22, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ pwm1_gpio023: pwm1_gpio023 {
+			pinmux = <REALTEK_RTS5912_PINMUX(23, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ pwm2_gpio025: pwm2_gpio025 {
+			pinmux = <REALTEK_RTS5912_PINMUX(25, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ pwm3_gpio026: pwm3_gpio026 {
+			pinmux = <REALTEK_RTS5912_PINMUX(26, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ pwm4_gpio027: pwm4_gpio027 {
+			pinmux = <REALTEK_RTS5912_PINMUX(27, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ pwm5_gpio028: pwm5_gpio028 {
+			pinmux = <REALTEK_RTS5912_PINMUX(28, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ pwm6_gpio029: pwm6_gpio029 {
+			pinmux = <REALTEK_RTS5912_PINMUX(29, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ pwm7_gpio031: pwm7_gpio031 {
+			pinmux = <REALTEK_RTS5912_PINMUX(31, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ pwm8_gpio032: pwm8_gpio032 {
+			pinmux = <REALTEK_RTS5912_PINMUX(32, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ pwm9_gpio033: pwm9_gpio033 {
+			pinmux = <REALTEK_RTS5912_PINMUX(33, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ pwm10_gpio034: pwm10_gpio034 {
+			pinmux = <REALTEK_RTS5912_PINMUX(34, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ pwm11_gpio035: pwm11_gpio035 {
+			pinmux = <REALTEK_RTS5912_PINMUX(35, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/* PWM PINCTRL SETTING END */
+	/* SPIC PINCTRL SETTING START */
+	/omit-if-no-ref/ spic_cs_gpio107: spic_cs_gpio107 {
+			pinmux = <REALTEK_RTS5912_PINMUX(107, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ spic_si_gpio108: spic_si_gpio108 {
+			pinmux = <REALTEK_RTS5912_PINMUX(108, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ spic_so_gpio109: spic_so_gpio109 {
+			pinmux = <REALTEK_RTS5912_PINMUX(109, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ spic_clk_gpio111: spic_clk_gpio111 {
+			pinmux = <REALTEK_RTS5912_PINMUX(111, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ spic_io2_gpio124: spic_io2_gpio124 {
+			pinmux = <REALTEK_RTS5912_PINMUX(124, FUNC2)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ spic_io3_gpio122: spic_io3_gpio122 {
+			pinmux = <REALTEK_RTS5912_PINMUX(122, FUNC2)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/* SPIC PINCTRL SETTING END */
+	/* TACHO PINCTRL SETTING START */
+	/omit-if-no-ref/ tacho0_gpio052: tacho0_gpio052 {
+			pinmux = <REALTEK_RTS5912_PINMUX(52, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ tacho1_gpio053: tacho1_gpio053 {
+			pinmux = <REALTEK_RTS5912_PINMUX(53, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ tacho1_gpio086: tacho1_gpio086 {
+			pinmux = <REALTEK_RTS5912_PINMUX(86, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ tacho2_gpio085: tacho2_gpio085 {
+			pinmux = <REALTEK_RTS5912_PINMUX(85, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ tacho3_gpio083: tacho3_gpio083 {
+			pinmux = <REALTEK_RTS5912_PINMUX(83, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ tacho3_gpio084: tacho3_gpio084 {
+			pinmux = <REALTEK_RTS5912_PINMUX(84, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/* TACHO PINCTRL SETTING END */
+	/* UART PINCTRL SETTING START */
+	/omit-if-no-ref/ uart_rx_gpio113: uart0_rx_gpio113 {
+			pinmux = <REALTEK_RTS5912_PINMUX(113, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ uart_tx_gpio114: uart0_tx_gpio114 {
+			pinmux = <REALTEK_RTS5912_PINMUX(114, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ uart_rx_gpio014: uart1_rx_gpio014 {
+			pinmux = <REALTEK_RTS5912_PINMUX(14, FUNC2)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ uart_tx_gpio015: uart1_tx_gpio015 {
+			pinmux = <REALTEK_RTS5912_PINMUX(15, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ uart_rx_gpio100: uart_rx_gpio100 {
+			pinmux = <REALTEK_RTS5912_PINMUX(100, FUNC2)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ uart_tx_gpio101: uart_tx_gpio101 {
+			pinmux = <REALTEK_RTS5912_PINMUX(101, FUNC2)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+
+	/omit-if-no-ref/ uart_dtr_gpio039: uart_dtr_gpio039 {
+			pinmux = <REALTEK_RTS5912_PINMUX(39, FUNC2)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ uart_rts_gpio040: uart_rts_gpio040 {
+			pinmux = <REALTEK_RTS5912_PINMUX(40, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ uart_dcd_gpio079: uart_dcd_gpio079 {
+			pinmux = <REALTEK_RTS5912_PINMUX(79, FUNC2)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ uart_dsr_gpio080: uart_dsr_gpio080 {
+			pinmux = <REALTEK_RTS5912_PINMUX(80, FUNC2)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ uart_cts_gpio081: uart_cts_gpio081 {
+			pinmux = <REALTEK_RTS5912_PINMUX(81, FUNC2)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ uart_ri_gpio088: uart_ri_gpio088 {
+			pinmux = <REALTEK_RTS5912_PINMUX(88, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/omit-if-no-ref/ uart_dtr_gpio124: uart_dtr_gpio124 {
+			pinmux = <REALTEK_RTS5912_PINMUX(124, FUNC1)>;
+			input-enable;
+			input-schmitt-enable;
+	};
+	/* UART PINCTRL SETTING END */
+};
diff --git a/dts/arm/realtek/ec/rts5912.dtsi b/dts/arm/realtek/ec/rts5912.dtsi
index 78115d654fb..3bd1b120eac 100644
--- a/dts/arm/realtek/ec/rts5912.dtsi
+++ b/dts/arm/realtek/ec/rts5912.dtsi
@@ -72,6 +72,13 @@
 			clocks = <&rc25m>, <&pll>;
 			clock-names = "rc25m", "pll";
 		};
+
+		pinctrl: pin-controller@40090000 {
+			compatible = "realtek,rts5912-pinctrl";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			reg = <0x40090000 0x300>;
+		};
 	};
 };
 
diff --git a/dts/bindings/pinctrl/realtek,rts5912-pinctrl.yaml b/dts/bindings/pinctrl/realtek,rts5912-pinctrl.yaml
new file mode 100644
index 00000000000..c5b00ae822a
--- /dev/null
+++ b/dts/bindings/pinctrl/realtek,rts5912-pinctrl.yaml
@@ -0,0 +1,54 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+description: |
+     This binding gives a base representation of the pins configuration
+
+compatible: "realtek,rts5912-pinctrl"
+
+include: [base.yaml, pinctrl-device.yaml, pincfg-node.yaml]
+
+properties:
+  reg:
+    required: true
+
+child-binding:
+  description: |
+    This binding gives a base representation of the pins configuration
+
+  include:
+    - name: pincfg-node.yaml
+      property-allowlist:
+        - bias-pull-down
+        - bias-pull-up
+        - drive-push-pull
+        - drive-open-drain
+        - input-enable
+        - output-enable
+        - output-high
+        - output-low
+        - input-schmitt-enable
+
+  properties:
+    pinmux:
+      type: int
+      required: true
+      description: Pinmux selection
+    drive-strength:
+      type: string
+      enum:
+        - "low"
+        - "high"
+      description: |
+        "low" — 4mA/8mA drive strength
+        "high" — 8mA/12mA drive strength
+    slew-rate:
+      type: string
+      enum:
+        - "fast"
+        - "low"
+      description: |
+        "fast" — Fast Frequency Slew Rate
+        "slow" — Slow Frequency Slew Rate
diff --git a/include/zephyr/dt-bindings/pinctrl/realtek-rts5912-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/realtek-rts5912-pinctrl.h
new file mode 100644
index 00000000000..9954f4105d7
--- /dev/null
+++ b/include/zephyr/dt-bindings/pinctrl/realtek-rts5912-pinctrl.h
@@ -0,0 +1,48 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_REALTEK_RTS5912_PINCTRL_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_REALTEK_RTS5912_PINCTRL_H_
+
+#include <zephyr/dt-bindings/dt-util.h>
+
+#define REALTEK_RTS5912_GPIO_INOUT     BIT(0) /* IN/OUT : 0 input 1 output */
+#define REALTEK_RTS5912_GPIO_PINON     BIT(1) /* Input_detect : 1 enable 0 disable */
+#define REALTEK_RTS5912_GPIO_VOLT      BIT(2) /* Pin Volt : 1 1.8V 0 3.3V */
+#define REALTEK_RTS5912_FUNC0          0      /* GPIO mode */
+#define REALTEK_RTS5912_FUNC1          BIT(8) /* Function mode use BIT0~2 */
+#define REALTEK_RTS5912_FUNC2          BIT(9)
+#define REALTEK_RTS5912_FUNC3          ((BIT(8)) | (BIT(9)))
+#define REALTEK_RTS5912_FUNC4          BIT(10)
+
+#define REALTEK_RTS5912_INPUT_OUTPUT_POS    0
+#define REALTEK_RTS5912_INPUT_DETECTION_POS 1
+#define REALTEK_RTS5912_VOLTAGE_POS         2
+#define REALTEK_RTS5912_DRV_STR_POS         11
+#define REALTEK_RTS5912_SLEW_RATE_POS       12
+#define REALTEK_RTS5912_PD_POS              13
+#define REALTEK_RTS5912_PU_POS              14
+#define REALTEK_RTS5912_SCHMITTER_POS       15
+#define REALTEK_RTS5912_TYPE_POS            16
+#define REALTEK_RTS5912_HIGH_LOW_POS        17
+
+#define REALTEK_RTS5912_GPIO_HIGH_POS 18
+#define REALTEK_RTS5912_GPIO_HIGH_MSK 0x3f
+#define REALTEK_RTS5912_GPIO_LOW_POS  3
+#define REALTEK_RTS5912_GPIO_LOW_MSK  0x1f
+
+#define FUNC0 REALTEK_RTS5912_FUNC0
+#define FUNC1 REALTEK_RTS5912_FUNC1
+#define FUNC2 REALTEK_RTS5912_FUNC2
+#define FUNC3 REALTEK_RTS5912_FUNC3
+#define FUNC4 REALTEK_RTS5912_FUNC4
+
+#define REALTEK_RTS5912_PINMUX(n, f)                                                               \
+	(((((n) >> 5) & REALTEK_RTS5912_GPIO_HIGH_MSK) << REALTEK_RTS5912_GPIO_HIGH_POS) |         \
+	 (((n) & REALTEK_RTS5912_GPIO_LOW_MSK) << REALTEK_RTS5912_GPIO_LOW_POS) | (f))
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_REALTEK_RTS5912_PINCTRL_H_ */
diff --git a/soc/realtek/ec/common/pinctrl_soc.h b/soc/realtek/ec/common/pinctrl_soc.h
new file mode 100644
index 00000000000..5ca47e1e8a5
--- /dev/null
+++ b/soc/realtek/ec/common/pinctrl_soc.h
@@ -0,0 +1,63 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
+ */
+
+/**
+ * @file
+ * realtek SoC specific helpers for pinctrl driver
+ */
+
+#ifndef ZEPHYR_SOC_ARM_REALTEK_COMMON_PINCTRL_SOC_H_
+#define ZEPHYR_SOC_ARM_REALTEK_COMMON_PINCTRL_SOC_H_
+
+#include <zephyr/devicetree.h>
+#include <zephyr/dt-bindings/pinctrl/realtek-rts5912-pinctrl.h>
+#include <zephyr/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @cond INTERNAL_HIDDEN */
+
+typedef uint32_t pinctrl_soc_pin_t;
+
+/**
+ * @brief Utility macro to initialize each pin.
+ *
+ * @param node_id Node identifier.
+ * @param prop Property name.
+ * @param idx Property entry index.
+ */
+#define Z_PINCTRL_REALTEK_RTS5912_PINMUX_INIT(node_id) (uint32_t)(DT_PROP(node_id, pinmux))
+
+#define Z_PINCTRL_STATE_PINCFG_INIT(node_id)                                                       \
+	((DT_PROP(node_id, bias_pull_down) << REALTEK_RTS5912_PD_POS) |                            \
+	 (DT_PROP(node_id, bias_pull_up) << REALTEK_RTS5912_PU_POS) |                              \
+	 (DT_PROP(node_id, drive_open_drain) << REALTEK_RTS5912_TYPE_POS) |                        \
+	 (DT_PROP(node_id, output_high) << REALTEK_RTS5912_HIGH_LOW_POS) |                         \
+	 (DT_PROP(node_id, output_enable) << REALTEK_RTS5912_INPUT_OUTPUT_POS) |                   \
+	 (DT_PROP(node_id, input_schmitt_enable) << REALTEK_RTS5912_SCHMITTER_POS) |               \
+	 (DT_PROP(node_id, input_enable) << REALTEK_RTS5912_INPUT_DETECTION_POS) |                 \
+	 (DT_ENUM_IDX_OR(node_id, slew_rate, 0x0) << REALTEK_RTS5912_SLEW_RATE_POS) |              \
+	 (DT_ENUM_IDX_OR(node_id, drive_strength, 0x0) << REALTEK_RTS5912_DRV_STR_POS))
+
+#define Z_PINCTRL_STATE_PIN_INIT(node_id, state_prop, idx)                                         \
+	(Z_PINCTRL_REALTEK_RTS5912_PINMUX_INIT(DT_PROP_BY_IDX(node_id, state_prop, idx)) |         \
+	 Z_PINCTRL_STATE_PINCFG_INIT(DT_PROP_BY_IDX(node_id, state_prop, idx))),
+
+#define Z_PINCTRL_STATE_PINS_INIT(node_id, prop)                                                   \
+	{                                                                                          \
+		DT_FOREACH_PROP_ELEM(node_id, prop, Z_PINCTRL_STATE_PIN_INIT)                      \
+	}
+
+/** @endcond */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_SOC_ARM_REALTEK_COMMON_PINCTRL_SOC_H_ */

From 56f2e5445b40eb8b307c350f8fcaed4811c617b5 Mon Sep 17 00:00:00 2001
From: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
Date: Fri, 22 Nov 2024 18:23:37 +0800
Subject: [PATCH 2806/2913] [nrf fromtree] soc: realrek: ec: Add debug_swj
 initial version of RTS5912.

Add swj driver for Realtek RTS5912.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 471cc3512d0ea043876bed42220882bc11c9cb56)
Signed-off-by: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
---
 dts/arm/realtek/ec/rts5912.dtsi       |  7 +++++++
 soc/realtek/ec/rts5912/CMakeLists.txt |  2 ++
 soc/realtek/ec/rts5912/debug_swj.c    | 27 +++++++++++++++++++++++++++
 soc/realtek/ec/rts5912/debug_swj.h    |  8 ++++++++
 soc/realtek/ec/rts5912/soc.c          | 10 ++++++++++
 5 files changed, 54 insertions(+)
 create mode 100644 soc/realtek/ec/rts5912/debug_swj.c
 create mode 100644 soc/realtek/ec/rts5912/debug_swj.h

diff --git a/dts/arm/realtek/ec/rts5912.dtsi b/dts/arm/realtek/ec/rts5912.dtsi
index 3bd1b120eac..b5f6daad4c7 100644
--- a/dts/arm/realtek/ec/rts5912.dtsi
+++ b/dts/arm/realtek/ec/rts5912.dtsi
@@ -80,6 +80,13 @@
 			reg = <0x40090000 0x300>;
 		};
 	};
+
+	swj_port: swj-port {
+		compatible = "swj-connector";
+		pinctrl-0 = <&jtag_tdi_gpio87 &jtag_tdo_gpio88 &jtag_rst_gpio89
+			     &jtag_clk_gpio90 &jtag_tms_gpio91>;
+		pinctrl-names = "default";
+	};
 };
 
 &nvic {
diff --git a/soc/realtek/ec/rts5912/CMakeLists.txt b/soc/realtek/ec/rts5912/CMakeLists.txt
index 335d40578ba..219c68e5a8d 100644
--- a/soc/realtek/ec/rts5912/CMakeLists.txt
+++ b/soc/realtek/ec/rts5912/CMakeLists.txt
@@ -12,4 +12,6 @@ zephyr_sources_ifdef(CONFIG_PM
   power.c
   )
 
+zephyr_sources_ifdef(CONFIG_DT_HAS_SWJ_CONNECTOR_ENABLED debug_swj.c)
+
 set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/realtek/ec/rts5912/debug_swj.c b/soc/realtek/ec/rts5912/debug_swj.c
new file mode 100644
index 00000000000..c04c9d8c106
--- /dev/null
+++ b/soc/realtek/ec/rts5912/debug_swj.c
@@ -0,0 +1,27 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Titan Chen <titan.chen@realtek.com>
+ */
+
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/init.h>
+
+#define SWJ_NODE DT_NODELABEL(swj_port)
+
+PINCTRL_DT_DEFINE(SWJ_NODE);
+
+const struct pinctrl_dev_config *swj_pcfg = PINCTRL_DT_DEV_CONFIG_GET(SWJ_NODE);
+
+int swj_connector_init(void)
+{
+	int err;
+
+	err = pinctrl_apply_state(swj_pcfg, PINCTRL_STATE_DEFAULT);
+	if (err < 0) {
+		return err;
+	}
+
+	return 0;
+}
diff --git a/soc/realtek/ec/rts5912/debug_swj.h b/soc/realtek/ec/rts5912/debug_swj.h
new file mode 100644
index 00000000000..0f610b7285f
--- /dev/null
+++ b/soc/realtek/ec/rts5912/debug_swj.h
@@ -0,0 +1,8 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
+ */
+
+int swj_connector_init(void);
diff --git a/soc/realtek/ec/rts5912/soc.c b/soc/realtek/ec/rts5912/soc.c
index adb28d75864..ce1e254e051 100644
--- a/soc/realtek/ec/rts5912/soc.c
+++ b/soc/realtek/ec/rts5912/soc.c
@@ -8,6 +8,10 @@
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>
+#include <zephyr/logging/log.h>
+#include "debug_swj.h"
+
+LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 
 #if defined(CONFIG_RTS5912_ON_ENTER_CPU_IDLE_HOOK)
 bool z_arm_on_enter_cpu_idle(void)
@@ -24,5 +28,11 @@ bool z_arm_on_enter_cpu_idle(void)
  */
 void soc_early_init_hook(void)
 {
+	int ret;
+
 	/* Apply device related preinit configuration */
+	ret = swj_connector_init();
+	if (ret < 0) {
+		LOG_ERR("SWJ init failed");
+	}
 }

From d324fb0b3f9d8326b632a1af538417319aea977a Mon Sep 17 00:00:00 2001
From: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
Date: Fri, 22 Nov 2024 18:27:29 +0800
Subject: [PATCH 2807/2913] [nrf fromtree] driver: timer: Add timer driver
 initial version of RTS5912.

Add timer driver for Realtek RTS5912.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit cfb2074a5e939bc6737fa9d63d211ff0f5a2dd94)
Signed-off-by: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
---
 drivers/timer/CMakeLists.txt                  |   1 +
 drivers/timer/Kconfig                         |   1 +
 drivers/timer/Kconfig.realtek_rts5912_rtmr    |  13 +
 drivers/timer/realtek_rts5912_rtmr.c          | 251 ++++++++++++++++++
 dts/arm/realtek/ec/rts5912.dtsi               |  19 ++
 dts/bindings/timer/realtek,rts5912-rtmr.yaml  |  17 ++
 .../timer/realtek,rts5912-slwtimer.yaml       |  30 +++
 soc/realtek/ec/rts5912/reg/reg_rtmr.h         |  31 +++
 8 files changed, 363 insertions(+)
 create mode 100644 drivers/timer/Kconfig.realtek_rts5912_rtmr
 create mode 100644 drivers/timer/realtek_rts5912_rtmr.c
 create mode 100644 dts/bindings/timer/realtek,rts5912-rtmr.yaml
 create mode 100644 dts/bindings/timer/realtek,rts5912-slwtimer.yaml
 create mode 100644 soc/realtek/ec/rts5912/reg/reg_rtmr.h

diff --git a/drivers/timer/CMakeLists.txt b/drivers/timer/CMakeLists.txt
index 2b837fba480..51b0e552f4a 100644
--- a/drivers/timer/CMakeLists.txt
+++ b/drivers/timer/CMakeLists.txt
@@ -33,6 +33,7 @@ zephyr_library_sources_ifdef(CONFIG_NRF_RTC_TIMER nrf_rtc_timer.c)
 zephyr_library_sources_ifdef(CONFIG_RCAR_CMT_TIMER rcar_cmt_timer.c)
 zephyr_library_sources_ifdef(CONFIG_RISCV_MACHINE_TIMER riscv_machine_timer.c)
 zephyr_library_sources_ifdef(CONFIG_RV32M1_LPTMR_TIMER rv32m1_lptmr_timer.c)
+zephyr_library_sources_ifdef(CONFIG_REALTEK_RTS5912_RTMR realtek_rts5912_rtmr.c)
 zephyr_library_sources_ifdef(CONFIG_SAM0_RTC_TIMER sam0_rtc_timer.c)
 zephyr_library_sources_ifdef(CONFIG_SILABS_SLEEPTIMER_TIMER silabs_sleeptimer_timer.c)
 zephyr_library_sources_ifdef(CONFIG_STM32_LPTIM_TIMER stm32_lptim_timer.c)
diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
index a43e666349c..f017589a60e 100644
--- a/drivers/timer/Kconfig
+++ b/drivers/timer/Kconfig
@@ -91,6 +91,7 @@ source "drivers/timer/Kconfig.nrf_xrtc"
 source "drivers/timer/Kconfig.rcar_cmt"
 source "drivers/timer/Kconfig.riscv_machine"
 source "drivers/timer/Kconfig.rv32m1_lptmr"
+source "drivers/timer/Kconfig.realtek_rts5912_rtmr"
 source "drivers/timer/Kconfig.sam0_rtc"
 source "drivers/timer/Kconfig.silabs"
 source "drivers/timer/Kconfig.smartbond"
diff --git a/drivers/timer/Kconfig.realtek_rts5912_rtmr b/drivers/timer/Kconfig.realtek_rts5912_rtmr
new file mode 100644
index 00000000000..560ea7a7059
--- /dev/null
+++ b/drivers/timer/Kconfig.realtek_rts5912_rtmr
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+config REALTEK_RTS5912_RTMR
+	bool "Realtek RTS5912 RTOS Timer"
+	default y if DT_HAS_REALTEK_RTS5912_RTMR_ENABLED
+	select TICKLESS_CAPABLE
+	select SYSTEM_TIMER_HAS_DISABLE_SUPPORT
+	help
+	  This module implements a kernel device driver for the Realtek
+	  RTS5912 series RTOS timer.
diff --git a/drivers/timer/realtek_rts5912_rtmr.c b/drivers/timer/realtek_rts5912_rtmr.c
new file mode 100644
index 00000000000..3476e730999
--- /dev/null
+++ b/drivers/timer/realtek_rts5912_rtmr.c
@@ -0,0 +1,251 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
+ */
+
+#define DT_DRV_COMPAT realtek_rts5912_rtmr
+
+#include <stdint.h>
+
+#include <zephyr/init.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/irq.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/drivers/timer/system_timer.h>
+
+#include <reg/reg_rtmr.h>
+#include <reg/reg_system.h>
+
+#define RTS5912_SCCON_REG_BASE ((SYSTEM_Type *)(DT_REG_ADDR(DT_NODELABEL(sccon))))
+
+#define CYCLES_PER_TICK (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC / CONFIG_SYS_CLOCK_TICKS_PER_SEC)
+
+BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
+	     "Realtek RTOS timer is not supported multiple instances");
+
+#define RTMR_REG ((RTOSTMR_Type *)DT_INST_REG_ADDR(0))
+
+#define SLWTMR_REG                                                                                 \
+	((RTOSTMR_Type *)(DT_REG_ADDR(DT_COMPAT_GET_ANY_STATUS_OKAY(realtek_rts5912_slwtimer))))
+
+#define SSCON_REG ((SYSTEM_Type *)(DT_REG_ADDR(DT_NODELABEL(sccon))))
+
+#define RTMR_COUNTER_MAX   0x0ffffffful
+#define RTMR_COUNTER_MSK   0x0ffffffful
+#define RTMR_TIMER_STOPPED 0xf0000000ul
+
+#define MAX_TICKS ((k_ticks_t)(RTMR_COUNTER_MAX / CYCLES_PER_TICK) - 1)
+
+#define RTMR_ADJUST_LIMIT  2
+#define RTMR_ADJUST_CYCLES 1
+
+static struct k_spinlock lock;
+static uint32_t accumulated_cycles;
+static uint32_t previous_cnt;      /* Record the counter set into RTMR */
+static uint32_t last_announcement; /* Record the last tick announced to system */
+
+static void rtmr_restart(uint32_t counter)
+{
+	RTMR_REG->CTRL = 0ul;
+	RTMR_REG->LDCNT = counter;
+	RTMR_REG->CTRL = RTOSTMR_CTRL_INTEN_Msk | RTOSTMR_CTRL_EN_Msk;
+}
+
+static uint32_t rtmr_get_counter(void)
+{
+	uint32_t counter = RTMR_REG->CNT;
+
+	if ((counter == 0) && (RTMR_REG->CTRL & RTOSTMR_CTRL_EN_Msk)) {
+		counter = previous_cnt;
+	}
+
+	return counter;
+}
+
+static void rtmr_isr(const void *arg)
+{
+	ARG_UNUSED(arg);
+
+	uint32_t cycles;
+	int32_t ticks;
+
+	k_spinlock_key_t key = k_spin_lock(&lock);
+
+	rtmr_restart(RTMR_COUNTER_MAX * CYCLES_PER_TICK);
+
+	cycles = previous_cnt;
+	previous_cnt = RTMR_COUNTER_MAX * CYCLES_PER_TICK;
+
+	accumulated_cycles += cycles;
+
+	if (accumulated_cycles > RTMR_COUNTER_MSK) {
+		accumulated_cycles &= RTMR_COUNTER_MSK;
+	}
+
+	ticks = accumulated_cycles - last_announcement;
+	ticks &= RTMR_COUNTER_MSK;
+	ticks /= CYCLES_PER_TICK;
+
+	last_announcement = accumulated_cycles;
+
+	k_spin_unlock(&lock, key);
+
+	sys_clock_announce(ticks);
+}
+
+void sys_clock_set_timeout(int32_t ticks, bool idle)
+{
+	ARG_UNUSED(idle);
+
+	uint32_t cur_cnt, temp;
+	int full_ticks;
+	uint32_t full_cycles;
+	uint32_t partial_cycles;
+
+	if (idle && (ticks == K_TICKS_FOREVER)) {
+		RTMR_REG->CTRL = 0U;
+		previous_cnt = RTMR_TIMER_STOPPED;
+		return;
+	}
+
+	if (ticks < 1) {
+		full_ticks = 0;
+	} else if ((ticks == K_TICKS_FOREVER) || (ticks > MAX_TICKS)) {
+		full_ticks = MAX_TICKS - 1;
+	} else {
+		full_ticks = ticks - 1;
+	}
+
+	full_cycles = full_ticks * CYCLES_PER_TICK;
+
+	k_spinlock_key_t key = k_spin_lock(&lock);
+
+	cur_cnt = rtmr_get_counter();
+
+	RTMR_REG->CTRL = 0U;
+
+	temp = accumulated_cycles;
+	temp += previous_cnt - cur_cnt;
+	temp &= RTMR_COUNTER_MSK;
+	accumulated_cycles = temp;
+
+	partial_cycles = CYCLES_PER_TICK - (accumulated_cycles % CYCLES_PER_TICK);
+	previous_cnt = full_cycles + partial_cycles;
+
+	temp = previous_cnt;
+	if (temp > RTMR_ADJUST_LIMIT) {
+		temp -= RTMR_ADJUST_CYCLES;
+	}
+	rtmr_restart(temp);
+
+	k_spin_unlock(&lock, key);
+}
+
+uint32_t sys_clock_elapsed(void)
+{
+	uint32_t cur_cnt;
+	uint32_t ticks;
+	int32_t elapsed;
+
+	k_spinlock_key_t key = k_spin_lock(&lock);
+
+	cur_cnt = rtmr_get_counter();
+
+	elapsed = (int32_t)accumulated_cycles - (int32_t)last_announcement;
+	if (elapsed < 0) {
+		elapsed = -1 * elapsed;
+	}
+	ticks = (uint32_t)elapsed;
+	ticks += previous_cnt - cur_cnt;
+	ticks /= CYCLES_PER_TICK;
+	ticks &= RTMR_COUNTER_MSK;
+
+	k_spin_unlock(&lock, key);
+
+	return ticks;
+}
+
+void sys_clock_idle_exit(void)
+{
+	if (previous_cnt == RTMR_TIMER_STOPPED) {
+		previous_cnt = CYCLES_PER_TICK;
+		rtmr_restart(previous_cnt);
+	}
+}
+
+void sys_clock_disable(void)
+{
+	/* Disable RTMR. */
+	RTMR_REG->CTRL = 0ul;
+}
+
+uint32_t sys_clock_cycle_get_32(void)
+{
+	uint32_t ret;
+	uint32_t cur_cnt;
+
+	k_spinlock_key_t key = k_spin_lock(&lock);
+
+	cur_cnt = rtmr_get_counter();
+	ret = (accumulated_cycles + (previous_cnt - cur_cnt)) & RTMR_COUNTER_MSK;
+
+	k_spin_unlock(&lock, key);
+
+	return ret;
+}
+
+#ifdef CONFIG_ARCH_HAS_CUSTOM_BUSY_WAIT
+
+void arch_busy_wait(uint32_t n_usec)
+{
+	if (n_usec == 0) {
+		return;
+	}
+
+	uint32_t start = SLWTMR_REG->CNT;
+
+	for (;;) {
+		uint32_t curr = SLWTMR_REG->CNT;
+
+		if ((start - curr) >= n_usec) {
+			break;
+		}
+	}
+}
+#endif
+
+static int sys_clock_driver_init(void)
+{
+	/* Enable RTMR clock power */
+
+	SYSTEM_Type *sys_reg = RTS5912_SCCON_REG_BASE;
+
+	sys_reg->PERICLKPWR1 |= SYSTEM_PERICLKPWR1_RTMRCLKPWR_Msk;
+
+	/* Enable RTMR interrupt. */
+	IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), rtmr_isr, 0, 0);
+	irq_enable(DT_INST_IRQN(0));
+
+	/* Trigger RTMR and wait it start to counting */
+	previous_cnt = RTMR_COUNTER_MAX;
+
+	rtmr_restart(previous_cnt);
+	while (RTMR_REG->CNT == 0) {
+	};
+
+#ifdef CONFIG_ARCH_HAS_CUSTOM_BUSY_WAIT
+	/* Enable SLWTMR0 clock power */
+	SSCON_REG->PERICLKPWR1 |= BIT(SYSTEM_PERICLKPWR1_SLWTMR0CLKPWR_Pos);
+
+	/* Enable SLWTMR0 */
+	SLWTMR_REG->LDCNT = UINT32_MAX;
+	SLWTMR_REG->CTRL = RTOSTMR_CTRL_MDSEL_Msk | RTOSTMR_CTRL_EN_Msk;
+#endif
+
+	return 0;
+}
+
+SYS_INIT(sys_clock_driver_init, PRE_KERNEL_2, CONFIG_SYSTEM_CLOCK_INIT_PRIORITY);
diff --git a/dts/arm/realtek/ec/rts5912.dtsi b/dts/arm/realtek/ec/rts5912.dtsi
index b5f6daad4c7..bff47d6803a 100644
--- a/dts/arm/realtek/ec/rts5912.dtsi
+++ b/dts/arm/realtek/ec/rts5912.dtsi
@@ -73,6 +73,25 @@
 			clock-names = "rc25m", "pll";
 		};
 
+		slwtmr0: slwtmr0@4000c200 {
+			compatible = "realtek,rts5912-slwtimer";
+			reg = <0x4000c200 0x10>;
+			interrupts = <202 0>;
+			clocks = <&sccon RTS5912_SCCON_PERIPH_GRP1 PERIPH_GRP1_SLWTMR0_CLKPWR>;
+			clock-names = "slwtmr";
+			max-value = <0xFFFFFFFF>;
+			clock-frequency = <1000000>;
+			prescaler = <0>;
+			status = "okay";
+		};
+
+		rtmr: rtmr@4000c500 {
+			compatible = "realtek,rts5912-rtmr";
+			reg = <0x4000c500 0x10>;
+			interrupts = <204 0>;
+			status = "okay";
+		};
+
 		pinctrl: pin-controller@40090000 {
 			compatible = "realtek,rts5912-pinctrl";
 			#address-cells = <1>;
diff --git a/dts/bindings/timer/realtek,rts5912-rtmr.yaml b/dts/bindings/timer/realtek,rts5912-rtmr.yaml
new file mode 100644
index 00000000000..6e6c0d3a0a6
--- /dev/null
+++ b/dts/bindings/timer/realtek,rts5912-rtmr.yaml
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+description: RTOS Timer on Realtek RTS5912 EC
+
+compatible: "realtek,rts5912-rtmr"
+
+include: base.yaml
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
diff --git a/dts/bindings/timer/realtek,rts5912-slwtimer.yaml b/dts/bindings/timer/realtek,rts5912-slwtimer.yaml
new file mode 100644
index 00000000000..aa8a3f40510
--- /dev/null
+++ b/dts/bindings/timer/realtek,rts5912-slwtimer.yaml
@@ -0,0 +1,30 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+description: Realtek RTS5912 32-bit slow timer
+
+compatible: "realtek,rts5912-slwtimer"
+
+include: rtc.yaml
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  max-value:
+    type: int
+    required: true
+    description: Maximum counter value the instance can handle
+
+  clock-frequency:
+    required: true
+
+  prescaler:
+    type: int
+    required: true
+    description: Timer frequency equals clock-frequency divided by the prescaler value
diff --git a/soc/realtek/ec/rts5912/reg/reg_rtmr.h b/soc/realtek/ec/rts5912/reg/reg_rtmr.h
new file mode 100644
index 00000000000..63957494728
--- /dev/null
+++ b/soc/realtek/ec/rts5912/reg/reg_rtmr.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2023 Realtek, SIBG-SD7
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_REALTEK_RTS5912_REG_RTMR_H
+#define ZEPHYR_SOC_REALTEK_RTS5912_REG_RTMR_H
+
+/*
+ * @brief RTOS Timer Controller (RTMR)
+ */
+
+typedef struct {
+	volatile uint32_t LDCNT;
+	volatile uint32_t CNT;
+	volatile uint32_t CTRL;
+	volatile uint32_t INTSTS;
+} RTOSTMR_Type;
+/* CTRL */
+#define RTOSTMR_CTRL_EN_Pos    (0UL)
+#define RTOSTMR_CTRL_EN_Msk    BIT(RTOSTMR_CTRL_EN_Pos)
+#define RTOSTMR_CTRL_MDSEL_Pos (1UL)
+#define RTOSTMR_CTRL_MDSEL_Msk BIT(RTOSTMR_CTRL_MDSEL_Pos)
+#define RTOSTMR_CTRL_INTEN_Pos (2UL)
+#define RTOSTMR_CTRL_INTEN_Msk BIT(RTOSTMR_CTRL_INTEN_Pos)
+/* INTSTS */
+#define RTOSTMR_INTSTS_STS_Pos (0UL)
+#define RTOSTMR_INTSTS_STS_Msk BIT(RTOSTMR_INTSTS_STS_Pos)
+
+#endif /* ZEPHYR_SOC_REALTEK_RTS5912_REG_RTMR_H */

From 1a487ce40ea054208f6ee9b017015ac2b7bbae69 Mon Sep 17 00:00:00 2001
From: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
Date: Fri, 22 Nov 2024 19:46:53 +0800
Subject: [PATCH 2808/2913] [nrf fromtree] driver: gpio: Add gpio driver
 initial version of RTS5912.

Add gpio driver for Realtek RTS5912.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 2656029c3aac3d7dc390c1aea33616817377ab0c)
Signed-off-by: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
---
 drivers/gpio/CMakeLists.txt                   |   1 +
 drivers/gpio/Kconfig                          |   1 +
 drivers/gpio/Kconfig.rts5912                  |  10 +
 drivers/gpio/gpio_rts5912.c                   | 457 ++++++++++++++++++
 dts/arm/realtek/ec/rts5912.dtsi               | 117 +++++
 dts/bindings/gpio/realtek,rts5912-gpio.yaml   |  18 +
 .../zephyr/dt-bindings/gpio/realtek-gpio.h    |  23 +
 soc/realtek/ec/rts5912/reg/reg_gpio.h         |  50 ++
 8 files changed, 677 insertions(+)
 create mode 100644 drivers/gpio/Kconfig.rts5912
 create mode 100644 drivers/gpio/gpio_rts5912.c
 create mode 100644 dts/bindings/gpio/realtek,rts5912-gpio.yaml
 create mode 100644 include/zephyr/dt-bindings/gpio/realtek-gpio.h
 create mode 100644 soc/realtek/ec/rts5912/reg/reg_gpio.h

diff --git a/drivers/gpio/CMakeLists.txt b/drivers/gpio/CMakeLists.txt
index dcc4b96a54f..d88cb2b87a9 100644
--- a/drivers/gpio/CMakeLists.txt
+++ b/drivers/gpio/CMakeLists.txt
@@ -82,6 +82,7 @@ zephyr_library_sources_ifdef(CONFIG_GPIO_RP1        gpio_rp1.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_RPI_PICO   gpio_rpi_pico.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_RT1718S    gpio_rt1718s.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_RT1718S    gpio_rt1718s_port.c)
+zephyr_library_sources_ifdef(CONFIG_GPIO_RTS5912    gpio_rts5912.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_RV32M1     gpio_rv32m1.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_RZT2M    gpio_rzt2m.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_SAM        gpio_sam.c)
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index ba1ed8a3f64..6ca6216a046 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -167,6 +167,7 @@ source "drivers/gpio/Kconfig.renesas_rz"
 source "drivers/gpio/Kconfig.rp1"
 source "drivers/gpio/Kconfig.rpi_pico"
 source "drivers/gpio/Kconfig.rt1718s"
+source "drivers/gpio/Kconfig.rts5912"
 source "drivers/gpio/Kconfig.rv32m1"
 source "drivers/gpio/Kconfig.rzt2m"
 source "drivers/gpio/Kconfig.sam"
diff --git a/drivers/gpio/Kconfig.rts5912 b/drivers/gpio/Kconfig.rts5912
new file mode 100644
index 00000000000..a0d845a8b3e
--- /dev/null
+++ b/drivers/gpio/Kconfig.rts5912
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+config GPIO_RTS5912
+	bool "Realtek embedded controller (EC) gpio driver"
+	default y if DT_HAS_REALTEK_RTS5912_GPIO_ENABLED
+	help
+	  Enable support for Realtek GPIO controller.
diff --git a/drivers/gpio/gpio_rts5912.c b/drivers/gpio/gpio_rts5912.c
new file mode 100644
index 00000000000..bda68ae39a5
--- /dev/null
+++ b/drivers/gpio/gpio_rts5912.c
@@ -0,0 +1,457 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
+ */
+
+#define DT_DRV_COMPAT realtek_rts5912_gpio
+
+#include <errno.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/irq.h>
+#include "zephyr/drivers/gpio/gpio_utils.h"
+#include <zephyr/logging/log.h>
+#include <zephyr/dt-bindings/gpio/realtek-gpio.h>
+
+#include <reg/reg_gpio.h>
+
+LOG_MODULE_REGISTER(gpio_rts5912, CONFIG_GPIO_LOG_LEVEL);
+
+#define RTS5912_GPIOA_REG_BASE ((GPIO_Type *)(DT_REG_ADDR(DT_NODELABEL(gpioa))))
+
+struct gpio_rts5912_config {
+	struct gpio_driver_config common;
+	volatile uint32_t *reg_base;
+	uint8_t num_pins;
+};
+
+struct gpio_rts5912_data {
+	struct gpio_driver_data common;
+	sys_slist_t callbacks;
+};
+
+static int pin_is_valid(const struct gpio_rts5912_config *config, gpio_pin_t pin)
+{
+	if (pin >= config->num_pins) {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int pin_output_high(const struct device *port, gpio_pin_t pin)
+{
+	const struct gpio_rts5912_config *config = port->config;
+	volatile uint32_t *gcr = &config->reg_base[pin];
+
+	int err = pin_is_valid(config, pin);
+
+	if (err) {
+		return err;
+	}
+
+	if (*gcr & GPIO_GCR_OUTMD_Msk) {
+		/* Switch I/O mode to input mode when configuration is open-drain with output high
+		 */
+		*gcr = (*gcr & ~GPIO_GCR_DIR_Msk) | GPIO_GCR_OUTCTRL_Msk;
+	} else {
+		*gcr |= GPIO_GCR_OUTCTRL_Msk | GPIO_GCR_DIR_Msk;
+	}
+
+	return 0;
+}
+
+static int pin_output_low(const struct device *port, gpio_pin_t pin)
+{
+	const struct gpio_rts5912_config *config = port->config;
+	volatile uint32_t *gcr = &config->reg_base[pin];
+
+	int err = pin_is_valid(config, pin);
+
+	if (err) {
+		return err;
+	}
+
+	*gcr = (*gcr & ~GPIO_GCR_OUTCTRL_Msk) | GPIO_GCR_DIR_Msk;
+
+	return 0;
+}
+
+static int gpio_rts5912_configuration(const struct device *port, gpio_pin_t pin, gpio_flags_t flags)
+{
+	const struct gpio_rts5912_config *config = port->config;
+	volatile uint32_t *gcr = &config->reg_base[pin];
+	uint32_t cfg_val = *gcr;
+
+	int err = pin_is_valid(config, pin);
+
+	if (err) {
+		return err;
+	}
+
+	if (flags & GPIO_INPUT) {
+		cfg_val &= ~GPIO_GCR_DIR_Msk;
+		cfg_val &= ~GPIO_GCR_OUTCTRL_Msk;
+		cfg_val |= GPIO_GCR_INDETEN_Msk;
+	}
+
+	if (flags & GPIO_OPEN_DRAIN) {
+		cfg_val |= GPIO_GCR_OUTMD_Msk;
+	} else {
+		cfg_val &= ~GPIO_GCR_OUTMD_Msk;
+	}
+
+	switch (flags & (GPIO_PULL_UP | GPIO_PULL_DOWN)) {
+	case GPIO_PULL_UP:
+		cfg_val &= ~GPIO_GCR_PULLDWEN_Msk;
+		cfg_val |= GPIO_GCR_PULLUPEN_Msk;
+		break;
+	case GPIO_PULL_DOWN:
+		cfg_val &= ~GPIO_GCR_PULLUPEN_Msk;
+		cfg_val |= GPIO_GCR_PULLDWEN_Msk;
+		break;
+	default:
+		break;
+	}
+
+	switch (flags & RTS5912_GPIO_VOLTAGE_MASK) {
+	case RTS5912_GPIO_VOLTAGE_1V8:
+		cfg_val |= GPIO_GCR_INVOLMD_Msk;
+		break;
+	case RTS5912_GPIO_VOLTAGE_DEFAULT:
+	case RTS5912_GPIO_VOLTAGE_3V3:
+		cfg_val &= ~GPIO_GCR_INVOLMD_Msk;
+		break;
+	case RTS5912_GPIO_VOLTAGE_5V0:
+		return -ENOTSUP;
+	default:
+		break;
+	}
+
+	*gcr = cfg_val;
+
+	if (flags & GPIO_OUTPUT) {
+		if (flags & GPIO_OUTPUT_INIT_HIGH) {
+			pin_output_high(port, pin);
+		} else {
+			pin_output_low(port, pin);
+		}
+	}
+
+	return 0;
+}
+
+#ifdef CONFIG_GPIO_GET_CONFIG
+static int gpio_rts5912_get_configuration(const struct device *port, gpio_pin_t pin,
+					  gpio_flags_t *flags)
+{
+	const struct gpio_rts5912_config *config = port->config;
+	volatile uint32_t *gcr = &config->reg_base[pin];
+	gpio_flags_t cfg_flag = 0x0UL;
+
+	int err = pin_is_valid(config, pin);
+
+	if (err) {
+		return err;
+	}
+
+	if (*gcr & GPIO_GCR_OUTCTRL_Msk) {
+		cfg_flag |= GPIO_OUTPUT | GPIO_OUTPUT_INIT_HIGH;
+	} else {
+		if (*gcr & GPIO_GCR_DIR_Msk) {
+			cfg_flag |= GPIO_OUTPUT | GPIO_OUTPUT_INIT_LOW;
+		} else {
+			cfg_flag |= GPIO_INPUT;
+			if (*gcr & GPIO_GCR_INVOLMD_Msk) {
+				cfg_flag |= RTS5912_GPIO_VOLTAGE_1V8;
+			} else {
+				cfg_flag |= RTS5912_GPIO_VOLTAGE_3V3;
+			}
+		}
+	}
+
+	if (*gcr & GPIO_GCR_OUTMD_Msk) {
+		cfg_flag |= GPIO_OPEN_DRAIN;
+	}
+
+	if (*gcr & GPIO_GCR_PULLUPEN_Msk) {
+		cfg_flag |= GPIO_PULL_UP;
+	} else if (*gcr & GPIO_GCR_PULLDWEN_Msk) {
+		cfg_flag |= GPIO_PULL_DOWN;
+	}
+
+	*flags = cfg_flag;
+
+	return 0;
+}
+#endif
+
+static int gpio_rts5912_port_get_raw(const struct device *port, gpio_port_value_t *value)
+{
+	const struct gpio_rts5912_config *config = port->config;
+	gpio_port_value_t ret_val = 0;
+	uint16_t mask = 0x1U;
+
+	for (gpio_pin_t i = 0; i < config->num_pins; i++) {
+		if (config->reg_base[i] & GPIO_GCR_PINSTS_Msk) {
+			ret_val |= (gpio_port_value_t)mask;
+		}
+		mask <<= 1;
+	}
+
+	*value = ret_val;
+
+	return 0;
+}
+
+static int gpio_rts5912_port_set_masked_raw(const struct device *port, gpio_port_pins_t mask,
+					    gpio_port_value_t value)
+{
+	const struct gpio_rts5912_config *config = port->config;
+	uint32_t pin;
+
+	mask &= 0x0000FFFF;
+	for (; mask; mask &= ~BIT(pin)) {
+		pin = find_lsb_set(mask) - 1;
+		if (pin >= config->num_pins) {
+			break;
+		}
+
+		if (value & BIT(pin)) {
+			pin_output_high(port, pin);
+		} else {
+			pin_output_low(port, pin);
+		}
+	}
+
+	return 0;
+}
+
+static int gpio_rts5912_port_set_bits_raw(const struct device *port, gpio_port_pins_t pins)
+{
+	const struct gpio_rts5912_config *config = port->config;
+	volatile uint32_t *gcr = config->reg_base;
+	uint32_t pin = 0;
+
+	pins &= 0x0000FFFF;
+	gpio_port_pins_t sel_pin = 1;
+
+	for (; pins;) {
+		if (pins & sel_pin) {
+			pin_output_high(port, pin);
+		}
+		pins &= ~sel_pin;
+		sel_pin <<= 1;
+		gcr++;
+		pin++;
+	}
+
+	return 0;
+}
+
+static int gpio_rts5912_port_clear_bits_raw(const struct device *port, gpio_port_pins_t pins)
+{
+	const struct gpio_rts5912_config *config = port->config;
+	volatile uint32_t *gcr = config->reg_base;
+	uint32_t pin = 0;
+
+	pins &= 0x0000FFFF;
+	gpio_port_pins_t sel_pin = 1;
+
+	for (; pins;) {
+		if (pins & sel_pin) {
+			pin_output_low(port, pin);
+		}
+		pins &= ~sel_pin;
+		sel_pin <<= 1;
+		gcr++;
+		pin++;
+	}
+
+	return 0;
+}
+
+static int gpio_rts5912_port_toggle_bits(const struct device *port, gpio_port_pins_t pins)
+{
+	const struct gpio_rts5912_config *config = port->config;
+	volatile uint32_t *gcr = config->reg_base;
+	uint32_t pin = 0;
+
+	pins &= 0x0000FFFF;
+	gpio_port_pins_t sel_pin = 0x1UL;
+
+	for (; pins;) {
+		if (pins & sel_pin) {
+			if (*gcr & GPIO_GCR_OUTCTRL_Msk) {
+				pin_output_low(port, pin);
+			} else {
+				pin_output_high(port, pin);
+			}
+		}
+
+		pins &= ~sel_pin;
+		sel_pin <<= 1;
+		gcr++;
+		pin++;
+	}
+
+	return 0;
+}
+
+static gpio_pin_t gpio_rts5912_get_intr_pin(volatile uint32_t *reg_base)
+{
+	gpio_pin_t pin = 0U;
+
+	for (; pin < 16; pin++) {
+		if (reg_base[pin] & GPIO_GCR_INTSTS_Msk) {
+			break;
+		}
+	}
+
+	return pin;
+}
+
+static void gpio_rts5912_isr(const void *arg)
+{
+	const struct device *port = arg;
+	const struct gpio_rts5912_config *config = port->config;
+	struct gpio_rts5912_data *data = port->data;
+	volatile uint32_t *gcr = config->reg_base;
+	unsigned int key = irq_lock();
+	gpio_pin_t pin = gpio_rts5912_get_intr_pin(gcr);
+
+	if (gcr[pin] & GPIO_GCR_INTSTS_Msk) {
+		gcr[pin] |= GPIO_GCR_INTSTS_Msk;
+
+		gpio_fire_callbacks(&data->callbacks, port, BIT(pin));
+	}
+	irq_unlock(key);
+}
+
+static int gpio_rts5912_intr_config(const struct device *port, gpio_pin_t pin,
+				    enum gpio_int_mode mode, enum gpio_int_trig trig)
+{
+	const struct gpio_rts5912_config *config = port->config;
+	volatile uint32_t *gcr = &config->reg_base[pin];
+	uint32_t cfg_val = *gcr;
+	uint32_t pin_index =
+		DT_IRQ_BY_IDX(DT_NODELABEL(gpioa), 0, irq) +
+		((uint32_t)(&config->reg_base[pin]) - (uint32_t)(RTS5912_GPIOA_REG_BASE)) / 4;
+
+	int err = pin_is_valid(config, pin);
+
+	if (err) {
+		return err;
+	}
+
+	switch (mode) {
+	case GPIO_INT_MODE_DISABLED:
+		cfg_val &= ~GPIO_GCR_INTEN_Msk;
+		irq_disable(pin_index);
+		*gcr = cfg_val;
+		return 0;
+	case GPIO_INT_MODE_LEVEL:
+		switch (trig) {
+		case GPIO_INT_TRIG_LOW:
+			cfg_val &= ~GPIO_GCR_INTCTRL_Msk;
+			cfg_val |= 0x03UL << GPIO_GCR_INTCTRL_Pos;
+			break;
+		case GPIO_INT_TRIG_HIGH:
+			cfg_val &= ~GPIO_GCR_INTCTRL_Msk;
+			cfg_val |= 0x04UL << GPIO_GCR_INTCTRL_Pos;
+			break;
+		default:
+			return -EINVAL;
+		}
+		break;
+	case GPIO_INT_MODE_EDGE:
+		switch (trig) {
+		case GPIO_INT_TRIG_LOW:
+			cfg_val &= ~GPIO_GCR_INTCTRL_Msk;
+			cfg_val |= 0x01UL << GPIO_GCR_INTCTRL_Pos;
+			break;
+		case GPIO_INT_TRIG_HIGH:
+			cfg_val &= ~GPIO_GCR_INTCTRL_Msk;
+			cfg_val |= 0x00UL << GPIO_GCR_INTCTRL_Pos;
+			break;
+		case GPIO_INT_TRIG_BOTH:
+			cfg_val &= ~GPIO_GCR_INTCTRL_Msk;
+			cfg_val |= 0x2UL << GPIO_GCR_INTCTRL_Pos;
+			break;
+		default:
+			return -EINVAL;
+		}
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	cfg_val |= GPIO_GCR_INTEN_Msk;
+	*gcr = cfg_val;
+
+	irq_enable(pin_index);
+
+	return 0;
+}
+
+static int gpio_rts5912_manage_cb(const struct device *port, struct gpio_callback *cb, bool set)
+{
+	struct gpio_rts5912_data *data = port->data;
+
+	return gpio_manage_callback(&data->callbacks, cb, set);
+}
+
+static DEVICE_API(gpio, gpio_rts5912_driver_api) = {
+	.pin_configure = gpio_rts5912_configuration,
+#ifdef CONFIG_GPIO_GET_CONFIG
+	.pin_get_config = gpio_rts5912_get_configuration,
+#endif
+	.port_get_raw = gpio_rts5912_port_get_raw,
+	.port_set_masked_raw = gpio_rts5912_port_set_masked_raw,
+	.port_set_bits_raw = gpio_rts5912_port_set_bits_raw,
+	.port_clear_bits_raw = gpio_rts5912_port_clear_bits_raw,
+	.port_toggle_bits = gpio_rts5912_port_toggle_bits,
+	.pin_interrupt_configure = gpio_rts5912_intr_config,
+	.manage_callback = gpio_rts5912_manage_cb,
+};
+
+#ifdef CONFIG_GEN_ISR_TABLES
+#define RTS5912_GPIO_DTNAMIC_IRQ(id)                                                               \
+	for (int i = 0; i < 16 && (DT_INST_IRQ_BY_IDX(id, 0, irq) + i) < 132; i++) {               \
+		irq_connect_dynamic((DT_INST_IRQ_BY_IDX(id, 0, irq) + i),                          \
+				    DT_INST_IRQ(id, priority), gpio_rts5912_isr,                   \
+				    DEVICE_DT_INST_GET(id), 0U);                                   \
+	}
+#else
+#define RTS5912_GPIO_DTNAMIC_IRQ(id)                                                               \
+	IRQ_CONNECT(DT_INST_IRQN(id), DT_INST_IRQ(id, priority), gpio_rts5912_isr,                 \
+		    DEVICE_DT_INST_GET(id), 0U);
+#endif
+
+#define GPIO_RTS5912_INIT(id)                                                                      \
+	static int gpio_rts5912_init_##id(const struct device *dev)                                \
+	{                                                                                          \
+		if (!(DT_INST_IRQ_HAS_CELL(id, irq))) {                                            \
+			return 0;                                                                  \
+		}                                                                                  \
+                                                                                                   \
+		RTS5912_GPIO_DTNAMIC_IRQ(id)                                                       \
+                                                                                                   \
+		return 0;                                                                          \
+	}                                                                                          \
+                                                                                                   \
+	static struct gpio_rts5912_data gpio_rts5912_data_##id;                                    \
+                                                                                                   \
+	static const struct gpio_rts5912_config gpio_rts5912_config_##id = {                       \
+		.common = {.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_INST(id)},                  \
+		.reg_base = (volatile uint32_t *)DT_INST_REG_ADDR(id),                             \
+		.num_pins = DT_INST_PROP(id, ngpios),                                              \
+	};                                                                                         \
+	DEVICE_DT_INST_DEFINE(id, gpio_rts5912_init_##id, NULL, &gpio_rts5912_data_##id,           \
+			      &gpio_rts5912_config_##id, POST_KERNEL, CONFIG_GPIO_INIT_PRIORITY,   \
+			      &gpio_rts5912_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(GPIO_RTS5912_INIT)
diff --git a/dts/arm/realtek/ec/rts5912.dtsi b/dts/arm/realtek/ec/rts5912.dtsi
index bff47d6803a..fe1b87dcb6f 100644
--- a/dts/arm/realtek/ec/rts5912.dtsi
+++ b/dts/arm/realtek/ec/rts5912.dtsi
@@ -97,6 +97,123 @@
 			#address-cells = <1>;
 			#size-cells = <1>;
 			reg = <0x40090000 0x300>;
+
+			/* GPIO0-GPIO15 */
+			gpioa: gpio@40090000 {
+				compatible = "realtek,rts5912-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				reg = <0x40090000 0x40>;
+				ngpios = <16>;
+				interrupts = <0 0 1 0 2 0 3 0
+					      4 0 5 0 6 0 7 0
+					      8 0 9 0 10 0 11 0
+					      12 0 13 0 14 0 15 0>;
+			};
+
+			/* GPIO16-GPIO31 */
+			gpiob: gpio@40090040 {
+				compatible = "realtek,rts5912-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				reg = <0x40090040 0x40>;
+				ngpios = <16>;
+				interrupts = <16 0 17 0 18 0 19 0
+					      20 0 21 0 22 0 23 0
+					      24 0 25 0 26 0 27 0
+					      28 0 29 0 30 0 31 0>;
+			};
+
+			/* GPIO32-GPIO47 */
+			gpioc: gpio@40090080 {
+				compatible = "realtek,rts5912-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				reg = <0x40090080 0x40>;
+				ngpios = <16>;
+				interrupts = <32 0 33 0 34 0 35 0
+					      36 0 37 0 38 0 39 0
+					      40 0 41 0 42 0 43 0
+					      44 0 45 0 46 0 47 0>;
+			};
+
+			/* GPIO48-GPIO63 */
+			gpiod: gpio@400900c0 {
+				compatible = "realtek,rts5912-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				reg = <0x400900c0 0x40>;
+				ngpios = <16>;
+				interrupts = <48 0 49 0 50 0 51 0
+					      52 0 53 0 54 0 55 0
+					      56 0 57 0 58 0 59 0
+					      60 0 61 0 62 0 63 0>;
+			};
+
+			/* GPIO64-GPIO79 */
+			gpioe: gpio@40090100 {
+				compatible = "realtek,rts5912-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				reg = <0x40090100 0x40>;
+				ngpios = <16>;
+				interrupts = <64 0 65 0 66 0 67 0
+					      68 0 69 0 70 0 71 0
+					      72 0 73 0 74 0 75 0
+					      76 0 77 0 78 0 79 0>;
+			};
+
+			/* GPIO80-GPIO95 */
+			gpiof: gpio@40090140 {
+				compatible = "realtek,rts5912-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				reg = <0x40090140 0x40>;
+				ngpios = <16>;
+				interrupts = <80 0 81 0 82 0 83 0
+					      84 0 85 0 86 0 87 0
+					      88 0 89 0 90 0 91 0
+					      92 0 93 0 94 0 95 0>;
+			};
+
+			/* GPIO96-GPIO111 */
+			gpiog: gpio@40090180 {
+				compatible = "realtek,rts5912-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				reg = <0x40090180 0x40>;
+				ngpios = <16>;
+				interrupts = <96 0 97 0 98 0 99 0
+					      100 0 101 0 102 0 103 0
+					      104 0 105 0 106 0 107 0
+					      108 0 109 0 110 0 111 0>;
+			};
+
+			/* GPIO112-GPIO127 */
+			gpioh: gpio@400901c0 {
+				compatible = "realtek,rts5912-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				reg = <0x400901c0 0x40>;
+				ngpios = <16>;
+				interrupts = <112 0 113 0 114 0 115 0
+					      116 0 117 0 118 0 119 0
+					      120 0 121 0 122 0 123 0
+					      124 0 125 0 126 0 127 0>;
+			};
+
+			/* GPIO128-GPIO131 */
+			gpioi: gpio@40090200 {
+				compatible = "realtek,rts5912-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				reg = <0x40090200 0x10>;
+				ngpios = <4>;
+				interrupts = <128 0 129 0 130 0 131 0
+					      132 0 133 0 134 0 135 0
+					      136 0 137 0 138 0 139 0
+					      140 0 141 0 142 0 143 0>;
+			};
 		};
 	};
 
diff --git a/dts/bindings/gpio/realtek,rts5912-gpio.yaml b/dts/bindings/gpio/realtek,rts5912-gpio.yaml
new file mode 100644
index 00000000000..4bf4d44e42f
--- /dev/null
+++ b/dts/bindings/gpio/realtek,rts5912-gpio.yaml
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+description: Realtek RTS5912 GPIO
+
+compatible: "realtek,rts5912-gpio"
+
+include: [gpio-controller.yaml, base.yaml]
+
+properties:
+  reg:
+    required: true
+
+gpio-cells:
+  - pin
+  - flags
diff --git a/include/zephyr/dt-bindings/gpio/realtek-gpio.h b/include/zephyr/dt-bindings/gpio/realtek-gpio.h
new file mode 100644
index 00000000000..9b346f4301b
--- /dev/null
+++ b/include/zephyr/dt-bindings/gpio/realtek-gpio.h
@@ -0,0 +1,23 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_REALTEK_GPIO_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_REALTEK_GPIO_H_
+
+#define RTS5912_GPIO_VOLTAGE_POS  11
+#define RTS5912_GPIO_VOLTAGE_MASK (3U << RTS5912_GPIO_VOLTAGE_POS)
+
+/** Set pin at the default voltage level */
+#define RTS5912_GPIO_VOLTAGE_DEFAULT (0U << RTS5912_GPIO_VOLTAGE_POS)
+/** Set pin voltage level at 1.8 V */
+#define RTS5912_GPIO_VOLTAGE_1V8     (1U << RTS5912_GPIO_VOLTAGE_POS)
+/** Set pin voltage level at 3.3 V */
+#define RTS5912_GPIO_VOLTAGE_3V3     (2U << RTS5912_GPIO_VOLTAGE_POS)
+/** Set pin voltage level at 5.0 V */
+#define RTS5912_GPIO_VOLTAGE_5V0     (3U << RTS5912_GPIO_VOLTAGE_POS)
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_REALTEK_GPIO_H_ */
diff --git a/soc/realtek/ec/rts5912/reg/reg_gpio.h b/soc/realtek/ec/rts5912/reg/reg_gpio.h
new file mode 100644
index 00000000000..818408c6914
--- /dev/null
+++ b/soc/realtek/ec/rts5912/reg/reg_gpio.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2023 Realtek, SIBG-SD7
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_REALTEK_RTS5912_REG_GPIO_H
+#define ZEPHYR_SOC_REALTEK_RTS5912_REG_GPIO_H
+
+/*
+ * @brief GPIO Controller (GPIO)
+ */
+
+typedef struct {
+	volatile uint32_t GCR[132];
+} GPIO_Type;
+
+/* GCR */
+#define GPIO_GCR_DIR_Pos      (0UL)
+#define GPIO_GCR_DIR_Msk      BIT(GPIO_GCR_DIR_Pos)
+#define GPIO_GCR_INDETEN_Pos  (1UL)
+#define GPIO_GCR_INDETEN_Msk  BIT(GPIO_GCR_INDETEN_Pos)
+#define GPIO_GCR_INVOLMD_Pos  (2UL)
+#define GPIO_GCR_INVOLMD_Msk  BIT(GPIO_GCR_INVOLMD_Pos)
+#define GPIO_GCR_PINSTS_Pos   (3UL)
+#define GPIO_GCR_PINSTS_Msk   BIT(GPIO_GCR_PINSTS_Pos)
+#define GPIO_GCR_MFCTRL_Pos   (8UL)
+#define GPIO_GCR_MFCTRL_Msk   GENMASK(10, 8)
+#define GPIO_GCR_OUTDRV_Pos   (11UL)
+#define GPIO_GCR_OUTDRV_Msk   BIT(GPIO_GCR_OUTDRV_Pos)
+#define GPIO_GCR_SLEWRATE_Pos (12UL)
+#define GPIO_GCR_SLEWRATE_Msk BIT(GPIO_GCR_SLEWRATE_Pos)
+#define GPIO_GCR_PULLDWEN_Pos (13UL)
+#define GPIO_GCR_PULLDWEN_Msk BIT(GPIO_GCR_PULLDWEN_Pos)
+#define GPIO_GCR_PULLUPEN_Pos (14UL)
+#define GPIO_GCR_PULLUPEN_Msk BIT(GPIO_GCR_PULLUPEN_Pos)
+#define GPIO_GCR_SCHEN_Pos    (15UL)
+#define GPIO_GCR_SCHEN_Msk    BIT(GPIO_GCR_SCHEN_Pos)
+#define GPIO_GCR_OUTMD_Pos    (16UL)
+#define GPIO_GCR_OUTMD_Msk    BIT(GPIO_GCR_OUTMD_Pos)
+#define GPIO_GCR_OUTCTRL_Pos  (17UL)
+#define GPIO_GCR_OUTCTRL_Msk  BIT(GPIO_GCR_OUTCTRL_Pos)
+#define GPIO_GCR_INTCTRL_Pos  (24UL)
+#define GPIO_GCR_INTCTRL_Msk  GENMASK(26, 24)
+#define GPIO_GCR_INTEN_Pos    (28UL)
+#define GPIO_GCR_INTEN_Msk    BIT(GPIO_GCR_INTEN_Pos)
+#define GPIO_GCR_INTSTS_Pos   (31UL)
+#define GPIO_GCR_INTSTS_Msk   BIT(GPIO_GCR_INTSTS_Pos)
+
+#endif /* ZEPHYR_SOC_REALTEK_RTS5912_REG_GPIO_H */

From f796c26db540fa3924a1ae348e5816427ab8900d Mon Sep 17 00:00:00 2001
From: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
Date: Sat, 23 Nov 2024 08:20:58 +0800
Subject: [PATCH 2809/2913] [nrf fromtree] driver: serial: Add UART driver
 initial version of RTS5912.

Add UART driver for Realtek RTS5912.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit a3c0b03915d7a554a9cb4c092910ff015547ff20)
Signed-off-by: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
---
 drivers/serial/CMakeLists.txt                 |  1 +
 drivers/serial/Kconfig                        |  2 +
 drivers/serial/Kconfig.realtek_rts5912        | 19 +++++
 drivers/serial/uart_realtek_rts5912.c         | 75 +++++++++++++++++++
 dts/arm/realtek/ec/rts5912.dtsi               | 18 +++++
 dts/bindings/serial/realtek,rts5912-uart.yaml | 24 ++++++
 6 files changed, 139 insertions(+)
 create mode 100644 drivers/serial/Kconfig.realtek_rts5912
 create mode 100644 drivers/serial/uart_realtek_rts5912.c
 create mode 100644 dts/bindings/serial/realtek,rts5912-uart.yaml

diff --git a/drivers/serial/CMakeLists.txt b/drivers/serial/CMakeLists.txt
index dcae664944d..c29700ac858 100644
--- a/drivers/serial/CMakeLists.txt
+++ b/drivers/serial/CMakeLists.txt
@@ -61,6 +61,7 @@ zephyr_library_sources_ifdef(CONFIG_UART_RCAR uart_rcar.c)
 zephyr_library_sources_ifdef(CONFIG_UART_RENESAS_RA uart_renesas_ra.c)
 zephyr_library_sources_ifdef(CONFIG_UART_RENESAS_RZ_SCIF uart_renesas_rz_scif.c)
 zephyr_library_sources_ifdef(CONFIG_UART_RPI_PICO_PIO uart_rpi_pico_pio.c)
+zephyr_library_sources_ifdef(CONFIG_UART_RTS5912 uart_realtek_rts5912.c)
 zephyr_library_sources_ifdef(CONFIG_UART_RTT_DRIVER uart_rtt.c)
 zephyr_library_sources_ifdef(CONFIG_UART_RV32M1_LPUART uart_rv32m1_lpuart.c)
 zephyr_library_sources_ifdef(CONFIG_UART_RZT2M uart_rzt2m.c)
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 5c84620990f..baf3f7e4121 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -230,4 +230,6 @@ source "drivers/serial/Kconfig.si32"
 
 source "drivers/serial/Kconfig.wch_usart"
 
+source "drivers/serial/Kconfig.realtek_rts5912"
+
 endif # SERIAL
diff --git a/drivers/serial/Kconfig.realtek_rts5912 b/drivers/serial/Kconfig.realtek_rts5912
new file mode 100644
index 00000000000..bafb518aa43
--- /dev/null
+++ b/drivers/serial/Kconfig.realtek_rts5912
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+config UART_RTS5912
+	bool "UART driver for Realtek RTS5912 EC"
+	default y if DT_HAS_REALTEK_RTS5912_UART_ENABLED
+	select PINCTRL
+	select CLOCK_CONTROL
+	help
+	  This option enables the RTS5912 UART wrapper driver.
+
+config UART_RTS5912_INIT_PRIORITY
+	int "RTS5912 UART wrapper init priority"
+	default 49
+	depends on UART_RTS5912
+	help
+	  Initialization priority for Realtek RTS5912 UART wrapper driver.
diff --git a/drivers/serial/uart_realtek_rts5912.c b/drivers/serial/uart_realtek_rts5912.c
new file mode 100644
index 00000000000..c57c3774514
--- /dev/null
+++ b/drivers/serial/uart_realtek_rts5912.c
@@ -0,0 +1,75 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
+ */
+
+#define DT_DRV_COMPAT realtek_rts5912_uart
+
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/clock_control_rts5912.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(uart_rts5912, CONFIG_UART_LOG_LEVEL);
+
+BUILD_ASSERT(CONFIG_UART_RTS5912_INIT_PRIORITY < CONFIG_SERIAL_INIT_PRIORITY,
+	     "The uart_realtek_rts5912 driver must be initialized before the uart_ns16550 driver");
+
+/* device config */
+struct uart_rts5912_device_config {
+	const struct pinctrl_dev_config *pcfg;
+	const struct device *clk_dev;
+	struct rts5912_sccon_subsys sccon_cfg;
+};
+
+/** Device data structure */
+struct uart_rts5912_dev_data {
+};
+
+static int rts5912_uart_init(const struct device *dev)
+{
+	const struct uart_rts5912_device_config *const dev_cfg = dev->config;
+	int rc;
+
+	if (!device_is_ready(dev_cfg->clk_dev)) {
+		return -ENODEV;
+	}
+
+	rc = clock_control_on(dev_cfg->clk_dev, (clock_control_subsys_t)&dev_cfg->sccon_cfg);
+	if (rc != 0) {
+		return rc;
+	}
+
+	rc = pinctrl_apply_state(dev_cfg->pcfg, PINCTRL_STATE_DEFAULT);
+	if (rc != 0) {
+		return rc;
+	}
+
+	return 0;
+}
+
+#define UART_RTS5912_DEVICE_INIT(n)                                                                \
+	PINCTRL_DT_INST_DEFINE(n);                                                                 \
+                                                                                                   \
+	static const struct uart_rts5912_device_config uart_rts5912_dev_cfg_##n = {                \
+		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),                                         \
+		.clk_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(n)),                                  \
+		.sccon_cfg =                                                                       \
+			{                                                                          \
+				.clk_grp = DT_INST_CLOCKS_CELL_BY_NAME(n, uart##n, clk_grp),       \
+				.clk_idx = DT_INST_CLOCKS_CELL_BY_NAME(n, uart##n, clk_idx),       \
+			},                                                                         \
+	};                                                                                         \
+                                                                                                   \
+	static struct uart_rts5912_dev_data uart_rts5912_dev_data_##n;                             \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(n, &rts5912_uart_init, NULL, &uart_rts5912_dev_data_##n,             \
+			      &uart_rts5912_dev_cfg_##n, PRE_KERNEL_1,                             \
+			      CONFIG_UART_RTS5912_INIT_PRIORITY, NULL);
+
+DT_INST_FOREACH_STATUS_OKAY(UART_RTS5912_DEVICE_INIT)
diff --git a/dts/arm/realtek/ec/rts5912.dtsi b/dts/arm/realtek/ec/rts5912.dtsi
index fe1b87dcb6f..aa994898109 100644
--- a/dts/arm/realtek/ec/rts5912.dtsi
+++ b/dts/arm/realtek/ec/rts5912.dtsi
@@ -92,6 +92,24 @@
 			status = "okay";
 		};
 
+		uart0: uart@40010100 {
+			compatible = "ns16550";
+			reg = <0x40010100 0x100>;
+			reg-shift = <2>;
+			clock-frequency = <25000000>;
+			interrupts = <191 0>;
+			status = "disabled";
+		};
+
+		uart0_wrapper: uart_wrapper@40010200 {
+			compatible = "realtek,rts5912-uart";
+			reg = <0x40010200 0x0020>;
+			port = <0>;
+			clocks = <&sccon RTS5912_SCCON_UART UART0_CLKPWR>;
+			clock-names = "uart0";
+			status = "disabled";
+		};
+
 		pinctrl: pin-controller@40090000 {
 			compatible = "realtek,rts5912-pinctrl";
 			#address-cells = <1>;
diff --git a/dts/bindings/serial/realtek,rts5912-uart.yaml b/dts/bindings/serial/realtek,rts5912-uart.yaml
new file mode 100644
index 00000000000..b1464900490
--- /dev/null
+++ b/dts/bindings/serial/realtek,rts5912-uart.yaml
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+description: Realtek RTS5912 UART
+
+compatible: "realtek,rts5912-uart"
+
+include: [uart-controller.yaml, pinctrl-device.yaml]
+
+properties:
+  reg:
+    required: true
+
+  port:
+    type: int
+    required: true
+
+  pinctrl-0:
+    required: true
+
+  pinctrl-names:
+    required: true

From acaf762af5c6e0ce47d95fbe36bb7492cfa4c641 Mon Sep 17 00:00:00 2001
From: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
Date: Sat, 23 Nov 2024 08:23:08 +0800
Subject: [PATCH 2810/2913] [nrf fromtree] boards: realtek: Add rts5912_evb
 board

Add support for Realtek rts5912_evb board

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 7762d3ea2b3204d01b86371a2cae8c5459f86d7e)
Signed-off-by: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
---
 boards/realtek/index.rst                      |  10 ++
 boards/realtek/rts5912_evb/Kconfig.defconfig  |   4 +
 .../realtek/rts5912_evb/Kconfig.rts5912_evb   |   7 ++
 boards/realtek/rts5912_evb/board.cmake        |   6 ++
 boards/realtek/rts5912_evb/board.yml          |   5 +
 .../realtek/rts5912_evb/doc/rts5912_evb.rst   |  93 ++++++++++++++++++
 .../realtek/rts5912_evb/doc/rts5912evb.webp   | Bin 0 -> 82900 bytes
 boards/realtek/rts5912_evb/rts5912_evb.dts    |  36 +++++++
 boards/realtek/rts5912_evb/rts5912_evb.yaml   |  19 ++++
 .../realtek/rts5912_evb/rts5912_evb_defconfig |  19 ++++
 10 files changed, 199 insertions(+)
 create mode 100644 boards/realtek/index.rst
 create mode 100644 boards/realtek/rts5912_evb/Kconfig.defconfig
 create mode 100644 boards/realtek/rts5912_evb/Kconfig.rts5912_evb
 create mode 100644 boards/realtek/rts5912_evb/board.cmake
 create mode 100644 boards/realtek/rts5912_evb/board.yml
 create mode 100644 boards/realtek/rts5912_evb/doc/rts5912_evb.rst
 create mode 100644 boards/realtek/rts5912_evb/doc/rts5912evb.webp
 create mode 100644 boards/realtek/rts5912_evb/rts5912_evb.dts
 create mode 100644 boards/realtek/rts5912_evb/rts5912_evb.yaml
 create mode 100644 boards/realtek/rts5912_evb/rts5912_evb_defconfig

diff --git a/boards/realtek/index.rst b/boards/realtek/index.rst
new file mode 100644
index 00000000000..b15a0a3d34c
--- /dev/null
+++ b/boards/realtek/index.rst
@@ -0,0 +1,10 @@
+.. _boards-realtek:
+
+Realtek
+#######
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/boards/realtek/rts5912_evb/Kconfig.defconfig b/boards/realtek/rts5912_evb/Kconfig.defconfig
new file mode 100644
index 00000000000..21c1e3c6514
--- /dev/null
+++ b/boards/realtek/rts5912_evb/Kconfig.defconfig
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
diff --git a/boards/realtek/rts5912_evb/Kconfig.rts5912_evb b/boards/realtek/rts5912_evb/Kconfig.rts5912_evb
new file mode 100644
index 00000000000..d9e479f42b9
--- /dev/null
+++ b/boards/realtek/rts5912_evb/Kconfig.rts5912_evb
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+config BOARD_RTS5912_EVB
+	select SOC_RTS5912
diff --git a/boards/realtek/rts5912_evb/board.cmake b/boards/realtek/rts5912_evb/board.cmake
new file mode 100644
index 00000000000..46c6d4bd1ff
--- /dev/null
+++ b/boards/realtek/rts5912_evb/board.cmake
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
diff --git a/boards/realtek/rts5912_evb/board.yml b/boards/realtek/rts5912_evb/board.yml
new file mode 100644
index 00000000000..2be9b8d1746
--- /dev/null
+++ b/boards/realtek/rts5912_evb/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: rts5912_evb
+  vendor: realtek
+  socs:
+  - name: rts5912
diff --git a/boards/realtek/rts5912_evb/doc/rts5912_evb.rst b/boards/realtek/rts5912_evb/doc/rts5912_evb.rst
new file mode 100644
index 00000000000..cb77ad613cc
--- /dev/null
+++ b/boards/realtek/rts5912_evb/doc/rts5912_evb.rst
@@ -0,0 +1,93 @@
+.. _rts5912_evb:
+
+Realtek RTS5912 Evaluation Board
+################################
+
+Overview
+********
+
+The RTS5912 EVB is a development platform to evaluate the Realtek RTS5912 embedded controller.
+
+.. figure:: rts5912evb.webp
+   :width: 800px
+   :align: center
+   :alt: RTS5912-GR EVB
+
+Hardware
+********
+
+- Realtek-M300 Processor (compatible to Cortex-M33)
+- Memory:
+
+   - 384 KB SRAM
+   - 64 KB ROM
+   - 512 KB Flash(MCM)
+   - 256 B Battery SRAM
+- PECI interface 3.1
+- FAN, PWM and TACHO pins
+- 6x I2C instances
+- eSPI header
+- 1x PS/2 ports
+- Keyboard interface headers
+
+For more information about the evb board please see `RTS5912_EVB_Schematics`_ and `RTS5912_DATASHEET`_
+
+The board is powered through the +5V USB Type-C connector or adaptor.
+
+Supported Features
+==================
+
+The ``rts5912_evb`` supports the following hardware features:
+
++-----------+------------+-------------------------------------+
+| Interface | Controller | Driver/Component                    |
++===========+============+=====================================+
+| NVIC      | on-chip    | nested vector interrupt controller  |
++-----------+------------+-------------------------------------+
+| UART      | on-chip    | serial                              |
++-----------+------------+-------------------------------------+
+| GPIO      | on-chip    | gpio                                |
++-----------+------------+-------------------------------------+
+| PINCTRL   | on-chip    | pinctrl                             |
++-----------+------------+-------------------------------------+
+| SCCON     | on-chip    | clock_control                       |
++-----------+------------+-------------------------------------+
+| RTMR      | on-chip    | timer                               |
++-----------+------------+-------------------------------------+
+
+Other hardware features are not currently supported by Zephyr.
+
+Programming and Debugging
+*************************
+
+Building
+========
+
+#. Build :zephyr:code-sample:`hello_world` application as you would normally do.
+
+#. The file ``zephyr.rts5912.bin`` will be created if the build system can build successfully.
+   This binary image can be found under file "build/zephyr/".
+
+Flashing
+========
+
+#. Connect Dediprog into header ``J81`` and ``J82``.
+#. Use Dediprog SF600 programmer to write the binary into the external flash ``U10`` at the address 0x0.
+#. Power off the board.
+#. Set the strap pin ``GPIO108`` to high and power on the board.
+
+Debugging
+=========
+
+Using SWD or JTAG with ULINPRO.
+
+References
+**********
+
+.. target-notes::
+
+.. _RTS5912_EVB_Schematics:
+    https://github.com/JasonLin-RealTek/Realtek_EC/blob/main/RTS5912_EVB_Schematic_Ver%201.1_20240701_1407.pdf
+
+.. _RTS5912_DATASHEET:
+   https://github.com/JasonLin-RealTek/Realtek_EC/blob/main/RTS5912_datasheet_brief.pdf
diff --git a/boards/realtek/rts5912_evb/doc/rts5912evb.webp b/boards/realtek/rts5912_evb/doc/rts5912evb.webp
new file mode 100644
index 0000000000000000000000000000000000000000..e8a7d96420af3ad3e67ac591d0b8ec6ebca08f0c
GIT binary patch
literal 82900
zcmV)DK*7IKNk&G@LjeF+MM6+kP&il$0000G0002b0syoE06|PpNXIt-009|>ZQDkI
zgZg@RPWB(T%`-wo|0e+LaF2+9t`Go84wpkp`X$?YMq}mP{=|%xv;?5gwkg)O_0~}(
zS$KpSNlKF0p#wUpYqFKvPOPz&XtqX7vE-O^TWbX1C~n)vk@lZE^~yUUCV;ZT^h%#S
zI$~E{Xwo(|m@yT9QXa%4bv@g*B}tMbNpS!Fm(BF7C4>kF@Zfcb)=0zz$bxLQZX5a~
zE3R_^TwH*Z?DX5yw(W@|%eJLYGBfw^h>T<$%v8+G*slI;QEOiH59S}3{n@MLWM*cb
zgNg<-L~>@NM>v_8r1!c^GXBim!zM+9EJ(IxQ(EUb+}r52=Y0pB?{WB?FMs_XfBheS
z{U3k*AO8n7C>sI-8Q>EU<Tzwh2FXw<jEu^Gv2}KLOXxUBv=P=CA;a-#MCocVi*-?`
z70EF8L6W4r^A{`-uz6g(cxn<6kTJ0WfFzQzi}}IyVBsw!mCSFE5`!O9AajohMGt_2
z<>7PNV>ODxAn*guY8}UMx|~gK&tmxZ1uc*q1h+{+0@+&bef?Wezw*d#I!~;W(!DPQ
z0!AAVZU^b~&fLNyX+=Rbz#zDrnR^D@OFb4SZoVJTrvjfxajfWz_nr<6%A*Iv;4>}A
z^M9(=27TrIn_(#-nIV{*9GRq6*r;eU3InC2AaB5$G>Mn1bP!tr_lQsl<DKxZVmXmA
zP4X|xZKhl(y6PfF$B*ysOh%!SQmR0a)r;w^Ywx~)+YDH>Bk%Ts^7bT6Hdkm|PHgFz
zD#o6kC%G~agu-T&rBtr9my{71ADe{ZD1v~6&B%ysN@h3Sef7oH_F{DC!N?q~qgF;L
zP$~%Xhpho)t#zKSbqXIBqNx@YktW8+*<-Tk4KfLo45O`4DAVOK<7Nv&(<X;E-u&rL
zUfrK9W7`2tPLH=Hfk{&1X9vJq7wtrnM8?2)d|ce;)Q*z$0yn$iy^||>9y^bPHP)j{
zf*fh`gmM%Ma*$)-Q37&Y`#aP6T5TpHBX2X`NaVIt&M>}V^F~3QLe892=Fz^X3LF4M
zEb^xmb8N|DMji>5y`%AH6pcnBj|v2Nz6K+VNz*jjpsn0Fty5H0oEq;OGcww_=R$5b
z)<vMPAW}h~q>Yy@DzjS=ZyVou?UgsK+`Kc>zW5N18Q?L`Q8DpyY1@a|{oq&cJAZs6
z(#2w>4Fs%CmdjOYRTwCtmy6ka85@$LD2f8<TdvSV!izei-I{i(Kzi}!{>>z-RgzdC
zl?qf4W;!M~L!~adJU9yo6^0%o3ui}dGdhJXL%DbI#LUt4wxh_KP(%>LWI;X$l!%by
zL8XPih!U01D-i}cVpPtTgwtJWyo8dA2zWdTr1sXNvmAh2>`19p-Yj9Ll=7782>V&c
zr8XZVJys<0(tA0{x11o4u5(`Dn?6u7W0=t*PcTmpBs~!``JyO$6po@Wr$wK*Ab3#`
z&u6oAbXr|D6+z*thd=SoYWwWn_nggylmx(7FLIou@qDGNMU`SQy>Vl@h*K+^t|@cw
zI8F_G^H8QJN)Io;{?dVI9jCwW-H)G}gi=5ozcj(C1y=Zz(ONq`p3R9IgvZWz43B{o
z&Z4=BN4~Kg598@q_*qYpZ(67Cyqe(?m6ALT@M3rs+aMhIA?r1Rg1p(6MhK6*(Vl7?
z-%K;kp3ZZeP(E2tL?K8y3OV1-WlNjQ!gs9PZogygJkRq7A#)-)J{~b3CyXa!Ml$fu
zY&bnT-}EFCPKb<FvRJOHinhj~axA_4;^`ve7dRyngl8iX83}(lk(5*gaRT2a@YHB?
zC6}ZpqLa~Af4;otOz-jZo`(XTl7dJnUo$y9D^F9>k;y1%&-sNT;?a>o7Gq%$WD@JQ
z7N`gjoc!FoQ+e$8?qoFAkV^SB%oyoR?b)Mhd?B*H(Y|AQ+O@t;GZyeQBy4>3r+@at
zn`j%yAO6V06IpN9yABnqT**Cd1=}l<q>5A_tjW>^GJ6K(6rA&YDj@0s&dIIucnL=#
z1NkY{B15jFa*&>Z9g66{W0WW2M~QP{Po4}p5u7wdOvwuuYm86QgX87m!0E$RjM1w&
zvC=D{j-{K8MLrElPnlj^2w!fQ(`rt`<py>XJ(egT<`EJ3<lyrlS;P!3eR=W_NuNx9
z%@;FA1J)Bjkj&AOfeM1rXdIY>1gPL4KFO{7=4nPwk<dnnyzZnE*LZPX>QE?lnOY8R
zXK#M;k6vv5e>-(?RDP@F@hGN3_2|Om<<v_hY*C%EXNv$k0wt1x>c=*kP#elbg`oBh
zt$A9hVHo5sQ%Nfg$Vzq6SeZD5sw{{tBJ#?PkmMC#*orbyO*zT&msyMiF8HgHljBn^
zEtOODQ-t$^N~odI0{)P}v3njn-Tr1BY|C<uph;Ud#gK}0TAw+U2X(a|mttLw_Ek(d
z6Qk*4h86rSTLbF(M$O1*z>TZ1bF#|l#F$#gGLe;p;(VwTNAW}KXv`=5eXaJfYFi=X
z0S)FILRDhusx_%dViG7}S%nS>ROh}yflAzz${5;3+CJh0r2th18X?mPwXS#}Ht!Rk
zO}S)Q7PYe#T8D)sF&qvSlMIv?5P`&S_;iFSoyc#sDm1GkDwZyvHQKFxw0ZU+#Kw%&
zk>Dv*l(7sZCF`m#A61nfHEt7H(*e^tl~Ygrd!ynPScF5*P1HH969$c|X9L+jjA=Cl
zh((&B^?8(`OZfx*t(lh#{3MqQkZLrbFsimt8NJGFP-UOu<ejaUAKly1-@)II;h9OQ
z7}#j}Z~y#dAw+*a3!D295aQ~P450t+kAIm-(m=COLIQmW7O9aKhI>CWOvpJH^$vuv
z=w{k))b~iBn&(pSLY;C|5-1Cj&GP9yP?+7yG(*Mdp{B>6ntG`+MXLX(I6x`{rpKXI
z-4{%1Pdz5Y(gwX=%*s^;W{QQNem7_j^ikExQ0LMBZ45gsN62&Fomfcn%RDF#f_Air
zn(2iaRRonWK(p$s#FF~>@wy#ScEDDs8XhR5jOvuD@!cqPoElFk=;p~@bjxQ*(Hc)a
z>%EuXa3+BxQ+H3keQ4ux4z#O02&zeq;M>1$?|~{z>X&mur3Qdd;&g=+8gf(g<Vzdk
z)szl<$Ql4s2=>w01q(KI%PuFLamge*ZW!b-Wu_o*hRJ{}!*ICq6~x_h^?WJS0LJ#f
zc}d7SYNFF@QBuPK|1e<&41~iIFu6+oRQ4ti#E`;}3U6@aJUDQ$9QFm}_-YnYPG8WA
z4HURXZI)&*B$;gBK-_eLK?Gz1P)rS!Wyj-$$0A)U6D(p+v5m!*W;W(yzbA`x!vhT1
zs0oJI4l&FMtlB-u3Ordrh_HzU!v&dMv6LHU%nzGaaA&W;gDYi?I_F^H_=8{pAG&v!
z7>8HLG)9s{K0gyj5PBBu2KQrd<yb->hc|*zmaGE8LoCELeu3C$#tVetxNHS<Ga+FV
zN7;ZamZ5>zxOCA@3_-_wd~wCF7DU-WE4#s23%I!B>na5VM)5r@?6LvKi>gKw8@nsy
z2_g1#F4RpN!G7bXq{1ERESRJNSy68TgJim8iW-B+9rzl&1x%QOo&#9K5O9hKM@89n
zXD9bBMR(+3I1LRf_<Mrb;(@GSZp6naWIfC{NDa*6D>w77lTr{X+aSL@v@spA?i@Eu
zvJ^){KSPWgW|@MQ^KrwX50Gp+9>%=_8^;Z_VvgZ4a<;LEukL$IEqK7}CRj#?N8N#u
zIBfvLhWz7j5g3B$1#C@}0S-*VqIt3qR6A#21$clUp<BHYPEe^qmy@}LEaMxok^Dz~
zbjK;Q^4^;z9GE&leCPU3B^K0Fm1HT>=S1L{5Hc0#z$X%5h<qoHv20y$BWr<>Eu46!
z|5_BWl@;=cR?hJQL5n(=oS6K#e+0}HoXOEOtP8wB%w$1ciM&A?$x0hx0KT6i5a)ix
z7XM%!PIz#Tl~!X1+*Z`&!6ULy{R4j40V9jyftvt{%V<M0`J7h@^UDmCRgBo|Cr!ND
z;Z<&2q(IC9|APFZkm<S*oN0?(VrBv!X=)*2-KEdP1nr1J*(T<jm?9BmQ2r#6-Li%R
zKJGM+6?}+)$1^qkeI5r%^qg1*BPMWV4?QH#D`dc|z{$;4*G9`4X&^{s0Ew`9v3$Ct
zz@GJzs}kJJj$(ck8x0FD!#-b8$b`@U*gU5&U2ww`!c*q0n*#|r!<I+qiUns*`3Apd
z@?^63peHPPZmK8&dk`bIwulGfhNFJs$jmD7X&x?JiMIzVVV119C@419@MJbN(8(T)
z#lUy)5|*2dXL9+mM-eM$K<3tqpV6fi^rZ>13zx?eCHEIMAo)rjz!_IO(%nB-0awh0
z8M*JZKwR-ZmAiykR%rf8Xs#5-SYYlE3^MhSMBa@8HsDqd5WoN=zwDEtLs}YEoOhHU
zt?>^GAM*vvL!JQ$-uaN_QUNQ>$gB`I?1o{GZuMzka-O}ns#<(dA?7&k@YzEj_{?Ev
zWW`sOcG`BL<HYZn%2zqQ&$cMmjGHUSCpS{tiM<8s{|L0gEa9hUz@V^yD99zPF?{8h
zZ#LH@eDfq9%?o9KQP+jjzs1wU6oX7)$g}4jobwhWSO(<K|I10E27t^h9Xq-|-HGK7
zkb0fhON%NF?whVck3;y5gZ14S{gQN$yt*QDjrQ_Ge}0#Qn20&SWI0N>I}pd?zrl<C
z?99|32p)+~?l3zzRwzlNIzyrtY`nP{v24=DdZOd0UqP7Qc<HgsP)c!g;@|%D2*5=b
z>msy*;v^+rL6SGHwh9~G!2tacW+Ae|O+12DGo04wuDyiID|AnJlZ&)GW55~Mf=3{*
zm+Ima(XS@TJ!B|Pea^8MPF##5$fdeP3Ab)dO|3A%UjC7WG!VMxASho(q!a~)q(BhV
zQ#ux64x{Cg6}S&Y9j(wr@y;lGaGyEqJlV}6E?<OJ81NP7M8L=$f>@@M?BT-8(P?<h
zo@`u)iHE%g13A?Ybgr;HNN-fL2gK`CEx1Qlm>Pw$<gt8(l8o3T7m~NFfra~<)WZqj
z$Wyn=E~hxwSiqnY8}Z$A;SzSYLACnnk&#<D{mL#T<pI0YHS6d1a>ERO<)))(EfeU&
zq?S(P<5~DK&wzvn%$-;ag@esBjln0h<xA*`toh0c<}m40VH0E>XG{R}_9d1_by?`)
za7D9uS@(8LEHqY@YEJY@Jokv1Q_`-0p(2SQvyp>ff|QR!#AFyX`m$;sR)X#<{IZo6
z?Mf6A2Kv2QXi&=vk!y5h(^tlzAXd-^!4cvM>^*@C+yyifFlgeMqBT5V7U}vu9P0*t
zL;uWj|82%m#F7w`u?$AKFyuTLU<?z)rbHPn$RcOlXpd6*sKZFjC58$6#Pm^)@w`wj
z4(WtOK4CH;Edn*>iwH$3@tIM0CuPH0CWyIApU^4bmI?XPa_?9W{>!RXY``YSV%E4#
zSs)0nj8-$5s)Eq%^bQmBcBF@`MX0Y9%7DB)WetX!A6JvgmE$BVI42ibmEH{cj3Rg8
z8u*DLCA-L3!$#~PH8-U2CpS5Pcq-5+^9YF>FN*~(M1Ki*KoM)L+J;U7McD@<5l7lj
zZpq{q;0j&V`;Z$fH@-T?J1{XNDcLi%`L%sSQ9Lk*Boj~z=|Bv91y46fA1R-WH6%~~
zCay(Hl!ieLnvJTc=#~^xSM4N4T)ThjoL6>O*9EuQni~P6Vt!r{^~~Za1ejqjBi{t>
zjX8Q9B(-=k(Fs!H^%~w9iOPzW36o_ls^~@efZOaWDS9aIbK<igvCRpLyR;x4!Nc~+
z{atWEi9ShkS^)=3q7et0pF$vJF=;?liOXtgu!&we(X?nuKA(O>S@xm2nF-RI;yqxo
zRJ14O!3f4~6g3zAek@KRg;w3||N0*eh`-I12YEByY&+L9x`>8ktZgi$m**Gt@&EaQ
z7K>Fgl@8)z5`rWHNErs^L8=E9kE;;Y{S>;_S!6+5l)bFuZAH_ju)*jeiAItn^+#~S
zp&j4NrN0`5@9`>!yCZ4Grl5DNBdGP>1Gh{N9O*L?=yjd2@UWD~9q>I2NN48gDaOS7
zWnA(&&bk^I=$MadGW16_L0VR684Q(&ug_(z3aR(>18)Tu4>+>nfiDj~ms*^`J-|Wm
z<$~He*hgKYBFU*u;p0wD@FSh&8VS}aU`AjIdv_vq{wAv~G2u)KcZAk;Em#LHZa9c!
zJ6}m+#)u4$Gj-`HZMe?YbFmt1dsb8k3K*1BIVGurCloz6nZgNf403@0Zw&)H552OT
zuIzR#4Q$P;=q9LG1aNQ+%%}5pY&ln0RA2-%<VgRDHY{Hka9$s+LFbZ-3+rq^@^$Ri
ziGZKpsU@y+c7`G-+%d~(5aGAr6(oAJeb>e9Ils(VBW=n6v#<#|c=rDw6}x+K@8^I2
z74&-30WmNPdFtDbNwc|KkAnb>1EQ)$=JGUt;v@IHtGl1bu~4GrPb^CbH*z4g+>@lD
zg&P#y?SAk>f3+BvzbN6pN5gIf@s{9c^9B<y#q6g9j*Aft-I;XJrBi3rCbO4`5a}!t
zU5qNslQk?`+r&+I?JHM`{iPMoFcHiwl8TPdAJ(tYxyE#->KRpY@&Ciho4N<fViey~
zd3!wDb=q@@Nf5p%Kn*#%=RXu6KqYy|r06?6q3=s>Srf;Yq4^uVve750D5Rl?FKZa2
zn^(pTQiX~64O?6n4;`oM=ZVB^Yq8yfAFx6^YFb+A3(MvA5K@2S%|327Apz1A)(+0L
zRH0Z=mIusgXE^)^ty!d`^xz`5dW8_$B$Ic-Ga!U3N3bhO;<09(v_WzjX~G1S*P{V5
zELe^-JkdzjOuB6BnHQAG=*CF{E0TgFW&ypxaJUjLS->VNfvI3$B>Js=?FWKcgykFz
z4>nR88k9BnK(6oSx=ap|(_v9`E^U`{%K<X*O;3#m4CY&VOb>XGn-h~i&M$}a5jWh<
z-2xxzsf@mz&%gp94HzfB!<o65@tC6e0ep9;tVx&bxg7zbEQ^*(UTTld+(?K8kIf{j
zJ1CY3Ie{Zqfk41mqn>l}WI(h8zy^A8=Hz1Guv%Cq!jxGFo81MXaQbKZGTAG$#CBj9
zF?}Q0#+*W0*y##dvj&RQ3e5k$fY`hie_(a0o=9r~goFp6E2cCQzaMs04zGHtMLf|A
zWz7<hraWMeNT0kCWKq0)n{SQa0SwMR#GrQS!4Bf4h51+oktku7{6Dn_TdYI$@J`(`
z3OSnL=TQ$XBnQuuCi}>JCEgPUlfKm6j8fOA#gs!5D=G+9wj}aghSeL<0N8MIL7Kaj
zq{LnhEzBAMk>|L`O0bq5EdwgkUw{b!XPOB&!iyC+NF#B0F3@%8<IE00@UUR<&>noM
z!Wuyx?l82))8S<#f2TLGS~?7nH`6Y$aXiUz!ihb%*{ik8j1iALn^V8v9G1zt7+8KS
z6S3@5<f6f8XanwGcA?&q#LOZaTk_&-TKy`Un`|-Y@CV1bOXL#1I=iPlEO};ysSyh@
zlJ!lHs-VtNk+xDtD$Iw?5Y*tzL^20l5KyH<BLm%WZ!m#ulk#be5hrf@V`5+d$WLxi
z^Po12Bfg?0AI4*R9)CSU7|XX9q6Z+(?7~Yr;9}6-@`5|lG37iGh(-$%M$981y9)Y5
zD{&rMaG7A+_hCph2Fn2>Wt#688nKKdmf-LdvWbpnG{i9SIWNSpO>>zHK)r2UBT0t^
z83b9YIzn$jCRI9_mw*fV<W)}!@fIvIYzj_}G71UpUVFhK$V>&Ap*{vo>~C4zkbf8X
z3a;SuM!oxJfOD9#2V9IS6hFzo*R;q}$rDri!~j@Osj_x6O|;nInb^=zqBe661j2Ee
zAtqhHPK;tlSs%xS#Y4o8WkyixMfS3YP3YU|-uQ*6p(22+g+`9S%_DJTlMSdwR%wGu
zo?=cjq!AA(wM!sH{o}02qt%l~L^x)W?7|lJ9G7j(f=c!ZL0o{1u19QUY$X!_C^I<q
zd_W%bn-k?0-vPmb!Sy`yx(<qZ+7^QKJ+jJrM34q=K}1M{AA*N$uP{f<3rZz(Uy<O2
zzP|6s)n{xG#8*Vb>hcq;`A3qk-!TXZDl;3wiolI%3L1YT(f0@9gHk`j`l|fh^rs*z
z2U-ovC&r;-r2Efw(R2Iq!Oz|BCOVSYYh>a(LD1>Jo<qFxiOt__0TW}#4DyEW?cIQ+
zXDkVHS~=ZWEe69OiP_&FYPr-S)bkFlaLa`X=?0mUT>F#Ua=#&mXb`|)N$fmT6o6XG
z8kiwSAhYbHF?S6?IVD(0cGryz#BXGcmtQ#Kb)-=4A?Nfjt1^PL%$CE&2F}k@)ooN%
z!Q7V;I?UpUFEV6&iyd+JTdHJ(f~i5h$anRW;buaE(n?OMDsct1Q4`)Rl1nzf>!7aI
zB)d&`OF>z(N+y-vRN!(>Xt8w_68l_?t*b99Fo=Bf;seYeFQ4d$qFZ`MoGfO8^>Usa
zc`&ucSUR9R32<yStQl_h8q-R9jdoMv+x!r3Z0aE~OtANl-&-fS>eWet-d{4||Mx#L
z9|(Vb;Ofm==%~Q<Et|X=m6j<Z?CEigPFO{a!>8Y4hIQlZvh7G|U~a?R<CW(wqq{0h
z@)7UqxxMz>OLx{r2KfZC4CxPl;|Ajn0o)w6r#A`WenFhat1rE{+)#Q+>89?78R=`U
zP7T9c<M|#q6bM1+9pZB)E3@1b*vmFr^!(*F?Ph!$Sujrvf#)uy`fgCad)czqT7y||
z37TZg0K-Zs&yGc`pOsc?%=O#ow!LJ)j5RWcC?>p|07Nnjlcg*Wn*x9izSrR#-F86S
zcVL}rQpKbe`#!`HkUQ2+B^i?R=yW~A8#{w#uVax!h$Ob0#?w2=V^T<^`6CB?Xv;)^
zW9lNb$XizUgXFuLB`}LPP~zg!qmKn86-qhp9GQhBjRo;-SjdtOKktbrcKyfZVoeY1
zD#3$B#(UU?W$i^2JCPRmBQd>y1OU_PfcLW|<ewR4Wf?Z%=<v5e-~(8dw5zr!k_CSN
zpYHmwKpPf7o{{%ie+0>0k#MTor0wb0QzL!*y7#%qlfU@$>*S~wu0;;+2@vNdDD)+0
z6*~`q>ZwV5<=x9B)uT^;aZGEb(nq9e2eS$-<KCbB%2~2HNz#ME?R(Be4ASv5!0lqD
zY!#VeebO$@eeJ#xoEO<N4MqWzdi?EOwl3ydn+g9~AVV<WySX#dv_>Rp7CU<-B5g=g
z+pHO#{Fl84$*q>l&0jLWgu?=3vGC+@aqD#C@}HBCffU2?pny7+EsARFFD@1*?#4zj
z@ZxT)zg!NM4kS~c!FECi3CBrW8DPXjY=Dyi<{^-LrU;uJS@kXQzT^8^1Y;B~Hg4n$
zY%>r$4i<!}huDcOJj))U=|J1}7#=snw*J!v>*X>|frgCpR&2b4ZS2{ftq^k9wA}?}
zUESfn$|bNwD(RI`1l@yB79+cl+l7hO0<4#95vX`bMApLre$3({F_pu_?Ovy<4|QEX
zMDH&l{AOhv+VsbW%(7jiQ&TUyVa;EJFLUuvfYSjTAJy4yujqwYck$rir3cGJumU87
zoOi8Teu`}^0Th~jaFVF-;EO1^f()+hk`8y27=TAKQL_Xdw$Dds5Ryg(aqK9R(JvIc
z*nakr3&+)Tksj<H;?ft+1nbTsFmH(=7r^k;G063G=<E3G_aC1KVGdt@{`L67pC8f2
zU_Hk?hqUXC8fLlub06MSLcn}#I*U)8mK7rtMavP=qdhuu6Q_US^T*t-r;1JqtCeJ$
z;UtH+%T4bMDH`%YkZaM5Ah{%(&tmsn3}gZ8up}u?KzMKu!sZQ(93bI*hC$%KMhO{E
zxtl8MCL?}|pF25t9vFm0vrz6vEd}&W4NAAuML-XtRl_ulL>HMA)j~t=?}Vd0o@78C
zNrk;Wb|ajQ#hsHwH;mP)fF=s`Bvr^DI@)wZ6eim^(&Cb${98ZH#gTR-B|?!3+BW{R
zk!}CHV?mL(K@z<RYI$Yj6Ujn%kri`*?B<CKu!wB9055n%Zm&aP^ppYSURVc;+FueV
zf%c2NWEwg-#<Lx`;)c9PBrwQ*M7?*|yXVbC?gI^{0om9bu)V4z;R=ASP;P?qRTt5b
zl!k2>ancQ4gmk~z4j);7kkp3DD2uV-as!HF?xu&9Y0{CrR&HY^xtG$Bj^N?OEkQ2h
z+HETa&e8ZA&2MU~t*-E-gUl*;X7LgURi5P%Awd$yar6(aKi0at?glHzv=a;J%TX6z
zc~+9}z>Z(BzWFY-O<(RJ_$1F$tsBq~M`v>(N9n`*!whFH#3Q>{C~8-G*h3hl)MwmC
zmF|B8_`6!N8M9;Jhcp8Q7fo6)Crew34+YeI&LX#TLT^eq+Ok_lN({?Gjb!5o%E7Y}
zLt4$MAV_nL6F+IpUE^5UwOWi}21np8zhHr^D<f<iQ?tI0Y&Cs#Kfpgb&@FprmJ10;
z#w|XYpvElu#I{QYnZ(0?WZ;C`Vr&3%Ei?yCNsYS!G%hevo7wE@UqleM+^4koMP-AD
zsYGqVI|%KW7UFkD4a?s%Cd6*gR<z1IYipk0VW`ySkVM0~t(<)cOjRq-en7gkkzG$2
z!MkAEixPVC(EMgae4AG(K=Z{D#gTongCP&&*FS?+UEZhDq=NF^$`crY#<4J<JmZW2
zt!wk6ms3Y)Db_p=v_}>&$#QF?(Dg;qp~NK3Uesk@`-fx9!HpZ|&hJXr!HcY4I$)4(
zr=bt8&)|)2r5=#J^2~b=eC*@l(EB|JLhQvp-{reMeDkqAo6B?UXwT94<2b2p8m}Lk
z!0}D)Tz>cc+qQA1@wzG`VIa$ZJo+kWOTOBqalEoOKSr4uZM>LG=Z$trxP{)Cn8Nj}
zPhgr~K|5Zlt))NZR<mjxH~-*!pAJdH*Y<8Ku3ny>?%$mm$2r%QOMd^)pM$^q^)Ehp
z0yqBihu2qcJ%9PJ36*>D4TxMgUeHZi-GfVrC##o#_o+{wx7VI|WeRco^<~{O`Af3w
zj@nH!-mHDW(vKh)2d7#QgK7_Q+AYNN=^sd8k`x(*7iQJ#e)S6Wrv8}_Ha;k5dS01V
zP6Cp=$Q^N7Yc^z7X9L9Fns#Md?#1=uK}xR}y-6#$zP5~HUpJlkWmPfooOlb)ux^aS
zbzdy*47JmmyfsOd!sB|hYznjY=fBi=8o-`gA$trFcpX>;idB=`O5G;g%5DJ>?}|JB
z*;6}o^6Edh*n?8a0AtW1XKn)Dl^#x!B3Wun3||4=R`4Tz#ZBiRgE%LJ9Ldr?KVmIe
zSYG`u%NjTUZMjI8_X~2-?nwTWGw%0@RfzgVL{L#fD5GH*6c$$gIm?%nCjWuFf!;l_
z-LjgXC>}vt*_cPyb=aZ#?+SeVx8%?WqL%T=Um1Jsn`&f`*qW@5=~na82TX3_-tQkb
z0STMq-`oAGyvaLBEo19r%Y&1F^am9#M~v&PW%>)M;{~<P`}nngIKFdiYis+&g}W{&
zv9=#0OTQvdA|NsWuK$-jvAeakbMn$tpLle)nL9~}m4g2E=yD}hda48~Zb>4NYUjeQ
zJ}w(c!|4lI*q)|{;+171Y_<1JS6_H@u`~R=k>r(lt{z^XM$(g1rkYuK)ODmKn`%mu
zmw*S0D(x8wm@Gq}ihe?FoW&-gaKMb(l39HDl@u?eX6QXHStY&qi4czKFN~~#4{u^-
z#`zfbF-=Qc6&u`@u(Ne(wPMeI0Tu)ALN);AnH+)|BP=LE_i)|6<7_$LBGi%Wh(Q>b
z5^Rvw6m9=TGMn-O)#ru4Ie3uQhw3ogxfitxoFwwO7$qBbUZf!4;+2)%E4Nwf4ukR@
zwKshOukx+<g6cFjkPquHd%z2UL_S2QW|ZQ?I*g-uK}z<u3md3#_GMCI^+%C?3Uy9N
z@aP*zFMd*bAqGG7Vvy-yayyP=OhF1FF6pVt9t4dXCbg`fEz1f$-yt1hT=i2B8}mY{
zd8a@WMg#HY*3v7fi4CtRV+XU%VeV{w;E)19P~ERX=r&HWeJ|NAxhXTCJX9cvg@>J>
zS4N$_EdEfQfJwD)?T}7nQ}BKxbpD)rUbIA4--z7=TZAeMr23URtQqwHL0Xkz*!h3a
zFnda^#scl3z<@!}zY+yzhpM$<ovWkNgZ?jS+ogSwyF{-Qd-@27xzeKnw``8H#|e1&
z-6wGD5m^k~@5j34{%U_ZBa6>1CTZJMuAbKUrYgNoJYGPYiXm|H%Tv6FXe!1-2E4hE
z>JCT3D{78RBn9XHF)7JxS{F%F1~^#+kb`we+NMA<BxdJvHpoK+Z5wLDYcfT9wX_*{
z61tFmG6w+X4yQo&%I9$LYCj-*>mDWB@BQ$lpf!5NQJ&>a+9L+Y_0IwXYW-g4@J7lH
zFGN9sG$hvO6Xwor$~FRpge0>!8ifr8stou<z8&uXX@hNEtx4#FsJszB>yzDS;v{s0
z;R8Z<Gc-Ok;`Tl2gWuS`cfu+ukZdBFWg;PSFi1(?%w(=1I|D}w5XYa`Wqh0l9cs>z
z94$JQh$n-7{HgO1YyYO6_f~mhPj();{}d;8k<>zOAd_E!cen*N5yvq)%B`m!QVh@I
z)KUT-`H92`i^d;|k)y$n9=b<zJMN99Ju&Y+(%eM*?ZBB9IJoB$r)eCmkIeMq4xOuu
z7sis)M6Kuup4H`CK#;A77M3|UP>SXDsgsJ?c}Z%_4KYYOeqk9MUQX>;&#FZ*6ijx5
z&ekRPuaIe3)xje}GKWBJ6h3*vXhoYw6RMQSMCo7NiZM8n5hE;9Y^)uErSvo)+a#x#
z&6mDF=%Nmhb|)$}wLq>A%HBd?gAX0BS=>FvK~~`4854Xmsa9QsWh6p|fq5)eXtKPc
z7Zp3@FqG)SRRVO?ZlA(MGI}M_if<%%xy%nMoEtNE3W(GG#~?U@Nb<QwVZr}`qS(r~
zNtXeyZfr4H9Y?elx|pBu<i*VrDCC6gah*^9eP~ZOfsRiq<k+I6kXAw#Uf`q}y0Ju1
zzH+IE(R6%!9UY|>6Vk6hKE0=F)s&;PPHa<yPP(A9iOf22B{JqI5scY54_a=O_bAaa
zui_@*13J0mx!RH8ul1m4T}QI8jHaE|^w88>+3sFV4X3A6UqJ?pkp+;l3P~QCFIhm3
zv!U5^m6&*R88Ft+$8H_Z1jPvlmv>S=>N_@C4>=5jICc!Yx*v}qWRJ_IIF29zxAyfK
zPP@F#Xxf%Xi=LtEC(EhkBg3STxRxYoiNQjnB(oGlbW7w`N+Qw&u&V<`(|9eF0VH26
zVy&RN_%92=166b!GkV#GD#U4d`zVPP3$$*H2BBQ?L}swMkrD&ou+tgC>_KSlGq{qL
z7^gqYkW$N*xqge2?<O@(c0AChEy_MaPiqebIWAE$AkDdlzI@#>!m^UfmJ5&dVj%+@
z2MbL&J*dLT1CYGE#|SvYMt<BHy$GC{zx)m-+*odJ;DAk|h(RvRN`Y~kzy01m7~$&l
zA_?@%W^`hvDmA+I;N_bsCtF><)kEH1>yT>@YY*<77pAPFxOD(A@C{5~JmA$e#dXsb
z<^tBZl#^ZMm%?L8Ld@Qr@%mA*rbY=~VSr2t(5;m;F^H55s9Ia%TS*6<H4v%9IzzMJ
z-kC$YLFbye6{Bwa=r+NpwVRtyhe2tEDi=#UiWhe5Kv~5cgUEnnzM&rBTLv(7wLo=K
z|0r4iOhCzi2HtJH7pfNbCq!Jh%$SZ(@ZI3c06%esxry?_YUc!juaBERW~K|4y@}|l
zf`_=`g24+_tm)WSvg5+eJ$lL<Wqu8X7ZrfNO&PFjreqODJYx`?w@PbtrES77EGKDv
zEH2`RYck`<E=lBoyZ1LGna%}~3^kgY7`Bnr5b0MT4se(>Byf@OFwGF$GBkWu6@=o6
z&?$H!NjHk~-Z01B!%LDd6Jx#tsHGGTR>Wij4u(+Og6U>=hE8}H1_z6NOW5{AMUW2b
z-V(_GSM6OG6%c2MpU@la&#-}AE1kX9q_*QYxP8dLshriRFu}6`CKkxyvz1>hH*oVa
zKPr$I)oxDFN3QRNjrkrf#1N3?Yf2zU{q9zKlh>F_CW(n8t<7A-2t2PFN!~K+>$;=2
zbg|t09>2OeUgUWs(4xB*x@HWyta=x!KHiySG+3(+P3~yQ(Q1bhuDO&RNqyZr?Tt)<
zv(ZC8|5S0}8)*VDOpJ7{u)OOlD`FZ@-1|1MbtwjE<*EO9hA>TgWP(?X667Hb_8x~r
z!!y5Ra7Tp^05>UR`*O*w*d?e70FvG(gfZBtn_)NC=B#`7{(e!O1p;k8j$=C(2#7^o
znQVAC!9o7GENM}fBf&;1?lACutEtc$y{s;`4e<aYfpuR#q#7|ou$hofI-xdrYo6iq
zIGgO|qj+Js*kl^~c>V5d3#V6dtSL>v9q`44k8oj)>1GT+PF_ForJYk?8Q^|!w;EpA
zQFZS`bblPj))Etr1B^V=6ImU<m%KON|BX;gfZBH*SZ!b#&BXMwml-NP>Vr<H8SU&$
zP|EW(U5GW`mnIrhDI|YL^0qG6NFqrQMQ{XaygjIO9!+4l17dg@4iXKrqlRBR2#Z?<
z=+h-Z@6=C7GTIo-3)THI#29mXl>Agz4|40kaFYs?e<y<+G6jblL4O*LtOoibF$bng
zh0VQ%vTZ2}QBO&KjsRk;!MQE95Ao3`I^I8|9BJbH6hUjh3+(ui{ND(rB?8+jice=t
z2uXZPJ7uH9Da8!<`yp_|9$ze(Nc@(7HvD9peqWi<35qg9Ep4FK!)7RP#T>VHTH}kL
zfcVK4Wxqw_R@h$DVI3K8BUuh)u|S7XA#A0z`NI)HiRUO-)}M>%gP!KnTA2m{o8V;~
zo0v&~Twqyx%LXAV^}D1-PW*rGhqh~R=l{)I3`4A=9Y#z6$Tn<2EF~3-o#IoxC4pD0
zQ^8us=W!a@BM|>pFq?KbL1$Iq7%;>dJUCn8^S*s=9&)6-z|<1#$|=0{5U}WC;4#KX
zZ4&~_K^s~fK#7NcOc9D{Ago{x997SUn*x-hz{T7=2#Ejo7*z9G6hX%8#)7OqH!MiP
zV{#E@*8vryB8ASB!%bo{{Nc+m?$|YcrWk^C+!CJa)Bq*)vVpFncFNC*IR%1-l#bX`
z211{AT_LcJyb%WTa`8aJ3<s5+V5fBxJuj$5lajbW)sO@7Wwbn=h7#;B%p6;GMf;!w
zpIf9FHBInxvm++>AP~$~P<vkl-^X9(w7x<r;)b9+s8JBz3rW+Bt*UFMr1!l{jmKq^
zuD!pgYKb4${O{Rgk<E-R8~7QXstSd)X^g|VE$4lX`mPXX<r7DrGZtu9jKNTlwc-PE
z9GUb;WwNtFuhphm?*9(6re_(pRIKnY(~<0yD8(8*q9M;hBs&y9XEc9PZ4mxZBzA2+
zW4TD+teOeRT{A+0u8*;C9^7mHOOhT(3I!J8wJDOM`Yhx)QWPdf3>)`zeon)6R!WHF
z_l#kfxlk1u-E9a*!O}VmnH#yV5YA+VtX<KHJp$1;jY@?JlDgQ=b}cv4nC!~4&yh^v
z0y@fH@}Gn8mfuQ~Q7d?xlSdpAa&e{S#`3*R73G}`791}VFAf;KqKnn&Zci#tHR3B8
zTJsB*<^n=iYDD8Z7W=|12dJ_K6o*Hg|Cb{bG&0R8N+NFvnzo*U7{(2@tTp^rY)dIg
z0!ZI(6!8j|b@=|BxW;@L_X6udo?VxnA`2Cc0F^o?0vlqAmBs~(cz-Si&1D_<XAaWO
ztAyN#q@IH$-_H@C=N&yEmWb!jTx{ygU2He2ovJtVoyIYm%>B}qdaxJ{^hka<zAUL;
zl2^gtO`HT$#FCcLUH+Z~`Lp#sU5thp$VT3GlKN(6t5tne3A;FM4w~%6U&C{`P~b3Z
z>`n$`dqYf_D0qha00cw8=VIX5BA4|7Ygq`+$GsH|EMJh|Fmw4q`n6{x@{Tg1gX6j{
zhnFi6!mZc@ItOV+6NN}=V9jRsy-YITwJaIw6b!$2de|EYzwg!6>v1#8k%`;FE;mbL
z*Gr|2H0hn+nJJgZm-Bf;m)?<06J-%1{$Q|l#92W+V3s(E6reRfY|cm6qF@!D5@3|6
za_C3IFa>VT=*cJUiK8_vP}%6%A^{dwB#b}~SVM>zRv3{GNi#v*<RjwgA_g&VpCr<v
zVuLO$;v=?*Ndf%4wgm*4Y}%giurhzxk&6lvzTeAK8si8+7CFZ+S(d<<_+3k}9EyI7
z7hnPer(+JbD-Hh}tUwtM0dlj_idCq0VICQ}2j}fDhTqD1@1^U>&V-94tnDV?L`DSX
z%)z5dzQWx1bqBCq8T5u_DG4319!PAnJc>B@!4&r$YZn-#3BC$VJ&qXoRyaC+TCv*M
z*(k=IkTb3moHX5iPayGI9-M4paD^=>XZc2VPLbJ66Og->!W{2J$ujXdaR%CQc)10|
ztDH&piJIbpnDF{fEHN+-Q#o{Dr!x{=x#eT{9uXnzk#-WKU~V|u(f-#4ARlEeUl<y|
zf<9WLi>V+PrVjckoDti6NNctv!9t17m;gReV@a!IfUQaBR~bQa{y;}{FP0X|wmFz%
zlMUos*%InnQqE>0!!X@6qxefx`4Y|>!Fs8^kkA4phl(s(@KZtZ!4W^67F^i-3{BwI
zewY}7QhFD0&tRD~GG&D7bLx0xAiL@8rZNOO0mtp%t#4Ra)SX``33gYKp=xBC#nHS&
zkXe!RU$D=3150?&-xC3dAr#LHgEhjgqlabh15-3+{=_nN<iEx(KJAhO;}O!J*UW=s
zSO(O=#tlha@e1bnFc2O6J8`h><gpdkCsdL}XCNu%l{~v*wZ||;wis_1A{tx<2ih{U
z7q!g#gkulfDlQT-`vtf}XNqGI?`JeJLpH%GRwlv~4+IPTL##X7ITu2I&p;Kpu`LEe
zEK7j86BSqjB3;a@2hzvB!qxziqE|kLi$RXxyan;*h7*X92LENn2eK3od4MPns&q)1
z#BC^kPS{OznJH;a{vA)$-o0SC3&vVZF#iR(?UzH*6_4TGZ8}KO(EL4PME#e5W!)4B
z)GfgA^vh$61jQc<qm520S@m<4un<5V5znzi)PG$v8kM`U5;7@#!E-RajGL&(gB)Iq
z3l@|W4!nnVH_$HUeEOoqazMVlFRPC-P-O)Q`4V)2z6{7R2M{@5YfdW_q%8B`kT=57
z9AZcw6a;Ir7sji;k{Ff;tYEh&i(zju`~(>%{_(2ec<d~Oy?-MGc74g#YS05DG5l!<
zD;0<qcLo}6kq8W7HDo|#pHwDEo*wI~1isclWr_i8s*O8>735Bvp-{g-#=@hM6E4r1
zstZchsh|>-?xf?Jff6HE>JhS<pXi5+$%H(q0O7e{bLz2HDA^cEqm2l|W<-M1Z$sih
z&u52+X*d~$fh1T92%8Bgqex{60ZhgOPM-ztL%9>XIWEY^x-#qOJ)@L~YcuBYVi6-4
zZEr<^%qYRvh84o2WkJ$252+vslq63gNz##mkTRnJWc)00plmI_-IG19U=S(k@yL;Z
zC@{NEqLUC!N=5C-gZd9p5X@#F_~DJ~r_Y4K8f&yR(e_rTnt?TGI-9FwyOC^UOBzpa
z@6-A7+f4{%(<IfwIBX(9O?>U?XI|WkgX3q<oR}ybuM%ynF*X?Q9NQVGbh%um8rBOi
zFHockGI?Z10kCj^rdM%da%Od`q}B0qF`KWfAh~sXXEIWbq!(T8{a|%!paPXK5Ndq<
z_=%m7i&z<qB85!SghrFhb~aheGpPYDc9c{u<fO`GFZM_XFVKV>ZEcMLw?QfQ0F;X;
zxzbZEubVLYDC4OdvOHwL7|P9}Fw&`*AeC@JS>PbYBFDy4c`ktnJA3zTez^L~RF3R2
z%djg1+ZUdA<g}s+211?#{O6hdz1QE`JJ`DKLmxd65_#GyQ3whMz{YRC{Oar17j(}D
zKmPa`nd4VT69qhA_4JijE+@NpJ$&C8f1whNg*HjAKK)NW+}ocU8I3bvB==e`Vn8a4
zLPb_<=c*YI<OmZ<>ANYsS-@mu;Zz1cwG%S>I$QUo9fyG;@)=rK_-b?^<|$gLXp{-)
zNRyO`L`K;P7pn?J>(p2;E;4z2ft}0+qQfg$QYj}|VYTphE@p^$d3~8A7HB-3DkVwg
zfA)#=EaYiRkk87Q2d)tMDz$Kw{Cs777Q*=jMWb<uWR-dN?(VVe(elpz1;GyUH?B-I
zNv9B(!Of|A9~e<36i|TP-+S+!x8HjA#&Ue|iO)QF_sOwzp)RHLwCE|)7$c-2v%GWt
z+O4-<fAjqVBThf~p-((^aW^FAKtV1My4caFkl{!Pb9nWgH(z|?TDo)op(h?aw-dtH
zj8PPYk_y|BjIUYTe*dTc@$A)9Y{bLC_bK7QbJE;RIApW*kaJZFEAq+0-3pL-*C>Eq
zNyjZ4a=gWHPi}Gj=8AIt=fQg~&X3=JViNh0Fa5~2#ve|DnHH9BKK=AtQ`eW09AEm(
zhaWhhtTsYMO8Joio1}3{Dx!4%truS2TN&$`2~wl`KJ?*>J7hq?XcS3L)2_2v*>G|!
z66xh1|Hli5#wA{L{ISnnm}LA#FxlA|=UM}6Qf*zpCpX`G?#DN^-JlQW)gwZ6yWC<5
z<dKAw>1;Zi>nI?WO0qUDtGj#U*%!_~a&9~F(lKnB#H;0ec5rZTxP*!#vwuymX0zDj
zsh->!EAsONQJ%h^3`ju7i)B(E7DW^9IoU+g(<!|00KEM%n=EFFd~A$QhEiB~U9W%d
z$0$6yX*^q)Bi?@qE6@%37W+5%PESH_uZg_QR_i25;y6tODP>m+h@o|)H>s$8p{QOB
z&g1|6$N&3}|MwsN??3+fKmPhZ{(dzC09H^qAl?fB0Pv3kodGJ)0<{7@okW~UC?=+-
zsPW9;uoH=6ZcvuDllBVN#~<X&4D>#CHd1)6IbCsvVyxXx)*cSUvG2G*3+Vaq`H&1f
zR{lmTw|nCGr1DRt(O$;mn{z+*F7}?KykPxN`oi<SkG<$S({qAh{|o$&r2m_LFaG2F
zmyNzwekJ?Y`M=q3a!k4Q4fSWLKhVD>e~bJ_wa@22^Z%j$S>?~kfBHYhdjx)W{de{g
z^N-_G@PBUq-1t^*AMd|zeS$r<`^W7ksR!5p^8aP(m+Qaje`x*yf2RM9^sD~QhL7Pt
z=6>UR0slz<L;Fka>;A{?SECQvKj!}7d<cGhf4KJe|NsBj;m_}f|NnO%+@JsGyVL6e
zD_9X)z>3xcR<I(qffcL>tzboK0xMV%TEL3d1Xi#jwSg6^2(4g6YXU1+5n8+J_AVJ7
z2e>`;ldvrt)9V4wcqpW&T{D%ywRP&F8%r-&btTyES!;$kpew5`V>K0RT0*x}Q8a_r
zTr<mAWCP{aSwZqi3PAcN6q%g90r|%a>FBkFX%M~+qGQy&p)qeqz=?W}7~-W}(2Ljb
z$zrA|_?TWty6?Hog18A7lb0re##j>4F5*gU;-zD#$KZu{l_U78gyG1n;v#||>N+$u
zNski;8Gz_Y@KafZm;R|yP`8-o|NQ@c+q6K^?h2idi~zKHO+oWTz^CjtG+#ZGI4=<T
zKO&Dr=-H}E^E&Eo4~<QSD~=AD?V-xGRT3;%r>ND_uletUKA?81!ze+b?`fjhHC&9y
zLqU+Mq2e>{DN!A+Rk2|>PIImLCyIrNkm~UOa#xk*LY=Z58fvKCcR89g<TendytHs5
zphCJbmrLme%)W$uspj6EG;#(W8xDK0N>RJf$<r5ze0$`WV!UG4I9d7|2r<Tfz0&<(
zp~Y!BtEaIcd3t6#-j=F@eeX<01`tNyNrEwhhaVPSAk;BW+gx&S=37(OHu{C@GC|K?
zJLZq4Aa^I)o6Tlfkh!&7xcoLo{<{vS6e;_m%`RGg((P28Tdkqeg&*R)#2$21&`IvT
zcj)GWyh?;Qv`~;^(E9n-VU9EZIheX9mB>U2=KSB*psz8qw#uO2=K=2A&>l21WPDuJ
zx|{un3ZbK1i77yANNYy6%d{&u2#)HYebJSECS~{bQ*;*mmmiC*<6yBx1SZ6UpDvT*
zJCSTd^GC&vQk_Yb%43EgW$I$~<?k2QRBSq~7OLkm#6;H=I|m4vphZMy13*N6=*SoC
zr9{Yb+%TAiY-6dXz!t=pw#!X;P?`jlc+aZ<m8xSs(S`&cKBL0^*>C5{?sCay$W{(W
zZ2HU2Oy1cH8)??|*>Gk;_>h-=+{W0pMJ#h;Jod@qk!INWq!mqCa8p1YzE_}Y!f@~I
z`}JSYxa$N_YO^UT2*yHo_4oHq`jmq2K_2@PhfqDErsgmc(8o5aVuCDvb-cOr_6*b7
z1y)a>5aJ-vjYm<Rzmt33fv;e!?R0i6M52%IIxrxdZSo;tw~%y~4q{Uy|M#Wzk^cLk
z8rRkdp)NB&l<N{n%q9y)P)5X6!cLwnIk5M{r4FX8hA#&^3HvcD%s#>bt#oGGe{^%m
z&n)x2ts;uynqYOmKva4IehoO_V7+5r>Pv*A$Bf;X-QshKu?l+vhl%0{NKpgt%N{<h
z1^f?|7<*oYHr@RVP^?G*>7tCuK246l04SV6!J3>0fjTtu_Td){P;&_(4S9(l4xF$9
z>j;{yh3nsL!L5`TuqxRCK)W8*<x&944tKs`JVMkCb+Y1|S~e!QyK}0$G_KivH`}!M
zW(*DDEv_6I{87$-djY@vNp|`o;f8?kj>YQgBk;@cC{Vcnf4kvNHD<`{mc~Kvja8R}
z9$@_X)Z}~6*~8`s%4!!EA<|xm>*VUWLJY~!ZwS@EHBqcayVbBeCRqVq$9Fq{2+9G-
zdy-GkG;=5bH$`7QW_6bHlG5{Y!n&=3z}<MNkzG#r54_fD?-~G;a(oH{#^UjK#Qk|_
z0OQ#^87VbX*mrC+lPPBnm|Fjaa`Qmk=k&98SFb_5+xXZiubn=)m9e~8Igr%Xa|2h&
zU%pq<a3W2M^DSDCBDjF-Q|RrJiHW@x2JDl6OUq#guI87KpWO4&0bTbe@#JY>+^x8Z
zOU`_aj}0Y0JA1^v>xzxlE%Z4mW<4gh?Uhk}TMxf-HNlXrYl}D=CN{sCbAS^+8<@^{
zh5=BP6o2dCR6#iXL1I~F^Fil3L5BXeqC&=>b!xn(V(tT9Ri4|{GY=pWGg)1O)$v>`
zku}Wq_B^*ZLTR?q9?@clJjBFC@A8Exe)jGH{xm0P`kGq`wWcpJs{wcL(p#WOD7#fh
z9++`$QXJE37W6KmK>oHZ`YSil1Y2*#AD>0c=D`9Ygiqu#5V*`p1kj={rDlFvxBARb
z?i0nYzUkHZi7sSN-vuPzBQ>U&FbX4FZWW9uYF^9_#Rih2+P)-gj28~K;gZXFPzwij
zXB{6-jm~x{9QVg_L?F%4An3E!Dm@li5q#eRV6A_XOrHISz1k>T$BsPT+<p*Px?fj+
z4uEwDoO_WP?DB=yhP;`rNpVk{bnT@538~#0T6BM+e)v7@%(iZ|4T7#v`JI=nm2oI#
zn3fxpWkwx<sfF(SFSTHz$H*R^=?+j1MeHhItRb5bt$S;C;4q(w5h06WRt81!ps$g>
z6ItJS=|fb`fUE6YY`ul7KKEtM0vp?P1lBq9Sn$HUAdNb~+aw{eZ?!5TBm9@wM;`En
z0D~qyf2EN(NU|(}T!;aElEPIA7>t}#k1&j`M#r{o+qP}nwr$(C&3A0uwrzW6e}CX4
zr<c8N+BDBvNYUO<$m$R|qaBof%7olILWV2TRFM5PuTBZG7KX7U*Io+1vDYF;gkSF=
zOGm&+&K<b`OX8E@<y*SE(JL!ZMT*o4&zfx}OBP;x<_@BRcAF*1DUNknBFA=(TFGyL
z9i1V*4TVcCpG3p4yvbKg`(CrE+`k4^wmhs8)|NM!<LaRlx_{?EVQtfwuL1~2cTHf9
zuWju!?5>^70QI=@z3=Yq+iWB3TdA1MPg5f=P@e~Tr4~1sQ&)NY2isT6I4pHF38STY
zDXVJ;iSgQJ>kT9Mdlz#nJvck+<^@*I{JCzSQ5oyTbDPM}8cxm3aD{QZQ0n~`hk2Ml
z9w*ezi5(1VFiIAj!WC9lkAC2JO_gP4LjRml2e+=(YYXku-%9Tb&y|}MOnCnKT!DK0
z@_#<(-a5pa!&+7o?#zXAc%*MrsfwA}kPkyqH8(}H!_sq)3iI?*{#Ciksy8hOKmCrn
zdjrs!_4=c$uT{7?U-G-?UJ9-UT>yAfqNJ&Nx?>ECOH}j=;OJ6}yjs(k`|O&iM?2zj
zf7b*Tfa^k}ZZcK_p|NQ#I||yngMCor!8D8A7e>~b78kPvI?ww_-n{-L|A-5RUv<AE
zMeU?WphlJA@r!Z}CwcrGHzrA5zmrZ<J6%0TxW2t@pDb?-sD+t(EV?z}L!=bV*P`4^
zoqW=qC;+APA2TdZDW?XBpj>RA(q-7q4}2!BThRR6zNatK0)US{Hq4{k<@Uaa<{VO2
zmmvpe=<dCH8}S;!URRv116PK#iNp;Ek_cYr5m-R$C(8w6h^@At>qqLiU_}JwL><jS
z)otzhbmr5vZ>o0SLJ;1=rMCxAlenM$utqWEiV-E>(;sgK5#zeLVe7S*K!b~}2oCYK
z^kkNG^Wy%tE9ML8N7Lu}vIRAOXCjBd#zesNcCH?`$3ZYWvGmyn+8bvkJV;}e*1ME#
zUBt_LS;!9N&tk`Fd~*=9L;ZzkB`8~8SP#r?ex`6grX^*)qg~r`(Uy5J&vAB~-B>Qv
zWgm#}0d$7{7XfG;_0n8`w@%pN1PkghVu<9hRvyXDk}kXktT{1VmJ05pq?zr_+e`j0
zcJ(d{conH26n%`#^_e{{j7u|{(KrwqL<-5i+u8xaR)g*~?F{0^INFIfoz3jpy%*+h
zg-r3RtY!Dd<wBFUgvHT#@@nV@MP|8(sz^>OW*E=~k*;<B<>b=nphatM+u1_+L1I}e
zfPYv17SkJtbd6syZSUlVbgsgmzBK)*2mDL^-dri%%-=DbaiKeBv+|cfksMtt4pn8Q
z{F!<F{V`-lEart1Rlzt)ADuCn6(QJJ7(R@R-e!BYW^cvt=8|5O$PN@dYialJC<oh%
zeugMj4BxZyL89O^#Mw6WIRPNj(-hic`OdLn{B{Heb7?G?ofH@3pB{=4YVqJPgm@%4
zr19oFNVZr5;e2(E)uF@q^?PhbfBdoV&i~@aAgmMQi^BXbklzKPEwjtW;B{i^)?EYp
zkp?nLY;i5<dl|?}@fxR>%F60x$X4P0Lm=kgJf)t~ytW(knOZhh$nM4zOP3RE#9zyo
zA|f(;<7>75x%)bm@t$Z_JTH3Ok2f3A*?~Q#RvOb+xr|7#9<QvkT{`Y7xkkSxV@WpA
zhY{JS<4U~`H}Z+<ZY^wEHj=r9e(M2IcU=pW%A2@-%L+c|c(R7*y^w`>LZ23j{%R8c
z=j$}$83YWEjDubVRr7E2{^(THrr*5|(er}4ZrRyAN?n{BMbnsCFXo_~(T@FnA_(QA
zEU3IqB4NBhZ<uq=lyHX&dOhobW-og9^lwZfdCN@E!(T3cCl3oQ=mK>jTd4fB)O<Ti
zw`7-2IB-xD(&pEztp?Vq>(Dk+YndXW%;$Y|_QFqDpa$GP)UmU42!UT^tl;vH_u1ve
zXc}rP^rzeDAJ8^?U(F8`JSkgu-GanH@s>71iV@z~6Cw!H6txa|_RP;!KIj8G3Q-Or
zqtqF^sCBUL*>mQY7XhCxAqm~idN$GaTPeYvN-pE1ePgw`VCjDc1yKt#MY1!7i8afk
zAH1*myT6UDh+uFweF2mgcg;)h2bk)BG{6834&UY7bn5}+-q?#r>(jXmi_>0tyjHiM
zKnM0aHu{t1=M(1K0od;1X9OQTFaag?8tY&V=K5H>4k&&SEb;EITyb}vXr%2Uo8<dU
z_@|t+;5rL;a1%THd-t!GHAc+^CE|{C1Y!Sbx!%eWq2lHlwI3i!8=feR(LfNATV0)E
zZ(*Gb!um0z{1P25E-!_<+jVq98h?0e{U;tjk@}M;J&GK|dTaD+7VD)~Or|YOYVzDw
zVEQv~Hi-IP0yVDe8Kh22ewdL@Vm3xXVFh6OqS7e%u<~YkjV)sK#I-i3I}uwidTy|*
zq0MruW7ikx3I49sbGLo6NUPD%NFJN=vSYsP7lHJE>6b{`sOS?Iz#P0B@O+C1PsTMw
zkE1pHJ<xi+LvCLz{XI|Gsw$&E%8A?hx0O4otqmZwLL6!i4hTWRc9|;FT2d)~Po(uY
zuu<z$WcS-EWE3<@YXp=bI$*=2+biR=G=8`8=V1$ZVu6!11lX*Es|JC?<7I2foIfu(
zVctoboP|!Ds6KL2>qT&J)U4gfuzR4Ix$<Hk+AMH@Z6HrI!QD(ZX$Q&A^}2vX`WDp*
zEnrYB=XXKM_FO<6mC2zm|EDLi4h`$ow^mIo^0u>0!+XF$sm_Co>+dAWUEU^hz6C7R
z@La3;yItl4!X%U@UV1eCcei18(J7U|B+|w%w@axSq0mnIamg_ZSWisF1P-wN$I2C^
zJeC7X9k%v0Dv4GyD+9t7;16sJB!J=2fc-W9KlDC3`zMo5;fM}T@q<0$Zu$xgGkBZN
z8zZ%%elIjBv1De^7is+TW|;{A8m$^D98wk65exM*$P@X!j!CX%f$&hCA<sY!!n~--
z$!$)3$b`%ty43SCe5GfC0u<rQ^`m2Z&f>tg0oCCQQXBO#oG$(@07;%+5A%GDgT_wg
zvXT3<R|!<arwy*nXI}%WdN-RH|CNuQW7C!{=@QSFZ2fx&KFG<BiyeaCq9HAW+*2~O
z=4b)x#yP)^ANI_l?+p5jLpP{cPPS5RF}>A9%Nm<plp>8ba0d6X;`D@MPb`Jz&{;A}
zp$&8(kxE7Z>QP3lvEi~5c)he!eiU(Bgfymv2<`VWwMTx+?R4qfwbRSeLxP|fabVjt
zUQtwvXma#>+h5>^V~alX^W0S@;CV5^iBx;3X8doJLH&L`)P<`boTeWhoaB?A=jck#
z8+kQyXe>U4PP$A2Y$;dibuUbf5J(NQ;c)yYP<~C@KF-wusqi{a^^||-(t6in{>l9;
z%-Q^9zDDk?NY{umcaDudVhNvjr}}o54<c9xJ??<GSfF#iDRNua->NT4+;Osxv%_n$
zduKkd+78{;htX-Nq-ym#=!Jw0qNq@6nZ{?U?(8_#L@S|txHOXW)SsG@X^xV73?9x*
zX`?qYeZz^%5HpX4{k4Y{4;|$#Skb1$_JEPRTh;z5NCMpy92pcU$NAuc)y8Xpv8tT3
z<9JP@sr~+3y?o#4hJv4N`Jz0s<YKR?7V56TFuowiORM>kIL#~%`zDG{?sdQ>TY4nj
zXXF#m*r_a)?yegB8Go4Iu^hJ!4yR1Z(LoXUy!deGY<Wt%sk-9nIeBb=49(C+GZxa&
zmvA>|8%GphIj8Gmx*0Fl2Qv~4V7BMju|(qWv;<GdE*DqjCs`WDn7}viQ8o$Ujk4h8
zizw#b?no={&xS$f{*e{!%V-bcyJ);9c^i+v<eJ%ZftxS5aH*o{o%gdMsPndit=pP-
z^e|)K<2y`uwN$EJ{c!anL>+6hX1+J5B|wVl>#|)7`4L2Y8{&SI32@Dk(xAuJpGOO4
z2rUUg8`}$UcKyv&CyVCAY2#6uoJpakQj$p;k5}~>S4za@zWmc=-N6bE0N|RGW7FQ<
z;<8RypjiV;Vi2Cb4KBLLtyb}_Ofh~hiF}xph1F*E;8DydXcx|+*c%svDPpUgc_wP0
znUxuOi_kIf966tI>SfS0XTvqJR~C=v%uMkeYV@#g@a2cxKi!@l&|vDsteGiB?)P8i
zE#_krDn+r}$6Hf3K~iL=g1AI+gKLNFJ-VDJXWYf8mk~9L#Cto=jrHT_<|i6Yf9Ltp
zgq&AT>2aPK0gA@5%fVuh&8Q;59b2W#E$HaS3e%qJu)TT=Yg#CoCW}_Ka#+sVyW={N
z#+C55>feeaSTYRJ6J>{@oy)Kf=Isp;JFpA~mlEz^71bJk#rHinp^GSvWoFpOY(=@Z
z{mwQrF$Q%MAM~PMTQ6XhsbQ(gF`)9I?uLETPhGO*#3^DEcb{>bT00APsPj?G*t<xY
z-4Q(TX7fyIMXbUDNSk8k!Z270R&?zZ&&n`&v&@UYI-0PCW4^9BXtfWSd-=Kcg2dlp
zbw~91w1XFB4!_0q=_6NzP;|SbDxpj_S0TXAp6dn}v?>wSl>LPvLsj<#y|&#akYLci
z)qY>YGp{hK6rpZ7E?T9!<Z$^G-?{(2ZLJcV=l4Z2;vvl-3cN!|(y34&8nHVUtW&1E
z8oJ*K@hxp=yxCK-CplrdE<Fh=YJkM{**D&T7!8-z!6iliRMK9dlZE%$$pbPPc?#Iv
z%~)kkxmCv2?Q<Ns;7y73j!2AC3EYjv0o0&?=~1quW0vHpaSHm=r<Zi30Fv^V)lJaa
zFUuExM6-=qD)x+KU%`SoP4wovM_c3+hWz+b&lF|+zMQg6#hC?Q8JeH|i5Eu*dBTy<
zBty7QWu(%A-$~cnb_73pSx}NbCNmQGk<1U&AX*>dXBR#yNmCf1N!p9AoTO<g(n-m2
zzHc9hpX7l*h{b*K1Ggj^hXG8??YFKjbRUDuJ^T9ZF4R@@zhfc0lBU!egv48Jww#EQ
zkk$Iwm&5>8wr88#Zo#7zmCC5^!1QmRoB=0Ym2yy7Y~K^6m0Ri<{Ncil8P*M{oT6NC
zCdpg<;;|Cc7)b-^9h^{I=l{h>4?sA%)}ZqxYxu0M6%TnWN~jS;h(PT0-a}QMq0%n8
zhBvm%%RD>liXpyQ1gZ9B@e|VuX#Ms<2(HXi6_$yU%Oipl<ua}fd1D+kFesM$6KGUg
z-1LAfvf=A7(k9(5_39VT|2<pI1#UO;+|$*@6RQ#Eebhb`gi7FlgX*~Ew6e!yFJt8I
z`7cT<cG;~J7H?>;N$rlSS1A|wD2|4E57}?aMJggDa+sM4`yb%=n+avl;4XPwvv%Ss
zAor)08>{mg{~48f`!BY=sz+?Gi2ahG9B#}MpnqalOuG6$&PiJ=9TX)3#|5is4K1Zg
zvbVS4B1tQp%E(CthHHE#J}8cz*0_ejc~TM-WTKt<)xWhUz_p}$t2M7Ok8ydzvmX_^
z@c<X00jTzkSU5vU!MMRBacn*$WK$?)JxMMtVm#DW!hM>QW~{prp8aF;3a5uFZU4*G
z_8gFnOpOQ)?Jw`-;#ERFbFr$%TtKEr8D!5@lE$ZeR{w}wMeUk5U7j+3nD*nc<d&51
zHowKA+-A#h+JCwK*cPtEf-dUFz32aYmU)NC-eC<B`mK01NYEE)i9=cdpPt_oedi^=
z=gZ?a$)6;eUOiBwpK{)YWJo4cAm+TH>Nk}0V)~D}`8rpx)tRv27>5+PqKY$*2Qv83
zf>r~^9=`H=0ZIVw!5K!b{w2S?9?rr?@`L5S{LqwUQ{$rx;ziT#Cc|csUZXUbIaM+a
ztWDOQ=01U)@DUd|t1hs8r#cyo5#RZxcIpZ;0pY%$rvatKpx$qCdg8{oo8294*&TSH
zoQzn6v}-g-8R0U*qQC(cM6fn<j(odCsBFz(w(8|woI;BGduVb7MT<q>=%rN=yb-Ra
zeWl50r`E(C!}vu2(`hb*q-EX=ZjqqnS7V<}6rSEUeB!BdN&x%3b_xMy^f0gSJ1`+)
zLh1UWrv*Y7?#`2lhm@@7H6Omo2eH95-FNS@IG`!v|Hy8K;Iu;K&fz0BymH|H%y}Yq
z1!-#?dW})$Zo`gB8Ar6kWTWUZ@rMq1efwTowrtKWyB*iz<s;?x9T{mjP?0KUtpltP
zQ6QtvF{n8MOafg=U{$2aDslz4ZImb7><pOc&p*m?2l;i#9;k8N=@GkkUiEKB!qdoR
z%z=GioCHSZ6_Ob9{hZ}+qNkPPrcg4wF@3X#TMc74$&PM@SF+{u3ULKqlu)_0txn*I
z!ozWzdKzktf2>O%i}e=JMKllpZ~ldgUO(T!Ye%`6sF^5LK5BV;puq|n+8u96=3ym>
z4myqq{7$cTq|2@Tv&(qORQe5RINAYB?K#(s6UFLuxbh)x8oaAq7q-?JA#x9G<^P7_
zToL(`<!b#r_^2E!^mHuGG>PY~lws8^IAhc`@B0dv1qD*}m|Kzh0b1FIoA2u9Obg&F
z50(-5=A?w~5b#Su{TQ=~Kn^ZRy5$h`6VVOkzLR`>9^MY@O6yPZ!ZOkrBsEO8Xf%29
z-y$hRB0S=WkYDX4I!bStZFtZAY-xFVqnUI`?g{3tTM5B}wTqFCS2;7LFZ6wYO4u6n
zG<i2M*Q8Orm__ZjcSyP4DBJNOCf>KRnu6@9$f|@HU?|3){=F1G{Hs)6C>%N?Xe<xS
z14pP`@HO~CMR4)E3|nSfpa9%Yb;*bPGmRWI(TYAyK|(uCs!T2JVY$mxx+Td_{5>1I
z=al_0kdKfm8@6PagC~-3-`Kh-q{=3QthI%ZDjOG4WfSshsC8Aeu8P)G(Yh>JQ$_2n
zXju`htD^mXH5d8;exED_{<Dq#ABBql2bZvo5xWJl%#-P%`MSiGZ!IqUy6mBb940Eo
zCfQDZ<C0AS#Tr+T4FCX6{}XE(+DjSY>!dKBk;jbE5$2om0t6|$XQrW!;D=MEQz{;4
zhm{#Dirz50Wa)b3eBK!%Sa<?t4?N9$G=nZwOBZPL&vQV;S~(#YQrvGaw@I6~atK&O
zR?8-o!1O3~mlljigM!Osguw#5N|w`nV-{1p%*+#eC9TBX<!p<@3m3fLLYbFjb&Jg%
ze_*wTU?JGmLp&+pX4DLa?#Dl;lA$)AY8qKO1fR~)R}-K0qyw^c<7++azwO|jdxSFO
z%dPsn!=H+L=kuUG1~e|7LJ4BtANjt+E{%@7c5HY>nvzYl5Nv2$>5$<GI1Zg64{{b2
zHb??UH>3Q^F*FG)$X&mj9AY@}m8%el^r(Cl3+(B#?--c2HnE+CA+#)A9!-t9N9i+`
zP{fJ$PoM)%CG58WWtRFyU5i}`b5(v&f=rwAh~YxukAe45ovTXYfho9FR{1WrLgQp$
zt6`PEhdq!Q$i}CGb`DRMr1oO3!y_shFL_4l&?3?2hchDsq%+d;5d|=$t3H_5G7M-<
zUY&K7g<K94<{tt3zgh^L;BZ2(@Gc>4YlKe3!8tfooQkq!>T&+Zd;*l}vDA$K5`XRf
zYqr#XKeRt=Iq6X>Dl<W_GdsDf=<q*%Ctk>{k@Q~(eq))+lyu-zo#nu(dkggKtt<Up
za#3@k_Lzil1sSNCqcUcI9E@G!sU2%iR+@Z3nY#5P6DIa4@wNlPCAx_)xbw{@ZP)?U
zK{I&dn_$$=D2;Yw5fXa1A-<_lBGIqE`4*$|<PH26eN#V~R)`G==W>{25Mq`_MZ2R9
z90lJv@I2e_H6u1*R^|3U7bmr-f}jJB!Km>(s?3Db?XI<>DcEJ%AKANt;9-O<K)}1&
z^Ot`&?FfW5?*C3Z*+OGGb%_q*H(cwo&!81H^{lYtQ9g{k1BCSV#^pfnIa71tYxX<L
zFCG*IM=x29YX%rf>p9ftHe}Lx)ptZmdjPx05dev9`oe1gl=AfBvZ+5w?a`W(_Xfsq
zN{R^rB+ug>*@)|?i0;`A6kh`;y_`fa#xB<fe2cerg&om&nv1W=Yl|nPwZMh#Vk`Ek
zxs~(tTW=l+$>j{1VHvGYmtn{L2>^=i1p!g}6lh)rOE~8cKi?5a&vKJum^Q6m0c=H4
zcUz8cUjIPtCsxKCc<t;wf{YH!J0iGEe&duo4EuvFf!(G5Ik|z{jF^<$)4Y%aM3B2%
zNS+~K{yFxX#$ph`Bn$EGpQaUEc|ol|`~nLeJk+q?-f2(|9Q7{lfq4pJ1Y7SwI9<H3
zv{L%P(f~Q*fQjBfk3-Nyp0DwtXKXwiwUSOReaF}`gPG1A)6ztA1ibJgE7O0y=_-2G
zf4u+_rtyp>Mol6Mc3#%0Fi#QK-yu`!6mXVn(4`;`GrZ1(=65&JoFP^}ASmRUstEi(
zh}rPPn<VON;>`2UJ(H)^=jrE-Q@h8j#sw2sXhb7D{?<kjq6mr!`I~&Q^o^v}g=;(H
zs1O)t#eWjJh3~%_uCZtvH=$YMwgF1Yi*&_vM|nQ~k*Ex`R)F#-9Y5$Ja-TcObOKyA
z%?E#~L~}WSdvV3or$B`Sol;sPS4c|^@H(O=*(lbG0Qm`Lg(A92?gT(ebRkU@KHk{B
zx+$O_w}bbY{)H+yF>?s(a(MXdXz{CI-+Gg>jPA*xCUMljd9-0nA2_+uxNbcYwm!g+
z{o~y2&eGV=Ur31Ji;Llm139KLUo0iF(~&4-?ftr;t%BJ+aBcPor(4aSqd8h=$~3=T
z^RHHbI<hUOn@4Mlng+F}98{<COZ)tdl~x3!absGR^#rZwo0Zp4{Hn__jn5P8*`c-o
z8S(wlr{j(Axax{|Jl~+Kh<<ZlS>m$u!|&D#7pW;<wCOx^Q4ek)BS~Hk7o~vIAU0x8
z7qMaImAWlwz9pcp<@Z1p_x|bv?zz0s9cz<|>6F(!>4cU8Cv6DPm_w>J)?!~Di(|s7
z)Eya2mjaUY;WthB#P>;9u%_rh<8G4|yX%<^r~_cz{EX={4oANjse9o&K@p8nLFH$X
zUCvXch<R)zr_(_VH4!Eo4%~hP;%&;{vk+^7aZYT?R?p%2jbXCm(p-eMix$gZLADe1
zBzuf9iu&v%@ikeM>hdXOi?P_ptceo+SF4j_Bz_X>AosRU*tkvGkJg2@k(;JZEr9z|
zIO7F6na@2@(I!-AXZCo{;J=6$WVOFy+ehu<Q7Kd%el+_XZHP0RPewjxwzQ0&B<3jW
z_=K!Z7b+6EJ_R;l^>Q;7^$B8a(k>t?Xyx0n&k~TWS#RCgHFfg@a^lWG&2ZL~_PvVf
zL+pqfK&w`~i)Ow`A60i+=+rx`N#7)P6T;19(T=L<X;4SnNu2xRN2+$my4!@lDB}hy
zHd-5eioOTSfTBK2mwAgnHjGsl-q=IYJG>Td6VoBb?ZZ&6Ry5jrqKe5e^YtH{_my(v
zH_<GfymDVr2X14FkZI`PKc5%-Em+X1?9F`QQMVVM1VcQ!D86VDuM;*r$*@)xqG1Kb
zGSqLFreUv8#!Xpf85rAtoW*par6aBq{c=m>AK#VX*Vt2&`}|l-B1bNE5oTSoa7Ilw
zR79-H-~nV+ci&03%so?kW2z8$7VPKw3KK%(wP$<DSZ7#f*l?i_$RU-0jH&<VBDL35
z&qQG|?bP(eMA9_-%vdJ*UKz)`fScvz9^KQnPGzWfx%e+-pYz6?#GFWHU;>Nj-WyLa
zXIk`d5#>(ob5jAbhUT281qM6TSa=P*LZC`{5?G?TDTwt;#zYf2BcyylRl7p69Zz)p
zMQhGU4TCN4*+dqWcwNUFVjXsms4<P)Z-MS=rJu=?$HIq{3=Vs@NPhGmd_}Xpx%Xjh
zua}%HUoy-(53KK^ng_q+D#+G+2kV|A`@UZ-iTf(6vd}|eMG>jm%!ZB|Hph5W#mExO
zbZ-JBW|9mjGL`3z=4qe2FiU!(if6+b8L~sjnc#h*+?-!v9aCUnqCD|$^Y-HwQ1k~n
zK8#X6>~08L<%xJo<y#PIWc)#6EDzV_t2mOd-fm*^1u&$g>TEA)VrW%$wi0h9^{<Q0
zfcAEM$u5t}@#RL9-hXuF8g(=0azds68^o*y{W`I5&6q>XDKof1-xXtxJV^Gnnn(%j
zEm3&s1Oe|KI^OV|1LOA|?0eRed9sk+LTL}*JGpPerz0K)6<^lz(}uCxV$$KaY8flR
zxn%WNb&0hu1}>+xuA&p6QJEC{dvDzCZiW!FX~Aig&w6pg54}<14LXJ8CS^P)2=Kos
zm!AgKB$KepMnG#E5i0fgZ08Y}V9-&}zl{|6u+A)rDhVuACE*?KXBG=<b3k_-!bRM#
z&Zd$Gf~iHV<xYzuqZDkE8#zL`iaeb{lxWl`YVm&uoc(dEBU%>+=TKJYxjYtnHxIx1
zWvPBZyZ{oA_id4ABSR;F9a4P|6<NU`8o)?inar4+;{ywk3pe=7zI`Xl<L^NG)14^V
z9T>7Mr07zL39&`rXqoo#&JetFb~W99g{C^JFeCoq2l!W%Pfi_$M{v`Gev6g*=2-Fr
z*PeP9ISuZ~7J3`uqfmsqWfeFhxtqkO;y1@i(-<)&ivwY`m40X@gvo$p?n@s<2P!L$
zfY=dK|AFv<UW@>S__S7S1&a==;tqxWJRbTC^eBXtM~zmO{))J(i@sML%7Q0r(#r_s
zQFfM)<1!U0AO$LvF7ACPOe_6xaJcq1Wd>AwD4Lbx1MxS<<ilDF15N`=X+>cynKgg<
z&W-tod#N^slPdof%)!B6iqp^}vwoZBLWY_VO?ni_z}=vfRdOJwA&f(413wI=VbWZ(
zi}94@nko$q`;$p-SPBdZu?eHWLcCHNYN1Am-!b>5i6UT|?l*`C?DWOb(tJIhXEesN
zAf(9F>H-SvM!y5j-WBjcqVFe{r|aG&U+D(kd*B4o{z+17xbgpdErD#M--STv?(QUM
z2>$Di{?i5SD%i3Y)$G$hKf#CDCY49tw{~FT%I>j2697_VU2y_tKKTqz^(+~F47KBq
z1lo5~^NT$77w+>LHTOscq+?5&t0P?J(JahB+G5m%*0aMY_6ZPDLMmKKWmZMUfM0$i
zhCY~7zXO92rk5`@BE3vv<oA0YTR}eLkL|<N6_|6>6_&Koqw<(vs0^GHMV5D9kCKRh
zc-aD|@Vx8aPWMfXstaT^+wJOb{TFz>EQOcMdbaH|W1CTM<boXX5(u?x7s_M_8t3T~
z8gUxKk&nnlVDa1F*V>Ck;WMnY)~p6vxAsJltCLSg1(C;Lnu>D#1!KKdJ9Wzhc_VcX
zjB?@LFOPBNn}oPmRBVAD^-z*)oHXiYEnp90mmXcP&y=|Rs`AqD9K3kg-7PZ6WlpG^
zU~cY1o<Jg4gct=_oS@x+#kOYHN|<FIu~PHi7q<<&EH<wG=}P1zwma-&F6`V)QImr;
zjJ<|&3lkmGt{cRu!jz4_l|CO-!(9BmPV6F<NKhol-$$U(Pgb4Nup5k;S(`a^0koZ8
z_tK}w$2$Ha=%ts<H#t~(9!kOU{;%<=rHr3W(;_jqf|}Yol!&EY8EPM{#0ek|11UqB
zTX-NWdhU;gy$99T&$V8JP^n7Fz=KN_JGvDmUFYat44$VY!Vx8Z<_t3^dmFW626=y6
zS4g+UtrRdAJkM)O<_2t0N;sPQeIiv+4Z3m8XB>@-w&r?^UL1g&2W(W9BUH<YQ4&aD
zD<L(VYT&-qwSwU#Qqj{F)H5_5xv%F!C4L3`4moSW$qh=FvcUTl2HoyWQ#Bt*4Lndf
zOoEDd+Y5(hIpVpq5+I35D2TX*T;e(8EPMoYXM*2ZK!W_}1DYH5r!!)SGVH^w0cGJV
zFU7u+G6br^u*~^Ylym3_EBP+9lwdO**m4wYDjFqh1R5d$Y-AWKc@MjU)Uv~axX=o5
zXAE-S)1RkBSo$TwGL70DaTC?|`j_fab{V-wP6yg%IqZFwct{Z#e~!nP`-AMF<m)aL
zK#sM@6)yfs(_b`wZSI&iUcvJpd1}qn=@c4cU@DcaKFW!H#^agEGVeJFYNDLP9LSSd
z`}r!aWokIEcVOVBuq`-27C{XUAILnsa^H_emX3~Wo;4N1h9!r|oC}UMOQ?n)NJYb%
zJm{a*!$A}*1XL)uc?mM$Rdj+^s!L9p>-30Bv)+oDQ0q@}70AUyLnVv?wF&oK0EM?$
zySw@AV89Y1Av&;apVK>QQ&r{!?(AR#-Zu_#Wk)vr8p-H<DNYQO)PWyWVv%q%>WStG
z>mZqrhoMdYKu76<5G@5VF?AG%f_bW!vbT{f3-w&QI;#e!fV@>-01B)vd$7Hic(z@k
z>^uTARBM568`62OVPO<|)Jyt6mq^Ae!ARPR!az+e1&lWux+I=#&N&*ttJiI<;y;~E
z6M!QIQVd^-ha<W9`_SsjeHnTm^6m(2n6^xBkkSJi-zn`)M>@a|@#3rS^>po@vrg|3
z1-7ICMawN?A=9(ro~C1XtmE(~=RDY#nxIYWSQc=zH0gH?IiK$^ddVe1dNya<R)VyM
zcxp69Y(FqW4{B8NW0M@CSl5Kh4wMJWy#|l^n3sNZkncOa%j}F1A3F}3?*2Nz<sCwl
zx(e9SfG9$|+YFc+n=#OinU4$pr`N#VW|*D9U4)4l*e)VW`OKH;Y758P0DFD+2ouLu
z`8U-n3s<Qs>Mna)7`<z-60!+v25P&~%nynVbh%^!pMox&SO0E{DTcSJ^+xN<)yN(^
zt8?BKO`{y37hoj5W)6zVJ6MrU=t?(cBDFjHjAoscwMy5x7=sM=_+4vYe4V|pJxP<}
z25K`zv*RI)8ktMAZ@MEHad=I@8!lfq0#SuLFMJN-_INB2J_pY%`!zl`;EWmH<o&26
zKLyu+M|x+@<suI~WArZN&bl^L1TbSIYeGLCU^Z;_ef&I77k~Ib+qoHkiV{QWg<hEx
zR4exGSL0&5<1TztM5C<rG!ciz--5_iwQWHUw9BP|lm%HU*X&u#G?N{L|It{pG#`%z
zy{<-!@5&|t*_re2bJgX~C01(SV@)M)+K+ToLr}Rl2#T+Q{DOdZDc`}z*6~vvyujLr
z?gtCU!!-=^;qzlM3rr~UfF}1Y0iaj#d*oV*)UkV!Y*zP*{=l+IoS?}SQD1~L4}V0Q
z`k!|n4P%FF3gp8I6LDoOduGRvKCZAOSS>PI`K<s|{F-E<D_Ty)r0(<`Of<Z%Q;)F}
z-Tv|Bvx|{|C|~_zC6C|JmZf46M%D0bX3T@u>nYa$Vo_x;d=hgFNG+83ud3YDX;&&B
zi!c^)ZP9{sRUt^1Yxf%irU<!16QDfE;F@20Us(Oyz7(Oc#6lU3q`;+p13_kfcF?R~
zzdZfw1gK2*fBMLhX8_t1JIUQ0zREOyMem6&I>_SAl?la=70dr+iPG1=nG7-Z&!UuR
zB5Zqw(7@Cr{>Cka<^K*QUT$*1p$O4qPRe~SqlTaK-P7`@1xKhbFI*Gi1sNIyaY;Vx
zyP>hcq%^G#&b(I}NUYjtOX*((%H(wa0r6$CJ(FTpcU-?<X}NW9FCuqz(z(n@3sVNG
zQDc8>l1Fio^H7Dg9D?bwr0wBkIi1fgVGqChZnZMIS5w^Lrr%FTT@jKxH2r7!F%I`o
z$gK?n_k{@t<Li~&H8fbndz`|Am2qkOAtXIHJ$S19TpAC|fw_R7aSg>1zL%*|ZpO}P
zxDi@kvD7Dvn=MF;l7dh!Joxt_PJ8mA%dg&6+(Fq<(0FMhLmV1fdwK#Wnbx%z|M~hY
zrw-O;wk&N}`pLy+OhNOAol>*>)UU4k_O-r)**-g2AtK5N3HL{<iSKI>378+8P~D{0
zp-n9z?s!qOf-~ZgVcpi-P(N^-qUk@sB#5?U;e`tks@kQ3ZEU=FQ^(|?w!w)bC19)!
zq3|)NfT!ZQj8W(b(kH=q(N!EAO#GMx5ljaxE1uE<hx)dNJ)jkwqN)k;{geuVHsPo+
z$1_EB-LibEr#NhTo>xpSl&dEtO`dA54&c$7a(wu0W`mk#sG%N(t^7LZSIjY5|Et8a
zpsVG6`Ol7^1W-^t6^|tsuGe>$^SaBnuQr@@|3Qw#vJ2*gnE%JAaZR_Mx+;@+$Z{b1
z$dE+^*V<1NPxOwg-J8QF9Ui@z0r}|mQy_H3g{*&}Xe(5^69#Hu=XH6de`f@><dP2x
zd6}EWPqd(?(5ai_N4CalOfLkiU^`6ng)mPo2s)JHWl5YHkJiONLt|&sgt&1r`c8iB
zP`lqe0IM;pKvm7CZ&N@ZI?02Ef`%#pkok15PM6V3VVyL&9KX1?VZjfMcl*p^(m!i;
zfi--?mJMNWFF(~O0RSG&t!^LJJ1MB>iT9@o3c^i#=>XUL{ulOj_$_I5ujK->G1pwA
z8n_VAKCZ9$g;JBJ+*qx3rzd2MXu7y73D5~GtbHVihRC4#tUu1q75D%P_XsSy{jYfZ
zivzwuC|<EFUyC{Dhkf+o!9E=r`s6IPS)&+Om_XX6zF%LWy1~Uo+p-{jc@<@Jl}p8p
z7RLhaY6c3c;klI?>$!~t_)g$+K5^KH@X(y)t=MTi)lmrbioyfav-E!Z4=~_#-9`D6
zO6?lTmO4HaSO2b4apmz4uP!Gflg~Hk0BJPHl#?h+2+fyl1P$`|2Hx16>1KM9r+Y%w
zVE3u0z811X$B~je>UWjCL0(2n)FxUGw2g*9hGazHKTEt2dbonQ{6*cm8VD|-1&2&X
z{0!gn(n5$$yLif+0n~u!6@w4?`hv0qbu1=y2>}@QHW4O0i~=7GWjiw=4*{!%3~86U
zomKCPsumc6GXUX`TK3E%^nCv+K=HI;QmhN0(javR80I@h>Rk8XeDaX{CMz33dcs`n
zm&^Jdq`FKzG8kE>|Cv-WpB|S28#Ga*CisF@mp6GbZ=A09tXzujyy?b138f8dEVLN_
z1Y<hLcW+@VMFEfG54bUuqF6r-*nr~u#c~D;o|FlPvD${kGu8)qObRK`$zOWvAqCxL
z9SNPH2WHMsjFomPRy{E>Gn=H4rKGXb`D>Tud3_9Z4(>>eV2d-`qt`&c+&$Ttul~Qf
z${$1?HkM{>!7ZtX)Q=$G+_#45*;WJPIE>8$fE9SugE@{4=*=e((A3n@YSogcGwHR8
z`KBR`R8AQ0W=h0PQ|kFiuFI!brNjT|5b{@~I-y!JTu?U9r~qarDWcoOGY$BnP<J}u
z{i-dM7d6LnFSzu>>1Jwc941{TU9x|*_A94IyRVG4m!cSS{TZui;n{UYWZ9QI6$bR{
zMtY#I6Npbu(U0rOF4fd2zF(>X&Al2V3le?g4X^}8qbGi@U!?G~k;PHw(ak`d{+<9|
z&``*Da|GQsH!&Lfa*WnSx(f>Qqv3^0cKEyjC+Y|~12$N|1P|?OHKsbiTUTGN=`O-c
z8MR<1pn>e)2weZHT$mu$D>5%#hD89+HHudz0RD8z9khS_lg*IkQ>K$gf{H!h7!Lt}
zA3WJDN@0|n_^Sm$l!8I#C{>^e#O@~?P#g`UjRAp{@J8~?`#Ny5Zi5rw#0dM;q$r4#
zo^2<Vw_Plc*(+@d+_LjGYwDSVgUZfnZ6Ed^SMy&K)Nf$Mn}Z=z5v{KI5jBGTqXwCN
z<+RGaOhD<?j6UGu%o}2{gLrPciR26lC_pD~uDN7_Tjg;gJ^~wYmiB(4o!am)9v1=-
zt1bI$z(R5>7tVQ4caPwP*+r)}Jpw?SN-nJ6G7~tyBPN7g_e-<%&BZa)3mdtN-{_(&
z#SwieML!2kD6sh1f|~MGtcAu>%1y{`vRA+B$yv`70HP0}$|M*)cT#EWdX;?yp>}XZ
zeL7r<z`FXVEV-A3%pdzS#nIM{cDWtC7I}cH4%DxI4R6CmhP$atO~jqOZyiK!WGwlX
zakFdUbiWczR6mTKC`WvGd9IafNRlVlM9qTfHy``?MH{&o`nI9Dfx<ek?OJ@a*QBY8
zoOgB#Dh*u*SHGcl`d(Kg`4>vtpqu4wHRdSfidasGY|qXCVx$-neiXYo_h0p*K?5YO
z6!5xmF=1vDhQC65o#EIW0Zl8CwWPl$$S!%P{Eyb41hg#$%fiOW8D$f9f~;uU9`EY`
z#ORI72%J29&wzV74P4IPr_dJI{Rj{=r8vc3`x~C-^FTy1u9lV7Zl$XbW%&eF{pD_K
z&{!R&mJ~~Za5>&Ro(U)w+<sGk)$#4Ztma|%(k1>lc(tI{<KfZdUEifq#1nvBA;CKd
z|EdYAz&OH{OR%%qF!E>3hL4=tAz9<wYIxmno@PGdsQs@moPWUq8o+2j*`OuA7rP=B
z31psh4FnY;r8PZ;U6S2G=TD|)S?%ajnJX#pq%!=?-&OC0be6Y3@DT!#k^OS^G<sxR
zwmW@AB8vd4q97;A(4p;-#=`ougp8}?@r5v;$xbE#d1USH`^u;@ZW)V`qrxX@Wu{e>
zma;mJ0u9{A@`}OWp}nHnYR)6Nzo?0MY|r?$km0}`+m#Gn8SaNMl>Dj7zlfL@>-BJ%
zVZ+H-46&|GO1$W<c5w%PrX)}|W01nVh#!105*X%Vt<EqNRAzAFYeD~@)*y5z00igu
zNyVi#)ZQxT5`Ys}WPo<VCR?*0@vkAY`~`LeOZ3Jk0)RMeC$T_~!OVz#iAu^G3d9t^
zb&Qe*c<E9Wh<bgQL;c)$U<)5qm6CHZWm~>%!k~Zpq6GKKgN{~L`A+T{ATB}PZG_{x
zr3FZ3L6GYh!{^m+VT#pDN4160uM<ym<rVT8mXChB3>lggaj<;YK3LK`cwK68G4)mZ
zz!5h|puXb$w&~Cj^%a8@<$>XoEv%RoV-A#~=$M5SCpD7OHx$FMsZ7p~@{24bShT;L
z{ve%wk>l3?RDwbC=lo#;<qCm51CH)Yj>vSddc4EjMf6<*M{G$A2xrbeoqHL;c$7sK
zd%*<PEZFA>gTK0q&ek)j#Gy$`U^qdMvMnY4drgID1u$ZHMjpPSN~g}`AREkC*x23Z
zN=iP@N`@-rM{hM7*|=G5nNf_>54fsqS`p5OdYZecA+sGy&+DxGGfU;wk8i_fL891#
zc4PS!n0X@@bLrF<?(~32AL_SD?*y`bsuJ^V;9cZ{2`o`!aA3bOmrFI-OlcX*Fg(ex
zmj3g8A<f%EEbK0Jcu1vhc{dch+(Pd~?`PptVM8Ddkhwrnnq#6W#v2+WHF9S(Pd%*P
zM*R8DU~9mB<-xJr0H|+0w2p@2pj%&GovrF6w>&@ywVuwP?+I&Q5zU)-R7e%Y<(S4-
zm0?SsiPQ7$IXL5E!#Lsz{mT_16_6jF&`5_aI%xwg3Y8jzCe?+{3vXyj)B7l3TYOYC
z9`F_lcH`*EM&$3CoE|2Xs7f9R|4*3qajIuS1Q<?_h4WH^ZmUHtMg6Fp#F%}KnL-O<
zg}BP0aus*VMkp+e_y$&-U&x+T<vL3D+qk<;?n%l4VB|#hz$4`aU1i`m>cQxU*Nhjh
z-K!K;0B(1sTOm;W&vRG_g?xnvDS2{%rzM(LEG8%bP~q)S06T!0-Jrqhy{fB4+a~Du
z;$<S5u0uSQ-G-pPuku_4{|@i4Bu~#|%*;cC5xhjiE5~7#02d7GIFB5vDHe_1BhN#<
zDmhhdPLnXYfxtJ`dKDOLf@ml+vGlx}EfigF`1N~@?}H(A?Z(fsWY>P}&)>;!<>zn4
zaf^W!DI=G9880dnN7(#vr!gQ#e6b6RmIaDZi66jIT%l+eIdb}7_cGIM%%OAfGIT9_
z1u$<sC@X_Yq_&%JYKe%4J5D;3*79K8sE1#Qz`W(+`u4)jacP>)B~(7w2uo8eQrQ(d
zfwd-3Q9BOC`OGp|^iAGrxG!3-CW{?Y5#`SnXn}iGpkBTlk7zQHerGNi(|qa@adsSG
zoxV5qEwkAo2ZUGRR7yb%#OA`}#;~Ez^Rvr=3|JpkR#rt{>KpwT-DY-z_vrl}qR72d
zWg4b<3hj<HiC>B&%{Q%y6&*Yn^JoMWBTaEPO*J7^eo{1ArH17c%#yRR#Gk^UT)Bpb
zi~NK7n#dfG9PYQnm|*=v3d<Tefu7r{05(5BXX4KXJ?r#4ADFpc31~R*9%vQf2bpu^
z@`Y=P<cumzXyVJoEuGyR5?;ujO81_?&O{1g$JhoGPb(uIVf~?>r9DiBj8lD752VSw
zs$j~M@caCA_tgnU5gmXdha9*mB+FP1$63{PF-cDL!W`ukIWEw;<t?LFlpGqiDW%@d
z&Z^i%2w!TiDas|&trIe063Qd+J~gZOo+rS8=p7#qFr5i6U1a2NMxUu{1r>awNP!$g
z3+`ekNgh!{h8$)Va`Ti#Tbnhq(Z9mCh?)XBm{U}`eH1U6(ye^9OTd`QUc3vB+~L@p
z9rdY+D@`cswF>oeG+vl-jftC4MAhAIY)$0h*<ozMT>(85HTER)br?BUU{Wic7D|8|
zLdt(7Vb!6yH2NP7%6SHbzxsnh$h^7ndaeptrd(L;MHZlA?SUL+h{UYek@zHK(j1}P
z5o+K=f~=uMsN<`~6cd5kdFB!h)?I^pMO~Xs6+0JFYccTL5vU|$fTeI+n&Gzzd?u>>
z#_byxLy-g*$+;|1fnhJ>i1JDALD^3v;@Lr(w{XEF%j$O}4!4N$y_apry|+BwK&?m3
z><A(ag6l*Z7Epm<s}u2K4^P!mvi|)@fm2%v#ggg%(i-}`R=T~38?H?t2aiBqF*0Q8
zP6Kdr?H{=9d}G5r_yjPqY1XX{v&+w9n>2TQU~fu#CS@W&-Ug`Oq{@>#9*c8^K+R{S
z46(EYB#0Br$&9^mHg*s*Py#P4j}-ri3bub6qADk9J~kn#YcFGmia!7hK+uiY=$+>h
z26k)niNkqe&se2-*7(wJrUs?|F77waf=>b95@J(u%W7{{)U_!uJlVjpL8}XAf<l5V
z5d`&sOE*s?(tQm492dnF%j$F4Qi^#6U#~rQ_<vahe%0;xWRlp9)hFDvI^xJS+Swo^
zJU-hTvA9C++GN9hvaAhkRD6Ei&3H#if+1Ssts=qfrawPjw^4j=;8<l$TKh<o3g1aS
zag*rCM*m?Imt-Uwu$#X!&F7YWv%4frLgn8Nkmf{bev;NDy15t2o3TNO>aMyN)r&mU
z{<<%c!HLhc9c)$&O&X0t=>QkB$<v7>j-YV&&7q206^z^!4;%0i%I%O_iJIt41o#ad
z9BwxBB(;we{#CY${UVLvFOvCo&&hLag-_$J1dQ9GCTL(bYnbN0O1Ny50cBFRz_y+9
z9okPhiD)%Clt+J+G@tz3zvwa2nI%HSw~<r;5b4-6pO?g4EP*_W6D#4J=@gWOgh<b`
z(*Ec<OZ5kM|6%ZLw$jtvQP9=65tgxR;HGy^0XMsYvQ06Y&wg-CGN<weu=&0Ug~@u^
zmfj9@pD!h?>qx8f9fy)A4Y^yp8b-Ly?l#3zEjIt8sphFRi}Vx$Ru6%<+XIJQ&+;d<
zcXvq%bWRbkdXMp{sDtD}q}kTZ&~8~mDW;`s1I;J+;ol5n-gyE6cGy_K6N+)AE2?r&
z^K=hD9F^bKr?NSgPxR>Jfc=b>+FY*XUrbH2x448Eg&tKKo$GG<YY`bp2FKGC8LVSP
zPWM%pvs55wDmgDwm5mnhJaLgF%9rB`1TK<;{&`Vd2;3ye%OVaw^N^YBH3^p)D&gT=
z<evA$E5}^t&2a)V%Iz-N*wZsF0aana+Y@!;KP*l;Wh8af5~1Q9&vXoHlAK^~eJks3
zxT3|bY24Pg<@j1vpFXQfH+wLT+jWr$%PKDG2bf%9Zm7ZxQ*2n&H~w2276>2lT|C2h
z%N|crn8h43N~SHNu51?9Op_W~4#Wfcz=r4k=O15ob_h}9fM8As{|52iokeEN3_<n@
zX|9&j?zEzc5vLJ?{L;G4qqawAknPrA_NBbObSLx`RUMO&e$q;=W(RkQkt@7fWXDqL
zOsNEF9+=OONBjJoP#N})01$jxC9kp;&9;oK9E9h<Wn=0<9#ga$v8`;gG>)g~l;iP}
z2zrot!N~jOh>Yu4=i?}ZM?&Hoh%ZA0j}RXTyAo0vm)wk2W-EWc`v81N&680nh#~=L
z@}qtoRSwC8Fq5fNPtFJB!GCYo=L>#GzTJ|6ZKhKl<rW<rgFtgrYVM=+vz15VR0Edi
zJyfkk`WUR$lx37NQyJ=JJe@Q>nojXynq!sdQ6ZT<N?5(Tz89-o^X%9dlJ3XwVY@lL
zxTc`vhFgXNKH8Im=2}T-mS)3^J<<=4VFaHC;O&3JGV^!&(aOQR-p_-<m*7|<q2Fid
z#tvz!(x>S5(7MdWgAiYse*&LUO_koo#WPQUv<eKW%S{124_AVOb2i%&TN>xtB`l<M
zt7ROK6ggDjK!YLt<H9WPD16f-Ci|n1{u!_Z!=A_5H~ge};}78ZfqHM)2E++(^Tf0+
z%!g2vL-p>XvL}2W9O>YN#ds&7mBmT9-~vV+;=@FD`O(M5BB>*-OYc<!rc&u{?2Ige
ziO_RbHFG1_YbKpuhOubKK5(hXJu;t!vCBbC0Kjt=nQ&svX-s{H4)p1Jz6PaaUcDh@
z6x0HHK^TVHhvn0%r}I*qnj(hByS-nAo0T<2!zza6hk@$>0)^YG7J$@!*_q-pkw4Ra
z4ovE(3Q;nl^Ct6RW^IYPgPvDxNu5g14|e<V!U4nKtz!s4U(3;^vnUhaz@78eG=l*J
zNiwWVi>_dCh^T)f?0rN?>Z1$M`jz2lpGWu3E$mbVtQ^q}N2|lOS^f}BHj$_6-|o_5
z-P&F(;TmOrQFuwR$0E&}J-eZc1$>NIRyU$UP8d(dC04G;CM@0lr@w16{|)fsN5(CN
z3i;x@LInir5U*{`*<nZnk_k}y_O0I2g{l~zV}d*16k@B-V%r5;OuN(RB301&;_=xo
zNA3|^DqoUtEOB0_Dv?=(V}L-YC0^4Rax}>bX;T{8W)dj~RN+_w5}PNyBL;@brOP@W
zr79X$2(+@r6Rj?+5k4v~&o{1<KC=fRC3;yE%)hldOBB7CtL+Gn@ke!2FFN3&iava(
zS+k81`K|f5B`)KQ;aaUvMHM9s#~d^Y{8zvx^zGNZY}9W&%}IPA8j*qIAJy1_05U|+
z^Di{?)kUBFtfj4OjVm1&b%*>nrb2WNmN+61T<i+ND+&*CP$av#Y7(`m-L#m~jVP$?
zqAwyZ*fA@n2x%QU8Iq5q0zgj&0{ndDR{R2sG=4E;k$>n*s(}Zf!EuNb2Nr8(^bp{#
zDnszK6^T%67YNFCbf3}UkF75$7L0ipAYv}#w-IoOYd}1KoaVHU`#m)(oH<jJ_GvW9
zG{`m{dVwYeF`*WtE2`p&#xx@YOV0aFHhqFQ4ez~M*l%l$WZNS)#Aw~71P&OEXQYw`
zuW!ggXsHBDT}rZvt|hc;RxiNl8%|af9E!z=Yb)LPH~zl8_TuVizW+D6aUu^e>rhS&
zWO8NxQV4&`&KLD6GMdYn#1}$!mc!U6^ZQt2x;te=wN0IQ+CEaJCj#<kJILowjApgS
zOr(G>dh0(vX>F#_z|hFM;AaXTfeNTv)mFYdY5diAcdeinKG>?^Bl}1rj9o9`nY>6u
z|13o}745`J`}8jLV$tk2<c_FP!LgqKbGG316N$+l|6;QL@`4f0a#ynv1%0qZB^u_|
zf>iEaxK0y9Xk)x>a|kYrKtJ;~T~$Ttpp~|Z;(BUw2XB&?zUc>9z794jI9Mqj;>Ynw
z30p)G008p{4cYKY;<p(3ZPzm@avu0Bu@@?K5W!G1!%SQ3ijx}_GfUGA8pAKDtr+fs
zgy1P&+Qwxe!Eok(06##$zv=kC2bF@qie>vdp_V*1!~nbl&N!VxbxoHA@pWW9-fQc!
zgLrQ=vue~svrq;=q657CWD3gFx~Ysq^!FD0adc4~dDebC+<C>gX5P#GZ}GbB*0YdH
z6RUD!fIP*?C@%fup~>Tt)J$yt(<vK#QM|>b73Jf#--Y!W;<vE#{)?J>*A-^h;jiZD
zK0J%1s`BUhT^hrm*CbhCX(VaxO!RbC=pMXaM_rUY>CP8&kj67QW_Dj2hiPY*(@KeV
zl2h2ah_3&rr;et)01-O{i)H%484*qd-w6{urv?@>8h;4URH2(>f>;&qf04|MHyq|%
zkVqvqbqniGHs@dB6WY`=*rk3|7UQ~C0{2+X(rkg$qs=`|M7bdV!*?-Z0IUD%Z(kBT
z*dzAR;51SMpIbTXs-E!5a_PhzQ|XS6A5CH-KA+dY5B;yXdf`gUKi^EW80m;!%3B*h
zpl5&~N!mCu^2Js_NM&V@19h-~n}<x_-Qb)Fx$s!iro$D0!Rfe5>pe^hpCX2Rg`s4V
z)%7$-TR(=IQnEU?cS67%%6Z%vdq3f`^(mq4HgLe9&@FPY4Krh<umXiJf3(z=*Awb3
zCy@_#%^km%{5@~+{Zz$hC^pp>>Y^i)Ddv`v2=l%BGQ=j0X#lk5GvkqIU`5MlTIy$;
zI7<&Ew~DH*b04Mk=6aIUvT}1hSk-Uy@n!|moWs}BO_>4?sgmb{zaOYD%Ym8;JWtx9
zbwoQ%w>c<RkUn5MG6O3(apqxtk2*Q;4;q@~!pF5)y}$+zFaKmo;2V7PFG?z9l6@j&
z2-@WmFGXC8rsjc$2Sz>$wdvztRl$Sf1{>AVR7Mp{uNqU81K+M{U$C9D?sg{#6cw`o
zo9JiqqKqhK1ZO%x*eg(++poiI&sK8Ol9ed3p&ejUr-75&(+E)qsu}WdWa=vHT=sM4
zb>^8iCW_{~&Xzb)ktRn<5Y#P*z42M$g1%nblx@}cbDO~9T<5k(MJj6s$YW6wDz8-W
zI?vFc62lc3eRJfGSD+;N^}N^w7|a?fH2u{180fYy>rcMa32mxPpTKN5I~k66i+PhY
zQY0?>N<CQhS&x^BHT`Fwx1tU0XsyQr#p~7e6@+QajA2g)V5)#wKZ%ZiFCjlekC|gk
zz(-P<)E2&Jfe93~LWRO(8yJnIB>FCkCc0UkryFSLZ}W8s2z-pX(J*2Ul@v{xy{sP_
zne60KW?f*Nba7gXxw(wCsj{KEepKS0^WFM#Xh;1Om$`J+e<G1EUZnCmG>j3a4Uft>
z#Ha;eSa~vIb$QkLCBtRK#+e#l@0jo62Gc*<c-Ee4)>9*E(OQd^7Bw40mp}&h6&po#
zf46xNxEQl3Tr6+WVQ=Bn)+UBc<4?$p+G80+REh?MYrqS|W7opc1SLHcn{xe_*exyB
zmU9Y+?+~U%hnrlhRRY^RX#(1QpP~KN7Wko15afF7W$EXdd;po&TO5WPZAW)NJ<_mV
z#)Iaf_*5=mdr1QR-_O0H-4o-;rmhD$LoE@3PcjZnZf+t)l=!_($X`Pnf_nTs0q82J
zu@n5BC#$d@P(E$hwmt5oDMSJaVmuVobD^HUCow;g-TNI@wNV(auM0e95)47Lx{ejr
zF90fr0O`FS0Y{jE`{pyyg~|(c1vLVlgk^t|+9Gqb)LmsseaQRXKk8$yL#hZ|Y^){=
z%N#^8Z;lw^Dke2S9$^kEB~<zCfwRP%0J(1^{1wTXWP|U2NP~1_n>w=_g#YGQ7{=Nb
zi88Nb+#dlj7u!;z1O)xfjNme7ZW5#8x2-zvG9TX{9N1K^bbvzgm5c42M{iY$(qpB5
z++}}%cR=k5L-Cq896T(!N|VhNf0(2|0rvi&#!uzbqdFU-XamWR@M@7^<p3m>&T0zQ
z>B81VKZ%WM-BI__Enq|@`7L0iC<LR3&8a8ET<`u<^ZIh4EDcPe4>DXJ3!Tzf`v#72
z#~qrR;rF!&<%E7C;c-z1DL_)hw(IRxe&x0*xazdMMZ7$lQN+YP+R(*3`CcgNOaF%i
z5JdWTvU0EUm)QA-vU{du9~giL11RL=_3k;&pTX^&oqpwLn9NA+Ibnfa+L?y~9}ALV
z;`>T3%IU;h=w-t5${hvNuaF{Zbx}n2jbE$<!NMxC&^Xs((!WD>t~1{sXoXlUJ5+d3
zY-|*ehH>=FM80118^$k-_?OlM{4VHd4h>rW#84YTJ}kVlys^^xRTL3Xlytmz33JM#
zv!131*6miKT$**hu}XoYcDA7BKyr%#K20a&nMS{n+xC+sd2QK3GowOEeru<5fYQ`g
z9J`B)JtH6ZQyl%UVvXo26DXk_f_1Hv;ILB!G%wzkG4n+~l*iFb04P%Q_DioEZAs4d
zxsSGS%zE1ZF%{r?dOX#1FbtPNp$Du;y2a=cNGHc=O54Ovd9^6WYtX!{7W?=)8{Di`
zwcqQEUL>{RdQpej#JOQ#b|(KOZS~S;n>?HQcn|Rts<dVoV75Q*IZ_&R=coV@fU2S7
z5Plm)(2iQv_Unm1=A{=*+j>B4DdU&i-!g^A!9%#_|L>Kqs?flUgpVrTCPOJA>st{a
zgSb;zeiuqQpVeew5AK!#_dLFyv{V_sWu=?3@Wb8CYgQ5iLt04#hRluFj?BTVzgUY}
z{p6l+&hu~S={<^KK{w7+lk`XBD@;i{TDeiJC=Wn6shpo0URcUKjp7>4?1;)~WQ7Fd
z9csTKDy1-of^%h10Fsp4p%)6x0n`Ie;6a%|eEA3VSq=`Izz@=06++$SSpUqVrdzGr
zENZe8%sA9_&$s(QHvX@<UeMcVgISkjwwOLa8lfBu<}kn1>9WP|5W{Af0M7&$5QJ+*
zCz(rcV?)#5`fP;Zllf~L>d?`%n}R0gKzPFR@7|&NR6eHV`BOWW?b`52P-b}py39KI
zm~H)X+rJVa2)?#4<+7DXb}NoLAp*xCp>&Y$(3Kqg>KD@9F*M|e2ARB>GWDzx59<{Z
zT_xpG`CNSuoz;U5^Y@mL2f8PG94=)YILJ4!uqf4}-}s_}(TGpjxGOr@AURyQ!x15H
z6Wk0>I8x0X(3?yWs_rzq2CWMAx{HU!njUvpNYL&(<ww+OG6l=D`367vBrUb5`-YnZ
zs_Z|zCBKHwstkUHG&!3PrG9UU5Hy`O&7}g_rIsJd+BjCOlWJe2qw~`HrxK}0Ib=|M
zo{^PsV}(l}FpDz<`#1qm0pb8?qn&K&yoX>96$x<wH+BtZtY;p)t&zaPSqi1{sY!*Y
zjAMaOK1d7)MH_N#GUa))KIVhjEJX*6*_*7`ih9bZq`faL>5x8PdSs9F0--s<*OUf$
zr|G7~M7Bxd_)`x2oH1ov%0bVSnxO0#g8fqQ!kJ>2kjK!>3{LODWrN?Lf*hmtJNgr$
zU)%rFzgP4M(v-=(=)F4p9Snk0|3*B#nyp(z+)X;qj_%AD=wZ8OMVQH0qV7dwd}`<f
z9W?$*)@+4X4B)pMA-_=FQ!-+$=>KD}lv0X#mF=|mjRRyM+BszQ<0B&)n?Jn7H8SLw
zC%`IUAzq-eS&f@~xH*Y|^#wz;6jNAWpr$vag%RH};Qe>7y;4XkjOZD5?*MU!HJ02+
zbvR@t7Vhc+k69?#-b4AmgQ}$vXKc<x;!_>VOQ`2bvThUUbE5c6xV#k8;rLC@yMi_-
zYC#S3*LARLY^2RaJxab+Wh`X<p(Up%U!^J2FBXhkumW)~V`PI!#7TY8J&GK#u>Mn~
z-ua>%m)9@m75Z;?3z`T#`Rcb~t>Rk*O$|iAy4;ya{T_fS2vTm&0#vHNc#rGtSw1;Q
zacrx!+%A5W<Dq;gg2c{&P_{;@NGy<f#31l#R+69D3z>Apo4|69UU3E)C$ee|&xz|_
z!rC6+pwE{`5&xii0Yc6Q%)vLcwAi$4w?1TDG0P&v=UkpKd~+qX&2>z#E&1&GZG<EI
zCrz6cGvu!mn#hR`yL!@(;VJu?zeqeZs?y!;lTe;$=$!n`OJ*QAyzW_paJbhae8Okq
zWDaH2es!V2e0Bo{x|fnm9z&Kfs_MlvoRlxsO}8LkZtC$(oez&jMzp)1A0?OykL_@o
z+c0_rUPCX`vmlqZeiBs4M8qTv74D_1QovvPqpp|^kRH^fEk^U1+j`Nwv@DlgAorCG
zK&Y*sBl^@9JcoS~<kACsmd_4`5>hvyqyuHrL%FI8p|u;=NC!<^>EiSnZ`7dS9n}nF
zk``XRhY#-{lCO{-T*B+WkV*>pb;HiOhhP2hYap#nD)<EZg*%`bQS2Pc2BH({z_H5(
zs0`^}5eiSJvTYhSsc?EY_?)Fx9@ecTnVUF?Z;f^QJ~t8rt$=`x-%~x=^Z9?PwvpXM
zo(0NS3eb1?M$X3kMbvmQAO85s*_cp^Ir^8z9v)_)1GXGK7M;$hbdIah&*tq*$a&b&
z<v`_8;O7>M{qnx?*9&&f^A!~)A15uUrlcDwdD?g1SQ25msD0q`=kuTDas^3|=5F8C
zQqAOz7e5ZTms44ve5r*Z<2#K5?LjqL<tNjcX;}hKhVBnhaXp!fw!D3gNPoNJQ}va>
z{ezM`VqL#EmAa04GX|27X&N82v3rdpC1UmP|CvyPljA9$FKbQg?xdo0*j=tI9euga
zhrQ_D0NwjcvDfr-pV(wSf|M?WF~FZ7YAIGvc%@Scl1PtY8(8fG)w6J$9)FVw4o)Oe
zz)1iuz6ueqJ^#93R^e<yn#mu~v9ukzWxS>COe*z^ghYC|-OM^V<c#`y8%<4i;+XQg
z7dAlt4H5f~MBfQw8idcN9B_yR5+ERX<U_vOzTitWh=&Uv(^p_4PMs8n=lM5{1?U^Y
zHh~$*zvy{RY*up<!~dEqfv6Nk-cMrJke&UApBm9(fvz<6V;_M|Cl4eSq!V%KcH;RX
zSAN1p?0$!GaqcrL*`Ih9^|^n4_Z0@GxPGTG8jE9wHn>i&(&7Z--FZ%zOM8T+(N#Xs
zNf2p;tFP|7E3?z+GL^U&2gEPfpIQb)p6ed3M|4u^#R*i-gTa=kk~-ht74JN{H$7CC
z7696wu6V)`4T&Va|KxU<CXJ@Zg_j-d(?h7`O`P1A5W3v{Ou7xV$lO6ApGy<0=?MgG
z{$7Xu5Hd?|!N3~ZmrF=+faQou(e~4Okx1Fa30UkN_(7NDcL-=jAe}{Q|6XBB=>vPS
zQB(#kffBD@8#A3i-`k;&nP#>Ah!oE(o`;i&I;m~jtHmg}2_40YnR|T#gzrAG1G!nU
zB$UEf4u&uhys{`*?WfFNoG$_=M99zx3Jb%i(PY^gwXwJ@Q%o1!@`fa0<zc4@$L;YT
ziuamVg|l)L2e^8+ThIJUTV7&HQ8UW!rgBM&Pe~{DW*Q_XtwQ&khWPV>QkzyqLcxLX
zSJJk|w!Kj+DCPK@rlesT(L&c3tT9{(&!iK9$EbZg=+VL)^SwGe8o#e^P!Qi-^B$6e
zf#RsC`tCs(+tGhdR!<=18Pt@>!6_EI{O4`d4atT37oikEHU>oi`pzM9lW+wYxC}oV
z%ohVQ_`%6t0x!$T`#=uFOuF+n{SY#sc5^vqOf!@?*AKd07WpzPrAsp0`lL=ZNQ=;Z
z>LuGmQT_p~l$Tc}XWj&cq*vqU|6nx8ihfoQefBrj4r}ATsXv#cH!~109KnR^3b;?H
zfGB_g>O<;oD5)OS>9i@7Yfu4mQ=pHi;u27Z^?=M|l`slJ9*M9GI<r>Yke=>zB6vgs
zeza=E8^LRzsg6LFFi?7$4i;YC?<&qF9Tc>YefBI6?=oTZ;IiZmzrR-rK95iz4j~+Y
zuDZYP9`M}~tZ8tdQH4S`Y(HYU_x29*ZO>BXT{~k*r<A;yV0x6QJw@1d3B+m=dl^E=
z6<Nfb=`9Uc#<a<#6eJ9B-;BLY7C=(TXl>RDn8B|9!0y9FOY90jJ1`ia;$#{XX#;4x
z;bcP?ydDtjNy8=%HW5!)qS@(UQyK!q-AEWWy!Jsh8o0nOE@<hE)BVvaX?4-Q)N%A^
zxy9P_XhMB$HG1d-9v*ytEJ^`yqPOUk37wm^U$<F3_Og*Rg~FM%V5Yx*JtTs+Q;tK~
zje{&sqf$dtWzl?%%&R^jxtk<B8{)1!dM5&70qWbAs@HsQ?dx|_zY*EOTcIInd1(2o
zKiWjDE1-x-LdI3X_z@==_I%eST~skC%?M@NInP?9!;<hX<$`)sKh8V~|K___Q>rDW
ze~MX=kNLi?ATC8-C5d55mLIFt*06qoZ0$!n^r0kp<Mnqde0GSES-$v65zmH&FoMQr
zs4tF0kpy{vCS5@#1cCVkI?V0N?{ZHGnTA?MOm0>f4WQ$gsnNyTX?9%Mpk(7l>~-cc
z1a!=COONm|rR1ynl#FXFy2dVaz*D_!O}>`X#e5jJAr^1I^b}$uKgTl^Ma+#I!jXs5
zO8Cz;-bJRP%FBYQhfz}P+O4|PUL}3MtPTU$hM{--koGB@RBW5vXnXlZYbx;rg=?gO
zZ3x3J7AG;SHW3J(3NG$`UbS`%vV%^WrROH8%#|*rl0#()70?pjkc9FZx)MG_zkjnW
zxr0dpis|{B0VNWJ*l2=v-fI^6@9HX`2_sq+<Kz2dEk{P-gwxQzK_LG%MSTTNizoOI
z$zwTva7Ny`B_mxEHw?iWr0a-t0&oD_Mvo-{z43|;TnXnLFF14F!0H!)RW-^4892^~
z16X<^tE_#wv%2)qVC0RDF6SX)k7TmR8|zt8T_{W=^-#RCSRxtVP``lDe)fQC>?=6&
zmKR*@3b>vDQi0^CZ_LSrUt^sP5z#@|EqqL4^@V2C94N>(&%=+#fW*Fv$LhV*9`{)i
z8I$fm$hGYGsdpV;Lmxs`!+xQH|ESjPV>ng|gEphqQz<j$Ud$uAl%m5>*g3Y15{Ri}
z_S2slI8+t;7J8hg-Wu{sOFH%vM{~ToyMDCz@^yQ<n|%>LU);bhJ{5#I(s;M0i}$8v
zW=^^G>c>8wM;e!DW$B%pO$wEng*>7+2}&(Nz-TM!ZUd6GJ|(GnFOk#~?{bSxg)U5l
zZxwVo@Jpy+V1qS}EZSu#r@-@_C%~0z7PP`m9~IeIkuj(Ts^pVMalsdggx};JdDKZt
zRGpBmgfh82eCeQsd_Hl=VAg^-%&~GOFGJ^qLn9&q;=hkeM`$Ojg-ft3^4Ev!01ROy
zQszh-naFXiP5-G2b;ReGw3hulq25?zH5RsJOi{||*&8<>_00SG3{O3YtAOBYGVQNc
z4rr&g4H5vPrh?c!<8DInuem4Z-(WptPo$Kq&Zm`~m32U#LfK5M*=!nrK!CtyI~L}}
z?LGpKEXu2~2BHb<8%m0YGs=114#@nmS1RB#QiRfD=e9!b(ZWdJ#WU%+_$M~|fl7n(
zF-w|!XakDskInA`LJLYHyawOqsp?aEPe1?%1NR^lv1V^WKO5X%=Y`{aRMckpG6W<W
zscSV)*oj%$j0o~^AeO%;&>54N^uSo?<ttryv5Z3BHpRb1cUo|HNPbZpZ$`ChsL18<
z{@Sjm5*{*ow>iF0Nl>wWEH8FSWUl%qk#{nJV7z&Dng*ewDP~DbuA`9Ukg);6BU9?y
z)fyI(PAPuggAE^NP{Dn5AgWNt?Co%NxQexY9Bu-#DN!L^1d0mDv$xaO;`Wj3)Pg=@
zYyg{!d1JgPprLiBS6iU~pg{j&V_+XnwuZ#!+2?dykk1i<H0WSx8ktzjI=YDz=73&|
zD$2t*@STmQqpe8=yyrM;M`RSk`6Ka#=Ig9{4q^7FlL>>bq0~D2ZwAF}t7F)sq!lg@
z-b^dt%X#qD=ZUMFK0@B#$=@Lx8`2z}Z}D!Z0mx5`LnAJelH)%$DD8q%ohT{PfT=;v
zXwDp^k^6c%DwUY7h$kJJv#AdZKLJ(1_~~kT3{Y#r<q|zttK}w=3I@rU^VY~rfM@zG
z6S3IzWcHPBAw+8WU;+-1mNm*Z3MI_ei&=hgrRu}wa!4F@+!4|flk6mgkzE73Z95~C
zJ`W|?Ea}LwGlrI)kftBAII&-q$-WOu)4J1jtRGLwhzK<TNIVFU09B*v89oA%fFDo^
zHFPp)6B=*K2u%RL*ZfVPss_qJj!;tewWvrv1q|j|@(kRA1e&^fqyt22AX|5bPl@1$
zXgA>fUIw|APMLJ6m!651?*-whNB`~bYR~xlxSdwkpwjDcq!qSh_#&$LU$aC>eC5%+
zGhnGE`<fgtJj4O@`!F%^#1a##V|}-P&d%7DpHJidk2*<Mk}YgxxaKE6nFYMO%gd?b
z&tCF<{J%P<x-^egZzNQrCq#`8b}O@Z+&N3&>KbY{ZFVGQQ#41t?7#FbxwnTdxEnWi
zc<2M;;&&GE$e*_SCipkjkze*UORwYFQD63J=AiXG$w#)xDoKuw9_dTrccml3%%CK4
zV@!<k8<Yy7)`KW2IwHd$tg_4HP42ap0;+f)gy0zbV%JE%p$>LBDcRGZ^!0OY5JCF)
z-5o|aV|Sr)5o)S;H;QrEMy9V<ytr%;NmPYM28caHh4W5I7)YgVu`*a|3Hyv!O~Vz^
ze6B2AWjuh`;gM2{H||DLyP8~b^}HF;s`vRWz3JIcGO_Bgt4*tMhZO1)P>vYfJMthL
zbX<7haJUH7emoyi`3M|t1cZo@zL|Pj!Io}yXTIQL<MGZ#1@Yr162<V)_7hb}D@4Dv
z=Ck@;Qi6af@I>@?mu5uz+E6a+r;$FD)vkHah=bR1Yhh}@>XkDat|FQL>+43361ib~
z3P1H}abW~GLmlB0Wb8C5-<trpC`X$b1XjY>GqB3P^H3#hNJ-Nox97K^lHt%FE!mUV
z?^}ILcUqo*PY8~~6aGz9oQ;LBH{`-cFomXaLZQ`Cjw^!z)cU)N`%7H0ughVT;7t@V
z@L|=JwC%Y3L@C|CgOvRa?izAxBx)DP)eAqGz;(Ds{)b1_T~V^PvhEVddi5kDB&Cx)
z0@p&}AIIE~!`*u9Xz)0NsE;43^ph4!(Ge9vtorC87l~S{gJN;>g+JxHLTMv&L4jd#
zcsy#I@?z;eW<(z#Clo}+5gkX+EbLn1W60T1=HfRN0K!og8JvwCowuD0fMW3e_!JpE
z_S3;=c|!|R+Cd~PfJpG~INE5ck|X?fOVSb$$x12ZQuStZX^bJz7G!4U_lCkK{x*%_
zXq%RKZk{UtZkrHyBQ!*7-taSYQqnT$ut{Qn=cjQKHCE^5iJVwRKlK(LB)TBuo4A<&
zDbufJ&9g;L<nN^6%4(^WnITSwLL;i2S!^!5zEN9J#S5`k!;To)iXSP;T?WfO7!eB!
z45f>n!0%7CH53=5l&g1LZ``(;8gCpj25eZK(gCS_?=#r7uoyKV7vU`@!T_h^=T)(w
zIR-@S@du-f5z?f4^G=~kREqN&;~+rdkZz9p0YDbGEnZhn#vYZ6|NU3!RJYI-7sDR*
z6ll6Lfof?e(9+kVklN*zB8e<ySCjR!eeWlU`}`Q-aez>ozn}?*c;KY7i+A38i&NDJ
zXrmrR&ZEqpBEcO&_Xitjm-Ak0-HtgeP>)d{5+I}&k^XO0&Cple@TzY1e!y7iuj#!h
zmv$f@SkF#7!b!<{U_uYVw_mvG5KP7C>Dj>*FIP)~E5N1w^>KSSl)!@p+#tjj{Y0^2
zK~TE~-vODe_JR+YZ%$&DryaM0!BBOI@#cv018+zO7GUS39);VX*09}rN!X-t7dmS_
zh^ZStc*)Dn%}xUx?9onoS@dv8P3^h?j;8I^ajWB7X{z5d@3*voNyP$eMir^=zEtZF
zFSIhHk2PQw4Qf8EVe$~(q_2~2BB5WipYY8dfR?C7A@sjG00Rd1+4-mfu&QL|njY2*
zC-;))bSOSBI+pbRneJsUM~K91=&lwi30+HRl?N4Wv@Q-aNT0{8ltD3-jrSOkOK!k4
zrk^-Usy0jLLLJ<QaXp6vz5i+ACMozz0d6iNUUg@|$$54|_~h<shWtF9C2Prv2a}*1
zLQVHc8dNZnpO+9SyB6^|@jLuy9#-tB4yUB>5l$h?Q~d_I(6aCbBqYI<I$C@u!!=Q7
z>tt4#W<HBD!n?hl&=Wskek+qwQ%{u0o4%+VQnF8LqSnlvV`flx?Yk=+aV1KN&Qum(
zF=R#1rb+plZ`;k2y6%y4hj~^W8;Yqp8vGr-ExXXx3JMx@JzDKn1I&ds$&vVEhR|ET
zl4Yh@Jn3nxac2$|p>(FUu!fx#PUk?e@Wf_5J2%c+rF@%&=BKMuxC9bjKs%>Ktvj<d
zQs@+_e|O5b)6xxz5Zz5P?MpNuUNMNKv;`<HNk-0!hevVFShxE5+)M@5NAXr;oHPYc
zXLjvPqYoA-G1egm4*pt?0?eOxdlr<26Y?x{8tGT1pK~fQ8iB+1Pe24*92lqaW*7E~
z*TjJz^i<4I5i1xh7Mg)t*BdDfoZoKcJA%jWLRV#>NuvdbOB21^oe%xtcD{dLf+*u7
zuqkBn4o&p9A2XrOD#9fIRtqQZ%IqYYZ*}JtDcc6Fp$eEGtE&fJ&mJ4r{wb~}<H8{K
zNJZmP6%#I-jsKdGr{kiz`b0HSJbXHxRUC!uPG`;WGzB{9*_{~e7dd_n{&Z2T2U!n3
z&PwKDFKngpUCy}UCD3F2*6qS53~dSpyvTpZhZCu6L9ovygrxYRq+{){uKF`2G6DxW
zai<q1&{+$0`OwxU?Xb!Sr<JE*>Z(OZQ9J*#!25}cV2nU{MB&vLkf>AO_e;NDidZf;
z)X4S#??(qBTb#|95sC6Rk5g3LNy}Ce82(pQ`(mq8%u#;af0_L?A+cLU^qbv^Re;4=
zVo}1=THx5G61;L2^i0CKrfd;0w{nm}$}{k>rDIwSq<LBM7p`*$L{l*v9kbx>pco0q
zPltZ{yi|y4+2-X9PyJ2+pCZNOZ$3}_4Y!(T-sS_ww@JTD{gH*CX1+cf2q8yTO!8*>
z<CPZ;K4(-~99dm9z4lM$f;+t-g#C>m{rsbQp~2n9WRI%rC{bLU5AgiOQPexq!+lv^
z4}wOlxF_~zSAFz*3b+BQWL0er<_9<Qo0!#QjaBNG$6=i^eU4{8pIg&iY7P=6b!vK}
z1J?JFDORvxo!Ns|PxDq(Mvg0sfZavA4PPBxcAM9LZrZ80=#L{RbQ<lcAk{A`t5I2G
z)qT~}@dDSev1Fr>C-kSK9+yA!IV_IqZz!)szG8PJp5O#BQja;&<f`Puet-aVVcCH@
zVIIg6(0qzKn1*^z0zTHlbGEny&N|OyW8j*~MglACC9suLqu#EUrXbMDC!cRz<M%tm
zXMF<!Dqb=?RFCvHvA8;|J`X?u#<;;yX3`6GVSqh_PJ|)2VLCu-V%JhLprKY(Xn-K}
zqrj>~wtSGDDubwgT4Fw;-iX$0nJOGx-fP<6*Q1t#_uy?(6MO3Y7EthZvt%6l<a)2x
zz7MyPlf~Hww+au~tUb<Z*R#^@bU@?`2Xwx^uGSrvN1N9(K?h?|TE+^O^va8*ovwPI
zNwFuO@N+S~SoVK+#~m&#69VMMWKfm)jno;b@cSF>K+>gBAj3)hB{)mW;llI}<@M!}
zc>%5g|B%}fwb+U(52K-v=J`w<_eV*bIN!aO3v=p}x43mr#D59B8=jv(kU7fhdV}Sv
zyFCvZ&?75=UJ*LzY5j;$U#coyq?#FTod0)!b4D>#<@vE3L9P5?mN?F}5s#a-aK%~;
z)>nb2T-v)YFw=@NU0g2wP}Ap5vUze<jP5cPh}Oyml;%I*cW5ZW6Q21+0n$mkql~;|
z{EOO_j@kT5Ls?`~<gKTq0Nd0wy*6Z$HA5s&Ws=26DVyuUeUpHcVh&9#0q*&C3=^X_
zFQEcMb97VIy1y~Cs}E4tpV(l-)^>Vm`ar(;BZeC#v#ipf(B0pNDEKpiYtW|=sY$)a
zioOYj(*Q68-vV7+53q|UZAJ;u3>!z#=K798pgjLV@#+ML<+-`jSq#ZpW&t=q4!V`o
zW)9$xk&R97t*~K7PHTfI(!|@FIKk}A5z20M!2ChguW|{9qt+@>2ek>@{ilbkzKP&D
zMl1Z1rym_x)H+)##j(?APM0_gC@f{LyfN4?i$z2drKs@rF&UEu396mbwNT6!1d>??
zVQikp?g!Rtvu|^wTz=jpBClpN>AoSagF0@1^R$Nsvyxj-YzDa3<}L0|lNxvnoDTOU
zX99qHVdKSwwfPg!F3uHs|49?>IVhde725(e1xU%=8NUt3It4FY^OmH3V_NVmg=0-T
zUn@Eh4Z>^RUin4@XXNqeo&FWkPXOi})}TU#AvqJlj9iHvaY=dSi$oN>Sjhb_GbbWe
z?py#iF0yk_{cov53l4YY!T(2KO(PY40-kO(JMSL#x`zbs=<5n7wQX}LpB2Fnnl$yR
z`M!o0ENSC_ojuvtCTG4fVMi?!6dB(J@u&<S#W|cQ*KVtE7Jj3qO*U5{t}+Wa<Lt$6
zmwU2E&SbgUBinf?TGSlN5HC5^vHk!+2pU9|>I13vwt753iVdJr8(@p?gTkpUou<`n
zgShl-<LJkv!qaUxX+BrGYxxxv3#!h@7=i^UwU)G*V!KXKDVV>_%L$C$dKU9(R{muk
zfP+|LJ&$t-npoaUT`MWmA@p<PM~BrD{A4HA^dn`*b$Cp^Q%}a_THjjYj8FMGuEN10
z!tOWmn4os_Rf~XiNcX!{qaw!DWW%Yi*+YvT=vs}cO1m4=TbW*>R^RX*($A7Zw9KA?
zK&j<6ZWM|QF#{(l_VUsb8Az_iA(x$L{G}-x=+cRf(L~!>-d%J?g^|SU$cIijQu`5*
z&t>DU=>`S#fO8CYmv_@o&$(dR8x1rXB@;k@Bp|c|W!v4KX83KjC$tey+em6%zhU~D
zzJf-PCN*bz@#sl6zvN$7XWlId;spD0v|+ZSJ}y3Y=Qj71K6B6R=zU(c&6(rzeK`Ke
zh`R*Qd>*@q;ZbGnm2zB#S%*z4HZkY0ZL#r;1Ahpfpjjw#GktenHvUZ89+a*34jxKq
z^)A!%m&4t-CaQ%h<;pFoCdHyJpTdOW`p--G{T?gbXgOfl`zc-E+RZA?1Ctu2M1b_#
z<xj^kCug|sKN<us_p2jyEVnjX!@8`$Y9W4Cp(((*{&#2B{ZtS0Z7QWQO;-JvU_;K_
z#Cnh4?FLjij6fiCE|Wx1b8^ynI>phVv5E(-sio)K_=`ZAdy8Zf&Q+v*Kw9PDa03$3
z#dY)Vjzovw>!l%1dFPC_#@dY(Qsc&qwegeI_JgZ~<{-EXr^ee5ZfE5QVb!jwyTu$z
z@`t%p5CZ}EMsP2A7~9M{9{ZbzUhJ{ckDNk~hQR!;4-6dAP}&Cnt!}OJMxQdk(%J;)
z&tsf;QxjC>0`vkWJ1ErEKN&;y(x8F<+|sW116)pn%BoFjkHo;iiNqe=l2{I-UR5Fh
zG6|Gn+Xx|CFaI{dy32n_8pB~2^VO>rj>fG+W)OLyzjPvAd}Z#m_oo`wHb)RG3^?{A
z$`A}H4hS(_GowuuUfedf!&8r<6h^C%Xr=Lz7$V>Awk7*(QPz8a#Npu+q||z7ardro
z<_kOIAf9%>%wDbA6$=##t;Yy8762)CxB?=Svq+B6aLoYU4KT-$BH$fWPxPVqwaKD9
zzq?@~wOxJr>)gDej5sfxO=!r9T5SL^XG7Ifd2yzPWQcx!cQ2XlLgNMlB@Gjlt#~~w
zUp!ai!7cdM!W;0aiZHB-X_Q(XLolnWK(#{lxh6D)({4ittcbP>!nvicF6xK{1+ir<
zc3($DI;d}dqh=Wzki^s`6h)$`RWPjICdcL7sBk_H2ZYID{!GDWw;OpA-k~`FJ_*v*
zbrE%oM0(b5j?EWfBgT?|P9qW^YrjS8wHqJz3^0y4v2~K@G-&)WqEt{PN49IaLYWS0
z@HwROVM}VNi~VAevmL};F{w8Z#1WL+4BWJ2K8)jO&D293Vq_Ys*a28MrCr>Vq2v6N
zr(?@12hDgJAb~%}5?5TI%2M~UpMIgVQ0FweeZ~QHt;-y~8$hIw#_uo_6tGnc5phI-
z;EAFb=u|xuuC4)h<#=_&LM^2dee37q=xbWs(0Czp(-LCtG@wa#K6;#qZM;fgKMUX_
zIIYR(>ZKl&b_lYOI2U1u6+xLFr&QXwb&W*Z^ua~7>2U`8P}c0<MYQUFShCB{9&6t5
zRA&Y5xVziJOw-`UTT5XYbfruGi;^S$HeK_sJU@q~ICmK}Mol~jkz^PEH(g>}s_$8Q
zEYWY`JC+wsv)H5bLNlgQDKqn8E2y<~p!4io(^rkdKMZ}j9gg~bh&jTi&w#No5a6mx
zgpzj3Qdyz#vto<tUf+OE$CEJCboV-BiQPeB8Ofw7KL|~)M2<si41D}0T>21)9LLNC
zVa=84J9Ko7g#6soa@nF%q$G+TSSMuI33pVWMQPI~72mOm#<?bf0G9*^7A1~&S~mql
z<s${VgDs%Xk?Mn6T1zUv=r8lg@oM))mlF5DW2^|oqKZqEbZHKLJuOcSfk&~P*S1vk
zt!ApHXF}VJzuZG2B3RbH^*Ppe5lQd4MVXj{j8?)$fh0<=;~C}Yle~9?Uuw#o><alT
zUy057>TK?WG9o^m2h4Wu(cMLL5&}n=#R@I$+`Xix^69Mce1K)g8aW^_7~E~`eweUH
zSV_OG9a*mEGT%sS<dAn~QUg4F2fd-yiU-@4h+|oPVXu}4vZX`4U4A8Sd;C%M{ei;U
zxz5NJ0teF_PK%m$ZO+|r=Du@G>k)6Ga_Ff&;0qu$i}&aTr%~EvLB}{WzJGf>)Mut%
z%R0f(6+4l^c65>~;l_ABq!qo+9TnH0w<I;xAo~)t)8FJ-JSfy}{*Cg33sn~<?Z>5+
z{lKOHOXvZp+{(gaMQ!x}XJ*7O4#OgP@xg8Pu<|2Ni6_7(cbwVefY(~#)<#nb0FsPD
z21~Yl({5;lGQO2%`M2$C#{L$|o+&$K)Wj34_7jZ94cKbk7*Z=TJlArxngYDo52Nqj
ziAUVW)g&ZeqCd;(zK|9RWy*pIU)YAqB%@m|UKjaY<vTkHGZ)7h^mM<T-OvJV2rP9e
z@-comu!wvHeuidJL-&@ju!v2;gZNh<bnm&Fel(TW$ucHv1Gz;A`4;a2_-fr%fOU34
zH$ZWlMBird(H~tRZ-OX+Sm->I0+K{j`US|z(M{{TJOX3NpWsd>XK8InXTXmZFy@}V
z0pt5NS<#Tob(J|P`ID;(AY76)`Sv!BzGq^bBk4S_lbhSD(DK^ZlFB(In)<pILG%S)
zN|9Bt%$7ElxQm`sKG2LxZtH}oar%q#LP;`X6lsT=lfDXEw%Nd=0j6d=q;4dH5^)E7
zqG`FsVhmGg(nNXU0ze5;_`MSFHwhS~bc*_#a-7D{L+N9n4?zt?7R-XC$OIic^`y|#
z;Xn|JGIB~JH3#2O4>MZ*;|l<d)qgVSqQ2tIBaSq53Kb27svuH*s8-je9*ug_9_8XP
z8E%KF%!am_-61K~kvx5|Vls8>sb;QRNv>g)igK7pjJOsy4qz+r@L_|irJBDXCGl9p
zn|(`Id}I5MrY@(1ol}Unh<FtuJZzm)mf1cbc-FxmR(|@c?wrT(2RDje!G%f~C5>P?
zg^otj^x*e-EJ+-Cf^2eRA_>Ik_|q1DWdH+7H0El(7Fxqmg<tHuwrj#0=;8vkJ*fJI
ziPG;Yk`Vm0rDQztLck)E7jr_0elGM0osNzI!5#L2@E54brrE*8$@BAgZjJl;QH$bb
z{_7MdF;V86{Ml)cj}v0?tv@fH*CU8H)t@uu5&Bu3_kkCR%ezT-Ec|n%m^4@9D@v$C
zgIm=f+m1}Qzrj@Zu=0Sn*ZP(wF7P0&2t<EDP<VqO&4bWLF~(Rp{<%9|<hpgLKZU4x
zZ^M_-BXRPzy2mDgF<QhkK&^hokwa`Ih<RGmY!GsBP2nLGJp=)to^qJqcvfILHMZ2e
z<3!-5Wplk%YJ3se!RenSPQODvlKaA;&qFH4Z$e-It*sBI?bZd=_x(;1n*d(ST%pSd
zNnq?68ejUMMq*lnGQ#lY)8T+FB?)cgBHBtP`lt`5*g)`IUh8pj1;}-{`C0%T|Nb2y
z{?K>sU&`q!+dE<M9^yEQxXMYF5jCZ(Rj2?qFUg?=+=nFFf?G>K`SbAL6J4Ux3TgDM
zpqg8ihNtJ=<zpKI7S!VwjCqxInInxck;I(u3H)yAtA12;AbH0@^F-vlnnXK^N!z26
zpG*}H<|iWERrGg(lJOK(_Vn<7B;?%}bcvvVfs#hO2ejFJ8m>EdgLO!2ad#X6?XD|?
zqB~buiO$3*ry#sx%KX7CD7a%iI{{D`i01Y);jEpaMCT|pX~sCO6l@&!zw~)`s4q(X
z^cx#pxl}_)hRC0%*=zd|o9gRBhuaW}gG4}a1~mkeGhF+FzRR%;{;T>U;Vv78G6@|7
zrK%hF&9G>JuSsm0W#j*U<H;h<g~cHX8E*RTq#;TPX(7NW8@az`k`;h$8A;v;>ZCfC
z)SFC^9TKgB8iDJ|a}Z??Pc5Q`%{snn?ekJLMU_Fs+ho+gEiB_^C;+q0*}B!(QGG--
zaSI+tfcmd=Sw`TX?QCI@J~aSw)OkLBwZ!YcE6KWLD4}jx=}{=S6V}FMbZvlG9v>K-
zJk&8ul<{u{ZNMs`fmO3vfTw1f@|Tq;_RAx?hazwiXfbWyEnD1<gar}uwYI4}T8d&C
zB?v_4cX<8|!AA@-y*wPS1F{<x8_)43EzI6wMP=qH_suBWAP^aC$M%%JoXe9fZI&>b
zM0~k(H0K=hGs+F43cmVa7F0@5g#w;Qe^Aa;KQ4As9Q)7HwBa;sy!w9Ntrp;yAr*%O
z;?gxexFeM_G-J%WQgm|N&`LLR&7nv%$Ff5ZUC72&9@5boZ>M-oSHT9y4?t=Ii04mY
zu|N7TG8dI(cIA215B!Fm`--65K^`(cflYXb(vqkHK^B7PsMTH*jHPQACJVi3HDm=7
zfZ_v9xAjoh<1O7$-tUjk+^cb->Sytbv(?SI59&%f&13!D-T7erMw4}h&33$q*QyvU
zqt5`xZY<XclrUPgm@&BaPUruAy!9hTJ|5JPs2Pal(${)9CMt@mBP_`o@AYA57iPf2
zC9M6Tlj0;^3iN0nh?OeB^58r9YYGjS%3o@-;#M8A?@?k7#Ts0#VK@vt7XBk{JToqQ
zmy2)x_|VDx&xshE!utR(N%g!_+P;~6=Z~_&slb0Okjst!^Mm$_c@&}fyywx1nn!H=
z8U&YwIzd1Qg(fIb+2V+#Qz<#BGh6mzVsa+b!TzgcV-Db@*8yf7UG>&iB2H4Ch3P6M
z0bk6UM9#UCI9q3Wxp5O{E5H$B2?WlT8y88-QF!zwX1yrJnoJ_*@|g;Fy~zNeZ=2qn
z_oMOHsDpOnu~#Y`#k5$h31q!!*F#Uyrt{F^ZO=P2Yj=_G*Xr4175@KGw$<S`Wi$9c
z9&{BV@jgLW_8BJmDy9M}oQqM+zlR1D?B@saDkbRN;ZD$;sXoCuNKIYy(TiOe`Ko2F
zhGWgUF+>(ksjQObUF^zxa}oFnh()<vExXcFeFZQ>D<wVimw-E-=)h{}da?1EcZA+c
zz3m`_X5pL;@<CO#7V%4Hmc0FUk|y5@zIH1yzKTGbIhMtx$(a}Zr?oMsjxNAIBd7Yg
z5DNK_@fAap?_9QNBYlSfET#H{{Y7m{wl1Mw8(_c~?8v;h_E2A$=)m#ED%s;ipWmK+
zYqpB9(f$upIIJXRt?QR?#G@26?ec0KC(_2W&f}1fOq5q7pMlEmeL}nqK{CXV;pG0|
zjY)fV97~=`f`S!(^X;Ou0P7F^*n0|?!g+RwN;<l8=z0z4ti|(A=6NquWMD?XOohN%
z{6U$3Bbc1BXc-Lj<YMzy1N3-o{jg)o2{rhAJB3BRBEU0E{~tIOiU||%0=s0Ivt1Mw
z&wZFe(I1L)zxUEo2(oXUnGY|d+5;c8!L!Anm7YT(`p8yoyBV9OBO`~@=hECz=whG?
z$_CL2a=>aSC2m&)C7IL*YS;VzKs(xbz13RE<OG1puXZ=22vTUxEm%7f0cnQVzuXKl
z<oSK5!SeRx>jkbW;(5e{(xEHh5LJhQ1ta5MUO{ao#Fg%i5-*)fi^#oUfUWDk8iqQv
z-%mWhe;fWs$F>Bo_)MSk;deMrUzo}DXv!P=?J!8KF@j=^NCw)7)Yx6(jEcMJs(HG^
zdWFX1NO+dC5CZ}Rg~-WRtzgom^?_5;MxlMRv!8U|{ob<{cG<fbH<qi)j9T5qqKqtD
zd$pYW3tjy(U3wD7-T{abgw)fzJyi6ns{@%etcIUz+fZ!p!*7ULE4v|T1f}HvsHKx7
z0_;wOiXK6hWo|)(pBUaWCI)_7A(O4dqkD;No3|=PFS%y<$QKK3y|B&A{BZCh1D$u4
znTRZhqCK5c8TC_o`;`cLhky>zl81VT!~KL8H=N@t`fp^<RfBPKMtc@5t26jFnS`X|
zBjN61?hNPbd+2-9>HzBJ7hz|L6o5?Pi<gsAG*sMiC%L`B=b?`D@X(h)<Uy1V>Jq;;
zk;m8ii;97GXb~0Gq*mQBriE$A+4=8cXD{)+wA0+tDD)r7bsB-!iqiu<&2+H&!sc!K
zqJC`oRrkhidHyZrli<6T7eW`?ZY|@5&xIf4ORStY-vPL<23_ZneOx?5%Bo?D8>XYU
zmk&G}AHx+Hee;P|0a_pYc`mH}sANu|PxP<nusLQ5p!;=iZ5BA3j(yd9kU(Xxe1lip
zU{eo#dT5T;dxCVTI_+PPdPky^3WB57@Ni+*amyQsH$^dPoSfq1#F0iO*k?<_7KLot
zm?$s>pjoNs0EHuQ<V9}ikyjS+2bj6%E{-=e!d5UgwYk7a11^XC{>220wdoEMP$bOn
zEQ#CRFINNH4@ti!6X<U?qn!&N*pnI@vt~WR+a7GD7fm3<{0q5&_?m{V^Dq2<r>kAR
zq~7Z_29?rpUC3uA3rLU}Qn7qcTfkjgSpd`2=iG-L6Pe3P5UFmlbu;cv;d#f3Chw7W
zSOarD7|n<&?7`zE{@X<gK_qb}+A**%prPPUzo0@F;>`JgXpAh}lA&qPB7<{ghWxmn
zq{95VD`x|p=h)<S`B#L3Gak;>#_cbCX&(NXv)|1-i2@+BqvAqEgBig=E2rD3I^x&z
ziHb<?t0v!_p22WE!1c@><IVcJda(^)*8{I|M`U1Aw*@?yK#y)HT|-<|1#Ol>QMv^m
z(}#WRFuOA)3h!;SH6g7T6`K|h*J;{E7aQB5{wCZ9!6SXbM<)HEm25>{aTR-6LPvhs
zgSP?4cHi|fogv;Uha)9h?UNq(UaI@OAzA7pC0RjYHnFaEh{G3!ot^q<%-;Lo$y)aW
zAkUO_x$ah`+upLx`WKC9%OG}gqNRuYfeoBSDU>W3xiQ-Xh3F<HuB*{|{cBWee&TLM
zlmLVZ`PTA2g1OKHE4TMtJ2t?)Dsz$w6n9ykUUPm5#r8^nCkT7M0DK7M6hW1c*!XIb
zm5|V*BYullkG7m-oaUxLbL5Pf`tn#_Pq9Nhe1t!nTt9Y%@*U}0bT^awS&wv55~{5j
z@pfv3|2sAt4uPHkQ5_}pYoQ#+0KA{?3>V<HJDBOlv?Xp5`^dnW242LXJOG!0(rAf?
z_iiOann@d*)X&RI@UmW)VhK-h0+`@vTJVy>p!08_Io1=x9)e!v@nRF8h=kg!JCx;t
z1eZ3+;z>stmdo=C=MCY;utyZY*3Tiw5(e?ENDfywVvwtbv~n$EJ%lETKu5=*z4rR}
z$;<>F)WKL0A>#bNO-gH)Cgyz-b3GMKA|CYcO3i34bCI{$^zv9s3Iu`uvzFiT_m+h$
z$+2g=kgSUeNy?r^S|K$aRN8xe|3rckvG|%?$4NYyc((_gOz+a^5>TPd&Zav0Lo*It
zuq%-%<R5+{Nd-0YITP~rDUwTx+x+8;zuXMo_F?1()0hSr>Dan~ea4di(HKDl)fwUP
z*B_hFx27>>;UCOi<e(ac=zD%&GsGCz4goZv#{lm`=)8=SVo8!-O91^8kVaeBV)!+_
z%54g1ZT>laJ>137tiN~<HPU&OmO+z@-+2hq#y~{9=PdUpF4e#24lpUrmumjwlV?;9
ztd+?T;IQW#*WquF9HG^V(uS>dIkoQLuIJLwpmWVysC)ulPp4$OzyN*l(C`H*P`gYo
z{}**)w+)=!aJ2me`26`Cqu<mPiaAqWI)Gc?C<H2mh`rF@NfTmEcl;-@X_U3*piuZe
zCUzbgS<BZJSqu3sBLdw4HS%gepNs-;LFm&yEV1RLu`7SJqZO}0F4)WV@Ws<2!l86`
zI=;9ZpR2=}No4BJ9>Kd9Y$NiOngq~jzk5uZ=HPw<lko-g!rfGk+V2I1IFp8@Ig;F%
zyXDZpwhrlM8+`&SI2{)aBGvD2{F)iHE5u$U4ZBmF)fZ5AUPtl~zB$HDzv+_4NG$G@
zp*Hzlpglis(l!=$t6#BxKf)uN<ZV)05oSEZcdFrvRnq~(1+1<$In9DqJ(tT~GgJH@
z$f$BSy@jDpno43C7I?u`tuffO%q|J<!Jpf!``2JWaE%p>@pe^YObn!G@&!-%Rayph
zquG{R&pTkPZSOIJV*j+X7Ij~iIyh;KTqOv=+h+7l3)5Gr>lUmDuSIJFz0pex99F;_
zV~_1v^F`NF6QTI^A32F003k%^*+XGQt6jeLtv^2wNMGDT@=n)N_}-?|wcz0suK95I
za7#5FOzBFiO2z=6Vqwv~&d$dTrqhNa41VE;#q91;agE^7O1&IhaUZ`Pqx(g7tHZJV
zXXA0Jxsjd%GAGSsl;+0P1%w=$ZP$ZXu}Mwu2Y@pLp8ULf=$fPA7&^e)+te7B)Eu)^
zIX553@|LS~JdbX$s{+SXuy)C&Tk{wb=RiCW2naEnS`QtR05dHOdmPawJyF9;k*IuJ
zbun8KQ?-6z%3bp2Z01aa*K4Ks!*nKT_>G9*09_XK&b&dZcRK(hUY<!PErU0r&G-5r
z3K`lKn-;mkmQLq?ymi*yOc=?T(=#^CF-(bt*&EHGlnnI99!Elr0ird6sX1TGaXp#p
zbrkYzuTsHs<8lDcPwKJUz2kCxtH*;bvEx7|6|AMMqH)7zaq*ExvfNn@K)ARsZW78-
z@z@C+$taoFV6>>I^&)+f_Hk{i&-M?)c_eNg`S-W$02Qi5e8?C#5^d;utT@>i^$@k=
zVfyNy?Fgf0okBd(j6ELj<ufn%ZdPNBG!{dBB6SrBi4ue4ejFqChUebij)$Q`YsMRs
zAa1%g{ehmK+Yiy}WaNA?)5%8;Y41V6!Z(H9D4;7V-Q8D>nU|+%!I(rTpj8QEqC@)o
zs#we)WVML}kNuF3yu1qIxCLj%|5=BN(eD7p<b0@zD^`z5G*)k+g*c**#BzUFw4qC4
zjo?Van6}16(rK(oj?*ug8>{Yxmg&u-6a(0@ff5TH@bA&=SmB`{Oj6h8saia3Aef-;
zeTnDZJ764tNWCg#5L^7cir@_5oMWHG+tbnZTm@YAL0a19=R>%`mu1y_0$xPP9W&FO
z?{BXfnq1yW+aG&I+_#4g%+@9oADtjwW}lMDNF#|Qw@A&lVaU+T8QHWF8lMxNwWctv
zsQoQPhROt|zWI5;UBuxZOmIQxojCO9VsmfkkL9no06jp$zc(BBEXGsfE77Hv2OH>p
z1o0!Z-jy~n4^CwEP-!<5fdu~n5p5bf)Zg-0kobE`8qD~7jKjbf(qa@-BdX<Rq&436
zP<NMxQ&7Lj2gO5+n#!@9_^}xz-T-Q-d7Bf8q_e`(*cJqLJj;2`;=3k7=(i!l1pNVp
z0}q~yF0GC~4Oe8!KNX4~0<~Z8g$Q1TqE@^#UesJJ7jG~XettI`;tPy7y&8DzKd#6c
zd%1}RuTn6!<lB=kdd_J<ULFU5iie?FJfI_+4o_q4m>@g$K6VaUXOtiXYkE@{*<uQT
ze|{1WOpG3Uojd&F-qfq)p5HbyjX8?IsfbZ#QCvg*DniJEAjSHg-`4Ab-WnaZp_0dk
zJRi|3iT}E<{=WXmz|t4uF$#>Ai(WQ=Pz>Iht6l_Hi{2xnvV1Dnw2=YJn9>7m)5GL7
z7OdC=fZH*b0e8z2Pd;}<{a4uYRMfJ&5N`DQi!kyn9W`(d4?A)79EwX<P+Qv*`Q@3A
zOs&0wI8*Z8|K3DShnZKRRY;CpUblI3YVy{lJEWRn5i5!_GEkjzb6Fzb^|0SFTI!48
zr0HJ~mq&?f#1RDpLj#K^#BUudO%zgq7w}-Q2!FB!p#=oeaifNnP@Kq;6K-c5LbKZf
zXw~_W%kK1SBemAYJ(+fzw=;fd!gq9v%jRC{ER1l`ysx@-xdydUE4M}lfO53fbpyr7
zio#Y$Og?H!*`XA5`Y_Z;Cxq^k<Lg)zYYDsqTqPft{s2zapX_4}>qjRlNKQL4pxwlz
zhU==^hVnnTQp9*AHr5GkF^*ki9|qvPc2WKulRAjKg@6Sf+`Q#r%wD#FU_j55R=Uir
zu8n~m1og>zZj9aqCW{G?JxbU)H7gj+9cw1`!(YuCp~od*j-B7ZYZWP?51EadNxh3I
zVnJ59_$P9Z;1g&hjlFZ5uxit1m2M>jVMy6493&uYy0=r3Z??b$1#tNh+<muyS3_(=
z_ZZ<lb5>#zfC|PzJq8&6HjlqXV|2Sl%mQAcW~mpa#8V$jq%&karliOwq?S!$UWCrV
z!KwU|9*mZKP|?!P(h&o@1Lgy-D9ow<>Lh|me+6_}qtiDFk(tZniCQ;HHuLD;rQv4Z
zMz}qYdGM$N1hd0*yFMfjptl%4-rkMsE%L~L787SBCic6q@Gv14xD<9nYb)KAo>2)f
zrTD2$D8K7q@ZQC{<S*h$=Sv(u)IC-HOm*+dDA3~YY(IDpdi?<qBf;%9C93Jgo0&IR
zWr8}|3b}L3=&}9bQ{VNS{NhHw*M};PT6U>7ht`k4P*T;rQzu?!A_$VXA`$rCR7+^;
zRKSW{36dTM`yvA|lcl}yD*{ZN+c44I<9=it@XU4BJ^q<=e+&D^;<g9gUf%wAnUVfo
z^?y*ve`Vrq@j)e824Qy_aGdb<E$XrjY|7Sj_@vDY{&F5<Qn$YG0Z^bWfi9XQK%VoH
z!5(O1y`+ynWDX3-0eakVf;?6isOE2OlZ(LFv5ax^?LtBG+(397y9S`-Z{cFt08ai*
zK)sHI^8Y9FF^yZZ!bS^ALAh$PP$4x=;%=QQTe-u0=3=TU0f8TV0yocI_8L)J2hkJX
zMgbF@N3*e&UtYd!6`xoQX8JFVwp;ZHi_xRl<hfhI|2Jo?5Gfe}00DK6k0f9`dCAR^
zSb2<P8UC&-XQXTr@(22o4_WW~G=ArdvmSM~_cpS|sgb5&qA&X|DT!ZiOUUe8hSOSx
zGR-vbbxAOG9JCL+fuQG+<`IVRFJg#Sr5w4Ak7MVOsuML{<ZoM|OjLcGb`!A%dq3^u
zWxa1UaT}!h9FEYM#m|V6FZ?O>;mTDgK1Ge-FuO;$UT1iYduSB-TpP*NhB<EfWKslQ
zc^GL65b#-RLJZSZB&*vH9UFfK^;Sjd-|&;rF&^RK!RD%PEjt0Sz_xaH&IIs4U6^sT
zi1$uvyFR4*{ka27G>e3NBV?z=q~3oz`91+W2;H8I?N%e(zAo^~O7}!5#+?;SEUT^p
zJv@7WjwF!KW?7F*?agfkEvTq~VjRRtKE>Cj2SJWTWfuvfayfNB&9MU;lmU1n)Xy)&
zdTw>kdv1dGdtJmt=bBLG;UsizTk$7jzu1eY1}$(cAzOt?4wzxX-YYEL&BJih;Hnvp
z|D)ot3Yc^JQ*VyRhD1Gi$4HxVf-g!N1qJQp*jytU8u++?OD=|i(N#bvdF4VHHulv~
zDc?KKrkg>X&QlcZK7V2d7)iraF*$ln!#mbf+>5IIB)N$U8CW*4?*m`;i0~&(_S=)*
z@x|rTsMD|<#anZhL2}s{bj`0$hWZ=ek~t24fis|d&oR3e%a)jH>N`zVShPJDOfg>K
zVD&L;R<m`bin!*5f1QaZ(twd-?UhwZ0iPsWIn`z&Ls+#@k(|4wAW&*SuSBhL%q|^^
z)kEhx7C4v}l-kFT7NW6ORLc2zTVG0~FIW*gHIi&`7Oo)(J-9VsN!z*YcNbl-?2X%U
z!)@svA|1Sj;xl&Vlc`CE+;|fv8I!@o<qo4~6uPqj?;qiYARcx$*l97t;WXD;k#GP-
zyJrfb^VyPsIL46_W;gQ479(Y6rll8fis?<$Ce?@+;lEyk3^6NV$P9%&oD@|92L#Za
z?c&@UjtNkTX?BwyfI9R7QC9)RqF}Gc(KK@Ih+_5<qjn#hTN2qYIVXn6=xc2f?P@Kb
z;NSRrFTYI~+iyItF8oUbrg{(9>~(ITdViQky^yD;qgzqRMxAS{I)j#AvU-P9-1V|8
zFI6<Z6lI&vYy;fNAeDQ1$H;~c=hy%R52jORpzP@w6a&Q<%8~6bn1GIJuy>dDa@5$#
zVI@FhZk*)yo1q1+_Fc@MI4o%%=AU1k@hIX9@=Eac`M+X@O88KsRT5|uMiMR9#v=nC
zQ^kl|3^wjp_OM!|bmztMkaGP~zq?@9NHrW91c1Pydl%-``jF?Hz$6PspN8@sjTO9y
z1KvW$`ZrAuK{C3ZoB72@*9yi$Cw7-3B}r^{!%1b-&?x=cb6-ytmzJXwj(m-@k$t=M
zGP~v219TBV)ks<=UxAv9SbeFC6!|!Ms3E{3DuPU7t{FMotmw@(``1qP|E&${kP;OC
z6uLk~<3F}-U%C<}g9eZXadghSa5-#WQzt=hHqzz{D=yCrMlHnI{6t8n0;U<*D*JlL
zh5SWsy{S5C3N<I|-#3?2X2eQnX`E*=+!dg!>65>diU{AB8z7kVgX(oc1t=brKk_c8
zMaaBv(oSm4X0e!f`#95m+j$y^H_I;L^zkp)G0$idVmKF7`l%9K=CmB_rcjJeG&7%h
z(w212PV<R~9QFmJ0f9SGJvy{YuB69sqtO5J+&_*^?@STcpomQ3dISbj;lKh!yJC@1
zCy<AlK*Db&IUVNu9pWXoHaKhWM2kCc;;akM74ctROSZ#)#j+jk-6!G+&3vDY^_?XK
z12~Qms7TO6gYCO~U3bSky{hIJ{=4d#VEV*S$%Yt;zIusQqd1-QM!#G^Fb35h5!`zT
z(dr<)=YCacs4ub5)0`UMW(f?x<4rC<&os3|ZKgTYZk%hUOfadcWVPbojKH(aZNHPG
zu7qvAInG*-FjIpOltXw2y|Y{C5i+JOhpM)v?7AQ&C4cmF`7RQ7c(}EB8o<e%yO}{O
zNJcfNJQ}}#{<ZdxGOut+UUwW4O;~$Ow{)oS{u(a}8qi79E+>M&_d_;8P_CKKL<-dP
z_FK15qG_UfvQ7VHz^ebBv7`<+H!;6Bc;eM~X(p!md@Y-LIyel8aT!cGph+>JFLvtY
zD+UU`k;mg0epur%G*w7zTFHKdw?xcB2{P9-=T)I!len@UaK7@Xcf}FnnJ#)o&6oI1
zivK_m(Lg~U7C`u3&eh8qLwxiCxIyXGW1*L%Zicv0Cl5ECt&=IZlRHF*;z`rQnTNAw
zG8VMuoRPcaJiKRXxw5bWfkkaV-sKVf@S2wzYL3e0Cmx&J?L_i&s#G^9+G@&0o`IvY
z^-A!saOK-<6Iog2`+Wtt_<LImp{v?Zn9i;Fy<_>jW@_3VWns2&VYY-tILXi3_EuA=
z2|89rzv;vUzEXME#^f8erSE0miZj^t6)3XPI$FQK3&t@~n&x=&v%Dq>ur(l`5_qWS
zA!~}NE_1~jKuX|EguPE!eCd!nQV~XxEx|fm^bCaME>i+79MpBN-ifItq#sH?N)yd$
zVzDPmA|)M{mk_nA`yPmw_>VqLvYU;;v5Wzb!EF((+=E~I_U=a`D+@DHwPEW(314DK
z>i)Sbka4ND2zBuWAh$D(HQf$}9&6VRl1jOrQuGmdt0{90x;!GU)%7a+mA~VCWk0gH
z=rHNxo|zcuO;^5b%*!y^ab|d~-g3JfBONn8E^1Z@M0}mr=mc;WZySc7ToL)4#m!Nn
zMjz!g)89xW5m%s?WmYvwsrxLk;<)<NsB9X_n7TI%NywF<Rlq#sgOhL~j!2Z$17|Va
z&R$qDyM-$-5|NMdhokKeQ6l$Y3GXpnt!d9>(luvX3UqH`C!NLRPLp=Ys5&})sS)JX
z`xJXHNgJ_m`4iZ0>zB%C{G+4o8d&<1U2a6l#SE2kzZj##U)OYB%wH&)poWQi^EgOK
z6gda6W-yFg88!8$5y+fcw}W^RKktkTy*TY(e~R1^qlM{8q2i)sPi<pXc1`F{_XjJ9
zVkPRZMJN|-E&8u?;!KQ15xJ?Ar=4PF9vWw}q0}0_XhfNeL;HmsuxXt>sC!(`<9F0`
z4Qc?p(sXpAyf|pk6>J9yqqFUy@7uzH=&{&MHzF+G^cyc2Q;Qe;F47Pgb3{7ZG#?|>
zsTfSXVs<jsq45IUWP2I`Rguua5cU#T!Sccz=R1$KDQ^XGd_SLC<4UPAf}x0L;zOeO
z+q*6HqoV&xIE?{#+wjh$1hcr>C%^K0VUtogoPeiavRxu3Nwjy>6(F=gwf;Fjei5Q^
z&GafllH`_5#)|&a>JdFRT-qIlehZS2f%DDi9I45w-H_tTJ|@c@UM;6Gs$h%*E%irf
zur6HZ6}a@S&F1ny%?UwP84>`Efv(0{Kvyw$pLgaLvghVu0QaY6R6_G^K6c=#_?6PG
zGj+5J*-ojb!CFR8MY;c_pp~Ir6nb_vLq@)9MdZa2cwA)Q-0c!9J!&Wr>4)CoTR7_<
z80}F>yj-o-B#CE_el-J`->m?qeqqqp<13lFaE&f$hh5Kexz1E%p|HT}egg%A#Et}s
z4j?g~5heBNuys*Q(aVg@a3qs{cVj1q)TX4@W=~~y{4xu;E8(f0K(Ez+>Ab`r;w>uC
zc>byv`;cFN1fawTB74cSraWBrQC@Ga-2kT-Yr~?c*KHXy$l}13m$DZLHuP6FKLTw8
z$I9vGySx)3Y0(k^ZU`ChY{u6B!Eu#yzQrr>S_;J)O!5blxnEDH)%+*P9pb~203zl=
z$ln*wdUG!e8@*gk>mPOGsU=4evIZ?*xT!KcJ7>+36ZVZ|!32!(rr@J$5_8L!{h;+H
zGGf!p&4iN*n&Du1c`}PIWBD)M2)r2ucc`UFwcw>;R-`)X^NHEA;_F0$`A&CdlL0ai
z5BMG6KW8nIO$7FT(&9k$u2DJM_!J>85R{$enMm>O(CYn7IW#uOkQLv#1>7yfqj#ey
zv*2G@+8A#;oBfP1g-J>*|7GAfk*<-c2luQjN-{K%<+x)6$L=u!1h7JRJ2+8EHR6PI
zWxhYQP%qax6Wd6O=ge^^xpvEkt-C2FfnChcY~X#_`6k*7k2j*nlC@xne<al5w&)!q
zMG>^(-=TbUhecWk<GZ&N!0w!LfL_bP-}KIbnil37aK!}Ws1z_DCc@2y$k~eR;0=tc
zfHUY8Xfh2HATE^r&n9BF2}wKg%CN}VUP%J$3lGr0sWQ5@Hbp?+d;IS0P1I{Jnyp0O
z`f@+O*3CS@NCPH<wYpVA%Xz&XR&;zNm#`ET!YcxW7$LOysU<1s*M%(A_@cZ|$FDbR
z!Q(s@ixJR-$bRCX3sVrv6hRQVpXG{f-Za8nuOE43LIlwW%PUrp1xri4y9PohqMO-p
zem=D|Bv+S%56Zai=%WA^&(_+Zb>n|O9kT)pb2_<Zk*;3Po3H(N&G=_t=cX$$B<l)j
z6w*xG?5NMg3kv)&0xvI-5c{x_W69#&0(WEGGonOllAUWPj6}gzAMA_>$Yq8#z^t}V
zAtW~0ZB~SM&xwLYW6bceaepE5??GZ3Y8Q_})N*YpG(apPsP%&$JUd?^Kpx~Zwncqv
z%B6e9rg1~8v&I!wA65?JuFpo`Fz$68nyjgTn`tN|bBjx6Q+!ho%rf#c8sGU%ia2kK
zG@}F@APG3Gy(x+;T_M%bnLwK;1^{9au~#Nx>Ca*$L?y5&lzA(yLKiY(We(5|t5j*9
z_x-TLv5u9cwCs?Yi!kl!cGD?hBGgSRO~ZHL)ELGIWOeSKCzud+&jyu(eAl!J+q(MS
zl0(9mOrV)1SSQTr<e`^Bp`I}dq-o-H%}?eD84n;f75$t(qfWbfe158PsVHavKK^+4
z_`TZRKEP`ZCdlvOKDu-y(0^04qr+i|m7+9dbilB#Mx(nGN&ldabR&dQHo4+jZcZrM
zP(S6rRwW(0U)i~VOtj!qAp&-`hZ$Zu9Fq`4E_+ObflA4~c%-;b`MLScc9k<m^(=WS
z-Kdi;>7jg~-4_9)WRb!#O@Zo%o{5Qc@8e6hJeb+7k3w0^OJb4*(B9N<njIrXkQ<pk
z<A`VW{aSJ%9;PVC>?M{4?NW0iH44x)JkNR$vKO=13(84fF3z5i|1UM<(A_O=-Qxn>
z#JI`iF@S0x0#v4T(ZBC?JV=1%M&$}2qEa#d;8?fn4rr80Lw?>)G2SLyQ;5VSECx1*
z@LT4NdukFMwq%A7gwr{m$aThDr3L8FaCOUH{P>8LYZyG~hN-w?@<IEhY3-(gS<!D2
z`i;_})SPfxOdR58#x{$RUf8X(u_XEI|N9cy_%^tdBT5jBG5P^=(4m2n2n!y5&NY~v
zqNx<7J2zpJuZ!>q3Cz&lGfc?pw1i_<3RY@u(;)oybODPgefj6@rtJ%$CPmEWi%+{#
zCTmHskc|a*T`QFGL4M-H37n7AxsJU;jerhfWPEeiVSP67npQOz{1!GH0v1P=EMFO;
zT*#^Fqb+|)#O)N#n>kGpx>9N1qxvsx7d$AA^EK>G-dQWjP{oVbS$7TdOWey2h=wty
zCmUNKl%9>3`3mhZ9y=U0{7SWi4iN#7o_7STR>hWgci28}WAleI^%n_8sGO7-S^E{c
z11x1Y+9hbu;iFa@0L{H~r1n-_{QOi_SXTcAM}j_lxm-R;RE#H8Mxv~!?5@zCLaP>B
z7`1aVW85Z^^4E09o}_Gu=ZB)hx;x)I65m2LWs_Q2aOY%VGzmr=+2Yin2UD@Bu>Y-u
z;0M#0sl6!v_G-brc-5C+u6ohS0jU6fxH$AF>u8j%@9*F^S|Vo}2*r8O4mpQyBu)ky
zHRf;tw@+&Vb7lW&NsrZ>wezyfF$xkKGN!YXL0VVs-`hm_j8_g?4pep$dVzONjK1;X
zL7ufn^`zf-MwL!Br8pd=-F<(Zvy%8GD=g0?VH<u*Dodn#duRAD(aPj>kLcPJW3`)%
znU7M=#ST3`%#VDUEa}fUaRXHbyGZ*<=5PugWFsSF^=5=k;Z(xU8U8tYsA~ydUjMRR
zDhw}No3ZPjCBc4I5y$q<&OYAO_+nNX4}CoVG<SqYF&i9iu2*TdM5$^dH%$+D119}s
z4vVlgV$%<{{UOIPIXBz^d(fxFhnH9!h46^N%pT@Ct;K@J6|u)ycJiMyhIdEC8aLz&
z9oor;W>c5{J3wz=s30lzFL`o5Nd|Drn;ufB1zedpWC94mEVYe2ch771i|YUN=w1a@
z!dh@gu@^4lpxvD)b@(Hq+)B6J7Cc-babQ~sJEX!U12a1(UU;Uo=??0~7jFqJ!&QzM
zc)G?H(QBnsT@fA)iw5I{+a{qz@aNB`9+|KJsi{86@x(BQm@F9jdJ^m57N3<a{@%0U
z-Gsf0TL2LlT;PLhQ-o`G^yhY=yU$hHAt5bQUBC4y!yxEc4K*xF9lI*Pc_u2Y2W}TD
z?Esjq5A#+ZQLt{nrrLOQ;S<Lqjv2f#><Y2U(5vKJLD1ePc+BviXrni@JV+cQ@}<<<
zrJQ6<`iU6V$_@RKXqc?+=PW}#GPL9Nu724Y5FG3&85#>(PEj3DS6frizN?!9=uZ4C
zX}{p?eFzuup;T%07H4pW7>(JnfSFGpj5bHYoB|$-C$=3k=BZQe$$#b{cg7(uEYb>P
zzpZcsljnI7v(*4(OBOE|wl(_(^eJX6C8rnXa?j-Cz1HI@Ll8X2mopyLJ`wVIr2Wg~
zAN#BiL+S>Y%sXQSDcQ|~1EnmqJ+OCzY8e_vikvUNE=lg_IJf3Ye0+^>>r1ov3kr-8
z61|-b|EE@YEV-<%V8DYju8DYg8}$?qL+9=>)<k~A?N&$X&o_|;Lsn^OcQ~6o-U0~4
z`y#~C8|COh@RCvuoHmg74m((`g>;W~8SvSkEc;iHgQ*2TxJ;hNXvs(7X{sn3@^F(g
z&Xn<WJ{<R@5xfQ!JqL0xO=wjgYXJ+-V|g|PgTzw@j$>Vdd!VqyCo6t>S)Re_b;ftx
zsp|8EDn<-izG7fvU%8Llg)O8ytXmBR+Wu@6q*DaS=W~jI70}OD<mWhUatj}NS|dd_
zf>9%AZ;uxr;<|n#3D6Ez8jShHm%W-2BvvC_QZQYdHN&p5khJ^!?3bNK=hkE>GZaQ2
z;vJ3G5!q=Wvc*V5FuW~1QWNh!T)r_x1X<Jjd$GgaFYUG}D?sdW%$&e!9(y5gq)k3-
z%+Tm3!h_t7f=E+qd8%@!f?pSJ;x+-Rq@?!6sM_!gg(O49m+KSp=dhVd+la5pKS2Nw
zZ^SK+M@f(10^xM#{qH6N@3#Ada+qXdE-Ct7gRF4tugp+>h+BiA1$d}CO3_N4m1Ol{
z(~*D<-+a%7y#X{!eWjr2dtmysKiLx?y9FMky-D6sl>~gz(V~EJ|6LlLv?0%H8N#cK
zwo$>;H)|MUZ2kj^95i$|Sr|*^U!Fcwjccm0JFx*n8%HcOK9bh!_t=Y6GOm>S*V3Xh
z&?uXXUQR07%%!97e;RwSzj$Q%5To3AZBo;Z)M6vDdpG6guF%MZ*}t7zKNv>bkf#q+
z_ClBL*4~KMhrvy<{%4zMR&rsk+06yHgHK#LUDOTgol!TC*t5aS&}n?1m$FF$R#{-9
zpYOcc;f=cBi@@dqXWS<WN0{gaS;CdFTOWhaoxj~*YOj}r4V#Rk#v5a~;az${cuzxp
zGBsUMy4bRhUOhcxgH^T!EK7?mOg;VfRcS{?Mjl%T8u8SE`B@>qV4gj0fXhCO3QyQE
zy|3|fx_gqN(V!$`T&9rY#AJQ0wZ5wJC!zIRTT=M$L#<hU#&Q5ZWDRlp!qz{qE+D^e
zv(N!cPC@;G_ptYoF2GM*>cC+mX|;>3r+`x9Uek3_PPn;>p;<@IHX;<@8exnIVLXkv
z{;!I_n*4AnVYwv9O|#jj*<ZE*qkzwE@n{`O+lYc3IHP^>aWmI#T~zT#AkS1NZhFg_
zIj>3Ei-elpo@090N|9O0SN^Xa4TDyx8NVrzlPdi<TuiDgDX1PbacpzRHd2)buuE)$
zJI@G0`biTKErFMsOwAUus%vUMDH^Z@>Ybgf0vg~J>!At*i$i{X)8~5A`ZodyAF_Wh
zmW+lMR@?quZ>PH2;4dDDt9CB9AVj&l=xSqSNcrlc044c^JIC0~`1D&ko@p{SZNS9K
zEj?#3G?j0Dy-R+=C+@IH47wPL-ENn<i4XPXpxUBqX5-@DAp%-;jPPjX5ep0#8uDNv
z=38<$Q6z~El<HcZ0gSqVAh(!jWHFp4jTB=Ax+WAf_w-EKw&6}+qo_>yOv?m7c0Qu6
zJW7&Z$MzG_?yKsjZRr+R#yp>n8Ck8{@ymV1>hRj)62|7KhV?4fA8vFG0UbIfWpm=>
zt**M*aAKL@#P4k;OvVPi>C*SyL%jzcl32$v(X4zVj1BY<Bo75-Losr&Qp}0MWl*A0
z_~H}BRw(+V3V3)nj^80i=zK^ygj)boT_=RVt|_xcuRDh-#sjh|MzjY1)3gu}dAd*f
zBN^Z$W1b>~$hg2;Fq9DQ$`*{kSC6H8cQirOAmW@gFm=u34)40X-7SlqbaTYY@v{G&
zc@YH#Hglnh&<wIPE%w3+!{{uib^{m1k&V(4Q}@-N?I;&xnhTK>E4phOA!<cG2`b*w
z?RG<0)j-G10M=T@CRR#RE7?u<LB_725OV32xTZRovCD04po~UFr(ISuKmg$QVG%ts
ztLUUoxmAGzq#k>5gLnt=V`-;oC=`SRna<($e9D(VS2~*^5Wc;Rhrp<y)>LbxXk2Sl
zc?pZCh3>Q}#l^9u(N1#Zn;ap%#GSi8m84vxq9qw<0k-wMv0{;|AA&;2r+M&%$>^`b
zkGM+P*Ss^0U)_0nZ*dnhsA{3*d(7?wn(1iAP(nlx*^okcGS~1!(+nI?=lZ6j>O&tt
z^E#N}h{+C-JwV8Ig>2T5qGL_MkoiBzpWhr(T0oh873lbdj+a(Ab8OgYA>o@viEfrw
z;564W4S`V1S1Sz#yKj8HAR#I4Qnr?0pCX3&)%y$tSR0`Ioak@xiZ!DT5->#mZ^_?$
zjx55-W=fcu9L<>Gi14>)^5p!4TX>!+fu5CD>r>+>HfuiIcF&#|3s+Sj9>M=sY`?qN
zbSzi`x$<3loJOhO(-iiMUn$e#r)Zs5PU*tz|K8S${5#|XQzpr?*>m_;1ZBksyHmIb
zpo8lRh9Gy8!p$Jg&uV=#pF9n;rP<Dm?|pY=u>peKe&^^!zeI826=F@IjNtsLdZ(Ik
zlL?lV&>ow<-~+guQS)~MufsMUMwu6csT}fRmG6?FP;3$@Dm>!{wIje^(giW4TAYFQ
zgArAU*}2U5p^z>mT92p%unb6%?Es|O-l`H8Cv8@N)E?5eXnKc>jX0jj1dQ#V^a20q
z6PxUX&KV4#A`Df)JS-*jrWL0aMVdHJ2x;ag)_A_wHDOG4ECV0_7ncr!d?cHh?WMe%
zw;I4hG#<uM!k#}YIYD$V0}6_`mxEJG8Jw@<2fkSIk`jfz$1GX$r9Sm{JpumXa6!qR
zbv2gsgM>kFIQmo6p{DEAVtdF*mHS~&s6R=fpb5hNGeL8pY(*lh7f}5&rbeKfUW+NR
zx~DC;BBRUbG0DGuNaT4TlQ=P~#AL>Uo2}x=1DAy42>m~{cb7I4Ro(wz7A<m`_v{g|
z+!84fD3RVrCEK#9T{p)3=61H!@3B^cK=LEqd8Ou~8R#||xW$l0#^lcnhV(@aQU*ii
zq=bk}stSkG9$l7&5m>*j_$6mgs+_W>tN1|K&tfg;c*^BdvPu+A2nLKduGKVdd&UhD
zL{E`aMjlPn*h!2MM}BW8T4xfa32(D|=}t$}r*$cK<DRfwBmJ@&kZ_qXs5%^_NL&bz
z{pw+JIxWZ8S{)kwm&%4BK0F;L#sengY&9bd_FRq2&}F57X82Lqe!gJ-bRg18yGAzw
z$#d^B9#@1aPqBFLnTkk$Cg+%VyHLLXX`fE_L>{^(<T1H-?G^g2O8nqZ>D(fyKzO~1
zkZRzAGAj+Po33g*;8*rvL;3ejNfSk24w`hKskY#91}!cOT35B2r!uGLRpfPbn-79X
z&%Gn?vv$UL_0Tvek0FSYpqs)vmoaW8FDM`OX;v8ES}yz)@8pCC=nX87wE-PFHI?xG
znfaA#q&%?XIIsKuB)S%ZWk{f|?P^!Cq*$S9h0^Mf&?4Wfhz!%;Whh&tNo|_qqG{|F
zGQL&AM_azfp@dpjvxl$ZLo?=?Jnj8im{tM}9d2V~>rDA;o3JDeNzNVV*JfKB&;zL%
z_PX@x7Bl=p)iT_%fzzm(G9gI<&kXF(V#!FQI8(y2axKr$YS|+a=QFpMD3f6-@3a+|
zfdR4C)pa8@E@Opg6`7I=Kten^S2GuZG-if&vB<}#9OO43jUa|*ApD_dc@yV4^Mwm_
zg_Xq9>p_xA|DuufVWoy1piH?4rh?tG!eo8Yn%H^^z1x{223*Gm9BA^=MtsX#MDv<&
zIgt$3opN(?BJV}My}R#TIf@3hNHU%seGtI|Ylm_moV^f8cJAAsNww@p1@#(emVH7b
zVb`CCMj!(wZj8$8n50>0hP=7$Ki!;qD!;WJXTo7>zpR_DDJlqKRUsMV;5@Lr?x%w;
z;AnvlRZoDXpXKDo?+1fqNdm45j4@CA!6w6`fs})bME^dqMX|1T)}ITSy?EHMs;u!p
zb(m%eZ6y~M8#%M#@1VlFx=a&3)v6Epf>0p@@UyE5?Oe+(Sk=1Z;6uwde=fG+-nZoW
z)BIbU5AgjR38FrsIw*I#D~(n8HMg^3Y31Q>48@6mUD|!Bpn4{=3}-UmE9&DIw8<Hc
z@)QkDY=vm`um~2sDjT$pO6j-FH?C*7Ud-Z>0^^-wJp;4Lj7i9t<n9sK^4UM6h?-!L
zTT19yrNM?Ytv*O#Rs`vRZRdT~m0HxA|KW4!$8>uS^*T+amGmYV%$g%z=)qQgM5pJX
zF%2ag+HW;I7MzRJjfAQpLKUnwjZev#T*aG3nOI<O%pPdfGik7ZhT(+Na+J)1Y~JkJ
zhp0U#N>FTgIZ+mWaH)4Iz@?#xQb1qOkmGG`Jm2a9`RPFHjUD-G&YLf;X>IHO5j@f7
zIOY!eD0{q^1w+f7LYC+&+&*l{+_4!?adb~y6FuBaOxSW02iLoIMwp#}Dj6UH){#GN
zdo_Z%uDlCbU70Y|rnKK|*%uk}0++(-cL2hl>ZBG4<lApsQ5hmK2YGon7MAQ}ywgZs
zaQDz|4ZvoFV7>BL8Wwq-Ec}P5rW;Os9aO=Jxe0w=4OyaoCguzi@%+LH3a)xhZU|TN
z26T+pT&fq;;P<1$dM^6aasW<$3OgQ*9>jtMEq6M92oR?!hpV!gv#XGfC-LNNppK{u
z`x4I&J^sEQJ9odockrt{DWv1;wLZa;hq@r&xGd;F9oE1P??RNpEMi^|z(_NzrM`Kz
ze~)yo6J3yVX7J@_cm}wEJ@9AfdE0p+shzz`vAUTSS@Yw8Z-<b>GR7zw$0@RjxSyjl
zRMK<gP2s_1la1lWk0#8e0DxU`=$u6`GrBgNRAJz8C;%G*FyoA-o6T)GSEhBnNG>YP
zpp_e;J3OR60?;&(N23&6O%pfVFVmr!{i0sXUaL3x3(b|RnSuh+0AI*yK8)rW>Mxm{
z^mGtNVipQB4i_Inl`sz{Y7g+y6Jp%`u+53|-mU4}Qe#KmfPX$wS@WdBKOsy%QJ!=w
z`-tW)mr1GiZ6iAsnotcEAoL&E#_#ReDX?UGD5g$JxO{enn&0`y1;B=m9`Gl4cTfUp
z&#I?p8L$nZ5c?;@a&O}tVWPc{y2iKc5VtO6PgfQB;FbFiWGM7I(1Dn72oG79p2>xv
z>7WW~HAcvh&vBO(!VKT}yPDawuGr+EuqPwZB_-?-<&!XC65@p7f^|)OpNDvQ#E?E4
zn-lAzzg%9)<GIeviEopF;5<WY{wDKb=pPKPLs}zTCDDrT_3Y6RFdFRN&C3;Uqr}}^
ziLRrU1$r{E$UYQk8TGrL$5Pe!k(ezgA2@&w14<7)nMxD5M-YrYhVc$Z+13QT#_*Fn
z{s`wZ|DLiD{{?nvCdi!W`2LFN{u~$k7V+#3^A1A+Qj7R#1BeYIhoM<M`Glk7%tO$S
zU-x0W6dLm4E>J!0)!9=%yEkGknAsu5C^1Fn@#!TlgCQy{@)$pmmZ(}2@Kg?&XLIm`
zvs?v#Dx|mqy8<*SYV=vD*T4z|e^ce~Q}(|j5uOaEWV2EPI&P)M1mVb@T->){j*fX&
z;McXK#~vO8%+BL>MWcWveFDrher&&KANX~N6$eyI_ia$slz-O9J*_z1hH^HsT+Sx}
ztI@JIyT-~6KajLtl7;916dibc7-(gVHCEU)nLJa^4lB)3d((<n&FE1~hD6GubrGLs
zE<CLME+=;3m6jQ04FQ*Av|V89g~OLTF2Y`dVe#~=`jYSvf@kC)dV-j)6w*>NU41&M
zp!pewAgi*+Pp}7Y<=)@t>wOy&N!V<~oHl`m$qk}J#eZhl7EN78(oJ*8ut>l4p<5&3
zM2vvd?Dfu}EFF45vPfk1?&KxNhwTvUt6YRn@>u=x8q477=~cxgzXROGcH}|NmD*{j
zQCX-%DjFs*P)~;s$Nl0j@Z44SRLM041e@!BsySZ|IS8dJOCq)>{PE?~k{c5(#V$#9
z?3S*L3rz-{o8mD|5*of3CQp4NJO0wpSd#>gu~0GC9y+l?pd_9#;Lo(V1*0-SoqO_%
zT|7~p2<*CTXn5=IsFz7ocHCen2!yn7%_gVNO{*PNi4WqnD7e;yNQl7okB+kZ3DbMH
z7?N}oNK|m*PAf6d*-obEICdMdXMy0|Xw`<@Vu=56zGc@xDwsO_NaKG_A0VQQZqq+a
zuok9HlvXn&>>UL8W}f;MSKEv?BfSd2i5ioZnq-Iz>or!fOQ%ap7Tl5jp{sQkUo=;5
zg|2V@Z#0+&0mzr@Yl2|Dtqs?~8$zNadD;53ih~gg-eapn;j|58_QfR%&qn3QDpi_g
z^f}}KNoUY{u<(#%!d(a&tN~lSB`I}I#^M?IOM6K!pR4uHl82eF+BzaHa-;4}eRKhX
zJk*3}6kqNa>dox$7?jbjDa-%_mjXB_2|;IIweo?rv54trW|uR;5GX1*F;O|Q^(eu`
zk(c>r_D9oa>^Yba=YuH_VXy;zLqXp?y4<MzCo~Q?Y~cbnW{RN)0WO3pApwNrJLhNK
zeb2#N>FdIhuCHwKX%mnc#%wwKjp2{hUYRluZplRVuIa`eu)4iZtRyu{Ybi$$&O|ck
z2qyKNt=fThs`JA&`CXa+Mq{)zqUT4vVb9;dBwVH0%Nn-y8ZY4y)wZc=19N!E(2(F0
z$A6LZ)gu!_mZYOnzOl2pU>&1NaK${-yZ!ntcm^>vT%anKB499}sIev?S-i-~yMi<W
z89s+t0WPK0v^!YjpHv;$YJ2UT*u79Oy1m055?mSijBpO(Cg=jI(u`;C0(r>NbA&I@
zX}3bbkhs24qM-dF+J*|M8jiQq)njIj#jp2{^kI1^Ga=9*E;a+n9lghfs10l5Jps~u
zD0r{~-!-dd_qS<zj6I1n^uwxAvI%{c`s5y*OF0FHbgEP_UXh!`^rqKm)shKcD(i{T
zbk5!)?MVn+V^`MBMKTbQo2t_W2(2O1Oi@O3BVfVKKRA*)Fs?>!6wBmYLdiCcWgz;l
z`M@fdG`M0C$dvVp+C9Zuj$sbuUqq1NtI%@=>t#)mKFy`)bTt$_N%^{oshvNC4e9Z!
zeo=Zec+}3$2w(%%aHa*H(MULszq@V_JY3-34)-P%MT+#@rYMgHgGnJG)%#cJIKFWe
z@6N8Sbsbo&>zN6r73{!IF)gZy;6v?5OTENj#1fI=PT%ljYnW+Q7z7cS)l%*Gl~kPc
zw`_h0k=Ma4yWc`yNQ<WLIM&l&nZkP2KRF4jrxZRP)<E~QUp0jMR*6v5Uje;{rbdb3
z+H<HS=lv2yn9x15@3dQ#w!?dvO|3&OeQ1NE*Y-iAj<Yr=g~pJZkx)0kAZ|<=B;~?D
zbiCk^TXFL$BzF#3&nKC+B<wJ-NhBdK7ThYi*HSBb*kPppwgR?Hq#=}|cyN?6gfe~W
zigA0Zu_(X-ofRNedc;2c3bohQTn_&D8M16Ch(Jn`1dYX>SRJ}?eLPbJlsX|<q1Ro~
zZaYnI{-<3tvVGyaUkKHD@%oV|1$%M5O9AS~bxx8@j`lx<MwqyVt+EbHI*{uTm6mIW
zUPoduT$5xzhDL$**F7u}06M2ptYJfH1c`-Aw|yM3(1#DEBmB^{3zajy?}h&K2|<dk
zDFZ-!A33-Xs=bv7JI`Y9T=17vDNsn*R>m@zQw6eQ3X!;AlnM<J2{aOE#$&)U5C!es
z!JuOcovbSs{>UHs0>~eegB{I3+`x5hUKK;Qte2%39idybZF#JHplOFg^nIgG)`PTD
zfF&!_W9e^UVi@SPj{B47*VkAHRQ;vT;+IzM&7mXSw%(tw?tKZ#>U5dWAE*NIVxM(1
z(K%t=;)!xyx$UdP8^En2eqci023ImkFSKP$jTh1?@ps3WTQx8g%}rz)NS%XnP@L75
zOnC--g2$p3!SZ+N-x7jZiMq-v`T#~j5`mLDUvOo#RGP!3eb2l+cRki$Im!)E;DZjl
zLdlJ4)KI~|!znxBq~jdC;xFuUet>CqF5Lj6oc2^!2nkq_-6tF{NV+hEr9R(K3jwCD
z!S8<?3Okxy0+bcCvPe7MWyi8;vr`qIVdg3wAP|^7f7rr)=Ps`tAoHuipu=V++`vA<
zg?7gCt!_x4myY5UFmqVEM+o$5V6Qi1cfevh!5R{NXrRwh$U~{!>R7L{D?>68zVTyK
z#9BTw<Y_#+=W5-2SITYNdA5h_C)b5B2_qJ-E3st&+1Mg1SdFwt3j`G9_sPbK=OwYW
z-jF3TumTTo+#GE@$_8XLj9PWLq%Gsgt(y?y4BgdP^hrfUP`hSd_~IurAhiY{*JgPj
zm-$${I}hpyn{55BGo%zHsEi$T88?^?3R^~{uJ2BrY<ytyu37Owcbqmzw<&ih=<}^y
z<tZ*haksYo2v^<Y8b)g9SeIr$<cXMJ*p(uvzn*$h{uE9{b#KbI@<KUk+~JOWuY6gr
z9<N8Se0m;Tjj-%Ole_%&(~qsu9T?+4TJM*e`(Tr#x5f1%@31Y$ZZv4?x&|7HxdrEd
z7b21<28G>%74)}ei|-4zNpAm-nnFtr<68qHOx$V#<(@9O{R;^qxFvJ=6ZFY?M!JH&
z-Uo%X*IV660F2K)v{i}!R7hCx?vOZEVV`m(8~M0P9cRWABcyQ8p_ZW{1J+<KrJoKu
z9Go?rau71LQilaWk-~)Act8-wAW@V0S0NxuqAt%CeZkS(=Oq|G!z+FT1SFrp%{In@
zg*|?#&(5b;8hy;jsvjJS-i!~D2~1)jWq1@ie;GnDYvUZxJ@!+et0ZAUa_Ejwa!;pg
z!r8&p-^sAj$X4T^)5aLQ96^@CZ`A?|GND8m(5_FMGA5~irIaaK45cg?3L)!E+D^$3
z4+Y=<WBx~Af>-DUP%m}I{vN{Qxp0N;!j;X`k#9wzAjjua-a=M{rL`1{G=sSV`}c6J
zULx^t@y{TmM+LxHy<+H}=%N{#hwpj*uvyvy0TY~y(gE~LrxUdD`J1%7^?29m&USJ_
z1eg^*P|d4J-so{4H=A`=;gG-zZXz7!a_IA3CD#&*e6WspWhQAFP+HAtOrbjMfYsT3
z$U{6Y0g-%Xa?|o<S+DG}Dfvm(hW}T~1xLw**SL3-zwDU|nm@40r~o87>1)9oLOItu
zDQ`YD-HPn={MM-55aQ8161HuR3tiUD-wJ~F7V7-BMgJQdJw<vb{d|L(q;g2kv&<By
za$_Z99BZOG!SF9yG%I;XVXn=LDAbq#h4iLI{WU~~Glck9_~57-0nn<~@<k2>5%qe0
z8iTL~8yz7eSR`HX!`=vgZ=$(F_y@2TML=LmxjeQtTl|~#&jtH_zV)KihW<ZWt7Q=<
zQfO<f<z_rX9T!7Z>i?gcD_+A-r<P+%MLi)pa=_<a*%~S*5KD|}84`iI5zOuXcR?o)
z`8<xZd{+0HuL3@li#1Qif#J70?*BBtrI7(DEz$fmQLrOD<5Wq>H)i3;jve0Qc0yAw
zDpuUVlt#fr5efAMPvd<xe-GOMD7!-$me+u1RC98~FFG4(3on!Iif?$Dtl(4Uvia&V
z2$4Llkd&~4>gRZ$4Sx}WTDjdRC#*lqcX8mO{5T~WGYBfjwzRM~NZDV@N#4RziuR02
z=?hXLa^b)cX6R62^3|2;{{y?Kc-`l=x~le%E?5LgQaa$Blej3|=Az&ZP4Y{SrHeSR
z_*+6(69N~>#==l4u6=6b=r*NZv^YwrqQJH;wtAhCrmO-%Jcu&>XESFr3anH1>_P`)
zKgo!QAdK@R*3+=Zb`ma{|I^vyW=D>UMu{QOn=@T_l^BjVX(1vQVNU40S2@hmVb0CY
z>tXPi_rZ6wwZYQbhVc=0j&>TEB?YSK(U@*t_YU3;uYmx`IcAS6eZvsNL<HYej+C1^
zBWsX|ih6HC{WdPx(iy)8h643pd=@reiQX?X_>E@mu7Gkj36J()p<Dq|2QM6<-u@sK
z>-=c3lUybv{sdjYH#c@~sGgJ09yy8i`(RBno%ubMmZggX%#$dihA}YIS;z4L+WDdQ
zHvZ=EoScf_VApCp=v>k^)$#crz@mnChq#jGL<L|#m%2f_h&+b)Rz18pHYHbf!<r`X
zAEs2{+zDd2<kUtL)xbTjV-7ZMR!D}Y%Td0ao&;OYWR#0TOlHqL+*>}zc2Tlx0Dc1D
zyT14?{)L-xqA<-a`zpX+Ewa7E9(YEO7Apn>gnMk>rUc3O%jWx_LWq-n2^$!Cn5_~y
zTC-RU4i6Lm6NndTG`qffFsV(+*(u`GkDAggSj5;iZ|xvUi8t>jvV35U_>m9JI6|(I
zQvNkXkf%DJ4X3>AgDBt2@ARi~o@_5@q=i${0~;c>#hKsh!P9BLbA4L&7<)-gnP6}J
zuHS+Z>XUrssZ-)4>obn>(fmU;$eI2&s|<S7M5sPVfJ#{L(e2o3VhlMa#<+Hu_cyYh
z(egkrJ_=x^V1VFxd+oiPJxl<D4Ux`%ADMhG=QvZJ8W{Q>8dEvX>zmAM12-RgRc%xj
z8(OR`2%viA0YLlGi2fi2o*&iN^b6oY$MpK_d=u0<KW0MTX5U13>$)tW`7gGguD6UC
z0id_7gOF99XthjvzVoJ$Lv&gYIudn~K&Hu?sJ}=_f8kJMm`9FwhpG-mz)pO%4;?7J
z!g4F>Xrqt%&h`tDljr*23@g-CKKB+5eZsAFmqfQTP;v1dR|Za(#`CofT8luYowzTR
zMj+fVjTWk<wKv;syDR6IYGauneGE7i%z*)O{$G1!$*hoV3VpTrC)N3w_7P#oppAQT
zJhNW9*(mX-Qb)%h4aG>D00)7lXr(nOS8i;g#jR{s8*ti~7o!E^Du^$f-pvGwHoJw6
z)Y8{dSndaP$|*P*VDZh;FAyLo=PJFyd0=h+0^PM>7r%bsY)`Cg^n({IZl@2TMziY{
z`955XLZdGx(Gd0aGm|>denz&o0z*UA=oDkkFiY4B#SHyxH!UC(QykKI0|!?pb2}@=
z3OV{l7m&-^M-bNe_6-GcO|vy_b_~^?@TmW3lZ}KXib<xf>r<f}92Hr<va?cGrm=Mm
zR+}IUb^>ivh`L~;Wsk=x#g?u`@O*ekrzl4UDw6@W$i@s)O>wKfR>&{>F2}l<h*Fbz
zfY8>im=GpgfKC)VIj<Swg$k<pSL*75a|Bljo<f=Ttui6h0mlxg4BYxt^zb|qC3iZ)
zv`>h{6{baCG-`XZr+QnIXDq?z{N0~VLb64tEC&b;mBQQKwC2K}^#V!$NHByM|DAbh
zOD|quHNlae((<f2m6hfZdo1H0He&*eyv_oZ<A3S%AZ6cidKd?X!#>R@ktIPd4r^@@
ze9N3ouO(N=W@rY5obsQZ=vt0RP%Q*P$DL_SYo=d{it#o6bVYh-(Bmrw2>-@V=-zc<
zsTDW(18s)8)&<L6pOgTX8p)q@aJYN?aMS(#sEj}r&LhCJ<V$X-Q(eqt(@omOgQ>FL
z--9P(k#p@yk{DxjPli934;Pun8J(0F(iKSgX52e4t#mc%KXTgH?nvl+MuL@TU7ObF
zfJI4;aibUyBTs{Twf=aEzbIEb&16{De`HP{PM6mOm<des-6{<uu;fM_8us@pom4<c
z%;LwPy;y97#20W(H)9^%GXV?{O!o%UEX&S?&!Y^QxkqK<jTo|O;v_W*w?TsL89XK9
zJ2b^Ug2X4uW4+SlpsmpvS;R=Ivb?6HDTCMepC4NYJ+SU)nT?6Hxkmq9)}<zfMQytU
z#v*U>!HS&s#(M%o%q|&@=Uuw2>Xa-R2V=g>()3g9Ky=32$s+C|#6&@BXjgC1j9eF@
zx6o>#=hrEG?>fH#yYs?dNymf<$}tB#De?Jyl&DfVszYb!7S>ENChGnOzqNC+QfH5X
z+})8qihH;s@@PxNwO>QPPC;2**Av=%2C5Ni2!Naoen=$<FF+!Jk4$xhFC>F8woP!s
z8JS^hE?NiBuaD+m4sB*9586E2r=`vk%*#;Z4qTb><|S!t^2aSXr8+yam{K3JBDl1$
zcEQ7;dYf&%iAPju?rq!S(kHsnw`jB1Y9k*@7AjY$%UW&|C%7eZWEP?_v#yWGb!nr3
z|NIIw`Fl9t>k1J7OU<G}8H0t<ee*brx`@#U5TcyM<x>${;ZEH&!Ej?HK1xyd#d$E%
z(D^Ig97t5POu4ctoRy-8YFo`PxPbp^dy@)`4k*}>k>lf}ux;t-;>(hrmh02=-P3fl
zQ#`t%R25D!Na|QXq|)Mv>_J5+i<E)@1V{+n-*#E0^y_Qmmry!Rc)jWs|Ax`sC^^+z
zy^?Bf<jrN(BqETH=nVU$VxErn?w!%`nqExH#Dt%51c1L58u0S0FoA?Nyanpg0q~|)
zVXE|r>Mbv~yM13xU`$9*Y<k+7A1m@B7J#c$bE@&0;)4HW^&QlFkoc1}@{TGGs_n<L
zQ+UM>%zG!Jv@896iJZWo{?U>!R|LY63?pPtd})vT-}ijB^Gqn<5}~l#s+A~cE^;He
zcx|7}LvDm2(T3rlOg6jaeng)T9hjFy4tayUZNi!f1qAFiYLGXOwb#Pvjwm)b?lyQ1
zz8T;vIqCWGpih_P4XbKuGs#6I4YJOJJiILlMhAhX*#kbX(jO%wy&Cqo45a206vVO7
zD|?EQffr{7ZV7AX$y*eV+_sQ&fH)tAU2YI2YXYj;smSNxR8@CZ!n-6IXT951c$-t#
z>BPi#VbKW?kOnmPDiYUqIv`LT1wQJNw#2+0IM=u&w{NjT>*M_T4(-5t6y!(}DQ(>t
zp`5{b(^}Xy9nfguf4gx!mD6(ebn;8Y84oXeXTls&GA2=jkJ{k9hH%u>!sUzOFQ>Pi
zamk1a1ko8+=<x);Fm)mSz=lzteUyFpPYSLYY@e-0L4b<rnqq=^RaxOvPSZZG5Qpu~
zMcPoC7>^<y)<L_~$^GWaT6JzK<y13sOlatKD5r><jr~Wk9@d!KCqzq~LpL3R!in}>
zEnUs;EEi^k;VG3?RkrhjSC>X_($olu6z<b*)kacrqsNBv==;yWE<Cwlt}Y{cCaK_o
z=|AY)?LQk}=C*R~`|#*geQl)yBual5_;<_8Pou`dlIWqk;)wtehLdB3CR@Z80(N(O
z$-q08J#l<4Bc*g&AU}5n6{)^K-+hN<6oh<}%O0U&ztT^1-ez*<BtIqVhk+H#VH>qT
z16$P!I9fj73n|SMo3P%sp>`I0!RBd<j$XkVX&j-DaJk4$KPoeGn>{jaOLvBRqt1IB
z|7Nus40jh}*T!18Gb6%m6DFg{D|xg*#GY+l7dAW<RA2QLMF64eb_Pl2URFURuXq4U
zK(xOou1U5oZyMmxhHWyZTD`Vj-nDh%zQWUf01hV-h70p>U?!#A<!d3?MyYPkPS6Ou
zC`pS=Ft@Cp;DV(wHH5qgb}&RpDclX|Iu8{6IR&m9fwcH~`ldD^ce-g9S+iNxSGJ|f
zHlT8D&yTIatDSm^@~x*o+yMb+fT(^mmIxueRqVMGqZ0+SpMdSXToZlt(*aR1Vsw~o
zc+me1?NR>N0+0HA5YT=Op$2~tjc%ApC8)TKpCGUd-A&rrI<zVPgdn}ep|gU{q1BK#
z{lqU{bc&1d`d|u_>LG?`LA-B@t2WScqPD8IFlwjCiKqc=Hq~PZ=DAkdCeNCEs+sFy
zFwmmv!Rrh^-#$9y1lW>b+MUU^MP5V~KB~BQbk(9h1;(|+j3J!bmo?ZyIs?|jI$k3Y
zMOOpdDvTapBx=!RKdpQLU??MB(~bk16&^^Yw$V0T3GTwqHTGB6VTMPsDPtpo2mW6l
zPoEIi4sg^#y1Eb<0o{7(iKeAOTNUKna~J~z%~nuGNQ>w5)wq=tDop1^J*oz#1VJ!4
zctd}PEv;XKoy*;;(7qU%hE?|`tpmd0P;XiVs^n-i3r4mJoTc4-<2d1Vvs~R^{ksK*
z&qsnJ+WRYyC-uW!TPFc3k<S+Mh+kLKRbzN_=4V<Hr<Wkwba2W#%(A^yT2^NDd1g?@
zLf*%zUcYLW7Oe<wH@rxerI9fYTw1)0&ZS4{rcJDQAzY-RNL+J=?<DkzFF+v_nBTi2
zL~D#L-%01z5}#Q+Gp-ku?Tic@_XBCk#j>K}x>m2-Z(Rb`<E>T*i)_BIbT;ZLEaHTU
z0!NUBnHk`yO7IipDMcj_f8aVVU7szo$>;pI<2I59fBCJOZ}J-3J}Xcco>?%IsI*rW
zbCXS6iAlri&i*=>gBjkvq%SWr3>Q_9hlXRfj2UbN_^wM09}Uw{uHtNy1K*kC0Q{?D
z5mFX~O*TbVQ#9#!oW<|rRe%KO_<}-^A*H}%xY6^+9}d*f&4NL6-2|t^1@fY%q@O=H
zmq6uW8LTDjuO~d#F6LR)tgZ0$*T$yuy;fRef~0NBpQMK5G!yr>p!Mk8qF(FI0{pnD
zfrjv`0l!A5#>v3h_%{)Y=Kg&<)NRsq#DeRXs|ZbS7S;+1X&PpDH*S6SJ>#Bavfu2E
z%%aJ#=>>7<5eF%-M(cyY^_pNq+;R13I4V&&lY=}#MIRQTZ3utE|LbT#EH9D$h_h1P
z)_@^k^$=mef^)S&TjnVTF&Qyay2Oq9Qfnzy^O1Dt&tM{!-#a}eCNfVd*+=poSe3$+
zvi`yKjMs@Du7^@(3s(3=flfkv`^gH|vRO!{Jy9Pck+k23d*W6oENKPP{F;TGDem?w
z*csqrCS-_foSFO&xwif4j@<5Bhj(291YngjEbeZb;k_~;4;nOf1bHuCOa6mo6`ojQ
z6Vma>ZjB|HFb^I*=zL#+rsolgYYG(!Dun?$b24lK`3$Q$@%&7>SO5it@fUQ->v`|J
zvDMy<KKsGG<-s|vdu)V{T0t-SF3VKt;MkHcHlrre>+SZSPF2dfmiN`91Nb1@8;n42
zTN*u{l&-N$H@NHxRFf_|*thsDM}re}s)BbM34%2{fN2Ms3Ee%X0hxu#6az^%IUQy8
zjimOl7~qX6-We~m?NzRjP|IHMbzny9>$x<nHRp1JYYpPC#C|08yXWjg!_f_xjEM%m
zNb)G#Z-l*GvR^xbvaUvQwc*h$>&tC|K)j|CBoO`y@-RTuFQ3g&!;0e-1ySyfLGI=m
z(m$=ejaA|nsiM$xp@Z`@@MOtcn1+!YbQlf#yvkfpnsRsr6!$P+7a&ukffbOEB%Hm0
zozUBFf|f)qe<!^s4mN7v@+t&2rO|w*1y27#E2mN498$P%-j(a|68Y*rQWJ-k<oDV?
z_g0l=)j}Z+v?2xLL7>>A8r7AYTw*`Yd2Y?gbt}GI6eEMWiP7k#vzUosP-#g6WyDq3
za*(goYUs2a<&7OUrkOZTw)AA$;tk3LsE>sROTBd5Ta6P=#<vfU7iElfr%q;Rs4pNR
zGY;1{ndUx5j_n`?IR7zDg}*o3^5%9(at1V>(I$06w_22rzNQwbUIG@wjV#oUnQL)4
z^NI;|$Z>4-K``c`PbA6IKLn;iyUasa?_3W8=srQ8zxI+L9mAUUl3o^OGc9Ca05b~D
z$XrGQtPrVxJdtJsdKR~$WJx0!vg5MQWyf2re;b+bB7_f?%9drj*%Q8&txQ2r?vA@z
zF%(FKg?nqUC7==*SOYFYK+MLX_$xJ$ZvoS<u%n<o+4yJLk8li?1Jw!BaT#OLVGELc
zqA~9K0??F|bmSJ>i||;74~MX>c-2r6NgSJ-qr4i%R~-$|dfbp8${A)ou13fabi^(7
z6Yuweb0OJqyrJ*AG;5n8H<FA>-BPyUgY~WB!Tfx&DSdY=fZS`?-xeP0UCD7axY}D-
zdh;M4kceLHMNd@ZJQ_C*-CKcy$IR#Wu)<QcCdq4+7>Os_+ljk<<hdHdx9_SaC}E*W
zoLkjMY^Q+K&t*<IL{XkH(1d(YKTpJ<v&U=BuWsyq`O9HVM$9_RBXU>%@FcirAks;_
z;?ORRc-|`Z*?kc2KMdZC`y4F_oYIk1l;z*Hvd|;Zd^6%OrrTX$6K~dNz%{v;BmF88
z^an6?Fl_Uy&K3<t?Tm5`*;G|AGF_1@BeZR3N%r~l{6MPUTv3$Pn+Z+$3l&1gwM65+
zIE@dQQcj(Ew+(w=D_QQ&n#sMU5@+Lk%8Z{XIj>j;dMB;92yJ2{51Pln?m|E$3g)gg
z23spR!-^0`gDKmgn{`s&&@jl^hlP__IpYO@MJD{jhOU-kuTob5j09=WpMVb8)C1#C
zqNk5x5f9m$D-wj}E^^8C-75IF*hYnMwr&|q8X2py$gJGcADipx#Xq_Pk|EWVCi!DK
zOICN9IGFiPbcYcp_E}C9esmjFDgY=8xP8_qz@pV>IZw|AlpS<L6k0&Q-0~h%tWP{w
zFIzRy+9dBR-=9&3OM>;f!Y!d`9PsmFvekMfEK{bq1EARvhT85(lkE|x!x`@)J?2B|
z&=Tkf%wuPC9mYAmK@jp;DigV7tLo=-kf(21X{ho=0~SdQ)cGeowHS#spGl4aB5GUN
zp2mW!*nKdM3xPWT=82`TG!g~;Ow=fpy5%xphEM1~Ktt`r?ow1J5h#0JJ}GKj;G9N+
z1t!X67$6tbJ*Mx;J4C;O&DNO&8sy}h{!{$YnG~}>IIL0m)%4%WA6+bFHoba(S7*OX
zV+1H@Zwmutj5!+{Xt0v#ang%IX3VS+Nq}q?87l&##w_1v)W?c?#RZ!(rA_vY%8out
zKab7&zc6@Vr#?wp891YJNvrb_Fiyu|a_IXCh^58>myLJ!VepTh)@Kfg&%j5rw2on|
z-!Y;r@b1*iDmW#Yj7l&Q7WFU_fCk(VYB?ddId;}$<<L)%p^x&0ERi+RR29eIWBgc3
zzMaEZ&7t{>cfOtvZ$vRGA+YVxD+d^N9%&T!V~Bmgou>sK16_)k+}2{!GoDX@Jp44t
z({DC6nNYMis6c2Y&oF5g#5G(aJ^d&n>b%IH(Mg9VjJ%bA*EobDd-wwQq^WqVcYwBN
zoes|Q{Nl##gMT+t$9;65PabY+(04y^wRX61&uKl!u4}g9I+x5vZ)%cLY~a|!on9aB
zqZY2E{`ub<zS&bC1#>K)xsG^ZUaCA+ut^y$TcE!*12D~!{rMt&st>1StKxgUT|dtb
z%f^7c4`9XxX~MsE1hs$VGa52soNfZ2SrWc%1)+-{%85L7uim<`l1zt}@FLRFWpOvE
z(=tW~(JM4~7^K($_Jaa)G|Zl;I*F)Bv1&I9-gYPR(eo^jFki*guX3?by|(-xr(%%x
z4;9W4ZybP4Hh!e2&kSVr)`E1+U=PP<tXp%+N#!Y86&fY6ChdC8ohc|Tsq>Cd_v9Ag
zxn+IFqOCHR|7zA^0u%tA3=MC}9KQL9I|4<lQx|cU;&Myd*#7HkiG&XpPWY=;So%Dt
zI$8j0M%|8)*5)7hmJ3>Yd^o#}{U94Im(wIPZ)XF1X}xVxit@Rekb*AucxJ*Ab#hgp
z#f2rJrc2-I?^hURr-N^+bL<LfK{6S4{KBxHTJv2FEuk!5_YkV4KbWQ)a*K$pU?mX*
z;AjDE>~-}(2Ar*^YYh}X0BFTuJjcw;zc!_(_jQp-Fc#qTN}OHkS+>!m+g2u8@)BM2
zjabv|dhuZCzO5E<#9ro#2&FSIZN8iWCt(<c9*h(HHZ+w#?yB@2P6nB7y0x()_M>%}
zqSFOLvN~y*itR{{J{&>VkSJy&CIsSJc)rD)Jxah3vjq>pF2Jps2K8DBuxu?LS|mb9
z>NlhOFapNfdrL8+OEw81SI(p@p8SU}M<l*C+iGw?ZneGXH8zqVtyF^p5l`1z1Ri^b
zZ7lZ_xUgHKkSl3E`n<6EZ8~Jg=z28|#w$(cRQ;uCWtG|I?)yrWZI>P|!8-I!-?wZ`
zR+5qfvR3ra(KtMhxiPgZ!h|K|zMgFfkqjF9>=!X5v^aoP=9jiLjl8^h3k3CYdo}qd
zGG^-aW4c#d+NS=!#APdZGCBPm4M&Fo|G>A$`ZG@V1Hx%Q>z(ssf~T}2!YA6=Vl{la
zh)|d%^{+dSfBKq+wPZ3i#+J5^2XR#a6cxL$qEJ3!yg4`gu785DkRxbHxqt@E8#qiW
zh<nW5u8$&!$RSbRpiQhm-<OKUods107{re~gW}X6n7}s?ag&B=ZPfA8#QG(2iu~f#
zm8los>Uh~QPT&n5$HFRZX*mLL`C+p{Ax7BO`Qhzzw0OAEvPrK21Y<gvW7N&w@C1t)
zg~BMObt0PKIK%ky>E#@tKyms!#ILj&{g@Gn@U-2kO(S%5_9$!T+FrDwp8wQ8gUyO~
zH)#Q&H5zH&|JRz`LzYSt%n=UByd{aM|L2%TW{A%PsuE6nERUTEbeL3Rmrt+7RIfJE
zRsKf(6awmXacUkjx8QuOFj)^zZ}nsBKsG3JW1!Y1jJmAzjRZ!#!jtbZ>LB%&r>@Ng
zI=KG&FQ`yzAqZaW$#!kAZ(6B}`n7Mv1a_8|id3e4B7;mhfX{S8{(u(dh6{`*K)~M{
zqCR1FV`I7#p$LnC7D8H%WA2SIV(appQM5#?TGaTW$UYTxRaacD0U^f&hN=A8{^|o*
z9m7*_Wk3^Z8r_(soT^rSjh<|uKLT~mc5FFe(IZV7_t7AAdCa<=(5k8$r&nvj4h@FF
z-P&ubnFv%Q*Yt-rJ=X*Fjn*4reQRp9ha$w_B2zW-3H};$_RR~hA~!(rXiq``PF%Mc
z_4Ekn@9rd?jwJ0aE4DX#;Vwp@g)Mk6@xfl<%7sui&bY^}Z*A7ar5kwHqy68YwTX4}
zx(aa=<jb`x408rN&ysTG{W8^#I7P_94OY(AdO@@n`7+*ZN*22&1NM^YFn~}E6L&cs
zcdomD$mc;w1<M1Rl?K1_fYV_(3^kl(sJ0VOKXgYQCJ7cQ<rP>%E{x2FLCDc-AOSB9
z-I>k?$D37JAFg|WxQ**)Kk7gott(9?1FUTZ#RhZGfT2=5kH!eld-L`>a%KS)Z7}?^
z9y;DXJXzu`2{2nBXCTl*jS26B1VvXEZUfu3Mg;S4m2p!=vOyMB{>$}GLzGx8>2RYb
zZ|L5kstPW&1I^maxD>%NkZi$?XY1m|it0P+N<pP!&U=<#3>jeqZM=gd?}K<^hRy{P
zk9^m-XRa4J!d?xR{?0_yvq_kp1mIv6N0C|OC(3#7I76Wu6)Nq^f7WO7{A_zL8!!*a
zp-8#%M>o0sYalXr_c_F#EL3zVjGqsa*wPawl<u;m>~S_iPkhH{F-7g8<*F1*kp!@>
zM`4!xruGdwO~z+Is%5K0^zSQTZH9HE#qbG18s-Lxj)e%zp{$daKR<>ScZc7t-Y2wR
zEFSB}5Rx#Zz^Jo&1xls@H;ZW^$I0eb+Paah<hS2e)LX*F8D*^irB9eyFeApnu3>2m
zt}m8?zY|DWuD3*1;JPg)g?_*!qE=D_^dZ5|iRC<dp60SZ!cz(ml)Nxr<UUqLZJAut
zC%C;>omABp0C9s;Crho52U)WNKxC|Q3UcMEutRC-eiRd~*_vEMh1#<6A|LWhQ1j7^
zTLY3f7f8aOl){}fMd<%cAm4G~Aqs==@0kf`NS1a9lP|tF{oeB&h<m+T4qbVQb6}q9
z2qLc^_VY<BsUM^9sNHVtxB~k?ftw)Qis_AhVW}E9rq<8nZ$*pI8~Fal(H48a4=nzx
z;>B?k;O~MMbCYpaPu!0FLKnc4%w>MY#^3@e(|Ctto&RggGHfDIP0Eg;;ZI8{E+MJ6
zMmiYWZmN1&=S7!V>e==r=#~oo2Qr>t@f%UdJs-wACU%@fI<m$`$`5=EZc&=t3o4oP
zav}^{r@g{VDs8VsaZ<fl<ygBvcG7kI#>QnoxoBh^(=TdnIKj2fM0QIyw(JLRR))1s
zhgoJxrOna-p(97ol;$qMJ>k}(!&mZ+Kdh!ArbcS88`-<RYzZVkx!DxHkSR7Ys`P+y
zRzTX15T6UcAs1R>HQ~`NaLyKCG+V)_2n^++MARUb?w*d>yKJ8c*t!zRBCL%jUp-|*
z`%#`(6oXtMHh?7mVQ`6Fbtex^yHIv@ixiLGhkQlw2>EWP->1OJ8{pElm?+4-dDG{z
z3@)ji1(HyY_FAL{K(wp3TsIp&$i4^VRL5aL0F=M)PBxm<9MP6Y*4f0fG6<gr(ma-h
z$B>6d&i}tN^Uor4L5KPgxNPKO3a6TE`F|8|Dp-#b{xpbA-)al$;4V-QR0#z1><0|Z
zHP_N#G|x#-KC<f5{a*C&u<Fdp>_m)y4x)MCu)G$OdlunAfCM~w*)RTOC<c}a&U2Kh
zQ3ti-6QIh0Qa12w!N4qvO*$cNAALQ<TAC_&0I8=NNC};ho9XzFVJ5c>$crfsP8712
zOrkIJ!rr)NFz){6G$!+qOKnExWfUT>?hosjk@p<DUc%Er)jZe*cDQE#g^!Qzae-ZB
zvSYUASyS_$D(boSp>n{|9hNeOWb#x&^$*E+%qc4yAY1AAD_`Rz&&w_Hpl%1a1%Kas
z5Yhl)_7u$Vct6rPB;x4Kh9aYhDTbdS+55JNMy6$dY4X42Sp6DU%LRJnIfOjQxwysn
zY8e`=Bzd@D`rQ1f)Ppy0`NRA#y<5&gl{J3F{oHj-PK=(Bz|Q8m&x7d~;}oo?zto7{
zRdH|rXmAxb5*h>0PtHV*@Sv$%AmEj>)j->xA+Z#j3>=6vzvD-_#@C)xzJ6@&sb4j`
z2vYs}nlUA~V13Xu(<n4muv7qMCBbRgi@(%&m^)zic`1CCp2S#=_PSjKNFN8QpTY%T
z`|(XyUWgsNJ&9Tv4fQ~7^qH|f?GtBec3D@o_lEFN#Z8`mjS3_c>=gI;Sld@-hrSLi
zQJ)f}%G7F^=R=UsVKfHBSUCB`7YJjA(xQCL$6NTMyNEK)$()WpjY&390O%l>cNciW
zua*ZLFRatY8v|C6Ob5RjP<oSRRU+tLKHSc{8}=(uFpN`O+zwaF$<?+A6V(ZIO$Uk&
z497S3clren1h$uU3)7?KaK?~PMqvm-$mUkT+Y=5Fk?j<ji-q@qCN*I3x;dBOj*6$1
zfP0h%7N&+&!vYi8OFc8w(Ri_EMNeKJ@^BjgUs3aeu4z9vDI9s};K9*~UP#^SE@Pnv
z&|R6#Lis=TA;^S*5Q~xCHXp;=nOh+p&oqpeUCh(fUCf;S9CRy#BOvLurok?G_ry7!
zKv&+TwlQXe^7WqwLFV{cZm&5y{1VzKl*G3a_L=^kw+A!*T{0FH{d{-zZf;oIk|xcp
zzY$9exgmp)Zv$Vz56D#c_D@J>mw~QD?9e#)TOGI4{m+L$bVJoLyJ3$b3mThCVfO@t
z-Air^t}ra!nD>h=H!jACsZWmh8bwWzm@GVkGSKsm;@cb!@yL^?;un4vDZ=a~JD=;U
zcR%$E189dncvhz+2v>#aR0$pX2~pPABR2AWtv-VimAOY4y^lbn@hlrSzaXK_0~9Dt
z9A^LV(=GifIfJ+`{U9?$&t`czN$U5^df?ys=T75Kz_s~5z0eU0JqLO5&D7YHevc4x
z%(`4eL2mZHpSyVzW{6JX$c)62CYT0W2%AH{m=c{m>Bl(D*&V_D0T8ICz8`i8X3`D0
zx=};yI3yi#jLdjyfE$8vwB~SohzD^R@aUx``wibIb5Ai?c!n5Fz<!}B?)sqy)WG9?
zlVzDPOW<;2<i@o=&v1Uruf#!LSs?q(B;M+K>HU>WT&?GT@uPc&Ub3jXzJ>Z)sYRsY
zR872ix|-m8>V#Cn7J9Nz^oxsJ{Cty!agZ)GYtv`z5C~9tNE>Q%?FHo1rl)Q_l0r6?
zD8kwz8JU94l7RUPJ1**78Xffyl0|~P40OB+!JMx+^1H{LD5$db&gYOlwAF?DK7Ddg
z0vuUTW>bNy@wDV_6Xrj$%14OtK?XKWBfM@HUCeeQtK)24!!m}p34*~F26#5Kr;Hki
z*bd;1BLdU(NVAJ91;xA8C(}ZZ!AEGqS7(R=IlPnp|8Bl$1h)DFhxj&zDh6RkY@jYH
zoB5YS12v(QKb?_;q3MVzvIJiBFl@9b<K|%29tmvuCdvG$Fs1kRf*wYM;*lfOYsrkS
zJaP{oVa|lvs!l}eWYo$}hxCO*O<AApT(6&)b!9}Bt=R@>M564ldN2-tiOAm?3vQvH
zu7uI1+e0=eKa))8i%{*gBGcAxQ54;g96Ow?J)%hlj4Srrr!7sdZ=R;RxQm^xN1?9N
z|3EdGA|NmE9q;-*xDeBpU(72aCLIa6J(g{3PNi2}=g}ztp`72p5OhArp1E!*Maceo
zHVzZ#;l=fL#cd4uwkj4`8+(0c{2&cOmESSMG8fY9JUc7e-Yc3TMz^5((h&1%sgRfV
zpU?30Ujt?%E#^Vr{Z#)x6K_S^i^Ko^{H58Ho~ax<Q}%~w<Zzi;uW$X)=?#-&0k($n
zef9e;mdlRl)_F^#3k=@L&PPd(d{2&l+mL0z-Kqna@ygf8qmqp8hRny?Cw#0~l|uy&
z*e^{p+c`E<EDyG<4H`-%{01CG1NJMtCC{ErY&+1T-4Y+zk}jE${W?os3kYriQMrto
z2Z6Z7qqFDep<g_%iuTA9UX#zQ$f7rbya+%&xoR_LOqs18+!f0vm;BLz7oPbb2oGZt
zTG{O&c{ToFN)75}fX*Ezk{-b1iAv!0wW<+f2oHAnGXv7=F{Ahzmz{%~vytVt=e@P7
zANs8uZ)$XjWcf5w%qR6R{@$JNsA8R4+QG*{|GW|t_merOftY^fT@)AbP*ibO)~}c{
z27pYQ(~f3Awav-`mtUvDhxD!al{1~Wt>Pvk>hvb`A_R#hMt5GT2@n@e4wuh`tvYF0
zl;t@rF+!y%1)L$QN{Y>@m_$&JRCh|_YusnFkA9qOfxUR>NeQA9sI6BIY%<wM-iT&~
zyw@$0$n#nxnCgG2UkK^%klfX67LvF|I-t>e7A!KjA_f9-^RZ1@t}440*riaX21(!x
zdN+IqYkmgXB&2Q}`Nc+M;dkKR%OzSy<1-j)910pNzBy1PbMPBRslg-ThwrPK3wMU@
z6;C^%H%QBdR+Gj6KHZD9uKVf)glrc4#Zj7N(2Y4mJn$hwc_Pf2zQl7m6q44A3{xPB
zqTW1GWCT-;R+$BkE=t~bam#BzHrmegTA5(~1B823u~7qmms7%eiVgv-GD|2V*#SxV
z$!JB6yN=Vz2mq)xBSKluxIbc27(Yt}9G^qek`>zxl{56U!U#nCMHI4JSBtV<{heK{
zNh|%e&>x<kLR&~vnh_MH`ZVP}Ljt`q?9-;c3_)g;FBUM7iX2Ynue+3uBZ73q<eNK?
z%EQ{hYkGf>6O-f_0`MPTm&Cee8RK_KJOcrG0$A}LE@VU`${Q&Fi%+&Sg9lw^5VKY?
zLj1o+sj-GcCZOvUXLV42_>l=&{M|Aem)`jY2QNIEO$;KR`egpfUjq7p$&O(t2_U8K
zHWdZdaST+KD1RlsR4E(~D=ccjWRxpmHN$+wy<XgZOjv<!V&jA+<I7T$SY3=CR&BIj
z#O)?~MG;;ykE}ib7{`XzT<35QRYpPP@}gYo<MIaDGi9r|L^NfGrafhu*w7~pBa>ee
zox@+<={({=w2!9>gR)5iK=N1-_SND$Hv3mKCzXvRYZ`!z(JTJLXL_%|xIhAN2&hzh
z;n8(i=}JR|%RlkrC(3LtB|6G&>ZbuCIOd~JC9z2za9Q{R$*b8A>pI11XCB@&;t2FC
z;XVARjY6!ut8hZKc)orKDZoBMqRh<(yS1JnlMI{<POSZf;xfXys2Q;le=45X{aLJq
z+)Mhm1i|7}t|M%gLjQ+6j9l)K2a^gl(<+T-pMk!K39JjJcg*7LBDE{@3>Lt~9(0=j
z@`hct^N|u`goAYrOQ4X$AbO8jN(mU8BuH~YCUj_9vTGP_ej}h5k5$A@%-Y1jK)s;v
zKxxLiB&iDr_0Jc)*i>H+OOQ*<a|`WZ%vq!*HKk%^$5I_Rf5gir_bhIgC7%{+;$&s(
z=J3dsc)^Z?)~WL42VM<{lg!_e4jWkx5vK?F@^h0!vuBL?gb^fMjL#|?-=?Q4x*{F%
zXvsg#eu~;0J14A(YQDr<M3iyneI0Z;@T#6hwhc*%|J}upW?vJ8^2Ul!jXxXbj!s|g
zj)(VvT-%+_?QJ*NQcIQz*R01CzW}gIN!4y5_!<MBi%exb?Jt)zfVrw@cDyCZJT3r%
z(d}8`@q75#v(WJM5J~+Cfq^aDtM>8Mevov01a?(a1Vs<{PC;v{$yP=D=EKQnFh5bC
z8=VFVlWbz|Zl}+{PS`;>*$FM!e8X$7&WzT|R{#C41zN_OGMdBrM8Z?p9amKGmneBa
zd+W_WCX%9Cvjq-_%-se|Cx_;B(meTM0Al{*9@qwtwfLHrSecG>*#GUklbO|yP#kSg
zdW>JY(l-he@(Jg5>>=Zfo$jWl&L8kfqnI?eQU#5F`)-C^RDIV$@R}%)84u<mylD&?
z1qsff`}K09ny=X>t23P#;Dg+3_2M8Z_>~nn6-dI##6bw0Gx?bW3O8Yk1Kz!aR6<$2
zIXhnh;rk+3WBtTD{WO>5f$PTWnZnc-^&+-6J11G{j)w8o#Iu(E<d@>1;RFQ=`kwkB
z9p}57YejGA!pVI%!z#-~aG%Jm7ST??3dNCRX<nX|50$xP>^9biCDscp%HuEjZ?o^k
zhW)T1+VI~;0u?EqX=)e2xNhoHDO~?L<EhLbffFTckF?2}Dp7|lGhh2VbuYHYOE1k(
z@$^Q(Bx>^`;Bm`@Emi7ZsrQT$B@=6e*yPIls8555X8A7|8}<y<`O*l()y~(xlLseg
z`>3WqC6lu=R)_?QOIIINUN6budBt?n#B~mhL&!;q-74GU$ev`o8QJ(#71+^0&1uhy
zz~#q6-4KK_$XksyZGR1MJbBdPI+LBxh>+*dD80jg_-EL>ibQHRNMS<TP176T@Bz9O
z69(YH(F?A5RgAN55a5PTH?}T&hK(IkVi!i;KYOyWCDojw#()Ef`?OG=laNkADa}51
z>ePAQYal|wLiRJ_`~Pi))%W^r6js2I=r#Wf`m2zYFz%%8bF;p*stSY$@5*Vjp3ok1
zl6OQ_dngDw>^yD~HJN3V#eV*i4+J@*?27cq8z?KGz?)yJSkKEXly@xPgSQ2z9zQlg
zT0NMFzY=UB)xyrxyyF53ItV5BM8smeuf52Qpf0|oNTz6nCvjwHkaB{8>~O<8H899J
zU-2OMu!k40J*hnz6#L4P2foWNBuKzIIe$Bi`#VN#^s||Qx<&2#V!=XI;@RN}^ZpSx
ztCnsX-`}qwOXXD_$_sIItmYf?i!C*8>4w~p5p{InW8YrA;C2FD$QP-O*~4RA%+G3v
z8Nb^;lNZi#J$$&xu~{rZbbfRfdb3~C1**3}Cy*L88+M*E2uIgRu~gz94Mf0_f~GQ>
zk+BvarZ5MEij<m)3nh8<W3CwONMrHB0bZ@D`{bjG-GdE@C3nYeHPazpTRrwuN8YX7
z{H1xStM@y=QIl&`?j|Qgw+f+B92-Z7*OZnX|7?<~^gYmiwF=E{ATJ&jvcBbU1>pgm
zCA+uu0ndb4ryY9=pM_eFep$~e$qZn&Mf#`JqfkfffdiB9zoDE71;1<Uqpk+3A4<vk
z8@YaFP}k7?omM-bCVgQ>YsLq+4O1guH+0#|o(Bn})2PS}5ei<(f3iF&um4JN%^=R`
zEBdY;U9KUJnilrw^101BK_y}*wuRZbDAl$qyOh9BoDvO1B62pN#|%9r0iMSDTh`yK
zc-7wDQS&!`8E1ZAj=FxMCv_u6+AUP?;5G#=ErIp$`I!TEHz`~?ZtyN{36dXswfd^%
z;|&4iaat;g!k<$kpgex-h1W-lpx@VxHOWV>mXcsQF+|z?yv75K$A|!8S=CsD!gPlE
zemPSi?bL{8s&16DpYU{<FZ7f?_OdW6-ADdk7m$WM?qfwP{D@5Z=mS{%m}xrK&6?YN
z+aMc+rq~cC#BaELqfz3-I%8>|!1K_{HRQ?}&P+oUXbLDAo52B0iUGLpMxZ$EN51+{
z@0|IBJy8ZQ!R2#_fR=+XR2uA^`|DS$eaS1)2U0qoA7RqD+7fLXoM3C%r)s{5z5;I@
z;3kZ7zst!G((s{YMXY%unjR+JH^e=1ic~R-qv2QM{IW6>ZhXNAz_Fqo34nwm^>Nn;
zP3n8ph)rbk$%zU+><Z@zsdPxrdAnBov;WLXe(RNIAss1KWA-_E>Z2_ap^!f$HhiLS
zfc>W3jOlv1c4x9@vhL!S?C}qvjV70EL3!mMywJiUwAw!?&Dg+_9G^#rP8Q9q93E}H
ztYc6aQxQ@8Q$gZixD&WI_Sy&%mefg1HKjPclXHG8{iRL0C?)0?L_vdR`&Oe`Of8Y<
z@WpQ5uuAHh0>Pm#fC8#LzvpK4?ojpyk5YURLn~QLU4+>=Hf}j~QzUX=J4c6)1;sT5
z9Y(<MH7T>*vvyDxyuoyZ;3yi$2+cmSL6H8XIdmOmRIs=;P&(=^E_>!5IP3jn0~9WA
zv<^%a<7fxzZ0@6OaUt<J8wKi`bT5yl5D6nS*_bB)uZTB+Lru!O(Vb-2o`i71U?&_c
zTH&9}lQLymmnk&|eJF)NU;dh6bopzG^$>>^gX#}gs?XwDOwVNrwQg_-$S~tnFLpU|
z|7oGa@sNIrEa>ob6x(WQ_Tr(Ic_d|AfoTr$NuFu5@Z>*u|3l=(eE)W%3!<z}4v>OW
z+T-)6_29fqbAv|T;KqNZ1jjlFbg;cg6a)MatQyy)Y*W+5U&=l1DwulRT`;ouIBY8{
zZCJ@>(0H0cWACtewdfe3V7EYw^=E}*$jEaSi05g4l-SR%rFn^S;Xo(LH3=l@WySyx
zzb-O%OI0vvG8746pBNSr^@v!Da_B`^NaeRnW2W7nTg3%0t2Dy``!g!Jhn>zBWR2?`
z2gQQ-A}<z`*zoI2MG9HZ3KUtni*gIFyi0!eK|66>vl%1Jh)3KK^roM5wQ_#<a#-Zy
z1Q2ct^n0E*J~P2@O>$@}zG1HBnGJ_Us4N08kO?4p;0X_$FvXG=9^$CPGk0QVC$_qC
z1oZ*$ltq5dOAo+=V496kU$aXx*8nO5O~CpAPW$C5b$$6Fm!xrXb6tI^;ntEtWa3Un
zuloOu&)+zpQ~nWaQ1tu%6CUhuZzx?7)buImrpMq9MUP#Ot}&vvW**(xw?cMcN;oOf
z+^N>yn`J+w;BC8%C%Sn2F*FT$@>=>-<VyIM)R1%%_QKteqpA5;(503A>6T<M6s;V(
zGN6LrRrVnh!RtdhUvJF3Zv7Fvv)k~tt`1r)kzJoK(D@-7kOx&{rO_*nt@rk3wPnL_
zV@oB3LZp86Xer5a(RR1GK|RPAv~!Dl?ns*c14fi?vz0rX23?7=!qp>}i+6N8Oao<T
z#5VvGxu9Pf@@V0MKSN(&c7#<YO;OY%He;b3W-yad*#7~zFK_ZnA#4M!MFY+k(9fN7
zl<b^Y#H5KtucVId@8&W|_9|=hx+bLNJqCummv@*P93opZEO@!ww+3H#UGl$N6zVYC
zf2_d4c`NwSf(GcPB(lLY?%4@vvKay@o03uD%<)g{HotJNfiZQtEDLnr0BkuT!NmjC
zGjFCc4^3{XQ~?`-5$iC_0Fj=c+23nYDlcD%D*{={2knb&P3GcSJ1g*V1`G~wQaN`O
za76!=Iq!Zbf`r*x^=?7E8<}}Kwm80G3U2QcZf&^+o_ZbwHD;=4`Y9iS1!|nez+wQ@
z!{d97iU~Dp=2T&Y&K4roSS3g|>=?lTjclZgKZ)}!`HR?DpgIZTcux3WockVZh=3R^
zy*P_9bQO59%=Wi*_{`#s-*Np*m#`9xHAXS!ju8|X6H0jWcGZt&)T45q8KH9+GCsJk
z{Oj6>7uyl(MeW5=eOE`tZzsPbO!&1VzTUiHcMmlcibLe=V3?SF?8(^<AXtHO2Zs~!
zw{ApYSvE#Srjt&u-=A&7M6h4&a!WQF5YXlCP82CgSgWAXI(jM3?H>CEjP8z+KBT;&
zisM~bp`(=WrHaY<M0eFkz}5NTGZQWnH?!4#`!>GgDM_x7a>+JZ6k4ol>%x9AJr&fD
zABO({&GJNJE%Zu&BI&?$xslW{mX*e9`_^d#Dl$SciBgiX?vY_~K2l1e%Ta_bBwK}5
z8|}|w;Qsy(pkl+;6JsZ{4a~Tn);zWa<-m1sWcybop=N)E!I0k@COwL^a>#>40Pufi
z6;pCLJA(4DVab^*!$5+Gp4JXhUJ)(^2Ial3@ir=zIJ&3!`<z}+gcRfqZq@We4zx0~
z0p~_`P^J__xR?@esoJ4J6`(Sl1o_$R0|^#02mnL3rx3LxA89xix&@na6#0~*8#KlU
z3D?F+&`iZ^5fMK{#j56{<*5*f(indHSl*2!V4~wjk2gw?SB80k){_xiP$lB}iJcUj
zEfG80brL?};F>pvGo6pOqcw)g%(~#uYK)rNGx*ik0sLHp`3JR~9}-wYz+-xk)wE(u
zt~xaTo>3lda%(8#Xca{R+-eRcpJ%hJO-!{qH*p(>(dq*v$gATFNdrb7dS-hMT-rN!
zkHeS64BG;+gHZuohO&$PbP^a}v%;Cdej`W0W4if^b%doa)F(=R8?%D$3>U>F!UI?~
zvJUBD26+NCeTzaJ8)Ef-96D;48bPA|y3*kf=Uv?l5x!M5S7IZTs)^E-WmX@kFq~-J
z<Odg+X)$Vq;riy8JR<i8nL)|YIhpwciMSX6ehG(|<N`FSC3<;KKGvHC{Idh(fCJq*
z#KA8&#f-=pqU(6yIU_$unMW~xg;v>XU}z;i<>`P<sA0-sqV7Az6VX>W-XLta8M6O8
zB``mu0Lczt*T!~K^#$m8hTS@Wgq!`PR0`7<Yx<n`MxW+{la{}X^cG7ED3EL#Z_&>|
z$i4qPtg>6-@;Q-;DLCX(AHd)%B)(bk7jkN1D^6gO#YkvOj|&%R_l-upL^ua5DQFjb
zjaUb?S#TP>*Y&%Sn#@DdQdTgAWv>Ip^!UEVy2gEHq16bU^?6m@H=p`)>z5Hvd91R&
zx0h`BcEESNBT^yXDye%4lmff_PNv$>erfB>@+SrRPI0O%nN-`rd0Br)G8vc^*<?&}
zzBuqn=GrFS74I9lO8=B1_0<Q!WYM7=^p64rMg$}9a*$69w2xSqlwsq0^@+v~xS#CI
z@u*_if1S5P18>(oB<c-qVBP|xCHh><;*;rGvnP6VcnQIXJ6~QTQLvSXo35IsAP|?A
zww#~ZAwUebXYal`2HHEa_-v|DzgyCwkr8ca`a&&zShv&jB$AOIMaV^H8`7Nc`pmab
zCQ3lV0b4(E`VW6WzBcwTx19wphS^l=F;NXzHOJX>1-d}7Rb!(=q*&<fo3OpT*#xjW
z?C4G|Ey2{6Oq%3OlT-v1Q%@p97h8vyh(jJIN*;m(*nu7*reK(7SKo`w-@832dOE|)
zlMRYMyh#L+8k7F~xe-rw1<wwk*s$2e?y>-TZUrV^Vqv&$W%NN<VSl9R%id76<2V)?
zitH0AqaCp6ok1&j_N8nP7j6T+Gz$?LzF4{7<&(&~T^h&0&L3M8n=|fJL`KGq>*TE~
z4NcNY6cXtBc0e^W;gdAg_`{pO$|w5&dKlTUsF~(CO~;C3{}N1Yx`K!Clx2l*0MaTU
zZ@RXf*$Z=2#-M&1hEX*Zv{LE1?U}HCb{uu0^$+&dri}oJg}N-6WrSys7c%CU3%aFS
z6H|ssHZ7o-#Zb8(0JQ=NGHjp_9{^hz_FWcZ)JsfxqW)$wv+<4RXJe+trj%)I>5+|$
z!%1`1=nG_ZRELu9ki)#aJb&&d^%rhx_WWwD!HgLb28Z@lPH^%s=QNB!w)wlIxcVUs
zhr<0|OlJ(yJ-8)oDH|dSB>4P7?oah~qb<Zy`K!}9ClDPWp4xh8-DuIS(Do6@lU#SX
zL}T-K9B?;<6^bMNhy`6e9;KKIt81szSn5-c+6S^G6Qf+L4w`uT&@P?ZBMm=Z$pFXM
zR>;ccZQ$Q2l%9%a|9}54TTnU#YS&*1Jy{A{M$fX6Ou~}UM^E)41yDoj-C+6;XSVVN
zO%}}ypKDH_2cToH^#>0ywMEf35uqIr?DYwPw+eMkcOfC-oBz^D;{~bxx!tY43A_f~
z)?qWG_m7JS)1043Q^mUsBHKE~gCc`MTuje;4j_(lw@f^gNa}8Jgdw1NwV9}J4M()9
z*T-;<jzOAZCck9HkKu-8Vo{e}`-?3OyGDM=av+>#-^~ikVUsW7+lRcPQqS%`Z()Fc
zn%zLUT^AtTUCGepQA@oMvD&npPSAw?LwlN=&ZJDeD-ca-pt{tAU1J{st5o@oG+zCB
z;j?YnVFHwh>oKG&l!g^m@{O8?83$BeX;>E?wSoqNrV@WQ5rIm-JVeXj@zA_Sc>0%;
z<{Av2Y!wt&#?r!=+Y~%{CpY4L@kc$<WL7VPof?<w$OvQf%QszI>FB0Oa9WRTP2M!)
zeko}VXe<eiv;pAb99)jt>*U;}4?>HpcLeOTmMcazJkRlZ5=w28i4P)e<n5Nt7tN8R
z5eVrBTdKOi>f~=wZ-8m5(9CAGBZjIoZ?<^SIvykxtZ%e&uu;%<WhIXi5NaNQRR^4+
zjm=8~xQD?!_$bdUtl;CI(UDc6NdR{FvQ&=AC`+QB!KP`Ovv={23$}+oTR|W|S=2?o
zw7Ha+M*CT1G@*LQ+omw_VCR)rB@#hGpsLr&^$CsvP95;76idFM;5SA4!u~6qI>M|@
z2?j;Tx-DvMnNI3-V7{8$DR*gO>%gVoMF@QQ+~8YQ@<t!n<RIX?y?#)uz|Km#93Wf_
z5VYs1QeExP>CV|juda{6dN~7}Q|f439$d!tLQZYtXSV6MkQe5h*Uxh8#9I@9v$Q(O
zj;5j}Q0t!k71ev=KIp-h7^Qle<#n=old1SL7NJ~8kI%s3>Bb{ws;t_j8P`IG!kjE`
zsG%CT<aWZatyP5IJs7Z;;prE4gs3IV!2>pFGre>EfzF#g^wmGmN5hkqM<~X1AS(fR
zWqX43l5lTa_uo{u%JhI7o1b1e2w+2O_^OVLJRAL{_=iO0hhLaTQPR`$jqb{zn*X59
zRDOhUS_*5!5D(PHkJXU>PeBti)EOsk3ohnh=c^KLo!Pi!O-S~u!>!Wxnve9Z9~Q9%
z1McWu_v+01#4DiLo%Yx9&dlRDC(G6hhB$>tZYqi?RPpx(oD9D)IsKxt^wA0Jm)jPN
z!9-hc3`cQUDaSjJ7ANS!z83jIrE{-hpJj#zR?8OO>hp&Z!y|evHzKA+H{wW&aaoX4
zocPAVb$v<|J_%FiKklJcsT-s8Zd<h6k4gnA|L0$ujaJMYmLD@!b3ek)b|P-xrwJ!`
zUSQNMK9p%%P!cYalkSE>zX%MvnK8Fq4TqvAE2)i;fSG?TResSfYBb-kr5VXq5CDo<
zH0Ecv)_4nkcs`4Wh2VudHMziQHc1T{(JD+x!5-Yc_ihI)Nj#EeN=jyL>(IE_L|C}b
zo-Dq=F{S%y`Xs{q&J&|hfz>$oXuoUAYSN>j)*UysQMqRR*3<4K78#|)qRUCZ&cG1I
z@^I^*5ftc~hQ)yYbDNqGV}YwWuA%HKV_`^0NgMCs-{De*gt7<f&oN79;wFYpQfyx7
zRFFeI4*dhP9Drqv%`3C%s9>#Yqks@iHlbRNy1qAalfotNM}6fp-ib2rZ+ztH(rUef
z04S-VT{}UTd=&#ZG1e%`{Wu1CxrV-Sr*TI40+u5eFltJzP802_gjdYyGBEVGaE%}e
z(Ud6n>~}P1KKjR!8fraIxvB|J5c5j6=PoEmQKSEL72v4=mGKZK4puX85Fb^}%{3Ii
zD^i0YVShGg>fOd`z;J4?<2+OX{i_;TJ@b;KZdj-0-Ykc>qA23%A%LLy@sRh5(T~6a
z3on>gP!ChfF_&RiKR?fn`XE{@(+W*@wYAxeMeEPnaT#|>`($ysyTR41_n+(4cn>Pv
zGAFjEdE%;ji|0=W>iFE_e{2c%QTTCl`_*TX)c#iWX~3M5*>i7@1dvCR^7E<a!h3*-
zlZ%!Z7iNzO7-tYs>@^bekvAV~Tg+FpiMUfh$+J<{@}EFRd7uj8Pp{aZ9M}cmmEaF@
z@8KTyX*az=89uWf6u#o3>~gBS4Ir^9a&5=}6#bUjOGKSB4MB#p)9+8O$C77lP$+gH
zWF*jrIs)CpG=YC7v4KC_NJ`TnA3)7542%Vgc~+r+Ulm=b4$4@T8YNUsIcLysAcAe7
zG?InX>JJCH+Wr@+lhtO7r4lHlz{gE*DeOa%y@)Bj*A!*xYm;d!AniVK>V1*1%N%Wn
zFReJdm_H^MP#NPpugBijvyuPw)RgsEBzlNcS8K&%3p&r#D3jM!4ZIX%uTGZ05d{Me
z(25t)%;LFfgK<)>&nG(fpd(BCH>NAW_a=lJ?7YyP-0WG%T}hg=_OJ9iu;uR%5G0IE
zowT4L42q~S&!1(?Sn(DhdDw-+lryM1bk0_Jxp_gfk`|)v&~W{jm^rcyjE@~uhijh+
zP#|xCNyZH{c@_tG%ta*KY#Lt-8$5k|xHm$IJrTPt@42*_#T5c6BAeHZ3~E&gu5lCG
z(h<ucxp#47&l#R1*papF$6Z-g0c>@TF9-}@(-kd>{_Ov{hf)HVZXibR-$Aqe{IeR?
zh~gPdLVgWT+Pf*rZsP`n4a{R9tI3#lM3}%cJrd?XsFwrVI%=fg3Bn4U)<m$_uwd}l
zRSGTZnOhu6USPdLC?FoG-Y+;A7OZn2ogPexy}Ufh73X6>)Dv&a*DUMs^G`MC#Wj)N
zo}J*~Mn=j!x|*Rkf&q{M#&hV|ulLlo09u+eT6DD-;>$sev*vxQh%~%I!LkJ6gez+=
z^t;{6vsB=lUefl-@CF}255X}UzS~M^?DM+nsFp1^95)eDc1&771A*Qz<%$l-`8+`N
z>)1;$BMC_P4WSiVwc|o35pd+q0bFmo7<6#|I<0Rw=_&pPky(yYgpfZtltIoycIzl)
z{Sj{Or0{O+8<?qjLVWTEfh|v+Fy7^9;&_{_N1&EXJ9g;QnzBx5Y0(6FWBbG_vel93
zqn9RVT!oKlN_=ipkZp9JGa}z5DJ{>%C?cpdmgIFW5NRvabf&tvzx+L|vO6G-6lW+N
z9P+%kgo4Lxtw+QUT<`G01Sps%FMJT;#-vYyf&6PU*7&x+EW!vIcnR&YQoBRnHWJI7
zrg#iKV-RP$&^?<CVekf5AGjT)YKG}>r*8*mhWT5FT+;1XjYrvwuPXjh$nV8IwKWQT
zMHeAsV;$Ov@mX)m(S2o69#b<TpuSE%u{}JiT@vy&#}KJ44C@2z?(I&(jAkeW+*9_O
z1XwD}1K}_@0z(oiJvcE$UN&l)R*xhG^k~0PBHWD7X70STXA;E7GU0UDg6w4!PQ1>|
zTvoDBzrD5|GkUvqa{-It*~E3M6J;ZbSZ2~dgv>{1*zfZva)>Fix^?2-i6Jf?`XDVb
zBfN36FkQ|3Yq2(}dEBpj!_TFafDaW+degGsDD1TTh_pZ`7M_xTt625WJN^0Uj%^{|
z@!`NS;6(LK{zr|1Vl=@jDGWg=fU(7+M!6V=&0Gc)g`}P+0M*0q0|WH_AgUFJ#ZL91
z;~NO<$0ksn4fKANH#<)runJA?w+qi<ZeaL&OJjV2#i>nu4E)C|r){L|gav)9#vAw>
z-3y*&Cg>{b=I8jY*4yXJv)(j)R@L<iRPl;gs<cBJ2$Dmw#4Ucch{mL(HY6!yq(WCX
z{R~93=&!Ta(Y5_2fv)3#68jfrz`DmN<BA`8XiLpH3<0GBz4)Ydhaf)E+xyw1;{e!A
zy>jF4z`Bh3uPJd=H)f84ClAuuJX6gwm=loihQO?=bxM#hrKc9229jyZ<pk3Xpw4Ik
zt)HBeXv6nzFMj6*6W`28M|@>8J&+Gj$OZ5E6Ms^|!$lISWV6GdS|_cP>M<GPm0LPe
z`Mzo}N(;iisJR}~)ZbjP%3-eGpYZ2J1P_xEL#LD)*acV!ZqT}=zF%Yc+{cvhTRr|g
zoYB;x(uHe00GU$GH@10W{%|$KV@O@gO(JbvmHhBSJs26-Y&>H*{%-FdGp%8Q6Z#D@
zgE$8>nV6qdpbUn1023~y%|RG|Y-U1D;Hp!yoJ#W_7kK=p94IbsYjxZ!8|E!3oRUb2
zIFro2sm2oN{qU1da*A}5lBEfU<X4Mb=q>-O*hvpmaDGO<x;~oG_-wOIUnQ2(whCeu
zwK*+7oK+@nl6s?t?1R*-TXBwY@}_6OQViUsIvmTjyDhp0ZnVh#MmB!BVd0$e?V!&r
z>@L0wRB_SuQ(_As6yN9u5G4(UfRHxTI7bYOpjv01b6?deH}Rupd+mcV#R3ly(Q>_}
zCufh54zm0~6N7n{-g7{u&=}%AnNS^p@%wg%x4-py5eeX_)VPgEaQu|1Y+cPOIeCn-
z0;q@C{fR^WM)%;~Wei6pU2)iA=Ts`*tJWD^d$QW5D_$g2e~U+93Al3=EtDiK%5B>$
z2ca=AVU?M$b1%5bh#2lRq0FXaRD>9ju6tgm6_BhSqc`rGW^*=!HW13@IktQpdlSBf
zaBr3sd_od3b_ukg<V+KX%)1tU-ErLT%KQM9r)nUsNnFunwl^`U&{-cijgkvthLmab
zID?X56zr(7+Kuo<$eKSLM~+m;`S)AY{%9BdT6=e}h868atbu^T4v${9fy4G~hV_Lu
zhZv?wm$9aEH<kB<ONt&L<uA^iG)ypc%#<3>q&1w-BZz(%UJ55R$4^wZiHHxxFKpW-
zeSxv<xizM75<_W{%7t5T8=@iqv2s{Y$J0Ma)k`JykFFQNtJTTRx>nenQxrcGjvD*j
z$NVq?m%k>i3zT7ox%z4V!~RRjDs;9(TaEP2ahe{}J!+e`UH7{|!9ZuM^ih)TSCw^|
zR6wWfJ$*Y7gwVesZJJJBg4e0m<`Cm76chBx9|`a!1};y3-^$2~_`>Rcb*8_wIspys
z8P0c9P8`@mfN_iHI1tjmooa^u;Nzb{_&WX_Y7u+H!d4{rJX<xd>qvIzpHFjU)@vFr
z6w7T$pP?D4GEqci=KA%mcT>XOWE>LI-Tl>nTZGA_x@0xBXHpUY>&qwf#^~7zDZhFB
zPM7oc%l$%ntF*j-cRvg;;7~d(y1J16^XmutK2v3POkUa<R_nvD_Du-?2d_$omkx#e
z9<3GuuTzY>y#Kh!=6+we@W$i#kM0vT&j@L2`Xs{r>h#yZ==JS)?Y2zVX5(h)x$o<G
zF3-Xgmyl`P#rJxu^Y?lEYPa{gRkb%-c89jjG>%$tzJiLzx!vzMbZ_4iZ#k_#sew`9
zuEQPuZ!EfZ1pD8=I#M6gb6Gy4V6NKVc7eSG2LG>cU5!uQRW|p4)0_*f`CPm_`z>$o
zOgbF3{z7T~)OU)T6qmX$Y2`kp+q{=u`PAG6+r1(mY<RTE@B{OKnkc`D+{gQ4J!Pgp
z{;$atm*uMd{*}lJm8^*j_pDu>HQd^=#h~D}BA<>@l7cF)i$y|R>&Y`)geLGg^J<Bv
zb{I6L-jDq>N1^S2Lhn2_qm+X4t6y7tGyPrsS#JKN_c_tC%x1qSdGxX9oPg@q1@XxW
zD<dD@wa+WK=2f&vI=Qzvpq#gH)v8NDZVJnpcgFQRdGl?@F2P>~`BsJ#Q=iRURjpC5
z@xA)Th;Q@dH5af8Zra;F`>@ruxI5dtIe(k$<#u{LpShPe>!reH-Frrw5`jA&KMF_?
z6g+W%jcaM?+_l;qN!KJh+t<I^W_yi&pS}E3A0r;kMKAwn?A<O|wa{32g&ISW0|VIr
E0Ev3NJOBUy

literal 0
HcmV?d00001

diff --git a/boards/realtek/rts5912_evb/rts5912_evb.dts b/boards/realtek/rts5912_evb/rts5912_evb.dts
new file mode 100644
index 00000000000..1e22d6c4ace
--- /dev/null
+++ b/boards/realtek/rts5912_evb/rts5912_evb.dts
@@ -0,0 +1,36 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+ *
+ */
+
+/dts-v1/;
+#include <realtek/ec/rts5912.dtsi>
+#include <realtek/ec/rts5912-pinctrl.dtsi>
+#include <zephyr/dt-bindings/gpio/gpio.h>
+/ {
+	model = "Realtek RTS5912 Evaluation Board";
+	compatible = "realtek,rts5912-evb";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,console = &uart0;
+		zephyr,flash = &flash0;
+	};
+};
+
+&uart0 {
+	status = "okay";
+	current-speed = <115200>;
+};
+
+&uart0_wrapper {
+	status = "okay";
+	pinctrl-0 = <&uart_rx_gpio113 &uart_tx_gpio114>;
+	pinctrl-names = "default";
+};
+
+&swj_port {
+	status = "okay";
+};
diff --git a/boards/realtek/rts5912_evb/rts5912_evb.yaml b/boards/realtek/rts5912_evb/rts5912_evb.yaml
new file mode 100644
index 00000000000..199a6e1027a
--- /dev/null
+++ b/boards/realtek/rts5912_evb/rts5912_evb.yaml
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+identifier: rts5912_evb
+name: RTS5912-EVB
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+  - xtools
+ram: 64
+flash: 320
+supported:
+  - gpio
+  - pinmux
+vendor: realtek
diff --git a/boards/realtek/rts5912_evb/rts5912_evb_defconfig b/boards/realtek/rts5912_evb/rts5912_evb_defconfig
new file mode 100644
index 00000000000..64454c374d5
--- /dev/null
+++ b/boards/realtek/rts5912_evb/rts5912_evb_defconfig
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+# Enable RTS5912 image tool
+CONFIG_REALTEK_RTS5912_BOOTROM_HEADER=y
+
+# Serial Driver
+CONFIG_SERIAL=y
+CONFIG_UART_NS16550=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+
+# Console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y

From a32aa12c23fa9fa73780b5390ff2de95f5fb9c95 Mon Sep 17 00:00:00 2001
From: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
Date: Thu, 28 Nov 2024 11:23:08 +0800
Subject: [PATCH 2811/2913] [nrf fromtree] MAINTAINERS: add maintainer for
 Realtek EC api and driver

This commit adds api and driver of Realtek EC to maintainers.yml

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit a4d0591ddf2daa68cf75bcd0148eab20836adc6b)
Signed-off-by: Lin Yu-Cheng <lin_yu_cheng@realtek.com>
---
 MAINTAINERS.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index f5e76e43935..5eed35c70da 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -3931,6 +3931,19 @@ OpenTitan Platforms:
   description: >-
     OpenTitan boards, SOCs, dts files and related drivers.
 
+Realtek EC Platforms:
+  status: maintained
+  maintainers:
+    - JasonLin-RealTek
+  files:
+    - boards/realtek/
+    - drivers/*/*rts5912*
+    - dts/bindings/*/*rts5912*
+    - dts/arm/realtek/ec/
+    - soc/realtek/ec/
+  labels:
+    - "platform: Realtek EC"
+
 Renesas SmartBond Platforms:
   status: maintained
   maintainers:

From de1fd4aecaca9ec61898a8fbe1b9818e331f6b29 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Fri, 21 Mar 2025 13:30:34 +0100
Subject: [PATCH 2812/2913] [nrf fromlist] dts: bindings: clock: add
 nordic,nrfs-audiopll

Introduce Nordic NRFS AudioPLL bindings.

Upstream PR #: 87471

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 dts/bindings/clock/nordic,nrfs-audiopll.yaml   | 18 ++++++++++++++++++
 .../zephyr/dt-bindings/clock/nrfs-audiopll.h   | 15 +++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 dts/bindings/clock/nordic,nrfs-audiopll.yaml
 create mode 100644 include/zephyr/dt-bindings/clock/nrfs-audiopll.h

diff --git a/dts/bindings/clock/nordic,nrfs-audiopll.yaml b/dts/bindings/clock/nordic,nrfs-audiopll.yaml
new file mode 100644
index 00000000000..a305b1c8088
--- /dev/null
+++ b/dts/bindings/clock/nordic,nrfs-audiopll.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Nordic NRFS AudioPLL clock
+
+compatible: "nordic,nrfs-audiopll"
+
+include: base.yaml
+
+properties:
+  frequency:
+    type: int
+    required: true
+    description: |
+      Initial frequency in Hertz.
+
+      See zephyr/include/zephyr/dt-bindings/nrfs_audiopll.h for
+      predefined frequencies.
diff --git a/include/zephyr/dt-bindings/clock/nrfs-audiopll.h b/include/zephyr/dt-bindings/clock/nrfs-audiopll.h
new file mode 100644
index 00000000000..b4c3975b5e1
--- /dev/null
+++ b/include/zephyr/dt-bindings/clock/nrfs-audiopll.h
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_NRFS_AUDIOPLL_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_NRFS_AUDIOPLL_H_
+
+#define NRFS_AUDIOPLL_FREQ_MIN        10666707
+#define NRFS_AUDIOPLL_FREQ_AUDIO_44K1 11289591
+#define NRFS_AUDIOPLL_FREQ_AUDIO_48K  12287963
+#define NRFS_AUDIOPLL_FREQ_MAX        13333292
+
+#endif /* #define ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_NRFS_AUDIOPLL_H_ */

From a1ea6976e2c6397501b6337fa29650f357819551 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Fri, 21 Mar 2025 13:31:28 +0100
Subject: [PATCH 2813/2913] [nrf fromlist] dts: common: nordic: nrf54h20: add
 audiopll node

Add audiopll node to nrf54h20.

Upstream PR #: 87471

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 dts/common/nordic/nrf54h20.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index dadd8c7ef54..7c06ba441a3 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -8,6 +8,7 @@
 #include <nordic/nrf_common.dtsi>
 
 #include <zephyr/dt-bindings/adc/nrf-saadc-haltium.h>
+#include <zephyr/dt-bindings/clock/nrfs-audiopll.h>
 #include <zephyr/dt-bindings/misc/nordic-nrf-ficr-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-domain-id-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-owner-id-nrf54h20.h>
@@ -201,6 +202,12 @@
 			clocks = <&hfxo>, <&lfxo>;
 			clock-names = "hfxo", "lfxo";
 		};
+
+		audiopll: audiopll {
+			compatible = "nordic,nrfs-audiopll";
+			frequency = <NRFS_AUDIOPLL_FREQ_AUDIO_44K1>;
+			status = "disabled";
+		};
 	};
 
 	gpd: global-power-domain {

From 268594ea8f827dfbeef7676b3dcfefadc4251564 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Fri, 21 Mar 2025 13:32:29 +0100
Subject: [PATCH 2814/2913] [nrf fromlist] drivers: clock_control: add
 nrfs_audiopll clock driver

Add NRFS AudioPLL clock control device driver.

Upstream PR #: 87471

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 drivers/clock_control/CMakeLists.txt          |   1 +
 drivers/clock_control/Kconfig.nrf             |   6 +
 .../clock_control_nrf2_audiopll.c             | 307 ++++++++++++++++++
 3 files changed, 314 insertions(+)
 create mode 100644 drivers/clock_control/clock_control_nrf2_audiopll.c

diff --git a/drivers/clock_control/CMakeLists.txt b/drivers/clock_control/CMakeLists.txt
index 8c451149a58..33ad557742a 100644
--- a/drivers/clock_control/CMakeLists.txt
+++ b/drivers/clock_control/CMakeLists.txt
@@ -39,6 +39,7 @@ zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_PWM                 clock_cont
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RPI_PICO            clock_control_rpi_pico.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL   clock_control_nrf2_global_hsfll.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RTS5912_SCCON       clock_control_rts5912_sccon.c)
+zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF2_AUDIOPLL       clock_control_nrf2_audiopll.c)
 
 if(CONFIG_CLOCK_CONTROL_NRF2)
   zephyr_library_sources(clock_control_nrf2_common.c)
diff --git a/drivers/clock_control/Kconfig.nrf b/drivers/clock_control/Kconfig.nrf
index b5b066ac48e..da330f7b08e 100644
--- a/drivers/clock_control/Kconfig.nrf
+++ b/drivers/clock_control/Kconfig.nrf
@@ -226,4 +226,10 @@ config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_INIT_PRIORITY
 
 endif # CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
 
+config CLOCK_CONTROL_NRF2_AUDIOPLL
+	bool "NRFS AudioPLL driver support"
+	depends on DT_HAS_NORDIC_NRFS_AUDIOPLL_ENABLED
+	depends on NRFS_AUDIOPLL_SERVICE_ENABLED
+	default y
+
 endif # CLOCK_CONTROL_NRF2
diff --git a/drivers/clock_control/clock_control_nrf2_audiopll.c b/drivers/clock_control/clock_control_nrf2_audiopll.c
new file mode 100644
index 00000000000..c4df962144a
--- /dev/null
+++ b/drivers/clock_control/clock_control_nrf2_audiopll.c
@@ -0,0 +1,307 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT nordic_nrfs_audiopll
+
+#include "clock_control_nrf2_common.h"
+#include <zephyr/devicetree.h>
+#include <zephyr/dt-bindings/clock/nrfs-audiopll.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <nrfs_audiopll.h>
+#include <nrfs_backend_ipc_service.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
+
+#define SHIM_DEFAULT_PRESCALER AUDIOPLL_DIV_12
+
+BUILD_ASSERT(
+	DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
+	"multiple instances not supported"
+);
+
+BUILD_ASSERT(DT_INST_PROP(0, frequency) >= NRFS_AUDIOPLL_FREQ_MIN);
+BUILD_ASSERT(DT_INST_PROP(0, frequency) <= NRFS_AUDIOPLL_FREQ_MAX);
+
+struct shim_data {
+	struct onoff_manager mgr;
+	onoff_notify_fn mgr_notify;
+	const struct device *dev;
+	struct k_sem evt_sem;
+	nrfs_audiopll_evt_type_t evt;
+};
+
+static int shim_nrfs_request_enable(const struct device *dev)
+{
+	struct shim_data *dev_data = dev->data;
+	nrfs_err_t err;
+
+	LOG_DBG("send enable request");
+
+	dev_data->evt = NRFS_AUDIOPLL_EVT_ENABLED;
+	err = nrfs_audiopll_enable_request(dev_data);
+	if (err != NRFS_SUCCESS) {
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int shim_nrfs_request_disable(const struct device *dev)
+{
+	struct shim_data *dev_data = dev->data;
+	nrfs_err_t err;
+
+	LOG_DBG("send disable request");
+
+	dev_data->evt = NRFS_AUDIOPLL_EVT_DISABLED;
+	err = nrfs_audiopll_disable_request(dev_data);
+	if (err != NRFS_SUCCESS) {
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static void onoff_start_option(struct onoff_manager *mgr, onoff_notify_fn notify)
+{
+	struct shim_data *dev_data = CONTAINER_OF(mgr, struct shim_data, mgr);
+	const struct device *dev = dev_data->dev;
+	int ret;
+
+	dev_data->mgr_notify = notify;
+
+	ret = shim_nrfs_request_enable(dev);
+	if (ret) {
+		dev_data->mgr_notify = NULL;
+		notify(mgr, -EIO);
+	}
+}
+
+static void onoff_stop_option(struct onoff_manager *mgr, onoff_notify_fn notify)
+{
+	struct shim_data *dev_data = CONTAINER_OF(mgr, struct shim_data, mgr);
+	const struct device *dev = dev_data->dev;
+	int ret;
+
+	dev_data->mgr_notify = notify;
+
+	ret = shim_nrfs_request_disable(dev);
+	if (ret) {
+		dev_data->mgr_notify = NULL;
+		notify(mgr, -EIO);
+	}
+}
+
+static const struct onoff_transitions shim_mgr_transitions = {
+	.start = onoff_start_option,
+	.stop  = onoff_stop_option
+};
+
+/*
+ * Formula:
+ *
+ *   frequency = ((4 + (freq_fraction * 2^-16)) * 32000000) / 12
+ *
+ * Simplified linear approximation:
+ *
+ *   frequency = 10666666 + (((13333292 - 10666666) / 65535) * freq_fraction)
+ *   frequency = 10666666 + ((2666626 / 65535) * freq_fraction)
+ *   frequency = ((10666666 * 65535) + (2666626 * freq_fraction)) / 65535
+ *   frequency = (699039956310 + (2666626 * freq_fraction)) / 65535
+ *
+ * Isolate freq_fraction:
+ *
+ *   frequency = (699039956310 + (2666626 * freq_fraction)) / 65535
+ *   frequency * 65535 = 699039956310 + (2666626 * freq_fraction)
+ *   (frequency * 65535) - 699039956310 = 2666626 * freq_fraction
+ *   freq_fraction = ((frequency * 65535) - 699039956310) / 2666626
+ */
+static uint16_t shim_frequency_to_freq_fraction(uint32_t frequency)
+{
+	uint64_t freq_fraction;
+
+	freq_fraction = frequency;
+	freq_fraction *= 65535;
+	freq_fraction -= 699039956310;
+	freq_fraction = DIV_ROUND_CLOSEST(freq_fraction, 2666626);
+
+	return (uint16_t)freq_fraction;
+}
+
+static int shim_nrfs_request_freq_sync(const struct device *dev, uint16_t freq_fraction)
+{
+	struct shim_data *dev_data = dev->data;
+	nrfs_err_t err;
+
+	LOG_DBG("send freq request");
+
+	err = nrfs_audiopll_request_freq(freq_fraction, dev_data);
+	if (err != NRFS_SUCCESS) {
+		return -EIO;
+	}
+
+	k_sem_take(&dev_data->evt_sem, K_FOREVER);
+	return dev_data->evt == NRFS_AUDIOPLL_EVT_FREQ_CONFIRMED ? 0 : -EIO;
+}
+
+static int shim_nrfs_request_prescaler_sync(const struct device *dev,
+					    enum audiopll_prescaler_div div)
+{
+	struct shim_data *dev_data = dev->data;
+	nrfs_err_t err;
+
+	LOG_DBG("send prescaler request");
+
+	err = nrfs_audiopll_request_prescaler(div, dev_data);
+	if (err != NRFS_SUCCESS) {
+		return -EIO;
+	}
+
+	k_sem_take(&dev_data->evt_sem, K_FOREVER);
+	return dev_data->evt == NRFS_AUDIOPLL_EVT_PRESCALER_CONFIRMED ? 0 : -EIO;
+}
+
+static void shim_nrfs_audiopll_init_evt_handler(nrfs_audiopll_evt_t const *evt, void *context)
+{
+	struct shim_data *dev_data = context;
+
+	LOG_DBG("init resp evt %u", (uint32_t)evt->type);
+
+	dev_data->evt = evt->type;
+	k_sem_give(&dev_data->evt_sem);
+}
+
+static void shim_nrfs_audiopll_evt_handler(nrfs_audiopll_evt_t const *evt, void *context)
+{
+	struct shim_data *dev_data = context;
+	int ret;
+
+	LOG_DBG("resp evt %u", (uint32_t)evt->type);
+
+	if (dev_data->mgr_notify == NULL) {
+		return;
+	}
+
+	ret = evt->type == dev_data->evt ? 0 : -EIO;
+	dev_data->mgr_notify(&dev_data->mgr, ret);
+}
+
+static int api_request_audiopll(const struct device *dev,
+				const struct nrf_clock_spec *spec,
+				struct onoff_client *cli)
+{
+	struct shim_data *dev_data = dev->data;
+	struct onoff_manager *mgr = &dev_data->mgr;
+
+	ARG_UNUSED(spec);
+
+	return onoff_request(mgr, cli);
+}
+
+static int api_release_audiopll(const struct device *dev,
+				    const struct nrf_clock_spec *spec)
+{
+	struct shim_data *dev_data = dev->data;
+	struct onoff_manager *mgr = &dev_data->mgr;
+
+	ARG_UNUSED(spec);
+
+	return onoff_release(mgr);
+}
+
+static int api_cancel_or_release_audiopll(const struct device *dev,
+					  const struct nrf_clock_spec *spec,
+					  struct onoff_client *cli)
+{
+	struct shim_data *dev_data = dev->data;
+	struct onoff_manager *mgr = &dev_data->mgr;
+
+	ARG_UNUSED(spec);
+
+	return onoff_cancel_or_release(mgr, cli);
+}
+
+static DEVICE_API(nrf_clock_control, shim_driver_api) = {
+	.std_api = {
+		.on = api_nosys_on_off,
+		.off = api_nosys_on_off,
+	},
+	.request = api_request_audiopll,
+	.release = api_release_audiopll,
+	.cancel_or_release = api_cancel_or_release_audiopll,
+};
+
+static int shim_init(const struct device *dev)
+{
+	struct shim_data *dev_data = dev->data;
+	nrfs_err_t err;
+	int ret;
+	uint16_t freq_fraction;
+
+	LOG_DBG("waiting for nrfs backend connected");
+	err = nrfs_backend_wait_for_connection(K_FOREVER);
+	if (err != NRFS_SUCCESS) {
+		LOG_ERR("nrfs backend not connected");
+		return -ENODEV;
+	}
+
+	k_sem_init(&dev_data->evt_sem, 0, 1);
+
+	err = nrfs_audiopll_init(shim_nrfs_audiopll_init_evt_handler);
+	if (err != NRFS_SUCCESS) {
+		LOG_ERR("failed to init audiopll service");
+		return -ENODEV;
+	}
+
+	ret = shim_nrfs_request_prescaler_sync(dev, SHIM_DEFAULT_PRESCALER);
+	if (ret) {
+		LOG_ERR("failed to set prescaler divider");
+		return ret;
+	}
+
+	freq_fraction = shim_frequency_to_freq_fraction(DT_INST_PROP(0, frequency));
+
+	LOG_DBG("requesting freq_fraction %u for frequency %uHz",
+		freq_fraction,
+		DT_INST_PROP(0, frequency));
+
+	ret = shim_nrfs_request_freq_sync(dev, freq_fraction);
+	if (ret) {
+		LOG_ERR("failed to set freq_fraction");
+		return ret;
+	}
+
+	nrfs_audiopll_uninit();
+
+	ret = onoff_manager_init(&dev_data->mgr, &shim_mgr_transitions);
+	if (ret < 0) {
+		LOG_ERR("failed to init onoff manager");
+		return ret;
+	}
+
+	err = nrfs_audiopll_init(shim_nrfs_audiopll_evt_handler);
+	if (err != NRFS_SUCCESS) {
+		LOG_ERR("failed to init audiopll service");
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
+static struct shim_data shim_data = {
+	.dev = DEVICE_DT_INST_GET(0),
+};
+
+DEVICE_DT_INST_DEFINE(
+	0,
+	shim_init,
+	NULL,
+	&shim_data,
+	NULL,
+	POST_KERNEL,
+	UTIL_INC(CONFIG_NRFS_BACKEND_IPC_SERVICE_INIT_PRIO),
+	&shim_driver_api,
+);

From 52b9abbb5e647b49392eca2c072a5bb667b2c61a Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Fri, 28 Mar 2025 10:45:51 +0100
Subject: [PATCH 2815/2913] [nrf fromlist] samples: boards: nordic: add
 audiopll

Add audiopll to sample.

Upstream PR #: 87471

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 .../nordic/clock_control/configs/audiopll.conf    |  4 ++++
 .../nordic/clock_control/configs/audiopll.overlay | 15 +++++++++++++++
 samples/boards/nordic/clock_control/sample.yaml   |  5 +++++
 3 files changed, 24 insertions(+)
 create mode 100644 samples/boards/nordic/clock_control/configs/audiopll.conf
 create mode 100644 samples/boards/nordic/clock_control/configs/audiopll.overlay

diff --git a/samples/boards/nordic/clock_control/configs/audiopll.conf b/samples/boards/nordic/clock_control/configs/audiopll.conf
new file mode 100644
index 00000000000..c06f206ab86
--- /dev/null
+++ b/samples/boards/nordic/clock_control/configs/audiopll.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CLOCK_CONTROL=y
diff --git a/samples/boards/nordic/clock_control/configs/audiopll.overlay b/samples/boards/nordic/clock_control/configs/audiopll.overlay
new file mode 100644
index 00000000000..3e99bbdbeb8
--- /dev/null
+++ b/samples/boards/nordic/clock_control/configs/audiopll.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/{
+	aliases {
+		sample-clock = &audiopll;
+	};
+};
+
+&audiopll {
+	status = "okay";
+};
diff --git a/samples/boards/nordic/clock_control/sample.yaml b/samples/boards/nordic/clock_control/sample.yaml
index 820ad0de75f..ee63e7c518e 100644
--- a/samples/boards/nordic/clock_control/sample.yaml
+++ b/samples/boards/nordic/clock_control/sample.yaml
@@ -41,3 +41,8 @@ tests:
     extra_args:
       - CONF_FILE="configs/global_hsfll.conf"
       - DTC_OVERLAY_FILE="configs/global_hsfll.overlay"
+  sample.boards.nrf.clock_control.audiopll:
+    filter: dt_nodelabel_enabled("audiopll")
+    extra_args:
+      - CONF_FILE="configs/audiopll.conf"
+      - DTC_OVERLAY_FILE="configs/audiopll.overlay"

From d840e4cb164e36ec3d851511ba8f06f185a24943 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 1 Apr 2025 12:31:59 +0200
Subject: [PATCH 2816/2913] Revert "[nrf fromlist] drivers: i2s: Add support
 for nRF TDM peripherals"

This reverts commit a4e63c80ca707673097c21ce87af02e6c4e137f6.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 drivers/i2s/CMakeLists.txt |    1 -
 drivers/i2s/Kconfig.nrfx   |   21 -
 drivers/i2s/i2s_nrfx_tdm.c | 1109 ------------------------------------
 3 files changed, 1131 deletions(-)
 delete mode 100644 drivers/i2s/i2s_nrfx_tdm.c

diff --git a/drivers/i2s/CMakeLists.txt b/drivers/i2s/CMakeLists.txt
index 29a9da412ce..7857b6e863b 100644
--- a/drivers/i2s/CMakeLists.txt
+++ b/drivers/i2s/CMakeLists.txt
@@ -11,7 +11,6 @@ zephyr_library_sources_ifdef(CONFIG_I2S_STM32		i2s_ll_stm32.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_LITEX		i2s_litex.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_MCUX_FLEXCOMM	i2s_mcux_flexcomm.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_NRFX		i2s_nrfx.c)
-zephyr_library_sources_ifdef(CONFIG_TDM_NRFX		i2s_nrfx_tdm.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_MCUX_SAI	i2s_mcux_sai.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_ESP32		i2s_esp32.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_TEST		i2s_test.c)
diff --git a/drivers/i2s/Kconfig.nrfx b/drivers/i2s/Kconfig.nrfx
index 4b7a9f6177a..b36f3eb9c64 100644
--- a/drivers/i2s/Kconfig.nrfx
+++ b/drivers/i2s/Kconfig.nrfx
@@ -22,24 +22,3 @@ config I2S_NRFX_TX_BLOCK_COUNT
 	default 4
 
 endif # I2S_NRFX
-
-menuconfig TDM_NRFX
-	bool "nRF TDM nrfx driver"
-	default y
-	depends on DT_HAS_NORDIC_NRF_TDM_ENABLED
-	select NRFX_TDM130 if HAS_HW_NRF_TDM130
-	select PINCTRL
-	help
-	  Enable support for nrfx TDM driver for nRF MCU series.
-
-if TDM_NRFX
-
-config TDM_NRFX_RX_BLOCK_COUNT
-	int "RX queue length"
-	default 4
-
-config TDM_NRFX_TX_BLOCK_COUNT
-	int "TX queue length"
-	default 4
-
-endif # TDM_NRFX
diff --git a/drivers/i2s/i2s_nrfx_tdm.c b/drivers/i2s/i2s_nrfx_tdm.c
deleted file mode 100644
index 0482fa732f6..00000000000
--- a/drivers/i2s/i2s_nrfx_tdm.c
+++ /dev/null
@@ -1,1109 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <stdlib.h>
-#include <zephyr/drivers/i2s.h>
-#include <zephyr/drivers/clock_control/nrf_clock_control.h>
-#include <zephyr/drivers/pinctrl.h>
-#include <soc.h>
-#include <dmm.h>
-#include <hal/nrf_tdm.h>
-#include <haly/nrfy_gpio.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/irq.h>
-LOG_MODULE_REGISTER(tdm_nrfx, CONFIG_I2S_LOG_LEVEL);
-
-/* The application must provide buffers that are to be used in the next
- * part of the transfer.
- */
-#define NRFX_TDM_STATUS_NEXT_BUFFERS_NEEDED BIT(0)
-
-/* The TDM peripheral has been stopped and all buffers that were passed
- * to the driver have been released.
- */
-#define NRFX_TDM_STATUS_TRANSFER_STOPPED BIT(1)
-
-typedef struct {
-	uint32_t *p_rx_buffer;
-	uint32_t const *p_tx_buffer;
-	void *p_tx_mem_slab;
-	void *p_rx_mem_slab;
-	uint16_t buffer_size;
-} tdm_buffers_t;
-
-typedef void (*tdm_data_handler_t)(tdm_buffers_t const *p_released, uint32_t status);
-
-typedef struct {
-	tdm_data_handler_t handler;
-	bool use_rx: 1;
-	bool use_tx: 1;
-	bool rx_ready: 1;
-	bool tx_ready: 1;
-	bool buffers_needed: 1;
-	bool buffers_reused: 1;
-	tdm_buffers_t next_buffers;
-	tdm_buffers_t current_buffers;
-} tdm_ctrl_t;
-
-struct stream_cfg {
-	struct i2s_config cfg;
-	nrf_tdm_config_t nrfx_cfg;
-};
-
-struct tdm_buf {
-	void *mem_block;
-	size_t size;
-	void *dmm_buf;
-};
-
-struct tdm_drv_cfg {
-	tdm_data_handler_t data_handler;
-	const struct pinctrl_dev_config *pcfg;
-	NRF_TDM_Type *p_reg;
-	void *mem_reg;
-	tdm_ctrl_t *control_data;
-	uint32_t mck_frequency;
-	uint32_t pclk_frequency;
-	enum clock_source {
-		PCLK,
-		ACLK
-	} clk_src;
-};
-
-struct tdm_drv_data {
-	struct onoff_manager *clk_mgr;
-	struct onoff_client clk_cli;
-	struct stream_cfg tx;
-	struct k_msgq tx_queue;
-	struct stream_cfg rx;
-	struct k_msgq rx_queue;
-	const struct tdm_drv_cfg *drv_cfg;
-	const uint32_t *last_tx_buffer;
-	void *last_tx_mem_slab;
-	enum i2s_state state;
-	enum i2s_dir active_dir;
-	bool stop;       /* stop after the current (TX or RX) block */
-	bool discard_rx; /* discard further RX blocks */
-	volatile bool next_tx_buffer_needed;
-	bool tx_configured: 1;
-	bool rx_configured: 1;
-	bool request_clock: 1;
-};
-
-void tdm_irq_handler(const struct device *dev)
-{
-	const struct tdm_drv_cfg *drv_cfg = dev->config;
-	NRF_TDM_Type *p_reg = drv_cfg->p_reg;
-	tdm_ctrl_t *ctrl_data = drv_cfg->control_data;
-	uint32_t event_mask = 0;
-
-	if (nrf_tdm_event_check(p_reg, NRF_TDM_EVENT_MAXCNT)) {
-		nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_MAXCNT);
-	}
-	if (nrf_tdm_event_check(p_reg, NRF_TDM_EVENT_TXPTRUPD)) {
-		nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_TXPTRUPD);
-		event_mask |= NRFY_EVENT_TO_INT_BITMASK(NRF_TDM_EVENT_TXPTRUPD);
-		ctrl_data->tx_ready = true;
-		if (ctrl_data->use_tx && ctrl_data->buffers_needed) {
-			ctrl_data->buffers_reused = true;
-		}
-	}
-	if (nrf_tdm_event_check(p_reg, NRF_TDM_EVENT_RXPTRUPD)) {
-		nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_RXPTRUPD);
-		event_mask |= NRFY_EVENT_TO_INT_BITMASK(NRF_TDM_EVENT_RXPTRUPD);
-		ctrl_data->rx_ready = true;
-		if (ctrl_data->use_rx && ctrl_data->buffers_needed) {
-			ctrl_data->buffers_reused = true;
-		}
-	}
-	if (nrf_tdm_event_check(p_reg, NRF_TDM_EVENT_STOPPED)) {
-		nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_STOPPED);
-		event_mask |= NRFY_EVENT_TO_INT_BITMASK(NRF_TDM_EVENT_STOPPED);
-		nrf_tdm_int_disable(p_reg, NRF_TDM_INT_STOPPED_MASK_MASK);
-		nrf_tdm_disable(p_reg);
-		/* When stopped, release all buffers, including these scheduled for
-		 * the next part of the transfer, and signal that the transfer has
-		 * finished.
-		 */
-		ctrl_data->handler(&ctrl_data->current_buffers, 0);
-		ctrl_data->handler(&ctrl_data->next_buffers, NRFX_TDM_STATUS_TRANSFER_STOPPED);
-	} else {
-		/* Check if the requested transfer has been completed:
-		 * - full-duplex mode
-		 */
-		if ((ctrl_data->use_tx && ctrl_data->use_rx && ctrl_data->tx_ready &&
-		     ctrl_data->rx_ready) ||
-		    /* - TX only mode */
-		    (!ctrl_data->use_rx && ctrl_data->tx_ready) ||
-		    /* - RX only mode */
-		    (!ctrl_data->use_tx && ctrl_data->rx_ready)) {
-			ctrl_data->tx_ready = false;
-			ctrl_data->rx_ready = false;
-
-			/* If the application did not supply the buffers for the next
-			 * part of the transfer until this moment, the current buffers
-			 * cannot be released, since the I2S peripheral already started
-			 * using them. Signal this situation to the application by
-			 * passing NULL instead of the structure with released buffers.
-			 */
-			if (ctrl_data->buffers_reused) {
-				ctrl_data->buffers_reused = false;
-				/* This will most likely be set at this point. However, there is
-				 * a small time window between TXPTRUPD and RXPTRUPD events,
-				 * and it is theoretically possible that next buffers will be
-				 * set in this window, so to be sure this flag is set to true,
-				 * set it explicitly.
-				 */
-				ctrl_data->buffers_needed = true;
-				ctrl_data->handler(NULL, NRFX_TDM_STATUS_NEXT_BUFFERS_NEEDED);
-			} else {
-				/* Buffers that have been used by the I2S peripheral (current)
-				 * are now released and will be returned to the application,
-				 * and the ones scheduled to be used as next become the current
-				 * ones.
-				 */
-				tdm_buffers_t released_buffers = ctrl_data->current_buffers;
-
-				ctrl_data->current_buffers = ctrl_data->next_buffers;
-				ctrl_data->next_buffers.p_rx_buffer = NULL;
-				ctrl_data->next_buffers.p_tx_buffer = NULL;
-				ctrl_data->buffers_needed = true;
-				ctrl_data->handler(&released_buffers,
-						   NRFX_TDM_STATUS_NEXT_BUFFERS_NEEDED);
-			}
-		}
-	}
-}
-
-static uint32_t div_calculate(uint32_t src_freq, uint32_t requested_clk_freq)
-{
-	enum {
-		MCKCONST = 1048576
-	};
-	/* As specified in the PS:
-	 *
-	 * DIV = 4096 * floor(f_MCK * 1048576 /
-	 *                        (f_source + f_MCK / 2))
-	 * f_actual = f_source /
-	 *            floor(1048576 * 4096 / DIV)
-	 */
-
-	uint32_t ck_div = (uint32_t)(((uint64_t)requested_clk_freq * MCKCONST) /
-				     (src_freq + requested_clk_freq / 2));
-	return (ck_div * 4096);
-}
-
-static bool get_next_tx_buffer(struct tdm_drv_data *drv_data, tdm_buffers_t *buffers)
-{
-	struct tdm_buf buf;
-	int ret = k_msgq_get(&drv_data->tx_queue, &buf, K_NO_WAIT);
-
-	if (ret != 0) {
-		return false;
-	}
-	buffers->p_tx_buffer = buf.dmm_buf;
-	buffers->p_tx_mem_slab = buf.mem_block;
-	buffers->buffer_size = buf.size / sizeof(uint32_t);
-	return true;
-}
-
-static bool get_next_rx_buffer(struct tdm_drv_data *drv_data, tdm_buffers_t *buffers)
-{
-	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
-	int ret = k_mem_slab_alloc(drv_data->rx.cfg.mem_slab, &buffers->p_rx_mem_slab, K_NO_WAIT);
-
-	if (ret < 0) {
-		LOG_ERR("Failed to allocate next RX buffer: %d", ret);
-		return false;
-	}
-	ret = dmm_buffer_in_prepare(drv_cfg->mem_reg, buffers->p_rx_mem_slab,
-				    buffers->buffer_size * sizeof(uint32_t),
-				    (void **)&buffers->p_rx_buffer);
-	if (ret < 0) {
-		LOG_ERR("Failed to prepare buffer: %d", ret);
-		return false;
-	}
-
-	return true;
-}
-
-static void free_tx_buffer(struct tdm_drv_data *drv_data, struct tdm_buf *buf)
-{
-	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
-
-	(void)dmm_buffer_out_release(drv_cfg->mem_reg, buf->dmm_buf);
-	k_mem_slab_free(drv_data->tx.cfg.mem_slab, buf->mem_block);
-	LOG_DBG("Freed TX %p", buf->mem_block);
-}
-
-static void free_rx_buffer(struct tdm_drv_data *drv_data, struct tdm_buf *buf)
-{
-	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
-
-	(void)dmm_buffer_in_release(drv_cfg->mem_reg, buf->mem_block, buf->size, buf->dmm_buf);
-	k_mem_slab_free(drv_data->rx.cfg.mem_slab, buf->mem_block);
-	LOG_DBG("Freed RX %p", buf->mem_block);
-}
-
-static void tdm_start(struct tdm_drv_data *drv_data, tdm_buffers_t const *p_initial_buffers)
-{
-	NRF_TDM_Type *p_reg = drv_data->drv_cfg->p_reg;
-	tdm_ctrl_t *ctrl_data = drv_data->drv_cfg->control_data;
-
-	__ASSERT_NO_MSG(p_initial_buffers->p_rx_buffer != NULL ||
-			p_initial_buffers->p_tx_buffer != NULL);
-	ctrl_data->use_rx = (p_initial_buffers->p_rx_buffer != NULL);
-	ctrl_data->use_tx = (p_initial_buffers->p_tx_buffer != NULL);
-	ctrl_data->rx_ready = false;
-	ctrl_data->tx_ready = false;
-	ctrl_data->buffers_needed = false;
-
-	ctrl_data->next_buffers = *p_initial_buffers;
-	ctrl_data->current_buffers.p_rx_buffer = NULL;
-	ctrl_data->current_buffers.p_tx_buffer = NULL;
-	nrf_tdm_enable(p_reg);
-
-	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_RXPTRUPD);
-	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_TXPTRUPD);
-
-	nrf_tdm_int_enable(
-		p_reg,
-		(p_initial_buffers->p_rx_buffer ? NRF_TDM_INT_RXPTRUPD_MASK_MASK : 0UL) |
-			(p_initial_buffers->p_tx_buffer ? NRF_TDM_INT_TXPTRUPD_MASK_MASK : 0UL) |
-			NRF_TDM_INT_STOPPED_MASK_MASK);
-
-	nrf_tdm_tx_count_set(p_reg, p_initial_buffers->buffer_size);
-	nrf_tdm_rx_count_set(p_reg, p_initial_buffers->buffer_size);
-	nrf_tdm_rx_buffer_set(p_reg, p_initial_buffers->p_rx_buffer);
-	nrf_tdm_tx_buffer_set(p_reg, p_initial_buffers->p_tx_buffer);
-	nrf_tdm_task_trigger(p_reg, NRF_TDM_TASK_START);
-}
-
-static void tdm_stop(NRF_TDM_Type *p_reg)
-{
-	nrf_tdm_int_disable(p_reg, NRF_TDM_INT_RXPTRUPD_MASK_MASK | NRF_TDM_INT_TXPTRUPD_MASK_MASK);
-
-	nrf_tdm_task_trigger(p_reg, NRF_TDM_TASK_STOP);
-}
-
-static bool next_buffers_set(struct tdm_drv_data *drv_data, tdm_buffers_t const *p_buffers)
-{
-	NRF_TDM_Type *p_reg = drv_data->drv_cfg->p_reg;
-	tdm_ctrl_t *ctrl_data = drv_data->drv_cfg->control_data;
-	nrf_tdm_rxtxen_t dir = NRF_TDM_RXTXEN_DUPLEX;
-
-	__ASSERT_NO_MSG(p_buffers->p_rx_buffer != NULL || p_buffers->p_tx_buffer != NULL);
-
-	if (!ctrl_data->buffers_needed) {
-		return false;
-	}
-
-	nrf_tdm_tx_count_set(p_reg, p_buffers->buffer_size);
-	nrf_tdm_rx_count_set(p_reg, p_buffers->buffer_size);
-	nrf_tdm_rx_buffer_set(p_reg, p_buffers->p_rx_buffer);
-	nrf_tdm_tx_buffer_set(p_reg, p_buffers->p_tx_buffer);
-
-	if (p_buffers->p_rx_buffer == NULL) {
-		dir = NRF_TDM_RXTXEN_TX;
-	} else if (p_buffers->p_tx_buffer == NULL) {
-		dir = NRF_TDM_RXTXEN_RX;
-	}
-	nrf_tdm_transfer_direction_set(p_reg, dir);
-
-	ctrl_data->next_buffers = *p_buffers;
-	ctrl_data->buffers_needed = false;
-
-	return true;
-}
-
-static bool supply_next_buffers(struct tdm_drv_data *drv_data, tdm_buffers_t *next)
-{
-	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
-
-	if (drv_data->active_dir != I2S_DIR_TX) { /* -> RX active */
-		if (!get_next_rx_buffer(drv_data, next)) {
-			drv_data->state = I2S_STATE_ERROR;
-			tdm_stop(drv_cfg->p_reg);
-			return false;
-		}
-		/* Set buffer size if there is no TX buffer (which effectively
-		 * controls how many bytes will be received).
-		 */
-		if (drv_data->active_dir == I2S_DIR_RX) {
-			next->buffer_size = drv_data->rx.cfg.block_size / sizeof(uint32_t);
-		}
-	}
-
-	drv_data->last_tx_buffer = next->p_tx_buffer;
-	drv_data->last_tx_mem_slab = next->p_tx_mem_slab;
-
-	LOG_DBG("Next buffers: %p/%p", next->p_tx_buffer, next->p_rx_buffer);
-	return next_buffers_set(drv_data, next);
-}
-
-static void purge_queue(const struct device *dev, enum i2s_dir dir)
-{
-	struct tdm_drv_data *drv_data = dev->data;
-	struct tdm_buf buf;
-
-	if (dir == I2S_DIR_TX || dir == I2S_DIR_BOTH) {
-		while (k_msgq_get(&drv_data->tx_queue, &buf, K_NO_WAIT) == 0) {
-			free_tx_buffer(drv_data, &buf);
-		}
-	}
-
-	if (dir == I2S_DIR_RX || dir == I2S_DIR_BOTH) {
-		while (k_msgq_get(&drv_data->rx_queue, &buf, K_NO_WAIT) == 0) {
-			free_rx_buffer(drv_data, &buf);
-		}
-	}
-}
-
-static void tdm_uninit(struct tdm_drv_data *drv_data)
-{
-	NRF_TDM_Type *p_reg = drv_data->drv_cfg->p_reg;
-
-	tdm_stop(p_reg);
-	NRFX_IRQ_DISABLE(nrfx_get_irq_number(p_reg));
-}
-
-static int tdm_nrfx_configure(const struct device *dev, enum i2s_dir dir,
-			      const struct i2s_config *tdm_cfg)
-{
-	struct tdm_drv_data *drv_data = dev->data;
-	const struct tdm_drv_cfg *drv_cfg = dev->config;
-	nrf_tdm_config_t nrfx_cfg;
-	uint32_t chan_mask = 0;
-
-	if (drv_data->state != I2S_STATE_READY) {
-		LOG_ERR("Cannot configure in state: %d", drv_data->state);
-		return -EINVAL;
-	}
-
-	if (tdm_cfg->frame_clk_freq == 0) { /* -> reset state */
-		purge_queue(dev, dir);
-		if (dir == I2S_DIR_TX || dir == I2S_DIR_BOTH) {
-			drv_data->tx_configured = false;
-			memset(&drv_data->tx, 0, sizeof(drv_data->tx));
-		}
-		if (dir == I2S_DIR_RX || dir == I2S_DIR_BOTH) {
-			drv_data->rx_configured = false;
-			memset(&drv_data->rx, 0, sizeof(drv_data->rx));
-		}
-		return 0;
-	}
-
-	__ASSERT_NO_MSG(tdm_cfg->mem_slab != NULL && tdm_cfg->block_size != 0);
-
-	if ((tdm_cfg->block_size % sizeof(uint32_t)) != 0) {
-		LOG_ERR("This device can transfer only full 32-bit words");
-		return -EINVAL;
-	}
-
-	switch (tdm_cfg->word_size) {
-	case 8:
-		nrfx_cfg.sample_width = NRF_TDM_SWIDTH_8BIT;
-		break;
-	case 16:
-		nrfx_cfg.sample_width = NRF_TDM_SWIDTH_16BIT;
-		break;
-	case 24:
-		nrfx_cfg.sample_width = NRF_TDM_SWIDTH_24BIT;
-		break;
-	case 32:
-		nrfx_cfg.sample_width = NRF_TDM_SWIDTH_32BIT;
-		break;
-	default:
-		LOG_ERR("Unsupported word size: %u", tdm_cfg->word_size);
-		return -EINVAL;
-	}
-
-	switch (tdm_cfg->format & I2S_FMT_DATA_FORMAT_MASK) {
-	case I2S_FMT_DATA_FORMAT_I2S:
-		nrfx_cfg.alignment = NRF_TDM_ALIGN_LEFT;
-		nrfx_cfg.fsync_polarity = NRF_TDM_POLARITY_NEGEDGE;
-		nrfx_cfg.sck_polarity = NRF_TDM_POLARITY_POSEDGE;
-		nrfx_cfg.fsync_duration = NRF_TDM_FSYNC_DURATION_CHANNEL;
-		nrfx_cfg.channel_delay = NRF_TDM_CHANNEL_DELAY_1CK;
-		break;
-	case I2S_FMT_DATA_FORMAT_LEFT_JUSTIFIED:
-		nrfx_cfg.alignment = NRF_TDM_ALIGN_LEFT;
-		nrfx_cfg.fsync_polarity = NRF_TDM_POLARITY_POSEDGE;
-		nrfx_cfg.sck_polarity = NRF_TDM_POLARITY_POSEDGE;
-		nrfx_cfg.fsync_duration = NRF_TDM_FSYNC_DURATION_CHANNEL;
-		nrfx_cfg.channel_delay = NRF_TDM_CHANNEL_DELAY_NONE;
-		break;
-	case I2S_FMT_DATA_FORMAT_RIGHT_JUSTIFIED:
-		nrfx_cfg.alignment = NRF_TDM_ALIGN_RIGHT;
-		nrfx_cfg.fsync_polarity = NRF_TDM_POLARITY_POSEDGE;
-		nrfx_cfg.sck_polarity = NRF_TDM_POLARITY_POSEDGE;
-		nrfx_cfg.fsync_duration = NRF_TDM_FSYNC_DURATION_CHANNEL;
-		nrfx_cfg.channel_delay = NRF_TDM_CHANNEL_DELAY_NONE;
-		break;
-	default:
-		LOG_ERR("Unsupported data format: 0x%02x", tdm_cfg->format);
-		return -EINVAL;
-	}
-
-	if ((tdm_cfg->format & I2S_FMT_DATA_ORDER_LSB) || (tdm_cfg->format & I2S_FMT_BIT_CLK_INV) ||
-	    (tdm_cfg->format & I2S_FMT_FRAME_CLK_INV)) {
-		LOG_ERR("Unsupported stream format: 0x%02x", tdm_cfg->format);
-		return -EINVAL;
-	}
-
-	if (tdm_cfg->channels == 2) {
-		nrfx_cfg.num_of_channels = NRF_TDM_CHANNELS_COUNT_2;
-	} else if (tdm_cfg->channels == 1) {
-		nrfx_cfg.num_of_channels = NRF_TDM_CHANNELS_COUNT_1;
-	} else {
-		LOG_ERR("Unsupported number of channels: %u", tdm_cfg->channels);
-		return -EINVAL;
-	}
-	chan_mask = BIT_MASK(tdm_cfg->channels);
-
-	if ((tdm_cfg->options & I2S_OPT_BIT_CLK_SLAVE) &&
-	    (tdm_cfg->options & I2S_OPT_FRAME_CLK_SLAVE)) {
-		nrfx_cfg.mode = NRF_TDM_MODE_SLAVE;
-	} else if (!(tdm_cfg->options & I2S_OPT_BIT_CLK_SLAVE) &&
-		   !(tdm_cfg->options & I2S_OPT_FRAME_CLK_SLAVE)) {
-		nrfx_cfg.mode = NRF_TDM_MODE_MASTER;
-	} else {
-		LOG_ERR("Unsupported operation mode: 0x%02x", tdm_cfg->options);
-		return -EINVAL;
-	}
-
-	nrfx_cfg.mck_setup = 0;
-	if (nrfx_cfg.mode == NRF_TDM_MODE_MASTER) {
-		uint32_t sck = tdm_cfg->word_size * tdm_cfg->frame_clk_freq * tdm_cfg->channels;
-		const uint32_t src_freq =
-			(drv_cfg->clk_src == ACLK)
-				? DT_PROP_OR(DT_NODELABEL(clock), hfclkaudio_frequency, 0)
-				: drv_cfg->pclk_frequency;
-
-		/* Unless the PCLK source is used,
-		 * it is required to request the proper clock to be running
-		 * before starting the transfer itself.
-		 */
-		drv_data->request_clock = (drv_cfg->clk_src != PCLK);
-		nrfx_cfg.sck_setup = div_calculate(src_freq, sck);
-
-		if (((nrf_tdm_mck_pin_get(drv_cfg->p_reg) & TDM_PSEL_MCK_CONNECT_Msk) ==
-		     TDM_PSEL_MCK_CONNECT_Connected << TDM_PSEL_MCK_CONNECT_Pos) &&
-		    drv_cfg->mck_frequency != 0) {
-			nrfx_cfg.mck_setup = div_calculate(src_freq, drv_cfg->mck_frequency);
-		}
-	} else {
-		drv_data->request_clock = false;
-	}
-
-	if ((tdm_cfg->options & I2S_OPT_LOOPBACK) || (tdm_cfg->options & I2S_OPT_PINGPONG)) {
-		LOG_ERR("Unsupported options: 0x%02x", tdm_cfg->options);
-		return -EINVAL;
-	}
-
-	if (dir == I2S_DIR_TX || dir == I2S_DIR_BOTH) {
-		nrfx_cfg.channels = (chan_mask << TDM_CONFIG_CHANNEL_MASK_Tx0Enable_Pos);
-		drv_data->tx.cfg = *tdm_cfg;
-		drv_data->tx.nrfx_cfg = nrfx_cfg;
-		drv_data->tx_configured = true;
-	}
-
-	if (dir == I2S_DIR_RX || dir == I2S_DIR_BOTH) {
-		nrfx_cfg.channels = (chan_mask << TDM_CONFIG_CHANNEL_MASK_Rx0Enable_Pos);
-		drv_data->rx.cfg = *tdm_cfg;
-		drv_data->rx.nrfx_cfg = nrfx_cfg;
-		drv_data->rx_configured = true;
-	}
-	return 0;
-}
-
-static const struct i2s_config *tdm_nrfx_config_get(const struct device *dev, enum i2s_dir dir)
-{
-	struct tdm_drv_data *drv_data = dev->data;
-
-	if (dir == I2S_DIR_TX && drv_data->tx_configured) {
-		return &drv_data->tx.cfg;
-	}
-	if (dir == I2S_DIR_RX && drv_data->rx_configured) {
-		return &drv_data->rx.cfg;
-	}
-
-	return NULL;
-}
-
-static int tdm_nrfx_read(const struct device *dev, void **mem_block, size_t *size)
-{
-	struct tdm_drv_data *drv_data = dev->data;
-	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
-	struct tdm_buf buf;
-	int ret;
-
-	if (!drv_data->rx_configured) {
-		LOG_ERR("Device is not configured");
-		return -EIO;
-	}
-	ret = k_msgq_get(&drv_data->rx_queue, &buf,
-			 (drv_data->state == I2S_STATE_ERROR)
-				 ? K_NO_WAIT
-				 : SYS_TIMEOUT_MS(drv_data->rx.cfg.timeout));
-	if (ret == -ENOMSG) {
-		return -EIO;
-	}
-
-	LOG_DBG("Released RX %p", buf.mem_block);
-
-	if (ret == 0) {
-		(void)dmm_buffer_in_release(drv_cfg->mem_reg, buf.mem_block, buf.size, buf.dmm_buf);
-		*mem_block = buf.mem_block;
-		*size = buf.size;
-	}
-	return ret;
-}
-
-static int tdm_nrfx_write(const struct device *dev, void *mem_block, size_t size)
-{
-	struct tdm_drv_data *drv_data = dev->data;
-	const struct tdm_drv_cfg *drv_cfg = dev->config;
-	struct tdm_buf buf = {.mem_block = mem_block, .size = size};
-	int ret;
-
-	if (!drv_data->tx_configured) {
-		LOG_ERR("Device is not configured");
-		return -EIO;
-	}
-
-	if (drv_data->state != I2S_STATE_RUNNING && drv_data->state != I2S_STATE_READY) {
-		LOG_ERR("Cannot write in state: %d", drv_data->state);
-		return -EIO;
-	}
-
-	if (size > drv_data->tx.cfg.block_size || size < sizeof(uint32_t)) {
-		LOG_ERR("This device can only write blocks up to %u bytes",
-			drv_data->tx.cfg.block_size);
-		return -EIO;
-	}
-	ret = dmm_buffer_out_prepare(drv_cfg->mem_reg, buf.mem_block, buf.size,
-				     (void **)&buf.dmm_buf);
-	ret = k_msgq_put(&drv_data->tx_queue, &buf, SYS_TIMEOUT_MS(drv_data->tx.cfg.timeout));
-	if (ret < 0) {
-		return ret;
-	}
-
-	/* Check if interrupt wanted to get next TX buffer before current buffer
-	 * was queued. Do not move this check before queuing because doing so
-	 * opens the possibility for a race condition between this function and
-	 * data_handler() that is called in interrupt context.
-	 */
-	if (drv_data->state == I2S_STATE_RUNNING && drv_data->next_tx_buffer_needed) {
-		tdm_buffers_t next = {0};
-
-		if (!get_next_tx_buffer(drv_data, &next)) {
-			/* Log error because this is definitely unexpected.
-			 * Do not return error because the caller is no longer
-			 * responsible for releasing the buffer.
-			 */
-			LOG_ERR("Cannot reacquire queued buffer");
-			return 0;
-		}
-
-		drv_data->next_tx_buffer_needed = false;
-
-		LOG_DBG("Next TX %p", next.p_tx_buffer);
-
-		if (!supply_next_buffers(drv_data, &next)) {
-			LOG_ERR("Cannot supply buffer");
-			return -EIO;
-		}
-	}
-	return 0;
-}
-
-static int start_transfer(struct tdm_drv_data *drv_data)
-{
-	tdm_buffers_t initial_buffers = {0};
-	int ret = 0;
-
-	if (drv_data->active_dir != I2S_DIR_RX && /* -> TX to be started */
-	    !get_next_tx_buffer(drv_data, &initial_buffers)) {
-		LOG_ERR("No TX buffer available");
-		ret = -ENOMEM;
-	} else if (drv_data->active_dir != I2S_DIR_TX && /* -> RX to be started */
-		   !get_next_rx_buffer(drv_data, &initial_buffers)) {
-		/* Failed to allocate next RX buffer */
-		ret = -ENOMEM;
-	} else {
-		/* It is necessary to set buffer size here only for I2S_DIR_RX,
-		 * because only then the get_next_tx_buffer() call in the if
-		 * condition above gets short-circuited.
-		 */
-		if (drv_data->active_dir == I2S_DIR_RX) {
-			initial_buffers.buffer_size =
-				drv_data->rx.cfg.block_size / sizeof(uint32_t);
-		}
-
-		drv_data->last_tx_buffer = initial_buffers.p_tx_buffer;
-		drv_data->last_tx_mem_slab = initial_buffers.p_tx_mem_slab;
-
-		tdm_start(drv_data, &initial_buffers);
-	}
-	if (ret < 0) {
-		tdm_uninit(drv_data);
-		if (drv_data->request_clock) {
-			(void)onoff_release(drv_data->clk_mgr);
-		}
-
-		if (initial_buffers.p_tx_buffer) {
-			struct tdm_buf buf = {.mem_block = (void *)initial_buffers.p_tx_mem_slab,
-					      .dmm_buf = (void *)initial_buffers.p_tx_buffer,
-					      .size = initial_buffers.buffer_size *
-						      sizeof(uint32_t)};
-			free_tx_buffer(drv_data, &buf);
-		}
-		if (initial_buffers.p_rx_buffer) {
-			struct tdm_buf buf = {.mem_block = initial_buffers.p_rx_mem_slab,
-					      .dmm_buf = (void *)initial_buffers.p_rx_buffer,
-					      .size = initial_buffers.buffer_size *
-						      sizeof(uint32_t)};
-			free_rx_buffer(drv_data, &buf);
-		}
-
-		drv_data->state = I2S_STATE_ERROR;
-	}
-	return ret;
-}
-
-static void tdm_init(struct tdm_drv_data *drv_data, nrf_tdm_config_t const *p_config,
-		     tdm_data_handler_t handler)
-{
-	tdm_ctrl_t *ctrl_data = drv_data->drv_cfg->control_data;
-	NRF_TDM_Type *p_reg = drv_data->drv_cfg->p_reg;
-
-	nrf_tdm_configure(p_reg, p_config);
-	nrf_tdm_mck_set(p_reg, p_config->mck_setup != 0);
-
-	ctrl_data->handler = handler;
-
-	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_RXPTRUPD);
-	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_TXPTRUPD);
-	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_STOPPED);
-	NRFX_IRQ_ENABLE(nrfx_get_irq_number(p_reg));
-}
-
-static void clock_started_callback(struct onoff_manager *mgr, struct onoff_client *cli,
-				   uint32_t state, int res)
-{
-	struct tdm_drv_data *drv_data = CONTAINER_OF(cli, struct tdm_drv_data, clk_cli);
-
-	/* The driver state can be set back to READY at this point if the DROP
-	 * command was triggered before the clock has started. Do not start
-	 * the actual transfer in such case.
-	 */
-	if (drv_data->state == I2S_STATE_READY) {
-		tdm_uninit(drv_data);
-		(void)onoff_release(drv_data->clk_mgr);
-	} else {
-		(void)start_transfer(drv_data);
-	}
-}
-
-static int trigger_start(const struct device *dev)
-{
-	struct tdm_drv_data *drv_data = dev->data;
-	const struct tdm_drv_cfg *drv_cfg = dev->config;
-	int ret;
-	const nrf_tdm_config_t *nrfx_cfg = (drv_data->active_dir == I2S_DIR_TX)
-						   ? &drv_data->tx.nrfx_cfg
-						   : &drv_data->rx.nrfx_cfg;
-
-	tdm_init(drv_data, nrfx_cfg, drv_cfg->data_handler);
-
-	drv_data->state = I2S_STATE_RUNNING;
-
-	nrf_tdm_sck_configure(drv_cfg->p_reg,
-			      drv_cfg->clk_src == ACLK ? NRF_TDM_SRC_ACLK : NRF_TDM_SRC_PCLK32M,
-			      false);
-
-	nrf_tdm_mck_configure(drv_cfg->p_reg,
-			      drv_cfg->clk_src == ACLK ? NRF_TDM_SRC_ACLK : NRF_TDM_SRC_PCLK32M,
-			      false);
-	/* If it is required to use certain HF clock, request it to be running
-	 * first. If not, start the transfer directly.
-	 */
-	if (drv_data->request_clock) {
-		sys_notify_init_callback(&drv_data->clk_cli.notify, clock_started_callback);
-		ret = onoff_request(drv_data->clk_mgr, &drv_data->clk_cli);
-		if (ret < 0) {
-			tdm_uninit(drv_data);
-			drv_data->state = I2S_STATE_READY;
-
-			LOG_ERR("Failed to request clock: %d", ret);
-			return -EIO;
-		}
-	} else {
-		ret = start_transfer(drv_data);
-		if (ret < 0) {
-			return ret;
-		}
-	}
-
-	return 0;
-}
-
-static int tdm_nrfx_trigger(const struct device *dev, enum i2s_dir dir, enum i2s_trigger_cmd cmd)
-{
-	struct tdm_drv_data *drv_data = dev->data;
-	const struct tdm_drv_cfg *drv_cfg = dev->config;
-	bool configured = false;
-	bool cmd_allowed;
-
-	/* This driver does not use the I2S_STATE_NOT_READY value.
-	 * Instead, if a given stream is not configured, the respective
-	 * flag (tx_configured or rx_configured) is cleared.
-	 */
-	drv_data->tx.nrfx_cfg.channels |= drv_data->rx.nrfx_cfg.channels;
-	drv_data->rx.nrfx_cfg.channels |= drv_data->tx.nrfx_cfg.channels;
-	if (dir == I2S_DIR_BOTH) {
-
-		configured = drv_data->tx_configured && drv_data->rx_configured;
-	} else if (dir == I2S_DIR_TX) {
-		configured = drv_data->tx_configured;
-	} else if (dir == I2S_DIR_RX) {
-		configured = drv_data->rx_configured;
-	}
-
-	if (!configured) {
-		LOG_ERR("Device is not configured");
-		return -EIO;
-	}
-
-	if (dir == I2S_DIR_BOTH && (memcmp(&drv_data->tx.nrfx_cfg, &drv_data->rx.nrfx_cfg,
-					   sizeof(drv_data->rx.nrfx_cfg)) != 0 ||
-				    (drv_data->tx.cfg.block_size != drv_data->rx.cfg.block_size))) {
-		LOG_ERR("TX and RX configurations are different");
-		return -EIO;
-	}
-
-	switch (cmd) {
-	case I2S_TRIGGER_START:
-		cmd_allowed = (drv_data->state == I2S_STATE_READY);
-		break;
-	case I2S_TRIGGER_STOP:
-	case I2S_TRIGGER_DRAIN:
-		cmd_allowed = (drv_data->state == I2S_STATE_RUNNING);
-		break;
-	case I2S_TRIGGER_DROP:
-		cmd_allowed = configured;
-		break;
-	case I2S_TRIGGER_PREPARE:
-		cmd_allowed = (drv_data->state == I2S_STATE_ERROR);
-		break;
-	default:
-		LOG_ERR("Invalid trigger: %d", cmd);
-		return -EINVAL;
-	}
-
-	if (!cmd_allowed) {
-		LOG_ERR("Not allowed");
-		return -EIO;
-	}
-
-	/* For triggers applicable to the RUNNING state (i.e. STOP, DRAIN,
-	 * and DROP), ensure that the command is applied to the streams
-	 * that are currently active (this device cannot e.g. stop only TX
-	 * without stopping RX).
-	 */
-	if (drv_data->state == I2S_STATE_RUNNING && drv_data->active_dir != dir) {
-		LOG_ERR("Inappropriate trigger (%d/%d), active stream(s): %d", cmd, dir,
-			drv_data->active_dir);
-		return -EINVAL;
-	}
-
-	switch (cmd) {
-	case I2S_TRIGGER_START:
-		drv_data->stop = false;
-		drv_data->discard_rx = false;
-		drv_data->active_dir = dir;
-		drv_data->next_tx_buffer_needed = false;
-		return trigger_start(dev);
-
-	case I2S_TRIGGER_STOP:
-		drv_data->state = I2S_STATE_STOPPING;
-		drv_data->stop = true;
-		return 0;
-
-	case I2S_TRIGGER_DRAIN:
-		drv_data->state = I2S_STATE_STOPPING;
-		/* If only RX is active, DRAIN is equivalent to STOP. */
-		drv_data->stop = (drv_data->active_dir == I2S_DIR_RX);
-		return 0;
-
-	case I2S_TRIGGER_DROP:
-		if (drv_data->state != I2S_STATE_READY) {
-			drv_data->discard_rx = true;
-			tdm_stop(drv_cfg->p_reg);
-		}
-		purge_queue(dev, dir);
-		drv_data->state = I2S_STATE_READY;
-		return 0;
-
-	case I2S_TRIGGER_PREPARE:
-		purge_queue(dev, dir);
-		drv_data->state = I2S_STATE_READY;
-		return 0;
-
-	default:
-		LOG_ERR("Invalid trigger: %d", cmd);
-		return -EINVAL;
-	}
-}
-
-#if CONFIG_CLOCK_CONTROL_NRF
-static void init_clock_manager(const struct device *dev)
-{
-	struct tdm_drv_data *drv_data = dev->data;
-	clock_control_subsys_t subsys;
-
-#if NRF_CLOCK_HAS_HFCLKAUDIO
-	const struct tdm_drv_cfg *drv_cfg = dev->config;
-
-	if (drv_cfg->clk_src == ACLK) {
-		subsys = CLOCK_CONTROL_NRF_SUBSYS_HFAUDIO;
-	} else {
-		subsys = CLOCK_CONTROL_NRF_SUBSYS_HF;
-	}
-#else
-	subsys = CLOCK_CONTROL_NRF_SUBSYS_HF;
-#endif
-
-	drv_data->clk_mgr = z_nrf_clock_control_get_onoff(subsys);
-	__ASSERT_NO_MSG(drv_data->clk_mgr != NULL);
-}
-#endif /* CONFIG_CLOCK_CONTROL_NRF */
-
-static void data_handler(const struct device *dev, const tdm_buffers_t *released, uint32_t status)
-{
-	struct tdm_drv_data *drv_data = dev->data;
-	const struct tdm_drv_cfg *drv_cfg = dev->config;
-	bool stop_transfer = false;
-	struct tdm_buf buf = {.mem_block = NULL, .dmm_buf = NULL, .size = 0};
-
-	if (released != NULL) {
-		buf.size = released->buffer_size * sizeof(uint32_t);
-	}
-
-	if (status & NRFX_TDM_STATUS_TRANSFER_STOPPED) {
-		if (drv_data->state == I2S_STATE_STOPPING) {
-			drv_data->state = I2S_STATE_READY;
-		}
-		if (drv_data->last_tx_buffer) {
-			/* Usually, these pointers are equal, i.e. the last TX
-			 * buffer that were to be transferred is released by the
-			 * driver after it stops. The last TX buffer pointer is
-			 * then set to NULL here so that the buffer can be freed
-			 * below, just as any other TX buffer released by the
-			 * driver. However, it may happen that the buffer is not
-			 * released this way, for example, when the transfer
-			 * ends with an error because an RX buffer allocation
-			 * fails. In such case, the last TX buffer needs to be
-			 * freed here.
-			 */
-
-			if ((released != NULL) != 0 &&
-			    (drv_data->last_tx_buffer != released->p_tx_buffer)) {
-				buf.dmm_buf = (void *)drv_data->last_tx_buffer;
-				buf.mem_block = (void *)drv_data->last_tx_mem_slab;
-				free_tx_buffer(drv_data, &buf);
-			}
-			drv_data->last_tx_buffer = NULL;
-		}
-		tdm_uninit(drv_data);
-		if (drv_data->request_clock) {
-			(void)onoff_release(drv_data->clk_mgr);
-		}
-	}
-
-	if (released == NULL) {
-		/* This means that buffers for the next part of the transfer
-		 * were not supplied and the previous ones cannot be released
-		 * yet, as pointers to them were latched in the I2S registers.
-		 * It is not an error when the transfer is to be stopped (those
-		 * buffers will be released after the transfer actually stops).
-		 */
-		if (drv_data->state != I2S_STATE_STOPPING) {
-			drv_data->state = I2S_STATE_ERROR;
-		}
-		tdm_stop(drv_cfg->p_reg);
-		return;
-	}
-	if (released->p_rx_buffer) {
-		buf.mem_block = (void *)released->p_rx_mem_slab;
-		buf.dmm_buf = (void *)released->p_rx_buffer;
-		if (drv_data->discard_rx) {
-			free_rx_buffer(drv_data, &buf);
-		} else {
-			int ret = k_msgq_put(&drv_data->rx_queue, &buf, K_NO_WAIT);
-
-			if (ret < 0) {
-				LOG_ERR("No room in RX queue");
-				drv_data->state = I2S_STATE_ERROR;
-				stop_transfer = true;
-
-				free_rx_buffer(drv_data, &buf);
-			} else {
-
-				/* If the TX direction is not active and
-				 * the transfer should be stopped after
-				 * the current block, stop the reception.
-				 */
-				if (drv_data->active_dir == I2S_DIR_RX && drv_data->stop) {
-					drv_data->discard_rx = true;
-					stop_transfer = true;
-				}
-			}
-		}
-	}
-
-	if (released->p_tx_buffer) {
-		buf.mem_block = (void *)released->p_tx_mem_slab;
-		buf.dmm_buf = (void *)released->p_tx_buffer;
-		/* If the last buffer that was to be transferred has just been
-		 * released, it is time to stop the transfer.
-		 */
-		if (released->p_tx_buffer == drv_data->last_tx_buffer) {
-			drv_data->discard_rx = true;
-			stop_transfer = true;
-		} else {
-			free_tx_buffer(drv_data, &buf);
-		}
-	}
-
-	if (stop_transfer) {
-		tdm_stop(drv_cfg->p_reg);
-	} else if (status & NRFX_TDM_STATUS_NEXT_BUFFERS_NEEDED) {
-		tdm_buffers_t next = {0};
-
-		if (drv_data->active_dir != I2S_DIR_RX) { /* -> TX active */
-			if (drv_data->stop) {
-				/* If the stream is to be stopped, don't get
-				 * the next TX buffer from the queue, instead
-				 * supply the one used last time (it won't be
-				 * transferred, the stream will stop right
-				 * before this buffer would be started again).
-				 */
-				next.p_tx_buffer = drv_data->last_tx_buffer;
-				next.p_tx_mem_slab = drv_data->last_tx_mem_slab;
-				next.buffer_size = 1;
-			} else if (get_next_tx_buffer(drv_data, &next)) {
-				/* Next TX buffer successfully retrieved from
-				 * the queue, nothing more to do here.
-				 */
-			} else if (drv_data->state == I2S_STATE_STOPPING) {
-				/* If there are no more TX blocks queued and
-				 * the current state is STOPPING (so the DRAIN
-				 * command was triggered) it is time to finish
-				 * the transfer.
-				 */
-				drv_data->stop = true;
-				/* Supply the same buffer as last time; it will
-				 * not be transferred anyway, as the transfer
-				 * will be stopped earlier.
-				 */
-				next.p_tx_buffer = drv_data->last_tx_buffer;
-				next.p_tx_mem_slab = drv_data->last_tx_mem_slab;
-				next.buffer_size = 1;
-			} else {
-				/* Next TX buffer cannot be supplied now.
-				 * Defer it to when the user writes more data.
-				 */
-				drv_data->next_tx_buffer_needed = true;
-				return;
-			}
-		}
-		(void)supply_next_buffers(drv_data, &next);
-	}
-}
-
-static int data_init(const struct device *dev)
-{
-	struct tdm_drv_data *drv_data = dev->data;
-	const struct tdm_drv_cfg *drv_cfg = dev->config;
-
-	drv_data->state = I2S_STATE_READY;
-	int err = pinctrl_apply_state(drv_cfg->pcfg, PINCTRL_STATE_DEFAULT);
-
-	if (err < 0) {
-		return err;
-	}
-	drv_data->drv_cfg = drv_cfg;
-	IF_ENABLED(CONFIG_CLOCK_CONTROL_NRF, (init_clock_manager(dev);))
-	return err;
-}
-
-static const struct i2s_driver_api tdm_nrf_drv_api = {
-	.configure = tdm_nrfx_configure,
-	.config_get = tdm_nrfx_config_get,
-	.read = tdm_nrfx_read,
-	.write = tdm_nrfx_write,
-	.trigger = tdm_nrfx_trigger,
-};
-
-#define TDM(idx)         DT_NODELABEL(tdm##idx)
-#define TDM_CLK_SRC(idx) DT_STRING_TOKEN(TDM(idx), clock_source)
-#define PCLK_NODE(idx)   DT_CLOCKS_CTLR(TDM(idx))
-
-#define TDM_NRFX_DEVICE(idx)                                                                       \
-	static tdm_ctrl_t tdm##idx##data;                                                          \
-	static struct tdm_buf tx_msgs##idx[CONFIG_TDM_NRFX_TX_BLOCK_COUNT];                        \
-	static struct tdm_buf rx_msgs##idx[CONFIG_TDM_NRFX_RX_BLOCK_COUNT];                        \
-	static void tdm_##idx##_irq_handler(const struct device *dev)                              \
-	{                                                                                          \
-		tdm_irq_handler(dev);                                                              \
-	}                                                                                          \
-	static void tdm_##idx##data_handler(tdm_buffers_t const *p_released, uint32_t status)      \
-	{                                                                                          \
-		data_handler(DEVICE_DT_GET(TDM(idx)), p_released, status);                         \
-	}                                                                                          \
-	PINCTRL_DT_DEFINE(TDM(idx));                                                               \
-	static const struct tdm_drv_cfg tdm_nrfx_cfg##idx = {                                      \
-		.data_handler = tdm_##idx##data_handler,                                           \
-		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(TDM(idx)),                                       \
-		.clk_src = TDM_CLK_SRC(idx),                                                       \
-		.mck_frequency = DT_PROP_OR(TDM(idx), mck_frequency, 0),                           \
-		.pclk_frequency = DT_PROP(PCLK_NODE(idx), clock_frequency),                        \
-		.p_reg = NRF_TDM##idx,                                                             \
-		.control_data = &tdm##idx##data,                                                   \
-		.mem_reg = DMM_DEV_TO_REG(TDM(idx)),                                               \
-	};                                                                                         \
-	static struct tdm_drv_data tdm_nrfx_data##idx;                                             \
-	static int tdm_nrfx_init##idx(const struct device *dev)                                    \
-	{                                                                                          \
-		IRQ_CONNECT(DT_IRQN(TDM(idx)), DT_IRQ(TDM(idx), priority),                         \
-			    tdm_##idx##_irq_handler, DEVICE_DT_GET(TDM(idx)), 0);                  \
-                                                                                                   \
-		int err = data_init(dev);                                                          \
-		if (err < 0) {                                                                     \
-			return err;                                                                \
-		}                                                                                  \
-		k_msgq_init(&tdm_nrfx_data##idx.tx_queue, (char *)tx_msgs##idx,                    \
-			    sizeof(struct tdm_buf), ARRAY_SIZE(tx_msgs##idx));                     \
-		k_msgq_init(&tdm_nrfx_data##idx.rx_queue, (char *)rx_msgs##idx,                    \
-			    sizeof(struct tdm_buf), ARRAY_SIZE(rx_msgs##idx));                     \
-		return 0;                                                                          \
-	}                                                                                          \
-	BUILD_ASSERT(TDM_CLK_SRC(idx) != ACLK, "Clock source ACLK is currently not supported. ");  \
-	DEVICE_DT_DEFINE(TDM(idx), tdm_nrfx_init##idx, NULL, &tdm_nrfx_data##idx,                  \
-			 &tdm_nrfx_cfg##idx, POST_KERNEL, CONFIG_I2S_INIT_PRIORITY,                \
-			 &tdm_nrf_drv_api);
-
-/* Execute macro f(x) for all instances. */
-#define TDM_FOR_EACH_INSTANCE(f, sep, off_code, ...)                                               \
-	NRFX_FOREACH_PRESENT(TDM, f, sep, off_code, __VA_ARGS__)
-
-#define COND_TDM_NRFX_DEVICE(unused, prefix, i, _)                                                 \
-	IF_ENABLED(CONFIG_HAS_HW_NRF_TDM##prefix##i, (TDM_NRFX_DEVICE(prefix##i);))
-
-TDM_FOR_EACH_INSTANCE(COND_TDM_NRFX_DEVICE, (), ())

From f07fb31d8033a32a3d0d3f0ebcd3621001a5aad2 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Wed, 27 Nov 2024 16:19:17 +0100
Subject: [PATCH 2817/2913] [nrf fromlist] drivers: i2s: Add support for nRF
 TDM peripherals

Add a shim that allows using the nRF TDM
(Time division multiplexed audio interface) HAL by I2S Zephyr API.

Upstream PR #: 82144

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 drivers/i2s/CMakeLists.txt |    1 +
 drivers/i2s/Kconfig.nrfx   |   22 +
 drivers/i2s/i2s_nrfx_tdm.c | 1116 ++++++++++++++++++++++++++++++++++++
 3 files changed, 1139 insertions(+)
 create mode 100644 drivers/i2s/i2s_nrfx_tdm.c

diff --git a/drivers/i2s/CMakeLists.txt b/drivers/i2s/CMakeLists.txt
index 7857b6e863b..29a9da412ce 100644
--- a/drivers/i2s/CMakeLists.txt
+++ b/drivers/i2s/CMakeLists.txt
@@ -11,6 +11,7 @@ zephyr_library_sources_ifdef(CONFIG_I2S_STM32		i2s_ll_stm32.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_LITEX		i2s_litex.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_MCUX_FLEXCOMM	i2s_mcux_flexcomm.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_NRFX		i2s_nrfx.c)
+zephyr_library_sources_ifdef(CONFIG_TDM_NRFX		i2s_nrfx_tdm.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_MCUX_SAI	i2s_mcux_sai.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_ESP32		i2s_esp32.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_TEST		i2s_test.c)
diff --git a/drivers/i2s/Kconfig.nrfx b/drivers/i2s/Kconfig.nrfx
index b36f3eb9c64..6c92cda3993 100644
--- a/drivers/i2s/Kconfig.nrfx
+++ b/drivers/i2s/Kconfig.nrfx
@@ -22,3 +22,25 @@ config I2S_NRFX_TX_BLOCK_COUNT
 	default 4
 
 endif # I2S_NRFX
+
+menuconfig TDM_NRFX
+	bool "nRF TDM nrfx driver"
+	default y
+	depends on DT_HAS_NORDIC_NRF_TDM_ENABLED
+	select NRFX_TDM130 if HAS_HW_NRF_TDM130
+	select CLOCK_CONTROL
+	select PINCTRL
+	help
+	  Enable support for nrfx TDM driver for nRF MCU series.
+
+if TDM_NRFX
+
+config TDM_NRFX_RX_BLOCK_COUNT
+	int "RX queue length"
+	default 4
+
+config TDM_NRFX_TX_BLOCK_COUNT
+	int "TX queue length"
+	default 4
+
+endif # TDM_NRFX
diff --git a/drivers/i2s/i2s_nrfx_tdm.c b/drivers/i2s/i2s_nrfx_tdm.c
new file mode 100644
index 00000000000..4ca14ccd48f
--- /dev/null
+++ b/drivers/i2s/i2s_nrfx_tdm.c
@@ -0,0 +1,1116 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <stdlib.h>
+#include <zephyr/drivers/i2s.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <soc.h>
+#include <dmm.h>
+#include <hal/nrf_tdm.h>
+#include <haly/nrfy_gpio.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/irq.h>
+
+LOG_MODULE_REGISTER(tdm_nrfx, CONFIG_I2S_LOG_LEVEL);
+
+/* The application must provide buffers that are to be used in the next
+ * part of the transfer.
+ */
+#define NRFX_TDM_STATUS_NEXT_BUFFERS_NEEDED BIT(0)
+
+/* The TDM peripheral has been stopped and all buffers that were passed
+ * to the driver have been released.
+ */
+#define NRFX_TDM_STATUS_TRANSFER_STOPPED BIT(1)
+
+#define NODE_AUDIOPLL DT_NODELABEL(audiopll)
+
+#if DT_NODE_HAS_STATUS_OKAY(NODE_AUDIOPLL)
+static const struct device *audiopll = DEVICE_DT_GET(NODE_AUDIOPLL);
+const struct nrf_clock_spec aclk_spec = {
+	.frequency = DT_PROP_OR(NODE_AUDIOPLL, frequency, 0),
+	.accuracy = 0,
+	.precision = NRF_CLOCK_CONTROL_PRECISION_DEFAULT,
+};
+#endif
+
+typedef struct {
+	uint32_t *p_rx_buffer;
+	uint32_t const *p_tx_buffer;
+	void *p_tx_mem_slab;
+	void *p_rx_mem_slab;
+	uint16_t buffer_size;
+} tdm_buffers_t;
+
+typedef void (*tdm_data_handler_t)(tdm_buffers_t const *p_released, uint32_t status);
+
+typedef struct {
+	tdm_data_handler_t handler;
+	bool use_rx: 1;
+	bool use_tx: 1;
+	bool rx_ready: 1;
+	bool tx_ready: 1;
+	bool buffers_needed: 1;
+	bool buffers_reused: 1;
+	tdm_buffers_t next_buffers;
+	tdm_buffers_t current_buffers;
+} tdm_ctrl_t;
+
+struct stream_cfg {
+	struct i2s_config cfg;
+	nrf_tdm_config_t nrfx_cfg;
+};
+
+struct tdm_buf {
+	void *mem_block;
+	size_t size;
+	void *dmm_buf;
+};
+
+struct tdm_drv_cfg {
+	tdm_data_handler_t data_handler;
+	const struct pinctrl_dev_config *pcfg;
+	NRF_TDM_Type *p_reg;
+	void *mem_reg;
+	tdm_ctrl_t *control_data;
+	uint32_t mck_frequency;
+	uint32_t pclk_frequency;
+	enum clock_source {
+		PCLK,
+		ACLK
+	} clk_src;
+};
+
+struct tdm_drv_data {
+	struct onoff_client clk_cli;
+	struct stream_cfg tx;
+	struct k_msgq tx_queue;
+	struct stream_cfg rx;
+	struct k_msgq rx_queue;
+	const struct tdm_drv_cfg *drv_cfg;
+	const uint32_t *last_tx_buffer;
+	void *last_tx_mem_slab;
+	enum i2s_state state;
+	enum i2s_dir active_dir;
+	bool stop;       /* stop after the current (TX or RX) block */
+	bool discard_rx; /* discard further RX blocks */
+	volatile bool next_tx_buffer_needed;
+	bool tx_configured: 1;
+	bool rx_configured: 1;
+	bool request_clock: 1;
+};
+
+static int audio_clock_request(struct tdm_drv_data *drv_data)
+{
+#if DT_NODE_HAS_STATUS_OKAY(NODE_AUDIOPLL)
+	return nrf_clock_control_request(audiopll, &aclk_spec, &drv_data->clk_cli);
+#else
+	(void)drv_data;
+
+	return -ENOTSUP;
+#endif
+}
+
+static int audio_clock_release(void)
+{
+#if DT_NODE_HAS_STATUS_OKAY(NODE_AUDIOPLL)
+	return nrf_clock_control_release(audiopll, &aclk_spec);
+#else
+	return -ENOTSUP;
+#endif
+}
+
+void tdm_irq_handler(const struct device *dev)
+{
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+	NRF_TDM_Type *p_reg = drv_cfg->p_reg;
+	tdm_ctrl_t *ctrl_data = drv_cfg->control_data;
+	uint32_t event_mask = 0;
+
+	if (nrf_tdm_event_check(p_reg, NRF_TDM_EVENT_MAXCNT)) {
+		nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_MAXCNT);
+	}
+	if (nrf_tdm_event_check(p_reg, NRF_TDM_EVENT_TXPTRUPD)) {
+		nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_TXPTRUPD);
+		event_mask |= NRFY_EVENT_TO_INT_BITMASK(NRF_TDM_EVENT_TXPTRUPD);
+		ctrl_data->tx_ready = true;
+		if (ctrl_data->use_tx && ctrl_data->buffers_needed) {
+			ctrl_data->buffers_reused = true;
+		}
+	}
+	if (nrf_tdm_event_check(p_reg, NRF_TDM_EVENT_RXPTRUPD)) {
+		nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_RXPTRUPD);
+		event_mask |= NRFY_EVENT_TO_INT_BITMASK(NRF_TDM_EVENT_RXPTRUPD);
+		ctrl_data->rx_ready = true;
+		if (ctrl_data->use_rx && ctrl_data->buffers_needed) {
+			ctrl_data->buffers_reused = true;
+		}
+	}
+	if (nrf_tdm_event_check(p_reg, NRF_TDM_EVENT_STOPPED)) {
+		nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_STOPPED);
+		event_mask |= NRFY_EVENT_TO_INT_BITMASK(NRF_TDM_EVENT_STOPPED);
+		nrf_tdm_int_disable(p_reg, NRF_TDM_INT_STOPPED_MASK_MASK);
+		nrf_tdm_disable(p_reg);
+		/* When stopped, release all buffers, including these scheduled for
+		 * the next part of the transfer, and signal that the transfer has
+		 * finished.
+		 */
+		ctrl_data->handler(&ctrl_data->current_buffers, 0);
+		ctrl_data->handler(&ctrl_data->next_buffers, NRFX_TDM_STATUS_TRANSFER_STOPPED);
+	} else {
+		/* Check if the requested transfer has been completed:
+		 * - full-duplex mode
+		 */
+		if ((ctrl_data->use_tx && ctrl_data->use_rx && ctrl_data->tx_ready &&
+		     ctrl_data->rx_ready) ||
+		    /* - TX only mode */
+		    (!ctrl_data->use_rx && ctrl_data->tx_ready) ||
+		    /* - RX only mode */
+		    (!ctrl_data->use_tx && ctrl_data->rx_ready)) {
+			ctrl_data->tx_ready = false;
+			ctrl_data->rx_ready = false;
+
+			/* If the application did not supply the buffers for the next
+			 * part of the transfer until this moment, the current buffers
+			 * cannot be released, since the I2S peripheral already started
+			 * using them. Signal this situation to the application by
+			 * passing NULL instead of the structure with released buffers.
+			 */
+			if (ctrl_data->buffers_reused) {
+				ctrl_data->buffers_reused = false;
+				/* This will most likely be set at this point. However, there is
+				 * a small time window between TXPTRUPD and RXPTRUPD events,
+				 * and it is theoretically possible that next buffers will be
+				 * set in this window, so to be sure this flag is set to true,
+				 * set it explicitly.
+				 */
+				ctrl_data->buffers_needed = true;
+				ctrl_data->handler(NULL, NRFX_TDM_STATUS_NEXT_BUFFERS_NEEDED);
+			} else {
+				/* Buffers that have been used by the I2S peripheral (current)
+				 * are now released and will be returned to the application,
+				 * and the ones scheduled to be used as next become the current
+				 * ones.
+				 */
+				tdm_buffers_t released_buffers = ctrl_data->current_buffers;
+
+				ctrl_data->current_buffers = ctrl_data->next_buffers;
+				ctrl_data->next_buffers.p_rx_buffer = NULL;
+				ctrl_data->next_buffers.p_tx_buffer = NULL;
+				ctrl_data->buffers_needed = true;
+				ctrl_data->handler(&released_buffers,
+						   NRFX_TDM_STATUS_NEXT_BUFFERS_NEEDED);
+			}
+		}
+	}
+}
+
+static uint32_t div_calculate(uint32_t src_freq, uint32_t requested_clk_freq)
+{
+	enum {
+		MCKCONST = 1048576
+	};
+	/* As specified in the PS:
+	 *
+	 * DIV = 4096 * floor(f_MCK * 1048576 /
+	 *                        (f_source + f_MCK / 2))
+	 * f_actual = f_source /
+	 *            floor(1048576 * 4096 / DIV)
+	 */
+
+	uint32_t ck_div = (uint32_t)(((uint64_t)requested_clk_freq * MCKCONST) /
+				     (src_freq + requested_clk_freq / 2));
+	return (ck_div * 4096);
+}
+
+static bool get_next_tx_buffer(struct tdm_drv_data *drv_data, tdm_buffers_t *buffers)
+{
+	struct tdm_buf buf;
+	int ret = k_msgq_get(&drv_data->tx_queue, &buf, K_NO_WAIT);
+
+	if (ret != 0) {
+		return false;
+	}
+	buffers->p_tx_buffer = buf.dmm_buf;
+	buffers->p_tx_mem_slab = buf.mem_block;
+	buffers->buffer_size = buf.size / sizeof(uint32_t);
+	return true;
+}
+
+static bool get_next_rx_buffer(struct tdm_drv_data *drv_data, tdm_buffers_t *buffers)
+{
+	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
+	int ret = k_mem_slab_alloc(drv_data->rx.cfg.mem_slab, &buffers->p_rx_mem_slab, K_NO_WAIT);
+
+	if (ret < 0) {
+		LOG_ERR("Failed to allocate next RX buffer: %d", ret);
+		return false;
+	}
+	ret = dmm_buffer_in_prepare(drv_cfg->mem_reg, buffers->p_rx_mem_slab,
+				    buffers->buffer_size * sizeof(uint32_t),
+				    (void **)&buffers->p_rx_buffer);
+	if (ret < 0) {
+		LOG_ERR("Failed to prepare buffer: %d", ret);
+		return false;
+	}
+
+	return true;
+}
+
+static void free_tx_buffer(struct tdm_drv_data *drv_data, struct tdm_buf *buf)
+{
+	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
+
+	(void)dmm_buffer_out_release(drv_cfg->mem_reg, buf->dmm_buf);
+	k_mem_slab_free(drv_data->tx.cfg.mem_slab, buf->mem_block);
+	LOG_DBG("Freed TX %p", buf->mem_block);
+}
+
+static void free_rx_buffer(struct tdm_drv_data *drv_data, struct tdm_buf *buf)
+{
+	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
+
+	(void)dmm_buffer_in_release(drv_cfg->mem_reg, buf->mem_block, buf->size, buf->dmm_buf);
+	k_mem_slab_free(drv_data->rx.cfg.mem_slab, buf->mem_block);
+	LOG_DBG("Freed RX %p", buf->mem_block);
+}
+
+static void tdm_start(struct tdm_drv_data *drv_data, tdm_buffers_t const *p_initial_buffers)
+{
+	NRF_TDM_Type *p_reg = drv_data->drv_cfg->p_reg;
+	tdm_ctrl_t *ctrl_data = drv_data->drv_cfg->control_data;
+
+	__ASSERT_NO_MSG(p_initial_buffers->p_rx_buffer != NULL ||
+			p_initial_buffers->p_tx_buffer != NULL);
+	ctrl_data->use_rx = (p_initial_buffers->p_rx_buffer != NULL);
+	ctrl_data->use_tx = (p_initial_buffers->p_tx_buffer != NULL);
+	ctrl_data->rx_ready = false;
+	ctrl_data->tx_ready = false;
+	ctrl_data->buffers_needed = false;
+
+	ctrl_data->next_buffers = *p_initial_buffers;
+	ctrl_data->current_buffers.p_rx_buffer = NULL;
+	ctrl_data->current_buffers.p_tx_buffer = NULL;
+	nrf_tdm_enable(p_reg);
+
+	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_RXPTRUPD);
+	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_TXPTRUPD);
+
+	nrf_tdm_int_enable(
+		p_reg,
+		(p_initial_buffers->p_rx_buffer ? NRF_TDM_INT_RXPTRUPD_MASK_MASK : 0UL) |
+			(p_initial_buffers->p_tx_buffer ? NRF_TDM_INT_TXPTRUPD_MASK_MASK : 0UL) |
+			NRF_TDM_INT_STOPPED_MASK_MASK);
+
+	nrf_tdm_tx_count_set(p_reg, p_initial_buffers->buffer_size);
+	nrf_tdm_rx_count_set(p_reg, p_initial_buffers->buffer_size);
+	nrf_tdm_rx_buffer_set(p_reg, p_initial_buffers->p_rx_buffer);
+	nrf_tdm_tx_buffer_set(p_reg, p_initial_buffers->p_tx_buffer);
+	nrf_tdm_task_trigger(p_reg, NRF_TDM_TASK_START);
+}
+
+static void tdm_stop(NRF_TDM_Type *p_reg)
+{
+	nrf_tdm_int_disable(p_reg, NRF_TDM_INT_RXPTRUPD_MASK_MASK | NRF_TDM_INT_TXPTRUPD_MASK_MASK);
+
+	nrf_tdm_task_trigger(p_reg, NRF_TDM_TASK_STOP);
+}
+
+static bool next_buffers_set(struct tdm_drv_data *drv_data, tdm_buffers_t const *p_buffers)
+{
+	NRF_TDM_Type *p_reg = drv_data->drv_cfg->p_reg;
+	tdm_ctrl_t *ctrl_data = drv_data->drv_cfg->control_data;
+	nrf_tdm_rxtxen_t dir = NRF_TDM_RXTXEN_DUPLEX;
+
+	__ASSERT_NO_MSG(p_buffers->p_rx_buffer != NULL || p_buffers->p_tx_buffer != NULL);
+
+	if (!ctrl_data->buffers_needed) {
+		return false;
+	}
+
+	nrf_tdm_tx_count_set(p_reg, p_buffers->buffer_size);
+	nrf_tdm_rx_count_set(p_reg, p_buffers->buffer_size);
+	nrf_tdm_rx_buffer_set(p_reg, p_buffers->p_rx_buffer);
+	nrf_tdm_tx_buffer_set(p_reg, p_buffers->p_tx_buffer);
+
+	if (p_buffers->p_rx_buffer == NULL) {
+		dir = NRF_TDM_RXTXEN_TX;
+	} else if (p_buffers->p_tx_buffer == NULL) {
+		dir = NRF_TDM_RXTXEN_RX;
+	}
+	nrf_tdm_transfer_direction_set(p_reg, dir);
+
+	ctrl_data->next_buffers = *p_buffers;
+	ctrl_data->buffers_needed = false;
+
+	return true;
+}
+
+static bool supply_next_buffers(struct tdm_drv_data *drv_data, tdm_buffers_t *next)
+{
+	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
+
+	if (drv_data->active_dir != I2S_DIR_TX) { /* -> RX active */
+		if (!get_next_rx_buffer(drv_data, next)) {
+			drv_data->state = I2S_STATE_ERROR;
+			tdm_stop(drv_cfg->p_reg);
+			return false;
+		}
+		/* Set buffer size if there is no TX buffer (which effectively
+		 * controls how many bytes will be received).
+		 */
+		if (drv_data->active_dir == I2S_DIR_RX) {
+			next->buffer_size = drv_data->rx.cfg.block_size / sizeof(uint32_t);
+		}
+	}
+
+	drv_data->last_tx_buffer = next->p_tx_buffer;
+	drv_data->last_tx_mem_slab = next->p_tx_mem_slab;
+
+	LOG_DBG("Next buffers: %p/%p", next->p_tx_buffer, next->p_rx_buffer);
+	return next_buffers_set(drv_data, next);
+}
+
+static void purge_queue(const struct device *dev, enum i2s_dir dir)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	struct tdm_buf buf;
+
+	if (dir == I2S_DIR_TX || dir == I2S_DIR_BOTH) {
+		while (k_msgq_get(&drv_data->tx_queue, &buf, K_NO_WAIT) == 0) {
+			free_tx_buffer(drv_data, &buf);
+		}
+	}
+
+	if (dir == I2S_DIR_RX || dir == I2S_DIR_BOTH) {
+		while (k_msgq_get(&drv_data->rx_queue, &buf, K_NO_WAIT) == 0) {
+			free_rx_buffer(drv_data, &buf);
+		}
+	}
+}
+
+static void tdm_uninit(struct tdm_drv_data *drv_data)
+{
+	NRF_TDM_Type *p_reg = drv_data->drv_cfg->p_reg;
+
+	tdm_stop(p_reg);
+	NRFX_IRQ_DISABLE(nrfx_get_irq_number(p_reg));
+}
+
+static int tdm_nrfx_configure(const struct device *dev, enum i2s_dir dir,
+			      const struct i2s_config *tdm_cfg)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+	nrf_tdm_config_t nrfx_cfg;
+	uint32_t chan_mask = 0;
+
+	if (drv_data->state != I2S_STATE_READY) {
+		LOG_ERR("Cannot configure in state: %d", drv_data->state);
+		return -EINVAL;
+	}
+
+	if (tdm_cfg->frame_clk_freq == 0) { /* -> reset state */
+		purge_queue(dev, dir);
+		if (dir == I2S_DIR_TX || dir == I2S_DIR_BOTH) {
+			drv_data->tx_configured = false;
+			memset(&drv_data->tx, 0, sizeof(drv_data->tx));
+		}
+		if (dir == I2S_DIR_RX || dir == I2S_DIR_BOTH) {
+			drv_data->rx_configured = false;
+			memset(&drv_data->rx, 0, sizeof(drv_data->rx));
+		}
+		return 0;
+	}
+
+	__ASSERT_NO_MSG(tdm_cfg->mem_slab != NULL && tdm_cfg->block_size != 0);
+
+	if ((tdm_cfg->block_size % sizeof(uint32_t)) != 0) {
+		LOG_ERR("This device can transfer only full 32-bit words");
+		return -EINVAL;
+	}
+
+	switch (tdm_cfg->word_size) {
+	case 8:
+		nrfx_cfg.sample_width = NRF_TDM_SWIDTH_8BIT;
+		break;
+	case 16:
+		nrfx_cfg.sample_width = NRF_TDM_SWIDTH_16BIT;
+		break;
+	case 24:
+		nrfx_cfg.sample_width = NRF_TDM_SWIDTH_24BIT;
+		break;
+	case 32:
+		nrfx_cfg.sample_width = NRF_TDM_SWIDTH_32BIT;
+		break;
+	default:
+		LOG_ERR("Unsupported word size: %u", tdm_cfg->word_size);
+		return -EINVAL;
+	}
+
+	switch (tdm_cfg->format & I2S_FMT_DATA_FORMAT_MASK) {
+	case I2S_FMT_DATA_FORMAT_I2S:
+		nrfx_cfg.alignment = NRF_TDM_ALIGN_LEFT;
+		nrfx_cfg.fsync_polarity = NRF_TDM_POLARITY_NEGEDGE;
+		nrfx_cfg.sck_polarity = NRF_TDM_POLARITY_POSEDGE;
+		nrfx_cfg.fsync_duration = NRF_TDM_FSYNC_DURATION_CHANNEL;
+		nrfx_cfg.channel_delay = NRF_TDM_CHANNEL_DELAY_1CK;
+		break;
+	case I2S_FMT_DATA_FORMAT_LEFT_JUSTIFIED:
+		nrfx_cfg.alignment = NRF_TDM_ALIGN_LEFT;
+		nrfx_cfg.fsync_polarity = NRF_TDM_POLARITY_POSEDGE;
+		nrfx_cfg.sck_polarity = NRF_TDM_POLARITY_POSEDGE;
+		nrfx_cfg.fsync_duration = NRF_TDM_FSYNC_DURATION_CHANNEL;
+		nrfx_cfg.channel_delay = NRF_TDM_CHANNEL_DELAY_NONE;
+		break;
+	case I2S_FMT_DATA_FORMAT_RIGHT_JUSTIFIED:
+		nrfx_cfg.alignment = NRF_TDM_ALIGN_RIGHT;
+		nrfx_cfg.fsync_polarity = NRF_TDM_POLARITY_POSEDGE;
+		nrfx_cfg.sck_polarity = NRF_TDM_POLARITY_POSEDGE;
+		nrfx_cfg.fsync_duration = NRF_TDM_FSYNC_DURATION_CHANNEL;
+		nrfx_cfg.channel_delay = NRF_TDM_CHANNEL_DELAY_NONE;
+		break;
+	default:
+		LOG_ERR("Unsupported data format: 0x%02x", tdm_cfg->format);
+		return -EINVAL;
+	}
+
+	if ((tdm_cfg->format & I2S_FMT_DATA_ORDER_LSB) || (tdm_cfg->format & I2S_FMT_BIT_CLK_INV) ||
+	    (tdm_cfg->format & I2S_FMT_FRAME_CLK_INV)) {
+		LOG_ERR("Unsupported stream format: 0x%02x", tdm_cfg->format);
+		return -EINVAL;
+	}
+
+	if (tdm_cfg->channels == 2) {
+		nrfx_cfg.num_of_channels = NRF_TDM_CHANNELS_COUNT_2;
+	} else if (tdm_cfg->channels == 1) {
+		nrfx_cfg.num_of_channels = NRF_TDM_CHANNELS_COUNT_1;
+	} else {
+		LOG_ERR("Unsupported number of channels: %u", tdm_cfg->channels);
+		return -EINVAL;
+	}
+	chan_mask = BIT_MASK(tdm_cfg->channels);
+
+	if ((tdm_cfg->options & I2S_OPT_BIT_CLK_SLAVE) &&
+	    (tdm_cfg->options & I2S_OPT_FRAME_CLK_SLAVE)) {
+		nrfx_cfg.mode = NRF_TDM_MODE_SLAVE;
+	} else if (!(tdm_cfg->options & I2S_OPT_BIT_CLK_SLAVE) &&
+		   !(tdm_cfg->options & I2S_OPT_FRAME_CLK_SLAVE)) {
+		nrfx_cfg.mode = NRF_TDM_MODE_MASTER;
+	} else {
+		LOG_ERR("Unsupported operation mode: 0x%02x", tdm_cfg->options);
+		return -EINVAL;
+	}
+
+	nrfx_cfg.mck_setup = 0;
+	if (nrfx_cfg.mode == NRF_TDM_MODE_MASTER) {
+		uint32_t sck = tdm_cfg->word_size * tdm_cfg->frame_clk_freq * tdm_cfg->channels;
+		const uint32_t src_freq = (drv_cfg->clk_src == ACLK)
+						  ? DT_PROP_OR(NODE_AUDIOPLL, frequency, 0)
+						  : drv_cfg->pclk_frequency;
+
+		/* Unless the PCLK source is used,
+		 * it is required to request the proper clock to be running
+		 * before starting the transfer itself.
+		 */
+		drv_data->request_clock = (drv_cfg->clk_src != PCLK);
+		nrfx_cfg.sck_setup = div_calculate(src_freq, sck);
+
+		if (((nrf_tdm_mck_pin_get(drv_cfg->p_reg) & TDM_PSEL_MCK_CONNECT_Msk) ==
+		     TDM_PSEL_MCK_CONNECT_Connected << TDM_PSEL_MCK_CONNECT_Pos) &&
+		    drv_cfg->mck_frequency != 0) {
+			nrfx_cfg.mck_setup = div_calculate(src_freq, drv_cfg->mck_frequency);
+		}
+	} else {
+		drv_data->request_clock = false;
+	}
+
+	if ((tdm_cfg->options & I2S_OPT_LOOPBACK) || (tdm_cfg->options & I2S_OPT_PINGPONG)) {
+		LOG_ERR("Unsupported options: 0x%02x", tdm_cfg->options);
+		return -EINVAL;
+	}
+
+	if (dir == I2S_DIR_TX || dir == I2S_DIR_BOTH) {
+		nrfx_cfg.channels = (chan_mask << TDM_CONFIG_CHANNEL_MASK_Tx0Enable_Pos);
+		drv_data->tx.cfg = *tdm_cfg;
+		drv_data->tx.nrfx_cfg = nrfx_cfg;
+		drv_data->tx_configured = true;
+	}
+
+	if (dir == I2S_DIR_RX || dir == I2S_DIR_BOTH) {
+		nrfx_cfg.channels = (chan_mask << TDM_CONFIG_CHANNEL_MASK_Rx0Enable_Pos);
+		drv_data->rx.cfg = *tdm_cfg;
+		drv_data->rx.nrfx_cfg = nrfx_cfg;
+		drv_data->rx_configured = true;
+	}
+	return 0;
+}
+
+static const struct i2s_config *tdm_nrfx_config_get(const struct device *dev, enum i2s_dir dir)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+
+	if (dir == I2S_DIR_TX && drv_data->tx_configured) {
+		return &drv_data->tx.cfg;
+	}
+	if (dir == I2S_DIR_RX && drv_data->rx_configured) {
+		return &drv_data->rx.cfg;
+	}
+
+	return NULL;
+}
+
+static int tdm_nrfx_read(const struct device *dev, void **mem_block, size_t *size)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
+	struct tdm_buf buf;
+	int ret;
+
+	if (!drv_data->rx_configured) {
+		LOG_ERR("Device is not configured");
+		return -EIO;
+	}
+	ret = k_msgq_get(&drv_data->rx_queue, &buf,
+			 (drv_data->state == I2S_STATE_ERROR)
+				 ? K_NO_WAIT
+				 : SYS_TIMEOUT_MS(drv_data->rx.cfg.timeout));
+	if (ret == -ENOMSG) {
+		return -EIO;
+	}
+
+	LOG_DBG("Released RX %p", buf.mem_block);
+
+	if (ret == 0) {
+		(void)dmm_buffer_in_release(drv_cfg->mem_reg, buf.mem_block, buf.size, buf.dmm_buf);
+		*mem_block = buf.mem_block;
+		*size = buf.size;
+	}
+	return ret;
+}
+
+static int tdm_nrfx_write(const struct device *dev, void *mem_block, size_t size)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+	struct tdm_buf buf = {.mem_block = mem_block, .size = size};
+	int ret;
+
+	if (!drv_data->tx_configured) {
+		LOG_ERR("Device is not configured");
+		return -EIO;
+	}
+
+	if (drv_data->state != I2S_STATE_RUNNING && drv_data->state != I2S_STATE_READY) {
+		LOG_ERR("Cannot write in state: %d", drv_data->state);
+		return -EIO;
+	}
+
+	if (size > drv_data->tx.cfg.block_size || size < sizeof(uint32_t)) {
+		LOG_ERR("This device can only write blocks up to %u bytes",
+			drv_data->tx.cfg.block_size);
+		return -EIO;
+	}
+	ret = dmm_buffer_out_prepare(drv_cfg->mem_reg, buf.mem_block, buf.size,
+				     (void **)&buf.dmm_buf);
+	ret = k_msgq_put(&drv_data->tx_queue, &buf, SYS_TIMEOUT_MS(drv_data->tx.cfg.timeout));
+	if (ret < 0) {
+		return ret;
+	}
+
+	/* Check if interrupt wanted to get next TX buffer before current buffer
+	 * was queued. Do not move this check before queuing because doing so
+	 * opens the possibility for a race condition between this function and
+	 * data_handler() that is called in interrupt context.
+	 */
+	if (drv_data->state == I2S_STATE_RUNNING && drv_data->next_tx_buffer_needed) {
+		tdm_buffers_t next = {0};
+
+		if (!get_next_tx_buffer(drv_data, &next)) {
+			/* Log error because this is definitely unexpected.
+			 * Do not return error because the caller is no longer
+			 * responsible for releasing the buffer.
+			 */
+			LOG_ERR("Cannot reacquire queued buffer");
+			return 0;
+		}
+
+		drv_data->next_tx_buffer_needed = false;
+
+		LOG_DBG("Next TX %p", next.p_tx_buffer);
+
+		if (!supply_next_buffers(drv_data, &next)) {
+			LOG_ERR("Cannot supply buffer");
+			return -EIO;
+		}
+	}
+	return 0;
+}
+
+static int start_transfer(struct tdm_drv_data *drv_data)
+{
+	tdm_buffers_t initial_buffers = {0};
+	int ret = 0;
+
+	if (drv_data->active_dir != I2S_DIR_RX && /* -> TX to be started */
+	    !get_next_tx_buffer(drv_data, &initial_buffers)) {
+		LOG_ERR("No TX buffer available");
+		ret = -ENOMEM;
+	} else if (drv_data->active_dir != I2S_DIR_TX && /* -> RX to be started */
+		   !get_next_rx_buffer(drv_data, &initial_buffers)) {
+		/* Failed to allocate next RX buffer */
+		ret = -ENOMEM;
+	} else {
+		/* It is necessary to set buffer size here only for I2S_DIR_RX,
+		 * because only then the get_next_tx_buffer() call in the if
+		 * condition above gets short-circuited.
+		 */
+		if (drv_data->active_dir == I2S_DIR_RX) {
+			initial_buffers.buffer_size =
+				drv_data->rx.cfg.block_size / sizeof(uint32_t);
+		}
+
+		drv_data->last_tx_buffer = initial_buffers.p_tx_buffer;
+		drv_data->last_tx_mem_slab = initial_buffers.p_tx_mem_slab;
+
+		tdm_start(drv_data, &initial_buffers);
+	}
+	if (ret < 0) {
+		tdm_uninit(drv_data);
+		if (drv_data->request_clock) {
+			(void)audio_clock_release();
+		}
+
+		if (initial_buffers.p_tx_buffer) {
+			struct tdm_buf buf = {.mem_block = (void *)initial_buffers.p_tx_mem_slab,
+					      .dmm_buf = (void *)initial_buffers.p_tx_buffer,
+					      .size = initial_buffers.buffer_size *
+						      sizeof(uint32_t)};
+			free_tx_buffer(drv_data, &buf);
+		}
+		if (initial_buffers.p_rx_buffer) {
+			struct tdm_buf buf = {.mem_block = initial_buffers.p_rx_mem_slab,
+					      .dmm_buf = (void *)initial_buffers.p_rx_buffer,
+					      .size = initial_buffers.buffer_size *
+						      sizeof(uint32_t)};
+			free_rx_buffer(drv_data, &buf);
+		}
+
+		drv_data->state = I2S_STATE_ERROR;
+	}
+	return ret;
+}
+
+static void tdm_init(struct tdm_drv_data *drv_data, nrf_tdm_config_t const *p_config,
+		     tdm_data_handler_t handler)
+{
+	tdm_ctrl_t *ctrl_data = drv_data->drv_cfg->control_data;
+	NRF_TDM_Type *p_reg = drv_data->drv_cfg->p_reg;
+
+	nrf_tdm_configure(p_reg, p_config);
+	nrf_tdm_mck_set(p_reg, p_config->mck_setup != 0);
+
+	ctrl_data->handler = handler;
+
+	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_RXPTRUPD);
+	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_TXPTRUPD);
+	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_STOPPED);
+	NRFX_IRQ_ENABLE(nrfx_get_irq_number(p_reg));
+}
+
+static void clock_started_callback(struct onoff_manager *mgr, struct onoff_client *cli,
+				   uint32_t state, int res)
+{
+	struct tdm_drv_data *drv_data = CONTAINER_OF(cli, struct tdm_drv_data, clk_cli);
+
+	/* The driver state can be set back to READY at this point if the DROP
+	 * command was triggered before the clock has started. Do not start
+	 * the actual transfer in such case.
+	 */
+	if (drv_data->state == I2S_STATE_READY) {
+		tdm_uninit(drv_data);
+		(void)audio_clock_release();
+	} else {
+		(void)start_transfer(drv_data);
+	}
+}
+
+static int trigger_start(const struct device *dev)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+	int ret;
+	const nrf_tdm_config_t *nrfx_cfg = (drv_data->active_dir == I2S_DIR_TX)
+						   ? &drv_data->tx.nrfx_cfg
+						   : &drv_data->rx.nrfx_cfg;
+
+	tdm_init(drv_data, nrfx_cfg, drv_cfg->data_handler);
+
+	drv_data->state = I2S_STATE_RUNNING;
+
+	nrf_tdm_sck_configure(drv_cfg->p_reg,
+			      drv_cfg->clk_src == ACLK ? NRF_TDM_SRC_ACLK : NRF_TDM_SRC_PCLK32M,
+			      false);
+
+	nrf_tdm_mck_configure(drv_cfg->p_reg,
+			      drv_cfg->clk_src == ACLK ? NRF_TDM_SRC_ACLK : NRF_TDM_SRC_PCLK32M,
+			      false);
+	/* If it is required to use certain HF clock, request it to be running
+	 * first. If not, start the transfer directly.
+	 */
+	if (drv_data->request_clock) {
+		sys_notify_init_callback(&drv_data->clk_cli.notify, clock_started_callback);
+		ret = audio_clock_request(drv_data);
+		if (ret < 0) {
+			tdm_uninit(drv_data);
+			drv_data->state = I2S_STATE_READY;
+
+			LOG_ERR("Failed to request clock: %d", ret);
+			return -EIO;
+		}
+	} else {
+		ret = start_transfer(drv_data);
+		if (ret < 0) {
+			return ret;
+		}
+	}
+
+	return 0;
+}
+
+static int tdm_nrfx_trigger(const struct device *dev, enum i2s_dir dir, enum i2s_trigger_cmd cmd)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+	bool configured = false;
+	bool cmd_allowed;
+
+	/* This driver does not use the I2S_STATE_NOT_READY value.
+	 * Instead, if a given stream is not configured, the respective
+	 * flag (tx_configured or rx_configured) is cleared.
+	 */
+	drv_data->tx.nrfx_cfg.channels |= drv_data->rx.nrfx_cfg.channels;
+	drv_data->rx.nrfx_cfg.channels |= drv_data->tx.nrfx_cfg.channels;
+	if (dir == I2S_DIR_BOTH) {
+
+		configured = drv_data->tx_configured && drv_data->rx_configured;
+	} else if (dir == I2S_DIR_TX) {
+		configured = drv_data->tx_configured;
+	} else if (dir == I2S_DIR_RX) {
+		configured = drv_data->rx_configured;
+	}
+
+	if (!configured) {
+		LOG_ERR("Device is not configured");
+		return -EIO;
+	}
+
+	if (dir == I2S_DIR_BOTH && (memcmp(&drv_data->tx.nrfx_cfg, &drv_data->rx.nrfx_cfg,
+					   sizeof(drv_data->rx.nrfx_cfg)) != 0 ||
+				    (drv_data->tx.cfg.block_size != drv_data->rx.cfg.block_size))) {
+		LOG_ERR("TX and RX configurations are different");
+		return -EIO;
+	}
+
+	switch (cmd) {
+	case I2S_TRIGGER_START:
+		cmd_allowed = (drv_data->state == I2S_STATE_READY);
+		break;
+	case I2S_TRIGGER_STOP:
+	case I2S_TRIGGER_DRAIN:
+		cmd_allowed = (drv_data->state == I2S_STATE_RUNNING);
+		break;
+	case I2S_TRIGGER_DROP:
+		cmd_allowed = configured;
+		break;
+	case I2S_TRIGGER_PREPARE:
+		cmd_allowed = (drv_data->state == I2S_STATE_ERROR);
+		break;
+	default:
+		LOG_ERR("Invalid trigger: %d", cmd);
+		return -EINVAL;
+	}
+
+	if (!cmd_allowed) {
+		LOG_ERR("Not allowed");
+		return -EIO;
+	}
+
+	/* For triggers applicable to the RUNNING state (i.e. STOP, DRAIN,
+	 * and DROP), ensure that the command is applied to the streams
+	 * that are currently active (this device cannot e.g. stop only TX
+	 * without stopping RX).
+	 */
+	if (drv_data->state == I2S_STATE_RUNNING && drv_data->active_dir != dir) {
+		LOG_ERR("Inappropriate trigger (%d/%d), active stream(s): %d", cmd, dir,
+			drv_data->active_dir);
+		return -EINVAL;
+	}
+
+	switch (cmd) {
+	case I2S_TRIGGER_START:
+		drv_data->stop = false;
+		drv_data->discard_rx = false;
+		drv_data->active_dir = dir;
+		drv_data->next_tx_buffer_needed = false;
+		return trigger_start(dev);
+
+	case I2S_TRIGGER_STOP:
+		drv_data->state = I2S_STATE_STOPPING;
+		drv_data->stop = true;
+		return 0;
+
+	case I2S_TRIGGER_DRAIN:
+		drv_data->state = I2S_STATE_STOPPING;
+		/* If only RX is active, DRAIN is equivalent to STOP. */
+		drv_data->stop = (drv_data->active_dir == I2S_DIR_RX);
+		return 0;
+
+	case I2S_TRIGGER_DROP:
+		if (drv_data->state != I2S_STATE_READY) {
+			drv_data->discard_rx = true;
+			tdm_stop(drv_cfg->p_reg);
+		}
+		purge_queue(dev, dir);
+		drv_data->state = I2S_STATE_READY;
+		return 0;
+
+	case I2S_TRIGGER_PREPARE:
+		purge_queue(dev, dir);
+		drv_data->state = I2S_STATE_READY;
+		return 0;
+
+	default:
+		LOG_ERR("Invalid trigger: %d", cmd);
+		return -EINVAL;
+	}
+}
+
+static void data_handler(const struct device *dev, const tdm_buffers_t *released, uint32_t status)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+	bool stop_transfer = false;
+	struct tdm_buf buf = {.mem_block = NULL, .dmm_buf = NULL, .size = 0};
+
+	if (released != NULL) {
+		buf.size = released->buffer_size * sizeof(uint32_t);
+	}
+
+	if (status & NRFX_TDM_STATUS_TRANSFER_STOPPED) {
+		if (drv_data->state == I2S_STATE_STOPPING) {
+			drv_data->state = I2S_STATE_READY;
+		}
+		if (drv_data->last_tx_buffer) {
+			/* Usually, these pointers are equal, i.e. the last TX
+			 * buffer that were to be transferred is released by the
+			 * driver after it stops. The last TX buffer pointer is
+			 * then set to NULL here so that the buffer can be freed
+			 * below, just as any other TX buffer released by the
+			 * driver. However, it may happen that the buffer is not
+			 * released this way, for example, when the transfer
+			 * ends with an error because an RX buffer allocation
+			 * fails. In such case, the last TX buffer needs to be
+			 * freed here.
+			 */
+
+			if ((released != NULL) != 0 &&
+			    (drv_data->last_tx_buffer != released->p_tx_buffer)) {
+				buf.dmm_buf = (void *)drv_data->last_tx_buffer;
+				buf.mem_block = (void *)drv_data->last_tx_mem_slab;
+				free_tx_buffer(drv_data, &buf);
+			}
+			drv_data->last_tx_buffer = NULL;
+		}
+		tdm_uninit(drv_data);
+		if (drv_data->request_clock) {
+			(void)audio_clock_release();
+		}
+	}
+
+	if (released == NULL) {
+		/* This means that buffers for the next part of the transfer
+		 * were not supplied and the previous ones cannot be released
+		 * yet, as pointers to them were latched in the I2S registers.
+		 * It is not an error when the transfer is to be stopped (those
+		 * buffers will be released after the transfer actually stops).
+		 */
+		if (drv_data->state != I2S_STATE_STOPPING) {
+			drv_data->state = I2S_STATE_ERROR;
+		}
+		tdm_stop(drv_cfg->p_reg);
+		return;
+	}
+	if (released->p_rx_buffer) {
+		buf.mem_block = (void *)released->p_rx_mem_slab;
+		buf.dmm_buf = (void *)released->p_rx_buffer;
+		if (drv_data->discard_rx) {
+			free_rx_buffer(drv_data, &buf);
+		} else {
+			int ret = k_msgq_put(&drv_data->rx_queue, &buf, K_NO_WAIT);
+
+			if (ret < 0) {
+				LOG_ERR("No room in RX queue");
+				drv_data->state = I2S_STATE_ERROR;
+				stop_transfer = true;
+
+				free_rx_buffer(drv_data, &buf);
+			} else {
+
+				/* If the TX direction is not active and
+				 * the transfer should be stopped after
+				 * the current block, stop the reception.
+				 */
+				if (drv_data->active_dir == I2S_DIR_RX && drv_data->stop) {
+					drv_data->discard_rx = true;
+					stop_transfer = true;
+				}
+			}
+		}
+	}
+
+	if (released->p_tx_buffer) {
+		buf.mem_block = (void *)released->p_tx_mem_slab;
+		buf.dmm_buf = (void *)released->p_tx_buffer;
+		/* If the last buffer that was to be transferred has just been
+		 * released, it is time to stop the transfer.
+		 */
+		if (released->p_tx_buffer == drv_data->last_tx_buffer) {
+			drv_data->discard_rx = true;
+			stop_transfer = true;
+		} else {
+			free_tx_buffer(drv_data, &buf);
+		}
+	}
+
+	if (stop_transfer) {
+		tdm_stop(drv_cfg->p_reg);
+	} else if (status & NRFX_TDM_STATUS_NEXT_BUFFERS_NEEDED) {
+		tdm_buffers_t next = {0};
+
+		if (drv_data->active_dir != I2S_DIR_RX) { /* -> TX active */
+			if (drv_data->stop) {
+				/* If the stream is to be stopped, don't get
+				 * the next TX buffer from the queue, instead
+				 * supply the one used last time (it won't be
+				 * transferred, the stream will stop right
+				 * before this buffer would be started again).
+				 */
+				next.p_tx_buffer = drv_data->last_tx_buffer;
+				next.p_tx_mem_slab = drv_data->last_tx_mem_slab;
+				next.buffer_size = 1;
+			} else if (get_next_tx_buffer(drv_data, &next)) {
+				/* Next TX buffer successfully retrieved from
+				 * the queue, nothing more to do here.
+				 */
+			} else if (drv_data->state == I2S_STATE_STOPPING) {
+				/* If there are no more TX blocks queued and
+				 * the current state is STOPPING (so the DRAIN
+				 * command was triggered) it is time to finish
+				 * the transfer.
+				 */
+				drv_data->stop = true;
+				/* Supply the same buffer as last time; it will
+				 * not be transferred anyway, as the transfer
+				 * will be stopped earlier.
+				 */
+				next.p_tx_buffer = drv_data->last_tx_buffer;
+				next.p_tx_mem_slab = drv_data->last_tx_mem_slab;
+				next.buffer_size = 1;
+			} else {
+				/* Next TX buffer cannot be supplied now.
+				 * Defer it to when the user writes more data.
+				 */
+				drv_data->next_tx_buffer_needed = true;
+				return;
+			}
+		}
+		(void)supply_next_buffers(drv_data, &next);
+	}
+}
+
+static int data_init(const struct device *dev)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+
+	drv_data->state = I2S_STATE_READY;
+	int err = pinctrl_apply_state(drv_cfg->pcfg, PINCTRL_STATE_DEFAULT);
+
+	if (err < 0) {
+		return err;
+	}
+	drv_data->drv_cfg = drv_cfg;
+	return err;
+}
+
+static const struct i2s_driver_api tdm_nrf_drv_api = {
+	.configure = tdm_nrfx_configure,
+	.config_get = tdm_nrfx_config_get,
+	.read = tdm_nrfx_read,
+	.write = tdm_nrfx_write,
+	.trigger = tdm_nrfx_trigger,
+};
+
+#define TDM(idx)         DT_NODELABEL(tdm##idx)
+#define TDM_CLK_SRC(idx) DT_STRING_TOKEN(TDM(idx), clock_source)
+#define PCLK_NODE(idx)   DT_CLOCKS_CTLR(TDM(idx))
+
+#define TDM_NRFX_DEVICE(idx)                                                                       \
+	static tdm_ctrl_t tdm##idx##data;                                                          \
+	static struct tdm_buf tx_msgs##idx[CONFIG_TDM_NRFX_TX_BLOCK_COUNT];                        \
+	static struct tdm_buf rx_msgs##idx[CONFIG_TDM_NRFX_RX_BLOCK_COUNT];                        \
+	static void tdm_##idx##_irq_handler(const struct device *dev)                              \
+	{                                                                                          \
+		tdm_irq_handler(dev);                                                              \
+	}                                                                                          \
+	static void tdm_##idx##data_handler(tdm_buffers_t const *p_released, uint32_t status)      \
+	{                                                                                          \
+		data_handler(DEVICE_DT_GET(TDM(idx)), p_released, status);                         \
+	}                                                                                          \
+	PINCTRL_DT_DEFINE(TDM(idx));                                                               \
+	static const struct tdm_drv_cfg tdm_nrfx_cfg##idx = {                                      \
+		.data_handler = tdm_##idx##data_handler,                                           \
+		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(TDM(idx)),                                       \
+		.clk_src = TDM_CLK_SRC(idx),                                                       \
+		.mck_frequency = DT_PROP_OR(TDM(idx), mck_frequency, 0),                           \
+		.pclk_frequency = DT_PROP(PCLK_NODE(idx), clock_frequency),                        \
+		.p_reg = NRF_TDM##idx,                                                             \
+		.control_data = &tdm##idx##data,                                                   \
+		.mem_reg = DMM_DEV_TO_REG(TDM(idx)),                                               \
+	};                                                                                         \
+	static struct tdm_drv_data tdm_nrfx_data##idx;                                             \
+	static int tdm_nrfx_init##idx(const struct device *dev)                                    \
+	{                                                                                          \
+		IRQ_CONNECT(DT_IRQN(TDM(idx)), DT_IRQ(TDM(idx), priority),                         \
+			    tdm_##idx##_irq_handler, DEVICE_DT_GET(TDM(idx)), 0);                  \
+                                                                                                   \
+		int err = data_init(dev);                                                          \
+		if (err < 0) {                                                                     \
+			return err;                                                                \
+		}                                                                                  \
+		k_msgq_init(&tdm_nrfx_data##idx.tx_queue, (char *)tx_msgs##idx,                    \
+			    sizeof(struct tdm_buf), ARRAY_SIZE(tx_msgs##idx));                     \
+		k_msgq_init(&tdm_nrfx_data##idx.rx_queue, (char *)rx_msgs##idx,                    \
+			    sizeof(struct tdm_buf), ARRAY_SIZE(rx_msgs##idx));                     \
+		return 0;                                                                          \
+	}                                                                                          \
+	BUILD_ASSERT(TDM_CLK_SRC(idx) != ACLK || DT_NODE_HAS_STATUS_OKAY(NODE_AUDIOPLL),	   \
+		     "Clock source ACLK requires the audiopll node.");                             \
+	DEVICE_DT_DEFINE(TDM(idx), tdm_nrfx_init##idx, NULL, &tdm_nrfx_data##idx,                  \
+			 &tdm_nrfx_cfg##idx, POST_KERNEL, CONFIG_I2S_INIT_PRIORITY,                \
+			 &tdm_nrf_drv_api);
+
+/* Execute macro f(x) for all instances. */
+#define TDM_FOR_EACH_INSTANCE(f, sep, off_code, ...)                                               \
+	NRFX_FOREACH_PRESENT(TDM, f, sep, off_code, __VA_ARGS__)
+
+#define COND_TDM_NRFX_DEVICE(unused, prefix, i, _)                                                 \
+	IF_ENABLED(CONFIG_HAS_HW_NRF_TDM##prefix##i, (TDM_NRFX_DEVICE(prefix##i);))
+
+TDM_FOR_EACH_INSTANCE(COND_TDM_NRFX_DEVICE, (), ())

From f04b534ed990e4775cb5efc4ff6ad8587fdc0de4 Mon Sep 17 00:00:00 2001
From: Sudan Landge <sudan.landge@arm.com>
Date: Thu, 9 Jan 2025 19:57:05 +0000
Subject: [PATCH 2818/2913] [nrf fromtree] arch: arm: fix: pm_s2ram with
 CONFIG_DEBUG_THREAD_INFO

What is the change?
 - Fixes #83660 allowing device to now enter suspend mode even if
   CONFIG_DEBUG_THREAD_INFO is enabled.

Why is this needed?
 - z_sys_post_kernel was cleared as part of #d778d5c
   to "allow debuggers to display the correct thread state after
   the first 3 instructions have run".
   This is not required while resuming from suspend and
   it prevents the device from entering suspend so,
   move it out of resume path.

Signed-off-by: Sudan Landge <sudan.landge@arm.com>
(cherry picked from commit 743fe6365178f76067f6aff1667591dd6c0a168c)
---
 arch/arm/core/cortex_m/reset.S | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/arch/arm/core/cortex_m/reset.S b/arch/arm/core/cortex_m/reset.S
index bc75ccfceaa..742a3fe3d65 100644
--- a/arch/arm/core/cortex_m/reset.S
+++ b/arch/arm/core/cortex_m/reset.S
@@ -68,13 +68,6 @@ SECTION_SUBSEC_FUNC(TEXT,_reset_section,z_arm_reset)
  */
 SECTION_SUBSEC_FUNC(TEXT,_reset_section,__start)
 
-#if defined(CONFIG_DEBUG_THREAD_INFO)
-    /* Clear z_sys_post_kernel flag for RTOS aware debuggers */
-    movs.n r0, #0
-    ldr r1, =z_sys_post_kernel
-    strb r0, [r1]
-#endif /* CONFIG_DEBUG_THREAD_INFO */
-
 #if defined(CONFIG_INIT_ARCH_HW_AT_BOOT)
     /* Reset CONTROL register */
     movs.n r0, #0
@@ -93,6 +86,18 @@ SECTION_SUBSEC_FUNC(TEXT,_reset_section,__start)
     bl arch_pm_s2ram_resume
 #endif /* CONFIG_PM_S2RAM */
 
+    /* Note: Make sure that variables like z_sys_post_kernel
+     *       are set after the call to arch_pm_s2ram_resume
+     *       to avoid any issues with suspend/resume path.
+     *       Refer issue #83660 for more details.
+     */
+#if defined(CONFIG_DEBUG_THREAD_INFO)
+    /* Clear z_sys_post_kernel flag for RTOS aware debuggers */
+    movs.n r0, #0
+    ldr r1, =z_sys_post_kernel
+    strb r0, [r1]
+#endif /* CONFIG_DEBUG_THREAD_INFO */
+
 #if defined(CONFIG_SOC_RESET_HOOK)
     bl soc_reset_hook
 #endif

From 6dda27b5918cfaab2eb59cd5d9adde42381dc655 Mon Sep 17 00:00:00 2001
From: Sudan Landge <sudan.landge@arm.com>
Date: Thu, 9 Jan 2025 23:58:45 +0000
Subject: [PATCH 2819/2913] [nrf fromtree] arch: arm: refactor pm_s2ram

What is the change?
 - APIs `pm_s2ram_mark_set` and `pm_s2ram_mark_check_and_clear`,
   used to set/check pm_s2ram magic marker,
   no longer have Arm specific limitations.

Why is this needed?
 - These APIs are generic and should not have arch specific dependency.

Signed-off-by: Sudan Landge <sudan.landge@arm.com>
(cherry picked from commit 7beff12b067abac1ca36105701212b3a55e55497)
---
 arch/arm/core/cortex_m/reset.S | 39 +++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/arch/arm/core/cortex_m/reset.S b/arch/arm/core/cortex_m/reset.S
index 742a3fe3d65..c3f9362eca8 100644
--- a/arch/arm/core/cortex_m/reset.S
+++ b/arch/arm/core/cortex_m/reset.S
@@ -21,6 +21,7 @@ _ASM_FILE_PROLOGUE
 GTEXT(z_arm_reset)
 GTEXT(z_early_memset)
 GDATA(z_interrupt_stacks)
+GDATA(z_main_stack)
 #if defined(CONFIG_DEBUG_THREAD_INFO)
 GDATA(z_sys_post_kernel)
 #endif
@@ -29,7 +30,6 @@ GTEXT(soc_reset_hook)
 #endif
 #if defined(CONFIG_INIT_ARCH_HW_AT_BOOT)
 GTEXT(z_arm_init_arch_hw_at_boot)
-GDATA(z_main_stack)
 #endif
 #if defined(CONFIG_PM_S2RAM)
 GTEXT(arch_pm_s2ram_resume)
@@ -83,9 +83,44 @@ SECTION_SUBSEC_FUNC(TEXT,_reset_section,__start)
 #endif /* CONFIG_INIT_ARCH_HW_AT_BOOT */
 
 #if defined(CONFIG_PM_S2RAM)
+    /*
+     * Temporarily set MSP to interrupt stack so that arch_pm_s2ram_resume can
+     * use stack for calling pm_s2ram_mark_check_and_clear.
+     * This is safe because suspend never being called from an ISR ensures that
+     * interrupt stack was not live during suspend.
+     * Note:
+     * if resuming from suspend, MSP is restored from cpu context
+     * if not resuming, MSP will be set back to z_main_stack for proper init
+     * And, apart from arch_pm_s2ram_resume being able to use the stack for
+     * a short while, there is no change in behavior in either of the paths.
+     */
+    ldr r0, =z_interrupt_stacks + CONFIG_ISR_STACK_SIZE + MPU_GUARD_ALIGN_AND_SIZE
+    msr msp, r0
+
     bl arch_pm_s2ram_resume
 #endif /* CONFIG_PM_S2RAM */
 
+    /*
+     * MSP needs to be set to main stack for following scenarios:
+     * - If CONFIG_PM_S2RAM is enabled, MSP is set to z_interrupt_stacks
+     *   for resume functions to make use of a stack. However,
+     *   if the device was not suspended and if resume functions return,
+     *   MSP needs to be set back to z_main_stack to ensure proper
+     *   initialization.
+     * - If CONFIG_PM_S2RAM is not enabled but CONFIG_INIT_ARCH_HW_AT_BOOT is,
+     *   MSP needs to be set to z_main_stack for proper initialization in case
+     *   device was loaded through chain loading or a debugger, as the initial
+     *   value of MSP would be anything that the previous image loaded.
+     * - If CONFIG_INIT_STACKS is enabled, we need to ensure MSP is not set
+     *   to z_interrupt_stacks, so we set it to z_main_stack.
+     *
+     * Since these scenarios cover most of the cases, we set MSP to
+     * z_main_stack here.
+     *
+     */
+    ldr r0, =z_main_stack + CONFIG_MAIN_STACK_SIZE
+    msr msp, r0
+
     /* Note: Make sure that variables like z_sys_post_kernel
      *       are set after the call to arch_pm_s2ram_resume
      *       to avoid any issues with suspend/resume path.
@@ -110,8 +145,6 @@ SECTION_SUBSEC_FUNC(TEXT,_reset_section,__start)
     str r0, [r1]
     dsb
 #endif /* CONFIG_CPU_HAS_ARM_MPU */
-    ldr r0, =z_main_stack + CONFIG_MAIN_STACK_SIZE
-    msr msp, r0
 
     /* Initialize core architecture registers and system blocks */
     bl z_arm_init_arch_hw_at_boot

From a6f69643b3a99bc9683fe28b655904da05ffb036 Mon Sep 17 00:00:00 2001
From: Wilfried Chauveau <wilfried.chauveau@arm.com>
Date: Thu, 30 Jan 2025 06:38:35 +0000
Subject: [PATCH 2820/2913] =?UTF-8?q?[nrf=20fromtree]=20arch:=20arm:=20cor?=
 =?UTF-8?q?tex=5Fm:=20use=20local=20label=20in=20ASM=C2=A0code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Regular label are exported in the object file and cause gdb to consider
them as function start. Local labels on the other hand are not exported.
For example, using `disassemble z_arm_pendsv` after this change will
disassemble the whole function rather than stop at the first branch.

Signed-off-by: Wilfried Chauveau <wilfried.chauveau@arm.com>
(cherry picked from commit 5261680312a0ba2c751d3fccef1781c3c124caa3)
---
 arch/arm/core/cortex_m/pm_s2ram.S    |  4 +--
 arch/arm/core/cortex_m/swap_helper.S | 38 ++++++++++++++--------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/arch/arm/core/cortex_m/pm_s2ram.S b/arch/arm/core/cortex_m/pm_s2ram.S
index d15bfea0432..4b43fb8d74f 100644
--- a/arch/arm/core/cortex_m/pm_s2ram.S
+++ b/arch/arm/core/cortex_m/pm_s2ram.S
@@ -221,10 +221,10 @@ SECTION_FUNC(TEXT, arch_pm_s2ram_resume)
 	bl 	pm_s2ram_mark_check_and_clear
 	mov 	lr, r1
 	cmp     r0, #0x1
-	beq     resume
+	beq     .L_resume
 	bx      lr
 
-resume:
+.L_resume:
 	/*
 	 * Restore the CPU context
 	 */
diff --git a/arch/arm/core/cortex_m/swap_helper.S b/arch/arm/core/cortex_m/swap_helper.S
index c6207084b5e..f1bbbfa2a13 100644
--- a/arch/arm/core/cortex_m/swap_helper.S
+++ b/arch/arm/core/cortex_m/swap_helper.S
@@ -98,7 +98,7 @@ SECTION_FUNC(TEXT, z_arm_pendsv)
 #ifdef CONFIG_FPU_SHARING
     /* Assess whether switched-out thread had been using the FP registers. */
     tst lr, #_EXC_RETURN_FTYPE_Msk
-    bne out_fp_endif
+    bne .L_out_fp_endif
 
     /* FP context active: set FP state and store callee-saved registers.
      * Note: if Lazy FP stacking is enabled, storing the callee-saved
@@ -108,7 +108,7 @@ SECTION_FUNC(TEXT, z_arm_pendsv)
     add r0, r2, #_thread_offset_to_preempt_float
     vstmia r0, {s16-s31}
 
-out_fp_endif:
+.L_out_fp_endif:
     /* At this point FPCCR.LSPACT is guaranteed to be cleared,
      * regardless of whether the thread has an active FP context.
      */
@@ -204,9 +204,9 @@ out_fp_endif:
      * were enabled before irq_lock was called.
      */
     cmp r0, #0
-    bne _thread_irq_disabled
+    bne .L_thread_irq_disabled
     cpsie i
-_thread_irq_disabled:
+.L_thread_irq_disabled:
 
 #if defined(CONFIG_MPU_STACK_GUARD) || defined(CONFIG_USERSPACE)
     /* Re-program dynamic memory map */
@@ -259,7 +259,7 @@ _thread_irq_disabled:
 #ifdef CONFIG_FPU_SHARING
     /* Assess whether switched-in thread had been using the FP registers. */
     tst lr, #_EXC_RETURN_FTYPE_Msk
-    beq in_fp_active
+    beq .L_in_fp_active
     /* FP context inactive for swapped-in thread:
      * - reset FPSCR to 0
      * - set EXC_RETURN.F_Type (prevents FP frame un-stacking when returning
@@ -267,9 +267,9 @@ _thread_irq_disabled:
      */
     movs.n r3, #0
     vmsr fpscr, r3
-    b in_fp_endif
+    b .L_in_fp_endif
 
-in_fp_active:
+.L_in_fp_active:
     /* FP context active:
      * - clear EXC_RETURN.F_Type
      * - FPSCR and caller-saved registers will be restored automatically
@@ -277,7 +277,7 @@ in_fp_active:
      */
     add r0, r2, #_thread_offset_to_preempt_float
     vldmia r0, {s16-s31}
-in_fp_endif:
+.L_in_fp_endif:
     /* Clear CONTROL.FPCA that may have been set by FP instructions */
     mrs r3, CONTROL
     bic r3, #_CONTROL_FPCA_Msk
@@ -361,12 +361,12 @@ SECTION_FUNC(TEXT, z_arm_svc)
   movs r0, #_EXC_RETURN_SPSEL_Msk
   mov r1, lr
   tst r1, r0
-  beq _stack_frame_msp
+  beq .L_stack_frame_msp
   mrs r0, PSP
-  bne _stack_frame_endif
-_stack_frame_msp:
+  bne .L_stack_frame_endif
+.L_stack_frame_msp:
   mrs r0, MSP
-_stack_frame_endif:
+.L_stack_frame_endif:
 #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
     tst lr, #_EXC_RETURN_SPSEL_Msk /* did we come from thread mode ? */
     ite eq  /* if zero (equal), came from handler mode */
@@ -399,7 +399,7 @@ _stack_frame_endif:
     mrs r2, CONTROL
 
     cmp r1, #3
-    beq _do_syscall
+    beq .L_do_syscall
 
     /*
      * check that we are privileged before invoking other SVCs
@@ -411,12 +411,12 @@ _stack_frame_endif:
 #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
     tst r2, #0x1
 #endif
-    bne _oops
+    bne .L_oops
 
 #endif /* CONFIG_USERSPACE */
 
     cmp r1, #2
-    beq _oops
+    beq .L_oops
 
 #if defined(CONFIG_IRQ_OFFLOAD)
     push {r0, lr}
@@ -434,7 +434,7 @@ _stack_frame_endif:
 
 #endif
 
-_oops:
+.L_oops:
     push {r0, lr}
 #if defined(CONFIG_EXTRA_EXCEPTION_INFO)
 #if defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
@@ -484,7 +484,7 @@ _oops:
      * r6 - call_id
      * r8 - saved link register
      */
-_do_syscall:
+.L_do_syscall:
 #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
     movs r3, #24
     ldr r1, [r0, r3]   /* grab address of PC from stack frame */
@@ -510,7 +510,7 @@ _do_syscall:
     /* The supplied syscall_id must be lower than the limit
      * (Requires unsigned integer comparison)
      */
-    blo valid_syscall_id
+    blo .L_valid_syscall_id
 
     /* bad syscall id.  Set arg1 to bad id and set call_id to SYSCALL_BAD */
     str r6, [r0]
@@ -518,7 +518,7 @@ _do_syscall:
 
     /* Bad syscalls treated as valid syscalls with ID K_SYSCALL_BAD. */
 
-valid_syscall_id:
+.L_valid_syscall_id:
     ldr r0, =_kernel
     ldr r0, [r0, #_kernel_offset_to_current]
 #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)

From df9e04a1b7524daef0523087107a3661f06d5d88 Mon Sep 17 00:00:00 2001
From: Sudan Landge <sudan.landge@arm.com>
Date: Tue, 14 Jan 2025 00:01:18 +0000
Subject: [PATCH 2821/2913] [nrf fromtree] Revert "arch: arm: cortex_m:
 pm_s2ram: Rework S2RAM mark functions"

What is the change?
 - This reverts commit 474d4c3249c190b3261bc128ec1847e0a4f7b176

Why do we need this change?
 - This commit was added because Cortex-M didn't have a valid
   stack to make required functionality work however,
   the previous commit fixes this and makes interrupt stack
   available for use. This removes Arm specific limitation from
   these generic APIs so revert the commit to reflect the same.

Signed-off-by: Sudan Landge <sudan.landge@arm.com>
(cherry picked from commit b4fb5d38ebe5604696978af49a1b143a776a6222)
---
 arch/arm/core/cortex_m/pm_s2ram.S     | 23 ++++++++-------
 arch/arm/core/cortex_m/pm_s2ram.c     | 40 ++++++---------------------
 include/zephyr/arch/common/pm_s2ram.h | 10 -------
 3 files changed, 19 insertions(+), 54 deletions(-)

diff --git a/arch/arm/core/cortex_m/pm_s2ram.S b/arch/arm/core/cortex_m/pm_s2ram.S
index 4b43fb8d74f..3e797c749c3 100644
--- a/arch/arm/core/cortex_m/pm_s2ram.S
+++ b/arch/arm/core/cortex_m/pm_s2ram.S
@@ -178,9 +178,7 @@ SECTION_FUNC(TEXT, arch_pm_s2ram_suspend)
 	/*
 	 * Mark entering suspend to RAM.
 	 */
-	mov 	r1, lr
-	bl 	pm_s2ram_mark_set
-	mov	lr, r1
+	bl pm_s2ram_mark_set
 
 	/*
 	 * Call the system_off function passed as parameter. This should never
@@ -199,9 +197,7 @@ SECTION_FUNC(TEXT, arch_pm_s2ram_suspend)
 	/*
 	 * Reset the marking of suspend to RAM, return is ignored.
 	 */
-	mov 	r1, lr
-	bl	pm_s2ram_mark_check_and_clear
-	mov 	lr, r1
+	bl pm_s2ram_mark_check_and_clear
 
 	/* Move the stored return value of system_off back to r0,
 	 * setting it as return value for this function.
@@ -216,13 +212,16 @@ GTEXT(arch_pm_s2ram_resume)
 SECTION_FUNC(TEXT, arch_pm_s2ram_resume)
 	/*
 	 * Check if reset occurred after suspending to RAM.
+	 * Store LR to ensure we can continue boot when we are not suspended
+	 * to RAM. In addition to LR, R0 is pushed too, to ensure "SP mod 8 = 0",
+	 * as stated by ARM rule 6.2.1.2 for AAPCS32.
 	 */
-	mov 	r1, lr
-	bl 	pm_s2ram_mark_check_and_clear
-	mov 	lr, r1
-	cmp     r0, #0x1
-	beq     .L_resume
-	bx      lr
+	push    {r0, lr}
+	bl      pm_s2ram_mark_check_and_clear
+	cmp	r0, #0x1
+	pop     {r0, lr}
+	beq	.L_resume
+	bx	lr
 
 .L_resume:
 	/*
diff --git a/arch/arm/core/cortex_m/pm_s2ram.c b/arch/arm/core/cortex_m/pm_s2ram.c
index b7fe5d9b626..2657d48dc32 100644
--- a/arch/arm/core/cortex_m/pm_s2ram.c
+++ b/arch/arm/core/cortex_m/pm_s2ram.c
@@ -22,44 +22,20 @@ __noinit _cpu_context_t _cpu_context;
  */
 static __noinit uint32_t marker;
 
-void __attribute__((naked)) pm_s2ram_mark_set(void)
+void pm_s2ram_mark_set(void)
 {
-	__asm__ volatile(
-		/* Set the marker to MAGIC value */
-		"str	%[_magic_val], [%[_marker]]\n"
-
-		"bx	lr\n"
-		:
-		: [_magic_val] "r"(MAGIC), [_marker] "r"(&marker)
-		: "r1", "r4", "memory");
+	marker = MAGIC;
 }
 
-bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
+bool pm_s2ram_mark_check_and_clear(void)
 {
-	__asm__ volatile(
-		/* Set return value to 0 */
-		"mov	r0, #0\n"
-
-		/* Check the marker */
-		"ldr	r3, [%[_marker]]\n"
-		"cmp	r3, %[_magic_val]\n"
-		"bne	exit\n"
-
-		/*
-		 * Reset the marker
-		 */
-		"str	r0, [%[_marker]]\n"
+	if (marker == MAGIC) {
+		marker = 0;
 
-		/*
-		 * Set return value to 1
-		 */
-		"mov	r0, #1\n"
+		return true;
+	}
 
-		"exit:\n"
-		"bx lr\n"
-		:
-		: [_magic_val] "r"(MAGIC), [_marker] "r"(&marker)
-		: "r0", "r1", "r3", "r4", "memory");
+	return false;
 }
 
 #endif /* CONFIG_PM_S2RAM_CUSTOM_MARKING */
diff --git a/include/zephyr/arch/common/pm_s2ram.h b/include/zephyr/arch/common/pm_s2ram.h
index ad9ab8ad7a4..34c544c769b 100644
--- a/include/zephyr/arch/common/pm_s2ram.h
+++ b/include/zephyr/arch/common/pm_s2ram.h
@@ -65,11 +65,6 @@ int arch_pm_s2ram_suspend(pm_s2ram_system_off_fn_t system_off);
  *
  * Default implementation is setting a magic word in RAM. CONFIG_PM_S2RAM_CUSTOM_MARKING
  * allows custom implementation.
- * The following requirements must be fulfilled:
- * - the function cannot use stack (asm function or function with 'naked' attribute)
- * - the content of the R1 and R4 registers must remain unchanged
- * - returning from the function should be performed with the `bx lr` instruction
- *
  */
 void pm_s2ram_mark_set(void);
 
@@ -81,11 +76,6 @@ void pm_s2ram_mark_set(void);
  *
  * Default implementation is checking a magic word in RAM. CONFIG_PM_S2RAM_CUSTOM_MARKING
  * allows custom implementation.
- * The following requirements must be fulfilled:
- * - the function cannot use stack (most likely asm function)
- * - the content of the R1 and R4 registers must remain unchanged
- * - the function's return value is passed by R0 register
- * - returning from the function should be performed with the `bx lr` instruction
  *
  * @retval true if marking is found which indicates resuming after suspend-to-RAM.
  * @retval false if marking is not found which indicates standard boot.

From 34c5d78f3b4a8625417770b3d2f154b1c1da4e10 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 18 Mar 2025 17:13:43 +0100
Subject: [PATCH 2822/2913] Revert "[nrf fromlist] soc: nordic: nrf54h20:
 disallow using LR in s2ram marking function"

This reverts commit 780667762da5c05318e0ed3e3c777bc0a0302408.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 soc/nordic/nrf54h/pm_s2ram.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/soc/nordic/nrf54h/pm_s2ram.c b/soc/nordic/nrf54h/pm_s2ram.c
index a85572f3d7b..bb54161e6a5 100644
--- a/soc/nordic/nrf54h/pm_s2ram.c
+++ b/soc/nordic/nrf54h/pm_s2ram.c
@@ -185,8 +185,6 @@ void __attribute__((naked)) pm_s2ram_mark_set(void)
 
 bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
 {
-	register uint32_t link_reg __asm__("r14");
-
 	__asm__ volatile(
 		/* Set return value to 0 */
 		"mov	r0, #0\n"
@@ -214,14 +212,13 @@ bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
 		"mov	r0, #1\n"
 
 		"exit:\n"
-		"bx	%[link_reg]\n"
+		"bx	lr\n"
 		:
 		: [resetinfo_addr] "r"(NRF_RESETINFO),
 		  [resetreas_offs] "r"(offsetof(NRF_RESETINFO_Type, RESETREAS.LOCAL)),
 		  [resetreas_unretained_mask] "r"(NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK),
 		  [restorevalid_offs] "r"(offsetof(NRF_RESETINFO_Type, RESTOREVALID)),
-		  [restorevalid_present_mask] "r"(RESETINFO_RESTOREVALID_RESTOREVALID_Msk),
-		  [link_reg] "r"(link_reg)
+		  [restorevalid_present_mask] "r"(RESETINFO_RESTOREVALID_RESTOREVALID_Msk)
 
-		: "r0", "r1", "r3", "r4", "cc", "memory");
+		: "r0", "r1", "r3", "r4", "memory");
 }

From 01b1af577859333003cfe6b07ec8539ec6ebaed5 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 18 Mar 2025 15:55:26 +0100
Subject: [PATCH 2823/2913] [nrf fromlist] Revert "soc: nordic: s2ram: Align
 s2ram marking procedures"

The marking procedures can be reverted, since at this stage
it is already allowed to use the stack.
The MSP is temporairly set to interrupt stack in `reset.S` file before
calling s2ram procedures..

Upstream PR #: 87304

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>

This reverts commit e68d110f7c175f2a9275659d023c9d37d1e4b4f1.
---
 soc/nordic/nrf54h/pm_s2ram.c | 49 ++++++++++--------------------------
 1 file changed, 13 insertions(+), 36 deletions(-)

diff --git a/soc/nordic/nrf54h/pm_s2ram.c b/soc/nordic/nrf54h/pm_s2ram.c
index bb54161e6a5..79de6a447a0 100644
--- a/soc/nordic/nrf54h/pm_s2ram.c
+++ b/soc/nordic/nrf54h/pm_s2ram.c
@@ -177,48 +177,25 @@ int soc_s2ram_suspend(pm_s2ram_system_off_fn_t system_off)
 	return ret;
 }
 
-void __attribute__((naked)) pm_s2ram_mark_set(void)
+void pm_s2ram_mark_set(void)
 {
 	/* empty */
-	__asm__ volatile("bx	lr\n");
 }
 
-bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
+bool pm_s2ram_mark_check_and_clear(void)
 {
-	__asm__ volatile(
-		/* Set return value to 0 */
-		"mov	r0, #0\n"
+	bool unretained_wake;
+	bool restore_valid;
+	uint32_t reset_reason = nrf_resetinfo_resetreas_local_get(NRF_RESETINFO);
 
-		/* Load and check RESETREAS register */
-		"ldr	r3, [%[resetinfo_addr], %[resetreas_offs]]\n"
-		"cmp	r3, %[resetreas_unretained_mask]\n"
-
-		"bne	exit\n"
-
-		/* Clear RESETREAS register */
-		"str	r0, [%[resetinfo_addr], %[resetreas_offs]]\n"
-
-		/* Load RESTOREVALID register */
-		"ldr	r3, [%[resetinfo_addr], %[restorevalid_offs]]\n"
-
-		/* Clear RESTOREVALID */
-		"str	r0, [%[resetinfo_addr], %[restorevalid_offs]]\n"
-
-		/* Check RESTOREVALID register */
-		"cmp	r3, %[restorevalid_present_mask]\n"
-		"bne	exit\n"
-
-		/* Set return value to 1 */
-		"mov	r0, #1\n"
+	if (reset_reason != NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK) {
+		return false;
+	}
+	unretained_wake = reset_reason & NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK;
+	nrf_resetinfo_resetreas_local_set(NRF_RESETINFO, 0);
 
-		"exit:\n"
-		"bx	lr\n"
-		:
-		: [resetinfo_addr] "r"(NRF_RESETINFO),
-		  [resetreas_offs] "r"(offsetof(NRF_RESETINFO_Type, RESETREAS.LOCAL)),
-		  [resetreas_unretained_mask] "r"(NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK),
-		  [restorevalid_offs] "r"(offsetof(NRF_RESETINFO_Type, RESTOREVALID)),
-		  [restorevalid_present_mask] "r"(RESETINFO_RESTOREVALID_RESTOREVALID_Msk)
+	restore_valid = nrf_resetinfo_restore_valid_check(NRF_RESETINFO);
+	nrf_resetinfo_restore_valid_set(NRF_RESETINFO, false);
 
-		: "r0", "r1", "r3", "r4", "memory");
+	return (unretained_wake & restore_valid) ? true : false;
 }

From 679b3860f150aef3d23bb2dd06eacc97efcec7e8 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 18 Mar 2025 16:38:37 +0100
Subject: [PATCH 2824/2913] [nrf fromlist] soc: nordic: s2ram: Optimize s2am
 marking functions

Optimize `pm_s2ram_mark_check_and_clear()` function.

Upstream PR #: 87304

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 soc/nordic/nrf54h/pm_s2ram.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/soc/nordic/nrf54h/pm_s2ram.c b/soc/nordic/nrf54h/pm_s2ram.c
index 79de6a447a0..c339039045e 100644
--- a/soc/nordic/nrf54h/pm_s2ram.c
+++ b/soc/nordic/nrf54h/pm_s2ram.c
@@ -184,18 +184,16 @@ void pm_s2ram_mark_set(void)
 
 bool pm_s2ram_mark_check_and_clear(void)
 {
-	bool unretained_wake;
 	bool restore_valid;
 	uint32_t reset_reason = nrf_resetinfo_resetreas_local_get(NRF_RESETINFO);
 
 	if (reset_reason != NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK) {
 		return false;
 	}
-	unretained_wake = reset_reason & NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK;
 	nrf_resetinfo_resetreas_local_set(NRF_RESETINFO, 0);
 
 	restore_valid = nrf_resetinfo_restore_valid_check(NRF_RESETINFO);
 	nrf_resetinfo_restore_valid_set(NRF_RESETINFO, false);
 
-	return (unretained_wake & restore_valid) ? true : false;
+	return restore_valid ? true : false;
 }

From 8b2040e848443e03ff367b958d521b5bdf09e524 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 1 Apr 2025 20:31:36 +0530
Subject: [PATCH 2825/2913] Revert "[nrf fromlist] nrfwifi: Display
 EAP_TLS_SHA256 security in scan results"

This reverts commit 4c3af28f5d55a4608f18204911256dca2267c7dc.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c b/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
index f85c71c4f5f..e30f572aeb3 100644
--- a/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
+++ b/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
@@ -297,8 +297,6 @@ static inline enum wifi_security_type drv_to_wifi_mgmt(int drv_security_type)
 		return WIFI_SECURITY_TYPE_WAPI;
 	case NRF_WIFI_EAP:
 		return WIFI_SECURITY_TYPE_EAP;
-	case NRF_WIFI_EAP_TLS_SHA256:
-		return WIFI_SECURITY_TYPE_EAP_TLS_SHA256;
 	default:
 		return WIFI_SECURITY_TYPE_UNKNOWN;
 	}

From d445cb7fef9133296d30d05bed06140efc6fe710 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Sat, 29 Mar 2025 21:30:49 +0530
Subject: [PATCH 2826/2913] Revert "[nrf noup] samples: net: wifi: Changes for
 EAP-TLS support"

This reverts commit 38d709da80534e8af33df2a22dcbfa6c948ca48d.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 samples/net/wifi/shell/overlay-enterprise.conf | 2 +-
 samples/net/wifi/shell/prj.conf                | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/samples/net/wifi/shell/overlay-enterprise.conf b/samples/net/wifi/shell/overlay-enterprise.conf
index ba6d958f9a5..34416282811 100644
--- a/samples/net/wifi/shell/overlay-enterprise.conf
+++ b/samples/net/wifi/shell/overlay-enterprise.conf
@@ -7,4 +7,4 @@ CONFIG_NET_BUF_RX_COUNT=36
 # For TLS and X.509 processing MbedTLS needs large heap size and using separate heap
 # for MbedTLS gives us more control over the heap size.
 CONFIG_MBEDTLS_ENABLE_HEAP=y
-CONFIG_MBEDTLS_HEAP_SIZE=70000
+CONFIG_MBEDTLS_HEAP_SIZE=55000
diff --git a/samples/net/wifi/shell/prj.conf b/samples/net/wifi/shell/prj.conf
index ab3d718f06b..e1a1b40a409 100644
--- a/samples/net/wifi/shell/prj.conf
+++ b/samples/net/wifi/shell/prj.conf
@@ -31,10 +31,6 @@ CONFIG_NET_STATISTICS_PERIODIC_OUTPUT=n
 CONFIG_WIFI=y
 CONFIG_WIFI_LOG_LEVEL_ERR=y
 CONFIG_NET_L2_WIFI_SHELL=y
-
-CONFIG_MBEDTLS_ENABLE_HEAP=y
-CONFIG_MBEDTLS_HEAP_SIZE=70000
-
 # printing of scan results puts pressure on queues in new locking
 # design in net_mgmt. So, use a higher timeout for a crowded
 # environment.

From 43b87f8c41f87007d58003559e436c9f0a17775c Mon Sep 17 00:00:00 2001
From: Maochen Wang <maochen.wang@nxp.com>
Date: Fri, 27 Dec 2024 15:38:46 +0800
Subject: [PATCH 2827/2913] [nrf fromtree] net: l2: wifi: remove EAP TLS SHA256
 security

Remove EAP TLS SHA256 security, as it was added to support the AKM
of 00-0F-AC:5 in RSN IE, but actually this AKM is used by WPA3
enterprise only mode.

Signed-off-by: Maochen Wang <maochen.wang@nxp.com>
(cherry picked from commit 4777dfaa28084f65fbd0e1fcfd2745bce7b10f5e)
---
 include/zephyr/net/wifi.h       |  2 --
 modules/hostap/src/supp_api.c   |  8 +-------
 subsys/net/l2/wifi/wifi_mgmt.c  |  2 --
 subsys/net/l2/wifi/wifi_shell.c | 10 ++++------
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/include/zephyr/net/wifi.h b/include/zephyr/net/wifi.h
index e74a44cafd4..dbe643c4d02 100644
--- a/include/zephyr/net/wifi.h
+++ b/include/zephyr/net/wifi.h
@@ -76,8 +76,6 @@ enum wifi_security_type {
 	WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2,
 	/** EAP PEAP security - Enterprise. */
 	WIFI_SECURITY_TYPE_EAP_PEAP_TLS,
-	/** EAP TLS SHA256 security - Enterprise. */
-	WIFI_SECURITY_TYPE_EAP_TLS_SHA256,
 	/** FT-PSK security */
 	WIFI_SECURITY_TYPE_FT_PSK,
 	/** FT-SAE security */
diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index fe697204fa3..8be2b085bdd 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -481,7 +481,6 @@ static struct wifi_eap_config eap_config[] = {
 	 "auth=MSCHAPV2"},
 	{WIFI_SECURITY_TYPE_EAP_PEAP_TLS, WIFI_EAP_TYPE_PEAP, WIFI_EAP_TYPE_TLS, "PEAP",
 	 "auth=TLS"},
-	{WIFI_SECURITY_TYPE_EAP_TLS_SHA256, WIFI_EAP_TYPE_TLS, WIFI_EAP_TYPE_NONE, "TLS", NULL},
 };
 
 int process_cipher_config(struct wifi_connect_req_params *params,
@@ -517,10 +516,6 @@ int process_cipher_config(struct wifi_connect_req_params *params,
 		}
 	}
 
-	if (params->security == WIFI_SECURITY_TYPE_EAP_TLS_SHA256) {
-		cipher_config->key_mgmt = "WPA-EAP-SHA256";
-	}
-
 	for (index = 0; index < ARRAY_SIZE(ciphers); index++) {
 		if (cipher_capa == ciphers[index].capa) {
 			cipher_config->group_cipher = ciphers[index].name;
@@ -557,8 +552,7 @@ static int is_eap_valid_security(int security)
 		    security == WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2 ||
 		    security == WIFI_SECURITY_TYPE_EAP_PEAP_GTC ||
 		    security == WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2 ||
-		    security == WIFI_SECURITY_TYPE_EAP_PEAP_TLS ||
-		    security == WIFI_SECURITY_TYPE_EAP_TLS_SHA256);
+		    security == WIFI_SECURITY_TYPE_EAP_PEAP_TLS);
 }
 #endif
 
diff --git a/subsys/net/l2/wifi/wifi_mgmt.c b/subsys/net/l2/wifi/wifi_mgmt.c
index 8713d0bd7fb..0009467abe3 100644
--- a/subsys/net/l2/wifi/wifi_mgmt.c
+++ b/subsys/net/l2/wifi/wifi_mgmt.c
@@ -83,8 +83,6 @@ const char *wifi_security_txt(enum wifi_security_type security)
 		return "EAP-TTLS-MSCHAPV2";
 	case WIFI_SECURITY_TYPE_EAP_PEAP_TLS:
 		return "EAP-PEAP-TLS";
-	case WIFI_SECURITY_TYPE_EAP_TLS_SHA256:
-		return "EAP-TLS-SHA256";
 	case WIFI_SECURITY_TYPE_FT_PSK:
 		return "FT-PSK";
 	case WIFI_SECURITY_TYPE_FT_SAE:
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index ccdd2f5c7a9..79a8f88b353 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -915,8 +915,7 @@ static int cmd_wifi_connect(const struct shell *sh, size_t argc,
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2 ||
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_GTC ||
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2 ||
-	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_TLS ||
-	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_TLS_SHA256) {
+	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_TLS) {
 		cmd_wifi_set_enterprise_creds(sh, iface);
 	}
 #endif
@@ -1924,8 +1923,7 @@ static int cmd_wifi_ap_enable(const struct shell *sh, size_t argc,
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2 ||
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_GTC ||
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2 ||
-	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_TLS ||
-	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_TLS_SHA256) {
+	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_TLS) {
 		cmd_wifi_set_enterprise_creds(sh, iface);
 	}
 #endif
@@ -3407,7 +3405,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      "0:None, 1:WPA2-PSK, 2:WPA2-PSK-256, 3:SAE-HNP, 4:SAE-H2E, 5:SAE-AUTO, 6:WAPI,"
 		      "7:EAP-TLS, 8:WEP, 9: WPA-PSK, 10: WPA-Auto-Personal, 11: DPP\n"
 		      "12: EAP-PEAP-MSCHAPv2, 13: EAP-PEAP-GTC, 14: EAP-TTLS-MSCHAPv2,\n"
-		      "15: EAP-PEAP-TLS, 16:EAP_TLS_SHA256\n"
+		      "15: EAP-PEAP-TLS\n"
 		      "-w --ieee-80211w=<MFP> (optional: needs security type to be specified)\n"
 		      "0:Disable, 1:Optional, 2:Required\n"
 		      "-b --band=<band> (2 -2.6GHz, 5 - 5Ghz, 6 - 6GHz)\n"
@@ -3650,7 +3648,7 @@ SHELL_SUBCMD_ADD((wifi), connect, NULL,
 		  "0:None, 1:WPA2-PSK, 2:WPA2-PSK-256, 3:SAE-HNP, 4:SAE-H2E, 5:SAE-AUTO, 6:WAPI,"
 		  "7:EAP-TLS, 8:WEP, 9: WPA-PSK, 10: WPA-Auto-Personal, 11: DPP\n"
 		  "12: EAP-PEAP-MSCHAPv2, 13: EAP-PEAP-GTC, 14: EAP-TTLS-MSCHAPv2,\n"
-		  "15: EAP-PEAP-TLS, 16:EAP_TLS_SHA256\n"
+		  "15: EAP-PEAP-TLS\n"
 		  "[-w, --ieee-80211w]: MFP (optional: needs security type to be specified)\n"
 		  ": 0:Disable, 1:Optional, 2:Required.\n"
 		  "[-m, --bssid]: MAC address of the AP (BSSID).\n"

From c08d236281843dc8b712e4f13270fe5dfaacc687 Mon Sep 17 00:00:00 2001
From: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
Date: Wed, 19 Mar 2025 23:55:48 +0530
Subject: [PATCH 2828/2913] [nrf fromtree] net: wifi: shell: Fix alloc failures
 during cert validation

Memory allocation failures during certificate validation causes
connection termination. Increase MBEDTLS_HEAP_SIZE to fix this.

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
(cherry picked from commit 58591c6f2c33434e048fd23d7bc15806c90467ca)
---
 samples/net/wifi/shell/overlay-enterprise.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/net/wifi/shell/overlay-enterprise.conf b/samples/net/wifi/shell/overlay-enterprise.conf
index 34416282811..5290e31744b 100644
--- a/samples/net/wifi/shell/overlay-enterprise.conf
+++ b/samples/net/wifi/shell/overlay-enterprise.conf
@@ -7,4 +7,4 @@ CONFIG_NET_BUF_RX_COUNT=36
 # For TLS and X.509 processing MbedTLS needs large heap size and using separate heap
 # for MbedTLS gives us more control over the heap size.
 CONFIG_MBEDTLS_ENABLE_HEAP=y
-CONFIG_MBEDTLS_HEAP_SIZE=55000
+CONFIG_MBEDTLS_HEAP_SIZE=60000

From d42adf04e23ad225501838a03cd0ea0db457e3a7 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 26 Mar 2025 19:50:43 +0530
Subject: [PATCH 2829/2913] [nrf fromlist] net: l2: wifi: Add support for
 run-time certificates

Using TLS credentials library add support for run-time certificates where
the installed certs are retrieved from the credential store (as of now
only volatile backend is tested).

This helps in production environments.

Implements #79564.

Upstream PR #: 87656

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 doc/connectivity/networking/api/wifi.rst |  18 +-
 subsys/net/l2/wifi/Kconfig               |  23 ++
 subsys/net/l2/wifi/wifi_shell.c          | 269 +++++++++++++++++++++--
 3 files changed, 284 insertions(+), 26 deletions(-)

diff --git a/doc/connectivity/networking/api/wifi.rst b/doc/connectivity/networking/api/wifi.rst
index 7f322bf2486..d69d3c1836d 100644
--- a/doc/connectivity/networking/api/wifi.rst
+++ b/doc/connectivity/networking/api/wifi.rst
@@ -30,11 +30,15 @@ Wi-Fi PSA crypto supported build
 
 To enable PSA crypto API supported Wi-Fi build, the :kconfig:option:`CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT` and the :kconfig:option:`CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA` need to be set.
 
-Wi-Fi Enterprise test: X.509 Certificate header generation
-**********************************************************
+Wi-Fi Enterprise test: X.509 Certificate management
+***************************************************
 
-Wi-Fi enterprise security requires use of X.509 certificates, test certificates
-in PEM format are committed to the repo at :zephyr_file:`samples/net/wifi/test_certs` and the during the
+Wi-Fi enterprise security requires use of X.509 certificates, two methods of installing certificates are supported:
+
+Compile time certificates
+-------------------------
+
+Test certificates in PEM format are committed to the repo at :zephyr_file:`samples/net/wifi/test_certs` and the during the
 build process the certificates are converted to a C header file that is included by the Wi-Fi shell
 module.
 
@@ -55,6 +59,12 @@ For using variable size network buffer, the following overlay file can be used:
     $ west build -p -b <board> samples/net/wifi -- -DEXTRA_CONF_FILE=overlay-enterprise-variable-bufs.conf
 
 
+Run time certificates
+---------------------
+
+The Wi-Fi shell module uses TLS credentials subsystem to store and manage the certificates. The certificates can be added at runtime using the shell commands, see :ref:`tls_credentials_shell` for more details.
+The sample or application need to enable the :kconfig:option:`CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES` option to use this feature.
+
 
 To initiate Wi-Fi connection, the following command can be used:
 
diff --git a/subsys/net/l2/wifi/Kconfig b/subsys/net/l2/wifi/Kconfig
index 78f98497c73..cd6540aa831 100644
--- a/subsys/net/l2/wifi/Kconfig
+++ b/subsys/net/l2/wifi/Kconfig
@@ -125,3 +125,26 @@ config WIFI_ENT_IDENTITY_MAX_USERS
 	default 8
 	help
 	  This option defines the maximum number of identity users allowed connection.
+
+if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+
+config WIFI_SHELL_RUNTIME_CERTIFICATES
+	bool "Provide Wi-Fi enterprise security certificates at run-time"
+	select TLS_CREDENTIALS
+	select TLS_CREDENTIALS_SHELL
+	select BASE64
+	help
+	  This option enables providing Wi-Fi enterprise security certificates at run-time.
+	  Uses the TLS credentials subsystem to store and manage the certificates.
+
+if WIFI_SHELL_RUNTIME_CERTIFICATES
+config HEAP_MEM_POOL_ADD_SIZE_WIFI_CERT
+	int "Wi-Fi enterprise security certificates memory pool size"
+	# STA - 6 certs and each assume 1500 bytes
+	default 12000
+	help
+	  The size of the memory pool used by the Wi-Fi enterprise security certificates.
+
+endif # WIFI_SHELL_RUNTIME_CERTIFICATES
+
+endif # WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index 79a8f88b353..182eb85d018 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -30,7 +30,29 @@ LOG_MODULE_REGISTER(net_wifi_shell, LOG_LEVEL_INF);
 
 #include "net_shell_private.h"
 #include <math.h>
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+#if defined CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE || \
+	defined CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
+#ifdef CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES
+#include <zephyr/net/tls_credentials.h>
+enum wifi_enterprise_cert_sec_tags {
+	WIFI_CERT_CA_SEC_TAG = 0x1020001,
+	WIFI_CERT_CLIENT_KEY_SEC_TAG,
+	WIFI_CERT_SERVER_KEY_SEC_TAG,
+	WIFI_CERT_CLIENT_SEC_TAG,
+	WIFI_CERT_SERVER_SEC_TAG,
+	/* Phase 2 */
+	WIFI_CERT_CA_P2_SEC_TAG,
+	WIFI_CERT_CLIENT_KEY_P2_SEC_TAG,
+	WIFI_CERT_CLIENT_P2_SEC_TAG,
+};
+
+struct wifi_cert_data {
+	enum tls_credential_type type;
+	uint32_t sec_tag;
+	uint8_t **data;
+	size_t *len;
+};
+#else
 static const char ca_cert_test[] = {
 	#include <wifi_enterprise_test_certs/ca.pem.inc>
 	'\0'
@@ -67,7 +89,8 @@ static const char server_key_test[] = {
 	#include <wifi_enterprise_test_certs/server-key.pem.inc>
 	'\0'
 };
-#endif
+#endif /* CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES */
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
 
 #define WIFI_SHELL_MODULE "wifi"
 
@@ -102,6 +125,12 @@ static struct {
 		};
 		uint8_t all;
 	};
+#if defined CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE || \
+	defined CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
+#ifdef CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES
+	struct wifi_enterprise_creds_params enterprise_creds_params;
+#endif /* CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES */
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
 } context;
 
 static struct net_mgmt_event_callback wifi_shell_mgmt_cb;
@@ -117,27 +146,212 @@ static struct wifi_ap_sta_node sta_list[CONFIG_WIFI_SHELL_MAX_AP_STA];
 
 #if defined CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE || \
 	defined CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
-static int cmd_wifi_set_enterprise_creds(const struct shell *sh, struct net_if *iface)
+#ifdef CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES
+static int process_certificates(struct wifi_cert_data *certs, size_t cert_count)
+{
+	for (size_t i = 0; i < cert_count; i++) {
+		int err;
+		size_t len = 0;
+		uint8_t *cert_tmp;
+
+		err = tls_credential_get(certs[i].sec_tag, certs[i].type, NULL, &len);
+		if (err != -EFBIG) {
+			LOG_ERR("Failed to get credential tag: %d length, err: %d",
+				certs[i].sec_tag, err);
+			return err;
+		}
+
+		cert_tmp = k_malloc(len);
+		if (!cert_tmp) {
+			LOG_ERR("Failed to allocate memory for credential tag: %d",
+				certs[i].sec_tag);
+			return -ENOMEM;
+		}
+
+		err = tls_credential_get(certs[i].sec_tag, certs[i].type, cert_tmp, &len);
+		if (err) {
+			LOG_ERR("Failed to get credential tag: %d", certs[i].sec_tag);
+			k_free(cert_tmp);
+			return err;
+		}
+
+		*certs[i].data = cert_tmp;
+		*certs[i].len = len;
+	}
+
+	return 0;
+}
+
+static void set_enterprise_creds_params(struct wifi_enterprise_creds_params *params,
+					bool is_ap)
 {
-	struct wifi_enterprise_creds_params params = {0};
+	struct wifi_cert_data certs_common[] = {
+		{
+			.type = TLS_CREDENTIAL_CA_CERTIFICATE,
+			.sec_tag = WIFI_CERT_CA_SEC_TAG,
+			.data = &params->ca_cert,
+			.len = &params->ca_cert_len,
+		},
+	};
+
+	struct wifi_cert_data certs_sta[] = {
+		{
+			.type = TLS_CREDENTIAL_PRIVATE_KEY,
+			.sec_tag = WIFI_CERT_CLIENT_KEY_SEC_TAG,
+			.data = &params->client_key,
+			.len = &params->client_key_len,
+		},
+		{
+			.type = TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
+			.sec_tag = WIFI_CERT_CLIENT_SEC_TAG,
+			.data = &params->client_cert,
+			.len = &params->client_cert_len,
+		},
+		{
+			.type = TLS_CREDENTIAL_CA_CERTIFICATE,
+			.sec_tag = WIFI_CERT_CA_P2_SEC_TAG,
+			.data = &params->ca_cert2,
+			.len = &params->ca_cert2_len,
+		},
+		{
+			.type = TLS_CREDENTIAL_PRIVATE_KEY,
+			.sec_tag = WIFI_CERT_CLIENT_KEY_P2_SEC_TAG,
+			.data = &params->client_key2,
+			.len = &params->client_key2_len,
+		},
+		{
+			.type = TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
+			.sec_tag = WIFI_CERT_CLIENT_P2_SEC_TAG,
+			.data = &params->client_cert2,
+			.len = &params->client_cert2_len,
+		},
+	};
+
+	struct wifi_cert_data certs_ap[] = {
+		{
+			.type = TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
+			.sec_tag = WIFI_CERT_SERVER_SEC_TAG,
+			.data = &params->server_cert,
+			.len = &params->server_cert_len,
+		},
+		{
+			.type = TLS_CREDENTIAL_PRIVATE_KEY,
+			.sec_tag = WIFI_CERT_SERVER_KEY_SEC_TAG,
+			.data = &params->server_key,
+			.len = &params->server_key_len,
+		},
+	};
+
+	memset(params, 0, sizeof(*params));
+
+	/* Process common certificates */
+	if (process_certificates(certs_common, ARRAY_SIZE(certs_common)) != 0) {
+		goto cleanup;
+	}
+
+	/* Process STA-specific certificates */
+	if (!is_ap) {
+		if (process_certificates(certs_sta, ARRAY_SIZE(certs_sta)) != 0) {
+			goto cleanup;
+		}
+	}
+
+	/* Process AP-specific certificates if is_ap is true */
+	if (is_ap) {
+		if (process_certificates(certs_ap, ARRAY_SIZE(certs_ap)) != 0) {
+			goto cleanup;
+		}
+	}
+
+	memcpy(&context.enterprise_creds_params, params, sizeof(*params));
+	return;
+
+cleanup:
+	for (size_t i = 0; i < ARRAY_SIZE(certs_common); i++) {
+		if (certs_common[i].data) {
+			k_free(*certs_common[i].data);
+		}
+	}
+
+	if (!is_ap) {
+		for (size_t i = 0; i < ARRAY_SIZE(certs_sta); i++) {
+			if (certs_sta[i].data) {
+				k_free(*certs_sta[i].data);
+			}
+		}
+	}
 
-	params.ca_cert = (uint8_t *)ca_cert_test;
-	params.ca_cert_len = ARRAY_SIZE(ca_cert_test);
-	params.client_cert = (uint8_t *)client_cert_test;
-	params.client_cert_len = ARRAY_SIZE(client_cert_test);
-	params.client_key = (uint8_t *)client_key_test;
-	params.client_key_len = ARRAY_SIZE(client_key_test);
-	params.ca_cert2 = (uint8_t *)ca_cert2_test;
-	params.ca_cert2_len = ARRAY_SIZE(ca_cert2_test);
-	params.client_cert2 = (uint8_t *)client_cert2_test;
-	params.client_cert2_len = ARRAY_SIZE(client_cert2_test);
-	params.client_key2 = (uint8_t *)client_key2_test;
-	params.client_key2_len = ARRAY_SIZE(client_key2_test);
-	params.server_cert = (uint8_t *)server_cert_test;
-	params.server_cert_len = ARRAY_SIZE(server_cert_test);
-	params.server_key = (uint8_t *)server_key_test;
-	params.server_key_len = ARRAY_SIZE(server_key_test);
+	if (is_ap) {
+		for (size_t i = 0; i < ARRAY_SIZE(certs_ap); i++) {
+			if (certs_ap[i].data) {
+				k_free(*certs_ap[i].data);
+			}
+		}
+	}
+}
+
+static void clear_enterprise_creds_params(struct wifi_enterprise_creds_params *params)
+{
+	size_t i;
+
+	if (!params) {
+		return;
+	}
 
+	const uint8_t *certs[] = {
+		params->ca_cert,
+		params->client_cert,
+		params->client_key,
+		params->server_cert,
+		params->server_key,
+		params->ca_cert2,
+		params->client_cert2
+		params->client_key2,
+	};
+
+	for (i = 0; i < ARRAY_SIZE(certs); i++) {
+		k_free((void *)certs[i]);
+	}
+	memset(params, 0, sizeof(*params));
+}
+#else
+static void set_enterprise_creds_params(struct wifi_enterprise_creds_params *params,
+										bool is_ap)
+{
+		params->ca_cert = (uint8_t *)ca_cert_test;
+		params->ca_cert_len = ARRAY_SIZE(ca_cert_test);
+
+		if (!is_ap) {
+			params->client_cert = (uint8_t *)client_cert_test;
+			params->client_cert_len = ARRAY_SIZE(client_cert_test);
+			params->client_key = (uint8_t *)client_key_test;
+			params->client_key_len = ARRAY_SIZE(client_key_test);
+			params->ca_cert2 = (uint8_t *)ca_cert2_test;
+			params->ca_cert2_len = ARRAY_SIZE(ca_cert2_test);
+			params->client_cert2 = (uint8_t *)client_cert2_test;
+			params->client_cert2_len = ARRAY_SIZE(client_cert2_test);
+			params->client_key2 = (uint8_t *)client_key2_test;
+			params->client_key2_len = ARRAY_SIZE(client_key2_test);
+
+			return;
+		}
+
+		params->server_cert = (uint8_t *)server_cert_test;
+		params->server_cert_len = ARRAY_SIZE(server_cert_test);
+		params->server_key = (uint8_t *)server_key_test;
+		params->server_key_len = ARRAY_SIZE(server_key_test);
+}
+#endif /* CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES */
+
+static int wifi_set_enterprise_creds(const struct shell *sh, struct net_if *iface,
+				    bool is_ap)
+{
+	struct wifi_enterprise_creds_params params = {0};
+
+#ifdef CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES
+	clear_enterprise_creds_params(&context.enterprise_creds_params);
+#endif /* CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES */
+	set_enterprise_creds_params(&params, is_ap);
 	if (net_mgmt(NET_REQUEST_WIFI_ENTERPRISE_CREDS, iface, &params, sizeof(params))) {
 		PR_WARNING("Set enterprise credentials failed\n");
 		return -1;
@@ -916,7 +1130,7 @@ static int cmd_wifi_connect(const struct shell *sh, size_t argc,
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_GTC ||
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2 ||
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_TLS) {
-		cmd_wifi_set_enterprise_creds(sh, iface);
+		wifi_set_enterprise_creds(sh, iface, 0);
 	}
 #endif
 
@@ -958,6 +1172,11 @@ static int cmd_wifi_disconnect(const struct shell *sh, size_t argc,
 		PR("Disconnect requested\n");
 	}
 
+#ifdef CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES
+	/* Clear the certificates */
+	clear_enterprise_creds_params(&context.enterprise_creds_params);
+#endif /* CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES */
+
 	return 0;
 }
 
@@ -1924,7 +2143,7 @@ static int cmd_wifi_ap_enable(const struct shell *sh, size_t argc,
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_GTC ||
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2 ||
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_TLS) {
-		cmd_wifi_set_enterprise_creds(sh, iface);
+		wifi_set_enterprise_creds(sh, iface, 1);
 	}
 #endif
 
@@ -1955,6 +2174,12 @@ static int cmd_wifi_ap_disable(const struct shell *sh, size_t argc,
 	}
 
 	PR("AP mode disable requested\n");
+
+#ifdef CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES
+	/* Clear the certificates */
+	clear_enterprise_creds_params(&context.enterprise_creds_params);
+#endif /* CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES */
+
 	return 0;
 }
 

From f3dc6eb371e3a73d2e3aa9f9daeb3d63de33408d Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 25 Mar 2025 23:54:10 +0530
Subject: [PATCH 2830/2913] [nrf fromlist] net: lib: tls_credentials_shell: Add
 a config for heap

The volatile backend stores the credentials on the heap, so, explicitly
add a config option that can be overridden in case there are more certs
than the default.

Upstream PR #: 87656

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 subsys/net/lib/tls_credentials/Kconfig.shell | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/subsys/net/lib/tls_credentials/Kconfig.shell b/subsys/net/lib/tls_credentials/Kconfig.shell
index 3e20f6e7717..9a28e887bf6 100644
--- a/subsys/net/lib/tls_credentials/Kconfig.shell
+++ b/subsys/net/lib/tls_credentials/Kconfig.shell
@@ -32,4 +32,13 @@ config TLS_CREDENTIALS_SHELL_DIGEST_BUF_SIZE
 
 	   Also used to print error messages if digest generation fails.
 
+if TLS_CREDENTIALS_BACKEND_VOLATILE
+config HEAP_MEM_POOL_ADD_SIZE_TLS_CRED_SHELL
+	int "TLS credentials shell memory pool size"
+	# default 4 certs and each assume 1500 bytes
+	default 6000
+	help
+	  The size of the memory pool used by the TLS credentials shell.
+endif # TLS_CREDENTIALS_BACKEND_VOLATILE
+
 endif # TLS_CREDENTIALS_SHELL

From e6d8fe15dbfef6a0b3e6d6403031b7fd7d7984d2 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 26 Mar 2025 00:10:17 +0530
Subject: [PATCH 2831/2913] [nrf fromlist] wifi: Move Wi-Fi enterprise configs
 to a snippet

Instead of having an overlay move the Enterprise configurations to a
dedicated snippet so that it can be enabled with any sample.

Can be used along with Wi-Fi snippet e.g., `-S
"wifi-ipv4;wifi-enterprise"`.

Upstream PR #: 87656

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 doc/connectivity/networking/api/wifi.rst      |  9 +-----
 .../net/wifi/shell/overlay-enterprise.conf    | 10 ------
 snippets/wifi-enterprise/README.rst           | 31 +++++++++++++++++++
 snippets/wifi-enterprise/snippet.yml          |  3 ++
 .../wifi-enterprise/wifi-enterprise.conf      |  5 ++-
 5 files changed, 37 insertions(+), 21 deletions(-)
 delete mode 100644 samples/net/wifi/shell/overlay-enterprise.conf
 create mode 100644 snippets/wifi-enterprise/README.rst
 create mode 100644 snippets/wifi-enterprise/snippet.yml
 rename samples/net/wifi/shell/overlay-enterprise-variable-bufs.conf => snippets/wifi-enterprise/wifi-enterprise.conf (70%)

diff --git a/doc/connectivity/networking/api/wifi.rst b/doc/connectivity/networking/api/wifi.rst
index d69d3c1836d..fdb8f22cabd 100644
--- a/doc/connectivity/networking/api/wifi.rst
+++ b/doc/connectivity/networking/api/wifi.rst
@@ -50,14 +50,7 @@ module.
     $ cp client2.pem samples/net/wifi/test_certs/
     $ cp client-key2.pem samples/net/wifi/test_certs/
     $ cp ca2.pem samples/net/wifi/test_certs/
-    $ west build -p -b <board> samples/net/wifi -- -DEXTRA_CONF_FILE=overlay-enterprise.conf
-
-For using variable size network buffer, the following overlay file can be used:
-
-.. code-block:: bash
-
-    $ west build -p -b <board> samples/net/wifi -- -DEXTRA_CONF_FILE=overlay-enterprise-variable-bufs.conf
-
+    $ west build -p -b <board> samples/net/wifi -S wifi-enterprise
 
 Run time certificates
 ---------------------
diff --git a/samples/net/wifi/shell/overlay-enterprise.conf b/samples/net/wifi/shell/overlay-enterprise.conf
deleted file mode 100644
index 5290e31744b..00000000000
--- a/samples/net/wifi/shell/overlay-enterprise.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE=y
-# EAP frames are ~1100 bytes, so, need higher packet counts as default packet size is 128
-CONFIG_NET_PKT_TX_COUNT=36
-CONFIG_NET_PKT_RX_COUNT=36
-CONFIG_NET_BUF_TX_COUNT=72
-CONFIG_NET_BUF_RX_COUNT=36
-# For TLS and X.509 processing MbedTLS needs large heap size and using separate heap
-# for MbedTLS gives us more control over the heap size.
-CONFIG_MBEDTLS_ENABLE_HEAP=y
-CONFIG_MBEDTLS_HEAP_SIZE=60000
diff --git a/snippets/wifi-enterprise/README.rst b/snippets/wifi-enterprise/README.rst
new file mode 100644
index 00000000000..ddf512b5835
--- /dev/null
+++ b/snippets/wifi-enterprise/README.rst
@@ -0,0 +1,31 @@
+.. _snippet-wifi-enterprise:
+
+Wi-Fi Enterprise Snippet (wifi-enterprise)
+##########################################
+
+.. code-block:: console
+
+   west build  -S wifi-enterprise [...]
+
+Can also be used along with the :ref:`snippet-wifi-ipv4` snippet.
+
+.. code-block:: console
+
+   west build  -S "wifi-enterprise,wifi-ipv4" [...]
+
+Overview
+********
+
+This snippet enables enterprise Wi-Fi support in supported networking samples.
+
+See :ref:`wifi_mgmt` for more information on the usage.
+
+Requirements
+************
+
+Hardware support for:
+
+- :kconfig:option:`CONFIG_WIFI`
+- :kconfig:option:`CONFIG_WIFI_USE_NATIVE_NETWORKING`
+- :kconfig:option:`CONFIG_WIFI_NM_WPA_SUPPLICANT`
+- :kconfig:option:`CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE`
diff --git a/snippets/wifi-enterprise/snippet.yml b/snippets/wifi-enterprise/snippet.yml
new file mode 100644
index 00000000000..6a4f73d38b4
--- /dev/null
+++ b/snippets/wifi-enterprise/snippet.yml
@@ -0,0 +1,3 @@
+name: wifi-enterprise
+append:
+  EXTRA_CONF_FILE: wifi-enterprise.conf
diff --git a/samples/net/wifi/shell/overlay-enterprise-variable-bufs.conf b/snippets/wifi-enterprise/wifi-enterprise.conf
similarity index 70%
rename from samples/net/wifi/shell/overlay-enterprise-variable-bufs.conf
rename to snippets/wifi-enterprise/wifi-enterprise.conf
index 627d77a9247..d6aeb00c81b 100644
--- a/samples/net/wifi/shell/overlay-enterprise-variable-bufs.conf
+++ b/snippets/wifi-enterprise/wifi-enterprise.conf
@@ -1,9 +1,8 @@
+# Enable Wi-Fi enterprise mode
 CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE=y
-# EAP frames are ~1100 bytes, so, for efficiency, we set the data size to 1100
-CONFIG_NET_BUF_DATA_SIZE=1100
 # Use variable data size to reduce memory usage for small data packets
 CONFIG_NET_BUF_VARIABLE_DATA_SIZE=y
 # For TLS and X.509 processing MbedTLS needs large heap size and using separate heap
 # for MbedTLS gives us more control over the heap size.
 CONFIG_MBEDTLS_ENABLE_HEAP=y
-CONFIG_MBEDTLS_HEAP_SIZE=55000
+CONFIG_MBEDTLS_HEAP_SIZE=60000

From e3269af9abf346060374aa5e739b65ea6828856d Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 26 Mar 2025 00:15:22 +0530
Subject: [PATCH 2832/2913] [nrf fromlist] snippets: wifi-enterprise: Add
 support for TLS credentials

Enable TLS credentials shell to manager Wi-Fi enterprise certs.

Upstream PR #: 87656

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 snippets/wifi-enterprise/wifi-enterprise.conf | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/snippets/wifi-enterprise/wifi-enterprise.conf b/snippets/wifi-enterprise/wifi-enterprise.conf
index d6aeb00c81b..5cc0646d518 100644
--- a/snippets/wifi-enterprise/wifi-enterprise.conf
+++ b/snippets/wifi-enterprise/wifi-enterprise.conf
@@ -6,3 +6,11 @@ CONFIG_NET_BUF_VARIABLE_DATA_SIZE=y
 # for MbedTLS gives us more control over the heap size.
 CONFIG_MBEDTLS_ENABLE_HEAP=y
 CONFIG_MBEDTLS_HEAP_SIZE=60000
+
+# For use with TLS credentials
+CONFIG_TLS_CREDENTIALS_SHELL=y
+CONFIG_BASE64=y
+CONFIG_TLS_CREDENTIALS=y
+CONFIG_TLS_CREDENTIALS_SHELL_CRED_BUF_SIZE=8192
+CONFIG_TLS_MAX_CREDENTIALS_NUMBER=6
+CONFIG_HEAP_MEM_POOL_ADD_SIZE_TLS_CRED_SHELL=9000

From f6e08628204917b028aa3dee2abb829792422107 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Thu, 27 Mar 2025 01:11:59 +0530
Subject: [PATCH 2833/2913] [nrf fromlist] net: lib: tls_credentials_shell: Fix
 crash during delete

Deletion of credential should use the pointer from the reference slot
not the temporary buffer, this causes a crash (unknown error).

Upstream PR #: 87656

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 subsys/net/lib/tls_credentials/tls_credentials_shell.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/subsys/net/lib/tls_credentials/tls_credentials_shell.c b/subsys/net/lib/tls_credentials/tls_credentials_shell.c
index 1b06520466b..3195c759962 100644
--- a/subsys/net/lib/tls_credentials/tls_credentials_shell.c
+++ b/subsys/net/lib/tls_credentials/tls_credentials_shell.c
@@ -564,8 +564,8 @@ static int tls_cred_cmd_del(const struct shell *sh, size_t argc, char *argv[])
 	ref_slot = find_ref_slot(cred->buf);
 	if (ref_slot >= 0) {
 		/* This was a credential we copied to heap. Clear and free it. */
-		memset((void *)cred_buf, 0, cred->len);
-		k_free((void *)cred_buf);
+		memset(&cred_refs[ref_slot], 0, cred->len);
+		k_free((void *)&cred_refs[ref_slot]);
 		cred->buf = NULL;
 
 		/* Clear the reference slot so it can be used again. */

From 7eaa7f522910a7f73205673511d8c9efc10e8e2b Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Thu, 27 Mar 2025 13:20:06 +0530
Subject: [PATCH 2834/2913] [nrf fromlist] net: l2: wifi: Make build time certs
 as optional

Certificates usage depends on STA/AP mode, but we don't have that
information at a build time, so, make all certs as optional and if a
file isn't found then generate an empty header so that corresponding C
code will be built.

Any missing mandatory certificates will be validated before connection
and connection is failed.

Upstream PR #: 87656

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 subsys/net/l2/wifi/CMakeLists.txt | 51 ++++++++-----------------------
 1 file changed, 13 insertions(+), 38 deletions(-)

diff --git a/subsys/net/l2/wifi/CMakeLists.txt b/subsys/net/l2/wifi/CMakeLists.txt
index 560f7b301be..6cf0183e141 100644
--- a/subsys/net/l2/wifi/CMakeLists.txt
+++ b/subsys/net/l2/wifi/CMakeLists.txt
@@ -33,53 +33,28 @@ if(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE AND CONFIG_NET_L2_WIFI_SHELL)
   # convert .pem files to array data at build time
   zephyr_include_directories(${gen_inc_dir})
 
-  generate_inc_file_for_target(
-      app
+  foreach(cert_file IN ITEMS
       ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client.pem
-      ${gen_dir}/client.pem.inc
-      )
-
-  generate_inc_file_for_target(
-      app
       ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client-key.pem
-      ${gen_dir}/client-key.pem.inc
-      )
-
-  generate_inc_file_for_target(
-      app
       ${ZEPHYR_BASE}/samples/net/wifi/test_certs/ca.pem
-      ${gen_dir}/ca.pem.inc
-      )
-
-  generate_inc_file_for_target(
-      app
       ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client2.pem
-      ${gen_dir}/client2.pem.inc
-      )
-
-  generate_inc_file_for_target(
-      app
       ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client-key2.pem
-      ${gen_dir}/client-key2.pem.inc
-      )
-
-  generate_inc_file_for_target(
-      app
       ${ZEPHYR_BASE}/samples/net/wifi/test_certs/ca2.pem
-      ${gen_dir}/ca2.pem.inc
-      )
-
-  generate_inc_file_for_target(
-      app
       ${ZEPHYR_BASE}/samples/net/wifi/test_certs/server.pem
-      ${gen_dir}/server.pem.inc
-      )
-
-  generate_inc_file_for_target(
-      app
       ${ZEPHYR_BASE}/samples/net/wifi/test_certs/server-key.pem
-      ${gen_dir}/server-key.pem.inc
       )
+    if(EXISTS ${cert_file})
+      get_filename_component(cert_name ${cert_file} NAME)
+      generate_inc_file_for_target(
+          app
+          ${cert_file}
+          ${gen_dir}/${cert_name}.inc
+          )
+    else()
+      get_filename_component(cert_name ${cert_file} NAME)
+      file(WRITE ${gen_dir}/${cert_name}.inc "// Empty file generated because ${cert_file} does not exist\n")
+    endif()
+  endforeach()
 
   # Add explicit dependency on app target for ZEPHYR_CURRENT_LIBRARY, so these
   # headers are generated at the correct point in the build

From 814203598be6770a45c5a46218e0396597c1af57 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Thu, 27 Mar 2025 13:47:40 +0530
Subject: [PATCH 2835/2913] [nrf fromlist] samples: net: wifi: Add two variants
 of certs

RSA3K based certs are not supported on all platforms, so, keep both
variants, rsa2k (the older certs but with longer expiry 9999 days) and
rsa3k (latest ones) and we can have more variants in this folders.

Also, add a cmake variable to override the path with default as rsa3k.

Upstream PR #: 87656

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 doc/connectivity/networking/api/wifi.rst      | 27 ++++++++++++----
 samples/net/wifi/test_certs/rsa2k/ca.pem      | 29 +++++++++++++++++
 samples/net/wifi/test_certs/rsa2k/ca2.pem     | 29 +++++++++++++++++
 .../net/wifi/test_certs/rsa2k/client-key.pem  | 30 ++++++++++++++++++
 .../net/wifi/test_certs/rsa2k/client-key2.pem | 30 ++++++++++++++++++
 samples/net/wifi/test_certs/rsa2k/client.pem  | 27 ++++++++++++++++
 samples/net/wifi/test_certs/rsa2k/client2.pem | 27 ++++++++++++++++
 .../net/wifi/test_certs/rsa2k/server-key.pem  | 30 ++++++++++++++++++
 samples/net/wifi/test_certs/rsa2k/server.pem  | 31 +++++++++++++++++++
 .../net/wifi/test_certs/{ => rsa3k}/ca.pem    |  0
 .../net/wifi/test_certs/{ => rsa3k}/ca2.pem   |  0
 .../test_certs/{ => rsa3k}/client-key.pem     |  0
 .../test_certs/{ => rsa3k}/client-key2.pem    |  0
 .../wifi/test_certs/{ => rsa3k}/client.pem    |  0
 .../wifi/test_certs/{ => rsa3k}/client2.pem   |  0
 .../test_certs/{ => rsa3k}/server-key.pem     |  0
 .../wifi/test_certs/{ => rsa3k}/server.pem    |  0
 subsys/net/l2/wifi/CMakeLists.txt             | 19 +++++++-----
 18 files changed, 265 insertions(+), 14 deletions(-)
 create mode 100644 samples/net/wifi/test_certs/rsa2k/ca.pem
 create mode 100644 samples/net/wifi/test_certs/rsa2k/ca2.pem
 create mode 100644 samples/net/wifi/test_certs/rsa2k/client-key.pem
 create mode 100644 samples/net/wifi/test_certs/rsa2k/client-key2.pem
 create mode 100644 samples/net/wifi/test_certs/rsa2k/client.pem
 create mode 100644 samples/net/wifi/test_certs/rsa2k/client2.pem
 create mode 100644 samples/net/wifi/test_certs/rsa2k/server-key.pem
 create mode 100644 samples/net/wifi/test_certs/rsa2k/server.pem
 rename samples/net/wifi/test_certs/{ => rsa3k}/ca.pem (100%)
 rename samples/net/wifi/test_certs/{ => rsa3k}/ca2.pem (100%)
 rename samples/net/wifi/test_certs/{ => rsa3k}/client-key.pem (100%)
 rename samples/net/wifi/test_certs/{ => rsa3k}/client-key2.pem (100%)
 rename samples/net/wifi/test_certs/{ => rsa3k}/client.pem (100%)
 rename samples/net/wifi/test_certs/{ => rsa3k}/client2.pem (100%)
 rename samples/net/wifi/test_certs/{ => rsa3k}/server-key.pem (100%)
 rename samples/net/wifi/test_certs/{ => rsa3k}/server.pem (100%)

diff --git a/doc/connectivity/networking/api/wifi.rst b/doc/connectivity/networking/api/wifi.rst
index fdb8f22cabd..5f042bc268f 100644
--- a/doc/connectivity/networking/api/wifi.rst
+++ b/doc/connectivity/networking/api/wifi.rst
@@ -42,16 +42,31 @@ Test certificates in PEM format are committed to the repo at :zephyr_file:`sampl
 build process the certificates are converted to a C header file that is included by the Wi-Fi shell
 module.
 
+If you want to use your own certificates, you can replace the existing certificates with your own certificates in the same directory.
+
 .. code-block:: bash
 
-    $ cp client.pem samples/net/wifi/test_certs/
-    $ cp client-key.pem samples/net/wifi/test_certs/
-    $ cp ca.pem samples/net/wifi/test_certs/
-    $ cp client2.pem samples/net/wifi/test_certs/
-    $ cp client-key2.pem samples/net/wifi/test_certs/
-    $ cp ca2.pem samples/net/wifi/test_certs/
+    $ export CERTS_DIR=samples/net/wifi/test_certs/rsa3k
+    $ cp client.pem $CERTS_DIR
+    $ cp client-key.pem $CERTS_DIR
+    $ cp ca.pem $CERTS_DIR
+    $ cp client2.pem $CERTS_DIR
+    $ cp client-key2.pem $CERTS_DIR
+    $ cp ca2.pem $CERTS_DIR
     $ west build -p -b <board> samples/net/wifi -S wifi-enterprise
 
+or alternatively copy ``rsa2k`` certificates by changing the ``CERTS_DIR`` environment variable.
+
+.. code-block:: bash
+
+    $ export CERTS_DIR=samples/net/wifi/test_certs/rsa2k
+
+or you can set the :envvar:`WIFI_TEST_CERTS_DIR` environment variable to point to the directory containing your certificates.
+
+.. code-block:: bash
+
+    $ west build -p -b <board> samples/net/wifi -S wifi-enterprise -- -DWIFI_TEST_CERTS_DIR=<path_to_your_certificates>
+
 Run time certificates
 ---------------------
 
diff --git a/samples/net/wifi/test_certs/rsa2k/ca.pem b/samples/net/wifi/test_certs/rsa2k/ca.pem
new file mode 100644
index 00000000000..a267be8fe47
--- /dev/null
+++ b/samples/net/wifi/test_certs/rsa2k/ca.pem
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE+TCCA+GgAwIBAgIUH614zvmCngpSc26BLLFu2loqvfgwDQYJKoZIhvcNAQEL
+BQAwgZIxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIDAZSYWRpdXMxEjAQBgNVBAcMCVNv
+bWV3aGVyZTEUMBIGA1UECgwLRXhhbXBsZSBJbmMxIDAeBgkqhkiG9w0BCQEWEWFk
+bWluQGV4YW1wbGUub3JnMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRlIEF1
+dGhvcml0eTAgFw0yNTAzMjcxMjUwNDhaGA8yMDUyMDgxMTEyNTA0OFowgZIxCzAJ
+BgNVBAYTAkZSMQ8wDQYDVQQIDAZSYWRpdXMxEjAQBgNVBAcMCVNvbWV3aGVyZTEU
+MBIGA1UECgwLRXhhbXBsZSBJbmMxIDAeBgkqhkiG9w0BCQEWEWFkbWluQGV4YW1w
+bGUub3JnMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRlIEF1dGhvcml0eTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALljCArLJs7rdS4pJDrpbSd3
+pNCo1skN3h9FSdboWnz5uvy4dUfOQcPzd1i/Kav7R+eURTIlIe24slDobYW7dS+u
+U+mlw8yzd6Xs9L8BvHrE/JvHMdaCubSWJwJ+BtTZMAvwfpysw0TrYgUw10v4O6PU
+0ri80I/79IKXCQjLnoqrf7OylYnSeuufMrcojZlqMD444EcJS8OAhm648D7w9xWp
+YwGhhV7gLgFZfIZ3vq/VQE6//pasHZ4P2bdej4Up7Nhsqa3qLtPYlUsJB8uTp04h
+YLA600hKoGKJiW1fHrmVIQiYamwkpUSmhY1mw/RJ0GbWE1BT+vLC2BMckw+cwF0C
+AwEAAaOCAUEwggE9MB0GA1UdDgQWBBTgzBbVi3ycphRotu7Am6ynMwVAyTCB0gYD
+VR0jBIHKMIHHgBTgzBbVi3ycphRotu7Am6ynMwVAyaGBmKSBlTCBkjELMAkGA1UE
+BhMCRlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYD
+VQQKDAtFeGFtcGxlIEluYzEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
+cmcxJjAkBgNVBAMMHUV4YW1wbGUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5ghQfrXjO
++YKeClJzboEssW7aWiq9+DAPBgNVHRMBAf8EBTADAQH/MDYGA1UdHwQvMC0wK6Ap
+oCeGJWh0dHA6Ly93d3cuZXhhbXBsZS5jb20vZXhhbXBsZV9jYS5jcmwwDQYJKoZI
+hvcNAQELBQADggEBAAV8StX4zFbOqcNVzF0JaZGu7CquFR4pOjCbM9XJVcwCxc0+
+DtIxy+w9KMLGgwB6LHh51tAExCR3UTktG8FqFxdjESCD8qlQoLU1uzt0kadKvQUr
+wjn8ToEp1UP8UZa+SzaXVAYv09DC+VMYqBmkUtze/F5LC0LMWQBR3bn2EGdwBoMl
+k2Gq6BdJZRCotyraSvG01mMyORY6UzLi25WFVg6B284VlD0cqFqmUMEmk2f76Ix3
+WpUkoGZ/ArAoS6+vaFmSrhZ9W+YBfBoBgjXrGMKi2dkUUngbm4yGxrhnN1MFu2lA
+xnBWRxSQjzLGzqQP/bfxAVlNyXwQNPETGVZpGzc=
+-----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/rsa2k/ca2.pem b/samples/net/wifi/test_certs/rsa2k/ca2.pem
new file mode 100644
index 00000000000..a267be8fe47
--- /dev/null
+++ b/samples/net/wifi/test_certs/rsa2k/ca2.pem
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE+TCCA+GgAwIBAgIUH614zvmCngpSc26BLLFu2loqvfgwDQYJKoZIhvcNAQEL
+BQAwgZIxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIDAZSYWRpdXMxEjAQBgNVBAcMCVNv
+bWV3aGVyZTEUMBIGA1UECgwLRXhhbXBsZSBJbmMxIDAeBgkqhkiG9w0BCQEWEWFk
+bWluQGV4YW1wbGUub3JnMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRlIEF1
+dGhvcml0eTAgFw0yNTAzMjcxMjUwNDhaGA8yMDUyMDgxMTEyNTA0OFowgZIxCzAJ
+BgNVBAYTAkZSMQ8wDQYDVQQIDAZSYWRpdXMxEjAQBgNVBAcMCVNvbWV3aGVyZTEU
+MBIGA1UECgwLRXhhbXBsZSBJbmMxIDAeBgkqhkiG9w0BCQEWEWFkbWluQGV4YW1w
+bGUub3JnMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRlIEF1dGhvcml0eTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALljCArLJs7rdS4pJDrpbSd3
+pNCo1skN3h9FSdboWnz5uvy4dUfOQcPzd1i/Kav7R+eURTIlIe24slDobYW7dS+u
+U+mlw8yzd6Xs9L8BvHrE/JvHMdaCubSWJwJ+BtTZMAvwfpysw0TrYgUw10v4O6PU
+0ri80I/79IKXCQjLnoqrf7OylYnSeuufMrcojZlqMD444EcJS8OAhm648D7w9xWp
+YwGhhV7gLgFZfIZ3vq/VQE6//pasHZ4P2bdej4Up7Nhsqa3qLtPYlUsJB8uTp04h
+YLA600hKoGKJiW1fHrmVIQiYamwkpUSmhY1mw/RJ0GbWE1BT+vLC2BMckw+cwF0C
+AwEAAaOCAUEwggE9MB0GA1UdDgQWBBTgzBbVi3ycphRotu7Am6ynMwVAyTCB0gYD
+VR0jBIHKMIHHgBTgzBbVi3ycphRotu7Am6ynMwVAyaGBmKSBlTCBkjELMAkGA1UE
+BhMCRlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYD
+VQQKDAtFeGFtcGxlIEluYzEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
+cmcxJjAkBgNVBAMMHUV4YW1wbGUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5ghQfrXjO
++YKeClJzboEssW7aWiq9+DAPBgNVHRMBAf8EBTADAQH/MDYGA1UdHwQvMC0wK6Ap
+oCeGJWh0dHA6Ly93d3cuZXhhbXBsZS5jb20vZXhhbXBsZV9jYS5jcmwwDQYJKoZI
+hvcNAQELBQADggEBAAV8StX4zFbOqcNVzF0JaZGu7CquFR4pOjCbM9XJVcwCxc0+
+DtIxy+w9KMLGgwB6LHh51tAExCR3UTktG8FqFxdjESCD8qlQoLU1uzt0kadKvQUr
+wjn8ToEp1UP8UZa+SzaXVAYv09DC+VMYqBmkUtze/F5LC0LMWQBR3bn2EGdwBoMl
+k2Gq6BdJZRCotyraSvG01mMyORY6UzLi25WFVg6B284VlD0cqFqmUMEmk2f76Ix3
+WpUkoGZ/ArAoS6+vaFmSrhZ9W+YBfBoBgjXrGMKi2dkUUngbm4yGxrhnN1MFu2lA
+xnBWRxSQjzLGzqQP/bfxAVlNyXwQNPETGVZpGzc=
+-----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/rsa2k/client-key.pem b/samples/net/wifi/test_certs/rsa2k/client-key.pem
new file mode 100644
index 00000000000..4fbf52d284f
--- /dev/null
+++ b/samples/net/wifi/test_certs/rsa2k/client-key.pem
@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIcm3x/CvLYRcCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCSqbBrS+vObBIIEyPSMbzL5DvaJ
+tW/lEoNvmujkYw/qADyExm4JidoemiTxMJB6TkXJE+W8glDeY+TCZUD6UyeiSx7J
+HC1R2rQmpy91LT5o6P7Eyq/VHIsXVE77rS91NCKjiljdPWbzkLFo5oNwguhsvKI9
+YjU8m0V6KVLx21DZFDi5OZQ8g0ULu9FR9WIr4eDUnAIjJnpqw00hZF6FVKe7lu9t
+2uCiKABXpODMqQyrDrTTsQNB4MV8axVWMaYW4P6JVf40ByzA4ISNYhmFH3DWMlAH
+c6LhZstT7n3lXbpsq3pTvn/07+5yuTIvOmFvOoUnXo+kIU7gf1ODma7kPHrcD62c
+9ZgMh/Y90YcQamoLUXJqKBk96ybj9v4p6CTzJC8vOj8GOJqEoUgs6lNYrNQmdJka
+InZJnMfCgX67g60NrQ7vb/LPXTs1gShk/fn2EdLCvhqJNQwNgLjwFtio2DObBD4b
+kuIV/h83moZ/yGrW2PPjxDrzWCxgFhMXs8kGZX6119J8Ki8L+EgKXz0Vfed6XQP6
+RK2anaQzmtJgM4gzzXDOPBPKYDMjqZHqZpMCl1J6TOYbVELDu+OAPGrLSXt71O+T
+toPVrUNdKvYB5H4hosoqMiyeNGwEVjFlSKEInSM6IlwWK2+/xeqTued74nKgj/Je
+xmLbZEurHtOctY0807gj2aNO2/iR4n+1kk9nniBcZNJ7la5GEqAp4wRSH2KI+hu0
+YoJHLtRX/BccawOTvWnLXOsbBTxXtZV9m4ojLbqCzpEV5alFkO0ycP/ao6A/ZTej
+52X01EoUi7Nq5uoIxx+BKj5LN4Pa0Wpe4/DryiEqjSQ2sZMnkD+DhHw/soGcJrJm
+s9zV0YFfFk9Flfnq/9uteHOj+CLxE4BQCpaEBkE+2IooU2Vtw9i5YOeQB+4971XE
+JFBqNknjSfFqaL9zzBliKA9bizZawBub/HUX5P+3k71761k+Li1ID+RYOhTGjqKh
+ws8bke2BtAOB/vccxQGYEOdi8U6+AgK7Dz1AmMQhLlDA8S7qAwodLmnaC6WhP1rA
+1koQYnAGCxOcARTZCLzlfidNf1KzYMRdSVjTh9QAGW7cxEnNEnai5nU4VXUVT3xB
+LWRP98yWzOIsQLFtXzjE0P+ESYGOsQj8aVyy/QHSOg5oEHxZ/myUbr1QB58Z+VKa
+T8/EE2lQazINMIxfsxjDygHX3iF3BlxpwCBk2ykdbfqQFwZ3cr1l53ixuKqd2pTV
+xsEhuAvAfJ1OadUM8HefT+ijUuKPUowtcrcA8URqgy1V/vgcM0qiw7fWysKK7oWl
+L7Oa3JfTE1mpZuocOvF7e5ueNzIgEgnxQEkEE3AJmS0YxMqI6ShTnUx6p79OlVZr
+/Izdkwqqhene+zudNd3z0TMhkjI8LZa6x4SBfCZmCOzOgoZ9XMrf80S/9CKTLWFv
+UrLOe8RJz/6SYweQTMakejC/sbHSSTrqmIf9mrVLP1sMBm8R7TPLMRt8CFNtuYB0
+3nHO9kP7qT3U3sTZ9A0NQyaOfQYcWSLSGBkLSJAM3wh590hp7i6hnM3FeOYY3+lL
+2a9q59B2H3HJfSUUCXtPA8wsEkZyCfz+y5YGscrhQcCbBq1FkkarluKJFonFCEKK
+D4mU9Io0mhON+5ZNhwqurQ==
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/rsa2k/client-key2.pem b/samples/net/wifi/test_certs/rsa2k/client-key2.pem
new file mode 100644
index 00000000000..4fbf52d284f
--- /dev/null
+++ b/samples/net/wifi/test_certs/rsa2k/client-key2.pem
@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIcm3x/CvLYRcCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCSqbBrS+vObBIIEyPSMbzL5DvaJ
+tW/lEoNvmujkYw/qADyExm4JidoemiTxMJB6TkXJE+W8glDeY+TCZUD6UyeiSx7J
+HC1R2rQmpy91LT5o6P7Eyq/VHIsXVE77rS91NCKjiljdPWbzkLFo5oNwguhsvKI9
+YjU8m0V6KVLx21DZFDi5OZQ8g0ULu9FR9WIr4eDUnAIjJnpqw00hZF6FVKe7lu9t
+2uCiKABXpODMqQyrDrTTsQNB4MV8axVWMaYW4P6JVf40ByzA4ISNYhmFH3DWMlAH
+c6LhZstT7n3lXbpsq3pTvn/07+5yuTIvOmFvOoUnXo+kIU7gf1ODma7kPHrcD62c
+9ZgMh/Y90YcQamoLUXJqKBk96ybj9v4p6CTzJC8vOj8GOJqEoUgs6lNYrNQmdJka
+InZJnMfCgX67g60NrQ7vb/LPXTs1gShk/fn2EdLCvhqJNQwNgLjwFtio2DObBD4b
+kuIV/h83moZ/yGrW2PPjxDrzWCxgFhMXs8kGZX6119J8Ki8L+EgKXz0Vfed6XQP6
+RK2anaQzmtJgM4gzzXDOPBPKYDMjqZHqZpMCl1J6TOYbVELDu+OAPGrLSXt71O+T
+toPVrUNdKvYB5H4hosoqMiyeNGwEVjFlSKEInSM6IlwWK2+/xeqTued74nKgj/Je
+xmLbZEurHtOctY0807gj2aNO2/iR4n+1kk9nniBcZNJ7la5GEqAp4wRSH2KI+hu0
+YoJHLtRX/BccawOTvWnLXOsbBTxXtZV9m4ojLbqCzpEV5alFkO0ycP/ao6A/ZTej
+52X01EoUi7Nq5uoIxx+BKj5LN4Pa0Wpe4/DryiEqjSQ2sZMnkD+DhHw/soGcJrJm
+s9zV0YFfFk9Flfnq/9uteHOj+CLxE4BQCpaEBkE+2IooU2Vtw9i5YOeQB+4971XE
+JFBqNknjSfFqaL9zzBliKA9bizZawBub/HUX5P+3k71761k+Li1ID+RYOhTGjqKh
+ws8bke2BtAOB/vccxQGYEOdi8U6+AgK7Dz1AmMQhLlDA8S7qAwodLmnaC6WhP1rA
+1koQYnAGCxOcARTZCLzlfidNf1KzYMRdSVjTh9QAGW7cxEnNEnai5nU4VXUVT3xB
+LWRP98yWzOIsQLFtXzjE0P+ESYGOsQj8aVyy/QHSOg5oEHxZ/myUbr1QB58Z+VKa
+T8/EE2lQazINMIxfsxjDygHX3iF3BlxpwCBk2ykdbfqQFwZ3cr1l53ixuKqd2pTV
+xsEhuAvAfJ1OadUM8HefT+ijUuKPUowtcrcA8URqgy1V/vgcM0qiw7fWysKK7oWl
+L7Oa3JfTE1mpZuocOvF7e5ueNzIgEgnxQEkEE3AJmS0YxMqI6ShTnUx6p79OlVZr
+/Izdkwqqhene+zudNd3z0TMhkjI8LZa6x4SBfCZmCOzOgoZ9XMrf80S/9CKTLWFv
+UrLOe8RJz/6SYweQTMakejC/sbHSSTrqmIf9mrVLP1sMBm8R7TPLMRt8CFNtuYB0
+3nHO9kP7qT3U3sTZ9A0NQyaOfQYcWSLSGBkLSJAM3wh590hp7i6hnM3FeOYY3+lL
+2a9q59B2H3HJfSUUCXtPA8wsEkZyCfz+y5YGscrhQcCbBq1FkkarluKJFonFCEKK
+D4mU9Io0mhON+5ZNhwqurQ==
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/rsa2k/client.pem b/samples/net/wifi/test_certs/rsa2k/client.pem
new file mode 100644
index 00000000000..33eeed9918e
--- /dev/null
+++ b/samples/net/wifi/test_certs/rsa2k/client.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEgzCCA2ugAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBkjELMAkGA1UEBhMCRlIx
+DzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQKDAtF
+eGFtcGxlIEluYzEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5vcmcxJjAk
+BgNVBAMMHUV4YW1wbGUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MCAXDTI1MDMyNzEy
+NTA0OVoYDzIwNTIwODExMTI1MDQ5WjB0MQswCQYDVQQGEwJGUjEPMA0GA1UECAwG
+UmFkaXVzMRQwEgYDVQQKDAtFeGFtcGxlIEluYzEVMBMGA1UEAwwMRXhhbXBsZSB1
+c2VyMScwJQYJKoZIhvcNAQkBFhh1c2VyLmV4YW1wbGVAZXhhbXBsZS5vcmcwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkyPDf2/pHiJ6Bb7JK2syekEMh
+j67IpFshtBy/6WAxQfbu9i8LAtyTiEg/7FvZbtAhfPtOnXc45Lu64EHyF8o60Y0X
+6+45Ja3TCrPI609uTf1wTk8cpuRbm5u5blVwECaRiUJQL+Jm6TVNHF4byrNgKmUn
+KY7JFYHQCp6FTCfyex7pTkZSWdNo/EWTuAtOqmwjVLBEQCGtdpbQZmnE9b0WcoPL
+TB5vw3T30UBf3ve5wj6y3BFgMnbaoGvZd07lQtKVjkf50fVwuenPJF6+5XQS68qO
+qeNTq77//qtjFEukobQ5CxFUTrLTO3XTfN+to7xI1WRxDCAIO7wxPCPOcAx3AgMB
+AAGjgf4wgfswCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwEwYDVR0lBAwwCgYIKwYB
+BQUHAwIwNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL3d3dy5leGFtcGxlLmNvbS9l
+eGFtcGxlX2NhLmNybDA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6
+Ly93d3cuZXhhbXBsZS5vcmcvb2NzcDAbBgNVHREEFDASgRB1c2VyQGV4YW1wbGUu
+b3JnMB0GA1UdDgQWBBReX3pn9AYI0W0cD5Qrd1PP4mNtOjAfBgNVHSMEGDAWgBTg
+zBbVi3ycphRotu7Am6ynMwVAyTANBgkqhkiG9w0BAQsFAAOCAQEAbXo1Wc2a4053
+jBgl/lGN7p1KNyTO92V/gNT1jM6lOfy+qK6NZGZsayLLT2qubX5t9+1FI/RbRq3i
+FVCocIGRbZD+vKWTfxe4XowCwF9aE2od3xbQjWfSRGZCCYJpPkr5oh3i5qfztYos
+ONclAY54yx3cpsEj5VG/TXA4BmlaoJRrBbAVCGwRHL/KXGu4Y/AlAKHQWnZp6+sl
+UraELVaPeSRuZLgustDtIbMdyC6yTBTfCaRHPDmgYAxVVhzR29kitMO/hoJIAt8d
+MDWMXTRNsJMGMVOy6YWZAdvW0pj9tTN1shhYBRA3Wi8W/HrvlPtQWfrJqaTHNJ32
+sTKtziYlCg==
+-----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/rsa2k/client2.pem b/samples/net/wifi/test_certs/rsa2k/client2.pem
new file mode 100644
index 00000000000..33eeed9918e
--- /dev/null
+++ b/samples/net/wifi/test_certs/rsa2k/client2.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEgzCCA2ugAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBkjELMAkGA1UEBhMCRlIx
+DzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQKDAtF
+eGFtcGxlIEluYzEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5vcmcxJjAk
+BgNVBAMMHUV4YW1wbGUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MCAXDTI1MDMyNzEy
+NTA0OVoYDzIwNTIwODExMTI1MDQ5WjB0MQswCQYDVQQGEwJGUjEPMA0GA1UECAwG
+UmFkaXVzMRQwEgYDVQQKDAtFeGFtcGxlIEluYzEVMBMGA1UEAwwMRXhhbXBsZSB1
+c2VyMScwJQYJKoZIhvcNAQkBFhh1c2VyLmV4YW1wbGVAZXhhbXBsZS5vcmcwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkyPDf2/pHiJ6Bb7JK2syekEMh
+j67IpFshtBy/6WAxQfbu9i8LAtyTiEg/7FvZbtAhfPtOnXc45Lu64EHyF8o60Y0X
+6+45Ja3TCrPI609uTf1wTk8cpuRbm5u5blVwECaRiUJQL+Jm6TVNHF4byrNgKmUn
+KY7JFYHQCp6FTCfyex7pTkZSWdNo/EWTuAtOqmwjVLBEQCGtdpbQZmnE9b0WcoPL
+TB5vw3T30UBf3ve5wj6y3BFgMnbaoGvZd07lQtKVjkf50fVwuenPJF6+5XQS68qO
+qeNTq77//qtjFEukobQ5CxFUTrLTO3XTfN+to7xI1WRxDCAIO7wxPCPOcAx3AgMB
+AAGjgf4wgfswCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwEwYDVR0lBAwwCgYIKwYB
+BQUHAwIwNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL3d3dy5leGFtcGxlLmNvbS9l
+eGFtcGxlX2NhLmNybDA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6
+Ly93d3cuZXhhbXBsZS5vcmcvb2NzcDAbBgNVHREEFDASgRB1c2VyQGV4YW1wbGUu
+b3JnMB0GA1UdDgQWBBReX3pn9AYI0W0cD5Qrd1PP4mNtOjAfBgNVHSMEGDAWgBTg
+zBbVi3ycphRotu7Am6ynMwVAyTANBgkqhkiG9w0BAQsFAAOCAQEAbXo1Wc2a4053
+jBgl/lGN7p1KNyTO92V/gNT1jM6lOfy+qK6NZGZsayLLT2qubX5t9+1FI/RbRq3i
+FVCocIGRbZD+vKWTfxe4XowCwF9aE2od3xbQjWfSRGZCCYJpPkr5oh3i5qfztYos
+ONclAY54yx3cpsEj5VG/TXA4BmlaoJRrBbAVCGwRHL/KXGu4Y/AlAKHQWnZp6+sl
+UraELVaPeSRuZLgustDtIbMdyC6yTBTfCaRHPDmgYAxVVhzR29kitMO/hoJIAt8d
+MDWMXTRNsJMGMVOy6YWZAdvW0pj9tTN1shhYBRA3Wi8W/HrvlPtQWfrJqaTHNJ32
+sTKtziYlCg==
+-----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/rsa2k/server-key.pem b/samples/net/wifi/test_certs/rsa2k/server-key.pem
new file mode 100644
index 00000000000..5a6a2e77e65
--- /dev/null
+++ b/samples/net/wifi/test_certs/rsa2k/server-key.pem
@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIZwdmrQt6RogCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHEftLym1jQkBIIEyH5UdHK2L2sR
+frTjMbkJBty0NxC8ucPqmBleZPkpAOF8XazZkfiq40/Vj9D+wTgXWL9/UNQHrY1m
+MbJvBaONODXnJe14rsL18NzN+LoUscE4poKBcrZ4Hbua5mS8mJ+WtPs9AfARyaEZ
+t60lDQMyJ/Hj2Nr7jbUykP6OOkAy1xqcjytcIRA+3q2Jiivv8XMozBzi8t+njODZ
+huMbuj13IFqLtZzTZikL+DpalNCezi7D8kttpkQul1uAtmtIAq3QZ99Ed8/XkRV1
+PiKkcj9J5oOcIyH9PE5D9Mid7+As2kkz614J3zeCG2s9xtUkgoasiabTKZNYgL4K
+sjuTFU4vOoGNasfH+j4tEFRozySW7z53C4jB1KZ8MmOUG+G9tlJk/jAHyFGiK0LN
+CTIsY/ZiA5f7Gk6BL1MbRTsLqch+5pmh43gDwfbq22gPs/TwQKxx3YZJfuUy2L7A
+T5sX3VjqQZ+rTwMEql790AnKSFsCbIH4Y7XcFY2Ux6tYzddiViLMTR29kJ0GJSEv
+aw5VIDAexec2M72p+l7kMecJiJgB2cDwkGFgD8qAd/hkWj6k6R9rRdI6Dg4a3Ta3
+Q50colSh0XfpPQ9jg6NjGJCUVO+uICOa5rD5tI5s/Ogd7MzgTcdDnzl7RDgOH1W+
+TivRMpFwCLdrtDmq9DSA0H7XCeSvf6orROK15dkQn1nmtK4/zhG20DVNJxV9UK0u
+GNCkEqqvcGXu75PKkw0bO7BFPAksP4WX+RPIEyZLasB8PxrorkDZTqNh7AJ5CuwO
+xy+ekOrNkfcqHIl2vJvrAhl6i68zM9e6sDV6+J1Eia0naFpZ3cjYC+AAgxcUZT23
+xLcNrNlZbcFJvCrb7JNgSbsQnHSjA1rtMXfNNTpnOGP29gv49rWiSL5QFMTSEBEZ
+4CGs6fpBNQxjvRfxGTnKaZWhenVE98r35zALeD74P8WWieRj7qDPMS8VJmvN6JmN
+VaQ2ysHeFlUEZxC2STHlUl0RAQU/Um4ee2kK6rzywjiZuOv3GeG7zB9P0kIpROa2
+KlxLN+EDffwFytiAlCMfqHrS7iqHPzMxWxzo/Fv7KFngrCxNSPTwxkRu/VVZouOl
+g6ip7VIYxuWgpUD4jZNllLKbJyQ8QABkmZIZI3nZqPX2K6OhqKPdnqF1BiuwrDRD
+k1f2jQBC4cue2nIuitr+mgsw5GG3mwob6Sniv4a6vy19DJImD+bGAxduiUH0laPq
+D2L5BH/Q3c+GtuQGfcemtPD3lteV4Qw/keOEBoLG0tPSVjs+uADUK3cBI4f2C3pd
+gb7Ze1dOPH8Fy/hy+wGp7+gLLLTv23RRYFZZsHBCat9qTyP97vzsckvL3VQN6zWE
+3W8TB2HBVKKkszv5ov0r8/mf5k6aqSw+IYHnkXehkTcRfENUdl7X/x0LM5Hi+I5F
+ZhbtWEETZlcu8XWaIAvW3eV2AOlf0xzC1SmCYEuQ6V9dSxGNuVn4pIMzxfLDfPOw
+gqheYFzSrKZJfB/iGI7XpN2XjWo61ZKudKRxZXSVxPM1hTOqtAFiE4mKarJUTkvC
+TWKmPppA4suT1wV79CMMxWBhe4Kj4STHYSHQfUS22SqsqJbdK/1DD9u+nNANnKol
+riIOT3CiCzNDQyu627UONg==
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/rsa2k/server.pem b/samples/net/wifi/test_certs/rsa2k/server.pem
new file mode 100644
index 00000000000..d894c33ded1
--- /dev/null
+++ b/samples/net/wifi/test_certs/rsa2k/server.pem
@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFaTCCBFGgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBkjELMAkGA1UEBhMCRlIx
+DzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQKDAtF
+eGFtcGxlIEluYzEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5vcmcxJjAk
+BgNVBAMMHUV4YW1wbGUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MCAXDTI1MDMyNzEy
+NTA0OVoYDzIwNTIwODExMTI1MDQ5WjB7MQswCQYDVQQGEwJGUjEPMA0GA1UECAwG
+UmFkaXVzMRQwEgYDVQQKDAtFeGFtcGxlIEluYzEjMCEGA1UEAwwaRXhhbXBsZSBT
+ZXJ2ZXIgQ2VydGlmaWNhdGUxIDAeBgkqhkiG9w0BCQEWEWFkbWluQGV4YW1wbGUu
+b3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxtIpRygUsyReit9O
+/15T0lf3p0ck1Sjw3ufaqaXXzEcM7i/w7UoSfNyqrjmCsZhfIDHqzWKdRUD+jE3Z
+TfRzrF/nGtyG2jjjqZy/p+0uTL0cN/QdMjUEvla/eRIgMHPPNG0oFn7GkzbrrqFt
++f3RgsWV6Anw+8ipZvd8BjsummA4W4v6A86zXgORlefU4A7JOlxHXYvhFwS044nd
+N1Fvi0bjyZ7ciKltVCxjLDJEzV7I3ttoO57TI85vtEIjMMwkGywx6ICyLbLrgycl
+OeMmArC86MFINUor3oz+mfI8ETOIfLftqVN+oPRtDqjLlrIvtaDV6PsEoiFajpdx
+faMLhwIDAQABo4IB3DCCAdgwHQYDVR0OBBYEFMGuQKFgIgEb+q+VVWotbLlNZUxu
+MIHSBgNVHSMEgcowgceAFODMFtWLfJymFGi27sCbrKczBUDJoYGYpIGVMIGSMQsw
+CQYDVQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hlcmUx
+FDASBgNVBAoMC0V4YW1wbGUgSW5jMSAwHgYJKoZIhvcNAQkBFhFhZG1pbkBleGFt
+cGxlLm9yZzEmMCQGA1UEAwwdRXhhbXBsZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmC
+FB+teM75gp4KUnNugSyxbtpaKr34MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDDjA2BgNVHR8ELzAtMCugKaAnhiVo
+dHRwOi8vd3d3LmV4YW1wbGUuY29tL2V4YW1wbGVfY2EuY3JsMDcGCCsGAQUFBwEB
+BCswKTAnBggrBgEFBQcwAYYbaHR0cDovL3d3dy5leGFtcGxlLm9yZy9vY3NwMDoG
+A1UdEQQzMDGCEnJhZGl1cy5leGFtcGxlLm9yZ6AbBggrBgEFBQcICKAPDA0qLmV4
+YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAov9HxapiYtoAUebNdGU6hFz7G
+3F6Jtpg5d34/AW1ntmgxHryNn5dJp/fmc3eyndMLQRJhDIksc/6Tmp0jUs6DhxE5
+5BmdAPVsAPhYfr3ylOoOP21wtmaH4MeRtBYuBsdvLgyiIXMWrliQnJa+12ovdqMX
++9KJJLWJm81IH6O2kEZ7HmoWkY6XXYpJZqw3c8FukuUoFQQk2mJ4u2yncq4oFQSn
+uu5G4UL8o3blhkY1pK8WmuzUiafyJjjlwBcsBkk47BuKbyQCquOXl/O+lzteJMEZ
+Z83ZANWQb7g1vhIVvse5qLZ9Osa68TJFDaHWcmIyFutbyfdAJy4XEGawf1Fq
+-----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/ca.pem b/samples/net/wifi/test_certs/rsa3k/ca.pem
similarity index 100%
rename from samples/net/wifi/test_certs/ca.pem
rename to samples/net/wifi/test_certs/rsa3k/ca.pem
diff --git a/samples/net/wifi/test_certs/ca2.pem b/samples/net/wifi/test_certs/rsa3k/ca2.pem
similarity index 100%
rename from samples/net/wifi/test_certs/ca2.pem
rename to samples/net/wifi/test_certs/rsa3k/ca2.pem
diff --git a/samples/net/wifi/test_certs/client-key.pem b/samples/net/wifi/test_certs/rsa3k/client-key.pem
similarity index 100%
rename from samples/net/wifi/test_certs/client-key.pem
rename to samples/net/wifi/test_certs/rsa3k/client-key.pem
diff --git a/samples/net/wifi/test_certs/client-key2.pem b/samples/net/wifi/test_certs/rsa3k/client-key2.pem
similarity index 100%
rename from samples/net/wifi/test_certs/client-key2.pem
rename to samples/net/wifi/test_certs/rsa3k/client-key2.pem
diff --git a/samples/net/wifi/test_certs/client.pem b/samples/net/wifi/test_certs/rsa3k/client.pem
similarity index 100%
rename from samples/net/wifi/test_certs/client.pem
rename to samples/net/wifi/test_certs/rsa3k/client.pem
diff --git a/samples/net/wifi/test_certs/client2.pem b/samples/net/wifi/test_certs/rsa3k/client2.pem
similarity index 100%
rename from samples/net/wifi/test_certs/client2.pem
rename to samples/net/wifi/test_certs/rsa3k/client2.pem
diff --git a/samples/net/wifi/test_certs/server-key.pem b/samples/net/wifi/test_certs/rsa3k/server-key.pem
similarity index 100%
rename from samples/net/wifi/test_certs/server-key.pem
rename to samples/net/wifi/test_certs/rsa3k/server-key.pem
diff --git a/samples/net/wifi/test_certs/server.pem b/samples/net/wifi/test_certs/rsa3k/server.pem
similarity index 100%
rename from samples/net/wifi/test_certs/server.pem
rename to samples/net/wifi/test_certs/rsa3k/server.pem
diff --git a/subsys/net/l2/wifi/CMakeLists.txt b/subsys/net/l2/wifi/CMakeLists.txt
index 6cf0183e141..e1e9606bfd2 100644
--- a/subsys/net/l2/wifi/CMakeLists.txt
+++ b/subsys/net/l2/wifi/CMakeLists.txt
@@ -27,6 +27,9 @@ if(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE AND CONFIG_NET_L2_WIFI_SHELL)
   # Wi-Fi Enterprise test certificates handling
   set(gen_inc_dir ${ZEPHYR_BINARY_DIR}/misc/generated)
   set(gen_dir ${gen_inc_dir}/wifi_enterprise_test_certs)
+  if(NOT DEFINED WIFI_TEST_CERTS_DIR)
+    set(WIFI_TEST_CERTS_DIR ${ZEPHYR_BASE}/samples/net/wifi/test_certs/rsa3k)
+  endif()
   # Create output directory for test certs
   file(MAKE_DIRECTORY ${gen_dir})
 
@@ -34,14 +37,14 @@ if(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE AND CONFIG_NET_L2_WIFI_SHELL)
   zephyr_include_directories(${gen_inc_dir})
 
   foreach(cert_file IN ITEMS
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client.pem
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client-key.pem
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/ca.pem
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client2.pem
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client-key2.pem
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/ca2.pem
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/server.pem
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/server-key.pem
+      ${WIFI_TEST_CERTS_DIR}/client.pem
+      ${WIFI_TEST_CERTS_DIR}/client-key.pem
+      ${WIFI_TEST_CERTS_DIR}/ca.pem
+      ${WIFI_TEST_CERTS_DIR}/client2.pem
+      ${WIFI_TEST_CERTS_DIR}/client-key2.pem
+      ${WIFI_TEST_CERTS_DIR}/ca2.pem
+      ${WIFI_TEST_CERTS_DIR}/server.pem
+      ${WIFI_TEST_CERTS_DIR}/server-key.pem
       )
     if(EXISTS ${cert_file})
       get_filename_component(cert_name ${cert_file} NAME)

From b9aa67cd05835e2514970e9241a62cd71d2e176f Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Fri, 28 Mar 2025 00:09:34 +0530
Subject: [PATCH 2836/2913] [nrf fromlist] doc: net: wifi: Fix the connect
 command

The command should work with existing certs rather than a generic
example, also fix the key-management.

Upstream PR #: 87656

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 doc/connectivity/networking/api/wifi.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/connectivity/networking/api/wifi.rst b/doc/connectivity/networking/api/wifi.rst
index 5f042bc268f..d8cd71dd1be 100644
--- a/doc/connectivity/networking/api/wifi.rst
+++ b/doc/connectivity/networking/api/wifi.rst
@@ -78,7 +78,7 @@ To initiate Wi-Fi connection, the following command can be used:
 
 .. code-block:: console
 
-    uart:~$ wifi connect -s <SSID> -c 149 -k 17 -w 2 -a client1 --key1-pwd whatever --key2-pwd whatever --eap-id1 id1 --eap-pwd1 pwd1
+    uart:~$ wifi connect -s <SSID> -c 149 -k 7 -w 2 -a client1 --key1-pwd whatever --key2-pwd whatever
 
 Server certificate is also provided in the same directory for testing purposes.
 Any AAA server can be used for testing purposes, for example, ``FreeRADIUS`` or ``hostapd``.

From b9e4e7dc4593f23f0e0dceabf994a420d82b83c4 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 25 Mar 2025 22:29:25 +0530
Subject: [PATCH 2837/2913] [nrf fromlist] samples: net: wifi: Add a script to
 install certs

For enterprise mode we need to install multiple certs to the TLS
credentials store, so, add a helper script.

Upstream PR #: 87656

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 doc/connectivity/networking/api/wifi.rst     |   8 ++
 samples/net/wifi/test_certs/install_certs.sh | 135 +++++++++++++++++++
 2 files changed, 143 insertions(+)
 create mode 100755 samples/net/wifi/test_certs/install_certs.sh

diff --git a/doc/connectivity/networking/api/wifi.rst b/doc/connectivity/networking/api/wifi.rst
index d8cd71dd1be..a06fda8f862 100644
--- a/doc/connectivity/networking/api/wifi.rst
+++ b/doc/connectivity/networking/api/wifi.rst
@@ -73,6 +73,14 @@ Run time certificates
 The Wi-Fi shell module uses TLS credentials subsystem to store and manage the certificates. The certificates can be added at runtime using the shell commands, see :ref:`tls_credentials_shell` for more details.
 The sample or application need to enable the :kconfig:option:`CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES` option to use this feature.
 
+To facilitate installation of the certificates, a helper script is provided in the ``samples/net/wifi/test_certs`` directory. The script can be used to install the certificates at runtime.
+
+.. code-block:: bash
+
+    $ samples/net/wifi/test_certs/install_certs.sh samples/net/wifi/test_certs/rsa2k
+
+The script will install the certificates in the ``rsa2k`` directory to the TLS credentials store in the device over UART and using TLS credentials shell commands.
+
 
 To initiate Wi-Fi connection, the following command can be used:
 
diff --git a/samples/net/wifi/test_certs/install_certs.sh b/samples/net/wifi/test_certs/install_certs.sh
new file mode 100755
index 00000000000..4a6940dc522
--- /dev/null
+++ b/samples/net/wifi/test_certs/install_certs.sh
@@ -0,0 +1,135 @@
+#!/usr/bin/env bash
+# Copyright (c) 2025, Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+#
+# This script installs Wi-Fi certificates to a device using the `device_credentials_installer` tool.
+#
+# shellcheck disable=SC2086,SC2154
+# Usage:
+#   ./install_certs.sh <path_to_certs> [port] [mode]
+#
+# Arguments:
+#   <path_to_certs>  Path to the directory containing the certificate files.
+#   [port]           (Optional) Serial port to use for communication with the device. Default is
+#                    /dev/ttyACM1.
+#   [mode]           (Optional) Mode of operation: AP or STA. Default is STA.
+#
+# Dependencies:
+#   - `device_credentials_installer` tool must be installed. You can install it using:
+#     pip3 install nrfcloud-utils
+#
+# Certificate Files:
+#   The script expects the following certificate files in the specified directory:
+#   - ca.pem: CA certificate for Wi-Fi Enterprise mode (Phase 1)
+#   - client-key.pem: Client private key for Wi-Fi Enterprise mode (Phase 1)
+#   - server-key.pem: Server private key for Wi-Fi Enterprise mode, for used in AP mode.
+#   - client.pem: Client certificate for Wi-Fi Enterprise mode (Phase 1)
+#   - server.pem: Server certificate for Wi-Fi Enterprise mode, for used in AP mode.
+#   - ca2.pem: CA certificate for Wi-Fi Enterprise mode (Phase 2)
+#   - client-key2.pem: Client private key for Wi-Fi Enterprise mode (Phase 2)
+#   - client2.pem: Client certificate for Wi-Fi Enterprise mode (Phase 2)
+#
+# Each certificate file is associated with a specific security tag (sec_tag) which is used during
+# installation.
+#
+# The script performs the following steps:
+#   1. Checks if the required arguments are provided.
+#   2. Validates the existence of the certificate directory.
+#   3. Checks if the `device_credentials_installer` tool is available.
+#   4. Iterates over the expected certificate files and installs them to the device if they exist.
+#   5. Logs the success or failure of each certificate installation.
+#
+# Note:
+#   - If a certificate file is missing, the script will skip its installation and log a warning.
+#   - The script will terminate on the first encountered error (set -e).
+set -e
+
+if [ -z "$1" ]; then
+  echo -e "\033[31mError: Usage: $0 <path_to_certs> [port] [mode]\033[0m"
+  exit 1
+fi
+
+CERT_PATH=$1
+PORT=${2:-/dev/ttyACM1}  # Default port is /dev/ttyACM1 if not provided
+MODE=${3:-STA}  # Default mode is STA if not provided
+
+if [ ! -d "$CERT_PATH" ]; then
+  echo -e "\033[31mError: Directory $CERT_PATH does not exist.\033[0m"
+  exit 1
+fi
+
+echo -e "\033[33mWarning: Please make sure that the UART is not being used by another" \
+  " application.\033[0m"
+
+read -r -p "Press Enter to continue or Ctrl+C to exit..."
+
+if ! command -v device_credentials_installer &> /dev/null; then
+  echo -e "\033[31mError: device_credentials_installer could not be found.\033[0m"
+  echo "Please install it using: pip3 install nrfcloud-utils"
+  exit 1
+fi
+
+INSTALLED_VERSION=$(pip3 show nrfcloud-utils | grep Version | awk '{print $2}')
+REQUIRED_VERSION="1.0.4"
+
+if [ "$(printf '%s\n' "$REQUIRED_VERSION" "$INSTALLED_VERSION" | sort -V | head -n1)" != \
+"$REQUIRED_VERSION" ]; then
+  echo -e "\033[31mError: device_credentials_installer >= $REQUIRED_VERSION required. Installed: \
+$INSTALLED_VERSION.\033[0m"
+  echo "Update: pip3 install --upgrade nrfcloud-utils"
+  exit 1
+fi
+
+# From zephyr/subsys/net/lib/tls_credentials/tls_credentials_shell.c
+TLS_CREDENTIAL_CA_CERTIFICATE=0 # CA
+TLS_CREDENTIAL_PUBLIC_CERTIFICATE=1 # SERV
+TLS_CREDENTIAL_PRIVATE_KEY=2 # PK
+
+
+WIFI_CERT_SEC_TAG_BASE=0x1020001
+declare -A WIFI_CERT_SEC_TAG_MAP=(
+  ["ca.pem"]="{\"$TLS_CREDENTIAL_CA_CERTIFICATE\" $((WIFI_CERT_SEC_TAG_BASE))}"
+  ["client-key.pem"]="{\"$TLS_CREDENTIAL_PRIVATE_KEY\" $((WIFI_CERT_SEC_TAG_BASE + 1))}"
+  ["server-key.pem"]="{\"$TLS_CREDENTIAL_PRIVATE_KEY\" $((WIFI_CERT_SEC_TAG_BASE + 2))}"
+  ["client.pem"]="{\"$TLS_CREDENTIAL_PUBLIC_CERTIFICATE\" $((WIFI_CERT_SEC_TAG_BASE + 3))}"
+  ["server.pem"]="{\"$TLS_CREDENTIAL_PUBLIC_CERTIFICATE\" $((WIFI_CERT_SEC_TAG_BASE + 4))}"
+  ["ca2.pem"]="{\"$TLS_CREDENTIAL_CA_CERTIFICATE\" $((WIFI_CERT_SEC_TAG_BASE + 5))}"
+  ["client-key2.pem"]="{\"$TLS_CREDENTIAL_PRIVATE_KEY\" $((WIFI_CERT_SEC_TAG_BASE + 6))}"
+  ["client2.pem"]="{\"$TLS_CREDENTIAL_PUBLIC_CERTIFICATE\" $((WIFI_CERT_SEC_TAG_BASE + 7))}"
+)
+
+# Select certificates based on mode
+if [ "$MODE" == "AP" ]; then
+  CERT_FILES=("ca.pem" "server-key.pem" "server.pem")
+else
+  CERT_FILES=("ca.pem" "client-key.pem" "client.pem" "ca2.pem" "client-key2.pem" "client2.pem")
+fi
+
+total_certs=${#CERT_FILES[@]}
+processed_certs=0
+
+for cert in "${CERT_FILES[@]}"; do
+  processed_certs=$((processed_certs + 1))
+  echo "Processing certificate $processed_certs of $total_certs: $cert"
+
+  if [ ! -f "$CERT_PATH/$cert" ]; then
+  echo -e "\033[31mWarning: Certificate file $CERT_PATH/$cert does not exist. Skipping...\033[0m"
+  continue
+  fi
+
+  cert_info=${WIFI_CERT_SEC_TAG_MAP[$cert]}
+  cert_type=$(echo "$cert_info" | awk -F'[{} ]' '{print $2}' | tr -d '"')
+  cert_type_int=$((10#$cert_type))
+  sec_tag=$(echo "$cert_info" | awk -F'[{} ]' '{print $3}' | tr -d '"')
+  sec_tag_int=$((10#$sec_tag))
+  if device_credentials_installer --local-cert-file "$CERT_PATH/$cert" \
+  --cmd-type tls_cred_shell --delete \
+  --port $PORT -S $sec_tag_int --cert-type $cert_type_int; then
+  echo "Successfully installed $cert."
+  else
+  echo -e "\033[31mFailed to install $cert.\033[0m"
+  fi
+done
+
+
+echo "Certificate installation process completed."

From e5d1ba3584e03caaa682406422c490617367badc Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Fri, 28 Mar 2025 13:24:27 +0100
Subject: [PATCH 2838/2913] [nrf fromtree] soc: nordic: add option for forcing
 RAM power on reboot

RAM power configuration is preserved through soft reset,
meaning that there is a risk of accessing powered off RAM blocks
when booting in different application (i.e. bootloader).
Add option to force all RAM blocks to be powered on
before triggering soft reset to prevent this from happening.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit c3646a34fd9f9125d63ee82302e5a2587c23a391)
---
 soc/nordic/common/CMakeLists.txt |  5 ++++
 soc/nordic/common/Kconfig        | 10 +++++++
 soc/nordic/common/reboot.c       | 45 ++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+)
 create mode 100644 soc/nordic/common/reboot.c

diff --git a/soc/nordic/common/CMakeLists.txt b/soc/nordic/common/CMakeLists.txt
index 8c00b768b90..7d71f62a4c5 100644
--- a/soc/nordic/common/CMakeLists.txt
+++ b/soc/nordic/common/CMakeLists.txt
@@ -11,6 +11,11 @@ if(CONFIG_ARM)
   zephyr_linker_sources(SECTIONS arm_platform_init.ld)
 endif()
 
+# TF-M provides its own reboot sequence
+if(NOT CONFIG_TFM_PARTITION_PLATFORM)
+  zephyr_library_sources_ifdef(CONFIG_ARM reboot.c)
+endif()
+
 zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c)
 if(CONFIG_ARM)
   zephyr_library_sources_ifdef(CONFIG_NRF_PLATFORM_HALTIUM soc_lrcconf.c)
diff --git a/soc/nordic/common/Kconfig b/soc/nordic/common/Kconfig
index a5bae67d5a1..059274fd299 100644
--- a/soc/nordic/common/Kconfig
+++ b/soc/nordic/common/Kconfig
@@ -7,6 +7,16 @@ config HAS_NORDIC_DMM
 config HAS_NORDIC_RAM_CTRL
 	bool
 
+config NRF_FORCE_RAM_ON_REBOOT
+	bool "Force all RAM blocks to be powered on before rebooting"
+	depends on HAS_NORDIC_RAM_CTRL
+	help
+	  RAM power configuration is preserved through soft reset,
+	  meaning that there is a risk of accessing powered off RAM blocks
+	  when booting in different application (i.e. bootloader).
+	  Force all RAM blocks to be powered on before triggering soft reset
+	  to prevent this from happening.
+
 config NRF_SYS_EVENT
 	bool "nRF system event support"
 	select NRFX_POWER if !NRF_PLATFORM_HALTIUM
diff --git a/soc/nordic/common/reboot.c b/soc/nordic/common/reboot.c
new file mode 100644
index 00000000000..43ecc589ce9
--- /dev/null
+++ b/soc/nordic/common/reboot.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/sys/reboot.h>
+#if defined(CONFIG_HAS_NORDIC_RAM_CTRL)
+#include <helpers/nrfx_ram_ctrl.h>
+#endif
+
+void sys_arch_reboot(int type)
+{
+	ARG_UNUSED(type);
+
+#ifdef CONFIG_NRF_FORCE_RAM_ON_REBOOT
+	uint8_t *ram_start;
+	size_t ram_size;
+
+#if defined(NRF_MEMORY_RAM_BASE)
+	ram_start = (uint8_t *)NRF_MEMORY_RAM_BASE;
+#else
+	ram_start = (uint8_t *)NRF_MEMORY_RAM0_BASE;
+#endif
+
+	ram_size = 0;
+#if defined(NRF_MEMORY_RAM_SIZE)
+	ram_size += NRF_MEMORY_RAM_SIZE;
+#endif
+#if defined(NRF_MEMORY_RAM0_SIZE)
+	ram_size += NRF_MEMORY_RAM0_SIZE;
+#endif
+#if defined(NRF_MEMORY_RAM1_SIZE)
+	ram_size += NRF_MEMORY_RAM1_SIZE;
+#endif
+#if defined(NRF_MEMORY_RAM2_SIZE)
+	ram_size += NRF_MEMORY_RAM2_SIZE;
+#endif
+
+	/* Power on all RAM blocks */
+	nrfx_ram_ctrl_power_enable_set(ram_start, ram_size, true);
+#endif
+
+	NVIC_SystemReset();
+}

From 23d0c953ea263e898a82e597590cbc0464dddf50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 28 Mar 2025 11:36:52 +0100
Subject: [PATCH 2839/2913] [nrf fromlist] soc: nordic: nrf54h: Change
 PM_DEVICE_RUNTIME default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

nrf54h20 device requires device runtime PM to be enabled when
device PM is in use.

Upstream PR #: 87807

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 soc/nordic/nrf54h/Kconfig.defconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/soc/nordic/nrf54h/Kconfig.defconfig b/soc/nordic/nrf54h/Kconfig.defconfig
index 65023fc18ca..e1bd0aa6801 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig
+++ b/soc/nordic/nrf54h/Kconfig.defconfig
@@ -42,4 +42,7 @@ config SPI_DW_ACCESS_WORD_ONLY
 config PM_DEVICE_POWER_DOMAIN
 	default n if PM_DEVICE
 
+config PM_DEVICE_RUNTIME
+	default y if PM_DEVICE
+
 endif # SOC_SERIES_NRF54HX

From 157e123fe244ca55c0e9cfd882e53b2e1f24cbde Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Tue, 1 Apr 2025 12:19:27 +0200
Subject: [PATCH 2840/2913] [nrf fromlist] cmake: fix Zephyr module ext order

Upstream PR #: 87962

MODULE_EXT_ROOT allows Zephyr modules to provide glue code for Zephyr
modules using `cmake-ext: True` and/or `kconfig-ext:True`.

A module ext root provides a `modules.cmake` file which defines
variables like: `set(ZEPHYR_FOO_CMAKE_DIR  <glue-code-path>/foo)`

It is intended that a downstream module can replace Zephyr's default
glue code, which again can be replaced further downstream.

Setting values in first modules.cmake (Zephyr's) are replaced by later
processed modules.cmake (downstream) when the setting name is identical.

Therefore the module ext root list should not be reversed, and Zephyr
itself should be placed as first entry in the list.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
(cherry picked from commit 83976563b4175e72841b002d35350abb16c6aea8)
---
 cmake/modules/zephyr_module.cmake | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmake/modules/zephyr_module.cmake b/cmake/modules/zephyr_module.cmake
index 191c71c193b..a2f42959d8d 100644
--- a/cmake/modules/zephyr_module.cmake
+++ b/cmake/modules/zephyr_module.cmake
@@ -85,9 +85,6 @@ if(WEST OR ZEPHYR_MODULES)
     endforeach()
   endif()
 
-  # Append ZEPHYR_BASE as a default ext root at lowest priority
-  list(APPEND MODULE_EXT_ROOT ${ZEPHYR_BASE})
-
   if(EXISTS ${cmake_modules_file})
     file(STRINGS ${cmake_modules_file} zephyr_modules_txt ENCODING UTF-8)
   endif()
@@ -114,9 +111,12 @@ if(WEST OR ZEPHYR_MODULES)
     list(APPEND SYSBUILD_MODULE_NAMES ${module_name})
   endforeach()
 
+  # Prepend ZEPHYR_BASE as a default ext root at lowest priority
+  list(PREPEND MODULE_EXT_ROOT ${ZEPHYR_BASE})
+
   # MODULE_EXT_ROOT is process order which means Zephyr module roots processed
-  # later wins. therefore we reverse the list before processing.
-  list(REVERSE MODULE_EXT_ROOT)
+  # later wins. Thus processing Zephyr first, and modules thereafter allows them
+  # to overrule default glue folder settings provided by higher level modules.cmake.
   foreach(root ${MODULE_EXT_ROOT})
     set(module_cmake_file_path modules/modules.cmake)
     if(NOT EXISTS ${root}/${module_cmake_file_path})

From f55a8067736a905992ef47d164c87443879b273c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 3 Apr 2025 08:15:03 +0200
Subject: [PATCH 2841/2913] Revert "[nrf fromlist] soc: nordic: nrf54h: Change
 PM_DEVICE_RUNTIME default"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 23d0c953ea263e898a82e597590cbc0464dddf50.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
---
 soc/nordic/nrf54h/Kconfig.defconfig | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/soc/nordic/nrf54h/Kconfig.defconfig b/soc/nordic/nrf54h/Kconfig.defconfig
index e1bd0aa6801..65023fc18ca 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig
+++ b/soc/nordic/nrf54h/Kconfig.defconfig
@@ -42,7 +42,4 @@ config SPI_DW_ACCESS_WORD_ONLY
 config PM_DEVICE_POWER_DOMAIN
 	default n if PM_DEVICE
 
-config PM_DEVICE_RUNTIME
-	default y if PM_DEVICE
-
 endif # SOC_SERIES_NRF54HX

From b040cf43705b48dc78db929631813241dfae083f Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Mon, 31 Mar 2025 11:13:33 +0200
Subject: [PATCH 2842/2913] [nrf fromlist] manifest: update hal_nordic to have
 nrfx_twim handler setter & getter

Updated hal_nordic revision contains new API for nrfx_twim driver
that allow to set and get handler in runtime.

Upstream PR #: 87887

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index d9ad7fd8e01..6e39a36fb26 100644
--- a/west.yml
+++ b/west.yml
@@ -193,7 +193,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 7440d573d36953b80cb6fb6438b147acb21bf753
+      revision: 8cdcc33c6e5c7618ca4e77ff19a0eab557cc4bd5
       path: modules/hal/nordic
       groups:
         - hal

From fe97a989a08fb92fd9744520b281316d6e6e790a Mon Sep 17 00:00:00 2001
From: Ryan Chu <ryan.chu@nordicsemi.no>
Date: Fri, 21 Mar 2025 15:03:00 +0100
Subject: [PATCH 2843/2913] [nrf fromtree] bluetooth: host: Report status of
 Channel Sounding complete events

If the HCI status of a complete event is not BT_HCI_ERR_SUCCESS,
the remaining parameters could be invalid.

In this case, the params is passed as NULL pointer to the callbacks.
- LE CS Read Remote Supported Capabilities Complete event
- LE CS Read Remote FAE Table Complete event
- LE CS Config Complete event
- LE CS Security Enable Complete event
- LE CS Procedure Enable Complete event

This change avoids forwarding the invalid fileds to the applications.

Signed-off-by: Ryan Chu <ryan.chu@nordicsemi.no>
(cherry picked from commit c9240cc99f939a8b42cc62725e1c3037d848105e)
---
 include/zephyr/bluetooth/conn.h       |  56 ++++--
 subsys/bluetooth/host/conn.c          |  53 +++---
 subsys/bluetooth/host/conn_internal.h |  13 +-
 subsys/bluetooth/host/cs.c            | 248 ++++++++++++++------------
 tests/bluetooth/host/cs/mocks/conn.c  |  12 +-
 tests/bluetooth/host/cs/mocks/conn.h  |  11 +-
 6 files changed, 223 insertions(+), 170 deletions(-)

diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index da72b2b506d..dc088068645 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -1847,35 +1847,50 @@ struct bt_conn_cb {
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
 	/** @brief LE CS Read Remote Supported Capabilities Complete event.
 	 *
-	 *  This callback notifies the application that the remote channel
+	 *  This callback notifies the application that a Channel Sounding
+	 *  Capabilities Exchange procedure has completed.
+	 *
+	 *  If status is BT_HCI_ERR_SUCCESS, the remote channel
 	 *  sounding capabilities have been received from the peer.
 	 *
 	 *  @param conn Connection object.
-	 *  @param remote_cs_capabilities Remote Channel Sounding Capabilities.
+	 *  @param status HCI status of complete event.
+	 *  @param remote_cs_capabilities Pointer to CS Capabilities on success or NULL otherwise.
 	 */
-	void (*le_cs_remote_capabilities_available)(struct bt_conn *conn,
-						    struct bt_conn_le_cs_capabilities *params);
+	void (*le_cs_read_remote_capabilities_complete)(struct bt_conn *conn,
+							uint8_t status,
+							struct bt_conn_le_cs_capabilities *params);
 
 	/** @brief LE CS Read Remote FAE Table Complete event.
 	 *
-	 *  This callback notifies the application that the remote mode-0
+	 *  This callback notifies the application that a Channel Sounding
+	 *  Mode-0 FAE Table Request procedure has completed.
+	 *
+	 *  If status is BT_HCI_ERR_SUCCESS, the remote mode-0
 	 *  FAE Table has been received from the peer.
 	 *
 	 *  @param conn Connection object.
-	 *  @param params FAE Table.
+	 *  @param status HCI status of complete event.
+	 *  @param params Pointer to FAE Table on success or NULL otherwise.
 	 */
-	void (*le_cs_remote_fae_table_available)(struct bt_conn *conn,
-						 struct bt_conn_le_cs_fae_table *params);
+	void (*le_cs_read_remote_fae_table_complete)(struct bt_conn *conn,
+						     uint8_t status,
+						     struct bt_conn_le_cs_fae_table *params);
 
 	/** @brief LE CS Config created.
 	 *
 	 *  This callback notifies the application that a Channel Sounding
-	 *  Configuration procedure has completed and a new CS config is created
+	 *  Configuration procedure has completed.
+	 *
+	 *  If status is BT_HCI_ERR_SUCCESS, a new CS config is created.
 	 *
 	 *  @param conn Connection object.
-	 *  @param config CS configuration.
+	 *  @param status HCI status of complete event.
+	 *  @param config Pointer to CS configuration on success or NULL otherwise.
 	 */
-	void (*le_cs_config_created)(struct bt_conn *conn, struct bt_conn_le_cs_config *config);
+	void (*le_cs_config_complete)(struct bt_conn *conn,
+				      uint8_t status,
+				      struct bt_conn_le_cs_config *config);
 
 	/** @brief LE CS Config removed.
 	 *
@@ -1901,22 +1916,29 @@ struct bt_conn_cb {
 	/** @brief LE CS Security Enabled.
 	 *
 	 *  This callback notifies the application that a Channel Sounding
-	 *  Security Enable procedure has completed
+	 *  Security Enable procedure has completed.
+	 *
+	 *  If status is BT_HCI_ERR_SUCCESS, CS Security is enabled.
 	 *
 	 *  @param conn Connection object.
+	 *  @param status HCI status of complete event.
 	 */
-	void (*le_cs_security_enabled)(struct bt_conn *conn);
+	void (*le_cs_security_enable_complete)(struct bt_conn *conn, uint8_t status);
 
 	/** @brief LE CS Procedure Enabled.
 	 *
 	 *  This callback notifies the application that a Channel Sounding
-	 *  Procedure Enable procedure has completed
+	 *  Procedure Enable procedure has completed.
+	 *
+	 *  If status is BT_HCI_ERR_SUCCESS, CS procedure is enabled.
 	 *
 	 *  @param conn Connection object.
-	 *  @param params CS Procedure Enable parameters
+	 *  @param status HCI status.
+	 *  @param params Pointer to CS Procedure Enable parameters on success or NULL otherwise.
 	 */
-	void (*le_cs_procedure_enabled)(
-		struct bt_conn *conn, struct bt_conn_le_cs_procedure_enable_complete *params);
+	void (*le_cs_procedure_enable_complete)(
+		struct bt_conn *conn, uint8_t status,
+		struct bt_conn_le_cs_procedure_enable_complete *params);
 
 #endif
 
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 40d91c3e8d6..f10f1aceed8 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -3340,53 +3340,56 @@ int bt_conn_le_subrate_request(struct bt_conn *conn,
 #endif /* CONFIG_BT_SUBRATING */
 
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
-void notify_remote_cs_capabilities(struct bt_conn *conn, struct bt_conn_le_cs_capabilities params)
+void notify_remote_cs_capabilities(struct bt_conn *conn, uint8_t status,
+				   struct bt_conn_le_cs_capabilities *params)
 {
 	struct bt_conn_cb *callback;
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->le_cs_remote_capabilities_available) {
-			callback->le_cs_remote_capabilities_available(conn, &params);
+		if (callback->le_cs_read_remote_capabilities_complete) {
+			callback->le_cs_read_remote_capabilities_complete(conn, status, params);
 		}
 	}
 
 	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->le_cs_remote_capabilities_available) {
-			cb->le_cs_remote_capabilities_available(conn, &params);
+		if (cb->le_cs_read_remote_capabilities_complete) {
+			cb->le_cs_read_remote_capabilities_complete(conn, status, params);
 		}
 	}
 }
 
-void notify_remote_cs_fae_table(struct bt_conn *conn, struct bt_conn_le_cs_fae_table params)
+void notify_remote_cs_fae_table(struct bt_conn *conn, uint8_t status,
+				struct bt_conn_le_cs_fae_table *params)
 {
 	struct bt_conn_cb *callback;
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->le_cs_remote_fae_table_available) {
-			callback->le_cs_remote_fae_table_available(conn, &params);
+		if (callback->le_cs_read_remote_fae_table_complete) {
+			callback->le_cs_read_remote_fae_table_complete(conn, status, params);
 		}
 	}
 
 	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->le_cs_remote_fae_table_available) {
-			cb->le_cs_remote_fae_table_available(conn, &params);
+		if (cb->le_cs_read_remote_fae_table_complete) {
+			cb->le_cs_read_remote_fae_table_complete(conn, status, params);
 		}
 	}
 }
 
-void notify_cs_config_created(struct bt_conn *conn, struct bt_conn_le_cs_config *params)
+void notify_cs_config_created(struct bt_conn *conn, uint8_t status,
+			      struct bt_conn_le_cs_config *params)
 {
 	struct bt_conn_cb *callback;
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->le_cs_config_created) {
-			callback->le_cs_config_created(conn, params);
+		if (callback->le_cs_config_complete) {
+			callback->le_cs_config_complete(conn, status, params);
 		}
 	}
 
 	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->le_cs_config_created) {
-			cb->le_cs_config_created(conn, params);
+		if (cb->le_cs_config_complete) {
+			cb->le_cs_config_complete(conn, status, params);
 		}
 	}
 }
@@ -3408,37 +3411,37 @@ void notify_cs_config_removed(struct bt_conn *conn, uint8_t config_id)
 	}
 }
 
-void notify_cs_security_enable_available(struct bt_conn *conn)
+void notify_cs_security_enable_available(struct bt_conn *conn, uint8_t status)
 {
 	struct bt_conn_cb *callback;
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->le_cs_security_enabled) {
-			callback->le_cs_security_enabled(conn);
+		if (callback->le_cs_security_enable_complete) {
+			callback->le_cs_security_enable_complete(conn, status);
 		}
 	}
 
 	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->le_cs_security_enabled) {
-			cb->le_cs_security_enabled(conn);
+		if (cb->le_cs_security_enable_complete) {
+			cb->le_cs_security_enable_complete(conn, status);
 		}
 	}
 }
 
-void notify_cs_procedure_enable_available(struct bt_conn *conn,
+void notify_cs_procedure_enable_available(struct bt_conn *conn, uint8_t status,
 					  struct bt_conn_le_cs_procedure_enable_complete *params)
 {
 	struct bt_conn_cb *callback;
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->le_cs_procedure_enabled) {
-			callback->le_cs_procedure_enabled(conn, params);
+		if (callback->le_cs_procedure_enable_complete) {
+			callback->le_cs_procedure_enable_complete(conn, status, params);
 		}
 	}
 
 	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->le_cs_procedure_enabled) {
-			cb->le_cs_procedure_enabled(conn, params);
+		if (cb->le_cs_procedure_enable_complete) {
+			cb->le_cs_procedure_enable_complete(conn, status, params);
 		}
 	}
 }
diff --git a/subsys/bluetooth/host/conn_internal.h b/subsys/bluetooth/host/conn_internal.h
index cd4eb2b8045..12ab95a8ac4 100644
--- a/subsys/bluetooth/host/conn_internal.h
+++ b/subsys/bluetooth/host/conn_internal.h
@@ -498,20 +498,25 @@ void notify_subrate_change(struct bt_conn *conn,
 			   struct bt_conn_le_subrate_changed params);
 
 void notify_remote_cs_capabilities(struct bt_conn *conn,
-			   struct bt_conn_le_cs_capabilities params);
+				   uint8_t status,
+				   struct bt_conn_le_cs_capabilities *params);
 
 void notify_remote_cs_fae_table(struct bt_conn *conn,
-			   struct bt_conn_le_cs_fae_table params);
+				uint8_t status,
+				struct bt_conn_le_cs_fae_table *params);
 
-void notify_cs_config_created(struct bt_conn *conn, struct bt_conn_le_cs_config *params);
+void notify_cs_config_created(struct bt_conn *conn,
+			      uint8_t status,
+			      struct bt_conn_le_cs_config *params);
 
 void notify_cs_config_removed(struct bt_conn *conn, uint8_t config_id);
 
 void notify_cs_subevent_result(struct bt_conn *conn, struct bt_conn_le_cs_subevent_result *result);
 
-void notify_cs_security_enable_available(struct bt_conn *conn);
+void notify_cs_security_enable_available(struct bt_conn *conn, uint8_t status);
 
 void notify_cs_procedure_enable_available(struct bt_conn *conn,
+					  uint8_t status,
 					  struct bt_conn_le_cs_procedure_enable_complete *params);
 
 #if defined(CONFIG_BT_SMP)
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index 8114659d822..3a2e588bdd0 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -310,7 +310,6 @@ void bt_hci_le_cs_read_remote_supported_capabilities_complete(struct net_buf *bu
 	evt = net_buf_pull_mem(buf, sizeof(*evt));
 	if (evt->status) {
 		LOG_WRN("Read Remote Supported Capabilities failed (status 0x%02X)", evt->status);
-		return;
 	}
 
 	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->conn_handle), BT_CONN_TYPE_LE);
@@ -319,95 +318,106 @@ void bt_hci_le_cs_read_remote_supported_capabilities_complete(struct net_buf *bu
 		return;
 	}
 
-	remote_cs_capabilities.num_config_supported = evt->num_config_supported;
-	remote_cs_capabilities.max_consecutive_procedures_supported =
-		sys_le16_to_cpu(evt->max_consecutive_procedures_supported);
-	remote_cs_capabilities.num_antennas_supported = evt->num_antennas_supported;
-	remote_cs_capabilities.max_antenna_paths_supported = evt->max_antenna_paths_supported;
-
-	remote_cs_capabilities.initiator_supported =
-		evt->roles_supported & BT_HCI_LE_CS_INITIATOR_ROLE_MASK;
-	remote_cs_capabilities.reflector_supported =
-		evt->roles_supported & BT_HCI_LE_CS_REFLECTOR_ROLE_MASK;
-	remote_cs_capabilities.mode_3_supported =
-		evt->modes_supported & BT_HCI_LE_CS_MODES_SUPPORTED_MODE_3_MASK;
-
-	remote_cs_capabilities.rtt_aa_only_n = evt->rtt_aa_only_n;
-	remote_cs_capabilities.rtt_sounding_n = evt->rtt_sounding_n;
-	remote_cs_capabilities.rtt_random_payload_n = evt->rtt_random_payload_n;
-
-	if (evt->rtt_aa_only_n) {
-		if (evt->rtt_capability & BT_HCI_LE_CS_RTT_AA_ONLY_N_10NS_MASK) {
-			remote_cs_capabilities.rtt_aa_only_precision =
-				BT_CONN_LE_CS_RTT_AA_ONLY_10NS;
+	if (evt->status == BT_HCI_ERR_SUCCESS) {
+		remote_cs_capabilities.num_config_supported = evt->num_config_supported;
+		remote_cs_capabilities.max_consecutive_procedures_supported =
+			sys_le16_to_cpu(evt->max_consecutive_procedures_supported);
+		remote_cs_capabilities.num_antennas_supported = evt->num_antennas_supported;
+		remote_cs_capabilities.max_antenna_paths_supported =
+			evt->max_antenna_paths_supported;
+
+		remote_cs_capabilities.initiator_supported =
+			evt->roles_supported & BT_HCI_LE_CS_INITIATOR_ROLE_MASK;
+		remote_cs_capabilities.reflector_supported =
+			evt->roles_supported & BT_HCI_LE_CS_REFLECTOR_ROLE_MASK;
+		remote_cs_capabilities.mode_3_supported =
+			evt->modes_supported & BT_HCI_LE_CS_MODES_SUPPORTED_MODE_3_MASK;
+
+		remote_cs_capabilities.rtt_aa_only_n = evt->rtt_aa_only_n;
+		remote_cs_capabilities.rtt_sounding_n = evt->rtt_sounding_n;
+		remote_cs_capabilities.rtt_random_payload_n = evt->rtt_random_payload_n;
+
+		if (evt->rtt_aa_only_n) {
+			if (evt->rtt_capability & BT_HCI_LE_CS_RTT_AA_ONLY_N_10NS_MASK) {
+				remote_cs_capabilities.rtt_aa_only_precision =
+					BT_CONN_LE_CS_RTT_AA_ONLY_10NS;
+			} else {
+				remote_cs_capabilities.rtt_aa_only_precision =
+					BT_CONN_LE_CS_RTT_AA_ONLY_150NS;
+			}
 		} else {
 			remote_cs_capabilities.rtt_aa_only_precision =
-				BT_CONN_LE_CS_RTT_AA_ONLY_150NS;
+				BT_CONN_LE_CS_RTT_AA_ONLY_NOT_SUPP;
 		}
-	} else {
-		remote_cs_capabilities.rtt_aa_only_precision = BT_CONN_LE_CS_RTT_AA_ONLY_NOT_SUPP;
-	}
 
-	if (evt->rtt_sounding_n) {
-		if (evt->rtt_capability & BT_HCI_LE_CS_RTT_SOUNDING_N_10NS_MASK) {
-			remote_cs_capabilities.rtt_sounding_precision =
-				BT_CONN_LE_CS_RTT_SOUNDING_10NS;
+		if (evt->rtt_sounding_n) {
+			if (evt->rtt_capability & BT_HCI_LE_CS_RTT_SOUNDING_N_10NS_MASK) {
+				remote_cs_capabilities.rtt_sounding_precision =
+					BT_CONN_LE_CS_RTT_SOUNDING_10NS;
+			} else {
+				remote_cs_capabilities.rtt_sounding_precision =
+					BT_CONN_LE_CS_RTT_SOUNDING_150NS;
+			}
 		} else {
 			remote_cs_capabilities.rtt_sounding_precision =
-				BT_CONN_LE_CS_RTT_SOUNDING_150NS;
+				BT_CONN_LE_CS_RTT_SOUNDING_NOT_SUPP;
 		}
-	} else {
-		remote_cs_capabilities.rtt_sounding_precision = BT_CONN_LE_CS_RTT_SOUNDING_NOT_SUPP;
-	}
 
-	if (evt->rtt_random_payload_n) {
-		if (evt->rtt_capability & BT_HCI_LE_CS_RTT_RANDOM_PAYLOAD_N_10NS_MASK) {
-			remote_cs_capabilities.rtt_random_payload_precision =
-				BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_10NS;
+		if (evt->rtt_random_payload_n) {
+			if (evt->rtt_capability & BT_HCI_LE_CS_RTT_RANDOM_PAYLOAD_N_10NS_MASK) {
+				remote_cs_capabilities.rtt_random_payload_precision =
+					BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_10NS;
+			} else {
+				remote_cs_capabilities.rtt_random_payload_precision =
+					BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_150NS;
+			}
 		} else {
 			remote_cs_capabilities.rtt_random_payload_precision =
-				BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_150NS;
+				BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_NOT_SUPP;
 		}
-	} else {
-		remote_cs_capabilities.rtt_random_payload_precision =
-			BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_NOT_SUPP;
-	}
 
-	remote_cs_capabilities.phase_based_nadm_sounding_supported =
-		sys_le16_to_cpu(evt->nadm_sounding_capability) &
-		BT_HCI_LE_CS_NADM_SOUNDING_CAPABILITY_PHASE_BASED_MASK;
+		remote_cs_capabilities.phase_based_nadm_sounding_supported =
+			sys_le16_to_cpu(evt->nadm_sounding_capability) &
+			BT_HCI_LE_CS_NADM_SOUNDING_CAPABILITY_PHASE_BASED_MASK;
 
-	remote_cs_capabilities.phase_based_nadm_random_supported =
-		sys_le16_to_cpu(evt->nadm_random_capability) &
-		BT_HCI_LE_CS_NADM_RANDOM_CAPABILITY_PHASE_BASED_MASK;
+		remote_cs_capabilities.phase_based_nadm_random_supported =
+			sys_le16_to_cpu(evt->nadm_random_capability) &
+			BT_HCI_LE_CS_NADM_RANDOM_CAPABILITY_PHASE_BASED_MASK;
 
-	remote_cs_capabilities.cs_sync_2m_phy_supported =
-		evt->cs_sync_phys_supported & BT_HCI_LE_CS_SYNC_PHYS_2M_MASK;
+		remote_cs_capabilities.cs_sync_2m_phy_supported =
+			evt->cs_sync_phys_supported & BT_HCI_LE_CS_SYNC_PHYS_2M_MASK;
 
-	remote_cs_capabilities.cs_sync_2m_2bt_phy_supported =
-		evt->cs_sync_phys_supported & BT_HCI_LE_CS_SYNC_PHYS_2M_2BT_MASK;
+		remote_cs_capabilities.cs_sync_2m_2bt_phy_supported =
+			evt->cs_sync_phys_supported & BT_HCI_LE_CS_SYNC_PHYS_2M_2BT_MASK;
 
-	remote_cs_capabilities.cs_without_fae_supported =
-		sys_le16_to_cpu(evt->subfeatures_supported) &
-		BT_HCI_LE_CS_SUBFEATURE_NO_TX_FAE_MASK;
+		remote_cs_capabilities.cs_without_fae_supported =
+			sys_le16_to_cpu(evt->subfeatures_supported) &
+			BT_HCI_LE_CS_SUBFEATURE_NO_TX_FAE_MASK;
 
-	remote_cs_capabilities.chsel_alg_3c_supported =
-		sys_le16_to_cpu(evt->subfeatures_supported) &
-		BT_HCI_LE_CS_SUBFEATURE_CHSEL_ALG_3C_MASK;
+		remote_cs_capabilities.chsel_alg_3c_supported =
+			sys_le16_to_cpu(evt->subfeatures_supported) &
+			BT_HCI_LE_CS_SUBFEATURE_CHSEL_ALG_3C_MASK;
 
-	remote_cs_capabilities.pbr_from_rtt_sounding_seq_supported =
-		sys_le16_to_cpu(evt->subfeatures_supported) &
-		BT_HCI_LE_CS_SUBFEATURE_PBR_FROM_RTT_SOUNDING_SEQ_MASK;
+		remote_cs_capabilities.pbr_from_rtt_sounding_seq_supported =
+			sys_le16_to_cpu(evt->subfeatures_supported) &
+			BT_HCI_LE_CS_SUBFEATURE_PBR_FROM_RTT_SOUNDING_SEQ_MASK;
 
-	remote_cs_capabilities.t_ip1_times_supported = sys_le16_to_cpu(evt->t_ip1_times_supported);
-	remote_cs_capabilities.t_ip2_times_supported = sys_le16_to_cpu(evt->t_ip2_times_supported);
-	remote_cs_capabilities.t_fcs_times_supported = sys_le16_to_cpu(evt->t_fcs_times_supported);
-	remote_cs_capabilities.t_pm_times_supported = sys_le16_to_cpu(evt->t_pm_times_supported);
+		remote_cs_capabilities.t_ip1_times_supported =
+			sys_le16_to_cpu(evt->t_ip1_times_supported);
+		remote_cs_capabilities.t_ip2_times_supported =
+			sys_le16_to_cpu(evt->t_ip2_times_supported);
+		remote_cs_capabilities.t_fcs_times_supported =
+			sys_le16_to_cpu(evt->t_fcs_times_supported);
+		remote_cs_capabilities.t_pm_times_supported =
+			sys_le16_to_cpu(evt->t_pm_times_supported);
 
-	remote_cs_capabilities.t_sw_time = evt->t_sw_time_supported;
-	remote_cs_capabilities.tx_snr_capability = evt->tx_snr_capability;
+		remote_cs_capabilities.t_sw_time = evt->t_sw_time_supported;
+		remote_cs_capabilities.tx_snr_capability = evt->tx_snr_capability;
 
-	notify_remote_cs_capabilities(conn, remote_cs_capabilities);
+		notify_remote_cs_capabilities(conn, BT_HCI_ERR_SUCCESS, &remote_cs_capabilities);
+	} else {
+		notify_remote_cs_capabilities(conn, evt->status, NULL);
+	}
 
 	bt_conn_unref(conn);
 }
@@ -470,7 +480,6 @@ void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf)
 	evt = net_buf_pull_mem(buf, sizeof(*evt));
 	if (evt->status) {
 		LOG_WRN("Read Remote FAE Table failed with status 0x%02X", evt->status);
-		return;
 	}
 
 	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->conn_handle), BT_CONN_TYPE_LE);
@@ -479,8 +488,13 @@ void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf)
 		return;
 	}
 
-	fae_table.remote_fae_table = evt->remote_fae_table;
-	notify_remote_cs_fae_table(conn, fae_table);
+	if (evt->status == BT_HCI_ERR_SUCCESS) {
+		fae_table.remote_fae_table = evt->remote_fae_table;
+
+		notify_remote_cs_fae_table(conn, BT_HCI_ERR_SUCCESS, &fae_table);
+	} else {
+		notify_remote_cs_fae_table(conn, evt->status, NULL);
+	}
 
 	bt_conn_unref(conn);
 }
@@ -810,7 +824,6 @@ void bt_hci_le_cs_config_complete_event(struct net_buf *buf)
 	evt = net_buf_pull_mem(buf, sizeof(*evt));
 	if (evt->status) {
 		LOG_WRN("CS Config failed (status 0x%02X)", evt->status);
-		return;
 	}
 
 	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->handle), BT_CONN_TYPE_LE);
@@ -819,33 +832,38 @@ void bt_hci_le_cs_config_complete_event(struct net_buf *buf)
 		return;
 	}
 
-	if (evt->action == BT_HCI_LE_CS_CONFIG_ACTION_REMOVED) {
-		notify_cs_config_removed(conn, evt->config_id);
-		bt_conn_unref(conn);
-		return;
+	if (evt->status == BT_HCI_ERR_SUCCESS) {
+		if (evt->action == BT_HCI_LE_CS_CONFIG_ACTION_REMOVED) {
+			notify_cs_config_removed(conn, evt->config_id);
+			bt_conn_unref(conn);
+			return;
+		}
+
+		config.id = evt->config_id;
+		config.main_mode_type = evt->main_mode_type;
+		config.sub_mode_type = evt->sub_mode_type;
+		config.min_main_mode_steps = evt->min_main_mode_steps;
+		config.max_main_mode_steps = evt->max_main_mode_steps;
+		config.main_mode_repetition = evt->main_mode_repetition;
+		config.mode_0_steps = evt->mode_0_steps;
+		config.role = evt->role;
+		config.rtt_type = evt->rtt_type;
+		config.cs_sync_phy = evt->cs_sync_phy;
+		config.channel_map_repetition = evt->channel_map_repetition;
+		config.channel_selection_type = evt->channel_selection_type;
+		config.ch3c_shape = evt->ch3c_shape;
+		config.ch3c_jump = evt->ch3c_jump;
+		config.t_ip1_time_us = evt->t_ip1_time;
+		config.t_ip2_time_us = evt->t_ip2_time;
+		config.t_fcs_time_us = evt->t_fcs_time;
+		config.t_pm_time_us = evt->t_pm_time;
+		memcpy(config.channel_map, evt->channel_map, ARRAY_SIZE(config.channel_map));
+
+		notify_cs_config_created(conn, BT_HCI_ERR_SUCCESS, &config);
+	} else {
+		notify_cs_config_created(conn, evt->status, NULL);
 	}
 
-	config.id = evt->config_id;
-	config.main_mode_type = evt->main_mode_type;
-	config.sub_mode_type = evt->sub_mode_type;
-	config.min_main_mode_steps = evt->min_main_mode_steps;
-	config.max_main_mode_steps = evt->max_main_mode_steps;
-	config.main_mode_repetition = evt->main_mode_repetition;
-	config.mode_0_steps = evt->mode_0_steps;
-	config.role = evt->role;
-	config.rtt_type = evt->rtt_type;
-	config.cs_sync_phy = evt->cs_sync_phy;
-	config.channel_map_repetition = evt->channel_map_repetition;
-	config.channel_selection_type = evt->channel_selection_type;
-	config.ch3c_shape = evt->ch3c_shape;
-	config.ch3c_jump = evt->ch3c_jump;
-	config.t_ip1_time_us = evt->t_ip1_time;
-	config.t_ip2_time_us = evt->t_ip2_time;
-	config.t_fcs_time_us = evt->t_fcs_time;
-	config.t_pm_time_us = evt->t_pm_time;
-	memcpy(config.channel_map, evt->channel_map, ARRAY_SIZE(config.channel_map));
-
-	notify_cs_config_created(conn, &config);
 	bt_conn_unref(conn);
 }
 
@@ -1208,7 +1226,6 @@ void bt_hci_le_cs_security_enable_complete(struct net_buf *buf)
 	evt = net_buf_pull_mem(buf, sizeof(*evt));
 	if (evt->status) {
 		LOG_WRN("Security Enable failed with status 0x%02X", evt->status);
-		return;
 	}
 
 	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->handle), BT_CONN_TYPE_LE);
@@ -1217,7 +1234,7 @@ void bt_hci_le_cs_security_enable_complete(struct net_buf *buf)
 		return;
 	}
 
-	notify_cs_security_enable_available(conn);
+	notify_cs_security_enable_available(conn, evt->status);
 
 	bt_conn_unref(conn);
 }
@@ -1237,7 +1254,6 @@ void bt_hci_le_cs_procedure_enable_complete(struct net_buf *buf)
 	evt = net_buf_pull_mem(buf, sizeof(*evt));
 	if (evt->status) {
 		LOG_WRN("Procedure Enable failed with status 0x%02X", evt->status);
-		return;
 	}
 
 	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->handle), BT_CONN_TYPE_LE);
@@ -1255,19 +1271,23 @@ void bt_hci_le_cs_procedure_enable_complete(struct net_buf *buf)
 		}
 	}
 
-	params.config_id = evt->config_id;
-	params.state = evt->state;
-	params.tone_antenna_config_selection = evt->tone_antenna_config_selection;
-	params.selected_tx_power = evt->selected_tx_power;
-	params.subevent_len = sys_get_le24(evt->subevent_len);
-	params.subevents_per_event = evt->subevents_per_event;
-	params.subevent_interval = sys_le16_to_cpu(evt->subevent_interval);
-	params.event_interval = sys_le16_to_cpu(evt->event_interval);
-	params.procedure_interval = sys_le16_to_cpu(evt->procedure_interval);
-	params.procedure_count = sys_le16_to_cpu(evt->procedure_count);
-	params.max_procedure_len = sys_le16_to_cpu(evt->max_procedure_len);
-
-	notify_cs_procedure_enable_available(conn, &params);
+	if (evt->status == BT_HCI_ERR_SUCCESS) {
+		params.config_id = evt->config_id;
+		params.state = evt->state;
+		params.tone_antenna_config_selection = evt->tone_antenna_config_selection;
+		params.selected_tx_power = evt->selected_tx_power;
+		params.subevent_len = sys_get_le24(evt->subevent_len);
+		params.subevents_per_event = evt->subevents_per_event;
+		params.subevent_interval = sys_le16_to_cpu(evt->subevent_interval);
+		params.event_interval = sys_le16_to_cpu(evt->event_interval);
+		params.procedure_interval = sys_le16_to_cpu(evt->procedure_interval);
+		params.procedure_count = sys_le16_to_cpu(evt->procedure_count);
+		params.max_procedure_len = sys_le16_to_cpu(evt->max_procedure_len);
+
+		notify_cs_procedure_enable_available(conn, BT_HCI_ERR_SUCCESS, &params);
+	} else {
+		notify_cs_procedure_enable_available(conn, evt->status, NULL);
+	}
 
 	bt_conn_unref(conn);
 }
diff --git a/tests/bluetooth/host/cs/mocks/conn.c b/tests/bluetooth/host/cs/mocks/conn.c
index 910a06e3ce3..c0bfd06944d 100644
--- a/tests/bluetooth/host/cs/mocks/conn.c
+++ b/tests/bluetooth/host/cs/mocks/conn.c
@@ -11,12 +11,14 @@
 DEFINE_FAKE_VOID_FUNC(bt_conn_unref, struct bt_conn *);
 DEFINE_FAKE_VALUE_FUNC(struct bt_conn *, bt_conn_lookup_handle, uint16_t, enum bt_conn_type);
 DEFINE_FAKE_VOID_FUNC(notify_remote_cs_capabilities, struct bt_conn *,
-		      struct bt_conn_le_cs_capabilities);
-DEFINE_FAKE_VOID_FUNC(notify_remote_cs_fae_table, struct bt_conn *, struct bt_conn_le_cs_fae_table);
-DEFINE_FAKE_VOID_FUNC(notify_cs_config_created, struct bt_conn *, struct bt_conn_le_cs_config *);
+		      uint8_t, struct bt_conn_le_cs_capabilities *);
+DEFINE_FAKE_VOID_FUNC(notify_remote_cs_fae_table, struct bt_conn *,
+		      uint8_t, struct bt_conn_le_cs_fae_table *);
+DEFINE_FAKE_VOID_FUNC(notify_cs_config_created, struct bt_conn *,
+		      uint8_t, struct bt_conn_le_cs_config *);
 DEFINE_FAKE_VOID_FUNC(notify_cs_config_removed, struct bt_conn *, uint8_t);
 DEFINE_FAKE_VOID_FUNC(notify_cs_subevent_result, struct bt_conn *,
 		      struct bt_conn_le_cs_subevent_result *);
-DEFINE_FAKE_VOID_FUNC(notify_cs_security_enable_available, struct bt_conn *);
+DEFINE_FAKE_VOID_FUNC(notify_cs_security_enable_available, struct bt_conn *, uint8_t);
 DEFINE_FAKE_VOID_FUNC(notify_cs_procedure_enable_available, struct bt_conn *,
-		      struct bt_conn_le_cs_procedure_enable_complete *);
+		      uint8_t, struct bt_conn_le_cs_procedure_enable_complete *);
diff --git a/tests/bluetooth/host/cs/mocks/conn.h b/tests/bluetooth/host/cs/mocks/conn.h
index 70aa9bdfd26..10d8bccd603 100644
--- a/tests/bluetooth/host/cs/mocks/conn.h
+++ b/tests/bluetooth/host/cs/mocks/conn.h
@@ -25,13 +25,14 @@
 DECLARE_FAKE_VOID_FUNC(bt_conn_unref, struct bt_conn *);
 DECLARE_FAKE_VALUE_FUNC(struct bt_conn *, bt_conn_lookup_handle, uint16_t, enum bt_conn_type);
 DECLARE_FAKE_VOID_FUNC(notify_remote_cs_capabilities, struct bt_conn *,
-		       struct bt_conn_le_cs_capabilities);
+		       uint8_t, struct bt_conn_le_cs_capabilities *);
 DECLARE_FAKE_VOID_FUNC(notify_remote_cs_fae_table, struct bt_conn *,
-		       struct bt_conn_le_cs_fae_table);
-DECLARE_FAKE_VOID_FUNC(notify_cs_config_created, struct bt_conn *, struct bt_conn_le_cs_config *);
+		       uint8_t, struct bt_conn_le_cs_fae_table *);
+DECLARE_FAKE_VOID_FUNC(notify_cs_config_created, struct bt_conn *,
+		       uint8_t, struct bt_conn_le_cs_config *);
 DECLARE_FAKE_VOID_FUNC(notify_cs_config_removed, struct bt_conn *, uint8_t);
 DECLARE_FAKE_VOID_FUNC(notify_cs_subevent_result, struct bt_conn *,
 		       struct bt_conn_le_cs_subevent_result *);
-DECLARE_FAKE_VOID_FUNC(notify_cs_security_enable_available, struct bt_conn *);
+DECLARE_FAKE_VOID_FUNC(notify_cs_security_enable_available, struct bt_conn *, uint8_t);
 DECLARE_FAKE_VOID_FUNC(notify_cs_procedure_enable_available, struct bt_conn *,
-		       struct bt_conn_le_cs_procedure_enable_complete *);
+		       uint8_t, struct bt_conn_le_cs_procedure_enable_complete *);

From e6ab653d822c1e8a12859b887c8f0d4dfb163e99 Mon Sep 17 00:00:00 2001
From: Ryan Chu <ryan.chu@nordicsemi.no>
Date: Fri, 28 Mar 2025 11:51:27 +0100
Subject: [PATCH 2844/2913] [nrf fromtree] bluetooth: host: Apply callback
 changes of CS complete events

The CS complete callbacks provide both status and params.
In the case of errors, NULL pointer is passed to the params of callbacks.

Signed-off-by: Ryan Chu <ryan.chu@nordicsemi.no>
(cherry picked from commit 9ba60d3eb742a0e6f22df32768cbf82f20beef67)
---
 .../src/connected_cs_initiator.c              | 56 ++++++++++++------
 .../src/connected_cs_reflector.c              | 58 +++++++++++++------
 subsys/bluetooth/host/shell/bt.c              | 33 +++++++++--
 3 files changed, 106 insertions(+), 41 deletions(-)

diff --git a/samples/bluetooth/channel_sounding/src/connected_cs_initiator.c b/samples/bluetooth/channel_sounding/src/connected_cs_initiator.c
index 1a012665c75..5f5250bad2c 100644
--- a/samples/bluetooth/channel_sounding/src/connected_cs_initiator.c
+++ b/samples/bluetooth/channel_sounding/src/connected_cs_initiator.c
@@ -138,32 +138,54 @@ static void security_changed_cb(struct bt_conn *conn, bt_security_t level, enum
 	k_sem_give(&sem_acl_encryption_enabled);
 }
 
-static void remote_capabilities_cb(struct bt_conn *conn, struct bt_conn_le_cs_capabilities *params)
+static void remote_capabilities_cb(struct bt_conn *conn,
+				   uint8_t status,
+				   struct bt_conn_le_cs_capabilities *params)
 {
 	ARG_UNUSED(params);
-	printk("CS capability exchange completed.\n");
-	k_sem_give(&sem_remote_capabilities_obtained);
+
+	if (status == BT_HCI_ERR_SUCCESS) {
+		printk("CS capability exchange completed.\n");
+		k_sem_give(&sem_remote_capabilities_obtained);
+	} else {
+		printk("CS capability exchange failed. (HCI status 0x%02x)\n", status);
+	}
 }
 
-static void config_created_cb(struct bt_conn *conn, struct bt_conn_le_cs_config *config)
+static void config_create_cb(struct bt_conn *conn,
+			     uint8_t status,
+			     struct bt_conn_le_cs_config *config)
 {
-	printk("CS config creation complete. ID: %d\n", config->id);
-	k_sem_give(&sem_config_created);
+	if (status == BT_HCI_ERR_SUCCESS) {
+		printk("CS config creation complete. ID: %d\n", config->id);
+		k_sem_give(&sem_config_created);
+	} else {
+		printk("CS config creation failed. (HCI status 0x%02x)\n", status);
+	}
 }
 
-static void security_enabled_cb(struct bt_conn *conn)
+static void security_enable_cb(struct bt_conn *conn, uint8_t status)
 {
-	printk("CS security enabled.\n");
-	k_sem_give(&sem_cs_security_enabled);
+	if (status == BT_HCI_ERR_SUCCESS) {
+		printk("CS security enabled.\n");
+		k_sem_give(&sem_cs_security_enabled);
+	} else {
+		printk("CS security enable failed. (HCI status 0x%02x)\n", status);
+	}
 }
 
-static void procedure_enabled_cb(struct bt_conn *conn,
+static void procedure_enable_cb(struct bt_conn *conn,
+				 uint8_t status,
 				 struct bt_conn_le_cs_procedure_enable_complete *params)
 {
-	if (params->state == 1) {
-		printk("CS procedures enabled.\n");
+	if (status == BT_HCI_ERR_SUCCESS) {
+		if (params->state == 1) {
+			printk("CS procedures enabled.\n");
+		} else {
+			printk("CS procedures disabled.\n");
+		}
 	} else {
-		printk("CS procedures disabled.\n");
+		printk("CS procedures enable failed. (HCI status 0x%02x)\n", status);
 	}
 }
 
@@ -223,10 +245,10 @@ BT_CONN_CB_DEFINE(conn_cb) = {
 	.connected = connected_cb,
 	.disconnected = disconnected_cb,
 	.security_changed = security_changed_cb,
-	.le_cs_remote_capabilities_available = remote_capabilities_cb,
-	.le_cs_config_created = config_created_cb,
-	.le_cs_security_enabled = security_enabled_cb,
-	.le_cs_procedure_enabled = procedure_enabled_cb,
+	.le_cs_read_remote_capabilities_complete = remote_capabilities_cb,
+	.le_cs_config_complete = config_create_cb,
+	.le_cs_security_enable_complete = security_enable_cb,
+	.le_cs_procedure_enable_complete = procedure_enable_cb,
 	.le_cs_subevent_data_available = subevent_result_cb,
 };
 
diff --git a/samples/bluetooth/channel_sounding/src/connected_cs_reflector.c b/samples/bluetooth/channel_sounding/src/connected_cs_reflector.c
index 2563d604387..404ee1ad4e3 100644
--- a/samples/bluetooth/channel_sounding/src/connected_cs_reflector.c
+++ b/samples/bluetooth/channel_sounding/src/connected_cs_reflector.c
@@ -89,32 +89,54 @@ static void disconnected_cb(struct bt_conn *conn, uint8_t reason)
 	connection = NULL;
 }
 
-static void remote_capabilities_cb(struct bt_conn *conn, struct bt_conn_le_cs_capabilities *params)
+static void remote_capabilities_cb(struct bt_conn *conn,
+				   uint8_t status,
+				   struct bt_conn_le_cs_capabilities *params)
 {
 	ARG_UNUSED(params);
-	printk("CS capability exchange completed.\n");
-	k_sem_give(&sem_remote_capabilities_obtained);
+
+	if (status == BT_HCI_ERR_SUCCESS) {
+		printk("CS capability exchange completed.\n");
+		k_sem_give(&sem_remote_capabilities_obtained);
+	} else {
+		printk("CS capability exchange failed. (HCI status 0x%02x)\n", status);
+	}
 }
 
-static void config_created_cb(struct bt_conn *conn, struct bt_conn_le_cs_config *config)
+static void config_create_cb(struct bt_conn *conn,
+			     uint8_t status,
+			     struct bt_conn_le_cs_config *config)
 {
-	printk("CS config creation complete. ID: %d\n", config->id);
-	k_sem_give(&sem_config_created);
+	if (status == BT_HCI_ERR_SUCCESS) {
+		printk("CS config creation complete. ID: %d\n", config->id);
+		k_sem_give(&sem_config_created);
+	} else {
+		printk("CS config creation failed. (HCI status 0x%02x)\n", status);
+	}
 }
 
-static void security_enabled_cb(struct bt_conn *conn)
+static void security_enable_cb(struct bt_conn *conn, uint8_t status)
 {
-	printk("CS security enabled.\n");
-	k_sem_give(&sem_cs_security_enabled);
+	if (status == BT_HCI_ERR_SUCCESS) {
+		printk("CS security enabled.\n");
+		k_sem_give(&sem_cs_security_enabled);
+	} else {
+		printk("CS security enable failed. (HCI status 0x%02x)\n", status);
+	}
 }
 
-static void procedure_enabled_cb(struct bt_conn *conn,
-				 struct bt_conn_le_cs_procedure_enable_complete *params)
+static void procedure_enable_cb(struct bt_conn *conn,
+				uint8_t status,
+				struct bt_conn_le_cs_procedure_enable_complete *params)
 {
-	if (params->state == 1) {
-		printk("CS procedures enabled.\n");
+	if (status == BT_HCI_ERR_SUCCESS) {
+		if (params->state == 1) {
+			printk("CS procedures enabled.\n");
+		} else {
+			printk("CS procedures disabled.\n");
+		}
 	} else {
-		printk("CS procedures disabled.\n");
+		printk("CS procedures enable failed. (HCI status 0x%02x)\n", status);
 	}
 }
 
@@ -160,10 +182,10 @@ static void write_func(struct bt_conn *conn, uint8_t err, struct bt_gatt_write_p
 BT_CONN_CB_DEFINE(conn_cb) = {
 	.connected = connected_cb,
 	.disconnected = disconnected_cb,
-	.le_cs_remote_capabilities_available = remote_capabilities_cb,
-	.le_cs_config_created = config_created_cb,
-	.le_cs_security_enabled = security_enabled_cb,
-	.le_cs_procedure_enabled = procedure_enabled_cb,
+	.le_cs_read_remote_capabilities_complete = remote_capabilities_cb,
+	.le_cs_config_complete = config_create_cb,
+	.le_cs_security_enable_complete = security_enable_cb,
+	.le_cs_procedure_enable_complete = procedure_enable_cb,
 	.le_cs_subevent_data_available = subevent_result_cb,
 };
 
diff --git a/subsys/bluetooth/host/shell/bt.c b/subsys/bluetooth/host/shell/bt.c
index 7386e14f0d1..c35e7c226e0 100644
--- a/subsys/bluetooth/host/shell/bt.c
+++ b/subsys/bluetooth/host/shell/bt.c
@@ -988,8 +988,15 @@ void subrate_changed(struct bt_conn *conn,
 #endif
 
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
-void print_remote_cs_capabilities(struct bt_conn *conn, struct bt_conn_le_cs_capabilities *params)
+void print_remote_cs_capabilities(struct bt_conn *conn,
+				  uint8_t status,
+				  struct bt_conn_le_cs_capabilities *params)
 {
+	if (status != BT_HCI_ERR_SUCCESS) {
+		bt_shell_print("Read Remote CS Capabilities failed (HCI status 0x%02x)", status);
+		return;
+	}
+
 	bt_shell_print(
 		"Received remote channel sounding capabilities:\n"
 		"- Num CS configurations: %d\n"
@@ -1051,14 +1058,28 @@ void print_remote_cs_capabilities(struct bt_conn *conn, struct bt_conn_le_cs_cap
 		params->tx_snr_capability);
 }
 
-void print_remote_cs_fae_table(struct bt_conn *conn, struct bt_conn_le_cs_fae_table *params)
+void print_remote_cs_fae_table(struct bt_conn *conn,
+			       uint8_t status,
+			       struct bt_conn_le_cs_fae_table *params)
 {
+	if (status != BT_HCI_ERR_SUCCESS) {
+		bt_shell_print("Read Remote CS FAE Table failed (HCI status 0x%02x)", status);
+		return;
+	}
+
 	bt_shell_print("Received FAE Table: ");
 	bt_shell_hexdump(params->remote_fae_table, 72);
 }
 
-static void le_cs_config_created(struct bt_conn *conn, struct bt_conn_le_cs_config *config)
+static void le_cs_config_created(struct bt_conn *conn,
+				 uint8_t status,
+				 struct bt_conn_le_cs_config *config)
 {
+	if (status != BT_HCI_ERR_SUCCESS) {
+		bt_shell_print("Create CS Config failed (HCI status 0x%02x)", status);
+		return;
+	}
+
 	const char *mode_str[5] = {"Unused", "1 (RTT)", "2 (PBR)", "3 (RTT + PBR)", "Invalid"};
 	const char *role_str[3] = {"Initiator", "Reflector", "Invalid"};
 	const char *rtt_type_str[8] = {"AA only",        "32-bit sounding", "96-bit sounding",
@@ -1146,9 +1167,9 @@ static struct bt_conn_cb conn_callbacks = {
 	.subrate_changed = subrate_changed,
 #endif
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
-	.le_cs_remote_capabilities_available = print_remote_cs_capabilities,
-	.le_cs_remote_fae_table_available = print_remote_cs_fae_table,
-	.le_cs_config_created = le_cs_config_created,
+	.le_cs_read_remote_capabilities_complete = print_remote_cs_capabilities,
+	.le_cs_read_remote_fae_table_complete = print_remote_cs_fae_table,
+	.le_cs_config_complete = le_cs_config_created,
 	.le_cs_config_removed = le_cs_config_removed,
 #endif
 };

From b41a7a4bdef03aa2843162e25b3648e412ce8967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20Amundsen?= <haakon.amundsen@nordicsemi.no>
Date: Wed, 2 Apr 2025 06:53:31 +0200
Subject: [PATCH 2845/2913] [nrf fromlist] tests: spi_controller_peripheral:
 fix CTRLSEL conflict
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Both EXMIF and SPIS peripherals are claiming GPIO port 6 pin 0, but
with different CTRLSEL values. This will trigger a build error with
nrf-regtool 9.0.0 as it is not possible to apply this configuration
to hardware.

Fix the issue by disabling the EXMIF node that is enabled by default.

Upstream PR #: 88017

Signed-off-by: Håkon Amundsen <haakon.amundsen@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp_fast_spis.overlay       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast_spis.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast_spis.overlay
index 36b5dcb0629..8a5728e291e 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast_spis.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast_spis.overlay
@@ -78,6 +78,10 @@
 	};
 };
 
+&exmif{
+	status = "disabled";
+};
+
 &gpio0 {
 	status = "okay";
 };

From 8cd647992e9491f46bd277b5601f29bed8ea3b70 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 24 Dec 2024 16:30:51 +0530
Subject: [PATCH 2846/2913] [nrf fromtree] manifest: nrf_wifi: Pull standalone
 lib support

Pull in support for building OSAL code as a standalone library.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit d1ebd66823cf195405ca4a574a4caf10d2906078)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 6e39a36fb26..f3b50f68131 100644
--- a/west.yml
+++ b/west.yml
@@ -318,7 +318,7 @@ manifest:
       revision: b84bd7314a239f818e78f6927f5673247816df53
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: 0f53c9ebab526661131d5d7e73c7a6cb3b2d2e11
+      revision: 68b018473527fa90237b1abad7ee2568a665bb44
       path: modules/lib/nrf_wifi
     - name: open-amp
       revision: 52bb1783521c62c019451cee9b05b8eda9d7425f

From 3325086ad75ec753965b9afefcfd808b9946cc42 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 23 Dec 2024 19:23:44 +0530
Subject: [PATCH 2847/2913] [nrf fromtree] nrf_wifi: Build OSAL as a standalone
 library

Move the cmake file of OSAL to it's own repo and build as a standalone
library, this is porting friendly.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit f74ff15101ada172a71d8e562574762f01f0248f)
---
 drivers/wifi/nrf_wifi/CMakeLists.txt |   2 +-
 modules/nrf_wifi/os/CMakeLists.txt   | 177 +--------------------------
 2 files changed, 5 insertions(+), 174 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
index 0df8d92c017..569df43ebd0 100644
--- a/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -73,7 +73,7 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF70_ON_QSPI
   -DNRF53_ERRATA_159_ENABLE_WORKAROUND=0
 )
 
-target_link_libraries(nrf_wifi PRIVATE nrf70-buslib)
+zephyr_library_link_libraries(nrf70-buslib nrf-wifi-shim)
 
 if (CONFIG_NRF_WIFI_PATCHES_BUILTIN)
   zephyr_blobs_verify(MODULE nrf_wifi REQUIRED)
diff --git a/modules/nrf_wifi/os/CMakeLists.txt b/modules/nrf_wifi/os/CMakeLists.txt
index 8821aa1eaae..42610b9bf57 100644
--- a/modules/nrf_wifi/os/CMakeLists.txt
+++ b/modules/nrf_wifi/os/CMakeLists.txt
@@ -4,184 +4,15 @@
 if(NOT CONFIG_WIFI_NRF70)
   return()
 endif()
-zephyr_interface_library_named(nrf-wifi-interface)
-zephyr_library()
 
-set(NRF_WIFI_DIR ${ZEPHYR_CURRENT_MODULE_DIR})
-
-# Translate the configuration to the OS agnostic code
-target_compile_definitions(
-  nrf-wifi-interface
-  INTERFACE
-  $<$<BOOL:${CONFIG_NRF_WIFI_LOW_POWER}>:NRF_WIFI_LOW_POWER>
-  $<$<BOOL:${CONFIG_NRF_WIFI_RPU_RECOVERY}>:NRF_WIFI_RPU_RECOVERY>
-  $<$<BOOL:${CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT}>:NRF_WIFI_AP_DEAD_DETECT_TIMEOUT=${CONFIG_NRF_WIFI_AP_DEAD_DETECT_TIMEOUT}>
-  $<$<BOOL:${CONFIG_NRF_WIFI_IFACE_MTU}>:NRF_WIFI_IFACE_MTU=${CONFIG_NRF_WIFI_IFACE_MTU}>
-  $<$<BOOL:${CONFIG_NRF70_STA_MODE}>:NRF70_STA_MODE>
-  $<$<BOOL:${CONFIG_NRF70_DATA_TX}>:NRF70_DATA_TX>
-  $<$<BOOL:${CONFIG_NRF70_RAW_DATA_TX}>:NRF70_RAW_DATA_TX>
-  $<$<BOOL:${CONFIG_NRF70_RAW_DATA_RX}>:NRF70_RAW_DATA_RX>
-  $<$<BOOL:${CONFIG_NRF70_PROMISC_DATA_RX}>:NRF70_PROMISC_DATA_RX>
-  $<$<BOOL:${CONFIG_NRF70_TX_DONE_WQ_ENABLED}>:NRF70_TX_DONE_WQ_ENABLED>
-  $<$<BOOL:${CONFIG_NRF70_RX_WQ_ENABLED}>:NRF70_RX_WQ_ENABLED>
-  $<$<BOOL:${CONFIG_NRF70_UTIL}>:NRF70_UTIL>
-  $<$<BOOL:${CONFIG_NRF70_RADIO_TEST}>:NRF70_RADIO_TEST>
-  $<$<BOOL:${CONFIG_NRF70_OFFLOADED_RAW_TX}>:NRF70_OFFLOADED_RAW_TX>
-  $<$<BOOL:${CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD}>:NRF70_TCP_IP_CHECKSUM_OFFLOAD>
-  $<$<BOOL:${CONFIG_NRF70_RPU_EXTEND_TWT_SP}>:NRF70_RPU_EXTEND_TWT_SP>
-  $<$<BOOL:${CONFIG_NRF70_SYSTEM_WITH_RAW_MODES}>:NRF70_SYSTEM_WITH_RAW_MODES>
-  $<$<BOOL:${CONFIG_NRF70_SCAN_ONLY}>:NRF70_SCAN_ONLY>
-  $<$<BOOL:${CONFIG_NRF70_SYSTEM_MODE}>:NRF70_SYSTEM_MODE>
-  $<$<BOOL:${CONFIG_NRF70_2_4G_ONLY}>:NRF70_2_4G_ONLY>
-  $<$<BOOL:${CONFIG_NRF70_LOG_VERBOSE}>:NRF70_LOG_VERBOSE>
-  $<$<BOOL:${CONFIG_NRF70_AP_MODE}>:NRF70_AP_MODE>
-  $<$<BOOL:${CONFIG_NRF_WIFI_MGMT_BUFF_OFFLOAD}>:NRF_WIFI_MGMT_BUFF_OFFLOAD>
-  $<$<BOOL:${CONFIG_NRF_WIFI_FEAT_KEEPALIVE}>:NRF_WIFI_FEAT_KEEPALIVE>
-  $<$<BOOL:${CONFIG_NRF_WIFI_FEAT_KEEPALIVE}>:NRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}>
-  $<$<BOOL:${CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS}>:WIFI_MGMT_RAW_SCAN_RESULTS>
-  $<$<BOOL:${CONFIG_NRF_WIFI_COEX_DISABLE_PRIORITY_WINDOW_FOR_SCAN}>:NRF_WIFI_COEX_DISABLE_PRIORITY_WINDOW_FOR_SCAN>
-  NRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS}
-  NRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS}
-  NRF70_RX_MAX_DATA_SIZE=${CONFIG_NRF70_RX_MAX_DATA_SIZE}
-  NRF70_MAX_TX_PENDING_QLEN=${CONFIG_NRF70_MAX_TX_PENDING_QLEN}
-  NRF70_RPU_PS_IDLE_TIMEOUT_MS=${CONFIG_NRF70_RPU_PS_IDLE_TIMEOUT_MS}
-  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS}
-  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_DSSS}
-  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_2G_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_1_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2A_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_2C_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_3_UPPER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_LOWER_EDGE_BACKOFF_HE}
-  NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT}
-  NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE=${CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE}
-  NRF70_PCB_LOSS_2G=${CONFIG_NRF70_PCB_LOSS_2G}
-  NRF70_PCB_LOSS_5G_BAND1=${CONFIG_NRF70_PCB_LOSS_5G_BAND1}
-  NRF70_PCB_LOSS_5G_BAND2=${CONFIG_NRF70_PCB_LOSS_5G_BAND2}
-  NRF70_PCB_LOSS_5G_BAND3=${CONFIG_NRF70_PCB_LOSS_5G_BAND3}
-  NRF70_ANT_GAIN_2G=${CONFIG_NRF70_ANT_GAIN_2G}
-  NRF70_ANT_GAIN_5G_BAND1=${CONFIG_NRF70_ANT_GAIN_5G_BAND1}
-  NRF70_ANT_GAIN_5G_BAND2=${CONFIG_NRF70_ANT_GAIN_5G_BAND2}
-  NRF70_ANT_GAIN_5G_BAND3=${CONFIG_NRF70_ANT_GAIN_5G_BAND3}
-  NRF_WIFI_PS_INT_PS=${CONFIG_NRF_WIFI_PS_INT_PS}
-  NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS=${CONFIG_NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS}
-  NRF_WIFI_DISPLAY_SCAN_BSS_LIMIT=${CONFIG_NRF_WIFI_DISPLAY_SCAN_BSS_LIMIT}
-)
-
-target_include_directories(
-  nrf-wifi-interface
-  INTERFACE
-  ${CMAKE_CURRENT_LIST_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/../bus
-  ${NRF_WIFI_DIR}/utils/inc
-  ${NRF_WIFI_DIR}/os_if/inc
-  ${NRF_WIFI_DIR}/bus_if/bus/qspi/inc
-  ${NRF_WIFI_DIR}/bus_if/bal/inc
-  ${NRF_WIFI_DIR}/fw_if/umac_if/inc
-  ${NRF_WIFI_DIR}/fw_load/mips/fw/inc
-  ${NRF_WIFI_DIR}/hw_if/hal/inc
-  ${NRF_WIFI_DIR}/hw_if/hal/inc/fw
-  ${NRF_WIFI_DIR}/fw_if/umac_if/inc/fw
-)
-
-if(CONFIG_NRF70_RADIO_TEST)
-  target_include_directories(nrf-wifi-interface INTERFACE
-    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/radio_test
-  )
-elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
-  target_include_directories(nrf-wifi-interface INTERFACE
-    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/offload_raw_tx
-    off_raw_tx/inc
-  )
-else()
-  target_include_directories(nrf-wifi-interface INTERFACE
-    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/default
-  )
-endif()
-
-zephyr_library_sources(
-  ${NRF_WIFI_DIR}/os_if/src/osal.c
-  ${NRF_WIFI_DIR}/utils/src/list.c
-  ${NRF_WIFI_DIR}/utils/src/queue.c
-  ${NRF_WIFI_DIR}/utils/src/util.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_api.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_fw_patch_loader.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_interrupt.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_mem.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_reg.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/hpqm.c
-  ${NRF_WIFI_DIR}/hw_if/hal/src/pal.c
-  ${NRF_WIFI_DIR}/bus_if/bal/src/bal.c
-  ${NRF_WIFI_DIR}/bus_if/bus/qspi/src/qspi.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/cmd.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/event.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_api_common.c
-)
-
-if(CONFIG_NRF70_RADIO_TEST)
-  zephyr_library_sources(
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/radio_test/fmac_api.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-  )
-elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
-  zephyr_library_sources(
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/offload_raw_tx/fmac_api.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-  )
-else()
-  zephyr_library_sources(
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/rx.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_vif.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-    ${NRF_WIFI_DIR}/fw_if/umac_if/src/default/fmac_api.c
-  )
-endif()
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_DATA_TX
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/tx.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_PROMISC_DATA_RX
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_promisc.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_NRF70_AP_MODE
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_ap.c
-)
-
-# Without WPA supplicant we only support scan
-zephyr_library_sources_ifdef(CONFIG_NRF70_STA_MODE
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_peer.c
-  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_util.c
-)
+add_subdirectory(${ZEPHYR_NRF_WIFI_MODULE_DIR} nrf_wifi_osal)
 
+zephyr_library_named(nrf-wifi-shim)
+zephyr_include_directories(${CMAKE_CURRENT_LIST_DIR})
 zephyr_library_sources(
   shim.c
   timer.c
   work.c
 )
 
-target_link_libraries(zephyr_interface INTERFACE nrf-wifi-interface)
-target_link_libraries(nrf_wifi PRIVATE nrf70-buslib)
+zephyr_library_link_libraries(nrf-wifi-osal)

From 6a63fd48a669796287641363866b0abea1aa578c Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 24 Dec 2024 16:27:50 +0530
Subject: [PATCH 2848/2913] [nrf fromtree] drivers: nrf_wifi: Remove unused
 macros

These are duplicates of nRF7o bus library.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit f8b3320c68d61e791ed1416c7234348619dd6f1e)
---
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index 126688d9a47..d796f23af1c 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -176,18 +176,6 @@ config WIFI_NRF70_LOG_LEVEL
 	# Enable error by default
 	default 1
 
-config NRF70_ON_QSPI
-	def_bool DT_HAS_NORDIC_NRF7002_QSPI_ENABLED || \
-			 DT_HAS_NORDIC_NRF7001_QSPI_ENABLED || \
-			 DT_HAS_NORDIC_NRF7000_QSPI_ENABLED
-	select NRFX_QSPI
-
-config NRF70_ON_SPI
-	def_bool DT_HAS_NORDIC_NRF7002_SPI_ENABLED || \
-			 DT_HAS_NORDIC_NRF7001_SPI_ENABLED || \
-			 DT_HAS_NORDIC_NRF7000_SPI_ENABLED
-	select SPI
-
 config NRF70_2_4G_ONLY
 	def_bool y if WIFI_NRF7001
 

From 7f28cbb4608d673718714a7206610a8b147423c4 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 24 Dec 2024 16:30:17 +0530
Subject: [PATCH 2849/2913] [nrf fromtree] tests: boards: nrf70: Add tags

Add appropriate tags for these to be run in CI.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 1d5447d32b91ebb267a78714b91535710b1e3ef0)
---
 tests/boards/nrf/nrf70/bustest/testcase.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/boards/nrf/nrf70/bustest/testcase.yaml b/tests/boards/nrf/nrf70/bustest/testcase.yaml
index 29dc054b823..fa520202bec 100644
--- a/tests/boards/nrf/nrf70/bustest/testcase.yaml
+++ b/tests/boards/nrf/nrf70/bustest/testcase.yaml
@@ -1,3 +1,8 @@
+common:
+  build_only: true
+  tags:
+    - drivers
+    - wifi
 tests:
   nrf_wifi.bustest.nrf7002:
     sysbuild: true

From 92be5093942d75540f76163c87b53691e1c01a22 Mon Sep 17 00:00:00 2001
From: Jordan Yates <jordan@embeint.com>
Date: Mon, 20 Jan 2025 10:11:52 +1000
Subject: [PATCH 2850/2913] [nrf fromtree] west.yml: update `nrf_wifi` to
 ignore binary blobs

Update the `nrf_wifi` repository so that git ignores binary blobs
fetched by `west blobs fetch nrf_wifi`.

Signed-off-by: Jordan Yates <jordan@embeint.com>
(cherry picked from commit 1b0fe8f60abb67db26f38dcd4866f7bf3d4df0ef)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index f3b50f68131..d7e42726fc2 100644
--- a/west.yml
+++ b/west.yml
@@ -318,7 +318,7 @@ manifest:
       revision: b84bd7314a239f818e78f6927f5673247816df53
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: 68b018473527fa90237b1abad7ee2568a665bb44
+      revision: 23160ca8417e2cfebbce887f01a355483954824c
       path: modules/lib/nrf_wifi
     - name: open-amp
       revision: 52bb1783521c62c019451cee9b05b8eda9d7425f

From b0f9794262080d6c3d63f956b62307e4368c5f94 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 21 Jan 2025 17:36:19 +0530
Subject: [PATCH 2851/2913] [nrf fromtree] manfiest: nrf_wifi: Pull fix for
 NULL checks

Pull fix to add NULL checks to avoid crashes.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 8444e264ebfc61ba6ba45728878a205923eeab4c)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index d7e42726fc2..1174f227eec 100644
--- a/west.yml
+++ b/west.yml
@@ -318,7 +318,7 @@ manifest:
       revision: b84bd7314a239f818e78f6927f5673247816df53
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: 23160ca8417e2cfebbce887f01a355483954824c
+      revision: 913d9f60b9dd6b92b70169ce857570f5bf5b1e3c
       path: modules/lib/nrf_wifi
     - name: open-amp
       revision: 52bb1783521c62c019451cee9b05b8eda9d7425f

From b1cd9755c131b65b8d672bf34ffbef1db9a5568e Mon Sep 17 00:00:00 2001
From: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
Date: Thu, 6 Feb 2025 21:51:19 +0530
Subject: [PATCH 2852/2913] [nrf fromtree] drivers: nrf_wifi: Use mode specific
 data structures

Update the driver to use the updated mode specific
data structure names.

Signed-off-by: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
(cherry picked from commit 922d207c591cc16550bb4466b3060620aa000bf2)
---
 drivers/wifi/nrf_wifi/src/fmac_main.c | 12 ++---
 drivers/wifi/nrf_wifi/src/net_if.c    | 66 +++++++++++++--------------
 drivers/wifi/nrf_wifi/src/wifi_mgmt.c | 50 ++++++++++----------
 3 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/src/fmac_main.c b/drivers/wifi/nrf_wifi/src/fmac_main.c
index 341d4c15a55..eb66d8f04b7 100644
--- a/drivers/wifi/nrf_wifi/src/fmac_main.c
+++ b/drivers/wifi/nrf_wifi/src/fmac_main.c
@@ -781,18 +781,18 @@ static int nrf_wifi_drv_main_zep(const struct device *dev)
 	}
 
 #ifdef CONFIG_NRF70_DATA_TX
-	struct nrf_wifi_fmac_priv_def *def_priv = NULL;
+	struct nrf_wifi_sys_fmac_priv *sys_fpriv = NULL;
 
-	def_priv = wifi_fmac_priv(rpu_drv_priv_zep.fmac_priv);
-	def_priv->max_ampdu_len_per_token =
+	sys_fpriv = wifi_fmac_priv(rpu_drv_priv_zep.fmac_priv);
+	sys_fpriv->max_ampdu_len_per_token =
 		(RPU_PKTRAM_SIZE - (CONFIG_NRF70_RX_NUM_BUFS * CONFIG_NRF70_RX_MAX_DATA_SIZE)) /
 		CONFIG_NRF70_MAX_TX_TOKENS;
 	/* Align to 4-byte */
-	def_priv->max_ampdu_len_per_token &= ~0x3;
+	sys_fpriv->max_ampdu_len_per_token &= ~0x3;
 
 	/* Alignment overhead for size based coalesce */
-	def_priv->avail_ampdu_len_per_token =
-	def_priv->max_ampdu_len_per_token -
+	sys_fpriv->avail_ampdu_len_per_token =
+	sys_fpriv->max_ampdu_len_per_token -
 		(MAX_PKT_RAM_TX_ALIGN_OVERHEAD * max_tx_aggregation);
 #endif /* CONFIG_NRF70_DATA_TX */
 
diff --git a/drivers/wifi/nrf_wifi/src/net_if.c b/drivers/wifi/nrf_wifi/src/net_if.c
index 5c7fb9759f7..e7adeeaab79 100644
--- a/drivers/wifi/nrf_wifi/src/net_if.c
+++ b/drivers/wifi/nrf_wifi/src/net_if.c
@@ -178,7 +178,7 @@ void nrf_wifi_rpu_recovery_cb(void *vif_ctx_handle,
 {
 	struct nrf_wifi_fmac_vif_ctx *vif_ctx = vif_ctx_handle;
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
-	struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
+	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
 
 	if (!vif_ctx) {
@@ -188,9 +188,9 @@ void nrf_wifi_rpu_recovery_cb(void *vif_ctx_handle,
 	}
 
 	fmac_dev_ctx = vif_ctx->fmac_dev_ctx;
-	def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
-	if (!def_dev_ctx) {
-		LOG_ERR("%s: def_dev_ctx is NULL",
+	sys_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
+	if (!sys_dev_ctx) {
+		LOG_ERR("%s: sys_dev_ctx is NULL",
 			__func__);
 		goto out;
 	}
@@ -238,10 +238,10 @@ void nrf_wifi_if_sniffer_rx_frm(void *os_vif_ctx, void *frm,
 	struct net_pkt *pkt;
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
-	struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
+	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
 	int ret;
 
-	def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
+	sys_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
 
 	pkt = net_raw_pkt_from_nbuf(iface, frm, sizeof(struct raw_rx_pkt_header),
 				    raw_rx_hdr,
@@ -269,11 +269,11 @@ void nrf_wifi_if_rx_frm(void *os_vif_ctx, void *frm)
 	int status;
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
-	struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
+	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
 	struct rpu_host_stats *host_stats = NULL;
 
-	def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
-	host_stats = &def_dev_ctx->host_stats;
+	sys_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
+	host_stats = &sys_dev_ctx->host_stats;
 	host_stats->total_rx_pkts++;
 
 	pkt = net_pkt_from_nbuf(iface, frm);
@@ -356,7 +356,7 @@ int nrf_wifi_if_send(const struct device *dev,
 #ifdef CONFIG_NRF70_DATA_TX
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
-	struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
+	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
 	struct rpu_host_stats *host_stats = NULL;
 	void *nbuf = NULL;
 
@@ -383,8 +383,8 @@ int nrf_wifi_if_send(const struct device *dev,
 		goto unlock;
 	}
 
-	def_dev_ctx = wifi_dev_priv(rpu_ctx_zep->rpu_ctx);
-	host_stats = &def_dev_ctx->host_stats;
+	sys_dev_ctx = wifi_dev_priv(rpu_ctx_zep->rpu_ctx);
+	host_stats = &sys_dev_ctx->host_stats;
 	nbuf = net_pkt_to_nbuf(pkt);
 	if (!nbuf) {
 		LOG_DBG("Failed to allocate net_pkt");
@@ -951,7 +951,7 @@ int nrf_wifi_if_get_config_zep(const struct device *dev,
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
-	struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
+	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
 
 	if (!dev || !config) {
 		LOG_ERR("%s: Invalid parameters",
@@ -979,9 +979,9 @@ int nrf_wifi_if_get_config_zep(const struct device *dev,
 		goto unlock;
 	}
 	fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
-	def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
-	if (!def_dev_ctx) {
-		LOG_ERR("%s: def_dev_ctx is NULL",
+	sys_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
+	if (!sys_dev_ctx) {
+		LOG_ERR("%s: sys_dev_ctx is NULL",
 			__func__);
 		goto unlock;
 	}
@@ -990,7 +990,7 @@ int nrf_wifi_if_get_config_zep(const struct device *dev,
 
 	if (type == ETHERNET_CONFIG_TYPE_TXINJECTION_MODE) {
 		config->txinjection_mode =
-			def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->txinjection_mode;
+			sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->txinjection_mode;
 	}
 #ifdef CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD
 	if (type  == ETHERNET_CONFIG_TYPE_TX_CHECKSUM_SUPPORT ||
@@ -1018,7 +1018,7 @@ int nrf_wifi_if_set_config_zep(const struct device *dev,
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
-	struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
+	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
 	int ret = -1;
 
 	if (!dev) {
@@ -1067,9 +1067,9 @@ int nrf_wifi_if_set_config_zep(const struct device *dev,
 	}
 
 	fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
-	def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
-	if (!def_dev_ctx) {
-		LOG_ERR("%s: def_dev_ctx is NULL",
+	sys_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
+	if (!sys_dev_ctx) {
+		LOG_ERR("%s: sys_dev_ctx is NULL",
 			__func__);
 		goto unlock;
 	}
@@ -1078,7 +1078,7 @@ int nrf_wifi_if_set_config_zep(const struct device *dev,
 	if (type == ETHERNET_CONFIG_TYPE_TXINJECTION_MODE) {
 		unsigned char mode;
 
-		if (def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->txinjection_mode ==
+		if (sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->txinjection_mode ==
 		    config->txinjection_mode) {
 			LOG_INF("%s: Driver TX injection setting is same as configured setting",
 				__func__);
@@ -1091,10 +1091,10 @@ int nrf_wifi_if_set_config_zep(const struct device *dev,
 		 * as is
 		 */
 		if (config->txinjection_mode) {
-			mode = (def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) |
+			mode = (sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) |
 			       (NRF_WIFI_TX_INJECTION_MODE);
 		} else {
-			mode = (def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) ^
+			mode = (sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) ^
 			       (NRF_WIFI_TX_INJECTION_MODE);
 		}
 
@@ -1111,7 +1111,7 @@ int nrf_wifi_if_set_config_zep(const struct device *dev,
 	else if (type == ETHERNET_CONFIG_TYPE_PROMISC_MODE) {
 		unsigned char mode;
 
-		if (def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->promisc_mode ==
+		if (sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->promisc_mode ==
 		    config->promisc_mode) {
 			LOG_ERR("%s: Driver promisc mode setting is same as configured setting",
 				__func__);
@@ -1119,10 +1119,10 @@ int nrf_wifi_if_set_config_zep(const struct device *dev,
 		}
 
 		if (config->promisc_mode) {
-			mode = (def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) |
+			mode = (sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) |
 			       (NRF_WIFI_PROMISCUOUS_MODE);
 		} else {
-			mode = (def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) ^
+			mode = (sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) ^
 			       (NRF_WIFI_PROMISCUOUS_MODE);
 		}
 
@@ -1171,7 +1171,7 @@ int nrf_wifi_stats_get(const struct device *dev, struct net_stats_wifi *zstats)
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
 #ifdef CONFIG_NRF70_RAW_DATA_TX
-	struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
+	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
 #endif /* CONFIG_NRF70_RAW_DATA_TX */
 	struct rpu_op_stats stats;
 	int ret = -1;
@@ -1229,8 +1229,8 @@ int nrf_wifi_stats_get(const struct device *dev, struct net_stats_wifi *zstats)
 	zstats->overrun_count = stats.host.total_tx_drop_pkts + stats.host.total_rx_drop_pkts;
 
 #ifdef CONFIG_NRF70_RAW_DATA_TX
-	def_dev_ctx = wifi_dev_priv(rpu_ctx_zep->rpu_ctx);
-	zstats->errors.tx += def_dev_ctx->raw_pkt_stats.raw_pkt_send_failure;
+	sys_dev_ctx = wifi_dev_priv(rpu_ctx_zep->rpu_ctx);
+	zstats->errors.tx += sys_dev_ctx->raw_pkt_stats.raw_pkt_send_failure;
 #endif /* CONFIG_NRF70_RAW_DATA_TX */
 	ret = 0;
 unlock:
@@ -1244,7 +1244,7 @@ int nrf_wifi_stats_reset(const struct device *dev)
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
-	struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
+	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
 	int ret = -1;
 
 	if (!dev) {
@@ -1277,8 +1277,8 @@ int nrf_wifi_stats_reset(const struct device *dev)
 		goto unlock;
 	}
 
-	def_dev_ctx = wifi_dev_priv(rpu_ctx_zep->rpu_ctx);
-	memset(&def_dev_ctx->host_stats, 0, sizeof(struct rpu_host_stats));
+	sys_dev_ctx = wifi_dev_priv(rpu_ctx_zep->rpu_ctx);
+	memset(&sys_dev_ctx->host_stats, 0, sizeof(struct rpu_host_stats));
 
 	ret = 0;
 unlock:
diff --git a/drivers/wifi/nrf_wifi/src/wifi_mgmt.c b/drivers/wifi/nrf_wifi/src/wifi_mgmt.c
index 9591ccf772e..bdc69a00118 100644
--- a/drivers/wifi/nrf_wifi/src/wifi_mgmt.c
+++ b/drivers/wifi/nrf_wifi/src/wifi_mgmt.c
@@ -682,8 +682,8 @@ void nrf_wifi_event_proc_twt_sleep_zep(void *vif_ctx,
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
-	struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
-	struct nrf_wifi_fmac_priv_def *def_priv = NULL;
+	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
+	struct nrf_wifi_sys_fmac_priv *sys_fpriv = NULL;
 #ifdef CONFIG_NRF70_DATA_TX
 	int desc = 0;
 	int ac = 0;
@@ -708,8 +708,8 @@ void nrf_wifi_event_proc_twt_sleep_zep(void *vif_ctx,
 	}
 
 	fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
-	def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
-	def_priv = wifi_fmac_priv(fmac_dev_ctx->fpriv);
+	sys_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
+	sys_fpriv = wifi_fmac_priv(fmac_dev_ctx->fpriv);
 
 	if (!sleep_evnt) {
 		LOG_ERR("%s: sleep_evnt is NULL", __func__);
@@ -718,29 +718,29 @@ void nrf_wifi_event_proc_twt_sleep_zep(void *vif_ctx,
 
 	switch (sleep_evnt->info.type) {
 	case TWT_BLOCK_TX:
-		nrf_wifi_osal_spinlock_take(def_dev_ctx->tx_config.tx_lock);
+		nrf_wifi_osal_spinlock_take(sys_dev_ctx->tx_config.tx_lock);
 
-		def_dev_ctx->twt_sleep_status = NRF_WIFI_FMAC_TWT_STATE_SLEEP;
+		sys_dev_ctx->twt_sleep_status = NRF_WIFI_FMAC_TWT_STATE_SLEEP;
 
 		wifi_mgmt_raise_twt_sleep_state(vif_ctx_zep->zep_net_if_ctx,
 						WIFI_TWT_STATE_SLEEP);
-		nrf_wifi_osal_spinlock_rel(def_dev_ctx->tx_config.tx_lock);
+		nrf_wifi_osal_spinlock_rel(sys_dev_ctx->tx_config.tx_lock);
 	break;
 	case TWT_UNBLOCK_TX:
-		nrf_wifi_osal_spinlock_take(def_dev_ctx->tx_config.tx_lock);
-		def_dev_ctx->twt_sleep_status = NRF_WIFI_FMAC_TWT_STATE_AWAKE;
+		nrf_wifi_osal_spinlock_take(sys_dev_ctx->tx_config.tx_lock);
+		sys_dev_ctx->twt_sleep_status = NRF_WIFI_FMAC_TWT_STATE_AWAKE;
 		wifi_mgmt_raise_twt_sleep_state(vif_ctx_zep->zep_net_if_ctx,
 						WIFI_TWT_STATE_AWAKE);
 #ifdef CONFIG_NRF70_DATA_TX
 		for (ac = NRF_WIFI_FMAC_AC_BE;
 		     ac <= NRF_WIFI_FMAC_AC_MAX; ++ac) {
 			desc = tx_desc_get(fmac_dev_ctx, ac);
-			if (desc < def_priv->num_tx_tokens) {
+			if (desc < sys_fpriv->num_tx_tokens) {
 				tx_pending_process(fmac_dev_ctx, desc, ac);
 			}
 		}
 #endif
-		nrf_wifi_osal_spinlock_rel(def_dev_ctx->tx_config.tx_lock);
+		nrf_wifi_osal_spinlock_rel(sys_dev_ctx->tx_config.tx_lock);
 	break;
 	default:
 	break;
@@ -757,7 +757,7 @@ int nrf_wifi_mode(const struct device *dev,
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
-	struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
+	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
 	int ret = -1;
 
 	if (!dev || !mode) {
@@ -784,7 +784,7 @@ int nrf_wifi_mode(const struct device *dev,
 	}
 
 	fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
-	def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
+	sys_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
 
 	if (!device_is_ready(dev)) {
 		LOG_ERR("%s: Device %s is not ready",
@@ -819,18 +819,18 @@ int nrf_wifi_mode(const struct device *dev,
 		}
 
 	} else {
-		mode->mode = def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode;
+		mode->mode = sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode;
 		/**
 		 * This is a work-around to handle current UMAC mode handling.
 		 * This might be removed in future versions when UMAC has more space.
 		 */
 #ifdef CONFIG_NRF70_RAW_DATA_TX
-		if (def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->txinjection_mode == true) {
+		if (sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->txinjection_mode == true) {
 			mode->mode ^= NRF_WIFI_TX_INJECTION_MODE;
 		}
 #endif /* CONFIG_NRF70_RAW_DATA_TX */
 #ifdef CONFIG_NRF70_PROMISC_DATA_RX
-		if (def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->promisc_mode == true) {
+		if (sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->promisc_mode == true) {
 			mode->mode ^= NRF_WIFI_PROMISCUOUS_MODE;
 		}
 #endif /* CONFIG_NRF70_PROMISC_DATA_RX */
@@ -849,7 +849,7 @@ int nrf_wifi_channel(const struct device *dev,
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
-	struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
+	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
 	int ret = -1;
 
@@ -882,7 +882,7 @@ int nrf_wifi_channel(const struct device *dev,
 	}
 
 	fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
-	def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
+	sys_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
 
 	if (channel->oper == WIFI_MGMT_SET) {
 		/**
@@ -899,7 +899,7 @@ int nrf_wifi_channel(const struct device *dev,
 			goto out;
 		}
 	} else {
-		channel->channel = def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->channel;
+		channel->channel = sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->channel;
 	}
 	ret = 0;
 out:
@@ -916,7 +916,7 @@ int nrf_wifi_filter(const struct device *dev,
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
-	struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
+	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
 	int ret = -1;
 
 	if (!dev || !filter) {
@@ -932,7 +932,7 @@ int nrf_wifi_filter(const struct device *dev,
 
 	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
 	fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
-	def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
+	sys_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
 
 	if (filter->oper == WIFI_MGMT_SET) {
 		/**
@@ -942,9 +942,9 @@ int nrf_wifi_filter(const struct device *dev,
 		 * driver and filter packet type on packet receive by
 		 * checking the 802.11 header in the packet
 		 */
-		if (((def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) &
+		if (((sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) &
 		    (NRF_WIFI_PROMISCUOUS_MODE)) == NRF_WIFI_PROMISCUOUS_MODE) {
-			def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->packet_filter =
+			sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->packet_filter =
 				filter->filter;
 			ret = 0;
 			goto out;
@@ -963,7 +963,7 @@ int nrf_wifi_filter(const struct device *dev,
 			filter->filter = 1;
 		} else if (filter->filter == 0) {
 			filter->filter =
-				def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->packet_filter;
+				sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->packet_filter;
 		}
 
 		/**
@@ -979,7 +979,7 @@ int nrf_wifi_filter(const struct device *dev,
 			goto out;
 		}
 	} else {
-		filter->filter = def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->packet_filter;
+		filter->filter = sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->packet_filter;
 	}
 	ret = 0;
 out:

From ef6030c375c79bd46ddfbe10a5ec93a8ad61dd1d Mon Sep 17 00:00:00 2001
From: Jordan Yates <jordan@embeint.com>
Date: Wed, 22 Jan 2025 11:04:55 +1000
Subject: [PATCH 2853/2913] [nrf fromtree] wifi: nrf_wifi: extract
 `NRF70_SYSTEM_WITH_RAW_MODES`

`NRF70_SYSTEM_WITH_RAW_MODES` is more accurately described as an
additional option on top of `NRF70_SYSTEM_MODE`, not as a unique
choice of `NRF70_OPER_MODES`.

This allows the elimination of multiple `NRF70_SYSTEM_MODE ||
NRF70_SYSTEM_WITH_RAW_MODES` dependencies.

Signed-off-by: Jordan Yates <jordan@embeint.com>
(cherry picked from commit d95de82b94f9506d3610fb0d3f2fea07d5a597d8)
---
 drivers/wifi/nrf_wifi/CMakeLists.txt  |  8 +++++---
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi | 17 ++++++++---------
 drivers/wifi/nrf_wifi/src/fmac_main.c |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
index 569df43ebd0..e4a65bb801d 100644
--- a/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -79,13 +79,15 @@ if (CONFIG_NRF_WIFI_PATCHES_BUILTIN)
   zephyr_blobs_verify(MODULE nrf_wifi REQUIRED)
   # RPU FW patch binaries based on the selected configuration
   if(CONFIG_NRF70_SYSTEM_MODE)
-    set(NRF70_PATCH ${FW_BINS_BASE}/default/nrf70.bin)
+    if (CONFIG_NRF70_SYSTEM_WITH_RAW_MODES)
+      set(NRF70_PATCH ${FW_BINS_BASE}/system_with_raw/nrf70.bin)
+    else()
+      set(NRF70_PATCH ${FW_BINS_BASE}/default/nrf70.bin)
+    endif()
   elseif(CONFIG_NRF70_RADIO_TEST)
     set(NRF70_PATCH ${FW_BINS_BASE}/radio_test/nrf70.bin)
   elseif(CONFIG_NRF70_SCAN_ONLY)
     set(NRF70_PATCH ${FW_BINS_BASE}/scan_only/nrf70.bin)
-  elseif (CONFIG_NRF70_SYSTEM_WITH_RAW_MODES)
-    set(NRF70_PATCH ${FW_BINS_BASE}/system_with_raw/nrf70.bin)
   elseif(CONFIG_NRF70_OFFLOADED_RAW_TX)
     set(NRF70_PATCH ${FW_BINS_BASE}/offloaded_raw_tx/nrf70.bin)
   else()
diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index d796f23af1c..87d5bf68aec 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -40,8 +40,6 @@ config NRF70_QSPI_LOW_POWER
 
 choice NRF70_OPER_MODES
 	bool "nRF70 operating modes"
-	default NRF70_SYSTEM_WITH_RAW_MODES if !WIFI_NRF7000 && \
-		(NRF70_RAW_DATA_TX || NRF70_RAW_DATA_RX || NRF70_PROMISC_DATA_RX)
 	default NRF70_SYSTEM_MODE if !WIFI_NRF7000
 	default NRF70_SCAN_ONLY if WIFI_NRF7000
 	help
@@ -65,17 +63,18 @@ config NRF70_RADIO_TEST
 config NRF70_OFFLOADED_RAW_TX
 	bool "Offloaded raw TX mode of the nRF70 driver"
 
+endchoice
+
 config NRF70_SYSTEM_WITH_RAW_MODES
 	bool "nRF70 system mode with raw modes"
-	depends on WIFI_NRF7002 || WIFI_NRF7001
-	select WIFI_NM_WPA_SUPPLICANT
+	depends on NRF70_SYSTEM_MODE
+	default y if (NRF70_RAW_DATA_TX || NRF70_RAW_DATA_RX || NRF70_PROMISC_DATA_RX)
 	help
 	  Select this option to enable system mode of the nRF70 driver with raw modes.
-endchoice
 
 config NRF70_SYSTEM_MODE_COMMON
 	bool
-	default y if NRF70_SYSTEM_MODE || NRF70_SYSTEM_WITH_RAW_MODES
+	default y if NRF70_SYSTEM_MODE
 
 config NET_L2_ETHERNET
 	default y if (!NRF70_RADIO_TEST && !NRF70_OFFLOADED_RAW_TX)
@@ -86,7 +85,7 @@ config HEAP_MEM_POOL_ADD_SIZE_NRF70
 	def_int 25000 if NRF70_SCAN_ONLY
 	def_int 150000
 
-if NRF70_SYSTEM_MODE || NRF70_SYSTEM_WITH_RAW_MODES
+if NRF70_SYSTEM_MODE
 config NRF70_STA_MODE
 	bool "nRF70 STA mode"
 	default y
@@ -100,7 +99,7 @@ config NRF70_AP_MODE
 
 config NRF70_P2P_MODE
 	bool "P2P support in driver"
-endif # NRF70_SYSTEM_MODE || NRF70_SYSTEM_WITH_RAW_MODES
+endif # NRF70_SYSTEM_MODE
 
 config NRF70_RAW_DATA_TX
 	bool "RAW TX data path in the driver"
@@ -118,7 +117,7 @@ config NRF70_PROMISC_DATA_RX
 
 config NRF70_DATA_TX
 	bool "TX data path in the driver"
-	default y if NRF70_SYSTEM_MODE || NRF70_SYSTEM_WITH_RAW_MODES
+	default y if NRF70_SYSTEM_MODE
 
 config NRF_WIFI_IF_AUTO_START
 	bool "Wi-Fi interface auto start on boot"
diff --git a/drivers/wifi/nrf_wifi/src/fmac_main.c b/drivers/wifi/nrf_wifi/src/fmac_main.c
index eb66d8f04b7..5347d8a2c0a 100644
--- a/drivers/wifi/nrf_wifi/src/fmac_main.c
+++ b/drivers/wifi/nrf_wifi/src/fmac_main.c
@@ -730,7 +730,7 @@ static int nrf_wifi_drv_main_zep(const struct device *dev)
 #ifdef CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS
 	callbk_fns.rx_bcn_prb_resp_callbk_fn = nrf_wifi_rx_bcn_prb_resp_frm;
 #endif /* CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS */
-#if defined(CONFIG_NRF70_SYSTEM_MODE) || defined(CONFIG_NRF70_SYSTEM_WITH_RAW_MODES)
+#ifdef CONFIG_NRF70_SYSTEM_MODE
 	callbk_fns.set_if_callbk_fn = nrf_wifi_set_iface_event_handler;
 #endif /* CONFIG_NRF70_SYSTEM_MODE */
 #ifdef CONFIG_NRF70_STA_MODE

From cbc79e51ffa41a6e413b6ef1ce4038c6090052e2 Mon Sep 17 00:00:00 2001
From: Jordan Yates <jordan@embeint.com>
Date: Wed, 22 Jan 2025 18:21:35 +1000
Subject: [PATCH 2854/2913] [nrf fromtree] wifi: nrf_wifi: eliminate
 `NRF70_SYSTEM_MODE_COMMON`

This symbol now has the same meaning as `NRF70_SYSTEM_MODE`.

Signed-off-by: Jordan Yates <jordan@embeint.com>
(cherry picked from commit 2e711aaf81595e8f1c6da3ac083c8b9b5edd3c44)
---
 drivers/wifi/nrf_wifi/CMakeLists.txt  | 2 +-
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
index e4a65bb801d..41a06e912f8 100644
--- a/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -41,7 +41,7 @@ zephyr_library_sources_ifdef(CONFIG_NET_L2_WIFI_MGMT
   src/wifi_mgmt_scan.c
 )
 
-zephyr_library_sources_ifdef(CONFIG_NRF70_SYSTEM_MODE_COMMON
+zephyr_library_sources_ifdef(CONFIG_NRF70_SYSTEM_MODE
   src/wifi_mgmt.c
 )
 
diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index 87d5bf68aec..4cc1a5aab7e 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -72,10 +72,6 @@ config NRF70_SYSTEM_WITH_RAW_MODES
 	help
 	  Select this option to enable system mode of the nRF70 driver with raw modes.
 
-config NRF70_SYSTEM_MODE_COMMON
-	bool
-	default y if NRF70_SYSTEM_MODE
-
 config NET_L2_ETHERNET
 	default y if (!NRF70_RADIO_TEST && !NRF70_OFFLOADED_RAW_TX)
 

From f0e3e97d24b3d61baa5c8e1aca9dd8bebc93bf75 Mon Sep 17 00:00:00 2001
From: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
Date: Thu, 6 Feb 2025 21:52:06 +0530
Subject: [PATCH 2855/2913] [nrf fromtree] drivers: nrf_wifi: Use mode specific
 APIs

Update the nrf70 Wi-Fi driver to use the mode specific
APIs (as a precursor to enable combining modes as required).

Signed-off-by: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
(cherry picked from commit a6dfdb9b8cb1b7f58dbd01727f4a27c169a37496)
---
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi         |  37 +++---
 drivers/wifi/nrf_wifi/inc/fmac_main.h         |   4 +-
 drivers/wifi/nrf_wifi/inc/net_if.h            |   2 +-
 .../wifi/nrf_wifi/off_raw_tx/inc/off_raw_tx.h |   2 +-
 .../nrf_wifi/off_raw_tx/src/off_raw_tx_api.c  |  30 ++---
 drivers/wifi/nrf_wifi/src/fmac_main.c         |  42 ++++---
 drivers/wifi/nrf_wifi/src/net_if.c            |  47 ++++---
 drivers/wifi/nrf_wifi/src/wifi_mgmt.c         |  44 ++++---
 drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c    |  12 +-
 drivers/wifi/nrf_wifi/src/wifi_util.c         |  40 +++---
 drivers/wifi/nrf_wifi/src/wifi_util.h         |   2 +-
 drivers/wifi/nrf_wifi/src/wpa_supp_if.c       | 117 ++++++++++--------
 .../wifi/nrf_wifi/off_raw_tx/off_raw_tx_api.h |   1 -
 west.yml                                      |   2 +-
 14 files changed, 201 insertions(+), 181 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index 4cc1a5aab7e..d78c11a86e4 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -45,18 +45,16 @@ choice NRF70_OPER_MODES
 	help
 	  Select the operating mode of the nRF70 driver
 
-config NRF70_SYSTEM_MODE
-	bool "nRF70 system mode"
-	depends on WIFI_NRF7002 || WIFI_NRF7001
-	select WIFI_NM_WPA_SUPPLICANT
-	help
-	  Select this option to enable system mode of the nRF70 driver
-
 config NRF70_SCAN_ONLY
 	bool "nRF70 scan only mode"
 	help
 	  Select this option to enable scan only mode of the nRF70 driver
 
+config NRF70_SYSTEM_MODE
+	bool "System mode of the nRF70 driver"
+	help
+	  Select this option to enable system mode of the nRF70 driver
+
 config NRF70_RADIO_TEST
 	bool "Radio test mode of the nRF70 driver"
 
@@ -65,13 +63,6 @@ config NRF70_OFFLOADED_RAW_TX
 
 endchoice
 
-config NRF70_SYSTEM_WITH_RAW_MODES
-	bool "nRF70 system mode with raw modes"
-	depends on NRF70_SYSTEM_MODE
-	default y if (NRF70_RAW_DATA_TX || NRF70_RAW_DATA_RX || NRF70_PROMISC_DATA_RX)
-	help
-	  Select this option to enable system mode of the nRF70 driver with raw modes.
-
 config NET_L2_ETHERNET
 	default y if (!NRF70_RADIO_TEST && !NRF70_OFFLOADED_RAW_TX)
 
@@ -85,17 +76,27 @@ if NRF70_SYSTEM_MODE
 config NRF70_STA_MODE
 	bool "nRF70 STA mode"
 	default y
+	depends on WIFI_NRF7002 || WIFI_NRF7001
+	select WIFI_NM_WPA_SUPPLICANT
+	select NRF70_DATA_TX
 	help
 	  Select this option to enable STA mode of the nRF70 driver.
-
 config NRF70_AP_MODE
 	bool "Access point mode"
+	depends on WIFI_NRF7002 || WIFI_NRF7001
+	select NRF70_DATA_TX
 	depends on WIFI_NM_WPA_SUPPLICANT_AP
 	default y if WIFI_NM_WPA_SUPPLICANT_AP
 
 config NRF70_P2P_MODE
 	bool "P2P support in driver"
-endif # NRF70_SYSTEM_MODE
+
+config NRF70_SYSTEM_WITH_RAW_MODES
+	bool
+	default y if (NRF70_RAW_DATA_TX || NRF70_RAW_DATA_RX || NRF70_PROMISC_DATA_RX)
+	depends on WIFI_NRF7002 || WIFI_NRF7001
+	help
+	  Select this option to enable system mode of the nRF70 driver with raw modes.
 
 config NRF70_RAW_DATA_TX
 	bool "RAW TX data path in the driver"
@@ -112,8 +113,8 @@ config NRF70_PROMISC_DATA_RX
 	select NET_PROMISCUOUS_MODE
 
 config NRF70_DATA_TX
-	bool "TX data path in the driver"
-	default y if NRF70_SYSTEM_MODE
+	bool
+endif # NRF70_SYSTEM_MODE
 
 config NRF_WIFI_IF_AUTO_START
 	bool "Wi-Fi interface auto start on boot"
diff --git a/drivers/wifi/nrf_wifi/inc/fmac_main.h b/drivers/wifi/nrf_wifi/inc/fmac_main.h
index 4c0b0e4daf5..0d37a2f2371 100644
--- a/drivers/wifi/nrf_wifi/inc/fmac_main.h
+++ b/drivers/wifi/nrf_wifi/inc/fmac_main.h
@@ -27,9 +27,11 @@
 #ifdef CONFIG_NRF70_STA_MODE
 #include <drivers/driver_zephyr.h>
 #endif /* CONFIG_NRF70_STA_MODE */
+#include <system/fmac_api.h>
+#else
+#include <radio_test/fmac_api.h>
 #endif /* !CONFIG_NRF70_RADIO_TEST */
 
-#include <fmac_api.h>
 #include <host_rpu_umac_if.h>
 
 #define NRF70_DRIVER_VERSION "1."KERNEL_VERSION_STRING
diff --git a/drivers/wifi/nrf_wifi/inc/net_if.h b/drivers/wifi/nrf_wifi/inc/net_if.h
index 8d97802ba65..315740ac5d9 100644
--- a/drivers/wifi/nrf_wifi/inc/net_if.h
+++ b/drivers/wifi/nrf_wifi/inc/net_if.h
@@ -15,8 +15,8 @@
 #include <zephyr/net/net_pkt.h>
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/ethernet.h>
-#include <fmac_structs.h>
 #include <zephyr/net/wifi_mgmt.h>
+#include <system/fmac_structs.h>
 
 #define UNICAST_MASK GENMASK(7, 1)
 #define LOCAL_BIT BIT(1)
diff --git a/drivers/wifi/nrf_wifi/off_raw_tx/inc/off_raw_tx.h b/drivers/wifi/nrf_wifi/off_raw_tx/inc/off_raw_tx.h
index 1cb6e258462..68c31f24e4f 100644
--- a/drivers/wifi/nrf_wifi/off_raw_tx/inc/off_raw_tx.h
+++ b/drivers/wifi/nrf_wifi/off_raw_tx/inc/off_raw_tx.h
@@ -8,7 +8,7 @@
  * @brief File containing internal structures for the offloaded raw TX feature in the driver.
  */
 
-#include "fmac_structs_common.h"
+#include "offload_raw_tx/fmac_structs.h"
 #include "osal_api.h"
 
 struct nrf_wifi_ctx_zep {
diff --git a/drivers/wifi/nrf_wifi/off_raw_tx/src/off_raw_tx_api.c b/drivers/wifi/nrf_wifi/off_raw_tx/src/off_raw_tx_api.c
index b714b902eeb..17825511787 100644
--- a/drivers/wifi/nrf_wifi/off_raw_tx/src/off_raw_tx_api.c
+++ b/drivers/wifi/nrf_wifi/off_raw_tx/src/off_raw_tx_api.c
@@ -14,7 +14,7 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/drivers/wifi/nrf_wifi/off_raw_tx/off_raw_tx_api.h>
 #include <off_raw_tx.h>
-#include <fmac_api.h>
+#include <offload_raw_tx/fmac_api.h>
 
 #define DT_DRV_COMPAT nordic_wlan
 LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
@@ -146,7 +146,7 @@ int nrf70_off_raw_tx_init(uint8_t *mac_addr, unsigned char *country_code)
 
 	key = k_spin_lock(&off_raw_tx_drv_priv.lock);
 
-	off_raw_tx_drv_priv.fmac_priv = nrf_wifi_fmac_off_raw_tx_init();
+	off_raw_tx_drv_priv.fmac_priv = nrf_wifi_off_raw_tx_fmac_init();
 
 	if (off_raw_tx_drv_priv.fmac_priv == NULL) {
 		LOG_ERR("%s: Failed to initialize nRF70 driver",
@@ -158,8 +158,8 @@ int nrf70_off_raw_tx_init(uint8_t *mac_addr, unsigned char *country_code)
 
 	rpu_ctx_zep->drv_priv_zep = &off_raw_tx_drv_priv;
 
-	rpu_ctx = nrf_wifi_fmac_dev_add(off_raw_tx_drv_priv.fmac_priv,
-					rpu_ctx_zep);
+	rpu_ctx = nrf_wifi_off_raw_tx_fmac_dev_add(off_raw_tx_drv_priv.fmac_priv,
+						   rpu_ctx_zep);
 	if (!rpu_ctx) {
 		LOG_ERR("%s: Failed to add nRF70 device", __func__);
 		rpu_ctx_zep = NULL;
@@ -197,7 +197,7 @@ int nrf70_off_raw_tx_init(uint8_t *mac_addr, unsigned char *country_code)
 
 	configure_board_dep_params(&board_params);
 
-	status = nrf_wifi_fmac_off_raw_tx_dev_init(rpu_ctx_zep->rpu_ctx,
+	status = nrf_wifi_off_raw_tx_fmac_dev_init(rpu_ctx_zep->rpu_ctx,
 #ifdef CONFIG_NRF_WIFI_LOW_POWER
 						   HW_SLEEP_ENABLE,
 #endif /* CONFIG_NRF_WIFI_LOW_POWER */
@@ -257,7 +257,7 @@ int nrf70_off_raw_tx_init(uint8_t *mac_addr, unsigned char *country_code)
 	return 0;
 err:
 	if (rpu_ctx) {
-		nrf_wifi_fmac_off_raw_tx_dev_rem(rpu_ctx);
+		nrf_wifi_fmac_dev_rem(rpu_ctx);
 		rpu_ctx_zep->rpu_ctx = NULL;
 	}
 
@@ -278,7 +278,7 @@ void nrf70_off_raw_tx_deinit(void)
 		return;
 	}
 
-	nrf_wifi_fmac_off_raw_tx_deinit(off_raw_tx_drv_priv.fmac_priv);
+	nrf_wifi_fmac_deinit(off_raw_tx_drv_priv.fmac_priv);
 
 	k_spin_unlock(&off_raw_tx_drv_priv.lock, key);
 }
@@ -361,7 +361,7 @@ int nrf70_off_raw_tx_conf_update(struct nrf_wifi_off_raw_tx_conf *conf)
 		goto out;
 	}
 
-	status = nrf_wifi_fmac_off_raw_tx_conf(fmac_dev_ctx,
+	status = nrf_wifi_off_raw_tx_fmac_conf(fmac_dev_ctx,
 					       off_ctrl_params,
 					       off_tx_params);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
@@ -398,7 +398,7 @@ int nrf70_off_raw_tx_start(struct nrf_wifi_off_raw_tx_conf *conf)
 		goto out;
 	}
 
-	status = nrf_wifi_fmac_off_raw_tx_start(off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx);
+	status = nrf_wifi_off_raw_tx_fmac_start(off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nRF70 offloaded raw TX start failed",
 				      __func__);
@@ -425,7 +425,7 @@ int nrf70_off_raw_tx_stop(void)
 		goto out;
 	}
 
-	status = nrf_wifi_fmac_off_raw_tx_stop(off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx);
+	status = nrf_wifi_off_raw_tx_fmac_stop(off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nRF70 offloaded raw TX stop failed",
 				      __func__);
@@ -454,10 +454,10 @@ int nrf70_off_raw_tx_stats(struct nrf_wifi_off_raw_tx_stats *off_raw_tx_stats)
 {
 	int ret = -1;
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
-	struct rpu_op_stats stats;
+	struct rpu_off_raw_tx_op_stats stats;
 	k_spinlock_key_t key;
 
-	memset(&stats, 0, sizeof(struct rpu_op_stats));
+	memset(&stats, 0, sizeof(stats));
 
 	key = k_spin_lock(&off_raw_tx_drv_priv.lock);
 
@@ -466,14 +466,16 @@ int nrf70_off_raw_tx_stats(struct nrf_wifi_off_raw_tx_stats *off_raw_tx_stats)
 		goto out;
 	}
 
-	status = nrf_wifi_fmac_stats_get(off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx, 0, &stats);
+	status = nrf_wifi_off_raw_tx_fmac_stats_get(off_raw_tx_drv_priv.rpu_ctx_zep.rpu_ctx,
+						    0,
+						    &stats);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nRF70 offloaded raw TX stats failed",
 				      __func__);
 		goto out;
 	}
 
-	off_raw_tx_stats->off_raw_tx_pkt_sent = stats.fw.offloaded_raw_tx.offload_raw_tx_cnt;
+	off_raw_tx_stats->off_raw_tx_pkt_sent = stats.fw.offload_raw_tx_cnt;
 
 	ret = 0;
 out:
diff --git a/drivers/wifi/nrf_wifi/src/fmac_main.c b/drivers/wifi/nrf_wifi/src/fmac_main.c
index 5347d8a2c0a..52b57f53b37 100644
--- a/drivers/wifi/nrf_wifi/src/fmac_main.c
+++ b/drivers/wifi/nrf_wifi/src/fmac_main.c
@@ -23,8 +23,7 @@
 
 
 #include <util.h>
-#include <fmac_api.h>
-#include "fmac_util.h"
+#include "common/fmac_util.h"
 #include <fmac_main.h>
 
 #ifndef CONFIG_NRF70_RADIO_TEST
@@ -37,8 +36,11 @@
 #include <wifi_mgmt.h>
 #include <wifi_mgmt_scan.h>
 #endif /* CONFIG_NRF70_STA_MODE */
-#include <zephyr/net/conn_mgr_connectivity.h>
 
+#include <system/fmac_api.h>
+#include <zephyr/net/conn_mgr_connectivity.h>
+#else
+#include <radio_test/fmac_api.h>
 #endif /* !CONFIG_NRF70_RADIO_TEST */
 
 #define DT_DRV_COMPAT nordic_wlan
@@ -582,7 +584,11 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv
 
 	rpu_ctx_zep->drv_priv_zep = drv_priv_zep;
 
-	rpu_ctx = nrf_wifi_fmac_dev_add(drv_priv_zep->fmac_priv, rpu_ctx_zep);
+#ifdef CONFIG_NRF70_RADIO_TEST
+	rpu_ctx = nrf_wifi_rt_fmac_dev_add(drv_priv_zep->fmac_priv, rpu_ctx_zep);
+#else
+	rpu_ctx = nrf_wifi_sys_fmac_dev_add(drv_priv_zep->fmac_priv, rpu_ctx_zep);
+#endif /* CONFIG_NRF70_RADIO_TEST */
 
 	if (!rpu_ctx) {
 		LOG_ERR("%s: nrf_wifi_fmac_dev_add failed", __func__);
@@ -618,7 +624,7 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv
 	configure_board_dep_params(&board_params);
 
 #ifdef CONFIG_NRF70_RADIO_TEST
-	status = nrf_wifi_fmac_dev_init_rt(rpu_ctx_zep->rpu_ctx,
+	status = nrf_wifi_rt_fmac_dev_init(rpu_ctx_zep->rpu_ctx,
 #ifdef CONFIG_NRF_WIFI_LOW_POWER
 					sleep_type,
 #endif /* CONFIG_NRF_WIFI_LOW_POWER */
@@ -630,7 +636,7 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv
 					&board_params,
 					STRINGIFY(CONFIG_NRF70_REG_DOMAIN));
 #else
-	status = nrf_wifi_fmac_dev_init(rpu_ctx_zep->rpu_ctx,
+	status = nrf_wifi_sys_fmac_dev_init(rpu_ctx_zep->rpu_ctx,
 #ifdef CONFIG_NRF_WIFI_LOW_POWER
 					sleep_type,
 #endif /* CONFIG_NRF_WIFI_LOW_POWER */
@@ -645,18 +651,14 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv
 
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_dev_init failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_dev_init failed", __func__);
 		goto err;
 	}
 
 	return status;
 err:
 	if (rpu_ctx) {
-#ifdef CONFIG_NRF70_RADIO_TEST
-		nrf_wifi_fmac_dev_rem_rt(rpu_ctx);
-#else
 		nrf_wifi_fmac_dev_rem(rpu_ctx);
-#endif /* CONFIG_NRF70_RADIO_TEST */
 		rpu_ctx_zep->rpu_ctx = NULL;
 	}
 	return status;
@@ -668,13 +670,13 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_rem_zep(struct nrf_wifi_drv_priv_zep *drv
 
 	rpu_ctx_zep = &drv_priv_zep->rpu_ctx_zep;
 #ifdef CONFIG_NRF70_RADIO_TEST
-	nrf_wifi_fmac_dev_deinit_rt(rpu_ctx_zep->rpu_ctx);
-	nrf_wifi_fmac_dev_rem_rt(rpu_ctx_zep->rpu_ctx);
+	nrf_wifi_rt_fmac_dev_deinit(rpu_ctx_zep->rpu_ctx);
 #else
-	nrf_wifi_fmac_dev_deinit(rpu_ctx_zep->rpu_ctx);
-	nrf_wifi_fmac_dev_rem(rpu_ctx_zep->rpu_ctx);
+	nrf_wifi_sys_fmac_dev_deinit(rpu_ctx_zep->rpu_ctx);
 #endif /* CONFIG_NRF70_RADIO_TEST */
 
+	nrf_wifi_fmac_dev_rem(rpu_ctx_zep->rpu_ctx);
+
 	k_free(rpu_ctx_zep->extended_capa);
 	rpu_ctx_zep->extended_capa = NULL;
 	k_free(rpu_ctx_zep->extended_capa_mask);
@@ -760,9 +762,9 @@ static int nrf_wifi_drv_main_zep(const struct device *dev)
 	 */
 	nrf_wifi_osal_init(&nrf_wifi_os_zep_ops);
 
-	rpu_drv_priv_zep.fmac_priv = nrf_wifi_fmac_init(&data_config,
-							rx_buf_pools,
-							&callbk_fns);
+	rpu_drv_priv_zep.fmac_priv = nrf_wifi_sys_fmac_init(&data_config,
+							    rx_buf_pools,
+							    &callbk_fns);
 #else /* !CONFIG_NRF70_RADIO_TEST */
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
 
@@ -771,7 +773,7 @@ static int nrf_wifi_drv_main_zep(const struct device *dev)
 	 */
 	nrf_wifi_osal_init(&nrf_wifi_os_zep_ops);
 
-	rpu_drv_priv_zep.fmac_priv = nrf_wifi_fmac_init_rt();
+	rpu_drv_priv_zep.fmac_priv = nrf_wifi_rt_fmac_init();
 #endif /* CONFIG_NRF70_RADIO_TEST */
 
 	if (rpu_drv_priv_zep.fmac_priv == NULL) {
@@ -811,7 +813,7 @@ static int nrf_wifi_drv_main_zep(const struct device *dev)
 	return 0;
 #ifdef CONFIG_NRF70_RADIO_TEST
 fmac_deinit:
-	nrf_wifi_fmac_deinit_rt(rpu_drv_priv_zep.fmac_priv);
+	nrf_wifi_fmac_deinit(rpu_drv_priv_zep.fmac_priv);
 	nrf_wifi_osal_deinit();
 #endif /* CONFIG_NRF70_RADIO_TEST */
 err:
diff --git a/drivers/wifi/nrf_wifi/src/net_if.c b/drivers/wifi/nrf_wifi/src/net_if.c
index e7adeeaab79..7433ee13535 100644
--- a/drivers/wifi/nrf_wifi/src/net_if.c
+++ b/drivers/wifi/nrf_wifi/src/net_if.c
@@ -23,8 +23,7 @@ LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 #include "net_private.h"
 
 #include "util.h"
-#include "fmac_api.h"
-#include "fmac_util.h"
+#include "common/fmac_util.h"
 #include "shim.h"
 #include "fmac_main.h"
 #include "wpa_supp_if.h"
@@ -490,7 +489,7 @@ static void ip_maddr_event_handler(struct net_if *iface,
 		   &mac_addr,
 		   NRF_WIFI_ETH_ADDR_LEN);
 
-	status = nrf_wifi_fmac_set_mcast_addr(rpu_ctx_zep->rpu_ctx,
+	status = nrf_wifi_sys_fmac_set_mcast_addr(rpu_ctx_zep->rpu_ctx,
 					      vif_ctx_zep->vif_idx,
 					      mcast_info);
 	if (status == NRF_WIFI_STATUS_FAIL) {
@@ -751,7 +750,7 @@ int nrf_wifi_if_start_zep(const struct device *dev)
 	       dev->name,
 	       strlen(dev->name));
 
-	vif_ctx_zep->vif_idx = nrf_wifi_fmac_add_vif(fmac_dev_ctx,
+	vif_ctx_zep->vif_idx = nrf_wifi_sys_fmac_add_vif(fmac_dev_ctx,
 						     vif_ctx_zep,
 						     &add_vif_info);
 	if (vif_ctx_zep->vif_idx >= MAX_NUM_VIFS) {
@@ -785,7 +784,7 @@ int nrf_wifi_if_start_zep(const struct device *dev)
 		mac_addr_len = WIFI_MAC_ADDR_LEN;
 	}
 
-	status = nrf_wifi_fmac_set_vif_macaddr(rpu_ctx_zep->rpu_ctx,
+	status = nrf_wifi_sys_fmac_set_vif_macaddr(rpu_ctx_zep->rpu_ctx,
 					       vif_ctx_zep->vif_idx,
 					       mac_addr);
 
@@ -806,12 +805,12 @@ int nrf_wifi_if_start_zep(const struct device *dev)
 	       dev->name,
 	       strlen(dev->name));
 
-	status = nrf_wifi_fmac_chg_vif_state(rpu_ctx_zep->rpu_ctx,
+	status = nrf_wifi_sys_fmac_chg_vif_state(rpu_ctx_zep->rpu_ctx,
 					     vif_ctx_zep->vif_idx,
 					     &vif_info);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_chg_vif_state failed",
+		LOG_ERR("%s: nrf_wifi_sys_fmac_chg_vif_state failed",
 			__func__);
 		goto del_vif;
 	}
@@ -820,12 +819,12 @@ int nrf_wifi_if_start_zep(const struct device *dev)
 	nrf_wifi_wpa_supp_event_mac_chgd(vif_ctx_zep);
 
 #ifdef CONFIG_NRF_WIFI_LOW_POWER
-	status = nrf_wifi_fmac_set_power_save(rpu_ctx_zep->rpu_ctx,
+	status = nrf_wifi_sys_fmac_set_power_save(rpu_ctx_zep->rpu_ctx,
 					      vif_ctx_zep->vif_idx,
 					      NRF_WIFI_PS_ENABLED);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_set_power_save failed",
+		LOG_ERR("%s: nrf_wifi_sys_fmac_set_power_save failed",
 			__func__);
 		goto dev_rem;
 	}
@@ -838,9 +837,9 @@ int nrf_wifi_if_start_zep(const struct device *dev)
 
 	goto out;
 del_vif:
-	status = nrf_wifi_fmac_del_vif(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx);
+	status = nrf_wifi_sys_fmac_del_vif(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_del_vif failed",
+		LOG_ERR("%s: nrf_wifi_sys_fmac_del_vif failed",
 			__func__);
 	}
 dev_rem:
@@ -891,12 +890,12 @@ int nrf_wifi_if_stop_zep(const struct device *dev)
 
 #ifdef CONFIG_NRF70_STA_MODE
 #ifdef CONFIG_NRF_WIFI_LOW_POWER
-	status = nrf_wifi_fmac_set_power_save(rpu_ctx_zep->rpu_ctx,
+	status = nrf_wifi_sys_fmac_set_power_save(rpu_ctx_zep->rpu_ctx,
 					      vif_ctx_zep->vif_idx,
 					      NRF_WIFI_PS_DISABLED);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_set_power_save failed",
+		LOG_ERR("%s: nrf_wifi_sys_fmac_set_power_save failed",
 			__func__);
 	}
 #endif /* CONFIG_NRF_WIFI_LOW_POWER */
@@ -909,20 +908,20 @@ int nrf_wifi_if_stop_zep(const struct device *dev)
 	vif_info.state = NRF_WIFI_FMAC_IF_OP_STATE_DOWN;
 	vif_info.if_index = vif_ctx_zep->vif_idx;
 
-	status = nrf_wifi_fmac_chg_vif_state(rpu_ctx_zep->rpu_ctx,
+	status = nrf_wifi_sys_fmac_chg_vif_state(rpu_ctx_zep->rpu_ctx,
 					     vif_ctx_zep->vif_idx,
 					     &vif_info);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_chg_vif_state failed",
+		LOG_ERR("%s: nrf_wifi_sys_fmac_chg_vif_state failed",
 			__func__);
 	}
 
-	status = nrf_wifi_fmac_del_vif(rpu_ctx_zep->rpu_ctx,
+	status = nrf_wifi_sys_fmac_del_vif(rpu_ctx_zep->rpu_ctx,
 				       vif_ctx_zep->vif_idx);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_del_vif failed",
+		LOG_ERR("%s: nrf_wifi_sys_fmac_del_vif failed",
 			__func__);
 	}
 
@@ -1098,8 +1097,8 @@ int nrf_wifi_if_set_config_zep(const struct device *dev,
 			       (NRF_WIFI_TX_INJECTION_MODE);
 		}
 
-		ret = nrf_wifi_fmac_set_mode(rpu_ctx_zep->rpu_ctx,
-					     vif_ctx_zep->vif_idx, mode);
+		ret = nrf_wifi_sys_fmac_set_mode(rpu_ctx_zep->rpu_ctx,
+						 vif_ctx_zep->vif_idx, mode);
 
 		if (ret != NRF_WIFI_STATUS_SUCCESS) {
 			LOG_ERR("%s: Mode set operation failed", __func__);
@@ -1126,8 +1125,8 @@ int nrf_wifi_if_set_config_zep(const struct device *dev,
 			       (NRF_WIFI_PROMISCUOUS_MODE);
 		}
 
-		ret = nrf_wifi_fmac_set_mode(rpu_ctx_zep->rpu_ctx,
-					     vif_ctx_zep->vif_idx, mode);
+		ret = nrf_wifi_sys_fmac_set_mode(rpu_ctx_zep->rpu_ctx,
+						 vif_ctx_zep->vif_idx, mode);
 
 		if (ret != NRF_WIFI_STATUS_SUCCESS) {
 			LOG_ERR("%s: mode set operation failed", __func__);
@@ -1173,7 +1172,7 @@ int nrf_wifi_stats_get(const struct device *dev, struct net_stats_wifi *zstats)
 #ifdef CONFIG_NRF70_RAW_DATA_TX
 	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
 #endif /* CONFIG_NRF70_RAW_DATA_TX */
-	struct rpu_op_stats stats;
+	struct rpu_sys_op_stats stats;
 	int ret = -1;
 
 	if (!dev) {
@@ -1204,8 +1203,8 @@ int nrf_wifi_stats_get(const struct device *dev, struct net_stats_wifi *zstats)
 		goto unlock;
 	}
 
-	memset(&stats, 0, sizeof(struct rpu_op_stats));
-	status = nrf_wifi_fmac_stats_get(rpu_ctx_zep->rpu_ctx, 0, &stats);
+	memset(&stats, 0, sizeof(struct rpu_sys_op_stats));
+	status = nrf_wifi_sys_fmac_stats_get(rpu_ctx_zep->rpu_ctx, 0, &stats);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nrf_wifi_fmac_stats_get failed", __func__);
 		goto unlock;
diff --git a/drivers/wifi/nrf_wifi/src/wifi_mgmt.c b/drivers/wifi/nrf_wifi/src/wifi_mgmt.c
index bdc69a00118..875ce786b57 100644
--- a/drivers/wifi/nrf_wifi/src/wifi_mgmt.c
+++ b/drivers/wifi/nrf_wifi/src/wifi_mgmt.c
@@ -15,9 +15,9 @@
 #include <zephyr/logging/log.h>
 
 #include "util.h"
-#include "fmac_api.h"
-#include "fmac_tx.h"
-#include "fmac_util.h"
+#include "system/fmac_api.h"
+#include "system/fmac_tx.h"
+#include "common/fmac_util.h"
 #include "fmac_main.h"
 #include "wifi_mgmt.h"
 
@@ -69,7 +69,7 @@ int nrf_wifi_set_power_save(const struct device *dev,
 				WIFI_PS_PARAM_LISTEN_INTERVAL_RANGE_INVALID;
 			return -EINVAL;
 		}
-		status = nrf_wifi_fmac_set_listen_interval(
+		status = nrf_wifi_sys_fmac_set_listen_interval(
 						rpu_ctx_zep->rpu_ctx,
 						vif_ctx_zep->vif_idx,
 						params->listen_interval);
@@ -90,7 +90,7 @@ int nrf_wifi_set_power_save(const struct device *dev,
 			goto out;
 		}
 
-		status = nrf_wifi_fmac_set_power_save_timeout(
+		status = nrf_wifi_sys_fmac_set_power_save_timeout(
 							rpu_ctx_zep->rpu_ctx,
 							vif_ctx_zep->vif_idx,
 							params->timeout_ms);
@@ -100,17 +100,17 @@ int nrf_wifi_set_power_save(const struct device *dev,
 			uapsd_queue = UAPSD_Q_MAX; /* WMM mode */
 		}
 
-		status = nrf_wifi_fmac_set_uapsd_queue(rpu_ctx_zep->rpu_ctx,
+		status = nrf_wifi_sys_fmac_set_uapsd_queue(rpu_ctx_zep->rpu_ctx,
 						       vif_ctx_zep->vif_idx,
 						       uapsd_queue);
 	break;
 	case  WIFI_PS_PARAM_STATE:
-		status = nrf_wifi_fmac_set_power_save(rpu_ctx_zep->rpu_ctx,
+		status = nrf_wifi_sys_fmac_set_power_save(rpu_ctx_zep->rpu_ctx,
 						      vif_ctx_zep->vif_idx,
 						      params->enabled);
 	break;
 	case WIFI_PS_PARAM_WAKEUP_MODE:
-		status = nrf_wifi_fmac_set_ps_wakeup_mode(
+		status = nrf_wifi_sys_fmac_set_ps_wakeup_mode(
 							rpu_ctx_zep->rpu_ctx,
 							vif_ctx_zep->vif_idx,
 							params->wakeup_mode);
@@ -128,7 +128,7 @@ int nrf_wifi_set_power_save(const struct device *dev,
 			return -EINVAL;
 		}
 
-		status = nrf_wifi_fmac_set_ps_exit_strategy(
+		status = nrf_wifi_sys_fmac_set_ps_exit_strategy(
 							rpu_ctx_zep->rpu_ctx,
 							vif_ctx_zep->vif_idx,
 							exit_strategy);
@@ -211,11 +211,11 @@ int nrf_wifi_get_power_save_config(const struct device *dev,
 
 	vif_ctx_zep->ps_config_info_evnt = false;
 
-	status = nrf_wifi_fmac_get_power_save_info(rpu_ctx_zep->rpu_ctx,
+	status = nrf_wifi_sys_fmac_get_power_save_info(rpu_ctx_zep->rpu_ctx,
 						   vif_ctx_zep->vif_idx);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_get_power_save_info failed",
+		LOG_ERR("%s: nrf_wifi_sys_fmac_get_power_save_info failed",
 			__func__);
 		goto out;
 	}
@@ -468,7 +468,7 @@ int nrf_wifi_twt_teardown_flows(struct nrf_wifi_vif_ctx_zep *vif_ctx_zep,
 			continue;
 		}
 		twt_info.twt_flow_id = flow_id;
-		status = nrf_wifi_fmac_twt_teardown(rpu_ctx_zep->rpu_ctx,
+		status = nrf_wifi_sys_fmac_twt_teardown(rpu_ctx_zep->rpu_ctx,
 						vif_ctx_zep->vif_idx,
 						&twt_info);
 		if (status != NRF_WIFI_STATUS_SUCCESS) {
@@ -569,7 +569,7 @@ int nrf_wifi_set_twt(const struct device *dev,
 		twt_info.dialog_token = twt_params->dialog_token;
 		twt_info.twt_wake_ahead_duration = twt_params->setup.twt_wake_ahead_duration;
 
-		status = nrf_wifi_fmac_twt_setup(rpu_ctx_zep->rpu_ctx,
+		status = nrf_wifi_sys_fmac_twt_setup(rpu_ctx_zep->rpu_ctx,
 					   vif_ctx_zep->vif_idx,
 					   &twt_info);
 
@@ -811,8 +811,9 @@ int nrf_wifi_mode(const struct device *dev,
 		 * context maps the correct network interface index to current driver
 		 * interface index.
 		 */
-		status = nrf_wifi_fmac_set_mode(rpu_ctx_zep->rpu_ctx,
-						vif_ctx_zep->vif_idx, mode->mode);
+		status = nrf_wifi_sys_fmac_set_mode(rpu_ctx_zep->rpu_ctx,
+						    vif_ctx_zep->vif_idx,
+						    mode->mode);
 		if (status != NRF_WIFI_STATUS_SUCCESS) {
 			LOG_ERR("%s: mode set operation failed", __func__);
 			goto out;
@@ -891,8 +892,9 @@ int nrf_wifi_channel(const struct device *dev,
 		 * context maps the correct network interface index to current driver
 		 * interface index.
 		 */
-		status = nrf_wifi_fmac_set_channel(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx,
-						   channel->channel);
+		status = nrf_wifi_sys_fmac_set_channel(rpu_ctx_zep->rpu_ctx,
+						       vif_ctx_zep->vif_idx,
+						       channel->channel);
 
 		if (status != NRF_WIFI_STATUS_SUCCESS) {
 			LOG_ERR("%s: set channel failed", __func__);
@@ -972,8 +974,10 @@ int nrf_wifi_filter(const struct device *dev,
 		 * context maps the correct network interface index to current driver
 		 * interface index
 		 */
-		status = nrf_wifi_fmac_set_packet_filter(rpu_ctx_zep->rpu_ctx, filter->filter,
-							 vif_ctx_zep->vif_idx, filter->buffer_size);
+		status = nrf_wifi_sys_fmac_set_packet_filter(rpu_ctx_zep->rpu_ctx,
+							     filter->filter,
+							     vif_ctx_zep->vif_idx,
+							     filter->buffer_size);
 		if (status != NRF_WIFI_STATUS_SUCCESS) {
 			LOG_ERR("%s: Set filter operation failed\n", __func__);
 			goto out;
@@ -1036,7 +1040,7 @@ int nrf_wifi_set_rts_threshold(const struct device *dev,
 
 	k_mutex_lock(&vif_ctx_zep->vif_lock, K_FOREVER);
 
-	status = nrf_wifi_fmac_set_wiphy_params(rpu_ctx_zep->rpu_ctx,
+	status = nrf_wifi_sys_fmac_set_wiphy_params(rpu_ctx_zep->rpu_ctx,
 						vif_ctx_zep->vif_idx,
 						&wiphy_info);
 
diff --git a/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c b/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
index e30f572aeb3..ceabdcf7f01 100644
--- a/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
+++ b/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
@@ -15,8 +15,8 @@
 #include <zephyr/logging/log.h>
 
 #include "util.h"
-#include "fmac_api.h"
-#include "fmac_tx.h"
+#include "system/fmac_api.h"
+#include "system/fmac_tx.h"
 #include "fmac_main.h"
 #include "wifi_mgmt_scan.h"
 
@@ -210,10 +210,10 @@ int nrf_wifi_disp_scan_zep(const struct device *dev, struct wifi_scan_params *pa
 	scan_info->scan_params.passive_scan = 1;
 #endif /* CONFIG_NRF70_PASSIVE_SCAN_ONLY */
 
-	status = nrf_wifi_fmac_scan(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, scan_info);
+	status = nrf_wifi_sys_fmac_scan(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, scan_info);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_scan failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_scan failed", __func__);
 		goto out;
 	}
 
@@ -249,12 +249,12 @@ enum nrf_wifi_status nrf_wifi_disp_scan_res_get_zep(struct nrf_wifi_vif_ctx_zep
 		goto out;
 	}
 
-	status = nrf_wifi_fmac_scan_res_get(rpu_ctx_zep->rpu_ctx,
+	status = nrf_wifi_sys_fmac_scan_res_get(rpu_ctx_zep->rpu_ctx,
 					    vif_ctx_zep->vif_idx,
 					    SCAN_DISPLAY);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_scan failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_scan failed", __func__);
 		goto out;
 	}
 
diff --git a/drivers/wifi/nrf_wifi/src/wifi_util.c b/drivers/wifi/nrf_wifi/src/wifi_util.c
index 2d2ca2a2b5b..70b64da4e2e 100644
--- a/drivers/wifi/nrf_wifi/src/wifi_util.c
+++ b/drivers/wifi/nrf_wifi/src/wifi_util.c
@@ -9,8 +9,8 @@
  */
 #include <stdlib.h>
 #include "host_rpu_umac_if.h"
-#include "fmac_api.h"
-#include "fmac_util.h"
+#include "common/fmac_util.h"
+#include "system/fmac_api.h"
 #include "fmac_main.h"
 #include "wifi_util.h"
 
@@ -161,10 +161,10 @@ static int nrf_wifi_util_set_he_ltf_gi(const struct shell *sh,
 		return -ENOEXEC;
 	}
 
-	status = nrf_wifi_fmac_conf_ltf_gi(ctx->rpu_ctx,
-					   ctx->conf_params.he_ltf,
-					   ctx->conf_params.he_gi,
-					   val);
+	status = nrf_wifi_sys_fmac_conf_ltf_gi(ctx->rpu_ctx,
+					       ctx->conf_params.he_ltf,
+					       ctx->conf_params.he_gi,
+					       val);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		shell_fprintf(sh,
@@ -199,7 +199,7 @@ static int nrf_wifi_util_set_uapsd_queue(const struct shell *sh,
 	}
 
 	if (ctx->conf_params.uapsd_queue != val) {
-		status = nrf_wifi_fmac_set_uapsd_queue(ctx->rpu_ctx,
+		status = nrf_wifi_sys_fmac_set_uapsd_queue(ctx->rpu_ctx,
 						       0,
 						       val);
 
@@ -272,7 +272,7 @@ static int nrf_wifi_util_tx_stats(const struct shell *sh,
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
 	void *queue = NULL;
 	unsigned int tx_pending_pkts = 0;
-	struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
+	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
 	int ret;
 
 	vif_index = atoi(argv[1]);
@@ -295,7 +295,7 @@ static int nrf_wifi_util_tx_stats(const struct shell *sh,
 	}
 
 	fmac_dev_ctx = ctx->rpu_ctx;
-	def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
+	sys_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
 
 	/* TODO: Get peer_index from shell once AP mode is supported */
 	shell_fprintf(sh,
@@ -304,7 +304,7 @@ static int nrf_wifi_util_tx_stats(const struct shell *sh,
 		vif_index);
 
 	for (int i = 0; i < NRF_WIFI_FMAC_AC_MAX ; i++) {
-		queue = def_dev_ctx->tx_config.data_pending_txq[peer_index][i];
+		queue = sys_dev_ctx->tx_config.data_pending_txq[peer_index][i];
 		tx_pending_pkts = nrf_wifi_utils_q_len(queue);
 
 		shell_fprintf(
@@ -312,7 +312,7 @@ static int nrf_wifi_util_tx_stats(const struct shell *sh,
 			SHELL_INFO,
 			"Outstanding tokens: ac: %d -> %d (pending_q_len: %d)\n",
 			i,
-			def_dev_ctx->tx_config.outstanding_descs[i],
+			sys_dev_ctx->tx_config.outstanding_descs[i],
 			tx_pending_pkts);
 	}
 
@@ -373,9 +373,9 @@ static int nrf_wifi_util_tx_rate(const struct shell *sh,
 
 	}
 
-	status = nrf_wifi_fmac_set_tx_rate(ctx->rpu_ctx,
-					   rate_flag,
-					   data_rate);
+	status = nrf_wifi_sys_fmac_set_tx_rate(ctx->rpu_ctx,
+					       rate_flag,
+					       data_rate);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		shell_fprintf(sh,
@@ -399,8 +399,8 @@ static int nrf_wifi_util_show_host_rpu_ps_ctrl_state(const struct shell *sh,
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
 	int rpu_ps_state = -1;
 
-	status = nrf_wifi_fmac_get_host_rpu_ps_ctrl_state(ctx->rpu_ctx,
-							  &rpu_ps_state);
+	status = nrf_wifi_sys_fmac_get_host_rpu_ps_ctrl_state(ctx->rpu_ctx,
+							      &rpu_ps_state);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		shell_fprintf(sh,
@@ -456,7 +456,7 @@ static int nrf_wifi_util_dump_rpu_stats(const struct shell *sh,
 {
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
-	struct rpu_op_stats stats;
+	struct rpu_sys_op_stats stats;
 	enum rpu_stats_type stats_type = RPU_STATS_TYPE_ALL;
 	int ret;
 
@@ -490,8 +490,8 @@ static int nrf_wifi_util_dump_rpu_stats(const struct shell *sh,
 	}
 	fmac_dev_ctx = ctx->rpu_ctx;
 
-	memset(&stats, 0, sizeof(struct rpu_op_stats));
-	status = nrf_wifi_fmac_stats_get(fmac_dev_ctx, 0, &stats);
+	memset(&stats, 0, sizeof(struct rpu_sys_op_stats));
+	status = nrf_wifi_sys_fmac_stats_get(fmac_dev_ctx, 0, &stats);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		shell_fprintf(sh,
@@ -898,7 +898,7 @@ static int nrf_wifi_util_trigger_rpu_recovery(const struct shell *sh,
 
 	fmac_dev_ctx = ctx->rpu_ctx;
 
-	status = nrf_wifi_fmac_rpu_recovery_callback(fmac_dev_ctx, NULL, 0);
+	status = nrf_wifi_sys_fmac_rpu_recovery_callback(fmac_dev_ctx, NULL, 0);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		shell_fprintf(sh,
 			      SHELL_ERROR,
diff --git a/drivers/wifi/nrf_wifi/src/wifi_util.h b/drivers/wifi/nrf_wifi/src/wifi_util.h
index 2ab188efed4..303d5feac99 100644
--- a/drivers/wifi/nrf_wifi/src/wifi_util.h
+++ b/drivers/wifi/nrf_wifi/src/wifi_util.h
@@ -15,7 +15,7 @@
 #include <zephyr/init.h>
 #include <ctype.h>
 #include <host_rpu_sys_if.h>
-#include <fmac_structs.h>
+#include <common/fmac_structs_common.h>
 #include <queue.h>
 
 struct nrf_wifi_ctx_zep_rt {
diff --git a/drivers/wifi/nrf_wifi/src/wpa_supp_if.c b/drivers/wifi/nrf_wifi/src/wpa_supp_if.c
index 75a6fa6c6b5..dd89851f3bd 100644
--- a/drivers/wifi/nrf_wifi/src/wpa_supp_if.c
+++ b/drivers/wifi/nrf_wifi/src/wpa_supp_if.c
@@ -14,7 +14,7 @@
 #include <zephyr/logging/log.h>
 
 #include "fmac_main.h"
-#include "fmac_util.h"
+#include "common/fmac_util.h"
 #include "wifi_mgmt.h"
 #include "wpa_supp_if.h"
 
@@ -563,7 +563,7 @@ int nrf_wifi_wpa_supp_scan2(void *if_priv, struct wpa_driver_scan_params *params
 		goto out;
 	}
 
-	status = nrf_wifi_fmac_scan(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, scan_info);
+	status = nrf_wifi_sys_fmac_scan(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, scan_info);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: Scan trigger failed", __func__);
@@ -614,10 +614,10 @@ int nrf_wifi_wpa_supp_scan_abort(void *if_priv)
 		goto out;
 	}
 
-	status = nrf_wifi_fmac_abort_scan(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx);
+	status = nrf_wifi_sys_fmac_abort_scan(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_abort_scan failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_abort_scan failed", __func__);
 		goto out;
 	}
 
@@ -660,11 +660,11 @@ int nrf_wifi_wpa_supp_scan_results_get(void *if_priv)
 		goto out;
 	}
 
-	status = nrf_wifi_fmac_scan_res_get(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx,
+	status = nrf_wifi_sys_fmac_scan_res_get(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx,
 					    SCAN_CONNECT);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_scan_res_get failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_scan_res_get failed", __func__);
 		goto out;
 	}
 
@@ -706,10 +706,10 @@ int nrf_wifi_wpa_supp_deauthenticate(void *if_priv, const char *addr, unsigned s
 
 	memcpy(deauth_info.mac_addr, addr, sizeof(deauth_info.mac_addr));
 
-	status = nrf_wifi_fmac_deauth(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, &deauth_info);
+	status = nrf_wifi_sys_fmac_deauth(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, &deauth_info);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_deauth failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_deauth failed", __func__);
 		goto out;
 	}
 
@@ -850,7 +850,7 @@ int nrf_wifi_wpa_supp_authenticate(void *if_priv, struct wpa_driver_auth_params
 		auth_info.nrf_wifi_flags |= NRF_WIFI_CMD_AUTHENTICATE_LOCAL_STATE_CHANGE;
 	}
 
-	status = nrf_wifi_fmac_auth(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, &auth_info);
+	status = nrf_wifi_sys_fmac_auth(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, &auth_info);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: MLME command failed (auth): count=%d ret=%d", __func__, count, ret);
@@ -931,7 +931,7 @@ int nrf_wifi_wpa_supp_associate(void *if_priv, struct wpa_driver_associate_param
 		assoc_info.bss_max_idle_time = params->bss_max_idle_period;
 	}
 
-	status = nrf_wifi_fmac_assoc(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, &assoc_info);
+	status = nrf_wifi_sys_fmac_assoc(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, &assoc_info);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: MLME command failed (assoc)", __func__);
@@ -1025,20 +1025,20 @@ int nrf_wifi_wpa_supp_set_key(void *if_priv, const unsigned char *ifname, enum w
 	key_info.valid_fields |= NRF_WIFI_KEY_IDX_VALID;
 
 	if (alg == WPA_ALG_NONE) {
-		status = nrf_wifi_fmac_del_key(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx,
+		status = nrf_wifi_sys_fmac_del_key(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx,
 					       &key_info, mac_addr);
 
 		if (status != NRF_WIFI_STATUS_SUCCESS) {
-			LOG_ERR("%s: nrf_wifi_fmac_del_key failed", __func__);
+			LOG_ERR("%s: nrf_wifi_sys_fmac_del_key failed", __func__);
 		} else {
 			ret = 0;
 		}
 	} else {
-		status = nrf_wifi_fmac_add_key(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx,
+		status = nrf_wifi_sys_fmac_add_key(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx,
 					       &key_info, mac_addr);
 
 		if (status != NRF_WIFI_STATUS_SUCCESS) {
-			LOG_ERR("%s: nrf_wifi_fmac_add_key failed", __func__);
+			LOG_ERR("%s: nrf_wifi_sys_fmac_add_key failed", __func__);
 		} else {
 			ret = 0;
 		}
@@ -1071,10 +1071,10 @@ int nrf_wifi_wpa_supp_set_key(void *if_priv, const unsigned char *ifname, enum w
 		key_info.nrf_wifi_flags |= NRF_WIFI_KEY_DEFAULT_TYPE_UNICAST;
 	}
 
-	status = nrf_wifi_fmac_set_key(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, &key_info);
+	status = nrf_wifi_sys_fmac_set_key(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, &key_info);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_set_key failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_set_key failed", __func__);
 		ret = -1;
 	} else {
 		ret = 0;
@@ -1129,10 +1129,12 @@ int nrf_wifi_wpa_set_supp_port(void *if_priv, int authorized, char *bssid)
 		chg_sta_info.sta_flags2.nrf_wifi_set = 1 << 1;
 	}
 
-	status = nrf_wifi_fmac_chg_sta(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, &chg_sta_info);
+	status = nrf_wifi_sys_fmac_chg_sta(rpu_ctx_zep->rpu_ctx,
+					   vif_ctx_zep->vif_idx,
+					   &chg_sta_info);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_chg_sta failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_chg_sta failed", __func__);
 		ret = -1;
 		goto out;
 	}
@@ -1178,7 +1180,9 @@ int nrf_wifi_wpa_supp_signal_poll(void *if_priv, struct wpa_signal_info *si, uns
 		nrf_wifi_osal_time_elapsed_us(vif_ctx_zep->rssi_record_timestamp_us) / 1000;
 
 	if (rssi_record_elapsed_time_ms > CONFIG_NRF70_RSSI_STALE_TIMEOUT_MS) {
-		ret = nrf_wifi_fmac_get_station(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, bssid);
+		ret = nrf_wifi_sys_fmac_get_station(rpu_ctx_zep->rpu_ctx,
+						    vif_ctx_zep->vif_idx,
+						    bssid);
 		if (ret != NRF_WIFI_STATUS_SUCCESS) {
 			LOG_ERR("%s: Failed to send get station info command", __func__);
 			goto out;
@@ -1194,7 +1198,7 @@ int nrf_wifi_wpa_supp_signal_poll(void *if_priv, struct wpa_signal_info *si, uns
 		si->data.signal = (int)vif_ctx_zep->rssi;
 	}
 
-	ret = nrf_wifi_fmac_get_interface(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx);
+	ret = nrf_wifi_sys_fmac_get_interface(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx);
 	if (ret != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: Failed to send get interface info command", __func__);
 		goto out;
@@ -1454,12 +1458,12 @@ int nrf_wifi_nl80211_send_mlme(void *if_priv, const u8 *data,
 
 	LOG_DBG("%s: Sending frame to RPU: cookie=%d wait_time=%d no_ack=%d", __func__,
 		    cookie, wait_time, noack);
-	status = nrf_wifi_fmac_mgmt_tx(rpu_ctx_zep->rpu_ctx,
+	status = nrf_wifi_sys_fmac_mgmt_tx(rpu_ctx_zep->rpu_ctx,
 			vif_ctx_zep->vif_idx,
 			mgmt_tx_info);
 
 	if (status == NRF_WIFI_STATUS_FAIL) {
-		LOG_ERR("%s: nrf_wifi_fmac_mgmt_tx failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_mgmt_tx failed", __func__);
 		goto out;
 	}
 
@@ -1656,10 +1660,10 @@ int nrf_wifi_supp_get_wiphy(void *if_priv)
 		goto out;
 	}
 
-	status = nrf_wifi_fmac_get_wiphy(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx);
+	status = nrf_wifi_sys_fmac_get_wiphy(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_get_wiphy failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_get_wiphy failed", __func__);
 		goto out;
 	}
 out:
@@ -1700,11 +1704,11 @@ int nrf_wifi_supp_register_frame(void *if_priv,
 	frame_info.frame_match.frame_match_len = match_len;
 	memcpy(frame_info.frame_match.frame_match, match, match_len);
 
-	status = nrf_wifi_fmac_register_frame(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx,
+	status = nrf_wifi_sys_fmac_register_frame(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx,
 			&frame_info);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_register_frame failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_register_frame failed", __func__);
 		goto out;
 	}
 out:
@@ -1843,9 +1847,9 @@ int nrf_wifi_supp_get_conn_info(void *if_priv, struct wpa_conn_info *info)
 	fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
 
 	vif_ctx_zep->conn_info = info;
-	ret = nrf_wifi_fmac_get_conn_info(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx);
+	ret = nrf_wifi_sys_fmac_get_conn_info(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx);
 	if (ret != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_get_conn_info failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_get_conn_info failed", __func__);
 		goto out;
 	}
 
@@ -1990,12 +1994,12 @@ static int nrf_wifi_vif_state_change(struct nrf_wifi_vif_ctx_zep *vif_ctx_zep,
 	vif_state_info.state = state;
 	vif_state_info.if_index = vif_ctx_zep->vif_idx;
 	vif_ctx->ifflags = false;
-	status = nrf_wifi_fmac_chg_vif_state(rpu_ctx_zep->rpu_ctx,
+	status = nrf_wifi_sys_fmac_chg_vif_state(rpu_ctx_zep->rpu_ctx,
 					     vif_ctx_zep->vif_idx,
 					     &vif_state_info);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_chg_vif_state failed",
+		LOG_ERR("%s: nrf_wifi_sys_fmac_chg_vif_state failed",
 			__func__);
 		goto out;
 	}
@@ -2047,9 +2051,11 @@ static int nrf_wifi_iftype_change(struct nrf_wifi_vif_ctx_zep *vif_ctx_zep, int
 	chg_vif_info.iftype = iftype;
 	vif_ctx_zep->set_if_event_received = false;
 	vif_ctx_zep->set_if_status = 0;
-	status = nrf_wifi_fmac_chg_vif(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, &chg_vif_info);
+	status = nrf_wifi_sys_fmac_chg_vif(rpu_ctx_zep->rpu_ctx,
+					   vif_ctx_zep->vif_idx,
+					   &chg_vif_info);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_chg_vif failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_chg_vif failed", __func__);
 		goto out;
 	}
 
@@ -2261,11 +2267,11 @@ int nrf_wifi_supp_register_mgmt_frame(void *if_priv,
 	}
 	memcpy(mgmt_frame_info.frame_match.frame_match, match, match_len);
 
-	status = nrf_wifi_fmac_mgmt_frame_reg(rpu_ctx_zep->rpu_ctx,
+	status = nrf_wifi_sys_fmac_mgmt_frame_reg(rpu_ctx_zep->rpu_ctx,
 					      vif_ctx_zep->vif_idx,
 					      &mgmt_frame_info);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_mgmt_frame_reg failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_mgmt_frame_reg failed", __func__);
 		goto out;
 	}
 
@@ -2324,9 +2330,9 @@ static int nrf_wifi_set_bss(struct nrf_wifi_vif_ctx_zep *vif_ctx_zep,
 	bss_info.nrf_wifi_slot = params->short_slot_time;
 	bss_info.ap_isolate = params->isolate;
 
-	status = nrf_wifi_fmac_set_bss(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, &bss_info);
+	status = nrf_wifi_sys_fmac_set_bss(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, &bss_info);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_set_bss failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_set_bss failed", __func__);
 		goto out;
 	}
 
@@ -2423,9 +2429,11 @@ int nrf_wifi_wpa_supp_start_ap(void *if_priv, struct wpa_driver_ap_params *param
 		NRF_WIFI_SET_FREQ_PARAMS_CHANNEL_TYPE_VALID;
 
 	vif_ctx_zep->if_carr_state = NRF_WIFI_FMAC_IF_CARR_STATE_OFF;
-	status = nrf_wifi_fmac_start_ap(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, &start_ap_info);
+	status = nrf_wifi_sys_fmac_start_ap(rpu_ctx_zep->rpu_ctx,
+					    vif_ctx_zep->vif_idx,
+					    &start_ap_info);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_start_ap failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_start_ap failed", __func__);
 		goto out;
 	}
 
@@ -2474,9 +2482,11 @@ int nrf_wifi_wpa_supp_change_beacon(void *if_priv, struct wpa_driver_ap_params *
 
 	nrf_wifi_set_beacon_data(params, &chg_bcn_info.beacon_data);
 
-	status = nrf_wifi_fmac_chg_bcn(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, &chg_bcn_info);
+	status = nrf_wifi_sys_fmac_chg_bcn(rpu_ctx_zep->rpu_ctx,
+					   vif_ctx_zep->vif_idx,
+					   &chg_bcn_info);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_chg_bcn failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_chg_bcn failed", __func__);
 		goto out;
 	}
 
@@ -2511,10 +2521,10 @@ int nrf_wifi_wpa_supp_stop_ap(void *if_priv)
 		goto out;
 	}
 
-	status = nrf_wifi_fmac_stop_ap(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx);
+	status = nrf_wifi_sys_fmac_stop_ap(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_stop_ap failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_stop_ap failed", __func__);
 		goto out;
 	}
 
@@ -2593,7 +2603,7 @@ int nrf_wifi_sta_flags_to_nrf(int wpas_sta_flags)
 		nrf_sta_flags |= NRF_WIFI_STA_FLAG_TDLS_PEER;
 	}
 	/* Note: Do not set flags > NRF_WIFI_STA_FLAG_TDLS_PEER, else
-	 * nrf_wifi_fmac_chg_sta will fail. This is equivalent to not
+	 * nrf_wifi_sys_fmac_chg_sta will fail. This is equivalent to not
 	 * setting WPA_DRIVER_FLAGS_FULL_AP_CLIENT_STATE flag.
 	 */
 
@@ -2685,16 +2695,16 @@ int nrf_wifi_wpa_supp_sta_add(void *if_priv, struct hostapd_sta_add_params *para
 		sta_info.sta_flags2.nrf_wifi_set, sta_info.sta_flags2.nrf_wifi_mask);
 
 	if (params->set) {
-		status = nrf_wifi_fmac_chg_sta(rpu_ctx_zep->rpu_ctx,
+		status = nrf_wifi_sys_fmac_chg_sta(rpu_ctx_zep->rpu_ctx,
 					vif_ctx_zep->vif_idx,
 					(struct nrf_wifi_umac_chg_sta_info *)&sta_info);
 	} else {
-		status = nrf_wifi_fmac_add_sta(rpu_ctx_zep->rpu_ctx,
+		status = nrf_wifi_sys_fmac_add_sta(rpu_ctx_zep->rpu_ctx,
 					vif_ctx_zep->vif_idx,
 					&sta_info);
 	}
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_add_sta failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_add_sta failed", __func__);
 		goto out;
 	}
 
@@ -2732,9 +2742,9 @@ int nrf_wifi_wpa_supp_sta_remove(void *if_priv, const u8 *addr)
 
 	memcpy(del_sta.mac_addr, addr, sizeof(del_sta.mac_addr));
 
-	status = nrf_wifi_fmac_del_sta(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, &del_sta);
+	status = nrf_wifi_sys_fmac_del_sta(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, &del_sta);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_del_sta failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_del_sta failed", __func__);
 		goto out;
 	}
 
@@ -2781,9 +2791,9 @@ int nrf_wifi_wpa_supp_sta_set_flags(void *if_priv, const u8 *addr,
 	LOG_DBG("%s %x, %x", __func__,
 		chg_sta.sta_flags2.nrf_wifi_set, chg_sta.sta_flags2.nrf_wifi_mask);
 
-	status = nrf_wifi_fmac_chg_sta(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, &chg_sta);
+	status = nrf_wifi_sys_fmac_chg_sta(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx, &chg_sta);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_chg_sta failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_chg_sta failed", __func__);
 		goto out;
 	}
 
@@ -2820,10 +2830,11 @@ int nrf_wifi_wpa_supp_sta_get_inact_sec(void *if_priv, const u8 *addr)
 		goto out;
 	}
 
-	status = nrf_wifi_fmac_get_station(rpu_ctx_zep->rpu_ctx, vif_ctx_zep->vif_idx,
-					(unsigned char *) addr);
+	status = nrf_wifi_sys_fmac_get_station(rpu_ctx_zep->rpu_ctx,
+					       vif_ctx_zep->vif_idx,
+					       (unsigned char *) addr);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
-		LOG_ERR("%s: nrf_wifi_fmac_get_station failed", __func__);
+		LOG_ERR("%s: nrf_wifi_sys_fmac_get_station failed", __func__);
 		goto out;
 	}
 
diff --git a/include/zephyr/drivers/wifi/nrf_wifi/off_raw_tx/off_raw_tx_api.h b/include/zephyr/drivers/wifi/nrf_wifi/off_raw_tx/off_raw_tx_api.h
index b14ae39488d..4f9c13ece31 100644
--- a/include/zephyr/drivers/wifi/nrf_wifi/off_raw_tx/off_raw_tx_api.h
+++ b/include/zephyr/drivers/wifi/nrf_wifi/off_raw_tx/off_raw_tx_api.h
@@ -16,7 +16,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include "osal_api.h"
 
 /*  Minimum frame size for raw packet transmission */
 #define NRF_WIFI_OFF_RAW_TX_FRAME_SIZE_MIN 26
diff --git a/west.yml b/west.yml
index 1174f227eec..a6d0405c0cf 100644
--- a/west.yml
+++ b/west.yml
@@ -318,7 +318,7 @@ manifest:
       revision: b84bd7314a239f818e78f6927f5673247816df53
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: 913d9f60b9dd6b92b70169ce857570f5bf5b1e3c
+      revision: 01359dffd9b6da4d162b4565fdd621ad94bd5d4e
       path: modules/lib/nrf_wifi
     - name: open-amp
       revision: 52bb1783521c62c019451cee9b05b8eda9d7425f

From 0e7ab5f820d5f35a0e004390370ba01325b969da Mon Sep 17 00:00:00 2001
From: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
Date: Mon, 10 Feb 2025 20:52:57 +0530
Subject: [PATCH 2856/2913] [nrf fromtree] drivers: nrf_wifi: Add missing test
 cases

Add test cases for SoftAP and P2P modes.

Signed-off-by: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
(cherry picked from commit 522387ec17c04a60eab7b0dff2eb74c11daf15c3)
---
 tests/drivers/wifi/nrf_wifi/testcase.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/drivers/wifi/nrf_wifi/testcase.yaml b/tests/drivers/wifi/nrf_wifi/testcase.yaml
index f8dac0a1ea8..f1888fcefc3 100644
--- a/tests/drivers/wifi/nrf_wifi/testcase.yaml
+++ b/tests/drivers/wifi/nrf_wifi/testcase.yaml
@@ -7,6 +7,8 @@ common:
   platform_allow:
     - nrf7002dk/nrf5340/cpuapp
 tests:
+  nrf70.build.sta:
+    extra_configs: []
   nrf70.build.radio_test:
     extra_configs:
       - CONFIG_NRF70_RADIO_TEST=y
@@ -44,3 +46,9 @@ tests:
       - CONFIG_NETWORKING=n
       - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
       - CONFIG_NET_L2_WIFI_MGMT=n
+  nrf70.build.softap:
+    extra_configs:
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT_AP=y
+  nrf70.build.p2p:
+    extra_configs:
+      - CONFIG_NRF70_P2P_MODE=y

From d6ec5a648b7a3ea0ddf04aa2b48a4b4fa4bc0e94 Mon Sep 17 00:00:00 2001
From: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
Date: Mon, 10 Feb 2025 20:54:33 +0530
Subject: [PATCH 2857/2913] [nrf fromtree] drivers: nrf_wifi: Fix compilation
 issues for SoftAP mode.

Fix compilation issues for SoftAP mode which were missed in the mode
specific code changes.

Signed-off-by: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
(cherry picked from commit 5f69ab752b8e67d09890e7eb2aeccd8b50a61be4)
---
 drivers/wifi/nrf_wifi/src/wpa_supp_if.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/src/wpa_supp_if.c b/drivers/wifi/nrf_wifi/src/wpa_supp_if.c
index dd89851f3bd..4b28c7bb24e 100644
--- a/drivers/wifi/nrf_wifi/src/wpa_supp_if.c
+++ b/drivers/wifi/nrf_wifi/src/wpa_supp_if.c
@@ -1969,7 +1969,7 @@ static int nrf_wifi_vif_state_change(struct nrf_wifi_vif_ctx_zep *vif_ctx_zep,
 	unsigned int timeout = 0;
 	struct nrf_wifi_fmac_vif_ctx *vif_ctx = NULL;
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
-	struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
+	struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
 	int ret = -1;
 
 	if (!vif_ctx_zep) {
@@ -1988,8 +1988,8 @@ static int nrf_wifi_vif_state_change(struct nrf_wifi_vif_ctx_zep *vif_ctx_zep,
 		goto out;
 	}
 
-	def_dev_ctx = wifi_dev_priv(rpu_ctx_zep->rpu_ctx);
-	vif_ctx = def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx];
+	sys_dev_ctx = wifi_dev_priv(rpu_ctx_zep->rpu_ctx);
+	vif_ctx = sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx];
 
 	vif_state_info.state = state;
 	vif_state_info.if_index = vif_ctx_zep->vif_idx;

From 63a2f790f5a6111feb957d890b7d9281334e3e35 Mon Sep 17 00:00:00 2001
From: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
Date: Mon, 10 Feb 2025 21:00:15 +0530
Subject: [PATCH 2858/2913] [nrf fromtree] manifest: nrf_wifi: Pull in fix for
 SAP and P2P build

Pull in the latest fixes for the SAP and P2P mode builds.

Signed-off-by: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
(cherry picked from commit d2e0bb2c09fcda62807cd71077f70fae5d3ab8e5)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index a6d0405c0cf..f5b30e08c02 100644
--- a/west.yml
+++ b/west.yml
@@ -318,7 +318,7 @@ manifest:
       revision: b84bd7314a239f818e78f6927f5673247816df53
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: 01359dffd9b6da4d162b4565fdd621ad94bd5d4e
+      revision: e35f707a782b7c4c0eb83a3b06ca4e6eb693f29f
       path: modules/lib/nrf_wifi
     - name: open-amp
       revision: 52bb1783521c62c019451cee9b05b8eda9d7425f

From 87b9a013420ccf3e20cf6673a6785218801fd02c Mon Sep 17 00:00:00 2001
From: "Bansidhar P.M" <bansidhar.mangalwedhekar@nordicsemi.no>
Date: Mon, 10 Feb 2025 12:44:02 +0530
Subject: [PATCH 2859/2913] [nrf fromtree] dts: nordic: Add wifi_spi label

Add wifi_spi label to nRF54h and nRF54l dts files to help
in shield overlay files

Signed-off-by: Bansidhar P.M <bansidhar.mangalwedhekar@nordicsemi.no>
(cherry picked from commit eb93df219703754753d542f668e404db44700cfa)
---
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-common.dtsi | 3 +++
 boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi          | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-common.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-common.dtsi
index 0c5307c4c8c..b0cb997de94 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-common.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-common.dtsi
@@ -16,3 +16,6 @@
 &lfxo {
 	status = "okay";
 };
+
+/* Get a node label for wi-fi spi to use in shield files */
+wifi_spi: &spi130 {};
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi b/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi
index 33cfebb55d6..6a40af0ee95 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi
@@ -98,3 +98,6 @@
 	pinctrl-1 = <&pwm20_sleep>;
 	pinctrl-names = "default", "sleep";
 };
+
+/* Get a node label for wi-fi spi to use in shield files */
+wifi_spi: &spi22 {};

From 54d43b2bd0c382a12569c5293a2b7d800f2f70ff Mon Sep 17 00:00:00 2001
From: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
Date: Mon, 29 Apr 2024 22:46:24 +0530
Subject: [PATCH 2860/2913] [nrf fromtree] drivers: wifi: Create dedicated mem
 pool for Wi-Fi driver

Create dedicated memory pools for Wi-Fi management and
data operations (defaults: 20KB for management and 130KB for data).
Setting Data pool to 110KB for non-Nordic SOCs to resolve
RAM overflows seen in twister runs.

Remove the `HEAP_MEM_POOL_ADD_SIZE_NRF70` hint since we are
creating separate heaps for driver and not allocating from
system heap.

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
(cherry picked from commit aa0cb68c6fca79269c8033d1745d1c0d057f69da)
---
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi      |  17 ++-
 drivers/wifi/nrf_wifi/src/fmac_main.c      |   7 +-
 drivers/wifi/nrf_wifi/src/net_if.c         |   4 +-
 drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c |   7 +-
 drivers/wifi/nrf_wifi/src/wpa_supp_if.c    |  26 +++--
 modules/nrf_wifi/bus/qspi_if.c             |   5 +-
 modules/nrf_wifi/os/CMakeLists.txt         |   1 +
 modules/nrf_wifi/os/shim.c                 | 129 +++++++++++++++++----
 8 files changed, 144 insertions(+), 52 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index d78c11a86e4..dc9372c7416 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -66,12 +66,6 @@ endchoice
 config NET_L2_ETHERNET
 	default y if (!NRF70_RADIO_TEST && !NRF70_OFFLOADED_RAW_TX)
 
-config HEAP_MEM_POOL_ADD_SIZE_NRF70
-	# Use a maximum that works for typical use cases and boards, each sample/app can override
-	# this value if needed by using CONFIG_HEAP_MEM_POOL_IGNORE_MIN
-	def_int 25000 if NRF70_SCAN_ONLY
-	def_int 150000
-
 if NRF70_SYSTEM_MODE
 config NRF70_STA_MODE
 	bool "nRF70 STA mode"
@@ -530,8 +524,19 @@ config NRF70_RSSI_STALE_TIMEOUT_MS
 	  value as the driver does not store it and requires RPU to provide the
 	  information.
 
+config NRF_WIFI_CTRL_HEAP_SIZE
+	int "Dedicated memory pool for control plane"
+	default 20000
+
+config NRF_WIFI_DATA_HEAP_SIZE
+	int "Dedicated memory pool for data plane"
+	default 6000 if NRF70_SCAN_ONLY
+	default 110000 if !SOC_FAMILY_NORDIC_NRF
+	default 130000
+
 if NETWORKING
 # Finetune defaults for certain system components used by the driver
+
 config SYSTEM_WORKQUEUE_STACK_SIZE
 	default 4096
 
diff --git a/drivers/wifi/nrf_wifi/src/fmac_main.c b/drivers/wifi/nrf_wifi/src/fmac_main.c
index 52b57f53b37..5a7d79141bc 100644
--- a/drivers/wifi/nrf_wifi/src/fmac_main.c
+++ b/drivers/wifi/nrf_wifi/src/fmac_main.c
@@ -465,7 +465,8 @@ void reg_change_callbk_fn(void *vif_ctx,
 		return;
 	}
 
-	fmac_dev_ctx->reg_change = k_malloc(sizeof(struct nrf_wifi_event_regulatory_change));
+	fmac_dev_ctx->reg_change = nrf_wifi_osal_mem_alloc(sizeof(struct
+							   nrf_wifi_event_regulatory_change));
 	if (!fmac_dev_ctx->reg_change) {
 		LOG_ERR("%s: Failed to allocate memory for reg_change", __func__);
 		return;
@@ -677,9 +678,9 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_rem_zep(struct nrf_wifi_drv_priv_zep *drv
 
 	nrf_wifi_fmac_dev_rem(rpu_ctx_zep->rpu_ctx);
 
-	k_free(rpu_ctx_zep->extended_capa);
+	nrf_wifi_osal_mem_free(rpu_ctx_zep->extended_capa);
 	rpu_ctx_zep->extended_capa = NULL;
-	k_free(rpu_ctx_zep->extended_capa_mask);
+	nrf_wifi_osal_mem_free(rpu_ctx_zep->extended_capa_mask);
 	rpu_ctx_zep->extended_capa_mask = NULL;
 
 	rpu_ctx_zep->rpu_ctx = NULL;
diff --git a/drivers/wifi/nrf_wifi/src/net_if.c b/drivers/wifi/nrf_wifi/src/net_if.c
index 7433ee13535..5ecb9054f03 100644
--- a/drivers/wifi/nrf_wifi/src/net_if.c
+++ b/drivers/wifi/nrf_wifi/src/net_if.c
@@ -459,7 +459,7 @@ static void ip_maddr_event_handler(struct net_if *iface,
 		goto unlock;
 	}
 
-	mcast_info = k_calloc(sizeof(*mcast_info), sizeof(char));
+	mcast_info = nrf_wifi_osal_mem_zalloc(sizeof(*mcast_info));
 
 	if (!mcast_info) {
 		LOG_ERR("%s: Unable to allocate memory of size %d "
@@ -501,7 +501,7 @@ static void ip_maddr_event_handler(struct net_if *iface,
 					       sizeof(mac_string_buf)));
 	}
 unlock:
-	k_free(mcast_info);
+	nrf_wifi_osal_mem_free(mcast_info);
 	k_mutex_unlock(&vif_ctx_zep->vif_lock);
 }
 #endif /* CONFIG_NRF70_STA_MODE */
diff --git a/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c b/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
index ceabdcf7f01..07560376987 100644
--- a/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
+++ b/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
@@ -109,10 +109,9 @@ int nrf_wifi_disp_scan_zep(const struct device *dev, struct wifi_scan_params *pa
 
 	vif_ctx_zep->disp_scan_cb = cb;
 
-	scan_info = k_calloc(sizeof(*scan_info) +
+	scan_info = nrf_wifi_osal_mem_zalloc(sizeof(*scan_info) +
 			     (num_scan_channels *
-			      sizeof(scan_info->scan_params.center_frequency[0])),
-			     sizeof(char));
+			      sizeof(scan_info->scan_params.center_frequency[0])));
 
 	if (!scan_info) {
 		LOG_ERR("%s: Unable to allocate memory for scan_info (size: %d bytes)",
@@ -226,7 +225,7 @@ int nrf_wifi_disp_scan_zep(const struct device *dev, struct wifi_scan_params *pa
 	ret = 0;
 out:
 	if (scan_info) {
-		k_free(scan_info);
+		nrf_wifi_osal_mem_free(scan_info);
 	}
 	k_mutex_unlock(&vif_ctx_zep->vif_lock);
 	return ret;
diff --git a/drivers/wifi/nrf_wifi/src/wpa_supp_if.c b/drivers/wifi/nrf_wifi/src/wpa_supp_if.c
index 4b28c7bb24e..6dc3315a64c 100644
--- a/drivers/wifi/nrf_wifi/src/wpa_supp_if.c
+++ b/drivers/wifi/nrf_wifi/src/wpa_supp_if.c
@@ -174,7 +174,7 @@ void nrf_wifi_wpa_supp_event_proc_scan_res(void *if_priv,
 		beacon_ie_len = scan_res->beacon_ies_len;
 	}
 
-	r = k_calloc(sizeof(*r) + ie_len + beacon_ie_len, sizeof(char));
+	r = nrf_wifi_osal_mem_zalloc(sizeof(*r) + ie_len + beacon_ie_len);
 
 	if (!r) {
 		LOG_ERR("%s: Unable to allocate memory for scan result", __func__);
@@ -254,7 +254,7 @@ void nrf_wifi_wpa_supp_event_proc_scan_res(void *if_priv,
 		vif_ctx_zep->scan_in_progress = false;
 	}
 
-	k_free(r);
+	nrf_wifi_osal_mem_free(r);
 }
 
 void nrf_wifi_wpa_supp_event_proc_auth_resp(void *if_priv,
@@ -519,8 +519,8 @@ int nrf_wifi_wpa_supp_scan2(void *if_priv, struct wpa_driver_scan_params *params
 		}
 	}
 
-	scan_info = k_calloc(sizeof(*scan_info) + (num_freqs * sizeof(unsigned int)),
-			     sizeof(char));
+	scan_info = nrf_wifi_osal_mem_zalloc(sizeof(*scan_info) +
+					    (num_freqs * sizeof(unsigned int)));
 
 	if (!scan_info) {
 		LOG_ERR("%s: Unable to allocate memory for scan info", __func__);
@@ -579,7 +579,7 @@ int nrf_wifi_wpa_supp_scan2(void *if_priv, struct wpa_driver_scan_params *params
 	ret = 0;
 out:
 	if (scan_info) {
-		k_free(scan_info);
+		nrf_wifi_osal_mem_free(scan_info);
 	}
 	k_mutex_unlock(&vif_ctx_zep->vif_lock);
 	return ret;
@@ -1414,7 +1414,7 @@ int nrf_wifi_nl80211_send_mlme(void *if_priv, const u8 *data,
 
 	k_mutex_lock(&mgmt_tx_lock, K_FOREVER);
 
-	mgmt_tx_info = k_calloc(sizeof(*mgmt_tx_info), sizeof(char));
+	mgmt_tx_info = nrf_wifi_osal_mem_zalloc(sizeof(*mgmt_tx_info));
 
 	if (!mgmt_tx_info) {
 		LOG_ERR("%s: Unable to allocate memory", __func__);
@@ -1491,7 +1491,7 @@ int nrf_wifi_nl80211_send_mlme(void *if_priv, const u8 *data,
 
 out:
 	if (mgmt_tx_info) {
-		k_free(mgmt_tx_info);
+		nrf_wifi_osal_mem_free(mgmt_tx_info);
 	}
 	k_mutex_unlock(&mgmt_tx_lock);
 	k_mutex_unlock(&vif_ctx_zep->vif_lock);
@@ -1610,22 +1610,24 @@ void nrf_wifi_wpa_supp_event_get_wiphy(void *if_priv,
 
 	if ((wiphy_info->params_valid & NRF_WIFI_GET_WIPHY_VALID_EXTENDED_CAPABILITIES) &&
 	    rpu_ctx_zep->extended_capa == NULL) {
+		/* To avoid overflowing the 100 column limit */
+		unsigned char ec_len = wiphy_info->extended_capabilities_len;
 
-		rpu_ctx_zep->extended_capa = k_malloc(wiphy_info->extended_capabilities_len);
+		rpu_ctx_zep->extended_capa = nrf_wifi_osal_mem_alloc(ec_len);
 
 		if (rpu_ctx_zep->extended_capa) {
 			memcpy(rpu_ctx_zep->extended_capa, wiphy_info->extended_capabilities,
-			       wiphy_info->extended_capabilities_len);
+			       ec_len);
 		}
 
-		rpu_ctx_zep->extended_capa_mask = k_malloc(wiphy_info->extended_capabilities_len);
+		rpu_ctx_zep->extended_capa_mask = nrf_wifi_osal_mem_alloc(ec_len);
 
 		if (rpu_ctx_zep->extended_capa_mask) {
 			memcpy(rpu_ctx_zep->extended_capa_mask,
 			       wiphy_info->extended_capabilities_mask,
-			       wiphy_info->extended_capabilities_len);
+			       ec_len);
 		} else {
-			free(rpu_ctx_zep->extended_capa);
+			nrf_wifi_osal_mem_free(rpu_ctx_zep->extended_capa);
 			rpu_ctx_zep->extended_capa = NULL;
 			rpu_ctx_zep->extended_capa_len = 0;
 		}
diff --git a/modules/nrf_wifi/bus/qspi_if.c b/modules/nrf_wifi/bus/qspi_if.c
index 8c381ff60c5..6107a5c4157 100644
--- a/modules/nrf_wifi/bus/qspi_if.c
+++ b/modules/nrf_wifi/bus/qspi_if.c
@@ -24,6 +24,7 @@
 #include <hal/nrf_gpio.h>
 
 #include "spi_nor.h"
+#include "osal_api.h"
 
 /* The QSPI bus node which the NRF70 is on */
 #define QSPI_IF_BUS_NODE DT_NODELABEL(qspi)
@@ -1287,7 +1288,7 @@ int qspi_hl_readw(unsigned int addr, void *data)
 
 	len = len + (4 * qspi_cfg->qspi_slave_latency);
 
-	rxb = k_malloc(len);
+	rxb = nrf_wifi_osal_mem_alloc(len);
 
 	if (rxb == NULL) {
 		LOG_ERR("%s: ERROR ENOMEM line %d", __func__, __LINE__);
@@ -1306,7 +1307,7 @@ int qspi_hl_readw(unsigned int addr, void *data)
 
 	*(uint32_t *)data = *(uint32_t *)(rxb + (len - 4));
 
-	k_free(rxb);
+	nrf_wifi_osal_mem_free(rxb);
 
 	return status;
 }
diff --git a/modules/nrf_wifi/os/CMakeLists.txt b/modules/nrf_wifi/os/CMakeLists.txt
index 42610b9bf57..e4f9cf2a0b6 100644
--- a/modules/nrf_wifi/os/CMakeLists.txt
+++ b/modules/nrf_wifi/os/CMakeLists.txt
@@ -9,6 +9,7 @@ add_subdirectory(${ZEPHYR_NRF_WIFI_MODULE_DIR} nrf_wifi_osal)
 
 zephyr_library_named(nrf-wifi-shim)
 zephyr_include_directories(${CMAKE_CURRENT_LIST_DIR})
+zephyr_include_directories(${ZEPHYR_NRF_WIFI_MODULE_DIR}/os_if/inc)
 zephyr_library_sources(
   shim.c
   timer.c
diff --git a/modules/nrf_wifi/os/shim.c b/modules/nrf_wifi/os/shim.c
index ed6acf95846..5b7245edfbb 100644
--- a/modules/nrf_wifi/os/shim.c
+++ b/modules/nrf_wifi/os/shim.c
@@ -20,6 +20,7 @@
 #include <zephyr/sys/__assert.h>
 #include <zephyr/drivers/wifi/nrf_wifi/bus/rpu_hw_if.h>
 #include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
+#include <zephyr/sys/math_extras.h>
 
 #include "shim.h"
 #include "work.h"
@@ -27,6 +28,14 @@
 #include "osal_ops.h"
 
 LOG_MODULE_REGISTER(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
+#if defined(CONFIG_NOCACHE_MEMORY)
+K_HEAP_DEFINE_NOCACHE(wifi_drv_ctrl_mem_pool, CONFIG_NRF_WIFI_CTRL_HEAP_SIZE);
+K_HEAP_DEFINE_NOCACHE(wifi_drv_data_mem_pool, CONFIG_NRF_WIFI_DATA_HEAP_SIZE);
+#else
+K_HEAP_DEFINE(wifi_drv_ctrl_mem_pool, CONFIG_NRF_WIFI_CTRL_HEAP_SIZE);
+K_HEAP_DEFINE(wifi_drv_data_mem_pool, CONFIG_NRF_WIFI_DATA_HEAP_SIZE);
+#endif /* CONFIG_NOCACHE_MEMORY */
+#define WORD_SIZE 4
 
 struct zep_shim_intr_priv *intr_priv;
 
@@ -34,14 +43,66 @@ static void *zep_shim_mem_alloc(size_t size)
 {
 	size_t size_aligned = ROUND_UP(size, 4);
 
-	return k_malloc(size_aligned);
+	return k_heap_aligned_alloc(&wifi_drv_ctrl_mem_pool, WORD_SIZE, size_aligned, K_FOREVER);
+}
+
+static void *zep_shim_data_mem_alloc(size_t size)
+{
+	size_t size_aligned = ROUND_UP(size, 4);
+
+	return k_heap_aligned_alloc(&wifi_drv_data_mem_pool, WORD_SIZE, size_aligned, K_FOREVER);
 }
 
 static void *zep_shim_mem_zalloc(size_t size)
 {
+	void *ret;
+	size_t bounds;
+
+	size_t size_aligned = ROUND_UP(size, 4);
+
+	if (size_mul_overflow(size_aligned, sizeof(char), &bounds)) {
+		return NULL;
+	}
+
+	ret = zep_shim_mem_alloc(bounds);
+	if (ret != NULL) {
+		(void)memset(ret, 0, bounds);
+	}
+
+	return ret;
+}
+
+static void *zep_shim_data_mem_zalloc(size_t size)
+{
+	void *ret;
+	size_t bounds;
+
 	size_t size_aligned = ROUND_UP(size, 4);
 
-	return k_calloc(size_aligned, sizeof(char));
+	if (size_mul_overflow(size_aligned, sizeof(char), &bounds)) {
+		return NULL;
+	}
+
+	ret = zep_shim_data_mem_alloc(bounds);
+	if (ret != NULL) {
+		(void)memset(ret, 0, bounds);
+	}
+
+	return ret;
+}
+
+static void zep_shim_mem_free(void *buf)
+{
+	if (buf) {
+		k_heap_free(&wifi_drv_ctrl_mem_pool, buf);
+	}
+}
+
+static void zep_shim_data_mem_free(void *buf)
+{
+	if (buf) {
+		k_heap_free(&wifi_drv_data_mem_pool, buf);
+	}
 }
 
 static void *zep_shim_mem_cpy(void *dest, const void *src, size_t count)
@@ -118,7 +179,7 @@ static void *zep_shim_spinlock_alloc(void)
 {
 	struct k_mutex *lock = NULL;
 
-	lock = k_malloc(sizeof(*lock));
+	lock = zep_shim_mem_zalloc(sizeof(*lock));
 
 	if (!lock) {
 		LOG_ERR("%s: Unable to allocate memory for spinlock", __func__);
@@ -129,7 +190,7 @@ static void *zep_shim_spinlock_alloc(void)
 
 static void zep_shim_spinlock_free(void *lock)
 {
-	k_free(lock);
+	k_heap_free(&wifi_drv_ctrl_mem_pool, lock);
 }
 
 static void zep_shim_spinlock_init(void *lock)
@@ -213,16 +274,16 @@ static void *zep_shim_nbuf_alloc(unsigned int size)
 {
 	struct nwb *nbuff;
 
-	nbuff = (struct nwb *)k_calloc(sizeof(struct nwb), sizeof(char));
+	nbuff = (struct nwb *)zep_shim_data_mem_zalloc(sizeof(struct nwb));
 
 	if (!nbuff) {
 		return NULL;
 	}
 
-	nbuff->priv = k_calloc(size, sizeof(char));
+	nbuff->priv = zep_shim_data_mem_zalloc(size);
 
 	if (!nbuff->priv) {
-		k_free(nbuff);
+		zep_shim_data_mem_free(nbuff);
 		return NULL;
 	}
 
@@ -241,8 +302,8 @@ static void zep_shim_nbuf_free(void *nbuf)
 		return;
 	}
 
-	k_free(((struct nwb *)nbuf)->priv);
-	k_free(nbuf);
+	zep_shim_data_mem_free(((struct nwb *)nbuf)->priv);
+	zep_shim_data_mem_free(nbuf);
 }
 
 static void zep_shim_nbuf_headroom_res(void *nbuf, unsigned int size)
@@ -406,7 +467,7 @@ void *net_raw_pkt_from_nbuf(void *iface, void *frm,
 	nwb_data = zep_shim_nbuf_data_get(nwb);
 	total_len = raw_hdr_len + nwb_len;
 
-	data = (unsigned char *)k_malloc(total_len);
+	data = (unsigned char *)zep_shim_data_mem_zalloc(total_len);
 	if (!data) {
 		LOG_ERR("%s: Unable to allocate memory for sniffer data packet", __func__);
 		goto out;
@@ -428,7 +489,7 @@ void *net_raw_pkt_from_nbuf(void *iface, void *frm,
 	}
 out:
 	if (data != NULL) {
-		k_free(data);
+		zep_shim_data_mem_free(data);
 	}
 
 	if (pkt_free) {
@@ -443,7 +504,7 @@ static void *zep_shim_llist_node_alloc(void)
 {
 	struct zep_shim_llist_node *llist_node = NULL;
 
-	llist_node = k_calloc(sizeof(*llist_node), sizeof(char));
+	llist_node = zep_shim_data_mem_zalloc(sizeof(*llist_node));
 
 	if (!llist_node) {
 		LOG_ERR("%s: Unable to allocate memory for linked list node", __func__);
@@ -457,7 +518,7 @@ static void *zep_shim_llist_node_alloc(void)
 
 static void zep_shim_llist_node_free(void *llist_node)
 {
-	k_free(llist_node);
+	zep_shim_data_mem_free(llist_node);
 }
 
 static void *zep_shim_llist_node_data_get(void *llist_node)
@@ -482,7 +543,20 @@ static void *zep_shim_llist_alloc(void)
 {
 	struct zep_shim_llist *llist = NULL;
 
-	llist = k_calloc(sizeof(*llist), sizeof(char));
+	llist = zep_shim_data_mem_zalloc(sizeof(*llist));
+
+	if (!llist) {
+		LOG_ERR("%s: Unable to allocate memory for linked list", __func__);
+	}
+
+	return llist;
+}
+
+static void *zep_shim_ctrl_llist_alloc(void)
+{
+	struct zep_shim_llist *llist = NULL;
+
+	llist = zep_shim_mem_zalloc(sizeof(*llist));
 
 	if (!llist) {
 		LOG_ERR("%s: Unable to allocate memory for linked list", __func__);
@@ -493,7 +567,12 @@ static void *zep_shim_llist_alloc(void)
 
 static void zep_shim_llist_free(void *llist)
 {
-	k_free(llist);
+	zep_shim_data_mem_free(llist);
+}
+
+static void zep_shim_ctrl_llist_free(void *llist)
+{
+	zep_shim_mem_free(llist);
 }
 
 static void zep_shim_llist_init(void *llist)
@@ -698,7 +777,7 @@ static void *zep_shim_bus_qspi_init(void)
 {
 	struct zep_shim_bus_qspi_priv *qspi_priv = NULL;
 
-	qspi_priv = k_calloc(sizeof(*qspi_priv), sizeof(char));
+	qspi_priv = zep_shim_mem_zalloc(sizeof(*qspi_priv));
 
 	if (!qspi_priv) {
 		LOG_ERR("%s: Unable to allocate memory for qspi_priv", __func__);
@@ -714,7 +793,7 @@ static void zep_shim_bus_qspi_deinit(void *os_qspi_priv)
 
 	qspi_priv = os_qspi_priv;
 
-	k_free(qspi_priv);
+	zep_shim_mem_free(qspi_priv);
 }
 
 #ifdef CONFIG_NRF_WIFI_LOW_POWER
@@ -789,7 +868,7 @@ static enum nrf_wifi_status zep_shim_bus_qspi_intr_reg(void *os_dev_ctx, void *c
 
 	ARG_UNUSED(os_dev_ctx);
 
-	intr_priv = k_calloc(sizeof(*intr_priv), sizeof(char));
+	intr_priv = zep_shim_mem_zalloc(sizeof(*intr_priv));
 
 	if (!intr_priv) {
 		LOG_ERR("%s: Unable to allocate memory for intr_priv", __func__);
@@ -805,7 +884,7 @@ static enum nrf_wifi_status zep_shim_bus_qspi_intr_reg(void *os_dev_ctx, void *c
 
 	if (ret) {
 		LOG_ERR("%s: request_irq failed", __func__);
-		k_free(intr_priv);
+		zep_shim_mem_free(intr_priv);
 		intr_priv = NULL;
 		goto out;
 	}
@@ -831,7 +910,7 @@ static void zep_shim_bus_qspi_intr_unreg(void *os_qspi_dev_ctx)
 
 	k_work_cancel_delayable_sync(&intr_priv->work, &sync);
 
-	k_free(intr_priv);
+	zep_shim_mem_free(intr_priv);
 	intr_priv = NULL;
 }
 
@@ -840,7 +919,7 @@ static void *zep_shim_timer_alloc(void)
 {
 	struct timer_list *timer = NULL;
 
-	timer = k_malloc(sizeof(*timer));
+	timer = zep_shim_mem_zalloc(sizeof(*timer));
 
 	if (!timer) {
 		LOG_ERR("%s: Unable to allocate memory for work", __func__);
@@ -859,7 +938,7 @@ static void zep_shim_timer_init(void *timer, void (*callback)(unsigned long), un
 
 static void zep_shim_timer_free(void *timer)
 {
-	k_free(timer);
+	zep_shim_mem_free(timer);
 }
 
 static void zep_shim_timer_schedule(void *timer, unsigned long duration)
@@ -907,7 +986,9 @@ static unsigned int zep_shim_strlen(const void *str)
 const struct nrf_wifi_osal_ops nrf_wifi_os_zep_ops = {
 	.mem_alloc = zep_shim_mem_alloc,
 	.mem_zalloc = zep_shim_mem_zalloc,
-	.mem_free = k_free,
+	.data_mem_zalloc = zep_shim_data_mem_zalloc,
+	.mem_free = zep_shim_mem_free,
+	.data_mem_free = zep_shim_data_mem_free,
 	.mem_cpy = zep_shim_mem_cpy,
 	.mem_set = zep_shim_mem_set,
 	.mem_cmp = zep_shim_mem_cmp,
@@ -936,7 +1017,9 @@ const struct nrf_wifi_osal_ops nrf_wifi_os_zep_ops = {
 	.llist_node_data_set = zep_shim_llist_node_data_set,
 
 	.llist_alloc = zep_shim_llist_alloc,
+	.ctrl_llist_alloc = zep_shim_ctrl_llist_alloc,
 	.llist_free = zep_shim_llist_free,
+	.ctrl_llist_free = zep_shim_ctrl_llist_free,
 	.llist_init = zep_shim_llist_init,
 	.llist_add_node_tail = zep_shim_llist_add_node_tail,
 	.llist_add_node_head = zep_shim_llist_add_node_head,

From e863a70b63d744586dde14d16c6151abe5c071bc Mon Sep 17 00:00:00 2001
From: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
Date: Thu, 28 Nov 2024 21:32:45 +0530
Subject: [PATCH 2861/2913] [nrf fromtree] manifest: nrf_wifi: Pull in changes
 for dedicated memory pools

Pull changes for creating separate memory pools for control traffic
and data traffic.

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
(cherry picked from commit 7f775c32563e2cf722e839a18a4b1bba32bf08af)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index f5b30e08c02..58856b5765c 100644
--- a/west.yml
+++ b/west.yml
@@ -318,7 +318,7 @@ manifest:
       revision: b84bd7314a239f818e78f6927f5673247816df53
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: e35f707a782b7c4c0eb83a3b06ca4e6eb693f29f
+      revision: 86de376136b668bf9372e8e5414aa6aad89ccd13
       path: modules/lib/nrf_wifi
     - name: open-amp
       revision: 52bb1783521c62c019451cee9b05b8eda9d7425f

From 57873121afb623c54f2cf757794e5c082911f1ae Mon Sep 17 00:00:00 2001
From: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
Date: Thu, 20 Feb 2025 14:01:12 +0530
Subject: [PATCH 2862/2913] [nrf fromtree] modules: nrf_wifi: Include OSAL lib
 in buslib compilation

With introduction of OSAL wrapper for memory allocation, usage of
zephyr's native malloc calls need to be removed. When NRF70 driver
is not enabled, OSAL needs to be built explicitly.

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
(cherry picked from commit 208e6869e531655512d72deaa0a6c03bdc53a0a3)
---
 modules/nrf_wifi/bus/CMakeLists.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/nrf_wifi/bus/CMakeLists.txt b/modules/nrf_wifi/bus/CMakeLists.txt
index f939ce3287c..ac9a2f0fd84 100644
--- a/modules/nrf_wifi/bus/CMakeLists.txt
+++ b/modules/nrf_wifi/bus/CMakeLists.txt
@@ -9,15 +9,23 @@ if(NOT DEFINED ENV{ZEPHYR_BASE})
     message(FATAL_ERROR "ZEPHYR_BASE environment variable is not set. Please set it to the Zephyr base directory.")
 endif()
 
+set(NRF_WIFI_DIR ${ZEPHYR_CURRENT_MODULE_DIR})
+
 if (CONFIG_NRF70_BUSLIB)
   zephyr_library_named(nrf70-buslib)
   zephyr_library_include_directories(
     inc
+    ${NRF_WIFI_DIR}/os_if/inc
   )
   zephyr_library_sources(
     rpu_hw_if.c
     device.c
   )
+  if(NOT CONFIG_WIFI_NRF70)
+    zephyr_library_sources(
+      ${NRF_WIFI_DIR}/os_if/src/osal.c
+    )
+  endif()
   zephyr_library_sources_ifdef(CONFIG_NRF70_ON_QSPI
     qspi_if.c
   )

From a97748e8c5d9c726c7707f78e833639ce7e127aa Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Thu, 27 Feb 2025 13:03:10 +0530
Subject: [PATCH 2863/2913] [nrf fromtree] manifest: Update nrf_wifi for doc
 fix

Some file names are changed, fix file names in
doxygen comments.

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit 46829bbe6bee531e5ba71d27addac51c292aca7d)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 58856b5765c..93b4b4cafc3 100644
--- a/west.yml
+++ b/west.yml
@@ -318,7 +318,7 @@ manifest:
       revision: b84bd7314a239f818e78f6927f5673247816df53
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: 86de376136b668bf9372e8e5414aa6aad89ccd13
+      revision: 396059ca7a6162d07276c5797adbb1311b81cd78
       path: modules/lib/nrf_wifi
     - name: open-amp
       revision: 52bb1783521c62c019451cee9b05b8eda9d7425f

From af84953eacbb8c9459accca21b4df76ebbc7684e Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Mon, 10 Mar 2025 14:03:02 +0530
Subject: [PATCH 2864/2913] [nrf fromtree] nrf_wifi: src: Fix include file path

With recent code restructuring file name and path
has been changed in nrf_wifi lib.

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit 928534455bcc5f190a571af2547ff8f6c4511fb6)
---
 drivers/wifi/nrf_wifi/src/coex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/wifi/nrf_wifi/src/coex.c b/drivers/wifi/nrf_wifi/src/coex.c
index 947bf8511a2..8177fb6f85b 100644
--- a/drivers/wifi/nrf_wifi/src/coex.c
+++ b/drivers/wifi/nrf_wifi/src/coex.c
@@ -17,7 +17,7 @@
 #include "coex.h"
 #include "coex_struct.h"
 #include "fmac_main.h"
-#include "fmac_api.h"
+#include "common/fmac_api_common.h"
 
 LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 

From 6506c6dff69324fe5adad451f918c1164ffcc1a6 Mon Sep 17 00:00:00 2001
From: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
Date: Mon, 10 Mar 2025 18:47:08 +0530
Subject: [PATCH 2865/2913] [nrf fromtree] manifest: nrf_wifi: Pull in change
 to include reg chan info

Pull in change to include reg chan info along with reg domain in the
GET_REG_DOMAIN event for the radio test and offloaded raw TX modes.

Signed-off-by: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
(cherry picked from commit a34198b2a243334f63cf8487bae19a7105f10fc1)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 93b4b4cafc3..d913d3550c0 100644
--- a/west.yml
+++ b/west.yml
@@ -318,7 +318,7 @@ manifest:
       revision: b84bd7314a239f818e78f6927f5673247816df53
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: 396059ca7a6162d07276c5797adbb1311b81cd78
+      revision: 0cd3bb2291a7dd22f4cdb1a4cd935a213c2bbfab
       path: modules/lib/nrf_wifi
     - name: open-amp
       revision: 52bb1783521c62c019451cee9b05b8eda9d7425f

From 7e79576ae12156358d80d8031bfb44727c79bac2 Mon Sep 17 00:00:00 2001
From: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
Date: Thu, 13 Mar 2025 18:43:27 +0530
Subject: [PATCH 2866/2913] [nrf fromtree] manifest: nrf_wifi: Pull fix for CI
 failure

Pull in fix for CI failure in Offloaded raw TX mode caused
due to commit 0cd3bb2291a7dd22f4cdb1a4cd935a213c2bbfab in nrf_wifi

Signed-off-by: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
(cherry picked from commit 69ce6af74b2c1ba1ef39e602e8ad3dc071b1bf50)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index d913d3550c0..54bb2e81db2 100644
--- a/west.yml
+++ b/west.yml
@@ -318,7 +318,7 @@ manifest:
       revision: b84bd7314a239f818e78f6927f5673247816df53
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: 0cd3bb2291a7dd22f4cdb1a4cd935a213c2bbfab
+      revision: 662ed74dce955e6c243f91c45a66768f5971e3cb
       path: modules/lib/nrf_wifi
     - name: open-amp
       revision: 52bb1783521c62c019451cee9b05b8eda9d7425f

From b01256f092ea9a69a3130e06c588762101449675 Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Thu, 20 Mar 2025 18:15:44 +0530
Subject: [PATCH 2867/2913] [nrf fromtree] drivers: nrf_wifi: Add prompt to
 Kconfig

Add prompt to Kconfig NRF70_SYSTEM_WITH_RAW_MODES.
It is assigned in a configuration file, but is not directly
user-configurable (has no prompt). It gets its value
indirectly from other symbols.

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit 3ef187dee67b31e60d2c231a457f0eff67dca38e)
---
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index dc9372c7416..d32c88bd76c 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -86,7 +86,7 @@ config NRF70_P2P_MODE
 	bool "P2P support in driver"
 
 config NRF70_SYSTEM_WITH_RAW_MODES
-	bool
+	bool "nRF70 system mode with raw modes"
 	default y if (NRF70_RAW_DATA_TX || NRF70_RAW_DATA_RX || NRF70_PROMISC_DATA_RX)
 	depends on WIFI_NRF7002 || WIFI_NRF7001
 	help

From 3c872b77f615192b5ef3cfec44010891665a824b Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Thu, 20 Mar 2025 18:20:22 +0530
Subject: [PATCH 2868/2913] [nrf fromtree] manifest: Update nrf_wifi revision
 to fix doxygen comments

Fix doxygen comments of arguments.

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit 5f3bd5dfd4c432632af791584aa1ed7352826174)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 54bb2e81db2..9c8bf80a9eb 100644
--- a/west.yml
+++ b/west.yml
@@ -318,7 +318,7 @@ manifest:
       revision: b84bd7314a239f818e78f6927f5673247816df53
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: 662ed74dce955e6c243f91c45a66768f5971e3cb
+      revision: 0d0c08e89b50d566285c661e886bf5db3ebaa077
       path: modules/lib/nrf_wifi
     - name: open-amp
       revision: 52bb1783521c62c019451cee9b05b8eda9d7425f

From 957793e22d7265fa790dd3277461e259082c3f82 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 18 Mar 2025 23:57:27 +0530
Subject: [PATCH 2869/2913] [nrf fromtree] samples: net: zperf: Fix RAM
 overflow for nRF70

nRF70 driver now uses a separate heap, so, no need to explicitly
configure the kernel heap.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 0b8601cfbeed14b804a4a676b7b05b433049876c)
---
 samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf
index 7842b0da31e..c9710d89dc5 100644
--- a/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf
+++ b/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -4,7 +4,6 @@ CONFIG_NET_PKT_TX_COUNT=27
 CONFIG_NET_BUF_RX_COUNT=28
 CONFIG_NET_BUF_TX_COUNT=54
 CONFIG_NET_BUF_DATA_SIZE=1100
-CONFIG_HEAP_MEM_POOL_SIZE=260000
 CONFIG_NRF70_MAX_TX_AGGREGATION=4
 CONFIG_NRF70_QSPI_LOW_POWER=n
 

From 7a03b571f25ca5f614b5151341d76f39e083dd9d Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Wed, 19 Mar 2025 00:03:22 +0530
Subject: [PATCH 2870/2913] [nrf fromtree] samples: net: zperf: Remove fixed
 size config for nRF70

nRF70 now by default uses variale buffers.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 8fe1df6f59722aafb1cb6154a1373a3dd6f109d6)
---
 samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf
index c9710d89dc5..1ae29c3fec5 100644
--- a/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf
+++ b/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -3,7 +3,6 @@ CONFIG_NET_PKT_RX_COUNT=28
 CONFIG_NET_PKT_TX_COUNT=27
 CONFIG_NET_BUF_RX_COUNT=28
 CONFIG_NET_BUF_TX_COUNT=54
-CONFIG_NET_BUF_DATA_SIZE=1100
 CONFIG_NRF70_MAX_TX_AGGREGATION=4
 CONFIG_NRF70_QSPI_LOW_POWER=n
 

From e5b878d3ad3fc1f401f71bb382ac80890b259c9e Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 24 Mar 2025 21:05:03 +0530
Subject: [PATCH 2871/2913] [nrf fromtree] samples: net: zperf: Optimize heap
 for nRF70 Series

Fine-tune the heap to get peak UDP (TX and RX) results but with minimal
heap consumption.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit be4c79b01ee3a5236e34eb48d8e96c14b6242c0d)
---
 samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf
index 1ae29c3fec5..4373713af69 100644
--- a/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf
+++ b/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -3,6 +3,9 @@ CONFIG_NET_PKT_RX_COUNT=28
 CONFIG_NET_PKT_TX_COUNT=27
 CONFIG_NET_BUF_RX_COUNT=28
 CONFIG_NET_BUF_TX_COUNT=54
+# reduces driver heap usage
+CONFIG_NRF70_RX_NUM_BUFS=16
+CONFIG_NRF_WIFI_DATA_HEAP_SIZE=50000
 CONFIG_NRF70_MAX_TX_AGGREGATION=4
 CONFIG_NRF70_QSPI_LOW_POWER=n
 

From 0f30c4cb3a23411fa0e90811bb85d281e5f07ef9 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Sat, 8 Feb 2025 01:34:48 +0530
Subject: [PATCH 2872/2913] [nrf fromtree] drivers: nrf_wifi: Implement TX
 zero-copy feature

This uses the network packet as is without the need for a copy all the
way till the packet is handed over to RPU.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 5119f9c3799ef8ed5965e130249c3e212cb70dbb)
---
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi | 21 ++++++++++
 drivers/wifi/nrf_wifi/src/net_if.c    |  5 +++
 modules/nrf_wifi/os/shim.c            | 59 +++++++++++++++++++++++++++
 modules/nrf_wifi/os/shim.h            |  2 +
 4 files changed, 87 insertions(+)

diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index d32c88bd76c..1fe0ad3503b 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -817,4 +817,25 @@ config NRF_WIFI_COEX_DISABLE_PRIORITY_WINDOW_FOR_SCAN
 	help
 	  Enable this configuration to disable priority window for scan
 	  in the case of coexistence with Short Range radio.
+
+if NETWORKING
+config NRF_WIFI_ZERO_COPY_TX
+	bool "Zero copy Transmit path [EXPERIMENTAL]"
+	select NET_L2_ETHERNET_RESERVE_HEADER
+	select EXPERIMENTAL
+	# 54L has lower RAM
+	default y if SOC_SERIES_NRF54LX
+	help
+	  Enable this configuration to use zero copy Transmit path.
+	  The driver will use the network buffer directly for transmission
+	  without copying the data to the driver's buffer. This reduces the
+	  driver heap memory usage without much impact on the performance.
+
+	  The application should configure the network buffers to ensure that
+	  the whole packet fits in a single buffer, else the driver will fallback
+	  to the normal copy path, but the memory requirements would still match
+	  to the zero copy path and may be sub-optimal for the normal copy path.
+
+endif # NETWORKING
+
 endif # WIFI_NRF70
diff --git a/drivers/wifi/nrf_wifi/src/net_if.c b/drivers/wifi/nrf_wifi/src/net_if.c
index 5ecb9054f03..5f79e2de26d 100644
--- a/drivers/wifi/nrf_wifi/src/net_if.c
+++ b/drivers/wifi/nrf_wifi/src/net_if.c
@@ -1001,6 +1001,11 @@ int nrf_wifi_if_get_config_zep(const struct device *dev,
 					 ETHERNET_CHECKSUM_SUPPORT_TCP |
 					 ETHERNET_CHECKSUM_SUPPORT_UDP;
 	}
+#endif
+#ifdef CONFIG_NRF_WIFI_ZERO_COPY_TX
+	if (type == ETHERNET_CONFIG_TYPE_EXTRA_TX_PKT_HEADROOM) {
+		config->extra_tx_pkt_headroom = NRF_WIFI_EXTRA_TX_HEADROOM;
+	}
 #endif
 	ret = 0;
 unlock:
diff --git a/modules/nrf_wifi/os/shim.c b/modules/nrf_wifi/os/shim.c
index 5b7245edfbb..4d82fdf2bfb 100644
--- a/modules/nrf_wifi/os/shim.c
+++ b/modules/nrf_wifi/os/shim.c
@@ -268,6 +268,9 @@ struct nwb {
 	void (*cleanup_cb)();
 	unsigned char priority;
 	bool chksum_done;
+#ifdef CONFIG_NRF_WIFI_ZERO_COPY_TX
+	struct net_pkt *pkt;
+#endif
 };
 
 static void *zep_shim_nbuf_alloc(unsigned int size)
@@ -301,6 +304,12 @@ static void zep_shim_nbuf_free(void *nbuf)
 	if (!nbuf) {
 		return;
 	}
+#ifdef CONFIG_NRF_WIFI_ZERO_COPY_TX
+	if (((struct nwb *)nbuf)->pkt) {
+		net_pkt_unref(((struct nwb *)nbuf)->pkt);
+		((struct nwb *)nbuf)->pkt = NULL;
+	}
+#endif /* CONFIG_NRF_WIFI_ZERO_COPY_TX */
 
 	zep_shim_data_mem_free(((struct nwb *)nbuf)->priv);
 	zep_shim_data_mem_free(nbuf);
@@ -387,12 +396,62 @@ static void zep_shim_nbuf_set_chksum_done(void *nbuf, unsigned char chksum_done)
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/net_core.h>
 
+#ifdef CONFIG_NRF_WIFI_ZERO_COPY_TX
+void *net_pkt_to_nbuf_zc(struct net_pkt *pkt)
+{
+	struct nwb *nbuff;
+
+	if (!pkt || !pkt->buffer) {
+		LOG_DBG("Invalid packet, dropping");
+		return NULL;
+	}
+
+	/* Check if packet has more than one fragment */
+	if (pkt->buffer->frags) {
+		LOG_ERR("Zero-copy only supports single buffer packets");
+		return NULL;
+	}
+
+	nbuff = zep_shim_nbuf_alloc(NRF_WIFI_EXTRA_TX_HEADROOM); /* Just for headers */
+	if (!nbuff) {
+		return NULL;
+	}
+
+	zep_shim_nbuf_headroom_res(nbuff, NRF_WIFI_EXTRA_TX_HEADROOM);
+
+	/* Zero-copy: point to the single data buffer */
+	/* TODO: Use API for proper cursor access? */
+	nbuff->data = pkt->buffer->data;
+	nbuff->len = pkt->buffer->len;
+
+	nbuff->priority = net_pkt_priority(pkt);
+	nbuff->chksum_done = (bool)net_pkt_is_chksum_done(pkt);
+
+	nbuff->pkt = pkt;
+	/* Ref the packet so that it is not freed */
+	net_pkt_ref(pkt);
+
+	return nbuff;
+}
+#endif /* CONFIG_NRF_WIFI_ZERO_COPY_TX */
+
 void *net_pkt_to_nbuf(struct net_pkt *pkt)
 {
 	struct nwb *nbuff;
 	unsigned char *data;
 	unsigned int len;
 
+	if (!pkt) {
+		return NULL;
+	}
+
+#ifdef CONFIG_NRF_WIFI_ZERO_COPY_TX
+	/* For zero-copy, check if packet has single buffer */
+	if (pkt->buffer && !pkt->buffer->frags) {
+		return net_pkt_to_nbuf_zc(pkt);
+	}
+#endif /* CONFIG_NRF_WIFI_ZERO_COPY_TX */
+
 	len = net_pkt_get_len(pkt);
 
 	nbuff = zep_shim_nbuf_alloc(len + 100);
diff --git a/modules/nrf_wifi/os/shim.h b/modules/nrf_wifi/os/shim.h
index be26fd6355e..b479f5c8df8 100644
--- a/modules/nrf_wifi/os/shim.h
+++ b/modules/nrf_wifi/os/shim.h
@@ -16,6 +16,8 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/net/net_pkt.h>
 
+#define NRF_WIFI_EXTRA_TX_HEADROOM 100
+
 /**
  * struct zep_shim_bus_qspi_priv - Structure to hold context information for the Linux OS
  *                        shim.

From 0a319dca6d76b4d98678d8d42d6a292cf00711b0 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 18 Mar 2025 23:54:54 +0530
Subject: [PATCH 2873/2913] [nrf fromtree] samples: net: zperf: Fine tune
 memory to align zero-copy

Now that nRF70 by default uses zero-copy fine-tune the configuration to
get optimal memory while getting peak throughputs.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit e33d9ee45c33c01e223ee141b75e650d2dfe1c02)
---
 samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf
index 4373713af69..2b7f5e48de1 100644
--- a/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf
+++ b/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -1,11 +1,11 @@
 # Optimized networking settings for performance
 CONFIG_NET_PKT_RX_COUNT=28
-CONFIG_NET_PKT_TX_COUNT=27
+CONFIG_NET_PKT_TX_COUNT=28
 CONFIG_NET_BUF_RX_COUNT=28
-CONFIG_NET_BUF_TX_COUNT=54
-# reduces driver heap usage
+CONFIG_NET_BUF_TX_COUNT=28
 CONFIG_NRF70_RX_NUM_BUFS=16
-CONFIG_NRF_WIFI_DATA_HEAP_SIZE=50000
+CONFIG_NRF_WIFI_DATA_HEAP_SIZE=30000
+CONFIG_NET_PKT_BUF_TX_DATA_POOL_SIZE=20000
 CONFIG_NRF70_MAX_TX_AGGREGATION=4
 CONFIG_NRF70_QSPI_LOW_POWER=n
 

From 5d63d145c53885932f6e6082353501b5767c8a56 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 4 Feb 2025 15:45:28 +0530
Subject: [PATCH 2874/2913] [nrf fromtree] net: l2: Add a config option to
 allow mismatched L3/L2 address packets

The RFC1122 section 3.3.6 says we SHOULD drop the packets if L2 address
is brodcast but L3 address is unicast, but we had seen some Wi-Fi access
points in the field not conforming to that, and DHCP offer is dropped
due to this and causes Wi-Fi connectivity issues.

As the RFC saus it's SHOULD and not a MUST, add a config option to allow
such packets, disabled by default.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 4cd6654b2196bf00d62a528707e45c15db8b627d)
---
 subsys/net/l2/ethernet/Kconfig    | 8 ++++++++
 subsys/net/l2/ethernet/ethernet.c | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/subsys/net/l2/ethernet/Kconfig b/subsys/net/l2/ethernet/Kconfig
index a07734fc0f8..3e5d1c5bb15 100644
--- a/subsys/net/l2/ethernet/Kconfig
+++ b/subsys/net/l2/ethernet/Kconfig
@@ -32,6 +32,14 @@ config NET_L2_ETHERNET_MGMT
 	  Enable support net_mgmt Ethernet interface which can be used to
 	  configure at run-time Ethernet drivers and L2 settings.
 
+
+config NET_L2_ETHERNET_ACCEPT_MISMATCH_L3_L2_ADDR
+	bool "Accept mismatched L3 and L2 addresses"
+	help
+	  If enabled, then accept packets where the L3 and L2 addresses do not
+	  conform to RFC1122 section 3.3.6. This is useful in dealing with
+	  buggy devices that do not follow the RFC.
+
 config NET_VLAN
 	bool "Virtual LAN support"
 	select NET_L2_VIRTUAL
diff --git a/subsys/net/l2/ethernet/ethernet.c b/subsys/net/l2/ethernet/ethernet.c
index 3f369e983b5..c031a7d0ed0 100644
--- a/subsys/net/l2/ethernet/ethernet.c
+++ b/subsys/net/l2/ethernet/ethernet.c
@@ -176,6 +176,10 @@ static inline
 enum net_verdict ethernet_check_ipv4_bcast_addr(struct net_pkt *pkt,
 						struct net_eth_hdr *hdr)
 {
+	if (IS_ENABLED(CONFIG_NET_L2_ETHERNET_ACCEPT_MISMATCH_L3_L2_ADDR)) {
+		return NET_OK;
+	}
+
 	if (net_eth_is_addr_broadcast(&hdr->dst) &&
 	    !(net_ipv4_is_addr_mcast((struct in_addr *)NET_IPV4_HDR(pkt)->dst) ||
 	      net_ipv4_is_addr_bcast(net_pkt_iface(pkt),

From bdb8c56d8875aff847476763ffb93d14da4c0862 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Tue, 21 Jan 2025 12:39:03 +0100
Subject: [PATCH 2875/2913] [nrf fromtree] net: ethernet: Allow drivers to
 reserve net_pkt headroom

Add new Ethernet driver config option,
ETHERNET_CONFIG_TYPE_EXTRA_TX_PKT_HEADROOM, which allows Ethernet
drivers to inform L2 about the extra net_pkt headroom they need to be
allocated.
This is only supported when CONFIG_NET_L2_ETHERNET_RESERVE_HEADER is
enabled, so that it's possible to fit entire packet into a single
net_buf, which is needed for zero-copy transmission.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 78c3996b593a7115cdb6e3d6f6200ff7b1f7e9b1)
---
 include/zephyr/net/ethernet.h     |  5 ++++-
 subsys/net/l2/ethernet/ethernet.c | 11 +++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/include/zephyr/net/ethernet.h b/include/zephyr/net/ethernet.h
index c870525c2e9..b4943a34692 100644
--- a/include/zephyr/net/ethernet.h
+++ b/include/zephyr/net/ethernet.h
@@ -230,7 +230,8 @@ enum ethernet_config_type {
 	ETHERNET_CONFIG_TYPE_T1S_PARAM,
 	ETHERNET_CONFIG_TYPE_TXINJECTION_MODE,
 	ETHERNET_CONFIG_TYPE_RX_CHECKSUM_SUPPORT,
-	ETHERNET_CONFIG_TYPE_TX_CHECKSUM_SUPPORT
+	ETHERNET_CONFIG_TYPE_TX_CHECKSUM_SUPPORT,
+	ETHERNET_CONFIG_TYPE_EXTRA_TX_PKT_HEADROOM,
 };
 
 enum ethernet_qav_param_type {
@@ -525,6 +526,8 @@ struct ethernet_config {
 		enum ethernet_checksum_support chksum_support;
 
 		struct ethernet_filter filter;
+
+		uint16_t extra_tx_pkt_headroom;
 	};
 };
 
diff --git a/subsys/net/l2/ethernet/ethernet.c b/subsys/net/l2/ethernet/ethernet.c
index c031a7d0ed0..354e83a6ae4 100644
--- a/subsys/net/l2/ethernet/ethernet.c
+++ b/subsys/net/l2/ethernet/ethernet.c
@@ -884,8 +884,15 @@ static int ethernet_l2_alloc(struct net_if *iface, struct net_pkt *pkt,
 			     size_t size, enum net_ip_protocol proto,
 			     k_timeout_t timeout)
 {
-	return net_pkt_alloc_buffer_with_reserve(pkt, size,
-						 get_reserve_ll_header_size(iface),
+	size_t reserve = get_reserve_ll_header_size(iface);
+	struct ethernet_config config;
+
+	if (net_eth_get_hw_config(iface, ETHERNET_CONFIG_TYPE_EXTRA_TX_PKT_HEADROOM,
+				  &config) == 0) {
+		reserve += config.extra_tx_pkt_headroom;
+	}
+
+	return net_pkt_alloc_buffer_with_reserve(pkt, size, reserve,
 						 proto, timeout);
 }
 #else

From 7ec894accd34a0b912620053ee41b1c3e3187c22 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Tue, 21 Jan 2025 13:12:34 +0100
Subject: [PATCH 2876/2913] [nrf fromtree] net: ethernet: Remove L2 header
 stripping after TX

It seems that this change was solely added to address issues with old
TCP stack, which blindly queued packets intended for TX for potential
further retransmission, expecting that the packet would remain intact
during transmission.

I think this assumption was wrong, as it's natural that lower layers
append respective headers to the packet, and this "header stripping"
behavior was specific for Ethernet L2 only. If an upper layer expects
that the packet would need to be retransmitted at some point, it should
clone it instead.

Therefore, remove the L2 header stripping from the Ethernet L2 to avoid
any potential issues in zero-copy case.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 21b71224ac2ad48d15870b6b4a2ca3837e47acfa)
---
 subsys/net/l2/ethernet/ethernet.c | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/subsys/net/l2/ethernet/ethernet.c b/subsys/net/l2/ethernet/ethernet.c
index 354e83a6ae4..890940f87fc 100644
--- a/subsys/net/l2/ethernet/ethernet.c
+++ b/subsys/net/l2/ethernet/ethernet.c
@@ -664,23 +664,6 @@ static void ethernet_update_tx_stats(struct net_if *iface, struct net_pkt *pkt)
 #define ethernet_update_tx_stats(...)
 #endif /* CONFIG_NET_STATISTICS_ETHERNET */
 
-static void ethernet_remove_l2_header(struct net_pkt *pkt)
-{
-	size_t reserve = get_reserve_ll_header_size(net_pkt_iface(pkt));
-	struct net_buf *buf;
-
-	/* Remove the buffer added in ethernet_fill_header() */
-	if (reserve == 0U) {
-		buf = pkt->buffer;
-		pkt->buffer = buf->frags;
-		buf->frags = NULL;
-
-		net_pkt_frag_unref(buf);
-	} else {
-		net_buf_pull(pkt->buffer, reserve);
-	}
-}
-
 static int ethernet_send(struct net_if *iface, struct net_pkt *pkt)
 {
 	const struct ethernet_api *api = net_if_get_device(iface)->api;
@@ -816,14 +799,12 @@ static int ethernet_send(struct net_if *iface, struct net_pkt *pkt)
 	ret = net_l2_send(api->send, net_if_get_device(iface), iface, pkt);
 	if (ret != 0) {
 		eth_stats_update_errors_tx(iface);
-		ethernet_remove_l2_header(pkt);
 		goto arp_error;
 	}
 
 	ethernet_update_tx_stats(iface, pkt);
 
 	ret = net_pkt_get_len(pkt);
-	ethernet_remove_l2_header(pkt);
 
 	net_pkt_unref(pkt);
 error:

From 32c2e5b10df5c3e79533f4b7ae617db64cd3db8e Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Sat, 29 Mar 2025 00:29:17 +0530
Subject: [PATCH 2877/2913] [nrf fromlist] manifest: nrf_wifi: Pull fix for
 nRF91 series build

Fix linking errors by using the Zephyr flags for libary too.

Upstream PR #: 87835

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 9c8bf80a9eb..d4bbd738e6a 100644
--- a/west.yml
+++ b/west.yml
@@ -318,7 +318,7 @@ manifest:
       revision: b84bd7314a239f818e78f6927f5673247816df53
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: 0d0c08e89b50d566285c661e886bf5db3ebaa077
+      revision: f8dbe23c2af8eb06b7a4bd9aa928e93d032a8578
       path: modules/lib/nrf_wifi
     - name: open-amp
       revision: 52bb1783521c62c019451cee9b05b8eda9d7425f

From 90b21d10ed23ed62ca6122bd7a1fcb619313c9ec Mon Sep 17 00:00:00 2001
From: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
Date: Tue, 1 Apr 2025 19:10:45 +0530
Subject: [PATCH 2878/2913] [nrf fromlist] wifi: nrf_wifi: Adjust default heap
 size for driver init failures

Reconfigure DATA heap sizes to fix the driver init failures.

Upstream PR #: 87979

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index 1fe0ad3503b..f06a1e1a11c 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -530,7 +530,7 @@ config NRF_WIFI_CTRL_HEAP_SIZE
 
 config NRF_WIFI_DATA_HEAP_SIZE
 	int "Dedicated memory pool for data plane"
-	default 6000 if NRF70_SCAN_ONLY
+	default 8000 if NRF70_SCAN_ONLY || NRF70_RADIO_TEST #TODO: Need to optimize this.
 	default 110000 if !SOC_FAMILY_NORDIC_NRF
 	default 130000
 

From ed6caa1992304f0c41a9bf234af5762aea3a7f31 Mon Sep 17 00:00:00 2001
From: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
Date: Wed, 26 Mar 2025 20:27:25 +0530
Subject: [PATCH 2879/2913] [nrf fromlist] drivers: nrf_wifi: Add debug shell

Add a debug shell to the driver to provide advanced debug support such
as reading/writing to RPU memory and registers etc.

Upstream PR #: 87823

Signed-off-by: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/CMakeLists.txt    |   5 +
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi   |   4 +
 drivers/wifi/nrf_wifi/src/debug_shell.c | 364 ++++++++++++++++++++++++
 drivers/wifi/nrf_wifi/src/shell.c       |  15 +
 4 files changed, 388 insertions(+)
 create mode 100644 drivers/wifi/nrf_wifi/src/debug_shell.c
 create mode 100644 drivers/wifi/nrf_wifi/src/shell.c

diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
index 41a06e912f8..64aef76cf56 100644
--- a/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -62,6 +62,11 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_UTIL
   src/wifi_util.c
 )
 
+zephyr_library_sources_ifdef(CONFIG_NRF70_DEBUG_SHELL
+  src/shell.c
+  src/debug_shell.c
+)
+
 zephyr_compile_definitions_ifdef(CONFIG_NRF70_ON_QSPI
 # These are XIP related anomalies and aren't applicable for nRF7002 and cause
 # throughput issues.
diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index f06a1e1a11c..18e478456a1 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -198,6 +198,10 @@ config NRF70_UTIL
 	depends on SHELL
 	bool "Utility shell in nRF70 driver"
 
+config NRF70_DEBUG_SHELL
+	depends on SHELL
+	bool "Debug shell in nRF70 driver"
+
 config NRF70_QSPI_LOW_POWER
 	bool "low power mode in QSPI"
 	default y if NRF_WIFI_LOW_POWER
diff --git a/drivers/wifi/nrf_wifi/src/debug_shell.c b/drivers/wifi/nrf_wifi/src/debug_shell.c
new file mode 100644
index 00000000000..70fb77d6ed0
--- /dev/null
+++ b/drivers/wifi/nrf_wifi/src/debug_shell.c
@@ -0,0 +1,364 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* @file
+ * @brief NRF Wi-Fi debug shell module
+ */
+#include <stdlib.h>
+#include <zephyr/shell/shell.h>
+#include "host_rpu_umac_if.h"
+#include "fmac_main.h"
+
+extern struct nrf_wifi_drv_priv_zep rpu_drv_priv_zep;
+struct nrf_wifi_ctx_zep *dbg_ctx = &rpu_drv_priv_zep.rpu_ctx_zep;
+
+
+static int nrf_wifi_dbg_read_mem(const struct shell *sh,
+				 size_t argc,
+				 const char *argv[])
+{
+	enum nrf_wifi_status status;
+	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx;
+	char *ptr;
+	unsigned long mem_type;
+	unsigned long mem_offset;
+	unsigned long num_words;
+	unsigned int mem_val;
+	unsigned int mem_start_addr;
+	unsigned int mem_end_addr;
+	unsigned int i;
+
+	fmac_dev_ctx = dbg_ctx->rpu_ctx;
+	mem_type = strtoul(argv[1], &ptr, 10);
+	mem_offset = strtoul(argv[2], &ptr, 10);
+	num_words = strtoul(argv[3], &ptr, 10);
+
+	if (mem_type == 0) {
+		mem_start_addr = RPU_ADDR_PKTRAM_START + (mem_offset * 4);
+		mem_end_addr = RPU_ADDR_PKTRAM_END;
+	} else if (mem_type == 1) {
+		mem_start_addr = RPU_ADDR_GRAM_START + (mem_offset * 4);
+		mem_end_addr = RPU_ADDR_GRAM_END;
+	} else {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid memory type(%lu).\n",
+			      mem_type);
+		return -ENOEXEC;
+	}
+
+	if ((mem_start_addr % 4) != 0) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid memory word offset(%lu). Needs to be a multiple of 4\n",
+			      mem_offset);
+		return -ENOEXEC;
+	}
+
+	if (mem_start_addr + (num_words * 4) - 1 > mem_end_addr) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid number of words(%lu). Exceeds memory region\n",
+			      num_words);
+		return -ENOEXEC;
+	}
+
+	for (i = 0; i < (num_words * 4); i += 4) {
+		status = hal_rpu_mem_read(fmac_dev_ctx->hal_dev_ctx,
+					  &mem_val,
+					  mem_start_addr + i,
+					  sizeof(mem_val));
+
+		if (status != NRF_WIFI_STATUS_SUCCESS) {
+			shell_fprintf(sh,
+				      SHELL_ERROR,
+				      "Failed to read memory at 0x%x.\n",
+				      mem_start_addr + i);
+			return -ENOEXEC;
+		}
+
+		if (i % 16 == 0) {
+			shell_fprintf(sh,
+				      SHELL_INFO,
+				      "\n0x%x: ", mem_start_addr + i);
+		}
+
+		shell_fprintf(sh,
+			      SHELL_INFO,
+			      "0x%08x ",
+			      mem_val);
+	}
+
+	shell_fprintf(sh,
+		      SHELL_INFO,
+		      "\n");
+	return 0;
+}
+
+
+static int nrf_wifi_dbg_write_mem(const struct shell *sh,
+				  size_t argc,
+				  const char *argv[])
+{
+	enum nrf_wifi_status status;
+	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx;
+	char *ptr;
+	unsigned long mem_type;
+	unsigned long mem_offset;
+	unsigned int val;
+	unsigned int mem_start_addr;
+	unsigned int mem_end_addr;
+
+	fmac_dev_ctx = dbg_ctx->rpu_ctx;
+	mem_type = strtoul(argv[1], &ptr, 10);
+	mem_offset = strtoul(argv[2], &ptr, 10);
+	val = strtoul(argv[3], &ptr, 10);
+
+	if (mem_type == 0) {
+		mem_start_addr = RPU_ADDR_PKTRAM_START + (mem_offset * 4);
+		mem_end_addr = RPU_ADDR_PKTRAM_END;
+	} else if (mem_type == 1) {
+		mem_start_addr = RPU_ADDR_GRAM_START + (mem_offset * 4);
+		mem_end_addr = RPU_ADDR_GRAM_END;
+	} else {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid memory type(%lu).\n",
+			      mem_type);
+		return -ENOEXEC;
+	}
+
+	if ((mem_start_addr % 4) != 0) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid memory word offset(%lu). Needs to be a multiple of 4\n",
+			      mem_offset);
+		return -ENOEXEC;
+	}
+
+	if (mem_start_addr + 3 > mem_end_addr) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid memory word offset. Exceeds memory region\n");
+		return -ENOEXEC;
+	}
+
+	status = hal_rpu_mem_write(fmac_dev_ctx->hal_dev_ctx,
+				   mem_start_addr,
+				   &val,
+				   sizeof(val));
+
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Failed to write memory at 0x%x.\n",
+			      mem_start_addr);
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
+
+static int nrf_wifi_dbg_read_reg(const struct shell *sh,
+				 size_t argc,
+				 const char *argv[])
+{
+	enum nrf_wifi_status status;
+	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx;
+	char *ptr;
+	unsigned long reg_type;
+	unsigned long reg_offset;
+	unsigned long num_regs;
+	unsigned int reg_val;
+	unsigned int reg_start_addr;
+	unsigned int reg_end_addr;
+	unsigned int i;
+
+	fmac_dev_ctx = dbg_ctx->rpu_ctx;
+	reg_type = strtoul(argv[1], &ptr, 10);
+	reg_offset = strtoul(argv[2], &ptr, 10);
+	num_regs = strtoul(argv[3], &ptr, 10);
+
+	if (reg_type == 0) {
+		reg_start_addr = RPU_ADDR_SBUS_START + (reg_offset * 4);
+		reg_end_addr = RPU_ADDR_SBUS_END;
+	} else if (reg_type == 1) {
+		reg_start_addr = RPU_ADDR_PBUS_START + (reg_offset * 4);
+		reg_end_addr = RPU_ADDR_PBUS_END;
+	} else {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid register type(%lu).\n",
+			      reg_type);
+		return -ENOEXEC;
+	}
+
+	if ((reg_start_addr % 4) != 0) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid register offset(%lu). Needs to be a multiple of 4\n",
+			      reg_offset);
+		return -ENOEXEC;
+	}
+
+	if (reg_start_addr + (num_regs * 4) - 1 > reg_end_addr) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid number of registers(%lu). Exceeds bus region\n",
+			      num_regs);
+		return -ENOEXEC;
+	}
+
+	for (i = 0; i < num_regs * 4; i += 4) {
+		status = hal_rpu_reg_read(fmac_dev_ctx->hal_dev_ctx,
+					  &reg_val,
+					  reg_start_addr + i);
+
+		if (status != NRF_WIFI_STATUS_SUCCESS) {
+			shell_fprintf(sh,
+				      SHELL_ERROR,
+				      "Failed to read register at 0x%x.\n",
+				      reg_start_addr + i);
+			return -ENOEXEC;
+		}
+
+		shell_fprintf(sh,
+			      SHELL_INFO,
+			      "0x%x: 0x%08x\n",
+			      reg_start_addr + i,
+			      reg_val);
+	}
+
+	shell_fprintf(sh,
+		      SHELL_INFO,
+		      "\n");
+	return 0;
+}
+
+
+static int nrf_wifi_dbg_write_reg(const struct shell *sh,
+				  size_t argc,
+				  const char *argv[])
+{
+	enum nrf_wifi_status status;
+	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx;
+	char *ptr;
+	unsigned long reg_type;
+	unsigned long reg_offset;
+	unsigned int val;
+	unsigned int reg_start_addr;
+	unsigned int reg_end_addr;
+
+	fmac_dev_ctx = dbg_ctx->rpu_ctx;
+	reg_type = strtoul(argv[1], &ptr, 10);
+	reg_offset = strtoul(argv[2], &ptr, 10);
+	val = strtoul(argv[3], &ptr, 10);
+
+	if (reg_type == 0) {
+		reg_start_addr = RPU_ADDR_SBUS_START + (reg_offset * 4);
+		reg_end_addr = RPU_ADDR_SBUS_END;
+	} else if (reg_type == 1) {
+		reg_start_addr = RPU_ADDR_PBUS_START + (reg_offset * 4);
+		reg_end_addr = RPU_ADDR_PBUS_END;
+	} else {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid register type(%lu).\n",
+			      reg_type);
+		return -ENOEXEC;
+	}
+
+	if ((reg_start_addr % 4) != 0) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid register offset(%lu). Needs to be a multiple of 4\n",
+			      reg_offset);
+		return -ENOEXEC;
+	}
+
+	if (reg_start_addr + 3 > reg_end_addr) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid register offset. Exceeds bus region\n");
+		return -ENOEXEC;
+	}
+
+	status = hal_rpu_reg_write(fmac_dev_ctx->hal_dev_ctx,
+				   reg_start_addr,
+				   val);
+
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Failed to write register at 0x%x.\n",
+			      reg_start_addr);
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
+
+
+SHELL_STATIC_SUBCMD_SET_CREATE(
+	nrf70_dbg,
+	SHELL_CMD_ARG(read_mem,
+		      NULL,
+		      "<mem_type> <offset> <num_words>\n"
+		      "where:\n"
+		      "<mem_type> : One of the memory regions below\n"
+		      "0 - PKTRAM\n"
+		      "1 - GRAM\n"
+		      "<offset> : Word offset in the memory region\n"
+		      "<num_words> : Number of words to read\n",
+		      nrf_wifi_dbg_read_mem,
+		      4,
+		      0),
+	SHELL_CMD_ARG(write_mem,
+		      NULL,
+		      "<mem_type> <offset> <val>\n"
+		      "where:\n"
+		      "<mem_type> : One of the memory regions below\n"
+		      "0 - PKTRAM\n"
+		      "1 - GRAM\n"
+		      "<offset> : Word offset in the memory region\n"
+		      "<val> : Value to be written\n",
+		      nrf_wifi_dbg_write_mem,
+		      4,
+		      0),
+	SHELL_CMD_ARG(read_reg,
+		      NULL,
+		      "<reg_type> <offset> <num_regs>\n"
+		      "where:\n"
+		      "<reg_type> : One of the bus regions below\n"
+		      "0 - SYSBUS\n"
+		      "1 - PBUS\n"
+		      "<offset> : Register offset\n"
+		      "<num_words> : Number of registers to read\n",
+		      nrf_wifi_dbg_read_reg,
+		      4,
+		      0),
+	SHELL_CMD_ARG(write_reg,
+		      NULL,
+		      "<reg_type> <offset> <val>\n"
+		      "where:\n"
+		      "<reg_type> : One of the bus regions below\n"
+		      "0 - SYSBUS\n"
+		      "1 - PBUS\n"
+		      "<offset> : Register offset\n"
+		      "<val> : Value to be written\n",
+		      nrf_wifi_dbg_write_reg,
+		      4,
+		      0),
+	SHELL_SUBCMD_SET_END
+);
+
+
+SHELL_SUBCMD_ADD((nrf70), dbg, &nrf70_dbg,
+		 "nRF70 advanced debug commands\n",
+		 NULL,
+		 0, 0);
diff --git a/drivers/wifi/nrf_wifi/src/shell.c b/drivers/wifi/nrf_wifi/src/shell.c
new file mode 100644
index 00000000000..36d21d21d50
--- /dev/null
+++ b/drivers/wifi/nrf_wifi/src/shell.c
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* @file
+ * @brief NRF Wi-Fi debug shell module
+ */
+#include <stdlib.h>
+#include <zephyr/shell/shell.h>
+
+SHELL_SUBCMD_SET_CREATE(nrf70_commands, (nrf70));
+
+SHELL_CMD_REGISTER(nrf70, &nrf70_commands, "nRF70 specific commands", NULL);

From 653648b76c13d85046adeffeb8f9bcf54080f676 Mon Sep 17 00:00:00 2001
From: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
Date: Tue, 1 Apr 2025 21:41:16 +0530
Subject: [PATCH 2880/2913] [nrf fromlist] drivers: nrf_wifi: Move util to
 nrf70 shell

Move the wifi_util to the newly created nrf70 shell as a sub-shell.

Upstream PR #: 87823

Signed-off-by: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
---
 drivers/wifi/nrf_wifi/CMakeLists.txt  | 5 ++++-
 drivers/wifi/nrf_wifi/src/wifi_util.c | 7 ++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
index 64aef76cf56..d44aa7b98c8 100644
--- a/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -62,8 +62,11 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_UTIL
   src/wifi_util.c
 )
 
+if(CONFIG_NRF70_UTIL OR CONFIG_NRF70_DEBUG_SHELL)
+  zephyr_library_sources(src/shell.c)
+endif()
+
 zephyr_library_sources_ifdef(CONFIG_NRF70_DEBUG_SHELL
-  src/shell.c
   src/debug_shell.c
 )
 
diff --git a/drivers/wifi/nrf_wifi/src/wifi_util.c b/drivers/wifi/nrf_wifi/src/wifi_util.c
index 70b64da4e2e..ec1dccb2a72 100644
--- a/drivers/wifi/nrf_wifi/src/wifi_util.c
+++ b/drivers/wifi/nrf_wifi/src/wifi_util.c
@@ -964,7 +964,7 @@ static int nrf_wifi_util_rpu_recovery_info(const struct shell *sh,
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 
 SHELL_STATIC_SUBCMD_SET_CREATE(
-	nrf_wifi_util_subcmds,
+	nrf70_util,
 	SHELL_CMD_ARG(he_ltf,
 		      NULL,
 		      "0 - 1x HE LTF\n"
@@ -1069,10 +1069,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 	SHELL_SUBCMD_SET_END);
 
 
-SHELL_CMD_REGISTER(wifi_util,
-		   &nrf_wifi_util_subcmds,
-		   "nRF Wi-Fi utility shell commands",
-		   NULL);
+SHELL_SUBCMD_ADD((nrf70), util, &nrf70_util, "nRF70 utility commands\n", NULL, 0, 0);
 
 
 static int nrf_wifi_util_init(void)

From 4ab7537983224c4f4cbce978f43bf4d7103bad81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Tue, 1 Apr 2025 09:51:06 +0200
Subject: [PATCH 2881/2913] [nrf fromlist] dts: common: nordic: nRF54L20: add
 audio clock node
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added binding and node for audio clock on nRF54L20
with fixed frequency of 24 MHz.

Upstream PR #: 87105

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 dts/bindings/clock/nordic,nrf-aclk.yaml | 14 ++++++++++++++
 dts/common/nordic/nrf54l20.dtsi         |  6 ++++++
 2 files changed, 20 insertions(+)
 create mode 100644 dts/bindings/clock/nordic,nrf-aclk.yaml

diff --git a/dts/bindings/clock/nordic,nrf-aclk.yaml b/dts/bindings/clock/nordic,nrf-aclk.yaml
new file mode 100644
index 00000000000..64584cfd78b
--- /dev/null
+++ b/dts/bindings/clock/nordic,nrf-aclk.yaml
@@ -0,0 +1,14 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Nordic Audio clock node
+
+compatible: "nordic,nrf-aclk"
+
+include: fixed-clock.yaml
+
+properties:
+  clock-frequency:
+    type: int
+    description: |
+      Frequency of the Audio clock in Hz.
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 3dc439394ff..5ac567e631f 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -76,6 +76,12 @@
 			#clock-cells = <0>;
 			clock-frequency = <DT_FREQ_M(128)>;
 		};
+
+		aclk: aclk {
+			compatible = "nordic,nrf-aclk";
+			#clock-cells = <0>;
+			clock-frequency = <DT_FREQ_M(24)>;
+		};
 	};
 
 	soc {

From e48bca44dd596dc66d71378e97bf5ceff2c483d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Tue, 1 Apr 2025 09:53:30 +0200
Subject: [PATCH 2882/2913] [nrf fromlist] drivers: audio: dmic_nrfx: add
 support for audio clocks on nRF54
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added support for audio clock for nRF54L20 and AudioPLL
for nRF54H20 in DMIC PDM driver.

Upstream PR #: 87105

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
---
 drivers/audio/dmic_nrfx_pdm.c | 112 +++++++++++++++++++++++-----------
 1 file changed, 76 insertions(+), 36 deletions(-)

diff --git a/drivers/audio/dmic_nrfx_pdm.c b/drivers/audio/dmic_nrfx_pdm.c
index ea78330deb5..70fb3e96a45 100644
--- a/drivers/audio/dmic_nrfx_pdm.c
+++ b/drivers/audio/dmic_nrfx_pdm.c
@@ -18,14 +18,23 @@ LOG_MODULE_REGISTER(dmic_nrfx_pdm, CONFIG_AUDIO_DMIC_LOG_LEVEL);
 #if CONFIG_SOC_SERIES_NRF54HX
 #define DMIC_NRFX_CLOCK_FREQ MHZ(16)
 #define DMIC_NRFX_CLOCK_FACTOR 8192
+#define DMIC_NRFX_AUDIO_CLOCK_FREQ DT_PROP_OR(DT_NODELABEL(audiopll), frequency, 0)
 #else
 #define DMIC_NRFX_CLOCK_FREQ MHZ(32)
 #define DMIC_NRFX_CLOCK_FACTOR 4096
+#define DMIC_NRFX_AUDIO_CLOCK_FREQ \
+	COND_CODE_1(CONFIG_SOC_NRF54L20, \
+		(DT_PROP_OR(DT_NODELABEL(aclk), clock_frequency, 0)), \
+		(DT_PROP_OR(DT_NODELABEL(clock), hfclkaudio_frequency, 0)))
 #endif
 
 struct dmic_nrfx_pdm_drv_data {
 	const nrfx_pdm_t *pdm;
+#if CONFIG_CLOCK_CONTROL_NRF
 	struct onoff_manager *clk_mgr;
+#elif CONFIG_CLOCK_CONTROL_NRF2_AUDIOPLL
+	const struct device *audiopll_dev;
+#endif
 	struct onoff_client clk_cli;
 	struct k_mem_slab *mem_slab;
 	uint32_t block_size;
@@ -61,6 +70,35 @@ static void stop_pdm(struct dmic_nrfx_pdm_drv_data *drv_data)
 	nrfx_pdm_stop(drv_data->pdm);
 }
 
+static int request_clock(struct dmic_nrfx_pdm_drv_data *drv_data)
+{
+	if (!drv_data->request_clock) {
+		return 0;
+	}
+#if CONFIG_CLOCK_CONTROL_NRF
+	return onoff_request(drv_data->clk_mgr, &drv_data->clk_cli);
+#elif CONFIG_CLOCK_CONTROL_NRF2_AUDIOPLL
+	return nrf_clock_control_request(drv_data->audiopll_dev, NULL, &drv_data->clk_cli);
+#else
+	return 0;
+#endif
+}
+
+static int release_clock(struct dmic_nrfx_pdm_drv_data *drv_data)
+{
+	if (!drv_data->request_clock) {
+		return 0;
+	}
+
+#if CONFIG_CLOCK_CONTROL_NRF
+	return onoff_release(drv_data->clk_mgr);
+#elif CONFIG_CLOCK_CONTROL_NRF2_AUDIOPLL
+	return nrf_clock_control_release(drv_data->audiopll_dev, NULL);
+#else
+	return 0;
+#endif
+}
+
 static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 {
 	struct dmic_nrfx_pdm_drv_data *drv_data = dev->data;
@@ -119,8 +157,10 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 
 		if (drv_data->active) {
 			drv_data->active = false;
-			if (drv_data->request_clock) {
-				(void)onoff_release(drv_data->clk_mgr);
+			ret = release_clock(drv_data);
+			if (ret < 0) {
+				LOG_ERR("Failed to release clock: %d", ret);
+				return;
 			}
 		}
 	} else if (evt->buffer_released) {
@@ -191,9 +231,11 @@ static bool check_pdm_frequencies(const struct dmic_nrfx_pdm_drv_cfg *drv_cfg,
 {
 	uint32_t req_rate = pdm_cfg->streams[0].pcm_rate;
 	bool better_found = false;
-
+	const uint32_t src_freq =
+		(NRF_PDM_HAS_SELECTABLE_CLOCK && drv_cfg->clk_src == ACLK)
+		? DMIC_NRFX_AUDIO_CLOCK_FREQ
+		: DMIC_NRFX_CLOCK_FREQ;
 #if NRF_PDM_HAS_PRESCALER
-	uint32_t src_freq = 32 * 1000 * 1000UL;
 	uint32_t req_freq = req_rate * ratio;
 	uint32_t prescaler = src_freq / req_freq;
 	uint32_t act_freq = src_freq / prescaler;
@@ -224,24 +266,6 @@ static bool check_pdm_frequencies(const struct dmic_nrfx_pdm_drv_cfg *drv_cfg,
 	}
 #else
 	if (IS_ENABLED(CONFIG_SOC_SERIES_NRF53X) || IS_ENABLED(CONFIG_SOC_SERIES_NRF54HX)) {
-		const uint32_t src_freq =
-			(NRF_PDM_HAS_MCLKCONFIG && drv_cfg->clk_src == ACLK)
-			/* The DMIC_NRFX_PDM_DEVICE() macro contains build
-			 * assertions that make sure that the ACLK clock
-			 * source is only used when it is available and only
-			 * with the "hfclkaudio-frequency" property defined,
-			 * but the default value of 0 here needs to be used
-			 * to prevent compilation errors when the property is
-			 * not defined (this expression will be eventually
-			 * optimized away then).
-			 */
-			/* TODO : PS does not provide correct formula for nRF54H20 PDM_CLK.
-			 * Assume that master clock source frequency is 8 MHz. Remove once
-			 * correct formula is found.
-			 */
-			? DT_PROP_OR(DT_NODELABEL(clock), hfclkaudio_frequency,
-				     0)
-			: DMIC_NRFX_CLOCK_FREQ;
 		uint32_t req_freq = req_rate * ratio;
 		/* As specified in the nRF5340 PS:
 		 *
@@ -461,7 +485,7 @@ static int dmic_nrfx_pdm_configure(const struct device *dev,
 		nrfx_cfg.edge = NRF_PDM_EDGE_LEFTRISING;
 		channel->act_chan_map_lo = alt_map;
 	}
-#if NRF_PDM_HAS_MCLKCONFIG
+#if NRF_PDM_HAS_SELECTABLE_CLOCK
 	nrfx_cfg.mclksrc = drv_cfg->clk_src == ACLK
 			 ? NRF_PDM_MCLKSRC_ACLK
 			 : NRF_PDM_MCLKSRC_PCLK32M;
@@ -508,8 +532,10 @@ static int start_transfer(struct dmic_nrfx_pdm_drv_data *drv_data)
 	LOG_ERR("Failed to start PDM: 0x%08x", err);
 	ret =  -EIO;
 
-	if (drv_data->request_clock) {
-		(void)onoff_release(drv_data->clk_mgr);
+	ret = release_clock(drv_data);
+	if (ret < 0) {
+		LOG_ERR("Failed to release clock: %d", ret);
+		return ret;
 	}
 
 	drv_data->active = false;
@@ -529,7 +555,12 @@ static void clock_started_callback(struct onoff_manager *mgr,
 	 * the actual transfer in such case.
 	 */
 	if (!drv_data->active) {
-		(void)onoff_release(drv_data->clk_mgr);
+		int ret = release_clock(drv_data);
+
+		if (ret < 0) {
+			LOG_ERR("Failed to release clock: %d", ret);
+			return;
+		}
 	} else {
 		(void)start_transfer(drv_data);
 	}
@@ -548,7 +579,7 @@ static int trigger_start(const struct device *dev)
 	if (drv_data->request_clock) {
 		sys_notify_init_callback(&drv_data->clk_cli.notify,
 					 clock_started_callback);
-		ret = onoff_request(drv_data->clk_mgr, &drv_data->clk_cli);
+		ret = request_clock(drv_data);
 		if (ret < 0) {
 			drv_data->active = false;
 
@@ -624,12 +655,11 @@ static int dmic_nrfx_pdm_read(const struct device *dev,
 	return ret;
 }
 
-#if CONFIG_CLOCK_CONTROL_NRF
 static void init_clock_manager(const struct device *dev)
 {
-	struct dmic_nrfx_pdm_drv_data *drv_data = dev->data;
+#if CONFIG_CLOCK_CONTROL_NRF
 	clock_control_subsys_t subsys;
-
+	struct dmic_nrfx_pdm_drv_data *drv_data = dev->data;
 #if NRF_CLOCK_HAS_HFCLKAUDIO
 	const struct dmic_nrfx_pdm_drv_cfg *drv_cfg = dev->config;
 
@@ -643,8 +673,12 @@ static void init_clock_manager(const struct device *dev)
 
 	drv_data->clk_mgr = z_nrf_clock_control_get_onoff(subsys);
 	__ASSERT_NO_MSG(drv_data->clk_mgr != NULL);
-}
+#elif CONFIG_CLOCK_CONTROL_NRF2_AUDIOPLL
+	struct dmic_nrfx_pdm_drv_data *drv_data = dev->data;
+
+	drv_data->audiopll_dev = DEVICE_DT_GET(DT_NODELABEL(audiopll));
 #endif
+}
 
 static const struct _dmic_ops dmic_ops = {
 	.configure = dmic_nrfx_pdm_configure,
@@ -677,8 +711,7 @@ static const struct _dmic_ops dmic_ops = {
 		k_msgq_init(&dmic_nrfx_pdm_data##idx.mem_slab_queue,	     \
 			    (char *)mem_slab_msgs##idx, sizeof(void *),	     \
 			    ARRAY_SIZE(mem_slab_msgs##idx));		     \
-		IF_ENABLED(CONFIG_CLOCK_CONTROL_NRF,			     \
-			   (init_clock_manager(dev);))			     \
+		init_clock_manager(dev);				     \
 		return 0;						     \
 	}								     \
 	static void event_handler##idx(const nrfx_pdm_evt_t *evt)	     \
@@ -695,13 +728,20 @@ static const struct _dmic_ops dmic_ops = {
 		.clk_src = PDM_CLK_SRC(idx),				     \
 		.mem_reg = DMM_DEV_TO_REG(PDM(idx)),			     \
 	};								     \
-	BUILD_ASSERT(PDM_CLK_SRC(idx) != ACLK || NRF_PDM_HAS_MCLKCONFIG,     \
+	BUILD_ASSERT(PDM_CLK_SRC(idx) != ACLK ||			     \
+		     NRF_PDM_HAS_SELECTABLE_CLOCK,			     \
 		"Clock source ACLK is not available.");			     \
 	BUILD_ASSERT(PDM_CLK_SRC(idx) != ACLK ||			     \
 		     DT_NODE_HAS_PROP(DT_NODELABEL(clock),		     \
-				      hfclkaudio_frequency),		     \
+				      hfclkaudio_frequency) ||		     \
+		     DT_NODE_HAS_PROP(DT_NODELABEL(aclk),		     \
+				      clock_frequency) ||		     \
+		     DT_NODE_HAS_PROP(DT_NODELABEL(audiopll),		     \
+				      frequency),			     \
 		"Clock source ACLK requires the hfclkaudio-frequency "	     \
-		"property to be defined in the nordic,nrf-clock node.");     \
+		"property to be defined in the nordic,nrf-clock node "	     \
+		"or clock-frequency property to be defined in aclk node"     \
+		"or frequency property to be defined in audiopll node");     \
 	DEVICE_DT_DEFINE(PDM(idx), pdm_nrfx_init##idx, NULL,		     \
 			 &dmic_nrfx_pdm_data##idx, &dmic_nrfx_pdm_cfg##idx,  \
 			 POST_KERNEL, CONFIG_AUDIO_DMIC_INIT_PRIORITY,	     \

From d8cee791f1628f6e05395b1f2f8376bd096ac8ce Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Thu, 3 Apr 2025 23:15:39 +0530
Subject: [PATCH 2883/2913] Revert "[nrf fromlist] manifest: nrf_wifi: Pull fix
 for nRF91 series build"

This reverts commit 32c2e5b10df5c3e79533f4b7ae617db64cd3db8e.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index d4bbd738e6a..9c8bf80a9eb 100644
--- a/west.yml
+++ b/west.yml
@@ -318,7 +318,7 @@ manifest:
       revision: b84bd7314a239f818e78f6927f5673247816df53
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: f8dbe23c2af8eb06b7a4bd9aa928e93d032a8578
+      revision: 0d0c08e89b50d566285c661e886bf5db3ebaa077
       path: modules/lib/nrf_wifi
     - name: open-amp
       revision: 52bb1783521c62c019451cee9b05b8eda9d7425f

From 9c6e88ad232a094a4dbc2aaf83a21af696bd6465 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 1 Apr 2025 00:35:08 +0530
Subject: [PATCH 2884/2913] [nrf fromtree] manifest: nrf_wifi: Pull stats from
 memory support

Gets the stats directly from RPU memory instead of command and event
exchange.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 85179fbadff39858486dfcbb0a9132698d95f915)
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 9c8bf80a9eb..b20f0460722 100644
--- a/west.yml
+++ b/west.yml
@@ -318,7 +318,7 @@ manifest:
       revision: b84bd7314a239f818e78f6927f5673247816df53
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: 0d0c08e89b50d566285c661e886bf5db3ebaa077
+      revision: 8fd3cd7b088d62f145b8b9f5ecc985dd73bd9e77
       path: modules/lib/nrf_wifi
     - name: open-amp
       revision: 52bb1783521c62c019451cee9b05b8eda9d7425f

From 1420ecbc26423ffb3b031b2f5ed4849d9214eeb9 Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Mon, 31 Mar 2025 21:45:35 +0530
Subject: [PATCH 2885/2913] [nrf fromtree] drivers: nrf_wifi: Add a new stats
 command that reads from memory

Instead of a command and event mechanism that relies on processors being
active (UMAC/LMAC) add a new command that reads from the RPU memory
directly for all stats, useful in debugging when processors are
crashed/non-functional.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 0cf47478ee2f71cbeea8ae9505fe0bc8e43b9e61)
---
 drivers/wifi/nrf_wifi/src/wifi_util.c | 133 ++++++++++++++++++++++++++
 1 file changed, 133 insertions(+)

diff --git a/drivers/wifi/nrf_wifi/src/wifi_util.c b/drivers/wifi/nrf_wifi/src/wifi_util.c
index ec1dccb2a72..4a31cae8121 100644
--- a/drivers/wifi/nrf_wifi/src/wifi_util.c
+++ b/drivers/wifi/nrf_wifi/src/wifi_util.c
@@ -14,6 +14,9 @@
 #include "fmac_main.h"
 #include "wifi_util.h"
 
+#include "rpu_lmac_phy_stats.h"
+#include "rpu_umac_stats.h"
+
 extern struct nrf_wifi_drv_priv_zep rpu_drv_priv_zep;
 struct nrf_wifi_ctx_zep *ctx = &rpu_drv_priv_zep.rpu_ctx_zep;
 
@@ -963,6 +966,129 @@ static int nrf_wifi_util_rpu_recovery_info(const struct shell *sh,
 }
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 
+static int nrf_wifi_dump_stats(const struct shell *sh,
+				   struct nrf_wifi_hal_dev_ctx *hal_dev_ctx,
+				   const char *name,
+				   struct rpu_stat_global *rpu_stat_g)
+{
+	int i;
+	int j;
+	int ret = 0;
+
+	for (i = 0; rpu_stat_g[i].stats != NULL; i++) {
+		struct rpu_stat_from_mem *rpu_stat = rpu_stat_g[i].stats;
+
+		shell_fprintf(sh, SHELL_INFO, "RPU %s - %s\n", name, rpu_stat_g[i].name);
+		shell_fprintf(sh, SHELL_INFO, "======================\n");
+
+		for (j = 0; rpu_stat[j].name[0] != '\0'; j++) {
+			uint32_t value = 0;
+
+			if (hal_rpu_mem_read(hal_dev_ctx, &value,
+						 rpu_stat[j].addr, sizeof(value)) != 0) {
+				shell_fprintf(sh, SHELL_ERROR,
+						  "Failed to read stat %s\n",
+							  rpu_stat[j].name);
+				continue;
+			}
+
+			shell_fprintf(sh, SHELL_INFO, "%s: %u\n",
+					  rpu_stat[j].name,
+					  value);
+		}
+
+		shell_fprintf(sh, SHELL_INFO, "\n");
+	}
+
+	return ret;
+}
+
+static int nrf_wifi_util_dump_rpu_stats_mem(const struct shell *sh,
+					size_t argc,
+					const char *argv[])
+{
+	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx;
+	struct nrf_wifi_hal_dev_ctx *hal_dev_ctx;
+	struct rpu_sys_op_stats stats;
+	enum rpu_stats_type stats_type = RPU_STATS_TYPE_ALL;
+	int ret;
+
+	if (argc == 2) {
+		const char *type  = argv[1];
+
+		if (!strcmp(type, "umac")) {
+			stats_type = RPU_STATS_TYPE_UMAC;
+		} else if (!strcmp(type, "lmac")) {
+			stats_type = RPU_STATS_TYPE_LMAC;
+		} else if (!strcmp(type, "all")) {
+			stats_type = RPU_STATS_TYPE_ALL;
+		} else {
+			shell_fprintf(sh,
+				      SHELL_ERROR,
+				      "Invalid stats type %s\n",
+				      type);
+			return -ENOEXEC;
+		}
+	}
+
+	k_mutex_lock(&ctx->rpu_lock, K_FOREVER);
+	if (!ctx->rpu_ctx) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "RPU context not initialized\n");
+		ret = -ENOEXEC;
+		goto unlock;
+	}
+	fmac_dev_ctx = ctx->rpu_ctx;
+	if (!fmac_dev_ctx) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "RPU context not initialized\n");
+		ret = -ENOEXEC;
+		goto unlock;
+	}
+	hal_dev_ctx = fmac_dev_ctx->hal_dev_ctx;
+	if (!hal_dev_ctx) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "HAL context not initialized\n");
+		ret = -ENOEXEC;
+		goto unlock;
+	}
+
+
+	memset(&stats, 0, sizeof(struct rpu_sys_op_stats));
+
+	if (stats_type == RPU_STATS_TYPE_UMAC || stats_type == RPU_STATS_TYPE_ALL) {
+		nrf_wifi_hal_proc_ctx_set(hal_dev_ctx, RPU_PROC_TYPE_MCU_UMAC);
+		ret = nrf_wifi_dump_stats(sh, hal_dev_ctx, "UMAC", rpu_all_umac_stats);
+		if (ret != 0) {
+			shell_fprintf(sh,
+				      SHELL_ERROR,
+				      "Failed to dump UMAC stats\n");
+			goto unlock;
+		}
+	}
+
+	if (stats_type == RPU_STATS_TYPE_LMAC || stats_type == RPU_STATS_TYPE_ALL) {
+		nrf_wifi_hal_proc_ctx_set(hal_dev_ctx, RPU_PROC_TYPE_MCU_LMAC);
+		ret = nrf_wifi_dump_stats(sh, hal_dev_ctx, "LMAC", rpu_all_lmac_stats);
+		if (ret != 0) {
+			shell_fprintf(sh,
+				      SHELL_ERROR,
+				      "Failed to dump LMAC stats\n");
+			goto unlock;
+		}
+	}
+
+	/* Reset the proc context to default */
+	nrf_wifi_hal_proc_ctx_set(hal_dev_ctx, RPU_PROC_TYPE_MCU_LMAC);
+
+unlock:
+	k_mutex_unlock(&ctx->rpu_lock);
+	return ret;
+}
+
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	nrf70_util,
 	SHELL_CMD_ARG(he_ltf,
@@ -1066,6 +1192,13 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      1,
 		      0),
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
+	SHELL_CMD_ARG(rpu_stats_mem,
+		      NULL,
+		      "Display RPU stats by reading from memory "
+		      "Parameters: umac or lmac or or all (default)",
+		      nrf_wifi_util_dump_rpu_stats_mem,
+		      1,
+		      1),
 	SHELL_SUBCMD_SET_END);
 
 

From 2bd5dc0a0d56d0765d279876adbef9ddd5154d6e Mon Sep 17 00:00:00 2001
From: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
Date: Tue, 11 Feb 2025 11:57:16 +0530
Subject: [PATCH 2886/2913] [nrf fromtree] drivers: nrf_wifi: Add Kconfig for
 ps poll and stbc

Add Kconfig in init command for maximum ps poll failures count
and stbc enable in HT.

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
(cherry picked from commit a934af8f895b739b4c6f60c14e0bc52fa03948eb)
---
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index 18e478456a1..facc1b071a1 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -842,4 +842,17 @@ config NRF_WIFI_ZERO_COPY_TX
 
 endif # NETWORKING
 
+config NRF_WIFI_MAX_PS_POLL_FAIL_CNT
+	int "Maximum number of PS-Poll failures"
+	default 10
+	range 10 4294967295
+	help
+	  Maximum number of PS-Poll failures before entering qos null-based power save.
+
+config NRF_WIFI_RX_STBC_HT
+	bool "Receive packets encoded with STBC in HT (Wi-Fi4) mode"
+	default y
+	help
+	  Receive packets encoded with STBC (Space-Time Block Coding)
+	  in HT (Wi-Fi4) mode.
 endif # WIFI_NRF70

From 7e4d86b35547b78a78d2901189179f41d0cce4a2 Mon Sep 17 00:00:00 2001
From: Murali Thokala <Murali.Thokala@nordicsemi.no>
Date: Tue, 1 Apr 2025 12:01:09 +0530
Subject: [PATCH 2887/2913] [nrf fromtree] drivers: wifi: Swctrl1 configuration
 for coex

Support to configure swctrl1 as input or output for coexistence.

Signed-off-by: Murali Thokala <Murali.Thokala@nordicsemi.no>
(cherry picked from commit 03c5f5f083df4b595d7e9194a4cc99b69bbb6fac)
---
 drivers/wifi/nrf_wifi/Kconfig.nrfwifi | 12 ++++++++++++
 drivers/wifi/nrf_wifi/src/coex.c      |  2 +-
 drivers/wifi/nrf_wifi/src/fmac_main.c | 19 +++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index facc1b071a1..cbd75ce5af6 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -182,6 +182,18 @@ config NRF70_SR_COEX_RF_SWITCH
 	  If this GPIO is asserted (1), the SR side RF switch is connected to the Wi-Fi side (shared antenna).
 	  If this GPIO is de-asserted (0), the SR side RF switch is connected to the SR side (separate antenna).
 
+config NRF70_SR_COEX_SLEEP_CTRL_GPIO_CTRL
+	bool "Configuration of GPIO control for coexistence"
+	default y
+
+config NRF70_SR_COEX_SWCTRL1_OUTPUT
+	int "Configure SWCTRIL1 as output"
+	default 0
+
+config NRF70_SR_COEX_BT_GRANT_ACTIVE_LOW
+	int "Configure BT grant active low"
+	default 1
+
 config NRF70_WORKQ_STACK_SIZE
 	int "Stack size for workqueue"
 	default 4096
diff --git a/drivers/wifi/nrf_wifi/src/coex.c b/drivers/wifi/nrf_wifi/src/coex.c
index 8177fb6f85b..a9147aad5dc 100644
--- a/drivers/wifi/nrf_wifi/src/coex.c
+++ b/drivers/wifi/nrf_wifi/src/coex.c
@@ -103,7 +103,7 @@ const uint16_t config_buffer_5G[] = {
 /* Shared antenna */
 const uint32_t ch_config_sha[] = {
 	0x00000028, 0x00000000, 0x001e1023, 0x00000000, 0x00000000,
-	0x00000000, 0x00000021, 0x000002ca, 0x00000050, 0x00000000,
+	0x00000000, 0x00000021, 0x000002ca, 0x0000005A, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000
 };
diff --git a/drivers/wifi/nrf_wifi/src/fmac_main.c b/drivers/wifi/nrf_wifi/src/fmac_main.c
index 5a7d79141bc..cc3a40c81ab 100644
--- a/drivers/wifi/nrf_wifi/src/fmac_main.c
+++ b/drivers/wifi/nrf_wifi/src/fmac_main.c
@@ -581,6 +581,13 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv
 
 	unsigned int fw_ver = 0;
 
+#if defined(CONFIG_NRF70_SR_COEX_SLEEP_CTRL_GPIO_CTRL) && \
+	defined(CONFIG_NRF70_SYSTEM_MODE)
+	unsigned int alt_swctrl1_function_bt_coex_status1 =
+			(~CONFIG_NRF70_SR_COEX_SWCTRL1_OUTPUT) & 0x1;
+	unsigned int invert_bt_coex_grant_output = CONFIG_NRF70_SR_COEX_BT_GRANT_ACTIVE_LOW;
+#endif /* CONFIG_NRF70_SR_COEX_SLEEP_CTRL_GPIO_CTRL && CONFIG_NRF70_SYSTEM_MODE */
+
 	rpu_ctx_zep = &drv_priv_zep->rpu_ctx_zep;
 
 	rpu_ctx_zep->drv_priv_zep = drv_priv_zep;
@@ -624,6 +631,18 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv
 
 	configure_board_dep_params(&board_params);
 
+#if defined(CONFIG_NRF70_SR_COEX_SLEEP_CTRL_GPIO_CTRL) && \
+	defined(CONFIG_NRF70_SYSTEM_MODE)
+	LOG_INF("Configuring SLEEP CTRL GPIO control register\n");
+	status = nrf_wifi_coex_config_sleep_ctrl_gpio_ctrl(rpu_ctx_zep->rpu_ctx,
+			alt_swctrl1_function_bt_coex_status1,
+			invert_bt_coex_grant_output);
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		LOG_ERR("%s: Failed to configure GPIO control register", __func__);
+		goto err;
+	}
+#endif /* CONFIG_NRF70_SR_COEX_SLEEP_CTRL_GPIO_CTRL  && CONFIG_NRF70_SYSTEM_MODE */
+
 #ifdef CONFIG_NRF70_RADIO_TEST
 	status = nrf_wifi_rt_fmac_dev_init(rpu_ctx_zep->rpu_ctx,
 #ifdef CONFIG_NRF_WIFI_LOW_POWER

From 3e19706cb5fb1ab4cfccd610ebd1a0d89e94a166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Stasiak?= <michal.stasiak@nordicsemi.no>
Date: Thu, 3 Apr 2025 14:54:40 +0200
Subject: [PATCH 2888/2913] [nrf fromlist] drivers: clock_control: nrf: Apply
 fix for nRF54L anomaly 30.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Applied fix for nRF54L anomaly 30, which requires a periodic
calibration of high-frequency clock.

Upstream PR #: 88112

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit b2e0b7a37f74dcbd625a58cd4778e1933c245f8d)
---
 drivers/clock_control/Kconfig.nrf         | 23 +++++++
 drivers/clock_control/clock_control_nrf.c | 82 +++++++++++++++++++++++
 2 files changed, 105 insertions(+)

diff --git a/drivers/clock_control/Kconfig.nrf b/drivers/clock_control/Kconfig.nrf
index da330f7b08e..f113a3284c2 100644
--- a/drivers/clock_control/Kconfig.nrf
+++ b/drivers/clock_control/Kconfig.nrf
@@ -128,6 +128,29 @@ config CLOCK_CONTROL_NRF_USES_TEMP_SENSOR
 endif # CLOCK_CONTROL_NRF_DRIVER_CALIBRATION
 endif # CLOCK_CONTROL_NRF_K32SRC_RC_CALIBRATION
 
+config CLOCK_CONTROL_NRF_HFINT_CALIBRATION
+	bool "HFINT clock calibration"
+	depends on SOC_NRF54L05 || SOC_NRF54L10 || SOC_NRF54L15
+	depends on DT_HAS_NORDIC_NRF_HFXO_ENABLED
+	depends on !TRUSTED_EXECUTION_NONSECURE
+	select EXPERIMENTAL
+	help
+	  Enables calibration of HFINT clock on every start of HFXO clock.
+
+if CLOCK_CONTROL_NRF_HFINT_CALIBRATION
+
+config CLOCK_CONTROL_NRF_HFINT_CALIBRATION_PERIOD
+	int "HFINT clock calibration period in milliseconds"
+	default 60000
+	help
+	  Periodically, HFINT clock calibration is performed.
+	  This includes requesting HFXO clock and starting actual calibration.
+	  Once the calibration is finished, the HFXO clock is released.
+	  Set to 0 to disable periodic calibration - in such case calibration
+	  will be done only when HFXO is started by the application itself.
+
+endif # CLOCK_CONTROL_NRF_HFINT_CALIBRATION
+
 choice CLOCK_CONTROL_NRF_ACCURACY_PPM
 	prompt "32KHz clock accuracy"
 	default CLOCK_CONTROL_NRF_K32SRC_500PPM if CLOCK_CONTROL_NRF_K32SRC_RC && SOC_COMPATIBLE_NRF52X
diff --git a/drivers/clock_control/clock_control_nrf.c b/drivers/clock_control/clock_control_nrf.c
index d829a945be7..6a374166dd9 100644
--- a/drivers/clock_control/clock_control_nrf.c
+++ b/drivers/clock_control/clock_control_nrf.c
@@ -14,6 +14,7 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/shell/shell.h>
 #include <zephyr/irq.h>
+#include <nrf_erratas.h>
 
 LOG_MODULE_REGISTER(clock_control, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
 
@@ -172,9 +173,90 @@ static void set_on_state(uint32_t *flags)
 	irq_unlock(key);
 }
 
+#ifdef CONFIG_CLOCK_CONTROL_NRF_HFINT_CALIBRATION
+
+static void nrf54l_errata_30_workaround(void)
+{
+	while (FIELD_GET(CLOCK_XO_STAT_STATE_Msk, NRF_CLOCK->XO.STAT) !=
+	       CLOCK_XO_STAT_STATE_Running) {
+	}
+	const uint32_t higher_bits = *((volatile uint32_t *)0x50120820UL) & 0xFFFFFFC0;
+	*((volatile uint32_t *)0x50120864UL) = 1 | BIT(31);
+	*((volatile uint32_t *)0x50120848UL) = 1;
+	uint32_t off_abs = 24;
+
+	while (off_abs >= 24) {
+		*((volatile uint32_t *)0x50120844UL) = 1;
+		while (((*((volatile uint32_t *)0x50120840UL)) & (1 << 16)) != 0) {
+		}
+		const uint32_t current_cal = *((volatile uint32_t *)0x50120820UL) & 0x3F;
+		const uint32_t cal_result = *((volatile uint32_t *)0x50120840UL) & 0x7FF;
+		int32_t off = 1024 - cal_result;
+
+		off_abs = (off < 0) ? -off : off;
+
+		if (off >= 24 && current_cal < 0x3F) {
+			*((volatile uint32_t *)0x50120820UL) = higher_bits | (current_cal + 1);
+		} else if (off <= -24 && current_cal > 0) {
+			*((volatile uint32_t *)0x50120820UL) = higher_bits | (current_cal - 1);
+		}
+	}
+
+	*((volatile uint32_t *)0x50120848UL) = 0;
+	*((volatile uint32_t *)0x50120864UL) = 0;
+}
+
+#if CONFIG_CLOCK_CONTROL_NRF_HFINT_CALIBRATION_PERIOD
+
+static struct onoff_client hf_cal_cli;
+
+static void calibration_finished_callback(struct onoff_manager *mgr,
+					  struct onoff_client *cli,
+					  uint32_t state,
+					  int res)
+{
+	(void)onoff_cancel_or_release(mgr, cli);
+}
+
+static void calibration_handler(struct k_timer *timer)
+{
+	nrf_clock_hfclk_t clk_src;
+
+	bool ret = nrfx_clock_is_running(NRF_CLOCK_DOMAIN_HFCLK, &clk_src);
+
+	if (ret && (clk_src == NRF_CLOCK_HFCLK_HIGH_ACCURACY)) {
+		return;
+	}
+
+	sys_notify_init_callback(&hf_cal_cli.notify, calibration_finished_callback);
+	(void)onoff_request(z_nrf_clock_control_get_onoff(CLOCK_CONTROL_NRF_SUBSYS_HF),
+			    &hf_cal_cli);
+}
+
+static K_TIMER_DEFINE(calibration_timer, calibration_handler, NULL);
+
+static int calibration_init(void)
+{
+	k_timer_start(&calibration_timer,
+		      K_NO_WAIT,
+		      K_MSEC(CONFIG_CLOCK_CONTROL_NRF_HFINT_CALIBRATION_PERIOD));
+
+	return 0;
+}
+
+SYS_INIT(calibration_init, APPLICATION, 0);
+
+#endif /* CONFIG_CLOCK_CONTROL_NRF_HFINT_CALIBRATION_PERIOD */
+#endif /* CONFIG_CLOCK_CONTROL_NRF_HFINT_CALIBRATION */
+
 static void clkstarted_handle(const struct device *dev,
 			      enum clock_control_nrf_type type)
 {
+#if CONFIG_CLOCK_CONTROL_NRF_HFINT_CALIBRATION
+	if (nrf54l_errata_30() && (type == CLOCK_CONTROL_NRF_TYPE_HFCLK)) {
+		nrf54l_errata_30_workaround();
+	}
+#endif
 	struct nrf_clock_control_sub_data *sub_data = get_sub_data(dev, type);
 	clock_control_cb_t callback = sub_data->cb;
 	void *user_data = sub_data->user_data;

From b9e1ba8edbcd6402e6f38ec93fbfe4e71461d1d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Thu, 20 Mar 2025 13:07:39 +0100
Subject: [PATCH 2889/2913] [nrf fromtree] drivers: usb: udc: Reduce
 unnecessary ep config lookups
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

UDC API passes struct udc_ep_config to all functions. Some UDC functions
were using endpoint config structure while some were using device and
endpoint number. This API inconsistency led to completely unnecessary
endpoint structure lookups. Remove unnecessary lookups by using endpoint
config structure pointer where it makes sense.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 1cccf28d5e51f8919000a0e68b60834ff59046f4)
(cherry picked from commit 511cd38b489beac989202077472bac92078d0900)
---
 drivers/usb/udc/udc_ambiq.c       | 36 ++++++++++---------
 drivers/usb/udc/udc_common.c      | 41 ++++------------------
 drivers/usb/udc/udc_common.h      | 28 ++++++---------
 drivers/usb/udc/udc_dwc2.c        | 52 ++++++++++++++-------------
 drivers/usb/udc/udc_it82xx2.c     | 46 ++++++++++++++----------
 drivers/usb/udc/udc_kinetis.c     | 36 +++++++++----------
 drivers/usb/udc/udc_mcux_ehci.c   | 24 +++++++------
 drivers/usb/udc/udc_mcux_ip3511.c | 24 +++++++------
 drivers/usb/udc/udc_nrf.c         | 38 ++++++++++++--------
 drivers/usb/udc/udc_numaker.c     | 38 +++++++++++++-------
 drivers/usb/udc/udc_renesas_ra.c  | 21 ++++++-----
 drivers/usb/udc/udc_rpi_pico.c    | 30 ++++++++--------
 drivers/usb/udc/udc_skeleton.c    |  2 +-
 drivers/usb/udc/udc_smartbond.c   | 44 +++++++++++++----------
 drivers/usb/udc/udc_stm32.c       | 58 +++++++++++++++++--------------
 drivers/usb/udc/udc_virtual.c     | 10 +++---
 16 files changed, 272 insertions(+), 256 deletions(-)

diff --git a/drivers/usb/udc/udc_ambiq.c b/drivers/usb/udc/udc_ambiq.c
index f6f342fc21c..11d26865df1 100644
--- a/drivers/usb/udc/udc_ambiq.c
+++ b/drivers/usb/udc/udc_ambiq.c
@@ -96,13 +96,14 @@ static int usbd_ctrl_feed_dout(const struct device *dev, const size_t length)
 static int udc_ambiq_tx(const struct device *dev, uint8_t ep, struct net_buf *buf)
 {
 	const struct udc_ambiq_data *priv = udc_get_private(dev);
+	struct udc_ep_config *cfg = udc_get_ep_cfg(dev, ep);
 	uint32_t status;
 
-	if (udc_ep_is_busy(dev, ep)) {
+	if (udc_ep_is_busy(cfg)) {
 		LOG_WRN("ep 0x%02x is busy!", ep);
 		return 0;
 	}
-	udc_ep_set_busy(dev, ep, true);
+	udc_ep_set_busy(cfg, true);
 
 	/* buf equals NULL is used as indication of ZLP request */
 	if (buf == NULL) {
@@ -112,7 +113,7 @@ static int udc_ambiq_tx(const struct device *dev, uint8_t ep, struct net_buf *bu
 	}
 
 	if (status != AM_HAL_STATUS_SUCCESS) {
-		udc_ep_set_busy(dev, ep, false);
+		udc_ep_set_busy(cfg, false);
 		LOG_ERR("am_hal_usb_ep_xfer write failed(0x%02x), %d", ep, (int)status);
 		return -EIO;
 	}
@@ -123,15 +124,16 @@ static int udc_ambiq_tx(const struct device *dev, uint8_t ep, struct net_buf *bu
 static int udc_ambiq_rx(const struct device *dev, uint8_t ep, struct net_buf *buf)
 {
 	struct udc_ambiq_data *priv = udc_get_private(dev);
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep);
 	struct udc_ep_config *cfg = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
 	uint32_t status;
 	uint16_t rx_size = buf->size;
 
-	if (udc_ep_is_busy(dev, ep)) {
+	if (udc_ep_is_busy(ep_cfg)) {
 		LOG_WRN("ep 0x%02x is busy!", ep);
 		return 0;
 	}
-	udc_ep_set_busy(dev, ep, true);
+	udc_ep_set_busy(ep_cfg, true);
 
 	/* Make sure that OUT transaction size triggered doesn't exceed EP's MPS */
 	if ((ep != USB_CONTROL_EP_OUT) && (cfg->mps < rx_size)) {
@@ -140,7 +142,7 @@ static int udc_ambiq_rx(const struct device *dev, uint8_t ep, struct net_buf *bu
 
 	status = am_hal_usb_ep_xfer(priv->usb_handle, ep, buf->data, rx_size);
 	if (status != AM_HAL_STATUS_SUCCESS) {
-		udc_ep_set_busy(dev, ep, false);
+		udc_ep_set_busy(ep_cfg, false);
 		LOG_ERR("am_hal_usb_ep_xfer read(rx) failed(0x%02x), %d", ep, (int)status);
 		return -EIO;
 	}
@@ -223,7 +225,9 @@ static void udc_ambiq_ep_xfer_complete_callback(const struct device *dev, uint8_
 	if (USB_EP_DIR_IS_IN(ep_addr)) {
 		evt.type = UDC_AMBIQ_EVT_HAL_IN_CMP;
 	} else {
-		buf = udc_buf_peek(dev, ep_addr);
+		struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep_addr);
+
+		buf = udc_buf_peek(ep_cfg);
 		if (buf == NULL) {
 			LOG_ERR("No buffer for ep 0x%02x", ep_addr);
 			udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
@@ -281,12 +285,12 @@ static int udc_ambiq_ep_dequeue(const struct device *dev, struct udc_ep_config *
 
 	lock_key = irq_lock();
 
-	buf = udc_buf_get_all(dev, ep_cfg->addr);
+	buf = udc_buf_get_all(ep_cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
 
-	udc_ep_set_busy(dev, ep_cfg->addr, false);
+	udc_ep_set_busy(ep_cfg, false);
 	am_hal_usb_ep_state_reset(priv->usb_handle, ep_cfg->addr);
 	irq_unlock(lock_key);
 
@@ -320,7 +324,7 @@ static int udc_ambiq_ep_clear_halt(const struct device *dev, struct udc_ep_confi
 	ep_cfg->stat.halted = false;
 
 	/* Resume queued transfer if any */
-	if (udc_buf_peek(dev, ep_cfg->addr)) {
+	if (udc_buf_peek(ep_cfg)) {
 		struct udc_ambiq_event evt = {
 			.ep = ep_cfg->addr,
 			.type = UDC_AMBIQ_EVT_XFER,
@@ -647,14 +651,14 @@ static inline void ambiq_handle_evt_dout(const struct device *dev, struct udc_ep
 	struct net_buf *buf;
 
 	/* retrieve endpoint buffer */
-	buf = udc_buf_get(dev, cfg->addr);
+	buf = udc_buf_get(cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer queued for control ep");
 		return;
 	}
 
 	/* Clear endpoint busy status */
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 
 	/* Handle transfer complete event */
 	if (cfg->addr == USB_CONTROL_EP_OUT) {
@@ -686,9 +690,9 @@ static void ambiq_handle_evt_din(const struct device *dev, struct udc_ep_config
 	bool udc_ambiq_rx_status_in_completed = false;
 
 	/* Clear endpoint busy status */
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 	/* Check and Handle ZLP flag */
-	buf = udc_buf_peek(dev, cfg->addr);
+	buf = udc_buf_peek(cfg);
 	if (cfg->addr != USB_CONTROL_EP_IN) {
 		if (udc_ep_buf_has_zlp(buf)) {
 			udc_ep_buf_clear_zlp(buf);
@@ -699,7 +703,7 @@ static void ambiq_handle_evt_din(const struct device *dev, struct udc_ep_config
 	}
 
 	/* retrieve endpoint buffer */
-	buf = udc_buf_get(dev, cfg->addr);
+	buf = udc_buf_get(cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer queued for control ep");
 		return;
@@ -754,7 +758,7 @@ static void udc_event_xfer(const struct device *dev, struct udc_ep_config *const
 {
 	struct net_buf *buf;
 
-	buf = udc_buf_peek(dev, cfg->addr);
+	buf = udc_buf_peek(cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer for ep 0x%02x", cfg->addr);
 		return;
diff --git a/drivers/usb/udc/udc_common.c b/drivers/usb/udc/udc_common.c
index 9429c404ad6..3718290ce42 100644
--- a/drivers/usb/udc/udc_common.c
+++ b/drivers/usb/udc/udc_common.c
@@ -78,22 +78,13 @@ struct udc_ep_config *udc_get_ep_cfg(const struct device *dev, const uint8_t ep)
 	return data->ep_lut[USB_EP_LUT_IDX(ep)];
 }
 
-bool udc_ep_is_busy(const struct device *dev, const uint8_t ep)
+bool udc_ep_is_busy(const struct udc_ep_config *const ep_cfg)
 {
-	struct udc_ep_config *ep_cfg;
-
-	ep_cfg = udc_get_ep_cfg(dev, ep);
-	__ASSERT(ep_cfg != NULL, "ep 0x%02x is not available", ep);
-
 	return ep_cfg->stat.busy;
 }
 
-void udc_ep_set_busy(const struct device *dev, const uint8_t ep, const bool busy)
+void udc_ep_set_busy(struct udc_ep_config *const ep_cfg, const bool busy)
 {
-	struct udc_ep_config *ep_cfg;
-
-	ep_cfg = udc_get_ep_cfg(dev, ep);
-	__ASSERT(ep_cfg != NULL, "ep 0x%02x is not available", ep);
 	ep_cfg->stat.busy = busy;
 }
 
@@ -115,34 +106,21 @@ int udc_register_ep(const struct device *dev, struct udc_ep_config *const cfg)
 	return 0;
 }
 
-struct net_buf *udc_buf_get(const struct device *dev, const uint8_t ep)
+struct net_buf *udc_buf_get(struct udc_ep_config *const ep_cfg)
 {
-	struct udc_ep_config *ep_cfg;
-
-	ep_cfg = udc_get_ep_cfg(dev, ep);
-	if (ep_cfg == NULL) {
-		return NULL;
-	}
-
 	return k_fifo_get(&ep_cfg->fifo, K_NO_WAIT);
 }
 
-struct net_buf *udc_buf_get_all(const struct device *dev, const uint8_t ep)
+struct net_buf *udc_buf_get_all(struct udc_ep_config *const ep_cfg)
 {
-	struct udc_ep_config *ep_cfg;
 	struct net_buf *buf;
 
-	ep_cfg = udc_get_ep_cfg(dev, ep);
-	if (ep_cfg == NULL) {
-		return NULL;
-	}
-
 	buf = k_fifo_get(&ep_cfg->fifo, K_NO_WAIT);
 	if (!buf) {
 		return NULL;
 	}
 
-	LOG_DBG("ep 0x%02x dequeue %p", ep, buf);
+	LOG_DBG("ep 0x%02x dequeue %p", ep_cfg->addr, buf);
 	for (struct net_buf *n = buf; !k_fifo_is_empty(&ep_cfg->fifo); n = n->frags) {
 		n->frags = k_fifo_get(&ep_cfg->fifo, K_NO_WAIT);
 		LOG_DBG("|-> %p ", n->frags);
@@ -154,15 +132,8 @@ struct net_buf *udc_buf_get_all(const struct device *dev, const uint8_t ep)
 	return buf;
 }
 
-struct net_buf *udc_buf_peek(const struct device *dev, const uint8_t ep)
+struct net_buf *udc_buf_peek(struct udc_ep_config *const ep_cfg)
 {
-	struct udc_ep_config *ep_cfg;
-
-	ep_cfg = udc_get_ep_cfg(dev, ep);
-	if (ep_cfg == NULL) {
-		return NULL;
-	}
-
 	return k_fifo_peek_head(&ep_cfg->fifo);
 }
 
diff --git a/drivers/usb/udc/udc_common.h b/drivers/usb/udc/udc_common.h
index 19cad23bd39..8cad6b6dd1c 100644
--- a/drivers/usb/udc/udc_common.h
+++ b/drivers/usb/udc/udc_common.h
@@ -61,21 +61,19 @@ struct udc_ep_config *udc_get_ep_cfg(const struct device *dev,
 /**
  * @brief Checks if the endpoint is busy
  *
- * @param[in] dev    Pointer to device struct of the driver instance
- * @param[in] ep     Endpoint address
+ * @param[in] ep_cfg Pointer to endpoint configuration
  *
  * @return true if endpoint is busy
  */
-bool udc_ep_is_busy(const struct device *dev, const uint8_t ep);
+bool udc_ep_is_busy(const struct udc_ep_config *const ep_cfg);
 
 /**
  * @brief Helper function to set endpoint busy state
  *
- * @param[in] dev    Pointer to device struct of the driver instance
- * @param[in] ep     Endpoint address
+ * @param[in] ep_cfg Pointer to endpoint configuration
  * @param[in] busy   Busy state
  */
-void udc_ep_set_busy(const struct device *dev, const uint8_t ep,
+void udc_ep_set_busy(struct udc_ep_config *const ep_cfg,
 		     const bool busy);
 
 /**
@@ -85,13 +83,11 @@ void udc_ep_set_busy(const struct device *dev, const uint8_t ep,
  * Use it when transfer is finished and request should
  * be passed to the higher level.
  *
- * @param[in] dev     Pointer to device struct of the driver instance
- * @param[in] ep      Endpoint address
+ * @param[in] ep_cfg Pointer to endpoint configuration
  *
  * @return pointer to UDC request or NULL on error.
  */
-struct net_buf *udc_buf_get(const struct device *dev,
-			    const uint8_t ep);
+struct net_buf *udc_buf_get(struct udc_ep_config *const ep_cfg);
 
 /**
  * @brief Get all UDC request from endpoint FIFO.
@@ -100,13 +96,11 @@ struct net_buf *udc_buf_get(const struct device *dev,
  * This function removes all request from endpoint FIFO and
  * is typically used to dequeue endpoint FIFO.
  *
- * @param[in] dev    Pointer to device struct of the driver instance
- * @param[in] ep     Endpoint address
+ * @param[in] ep_cfg Pointer to endpoint configuration
  *
  * @return pointer to UDC request or NULL on error.
  */
-struct net_buf *udc_buf_get_all(const struct device *dev,
-				const uint8_t ep);
+struct net_buf *udc_buf_get_all(struct udc_ep_config *const ep_cfg);
 
 /**
  * @brief Peek request at the head of endpoint FIFO.
@@ -114,13 +108,11 @@ struct net_buf *udc_buf_get_all(const struct device *dev,
  * Return request from the head of endpoint FIFO without removing.
  * Use it when request buffer is required for a transfer.
  *
- * @param[in] dev     Pointer to device struct of the driver instance
- * @param[in] ep      Endpoint address
+ * @param[in] ep_cfg Pointer to endpoint configuration
  *
  * @return pointer to request or NULL on error.
  */
-struct net_buf *udc_buf_peek(const struct device *dev,
-			     const uint8_t ep);
+struct net_buf *udc_buf_peek(struct udc_ep_config *const ep_cfg);
 
 /**
  * @brief Put request at the tail of endpoint FIFO.
diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index feccd3d8662..2339356d882 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -417,7 +417,7 @@ static void dwc2_ensure_setup_ready(const struct device *dev)
 		return;
 	}
 
-	if (!udc_buf_peek(dev, USB_CONTROL_EP_OUT)) {
+	if (!udc_buf_peek(udc_get_ep_cfg(dev, USB_CONTROL_EP_IN))) {
 		dwc2_ctrl_feed_dout(dev, 8);
 	}
 }
@@ -762,7 +762,7 @@ static void dwc2_handle_xfer_next(const struct device *dev,
 {
 	struct net_buf *buf;
 
-	buf = udc_buf_peek(dev, cfg->addr);
+	buf = udc_buf_peek(cfg);
 	if (buf == NULL) {
 		return;
 	}
@@ -796,7 +796,7 @@ static void dwc2_handle_xfer_next(const struct device *dev,
 			LOG_ERR("Failed to start write to TX FIFO, ep 0x%02x (err: %d)",
 				cfg->addr, err);
 
-			buf = udc_buf_get(dev, cfg->addr);
+			buf = udc_buf_get(cfg);
 			if (udc_submit_ep_event(dev, buf, -ECONNREFUSED)) {
 				LOG_ERR("Failed to submit endpoint event");
 			};
@@ -805,12 +805,14 @@ static void dwc2_handle_xfer_next(const struct device *dev,
 		}
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, true);
+	udc_ep_set_busy(cfg, true);
 }
 
 static int dwc2_handle_evt_setup(const struct device *dev)
 {
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	struct udc_ep_config *cfg_out = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
+	struct udc_ep_config *cfg_in = udc_get_ep_cfg(dev, USB_CONTROL_EP_IN);
 	struct net_buf *buf;
 	int err;
 
@@ -820,18 +822,18 @@ static int dwc2_handle_evt_setup(const struct device *dev)
 	 */
 	k_event_clear(&priv->xfer_finished, BIT(0) | BIT(16));
 
-	buf = udc_buf_get_all(dev, USB_CONTROL_EP_OUT);
+	buf = udc_buf_get_all(cfg_out);
 	if (buf) {
 		net_buf_unref(buf);
 	}
 
-	buf = udc_buf_get_all(dev, USB_CONTROL_EP_IN);
+	buf = udc_buf_get_all(cfg_in);
 	if (buf) {
 		net_buf_unref(buf);
 	}
 
-	udc_ep_set_busy(dev, USB_CONTROL_EP_OUT, false);
-	udc_ep_set_busy(dev, USB_CONTROL_EP_IN, false);
+	udc_ep_set_busy(cfg_out, false);
+	udc_ep_set_busy(cfg_in, false);
 
 	/* Allocate buffer and copy received SETUP for processing */
 	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, 8);
@@ -877,13 +879,13 @@ static inline int dwc2_handle_evt_dout(const struct device *dev,
 	struct net_buf *buf;
 	int err = 0;
 
-	buf = udc_buf_get(dev, cfg->addr);
+	buf = udc_buf_get(cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer queued for ep 0x%02x", cfg->addr);
 		return -ENODATA;
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 
 	if (cfg->addr == USB_CONTROL_EP_OUT) {
 		if (udc_ctrl_stage_is_status_out(dev)) {
@@ -925,7 +927,7 @@ static int dwc2_handle_evt_din(const struct device *dev,
 {
 	struct net_buf *buf;
 
-	buf = udc_buf_peek(dev, cfg->addr);
+	buf = udc_buf_peek(cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer for ep 0x%02x", cfg->addr);
 		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
@@ -942,8 +944,8 @@ static int dwc2_handle_evt_din(const struct device *dev,
 		return dwc2_tx_fifo_write(dev, cfg, buf);
 	}
 
-	buf = udc_buf_get(dev, cfg->addr);
-	udc_ep_set_busy(dev, cfg->addr, false);
+	buf = udc_buf_get(cfg);
+	udc_ep_set_busy(cfg, false);
 
 	if (cfg->addr == USB_CONTROL_EP_IN) {
 		if (udc_ctrl_stage_is_status_in(dev) ||
@@ -1649,7 +1651,7 @@ static void udc_dwc2_ep_disable(const struct device *dev,
 		dwc2_flush_tx_fifo(dev, usb_dwc2_get_depctl_txfnum(dxepctl));
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 }
 
 /* Deactivated endpoint means that there will be a bus timeout when the host
@@ -1723,7 +1725,7 @@ static int udc_dwc2_ep_clear_halt(const struct device *dev,
 	cfg->stat.halted = false;
 
 	/* Resume queued transfers if any */
-	if (udc_buf_peek(dev, cfg->addr)) {
+	if (udc_buf_peek(cfg)) {
 		uint32_t ep_bit;
 
 		if (USB_EP_DIR_IS_IN(cfg->addr)) {
@@ -1771,12 +1773,12 @@ static int udc_dwc2_ep_dequeue(const struct device *dev,
 
 	udc_dwc2_ep_disable(dev, cfg, false);
 
-	buf = udc_buf_get_all(dev, cfg->addr);
+	buf = udc_buf_get_all(cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 
 	LOG_DBG("dequeue ep 0x%02x", cfg->addr);
 
@@ -2235,7 +2237,7 @@ static int udc_dwc2_disable(const struct device *dev)
 	 * triggering Soft Reset seems to be enough on shutdown clean up.
 	 */
 	dwc2_core_soft_reset(dev);
-	buf = udc_buf_get_all(dev, USB_CONTROL_EP_OUT);
+	buf = udc_buf_get_all(udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT));
 	if (buf) {
 		net_buf_unref(buf);
 	}
@@ -2513,7 +2515,7 @@ static inline void dwc2_handle_rxflvl(const struct device *dev)
 	case USB_DWC2_GRXSTSR_PKTSTS_OUT_DATA:
 		ep_cfg = udc_get_ep_cfg(dev, ep);
 
-		buf = udc_buf_peek(dev, ep_cfg->addr);
+		buf = udc_buf_peek(ep_cfg);
 
 		/* RxFIFO data must be retrieved even when buf is NULL */
 		dwc2_read_fifo(dev, ep, buf, bcnt);
@@ -2539,7 +2541,7 @@ static inline void dwc2_handle_in_xfercompl(const struct device *dev,
 	struct net_buf *buf;
 
 	ep_cfg = udc_get_ep_cfg(dev, ep_idx | USB_EP_DIR_IN);
-	buf = udc_buf_peek(dev, ep_cfg->addr);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
 		return;
@@ -2602,7 +2604,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 
 	doeptsiz = sys_read32((mem_addr_t)&base->out_ep[ep_idx].doeptsiz);
 
-	buf = udc_buf_peek(dev, ep_cfg->addr);
+	buf = udc_buf_peek(ep_cfg);
 	if (!buf) {
 		LOG_ERR("No buffer for ep 0x%02x", ep_cfg->addr);
 		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
@@ -2771,7 +2773,7 @@ static void dwc2_handle_incompisoin(const struct device *dev)
 
 				udc_dwc2_ep_disable(dev, cfg, false);
 
-				buf = udc_buf_get(dev, cfg->addr);
+				buf = udc_buf_get(cfg);
 				if (buf) {
 					/* Data is no longer relevant */
 					udc_submit_ep_event(dev, buf, 0);
@@ -2826,7 +2828,7 @@ static void dwc2_handle_incompisoout(const struct device *dev)
 
 				udc_dwc2_ep_disable(dev, cfg, false);
 
-				buf = udc_buf_get(dev, cfg->addr);
+				buf = udc_buf_get(cfg);
 				if (buf) {
 					udc_submit_ep_event(dev, buf, 0);
 				}
@@ -3061,7 +3063,7 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 			ep = pull_next_ep_from_bitmap(&eps);
 			ep_cfg = udc_get_ep_cfg(dev, ep);
 
-			if (!udc_ep_is_busy(dev, ep_cfg->addr)) {
+			if (!udc_ep_is_busy(ep_cfg)) {
 				dwc2_handle_xfer_next(dev, ep_cfg);
 			} else {
 				LOG_DBG("ep 0x%02x busy", ep_cfg->addr);
@@ -3091,7 +3093,7 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 				dwc2_handle_evt_dout(dev, ep_cfg);
 			}
 
-			if (!udc_ep_is_busy(dev, ep_cfg->addr)) {
+			if (!udc_ep_is_busy(ep_cfg)) {
 				dwc2_handle_xfer_next(dev, ep_cfg);
 			} else {
 				LOG_DBG("ep 0x%02x busy", ep_cfg->addr);
diff --git a/drivers/usb/udc/udc_it82xx2.c b/drivers/usb/udc/udc_it82xx2.c
index 0c61b7b17db..fd00587dd65 100644
--- a/drivers/usb/udc/udc_it82xx2.c
+++ b/drivers/usb/udc/udc_it82xx2.c
@@ -506,12 +506,12 @@ static int it82xx2_ep_dequeue(const struct device *dev, struct udc_ep_config *co
 	}
 	irq_unlock(lock_key);
 
-	buf = udc_buf_get_all(dev, cfg->addr);
+	buf = udc_buf_get_all(cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 
 	return 0;
 }
@@ -861,16 +861,17 @@ static int work_handler_xfer_continue(const struct device *dev, uint8_t ep, stru
 	return ret;
 }
 
-static int work_handler_xfer_next(const struct device *dev, uint8_t ep)
+static int work_handler_xfer_next(const struct device *dev,
+				  struct udc_ep_config *ep_cfg)
 {
 	struct net_buf *buf;
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		return -ENODATA;
 	}
 
-	return work_handler_xfer_continue(dev, ep, buf);
+	return work_handler_xfer_continue(dev, ep_cfg->addr, buf);
 }
 
 /*
@@ -984,11 +985,12 @@ static inline int work_handler_in(const struct device *dev, uint8_t ep)
 		k_sem_give(&priv->fifo_sem[fifo_idx - 1]);
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	ep_cfg = udc_get_ep_cfg(dev, ep);
+
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		return -ENODATA;
 	}
-	ep_cfg = udc_get_ep_cfg(dev, ep);
 
 	net_buf_pull(buf, MIN(buf->len, udc_mps_ep_size(ep_cfg)));
 
@@ -1005,12 +1007,12 @@ static inline int work_handler_in(const struct device *dev, uint8_t ep)
 		return 0;
 	}
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(ep_cfg);
 	if (buf == NULL) {
 		return -ENODATA;
 	}
 
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(ep_cfg, false);
 
 	if (ep == USB_CONTROL_EP_IN) {
 		if (udc_ctrl_stage_is_status_in(dev) || udc_ctrl_stage_is_no_data(dev)) {
@@ -1042,10 +1044,13 @@ static inline int work_handler_setup(const struct device *dev, uint8_t ep)
 	int err = 0;
 
 	if (udc_ctrl_stage_is_status_out(dev)) {
+		struct udc_ep_config *cfg_out;
+
 		/* out -> setup */
-		buf = udc_buf_get(dev, USB_CONTROL_EP_OUT);
+		cfg_out = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
+		buf = udc_buf_get(cfg_out);
 		if (buf) {
-			udc_ep_set_busy(dev, USB_CONTROL_EP_OUT, false);
+			udc_ep_set_busy(cfg_out, false);
 			net_buf_unref(buf);
 		}
 	}
@@ -1109,7 +1114,8 @@ static inline int work_handler_out(const struct device *dev, uint8_t ep)
 		return 0;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	ep_cfg = udc_get_ep_cfg(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		return -ENODATA;
 	}
@@ -1121,7 +1127,7 @@ static inline int work_handler_out(const struct device *dev, uint8_t ep)
 	if (ep == USB_CONTROL_EP_OUT) {
 		if (udc_ctrl_stage_is_status_out(dev) && len != 0) {
 			LOG_DBG("Handle early setup token");
-			buf = udc_buf_get(dev, ep);
+			buf = udc_buf_get(ep_cfg);
 			/* Notify upper layer */
 			udc_ctrl_submit_status(dev, buf);
 			/* Update to next stage of control transfer */
@@ -1130,7 +1136,6 @@ static inline int work_handler_out(const struct device *dev, uint8_t ep)
 		}
 	}
 
-	ep_cfg = udc_get_ep_cfg(dev, ep);
 	if (len > udc_mps_ep_size(ep_cfg)) {
 		LOG_ERR("Failed to handle this packet due to the packet size");
 		return -ENOBUFS;
@@ -1148,12 +1153,12 @@ static inline int work_handler_out(const struct device *dev, uint8_t ep)
 		return err;
 	}
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(ep_cfg);
 	if (buf == NULL) {
 		return -ENODATA;
 	}
 
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(ep_cfg, false);
 
 	if (ep == USB_CONTROL_EP_OUT) {
 		if (udc_ctrl_stage_is_status_out(dev)) {
@@ -1179,11 +1184,14 @@ static inline int work_handler_out(const struct device *dev, uint8_t ep)
 static void xfer_work_handler(const struct device *dev)
 {
 	while (true) {
+		struct udc_ep_config *ep_cfg;
 		struct it82xx2_ep_event evt;
 		int err = 0;
 
 		k_msgq_get(&evt_msgq, &evt, K_FOREVER);
 
+		ep_cfg = udc_get_ep_cfg(evt.dev, evt.ep);
+
 		switch (evt.event) {
 		case IT82xx2_EVT_SETUP_TOKEN:
 			err = work_handler_setup(evt.dev, evt.ep);
@@ -1206,9 +1214,9 @@ static void xfer_work_handler(const struct device *dev)
 			udc_submit_event(evt.dev, UDC_EVT_ERROR, err);
 		}
 
-		if (evt.ep != USB_CONTROL_EP_OUT && !udc_ep_is_busy(evt.dev, evt.ep)) {
-			if (work_handler_xfer_next(evt.dev, evt.ep) == 0) {
-				udc_ep_set_busy(evt.dev, evt.ep, true);
+		if (evt.ep != USB_CONTROL_EP_OUT && !udc_ep_is_busy(ep_cfg)) {
+			if (work_handler_xfer_next(ep_cfg) == 0) {
+				udc_ep_set_busy(ep_cfg, true);
 			}
 		}
 	}
diff --git a/drivers/usb/udc/udc_kinetis.c b/drivers/usb/udc/udc_kinetis.c
index 70fae41b487..19e1f865efa 100644
--- a/drivers/usb/udc/udc_kinetis.c
+++ b/drivers/usb/udc/udc_kinetis.c
@@ -221,7 +221,7 @@ static int usbfsotg_xfer_next(const struct device *dev,
 {
 	struct net_buf *buf;
 
-	buf = udc_buf_peek(dev, cfg->addr);
+	buf = udc_buf_peek(cfg);
 	if (buf == NULL) {
 		return -ENODATA;
 	}
@@ -317,7 +317,7 @@ static inline int work_handler_setup(const struct device *dev)
 	struct net_buf *buf;
 	int err;
 
-	buf = udc_buf_get(dev, USB_CONTROL_EP_OUT);
+	buf = udc_buf_get(udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT));
 	if (buf == NULL) {
 		return -ENODATA;
 	}
@@ -365,17 +365,17 @@ static inline int work_handler_setup(const struct device *dev)
 }
 
 static inline int work_handler_out(const struct device *dev,
-				   const uint8_t ep)
+				   struct udc_ep_config *ep_cfg)
 {
 	struct net_buf *buf;
 	int err = 0;
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(ep_cfg);
 	if (buf == NULL) {
 		return -ENODATA;
 	}
 
-	if (ep == USB_CONTROL_EP_OUT) {
+	if (ep_cfg->addr == USB_CONTROL_EP_OUT) {
 		if (udc_ctrl_stage_is_status_out(dev)) {
 			/* s-in-status finished, next bd is already fed */
 			LOG_DBG("dout:%p|no feed", buf);
@@ -404,16 +404,16 @@ static inline int work_handler_out(const struct device *dev,
 }
 
 static inline int work_handler_in(const struct device *dev,
-				  const uint8_t ep)
+				  struct udc_ep_config *ep_cfg)
 {
 	struct net_buf *buf;
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(ep_cfg);
 	if (buf == NULL) {
 		return -ENODATA;
 	}
 
-	if (ep == USB_CONTROL_EP_IN) {
+	if (ep_cfg->addr == USB_CONTROL_EP_IN) {
 		if (udc_ctrl_stage_is_status_in(dev) ||
 		    udc_ctrl_stage_is_no_data(dev)) {
 			/* Status stage finished, notify upper layer */
@@ -482,12 +482,12 @@ static void xfer_work_handler(struct k_work *item)
 			err = work_handler_setup(ev->dev);
 			break;
 		case USBFSOTG_EVT_DOUT:
-			err = work_handler_out(ev->dev, ev->ep);
-			udc_ep_set_busy(ev->dev, ev->ep, false);
+			err = work_handler_out(ev->dev, ep_cfg);
+			udc_ep_set_busy(ep_cfg, false);
 			break;
 		case USBFSOTG_EVT_DIN:
-			err = work_handler_in(ev->dev, ev->ep);
-			udc_ep_set_busy(ev->dev, ev->ep, false);
+			err = work_handler_in(ev->dev, ep_cfg);
+			udc_ep_set_busy(ep_cfg, false);
 			break;
 		case USBFSOTG_EVT_CLEAR_HALT:
 			err = usbfsotg_ep_clear_halt(ev->dev, ep_cfg);
@@ -501,9 +501,9 @@ static void xfer_work_handler(struct k_work *item)
 		}
 
 		/* Peek next transfer */
-		if (ev->ep != USB_CONTROL_EP_OUT && !udc_ep_is_busy(ev->dev, ev->ep)) {
+		if (ev->ep != USB_CONTROL_EP_OUT && !udc_ep_is_busy(ep_cfg)) {
 			if (usbfsotg_xfer_next(ev->dev, ep_cfg) == 0) {
-				udc_ep_set_busy(ev->dev, ev->ep, true);
+				udc_ep_set_busy(ep_cfg, true);
 			}
 		}
 
@@ -584,7 +584,7 @@ static ALWAYS_INLINE void isr_handle_xfer_done(const struct device *dev,
 			priv->busy[odd] = false;
 			priv->out_buf[odd] = NULL;
 		} else {
-			buf = udc_buf_peek(dev, ep_cfg->addr);
+			buf = udc_buf_peek(ep_cfg);
 		}
 
 		if (buf == NULL) {
@@ -614,7 +614,7 @@ static ALWAYS_INLINE void isr_handle_xfer_done(const struct device *dev,
 		ep_cfg->stat.odd = !odd;
 		ep_cfg->stat.data1 = !data1;
 
-		buf = udc_buf_peek(dev, ep_cfg->addr);
+		buf = udc_buf_peek(ep_cfg);
 		if (buf == NULL) {
 			LOG_ERR("No buffer for ep 0x%02x", ep);
 			udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
@@ -740,12 +740,12 @@ static int usbfsotg_ep_dequeue(const struct device *dev,
 	irq_unlock(lock_key);
 
 	cfg->stat.halted = false;
-	buf = udc_buf_get_all(dev, cfg->addr);
+	buf = udc_buf_get_all(cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 
 	return 0;
 }
diff --git a/drivers/usb/udc/udc_mcux_ehci.c b/drivers/usb/udc/udc_mcux_ehci.c
index 489540a9d15..fc5f65b7644 100644
--- a/drivers/usb/udc/udc_mcux_ehci.c
+++ b/drivers/usb/udc/udc_mcux_ehci.c
@@ -112,8 +112,8 @@ static int udc_mcux_ep_feed(const struct device *dev,
 	}
 
 	udc_mcux_lock(dev);
-	if (!udc_ep_is_busy(dev, cfg->addr)) {
-		udc_ep_set_busy(dev, cfg->addr, true);
+	if (!udc_ep_is_busy(cfg)) {
+		udc_ep_set_busy(cfg, true);
 		udc_mcux_unlock(dev);
 
 		if (USB_EP_DIR_IS_OUT(cfg->addr)) {
@@ -130,7 +130,7 @@ static int udc_mcux_ep_feed(const struct device *dev,
 
 		udc_mcux_lock(dev);
 		if (status != kStatus_USB_Success) {
-			udc_ep_set_busy(dev, cfg->addr, false);
+			udc_ep_set_busy(cfg, false);
 		}
 		udc_mcux_unlock(dev);
 	} else {
@@ -147,7 +147,7 @@ static int udc_mcux_ep_try_feed(const struct device *dev,
 {
 	struct net_buf *feed_buf;
 
-	feed_buf = udc_buf_peek(dev, cfg->addr);
+	feed_buf = udc_buf_peek(cfg);
 	if (feed_buf) {
 		int ret = udc_mcux_ep_feed(dev, cfg, feed_buf);
 
@@ -322,13 +322,14 @@ static int udc_mcux_handler_non_ctrl_out(const struct device *dev, uint8_t ep,
 static int udc_mcux_handler_out(const struct device *dev, uint8_t ep,
 				uint8_t *mcux_buf, uint16_t mcux_len)
 {
+	struct udc_ep_config *const cfg = udc_get_ep_cfg(dev, ep);
 	int err;
 	struct net_buf *buf;
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(cfg);
 
 	udc_mcux_lock(dev);
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(cfg, false);
 	udc_mcux_unlock(dev);
 
 	if (buf == NULL) {
@@ -375,10 +376,11 @@ static bool udc_mcux_handler_zlt(const struct device *dev, uint8_t ep, struct ne
 static int udc_mcux_handler_in(const struct device *dev, uint8_t ep,
 				uint8_t *mcux_buf, uint16_t mcux_len)
 {
+	struct udc_ep_config *const cfg = udc_get_ep_cfg(dev, ep);
 	int err;
 	struct net_buf *buf;
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(cfg);
 	if (buf == NULL) {
 		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
 		return -ENOBUFS;
@@ -388,10 +390,10 @@ static int udc_mcux_handler_in(const struct device *dev, uint8_t ep,
 		return 0;
 	}
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(cfg);
 
 	udc_mcux_lock(dev);
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(cfg, false);
 	udc_mcux_unlock(dev);
 
 	if (buf == NULL) {
@@ -593,13 +595,13 @@ static int udc_mcux_ep_dequeue(const struct device *dev,
 	struct net_buf *buf;
 
 	cfg->stat.halted = false;
-	buf = udc_buf_get_all(dev, cfg->addr);
+	buf = udc_buf_get_all(cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
 
 	udc_mcux_lock(dev);
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 	udc_mcux_unlock(dev);
 
 	return 0;
diff --git a/drivers/usb/udc/udc_mcux_ip3511.c b/drivers/usb/udc/udc_mcux_ip3511.c
index f8db1221e07..564f2f9357b 100644
--- a/drivers/usb/udc/udc_mcux_ip3511.c
+++ b/drivers/usb/udc/udc_mcux_ip3511.c
@@ -112,8 +112,8 @@ static int udc_mcux_ep_feed(const struct device *dev,
 	}
 
 	udc_mcux_lock(dev);
-	if (!udc_ep_is_busy(dev, cfg->addr)) {
-		udc_ep_set_busy(dev, cfg->addr, true);
+	if (!udc_ep_is_busy(cfg)) {
+		udc_ep_set_busy(cfg, true);
 		udc_mcux_unlock(dev);
 
 		if (USB_EP_DIR_IS_OUT(cfg->addr)) {
@@ -130,7 +130,7 @@ static int udc_mcux_ep_feed(const struct device *dev,
 
 		udc_mcux_lock(dev);
 		if (status != kStatus_USB_Success) {
-			udc_ep_set_busy(dev, cfg->addr, false);
+			udc_ep_set_busy(cfg, false);
 		}
 		udc_mcux_unlock(dev);
 	} else {
@@ -147,7 +147,7 @@ static int udc_mcux_ep_try_feed(const struct device *dev,
 {
 	struct net_buf *feed_buf;
 
-	feed_buf = udc_buf_peek(dev, cfg->addr);
+	feed_buf = udc_buf_peek(cfg);
 	if (feed_buf) {
 		int ret = udc_mcux_ep_feed(dev, cfg, feed_buf);
 
@@ -322,13 +322,14 @@ static int udc_mcux_handler_non_ctrl_out(const struct device *dev, uint8_t ep,
 static int udc_mcux_handler_out(const struct device *dev, uint8_t ep,
 				uint8_t *mcux_buf, uint16_t mcux_len)
 {
+	struct udc_ep_config *const cfg = udc_get_ep_cfg(dev, ep);
 	int err;
 	struct net_buf *buf;
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(cfg);
 
 	udc_mcux_lock(dev);
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(cfg, false);
 	udc_mcux_unlock(dev);
 
 	if (buf == NULL) {
@@ -375,10 +376,11 @@ static bool udc_mcux_handler_zlt(const struct device *dev, uint8_t ep, struct ne
 static int udc_mcux_handler_in(const struct device *dev, uint8_t ep,
 				uint8_t *mcux_buf, uint16_t mcux_len)
 {
+	struct udc_ep_config *const cfg = udc_get_ep_cfg(dev, ep);
 	int err;
 	struct net_buf *buf;
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(cfg);
 	if (buf == NULL) {
 		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
 		return -ENOBUFS;
@@ -388,10 +390,10 @@ static int udc_mcux_handler_in(const struct device *dev, uint8_t ep,
 		return 0;
 	}
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(cfg);
 
 	udc_mcux_lock(dev);
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(cfg, false);
 	udc_mcux_unlock(dev);
 
 	if (buf == NULL) {
@@ -593,13 +595,13 @@ static int udc_mcux_ep_dequeue(const struct device *dev,
 	struct net_buf *buf;
 
 	cfg->stat.halted = false;
-	buf = udc_buf_get_all(dev, cfg->addr);
+	buf = udc_buf_get_all(cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
 
 	udc_mcux_lock(dev);
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 	udc_mcux_unlock(dev);
 
 	return 0;
diff --git a/drivers/usb/udc/udc_nrf.c b/drivers/usb/udc/udc_nrf.c
index cafe3fbd19f..8e43313bd19 100644
--- a/drivers/usb/udc/udc_nrf.c
+++ b/drivers/usb/udc/udc_nrf.c
@@ -96,13 +96,14 @@ static void udc_nrf_clear_control_out(const struct device *dev)
 
 static void udc_event_xfer_in_next(const struct device *dev, const uint8_t ep)
 {
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep);
 	struct net_buf *buf;
 
-	if (udc_ep_is_busy(dev, ep)) {
+	if (udc_ep_is_busy(ep_cfg)) {
 		return;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf != NULL) {
 		nrf_usbd_common_transfer_t xfer = {
 			.p_data = {.tx = buf->data},
@@ -118,7 +119,7 @@ static void udc_event_xfer_in_next(const struct device *dev, const uint8_t ep)
 			/* REVISE: remove from endpoint queue? ASSERT? */
 			udc_submit_ep_event(dev, buf, -ECONNREFUSED);
 		} else {
-			udc_ep_set_busy(dev, ep, true);
+			udc_ep_set_busy(ep_cfg, true);
 		}
 	}
 }
@@ -151,9 +152,10 @@ static void udc_event_xfer_ctrl_in(const struct device *dev,
 
 static void udc_event_fake_status_in(const struct device *dev)
 {
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, USB_CONTROL_EP_IN);
 	struct net_buf *buf;
 
-	buf = udc_buf_get(dev, USB_CONTROL_EP_IN);
+	buf = udc_buf_get(ep_cfg);
 	if (unlikely(buf == NULL)) {
 		LOG_DBG("ep 0x%02x queue is empty", USB_CONTROL_EP_IN);
 		return;
@@ -166,19 +168,22 @@ static void udc_event_fake_status_in(const struct device *dev)
 static void udc_event_xfer_in(const struct device *dev,
 			      nrf_usbd_common_evt_t const *const event)
 {
+	struct udc_ep_config *ep_cfg;
 	uint8_t ep = event->data.eptransfer.ep;
 	struct net_buf *buf;
 
+	ep_cfg = udc_get_ep_cfg(dev, ep);
+
 	switch (event->data.eptransfer.status) {
 	case NRF_USBD_COMMON_EP_OK:
-		buf = udc_buf_get(dev, ep);
+		buf = udc_buf_get(ep_cfg);
 		if (buf == NULL) {
 			LOG_ERR("ep 0x%02x queue is empty", ep);
 			__ASSERT_NO_MSG(false);
 			return;
 		}
 
-		udc_ep_set_busy(dev, ep, false);
+		udc_ep_set_busy(ep_cfg, false);
 		if (ep == USB_CONTROL_EP_IN) {
 			udc_event_xfer_ctrl_in(dev, buf);
 			return;
@@ -189,14 +194,14 @@ static void udc_event_xfer_in(const struct device *dev,
 
 	case NRF_USBD_COMMON_EP_ABORTED:
 		LOG_WRN("aborted IN ep 0x%02x", ep);
-		buf = udc_buf_get_all(dev, ep);
+		buf = udc_buf_get_all(ep_cfg);
 
 		if (buf == NULL) {
 			LOG_DBG("ep 0x%02x queue is empty", ep);
 			return;
 		}
 
-		udc_ep_set_busy(dev, ep, false);
+		udc_ep_set_busy(ep_cfg, false);
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 		break;
 
@@ -226,13 +231,14 @@ static void udc_event_xfer_ctrl_out(const struct device *dev,
 
 static void udc_event_xfer_out_next(const struct device *dev, const uint8_t ep)
 {
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep);
 	struct net_buf *buf;
 
-	if (udc_ep_is_busy(dev, ep)) {
+	if (udc_ep_is_busy(ep_cfg)) {
 		return;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf != NULL) {
 		nrf_usbd_common_transfer_t xfer = {
 			.p_data = {.rx = buf->data},
@@ -247,7 +253,7 @@ static void udc_event_xfer_out_next(const struct device *dev, const uint8_t ep)
 			/* REVISE: remove from endpoint queue? ASSERT? */
 			udc_submit_ep_event(dev, buf, -ECONNREFUSED);
 		} else {
-			udc_ep_set_busy(dev, ep, true);
+			udc_ep_set_busy(ep_cfg, true);
 		}
 	} else {
 		LOG_DBG("ep 0x%02x waiting, queue is empty", ep);
@@ -257,6 +263,7 @@ static void udc_event_xfer_out_next(const struct device *dev, const uint8_t ep)
 static void udc_event_xfer_out(const struct device *dev,
 			       nrf_usbd_common_evt_t const *const event)
 {
+	struct udc_ep_config *ep_cfg;
 	uint8_t ep = event->data.eptransfer.ep;
 	nrf_usbd_common_ep_status_t err_code;
 	struct net_buf *buf;
@@ -276,14 +283,15 @@ static void udc_event_xfer_out(const struct device *dev,
 			LOG_ERR("OUT transfer failed %d", err_code);
 		}
 
-		buf = udc_buf_get(dev, ep);
+		ep_cfg = udc_get_ep_cfg(dev, ep);
+		buf = udc_buf_get(ep_cfg);
 		if (buf == NULL) {
 			LOG_ERR("ep 0x%02x ok, queue is empty", ep);
 			return;
 		}
 
 		net_buf_add(buf, len);
-		udc_ep_set_busy(dev, ep, false);
+		udc_ep_set_busy(ep_cfg, false);
 		if (ep == USB_CONTROL_EP_OUT) {
 			udc_event_xfer_ctrl_out(dev, buf);
 		} else {
@@ -616,7 +624,7 @@ static int udc_nrf_ep_dequeue(const struct device *dev,
 		 * HAL driver does not generate event for an OUT endpoint
 		 * or when IN endpoint is not busy.
 		 */
-		buf = udc_buf_get_all(dev, cfg->addr);
+		buf = udc_buf_get_all(cfg);
 		if (buf) {
 			udc_submit_ep_event(dev, buf, -ECONNABORTED);
 		} else {
@@ -625,7 +633,7 @@ static int udc_nrf_ep_dequeue(const struct device *dev,
 
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 
 	return 0;
 }
diff --git a/drivers/usb/udc/udc_numaker.c b/drivers/usb/udc/udc_numaker.c
index 5545132944d..736ded93fc5 100644
--- a/drivers/usb/udc/udc_numaker.c
+++ b/drivers/usb/udc/udc_numaker.c
@@ -505,6 +505,7 @@ static void numaker_usbd_ep_config_dmabuf(struct numaker_usbd_ep *ep_cur, uint32
 
 static void numaker_usbd_ep_abort(struct numaker_usbd_ep *ep_cur)
 {
+	struct udc_ep_config *ep_cfg;
 	const struct device *dev = ep_cur->dev;
 	USBD_EP_T *ep_base = numaker_usbd_ep_base(dev, ep_cur->ep_hw_idx);
 
@@ -512,7 +513,8 @@ static void numaker_usbd_ep_abort(struct numaker_usbd_ep *ep_cur)
 	ep_base->CFGP |= USBD_CFGP_CLRRDY_Msk;
 
 	if (ep_cur->addr_valid) {
-		udc_ep_set_busy(dev, ep_cur->addr, false);
+		ep_cfg = udc_get_ep_cfg(dev, ep_cur->addr);
+		udc_ep_set_busy(ep_cfg, false);
 	}
 }
 
@@ -589,11 +591,13 @@ static void numaker_usbd_ep_disable(struct numaker_usbd_ep *ep_cur)
 /* Start EP data transaction */
 static void udc_numaker_ep_trigger(struct numaker_usbd_ep *ep_cur, uint32_t len)
 {
+	struct udc_ep_config *ep_cfg;
 	const struct device *dev = ep_cur->dev;
 	USBD_EP_T *ep_base = numaker_usbd_ep_base(dev, ep_cur->ep_hw_idx);
 
 	if (ep_cur->addr_valid) {
-		udc_ep_set_busy(dev, ep_cur->addr, true);
+		ep_cfg = udc_get_ep_cfg(dev, ep_cur->addr);
+		udc_ep_set_busy(ep_cfg, true);
 	}
 
 	ep_base->MXPLD = len;
@@ -762,13 +766,15 @@ static int numaker_usbd_xfer_out(const struct device *dev, uint8_t ep, bool stri
 {
 	struct net_buf *buf;
 	struct numaker_usbd_ep *ep_cur;
+	struct udc_ep_config *ep_cfg;
 
 	if (!USB_EP_DIR_IS_OUT(ep)) {
 		LOG_ERR("Invalid EP address 0x%02x for data out", ep);
 		return -EINVAL;
 	}
 
-	if (udc_ep_is_busy(dev, ep)) {
+	ep_cfg = udc_get_ep_cfg(dev, ep);
+	if (udc_ep_is_busy(ep_cfg)) {
 		if (strict) {
 			LOG_ERR("EP 0x%02x busy", ep);
 			return -EAGAIN;
@@ -777,7 +783,7 @@ static int numaker_usbd_xfer_out(const struct device *dev, uint8_t ep, bool stri
 		return 0;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		if (strict) {
 			LOG_ERR("No buffer queued for EP 0x%02x", ep);
@@ -803,6 +809,7 @@ static int numaker_usbd_xfer_in(const struct device *dev, uint8_t ep, bool stric
 {
 	struct net_buf *buf;
 	struct numaker_usbd_ep *ep_cur;
+	struct udc_ep_config *ep_cfg;
 	uint32_t data_len;
 
 	if (!USB_EP_DIR_IS_IN(ep)) {
@@ -810,7 +817,8 @@ static int numaker_usbd_xfer_in(const struct device *dev, uint8_t ep, bool stric
 		return -EINVAL;
 	}
 
-	if (udc_ep_is_busy(dev, ep)) {
+	ep_cfg = udc_get_ep_cfg(dev, ep);
+	if (udc_ep_is_busy(ep_cfg)) {
 		if (strict) {
 			LOG_ERR("EP 0x%02x busy", ep);
 			return -EAGAIN;
@@ -819,7 +827,7 @@ static int numaker_usbd_xfer_in(const struct device *dev, uint8_t ep, bool stric
 		return 0;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		if (strict) {
 			LOG_ERR("No buffer queued for EP 0x%02x", ep);
@@ -944,6 +952,7 @@ static int numaker_usbd_msg_handle_out(const struct device *dev, struct numaker_
 	int err;
 	uint8_t ep;
 	struct numaker_usbd_ep *ep_cur;
+	struct udc_ep_config *ep_cfg;
 	struct net_buf *buf;
 	uint8_t *data_ptr;
 	uint32_t data_len;
@@ -952,8 +961,9 @@ static int numaker_usbd_msg_handle_out(const struct device *dev, struct numaker_
 	__ASSERT_NO_MSG(msg->type == NUMAKER_USBD_MSG_TYPE_OUT);
 
 	ep = msg->out.ep;
+	ep_cfg = udc_get_ep_cfg(ep);
 
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(ep_cfg, false);
 
 	/* Bind EP H/W context to EP address */
 	ep_cur = numaker_usbd_ep_mgmt_bind_ep(dev, ep);
@@ -962,7 +972,7 @@ static int numaker_usbd_msg_handle_out(const struct device *dev, struct numaker_
 		return -ENODEV;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer queued for ep=0x%02x", ep);
 		return -ENODATA;
@@ -993,7 +1003,7 @@ static int numaker_usbd_msg_handle_out(const struct device *dev, struct numaker_
 	}
 
 	/* To submit the peeked buffer */
-	udc_buf_get(dev, ep);
+	udc_buf_get(ep_cfg);
 
 	if (ep == USB_CONTROL_EP_OUT) {
 		if (udc_ctrl_stage_is_status_out(dev)) {
@@ -1037,13 +1047,15 @@ static int numaker_usbd_msg_handle_in(const struct device *dev, struct numaker_u
 	int err;
 	uint8_t ep;
 	struct numaker_usbd_ep *ep_cur;
+	struct udc_ep_config *ep_cfg;
 	struct net_buf *buf;
 
 	__ASSERT_NO_MSG(msg->type == NUMAKER_USBD_MSG_TYPE_IN);
 
 	ep = msg->in.ep;
+	ep_cfg = udc_get_ep_cfg(dev, ep);
 
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(ep_cfg, false);
 
 	/* Bind EP H/W context to EP address */
 	ep_cur = numaker_usbd_ep_mgmt_bind_ep(dev, ep);
@@ -1052,7 +1064,7 @@ static int numaker_usbd_msg_handle_in(const struct device *dev, struct numaker_u
 		return -ENODEV;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		/* No DATA IN request */
 		return 0;
@@ -1063,7 +1075,7 @@ static int numaker_usbd_msg_handle_in(const struct device *dev, struct numaker_u
 	}
 
 	/* To submit the peeked buffer */
-	udc_buf_get(dev, ep);
+	udc_buf_get(ep_cfg);
 
 	if (ep == USB_CONTROL_EP_IN) {
 		if (udc_ctrl_stage_is_status_in(dev) || udc_ctrl_stage_is_no_data(dev)) {
@@ -1408,7 +1420,7 @@ static int udc_numaker_ep_dequeue(const struct device *dev, struct udc_ep_config
 
 	numaker_usbd_ep_abort(ep_cur);
 
-	buf = udc_buf_get_all(dev, ep_cfg->addr);
+	buf = udc_buf_get_all(ep_cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
diff --git a/drivers/usb/udc/udc_renesas_ra.c b/drivers/usb/udc/udc_renesas_ra.c
index 66f3ae30840..60f32d86b30 100644
--- a/drivers/usb/udc/udc_renesas_ra.c
+++ b/drivers/usb/udc/udc_renesas_ra.c
@@ -97,13 +97,14 @@ static void udc_renesas_ra_interrupt_handler(void *arg)
 static void udc_event_xfer_next(const struct device *dev, const uint8_t ep)
 {
 	struct udc_renesas_ra_data *data = udc_get_private(dev);
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep);
 	struct net_buf *buf;
 
-	if (udc_ep_is_busy(dev, ep)) {
+	if (udc_ep_is_busy(ep_cfg)) {
 		return;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf != NULL) {
 		int err;
 
@@ -117,7 +118,7 @@ static void udc_event_xfer_next(const struct device *dev, const uint8_t ep)
 			LOG_ERR("ep 0x%02x error", ep);
 			udc_submit_ep_event(dev, buf, -ECONNREFUSED);
 		} else {
-			udc_ep_set_busy(dev, ep, true);
+			udc_ep_set_busy(ep_cfg, true);
 		}
 	}
 }
@@ -200,7 +201,7 @@ static void udc_event_status_in(const struct device *dev)
 	struct udc_renesas_ra_data *data = udc_get_private(dev);
 	struct net_buf *buf;
 
-	buf = udc_buf_get(dev, USB_CONTROL_EP_IN);
+	buf = udc_buf_get(udc_get_ep_cfg(dev, USB_CONTROL_EP_IN));
 	if (unlikely(buf == NULL)) {
 		LOG_DBG("ep 0x%02x queue is empty", USB_CONTROL_EP_IN);
 		return;
@@ -234,14 +235,16 @@ static void udc_event_xfer_complete(const struct device *dev, struct udc_renesas
 {
 	struct net_buf *buf;
 	struct udc_renesas_ra_data *data = udc_get_private(dev);
+	struct udc_ep_config *ep_cfg;
 
 	uint8_t ep = evt->hal_evt.xfer_complete.ep_addr;
 	usbd_xfer_result_t result = evt->hal_evt.xfer_complete.result;
 	uint32_t len = evt->hal_evt.xfer_complete.len;
 
-	udc_ep_set_busy(dev, ep, false);
+	ep_cfg = udc_get_ep_cfg(dev, ep);
+	udc_ep_set_busy(ep_cfg, false);
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		return;
 	}
@@ -260,7 +263,7 @@ static void udc_event_xfer_complete(const struct device *dev, struct udc_renesas
 		return;
 	}
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(ep_cfg);
 
 	if (ep == USB_CONTROL_EP_IN) {
 		udc_event_xfer_ctrl_in(dev, buf);
@@ -351,7 +354,7 @@ static int udc_renesas_ra_ep_dequeue(const struct device *dev, struct udc_ep_con
 
 	lock_key = irq_lock();
 
-	buf = udc_buf_get_all(dev, cfg->addr);
+	buf = udc_buf_get_all(cfg);
 	if (buf != NULL) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
@@ -360,7 +363,7 @@ static int udc_renesas_ra_ep_dequeue(const struct device *dev, struct udc_ep_con
 		return -EIO;
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 
 	irq_unlock(lock_key);
 
diff --git a/drivers/usb/udc/udc_rpi_pico.c b/drivers/usb/udc/udc_rpi_pico.c
index 4065f4555b1..763e5a3d802 100644
--- a/drivers/usb/udc/udc_rpi_pico.c
+++ b/drivers/usb/udc/udc_rpi_pico.c
@@ -278,14 +278,16 @@ static int rpi_pico_ctrl_feed_dout(const struct device *dev, const size_t length
 
 static void drop_control_transfers(const struct device *dev)
 {
+	struct udc_ep_config *cfg_out = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
+	struct udc_ep_config *cfg_in = udc_get_ep_cfg(dev, USB_CONTROL_EP_IN);
 	struct net_buf *buf;
 
-	buf = udc_buf_get_all(dev, USB_CONTROL_EP_OUT);
+	buf = udc_buf_get_all(cfg_out);
 	if (buf != NULL) {
 		net_buf_unref(buf);
 	}
 
-	buf = udc_buf_get_all(dev, USB_CONTROL_EP_IN);
+	buf = udc_buf_get_all(cfg_in);
 	if (buf != NULL) {
 		net_buf_unref(buf);
 	}
@@ -337,14 +339,14 @@ static inline int rpi_pico_handle_evt_dout(const struct device *dev,
 	struct net_buf *buf;
 	int err = 0;
 
-	buf = udc_buf_get(dev, cfg->addr);
+	buf = udc_buf_get(cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer for OUT ep 0x%02x", cfg->addr);
 		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
 		return -ENODATA;
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 
 	if (cfg->addr == USB_CONTROL_EP_OUT) {
 		if (udc_ctrl_stage_is_status_out(dev)) {
@@ -373,15 +375,15 @@ static int rpi_pico_handle_evt_din(const struct device *dev,
 	struct net_buf *buf;
 	int err;
 
-	buf = udc_buf_peek(dev, cfg->addr);
+	buf = udc_buf_peek(cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer for ep 0x%02x", cfg->addr);
 		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
 		return -ENOBUFS;
 	}
 
-	buf = udc_buf_get(dev, cfg->addr);
-	udc_ep_set_busy(dev, cfg->addr, false);
+	buf = udc_buf_get(cfg);
+	udc_ep_set_busy(cfg, false);
 
 	if (cfg->addr == USB_CONTROL_EP_IN) {
 		if (udc_ctrl_stage_is_status_in(dev) ||
@@ -415,7 +417,7 @@ static void rpi_pico_handle_xfer_next(const struct device *dev,
 	struct net_buf *buf;
 	int err;
 
-	buf = udc_buf_peek(dev, cfg->addr);
+	buf = udc_buf_peek(cfg);
 	if (buf == NULL) {
 		return;
 	}
@@ -429,7 +431,7 @@ static void rpi_pico_handle_xfer_next(const struct device *dev,
 	if (err != 0) {
 		udc_submit_ep_event(dev, buf, -ECONNREFUSED);
 	} else {
-		udc_ep_set_busy(dev, cfg->addr, true);
+		udc_ep_set_busy(cfg, true);
 	}
 }
 
@@ -460,7 +462,7 @@ static ALWAYS_INLINE void rpi_pico_thread_handler(void *const arg)
 		break;
 	}
 
-	if (ep_cfg->addr != USB_CONTROL_EP_OUT && !udc_ep_is_busy(dev, ep_cfg->addr)) {
+	if (ep_cfg->addr != USB_CONTROL_EP_OUT && !udc_ep_is_busy(ep_cfg)) {
 		rpi_pico_handle_xfer_next(dev, ep_cfg);
 	}
 }
@@ -503,7 +505,7 @@ static void rpi_pico_handle_buff_status_in(const struct device *dev, const uint8
 	struct net_buf *buf;
 	size_t len;
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer for ep 0x%02x", ep);
 		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
@@ -538,7 +540,7 @@ static void rpi_pico_handle_buff_status_out(const struct device *dev, const uint
 	struct net_buf *buf;
 	size_t len;
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer for ep 0x%02x", ep);
 		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
@@ -739,7 +741,7 @@ static int udc_rpi_pico_ep_dequeue(const struct device *dev,
 	lock_key = irq_lock();
 
 	rpi_pico_ep_cancel(dev, cfg->addr);
-	buf = udc_buf_get_all(dev, cfg->addr);
+	buf = udc_buf_get_all(cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
@@ -856,7 +858,7 @@ static int udc_rpi_pico_ep_clear_halt(const struct device *dev,
 		arch_nop();
 		rpi_pico_bit_clr(buf_ctrl_reg, USB_BUF_CTRL_STALL);
 
-		if (udc_buf_peek(dev, cfg->addr)) {
+		if (udc_buf_peek(cfg)) {
 			k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
 		}
 	}
diff --git a/drivers/usb/udc/udc_skeleton.c b/drivers/usb/udc/udc_skeleton.c
index cba2016572c..86c7cdc75f7 100644
--- a/drivers/usb/udc/udc_skeleton.c
+++ b/drivers/usb/udc/udc_skeleton.c
@@ -119,7 +119,7 @@ static int udc_skeleton_ep_dequeue(const struct device *dev,
 
 	lock_key = irq_lock();
 
-	buf = udc_buf_get_all(dev, cfg->addr);
+	buf = udc_buf_get_all(cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
diff --git a/drivers/usb/udc/udc_smartbond.c b/drivers/usb/udc/udc_smartbond.c
index dd5a2aa782a..e413f518d68 100644
--- a/drivers/usb/udc/udc_smartbond.c
+++ b/drivers/usb/udc/udc_smartbond.c
@@ -555,14 +555,15 @@ static int udc_smartbond_ep_tx(const struct device *dev, uint8_t ep)
 {
 	struct usb_smartbond_data *data = dev->data;
 	struct smartbond_ep_state *ep_state = usb_dc_get_ep_in_state(data, USB_EP_GET_IDX(ep));
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep);
 	struct net_buf *buf;
 
-	if (udc_ep_is_busy(dev, ep) ||
+	if (udc_ep_is_busy(ep_cfg) ||
 	    (ep_state->regs->epc_in & USB_USB_EPC1_REG_USB_STALL_Msk) != 0) {
 		return 0;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	LOG_DBG("TX ep 0x%02x len %u", ep, buf ? buf->len : -1);
 
 	if (buf) {
@@ -571,7 +572,7 @@ static int udc_smartbond_ep_tx(const struct device *dev, uint8_t ep)
 
 		start_tx_packet(data, ep_state);
 
-		udc_ep_set_busy(dev, ep, true);
+		udc_ep_set_busy(ep_cfg, true);
 	}
 
 	return 0;
@@ -581,13 +582,14 @@ static int udc_smartbond_ep_rx(const struct device *dev, uint8_t ep)
 {
 	struct usb_smartbond_data *data = dev->data;
 	struct smartbond_ep_state *ep_state = usb_dc_get_ep_out_state(data, USB_EP_GET_IDX(ep));
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep);
 	struct net_buf *buf;
 
-	if (udc_ep_is_busy(dev, ep)) {
+	if (udc_ep_is_busy(ep_cfg)) {
 		return 0;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 
 	if (buf) {
 		LOG_DBG("RX ep 0x%02x len %u", ep, buf->size);
@@ -597,7 +599,7 @@ static int udc_smartbond_ep_rx(const struct device *dev, uint8_t ep)
 
 		start_rx_packet(data, ep_state);
 
-		udc_ep_set_busy(dev, ep, true);
+		udc_ep_set_busy(ep_cfg, true);
 	}
 
 	return 0;
@@ -648,12 +650,12 @@ static int udc_smartbond_ep_dequeue(const struct device *dev, struct udc_ep_conf
 
 	udc_smartbond_ep_abort(dev, ep_cfg);
 
-	buf = udc_buf_get_all(dev, ep);
+	buf = udc_buf_get_all(ep_cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
 
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(ep_cfg, false);
 
 	irq_unlock(lock_key);
 
@@ -729,7 +731,7 @@ static int udc_smartbond_ep_set_halt(const struct device *dev, struct udc_ep_con
 	if (ep_cfg->addr == USB_CONTROL_EP_IN) {
 		/* Stall in DATA IN phase, drop status OUT packet */
 		if (udc_ctrl_stage_is_data_in(dev)) {
-			buf = udc_buf_get(dev, USB_CONTROL_EP_OUT);
+			buf = udc_buf_get(udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT));
 			if (buf) {
 				net_buf_unref(buf);
 			}
@@ -992,7 +994,7 @@ static void handle_epx_rx_ev(struct usb_smartbond_data *data, uint8_t ep_idx)
 				if (net_buf_tailroom(buf) == 0 ||
 				    ep_state->last_packet_size < udc_mps_ep_size(ep_cfg) ||
 				    ep_state->iso) {
-					buf = udc_buf_get(data->dev, ep_cfg->addr);
+					buf = udc_buf_get(ep_cfg);
 					if (unlikely(buf == NULL)) {
 						LOG_ERR("ep 0x%02x queue is empty", ep_cfg->addr);
 						break;
@@ -1063,8 +1065,8 @@ static void handle_epx_tx_ev(struct usb_smartbond_data *data, struct smartbond_e
 					regs->txc |= USB_USB_TXC1_REG_USB_TX_EN_Msk |
 						     USB_USB_TXC1_REG_USB_LAST_Msk;
 				} else {
-					udc_ep_set_busy(data->dev, ep, false);
-					buf = udc_buf_get(data->dev, ep);
+					udc_ep_set_busy(ep_cfg, false);
+					buf = udc_buf_get(ep_cfg);
 
 					udc_submit_ep_event(data->dev, buf, 0);
 					udc_smartbond_ep_tx(data->dev, ep);
@@ -1164,13 +1166,15 @@ static void handle_ep0_nak(struct usb_smartbond_data *data)
 
 static void empty_ep0_queues(const struct device *dev)
 {
+	struct udc_ep_config *cfg_out = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
+	struct udc_ep_config *cfg_in = udc_get_ep_cfg(dev, USB_CONTROL_EP_IN);
 	struct net_buf *buf;
 
-	buf = udc_buf_get_all(dev, USB_CONTROL_EP_OUT);
+	buf = udc_buf_get_all(cfg_out);
 	if (buf) {
 		net_buf_unref(buf);
 	}
-	buf = udc_buf_get_all(dev, USB_CONTROL_EP_IN);
+	buf = udc_buf_get_all(cfg_in);
 	if (buf) {
 		net_buf_unref(buf);
 	}
@@ -1452,6 +1456,7 @@ static void handle_ep0_rx_work(struct k_work *item)
 	struct usb_smartbond_data *data =
 		CONTAINER_OF(item, struct usb_smartbond_data, ep0_rx_work);
 	const uint8_t ep = USB_CONTROL_EP_OUT;
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(ep);
 	struct net_buf *buf;
 	const struct device *dev = data->dev;
 	unsigned int lock_key;
@@ -1462,8 +1467,8 @@ static void handle_ep0_rx_work(struct k_work *item)
 	 */
 	lock_key = irq_lock();
 
-	udc_ep_set_busy(dev, ep, false);
-	buf = udc_buf_get(dev, ep);
+	udc_ep_set_busy(ep_cfg, false);
+	buf = udc_buf_get(ep_cfg);
 
 	irq_unlock(lock_key);
 	if (unlikely(buf == NULL)) {
@@ -1490,9 +1495,10 @@ static void handle_ep0_tx_work(struct k_work *item)
 	struct net_buf *buf;
 	const struct device *dev = data->dev;
 	const uint8_t ep = USB_CONTROL_EP_IN;
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(ep);
 	unsigned int lock_key;
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	__ASSERT(buf == EP0_IN_STATE(data)->buf, "TX work without buffer %p %p", buf,
 		 EP0_IN_STATE(data)->buf);
 
@@ -1502,10 +1508,10 @@ static void handle_ep0_tx_work(struct k_work *item)
 	 */
 	lock_key = irq_lock();
 
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(ep_cfg, false);
 
 	/* Remove buffer from queue */
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(ep_cfg);
 
 	irq_unlock(lock_key);
 
diff --git a/drivers/usb/udc/udc_stm32.c b/drivers/usb/udc/udc_stm32.c
index d95c6fb0afd..99136d1ba44 100644
--- a/drivers/usb/udc/udc_stm32.c
+++ b/drivers/usb/udc/udc_stm32.c
@@ -194,7 +194,7 @@ void HAL_PCD_SOFCallback(PCD_HandleTypeDef *hpcd)
 	udc_submit_event(priv->dev, UDC_EVT_SOF, 0);
 }
 
-static int udc_stm32_tx(const struct device *dev, uint8_t ep,
+static int udc_stm32_tx(const struct device *dev, struct udc_ep_config *epcfg,
 			struct net_buf *buf)
 {
 	struct udc_stm32_data *priv = udc_get_private(dev);
@@ -202,31 +202,31 @@ static int udc_stm32_tx(const struct device *dev, uint8_t ep,
 	uint8_t *data; uint32_t len;
 	HAL_StatusTypeDef status;
 
-	LOG_DBG("TX ep 0x%02x len %u", ep, buf->len);
+	LOG_DBG("TX ep 0x%02x len %u", epcfg->addr, buf->len);
 
-	if (udc_ep_is_busy(dev, ep)) {
+	if (udc_ep_is_busy(epcfg)) {
 		return 0;
 	}
 
 	data = buf->data;
 	len = buf->len;
 
-	if (ep == USB_CONTROL_EP_IN) {
+	if (epcfg->addr == USB_CONTROL_EP_IN) {
 		len = MIN(cfg->ep0_mps, buf->len);
 	}
 
 	buf->data += len;
 	buf->len -= len;
 
-	status = HAL_PCD_EP_Transmit(&priv->pcd, ep, data, len);
+	status = HAL_PCD_EP_Transmit(&priv->pcd, epcfg->addr, data, len);
 	if (status != HAL_OK) {
-		LOG_ERR("HAL_PCD_EP_Transmit failed(0x%02x), %d", ep, (int)status);
+		LOG_ERR("HAL_PCD_EP_Transmit failed(0x%02x), %d", epcfg->addr, (int)status);
 		return -EIO;
 	}
 
-	udc_ep_set_busy(dev, ep, true);
+	udc_ep_set_busy(epcfg, true);
 
-	if (ep == USB_CONTROL_EP_IN && len > 0) {
+	if (epcfg->addr == USB_CONTROL_EP_IN && len > 0) {
 		/* Wait for an empty package from the host.
 		 * This also flushes the TX FIFO to the host.
 		 */
@@ -236,25 +236,25 @@ static int udc_stm32_tx(const struct device *dev, uint8_t ep,
 	return 0;
 }
 
-static int udc_stm32_rx(const struct device *dev, uint8_t ep,
+static int udc_stm32_rx(const struct device *dev, struct udc_ep_config *epcfg,
 			struct net_buf *buf)
 {
 	struct udc_stm32_data *priv = udc_get_private(dev);
 	HAL_StatusTypeDef status;
 
-	LOG_DBG("RX ep 0x%02x len %u", ep, buf->size);
+	LOG_DBG("RX ep 0x%02x len %u", epcfg->addr, buf->size);
 
-	if (udc_ep_is_busy(dev, ep)) {
+	if (udc_ep_is_busy(epcfg)) {
 		return 0;
 	}
 
-	status = HAL_PCD_EP_Receive(&priv->pcd, ep, buf->data, buf->size);
+	status = HAL_PCD_EP_Receive(&priv->pcd, epcfg->addr, buf->data, buf->size);
 	if (status != HAL_OK) {
-		LOG_ERR("HAL_PCD_EP_Receive failed(0x%02x), %d", ep, (int)status);
+		LOG_ERR("HAL_PCD_EP_Receive failed(0x%02x), %d", epcfg->addr, (int)status);
 		return -EIO;
 	}
 
-	udc_ep_set_busy(dev, ep, true);
+	udc_ep_set_busy(epcfg, true);
 
 	return 0;
 }
@@ -264,14 +264,16 @@ void HAL_PCD_DataOutStageCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum)
 	uint32_t rx_count = HAL_PCD_EP_GetRxCount(hpcd, epnum);
 	struct udc_stm32_data *priv = hpcd2data(hpcd);
 	const struct device *dev = priv->dev;
+	struct udc_ep_config *epcfg;
 	uint8_t ep = epnum | USB_EP_DIR_OUT;
 	struct net_buf *buf;
 
 	LOG_DBG("DataOut ep 0x%02x",  ep);
 
-	udc_ep_set_busy(dev, ep, false);
+	epcfg = udc_get_ep_cfg(dev, ep);
+	udc_ep_set_busy(epcfg, false);
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(epcfg);
 	if (unlikely(buf == NULL)) {
 		LOG_ERR("ep 0x%02x queue is empty", ep);
 		return;
@@ -294,9 +296,9 @@ void HAL_PCD_DataOutStageCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum)
 		udc_submit_ep_event(dev, buf, 0);
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(epcfg);
 	if (buf) {
-		udc_stm32_rx(dev, ep, buf);
+		udc_stm32_rx(dev, epcfg, buf);
 	}
 }
 
@@ -304,14 +306,16 @@ void HAL_PCD_DataInStageCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum)
 {
 	struct udc_stm32_data *priv = hpcd2data(hpcd);
 	const struct device *dev = priv->dev;
+	struct udc_ep_config *epcfg;
 	uint8_t ep = epnum | USB_EP_DIR_IN;
 	struct net_buf *buf;
 
 	LOG_DBG("DataIn ep 0x%02x",  ep);
 
-	udc_ep_set_busy(dev, ep, false);
+	epcfg = udc_get_ep_cfg(dev, ep);
+	udc_ep_set_busy(epcfg, false);
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(epcfg);
 	if (unlikely(buf == NULL)) {
 		return;
 	}
@@ -335,7 +339,7 @@ void HAL_PCD_DataInStageCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum)
 		return;
 	}
 
-	udc_buf_get(dev, ep);
+	udc_buf_get(epcfg);
 
 	if (ep == USB_CONTROL_EP_IN) {
 		if (udc_ctrl_stage_is_status_in(dev) ||
@@ -360,9 +364,9 @@ void HAL_PCD_DataInStageCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum)
 
 	udc_submit_ep_event(dev, buf, 0);
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(epcfg);
 	if (buf) {
-		udc_stm32_tx(dev, ep, buf);
+		udc_stm32_tx(dev, epcfg, buf);
 	}
 }
 
@@ -763,9 +767,9 @@ static int udc_stm32_ep_enqueue(const struct device *dev,
 	lock_key = irq_lock();
 
 	if (USB_EP_DIR_IS_IN(epcfg->addr)) {
-		ret = udc_stm32_tx(dev, epcfg->addr, buf);
+		ret = udc_stm32_tx(dev, epcfg, buf);
 	} else {
-		ret = udc_stm32_rx(dev, epcfg->addr, buf);
+		ret = udc_stm32_rx(dev, epcfg, buf);
 	}
 
 	irq_unlock(lock_key);
@@ -780,12 +784,12 @@ static int udc_stm32_ep_dequeue(const struct device *dev,
 
 	udc_stm32_ep_flush(dev, epcfg);
 
-	buf = udc_buf_get_all(dev, epcfg->addr);
+	buf = udc_buf_get_all(epcfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
 
-	udc_ep_set_busy(dev, epcfg->addr, false);
+	udc_ep_set_busy(epcfg, false);
 
 	return 0;
 }
diff --git a/drivers/usb/udc/udc_virtual.c b/drivers/usb/udc/udc_virtual.c
index c729aa08cd7..ae32c9ae2c6 100644
--- a/drivers/usb/udc/udc_virtual.c
+++ b/drivers/usb/udc/udc_virtual.c
@@ -172,7 +172,7 @@ static int vrt_handle_out(const struct device *dev,
 		return vrt_request_reply(dev, pkt, UVB_REPLY_STALL);
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		LOG_DBG("reply NACK ep 0x%02x", ep);
 		return vrt_request_reply(dev, pkt, UVB_REPLY_NACK);
@@ -184,7 +184,7 @@ static int vrt_handle_out(const struct device *dev,
 	LOG_DBG("Handle data OUT, %zu | %zu", pkt->length, net_buf_tailroom(buf));
 
 	if (net_buf_tailroom(buf) == 0 || pkt->length < udc_mps_ep_size(ep_cfg)) {
-		buf = udc_buf_get(dev, ep);
+		buf = udc_buf_get(ep_cfg);
 
 		if (ep == USB_CONTROL_EP_OUT) {
 			err = vrt_handle_ctrl_out(dev, buf);
@@ -239,7 +239,7 @@ static int vrt_handle_in(const struct device *dev,
 		return vrt_request_reply(dev, pkt, UVB_REPLY_STALL);
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		LOG_DBG("reply NACK ep 0x%02x", ep);
 		return vrt_request_reply(dev, pkt, UVB_REPLY_NACK);
@@ -259,7 +259,7 @@ static int vrt_handle_in(const struct device *dev,
 		}
 
 		LOG_DBG("Finish data IN %zu | %u", pkt->length, buf->len);
-		buf = udc_buf_get(dev, ep);
+		buf = udc_buf_get(ep_cfg);
 
 		if (ep == USB_CONTROL_EP_IN) {
 			err = isr_handle_ctrl_in(dev, buf);
@@ -411,7 +411,7 @@ static int udc_vrt_ep_dequeue(const struct device *dev,
 
 	lock_key = irq_lock();
 	/* Draft dequeue implementation */
-	buf = udc_buf_get_all(dev, cfg->addr);
+	buf = udc_buf_get_all(cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}

From cd267a7cf509e0785e3c7ab12d6c79646ef30e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
Date: Mon, 7 Apr 2025 10:27:23 +0200
Subject: [PATCH 2890/2913] [nrf fromlist] drivers: udc_dwc2: Mark endpoint
 idle on disable while hibernated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When endpoint is disabled while hibernated, the UDC endpoint state has
to be reset. Set the busy to false to keep UDC endpoint state in sync
with peripheral register state.

Upstream PR #: 88236

Fixes: 2be960ad2b33 ("drivers: udc_dwc2: Disable endpoint while
hibernated")

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 7a28ef1dc00aeeae17034631b79cdc0d52a13c6b)
---
 drivers/usb/udc/udc_dwc2.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 2339356d882..5920ae10b78 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -1553,6 +1553,7 @@ static void udc_dwc2_ep_disable(const struct device *dev,
 			priv->pending_tx_flush |= BIT(usb_dwc2_get_depctl_txfnum(dxepctl));
 		}
 
+		udc_ep_set_busy(cfg, false);
 		return;
 	}
 

From 98e222f73785d849cca726256f633fa833097dde Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Fri, 4 Apr 2025 15:34:39 +0200
Subject: [PATCH 2891/2913] [nrf fromlist] net: openthread: Add missing error
 checks

Upstream PR #: 88166

Some OpenThread functions were called without verifying the return
value, which not only is not the best practice, but also could lead to
build warnings with llvm. This commit fixes it.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 06c6605ca152de466718b0cb3f73ae7bba17e6ff)
---
 subsys/net/l2/openthread/openthread.c | 68 ++++++++++++++++++++++-----
 1 file changed, 56 insertions(+), 12 deletions(-)

diff --git a/subsys/net/l2/openthread/openthread.c b/subsys/net/l2/openthread/openthread.c
index 61fe1d5c3bc..f3553e13874 100644
--- a/subsys/net/l2/openthread/openthread.c
+++ b/subsys/net/l2/openthread/openthread.c
@@ -329,7 +329,11 @@ static void ot_joiner_start_handler(otError error, void *context)
 	switch (error) {
 	case OT_ERROR_NONE:
 		NET_INFO("Join success");
-		otThreadSetEnabled(ot_context->instance, true);
+		error = otThreadSetEnabled(ot_context->instance, true);
+		if (error != OT_ERROR_NONE) {
+			NET_ERR("Failed to start the OpenThread network [%d]", error);
+		}
+
 		break;
 	default:
 		NET_ERR("Join failed [%d]", error);
@@ -430,7 +434,11 @@ int openthread_start(struct openthread_context *ot_context)
 		goto exit;
 	}
 
-	otIp6SetEnabled(ot_context->instance, true);
+	error = otIp6SetEnabled(ot_context->instance, true);
+	if (error != OT_ERROR_NONE) {
+		NET_ERR("Failed to set %s [%d]", "IPv6 support", error);
+		goto exit;
+	}
 
 	/* Sleepy End Device specific configuration. */
 	if (IS_ENABLED(CONFIG_OPENTHREAD_MTD_SED)) {
@@ -441,8 +449,17 @@ int openthread_start(struct openthread_context *ot_context)
 		 */
 		ot_mode.mRxOnWhenIdle = false;
 
-		otThreadSetLinkMode(ot_context->instance, ot_mode);
-		otLinkSetPollPeriod(ot_context->instance, OT_POLL_PERIOD);
+		error = otThreadSetLinkMode(ot_context->instance, ot_mode);
+		if (error != OT_ERROR_NONE) {
+			NET_ERR("Failed to set %s [%d]", "link mode", error);
+			goto exit;
+		}
+
+		error = otLinkSetPollPeriod(ot_context->instance, OT_POLL_PERIOD);
+		if (error != OT_ERROR_NONE) {
+			NET_ERR("Failed to set %s [%d]", "poll period", error);
+			goto exit;
+		}
 	}
 
 	/* Configure Child Supervision and MLE Child timeouts. */
@@ -477,16 +494,39 @@ int openthread_start(struct openthread_context *ot_context)
 		otExtendedPanId xpanid;
 		otNetworkKey    networkKey;
 
-		otThreadSetNetworkName(ot_instance, OT_NETWORK_NAME);
-		otLinkSetChannel(ot_instance, OT_CHANNEL);
-		otLinkSetPanId(ot_instance, OT_PANID);
+		error = otThreadSetNetworkName(ot_instance, OT_NETWORK_NAME);
+		if (error != OT_ERROR_NONE) {
+			NET_ERR("Failed to set %s [%d]", "network name", error);
+			goto exit;
+		}
+
+		error = otLinkSetChannel(ot_instance, OT_CHANNEL);
+		if (error != OT_ERROR_NONE) {
+			NET_ERR("Failed to set %s [%d]", "channel", error);
+			goto exit;
+		}
+
+		error = otLinkSetPanId(ot_instance, OT_PANID);
+		if (error != OT_ERROR_NONE) {
+			NET_ERR("Failed to set %s [%d]", "PAN ID", error);
+			goto exit;
+		}
+
 		net_bytes_from_str(xpanid.m8, 8, (char *)OT_XPANID);
-		otThreadSetExtendedPanId(ot_instance, &xpanid);
+		error = otThreadSetExtendedPanId(ot_instance, &xpanid);
+		if (error != OT_ERROR_NONE) {
+			NET_ERR("Failed to set %s [%d]", "ext PAN ID", error);
+			goto exit;
+		}
 
 		if (strlen(OT_NETWORKKEY)) {
 			net_bytes_from_str(networkKey.m8, OT_NETWORK_KEY_SIZE,
 					   (char *)OT_NETWORKKEY);
-			otThreadSetNetworkKey(ot_instance, &networkKey);
+			error = otThreadSetNetworkKey(ot_instance, &networkKey);
+			if (error != OT_ERROR_NONE) {
+				NET_ERR("Failed to set %s [%d]", "network key", error);
+				goto exit;
+			}
 		}
 	}
 
@@ -533,7 +573,7 @@ static int openthread_init(struct net_if *iface)
 		.name = "openthread",
 		.no_yield = true,
 	};
-	otError err;
+	otError err = OT_ERROR_NONE;
 
 	NET_DBG("openthread_init");
 
@@ -556,7 +596,11 @@ static int openthread_init(struct net_if *iface)
 	}
 
 	if (IS_ENABLED(CONFIG_OPENTHREAD_COPROCESSOR)) {
-		otPlatUartEnable();
+		err = otPlatUartEnable();
+		if (err != OT_ERROR_NONE) {
+			NET_ERR("Failed to enable UART: [%d]", err);
+		}
+
 		otNcpHdlcInit(ot_context->instance, ncp_hdlc_send);
 	} else {
 		otIp6SetReceiveFilterEnabled(ot_context->instance, true);
@@ -604,7 +648,7 @@ static int openthread_init(struct net_if *iface)
 
 	(void)k_work_submit_to_queue(&ot_context->work_q, &ot_context->api_work);
 
-	return 0;
+	return (err == OT_ERROR_NONE) ? 0 : -EIO;
 }
 
 void ieee802154_init(struct net_if *iface)

From bfd59731dac5c874355c144195e3bfaca6c38222 Mon Sep 17 00:00:00 2001
From: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
Date: Thu, 27 Mar 2025 15:23:40 +0100
Subject: [PATCH 2892/2913] [nrf fromtree] Bluetooth: Mesh: make corresponding
 group ID unique

Commit fixes bug when corresponding group ID was never
incremented for independent corresponding relationships.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
(cherry picked from commit 69c5c6f40ea01946bc419067fc1577d74ae3e5f4)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
(cherry picked from commit eacfed3332af6f473c97b6888594ea9d74e0149f)
---
 subsys/bluetooth/mesh/access.c            | 4 ++--
 tests/bsim/bluetooth/mesh/src/test_cdp1.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/subsys/bluetooth/mesh/access.c b/subsys/bluetooth/mesh/access.c
index 2f3b93ef441..1dfbf924316 100644
--- a/subsys/bluetooth/mesh/access.c
+++ b/subsys/bluetooth/mesh/access.c
@@ -1830,8 +1830,8 @@ int bt_mesh_model_correspond(const struct bt_mesh_model *corresponding_mod,
 
 	MOD_REL_LIST_FOR_EACH(i) {
 		if (mod_rel_list[i].type < RELATION_TYPE_EXT &&
-		    mod_rel_list[i].type > cor_id) {
-			cor_id = mod_rel_list[i].type;
+		    mod_rel_list[i].type >= cor_id) {
+			cor_id = mod_rel_list[i].type + 1;
 		}
 
 		if ((IS_MOD_BASE(base_mod, i, base_offset) ||
diff --git a/tests/bsim/bluetooth/mesh/src/test_cdp1.c b/tests/bsim/bluetooth/mesh/src/test_cdp1.c
index 35befdea95b..fd9e9c9f35e 100644
--- a/tests/bsim/bluetooth/mesh/src/test_cdp1.c
+++ b/tests/bsim/bluetooth/mesh/src/test_cdp1.c
@@ -197,7 +197,7 @@ static const struct bt_mesh_comp_p1_model_item test_p1_mod2 = {
 	.cor_present = 1,
 	.format = 0,
 	.ext_item_cnt = 1,
-	.cor_id = 0,
+	.cor_id = 1,
 };
 
 static const struct bt_mesh_comp_p1_model_item test_p1_mod3 = {
@@ -211,7 +211,7 @@ static const struct bt_mesh_comp_p1_model_item test_p1_mod4 = {
 	.cor_present = 1,
 	.format = 0,
 	.ext_item_cnt = 0,
-	.cor_id = 0,
+	.cor_id = 1,
 };
 
 static const struct bt_mesh_comp_p1_model_item test_p1_mod5 = {

From 0020c98d990f37f126ebf56facef720918375327 Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Wed, 9 Apr 2025 13:50:57 +0200
Subject: [PATCH 2893/2913] [nrf fromlist] net: openthread: Fix ignored return
 values in OT utils

Upstream PR #: 88359

Do not ignore return values of OT functions registering IPv6 addresses.
As this is called from the net_mgmt callback context, which returns
void, there's not much that can be done, other than logging the error.

To simplify the logging code and avoid the need to use extra buffer,
use net_sprint_ipv6_addr() networking utility function within the log
message to convert binary address to string.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 6150da7a86bf140f2b836b64dba9c0da80383a76)
---
 subsys/net/l2/openthread/openthread_utils.c | 27 ++++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/subsys/net/l2/openthread/openthread_utils.c b/subsys/net/l2/openthread/openthread_utils.c
index 2e78da6b7aa..f9b518725b7 100644
--- a/subsys/net/l2/openthread/openthread_utils.c
+++ b/subsys/net/l2/openthread/openthread_utils.c
@@ -14,6 +14,7 @@ LOG_MODULE_DECLARE(net_l2_openthread, CONFIG_OPENTHREAD_L2_LOG_LEVEL);
 #include <openthread/ip6.h>
 #include <openthread/thread.h>
 
+#include "net_private.h"
 #include "openthread_utils.h"
 
 #define ALOC16_MASK 0xfc
@@ -167,6 +168,7 @@ void add_ipv6_addr_to_ot(struct openthread_context *context,
 	struct otNetifAddress addr = { 0 };
 	struct net_if_ipv6 *ipv6;
 	struct net_if_addr *if_addr = NULL;
+	otError error;
 	int i;
 
 	/* IPv6 struct should've already been allocated when we get an
@@ -214,14 +216,14 @@ void add_ipv6_addr_to_ot(struct openthread_context *context,
 	}
 
 	openthread_api_mutex_lock(context);
-	otIp6AddUnicastAddress(context->instance, &addr);
+	error = otIp6AddUnicastAddress(context->instance, &addr);
 	openthread_api_mutex_unlock(context);
 
-	if (CONFIG_OPENTHREAD_L2_LOG_LEVEL == LOG_LEVEL_DBG) {
-		char buf[NET_IPV6_ADDR_LEN];
-
-		NET_DBG("Added %s",
-			net_addr_ntop(AF_INET6, &addr.mAddress, buf, sizeof(buf)));
+	if (error != OT_ERROR_NONE) {
+		NET_ERR("Failed to add IPv6 unicast address %s [%d]",
+			net_sprint_ipv6_addr(addr6), error);
+	} else {
+		NET_DBG("Added %s", net_sprint_ipv6_addr(addr6));
 	}
 }
 
@@ -229,18 +231,19 @@ void add_ipv6_maddr_to_ot(struct openthread_context *context,
 			  const struct in6_addr *addr6)
 {
 	struct otIp6Address addr;
+	otError error;
 
 	memcpy(&addr, addr6, sizeof(addr));
 
 	openthread_api_mutex_lock(context);
-	otIp6SubscribeMulticastAddress(context->instance, &addr);
+	error = otIp6SubscribeMulticastAddress(context->instance, &addr);
 	openthread_api_mutex_unlock(context);
 
-	if (CONFIG_OPENTHREAD_L2_LOG_LEVEL == LOG_LEVEL_DBG) {
-		char buf[NET_IPV6_ADDR_LEN];
-
-		NET_DBG("Added multicast %s",
-			net_addr_ntop(AF_INET6, &addr, buf, sizeof(buf)));
+	if (error != OT_ERROR_NONE) {
+		NET_ERR("Failed to add IPv6 multicast address %s [%d]",
+			net_sprint_ipv6_addr(addr6), error);
+	} else {
+		NET_DBG("Added %s", net_sprint_ipv6_addr(addr6));
 	}
 }
 

From 3bb2db9bbed0f42c969197524a2e266d883177ca Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Wed, 9 Apr 2025 14:07:12 +0200
Subject: [PATCH 2894/2913] [nrf fromlist] net: openthread: Remove unused
 function from radio.c

Upstream PR #: 88359

clear_pending_events() was not used anywhere.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 8e6457ef04460a53081477ff1094176e518eba09)
---
 modules/openthread/platform/radio.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/openthread/platform/radio.c b/modules/openthread/platform/radio.c
index 82b54a34763..4a9fc1279cf 100644
--- a/modules/openthread/platform/radio.c
+++ b/modules/openthread/platform/radio.c
@@ -158,11 +158,6 @@ static void reset_pending_event(enum pending_events event)
 	atomic_clear_bit(pending_events, event);
 }
 
-static inline void clear_pending_events(void)
-{
-	atomic_clear(pending_events);
-}
-
 void energy_detected(const struct device *dev, int16_t max_ed)
 {
 	if (dev == radio_dev) {

From 2ae6b8cf2901cb3a260f1a81dd9bdbb6b93f0131 Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Wed, 2 Apr 2025 15:26:30 +0200
Subject: [PATCH 2895/2913] Revert "[nrf fromlist] drivers: flash: mspi_nor:
 support MODE_SINGLE and MODE_QUAD_1_4_4"

This reverts commit 999e700d8c226f6ea05f8b685516d7df7c608dc5.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
(cherry picked from commit 599c345b6cebaa5d31f12e8a4cb9d59b5936c02f)
---
 drivers/flash/flash_mspi_nor.c | 525 ++++++++-------------------------
 1 file changed, 131 insertions(+), 394 deletions(-)

diff --git a/drivers/flash/flash_mspi_nor.c b/drivers/flash/flash_mspi_nor.c
index 455076a7a9b..a5ced1e0070 100644
--- a/drivers/flash/flash_mspi_nor.c
+++ b/drivers/flash/flash_mspi_nor.c
@@ -22,206 +22,18 @@ LOG_MODULE_REGISTER(flash_mspi_nor, CONFIG_FLASH_LOG_LEVEL);
 #define WITH_RESET_GPIO 1
 #endif
 
-#define FLASH_MX25R_LH_MASK BIT(1)
-
-static uint8_t hp_payload[3] = {SPI_NOR_QE_BIT, 0x0, FLASH_MX25R_LH_MASK};
-
 struct flash_mspi_nor_data {
 	struct k_sem acquired;
 	struct mspi_xfer_packet packet;
 	struct mspi_xfer xfer;
 };
 
-struct flash_mspi_nor_cmd {
-	enum mspi_xfer_direction dir;
-	uint32_t cmd;
-	uint16_t tx_dummy;
-	uint16_t rx_dummy;
-	uint8_t cmd_length;
-	uint8_t addr_length;
-	bool force_single;
-};
-
-struct flash_mspi_nor_cmds {
-	struct flash_mspi_nor_cmd id;
-	struct flash_mspi_nor_cmd write_en;
-	struct flash_mspi_nor_cmd read;
-	struct flash_mspi_nor_cmd status;
-	struct flash_mspi_nor_cmd page_program;
-	struct flash_mspi_nor_cmd sector_erase;
-	struct flash_mspi_nor_cmd chip_erase;
-	struct flash_mspi_nor_cmd mode_change;
-	struct flash_mspi_nor_cmd sfdp;
-	uint8_t mode_payload;
-};
-
-static const struct flash_mspi_nor_cmds commands[] = {
-	[MSPI_IO_MODE_SINGLE] = {
-		.id = {
-			.dir = MSPI_RX,
-			.cmd = JESD216_CMD_READ_ID,
-			.cmd_length = 1,
-		},
-		.write_en = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WREN,
-			.cmd_length = 1,
-		},
-		.read = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_CMD_READ_FAST,
-			.cmd_length = 1,
-			.addr_length = 3,
-			.rx_dummy = 8,
-		},
-		.status = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_CMD_RDSR,
-			.cmd_length = 1,
-		},
-		.page_program = {
-			.dir  = MSPI_TX,
-			.cmd = SPI_NOR_CMD_PP,
-			.cmd_length = 1,
-			.addr_length = 3,
-		},
-		.sector_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_SE,
-			.cmd_length = 1,
-			.addr_length = 3,
-		},
-		.chip_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_CE,
-			.cmd_length = 1,
-		},
-		.mode_change = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WRSR,
-			.cmd_length = 1,
-		},
-		.mode_payload = 0,
-	},
-	[MSPI_IO_MODE_QUAD_1_4_4] = {
-		.id = {
-			.dir = MSPI_RX,
-			.cmd = JESD216_CMD_READ_ID,
-			.cmd_length = 1,
-			.force_single = true,
-		},
-		.write_en = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WREN,
-			.cmd_length = 1,
-		},
-		.read = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_CMD_4READ,
-			.cmd_length = 1,
-			.addr_length = 3,
-			.rx_dummy = 6,
-		},
-		.status = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_CMD_RDSR,
-			.cmd_length = 1,
-			.force_single = true,
-		},
-		.page_program = {
-			.dir  = MSPI_TX,
-			.cmd = SPI_NOR_CMD_PP_1_4_4,
-			.cmd_length = 1,
-			.addr_length = 3,
-		},
-		.sector_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_SE,
-			.cmd_length = 1,
-			.addr_length = 3,
-			.force_single = true,
-		},
-		.chip_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_CE,
-			.cmd_length = 1,
-		},
-		.mode_change = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WRSR,
-			.cmd_length = 1,
-			.force_single = true,
-		},
-		.mode_payload = SPI_NOR_QE_BIT,
-	},
-	[MSPI_IO_MODE_OCTAL] = {
-		.id = {
-			.dir = MSPI_RX,
-			.cmd = JESD216_OCMD_READ_ID,
-			.cmd_length = 2,
-			.addr_length = 4,
-			.rx_dummy = 4
-		},
-		.write_en = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_OCMD_WREN,
-			.cmd_length = 2,
-		},
-		.read = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_OCMD_RD,
-			.cmd_length = 2,
-			.addr_length = 4,
-			.rx_dummy = 20,
-		},
-		.status = {
-			.dir = MSPI_RX,
-			.cmd = SPI_NOR_OCMD_RDSR,
-			.cmd_length = 2,
-			.addr_length = 4,
-			.rx_dummy = 4,
-		},
-		.page_program = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_OCMD_PAGE_PRG,
-			.cmd_length = 2,
-			.addr_length = 4,
-		},
-		.sector_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_OCMD_SE,
-			.cmd_length = 2,
-			.addr_length = 4,
-		},
-		.chip_erase = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_OCMD_CE,
-			.cmd_length = 2,
-		},
-		.sfdp = {
-			.dir = MSPI_RX,
-			.cmd = JESD216_OCMD_READ_SFDP,
-			.cmd_length = 2,
-			.addr_length = 4,
-			.rx_dummy = 20,
-		},
-		.mode_change = {
-			.dir = MSPI_TX,
-			.cmd = SPI_NOR_CMD_WR_CFGREG2,
-			.cmd_length = 1,
-			.addr_length = 4,
-		},
-		.mode_payload = 0x01,
-	},
-};
-
 struct flash_mspi_nor_config {
 	const struct device *bus;
 	uint32_t flash_size;
 	struct mspi_dev_id mspi_id;
-	struct mspi_dev_cfg mspi_nor_cfg;
-	struct mspi_dev_cfg mspi_nor_init_cfg;
-	enum mspi_dev_cfg_mask mspi_nor_cfg_mask;
+	struct mspi_dev_cfg mspi_cfg;
+	enum mspi_dev_cfg_mask mspi_cfg_mask;
 #if defined(CONFIG_MSPI_XIP)
 	struct mspi_xip_cfg xip_cfg;
 #endif
@@ -234,22 +46,9 @@ struct flash_mspi_nor_config {
 	struct flash_pages_layout layout;
 #endif
 	uint8_t jedec_id[SPI_NOR_MAX_ID_LEN];
-	const struct flash_mspi_nor_cmds *jedec_cmds;
 };
 
-static int dev_cfg_apply(const struct device *dev, const struct mspi_dev_cfg *cfg)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-
-	int rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
-				 dev_config->mspi_nor_cfg_mask, cfg);
-	if (rc < 0) {
-		LOG_ERR("Failed to set device config: %p error: %d", cfg, rc);
-	}
-	return rc;
-}
-
-static int acquire(const struct device *dev, const struct mspi_dev_cfg *cfg)
+static int acquire(const struct device *dev)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
 	struct flash_mspi_nor_data *dev_data = dev->data;
@@ -264,8 +63,12 @@ static int acquire(const struct device *dev, const struct mspi_dev_cfg *cfg)
 		/* This acquires the MSPI controller and reconfigures it
 		 * if needed for the flash device.
 		 */
-		rc = dev_cfg_apply(dev, cfg);
-		if (rc == 0) {
+		rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
+				     dev_config->mspi_cfg_mask,
+				     &dev_config->mspi_cfg);
+		if (rc < 0) {
+			LOG_ERR("mspi_dev_config() failed: %d", rc);
+		} else {
 			return 0;
 		}
 
@@ -301,30 +104,6 @@ static inline uint16_t dev_page_size(const struct device *dev)
 	return SPI_NOR_PAGE_SIZE;
 }
 
-static void command_set(const struct device *dev, const struct flash_mspi_nor_cmd *cmd)
-{
-	struct flash_mspi_nor_data *dev_data = dev->data;
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-
-	memset(&dev_data->xfer, 0, sizeof(dev_data->xfer));
-	memset(&dev_data->packet, 0, sizeof(dev_data->packet));
-
-	dev_data->xfer.xfer_mode  = MSPI_PIO;
-	dev_data->xfer.packets    = &dev_data->packet;
-	dev_data->xfer.num_packet = 1;
-	dev_data->xfer.timeout    = 10;
-
-	dev_data->xfer.cmd_length = cmd->cmd_length;
-	dev_data->xfer.addr_length = cmd->addr_length;
-	dev_data->xfer.tx_dummy = (cmd->dir == MSPI_TX) ?
-				  cmd->tx_dummy : dev_config->mspi_nor_cfg.tx_dummy;
-	dev_data->xfer.rx_dummy = (cmd->dir == MSPI_RX) ?
-				  cmd->rx_dummy : dev_config->mspi_nor_cfg.rx_dummy;
-
-	dev_data->packet.dir = cmd->dir;
-	dev_data->packet.cmd = cmd->cmd;
-}
-
 static int api_read(const struct device *dev, off_t addr, void *dest,
 		    size_t size)
 {
@@ -341,13 +120,17 @@ static int api_read(const struct device *dev, off_t addr, void *dest,
 		return -EINVAL;
 	}
 
-	rc = acquire(dev, &dev_config->mspi_nor_cfg);
+	rc = acquire(dev);
 	if (rc < 0) {
 		return rc;
 	}
 
 	/* TODO: get rid of all these hard-coded values for MX25Ux chips */
-	command_set(dev, &dev_config->jedec_cmds->read);
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 20;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = SPI_NOR_OCMD_RD;
 	dev_data->packet.address   = addr;
 	dev_data->packet.data_buf  = dest;
 	dev_data->packet.num_bytes = size;
@@ -357,67 +140,35 @@ static int api_read(const struct device *dev, off_t addr, void *dest,
 	release(dev);
 
 	if (rc < 0) {
-		LOG_ERR("Read xfer failed: %d", rc);
+		LOG_ERR("SPI_NOR_OCMD_RD xfer failed: %d", rc);
 		return rc;
 	}
 
 	return 0;
 }
 
-static int status_get(const struct device *dev, const struct mspi_dev_cfg *curr_cfg,
-		      uint8_t *status)
+static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
 	struct flash_mspi_nor_data *dev_data = dev->data;
-	int rc;
-
-	/* Enter command mode */
-	if (curr_cfg != &dev_config->mspi_nor_init_cfg) {
-		rc = dev_cfg_apply(dev, &dev_config->mspi_nor_init_cfg);
-
-		if (rc < 0) {
-			LOG_ERR("Switching to initial dev_cfg failed: %d", rc);
-			return rc;
-		}
-	}
-
-	command_set(dev, &dev_config->jedec_cmds->status);
-	dev_data->packet.data_buf  = status;
-	dev_data->packet.num_bytes = sizeof(uint8_t);
-
-	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
-
-	if (rc < 0) {
-		LOG_ERR("Status xfer failed: %d", rc);
-		return rc;
-	}
-
-	/* Exit command mode */
-	if (curr_cfg != &dev_config->mspi_nor_init_cfg) {
-		rc = dev_cfg_apply(dev, &dev_config->mspi_nor_cfg);
-
-		if (rc < 0) {
-			LOG_ERR("Switching to default dev_cfg failed: %d", rc);
-		}
-	}
-
-	return rc;
-}
-
-static int wait_until_ready(const struct device *dev, const struct mspi_dev_cfg *curr_cfg,
-			    k_timeout_t poll_period)
-{
-	int rc;
 	uint8_t status_reg;
+	int rc;
 
 	while (true) {
-		rc = status_get(dev, curr_cfg, &status_reg);
-
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.addr_length = 4;
+		dev_data->xfer.rx_dummy    = 4;
+		dev_data->packet.dir       = MSPI_RX;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_RDSR;
+		dev_data->packet.address   = 0;
+		dev_data->packet.data_buf  = &status_reg;
+		dev_data->packet.num_bytes = sizeof(status_reg);
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("Status xfer failed: %d", rc);
+			LOG_ERR("SPI_NOR_OCMD_RDSR xfer failed: %d", rc);
 			return rc;
 		}
-
 		if (!(status_reg & SPI_NOR_WIP_BIT)) {
 			break;
 		}
@@ -428,15 +179,6 @@ static int wait_until_ready(const struct device *dev, const struct mspi_dev_cfg
 	return 0;
 }
 
-static int write_enable(const struct device *dev)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-
-	command_set(dev, &dev_config->jedec_cmds->write_en);
-	return mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
-}
-
 static int api_write(const struct device *dev, off_t addr, const void *src,
 		     size_t size)
 {
@@ -454,7 +196,7 @@ static int api_write(const struct device *dev, off_t addr, const void *src,
 		return -EINVAL;
 	}
 
-	rc = acquire(dev, &dev_config->mspi_nor_cfg);
+	rc = acquire(dev);
 	if (rc < 0) {
 		return rc;
 	}
@@ -465,19 +207,29 @@ static int api_write(const struct device *dev, off_t addr, const void *src,
 		uint16_t page_left = page_size - page_offset;
 		uint16_t to_write = (uint16_t)MIN(size, page_left);
 
-		if (write_enable(dev) < 0) {
-			LOG_ERR("Write enable xfer failed: %d", rc);
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.tx_dummy    = 0;
+		dev_data->packet.dir       = MSPI_TX;
+
+		dev_data->xfer.addr_length = 0;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
+		dev_data->packet.num_bytes = 0;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
 			break;
 		}
 
-		command_set(dev, &dev_config->jedec_cmds->page_program);
+		dev_data->xfer.addr_length = 4;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_PAGE_PRG;
 		dev_data->packet.address   = addr;
 		dev_data->packet.data_buf  = (uint8_t *)src;
 		dev_data->packet.num_bytes = to_write;
 		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("Page program xfer failed: %d", rc);
+			LOG_ERR("SPI_NOR_OCMD_PAGE_PRG xfer failed: %d", rc);
 			break;
 		}
 
@@ -485,7 +237,7 @@ static int api_write(const struct device *dev, off_t addr, const void *src,
 		src   = (const uint8_t *)src + to_write;
 		size -= to_write;
 
-		rc = wait_until_ready(dev, &dev_config->mspi_nor_cfg, K_MSEC(1));
+		rc = wait_until_ready(dev, K_MSEC(1));
 		if (rc < 0) {
 			break;
 		}
@@ -515,26 +267,38 @@ static int api_erase(const struct device *dev, off_t addr, size_t size)
 		return -EINVAL;
 	}
 
-	rc = acquire(dev, &dev_config->mspi_nor_init_cfg);
+	rc = acquire(dev);
 	if (rc < 0) {
 		return rc;
 	}
 
 	while (size > 0) {
-		rc = write_enable(dev);
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.tx_dummy    = 0;
+		dev_data->packet.dir       = MSPI_TX;
+		dev_data->packet.num_bytes = 0;
+
+		dev_data->xfer.addr_length = 0;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("Write enable failed.");
+			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
 			break;
 		}
 
 		if (size == flash_size) {
 			/* Chip erase. */
-			command_set(dev, &dev_config->jedec_cmds->chip_erase);
+			dev_data->xfer.addr_length = 0;
+			dev_data->packet.cmd       = SPI_NOR_OCMD_CE;
+
 			size -= flash_size;
 		} else {
 			/* Sector erase. */
-			command_set(dev, &dev_config->jedec_cmds->sector_erase);
-			dev_data->packet.address = addr;
+			dev_data->xfer.addr_length = 4;
+			dev_data->packet.cmd       = SPI_NOR_OCMD_SE;
+			dev_data->packet.address   = addr;
+
 			addr += SPI_NOR_SECTOR_SIZE;
 			size -= SPI_NOR_SECTOR_SIZE;
 		}
@@ -546,7 +310,7 @@ static int api_erase(const struct device *dev, off_t addr, size_t size)
 			break;
 		}
 
-		rc = wait_until_ready(dev, &dev_config->mspi_nor_init_cfg, K_MSEC(1));
+		rc = wait_until_ready(dev, K_MSEC(1));
 		if (rc < 0) {
 			break;
 		}
@@ -576,14 +340,19 @@ static int read_jedec_id(const struct device *dev, uint8_t *id)
 	struct flash_mspi_nor_data *dev_data = dev->data;
 	int rc;
 
-	command_set(dev, &dev_config->jedec_cmds->id);
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 4;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_OCMD_READ_ID;
+	dev_data->packet.address   = 0;
 	dev_data->packet.data_buf  = id;
 	dev_data->packet.num_bytes = JESD216_READ_ID_LEN;
-
 	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 			     &dev_data->xfer);
 	if (rc < 0) {
-		LOG_ERR("mspi_transceive() failed: %d\n", rc);
+		printk("mspi_transceive() failed: %d\n", rc);
+		return rc;
 	}
 
 	return rc;
@@ -613,13 +382,16 @@ static int api_sfdp_read(const struct device *dev, off_t addr, void *dest,
 		return 0;
 	}
 
-	rc = acquire(dev, dev_config->jedec_cmds->sfdp.force_single ?
-			  &dev_config->mspi_nor_init_cfg : &dev_config->mspi_nor_cfg);
+	rc = acquire(dev);
 	if (rc < 0) {
 		return rc;
 	}
 
-	command_set(dev, &dev_config->jedec_cmds->sfdp);
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 20;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_OCMD_READ_SFDP;
 	dev_data->packet.address   = addr;
 	dev_data->packet.data_buf  = dest;
 	dev_data->packet.num_bytes = size;
@@ -637,10 +409,9 @@ static int api_sfdp_read(const struct device *dev, off_t addr, void *dest,
 
 static int api_read_jedec_id(const struct device *dev, uint8_t *id)
 {
-	const struct flash_mspi_nor_config *dev_config = dev->config;
+	int rc = 0;
 
-	int rc = acquire(dev, dev_config->jedec_cmds->id.force_single ?
-			      &dev_config->mspi_nor_init_cfg : &dev_config->mspi_nor_cfg);
+	rc = acquire(dev);
 	if (rc < 0) {
 		return rc;
 	}
@@ -668,91 +439,77 @@ static int dev_pm_action_cb(const struct device *dev,
 	return 0;
 }
 
-static int switch_mode(const struct device *dev, uint8_t *id)
-{
-	const struct flash_mspi_nor_config *dev_config = dev->config;
-	struct flash_mspi_nor_data *dev_data = dev->data;
-
-	/* For octal mode:
-	 * If the read ID does not match the one from DTS, assume the flash
-	 * is already in the Octa I/O mode, so switching it is not needed.
-	 */
-	if ((dev_config->mspi_nor_cfg.io_mode == MSPI_IO_MODE_OCTAL) &&
-	     (memcmp(id, dev_config->jedec_id, JESD216_READ_ID_LEN) != 0)) {
-		return 0;
-	}
-
-	command_set(dev, &commands[MSPI_IO_MODE_SINGLE].write_en);
-	int rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-			     &dev_data->xfer);
-	if (rc < 0) {
-		LOG_ERR("Failed to set write enable: %d", rc);
-		return rc;
-	}
-
-	command_set(dev, &dev_config->jedec_cmds->mode_change);
-
-	/* MX25R specific:
-	 * For quad io mode above 8 MHz and single io mode above 33 MHz,
-	 * high performance mode needs to be enabled.
-	 */
-	if (((dev_config->mspi_nor_cfg.io_mode == MSPI_IO_MODE_QUAD_1_4_4) &&
-	     (dev_config->mspi_nor_cfg.freq > MHZ(8))) ||
-	    ((dev_config->mspi_nor_cfg.io_mode == MSPI_IO_MODE_SINGLE) &&
-	     (dev_config->mspi_nor_cfg.freq > MHZ(33)))) {
-		dev_data->packet.data_buf  = hp_payload;
-		dev_data->packet.num_bytes = sizeof(hp_payload);
-	} else {
-		dev_data->packet.data_buf  = (uint8_t *)&dev_config->jedec_cmds->mode_payload;
-		dev_data->packet.num_bytes = sizeof(dev_config->jedec_cmds->mode_payload);
-	}
-
-	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
-
-	if (rc < 0) {
-		LOG_ERR("Failed to change IO mode: %d\n", rc);
-		return rc;
-	}
-
-	return 0;
-}
-
 static int flash_chip_init(const struct device *dev)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
 	struct flash_mspi_nor_data *dev_data = dev->data;
+	struct mspi_dev_cfg init_dev_cfg = dev_config->mspi_cfg;
 	uint8_t id[JESD216_READ_ID_LEN] = {0};
 	int rc;
 
+	init_dev_cfg.freq = MHZ(1);
+	init_dev_cfg.io_mode = MSPI_IO_MODE_SINGLE;
+
 	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
-			     MSPI_DEVICE_CONFIG_ALL, &dev_config->mspi_nor_init_cfg);
+			     MSPI_DEVICE_CONFIG_ALL, &init_dev_cfg);
 	if (rc < 0) {
 		LOG_ERR("Failed to set initial device config: %d", rc);
 		return rc;
 	}
 
-	command_set(dev, &commands[MSPI_IO_MODE_SINGLE].id);
+	dev_data->xfer.xfer_mode  = MSPI_PIO;
+	dev_data->xfer.packets    = &dev_data->packet;
+	dev_data->xfer.num_packet = 1;
+	dev_data->xfer.timeout    = 10;
+
+	dev_data->xfer.cmd_length  = 1;
+	dev_data->xfer.addr_length = 0;
+	dev_data->xfer.tx_dummy    = 0;
+	dev_data->xfer.rx_dummy    = 0;
+
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_CMD_READ_ID;
 	dev_data->packet.data_buf  = id;
 	dev_data->packet.num_bytes = sizeof(id);
-
 	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 			     &dev_data->xfer);
 	if (rc < 0) {
-		LOG_ERR("Failed to read JEDEC ID in initial line mode: %d", rc);
+		LOG_ERR("Failed to read JEDEC ID in single line mode: %d", rc);
 		return rc;
 	}
 
-	rc = switch_mode(dev, id);
+	/*
+	 * If the read ID does not match the one from DTS, assume the flash
+	 * is already in the Octa I/O mode, so switching it is not needed.
+	 */
+	if (memcmp(id, dev_config->jedec_id, sizeof(id)) == 0) {
+		static const uint8_t enable_sopi[] = { 0x01 };
+
+		dev_data->packet.dir       = MSPI_TX;
+		dev_data->packet.cmd       = SPI_NOR_CMD_WREN;
+		dev_data->packet.num_bytes = 0;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_CMD_WREN xfer failed: %d", rc);
+			return rc;
+		}
 
-	if (rc < 0) {
-		LOG_ERR("Failed to switch mode: %d", rc);
-		return rc;
+		dev_data->xfer.addr_length = 4;
+		dev_data->packet.cmd       = SPI_NOR_CMD_WR_CFGREG2;
+		dev_data->packet.address   = 0;
+		dev_data->packet.data_buf  = (uint8_t *)&enable_sopi;
+		dev_data->packet.num_bytes = sizeof(enable_sopi);
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			printk("SPI_NOR_CMD_WR_CFGREG2 xfer failed: %d\n", rc);
+			return rc;
+		}
 	}
 
 	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
-			     MSPI_DEVICE_CONFIG_ALL,
-			     dev_config->jedec_cmds->id.force_single ?
-			     &dev_config->mspi_nor_init_cfg : &dev_config->mspi_nor_cfg);
+			     MSPI_DEVICE_CONFIG_ALL, &dev_config->mspi_cfg);
 	if (rc < 0) {
 		LOG_ERR("Failed to set device config: %d", rc);
 		return rc;
@@ -760,7 +517,6 @@ static int flash_chip_init(const struct device *dev)
 
 	rc = read_jedec_id(dev, id);
 	if (rc < 0) {
-		LOG_ERR("Failed to read JEDEC ID in final line mode: %d", rc);
 		return rc;
 	}
 
@@ -868,20 +624,7 @@ static DEVICE_API(flash, drv_api) = {
 #endif
 };
 
-#define FLASH_INITIAL_CONFIG(inst)					\
-{									\
-	.ce_num = DT_INST_PROP_OR(inst, mspi_hardware_ce_num, 0),	\
-	.freq = MIN(DT_INST_PROP(inst, mspi_max_frequency), MHZ(50)),	\
-	.io_mode = MSPI_IO_MODE_SINGLE,					\
-	.data_rate = MSPI_DATA_RATE_SINGLE,				\
-	.cpp = MSPI_CPP_MODE_0,						\
-	.endian = MSPI_XFER_BIG_ENDIAN,					\
-	.ce_polarity = MSPI_CE_ACTIVE_LOW,				\
-	.dqs_enable = false,						\
-}
-
 #define FLASH_SIZE_INST(inst) (DT_INST_PROP(inst, size) / 8)
-#define FLASH_CMDS(inst) &commands[DT_INST_ENUM_IDX(inst, mspi_io_mode)]
 
 #if defined(CONFIG_FLASH_PAGE_LAYOUT)
 BUILD_ASSERT((CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE % 4096) == 0,
@@ -908,22 +651,17 @@ BUILD_ASSERT((FLASH_SIZE_INST(inst) % CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE) ==
 #endif
 
 #define FLASH_MSPI_NOR_INST(inst)						\
-	BUILD_ASSERT((DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
-		      MSPI_IO_MODE_SINGLE) ||					\
-		     (DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
-		      MSPI_IO_MODE_QUAD_1_4_4) ||				\
-		     (DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
-		      MSPI_IO_MODE_OCTAL),					\
-		"Only 1x, 1-4-4 and 8x I/O modes are supported for now");	\
+	BUILD_ASSERT(DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		     MSPI_IO_MODE_OCTAL,					\
+		"Only Octal I/O mode is supported for now");			\
 	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);			\
 	static struct flash_mspi_nor_data dev##inst##_data;			\
 	static const struct flash_mspi_nor_config dev##inst##_config = {	\
 		.bus = DEVICE_DT_GET(DT_INST_BUS(inst)),			\
 		.flash_size = FLASH_SIZE_INST(inst),				\
 		.mspi_id = MSPI_DEVICE_ID_DT_INST(inst),			\
-		.mspi_nor_cfg = MSPI_DEVICE_CONFIG_DT_INST(inst),		\
-		.mspi_nor_init_cfg = FLASH_INITIAL_CONFIG(inst),		\
-		.mspi_nor_cfg_mask = DT_PROP(DT_INST_BUS(inst),			\
+		.mspi_cfg = MSPI_DEVICE_CONFIG_DT_INST(inst),			\
+		.mspi_cfg_mask = DT_PROP(DT_INST_BUS(inst),			\
 					 software_multiperipheral)		\
 			       ? MSPI_DEVICE_CONFIG_ALL				\
 			       : MSPI_DEVICE_CONFIG_NONE,			\
@@ -937,7 +675,6 @@ BUILD_ASSERT((FLASH_SIZE_INST(inst) % CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE) ==
 				   / 1000,))					\
 		FLASH_PAGE_LAYOUT_DEFINE(inst)					\
 		.jedec_id = DT_INST_PROP(inst, jedec_id),			\
-		.jedec_cmds = FLASH_CMDS(inst),					\
 	};									\
 	FLASH_PAGE_LAYOUT_CHECK(inst)						\
 	DEVICE_DT_INST_DEFINE(inst,						\

From 8951b565ad179a129ae1f99553ed514da384374f Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Wed, 2 Apr 2025 15:26:58 +0200
Subject: [PATCH 2896/2913] Revert "[nrf fromlist] drivers: flash: spi_nor: add
 define for Quad Enable bit"

This reverts commit a7e820a3b7290ffafc258881f498e0ce748c999d.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
(cherry picked from commit 6978eb3fab5672917b087b4526b27aed5f4e6dae)
---
 drivers/flash/spi_nor.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/flash/spi_nor.h b/drivers/flash/spi_nor.h
index 141b67718ef..a918e0a99d0 100644
--- a/drivers/flash/spi_nor.h
+++ b/drivers/flash/spi_nor.h
@@ -14,7 +14,6 @@
 /* Status register bits */
 #define SPI_NOR_WIP_BIT         BIT(0)  /* Write in progress */
 #define SPI_NOR_WEL_BIT         BIT(1)  /* Write enable latch */
-#define SPI_NOR_QE_BIT          BIT(6)  /* Quad enable */
 
 /* Flash opcodes */
 #define SPI_NOR_CMD_WRSR        0x01    /* Write status register */

From 1a28e2a288cd1de18e85fabcd0ee9f41fbfd3b8a Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Wed, 2 Apr 2025 14:50:02 +0200
Subject: [PATCH 2897/2913] [nrf fromlist] boards: nordic: update binding for
 MX25U

Separate compatible is required for Flash MSPI quirks.

Upstream PR #: 85520

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
(cherry picked from commit 491bf44e4364f6f6c67ed8a75e9ecc7108b970ec)
---
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts | 2 +-
 boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 06e642948f3..6f28374d976 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -268,7 +268,7 @@ ipc0: &cpuapp_cpurad_ipc {
 	status = "okay";
 
 	mx25uw63: mx25uw6345g@0 {
-		compatible = "jedec,mspi-nor";
+		compatible = "mxicy,mx25u", "jedec,mspi-nor";
 		status = "disabled";
 		reg = <0>;
 		jedec-id = [c2 84 37];
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index a7b61861bed..6abddbeafcc 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -254,7 +254,7 @@ ipc0: &cpuapp_cpurad_ipc {
 	status = "okay";
 
 	mx25uw63: mx25uw6345g@0 {
-		compatible = "jedec,mspi-nor";
+		compatible = "mxicy,mx25u", "jedec,mspi-nor";
 		status = "disabled";
 		reg = <0>;
 		jedec-id = [c2 84 37];

From c206f1e9e15da2f422454f3729e29ffc3e8db53e Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Fri, 7 Feb 2025 15:01:18 +0100
Subject: [PATCH 2898/2913] [nrf fromlist] drivers: flash: mspi_nor: support
 MODE_SINGLE and MODE_QUAD_1_4_4

Extend driver to support single lane and 1-4-4 IO modes.
Move flash chip quirks to a separate file.

Upstream PR #: 85520

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
(cherry picked from commit 80ef7970f0d1fdf506a3b1b644849a92a46f7c6f)
---
 drivers/flash/flash_mspi_nor.c        | 538 +++++++++++++++++---------
 drivers/flash/flash_mspi_nor.h        | 248 ++++++++++++
 drivers/flash/flash_mspi_nor_quirks.h | 185 +++++++++
 3 files changed, 791 insertions(+), 180 deletions(-)
 create mode 100644 drivers/flash/flash_mspi_nor.h
 create mode 100644 drivers/flash/flash_mspi_nor_quirks.h

diff --git a/drivers/flash/flash_mspi_nor.c b/drivers/flash/flash_mspi_nor.c
index a5ced1e0070..140a5300308 100644
--- a/drivers/flash/flash_mspi_nor.c
+++ b/drivers/flash/flash_mspi_nor.c
@@ -6,47 +6,56 @@
 
 #define DT_DRV_COMPAT jedec_mspi_nor
 
-#include <zephyr/drivers/flash.h>
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/drivers/mspi.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/pm/device.h>
 #include <zephyr/pm/device_runtime.h>
 
-#include "jesd216.h"
-#include "spi_nor.h"
+#include "flash_mspi_nor.h"
+#include "flash_mspi_nor_quirks.h"
 
 LOG_MODULE_REGISTER(flash_mspi_nor, CONFIG_FLASH_LOG_LEVEL);
 
-#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios)
-#define WITH_RESET_GPIO 1
-#endif
+void flash_mspi_command_set(const struct device *dev, const struct flash_mspi_nor_cmd *cmd)
+{
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	const struct flash_mspi_nor_config *dev_config = dev->config;
 
-struct flash_mspi_nor_data {
-	struct k_sem acquired;
-	struct mspi_xfer_packet packet;
-	struct mspi_xfer xfer;
-};
+	memset(&dev_data->xfer, 0, sizeof(dev_data->xfer));
+	memset(&dev_data->packet, 0, sizeof(dev_data->packet));
 
-struct flash_mspi_nor_config {
-	const struct device *bus;
-	uint32_t flash_size;
-	struct mspi_dev_id mspi_id;
-	struct mspi_dev_cfg mspi_cfg;
-	enum mspi_dev_cfg_mask mspi_cfg_mask;
-#if defined(CONFIG_MSPI_XIP)
-	struct mspi_xip_cfg xip_cfg;
-#endif
-#if defined(WITH_RESET_GPIO)
-	struct gpio_dt_spec reset;
-	uint32_t reset_pulse_us;
-	uint32_t reset_recovery_us;
-#endif
-#if defined(CONFIG_FLASH_PAGE_LAYOUT)
-	struct flash_pages_layout layout;
-#endif
-	uint8_t jedec_id[SPI_NOR_MAX_ID_LEN];
-};
+	dev_data->xfer.xfer_mode  = MSPI_PIO;
+	dev_data->xfer.packets    = &dev_data->packet;
+	dev_data->xfer.num_packet = 1;
+	dev_data->xfer.timeout    = 10;
+
+	dev_data->xfer.cmd_length = cmd->cmd_length;
+	dev_data->xfer.addr_length = cmd->addr_length;
+	dev_data->xfer.tx_dummy = (cmd->dir == MSPI_TX) ?
+				  cmd->tx_dummy : dev_config->mspi_nor_cfg.tx_dummy;
+	dev_data->xfer.rx_dummy = (cmd->dir == MSPI_RX) ?
+				  cmd->rx_dummy : dev_config->mspi_nor_cfg.rx_dummy;
+
+	dev_data->packet.dir = cmd->dir;
+	dev_data->packet.cmd = cmd->cmd;
+}
+
+static int dev_cfg_apply(const struct device *dev, const struct mspi_dev_cfg *cfg)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+
+	if (dev_data->curr_cfg == cfg) {
+		return 0;
+	}
+
+	int rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
+				 MSPI_DEVICE_CONFIG_ALL, cfg);
+	if (rc < 0) {
+		LOG_ERR("Failed to set device config: %p error: %d", cfg, rc);
+	}
+	return rc;
+}
 
 static int acquire(const struct device *dev)
 {
@@ -64,8 +73,8 @@ static int acquire(const struct device *dev)
 		 * if needed for the flash device.
 		 */
 		rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
-				     dev_config->mspi_cfg_mask,
-				     &dev_config->mspi_cfg);
+				     dev_config->mspi_nor_cfg_mask,
+				     &dev_config->mspi_nor_cfg);
 		if (rc < 0) {
 			LOG_ERR("mspi_dev_config() failed: %d", rc);
 		} else {
@@ -125,12 +134,18 @@ static int api_read(const struct device *dev, off_t addr, void *dest,
 		return rc;
 	}
 
+	if (dev_config->jedec_cmds->read.force_single) {
+		rc = dev_cfg_apply(dev, &dev_config->mspi_nor_init_cfg);
+	} else {
+		rc = dev_cfg_apply(dev, &dev_config->mspi_nor_cfg);
+	}
+
+	if (rc < 0) {
+		return rc;
+	}
+
 	/* TODO: get rid of all these hard-coded values for MX25Ux chips */
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 20;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = SPI_NOR_OCMD_RD;
+	flash_mspi_command_set(dev, &dev_config->jedec_cmds->read);
 	dev_data->packet.address   = addr;
 	dev_data->packet.data_buf  = dest;
 	dev_data->packet.num_bytes = size;
@@ -140,35 +155,58 @@ static int api_read(const struct device *dev, off_t addr, void *dest,
 	release(dev);
 
 	if (rc < 0) {
-		LOG_ERR("SPI_NOR_OCMD_RD xfer failed: %d", rc);
+		LOG_ERR("Read xfer failed: %d", rc);
 		return rc;
 	}
 
 	return 0;
 }
 
-static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
+static int status_get(const struct device *dev, uint8_t *status)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
 	struct flash_mspi_nor_data *dev_data = dev->data;
-	uint8_t status_reg;
 	int rc;
 
+	/* Enter command mode */
+	if (dev_config->jedec_cmds->status.force_single) {
+		rc = dev_cfg_apply(dev, &dev_config->mspi_nor_init_cfg);
+	} else {
+		rc = dev_cfg_apply(dev, &dev_config->mspi_nor_cfg);
+	}
+
+	if (rc < 0) {
+		LOG_ERR("Switching to dev_cfg failed: %d", rc);
+		return rc;
+	}
+
+	flash_mspi_command_set(dev, &dev_config->jedec_cmds->status);
+	dev_data->packet.data_buf  = status;
+	dev_data->packet.num_bytes = sizeof(uint8_t);
+
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
+
+	if (rc < 0) {
+		LOG_ERR("Status xfer failed: %d", rc);
+		return rc;
+	}
+
+	return rc;
+}
+
+static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
+{
+	int rc;
+	uint8_t status_reg;
+
 	while (true) {
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.addr_length = 4;
-		dev_data->xfer.rx_dummy    = 4;
-		dev_data->packet.dir       = MSPI_RX;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_RDSR;
-		dev_data->packet.address   = 0;
-		dev_data->packet.data_buf  = &status_reg;
-		dev_data->packet.num_bytes = sizeof(status_reg);
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
+		rc = status_get(dev, &status_reg);
+
 		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_RDSR xfer failed: %d", rc);
+			LOG_ERR("Wait until ready - status xfer failed: %d", rc);
 			return rc;
 		}
+
 		if (!(status_reg & SPI_NOR_WIP_BIT)) {
 			break;
 		}
@@ -179,6 +217,26 @@ static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
 	return 0;
 }
 
+static int write_enable(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	int rc;
+
+	if (dev_config->jedec_cmds->write_en.force_single) {
+		rc = dev_cfg_apply(dev, &dev_config->mspi_nor_init_cfg);
+	} else {
+		rc = dev_cfg_apply(dev, &dev_config->mspi_nor_cfg);
+	}
+
+	if (rc < 0) {
+		return rc;
+	}
+
+	flash_mspi_command_set(dev, &dev_config->jedec_cmds->write_en);
+	return mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
+}
+
 static int api_write(const struct device *dev, off_t addr, const void *src,
 		     size_t size)
 {
@@ -207,29 +265,29 @@ static int api_write(const struct device *dev, off_t addr, const void *src,
 		uint16_t page_left = page_size - page_offset;
 		uint16_t to_write = (uint16_t)MIN(size, page_left);
 
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.tx_dummy    = 0;
-		dev_data->packet.dir       = MSPI_TX;
+		if (write_enable(dev) < 0) {
+			LOG_ERR("Write enable xfer failed: %d", rc);
+			break;
+		}
+
+		if (dev_config->jedec_cmds->page_program.force_single) {
+			rc = dev_cfg_apply(dev, &dev_config->mspi_nor_init_cfg);
+		} else {
+			rc = dev_cfg_apply(dev, &dev_config->mspi_nor_cfg);
+		}
 
-		dev_data->xfer.addr_length = 0;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
-		dev_data->packet.num_bytes = 0;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
-			break;
+			return rc;
 		}
 
-		dev_data->xfer.addr_length = 4;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_PAGE_PRG;
+		flash_mspi_command_set(dev, &dev_config->jedec_cmds->page_program);
 		dev_data->packet.address   = addr;
 		dev_data->packet.data_buf  = (uint8_t *)src;
 		dev_data->packet.num_bytes = to_write;
 		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_PAGE_PRG xfer failed: %d", rc);
+			LOG_ERR("Page program xfer failed: %d", rc);
 			break;
 		}
 
@@ -273,32 +331,40 @@ static int api_erase(const struct device *dev, off_t addr, size_t size)
 	}
 
 	while (size > 0) {
-		dev_data->xfer.cmd_length  = 2;
-		dev_data->xfer.tx_dummy    = 0;
-		dev_data->packet.dir       = MSPI_TX;
-		dev_data->packet.num_bytes = 0;
-
-		dev_data->xfer.addr_length = 0;
-		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
+		rc = write_enable(dev);
 		if (rc < 0) {
-			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
+			LOG_ERR("Write enable failed.");
 			break;
 		}
 
 		if (size == flash_size) {
 			/* Chip erase. */
-			dev_data->xfer.addr_length = 0;
-			dev_data->packet.cmd       = SPI_NOR_OCMD_CE;
+			if (dev_config->jedec_cmds->chip_erase.force_single) {
+				rc = dev_cfg_apply(dev, &dev_config->mspi_nor_init_cfg);
+			} else {
+				rc = dev_cfg_apply(dev, &dev_config->mspi_nor_cfg);
+			}
 
+			if (rc < 0) {
+				return rc;
+			}
+
+			flash_mspi_command_set(dev, &dev_config->jedec_cmds->chip_erase);
 			size -= flash_size;
 		} else {
 			/* Sector erase. */
-			dev_data->xfer.addr_length = 4;
-			dev_data->packet.cmd       = SPI_NOR_OCMD_SE;
-			dev_data->packet.address   = addr;
-
+			if (dev_config->jedec_cmds->sector_erase.force_single) {
+				rc = dev_cfg_apply(dev, &dev_config->mspi_nor_init_cfg);
+			} else {
+				rc = dev_cfg_apply(dev, &dev_config->mspi_nor_cfg);
+			}
+
+			if (rc < 0) {
+				return rc;
+			}
+
+			flash_mspi_command_set(dev, &dev_config->jedec_cmds->sector_erase);
+			dev_data->packet.address = addr;
 			addr += SPI_NOR_SECTOR_SIZE;
 			size -= SPI_NOR_SECTOR_SIZE;
 		}
@@ -340,19 +406,24 @@ static int read_jedec_id(const struct device *dev, uint8_t *id)
 	struct flash_mspi_nor_data *dev_data = dev->data;
 	int rc;
 
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 4;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_OCMD_READ_ID;
-	dev_data->packet.address   = 0;
+	if (dev_config->jedec_cmds->id.force_single) {
+		rc = dev_cfg_apply(dev, &dev_config->mspi_nor_init_cfg);
+	} else {
+		rc = dev_cfg_apply(dev, &dev_config->mspi_nor_cfg);
+	}
+
+	if (rc < 0) {
+		return rc;
+	}
+
+	flash_mspi_command_set(dev, &dev_config->jedec_cmds->id);
 	dev_data->packet.data_buf  = id;
 	dev_data->packet.num_bytes = JESD216_READ_ID_LEN;
+
 	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 			     &dev_data->xfer);
 	if (rc < 0) {
-		printk("mspi_transceive() failed: %d\n", rc);
-		return rc;
+		LOG_ERR("Read JEDEC ID failed: %d\n", rc);
 	}
 
 	return rc;
@@ -387,18 +458,24 @@ static int api_sfdp_read(const struct device *dev, off_t addr, void *dest,
 		return rc;
 	}
 
-	dev_data->xfer.cmd_length  = 2;
-	dev_data->xfer.addr_length = 4;
-	dev_data->xfer.rx_dummy    = 20;
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_OCMD_READ_SFDP;
+	if (dev_config->jedec_cmds->sfdp.force_single) {
+		rc = dev_cfg_apply(dev, &dev_config->mspi_nor_init_cfg);
+	} else {
+		rc = dev_cfg_apply(dev, &dev_config->mspi_nor_cfg);
+	}
+
+	if (rc < 0) {
+		return rc;
+	}
+
+	flash_mspi_command_set(dev, &dev_config->jedec_cmds->sfdp);
 	dev_data->packet.address   = addr;
 	dev_data->packet.data_buf  = dest;
 	dev_data->packet.num_bytes = size;
 	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
 			     &dev_data->xfer);
 	if (rc < 0) {
-		printk("JESD216_OCMD_READ_SFDP xfer failed: %d\n", rc);
+		printk("Read SFDP xfer failed: %d\n", rc);
 		return rc;
 	}
 
@@ -409,9 +486,7 @@ static int api_sfdp_read(const struct device *dev, off_t addr, void *dest,
 
 static int api_read_jedec_id(const struct device *dev, uint8_t *id)
 {
-	int rc = 0;
-
-	rc = acquire(dev);
+	int rc = acquire(dev);
 	if (rc < 0) {
 		return rc;
 	}
@@ -439,87 +514,193 @@ static int dev_pm_action_cb(const struct device *dev,
 	return 0;
 }
 
-static int flash_chip_init(const struct device *dev)
+static int quad_enable_set(const struct device *dev, bool enable)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
 	struct flash_mspi_nor_data *dev_data = dev->data;
-	struct mspi_dev_cfg init_dev_cfg = dev_config->mspi_cfg;
-	uint8_t id[JESD216_READ_ID_LEN] = {0};
 	int rc;
 
-	init_dev_cfg.freq = MHZ(1);
-	init_dev_cfg.io_mode = MSPI_IO_MODE_SINGLE;
+	flash_mspi_command_set(dev, &commands[MSPI_IO_MODE_SINGLE].write_en);
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		LOG_ERR("Failed to set write enable: %d", rc);
+		return rc;
+	}
+
+	if (dev_config->dw15_qer == JESD216_DW15_QER_VAL_S1B6) {
+		const struct flash_mspi_nor_cmd cmd_status = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WRSR,
+			.cmd_length = 1,
+		};
+		uint8_t mode_payload = enable ? BIT(6) : 0;
+
+		flash_mspi_command_set(dev, &cmd_status);
+		dev_data->packet.data_buf  = &mode_payload;
+		dev_data->packet.num_bytes = sizeof(mode_payload);
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
+
+		if (rc < 0) {
+			LOG_ERR("Failed to enable/disable quad mode: %d", rc);
+			return rc;
+		}
+	} else {
+		/* TODO: handle all DW15 QER values */
+		return -ENOTSUP;
+	}
+
+	rc = wait_until_ready(dev, K_USEC(1));
 
-	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
-			     MSPI_DEVICE_CONFIG_ALL, &init_dev_cfg);
 	if (rc < 0) {
-		LOG_ERR("Failed to set initial device config: %d", rc);
+		LOG_ERR("Failed waiting until device ready after enabling quad: %d", rc);
 		return rc;
 	}
 
-	dev_data->xfer.xfer_mode  = MSPI_PIO;
-	dev_data->xfer.packets    = &dev_data->packet;
-	dev_data->xfer.num_packet = 1;
-	dev_data->xfer.timeout    = 10;
+	return 0;
+}
 
-	dev_data->xfer.cmd_length  = 1;
-	dev_data->xfer.addr_length = 0;
-	dev_data->xfer.tx_dummy    = 0;
-	dev_data->xfer.rx_dummy    = 0;
 
-	dev_data->packet.dir       = MSPI_RX;
-	dev_data->packet.cmd       = JESD216_CMD_READ_ID;
-	dev_data->packet.data_buf  = id;
-	dev_data->packet.num_bytes = sizeof(id);
-	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-			     &dev_data->xfer);
+static int default_io_mode(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	enum mspi_io_mode io_mode = dev_config->mspi_nor_cfg.io_mode;
+	int rc = 0;
+
+	/* For Quad 1-1-4 and 1-4-4, entering or leaving mode is defined in JEDEC216 BFP DW15 QER */
+	if (io_mode == MSPI_IO_MODE_SINGLE) {
+		rc = quad_enable_set(dev, false);
+	} else if ((io_mode == MSPI_IO_MODE_QUAD_1_1_4) || (io_mode == MSPI_IO_MODE_QUAD_1_4_4)) {
+		rc = quad_enable_set(dev, true);
+	}
+
 	if (rc < 0) {
-		LOG_ERR("Failed to read JEDEC ID in single line mode: %d", rc);
+		LOG_ERR("Failed to modify Quad Enable bit: %d", rc);
+	}
+
+	if ((dev_config->quirks != NULL) && (dev_config->quirks->post_switch_mode != NULL)) {
+		rc = dev_config->quirks->post_switch_mode(dev);
+	}
+
+	if (rc < 0) {
+		LOG_ERR("Failed to change IO mode: %d\n", rc);
 		return rc;
 	}
 
-	/*
-	 * If the read ID does not match the one from DTS, assume the flash
-	 * is already in the Octa I/O mode, so switching it is not needed.
+	return dev_cfg_apply(dev, &dev_config->mspi_nor_cfg);
+}
+
+#if defined(WITH_RESET_GPIO)
+static int gpio_reset(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	int rc;
+
+	if (dev_config->reset.port) {
+		if (!gpio_is_ready_dt(&dev_config->reset)) {
+			LOG_ERR("Device %s is not ready",
+				dev_config->reset.port->name);
+			return -ENODEV;
+		}
+
+		rc = gpio_pin_configure_dt(&dev_config->reset,
+					   GPIO_OUTPUT_ACTIVE);
+		if (rc < 0) {
+			LOG_ERR("Failed to activate RESET: %d", rc);
+			return -EIO;
+		}
+
+		if (dev_config->reset_pulse_us != 0) {
+			k_busy_wait(dev_config->reset_pulse_us);
+		}
+
+		rc = gpio_pin_set_dt(&dev_config->reset, 0);
+		if (rc < 0) {
+			LOG_ERR("Failed to deactivate RESET: %d", rc);
+			return -EIO;
+		}
+
+		if (dev_config->reset_recovery_us != 0) {
+			k_busy_wait(dev_config->reset_recovery_us);
+		}
+	}
+
+	return 0;
+}
+#endif
+
+static int flash_chip_init(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	enum mspi_io_mode io_mode = dev_config->mspi_nor_cfg.io_mode;
+	uint8_t id[JESD216_READ_ID_LEN] = {0};
+	int rc;
+
+	rc = dev_cfg_apply(dev, &dev_config->mspi_nor_init_cfg);
+
+	if (rc < 0) {
+		return rc;
+	}
+
+	/* Some chips reuse RESET pin for data in Quad modes:
+	 * force single line mode before resetting.
 	 */
-	if (memcmp(id, dev_config->jedec_id, sizeof(id)) == 0) {
-		static const uint8_t enable_sopi[] = { 0x01 };
+	if ((io_mode == MSPI_IO_MODE_SINGLE) || (io_mode == MSPI_IO_MODE_QUAD_1_1_4) ||
+	    (io_mode == MSPI_IO_MODE_QUAD_1_4_4)) {
+		rc = quad_enable_set(dev, false);
 
-		dev_data->packet.dir       = MSPI_TX;
-		dev_data->packet.cmd       = SPI_NOR_CMD_WREN;
-		dev_data->packet.num_bytes = 0;
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
 		if (rc < 0) {
-			LOG_ERR("SPI_NOR_CMD_WREN xfer failed: %d", rc);
+			LOG_ERR("Failed to switch to single line mode: %d", rc);
 			return rc;
 		}
 
-		dev_data->xfer.addr_length = 4;
-		dev_data->packet.cmd       = SPI_NOR_CMD_WR_CFGREG2;
-		dev_data->packet.address   = 0;
-		dev_data->packet.data_buf  = (uint8_t *)&enable_sopi;
-		dev_data->packet.num_bytes = sizeof(enable_sopi);
-		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
-				     &dev_data->xfer);
+		rc = wait_until_ready(dev, K_USEC(1));
+
 		if (rc < 0) {
-			printk("SPI_NOR_CMD_WR_CFGREG2 xfer failed: %d\n", rc);
+			LOG_ERR("Failed waiting for device after switch to single line: %d", rc);
 			return rc;
 		}
 	}
 
-	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
-			     MSPI_DEVICE_CONFIG_ALL, &dev_config->mspi_cfg);
+#if defined(WITH_RESET_GPIO)
+	rc = gpio_reset(dev);
+
 	if (rc < 0) {
-		LOG_ERR("Failed to set device config: %d", rc);
+		LOG_ERR("Failed to reset with GPIO: %d", rc);
 		return rc;
 	}
+#endif
+
+	flash_mspi_command_set(dev, &commands[MSPI_IO_MODE_SINGLE].id);
+	dev_data->packet.data_buf  = id;
+	dev_data->packet.num_bytes = sizeof(id);
+
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		LOG_ERR("Failed to read JEDEC ID in initial line mode: %d", rc);
+		return rc;
+	}
+
+	rc = default_io_mode(dev);
 
-	rc = read_jedec_id(dev, id);
 	if (rc < 0) {
+		LOG_ERR("Failed to switch to default io mode: %d", rc);
 		return rc;
 	}
 
+	/* Reading JEDEC ID for mode that forces single lane would be redundant,
+	 * since it switches back to single lane mode. Use ID from previous read.
+	 */
+	if (!dev_config->jedec_cmds->id.force_single) {
+		rc = read_jedec_id(dev, id);
+		if (rc < 0) {
+			LOG_ERR("Failed to read JEDEC ID in final line mode: %d", rc);
+			return rc;
+		}
+	}
+
 	if (memcmp(id, dev_config->jedec_id, sizeof(id)) != 0) {
 		LOG_ERR("JEDEC ID mismatch, read: %02x %02x %02x, "
 			"expected: %02x %02x %02x",
@@ -555,37 +736,6 @@ static int drv_init(const struct device *dev)
 		return -ENODEV;
 	}
 
-#if defined(WITH_RESET_GPIO)
-	if (dev_config->reset.port) {
-		if (!gpio_is_ready_dt(&dev_config->reset)) {
-			LOG_ERR("Device %s is not ready",
-				dev_config->reset.port->name);
-			return -ENODEV;
-		}
-
-		rc = gpio_pin_configure_dt(&dev_config->reset,
-					   GPIO_OUTPUT_ACTIVE);
-		if (rc < 0) {
-			LOG_ERR("Failed to activate RESET: %d", rc);
-			return -EIO;
-		}
-
-		if (dev_config->reset_pulse_us != 0) {
-			k_busy_wait(dev_config->reset_pulse_us);
-		}
-
-		rc = gpio_pin_set_dt(&dev_config->reset, 0);
-		if (rc < 0) {
-			LOG_ERR("Failed to deactivate RESET: %d", rc);
-			return -EIO;
-		}
-
-		if (dev_config->reset_recovery_us != 0) {
-			k_busy_wait(dev_config->reset_recovery_us);
-		}
-	}
-#endif
-
 	rc = pm_device_runtime_get(dev_config->bus);
 	if (rc < 0) {
 		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
@@ -624,7 +774,27 @@ static DEVICE_API(flash, drv_api) = {
 #endif
 };
 
+#define FLASH_INITIAL_CONFIG(inst)					\
+{									\
+	.ce_num = DT_INST_PROP_OR(inst, mspi_hardware_ce_num, 0),	\
+	.freq = MIN(DT_INST_PROP(inst, mspi_max_frequency), MHZ(50)),	\
+	.io_mode = MSPI_IO_MODE_SINGLE,					\
+	.data_rate = MSPI_DATA_RATE_SINGLE,				\
+	.cpp = MSPI_CPP_MODE_0,						\
+	.endian = MSPI_XFER_BIG_ENDIAN,					\
+	.ce_polarity = MSPI_CE_ACTIVE_LOW,				\
+	.dqs_enable = false,						\
+}
+
 #define FLASH_SIZE_INST(inst) (DT_INST_PROP(inst, size) / 8)
+#define FLASH_CMDS(inst) &commands[DT_INST_ENUM_IDX(inst, mspi_io_mode)]
+#define FLASH_QUIRKS(inst) FLASH_MSPI_QUIRKS_GET(DT_DRV_INST(inst))
+
+#define FLASH_DW15_QER_VAL(inst) _CONCAT(JESD216_DW15_QER_VAL_, \
+	DT_INST_STRING_TOKEN(inst, quad_enable_requirements))
+#define FLASH_DW15_QER(inst) COND_CODE_1(DT_INST_NODE_HAS_PROP(inst, quad_enable_requirements), \
+	(FLASH_DW15_QER_VAL(inst)), (JESD216_DW15_QER_VAL_NONE))
+
 
 #if defined(CONFIG_FLASH_PAGE_LAYOUT)
 BUILD_ASSERT((CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE % 4096) == 0,
@@ -651,17 +821,22 @@ BUILD_ASSERT((FLASH_SIZE_INST(inst) % CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE) ==
 #endif
 
 #define FLASH_MSPI_NOR_INST(inst)						\
-	BUILD_ASSERT(DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
-		     MSPI_IO_MODE_OCTAL,					\
-		"Only Octal I/O mode is supported for now");			\
+	BUILD_ASSERT((DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		      MSPI_IO_MODE_SINGLE) ||					\
+		     (DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		      MSPI_IO_MODE_QUAD_1_4_4) ||				\
+		     (DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		      MSPI_IO_MODE_OCTAL),					\
+		"Only 1x, 1-4-4 and 8x I/O modes are supported for now");	\
 	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);			\
 	static struct flash_mspi_nor_data dev##inst##_data;			\
 	static const struct flash_mspi_nor_config dev##inst##_config = {	\
 		.bus = DEVICE_DT_GET(DT_INST_BUS(inst)),			\
 		.flash_size = FLASH_SIZE_INST(inst),				\
 		.mspi_id = MSPI_DEVICE_ID_DT_INST(inst),			\
-		.mspi_cfg = MSPI_DEVICE_CONFIG_DT_INST(inst),			\
-		.mspi_cfg_mask = DT_PROP(DT_INST_BUS(inst),			\
+		.mspi_nor_cfg = MSPI_DEVICE_CONFIG_DT_INST(inst),		\
+		.mspi_nor_init_cfg = FLASH_INITIAL_CONFIG(inst),		\
+		.mspi_nor_cfg_mask = DT_PROP(DT_INST_BUS(inst),			\
 					 software_multiperipheral)		\
 			       ? MSPI_DEVICE_CONFIG_ALL				\
 			       : MSPI_DEVICE_CONFIG_NONE,			\
@@ -675,6 +850,9 @@ BUILD_ASSERT((FLASH_SIZE_INST(inst) % CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE) ==
 				   / 1000,))					\
 		FLASH_PAGE_LAYOUT_DEFINE(inst)					\
 		.jedec_id = DT_INST_PROP(inst, jedec_id),			\
+		.jedec_cmds = FLASH_CMDS(inst),					\
+		.quirks = FLASH_QUIRKS(inst),					\
+		.dw15_qer = FLASH_DW15_QER(inst),				\
 	};									\
 	FLASH_PAGE_LAYOUT_CHECK(inst)						\
 	DEVICE_DT_INST_DEFINE(inst,						\
diff --git a/drivers/flash/flash_mspi_nor.h b/drivers/flash/flash_mspi_nor.h
new file mode 100644
index 00000000000..42489606ffe
--- /dev/null
+++ b/drivers/flash/flash_mspi_nor.h
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __FLASH_MSPI_NOR_H__
+#define __FLASH_MSPI_NOR_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <zephyr/drivers/flash.h>
+#include <zephyr/drivers/mspi.h>
+#include "jesd216.h"
+#include "spi_nor.h"
+
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios)
+#define WITH_RESET_GPIO 1
+#endif
+
+struct flash_mspi_nor_config {
+	const struct device *bus;
+	uint32_t flash_size;
+	struct mspi_dev_id mspi_id;
+	struct mspi_dev_cfg mspi_nor_cfg;
+	struct mspi_dev_cfg mspi_nor_init_cfg;
+	enum mspi_dev_cfg_mask mspi_nor_cfg_mask;
+#if defined(CONFIG_MSPI_XIP)
+	struct mspi_xip_cfg xip_cfg;
+#endif
+#if defined(WITH_RESET_GPIO)
+	struct gpio_dt_spec reset;
+	uint32_t reset_pulse_us;
+	uint32_t reset_recovery_us;
+#endif
+#if defined(CONFIG_FLASH_PAGE_LAYOUT)
+	struct flash_pages_layout layout;
+#endif
+	uint8_t jedec_id[SPI_NOR_MAX_ID_LEN];
+	struct flash_mspi_nor_cmds *jedec_cmds;
+	struct flash_mspi_nor_quirks *quirks;
+	uint8_t dw15_qer;
+};
+
+struct flash_mspi_nor_data {
+	struct k_sem acquired;
+	struct mspi_xfer_packet packet;
+	struct mspi_xfer xfer;
+	struct mspi_dev_cfg *curr_cfg;
+};
+
+struct flash_mspi_nor_cmd {
+	enum mspi_xfer_direction dir;
+	uint32_t cmd;
+	uint16_t tx_dummy;
+	uint16_t rx_dummy;
+	uint8_t cmd_length;
+	uint8_t addr_length;
+	bool force_single;
+};
+
+struct flash_mspi_nor_cmds {
+	struct flash_mspi_nor_cmd id;
+	struct flash_mspi_nor_cmd write_en;
+	struct flash_mspi_nor_cmd read;
+	struct flash_mspi_nor_cmd status;
+	struct flash_mspi_nor_cmd config;
+	struct flash_mspi_nor_cmd page_program;
+	struct flash_mspi_nor_cmd sector_erase;
+	struct flash_mspi_nor_cmd chip_erase;
+	struct flash_mspi_nor_cmd sfdp;
+};
+
+struct flash_mspi_nor_cmds commands[] = {
+	[MSPI_IO_MODE_SINGLE] = {
+		.id = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_CMD_READ_ID,
+			.cmd_length = 1,
+		},
+		.write_en = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WREN,
+			.cmd_length = 1,
+		},
+		.read = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_READ_FAST,
+			.cmd_length = 1,
+			.addr_length = 3,
+			.rx_dummy = 8,
+		},
+		.status = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_RDSR,
+			.cmd_length = 1,
+		},
+		.config = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_RDCR,
+			.cmd_length = 1,
+		},
+		.page_program = {
+			.dir  = MSPI_TX,
+			.cmd = SPI_NOR_CMD_PP,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.sector_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_SE,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.chip_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_CE,
+			.cmd_length = 1,
+		},
+		.sfdp = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_CMD_READ_SFDP,
+			.cmd_length = 1,
+			.addr_length = 3,
+			.rx_dummy = 8,
+		},
+	},
+	[MSPI_IO_MODE_QUAD_1_4_4] = {
+		.id = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_CMD_READ_ID,
+			.cmd_length = 1,
+			.force_single = true,
+		},
+		.write_en = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_WREN,
+			.cmd_length = 1,
+		},
+		.read = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_4READ,
+			.cmd_length = 1,
+			.addr_length = 3,
+			.rx_dummy = 6,
+		},
+		.status = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_RDSR,
+			.cmd_length = 1,
+			.force_single = true,
+		},
+		.config = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_CMD_RDCR,
+			.cmd_length = 1,
+			.force_single = true,
+		},
+		.page_program = {
+			.dir  = MSPI_TX,
+			.cmd = SPI_NOR_CMD_PP_1_4_4,
+			.cmd_length = 1,
+			.addr_length = 3,
+		},
+		.sector_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_SE,
+			.cmd_length = 1,
+			.addr_length = 3,
+			.force_single = true,
+		},
+		.chip_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_CMD_CE,
+			.cmd_length = 1,
+		},
+		.sfdp = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_CMD_READ_SFDP,
+			.cmd_length = 1,
+			.addr_length = 3,
+			.rx_dummy = 8,
+			.force_single = true,
+		},
+	},
+	[MSPI_IO_MODE_OCTAL] = {
+		.id = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_OCMD_READ_ID,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 4
+		},
+		.write_en = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_WREN,
+			.cmd_length = 2,
+		},
+		.read = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_OCMD_RD,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 20,
+		},
+		.status = {
+			.dir = MSPI_RX,
+			.cmd = SPI_NOR_OCMD_RDSR,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 4,
+		},
+		.page_program = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_PAGE_PRG,
+			.cmd_length = 2,
+			.addr_length = 4,
+		},
+		.sector_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_SE,
+			.cmd_length = 2,
+			.addr_length = 4,
+		},
+		.chip_erase = {
+			.dir = MSPI_TX,
+			.cmd = SPI_NOR_OCMD_CE,
+			.cmd_length = 2,
+		},
+		.sfdp = {
+			.dir = MSPI_RX,
+			.cmd = JESD216_OCMD_READ_SFDP,
+			.cmd_length = 2,
+			.addr_length = 4,
+			.rx_dummy = 20,
+		},
+	},
+};
+
+void flash_mspi_command_set(const struct device *dev, const struct flash_mspi_nor_cmd *cmd);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__FLASH_MSPI_NOR_H__*/
diff --git a/drivers/flash/flash_mspi_nor_quirks.h b/drivers/flash/flash_mspi_nor_quirks.h
new file mode 100644
index 00000000000..ba840bd7926
--- /dev/null
+++ b/drivers/flash/flash_mspi_nor_quirks.h
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __FLASH_MSPI_NOR_QUIRKS_H__
+#define __FLASH_MSPI_NOR_QUIRKS_H__
+
+/* Flash chip specific quirks */
+struct flash_mspi_nor_quirks {
+	/* Called after switching to default IO mode. */
+	int (*post_switch_mode)(const struct device *dev);
+};
+
+/* Extend this macro when adding new flash chip with quirks */
+#define FLASH_MSPI_QUIRKS_GET(node)						\
+	COND_CODE_1(DT_NODE_HAS_COMPAT_STATUS(node, mxicy_mx25r, okay),		\
+		    (&flash_quirks_mxicy_mx25r),				\
+	(COND_CODE_1(DT_NODE_HAS_COMPAT_STATUS(node, mxicy_mx25u, okay),	\
+		    (&flash_quirks_mxicy_mx25u),				\
+		    (NULL))))
+
+#if DT_HAS_COMPAT_STATUS_OKAY(mxicy_mx25r)
+
+#define MXICY_MX25R_LH_MASK BIT(1)
+#define MXICY_MX25R_QE_MASK BIT(6)
+#define MXICY_MX25R_REGS_LEN 3
+
+static uint8_t mxicy_mx25r_hp_payload[MXICY_MX25R_REGS_LEN] = {
+	MXICY_MX25R_QE_MASK, 0x0, MXICY_MX25R_LH_MASK
+};
+
+/* For quad io mode above 8 MHz and single io mode above 33 MHz,
+ * high performance mode needs to be enabled.
+ */
+static inline bool needs_hp(enum mspi_io_mode io_mode, uint32_t freq)
+{
+	if ((io_mode == MSPI_IO_MODE_QUAD_1_1_4) || (io_mode == MSPI_IO_MODE_QUAD_1_4_4)) {
+		if (freq > MHZ(8)) {
+			return true;
+		}
+	} else if (io_mode == MSPI_IO_MODE_SINGLE) {
+		if (freq > MHZ(33)) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+static inline int mxicy_mx25r_post_switch_mode(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	enum mspi_io_mode io_mode = dev_config->mspi_nor_cfg.io_mode;
+	uint32_t freq = dev_config->mspi_nor_cfg.freq;
+	int rc;
+	uint8_t status;
+	uint8_t config[MXICY_MX25R_REGS_LEN - 1];
+
+	if (!needs_hp(io_mode, freq)) {
+		return 0;
+	}
+
+	/* Wait for previous write to finish */
+	do {
+		flash_mspi_command_set(dev, &dev_config->jedec_cmds->status);
+		dev_data->packet.data_buf  = &status;
+		dev_data->packet.num_bytes = sizeof(status);
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
+		if (rc < 0) {
+			return rc;
+		}
+	} while (status & SPI_NOR_WIP_BIT);
+
+	/* Write enable */
+	flash_mspi_command_set(dev, &commands[MSPI_IO_MODE_SINGLE].write_en);
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		return rc;
+	}
+
+	/* Write status and config registers */
+	const struct flash_mspi_nor_cmd cmd_status = {
+		.dir = MSPI_TX,
+		.cmd = SPI_NOR_CMD_WRSR,
+		.cmd_length = 1,
+	};
+
+	flash_mspi_command_set(dev, &cmd_status);
+	dev_data->packet.data_buf  = mxicy_mx25r_hp_payload;
+	dev_data->packet.num_bytes = sizeof(mxicy_mx25r_hp_payload);
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
+	if (rc < 0) {
+		return rc;
+	}
+
+	/* Wait for write to end and verify status register */
+	do {
+		flash_mspi_command_set(dev, &dev_config->jedec_cmds->status);
+		dev_data->packet.data_buf  = &status;
+		dev_data->packet.num_bytes = sizeof(status);
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
+		if (rc < 0) {
+			return rc;
+		}
+	} while (status & SPI_NOR_WIP_BIT);
+
+	if (status != mxicy_mx25r_hp_payload[0]) {
+		return -EIO;
+	}
+
+	/* Verify configuration registers */
+	flash_mspi_command_set(dev, &dev_config->jedec_cmds->config);
+	dev_data->packet.data_buf  = config;
+	dev_data->packet.num_bytes = sizeof(config);
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
+	if (rc < 0) {
+		return rc;
+	}
+
+	for (uint8_t i = 0; i < MXICY_MX25R_REGS_LEN - 1; i++) {
+		if (config[i] != mxicy_mx25r_hp_payload[i + 1]) {
+			return -EIO;
+		}
+	}
+
+	return 0;
+}
+
+struct flash_mspi_nor_quirks flash_quirks_mxicy_mx25r = {
+	.post_switch_mode = mxicy_mx25r_post_switch_mode,
+};
+
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(mxicy_mx25r) */
+
+#if DT_HAS_COMPAT_STATUS_OKAY(mxicy_mx25u)
+
+#define MXICY_MX25R_OE_MASK BIT(0)
+
+static uint8_t mxicy_mx25u_oe_payload = MXICY_MX25R_OE_MASK;
+
+static inline int mxicy_mx25u_post_switch_mode(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	enum mspi_io_mode io_mode = dev_config->mspi_nor_cfg.io_mode;
+	int rc;
+
+	if (io_mode != MSPI_IO_MODE_OCTAL) {
+		return 0;
+	}
+
+	/* Write enable */
+	flash_mspi_command_set(dev, &commands[MSPI_IO_MODE_SINGLE].write_en);
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		return rc;
+	}
+
+	/* Write config register 2 */
+	const struct flash_mspi_nor_cmd cmd_status = {
+		.dir = MSPI_TX,
+		.cmd = SPI_NOR_CMD_WR_CFGREG2,
+		.cmd_length = 1,
+		.addr_length = 4,
+	};
+
+	flash_mspi_command_set(dev, &cmd_status);
+	dev_data->packet.data_buf  = &mxicy_mx25u_oe_payload;
+	dev_data->packet.num_bytes = sizeof(mxicy_mx25u_oe_payload);
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id, &dev_data->xfer);
+	return rc;
+}
+
+struct flash_mspi_nor_quirks flash_quirks_mxicy_mx25u = {
+	.post_switch_mode = mxicy_mx25u_post_switch_mode,
+};
+
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(mxicy_mx25u) */
+
+#endif /*__FLASH_MSPI_NOR_QUIRKS_H__*/

From a34c1df08b232dd5fd8e3d3196c61d586a2fb989 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Fri, 4 Apr 2025 10:24:06 +0100
Subject: [PATCH 2899/2913] Revert "[nrf noup] boards: nordic: nrf7002dk: Bring
 back NS variants"

This reverts commit 9ec6585407fc97aedc799f500c2f6f9ae621b94b.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 1bef56ef3b565f10b087e2084bbf5a8dc5cf7655)
---
 boards/nordic/nrf7002dk/CMakeLists.txt        | 11 ---
 boards/nordic/nrf7002dk/Kconfig               |  6 +-
 boards/nordic/nrf7002dk/Kconfig.defconfig     | 76 -------------------
 boards/nordic/nrf7002dk/Kconfig.nrf7002dk     |  4 +-
 boards/nordic/nrf7002dk/board.cmake           | 18 +----
 boards/nordic/nrf7002dk/board.yml             |  4 -
 .../nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts   | 39 ----------
 .../nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml  | 19 -----
 ...7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig | 27 -------
 .../nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts | 40 ----------
 .../nrf7002dk_nrf5340_cpuapp_ns.yaml          | 19 -----
 .../nrf7002dk_nrf5340_cpuapp_ns_defconfig     | 26 -------
 12 files changed, 4 insertions(+), 285 deletions(-)
 delete mode 100644 boards/nordic/nrf7002dk/CMakeLists.txt
 delete mode 100644 boards/nordic/nrf7002dk/Kconfig.defconfig
 delete mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
 delete mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml
 delete mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig
 delete mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
 delete mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml
 delete mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig

diff --git a/boards/nordic/nrf7002dk/CMakeLists.txt b/boards/nordic/nrf7002dk/CMakeLists.txt
deleted file mode 100644
index db20255712b..00000000000
--- a/boards/nordic/nrf7002dk/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if((CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR
-    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
-    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 OR
-    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS) AND
-   CONFIG_BOARD_ENABLE_CPUNET)
-  zephyr_library()
-  zephyr_library_sources(nrf5340_cpunet_reset.c)
-endif()
diff --git a/boards/nordic/nrf7002dk/Kconfig b/boards/nordic/nrf7002dk/Kconfig
index bf5b239c98c..e599cbcce07 100644
--- a/boards/nordic/nrf7002dk/Kconfig
+++ b/boards/nordic/nrf7002dk/Kconfig
@@ -10,9 +10,7 @@ config MBOX_NRFX_IPC
 	default MBOX
 
 if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
 
 config BT_HCI_IPC
 	default y if BT
@@ -40,9 +38,7 @@ config BT_ECC
 config DOMAIN_CPUAPP_BOARD
 	string
 	default "nrf7002dk/nrf5340/cpuapp" if BOARD_NRF7002DK_NRF5340_CPUAPP
-	default "nrf7002dk/nrf5340/cpuapp/ns" if BOARD_NRF7002DK_NRF5340_CPUAPP_NS
 	default "nrf7002dk/nrf5340/cpuapp/nrf7001" if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
-	default "nrf7002dk/nrf5340/cpuapp/nrf7001/ns" if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
 	help
 	  The board which will be used for CPUAPP domain when creating a multi
 	  image application where one or more images should be located on
diff --git a/boards/nordic/nrf7002dk/Kconfig.defconfig b/boards/nordic/nrf7002dk/Kconfig.defconfig
deleted file mode 100644
index a6357ae50b2..00000000000
--- a/boards/nordic/nrf7002dk/Kconfig.defconfig
+++ /dev/null
@@ -1,76 +0,0 @@
-# nRF5340 DK nRF5340 board configuration
-
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-# By default, if we build for a Non-Secure version of the board,
-# force building with TF-M as the Secure Execution Environment.
-config BUILD_WITH_TFM
-	default y if BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-if BUILD_WITH_TFM
-
-# By default, if we build with TF-M, instruct build system to
-# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
-config TFM_FLASH_MERGED_BINARY
-	bool
-	default y
-
-endif # BUILD_WITH_TFM
-
-# Code Partition:
-#
-# For the secure version of the board the firmware is linked at the beginning
-# of the flash, or into the code-partition defined in DT if it is intended to
-# be loaded by MCUboot. If the secure firmware is to be combined with a non-
-# secure image (TRUSTED_EXECUTION_SECURE=y), the secure FW image shall always
-# be restricted to the size of its code partition.
-#
-# For the non-secure version of the board, the firmware
-# must be linked into the code-partition (non-secure) defined in DT, regardless.
-# Apply this configuration below by setting the Kconfig symbols used by
-# the linker according to the information extracted from DT partitions.
-
-# SRAM Partition:
-#
-# If the secure firmware is to be combined with a non-secure image
-# (TRUSTED_EXECUTION_SECURE=y), the secure FW image SRAM shall always
-# be restricted to the secure image SRAM partition (sram-secure-partition).
-# Otherwise (if TRUSTED_EXECUTION_SECURE is not set) the whole zephyr,sram
-# may be used by the image.
-#
-# For the non-secure version of the board, the firmware image SRAM is
-# always restricted to the allocated non-secure SRAM partition.
-#
-# Workaround for not being able to have commas in macro arguments
-DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
-DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
-
-if (BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001) && \
-	TRUSTED_EXECUTION_SECURE
-
-config FLASH_LOAD_SIZE
-	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-config SRAM_SIZE
-	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM_PARTITION),0,K)
-
-endif
-
-if BOARD_NRF7002DK_NRF5340_CPUAPP_NS || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
-
-config FLASH_LOAD_OFFSET
-	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-config FLASH_LOAD_SIZE
-	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-endif
-
-endif
diff --git a/boards/nordic/nrf7002dk/Kconfig.nrf7002dk b/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
index 91f52ee6f08..61b9e818f36 100644
--- a/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
+++ b/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
@@ -4,6 +4,4 @@
 config BOARD_NRF7002DK
 	select SOC_NRF5340_CPUNET_QKAA if BOARD_NRF7002DK_NRF5340_CPUNET
 	select SOC_NRF5340_CPUAPP_QKAA if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-					  BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
-					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
-					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
diff --git a/boards/nordic/nrf7002dk/board.cmake b/boards/nordic/nrf7002dk/board.cmake
index c4f86afedf7..77b78fdd1a7 100644
--- a/boards/nordic/nrf7002dk/board.cmake
+++ b/boards/nordic/nrf7002dk/board.cmake
@@ -1,24 +1,10 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
-   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS)
-  set(TFM_PUBLIC_KEY_FORMAT "full")
-endif()
-
-if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR
-   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
-   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 OR
-   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS)
+if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001)
   board_runner_args(nrfutil "--ext-mem-config-file=${BOARD_DIR}/nrf7002dk_spi_nrfutil_config.json")
   board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
-endif()
-
-if(CONFIG_TFM_FLASH_MERGED_BINARY)
-  set_property(TARGET runners_yaml_props_target PROPERTY hex_file "${CMAKE_BINARY_DIR}/zephyr/tfm_merged.hex")
-endif()
-
-if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
+elseif(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
diff --git a/boards/nordic/nrf7002dk/board.yml b/boards/nordic/nrf7002dk/board.yml
index 39db5dcfa3a..4f41341e442 100644
--- a/boards/nordic/nrf7002dk/board.yml
+++ b/boards/nordic/nrf7002dk/board.yml
@@ -5,9 +5,5 @@ board:
   socs:
     - name: nrf5340
       variants:
-        - name: ns
-          cpucluster: cpuapp
         - name: nrf7001
           cpucluster: cpuapp
-          variants:
-            - name: ns
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
deleted file mode 100644
index 5ff28accf3f..00000000000
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-#include <nordic/nrf5340_cpuappns_qkaa.dtsi>
-#include "nrf5340_cpuapp_common.dtsi"
-
-/ {
-	model = "Nordic NRF5340 DK NRF5340 Application";
-	compatible = "nordic,nrf5340-dk-nrf5340-cpuapp";
-
-	chosen {
-		zephyr,sram = &sram0_ns;
-		zephyr,flash = &flash0;
-		zephyr,code-partition = &slot0_ns_partition;
-		zephyr,entropy = &psa_rng;
-		zephyr,wifi = &wlan0;
-	};
-
-	psa_rng: psa-rng {
-		compatible = "zephyr,psa-crypto-rng";
-		status = "okay";
-	};
-};
-
-&qspi {
-	nrf70: nrf7001@1 {
-		compatible = "nordic,nrf7001-qspi";
-		status = "okay";
-		reg = <1>;
-		qspi-frequency = <24000000>;
-		qspi-quad-mode;
-
-		#include "nrf70_common.dtsi"
-	};
-};
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml
deleted file mode 100644
index 16575969126..00000000000
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-identifier: nrf7002dk/nrf5340/cpuapp/nrf7001/ns
-name: NRF7002-DK-NRF7001-NRF5340-application-MCU-Non-Secure
-type: mcu
-arch: arm
-toolchain:
-  - gnuarmemb
-  - xtools
-  - zephyr
-ram: 192
-flash: 192
-supported:
-  - gpio
-  - i2c
-  - pwm
-  - watchdog
-  - usbd
-  - usb_device
-  - netif:openthread
-vendor: nordic
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig
deleted file mode 100644
index c536aae767d..00000000000
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-# Enable MPU
-CONFIG_ARM_MPU=y
-
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
-# Enable TrustZone-M
-CONFIG_ARM_TRUSTZONE_M=y
-
-# This Board implies building Non-Secure firmware
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
-
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PINCTRL
-CONFIG_PINCTRL=y
-
-# Enable uart driver
-CONFIG_SERIAL=y
-
-# enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
deleted file mode 100644
index 0deb8ccc1bf..00000000000
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-#include <nordic/nrf5340_cpuappns_qkaa.dtsi>
-#include "nrf5340_cpuapp_common.dtsi"
-
-/ {
-	model = "Nordic NRF5340 DK NRF5340 Application";
-	compatible = "nordic,nrf5340-dk-nrf5340-cpuapp";
-
-	chosen {
-		zephyr,sram = &sram0_ns_app;
-		zephyr,flash = &flash0;
-		zephyr,code-partition = &slot0_ns_partition;
-		zephyr,entropy = &psa_rng;
-		zephyr,wifi = &wlan0;
-	};
-
-	psa_rng: psa-rng {
-		compatible = "zephyr,psa-crypto-rng";
-		status = "okay";
-	};
-};
-
-&qspi {
-	nrf70: nrf7002@1 {
-		compatible = "nordic,nrf7002-qspi";
-		status = "okay";
-		reg = <1>;
-		qspi-frequency = <24000000>;
-		qspi-quad-mode;
-
-		#include "nrf70_common.dtsi"
-		#include "nrf70_common_5g.dtsi"
-	};
-};
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml
deleted file mode 100644
index ea43785b455..00000000000
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-identifier: nrf7002dk/nrf5340/cpuapp/ns
-name: NRF7002-DK-NRF5340-application-MCU-Non-Secure
-type: mcu
-arch: arm
-toolchain:
-  - gnuarmemb
-  - xtools
-  - zephyr
-ram: 192
-flash: 192
-supported:
-  - gpio
-  - i2c
-  - pwm
-  - watchdog
-  - usbd
-  - usb_device
-  - netif:openthread
-vendor: nordic
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig
deleted file mode 100644
index c5b2eaadc16..00000000000
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-# Enable MPU
-CONFIG_ARM_MPU=y
-
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
-# Enable TrustZone-M
-CONFIG_ARM_TRUSTZONE_M=y
-
-# This Board implies building Non-Secure firmware
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
-
-# enable GPIO
-CONFIG_GPIO=y
-
-# enable PINCTRL
-CONFIG_PINCTRL=y
-
-# Enable uart driver
-CONFIG_SERIAL=y
-
-# enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y

From cd4604d03e5a48418fd748d6aef2aa4fd0e3b107 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Fri, 4 Apr 2025 10:24:19 +0100
Subject: [PATCH 2900/2913] Revert "[nrf fromlist] boards: nordic: thingy53:
 Add QSPI nrfutil config"

This reverts commit 988e2e79056bc1c491e291ff1305ac6bc34d6216.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 9d0bbbc698bcad55970bdbf3ee8363d34bcf5241)
---
 boards/nordic/thingy53/board.cmake            |  1 -
 .../thingy53_qspi_nrfutil_config.json         | 22 -------------------
 2 files changed, 23 deletions(-)
 delete mode 100644 boards/nordic/thingy53/thingy53_qspi_nrfutil_config.json

diff --git a/boards/nordic/thingy53/board.cmake b/boards/nordic/thingy53/board.cmake
index f03b026d9fb..916d982b65c 100644
--- a/boards/nordic/thingy53/board.cmake
+++ b/boards/nordic/thingy53/board.cmake
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(CONFIG_BOARD_THINGY53_NRF5340_CPUAPP OR CONFIG_BOARD_THINGY53_NRF5340_CPUAPP_NS)
-  board_runner_args(nrfutil "--ext-mem-config-file=${BOARD_DIR}/thingy53_qspi_nrfutil_config.json")
   board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
 elseif(CONFIG_BOARD_THINGY53_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
diff --git a/boards/nordic/thingy53/thingy53_qspi_nrfutil_config.json b/boards/nordic/thingy53/thingy53_qspi_nrfutil_config.json
deleted file mode 100644
index 8138801cd91..00000000000
--- a/boards/nordic/thingy53/thingy53_qspi_nrfutil_config.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "firmware_config": {
-    "peripheral": "QSPI"
-  },
-  "pins": {
-    "sck": 17,
-    "csn": 18,
-    "io0": 13,
-    "io1": 14,
-    "io2": 15,
-    "io3": 16
-  },
-  "flash_size": 67108864,
-  "sck_frequency": 8000000,
-  "address_mode": "MODE24BIT",
-  "readoc": "READ2IO",
-  "writeoc": "PP",
-  "pp_size": "PPSIZE256",
-  "sck_delay": 128,
-  "rx_delay": 2,
-  "page_size": 4096
-}

From e5f630afccbc424fbe76ef0e2a025727883ba3d5 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Fri, 4 Apr 2025 10:24:21 +0100
Subject: [PATCH 2901/2913] Revert "[nrf fromlist] boards: nordic: nrf7002dk:
 Add SPI nrfutil config"

This reverts commit bf353ee20110e87943cba540940140c2dbf38382.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 64182b035f8d9659579cd3e7674490b24968db71)
---
 boards/nordic/nrf7002dk/board.cmake             |  1 -
 .../nrf7002dk/nrf7002dk_spi_nrfutil_config.json | 17 -----------------
 2 files changed, 18 deletions(-)
 delete mode 100644 boards/nordic/nrf7002dk/nrf7002dk_spi_nrfutil_config.json

diff --git a/boards/nordic/nrf7002dk/board.cmake b/boards/nordic/nrf7002dk/board.cmake
index 77b78fdd1a7..56982511034 100644
--- a/boards/nordic/nrf7002dk/board.cmake
+++ b/boards/nordic/nrf7002dk/board.cmake
@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001)
-  board_runner_args(nrfutil "--ext-mem-config-file=${BOARD_DIR}/nrf7002dk_spi_nrfutil_config.json")
   board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
 elseif(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_spi_nrfutil_config.json b/boards/nordic/nrf7002dk/nrf7002dk_spi_nrfutil_config.json
deleted file mode 100644
index af668581877..00000000000
--- a/boards/nordic/nrf7002dk/nrf7002dk_spi_nrfutil_config.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "firmware_config": {
-    "peripheral": "SPIM0"
-  },
-  "pins": {
-    "sck": 8,
-    "csn": 11,
-    "io0": 9,
-    "io1": 10,
-    "io2": 4294967295,
-    "io3": 4294967295
-  },
-  "flash_size": 8388608,
-  "page_size": 4096,
-  "sck_frequency": 8000000,
-  "address_mode": "MODE24BIT"
-}

From 17f84aa0718e34c1fe83da6c35ec168ac317dc67 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Wed, 12 Mar 2025 11:40:29 +0000
Subject: [PATCH 2902/2913] [nrf fromlist] boards: nordic: thingy53: Add QSPI
 nrfutil config

Adds a configuration file which is used with nrfutil to allow
programming QSPI on the device

Upstream PR #: 86985

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 7345e5176943d75ab3b7a4b73cc3bb9a84f7f499)
---
 boards/nordic/thingy53/board.cmake            |  1 +
 .../support/thingy53_qspi_nrfutil_config.json | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 boards/nordic/thingy53/support/thingy53_qspi_nrfutil_config.json

diff --git a/boards/nordic/thingy53/board.cmake b/boards/nordic/thingy53/board.cmake
index 916d982b65c..6f14014a0c9 100644
--- a/boards/nordic/thingy53/board.cmake
+++ b/boards/nordic/thingy53/board.cmake
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(CONFIG_BOARD_THINGY53_NRF5340_CPUAPP OR CONFIG_BOARD_THINGY53_NRF5340_CPUAPP_NS)
+  board_runner_args(nrfutil "--ext-mem-config-file=${BOARD_DIR}/support/thingy53_qspi_nrfutil_config.json")
   board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
 elseif(CONFIG_BOARD_THINGY53_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
diff --git a/boards/nordic/thingy53/support/thingy53_qspi_nrfutil_config.json b/boards/nordic/thingy53/support/thingy53_qspi_nrfutil_config.json
new file mode 100644
index 00000000000..8138801cd91
--- /dev/null
+++ b/boards/nordic/thingy53/support/thingy53_qspi_nrfutil_config.json
@@ -0,0 +1,22 @@
+{
+  "firmware_config": {
+    "peripheral": "QSPI"
+  },
+  "pins": {
+    "sck": 17,
+    "csn": 18,
+    "io0": 13,
+    "io1": 14,
+    "io2": 15,
+    "io3": 16
+  },
+  "flash_size": 67108864,
+  "sck_frequency": 8000000,
+  "address_mode": "MODE24BIT",
+  "readoc": "READ2IO",
+  "writeoc": "PP",
+  "pp_size": "PPSIZE256",
+  "sck_delay": 128,
+  "rx_delay": 2,
+  "page_size": 4096
+}

From b4abd22e24644ea698650c37724263aa9da6442c Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Mon, 31 Mar 2025 11:15:18 +0100
Subject: [PATCH 2903/2913] [nrf fromlist] boards: nordic: nrf7002dk: Add SPI
 nrfutil config

Adds a configuration file which is used with nrfutil to allow
programming the SPI flash on the device

Upstream PR #: 86985

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit cd38823922ec966f7b4d87716f8a7ae0f1d550c4)
---
 boards/nordic/nrf7002dk/board.cmake             |  1 +
 .../support/nrf7002dk_spi_nrfutil_config.json   | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 boards/nordic/nrf7002dk/support/nrf7002dk_spi_nrfutil_config.json

diff --git a/boards/nordic/nrf7002dk/board.cmake b/boards/nordic/nrf7002dk/board.cmake
index 56982511034..f85bbc86f48 100644
--- a/boards/nordic/nrf7002dk/board.cmake
+++ b/boards/nordic/nrf7002dk/board.cmake
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001)
+  board_runner_args(nrfutil "--ext-mem-config-file=${BOARD_DIR}/support/nrf7002dk_spi_nrfutil_config.json")
   board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
 elseif(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
diff --git a/boards/nordic/nrf7002dk/support/nrf7002dk_spi_nrfutil_config.json b/boards/nordic/nrf7002dk/support/nrf7002dk_spi_nrfutil_config.json
new file mode 100644
index 00000000000..af668581877
--- /dev/null
+++ b/boards/nordic/nrf7002dk/support/nrf7002dk_spi_nrfutil_config.json
@@ -0,0 +1,17 @@
+{
+  "firmware_config": {
+    "peripheral": "SPIM0"
+  },
+  "pins": {
+    "sck": 8,
+    "csn": 11,
+    "io0": 9,
+    "io1": 10,
+    "io2": 4294967295,
+    "io3": 4294967295
+  },
+  "flash_size": 8388608,
+  "page_size": 4096,
+  "sck_frequency": 8000000,
+  "address_mode": "MODE24BIT"
+}

From f71e15c509cdc93086a82cfb59fc3e04875a955a Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Fri, 4 Apr 2025 10:03:52 +0100
Subject: [PATCH 2904/2913] [nrf fromlist] boards: nordic: nrf5340dk: Add QSPI
 nrfutil config

Adds a configuration file which is used with nrfutil to allow
programming QSPI on the device

Upstream PR #: 86985

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit c8171c0f803e854c33c6ad01bedd42d4556cf823)
---
 boards/nordic/nrf5340dk/board.cmake           |  1 +
 .../nrf5340dk_qspi_nrfutil_config.json        | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 boards/nordic/nrf5340dk/support/nrf5340dk_qspi_nrfutil_config.json

diff --git a/boards/nordic/nrf5340dk/board.cmake b/boards/nordic/nrf5340dk/board.cmake
index 3634697dd77..38eefdc71fc 100644
--- a/boards/nordic/nrf5340dk/board.cmake
+++ b/boards/nordic/nrf5340dk/board.cmake
@@ -5,6 +5,7 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP_NS)
 endif()
 
 if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP_NS)
+  board_runner_args(nrfutil "--ext-mem-config-file=${BOARD_DIR}/support/nrf5340dk_qspi_nrfutil_config.json")
   board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
 endif()
 
diff --git a/boards/nordic/nrf5340dk/support/nrf5340dk_qspi_nrfutil_config.json b/boards/nordic/nrf5340dk/support/nrf5340dk_qspi_nrfutil_config.json
new file mode 100644
index 00000000000..f7a1a4a06bd
--- /dev/null
+++ b/boards/nordic/nrf5340dk/support/nrf5340dk_qspi_nrfutil_config.json
@@ -0,0 +1,22 @@
+{
+  "firmware_config": {
+    "peripheral": "QSPI"
+  },
+  "pins": {
+    "sck": 17,
+    "csn": 18,
+    "io0": 13,
+    "io1": 14,
+    "io2": 15,
+    "io3": 16
+  },
+  "flash_size": 67108864,
+  "sck_frequency": 8000000,
+  "address_mode": "MODE24BIT",
+  "readoc": "READ4IO",
+  "writeoc": "PP4IO",
+  "pp_size": "PPSIZE256",
+  "sck_delay": 128,
+  "rx_delay": 2,
+  "page_size": 4096
+}

From 309ae6d1ab03d7e78c18727800e5322c3a61596e Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Fri, 4 Apr 2025 10:09:05 +0100
Subject: [PATCH 2905/2913] [nrf fromlist] boards: nordic: nrf52840dk: Add QSPI
 nrfutil config

Adds a configuration file which is used with nrfutil to allow
programming QSPI on the device

Upstream PR #: 86985

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 85f6fcdae82523bbfa3b1ce0bb0e21c5f39fc852)
---
 boards/nordic/nrf52840dk/board.cmake          |  4 ++++
 .../nrf52840dk_qspi_nrfutil_config.json       | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 boards/nordic/nrf52840dk/support/nrf52840dk_qspi_nrfutil_config.json

diff --git a/boards/nordic/nrf52840dk/board.cmake b/boards/nordic/nrf52840dk/board.cmake
index 1ebf652634f..a3109800d08 100644
--- a/boards/nordic/nrf52840dk/board.cmake
+++ b/boards/nordic/nrf52840dk/board.cmake
@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
+if(CONFIG_SOC_NRF52840_QIAA)
+  board_runner_args(nrfutil "--ext-mem-config-file=${BOARD_DIR}/support/nrf52840dk_qspi_nrfutil_config.json")
+endif()
+
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
diff --git a/boards/nordic/nrf52840dk/support/nrf52840dk_qspi_nrfutil_config.json b/boards/nordic/nrf52840dk/support/nrf52840dk_qspi_nrfutil_config.json
new file mode 100644
index 00000000000..1918a1e5923
--- /dev/null
+++ b/boards/nordic/nrf52840dk/support/nrf52840dk_qspi_nrfutil_config.json
@@ -0,0 +1,22 @@
+{
+  "firmware_config": {
+    "peripheral": "QSPI"
+  },
+  "pins": {
+    "sck": 19,
+    "csn": 17,
+    "io0": 20,
+    "io1": 21,
+    "io2": 22,
+    "io3": 23
+  },
+  "flash_size": 67108864,
+  "sck_frequency": 8000000,
+  "address_mode": "MODE24BIT",
+  "readoc": "READ4IO",
+  "writeoc": "PP4IO",
+  "pp_size": "PPSIZE256",
+  "sck_delay": 128,
+  "rx_delay": 2,
+  "page_size": 4096
+}

From 2e042b1767fef320facd68a2563197914f9b945b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 8 Jan 2025 11:15:56 +0100
Subject: [PATCH 2906/2913] [nrf noup] boards: nordic: nrf7002dk: Bring back NS
 variants
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Non-secure variants for nRF7002 DK were removed from upstream
in commit 10d49736cffa14d3798e615e70d58b3be8ee2cfc. Revert these
changes downstream, so that the NS variants are still available.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit c30f4cdbb6219d14c0227748e8361292617354df)
---
 boards/nordic/nrf7002dk/CMakeLists.txt        | 11 +++
 boards/nordic/nrf7002dk/Kconfig               |  6 +-
 boards/nordic/nrf7002dk/Kconfig.defconfig     | 76 +++++++++++++++++++
 boards/nordic/nrf7002dk/Kconfig.nrf7002dk     |  4 +-
 boards/nordic/nrf7002dk/board.cmake           | 18 ++++-
 boards/nordic/nrf7002dk/board.yml             |  4 +
 .../nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts   | 39 ++++++++++
 .../nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml  | 19 +++++
 ...7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig | 27 +++++++
 .../nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts | 40 ++++++++++
 .../nrf7002dk_nrf5340_cpuapp_ns.yaml          | 19 +++++
 .../nrf7002dk_nrf5340_cpuapp_ns_defconfig     | 26 +++++++
 12 files changed, 285 insertions(+), 4 deletions(-)
 create mode 100644 boards/nordic/nrf7002dk/CMakeLists.txt
 create mode 100644 boards/nordic/nrf7002dk/Kconfig.defconfig
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml
 create mode 100644 boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig

diff --git a/boards/nordic/nrf7002dk/CMakeLists.txt b/boards/nordic/nrf7002dk/CMakeLists.txt
new file mode 100644
index 00000000000..db20255712b
--- /dev/null
+++ b/boards/nordic/nrf7002dk/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if((CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR
+    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
+    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 OR
+    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS) AND
+   CONFIG_BOARD_ENABLE_CPUNET)
+  zephyr_library()
+  zephyr_library_sources(nrf5340_cpunet_reset.c)
+endif()
diff --git a/boards/nordic/nrf7002dk/Kconfig b/boards/nordic/nrf7002dk/Kconfig
index e599cbcce07..bf5b239c98c 100644
--- a/boards/nordic/nrf7002dk/Kconfig
+++ b/boards/nordic/nrf7002dk/Kconfig
@@ -10,7 +10,9 @@ config MBOX_NRFX_IPC
 	default MBOX
 
 if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
 
 config BT_HCI_IPC
 	default y if BT
@@ -38,7 +40,9 @@ config BT_ECC
 config DOMAIN_CPUAPP_BOARD
 	string
 	default "nrf7002dk/nrf5340/cpuapp" if BOARD_NRF7002DK_NRF5340_CPUAPP
+	default "nrf7002dk/nrf5340/cpuapp/ns" if BOARD_NRF7002DK_NRF5340_CPUAPP_NS
 	default "nrf7002dk/nrf5340/cpuapp/nrf7001" if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
+	default "nrf7002dk/nrf5340/cpuapp/nrf7001/ns" if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
 	help
 	  The board which will be used for CPUAPP domain when creating a multi
 	  image application where one or more images should be located on
diff --git a/boards/nordic/nrf7002dk/Kconfig.defconfig b/boards/nordic/nrf7002dk/Kconfig.defconfig
new file mode 100644
index 00000000000..a6357ae50b2
--- /dev/null
+++ b/boards/nordic/nrf7002dk/Kconfig.defconfig
@@ -0,0 +1,76 @@
+# nRF5340 DK nRF5340 board configuration
+
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+# By default, if we build for a Non-Secure version of the board,
+# force building with TF-M as the Secure Execution Environment.
+config BUILD_WITH_TFM
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+if BUILD_WITH_TFM
+
+# By default, if we build with TF-M, instruct build system to
+# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
+config TFM_FLASH_MERGED_BINARY
+	bool
+	default y
+
+endif # BUILD_WITH_TFM
+
+# Code Partition:
+#
+# For the secure version of the board the firmware is linked at the beginning
+# of the flash, or into the code-partition defined in DT if it is intended to
+# be loaded by MCUboot. If the secure firmware is to be combined with a non-
+# secure image (TRUSTED_EXECUTION_SECURE=y), the secure FW image shall always
+# be restricted to the size of its code partition.
+#
+# For the non-secure version of the board, the firmware
+# must be linked into the code-partition (non-secure) defined in DT, regardless.
+# Apply this configuration below by setting the Kconfig symbols used by
+# the linker according to the information extracted from DT partitions.
+
+# SRAM Partition:
+#
+# If the secure firmware is to be combined with a non-secure image
+# (TRUSTED_EXECUTION_SECURE=y), the secure FW image SRAM shall always
+# be restricted to the secure image SRAM partition (sram-secure-partition).
+# Otherwise (if TRUSTED_EXECUTION_SECURE is not set) the whole zephyr,sram
+# may be used by the image.
+#
+# For the non-secure version of the board, the firmware image SRAM is
+# always restricted to the allocated non-secure SRAM partition.
+#
+# Workaround for not being able to have commas in macro arguments
+DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
+DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
+
+if (BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001) && \
+	TRUSTED_EXECUTION_SECURE
+
+config FLASH_LOAD_SIZE
+	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+config SRAM_SIZE
+	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM_PARTITION),0,K)
+
+endif
+
+if BOARD_NRF7002DK_NRF5340_CPUAPP_NS || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+config FLASH_LOAD_OFFSET
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+config FLASH_LOAD_SIZE
+	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+endif
+
+endif
diff --git a/boards/nordic/nrf7002dk/Kconfig.nrf7002dk b/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
index 61b9e818f36..91f52ee6f08 100644
--- a/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
+++ b/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
@@ -4,4 +4,6 @@
 config BOARD_NRF7002DK
 	select SOC_NRF5340_CPUNET_QKAA if BOARD_NRF7002DK_NRF5340_CPUNET
 	select SOC_NRF5340_CPUAPP_QKAA if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
+					  BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
diff --git a/boards/nordic/nrf7002dk/board.cmake b/boards/nordic/nrf7002dk/board.cmake
index f85bbc86f48..11a27910eeb 100644
--- a/boards/nordic/nrf7002dk/board.cmake
+++ b/boards/nordic/nrf7002dk/board.cmake
@@ -1,10 +1,24 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001)
+if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS)
+  set(TFM_PUBLIC_KEY_FORMAT "full")
+endif()
+
+if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS)
   board_runner_args(nrfutil "--ext-mem-config-file=${BOARD_DIR}/support/nrf7002dk_spi_nrfutil_config.json")
   board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
-elseif(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
+endif()
+
+if(CONFIG_TFM_FLASH_MERGED_BINARY)
+  set_property(TARGET runners_yaml_props_target PROPERTY hex_file "${CMAKE_BINARY_DIR}/zephyr/tfm_merged.hex")
+endif()
+
+if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
diff --git a/boards/nordic/nrf7002dk/board.yml b/boards/nordic/nrf7002dk/board.yml
index 4f41341e442..39db5dcfa3a 100644
--- a/boards/nordic/nrf7002dk/board.yml
+++ b/boards/nordic/nrf7002dk/board.yml
@@ -5,5 +5,9 @@ board:
   socs:
     - name: nrf5340
       variants:
+        - name: ns
+          cpucluster: cpuapp
         - name: nrf7001
           cpucluster: cpuapp
+          variants:
+            - name: ns
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
new file mode 100644
index 00000000000..5ff28accf3f
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf5340_cpuappns_qkaa.dtsi>
+#include "nrf5340_cpuapp_common.dtsi"
+
+/ {
+	model = "Nordic NRF5340 DK NRF5340 Application";
+	compatible = "nordic,nrf5340-dk-nrf5340-cpuapp";
+
+	chosen {
+		zephyr,sram = &sram0_ns;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_ns_partition;
+		zephyr,entropy = &psa_rng;
+		zephyr,wifi = &wlan0;
+	};
+
+	psa_rng: psa-rng {
+		compatible = "zephyr,psa-crypto-rng";
+		status = "okay";
+	};
+};
+
+&qspi {
+	nrf70: nrf7001@1 {
+		compatible = "nordic,nrf7001-qspi";
+		status = "okay";
+		reg = <1>;
+		qspi-frequency = <24000000>;
+		qspi-quad-mode;
+
+		#include "nrf70_common.dtsi"
+	};
+};
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml
new file mode 100644
index 00000000000..16575969126
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml
@@ -0,0 +1,19 @@
+identifier: nrf7002dk/nrf5340/cpuapp/nrf7001/ns
+name: NRF7002-DK-NRF7001-NRF5340-application-MCU-Non-Secure
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+ram: 192
+flash: 192
+supported:
+  - gpio
+  - i2c
+  - pwm
+  - watchdog
+  - usbd
+  - usb_device
+  - netif:openthread
+vendor: nordic
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig
new file mode 100644
index 00000000000..c536aae767d
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig
@@ -0,0 +1,27 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Enable TrustZone-M
+CONFIG_ARM_TRUSTZONE_M=y
+
+# This Board implies building Non-Secure firmware
+CONFIG_TRUSTED_EXECUTION_NONSECURE=y
+
+# enable GPIO
+CONFIG_GPIO=y
+
+# enable PINCTRL
+CONFIG_PINCTRL=y
+
+# Enable uart driver
+CONFIG_SERIAL=y
+
+# enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
new file mode 100644
index 00000000000..0deb8ccc1bf
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf5340_cpuappns_qkaa.dtsi>
+#include "nrf5340_cpuapp_common.dtsi"
+
+/ {
+	model = "Nordic NRF5340 DK NRF5340 Application";
+	compatible = "nordic,nrf5340-dk-nrf5340-cpuapp";
+
+	chosen {
+		zephyr,sram = &sram0_ns_app;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_ns_partition;
+		zephyr,entropy = &psa_rng;
+		zephyr,wifi = &wlan0;
+	};
+
+	psa_rng: psa-rng {
+		compatible = "zephyr,psa-crypto-rng";
+		status = "okay";
+	};
+};
+
+&qspi {
+	nrf70: nrf7002@1 {
+		compatible = "nordic,nrf7002-qspi";
+		status = "okay";
+		reg = <1>;
+		qspi-frequency = <24000000>;
+		qspi-quad-mode;
+
+		#include "nrf70_common.dtsi"
+		#include "nrf70_common_5g.dtsi"
+	};
+};
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml
new file mode 100644
index 00000000000..ea43785b455
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml
@@ -0,0 +1,19 @@
+identifier: nrf7002dk/nrf5340/cpuapp/ns
+name: NRF7002-DK-NRF5340-application-MCU-Non-Secure
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+ram: 192
+flash: 192
+supported:
+  - gpio
+  - i2c
+  - pwm
+  - watchdog
+  - usbd
+  - usb_device
+  - netif:openthread
+vendor: nordic
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig
new file mode 100644
index 00000000000..c5b2eaadc16
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Enable TrustZone-M
+CONFIG_ARM_TRUSTZONE_M=y
+
+# This Board implies building Non-Secure firmware
+CONFIG_TRUSTED_EXECUTION_NONSECURE=y
+
+# enable GPIO
+CONFIG_GPIO=y
+
+# enable PINCTRL
+CONFIG_PINCTRL=y
+
+# Enable uart driver
+CONFIG_SERIAL=y
+
+# enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y

From b48b727102d1267b52441b491d860a9fe8973b85 Mon Sep 17 00:00:00 2001
From: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
Date: Fri, 28 Mar 2025 10:42:13 +0100
Subject: [PATCH 2907/2913] [nrf fromtree] Revert "boards: nordic: Fix
 cpuapp_ram0x_region reg value."

This reverts commit 1e69738bf2841a0f1451237bbb8d7a76d297f7b4.

Ref: NCSDK-32650

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>

This reverts commit 1e69738bf2841a0f1451237bbb8d7a76d297f7b4
(cherry picked from commit 062e6e19c028e524c952fec943028f35d8f40e87)
---
 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index 165fa12ba80..8dc6ef757e9 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -27,7 +27,7 @@
 
 		cpuapp_ram0x_region: memory@2f011000 {
 			compatible = "nordic,owned-memory";
-			reg = <0x2f011000 DT_SIZE_K(260)>;
+			reg = <0x2f010000 DT_SIZE_K(260)>;
 			status = "disabled";
 			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
 			#address-cells = <1>;

From 7e1daf0211b902f0aa49c47ec23746b60d750d55 Mon Sep 17 00:00:00 2001
From: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
Date: Fri, 28 Mar 2025 10:42:46 +0100
Subject: [PATCH 2908/2913] [nrf fromtree] Revert "boards: nordic: Rearrange
 ram0x regions."

This reverts commit a53cb7358717f21079197817976b938d37159c85.

Ref: NCSDK-32650

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>

This reverts commit a53cb7358717f21079197817976b938d37159c85.
(cherry picked from commit db34319d012889c8eefa994a1b30188256cebc3c)
---
 .../nrf54h20dk_nrf54h20-memory_map.dtsi       | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index 8dc6ef757e9..f2937402554 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -7,44 +7,44 @@
 
 / {
 	reserved-memory {
-		cpurad_ram0x_region: memory@2f010000 {
+		cpuapp_ram0x_region: memory@2f010000 {
 			compatible = "nordic,owned-memory";
-			reg = <0x2f010000 DT_SIZE_K(4)>;
+			reg = <0x2f010000 DT_SIZE_K(260)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RWS>;
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0x0 0x2f010000 0x1000>;
+			ranges = <0x0 0x2f010000 0x41000>;
 
-			cpusec_cpurad_ipc_shm: memory@0 {
+			cpusec_cpuapp_ipc_shm: memory@0 {
 				reg = <0x0 DT_SIZE_K(2)>;
 			};
 
-			cpurad_cpusec_ipc_shm: memory@800 {
+			cpuapp_cpusec_ipc_shm: memory@800 {
 				reg = <0x800 DT_SIZE_K(2)>;
 			};
+
+			cpuapp_data: memory@1000 {
+				reg = <0x1000 DT_SIZE_K(256)>;
+			};
 		};
 
-		cpuapp_ram0x_region: memory@2f011000 {
+		cpurad_ram0x_region: memory@2f051000 {
 			compatible = "nordic,owned-memory";
-			reg = <0x2f010000 DT_SIZE_K(260)>;
+			reg = <0x2f051000 DT_SIZE_K(4)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
+			nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RWS>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0x0 0x2f011000 0x41000>;
+			ranges = <0x0 0x2f051000 0x1000>;
 
-			cpusec_cpuapp_ipc_shm: memory@0 {
+			cpusec_cpurad_ipc_shm: memory@0 {
 				reg = <0x0 DT_SIZE_K(2)>;
 			};
 
-			cpuapp_cpusec_ipc_shm: memory@800 {
+			cpurad_cpusec_ipc_shm: memory@800 {
 				reg = <0x800 DT_SIZE_K(2)>;
 			};
-
-			cpuapp_data: memory@1000 {
-				reg = <0x1000 DT_SIZE_K(256)>;
-			};
 		};
 
 		etr_buf_ram0x_region: memory@2f0be000 {

From b7ef082eb50f04be5ee4af2b706747a5289adaad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Fri, 28 Mar 2025 11:36:52 +0100
Subject: [PATCH 2909/2913] [nrf fromtree] soc: nordic: nrf54h: Change
 PM_DEVICE_RUNTIME default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

nrf54h20 device requires device runtime PM to be enabled when
device PM is in use.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 4b1691531b5e5d7341b183c87a486d9e76844ccd)
---
 soc/nordic/nrf54h/Kconfig.defconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/soc/nordic/nrf54h/Kconfig.defconfig b/soc/nordic/nrf54h/Kconfig.defconfig
index 65023fc18ca..e1bd0aa6801 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig
+++ b/soc/nordic/nrf54h/Kconfig.defconfig
@@ -42,4 +42,7 @@ config SPI_DW_ACCESS_WORD_ONLY
 config PM_DEVICE_POWER_DOMAIN
 	default n if PM_DEVICE
 
+config PM_DEVICE_RUNTIME
+	default y if PM_DEVICE
+
 endif # SOC_SERIES_NRF54HX

From 61de516bbbf9a8739615ac91d97f7644338534c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?=
 <krzysztof.chruscinski@nordicsemi.no>
Date: Thu, 3 Apr 2025 08:23:19 +0200
Subject: [PATCH 2910/2913] [nrf fromtree] tests: drivers: uart: uart_pm:
 Disable device runtime PM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Explicitly disable device runtime PM since this test is expecting
it to be disabled and there are SoC now that turns on it by default.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 24c01a99c997c57d893ce9f68ade9b5a2580fd32)
---
 tests/drivers/uart/uart_pm/prj.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/drivers/uart/uart_pm/prj.conf b/tests/drivers/uart/uart_pm/prj.conf
index 949c1497802..a01ea2777b6 100644
--- a/tests/drivers/uart/uart_pm/prj.conf
+++ b/tests/drivers/uart/uart_pm/prj.conf
@@ -2,3 +2,4 @@ CONFIG_ZTEST=y
 CONFIG_SERIAL=y
 CONFIG_PM=y
 CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_RUNTIME=n

From 8b07dfa89109b064aaa0e5cb88479c3a726ec831 Mon Sep 17 00:00:00 2001
From: alperen sener <alperen.sener@nordicsemi.no>
Date: Mon, 31 Mar 2025 08:51:15 +0200
Subject: [PATCH 2911/2913] [nrf fromlist] Bluetooth: Mesh: Stop Private NID
 advs upon subnet removal

Private Node Identity advertisement on a subnet should stop as soon as
the network is removed.

Upstream PR #: 87891

Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 subsys/bluetooth/mesh/proxy_srv.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/subsys/bluetooth/mesh/proxy_srv.c b/subsys/bluetooth/mesh/proxy_srv.c
index 7d16a42a86e..7894ef8d608 100644
--- a/subsys/bluetooth/mesh/proxy_srv.c
+++ b/subsys/bluetooth/mesh/proxy_srv.c
@@ -897,10 +897,13 @@ static void subnet_evt(struct bt_mesh_subnet *sub, enum bt_mesh_key_evt evt)
 		if (sub == beacon_sub) {
 			beacon_sub = NULL;
 		}
+
+		bt_mesh_proxy_identity_stop(sub);
 	} else {
 		bt_mesh_proxy_beacon_send(sub);
-		bt_mesh_adv_gatt_update();
 	}
+
+	bt_mesh_adv_gatt_update();
 }
 
 BT_MESH_SUBNET_CB_DEFINE(gatt_services) = {

From d64edaff78e7e87d2bddc33b4bd13454637bf140 Mon Sep 17 00:00:00 2001
From: alperen sener <alperen.sener@nordicsemi.no>
Date: Mon, 31 Mar 2025 11:04:00 +0200
Subject: [PATCH 2912/2913] [nrf fromlist] tests: bluetooth: tester: Fix
 MESH/SR/PRB/PNID/BV-02-C test case

Private node identity advertisements must stop immediately when
ordered by PTS. To do so; adding enabled parameter to
btp_priv_node_id_get_cmd.

Upstream PR #: 87891

Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
---
 tests/bluetooth/tester/src/btp/btp_mesh.h |  3 +++
 tests/bluetooth/tester/src/btp_mesh.c     | 30 ++++++++++++++++++++---
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/tests/bluetooth/tester/src/btp/btp_mesh.h b/tests/bluetooth/tester/src/btp/btp_mesh.h
index 17f49e4927e..6a8e54f9f14 100644
--- a/tests/bluetooth/tester/src/btp/btp_mesh.h
+++ b/tests/bluetooth/tester/src/btp/btp_mesh.h
@@ -1060,6 +1060,9 @@ struct btp_priv_node_id_set_cmd {
 } __packed;
 
 #define BTP_MESH_PROXY_PRIVATE_IDENTITY		0x72
+struct btp_proxy_priv_identity_cmd {
+	uint8_t enabled;
+} __packed;
 
 #define BTP_MESH_OD_PRIV_PROXY_GET		0x73
 struct btp_od_priv_proxy_get_cmd {
diff --git a/tests/bluetooth/tester/src/btp_mesh.c b/tests/bluetooth/tester/src/btp_mesh.c
index acc97d5dda7..1633fae0c34 100644
--- a/tests/bluetooth/tester/src/btp_mesh.c
+++ b/tests/bluetooth/tester/src/btp_mesh.c
@@ -899,20 +899,40 @@ static uint8_t priv_node_id_set(const void *cmd, uint16_t cmd_len,
 
 	return BTP_STATUS_SUCCESS;
 }
+#endif
 
+#ifdef CONFIG_BT_MESH_PRIV_BEACON_SRV
 static uint8_t proxy_private_identity_enable(const void *cmd, uint16_t cmd_len,
 					     void *rsp, uint16_t *rsp_len)
 {
+	const struct btp_proxy_priv_identity_cmd *cp = cmd;
+	uint16_t net_idx[CONFIG_BT_MESH_SUBNET_COUNT];
+	enum bt_mesh_feat_state priv_node_id = BT_MESH_FEATURE_DISABLED;
+	ssize_t count;
 	int err;
 
 	LOG_DBG("");
 
-	err = bt_mesh_proxy_private_identity_enable();
-	if (err) {
-		LOG_ERR("Failed to enable proxy private identity (err %d)", err);
+	count = bt_mesh_subnets_get(net_idx, ARRAY_SIZE(net_idx), 0);
+
+	if (count <= 0) {
+		LOG_ERR("No subnet (err:%i)", count);
 		return BTP_STATUS_FAILED;
 	}
 
+	if (cp->enabled) {
+		priv_node_id = BT_MESH_FEATURE_ENABLED;
+	}
+
+	for (int i = 0; i < count; i++) {
+		err = bt_mesh_subnet_priv_node_id_set(net_idx[i], priv_node_id);
+		if (err) {
+			LOG_ERR("Failed to %s proxy private identity for net idx:%x (err %d)",
+				cp->enabled ? "enable" : "disable", net_idx[i], err);
+			return BTP_STATUS_FAILED;
+		}
+	}
+
 	return BTP_STATUS_SUCCESS;
 }
 #endif
@@ -5251,8 +5271,10 @@ static const struct btp_handler handlers[] = {
 	{.opcode = BTP_MESH_PRIV_NODE_ID_SET,
 	 .expect_len = sizeof(struct btp_priv_node_id_set_cmd),
 	 .func = priv_node_id_set},
+#endif
+#ifdef CONFIG_BT_MESH_PRIV_BEACON_SRV
 	{.opcode = BTP_MESH_PROXY_PRIVATE_IDENTITY,
-	 .expect_len = 0,
+	 .expect_len = sizeof(struct btp_proxy_priv_identity_cmd),
 	 .func = proxy_private_identity_enable},
 #endif
 #if defined(CONFIG_BT_MESH_OD_PRIV_PROXY_CLI)

From 1e87a8547a1c1b7f0894aae4a1eb94f365d83442 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Tue, 8 Apr 2025 10:16:33 +0100
Subject: [PATCH 2913/2913] [nrf noup] mgmt: mcumgr: Fix nRF5340 network core
 hook

Fixes an issue whereby just enabling hooks would enable the nrf5340
network core hook despite lacking other requirements

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 8dbca43a6a9d332c62457789780c569e907aa7f7)
---
 subsys/mgmt/mcumgr/CMakeLists.txt               | 13 +++++++------
 subsys/mgmt/mcumgr/Kconfig                      |  2 +-
 subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c | 15 +++------------
 subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig         |  8 ++++++++
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/subsys/mgmt/mcumgr/CMakeLists.txt b/subsys/mgmt/mcumgr/CMakeLists.txt
index ad088eca067..3bb21e16f79 100644
--- a/subsys/mgmt/mcumgr/CMakeLists.txt
+++ b/subsys/mgmt/mcumgr/CMakeLists.txt
@@ -17,10 +17,11 @@ add_subdirectory_ifdef(CONFIG_SMP_CLIENT    smp_client)
 
 zephyr_library_link_libraries(mgmt_mcumgr)
 
-if (CONFIG_BOOT_IMAGE_ACCESS_HOOKS)
-    zephyr_include_directories(
-        ${ZEPHYR_MCUBOOT_MODULE_DIR}/boot/bootutil/include
-        ${ZEPHYR_MCUBOOT_MODULE_DIR}/boot/zephyr/include
-    )
-    zephyr_library_sources(bootutil_hooks/nrf53_hooks.c)
+if(CONFIG_MCUMGR_GRP_IMG_NRF5340_BOOTUTIL_HOOK)
+  zephyr_include_directories(
+    ${ZEPHYR_MCUBOOT_MODULE_DIR}/boot/bootutil/include
+    ${ZEPHYR_MCUBOOT_MODULE_DIR}/boot/zephyr/include
+  )
+
+  zephyr_library_sources(bootutil_hooks/nrf53_hooks.c)
 endif()
diff --git a/subsys/mgmt/mcumgr/Kconfig b/subsys/mgmt/mcumgr/Kconfig
index 1c6a3a2a516..c45cb7f81d6 100644
--- a/subsys/mgmt/mcumgr/Kconfig
+++ b/subsys/mgmt/mcumgr/Kconfig
@@ -6,7 +6,7 @@ menuconfig MCUMGR
 	bool "mcumgr Support"
 	depends on NET_BUF
 	depends on ZCBOR
-	imply BOOT_IMAGE_ACCESS_HOOKS if (SOC_NRF5340_CPUAPP_QKAA && MCUMGR_GRP_IMG)
+	imply BOOT_IMAGE_ACCESS_HOOKS if SOC_NRF5340_CPUAPP && MCUMGR_GRP_IMG && MCUBOOT_NETWORK_CORE_IMAGE_NUMBER > -1
 	help
 	  This option enables the mcumgr management library.
 
diff --git a/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c b/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c
index f1ac8a168e6..b372ce4e494 100644
--- a/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c
+++ b/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c
@@ -8,19 +8,10 @@
 #include <zephyr/device.h>
 #include "bootutil/bootutil_public.h"
 
-#if CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER != -1
-/* Sysbuild */
-#define NET_CORE_IMAGE CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER
-#else
-/* Legacy child/parent */
-#define NET_CORE_IMAGE 1
-#endif
-
-int boot_read_swap_state_primary_slot_hook(int image_index,
-		struct boot_swap_state *state)
+int boot_read_swap_state_primary_slot_hook(int image_index, struct boot_swap_state *state)
 {
-	if (image_index == NET_CORE_IMAGE) {
-		/* Pretend that primary slot of image 1 unpopulated */
+	if (image_index == CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER) {
+		/* Pretend that primary slot of the network core update image is unpopulated */
 		state->magic = BOOT_MAGIC_UNSET;
 		state->swap_type = BOOT_SWAP_TYPE_NONE;
 		state->image_num = image_index;
diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig b/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
index 684588a47d6..9cb32a46e02 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
@@ -224,6 +224,14 @@ config MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE
 	  sysbuild if needed. This enables selecting the correct slot when running a QSPI XIP
 	  split image application in DirectXIP mode.
 
+config MCUMGR_GRP_IMG_NRF5340_BOOTUTIL_HOOK
+	bool "nRF5340 network core bootutil hook"
+	depends on SOC_NRF5340_CPUAPP && BOOT_IMAGE_ACCESS_HOOKS && MCUBOOT_NETWORK_CORE_IMAGE_NUMBER > -1
+	default y
+	help
+	  This option will enable a bootutil hook that populates the network core update image
+	  slot with dummy data to allow for uploading a firmware update to the network core.
+
 module = MCUMGR_GRP_IMG
 module-str = mcumgr_grp_img
 source "subsys/logging/Kconfig.template.log_config"